From 0f4e20b7fa690c18ead85bee5280e73c407ecd5b Mon Sep 17 00:00:00 2001
From: AdrianFarmadin <adrian.farmadin@gepardec.com>
Date: Fri, 5 May 2017 17:28:52 +0200
Subject: [PATCH 0001/1382] Point, Polygon definitions

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

diff --git a/types/rethinkdb/index.d.ts b/types/rethinkdb/index.d.ts
index f375a50fc7..94130520d1 100644
--- a/types/rethinkdb/index.d.ts
+++ b/types/rethinkdb/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for RethinkDB 2.3
 // Project: http://rethinkdb.com/
 // Definitions by: Alex Gorbatchev <https://github.com/alexgorbatchev>
+// Definitions by: Adrian Farmadin <https://github.com/AdrianFarmadin>	
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 //
 // Reference: https://rethinkdb.com/api/javascript/

From 96b6817d5e442e2c5329af0c5e860d11dc60d6db Mon Sep 17 00:00:00 2001
From: AdrianFarmadin <adrian.farmadin@gepardec.com>
Date: Fri, 5 May 2017 17:30:47 +0200
Subject: [PATCH 0002/1382] Point, Polygon definitions

---
 types/rethinkdb/index.d.ts | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/types/rethinkdb/index.d.ts b/types/rethinkdb/index.d.ts
index 94130520d1..a4cbd64313 100644
--- a/types/rethinkdb/index.d.ts
+++ b/types/rethinkdb/index.d.ts
@@ -1,7 +1,7 @@
 // Type definitions for RethinkDB 2.3
 // Project: http://rethinkdb.com/
 // Definitions by: Alex Gorbatchev <https://github.com/alexgorbatchev>
-// Definitions by: Adrian Farmadin <https://github.com/AdrianFarmadin>	
+// Definitions by: Adrian Farmadin <https://github.com/AdrianFarmadin>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 //
 // Reference: https://rethinkdb.com/api/javascript/
@@ -38,6 +38,9 @@ declare module "rethinkdb" {
     export function asc(property: string): Sort;
     export function desc(property: string): Sort;
 
+    export function point(lng: number, lat: number): Point;
+    export function polygon(...point: Point[]): Polygon;
+
     export var count: Aggregator;
     export function sum(prop: string): Aggregator;
     export function avg(prop: string): Aggregator;
@@ -222,6 +225,18 @@ declare module "rethinkdb" {
          * See: https://rethinkdb.com/api/javascript/has_fields/
          */
         hasFields(...fields: string[]): T;
+    } 
+
+    interface Geometry {
+
+    }
+
+    interface Point {
+
+    }
+
+    interface Polygon extends Geometry {
+
     }
 
     interface Table extends Sequence, HasFields<Sequence> {
@@ -235,6 +250,8 @@ 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;
+
+	getIntersecting(geometry: Geometry, index: Index): Sequence;
     }
 
     interface Sequence extends Operation<Cursor>, Writeable {

From dc86e5222e397c382a99c36219f8fe5679a9ffa7 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Fri, 5 May 2017 09:56:00 -0700
Subject: [PATCH 0003/1382] fix header

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

diff --git a/types/rethinkdb/index.d.ts b/types/rethinkdb/index.d.ts
index a4cbd64313..afe672468e 100644
--- a/types/rethinkdb/index.d.ts
+++ b/types/rethinkdb/index.d.ts
@@ -1,7 +1,6 @@
 // Type definitions for RethinkDB 2.3
 // Project: http://rethinkdb.com/
-// Definitions by: Alex Gorbatchev <https://github.com/alexgorbatchev>
-// Definitions by: Adrian Farmadin <https://github.com/AdrianFarmadin>
+// Definitions by: Alex Gorbatchev <https://github.com/alexgorbatchev>, Adrian Farmadin <https://github.com/AdrianFarmadin>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 //
 // Reference: https://rethinkdb.com/api/javascript/

From 836e57e76558b4a97189c4ccf65c751807db7655 Mon Sep 17 00:00:00 2001
From: Kyle Buzby <kyle.buzby@gmail.com>
Date: Fri, 1 Sep 2017 13:54:42 -0500
Subject: [PATCH 0004/1382] Update dts-gen example with proper command line
 option

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

diff --git a/README.md b/README.md
index 4b16884273..5631d78375 100644
--- a/README.md
+++ b/README.md
@@ -119,7 +119,7 @@ Your package should have this structure:
 | tsconfig.json | This allows you to run `tsc` within the package. |
 | tslint.json | Enables linting. |
 
-Generate these by running `npm install -g dts-gen` and `dts-gen --dt --name my-package-name --template module`.
+Generate these by running `npm install -g dts-gen` and `dts-gen --dt --name my-package-name --module module`.
 See all options at [dts-gen](https://github.com/Microsoft/dts-gen).
 
 You may edit the `tsconfig.json` to add new files, to add `"target": "es6"` (needed for async functions), to add to `"lib"`, or to add the `"jsx"` compiler option.

From 57c70f83b8604b7eabc2c69a4cf5f1bcd56b1369 Mon Sep 17 00:00:00 2001
From: Jovica Zoric <zoricjovica@gmail.com>
Date: Tue, 26 Sep 2017 13:29:50 +0200
Subject: [PATCH 0005/1382] fix(react-sortable-tree): Add missing prop

Add missing dndType prop.
---
 types/react-sortable-tree/index.d.ts                    | 2 ++
 types/react-sortable-tree/react-sortable-tree-tests.tsx | 1 +
 2 files changed, 3 insertions(+)

diff --git a/types/react-sortable-tree/index.d.ts b/types/react-sortable-tree/index.d.ts
index a6a04f4968..dfed930e2f 100644
--- a/types/react-sortable-tree/index.d.ts
+++ b/types/react-sortable-tree/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for react-sortable-tree 0.1
 // Project: https://fritz-c.github.io/react-sortable-tree
 // Definitions by: Wouter Hardeman <https://github.com/wouterhardeman>
+//                 Jovica Zoric <https://github.com/jzoric>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -111,6 +112,7 @@ export interface ReactSortableTreeProps {
     scaffoldBlockPxWidth?: number;
     isVirtualized?: boolean;
     nodeContentRenderer?: NodeRenderer;
+    dndType?: string;
 }
 
 declare const SortableTree: React.ComponentClass<ReactSortableTreeProps>;
diff --git a/types/react-sortable-tree/react-sortable-tree-tests.tsx b/types/react-sortable-tree/react-sortable-tree-tests.tsx
index 1a5e2dfcd0..106415744b 100644
--- a/types/react-sortable-tree/react-sortable-tree-tests.tsx
+++ b/types/react-sortable-tree/react-sortable-tree-tests.tsx
@@ -54,6 +54,7 @@ class Test extends React.Component {
                     scaffoldBlockPxWidth={44}
                     isVirtualized={true}
                     nodeContentRenderer={nodeRenderer}
+                    dndType="testNodeType"
                 />
                 <SortableTreeWithoutDndContext
                     treeData={[{title: "Title", subtitle: "Subtitle", children: []}]}

From a02acb4da8a2bf72e49533956e7a24253a82d915 Mon Sep 17 00:00:00 2001
From: Hugues Stefanski <hugues.stefanski@gmail.com>
Date: Sat, 7 Oct 2017 17:38:07 +0200
Subject: [PATCH 0006/1382] Updated d3-geo to reflect version 1.9.0: added
 fitWidth and fitHeight methods

---
 types/d3-geo/index.d.ts | 61 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 58 insertions(+), 3 deletions(-)

diff --git a/types/d3-geo/index.d.ts b/types/d3-geo/index.d.ts
index 6860031224..75f23d94a2 100644
--- a/types/d3-geo/index.d.ts
+++ b/types/d3-geo/index.d.ts
@@ -1,9 +1,9 @@
-// Type definitions for D3JS d3-geo module 1.8
+// Type definitions for D3JS d3-geo module 1.9
 // 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
 
-// Last module patch version validated against: 1.8.1
+// Last module patch version validated against: 1.9.0
 
 import * as GeoJSON from 'geojson';
 
@@ -804,7 +804,62 @@ export interface GeoProjection extends GeoStreamWrapper {
      * @param object A geographic geometry collection supported by d3-geo (An extension of GeoJSON geometry collection).
      */
     fitSize(size: [number, number], object: ExtendedGeometryCollection<GeoGeometryObjects>): this;
-
+    /**
+     *A convenience method for projection.fitSize where the height is automatically chosen from the aspect ratio of object and the given constraint on width.
+    *
+     * @param width The width of the extent.
+     * @param object A geographic feature supported by d3-geo (An extension of GeoJSON feature).
+     */
+    fitWidth(width: number, object: ExtendedFeature<GeoGeometryObjects, any>): this;
+    /**
+     *A convenience method for projection.fitSize where the height is automatically chosen from the aspect ratio of object and the given constraint on width.
+    *
+     * @param width The width of the extent.
+     * @param object A GeoJson Geometry Object or GeoSphere object supported by d3-geo (An extension of GeoJSON).
+     */
+    fitWidth(width: number, object: ExtendedFeatureCollection<ExtendedFeature<GeoGeometryObjects, any>>): this;
+    /**
+     *A convenience method for projection.fitSize where the height is automatically chosen from the aspect ratio of object and the given constraint on width.
+    *
+     * @param width The width of the extent.
+     * @param object A geographic feature supported by d3-geo (An extension of GeoJSON feature).
+     */
+    fitWidth(width: number, object: GeoGeometryObjects): this;
+    /**
+     *A convenience method for projection.fitSize where the height is automatically chosen from the aspect ratio of object and the given constraint on width.
+    *
+     * @param width The width of the extent.
+     * @param object A geographic geometry collection supported by d3-geo (An extension of GeoJSON geometry collection).
+     */
+    fitWidth(width: number, object: ExtendedGeometryCollection<GeoGeometryObjects>): this;
+    /**
+     *A convenience method for projection.fitSize where the width is automatically chosen from the aspect ratio of object and the given constraint on height.
+    *
+     * @param height The height of the extent.
+     * @param object A geographic feature supported by d3-geo (An extension of GeoJSON feature).
+     */
+    fitHeight(height: number, object: ExtendedFeature<GeoGeometryObjects, any>): this;
+    /**
+     *A convenience method for projection.fitSize where the width is automatically chosen from the aspect ratio of object and the given constraint on height.
+    *
+     * @param height The height of the extent.
+     * @param object A GeoJson Geometry Object or GeoSphere object supported by d3-geo (An extension of GeoJSON).
+     */
+    fitHeight(height: number, object: ExtendedFeatureCollection<ExtendedFeature<GeoGeometryObjects, any>>): this;
+    /**
+     *A convenience method for projection.fitSize where the width is automatically chosen from the aspect ratio of object and the given constraint on height.
+    *
+     * @param height The height of the extent.
+     * @param object A geographic feature supported by d3-geo (An extension of GeoJSON feature).
+     */
+    fitHeight(height: number, object: GeoGeometryObjects): this;
+    /**
+     *A convenience method for projection.fitSize where the width is automatically chosen from the aspect ratio of object and the given constraint on height.
+    *
+     * @param height The height of the extent.
+     * @param object A geographic geometry collection supported by d3-geo (An extension of GeoJSON geometry collection).
+     */
+    fitHeight(height: number, object: ExtendedGeometryCollection<GeoGeometryObjects>): this;
     /**
      * Returns a new array [longitude, latitude] in degrees representing the unprojected point of the given projected point.
      * May return null if the specified point has no defined projected position, such as when the point is outside the clipping bounds of the projection.

From 1194c013de62f1aa8092de15fbbf426c1f92523b Mon Sep 17 00:00:00 2001
From: Hugues Stefanski <hugues.stefanski@gmail.com>
Date: Sat, 7 Oct 2017 19:32:08 +0200
Subject: [PATCH 0007/1382] Fix asterisk position

---
 types/d3-geo/index.d.ts | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/types/d3-geo/index.d.ts b/types/d3-geo/index.d.ts
index 75f23d94a2..1a3ae3d295 100644
--- a/types/d3-geo/index.d.ts
+++ b/types/d3-geo/index.d.ts
@@ -806,56 +806,56 @@ export interface GeoProjection extends GeoStreamWrapper {
     fitSize(size: [number, number], object: ExtendedGeometryCollection<GeoGeometryObjects>): this;
     /**
      *A convenience method for projection.fitSize where the height is automatically chosen from the aspect ratio of object and the given constraint on width.
-    *
+     *
      * @param width The width of the extent.
      * @param object A geographic feature supported by d3-geo (An extension of GeoJSON feature).
      */
     fitWidth(width: number, object: ExtendedFeature<GeoGeometryObjects, any>): this;
     /**
      *A convenience method for projection.fitSize where the height is automatically chosen from the aspect ratio of object and the given constraint on width.
-    *
+     *
      * @param width The width of the extent.
      * @param object A GeoJson Geometry Object or GeoSphere object supported by d3-geo (An extension of GeoJSON).
      */
     fitWidth(width: number, object: ExtendedFeatureCollection<ExtendedFeature<GeoGeometryObjects, any>>): this;
     /**
      *A convenience method for projection.fitSize where the height is automatically chosen from the aspect ratio of object and the given constraint on width.
-    *
+     *
      * @param width The width of the extent.
      * @param object A geographic feature supported by d3-geo (An extension of GeoJSON feature).
      */
     fitWidth(width: number, object: GeoGeometryObjects): this;
     /**
      *A convenience method for projection.fitSize where the height is automatically chosen from the aspect ratio of object and the given constraint on width.
-    *
+     *
      * @param width The width of the extent.
      * @param object A geographic geometry collection supported by d3-geo (An extension of GeoJSON geometry collection).
      */
     fitWidth(width: number, object: ExtendedGeometryCollection<GeoGeometryObjects>): this;
     /**
      *A convenience method for projection.fitSize where the width is automatically chosen from the aspect ratio of object and the given constraint on height.
-    *
+     *
      * @param height The height of the extent.
      * @param object A geographic feature supported by d3-geo (An extension of GeoJSON feature).
      */
     fitHeight(height: number, object: ExtendedFeature<GeoGeometryObjects, any>): this;
     /**
      *A convenience method for projection.fitSize where the width is automatically chosen from the aspect ratio of object and the given constraint on height.
-    *
+     *
      * @param height The height of the extent.
      * @param object A GeoJson Geometry Object or GeoSphere object supported by d3-geo (An extension of GeoJSON).
      */
     fitHeight(height: number, object: ExtendedFeatureCollection<ExtendedFeature<GeoGeometryObjects, any>>): this;
     /**
      *A convenience method for projection.fitSize where the width is automatically chosen from the aspect ratio of object and the given constraint on height.
-    *
+     *
      * @param height The height of the extent.
      * @param object A geographic feature supported by d3-geo (An extension of GeoJSON feature).
      */
     fitHeight(height: number, object: GeoGeometryObjects): this;
     /**
      *A convenience method for projection.fitSize where the width is automatically chosen from the aspect ratio of object and the given constraint on height.
-    *
+     *
      * @param height The height of the extent.
      * @param object A geographic geometry collection supported by d3-geo (An extension of GeoJSON geometry collection).
      */

From 9fba8310108c681596ea5ec70fcd290fca72a92c Mon Sep 17 00:00:00 2001
From: Hugues Stefanski <hugues.stefanski@gmail.com>
Date: Sat, 7 Oct 2017 19:53:36 +0200
Subject: [PATCH 0008/1382] Missing space

---
 types/d3-geo/index.d.ts | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/types/d3-geo/index.d.ts b/types/d3-geo/index.d.ts
index 1a3ae3d295..4d9def3565 100644
--- a/types/d3-geo/index.d.ts
+++ b/types/d3-geo/index.d.ts
@@ -805,56 +805,56 @@ export interface GeoProjection extends GeoStreamWrapper {
      */
     fitSize(size: [number, number], object: ExtendedGeometryCollection<GeoGeometryObjects>): this;
     /**
-     *A convenience method for projection.fitSize where the height is automatically chosen from the aspect ratio of object and the given constraint on width.
+     * A convenience method for projection.fitSize where the height is automatically chosen from the aspect ratio of object and the given constraint on width.
      *
      * @param width The width of the extent.
      * @param object A geographic feature supported by d3-geo (An extension of GeoJSON feature).
      */
     fitWidth(width: number, object: ExtendedFeature<GeoGeometryObjects, any>): this;
     /**
-     *A convenience method for projection.fitSize where the height is automatically chosen from the aspect ratio of object and the given constraint on width.
+     * A convenience method for projection.fitSize where the height is automatically chosen from the aspect ratio of object and the given constraint on width.
      *
      * @param width The width of the extent.
      * @param object A GeoJson Geometry Object or GeoSphere object supported by d3-geo (An extension of GeoJSON).
      */
     fitWidth(width: number, object: ExtendedFeatureCollection<ExtendedFeature<GeoGeometryObjects, any>>): this;
     /**
-     *A convenience method for projection.fitSize where the height is automatically chosen from the aspect ratio of object and the given constraint on width.
+     * A convenience method for projection.fitSize where the height is automatically chosen from the aspect ratio of object and the given constraint on width.
      *
      * @param width The width of the extent.
      * @param object A geographic feature supported by d3-geo (An extension of GeoJSON feature).
      */
     fitWidth(width: number, object: GeoGeometryObjects): this;
     /**
-     *A convenience method for projection.fitSize where the height is automatically chosen from the aspect ratio of object and the given constraint on width.
+     * A convenience method for projection.fitSize where the height is automatically chosen from the aspect ratio of object and the given constraint on width.
      *
      * @param width The width of the extent.
      * @param object A geographic geometry collection supported by d3-geo (An extension of GeoJSON geometry collection).
      */
     fitWidth(width: number, object: ExtendedGeometryCollection<GeoGeometryObjects>): this;
     /**
-     *A convenience method for projection.fitSize where the width is automatically chosen from the aspect ratio of object and the given constraint on height.
+     * A convenience method for projection.fitSize where the width is automatically chosen from the aspect ratio of object and the given constraint on height.
      *
      * @param height The height of the extent.
      * @param object A geographic feature supported by d3-geo (An extension of GeoJSON feature).
      */
     fitHeight(height: number, object: ExtendedFeature<GeoGeometryObjects, any>): this;
     /**
-     *A convenience method for projection.fitSize where the width is automatically chosen from the aspect ratio of object and the given constraint on height.
+     * A convenience method for projection.fitSize where the width is automatically chosen from the aspect ratio of object and the given constraint on height.
      *
      * @param height The height of the extent.
      * @param object A GeoJson Geometry Object or GeoSphere object supported by d3-geo (An extension of GeoJSON).
      */
     fitHeight(height: number, object: ExtendedFeatureCollection<ExtendedFeature<GeoGeometryObjects, any>>): this;
     /**
-     *A convenience method for projection.fitSize where the width is automatically chosen from the aspect ratio of object and the given constraint on height.
+     * A convenience method for projection.fitSize where the width is automatically chosen from the aspect ratio of object and the given constraint on height.
      *
      * @param height The height of the extent.
      * @param object A geographic feature supported by d3-geo (An extension of GeoJSON feature).
      */
     fitHeight(height: number, object: GeoGeometryObjects): this;
     /**
-     *A convenience method for projection.fitSize where the width is automatically chosen from the aspect ratio of object and the given constraint on height.
+     * A convenience method for projection.fitSize where the width is automatically chosen from the aspect ratio of object and the given constraint on height.
      *
      * @param height The height of the extent.
      * @param object A geographic geometry collection supported by d3-geo (An extension of GeoJSON geometry collection).

From c4fdefb8d39e84b0d17d3b34a0e447829df9137e Mon Sep 17 00:00:00 2001
From: Hugues Stefanski <hugues.stefanski@gmail.com>
Date: Sat, 7 Oct 2017 22:26:28 +0200
Subject: [PATCH 0009/1382] Added spacing between methods

---
 types/d3-geo/index.d.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/types/d3-geo/index.d.ts b/types/d3-geo/index.d.ts
index 4d9def3565..40ec500f90 100644
--- a/types/d3-geo/index.d.ts
+++ b/types/d3-geo/index.d.ts
@@ -804,6 +804,7 @@ export interface GeoProjection extends GeoStreamWrapper {
      * @param object A geographic geometry collection supported by d3-geo (An extension of GeoJSON geometry collection).
      */
     fitSize(size: [number, number], object: ExtendedGeometryCollection<GeoGeometryObjects>): this;
+
     /**
      * A convenience method for projection.fitSize where the height is automatically chosen from the aspect ratio of object and the given constraint on width.
      *
@@ -832,6 +833,7 @@ export interface GeoProjection extends GeoStreamWrapper {
      * @param object A geographic geometry collection supported by d3-geo (An extension of GeoJSON geometry collection).
      */
     fitWidth(width: number, object: ExtendedGeometryCollection<GeoGeometryObjects>): this;
+
     /**
      * A convenience method for projection.fitSize where the width is automatically chosen from the aspect ratio of object and the given constraint on height.
      *
@@ -860,6 +862,7 @@ export interface GeoProjection extends GeoStreamWrapper {
      * @param object A geographic geometry collection supported by d3-geo (An extension of GeoJSON geometry collection).
      */
     fitHeight(height: number, object: ExtendedGeometryCollection<GeoGeometryObjects>): this;
+
     /**
      * Returns a new array [longitude, latitude] in degrees representing the unprojected point of the given projected point.
      * May return null if the specified point has no defined projected position, such as when the point is outside the clipping bounds of the projection.

From 8b26070d2a557744ec6581df8338f758263fe1bc Mon Sep 17 00:00:00 2001
From: Hugues Stefanski <hugues.stefanski@gmail.com>
Date: Sun, 8 Oct 2017 10:06:28 +0200
Subject: [PATCH 0010/1382] Added tests for d3-geo `fitHeight` and `fitWidth`

---
 types/d3-geo/d3-geo-tests.ts | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/types/d3-geo/d3-geo-tests.ts b/types/d3-geo/d3-geo-tests.ts
index 4d423aa5a3..876461e3e9 100644
--- a/types/d3-geo/d3-geo-tests.ts
+++ b/types/d3-geo/d3-geo-tests.ts
@@ -422,6 +422,26 @@ constructedProjection = constructedProjection.fitSize([960, 500], sampleExtended
 constructedProjection = constructedProjection.fitSize([960, 500], sampleFeatureCollection);
 constructedProjection = constructedProjection.fitSize([960, 500], sampleExtendedFeatureCollection);
 
+constructedProjection = constructedProjection.fitWidth(960, samplePolygon);
+constructedProjection = constructedProjection.fitWidth(960, sampleSphere);
+constructedProjection = constructedProjection.fitWidth(960, sampleGeometryCollection);
+constructedProjection = constructedProjection.fitWidth(960, sampleExtendedGeometryCollection);
+constructedProjection = constructedProjection.fitWidth(960, sampleFeature);
+constructedProjection = constructedProjection.fitWidth(960, sampleExtendedFeature1);
+constructedProjection = constructedProjection.fitWidth(960, sampleExtendedFeature2);
+constructedProjection = constructedProjection.fitWidth(960, sampleFeatureCollection);
+constructedProjection = constructedProjection.fitWidth(960, sampleExtendedFeatureCollection);
+
+constructedProjection = constructedProjection.fitHeight(500, samplePolygon);
+constructedProjection = constructedProjection.fitHeight(500, sampleSphere);
+constructedProjection = constructedProjection.fitHeight(500, sampleGeometryCollection);
+constructedProjection = constructedProjection.fitHeight(500, sampleExtendedGeometryCollection);
+constructedProjection = constructedProjection.fitHeight(500, sampleFeature);
+constructedProjection = constructedProjection.fitHeight(500, sampleExtendedFeature1);
+constructedProjection = constructedProjection.fitHeight(500, sampleExtendedFeature2);
+constructedProjection = constructedProjection.fitHeight(500, sampleFeatureCollection);
+constructedProjection = constructedProjection.fitHeight(500, sampleExtendedFeatureCollection);
+
 // ----------------------------------------------------------------------
 // GeoConicProjection interface
 // ----------------------------------------------------------------------

From 109298354cabba3ee9959f213ce456c7e424971c Mon Sep 17 00:00:00 2001
From: Brice BERNARD <brikou@gmail.com>
Date: Sat, 9 Dec 2017 18:19:19 +0100
Subject: [PATCH 0011/1382] Prettier test

---
 types/jsonwebtoken/jsonwebtoken-tests.ts | 76 +++++++++++++-----------
 1 file changed, 42 insertions(+), 34 deletions(-)

diff --git a/types/jsonwebtoken/jsonwebtoken-tests.ts b/types/jsonwebtoken/jsonwebtoken-tests.ts
index 9e495d31cb..3ced0ccfb5 100644
--- a/types/jsonwebtoken/jsonwebtoken-tests.ts
+++ b/types/jsonwebtoken/jsonwebtoken-tests.ts
@@ -11,39 +11,44 @@ var token: string;
 var cert: Buffer;
 
 interface ITestObject {
-  'foo': string
+    foo: string;
 }
 
-const testObject = { foo: 'bar' }
+const testObject = { foo: "bar" };
 
 /**
  * jwt.sign
  * https://github.com/auth0/node-jsonwebtoken#usage
  */
 // sign with default (HMAC SHA256)
-token = jwt.sign(testObject, 'shhhhh');
+token = jwt.sign(testObject, "shhhhh");
 
 // sign with default (HMAC SHA256) and single audience
-token = jwt.sign(testObject, 'shhhhh', { audience: "theAudience"});
+token = jwt.sign(testObject, "shhhhh", { audience: "theAudience" });
 
 // sign with default (HMAC SHA256) and multiple audiences
-token = jwt.sign(testObject, 'shhhhh', { audience: ["audience1", "audience2"]});
+token = jwt.sign(testObject, "shhhhh", {
+    audience: ["audience1", "audience2"],
+});
 
 // sign with default (HMAC SHA256) and a keyid
-token = jwt.sign(testObject, 'shhhhh', { keyid: "theKeyId"});
+token = jwt.sign(testObject, "shhhhh", { keyid: "theKeyId" });
 
 // sign with RSA SHA256
-cert = fs.readFileSync('private.key');  // get private key
-token = jwt.sign(testObject, cert, { algorithm: 'RS256'});
+cert = fs.readFileSync("private.key"); // get private key
+token = jwt.sign(testObject, cert, { algorithm: "RS256" });
 
 // sign with encrypted RSA SHA256 private key (only PEM encoding is supported)
-const privKey: Buffer = fs.readFileSync('encrypted_private.key');  // get private key
-const secret = {key: privKey.toString(), passphrase: 'keypwd'}
-token = jwt.sign(testObject, secret, { algorithm: 'RS256' }); // the algorithm option is mandatory in this case
+const privKey: Buffer = fs.readFileSync("encrypted_private.key"); // get private key
+const secret = { key: privKey.toString(), passphrase: "keypwd" };
+token = jwt.sign(testObject, secret, { algorithm: "RS256" }); // the algorithm option is mandatory in this case
 
 // sign asynchronously
-jwt.sign(testObject, cert, { algorithm: 'RS256' }, function(err: Error, token: string) {
-  console.log(token);
+jwt.sign(testObject, cert, { algorithm: "RS256" }, function(
+    err: Error,
+    token: string,
+) {
+    console.log(token);
 });
 
 /**
@@ -51,48 +56,51 @@ jwt.sign(testObject, cert, { algorithm: 'RS256' }, function(err: Error, token: s
  * https://github.com/auth0/node-jsonwebtoken#jwtverifytoken-secretorpublickey-options-callback
  */
 // verify a token symmetric
-jwt.verify(token, 'shhhhh', function(err, decoded) {
-  const result = decoded as ITestObject
+jwt.verify(token, "shhhhh", function(err, decoded) {
+    const result = decoded as ITestObject;
 
-  console.log(result.foo) // bar
+    console.log(result.foo); // bar
 });
 
 // invalid token
-jwt.verify(token, 'wrong-secret', function(err, decoded) {
-  // err
-  // decoded undefined
+jwt.verify(token, "wrong-secret", function(err, decoded) {
+    // err
+    // decoded undefined
 });
 
 // verify a token asymmetric
-cert = fs.readFileSync('public.pem');  // get public key
-jwt.verify(token, cert, function (err, decoded) {
-  const result = decoded as ITestObject
+cert = fs.readFileSync("public.pem"); // get public key
+jwt.verify(token, cert, function(err, decoded) {
+    const result = decoded as ITestObject;
 
-  console.log(result.foo) // bar
+    console.log(result.foo); // bar
 });
 
 // verify audience
-cert = fs.readFileSync('public.pem');  // get public key
-jwt.verify(token, cert, { audience: 'urn:foo' }, function(err, decoded) {
-  // if audience mismatch, err == invalid audience
+cert = fs.readFileSync("public.pem"); // get public key
+jwt.verify(token, cert, { audience: "urn:foo" }, function(err, decoded) {
+    // if audience mismatch, err == invalid audience
 });
 
 // verify issuer
-cert = fs.readFileSync('public.pem');  // get public key
-jwt.verify(token, cert, { audience: 'urn:foo', issuer: 'urn:issuer' }, function(err, decoded) {
-  // if issuer mismatch, err == invalid issuer
+cert = fs.readFileSync("public.pem"); // get public key
+jwt.verify(token, cert, { audience: "urn:foo", issuer: "urn:issuer" }, function(
+    err,
+    decoded,
+) {
+    // if issuer mismatch, err == invalid issuer
 });
 
 // verify algorithm
-cert = fs.readFileSync('public.pem');  // get public key
-jwt.verify(token, cert, { algorithms: ['RS256'] }, function(err, decoded) {
-  // if algorithm mismatch, err == invalid algorithm
+cert = fs.readFileSync("public.pem"); // get public key
+jwt.verify(token, cert, { algorithms: ["RS256"] }, function(err, decoded) {
+    // if algorithm mismatch, err == invalid algorithm
 });
 
 // verify without expiration check
-cert = fs.readFileSync('public.pem');  // get public key
+cert = fs.readFileSync("public.pem"); // get public key
 jwt.verify(token, cert, { ignoreExpiration: true }, function(err, decoded) {
-  // if ignoreExpration == false and token is expired, err == expired token
+    // if ignoreExpration == false and token is expired, err == expired token
 });
 
 /**

From ed28cd0b50ea04fb5d458710b403e1bfc371c8db Mon Sep 17 00:00:00 2001
From: Brice BERNARD <brikou@gmail.com>
Date: Sat, 9 Dec 2017 18:22:02 +0100
Subject: [PATCH 0012/1382] Add test and related fix

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

diff --git a/types/jsonwebtoken/index.d.ts b/types/jsonwebtoken/index.d.ts
index 766042e627..6455eeb1ba 100644
--- a/types/jsonwebtoken/index.d.ts
+++ b/types/jsonwebtoken/index.d.ts
@@ -166,4 +166,4 @@ declare function verify(
 declare function decode(
     token: string,
     options?: DecodeOptions,
-): null | object | string;
+): null | { [key: string]: any } | string;
diff --git a/types/jsonwebtoken/jsonwebtoken-tests.ts b/types/jsonwebtoken/jsonwebtoken-tests.ts
index 3ced0ccfb5..87e3a56390 100644
--- a/types/jsonwebtoken/jsonwebtoken-tests.ts
+++ b/types/jsonwebtoken/jsonwebtoken-tests.ts
@@ -111,6 +111,10 @@ var decoded = jwt.decode(token);
 
 decoded = jwt.decode(token, { complete: false });
 
+if (decoded !== null && typeof decoded === "object") {
+    console.log(decoded.foo);
+}
+
 decoded = jwt.decode(token, { json: false });
 
 decoded = jwt.decode(token, { complete: false, json: false });

From 8a94d4a3d434602d3fbc7d6b768bb9d535410d3b Mon Sep 17 00:00:00 2001
From: Brice BERNARD <brikou@gmail.com>
Date: Sat, 9 Dec 2017 18:32:00 +0100
Subject: [PATCH 0013/1382] Bump version

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

diff --git a/types/jsonwebtoken/index.d.ts b/types/jsonwebtoken/index.d.ts
index 6455eeb1ba..cd05b54d69 100644
--- a/types/jsonwebtoken/index.d.ts
+++ b/types/jsonwebtoken/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for jsonwebtoken 7.2.1
+// Type definitions for jsonwebtoken 7.2.2
 // Project: https://github.com/auth0/node-jsonwebtoken
 // Definitions by: Maxime LUCE <https://github.com/SomaticIT>,
 //                 Daniel Heim <https://github.com/danielheim>,

From 34b42dbf696847ce0dd1282f5dc3d872cb0f79a0 Mon Sep 17 00:00:00 2001
From: Craig Kovatch <cromas@gmail.com>
Date: Fri, 29 Dec 2017 17:44:19 -0800
Subject: [PATCH 0014/1382] Add WAI-ARIA 1.1 attributes to React typings

---
 types/react/index.d.ts     | 136 +++++++++++++++++++++++++++++++++++++
 types/react/v15/index.d.ts | 136 +++++++++++++++++++++++++++++++++++++
 2 files changed, 272 insertions(+)

diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index c5c1c76d17..a4784caa41 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -2498,6 +2498,142 @@ declare namespace React {
         unselectable?: boolean;
     }
 
+    // All the WAI-ARIA 1.1 attributes
+    // https://www.w3.org/TR/wai-aria-1.1/
+    interface HTMLAttributes<T> extends DOMAttributes<T> {
+         /** Identifies the currently active element when DOM focus is on a composite widget, textbox, group, or application. */
+        'aria-activedescendant'?: string;
+        /** Indicates whether assistive technologies will present all, or only parts of, the changed region based on the change
+         * notifications defined by the aria-relevant attribute. */
+        'aria-atomic'?: boolean;
+        /** Indicates whether inputting text could trigger display of one or more predictions of the user's intended value for
+         * an input and specifies how predictions would be presented if they are made. */
+        'aria-autocomplete'?: 'none' | 'inline' | 'list' | 'both';
+        /** Indicates an element is being modified and that assistive technologies MAY want to wait until the modifications are
+         * complete before exposing them to the user. */
+        'aria-busy'?: boolean;
+        /** Indicates the current "checked" state of checkboxes, radio buttons, and other widgets.
+         * @see aria-pressed @see aria-selected. */
+        'aria-checked'?: boolean | 'false' | 'mixed' | 'true';
+        /** Defines the total number of columns in a table, grid, or treegrid.
+         * @see aria-colindex. */
+        'aria-colcount'?: number;
+        /** Defines an element's column index or position with respect to the total number of columns within a table, grid, or
+         * treegrid.
+         * @see aria-colcount @see aria-colspan. */
+        'aria-colindex'?: number;
+        /** Defines the number of columns spanned by a cell or gridcell within a table, grid, or treegrid.
+         *  @see aria-colindex @see aria-rowspan. */
+        'aria-colspan'?: number;
+        /** Indicates the element that represents the current item within a container or set of related elements. */
+        'aria-current'?: boolean | 'false' | 'true' | 'page' | 'step' | 'location' | 'date' | 'time';
+        /** Identifies the element (or elements) that describes the object.
+         * @see aria-labelledby */
+        'aria-describedby'?: string;
+        /** Identifies the element that provides a detailed, extended description for the object.
+         * @see aria-describedby. */
+        'aria-details'?: string;
+        /** Indicates that the element is perceivable but disabled, so it is not editable or otherwise operable.
+         * @see aria-hidden @see aria-readonly. */
+        'aria-disabled'?: boolean;
+        /** Indicates what functions can be performed when a dragged object is released on the drop target.
+         * @deprecated in ARIA 1.1 */
+        'aria-dropeffect'?: 'none' | 'copy' | 'execute' | 'link' | 'move' | 'popup';
+        /** Identifies the element that provides an error message for the object.
+         * @see aria-invalid @see aria-describedby. */
+        'aria-errormessage'?: string;
+        /** Indicates whether the element, or another grouping element it controls, is currently expanded or collapsed. */
+        'aria-expanded'?: boolean;
+        /** Identifies the next element (or elements) in an alternate reading order of content which, at the user's discretion,
+         * allows assistive technology to override the general default of reading in document source order. */
+        'aria-flowto'?: string;
+        /** Indicates an element's "grabbed" state in a drag-and-drop operation.
+         * @deprecated in ARIA 1.1 */
+        'aria-grabbed'?: boolean;
+        /** Indicates the availability and type of interactive popup element, such as menu or dialog, that can be triggered by an
+         * element. */
+        'aria-haspopup'?: boolean | 'false' | 'true' | 'menu' | 'listbox' | 'tree' | 'grid' | 'dialog';
+        /** Indicates whether the element is exposed to an accessibility API.
+         * @see aria-disabled. */
+        'aria-hidden'?: boolean;
+        /** Indicates the entered value does not conform to the format expected by the application.
+         * @see aria-errormessage. */
+        'aria-invalid'?: boolean | 'false' | 'true' | 'grammar' | 'spelling';
+        /** Indicates keyboard shortcuts that an author has implemented to activate or give focus to an element. */
+        'aria-keyshortcuts'?: string;
+        /** Defines a string value that labels the current element.
+         * @see aria-labelledby. */
+        'aria-label'?: string;
+        /** Identifies the element (or elements) that labels the current element.
+         * @see aria-describedby. */
+        'aria-labelledby'?: string;
+        /** Defines the hierarchical level of an element within a structure. */
+        'aria-level'?: number;
+        /** Indicates that an element will be updated, and describes the types of updates the user agents, assistive technologies,
+         * and user can expect from the live region. */
+        'aria-live'?: 'off' | 'assertive' | 'polite';
+        /** Indicates whether an element is modal when displayed. */
+        'aria-modal'?: boolean;
+        /** Indicates whether a text box accepts multiple lines of input or only a single line. */
+        'aria-multiline'?: boolean;
+        /** Indicates that the user may select more than one item from the current selectable descendants. */
+        'aria-multiselectable'?: boolean;
+        /** Indicates whether the element's orientation is horizontal, vertical, or unknown/ambiguous. */
+        'aria-orientation'?: 'undefined' | 'horizontal' | 'vertical';
+        /** Identifies an element (or elements) in order to define a visual, functional, or contextual parent/child relationship
+         * between DOM
+         * elements where the DOM hierarchy cannot be used to represent the relationship.
+         * @see aria-controls. */
+        'aria-owns'?: string;
+        /** Defines a short hint (a word or short phrase) intended to aid the user with data entry when the control has no value.
+         * A hint could be a sample value or a brief description of the expected format. */
+        'aria-placeholder'?: string;
+        /** Defines an element's number or position in the current set of listitems or treeitems. Not required if all elements in
+         * the set are present in the DOM.
+         * @see aria-setsize. */
+        'aria-posinset'?: number;
+        /** Indicates the current "pressed" state of toggle buttons.
+         * @see aria-checked @see aria-selected. */
+        'aria-pressed'?: boolean | 'undefined' | 'false' | 'mixed' | 'true';
+        /** Indicates that the element is not editable, but is otherwise operable.
+         * @see aria-disabled. */
+        'aria-readonly'?: boolean;
+        /** Indicates what notifications the user agent will trigger when the accessibility tree within a live region is modified.
+         * @see aria-atomic. */
+        'aria-relevant'?: 'additions' | 'additions text' | 'all' | 'removals' | 'text';
+        /** Indicates that user input is required on the element before a form may be submitted. */
+        'aria-required'?: boolean;
+        /** Defines a human-readable, author-localized description for the role of an element. */
+        'aria-roledescription'?: string;
+        /** Defines the total number of rows in a table, grid, or treegrid.
+         * @see aria-rowindex. */
+        'aria-rowcount'?: number;
+        /** Defines an element's row index or position with respect to the total number of rows within a table, grid, or treegrid.
+         * @see aria-rowcount @see aria-rowspan. */
+        'aria-rowindex'?: number;
+        /** Defines the number of rows spanned by a cell or gridcell within a table, grid, or treegrid.
+         * @see aria-rowindex @see aria-colspan. */
+        'aria-rowspan'?: number;
+        /** Indicates the current "selected" state of various widgets.
+         * @see aria-checked @see aria-pressed. */
+        'aria-selected'?: boolean | 'undefined' | 'false' | 'true';
+        /** Defines the number of items in the current set of listitems or treeitems. Not required if all elements in the set are
+         * present in the DOM.
+         * @see aria-posinset. */
+        'aria-setsize'?: number;
+        /** Indicates if items in a table or grid are sorted in ascending or descending order. */
+        'aria-sort'?: 'none' | 'ascending' | 'descending' | 'other';
+        /** Defines the maximum allowed value for a range widget. */
+        'aria-valuemax'?: number;
+        /** Defines the minimum allowed value for a range widget. */
+        'aria-valuemin'?: number;
+        /** Defines the current value for a range widget.
+         * @see aria-valuetext. */
+        'aria-valuenow'?: number;
+        /** Defines the human readable text alternative of aria-valuenow for a range widget. */
+        'aria-valuetext'?: string;
+    }
+
     interface AllHTMLAttributes<T> extends HTMLAttributes<T> {
         // Standard HTML Attributes
         accept?: string;
diff --git a/types/react/v15/index.d.ts b/types/react/v15/index.d.ts
index 12b25439aa..72a14d9abb 100644
--- a/types/react/v15/index.d.ts
+++ b/types/react/v15/index.d.ts
@@ -2428,6 +2428,142 @@ declare namespace React {
         unselectable?: boolean;
     }
 
+    // All the WAI-ARIA 1.1 attributes
+    // https://www.w3.org/TR/wai-aria-1.1/
+    interface HTMLAttributes<T> extends DOMAttributes<T> {
+        /** Identifies the currently active element when DOM focus is on a composite widget, textbox, group, or application. */
+       'aria-activedescendant'?: string;
+       /** Indicates whether assistive technologies will present all, or only parts of, the changed region based on the change
+        * notifications defined by the aria-relevant attribute. */
+       'aria-atomic'?: boolean;
+       /** Indicates whether inputting text could trigger display of one or more predictions of the user's intended value for
+        * an input and specifies how predictions would be presented if they are made. */
+       'aria-autocomplete'?: 'none' | 'inline' | 'list' | 'both';
+       /** Indicates an element is being modified and that assistive technologies MAY want to wait until the modifications are
+        * complete before exposing them to the user. */
+       'aria-busy'?: boolean;
+       /** Indicates the current "checked" state of checkboxes, radio buttons, and other widgets.
+        * @see aria-pressed @see aria-selected. */
+       'aria-checked'?: boolean | 'false' | 'mixed' | 'true';
+       /** Defines the total number of columns in a table, grid, or treegrid.
+        * @see aria-colindex. */
+       'aria-colcount'?: number;
+       /** Defines an element's column index or position with respect to the total number of columns within a table, grid, or
+        * treegrid.
+        * @see aria-colcount @see aria-colspan. */
+       'aria-colindex'?: number;
+       /** Defines the number of columns spanned by a cell or gridcell within a table, grid, or treegrid.
+        *  @see aria-colindex @see aria-rowspan. */
+       'aria-colspan'?: number;
+       /** Indicates the element that represents the current item within a container or set of related elements. */
+       'aria-current'?: boolean | 'false' | 'true' | 'page' | 'step' | 'location' | 'date' | 'time';
+       /** Identifies the element (or elements) that describes the object.
+        * @see aria-labelledby */
+       'aria-describedby'?: string;
+       /** Identifies the element that provides a detailed, extended description for the object.
+        * @see aria-describedby. */
+       'aria-details'?: string;
+       /** Indicates that the element is perceivable but disabled, so it is not editable or otherwise operable.
+        * @see aria-hidden @see aria-readonly. */
+       'aria-disabled'?: boolean;
+       /** Indicates what functions can be performed when a dragged object is released on the drop target.
+        * @deprecated in ARIA 1.1 */
+       'aria-dropeffect'?: 'none' | 'copy' | 'execute' | 'link' | 'move' | 'popup';
+       /** Identifies the element that provides an error message for the object.
+        * @see aria-invalid @see aria-describedby. */
+       'aria-errormessage'?: string;
+       /** Indicates whether the element, or another grouping element it controls, is currently expanded or collapsed. */
+       'aria-expanded'?: boolean;
+       /** Identifies the next element (or elements) in an alternate reading order of content which, at the user's discretion,
+        * allows assistive technology to override the general default of reading in document source order. */
+       'aria-flowto'?: string;
+       /** Indicates an element's "grabbed" state in a drag-and-drop operation.
+        * @deprecated in ARIA 1.1 */
+       'aria-grabbed'?: boolean;
+       /** Indicates the availability and type of interactive popup element, such as menu or dialog, that can be triggered by an
+        * element. */
+       'aria-haspopup'?: boolean | 'false' | 'true' | 'menu' | 'listbox' | 'tree' | 'grid' | 'dialog';
+       /** Indicates whether the element is exposed to an accessibility API.
+        * @see aria-disabled. */
+       'aria-hidden'?: boolean;
+       /** Indicates the entered value does not conform to the format expected by the application.
+        * @see aria-errormessage. */
+       'aria-invalid'?: boolean | 'false' | 'true' | 'grammar' | 'spelling';
+       /** Indicates keyboard shortcuts that an author has implemented to activate or give focus to an element. */
+       'aria-keyshortcuts'?: string;
+       /** Defines a string value that labels the current element.
+        * @see aria-labelledby. */
+       'aria-label'?: string;
+       /** Identifies the element (or elements) that labels the current element.
+        * @see aria-describedby. */
+       'aria-labelledby'?: string;
+       /** Defines the hierarchical level of an element within a structure. */
+       'aria-level'?: number;
+       /** Indicates that an element will be updated, and describes the types of updates the user agents, assistive technologies,
+        * and user can expect from the live region. */
+       'aria-live'?: 'off' | 'assertive' | 'polite';
+       /** Indicates whether an element is modal when displayed. */
+       'aria-modal'?: boolean;
+       /** Indicates whether a text box accepts multiple lines of input or only a single line. */
+       'aria-multiline'?: boolean;
+       /** Indicates that the user may select more than one item from the current selectable descendants. */
+       'aria-multiselectable'?: boolean;
+       /** Indicates whether the element's orientation is horizontal, vertical, or unknown/ambiguous. */
+       'aria-orientation'?: 'undefined' | 'horizontal' | 'vertical';
+       /** Identifies an element (or elements) in order to define a visual, functional, or contextual parent/child relationship
+        * between DOM
+        * elements where the DOM hierarchy cannot be used to represent the relationship.
+        * @see aria-controls. */
+       'aria-owns'?: string;
+       /** Defines a short hint (a word or short phrase) intended to aid the user with data entry when the control has no value.
+        * A hint could be a sample value or a brief description of the expected format. */
+       'aria-placeholder'?: string;
+       /** Defines an element's number or position in the current set of listitems or treeitems. Not required if all elements in
+        * the set are present in the DOM.
+        * @see aria-setsize. */
+       'aria-posinset'?: number;
+       /** Indicates the current "pressed" state of toggle buttons.
+        * @see aria-checked @see aria-selected. */
+       'aria-pressed'?: boolean | 'undefined' | 'false' | 'mixed' | 'true';
+       /** Indicates that the element is not editable, but is otherwise operable.
+        * @see aria-disabled. */
+       'aria-readonly'?: boolean;
+       /** Indicates what notifications the user agent will trigger when the accessibility tree within a live region is modified.
+        * @see aria-atomic. */
+       'aria-relevant'?: 'additions' | 'additions text' | 'all' | 'removals' | 'text';
+       /** Indicates that user input is required on the element before a form may be submitted. */
+       'aria-required'?: boolean;
+       /** Defines a human-readable, author-localized description for the role of an element. */
+       'aria-roledescription'?: string;
+       /** Defines the total number of rows in a table, grid, or treegrid.
+        * @see aria-rowindex. */
+       'aria-rowcount'?: number;
+       /** Defines an element's row index or position with respect to the total number of rows within a table, grid, or treegrid.
+        * @see aria-rowcount @see aria-rowspan. */
+       'aria-rowindex'?: number;
+       /** Defines the number of rows spanned by a cell or gridcell within a table, grid, or treegrid.
+        * @see aria-rowindex @see aria-colspan. */
+       'aria-rowspan'?: number;
+       /** Indicates the current "selected" state of various widgets.
+        * @see aria-checked @see aria-pressed. */
+       'aria-selected'?: boolean | 'undefined' | 'false' | 'true';
+       /** Defines the number of items in the current set of listitems or treeitems. Not required if all elements in the set are
+        * present in the DOM.
+        * @see aria-posinset. */
+       'aria-setsize'?: number;
+       /** Indicates if items in a table or grid are sorted in ascending or descending order. */
+       'aria-sort'?: 'none' | 'ascending' | 'descending' | 'other';
+       /** Defines the maximum allowed value for a range widget. */
+       'aria-valuemax'?: number;
+       /** Defines the minimum allowed value for a range widget. */
+       'aria-valuemin'?: number;
+       /** Defines the current value for a range widget.
+        * @see aria-valuetext. */
+       'aria-valuenow'?: number;
+       /** Defines the human readable text alternative of aria-valuenow for a range widget. */
+       'aria-valuetext'?: string;
+   }
+
     interface AllHTMLAttributes<T> extends HTMLAttributes<T> {
         // Standard HTML Attributes
         accept?: string;

From 8ffe91a4d8eb3f647c6548a7c91ed0f180f37225 Mon Sep 17 00:00:00 2001
From: Craig Kovatch <cromas@gmail.com>
Date: Fri, 29 Dec 2017 18:05:53 -0800
Subject: [PATCH 0015/1382] Fix linting errors

---
 types/react/index.d.ts     | 191 +++++++++++++---------
 types/react/v15/index.d.ts | 313 +++++++++++++++++++++----------------
 2 files changed, 299 insertions(+), 205 deletions(-)

diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index a4784caa41..e3c3f53bb8 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -2498,79 +2498,105 @@ declare namespace React {
         unselectable?: boolean;
     }
 
-    // All the WAI-ARIA 1.1 attributes
-    // https://www.w3.org/TR/wai-aria-1.1/
+    // All the WAI-ARIA 1.1 attributes from https://www.w3.org/TR/wai-aria-1.1/
     interface HTMLAttributes<T> extends DOMAttributes<T> {
-         /** Identifies the currently active element when DOM focus is on a composite widget, textbox, group, or application. */
+        /** Identifies the currently active element when DOM focus is on a composite widget, textbox, group, or application. */
         'aria-activedescendant'?: string;
-        /** Indicates whether assistive technologies will present all, or only parts of, the changed region based on the change
-         * notifications defined by the aria-relevant attribute. */
+        /** Indicates whether assistive technologies will present all, or only parts of, the changed region based on the change notifications defined by the aria-relevant attribute. */
         'aria-atomic'?: boolean;
-        /** Indicates whether inputting text could trigger display of one or more predictions of the user's intended value for
-         * an input and specifies how predictions would be presented if they are made. */
+        /**
+         * Indicates whether inputting text could trigger display of one or more predictions of the user's intended value for an input and specifies how predictions would be
+         * presented if they are made.
+         */
         'aria-autocomplete'?: 'none' | 'inline' | 'list' | 'both';
-        /** Indicates an element is being modified and that assistive technologies MAY want to wait until the modifications are
-         * complete before exposing them to the user. */
+        /** Indicates an element is being modified and that assistive technologies MAY want to wait until the modifications are complete before exposing them to the user. */
         'aria-busy'?: boolean;
-        /** Indicates the current "checked" state of checkboxes, radio buttons, and other widgets.
-         * @see aria-pressed @see aria-selected. */
+        /**
+         * Indicates the current "checked" state of checkboxes, radio buttons, and other widgets.
+         * @see aria-pressed @see aria-selected.
+         */
         'aria-checked'?: boolean | 'false' | 'mixed' | 'true';
-        /** Defines the total number of columns in a table, grid, or treegrid.
-         * @see aria-colindex. */
+        /**
+         * Defines the total number of columns in a table, grid, or treegrid.
+         * @see aria-colindex.
+         */
         'aria-colcount'?: number;
-        /** Defines an element's column index or position with respect to the total number of columns within a table, grid, or
-         * treegrid.
-         * @see aria-colcount @see aria-colspan. */
+        /**
+         * Defines an element's column index or position with respect to the total number of columns within a table, grid, or treegrid.
+         * @see aria-colcount @see aria-colspan.
+         */
         'aria-colindex'?: number;
-        /** Defines the number of columns spanned by a cell or gridcell within a table, grid, or treegrid.
-         *  @see aria-colindex @see aria-rowspan. */
+        /**
+         * Defines the number of columns spanned by a cell or gridcell within a table, grid, or treegrid.
+         * @see aria-colindex @see aria-rowspan.
+         */
         'aria-colspan'?: number;
         /** Indicates the element that represents the current item within a container or set of related elements. */
         'aria-current'?: boolean | 'false' | 'true' | 'page' | 'step' | 'location' | 'date' | 'time';
-        /** Identifies the element (or elements) that describes the object.
-         * @see aria-labelledby */
+        /**
+         * Identifies the element (or elements) that describes the object.
+         * @see aria-labelledby
+         */
         'aria-describedby'?: string;
-        /** Identifies the element that provides a detailed, extended description for the object.
-         * @see aria-describedby. */
+        /**
+         * Identifies the element that provides a detailed, extended description for the object.
+         * @see aria-describedby.
+         */
         'aria-details'?: string;
-        /** Indicates that the element is perceivable but disabled, so it is not editable or otherwise operable.
-         * @see aria-hidden @see aria-readonly. */
+        /**
+         * Indicates that the element is perceivable but disabled, so it is not editable or otherwise operable.
+         * @see aria-hidden @see aria-readonly.
+         */
         'aria-disabled'?: boolean;
-        /** Indicates what functions can be performed when a dragged object is released on the drop target.
-         * @deprecated in ARIA 1.1 */
+        /**
+         * Indicates what functions can be performed when a dragged object is released on the drop target.
+         * @deprecated in ARIA 1.1
+         */
         'aria-dropeffect'?: 'none' | 'copy' | 'execute' | 'link' | 'move' | 'popup';
-        /** Identifies the element that provides an error message for the object.
-         * @see aria-invalid @see aria-describedby. */
+        /**
+         * Identifies the element that provides an error message for the object.
+         * @see aria-invalid @see aria-describedby.
+         */
         'aria-errormessage'?: string;
         /** Indicates whether the element, or another grouping element it controls, is currently expanded or collapsed. */
         'aria-expanded'?: boolean;
-        /** Identifies the next element (or elements) in an alternate reading order of content which, at the user's discretion,
-         * allows assistive technology to override the general default of reading in document source order. */
+        /**
+         * Identifies the next element (or elements) in an alternate reading order of content which, at the user's discretion,
+         * allows assistive technology to override the general default of reading in document source order.
+         */
         'aria-flowto'?: string;
-        /** Indicates an element's "grabbed" state in a drag-and-drop operation.
-         * @deprecated in ARIA 1.1 */
+        /**
+         * Indicates an element's "grabbed" state in a drag-and-drop operation.
+         * @deprecated in ARIA 1.1
+         */
         'aria-grabbed'?: boolean;
-        /** Indicates the availability and type of interactive popup element, such as menu or dialog, that can be triggered by an
-         * element. */
+        /** Indicates the availability and type of interactive popup element, such as menu or dialog, that can be triggered by an element. */
         'aria-haspopup'?: boolean | 'false' | 'true' | 'menu' | 'listbox' | 'tree' | 'grid' | 'dialog';
-        /** Indicates whether the element is exposed to an accessibility API.
-         * @see aria-disabled. */
+        /**
+         * Indicates whether the element is exposed to an accessibility API.
+         * @see aria-disabled.
+         */
         'aria-hidden'?: boolean;
-        /** Indicates the entered value does not conform to the format expected by the application.
-         * @see aria-errormessage. */
+        /**
+         * Indicates the entered value does not conform to the format expected by the application.
+         * @see aria-errormessage.
+         */
         'aria-invalid'?: boolean | 'false' | 'true' | 'grammar' | 'spelling';
         /** Indicates keyboard shortcuts that an author has implemented to activate or give focus to an element. */
         'aria-keyshortcuts'?: string;
-        /** Defines a string value that labels the current element.
-         * @see aria-labelledby. */
+        /**
+         * Defines a string value that labels the current element.
+         * @see aria-labelledby.
+         */
         'aria-label'?: string;
-        /** Identifies the element (or elements) that labels the current element.
-         * @see aria-describedby. */
+        /**
+         * Identifies the element (or elements) that labels the current element.
+         * @see aria-describedby.
+         */
         'aria-labelledby'?: string;
         /** Defines the hierarchical level of an element within a structure. */
         'aria-level'?: number;
-        /** Indicates that an element will be updated, and describes the types of updates the user agents, assistive technologies,
-         * and user can expect from the live region. */
+        /** Indicates that an element will be updated, and describes the types of updates the user agents, assistive technologies, and user can expect from the live region. */
         'aria-live'?: 'off' | 'assertive' | 'polite';
         /** Indicates whether an element is modal when displayed. */
         'aria-modal'?: boolean;
@@ -2580,46 +2606,65 @@ declare namespace React {
         'aria-multiselectable'?: boolean;
         /** Indicates whether the element's orientation is horizontal, vertical, or unknown/ambiguous. */
         'aria-orientation'?: 'undefined' | 'horizontal' | 'vertical';
-        /** Identifies an element (or elements) in order to define a visual, functional, or contextual parent/child relationship
-         * between DOM
-         * elements where the DOM hierarchy cannot be used to represent the relationship.
-         * @see aria-controls. */
+        /**
+         * Identifies an element (or elements) in order to define a visual, functional, or contextual parent/child relationship
+         * between DOM elements where the DOM hierarchy cannot be used to represent the relationship.
+         * @see aria-controls.
+         */
         'aria-owns'?: string;
-        /** Defines a short hint (a word or short phrase) intended to aid the user with data entry when the control has no value.
-         * A hint could be a sample value or a brief description of the expected format. */
+        /**
+         * Defines a short hint (a word or short phrase) intended to aid the user with data entry when the control has no value.
+         * A hint could be a sample value or a brief description of the expected format.
+         */
         'aria-placeholder'?: string;
-        /** Defines an element's number or position in the current set of listitems or treeitems. Not required if all elements in
-         * the set are present in the DOM.
-         * @see aria-setsize. */
+        /**
+         * Defines an element's number or position in the current set of listitems or treeitems. Not required if all elements in the set are present in the DOM.
+         * @see aria-setsize.
+         */
         'aria-posinset'?: number;
-        /** Indicates the current "pressed" state of toggle buttons.
-         * @see aria-checked @see aria-selected. */
+        /**
+         * Indicates the current "pressed" state of toggle buttons.
+         * @see aria-checked @see aria-selected.
+         */
         'aria-pressed'?: boolean | 'undefined' | 'false' | 'mixed' | 'true';
-        /** Indicates that the element is not editable, but is otherwise operable.
-         * @see aria-disabled. */
+        /**
+         * Indicates that the element is not editable, but is otherwise operable.
+         * @see aria-disabled.
+         */
         'aria-readonly'?: boolean;
-        /** Indicates what notifications the user agent will trigger when the accessibility tree within a live region is modified.
-         * @see aria-atomic. */
+        /**
+         * Indicates what notifications the user agent will trigger when the accessibility tree within a live region is modified.
+         * @see aria-atomic.
+         */
         'aria-relevant'?: 'additions' | 'additions text' | 'all' | 'removals' | 'text';
         /** Indicates that user input is required on the element before a form may be submitted. */
         'aria-required'?: boolean;
         /** Defines a human-readable, author-localized description for the role of an element. */
         'aria-roledescription'?: string;
-        /** Defines the total number of rows in a table, grid, or treegrid.
-         * @see aria-rowindex. */
+        /**
+         * Defines the total number of rows in a table, grid, or treegrid.
+         * @see aria-rowindex.
+         */
         'aria-rowcount'?: number;
-        /** Defines an element's row index or position with respect to the total number of rows within a table, grid, or treegrid.
-         * @see aria-rowcount @see aria-rowspan. */
+        /**
+         * Defines an element's row index or position with respect to the total number of rows within a table, grid, or treegrid.
+         * @see aria-rowcount @see aria-rowspan.
+         */
         'aria-rowindex'?: number;
-        /** Defines the number of rows spanned by a cell or gridcell within a table, grid, or treegrid.
-         * @see aria-rowindex @see aria-colspan. */
+        /**
+         * Defines the number of rows spanned by a cell or gridcell within a table, grid, or treegrid.
+         * @see aria-rowindex @see aria-colspan.
+         */
         'aria-rowspan'?: number;
-        /** Indicates the current "selected" state of various widgets.
-         * @see aria-checked @see aria-pressed. */
+        /**
+         * Indicates the current "selected" state of various widgets.
+         * @see aria-checked @see aria-pressed.
+         */
         'aria-selected'?: boolean | 'undefined' | 'false' | 'true';
-        /** Defines the number of items in the current set of listitems or treeitems. Not required if all elements in the set are
-         * present in the DOM.
-         * @see aria-posinset. */
+        /**
+         * Defines the number of items in the current set of listitems or treeitems. Not required if all elements in the set are present in the DOM.
+         * @see aria-posinset.
+         */
         'aria-setsize'?: number;
         /** Indicates if items in a table or grid are sorted in ascending or descending order. */
         'aria-sort'?: 'none' | 'ascending' | 'descending' | 'other';
@@ -2627,8 +2672,10 @@ declare namespace React {
         'aria-valuemax'?: number;
         /** Defines the minimum allowed value for a range widget. */
         'aria-valuemin'?: number;
-        /** Defines the current value for a range widget.
-         * @see aria-valuetext. */
+        /**
+         * Defines the current value for a range widget.
+         * @see aria-valuetext.
+         */
         'aria-valuenow'?: number;
         /** Defines the human readable text alternative of aria-valuenow for a range widget. */
         'aria-valuetext'?: string;
diff --git a/types/react/v15/index.d.ts b/types/react/v15/index.d.ts
index 72a14d9abb..5169c8d2e8 100644
--- a/types/react/v15/index.d.ts
+++ b/types/react/v15/index.d.ts
@@ -2428,141 +2428,188 @@ declare namespace React {
         unselectable?: boolean;
     }
 
-    // All the WAI-ARIA 1.1 attributes
-    // https://www.w3.org/TR/wai-aria-1.1/
+    // All the WAI-ARIA 1.1 attributes from https://www.w3.org/TR/wai-aria-1.1/
     interface HTMLAttributes<T> extends DOMAttributes<T> {
         /** Identifies the currently active element when DOM focus is on a composite widget, textbox, group, or application. */
-       'aria-activedescendant'?: string;
-       /** Indicates whether assistive technologies will present all, or only parts of, the changed region based on the change
-        * notifications defined by the aria-relevant attribute. */
-       'aria-atomic'?: boolean;
-       /** Indicates whether inputting text could trigger display of one or more predictions of the user's intended value for
-        * an input and specifies how predictions would be presented if they are made. */
-       'aria-autocomplete'?: 'none' | 'inline' | 'list' | 'both';
-       /** Indicates an element is being modified and that assistive technologies MAY want to wait until the modifications are
-        * complete before exposing them to the user. */
-       'aria-busy'?: boolean;
-       /** Indicates the current "checked" state of checkboxes, radio buttons, and other widgets.
-        * @see aria-pressed @see aria-selected. */
-       'aria-checked'?: boolean | 'false' | 'mixed' | 'true';
-       /** Defines the total number of columns in a table, grid, or treegrid.
-        * @see aria-colindex. */
-       'aria-colcount'?: number;
-       /** Defines an element's column index or position with respect to the total number of columns within a table, grid, or
-        * treegrid.
-        * @see aria-colcount @see aria-colspan. */
-       'aria-colindex'?: number;
-       /** Defines the number of columns spanned by a cell or gridcell within a table, grid, or treegrid.
-        *  @see aria-colindex @see aria-rowspan. */
-       'aria-colspan'?: number;
-       /** Indicates the element that represents the current item within a container or set of related elements. */
-       'aria-current'?: boolean | 'false' | 'true' | 'page' | 'step' | 'location' | 'date' | 'time';
-       /** Identifies the element (or elements) that describes the object.
-        * @see aria-labelledby */
-       'aria-describedby'?: string;
-       /** Identifies the element that provides a detailed, extended description for the object.
-        * @see aria-describedby. */
-       'aria-details'?: string;
-       /** Indicates that the element is perceivable but disabled, so it is not editable or otherwise operable.
-        * @see aria-hidden @see aria-readonly. */
-       'aria-disabled'?: boolean;
-       /** Indicates what functions can be performed when a dragged object is released on the drop target.
-        * @deprecated in ARIA 1.1 */
-       'aria-dropeffect'?: 'none' | 'copy' | 'execute' | 'link' | 'move' | 'popup';
-       /** Identifies the element that provides an error message for the object.
-        * @see aria-invalid @see aria-describedby. */
-       'aria-errormessage'?: string;
-       /** Indicates whether the element, or another grouping element it controls, is currently expanded or collapsed. */
-       'aria-expanded'?: boolean;
-       /** Identifies the next element (or elements) in an alternate reading order of content which, at the user's discretion,
-        * allows assistive technology to override the general default of reading in document source order. */
-       'aria-flowto'?: string;
-       /** Indicates an element's "grabbed" state in a drag-and-drop operation.
-        * @deprecated in ARIA 1.1 */
-       'aria-grabbed'?: boolean;
-       /** Indicates the availability and type of interactive popup element, such as menu or dialog, that can be triggered by an
-        * element. */
-       'aria-haspopup'?: boolean | 'false' | 'true' | 'menu' | 'listbox' | 'tree' | 'grid' | 'dialog';
-       /** Indicates whether the element is exposed to an accessibility API.
-        * @see aria-disabled. */
-       'aria-hidden'?: boolean;
-       /** Indicates the entered value does not conform to the format expected by the application.
-        * @see aria-errormessage. */
-       'aria-invalid'?: boolean | 'false' | 'true' | 'grammar' | 'spelling';
-       /** Indicates keyboard shortcuts that an author has implemented to activate or give focus to an element. */
-       'aria-keyshortcuts'?: string;
-       /** Defines a string value that labels the current element.
-        * @see aria-labelledby. */
-       'aria-label'?: string;
-       /** Identifies the element (or elements) that labels the current element.
-        * @see aria-describedby. */
-       'aria-labelledby'?: string;
-       /** Defines the hierarchical level of an element within a structure. */
-       'aria-level'?: number;
-       /** Indicates that an element will be updated, and describes the types of updates the user agents, assistive technologies,
-        * and user can expect from the live region. */
-       'aria-live'?: 'off' | 'assertive' | 'polite';
-       /** Indicates whether an element is modal when displayed. */
-       'aria-modal'?: boolean;
-       /** Indicates whether a text box accepts multiple lines of input or only a single line. */
-       'aria-multiline'?: boolean;
-       /** Indicates that the user may select more than one item from the current selectable descendants. */
-       'aria-multiselectable'?: boolean;
-       /** Indicates whether the element's orientation is horizontal, vertical, or unknown/ambiguous. */
-       'aria-orientation'?: 'undefined' | 'horizontal' | 'vertical';
-       /** Identifies an element (or elements) in order to define a visual, functional, or contextual parent/child relationship
-        * between DOM
-        * elements where the DOM hierarchy cannot be used to represent the relationship.
-        * @see aria-controls. */
-       'aria-owns'?: string;
-       /** Defines a short hint (a word or short phrase) intended to aid the user with data entry when the control has no value.
-        * A hint could be a sample value or a brief description of the expected format. */
-       'aria-placeholder'?: string;
-       /** Defines an element's number or position in the current set of listitems or treeitems. Not required if all elements in
-        * the set are present in the DOM.
-        * @see aria-setsize. */
-       'aria-posinset'?: number;
-       /** Indicates the current "pressed" state of toggle buttons.
-        * @see aria-checked @see aria-selected. */
-       'aria-pressed'?: boolean | 'undefined' | 'false' | 'mixed' | 'true';
-       /** Indicates that the element is not editable, but is otherwise operable.
-        * @see aria-disabled. */
-       'aria-readonly'?: boolean;
-       /** Indicates what notifications the user agent will trigger when the accessibility tree within a live region is modified.
-        * @see aria-atomic. */
-       'aria-relevant'?: 'additions' | 'additions text' | 'all' | 'removals' | 'text';
-       /** Indicates that user input is required on the element before a form may be submitted. */
-       'aria-required'?: boolean;
-       /** Defines a human-readable, author-localized description for the role of an element. */
-       'aria-roledescription'?: string;
-       /** Defines the total number of rows in a table, grid, or treegrid.
-        * @see aria-rowindex. */
-       'aria-rowcount'?: number;
-       /** Defines an element's row index or position with respect to the total number of rows within a table, grid, or treegrid.
-        * @see aria-rowcount @see aria-rowspan. */
-       'aria-rowindex'?: number;
-       /** Defines the number of rows spanned by a cell or gridcell within a table, grid, or treegrid.
-        * @see aria-rowindex @see aria-colspan. */
-       'aria-rowspan'?: number;
-       /** Indicates the current "selected" state of various widgets.
-        * @see aria-checked @see aria-pressed. */
-       'aria-selected'?: boolean | 'undefined' | 'false' | 'true';
-       /** Defines the number of items in the current set of listitems or treeitems. Not required if all elements in the set are
-        * present in the DOM.
-        * @see aria-posinset. */
-       'aria-setsize'?: number;
-       /** Indicates if items in a table or grid are sorted in ascending or descending order. */
-       'aria-sort'?: 'none' | 'ascending' | 'descending' | 'other';
-       /** Defines the maximum allowed value for a range widget. */
-       'aria-valuemax'?: number;
-       /** Defines the minimum allowed value for a range widget. */
-       'aria-valuemin'?: number;
-       /** Defines the current value for a range widget.
-        * @see aria-valuetext. */
-       'aria-valuenow'?: number;
-       /** Defines the human readable text alternative of aria-valuenow for a range widget. */
-       'aria-valuetext'?: string;
-   }
+        'aria-activedescendant'?: string;
+        /** Indicates whether assistive technologies will present all, or only parts of, the changed region based on the change notifications defined by the aria-relevant attribute. */
+        'aria-atomic'?: boolean;
+        /**
+         * Indicates whether inputting text could trigger display of one or more predictions of the user's intended value for an input and specifies how predictions would be
+         * presented if they are made.
+         */
+        'aria-autocomplete'?: 'none' | 'inline' | 'list' | 'both';
+        /** Indicates an element is being modified and that assistive technologies MAY want to wait until the modifications are complete before exposing them to the user. */
+        'aria-busy'?: boolean;
+        /**
+         * Indicates the current "checked" state of checkboxes, radio buttons, and other widgets.
+         * @see aria-pressed @see aria-selected.
+         */
+        'aria-checked'?: boolean | 'false' | 'mixed' | 'true';
+        /**
+         * Defines the total number of columns in a table, grid, or treegrid.
+         * @see aria-colindex.
+         */
+        'aria-colcount'?: number;
+        /**
+         * Defines an element's column index or position with respect to the total number of columns within a table, grid, or treegrid.
+         * @see aria-colcount @see aria-colspan.
+         */
+        'aria-colindex'?: number;
+        /**
+         * Defines the number of columns spanned by a cell or gridcell within a table, grid, or treegrid.
+         * @see aria-colindex @see aria-rowspan.
+         */
+        'aria-colspan'?: number;
+        /** Indicates the element that represents the current item within a container or set of related elements. */
+        'aria-current'?: boolean | 'false' | 'true' | 'page' | 'step' | 'location' | 'date' | 'time';
+        /**
+         * Identifies the element (or elements) that describes the object.
+         * @see aria-labelledby
+         */
+        'aria-describedby'?: string;
+        /**
+         * Identifies the element that provides a detailed, extended description for the object.
+         * @see aria-describedby.
+         */
+        'aria-details'?: string;
+        /**
+         * Indicates that the element is perceivable but disabled, so it is not editable or otherwise operable.
+         * @see aria-hidden @see aria-readonly.
+         */
+        'aria-disabled'?: boolean;
+        /**
+         * Indicates what functions can be performed when a dragged object is released on the drop target.
+         * @deprecated in ARIA 1.1
+         */
+        'aria-dropeffect'?: 'none' | 'copy' | 'execute' | 'link' | 'move' | 'popup';
+        /**
+         * Identifies the element that provides an error message for the object.
+         * @see aria-invalid @see aria-describedby.
+         */
+        'aria-errormessage'?: string;
+        /** Indicates whether the element, or another grouping element it controls, is currently expanded or collapsed. */
+        'aria-expanded'?: boolean;
+        /**
+         * Identifies the next element (or elements) in an alternate reading order of content which, at the user's discretion,
+         * allows assistive technology to override the general default of reading in document source order.
+         */
+        'aria-flowto'?: string;
+        /**
+         * Indicates an element's "grabbed" state in a drag-and-drop operation.
+         * @deprecated in ARIA 1.1
+         */
+        'aria-grabbed'?: boolean;
+        /** Indicates the availability and type of interactive popup element, such as menu or dialog, that can be triggered by an element. */
+        'aria-haspopup'?: boolean | 'false' | 'true' | 'menu' | 'listbox' | 'tree' | 'grid' | 'dialog';
+        /**
+         * Indicates whether the element is exposed to an accessibility API.
+         * @see aria-disabled.
+         */
+        'aria-hidden'?: boolean;
+        /**
+         * Indicates the entered value does not conform to the format expected by the application.
+         * @see aria-errormessage.
+         */
+        'aria-invalid'?: boolean | 'false' | 'true' | 'grammar' | 'spelling';
+        /** Indicates keyboard shortcuts that an author has implemented to activate or give focus to an element. */
+        'aria-keyshortcuts'?: string;
+        /**
+         * Defines a string value that labels the current element.
+         * @see aria-labelledby.
+         */
+        'aria-label'?: string;
+        /**
+         * Identifies the element (or elements) that labels the current element.
+         * @see aria-describedby.
+         */
+        'aria-labelledby'?: string;
+        /** Defines the hierarchical level of an element within a structure. */
+        'aria-level'?: number;
+        /** Indicates that an element will be updated, and describes the types of updates the user agents, assistive technologies, and user can expect from the live region. */
+        'aria-live'?: 'off' | 'assertive' | 'polite';
+        /** Indicates whether an element is modal when displayed. */
+        'aria-modal'?: boolean;
+        /** Indicates whether a text box accepts multiple lines of input or only a single line. */
+        'aria-multiline'?: boolean;
+        /** Indicates that the user may select more than one item from the current selectable descendants. */
+        'aria-multiselectable'?: boolean;
+        /** Indicates whether the element's orientation is horizontal, vertical, or unknown/ambiguous. */
+        'aria-orientation'?: 'undefined' | 'horizontal' | 'vertical';
+        /**
+         * Identifies an element (or elements) in order to define a visual, functional, or contextual parent/child relationship
+         * between DOM elements where the DOM hierarchy cannot be used to represent the relationship.
+         * @see aria-controls.
+         */
+        'aria-owns'?: string;
+        /**
+         * Defines a short hint (a word or short phrase) intended to aid the user with data entry when the control has no value.
+         * A hint could be a sample value or a brief description of the expected format.
+         */
+        'aria-placeholder'?: string;
+        /**
+         * Defines an element's number or position in the current set of listitems or treeitems. Not required if all elements in the set are present in the DOM.
+         * @see aria-setsize.
+         */
+        'aria-posinset'?: number;
+        /**
+         * Indicates the current "pressed" state of toggle buttons.
+         * @see aria-checked @see aria-selected.
+         */
+        'aria-pressed'?: boolean | 'undefined' | 'false' | 'mixed' | 'true';
+        /**
+         * Indicates that the element is not editable, but is otherwise operable.
+         * @see aria-disabled.
+         */
+        'aria-readonly'?: boolean;
+        /**
+         * Indicates what notifications the user agent will trigger when the accessibility tree within a live region is modified.
+         * @see aria-atomic.
+         */
+        'aria-relevant'?: 'additions' | 'additions text' | 'all' | 'removals' | 'text';
+        /** Indicates that user input is required on the element before a form may be submitted. */
+        'aria-required'?: boolean;
+        /** Defines a human-readable, author-localized description for the role of an element. */
+        'aria-roledescription'?: string;
+        /**
+         * Defines the total number of rows in a table, grid, or treegrid.
+         * @see aria-rowindex.
+         */
+        'aria-rowcount'?: number;
+        /**
+         * Defines an element's row index or position with respect to the total number of rows within a table, grid, or treegrid.
+         * @see aria-rowcount @see aria-rowspan.
+         */
+        'aria-rowindex'?: number;
+        /**
+         * Defines the number of rows spanned by a cell or gridcell within a table, grid, or treegrid.
+         * @see aria-rowindex @see aria-colspan.
+         */
+        'aria-rowspan'?: number;
+        /**
+         * Indicates the current "selected" state of various widgets.
+         * @see aria-checked @see aria-pressed.
+         */
+        'aria-selected'?: boolean | 'undefined' | 'false' | 'true';
+        /**
+         * Defines the number of items in the current set of listitems or treeitems. Not required if all elements in the set are present in the DOM.
+         * @see aria-posinset.
+         */
+        'aria-setsize'?: number;
+        /** Indicates if items in a table or grid are sorted in ascending or descending order. */
+        'aria-sort'?: 'none' | 'ascending' | 'descending' | 'other';
+        /** Defines the maximum allowed value for a range widget. */
+        'aria-valuemax'?: number;
+        /** Defines the minimum allowed value for a range widget. */
+        'aria-valuemin'?: number;
+        /**
+         * Defines the current value for a range widget.
+         * @see aria-valuetext.
+         */
+        'aria-valuenow'?: number;
+        /** Defines the human readable text alternative of aria-valuenow for a range widget. */
+        'aria-valuetext'?: string;
+    }
 
     interface AllHTMLAttributes<T> extends HTMLAttributes<T> {
         // Standard HTML Attributes

From eebfcef80eec96a3c823b0e73e32f297050241bf Mon Sep 17 00:00:00 2001
From: Craig Kovatch <cromas@gmail.com>
Date: Thu, 4 Jan 2018 14:23:28 -0800
Subject: [PATCH 0016/1382] Add 'true' and 'false' options to boolean
 attributes, remove incorrect 'undefined' options

---
 types/react/index.d.ts     | 28 ++++++++++++++--------------
 types/react/v15/index.d.ts | 28 ++++++++++++++--------------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index e3c3f53bb8..9277ed2986 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -2503,14 +2503,14 @@ declare namespace React {
         /** Identifies the currently active element when DOM focus is on a composite widget, textbox, group, or application. */
         'aria-activedescendant'?: string;
         /** Indicates whether assistive technologies will present all, or only parts of, the changed region based on the change notifications defined by the aria-relevant attribute. */
-        'aria-atomic'?: boolean;
+        'aria-atomic'?: boolean | 'false' | 'true';
         /**
          * Indicates whether inputting text could trigger display of one or more predictions of the user's intended value for an input and specifies how predictions would be
          * presented if they are made.
          */
         'aria-autocomplete'?: 'none' | 'inline' | 'list' | 'both';
         /** Indicates an element is being modified and that assistive technologies MAY want to wait until the modifications are complete before exposing them to the user. */
-        'aria-busy'?: boolean;
+        'aria-busy'?: boolean | 'false' | 'true';
         /**
          * Indicates the current "checked" state of checkboxes, radio buttons, and other widgets.
          * @see aria-pressed @see aria-selected.
@@ -2547,7 +2547,7 @@ declare namespace React {
          * Indicates that the element is perceivable but disabled, so it is not editable or otherwise operable.
          * @see aria-hidden @see aria-readonly.
          */
-        'aria-disabled'?: boolean;
+        'aria-disabled'?: boolean | 'false' | 'true';
         /**
          * Indicates what functions can be performed when a dragged object is released on the drop target.
          * @deprecated in ARIA 1.1
@@ -2559,7 +2559,7 @@ declare namespace React {
          */
         'aria-errormessage'?: string;
         /** Indicates whether the element, or another grouping element it controls, is currently expanded or collapsed. */
-        'aria-expanded'?: boolean;
+        'aria-expanded'?: boolean | 'false' | 'true';
         /**
          * Identifies the next element (or elements) in an alternate reading order of content which, at the user's discretion,
          * allows assistive technology to override the general default of reading in document source order.
@@ -2569,14 +2569,14 @@ declare namespace React {
          * Indicates an element's "grabbed" state in a drag-and-drop operation.
          * @deprecated in ARIA 1.1
          */
-        'aria-grabbed'?: boolean;
+        'aria-grabbed'?: boolean | 'false' | 'true';
         /** Indicates the availability and type of interactive popup element, such as menu or dialog, that can be triggered by an element. */
         'aria-haspopup'?: boolean | 'false' | 'true' | 'menu' | 'listbox' | 'tree' | 'grid' | 'dialog';
         /**
          * Indicates whether the element is exposed to an accessibility API.
          * @see aria-disabled.
          */
-        'aria-hidden'?: boolean;
+        'aria-hidden'?: boolean | 'false' | 'true';
         /**
          * Indicates the entered value does not conform to the format expected by the application.
          * @see aria-errormessage.
@@ -2599,13 +2599,13 @@ declare namespace React {
         /** Indicates that an element will be updated, and describes the types of updates the user agents, assistive technologies, and user can expect from the live region. */
         'aria-live'?: 'off' | 'assertive' | 'polite';
         /** Indicates whether an element is modal when displayed. */
-        'aria-modal'?: boolean;
+        'aria-modal'?: boolean | 'false' | 'true';
         /** Indicates whether a text box accepts multiple lines of input or only a single line. */
-        'aria-multiline'?: boolean;
+        'aria-multiline'?: boolean | 'false' | 'true';
         /** Indicates that the user may select more than one item from the current selectable descendants. */
-        'aria-multiselectable'?: boolean;
+        'aria-multiselectable'?: boolean | 'false' | 'true';
         /** Indicates whether the element's orientation is horizontal, vertical, or unknown/ambiguous. */
-        'aria-orientation'?: 'undefined' | 'horizontal' | 'vertical';
+        'aria-orientation'?: 'horizontal' | 'vertical';
         /**
          * Identifies an element (or elements) in order to define a visual, functional, or contextual parent/child relationship
          * between DOM elements where the DOM hierarchy cannot be used to represent the relationship.
@@ -2626,19 +2626,19 @@ declare namespace React {
          * Indicates the current "pressed" state of toggle buttons.
          * @see aria-checked @see aria-selected.
          */
-        'aria-pressed'?: boolean | 'undefined' | 'false' | 'mixed' | 'true';
+        'aria-pressed'?: boolean | 'false' | 'mixed' | 'true';
         /**
          * Indicates that the element is not editable, but is otherwise operable.
          * @see aria-disabled.
          */
-        'aria-readonly'?: boolean;
+        'aria-readonly'?: boolean | 'false' | 'true';
         /**
          * Indicates what notifications the user agent will trigger when the accessibility tree within a live region is modified.
          * @see aria-atomic.
          */
         'aria-relevant'?: 'additions' | 'additions text' | 'all' | 'removals' | 'text';
         /** Indicates that user input is required on the element before a form may be submitted. */
-        'aria-required'?: boolean;
+        'aria-required'?: boolean | 'false' | 'true';
         /** Defines a human-readable, author-localized description for the role of an element. */
         'aria-roledescription'?: string;
         /**
@@ -2660,7 +2660,7 @@ declare namespace React {
          * Indicates the current "selected" state of various widgets.
          * @see aria-checked @see aria-pressed.
          */
-        'aria-selected'?: boolean | 'undefined' | 'false' | 'true';
+        'aria-selected'?: boolean | 'false' | 'true';
         /**
          * Defines the number of items in the current set of listitems or treeitems. Not required if all elements in the set are present in the DOM.
          * @see aria-posinset.
diff --git a/types/react/v15/index.d.ts b/types/react/v15/index.d.ts
index 5169c8d2e8..797d21f0d8 100644
--- a/types/react/v15/index.d.ts
+++ b/types/react/v15/index.d.ts
@@ -2433,14 +2433,14 @@ declare namespace React {
         /** Identifies the currently active element when DOM focus is on a composite widget, textbox, group, or application. */
         'aria-activedescendant'?: string;
         /** Indicates whether assistive technologies will present all, or only parts of, the changed region based on the change notifications defined by the aria-relevant attribute. */
-        'aria-atomic'?: boolean;
+        'aria-atomic'?: boolean | 'false' | 'true';
         /**
          * Indicates whether inputting text could trigger display of one or more predictions of the user's intended value for an input and specifies how predictions would be
          * presented if they are made.
          */
         'aria-autocomplete'?: 'none' | 'inline' | 'list' | 'both';
         /** Indicates an element is being modified and that assistive technologies MAY want to wait until the modifications are complete before exposing them to the user. */
-        'aria-busy'?: boolean;
+        'aria-busy'?: boolean | 'false' | 'true';
         /**
          * Indicates the current "checked" state of checkboxes, radio buttons, and other widgets.
          * @see aria-pressed @see aria-selected.
@@ -2477,7 +2477,7 @@ declare namespace React {
          * Indicates that the element is perceivable but disabled, so it is not editable or otherwise operable.
          * @see aria-hidden @see aria-readonly.
          */
-        'aria-disabled'?: boolean;
+        'aria-disabled'?: boolean | 'false' | 'true';
         /**
          * Indicates what functions can be performed when a dragged object is released on the drop target.
          * @deprecated in ARIA 1.1
@@ -2489,7 +2489,7 @@ declare namespace React {
          */
         'aria-errormessage'?: string;
         /** Indicates whether the element, or another grouping element it controls, is currently expanded or collapsed. */
-        'aria-expanded'?: boolean;
+        'aria-expanded'?: boolean | 'false' | 'true';
         /**
          * Identifies the next element (or elements) in an alternate reading order of content which, at the user's discretion,
          * allows assistive technology to override the general default of reading in document source order.
@@ -2499,14 +2499,14 @@ declare namespace React {
          * Indicates an element's "grabbed" state in a drag-and-drop operation.
          * @deprecated in ARIA 1.1
          */
-        'aria-grabbed'?: boolean;
+        'aria-grabbed'?: boolean | 'false' | 'true';
         /** Indicates the availability and type of interactive popup element, such as menu or dialog, that can be triggered by an element. */
         'aria-haspopup'?: boolean | 'false' | 'true' | 'menu' | 'listbox' | 'tree' | 'grid' | 'dialog';
         /**
          * Indicates whether the element is exposed to an accessibility API.
          * @see aria-disabled.
          */
-        'aria-hidden'?: boolean;
+        'aria-hidden'?: boolean | 'false' | 'true';
         /**
          * Indicates the entered value does not conform to the format expected by the application.
          * @see aria-errormessage.
@@ -2529,13 +2529,13 @@ declare namespace React {
         /** Indicates that an element will be updated, and describes the types of updates the user agents, assistive technologies, and user can expect from the live region. */
         'aria-live'?: 'off' | 'assertive' | 'polite';
         /** Indicates whether an element is modal when displayed. */
-        'aria-modal'?: boolean;
+        'aria-modal'?: boolean | 'false' | 'true';
         /** Indicates whether a text box accepts multiple lines of input or only a single line. */
-        'aria-multiline'?: boolean;
+        'aria-multiline'?: boolean | 'false' | 'true';
         /** Indicates that the user may select more than one item from the current selectable descendants. */
-        'aria-multiselectable'?: boolean;
+        'aria-multiselectable'?: boolean | 'false' | 'true';
         /** Indicates whether the element's orientation is horizontal, vertical, or unknown/ambiguous. */
-        'aria-orientation'?: 'undefined' | 'horizontal' | 'vertical';
+        'aria-orientation'?: 'horizontal' | 'vertical';
         /**
          * Identifies an element (or elements) in order to define a visual, functional, or contextual parent/child relationship
          * between DOM elements where the DOM hierarchy cannot be used to represent the relationship.
@@ -2556,19 +2556,19 @@ declare namespace React {
          * Indicates the current "pressed" state of toggle buttons.
          * @see aria-checked @see aria-selected.
          */
-        'aria-pressed'?: boolean | 'undefined' | 'false' | 'mixed' | 'true';
+        'aria-pressed'?: boolean | 'false' | 'mixed' | 'true';
         /**
          * Indicates that the element is not editable, but is otherwise operable.
          * @see aria-disabled.
          */
-        'aria-readonly'?: boolean;
+        'aria-readonly'?: boolean | 'false' | 'true';
         /**
          * Indicates what notifications the user agent will trigger when the accessibility tree within a live region is modified.
          * @see aria-atomic.
          */
         'aria-relevant'?: 'additions' | 'additions text' | 'all' | 'removals' | 'text';
         /** Indicates that user input is required on the element before a form may be submitted. */
-        'aria-required'?: boolean;
+        'aria-required'?: boolean | 'false' | 'true';
         /** Defines a human-readable, author-localized description for the role of an element. */
         'aria-roledescription'?: string;
         /**
@@ -2590,7 +2590,7 @@ declare namespace React {
          * Indicates the current "selected" state of various widgets.
          * @see aria-checked @see aria-pressed.
          */
-        'aria-selected'?: boolean | 'undefined' | 'false' | 'true';
+        'aria-selected'?: boolean | 'false' | 'true';
         /**
          * Defines the number of items in the current set of listitems or treeitems. Not required if all elements in the set are present in the DOM.
          * @see aria-posinset.

From 0565f573b66721dd76b625ed3696ecc561d8b95d Mon Sep 17 00:00:00 2001
From: Craig Kovatch <cromas@gmail.com>
Date: Sat, 6 Jan 2018 11:11:44 -0800
Subject: [PATCH 0017/1382] Add tests

---
 types/react/test/index.ts     |  6 +++++-
 types/react/test/tsx.tsx      | 11 +++++++++++
 types/react/v15/test/index.ts |  6 +++++-
 types/react/v15/test/tsx.tsx  | 11 +++++++++++
 4 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/types/react/test/index.ts b/types/react/test/index.ts
index e8aabfa35c..06a72c2bcb 100644
--- a/types/react/test/index.ts
+++ b/types/react/test/index.ts
@@ -307,7 +307,11 @@ const htmlAttr: React.HTMLProps<HTMLElement> = {
     },
     dangerouslySetInnerHTML: {
         __html: "<strong>STRONG</strong>"
-    }
+    },
+    'aria-atomic': false,
+    'aria-checked': 'true',
+    'aria-colcount': 7,
+    'aria-label': 'test'
 };
 DOM.div(htmlAttr);
 DOM.span(htmlAttr);
diff --git a/types/react/test/tsx.tsx b/types/react/test/tsx.tsx
index 38d902c387..26c2ff9d41 100644
--- a/types/react/test/tsx.tsx
+++ b/types/react/test/tsx.tsx
@@ -41,6 +41,17 @@ StatelessComponent2.defaultProps = {
     <b>foo</b>
 </div>;
 
+// WAI-ARIA 1.1 Attributes
+<div
+    aria-atomic={false}
+    aria-checked='true'
+    aria-colcount={7}
+    aria-label='test'
+    ariaExpanded='false' // $ExpectError
+>
+    <b>bar</b>
+</div>;
+
 interface Props {
     hello: string;
 }
diff --git a/types/react/v15/test/index.ts b/types/react/v15/test/index.ts
index 340ea94ec2..e4b324916d 100644
--- a/types/react/v15/test/index.ts
+++ b/types/react/v15/test/index.ts
@@ -346,7 +346,11 @@ const htmlAttr: React.HTMLProps<HTMLElement> = {
     },
     dangerouslySetInnerHTML: {
         __html: "<strong>STRONG</strong>"
-    }
+    },
+    'aria-atomic': false,
+    'aria-checked': 'true',
+    'aria-colcount': 7,
+    'aria-label': 'test'
 };
 React.DOM.div(htmlAttr);
 React.DOM.span(htmlAttr);
diff --git a/types/react/v15/test/tsx.tsx b/types/react/v15/test/tsx.tsx
index 8afb75d9a8..7f781cb8fc 100644
--- a/types/react/v15/test/tsx.tsx
+++ b/types/react/v15/test/tsx.tsx
@@ -41,6 +41,17 @@ StatelessComponent2.defaultProps = {
     <b>foo</b>
 </div>;
 
+// WAI-ARIA 1.1 Attributes
+<div
+    aria-atomic={false}
+    aria-checked='true'
+    aria-colcount={7}
+    aria-label='test'
+    ariaExpanded='false' // $ExpectError
+>
+    <b>bar</b>
+</div>;
+
 interface Props {
     hello: string;
 }

From b540b2e9e0f95ebb59798bbf4dff5d8c36dd5041 Mon Sep 17 00:00:00 2001
From: Craig Kovatch <cromas@gmail.com>
Date: Sat, 6 Jan 2018 11:13:19 -0800
Subject: [PATCH 0018/1382] Revert incorrect use of $ExpectError

---
 types/react/test/tsx.tsx     | 1 -
 types/react/v15/test/tsx.tsx | 1 -
 2 files changed, 2 deletions(-)

diff --git a/types/react/test/tsx.tsx b/types/react/test/tsx.tsx
index 26c2ff9d41..bc48add9a4 100644
--- a/types/react/test/tsx.tsx
+++ b/types/react/test/tsx.tsx
@@ -47,7 +47,6 @@ StatelessComponent2.defaultProps = {
     aria-checked='true'
     aria-colcount={7}
     aria-label='test'
-    ariaExpanded='false' // $ExpectError
 >
     <b>bar</b>
 </div>;
diff --git a/types/react/v15/test/tsx.tsx b/types/react/v15/test/tsx.tsx
index 7f781cb8fc..289a912a3f 100644
--- a/types/react/v15/test/tsx.tsx
+++ b/types/react/v15/test/tsx.tsx
@@ -47,7 +47,6 @@ StatelessComponent2.defaultProps = {
     aria-checked='true'
     aria-colcount={7}
     aria-label='test'
-    ariaExpanded='false' // $ExpectError
 >
     <b>bar</b>
 </div>;

From 3cda7bec3b72d0fb0b2d1ca554939856c620c512 Mon Sep 17 00:00:00 2001
From: Jovica Zoric <zoricjovica@gmail.com>
Date: Thu, 11 Jan 2018 15:14:01 +0100
Subject: [PATCH 0019/1382] Add missing placeholderRenderer prop

---
 types/react-sortable-tree/index.d.ts                  |  9 +++++++++
 .../react-sortable-tree/react-sortable-tree-tests.tsx | 11 ++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/types/react-sortable-tree/index.d.ts b/types/react-sortable-tree/index.d.ts
index dfed930e2f..2b9d1d1a6c 100644
--- a/types/react-sortable-tree/index.d.ts
+++ b/types/react-sortable-tree/index.d.ts
@@ -87,6 +87,14 @@ export interface NodeRendererProps {
     canDrop?: boolean;
 }
 
+export type PlaceholderRenderer = React.ComponentClass<PlaceholderRendererProps>;
+
+export interface PlaceholderRendererProps {
+    isOver: boolean;
+    canDrop: boolean;
+    draggedNode: {[index: string]: any};
+}
+
 type NumberArrayOrStringArray = string[] | number[];
 
 export interface ReactSortableTreeProps {
@@ -113,6 +121,7 @@ export interface ReactSortableTreeProps {
     isVirtualized?: boolean;
     nodeContentRenderer?: NodeRenderer;
     dndType?: string;
+    placeholderRenderer?: PlaceholderRenderer;
 }
 
 declare const SortableTree: React.ComponentClass<ReactSortableTreeProps>;
diff --git a/types/react-sortable-tree/react-sortable-tree-tests.tsx b/types/react-sortable-tree/react-sortable-tree-tests.tsx
index 106415744b..154a7284c6 100644
--- a/types/react-sortable-tree/react-sortable-tree-tests.tsx
+++ b/types/react-sortable-tree/react-sortable-tree-tests.tsx
@@ -11,10 +11,18 @@ import SortableTree,
         ExtendedNodeData,
         FullTree,
         OnVisibilityToggleData,
-        PreviousAnNextLocation
+        PreviousAnNextLocation,
+        PlaceholderRendererProps
     } from "react-sortable-tree";
 import { ListProps, ListRowRenderer } from "react-virtualized";
 
+class PlaceholderRenderer extends React.Component<PlaceholderRendererProps> {
+    render() {
+        const backgroundColor = this.props.isOver ? 'green' : 'red';
+        return <div style={{backgroundColor}}>Custom Placeholder class</div>;
+    }
+}
+
 class Test extends React.Component {
     render() {
         const treeData = [
@@ -55,6 +63,7 @@ class Test extends React.Component {
                     isVirtualized={true}
                     nodeContentRenderer={nodeRenderer}
                     dndType="testNodeType"
+                    placeholderRenderer={PlaceholderRenderer}
                 />
                 <SortableTreeWithoutDndContext
                     treeData={[{title: "Title", subtitle: "Subtitle", children: []}]}

From 2f72593265c0202f6c46d1cc47cdfb778c74b369 Mon Sep 17 00:00:00 2001
From: baobabx <baobabx@gmail.com>
Date: Wed, 17 Jan 2018 16:39:49 +0900
Subject: [PATCH 0020/1382] Adding definition for Database#configure

---
 types/sqlite3/index.d.ts       | 2 ++
 types/sqlite3/sqlite3-tests.ts | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/types/sqlite3/index.d.ts b/types/sqlite3/index.d.ts
index 921845e5a0..26f69d526d 100644
--- a/types/sqlite3/index.d.ts
+++ b/types/sqlite3/index.d.ts
@@ -83,6 +83,8 @@ export class Database extends events.EventEmitter {
     on(event: "error", listener: (err: Error) => void): this;
     on(event: "open" | "close", listener: () => void): this;
     on(event: string, listener: (...args: any[]) => void): this;
+
+    configure(option: "busyTimeout", value: number): void;
 }
 
 export function verbose(): void;
diff --git a/types/sqlite3/sqlite3-tests.ts b/types/sqlite3/sqlite3-tests.ts
index 4ddfa0a502..ee5e4b17d7 100644
--- a/types/sqlite3/sqlite3-tests.ts
+++ b/types/sqlite3/sqlite3-tests.ts
@@ -5,7 +5,8 @@ let db: sqlite3.Database = new sqlite3.Database('chain.sqlite3', () => {});
 
 function createDb() {
     console.log("createDb chain");
-    db = new sqlite3.Database('chain.sqlite3', createTable);
+	db = new sqlite3.Database('chain.sqlite3', createTable);
+	db.configure("busyTimeout", 1000);
 }
 
 function createTable() {

From 7ae2eba53391edc454d0f75a2f04ad7db5475434 Mon Sep 17 00:00:00 2001
From: Josh Goldberg <josh@fullscreenmario.com>
Date: Sun, 21 Jan 2018 19:29:28 -0800
Subject: [PATCH 0021/1382] Allowed functions in jest's describe

As of 22.0.5, jest allows classes for describe blocks.
---
 types/jest/index.d.ts    | 2 +-
 types/jest/jest-tests.ts | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/types/jest/index.d.ts b/types/jest/index.d.ts
index 0ba1762485..669a96fa23 100644
--- a/types/jest/index.d.ts
+++ b/types/jest/index.d.ts
@@ -220,7 +220,7 @@ declare namespace jest {
     }
 
     interface Describe {
-        (name: string, fn: EmptyFunction): void;
+        (name: string | Function, fn: EmptyFunction): void;
         only: Describe;
         skip: Describe;
     }
diff --git a/types/jest/jest-tests.ts b/types/jest/jest-tests.ts
index 4d8ae05e1c..146c848a72 100644
--- a/types/jest/jest-tests.ts
+++ b/types/jest/jest-tests.ts
@@ -10,6 +10,10 @@ declare const $: any;
 // Tests based on the Jest website
 jest.unmock('../sum');
 
+class TestClass { }
+
+describe(TestClass, () => { });
+
 describe('sum', () => {
     it('adds 1 + 2 to equal 3', () => {
         const sum: (a: number, b: number) => number = require('../sum');

From 983acb16764911e46947688579d0e5129c737a11 Mon Sep 17 00:00:00 2001
From: Josh Goldberg <josh@fullscreenmario.com>
Date: Sun, 21 Jan 2018 19:33:28 -0800
Subject: [PATCH 0022/1382] Bumped jest version in types to 22.0.5

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

diff --git a/types/jest/index.d.ts b/types/jest/index.d.ts
index 669a96fa23..218eef8457 100644
--- a/types/jest/index.d.ts
+++ b/types/jest/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Jest 22.0
+// Type definitions for Jest 22.0.5
 // Project: http://facebook.github.io/jest/
 // Definitions by: Asana <https://asana.com>
 //                 Ivo Stratev <https://github.com/NoHomey>

From 4b3b60fd821a294f33abf5095a4dca0b68b54c4e Mon Sep 17 00:00:00 2001
From: Josh Goldberg <josh@fullscreenmario.com>
Date: Sun, 21 Jan 2018 22:05:01 -0800
Subject: [PATCH 0023/1382] Used a ClassLike interface because of ban-types

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

diff --git a/types/jest/index.d.ts b/types/jest/index.d.ts
index 218eef8457..ba36a036d6 100644
--- a/types/jest/index.d.ts
+++ b/types/jest/index.d.ts
@@ -199,6 +199,10 @@ declare namespace jest {
 
     type Lifecycle = (fn: ProvidesCallback, timeout?: number) => any;
 
+    interface IClassLike {
+        readonly name: string;
+    }
+
     /**
      * Creates a test closure
      */
@@ -220,7 +224,7 @@ declare namespace jest {
     }
 
     interface Describe {
-        (name: string | Function, fn: EmptyFunction): void;
+        (name: number | string | IClassLike, fn: EmptyFunction): void;
         only: Describe;
         skip: Describe;
     }

From 2a858618c3f721512c52cbf8bbe943d8b7be4931 Mon Sep 17 00:00:00 2001
From: Hugues Stefanski <hugues.stefanski@gmail.com>
Date: Mon, 29 Jan 2018 20:44:25 +0100
Subject: [PATCH 0024/1382] Backbone for d3-fetch

---
 types/d3-fetch/d3-fetch-tests.ts |  0
 types/d3-fetch/index.d.ts        |  5 +++++
 types/d3-fetch/tsconfig.json     | 22 ++++++++++++++++++++++
 types/d3-fetch/tslint.json       |  1 +
 4 files changed, 28 insertions(+)
 create mode 100644 types/d3-fetch/d3-fetch-tests.ts
 create mode 100644 types/d3-fetch/index.d.ts
 create mode 100644 types/d3-fetch/tsconfig.json
 create mode 100644 types/d3-fetch/tslint.json

diff --git a/types/d3-fetch/d3-fetch-tests.ts b/types/d3-fetch/d3-fetch-tests.ts
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/types/d3-fetch/index.d.ts b/types/d3-fetch/index.d.ts
new file mode 100644
index 0000000000..f5b195ca04
--- /dev/null
+++ b/types/d3-fetch/index.d.ts
@@ -0,0 +1,5 @@
+// Type definitions for d3-fetch 1.0.1
+// Project: https://d3js.org/d3-fetch/
+// Definitions by: Hugues Stefanski <https://github.com/ledragon>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
diff --git a/types/d3-fetch/tsconfig.json b/types/d3-fetch/tsconfig.json
new file mode 100644
index 0000000000..d4e382e338
--- /dev/null
+++ b/types/d3-fetch/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "d3-fetch-tests.ts"
+    ]
+}
diff --git a/types/d3-fetch/tslint.json b/types/d3-fetch/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/d3-fetch/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From d25d2ee1b42624281a7a36bbe2daf7970ecb02a8 Mon Sep 17 00:00:00 2001
From: Hugues Stefanski <hugues.stefanski@gmail.com>
Date: Mon, 29 Jan 2018 21:12:59 +0100
Subject: [PATCH 0025/1382] Completed fetch API

---
 types/d3-fetch/d3-fetch-tests.ts | 15 ++++++++++++
 types/d3-fetch/index.d.ts        | 42 ++++++++++++++++++++++++++++++++
 types/d3-fetch/tsconfig.json     |  3 ++-
 3 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/types/d3-fetch/d3-fetch-tests.ts b/types/d3-fetch/d3-fetch-tests.ts
index e69de29bb2..b82ea8ffbe 100644
--- a/types/d3-fetch/d3-fetch-tests.ts
+++ b/types/d3-fetch/d3-fetch-tests.ts
@@ -0,0 +1,15 @@
+import * as d3Fetch from 'd3-fetch';
+
+interface MyType {
+    foo: string;
+}
+
+let promise: Promise<MyType>;
+const url = 'foo.bar';
+
+const init: RequestInit = {};
+
+promise = d3Fetch.blob<MyType>(url);
+promise = d3Fetch.blob<MyType>(url, init);
+promise = d3Fetch.buffer<MyType>(url);
+promise = d3Fetch.buffer<MyType>(url, init);
diff --git a/types/d3-fetch/index.d.ts b/types/d3-fetch/index.d.ts
index f5b195ca04..f46a779003 100644
--- a/types/d3-fetch/index.d.ts
+++ b/types/d3-fetch/index.d.ts
@@ -3,3 +3,45 @@
 // Definitions by: Hugues Stefanski <https://github.com/ledragon>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+/**Fetches the binary file at the specified input URL as a Blob. */
+export function blob<ResponseData>(input: string): Promise<ResponseData>;
+/**Fetches the binary file at the specified input URL as a Blob. Passes init along to the underlying call to fetch. */
+export function blob<ResponseData>(input: string, init: RequestInit): Promise<ResponseData>;
+/**Fetches the binary file at the specified input URL as an ArrayBuffer. */
+export function buffer<ResponseData>(input: string): Promise<ResponseData>;
+/**Fetches the binary file at the specified input URL as an ArrayBuffer. Passes init along to the underlying call to fetch. */
+export function buffer<ResponseData>(input: string, init: RequestInit): Promise<ResponseData>;
+
+/**Equivalent to d3.dsv with the comma character as the delimiter. */
+export function csv<ResponseData>(input: string): Promise<ResponseData>;
+/**Equivalent to d3.dsv with the comma character as the delimiter. */
+export function csv<ResponseData>(input: string, init: RequestInit): Promise<ResponseData>;
+/**Equivalent to d3.dsv with the comma character as the delimiter. */
+export function csv<ResponseData>(input: string, init: RequestInit, row: (d: any) => any): Promise<ResponseData>;
+
+/**Fetches the DSV file at the specified input URL. */
+export function dsv<ResponseData>(delimiter: string, input: string): Promise<ResponseData>;
+export function dsv<ResponseData>(delimiter: string, input: string, init: RequestInit): Promise<ResponseData>;
+export function dsv<ResponseData>(delimiter: string, input: string, init: RequestInit, row: any): Promise<ResponseData>;
+
+/**Fetches the image at the specified input URL. */
+export function image<ResponseData>(input: string): Promise<ResponseData>;
+/**Fetches the image at the specified input URL. Passes init along to the underlying call to fetch. */
+export function image<ResponseData>(input: string, init: RequestInit): Promise<ResponseData>;
+
+/**Fetches the json file at the specified input URL. */
+export function json<ResponseData>(input: string): Promise<ResponseData>;
+/**Fetches the json file at the specified input URL. Passes init along to the underlying call to fetch. */
+export function json<ResponseData>(input: string, init: RequestInit): Promise<ResponseData>;
+
+/**Fetches the text file at the specified input URL. */
+export function text(input: string): Promise<string>;
+/**Fetches the text file at the specified input URL. Passes init along to the underlying call to fetch. */
+export function text(input: string, init: RequestInit): Promise<string>;
+
+/**Equivalent to d3.dsv with the tab character as the delimiter. */
+export function tsv<ResponseData>(input: string): Promise<ResponseData>;
+/**Equivalent to d3.dsv with the tab character as the delimiter. */
+export function tsv<ResponseData>(input: string, init: RequestInit): Promise<ResponseData>;
+/**Equivalent to d3.dsv with the tab character as the delimiter. */
+export function tsv<ResponseData>(input: string, init: RequestInit, row: (d: any) => any): Promise<ResponseData>;
diff --git a/types/d3-fetch/tsconfig.json b/types/d3-fetch/tsconfig.json
index d4e382e338..4d18bd9ade 100644
--- a/types/d3-fetch/tsconfig.json
+++ b/types/d3-fetch/tsconfig.json
@@ -2,7 +2,8 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es6"
+            "es2017",
+            "dom"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,

From a1e32e69642cd3ca0f7a80946412e138d5649982 Mon Sep 17 00:00:00 2001
From: Hugues Stefanski <hugues.stefanski@gmail.com>
Date: Mon, 29 Jan 2018 21:23:56 +0100
Subject: [PATCH 0026/1382] Strong typings of parsing methods

---
 types/d3-fetch/index.d.ts | 55 +++++++++++++++++++++++++--------------
 1 file changed, 36 insertions(+), 19 deletions(-)

diff --git a/types/d3-fetch/index.d.ts b/types/d3-fetch/index.d.ts
index f46a779003..6a62630808 100644
--- a/types/d3-fetch/index.d.ts
+++ b/types/d3-fetch/index.d.ts
@@ -3,45 +3,62 @@
 // Definitions by: Hugues Stefanski <https://github.com/ledragon>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+import { DSVParsedArray, DSVRowString, DSVRowAny } from 'd3-dsv';
+
 /**Fetches the binary file at the specified input URL as a Blob. */
-export function blob<ResponseData>(input: string): Promise<ResponseData>;
+export function blob<ResponseData>(url: string): Promise<ResponseData>;
 /**Fetches the binary file at the specified input URL as a Blob. Passes init along to the underlying call to fetch. */
-export function blob<ResponseData>(input: string, init: RequestInit): Promise<ResponseData>;
+export function blob<ResponseData>(url: string, init: RequestInit): Promise<ResponseData>;
 /**Fetches the binary file at the specified input URL as an ArrayBuffer. */
-export function buffer<ResponseData>(input: string): Promise<ResponseData>;
+export function buffer<ResponseData>(url: string): Promise<ResponseData>;
 /**Fetches the binary file at the specified input URL as an ArrayBuffer. Passes init along to the underlying call to fetch. */
-export function buffer<ResponseData>(input: string, init: RequestInit): Promise<ResponseData>;
+export function buffer<ResponseData>(url: string, init: RequestInit): Promise<ResponseData>;
 
 /**Equivalent to d3.dsv with the comma character as the delimiter. */
-export function csv<ResponseData>(input: string): Promise<ResponseData>;
+export function csv<ParsedRow extends DSVRowAny>(url: string): Promise<DSVParsedArray<ParsedRow>>;
 /**Equivalent to d3.dsv with the comma character as the delimiter. */
-export function csv<ResponseData>(input: string, init: RequestInit): Promise<ResponseData>;
+export function csv<ParsedRow extends DSVRowAny>(url: string, init: RequestInit): Promise<DSVParsedArray<ParsedRow>>;
 /**Equivalent to d3.dsv with the comma character as the delimiter. */
-export function csv<ResponseData>(input: string, init: RequestInit, row: (d: any) => any): Promise<ResponseData>;
+export function csv<ParsedRow extends DSVRowAny>(
+    url: string,
+    init: RequestInit,
+    row: (d: DSVRowAny) => ParsedRow
+): Promise<DSVParsedArray<ParsedRow>>;
 
 /**Fetches the DSV file at the specified input URL. */
-export function dsv<ResponseData>(delimiter: string, input: string): Promise<ResponseData>;
-export function dsv<ResponseData>(delimiter: string, input: string, init: RequestInit): Promise<ResponseData>;
-export function dsv<ResponseData>(delimiter: string, input: string, init: RequestInit, row: any): Promise<ResponseData>;
+export function dsv<ParsedRow extends DSVRowAny>(delimiter: string, url: string): Promise<DSVParsedArray<ParsedRow>>;
+/**Fetches the DSV file at the specified input URL. */
+export function dsv<ParsedRow extends DSVRowAny>(delimiter: string, url: string, init: RequestInit): Promise<DSVParsedArray<ParsedRow>>;
+/**Fetches the DSV file at the specified input URL. */
+export function dsv<ParsedRow extends DSVRowAny>(
+    delimiter: string,
+    url: string,
+    init: RequestInit,
+    row: (d: DSVRowAny) => ParsedRow
+): Promise<DSVParsedArray<ParsedRow>>;
 
 /**Fetches the image at the specified input URL. */
-export function image<ResponseData>(input: string): Promise<ResponseData>;
+export function image<ResponseData>(url: string): Promise<ResponseData>;
 /**Fetches the image at the specified input URL. Passes init along to the underlying call to fetch. */
-export function image<ResponseData>(input: string, init: RequestInit): Promise<ResponseData>;
+export function image<ResponseData>(url: string, init: RequestInit): Promise<ResponseData>;
 
 /**Fetches the json file at the specified input URL. */
-export function json<ResponseData>(input: string): Promise<ResponseData>;
+export function json<ResponseData>(url: string): Promise<ResponseData>;
 /**Fetches the json file at the specified input URL. Passes init along to the underlying call to fetch. */
-export function json<ResponseData>(input: string, init: RequestInit): Promise<ResponseData>;
+export function json<ResponseData>(url: string, init: RequestInit): Promise<ResponseData>;
 
 /**Fetches the text file at the specified input URL. */
-export function text(input: string): Promise<string>;
+export function text(url: string): Promise<string>;
 /**Fetches the text file at the specified input URL. Passes init along to the underlying call to fetch. */
-export function text(input: string, init: RequestInit): Promise<string>;
+export function text(url: string, init: RequestInit): Promise<string>;
 
 /**Equivalent to d3.dsv with the tab character as the delimiter. */
-export function tsv<ResponseData>(input: string): Promise<ResponseData>;
+export function tsv<ParsedRow extends DSVRowAny>(url: string): Promise<DSVParsedArray<ParsedRow>>;
 /**Equivalent to d3.dsv with the tab character as the delimiter. */
-export function tsv<ResponseData>(input: string, init: RequestInit): Promise<ResponseData>;
+export function tsv<ParsedRow extends DSVRowAny>(url: string, init: RequestInit): Promise<DSVParsedArray<ParsedRow>>;
 /**Equivalent to d3.dsv with the tab character as the delimiter. */
-export function tsv<ResponseData>(input: string, init: RequestInit, row: (d: any) => any): Promise<ResponseData>;
+export function tsv<ParsedRow extends DSVRowAny>(
+    url: string,
+    init: RequestInit,
+    row: (d: DSVRowAny) => ParsedRow
+): Promise<DSVParsedArray<ParsedRow>>;

From 1d9a51fd97c2496378fb4507c390aa46ec75db7f Mon Sep 17 00:00:00 2001
From: Hugues Stefanski <hugues.stefanski@gmail.com>
Date: Mon, 29 Jan 2018 21:29:16 +0100
Subject: [PATCH 0027/1382] Partial d3-fetch tests

---
 types/d3-fetch/d3-fetch-tests.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/types/d3-fetch/d3-fetch-tests.ts b/types/d3-fetch/d3-fetch-tests.ts
index b82ea8ffbe..9c88ed8674 100644
--- a/types/d3-fetch/d3-fetch-tests.ts
+++ b/types/d3-fetch/d3-fetch-tests.ts
@@ -13,3 +13,10 @@ promise = d3Fetch.blob<MyType>(url);
 promise = d3Fetch.blob<MyType>(url, init);
 promise = d3Fetch.buffer<MyType>(url);
 promise = d3Fetch.buffer<MyType>(url, init);
+
+promise = d3Fetch.image<MyType>(url);
+promise = d3Fetch.image<MyType>(url, init);
+promise = d3Fetch.json<MyType>(url);
+promise = d3Fetch.json<MyType>(url, init);
+let myString: Promise<string> = d3Fetch.text(url);
+myString = d3Fetch.text(url, init);

From 24c16d91da489001a967cc03e9fdb5915c6ec66b Mon Sep 17 00:00:00 2001
From: Hugues Stefanski <hugues.stefanski@gmail.com>
Date: Mon, 29 Jan 2018 21:36:08 +0100
Subject: [PATCH 0028/1382] Completed tests for d3-fetch

---
 types/d3-fetch/d3-fetch-tests.ts | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/types/d3-fetch/d3-fetch-tests.ts b/types/d3-fetch/d3-fetch-tests.ts
index 9c88ed8674..1dfff0e04f 100644
--- a/types/d3-fetch/d3-fetch-tests.ts
+++ b/types/d3-fetch/d3-fetch-tests.ts
@@ -1,4 +1,5 @@
 import * as d3Fetch from 'd3-fetch';
+import { DSVParsedArray, DSVRowString, DSVRowAny } from 'd3-dsv';
 
 interface MyType {
     foo: string;
@@ -13,10 +14,26 @@ promise = d3Fetch.blob<MyType>(url);
 promise = d3Fetch.blob<MyType>(url, init);
 promise = d3Fetch.buffer<MyType>(url);
 promise = d3Fetch.buffer<MyType>(url, init);
-
 promise = d3Fetch.image<MyType>(url);
 promise = d3Fetch.image<MyType>(url, init);
 promise = d3Fetch.json<MyType>(url);
 promise = d3Fetch.json<MyType>(url, init);
-let myString: Promise<string> = d3Fetch.text(url);
+
+let myString: Promise<string>;
+myString = d3Fetch.text(url);
 myString = d3Fetch.text(url, init);
+
+const parseRow = (d: {}) => {
+    const myType: MyType = { foo: 'foo' };
+    return myType;
+};
+let promise2: Promise<DSVParsedArray<MyType>>;
+promise2 = d3Fetch.csv<MyType>(url);
+promise2 = d3Fetch.csv<MyType>(url, init);
+promise2 = d3Fetch.csv<MyType>(url, init, parseRow);
+promise2 = d3Fetch.dsv<MyType>(';', url);
+promise2 = d3Fetch.dsv<MyType>(';', url, init);
+promise2 = d3Fetch.dsv<MyType>(';', url, init, parseRow);
+promise2 = d3Fetch.tsv<MyType>(url);
+promise2 = d3Fetch.tsv<MyType>(url, init);
+promise2 = d3Fetch.tsv<MyType>(url, init, parseRow);

From 86f5c0fe17177d25f20ed82aefb71b29366b8a67 Mon Sep 17 00:00:00 2001
From: Hugues Stefanski <hugues.stefanski@gmail.com>
Date: Mon, 29 Jan 2018 21:40:18 +0100
Subject: [PATCH 0029/1382] Reste library to es6 in d3-fetch

---
 types/d3-fetch/tsconfig.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/d3-fetch/tsconfig.json b/types/d3-fetch/tsconfig.json
index 4d18bd9ade..ea7938966e 100644
--- a/types/d3-fetch/tsconfig.json
+++ b/types/d3-fetch/tsconfig.json
@@ -2,7 +2,7 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es2017",
+            "es6",
             "dom"
         ],
         "noImplicitAny": true,

From e8920bb7a943e2cc28a4f62f5192be9961bf4a5b Mon Sep 17 00:00:00 2001
From: Hugues Stefanski <hugues.stefanski@gmail.com>
Date: Mon, 29 Jan 2018 22:04:52 +0100
Subject: [PATCH 0030/1382] Fix linting errors

---
 types/d3-fetch/index.d.ts    | 62 ++++++++++++------------------------
 types/d3-fetch/tsconfig.json |  1 +
 2 files changed, 21 insertions(+), 42 deletions(-)

diff --git a/types/d3-fetch/index.d.ts b/types/d3-fetch/index.d.ts
index 6a62630808..6d4d4c7303 100644
--- a/types/d3-fetch/index.d.ts
+++ b/types/d3-fetch/index.d.ts
@@ -1,64 +1,42 @@
-// Type definitions for d3-fetch 1.0.1
+// Type definitions for d3-fetch 1.0
 // Project: https://d3js.org/d3-fetch/
 // Definitions by: Hugues Stefanski <https://github.com/ledragon>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 import { DSVParsedArray, DSVRowString, DSVRowAny } from 'd3-dsv';
 
-/**Fetches the binary file at the specified input URL as a Blob. */
-export function blob<ResponseData>(url: string): Promise<ResponseData>;
-/**Fetches the binary file at the specified input URL as a Blob. Passes init along to the underlying call to fetch. */
-export function blob<ResponseData>(url: string, init: RequestInit): Promise<ResponseData>;
-/**Fetches the binary file at the specified input URL as an ArrayBuffer. */
-export function buffer<ResponseData>(url: string): Promise<ResponseData>;
-/**Fetches the binary file at the specified input URL as an ArrayBuffer. Passes init along to the underlying call to fetch. */
-export function buffer<ResponseData>(url: string, init: RequestInit): Promise<ResponseData>;
+/** Fetches the binary file at the specified input URL as a Blob. If init is specified, it is passed along to the underlying call to fetch. */
+export function blob<ResponseData>(url: string, init?: RequestInit): Promise<ResponseData>;
+/** Fetches the binary file at the specified input URL as an ArrayBuffer. If init is specified, it is passed along to the underlying call to fetch. */
+export function buffer<ResponseData>(url: string, init?: RequestInit): Promise<ResponseData>;
 
-/**Equivalent to d3.dsv with the comma character as the delimiter. */
-export function csv<ParsedRow extends DSVRowAny>(url: string): Promise<DSVParsedArray<ParsedRow>>;
-/**Equivalent to d3.dsv with the comma character as the delimiter. */
-export function csv<ParsedRow extends DSVRowAny>(url: string, init: RequestInit): Promise<DSVParsedArray<ParsedRow>>;
-/**Equivalent to d3.dsv with the comma character as the delimiter. */
+/** Equivalent to d3.dsv with the comma character as the delimiter. */
 export function csv<ParsedRow extends DSVRowAny>(
     url: string,
-    init: RequestInit,
-    row: (d: DSVRowAny) => ParsedRow
+    init?: RequestInit,
+    row?: (d: DSVRowAny) => ParsedRow
 ): Promise<DSVParsedArray<ParsedRow>>;
 
-/**Fetches the DSV file at the specified input URL. */
-export function dsv<ParsedRow extends DSVRowAny>(delimiter: string, url: string): Promise<DSVParsedArray<ParsedRow>>;
-/**Fetches the DSV file at the specified input URL. */
-export function dsv<ParsedRow extends DSVRowAny>(delimiter: string, url: string, init: RequestInit): Promise<DSVParsedArray<ParsedRow>>;
-/**Fetches the DSV file at the specified input URL. */
+/** Fetches the DSV file at the specified input URL. */
 export function dsv<ParsedRow extends DSVRowAny>(
     delimiter: string,
     url: string,
-    init: RequestInit,
-    row: (d: DSVRowAny) => ParsedRow
+    init?: RequestInit,
+    row?: (d: DSVRowAny) => ParsedRow
 ): Promise<DSVParsedArray<ParsedRow>>;
 
-/**Fetches the image at the specified input URL. */
-export function image<ResponseData>(url: string): Promise<ResponseData>;
-/**Fetches the image at the specified input URL. Passes init along to the underlying call to fetch. */
-export function image<ResponseData>(url: string, init: RequestInit): Promise<ResponseData>;
+/** Fetches the image at the specified input URL. If init is specified, it is passed along to the underlying call to fetch. */
+export function image<ResponseData>(url: string, init?: RequestInit): Promise<ResponseData>;
 
-/**Fetches the json file at the specified input URL. */
-export function json<ResponseData>(url: string): Promise<ResponseData>;
-/**Fetches the json file at the specified input URL. Passes init along to the underlying call to fetch. */
-export function json<ResponseData>(url: string, init: RequestInit): Promise<ResponseData>;
+/** Fetches the json file at the specified input URL. If init is specified, it is passed along to the underlying call to fetch. */
+export function json<ResponseData>(url: string, init?: RequestInit): Promise<ResponseData>;
 
-/**Fetches the text file at the specified input URL. */
-export function text(url: string): Promise<string>;
-/**Fetches the text file at the specified input URL. Passes init along to the underlying call to fetch. */
-export function text(url: string, init: RequestInit): Promise<string>;
+/** Fetches the text file at the specified input URL. If init is specified, it is passed along to the underlying call to fetch. */
+export function text(url: string, init?: RequestInit): Promise<string>;
 
-/**Equivalent to d3.dsv with the tab character as the delimiter. */
-export function tsv<ParsedRow extends DSVRowAny>(url: string): Promise<DSVParsedArray<ParsedRow>>;
-/**Equivalent to d3.dsv with the tab character as the delimiter. */
-export function tsv<ParsedRow extends DSVRowAny>(url: string, init: RequestInit): Promise<DSVParsedArray<ParsedRow>>;
-/**Equivalent to d3.dsv with the tab character as the delimiter. */
+/** Equivalent to d3.dsv with the tab character as the delimiter. */
 export function tsv<ParsedRow extends DSVRowAny>(
     url: string,
-    init: RequestInit,
-    row: (d: DSVRowAny) => ParsedRow
+    init?: RequestInit,
+    row?: (d: DSVRowAny) => ParsedRow
 ): Promise<DSVParsedArray<ParsedRow>>;
diff --git a/types/d3-fetch/tsconfig.json b/types/d3-fetch/tsconfig.json
index ea7938966e..f9b9d190dd 100644
--- a/types/d3-fetch/tsconfig.json
+++ b/types/d3-fetch/tsconfig.json
@@ -8,6 +8,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"

From 0134384872fa0cbc434c25de5d8af358c491dd5e Mon Sep 17 00:00:00 2001
From: Hugues Stefanski <hugues.stefanski@gmail.com>
Date: Mon, 29 Jan 2018 22:11:21 +0100
Subject: [PATCH 0031/1382] tentative fix TS 2.1

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

diff --git a/types/d3-fetch/index.d.ts b/types/d3-fetch/index.d.ts
index 6d4d4c7303..103f0f505c 100644
--- a/types/d3-fetch/index.d.ts
+++ b/types/d3-fetch/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://d3js.org/d3-fetch/
 // Definitions by: Hugues Stefanski <https://github.com/ledragon>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
+// TypeScript Version: 2.2
 import { DSVParsedArray, DSVRowString, DSVRowAny } from 'd3-dsv';
 
 /** Fetches the binary file at the specified input URL as a Blob. If init is specified, it is passed along to the underlying call to fetch. */

From ba310edd776755af165cac8b52a9b74ede22e135 Mon Sep 17 00:00:00 2001
From: Hugues Stefanski <hugues.stefanski@gmail.com>
Date: Wed, 31 Jan 2018 21:27:37 +0100
Subject: [PATCH 0032/1382] Specific types for d3-fetch

---
 types/d3-fetch/index.d.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/types/d3-fetch/index.d.ts b/types/d3-fetch/index.d.ts
index 103f0f505c..16cce19e70 100644
--- a/types/d3-fetch/index.d.ts
+++ b/types/d3-fetch/index.d.ts
@@ -6,9 +6,9 @@
 import { DSVParsedArray, DSVRowString, DSVRowAny } from 'd3-dsv';
 
 /** Fetches the binary file at the specified input URL as a Blob. If init is specified, it is passed along to the underlying call to fetch. */
-export function blob<ResponseData>(url: string, init?: RequestInit): Promise<ResponseData>;
+export function blob(url: string, init?: RequestInit): Promise<Blob>;
 /** Fetches the binary file at the specified input URL as an ArrayBuffer. If init is specified, it is passed along to the underlying call to fetch. */
-export function buffer<ResponseData>(url: string, init?: RequestInit): Promise<ResponseData>;
+export function buffer(url: string, init?: RequestInit): Promise<ArrayBuffer>;
 
 /** Equivalent to d3.dsv with the comma character as the delimiter. */
 export function csv<ParsedRow extends DSVRowAny>(
@@ -26,7 +26,7 @@ export function dsv<ParsedRow extends DSVRowAny>(
 ): Promise<DSVParsedArray<ParsedRow>>;
 
 /** Fetches the image at the specified input URL. If init is specified, it is passed along to the underlying call to fetch. */
-export function image<ResponseData>(url: string, init?: RequestInit): Promise<ResponseData>;
+export function image(url: string, init?: RequestInit): Promise<HTMLImageElement>;
 
 /** Fetches the json file at the specified input URL. If init is specified, it is passed along to the underlying call to fetch. */
 export function json<ResponseData>(url: string, init?: RequestInit): Promise<ResponseData>;

From 284c05386176ddd79c1aeab96d002186b1d0dea3 Mon Sep 17 00:00:00 2001
From: Hugues Stefanski <hugues.stefanski@gmail.com>
Date: Wed, 31 Jan 2018 21:32:28 +0100
Subject: [PATCH 0033/1382] Fix test on d3-fetch

---
 types/d3-fetch/d3-fetch-tests.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/types/d3-fetch/d3-fetch-tests.ts b/types/d3-fetch/d3-fetch-tests.ts
index 1dfff0e04f..dc4729fced 100644
--- a/types/d3-fetch/d3-fetch-tests.ts
+++ b/types/d3-fetch/d3-fetch-tests.ts
@@ -10,12 +10,12 @@ const url = 'foo.bar';
 
 const init: RequestInit = {};
 
-promise = d3Fetch.blob<MyType>(url);
-promise = d3Fetch.blob<MyType>(url, init);
-promise = d3Fetch.buffer<MyType>(url);
-promise = d3Fetch.buffer<MyType>(url, init);
-promise = d3Fetch.image<MyType>(url);
-promise = d3Fetch.image<MyType>(url, init);
+let p1: Promise<Blob> = d3Fetch.blob(url);
+p1 = d3Fetch.blob(url, init);
+let p2: Promise<ArrayBuffer> = d3Fetch.buffer(url);
+p2 = d3Fetch.buffer(url, init);
+let p3: Promise<HTMLImageElement> = d3Fetch.image(url);
+p3 = d3Fetch.image(url, init);
 promise = d3Fetch.json<MyType>(url);
 promise = d3Fetch.json<MyType>(url, init);
 

From 1c607f2fc49ccf15b10a06d1b05f55b193c74175 Mon Sep 17 00:00:00 2001
From: Hugues Stefanski <hugues.stefanski@gmail.com>
Date: Wed, 31 Jan 2018 21:40:53 +0100
Subject: [PATCH 0034/1382] Removed generic used only once for json function in
 d3-fetch

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

diff --git a/types/d3-fetch/index.d.ts b/types/d3-fetch/index.d.ts
index 16cce19e70..9fd19fe8ed 100644
--- a/types/d3-fetch/index.d.ts
+++ b/types/d3-fetch/index.d.ts
@@ -29,7 +29,7 @@ export function dsv<ParsedRow extends DSVRowAny>(
 export function image(url: string, init?: RequestInit): Promise<HTMLImageElement>;
 
 /** Fetches the json file at the specified input URL. If init is specified, it is passed along to the underlying call to fetch. */
-export function json<ResponseData>(url: string, init?: RequestInit): Promise<ResponseData>;
+export function json(url: string, init?: RequestInit): Promise<{}>;
 
 /** Fetches the text file at the specified input URL. If init is specified, it is passed along to the underlying call to fetch. */
 export function text(url: string, init?: RequestInit): Promise<string>;

From 06b18847055218f1bbea97461d4d80fd215d25fa Mon Sep 17 00:00:00 2001
From: Hugues Stefanski <hugues.stefanski@gmail.com>
Date: Wed, 31 Jan 2018 21:41:43 +0100
Subject: [PATCH 0035/1382] Fix d3-fetch test

---
 types/d3-fetch/d3-fetch-tests.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/types/d3-fetch/d3-fetch-tests.ts b/types/d3-fetch/d3-fetch-tests.ts
index dc4729fced..24c6783997 100644
--- a/types/d3-fetch/d3-fetch-tests.ts
+++ b/types/d3-fetch/d3-fetch-tests.ts
@@ -5,7 +5,6 @@ interface MyType {
     foo: string;
 }
 
-let promise: Promise<MyType>;
 const url = 'foo.bar';
 
 const init: RequestInit = {};
@@ -16,8 +15,8 @@ let p2: Promise<ArrayBuffer> = d3Fetch.buffer(url);
 p2 = d3Fetch.buffer(url, init);
 let p3: Promise<HTMLImageElement> = d3Fetch.image(url);
 p3 = d3Fetch.image(url, init);
-promise = d3Fetch.json<MyType>(url);
-promise = d3Fetch.json<MyType>(url, init);
+let p4: Promise<any> = d3Fetch.json(url);
+p4 = d3Fetch.json(url, init);
 
 let myString: Promise<string>;
 myString = d3Fetch.text(url);

From 1621caf0dfdceac25e5ecc5748184c9edcefb079 Mon Sep 17 00:00:00 2001
From: Mathieu Masy <mathieu@potloc.com>
Date: Mon, 5 Feb 2018 16:57:56 -0500
Subject: [PATCH 0036/1382] [react-form] Updated typings

---
 types/react-form/index.d.ts           |  9 ++++--
 types/react-form/react-form-tests.tsx | 44 +++++++++++++++++++++++++++
 types/react-form/tsconfig.json        |  2 +-
 3 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/types/react-form/index.d.ts b/types/react-form/index.d.ts
index 965f55e7e7..debc89488c 100644
--- a/types/react-form/index.d.ts
+++ b/types/react-form/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for react-form 2.12
+// Type definitions for react-form 2.16
 // Project: https://github.com/tannerlinsley/react-form#readme
 // Definitions by: Cameron McAteer <https://github.com/cameron-mcateer>
+//                 Mathieu Masy <https://github.com/TiuSh>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -18,7 +19,7 @@ export interface FormErrors {
     [key: string]: FormError;
 }
 export type NestedErrors = Nested<FormErrors>;
-export type RenderReturn = JSX.Element | false | null;
+export type RenderReturn = JSX.Element | false | null | never[];
 
 export interface FormState {
     values: FormValues;
@@ -29,7 +30,10 @@ export interface FormState {
 }
 
 export interface FormProps {
+    component?: React.ReactType<{ formApi: FormApi }>;
+    render?: (formApi: FormApi) => RenderReturn;
     dontValidateOnMount?: boolean;
+    validateOnSubmit?: boolean;
     defaultValues?: FormValues;
     onSubmit?(values: FormValues, submissionEvent: React.SyntheticEvent<any>, formApi: FormApi): void;
     preSubmit?(values: FormValues, formApi: FormApi): FormValues;
@@ -43,6 +47,7 @@ export interface FormProps {
         [field: string]: (value: FormValue) => Promise<any>
     };
     dontPreventDefault?: boolean;
+    getApi?: (formApi: FormApi) => void;
 }
 
 export interface FormApi {
diff --git a/types/react-form/react-form-tests.tsx b/types/react-form/react-form-tests.tsx
index 2d08cc4b8a..36aa86db94 100644
--- a/types/react-form/react-form-tests.tsx
+++ b/types/react-form/react-form-tests.tsx
@@ -21,6 +21,50 @@ import {
 	FormApi
 } from 'react-form';
 
+// Form Api
+class FormApiMethods extends React.Component {
+	constructor(props: {}) {
+		super(props);
+		this.state = {};
+	}
+
+	render() {
+		const FormContent = (props: { formApi?: FormApi }) => (
+			<form onSubmit={props.formApi ? props.formApi.submitForm : () => {}}>
+				<Text field="hello" id="hello" />
+				<button type="submit">Submit</button>
+			</form>
+		);
+
+		return (
+			<div>
+				<Form>
+					{ formApi => (
+						<form onSubmit={formApi.submitForm}>
+							<Text field="hello" id="hello" />
+							<button type="submit">Submit</button>
+						</form>
+					)}
+				</Form>
+
+				<Form render={ formApi => (
+					<form onSubmit={formApi.submitForm}>
+						<Text field="hello" id="hello" />
+						<button type="submit">Submit</button>
+					</form>
+				)}>
+				</Form>
+
+				<Form>
+					<FormContent />
+				</Form>
+
+				<Form component={FormContent} />
+			</div>
+		);
+	}
+}
+
 // Basic Form Example
 const statusOptions = [
 	{
diff --git a/types/react-form/tsconfig.json b/types/react-form/tsconfig.json
index cc5dcb26ba..43d05d6dc6 100644
--- a/types/react-form/tsconfig.json
+++ b/types/react-form/tsconfig.json
@@ -23,4 +23,4 @@
         "index.d.ts",
         "react-form-tests.tsx"
     ]
-}
\ No newline at end of file
+}

From 3eb8d0c31adb111d48011296ae2ddaec327143fa Mon Sep 17 00:00:00 2001
From: Mathieu Masy <mathieu@potloc.com>
Date: Wed, 7 Feb 2018 14:20:16 -0500
Subject: [PATCH 0037/1382] [react-form] Added placeholder prop on Select
 component

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

diff --git a/types/react-form/index.d.ts b/types/react-form/index.d.ts
index debc89488c..4dc7e4b1b2 100644
--- a/types/react-form/index.d.ts
+++ b/types/react-form/index.d.ts
@@ -142,6 +142,7 @@ export type SelectOptions = Array<{
 
 export interface SelectProps extends FieldProps, React.SelectHTMLAttributes<HTMLSelectElement> {
     options: SelectOptions;
+    placeholder: string;
 }
 
 export const Select: React.StatelessComponent<SelectProps>;

From b47fc25da9455080fd29806247a38b8b27fb9cfe Mon Sep 17 00:00:00 2001
From: Josh Goldberg <josh@fullscreenmario.com>
Date: Wed, 7 Feb 2018 16:36:08 -0800
Subject: [PATCH 0038/1382] Renamed to FunctionLike; allowed Function

---
 types/jest/index.d.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/types/jest/index.d.ts b/types/jest/index.d.ts
index ba36a036d6..2d67c8fa97 100644
--- a/types/jest/index.d.ts
+++ b/types/jest/index.d.ts
@@ -199,7 +199,7 @@ declare namespace jest {
 
     type Lifecycle = (fn: ProvidesCallback, timeout?: number) => any;
 
-    interface IClassLike {
+    interface FunctionLike {
         readonly name: string;
     }
 
@@ -224,7 +224,8 @@ declare namespace jest {
     }
 
     interface Describe {
-        (name: number | string | IClassLike, fn: EmptyFunction): void;
+        // tslint:disable-next-line ban-types
+        (name: number | string | Function | FunctionLike, fn: EmptyFunction): void;
         only: Describe;
         skip: Describe;
     }

From 4e7c1db217790ca5aacf9851c64663b85aaf3a7f Mon Sep 17 00:00:00 2001
From: Josh Goldberg <josh@fullscreenmario.com>
Date: Wed, 7 Feb 2018 16:36:59 -0800
Subject: [PATCH 0039/1382] Added my name there too; why not?

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

diff --git a/types/jest/index.d.ts b/types/jest/index.d.ts
index 2d67c8fa97..f58540fbe2 100644
--- a/types/jest/index.d.ts
+++ b/types/jest/index.d.ts
@@ -10,6 +10,7 @@
 //                 Waseem Dahman <https://github.com/wsmd>
 //                 Jamie Mason <https://github.com/JamieMason>
 //                 Douglas Duteil <https://github.com/douglasduteil>
+//                 Josh Goldberg <https://github.com/joshuakgoldberg>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 

From 570c7db5d8b02755269dc32e2faf97088d418fc5 Mon Sep 17 00:00:00 2001
From: Andrea Ascari <andrea.ascari@buildo.io>
Date: Wed, 7 Feb 2018 17:34:36 +0100
Subject: [PATCH 0040/1382] Created react-native-auth0 types

---
 types/react-native-auth0/index.d.ts           | 171 ++++++++++++++++++
 .../react-native-auth0-tests.ts               |  66 +++++++
 types/react-native-auth0/tsconfig.json        |  17 ++
 types/react-native-auth0/tslint.json          |   7 +
 4 files changed, 261 insertions(+)
 create mode 100644 types/react-native-auth0/index.d.ts
 create mode 100644 types/react-native-auth0/react-native-auth0-tests.ts
 create mode 100644 types/react-native-auth0/tsconfig.json
 create mode 100644 types/react-native-auth0/tslint.json

diff --git a/types/react-native-auth0/index.d.ts b/types/react-native-auth0/index.d.ts
new file mode 100644
index 0000000000..45016da9ca
--- /dev/null
+++ b/types/react-native-auth0/index.d.ts
@@ -0,0 +1,171 @@
+// Type definitions for react-native 1.2
+// Project: https://github.com/auth0/react-native-auth0
+// Definitions by: Andrea Ascari <https://github.com/ascariandrea>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+/**
+ * Auth
+ */
+
+export interface AuthorizationUrlParams {
+    responseType: string;
+    redirectUri: string;
+    state: string;
+}
+
+export interface CreateUserParams<T extends any> {
+    email: string;
+    username?: string;
+    password: string;
+    connection: string;
+    metadata?: T;
+}
+
+export interface CreateUserResponse {
+    Id: string;
+    emailVerified: boolean;
+    email: string;
+}
+
+export interface ExchangeParams {
+    code: string;
+    redirectUri: string;
+    verifier: string;
+}
+
+export interface LogoutParams {
+    federated: boolean;
+    clientId?: string;
+    returnTo?: string;
+}
+
+export interface PasswordRealmParams {
+    username: string;
+    password: string;
+    realm: string;
+    audience?: string;
+    scope?: string;
+}
+
+export interface PasswordRealmResponse {
+    accessToken: string;
+    expiresIn: number;
+    idToken: string;
+    scope: string;
+    tokenType: "Bearer";
+}
+
+export interface RefreshTokenParams {
+    refreshToken: string;
+    scope?: string;
+}
+
+export interface RevokeParams {
+    refreshToken: string;
+}
+
+export interface UserInfoParams {
+    token: string;
+}
+
+export interface UserInfo {
+    email: string;
+    emailVerified: boolean;
+    name: string;
+    nickname: string;
+    picture: string;
+    sub: string;
+    updatedAt: string;
+}
+export class Auth {
+    authorizationUrl(params: AuthorizationUrlParams): string;
+    createUser(user: CreateUserParams<any>): Promise<CreateUserResponse>;
+    exchange(params: ExchangeParams): Promise<string>;
+    logoutUrl(params: LogoutParams): string;
+    passwordRealm(params: PasswordRealmParams): Promise<PasswordRealmResponse>;
+
+    refreshToken(params: RefreshTokenParams): Promise<any>;
+    revoke(params: RevokeParams): Promise<any>;
+    userInfo(params: UserInfoParams): Promise<UserInfo>;
+}
+
+/**
+ * Users
+ */
+export interface Auth0User<T> {
+    created_at: string;
+    email: string;
+    emailVerified: boolean;
+    identities: any[];
+    last_ip?: string;
+    last_login?: string;
+    logins_count: number;
+    name: string;
+    nickname: string;
+    picture?: string;
+    updated_at: string;
+    userId: string;
+    userMetadata?: T;
+}
+
+export interface GetUserParams {
+    id: string;
+}
+
+export interface PatchUserParams<T> {
+    id: string;
+    metadata: T;
+}
+
+export class Users {
+    constructor(options: UsersOptions);
+    /* tslint:disable-next-line no-unnecessary-generics */
+    getUser<T extends any>(parameters: GetUserParams): Promise<Auth0User<T>>;
+    patchUser<T extends any>(
+        parameters: PatchUserParams<T>
+    ): Promise<Auth0User<T>>;
+}
+
+export const users: Users;
+
+/**
+ * Web Auth
+ */
+export interface AuthorizeParams {
+    state?: string;
+    nonce?: string;
+    audience?: string;
+    scope?: string;
+}
+
+export interface ClearSessionParams {
+    federated: boolean;
+}
+
+export class WebAuth {
+    authorize(parameters: AuthorizeParams): Promise<any>;
+    clearSession(parameters: ClearSessionParams): Promise<any>;
+}
+
+export interface UsersOptions {
+    baseUrl: Options["domain"];
+    token: string;
+}
+
+export interface Options {
+    domain: string;
+    clientId: string;
+}
+
+/**
+ * Auth0
+ */
+
+export default class Auth0 {
+    auth: Auth;
+    webAuth: WebAuth;
+    constructor(options: Options);
+
+    users(token: string): Users;
+}
diff --git a/types/react-native-auth0/react-native-auth0-tests.ts b/types/react-native-auth0/react-native-auth0-tests.ts
new file mode 100644
index 0000000000..53eca829eb
--- /dev/null
+++ b/types/react-native-auth0/react-native-auth0-tests.ts
@@ -0,0 +1,66 @@
+import Auth0, { UserInfo } from "react-native-auth0";
+
+const auth0 = new Auth0({
+    domain: "definitely-typed",
+    clientId: "definitely-typed"
+});
+
+auth0.auth.createUser({
+    email: "me@example.com",
+    username: "johndoe",
+    password: "password",
+    connection: "db-connection"
+});
+
+auth0.auth.authorizationUrl({
+    responseType: "json",
+    redirectUri: "http://localhost:3000",
+    state: "my-state"
+});
+
+auth0.auth.exchange({
+    code: "my-code",
+    redirectUri: "http://localhost:3000",
+    verifier: "verifier"
+});
+
+auth0.auth.logoutUrl({
+    federated: true,
+    clientId: "client-id",
+    returnTo: "http://localhost:3000"
+});
+
+auth0.auth.passwordRealm({
+    username: "me@example.com",
+    password: "password",
+    realm: "realm",
+    audience: "user-info"
+});
+
+auth0.auth.refreshToken({
+    refreshToken: "refresh-token",
+    scope: "openid"
+});
+
+auth0.auth.revoke({
+    refreshToken: "refresh-token"
+});
+
+auth0.auth.userInfo({
+    token: "token"
+});
+
+auth0.webAuth.authorize({
+    state: "state",
+    nonce: "nonce",
+    scope: "openid"
+});
+
+auth0.webAuth.clearSession({ federated: false });
+
+auth0.users("token").getUser({ id: "userId" });
+
+auth0.users("token").patchUser<{ firstName: string; lastName: string }>({
+    id: "userId",
+    metadata: { firstName: "John", lastName: "Dow" }
+});
diff --git a/types/react-native-auth0/tsconfig.json b/types/react-native-auth0/tsconfig.json
new file mode 100644
index 0000000000..f694a107be
--- /dev/null
+++ b/types/react-native-auth0/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "target": "es6",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": ["index.d.ts", "react-native-auth0-tests.ts"]
+}
diff --git a/types/react-native-auth0/tslint.json b/types/react-native-auth0/tslint.json
new file mode 100644
index 0000000000..fd90cce501
--- /dev/null
+++ b/types/react-native-auth0/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        // Lowercase `object` is available in TypeScript 2.2 only.
+        "ban-types": false
+    }
+}

From 9f14ab9919d4b18bcf9252288285ababbf448b16 Mon Sep 17 00:00:00 2001
From: Wayne Dela Cruz <ddwwcruz@gmail.com>
Date: Mon, 12 Feb 2018 23:02:55 +0800
Subject: [PATCH 0041/1382] Create filter query typing

---
 types/mongodb/index.d.ts | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/types/mongodb/index.d.ts b/types/mongodb/index.d.ts
index dd4f44f38a..a2a30c9f1e 100644
--- a/types/mongodb/index.d.ts
+++ b/types/mongodb/index.d.ts
@@ -635,6 +635,21 @@ export interface Collection<TSchema = Default> {
     watch(pipeline?: Object[], options?: ChangeStreamOptions & { session?: ClientSession }): ChangeStream;
 }
 
+type FilterQuery<T> = {
+    [P in keyof T]?: T[P] | {
+        $eq?: T[P];
+        $gt?: T[P];
+        $gte?: T[P];
+        $in?: T[P][];
+        $lt?: T[P];
+        $lte?: T[P];
+        $ne?: T[P];
+        $nin?: T[P][];
+        $and?: FilterQuery<T[P]>[];
+        $not?: FilterQuery<T[P]>[] | T[P];
+    };
+};
+
 // Documentation: http://docs.mongodb.org/manual/reference/command/collStats/
 export interface CollStats {
     // Namespace.

From 3a4de187b2edaf2d09e60e6269c05e5509005e49 Mon Sep 17 00:00:00 2001
From: Wayne Dela Cruz <ddwwcruz@gmail.com>
Date: Mon, 12 Feb 2018 23:06:36 +0800
Subject: [PATCH 0042/1382] Collection use filter query

---
 types/mongodb/index.d.ts | 60 ++++++++++++++++++++--------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/types/mongodb/index.d.ts b/types/mongodb/index.d.ts
index a2a30c9f1e..d9d6a21bdc 100644
--- a/types/mongodb/index.d.ts
+++ b/types/mongodb/index.d.ts
@@ -482,13 +482,13 @@ export interface Collection<TSchema = Default> {
     createIndexes(indexSpecs: Object[], options?: {session?: ClientSession}): Promise<any>;
     createIndexes(indexSpecs: Object[], options: {session?: ClientSession}, callback: MongoCallback<any>): void;
     /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#deleteMany */
-    deleteMany(filter: Object, callback: MongoCallback<DeleteWriteOpResultObject>): void;
-    deleteMany(filter: Object, options?: CommonOptions): Promise<DeleteWriteOpResultObject>;
-    deleteMany(filter: Object, options: CommonOptions, callback: MongoCallback<DeleteWriteOpResultObject>): void;
+    deleteMany(filter: FilterQuery<TSchema>, callback: MongoCallback<DeleteWriteOpResultObject>): void;
+    deleteMany(filter: FilterQuery<TSchema>, options?: CommonOptions): Promise<DeleteWriteOpResultObject>;
+    deleteMany(filter: FilterQuery<TSchema>, options: CommonOptions, callback: MongoCallback<DeleteWriteOpResultObject>): void;
     /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#deleteOne */
-    deleteOne(filter: Object, callback: MongoCallback<DeleteWriteOpResultObject>): void;
-    deleteOne(filter: Object, options?: CommonOptions & { bypassDocumentValidation?: boolean }): Promise<DeleteWriteOpResultObject>;
-    deleteOne(filter: Object, options: CommonOptions & { bypassDocumentValidation?: boolean }, callback: MongoCallback<DeleteWriteOpResultObject>): void;
+    deleteOne(filter: FilterQuery<TSchema>, callback: MongoCallback<DeleteWriteOpResultObject>): void;
+    deleteOne(filter: FilterQuery<TSchema>, options?: CommonOptions & { bypassDocumentValidation?: boolean }): Promise<DeleteWriteOpResultObject>;
+    deleteOne(filter: FilterQuery<TSchema>, options: CommonOptions & { bypassDocumentValidation?: boolean }, callback: MongoCallback<DeleteWriteOpResultObject>): void;
     /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#distinct */
     distinct(key: string, query: Object, callback: MongoCallback<any>): void;
     distinct(key: string, query: Object, options?: { readPreference?: ReadPreference | string, maxTimeMS?: number, session?: ClientSession }): Promise<any>;
@@ -510,21 +510,21 @@ export interface Collection<TSchema = Default> {
     /** @deprecated */
     find<T = TSchema>(query: Object, options?: FindOneOptions): Cursor<T>;
     /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#findOne */
-    findOne<T = TSchema>(filter: Object, callback: MongoCallback<T | null>): void;
-    findOne<T = TSchema>(filter: Object, options?: FindOneOptions): Promise<T | null>;
-    findOne<T = TSchema>(filter: Object, options: FindOneOptions, callback: MongoCallback<T | null>): void;
+    findOne<T = TSchema>(filter: FilterQuery<TSchema>, callback: MongoCallback<T | null>): void;
+    findOne<T = TSchema>(filter: FilterQuery<TSchema>, options?: FindOneOptions): Promise<T | null>;
+    findOne<T = TSchema>(filter: FilterQuery<TSchema>, options: FindOneOptions, callback: MongoCallback<T | null>): void;
     /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#findOneAndDelete */
-    findOneAndDelete(filter: Object, callback: MongoCallback<FindAndModifyWriteOpResultObject<TSchema>>): void;
-    findOneAndDelete(filter: Object, options?: { projection?: Object, sort?: Object, maxTimeMS?: number, session?: ClientSession }): Promise<FindAndModifyWriteOpResultObject<TSchema>>;
-    findOneAndDelete(filter: Object, options: { projection?: Object, sort?: Object, maxTimeMS?: number, session?: ClientSession }, callback: MongoCallback<FindAndModifyWriteOpResultObject<TSchema>>): void;
+    findOneAndDelete(filter: FilterQuery<TSchema>, callback: MongoCallback<FindAndModifyWriteOpResultObject<TSchema>>): void;
+    findOneAndDelete(filter: FilterQuery<TSchema>, options?: { projection?: Object, sort?: Object, maxTimeMS?: number, session?: ClientSession }): Promise<FindAndModifyWriteOpResultObject<TSchema>>;
+    findOneAndDelete(filter: FilterQuery<TSchema>, options: { projection?: Object, sort?: Object, maxTimeMS?: number, session?: ClientSession }, callback: MongoCallback<FindAndModifyWriteOpResultObject<TSchema>>): void;
     /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#findOneAndReplace */
-    findOneAndReplace(filter: Object, replacement: Object, callback: MongoCallback<FindAndModifyWriteOpResultObject<TSchema>>): void;
-    findOneAndReplace(filter: Object, replacement: Object, options?: FindOneAndReplaceOption): Promise<FindAndModifyWriteOpResultObject<TSchema>>;
-    findOneAndReplace(filter: Object, replacement: Object, options: FindOneAndReplaceOption, callback: MongoCallback<FindAndModifyWriteOpResultObject<TSchema>>): void;
+    findOneAndReplace(filter: FilterQuery<TSchema>, replacement: Object, callback: MongoCallback<FindAndModifyWriteOpResultObject<TSchema>>): void;
+    findOneAndReplace(filter: FilterQuery<TSchema>, replacement: Object, options?: FindOneAndReplaceOption): Promise<FindAndModifyWriteOpResultObject<TSchema>>;
+    findOneAndReplace(filter: FilterQuery<TSchema>, replacement: Object, options: FindOneAndReplaceOption, callback: MongoCallback<FindAndModifyWriteOpResultObject<TSchema>>): void;
     /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#findOneAndUpdate */
-    findOneAndUpdate(filter: Object, update: Object, callback: MongoCallback<FindAndModifyWriteOpResultObject<TSchema>>): void;
-    findOneAndUpdate(filter: Object, update: Object, options?: FindOneAndReplaceOption): Promise<FindAndModifyWriteOpResultObject<TSchema>>;
-    findOneAndUpdate(filter: Object, update: Object, options: FindOneAndReplaceOption, callback: MongoCallback<FindAndModifyWriteOpResultObject<TSchema>>): void;
+    findOneAndUpdate(filter: FilterQuery<TSchema>, update: Object, callback: MongoCallback<FindAndModifyWriteOpResultObject<TSchema>>): void;
+    findOneAndUpdate(filter: FilterQuery<TSchema>, update: Object, options?: FindOneAndReplaceOption): Promise<FindAndModifyWriteOpResultObject<TSchema>>;
+    findOneAndUpdate(filter: FilterQuery<TSchema>, update: Object, options: FindOneAndReplaceOption, callback: MongoCallback<FindAndModifyWriteOpResultObject<TSchema>>): void;
     /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#geoHaystackSearch */
     geoHaystackSearch(x: number, y: number, callback: MongoCallback<any>): void;
     geoHaystackSearch(x: number, y: number, options?: GeoHaystackSearchOptions): Promise<any>;
@@ -602,9 +602,9 @@ export interface Collection<TSchema = Default> {
     rename(newName: string, options?: { dropTarget?: boolean, session?: ClientSession }): Promise<Collection<TSchema>>;
     rename(newName: string, options: { dropTarget?: boolean, session?: ClientSession }, callback: MongoCallback<Collection<TSchema>>): void;
     /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#replaceOne */
-    replaceOne(filter: Object, doc: Object, callback: MongoCallback<ReplaceWriteOpResult>): void;
-    replaceOne(filter: Object, doc: Object, options?: ReplaceOneOptions): Promise<ReplaceWriteOpResult>;
-    replaceOne(filter: Object, doc: Object, options: ReplaceOneOptions, callback: MongoCallback<ReplaceWriteOpResult>): void;
+    replaceOne(filter: FilterQuery<TSchema>, doc: Object, callback: MongoCallback<ReplaceWriteOpResult>): void;
+    replaceOne(filter: FilterQuery<TSchema>, doc: Object, options?: ReplaceOneOptions): Promise<ReplaceWriteOpResult>;
+    replaceOne(filter: FilterQuery<TSchema>, doc: Object, options: ReplaceOneOptions, callback: MongoCallback<ReplaceWriteOpResult>): void;
     /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#save */
     /** @deprecated Use insertOne, insertMany, updateOne or updateMany */
     save(doc: Object, callback: MongoCallback<WriteOpResult>): void;
@@ -618,19 +618,19 @@ export interface Collection<TSchema = Default> {
     stats(options: { scale: number, session?: ClientSession }, callback: MongoCallback<CollStats>): void;
     /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#update */
     /** @deprecated use updateOne, updateMany or bulkWrite */
-    update(filter: Object, update: Object, callback: MongoCallback<WriteOpResult>): void;
+    update(filter: FilterQuery<TSchema>, update: Object, callback: MongoCallback<WriteOpResult>): void;
     /** @deprecated use updateOne, updateMany or bulkWrite */
-    update(filter: Object, update: Object, options?: ReplaceOneOptions & { multi?: boolean }): Promise<WriteOpResult>;
+    update(filter: FilterQuery<TSchema>, update: Object, options?: ReplaceOneOptions & { multi?: boolean }): Promise<WriteOpResult>;
     /** @deprecated use updateOne, updateMany or bulkWrite */
-    update(filter: Object, update: Object, options: ReplaceOneOptions & { multi?: boolean }, callback: MongoCallback<WriteOpResult>): void;
+    update(filter: FilterQuery<TSchema>, update: Object, options: ReplaceOneOptions & { multi?: boolean }, callback: MongoCallback<WriteOpResult>): void;
     /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#updateMany */
-    updateMany(filter: Object, update: Object, callback: MongoCallback<UpdateWriteOpResult>): void;
-    updateMany(filter: Object, update: Object, options?: CommonOptions & { upsert?: boolean }): Promise<UpdateWriteOpResult>;
-    updateMany(filter: Object, update: Object, options: CommonOptions & { upsert?: boolean }, callback: MongoCallback<UpdateWriteOpResult>): void;
+    updateMany(filter: FilterQuery<TSchema>, update: Object, callback: MongoCallback<UpdateWriteOpResult>): void;
+    updateMany(filter: FilterQuery<TSchema>, update: Object, options?: CommonOptions & { upsert?: boolean }): Promise<UpdateWriteOpResult>;
+    updateMany(filter: FilterQuery<TSchema>, update: Object, options: CommonOptions & { upsert?: boolean }, callback: MongoCallback<UpdateWriteOpResult>): void;
     /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#updateOne */
-    updateOne(filter: Object, update: Object, callback: MongoCallback<UpdateWriteOpResult>): void;
-    updateOne(filter: Object, update: Object, options?: ReplaceOneOptions): Promise<UpdateWriteOpResult>;
-    updateOne(filter: Object, update: Object, options: ReplaceOneOptions, callback: MongoCallback<UpdateWriteOpResult>): void;
+    updateOne(filter: FilterQuery<TSchema>, update: Object, callback: MongoCallback<UpdateWriteOpResult>): void;
+    updateOne(filter: FilterQuery<TSchema>, update: Object, options?: ReplaceOneOptions): Promise<UpdateWriteOpResult>;
+    updateOne(filter: FilterQuery<TSchema>, update: Object, options: ReplaceOneOptions, callback: MongoCallback<UpdateWriteOpResult>): void;
     /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#watch */
     watch(pipeline?: Object[], options?: ChangeStreamOptions & { session?: ClientSession }): ChangeStream;
 }

From cad9bcefb7eca399a54ec52d774f70ad011c6da6 Mon Sep 17 00:00:00 2001
From: Wayne Dela Cruz <ddwwcruz@gmail.com>
Date: Mon, 12 Feb 2018 23:31:22 +0800
Subject: [PATCH 0043/1382] Add more typings

---
 types/mongodb/index.d.ts | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/types/mongodb/index.d.ts b/types/mongodb/index.d.ts
index d9d6a21bdc..cebf31e32c 100644
--- a/types/mongodb/index.d.ts
+++ b/types/mongodb/index.d.ts
@@ -645,8 +645,30 @@ type FilterQuery<T> = {
         $lte?: T[P];
         $ne?: T[P];
         $nin?: T[P][];
-        $and?: FilterQuery<T[P]>[];
-        $not?: FilterQuery<T[P]>[] | T[P];
+        $and?: (FilterQuery<T[P]> | T[P])[];
+        $not?: (FilterQuery<T[P]> | T[P])[] | T[P];
+        $expr?: any;
+        $jsonSchema?: any;
+        $mod?: [number, number];
+        $regex?: RegExp;
+        $options?: string;
+        $text?: {
+            $search: string;
+            $language?: string;
+            $caseSensitive?: boolean;
+            $diacraticSensitive?: boolean;
+        };
+        $where: Object;
+        $geoIntersects?: Object;
+        $geoWithin?: Object;
+        $near?: Object;
+        $nearSphere?: Object;
+        $elemMatch?: Object;
+        $size?: number;
+        $bitsAllClear?: Object;
+        $bitsAllSet?: Object;
+        $bitsAnyClear?: Object;
+        $bitsAnySet?: Object;
     };
 };
 

From 4c8fb4edcb6567474e00564e0431cbffa8e93b1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20H=C3=B8is=C3=A6ther=20Rasch?=
 <fredrik.rasch@gmail.com>
Date: Tue, 13 Feb 2018 22:03:10 +0100
Subject: [PATCH 0044/1382] add new chrome.devtools.inspectedWindow.eval
 overload

Additional Overload accepts the new optional options parameter.

fixes https://github.com/DefinitelyTyped/DefinitelyTyped/issues/23597
---
 types/chrome/index.d.ts | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/types/chrome/index.d.ts b/types/chrome/index.d.ts
index cd12179213..8d3a8a80ab 100644
--- a/types/chrome/index.d.ts
+++ b/types/chrome/index.d.ts
@@ -1678,6 +1678,17 @@ declare namespace chrome.devtools.inspectedWindow {
      * Parameter exceptionInfo: An object providing details if an exception occurred while evaluating the expression.
      */
     export function eval<T>(expression: string, callback?: (result: T, exceptionInfo: EvaluationExceptionInfo) => void): void;
+    /**
+     * Evaluates a JavaScript expression in the context of the main frame of the inspected page. The expression must evaluate to a JSON-compliant object, otherwise an exception is thrown. The eval function can report either a DevTools-side error or a JavaScript exception that occurs during evaluation. In either case, the result parameter of the callback is undefined. In the case of a DevTools-side error, the isException parameter is non-null and has isError set to true and code set to an error code. In the case of a JavaScript error, isException is set to true and value is set to the string value of thrown object.
+     * @param expression An expression to evaluate.
+     * @param options The options parameter can contain one or more options.
+     * @param callback A function called when evaluation completes.
+     * If you specify the callback parameter, it should be a function that looks like this:
+     * function(object result, object exceptionInfo) {...};
+     * Parameter result: The result of evaluation.
+     * Parameter exceptionInfo: An object providing details if an exception occurred while evaluating the expression.
+     */
+    export function eval<T>(expression: string, options: EvalOptions, callback?: (result: T, exceptionInfo: EvaluationExceptionInfo) => void): void;
     /**
      * Retrieves the list of resources from the inspected page.
      * @param callback A function that receives the list of resources when the request completes.
@@ -1690,6 +1701,15 @@ declare namespace chrome.devtools.inspectedWindow {
     export var onResourceAdded: ResourceAddedEvent;
     /** Fired when a new revision of the resource is committed (e.g. user saves an edited version of the resource in the Developer Tools). */
     export var onResourceContentCommitted: ResourceContentCommittedEvent;
+
+    export interface EvalOptions {
+        /** If specified, the expression is evaluated on the iframe whose URL matches the one specified. By default, the expression is evaluated in the top frame of the inspected page. */
+        frameURL?: string;
+        /** Evaluate the expression in the context of the content script of the calling extension, provided that the content script is already injected into the inspected page. If not, the expression is not evaluated and the callback is invoked with the exception parameter set to an object that has the isError field set to true and the code field set to E_NOTFOUND. */
+        useContentScriptContext?: boolean;
+        /** Evaluate the expression in the context of a content script of an extension that matches the specified origin. If given, contextSecurityOrigin overrides the 'true' setting on userContentScriptContext. */
+        contextSecurityOrigin?: string;
+    }
 }
 
 ////////////////////

From 866f915fbe5d3cfb4e05b2a2f9ed7c3bb0f44c14 Mon Sep 17 00:00:00 2001
From: Andrew Shepherd <shepherd_a@hotmail.com>
Date: Wed, 14 Feb 2018 08:14:06 +1000
Subject: [PATCH 0045/1382] TS7006  error on showNativeTouchCallibration

Compiling with `noImplicitAny` set to `true` created the following warning:

> node_modules/@types/chrome/chrome-app.d.ts(1192,71): error TS7006: Parameter 'success' implicitly has an 'any' type.

The method `showNativeTouchCalibration` is documented here: https://developer.chrome.com/apps/system_display#method-showNativeTouchCalibration

It describes callback as such:

> If you specify the callback parameter, it should be a function that looks like this:
>
> `function(boolean success) {...};`
---
 types/chrome/chrome-app.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/chrome/chrome-app.d.ts b/types/chrome/chrome-app.d.ts
index 4ecf1d344a..65d80f3290 100644
--- a/types/chrome/chrome-app.d.ts
+++ b/types/chrome/chrome-app.d.ts
@@ -1189,7 +1189,7 @@ declare namespace chrome.system.display {
      * @param {string} id The display's unique identifier.
      * @param {(success) => void} callback Optional callback to inform the caller that the touch calibration has ended. The argument of the callback informs if the calibration was a success or not.
      */
-    export function showNativeTouchCalibration(id: string, callback: (success) => void): void;
+    export function showNativeTouchCalibration(id: string, callback: (success: boolean) => void): void;
 
     /**
      * @description Starts custom touch calibration for a display. This should be called when using a custom UX for collecting calibration data. If another touch calibration is already in progress this will throw an error.

From 4531a3601c108cf612d9a57c92773e5a0ceba2e4 Mon Sep 17 00:00:00 2001
From: samuelneff <github@serndesign.com>
Date: Wed, 14 Feb 2018 04:56:11 +0000
Subject: [PATCH 0046/1382] Typings for MUI's React libary (muicss/react)

---
 types/muicss-react/index.d.ts             | 264 ++++++++++++++++++++++
 types/muicss-react/muicss-react-tests.tsx | 203 +++++++++++++++++
 types/muicss-react/tsconfig.json          |  27 +++
 types/muicss-react/tslint.json            |  17 ++
 4 files changed, 511 insertions(+)
 create mode 100644 types/muicss-react/index.d.ts
 create mode 100644 types/muicss-react/muicss-react-tests.tsx
 create mode 100644 types/muicss-react/tsconfig.json
 create mode 100644 types/muicss-react/tslint.json

diff --git a/types/muicss-react/index.d.ts b/types/muicss-react/index.d.ts
new file mode 100644
index 0000000000..65982f21af
--- /dev/null
+++ b/types/muicss-react/index.d.ts
@@ -0,0 +1,264 @@
+// Type definitions for muicss React bindings v09.36
+// Project: https://www.muicss.com/
+// Definitions by: Samuel Neff <https://github.com/samuelneff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+/// <reference types="react" />
+
+declare module "muicss/react" {
+    export import Appbar = Muicss.Appbar;
+    export import Button = Muicss.Button;
+    export import Checkbox = Muicss.Checkbox;
+    export import Col = Muicss.Col;
+    export import Container = Muicss.Container;
+    export import Divider = Muicss.Divider;
+    export import Dropdown = Muicss.Dropdown;
+    export import DropdownItem = Muicss.DropdownItem;
+    export import Form = Muicss.Form;
+    export import Input = Muicss.Input;
+    export import Option = Muicss.Option;
+    export import Panel = Muicss.Panel;
+    export import Radio = Muicss.Radio;
+    export import Row = Muicss.Row;
+    export import Select = Muicss.Select;
+    export import Tab = Muicss.Tab;
+    export import Tabs = Muicss.Tabs;
+    export import Textarea = Muicss.Textarea;
+}
+
+declare module 'muicss/lib/react/appbar' {
+    export import Appbar = Muicss.Appbar;
+    export default Appbar;
+}
+
+declare module 'muicss/lib/react/button' {
+    export import Button = Muicss.Button;
+    export default Button;
+}
+
+declare module 'muicss/lib/react/checkbox' {
+    export import Checkbox = Muicss.Checkbox;
+    export default Checkbox;
+}
+
+declare module 'muicss/lib/react/col' {
+    export import Col = Muicss.Col;
+    export default Col;
+}
+
+declare module 'muicss/lib/react/container' {
+    export import Container = Muicss.Container;
+    export default Container;
+}
+
+declare module 'muicss/lib/react/divider' {
+    export import Divider = Muicss.Divider;
+    export default Divider;
+}
+
+declare module 'muicss/lib/react/dropdown' {
+    export import Dropdown = Muicss.Dropdown;
+    export default Dropdown;
+}
+
+declare module 'muicss/lib/react/dropdown-item' {
+    export import DropdownItem = Muicss.DropdownItem;
+    export default DropdownItem;
+}
+
+declare module 'muicss/lib/react/form' {
+    export import Form = Muicss.Form;
+    export default Form;
+}
+
+declare module 'muicss/lib/react/input' {
+    export import Input = Muicss.Input;
+    export default Input;
+}
+
+declare module 'muicss/lib/react/option' {
+    export import Option = Muicss.Option;
+    export default Option;
+}
+
+declare module 'muicss/lib/react/panel' {
+    export import Panel = Muicss.Panel;
+    export default Panel;
+}
+
+declare module 'muicss/lib/react/radio' {
+    export import Radio = Muicss.Radio;
+    export default Radio;
+}
+
+declare module 'muicss/lib/react/row' {
+    export import Row = Muicss.Row;
+    export default Row;
+}
+
+declare module 'muicss/lib/react/select' {
+    export import Select = Muicss.Select;
+    export default Select;
+}
+
+declare module 'muicss/lib/react/tab' {
+    export import Tab = Muicss.Tab;
+    export default Tab;
+}
+
+declare module 'muicss/lib/react/tabs' {
+    export import Tabs = Muicss.Tabs;
+    export default Tabs;
+}
+
+declare module 'muicss/lib/react/textarea' {
+    export import Textarea = Muicss.Textarea;
+    export default Textarea;
+}
+
+declare namespace Muicss {
+    export class Appbar extends React.Component<DivProps> {}
+    export class Button extends React.Component<ButtonProps> {}
+    export class Checkbox extends React.Component<CheckboxProps> {}
+    export class Col extends React.Component<ColProps> {}
+    export class Container extends React.Component<ContainerProps> {}
+    export class Divider extends React.Component<DividerProps> {}
+    export class Dropdown extends React.Component<DropdownProps> {}
+    export class DropdownItem extends React.Component<DropdownItemProps> {}
+    export class Form extends React.Component<FormProps> {}
+    export class Input extends React.Component<InputProps> {}
+    export class Panel extends React.Component<PanelProps> {}
+    export class Option extends React.Component<OptionProps> {}
+    export class Radio extends React.Component<RadioProps> {}
+    export class Row extends React.Component<RowProps> {}
+    export class Select extends React.Component<SelectProps> {}
+    export class Tab extends React.Component<TabProps> {}
+    export class Tabs extends React.Component<TabsProps> {}
+    export class Textarea extends React.Component<TextareaProps> {}
+
+    export interface ButtonProps extends React.DetailedHTMLFactory<React.ButtonHTMLAttributes<HTMLButtonElement>, HTMLButtonElement> {
+        color?: string;
+        size?: string;
+        variant?: string;
+        onMouseDown?: React.MouseEventHandler<{}>;
+        onMouseUp?: React.MouseEventHandler<{}>;
+        onMouseLeave?: React.MouseEventHandler<{}>;
+        onTouchStart?: React.MouseEventHandler<{}>;
+        onTouchEnd?: React.MouseEventHandler<{}>;
+    }
+
+    export interface CheckboxProps extends React.DetailedHTMLFactory<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement> {
+        label?: React.ReactNode;
+        autoFocus?: boolean;
+        checked?: boolean;
+        defaultChecked?: boolean;
+        defaultValue?: string | string[];
+        disabled?: boolean;
+        form?: string;
+        name?: string;
+        required?: boolean;
+        value?: string | string[] | number;
+        onChange?: React.ChangeEventHandler<HTMLInputElement>;
+    }
+
+    export interface ColProps extends DivProps {
+        xs?: number;
+        sm?: number;
+        md?: number;
+        lg?: number;
+        xl?: number;
+        'xs-offset'?: number;
+        'sm-offset'?: number;
+        'md-offset'?: number;
+        'lg-offset'?: number;
+        'xl-offset'?: number;
+    }
+
+    export interface ContainerProps extends DivProps {
+        fluid?: boolean;
+    }
+
+    export interface DivProps extends React.DetailedHTMLFactory<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement> {}
+    export interface DividerProps extends DivProps {}
+
+    export interface DropdownItemProps extends React.DetailedHTMLFactory<React.LiHTMLAttributes<HTMLLIElement>, HTMLLIElement> {
+        link?: string;
+        target?: string;
+        value?: any;
+    }
+
+    export interface DropdownProps extends React.DetailedHTMLFactory<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement> {
+        onSelect?: React.MouseEventHandler<HTMLDivElement>; // proxy of menu item's onClick
+        onClick?: React.MouseEventHandler<HTMLDivElement>; // click the button to show dropdown
+        onOutsideClick?: React.MouseEventHandler<HTMLDivElement>;
+        onKeyDown?: React.KeyboardEventHandler<HTMLDivElement>;
+
+        color?: string;
+        variant?: string;
+        size?: string;
+        label?: React.ReactNode;
+        alignMenu?: 'left' | 'right';
+        disabled?: boolean;
+    }
+
+    export interface FormProps extends React.DetailedHTMLFactory<React.FormHTMLAttributes<HTMLFormElement>, HTMLFormElement> {
+        inline?: boolean;
+    }
+
+    export interface InputProps extends React.DetailedHTMLFactory<React.InputHTMLAttributes<HTMLInputElement>, HTMLInputElement> {
+        inputRef?: React.Ref<HTMLInputElement>;
+        onLabelClick?: React.MouseEventHandler<HTMLInputElement>;
+        hint?: string; // placeholder
+        invalid?: boolean;
+        label?: React.ReactNode;
+        floatingLabel?: boolean;
+    }
+
+    export interface OptionProps extends React.DetailedHTMLFactory<React.OptionHTMLAttributes<HTMLOptionElement>, HTMLOptionElement> {
+        label?: string;
+        value?: string | string[] | number;
+    }
+
+    export interface PanelProps extends DivProps {}
+    export interface RadioProps extends CheckboxProps {}
+
+    export interface RowProps extends DivProps {
+        xs?: number;
+        sm?: number;
+        md?: number;
+        lg?: number;
+    }
+
+    export interface SelectProps extends DivProps {
+        label?: React.ReactNode;
+        name?: string;
+        readOnly?: boolean;
+        useDefault?: boolean;
+        onChange?: React.ChangeEventHandler<HTMLDivElement>;
+        onClick?: React.MouseEventHandler<HTMLDivElement>;
+        onKeyDown?: React.KeyboardEventHandler<HTMLDivElement>;
+    }
+
+    export interface TabProps {
+        value?: any;
+        label?: React.ReactNode;
+        onActive?: (tab: Tab) => void;
+    }
+
+    export interface TabsProps extends DivProps {
+        defaultSelectedIndex?: number;
+        selectedIndex?: number;
+        justified?: boolean;
+        onChange?: (index: number, value: any, tab: Tab, event: Event) => void;
+    }
+
+    export interface TextareaProps extends React.DetailedHTMLFactory<React.TextareaHTMLAttributes<HTMLTextAreaElement>, HTMLTextAreaElement> {
+        inputRef?: React.Ref<HTMLTextAreaElement>;
+        onLabelClick?: React.MouseEventHandler<HTMLInputElement>;
+        hint?: string; // placeholder
+        invalid?: boolean;
+        label?: React.ReactNode;
+        floatingLabel?: boolean;
+    }
+}
diff --git a/types/muicss-react/muicss-react-tests.tsx b/types/muicss-react/muicss-react-tests.tsx
new file mode 100644
index 0000000000..6fcdf76cb5
--- /dev/null
+++ b/types/muicss-react/muicss-react-tests.tsx
@@ -0,0 +1,203 @@
+import * as React from 'react';
+import { Component } from 'react';
+import * as ReactDOM from 'react-dom';
+
+import {
+    Appbar,
+    Button,
+    Checkbox,
+    Col,
+    Container,
+    Divider,
+    Dropdown,
+    DropdownItem,
+    Form,
+    Input,
+    Option,
+    Panel,
+    Radio,
+    Row,
+    Select,
+    Tab,
+    Tabs,
+    Textarea
+} from 'muicss/react';
+
+import Appbar2 from 'muicss/lib/react/appbar';
+import Button2 from 'muicss/lib/react/button';
+import Checkbox2 from 'muicss/lib/react/checkbox';
+import Col2 from 'muicss/lib/react/col';
+import Container2 from 'muicss/lib/react/container';
+import Divider2 from 'muicss/lib/react/divider';
+import Dropdown2 from 'muicss/lib/react/dropdown';
+import DropdownItem2 from 'muicss/lib/react/dropdown-item';
+import Form2 from 'muicss/lib/react/form';
+import Input2 from 'muicss/lib/react/input';
+import Option2 from 'muicss/lib/react/option';
+import Panel2 from 'muicss/lib/react/panel';
+import Radio2 from 'muicss/lib/react/radio';
+import Row2 from 'muicss/lib/react/row';
+import Select2 from 'muicss/lib/react/select';
+import Tab2 from 'muicss/lib/react/tab';
+import Tabs2 from 'muicss/lib/react/tabs';
+import Textarea2 from 'muicss/lib/react/textarea';
+
+interface Props {}
+
+class Test extends Component<Props> {
+    render() {
+        return (
+            <div>
+                <Appbar>Test application</Appbar>
+                <Container fluid={true}>
+                    <Row>
+                        <Col md={3} xs={12}>
+                            Link
+                            <Divider/>
+                            Link
+                        </Col>
+                        <Col md={4} xs={12}>
+                            <Tabs defaultSelectedIndex={0}>
+                                <Tab label="One">
+                                    <Form>
+                                        <legend>Test form</legend>
+
+                                        <Input label="Text input"
+                                               hint="Type something"
+                                               />
+
+                                        <Textarea label="Text area"
+                                                  hint="Type lots of something"
+                                                  />
+
+                                        <Checkbox label="Check"
+                                                  value="whatever"
+                                                  defaultChecked={false}
+                                                  />
+
+                                        <Radio name="radios"
+                                               label="Radio 1"
+                                               value="r1"
+                                               />
+
+                                        <Radio name="radios"
+                                               label="Radio 2"
+                                               value="r2"
+                                               />
+
+                                        <Radio name="radios"
+                                               label="Radio 3"
+                                               value="r3"
+                                               />
+
+                                        <Dropdown label="dropdown">
+                                            <DropdownItem value={1}>One</DropdownItem>
+                                            <DropdownItem value={2}>Two</DropdownItem>
+                                            <DropdownItem value={3}>Three</DropdownItem>
+                                        </Dropdown>
+
+                                        <Select label="select">
+                                            <Option value={1} label="One" />
+                                            <Option value={2} label="Two" />
+                                            <Option value={3} label="Three" />
+                                        </Select>
+
+                                        <Button>Submit</Button>
+                                    </Form>
+                                </Tab>
+                                <Tab label="Two">
+
+                                    <Panel>
+                                        I'm inside a panel!
+                                    </Panel>
+
+                                </Tab>
+                            </Tabs>
+                        </Col>
+                    </Row>
+                    <Button color="primary">button</Button>
+                </Container>
+            </div>
+        );
+    }
+}
+
+class Test2 extends Component<Props> {
+    render() {
+        return (
+            <div>
+                <Appbar2>Test application</Appbar2>
+                <Container2 fluid={true}>
+                    <Row2>
+                        <Col2 md={3} xs={12}>
+                            Link
+                            <Divider2/>
+                            Link
+                        </Col2>
+                        <Col2 md={4} xs={12}>
+                            <Tabs2 defaultSelectedIndex={0}>
+                                <Tab2 label="One">
+                                    <Form2>
+                                        <legend>Test form</legend>
+
+                                        <Input2 label="Text input"
+                                               hint="Type something"
+                                        />
+
+                                        <Textarea2 label="Text area"
+                                                  hint="Type lots of something"
+                                        />
+
+                                        <Checkbox2 label="Check"
+                                                  value="whatever"
+                                                  defaultChecked={false}
+                                        />
+
+                                        <Radio2 name="radios"
+                                               label="Radio 1"
+                                               value="r1"
+                                        />
+
+                                        <Radio2 name="radios"
+                                               label="Radio 2"
+                                               value="r2"
+                                        />
+
+                                        <Radio2 name="radios"
+                                               label="Radio 3"
+                                               value="r3"
+                                        />
+
+                                        <Dropdown2 label="dropdown">
+                                            <DropdownItem2 value={1}>One</DropdownItem2>
+                                            <DropdownItem2 value={2}>Two</DropdownItem2>
+                                            <DropdownItem2 value={3}>Three</DropdownItem2>
+                                        </Dropdown2>
+
+                                        <Select2 label="select">
+                                            <Option2 value={1} label="One" />
+                                            <Option2 value={2} label="Two" />
+                                            <Option2 value={3} label="Three" />
+                                        </Select2>
+
+                                        <Button2>Submit</Button2>
+                                    </Form2>
+                                </Tab2>
+                                <Tab2 label="Two">
+
+                                    <Panel2>
+                                        I'm inside a panel!
+                                    </Panel2>
+
+                                </Tab2>
+                            </Tabs2>
+                        </Col2>
+                    </Row2>
+                    <Button2 color="primary">button</Button2>
+                </Container2>
+            </div>
+        );
+    }
+}
+
+ReactDOM.render(<Test />, document.getElementById('root'));
diff --git a/types/muicss-react/tsconfig.json b/types/muicss-react/tsconfig.json
new file mode 100644
index 0000000000..51741cfc48
--- /dev/null
+++ b/types/muicss-react/tsconfig.json
@@ -0,0 +1,27 @@
+{
+    "files": [
+        "index.d.ts",
+        "muicss-react-tests.tsx"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": false,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": false,
+        "baseUrl": "../",
+        "jsx": "react",
+        "experimentalDecorators": true,
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "esModuleInterop": true
+    }
+}
diff --git a/types/muicss-react/tslint.json b/types/muicss-react/tslint.json
new file mode 100644
index 0000000000..b8cee022bf
--- /dev/null
+++ b/types/muicss-react/tslint.json
@@ -0,0 +1,17 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        // TODOs
+        "ban-types": false,
+        "dt-header": false,
+        "no-any-union": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-empty-interface": false,
+        "no-mergeable-namespace": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "strict-export-declare-modifiers": false,
+        "use-default-type-parameter": false
+    }
+}
\ No newline at end of file

From 722a3b0a0a4e04766cca4487c16b8b386a11ad62 Mon Sep 17 00:00:00 2001
From: Kyle Buzby <kbuzby@epic.com>
Date: Wed, 14 Feb 2018 18:30:27 -0600
Subject: [PATCH 0047/1382] add dts-gen files

---
 types/postman-collection/index.d.ts           | 5877 +++++++++++++++++
 .../postman-collection-tests.ts               |    0
 types/postman-collection/tsconfig.json        |   22 +
 types/postman-collection/tslint.json          |    1 +
 4 files changed, 5900 insertions(+)
 create mode 100644 types/postman-collection/index.d.ts
 create mode 100644 types/postman-collection/postman-collection-tests.ts
 create mode 100644 types/postman-collection/tsconfig.json
 create mode 100644 types/postman-collection/tslint.json

diff --git a/types/postman-collection/index.d.ts b/types/postman-collection/index.d.ts
new file mode 100644
index 0000000000..92e39e82d2
--- /dev/null
+++ b/types/postman-collection/index.d.ts
@@ -0,0 +1,5877 @@
+// Type definitions for postman-collection 3.0
+// Project: https://github.com/postmanlabs/postman-collection#readme
+// Definitions by: My Self <https://github.com/me>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export class Certificate {
+    constructor(options: any, ...args: any[]);
+
+    canApplyTo(url: any): any;
+
+    toJSON(): any;
+
+    update(options: any): void;
+
+    static isCertificate(obj: any): any;
+
+}
+
+export class CertificateList {
+    constructor(parent: any, list: any);
+
+    resolveOne(url: any): any;
+
+    static isCertificateList(obj: any): any;
+
+}
+
+export class Collection {
+    constructor(definition: any, environments: any);
+
+    syncVariablesFrom(obj: any, track: any): any;
+
+    syncVariablesTo(obj: any): any;
+
+    toJSON(): any;
+
+    static isCollection(obj: any): any;
+
+}
+
+export class Cookie {
+    constructor(options: any);
+
+    update(options: any): void;
+
+    valueOf(): any;
+
+    static isCookie(obj: any): any;
+
+    static parse(str: any): any;
+
+    static splitParam(param: any): any;
+
+}
+
+export class Description {
+    constructor(definition: any);
+
+    toJSON(): any;
+
+    toString(): any;
+
+    update(content: any, type: any): void;
+
+    static isDescription(obj: any): any;
+
+}
+
+export class Event {
+    constructor(definition: any);
+
+    update(definition: any): void;
+
+}
+
+export class EventList {
+    constructor(parent: any, populate: any);
+
+    listeners(name: any): any;
+
+    listenersOwn(name: any): any;
+
+    static isEventList(obj: any): any;
+
+}
+
+export class FormParam {
+    constructor(options: any, ...args: any[]);
+
+    toString(): any;
+
+    valueOf(): any;
+
+    static parse(): void;
+
+}
+
+export class Header {
+    constructor(options: any, name: any, ...args: any[]);
+
+    toString(): any;
+
+    update(options: any): void;
+
+    valueOf(): any;
+
+    static create(...args: any[]): any;
+
+    static isHeader(obj: any): any;
+
+    static parse(headerString: any): any;
+
+    static parseSingle(header: any): any;
+
+    static unparse(headers: any, separator: any): any;
+
+    static unparseSingle(header: any): any;
+
+}
+
+export class HeaderList {
+    constructor(parent: any, headers: any);
+
+    contentSize(): any;
+
+    static isHeaderList(obj: any): any;
+
+}
+
+export class Item {
+    constructor(definition: any, ...args: any[]);
+
+    authorizeRequestUsing(type: any, options: any): any;
+
+    getAuth(): any;
+
+    getEvents(name: any): any;
+
+    static isItem(obj: any): any;
+
+}
+
+export class ItemGroup {
+    constructor(definition: any, ...args: any[]);
+
+    authorizeRequestsUsing(type: any, options: any): void;
+
+    forEachItem(callback: any): any;
+
+    forEachItemGroup(callback: any): void;
+
+    oneDeep(idOrName: any): any;
+
+    static isItemGroup(obj: any): any;
+
+}
+
+export class Property {
+    constructor(definition: any, ...args: any[]);
+
+    describe(content: any, type: any): void;
+
+    toObjectResolved(scope: any, overrides: any, options: any): any;
+
+    static replaceSubstitutions(str: any, variables: any, ...args: any[]): any;
+
+    static replaceSubstitutionsIn(obj: any, variables: any, mutate: any): any;
+
+}
+
+export class PropertyBase {
+    constructor(definition: any);
+
+    findInParents(property: any, customizer: any): any;
+
+    findParentContaining(property: any, customizer: any): any;
+
+    forEachParent(options: any, iterator: any): void;
+
+    meta(...args: any[]): any;
+
+    parent(): any;
+
+    setParent(parent: any): void;
+
+    toJSON(): any;
+
+    static propertyIsMeta(value: any, key: any): any;
+
+    static propertyUnprefixMeta(value: any, key: any): any;
+
+    static toJSON(obj: any): any;
+
+}
+
+export class PropertyList {
+    constructor(type: any, parent: any, populate: any);
+
+    add(item: any, ...args: any[]): void;
+
+    all(): any;
+
+    append(item: any): any;
+
+    assimilate(source: any, prune: any): void;
+
+    clear(): void;
+
+    count(): any;
+
+    each(iterator: any, context: any): void;
+
+    eachParent(iterator: any, context: any): void;
+
+    filter(rule: any, context: any): any;
+
+    find(rule: any, context: any): any;
+
+    get(key: any): any;
+
+    has(item: any, value: any, ...args: any[]): any;
+
+    idx(index: any): any;
+
+    indexOf(item: any): any;
+
+    insert(item: any, before: any): void;
+
+    insertAfter(item: any, after: any): any;
+
+    map(iterator: any, context: any): any;
+
+    one(id: any): any;
+
+    populate(items: any): void;
+
+    prepend(item: any): any;
+
+    remove(predicate: any, context: any, ...args: any[]): any;
+
+    repopulate(items: any): void;
+
+    toJSON(): any;
+
+    toObject(excludeDisabled: any, caseSensitive: any, multiValue: any, sanitizeKeys: any): any;
+
+    toString(): any;
+
+    upsert(item: any): any;
+
+    static isPropertyList(obj: any): any;
+
+}
+
+export class ProxyConfig {
+    constructor(options: any);
+
+    getProtocols(): any;
+
+    getProxyUrl(): any;
+
+    test(urlStr: any): any;
+
+    update(options: any): void;
+
+    updateProtocols(protocols: any): void;
+
+    static isProxyConfig(obj: any): any;
+
+}
+
+export class ProxyConfigList {
+    constructor(parent: any, populate: any);
+
+    resolve(url: any): any;
+
+    static isProxyConfigList(obj: any): any;
+
+}
+
+export class QueryParam {
+    constructor(options: any, ...args: any[]);
+
+    toString(): any;
+
+    update(param: any): void;
+
+    valueOf(): any;
+
+    static parse(query: any): any;
+
+    static parseSingle(param: any, idx: any, all: any): any;
+
+    static unparse(params: any, options: any): any;
+
+    static unparseSingle(obj: any, encode: any): any;
+
+}
+
+export class Request {
+    constructor(options: any, ...args: any[]);
+
+    addHeader(header: any): void;
+
+    addQueryParams(params: any): void;
+
+    authorize(): void;
+
+    authorizeUsing(type: any, options: any): void;
+
+    clone(): any;
+
+    forEachHeader(callback: any): any;
+
+    getHeaders(options: any): any;
+
+    removeHeader(toRemove: any, options: any): any;
+
+    removeQueryParams(params: any): void;
+
+    toJSON(): any;
+
+    update(options: any): void;
+
+    upsertHeader(header: any): any;
+
+    static isRequest(obj: any): any;
+
+}
+
+export class RequestAuth {
+    constructor(options: any, parent: any);
+
+    clear(type: any): void;
+
+    current(): any;
+
+    parameters(): any;
+
+    update(options: any, type: any): void;
+
+    use(type: any, options: any): void;
+
+    static isValidType(type: any): any;
+
+}
+
+export class RequestBody {
+    constructor(options: any, ...args: any[]);
+
+    isEmpty(): any;
+
+    toString(): any;
+
+    update(options: any): void;
+
+    static MODES: {
+        file: string;
+        formdata: string;
+        raw: string;
+        urlencoded: string;
+    };
+
+}
+
+export class Response {
+    constructor(options: any, ...args: any[]);
+
+    dataURI(): any;
+
+    details(): any;
+
+    encoding(): any;
+
+    json(reviver: any, strict: any): any;
+
+    mime(contentType: any, contentDisposition: any): any;
+
+    reason(): any;
+
+    size(): any;
+
+    text(): any;
+
+    toJSON(): any;
+
+    update(options: any): void;
+
+    static createFromNode(response: any, cookies: any): any;
+
+    static isResponse(obj: any): any;
+
+    static mimeInfo(type: any, disposition: any): any;
+
+}
+
+export class Script {
+    constructor(options: any, ...args: any[]);
+
+    toSource(): any;
+
+    update(options: any): void;
+
+    static isScript(obj: any): any;
+
+}
+
+export class Url {
+    constructor(options: any, ...args: any[]);
+
+    addQueryParams(params: any): void;
+
+    getHost(): any;
+
+    getOAuth1BaseUrl(): any;
+
+    getPath(options: any): any;
+
+    getPathWithQuery(): any;
+
+    getQueryString(options: any): any;
+
+    getRaw(): any;
+
+    getRemote(options: any): any;
+
+    removeQueryParams(params: any): any;
+
+    toString(forceProtocol: any): any;
+
+    update(url: any): any;
+
+    static isUrl(obj: any): any;
+
+    static parse(url: any): any;
+
+}
+
+export class UrlMatchPattern {
+    constructor(options: any, ...args: any[]);
+
+    createMatchPattern(): any;
+
+    getProtocols(): any;
+
+    globPatternToRegexp(pattern: any): any;
+
+    matchAbsoluteHostPattern(matchRegexObject: any, remote: any): any;
+
+    matchAnyHost(matchRegexObject: any): any;
+
+    matchSuffixHostPattern(matchRegexObject: any, remote: any): any;
+
+    test(urlStr: any): any;
+
+    testHost(host: any): any;
+
+    testPath(path: any): any;
+
+    testProtocol(protocol: any): any;
+
+    toJSON(): any;
+
+    toString(): any;
+
+    update(options: any): void;
+
+    static MATCH_ALL_URLS: string;
+
+    static PROTOCOL_DELIMITER: string;
+
+}
+
+export class UrlMatchPatternList {
+    constructor(parent: any, list: any);
+
+    test(urlStr: any): any;
+
+}
+
+export class Variable {
+    constructor(definition: any, ...args: any[]);
+
+    cast(value: any): any;
+
+    castIn(value: any): any;
+
+    castOut(value: any): any;
+
+    get(): any;
+
+    set(value: any): void;
+
+    toString(): any;
+
+    update(options: any): void;
+
+    valueOf(value: any, ...args: any[]): any;
+
+    valueType(typeName: any, _noCast: any): any;
+
+    static isVariable(obj: any): any;
+
+}
+
+export class VariableList {
+    constructor(parent: any, populate: any);
+
+    replace(str: any, overrides: any): any;
+
+    substitute(obj: any, overrides: any, mutate: any): any;
+
+    syncFromObject(obj: any, track: any, prune: any): any;
+
+    syncToObject(obj: any): any;
+
+    static isVariableList(obj: any): any;
+
+}
+
+export class VariableScope {
+    constructor(definition: any, layers: any);
+
+    addLayer(list: any): void;
+
+    clear(): void;
+
+    get(key: any): any;
+
+    has(variableName: any): any;
+
+    set(key: any, value: any, type: any): any;
+
+    syncVariablesFrom(obj: any, track: any): any;
+
+    syncVariablesTo(obj: any): any;
+
+    toJSON(): any;
+
+    toObject(excludeDisabled: any, caseSensitive: any): any;
+
+    unset(key: any): void;
+
+    variables(): any;
+
+    static isVariableScope(obj: any): any;
+
+}
+
+export class Version {
+    constructor(options: any);
+
+    set(value: any): void;
+
+    toString(): any;
+
+}
+
+export function CookieList(parent: any, cookies: any): void;
+
+export namespace Certificate {
+    namespace isCertificate {
+        const prototype: {
+        };
+
+    }
+
+    namespace prototype {
+        function canApplyTo(url: any): any;
+
+        function describe(content: any, type: any): void;
+
+        function findInParents(property: any, customizer: any): any;
+
+        function findParentContaining(property: any, customizer: any): any;
+
+        function forEachParent(options: any, iterator: any): void;
+
+        function meta(...args: any[]): any;
+
+        function parent(): any;
+
+        function setParent(parent: any): void;
+
+        function toJSON(): any;
+
+        function toObjectResolved(scope: any, overrides: any, options: any): any;
+
+        function update(options: any): void;
+
+        namespace canApplyTo {
+            const prototype: {
+            };
+
+        }
+
+        namespace describe {
+            const prototype: {
+            };
+
+        }
+
+        namespace findInParents {
+            const prototype: {
+            };
+
+        }
+
+        namespace findParentContaining {
+            const prototype: {
+            };
+
+        }
+
+        namespace forEachParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace meta {
+            const prototype: {
+            };
+
+        }
+
+        namespace parent {
+            const prototype: {
+            };
+
+        }
+
+        namespace setParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace toJSON {
+            const prototype: {
+            };
+
+        }
+
+        namespace toObjectResolved {
+            const prototype: {
+            };
+
+        }
+
+        namespace update {
+            const prototype: {
+            };
+
+        }
+
+    }
+
+}
+
+export namespace CertificateList {
+    namespace isCertificateList {
+        const prototype: {
+        };
+
+    }
+
+    namespace prototype {
+        function add(item: any, ...args: any[]): void;
+
+        function all(): any;
+
+        function append(item: any): any;
+
+        function assimilate(source: any, prune: any): void;
+
+        function clear(): void;
+
+        function count(): any;
+
+        function each(iterator: any, context: any): void;
+
+        function eachParent(iterator: any, context: any): void;
+
+        function filter(rule: any, context: any): any;
+
+        function find(rule: any, context: any): any;
+
+        function findInParents(property: any, customizer: any): any;
+
+        function findParentContaining(property: any, customizer: any): any;
+
+        function forEachParent(options: any, iterator: any): void;
+
+        function get(key: any): any;
+
+        function has(item: any, value: any, ...args: any[]): any;
+
+        function idx(index: any): any;
+
+        function indexOf(item: any): any;
+
+        function insert(item: any, before: any): void;
+
+        function insertAfter(item: any, after: any): any;
+
+        function map(iterator: any, context: any): any;
+
+        function meta(...args: any[]): any;
+
+        function one(id: any): any;
+
+        function parent(): any;
+
+        function populate(items: any): void;
+
+        function prepend(item: any): any;
+
+        function remove(predicate: any, context: any, ...args: any[]): any;
+
+        function repopulate(items: any): void;
+
+        function resolveOne(url: any): any;
+
+        function setParent(parent: any): void;
+
+        function toJSON(): any;
+
+        function toObject(excludeDisabled: any, caseSensitive: any, multiValue: any, sanitizeKeys: any): any;
+
+        function toString(): any;
+
+        function upsert(item: any): any;
+
+        namespace add {
+            const prototype: {
+            };
+
+        }
+
+        namespace all {
+            const prototype: {
+            };
+
+        }
+
+        namespace append {
+            const prototype: {
+            };
+
+        }
+
+        namespace assimilate {
+            const prototype: {
+            };
+
+        }
+
+        namespace clear {
+            const prototype: {
+            };
+
+        }
+
+        namespace count {
+            const prototype: {
+            };
+
+        }
+
+        namespace each {
+            const prototype: {
+            };
+
+        }
+
+        namespace eachParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace filter {
+            const prototype: {
+            };
+
+        }
+
+        namespace find {
+            const prototype: {
+            };
+
+        }
+
+        namespace findInParents {
+            const prototype: {
+            };
+
+        }
+
+        namespace findParentContaining {
+            const prototype: {
+            };
+
+        }
+
+        namespace forEachParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace get {
+            const prototype: {
+            };
+
+        }
+
+        namespace has {
+            const prototype: {
+            };
+
+        }
+
+        namespace idx {
+            const prototype: {
+            };
+
+        }
+
+        namespace indexOf {
+            const prototype: {
+            };
+
+        }
+
+        namespace insert {
+            const prototype: {
+            };
+
+        }
+
+        namespace insertAfter {
+            const prototype: {
+            };
+
+        }
+
+        namespace map {
+            const prototype: {
+            };
+
+        }
+
+        namespace meta {
+            const prototype: {
+            };
+
+        }
+
+        namespace one {
+            const prototype: {
+            };
+
+        }
+
+        namespace parent {
+            const prototype: {
+            };
+
+        }
+
+        namespace populate {
+            const prototype: {
+            };
+
+        }
+
+        namespace prepend {
+            const prototype: {
+            };
+
+        }
+
+        namespace remove {
+            const prototype: {
+            };
+
+        }
+
+        namespace repopulate {
+            const prototype: {
+            };
+
+        }
+
+        namespace resolveOne {
+            const prototype: {
+            };
+
+        }
+
+        namespace setParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace toJSON {
+            const prototype: {
+            };
+
+        }
+
+        namespace toObject {
+            const prototype: {
+            };
+
+        }
+
+        namespace toString {
+            const prototype: {
+            };
+
+        }
+
+        namespace upsert {
+            const prototype: {
+            };
+
+        }
+
+    }
+
+}
+
+export namespace Collection {
+    namespace isCollection {
+        const prototype: {
+        };
+
+    }
+
+    namespace prototype {
+        function authorizeRequestsUsing(type: any, options: any): void;
+
+        function describe(content: any, type: any): void;
+
+        function findInParents(property: any, customizer: any): any;
+
+        function findParentContaining(property: any, customizer: any): any;
+
+        function forEachItem(callback: any): any;
+
+        function forEachItemGroup(callback: any): void;
+
+        function forEachParent(options: any, iterator: any): void;
+
+        function meta(...args: any[]): any;
+
+        function oneDeep(idOrName: any): any;
+
+        function parent(): any;
+
+        function setParent(parent: any): void;
+
+        function syncVariablesFrom(obj: any, track: any): any;
+
+        function syncVariablesTo(obj: any): any;
+
+        function toJSON(): any;
+
+        function toObjectResolved(scope: any, overrides: any, options: any): any;
+
+        namespace authorizeRequestsUsing {
+            const prototype: {
+            };
+
+        }
+
+        namespace describe {
+            const prototype: {
+            };
+
+        }
+
+        namespace findInParents {
+            const prototype: {
+            };
+
+        }
+
+        namespace findParentContaining {
+            const prototype: {
+            };
+
+        }
+
+        namespace forEachItem {
+            const prototype: {
+            };
+
+        }
+
+        namespace forEachItemGroup {
+            const prototype: {
+            };
+
+        }
+
+        namespace forEachParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace meta {
+            const prototype: {
+            };
+
+        }
+
+        namespace oneDeep {
+            const prototype: {
+            };
+
+        }
+
+        namespace parent {
+            const prototype: {
+            };
+
+        }
+
+        namespace setParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace syncVariablesFrom {
+            const prototype: {
+            };
+
+        }
+
+        namespace syncVariablesTo {
+            const prototype: {
+            };
+
+        }
+
+        namespace toJSON {
+            const prototype: {
+            };
+
+        }
+
+        namespace toObjectResolved {
+            const prototype: {
+            };
+
+        }
+
+    }
+
+}
+
+export namespace Cookie {
+    namespace isCookie {
+        const prototype: {
+        };
+
+    }
+
+    namespace parse {
+        const prototype: {
+        };
+
+    }
+
+    namespace prototype {
+        function findInParents(property: any, customizer: any): any;
+
+        function findParentContaining(property: any, customizer: any): any;
+
+        function forEachParent(options: any, iterator: any): void;
+
+        function meta(...args: any[]): any;
+
+        function parent(): any;
+
+        function setParent(parent: any): void;
+
+        function toJSON(): any;
+
+        function update(options: any): void;
+
+        function valueOf(): any;
+
+        namespace findInParents {
+            const prototype: {
+            };
+
+        }
+
+        namespace findParentContaining {
+            const prototype: {
+            };
+
+        }
+
+        namespace forEachParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace meta {
+            const prototype: {
+            };
+
+        }
+
+        namespace parent {
+            const prototype: {
+            };
+
+        }
+
+        namespace setParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace toJSON {
+            const prototype: {
+            };
+
+        }
+
+        namespace update {
+            const prototype: {
+            };
+
+        }
+
+        namespace valueOf {
+            const prototype: {
+            };
+
+        }
+
+    }
+
+    namespace splitParam {
+        const prototype: {
+        };
+
+    }
+
+}
+
+export namespace CookieList {
+    function isCookieList(obj: any): any;
+
+    namespace isCookieList {
+        const prototype: {
+        };
+
+    }
+
+    namespace prototype {
+        function add(item: any, ...args: any[]): void;
+
+        function all(): any;
+
+        function append(item: any): any;
+
+        function assimilate(source: any, prune: any): void;
+
+        function clear(): void;
+
+        function count(): any;
+
+        function each(iterator: any, context: any): void;
+
+        function eachParent(iterator: any, context: any): void;
+
+        function filter(rule: any, context: any): any;
+
+        function find(rule: any, context: any): any;
+
+        function findInParents(property: any, customizer: any): any;
+
+        function findParentContaining(property: any, customizer: any): any;
+
+        function forEachParent(options: any, iterator: any): void;
+
+        function get(key: any): any;
+
+        function has(item: any, value: any, ...args: any[]): any;
+
+        function idx(index: any): any;
+
+        function indexOf(item: any): any;
+
+        function insert(item: any, before: any): void;
+
+        function insertAfter(item: any, after: any): any;
+
+        function map(iterator: any, context: any): any;
+
+        function meta(...args: any[]): any;
+
+        function one(id: any): any;
+
+        function parent(): any;
+
+        function populate(items: any): void;
+
+        function prepend(item: any): any;
+
+        function remove(predicate: any, context: any, ...args: any[]): any;
+
+        function repopulate(items: any): void;
+
+        function setParent(parent: any): void;
+
+        function toJSON(): any;
+
+        function toObject(excludeDisabled: any, caseSensitive: any, multiValue: any, sanitizeKeys: any): any;
+
+        function toString(): any;
+
+        function upsert(item: any): any;
+
+        namespace add {
+            const prototype: {
+            };
+
+        }
+
+        namespace all {
+            const prototype: {
+            };
+
+        }
+
+        namespace append {
+            const prototype: {
+            };
+
+        }
+
+        namespace assimilate {
+            const prototype: {
+            };
+
+        }
+
+        namespace clear {
+            const prototype: {
+            };
+
+        }
+
+        namespace count {
+            const prototype: {
+            };
+
+        }
+
+        namespace each {
+            const prototype: {
+            };
+
+        }
+
+        namespace eachParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace filter {
+            const prototype: {
+            };
+
+        }
+
+        namespace find {
+            const prototype: {
+            };
+
+        }
+
+        namespace findInParents {
+            const prototype: {
+            };
+
+        }
+
+        namespace findParentContaining {
+            const prototype: {
+            };
+
+        }
+
+        namespace forEachParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace get {
+            const prototype: {
+            };
+
+        }
+
+        namespace has {
+            const prototype: {
+            };
+
+        }
+
+        namespace idx {
+            const prototype: {
+            };
+
+        }
+
+        namespace indexOf {
+            const prototype: {
+            };
+
+        }
+
+        namespace insert {
+            const prototype: {
+            };
+
+        }
+
+        namespace insertAfter {
+            const prototype: {
+            };
+
+        }
+
+        namespace map {
+            const prototype: {
+            };
+
+        }
+
+        namespace meta {
+            const prototype: {
+            };
+
+        }
+
+        namespace one {
+            const prototype: {
+            };
+
+        }
+
+        namespace parent {
+            const prototype: {
+            };
+
+        }
+
+        namespace populate {
+            const prototype: {
+            };
+
+        }
+
+        namespace prepend {
+            const prototype: {
+            };
+
+        }
+
+        namespace remove {
+            const prototype: {
+            };
+
+        }
+
+        namespace repopulate {
+            const prototype: {
+            };
+
+        }
+
+        namespace setParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace toJSON {
+            const prototype: {
+            };
+
+        }
+
+        namespace toObject {
+            const prototype: {
+            };
+
+        }
+
+        namespace toString {
+            const prototype: {
+            };
+
+        }
+
+        namespace upsert {
+            const prototype: {
+            };
+
+        }
+
+    }
+
+}
+
+export namespace Description {
+    namespace format {
+    }
+
+    namespace isDescription {
+        const prototype: {
+        };
+
+    }
+
+    namespace prototype {
+        function toJSON(): any;
+
+        function toString(): any;
+
+        function update(content: any, type: any): void;
+
+        namespace toJSON {
+            const prototype: {
+            };
+
+        }
+
+        namespace toString {
+            const prototype: {
+            };
+
+        }
+
+        namespace update {
+            const prototype: {
+            };
+
+        }
+
+    }
+
+}
+
+export namespace Event {
+    namespace prototype {
+        function describe(content: any, type: any): void;
+
+        function findInParents(property: any, customizer: any): any;
+
+        function findParentContaining(property: any, customizer: any): any;
+
+        function forEachParent(options: any, iterator: any): void;
+
+        function meta(...args: any[]): any;
+
+        function parent(): any;
+
+        function setParent(parent: any): void;
+
+        function toJSON(): any;
+
+        function toObjectResolved(scope: any, overrides: any, options: any): any;
+
+        function update(definition: any): void;
+
+        namespace describe {
+            const prototype: {
+            };
+
+        }
+
+        namespace findInParents {
+            const prototype: {
+            };
+
+        }
+
+        namespace findParentContaining {
+            const prototype: {
+            };
+
+        }
+
+        namespace forEachParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace meta {
+            const prototype: {
+            };
+
+        }
+
+        namespace parent {
+            const prototype: {
+            };
+
+        }
+
+        namespace setParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace toJSON {
+            const prototype: {
+            };
+
+        }
+
+        namespace toObjectResolved {
+            const prototype: {
+            };
+
+        }
+
+        namespace update {
+            const prototype: {
+            };
+
+        }
+
+    }
+
+}
+
+export namespace EventList {
+    namespace isEventList {
+        const prototype: {
+        };
+
+    }
+
+    namespace prototype {
+        function add(item: any, ...args: any[]): void;
+
+        function all(): any;
+
+        function append(item: any): any;
+
+        function assimilate(source: any, prune: any): void;
+
+        function clear(): void;
+
+        function count(): any;
+
+        function each(iterator: any, context: any): void;
+
+        function eachParent(iterator: any, context: any): void;
+
+        function filter(rule: any, context: any): any;
+
+        function find(rule: any, context: any): any;
+
+        function findInParents(property: any, customizer: any): any;
+
+        function findParentContaining(property: any, customizer: any): any;
+
+        function forEachParent(options: any, iterator: any): void;
+
+        function get(key: any): any;
+
+        function has(item: any, value: any, ...args: any[]): any;
+
+        function idx(index: any): any;
+
+        function indexOf(item: any): any;
+
+        function insert(item: any, before: any): void;
+
+        function insertAfter(item: any, after: any): any;
+
+        function listeners(name: any): any;
+
+        function listenersOwn(name: any): any;
+
+        function map(iterator: any, context: any): any;
+
+        function meta(...args: any[]): any;
+
+        function one(id: any): any;
+
+        function parent(): any;
+
+        function populate(items: any): void;
+
+        function prepend(item: any): any;
+
+        function remove(predicate: any, context: any, ...args: any[]): any;
+
+        function repopulate(items: any): void;
+
+        function setParent(parent: any): void;
+
+        function toJSON(): any;
+
+        function toObject(excludeDisabled: any, caseSensitive: any, multiValue: any, sanitizeKeys: any): any;
+
+        function toString(): any;
+
+        function upsert(item: any): any;
+
+        namespace add {
+            const prototype: {
+            };
+
+        }
+
+        namespace all {
+            const prototype: {
+            };
+
+        }
+
+        namespace append {
+            const prototype: {
+            };
+
+        }
+
+        namespace assimilate {
+            const prototype: {
+            };
+
+        }
+
+        namespace clear {
+            const prototype: {
+            };
+
+        }
+
+        namespace count {
+            const prototype: {
+            };
+
+        }
+
+        namespace each {
+            const prototype: {
+            };
+
+        }
+
+        namespace eachParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace filter {
+            const prototype: {
+            };
+
+        }
+
+        namespace find {
+            const prototype: {
+            };
+
+        }
+
+        namespace findInParents {
+            const prototype: {
+            };
+
+        }
+
+        namespace findParentContaining {
+            const prototype: {
+            };
+
+        }
+
+        namespace forEachParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace get {
+            const prototype: {
+            };
+
+        }
+
+        namespace has {
+            const prototype: {
+            };
+
+        }
+
+        namespace idx {
+            const prototype: {
+            };
+
+        }
+
+        namespace indexOf {
+            const prototype: {
+            };
+
+        }
+
+        namespace insert {
+            const prototype: {
+            };
+
+        }
+
+        namespace insertAfter {
+            const prototype: {
+            };
+
+        }
+
+        namespace listeners {
+            const prototype: {
+            };
+
+        }
+
+        namespace listenersOwn {
+            const prototype: {
+            };
+
+        }
+
+        namespace map {
+            const prototype: {
+            };
+
+        }
+
+        namespace meta {
+            const prototype: {
+            };
+
+        }
+
+        namespace one {
+            const prototype: {
+            };
+
+        }
+
+        namespace parent {
+            const prototype: {
+            };
+
+        }
+
+        namespace populate {
+            const prototype: {
+            };
+
+        }
+
+        namespace prepend {
+            const prototype: {
+            };
+
+        }
+
+        namespace remove {
+            const prototype: {
+            };
+
+        }
+
+        namespace repopulate {
+            const prototype: {
+            };
+
+        }
+
+        namespace setParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace toJSON {
+            const prototype: {
+            };
+
+        }
+
+        namespace toObject {
+            const prototype: {
+            };
+
+        }
+
+        namespace toString {
+            const prototype: {
+            };
+
+        }
+
+        namespace upsert {
+            const prototype: {
+            };
+
+        }
+
+    }
+
+}
+
+export namespace FormParam {
+    namespace parse {
+        const prototype: {
+        };
+
+    }
+
+    namespace prototype {
+        function describe(content: any, type: any): void;
+
+        function findInParents(property: any, customizer: any): any;
+
+        function findParentContaining(property: any, customizer: any): any;
+
+        function forEachParent(options: any, iterator: any): void;
+
+        function meta(...args: any[]): any;
+
+        function parent(): any;
+
+        function setParent(parent: any): void;
+
+        function toJSON(): any;
+
+        function toObjectResolved(scope: any, overrides: any, options: any): any;
+
+        function toString(): any;
+
+        function valueOf(): any;
+
+        namespace describe {
+            const prototype: {
+            };
+
+        }
+
+        namespace findInParents {
+            const prototype: {
+            };
+
+        }
+
+        namespace findParentContaining {
+            const prototype: {
+            };
+
+        }
+
+        namespace forEachParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace meta {
+            const prototype: {
+            };
+
+        }
+
+        namespace parent {
+            const prototype: {
+            };
+
+        }
+
+        namespace setParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace toJSON {
+            const prototype: {
+            };
+
+        }
+
+        namespace toObjectResolved {
+            const prototype: {
+            };
+
+        }
+
+        namespace toString {
+            const prototype: {
+            };
+
+        }
+
+        namespace valueOf {
+            const prototype: {
+            };
+
+        }
+
+    }
+
+}
+
+export namespace Header {
+    namespace create {
+        const prototype: {
+        };
+
+    }
+
+    namespace isHeader {
+        const prototype: {
+        };
+
+    }
+
+    namespace parse {
+        const prototype: {
+        };
+
+    }
+
+    namespace parseSingle {
+        const prototype: {
+        };
+
+    }
+
+    namespace prototype {
+        function describe(content: any, type: any): void;
+
+        function findInParents(property: any, customizer: any): any;
+
+        function findParentContaining(property: any, customizer: any): any;
+
+        function forEachParent(options: any, iterator: any): void;
+
+        function meta(...args: any[]): any;
+
+        function parent(): any;
+
+        function setParent(parent: any): void;
+
+        function toJSON(): any;
+
+        function toObjectResolved(scope: any, overrides: any, options: any): any;
+
+        function toString(): any;
+
+        function update(options: any): void;
+
+        function valueOf(): any;
+
+        namespace describe {
+            const prototype: {
+            };
+
+        }
+
+        namespace findInParents {
+            const prototype: {
+            };
+
+        }
+
+        namespace findParentContaining {
+            const prototype: {
+            };
+
+        }
+
+        namespace forEachParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace meta {
+            const prototype: {
+            };
+
+        }
+
+        namespace parent {
+            const prototype: {
+            };
+
+        }
+
+        namespace setParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace toJSON {
+            const prototype: {
+            };
+
+        }
+
+        namespace toObjectResolved {
+            const prototype: {
+            };
+
+        }
+
+        namespace toString {
+            const prototype: {
+            };
+
+        }
+
+        namespace update {
+            const prototype: {
+            };
+
+        }
+
+        namespace valueOf {
+            const prototype: {
+            };
+
+        }
+
+    }
+
+    namespace unparse {
+        const prototype: {
+        };
+
+    }
+
+    namespace unparseSingle {
+        const prototype: {
+        };
+
+    }
+
+}
+
+export namespace HeaderList {
+    namespace isHeaderList {
+        const prototype: {
+        };
+
+    }
+
+    namespace prototype {
+        function add(item: any, ...args: any[]): void;
+
+        function all(): any;
+
+        function append(item: any): any;
+
+        function assimilate(source: any, prune: any): void;
+
+        function clear(): void;
+
+        function contentSize(): any;
+
+        function count(): any;
+
+        function each(iterator: any, context: any): void;
+
+        function eachParent(iterator: any, context: any): void;
+
+        function filter(rule: any, context: any): any;
+
+        function find(rule: any, context: any): any;
+
+        function findInParents(property: any, customizer: any): any;
+
+        function findParentContaining(property: any, customizer: any): any;
+
+        function forEachParent(options: any, iterator: any): void;
+
+        function get(key: any): any;
+
+        function has(item: any, value: any, ...args: any[]): any;
+
+        function idx(index: any): any;
+
+        function indexOf(item: any): any;
+
+        function insert(item: any, before: any): void;
+
+        function insertAfter(item: any, after: any): any;
+
+        function map(iterator: any, context: any): any;
+
+        function meta(...args: any[]): any;
+
+        function one(id: any): any;
+
+        function parent(): any;
+
+        function populate(items: any): void;
+
+        function prepend(item: any): any;
+
+        function remove(predicate: any, context: any, ...args: any[]): any;
+
+        function repopulate(items: any): void;
+
+        function setParent(parent: any): void;
+
+        function toJSON(): any;
+
+        function toObject(excludeDisabled: any, caseSensitive: any, multiValue: any, sanitizeKeys: any): any;
+
+        function toString(): any;
+
+        function upsert(item: any): any;
+
+        namespace add {
+            const prototype: {
+            };
+
+        }
+
+        namespace all {
+            const prototype: {
+            };
+
+        }
+
+        namespace append {
+            const prototype: {
+            };
+
+        }
+
+        namespace assimilate {
+            const prototype: {
+            };
+
+        }
+
+        namespace clear {
+            const prototype: {
+            };
+
+        }
+
+        namespace contentSize {
+            const prototype: {
+            };
+
+        }
+
+        namespace count {
+            const prototype: {
+            };
+
+        }
+
+        namespace each {
+            const prototype: {
+            };
+
+        }
+
+        namespace eachParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace filter {
+            const prototype: {
+            };
+
+        }
+
+        namespace find {
+            const prototype: {
+            };
+
+        }
+
+        namespace findInParents {
+            const prototype: {
+            };
+
+        }
+
+        namespace findParentContaining {
+            const prototype: {
+            };
+
+        }
+
+        namespace forEachParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace get {
+            const prototype: {
+            };
+
+        }
+
+        namespace has {
+            const prototype: {
+            };
+
+        }
+
+        namespace idx {
+            const prototype: {
+            };
+
+        }
+
+        namespace indexOf {
+            const prototype: {
+            };
+
+        }
+
+        namespace insert {
+            const prototype: {
+            };
+
+        }
+
+        namespace insertAfter {
+            const prototype: {
+            };
+
+        }
+
+        namespace map {
+            const prototype: {
+            };
+
+        }
+
+        namespace meta {
+            const prototype: {
+            };
+
+        }
+
+        namespace one {
+            const prototype: {
+            };
+
+        }
+
+        namespace parent {
+            const prototype: {
+            };
+
+        }
+
+        namespace populate {
+            const prototype: {
+            };
+
+        }
+
+        namespace prepend {
+            const prototype: {
+            };
+
+        }
+
+        namespace remove {
+            const prototype: {
+            };
+
+        }
+
+        namespace repopulate {
+            const prototype: {
+            };
+
+        }
+
+        namespace setParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace toJSON {
+            const prototype: {
+            };
+
+        }
+
+        namespace toObject {
+            const prototype: {
+            };
+
+        }
+
+        namespace toString {
+            const prototype: {
+            };
+
+        }
+
+        namespace upsert {
+            const prototype: {
+            };
+
+        }
+
+    }
+
+}
+
+export namespace Item {
+    namespace isItem {
+        const prototype: {
+        };
+
+    }
+
+    namespace prototype {
+        function authorizeRequestUsing(type: any, options: any): any;
+
+        function describe(content: any, type: any): void;
+
+        function findInParents(property: any, customizer: any): any;
+
+        function findParentContaining(property: any, customizer: any): any;
+
+        function forEachParent(options: any, iterator: any): void;
+
+        function getAuth(): any;
+
+        function getEvents(name: any): any;
+
+        function meta(...args: any[]): any;
+
+        function parent(): any;
+
+        function setParent(parent: any): void;
+
+        function toJSON(): any;
+
+        function toObjectResolved(scope: any, overrides: any, options: any): any;
+
+        namespace authorizeRequestUsing {
+            const prototype: {
+            };
+
+        }
+
+        namespace describe {
+            const prototype: {
+            };
+
+        }
+
+        namespace findInParents {
+            const prototype: {
+            };
+
+        }
+
+        namespace findParentContaining {
+            const prototype: {
+            };
+
+        }
+
+        namespace forEachParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace getAuth {
+            const prototype: {
+            };
+
+        }
+
+        namespace getEvents {
+            const prototype: {
+            };
+
+        }
+
+        namespace meta {
+            const prototype: {
+            };
+
+        }
+
+        namespace parent {
+            const prototype: {
+            };
+
+        }
+
+        namespace setParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace toJSON {
+            const prototype: {
+            };
+
+        }
+
+        namespace toObjectResolved {
+            const prototype: {
+            };
+
+        }
+
+    }
+
+}
+
+export namespace ItemGroup {
+    namespace isItemGroup {
+        const prototype: {
+        };
+
+    }
+
+    namespace prototype {
+        function authorizeRequestsUsing(type: any, options: any): void;
+
+        function describe(content: any, type: any): void;
+
+        function findInParents(property: any, customizer: any): any;
+
+        function findParentContaining(property: any, customizer: any): any;
+
+        function forEachItem(callback: any): any;
+
+        function forEachItemGroup(callback: any): void;
+
+        function forEachParent(options: any, iterator: any): void;
+
+        function meta(...args: any[]): any;
+
+        function oneDeep(idOrName: any): any;
+
+        function parent(): any;
+
+        function setParent(parent: any): void;
+
+        function toJSON(): any;
+
+        function toObjectResolved(scope: any, overrides: any, options: any): any;
+
+        namespace authorizeRequestsUsing {
+            const prototype: {
+            };
+
+        }
+
+        namespace describe {
+            const prototype: {
+            };
+
+        }
+
+        namespace findInParents {
+            const prototype: {
+            };
+
+        }
+
+        namespace findParentContaining {
+            const prototype: {
+            };
+
+        }
+
+        namespace forEachItem {
+            const prototype: {
+            };
+
+        }
+
+        namespace forEachItemGroup {
+            const prototype: {
+            };
+
+        }
+
+        namespace forEachParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace meta {
+            const prototype: {
+            };
+
+        }
+
+        namespace oneDeep {
+            const prototype: {
+            };
+
+        }
+
+        namespace parent {
+            const prototype: {
+            };
+
+        }
+
+        namespace setParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace toJSON {
+            const prototype: {
+            };
+
+        }
+
+        namespace toObjectResolved {
+            const prototype: {
+            };
+
+        }
+
+    }
+
+}
+
+export namespace Property {
+    namespace prototype {
+        function describe(content: any, type: any): void;
+
+        function findInParents(property: any, customizer: any): any;
+
+        function findParentContaining(property: any, customizer: any): any;
+
+        function forEachParent(options: any, iterator: any): void;
+
+        function meta(...args: any[]): any;
+
+        function parent(): any;
+
+        function setParent(parent: any): void;
+
+        function toJSON(): any;
+
+        function toObjectResolved(scope: any, overrides: any, options: any): any;
+
+        namespace describe {
+            const prototype: {
+            };
+
+        }
+
+        namespace findInParents {
+            const prototype: {
+            };
+
+        }
+
+        namespace findParentContaining {
+            const prototype: {
+            };
+
+        }
+
+        namespace forEachParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace meta {
+            const prototype: {
+            };
+
+        }
+
+        namespace parent {
+            const prototype: {
+            };
+
+        }
+
+        namespace setParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace toJSON {
+            const prototype: {
+            };
+
+        }
+
+        namespace toObjectResolved {
+            const prototype: {
+            };
+
+        }
+
+    }
+
+    namespace replaceSubstitutions {
+        const prototype: {
+        };
+
+    }
+
+    namespace replaceSubstitutionsIn {
+        const prototype: {
+        };
+
+    }
+
+}
+
+export namespace PropertyBase {
+    namespace propertyIsMeta {
+        const prototype: {
+        };
+
+    }
+
+    namespace propertyUnprefixMeta {
+        const prototype: {
+        };
+
+    }
+
+    namespace prototype {
+        function findInParents(property: any, customizer: any): any;
+
+        function findParentContaining(property: any, customizer: any): any;
+
+        function forEachParent(options: any, iterator: any): void;
+
+        function meta(...args: any[]): any;
+
+        function parent(): any;
+
+        function setParent(parent: any): void;
+
+        function toJSON(): any;
+
+        namespace findInParents {
+            const prototype: {
+            };
+
+        }
+
+        namespace findParentContaining {
+            const prototype: {
+            };
+
+        }
+
+        namespace forEachParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace meta {
+            const prototype: {
+            };
+
+        }
+
+        namespace parent {
+            const prototype: {
+            };
+
+        }
+
+        namespace setParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace toJSON {
+            const prototype: {
+            };
+
+        }
+
+    }
+
+    namespace toJSON {
+        const prototype: {
+        };
+
+    }
+
+}
+
+export namespace PropertyList {
+    namespace isPropertyList {
+        const prototype: {
+        };
+
+    }
+
+    namespace prototype {
+        function add(item: any, ...args: any[]): void;
+
+        function all(): any;
+
+        function append(item: any): any;
+
+        function assimilate(source: any, prune: any): void;
+
+        function clear(): void;
+
+        function count(): any;
+
+        function each(iterator: any, context: any): void;
+
+        function eachParent(iterator: any, context: any): void;
+
+        function filter(rule: any, context: any): any;
+
+        function find(rule: any, context: any): any;
+
+        function findInParents(property: any, customizer: any): any;
+
+        function findParentContaining(property: any, customizer: any): any;
+
+        function forEachParent(options: any, iterator: any): void;
+
+        function get(key: any): any;
+
+        function has(item: any, value: any, ...args: any[]): any;
+
+        function idx(index: any): any;
+
+        function indexOf(item: any): any;
+
+        function insert(item: any, before: any): void;
+
+        function insertAfter(item: any, after: any): any;
+
+        function map(iterator: any, context: any): any;
+
+        function meta(...args: any[]): any;
+
+        function one(id: any): any;
+
+        function parent(): any;
+
+        function populate(items: any): void;
+
+        function prepend(item: any): any;
+
+        function remove(predicate: any, context: any, ...args: any[]): any;
+
+        function repopulate(items: any): void;
+
+        function setParent(parent: any): void;
+
+        function toJSON(): any;
+
+        function toObject(excludeDisabled: any, caseSensitive: any, multiValue: any, sanitizeKeys: any): any;
+
+        function toString(): any;
+
+        function upsert(item: any): any;
+
+        namespace add {
+            const prototype: {
+            };
+
+        }
+
+        namespace all {
+            const prototype: {
+            };
+
+        }
+
+        namespace append {
+            const prototype: {
+            };
+
+        }
+
+        namespace assimilate {
+            const prototype: {
+            };
+
+        }
+
+        namespace clear {
+            const prototype: {
+            };
+
+        }
+
+        namespace count {
+            const prototype: {
+            };
+
+        }
+
+        namespace each {
+            const prototype: {
+            };
+
+        }
+
+        namespace eachParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace filter {
+            const prototype: {
+            };
+
+        }
+
+        namespace find {
+            const prototype: {
+            };
+
+        }
+
+        namespace findInParents {
+            const prototype: {
+            };
+
+        }
+
+        namespace findParentContaining {
+            const prototype: {
+            };
+
+        }
+
+        namespace forEachParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace get {
+            const prototype: {
+            };
+
+        }
+
+        namespace has {
+            const prototype: {
+            };
+
+        }
+
+        namespace idx {
+            const prototype: {
+            };
+
+        }
+
+        namespace indexOf {
+            const prototype: {
+            };
+
+        }
+
+        namespace insert {
+            const prototype: {
+            };
+
+        }
+
+        namespace insertAfter {
+            const prototype: {
+            };
+
+        }
+
+        namespace map {
+            const prototype: {
+            };
+
+        }
+
+        namespace meta {
+            const prototype: {
+            };
+
+        }
+
+        namespace one {
+            const prototype: {
+            };
+
+        }
+
+        namespace parent {
+            const prototype: {
+            };
+
+        }
+
+        namespace populate {
+            const prototype: {
+            };
+
+        }
+
+        namespace prepend {
+            const prototype: {
+            };
+
+        }
+
+        namespace remove {
+            const prototype: {
+            };
+
+        }
+
+        namespace repopulate {
+            const prototype: {
+            };
+
+        }
+
+        namespace setParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace toJSON {
+            const prototype: {
+            };
+
+        }
+
+        namespace toObject {
+            const prototype: {
+            };
+
+        }
+
+        namespace toString {
+            const prototype: {
+            };
+
+        }
+
+        namespace upsert {
+            const prototype: {
+            };
+
+        }
+
+    }
+
+}
+
+export namespace ProxyConfig {
+    namespace isProxyConfig {
+        const prototype: {
+        };
+
+    }
+
+    namespace prototype {
+        function describe(content: any, type: any): void;
+
+        function findInParents(property: any, customizer: any): any;
+
+        function findParentContaining(property: any, customizer: any): any;
+
+        function forEachParent(options: any, iterator: any): void;
+
+        function getProtocols(): any;
+
+        function getProxyUrl(): any;
+
+        function meta(...args: any[]): any;
+
+        function parent(): any;
+
+        function setParent(parent: any): void;
+
+        function test(urlStr: any): any;
+
+        function toJSON(): any;
+
+        function toObjectResolved(scope: any, overrides: any, options: any): any;
+
+        function update(options: any): void;
+
+        function updateProtocols(protocols: any): void;
+
+        namespace describe {
+            const prototype: {
+            };
+
+        }
+
+        namespace findInParents {
+            const prototype: {
+            };
+
+        }
+
+        namespace findParentContaining {
+            const prototype: {
+            };
+
+        }
+
+        namespace forEachParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace getProtocols {
+            const prototype: {
+            };
+
+        }
+
+        namespace getProxyUrl {
+            const prototype: {
+            };
+
+        }
+
+        namespace meta {
+            const prototype: {
+            };
+
+        }
+
+        namespace parent {
+            const prototype: {
+            };
+
+        }
+
+        namespace setParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace test {
+            const prototype: {
+            };
+
+        }
+
+        namespace toJSON {
+            const prototype: {
+            };
+
+        }
+
+        namespace toObjectResolved {
+            const prototype: {
+            };
+
+        }
+
+        namespace update {
+            const prototype: {
+            };
+
+        }
+
+        namespace updateProtocols {
+            const prototype: {
+            };
+
+        }
+
+    }
+
+}
+
+export namespace ProxyConfigList {
+    namespace isProxyConfigList {
+        const prototype: {
+        };
+
+    }
+
+    namespace prototype {
+        function add(item: any, ...args: any[]): void;
+
+        function all(): any;
+
+        function append(item: any): any;
+
+        function assimilate(source: any, prune: any): void;
+
+        function clear(): void;
+
+        function count(): any;
+
+        function each(iterator: any, context: any): void;
+
+        function eachParent(iterator: any, context: any): void;
+
+        function filter(rule: any, context: any): any;
+
+        function find(rule: any, context: any): any;
+
+        function findInParents(property: any, customizer: any): any;
+
+        function findParentContaining(property: any, customizer: any): any;
+
+        function forEachParent(options: any, iterator: any): void;
+
+        function get(key: any): any;
+
+        function has(item: any, value: any, ...args: any[]): any;
+
+        function idx(index: any): any;
+
+        function indexOf(item: any): any;
+
+        function insert(item: any, before: any): void;
+
+        function insertAfter(item: any, after: any): any;
+
+        function map(iterator: any, context: any): any;
+
+        function meta(...args: any[]): any;
+
+        function one(id: any): any;
+
+        function parent(): any;
+
+        function populate(items: any): void;
+
+        function prepend(item: any): any;
+
+        function remove(predicate: any, context: any, ...args: any[]): any;
+
+        function repopulate(items: any): void;
+
+        function resolve(url: any): any;
+
+        function setParent(parent: any): void;
+
+        function toJSON(): any;
+
+        function toObject(excludeDisabled: any, caseSensitive: any, multiValue: any, sanitizeKeys: any): any;
+
+        function toString(): any;
+
+        function upsert(item: any): any;
+
+        namespace add {
+            const prototype: {
+            };
+
+        }
+
+        namespace all {
+            const prototype: {
+            };
+
+        }
+
+        namespace append {
+            const prototype: {
+            };
+
+        }
+
+        namespace assimilate {
+            const prototype: {
+            };
+
+        }
+
+        namespace clear {
+            const prototype: {
+            };
+
+        }
+
+        namespace count {
+            const prototype: {
+            };
+
+        }
+
+        namespace each {
+            const prototype: {
+            };
+
+        }
+
+        namespace eachParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace filter {
+            const prototype: {
+            };
+
+        }
+
+        namespace find {
+            const prototype: {
+            };
+
+        }
+
+        namespace findInParents {
+            const prototype: {
+            };
+
+        }
+
+        namespace findParentContaining {
+            const prototype: {
+            };
+
+        }
+
+        namespace forEachParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace get {
+            const prototype: {
+            };
+
+        }
+
+        namespace has {
+            const prototype: {
+            };
+
+        }
+
+        namespace idx {
+            const prototype: {
+            };
+
+        }
+
+        namespace indexOf {
+            const prototype: {
+            };
+
+        }
+
+        namespace insert {
+            const prototype: {
+            };
+
+        }
+
+        namespace insertAfter {
+            const prototype: {
+            };
+
+        }
+
+        namespace map {
+            const prototype: {
+            };
+
+        }
+
+        namespace meta {
+            const prototype: {
+            };
+
+        }
+
+        namespace one {
+            const prototype: {
+            };
+
+        }
+
+        namespace parent {
+            const prototype: {
+            };
+
+        }
+
+        namespace populate {
+            const prototype: {
+            };
+
+        }
+
+        namespace prepend {
+            const prototype: {
+            };
+
+        }
+
+        namespace remove {
+            const prototype: {
+            };
+
+        }
+
+        namespace repopulate {
+            const prototype: {
+            };
+
+        }
+
+        namespace resolve {
+            const prototype: {
+            };
+
+        }
+
+        namespace setParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace toJSON {
+            const prototype: {
+            };
+
+        }
+
+        namespace toObject {
+            const prototype: {
+            };
+
+        }
+
+        namespace toString {
+            const prototype: {
+            };
+
+        }
+
+        namespace upsert {
+            const prototype: {
+            };
+
+        }
+
+    }
+
+}
+
+export namespace QueryParam {
+    namespace parse {
+        const prototype: {
+        };
+
+    }
+
+    namespace parseSingle {
+        const prototype: {
+        };
+
+    }
+
+    namespace prototype {
+        function describe(content: any, type: any): void;
+
+        function findInParents(property: any, customizer: any): any;
+
+        function findParentContaining(property: any, customizer: any): any;
+
+        function forEachParent(options: any, iterator: any): void;
+
+        function meta(...args: any[]): any;
+
+        function parent(): any;
+
+        function setParent(parent: any): void;
+
+        function toJSON(): any;
+
+        function toObjectResolved(scope: any, overrides: any, options: any): any;
+
+        function toString(): any;
+
+        function update(param: any): void;
+
+        function valueOf(): any;
+
+        namespace describe {
+            const prototype: {
+            };
+
+        }
+
+        namespace findInParents {
+            const prototype: {
+            };
+
+        }
+
+        namespace findParentContaining {
+            const prototype: {
+            };
+
+        }
+
+        namespace forEachParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace meta {
+            const prototype: {
+            };
+
+        }
+
+        namespace parent {
+            const prototype: {
+            };
+
+        }
+
+        namespace setParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace toJSON {
+            const prototype: {
+            };
+
+        }
+
+        namespace toObjectResolved {
+            const prototype: {
+            };
+
+        }
+
+        namespace toString {
+            const prototype: {
+            };
+
+        }
+
+        namespace update {
+            const prototype: {
+            };
+
+        }
+
+        namespace valueOf {
+            const prototype: {
+            };
+
+        }
+
+    }
+
+    namespace unparse {
+        const prototype: {
+        };
+
+    }
+
+    namespace unparseSingle {
+        const prototype: {
+        };
+
+    }
+
+}
+
+export namespace Request {
+    namespace isRequest {
+        const prototype: {
+        };
+
+    }
+
+    namespace prototype {
+        function addHeader(header: any): void;
+
+        function addQueryParams(params: any): void;
+
+        function authorize(): void;
+
+        function authorizeUsing(type: any, options: any): void;
+
+        function clone(): any;
+
+        function describe(content: any, type: any): void;
+
+        function findInParents(property: any, customizer: any): any;
+
+        function findParentContaining(property: any, customizer: any): any;
+
+        function forEachHeader(callback: any): any;
+
+        function forEachParent(options: any, iterator: any): void;
+
+        function getHeaders(options: any): any;
+
+        function meta(...args: any[]): any;
+
+        function parent(): any;
+
+        function removeHeader(toRemove: any, options: any): any;
+
+        function removeQueryParams(params: any): void;
+
+        function setParent(parent: any): void;
+
+        function toJSON(): any;
+
+        function toObjectResolved(scope: any, overrides: any, options: any): any;
+
+        function update(options: any): void;
+
+        function upsertHeader(header: any): any;
+
+        namespace addHeader {
+            const prototype: {
+            };
+
+        }
+
+        namespace addQueryParams {
+            const prototype: {
+            };
+
+        }
+
+        namespace authorize {
+            const prototype: {
+            };
+
+        }
+
+        namespace authorizeUsing {
+            const prototype: {
+            };
+
+        }
+
+        namespace clone {
+            const prototype: {
+            };
+
+        }
+
+        namespace describe {
+            const prototype: {
+            };
+
+        }
+
+        namespace findInParents {
+            const prototype: {
+            };
+
+        }
+
+        namespace findParentContaining {
+            const prototype: {
+            };
+
+        }
+
+        namespace forEachHeader {
+            const prototype: {
+            };
+
+        }
+
+        namespace forEachParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace getHeaders {
+            const prototype: {
+            };
+
+        }
+
+        namespace meta {
+            const prototype: {
+            };
+
+        }
+
+        namespace parent {
+            const prototype: {
+            };
+
+        }
+
+        namespace removeHeader {
+            const prototype: {
+            };
+
+        }
+
+        namespace removeQueryParams {
+            const prototype: {
+            };
+
+        }
+
+        namespace setParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace toJSON {
+            const prototype: {
+            };
+
+        }
+
+        namespace toObjectResolved {
+            const prototype: {
+            };
+
+        }
+
+        namespace update {
+            const prototype: {
+            };
+
+        }
+
+        namespace upsertHeader {
+            const prototype: {
+            };
+
+        }
+
+    }
+
+}
+
+export namespace RequestAuth {
+    namespace isValidType {
+        const prototype: {
+        };
+
+    }
+
+    namespace prototype {
+        function clear(type: any): void;
+
+        function current(): any;
+
+        function describe(content: any, type: any): void;
+
+        function findInParents(property: any, customizer: any): any;
+
+        function findParentContaining(property: any, customizer: any): any;
+
+        function forEachParent(options: any, iterator: any): void;
+
+        function meta(...args: any[]): any;
+
+        function parameters(): any;
+
+        function parent(): any;
+
+        function setParent(parent: any): void;
+
+        function toJSON(): any;
+
+        function toObjectResolved(scope: any, overrides: any, options: any): any;
+
+        function update(options: any, type: any): void;
+
+        function use(type: any, options: any): void;
+
+        namespace clear {
+            const prototype: {
+            };
+
+        }
+
+        namespace current {
+            const prototype: {
+            };
+
+        }
+
+        namespace describe {
+            const prototype: {
+            };
+
+        }
+
+        namespace findInParents {
+            const prototype: {
+            };
+
+        }
+
+        namespace findParentContaining {
+            const prototype: {
+            };
+
+        }
+
+        namespace forEachParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace meta {
+            const prototype: {
+            };
+
+        }
+
+        namespace parameters {
+            const prototype: {
+            };
+
+        }
+
+        namespace parent {
+            const prototype: {
+            };
+
+        }
+
+        namespace setParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace toJSON {
+            const prototype: {
+            };
+
+        }
+
+        namespace toObjectResolved {
+            const prototype: {
+            };
+
+        }
+
+        namespace update {
+            const prototype: {
+            };
+
+        }
+
+        namespace use {
+            const prototype: {
+            };
+
+        }
+
+    }
+
+}
+
+export namespace RequestBody {
+    namespace prototype {
+        function findInParents(property: any, customizer: any): any;
+
+        function findParentContaining(property: any, customizer: any): any;
+
+        function forEachParent(options: any, iterator: any): void;
+
+        function isEmpty(): any;
+
+        function meta(...args: any[]): any;
+
+        function parent(): any;
+
+        function setParent(parent: any): void;
+
+        function toJSON(): any;
+
+        function toString(): any;
+
+        function update(options: any): void;
+
+        namespace findInParents {
+            const prototype: {
+            };
+
+        }
+
+        namespace findParentContaining {
+            const prototype: {
+            };
+
+        }
+
+        namespace forEachParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace isEmpty {
+            const prototype: {
+            };
+
+        }
+
+        namespace meta {
+            const prototype: {
+            };
+
+        }
+
+        namespace parent {
+            const prototype: {
+            };
+
+        }
+
+        namespace setParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace toJSON {
+            const prototype: {
+            };
+
+        }
+
+        namespace toString {
+            const prototype: {
+            };
+
+        }
+
+        namespace update {
+            const prototype: {
+            };
+
+        }
+
+    }
+
+}
+
+export namespace Response {
+    namespace createFromNode {
+        const prototype: {
+        };
+
+    }
+
+    namespace isResponse {
+        const prototype: {
+        };
+
+    }
+
+    namespace mimeInfo {
+        const prototype: {
+        };
+
+    }
+
+    namespace prototype {
+        function dataURI(): any;
+
+        function describe(content: any, type: any): void;
+
+        function details(): any;
+
+        function encoding(): any;
+
+        function findInParents(property: any, customizer: any): any;
+
+        function findParentContaining(property: any, customizer: any): any;
+
+        function forEachParent(options: any, iterator: any): void;
+
+        function json(reviver: any, strict: any): any;
+
+        function meta(...args: any[]): any;
+
+        function mime(contentType: any, contentDisposition: any): any;
+
+        function parent(): any;
+
+        function reason(): any;
+
+        function setParent(parent: any): void;
+
+        function size(): any;
+
+        function text(): any;
+
+        function toJSON(): any;
+
+        function toObjectResolved(scope: any, overrides: any, options: any): any;
+
+        function update(options: any): void;
+
+        namespace dataURI {
+            const prototype: {
+            };
+
+        }
+
+        namespace describe {
+            const prototype: {
+            };
+
+        }
+
+        namespace details {
+            const prototype: {
+            };
+
+        }
+
+        namespace encoding {
+            const prototype: {
+            };
+
+        }
+
+        namespace findInParents {
+            const prototype: {
+            };
+
+        }
+
+        namespace findParentContaining {
+            const prototype: {
+            };
+
+        }
+
+        namespace forEachParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace json {
+            const prototype: {
+            };
+
+        }
+
+        namespace meta {
+            const prototype: {
+            };
+
+        }
+
+        namespace mime {
+            const prototype: {
+            };
+
+        }
+
+        namespace parent {
+            const prototype: {
+            };
+
+        }
+
+        namespace reason {
+            const prototype: {
+            };
+
+        }
+
+        namespace setParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace size {
+            const prototype: {
+            };
+
+        }
+
+        namespace text {
+            const prototype: {
+            };
+
+        }
+
+        namespace toJSON {
+            const prototype: {
+            };
+
+        }
+
+        namespace toObjectResolved {
+            const prototype: {
+            };
+
+        }
+
+        namespace update {
+            const prototype: {
+            };
+
+        }
+
+    }
+
+}
+
+export namespace Script {
+    namespace isScript {
+        const prototype: {
+        };
+
+    }
+
+    namespace prototype {
+        function describe(content: any, type: any): void;
+
+        function findInParents(property: any, customizer: any): any;
+
+        function findParentContaining(property: any, customizer: any): any;
+
+        function forEachParent(options: any, iterator: any): void;
+
+        function meta(...args: any[]): any;
+
+        function parent(): any;
+
+        function setParent(parent: any): void;
+
+        function toJSON(): any;
+
+        function toObjectResolved(scope: any, overrides: any, options: any): any;
+
+        function toSource(): any;
+
+        function update(options: any): void;
+
+        namespace describe {
+            const prototype: {
+            };
+
+        }
+
+        namespace findInParents {
+            const prototype: {
+            };
+
+        }
+
+        namespace findParentContaining {
+            const prototype: {
+            };
+
+        }
+
+        namespace forEachParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace meta {
+            const prototype: {
+            };
+
+        }
+
+        namespace parent {
+            const prototype: {
+            };
+
+        }
+
+        namespace setParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace toJSON {
+            const prototype: {
+            };
+
+        }
+
+        namespace toObjectResolved {
+            const prototype: {
+            };
+
+        }
+
+        namespace toSource {
+            const prototype: {
+            };
+
+        }
+
+        namespace update {
+            const prototype: {
+            };
+
+        }
+
+    }
+
+}
+
+export namespace Url {
+    namespace isUrl {
+        const prototype: {
+        };
+
+    }
+
+    namespace parse {
+        const prototype: {
+        };
+
+    }
+
+    namespace prototype {
+        function addQueryParams(params: any): void;
+
+        function findInParents(property: any, customizer: any): any;
+
+        function findParentContaining(property: any, customizer: any): any;
+
+        function forEachParent(options: any, iterator: any): void;
+
+        function getHost(): any;
+
+        function getOAuth1BaseUrl(): any;
+
+        function getPath(options: any): any;
+
+        function getPathWithQuery(): any;
+
+        function getQueryString(options: any): any;
+
+        function getRaw(): any;
+
+        function getRemote(options: any): any;
+
+        function meta(...args: any[]): any;
+
+        function parent(): any;
+
+        function removeQueryParams(params: any): any;
+
+        function setParent(parent: any): void;
+
+        function toJSON(): any;
+
+        function toString(forceProtocol: any): any;
+
+        function update(url: any): any;
+
+        namespace addQueryParams {
+            const prototype: {
+            };
+
+        }
+
+        namespace findInParents {
+            const prototype: {
+            };
+
+        }
+
+        namespace findParentContaining {
+            const prototype: {
+            };
+
+        }
+
+        namespace forEachParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace getHost {
+            const prototype: {
+            };
+
+        }
+
+        namespace getOAuth1BaseUrl {
+            const prototype: {
+            };
+
+        }
+
+        namespace getPath {
+            const prototype: {
+            };
+
+        }
+
+        namespace getPathWithQuery {
+            const prototype: {
+            };
+
+        }
+
+        namespace getQueryString {
+            const prototype: {
+            };
+
+        }
+
+        namespace getRaw {
+            const prototype: {
+            };
+
+        }
+
+        namespace getRemote {
+            const prototype: {
+            };
+
+        }
+
+        namespace meta {
+            const prototype: {
+            };
+
+        }
+
+        namespace parent {
+            const prototype: {
+            };
+
+        }
+
+        namespace removeQueryParams {
+            const prototype: {
+            };
+
+        }
+
+        namespace setParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace toJSON {
+            const prototype: {
+            };
+
+        }
+
+        namespace toString {
+            const prototype: {
+            };
+
+        }
+
+        namespace update {
+            const prototype: {
+            };
+
+        }
+
+    }
+
+}
+
+export namespace UrlMatchPattern {
+    namespace prototype {
+        function createMatchPattern(): any;
+
+        function describe(content: any, type: any): void;
+
+        function findInParents(property: any, customizer: any): any;
+
+        function findParentContaining(property: any, customizer: any): any;
+
+        function forEachParent(options: any, iterator: any): void;
+
+        function getProtocols(): any;
+
+        function globPatternToRegexp(pattern: any): any;
+
+        function matchAbsoluteHostPattern(matchRegexObject: any, remote: any): any;
+
+        function matchAnyHost(matchRegexObject: any): any;
+
+        function matchSuffixHostPattern(matchRegexObject: any, remote: any): any;
+
+        function meta(...args: any[]): any;
+
+        function parent(): any;
+
+        function setParent(parent: any): void;
+
+        function test(urlStr: any): any;
+
+        function testHost(host: any): any;
+
+        function testPath(path: any): any;
+
+        function testProtocol(protocol: any): any;
+
+        function toJSON(): any;
+
+        function toObjectResolved(scope: any, overrides: any, options: any): any;
+
+        function toString(): any;
+
+        function update(options: any): void;
+
+        namespace createMatchPattern {
+            const prototype: {
+            };
+
+        }
+
+        namespace describe {
+            const prototype: {
+            };
+
+        }
+
+        namespace findInParents {
+            const prototype: {
+            };
+
+        }
+
+        namespace findParentContaining {
+            const prototype: {
+            };
+
+        }
+
+        namespace forEachParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace getProtocols {
+            const prototype: {
+            };
+
+        }
+
+        namespace globPatternToRegexp {
+            const prototype: {
+            };
+
+        }
+
+        namespace matchAbsoluteHostPattern {
+            const prototype: {
+            };
+
+        }
+
+        namespace matchAnyHost {
+            const prototype: {
+            };
+
+        }
+
+        namespace matchSuffixHostPattern {
+            const prototype: {
+            };
+
+        }
+
+        namespace meta {
+            const prototype: {
+            };
+
+        }
+
+        namespace parent {
+            const prototype: {
+            };
+
+        }
+
+        namespace setParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace test {
+            const prototype: {
+            };
+
+        }
+
+        namespace testHost {
+            const prototype: {
+            };
+
+        }
+
+        namespace testPath {
+            const prototype: {
+            };
+
+        }
+
+        namespace testProtocol {
+            const prototype: {
+            };
+
+        }
+
+        namespace toJSON {
+            const prototype: {
+            };
+
+        }
+
+        namespace toObjectResolved {
+            const prototype: {
+            };
+
+        }
+
+        namespace toString {
+            const prototype: {
+            };
+
+        }
+
+        namespace update {
+            const prototype: {
+            };
+
+        }
+
+    }
+
+}
+
+export namespace UrlMatchPatternList {
+    namespace prototype {
+        function add(item: any, ...args: any[]): void;
+
+        function all(): any;
+
+        function append(item: any): any;
+
+        function assimilate(source: any, prune: any): void;
+
+        function clear(): void;
+
+        function count(): any;
+
+        function each(iterator: any, context: any): void;
+
+        function eachParent(iterator: any, context: any): void;
+
+        function filter(rule: any, context: any): any;
+
+        function find(rule: any, context: any): any;
+
+        function findInParents(property: any, customizer: any): any;
+
+        function findParentContaining(property: any, customizer: any): any;
+
+        function forEachParent(options: any, iterator: any): void;
+
+        function get(key: any): any;
+
+        function has(item: any, value: any, ...args: any[]): any;
+
+        function idx(index: any): any;
+
+        function indexOf(item: any): any;
+
+        function insert(item: any, before: any): void;
+
+        function insertAfter(item: any, after: any): any;
+
+        function map(iterator: any, context: any): any;
+
+        function meta(...args: any[]): any;
+
+        function one(id: any): any;
+
+        function parent(): any;
+
+        function populate(items: any): void;
+
+        function prepend(item: any): any;
+
+        function remove(predicate: any, context: any, ...args: any[]): any;
+
+        function repopulate(items: any): void;
+
+        function setParent(parent: any): void;
+
+        function test(urlStr: any): any;
+
+        function toJSON(): any;
+
+        function toObject(excludeDisabled: any, caseSensitive: any, multiValue: any, sanitizeKeys: any): any;
+
+        function toString(): any;
+
+        function upsert(item: any): any;
+
+        namespace add {
+            const prototype: {
+            };
+
+        }
+
+        namespace all {
+            const prototype: {
+            };
+
+        }
+
+        namespace append {
+            const prototype: {
+            };
+
+        }
+
+        namespace assimilate {
+            const prototype: {
+            };
+
+        }
+
+        namespace clear {
+            const prototype: {
+            };
+
+        }
+
+        namespace count {
+            const prototype: {
+            };
+
+        }
+
+        namespace each {
+            const prototype: {
+            };
+
+        }
+
+        namespace eachParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace filter {
+            const prototype: {
+            };
+
+        }
+
+        namespace find {
+            const prototype: {
+            };
+
+        }
+
+        namespace findInParents {
+            const prototype: {
+            };
+
+        }
+
+        namespace findParentContaining {
+            const prototype: {
+            };
+
+        }
+
+        namespace forEachParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace get {
+            const prototype: {
+            };
+
+        }
+
+        namespace has {
+            const prototype: {
+            };
+
+        }
+
+        namespace idx {
+            const prototype: {
+            };
+
+        }
+
+        namespace indexOf {
+            const prototype: {
+            };
+
+        }
+
+        namespace insert {
+            const prototype: {
+            };
+
+        }
+
+        namespace insertAfter {
+            const prototype: {
+            };
+
+        }
+
+        namespace map {
+            const prototype: {
+            };
+
+        }
+
+        namespace meta {
+            const prototype: {
+            };
+
+        }
+
+        namespace one {
+            const prototype: {
+            };
+
+        }
+
+        namespace parent {
+            const prototype: {
+            };
+
+        }
+
+        namespace populate {
+            const prototype: {
+            };
+
+        }
+
+        namespace prepend {
+            const prototype: {
+            };
+
+        }
+
+        namespace remove {
+            const prototype: {
+            };
+
+        }
+
+        namespace repopulate {
+            const prototype: {
+            };
+
+        }
+
+        namespace setParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace test {
+            const prototype: {
+            };
+
+        }
+
+        namespace toJSON {
+            const prototype: {
+            };
+
+        }
+
+        namespace toObject {
+            const prototype: {
+            };
+
+        }
+
+        namespace toString {
+            const prototype: {
+            };
+
+        }
+
+        namespace upsert {
+            const prototype: {
+            };
+
+        }
+
+    }
+
+}
+
+export namespace Variable {
+    namespace isVariable {
+        const prototype: {
+        };
+
+    }
+
+    namespace prototype {
+        function cast(value: any): any;
+
+        function castIn(value: any): any;
+
+        function castOut(value: any): any;
+
+        function describe(content: any, type: any): void;
+
+        function findInParents(property: any, customizer: any): any;
+
+        function findParentContaining(property: any, customizer: any): any;
+
+        function forEachParent(options: any, iterator: any): void;
+
+        function get(): any;
+
+        function meta(...args: any[]): any;
+
+        function parent(): any;
+
+        function set(value: any): void;
+
+        function setParent(parent: any): void;
+
+        function toJSON(): any;
+
+        function toObjectResolved(scope: any, overrides: any, options: any): any;
+
+        function toString(): any;
+
+        function update(options: any): void;
+
+        function valueOf(value: any, ...args: any[]): any;
+
+        function valueType(typeName: any, _noCast: any): any;
+
+        namespace cast {
+            const prototype: {
+            };
+
+        }
+
+        namespace castIn {
+            const prototype: {
+            };
+
+        }
+
+        namespace castOut {
+            const prototype: {
+            };
+
+        }
+
+        namespace describe {
+            const prototype: {
+            };
+
+        }
+
+        namespace findInParents {
+            const prototype: {
+            };
+
+        }
+
+        namespace findParentContaining {
+            const prototype: {
+            };
+
+        }
+
+        namespace forEachParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace get {
+            const prototype: {
+            };
+
+        }
+
+        namespace meta {
+            const prototype: {
+            };
+
+        }
+
+        namespace parent {
+            const prototype: {
+            };
+
+        }
+
+        namespace set {
+            const prototype: {
+            };
+
+        }
+
+        namespace setParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace toJSON {
+            const prototype: {
+            };
+
+        }
+
+        namespace toObjectResolved {
+            const prototype: {
+            };
+
+        }
+
+        namespace toString {
+            const prototype: {
+            };
+
+        }
+
+        namespace update {
+            const prototype: {
+            };
+
+        }
+
+        namespace valueOf {
+            const prototype: {
+            };
+
+        }
+
+        namespace valueType {
+            const prototype: {
+            };
+
+        }
+
+    }
+
+    namespace types {
+        class number {
+            constructor(p0: any);
+
+            // Native method; no parameter or return type inference available
+            toExponential(p0: any): any;
+
+            // Native method; no parameter or return type inference available
+            toFixed(p0: any): any;
+
+            // Native method; no parameter or return type inference available
+            toLocaleString(): any;
+
+            // Native method; no parameter or return type inference available
+            toPrecision(p0: any): any;
+
+            // Native method; no parameter or return type inference available
+            toString(p0: any): any;
+
+            // Native method; no parameter or return type inference available
+            valueOf(): any;
+
+            static EPSILON: number;
+
+            static MAX_SAFE_INTEGER: number;
+
+            static MAX_VALUE: number;
+
+            static MIN_SAFE_INTEGER: number;
+
+            static MIN_VALUE: number;
+
+            static NEGATIVE_INFINITY: number;
+
+            static NaN: number;
+
+            static POSITIVE_INFINITY: number;
+
+            static isFinite(p0: any): any;
+
+            static isInteger(p0: any): any;
+
+            static isNaN(p0: any): any;
+
+            static isSafeInteger(p0: any): any;
+
+            static parseFloat(p0: any): any;
+
+            static parseInt(p0: any, p1: any): any;
+
+        }
+
+        class string {
+            constructor(p0: any);
+
+            // Native method; no parameter or return type inference available
+            anchor(p0: any): any;
+
+            // Native method; no parameter or return type inference available
+            big(): any;
+
+            // Native method; no parameter or return type inference available
+            blink(): any;
+
+            // Native method; no parameter or return type inference available
+            bold(): any;
+
+            // Native method; no parameter or return type inference available
+            charAt(p0: any): any;
+
+            // Native method; no parameter or return type inference available
+            charCodeAt(p0: any): any;
+
+            // Native method; no parameter or return type inference available
+            codePointAt(p0: any): any;
+
+            // Native method; no parameter or return type inference available
+            concat(p0: any): any;
+
+            // Native method; no parameter or return type inference available
+            endsWith(p0: any): any;
+
+            // Native method; no parameter or return type inference available
+            fixed(): any;
+
+            // Native method; no parameter or return type inference available
+            fontcolor(p0: any): any;
+
+            // Native method; no parameter or return type inference available
+            fontsize(p0: any): any;
+
+            // Native method; no parameter or return type inference available
+            includes(p0: any): any;
+
+            // Native method; no parameter or return type inference available
+            indexOf(p0: any): any;
+
+            // Native method; no parameter or return type inference available
+            italics(): any;
+
+            // Native method; no parameter or return type inference available
+            lastIndexOf(p0: any): any;
+
+            // Native method; no parameter or return type inference available
+            link(p0: any): any;
+
+            // Native method; no parameter or return type inference available
+            localeCompare(p0: any): any;
+
+            // Native method; no parameter or return type inference available
+            match(p0: any): any;
+
+            // Native method; no parameter or return type inference available
+            normalize(): any;
+
+            // Native method; no parameter or return type inference available
+            padEnd(p0: any): any;
+
+            // Native method; no parameter or return type inference available
+            padStart(p0: any): any;
+
+            // Native method; no parameter or return type inference available
+            repeat(p0: any): any;
+
+            // Native method; no parameter or return type inference available
+            replace(p0: any, p1: any): any;
+
+            // Native method; no parameter or return type inference available
+            search(p0: any): any;
+
+            // Native method; no parameter or return type inference available
+            slice(p0: any, p1: any): any;
+
+            // Native method; no parameter or return type inference available
+            small(): any;
+
+            // Native method; no parameter or return type inference available
+            split(p0: any, p1: any): any;
+
+            // Native method; no parameter or return type inference available
+            startsWith(p0: any): any;
+
+            // Native method; no parameter or return type inference available
+            strike(): any;
+
+            // Native method; no parameter or return type inference available
+            sub(): any;
+
+            // Native method; no parameter or return type inference available
+            substr(p0: any, p1: any): any;
+
+            // Native method; no parameter or return type inference available
+            substring(p0: any, p1: any): any;
+
+            // Native method; no parameter or return type inference available
+            sup(): any;
+
+            // Native method; no parameter or return type inference available
+            toLocaleLowerCase(): any;
+
+            // Native method; no parameter or return type inference available
+            toLocaleUpperCase(): any;
+
+            // Native method; no parameter or return type inference available
+            toLowerCase(): any;
+
+            // Native method; no parameter or return type inference available
+            toString(): any;
+
+            // Native method; no parameter or return type inference available
+            toUpperCase(): any;
+
+            // Native method; no parameter or return type inference available
+            trim(): any;
+
+            // Native method; no parameter or return type inference available
+            trimLeft(): any;
+
+            // Native method; no parameter or return type inference available
+            trimRight(): any;
+
+            // Native method; no parameter or return type inference available
+            valueOf(): any;
+
+            static fromCharCode(p0: any): any;
+
+            static fromCodePoint(p0: any): any;
+
+            static raw(p0: any): any;
+
+        }
+
+        namespace any {
+            function out(val: any): any;
+
+            namespace out {
+                // Too-deep object hierarchy from postman_collection.Variable.types.any.out
+                const prototype: any;
+
+            }
+
+        }
+
+        namespace json {
+            function out(val: any): any;
+
+            namespace out {
+                // Too-deep object hierarchy from postman_collection.Variable.types.json.out
+                const prototype: any;
+
+            }
+
+        }
+
+        namespace number {
+            namespace prototype {
+                // Too-deep object hierarchy from postman_collection.Variable.types.number.prototype
+                const toExponential: any;
+
+                // Too-deep object hierarchy from postman_collection.Variable.types.number.prototype
+                const toFixed: any;
+
+                // Too-deep object hierarchy from postman_collection.Variable.types.number.prototype
+                const toLocaleString: any;
+
+                // Too-deep object hierarchy from postman_collection.Variable.types.number.prototype
+                const toPrecision: any;
+
+                // Too-deep object hierarchy from postman_collection.Variable.types.number.prototype
+                const toString: any;
+
+                // Too-deep object hierarchy from postman_collection.Variable.types.number.prototype
+                const valueOf: any;
+
+            }
+
+        }
+
+        namespace string {
+            namespace prototype {
+                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
+                const anchor: any;
+
+                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
+                const big: any;
+
+                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
+                const blink: any;
+
+                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
+                const bold: any;
+
+                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
+                const charAt: any;
+
+                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
+                const charCodeAt: any;
+
+                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
+                const codePointAt: any;
+
+                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
+                const concat: any;
+
+                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
+                const endsWith: any;
+
+                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
+                const fixed: any;
+
+                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
+                const fontcolor: any;
+
+                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
+                const fontsize: any;
+
+                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
+                const includes: any;
+
+                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
+                const indexOf: any;
+
+                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
+                const italics: any;
+
+                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
+                const lastIndexOf: any;
+
+                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
+                const length: any;
+
+                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
+                const link: any;
+
+                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
+                const localeCompare: any;
+
+                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
+                const match: any;
+
+                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
+                const normalize: any;
+
+                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
+                const padEnd: any;
+
+                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
+                const padStart: any;
+
+                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
+                const repeat: any;
+
+                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
+                const replace: any;
+
+                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
+                const search: any;
+
+                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
+                const slice: any;
+
+                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
+                const small: any;
+
+                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
+                const split: any;
+
+                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
+                const startsWith: any;
+
+                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
+                const strike: any;
+
+                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
+                const sub: any;
+
+                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
+                const substr: any;
+
+                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
+                const substring: any;
+
+                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
+                const sup: any;
+
+                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
+                const toLocaleLowerCase: any;
+
+                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
+                const toLocaleUpperCase: any;
+
+                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
+                const toLowerCase: any;
+
+                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
+                const toString: any;
+
+                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
+                const toUpperCase: any;
+
+                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
+                const trim: any;
+
+                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
+                const trimLeft: any;
+
+                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
+                const trimRight: any;
+
+                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
+                const valueOf: any;
+
+            }
+
+        }
+
+    }
+
+}
+
+export namespace VariableList {
+    namespace isVariableList {
+        const prototype: {
+        };
+
+    }
+
+    namespace prototype {
+        function add(item: any, ...args: any[]): void;
+
+        function all(): any;
+
+        function append(item: any): any;
+
+        function assimilate(source: any, prune: any): void;
+
+        function clear(): void;
+
+        function count(): any;
+
+        function each(iterator: any, context: any): void;
+
+        function eachParent(iterator: any, context: any): void;
+
+        function filter(rule: any, context: any): any;
+
+        function find(rule: any, context: any): any;
+
+        function findInParents(property: any, customizer: any): any;
+
+        function findParentContaining(property: any, customizer: any): any;
+
+        function forEachParent(options: any, iterator: any): void;
+
+        function get(key: any): any;
+
+        function has(item: any, value: any, ...args: any[]): any;
+
+        function idx(index: any): any;
+
+        function indexOf(item: any): any;
+
+        function insert(item: any, before: any): void;
+
+        function insertAfter(item: any, after: any): any;
+
+        function map(iterator: any, context: any): any;
+
+        function meta(...args: any[]): any;
+
+        function one(id: any): any;
+
+        function parent(): any;
+
+        function populate(items: any): void;
+
+        function prepend(item: any): any;
+
+        function remove(predicate: any, context: any, ...args: any[]): any;
+
+        function replace(str: any, overrides: any): any;
+
+        function repopulate(items: any): void;
+
+        function setParent(parent: any): void;
+
+        function substitute(obj: any, overrides: any, mutate: any): any;
+
+        function syncFromObject(obj: any, track: any, prune: any): any;
+
+        function syncToObject(obj: any): any;
+
+        function toJSON(): any;
+
+        function toObject(excludeDisabled: any, caseSensitive: any, multiValue: any, sanitizeKeys: any): any;
+
+        function toString(): any;
+
+        function upsert(item: any): any;
+
+        namespace add {
+            const prototype: {
+            };
+
+        }
+
+        namespace all {
+            const prototype: {
+            };
+
+        }
+
+        namespace append {
+            const prototype: {
+            };
+
+        }
+
+        namespace assimilate {
+            const prototype: {
+            };
+
+        }
+
+        namespace clear {
+            const prototype: {
+            };
+
+        }
+
+        namespace count {
+            const prototype: {
+            };
+
+        }
+
+        namespace each {
+            const prototype: {
+            };
+
+        }
+
+        namespace eachParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace filter {
+            const prototype: {
+            };
+
+        }
+
+        namespace find {
+            const prototype: {
+            };
+
+        }
+
+        namespace findInParents {
+            const prototype: {
+            };
+
+        }
+
+        namespace findParentContaining {
+            const prototype: {
+            };
+
+        }
+
+        namespace forEachParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace get {
+            const prototype: {
+            };
+
+        }
+
+        namespace has {
+            const prototype: {
+            };
+
+        }
+
+        namespace idx {
+            const prototype: {
+            };
+
+        }
+
+        namespace indexOf {
+            const prototype: {
+            };
+
+        }
+
+        namespace insert {
+            const prototype: {
+            };
+
+        }
+
+        namespace insertAfter {
+            const prototype: {
+            };
+
+        }
+
+        namespace map {
+            const prototype: {
+            };
+
+        }
+
+        namespace meta {
+            const prototype: {
+            };
+
+        }
+
+        namespace one {
+            const prototype: {
+            };
+
+        }
+
+        namespace parent {
+            const prototype: {
+            };
+
+        }
+
+        namespace populate {
+            const prototype: {
+            };
+
+        }
+
+        namespace prepend {
+            const prototype: {
+            };
+
+        }
+
+        namespace remove {
+            const prototype: {
+            };
+
+        }
+
+        namespace replace {
+            const prototype: {
+            };
+
+        }
+
+        namespace repopulate {
+            const prototype: {
+            };
+
+        }
+
+        namespace setParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace substitute {
+            const prototype: {
+            };
+
+        }
+
+        namespace syncFromObject {
+            const prototype: {
+            };
+
+        }
+
+        namespace syncToObject {
+            const prototype: {
+            };
+
+        }
+
+        namespace toJSON {
+            const prototype: {
+            };
+
+        }
+
+        namespace toObject {
+            const prototype: {
+            };
+
+        }
+
+        namespace toString {
+            const prototype: {
+            };
+
+        }
+
+        namespace upsert {
+            const prototype: {
+            };
+
+        }
+
+    }
+
+}
+
+export namespace VariableScope {
+    namespace isVariableScope {
+        const prototype: {
+        };
+
+    }
+
+    namespace prototype {
+        function addLayer(list: any): void;
+
+        function clear(): void;
+
+        function describe(content: any, type: any): void;
+
+        function findInParents(property: any, customizer: any): any;
+
+        function findParentContaining(property: any, customizer: any): any;
+
+        function forEachParent(options: any, iterator: any): void;
+
+        function get(key: any): any;
+
+        function has(variableName: any): any;
+
+        function meta(...args: any[]): any;
+
+        function parent(): any;
+
+        function set(key: any, value: any, type: any): any;
+
+        function setParent(parent: any): void;
+
+        function syncVariablesFrom(obj: any, track: any): any;
+
+        function syncVariablesTo(obj: any): any;
+
+        function toJSON(): any;
+
+        function toObject(excludeDisabled: any, caseSensitive: any): any;
+
+        function toObjectResolved(scope: any, overrides: any, options: any): any;
+
+        function unset(key: any): void;
+
+        function variables(): any;
+
+        namespace addLayer {
+            const prototype: {
+            };
+
+        }
+
+        namespace clear {
+            const prototype: {
+            };
+
+        }
+
+        namespace describe {
+            const prototype: {
+            };
+
+        }
+
+        namespace findInParents {
+            const prototype: {
+            };
+
+        }
+
+        namespace findParentContaining {
+            const prototype: {
+            };
+
+        }
+
+        namespace forEachParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace get {
+            const prototype: {
+            };
+
+        }
+
+        namespace has {
+            const prototype: {
+            };
+
+        }
+
+        namespace meta {
+            const prototype: {
+            };
+
+        }
+
+        namespace parent {
+            const prototype: {
+            };
+
+        }
+
+        namespace set {
+            const prototype: {
+            };
+
+        }
+
+        namespace setParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace syncVariablesFrom {
+            const prototype: {
+            };
+
+        }
+
+        namespace syncVariablesTo {
+            const prototype: {
+            };
+
+        }
+
+        namespace toJSON {
+            const prototype: {
+            };
+
+        }
+
+        namespace toObject {
+            const prototype: {
+            };
+
+        }
+
+        namespace toObjectResolved {
+            const prototype: {
+            };
+
+        }
+
+        namespace unset {
+            const prototype: {
+            };
+
+        }
+
+        namespace variables {
+            const prototype: {
+            };
+
+        }
+
+    }
+
+}
+
+export namespace Version {
+    namespace prototype {
+        function findInParents(property: any, customizer: any): any;
+
+        function findParentContaining(property: any, customizer: any): any;
+
+        function forEachParent(options: any, iterator: any): void;
+
+        function meta(...args: any[]): any;
+
+        function parent(): any;
+
+        function set(value: any): void;
+
+        function setParent(parent: any): void;
+
+        function toJSON(): any;
+
+        function toString(): any;
+
+        namespace findInParents {
+            const prototype: {
+            };
+
+        }
+
+        namespace findParentContaining {
+            const prototype: {
+            };
+
+        }
+
+        namespace forEachParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace meta {
+            const prototype: {
+            };
+
+        }
+
+        namespace parent {
+            const prototype: {
+            };
+
+        }
+
+        namespace set {
+            const prototype: {
+            };
+
+        }
+
+        namespace setParent {
+            const prototype: {
+            };
+
+        }
+
+        namespace toJSON {
+            const prototype: {
+            };
+
+        }
+
+        namespace toString {
+            const prototype: {
+            };
+
+        }
+
+    }
+
+}
+
diff --git a/types/postman-collection/postman-collection-tests.ts b/types/postman-collection/postman-collection-tests.ts
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/types/postman-collection/tsconfig.json b/types/postman-collection/tsconfig.json
new file mode 100644
index 0000000000..3f176970e4
--- /dev/null
+++ b/types/postman-collection/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "postman-collection-tests.ts"
+    ]
+}
diff --git a/types/postman-collection/tslint.json b/types/postman-collection/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/postman-collection/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 685800783ac53ef976dba890a039f1b55334c9f2 Mon Sep 17 00:00:00 2001
From: Vidar Tonaas Fauske <vidartf@gmail.com>
Date: Thu, 15 Feb 2018 13:04:43 +0100
Subject: [PATCH 0048/1382] node: Add child_process Windows options

Add `windowsHide` to the appropriate options interfaces for node's
`child_process` functions. Following the documentation for node v9.5.0.
---
 types/node/index.d.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index 717b906b28..53d8d67702 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -2104,6 +2104,7 @@ declare module "child_process" {
         killSignal?: string;
         uid?: number;
         gid?: number;
+        windowsHide?: boolean;
     }
 
     export interface ExecOptionsWithStringEncoding extends ExecOptions {
@@ -2150,6 +2151,7 @@ declare module "child_process" {
         killSignal?: string;
         uid?: number;
         gid?: number;
+        windowsHide?: boolean;
         windowsVerbatimArguments?: boolean;
     }
     export interface ExecFileOptionsWithStringEncoding extends ExecFileOptions {
@@ -2233,6 +2235,7 @@ declare module "child_process" {
         maxBuffer?: number;
         encoding?: string;
         shell?: boolean | string;
+        windowsHide?: boolean;
         windowsVerbatimArguments?: boolean;
     }
     export interface SpawnSyncOptionsWithStringEncoding extends SpawnSyncOptions {
@@ -2270,6 +2273,7 @@ declare module "child_process" {
         killSignal?: string;
         maxBuffer?: number;
         encoding?: string;
+        windowsHide?: boolean;
     }
     export interface ExecSyncOptionsWithStringEncoding extends ExecSyncOptions {
         encoding: BufferEncoding;
@@ -2293,6 +2297,7 @@ declare module "child_process" {
         killSignal?: string;
         maxBuffer?: number;
         encoding?: string;
+        windowsHide?: boolean;
     }
     export interface ExecFileSyncOptionsWithStringEncoding extends ExecFileSyncOptions {
         encoding: BufferEncoding;

From 3f9d7f0bca2951025adbd46046bee8fece7804fa Mon Sep 17 00:00:00 2001
From: Vidar Tonaas Fauske <vidartf@gmail.com>
Date: Thu, 15 Feb 2018 13:08:20 +0100
Subject: [PATCH 0049/1382] node: Add test for windowsHide option

Test for commit 685800783ac53ef976dba890a039f1b55334c9f2
---
 types/node/node-tests.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/types/node/node-tests.ts b/types/node/node-tests.ts
index 0572c58fea..1eb6539b09 100644
--- a/types/node/node-tests.ts
+++ b/types/node/node-tests.ts
@@ -2049,14 +2049,17 @@ namespace string_decoder_tests {
 namespace child_process_tests {
     {
         childProcess.exec("echo test");
+        childProcess.exec("echo test", {windowsHide: true});
         childProcess.spawnSync("echo test");
+        childProcess.spawnSync("echo test", {windowsVerbatimArguments: false});
     }
 
     {
         childProcess.execFile("npm", () => {});
+        childProcess.execFile("npm", { windowsHide: true }, () => {});
         childProcess.execFile("npm", ["-v"], () => {});
-        childProcess.execFile("npm", ["-v"], { encoding: 'utf-8' }, (stdout, stderr) => { assert(stdout instanceof String); });
-        childProcess.execFile("npm", ["-v"], { encoding: 'buffer' }, (stdout, stderr) => { assert(stdout instanceof Buffer); });
+        childProcess.execFile("npm", ["-v"], { windowsHide: true, encoding: 'utf-8' }, (stdout, stderr) => { assert(stdout instanceof String); });
+        childProcess.execFile("npm", ["-v"], { windowsHide: true, encoding: 'buffer' }, (stdout, stderr) => { assert(stdout instanceof Buffer); });
         childProcess.execFile("npm", { encoding: 'utf-8' }, (stdout, stderr) => { assert(stdout instanceof String); });
         childProcess.execFile("npm", { encoding: 'buffer' }, (stdout, stderr) => { assert(stdout instanceof Buffer); });
     }

From b044535ed9892ca463096a46a8d11b5bf10bb272 Mon Sep 17 00:00:00 2001
From: Kyle Buzby <kbuzby@epic.com>
Date: Thu, 15 Feb 2018 09:55:50 -0600
Subject: [PATCH 0050/1382] add example tests

---
 types/postman-collection/postman-collection-tests.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/types/postman-collection/postman-collection-tests.ts b/types/postman-collection/postman-collection-tests.ts
index e69de29bb2..fd65e5e3d9 100644
--- a/types/postman-collection/postman-collection-tests.ts
+++ b/types/postman-collection/postman-collection-tests.ts
@@ -0,0 +1,7 @@
+import * as pmCollection from 'postman-collection';
+
+/* Example https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/base64-js/base64-js-tests.ts
+base64js.byteLength(""); // $ExpectType number
+base64js.toByteArray(""); // $ExpectType Uint8Array
+base64js.fromByteArray(new Uint8Array(0)); // $ExpectType string
+*/

From 009e85b173cfa589189096fbdf4449d29db400e9 Mon Sep 17 00:00:00 2001
From: Kyle Buzby <kbuzby@epic.com>
Date: Thu, 15 Feb 2018 09:56:05 -0600
Subject: [PATCH 0051/1382] remove unnecessary namespaces pt 1

---
 types/postman-collection/index.d.ts | 4692 ++++-----------------------
 1 file changed, 558 insertions(+), 4134 deletions(-)

diff --git a/types/postman-collection/index.d.ts b/types/postman-collection/index.d.ts
index 92e39e82d2..1247493c85 100644
--- a/types/postman-collection/index.d.ts
+++ b/types/postman-collection/index.d.ts
@@ -1,563 +1,566 @@
 // Type definitions for postman-collection 3.0
-// Project: https://github.com/postmanlabs/postman-collection#readme
-// Definitions by: My Self <https://github.com/me>
+// Project: https://github.com/postmanlabs/postman-collection
+// Definitions by: Kyle Buzby <https://github.com/kbuzby>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-export class Certificate {
-    constructor(options: any, ...args: any[]);
-
-    canApplyTo(url: any): any;
-
-    toJSON(): any;
-
-    update(options: any): void;
-
-    static isCertificate(obj: any): any;
-
+declare module PostmanCollection {
+    export class Certificate {
+        constructor(options: any, ...args: any[]);
+    
+        canApplyTo(url: any): any;
+    
+        toJSON(): any;
+    
+        update(options: any): void;
+    
+        static isCertificate(obj: any): any;
+    
+    }
+    
+    export class CertificateList {
+        constructor(parent: any, list: any);
+    
+        resolveOne(url: any): any;
+    
+        static isCertificateList(obj: any): any;
+    
+    }
+    
+    export class Collection {
+        constructor(definition: any, environments: any);
+    
+        syncVariablesFrom(obj: any, track: any): any;
+    
+        syncVariablesTo(obj: any): any;
+    
+        toJSON(): any;
+    
+        static isCollection(obj: any): any;
+    
+    }
+    
+    export class Cookie {
+        constructor(options: any);
+    
+        update(options: any): void;
+    
+        valueOf(): any;
+    
+        static isCookie(obj: any): any;
+    
+        static parse(str: any): any;
+    
+        static splitParam(param: any): any;
+    
+    }
+    
+    export class Description {
+        constructor(definition: any);
+    
+        toJSON(): any;
+    
+        toString(): any;
+    
+        update(content: any, type: any): void;
+    
+        static isDescription(obj: any): any;
+    
+    }
+    
+    export class Event {
+        constructor(definition: any);
+    
+        update(definition: any): void;
+    
+    }
+    
+    export class EventList {
+        constructor(parent: any, populate: any);
+    
+        listeners(name: any): any;
+    
+        listenersOwn(name: any): any;
+    
+        static isEventList(obj: any): any;
+    
+    }
+    
+    export class FormParam {
+        constructor(options: any, ...args: any[]);
+    
+        toString(): any;
+    
+        valueOf(): any;
+    
+        static parse(): void;
+    
+    }
+    
+    export class Header {
+        constructor(options: any, name: any, ...args: any[]);
+    
+        toString(): any;
+    
+        update(options: any): void;
+    
+        valueOf(): any;
+    
+        static create(...args: any[]): any;
+    
+        static isHeader(obj: any): any;
+    
+        static parse(headerString: any): any;
+    
+        static parseSingle(header: any): any;
+    
+        static unparse(headers: any, separator: any): any;
+    
+        static unparseSingle(header: any): any;
+    
+    }
+    
+    export class HeaderList {
+        constructor(parent: any, headers: any);
+    
+        contentSize(): any;
+    
+        static isHeaderList(obj: any): any;
+    
+    }
+    
+    export class Item {
+        constructor(definition: any, ...args: any[]);
+    
+        authorizeRequestUsing(type: any, options: any): any;
+    
+        getAuth(): any;
+    
+        getEvents(name: any): any;
+    
+        static isItem(obj: any): any;
+    
+    }
+    
+    export class ItemGroup {
+        constructor(definition: any, ...args: any[]);
+    
+        authorizeRequestsUsing(type: any, options: any): void;
+    
+        forEachItem(callback: any): any;
+    
+        forEachItemGroup(callback: any): void;
+    
+        oneDeep(idOrName: any): any;
+    
+        static isItemGroup(obj: any): any;
+    
+    }
+    
+    export class Property {
+        constructor(definition: any, ...args: any[]);
+    
+        describe(content: any, type: any): void;
+    
+        toObjectResolved(scope: any, overrides: any, options: any): any;
+    
+        static replaceSubstitutions(str: any, variables: any, ...args: any[]): any;
+    
+        static replaceSubstitutionsIn(obj: any, variables: any, mutate: any): any;
+    
+    }
+    
+    export class PropertyBase {
+        constructor(definition: any);
+    
+        findInParents(property: any, customizer: any): any;
+    
+        findParentContaining(property: any, customizer: any): any;
+    
+        forEachParent(options: any, iterator: any): void;
+    
+        meta(...args: any[]): any;
+    
+        parent(): any;
+    
+        setParent(parent: any): void;
+    
+        toJSON(): any;
+    
+        static propertyIsMeta(value: any, key: any): any;
+    
+        static propertyUnprefixMeta(value: any, key: any): any;
+    
+        static toJSON(obj: any): any;
+    
+    }
+    
+    export class PropertyList {
+        constructor(type: any, parent: any, populate: any);
+    
+        add(item: any, ...args: any[]): void;
+    
+        all(): any;
+    
+        append(item: any): any;
+    
+        assimilate(source: any, prune: any): void;
+    
+        clear(): void;
+    
+        count(): any;
+    
+        each(iterator: any, context: any): void;
+    
+        eachParent(iterator: any, context: any): void;
+    
+        filter(rule: any, context: any): any;
+    
+        find(rule: any, context: any): any;
+    
+        get(key: any): any;
+    
+        has(item: any, value: any, ...args: any[]): any;
+    
+        idx(index: any): any;
+    
+        indexOf(item: any): any;
+    
+        insert(item: any, before: any): void;
+    
+        insertAfter(item: any, after: any): any;
+    
+        map(iterator: any, context: any): any;
+    
+        one(id: any): any;
+    
+        populate(items: any): void;
+    
+        prepend(item: any): any;
+    
+        remove(predicate: any, context: any, ...args: any[]): any;
+    
+        repopulate(items: any): void;
+    
+        toJSON(): any;
+    
+        toObject(excludeDisabled: any, caseSensitive: any, multiValue: any, sanitizeKeys: any): any;
+    
+        toString(): any;
+    
+        upsert(item: any): any;
+    
+        static isPropertyList(obj: any): any;
+    
+    }
+    
+    export class ProxyConfig {
+        constructor(options: any);
+    
+        getProtocols(): any;
+    
+        getProxyUrl(): any;
+    
+        test(urlStr: any): any;
+    
+        update(options: any): void;
+    
+        updateProtocols(protocols: any): void;
+    
+        static isProxyConfig(obj: any): any;
+    
+    }
+    
+    export class ProxyConfigList {
+        constructor(parent: any, populate: any);
+    
+        resolve(url: any): any;
+    
+        static isProxyConfigList(obj: any): any;
+    
+    }
+    
+    export class QueryParam {
+        constructor(options: any, ...args: any[]);
+    
+        toString(): any;
+    
+        update(param: any): void;
+    
+        valueOf(): any;
+    
+        static parse(query: any): any;
+    
+        static parseSingle(param: any, idx: any, all: any): any;
+    
+        static unparse(params: any, options: any): any;
+    
+        static unparseSingle(obj: any, encode: any): any;
+    
+    }
+    
+    export class Request {
+        constructor(options: any, ...args: any[]);
+    
+        addHeader(header: any): void;
+    
+        addQueryParams(params: any): void;
+    
+        authorize(): void;
+    
+        authorizeUsing(type: any, options: any): void;
+    
+        clone(): any;
+    
+        forEachHeader(callback: any): any;
+    
+        getHeaders(options: any): any;
+    
+        removeHeader(toRemove: any, options: any): any;
+    
+        removeQueryParams(params: any): void;
+    
+        toJSON(): any;
+    
+        update(options: any): void;
+    
+        upsertHeader(header: any): any;
+    
+        static isRequest(obj: any): any;
+    
+    }
+    
+    export class RequestAuth {
+        constructor(options: any, parent: any);
+    
+        clear(type: any): void;
+    
+        current(): any;
+    
+        parameters(): any;
+    
+        update(options: any, type: any): void;
+    
+        use(type: any, options: any): void;
+    
+        static isValidType(type: any): any;
+    
+    }
+    
+    export class RequestBody {
+        constructor(options: any, ...args: any[]);
+    
+        isEmpty(): any;
+    
+        toString(): any;
+    
+        update(options: any): void;
+    
+        static MODES: {
+            file: string;
+            formdata: string;
+            raw: string;
+            urlencoded: string;
+        };
+    
+    }
+    
+    export class Response {
+        constructor(options: any, ...args: any[]);
+    
+        dataURI(): any;
+    
+        details(): any;
+    
+        encoding(): any;
+    
+        json(reviver: any, strict: any): any;
+    
+        mime(contentType: any, contentDisposition: any): any;
+    
+        reason(): any;
+    
+        size(): any;
+    
+        text(): any;
+    
+        toJSON(): any;
+    
+        update(options: any): void;
+    
+        static createFromNode(response: any, cookies: any): any;
+    
+        static isResponse(obj: any): any;
+    
+        static mimeInfo(type: any, disposition: any): any;
+    
+    }
+    
+    export class Script {
+        constructor(options: any, ...args: any[]);
+    
+        toSource(): any;
+    
+        update(options: any): void;
+    
+        static isScript(obj: any): any;
+    
+    }
+    
+    export class Url {
+        constructor(options: any, ...args: any[]);
+    
+        addQueryParams(params: any): void;
+    
+        getHost(): any;
+    
+        getOAuth1BaseUrl(): any;
+    
+        getPath(options: any): any;
+    
+        getPathWithQuery(): any;
+    
+        getQueryString(options: any): any;
+    
+        getRaw(): any;
+    
+        getRemote(options: any): any;
+    
+        removeQueryParams(params: any): any;
+    
+        toString(forceProtocol: any): any;
+    
+        update(url: any): any;
+    
+        static isUrl(obj: any): any;
+    
+        static parse(url: any): any;
+    
+    }
+    
+    export class UrlMatchPattern {
+        constructor(options: any, ...args: any[]);
+    
+        createMatchPattern(): any;
+    
+        getProtocols(): any;
+    
+        globPatternToRegexp(pattern: any): any;
+    
+        matchAbsoluteHostPattern(matchRegexObject: any, remote: any): any;
+    
+        matchAnyHost(matchRegexObject: any): any;
+    
+        matchSuffixHostPattern(matchRegexObject: any, remote: any): any;
+    
+        test(urlStr: any): any;
+    
+        testHost(host: any): any;
+    
+        testPath(path: any): any;
+    
+        testProtocol(protocol: any): any;
+    
+        toJSON(): any;
+    
+        toString(): any;
+    
+        update(options: any): void;
+    
+        static MATCH_ALL_URLS: string;
+    
+        static PROTOCOL_DELIMITER: string;
+    
+    }
+    
+    export class UrlMatchPatternList {
+        constructor(parent: any, list: any);
+    
+        test(urlStr: any): any;
+    
+    }
+    
+    export class Variable {
+        constructor(definition: any, ...args: any[]);
+    
+        cast(value: any): any;
+    
+        castIn(value: any): any;
+    
+        castOut(value: any): any;
+    
+        get(): any;
+    
+        set(value: any): void;
+    
+        toString(): any;
+    
+        update(options: any): void;
+    
+        valueOf(value: any, ...args: any[]): any;
+    
+        valueType(typeName: any, _noCast: any): any;
+    
+        static isVariable(obj: any): any;
+    
+    }
+    
+    export class VariableList {
+        constructor(parent: any, populate: any);
+    
+        replace(str: any, overrides: any): any;
+    
+        substitute(obj: any, overrides: any, mutate: any): any;
+    
+        syncFromObject(obj: any, track: any, prune: any): any;
+    
+        syncToObject(obj: any): any;
+    
+        static isVariableList(obj: any): any;
+    
+    }
+    
+    export class VariableScope {
+        constructor(definition: any, layers: any);
+    
+        addLayer(list: any): void;
+    
+        clear(): void;
+    
+        get(key: any): any;
+    
+        has(variableName: any): any;
+    
+        set(key: any, value: any, type: any): any;
+    
+        syncVariablesFrom(obj: any, track: any): any;
+    
+        syncVariablesTo(obj: any): any;
+    
+        toJSON(): any;
+    
+        toObject(excludeDisabled: any, caseSensitive: any): any;
+    
+        unset(key: any): void;
+    
+        variables(): any;
+    
+        static isVariableScope(obj: any): any;
+    
+    }
+    
+    export class Version {
+        constructor(options: any);
+    
+        set(value: any): void;
+    
+        toString(): any;
+    
+    }
+    
+    export function CookieList(parent: any, cookies: any): void;
+    
 }
 
-export class CertificateList {
-    constructor(parent: any, list: any);
-
-    resolveOne(url: any): any;
-
-    static isCertificateList(obj: any): any;
-
-}
-
-export class Collection {
-    constructor(definition: any, environments: any);
-
-    syncVariablesFrom(obj: any, track: any): any;
-
-    syncVariablesTo(obj: any): any;
-
-    toJSON(): any;
-
-    static isCollection(obj: any): any;
-
-}
-
-export class Cookie {
-    constructor(options: any);
-
-    update(options: any): void;
-
-    valueOf(): any;
-
-    static isCookie(obj: any): any;
-
-    static parse(str: any): any;
-
-    static splitParam(param: any): any;
-
-}
-
-export class Description {
-    constructor(definition: any);
-
-    toJSON(): any;
-
-    toString(): any;
-
-    update(content: any, type: any): void;
-
-    static isDescription(obj: any): any;
-
-}
-
-export class Event {
-    constructor(definition: any);
-
-    update(definition: any): void;
-
-}
-
-export class EventList {
-    constructor(parent: any, populate: any);
-
-    listeners(name: any): any;
-
-    listenersOwn(name: any): any;
-
-    static isEventList(obj: any): any;
-
-}
-
-export class FormParam {
-    constructor(options: any, ...args: any[]);
-
-    toString(): any;
-
-    valueOf(): any;
-
-    static parse(): void;
-
-}
-
-export class Header {
-    constructor(options: any, name: any, ...args: any[]);
-
-    toString(): any;
-
-    update(options: any): void;
-
-    valueOf(): any;
-
-    static create(...args: any[]): any;
-
-    static isHeader(obj: any): any;
-
-    static parse(headerString: any): any;
-
-    static parseSingle(header: any): any;
-
-    static unparse(headers: any, separator: any): any;
-
-    static unparseSingle(header: any): any;
-
-}
-
-export class HeaderList {
-    constructor(parent: any, headers: any);
-
-    contentSize(): any;
-
-    static isHeaderList(obj: any): any;
-
-}
-
-export class Item {
-    constructor(definition: any, ...args: any[]);
-
-    authorizeRequestUsing(type: any, options: any): any;
-
-    getAuth(): any;
-
-    getEvents(name: any): any;
-
-    static isItem(obj: any): any;
-
-}
-
-export class ItemGroup {
-    constructor(definition: any, ...args: any[]);
-
-    authorizeRequestsUsing(type: any, options: any): void;
-
-    forEachItem(callback: any): any;
-
-    forEachItemGroup(callback: any): void;
-
-    oneDeep(idOrName: any): any;
-
-    static isItemGroup(obj: any): any;
-
-}
-
-export class Property {
-    constructor(definition: any, ...args: any[]);
-
-    describe(content: any, type: any): void;
-
-    toObjectResolved(scope: any, overrides: any, options: any): any;
-
-    static replaceSubstitutions(str: any, variables: any, ...args: any[]): any;
-
-    static replaceSubstitutionsIn(obj: any, variables: any, mutate: any): any;
-
-}
-
-export class PropertyBase {
-    constructor(definition: any);
-
-    findInParents(property: any, customizer: any): any;
-
-    findParentContaining(property: any, customizer: any): any;
-
-    forEachParent(options: any, iterator: any): void;
-
-    meta(...args: any[]): any;
-
-    parent(): any;
-
-    setParent(parent: any): void;
-
-    toJSON(): any;
-
-    static propertyIsMeta(value: any, key: any): any;
-
-    static propertyUnprefixMeta(value: any, key: any): any;
-
-    static toJSON(obj: any): any;
-
-}
-
-export class PropertyList {
-    constructor(type: any, parent: any, populate: any);
-
-    add(item: any, ...args: any[]): void;
-
-    all(): any;
-
-    append(item: any): any;
-
-    assimilate(source: any, prune: any): void;
-
-    clear(): void;
-
-    count(): any;
-
-    each(iterator: any, context: any): void;
-
-    eachParent(iterator: any, context: any): void;
-
-    filter(rule: any, context: any): any;
-
-    find(rule: any, context: any): any;
-
-    get(key: any): any;
-
-    has(item: any, value: any, ...args: any[]): any;
-
-    idx(index: any): any;
-
-    indexOf(item: any): any;
-
-    insert(item: any, before: any): void;
-
-    insertAfter(item: any, after: any): any;
-
-    map(iterator: any, context: any): any;
-
-    one(id: any): any;
-
-    populate(items: any): void;
-
-    prepend(item: any): any;
-
-    remove(predicate: any, context: any, ...args: any[]): any;
-
-    repopulate(items: any): void;
-
-    toJSON(): any;
-
-    toObject(excludeDisabled: any, caseSensitive: any, multiValue: any, sanitizeKeys: any): any;
-
-    toString(): any;
-
-    upsert(item: any): any;
-
-    static isPropertyList(obj: any): any;
-
-}
-
-export class ProxyConfig {
-    constructor(options: any);
-
-    getProtocols(): any;
-
-    getProxyUrl(): any;
-
-    test(urlStr: any): any;
-
-    update(options: any): void;
-
-    updateProtocols(protocols: any): void;
-
-    static isProxyConfig(obj: any): any;
-
-}
-
-export class ProxyConfigList {
-    constructor(parent: any, populate: any);
-
-    resolve(url: any): any;
-
-    static isProxyConfigList(obj: any): any;
-
-}
-
-export class QueryParam {
-    constructor(options: any, ...args: any[]);
-
-    toString(): any;
-
-    update(param: any): void;
-
-    valueOf(): any;
-
-    static parse(query: any): any;
-
-    static parseSingle(param: any, idx: any, all: any): any;
-
-    static unparse(params: any, options: any): any;
-
-    static unparseSingle(obj: any, encode: any): any;
-
-}
-
-export class Request {
-    constructor(options: any, ...args: any[]);
-
-    addHeader(header: any): void;
-
-    addQueryParams(params: any): void;
-
-    authorize(): void;
-
-    authorizeUsing(type: any, options: any): void;
-
-    clone(): any;
-
-    forEachHeader(callback: any): any;
-
-    getHeaders(options: any): any;
-
-    removeHeader(toRemove: any, options: any): any;
-
-    removeQueryParams(params: any): void;
-
-    toJSON(): any;
-
-    update(options: any): void;
-
-    upsertHeader(header: any): any;
-
-    static isRequest(obj: any): any;
-
-}
-
-export class RequestAuth {
-    constructor(options: any, parent: any);
-
-    clear(type: any): void;
-
-    current(): any;
-
-    parameters(): any;
-
-    update(options: any, type: any): void;
-
-    use(type: any, options: any): void;
-
-    static isValidType(type: any): any;
-
-}
-
-export class RequestBody {
-    constructor(options: any, ...args: any[]);
-
-    isEmpty(): any;
-
-    toString(): any;
-
-    update(options: any): void;
-
-    static MODES: {
-        file: string;
-        formdata: string;
-        raw: string;
-        urlencoded: string;
-    };
-
-}
-
-export class Response {
-    constructor(options: any, ...args: any[]);
-
-    dataURI(): any;
-
-    details(): any;
-
-    encoding(): any;
-
-    json(reviver: any, strict: any): any;
-
-    mime(contentType: any, contentDisposition: any): any;
-
-    reason(): any;
-
-    size(): any;
-
-    text(): any;
-
-    toJSON(): any;
-
-    update(options: any): void;
-
-    static createFromNode(response: any, cookies: any): any;
-
-    static isResponse(obj: any): any;
-
-    static mimeInfo(type: any, disposition: any): any;
-
-}
-
-export class Script {
-    constructor(options: any, ...args: any[]);
-
-    toSource(): any;
-
-    update(options: any): void;
-
-    static isScript(obj: any): any;
-
-}
-
-export class Url {
-    constructor(options: any, ...args: any[]);
-
-    addQueryParams(params: any): void;
-
-    getHost(): any;
-
-    getOAuth1BaseUrl(): any;
-
-    getPath(options: any): any;
-
-    getPathWithQuery(): any;
-
-    getQueryString(options: any): any;
-
-    getRaw(): any;
-
-    getRemote(options: any): any;
-
-    removeQueryParams(params: any): any;
-
-    toString(forceProtocol: any): any;
-
-    update(url: any): any;
-
-    static isUrl(obj: any): any;
-
-    static parse(url: any): any;
-
-}
-
-export class UrlMatchPattern {
-    constructor(options: any, ...args: any[]);
-
-    createMatchPattern(): any;
-
-    getProtocols(): any;
-
-    globPatternToRegexp(pattern: any): any;
-
-    matchAbsoluteHostPattern(matchRegexObject: any, remote: any): any;
-
-    matchAnyHost(matchRegexObject: any): any;
-
-    matchSuffixHostPattern(matchRegexObject: any, remote: any): any;
-
-    test(urlStr: any): any;
-
-    testHost(host: any): any;
-
-    testPath(path: any): any;
-
-    testProtocol(protocol: any): any;
-
-    toJSON(): any;
-
-    toString(): any;
-
-    update(options: any): void;
-
-    static MATCH_ALL_URLS: string;
-
-    static PROTOCOL_DELIMITER: string;
-
-}
-
-export class UrlMatchPatternList {
-    constructor(parent: any, list: any);
-
-    test(urlStr: any): any;
-
-}
-
-export class Variable {
-    constructor(definition: any, ...args: any[]);
-
-    cast(value: any): any;
-
-    castIn(value: any): any;
-
-    castOut(value: any): any;
-
-    get(): any;
-
-    set(value: any): void;
-
-    toString(): any;
-
-    update(options: any): void;
-
-    valueOf(value: any, ...args: any[]): any;
-
-    valueType(typeName: any, _noCast: any): any;
-
-    static isVariable(obj: any): any;
-
-}
-
-export class VariableList {
-    constructor(parent: any, populate: any);
-
-    replace(str: any, overrides: any): any;
-
-    substitute(obj: any, overrides: any, mutate: any): any;
-
-    syncFromObject(obj: any, track: any, prune: any): any;
-
-    syncToObject(obj: any): any;
-
-    static isVariableList(obj: any): any;
-
-}
-
-export class VariableScope {
-    constructor(definition: any, layers: any);
-
-    addLayer(list: any): void;
-
-    clear(): void;
-
-    get(key: any): any;
-
-    has(variableName: any): any;
-
-    set(key: any, value: any, type: any): any;
-
-    syncVariablesFrom(obj: any, track: any): any;
-
-    syncVariablesTo(obj: any): any;
-
-    toJSON(): any;
-
-    toObject(excludeDisabled: any, caseSensitive: any): any;
-
-    unset(key: any): void;
-
-    variables(): any;
-
-    static isVariableScope(obj: any): any;
-
-}
-
-export class Version {
-    constructor(options: any);
-
-    set(value: any): void;
-
-    toString(): any;
-
-}
-
-export function CookieList(parent: any, cookies: any): void;
-
 export namespace Certificate {
     namespace isCertificate {
         const prototype: {
@@ -587,73 +590,6 @@ export namespace Certificate {
         function toObjectResolved(scope: any, overrides: any, options: any): any;
 
         function update(options: any): void;
-
-        namespace canApplyTo {
-            const prototype: {
-            };
-
-        }
-
-        namespace describe {
-            const prototype: {
-            };
-
-        }
-
-        namespace findInParents {
-            const prototype: {
-            };
-
-        }
-
-        namespace findParentContaining {
-            const prototype: {
-            };
-
-        }
-
-        namespace forEachParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace meta {
-            const prototype: {
-            };
-
-        }
-
-        namespace parent {
-            const prototype: {
-            };
-
-        }
-
-        namespace setParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace toJSON {
-            const prototype: {
-            };
-
-        }
-
-        namespace toObjectResolved {
-            const prototype: {
-            };
-
-        }
-
-        namespace update {
-            const prototype: {
-            };
-
-        }
-
     }
 
 }
@@ -732,204 +668,6 @@ export namespace CertificateList {
 
         function upsert(item: any): any;
 
-        namespace add {
-            const prototype: {
-            };
-
-        }
-
-        namespace all {
-            const prototype: {
-            };
-
-        }
-
-        namespace append {
-            const prototype: {
-            };
-
-        }
-
-        namespace assimilate {
-            const prototype: {
-            };
-
-        }
-
-        namespace clear {
-            const prototype: {
-            };
-
-        }
-
-        namespace count {
-            const prototype: {
-            };
-
-        }
-
-        namespace each {
-            const prototype: {
-            };
-
-        }
-
-        namespace eachParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace filter {
-            const prototype: {
-            };
-
-        }
-
-        namespace find {
-            const prototype: {
-            };
-
-        }
-
-        namespace findInParents {
-            const prototype: {
-            };
-
-        }
-
-        namespace findParentContaining {
-            const prototype: {
-            };
-
-        }
-
-        namespace forEachParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace get {
-            const prototype: {
-            };
-
-        }
-
-        namespace has {
-            const prototype: {
-            };
-
-        }
-
-        namespace idx {
-            const prototype: {
-            };
-
-        }
-
-        namespace indexOf {
-            const prototype: {
-            };
-
-        }
-
-        namespace insert {
-            const prototype: {
-            };
-
-        }
-
-        namespace insertAfter {
-            const prototype: {
-            };
-
-        }
-
-        namespace map {
-            const prototype: {
-            };
-
-        }
-
-        namespace meta {
-            const prototype: {
-            };
-
-        }
-
-        namespace one {
-            const prototype: {
-            };
-
-        }
-
-        namespace parent {
-            const prototype: {
-            };
-
-        }
-
-        namespace populate {
-            const prototype: {
-            };
-
-        }
-
-        namespace prepend {
-            const prototype: {
-            };
-
-        }
-
-        namespace remove {
-            const prototype: {
-            };
-
-        }
-
-        namespace repopulate {
-            const prototype: {
-            };
-
-        }
-
-        namespace resolveOne {
-            const prototype: {
-            };
-
-        }
-
-        namespace setParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace toJSON {
-            const prototype: {
-            };
-
-        }
-
-        namespace toObject {
-            const prototype: {
-            };
-
-        }
-
-        namespace toString {
-            const prototype: {
-            };
-
-        }
-
-        namespace upsert {
-            const prototype: {
-            };
-
-        }
-
     }
 
 }
@@ -971,97 +709,6 @@ export namespace Collection {
         function toJSON(): any;
 
         function toObjectResolved(scope: any, overrides: any, options: any): any;
-
-        namespace authorizeRequestsUsing {
-            const prototype: {
-            };
-
-        }
-
-        namespace describe {
-            const prototype: {
-            };
-
-        }
-
-        namespace findInParents {
-            const prototype: {
-            };
-
-        }
-
-        namespace findParentContaining {
-            const prototype: {
-            };
-
-        }
-
-        namespace forEachItem {
-            const prototype: {
-            };
-
-        }
-
-        namespace forEachItemGroup {
-            const prototype: {
-            };
-
-        }
-
-        namespace forEachParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace meta {
-            const prototype: {
-            };
-
-        }
-
-        namespace oneDeep {
-            const prototype: {
-            };
-
-        }
-
-        namespace parent {
-            const prototype: {
-            };
-
-        }
-
-        namespace setParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace syncVariablesFrom {
-            const prototype: {
-            };
-
-        }
-
-        namespace syncVariablesTo {
-            const prototype: {
-            };
-
-        }
-
-        namespace toJSON {
-            const prototype: {
-            };
-
-        }
-
-        namespace toObjectResolved {
-            const prototype: {
-            };
-
-        }
-
     }
 
 }
@@ -1098,60 +745,6 @@ export namespace Cookie {
 
         function valueOf(): any;
 
-        namespace findInParents {
-            const prototype: {
-            };
-
-        }
-
-        namespace findParentContaining {
-            const prototype: {
-            };
-
-        }
-
-        namespace forEachParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace meta {
-            const prototype: {
-            };
-
-        }
-
-        namespace parent {
-            const prototype: {
-            };
-
-        }
-
-        namespace setParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace toJSON {
-            const prototype: {
-            };
-
-        }
-
-        namespace update {
-            const prototype: {
-            };
-
-        }
-
-        namespace valueOf {
-            const prototype: {
-            };
-
-        }
-
     }
 
     namespace splitParam {
@@ -1236,197 +829,6 @@ export namespace CookieList {
 
         function upsert(item: any): any;
 
-        namespace add {
-            const prototype: {
-            };
-
-        }
-
-        namespace all {
-            const prototype: {
-            };
-
-        }
-
-        namespace append {
-            const prototype: {
-            };
-
-        }
-
-        namespace assimilate {
-            const prototype: {
-            };
-
-        }
-
-        namespace clear {
-            const prototype: {
-            };
-
-        }
-
-        namespace count {
-            const prototype: {
-            };
-
-        }
-
-        namespace each {
-            const prototype: {
-            };
-
-        }
-
-        namespace eachParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace filter {
-            const prototype: {
-            };
-
-        }
-
-        namespace find {
-            const prototype: {
-            };
-
-        }
-
-        namespace findInParents {
-            const prototype: {
-            };
-
-        }
-
-        namespace findParentContaining {
-            const prototype: {
-            };
-
-        }
-
-        namespace forEachParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace get {
-            const prototype: {
-            };
-
-        }
-
-        namespace has {
-            const prototype: {
-            };
-
-        }
-
-        namespace idx {
-            const prototype: {
-            };
-
-        }
-
-        namespace indexOf {
-            const prototype: {
-            };
-
-        }
-
-        namespace insert {
-            const prototype: {
-            };
-
-        }
-
-        namespace insertAfter {
-            const prototype: {
-            };
-
-        }
-
-        namespace map {
-            const prototype: {
-            };
-
-        }
-
-        namespace meta {
-            const prototype: {
-            };
-
-        }
-
-        namespace one {
-            const prototype: {
-            };
-
-        }
-
-        namespace parent {
-            const prototype: {
-            };
-
-        }
-
-        namespace populate {
-            const prototype: {
-            };
-
-        }
-
-        namespace prepend {
-            const prototype: {
-            };
-
-        }
-
-        namespace remove {
-            const prototype: {
-            };
-
-        }
-
-        namespace repopulate {
-            const prototype: {
-            };
-
-        }
-
-        namespace setParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace toJSON {
-            const prototype: {
-            };
-
-        }
-
-        namespace toObject {
-            const prototype: {
-            };
-
-        }
-
-        namespace toString {
-            const prototype: {
-            };
-
-        }
-
-        namespace upsert {
-            const prototype: {
-            };
-
-        }
 
     }
 
@@ -1449,24 +851,6 @@ export namespace Description {
 
         function update(content: any, type: any): void;
 
-        namespace toJSON {
-            const prototype: {
-            };
-
-        }
-
-        namespace toString {
-            const prototype: {
-            };
-
-        }
-
-        namespace update {
-            const prototype: {
-            };
-
-        }
-
     }
 
 }
@@ -1492,67 +876,6 @@ export namespace Event {
         function toObjectResolved(scope: any, overrides: any, options: any): any;
 
         function update(definition: any): void;
-
-        namespace describe {
-            const prototype: {
-            };
-
-        }
-
-        namespace findInParents {
-            const prototype: {
-            };
-
-        }
-
-        namespace findParentContaining {
-            const prototype: {
-            };
-
-        }
-
-        namespace forEachParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace meta {
-            const prototype: {
-            };
-
-        }
-
-        namespace parent {
-            const prototype: {
-            };
-
-        }
-
-        namespace setParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace toJSON {
-            const prototype: {
-            };
-
-        }
-
-        namespace toObjectResolved {
-            const prototype: {
-            };
-
-        }
-
-        namespace update {
-            const prototype: {
-            };
-
-        }
-
     }
 
 }
@@ -1632,211 +955,6 @@ export namespace EventList {
         function toString(): any;
 
         function upsert(item: any): any;
-
-        namespace add {
-            const prototype: {
-            };
-
-        }
-
-        namespace all {
-            const prototype: {
-            };
-
-        }
-
-        namespace append {
-            const prototype: {
-            };
-
-        }
-
-        namespace assimilate {
-            const prototype: {
-            };
-
-        }
-
-        namespace clear {
-            const prototype: {
-            };
-
-        }
-
-        namespace count {
-            const prototype: {
-            };
-
-        }
-
-        namespace each {
-            const prototype: {
-            };
-
-        }
-
-        namespace eachParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace filter {
-            const prototype: {
-            };
-
-        }
-
-        namespace find {
-            const prototype: {
-            };
-
-        }
-
-        namespace findInParents {
-            const prototype: {
-            };
-
-        }
-
-        namespace findParentContaining {
-            const prototype: {
-            };
-
-        }
-
-        namespace forEachParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace get {
-            const prototype: {
-            };
-
-        }
-
-        namespace has {
-            const prototype: {
-            };
-
-        }
-
-        namespace idx {
-            const prototype: {
-            };
-
-        }
-
-        namespace indexOf {
-            const prototype: {
-            };
-
-        }
-
-        namespace insert {
-            const prototype: {
-            };
-
-        }
-
-        namespace insertAfter {
-            const prototype: {
-            };
-
-        }
-
-        namespace listeners {
-            const prototype: {
-            };
-
-        }
-
-        namespace listenersOwn {
-            const prototype: {
-            };
-
-        }
-
-        namespace map {
-            const prototype: {
-            };
-
-        }
-
-        namespace meta {
-            const prototype: {
-            };
-
-        }
-
-        namespace one {
-            const prototype: {
-            };
-
-        }
-
-        namespace parent {
-            const prototype: {
-            };
-
-        }
-
-        namespace populate {
-            const prototype: {
-            };
-
-        }
-
-        namespace prepend {
-            const prototype: {
-            };
-
-        }
-
-        namespace remove {
-            const prototype: {
-            };
-
-        }
-
-        namespace repopulate {
-            const prototype: {
-            };
-
-        }
-
-        namespace setParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace toJSON {
-            const prototype: {
-            };
-
-        }
-
-        namespace toObject {
-            const prototype: {
-            };
-
-        }
-
-        namespace toString {
-            const prototype: {
-            };
-
-        }
-
-        namespace upsert {
-            const prototype: {
-            };
-
-        }
-
     }
 
 }
@@ -1870,73 +988,6 @@ export namespace FormParam {
         function toString(): any;
 
         function valueOf(): any;
-
-        namespace describe {
-            const prototype: {
-            };
-
-        }
-
-        namespace findInParents {
-            const prototype: {
-            };
-
-        }
-
-        namespace findParentContaining {
-            const prototype: {
-            };
-
-        }
-
-        namespace forEachParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace meta {
-            const prototype: {
-            };
-
-        }
-
-        namespace parent {
-            const prototype: {
-            };
-
-        }
-
-        namespace setParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace toJSON {
-            const prototype: {
-            };
-
-        }
-
-        namespace toObjectResolved {
-            const prototype: {
-            };
-
-        }
-
-        namespace toString {
-            const prototype: {
-            };
-
-        }
-
-        namespace valueOf {
-            const prototype: {
-            };
-
-        }
-
     }
 
 }
@@ -1990,79 +1041,6 @@ export namespace Header {
         function update(options: any): void;
 
         function valueOf(): any;
-
-        namespace describe {
-            const prototype: {
-            };
-
-        }
-
-        namespace findInParents {
-            const prototype: {
-            };
-
-        }
-
-        namespace findParentContaining {
-            const prototype: {
-            };
-
-        }
-
-        namespace forEachParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace meta {
-            const prototype: {
-            };
-
-        }
-
-        namespace parent {
-            const prototype: {
-            };
-
-        }
-
-        namespace setParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace toJSON {
-            const prototype: {
-            };
-
-        }
-
-        namespace toObjectResolved {
-            const prototype: {
-            };
-
-        }
-
-        namespace toString {
-            const prototype: {
-            };
-
-        }
-
-        namespace update {
-            const prototype: {
-            };
-
-        }
-
-        namespace valueOf {
-            const prototype: {
-            };
-
-        }
-
     }
 
     namespace unparse {
@@ -2152,205 +1130,6 @@ export namespace HeaderList {
         function toString(): any;
 
         function upsert(item: any): any;
-
-        namespace add {
-            const prototype: {
-            };
-
-        }
-
-        namespace all {
-            const prototype: {
-            };
-
-        }
-
-        namespace append {
-            const prototype: {
-            };
-
-        }
-
-        namespace assimilate {
-            const prototype: {
-            };
-
-        }
-
-        namespace clear {
-            const prototype: {
-            };
-
-        }
-
-        namespace contentSize {
-            const prototype: {
-            };
-
-        }
-
-        namespace count {
-            const prototype: {
-            };
-
-        }
-
-        namespace each {
-            const prototype: {
-            };
-
-        }
-
-        namespace eachParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace filter {
-            const prototype: {
-            };
-
-        }
-
-        namespace find {
-            const prototype: {
-            };
-
-        }
-
-        namespace findInParents {
-            const prototype: {
-            };
-
-        }
-
-        namespace findParentContaining {
-            const prototype: {
-            };
-
-        }
-
-        namespace forEachParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace get {
-            const prototype: {
-            };
-
-        }
-
-        namespace has {
-            const prototype: {
-            };
-
-        }
-
-        namespace idx {
-            const prototype: {
-            };
-
-        }
-
-        namespace indexOf {
-            const prototype: {
-            };
-
-        }
-
-        namespace insert {
-            const prototype: {
-            };
-
-        }
-
-        namespace insertAfter {
-            const prototype: {
-            };
-
-        }
-
-        namespace map {
-            const prototype: {
-            };
-
-        }
-
-        namespace meta {
-            const prototype: {
-            };
-
-        }
-
-        namespace one {
-            const prototype: {
-            };
-
-        }
-
-        namespace parent {
-            const prototype: {
-            };
-
-        }
-
-        namespace populate {
-            const prototype: {
-            };
-
-        }
-
-        namespace prepend {
-            const prototype: {
-            };
-
-        }
-
-        namespace remove {
-            const prototype: {
-            };
-
-        }
-
-        namespace repopulate {
-            const prototype: {
-            };
-
-        }
-
-        namespace setParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace toJSON {
-            const prototype: {
-            };
-
-        }
-
-        namespace toObject {
-            const prototype: {
-            };
-
-        }
-
-        namespace toString {
-            const prototype: {
-            };
-
-        }
-
-        namespace upsert {
-            const prototype: {
-            };
-
-        }
-
     }
 
 }
@@ -2386,79 +1165,6 @@ export namespace Item {
         function toJSON(): any;
 
         function toObjectResolved(scope: any, overrides: any, options: any): any;
-
-        namespace authorizeRequestUsing {
-            const prototype: {
-            };
-
-        }
-
-        namespace describe {
-            const prototype: {
-            };
-
-        }
-
-        namespace findInParents {
-            const prototype: {
-            };
-
-        }
-
-        namespace findParentContaining {
-            const prototype: {
-            };
-
-        }
-
-        namespace forEachParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace getAuth {
-            const prototype: {
-            };
-
-        }
-
-        namespace getEvents {
-            const prototype: {
-            };
-
-        }
-
-        namespace meta {
-            const prototype: {
-            };
-
-        }
-
-        namespace parent {
-            const prototype: {
-            };
-
-        }
-
-        namespace setParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace toJSON {
-            const prototype: {
-            };
-
-        }
-
-        namespace toObjectResolved {
-            const prototype: {
-            };
-
-        }
-
     }
 
 }
@@ -2497,84 +1203,6 @@ export namespace ItemGroup {
 
         function toObjectResolved(scope: any, overrides: any, options: any): any;
 
-        namespace authorizeRequestsUsing {
-            const prototype: {
-            };
-
-        }
-
-        namespace describe {
-            const prototype: {
-            };
-
-        }
-
-        namespace findInParents {
-            const prototype: {
-            };
-
-        }
-
-        namespace findParentContaining {
-            const prototype: {
-            };
-
-        }
-
-        namespace forEachItem {
-            const prototype: {
-            };
-
-        }
-
-        namespace forEachItemGroup {
-            const prototype: {
-            };
-
-        }
-
-        namespace forEachParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace meta {
-            const prototype: {
-            };
-
-        }
-
-        namespace oneDeep {
-            const prototype: {
-            };
-
-        }
-
-        namespace parent {
-            const prototype: {
-            };
-
-        }
-
-        namespace setParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace toJSON {
-            const prototype: {
-            };
-
-        }
-
-        namespace toObjectResolved {
-            const prototype: {
-            };
-
-        }
-
     }
 
 }
@@ -2599,60 +1227,6 @@ export namespace Property {
 
         function toObjectResolved(scope: any, overrides: any, options: any): any;
 
-        namespace describe {
-            const prototype: {
-            };
-
-        }
-
-        namespace findInParents {
-            const prototype: {
-            };
-
-        }
-
-        namespace findParentContaining {
-            const prototype: {
-            };
-
-        }
-
-        namespace forEachParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace meta {
-            const prototype: {
-            };
-
-        }
-
-        namespace parent {
-            const prototype: {
-            };
-
-        }
-
-        namespace setParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace toJSON {
-            const prototype: {
-            };
-
-        }
-
-        namespace toObjectResolved {
-            const prototype: {
-            };
-
-        }
-
     }
 
     namespace replaceSubstitutions {
@@ -2696,57 +1270,7 @@ export namespace PropertyBase {
         function setParent(parent: any): void;
 
         function toJSON(): any;
-
-        namespace findInParents {
-            const prototype: {
-            };
-
-        }
-
-        namespace findParentContaining {
-            const prototype: {
-            };
-
-        }
-
-        namespace forEachParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace meta {
-            const prototype: {
-            };
-
-        }
-
-        namespace parent {
-            const prototype: {
-            };
-
-        }
-
-        namespace setParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace toJSON {
-            const prototype: {
-            };
-
-        }
-
     }
-
-    namespace toJSON {
-        const prototype: {
-        };
-
-    }
-
 }
 
 export namespace PropertyList {
@@ -2820,201 +1344,7 @@ export namespace PropertyList {
         function toString(): any;
 
         function upsert(item: any): any;
-
-        namespace add {
-            const prototype: {
-            };
-
-        }
-
-        namespace all {
-            const prototype: {
-            };
-
-        }
-
-        namespace append {
-            const prototype: {
-            };
-
-        }
-
-        namespace assimilate {
-            const prototype: {
-            };
-
-        }
-
-        namespace clear {
-            const prototype: {
-            };
-
-        }
-
-        namespace count {
-            const prototype: {
-            };
-
-        }
-
-        namespace each {
-            const prototype: {
-            };
-
-        }
-
-        namespace eachParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace filter {
-            const prototype: {
-            };
-
-        }
-
-        namespace find {
-            const prototype: {
-            };
-
-        }
-
-        namespace findInParents {
-            const prototype: {
-            };
-
-        }
-
-        namespace findParentContaining {
-            const prototype: {
-            };
-
-        }
-
-        namespace forEachParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace get {
-            const prototype: {
-            };
-
-        }
-
-        namespace has {
-            const prototype: {
-            };
-
-        }
-
-        namespace idx {
-            const prototype: {
-            };
-
-        }
-
-        namespace indexOf {
-            const prototype: {
-            };
-
-        }
-
-        namespace insert {
-            const prototype: {
-            };
-
-        }
-
-        namespace insertAfter {
-            const prototype: {
-            };
-
-        }
-
-        namespace map {
-            const prototype: {
-            };
-
-        }
-
-        namespace meta {
-            const prototype: {
-            };
-
-        }
-
-        namespace one {
-            const prototype: {
-            };
-
-        }
-
-        namespace parent {
-            const prototype: {
-            };
-
-        }
-
-        namespace populate {
-            const prototype: {
-            };
-
-        }
-
-        namespace prepend {
-            const prototype: {
-            };
-
-        }
-
-        namespace remove {
-            const prototype: {
-            };
-
-        }
-
-        namespace repopulate {
-            const prototype: {
-            };
-
-        }
-
-        namespace setParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace toJSON {
-            const prototype: {
-            };
-
-        }
-
-        namespace toObject {
-            const prototype: {
-            };
-
-        }
-
-        namespace toString {
-            const prototype: {
-            };
-
-        }
-
-        namespace upsert {
-            const prototype: {
-            };
-
-        }
-
     }
-
 }
 
 export namespace ProxyConfig {
@@ -3052,93 +1382,7 @@ export namespace ProxyConfig {
         function update(options: any): void;
 
         function updateProtocols(protocols: any): void;
-
-        namespace describe {
-            const prototype: {
-            };
-
-        }
-
-        namespace findInParents {
-            const prototype: {
-            };
-
-        }
-
-        namespace findParentContaining {
-            const prototype: {
-            };
-
-        }
-
-        namespace forEachParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace getProtocols {
-            const prototype: {
-            };
-
-        }
-
-        namespace getProxyUrl {
-            const prototype: {
-            };
-
-        }
-
-        namespace meta {
-            const prototype: {
-            };
-
-        }
-
-        namespace parent {
-            const prototype: {
-            };
-
-        }
-
-        namespace setParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace test {
-            const prototype: {
-            };
-
-        }
-
-        namespace toJSON {
-            const prototype: {
-            };
-
-        }
-
-        namespace toObjectResolved {
-            const prototype: {
-            };
-
-        }
-
-        namespace update {
-            const prototype: {
-            };
-
-        }
-
-        namespace updateProtocols {
-            const prototype: {
-            };
-
-        }
-
     }
-
 }
 
 export namespace ProxyConfigList {
@@ -3214,207 +1458,7 @@ export namespace ProxyConfigList {
         function toString(): any;
 
         function upsert(item: any): any;
-
-        namespace add {
-            const prototype: {
-            };
-
-        }
-
-        namespace all {
-            const prototype: {
-            };
-
-        }
-
-        namespace append {
-            const prototype: {
-            };
-
-        }
-
-        namespace assimilate {
-            const prototype: {
-            };
-
-        }
-
-        namespace clear {
-            const prototype: {
-            };
-
-        }
-
-        namespace count {
-            const prototype: {
-            };
-
-        }
-
-        namespace each {
-            const prototype: {
-            };
-
-        }
-
-        namespace eachParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace filter {
-            const prototype: {
-            };
-
-        }
-
-        namespace find {
-            const prototype: {
-            };
-
-        }
-
-        namespace findInParents {
-            const prototype: {
-            };
-
-        }
-
-        namespace findParentContaining {
-            const prototype: {
-            };
-
-        }
-
-        namespace forEachParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace get {
-            const prototype: {
-            };
-
-        }
-
-        namespace has {
-            const prototype: {
-            };
-
-        }
-
-        namespace idx {
-            const prototype: {
-            };
-
-        }
-
-        namespace indexOf {
-            const prototype: {
-            };
-
-        }
-
-        namespace insert {
-            const prototype: {
-            };
-
-        }
-
-        namespace insertAfter {
-            const prototype: {
-            };
-
-        }
-
-        namespace map {
-            const prototype: {
-            };
-
-        }
-
-        namespace meta {
-            const prototype: {
-            };
-
-        }
-
-        namespace one {
-            const prototype: {
-            };
-
-        }
-
-        namespace parent {
-            const prototype: {
-            };
-
-        }
-
-        namespace populate {
-            const prototype: {
-            };
-
-        }
-
-        namespace prepend {
-            const prototype: {
-            };
-
-        }
-
-        namespace remove {
-            const prototype: {
-            };
-
-        }
-
-        namespace repopulate {
-            const prototype: {
-            };
-
-        }
-
-        namespace resolve {
-            const prototype: {
-            };
-
-        }
-
-        namespace setParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace toJSON {
-            const prototype: {
-            };
-
-        }
-
-        namespace toObject {
-            const prototype: {
-            };
-
-        }
-
-        namespace toString {
-            const prototype: {
-            };
-
-        }
-
-        namespace upsert {
-            const prototype: {
-            };
-
-        }
-
     }
-
 }
 
 export namespace QueryParam {
@@ -3454,79 +1498,6 @@ export namespace QueryParam {
         function update(param: any): void;
 
         function valueOf(): any;
-
-        namespace describe {
-            const prototype: {
-            };
-
-        }
-
-        namespace findInParents {
-            const prototype: {
-            };
-
-        }
-
-        namespace findParentContaining {
-            const prototype: {
-            };
-
-        }
-
-        namespace forEachParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace meta {
-            const prototype: {
-            };
-
-        }
-
-        namespace parent {
-            const prototype: {
-            };
-
-        }
-
-        namespace setParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace toJSON {
-            const prototype: {
-            };
-
-        }
-
-        namespace toObjectResolved {
-            const prototype: {
-            };
-
-        }
-
-        namespace toString {
-            const prototype: {
-            };
-
-        }
-
-        namespace update {
-            const prototype: {
-            };
-
-        }
-
-        namespace valueOf {
-            const prototype: {
-            };
-
-        }
-
     }
 
     namespace unparse {
@@ -3540,7 +1511,6 @@ export namespace QueryParam {
         };
 
     }
-
 }
 
 export namespace Request {
@@ -3590,129 +1560,7 @@ export namespace Request {
         function update(options: any): void;
 
         function upsertHeader(header: any): any;
-
-        namespace addHeader {
-            const prototype: {
-            };
-
-        }
-
-        namespace addQueryParams {
-            const prototype: {
-            };
-
-        }
-
-        namespace authorize {
-            const prototype: {
-            };
-
-        }
-
-        namespace authorizeUsing {
-            const prototype: {
-            };
-
-        }
-
-        namespace clone {
-            const prototype: {
-            };
-
-        }
-
-        namespace describe {
-            const prototype: {
-            };
-
-        }
-
-        namespace findInParents {
-            const prototype: {
-            };
-
-        }
-
-        namespace findParentContaining {
-            const prototype: {
-            };
-
-        }
-
-        namespace forEachHeader {
-            const prototype: {
-            };
-
-        }
-
-        namespace forEachParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace getHeaders {
-            const prototype: {
-            };
-
-        }
-
-        namespace meta {
-            const prototype: {
-            };
-
-        }
-
-        namespace parent {
-            const prototype: {
-            };
-
-        }
-
-        namespace removeHeader {
-            const prototype: {
-            };
-
-        }
-
-        namespace removeQueryParams {
-            const prototype: {
-            };
-
-        }
-
-        namespace setParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace toJSON {
-            const prototype: {
-            };
-
-        }
-
-        namespace toObjectResolved {
-            const prototype: {
-            };
-
-        }
-
-        namespace update {
-            const prototype: {
-            };
-
-        }
-
-        namespace upsertHeader {
-            const prototype: {
-            };
-
-        }
-
     }
-
 }
 
 export namespace RequestAuth {
@@ -3750,93 +1598,7 @@ export namespace RequestAuth {
         function update(options: any, type: any): void;
 
         function use(type: any, options: any): void;
-
-        namespace clear {
-            const prototype: {
-            };
-
-        }
-
-        namespace current {
-            const prototype: {
-            };
-
-        }
-
-        namespace describe {
-            const prototype: {
-            };
-
-        }
-
-        namespace findInParents {
-            const prototype: {
-            };
-
-        }
-
-        namespace findParentContaining {
-            const prototype: {
-            };
-
-        }
-
-        namespace forEachParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace meta {
-            const prototype: {
-            };
-
-        }
-
-        namespace parameters {
-            const prototype: {
-            };
-
-        }
-
-        namespace parent {
-            const prototype: {
-            };
-
-        }
-
-        namespace setParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace toJSON {
-            const prototype: {
-            };
-
-        }
-
-        namespace toObjectResolved {
-            const prototype: {
-            };
-
-        }
-
-        namespace update {
-            const prototype: {
-            };
-
-        }
-
-        namespace use {
-            const prototype: {
-            };
-
-        }
-
     }
-
 }
 
 export namespace RequestBody {
@@ -3860,69 +1622,7 @@ export namespace RequestBody {
         function toString(): any;
 
         function update(options: any): void;
-
-        namespace findInParents {
-            const prototype: {
-            };
-
-        }
-
-        namespace findParentContaining {
-            const prototype: {
-            };
-
-        }
-
-        namespace forEachParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace isEmpty {
-            const prototype: {
-            };
-
-        }
-
-        namespace meta {
-            const prototype: {
-            };
-
-        }
-
-        namespace parent {
-            const prototype: {
-            };
-
-        }
-
-        namespace setParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace toJSON {
-            const prototype: {
-            };
-
-        }
-
-        namespace toString {
-            const prototype: {
-            };
-
-        }
-
-        namespace update {
-            const prototype: {
-            };
-
-        }
-
     }
-
 }
 
 export namespace Response {
@@ -3980,117 +1680,7 @@ export namespace Response {
         function toObjectResolved(scope: any, overrides: any, options: any): any;
 
         function update(options: any): void;
-
-        namespace dataURI {
-            const prototype: {
-            };
-
-        }
-
-        namespace describe {
-            const prototype: {
-            };
-
-        }
-
-        namespace details {
-            const prototype: {
-            };
-
-        }
-
-        namespace encoding {
-            const prototype: {
-            };
-
-        }
-
-        namespace findInParents {
-            const prototype: {
-            };
-
-        }
-
-        namespace findParentContaining {
-            const prototype: {
-            };
-
-        }
-
-        namespace forEachParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace json {
-            const prototype: {
-            };
-
-        }
-
-        namespace meta {
-            const prototype: {
-            };
-
-        }
-
-        namespace mime {
-            const prototype: {
-            };
-
-        }
-
-        namespace parent {
-            const prototype: {
-            };
-
-        }
-
-        namespace reason {
-            const prototype: {
-            };
-
-        }
-
-        namespace setParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace size {
-            const prototype: {
-            };
-
-        }
-
-        namespace text {
-            const prototype: {
-            };
-
-        }
-
-        namespace toJSON {
-            const prototype: {
-            };
-
-        }
-
-        namespace toObjectResolved {
-            const prototype: {
-            };
-
-        }
-
-        namespace update {
-            const prototype: {
-            };
-
-        }
-
     }
-
 }
 
 export namespace Script {
@@ -4122,75 +1712,7 @@ export namespace Script {
         function toSource(): any;
 
         function update(options: any): void;
-
-        namespace describe {
-            const prototype: {
-            };
-
-        }
-
-        namespace findInParents {
-            const prototype: {
-            };
-
-        }
-
-        namespace findParentContaining {
-            const prototype: {
-            };
-
-        }
-
-        namespace forEachParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace meta {
-            const prototype: {
-            };
-
-        }
-
-        namespace parent {
-            const prototype: {
-            };
-
-        }
-
-        namespace setParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace toJSON {
-            const prototype: {
-            };
-
-        }
-
-        namespace toObjectResolved {
-            const prototype: {
-            };
-
-        }
-
-        namespace toSource {
-            const prototype: {
-            };
-
-        }
-
-        namespace update {
-            const prototype: {
-            };
-
-        }
-
     }
-
 }
 
 export namespace Url {
@@ -4242,117 +1764,7 @@ export namespace Url {
         function toString(forceProtocol: any): any;
 
         function update(url: any): any;
-
-        namespace addQueryParams {
-            const prototype: {
-            };
-
-        }
-
-        namespace findInParents {
-            const prototype: {
-            };
-
-        }
-
-        namespace findParentContaining {
-            const prototype: {
-            };
-
-        }
-
-        namespace forEachParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace getHost {
-            const prototype: {
-            };
-
-        }
-
-        namespace getOAuth1BaseUrl {
-            const prototype: {
-            };
-
-        }
-
-        namespace getPath {
-            const prototype: {
-            };
-
-        }
-
-        namespace getPathWithQuery {
-            const prototype: {
-            };
-
-        }
-
-        namespace getQueryString {
-            const prototype: {
-            };
-
-        }
-
-        namespace getRaw {
-            const prototype: {
-            };
-
-        }
-
-        namespace getRemote {
-            const prototype: {
-            };
-
-        }
-
-        namespace meta {
-            const prototype: {
-            };
-
-        }
-
-        namespace parent {
-            const prototype: {
-            };
-
-        }
-
-        namespace removeQueryParams {
-            const prototype: {
-            };
-
-        }
-
-        namespace setParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace toJSON {
-            const prototype: {
-            };
-
-        }
-
-        namespace toString {
-            const prototype: {
-            };
-
-        }
-
-        namespace update {
-            const prototype: {
-            };
-
-        }
-
     }
-
 }
 
 export namespace UrlMatchPattern {
@@ -4398,135 +1810,7 @@ export namespace UrlMatchPattern {
         function toString(): any;
 
         function update(options: any): void;
-
-        namespace createMatchPattern {
-            const prototype: {
-            };
-
-        }
-
-        namespace describe {
-            const prototype: {
-            };
-
-        }
-
-        namespace findInParents {
-            const prototype: {
-            };
-
-        }
-
-        namespace findParentContaining {
-            const prototype: {
-            };
-
-        }
-
-        namespace forEachParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace getProtocols {
-            const prototype: {
-            };
-
-        }
-
-        namespace globPatternToRegexp {
-            const prototype: {
-            };
-
-        }
-
-        namespace matchAbsoluteHostPattern {
-            const prototype: {
-            };
-
-        }
-
-        namespace matchAnyHost {
-            const prototype: {
-            };
-
-        }
-
-        namespace matchSuffixHostPattern {
-            const prototype: {
-            };
-
-        }
-
-        namespace meta {
-            const prototype: {
-            };
-
-        }
-
-        namespace parent {
-            const prototype: {
-            };
-
-        }
-
-        namespace setParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace test {
-            const prototype: {
-            };
-
-        }
-
-        namespace testHost {
-            const prototype: {
-            };
-
-        }
-
-        namespace testPath {
-            const prototype: {
-            };
-
-        }
-
-        namespace testProtocol {
-            const prototype: {
-            };
-
-        }
-
-        namespace toJSON {
-            const prototype: {
-            };
-
-        }
-
-        namespace toObjectResolved {
-            const prototype: {
-            };
-
-        }
-
-        namespace toString {
-            const prototype: {
-            };
-
-        }
-
-        namespace update {
-            const prototype: {
-            };
-
-        }
-
     }
-
 }
 
 export namespace UrlMatchPatternList {
@@ -4596,207 +1880,7 @@ export namespace UrlMatchPatternList {
         function toString(): any;
 
         function upsert(item: any): any;
-
-        namespace add {
-            const prototype: {
-            };
-
-        }
-
-        namespace all {
-            const prototype: {
-            };
-
-        }
-
-        namespace append {
-            const prototype: {
-            };
-
-        }
-
-        namespace assimilate {
-            const prototype: {
-            };
-
-        }
-
-        namespace clear {
-            const prototype: {
-            };
-
-        }
-
-        namespace count {
-            const prototype: {
-            };
-
-        }
-
-        namespace each {
-            const prototype: {
-            };
-
-        }
-
-        namespace eachParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace filter {
-            const prototype: {
-            };
-
-        }
-
-        namespace find {
-            const prototype: {
-            };
-
-        }
-
-        namespace findInParents {
-            const prototype: {
-            };
-
-        }
-
-        namespace findParentContaining {
-            const prototype: {
-            };
-
-        }
-
-        namespace forEachParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace get {
-            const prototype: {
-            };
-
-        }
-
-        namespace has {
-            const prototype: {
-            };
-
-        }
-
-        namespace idx {
-            const prototype: {
-            };
-
-        }
-
-        namespace indexOf {
-            const prototype: {
-            };
-
-        }
-
-        namespace insert {
-            const prototype: {
-            };
-
-        }
-
-        namespace insertAfter {
-            const prototype: {
-            };
-
-        }
-
-        namespace map {
-            const prototype: {
-            };
-
-        }
-
-        namespace meta {
-            const prototype: {
-            };
-
-        }
-
-        namespace one {
-            const prototype: {
-            };
-
-        }
-
-        namespace parent {
-            const prototype: {
-            };
-
-        }
-
-        namespace populate {
-            const prototype: {
-            };
-
-        }
-
-        namespace prepend {
-            const prototype: {
-            };
-
-        }
-
-        namespace remove {
-            const prototype: {
-            };
-
-        }
-
-        namespace repopulate {
-            const prototype: {
-            };
-
-        }
-
-        namespace setParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace test {
-            const prototype: {
-            };
-
-        }
-
-        namespace toJSON {
-            const prototype: {
-            };
-
-        }
-
-        namespace toObject {
-            const prototype: {
-            };
-
-        }
-
-        namespace toString {
-            const prototype: {
-            };
-
-        }
-
-        namespace upsert {
-            const prototype: {
-            };
-
-        }
-
     }
-
 }
 
 export namespace Variable {
@@ -4843,114 +1927,6 @@ export namespace Variable {
 
         function valueType(typeName: any, _noCast: any): any;
 
-        namespace cast {
-            const prototype: {
-            };
-
-        }
-
-        namespace castIn {
-            const prototype: {
-            };
-
-        }
-
-        namespace castOut {
-            const prototype: {
-            };
-
-        }
-
-        namespace describe {
-            const prototype: {
-            };
-
-        }
-
-        namespace findInParents {
-            const prototype: {
-            };
-
-        }
-
-        namespace findParentContaining {
-            const prototype: {
-            };
-
-        }
-
-        namespace forEachParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace get {
-            const prototype: {
-            };
-
-        }
-
-        namespace meta {
-            const prototype: {
-            };
-
-        }
-
-        namespace parent {
-            const prototype: {
-            };
-
-        }
-
-        namespace set {
-            const prototype: {
-            };
-
-        }
-
-        namespace setParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace toJSON {
-            const prototype: {
-            };
-
-        }
-
-        namespace toObjectResolved {
-            const prototype: {
-            };
-
-        }
-
-        namespace toString {
-            const prototype: {
-            };
-
-        }
-
-        namespace update {
-            const prototype: {
-            };
-
-        }
-
-        namespace valueOf {
-            const prototype: {
-            };
-
-        }
-
-        namespace valueType {
-            const prototype: {
-            };
-
-        }
-
     }
 
     namespace types {
@@ -5166,169 +2142,6 @@ export namespace Variable {
             }
 
         }
-
-        namespace number {
-            namespace prototype {
-                // Too-deep object hierarchy from postman_collection.Variable.types.number.prototype
-                const toExponential: any;
-
-                // Too-deep object hierarchy from postman_collection.Variable.types.number.prototype
-                const toFixed: any;
-
-                // Too-deep object hierarchy from postman_collection.Variable.types.number.prototype
-                const toLocaleString: any;
-
-                // Too-deep object hierarchy from postman_collection.Variable.types.number.prototype
-                const toPrecision: any;
-
-                // Too-deep object hierarchy from postman_collection.Variable.types.number.prototype
-                const toString: any;
-
-                // Too-deep object hierarchy from postman_collection.Variable.types.number.prototype
-                const valueOf: any;
-
-            }
-
-        }
-
-        namespace string {
-            namespace prototype {
-                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
-                const anchor: any;
-
-                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
-                const big: any;
-
-                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
-                const blink: any;
-
-                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
-                const bold: any;
-
-                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
-                const charAt: any;
-
-                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
-                const charCodeAt: any;
-
-                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
-                const codePointAt: any;
-
-                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
-                const concat: any;
-
-                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
-                const endsWith: any;
-
-                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
-                const fixed: any;
-
-                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
-                const fontcolor: any;
-
-                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
-                const fontsize: any;
-
-                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
-                const includes: any;
-
-                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
-                const indexOf: any;
-
-                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
-                const italics: any;
-
-                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
-                const lastIndexOf: any;
-
-                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
-                const length: any;
-
-                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
-                const link: any;
-
-                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
-                const localeCompare: any;
-
-                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
-                const match: any;
-
-                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
-                const normalize: any;
-
-                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
-                const padEnd: any;
-
-                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
-                const padStart: any;
-
-                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
-                const repeat: any;
-
-                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
-                const replace: any;
-
-                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
-                const search: any;
-
-                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
-                const slice: any;
-
-                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
-                const small: any;
-
-                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
-                const split: any;
-
-                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
-                const startsWith: any;
-
-                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
-                const strike: any;
-
-                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
-                const sub: any;
-
-                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
-                const substr: any;
-
-                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
-                const substring: any;
-
-                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
-                const sup: any;
-
-                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
-                const toLocaleLowerCase: any;
-
-                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
-                const toLocaleUpperCase: any;
-
-                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
-                const toLowerCase: any;
-
-                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
-                const toString: any;
-
-                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
-                const toUpperCase: any;
-
-                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
-                const trim: any;
-
-                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
-                const trimLeft: any;
-
-                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
-                const trimRight: any;
-
-                // Too-deep object hierarchy from postman_collection.Variable.types.string.prototype
-                const valueOf: any;
-
-            }
-
-        }
-
     }
 
 }
@@ -5412,223 +2225,6 @@ export namespace VariableList {
         function toString(): any;
 
         function upsert(item: any): any;
-
-        namespace add {
-            const prototype: {
-            };
-
-        }
-
-        namespace all {
-            const prototype: {
-            };
-
-        }
-
-        namespace append {
-            const prototype: {
-            };
-
-        }
-
-        namespace assimilate {
-            const prototype: {
-            };
-
-        }
-
-        namespace clear {
-            const prototype: {
-            };
-
-        }
-
-        namespace count {
-            const prototype: {
-            };
-
-        }
-
-        namespace each {
-            const prototype: {
-            };
-
-        }
-
-        namespace eachParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace filter {
-            const prototype: {
-            };
-
-        }
-
-        namespace find {
-            const prototype: {
-            };
-
-        }
-
-        namespace findInParents {
-            const prototype: {
-            };
-
-        }
-
-        namespace findParentContaining {
-            const prototype: {
-            };
-
-        }
-
-        namespace forEachParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace get {
-            const prototype: {
-            };
-
-        }
-
-        namespace has {
-            const prototype: {
-            };
-
-        }
-
-        namespace idx {
-            const prototype: {
-            };
-
-        }
-
-        namespace indexOf {
-            const prototype: {
-            };
-
-        }
-
-        namespace insert {
-            const prototype: {
-            };
-
-        }
-
-        namespace insertAfter {
-            const prototype: {
-            };
-
-        }
-
-        namespace map {
-            const prototype: {
-            };
-
-        }
-
-        namespace meta {
-            const prototype: {
-            };
-
-        }
-
-        namespace one {
-            const prototype: {
-            };
-
-        }
-
-        namespace parent {
-            const prototype: {
-            };
-
-        }
-
-        namespace populate {
-            const prototype: {
-            };
-
-        }
-
-        namespace prepend {
-            const prototype: {
-            };
-
-        }
-
-        namespace remove {
-            const prototype: {
-            };
-
-        }
-
-        namespace replace {
-            const prototype: {
-            };
-
-        }
-
-        namespace repopulate {
-            const prototype: {
-            };
-
-        }
-
-        namespace setParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace substitute {
-            const prototype: {
-            };
-
-        }
-
-        namespace syncFromObject {
-            const prototype: {
-            };
-
-        }
-
-        namespace syncToObject {
-            const prototype: {
-            };
-
-        }
-
-        namespace toJSON {
-            const prototype: {
-            };
-
-        }
-
-        namespace toObject {
-            const prototype: {
-            };
-
-        }
-
-        namespace toString {
-            const prototype: {
-            };
-
-        }
-
-        namespace upsert {
-            const prototype: {
-            };
-
-        }
-
     }
 
 }
@@ -5678,123 +2274,7 @@ export namespace VariableScope {
         function unset(key: any): void;
 
         function variables(): any;
-
-        namespace addLayer {
-            const prototype: {
-            };
-
-        }
-
-        namespace clear {
-            const prototype: {
-            };
-
-        }
-
-        namespace describe {
-            const prototype: {
-            };
-
-        }
-
-        namespace findInParents {
-            const prototype: {
-            };
-
-        }
-
-        namespace findParentContaining {
-            const prototype: {
-            };
-
-        }
-
-        namespace forEachParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace get {
-            const prototype: {
-            };
-
-        }
-
-        namespace has {
-            const prototype: {
-            };
-
-        }
-
-        namespace meta {
-            const prototype: {
-            };
-
-        }
-
-        namespace parent {
-            const prototype: {
-            };
-
-        }
-
-        namespace set {
-            const prototype: {
-            };
-
-        }
-
-        namespace setParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace syncVariablesFrom {
-            const prototype: {
-            };
-
-        }
-
-        namespace syncVariablesTo {
-            const prototype: {
-            };
-
-        }
-
-        namespace toJSON {
-            const prototype: {
-            };
-
-        }
-
-        namespace toObject {
-            const prototype: {
-            };
-
-        }
-
-        namespace toObjectResolved {
-            const prototype: {
-            };
-
-        }
-
-        namespace unset {
-            const prototype: {
-            };
-
-        }
-
-        namespace variables {
-            const prototype: {
-            };
-
-        }
-
     }
-
 }
 
 export namespace Version {
@@ -5816,62 +2296,6 @@ export namespace Version {
         function toJSON(): any;
 
         function toString(): any;
-
-        namespace findInParents {
-            const prototype: {
-            };
-
-        }
-
-        namespace findParentContaining {
-            const prototype: {
-            };
-
-        }
-
-        namespace forEachParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace meta {
-            const prototype: {
-            };
-
-        }
-
-        namespace parent {
-            const prototype: {
-            };
-
-        }
-
-        namespace set {
-            const prototype: {
-            };
-
-        }
-
-        namespace setParent {
-            const prototype: {
-            };
-
-        }
-
-        namespace toJSON {
-            const prototype: {
-            };
-
-        }
-
-        namespace toString {
-            const prototype: {
-            };
-
-        }
-
     }
-
 }
 

From 34002556c3233549790606bf3c7ddc1dd4f21e76 Mon Sep 17 00:00:00 2001
From: samuelneff <github@serndesign.com>
Date: Fri, 16 Feb 2018 05:47:37 +0000
Subject: [PATCH 0052/1382] Update muicss element inheritance and remove
 duplicate inherited properties

---
 types/muicss-react/index.d.ts | 44 +++++++++--------------------------
 1 file changed, 11 insertions(+), 33 deletions(-)

diff --git a/types/muicss-react/index.d.ts b/types/muicss-react/index.d.ts
index 65982f21af..c14d88685c 100644
--- a/types/muicss-react/index.d.ts
+++ b/types/muicss-react/index.d.ts
@@ -137,29 +137,19 @@ declare namespace Muicss {
     export class Tabs extends React.Component<TabsProps> {}
     export class Textarea extends React.Component<TextareaProps> {}
 
-    export interface ButtonProps extends React.DetailedHTMLFactory<React.ButtonHTMLAttributes<HTMLButtonElement>, HTMLButtonElement> {
-        color?: string;
+    export interface ButtonProps extends React.ButtonHTMLAttributes<HTMLButtonElement> {
         size?: string;
         variant?: string;
-        onMouseDown?: React.MouseEventHandler<{}>;
-        onMouseUp?: React.MouseEventHandler<{}>;
-        onMouseLeave?: React.MouseEventHandler<{}>;
-        onTouchStart?: React.MouseEventHandler<{}>;
-        onTouchEnd?: React.MouseEventHandler<{}>;
     }
 
-    export interface CheckboxProps extends React.DetailedHTMLFactory<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement> {
+    export interface CheckboxProps extends React.HTMLAttributes<HTMLDivElement> {
         label?: React.ReactNode;
         autoFocus?: boolean;
         checked?: boolean;
-        defaultChecked?: boolean;
-        defaultValue?: string | string[];
         disabled?: boolean;
         form?: string;
-        name?: string;
         required?: boolean;
         value?: string | string[] | number;
-        onChange?: React.ChangeEventHandler<HTMLInputElement>;
     }
 
     export interface ColProps extends DivProps {
@@ -179,22 +169,17 @@ declare namespace Muicss {
         fluid?: boolean;
     }
 
-    export interface DivProps extends React.DetailedHTMLFactory<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement> {}
+    export interface DivProps extends React.HTMLAttributes<HTMLDivElement> {}
     export interface DividerProps extends DivProps {}
 
-    export interface DropdownItemProps extends React.DetailedHTMLFactory<React.LiHTMLAttributes<HTMLLIElement>, HTMLLIElement> {
+    export interface DropdownItemProps extends React.LiHTMLAttributes<HTMLLIElement> {
         link?: string;
         target?: string;
-        value?: any;
     }
 
-    export interface DropdownProps extends React.DetailedHTMLFactory<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement> {
-        onSelect?: React.MouseEventHandler<HTMLDivElement>; // proxy of menu item's onClick
-        onClick?: React.MouseEventHandler<HTMLDivElement>; // click the button to show dropdown
+    export interface DropdownProps extends React.HTMLAttributes<HTMLDivElement> {
         onOutsideClick?: React.MouseEventHandler<HTMLDivElement>;
-        onKeyDown?: React.KeyboardEventHandler<HTMLDivElement>;
 
-        color?: string;
         variant?: string;
         size?: string;
         label?: React.ReactNode;
@@ -202,22 +187,20 @@ declare namespace Muicss {
         disabled?: boolean;
     }
 
-    export interface FormProps extends React.DetailedHTMLFactory<React.FormHTMLAttributes<HTMLFormElement>, HTMLFormElement> {
+    export interface FormProps extends React.FormHTMLAttributes<HTMLFormElement> {
         inline?: boolean;
     }
 
-    export interface InputProps extends React.DetailedHTMLFactory<React.InputHTMLAttributes<HTMLInputElement>, HTMLInputElement> {
+    export interface InputProps extends React.InputHTMLAttributes<HTMLInputElement> {
         inputRef?: React.Ref<HTMLInputElement>;
         onLabelClick?: React.MouseEventHandler<HTMLInputElement>;
-        hint?: string; // placeholder
+        hint?: string;
         invalid?: boolean;
         label?: React.ReactNode;
         floatingLabel?: boolean;
     }
 
-    export interface OptionProps extends React.DetailedHTMLFactory<React.OptionHTMLAttributes<HTMLOptionElement>, HTMLOptionElement> {
-        label?: string;
-        value?: string | string[] | number;
+    export interface OptionProps extends React.OptionHTMLAttributes<HTMLOptionElement> {
     }
 
     export interface PanelProps extends DivProps {}
@@ -232,12 +215,8 @@ declare namespace Muicss {
 
     export interface SelectProps extends DivProps {
         label?: React.ReactNode;
-        name?: string;
         readOnly?: boolean;
         useDefault?: boolean;
-        onChange?: React.ChangeEventHandler<HTMLDivElement>;
-        onClick?: React.MouseEventHandler<HTMLDivElement>;
-        onKeyDown?: React.KeyboardEventHandler<HTMLDivElement>;
     }
 
     export interface TabProps {
@@ -250,13 +229,12 @@ declare namespace Muicss {
         defaultSelectedIndex?: number;
         selectedIndex?: number;
         justified?: boolean;
-        onChange?: (index: number, value: any, tab: Tab, event: Event) => void;
     }
 
-    export interface TextareaProps extends React.DetailedHTMLFactory<React.TextareaHTMLAttributes<HTMLTextAreaElement>, HTMLTextAreaElement> {
+    export interface TextareaProps extends React.TextareaHTMLAttributes<HTMLTextAreaElement> {
         inputRef?: React.Ref<HTMLTextAreaElement>;
         onLabelClick?: React.MouseEventHandler<HTMLInputElement>;
-        hint?: string; // placeholder
+        hint?: string;
         invalid?: boolean;
         label?: React.ReactNode;
         floatingLabel?: boolean;

From d8ab589ee995cc866fb9be0b868f3461db51da57 Mon Sep 17 00:00:00 2001
From: samuelneff <github@serndesign.com>
Date: Fri, 16 Feb 2018 05:53:15 +0000
Subject: [PATCH 0053/1382] Remove comment from tslint.json

---
 types/muicss-react/tslint.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/types/muicss-react/tslint.json b/types/muicss-react/tslint.json
index b8cee022bf..fb9b1973fc 100644
--- a/types/muicss-react/tslint.json
+++ b/types/muicss-react/tslint.json
@@ -1,7 +1,6 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        // TODOs
         "ban-types": false,
         "dt-header": false,
         "no-any-union": false,
@@ -14,4 +13,4 @@
         "strict-export-declare-modifiers": false,
         "use-default-type-parameter": false
     }
-}
\ No newline at end of file
+}

From 7c4b2317587e6443abf0782f303e669968c00c57 Mon Sep 17 00:00:00 2001
From: samuelneff <github@serndesign.com>
Date: Fri, 16 Feb 2018 05:59:18 +0000
Subject: [PATCH 0054/1382] Update muicss namespace to clarify it is for the
 react bindings

---
 types/muicss-react/index.d.ts | 74 +++++++++++++++++------------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/types/muicss-react/index.d.ts b/types/muicss-react/index.d.ts
index c14d88685c..5baeb17198 100644
--- a/types/muicss-react/index.d.ts
+++ b/types/muicss-react/index.d.ts
@@ -7,117 +7,117 @@
 /// <reference types="react" />
 
 declare module "muicss/react" {
-    export import Appbar = Muicss.Appbar;
-    export import Button = Muicss.Button;
-    export import Checkbox = Muicss.Checkbox;
-    export import Col = Muicss.Col;
-    export import Container = Muicss.Container;
-    export import Divider = Muicss.Divider;
-    export import Dropdown = Muicss.Dropdown;
-    export import DropdownItem = Muicss.DropdownItem;
-    export import Form = Muicss.Form;
-    export import Input = Muicss.Input;
-    export import Option = Muicss.Option;
-    export import Panel = Muicss.Panel;
-    export import Radio = Muicss.Radio;
-    export import Row = Muicss.Row;
-    export import Select = Muicss.Select;
-    export import Tab = Muicss.Tab;
-    export import Tabs = Muicss.Tabs;
-    export import Textarea = Muicss.Textarea;
+    export import Appbar = MuicssReact.Appbar;
+    export import Button = MuicssReact.Button;
+    export import Checkbox = MuicssReact.Checkbox;
+    export import Col = MuicssReact.Col;
+    export import Container = MuicssReact.Container;
+    export import Divider = MuicssReact.Divider;
+    export import Dropdown = MuicssReact.Dropdown;
+    export import DropdownItem = MuicssReact.DropdownItem;
+    export import Form = MuicssReact.Form;
+    export import Input = MuicssReact.Input;
+    export import Option = MuicssReact.Option;
+    export import Panel = MuicssReact.Panel;
+    export import Radio = MuicssReact.Radio;
+    export import Row = MuicssReact.Row;
+    export import Select = MuicssReact.Select;
+    export import Tab = MuicssReact.Tab;
+    export import Tabs = MuicssReact.Tabs;
+    export import Textarea = MuicssReact.Textarea;
 }
 
 declare module 'muicss/lib/react/appbar' {
-    export import Appbar = Muicss.Appbar;
+    export import Appbar = MuicssReact.Appbar;
     export default Appbar;
 }
 
 declare module 'muicss/lib/react/button' {
-    export import Button = Muicss.Button;
+    export import Button = MuicssReact.Button;
     export default Button;
 }
 
 declare module 'muicss/lib/react/checkbox' {
-    export import Checkbox = Muicss.Checkbox;
+    export import Checkbox = MuicssReact.Checkbox;
     export default Checkbox;
 }
 
 declare module 'muicss/lib/react/col' {
-    export import Col = Muicss.Col;
+    export import Col = MuicssReact.Col;
     export default Col;
 }
 
 declare module 'muicss/lib/react/container' {
-    export import Container = Muicss.Container;
+    export import Container = MuicssReact.Container;
     export default Container;
 }
 
 declare module 'muicss/lib/react/divider' {
-    export import Divider = Muicss.Divider;
+    export import Divider = MuicssReact.Divider;
     export default Divider;
 }
 
 declare module 'muicss/lib/react/dropdown' {
-    export import Dropdown = Muicss.Dropdown;
+    export import Dropdown = MuicssReact.Dropdown;
     export default Dropdown;
 }
 
 declare module 'muicss/lib/react/dropdown-item' {
-    export import DropdownItem = Muicss.DropdownItem;
+    export import DropdownItem = MuicssReact.DropdownItem;
     export default DropdownItem;
 }
 
 declare module 'muicss/lib/react/form' {
-    export import Form = Muicss.Form;
+    export import Form = MuicssReact.Form;
     export default Form;
 }
 
 declare module 'muicss/lib/react/input' {
-    export import Input = Muicss.Input;
+    export import Input = MuicssReact.Input;
     export default Input;
 }
 
 declare module 'muicss/lib/react/option' {
-    export import Option = Muicss.Option;
+    export import Option = MuicssReact.Option;
     export default Option;
 }
 
 declare module 'muicss/lib/react/panel' {
-    export import Panel = Muicss.Panel;
+    export import Panel = MuicssReact.Panel;
     export default Panel;
 }
 
 declare module 'muicss/lib/react/radio' {
-    export import Radio = Muicss.Radio;
+    export import Radio = MuicssReact.Radio;
     export default Radio;
 }
 
 declare module 'muicss/lib/react/row' {
-    export import Row = Muicss.Row;
+    export import Row = MuicssReact.Row;
     export default Row;
 }
 
 declare module 'muicss/lib/react/select' {
-    export import Select = Muicss.Select;
+    export import Select = MuicssReact.Select;
     export default Select;
 }
 
 declare module 'muicss/lib/react/tab' {
-    export import Tab = Muicss.Tab;
+    export import Tab = MuicssReact.Tab;
     export default Tab;
 }
 
 declare module 'muicss/lib/react/tabs' {
-    export import Tabs = Muicss.Tabs;
+    export import Tabs = MuicssReact.Tabs;
     export default Tabs;
 }
 
 declare module 'muicss/lib/react/textarea' {
-    export import Textarea = Muicss.Textarea;
+    export import Textarea = MuicssReact.Textarea;
     export default Textarea;
 }
 
-declare namespace Muicss {
+declare namespace MuicssReact {
     export class Appbar extends React.Component<DivProps> {}
     export class Button extends React.Component<ButtonProps> {}
     export class Checkbox extends React.Component<CheckboxProps> {}

From 897313327cee8dd37b56bac798b5fff078055e1c Mon Sep 17 00:00:00 2001
From: samuelneff <github@serndesign.com>
Date: Fri, 16 Feb 2018 06:12:13 +0000
Subject: [PATCH 0055/1382] Move from muicss-react folder to muicss, minor
 update to Checkbox

---
 types/{muicss-react => muicss}/index.d.ts             | 1 +
 types/{muicss-react => muicss}/muicss-react-tests.tsx | 0
 types/{muicss-react => muicss}/tsconfig.json          | 6 +++---
 types/{muicss-react => muicss}/tslint.json            | 0
 4 files changed, 4 insertions(+), 3 deletions(-)
 rename types/{muicss-react => muicss}/index.d.ts (99%)
 rename types/{muicss-react => muicss}/muicss-react-tests.tsx (100%)
 rename types/{muicss-react => muicss}/tsconfig.json (82%)
 rename types/{muicss-react => muicss}/tslint.json (100%)

diff --git a/types/muicss-react/index.d.ts b/types/muicss/index.d.ts
similarity index 99%
rename from types/muicss-react/index.d.ts
rename to types/muicss/index.d.ts
index 5baeb17198..33f674a522 100644
--- a/types/muicss-react/index.d.ts
+++ b/types/muicss/index.d.ts
@@ -143,6 +143,7 @@ declare namespace MuicssReact {
     }
 
     export interface CheckboxProps extends React.HTMLAttributes<HTMLDivElement> {
+        name?: string;
         label?: React.ReactNode;
         autoFocus?: boolean;
         checked?: boolean;
diff --git a/types/muicss-react/muicss-react-tests.tsx b/types/muicss/muicss-react-tests.tsx
similarity index 100%
rename from types/muicss-react/muicss-react-tests.tsx
rename to types/muicss/muicss-react-tests.tsx
diff --git a/types/muicss-react/tsconfig.json b/types/muicss/tsconfig.json
similarity index 82%
rename from types/muicss-react/tsconfig.json
rename to types/muicss/tsconfig.json
index 51741cfc48..a15e9d86b5 100644
--- a/types/muicss-react/tsconfig.json
+++ b/types/muicss/tsconfig.json
@@ -9,10 +9,10 @@
             "es6",
             "dom"
         ],
-        "noImplicitAny": false,
+        "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": false,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "jsx": "react",
         "experimentalDecorators": true,
diff --git a/types/muicss-react/tslint.json b/types/muicss/tslint.json
similarity index 100%
rename from types/muicss-react/tslint.json
rename to types/muicss/tslint.json

From 7720f6f797cbf9a86c338ec1637b0d0a87827d1c Mon Sep 17 00:00:00 2001
From: samuelneff <github@serndesign.com>
Date: Fri, 16 Feb 2018 06:22:10 +0000
Subject: [PATCH 0056/1382] Fix muicss test filename

---
 types/muicss/{muicss-react-tests.tsx => muicss-tests.tsx} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename types/muicss/{muicss-react-tests.tsx => muicss-tests.tsx} (100%)

diff --git a/types/muicss/muicss-react-tests.tsx b/types/muicss/muicss-tests.tsx
similarity index 100%
rename from types/muicss/muicss-react-tests.tsx
rename to types/muicss/muicss-tests.tsx

From b04ebfdc5958becdf83f1a513a9f034369095f4b Mon Sep 17 00:00:00 2001
From: samuelneff <github@serndesign.com>
Date: Fri, 16 Feb 2018 06:38:33 +0000
Subject: [PATCH 0057/1382] Minor tsconfig fix

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

diff --git a/types/muicss/tsconfig.json b/types/muicss/tsconfig.json
index a15e9d86b5..2fd7f268f3 100644
--- a/types/muicss/tsconfig.json
+++ b/types/muicss/tsconfig.json
@@ -1,7 +1,7 @@
 {
     "files": [
         "index.d.ts",
-        "muicss-react-tests.tsx"
+        "muicss-tests.tsx"
     ],
     "compilerOptions": {
         "module": "commonjs",

From 27e5506ee39a823938aeaf9acd3b579e8716e2a6 Mon Sep 17 00:00:00 2001
From: Kristofer Sommestad <kristofer.sommestad@springworks.se>
Date: Fri, 16 Feb 2018 09:23:24 +0100
Subject: [PATCH 0058/1382] fix(sinon): update typing for `useFakeTimers`

The parameters for `useFakeTimers()` changed in Sinon 3.0.0. It now expects a `config` property instead.

See http://sinonjs.org/releases/v4.3.0/fake-timers/ for more details.
---
 types/sinon/index.d.ts     | 4 ++--
 types/sinon/sinon-tests.ts | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/types/sinon/index.d.ts b/types/sinon/index.d.ts
index f0433a694e..24c809a71f 100644
--- a/types/sinon/index.d.ts
+++ b/types/sinon/index.d.ts
@@ -234,8 +234,8 @@ declare namespace Sinon {
 
     interface SinonFakeTimersStatic {
         (): SinonFakeTimers;
-        (...timers: string[]): SinonFakeTimers;
-        (now: number, ...timers: string[]): SinonFakeTimers;
+        (now?: number | Date): SinonFakeTimers;
+        (config: { now?: number | Date, toFake?: string[], shouldAdvanceTime?: boolean }): SinonFakeTimers;
     }
 
     interface SinonStatic {
diff --git a/types/sinon/sinon-tests.ts b/types/sinon/sinon-tests.ts
index 2e2286e538..838972798f 100644
--- a/types/sinon/sinon-tests.ts
+++ b/types/sinon/sinon-tests.ts
@@ -121,6 +121,10 @@ function testSandbox() {
         sandbox.mock(objectUnderTest).expects("process").once();
     }
     sandbox.useFakeTimers();
+    sandbox.useFakeTimers({
+        now: 1,
+        toFake: ['Date']
+    });
     sandbox.useFakeXMLHttpRequest();
     sandbox.useFakeServer();
     sandbox.restore();

From 7b5682c2412e626dad088fa6917ee42a5e18ff86 Mon Sep 17 00:00:00 2001
From: hisorange <hello@hisorange.me>
Date: Fri, 16 Feb 2018 21:10:24 +0100
Subject: [PATCH 0059/1382] Add missing limit option

---
 types/bull/index.d.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/types/bull/index.d.ts b/types/bull/index.d.ts
index 8a12db0fd7..97cb7a23df 100644
--- a/types/bull/index.d.ts
+++ b/types/bull/index.d.ts
@@ -164,6 +164,11 @@ declare namespace Bull {
      * End date when the repeat job should stop repeating
      */
     endDate?: Date | string | number;
+
+    /**
+     * Number of times the job should repeat at max.
+     */
+    limit?: number;
   }
 
   interface JobOptions {

From bc951f40501c233005ff1a586c3043756008edc2 Mon Sep 17 00:00:00 2001
From: Andrea Ascari <andrea.ascari@buildo.io>
Date: Sat, 17 Feb 2018 11:15:51 +0100
Subject: [PATCH 0060/1382] Added 'esModuleInterop' in tsconfig, removed the
 'ban-types' rule from lint config

---
 types/react-native-auth0/tsconfig.json | 1 +
 types/react-native-auth0/tslint.json   | 6 +-----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/types/react-native-auth0/tsconfig.json b/types/react-native-auth0/tsconfig.json
index f694a107be..407210c6b1 100644
--- a/types/react-native-auth0/tsconfig.json
+++ b/types/react-native-auth0/tsconfig.json
@@ -3,6 +3,7 @@
         "module": "commonjs",
         "lib": ["es6"],
         "target": "es6",
+        "esModuleInterop": true,
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
diff --git a/types/react-native-auth0/tslint.json b/types/react-native-auth0/tslint.json
index fd90cce501..f93cf8562a 100644
--- a/types/react-native-auth0/tslint.json
+++ b/types/react-native-auth0/tslint.json
@@ -1,7 +1,3 @@
 {
-    "extends": "dtslint/dt.json",
-    "rules": {
-        // Lowercase `object` is available in TypeScript 2.2 only.
-        "ban-types": false
-    }
+    "extends": "dtslint/dt.json"
 }

From f61e27785edad81321b2f3c020809dae9220dfaa Mon Sep 17 00:00:00 2001
From: Trung Dang <trungdt@absoft.vn>
Date: Mon, 19 Feb 2018 00:23:33 +0700
Subject: [PATCH 0061/1382] update missing ioredis/onPossiblyUnhandledRejection

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

diff --git a/types/ioredis/index.d.ts b/types/ioredis/index.d.ts
index de71a9f083..6834121851 100644
--- a/types/ioredis/index.d.ts
+++ b/types/ioredis/index.d.ts
@@ -48,6 +48,7 @@ declare namespace IORedis {
     }
 
     interface Redis extends NodeJS.EventEmitter, Commander {
+        Promise: typeof Promise;
         status: string;
         connect(callback?: () => void): Promise<any>;
         disconnect(): void;
diff --git a/types/ioredis/ioredis-tests.ts b/types/ioredis/ioredis-tests.ts
index d8106ecdea..e8e32062dc 100644
--- a/types/ioredis/ioredis-tests.ts
+++ b/types/ioredis/ioredis-tests.ts
@@ -105,7 +105,10 @@ redis.multi([
     // results = [[null, 'OK'], [null, 'bar']]
 });
 
-const keys = [ 'foo', 'bar' ];
+redis.Promise.onPossiblyUnhandledRejection((error) => {
+});
+
+const keys = ['foo', 'bar'];
 redis.mget(...keys);
 
 new Redis.Cluster([

From a96c2c5287dca1519aee1e56916c44c2f2853514 Mon Sep 17 00:00:00 2001
From: samuelneff <github@serndesign.com>
Date: Sun, 18 Feb 2018 19:57:50 +0000
Subject: [PATCH 0062/1382] Refactor muicss react types per pull request
 feedback

---
 types/muicss/index.d.ts                   | 240 +---------------------
 types/muicss/lib/react/appbar.d.ts        |   4 +
 types/muicss/lib/react/button.d.ts        |   4 +
 types/muicss/lib/react/checkbox.d.ts      |   4 +
 types/muicss/lib/react/col.d.ts           |   4 +
 types/muicss/lib/react/container.d.ts     |   4 +
 types/muicss/lib/react/divider.d.ts       |   4 +
 types/muicss/lib/react/dropdown-item.d.ts |   4 +
 types/muicss/lib/react/dropdown.d.ts      |   4 +
 types/muicss/lib/react/form.d.ts          |   4 +
 types/muicss/lib/react/input.d.ts         |   4 +
 types/muicss/lib/react/option.d.ts        |   4 +
 types/muicss/lib/react/panel.d.ts         |   4 +
 types/muicss/lib/react/radio.d.ts         |   4 +
 types/muicss/lib/react/row.d.ts           |   4 +
 types/muicss/lib/react/select.d.ts        |   4 +
 types/muicss/lib/react/tab.d.ts           |   4 +
 types/muicss/lib/react/tabs.d.ts          |   4 +
 types/muicss/lib/react/textarea.d.ts      |   4 +
 types/muicss/muicss-tests.tsx             |   7 +-
 types/muicss/react.d.ts                   | 143 +++++++++++++
 types/muicss/tsconfig.json                |  22 +-
 types/muicss/tslint.json                  |  11 -
 23 files changed, 239 insertions(+), 256 deletions(-)
 create mode 100644 types/muicss/lib/react/appbar.d.ts
 create mode 100644 types/muicss/lib/react/button.d.ts
 create mode 100644 types/muicss/lib/react/checkbox.d.ts
 create mode 100644 types/muicss/lib/react/col.d.ts
 create mode 100644 types/muicss/lib/react/container.d.ts
 create mode 100644 types/muicss/lib/react/divider.d.ts
 create mode 100644 types/muicss/lib/react/dropdown-item.d.ts
 create mode 100644 types/muicss/lib/react/dropdown.d.ts
 create mode 100644 types/muicss/lib/react/form.d.ts
 create mode 100644 types/muicss/lib/react/input.d.ts
 create mode 100644 types/muicss/lib/react/option.d.ts
 create mode 100644 types/muicss/lib/react/panel.d.ts
 create mode 100644 types/muicss/lib/react/radio.d.ts
 create mode 100644 types/muicss/lib/react/row.d.ts
 create mode 100644 types/muicss/lib/react/select.d.ts
 create mode 100644 types/muicss/lib/react/tab.d.ts
 create mode 100644 types/muicss/lib/react/tabs.d.ts
 create mode 100644 types/muicss/lib/react/textarea.d.ts
 create mode 100644 types/muicss/react.d.ts

diff --git a/types/muicss/index.d.ts b/types/muicss/index.d.ts
index 33f674a522..f195ae5d23 100644
--- a/types/muicss/index.d.ts
+++ b/types/muicss/index.d.ts
@@ -1,243 +1,7 @@
-// Type definitions for muicss React bindings v09.36
+// Type definitions for muicss React bindings 0.9
 // Project: https://www.muicss.com/
 // Definitions by: Samuel Neff <https://github.com/samuelneff>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
-/// <reference types="react" />
-
-declare module "muicss/react" {
-    export import Appbar = MuicssReact.Appbar;
-    export import Button = MuicssReact.Button;
-    export import Checkbox = MuicssReact.Checkbox;
-    export import Col = MuicssReact.Col;
-    export import Container = MuicssReact.Container;
-    export import Divider = MuicssReact.Divider;
-    export import Dropdown = MuicssReact.Dropdown;
-    export import DropdownItem = MuicssReact.DropdownItem;
-    export import Form = MuicssReact.Form;
-    export import Input = MuicssReact.Input;
-    export import Option = MuicssReact.Option;
-    export import Panel = MuicssReact.Panel;
-    export import Radio = MuicssReact.Radio;
-    export import Row = MuicssReact.Row;
-    export import Select = MuicssReact.Select;
-    export import Tab = MuicssReact.Tab;
-    export import Tabs = MuicssReact.Tabs;
-    export import Textarea = MuicssReact.Textarea;
-}
-
-declare module 'muicss/lib/react/appbar' {
-    export import Appbar = MuicssReact.Appbar;
-    export default Appbar;
-}
-
-declare module 'muicss/lib/react/button' {
-    export import Button = MuicssReact.Button;
-    export default Button;
-}
-
-declare module 'muicss/lib/react/checkbox' {
-    export import Checkbox = MuicssReact.Checkbox;
-    export default Checkbox;
-}
-
-declare module 'muicss/lib/react/col' {
-    export import Col = MuicssReact.Col;
-    export default Col;
-}
-
-declare module 'muicss/lib/react/container' {
-    export import Container = MuicssReact.Container;
-    export default Container;
-}
-
-declare module 'muicss/lib/react/divider' {
-    export import Divider = MuicssReact.Divider;
-    export default Divider;
-}
-
-declare module 'muicss/lib/react/dropdown' {
-    export import Dropdown = MuicssReact.Dropdown;
-    export default Dropdown;
-}
-
-declare module 'muicss/lib/react/dropdown-item' {
-    export import DropdownItem = MuicssReact.DropdownItem;
-    export default DropdownItem;
-}
-
-declare module 'muicss/lib/react/form' {
-    export import Form = MuicssReact.Form;
-    export default Form;
-}
-
-declare module 'muicss/lib/react/input' {
-    export import Input = MuicssReact.Input;
-    export default Input;
-}
-
-declare module 'muicss/lib/react/option' {
-    export import Option = MuicssReact.Option;
-    export default Option;
-}
-
-declare module 'muicss/lib/react/panel' {
-    export import Panel = MuicssReact.Panel;
-    export default Panel;
-}
-
-declare module 'muicss/lib/react/radio' {
-    export import Radio = MuicssReact.Radio;
-    export default Radio;
-}
-
-declare module 'muicss/lib/react/row' {
-    export import Row = MuicssReact.Row;
-    export default Row;
-}
-
-declare module 'muicss/lib/react/select' {
-    export import Select = MuicssReact.Select;
-    export default Select;
-}
-
-declare module 'muicss/lib/react/tab' {
-    export import Tab = MuicssReact.Tab;
-    export default Tab;
-}
-
-declare module 'muicss/lib/react/tabs' {
-    export import Tabs = MuicssReact.Tabs;
-    export default Tabs;
-}
-
-declare module 'muicss/lib/react/textarea' {
-    export import Textarea = MuicssReact.Textarea;
-    export default Textarea;
-}
-
-declare namespace MuicssReact {
-    export class Appbar extends React.Component<DivProps> {}
-    export class Button extends React.Component<ButtonProps> {}
-    export class Checkbox extends React.Component<CheckboxProps> {}
-    export class Col extends React.Component<ColProps> {}
-    export class Container extends React.Component<ContainerProps> {}
-    export class Divider extends React.Component<DividerProps> {}
-    export class Dropdown extends React.Component<DropdownProps> {}
-    export class DropdownItem extends React.Component<DropdownItemProps> {}
-    export class Form extends React.Component<FormProps> {}
-    export class Input extends React.Component<InputProps> {}
-    export class Panel extends React.Component<PanelProps> {}
-    export class Option extends React.Component<OptionProps> {}
-    export class Radio extends React.Component<RadioProps> {}
-    export class Row extends React.Component<RowProps> {}
-    export class Select extends React.Component<SelectProps> {}
-    export class Tab extends React.Component<TabProps> {}
-    export class Tabs extends React.Component<TabsProps> {}
-    export class Textarea extends React.Component<TextareaProps> {}
-
-    export interface ButtonProps extends React.ButtonHTMLAttributes<HTMLButtonElement> {
-        size?: string;
-        variant?: string;
-    }
-
-    export interface CheckboxProps extends React.HTMLAttributes<HTMLDivElement> {
-        name?: string;
-        label?: React.ReactNode;
-        autoFocus?: boolean;
-        checked?: boolean;
-        disabled?: boolean;
-        form?: string;
-        required?: boolean;
-        value?: string | string[] | number;
-    }
-
-    export interface ColProps extends DivProps {
-        xs?: number;
-        sm?: number;
-        md?: number;
-        lg?: number;
-        xl?: number;
-        'xs-offset'?: number;
-        'sm-offset'?: number;
-        'md-offset'?: number;
-        'lg-offset'?: number;
-        'xl-offset'?: number;
-    }
-
-    export interface ContainerProps extends DivProps {
-        fluid?: boolean;
-    }
-
-    export interface DivProps extends React.HTMLAttributes<HTMLDivElement> {}
-    export interface DividerProps extends DivProps {}
-
-    export interface DropdownItemProps extends React.LiHTMLAttributes<HTMLLIElement> {
-        link?: string;
-        target?: string;
-    }
-
-    export interface DropdownProps extends React.HTMLAttributes<HTMLDivElement> {
-        onOutsideClick?: React.MouseEventHandler<HTMLDivElement>;
-
-        variant?: string;
-        size?: string;
-        label?: React.ReactNode;
-        alignMenu?: 'left' | 'right';
-        disabled?: boolean;
-    }
-
-    export interface FormProps extends React.FormHTMLAttributes<HTMLFormElement> {
-        inline?: boolean;
-    }
-
-    export interface InputProps extends React.InputHTMLAttributes<HTMLInputElement> {
-        inputRef?: React.Ref<HTMLInputElement>;
-        onLabelClick?: React.MouseEventHandler<HTMLInputElement>;
-        hint?: string;
-        invalid?: boolean;
-        label?: React.ReactNode;
-        floatingLabel?: boolean;
-    }
-
-    export interface OptionProps extends React.OptionHTMLAttributes<HTMLOptionElement> {
-    }
-
-    export interface PanelProps extends DivProps {}
-    export interface RadioProps extends CheckboxProps {}
-
-    export interface RowProps extends DivProps {
-        xs?: number;
-        sm?: number;
-        md?: number;
-        lg?: number;
-    }
-
-    export interface SelectProps extends DivProps {
-        label?: React.ReactNode;
-        readOnly?: boolean;
-        useDefault?: boolean;
-    }
-
-    export interface TabProps {
-        value?: any;
-        label?: React.ReactNode;
-        onActive?: (tab: Tab) => void;
-    }
-
-    export interface TabsProps extends DivProps {
-        defaultSelectedIndex?: number;
-        selectedIndex?: number;
-        justified?: boolean;
-    }
-
-    export interface TextareaProps extends React.TextareaHTMLAttributes<HTMLTextAreaElement> {
-        inputRef?: React.Ref<HTMLTextAreaElement>;
-        onLabelClick?: React.MouseEventHandler<HTMLInputElement>;
-        hint?: string;
-        invalid?: boolean;
-        label?: React.ReactNode;
-        floatingLabel?: boolean;
-    }
-}
+// all definitions in react.d.ts and subdirs
diff --git a/types/muicss/lib/react/appbar.d.ts b/types/muicss/lib/react/appbar.d.ts
new file mode 100644
index 0000000000..3da725be31
--- /dev/null
+++ b/types/muicss/lib/react/appbar.d.ts
@@ -0,0 +1,4 @@
+import * as React from 'react';
+import * as P from '../../react';
+
+export default class Appbar extends React.Component<P.DivProps> {}
diff --git a/types/muicss/lib/react/button.d.ts b/types/muicss/lib/react/button.d.ts
new file mode 100644
index 0000000000..df641cf4c4
--- /dev/null
+++ b/types/muicss/lib/react/button.d.ts
@@ -0,0 +1,4 @@
+import * as React from 'react';
+import * as P from '../../react';
+
+export default class Button extends React.Component<P.ButtonProps> {}
diff --git a/types/muicss/lib/react/checkbox.d.ts b/types/muicss/lib/react/checkbox.d.ts
new file mode 100644
index 0000000000..dda10e0ade
--- /dev/null
+++ b/types/muicss/lib/react/checkbox.d.ts
@@ -0,0 +1,4 @@
+import * as React from 'react';
+import * as P from '../../react';
+
+export default class Checkbox extends React.Component<P.CheckboxProps> {}
diff --git a/types/muicss/lib/react/col.d.ts b/types/muicss/lib/react/col.d.ts
new file mode 100644
index 0000000000..a052122a04
--- /dev/null
+++ b/types/muicss/lib/react/col.d.ts
@@ -0,0 +1,4 @@
+import * as React from 'react';
+import * as P from '../../react';
+
+export default class Col extends React.Component<P.ColProps> {}
diff --git a/types/muicss/lib/react/container.d.ts b/types/muicss/lib/react/container.d.ts
new file mode 100644
index 0000000000..6845cd981b
--- /dev/null
+++ b/types/muicss/lib/react/container.d.ts
@@ -0,0 +1,4 @@
+import * as React from 'react';
+import * as P from '../../react';
+
+export default class Container extends React.Component<P.ContainerProps> {}
diff --git a/types/muicss/lib/react/divider.d.ts b/types/muicss/lib/react/divider.d.ts
new file mode 100644
index 0000000000..ce2ea1f3d6
--- /dev/null
+++ b/types/muicss/lib/react/divider.d.ts
@@ -0,0 +1,4 @@
+import * as React from 'react';
+import * as P from '../../react';
+
+export default class Divider extends React.Component<P.DividerProps> {}
diff --git a/types/muicss/lib/react/dropdown-item.d.ts b/types/muicss/lib/react/dropdown-item.d.ts
new file mode 100644
index 0000000000..07dbcd77b9
--- /dev/null
+++ b/types/muicss/lib/react/dropdown-item.d.ts
@@ -0,0 +1,4 @@
+import * as React from 'react';
+import * as P from '../../react';
+
+export default class DropdownItem extends React.Component<P.DropdownItemProps> {}
diff --git a/types/muicss/lib/react/dropdown.d.ts b/types/muicss/lib/react/dropdown.d.ts
new file mode 100644
index 0000000000..c34154133e
--- /dev/null
+++ b/types/muicss/lib/react/dropdown.d.ts
@@ -0,0 +1,4 @@
+import * as React from 'react';
+import * as P from '../../react';
+
+export default class Dropdown extends React.Component<P.DropdownProps> {}
diff --git a/types/muicss/lib/react/form.d.ts b/types/muicss/lib/react/form.d.ts
new file mode 100644
index 0000000000..ca09da6102
--- /dev/null
+++ b/types/muicss/lib/react/form.d.ts
@@ -0,0 +1,4 @@
+import * as React from 'react';
+import * as P from '../../react';
+
+export default class Form extends React.Component<P.FormProps> {}
diff --git a/types/muicss/lib/react/input.d.ts b/types/muicss/lib/react/input.d.ts
new file mode 100644
index 0000000000..2e8edfd7f7
--- /dev/null
+++ b/types/muicss/lib/react/input.d.ts
@@ -0,0 +1,4 @@
+import * as React from 'react';
+import * as P from '../../react';
+
+export default class Input extends React.Component<P.InputProps> {}
diff --git a/types/muicss/lib/react/option.d.ts b/types/muicss/lib/react/option.d.ts
new file mode 100644
index 0000000000..59514c5cbc
--- /dev/null
+++ b/types/muicss/lib/react/option.d.ts
@@ -0,0 +1,4 @@
+import * as React from 'react';
+import * as P from '../../react';
+
+export default class Option extends React.Component<P.OptionProps> {}
diff --git a/types/muicss/lib/react/panel.d.ts b/types/muicss/lib/react/panel.d.ts
new file mode 100644
index 0000000000..b92359f19e
--- /dev/null
+++ b/types/muicss/lib/react/panel.d.ts
@@ -0,0 +1,4 @@
+import * as React from 'react';
+import * as P from '../../react';
+
+export default class Panel extends React.Component<P.PanelProps> {}
diff --git a/types/muicss/lib/react/radio.d.ts b/types/muicss/lib/react/radio.d.ts
new file mode 100644
index 0000000000..ab8f20cb37
--- /dev/null
+++ b/types/muicss/lib/react/radio.d.ts
@@ -0,0 +1,4 @@
+import * as React from 'react';
+import * as P from '../../react';
+
+export default class Radio extends React.Component<P.RadioProps> {}
diff --git a/types/muicss/lib/react/row.d.ts b/types/muicss/lib/react/row.d.ts
new file mode 100644
index 0000000000..6da3037efc
--- /dev/null
+++ b/types/muicss/lib/react/row.d.ts
@@ -0,0 +1,4 @@
+import * as React from 'react';
+import * as P from '../../react';
+
+export default class Row extends React.Component<P.RowProps> {}
diff --git a/types/muicss/lib/react/select.d.ts b/types/muicss/lib/react/select.d.ts
new file mode 100644
index 0000000000..4a5cefc75a
--- /dev/null
+++ b/types/muicss/lib/react/select.d.ts
@@ -0,0 +1,4 @@
+import * as React from 'react';
+import * as P from '../../react';
+
+export default class Select extends React.Component<P.SelectProps> {}
diff --git a/types/muicss/lib/react/tab.d.ts b/types/muicss/lib/react/tab.d.ts
new file mode 100644
index 0000000000..6c93a45b09
--- /dev/null
+++ b/types/muicss/lib/react/tab.d.ts
@@ -0,0 +1,4 @@
+import * as React from 'react';
+import * as P from '../../react';
+
+export default class Tab extends React.Component<P.TabProps> {}
diff --git a/types/muicss/lib/react/tabs.d.ts b/types/muicss/lib/react/tabs.d.ts
new file mode 100644
index 0000000000..e33ca34333
--- /dev/null
+++ b/types/muicss/lib/react/tabs.d.ts
@@ -0,0 +1,4 @@
+import * as React from 'react';
+import * as P from '../../react';
+
+export default class Tabs extends React.Component<P.TabsProps> {}
diff --git a/types/muicss/lib/react/textarea.d.ts b/types/muicss/lib/react/textarea.d.ts
new file mode 100644
index 0000000000..82acb645e0
--- /dev/null
+++ b/types/muicss/lib/react/textarea.d.ts
@@ -0,0 +1,4 @@
+import * as React from 'react';
+import * as P from '../../react';
+
+export default class TextArea extends React.Component<P.TextareaProps> {}
diff --git a/types/muicss/muicss-tests.tsx b/types/muicss/muicss-tests.tsx
index 6fcdf76cb5..000310918b 100644
--- a/types/muicss/muicss-tests.tsx
+++ b/types/muicss/muicss-tests.tsx
@@ -1,5 +1,4 @@
 import * as React from 'react';
-import { Component } from 'react';
 import * as ReactDOM from 'react-dom';
 
 import {
@@ -42,9 +41,7 @@ import Tab2 from 'muicss/lib/react/tab';
 import Tabs2 from 'muicss/lib/react/tabs';
 import Textarea2 from 'muicss/lib/react/textarea';
 
-interface Props {}
-
-class Test extends Component<Props> {
+class Test extends React.Component {
     render() {
         return (
             <div>
@@ -122,7 +119,7 @@ class Test extends Component<Props> {
     }
 }
 
-class Test2 extends Component<Props> {
+class Test2 extends React.Component {
     render() {
         return (
             <div>
diff --git a/types/muicss/react.d.ts b/types/muicss/react.d.ts
new file mode 100644
index 0000000000..f8a28c5964
--- /dev/null
+++ b/types/muicss/react.d.ts
@@ -0,0 +1,143 @@
+import Appbar from './lib/react/appbar';
+import Button from './lib/react/button';
+import Checkbox from './lib/react/checkbox';
+import Col from './lib/react/col';
+import Container from './lib/react/container';
+import Divider from './lib/react/divider';
+import Dropdown from './lib/react/dropdown';
+import DropdownItem from './lib/react/dropdown-item';
+import Form from './lib/react/form';
+import Input from './lib/react/input';
+import Option from './lib/react/option';
+import Panel from './lib/react/panel';
+import Radio from './lib/react/radio';
+import Row from './lib/react/row';
+import Select from './lib/react/select';
+import Tab from './lib/react/tab';
+import Tabs from './lib/react/tabs';
+import Textarea from './lib/react/textarea';
+
+export {
+    Appbar,
+    Button,
+    Checkbox,
+    Col,
+    Container,
+    Divider,
+    Dropdown,
+    DropdownItem,
+    Form,
+    Input,
+    Option,
+    Panel,
+    Radio,
+    Row,
+    Select,
+    Tab,
+    Tabs,
+    Textarea
+};
+
+export interface ButtonProps extends React.ButtonHTMLAttributes<HTMLButtonElement> {
+    size?: string;
+    variant?: string;
+}
+
+export interface CheckboxProps extends React.HTMLAttributes<HTMLDivElement> {
+    name?: string;
+    label?: React.ReactNode;
+    autoFocus?: boolean;
+    checked?: boolean;
+    disabled?: boolean;
+    form?: string;
+    required?: boolean;
+    value?: string | string[] | number;
+}
+
+export interface ColProps extends DivProps {
+    xs?: number;
+    sm?: number;
+    md?: number;
+    lg?: number;
+    xl?: number;
+    'xs-offset'?: number;
+    'sm-offset'?: number;
+    'md-offset'?: number;
+    'lg-offset'?: number;
+    'xl-offset'?: number;
+}
+
+export interface ContainerProps extends DivProps {
+    fluid?: boolean;
+}
+
+export interface DivProps extends React.HTMLAttributes<HTMLDivElement> {}
+export type DividerProps = DivProps;
+
+export interface DropdownItemProps extends React.LiHTMLAttributes<HTMLLIElement> {
+    link?: string;
+    target?: string;
+}
+
+export interface DropdownProps extends React.HTMLAttributes<HTMLDivElement> {
+    onOutsideClick?: React.MouseEventHandler<HTMLDivElement>;
+
+    variant?: string;
+    size?: string;
+    label?: React.ReactNode;
+    alignMenu?: 'left' | 'right';
+    disabled?: boolean;
+}
+
+export interface FormProps extends React.FormHTMLAttributes<HTMLFormElement> {
+    inline?: boolean;
+}
+
+export interface InputProps extends React.InputHTMLAttributes<HTMLInputElement> {
+    inputRef?: React.Ref<HTMLInputElement>;
+    onLabelClick?: React.MouseEventHandler<HTMLInputElement>;
+    hint?: string;
+    invalid?: boolean;
+    label?: React.ReactNode;
+    floatingLabel?: boolean;
+}
+
+export interface OptionProps extends React.OptionHTMLAttributes<HTMLOptionElement> {
+}
+
+export type PanelProps = DivProps;
+export type RadioProps = CheckboxProps;
+
+export interface RowProps extends DivProps {
+    xs?: number;
+    sm?: number;
+    md?: number;
+    lg?: number;
+}
+
+export interface SelectProps extends DivProps {
+    label?: React.ReactNode;
+    readOnly?: boolean;
+    useDefault?: boolean;
+}
+
+export interface TabProps {
+    value?: any;
+    label?: React.ReactNode;
+    onActive?: (tab: Tab) => void;
+}
+
+export interface TabsProps extends DivProps {
+    defaultSelectedIndex?: number;
+    selectedIndex?: number;
+    justified?: boolean;
+}
+
+export interface TextareaProps extends React.TextareaHTMLAttributes<HTMLTextAreaElement> {
+    inputRef?: React.Ref<HTMLTextAreaElement>;
+    onLabelClick?: React.MouseEventHandler<HTMLInputElement>;
+    hint?: string;
+    invalid?: boolean;
+    label?: React.ReactNode;
+    floatingLabel?: boolean;
+}
diff --git a/types/muicss/tsconfig.json b/types/muicss/tsconfig.json
index 2fd7f268f3..52a96cebf7 100644
--- a/types/muicss/tsconfig.json
+++ b/types/muicss/tsconfig.json
@@ -1,7 +1,25 @@
 {
     "files": [
-        "index.d.ts",
-        "muicss-tests.tsx"
+        "react.d.ts",
+        "muicss-tests.tsx",
+        "lib/react/appbar.d.ts",
+        "lib/react/button.d.ts",
+        "lib/react/checkbox.d.ts",
+        "lib/react/col.d.ts",
+        "lib/react/container.d.ts",
+        "lib/react/divider.d.ts",
+        "lib/react/dropdown.d.ts",
+        "lib/react/dropdown-item.d.ts",
+        "lib/react/form.d.ts",
+        "lib/react/input.d.ts",
+        "lib/react/option.d.ts",
+        "lib/react/panel.d.ts",
+        "lib/react/radio.d.ts",
+        "lib/react/row.d.ts",
+        "lib/react/select.d.ts",
+        "lib/react/tab.d.ts",
+        "lib/react/tabs.d.ts",
+        "lib/react/textarea.d.ts"
     ],
     "compilerOptions": {
         "module": "commonjs",
diff --git a/types/muicss/tslint.json b/types/muicss/tslint.json
index fb9b1973fc..495d29983d 100644
--- a/types/muicss/tslint.json
+++ b/types/muicss/tslint.json
@@ -1,16 +1,5 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "ban-types": false,
-        "dt-header": false,
-        "no-any-union": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-empty-interface": false,
-        "no-mergeable-namespace": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "strict-export-declare-modifiers": false,
-        "use-default-type-parameter": false
     }
 }

From 131c314cb4cbaffcdba6980b33b4eb529b7ed6f4 Mon Sep 17 00:00:00 2001
From: samuelneff <github@serndesign.com>
Date: Sun, 18 Feb 2018 20:03:50 +0000
Subject: [PATCH 0063/1382] Resolve index.d.ts missing from tsconfig

---
 types/muicss/tsconfig.json | 1 +
 types/muicss/tslint.json   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/types/muicss/tsconfig.json b/types/muicss/tsconfig.json
index 52a96cebf7..a7b54e6b6a 100644
--- a/types/muicss/tsconfig.json
+++ b/types/muicss/tsconfig.json
@@ -1,5 +1,6 @@
 {
     "files": [
+        "index.d.ts",
         "react.d.ts",
         "muicss-tests.tsx",
         "lib/react/appbar.d.ts",
diff --git a/types/muicss/tslint.json b/types/muicss/tslint.json
index 495d29983d..946997cb87 100644
--- a/types/muicss/tslint.json
+++ b/types/muicss/tslint.json
@@ -1,5 +1,6 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
+        "no-useless-files": false
     }
 }

From 756f6c78fb1bc91a8dd31c4f033d46e6f8fae900 Mon Sep 17 00:00:00 2001
From: Brendan Forster <github@brendanforster.com>
Date: Mon, 29 Jan 2018 11:01:06 +1100
Subject: [PATCH 0064/1382] add textarea-caret package

---
 types/textarea-caret/index.d.ts              | 24 ++++++++++++++++++++
 types/textarea-caret/textarea-caret-tests.ts |  8 +++++++
 types/textarea-caret/tsconfig.json           | 24 ++++++++++++++++++++
 types/textarea-caret/tslint.json             |  8 +++++++
 4 files changed, 64 insertions(+)
 create mode 100644 types/textarea-caret/index.d.ts
 create mode 100644 types/textarea-caret/textarea-caret-tests.ts
 create mode 100644 types/textarea-caret/tsconfig.json
 create mode 100644 types/textarea-caret/tslint.json

diff --git a/types/textarea-caret/index.d.ts b/types/textarea-caret/index.d.ts
new file mode 100644
index 0000000000..3306b62544
--- /dev/null
+++ b/types/textarea-caret/index.d.ts
@@ -0,0 +1,24 @@
+// Type definitions for textarea-caret 3.0
+// Project: https://github.com/component/textarea-caret-position
+// Definitions by: Brendan Forster <https://github.com/shiftkey>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+export = textarea_caret;
+
+interface Caret {
+    top: number;
+    left: number;
+    height: number;
+}
+
+interface Options {
+    debug?: boolean;
+}
+
+declare function textarea_caret(element: HTMLElement, position: number, options?: Options): Caret;
+
+declare namespace textarea_caret {
+    const prototype: {
+    };
+}
diff --git a/types/textarea-caret/textarea-caret-tests.ts b/types/textarea-caret/textarea-caret-tests.ts
new file mode 100644
index 0000000000..60de8a6acc
--- /dev/null
+++ b/types/textarea-caret/textarea-caret-tests.ts
@@ -0,0 +1,8 @@
+import getCaretCoordinates = require('textarea-caret');
+
+const element = document.querySelector('textarea');
+
+element!.addEventListener('input', function() {
+  const caret = getCaretCoordinates(this, this.selectionEnd);
+  console.log('(top, left, height) = (%s, %s, %s)', caret.top, caret.left, caret.height);
+});
diff --git a/types/textarea-caret/tsconfig.json b/types/textarea-caret/tsconfig.json
new file mode 100644
index 0000000000..db5d25647a
--- /dev/null
+++ b/types/textarea-caret/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "textarea-caret-tests.ts"
+    ]
+}
diff --git a/types/textarea-caret/tslint.json b/types/textarea-caret/tslint.json
new file mode 100644
index 0000000000..e0508241c7
--- /dev/null
+++ b/types/textarea-caret/tslint.json
@@ -0,0 +1,8 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "indent": [true, "spaces", 4],
+        "max-line-length": [true, 100],
+        "no-any": true
+    }
+}

From 1280dde3802b034659f854c74f1ea18103ac5b1b Mon Sep 17 00:00:00 2001
From: Keegan Shay <keegan-shay@uiowa.edu>
Date: Mon, 19 Feb 2018 18:01:11 -0600
Subject: [PATCH 0065/1382] Add sqlMessage field to MySqlError

---
 types/mysql/index.d.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/types/mysql/index.d.ts b/types/mysql/index.d.ts
index 7d3281218f..1e827a7d37 100644
--- a/types/mysql/index.d.ts
+++ b/types/mysql/index.d.ts
@@ -521,6 +521,11 @@ export interface MysqlError extends Error {
      * SQL of failed query
      */
     sql?: string;
+
+    /**
+     * Error message from MySQL
+     */
+    sqlMessage?: string;
 }
 
 export const enum Types {

From 7589ddfcbc30151bf9990fa3babf57dd6d1a5381 Mon Sep 17 00:00:00 2001
From: Greg Zapp <greg@enflux.com>
Date: Mon, 19 Feb 2018 19:06:40 -0600
Subject: [PATCH 0066/1382] Correct row documentation and add original
 property.

---
 types/react-table/index.d.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/types/react-table/index.d.ts b/types/react-table/index.d.ts
index 2ab2d2a821..341bb103cb 100644
--- a/types/react-table/index.d.ts
+++ b/types/react-table/index.d.ts
@@ -601,9 +601,12 @@ export interface RowRenderProps extends Partial<RowInfo> {
 }
 
 export interface RowInfo {
-    /** Original row from your data */
+    /** Materialized row of data */
     row: any;
 
+    /** Original row from your data */
+    original: any;
+
     /** The post-accessed values from the original row */
     rowValues: any;
 

From d2a3242b8693be32147647d3291c25f26d934af7 Mon Sep 17 00:00:00 2001
From: Piotr Roszatycki <piotr.roszatycki@gmail.com>
Date: Sun, 4 Feb 2018 16:35:09 +0100
Subject: [PATCH 0067/1382] New typings for simple-websocket

---
 types/simple-websocket/index.d.ts             | 33 +++++++++++++++
 types/simple-websocket/server.d.ts            | 40 +++++++++++++++++++
 .../simple-websocket-tests.ts                 | 29 ++++++++++++++
 types/simple-websocket/tsconfig.json          | 24 +++++++++++
 types/simple-websocket/tslint.json            |  1 +
 5 files changed, 127 insertions(+)
 create mode 100644 types/simple-websocket/index.d.ts
 create mode 100644 types/simple-websocket/server.d.ts
 create mode 100644 types/simple-websocket/simple-websocket-tests.ts
 create mode 100644 types/simple-websocket/tsconfig.json
 create mode 100644 types/simple-websocket/tslint.json

diff --git a/types/simple-websocket/index.d.ts b/types/simple-websocket/index.d.ts
new file mode 100644
index 0000000000..d7ea924aff
--- /dev/null
+++ b/types/simple-websocket/index.d.ts
@@ -0,0 +1,33 @@
+// Type definitions for simple-websocket 6.0
+// Project: https://github.com/feross/simple-websocket
+// Definitions by: Piotr Roszatycki <https://github.com/dex4er>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import { Duplex, DuplexOptions } from 'stream';
+import WebSocket = require('ws');
+
+declare namespace Socket {
+  interface Options extends DuplexOptions {
+    /** websocket server url */
+    url?: string;
+    /** raw websocket instance to wrap */
+    socket?: WebSocket;
+  }
+
+  let WEBSOCKET_SUPPORT: boolean;
+}
+
+declare class Socket extends Duplex {
+  constructor(options: Socket.Options | string);
+
+  /** Send text/binary data to the WebSocket server */
+  send(chunk: any): void;
+
+  // TODO destroy method not compatible with Duplex
+  // destroy(err?: Error): void;
+  // destroy(callback?: (err?: Error) => void): void;
+}
+
+export = Socket;
diff --git a/types/simple-websocket/server.d.ts b/types/simple-websocket/server.d.ts
new file mode 100644
index 0000000000..a1e6c7a703
--- /dev/null
+++ b/types/simple-websocket/server.d.ts
@@ -0,0 +1,40 @@
+/// <reference types="node" />
+
+import { EventEmitter } from 'events';
+import * as http from 'http';
+import * as net from 'net';
+import WebSocket = require('ws');
+
+import Socket = require('.');
+
+declare namespace SocketServer {
+  type Options = WebSocket.ServerOptions;
+}
+
+declare class SocketServer extends EventEmitter {
+  options: SocketServer.Options;
+  path: string;
+  clients: Set<WebSocket>;
+
+  constructor(options?: SocketServer.Options, callback?: () => void);
+
+  close(cb?: (err?: Error) => void): void;
+  handleUpgrade(request: http.IncomingMessage, socket: net.Socket,
+      upgradeHead: Buffer, callback: (client: WebSocket) => void): void;
+  shouldHandle(request: http.IncomingMessage): boolean;
+
+  // Events
+  on(event: 'connection', cb: (socket: Socket, request: http.IncomingMessage) => void): this;
+  on(event: 'error', cb: (error: Error) => void): this;
+  on(event: 'headers', cb: (headers: string[], request: http.IncomingMessage) => void): this;
+  on(event: 'listening', cb: () => void): this;
+  on(event: string | symbol, listener: (...args: any[]) => void): this;
+
+  addListener(event: 'connection', cb: (client: Socket) => void): this;
+  addListener(event: 'error', cb: (err: Error) => void): this;
+  addListener(event: 'headers', cb: (headers: string[], request: http.IncomingMessage) => void): this;
+  addListener(event: 'listening', cb: () => void): this;
+  addListener(event: string | symbol, listener: (...args: any[]) => void): this;
+}
+
+export = SocketServer;
diff --git a/types/simple-websocket/simple-websocket-tests.ts b/types/simple-websocket/simple-websocket-tests.ts
new file mode 100644
index 0000000000..9d7d9af1ca
--- /dev/null
+++ b/types/simple-websocket/simple-websocket-tests.ts
@@ -0,0 +1,29 @@
+import Socket = require('simple-websocket');
+
+if (Socket.WEBSOCKET_SUPPORT) {
+  const socket = new Socket('ws://echo.websocket.org');
+  socket.on('connect', () => {
+    // socket is connected!
+    socket.send('sup!');
+  });
+
+  socket.on('data', (data: string | Buffer) => {
+    console.log('got message: ' + data);
+    // socket.destroy(() => {
+    //   console.log('socket destroyed');
+    // });
+  });
+}
+
+import Server = require('simple-websocket/server');
+
+const server = new Server({ port: 8080 }); // see `ws` docs for other options
+
+server.on('connection', (socket: Socket) => {
+  socket.write('pong');
+  socket.on('data', (data: string | Buffer) => {});
+  socket.on('close', () => {});
+  socket.on('error', (err: Error) => {});
+});
+
+server.close();
diff --git a/types/simple-websocket/tsconfig.json b/types/simple-websocket/tsconfig.json
new file mode 100644
index 0000000000..09935e03b6
--- /dev/null
+++ b/types/simple-websocket/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "server.d.ts",
+        "simple-websocket-tests.ts"
+    ]
+}
diff --git a/types/simple-websocket/tslint.json b/types/simple-websocket/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/simple-websocket/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 5592de580aca19f0f6ed705ddb8266f7082798c5 Mon Sep 17 00:00:00 2001
From: Piotr Roszatycki <piotr.roszatycki@gmail.com>
Date: Tue, 20 Feb 2018 16:46:33 +0100
Subject: [PATCH 0068/1382] Compatible with simple-socket 7.0

---
 types/simple-websocket/index.d.ts             | 33 ++++-----
 types/simple-websocket/server.d.ts            | 70 +++++++++++++------
 .../simple-websocket-tests.ts                 | 13 ++--
 types/simple-websocket/tsconfig.json          |  3 +-
 4 files changed, 71 insertions(+), 48 deletions(-)

diff --git a/types/simple-websocket/index.d.ts b/types/simple-websocket/index.d.ts
index d7ea924aff..5e79241ff1 100644
--- a/types/simple-websocket/index.d.ts
+++ b/types/simple-websocket/index.d.ts
@@ -1,33 +1,28 @@
-// Type definitions for simple-websocket 6.0
+// Type definitions for simple-websocket 7.0
 // Project: https://github.com/feross/simple-websocket
 // Definitions by: Piotr Roszatycki <https://github.com/dex4er>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
 
-import { Duplex, DuplexOptions } from 'stream';
-import WebSocket = require('ws');
+import { Duplex, DuplexOptions } from "stream";
+import WebSocket from "ws";
 
-declare namespace Socket {
-  interface Options extends DuplexOptions {
-    /** websocket server url */
-    url?: string;
-    /** raw websocket instance to wrap */
-    socket?: WebSocket;
-  }
-
-  let WEBSOCKET_SUPPORT: boolean;
+export interface SocketOptions extends DuplexOptions {
+  /** websocket server url */
+  url?: string;
+  /** raw websocket instance to wrap */
+  socket?: WebSocket;
 }
 
-declare class Socket extends Duplex {
-  constructor(options: Socket.Options | string);
+export default class Socket extends Duplex {
+  static WEBSOCKET_SUPPORT: boolean;
+
+  constructor(options: SocketOptions | string);
 
   /** Send text/binary data to the WebSocket server */
   send(chunk: any): void;
 
-  // TODO destroy method not compatible with Duplex
-  // destroy(err?: Error): void;
-  // destroy(callback?: (err?: Error) => void): void;
+  /** Destroy and cleanup this websocket connection */
+  destroy(err?: Error): void;
 }
-
-export = Socket;
diff --git a/types/simple-websocket/server.d.ts b/types/simple-websocket/server.d.ts
index a1e6c7a703..b9694444f0 100644
--- a/types/simple-websocket/server.d.ts
+++ b/types/simple-websocket/server.d.ts
@@ -1,22 +1,20 @@
 /// <reference types="node" />
 
-import { EventEmitter } from 'events';
-import * as http from 'http';
-import * as net from 'net';
-import WebSocket = require('ws');
+import { EventEmitter } from "events";
+import * as http from "http";
+import * as net from "net";
+import WebSocket from "ws";
 
-import Socket = require('.');
+import Socket from ".";
 
-declare namespace SocketServer {
-  type Options = WebSocket.ServerOptions;
-}
+export type SocketServerOptions = WebSocket.ServerOptions;
 
-declare class SocketServer extends EventEmitter {
-  options: SocketServer.Options;
+export default class SocketServer extends EventEmitter {
+  options: SocketServerOptions;
   path: string;
   clients: Set<WebSocket>;
 
-  constructor(options?: SocketServer.Options, callback?: () => void);
+  constructor(options?: SocketServerOptions, callback?: () => void);
 
   close(cb?: (err?: Error) => void): void;
   handleUpgrade(request: http.IncomingMessage, socket: net.Socket,
@@ -24,17 +22,45 @@ declare class SocketServer extends EventEmitter {
   shouldHandle(request: http.IncomingMessage): boolean;
 
   // Events
-  on(event: 'connection', cb: (socket: Socket, request: http.IncomingMessage) => void): this;
-  on(event: 'error', cb: (error: Error) => void): this;
-  on(event: 'headers', cb: (headers: string[], request: http.IncomingMessage) => void): this;
-  on(event: 'listening', cb: () => void): this;
+  addListener(event: "connection", cb: (client: Socket) => void): this;
+  addListener(event: "error", cb: (err: Error) => void): this;
+  addListener(event: "headers", cb: (headers: string[], request: http.IncomingMessage) => void): this;
+  addListener(event: "listening", cb: () => void): this;
+  addListener(event: string | symbol, listener: (...args: any[]) => void): this;
+
+  emit(event: "connection", socket: Socket): boolean;
+  emit(event: "error", error: Error): boolean;
+  emit(event: "headers", headers: string[], request: http.IncomingMessage): boolean;
+  emit(event: "listening"): boolean;
+  emit(event: string | symbol, ...args: any[]): boolean;
+
+  on(event: "connection", cb: (socket: Socket, request: http.IncomingMessage) => void): this;
+  on(event: "error", cb: (error: Error) => void): this;
+  on(event: "headers", cb: (headers: string[], request: http.IncomingMessage) => void): this;
+  on(event: "listening", cb: () => void): this;
   on(event: string | symbol, listener: (...args: any[]) => void): this;
 
-  addListener(event: 'connection', cb: (client: Socket) => void): this;
-  addListener(event: 'error', cb: (err: Error) => void): this;
-  addListener(event: 'headers', cb: (headers: string[], request: http.IncomingMessage) => void): this;
-  addListener(event: 'listening', cb: () => void): this;
-  addListener(event: string | symbol, listener: (...args: any[]) => void): this;
-}
+  once(event: "connection", cb: (socket: Socket, request: http.IncomingMessage) => void): this;
+  once(event: "error", cb: (error: Error) => void): this;
+  once(event: "headers", cb: (headers: string[], request: http.IncomingMessage) => void): this;
+  once(event: "listening", cb: () => void): this;
+  once(event: string | symbol, listener: (...args: any[]) => void): this;
 
-export = SocketServer;
+  prependListener(event: "connection", cb: (client: Socket) => void): this;
+  prependListener(event: "error", cb: (err: Error) => void): this;
+  prependListener(event: "headers", cb: (headers: string[], request: http.IncomingMessage) => void): this;
+  prependListener(event: "listening", cb: () => void): this;
+  prependListener(event: string | symbol, listener: (...args: any[]) => void): this;
+
+  prependOnceListener(event: "connection", cb: (client: Socket) => void): this;
+  prependOnceListener(event: "error", cb: (err: Error) => void): this;
+  prependOnceListener(event: "headers", cb: (headers: string[], request: http.IncomingMessage) => void): this;
+  prependOnceListener(event: "listening", cb: () => void): this;
+  prependOnceListener(event: string | symbol, listener: (...args: any[]) => void): this;
+
+  removeListener(event: "connection", cb: (client: Socket) => void): this;
+  removeListener(event: "error", cb: (err: Error) => void): this;
+  removeListener(event: "headers", cb: (headers: string[], request: http.IncomingMessage) => void): this;
+  removeListener(event: "listening", cb: () => void): this;
+  removeListener(event: string | symbol, listener: (...args: any[]) => void): this;
+}
diff --git a/types/simple-websocket/simple-websocket-tests.ts b/types/simple-websocket/simple-websocket-tests.ts
index 9d7d9af1ca..9103d1c191 100644
--- a/types/simple-websocket/simple-websocket-tests.ts
+++ b/types/simple-websocket/simple-websocket-tests.ts
@@ -1,4 +1,4 @@
-import Socket = require('simple-websocket');
+import Socket from "simple-websocket";
 
 if (Socket.WEBSOCKET_SUPPORT) {
   const socket = new Socket('ws://echo.websocket.org');
@@ -9,15 +9,16 @@ if (Socket.WEBSOCKET_SUPPORT) {
 
   socket.on('data', (data: string | Buffer) => {
     console.log('got message: ' + data);
-    // socket.destroy(() => {
-    //   console.log('socket destroyed');
-    // });
+  });
+
+  socket.on('error', (err: Error) => {
+    socket.destroy(err);
   });
 }
 
-import Server = require('simple-websocket/server');
+import Server from "simple-websocket/server";
 
-const server = new Server({ port: 8080 }); // see `ws` docs for other options
+const server = new Server({ port: 8080 });
 
 server.on('connection', (socket: Socket) => {
   socket.write('pong');
diff --git a/types/simple-websocket/tsconfig.json b/types/simple-websocket/tsconfig.json
index 09935e03b6..06b0fdd9da 100644
--- a/types/simple-websocket/tsconfig.json
+++ b/types/simple-websocket/tsconfig.json
@@ -14,7 +14,8 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true
+        "forceConsistentCasingInFileNames": true,
+        "esModuleInterop": true
     },
     "files": [
         "index.d.ts",

From ade295856bf971b2d3cb2b294ce0aebef88e1ea0 Mon Sep 17 00:00:00 2001
From: Piotr Roszatycki <piotr.roszatycki@gmail.com>
Date: Tue, 20 Feb 2018 17:58:13 +0100
Subject: [PATCH 0069/1382] dtslint: fix no-import-default-of-export-equals

---
 types/simple-websocket/index.d.ts  | 2 +-
 types/simple-websocket/server.d.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/simple-websocket/index.d.ts b/types/simple-websocket/index.d.ts
index 5e79241ff1..fa4a5d492c 100644
--- a/types/simple-websocket/index.d.ts
+++ b/types/simple-websocket/index.d.ts
@@ -6,7 +6,7 @@
 /// <reference types="node" />
 
 import { Duplex, DuplexOptions } from "stream";
-import WebSocket from "ws";
+import WebSocket = require("ws");
 
 export interface SocketOptions extends DuplexOptions {
   /** websocket server url */
diff --git a/types/simple-websocket/server.d.ts b/types/simple-websocket/server.d.ts
index b9694444f0..ec88a300ff 100644
--- a/types/simple-websocket/server.d.ts
+++ b/types/simple-websocket/server.d.ts
@@ -3,7 +3,7 @@
 import { EventEmitter } from "events";
 import * as http from "http";
 import * as net from "net";
-import WebSocket from "ws";
+import WebSocket = require("ws");
 
 import Socket from ".";
 

From c69f7de87e14887ea2fb903235737c82d64b8f97 Mon Sep 17 00:00:00 2001
From: Almir Kadric <github@almirkadric.com>
Date: Wed, 21 Feb 2018 02:31:55 +0900
Subject: [PATCH 0070/1382] added missing properties to NativeRouter and fixed
 Link component type

---
 types/react-router-native/index.d.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/types/react-router-native/index.d.ts b/types/react-router-native/index.d.ts
index 4a14dce8dc..7adbdcf4f3 100644
--- a/types/react-router-native/index.d.ts
+++ b/types/react-router-native/index.d.ts
@@ -31,7 +31,7 @@ export class AndroidBackButton extends React.Component<AndroidBackButtonProps> {
 export class DeepLinking extends React.Component {}
 
 export interface LinkProps {
-  component?: React.Component;
+  component?: React.Component | React.ComponentClass;
   replace?: boolean;
   style?: any;
   to: H.LocationDescriptor;
@@ -40,6 +40,8 @@ export interface LinkProps {
 export class Link extends React.Component<LinkProps> {}
 
 export interface NativeRouterProps {
+  initialEntries?: string[];
+  initialIndex?: number;
   getUserConfirmation?: Function;
   keyLength?: number;
 }

From ddd58d8476490dc32ce78026839336b735ab5dd8 Mon Sep 17 00:00:00 2001
From: Almir Kadric <github@almirkadric.com>
Date: Wed, 21 Feb 2018 02:51:22 +0900
Subject: [PATCH 0071/1382] fixed Link type to accept any property as it will
 proxy them to the given component

---
 types/react-router-native/index.d.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/types/react-router-native/index.d.ts b/types/react-router-native/index.d.ts
index 7adbdcf4f3..600ac53ce9 100644
--- a/types/react-router-native/index.d.ts
+++ b/types/react-router-native/index.d.ts
@@ -37,7 +37,14 @@ export interface LinkProps {
   to: H.LocationDescriptor;
 }
 
-export class Link extends React.Component<LinkProps> {}
+/**
+ * Disable the "no-any-union" rule here as the Link component can accept any property.
+ * It will feed them to the given component. However if we just use any we will lose
+ * autocomplete on known properties. So it is better to disable this rule in this one
+ * instance.
+ */
+// tslint:disable-next-line:no-any-union
+export class Link extends React.Component<LinkProps | any> {}
 
 export interface NativeRouterProps {
   initialEntries?: string[];

From d7ee161569535bbac6ba3cb2af3dc59633f459e4 Mon Sep 17 00:00:00 2001
From: Piotr Roszatycki <piotr.roszatycki@gmail.com>
Date: Tue, 20 Feb 2018 20:23:41 +0100
Subject: [PATCH 0072/1382] New typings for csv2json

---
 types/csv2json/csv2json-tests.ts |  8 ++++++++
 types/csv2json/index.d.ts        | 15 +++++++++++++++
 types/csv2json/tsconfig.json     | 23 +++++++++++++++++++++++
 types/csv2json/tslint.json       |  1 +
 4 files changed, 47 insertions(+)
 create mode 100644 types/csv2json/csv2json-tests.ts
 create mode 100644 types/csv2json/index.d.ts
 create mode 100644 types/csv2json/tsconfig.json
 create mode 100644 types/csv2json/tslint.json

diff --git a/types/csv2json/csv2json-tests.ts b/types/csv2json/csv2json-tests.ts
new file mode 100644
index 0000000000..269d4c2dfe
--- /dev/null
+++ b/types/csv2json/csv2json-tests.ts
@@ -0,0 +1,8 @@
+import csv2json from "csv2json";
+import fs from "fs";
+
+fs.createReadStream('data.csv')
+  .pipe(csv2json({
+    separator: ';'
+  }))
+  .pipe(fs.createWriteStream('data.json'));
diff --git a/types/csv2json/index.d.ts b/types/csv2json/index.d.ts
new file mode 100644
index 0000000000..f1c08c3e7c
--- /dev/null
+++ b/types/csv2json/index.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for csv2json 1.4
+// Project: https://github.com/julien-f/csv2json
+// Definitions by: Piotr Roszatycki <https://github.com/dex4er>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import { Writable } from "stream";
+
+export interface CSV2JSONOptions {
+  dynamicTyping?: boolean;
+  separator?: string;
+}
+
+export default function csv2json (options: CSV2JSONOptions): Writable;
diff --git a/types/csv2json/tsconfig.json b/types/csv2json/tsconfig.json
new file mode 100644
index 0000000000..e9840faef7
--- /dev/null
+++ b/types/csv2json/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "esModuleInterop": true
+    },
+    "files": [
+        "index.d.ts",
+        "csv2json-tests.ts"
+    ]
+}
diff --git a/types/csv2json/tslint.json b/types/csv2json/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/csv2json/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 20be1b2329f13c8b8f8a42d07cad308a999e27d8 Mon Sep 17 00:00:00 2001
From: Piotr Roszatycki <piotr.roszatycki@gmail.com>
Date: Tue, 20 Feb 2018 20:43:12 +0100
Subject: [PATCH 0073/1382] linter clean

---
 types/csv2json/index.d.ts    | 3 ++-
 types/csv2json/tsconfig.json | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/types/csv2json/index.d.ts b/types/csv2json/index.d.ts
index f1c08c3e7c..1ea9d5c6eb 100644
--- a/types/csv2json/index.d.ts
+++ b/types/csv2json/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/julien-f/csv2json
 // Definitions by: Piotr Roszatycki <https://github.com/dex4er>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.7
 
 /// <reference types="node" />
 
@@ -12,4 +13,4 @@ export interface CSV2JSONOptions {
   separator?: string;
 }
 
-export default function csv2json (options: CSV2JSONOptions): Writable;
+export default function csv2json(options: CSV2JSONOptions): Writable;
diff --git a/types/csv2json/tsconfig.json b/types/csv2json/tsconfig.json
index e9840faef7..79a635ca7d 100644
--- a/types/csv2json/tsconfig.json
+++ b/types/csv2json/tsconfig.json
@@ -6,6 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
+        "strictFunctionTypes": true,
         "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [

From f602a6db7619a426bd9e814b38a9439c4fb44f31 Mon Sep 17 00:00:00 2001
From: Piotr Roszatycki <piotr.roszatycki@gmail.com>
Date: Tue, 20 Feb 2018 21:12:37 +0100
Subject: [PATCH 0074/1382] This typings is for TypeScript 2.7 only but
 Microsoft/definitelytyped-header-parser#11 is not fixed

---
 types/csv2json/csv2json-tests.ts | 2 +-
 types/csv2json/index.d.ts        | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/types/csv2json/csv2json-tests.ts b/types/csv2json/csv2json-tests.ts
index 269d4c2dfe..9e4e6cbdd3 100644
--- a/types/csv2json/csv2json-tests.ts
+++ b/types/csv2json/csv2json-tests.ts
@@ -1,5 +1,5 @@
 import csv2json from "csv2json";
-import fs from "fs";
+import fs = require("fs");
 
 fs.createReadStream('data.csv')
   .pipe(csv2json({
diff --git a/types/csv2json/index.d.ts b/types/csv2json/index.d.ts
index 1ea9d5c6eb..713f4a05bc 100644
--- a/types/csv2json/index.d.ts
+++ b/types/csv2json/index.d.ts
@@ -2,7 +2,6 @@
 // Project: https://github.com/julien-f/csv2json
 // Definitions by: Piotr Roszatycki <https://github.com/dex4er>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.7
 
 /// <reference types="node" />
 

From 480c8a8ba81b38b71c7cf57b800ea0c6cdefa44d Mon Sep 17 00:00:00 2001
From: Josh Goldberg <josh@fullscreenmario.com>
Date: Tue, 20 Feb 2018 15:30:53 -0500
Subject: [PATCH 0075/1382] Removed "dom" from React types tsconfig.json

---
 types/react/global.d.ts   |  5 ++++-
 types/react/index.d.ts    |  1 +
 types/react/test/index.ts | 16 +++++++++-------
 types/react/tsconfig.json |  3 +--
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/types/react/global.d.ts b/types/react/global.d.ts
index 23af6dc7a3..c647e7239b 100644
--- a/types/react/global.d.ts
+++ b/types/react/global.d.ts
@@ -1,5 +1,5 @@
 /*
-React projects that don't include the DOM library need these interfaces to compile.
+React projects that don't include the DOM library these interfaces need to compile.
 React Native applications use React, but there is no DOM available. The JavaScript runtime
 is ES6/ES2015 only. These definitions allow such projects to compile with only `--lib ES6`.
 */
@@ -33,6 +33,7 @@ interface HTMLBodyElement extends HTMLElement { }
 interface HTMLBRElement extends HTMLElement { }
 interface HTMLButtonElement extends HTMLElement { }
 interface HTMLCanvasElement extends HTMLElement { }
+interface HTMLDialogElement extends HTMLElement { }
 interface HTMLDivElement extends HTMLElement { }
 interface HTMLDListElement extends HTMLElement { }
 interface HTMLEmbedElement extends HTMLElement { }
@@ -175,3 +176,5 @@ interface SVGTextPathElement extends SVGElement { }
 interface SVGTSpanElement extends SVGElement { }
 interface SVGUseElement extends SVGElement { }
 interface SVGViewElement extends SVGElement { }
+
+interface TouchList { }
diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index c39e5eeb6c..24884576ff 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -14,6 +14,7 @@
 //                 Stéphane Goetz <https://github.com/onigoetz>
 //                 Rich Seviora <https://github.com/richseviora>
 //                 Josh Rutherford <https://github.com/theruther4d>
+//                 Josh Goldberg <https://github.com/joshuakgoldberg>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
diff --git a/types/react/test/index.ts b/types/react/test/index.ts
index 757a1da669..e0e4a09065 100644
--- a/types/react/test/index.ts
+++ b/types/react/test/index.ts
@@ -44,7 +44,7 @@ const props: Props & React.ClassAttributes<{}> = {
     foo: 42
 };
 
-const container: Element = document.createElement("div");
+declare const container: Element;
 
 //
 // Top-Level API
@@ -226,9 +226,9 @@ const clonedSvgElement: React.ReactSVGElement =
 const component: ModernComponent = ReactDOM.render(element, container);
 const componentNullContainer: ModernComponent = ReactDOM.render(element, null);
 
-const componentElementOrNull: ModernComponent = ReactDOM.render(element, document.getElementById("anelement"));
+const componentElementOrNull: ModernComponent = ReactDOM.render(element, container);
 const componentNoState: ModernComponentNoState = ReactDOM.render(elementNoState, container);
-const componentNoStateElementOrNull: ModernComponentNoState = ReactDOM.render(elementNoState, document.getElementById("anelement"));
+const componentNoStateElementOrNull: ModernComponentNoState = ReactDOM.render(elementNoState, container);
 const domComponent: Element = ReactDOM.render(domElement, container);
 
 // Other Top-Level API
@@ -313,7 +313,7 @@ const htmlAttr: React.HTMLProps<HTMLElement> = {
         event.stopPropagation();
     },
     onAnimationStart: event => {
-        console.log(event.currentTarget.className);
+        const currentTarget: EventTarget & HTMLElement = event.currentTarget;
     },
     dangerouslySetInnerHTML: {
         __html: "<strong>STRONG</strong>"
@@ -624,7 +624,7 @@ if (TestUtils.isElementOfType(emptyElement2, StatelessComponent)) {
 }
 
 if (TestUtils.isDOMComponent(container)) {
-    container.getAttribute("className");
+    const reassignedContainer: Element = container;
 } else if (TestUtils.isCompositeComponent(new ModernComponent({ hello: 'hi', foo: 3 }))) {
     new ModernComponent({ hello: 'hi', foo: 3 }).props;
 }
@@ -670,7 +670,9 @@ class SyntheticEventTargetValue extends React.Component<{}, { value: string }> {
     render() {
         return DOM.textarea({
             value: this.state.value,
-            onChange: e => this.setState({ value: e.target.value })
+            onChange: e => {
+                const target: HTMLTextAreaElement = e.target;
+            }
         });
     }
 }
@@ -678,7 +680,7 @@ class SyntheticEventTargetValue extends React.Component<{}, { value: string }> {
 DOM.input({
     onChange: event => {
         // `event.target` is guaranteed to be HTMLInputElement
-        event.target.value;
+        const target: HTMLInputElement = event.target;
     }
 });
 
diff --git a/types/react/tsconfig.json b/types/react/tsconfig.json
index 1b79768acc..b999a338b3 100644
--- a/types/react/tsconfig.json
+++ b/types/react/tsconfig.json
@@ -8,8 +8,7 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es6",
-            "dom"
+            "es6"
         ],
         "noImplicitAny": true,
         "noImplicitThis": false,

From 2cd2bd872694741753a201574a8168a4a913cdb2 Mon Sep 17 00:00:00 2001
From: Alex Regan <alex.joseph.regan@gmail.com>
Date: Tue, 20 Feb 2018 15:09:07 -0700
Subject: [PATCH 0076/1382] fix(bull): adds `Queue.process` overloads

---
 types/bull/index.d.ts | 59 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/types/bull/index.d.ts b/types/bull/index.d.ts
index a7a9ea350b..a77552cb9a 100644
--- a/types/bull/index.d.ts
+++ b/types/bull/index.d.ts
@@ -265,6 +265,24 @@ declare namespace Bull {
      */
     process(callback: (job: Job, done: DoneCallback) => void): void;
 
+    /**
+     * Defines a processing function for the jobs placed into a given Queue.
+     *
+     * The handlerPath defines the path to the job callback.
+     * Using a handlerPath has several advantages:
+     * - The process is sandboxed so if it crashes it does not affect the worker.
+     * - You can run blocking code without affecting the queue (jobs will not stall).
+     * - Much better utilization of multi-core CPUs.
+     * - Less connections to redis.
+     *
+     * It is passed an instance of the job as first argument.
+     *
+     * A promise must be returned to signal job completion.
+     * If the promise is rejected, the error will be passed as a second argument to the "failed" event.
+     * If it is resolved, its value will be the "completed" event's second argument.
+     */
+    process(handlerPath: string): void;
+
     /**
      * Defines a processing function for the jobs placed into a given Queue.
      *
@@ -291,6 +309,26 @@ declare namespace Bull {
      */
     process(concurrency: number, callback: (job: Job) => void): Promise<any>;
 
+    /**
+     * Defines a processing function for the jobs placed into a given Queue.
+     *
+     * The handlerPath defines the path to the job callback.
+     * Using a handlerPath has several advantages:
+     * - The process is sandboxed so if it crashes it does not affect the worker.
+     * - You can run blocking code without affecting the queue (jobs will not stall).
+     * - Much better utilization of multi-core CPUs.
+     * - Less connections to redis.
+     *
+     * It is passed an instance of the job as first argument.
+     *
+     * A promise must be returned to signal job completion.
+     * If the promise is rejected, the error will be passed as a second argument to the "failed" event.
+     * If it is resolved, its value will be the "completed" event's second argument.
+     *
+     * @param concurrency Bull will then call you handler in parallel respecting this max number.
+     */
+    process(concurrency: number, handlerPath: string): void;
+
     /**
      * Defines a processing function for the jobs placed into a given Queue.
      *
@@ -337,6 +375,27 @@ declare namespace Bull {
     // tslint:disable-next-line:unified-signatures
     process(name: string, callback: (job: Job, done: DoneCallback) => void): void;
 
+    /**
+     * Defines a processing function for the jobs placed into a given Queue.
+     *
+     * The handlerPath defines the path to the job callback.
+     * Using a handlerPath has several advantages:
+     * - The process is sandboxed so if it crashes it does not affect the worker.
+     * - You can run blocking code without affecting the queue (jobs will not stall).
+     * - Much better utilization of multi-core CPUs.
+     * - Less connections to redis.
+     *
+     * It is passed an instance of the job as first argument.
+     *
+     * A promise must be returned to signal job completion.
+     * If the promise is rejected, the error will be passed as a second argument to the "failed" event.
+     * If it is resolved, its value will be the "completed" event's second argument.
+     *
+     * @param name Bull will only call the handler if the job name matches
+     * @param concurrency Bull will then call you handler in parallel respecting this max number.
+     */
+    process(name: string, concurrency: number, handlerPath: string): void;
+
     /**
      * Defines a named processing function for the jobs placed into a given Queue.
      *

From ebcbc212b7da009de20e1802c05b8f66ec7c2be5 Mon Sep 17 00:00:00 2001
From: Alex Regan <alex.joseph.regan@gmail.com>
Date: Tue, 20 Feb 2018 15:20:04 -0700
Subject: [PATCH 0077/1382] fix(bull): merge overload decls with same arity

---
 types/bull/index.d.ts | 87 +++++++++++++------------------------------
 1 file changed, 26 insertions(+), 61 deletions(-)

diff --git a/types/bull/index.d.ts b/types/bull/index.d.ts
index a77552cb9a..77317c44ff 100644
--- a/types/bull/index.d.ts
+++ b/types/bull/index.d.ts
@@ -257,31 +257,19 @@ declare namespace Bull {
      *
      * The callback is called everytime a job is placed in the queue.
      * It is passed an instance of the job as first argument.
+     * The callback can also be defined as the string path to a module
+     * exporting the callback function. Using a path has several advantages:
+     * - The process is sandboxed so if it crashes it does not affect the worker.
+     * - You can run blocking code without affecting the queue (jobs will not stall).
+     * - Much better utilization of multi-core CPUs.
+     * - Less connections to redis.
      *
      * The done callback can be called with an Error instance, to signal that the job did not complete successfully,
      * or with a result as second argument as second argument (e.g.: done(null, result);) when the job is successful.
      * Errors will be passed as a second argument to the "failed" event;
      * results, as a second argument to the "completed" event.
      */
-    process(callback: (job: Job, done: DoneCallback) => void): void;
-
-    /**
-     * Defines a processing function for the jobs placed into a given Queue.
-     *
-     * The handlerPath defines the path to the job callback.
-     * Using a handlerPath has several advantages:
-     * - The process is sandboxed so if it crashes it does not affect the worker.
-     * - You can run blocking code without affecting the queue (jobs will not stall).
-     * - Much better utilization of multi-core CPUs.
-     * - Less connections to redis.
-     *
-     * It is passed an instance of the job as first argument.
-     *
-     * A promise must be returned to signal job completion.
-     * If the promise is rejected, the error will be passed as a second argument to the "failed" event.
-     * If it is resolved, its value will be the "completed" event's second argument.
-     */
-    process(handlerPath: string): void;
+    process(callback: (job: Job, done: DoneCallback) => void | string): void;
 
     /**
      * Defines a processing function for the jobs placed into a given Queue.
@@ -312,29 +300,15 @@ declare namespace Bull {
     /**
      * Defines a processing function for the jobs placed into a given Queue.
      *
-     * The handlerPath defines the path to the job callback.
-     * Using a handlerPath has several advantages:
+     * The callback is called everytime a job is placed in the queue.
+     * It is passed an instance of the job as first argument.
+     * The callback can also be defined as the string path to a module
+     * exporting the callback function. Using a path has several advantages:
      * - The process is sandboxed so if it crashes it does not affect the worker.
      * - You can run blocking code without affecting the queue (jobs will not stall).
      * - Much better utilization of multi-core CPUs.
      * - Less connections to redis.
      *
-     * It is passed an instance of the job as first argument.
-     *
-     * A promise must be returned to signal job completion.
-     * If the promise is rejected, the error will be passed as a second argument to the "failed" event.
-     * If it is resolved, its value will be the "completed" event's second argument.
-     *
-     * @param concurrency Bull will then call you handler in parallel respecting this max number.
-     */
-    process(concurrency: number, handlerPath: string): void;
-
-    /**
-     * Defines a processing function for the jobs placed into a given Queue.
-     *
-     * The callback is called everytime a job is placed in the queue.
-     * It is passed an instance of the job as first argument.
-     *
      * The done callback can be called with an Error instance, to signal that the job did not complete successfully,
      * or with a result as second argument as second argument (e.g.: done(null, result);) when the job is successful.
      * Errors will be passed as a second argument to the "failed" event;
@@ -342,7 +316,7 @@ declare namespace Bull {
      *
      * @param concurrency Bull will then call you handler in parallel respecting this max number.
      */
-    process(concurrency: number, callback: (job: Job, done: DoneCallback) => void): void;
+    process(concurrency: number, callback: (job: Job, done: DoneCallback) => void | string): void;
 
     /**
      * Defines a named processing function for the jobs placed into a given Queue.
@@ -364,6 +338,12 @@ declare namespace Bull {
      *
      * The callback is called everytime a job is placed in the queue.
      * It is passed an instance of the job as first argument.
+     * The callback can also be defined as the string path to a module
+     * exporting the callback function. Using a path has several advantages:
+     * - The process is sandboxed so if it crashes it does not affect the worker.
+     * - You can run blocking code without affecting the queue (jobs will not stall).
+     * - Much better utilization of multi-core CPUs.
+     * - Less connections to redis.
      *
      * The done callback can be called with an Error instance, to signal that the job did not complete successfully,
      * or with a result as second argument as second argument (e.g.: done(null, result);) when the job is successful.
@@ -373,28 +353,7 @@ declare namespace Bull {
      * @param name Bull will only call the handler if the job name matches
      */
     // tslint:disable-next-line:unified-signatures
-    process(name: string, callback: (job: Job, done: DoneCallback) => void): void;
-
-    /**
-     * Defines a processing function for the jobs placed into a given Queue.
-     *
-     * The handlerPath defines the path to the job callback.
-     * Using a handlerPath has several advantages:
-     * - The process is sandboxed so if it crashes it does not affect the worker.
-     * - You can run blocking code without affecting the queue (jobs will not stall).
-     * - Much better utilization of multi-core CPUs.
-     * - Less connections to redis.
-     *
-     * It is passed an instance of the job as first argument.
-     *
-     * A promise must be returned to signal job completion.
-     * If the promise is rejected, the error will be passed as a second argument to the "failed" event.
-     * If it is resolved, its value will be the "completed" event's second argument.
-     *
-     * @param name Bull will only call the handler if the job name matches
-     * @param concurrency Bull will then call you handler in parallel respecting this max number.
-     */
-    process(name: string, concurrency: number, handlerPath: string): void;
+    process(name: string, callback: (job: Job, done: DoneCallback) => void | string): void;
 
     /**
      * Defines a named processing function for the jobs placed into a given Queue.
@@ -416,6 +375,12 @@ declare namespace Bull {
      *
      * The callback is called everytime a job is placed in the queue.
      * It is passed an instance of the job as first argument.
+     * The callback can also be defined as the string path to a module
+     * exporting the callback function. Using a path has several advantages:
+     * - The process is sandboxed so if it crashes it does not affect the worker.
+     * - You can run blocking code without affecting the queue (jobs will not stall).
+     * - Much better utilization of multi-core CPUs.
+     * - Less connections to redis.
      *
      * The done callback can be called with an Error instance, to signal that the job did not complete successfully,
      * or with a result as second argument as second argument (e.g.: done(null, result);) when the job is successful.
@@ -425,7 +390,7 @@ declare namespace Bull {
      * @param name Bull will only call the handler if the job name matches
      * @param concurrency Bull will then call you handler in parallel respecting this max number.
      */
-    process(name: string, concurrency: number, callback: (job: Job, done: DoneCallback) => void): void;
+    process(name: string, concurrency: number, callback: (job: Job, done: DoneCallback) => void | string): void;
 
     /**
      * Creates a new job and adds it to the queue.

From 79e131eedb00e9ff7a4f72c9cf9d71a7c29c39c7 Mon Sep 17 00:00:00 2001
From: Andrea Ascari <andrea.ascari@buildo.io>
Date: Wed, 21 Feb 2018 16:33:57 +0100
Subject: [PATCH 0078/1382] Removed default base type for inferred types

---
 types/react-native-auth0/index.d.ts | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/types/react-native-auth0/index.d.ts b/types/react-native-auth0/index.d.ts
index 45016da9ca..152da0655c 100644
--- a/types/react-native-auth0/index.d.ts
+++ b/types/react-native-auth0/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-native 1.2
+// Type definitions for react-native-auth0 1.2
 // Project: https://github.com/auth0/react-native-auth0
 // Definitions by: Andrea Ascari <https://github.com/ascariandrea>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -14,7 +14,7 @@ export interface AuthorizationUrlParams {
     state: string;
 }
 
-export interface CreateUserParams<T extends any> {
+export interface CreateUserParams<T> {
     email: string;
     username?: string;
     password: string;
@@ -80,7 +80,7 @@ export interface UserInfo {
 }
 export class Auth {
     authorizationUrl(params: AuthorizationUrlParams): string;
-    createUser(user: CreateUserParams<any>): Promise<CreateUserResponse>;
+    createUser<T>(user: CreateUserParams<T>): Promise<CreateUserResponse>;
     exchange(params: ExchangeParams): Promise<string>;
     logoutUrl(params: LogoutParams): string;
     passwordRealm(params: PasswordRealmParams): Promise<PasswordRealmResponse>;
@@ -121,10 +121,8 @@ export interface PatchUserParams<T> {
 export class Users {
     constructor(options: UsersOptions);
     /* tslint:disable-next-line no-unnecessary-generics */
-    getUser<T extends any>(parameters: GetUserParams): Promise<Auth0User<T>>;
-    patchUser<T extends any>(
-        parameters: PatchUserParams<T>
-    ): Promise<Auth0User<T>>;
+    getUser<T>(parameters: GetUserParams): Promise<Auth0User<T>>;
+    patchUser<T>(parameters: PatchUserParams<T>): Promise<Auth0User<T>>;
 }
 
 export const users: Users;
@@ -145,7 +143,7 @@ export interface ClearSessionParams {
 
 export class WebAuth {
     authorize(parameters: AuthorizeParams): Promise<any>;
-    clearSession(parameters: ClearSessionParams): Promise<any>;
+    clearSession(parameters?: ClearSessionParams): Promise<any>;
 }
 
 export interface UsersOptions {

From 433cfd71382c4c31d376525b2461edc01d54e25d Mon Sep 17 00:00:00 2001
From: Andrea Ascari <andrea.ascari@buildo.io>
Date: Wed, 21 Feb 2018 16:40:29 +0100
Subject: [PATCH 0079/1382] Add test for clearSession invoked without params

---
 types/react-native-auth0/react-native-auth0-tests.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/react-native-auth0/react-native-auth0-tests.ts b/types/react-native-auth0/react-native-auth0-tests.ts
index 53eca829eb..3f659cbdee 100644
--- a/types/react-native-auth0/react-native-auth0-tests.ts
+++ b/types/react-native-auth0/react-native-auth0-tests.ts
@@ -57,6 +57,7 @@ auth0.webAuth.authorize({
 });
 
 auth0.webAuth.clearSession({ federated: false });
+auth0.webAuth.clearSession();
 
 auth0.users("token").getUser({ id: "userId" });
 

From 38f5479744a0f81236af6f4c86bde62eead501c1 Mon Sep 17 00:00:00 2001
From: Aluan Haddad <aluanh@gmail.com>
Date: Wed, 21 Feb 2018 18:01:41 -0500
Subject: [PATCH 0080/1382] fix import in window module test

---
 types/jquery/test/jquery-window-module-tests.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/jquery/test/jquery-window-module-tests.ts b/types/jquery/test/jquery-window-module-tests.ts
index 71e20bc4a0..6bc5486fb9 100644
--- a/types/jquery/test/jquery-window-module-tests.ts
+++ b/types/jquery/test/jquery-window-module-tests.ts
@@ -1,4 +1,4 @@
-import * as jq from 'jquery';
+import jq = require('jquery');
 
 const $window = jq(window);
 // $ExpectType JQuery<HTMLElement>

From 8acf1ae42963dcfe82e0ebb74a897c4a6a5aa033 Mon Sep 17 00:00:00 2001
From: Aluan Haddad <aluanh@gmail.com>
Date: Wed, 21 Feb 2018 18:10:15 -0500
Subject: [PATCH 0081/1382] fix import in another test

---
 types/jquery/test/jquery-slim-window-module-tests.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/jquery/test/jquery-slim-window-module-tests.ts b/types/jquery/test/jquery-slim-window-module-tests.ts
index 76870e7a04..b47707cb23 100644
--- a/types/jquery/test/jquery-slim-window-module-tests.ts
+++ b/types/jquery/test/jquery-slim-window-module-tests.ts
@@ -1,4 +1,4 @@
-import * as jq from 'jquery/dist/jquery.slim';
+import jq = require('jquery/dist/jquery.slim');
 
 const $window = jq(window);
 // $ExpectType JQuery<HTMLElement>

From bf9864b51f6d7d0b9fa3410cbe00d7cad47aa337 Mon Sep 17 00:00:00 2001
From: Kyle Buzby <kbuzby@epic.com>
Date: Wed, 21 Feb 2018 17:26:28 -0600
Subject: [PATCH 0082/1382] roughly complete documented types from the web site

TODO: update function signatures for parameters that are functions
---
 types/postman-collection/index.d.ts | 2733 ++++++---------------------
 1 file changed, 617 insertions(+), 2116 deletions(-)

diff --git a/types/postman-collection/index.d.ts b/types/postman-collection/index.d.ts
index 1247493c85..5365b9cfaf 100644
--- a/types/postman-collection/index.d.ts
+++ b/types/postman-collection/index.d.ts
@@ -2,2300 +2,801 @@
 // Project: https://github.com/postmanlabs/postman-collection
 // Definitions by: Kyle Buzby <https://github.com/kbuzby>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+///<reference types="node" />
+            
+export class PropertyBase {
+    constructor(definition: any);
 
-declare module PostmanCollection {
-    export class Certificate {
-        constructor(options: any, ...args: any[]);
-    
-        canApplyTo(url: any): any;
-    
-        toJSON(): any;
-    
-        update(options: any): void;
-    
-        static isCertificate(obj: any): any;
-    
-    }
-    
-    export class CertificateList {
-        constructor(parent: any, list: any);
-    
-        resolveOne(url: any): any;
-    
-        static isCertificateList(obj: any): any;
-    
-    }
-    
-    export class Collection {
-        constructor(definition: any, environments: any);
-    
-        syncVariablesFrom(obj: any, track: any): any;
-    
-        syncVariablesTo(obj: any): any;
-    
-        toJSON(): any;
-    
-        static isCollection(obj: any): any;
-    
-    }
-    
-    export class Cookie {
-        constructor(options: any);
-    
-        update(options: any): void;
-    
-        valueOf(): any;
-    
-        static isCookie(obj: any): any;
-    
-        static parse(str: any): any;
-    
-        static splitParam(param: any): any;
-    
-    }
-    
-    export class Description {
-        constructor(definition: any);
-    
-        toJSON(): any;
-    
-        toString(): any;
-    
-        update(content: any, type: any): void;
-    
-        static isDescription(obj: any): any;
-    
-    }
-    
-    export class Event {
-        constructor(definition: any);
-    
-        update(definition: any): void;
-    
-    }
-    
-    export class EventList {
-        constructor(parent: any, populate: any);
-    
-        listeners(name: any): any;
-    
-        listenersOwn(name: any): any;
-    
-        static isEventList(obj: any): any;
-    
-    }
-    
-    export class FormParam {
-        constructor(options: any, ...args: any[]);
-    
-        toString(): any;
-    
-        valueOf(): any;
-    
-        static parse(): void;
-    
-    }
-    
-    export class Header {
-        constructor(options: any, name: any, ...args: any[]);
-    
-        toString(): any;
-    
-        update(options: any): void;
-    
-        valueOf(): any;
-    
-        static create(...args: any[]): any;
-    
-        static isHeader(obj: any): any;
-    
-        static parse(headerString: any): any;
-    
-        static parseSingle(header: any): any;
-    
-        static unparse(headers: any, separator: any): any;
-    
-        static unparseSingle(header: any): any;
-    
-    }
-    
-    export class HeaderList {
-        constructor(parent: any, headers: any);
-    
-        contentSize(): any;
-    
-        static isHeaderList(obj: any): any;
-    
-    }
-    
-    export class Item {
-        constructor(definition: any, ...args: any[]);
-    
-        authorizeRequestUsing(type: any, options: any): any;
-    
-        getAuth(): any;
-    
-        getEvents(name: any): any;
-    
-        static isItem(obj: any): any;
-    
-    }
-    
-    export class ItemGroup {
-        constructor(definition: any, ...args: any[]);
-    
-        authorizeRequestsUsing(type: any, options: any): void;
-    
-        forEachItem(callback: any): any;
-    
-        forEachItemGroup(callback: any): void;
-    
-        oneDeep(idOrName: any): any;
-    
-        static isItemGroup(obj: any): any;
-    
-    }
-    
-    export class Property {
-        constructor(definition: any, ...args: any[]);
-    
-        describe(content: any, type: any): void;
-    
-        toObjectResolved(scope: any, overrides: any, options: any): any;
-    
-        static replaceSubstitutions(str: any, variables: any, ...args: any[]): any;
-    
-        static replaceSubstitutionsIn(obj: any, variables: any, mutate: any): any;
-    
-    }
-    
-    export class PropertyBase {
-        constructor(definition: any);
-    
-        findInParents(property: any, customizer: any): any;
-    
-        findParentContaining(property: any, customizer: any): any;
-    
-        forEachParent(options: any, iterator: any): void;
-    
-        meta(...args: any[]): any;
-    
-        parent(): any;
-    
-        setParent(parent: any): void;
-    
-        toJSON(): any;
-    
-        static propertyIsMeta(value: any, key: any): any;
-    
-        static propertyUnprefixMeta(value: any, key: any): any;
-    
-        static toJSON(obj: any): any;
-    
-    }
-    
-    export class PropertyList {
-        constructor(type: any, parent: any, populate: any);
-    
-        add(item: any, ...args: any[]): void;
-    
-        all(): any;
-    
-        append(item: any): any;
-    
-        assimilate(source: any, prune: any): void;
-    
-        clear(): void;
-    
-        count(): any;
-    
-        each(iterator: any, context: any): void;
-    
-        eachParent(iterator: any, context: any): void;
-    
-        filter(rule: any, context: any): any;
-    
-        find(rule: any, context: any): any;
-    
-        get(key: any): any;
-    
-        has(item: any, value: any, ...args: any[]): any;
-    
-        idx(index: any): any;
-    
-        indexOf(item: any): any;
-    
-        insert(item: any, before: any): void;
-    
-        insertAfter(item: any, after: any): any;
-    
-        map(iterator: any, context: any): any;
-    
-        one(id: any): any;
-    
-        populate(items: any): void;
-    
-        prepend(item: any): any;
-    
-        remove(predicate: any, context: any, ...args: any[]): any;
-    
-        repopulate(items: any): void;
-    
-        toJSON(): any;
-    
-        toObject(excludeDisabled: any, caseSensitive: any, multiValue: any, sanitizeKeys: any): any;
-    
-        toString(): any;
-    
-        upsert(item: any): any;
-    
-        static isPropertyList(obj: any): any;
-    
-    }
-    
-    export class ProxyConfig {
-        constructor(options: any);
-    
-        getProtocols(): any;
-    
-        getProxyUrl(): any;
-    
-        test(urlStr: any): any;
-    
-        update(options: any): void;
-    
-        updateProtocols(protocols: any): void;
-    
-        static isProxyConfig(obj: any): any;
-    
-    }
-    
-    export class ProxyConfigList {
-        constructor(parent: any, populate: any);
-    
-        resolve(url: any): any;
-    
-        static isProxyConfigList(obj: any): any;
-    
-    }
-    
-    export class QueryParam {
-        constructor(options: any, ...args: any[]);
-    
-        toString(): any;
-    
-        update(param: any): void;
-    
-        valueOf(): any;
-    
-        static parse(query: any): any;
-    
-        static parseSingle(param: any, idx: any, all: any): any;
-    
-        static unparse(params: any, options: any): any;
-    
-        static unparseSingle(obj: any, encode: any): any;
-    
-    }
-    
-    export class Request {
-        constructor(options: any, ...args: any[]);
-    
-        addHeader(header: any): void;
-    
-        addQueryParams(params: any): void;
-    
-        authorize(): void;
-    
-        authorizeUsing(type: any, options: any): void;
-    
-        clone(): any;
-    
-        forEachHeader(callback: any): any;
-    
-        getHeaders(options: any): any;
-    
-        removeHeader(toRemove: any, options: any): any;
-    
-        removeQueryParams(params: any): void;
-    
-        toJSON(): any;
-    
-        update(options: any): void;
-    
-        upsertHeader(header: any): any;
-    
-        static isRequest(obj: any): any;
-    
-    }
-    
-    export class RequestAuth {
-        constructor(options: any, parent: any);
-    
-        clear(type: any): void;
-    
-        current(): any;
-    
-        parameters(): any;
-    
-        update(options: any, type: any): void;
-    
-        use(type: any, options: any): void;
-    
-        static isValidType(type: any): any;
-    
-    }
-    
-    export class RequestBody {
-        constructor(options: any, ...args: any[]);
-    
-        isEmpty(): any;
-    
-        toString(): any;
-    
-        update(options: any): void;
-    
-        static MODES: {
-            file: string;
-            formdata: string;
-            raw: string;
-            urlencoded: string;
-        };
-    
-    }
-    
-    export class Response {
-        constructor(options: any, ...args: any[]);
-    
-        dataURI(): any;
-    
-        details(): any;
-    
-        encoding(): any;
-    
-        json(reviver: any, strict: any): any;
-    
-        mime(contentType: any, contentDisposition: any): any;
-    
-        reason(): any;
-    
-        size(): any;
-    
-        text(): any;
-    
-        toJSON(): any;
-    
-        update(options: any): void;
-    
-        static createFromNode(response: any, cookies: any): any;
-    
-        static isResponse(obj: any): any;
-    
-        static mimeInfo(type: any, disposition: any): any;
-    
-    }
-    
-    export class Script {
-        constructor(options: any, ...args: any[]);
-    
-        toSource(): any;
-    
-        update(options: any): void;
-    
-        static isScript(obj: any): any;
-    
-    }
-    
-    export class Url {
-        constructor(options: any, ...args: any[]);
-    
-        addQueryParams(params: any): void;
-    
-        getHost(): any;
-    
-        getOAuth1BaseUrl(): any;
-    
-        getPath(options: any): any;
-    
-        getPathWithQuery(): any;
-    
-        getQueryString(options: any): any;
-    
-        getRaw(): any;
-    
-        getRemote(options: any): any;
-    
-        removeQueryParams(params: any): any;
-    
-        toString(forceProtocol: any): any;
-    
-        update(url: any): any;
-    
-        static isUrl(obj: any): any;
-    
-        static parse(url: any): any;
-    
-    }
-    
-    export class UrlMatchPattern {
-        constructor(options: any, ...args: any[]);
-    
-        createMatchPattern(): any;
-    
-        getProtocols(): any;
-    
-        globPatternToRegexp(pattern: any): any;
-    
-        matchAbsoluteHostPattern(matchRegexObject: any, remote: any): any;
-    
-        matchAnyHost(matchRegexObject: any): any;
-    
-        matchSuffixHostPattern(matchRegexObject: any, remote: any): any;
-    
-        test(urlStr: any): any;
-    
-        testHost(host: any): any;
-    
-        testPath(path: any): any;
-    
-        testProtocol(protocol: any): any;
-    
-        toJSON(): any;
-    
-        toString(): any;
-    
-        update(options: any): void;
-    
-        static MATCH_ALL_URLS: string;
-    
-        static PROTOCOL_DELIMITER: string;
-    
-    }
-    
-    export class UrlMatchPatternList {
-        constructor(parent: any, list: any);
-    
-        test(urlStr: any): any;
-    
-    }
-    
-    export class Variable {
-        constructor(definition: any, ...args: any[]);
-    
-        cast(value: any): any;
-    
-        castIn(value: any): any;
-    
-        castOut(value: any): any;
-    
-        get(): any;
-    
-        set(value: any): void;
-    
-        toString(): any;
-    
-        update(options: any): void;
-    
-        valueOf(value: any, ...args: any[]): any;
-    
-        valueType(typeName: any, _noCast: any): any;
-    
-        static isVariable(obj: any): any;
-    
-    }
-    
-    export class VariableList {
-        constructor(parent: any, populate: any);
-    
-        replace(str: any, overrides: any): any;
-    
-        substitute(obj: any, overrides: any, mutate: any): any;
-    
-        syncFromObject(obj: any, track: any, prune: any): any;
-    
-        syncToObject(obj: any): any;
-    
-        static isVariableList(obj: any): any;
-    
-    }
-    
-    export class VariableScope {
-        constructor(definition: any, layers: any);
-    
-        addLayer(list: any): void;
-    
-        clear(): void;
-    
-        get(key: any): any;
-    
-        has(variableName: any): any;
-    
-        set(key: any, value: any, type: any): any;
-    
-        syncVariablesFrom(obj: any, track: any): any;
-    
-        syncVariablesTo(obj: any): any;
-    
-        toJSON(): any;
-    
-        toObject(excludeDisabled: any, caseSensitive: any): any;
-    
-        unset(key: any): void;
-    
-        variables(): any;
-    
-        static isVariableScope(obj: any): any;
-    
-    }
-    
-    export class Version {
-        constructor(options: any);
-    
-        set(value: any): void;
-    
-        toString(): any;
-    
-    }
-    
-    export function CookieList(parent: any, cookies: any): void;
-    
-}
+    findInParents(property: string, customizer?: any): any | undefined; // TODO Update customizer function def
 
-export namespace Certificate {
-    namespace isCertificate {
-        const prototype: {
-        };
+    findParentContaining(property: any, customizer: any): any; // TODO Update customizer function def
 
-    }
+    forEachParent(iterator: any): void;                         // TODO Update iterator function def
+    forEachParent(options: any | boolean, iterator: any): void; // TODO Update iterator function def
 
-    namespace prototype {
-        function canApplyTo(url: any): any;
+    meta(): any;
 
-        function describe(content: any, type: any): void;
+    parent(): any | undefined;
 
-        function findInParents(property: any, customizer: any): any;
+    setParent(parent: any): void;
 
-        function findParentContaining(property: any, customizer: any): any;
+    toJSON(): any;
 
-        function forEachParent(options: any, iterator: any): void;
+    static propertyIsMeta(value: any, key: any): any;
 
-        function meta(...args: any[]): any;
+    static propertyUnprefixMeta(value: any, key: any): any;
 
-        function parent(): any;
-
-        function setParent(parent: any): void;
-
-        function toJSON(): any;
-
-        function toObjectResolved(scope: any, overrides: any, options: any): any;
-
-        function update(options: any): void;
-    }
+    static toJSON(obj: any): any;
 
 }
 
-export namespace CertificateList {
-    namespace isCertificateList {
-        const prototype: {
-        };
+export interface PropertyDefinition {
+    id?: string;
+    name?: string;
+    disabled?: boolean;
+}
 
-    }
+export class Property extends PropertyBase implements PropertyDefinition {
+    auth: RequestAuth;
+    disabled: boolean;
+    id: string;
+    name: string;
 
-    namespace prototype {
-        function add(item: any, ...args: any[]): void;
+    constructor(definition?: PropertyDefinition);
 
-        function all(): any;
+    describe(content: string, type?: string): void;
 
-        function append(item: any): any;
+    toObjectResolved(scope: any, overrides: any, options: any): any;
 
-        function assimilate(source: any, prune: any): void;
+    static replaceSubstitutions(str: string, variables: VariableList | any | (VariableList | any)[]): string;
 
-        function clear(): void;
-
-        function count(): any;
-
-        function each(iterator: any, context: any): void;
-
-        function eachParent(iterator: any, context: any): void;
-
-        function filter(rule: any, context: any): any;
-
-        function find(rule: any, context: any): any;
-
-        function findInParents(property: any, customizer: any): any;
-
-        function findParentContaining(property: any, customizer: any): any;
-
-        function forEachParent(options: any, iterator: any): void;
-
-        function get(key: any): any;
-
-        function has(item: any, value: any, ...args: any[]): any;
-
-        function idx(index: any): any;
-
-        function indexOf(item: any): any;
-
-        function insert(item: any, before: any): void;
-
-        function insertAfter(item: any, after: any): any;
-
-        function map(iterator: any, context: any): any;
-
-        function meta(...args: any[]): any;
-
-        function one(id: any): any;
-
-        function parent(): any;
-
-        function populate(items: any): void;
-
-        function prepend(item: any): any;
-
-        function remove(predicate: any, context: any, ...args: any[]): any;
-
-        function repopulate(items: any): void;
-
-        function resolveOne(url: any): any;
-
-        function setParent(parent: any): void;
-
-        function toJSON(): any;
-
-        function toObject(excludeDisabled: any, caseSensitive: any, multiValue: any, sanitizeKeys: any): any;
-
-        function toString(): any;
-
-        function upsert(item: any): any;
-
-    }
+    static replaceSubstitutionsIn(obj: any, variables: (VariableList | any)[], mutate: boolean): any;
 
 }
 
-export namespace Collection {
-    namespace isCollection {
-        const prototype: {
-        };
+export interface CertificateDefinition extends PropertyDefinition {
+    name?: string;
+    matches?: any[];
+    key?: any;
+    cert?: any;
+    passphrase?: string;
+}
 
-    }
+export class Certificate extends Property {
+    cert: any;
+    id: string;
+    key: any;
+    matches: any; // TODO update to UrlMatchPatternList?
+    name: string;
+    passphrase: any;
 
-    namespace prototype {
-        function authorizeRequestsUsing(type: any, options: any): void;
+    constructor(options: any);
 
-        function describe(content: any, type: any): void;
+    canApplyTo(url: string | Url): any;
 
-        function findInParents(property: any, customizer: any): any;
+    toJSON(): CertificateDefinition;
 
-        function findParentContaining(property: any, customizer: any): any;
+    update(options: CertificateDefinition): void;
 
-        function forEachItem(callback: any): any;
-
-        function forEachItemGroup(callback: any): void;
-
-        function forEachParent(options: any, iterator: any): void;
-
-        function meta(...args: any[]): any;
-
-        function oneDeep(idOrName: any): any;
-
-        function parent(): any;
-
-        function setParent(parent: any): void;
-
-        function syncVariablesFrom(obj: any, track: any): any;
-
-        function syncVariablesTo(obj: any): any;
-
-        function toJSON(): any;
-
-        function toObjectResolved(scope: any, overrides: any, options: any): any;
-    }
+    static isCertificate(obj: any): boolean;
 
 }
 
-export namespace Cookie {
-    namespace isCookie {
-        const prototype: {
-        };
 
-    }
+export class PropertyList<TElement> {
+    constructor(type: any, parent: any, populate: any);
 
-    namespace parse {
-        const prototype: {
-        };
+    add(item: any | TElement): void;
 
-    }
+    all(): any;
 
-    namespace prototype {
-        function findInParents(property: any, customizer: any): any;
+    append(item: TElement): any;
 
-        function findParentContaining(property: any, customizer: any): any;
+    assimilate(source: PropertyList<TElement> | any[], prune: boolean): void;
 
-        function forEachParent(options: any, iterator: any): void;
+    clear(): void;
 
-        function meta(...args: any[]): any;
+    count(): number;
 
-        function parent(): any;
+    each(iterator: any, context: any): void;
 
-        function setParent(parent: any): void;
+    eachParent(iterator: any, context?: any): void;
 
-        function toJSON(): any;
+    filter(rule: any, context: any): any;
 
-        function update(options: any): void;
+    find(rule: any, context?: any): Item | ItemGroup<TElement>;
 
-        function valueOf(): any;
+    get(key: string | any): TElement;
 
-    }
+    has(item: string | TElement, value?: any): boolean;
 
-    namespace splitParam {
-        const prototype: {
-        };
+    idx(index: number): TElement;
 
-    }
+    indexOf(item: string | any): number;
+
+    insert(item: TElement, before: TElement | string): void;
+
+    insertAfter(item: TElement, after: TElement | string): any;
+
+    map(iterator: any, context: any): any;
+
+    one(id: string): TElement;
+
+    populate(items: any | any[]): void;
+
+    prepend(item: TElement): any;
+
+    remove(predicate: any | string | TElement, context: any): any;
+
+    repopulate(items: any | any[]): void;
+
+    toJSON(): any;
+
+    toObject(excludeDisabled?: any | null, caseSensitive?: any | null, multiValue?: any | null, sanitizeKeys?: any): any;
+
+    toString(): string;
+
+    upsert(item: TElement): boolean | null;
+
+    static isPropertyList(obj: any): any;
 
 }
 
-export namespace CookieList {
-    function isCookieList(obj: any): any;
+export class CertificateList extends PropertyList<Certificate> {
+    constructor(parent: any, list: CertificateDefinition[]);
 
-    namespace isCookieList {
-        const prototype: {
-        };
+    resolveOne(url: string): CertificateDefinition;
 
-    }
-
-    namespace prototype {
-        function add(item: any, ...args: any[]): void;
-
-        function all(): any;
-
-        function append(item: any): any;
-
-        function assimilate(source: any, prune: any): void;
-
-        function clear(): void;
-
-        function count(): any;
-
-        function each(iterator: any, context: any): void;
-
-        function eachParent(iterator: any, context: any): void;
-
-        function filter(rule: any, context: any): any;
-
-        function find(rule: any, context: any): any;
-
-        function findInParents(property: any, customizer: any): any;
-
-        function findParentContaining(property: any, customizer: any): any;
-
-        function forEachParent(options: any, iterator: any): void;
-
-        function get(key: any): any;
-
-        function has(item: any, value: any, ...args: any[]): any;
-
-        function idx(index: any): any;
-
-        function indexOf(item: any): any;
-
-        function insert(item: any, before: any): void;
-
-        function insertAfter(item: any, after: any): any;
-
-        function map(iterator: any, context: any): any;
-
-        function meta(...args: any[]): any;
-
-        function one(id: any): any;
-
-        function parent(): any;
-
-        function populate(items: any): void;
-
-        function prepend(item: any): any;
-
-        function remove(predicate: any, context: any, ...args: any[]): any;
-
-        function repopulate(items: any): void;
-
-        function setParent(parent: any): void;
-
-        function toJSON(): any;
-
-        function toObject(excludeDisabled: any, caseSensitive: any, multiValue: any, sanitizeKeys: any): any;
-
-        function toString(): any;
-
-        function upsert(item: any): any;
-
-
-    }
+    static isCertificateList(obj: any): boolean;
 
 }
 
-export namespace Description {
-    namespace format {
-    }
+export interface ItemGroupDefinition extends PropertyDefinition {
+    item?: (ItemDefinition | ItemGroupDefinition)[];
+    auth?: RequestAuthDefinition;
+    event?: EventDefinition[];
+}
+    
+export class ItemGroup<TItem> extends Property {
+    auth: RequestAuth;
+    items: PropertyList<TItem>;
 
-    namespace isDescription {
-        const prototype: {
-        };
+    constructor(definition?: ItemGroupDefinition);
 
-    }
+    authorizeRequestsUsing(type: any, options: any): void; // TODO add better types for parameters
 
-    namespace prototype {
-        function toJSON(): any;
+    forEachItem(callback: any): any;
 
-        function toString(): any;
+    forEachItemGroup(callback: any): void;
 
-        function update(content: any, type: any): void;
+    oneDeep(idOrName: string): TItem;
 
-    }
+    static isItemGroup(obj: any): boolean;
 
 }
 
-export namespace Event {
-    namespace prototype {
-        function describe(content: any, type: any): void;
+export interface CollectionDefinition extends ItemGroupDefinition {
+    info?: {
+        id?: string;
+        name?: string;
+        version?: string;
+    };
+    item?: (ItemDefinition | ItemGroupDefinition)[];
+    variable?: VariableDefinition;
+    auth?: RequestAuthDefinition;
+    event?: EventDefinition[];
+    version?: string | Version;
+}
 
-        function findInParents(property: any, customizer: any): any;
+export class Collection extends ItemGroup<Request> implements CollectionDefinition {
+    events: EventList;
+    variables: VariableList;
+    version: Version;
 
-        function findParentContaining(property: any, customizer: any): any;
+    constructor(definition?: CollectionDefinition, environments?: any[]);
 
-        function forEachParent(options: any, iterator: any): void;
+    syncVariablesFrom(obj: any, track?: boolean): any;
 
-        function meta(...args: any[]): any;
+    syncVariablesTo(obj?: any): any;
 
-        function parent(): any;
+    toJSON(): any;
 
-        function setParent(parent: any): void;
-
-        function toJSON(): any;
-
-        function toObjectResolved(scope: any, overrides: any, options: any): any;
-
-        function update(definition: any): void;
-    }
+    static isCollection(obj: any): boolean;
 
 }
 
-export namespace EventList {
-    namespace isEventList {
-        const prototype: {
-        };
-
-    }
-
-    namespace prototype {
-        function add(item: any, ...args: any[]): void;
-
-        function all(): any;
-
-        function append(item: any): any;
-
-        function assimilate(source: any, prune: any): void;
-
-        function clear(): void;
-
-        function count(): any;
-
-        function each(iterator: any, context: any): void;
-
-        function eachParent(iterator: any, context: any): void;
-
-        function filter(rule: any, context: any): any;
-
-        function find(rule: any, context: any): any;
-
-        function findInParents(property: any, customizer: any): any;
-
-        function findParentContaining(property: any, customizer: any): any;
-
-        function forEachParent(options: any, iterator: any): void;
-
-        function get(key: any): any;
-
-        function has(item: any, value: any, ...args: any[]): any;
-
-        function idx(index: any): any;
-
-        function indexOf(item: any): any;
-
-        function insert(item: any, before: any): void;
-
-        function insertAfter(item: any, after: any): any;
-
-        function listeners(name: any): any;
-
-        function listenersOwn(name: any): any;
-
-        function map(iterator: any, context: any): any;
-
-        function meta(...args: any[]): any;
-
-        function one(id: any): any;
-
-        function parent(): any;
-
-        function populate(items: any): void;
-
-        function prepend(item: any): any;
-
-        function remove(predicate: any, context: any, ...args: any[]): any;
-
-        function repopulate(items: any): void;
-
-        function setParent(parent: any): void;
-
-        function toJSON(): any;
-
-        function toObject(excludeDisabled: any, caseSensitive: any, multiValue: any, sanitizeKeys: any): any;
-
-        function toString(): any;
-
-        function upsert(item: any): any;
-    }
+export interface CookieDefinition {
+    key?: string;
+    value?: string;
+    expires?: string | Date;
+    maxAge?: number;
+    domain?: string;
+    path?: string;
+    secure?: boolean;
+    httpOnly?: boolean;
+    hostOnly?: boolean;
+    session?: boolean;
+    extensions?: {key: string; value: string}[];
 
 }
 
-export namespace FormParam {
-    namespace parse {
-        const prototype: {
-        };
+export class Cookie extends PropertyBase implements CookieDefinition {
+    domain: string;
+    expires: Date | string;
+    extensions: {key: string; value: string}[];
+    hostOnly: any;
+    httpOnly: any;
+    maxAge: number;
+    name: string;
+    path: string;
+    secure: any;
+    session: any;
+    value: string;
 
-    }
+    constructor(options?: CookieDefinition);
 
-    namespace prototype {
-        function describe(content: any, type: any): void;
+    update(options: any): void;
 
-        function findInParents(property: any, customizer: any): any;
+    valueOf(): string;
 
-        function findParentContaining(property: any, customizer: any): any;
+    static isCookie(obj: any): boolean;
 
-        function forEachParent(options: any, iterator: any): void;
+    static parse(str: string): any;
 
-        function meta(...args: any[]): any;
-
-        function parent(): any;
-
-        function setParent(parent: any): void;
-
-        function toJSON(): any;
-
-        function toObjectResolved(scope: any, overrides: any, options: any): any;
-
-        function toString(): any;
-
-        function valueOf(): any;
-    }
+    static splitParam(param: any): any;
 
 }
 
-export namespace Header {
-    namespace create {
-        const prototype: {
-        };
+export class CookieList extends PropertyList<Cookie> {
+    constructor(parent: any, cookies: any[]);
 
-    }
+    static isCookieList(obj: any): boolean;
+}
 
-    namespace isHeader {
-        const prototype: {
-        };
+export interface DescriptionDefinition {
+    content: string;
+    format: string;
+}
 
-    }
+export class Description implements DescriptionDefinition {
+    format: string; // TODO huh?
+    content: string;
+    type: string;
 
-    namespace parse {
-        const prototype: {
-        };
+    constructor(definition?: DescriptionDefinition);
 
-    }
+    toJSON(): any;
 
-    namespace parseSingle {
-        const prototype: {
-        };
+    toString(): string;
 
-    }
+    update(content: string | DescriptionDefinition, type?: string): void;
 
-    namespace prototype {
-        function describe(content: any, type: any): void;
-
-        function findInParents(property: any, customizer: any): any;
-
-        function findParentContaining(property: any, customizer: any): any;
-
-        function forEachParent(options: any, iterator: any): void;
-
-        function meta(...args: any[]): any;
-
-        function parent(): any;
-
-        function setParent(parent: any): void;
-
-        function toJSON(): any;
-
-        function toObjectResolved(scope: any, overrides: any, options: any): any;
-
-        function toString(): any;
-
-        function update(options: any): void;
-
-        function valueOf(): any;
-    }
-
-    namespace unparse {
-        const prototype: {
-        };
-
-    }
-
-    namespace unparseSingle {
-        const prototype: {
-        };
-
-    }
+    static isDescription(obj: any): boolean;
 
 }
 
-export namespace HeaderList {
-    namespace isHeaderList {
-        const prototype: {
-        };
+export interface EventDefinition extends PropertyDefinition {
+    listen: string;
+    script: string | Script;
+}
 
-    }
+export class Event extends Property implements EventDefinition {
+    listen: string;
+    script: string;
 
-    namespace prototype {
-        function add(item: any, ...args: any[]): void;
+    constructor(definition: EventDefinition);
 
-        function all(): any;
+    update(definition: EventDefinition): void;    
+}
 
-        function append(item: any): any;
+export class EventList extends PropertyList<Event> {
+    constructor(parent: any, populate: any[]);
 
-        function assimilate(source: any, prune: any): void;
+    listeners(name: string): Event[];
 
-        function clear(): void;
+    listenersOwn(name: string): Event[];
 
-        function contentSize(): any;
-
-        function count(): any;
-
-        function each(iterator: any, context: any): void;
-
-        function eachParent(iterator: any, context: any): void;
-
-        function filter(rule: any, context: any): any;
-
-        function find(rule: any, context: any): any;
-
-        function findInParents(property: any, customizer: any): any;
-
-        function findParentContaining(property: any, customizer: any): any;
-
-        function forEachParent(options: any, iterator: any): void;
-
-        function get(key: any): any;
-
-        function has(item: any, value: any, ...args: any[]): any;
-
-        function idx(index: any): any;
-
-        function indexOf(item: any): any;
-
-        function insert(item: any, before: any): void;
-
-        function insertAfter(item: any, after: any): any;
-
-        function map(iterator: any, context: any): any;
-
-        function meta(...args: any[]): any;
-
-        function one(id: any): any;
-
-        function parent(): any;
-
-        function populate(items: any): void;
-
-        function prepend(item: any): any;
-
-        function remove(predicate: any, context: any, ...args: any[]): any;
-
-        function repopulate(items: any): void;
-
-        function setParent(parent: any): void;
-
-        function toJSON(): any;
-
-        function toObject(excludeDisabled: any, caseSensitive: any, multiValue: any, sanitizeKeys: any): any;
-
-        function toString(): any;
-
-        function upsert(item: any): any;
-    }
+    static isEventList(obj: any): boolean;
 
 }
 
-export namespace Item {
-    namespace isItem {
-        const prototype: {
-        };
+export interface FormParamDefinition extends PropertyDefinition {
+    key: string;
+    value: string;
+}
 
-    }
+export class FormParam extends Property implements FormParamDefinition{
+    key: string;
+    value: string;
 
-    namespace prototype {
-        function authorizeRequestUsing(type: any, options: any): any;
+    static _postman_propertyAllowsMultipleValues: boolean;
+    static _postman_propertyIndex: string;
 
-        function describe(content: any, type: any): void;
+    constructor(options: FormParamDefinition);
 
-        function findInParents(property: any, customizer: any): any;
+    toString(): string;
 
-        function findParentContaining(property: any, customizer: any): any;
+    valueOf(): any | string;
 
-        function forEachParent(options: any, iterator: any): void;
+    // static parse(): void; // TODO not implemented yet
+}
 
-        function getAuth(): any;
+export interface HeaderDefinition extends PropertyDefinition {
+    key: string;
+    value: string;
+}
 
-        function getEvents(name: any): any;
+export class Header extends Property implements HeaderDefinition {
+    key: string;
+    value: string;
 
-        function meta(...args: any[]): any;
+    constructor(options: HeaderDefinition | string, name?: string);
 
-        function parent(): any;
+    toString(): string;
 
-        function setParent(parent: any): void;
+    update(options: any): void;
 
-        function toJSON(): any;
+    valueOf(): string;
 
-        function toObjectResolved(scope: any, overrides: any, options: any): any;
-    }
+    static create(value?: HeaderDefinition | string, name?: string): Header;
+
+    static isHeader(obj: any): boolean;
+
+    static parse(headerString: string): HeaderDefinition[];
+
+    static parseSingle(header: string): HeaderDefinition;
+
+    static unparse(headers: HeaderList | any[], separator?: string): string;
+
+    static unparseSingle(header: Header): string;    
+}
+
+export class HeaderList extends PropertyList<Header> {
+    constructor(parent: any, headers: Header[]);
+
+    contentSize(): number;
+
+    static isHeaderList(obj: any): boolean;    
+}
+
+export interface ItemDefinition extends PropertyDefinition {
+    request?: RequestDefinition;
+    responses?: ResponseDefinition[];
+    events?: EventDefinition[];
+}
+
+export class Item extends Property implements ItemDefinition {
+    events: EventDefinition[];
+    request: Request;
+    responses: ResponseDefinition[];
+
+    constructor(definition?: ItemDefinition);
+
+    authorizeRequestUsing(type: string | RequestAuthDefinition, options?: VariableList): any;
+
+    getAuth(): RequestAuth;
+
+    getEvents(name: string): Event[];
+
+    static isItem(obj: any): boolean;
 
 }
 
-export namespace ItemGroup {
-    namespace isItemGroup {
-        const prototype: {
-        };
+export interface ProxyConfigDefinition extends PropertyDefinition {
+    match?: string;
+    host?: string;
+    port?: number;
+    tunnel?: boolean;
+    disabled?: boolean;
+}
 
-    }
+export class ProxyConfig extends Property implements ProxyConfigDefinition {
+    static host: string;
+    static match: string;
+    static port: number;
+    static tunnel: boolean;
 
-    namespace prototype {
-        function authorizeRequestsUsing(type: any, options: any): void;
+    constructor(options?: ProxyConfigDefinition);
 
-        function describe(content: any, type: any): void;
+    getProtocols(): string[];
 
-        function findInParents(property: any, customizer: any): any;
+    getProxyUrl(): string;
 
-        function findParentContaining(property: any, customizer: any): any;
+    test(urlStr?: string): any;
 
-        function forEachItem(callback: any): any;
+    update(options: ProxyConfigDefinition): void;
 
-        function forEachItemGroup(callback: any): void;
+    updateProtocols(protocols: string[]): void;
 
-        function forEachParent(options: any, iterator: any): void;
-
-        function meta(...args: any[]): any;
-
-        function oneDeep(idOrName: any): any;
-
-        function parent(): any;
-
-        function setParent(parent: any): void;
-
-        function toJSON(): any;
-
-        function toObjectResolved(scope: any, overrides: any, options: any): any;
-
-    }
+    static isProxyConfig(obj: any): boolean;
 
 }
 
-export namespace Property {
-    namespace prototype {
-        function describe(content: any, type: any): void;
+export class ProxyConfigList extends PropertyList<ProxyConfig> {
+    constructor(parent: any, populate: ProxyConfig[]);
 
-        function findInParents(property: any, customizer: any): any;
+    resolve(url?: Url): ProxyConfigDefinition;
 
-        function findParentContaining(property: any, customizer: any): any;
-
-        function forEachParent(options: any, iterator: any): void;
-
-        function meta(...args: any[]): any;
-
-        function parent(): any;
-
-        function setParent(parent: any): void;
-
-        function toJSON(): any;
-
-        function toObjectResolved(scope: any, overrides: any, options: any): any;
-
-    }
-
-    namespace replaceSubstitutions {
-        const prototype: {
-        };
-
-    }
-
-    namespace replaceSubstitutionsIn {
-        const prototype: {
-        };
-
-    }
+    static isProxyConfigList(obj: any): boolean;
 
 }
 
-export namespace PropertyBase {
-    namespace propertyIsMeta {
-        const prototype: {
-        };
-
-    }
-
-    namespace propertyUnprefixMeta {
-        const prototype: {
-        };
-
-    }
-
-    namespace prototype {
-        function findInParents(property: any, customizer: any): any;
-
-        function findParentContaining(property: any, customizer: any): any;
-
-        function forEachParent(options: any, iterator: any): void;
-
-        function meta(...args: any[]): any;
-
-        function parent(): any;
-
-        function setParent(parent: any): void;
-
-        function toJSON(): any;
-    }
+export interface QueryParamDefinition extends PropertyDefinition {
+    key: string;
+    value: string;
 }
 
-export namespace PropertyList {
-    namespace isPropertyList {
-        const prototype: {
-        };
+export class QueryParam extends Property implements QueryParamDefinition {
+    static _postman_propertyAllowsMultipleValues: boolean;
+    static _postman_propertyIndexKey: string;
 
-    }
+    key: string;
+    value: string;
 
-    namespace prototype {
-        function add(item: any, ...args: any[]): void;
+    constructor(options: QueryParamDefinition | string);
 
-        function all(): any;
+    toString(): string;
 
-        function append(item: any): any;
+    update(param: string | {key: string, value?: string}): void;
 
-        function assimilate(source: any, prune: any): void;
+    valueOf(): any;
 
-        function clear(): void;
+    static parse(query: string): any[];
 
-        function count(): any;
+    static parseSingle(param: string, idx: number, all: string[]): any;
 
-        function each(iterator: any, context: any): void;
+    static unparse(params: any | any[], options?: {encode?: boolean | null, ignoreDisabled?: boolean | null}): string;
 
-        function eachParent(iterator: any, context: any): void;
-
-        function filter(rule: any, context: any): any;
-
-        function find(rule: any, context: any): any;
-
-        function findInParents(property: any, customizer: any): any;
-
-        function findParentContaining(property: any, customizer: any): any;
-
-        function forEachParent(options: any, iterator: any): void;
-
-        function get(key: any): any;
-
-        function has(item: any, value: any, ...args: any[]): any;
-
-        function idx(index: any): any;
-
-        function indexOf(item: any): any;
-
-        function insert(item: any, before: any): void;
-
-        function insertAfter(item: any, after: any): any;
-
-        function map(iterator: any, context: any): any;
-
-        function meta(...args: any[]): any;
-
-        function one(id: any): any;
-
-        function parent(): any;
-
-        function populate(items: any): void;
-
-        function prepend(item: any): any;
-
-        function remove(predicate: any, context: any, ...args: any[]): any;
-
-        function repopulate(items: any): void;
-
-        function setParent(parent: any): void;
-
-        function toJSON(): any;
-
-        function toObject(excludeDisabled: any, caseSensitive: any, multiValue: any, sanitizeKeys: any): any;
-
-        function toString(): any;
-
-        function upsert(item: any): any;
-    }
-}
-
-export namespace ProxyConfig {
-    namespace isProxyConfig {
-        const prototype: {
-        };
-
-    }
-
-    namespace prototype {
-        function describe(content: any, type: any): void;
-
-        function findInParents(property: any, customizer: any): any;
-
-        function findParentContaining(property: any, customizer: any): any;
-
-        function forEachParent(options: any, iterator: any): void;
-
-        function getProtocols(): any;
-
-        function getProxyUrl(): any;
-
-        function meta(...args: any[]): any;
-
-        function parent(): any;
-
-        function setParent(parent: any): void;
-
-        function test(urlStr: any): any;
-
-        function toJSON(): any;
-
-        function toObjectResolved(scope: any, overrides: any, options: any): any;
-
-        function update(options: any): void;
-
-        function updateProtocols(protocols: any): void;
-    }
-}
-
-export namespace ProxyConfigList {
-    namespace isProxyConfigList {
-        const prototype: {
-        };
-
-    }
-
-    namespace prototype {
-        function add(item: any, ...args: any[]): void;
-
-        function all(): any;
-
-        function append(item: any): any;
-
-        function assimilate(source: any, prune: any): void;
-
-        function clear(): void;
-
-        function count(): any;
-
-        function each(iterator: any, context: any): void;
-
-        function eachParent(iterator: any, context: any): void;
-
-        function filter(rule: any, context: any): any;
-
-        function find(rule: any, context: any): any;
-
-        function findInParents(property: any, customizer: any): any;
-
-        function findParentContaining(property: any, customizer: any): any;
-
-        function forEachParent(options: any, iterator: any): void;
-
-        function get(key: any): any;
-
-        function has(item: any, value: any, ...args: any[]): any;
-
-        function idx(index: any): any;
-
-        function indexOf(item: any): any;
-
-        function insert(item: any, before: any): void;
-
-        function insertAfter(item: any, after: any): any;
-
-        function map(iterator: any, context: any): any;
-
-        function meta(...args: any[]): any;
-
-        function one(id: any): any;
-
-        function parent(): any;
-
-        function populate(items: any): void;
-
-        function prepend(item: any): any;
-
-        function remove(predicate: any, context: any, ...args: any[]): any;
-
-        function repopulate(items: any): void;
-
-        function resolve(url: any): any;
-
-        function setParent(parent: any): void;
-
-        function toJSON(): any;
-
-        function toObject(excludeDisabled: any, caseSensitive: any, multiValue: any, sanitizeKeys: any): any;
-
-        function toString(): any;
-
-        function upsert(item: any): any;
-    }
-}
-
-export namespace QueryParam {
-    namespace parse {
-        const prototype: {
-        };
-
-    }
-
-    namespace parseSingle {
-        const prototype: {
-        };
-
-    }
-
-    namespace prototype {
-        function describe(content: any, type: any): void;
-
-        function findInParents(property: any, customizer: any): any;
-
-        function findParentContaining(property: any, customizer: any): any;
-
-        function forEachParent(options: any, iterator: any): void;
-
-        function meta(...args: any[]): any;
-
-        function parent(): any;
-
-        function setParent(parent: any): void;
-
-        function toJSON(): any;
-
-        function toObjectResolved(scope: any, overrides: any, options: any): any;
-
-        function toString(): any;
-
-        function update(param: any): void;
-
-        function valueOf(): any;
-    }
-
-    namespace unparse {
-        const prototype: {
-        };
-
-    }
-
-    namespace unparseSingle {
-        const prototype: {
-        };
-
-    }
-}
-
-export namespace Request {
-    namespace isRequest {
-        const prototype: {
-        };
-
-    }
-
-    namespace prototype {
-        function addHeader(header: any): void;
-
-        function addQueryParams(params: any): void;
-
-        function authorize(): void;
-
-        function authorizeUsing(type: any, options: any): void;
-
-        function clone(): any;
-
-        function describe(content: any, type: any): void;
-
-        function findInParents(property: any, customizer: any): any;
-
-        function findParentContaining(property: any, customizer: any): any;
-
-        function forEachHeader(callback: any): any;
-
-        function forEachParent(options: any, iterator: any): void;
-
-        function getHeaders(options: any): any;
-
-        function meta(...args: any[]): any;
-
-        function parent(): any;
-
-        function removeHeader(toRemove: any, options: any): any;
-
-        function removeQueryParams(params: any): void;
-
-        function setParent(parent: any): void;
-
-        function toJSON(): any;
-
-        function toObjectResolved(scope: any, overrides: any, options: any): any;
-
-        function update(options: any): void;
-
-        function upsertHeader(header: any): any;
-    }
-}
-
-export namespace RequestAuth {
-    namespace isValidType {
-        const prototype: {
-        };
-
-    }
-
-    namespace prototype {
-        function clear(type: any): void;
-
-        function current(): any;
-
-        function describe(content: any, type: any): void;
-
-        function findInParents(property: any, customizer: any): any;
-
-        function findParentContaining(property: any, customizer: any): any;
-
-        function forEachParent(options: any, iterator: any): void;
-
-        function meta(...args: any[]): any;
-
-        function parameters(): any;
-
-        function parent(): any;
-
-        function setParent(parent: any): void;
-
-        function toJSON(): any;
-
-        function toObjectResolved(scope: any, overrides: any, options: any): any;
-
-        function update(options: any, type: any): void;
-
-        function use(type: any, options: any): void;
-    }
-}
-
-export namespace RequestBody {
-    namespace prototype {
-        function findInParents(property: any, customizer: any): any;
-
-        function findParentContaining(property: any, customizer: any): any;
-
-        function forEachParent(options: any, iterator: any): void;
-
-        function isEmpty(): any;
-
-        function meta(...args: any[]): any;
-
-        function parent(): any;
-
-        function setParent(parent: any): void;
-
-        function toJSON(): any;
-
-        function toString(): any;
-
-        function update(options: any): void;
-    }
-}
-
-export namespace Response {
-    namespace createFromNode {
-        const prototype: {
-        };
-
-    }
-
-    namespace isResponse {
-        const prototype: {
-        };
-
-    }
-
-    namespace mimeInfo {
-        const prototype: {
-        };
-
-    }
-
-    namespace prototype {
-        function dataURI(): any;
-
-        function describe(content: any, type: any): void;
-
-        function details(): any;
-
-        function encoding(): any;
-
-        function findInParents(property: any, customizer: any): any;
-
-        function findParentContaining(property: any, customizer: any): any;
-
-        function forEachParent(options: any, iterator: any): void;
-
-        function json(reviver: any, strict: any): any;
-
-        function meta(...args: any[]): any;
-
-        function mime(contentType: any, contentDisposition: any): any;
-
-        function parent(): any;
-
-        function reason(): any;
-
-        function setParent(parent: any): void;
-
-        function size(): any;
-
-        function text(): any;
-
-        function toJSON(): any;
-
-        function toObjectResolved(scope: any, overrides: any, options: any): any;
-
-        function update(options: any): void;
-    }
-}
-
-export namespace Script {
-    namespace isScript {
-        const prototype: {
-        };
-
-    }
-
-    namespace prototype {
-        function describe(content: any, type: any): void;
-
-        function findInParents(property: any, customizer: any): any;
-
-        function findParentContaining(property: any, customizer: any): any;
-
-        function forEachParent(options: any, iterator: any): void;
-
-        function meta(...args: any[]): any;
-
-        function parent(): any;
-
-        function setParent(parent: any): void;
-
-        function toJSON(): any;
-
-        function toObjectResolved(scope: any, overrides: any, options: any): any;
-
-        function toSource(): any;
-
-        function update(options: any): void;
-    }
-}
-
-export namespace Url {
-    namespace isUrl {
-        const prototype: {
-        };
-
-    }
-
-    namespace parse {
-        const prototype: {
-        };
-
-    }
-
-    namespace prototype {
-        function addQueryParams(params: any): void;
-
-        function findInParents(property: any, customizer: any): any;
-
-        function findParentContaining(property: any, customizer: any): any;
-
-        function forEachParent(options: any, iterator: any): void;
-
-        function getHost(): any;
-
-        function getOAuth1BaseUrl(): any;
-
-        function getPath(options: any): any;
-
-        function getPathWithQuery(): any;
-
-        function getQueryString(options: any): any;
-
-        function getRaw(): any;
-
-        function getRemote(options: any): any;
-
-        function meta(...args: any[]): any;
-
-        function parent(): any;
-
-        function removeQueryParams(params: any): any;
-
-        function setParent(parent: any): void;
-
-        function toJSON(): any;
-
-        function toString(forceProtocol: any): any;
-
-        function update(url: any): any;
-    }
-}
-
-export namespace UrlMatchPattern {
-    namespace prototype {
-        function createMatchPattern(): any;
-
-        function describe(content: any, type: any): void;
-
-        function findInParents(property: any, customizer: any): any;
-
-        function findParentContaining(property: any, customizer: any): any;
-
-        function forEachParent(options: any, iterator: any): void;
-
-        function getProtocols(): any;
-
-        function globPatternToRegexp(pattern: any): any;
-
-        function matchAbsoluteHostPattern(matchRegexObject: any, remote: any): any;
-
-        function matchAnyHost(matchRegexObject: any): any;
-
-        function matchSuffixHostPattern(matchRegexObject: any, remote: any): any;
-
-        function meta(...args: any[]): any;
-
-        function parent(): any;
-
-        function setParent(parent: any): void;
-
-        function test(urlStr: any): any;
-
-        function testHost(host: any): any;
-
-        function testPath(path: any): any;
-
-        function testProtocol(protocol: any): any;
-
-        function toJSON(): any;
-
-        function toObjectResolved(scope: any, overrides: any, options: any): any;
-
-        function toString(): any;
-
-        function update(options: any): void;
-    }
-}
-
-export namespace UrlMatchPatternList {
-    namespace prototype {
-        function add(item: any, ...args: any[]): void;
-
-        function all(): any;
-
-        function append(item: any): any;
-
-        function assimilate(source: any, prune: any): void;
-
-        function clear(): void;
-
-        function count(): any;
-
-        function each(iterator: any, context: any): void;
-
-        function eachParent(iterator: any, context: any): void;
-
-        function filter(rule: any, context: any): any;
-
-        function find(rule: any, context: any): any;
-
-        function findInParents(property: any, customizer: any): any;
-
-        function findParentContaining(property: any, customizer: any): any;
-
-        function forEachParent(options: any, iterator: any): void;
-
-        function get(key: any): any;
-
-        function has(item: any, value: any, ...args: any[]): any;
-
-        function idx(index: any): any;
-
-        function indexOf(item: any): any;
-
-        function insert(item: any, before: any): void;
-
-        function insertAfter(item: any, after: any): any;
-
-        function map(iterator: any, context: any): any;
-
-        function meta(...args: any[]): any;
-
-        function one(id: any): any;
-
-        function parent(): any;
-
-        function populate(items: any): void;
-
-        function prepend(item: any): any;
-
-        function remove(predicate: any, context: any, ...args: any[]): any;
-
-        function repopulate(items: any): void;
-
-        function setParent(parent: any): void;
-
-        function test(urlStr: any): any;
-
-        function toJSON(): any;
-
-        function toObject(excludeDisabled: any, caseSensitive: any, multiValue: any, sanitizeKeys: any): any;
-
-        function toString(): any;
-
-        function upsert(item: any): any;
-    }
-}
-
-export namespace Variable {
-    namespace isVariable {
-        const prototype: {
-        };
-
-    }
-
-    namespace prototype {
-        function cast(value: any): any;
-
-        function castIn(value: any): any;
-
-        function castOut(value: any): any;
-
-        function describe(content: any, type: any): void;
-
-        function findInParents(property: any, customizer: any): any;
-
-        function findParentContaining(property: any, customizer: any): any;
-
-        function forEachParent(options: any, iterator: any): void;
-
-        function get(): any;
-
-        function meta(...args: any[]): any;
-
-        function parent(): any;
-
-        function set(value: any): void;
-
-        function setParent(parent: any): void;
-
-        function toJSON(): any;
-
-        function toObjectResolved(scope: any, overrides: any, options: any): any;
-
-        function toString(): any;
-
-        function update(options: any): void;
-
-        function valueOf(value: any, ...args: any[]): any;
-
-        function valueType(typeName: any, _noCast: any): any;
-
-    }
-
-    namespace types {
-        class number {
-            constructor(p0: any);
-
-            // Native method; no parameter or return type inference available
-            toExponential(p0: any): any;
-
-            // Native method; no parameter or return type inference available
-            toFixed(p0: any): any;
-
-            // Native method; no parameter or return type inference available
-            toLocaleString(): any;
-
-            // Native method; no parameter or return type inference available
-            toPrecision(p0: any): any;
-
-            // Native method; no parameter or return type inference available
-            toString(p0: any): any;
-
-            // Native method; no parameter or return type inference available
-            valueOf(): any;
-
-            static EPSILON: number;
-
-            static MAX_SAFE_INTEGER: number;
-
-            static MAX_VALUE: number;
-
-            static MIN_SAFE_INTEGER: number;
-
-            static MIN_VALUE: number;
-
-            static NEGATIVE_INFINITY: number;
-
-            static NaN: number;
-
-            static POSITIVE_INFINITY: number;
-
-            static isFinite(p0: any): any;
-
-            static isInteger(p0: any): any;
-
-            static isNaN(p0: any): any;
-
-            static isSafeInteger(p0: any): any;
-
-            static parseFloat(p0: any): any;
-
-            static parseInt(p0: any, p1: any): any;
-
-        }
-
-        class string {
-            constructor(p0: any);
-
-            // Native method; no parameter or return type inference available
-            anchor(p0: any): any;
-
-            // Native method; no parameter or return type inference available
-            big(): any;
-
-            // Native method; no parameter or return type inference available
-            blink(): any;
-
-            // Native method; no parameter or return type inference available
-            bold(): any;
-
-            // Native method; no parameter or return type inference available
-            charAt(p0: any): any;
-
-            // Native method; no parameter or return type inference available
-            charCodeAt(p0: any): any;
-
-            // Native method; no parameter or return type inference available
-            codePointAt(p0: any): any;
-
-            // Native method; no parameter or return type inference available
-            concat(p0: any): any;
-
-            // Native method; no parameter or return type inference available
-            endsWith(p0: any): any;
-
-            // Native method; no parameter or return type inference available
-            fixed(): any;
-
-            // Native method; no parameter or return type inference available
-            fontcolor(p0: any): any;
-
-            // Native method; no parameter or return type inference available
-            fontsize(p0: any): any;
-
-            // Native method; no parameter or return type inference available
-            includes(p0: any): any;
-
-            // Native method; no parameter or return type inference available
-            indexOf(p0: any): any;
-
-            // Native method; no parameter or return type inference available
-            italics(): any;
-
-            // Native method; no parameter or return type inference available
-            lastIndexOf(p0: any): any;
-
-            // Native method; no parameter or return type inference available
-            link(p0: any): any;
-
-            // Native method; no parameter or return type inference available
-            localeCompare(p0: any): any;
-
-            // Native method; no parameter or return type inference available
-            match(p0: any): any;
-
-            // Native method; no parameter or return type inference available
-            normalize(): any;
-
-            // Native method; no parameter or return type inference available
-            padEnd(p0: any): any;
-
-            // Native method; no parameter or return type inference available
-            padStart(p0: any): any;
-
-            // Native method; no parameter or return type inference available
-            repeat(p0: any): any;
-
-            // Native method; no parameter or return type inference available
-            replace(p0: any, p1: any): any;
-
-            // Native method; no parameter or return type inference available
-            search(p0: any): any;
-
-            // Native method; no parameter or return type inference available
-            slice(p0: any, p1: any): any;
-
-            // Native method; no parameter or return type inference available
-            small(): any;
-
-            // Native method; no parameter or return type inference available
-            split(p0: any, p1: any): any;
-
-            // Native method; no parameter or return type inference available
-            startsWith(p0: any): any;
-
-            // Native method; no parameter or return type inference available
-            strike(): any;
-
-            // Native method; no parameter or return type inference available
-            sub(): any;
-
-            // Native method; no parameter or return type inference available
-            substr(p0: any, p1: any): any;
-
-            // Native method; no parameter or return type inference available
-            substring(p0: any, p1: any): any;
-
-            // Native method; no parameter or return type inference available
-            sup(): any;
-
-            // Native method; no parameter or return type inference available
-            toLocaleLowerCase(): any;
-
-            // Native method; no parameter or return type inference available
-            toLocaleUpperCase(): any;
-
-            // Native method; no parameter or return type inference available
-            toLowerCase(): any;
-
-            // Native method; no parameter or return type inference available
-            toString(): any;
-
-            // Native method; no parameter or return type inference available
-            toUpperCase(): any;
-
-            // Native method; no parameter or return type inference available
-            trim(): any;
-
-            // Native method; no parameter or return type inference available
-            trimLeft(): any;
-
-            // Native method; no parameter or return type inference available
-            trimRight(): any;
-
-            // Native method; no parameter or return type inference available
-            valueOf(): any;
-
-            static fromCharCode(p0: any): any;
-
-            static fromCodePoint(p0: any): any;
-
-            static raw(p0: any): any;
-
-        }
-
-        namespace any {
-            function out(val: any): any;
-
-            namespace out {
-                // Too-deep object hierarchy from postman_collection.Variable.types.any.out
-                const prototype: any;
-
-            }
-
-        }
-
-        namespace json {
-            function out(val: any): any;
-
-            namespace out {
-                // Too-deep object hierarchy from postman_collection.Variable.types.json.out
-                const prototype: any;
-
-            }
-
-        }
-    }
+    static unparseSingle(obj: any, encode: boolean): string;
 
 }
 
-export namespace VariableList {
-    namespace isVariableList {
-        const prototype: {
-        };
+export interface RequestDefinition extends PropertyDefinition {
+    url: string | Url;
+    method: string;
+    header?: HeaderDefinition;
+    body?: RequestBody;
+    auth: RequestAuthDefinition;
+    proxy: ProxyConfigDefinition;
+    certificate?: CertificateDefinition;
+}
 
-    }
+export class Request extends Property implements RequestDefinition {
+    auth: RequestAuth;
+    body?: RequestBody;
+    certificate?: Certificate;
+    headers: HeaderList;
+    method: string;
+    proxy: ProxyConfig;
+    url: Url;
 
-    namespace prototype {
-        function add(item: any, ...args: any[]): void;
+    constructor(options: RequestDefinition);
 
-        function all(): any;
+    addHeader(header: Header | HeaderDefinition): void;
 
-        function append(item: any): any;
+    addQueryParams(params: string | QueryParam[]): void;
 
-        function assimilate(source: any, prune: any): void;
+    authorize(): Request;
 
-        function clear(): void;
+    authorizeUsing(type: string | RequestAuthDefinition, options?: VariableList): void;
 
-        function count(): any;
+    clone(): Request;
 
-        function each(iterator: any, context: any): void;
+    forEachHeader(callback: any): void;
 
-        function eachParent(iterator: any, context: any): void;
+    getHeaders(options?: {ignoreCase?: boolean, enabled?: boolean}): any;
 
-        function filter(rule: any, context: any): any;
+    removeHeader(toRemove: string | Header, options: {ignoreCase: boolean}): any;
 
-        function find(rule: any, context: any): any;
+    removeQueryParams(params: string | string[]): void;
 
-        function findInParents(property: any, customizer: any): any;
+    toJSON(): any;
 
-        function findParentContaining(property: any, customizer: any): any;
+    update(options: RequestDefinition): void;
 
-        function forEachParent(options: any, iterator: any): void;
+    upsertHeader(header: any): void;
 
-        function get(key: any): any;
-
-        function has(item: any, value: any, ...args: any[]): any;
-
-        function idx(index: any): any;
-
-        function indexOf(item: any): any;
-
-        function insert(item: any, before: any): void;
-
-        function insertAfter(item: any, after: any): any;
-
-        function map(iterator: any, context: any): any;
-
-        function meta(...args: any[]): any;
-
-        function one(id: any): any;
-
-        function parent(): any;
-
-        function populate(items: any): void;
-
-        function prepend(item: any): any;
-
-        function remove(predicate: any, context: any, ...args: any[]): any;
-
-        function replace(str: any, overrides: any): any;
-
-        function repopulate(items: any): void;
-
-        function setParent(parent: any): void;
-
-        function substitute(obj: any, overrides: any, mutate: any): any;
-
-        function syncFromObject(obj: any, track: any, prune: any): any;
-
-        function syncToObject(obj: any): any;
-
-        function toJSON(): any;
-
-        function toObject(excludeDisabled: any, caseSensitive: any, multiValue: any, sanitizeKeys: any): any;
-
-        function toString(): any;
-
-        function upsert(item: any): any;
-    }
+    static isRequest(obj: any): boolean;
 
 }
 
-export namespace VariableScope {
-    namespace isVariableScope {
-        const prototype: {
-        };
-
-    }
-
-    namespace prototype {
-        function addLayer(list: any): void;
-
-        function clear(): void;
-
-        function describe(content: any, type: any): void;
-
-        function findInParents(property: any, customizer: any): any;
-
-        function findParentContaining(property: any, customizer: any): any;
-
-        function forEachParent(options: any, iterator: any): void;
-
-        function get(key: any): any;
-
-        function has(variableName: any): any;
-
-        function meta(...args: any[]): any;
-
-        function parent(): any;
-
-        function set(key: any, value: any, type: any): any;
-
-        function setParent(parent: any): void;
-
-        function syncVariablesFrom(obj: any, track: any): any;
-
-        function syncVariablesTo(obj: any): any;
-
-        function toJSON(): any;
-
-        function toObject(excludeDisabled: any, caseSensitive: any): any;
-
-        function toObjectResolved(scope: any, overrides: any, options: any): any;
-
-        function unset(key: any): void;
-
-        function variables(): any;
-    }
+export interface RequestAuthDefinition extends PropertyDefinition {
+    type?: string;
 }
 
-export namespace Version {
-    namespace prototype {
-        function findInParents(property: any, customizer: any): any;
+export class RequestAuth extends Property implements RequestAuthDefinition {
+    type: string;
 
-        function findParentContaining(property: any, customizer: any): any;
+    constructor(options: RequestAuthDefinition, parent?: Property | PropertyList<RequestAuth>);
 
-        function forEachParent(options: any, iterator: any): void;
+    clear(type: string): void;
 
-        function meta(...args: any[]): any;
+    current(): any | undefined;
 
-        function parent(): any;
+    parameters(): VariableList;
 
-        function set(value: any): void;
+    update(options: VariableList | any[] | any, type?: string): void;
 
-        function setParent(parent: any): void;
+    use(type: string, options: VariableList): void;
 
-        function toJSON(): any;
+    static isValidType(type: any): boolean;
 
-        function toString(): any;
-    }
 }
 
+
+export class RequestBody extends PropertyBase {
+    static MODES: {
+        raw: string;
+        formadata: string;
+        urlencoded: string;
+        file: string;
+    };
+
+    file: string;
+    formdata: PropertyList<FormParam>;
+    mode: string;
+    raw: string;
+    urlencoded: PropertyList<QueryParam>;
+
+    constructor(options: any);
+
+    isEmpty(): boolean;
+
+    toString(): string;
+
+    update(options: any): void;    
+}
+
+export interface ResponseDefinition extends PropertyDefinition {
+    code: number;
+    reason?: string;
+    header?: HeaderDefinition[];
+    cookie?: CookieDefinition[];
+    body?: string;
+    stream?: Buffer | Uint8Array;
+    responseTime: number;
+}
+
+export class Response extends Property implements ResponseDefinition {
+    body: string;
+    code: number;
+    cookies: CookieList;
+    headers: HeaderList;
+    originalRequest: Request;
+    responseTime: number;
+    status: string;
+    reason?: string;
+
+    constructor(options: ResponseDefinition);
+
+    dataURI(): string;
+
+    details(): any;
+
+    encoding(): any;
+
+    json(reviver?: any, strict?: boolean): any;
+
+    mime(contentType: any, contentDisposition: any): any; //TODO ??
+
+    size(): number;
+
+    text(): string | undefined;
+
+    toJSON(): any;
+
+    update(options: any): void;
+
+    static createFromNode(response: any, cookies: any): any;
+
+    static isResponse(obj: any): boolean;
+
+    static mimeInfo(type: any, disposition: any): any; // TODO ??
+
+}
+
+export class Script extends Property {
+    exec: string[];
+    src: Url;
+    type: string;
+
+    constructor(options: any);
+
+    toSource(): string;
+
+    update(options?: {type?: string, src?: string, exec?: string | string[]}): void;
+
+    static isScript(obj: any): boolean;    
+}
+
+export class Url extends PropertyBase {
+    auth: string;
+    hash: string;
+    host: string[];
+    path: string[];
+    port: string;
+    protocol: string;
+    query: PropertyList<QueryParam>;
+    variables: VariableList;
+
+    constructor(options: any | string);
+
+    addQueryParams(params: any | string): void;
+
+    getHost(): string;
+
+    getOAuth1BaseUrl(): any;
+
+    getPath(options?: {unresolved: boolean}): string;
+
+    getPathWithQuery(): any | string;
+
+    getQueryString(options?: {encode: boolean | null, ignoredDisabled: boolean | null} | null): string;
+
+    getRaw(): string;
+
+    getRemote(options: {forcePort: boolean}): string;
+
+    removeQueryParams(params: QueryParam[] | string[] | string): void;
+
+    toString(forceProtocol?: boolean): string;
+
+    update(url: string | any): void;
+
+    static isUrl(obj: any): boolean;
+
+    static parse(url: string): any;
+
+}
+
+/* No documentation for this right now?
+export class UrlMatchPattern {
+    constructor(options: any, ...args: any[]);
+
+    createMatchPattern(): any;
+
+    getProtocols(): any;
+
+    globPatternToRegexp(pattern: any): any;
+
+    matchAbsoluteHostPattern(matchRegexObject: any, remote: any): any;
+
+    matchAnyHost(matchRegexObject: any): any;
+
+    matchSuffixHostPattern(matchRegexObject: any, remote: any): any;
+
+    test(urlStr: any): any;
+
+    testHost(host: any): any;
+
+    testPath(path: any): any;
+
+    testProtocol(protocol: any): any;
+
+    toJSON(): any;
+
+    toString(): any;
+
+    update(options: any): void;
+
+    static MATCH_ALL_URLS: string;
+
+    static PROTOCOL_DELIMITER: string;
+
+}
+
+export class UrlMatchPatternList extends PropertyList<UrlMatchPattern> {
+    constructor(parent: any, list: any);
+
+    test(urlStr: any): any;
+
+}*/
+
+export interface VariableDefinition extends PropertyDefinition {
+    value?: any;
+    type?: VariableTypes;
+}
+
+export enum VariableTypes {
+    string = 'string',
+    boolean = 'boolean',
+    number = 'number',
+    json = 'json',
+    any = 'any'
+}
+
+export class Variable extends Property implements VariableDefinition {
+    key: string;
+    type: VariableTypes;
+    value: any;
+
+    constructor(definition?: VariableDefinition);
+
+    cast(value: any): any;
+
+    castIn(value: any): any;
+
+    castOut(value: any): any;
+
+    get(): any;
+
+    set(value: any): void;
+
+    toString(): string;
+
+    update(options: VariableDefinition): void;
+
+    valueOf(value?: any): any;
+
+    valueType(typeName: string, _noCast: boolean): string;
+
+    static isVariable(obj: any): boolean;
+
+}
+
+export class VariableList extends PropertyList<Variable> {
+    constructor(parent: Property, populate: any);
+
+    replace(str: string, overrides?: any): string;
+
+    substitute(obj: any | any[], overrides?: any[] | null, mutate?: boolean): any;
+
+    syncFromObject(obj: any, track?: boolean, prune?: boolean): any;
+
+    syncToObject(obj?: any): any;
+
+    static isVariableList(obj: any): boolean;
+
+}
+
+export interface VariableScopeDefinition extends PropertyDefinition {
+    id?: string;
+    name?: string;
+    values?: VariableDefinition[]
+}
+
+export class VariableScope extends Property implements VariableScopeDefinition {
+    values?: VariableDefinition[];
+
+    constructor(definition: VariableScopeDefinition, layers?: VariableList[]);
+
+    addLayer(list: any): void;
+
+    clear(): void;
+
+    get(key: string): any;
+
+    has(variableName: string): boolean;
+
+    set(key: string, value: any, type: VariableTypes): void;
+
+    syncVariablesFrom(obj: any, track: any): any;
+
+    syncVariablesTo(obj: any): any;
+
+    toJSON(): any;
+
+    toObject(excludeDisabled: boolean, caseSensitive: boolean): any;
+
+    unset(key: string): void;
+
+    variables(): any;
+
+    static isVariableScope(obj: any): boolean;    
+}
+
+export class Version extends PropertyBase {
+    build: string;
+    major: string;
+    minor: string;
+    patch: string;
+    prerelease: string;
+    raw: string;
+    string: string;
+
+    constructor(options: any | string);
+
+    set(value: any | string): void;
+
+    toString(): string;    
+}    

From 30a2c6bb27c92c5ced9261e7519fd76e820d9012 Mon Sep 17 00:00:00 2001
From: Denis Augsburger <d.augsbi@gmail.com>
Date: Fri, 23 Feb 2018 10:43:32 +0100
Subject: [PATCH 0083/1382] Expand jss typings to represent SheetsRegistry

---
 types/jss/index.d.ts   | 15 ++++++++++-
 types/jss/jss-tests.ts | 58 +++++++++++++++++++++++++++++++++---------
 2 files changed, 60 insertions(+), 13 deletions(-)

diff --git a/types/jss/index.d.ts b/types/jss/index.d.ts
index d0136216ed..dfd705710f 100644
--- a/types/jss/index.d.ts
+++ b/types/jss/index.d.ts
@@ -5,6 +5,10 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
+export interface toCSSOptions {
+	indent?: number;
+}
+
 export interface Rule {
 	className: string;
 	selector: string;
@@ -62,7 +66,7 @@ export interface StyleSheet<T> {
 	/**
 	 * Convert rules to a CSS string.
 	 */
-	toString(options?: { indent?: number }): string;
+	toString(options?: toCSSOptions): string;
 }
 export type GenerateClassName<T> = (rule: Rule, sheet?: StyleSheet<T>) => string;
 export interface Style {
@@ -96,6 +100,15 @@ export interface RuleOptions {
 	index: number;
 	className: string;
 }
+export declare class SheetsRegistry {
+    constructor();
+    registry: ReadonlyArray<StyleSheet<any>>;
+    index(): number;
+    add(sheet: StyleSheet<any>): void;
+    reset(): void;
+    remove(sheet: StyleSheet<any>): void;
+    toString(options?: toCSSOptions): string;
+}
 declare class JSS {
 	constructor(options?: Partial<JSSOptions>);
 	createStyleSheet<T>(
diff --git a/types/jss/jss-tests.ts b/types/jss/jss-tests.ts
index 0cf3f51350..948dca39a2 100644
--- a/types/jss/jss-tests.ts
+++ b/types/jss/jss-tests.ts
@@ -2,7 +2,8 @@
 
 import {
 	create as createJSS,
-	default as sharedInstance
+	SheetsRegistry,
+	default as sharedInstance,
 } from 'jss';
 
 const jss = createJSS().setup({});
@@ -21,28 +22,30 @@ const styleSheet = jss.createStyleSheet(
 	{
 		link: true,
 	}
-).attach();
+);
 
-styleSheet.classes.container; // $ExpectType string
-styleSheet.classes.ruleWithMockObservable; // $ExpectType string
+const attachedStyleSheet = styleSheet.attach();
 
-const rule = styleSheet.addRule('dynamicRule', { color: 'indigo' });
+attachedStyleSheet.classes.container; // $ExpectType string
+attachedStyleSheet.classes.ruleWithMockObservable; // $ExpectType string
+
+const rule = attachedStyleSheet.addRule('dynamicRule', { color: 'indigo' });
 rule.prop('border-radius', 5).prop('color'); // $ExpectType string
-styleSheet.classes.dynamicRule; // $ExpectType string
+attachedStyleSheet.classes.dynamicRule; // $ExpectType string
 
-styleSheet.deleteRule('dynamicRule');
+attachedStyleSheet.deleteRule('dynamicRule');
 
 // test that `addRule` supports the shorthand signature
-const dynamicRule = styleSheet.addRule({ color: 'red' });
+const dynamicRule = attachedStyleSheet.addRule({ color: 'red' });
 
 const div = document.createElement('div');
 dynamicRule.applyTo(div);
 
-const containerRule = styleSheet.getRule('container');
+const containerRule = attachedStyleSheet.getRule('container');
 const containerJSON = containerRule.toJSON();
-const css = styleSheet.toString();
+const css = attachedStyleSheet.toString();
 
-styleSheet.addRules({
+attachedStyleSheet.addRules({
 	rule1: {
 		fontFamily: 'Roboto',
 		color: '#FFFFFF',
@@ -53,10 +56,41 @@ styleSheet.addRules({
 	},
 });
 
-styleSheet.detach();
+attachedStyleSheet.detach();
 
 sharedInstance.createStyleSheet({
 	container: {
 		background: '#000099',
 	}
 });
+
+/* SheetsRegistry test */
+const sheetsRegistry = new SheetsRegistry();
+sheetsRegistry.add(styleSheet);
+
+const secondStyleSheet = jss.createStyleSheet(
+	{
+		ruleWithMockObservable: {
+			subscribe() {}
+		},
+		container2: {
+			display: 'flex',
+			width: 150,
+			opacity: .8,
+		},
+	},
+	{
+		link: true,
+	}
+);
+
+sheetsRegistry.add(secondStyleSheet);
+sheetsRegistry.registry.length; // $ExpectType number
+sheetsRegistry.remove(secondStyleSheet);
+
+sheetsRegistry.index(); // $ExpectType number
+sheetsRegistry.toString(); // $ExpectType string
+// With css options
+sheetsRegistry.toString({indent: 5}); // $ExpectType string
+
+sheetsRegistry.reset();

From 0da14f6a5bd20ba88055fbcd162e79c6c13d6848 Mon Sep 17 00:00:00 2001
From: Ariel Saldana <hello@ariel.io>
Date: Fri, 23 Feb 2018 10:00:58 -0500
Subject: [PATCH 0084/1382] Support for helper functions

---
 .github/CODEOWNERS               |  2 +-
 types/showdown/index.d.ts        | 15 +++++++++++++--
 types/showdown/showdown-tests.ts |  2 ++
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index a03915a264..8ce8955c37 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -3379,7 +3379,7 @@
 /types/shopify-buy/                             @openminder
 /types/shortid/                                 @stpettersens @despairblue
 /types/shot/                                    @AJamesPhillips
-/types/showdown/                                @cbowdon @tan9
+/types/showdown/                                @cbowdon @tan9 @arielsaldana
 /types/shrink-ray/                              @forabi
 /types/siema/                                   @Irmiz @0x6368656174 @samnau
 /types/siesta/                                  @bquarmby
diff --git a/types/showdown/index.d.ts b/types/showdown/index.d.ts
index 3a1accb411..948fd966ec 100644
--- a/types/showdown/index.d.ts
+++ b/types/showdown/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for Showdown 1.7.2
+// Type definitions for Showdown 1.7.3
 // Project: https://github.com/coreyti/showdown
-// Definitions by: cbowdon <https://github.com/cbowdon>, Pei-Tang Huang <https://github.com/tan9>
+// Definitions by: cbowdon <https://github.com/cbowdon>, Pei-Tang Huang <https://github.com/tan9>, Ariel-Saldana <https://github.com/arielsaldana>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export = Showdown;
@@ -362,10 +362,21 @@ declare namespace Showdown {
          */
         new (converterOptions?: ConverterOptions): Converter;
     }
+    /** 
+     * Helper Interface 
+     */
+    interface Helper {
+        replaceRecursiveRegExp(...args: any[]): string;
+    }
 
     /** Constructor function for a Converter */
     var Converter: ConverterStatic;
 
+    /**
+     * Showdown helper
+     */
+    var helper: Helper;
+
     /**
      * Setting a "global" option affects all instances of showdown
      */
diff --git a/types/showdown/showdown-tests.ts b/types/showdown/showdown-tests.ts
index e0d9093bc1..09a04b920c 100644
--- a/types/showdown/showdown-tests.ts
+++ b/types/showdown/showdown-tests.ts
@@ -17,6 +17,8 @@ var preloadedExtensions = [ 'my-ext' ],
 var configuredConverter = new showdown.Converter();
     configuredConverter.addExtension({type: 'output', filter: (text, converter)=>{return text.replace('#', '*')}}, 'myext');
 
+console.log(showdown.helper);
+
 console.log(converter.makeHtml(exampleMarkdown));
 // should log '<h1 id="hellomarkdown">hello, markdown</h1>'
 

From cb7659eedfdcfbf8622dbcfc7e6f2296e7b4dbbd Mon Sep 17 00:00:00 2001
From: Andrew Pinkham <code@andrewsforge.com>
Date: Fri, 23 Feb 2018 17:37:14 -0500
Subject: [PATCH 0085/1382] leaflet: add methods and properties

The goal is to make writing plugins easier for developers by adding
private methods and properties.
---
 types/leaflet/index.d.ts       | 27 +++++++++++++++++++
 types/leaflet/leaflet-tests.ts | 47 ++++++++++++++++++++++++++++++++++
 2 files changed, 74 insertions(+)

diff --git a/types/leaflet/index.d.ts b/types/leaflet/index.d.ts
index eabb98c710..922b9ab686 100644
--- a/types/leaflet/index.d.ts
+++ b/types/leaflet/index.d.ts
@@ -182,6 +182,10 @@ export class Point {
     y: number;
 }
 
+export interface Coords extends Point {
+    z: number;
+}
+
 export type PointExpression = Point | PointTuple;
 
 export function point(x: number, y: number, round?: boolean): Point;
@@ -388,6 +392,7 @@ export interface InteractiveLayerOptions extends LayerOptions {
 }
 
 export class Layer extends Evented {
+    _map: Map;
     constructor(options?: LayerOptions);
     addTo(map: Map|LayerGroup): this;
     remove(): this;
@@ -439,6 +444,17 @@ export interface GridLayerOptions {
     keepBuffer?: number;
 }
 
+export interface InternalTiles {
+    [key: string]: {
+        active?: boolean,
+        coords: Coords,
+        current: boolean,
+        el: HTMLElement,
+        loaded?: Date,
+        retain?: boolean,
+    };
+}
+
 export class GridLayer extends Layer {
     constructor(options?: GridLayerOptions);
     bringToFront(): this;
@@ -449,6 +465,11 @@ export class GridLayer extends Layer {
     isLoading(): boolean;
     redraw(): this;
     getTileSize(): Point;
+
+    _tileCoordsToKey(coords: Coords): string;
+
+    _tiles: InternalTiles;
+    _tileZoom?: number;
 }
 
 export function gridLayer(options?: GridLayerOptions): GridLayer;
@@ -468,10 +489,16 @@ export interface TileLayerOptions extends GridLayerOptions {
     [name: string]: any;
 }
 
+export type DoneCallback = (error?: Error, tile?: HTMLElement) => void;
+
 export class TileLayer extends GridLayer {
     constructor(urlTemplate: string, options?: TileLayerOptions);
+    createTile(coords: Coords, done: DoneCallback): HTMLElement;
     setUrl(url: string, noRedraw?: boolean): this;
 
+    _abortLoading(): void;
+    _getZoomForUrl(): number;
+
     options: TileLayerOptions;
 }
 
diff --git a/types/leaflet/leaflet-tests.ts b/types/leaflet/leaflet-tests.ts
index c4f73e5b84..a22ab91248 100644
--- a/types/leaflet/leaflet-tests.ts
+++ b/types/leaflet/leaflet-tests.ts
@@ -510,3 +510,50 @@ lg = new L.LayerGroup([new L.Layer(), new L.Layer()], {
 	pane: 'overlayPane',
 	attribution: 'test'
 });
+
+// adapted from GridLayer documentation
+const CanvasLayer = L.GridLayer.extend({
+	createTile(coords: L.Coords, done: L.DoneCallback) {
+		const tile = (L.DomUtil.create('canvas', 'leaflet-tile') as HTMLCanvasElement);
+		const size = this.getTileSize();
+		tile.width = size.x;
+		tile.height = size.y;
+		return tile;
+	}
+});
+
+// adapted from GridLayer documentation
+const AsyncCanvasLayer = L.GridLayer.extend({
+	createTile(coords: L.Coords, done: L.DoneCallback) {
+		const tile = (L.DomUtil.create('canvas', 'leaflet-tile') as HTMLCanvasElement);
+		const size = this.getTileSize();
+		tile.width = size.x;
+		tile.height = size.y;
+		setTimeout(() => done(undefined, tile), 1000);
+		return tile;
+	}
+});
+
+export class ExtendedTileLayer extends L.TileLayer {
+	options: L.TileLayerOptions;
+	createTile(coords: L.Coords, done: L.DoneCallback) {
+		const newCoords: L.Coords = (new L.Point(coords.x, coords.y) as L.Coords);
+		newCoords.z = coords.z;
+		return super.createTile(newCoords, done);
+	}
+	_abortLoading() {
+		// adapted from TileLayer's implementation
+		for (const i in this._tiles) {
+			if (this._tiles[i].coords.z !== this._tileZoom) {
+				const tile = this._tiles[i].el;
+				tile.onload = L.Util.falseFn;
+				tile.onerror = L.Util.falseFn;
+				if (tile instanceof HTMLImageElement && !tile.complete) {
+					tile.src = L.Util.emptyImageUrl;
+					L.DomUtil.remove(tile);
+					this._tiles[i] = undefined;
+				}
+			}
+		}
+	}
+}

From d2e34706c978ac15569c9d65cd4ea0215e523e1a Mon Sep 17 00:00:00 2001
From: Silas Rech <silas@panascais.io>
Date: Sun, 25 Feb 2018 19:20:33 +0100
Subject: [PATCH 0086/1382] Add options for webp and tiff

---
 types/sharp/index.d.ts | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/types/sharp/index.d.ts b/types/sharp/index.d.ts
index 69f4bc970a..432be5346d 100644
--- a/types/sharp/index.d.ts
+++ b/types/sharp/index.d.ts
@@ -382,14 +382,14 @@ declare namespace sharp {
          * @throws {Error} Invalid options
          * @returns A sharp instance that can be used to chain operations
          */
-        webp(options?: OutputOptions): SharpInstance;
+        webp(options?: WebpOptions): SharpInstance;
         /**
          * Use these TIFF options for output image.
          * @param options Output options.
          * @throws {Error} Invalid options
          * @returns A sharp instance that can be used to chain operations
          */
-        tiff(options?: OutputOptions): SharpInstance;
+        tiff(options?: TiffOptions): SharpInstance;
         /**
          * Force output to be raw, uncompressed uint8 pixel data.
          * @returns A sharp instance that can be used to chain operations
@@ -498,6 +498,28 @@ declare namespace sharp {
         optimizeScans?: boolean;
     }
 
+    interface WebpOptions extends OutputOptions {
+        /** Quality of alpha layer, number from 0-100 (optional, default 100) */
+        alphaQuality?: number;
+        /** Use lossless compression mode (optional, default false) */
+        lossless?: boolean;
+        /** Use near_lossless compression mode (optional, default false) */
+        nearLossless?: boolean;
+    }
+
+    interface TiffOptions extends OutputOptions {
+        /** Compression options: lzw, deflate, jpeg (optional, default 'jpeg') */
+        compression?: string;
+        /** Compression predictor options: none, horizontal, float (optional, default  'horizontal') */
+        predictor?: string;
+        /** Horizontal resolution in pixels/mm (optional, default 1.0) */
+        xres?: number;
+        /** Vertical resolution in pixels/mm (optional, default 1.0) */
+        yres?: number;
+        /** Squash 8-bit images down to 1 bit (optional, default false) */
+        squash?: boolean;
+    }
+
     interface PngOptions {
         /** Use progressive (interlace) scan (optional, default false) */
         progressive?: boolean;

From 7121790b73fade321587d43bd7041a742c33cc96 Mon Sep 17 00:00:00 2001
From: Benjamin Riggs <deisum@gmail.com>
Date: Sun, 25 Feb 2018 21:20:02 -0600
Subject: [PATCH 0087/1382] Fixed bugs, added dependency on 'events'.

---
 types/kurento-utils/index.d.ts             | 14 +++++++++-----
 types/kurento-utils/kurento-utils-tests.ts |  4 ++++
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/types/kurento-utils/index.d.ts b/types/kurento-utils/index.d.ts
index 8074661881..a8a30005b6 100644
--- a/types/kurento-utils/index.d.ts
+++ b/types/kurento-utils/index.d.ts
@@ -1,10 +1,13 @@
-// Type definitions for kurento-utils 6.6
+// Type definitions for kurento-utils 6.7
 // Project: https://github.com/Kurento/kurento-utils-js
 // Definitions by: Miloslav Nenadál <https://github.com/nenadalm>
+//                 Benjamin Riggs <https://github.com/riggs>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
-export class WebRtcPeer {
+import { EventEmitter } from 'events';
+
+export class WebRtcPeer extends EventEmitter {
     /**
      * Using this property the user can get the peerConnection and use it directly.
      */
@@ -60,7 +63,7 @@ export class WebRtcPeer {
      */
     addIceCandidate: (
         iceCandidate: RTCIceCandidate,
-        callback?: () => void
+        callback?: (error: string | undefined) => void
     ) => void;
     /**
      * Using this method the user can get peerconnection’s local session descriptor.
@@ -73,8 +76,9 @@ export class WebRtcPeer {
     /**
      * Creates an offer that is a request to find a remote peer with a specific configuration.
      */
-    generateOffer: (error: string | undefined, sdp: string) => void;
-
+    generateOffer: (
+        callback: (error: string | undefined, sdp: string) => void
+    ) => void;
     /**
      * Create a WebRtcPeer as receive only.
      */
diff --git a/types/kurento-utils/kurento-utils-tests.ts b/types/kurento-utils/kurento-utils-tests.ts
index 5866a2e157..380b1b1019 100644
--- a/types/kurento-utils/kurento-utils-tests.ts
+++ b/types/kurento-utils/kurento-utils-tests.ts
@@ -4,6 +4,10 @@ import * as kurentoUtils from 'kurento-utils';
     const peer = kurentoUtils.WebRtcPeer.WebRtcPeerSendrecv({}, error => {});
     peer.showLocalVideo();
     peer.getLocalStream().getAudioTracks();
+    peer.generateOffer((error, sdp) => {});
+    peer.on('icecandidate', (candidate: any) => {
+        peer.addIceCandidate(candidate, error => {});
+    });
     peer.getRemoteStream().getAudioTracks();
     peer.processAnswer('answer', error => {});
     peer.processOffer('offer', (error, {}) => {});

From be24886f7a4b628636a6dda8bfdb60fc47937556 Mon Sep 17 00:00:00 2001
From: Oleg Repin <oleg.repin@iqoption.com>
Date: Mon, 26 Feb 2018 11:28:31 +0300
Subject: [PATCH 0088/1382] [bull] add `defaultJobOptions` to `QueueOptions`

---
 types/bull/index.d.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/types/bull/index.d.ts b/types/bull/index.d.ts
index a7a9ea350b..97844cfbbb 100644
--- a/types/bull/index.d.ts
+++ b/types/bull/index.d.ts
@@ -5,6 +5,7 @@
 //                 Marshall Cottrell <https://github.com/marshall007>
 //                 Weeco <https://github.com/weeco>
 //                 Gabriel Terwesten <https://github.com/blaugold>
+//                 Oleg Repin <https://github.com/iamolegga>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -51,6 +52,8 @@ declare namespace Bull {
     settings?: AdvancedSettings;
 
     limiter?: RateLimiter;
+
+    defaultJobOptions?: JobOptions;
   }
 
   interface AdvancedSettings {

From 0428c407f07b7c5619c790cd96fe2deb88644a95 Mon Sep 17 00:00:00 2001
From: Hasse Feldthaus <hafe@kb.dk>
Date: Mon, 26 Feb 2018 09:40:41 +0100
Subject: [PATCH 0089/1382] Update index.d.ts

Added Window to selector_object_callback type so $(window) is possible
---
 types/jquery/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/jquery/index.d.ts b/types/jquery/index.d.ts
index 90f6ffbd03..8422f3ec5c 100644
--- a/types/jquery/index.d.ts
+++ b/types/jquery/index.d.ts
@@ -152,7 +152,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * @since 1.4
      */
     (selector_object_callback?: JQuery.Selector | JQuery.htmlString | JQuery.TypeOrArray<Element> | JQuery |
-        JQuery.PlainObject |
+        JQuery.PlainObject | Window |
         ((this: Document, $: JQueryStatic<TElement>) => void)): JQuery<TElement>;
     /**
      * A multi-purpose callbacks list object that provides a powerful way to manage callback lists.

From 0535a1af2d8d7bf2de60d284e5a304a33b1dd9fe Mon Sep 17 00:00:00 2001
From: James Hulse <jameshulse@users.noreply.github.com>
Date: Mon, 26 Feb 2018 17:56:13 +0000
Subject: [PATCH 0090/1382] Add missing word to promise constructor explanation

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

diff --git a/types/es6-shim/index.d.ts b/types/es6-shim/index.d.ts
index 51824fc932..2cf61a9362 100644
--- a/types/es6-shim/index.d.ts
+++ b/types/es6-shim/index.d.ts
@@ -500,7 +500,7 @@ interface PromiseConstructor {
     /**
      * Creates a new Promise.
      * @param executor A callback used to initialize the promise. This callback is passed two arguments:
-     * a resolve callback used resolve the promise with a value or the result of another promise,
+     * a resolve callback used to resolve the promise with a value or the result of another promise,
      * and a reject callback used to reject the promise with a provided reason or error.
      */
     new <T>(executor: (resolve: (value?: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void): Promise<T>;

From e327a3e895003b3ab3dd2cc055261b1094bd9724 Mon Sep 17 00:00:00 2001
From: Josh Goldberg <joshuakgoldberg@outlook.com>
Date: Mon, 26 Feb 2018 12:12:31 -0800
Subject: [PATCH 0091/1382] Sentence fragment

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

diff --git a/types/react/global.d.ts b/types/react/global.d.ts
index c647e7239b..8d6062b4bc 100644
--- a/types/react/global.d.ts
+++ b/types/react/global.d.ts
@@ -1,5 +1,5 @@
 /*
-React projects that don't include the DOM library these interfaces need to compile.
+React projects that don't include the DOM library need these interfaces to compile.
 React Native applications use React, but there is no DOM available. The JavaScript runtime
 is ES6/ES2015 only. These definitions allow such projects to compile with only `--lib ES6`.
 */

From c79832e00141c34b9a49c09d6368175b58d0bb78 Mon Sep 17 00:00:00 2001
From: Adrian Farmadin <adrian.farmadin@gepardec.com>
Date: Mon, 26 Feb 2018 21:37:36 +0100
Subject: [PATCH 0092/1382] Point and Polygon functions for RethinkDb Geometry

---
 types/rethinkdb/index.d.ts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/types/rethinkdb/index.d.ts b/types/rethinkdb/index.d.ts
index d45f359359..038a9d48e6 100644
--- a/types/rethinkdb/index.d.ts
+++ b/types/rethinkdb/index.d.ts
@@ -40,6 +40,9 @@ declare module "rethinkdb" {
     export function asc(property: string): Sort;
     export function desc(property: string): Sort;
 
+    export function point(lng: number, lat: number): Point;
+    export function polygon(...point: Point[]): Polygon;
+
     export var count: Aggregator;
     export function sum(prop: string): Aggregator;
     export function avg(prop: string): Aggregator;
@@ -233,7 +236,13 @@ declare module "rethinkdb" {
          * See: https://rethinkdb.com/api/javascript/has_fields/
          */
         hasFields(...fields: string[]): T;
-    }
+    } 
+
+    interface Geometry { }
+
+    interface Point { }
+
+    interface Polygon extends Geometry { }
 
     interface Table extends Sequence, HasFields<Sequence> {
         indexCreate(name: string, index?: ExpressionFunction<any>): Operation<CreateResult>;

From 77a857abff084c942de362fdf2c9fce68f882b23 Mon Sep 17 00:00:00 2001
From: Phil Nova <pnova8@gmail.com>
Date: Mon, 26 Feb 2018 13:58:54 -0800
Subject: [PATCH 0093/1382] Add tag to SortEvent

In order to check if the event target is a hyperlink and cancel sort if the user clicks a link, the recommended pattern is to check SortEvent.target.tagName. (see https://stackoverflow.com/questions/15661343/check-if-event-target-is-hyperlink). However, the typings do not support this pattern as SortEvent.target does not expect a tag attribute.
---
 types/react-sortable-hoc/index.d.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/types/react-sortable-hoc/index.d.ts b/types/react-sortable-hoc/index.d.ts
index 851170036d..dbf402599f 100644
--- a/types/react-sortable-hoc/index.d.ts
+++ b/types/react-sortable-hoc/index.d.ts
@@ -18,6 +18,14 @@ export interface SortStart {
 
 export type SortEvent = React.MouseEvent<any> | React.TouchEvent<any>;
 
+interface Tag extends React.EventTarget {
+    tagName: string;
+}
+
+export interface SortEventWithTag extends SortEvent {
+    target: Tag;
+}
+
 export type SortStartHandler = (sort: SortStart, event: SortEvent) => void;
 
 export type SortMoveHandler = (event: SortEvent) => void;
@@ -45,7 +53,7 @@ export interface SortableContainerProps {
     pressDelay?: number;
     pressThreshold?: number;
     distance?: number;
-    shouldCancelStart?: (event: SortEvent) => boolean;
+    shouldCancelStart?: (event: SortEvent | SortEventWithTag) => boolean;
     onSortStart?: SortStartHandler;
     onSortMove?: SortMoveHandler;
     onSortEnd?: SortEndHandler;

From 51fd12ef41191e4444a8153eb953ac169265aaa9 Mon Sep 17 00:00:00 2001
From: yushulx <lingxiao1002@gmail.com>
Date: Tue, 27 Feb 2018 10:16:49 +0800
Subject: [PATCH 0094/1382] Add addon API test

---
 types/dwt/dwt-tests.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/types/dwt/dwt-tests.ts b/types/dwt/dwt-tests.ts
index b1a5cc6b09..16a56f1cd2 100644
--- a/types/dwt/dwt-tests.ts
+++ b/types/dwt/dwt-tests.ts
@@ -99,3 +99,13 @@ function downloadImage() {
     DWObject.HTTPDownload("www.dynamsoft.com", "img.png", () => {}, (errorCode: number, errorString: string) => {});
   }
 }
+
+function loadPDF() {
+    const DWObject = Dynamsoft.WebTwainEnv.GetWebTwain('dwtcontrolContainer');
+    if (DWObject) {
+        DWObject.Addon.PDF.SetResolution(200);
+        DWObject.Addon.PDF.SetConvertMode(1);
+        DWObject.IfShowFileDialog = true;
+        DWObject.LoadImageEx(" ", 5);
+    }
+}

From f3e5f751b71b523783671302a3f838a26f7f143f Mon Sep 17 00:00:00 2001
From: Denis Augsburger <d.augsbi@gmail.com>
Date: Tue, 27 Feb 2018 09:58:21 +0100
Subject: [PATCH 0095/1382] Rename interface

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

diff --git a/types/jss/index.d.ts b/types/jss/index.d.ts
index dfd705710f..e106a70c74 100644
--- a/types/jss/index.d.ts
+++ b/types/jss/index.d.ts
@@ -5,7 +5,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
-export interface toCSSOptions {
+export interface ToCssOptions {
 	indent?: number;
 }
 
@@ -66,7 +66,7 @@ export interface StyleSheet<T> {
 	/**
 	 * Convert rules to a CSS string.
 	 */
-	toString(options?: toCSSOptions): string;
+	toString(options?: ToCssOptions): string;
 }
 export type GenerateClassName<T> = (rule: Rule, sheet?: StyleSheet<T>) => string;
 export interface Style {
@@ -107,7 +107,7 @@ export declare class SheetsRegistry {
     add(sheet: StyleSheet<any>): void;
     reset(): void;
     remove(sheet: StyleSheet<any>): void;
-    toString(options?: toCSSOptions): string;
+    toString(options?: ToCssOptions): string;
 }
 declare class JSS {
 	constructor(options?: Partial<JSSOptions>);

From 6b53e1fbde3df53a8c2b2feae2188e25e7e970ee Mon Sep 17 00:00:00 2001
From: Denis Augsburger <d.augsbi@gmail.com>
Date: Tue, 27 Feb 2018 10:10:56 +0100
Subject: [PATCH 0096/1382] Index as a function which returns a number

---
 types/jss/jss-tests.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/jss/jss-tests.ts b/types/jss/jss-tests.ts
index 948dca39a2..80f4c1e94f 100644
--- a/types/jss/jss-tests.ts
+++ b/types/jss/jss-tests.ts
@@ -89,6 +89,7 @@ sheetsRegistry.registry.length; // $ExpectType number
 sheetsRegistry.remove(secondStyleSheet);
 
 sheetsRegistry.index(); // $ExpectType number
+sheetsRegistry.index; // $ExpectType () => number
 sheetsRegistry.toString(); // $ExpectType string
 // With css options
 sheetsRegistry.toString({indent: 5}); // $ExpectType string

From d70bcc668aff1d50607e94bdc73672728b7afab8 Mon Sep 17 00:00:00 2001
From: Denis Augsburger <d.augsbi@gmail.com>
Date: Tue, 27 Feb 2018 10:48:05 +0100
Subject: [PATCH 0097/1382] Change to represent get index

---
 types/jss/index.d.ts   | 2 +-
 types/jss/jss-tests.ts | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/types/jss/index.d.ts b/types/jss/index.d.ts
index e106a70c74..0f77605b2c 100644
--- a/types/jss/index.d.ts
+++ b/types/jss/index.d.ts
@@ -103,7 +103,7 @@ export interface RuleOptions {
 export declare class SheetsRegistry {
     constructor();
     registry: ReadonlyArray<StyleSheet<any>>;
-    index(): number;
+    readonly index: number;
     add(sheet: StyleSheet<any>): void;
     reset(): void;
     remove(sheet: StyleSheet<any>): void;
diff --git a/types/jss/jss-tests.ts b/types/jss/jss-tests.ts
index 80f4c1e94f..a5c6f34126 100644
--- a/types/jss/jss-tests.ts
+++ b/types/jss/jss-tests.ts
@@ -88,8 +88,8 @@ sheetsRegistry.add(secondStyleSheet);
 sheetsRegistry.registry.length; // $ExpectType number
 sheetsRegistry.remove(secondStyleSheet);
 
-sheetsRegistry.index(); // $ExpectType number
-sheetsRegistry.index; // $ExpectType () => number
+sheetsRegistry.index; // $ExpectType number
+sheetsRegistry.index = 5; // $ExpectError
 sheetsRegistry.toString(); // $ExpectType string
 // With css options
 sheetsRegistry.toString({indent: 5}); // $ExpectType string

From 1426182dcd3721e627298302f2862030626b806a Mon Sep 17 00:00:00 2001
From: Alex Regan <alex.joseph.regan@gmail.com>
Date: Tue, 27 Feb 2018 08:19:14 -0700
Subject: [PATCH 0098/1382] fix(bull): union callback param, not return val

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

diff --git a/types/bull/index.d.ts b/types/bull/index.d.ts
index 77317c44ff..289c05d149 100644
--- a/types/bull/index.d.ts
+++ b/types/bull/index.d.ts
@@ -269,7 +269,7 @@ declare namespace Bull {
      * Errors will be passed as a second argument to the "failed" event;
      * results, as a second argument to the "completed" event.
      */
-    process(callback: (job: Job, done: DoneCallback) => void | string): void;
+    process(callback: ((job: Job, done: DoneCallback) => void) | string): void;
 
     /**
      * Defines a processing function for the jobs placed into a given Queue.
@@ -316,7 +316,7 @@ declare namespace Bull {
      *
      * @param concurrency Bull will then call you handler in parallel respecting this max number.
      */
-    process(concurrency: number, callback: (job: Job, done: DoneCallback) => void | string): void;
+    process(concurrency: number, callback: ((job: Job, done: DoneCallback) => void) | string): void;
 
     /**
      * Defines a named processing function for the jobs placed into a given Queue.
@@ -353,7 +353,7 @@ declare namespace Bull {
      * @param name Bull will only call the handler if the job name matches
      */
     // tslint:disable-next-line:unified-signatures
-    process(name: string, callback: (job: Job, done: DoneCallback) => void | string): void;
+    process(name: string, callback: ((job: Job, done: DoneCallback) => void) | string): void;
 
     /**
      * Defines a named processing function for the jobs placed into a given Queue.
@@ -390,7 +390,7 @@ declare namespace Bull {
      * @param name Bull will only call the handler if the job name matches
      * @param concurrency Bull will then call you handler in parallel respecting this max number.
      */
-    process(name: string, concurrency: number, callback: (job: Job, done: DoneCallback) => void | string): void;
+    process(name: string, concurrency: number, callback: ((job: Job, done: DoneCallback) => void) | string): void;
 
     /**
      * Creates a new job and adds it to the queue.

From c04400ee4be3aa5b6c272fae0e8693547f049a1f Mon Sep 17 00:00:00 2001
From: Netanel Draiman <Nexxado@users.noreply.github.com>
Date: Tue, 27 Feb 2018 18:05:22 +0200
Subject: [PATCH 0099/1382] [Dragula] updated moves() function arguments in
 DragulaOptions

Updated moves() function arguments in DragulaOptions to include a sibling argument.
---
 types/dragula/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/dragula/index.d.ts b/types/dragula/index.d.ts
index f91e8b70ac..51998fb583 100644
--- a/types/dragula/index.d.ts
+++ b/types/dragula/index.d.ts
@@ -13,7 +13,7 @@ declare namespace dragula {
     interface DragulaOptions {
         containers?: Element[];
         isContainer?: (el?: Element) => boolean;
-        moves?: (el?: Element, container?: Element, handle?: Element) => boolean;
+        moves?: (el?: Element, container?: Element, handle?: Element, sibling?: Element) => boolean;
         accepts?: (el?: Element, target?: Element, source?: Element, sibling?: Element) => boolean;
         invalid?: (el?: Element, target?: Element) => boolean;
         direction?: string;

From 58296325aa33d943a1caed60b8c5438b5d4bd2d9 Mon Sep 17 00:00:00 2001
From: Ragg <Ragg-@users.noreply.github.com>
Date: Wed, 28 Feb 2018 01:26:21 +0900
Subject: [PATCH 0100/1382] Add `dispatchr` typing

---
 types/dispatchr/addons/BaseStore.d.ts   | 17 +++++++
 types/dispatchr/addons/createStore.d.ts | 15 ++++++
 types/dispatchr/dispatchr-test.ts       | 28 +++++++++++
 types/dispatchr/index.d.ts              | 62 +++++++++++++++++++++++++
 types/dispatchr/tsconfig.json           | 25 ++++++++++
 types/dispatchr/tslint.json             |  1 +
 6 files changed, 148 insertions(+)
 create mode 100644 types/dispatchr/addons/BaseStore.d.ts
 create mode 100644 types/dispatchr/addons/createStore.d.ts
 create mode 100644 types/dispatchr/dispatchr-test.ts
 create mode 100644 types/dispatchr/index.d.ts
 create mode 100644 types/dispatchr/tsconfig.json
 create mode 100644 types/dispatchr/tslint.json

diff --git a/types/dispatchr/addons/BaseStore.d.ts b/types/dispatchr/addons/BaseStore.d.ts
new file mode 100644
index 0000000000..9e5e4888c3
--- /dev/null
+++ b/types/dispatchr/addons/BaseStore.d.ts
@@ -0,0 +1,17 @@
+// TypeScript Version: 2.3
+/// <reference types="node" />
+
+import { Dispatcher, DispatcherInterface, DispatcherContext, Store } from 'dispatchr';
+import { EventEmitter } from 'events';
+
+declare class BaseStore<S = {}> extends EventEmitter implements Store<S> {
+    constructor(dispatcher: DispatcherInterface);
+    initialize?: () => void;
+    getContext(): DispatcherContext;
+    addChangeListener(callback: () => void): void;
+    removeChangeListener(callback: () => void): void;
+    shouldDehydrate(): boolean;
+    emitChange(): void;
+}
+
+export = BaseStore;
diff --git a/types/dispatchr/addons/createStore.d.ts b/types/dispatchr/addons/createStore.d.ts
new file mode 100644
index 0000000000..11fe076a8f
--- /dev/null
+++ b/types/dispatchr/addons/createStore.d.ts
@@ -0,0 +1,15 @@
+// TypeScript Version: 2.3
+import { StoreClass, Store } from 'dispatchr';
+
+interface StoreOptions {
+    initialize?(): void;
+    storeName: string;
+    handlers: { [event: string]: string };
+}
+
+type CreateStoreOption = ThisType<Store> & StoreOptions & { [key: string]: any };
+
+type CreateStore = (options: CreateStoreOption) => StoreClass;
+
+declare const _: CreateStore;
+export = _;
diff --git a/types/dispatchr/dispatchr-test.ts b/types/dispatchr/dispatchr-test.ts
new file mode 100644
index 0000000000..816e6fb3bd
--- /dev/null
+++ b/types/dispatchr/dispatchr-test.ts
@@ -0,0 +1,28 @@
+import { createDispatcher, Store } from 'dispatchr';
+import * as createStore from 'dispatchr/addons/createStore';
+
+const TestStore = createStore({
+    storeName: 'TestStore',
+
+    handlers: {
+        ACTION_NAME: 'actionHandler'
+    },
+
+    initialize() { },
+
+    actionHandler() {
+        this.emitChange();
+    }
+});
+
+const dispatcher = createDispatcher({
+    errorHandler(e, context) {
+        e.meta;
+        e.type;
+        e.message;
+    },
+    stores: [TestStore]
+});
+
+const context = dispatcher.createContext({});
+context.dispatch('ACTION_NAME', {});
diff --git a/types/dispatchr/index.d.ts b/types/dispatchr/index.d.ts
new file mode 100644
index 0000000000..f245c5f728
--- /dev/null
+++ b/types/dispatchr/index.d.ts
@@ -0,0 +1,62 @@
+// TypeScript Version: 2.3
+/// <reference types="node" />
+import { EventEmitter } from 'events';
+
+export interface DispatcherState {
+    stores: { [storeName: string]: any };
+}
+
+export interface DispatcherOption {
+    stores?: StoreClass[];
+    errorHandler?: (e: DispatcherError, context: DispatcherContext) => void;
+}
+
+export interface StoreClass {
+    storeName: string;
+    new(): Store;
+}
+
+export interface Store<S = {}> extends EventEmitter {
+    dehydrate?(): S;
+    rehydrate?(state: S): void;
+    shouldDehydrate?(): boolean;
+    emitChange(): void;
+}
+
+export interface Dispatcher {
+    createContext(context: {}): DispatcherContext;
+    registerStore(store: StoreClass): void;
+    isRegistered(store: StoreClass | string): boolean;
+    getStoreName(store: StoreClass | string): string;
+}
+
+export interface DispatcherInterface {
+    getContext(): DispatcherContext;
+    getStore: DispatcherContext['getStore'];
+    waitFor: DispatcherContext['waitFor'];
+}
+
+export interface DispatcherContext {
+    getStore(name: string): Store;
+    getStore<T extends StoreClass>(name: T): T;
+
+    dispatch(actionName: string, payload: any): void;
+
+    dehydrate(): DispatcherState;
+    rehydrate(dispatcherState: DispatcherState): void;
+
+    waitFor(stores: Array<string|StoreClass>, callback: () => void): void;
+    dispatcherInterface: DispatcherInterface;
+}
+
+export interface DispatcherError {
+    message: string;
+    type: string;
+    meta: {
+        actionName?: string,
+        payload?: any,
+        error: Error
+    };
+}
+
+export function createDispatcher(options: DispatcherOption): Dispatcher;
diff --git a/types/dispatchr/tsconfig.json b/types/dispatchr/tsconfig.json
new file mode 100644
index 0000000000..3a2ad998e2
--- /dev/null
+++ b/types/dispatchr/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "addons/BaseStore.d.ts",
+        "addons/createStore.d.ts",
+        "dispatchr-test.ts"
+    ]
+  }
diff --git a/types/dispatchr/tslint.json b/types/dispatchr/tslint.json
new file mode 100644
index 0000000000..c17ac4dd6d
--- /dev/null
+++ b/types/dispatchr/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dtslint.json" }

From 0b1f1c3e872fd8feb516867248e53831d756f2b8 Mon Sep 17 00:00:00 2001
From: Ragg <Ragg-@users.noreply.github.com>
Date: Wed, 28 Feb 2018 02:07:03 +0900
Subject: [PATCH 0101/1382] Improve createStore() type

---
 types/dispatchr/addons/createStore.d.ts | 5 ++---
 types/dispatchr/dispatchr-test.ts       | 5 ++++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/types/dispatchr/addons/createStore.d.ts b/types/dispatchr/addons/createStore.d.ts
index 11fe076a8f..a62425f9ae 100644
--- a/types/dispatchr/addons/createStore.d.ts
+++ b/types/dispatchr/addons/createStore.d.ts
@@ -5,11 +5,10 @@ interface StoreOptions {
     initialize?(): void;
     storeName: string;
     handlers: { [event: string]: string };
+    [prop: string]: any;
 }
 
-type CreateStoreOption = ThisType<Store> & StoreOptions & { [key: string]: any };
-
-type CreateStore = (options: CreateStoreOption) => StoreClass;
+type CreateStore = <This extends StoreOptions>(options: This & ThisType<This & Store>) => StoreClass;
 
 declare const _: CreateStore;
 export = _;
diff --git a/types/dispatchr/dispatchr-test.ts b/types/dispatchr/dispatchr-test.ts
index 816e6fb3bd..3c26c50c9b 100644
--- a/types/dispatchr/dispatchr-test.ts
+++ b/types/dispatchr/dispatchr-test.ts
@@ -12,7 +12,10 @@ const TestStore = createStore({
 
     actionHandler() {
         this.emitChange();
-    }
+        this.additionalMethod();
+    },
+
+    additionalMethod() {}
 });
 
 const dispatcher = createDispatcher({

From d08933b8f62b5afd7fd1a23a5bde65054ae56c35 Mon Sep 17 00:00:00 2001
From: Ragg <Ragg-@users.noreply.github.com>
Date: Wed, 28 Feb 2018 02:15:17 +0900
Subject: [PATCH 0102/1382] Regenerate by dts-gen

---
 types/dispatchr/{dispatchr-test.ts => dispatchr-tests.ts} | 0
 types/dispatchr/index.d.ts                                | 4 ++++
 types/dispatchr/tsconfig.json                             | 6 +++---
 types/dispatchr/tslint.json                               | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)
 rename types/dispatchr/{dispatchr-test.ts => dispatchr-tests.ts} (100%)

diff --git a/types/dispatchr/dispatchr-test.ts b/types/dispatchr/dispatchr-tests.ts
similarity index 100%
rename from types/dispatchr/dispatchr-test.ts
rename to types/dispatchr/dispatchr-tests.ts
diff --git a/types/dispatchr/index.d.ts b/types/dispatchr/index.d.ts
index f245c5f728..f9f31739fd 100644
--- a/types/dispatchr/index.d.ts
+++ b/types/dispatchr/index.d.ts
@@ -1,3 +1,7 @@
+// Type definitions for dispatchr 1.2
+// Project: https://github.com/yahoo/fluxible#readme
+// Definitions by: Ragg <https://github.com/Ragg->
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 /// <reference types="node" />
 import { EventEmitter } from 'events';
diff --git a/types/dispatchr/tsconfig.json b/types/dispatchr/tsconfig.json
index 3a2ad998e2..47109880da 100644
--- a/types/dispatchr/tsconfig.json
+++ b/types/dispatchr/tsconfig.json
@@ -18,8 +18,8 @@
     },
     "files": [
         "index.d.ts",
-        "addons/BaseStore.d.ts",
         "addons/createStore.d.ts",
-        "dispatchr-test.ts"
+        "addons/BaseStore.d.ts",
+        "dispatchr-tests.ts"
     ]
-  }
+}
diff --git a/types/dispatchr/tslint.json b/types/dispatchr/tslint.json
index c17ac4dd6d..3db14f85ea 100644
--- a/types/dispatchr/tslint.json
+++ b/types/dispatchr/tslint.json
@@ -1 +1 @@
-{ "extends": "dtslint/dtslint.json" }
+{ "extends": "dtslint/dt.json" }

From e85eb95d786b6d333c94ec952f8f0ed1bf230645 Mon Sep 17 00:00:00 2001
From: Ragg <Ragg-@users.noreply.github.com>
Date: Wed, 28 Feb 2018 02:29:55 +0900
Subject: [PATCH 0103/1382] Fix for test

---
 types/dispatchr/addons/BaseStore.d.ts   | 3 +--
 types/dispatchr/addons/createStore.d.ts | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/types/dispatchr/addons/BaseStore.d.ts b/types/dispatchr/addons/BaseStore.d.ts
index 9e5e4888c3..0c1c577a3f 100644
--- a/types/dispatchr/addons/BaseStore.d.ts
+++ b/types/dispatchr/addons/BaseStore.d.ts
@@ -1,7 +1,6 @@
-// TypeScript Version: 2.3
 /// <reference types="node" />
 
-import { Dispatcher, DispatcherInterface, DispatcherContext, Store } from 'dispatchr';
+import { Dispatcher, DispatcherInterface, DispatcherContext, Store } from '../index';
 import { EventEmitter } from 'events';
 
 declare class BaseStore<S = {}> extends EventEmitter implements Store<S> {
diff --git a/types/dispatchr/addons/createStore.d.ts b/types/dispatchr/addons/createStore.d.ts
index a62425f9ae..0c6388d1ae 100644
--- a/types/dispatchr/addons/createStore.d.ts
+++ b/types/dispatchr/addons/createStore.d.ts
@@ -1,5 +1,4 @@
-// TypeScript Version: 2.3
-import { StoreClass, Store } from 'dispatchr';
+import { StoreClass, Store } from '../index';
 
 interface StoreOptions {
     initialize?(): void;

From 99a18f011384596248ea2d5a8cebf4c26d1e6cba Mon Sep 17 00:00:00 2001
From: Ragg <Ragg-@users.noreply.github.com>
Date: Wed, 28 Feb 2018 02:32:08 +0900
Subject: [PATCH 0104/1382] to ReadonlyArray

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

diff --git a/types/dispatchr/index.d.ts b/types/dispatchr/index.d.ts
index f9f31739fd..3fa0118729 100644
--- a/types/dispatchr/index.d.ts
+++ b/types/dispatchr/index.d.ts
@@ -49,7 +49,7 @@ export interface DispatcherContext {
     dehydrate(): DispatcherState;
     rehydrate(dispatcherState: DispatcherState): void;
 
-    waitFor(stores: Array<string|StoreClass>, callback: () => void): void;
+    waitFor(stores: ReadonlyArray<string|StoreClass>, callback: () => void): void;
     dispatcherInterface: DispatcherInterface;
 }
 

From 9b593e264d25ac6351ce959bb06a4e5c1cdd613f Mon Sep 17 00:00:00 2001
From: Dennis George <dennispg@gmail.com>
Date: Tue, 27 Feb 2018 13:43:11 -0600
Subject: [PATCH 0105/1382] updated for webpack 4.0

---
 types/webpack/index.d.ts | 48 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

diff --git a/types/webpack/index.d.ts b/types/webpack/index.d.ts
index d6102808b6..06483792cd 100644
--- a/types/webpack/index.d.ts
+++ b/types/webpack/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for webpack 3.8
+// Type definitions for webpack 4.0
 // Project: https://github.com/webpack/webpack
 // Definitions by: Qubo <https://github.com/tkqubo>
 //                 Benjamin Lim <https://github.com/bumbleblym>
@@ -35,6 +35,8 @@ declare function webpack(options: webpack.Configuration[]): webpack.MultiCompile
 
 declare namespace webpack {
     interface Configuration {
+        /** Specify which set of defaults to use. */
+        mode?: "development" | "production";
         /** Name of the configuration. Used when loading multiple configurations. */
         name?: string;
         /**
@@ -105,6 +107,9 @@ declare namespace webpack {
         performance?: Options.Performance;
         /** Limit the number of parallel processed modules. Can be used to fine tune performance or to get more reliable profiling results */
         parallelism?: number;
+
+        /** Optimization options */
+        optimization?: Options.Optimization;
     }
 
     interface Entry {
@@ -496,6 +501,47 @@ declare namespace webpack {
         }
         type Stats = Stats.ToStringOptions;
         type WatchOptions = ICompiler.WatchOptions;
+
+        interface Optimization {
+            /** Modules are removed from chunks when they are already available in all parent chunk groups.
+             *  This reduces asset size. Smaller assets also result in faster builds since less code generation has to be performed. */
+            removeAvailableModules?: boolean;
+            /** Empty chunks are removed. This reduces load in filesystem and results in faster builds. */
+            removeEmptyChunks?: boolean;
+            /** Equal chunks are merged. This results in less code generation and faster builds. */
+            mergeDuplicateChunks?: boolean;
+            /** Chunks which are subsets of other chunks are determined and flagged in a way that subsets don’t have to be loaded when the bigger chunk has been loaded. */
+            flagIncludedChunks?: boolean;
+            /** Give more often used ids smaller (shorter) values. */
+            occurrenceOrder?: boolean;
+            /** Determine exports for each module when possible. This information is used by other optimizations or code generation. I. e. to generate more efficient code for export * from. */
+            providedExports?: boolean;
+            /** Determine used exports for each module. This depends on optimization.providedExports. This information is used by other optimizations or code generation.
+             *  I. e. exports are not generated for unused exports, export names are mangled to single char identifiers when all usages are compatible. DCE in minimizers will benefit from this and can remove unused exports. */
+            usedExports?: boolean;
+            /** Recognise the sideEffects flag in package.json or rules to eliminate modules. This depends on optimization.providedExports and optimization.usedExports.
+             *  These dependencies have a cost, but eliminating modules has positive impact on performance because of less code generation. It depends on your codebase.
+             *  Try it for possible performance wins. */
+            sideEffects?: boolean;
+            /** Tries to find segments of the module graph which can be safely concatenated into a single module. Depends on optimization.providedExports and optimization.usedExports. */
+            concatenateModules?: boolean;
+            /** Finds modules which are shared between chunk and splits them into separate chunks to reduce duplication or separate vendor modules from application modules. */
+            splitChunks?: boolean;
+            /** Create a separate chunk for the webpack runtime code and chunk manifest. This chunk should be inlined into the HTML */
+            runtimeChunk?: boolean;
+            /** Don’t write output assets when compilation errors. */
+            noEmitOnErrors?: boolean;
+            /** Instead of numeric ids, give modules useful names. */
+            namedModules?: boolean;
+            /** Instead of numeric ids, give chunks useful names. */
+            namedChunks?: boolean;
+            /** Defines the process.env.NODE_ENV constant to a compile-time-constant value. This allows to remove development only code from code. */
+            nodeEnv?: boolean;
+            /** Use the minimizer (optimization.minimizer, by default uglify-js) to minimize output assets. */
+            minimize?: boolean;
+            /** Identifiers used in records are relative to context directory. */
+            portableRecords?: boolean;
+        }
     }
 
     // tslint:disable-next-line:interface-name

From ee6770df50f6e893d2a47e3e41510378963893cc Mon Sep 17 00:00:00 2001
From: Dennis George <dennispg@gmail.com>
Date: Tue, 27 Feb 2018 13:51:14 -0600
Subject: [PATCH 0106/1382] updated webpack 4.0 optimization options comments
 for linter

---
 types/webpack/index.d.ts | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/types/webpack/index.d.ts b/types/webpack/index.d.ts
index 06483792cd..fbc0d9f636 100644
--- a/types/webpack/index.d.ts
+++ b/types/webpack/index.d.ts
@@ -503,8 +503,10 @@ declare namespace webpack {
         type WatchOptions = ICompiler.WatchOptions;
 
         interface Optimization {
-            /** Modules are removed from chunks when they are already available in all parent chunk groups.
-             *  This reduces asset size. Smaller assets also result in faster builds since less code generation has to be performed. */
+            /**
+             *  Modules are removed from chunks when they are already available in all parent chunk groups.
+             *  This reduces asset size. Smaller assets also result in faster builds since less code generation has to be performed.
+             */
             removeAvailableModules?: boolean;
             /** Empty chunks are removed. This reduces load in filesystem and results in faster builds. */
             removeEmptyChunks?: boolean;
@@ -516,12 +518,17 @@ declare namespace webpack {
             occurrenceOrder?: boolean;
             /** Determine exports for each module when possible. This information is used by other optimizations or code generation. I. e. to generate more efficient code for export * from. */
             providedExports?: boolean;
-            /** Determine used exports for each module. This depends on optimization.providedExports. This information is used by other optimizations or code generation.
-             *  I. e. exports are not generated for unused exports, export names are mangled to single char identifiers when all usages are compatible. DCE in minimizers will benefit from this and can remove unused exports. */
+            /**
+             *  Determine used exports for each module. This depends on optimization.providedExports. This information is used by other optimizations or code generation.
+             *  I. e. exports are not generated for unused exports, export names are mangled to single char identifiers when all usages are compatible.
+             *  DCE in minimizers will benefit from this and can remove unused exports.
+             */
             usedExports?: boolean;
-            /** Recognise the sideEffects flag in package.json or rules to eliminate modules. This depends on optimization.providedExports and optimization.usedExports.
+            /**
+             *  Recognise the sideEffects flag in package.json or rules to eliminate modules. This depends on optimization.providedExports and optimization.usedExports.
              *  These dependencies have a cost, but eliminating modules has positive impact on performance because of less code generation. It depends on your codebase.
-             *  Try it for possible performance wins. */
+             *  Try it for possible performance wins.
+             */
             sideEffects?: boolean;
             /** Tries to find segments of the module graph which can be safely concatenated into a single module. Depends on optimization.providedExports and optimization.usedExports. */
             concatenateModules?: boolean;

From d1d1d18d98245d457c03947bf63079da71e714cd Mon Sep 17 00:00:00 2001
From: Dave Keen <dev@ruffness.com>
Date: Mon, 26 Feb 2018 19:59:43 +0100
Subject: [PATCH 0107/1382] Added chmod method to rsync types

---
 types/rsync/index.d.ts     | 3 ++-
 types/rsync/rsync-tests.ts | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/types/rsync/index.d.ts b/types/rsync/index.d.ts
index e86d22647a..b67932eb5a 100644
--- a/types/rsync/index.d.ts
+++ b/types/rsync/index.d.ts
@@ -48,7 +48,7 @@ interface Rsync {
         stdout: StreamDataHandler,
         stderr: StreamDataHandler
     ): child_process.ChildProcess;
-    
+
     // cwd
     cwd(cwd: string): string;
 
@@ -63,6 +63,7 @@ interface Rsync {
     quiet(): Rsync;
     dirs(): Rsync;
     links(): Rsync;
+    chmod(flags: string): Rsync;
     dry(): Rsync;
 
     // accessor methods
diff --git a/types/rsync/rsync-tests.ts b/types/rsync/rsync-tests.ts
index 41ec4dd9b1..fe9bf39558 100644
--- a/types/rsync/rsync-tests.ts
+++ b/types/rsync/rsync-tests.ts
@@ -114,6 +114,7 @@ rsync.shell('ssh')
     .quiet()
     .dirs()
     .links()
+    .chmod("ug=rwX")
     .dry();
 
 
@@ -152,4 +153,4 @@ rsync.include('/a/file')
   .include('/b/file');
 
 // as Array
-rsync.include(['/a/file', '/b/file']);
\ No newline at end of file
+rsync.include(['/a/file', '/b/file']);

From be525690a83492681ee6e28d45839ccffbfb82b4 Mon Sep 17 00:00:00 2001
From: Dennis George <dennispg@gmail.com>
Date: Tue, 27 Feb 2018 14:18:59 -0600
Subject: [PATCH 0108/1382] updated for webpack 4.0 added
 optimization.minimizer option

---
 types/webpack/index.d.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/types/webpack/index.d.ts b/types/webpack/index.d.ts
index fbc0d9f636..f704797f58 100644
--- a/types/webpack/index.d.ts
+++ b/types/webpack/index.d.ts
@@ -546,6 +546,8 @@ declare namespace webpack {
             nodeEnv?: boolean;
             /** Use the minimizer (optimization.minimizer, by default uglify-js) to minimize output assets. */
             minimize?: boolean;
+            /** Configure minimzers and options TODO: add type for this */
+            minimizer?: any;
             /** Identifiers used in records are relative to context directory. */
             portableRecords?: boolean;
         }

From 1b53b01f4084b83fd301c8360486722799532047 Mon Sep 17 00:00:00 2001
From: Nick Schultz <nrschultz@gmail.com>
Date: Tue, 27 Feb 2018 15:57:47 -0500
Subject: [PATCH 0109/1382] add returning option to upsert and change return
 type accordingly

---
 types/sequelize/index.d.ts         | 8 +++++---
 types/sequelize/sequelize-tests.ts | 4 +++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/types/sequelize/index.d.ts b/types/sequelize/index.d.ts
index 643a9a8167..fc4fc03409 100644
--- a/types/sequelize/index.d.ts
+++ b/types/sequelize/index.d.ts
@@ -3445,7 +3445,7 @@ declare namespace sequelize {
     /**
  * Options for Model.upsert method
      */
-    interface UpsertOptions extends FieldsOptions, LoggingOptions, SearchPathOptions {
+    interface UpsertOptions extends FieldsOptions, LoggingOptions, SearchPathOptions, ReturningOptions {
     }
 
     /**
@@ -3993,8 +3993,10 @@ declare namespace sequelize {
  * because SQLite always runs INSERT OR IGNORE + UPDATE, in a single query, so there is no way to know
  * whether the row was inserted or not.
  */
-        upsert(values: TAttributes, options?: UpsertOptions): Promise<boolean>;
-        insertOrUpdate(values: TAttributes, options?: UpsertOptions): Promise<boolean>;
+        upsert(values: TAttributes, options?: UpsertOptions & { returning: false | undefined }): Promise<boolean>;
+        upsert(values: TAttributes, options?: UpsertOptions & { returning: true }): Promise<[boolean, TInstance]>;
+        insertOrUpdate(values: TAttributes, options?: UpsertOptions & { returning: false | undefined }): Promise<boolean>;
+        insertOrUpdate(values: TAttributes, options?: UpsertOptions & { returning: true }): Promise<[boolean, TInstance]>;
 
         /**
          * Create and insert multiple instances in bulk.
diff --git a/types/sequelize/sequelize-tests.ts b/types/sequelize/sequelize-tests.ts
index eea19959bd..2eabc511f2 100644
--- a/types/sequelize/sequelize-tests.ts
+++ b/types/sequelize/sequelize-tests.ts
@@ -1036,7 +1036,9 @@ findOrRetVal = User.findOrCreate( { where : { id : undefined }, defaults : { nam
 findOrRetVal = User.findOrCreate( { where : { email : 'unique.email.@d.com', companyId : Math.floor( Math.random() * 5 ) } } );
 findOrRetVal = User.findOrCreate( { where : { objectId : 1 }, defaults : { bool : false } } );
 
-User.upsert( { id : 42, username : 'doe', foo : s.fn( 'upper', 'mixedCase2' ) } );
+let upsertPromiseNoOptions: Bluebird<boolean> = User.upsert( { id : 42, username : 'doe', foo : s.fn( 'upper', 'mixedCase2' ) } );
+let upsertPromiseReturning: Bluebird<[boolean, AnyInstance]> = User.upsert( { id : 42, username : 'doe', foo : s.fn( 'upper', 'mixedCase2' ) }, { returning: true } );
+let upsertPromiseNotReturning: Bluebird<boolean> = User.upsert( { id : 42, username : 'doe', foo : s.fn( 'upper', 'mixedCase2' ) }, { returning: false } );
 
 User.bulkCreate( [{ aNumber : 10 }, { aNumber : 12 }] ).then( ( i ) => i[0].isNewRecord );
 User.bulkCreate( [{ username : 'bar' }, { username : 'bar' }, { username : 'bar' }] );

From b996d556729d14f0f106747bdbf57bc84e1a64c9 Mon Sep 17 00:00:00 2001
From: Nick Schultz <nrschultz@gmail.com>
Date: Tue, 27 Feb 2018 16:08:58 -0500
Subject: [PATCH 0110/1382] bump version to reflect a change from current npm
 version

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

diff --git a/types/sequelize/index.d.ts b/types/sequelize/index.d.ts
index fc4fc03409..7a9c64db6a 100644
--- a/types/sequelize/index.d.ts
+++ b/types/sequelize/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Sequelize 4.27.0
+// Type definitions for Sequelize 4.27.8
 // Project: http://sequelizejs.com
 // Definitions by: samuelneff <https://github.com/samuelneff>
 //                 Peter Harris <https://github.com/codeanimal>

From 76cfb34e13ca0edc556d3fc48096fbf4b79fe186 Mon Sep 17 00:00:00 2001
From: Dennis George <dennispg@gmail.com>
Date: Tue, 27 Feb 2018 15:48:32 -0600
Subject: [PATCH 0111/1382] updated webpack to be 4.0 specific; added v3
 subfolder for old version

---
 types/webpack/index.d.ts          |   98 +--
 types/webpack/v3/index.d.ts       | 1301 +++++++++++++++++++++++++++++
 types/webpack/v3/package.json     |    6 +
 types/webpack/v3/tsconfig.json    |   26 +
 types/webpack/v3/tslint.json      |    3 +
 types/webpack/v3/webpack-tests.ts |  667 +++++++++++++++
 6 files changed, 2025 insertions(+), 76 deletions(-)
 create mode 100644 types/webpack/v3/index.d.ts
 create mode 100644 types/webpack/v3/package.json
 create mode 100644 types/webpack/v3/tsconfig.json
 create mode 100644 types/webpack/v3/tslint.json
 create mode 100644 types/webpack/v3/webpack-tests.ts

diff --git a/types/webpack/index.d.ts b/types/webpack/index.d.ts
index f704797f58..9b84ff7731 100644
--- a/types/webpack/index.d.ts
+++ b/types/webpack/index.d.ts
@@ -187,9 +187,13 @@ declare namespace webpack {
         sourcePrefix?: string;
         /** This option enables cross-origin loading of chunks. */
         crossOriginLoading?: string | boolean;
+        /** A Constructor to a custom hash function. You can provide a non-crypto hash function for performance reasons */
+        hashFunction?: (algorithm: string, options?: any) => any;
+        /** Allow to choose the global object reference in runtime exitCode. */
+        globalObject?: any;
     }
 
-    interface BaseModule {
+    interface Module {
         /** A array of applied pre loaders. */
         preLoaders?: Rule[];
         /** A array of applied post loaders. */
@@ -208,18 +212,10 @@ declare namespace webpack {
         wrappedContextRecursive?: boolean;
         wrappedContextCritical?: boolean;
         strictExportPresence?: boolean;
-    }
-    interface OldModule extends BaseModule {
-        /** An array of automatically applied loaders. */
-        loaders: Rule[];
-    }
-    interface NewModule extends BaseModule {
         /** An array of rules applied for modules. */
         rules: Rule[];
     }
 
-    type Module = OldModule | NewModule;
-
     interface Resolve {
         /**
          * A list of directories to resolve modules from.
@@ -381,7 +377,10 @@ declare namespace webpack {
         options?: { [name: string]: any };
     }
     type Loader = string | OldLoader | NewLoader;
-
+    interface ParserOptions {
+        [optName: string]: any;
+        system?: boolean;
+    }
     /**
      * There are direct and delegate rules. Direct Rules need a test, Delegate rules delegate to subrules bringing their own.
      * Direct rules can optionally contain delegate keys (oneOf, rules).
@@ -421,11 +420,17 @@ declare namespace webpack {
          * For each different parser options object a new parser is created and plugins can apply plugins depending on the parser options.
          * Many of the default plugins apply their parser plugins only if a property in the parser options is not set or true.
          */
-        parser?: { [optName: string]: any };
+        parser?: ParserOptions;
         /** An array of Rules that is also used when the Rule matches. */
         rules?: Rule[];
         /** An array of Rules from which only the first matching Rule is used when the Rule matches. */
         oneOf?: Rule[];
+        /** Configures module resolving. */
+        resolve?: Resolve;
+        /** Configures the module type. */
+        type?: "javascript/auto" | "javascript/esm" | "javascript/dynamic" | "json" | "webassembly/experimental";
+        /** TODO: Update this when the v4 documentation is complete. */
+        sideEffects?: any;
     }
     interface BaseDirectRule extends BaseRule {
         /** A condition that must be met */
@@ -884,6 +889,7 @@ declare namespace webpack {
         constructor(options: any);
     }
 
+    /** @deprecated use config.optimization.namedModules */
     class NamedModulesPlugin extends Plugin {
         constructor();
     }
@@ -892,15 +898,12 @@ declare namespace webpack {
         constructor(nameResolver?: (chunk: any) => string | null);
     }
 
+    /** @deprecated use config.optimization.noEmitOnErrors */
     class NoEmitOnErrorsPlugin extends Plugin {
         constructor();
     }
 
     /** @deprecated use webpack.NoEmitOnErrorsPlugin */
-    class NoErrorsPlugin extends Plugin {
-        constructor();
-    }
-
     class NormalModuleReplacementPlugin extends Plugin {
         constructor(resourceRegExp: any, newResource: any);
     }
@@ -954,6 +957,7 @@ declare namespace webpack {
     }
 
     namespace optimize {
+        /** @deprecated use config.optimization.concatenateModules */
         class ModuleConcatenationPlugin extends Plugin { }
         class AggressiveMergingPlugin extends Plugin {
             constructor(options?: AggressiveMergingPlugin.Options);
@@ -980,62 +984,6 @@ declare namespace webpack {
             }
         }
 
-        class CommonsChunkPlugin extends Plugin {
-            constructor(options?: CommonsChunkPlugin.Options);
-        }
-
-        namespace CommonsChunkPlugin {
-            type MinChunksFn = (module: any, count: number) => boolean;
-
-            interface Options {
-                /**
-                 * The chunk name of the commons chunk. An existing chunk can be selected by passing a name of an existing chunk.
-                 * If an array of strings is passed this is equal to invoking the plugin multiple times for each chunk name.
-                 * If omitted and `options.async` or `options.children` is set all chunks are used,
-                 * otherwise `options.filename` is used as chunk name.
-                 */
-                name?: string;
-                names?: string[];
-
-                /**
-                 * The filename template for the commons chunk. Can contain the same placeholders as `output.filename`.
-                 * If omitted the original filename is not modified (usually `output.filename` or `output.chunkFilename`).
-                 */
-                filename?: string;
-
-                /**
-                 * The minimum number of chunks which need to contain a module before it's moved into the commons chunk.
-                 * The number must be greater than or equal 2 and lower than or equal to the number of chunks.
-                 * Passing `Infinity` just creates the commons chunk, but moves no modules into it.
-                 * By providing a `function` you can add custom logic. (Defaults to the number of chunks)
-                 */
-                minChunks?: number | MinChunksFn;
-
-                /**
-                 * Select the source chunks by chunk names. The chunk must be a child of the commons chunk.
-                 * If omitted all entry chunks are selected.
-                 */
-                chunks?: string[];
-
-                /**
-                 * If `true` all children of the commons chunk are selected
-                 */
-                children?: boolean;
-
-                /**
-                 * If `true` a new async commons chunk is created as child of `options.name` and sibling of `options.chunks`.
-                 * It is loaded in parallel with `options.chunks`. It is possible to change the name of the output file
-                 * by providing the desired string instead of `true`.
-                 */
-                async?: boolean | string;
-
-                /**
-                 * Minimum size of all common module before a commons chunk is created.
-                 */
-                minSize?: number;
-            }
-        }
-
         /** @deprecated */
         class DedupePlugin extends Plugin {
             constructor();
@@ -1252,11 +1200,6 @@ declare namespace webpack {
              */
             inputValue: any;
 
-            /**
-             * The options passed to the Compiler.
-             */
-            options: any;
-
             /**
              * A boolean flag. It is set when in debug mode.
              */
@@ -1311,6 +1254,9 @@ declare namespace webpack {
              * Hacky access to the Module object being loaded.
              */
             _module: any;
+
+            /** Flag if HMR is enabled */
+            hot: boolean;
         }
     }
 
diff --git a/types/webpack/v3/index.d.ts b/types/webpack/v3/index.d.ts
new file mode 100644
index 0000000000..ee3a291d02
--- /dev/null
+++ b/types/webpack/v3/index.d.ts
@@ -0,0 +1,1301 @@
+// Type definitions for webpack 3.8
+// Project: https://github.com/webpack/webpack
+// Definitions by: Qubo <https://github.com/tkqubo>
+//                 Benjamin Lim <https://github.com/bumbleblym>
+//                 Boris Cherny <https://github.com/bcherny>
+//                 Tommy Troy Lin <https://github.com/tommytroylin>
+//                 Mohsen Azimi <https://github.com/mohsen1>
+//                 Jonathan Creamer <https://github.com/jcreamer898>
+//                 Ahmed T. Ali <https://github.com/ahmed-taj>
+//                 Alan Agius <https://github.com/alan-agius4>
+//                 Spencer Elliott <https://github.com/elliottsj>
+//                 Jason Cheatham <https://github.com/jason0x43>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/// <reference types="node" />
+
+import Tapable = require('tapable');
+import * as UglifyJS from 'uglify-js';
+import { RawSourceMap } from 'source-map';
+
+export = webpack;
+
+declare function webpack(
+    options: webpack.Configuration,
+    handler: webpack.Compiler.Handler
+): webpack.Compiler.Watching | webpack.Compiler;
+declare function webpack(options?: webpack.Configuration): webpack.Compiler;
+
+declare function webpack(
+    options: webpack.Configuration[],
+    handler: webpack.MultiCompiler.Handler
+): webpack.MultiWatching | webpack.MultiCompiler;
+declare function webpack(options: webpack.Configuration[]): webpack.MultiCompiler;
+
+declare namespace webpack {
+    interface Configuration {
+        /** Name of the configuration. Used when loading multiple configurations. */
+        name?: string;
+        /**
+         * The base directory (absolute path!) for resolving the `entry` option.
+         * If `output.pathinfo` is set, the included pathinfo is shortened to this directory.
+         */
+        context?: string;
+        entry?: string | string[] | Entry | EntryFunc;
+        /** Choose a style of source mapping to enhance the debugging process. These values can affect build and rebuild speed dramatically. */
+        devtool?: Options.Devtool;
+        /** Options affecting the output. */
+        output?: Output;
+        /** Options affecting the normal modules (NormalModuleFactory) */
+        module?: Module;
+        /** Options affecting the resolving of modules. */
+        resolve?: Resolve;
+        /** Like resolve but for loaders. */
+        resolveLoader?: ResolveLoader;
+        /**
+         *  Specify dependencies that shouldn’t be resolved by webpack, but should become dependencies of the resulting bundle.
+         *  The kind of the dependency depends on output.libraryTarget.
+         */
+        externals?: ExternalsElement | ExternalsElement[];
+        /**
+         * <ul>
+         *   <li>"web" Compile for usage in a browser-like environment (default)</li>
+         *   <li>"webworker" Compile as WebWorker</li>
+         *   <li>"node" Compile for usage in a node.js-like environment (use require to load chunks)</li>
+         *   <li>"async-node" Compile for usage in a node.js-like environment (use fs and vm to load chunks async)</li>
+         *   <li>"node-webkit" Compile for usage in webkit, uses jsonp chunk loading but also supports builtin node.js modules plus require(“nw.gui”) (experimental)</li>
+         *   <li>"atom" Compile for usage in electron (formerly known as atom-shell), supports require for modules necessary to run Electron.</li>
+         *   <li>"electron-renderer" Compile for Electron for renderer process, providing a target using JsonpTemplatePlugin, FunctionModulePlugin
+         *        for browser environments and NodeTargetPlugin and ExternalsPlugin for CommonJS and Electron built-in modules.<li>
+         *   <li>"electron-main" Compile for Electron for main process.</li>
+         *   <li>"atom" Alias for electron-main</li>
+         *   <li>"electron" Alias for electron-main</li>
+         * <ul>
+         */
+        target?: 'web' | 'webworker' | 'node' | 'async-node' | 'node-webkit' | 'atom' | 'electron' | 'electron-renderer' | 'electron-main' | ((compiler?: any) => void);
+        /** Report the first error as a hard error instead of tolerating it. */
+        bail?: boolean;
+        /** Capture timing information for each module. */
+        profile?: boolean;
+        /** Cache generated modules and chunks to improve performance for multiple incremental builds. */
+        cache?: boolean | object;
+        /** Enter watch mode, which rebuilds on file change. */
+        watch?: boolean;
+        watchOptions?: Options.WatchOptions;
+        /** Switch loaders to debug mode. */
+        debug?: boolean;
+        /** Can be used to configure the behaviour of webpack-dev-server when the webpack config is passed to webpack-dev-server CLI. */
+        devServer?: any; // TODO: Type this
+        /** Include polyfills or mocks for various node stuff */
+        node?: Node;
+        /** Set the value of require.amd and define.amd. */
+        amd?: { [moduleName: string]: boolean };
+        /** Used for recordsInputPath and recordsOutputPath */
+        recordsPath?: string;
+        /** Load compiler state from a json file. */
+        recordsInputPath?: string;
+        /** Store compiler state to a json file. */
+        recordsOutputPath?: string;
+        /** Add additional plugins to the compiler. */
+        plugins?: Plugin[];
+        /** Stats options for logging  */
+        stats?: Options.Stats;
+        /** Performance options */
+        performance?: Options.Performance;
+        /** Limit the number of parallel processed modules. Can be used to fine tune performance or to get more reliable profiling results */
+        parallelism?: number;
+    }
+
+    interface Entry {
+        [name: string]: string | string[];
+    }
+
+    type EntryFunc = () => (string | string[] | Promise<string | string[]>);
+
+    interface DevtoolModuleFilenameTemplateInfo {
+        identifier: string;
+        shortIdentifier: string;
+        resource: any;
+        resourcePath: string;
+        absoluteResourcePath: string;
+        allLoaders: any[];
+        query: string;
+        moduleId: string;
+        hash: string;
+    }
+
+    interface Output {
+        /** The output directory as absolute path (required). */
+        path?: string;
+        /** The filename of the entry chunk as relative path inside the output.path directory. */
+        filename?: string;
+        /** The filename of non-entry chunks as relative path inside the output.path directory. */
+        chunkFilename?: string;
+        /** The filename of the SourceMaps for the JavaScript files. They are inside the output.path directory. */
+        sourceMapFilename?: string;
+        /** Filename template string of function for the sources array in a generated SourceMap. */
+        devtoolModuleFilenameTemplate?: string | ((info: DevtoolModuleFilenameTemplateInfo) => string);
+        /** Similar to output.devtoolModuleFilenameTemplate, but used in the case of duplicate module identifiers. */
+        devtoolFallbackModuleFilenameTemplate?: string | ((info: DevtoolModuleFilenameTemplateInfo) => string);
+        /**
+         * Enable line to line mapped mode for all/specified modules.
+         * Line to line mapped mode uses a simple SourceMap where each line of the generated source is mapped to the same line of the original source.
+         * It’s a performance optimization. Only use it if your performance need to be better and you are sure that input lines match which generated lines.
+         * true enables it for all modules (not recommended)
+         */
+        devtoolLineToLine?: boolean;
+        /** The filename of the Hot Update Chunks. They are inside the output.path directory. */
+        hotUpdateChunkFilename?: string;
+        /** The filename of the Hot Update Main File. It is inside the output.path directory. */
+        hotUpdateMainFilename?: string;
+        /** The output.path from the view of the Javascript / HTML page. */
+        publicPath?: string;
+        /** The JSONP function used by webpack for asnyc loading of chunks. */
+        jsonpFunction?: string;
+        /** The JSONP function used by webpack for async loading of hot update chunks. */
+        hotUpdateFunction?: string;
+        /** Include comments with information about the modules. */
+        pathinfo?: boolean;
+        /** If set, export the bundle as library. output.library is the name. */
+        library?: string | string[];
+        /**
+         * Which format to export the library:
+         * <ul>
+         *   <li>"var" - Export by setting a variable: var Library = xxx (default)</li>
+         *   <li>"this" - Export by setting a property of this: this["Library"] = xxx</li>
+         *   <li>"commonjs" - Export by setting a property of exports: exports["Library"] = xxx</li>
+         *   <li>"commonjs2" - Export by setting module.exports: module.exports = xxx</li>
+         *   <li>"amd" - Export to AMD (optionally named)</li>
+         *   <li>"umd" - Export to AMD, CommonJS2 or as property in root</li>
+         *   <li>"window" - Assign to widnow</li>
+         *   <li>"assign" - Assign to a global variable</li>
+         *   <li>"jsonp" - Generate Webpack JSONP module<li>
+         * </ul>
+         */
+        libraryTarget?: 'var' | 'this' | 'commonjs' | 'commonjs2' | 'amd' | 'umd' | 'window' | 'assign' | 'jsonp';
+        /** Configure which module or modules will be exposed via the `libraryTarget` */
+        libraryExport?: string | string[];
+        /** If output.libraryTarget is set to umd and output.library is set, setting this to true will name the AMD module. */
+        umdNamedDefine?: boolean;
+        /** Prefixes every line of the source in the bundle with this string. */
+        sourcePrefix?: string;
+        /** This option enables cross-origin loading of chunks. */
+        crossOriginLoading?: string | boolean;
+    }
+
+    interface BaseModule {
+        /** A array of applied pre loaders. */
+        preLoaders?: Rule[];
+        /** A array of applied post loaders. */
+        postLoaders?: Rule[];
+        /** A RegExp or an array of RegExps. Don’t parse files matching. */
+        noParse?: RegExp | RegExp[] | ((content: string) => boolean);
+        unknownContextRequest?: string;
+        unknownContextRecursive?: boolean;
+        unknownContextRegExp?: RegExp;
+        unknownContextCritical?: boolean;
+        exprContextRequest?: string;
+        exprContextRegExp?: RegExp;
+        exprContextRecursive?: boolean;
+        exprContextCritical?: boolean;
+        wrappedContextRegExp?: RegExp;
+        wrappedContextRecursive?: boolean;
+        wrappedContextCritical?: boolean;
+        strictExportPresence?: boolean;
+    }
+    interface OldModule extends BaseModule {
+        /** An array of automatically applied loaders. */
+        loaders: Rule[];
+    }
+    interface NewModule extends BaseModule {
+        /** An array of rules applied for modules. */
+        rules: Rule[];
+    }
+
+    type Module = OldModule | NewModule;
+
+    interface Resolve {
+        /**
+         * A list of directories to resolve modules from.
+         *
+         * Absolute paths will be searched once.
+         *
+         * If an entry is relative, will be resolved using node's resolution algorithm
+         * relative to the requested file.
+         *
+         * Defaults to `["node_modules"]`
+         */
+        modules?: string[];
+
+        /**
+         * A list of package description files to search for.
+         *
+         * Defaults to `["package.json"]`
+         */
+        descriptionFiles?: string[];
+
+        /**
+         * A list of fields in a package description object to use for finding
+         * the entry point.
+         *
+         * Defaults to `["browser", "module", "main"]` or `["module", "main"]`,
+         * depending on the value of the `target` `Configuration` value.
+         */
+        mainFields?: string[];
+
+        /**
+         * A list of fields in a package description object to try to parse
+         * in the same format as the `alias` resolve option.
+         *
+         * Defaults to `["browser"]` or `[]`, depending on the value of the
+         * `target` `Configuration` value.
+         *
+         * @see alias
+         */
+        aliasFields?: string[];
+
+        /**
+         * A list of file names to search for when requiring directories that
+         * don't contain a package description file.
+         *
+         * Defaults to `["index"]`.
+         */
+        mainFiles?: string[];
+
+        /**
+         * A list of file extensions to try when requesting files.
+         *
+         * An empty string is considered invalid.
+         */
+        extensions?: string[];
+
+        /**
+         * If true, requires that all requested paths must use an extension
+         * from `extensions`.
+         */
+        enforceExtension?: boolean;
+
+        /**
+         * Replace the given module requests with other modules or paths.
+         *
+         * @see aliasFields
+         */
+        alias?: { [key: string]: string; };
+
+        /**
+         * Whether to use a cache for resolving, or the specific object
+         * to use for caching. Sharing objects may be useful when running
+         * multiple webpack compilers.
+         *
+         * Defaults to `true`.
+         */
+        unsafeCache?: {} | boolean;
+
+        /**
+         * A function used to decide whether to cache the given resolve request.
+         *
+         * Defaults to `() => true`.
+         */
+        cachePredicate?(data: { path: string, request: string }): boolean;
+
+        /**
+         * A list of additional resolve plugins which should be applied.
+         */
+        plugins?: ResolvePlugin[];
+
+        /**
+         * Whether to resolve symlinks to their symlinked location.
+         *
+         * Defaults to `true`
+         */
+        symlinks?: boolean;
+    }
+
+    interface ResolveLoader extends Resolve {
+        /**
+         * List of strings to append to a loader's name when trying to resolve it.
+         */
+        moduleExtensions?: string[];
+
+        enforceModuleExtension?: boolean;
+    }
+
+    type ExternalsElement = string | RegExp | ExternalsObjectElement | ExternalsFunctionElement;
+
+    interface ExternalsObjectElement {
+        [key: string]: boolean | string;
+    }
+
+    type ExternalsFunctionElement = (context: any, request: any, callback: (error: any, result: any) => void) => any;
+
+    interface Node {
+        console?: boolean;
+        global?: boolean;
+        process?: boolean;
+        Buffer?: boolean;
+        __filename?: boolean | string;
+        __dirname?: boolean | string;
+        [nodeBuiltin: string]: boolean | string | undefined;
+    }
+
+    interface BaseConditionSpec {
+        /** The Condition must match. The convention is the provide a string or array of strings here, but it's not enforced. */
+        include?: Condition;
+        /** The Condition must NOT match. The convention is the provide a string or array of strings here, but it's not enforced. */
+        exclude?: Condition;
+    }
+    interface TestConditionSpec extends BaseConditionSpec {
+        /** The Condition must match. The convention is the provide a RegExp or array of RegExps here, but it's not enforced. */
+        test: Condition;
+    }
+    interface AndConditionSpec extends BaseConditionSpec {
+        /** All Conditions must match. */
+        and: Condition[];
+    }
+    interface OrConditionSpec extends BaseConditionSpec {
+        /** Any Condition must match. */
+        or: Condition[];
+    }
+    interface NotConditionSpec extends BaseConditionSpec {
+        /** The Condition must NOT match. */
+        not: Condition;
+    }
+    type ConditionSpec = TestConditionSpec | OrConditionSpec | AndConditionSpec | NotConditionSpec;
+
+    // tslint:disable-next-line:no-empty-interface
+    interface ConditionArray extends Array<Condition> { }
+    type Condition = string | RegExp | ((absPath: string) => boolean) | ConditionSpec | ConditionArray;
+
+    interface OldLoader {
+        loader: string;
+        query?: { [name: string]: any };
+    }
+    interface NewLoader {
+        loader: string;
+        options?: { [name: string]: any };
+    }
+    type Loader = string | OldLoader | NewLoader;
+
+    /**
+     * There are direct and delegate rules. Direct Rules need a test, Delegate rules delegate to subrules bringing their own.
+     * Direct rules can optionally contain delegate keys (oneOf, rules).
+     *
+     * These types exist to enforce that a rule has the keys `((loader XOR loaders) AND test) OR oneOf OR rules`
+     */
+    interface BaseRule {
+        /**
+         * Specifies the category of the loader. No value means normal loader.
+         *
+         * There is also an additional category "inlined loader" which are loaders applied inline of the import/require.
+         *
+         * All loaders are sorted in the order post, inline, normal, pre and used in this order.
+         *
+         * All normal loaders can be omitted (overridden) by prefixing ! in the request.
+         *
+         * All normal and pre loaders can be omitted (overridden) by prefixing -! in the request.
+         *
+         * All normal, post and pre loaders can be omitted (overridden) by prefixing !! in the request.
+         *
+         * Inline loaders and ! prefixes should not be used as they are non-standard. They may be use by loader generated code.
+         */
+        enforce?: 'pre' | 'post';
+        /** A condition that must be met */
+        test?: Condition | Condition[];
+        /** A condition that must not be met */
+        exclude?: Condition | Condition[];
+        /** A condition that must be met */
+        include?: Condition | Condition[];
+        /** A Condition matched with the resource. */
+        resource?: Condition | Condition[];
+        /** A condition matched with the issuer */
+        issuer?: Condition | Condition[];
+        /**
+         * An object with parser options. All applied parser options are merged.
+         *
+         * For each different parser options object a new parser is created and plugins can apply plugins depending on the parser options.
+         * Many of the default plugins apply their parser plugins only if a property in the parser options is not set or true.
+         */
+        parser?: { [optName: string]: any };
+        /** An array of Rules that is also used when the Rule matches. */
+        rules?: Rule[];
+        /** An array of Rules from which only the first matching Rule is used when the Rule matches. */
+        oneOf?: Rule[];
+    }
+    interface BaseDirectRule extends BaseRule {
+        /** A condition that must be met */
+        test: Condition | Condition[];
+    }
+    // Direct Rules
+    interface BaseSingleLoaderRule extends BaseDirectRule {
+        /** Loader name or an object with name and options */
+        loader: Loader;
+    }
+    interface OldLoaderRule extends BaseSingleLoaderRule {
+        /**
+         * Loader options
+         * @deprecated:
+         */
+        query?: { [name: string]: any };
+    }
+    interface NewLoaderRule extends BaseSingleLoaderRule {
+        options?: { [name: string]: any };
+    }
+    type LoaderRule = OldLoaderRule | NewLoaderRule;
+    interface OldUseRule extends BaseDirectRule {
+        /**
+         * A array of loaders.
+         * @deprecated  use `use` instead
+         */
+        loaders: string[];
+    }
+    interface NewUseRule extends BaseDirectRule {
+        /** A loader or array of loaders */
+        use: Loader | Loader[];
+    }
+    type UseRule = OldUseRule | NewUseRule;
+
+    // Delegate Rules
+    interface RulesRule extends BaseRule {
+        /** An array of Rules that is also used when the Rule matches. */
+        rules: Rule[];
+    }
+    interface OneOfRule extends BaseRule {
+        oneOf: Rule[];
+    }
+    type Rule = LoaderRule | UseRule | RulesRule | OneOfRule;
+
+    namespace Options {
+        // tslint:disable-next-line:max-line-length
+        type Devtool = 'eval' | 'inline-source-map' | 'cheap-eval-source-map' | 'cheap-source-map' | 'cheap-module-eval-source-map' | 'cheap-module-source-map' | 'eval-source-map' | 'source-map' |
+            'nosources-source-map' | 'hidden-source-map' | 'nosources-source-map' | '@eval' | '@inline-source-map' | '@cheap-eval-source-map' | '@cheap-source-map' | '@cheap-module-eval-source-map' |
+            '@cheap-module-source-map' | '@eval-source-map' | '@source-map' | '@nosources-source-map' | '@hidden-source-map' | '@nosources-source-map' | '#eval' | '#inline-source-map' |
+            '#cheap-eval-source-map' | '#cheap-source-map' | '#cheap-module-eval-source-map' | '#cheap-module-source-map' | '#eval-source-map' | '#source-map' | '#nosources-source-map' |
+            '#hidden-source-map' | '#nosources-source-map' | '#@eval' | '#@inline-source-map' | '#@cheap-eval-source-map' | '#@cheap-source-map' | '#@cheap-module-eval-source-map' |
+            '#@cheap-module-source-map' | '#@eval-source-map' | '#@source-map' | '#@nosources-source-map' | '#@hidden-source-map' | '#@nosources-source-map' | boolean;
+
+        interface Performance {
+            /** This property allows webpack to control what files are used to calculate performance hints. */
+            assetFilter?(assetFilename: string): boolean;
+            /**
+             * Turns hints on/off. In addition, tells webpack to throw either an error or a warning when hints are
+             * found. This property is set to "warning" by default.
+             */
+            hints?: 'warning' | 'error' | false;
+            /**
+             * An asset is any emitted file from webpack. This option controls when webpack emits a performance hint
+             * based on individual asset size. The default value is 250000 (bytes).
+             */
+            maxAssetSize?: number;
+            /**
+             * An entrypoint represents all assets that would be utilized during initial load time for a specific entry.
+             * This option controls when webpack should emit performance hints based on the maximum entrypoint size.
+             * The default value is 250000 (bytes).
+             */
+            maxEntrypointSize?: number;
+        }
+        type Stats = Stats.ToStringOptions;
+        type WatchOptions = ICompiler.WatchOptions;
+    }
+
+    // tslint:disable-next-line:interface-name
+    interface ICompiler {
+        run(handler: ICompiler.Handler): void;
+        watch(watchOptions: ICompiler.WatchOptions, handler: ICompiler.Handler): Watching;
+    }
+
+    namespace ICompiler {
+        type Handler = (err: Error, stats: Stats) => void;
+
+        interface WatchOptions {
+            /**
+             * Add a delay before rebuilding once the first file changed. This allows webpack to aggregate any other
+             * changes made during this time period into one rebuild.
+             * Pass a value in milliseconds. Default: 300.
+             */
+            aggregateTimeout?: number;
+            /**
+             * For some systems, watching many file systems can result in a lot of CPU or memory usage.
+             * It is possible to exclude a huge folder like node_modules.
+             * It is also possible to use anymatch patterns.
+             */
+            ignored?: string | string[] | RegExp;
+            /** Turn on polling by passing true, or specifying a poll interval in milliseconds. */
+            poll?: boolean | number;
+        }
+    }
+
+    interface Watching {
+        close(callback: () => void): void;
+        invalidate(): void;
+    }
+
+    class Compiler extends Tapable implements ICompiler {
+        constructor();
+
+        name: string;
+        options: Configuration;
+        outputFileSystem: any;
+        run(handler: Compiler.Handler): void;
+        watch(watchOptions: Compiler.WatchOptions, handler: Compiler.Handler): Compiler.Watching;
+    }
+
+    namespace Compiler {
+        type Handler = ICompiler.Handler;
+        type WatchOptions = ICompiler.WatchOptions;
+
+        class Watching implements Watching {
+            constructor(compiler: Compiler, watchOptions: Watching.WatchOptions, handler: Watching.Handler);
+
+            close(callback: () => void): void;
+            invalidate(): void;
+        }
+
+        namespace Watching {
+            type WatchOptions = ICompiler.WatchOptions;
+            type Handler = ICompiler.Handler;
+        }
+    }
+
+    abstract class MultiCompiler extends Tapable implements ICompiler {
+        compilers: ICompiler[];
+        run(handler: MultiCompiler.Handler): void;
+        watch(watchOptions: MultiCompiler.WatchOptions, handler: MultiCompiler.Handler): MultiWatching;
+    }
+
+    namespace MultiCompiler {
+        type Handler = ICompiler.Handler;
+        type WatchOptions = ICompiler.WatchOptions;
+    }
+
+    abstract class MultiWatching implements Watching {
+        close(callback: () => void): void;
+        invalidate(): void;
+    }
+
+    abstract class Plugin implements Tapable.Plugin {
+        apply(compiler: Compiler): void;
+    }
+
+    abstract class ResolvePlugin implements Tapable.Plugin {
+        apply(resolver: any /* EnhancedResolve.Resolver */): void;
+    }
+
+    abstract class Stats {
+        /** Returns true if there were errors while compiling. */
+        hasErrors(): boolean;
+        /** Returns true if there were warnings while compiling. */
+        hasWarnings(): boolean;
+        /** Returns compilation information as a JSON object. */
+        toJson(options?: Stats.ToJsonOptions): any;
+        /** Returns a formatted string of the compilation information (similar to CLI output). */
+        toString(options?: Stats.ToStringOptions): string;
+    }
+
+    namespace Stats {
+        type Preset
+            = boolean
+            | 'errors-only'
+            | 'minimal'
+            | 'none'
+            | 'normal'
+            | 'verbose';
+
+        interface ToJsonOptionsObject {
+            /** Add asset Information */
+            assets?: boolean;
+            /** Sort assets by a field */
+            assetsSort?: string;
+            /** Add information about cached (not built) modules */
+            cached?: boolean;
+            /** Show cached assets (setting this to `false` only shows emitted files) */
+            cachedAssets?: boolean;
+            /** Add children information */
+            children?: boolean;
+            /** Add built modules information to chunk information */
+            chunkModules?: boolean;
+            /** Add the origins of chunks and chunk merging info */
+            chunkOrigins?: boolean;
+            /** Add chunk information (setting this to `false` allows for a less verbose output) */
+            chunks?: boolean;
+            /** Sort the chunks by a field */
+            chunksSort?: string;
+            /** Context directory for request shortening */
+            context?: string;
+            /** Display the distance from the entry point for each module */
+            depth?: boolean;
+            /** Display the entry points with the corresponding bundles */
+            entrypoints?: boolean;
+            /** Add --env information */
+            env?: boolean;
+            /** Add errors */
+            errors?: boolean;
+            /** Add details to errors (like resolving log) */
+            errorDetails?: boolean;
+            /** Exclude assets from being displayed in stats */
+            excludeAssets?: StatsExcludeFilter;
+            /** Exclude modules from being displayed in stats */
+            excludeModules?: StatsExcludeFilter;
+            /** See excludeModules */
+            exclude?: StatsExcludeFilter;
+            /** Add the hash of the compilation */
+            hash?: boolean;
+            /** Set the maximum number of modules to be shown */
+            maxModules?: number;
+            /** Add built modules information */
+            modules?: boolean;
+            /** Sort the modules by a field */
+            modulesSort?: string;
+            /** Show dependencies and origin of warnings/errors */
+            moduleTrace?: boolean;
+            /** Add public path information */
+            publicPath?: boolean;
+            /** Add information about the reasons why modules are included */
+            reasons?: boolean;
+            /** Add the source code of modules */
+            source?: boolean;
+            /** Add timing information */
+            timings?: boolean;
+            /** Add webpack version information */
+            version?: boolean;
+            /** Add warnings */
+            warnings?: boolean;
+            /** Show which exports of a module are used */
+            usedExports?: boolean;
+            /** Filter warnings to be shown */
+            warningsFilter?: string | RegExp | Array<string | RegExp> | ((warning: string) => boolean);
+            /** Show performance hint when file size exceeds `performance.maxAssetSize` */
+            performance?: boolean;
+            /** Show the exports of the modules */
+            providedExports?: boolean;
+        }
+
+        type ToJsonOptions = Preset | ToJsonOptionsObject;
+
+        type StatsExcludeFilter = string | string[] | RegExp | RegExp[] | ((assetName: string) => boolean) | Array<(assetName: string) => boolean>;
+
+        interface ToStringOptionsObject extends ToJsonOptionsObject {
+            /** `webpack --colors` equivalent */
+            colors?: boolean;
+        }
+
+        type ToStringOptions = Preset | ToStringOptionsObject;
+    }
+
+    /**
+     * Plugins
+     */
+
+    class BannerPlugin extends Plugin {
+        constructor(options: string | BannerPlugin.Options);
+    }
+
+    namespace BannerPlugin {
+        type Filter = string | RegExp;
+
+        interface Options {
+            banner: string;
+            entryOnly?: boolean;
+            exclude?: Filter | Filter[];
+            include?: Filter | Filter[];
+            raw?: boolean;
+            test?: Filter | Filter[];
+        }
+    }
+
+    class ContextReplacementPlugin extends Plugin {
+        constructor(resourceRegExp: any, newContentResource?: any, newContentRecursive?: any, newContentRegExp?: any);
+    }
+
+    class DefinePlugin extends Plugin {
+        constructor(definitions: { [key: string]: any });
+    }
+
+    class DllPlugin extends Plugin {
+        constructor(options: DllPlugin.Options | DllPlugin.Options[]);
+    }
+
+    namespace DllPlugin {
+        interface Options {
+            /**
+             * The context of requests in the manifest file.
+             *
+             * Defaults to the webpack context.
+             */
+            context?: string;
+
+            /**
+             * The name of the exposed DLL function (keep consistent with `output.library`).
+             */
+            name: string;
+
+            /**
+             * The absolute path to the manifest json file (output).
+             */
+            path: string;
+        }
+    }
+
+    class DllReferencePlugin extends Plugin {
+        constructor(options: DllReferencePlugin.Options);
+    }
+
+    namespace DllReferencePlugin {
+        interface Options {
+            /**
+             * The mappings from the request to module ID.
+             *
+             * Defaults to `manifest.content`.
+             */
+            content?: any;
+
+            /**
+             * The context of requests in the manifest (or content property).
+             *
+             * This is an <b>absolute path</b>.
+             */
+            context: string;
+
+            /**
+             * An object containing `content` and `name`.
+             */
+            manifest: { content: string, name: string } | string;
+
+            /**
+             * The name where the DLL is exposed.
+             *
+             * Defaults to `manifest.name`.
+             *
+             * See also `externals`.
+             */
+            name?: string;
+
+            /**
+             * The prefix which is used for accessing the content of the DLL.
+             */
+            scope?: string;
+
+            /**
+             * The type how the DLL is exposed.
+             *
+             * Defaults to `"var"`.
+             *
+             * See also `externals`.
+             */
+            sourceType?: string;
+        }
+    }
+
+    class EvalSourceMapDevToolPlugin extends Plugin {
+        constructor(options?: false | string | EvalSourceMapDevToolPlugin.Options);
+    }
+
+    namespace EvalSourceMapDevToolPlugin {
+        interface Options {
+            append?: false | string;
+            columns?: boolean;
+            lineToLine?: boolean | {
+                exclude?: Condition | Condition[];
+                include?: Condition | Condition[];
+                test?: Condition | Condition[];
+            };
+            module?: boolean;
+            moduleFilenameTemplate?: string;
+            sourceRoot?: string;
+        }
+    }
+
+    class ExtendedAPIPlugin extends Plugin {
+        constructor();
+    }
+
+    class HashedModuleIdsPlugin extends Plugin {
+        constructor(options?: {
+            hashFunction?: string,
+            hashDigest?: string,
+            hashDigestLength?: number
+        });
+    }
+
+    class HotModuleReplacementPlugin extends Plugin {
+        constructor(options?: any);
+    }
+
+    class IgnorePlugin extends Plugin {
+        constructor(requestRegExp: any, contextRegExp?: any);
+    }
+
+    class LoaderOptionsPlugin extends Plugin {
+        constructor(options: any);
+    }
+
+    class NamedModulesPlugin extends Plugin {
+        constructor();
+    }
+
+    class NamedChunksPlugin extends Plugin {
+        constructor(nameResolver?: (chunk: any) => string | null);
+    }
+
+    class NoEmitOnErrorsPlugin extends Plugin {
+        constructor();
+    }
+
+    /** @deprecated use webpack.NoEmitOnErrorsPlugin */
+    class NoErrorsPlugin extends Plugin {
+        constructor();
+    }
+
+    class NormalModuleReplacementPlugin extends Plugin {
+        constructor(resourceRegExp: any, newResource: any);
+    }
+
+    class PrefetchPlugin extends Plugin {
+        // tslint:disable-next-line:unified-signatures
+        constructor(context: any, request: any);
+        constructor(request: any);
+    }
+
+    class ProgressPlugin extends Plugin {
+        constructor(options?: (percentage: number, msg: string, moduleProgress?: string, activeModules?: string, moduleName?: string) => void);
+    }
+
+    class EnvironmentPlugin extends Plugin {
+        constructor(envs: string[] | { [key: string]: any });
+    }
+
+    class ProvidePlugin extends Plugin {
+        constructor(definitions: { [key: string]: any });
+    }
+
+    class SourceMapDevToolPlugin extends Plugin {
+        constructor(options?: null | false | string | SourceMapDevToolPlugin.Options);
+    }
+
+    namespace SourceMapDevToolPlugin {
+        /** @todo extend EvalSourceMapDevToolPlugin.Options */
+        interface Options {
+            append?: false | string;
+            columns?: boolean;
+            exclude?: Condition | Condition[];
+            fallbackModuleFilenameTemplate?: string;
+            filename?: null | false | string;
+            include?: Condition | Condition[];
+            lineToLine?: boolean | {
+                exclude?: Condition | Condition[];
+                include?: Condition | Condition[];
+                test?: Condition | Condition[];
+            };
+            module?: boolean;
+            moduleFilenameTemplate?: string;
+            noSources?: boolean;
+            sourceRoot?: null | string;
+            test?: Condition | Condition[];
+        }
+    }
+
+    class WatchIgnorePlugin extends Plugin {
+        constructor(paths: Array<string | RegExp>);
+    }
+
+    namespace optimize {
+        class ModuleConcatenationPlugin extends Plugin { }
+        class AggressiveMergingPlugin extends Plugin {
+            constructor(options?: AggressiveMergingPlugin.Options);
+        }
+
+        namespace AggressiveMergingPlugin {
+            interface Options {
+                /**
+                 * When options.moveToParents is set, moving to an entry chunk is more expensive.
+                 * Defaults to 10, which means moving to an entry chunk is ten times more expensive than moving to a
+                 * normal chunk.
+                 */
+                entryChunkMultiplicator?: number;
+                /**
+                 * A factor which defines the minimum required size reduction for chunk merging.
+                 * Defaults to 1.5 which means that the total size needs to be reduced by 50% for chunk merging.
+                 */
+                minSizeReduce?: number;
+                /**
+                 * When set, modules that are not in both merged chunks are moved to all parents of the chunk.
+                 * Defaults to false.
+                 */
+                moveToParents?: boolean;
+            }
+        }
+
+        class CommonsChunkPlugin extends Plugin {
+            constructor(options?: CommonsChunkPlugin.Options);
+        }
+
+        namespace CommonsChunkPlugin {
+            type MinChunksFn = (module: any, count: number) => boolean;
+
+            interface Options {
+                /**
+                 * The chunk name of the commons chunk. An existing chunk can be selected by passing a name of an existing chunk.
+                 * If an array of strings is passed this is equal to invoking the plugin multiple times for each chunk name.
+                 * If omitted and `options.async` or `options.children` is set all chunks are used,
+                 * otherwise `options.filename` is used as chunk name.
+                 */
+                name?: string;
+                names?: string[];
+
+                /**
+                 * The filename template for the commons chunk. Can contain the same placeholders as `output.filename`.
+                 * If omitted the original filename is not modified (usually `output.filename` or `output.chunkFilename`).
+                 */
+                filename?: string;
+
+                /**
+                 * The minimum number of chunks which need to contain a module before it's moved into the commons chunk.
+                 * The number must be greater than or equal 2 and lower than or equal to the number of chunks.
+                 * Passing `Infinity` just creates the commons chunk, but moves no modules into it.
+                 * By providing a `function` you can add custom logic. (Defaults to the number of chunks)
+                 */
+                minChunks?: number | MinChunksFn;
+
+                /**
+                 * Select the source chunks by chunk names. The chunk must be a child of the commons chunk.
+                 * If omitted all entry chunks are selected.
+                 */
+                chunks?: string[];
+
+                /**
+                 * If `true` all children of the commons chunk are selected
+                 */
+                children?: boolean;
+
+                /**
+                 * If `true` a new async commons chunk is created as child of `options.name` and sibling of `options.chunks`.
+                 * It is loaded in parallel with `options.chunks`. It is possible to change the name of the output file
+                 * by providing the desired string instead of `true`.
+                 */
+                async?: boolean | string;
+
+                /**
+                 * Minimum size of all common module before a commons chunk is created.
+                 */
+                minSize?: number;
+            }
+        }
+
+        /** @deprecated */
+        class DedupePlugin extends Plugin {
+            constructor();
+        }
+
+        class LimitChunkCountPlugin extends Plugin {
+            constructor(options: any);
+        }
+
+        class MinChunkSizePlugin extends Plugin {
+            constructor(options: any);
+        }
+
+        class OccurrenceOrderPlugin extends Plugin {
+            constructor(preferEntry: boolean);
+        }
+
+        class UglifyJsPlugin extends Plugin {
+            constructor(options?: UglifyJsPlugin.Options);
+        }
+
+        namespace UglifyJsPlugin {
+            type CommentFilter = (astNode: any, comment: any) => boolean;
+
+            interface Options extends UglifyJS.MinifyOptions {
+                beautify?: boolean;
+                comments?: boolean | RegExp | CommentFilter;
+                exclude?: Condition | Condition[];
+                include?: Condition | Condition[];
+                /** Parallelization can speedup your build significantly and is therefore highly recommended. */
+                parallel?: boolean | { cache: boolean, workers: boolean | number };
+                sourceMap?: boolean;
+                test?: Condition | Condition[];
+            }
+        }
+    }
+
+    namespace dependencies {
+    }
+
+    namespace loader {
+        interface Loader extends Function {
+            (this: LoaderContext, source: string | Buffer, sourceMap?: RawSourceMap): string | Buffer | void | undefined;
+
+            /**
+             * The order of chained loaders are always called from right to left.
+             * But, in some cases, loaders do not care about the results of the previous loader or the resource.
+             * They only care for metadata. The pitch method on the loaders is called from left to right before the loaders are called (from right to left).
+             * If a loader delivers a result in the pitch method the process turns around and skips the remaining loaders,
+             * continuing with the calls to the more left loaders. data can be passed between pitch and normal call.
+             */
+            pitch?(remainingRequest: string, precedingRequest: string, data: any): any;
+
+            /**
+             * By default, the resource file is treated as utf-8 string and passed as String to the loader.
+             * By setting raw to true the loader is passed the raw Buffer.
+             * Every loader is allowed to deliver its result as String or as Buffer.
+             * The compiler converts them between loaders.
+             */
+            raw?: boolean;
+        }
+
+        type loaderCallback = (err: Error | undefined | null, content?: string | Buffer, sourceMap?: RawSourceMap) => void;
+
+        interface LoaderContext {
+            /**
+             * Loader API version. Currently 2.
+             * This is useful for providing backwards compatibility.
+             * Using the version you can specify custom logic or fallbacks for breaking changes.
+             */
+            version: string;
+
+            /**
+             *  The directory of the module. Can be used as context for resolving other stuff.
+             *  In the example: /abc because resource.js is in this directory
+             */
+            context: string;
+
+            /**
+             * The resolved request string.
+             * In the example: "/abc/loader1.js?xyz!/abc/node_modules/loader2/index.js!/abc/resource.js?rrr"
+             */
+            request: string;
+
+            /**
+             *  A string or any object. The query of the request for the current loader.
+             */
+            query: any;
+
+            /**
+             * A data object shared between the pitch and the normal phase.
+             */
+            data?: any;
+
+            callback: loaderCallback;
+
+            /**
+             * Make this loader async.
+             */
+            async(): loaderCallback | undefined;
+
+            /**
+             *  Make this loader result cacheable. By default it's not cacheable.
+             *  A cacheable loader must have a deterministic result, when inputs and dependencies haven't changed.
+             *  This means the loader shouldn't have other dependencies than specified with this.addDependency.
+             *  Most loaders are deterministic and cacheable.
+             */
+            cacheable(flag?: boolean): void;
+
+            /**
+             * loaders = [{request: string, path: string, query: string, module: function}]
+             * An array of all the loaders. It is writeable in the pitch phase.
+             * In the example:
+             * [
+             *   { request: "/abc/loader1.js?xyz",
+             *     path: "/abc/loader1.js",
+             *     query: "?xyz",
+             *     module: [Function]
+             *   },
+             *   { request: "/abc/node_modules/loader2/index.js",
+             *     path: "/abc/node_modules/loader2/index.js",
+             *     query: "",
+             *     module: [Function]
+             *   }
+             * ]
+             */
+            loaders: any[];
+
+            /**
+             * The index in the loaders array of the current loader.
+             * In the example: in loader1: 0, in loader2: 1
+             */
+            loaderIndex: number;
+
+            /**
+             * The resource part of the request, including query.
+             * In the example: "/abc/resource.js?rrr"
+             */
+            resource: string;
+
+            /**
+             * The resource file.
+             * In the example: "/abc/resource.js"
+             */
+            resourcePath: string;
+
+            /**
+             * The query of the resource.
+             * In the example: "?rrr"
+             */
+            resourceQuery: string;
+
+            /**
+             * Emit a warning.
+             */
+            emitWarning(message: string | Error): void;
+
+            /**
+             * Emit a error.
+             */
+            emitError(message: string | Error): void;
+
+            /**
+             * Execute some code fragment like a module.
+             *
+             * Don't use require(this.resourcePath), use this function to make loaders chainable!
+             *
+             */
+            exec(code: string, filename: string): any;
+
+            /**
+             * Resolve a request like a require expression.
+             */
+            resolve(context: string, request: string, callback: (err: Error, result: string) => void): any;
+
+            /**
+             * Resolve a request like a require expression.
+             */
+            resolveSync(context: string, request: string): string;
+
+            /**
+             * Adds a file as dependency of the loader result in order to make them watchable.
+             * For example, html-loader uses this technique as it finds src and src-set attributes.
+             * Then, it sets the url's for those attributes as dependencies of the html file that is parsed.
+             */
+            addDependency(file: string): void;
+
+            /**
+             * Adds a file as dependency of the loader result in order to make them watchable.
+             * For example, html-loader uses this technique as it finds src and src-set attributes.
+             * Then, it sets the url's for those attributes as dependencies of the html file that is parsed.
+             */
+            dependency(file: string): void;
+
+            /**
+             * Add a directory as dependency of the loader result.
+             */
+            addContextDependency(directory: string): void;
+
+            /**
+             * Remove all dependencies of the loader result. Even initial dependencies and these of other loaders. Consider using pitch.
+             */
+            clearDependencies(): void;
+
+            /**
+             * Pass values to the next loader.
+             * If you know what your result exports if executed as module, set this value here (as a only element array).
+             */
+            value: any;
+
+            /**
+             * Passed from the last loader.
+             * If you would execute the input argument as module, consider reading this variable for a shortcut (for performance).
+             */
+            inputValue: any;
+
+            /**
+             * The options passed to the Compiler.
+             */
+            options: any;
+
+            /**
+             * A boolean flag. It is set when in debug mode.
+             */
+            debug: boolean;
+
+            /**
+             * Should the result be minimized.
+             */
+            minimize: boolean;
+
+            /**
+             * Should a SourceMap be generated.
+             */
+            sourceMap: boolean;
+
+            /**
+             * Target of compilation. Passed from configuration options.
+             * Example values: "web", "node"
+             */
+            target: 'web' | 'webworker' | 'async-node' | 'node' | 'electron-main' | 'electron-renderer' | 'node-webkit' | string;
+
+            /**
+             * This boolean is set to true when this is compiled by webpack.
+             *
+             * Loaders were originally designed to also work as Babel transforms.
+             * Therefore if you write a loader that works for both, you can use this property to know if
+             * there is access to additional loaderContext and webpack features.
+             */
+            webpack: boolean;
+
+            /**
+             * Emit a file. This is webpack-specific.
+             */
+            emitFile(name: string, content: Buffer | string, sourceMap: any): void;
+
+            /**
+             * Access to the compilation's inputFileSystem property.
+             */
+            fs: any;
+
+            /**
+             * Hacky access to the Compilation object of webpack.
+             */
+            _compilation: any;
+
+            /**
+             * Hacky access to the Compiler object of webpack.
+             */
+            _compiler: Compiler;
+
+            /**
+             * Hacky access to the Module object being loaded.
+             */
+            _module: any;
+        }
+    }
+
+    /** @deprecated */
+    namespace compiler {
+        /** @deprecated use webpack.Compiler */
+        // tslint:disable-next-line:no-unnecessary-qualifier
+        type Compiler = webpack.Compiler;
+
+        /** @deprecated use webpack.Compiler.Watching */
+        type Watching = Compiler.Watching;
+
+        /** @deprecated use webpack.Compiler.WatchOptions */
+
+        type WatchOptions = Compiler.WatchOptions;
+
+        /** @deprecated use webpack.Stats */
+        // tslint:disable-next-line:no-unnecessary-qualifier
+        type Stats = webpack.Stats;
+
+        /** @deprecated use webpack.Stats.ToJsonOptions */
+        type StatsOptions = Stats.ToJsonOptions;
+
+        /** @deprecated use webpack.Stats.ToStringOptions */
+        type StatsToStringOptions = Stats.ToStringOptions;
+
+        /** @deprecated use webpack.Compiler.Handler */
+        type CompilerCallback = Compiler.Handler;
+    }
+
+    /** @deprecated use webpack.Options.Performance */
+    type PerformanceOptions = Options.Performance;
+    /** @deprecated use webpack.Options.WatchOptions */
+    type WatchOptions = Options.WatchOptions;
+    /** @deprecated use webpack.EvalSourceMapDevToolPlugin.Options */
+    type EvalSourceMapDevToolPluginOptions = EvalSourceMapDevToolPlugin.Options;
+    /** @deprecated use webpack.SourceMapDevToolPlugin.Options */
+    type SourceMapDevToolPluginOptions = SourceMapDevToolPlugin.Options;
+    /** @deprecated use webpack.optimize.UglifyJsPlugin.CommentFilter */
+    type UglifyCommentFunction = optimize.UglifyJsPlugin.CommentFilter;
+    /** @deprecated use webpack.optimize.UglifyJsPlugin.Options */
+    type UglifyPluginOptions = optimize.UglifyJsPlugin.Options;
+}
\ No newline at end of file
diff --git a/types/webpack/v3/package.json b/types/webpack/v3/package.json
new file mode 100644
index 0000000000..59c231c54c
--- /dev/null
+++ b/types/webpack/v3/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "source-map": "^0.6.0"
+    }
+}
diff --git a/types/webpack/v3/tsconfig.json b/types/webpack/v3/tsconfig.json
new file mode 100644
index 0000000000..a6671e38b4
--- /dev/null
+++ b/types/webpack/v3/tsconfig.json
@@ -0,0 +1,26 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "paths": {
+            "webpack": ["webpack/v3"]
+        }
+    },
+    "files": [
+        "index.d.ts",
+        "webpack-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/webpack/v3/tslint.json b/types/webpack/v3/tslint.json
new file mode 100644
index 0000000000..b4b47a0378
--- /dev/null
+++ b/types/webpack/v3/tslint.json
@@ -0,0 +1,3 @@
+{
+	"extends": "dtslint/dt.json"
+}
diff --git a/types/webpack/v3/webpack-tests.ts b/types/webpack/v3/webpack-tests.ts
new file mode 100644
index 0000000000..f56dbb84b6
--- /dev/null
+++ b/types/webpack/v3/webpack-tests.ts
@@ -0,0 +1,667 @@
+import webpack = require('webpack');
+import { RawSourceMap } from 'source-map';
+
+const {
+    optimize,
+} = webpack;
+
+let plugins: webpack.Plugin[];
+
+/**
+ * Plugins
+ */
+
+/**
+ * optimize
+ */
+
+const {
+    AggressiveMergingPlugin,
+} = optimize;
+
+plugins = [
+    new AggressiveMergingPlugin(),
+    new AggressiveMergingPlugin({}),
+    new AggressiveMergingPlugin({
+        entryChunkMultiplicator: 10,
+        minSizeReduce: 1.5,
+        moveToParents: false,
+    }),
+];
+
+let configuration: webpack.Configuration;
+let rule: webpack.Rule;
+let plugin: webpack.Plugin;
+declare const __dirname: string;
+
+//
+// https://webpack.github.io/docs/using-loaders.html
+//
+
+configuration = {
+    module: {
+        loaders: [
+            { test: /\.jade$/, loader: "jade" },
+            // => "jade" loader is used for ".jade" files
+
+            { test: /\.css$/, loader: "style!css" },
+            // => "style" and "css" loader is used for ".css" files
+            // Alternative syntax:
+            { test: /\.css$/, loaders: ["style", "css"] },
+        ]
+    }
+};
+
+rule = { test: /\.png$/, loader: "url-loader?mimetype=image/png" };
+
+rule = {
+    test: /\.png$/,
+    loader: "url-loader",
+    query: { mimetype: "image/png" }
+};
+
+//
+// http://webpack.github.io/docs/tutorials/getting-started/
+//
+
+configuration = {
+    entry: "./entry.js",
+    output: {
+        path: __dirname,
+        filename: "bundle.js"
+    },
+    module: {
+        loaders: [
+            { test: /\.css$/, loader: "style!css" }
+        ]
+    }
+};
+
+//
+// https://webpack.js.org/configuration/entry-context/#dynamic-entry
+//
+
+configuration = {
+    entry: () => './demo'
+};
+
+configuration = {
+    entry: () => ['./demo', './demo2']
+};
+
+configuration = {
+    entry: () => new Promise((resolve) => resolve('./demo'))
+};
+
+configuration = {
+    entry: () => new Promise((resolve) => resolve(['./demo', './demo2']))
+};
+
+//
+// https://webpack.github.io/docs/code-splitting.html
+//
+
+configuration = {
+    entry: {
+        app: "./app.js",
+        vendor: ["jquery", "underscore"],
+    },
+    output: {
+        filename: "bundle.js"
+    },
+    plugins: [
+        new webpack.optimize.CommonsChunkPlugin({
+            name: "vendor",
+            filename: "vendor.bundle.js",
+        }),
+    ]
+};
+
+configuration = {
+    entry: { a: "./a", b: "./b" },
+    output: { filename: "[name].js" },
+    plugins: [new webpack.optimize.CommonsChunkPlugin({ name: "init.js" })]
+};
+
+//
+// https://webpack.github.io/docs/stylesheets.html
+//
+
+configuration = {
+    // ...
+    module: {
+        loaders: [
+            { test: /\.css$/, loader: "style-loader!css-loader" }
+        ]
+    }
+};
+
+//
+// https://webpack.github.io/docs/optimization.html
+//
+
+configuration = {
+    entry: {
+        p1: "./page1",
+        p2: "./page2",
+        p3: "./page3"
+    },
+    output: {
+        filename: "[name].entry.chunk.js"
+    }
+};
+
+const CommonsChunkPlugin = webpack.optimize.CommonsChunkPlugin;
+configuration = {
+    entry: {
+        p1: "./page1",
+        p2: "./page2",
+        p3: "./page3"
+    },
+    output: {
+        filename: "[name].entry.chunk.js"
+    },
+    plugins: [
+        new CommonsChunkPlugin({ name: "commons.chunk.js" })
+    ]
+};
+
+configuration = {
+    entry: {
+        p1: "./page1",
+        p2: "./page2",
+        p3: "./page3",
+        ap1: "./admin/page1",
+        ap2: "./admin/page2"
+    },
+    output: {
+        filename: "[name].js"
+    },
+};
+// <script>s required:
+// page1.html: commons.js, p1.js
+// page2.html: commons.js, p2.js
+// page3.html: p3.js
+// admin-page1.html: commons.js, admin-commons.js, ap1.js
+// admin-page2.html: commons.js, admin-commons.js, ap2.js
+
+configuration = {
+    entry: {
+        p1: "./page1",
+        p2: "./page2",
+        commons: "./entry-for-the-commons-chunk"
+    },
+    plugins: [
+        new CommonsChunkPlugin({
+            name: "commons",
+            filename: "commons.js",
+        }),
+    ]
+};
+
+//
+// https://webpack.github.io/docs/long-term-caching.html
+//
+
+configuration = {
+    output: {
+        path: path.join(__dirname, "assets", "[hash]"),
+        publicPath: "assets/[hash]/",
+        filename: "output.[hash].bundle.js",
+        chunkFilename: "[id].[hash].bundle.js"
+    }
+};
+
+configuration = { output: { chunkFilename: "[chunkhash].bundle.js" } };
+
+//
+// https://webpack.github.io/docs/configuration.html
+//
+
+configuration = {
+    entry: [
+        "./entry1",
+        "./entry2"
+    ]
+};
+
+configuration = {
+    devtool: "inline-source-map"
+};
+
+configuration = {
+    devtool: false
+};
+
+configuration = {
+    resolve: {
+        modules: [__dirname]
+    }
+};
+
+rule = {
+    test: /\.jsx$/,
+    include: [
+        path.resolve(__dirname, "app/src"),
+        path.resolve(__dirname, "app/test")
+    ],
+    exclude: [
+        path.resolve(__dirname, "node_modules")
+    ],
+    loader: "babel-loader"
+};
+
+declare const require: any;
+declare const path: any;
+configuration = {
+    plugins: [
+        function(this: webpack.Compiler) {
+            this.plugin("done", stats => {
+                require("fs").writeFileSync(
+                    path.join(__dirname, "...", "stats.json"),
+                    JSON.stringify(stats.toJson()));
+            });
+        }
+    ]
+};
+
+//
+// https://webpack.github.io/docs/list-of-plugins.html
+//
+
+declare const resourceRegExp: any;
+declare const newResource: any;
+declare const contextRegExp: any;
+declare const newContentResource: any;
+declare const newContentRecursive: any;
+declare const newContentRegExp: any;
+declare const requestRegExp: any;
+declare const options: any;
+declare const definitions: any;
+declare const paths: any;
+const preferEntry = true;
+declare const context: any;
+declare const request: any;
+declare const types: any;
+declare const banner: any;
+
+plugin = new webpack.NormalModuleReplacementPlugin(resourceRegExp, newResource);
+plugin = new webpack.ContextReplacementPlugin(
+    resourceRegExp,
+    newContentResource,
+    newContentRecursive,
+    newContentRegExp);
+plugin = new webpack.ContextReplacementPlugin(
+    resourceRegExp,
+    newContentResource,
+    newContentRecursive);
+plugin = new webpack.ContextReplacementPlugin(
+    resourceRegExp,
+    newContentResource);
+plugin = new webpack.ContextReplacementPlugin(resourceRegExp);
+plugin = new webpack.DllPlugin({
+    context: 'dir-context',
+    name: 'dll-name',
+    path: 'manifest-path'
+});
+plugin = new webpack.DllPlugin([{
+    context: 'dir-context',
+    name: 'dll-name',
+    path: 'manifest-path'
+}]);
+plugin = new webpack.DllReferencePlugin({
+    content: 'dll content',
+    context: 'dir-context',
+    manifest: {
+        content: 'dll content',
+        name: 'dll name'
+    },
+    name: 'dll name',
+    scope: 'dll prefix',
+    sourceType: 'var'
+});
+plugin = new webpack.IgnorePlugin(requestRegExp);
+plugin = new webpack.IgnorePlugin(requestRegExp, contextRegExp);
+
+plugin = new webpack.PrefetchPlugin(context, request);
+plugin = new webpack.PrefetchPlugin(request);
+plugin = new webpack.BannerPlugin('banner');
+plugin = new webpack.BannerPlugin({
+    banner: 'banner'
+});
+plugin = new webpack.BannerPlugin({
+    banner: 'banner',
+    entryOnly: true,
+    exclude: /index/,
+    include: 'test',
+    raw: false,
+    test: ['test', /index/]
+});
+plugin = new webpack.optimize.DedupePlugin();
+plugin = new webpack.optimize.LimitChunkCountPlugin(options);
+plugin = new webpack.optimize.MinChunkSizePlugin(options);
+plugin = new webpack.optimize.OccurrenceOrderPlugin(preferEntry);
+plugin = new webpack.optimize.OccurrenceOrderPlugin(preferEntry);
+plugin = new webpack.optimize.UglifyJsPlugin(options);
+plugin = new webpack.optimize.UglifyJsPlugin();
+plugin = new webpack.optimize.UglifyJsPlugin({
+    parallel: true
+});
+plugin = new webpack.optimize.UglifyJsPlugin({
+    parallel: {
+        cache: true,
+        workers: 2
+    }
+});
+plugin = new webpack.optimize.UglifyJsPlugin({
+    compress: {
+        warnings: false
+    }
+});
+plugin = new webpack.optimize.UglifyJsPlugin({
+    sourceMap: false,
+    comments: true,
+    beautify: true,
+    test: 'foo',
+    exclude: /node_modules/,
+    include: 'test'
+});
+plugin = new webpack.optimize.UglifyJsPlugin({
+    mangle: {
+        except: ['$super', '$', 'exports', 'require']
+    }
+});
+plugin = new webpack.optimize.UglifyJsPlugin({
+    comments: (astNode: any, comment: any) => false
+});
+plugin = new webpack.optimize.CommonsChunkPlugin(options);
+plugin = new CommonsChunkPlugin({
+    name: "commons",
+    // (the commons chunk name)
+
+    filename: "commons.js",
+    // (the filename of the commons chunk)
+
+    // minChunks: 3,
+    // (Modules must be shared between 3 entries)
+
+    // chunks: ["pageA", "pageB"],
+    // (Only use these entries)
+});
+plugin = new CommonsChunkPlugin({
+    // names: ["app", "subPageA"]
+    // (choose the chunks, or omit for all chunks)
+
+    children: true,
+    // (select all children of chosen chunks)
+
+    // minChunks: 3,
+    // (3 children must share the module before it's moved)
+});
+plugin = new CommonsChunkPlugin({
+    // names: ["app", "subPageA"]
+    // (choose the chunks, or omit for all chunks)
+
+    children: true,
+    // (use all children of the chunk)
+
+    async: true,
+    // (create an async commons chunk)
+
+    // minChunks: 3,
+    // (3 children must share the module before it's separated)
+});
+plugin = new webpack.DefinePlugin(definitions);
+plugin = new webpack.DefinePlugin({
+    VERSION: JSON.stringify("5fa3b9"),
+    BROWSER_SUPPORTS_HTML5: true,
+    TWO: "1+1",
+    "typeof window": JSON.stringify("object")
+});
+plugin = new webpack.ProvidePlugin(definitions);
+plugin = new webpack.ProvidePlugin({
+    $: "jquery"
+});
+plugin = new webpack.SourceMapDevToolPlugin({
+    //// asset matching
+    test: /\.js$/,
+    // include: Condition | Condition[],
+    exclude: [
+        /node_modules/
+    ],
+    //
+    //// file and reference
+    filename: null, // | string
+    // append: false | string,
+    //// sources naming
+    // moduleFilenameTemplate: string,
+    // fallbackModuleFilenameTemplate: string,
+    //
+    //// quality/performance
+    module: true,
+    columns: true,
+    lineToLine: false // | { test?: Condition | Condition[], ... }
+});
+plugin = new webpack.EvalSourceMapDevToolPlugin(false);
+plugin = new webpack.HotModuleReplacementPlugin();
+plugin = new webpack.ExtendedAPIPlugin();
+plugin = new webpack.NoErrorsPlugin();
+plugin = new webpack.NoEmitOnErrorsPlugin();
+plugin = new webpack.WatchIgnorePlugin(paths);
+plugin = new webpack.LoaderOptionsPlugin({
+    debug: true
+});
+plugin = new webpack.EnvironmentPlugin(['a', 'b']);
+plugin = new webpack.EnvironmentPlugin({ a: true, b: 'c' });
+plugin = new webpack.ProgressPlugin((percent: number, message: string) => { });
+plugin = new webpack.ProgressPlugin((percent: number, message: string, moduleProgress?: string, activeModules?: string, moduleName?: string) => { });
+plugin = new webpack.HashedModuleIdsPlugin();
+plugin = new webpack.HashedModuleIdsPlugin({
+    hashFunction: 'sha256',
+    hashDigest: 'hex',
+    hashDigestLength: 20
+});
+
+//
+// http://webpack.github.io/docs/node.js-api.html
+//
+
+// returns a Compiler instance
+webpack({
+    // configuration
+}, (err, stats) => {
+    // ...
+});
+
+// returns a Compiler instance
+let compiler = webpack({
+    // configuration
+});
+
+compiler.run((err, stats) => {
+    // ...
+});
+// or
+compiler.watch({ // watch options:
+    aggregateTimeout: 300, // wait so long for more changes
+    poll: true // use polling instead of native watchers
+    // pass a number to set the polling interval
+}, (err, stats) => {
+    // ...
+});
+// or
+compiler.watch({ // watch options:
+    ignored: 'foo/**/*'
+}, (err, stats) => {
+    // ...
+});
+// or
+compiler.watch({ // watch options:
+    ignored: /node_modules/
+}, (err, stats) => {
+    // ...
+});
+
+declare function handleFatalError(err: Error): void;
+declare function handleSoftErrors(errs: string[]): void;
+declare function handleWarnings(errs: string[]): void;
+declare function successfullyCompiled(): void;
+
+webpack({
+    // configuration
+}, (err, stats) => {
+    if (err) {
+        handleFatalError(err);
+        return;
+    }
+    const jsonStats = stats.toJson();
+    const jsonStatsWithAllOptions = stats.toJson({
+        assets: true,
+        assetsSort: "field",
+        cached: true,
+        children: true,
+        chunks: true,
+        chunkModules: true,
+        chunkOrigins: true,
+        chunksSort: "field",
+        context: "../src/",
+        errors: true,
+        errorDetails: true,
+        hash: true,
+        modules: true,
+        modulesSort: "field",
+        publicPath: true,
+        reasons: true,
+        source: true,
+        timings: true,
+        version: true,
+        warnings: true,
+        warningsFilter: ["filter", /filter/],
+        excludeAssets: ["filter", "excluded"]
+    });
+
+    if (jsonStats.errors.length > 0) {
+        handleSoftErrors(jsonStats.errors);
+        return;
+    }
+    if (jsonStats.warnings.length > 0) {
+        handleWarnings(jsonStats.warnings);
+    }
+    successfullyCompiled();
+});
+
+declare const fs: any;
+
+compiler = webpack({});
+compiler.outputFileSystem = fs;
+compiler.run((err, stats) => {
+    // ...
+    const fileContent = fs.readFileSync("...");
+});
+
+//
+// https://github.com/webpack/webpack/blob/master/test/configCases/rule-set/simple/webpack.config.js
+//
+
+rule = {
+    test: {
+        or: [
+            require.resolve("./a"),
+            require.resolve("./c"),
+        ]
+    },
+    loader: "./loader",
+    options: "third"
+};
+
+configuration = {
+    module: {
+        rules: [
+            {
+                oneOf: [
+                    {
+                        test: {
+                            and: [
+                                /a.\.js$/,
+                                /b\.js$/
+                            ]
+                        },
+                        loader: "./loader?first"
+                    },
+                    {
+                        test: [
+                            require.resolve("./a"),
+                            require.resolve("./c"),
+                        ],
+                        issuer: require.resolve("./b"),
+                        use: [
+                            "./loader?second-1",
+                            {
+                                loader: "./loader",
+                                options: "second-2"
+                            },
+                            {
+                                loader: "./loader",
+                                options: {
+                                    get: () => "second-3"
+                                }
+                            }
+                        ]
+                    },
+                    {
+                        test: {
+                            or: [
+                                require.resolve("./a"),
+                                require.resolve("./c"),
+                            ]
+                        },
+                        loader: "./loader",
+                        options: "third"
+                    }
+                ]
+            }
+        ]
+    }
+};
+
+class TestResolvePlugin implements webpack.ResolvePlugin {
+    apply(resolver: any) {
+        resolver.plugin('before-existing-directory', (request: any, callback: any) => {
+            callback();
+        });
+    }
+}
+
+const performance: webpack.Options.Performance = {
+    hints: 'error',
+    maxEntrypointSize: 400000,
+    maxAssetSize: 100000,
+    assetFilter: assetFilename => assetFilename.endsWith('.js'),
+};
+
+configuration = {
+    performance,
+};
+
+function loader(this: webpack.loader.LoaderContext, source: string | Buffer, sourcemap?: RawSourceMap): void {
+    this.cacheable();
+
+    this.async();
+
+    this.addDependency('');
+
+    this.resolve('context', 'request', (err: Error, result: string) => { });
+
+    this.emitWarning('warning message');
+    this.emitWarning(new Error('warning message'));
+
+    this.emitError('error message');
+    this.emitError(new Error('error message'));
+
+    this.callback(null, source);
+}
+
+(loader as webpack.loader.Loader).raw = true;
+(loader as webpack.loader.Loader).pitch = (remainingRequest: string, precedingRequest: string, data: any) => { };
+const loaderRef: webpack.loader.Loader = loader;
+console.log(loaderRef.raw === true);

From ba0d049c49144fcb9173582e74827f37e14e032a Mon Sep 17 00:00:00 2001
From: Dennis George <dennispg@gmail.com>
Date: Tue, 27 Feb 2018 15:59:15 -0600
Subject: [PATCH 0112/1382] Added newline back to webpack v3 definition

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

diff --git a/types/webpack/v3/index.d.ts b/types/webpack/v3/index.d.ts
index ee3a291d02..d6102808b6 100644
--- a/types/webpack/v3/index.d.ts
+++ b/types/webpack/v3/index.d.ts
@@ -1298,4 +1298,4 @@ declare namespace webpack {
     type UglifyCommentFunction = optimize.UglifyJsPlugin.CommentFilter;
     /** @deprecated use webpack.optimize.UglifyJsPlugin.Options */
     type UglifyPluginOptions = optimize.UglifyJsPlugin.Options;
-}
\ No newline at end of file
+}

From f544c1287b9a4657cca30c34db4283aadbba3aaa Mon Sep 17 00:00:00 2001
From: Dennis George <dennispg@gmail.com>
Date: Tue, 27 Feb 2018 16:19:25 -0600
Subject: [PATCH 0113/1382] fixed tests for webpack v4

---
 types/webpack/index.d.ts       |   2 +-
 types/webpack/webpack-tests.ts | 207 ++++++++++-----------------------
 2 files changed, 61 insertions(+), 148 deletions(-)

diff --git a/types/webpack/index.d.ts b/types/webpack/index.d.ts
index 9b84ff7731..5145ced7f7 100644
--- a/types/webpack/index.d.ts
+++ b/types/webpack/index.d.ts
@@ -548,7 +548,7 @@ declare namespace webpack {
             /** Instead of numeric ids, give chunks useful names. */
             namedChunks?: boolean;
             /** Defines the process.env.NODE_ENV constant to a compile-time-constant value. This allows to remove development only code from code. */
-            nodeEnv?: boolean;
+            nodeEnv?: any;
             /** Use the minimizer (optimization.minimizer, by default uglify-js) to minimize output assets. */
             minimize?: boolean;
             /** Configure minimzers and options TODO: add type for this */
diff --git a/types/webpack/webpack-tests.ts b/types/webpack/webpack-tests.ts
index f56dbb84b6..78a6ba851c 100644
--- a/types/webpack/webpack-tests.ts
+++ b/types/webpack/webpack-tests.ts
@@ -34,24 +34,6 @@ let rule: webpack.Rule;
 let plugin: webpack.Plugin;
 declare const __dirname: string;
 
-//
-// https://webpack.github.io/docs/using-loaders.html
-//
-
-configuration = {
-    module: {
-        loaders: [
-            { test: /\.jade$/, loader: "jade" },
-            // => "jade" loader is used for ".jade" files
-
-            { test: /\.css$/, loader: "style!css" },
-            // => "style" and "css" loader is used for ".css" files
-            // Alternative syntax:
-            { test: /\.css$/, loaders: ["style", "css"] },
-        ]
-    }
-};
-
 rule = { test: /\.png$/, loader: "url-loader?mimetype=image/png" };
 
 rule = {
@@ -60,23 +42,6 @@ rule = {
     query: { mimetype: "image/png" }
 };
 
-//
-// http://webpack.github.io/docs/tutorials/getting-started/
-//
-
-configuration = {
-    entry: "./entry.js",
-    output: {
-        path: __dirname,
-        filename: "bundle.js"
-    },
-    module: {
-        loaders: [
-            { test: /\.css$/, loader: "style!css" }
-        ]
-    }
-};
-
 //
 // https://webpack.js.org/configuration/entry-context/#dynamic-entry
 //
@@ -97,45 +62,6 @@ configuration = {
     entry: () => new Promise((resolve) => resolve(['./demo', './demo2']))
 };
 
-//
-// https://webpack.github.io/docs/code-splitting.html
-//
-
-configuration = {
-    entry: {
-        app: "./app.js",
-        vendor: ["jquery", "underscore"],
-    },
-    output: {
-        filename: "bundle.js"
-    },
-    plugins: [
-        new webpack.optimize.CommonsChunkPlugin({
-            name: "vendor",
-            filename: "vendor.bundle.js",
-        }),
-    ]
-};
-
-configuration = {
-    entry: { a: "./a", b: "./b" },
-    output: { filename: "[name].js" },
-    plugins: [new webpack.optimize.CommonsChunkPlugin({ name: "init.js" })]
-};
-
-//
-// https://webpack.github.io/docs/stylesheets.html
-//
-
-configuration = {
-    // ...
-    module: {
-        loaders: [
-            { test: /\.css$/, loader: "style-loader!css-loader" }
-        ]
-    }
-};
-
 //
 // https://webpack.github.io/docs/optimization.html
 //
@@ -151,21 +77,6 @@ configuration = {
     }
 };
 
-const CommonsChunkPlugin = webpack.optimize.CommonsChunkPlugin;
-configuration = {
-    entry: {
-        p1: "./page1",
-        p2: "./page2",
-        p3: "./page3"
-    },
-    output: {
-        filename: "[name].entry.chunk.js"
-    },
-    plugins: [
-        new CommonsChunkPlugin({ name: "commons.chunk.js" })
-    ]
-};
-
 configuration = {
     entry: {
         p1: "./page1",
@@ -178,26 +89,6 @@ configuration = {
         filename: "[name].js"
     },
 };
-// <script>s required:
-// page1.html: commons.js, p1.js
-// page2.html: commons.js, p2.js
-// page3.html: p3.js
-// admin-page1.html: commons.js, admin-commons.js, ap1.js
-// admin-page2.html: commons.js, admin-commons.js, ap2.js
-
-configuration = {
-    entry: {
-        p1: "./page1",
-        p2: "./page2",
-        commons: "./entry-for-the-commons-chunk"
-    },
-    plugins: [
-        new CommonsChunkPlugin({
-            name: "commons",
-            filename: "commons.js",
-        }),
-    ]
-};
 
 //
 // https://webpack.github.io/docs/long-term-caching.html
@@ -374,43 +265,6 @@ plugin = new webpack.optimize.UglifyJsPlugin({
 plugin = new webpack.optimize.UglifyJsPlugin({
     comments: (astNode: any, comment: any) => false
 });
-plugin = new webpack.optimize.CommonsChunkPlugin(options);
-plugin = new CommonsChunkPlugin({
-    name: "commons",
-    // (the commons chunk name)
-
-    filename: "commons.js",
-    // (the filename of the commons chunk)
-
-    // minChunks: 3,
-    // (Modules must be shared between 3 entries)
-
-    // chunks: ["pageA", "pageB"],
-    // (Only use these entries)
-});
-plugin = new CommonsChunkPlugin({
-    // names: ["app", "subPageA"]
-    // (choose the chunks, or omit for all chunks)
-
-    children: true,
-    // (select all children of chosen chunks)
-
-    // minChunks: 3,
-    // (3 children must share the module before it's moved)
-});
-plugin = new CommonsChunkPlugin({
-    // names: ["app", "subPageA"]
-    // (choose the chunks, or omit for all chunks)
-
-    children: true,
-    // (use all children of the chunk)
-
-    async: true,
-    // (create an async commons chunk)
-
-    // minChunks: 3,
-    // (3 children must share the module before it's separated)
-});
 plugin = new webpack.DefinePlugin(definitions);
 plugin = new webpack.DefinePlugin({
     VERSION: JSON.stringify("5fa3b9"),
@@ -445,7 +299,6 @@ plugin = new webpack.SourceMapDevToolPlugin({
 plugin = new webpack.EvalSourceMapDevToolPlugin(false);
 plugin = new webpack.HotModuleReplacementPlugin();
 plugin = new webpack.ExtendedAPIPlugin();
-plugin = new webpack.NoErrorsPlugin();
 plugin = new webpack.NoEmitOnErrorsPlugin();
 plugin = new webpack.WatchIgnorePlugin(paths);
 plugin = new webpack.LoaderOptionsPlugin({
@@ -665,3 +518,63 @@ function loader(this: webpack.loader.LoaderContext, source: string | Buffer, sou
 (loader as webpack.loader.Loader).pitch = (remainingRequest: string, precedingRequest: string, data: any) => { };
 const loaderRef: webpack.loader.Loader = loader;
 console.log(loaderRef.raw === true);
+
+/**
+ * New v4 tests
+ */
+configuration = {
+};
+
+configuration = {
+    mode: "development"
+};
+
+configuration = {
+    mode: "production"
+};
+
+configuration = {
+    mode: "development",
+    optimization: {
+        removeAvailableModules: true,
+        removeEmptyChunks: true,
+        mergeDuplicateChunks: true,
+        flagIncludedChunks: false,
+        occurrenceOrder: false,
+        providedExports: true,
+        usedExports: false,
+        sideEffects: false,
+        concatenateModules: false,
+        splitChunks: true,
+        runtimeChunk: true,
+        noEmitOnErrors: false,
+        namedModules: true,
+        namedChunks: true,
+        nodeEnv: "development",
+        minimize: false,
+        portableRecords: false
+    }
+};
+
+configuration = {
+    mode: "production",
+    optimization: {
+        removeAvailableModules: true,
+        removeEmptyChunks: true,
+        mergeDuplicateChunks: true,
+        flagIncludedChunks: true,
+        occurrenceOrder: true,
+        providedExports: true,
+        usedExports: true,
+        sideEffects: true,
+        concatenateModules: true,
+        splitChunks: true,
+        runtimeChunk: true,
+        noEmitOnErrors: true,
+        namedModules: false,
+        namedChunks: false,
+        nodeEnv: "production",
+        minimize: true,
+        portableRecords: true
+    }
+};

From 9db7bc60885d54e912be3d73f2e57db6b65cbb40 Mon Sep 17 00:00:00 2001
From: denis <denisname@users.noreply.github.com>
Date: Tue, 27 Feb 2018 23:21:24 +0100
Subject: [PATCH 0114/1382] Activate Strict Null Checks

Set strictNullChecks to true
Make geometry and property nullable
Add tests
---
 types/geojson/geojson-tests.ts | 74 ++++++++++++++++++++++++++++++++++
 types/geojson/index.d.ts       |  8 ++--
 types/geojson/tsconfig.json    |  2 +-
 3 files changed, 79 insertions(+), 5 deletions(-)

diff --git a/types/geojson/geojson-tests.ts b/types/geojson/geojson-tests.ts
index ce8c62418e..19a3a4fd53 100644
--- a/types/geojson/geojson-tests.ts
+++ b/types/geojson/geojson-tests.ts
@@ -248,3 +248,77 @@ const typedPropertiesFeatureCollection: FeatureCollection<Point> = {
     type: "FeatureCollection",
     features: [typedPropertiesFeature]
 };
+
+// Strict Null Checks
+
+let isNull: null;
+let isPoint: Point;
+let isPointOrNull: Point | null;
+let isProperty: TestProperty;
+let isPropertyOrNull: TestProperty | null;
+
+const featureAllNull: Feature<null, null> = {
+    type: "Feature",
+    properties: null,
+    geometry: null
+};
+
+const featurePropertyNull: Feature<Point, null> = {
+    type: "Feature",
+    properties: null,
+    geometry: point
+};
+
+const featureGeometryNull: Feature<null, TestProperty> = {
+    type: "Feature",
+    properties: testProps,
+    geometry: null
+};
+
+const featureNoNull: Feature<Point, TestProperty> = {
+    type: "Feature",
+    properties: testProps,
+    geometry: point
+};
+
+const collectionAllNull: FeatureCollection<null, null> = {
+    type: "FeatureCollection",
+    features: [featureAllNull],
+};
+
+const collectionMaybeNull: FeatureCollection<Point | null, TestProperty | null> = {
+    type: "FeatureCollection",
+    features: [featureAllNull, featurePropertyNull, featureGeometryNull, featureNoNull],
+};
+
+const collectionPropertyMaybeNull: FeatureCollection<Point, TestProperty | null> = {
+    type: "FeatureCollection",
+    features: [featurePropertyNull, featureNoNull],
+};
+
+const collectionGeometryMaybeNull: FeatureCollection<Point | null, TestProperty> = {
+    type: "FeatureCollection",
+    features: [featureGeometryNull, featureNoNull],
+};
+
+const collectionNoNull: FeatureCollection<Point, TestProperty> = {
+    type: "FeatureCollection",
+    features: [featureNoNull],
+};
+
+isNull = featureAllNull.geometry;
+isPoint = featurePropertyNull.geometry;
+isNull = featureAllNull.properties;
+isProperty = featureGeometryNull.properties;
+
+isNull = collectionAllNull.features[0].geometry;
+isPointOrNull = collectionMaybeNull.features[0].geometry;
+isPoint = collectionPropertyMaybeNull.features[0].geometry;
+isPointOrNull = collectionGeometryMaybeNull.features[0].geometry;
+isPoint = collectionNoNull.features[0].geometry;
+
+isNull = collectionAllNull.features[0].properties;
+isPropertyOrNull = collectionMaybeNull.features[0].properties;
+isPropertyOrNull = collectionPropertyMaybeNull.features[0].properties;
+isProperty = collectionGeometryMaybeNull.features[0].properties;
+isProperty = collectionNoNull.features[0].properties;
diff --git a/types/geojson/index.d.ts b/types/geojson/index.d.ts
index 85f02aaad0..b1c7b9f39a 100644
--- a/types/geojson/index.d.ts
+++ b/types/geojson/index.d.ts
@@ -139,12 +139,12 @@ export type GeoJsonProperties = { [name: string]: any; } | null;
  * A feature object which contains a geometry and associated properties.
  * https://tools.ietf.org/html/rfc7946#section-3.2
  */
-export interface Feature<G extends GeometryObject, P = GeoJsonProperties> extends GeoJsonObject {
+export interface Feature<G extends GeometryObject | null, P = GeoJsonProperties> extends GeoJsonObject {
     type: "Feature";
     /**
      * The feature's geometry
      */
-    geometry: G | null;
+    geometry: G;
     /**
      * A value that uniquely identifies this feature in a
      * https://tools.ietf.org/html/rfc7946#section-3.2.
@@ -153,14 +153,14 @@ export interface Feature<G extends GeometryObject, P = GeoJsonProperties> extend
     /**
      * Properties associated with this feature.
      */
-    properties: P | null;
+    properties: P;
 }
 
 /**
  * A collection of feature objects.
  *  https://tools.ietf.org/html/rfc7946#section-3.3
  */
-export interface FeatureCollection<G extends GeometryObject, P = GeoJsonProperties> extends GeoJsonObject {
+export interface FeatureCollection<G extends GeometryObject | null, P = GeoJsonProperties | null> extends GeoJsonObject {
     type: "FeatureCollection";
     features: Array<Feature<G, P>>;
 }
diff --git a/types/geojson/tsconfig.json b/types/geojson/tsconfig.json
index 071f17c65d..86021d5757 100644
--- a/types/geojson/tsconfig.json
+++ b/types/geojson/tsconfig.json
@@ -6,7 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [

From a6df8354c204d7f8ab578508b8e5e5f31ea6be46 Mon Sep 17 00:00:00 2001
From: Dennis George <dennispg@gmail.com>
Date: Tue, 27 Feb 2018 17:16:10 -0600
Subject: [PATCH 0115/1382] Updated against webpack v4 options schema.json

---
 types/webpack/index.d.ts       | 79 ++++++++++++++++++++++++++--------
 types/webpack/webpack-tests.ts |  4 +-
 2 files changed, 62 insertions(+), 21 deletions(-)

diff --git a/types/webpack/index.d.ts b/types/webpack/index.d.ts
index 5145ced7f7..1386d9c69a 100644
--- a/types/webpack/index.d.ts
+++ b/types/webpack/index.d.ts
@@ -35,8 +35,8 @@ declare function webpack(options: webpack.Configuration[]): webpack.MultiCompile
 
 declare namespace webpack {
     interface Configuration {
-        /** Specify which set of defaults to use. */
-        mode?: "development" | "production";
+        /** Enable production optimizations or development hints. */
+        mode?: "development" | "production" | "none";
         /** Name of the configuration. Used when loading multiple configurations. */
         name?: string;
         /**
@@ -187,10 +187,10 @@ declare namespace webpack {
         sourcePrefix?: string;
         /** This option enables cross-origin loading of chunks. */
         crossOriginLoading?: string | boolean;
-        /** A Constructor to a custom hash function. You can provide a non-crypto hash function for performance reasons */
-        hashFunction?: (algorithm: string, options?: any) => any;
-        /** Allow to choose the global object reference in runtime exitCode. */
-        globalObject?: any;
+        /** Algorithm used for generation the hash (see node.js crypto package) */
+        hashFunction?: string | ((algorithm: string, options?: any) => any);
+        /** An expression which is used to address the global object/scope in runtime code. */
+        globalObject?: string;
     }
 
     interface Module {
@@ -429,8 +429,8 @@ declare namespace webpack {
         resolve?: Resolve;
         /** Configures the module type. */
         type?: "javascript/auto" | "javascript/esm" | "javascript/dynamic" | "json" | "webassembly/experimental";
-        /** TODO: Update this when the v4 documentation is complete. */
-        sideEffects?: any;
+        /** Flags a module as with or without side effects */
+        sideEffects?: boolean;
     }
     interface BaseDirectRule extends BaseRule {
         /** A condition that must be met */
@@ -506,7 +506,48 @@ declare namespace webpack {
         }
         type Stats = Stats.ToStringOptions;
         type WatchOptions = ICompiler.WatchOptions;
-
+        interface CacheGroupsOptions {
+            /** Assign modules to a cache group */
+            test?: ((...args: any[]) => boolean) | string | RegExp;
+            /** Select chunks for determining cache group content (defaults to \"initial\", \"initial\" and \"all\" requires adding these chunks to the HTML) */
+            chunks?: "initial" | "async" | "all";
+            /** Ignore minimum size, minimum chunks and maximum requests and always create chunks for this cache group */
+            enforce?: boolean;
+            /** Priority of this cache group */
+            priority?: number;
+            /** Minimal size for the created chunk */
+            minSize?: number;
+            /** Minimum number of times a module has to be duplicated until it's considered for splitting */
+            minChunks?: number;
+            /** Maximum number of requests which are accepted for on-demand loading */
+            maxAsyncRequests?: number;
+            /** Maximum number of initial chunks which are accepted for an entry point */
+            maxInitialRequests?: number;
+            /** Try to reuse existing chunk (with name) when it has matching modules */
+            reuseExistingChunk?: boolean;
+            /** Give chunks created a name (chunks with equal name are merged) */
+            name?: boolean | string | ((...args: any[]) => any);
+        }
+        interface SplitChunksOptions {
+            /** Select chunks for determining shared modules (defaults to \"async\", \"initial\" and \"all\" requires adding these chunks to the HTML) */
+            chunks?: "initial" | "async" | "all";
+            /** Minimal size for the created chunk */
+            minSize?: number;
+            /** Minimum number of times a module has to be duplicated until it's considered for splitting */
+            minChunks?: number;
+            /** Maximum number of requests which are accepted for on-demand loading */
+            maxAsyncRequests?: number;
+            /** Maximum number of initial chunks which are accepted for an entry point */
+            maxInitialRequests?: number;
+            /** Give chunks created a name (chunks with equal name are merged) */
+            name?: boolean | string | ((...args: any[]) => any);
+            /** Assign modules to a cache group (modules from different cache groups are tried to keep in separate chunks) */
+            cacheGroups?: false | string | ((...args: any[]) => any) | RegExp | CacheGroupsOptions;
+        }
+        interface RuntimeChunkOptions {
+            /** The name or name factory for the runtime chunks. */
+            name?: string | ((...args: any[]) => any);
+        }
         interface Optimization {
             /**
              *  Modules are removed from chunks when they are already available in all parent chunk groups.
@@ -538,22 +579,22 @@ declare namespace webpack {
             /** Tries to find segments of the module graph which can be safely concatenated into a single module. Depends on optimization.providedExports and optimization.usedExports. */
             concatenateModules?: boolean;
             /** Finds modules which are shared between chunk and splits them into separate chunks to reduce duplication or separate vendor modules from application modules. */
-            splitChunks?: boolean;
-            /** Create a separate chunk for the webpack runtime code and chunk manifest. This chunk should be inlined into the HTML */
-            runtimeChunk?: boolean;
-            /** Don’t write output assets when compilation errors. */
+            splitChunks?: SplitChunksOptions | false;
+            /** Create a separate chunk for the webpack runtime code and chunk hash maps. This chunk should be inlined into the HTML */
+            runtimeChunk?: boolean | "single" | "multiple" | RuntimeChunkOptions;
+            /** Avoid emitting assets when errors occur. */
             noEmitOnErrors?: boolean;
-            /** Instead of numeric ids, give modules useful names. */
+            /** Instead of numeric ids, give modules readable names for better debugging. */
             namedModules?: boolean;
-            /** Instead of numeric ids, give chunks useful names. */
+            /** Instead of numeric ids, give chunks readable names for better debugging. */
             namedChunks?: boolean;
             /** Defines the process.env.NODE_ENV constant to a compile-time-constant value. This allows to remove development only code from code. */
-            nodeEnv?: any;
+            nodeEnv?: string | false;
             /** Use the minimizer (optimization.minimizer, by default uglify-js) to minimize output assets. */
             minimize?: boolean;
-            /** Configure minimzers and options TODO: add type for this */
-            minimizer?: any;
-            /** Identifiers used in records are relative to context directory. */
+            /** Minimizer(s) to use for minimizing the output */
+            minimizer?: Array<Plugin | Tapable.Plugin>;
+            /** Generate records with relative paths to be able to move the context folder". */
             portableRecords?: boolean;
         }
     }
diff --git a/types/webpack/webpack-tests.ts b/types/webpack/webpack-tests.ts
index 78a6ba851c..ca8249b039 100644
--- a/types/webpack/webpack-tests.ts
+++ b/types/webpack/webpack-tests.ts
@@ -545,7 +545,7 @@ configuration = {
         usedExports: false,
         sideEffects: false,
         concatenateModules: false,
-        splitChunks: true,
+        splitChunks: false,
         runtimeChunk: true,
         noEmitOnErrors: false,
         namedModules: true,
@@ -568,7 +568,7 @@ configuration = {
         usedExports: true,
         sideEffects: true,
         concatenateModules: true,
-        splitChunks: true,
+        splitChunks: { chunks: "async", minChunks: 2 },
         runtimeChunk: true,
         noEmitOnErrors: true,
         namedModules: false,

From c8e95cf22664e2894120a8b47a3e37d4f6e53455 Mon Sep 17 00:00:00 2001
From: Alex Regan <alex.joseph.regan@gmail.com>
Date: Tue, 27 Feb 2018 19:32:33 -0700
Subject: [PATCH 0116/1382] fix(bull): switch overload to Promise return

---
 types/bull/index.d.ts | 116 +++++++++++++++++++++---------------------
 1 file changed, 58 insertions(+), 58 deletions(-)

diff --git a/types/bull/index.d.ts b/types/bull/index.d.ts
index 289c05d149..608460b63b 100644
--- a/types/bull/index.d.ts
+++ b/types/bull/index.d.ts
@@ -257,45 +257,13 @@ declare namespace Bull {
      *
      * The callback is called everytime a job is placed in the queue.
      * It is passed an instance of the job as first argument.
-     * The callback can also be defined as the string path to a module
-     * exporting the callback function. Using a path has several advantages:
-     * - The process is sandboxed so if it crashes it does not affect the worker.
-     * - You can run blocking code without affecting the queue (jobs will not stall).
-     * - Much better utilization of multi-core CPUs.
-     * - Less connections to redis.
      *
      * The done callback can be called with an Error instance, to signal that the job did not complete successfully,
      * or with a result as second argument as second argument (e.g.: done(null, result);) when the job is successful.
      * Errors will be passed as a second argument to the "failed" event;
      * results, as a second argument to the "completed" event.
      */
-    process(callback: ((job: Job, done: DoneCallback) => void) | string): void;
-
-    /**
-     * Defines a processing function for the jobs placed into a given Queue.
-     *
-     * The callback is called everytime a job is placed in the queue.
-     * It is passed an instance of the job as first argument.
-     *
-     * A promise must be returned to signal job completion.
-     * If the promise is rejected, the error will be passed as a second argument to the "failed" event.
-     * If it is resolved, its value will be the "completed" event's second argument.
-     */
-    process(callback: (job: Job) => void): Promise<any>;
-
-    /**
-     * Defines a processing function for the jobs placed into a given Queue.
-     *
-     * The callback is called everytime a job is placed in the queue.
-     * It is passed an instance of the job as first argument.
-     *
-     * A promise must be returned to signal job completion.
-     * If the promise is rejected, the error will be passed as a second argument to the "failed" event.
-     * If it is resolved, its value will be the "completed" event's second argument.
-     *
-     * @param concurrency Bull will then call you handler in parallel respecting this max number.
-     */
-    process(concurrency: number, callback: (job: Job) => void): Promise<any>;
+    process(callback: (job: Job, done: DoneCallback) => void): void;
 
     /**
      * Defines a processing function for the jobs placed into a given Queue.
@@ -309,6 +277,38 @@ declare namespace Bull {
      * - Much better utilization of multi-core CPUs.
      * - Less connections to redis.
      *
+     * A promise must be returned to signal job completion.
+     * If the promise is rejected, the error will be passed as a second argument to the "failed" event.
+     * If it is resolved, its value will be the "completed" event's second argument.
+     */
+    process(callback: ((job: Job) => void) | string): Promise<any>;
+
+    /**
+     * Defines a processing function for the jobs placed into a given Queue.
+     *
+     * The callback is called everytime a job is placed in the queue.
+     * It is passed an instance of the job as first argument.
+     * The callback can also be defined as the string path to a module
+     * exporting the callback function. Using a path has several advantages:
+     * - The process is sandboxed so if it crashes it does not affect the worker.
+     * - You can run blocking code without affecting the queue (jobs will not stall).
+     * - Much better utilization of multi-core CPUs.
+     * - Less connections to redis.
+     *
+     * A promise must be returned to signal job completion.
+     * If the promise is rejected, the error will be passed as a second argument to the "failed" event.
+     * If it is resolved, its value will be the "completed" event's second argument.
+     *
+     * @param concurrency Bull will then call you handler in parallel respecting this max number.
+     */
+    process(concurrency: number, callback: ((job: Job) => void) | string): Promise<any>;
+
+    /**
+     * Defines a processing function for the jobs placed into a given Queue.
+     *
+     * The callback is called everytime a job is placed in the queue.
+     * It is passed an instance of the job as first argument.
+     *
      * The done callback can be called with an Error instance, to signal that the job did not complete successfully,
      * or with a result as second argument as second argument (e.g.: done(null, result);) when the job is successful.
      * Errors will be passed as a second argument to the "failed" event;
@@ -316,13 +316,19 @@ declare namespace Bull {
      *
      * @param concurrency Bull will then call you handler in parallel respecting this max number.
      */
-    process(concurrency: number, callback: ((job: Job, done: DoneCallback) => void) | string): void;
+    process(concurrency: number, callback: (job: Job, done: DoneCallback) => void): void;
 
     /**
      * Defines a named processing function for the jobs placed into a given Queue.
      *
      * The callback is called everytime a job is placed in the queue.
      * It is passed an instance of the job as first argument.
+     * The callback can also be defined as the string path to a module
+     * exporting the callback function. Using a path has several advantages:
+     * - The process is sandboxed so if it crashes it does not affect the worker.
+     * - You can run blocking code without affecting the queue (jobs will not stall).
+     * - Much better utilization of multi-core CPUs.
+     * - Less connections to redis.
      *
      * A promise must be returned to signal job completion.
      * If the promise is rejected, the error will be passed as a second argument to the "failed" event.
@@ -331,19 +337,13 @@ declare namespace Bull {
      * @param name Bull will only call the handler if the job name matches
      */
     // tslint:disable-next-line:unified-signatures
-    process(name: string, callback: (job: Job) => void): Promise<any>;
+    process(name: string, callback: ((job: Job) => void) | string): Promise<any>;
 
     /**
      * Defines a processing function for the jobs placed into a given Queue.
      *
      * The callback is called everytime a job is placed in the queue.
      * It is passed an instance of the job as first argument.
-     * The callback can also be defined as the string path to a module
-     * exporting the callback function. Using a path has several advantages:
-     * - The process is sandboxed so if it crashes it does not affect the worker.
-     * - You can run blocking code without affecting the queue (jobs will not stall).
-     * - Much better utilization of multi-core CPUs.
-     * - Less connections to redis.
      *
      * The done callback can be called with an Error instance, to signal that the job did not complete successfully,
      * or with a result as second argument as second argument (e.g.: done(null, result);) when the job is successful.
@@ -353,28 +353,13 @@ declare namespace Bull {
      * @param name Bull will only call the handler if the job name matches
      */
     // tslint:disable-next-line:unified-signatures
-    process(name: string, callback: ((job: Job, done: DoneCallback) => void) | string): void;
+    process(name: string, callback: (job: Job, done: DoneCallback) => void): void;
 
     /**
      * Defines a named processing function for the jobs placed into a given Queue.
      *
      * The callback is called everytime a job is placed in the queue.
      * It is passed an instance of the job as first argument.
-     *
-     * A promise must be returned to signal job completion.
-     * If the promise is rejected, the error will be passed as a second argument to the "failed" event.
-     * If it is resolved, its value will be the "completed" event's second argument.
-     *
-     * @param name Bull will only call the handler if the job name matches
-     * @param concurrency Bull will then call you handler in parallel respecting this max number.
-     */
-    process(name: string, concurrency: number, callback: (job: Job) => void): Promise<any>;
-
-    /**
-     * Defines a processing function for the jobs placed into a given Queue.
-     *
-     * The callback is called everytime a job is placed in the queue.
-     * It is passed an instance of the job as first argument.
      * The callback can also be defined as the string path to a module
      * exporting the callback function. Using a path has several advantages:
      * - The process is sandboxed so if it crashes it does not affect the worker.
@@ -382,6 +367,21 @@ declare namespace Bull {
      * - Much better utilization of multi-core CPUs.
      * - Less connections to redis.
      *
+     * A promise must be returned to signal job completion.
+     * If the promise is rejected, the error will be passed as a second argument to the "failed" event.
+     * If it is resolved, its value will be the "completed" event's second argument.
+     *
+     * @param name Bull will only call the handler if the job name matches
+     * @param concurrency Bull will then call you handler in parallel respecting this max number.
+     */
+    process(name: string, concurrency: number, callback: ((job: Job) => void) | string): Promise<any>;
+
+    /**
+     * Defines a processing function for the jobs placed into a given Queue.
+     *
+     * The callback is called everytime a job is placed in the queue.
+     * It is passed an instance of the job as first argument.
+     *
      * The done callback can be called with an Error instance, to signal that the job did not complete successfully,
      * or with a result as second argument as second argument (e.g.: done(null, result);) when the job is successful.
      * Errors will be passed as a second argument to the "failed" event;
@@ -390,7 +390,7 @@ declare namespace Bull {
      * @param name Bull will only call the handler if the job name matches
      * @param concurrency Bull will then call you handler in parallel respecting this max number.
      */
-    process(name: string, concurrency: number, callback: ((job: Job, done: DoneCallback) => void) | string): void;
+    process(name: string, concurrency: number, callback: (job: Job, done: DoneCallback) => void): void;
 
     /**
      * Creates a new job and adds it to the queue.

From 472056e954b62b303bd0026111d7126eb5a170ea Mon Sep 17 00:00:00 2001
From: Curtis Hawthorne <fjord@google.com>
Date: Tue, 27 Feb 2018 18:33:17 -0800
Subject: [PATCH 0117/1382] add support for custom Error subclasses

---
 types/tape/index.d.ts    |  4 ++--
 types/tape/tape-tests.ts | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/types/tape/index.d.ts b/types/tape/index.d.ts
index 581a669606..936f2ac491 100644
--- a/types/tape/index.d.ts
+++ b/types/tape/index.d.ts
@@ -193,13 +193,13 @@ declare namespace tape {
          * expected, if present, must be a RegExp or Function, which is used to test the exception object.
          */
         throws(fn: () => void, msg?: string): void;
-        throws(fn: () => void, exceptionExpected: RegExp | (() => void), msg?: string): void;
+        throws(fn: () => void, exceptionExpected: RegExp | Function, msg?: string): void;
 
         /**
          * Assert that the function call fn() does not throw an exception.
          */
         doesNotThrow(fn: () => void, msg?: string): void;
-        doesNotThrow(fn: () => void, exceptionExpected: RegExp | (() => void), msg?: string): void;
+        doesNotThrow(fn: () => void, exceptionExpected: RegExp | Function, msg?: string): void;
 
         /**
          * Print a message without breaking the tap output.
diff --git a/types/tape/tape-tests.ts b/types/tape/tape-tests.ts
index 6f5ad605e5..5b86ef31f7 100644
--- a/types/tape/tape-tests.ts
+++ b/types/tape/tape-tests.ts
@@ -28,6 +28,13 @@ rs = tape.createStream(sopts);
 var htest: typeof tape;
 htest = tape.createHarness();
 
+class CustomException extends Error {
+  constructor(message?: string) {
+    super(message);
+    Object.setPrototypeOf(this, new.target.prototype);
+  }
+}
+
 
 tape(name, (test: tape.Test) => {
 
@@ -146,11 +153,15 @@ tape(name, (test: tape.Test) => {
 	test.throws(fn, msg);
 	test.throws(fn, exceptionExpected);
 	test.throws(fn, exceptionExpected, msg);
+	test.throws(fn, CustomException);
+	test.throws(fn, CustomException, msg);
 
 	test.doesNotThrow(fn);
 	test.doesNotThrow(fn, msg);
 	test.doesNotThrow(fn, exceptionExpected);
 	test.doesNotThrow(fn, exceptionExpected, msg);
+	test.doesNotThrow(fn, CustomException);
+	test.doesNotThrow(fn, CustomException, msg);
 
 	test.test(name, (st) => {
 		t = st;

From 1de3b5999f753bcccc4b0e1f9aea7e0ebe659d2f Mon Sep 17 00:00:00 2001
From: petitspois <qingdoufd@163.com>
Date: Wed, 28 Feb 2018 11:40:02 +0800
Subject: [PATCH 0118/1382] Modify the contentFormat and initialContent types

---
 types/braft-editor/braft-editor-tests.tsx | 2 +-
 types/braft-editor/index.d.ts             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/types/braft-editor/braft-editor-tests.tsx b/types/braft-editor/braft-editor-tests.tsx
index 354c4cbb5b..d62356a318 100644
--- a/types/braft-editor/braft-editor-tests.tsx
+++ b/types/braft-editor/braft-editor-tests.tsx
@@ -12,7 +12,7 @@ class BraftEditorTest extends React.Component<BraftEditor.editorProps> {
             height: 500,
             initialContent: this.state.content,
             onChange: this.handleChange,
-            onHTMLChange: this.handleHTMLChange
+            onHTMLChange: this.handleHTMLChange,
         };
         return (
             <div>
diff --git a/types/braft-editor/index.d.ts b/types/braft-editor/index.d.ts
index 225d32722d..a989ec736c 100644
--- a/types/braft-editor/index.d.ts
+++ b/types/braft-editor/index.d.ts
@@ -15,8 +15,8 @@ declare namespace BraftEditor {
 	}
 	interface editorProps {
 		editorState?: any;
-		contentFormat?: RawDraftContentState;
-		initialContent?: RawDraftContentState | null;
+		contentFormat?: 'raw' | 'html';
+		initialContent?: string | null;
 		onChange?: (content: RawDraftContentState) => void;
 		onRawChange?: (content: RawDraftContentState) => void;
 		onHTMLChange?: (content: string) => void;

From ab744a9b6f88ebc5663d4a26052c9a40bd02b351 Mon Sep 17 00:00:00 2001
From: Jonathan Skeate <skeate@gmail.com>
Date: Tue, 27 Feb 2018 22:40:48 -0500
Subject: [PATCH 0119/1382] [recompose] Make StateHandler use Partial<TState>

The state handlers in withStateHandlers do not need to return the full
state every time, since recompose will merge the states together. Their
own flow-types specify $Shape<State>, which as far as I can tell is
analogous to Partial<TState>.
---
 types/recompose/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/recompose/index.d.ts b/types/recompose/index.d.ts
index b6a9f21b14..edff2061b5 100644
--- a/types/recompose/index.d.ts
+++ b/types/recompose/index.d.ts
@@ -133,7 +133,7 @@ declare module 'recompose' {
     >;
 
     // withStateHandlers: https://github.com/acdlite/recompose/blob/master/docs/API.md#withstatehandlers
-    type StateHandler<TState> = (...payload: any[]) => TState | undefined;
+    type StateHandler<TState> = (...payload: any[]) => Partial<TState> | undefined;
     type StateHandlerMap<TState> = {
       [updaterName: string]: StateHandler<TState>;
     };

From 5ad783bf51bfe9dabc59fb508858032f9defc509 Mon Sep 17 00:00:00 2001
From: Kyle Buzby <kyle.buzby@gmail.com>
Date: Tue, 27 Feb 2018 22:14:05 -0600
Subject: [PATCH 0120/1382] add strictFunctionTypes for dtslint

---
 types/postman-collection/tsconfig.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/postman-collection/tsconfig.json b/types/postman-collection/tsconfig.json
index 3f176970e4..9b0b244020 100644
--- a/types/postman-collection/tsconfig.json
+++ b/types/postman-collection/tsconfig.json
@@ -7,6 +7,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"

From a07b4e7d1d9b361ef739c3402deb86a7a870e60b Mon Sep 17 00:00:00 2001
From: Kyle Buzby <kyle.buzby@gmail.com>
Date: Tue, 27 Feb 2018 22:14:24 -0600
Subject: [PATCH 0121/1382] fix tslint errors

---
 types/postman-collection/index.d.ts | 113 +++++++++++-----------------
 1 file changed, 45 insertions(+), 68 deletions(-)

diff --git a/types/postman-collection/index.d.ts b/types/postman-collection/index.d.ts
index 5365b9cfaf..8ed90d8827 100644
--- a/types/postman-collection/index.d.ts
+++ b/types/postman-collection/index.d.ts
@@ -2,21 +2,21 @@
 // Project: https://github.com/postmanlabs/postman-collection
 // Definitions by: Kyle Buzby <https://github.com/kbuzby>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-///<reference types="node" />
-            
+/// <reference types="node" />
+
 export class PropertyBase {
     constructor(definition: any);
 
-    findInParents(property: string, customizer?: any): any | undefined; // TODO Update customizer function def
+    findInParents(property: string, customizer?: any): any ; // TODO Update customizer function def
 
     findParentContaining(property: any, customizer: any): any; // TODO Update customizer function def
 
-    forEachParent(iterator: any): void;                         // TODO Update iterator function def
-    forEachParent(options: any | boolean, iterator: any): void; // TODO Update iterator function def
+    forEachParent(iterator: (item: any) => void): void;
+    forEachParent(options: any /* TODO | boolean*/, iterator: (item: any) => void): void;
 
     meta(): any;
 
-    parent(): any | undefined;
+    parent(): any;
 
     setParent(parent: any): void;
 
@@ -27,7 +27,6 @@ export class PropertyBase {
     static propertyUnprefixMeta(value: any, key: any): any;
 
     static toJSON(obj: any): any;
-
 }
 
 export interface PropertyDefinition {
@@ -48,10 +47,9 @@ export class Property extends PropertyBase implements PropertyDefinition {
 
     toObjectResolved(scope: any, overrides: any, options: any): any;
 
-    static replaceSubstitutions(str: string, variables: VariableList | any | (VariableList | any)[]): string;
-
-    static replaceSubstitutionsIn(obj: any, variables: (VariableList | any)[], mutate: boolean): any;
+    static replaceSubstitutions(str: string, variables: VariableList | VariableList[]): string;
 
+    static replaceSubstitutionsIn(obj: any, variables: VariableList[], mutate: boolean): any;
 }
 
 export interface CertificateDefinition extends PropertyDefinition {
@@ -62,13 +60,13 @@ export interface CertificateDefinition extends PropertyDefinition {
     passphrase?: string;
 }
 
-export class Certificate extends Property {
+export class Certificate extends Property implements CertificateDefinition {
     cert: any;
     id: string;
     key: any;
-    matches: any; // TODO update to UrlMatchPatternList?
+    matches: any[];
     name: string;
-    passphrase: any;
+    passphrase: string;
 
     constructor(options: any);
 
@@ -79,14 +77,12 @@ export class Certificate extends Property {
     update(options: CertificateDefinition): void;
 
     static isCertificate(obj: any): boolean;
-
 }
 
-
 export class PropertyList<TElement> {
     constructor(type: any, parent: any, populate: any);
 
-    add(item: any | TElement): void;
+    add(item: TElement): void;
 
     all(): any;
 
@@ -106,13 +102,13 @@ export class PropertyList<TElement> {
 
     find(rule: any, context?: any): Item | ItemGroup<TElement>;
 
-    get(key: string | any): TElement;
+    get(key: /*TODO string |*/ any): TElement;
 
     has(item: string | TElement, value?: any): boolean;
 
     idx(index: number): TElement;
 
-    indexOf(item: string | any): number;
+    indexOf(item: /*TODO string |*/ any): number;
 
     insert(item: TElement, before: TElement | string): void;
 
@@ -122,24 +118,23 @@ export class PropertyList<TElement> {
 
     one(id: string): TElement;
 
-    populate(items: any | any[]): void;
+    populate(items: any): void;
 
     prepend(item: TElement): any;
 
-    remove(predicate: any | string | TElement, context: any): any;
+    remove(predicate: any /*TODO | string | TElement*/, context: any): any;
 
-    repopulate(items: any | any[]): void;
+    repopulate(items: any): void;
 
     toJSON(): any;
 
-    toObject(excludeDisabled?: any | null, caseSensitive?: any | null, multiValue?: any | null, sanitizeKeys?: any): any;
+    toObject(excludeDisabled?: any, caseSensitive?: any, multiValue?: any, sanitizeKeys?: any): any;
 
     toString(): string;
 
     upsert(item: TElement): boolean | null;
 
     static isPropertyList(obj: any): any;
-
 }
 
 export class CertificateList extends PropertyList<Certificate> {
@@ -148,15 +143,14 @@ export class CertificateList extends PropertyList<Certificate> {
     resolveOne(url: string): CertificateDefinition;
 
     static isCertificateList(obj: any): boolean;
-
 }
 
 export interface ItemGroupDefinition extends PropertyDefinition {
-    item?: (ItemDefinition | ItemGroupDefinition)[];
+    item?: Array<ItemDefinition | ItemGroupDefinition>;
     auth?: RequestAuthDefinition;
     event?: EventDefinition[];
 }
-    
+
 export class ItemGroup<TItem> extends Property {
     auth: RequestAuth;
     items: PropertyList<TItem>;
@@ -172,7 +166,6 @@ export class ItemGroup<TItem> extends Property {
     oneDeep(idOrName: string): TItem;
 
     static isItemGroup(obj: any): boolean;
-
 }
 
 export interface CollectionDefinition extends ItemGroupDefinition {
@@ -181,7 +174,7 @@ export interface CollectionDefinition extends ItemGroupDefinition {
         name?: string;
         version?: string;
     };
-    item?: (ItemDefinition | ItemGroupDefinition)[];
+    item?: Array<ItemDefinition | ItemGroupDefinition>;
     variable?: VariableDefinition;
     auth?: RequestAuthDefinition;
     event?: EventDefinition[];
@@ -202,7 +195,6 @@ export class Collection extends ItemGroup<Request> implements CollectionDefiniti
     toJSON(): any;
 
     static isCollection(obj: any): boolean;
-
 }
 
 export interface CookieDefinition {
@@ -216,14 +208,13 @@ export interface CookieDefinition {
     httpOnly?: boolean;
     hostOnly?: boolean;
     session?: boolean;
-    extensions?: {key: string; value: string}[];
-
+    extensions?: Array<{key: string; value: string}>;
 }
 
 export class Cookie extends PropertyBase implements CookieDefinition {
     domain: string;
     expires: Date | string;
-    extensions: {key: string; value: string}[];
+    extensions: Array<{key: string; value: string}>;
     hostOnly: any;
     httpOnly: any;
     maxAge: number;
@@ -244,7 +235,6 @@ export class Cookie extends PropertyBase implements CookieDefinition {
     static parse(str: string): any;
 
     static splitParam(param: any): any;
-
 }
 
 export class CookieList extends PropertyList<Cookie> {
@@ -272,7 +262,6 @@ export class Description implements DescriptionDefinition {
     update(content: string | DescriptionDefinition, type?: string): void;
 
     static isDescription(obj: any): boolean;
-
 }
 
 export interface EventDefinition extends PropertyDefinition {
@@ -286,7 +275,7 @@ export class Event extends Property implements EventDefinition {
 
     constructor(definition: EventDefinition);
 
-    update(definition: EventDefinition): void;    
+    update(definition: EventDefinition): void;
 }
 
 export class EventList extends PropertyList<Event> {
@@ -297,7 +286,6 @@ export class EventList extends PropertyList<Event> {
     listenersOwn(name: string): Event[];
 
     static isEventList(obj: any): boolean;
-
 }
 
 export interface FormParamDefinition extends PropertyDefinition {
@@ -305,7 +293,7 @@ export interface FormParamDefinition extends PropertyDefinition {
     value: string;
 }
 
-export class FormParam extends Property implements FormParamDefinition{
+export class FormParam extends Property implements FormParamDefinition {
     key: string;
     value: string;
 
@@ -316,7 +304,7 @@ export class FormParam extends Property implements FormParamDefinition{
 
     toString(): string;
 
-    valueOf(): any | string;
+    valueOf(): any;
 
     // static parse(): void; // TODO not implemented yet
 }
@@ -348,7 +336,7 @@ export class Header extends Property implements HeaderDefinition {
 
     static unparse(headers: HeaderList | any[], separator?: string): string;
 
-    static unparseSingle(header: Header): string;    
+    static unparseSingle(header: Header): string;
 }
 
 export class HeaderList extends PropertyList<Header> {
@@ -356,7 +344,7 @@ export class HeaderList extends PropertyList<Header> {
 
     contentSize(): number;
 
-    static isHeaderList(obj: any): boolean;    
+    static isHeaderList(obj: any): boolean;
 }
 
 export interface ItemDefinition extends PropertyDefinition {
@@ -379,7 +367,6 @@ export class Item extends Property implements ItemDefinition {
     getEvents(name: string): Event[];
 
     static isItem(obj: any): boolean;
-
 }
 
 export interface ProxyConfigDefinition extends PropertyDefinition {
@@ -409,7 +396,6 @@ export class ProxyConfig extends Property implements ProxyConfigDefinition {
     updateProtocols(protocols: string[]): void;
 
     static isProxyConfig(obj: any): boolean;
-
 }
 
 export class ProxyConfigList extends PropertyList<ProxyConfig> {
@@ -418,7 +404,6 @@ export class ProxyConfigList extends PropertyList<ProxyConfig> {
     resolve(url?: Url): ProxyConfigDefinition;
 
     static isProxyConfigList(obj: any): boolean;
-
 }
 
 export interface QueryParamDefinition extends PropertyDefinition {
@@ -445,10 +430,9 @@ export class QueryParam extends Property implements QueryParamDefinition {
 
     static parseSingle(param: string, idx: number, all: string[]): any;
 
-    static unparse(params: any | any[], options?: {encode?: boolean | null, ignoreDisabled?: boolean | null}): string;
+    static unparse(params: any, options?: {encode?: boolean | null, ignoreDisabled?: boolean | null}): string;
 
     static unparseSingle(obj: any, encode: boolean): string;
-
 }
 
 export interface RequestDefinition extends PropertyDefinition {
@@ -497,7 +481,6 @@ export class Request extends Property implements RequestDefinition {
     upsertHeader(header: any): void;
 
     static isRequest(obj: any): boolean;
-
 }
 
 export interface RequestAuthDefinition extends PropertyDefinition {
@@ -511,19 +494,17 @@ export class RequestAuth extends Property implements RequestAuthDefinition {
 
     clear(type: string): void;
 
-    current(): any | undefined;
+    current(): any;
 
     parameters(): VariableList;
 
-    update(options: VariableList | any[] | any, type?: string): void;
+    update(options: /*TODO VariableList | any[] |*/ any, type?: string): void;
 
     use(type: string, options: VariableList): void;
 
     static isValidType(type: any): boolean;
-
 }
 
-
 export class RequestBody extends PropertyBase {
     static MODES: {
         raw: string;
@@ -544,7 +525,7 @@ export class RequestBody extends PropertyBase {
 
     toString(): string;
 
-    update(options: any): void;    
+    update(options: any): void;
 }
 
 export interface ResponseDefinition extends PropertyDefinition {
@@ -577,7 +558,7 @@ export class Response extends Property implements ResponseDefinition {
 
     json(reviver?: any, strict?: boolean): any;
 
-    mime(contentType: any, contentDisposition: any): any; //TODO ??
+    mime(contentType: any, contentDisposition: any): any; // TODO ??
 
     size(): number;
 
@@ -592,7 +573,6 @@ export class Response extends Property implements ResponseDefinition {
     static isResponse(obj: any): boolean;
 
     static mimeInfo(type: any, disposition: any): any; // TODO ??
-
 }
 
 export class Script extends Property {
@@ -606,7 +586,7 @@ export class Script extends Property {
 
     update(options?: {type?: string, src?: string, exec?: string | string[]}): void;
 
-    static isScript(obj: any): boolean;    
+    static isScript(obj: any): boolean;
 }
 
 export class Url extends PropertyBase {
@@ -619,9 +599,9 @@ export class Url extends PropertyBase {
     query: PropertyList<QueryParam>;
     variables: VariableList;
 
-    constructor(options: any | string);
+    constructor(options: any /*TODO| string*/);
 
-    addQueryParams(params: any | string): void;
+    addQueryParams(params: any /*TODO | string*/): void;
 
     getHost(): string;
 
@@ -629,7 +609,7 @@ export class Url extends PropertyBase {
 
     getPath(options?: {unresolved: boolean}): string;
 
-    getPathWithQuery(): any | string;
+    getPathWithQuery(): any /*TODO | string*/;
 
     getQueryString(options?: {encode: boolean | null, ignoredDisabled: boolean | null} | null): string;
 
@@ -641,12 +621,11 @@ export class Url extends PropertyBase {
 
     toString(forceProtocol?: boolean): string;
 
-    update(url: string | any): void;
+    update(url: /*TODO string |*/ any): void;
 
     static isUrl(obj: any): boolean;
 
     static parse(url: string): any;
-
 }
 
 /* No documentation for this right now?
@@ -731,7 +710,6 @@ export class Variable extends Property implements VariableDefinition {
     valueType(typeName: string, _noCast: boolean): string;
 
     static isVariable(obj: any): boolean;
-
 }
 
 export class VariableList extends PropertyList<Variable> {
@@ -739,20 +717,19 @@ export class VariableList extends PropertyList<Variable> {
 
     replace(str: string, overrides?: any): string;
 
-    substitute(obj: any | any[], overrides?: any[] | null, mutate?: boolean): any;
+    substitute(obj: any, overrides?: any[] | null, mutate?: boolean): any;
 
     syncFromObject(obj: any, track?: boolean, prune?: boolean): any;
 
     syncToObject(obj?: any): any;
 
     static isVariableList(obj: any): boolean;
-
 }
 
 export interface VariableScopeDefinition extends PropertyDefinition {
     id?: string;
     name?: string;
-    values?: VariableDefinition[]
+    values?: VariableDefinition[];
 }
 
 export class VariableScope extends Property implements VariableScopeDefinition {
@@ -782,7 +759,7 @@ export class VariableScope extends Property implements VariableScopeDefinition {
 
     variables(): any;
 
-    static isVariableScope(obj: any): boolean;    
+    static isVariableScope(obj: any): boolean;
 }
 
 export class Version extends PropertyBase {
@@ -794,9 +771,9 @@ export class Version extends PropertyBase {
     raw: string;
     string: string;
 
-    constructor(options: any | string);
+    constructor(options: any /*TODO | string*/);
 
-    set(value: any | string): void;
+    set(value: any /*TODO | string*/): void;
 
-    toString(): string;    
-}    
+    toString(): string;
+}

From d7629ffffac1ff973c581d2c166a229a6bc2af8b Mon Sep 17 00:00:00 2001
From: Kyle Buzby <kyle.buzby@gmail.com>
Date: Tue, 27 Feb 2018 22:26:21 -0600
Subject: [PATCH 0122/1382] add some function types

---
 types/postman-collection/index.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/postman-collection/index.d.ts b/types/postman-collection/index.d.ts
index 8ed90d8827..e0025d9bda 100644
--- a/types/postman-collection/index.d.ts
+++ b/types/postman-collection/index.d.ts
@@ -7,9 +7,9 @@
 export class PropertyBase {
     constructor(definition: any);
 
-    findInParents(property: string, customizer?: any): any ; // TODO Update customizer function def
+    findInParents(property: string, customizer?: (item: any) => boolean): PropertyBase ;
 
-    findParentContaining(property: any, customizer: any): any; // TODO Update customizer function def
+    findParentContaining(property: any, customizer: (item: any) => boolean): PropertyBase;
 
     forEachParent(iterator: (item: any) => void): void;
     forEachParent(options: any /* TODO | boolean*/, iterator: (item: any) => void): void;

From 63ca62a96bbc16ac3bd46b6dc6f46506a20483d7 Mon Sep 17 00:00:00 2001
From: Kyle Buzby <kyle.buzby@gmail.com>
Date: Tue, 27 Feb 2018 22:26:30 -0600
Subject: [PATCH 0123/1382] add start of tests

---
 .../postman-collection-tests.ts               | 29 +++++++++++++++----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/types/postman-collection/postman-collection-tests.ts b/types/postman-collection/postman-collection-tests.ts
index fd65e5e3d9..9f98e7d689 100644
--- a/types/postman-collection/postman-collection-tests.ts
+++ b/types/postman-collection/postman-collection-tests.ts
@@ -1,7 +1,26 @@
 import * as pmCollection from 'postman-collection';
 
-/* Example https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/base64-js/base64-js-tests.ts
-base64js.byteLength(""); // $ExpectType number
-base64js.toByteArray(""); // $ExpectType Uint8Array
-base64js.fromByteArray(new Uint8Array(0)); // $ExpectType string
-*/
+const certificate = new pmCollection.Certificate({});
+certificate.cert; // $ExpectType any
+certificate.id; // $ExpectType string
+certificate.key; // $ExpectType any
+certificate.matches; // $ExpectType any[]
+certificate.name; // $ExpectType string
+certificate.passphrase; // $ExpectType string
+certificate.auth; // $ExpectType RequestAuth
+certificate.disabled; // $ExpectType boolean
+
+certificate.canApplyTo("string"); // $ExpectType any
+certificate.canApplyTo(new pmCollection.Url({})); // $ExpectType any
+
+certificate.toJSON(); // $ExpectType CertificateDefinition
+certificate.update({}); // $ExpectType void
+
+certificate as pmCollection.Property; // $ExpectType Property
+
+pmCollection.Certificate.isCertificate(certificate); // $ExpectType boolean
+
+let collection: pmCollection.Collection;
+collection = new pmCollection.Collection();
+collection = new pmCollection.Collection({});
+collection = new pmCollection.Collection({}, []);

From e3261f05e9e52e7cd059f0e5c6a3bbda2021adc0 Mon Sep 17 00:00:00 2001
From: Nikolay Polukhin <polu-hin@mail.ru>
Date: Wed, 28 Feb 2018 15:03:58 +0400
Subject: [PATCH 0124/1382] [react-native-touch-id] Update to 4.0.0

---
 types/react-native-touch-id/index.d.ts               | 12 +++++++++---
 .../react-native-touch-id-tests.ts                   |  5 +++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/types/react-native-touch-id/index.d.ts b/types/react-native-touch-id/index.d.ts
index f1fc4f7a71..e222b87b59 100644
--- a/types/react-native-touch-id/index.d.ts
+++ b/types/react-native-touch-id/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for react-native-touch-id 3.0.0
+// Type definitions for react-native-touch-id 4.0.0
 // Project: https://github.com/naoufal/react-native-touch-id
 // Definitions by: huhuanming <https://github.com/huhuanming>
+//                 Nikolay Polukhin <https://github.com/gazaret>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare module 'react-native-touch-id' {
@@ -13,6 +14,11 @@ declare module 'react-native-touch-id' {
     details: any;
   }
 
-  export const isSupported: () => Promise<boolean | TouchIDError>;
-  export const authenticate: (reason: string) => Promise<boolean | TouchIDError>;
+  export interface AuthenticateConfig {
+    title: string;
+    color: string;
+  }
+
+  export const isSupported: () => Promise<boolean | string | TouchIDError>;
+  export const authenticate: (reason: string, config?: AuthenticateConfig) => Promise<boolean | TouchIDError>;
 }
diff --git a/types/react-native-touch-id/react-native-touch-id-tests.ts b/types/react-native-touch-id/react-native-touch-id-tests.ts
index 0b431ecc85..8ad30c1390 100644
--- a/types/react-native-touch-id/react-native-touch-id-tests.ts
+++ b/types/react-native-touch-id/react-native-touch-id-tests.ts
@@ -3,3 +3,8 @@ import { isSupported, authenticate, TouchIDError } from 'react-native-touch-id';
 isSupported().then((isOk: boolean) => {}).catch((error: TouchIDError) => {});
 
 authenticate('reason').then((isOk: boolean) => {}).catch((error: TouchIDError) => {});
+
+authenticate('reason', {
+    title: 'Authentication Required',
+    color: '#1306ff'
+}).then((isOk: boolean) => {}).catch((error: TouchIDError) => {});

From 01aa7a6ff452e42e90be95d47e5a116e7249a831 Mon Sep 17 00:00:00 2001
From: Ragg <Ragg-@users.noreply.github.com>
Date: Thu, 1 Mar 2018 00:23:53 +0900
Subject: [PATCH 0125/1382] Improve typing for createStore (review fixes)

---
 types/dispatchr/addons/createStore.d.ts | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/types/dispatchr/addons/createStore.d.ts b/types/dispatchr/addons/createStore.d.ts
index 0c6388d1ae..df8e12cf03 100644
--- a/types/dispatchr/addons/createStore.d.ts
+++ b/types/dispatchr/addons/createStore.d.ts
@@ -1,13 +1,20 @@
 import { StoreClass, Store } from '../index';
 
+type Diff<T extends string, U extends string> = ({ [P in T]: P } & { [P in U]: never } & { [x: string]: never })[T];
+type Omit<T, K extends keyof T> = Pick<T, Diff<keyof T, K>>;
+
 interface StoreOptions {
-    initialize?(): void;
     storeName: string;
     handlers: { [event: string]: string };
-    [prop: string]: any;
+    statics?: { [prop: string]: any };
+    mixins?: object[];
+    initialize?(): void;
+    dehydrate?(): any;
+    rehydrate?(state: any): void;
 }
 
-type CreateStore = <This extends StoreOptions>(options: This & ThisType<This & Store>) => StoreClass;
+// see: https://github.com/yahoo/fluxible/blob/dispatchr-v1.2.0/packages/dispatchr/addons/createStore.js#L9
+type StoreThis<T extends StoreOptions> = Omit<T, 'statics'|'storeName'|'handlers'|'mixins'> & Store
 
-declare const _: CreateStore;
-export = _;
+declare function createStore<T extends StoreOptions>(options: T & ThisType<StoreThis<T>>): StoreClass;
+export = createStore;

From 088f244955d98cbe794fcdaa4c4473ee830379a3 Mon Sep 17 00:00:00 2001
From: Ragg <Ragg-@users.noreply.github.com>
Date: Thu, 1 Mar 2018 00:24:38 +0900
Subject: [PATCH 0126/1382] Arrow function type to method type

---
 types/dispatchr/addons/BaseStore.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/dispatchr/addons/BaseStore.d.ts b/types/dispatchr/addons/BaseStore.d.ts
index 0c1c577a3f..6507a7fcf4 100644
--- a/types/dispatchr/addons/BaseStore.d.ts
+++ b/types/dispatchr/addons/BaseStore.d.ts
@@ -5,7 +5,7 @@ import { EventEmitter } from 'events';
 
 declare class BaseStore<S = {}> extends EventEmitter implements Store<S> {
     constructor(dispatcher: DispatcherInterface);
-    initialize?: () => void;
+    initialize?(): void;
     getContext(): DispatcherContext;
     addChangeListener(callback: () => void): void;
     removeChangeListener(callback: () => void): void;

From 06f37f7a26f27c94f9199e301741991550494706 Mon Sep 17 00:00:00 2001
From: Ragg <Ragg-@users.noreply.github.com>
Date: Thu, 1 Mar 2018 00:25:07 +0900
Subject: [PATCH 0127/1382] Add BaseStore test

---
 types/dispatchr/dispatchr-tests.ts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/types/dispatchr/dispatchr-tests.ts b/types/dispatchr/dispatchr-tests.ts
index 3c26c50c9b..4097b14af3 100644
--- a/types/dispatchr/dispatchr-tests.ts
+++ b/types/dispatchr/dispatchr-tests.ts
@@ -1,5 +1,6 @@
 import { createDispatcher, Store } from 'dispatchr';
 import * as createStore from 'dispatchr/addons/createStore';
+import * as BaseStore from 'dispatchr/addons/BaseStore';
 
 const TestStore = createStore({
     storeName: 'TestStore',
@@ -18,6 +19,16 @@ const TestStore = createStore({
     additionalMethod() {}
 });
 
+class ExtendedStore extends BaseStore<{}> {
+    static handlers = {
+        ACTION_NAME: 'actionHandler'
+    };
+
+    actionHandler() {
+        this.emitChange();
+    }
+}
+
 const dispatcher = createDispatcher({
     errorHandler(e, context) {
         e.meta;

From 020a99332b38d167262312f6f264a64f936732ad Mon Sep 17 00:00:00 2001
From: Ragg <Ragg-@users.noreply.github.com>
Date: Thu, 1 Mar 2018 00:32:20 +0900
Subject: [PATCH 0128/1382] Add createStore `statics` test

---
 types/dispatchr/dispatchr-tests.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/types/dispatchr/dispatchr-tests.ts b/types/dispatchr/dispatchr-tests.ts
index 4097b14af3..4c66c47b65 100644
--- a/types/dispatchr/dispatchr-tests.ts
+++ b/types/dispatchr/dispatchr-tests.ts
@@ -9,6 +9,10 @@ const TestStore = createStore({
         ACTION_NAME: 'actionHandler'
     },
 
+    statics: {
+        staticMethod() {}
+    },
+
     initialize() { },
 
     actionHandler() {

From faf8f5f20700d214f56427063dfccc16416ad55f Mon Sep 17 00:00:00 2001
From: Ragg <Ragg-@users.noreply.github.com>
Date: Thu, 1 Mar 2018 00:35:03 +0900
Subject: [PATCH 0129/1382] lint

---
 types/dispatchr/addons/createStore.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/dispatchr/addons/createStore.d.ts b/types/dispatchr/addons/createStore.d.ts
index df8e12cf03..86a1f24fbb 100644
--- a/types/dispatchr/addons/createStore.d.ts
+++ b/types/dispatchr/addons/createStore.d.ts
@@ -14,7 +14,7 @@ interface StoreOptions {
 }
 
 // see: https://github.com/yahoo/fluxible/blob/dispatchr-v1.2.0/packages/dispatchr/addons/createStore.js#L9
-type StoreThis<T extends StoreOptions> = Omit<T, 'statics'|'storeName'|'handlers'|'mixins'> & Store
+type StoreThis<T extends StoreOptions> = Omit<T, 'statics'|'storeName'|'handlers'|'mixins'> & Store;
 
 declare function createStore<T extends StoreOptions>(options: T & ThisType<StoreThis<T>>): StoreClass;
 export = createStore;

From 528492dd9314556edd310c924310078164ca2cda Mon Sep 17 00:00:00 2001
From: Ragg <Ragg-@users.noreply.github.com>
Date: Thu, 1 Mar 2018 00:35:48 +0900
Subject: [PATCH 0130/1382] Fix import syntax

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

diff --git a/types/dispatchr/dispatchr-tests.ts b/types/dispatchr/dispatchr-tests.ts
index 4c66c47b65..797cb9fb0a 100644
--- a/types/dispatchr/dispatchr-tests.ts
+++ b/types/dispatchr/dispatchr-tests.ts
@@ -1,6 +1,6 @@
 import { createDispatcher, Store } from 'dispatchr';
-import * as createStore from 'dispatchr/addons/createStore';
-import * as BaseStore from 'dispatchr/addons/BaseStore';
+import createStore = require('dispatchr/addons/createStore');
+import BaseStore = require('dispatchr/addons/BaseStore');
 
 const TestStore = createStore({
     storeName: 'TestStore',

From c85dafb61e5629bc3a280f952fe44c684e4cf7d5 Mon Sep 17 00:00:00 2001
From: Ragg <Ragg-@users.noreply.github.com>
Date: Thu, 1 Mar 2018 00:36:30 +0900
Subject: [PATCH 0131/1382] empty {} -> object

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

diff --git a/types/dispatchr/index.d.ts b/types/dispatchr/index.d.ts
index 3fa0118729..3b4dab9ec1 100644
--- a/types/dispatchr/index.d.ts
+++ b/types/dispatchr/index.d.ts
@@ -28,7 +28,7 @@ export interface Store<S = {}> extends EventEmitter {
 }
 
 export interface Dispatcher {
-    createContext(context: {}): DispatcherContext;
+    createContext(context: object): DispatcherContext;
     registerStore(store: StoreClass): void;
     isRegistered(store: StoreClass | string): boolean;
     getStoreName(store: StoreClass | string): string;

From 6b42020bf237e2422cd6b42a374ebc61ddbc533b Mon Sep 17 00:00:00 2001
From: Ragg <Ragg-@users.noreply.github.com>
Date: Thu, 1 Mar 2018 00:44:46 +0900
Subject: [PATCH 0132/1382] lint

---
 types/dispatchr/dispatchr-tests.ts | 2 +-
 types/dispatchr/index.d.ts         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/dispatchr/dispatchr-tests.ts b/types/dispatchr/dispatchr-tests.ts
index 797cb9fb0a..fcf0490f44 100644
--- a/types/dispatchr/dispatchr-tests.ts
+++ b/types/dispatchr/dispatchr-tests.ts
@@ -23,7 +23,7 @@ const TestStore = createStore({
     additionalMethod() {}
 });
 
-class ExtendedStore extends BaseStore<{}> {
+class ExtendedStore extends BaseStore {
     static handlers = {
         ACTION_NAME: 'actionHandler'
     };
diff --git a/types/dispatchr/index.d.ts b/types/dispatchr/index.d.ts
index 3b4dab9ec1..b5cf63009d 100644
--- a/types/dispatchr/index.d.ts
+++ b/types/dispatchr/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/yahoo/fluxible#readme
 // Definitions by: Ragg <https://github.com/Ragg->
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.5
 /// <reference types="node" />
 import { EventEmitter } from 'events';
 

From 627a65914771debabdb46012ed20928c746ea527 Mon Sep 17 00:00:00 2001
From: Curtis Hawthorne <fjord@google.com>
Date: Wed, 28 Feb 2018 09:47:32 -0800
Subject: [PATCH 0133/1382] TypeScript 2.2

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

diff --git a/types/tape/index.d.ts b/types/tape/index.d.ts
index 936f2ac491..cb087b415a 100644
--- a/types/tape/index.d.ts
+++ b/types/tape/index.d.ts
@@ -5,6 +5,7 @@
 //                 Dennis Schwartz <https://github.com/DennisSchwartz>
 //                 Michael Henretty <https://github.com/mikehenrty>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 /// <reference types="node" />
 

From 01fe9e8b52c28b711b757a88d801e1d59b010ab1 Mon Sep 17 00:00:00 2001
From: Curtis Hawthorne <fjord@google.com>
Date: Wed, 28 Feb 2018 10:21:10 -0800
Subject: [PATCH 0134/1382] fix deps

---
 types/cwise-parser/index.d.ts    | 1 +
 types/typedarray-pool/index.d.ts | 1 +
 2 files changed, 2 insertions(+)

diff --git a/types/cwise-parser/index.d.ts b/types/cwise-parser/index.d.ts
index d2a06fd7f1..f2f9dea473 100644
--- a/types/cwise-parser/index.d.ts
+++ b/types/cwise-parser/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/scijs/cwise-parser#readme
 // Definitions by: taoqf <https://github.com/taoqf>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 declare namespace cwise_parser {
 	interface CompiledArgument {
diff --git a/types/typedarray-pool/index.d.ts b/types/typedarray-pool/index.d.ts
index 34bcc7adf7..9b3ae99b1f 100644
--- a/types/typedarray-pool/index.d.ts
+++ b/types/typedarray-pool/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/mikolalysenko/typedarray-pool
 // Definitions by: Giff Song <https://github.com/pawsong>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 type DataType =
     'uint8' | 'uint16' | 'uint32' | 'int8' | 'int16' | 'int32' |

From 3fd24d5fa42dd1db9f45185809a4bd8db0c599b5 Mon Sep 17 00:00:00 2001
From: Chad Johnston <cjohnston@megatome.com>
Date: Wed, 28 Feb 2018 12:58:53 -0700
Subject: [PATCH 0135/1382] Clean up openlayers linting

Remove as many lint exclusions as possible, while cleaning up code to make linting pass.
---
 types/openlayers/index.d.ts          | 395 ++++-----------------------
 types/openlayers/openlayers-tests.ts | 279 +++++++++----------
 types/openlayers/tslint.json         |  69 +----
 3 files changed, 195 insertions(+), 548 deletions(-)

diff --git a/types/openlayers/index.d.ts b/types/openlayers/index.d.ts
index 8a711771fa..a01f6b25ad 100644
--- a/types/openlayers/index.d.ts
+++ b/types/openlayers/index.d.ts
@@ -18,14 +18,14 @@ declare type GlobalObject = Object;
  */
 declare module ol {
     /**
-      * Error object thrown when an assertion failed. This is an ECMA-262 Error,
-      * extended with a `code` property.
-      * @see {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error}
-      * @constructor
-      * @extends {Error}
-      * @implements {oli.AssertionError}
-      * @param {number} code Error code.
-      */
+     * Error object thrown when an assertion failed. This is an ECMA-262 Error,
+     * extended with a `code` property.
+     * @see {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error}
+     * @constructor
+     * @extends {Error}
+     * @implements {oli.AssertionError}
+     * @param {number} code Error code.
+     */
     class AssertionError extends Error {
         /**
          * Error object thrown when an assertion failed. This is an ECMA-262 Error,
@@ -47,7 +47,6 @@ declare module ol {
          * @api
          */
         code: number;
-
     }
 
     /**
@@ -101,7 +100,6 @@ declare module ol {
          * @api stable
          */
         getHTML(): string;
-
     }
 
     /**
@@ -237,24 +235,22 @@ declare module ol {
          * @api stable
          */
         setAt(index: number, elem: T): void;
-
     }
 
     module Collection {
-
         type EventType = string;
 
         /**
-          * @classdesc
-          * Events emitted by {@link ol.Collection} instances are instances of this
-          * type.
-          *
-          * @constructor
-          * @extends {ol.events.Event}
-          * @implements {oli.Collection.Event}
-          * @param {ol.Collection.EventType} type Type.
-          * @param {*=} opt_element Element.
-          */
+         * @classdesc
+         * Events emitted by {@link ol.Collection} instances are instances of this
+         * type.
+         *
+         * @constructor
+         * @extends {ol.events.Event}
+         * @implements {oli.Collection.Event}
+         * @param {ol.Collection.EventType} type Type.
+         * @param {*=} opt_element Element.
+         */
         class Event extends ol.events.Event {
             /**
              * @classdesc
@@ -275,7 +271,6 @@ declare module ol {
              * @api stable
              */
             element: any;
-
         }
     }
 
@@ -304,7 +299,6 @@ declare module ol {
          * @api
          */
         function asString(color: (ol.Color | string)): string;
-
     }
 
     /**
@@ -319,7 +313,6 @@ declare module ol {
          * @api
          */
         function asColorLike(color: (ol.Color | ol.ColorLike)): ol.ColorLike;
-
     }
 
     /**
@@ -391,7 +384,6 @@ declare module ol {
              * @api stable
              */
             getCollapsed(): boolean;
-
         }
 
         /**
@@ -481,7 +473,6 @@ declare module ol {
              * @api
              */
             setTarget(target: (Element | string)): void;
-
         }
 
         /**
@@ -520,7 +511,6 @@ declare module ol {
              * @api stable
              */
             constructor(opt_options?: olx.control.FullScreenOptions);
-
         }
 
         /**
@@ -610,7 +600,6 @@ declare module ol {
              * @api stable
              */
             setProjection(projection: ol.proj.Projection): void;
-
         }
 
         /**
@@ -676,7 +665,6 @@ declare module ol {
              * @api
              */
             getOverviewMap(): ol.Map;
-
         }
 
         /**
@@ -711,7 +699,6 @@ declare module ol {
              * @api
              */
             static render(mapEvent: ol.MapEvent): void;
-
         }
 
         /**
@@ -781,10 +768,10 @@ declare module ol {
             type Property = string;
 
             /**
-            * Units for the scale line. Supported values are `'degrees'`, `'imperial'`,
-            * `'nautical'`, `'metric'`, `'us'`.
-            * @enum {string}
-            */
+             * Units for the scale line. Supported values are `'degrees'`, `'imperial'`,
+             * `'nautical'`, `'metric'`, `'us'`.
+             * @enum {string}
+             */
             type Units = "degrees" | "imperial" | "nautical" | "metric" | "us";
         }
 
@@ -812,7 +799,6 @@ declare module ol {
              * @api stable
              */
             constructor(opt_options?: olx.control.ZoomOptions);
-
         }
 
         /**
@@ -851,7 +837,6 @@ declare module ol {
              * @api
              */
             static render(mapEvent: ol.MapEvent): void;
-
         }
 
         /**
@@ -876,9 +861,7 @@ declare module ol {
              * @api stable
              */
             constructor(opt_options?: olx.control.ZoomToExtentOptions);
-
         }
-
     }
 
     /**
@@ -1020,7 +1003,6 @@ declare module ol {
          * @api stable
          */
         function toStringXY(coordinate?: ol.Coordinate, opt_fractionDigits?: number): string;
-
     }
 
     /**
@@ -1188,7 +1170,6 @@ declare module ol {
          * @api
          */
         setTracking(tracking: boolean): void;
-
     }
 
     /**
@@ -1201,7 +1182,6 @@ declare module ol {
          * @constructor
          */
         constructor();
-
     }
 
     /**
@@ -1250,7 +1230,6 @@ declare module ol {
          * @api
          */
         function upAndDown(t: number): number;
-
     }
 
     /**
@@ -1409,7 +1388,6 @@ declare module ol {
              * @api
              */
             function primaryAction(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-
         }
 
         /**
@@ -1470,7 +1448,6 @@ declare module ol {
              * @api stable
              */
             stopPropagation(): void;
-
         }
 
         /**
@@ -1511,9 +1488,7 @@ declare module ol {
              * @extends {ol.Disposable}
              */
             constructor();
-
         }
-
     }
 
     /**
@@ -1700,7 +1675,6 @@ declare module ol {
          * @api stable
          */
         function applyTransform(extent: ol.Extent, transformFn: ol.TransformFunction, opt_extent?: ol.Extent): ol.Extent;
-
     }
 
     /**
@@ -1890,7 +1864,6 @@ declare module ol {
          * @api stable
          */
         setGeometryName(name: string): void;
-
     }
 
     /**
@@ -1919,14 +1892,12 @@ declare module ol {
          * @api
          */
         function xhr(url: (string | ol.FeatureUrlFunction), format: ol.format.Feature): ol.FeatureLoader;
-
     }
 
     /**
      * @namespace ol.format
      */
     module format {
-
         /**
          * @classdesc
          * Feature format for reading and writing data in the EsriJSON format.
@@ -2055,7 +2026,6 @@ declare module ol {
              * @api
              */
             writeFeaturesObject(features: ol.Feature[], opt_options?: olx.format.WriteOptions): GlobalObject;
-
         }
 
         type EsriJSONGeometry = JSON;
@@ -2086,7 +2056,6 @@ declare module ol {
              * @api stable
              */
             constructor();
-
         }
 
         type GeoJSONFeature = JSON;
@@ -2222,7 +2191,6 @@ declare module ol {
              * @api stable
              */
             writeGeometryObject(geometry: ol.geom.Geometry, opt_options?: olx.format.WriteOptions): (GeoJSONGeometry | GeoJSONGeometryCollection);
-
         }
 
         /**
@@ -2273,7 +2241,6 @@ declare module ol {
              * @api
              */
             writeFeaturesNode(features: ol.Feature[], opt_options?: olx.format.WriteOptions): Node;
-
         }
 
         /**
@@ -2298,7 +2265,6 @@ declare module ol {
              * @api
              */
             constructor(opt_options?: olx.format.GMLOptions);
-
         }
 
         /**
@@ -2358,7 +2324,6 @@ declare module ol {
              * @api
              */
             writeFeaturesNode(features: ol.Feature[], opt_options?: olx.format.WriteOptions): Node;
-
         }
 
         /**
@@ -2402,7 +2367,6 @@ declare module ol {
              * @api stable
              */
             readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
-
         }
 
         /**
@@ -2486,7 +2450,6 @@ declare module ol {
              * @api
              */
             writeFeaturesNode(features: ol.Feature[], opt_options?: olx.format.WriteOptions): Node;
-
         }
 
         /**
@@ -2548,7 +2511,6 @@ declare module ol {
              * @api
              */
             readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
-
         }
 
         /**
@@ -2571,7 +2533,6 @@ declare module ol {
              * @extends {ol.format.Feature}
              */
             constructor();
-
         }
 
         /**
@@ -2677,7 +2638,6 @@ declare module ol {
              * @api
              */
             writeFeaturesNode(features: ol.Feature[], opt_options?: olx.format.WriteOptions): Node;
-
         }
 
         /**
@@ -2719,7 +2679,6 @@ declare module ol {
              * @api
              */
             setLayers(layers: string[]): void;
-
         }
 
         module filter {
@@ -3497,7 +3456,6 @@ declare module ol {
              * @api stable
              */
             readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
-
         }
 
         /**
@@ -3633,7 +3591,6 @@ declare module ol {
              * @api stable
              */
             writeGeometry(geometry: ol.geom.Geometry, opt_options?: olx.format.WriteOptions): string;
-
         }
 
         /**
@@ -3656,7 +3613,6 @@ declare module ol {
              * @extends {ol.format.Feature}
              */
             constructor();
-
         }
 
         /**
@@ -3699,7 +3655,6 @@ declare module ol {
              * @api stable
              */
             readProjection(object: (Document | Node | GlobalObject | string)): ol.proj.Projection;
-
         }
 
         /**
@@ -3791,7 +3746,6 @@ declare module ol {
              * @api stable
              */
             readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
-
         }
 
         /**
@@ -3881,7 +3835,6 @@ declare module ol {
              * @api stable
              */
             writeGeometry(geometry: ol.geom.Geometry): string;
-
         }
 
         /**
@@ -3912,7 +3865,6 @@ declare module ol {
              * @api
              */
             read(source: (Document | Node | string)): GlobalObject;
-
         }
 
         /**
@@ -3948,7 +3900,6 @@ declare module ol {
              * @api stable
              */
             readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
-
         }
 
         /**
@@ -3979,7 +3930,6 @@ declare module ol {
              * @api
              */
             read(source: (Document | Node | string)): GlobalObject;
-
         }
 
         /**
@@ -3998,7 +3948,6 @@ declare module ol {
              * @struct
              */
             constructor();
-
         }
 
         /**
@@ -4021,9 +3970,7 @@ declare module ol {
              * @extends {ol.format.Feature}
              */
             constructor();
-
         }
-
     }
 
     /**
@@ -4197,7 +4144,6 @@ declare module ol {
          * @api stable
          */
         setTrackingOptions(options: PositionOptions): void;
-
     }
 
     /**
@@ -4285,7 +4231,6 @@ declare module ol {
              * @api
              */
             setRadius(radius: number): void;
-
         }
 
         /**
@@ -4489,7 +4434,6 @@ declare module ol {
              * @api
              */
             translate(deltaX: number, deltaY: number): void;
-
         }
 
         /**
@@ -4551,7 +4495,6 @@ declare module ol {
              * @api stable
              */
             setCoordinates(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout): void;
-
         }
 
         /**
@@ -4667,7 +4610,6 @@ declare module ol {
              * @api stable
              */
             setCoordinates(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout): void;
-
         }
 
         /**
@@ -4772,7 +4714,6 @@ declare module ol {
              * @api stable
              */
             setCoordinates(coordinates: ol.Coordinate[][], opt_layout?: ol.geom.GeometryLayout): void;
-
         }
 
         /**
@@ -4853,7 +4794,6 @@ declare module ol {
              * @api stable
              */
             setCoordinates(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout): void;
-
         }
 
         /**
@@ -4956,7 +4896,6 @@ declare module ol {
              * @api stable
              */
             setCoordinates(coordinates: ol.Coordinate[][][], opt_layout?: ol.geom.GeometryLayout): void;
-
         }
 
         /**
@@ -5015,7 +4954,6 @@ declare module ol {
              * @api stable
              */
             setCoordinates(coordinates: ol.Coordinate, opt_layout?: ol.geom.GeometryLayout): void;
-
         }
 
         /**
@@ -5163,7 +5101,6 @@ declare module ol {
              * @api
              */
             static fromCircle(circle: ol.geom.Circle, opt_sides?: number, opt_angle?: number): ol.geom.Polygon;
-
         }
 
         /**
@@ -5219,9 +5156,7 @@ declare module ol {
              * @api stable
              */
             translate(deltaX: number, deltaY: number): void;
-
         }
-
     }
 
     /**
@@ -5267,7 +5202,6 @@ declare module ol {
          * @api
          */
         setMap(map: ol.Map): void;
-
     }
 
     /**
@@ -5324,7 +5258,6 @@ declare module ol {
          * @api stable
          */
         const WEBGL: boolean;
-
     }
 
     /**
@@ -5367,7 +5300,6 @@ declare module ol {
          * @api
          */
         load(): void;
-
     }
 
     /**
@@ -5390,7 +5322,6 @@ declare module ol {
          * @param {Array.<ol.Attribution>} attributions Attributions.
          */
         constructor(extent: ol.Extent, resolution: (number), pixelRatio: number, state: ol.ImageState, attributions: ol.Attribution[]);
-
     }
 
     type ImageState = number;
@@ -5422,7 +5353,6 @@ declare module ol {
          * @api
          */
         getImage(opt_context?: GlobalObject): (HTMLCanvasElement | HTMLImageElement | HTMLVideoElement);
-
     }
 
     /**
@@ -5483,7 +5413,6 @@ declare module ol {
              * @api
              */
             static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-
         }
 
         /**
@@ -5518,7 +5447,6 @@ declare module ol {
              * @api
              */
             static handleEvent: any;
-
         }
 
         /**
@@ -5574,9 +5502,7 @@ declare module ol {
                  * @api
                  */
                 projection: ol.proj.Projection;
-
             }
-
         }
 
         type DragAndDropEventType = string;
@@ -5624,7 +5550,6 @@ declare module ol {
              * @api stable
              */
             getGeometry(): ol.geom.Polygon;
-
         }
 
         /**
@@ -5672,9 +5597,7 @@ declare module ol {
                  * @api
                  */
                 mapBrowserEvent: ol.MapBrowserEvent;
-
             }
-
         }
 
         type DragBoxEventType = string;
@@ -5699,7 +5622,6 @@ declare module ol {
              * @api stable
              */
             constructor(opt_options?: olx.interaction.DragPanOptions);
-
         }
 
         /**
@@ -5730,7 +5652,6 @@ declare module ol {
              * @api stable
              */
             constructor(opt_options?: olx.interaction.DragRotateOptions);
-
         }
 
         /**
@@ -5765,7 +5686,6 @@ declare module ol {
              * @api stable
              */
             constructor(opt_options?: olx.interaction.DragRotateAndZoomOptions);
-
         }
 
         /**
@@ -5798,7 +5718,6 @@ declare module ol {
              * @api stable
              */
             constructor(opt_options?: olx.interaction.DragZoomOptions);
-
         }
 
         /**
@@ -5836,9 +5755,7 @@ declare module ol {
                  * @api stable
                  */
                 feature: ol.Feature;
-
             }
-
         }
 
         type DrawEventType = string;
@@ -5912,7 +5829,6 @@ declare module ol {
              * @api
              */
             static createRegularPolygon(opt_sides?: number, opt_angle?: number): ol.DrawGeometryFunctionType;
-
         }
 
         /**
@@ -5999,7 +5915,6 @@ declare module ol {
              * @api
              */
             setActive(active: boolean): void;
-
         }
 
         /**
@@ -6049,7 +5964,6 @@ declare module ol {
              * @api
              */
             static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-
         }
 
         /**
@@ -6099,7 +6013,6 @@ declare module ol {
              * @api
              */
             static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-
         }
 
         /**
@@ -6148,9 +6061,7 @@ declare module ol {
                  * @api
                  */
                 mapBrowserEvent: ol.MapBrowserEvent;
-
             }
-
         }
 
         /**
@@ -6182,7 +6093,6 @@ declare module ol {
              * @api
              */
             removePoint(): boolean;
-
         }
 
         /**
@@ -6223,7 +6133,6 @@ declare module ol {
              * @api
              */
             setMouseAnchor(useAnchor: boolean): void;
-
         }
 
         /**
@@ -6248,7 +6157,6 @@ declare module ol {
              * @api stable
              */
             constructor(opt_options?: olx.interaction.PinchRotateOptions);
-
         }
 
         /**
@@ -6273,7 +6181,6 @@ declare module ol {
              * @api stable
              */
             constructor(opt_options?: olx.interaction.PinchZoomOptions);
-
         }
 
         /**
@@ -6319,7 +6226,6 @@ declare module ol {
              * @api
              */
             static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-
         }
 
         /**
@@ -6377,9 +6283,7 @@ declare module ol {
                  * @api
                  */
                 mapBrowserEvent: ol.MapBrowserEvent;
-
             }
-
         }
 
         /**
@@ -6456,7 +6360,6 @@ declare module ol {
              * @api stable
              */
             setMap(map: ol.Map): void;
-
         }
 
         /**
@@ -6523,7 +6426,6 @@ declare module ol {
              * @api
              */
             removeFeature(feature: ol.Feature, opt_unlisten?: boolean): void;
-
         }
 
         /**
@@ -6571,9 +6473,7 @@ declare module ol {
                  * @api
                  */
                 coordinate: ol.Coordinate;
-
             }
-
         }
 
         type TranslateEventType = string;
@@ -6600,9 +6500,7 @@ declare module ol {
              * @api
              */
             constructor(options: olx.interaction.TranslateOptions);
-
         }
-
     }
 
     /**
@@ -6631,7 +6529,6 @@ declare module ol {
          * @api
          */
         constructor(decay: number, minVelocity: number, delay: number);
-
     }
 
     /**
@@ -6766,7 +6663,6 @@ declare module ol {
              * @api
              */
             setZIndex(zindex: number): void;
-
         }
 
         /**
@@ -6813,7 +6709,6 @@ declare module ol {
              * @api stable
              */
             setLayers(layers: ol.Collection<ol.layer.Base>): void;
-
         }
 
         /**
@@ -6892,7 +6787,6 @@ declare module ol {
              * @observable
              */
             setRadius(radius: number): void;
-
         }
 
         /**
@@ -6925,7 +6819,6 @@ declare module ol {
              * @api stable
              */
             constructor(opt_options?: olx.layer.ImageOptions);
-
         }
 
         /**
@@ -7002,7 +6895,6 @@ declare module ol {
              * @api stable
              */
             setSource(source: ol.source.Source): void;
-
         }
 
         /**
@@ -7067,7 +6959,6 @@ declare module ol {
              * @api
              */
             setUseInterimTilesOnError(useInterimTilesOnError: boolean): void;
-
         }
 
         /**
@@ -7134,7 +7025,6 @@ declare module ol {
              * @api stable
              */
             setStyle(style: (ol.style.Style | ol.style.Style[] | ol.StyleFunction)): void;
-
         }
 
         /**
@@ -7210,9 +7100,7 @@ declare module ol {
              * @api
              */
             setUseInterimTilesOnError(useInterimTilesOnError: boolean): void;
-
         }
-
     }
 
     /**
@@ -7246,7 +7134,6 @@ declare module ol {
          * @api
          */
         function tile(tileGrid: ol.tilegrid.TileGrid): ((extent: ol.Extent, i: number) => ol.Extent[]);
-
     }
 
     /**
@@ -7440,7 +7327,11 @@ declare module ol {
          * @template S,T,U
          * @api stable
          */
-        forEachLayerAtPixel<S, T, U>(pixel: ol.Pixel, callback: ((layer: ol.layer.Layer, color: ol.Color) => T), opt_this?: S, opt_layerFilter?: ((layer: ol.layer.Layer) => boolean), opt_this2?: U): (T);
+        forEachLayerAtPixel<S, T, U>(pixel: ol.Pixel,
+                                     callback: ((layer: ol.layer.Layer, color: ol.Color) => T),
+                                     opt_this?: S,
+                                     opt_layerFilter?: ((layer: ol.layer.Layer) => boolean),
+                                     opt_this2?: U): (T);
 
         /**
          * Detect if features intersect a pixel on the viewport. Layers included in the
@@ -7672,7 +7563,6 @@ declare module ol {
          * @api stable
          */
         updateSize(): void;
-
     }
 
     /**
@@ -7736,7 +7626,6 @@ declare module ol {
          * @api stable
          */
         dragging: boolean;
-
     }
 
     /**
@@ -7749,7 +7638,6 @@ declare module ol {
      * @param {?olx.FrameState=} opt_frameState Frame state.
      */
     class MapBrowserPointerEvent extends ol.MapBrowserEvent {
-
         // /**
         //  * @constructor
         //  * @extends {ol.MapBrowserEvent}
@@ -7808,7 +7696,6 @@ declare module ol {
          * @api
          */
         frameState: olx.FrameState;
-
     }
 
     /**
@@ -7850,7 +7737,6 @@ declare module ol {
          * @api stable
          */
         oldValue: any;
-
     }
 
     /**
@@ -7993,7 +7879,6 @@ declare module ol {
          * @api stable
          */
         unset(key: string, opt_silent?: boolean): void;
-
     }
 
     /**
@@ -8241,11 +8126,9 @@ declare module ol {
          * @api stable
          */
         setPositioning(positioning: ol.OverlayPositioning): void;
-
     }
 
     module pointer {
-
         /**
          * @classdesc
          * A class for pointer events.
@@ -8319,7 +8202,6 @@ declare module ol {
      * @namespace ol.proj
      */
     module proj {
-
         /**
          * Projection units: `'degrees'`, `'ft'`, `'m'`, `'pixels'`, `'tile-pixels'` or
          * `'us-ft'`.
@@ -8487,7 +8369,6 @@ declare module ol {
              * @api
              */
             getPointResolution(resolution: number, point: ol.Coordinate): number;
-
         }
 
         /**
@@ -8541,7 +8422,10 @@ declare module ol {
          *     the transformed {@link ol.Coordinate}.
          * @api stable
          */
-        function addCoordinateTransforms(source: ol.ProjectionLike, destination: ol.ProjectionLike, forward: ((coords: ol.Coordinate) => ol.Coordinate), inverse: ((coords: ol.Coordinate) => ol.Coordinate)): void;
+        function addCoordinateTransforms(source: ol.ProjectionLike,
+                                         destination: ol.ProjectionLike,
+                                         forward: ((coords: ol.Coordinate) => ol.Coordinate),
+                                         inverse: ((coords: ol.Coordinate) => ol.Coordinate)): void;
 
         /**
          * Transforms a coordinate from longitude/latitude to a different projection.
@@ -8730,9 +8614,7 @@ declare module ol {
                  * @api
                  */
                 drawFeature(feature: ol.Feature, style: ol.style.Style): void;
-
             }
-
         }
 
         /**
@@ -8787,7 +8669,6 @@ declare module ol {
              * @api
              */
             glContext: any;
-
         }
 
         type EventType = string;
@@ -8854,7 +8735,6 @@ declare module ol {
              * @api
              */
             getType(): ol.geom.GeometryType;
-
         }
 
         /**
@@ -8873,7 +8753,6 @@ declare module ol {
              * @api
              */
             constructor();
-
         }
 
         /**
@@ -8897,7 +8776,6 @@ declare module ol {
          * @api
          */
         function toContext(context: CanvasRenderingContext2D, opt_options?: olx.render.ToContextOptions): ol.render.canvas.Immediate;
-
     }
 
     /**
@@ -8945,7 +8823,6 @@ declare module ol {
              * @api
              */
             static TOS_ATTRIBUTION: ol.Attribution;
-
         }
 
         /**
@@ -8992,7 +8869,6 @@ declare module ol {
              * @api
              */
             setConfig(config: GlobalObject): void;
-
         }
 
         /**
@@ -9040,7 +8916,6 @@ declare module ol {
              * @api
              */
             setDistance(distance: number): void;
-
         }
 
         /**
@@ -9067,7 +8942,6 @@ declare module ol {
              * @api
              */
             constructor(options: ol.SourceImageOptions);
-
         }
 
         /**
@@ -9101,7 +8975,6 @@ declare module ol {
              * @api
              */
             image: ol.Image;
-
         }
 
         /**
@@ -9179,7 +9052,6 @@ declare module ol {
              * @api stable
              */
             updateParams(params: GlobalObject): void;
-
         }
 
         /**
@@ -9202,7 +9074,6 @@ declare module ol {
              * @api
              */
             constructor(options: olx.source.ImageCanvasOptions);
-
         }
 
         /**
@@ -9256,7 +9127,6 @@ declare module ol {
              * @api
              */
             setImageLoadFunction(imageLoadFunction: ol.ImageLoadFunctionType): void;
-
         }
 
         /**
@@ -9279,7 +9149,6 @@ declare module ol {
              * @api stable
              */
             constructor(options: olx.source.ImageStaticOptions);
-
         }
 
         /**
@@ -9354,7 +9223,6 @@ declare module ol {
              * @api stable
              */
             setStyle(style: (ol.style.Style | ol.style.Style[] | ol.StyleFunction)): void;
-
         }
 
         /**
@@ -9438,7 +9306,6 @@ declare module ol {
              * @api stable
              */
             updateParams(params: GlobalObject): void;
-
         }
 
         /**
@@ -9470,7 +9337,6 @@ declare module ol {
              * @api
              */
             static ATTRIBUTION: ol.Attribution;
-
         }
 
         /**
@@ -9508,7 +9374,6 @@ declare module ol {
              * @api
              */
             setOperation(operation: ol.RasterOperation, opt_lib?: GlobalObject): void;
-
         }
 
         /**
@@ -9559,7 +9424,6 @@ declare module ol {
              * @api
              */
             data: GlobalObject;
-
         }
 
         /**
@@ -9639,7 +9503,6 @@ declare module ol {
              * @api
              */
             setAttributions(attributions: (ol.AttributionLike)): void;
-
         }
 
         /**
@@ -9662,7 +9525,6 @@ declare module ol {
              * @api stable
              */
             constructor(options: olx.source.StamenOptions);
-
         }
 
         /**
@@ -9696,7 +9558,6 @@ declare module ol {
              * @api stable
              */
             getTileGrid(): ol.tilegrid.TileGrid;
-
         }
 
         /**
@@ -9730,7 +9591,6 @@ declare module ol {
              * @api
              */
             tile: ol.Tile;
-
         }
 
         /**
@@ -9778,7 +9638,6 @@ declare module ol {
              * @api stable
              */
             updateParams(params: GlobalObject): void;
-
         }
 
         /**
@@ -9809,7 +9668,6 @@ declare module ol {
              * @api
              */
             constructor(options: olx.source.TileDebugOptions);
-
         }
 
         /**
@@ -9855,7 +9713,6 @@ declare module ol {
              * @api
              */
             setTileGridForProjection(projection: ol.ProjectionLike, tilegrid: ol.tilegrid.TileGrid): void;
-
         }
 
         /**
@@ -9884,7 +9741,6 @@ declare module ol {
              * @api
              */
             getTileJSON(): TileJSON;
-
         }
 
         /**
@@ -9929,7 +9785,6 @@ declare module ol {
              * @api
              */
             forDataAtCoordinateAndResolution<T>(coordinate: ol.Coordinate, resolution: number, callback: ((d: any) => any), opt_this?: T, opt_request?: boolean): void;
-
         }
 
         /**
@@ -9983,7 +9838,6 @@ declare module ol {
              * @api stable
              */
             updateParams(params: GlobalObject): void;
-
         }
 
         /**
@@ -10058,7 +9912,6 @@ declare module ol {
              * @api stable
              */
             setUrls(urls: string[]): void;
-
         }
 
         /**
@@ -10263,7 +10116,6 @@ declare module ol {
              * @api stable
              */
             removeFeature(feature: ol.Feature): void;
-
         }
 
         /**
@@ -10297,7 +10149,6 @@ declare module ol {
              * @api stable
              */
             feature: ol.Feature;
-
         }
 
         /**
@@ -10334,7 +10185,6 @@ declare module ol {
              * @api
              */
             constructor(options: olx.source.VectorTileOptions);
-
         }
 
         /**
@@ -10348,7 +10198,6 @@ declare module ol {
              * @enum {string}
              */
             type ServerType = "carmentaserver" | "geoserver" | "mapserver" | "qgis";
-
         }
 
         /**
@@ -10460,7 +10309,6 @@ declare module ol {
              * @api
              */
             static optionsFromCapabilities(wmtsCap: GlobalObject, config: GlobalObject): olx.source.WMTSOptions;
-
         }
 
         /**
@@ -10509,7 +10357,6 @@ declare module ol {
              * @api stable
              */
             constructor(opt_options?: olx.source.XYZOptions);
-
         }
 
         /**
@@ -10532,9 +10379,7 @@ declare module ol {
              * @api stable
              */
             constructor(opt_options?: olx.source.ZoomifyOptions);
-
         }
-
     }
 
     /**
@@ -10542,14 +10387,12 @@ declare module ol {
      * {@link ol.Sphere.getArea} functions.
      */
     interface SphereMetricOptions {
-
         /**
          * Projection of the geometry.  By default, the geometry is assumed to be in
          * EPSG:3857 (Web Mercator).
          */
         projection?: ol.proj.Projection;
 
-
         /**
          * Sphere radius.  By default, the radius of the earth is used (Clarke 1866
          * Authalic Sphere).
@@ -10557,7 +10400,6 @@ declare module ol {
          * @api
          */
         radius?: number;
-
     }
 
     /**
@@ -10724,7 +10566,7 @@ declare module ol {
      *      styles[ol.geom.GeometryType.POLYGON].concat(
      *          styles[ol.geom.GeometryType.POINT]
      *      );
-     *```
+     * ```
      *
      * @namespace ol.style
      */
@@ -10765,7 +10607,6 @@ declare module ol {
              * @param {olx.style.AtlasManagerOptions=} opt_options Options.
              */
             constructor(opt_options?: olx.style.AtlasManagerOptions);
-
         }
 
         /**
@@ -10825,7 +10666,6 @@ declare module ol {
              * @api
              */
             setRadius(radius: number): void;
-
         }
 
         /**
@@ -10861,7 +10701,6 @@ declare module ol {
              * @api
              */
             setColor(color: (ol.Color | ol.ColorLike)): void;
-
         }
 
         /**
@@ -10938,7 +10777,6 @@ declare module ol {
              * @api
              */
             load(): void;
-
         }
 
         /**
@@ -11022,7 +10860,6 @@ declare module ol {
              * @api
              */
             setScale(scale: number): void;
-
         }
 
         /**
@@ -11115,7 +10952,6 @@ declare module ol {
              * @api
              */
             getStroke(): ol.style.Stroke;
-
         }
 
         /**
@@ -11238,7 +11074,6 @@ declare module ol {
              * @api
              */
             setWidth(width: (number)): void;
-
         }
 
         /**
@@ -11370,7 +11205,6 @@ declare module ol {
              * @api
              */
             setZIndex(zIndex: (number)): void;
-
         }
 
         /**
@@ -11548,9 +11382,7 @@ declare module ol {
              * @api
              */
             setTextBaseline(textBaseline: (string)): void;
-
         }
-
     }
 
     /**
@@ -11589,7 +11421,6 @@ declare module ol {
          * @api
          */
         load(): void;
-
     }
 
     module Tile {
@@ -11730,7 +11561,6 @@ declare module ol {
              * @api
              */
             getZForResolution(resolution: number, opt_direction?: number): number;
-
         }
 
         /**
@@ -11773,9 +11603,7 @@ declare module ol {
              * @api
              */
             static createFromCapabilitiesMatrixSet(matrixSet: GlobalObject, opt_extent?: ol.Extent): ol.tilegrid.WMTS;
-
         }
-
     }
 
     /**
@@ -12225,7 +12053,6 @@ declare module ol {
          * @api
          */
         setLoader(loader: ol.FeatureLoader): void;
-
     }
 
     /**
@@ -12586,16 +12413,13 @@ declare module ol {
          * @api stable
          */
         setZoom(zoom: number): void;
-
     }
-
 }
 
 /**
  * @namespace olx
  */
 declare module olx {
-
     /**
      * @namespace olx.animation
      */
@@ -12613,7 +12437,6 @@ declare module olx {
             easing?: ((t: number) => number);
         }
 
-
         /**
          * @typedef {{source: ol.Coordinate,
          *     start: (number|undefined),
@@ -12627,7 +12450,6 @@ declare module olx {
             easing?: ((t: number) => number);
         }
 
-
         /**
          * @typedef {{rotation: (number|undefined),
          *     anchor: (ol.Coordinate|undefined),
@@ -12643,7 +12465,6 @@ declare module olx {
             easing?: ((t: number) => number);
         }
 
-
         /**
          * @typedef {{resolution: number,
          *     start: (number|undefined),
@@ -12665,13 +12486,13 @@ declare module olx {
          * whether the animation completed without being cancelled.
          */
         interface AnimateOptions {
-            center?: ol.Coordinate | undefined;
-            zoom?: number | undefined;
-            resolution?: number | undefined;
-            rotation?: number | undefined;
-            anchor?: ol.Coordinate | undefined;
-            duration?: number | undefined;
-            easing?: ((t: number) => number) | undefined;
+            center?: ol.Coordinate;
+            zoom?: number;
+            resolution?: number;
+            rotation?: number;
+            anchor?: ol.Coordinate;
+            duration?: number;
+            easing?: ((t: number) => number);
         }
 
         type AnimateCallback = (completed: boolean) => void;
@@ -12702,7 +12523,6 @@ declare module olx {
             render?: ((event: ol.MapEvent) => any);
         }
 
-
         /**
          * @typedef {{element: (Element|undefined),
          *     render: (function(ol.MapEvent)|undefined),
@@ -12714,7 +12534,6 @@ declare module olx {
             target?: (Element | string);
         }
 
-
         /**
          * @typedef {{attribution: (boolean|undefined),
          *     attributionOptions: (olx.control.AttributionOptions|undefined),
@@ -12732,7 +12551,6 @@ declare module olx {
             zoomOptions?: olx.control.ZoomOptions;
         }
 
-
         /**
          * @typedef {{className: (string|undefined),
          *     label: (string|Node|undefined),
@@ -12752,7 +12570,6 @@ declare module olx {
             source?: (Element | string);
         }
 
-
         /**
          * @typedef {{className: (string|undefined),
          *     coordinateFormat: (ol.CoordinateFormatType|undefined),
@@ -12770,7 +12587,6 @@ declare module olx {
             undefinedHTML?: string;
         }
 
-
         /**
          * @typedef {{collapsed: (boolean|undefined),
          *     collapseLabel: (string|Node|undefined),
@@ -12794,7 +12610,6 @@ declare module olx {
             view?: ol.View;
         }
 
-
         /**
          * @typedef {{className: (string|undefined),
          *     minWidth: (number|undefined),
@@ -12810,7 +12625,6 @@ declare module olx {
             units?: (ol.control.ScaleLine.Units | string);
         }
 
-
         /**
          * @typedef {{duration: (number|undefined),
          *     className: (string|undefined),
@@ -12832,7 +12646,6 @@ declare module olx {
             target?: Element;
         }
 
-
         /**
          * @typedef {{duration: (number|undefined),
          *     className: (string|undefined),
@@ -12854,7 +12667,6 @@ declare module olx {
             target?: Element;
         }
 
-
         /**
          * @typedef {{className: (string|undefined),
          *     duration: (number|undefined),
@@ -12870,7 +12682,6 @@ declare module olx {
             render?: ((event: ol.MapEvent) => any);
         }
 
-
         /**
          * @typedef {{className: (string|undefined),
          *     target: (Element|undefined),
@@ -12885,8 +12696,6 @@ declare module olx {
             tipLabel?: string;
             extent?: ol.Extent;
         }
-
-
     }
 
     /**
@@ -12903,7 +12712,6 @@ declare module olx {
             featureProjection: ol.ProjectionLike;
         }
 
-
         /**
          * @typedef {{dataProjection: ol.ProjectionLike,
          *     featureProjection: ol.ProjectionLike,
@@ -12917,7 +12725,6 @@ declare module olx {
             decimals?: number;
         }
 
-
         /**
          * @typedef {{defaultDataProjection: ol.ProjectionLike,
          *     geometryName: (string|undefined)}}
@@ -12928,7 +12735,6 @@ declare module olx {
             geometryName?: string;
         }
 
-
         /**
          * @typedef {{geometryName: (string|undefined)}}
          */
@@ -12946,13 +12752,14 @@ declare module olx {
          *     layerName: (string|undefined)}}
          */
         interface MVTOptions {
-            featureClass?: (((geom: (ol.geom.Geometry | { [k: string]: any })) => any) | ((geom: ol.geom.GeometryType, arg2: number[], arg3: (number[] | number[][]), arg4: { [k: string]: any }) => any));
+            featureClass?: (((geom: (ol.geom.Geometry | { [k: string]: any })) => any) | ((geom: ol.geom.GeometryType, arg2: number[],
+                           arg3: (number[] | number[][]),
+                           arg4: { [k: string]: any }) => any));
             geometryName?: string;
             layerName?: string;
             layers?: string[];
         }
 
-
         /**
          * @typedef {{factor: (number|undefined),
          *     geometryLayout: (ol.geom.GeometryLayout|undefined)}}
@@ -12962,7 +12769,6 @@ declare module olx {
             geometryLayout?: ol.geom.GeometryLayout;
         }
 
-
         /**
          * @typedef {{defaultDataProjection: ol.ProjectionLike}}
          */
@@ -12970,15 +12776,14 @@ declare module olx {
             defaultDataProjection: ol.ProjectionLike;
         }
 
-
         /**
          * @typedef {{altitudeMode: (ol.format.IGCZ|undefined)}}
          */
+        /* tslint:disable-next-line:interface-name */
         interface IGCOptions {
             altitudeMode?: ol.format.IGCZ;
         }
 
-
         /**
          * @typedef {{extractStyles: (boolean|undefined),
          *     defaultStyle: (Array.<ol.style.Style>|undefined),
@@ -12992,7 +12797,6 @@ declare module olx {
             writeStyles?: boolean;
         }
 
-
         /**
          * @typedef {{featureNS: (Object.<string, string>|string|undefined),
          *     featureType: (Array.<string>|string|undefined),
@@ -13014,7 +12818,6 @@ declare module olx {
             schemaLocation?: string;
         }
 
-
         /**
          * @typedef {{readExtensions: (function(ol.Feature, Node)|undefined)}}
          */
@@ -13022,7 +12825,6 @@ declare module olx {
             readExtensions?: ((feature: ol.Feature, node: Node) => any);
         }
 
-
         /**
          * @typedef {{featureNS: (Object.<string, string>|string|undefined),
          *     featureType: (Array.<string>|string|undefined),
@@ -13036,7 +12838,6 @@ declare module olx {
             schemaLocation?: string;
         }
 
-
         /**
          * @typedef {{featureNS: string,
          *     featurePrefix: string,
@@ -13070,7 +12871,6 @@ declare module olx {
             resultType?: string;
         }
 
-
         /**
          * @typedef {{featureNS: string,
          *     featurePrefix: string,
@@ -13090,7 +12890,6 @@ declare module olx {
             gmlOptions?: olx.format.GMLOptions;
         }
 
-
         /**
          * @typedef {{splitCollection: (boolean|undefined)}}
          */
@@ -13098,7 +12897,6 @@ declare module olx {
             splitCollection?: boolean;
         }
 
-
         /**
          * @typedef {{
          *     layers: (Array.<string>|undefined)
@@ -13107,8 +12905,6 @@ declare module olx {
         interface WMSGetFeatureInfoOptions {
             layers?: string[];
         }
-
-
     }
 
     /**
@@ -13123,7 +12919,6 @@ declare module olx {
             handleEvent: (event: ol.MapBrowserEvent) => boolean;
         }
 
-
         /**
          * Interactions for the map. Default is `true` for all options.
          * @typedef {{altShiftDragRotate: (boolean|undefined),
@@ -13151,7 +12946,6 @@ declare module olx {
             zoomDuration?: number;
         }
 
-
         /**
          * @typedef {{duration: (number|undefined),
          *     delta: (number|undefined)}}
@@ -13161,7 +12955,6 @@ declare module olx {
             delta?: number;
         }
 
-
         /**
          * @typedef {{formatConstructors: (Array.<function(new: ol.format.Feature)>|undefined),
          *     projection: ol.ProjectionLike,
@@ -13169,13 +12962,12 @@ declare module olx {
          *     source: (ol.source.Vector|undefined)}}
          */
         interface DragAndDropOptions {
-            formatConstructors?: ((n: ol.format.Feature) => any)[];
+            formatConstructors?: Array<((n: ol.format.Feature) => any)>;
             projection: ol.ProjectionLike;
             target?: Element;
             source?: ol.source.Vector;
         }
 
-
         /**
          * @typedef {{className: (string|undefined),
          *     condition: (ol.EventsConditionType|undefined),
@@ -13189,7 +12981,6 @@ declare module olx {
             boxEndCondition?: ol.DragBoxEndConditionType;
         }
 
-
         /**
          * @typedef {{condition: (ol.EventsConditionType|undefined),
          *     kinetic: (ol.Kinetic|undefined)}}
@@ -13199,7 +12990,6 @@ declare module olx {
             kinetic?: ol.Kinetic;
         }
 
-
         /**
          * @typedef {{condition: (ol.EventsConditionType|undefined),
          *     duration: (number|undefined)}}
@@ -13209,7 +12999,6 @@ declare module olx {
             duration?: number;
         }
 
-
         /**
          * @typedef {{condition: (ol.EventsConditionType|undefined),
          *     duration: (number|undefined)}}
@@ -13219,7 +13008,6 @@ declare module olx {
             duration?: number;
         }
 
-
         /**
          * @typedef {{className: (string|undefined),
          *     condition: (ol.EventsConditionType|undefined),
@@ -13233,7 +13021,6 @@ declare module olx {
             out?: boolean;
         }
 
-
         /**
          * @typedef {{clickTolerance: (number|undefined),
          *     features: (ol.Collection.<ol.Feature>|undefined),
@@ -13269,7 +13056,6 @@ declare module olx {
             wrapX?: boolean;
         }
 
-
         /**
          * @typedef {{
          *     features: (ol.Collection.<ol.Feature>|undefined),
@@ -13281,7 +13067,6 @@ declare module olx {
             layers?: (ol.layer.Layer[] | ((layer: ol.layer.Layer) => boolean));
         }
 
-
         /**
          * @typedef {{condition: (ol.EventsConditionType|undefined),
          *     duration: (number|undefined),
@@ -13293,7 +13078,6 @@ declare module olx {
             pixelDelta?: number;
         }
 
-
         /**
          * @typedef {{duration: (number|undefined),
          *     condition: (ol.EventsConditionType|undefined),
@@ -13305,7 +13089,6 @@ declare module olx {
             delta?: number;
         }
 
-
         /**
          * @typedef {{condition: (ol.EventsConditionType|undefined),
          *     deleteCondition: (ol.EventsConditionType|undefined),
@@ -13327,7 +13110,6 @@ declare module olx {
             source?: ol.source.Vector;
         }
 
-
         /**
          * @typedef {{constrainResolution: (boolean|undefined),
          *     duration: (number|undefined),
@@ -13341,7 +13123,6 @@ declare module olx {
             useAnchor?: boolean;
         }
 
-
         /**
          * @typedef {{threshold: (number|undefined),
          *     duration: (number|undefined)}}
@@ -13351,7 +13132,6 @@ declare module olx {
             threshold?: number;
         }
 
-
         /**
          * @typedef {{constrainResolution: (boolean|undefined)
          *     duration: (number|undefined)}}
@@ -13361,7 +13141,6 @@ declare module olx {
             duration?: number;
         }
 
-
         /**
          * @typedef {{handleDownEvent: (function(ol.MapBrowserPointerEvent):boolean|undefined),
          *     handleDragEvent: (function(ol.MapBrowserPointerEvent)|undefined),
@@ -13377,7 +13156,6 @@ declare module olx {
             handleUpEvent?: ((event: ol.MapBrowserPointerEvent) => boolean);
         }
 
-
         /**
          * @typedef {{addCondition: (ol.EventsConditionType|undefined),
          *     condition: (ol.EventsConditionType|undefined),
@@ -13405,7 +13183,6 @@ declare module olx {
             hitTolerance?: number;
         }
 
-
         /**
          * Options for snap
          * @typedef {{
@@ -13423,8 +13200,6 @@ declare module olx {
             pixelTolerance?: number;
             source?: ol.source.Vector;
         }
-
-
     }
 
     /**
@@ -13448,7 +13223,6 @@ declare module olx {
             maxResolution?: number;
         }
 
-
         /**
          * @typedef {{opacity: (number|undefined),
          *     source: (ol.source.Source|undefined),
@@ -13468,7 +13242,6 @@ declare module olx {
             maxResolution?: number;
         }
 
-
         /**
          * @typedef {{opacity: (number|undefined),
          *     visible: (boolean|undefined),
@@ -13488,7 +13261,6 @@ declare module olx {
             layers?: (ol.layer.Base[] | ol.Collection<ol.layer.Base>);
         }
 
-
         /**
          * @typedef {{gradient: (Array.<string>|undefined),
          *     radius: (number|undefined),
@@ -13518,7 +13290,6 @@ declare module olx {
             zIndex?: number;
         }
 
-
         /**
          * @typedef {{opacity: (number|undefined),
          *     map: (ol.Map|undefined),
@@ -13540,7 +13311,6 @@ declare module olx {
             zIndex?: number;
         }
 
-
         /**
          * @typedef {{opacity: (number|undefined),
          *     preload: (number|undefined),
@@ -13566,7 +13336,6 @@ declare module olx {
             zIndex?: number;
         }
 
-
         /**
          * @enum {string}
          * Render mode for vector layers:
@@ -13581,7 +13350,6 @@ declare module olx {
          */
         type VectorRenderType = "image" | "vector";
 
-
         /**
          * @typedef {{renderOrder: (function(ol.Feature, ol.Feature):number|null|undefined),
          *     minResolution: (number|undefined),
@@ -13614,7 +13382,6 @@ declare module olx {
             zIndex?: number;
         }
 
-
         /**
          * @typedef {{extent: (ol.Extent|undefined),
          *     map: (ol.Map|undefined),
@@ -13647,8 +13414,6 @@ declare module olx {
             visible?: boolean;
             zIndex?: number;
         }
-
-
     }
 
     /**
@@ -13669,8 +13434,6 @@ declare module olx {
             size?: ol.Size;
             pixelRatio?: number;
         }
-
-
     }
 
     /**
@@ -13698,7 +13461,6 @@ declare module olx {
             wrapX?: boolean;
         }
 
-
         /**
          * @typedef {{attributions: (ol.AttributionLike|undefined),
          *     distance: (number|undefined),
@@ -13737,7 +13499,6 @@ declare module olx {
             url?: string;
         }
 
-
         /**
          * @typedef {{attributions: (ol.AttributionLike|undefined),
          *            cacheSize: (number|undefined),
@@ -13777,7 +13538,6 @@ declare module olx {
             wrapX?: boolean;
         }
 
-
         /**
          * @typedef {{attributions: (ol.AttributionLike|undefined),
          *            cacheSize: (number|undefined),
@@ -13813,7 +13573,6 @@ declare module olx {
             wrapX?: boolean;
         }
 
-
         /**
          * @typedef {{url: (string|undefined),
          *     displayDpi: (number|undefined),
@@ -13839,7 +13598,6 @@ declare module olx {
             params?: GlobalObject;
         }
 
-
         /**
          * @typedef {{cacheSize: (number|undefined),
          *     layer: string,
@@ -13855,7 +13613,6 @@ declare module olx {
             url?: string;
         }
 
-
         /**
          * @typedef {{projection: ol.ProjectionLike,
          *     tileGrid: (ol.tilegrid.TileGrid|undefined),
@@ -13867,7 +13624,6 @@ declare module olx {
             wrapX?: boolean;
         }
 
-
         /**
          * @typedef {{attributions: (ol.AttributionLike|undefined),
          *     cacheSize: (number|undefined),
@@ -13891,7 +13647,6 @@ declare module olx {
             wrapX?: boolean;
         }
 
-
         /**
          * @typedef {{attributions: (Array.<ol.Attribution>|undefined),
          *     crossOrigin: (null|string|undefined),
@@ -13915,7 +13670,6 @@ declare module olx {
             url?: string;
         }
 
-
         /**
          * @typedef {{attributions: (ol.AttributionLike|undefined),
          *     canvasFunction: ol.CanvasFunctionType,
@@ -13935,7 +13689,6 @@ declare module olx {
             state?: ol.source.State;
         }
 
-
         /**
          * @typedef {{attributions: (ol.AttributionLike|undefined),
          *     logo: (string|olx.LogoOptions|undefined),
@@ -13957,7 +13710,6 @@ declare module olx {
             style?: (ol.style.Style | ol.style.Style[] | ol.StyleFunction);
         }
 
-
         /**
          * @typedef {{sources: Array.<ol.source.Source>,
          *     operation: (ol.RasterOperation|undefined),
@@ -13974,7 +13726,6 @@ declare module olx {
             operationType?: ol.RasterOperationType;
         }
 
-
         /**
          * @typedef {{attributions: (ol.AttributionLike|undefined),
          *     crossOrigin: (null|string|undefined),
@@ -14002,7 +13753,6 @@ declare module olx {
             url?: string;
         }
 
-
         /**
          * @typedef {{cacheSize: (number|undefined),
          *     layer: string,
@@ -14024,7 +13774,6 @@ declare module olx {
             url?: string;
         }
 
-
         /**
          * @typedef {{attributions: (ol.AttributionLike|undefined),
          *     crossOrigin: (null|string|undefined),
@@ -14046,7 +13795,6 @@ declare module olx {
             url: string;
         }
 
-
         /**
          * @typedef {{attributions: (ol.AttributionLike|undefined),
          *     cacheSize: (number|undefined),
@@ -14076,7 +13824,6 @@ declare module olx {
             urls?: string[];
         }
 
-
         /**
          * @typedef {{attributions: (ol.AttributionLike|undefined),
          *     cacheSize: (number|undefined),
@@ -14098,7 +13845,6 @@ declare module olx {
             wrapX?: boolean;
         }
 
-
         /**
          * @typedef {{attributions: (ol.AttributionLike|undefined),
          *     cacheSize: (number|undefined),
@@ -14134,7 +13880,6 @@ declare module olx {
             wrapX?: boolean;
         }
 
-
         /**
          * @typedef {{attributions: (ol.AttributionLike|undefined),
          *     features: (Array.<ol.Feature>|ol.Collection.<ol.Feature>|undefined),
@@ -14160,7 +13905,6 @@ declare module olx {
             wrapX?: boolean;
         }
 
-
         /**
          * @typedef {{attributions: (ol.AttributionLike|undefined),
          *     cacheSize: (number|undefined),
@@ -14208,7 +13952,6 @@ declare module olx {
             wrapX?: boolean;
         }
 
-
         /**
          * @typedef {{attributions: (ol.AttributionLike|undefined),
          *     cacheSize: (number|undefined),
@@ -14248,7 +13991,6 @@ declare module olx {
             wrapX?: boolean;
         }
 
-
         /**
          * @typedef {{attributions: (ol.AttributionLike|undefined),
          *     cacheSize: (number|undefined),
@@ -14276,7 +14018,6 @@ declare module olx {
             account: string;
         }
 
-
         /**
          * @typedef {{attributions: (ol.AttributionLike|undefined),
          *     cacheSize: (number|undefined),
@@ -14297,8 +14038,6 @@ declare module olx {
             tierSizeCalculation?: string;
             size: ol.Size;
         }
-
-
     }
 
     /**
@@ -14320,7 +14059,6 @@ declare module olx {
             atlasManager?: ol.style.AtlasManager;
         }
 
-
         /**
          * @typedef {{color: (ol.Color|ol.ColorLike|undefined)}}
          */
@@ -14328,7 +14066,6 @@ declare module olx {
             color?: (ol.Color | ol.ColorLike);
         }
 
-
         /**
          * @typedef {{anchor: (Array.<number>|undefined),
          *     anchorOrigin: (ol.style.IconOrigin|undefined),
@@ -14368,7 +14105,6 @@ declare module olx {
             src?: string;
         }
 
-
         /**
          * Specify radius for regular polygons, or radius1 and radius2 for stars.
          * @typedef {{fill: (ol.style.Fill|undefined),
@@ -14395,7 +14131,6 @@ declare module olx {
             rotation?: number;
         }
 
-
         /**
          * @typedef {{color: (ol.Color|string|undefined),
          *     lineCap: (string|undefined),
@@ -14422,8 +14157,6 @@ declare module olx {
          */
         type TextPlacement = 'point' | 'line';
 
-
-
         /**
          * @typedef {{font: (string|undefined),
          *     maxAngle: (number|undefined),
@@ -14449,7 +14182,7 @@ declare module olx {
             offsetX?: number;
             offsetY?: number;
             overflow?: boolean;
-            placement?: olx.style.TextPlacement,
+            placement?: olx.style.TextPlacement;
             scale?: number;
             rotateWithView?: boolean;
             rotation?: number;
@@ -14463,7 +14196,6 @@ declare module olx {
             padding?: number[];
         }
 
-
         /**
          * @typedef {{geometry: (undefined|string|ol.geom.Geometry|ol.StyleGeometryFunction),
          *     fill: (ol.style.Fill|undefined),
@@ -14481,7 +14213,6 @@ declare module olx {
             zIndex?: number;
         }
 
-
         /**
          * @typedef {{initialSize: (number|undefined),
          *     maxSize: (number|undefined),
@@ -14492,8 +14223,6 @@ declare module olx {
             maxSize?: number;
             space?: number;
         }
-
-
     }
 
     /**
@@ -14517,10 +14246,9 @@ declare module olx {
             origins?: ol.Coordinate[];
             resolutions: number[];
             tileSize?: (number | ol.Size);
-            tileSizes?: ((number | ol.Size)[]);
+            tileSizes?: (Array<(number | ol.Size)>);
         }
 
-
         /**
          * @typedef {{extent: (ol.Extent|undefined),
          *     origin: (ol.Coordinate|undefined),
@@ -14539,11 +14267,10 @@ declare module olx {
             matrixIds: string[];
             sizes?: ol.Size[];
             tileSize?: (number | ol.Size);
-            tileSizes?: ((number | ol.Size)[]);
+            tileSizes?: (Array<(number | ol.Size)>);
             widths?: number[];
         }
 
-
         /**
          * @typedef {{extent: (ol.Extent|undefined),
          *     maxZoom: (number|undefined),
@@ -14556,8 +14283,6 @@ declare module olx {
             minZoom?: number;
             tileSize?: (number | ol.Size);
         }
-
-
     }
 
     /**
@@ -14568,7 +14293,6 @@ declare module olx {
         html: string;
     }
 
-
     /**
      * @typedef {{tracking: (boolean|undefined)}}
      */
@@ -14587,7 +14311,6 @@ declare module olx {
         projection: ol.ProjectionLike;
     }
 
-
     /**
      * Object literal with config options for the map logo.
      * @typedef {{href: (string), src: (string)}}
@@ -14597,7 +14320,6 @@ declare module olx {
         src: string;
     }
 
-
     /**
      * @typedef {{map: (ol.Map|undefined),
      *     maxLines: (number|undefined),
@@ -14618,7 +14340,6 @@ declare module olx {
         latLabelStyle?: ol.style.Text;
     }
 
-
     /**
      * Object literal with config options for the map.
      * @typedef {{controls: (ol.Collection.<ol.control.Control>|Array.<ol.control.Control>|undefined),
@@ -14644,12 +14365,11 @@ declare module olx {
         loadTilesWhileInteracting?: boolean;
         logo?: (boolean | string | olx.LogoOptions | Element);
         overlays?: (ol.Collection<ol.Overlay> | ol.Overlay[]);
-        renderer?: (ol.RendererType | (ol.RendererType | string)[] | string);
+        renderer?: (ol.RendererType | Array<(ol.RendererType | string)> | string);
         target?: (Element | string);
         view?: ol.View;
     }
 
-
     /**
      * Object literal with config options for the overlay.
      * @typedef {{id: (number|string|undefined),
@@ -14676,7 +14396,6 @@ declare module olx {
         autoPanMargin?: number;
     }
 
-
     /**
      * Object literal with config options for the projection.
      * @typedef {{code: string,
@@ -14712,7 +14431,7 @@ declare module olx {
          *     easing: (function(t: number) => number) }}
          */
         interface FitOptions {
-            size?: ol.Size,
+            size?: ol.Size;
             padding?: number[];
             constrainResolution?: boolean;
             nearest?: boolean;
@@ -14759,14 +14478,14 @@ declare module olx {
     }
 
     /**
-    * Object literal with options for the {@link ol.Map#forEachFeatureAtPixel} and
-    * {@link ol.Map#hasFeatureAtPixel} methods.
-    * @typedef {{layerFilter: ((function(ol.layer.Layer): boolean)|undefined),
-    *     hitTolerance: (number|undefined)}}
-    */
+     * Object literal with options for the {@link ol.Map#forEachFeatureAtPixel} and
+     * {@link ol.Map#hasFeatureAtPixel} methods.
+     * @typedef {{layerFilter: ((function(ol.layer.Layer): boolean)|undefined),
+     *     hitTolerance: (number|undefined)}}
+     */
     interface AtPixelOptions {
-        layerFilter?: ((layer: ol.layer.Layer) => boolean)
-        hitTolerance?: number
+        layerFilter?: ((layer: ol.layer.Layer) => boolean);
+        hitTolerance?: number;
     }
 
     /**
@@ -14797,7 +14516,6 @@ declare module olx {
         viewState: olx.ViewState;
     }
 
-
     /**
      * @typedef {{center: ol.Coordinate,
      *     projection: ol.proj.Projection,
@@ -14810,7 +14528,6 @@ declare module olx {
         resolution: number;
         rotation: number;
     }
-
 }
 
 declare module "openlayers" {
diff --git a/types/openlayers/openlayers-tests.ts b/types/openlayers/openlayers-tests.ts
index d2d708c168..2d2d22d411 100644
--- a/types/openlayers/openlayers-tests.ts
+++ b/types/openlayers/openlayers-tests.ts
@@ -1,12 +1,10 @@
 // Basic type variables for test functions
 let anyValue: any;
-let voidValue: void;
 let numberValue: number;
 let booleanValue: boolean;
 let stringValue: string;
-let stringArray: Array<string>;
+let stringArray: string[];
 let jsonValue: JSON;
-let voidOrBooleanValue: void | boolean;
 let domEventTarget: EventTarget;
 let fn: Function;
 let object: Object;
@@ -24,25 +22,25 @@ drawGeometryFunction([0, 0]);
 
 // Type variables for OpenLayers
 let attribution: ol.Attribution;
-let boundingCoordinates: Array<ol.Coordinate>;
+let boundingCoordinates: ol.Coordinate[];
 let circle: ol.geom.Circle;
 let color: ol.Color;
 let coordinate: ol.Coordinate;
-let coordinatesArray: Array<ol.Coordinate>;
-let coordinatesArrayDim2: Array<Array<ol.Coordinate>>;
+let coordinatesArray: ol.Coordinate[];
+let coordinatesArrayDim2: ol.Coordinate[][];
 let extent: ol.Extent;
 let olEvent: ol.events.Event;
 let eventKey: ol.EventsKey;
-let eventKeyArray: Array<ol.EventsKey>;
-let eventKeyMixed: ol.EventsKey | Array<ol.EventsKey>;
+let eventKeyArray: ol.EventsKey[];
+let eventKeyMixed: ol.EventsKey | ol.EventsKey[];
 let eventTarget: ol.events.EventTarget;
 let feature: ol.Feature;
-let featureArray: Array<ol.Feature>;
+let featureArray: ol.Feature[];
 let featureCollection: ol.Collection<ol.Feature>;
 let featureFormat: ol.format.Feature;
 let featureUrlFunction: ol.FeatureUrlFunction;
 let graticule: ol.Graticule;
-let geometriesArray: Array<ol.geom.Geometry>;
+let geometriesArray: ol.geom.Geometry[];
 let geometry: ol.geom.Geometry;
 let geometryCollection: ol.geom.GeometryCollection;
 let geometryLayout: ol.geom.GeometryLayout;
@@ -63,7 +61,7 @@ let projectionLike: ol.ProjectionLike;
 let simpleGeometry: ol.geom.SimpleGeometry;
 let size: ol.Size;
 let style: ol.style.Style;
-let styleArray: Array<ol.style.Style>;
+let styleArray: ol.style.Style[];
 let styleFunction: ol.StyleFunction;
 let tilegrid: ol.tilegrid.TileGrid;
 let transformFn: ol.TransformFunction;
@@ -92,21 +90,21 @@ stringValue = ol.color.asString(stringValue);
 //
 // ol.extent
 //
-transformFunction = function (input: number[]) {
-    let returnData: number[];
+transformFunction = (input: number[]) => {
+    const returnData: number[] = [];
     return returnData;
 };
-transformFunction = function (input: number[], output: number[]) {
-    let returnData: number[];
+transformFunction = (input: number[], output: number[]) => {
+    const returnData: number[] = [];
     return returnData;
 };
-transformFunction = function (input: number[], output: number[], dimension: number) {
-    let returnData: number[];
+transformFunction = (input: number[], output: number[], dimension: number) => {
+    const returnData: number[] = [];
     return returnData;
-}
+};
 extent = ol.extent.applyTransform(extent, transformFunction);
 ol.extent.applyTransform(extent, transformFunction, extent);
-extent = ol.extent.boundingExtent(boundingCoordinates)
+extent = ol.extent.boundingExtent(boundingCoordinates);
 extent = ol.extent.buffer(extent, numberValue);
 ol.extent.buffer(extent, numberValue, extent);
 booleanValue = ol.extent.containsCoordinate(extent, coordinate);
@@ -145,7 +143,7 @@ loadingStrategy = ol.loadingstrategy.tile(tilegrid);
 // ol.geom.Circle
 //
 booleanValue = circle.intersectsExtent(extent);
-circle = <ol.geom.Circle>circle.transform(projectionLike, projectionLike);
+circle = <ol.geom.Circle> circle.transform(projectionLike, projectionLike);
 
 //
 //
@@ -162,14 +160,14 @@ geometryResult.transform(projectionLike, projectionLike);
 //
 // ol.geom.GeometryCollection
 //
-geometryCollection = new ol.geom.GeometryCollection(geometriesArray)
+geometryCollection = new ol.geom.GeometryCollection(geometriesArray);
 geometryCollection = new ol.geom.GeometryCollection();
-voidValue = geometryCollection.applyTransform(transformFn);
+geometryCollection.applyTransform(transformFn);
 geometryCollection = geometryCollection.clone();
 geometriesArray = geometryCollection.getGeometries();
 geometryType = geometryCollection.getType();
 booleanValue = geometryCollection.intersectsExtent(extent);
-voidValue = geometryCollection.setGeometries(geometriesArray);
+geometryCollection.setGeometries(geometriesArray);
 
 //
 //
@@ -181,8 +179,8 @@ linearRing = linearRing.clone();
 numberValue = linearRing.getArea();
 coordinatesArray = linearRing.getCoordinates();
 geometryType = linearRing.getType();
-voidValue = linearRing.setCoordinates(coordinatesArray);
-voidValue = linearRing.setCoordinates(coordinatesArray, geometryLayout);
+linearRing.setCoordinates(coordinatesArray);
+linearRing.setCoordinates(coordinatesArray, geometryLayout);
 
 //
 //
@@ -190,7 +188,7 @@ voidValue = linearRing.setCoordinates(coordinatesArray, geometryLayout);
 //
 lineString = new ol.geom.LineString(coordinatesArray);
 lineString = new ol.geom.LineString(coordinatesArray, geometryLayout);
-voidValue = lineString.appendCoordinate(coordinate);
+lineString.appendCoordinate(coordinate);
 lineString = lineString.clone();
 coordinate = lineString.getCoordinateAtM(numberValue);
 coordinate = lineString.getCoordinateAtM(numberValue, booleanValue);
@@ -198,18 +196,18 @@ coordinatesArray = lineString.getCoordinates();
 numberValue = lineString.getLength();
 geometryType = lineString.getType();
 booleanValue = lineString.intersectsExtent(extent);
-voidValue = lineString.setCoordinates(coordinatesArray);
-voidValue = lineString.setCoordinates(coordinatesArray, geometryLayout);
+lineString.setCoordinates(coordinatesArray);
+lineString.setCoordinates(coordinatesArray, geometryLayout);
 
 //
 //
 // ol.geom.MultiLineString
 //
-let lineStringsArray: Array<ol.geom.LineString>;
+let lineStringsArray: ol.geom.LineString[];
 
 multiLineString = new ol.geom.MultiLineString(coordinatesArrayDim2);
 multiLineString = new ol.geom.MultiLineString(coordinatesArrayDim2, geometryLayout);
-voidValue = multiLineString.appendLineString(lineString);
+multiLineString.appendLineString(lineString);
 multiLineString = multiLineString.clone();
 coordinate = multiLineString.getCoordinateAtM(numberValue);
 coordinate = multiLineString.getCoordinateAtM(numberValue, booleanValue);
@@ -219,37 +217,37 @@ lineString = multiLineString.getLineString(numberValue);
 lineStringsArray = multiLineString.getLineStrings();
 geometryType = multiLineString.getType();
 booleanValue = multiLineString.intersectsExtent(extent);
-voidValue = multiLineString.setCoordinates(coordinatesArrayDim2);
-voidValue = multiLineString.setCoordinates(coordinatesArrayDim2, geometryLayout);
+multiLineString.setCoordinates(coordinatesArrayDim2);
+multiLineString.setCoordinates(coordinatesArrayDim2, geometryLayout);
 
 //
 //
 // ol.geom.MultiPoint
 //
-let pointsArray: Array<ol.geom.Point>;
+let pointsArray: ol.geom.Point[];
 
 multiPoint = new ol.geom.MultiPoint(coordinatesArray);
 multiPoint = new ol.geom.MultiPoint(coordinatesArray, geometryLayout);
-voidValue = multiPoint.appendPoint(point);
+multiPoint.appendPoint(point);
 multiPoint = multiPoint.clone();
 coordinatesArray = multiPoint.getCoordinates();
 point = multiPoint.getPoint(numberValue);
 pointsArray = multiPoint.getPoints();
 geometryType = multiPoint.getType();
 booleanValue = multiPoint.intersectsExtent(extent);
-voidValue = multiPoint.setCoordinates(coordinatesArray);
-voidValue = multiPoint.setCoordinates(coordinatesArray, geometryLayout);
+multiPoint.setCoordinates(coordinatesArray);
+multiPoint.setCoordinates(coordinatesArray, geometryLayout);
 
 //
 //
 // ol.geom.MultiPolygon
 //
-let coordinatesArrayDim3: Array<Array<Array<ol.Coordinate>>>;
-let polygonsArray: Array<ol.geom.Polygon>;
+let coordinatesArrayDim3: ol.Coordinate[][][];
+let polygonsArray: ol.geom.Polygon[];
 
 multiPolygon = new ol.geom.MultiPolygon(coordinatesArrayDim3);
 multiPolygon = new ol.geom.MultiPolygon(coordinatesArrayDim3, geometryLayout);
-voidValue = multiPolygon.appendPolygon(polygon);
+multiPolygon.appendPolygon(polygon);
 multiPolygon = multiPolygon.clone();
 numberValue = multiPolygon.getArea();
 coordinatesArrayDim3 = multiPolygon.getCoordinates();
@@ -259,8 +257,8 @@ polygon = multiPolygon.getPolygon(numberValue);
 polygonsArray = multiPolygon.getPolygons();
 geometryType = multiPolygon.getType();
 booleanValue = multiPolygon.intersectsExtent(extent);
-voidValue = multiPolygon.setCoordinates(coordinatesArrayDim3);
-voidValue = multiPolygon.setCoordinates(coordinatesArrayDim3, geometryLayout);
+multiPolygon.setCoordinates(coordinatesArrayDim3);
+multiPolygon.setCoordinates(coordinatesArrayDim3, geometryLayout);
 
 //
 //
@@ -272,15 +270,15 @@ point = point.clone();
 coordinate = point.getCoordinates();
 geometryType = point.getType();
 booleanValue = point.intersectsExtent(extent);
-voidValue = point.setCoordinates(coordinate);
-voidValue = point.setCoordinates(coordinate, geometryLayout);
+point.setCoordinates(coordinate);
+point.setCoordinates(coordinate, geometryLayout);
 
 //
 //
 // ol.geom.Polygon
 //
 let localSphere: ol.Sphere;
-let linearRingsArray: Array<ol.geom.LinearRing>;
+let linearRingsArray: ol.geom.LinearRing[];
 
 polygon = new ol.geom.Polygon(coordinatesArrayDim2);
 polygon = new ol.geom.Polygon(coordinatesArrayDim2, geometryLayout);
@@ -290,7 +288,7 @@ polygon = ol.geom.Polygon.fromCircle(circle);
 polygon = ol.geom.Polygon.fromCircle(circle, numberValue);
 polygon = ol.geom.Polygon.fromCircle(circle, numberValue, numberValue);
 polygon = ol.geom.Polygon.fromExtent(extent);
-voidValue = polygon.appendLinearRing(linearRing);
+polygon.appendLinearRing(linearRing);
 polygon = polygon.clone();
 numberValue = polygon.getArea();
 coordinatesArrayDim2 = polygon.getCoordinates();
@@ -301,8 +299,8 @@ numberValue = polygon.getLinearRingCount();
 linearRingsArray = polygon.getLinearRings();
 geometryType = polygon.getType();
 booleanValue = polygon.intersectsExtent(extent);
-voidValue = polygon.setCoordinates([[coordinate]]);
-voidValue = polygon.setCoordinates([[coordinate]], geometryLayout);
+polygon.setCoordinates([[coordinate]]);
+polygon.setCoordinates([[coordinate]], geometryLayout);
 
 //
 //
@@ -312,7 +310,7 @@ simpleGeometry.applyTransform(transformFn);
 coordinate = simpleGeometry.getFirstCoordinate();
 coordinate = simpleGeometry.getLastCoordinate();
 geometryLayout = simpleGeometry.getLayout();
-voidValue = simpleGeometry.translate(numberValue, numberValue);
+simpleGeometry.translate(numberValue, numberValue);
 
 //
 // ol.source
@@ -336,10 +334,10 @@ vectorSource = new ol.source.Vector({
     url: featureUrlFunction,
     loader: featureLoader
 });
-voidValue = vectorSource.addFeature(feature);
-voidValue = vectorSource.addFeatures(featureArray);
-voidValue = vectorSource.clear();
-voidValue = vectorSource.clear(booleanValue);
+vectorSource.addFeature(feature);
+vectorSource.addFeatures(featureArray);
+vectorSource.clear();
+vectorSource.clear(booleanValue);
 anyValue = vectorSource.forEachFeature(featureCallback);
 anyValue = vectorSource.forEachFeature(featureCallback, object);
 anyValue = vectorSource.forEachFeatureInExtent(extent, featureCallback, object);
@@ -352,8 +350,7 @@ featureArray = vectorSource.getFeatures();
 featureArray = vectorSource.getFeaturesAtCoordinate(coordinate);
 featureCollection = vectorSource.getFeaturesCollection();
 featureArray = vectorSource.getFeaturesInExtent(extent);
-voidValue = vectorSource.removeFeature(feature);
-
+vectorSource.removeFeature(feature);
 
 clusterSource = new ol.source.Cluster({
     source: vectorSource
@@ -367,7 +364,7 @@ numberValue = clusterSource.getDistance();
 feature = new ol.Feature();
 feature = new ol.Feature(geometry);
 feature = new ol.Feature({
-    geometry: geometry,
+    geometry,
     a: numberValue,
     b: stringValue,
     c: null,
@@ -377,17 +374,17 @@ feature = feature.clone();
 geometry = feature.getGeometry();
 stringValue = feature.getGeometryName();
 let featureGetId: string | number = feature.getId();
-let featureGetStyle: ol.style.Style | Array<ol.style.Style> | ol.FeatureStyleFunction | ol.StyleFunction = feature.getStyle();
+let featureGetStyle: ol.style.Style | ol.style.Style[] | ol.FeatureStyleFunction | ol.StyleFunction = feature.getStyle();
 featureStyleFunction = feature.getStyleFunction();
-voidValue = feature.setGeometry(geometry);
-voidValue = feature.setGeometryName(stringValue);
-voidValue = feature.setId(stringValue);
-voidValue = feature.setId(numberValue);
-voidValue = feature.setStyle(style);
-voidValue = feature.setStyle(styleArray);
-voidValue = feature.setStyle(featureStyleFunction);
-voidValue = feature.setStyle(styleFunction);
-voidValue = feature.setProperties(object);
+feature.setGeometry(geometry);
+feature.setGeometryName(stringValue);
+feature.setId(stringValue);
+feature.setId(numberValue);
+feature.setStyle(style);
+feature.setStyle(styleArray);
+feature.setStyle(featureStyleFunction);
+feature.setStyle(styleFunction);
+feature.setProperties(object);
 
 //
 // ol.View
@@ -400,7 +397,7 @@ view = new ol.View({
     center: coordinate,
     constrainRotation: numberValue,
     enableRotation: booleanValue,
-    extent: extent,
+    extent,
     maxResolution: numberValue,
     minResolution: numberValue,
     maxZoom: numberValue,
@@ -416,11 +413,11 @@ view = new ol.View({
     constrainRotation: booleanValue,
 });
 
-voidValue = view.animate();
-voidValue = view.animate({});
-voidValue = view.animate({ zoom: view.getZoom() + 1 });
-voidValue = view.animate({ zoom: 10 }, { center: [0, 0] });
-voidValue = view.animate({
+view.animate();
+view.animate({});
+view.animate({ zoom: view.getZoom() + 1 });
+view.animate({ zoom: 10 }, { center: [0, 0] });
+view.animate({
     center: coordinate,
     zoom: numberValue,
     resolution: numberValue,
@@ -431,8 +428,8 @@ voidValue = view.animate({
 });
 extent = view.calculateExtent();
 extent = view.calculateExtent(size);
-voidValue = view.cancelAnimations();
-voidValue = view.centerOn(coordinate, size, pixel);
+view.cancelAnimations();
+view.centerOn(coordinate, size, pixel);
 coordinate = view.constrainCenter();
 coordinate = view.constrainCenter(coordinate);
 numberValue = view.constrainResolution();
@@ -442,14 +439,14 @@ numberValue = view.constrainResolution(numberValue, numberValue, numberValue);
 numberValue = view.constrainRotation();
 numberValue = view.constrainRotation(numberValue);
 numberValue = view.constrainRotation(numberValue, numberValue);
-voidValue = view.fit(simpleGeometry);
-voidValue = view.fit(simpleGeometry, {});
-voidValue = view.fit(extent);
-voidValue = view.fit(extent, {});
-voidValue = view.fit(extent, { callback: () => { } });
-voidValue = view.fit(extent, { callback: (animationCompleted: boolean) => { } });
-voidValue = view.fit(extent, {
-    size: size,
+view.fit(simpleGeometry);
+view.fit(simpleGeometry, {});
+view.fit(extent);
+view.fit(extent, {});
+view.fit(extent, { callback: () => { } });
+view.fit(extent, { callback: (animationCompleted: boolean) => { } });
+view.fit(extent, {
+    size,
     padding: [numberValue, numberValue, numberValue, numberValue],
     constrainResolution: booleanValue,
     nearest: booleanValue,
@@ -475,15 +472,15 @@ numberValue = view.getResolutionForZoom(numberValue);
 numberValue = view.getRotation();
 numberValue = view.getZoom();
 numberValue = view.getZoomForResolution(numberValue);
-voidValue = view.rotate(numberValue);
-voidValue = view.rotate(numberValue, coordinate);
-voidValue = view.setCenter(coordinate);
-voidValue = view.setMaxZoom(numberValue);
-voidValue = view.setMinZoom(numberValue);
-voidValue = view.setResolution();
-voidValue = view.setResolution(numberValue);
-voidValue = view.setRotation(numberValue);
-voidValue = view.setZoom(numberValue);
+view.rotate(numberValue);
+view.rotate(numberValue, coordinate);
+view.setCenter(coordinate);
+view.setMaxZoom(numberValue);
+view.setMinZoom(numberValue);
+view.setResolution();
+view.setResolution(numberValue);
+view.setRotation(numberValue);
+view.setZoom(numberValue);
 
 //
 // ol.layer.Base
@@ -551,7 +548,6 @@ let vectorTileLayer: ol.layer.VectorTile = new ol.layer.VectorTile({
     zIndex: 2
 });
 
-
 //
 // ol.Object
 //
@@ -559,37 +555,36 @@ let olObject: ol.Object = new ol.Object({
     a: numberValue,
     b: stringValue,
     c: booleanValue,
-    d: voidValue,
-    e: object,
-    f: fn
+    d: object,
+    e: fn
 });
 anyValue = olObject.get(stringValue);
 stringArray = olObject.getKeys();
 object = olObject.getProperties();
-voidValue = olObject.set(stringValue, anyValue);
-voidValue = olObject.set(stringValue, anyValue, booleanValue);
-voidValue = olObject.setProperties(object, booleanValue);
-voidValue = olObject.unset(stringValue, booleanValue);
+olObject.set(stringValue, anyValue);
+olObject.set(stringValue, anyValue, booleanValue);
+olObject.setProperties(object, booleanValue);
+olObject.unset(stringValue, booleanValue);
 
 //
 // ol.Observable
 //
 ol.Observable.unByKey(eventKey);
 let observable: ol.Observable = new ol.Observable();
-voidValue = observable.changed();
-voidOrBooleanValue = observable.dispatchEvent({ type: stringValue });
-voidOrBooleanValue = observable.dispatchEvent({ type: stringValue, target: domEventTarget });
-voidOrBooleanValue = observable.dispatchEvent({ type: stringValue, target: eventTarget });
-voidOrBooleanValue = observable.dispatchEvent({ type: stringValue, a: numberValue, b: stringValue, c: booleanValue, d: null, e: {} });
-voidOrBooleanValue = observable.dispatchEvent(olEvent);
-voidOrBooleanValue = observable.dispatchEvent(stringValue);
+observable.changed();
+observable.dispatchEvent({ type: stringValue });
+observable.dispatchEvent({ type: stringValue, target: domEventTarget });
+observable.dispatchEvent({ type: stringValue, target: eventTarget });
+observable.dispatchEvent({ type: stringValue, a: numberValue, b: stringValue, c: booleanValue, d: null, e: {} });
+observable.dispatchEvent(olEvent);
+observable.dispatchEvent(stringValue);
 numberValue = observable.getRevision();
 eventKeyMixed = observable.on(stringValue, fn);
 eventKeyMixed = observable.on([stringValue, stringValue], fn, {});
 eventKeyMixed = observable.once(stringValue, fn);
 eventKeyMixed = observable.once([stringValue, stringValue], fn, {});
-voidValue = observable.un(stringValue, fn);
-voidValue = observable.un([stringValue, stringValue], fn, {});
+observable.un(stringValue, fn);
+observable.un([stringValue, stringValue], fn, {});
 
 //
 // ol.proj
@@ -605,17 +600,17 @@ numberValue = projection.getPointResolution(numberValue, coordinate);
 units = projection.getUnits();
 extent = projection.getWorldExtent();
 booleanValue = projection.isGlobal();
-voidValue = projection.setExtent(extent);
-voidValue = projection.setGetPointResolution(getPointResolutionFn);
-voidValue = projection.setGlobal(booleanValue);
-voidValue = projection.setWorldExtent(extent);
+projection.setExtent(extent);
+projection.setGetPointResolution(getPointResolutionFn);
+projection.setGlobal(booleanValue);
+projection.setWorldExtent(extent);
 
 //
 // ol.Map
 //
 
 let map: ol.Map = new ol.Map({
-    view: view,
+    view,
     layers: [tileLayer],
     target: stringValue
 });
@@ -625,7 +620,7 @@ let map: ol.Map = new ol.Map({
 //
 let imageWMS: ol.source.ImageWMS = new ol.source.ImageWMS({
     params: {},
-    projection: projection,
+    projection,
     serverType: stringValue,
     url: stringValue
 });
@@ -641,18 +636,18 @@ projection = source.getProjection();
 //
 let tileWMS: ol.source.TileWMS = new ol.source.TileWMS({
     params: {},
-    projection: projection,
+    projection,
     serverType: stringValue,
     url: stringValue
 });
 
-//test without projection
+// test without projection
 tileWMS = new ol.source.TileWMS({
     params: {},
     serverType: stringValue,
     url: stringValue
 });
-voidValue = tileWMS.updateParams(tileWMS.getParams());
+tileWMS.updateParams(tileWMS.getParams());
 stringValue = tileWMS.getGetFeatureInfoUrl([0, 0], 1, "EPSG:4326", {});
 
 //
@@ -660,7 +655,7 @@ stringValue = tileWMS.getGetFeatureInfoUrl([0, 0], 1, "EPSG:4326", {});
 //
 let wmts: ol.source.WMTS = new ol.source.WMTS({
     layer: "",
-    projection: projection,
+    projection,
     matrixSet: "",
     style: "",
     tileGrid: new ol.tilegrid.WMTS({
@@ -699,7 +694,7 @@ easingFunction = ol.easing.upAndDown;
 // ol.Geolocation
 //
 let geolocation: ol.Geolocation = new ol.Geolocation({
-    projection: projection
+    projection
 });
 coordinate = geolocation.getPosition();
 
@@ -709,12 +704,12 @@ coordinate = geolocation.getPosition();
 
 graticule = new ol.Graticule();
 graticule = new ol.Graticule({
-    map: map,
+    map,
 });
 let graticuleMap: ol.Map = graticule.getMap();
-let graticuleMeridians: Array<ol.geom.LineString> = graticule.getMeridians();
-let graticuleParallels: Array<ol.geom.LineString> = graticule.getParallels();
-voidValue = graticule.setMap(graticuleMap);
+let graticuleMeridians: ol.geom.LineString[] = graticule.getMeridians();
+let graticuleParallels: ol.geom.LineString[] = graticule.getParallels();
+graticule.setMap(graticuleMap);
 
 //
 // ol.DeviceOrientation
@@ -732,19 +727,18 @@ numberValue = deviceOrientation.getHeading();
 let popup: ol.Overlay = new ol.Overlay({
     element: document.getElementById('popup')
 });
-voidValue = map.addOverlay(popup);
+map.addOverlay(popup);
 let popupElement: Element = popup.getElement();
 let popupMap: ol.Map = popup.getMap();
-let popupOffset: Array<number> = popup.getOffset();
+let popupOffset: number[] = popup.getOffset();
 coordinate = popup.getPosition();
 let popupPositioning: ol.OverlayPositioning = popup.getPositioning();
-voidValue = popup.setElement(popupElement);
-voidValue = popup.setMap(popupMap);
-voidValue = popup.setOffset(popupOffset);
-voidValue = popup.setPosition(coordinate);
-voidValue = popup.setPosition(undefined);
-voidValue = popup.setPositioning(popupPositioning);
-
+popup.setElement(popupElement);
+popup.setMap(popupMap);
+popup.setOffset(popupOffset);
+popup.setPosition(coordinate);
+popup.setPosition(undefined);
+popup.setPositioning(popupPositioning);
 
 //
 // ol.format.GeoJSON
@@ -909,7 +903,7 @@ let draw: ol.interaction.Draw = new ol.interaction.Draw({
     snapTolerance: numberValue,
     maxPoints: numberValue,
     minPoints: numberValue,
-    style: style,
+    style,
     geometryFunction: drawGeometryFunction,
     geometryName: stringValue,
     condition: ol.events.condition.never,
@@ -924,7 +918,7 @@ draw = new ol.interaction.Draw({
     type: "Point",
     style: styleFunction
 });
-let styleFunctionAsStyle = function (feature: ol.Feature, resolution: number): ol.style.Style { return style; }
+let styleFunctionAsStyle = (feature: ol.Feature, resolution: number): ol.style.Style => style;
 draw = new ol.interaction.Draw({
     type: "Point",
     style: styleFunctionAsStyle
@@ -938,8 +932,7 @@ ol.interaction.defaults({
     constrainResolution: booleanValue
 });
 
-
-let styleFunctionAsArray = function (feature: ol.Feature, resolution: number): ol.style.Style[] { return styleArray; }
+let styleFunctionAsArray = (feature: ol.Feature, resolution: number): ol.style.Style[] => styleArray;
 draw = new ol.interaction.Draw({
     type: "Point",
     style: styleFunctionAsArray
@@ -949,24 +942,22 @@ let dragbox: ol.interaction.DragBox = new ol.interaction.DragBox({
     className: stringValue,
     minArea: 10,
     condition: ol.events.condition.always,
-    boxEndCondition: function (mapBrowserEvent: ol.MapBrowserEvent, startPixel: ol.Pixel, endPixel: ol.Pixel) {
-        let width: number = endPixel[0] - startPixel[0];
-        let height: number = endPixel[1] - startPixel[1];
+    boxEndCondition: (mapBrowserEvent: ol.MapBrowserEvent, startPixel: ol.Pixel, endPixel: ol.Pixel) => {
+        const width: number = endPixel[0] - startPixel[0];
+        const height: number = endPixel[1] - startPixel[1];
         return booleanValue;
     }
 });
 polygon = dragbox.getGeometry();
 
 let interaction: ol.interaction.Interaction = new ol.interaction.Interaction({
-    handleEvent: function (e: ol.MapBrowserEvent) {
+    handleEvent: (e: ol.MapBrowserEvent) => {
         return booleanValue;
     }
 });
 booleanValue = interaction.getActive();
 map = interaction.getMap();
-voidValue = interaction.setActive(true);
-
-
+interaction.setActive(true);
 
 const select: ol.interaction.Select = new ol.interaction.Select({
     layers: (layer: ol.layer.Layer) => true,
@@ -999,11 +990,11 @@ styleRegularShape = new ol.style.RegularShape({
 let value = ol.proj.METERS_PER_UNIT['degrees'];
 
 numberValue = ol.Sphere.getArea(geometry, {
-    projection: projection,
+    projection,
     radius: numberValue,
 });
 
 numberValue = ol.Sphere.getLength(geometry, {
-    projection: projection,
+    projection,
     radius: numberValue,
 });
diff --git a/types/openlayers/tslint.json b/types/openlayers/tslint.json
index a41bf5d19a..2effdd6100 100644
--- a/types/openlayers/tslint.json
+++ b/types/openlayers/tslint.json
@@ -1,79 +1,18 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
+        // It appears somewhat difficult to remove the Function and Object types
         "ban-types": false,
-        "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
+        // This currently fails for an option that does not appear to be in OL 4
         "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
+        // Not sure how to work around this, or if it's necessary to        
         "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
-        "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
         "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
         "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
         "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
         "no-unnecessary-class": false,
         "no-unnecessary-generics": false,
         "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
-        "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
-        "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
-        "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
+        "strict-export-declare-modifiers": false
     }
 }

From 2a39618c9c51cf662fd733fc81901d679b411a64 Mon Sep 17 00:00:00 2001
From: Thomas Bruun <thomas.bruun@gmail.com>
Date: Fri, 23 Feb 2018 09:30:48 +0100
Subject: [PATCH 0136/1382] Stripe: Add status property to IRefund definition

As described in the Stripe documentation: https://stripe.com/docs/api/node\#refund_object
---
 types/stripe/index.d.ts      | 7 +++++++
 types/stripe/stripe-tests.ts | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/types/stripe/index.d.ts b/types/stripe/index.d.ts
index 12f2b4abea..2289e02e55 100644
--- a/types/stripe/index.d.ts
+++ b/types/stripe/index.d.ts
@@ -7,6 +7,7 @@
 //                 Brannon Jones <https://github.com/brannon>
 //                 Kyle Kamperschroer <https://github.com/kkamperschroer>
 //                 Kensuke Hoshikawa <https://github.com/starhoshi>
+//                 Thomas Bruun <https://github.com/bruun>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -4688,6 +4689,12 @@ declare namespace Stripe {
              * This is the transaction number that appears on email receipts sent for this refund.
              */
             receipt_number: string;
+
+            /**
+             * Status of the refund. For credit card refunds, this can be succeeded or failed.
+             * For other types of refunds, it can be pending, succeeded, failed, or canceled.
+             */
+            status: "pending" | "succeeded" | "failed" | "canceled";
         }
 
         interface IRefundCreationOptions extends IDataOptionsWithMetadata {
diff --git a/types/stripe/stripe-tests.ts b/types/stripe/stripe-tests.ts
index b887ae6228..ff909076b2 100644
--- a/types/stripe/stripe-tests.ts
+++ b/types/stripe/stripe-tests.ts
@@ -66,7 +66,7 @@ stripe.charges.create({
     });
 
     charge.refunds.retrieve("re_15jzA4Ee31JkLCeQcxbTbjaL").then(function (refund) {
-
+        var status: "pending" | "succeeded" | "failed" | "canceled" = refund.status;
     });
 
     charge.refunds.update("re_15jzA4Ee31JkLCeQcxbTbjaL", { metadata: { test: "data" } }).then(function (refund) {

From 85a6e37f7e56c646def6e8d0bda3671557018883 Mon Sep 17 00:00:00 2001
From: Dennis George <dennispg@gmail.com>
Date: Wed, 28 Feb 2018 15:20:06 -0600
Subject: [PATCH 0137/1382] Removed CommonsChunkPlugin from
 extract-test-webpack-plugin-tests.ts

---
 .../extract-text-webpack-plugin-tests.ts              | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/types/extract-text-webpack-plugin/extract-text-webpack-plugin-tests.ts b/types/extract-text-webpack-plugin/extract-text-webpack-plugin-tests.ts
index 06fc528cff..aefadf29a4 100644
--- a/types/extract-text-webpack-plugin/extract-text-webpack-plugin-tests.ts
+++ b/types/extract-text-webpack-plugin/extract-text-webpack-plugin-tests.ts
@@ -52,17 +52,6 @@ configuration = {
     ]
 };
 
-configuration = {
-    // ...
-    plugins: [
-        new webpack.optimize.CommonsChunkPlugin({
-            name: "commons",
-            filename: "commons.js",
-        }),
-        new ExtractTextPlugin("[name].css")
-    ]
-};
-
 configuration = {
     // ...
     module: {

From 731fbb40fa7a48b2350ce2bca0d942c91ca5e4ef Mon Sep 17 00:00:00 2001
From: denis <denisname@users.noreply.github.com>
Date: Wed, 28 Feb 2018 23:17:10 +0100
Subject: [PATCH 0138/1382] Remove useless null

GeoJsonProperties is a union type containing null...
---
 types/geojson/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/geojson/index.d.ts b/types/geojson/index.d.ts
index b1c7b9f39a..9a0ab3cd8b 100644
--- a/types/geojson/index.d.ts
+++ b/types/geojson/index.d.ts
@@ -160,7 +160,7 @@ export interface Feature<G extends GeometryObject | null, P = GeoJsonProperties>
  * A collection of feature objects.
  *  https://tools.ietf.org/html/rfc7946#section-3.3
  */
-export interface FeatureCollection<G extends GeometryObject | null, P = GeoJsonProperties | null> extends GeoJsonObject {
+export interface FeatureCollection<G extends GeometryObject | null, P = GeoJsonProperties> extends GeoJsonObject {
     type: "FeatureCollection";
     features: Array<Feature<G, P>>;
 }

From 8d058bab3da5aca8e1aefff67a9c86f1a2c1d4a8 Mon Sep 17 00:00:00 2001
From: Jared Szechy <jared.szechy@gmail.com>
Date: Wed, 28 Feb 2018 18:00:52 -0500
Subject: [PATCH 0139/1382] [plotly.js] Add ModeBarButton

---
 types/plotly.js/index.d.ts | 43 ++++++++++++++++++++++++++++++++++----
 1 file changed, 39 insertions(+), 4 deletions(-)

diff --git a/types/plotly.js/index.d.ts b/types/plotly.js/index.d.ts
index 6e7c9a67bc..97d439c504 100644
--- a/types/plotly.js/index.d.ts
+++ b/types/plotly.js/index.d.ts
@@ -5,6 +5,7 @@
 // 				Frederik Aalund <https://github.com/frederikaalund>
 // 				taoqf <https://github.com/taoqf>
 // 				Dadstart <https://github.com/Dadstart>
+// 				Jared Szechy <https://github.com/szechyjs>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -281,13 +282,47 @@ export interface Margin {
 	r: number;
 }
 
-export type ModeBarButtons = 'lasso2d' | 'select2d' | 'sendDataToCloud' | 'autoScale2d' |
+export type ModeBarDefaultButtons = 'lasso2d' | 'select2d' | 'sendDataToCloud' | 'autoScale2d' |
 	'zoom2d' | 'pan2d' | 'zoomIn2d' | 'zoomOut2d' | 'autoScale2d' | 'resetScale2d' |
 	'hoverClosestCartesian' | 'hoverCompareCartesian' | 'zoom3d' | 'pan3d' | 'orbitRotation' |
 	'tableRotation' | 'resetCameraDefault3d' | 'resetCameraLastSave3d' | 'hoverClosest3d' |
 	'zoomInGeo' | 'zoomOutGeo' | 'resetGeo' | 'hoverClosestGeo' | 'hoverClosestGl2d' |
 	'hoverClosestPie' | 'toggleHover' | 'toImage' | 'resetViews' | 'toggleSpikelines';
 
+export type ButtonClickEvent = (gd: PlotlyHTMLElement, ev: MouseEvent) => void;
+
+export interface ModeBarButton {
+	/** name / id of the buttons (for tracking) */
+	name: string;
+	/**
+	 * text that appears while hovering over the button,
+	 * enter null, false or '' for no hover text
+	 */
+	title: string;
+	/**
+	 * svg icon object associated with the button
+	 * can be linked to Plotly.Icons to use the default plotly icons
+	 */
+	icon: string;
+	/** icon positioning */
+	gravity?: string;
+	/**
+	 * click handler associated with the button, a function of
+	 * 'gd' (the main graph object) and
+	 * 'ev' (the event object)
+	 */
+	click: ButtonClickEvent;
+	/**
+	 * attribute associated with button,
+	 * use this with 'val' to keep track of the state
+	 */
+	attr?: string;
+	/** initial 'attr' value, can be a function of gd */
+	val?: any;
+	/** is the button a toggle button? */
+	toggle?: boolean;
+}
+
 // Data
 
 export type Datum = string | number | Date;
@@ -428,17 +463,17 @@ export interface Config {
 
 	// remove mode bar button by name
 	// (see ./components/modebar/buttons.js for the list of names)
-	modeBarButtonsToRemove: ModeBarButtons[];
+	modeBarButtonsToRemove: ModeBarDefaultButtons[];
 
 	// add mode bar button using config objects
 	// (see ./components/modebar/buttons.js for list of arguments)
-	modeBarButtonsToAdd: ModeBarButtons[];
+	modeBarButtonsToAdd: ModeBarDefaultButtons[] | ModeBarButton[];
 
 	// fully custom mode bar buttons as nested array,
 	// where the outer arrays represents button groups, and
 	// the inner arrays have buttons config objects or names of default buttons
 	// (see ./components/modebar/buttons.js for more info)
-	modeBarButtons: ModeBarButtons[][];
+	modeBarButtons: ModeBarDefaultButtons[][] | ModeBarButton[][];
 
 	// add the plotly logo on the end of the mode bar
 	displaylogo: boolean;

From 70c011436c74e0af1e145ef5fcd2cfc112a32bd3 Mon Sep 17 00:00:00 2001
From: denis <denisname@users.noreply.github.com>
Date: Thu, 1 Mar 2018 01:14:23 +0100
Subject: [PATCH 0140/1382] Force CI Build to run again

Test pass, but CI failed... :/
---
 types/geojson/geojson-tests.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/geojson/geojson-tests.ts b/types/geojson/geojson-tests.ts
index 19a3a4fd53..c5c3fa2bdd 100644
--- a/types/geojson/geojson-tests.ts
+++ b/types/geojson/geojson-tests.ts
@@ -231,7 +231,7 @@ interface TestProperty {
 }
 
 const testProps: TestProperty = {
-    foo: "bar",
+    foo: "baz",
     hello: "world"
 };
 

From 5ce08904d77cbb323f34cdd8510cee32e880b649 Mon Sep 17 00:00:00 2001
From: Phil Nova <pnova8@gmail.com>
Date: Wed, 28 Feb 2018 16:24:17 -0800
Subject: [PATCH 0141/1382] Use intersection type

---
 types/react-sortable-hoc/index.d.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/types/react-sortable-hoc/index.d.ts b/types/react-sortable-hoc/index.d.ts
index dbf402599f..b3df2fb3a5 100644
--- a/types/react-sortable-hoc/index.d.ts
+++ b/types/react-sortable-hoc/index.d.ts
@@ -18,13 +18,11 @@ export interface SortStart {
 
 export type SortEvent = React.MouseEvent<any> | React.TouchEvent<any>;
 
-interface Tag extends React.EventTarget {
+export interface Tag extends React.EventTarget {
     tagName: string;
 }
 
-export interface SortEventWithTag extends SortEvent {
-    target: Tag;
-}
+export type SortEventWithTag = SortEvent & { target: Tag }
 
 export type SortStartHandler = (sort: SortStart, event: SortEvent) => void;
 

From 1e21e896dd0feacbd06c989aab202b706c17184a Mon Sep 17 00:00:00 2001
From: Phil Nova <pnova8@gmail.com>
Date: Wed, 28 Feb 2018 16:34:31 -0800
Subject: [PATCH 0142/1382] Remove unneeded interface

---
 types/react-sortable-hoc/index.d.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/types/react-sortable-hoc/index.d.ts b/types/react-sortable-hoc/index.d.ts
index b3df2fb3a5..41eda5ce40 100644
--- a/types/react-sortable-hoc/index.d.ts
+++ b/types/react-sortable-hoc/index.d.ts
@@ -18,12 +18,12 @@ export interface SortStart {
 
 export type SortEvent = React.MouseEvent<any> | React.TouchEvent<any>;
 
-export interface Tag extends React.EventTarget {
-    tagName: string;
+export type SortEventWithTag = SortEvent & {
+  target: {
+    tagName: string
+  }
 }
 
-export type SortEventWithTag = SortEvent & { target: Tag }
-
 export type SortStartHandler = (sort: SortStart, event: SortEvent) => void;
 
 export type SortMoveHandler = (event: SortEvent) => void;

From 3d4d801f3a6660179b011fd4cbc37e1434b54f65 Mon Sep 17 00:00:00 2001
From: Phil Nova <pnova8@gmail.com>
Date: Wed, 28 Feb 2018 16:38:47 -0800
Subject: [PATCH 0143/1382] Fix lint error

---
 types/react-sortable-hoc/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/react-sortable-hoc/index.d.ts b/types/react-sortable-hoc/index.d.ts
index 41eda5ce40..9963ebd69e 100644
--- a/types/react-sortable-hoc/index.d.ts
+++ b/types/react-sortable-hoc/index.d.ts
@@ -22,7 +22,7 @@ export type SortEventWithTag = SortEvent & {
   target: {
     tagName: string
   }
-}
+};
 
 export type SortStartHandler = (sort: SortStart, event: SortEvent) => void;
 

From dcb034264e9a90926ca1927f4bb24752947677a6 Mon Sep 17 00:00:00 2001
From: Sean Zhu <interestinglythere@gmail.com>
Date: Wed, 28 Feb 2018 17:52:24 -0800
Subject: [PATCH 0144/1382] Update "compact" in underscore/index.d.ts

See https://github.com/DefinitelyTyped/DefinitelyTyped/blob/81b3b60696aeb6cab25c323219483f7fcf9c30ce/types/lodash/common/array.d.ts#L50
---
 types/underscore/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/underscore/index.d.ts b/types/underscore/index.d.ts
index 72a2c23c33..8822deca98 100644
--- a/types/underscore/index.d.ts
+++ b/types/underscore/index.d.ts
@@ -856,7 +856,7 @@ declare module _ {
         * @param array Array to compact.
         * @return Copy of `array` without false values.
         **/
-        compact<T>(array: _.List<T>): T[];
+        compact<T>(array: _.List<T | null | undefined | false | "" | 0> | null | undefined): T[]
 
         /**
         * Flattens a nested array (the nesting can be to any depth). If you pass shallow, the array will

From 86b92bacb833930494f6564b5cce1c108b76cc02 Mon Sep 17 00:00:00 2001
From: Anton Vasin <antonvasin@me.com>
Date: Wed, 28 Feb 2018 18:57:16 +0300
Subject: [PATCH 0145/1382] Add legacy aliases to grid-styled

---
 types/grid-styled/index.d.ts | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/types/grid-styled/index.d.ts b/types/grid-styled/index.d.ts
index bea89b9237..dec3fd34f2 100644
--- a/types/grid-styled/index.d.ts
+++ b/types/grid-styled/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for grid-styled 3.0
+// Type definitions for grid-styled 3.2
 // Project: https://github.com/jxnblk/grid-styled
 // Definitions by: Anton Vasin <https://github.com/antonvasin>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -44,9 +44,14 @@ export interface BoxProps
 }
 
 export interface FlexProps extends BoxProps {
-    align: ResponsiveProp | boolean;
-    justify: ResponsiveProp | boolean;
-    flexDirection: ResponsiveProp | boolean;
+    alignItems: ResponsiveProp;
+    justifyContent: ResponsiveProp;
+    flexDirection: ResponsiveProp;
+    flexWrap: ResponsiveProp;
+
+    // legacy aliases https://github.com/jxnblk/styled-system/releases/tag/v2.0.0
+    justify: ResponsiveProp;
+    align: ResponsiveProp;
     wrap: ResponsiveProp | boolean;
 }
 

From 9760b4ae7901e8d934907d90c689871b7014d8c3 Mon Sep 17 00:00:00 2001
From: Adrian Leonhard <adrianleonhard@gmail.com>
Date: Thu, 1 Mar 2018 10:49:33 +0100
Subject: [PATCH 0146/1382] [chroma-js] fix bug with Scale.colors.

---
 types/chroma-js/chroma-js-tests.ts | 9 +++++++++
 types/chroma-js/index.d.ts         | 8 ++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/types/chroma-js/chroma-js-tests.ts b/types/chroma-js/chroma-js-tests.ts
index 82cfb7274d..fdd1b5946b 100644
--- a/types/chroma-js/chroma-js-tests.ts
+++ b/types/chroma-js/chroma-js-tests.ts
@@ -1,3 +1,6 @@
+import { Color } from "chroma-js";
+import chroma = require("chroma-js");
+
 function test_chroma() {
     chroma('hotpink');
     chroma('#ff3399');
@@ -187,3 +190,9 @@ function test_types() {
     const color: chroma.Color = chroma('orange');
     const scale: chroma.Scale = chroma.scale('RdYlBu');
 }
+
+// the following should actually, pass, but TS can't disambiguate between a parameter
+// which is passed as undefined/null or not passed at all
+// const scaleColors1: Color[] = chroma.scale(['black', 'white']).colors(12);
+const scaleColors2: Color[] = chroma.scale(['black', 'white']).colors(12, null);
+const scaleColors3: Color[] = chroma.scale(['black', 'white']).colors(12, undefined);
diff --git a/types/chroma-js/index.d.ts b/types/chroma-js/index.d.ts
index c18484dc1f..797752c8ad 100644
--- a/types/chroma-js/index.d.ts
+++ b/types/chroma-js/index.d.ts
@@ -303,10 +303,10 @@ declare namespace chroma {
          * You can call scale.colors(n) to quickly grab `c` equi-distant colors from a color scale. If called with no
          * arguments, scale.colors returns the original array of colors used to create the scale.
          */
-        colors(c?: number, format?: 'hex' | 'name'): string[];
-        colors(c?: number, format?: null | 'alpha' | 'darken' | 'brighten' | 'saturate' | 'desaturate'): Color[];
-        colors(c?: number, format?: 'luminance' | 'temperature'): number[];
-        colors<K extends keyof ColorSpaces>(c?: number, format?: K): Array<ColorSpaces[K]>;
+        colors(c: number | undefined, format: undefined | null | 'alpha' | 'darken' | 'brighten' | 'saturate' | 'desaturate'): Color[];
+        colors(c: number | undefined, format: 'luminance' | 'temperature'): number[];
+        colors<K extends keyof ColorSpaces>(c: number | undefined, format: K): Array<ColorSpaces[K]>;
+        colors(c: number | undefined, format?: 'hex' | 'name'): string[];
 
         /**
          * If you want the scale function to return a distinct set of colors instead of a continuous gradient, you can

From 82c4eaf05cfcd5726b08196ed9f2cac3c52c50df Mon Sep 17 00:00:00 2001
From: Wayne Dela Cruz <ddwwcruz@gmail.com>
Date: Thu, 1 Mar 2018 19:36:20 +0800
Subject: [PATCH 0147/1382] Add or typing

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

diff --git a/types/mongodb/index.d.ts b/types/mongodb/index.d.ts
index cebf31e32c..4e79a66102 100644
--- a/types/mongodb/index.d.ts
+++ b/types/mongodb/index.d.ts
@@ -646,6 +646,7 @@ type FilterQuery<T> = {
         $ne?: T[P];
         $nin?: T[P][];
         $and?: (FilterQuery<T[P]> | T[P])[];
+        $or?: (FilterQuery<T[P]> | T[P])[];
         $not?: (FilterQuery<T[P]> | T[P])[] | T[P];
         $expr?: any;
         $jsonSchema?: any;

From 72a2a17d5f996e6d212338789578d9a5cffb488f Mon Sep 17 00:00:00 2001
From: Wayne Dela Cruz <ddwwcruz@gmail.com>
Date: Thu, 1 Mar 2018 19:37:06 +0800
Subject: [PATCH 0148/1382] Add support for all cases

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

diff --git a/types/mongodb/index.d.ts b/types/mongodb/index.d.ts
index 4e79a66102..3cdfdbcced 100644
--- a/types/mongodb/index.d.ts
+++ b/types/mongodb/index.d.ts
@@ -670,6 +670,7 @@ type FilterQuery<T> = {
         $bitsAllSet?: Object;
         $bitsAnyClear?: Object;
         $bitsAnySet?: Object;
+        [key: string]: any;
     };
 };
 

From e3a0c63975d5db48e3a7c3af79af1dc706fa2825 Mon Sep 17 00:00:00 2001
From: Wayne Dela Cruz <ddwwcruz@gmail.com>
Date: Thu, 1 Mar 2018 19:55:26 +0800
Subject: [PATCH 0149/1382] find method uses filter query

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

diff --git a/types/mongodb/index.d.ts b/types/mongodb/index.d.ts
index 3cdfdbcced..2b67462c7c 100644
--- a/types/mongodb/index.d.ts
+++ b/types/mongodb/index.d.ts
@@ -506,9 +506,9 @@ export interface Collection<TSchema = Default> {
     dropIndexes(callback?: MongoCallback<any>): void;
     dropIndexes(options: {session?: ClientSession, maxTimeMS?: number}, callback: MongoCallback<any>): void;
     /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#find */
-    find<T = TSchema>(query?: Object): Cursor<T>;
+    find<T = TSchema>(query?: FilterQuery<T>): Cursor<T>;
     /** @deprecated */
-    find<T = TSchema>(query: Object, options?: FindOneOptions): Cursor<T>;
+    find<T = TSchema>(query: FilterQuery<T>, options?: FindOneOptions): Cursor<T>;
     /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#findOne */
     findOne<T = TSchema>(filter: FilterQuery<TSchema>, callback: MongoCallback<T | null>): void;
     findOne<T = TSchema>(filter: FilterQuery<TSchema>, options?: FindOneOptions): Promise<T | null>;

From c04a3e7179dd45dc0f42580670ecc50a9fa7b152 Mon Sep 17 00:00:00 2001
From: Wayne Dela Cruz <ddwwcruz@gmail.com>
Date: Thu, 1 Mar 2018 21:02:08 +0800
Subject: [PATCH 0150/1382] Add some tests

---
 types/mongodb/mongodb-tests.ts | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/types/mongodb/mongodb-tests.ts b/types/mongodb/mongodb-tests.ts
index 36428d786f..852522aadc 100644
--- a/types/mongodb/mongodb-tests.ts
+++ b/types/mongodb/mongodb-tests.ts
@@ -98,4 +98,19 @@ MongoClient.connect('mongodb://127.0.0.1:27017/test', options, function (err: mo
         type payment = typeof payment;
         let cursor: mongodb.AggregationCursor<payment> = collection.aggregate<payment>([{}])
     }
+
+    // test for new typings
+    {
+        type TestCollection = {
+            stringField: string;
+            numberField: number;
+        };
+        let testCollection = db.collection<TestCollection>('testCollection');
+
+        testCollection.find({
+            numberField: {
+                $and: [{ $gt: 0, $lt: 100 }]
+            }
+        });
+    }
 })

From 07eb4e8a70f1ae23d37d283f0c33bd41c9f433f0 Mon Sep 17 00:00:00 2001
From: James Garbutt <43081j@users.noreply.github.com>
Date: Thu, 1 Mar 2018 15:59:23 +0000
Subject: [PATCH 0151/1382] ace: fix tokeninfo types

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

diff --git a/types/ace/index.d.ts b/types/ace/index.d.ts
index 822c394a32..1f7dd9752b 100644
--- a/types/ace/index.d.ts
+++ b/types/ace/index.d.ts
@@ -52,6 +52,10 @@ declare namespace AceAjax {
     export interface TokenInfo {
 
         value: string;
+
+        index?: number;
+
+        start?: number;
     }
 
     export interface Position {
@@ -575,7 +579,7 @@ declare namespace AceAjax {
          * @param row The row number to retrieve from
          * @param column The column number to retrieve from
         **/
-        getTokenAt(row: number, column: number): TokenInfo;
+        getTokenAt(row: number, column: number): TokenInfo|null;
 
         /**
          * Sets the undo manager.

From d764612c2b193af303e6e22f4c2be797aaf1ad2f Mon Sep 17 00:00:00 2001
From: Chad Johnston <cjohnston@megatome.com>
Date: Thu, 1 Mar 2018 10:18:10 -0700
Subject: [PATCH 0152/1382] Add line to PR template calling out tests.

Add a specific line to make it more explicit that adding/editing tests is an expected part of changes.
---
 .github/PULL_REQUEST_TEMPLATE.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 4217471f9d..79793c16c1 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -2,6 +2,7 @@ Please fill in this template.
 
 - [ ] Use a meaningful title for the pull request. Include the name of the package modified.
 - [ ] Test the change in your own code. (Compile and run.)
+- [ ] Add or edit tests to reflect the change. (Run with `npm test`.)
 - [ ] Follow the advice from the [readme](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/README.md#make-a-pull-request).
 - [ ] Avoid [common mistakes](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/README.md#common-mistakes).
 - [ ] Run `npm run lint package-name` (or `tsc` if no `tslint.json` is present).

From 47262025cff6a01dce5ee5e3e4b22d4f3c021240 Mon Sep 17 00:00:00 2001
From: Curtis Hawthorne <fjord@google.com>
Date: Thu, 1 Mar 2018 09:52:57 -0800
Subject: [PATCH 0153/1382] remove need for ts 2.2

---
 types/cwise-parser/index.d.ts    | 1 -
 types/tape/index.d.ts            | 1 -
 types/tape/tape-tests.ts         | 1 -
 types/typedarray-pool/index.d.ts | 1 -
 4 files changed, 4 deletions(-)

diff --git a/types/cwise-parser/index.d.ts b/types/cwise-parser/index.d.ts
index f2f9dea473..d2a06fd7f1 100644
--- a/types/cwise-parser/index.d.ts
+++ b/types/cwise-parser/index.d.ts
@@ -2,7 +2,6 @@
 // Project: https://github.com/scijs/cwise-parser#readme
 // Definitions by: taoqf <https://github.com/taoqf>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
 
 declare namespace cwise_parser {
 	interface CompiledArgument {
diff --git a/types/tape/index.d.ts b/types/tape/index.d.ts
index cb087b415a..936f2ac491 100644
--- a/types/tape/index.d.ts
+++ b/types/tape/index.d.ts
@@ -5,7 +5,6 @@
 //                 Dennis Schwartz <https://github.com/DennisSchwartz>
 //                 Michael Henretty <https://github.com/mikehenrty>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
 
 /// <reference types="node" />
 
diff --git a/types/tape/tape-tests.ts b/types/tape/tape-tests.ts
index 5b86ef31f7..0c67629f58 100644
--- a/types/tape/tape-tests.ts
+++ b/types/tape/tape-tests.ts
@@ -31,7 +31,6 @@ htest = tape.createHarness();
 class CustomException extends Error {
   constructor(message?: string) {
     super(message);
-    Object.setPrototypeOf(this, new.target.prototype);
   }
 }
 
diff --git a/types/typedarray-pool/index.d.ts b/types/typedarray-pool/index.d.ts
index 9b3ae99b1f..34bcc7adf7 100644
--- a/types/typedarray-pool/index.d.ts
+++ b/types/typedarray-pool/index.d.ts
@@ -2,7 +2,6 @@
 // Project: https://github.com/mikolalysenko/typedarray-pool
 // Definitions by: Giff Song <https://github.com/pawsong>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
 
 type DataType =
     'uint8' | 'uint16' | 'uint32' | 'int8' | 'int16' | 'int32' |

From e8c0f80ed3de50c6d2e722c1de4c40ee52591c38 Mon Sep 17 00:00:00 2001
From: Dennis George <dennispg@gmail.com>
Date: Thu, 1 Mar 2018 15:29:39 -0600
Subject: [PATCH 0154/1382] added SplitChunkPlugin

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

diff --git a/types/webpack/index.d.ts b/types/webpack/index.d.ts
index 1386d9c69a..58333632cd 100644
--- a/types/webpack/index.d.ts
+++ b/types/webpack/index.d.ts
@@ -967,6 +967,10 @@ declare namespace webpack {
         constructor(definitions: { [key: string]: any });
     }
 
+    class SplitChunksPlugin extends Plugin {
+        constructor(options?: Options.SplitChunksOptions);
+    }
+
     class SourceMapDevToolPlugin extends Plugin {
         constructor(options?: null | false | string | SourceMapDevToolPlugin.Options);
     }
diff --git a/types/webpack/webpack-tests.ts b/types/webpack/webpack-tests.ts
index ca8249b039..46a9fb0ca0 100644
--- a/types/webpack/webpack-tests.ts
+++ b/types/webpack/webpack-tests.ts
@@ -578,3 +578,5 @@ configuration = {
         portableRecords: true
     }
 };
+
+plugin = new webpack.SplitChunksPlugin({ chunks: "async", minChunks: 2 });

From e5472a24cf3f71113bd3043aa383c4c3941ec3cb Mon Sep 17 00:00:00 2001
From: Arturas Molcanovas <a.molcanovas@gmail.com>
Date: Thu, 1 Mar 2018 22:29:57 +0000
Subject: [PATCH 0155/1382] add stream-to-promise pkg

Signed-off-by: Arturas Molcanovas <a.molcanovas@gmail.com>
---
 types/stream-to-promise/index.d.ts            | 23 +++++++++++++++++++
 .../stream-to-promise-tests.ts                |  8 +++++++
 types/stream-to-promise/tsconfig.json         | 23 +++++++++++++++++++
 types/stream-to-promise/tslint.json           |  1 +
 4 files changed, 55 insertions(+)
 create mode 100644 types/stream-to-promise/index.d.ts
 create mode 100644 types/stream-to-promise/stream-to-promise-tests.ts
 create mode 100644 types/stream-to-promise/tsconfig.json
 create mode 100644 types/stream-to-promise/tslint.json

diff --git a/types/stream-to-promise/index.d.ts b/types/stream-to-promise/index.d.ts
new file mode 100644
index 0000000000..09ca3a5ca3
--- /dev/null
+++ b/types/stream-to-promise/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for stream-to-promise 2.2
+// Project: https://github.com/bendrucker/stream-to-promise
+// Definitions by: Alorel <https://github.com/Alorel>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+/**
+ * Return a promise which resolves when the input stream ends
+ * @param stream The input stream
+ * @returns A promise containing the stream output as a buffer
+ */
+declare function streamToPromise(stream: NodeJS.ReadableStream): Promise<Buffer>;
+
+/**
+ * Return s promise which resolves when the input stream ends
+ * @param stream The input stream
+ */
+declare function streamToPromise(stream: NodeJS.WritableStream): Promise<void>;
+
+declare namespace streamToPromise {} // Add a namespace so we can do import * instead of import x = require()
+
+export = streamToPromise;
diff --git a/types/stream-to-promise/stream-to-promise-tests.ts b/types/stream-to-promise/stream-to-promise-tests.ts
new file mode 100644
index 0000000000..95ce74b3aa
--- /dev/null
+++ b/types/stream-to-promise/stream-to-promise-tests.ts
@@ -0,0 +1,8 @@
+import * as stp from 'stream-to-promise';
+import * as fs from 'fs';
+
+const read = fs.createReadStream(__filename);
+const write = fs.createWriteStream(__filename);
+
+const read$: Promise<Buffer> = stp(read);
+const write$: Promise<void> = stp(write);
diff --git a/types/stream-to-promise/tsconfig.json b/types/stream-to-promise/tsconfig.json
new file mode 100644
index 0000000000..c8a17b114c
--- /dev/null
+++ b/types/stream-to-promise/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "stream-to-promise-tests.ts"
+    ]
+}
diff --git a/types/stream-to-promise/tslint.json b/types/stream-to-promise/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/stream-to-promise/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From a5d521c242fcf8f36f9d9ffc0689a00c2faba0b3 Mon Sep 17 00:00:00 2001
From: bang <sqibang@gmail.com>
Date: Fri, 2 Mar 2018 09:25:40 +0800
Subject: [PATCH 0156/1382] refactor(inquirer):generic type

---
 types/inquirer/index.d.ts        |  46 ++--
 types/inquirer/inquirer-tests.ts | 456 +++++++++++++++++--------------
 2 files changed, 274 insertions(+), 228 deletions(-)

diff --git a/types/inquirer/index.d.ts b/types/inquirer/index.d.ts
index 32c54fa99e..530d3c63cd 100644
--- a/types/inquirer/index.d.ts
+++ b/types/inquirer/index.d.ts
@@ -1,18 +1,23 @@
+// TypeScript Version: 2.3
 // Type definitions for Inquirer.js
 // Project: https://github.com/SBoudrias/Inquirer.js
 // Definitions by: Qubo <https://github.com/tkQubo>
 //                 Parvez <https://github.com/ppathan>
 //                 Jouderian <https://github.com/jouderianjr>
+//                 Qibang <https://github.com/bang88>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="rx" />
 
-import through = require('through');
+import through = require("through");
 
 declare namespace inquirer {
     type Prompts = { [name: string]: PromptModule };
     type ChoiceType = string | objects.ChoiceOption | objects.Separator;
-    type Questions = Question | Question[] | Rx.Observable<Question>;
+    type Questions<T> =
+        | Question<T>
+        | Question<T>[]
+        | Rx.Observable<Question<T>>;
 
     interface Inquirer {
         restoreDefaultPrompts(): void;
@@ -32,19 +37,19 @@ declare namespace inquirer {
          * @param cb Callback being passed the user answers
          * @return
          */
-        prompt(questions: Questions, cb: (answers: Answers) => any): ui.Prompt;
-        prompt(questions: Questions): Promise<Answers>;
+        prompt<T>(questions: Questions<T>, cb: (answers: T) => any): ui.Prompt;
+        prompt<T>(questions: Questions<T>): Promise<T>;
         prompts: Prompts;
         Separator: objects.SeparatorStatic;
         ui: {
             BottomBar: ui.BottomBar;
             Prompt: ui.Prompt;
-        }
+        };
     }
 
     interface PromptModule {
-        (questions: Questions): Promise<Answers>;
-        (questions: Questions, cb: (answers: Answers) => any): ui.Prompt;
+        <T>(questions: Questions<T>): Promise<T>;
+        <T>(questions: Questions<T>, cb: (answers: T) => any): ui.Prompt;
         /**
          * Register a prompt type
          * @param name Prompt type name
@@ -57,7 +62,7 @@ declare namespace inquirer {
         restoreDefaultPrompts(): void;
     }
 
-    interface Question {
+    interface Question<T = Answers> {
         /**
          * Type of the prompt.
          * Possible values:
@@ -79,24 +84,24 @@ declare namespace inquirer {
          * The question to print. If defined as a function,
          * the first parameter will be the current inquirer session answers.
          */
-        message?: string | ((answers: Answers) => string);
+        message?: string | ((answers: T) => string);
         /**
          * Default value(s) to use if nothing is entered, or a function that returns the default value(s).
          * If defined as a function, the first parameter will be the current inquirer session answers.
          */
-        default?: any | ((answers: Answers) => any);
+        default?: any | ((answers: T) => any);
         /**
          * Choices array or a function returning a choices array. If defined as a function,
          * the first parameter will be the current inquirer session answers.
          * Array values can be simple strings, or objects containing a name (to display) and a value properties
          * (to save in the answers hash). Values can also be a Separator.
          */
-        choices?: ChoiceType[] | ((answers: Answers) => ChoiceType[]);
+        choices?: ChoiceType[] | ((answers: T) => ChoiceType[]);
         /**
          * Receive the user input and should return true if the value is valid, and an error message (String)
          * otherwise. If false is returned, a default error message is provided.
          */
-        validate?(input: string, answers?: Answers): boolean | string;
+        validate?(input: string, answers?: T): boolean | string;
         /**
          * Receive the user input and return the filtered value to be used inside the program.
          * The value returned will be added to the Answers hash.
@@ -106,7 +111,7 @@ declare namespace inquirer {
          * Receive the current user answers hash and should return true or false depending on whether or
          * not this question should be asked. The value can also be a simple boolean.
          */
-        when?: boolean | ((answers: Answers) => boolean);
+        when?: boolean | ((answers: T) => boolean);
         paginated?: boolean;
         /**
          * Change the number of lines that will be rendered when using list, rawList, expand or checkbox.
@@ -143,10 +148,10 @@ declare namespace inquirer {
              * Once all prompt are over
              */
             onCompletion(): void;
-            processQuestion(question: Question): any;
-            fetchAnswer(question: Question): any;
-            setDefaultType(question: Question): any;
-            filterIfRunnable(question: Question): any;
+            processQuestion<T>(question: Question<T>): any;
+            fetchAnswer<T>(question: Question<T>): any;
+            setDefaultType<T>(question: Question<T>): any;
+            filterIfRunnable<T>(question: Question<T>): any;
         }
 
         /**
@@ -237,7 +242,7 @@ declare namespace inquirer {
             extra?: any;
             key?: string;
             checked?: boolean;
-            disabled?: string | ((answers: Answers) => any);
+            disabled?: string | (<T = Answers>(answers: T) => any);
         }
 
         /**
@@ -247,7 +252,10 @@ declare namespace inquirer {
          * @param choices  All `choice` to keep in the collection
          */
         interface Choices {
-            new (choices: (string | Separator | ChoiceOption)[], answers?: Answers): Choices;
+            new <T = Answers>(
+                choices: (string | Separator | ChoiceOption)[],
+                answers?: T
+            ): Choices;
             choices: Choice[];
             realChoices: Choice[];
             length: number;
diff --git a/types/inquirer/inquirer-tests.ts b/types/inquirer/inquirer-tests.ts
index 4a43dcc98e..bd1d6a5ac4 100644
--- a/types/inquirer/inquirer-tests.ts
+++ b/types/inquirer/inquirer-tests.ts
@@ -1,9 +1,13 @@
-import inquirer = require('inquirer');
+import inquirer = require("inquirer");
 
-
-inquirer.prompt([/* Pass your questions in here */], function( answers: inquirer.Answers ) {
-    // Use user feedback for... whatever!!
-});
+inquirer.prompt(
+    [
+        /* Pass your questions in here */
+    ],
+    function(answers: inquirer.Answers) {
+        // Use user feedback for... whatever!!
+    }
+);
 
 //
 // examples/bottom-bar.js
@@ -13,29 +17,25 @@ inquirer.prompt([/* Pass your questions in here */], function( answers: inquirer
 var BottomBar = inquirer.ui.BottomBar;
 declare var cmdify: any;
 
-var loader = [
-    "/ Installing",
-    "| Installing",
-    "\\ Installing",
-    "- Installing"
-];
+var loader = ["/ Installing", "| Installing", "\\ Installing", "- Installing"];
 var i = 4;
 var ui = new BottomBar({ bottomBar: loader[i % 4] });
 
 setInterval(function() {
-    ui.updateBottomBar( loader[i++ % 4] );
-}, 300 );
+    ui.updateBottomBar(loader[i++ % 4]);
+}, 300);
 
 var spawn = require("child_process").spawn;
 
-var cmd = spawn(cmdify("npm"), [ "-g", "install", "inquirer" ], { stdio: "pipe" });
-cmd.stdout.pipe( ui.log );
-cmd.on( "close", function() {
+var cmd = spawn(cmdify("npm"), ["-g", "install", "inquirer"], {
+    stdio: "pipe"
+});
+cmd.stdout.pipe(ui.log);
+cmd.on("close", function() {
     ui.updateBottomBar("Installation done!\n");
     process.exit();
 });
 
-
 //
 // examples/checkbox.js
 //
@@ -47,49 +47,51 @@ cmd.on( "close", function() {
 "use strict";
 //var inquirer = require("../lib/inquirer");
 
-inquirer.prompt([
-    {
-        type: "checkbox",
-        message: "Select toppings",
-        name: "toppings",
-        choices: [
-            new inquirer.Separator("The usual:"),
-            {
-                name: "Pepperoni"
-            },
-            {
-                name: "Cheese",
-                checked: true
-            },
-            {
-                name: "Mushroom"
-            },
-            new inquirer.Separator("The extras:"),
-            {
-                name: "Pineapple",
-            },
-            {
-                name: "Bacon"
-            },
-            {
-                name: "Olives",
-                disabled: "out of stock"
-            },
-            {
-                name: "Extra cheese"
+inquirer.prompt<{ toppings: string }>(
+    [
+        {
+            type: "checkbox",
+            message: "Select toppings",
+            name: "toppings",
+            choices: [
+                new inquirer.Separator("The usual:"),
+                {
+                    name: "Pepperoni"
+                },
+                {
+                    name: "Cheese",
+                    checked: true
+                },
+                {
+                    name: "Mushroom"
+                },
+                new inquirer.Separator("The extras:"),
+                {
+                    name: "Pineapple"
+                },
+                {
+                    name: "Bacon"
+                },
+                {
+                    name: "Olives",
+                    disabled: "out of stock"
+                },
+                {
+                    name: "Extra cheese"
+                }
+            ],
+            validate: function(answer) {
+                if (answer.length < 1) {
+                    return "You must choose at least one topping.";
+                }
+                return true;
             }
-        ],
-        validate: function( answer ) {
-            if ( answer.length < 1 ) {
-                return "You must choose at least one topping.";
-            }
-            return true;
         }
+    ],
+    function(answers) {
+        console.log(JSON.stringify(answers, null, "  "));
     }
-], function( answers: inquirer.Answers ) {
-    console.log( JSON.stringify(answers, null, "  ") );
-});
-
+);
 
 //
 // examples/expand.js
@@ -102,39 +104,41 @@ inquirer.prompt([
 "use strict";
 //var inquirer = require("../lib/inquirer");
 
-inquirer.prompt([
-    {
-        type: "expand",
-        message: "Conflict on `file.js`: ",
-        name: "overwrite",
-        choices: [
-            {
-                key: "y",
-                name: "Overwrite",
-                value: "overwrite"
-            },
-            {
-                key: "a",
-                name: "Overwrite this one and all next",
-                value: "overwrite_all"
-            },
-            {
-                key: "d",
-                name: "Show diff",
-                value: "diff"
-            },
-            new inquirer.Separator(),
-            {
-                key: "x",
-                name: "Abort",
-                value: "abort"
-            }
-        ]
+inquirer.prompt(
+    [
+        {
+            type: "expand",
+            message: "Conflict on `file.js`: ",
+            name: "overwrite",
+            choices: [
+                {
+                    key: "y",
+                    name: "Overwrite",
+                    value: "overwrite"
+                },
+                {
+                    key: "a",
+                    name: "Overwrite this one and all next",
+                    value: "overwrite_all"
+                },
+                {
+                    key: "d",
+                    name: "Show diff",
+                    value: "diff"
+                },
+                new inquirer.Separator(),
+                {
+                    key: "x",
+                    name: "Abort",
+                    value: "abort"
+                }
+            ]
+        }
+    ],
+    function(answers: inquirer.Answers) {
+        console.log(JSON.stringify(answers, null, "  "));
     }
-], function( answers: inquirer.Answers ) {
-    console.log( JSON.stringify(answers, null, "  ") );
-});
-
+);
 
 //
 // examples/input.js
@@ -152,21 +156,25 @@ var questions = [
         type: "input",
         name: "first_name",
         message: "What's your first name",
-        prefix: "1 - ",
+        prefix: "1 - "
     },
     {
         type: "input",
         name: "last_name",
         message: "What's your last name",
-        default: function () { return "Doe"; },
+        default: function() {
+            return "Doe";
+        },
         suffix: "!!"
     },
     {
         type: "input",
         name: "phone",
         message: "What's your phone number",
-        validate: function( value: string ): string|boolean {
-            var pass = value.match(/^([01]{1})?[\-\.\s]?\(?(\d{3})\)?[\-\.\s]?(\d{3})[\-\.\s]?(\d{4})\s?((?:#|ext\.?\s?|x\.?\s?){1}(?:\d+)?)?$/i);
+        validate: function(value: string): string | boolean {
+            var pass = value.match(
+                /^([01]{1})?[\-\.\s]?\(?(\d{3})\)?[\-\.\s]?(\d{3})[\-\.\s]?(\d{4})\s?((?:#|ext\.?\s?|x\.?\s?){1}(?:\d+)?)?$/i
+            );
             if (pass) {
                 return true;
             } else {
@@ -176,15 +184,14 @@ var questions = [
     }
 ];
 
-inquirer.prompt( questions, function( answers ) {
-    console.log( JSON.stringify(answers, null, "  ") );
+inquirer.prompt(questions, function(answers) {
+    console.log(JSON.stringify(answers, null, "  "));
 });
 
 //
 // examples/list.js
 //
 
-
 /**
  * List prompt example
  */
@@ -192,29 +199,34 @@ inquirer.prompt( questions, function( answers ) {
 "use strict";
 //var inquirer = require("../lib/inquirer");
 
-inquirer.prompt([
-    {
-        type: "list",
-        name: "theme",
-        message: "What do you want to do?",
-        choices: [
-            "Order a pizza",
-            "Make a reservation",
-            new inquirer.Separator(),
-            "Ask opening hours",
-            "Talk to the receptionist"
-        ]
-    },
-    {
-        type: "list",
-        name: "size",
-        message: "What size do you need",
-        choices: [ "Jumbo", "Large", "Standard", "Medium", "Small", "Micro" ],
-        filter: function( val: string ) { return val.toLowerCase(); }
+inquirer.prompt(
+    [
+        {
+            type: "list",
+            name: "theme",
+            message: "What do you want to do?",
+            choices: [
+                "Order a pizza",
+                "Make a reservation",
+                new inquirer.Separator(),
+                "Ask opening hours",
+                "Talk to the receptionist"
+            ]
+        },
+        {
+            type: "list",
+            name: "size",
+            message: "What size do you need",
+            choices: ["Jumbo", "Large", "Standard", "Medium", "Small", "Micro"],
+            filter: function(val: string) {
+                return val.toLowerCase();
+            }
+        }
+    ],
+    function(answers: inquirer.Answers) {
+        console.log(JSON.stringify(answers, null, "  "));
     }
-], function( answers: inquirer.Answers ) {
-    console.log( JSON.stringify(answers, null, "  ") );
-});
+);
 
 //
 // examples/long-list.js
@@ -227,30 +239,35 @@ inquirer.prompt([
 "use strict";
 //var inquirer = require("../lib/inquirer");
 
-var choices = Array.apply(0, new Array(26)).map(function(x: number,y: number) {
+var choices = Array.apply(0, new Array(26)).map(function(x: number, y: number) {
     return String.fromCharCode(y + 65);
 });
 choices.push("Multiline option \n  super cool feature");
-choices.push("Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium.");
+choices.push(
+    "Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium."
+);
 
-inquirer.prompt([
-    {
-        type      : "list",
-        name      : "letter",
-        message   : "What's your favorite letter?",
-        paginated : true,
-        choices   : choices
-    },
-    {
-        type      : "checkbox",
-        name      : "name",
-        message   : "Select the letter contained in your name:",
-        paginated : true,
-        choices   : choices
+inquirer.prompt(
+    [
+        {
+            type: "list",
+            name: "letter",
+            message: "What's your favorite letter?",
+            paginated: true,
+            choices: choices
+        },
+        {
+            type: "checkbox",
+            name: "name",
+            message: "Select the letter contained in your name:",
+            paginated: true,
+            choices: choices
+        }
+    ],
+    function(answers: inquirer.Answers) {
+        console.log(JSON.stringify(answers, null, "  "));
     }
-], function( answers: inquirer.Answers ) {
-    console.log( JSON.stringify(answers, null, "  ") );
-});
+);
 
 //
 // examples/nested-call.js
@@ -263,19 +280,22 @@ inquirer.prompt([
 "use strict";
 //var inquirer = require("../lib/inquirer");
 
-inquirer.prompt({
-    type: "list",
-    name: "chocolate",
-    message: "What's your favorite chocolate?",
-    choices: [ "Mars", "Oh Henry", "Hershey" ]
-}, function( answers: inquirer.Answers ) {
-    inquirer.prompt({
+inquirer.prompt(
+    {
         type: "list",
-        name: "beverage",
-        message: "And your favorite beverage?",
-        choices: [ "Pepsi", "Coke", "7up", "Mountain Dew", "Red Bull" ]
-    });
-});
+        name: "chocolate",
+        message: "What's your favorite chocolate?",
+        choices: ["Mars", "Oh Henry", "Hershey"]
+    },
+    function(answers: inquirer.Answers) {
+        inquirer.prompt({
+            type: "list",
+            name: "beverage",
+            message: "And your favorite beverage?",
+            choices: ["Pepsi", "Coke", "7up", "Mountain Dew", "Red Bull"]
+        });
+    }
+);
 
 //
 // examples/password.js
@@ -288,15 +308,18 @@ inquirer.prompt({
 "use strict";
 //var inquirer = require("../lib/inquirer");
 
-inquirer.prompt([
-    {
-        type: "password",
-        message: "Enter your git password",
-        name: "password"
+inquirer.prompt(
+    [
+        {
+            type: "password",
+            message: "Enter your git password",
+            name: "password"
+        }
+    ],
+    function(answers: inquirer.Answers) {
+        console.log(JSON.stringify(answers, null, "  "));
     }
-], function( answers: inquirer.Answers ) {
-    console.log( JSON.stringify(answers, null, "  ") );
-});
+);
 
 //
 // examples/pizza.js
@@ -323,8 +346,10 @@ var questions2 = [
         type: "input",
         name: "phone",
         message: "What's your phone number",
-        validate: function( value: string ): string|boolean {
-            var pass = value.match(/^([01]{1})?[\-\.\s]?\(?(\d{3})\)?[\-\.\s]?(\d{3})[\-\.\s]?(\d{4})\s?((?:#|ext\.?\s?|x\.?\s?){1}(?:\d+)?)?$/i);
+        validate: function(value: string): string | boolean {
+            var pass = value.match(
+                /^([01]{1})?[\-\.\s]?\(?(\d{3})\)?[\-\.\s]?(\d{3})[\-\.\s]?(\d{4})\s?((?:#|ext\.?\s?|x\.?\s?){1}(?:\d+)?)?$/i
+            );
             if (pass) {
                 return true;
             } else {
@@ -336,14 +361,16 @@ var questions2 = [
         type: "list",
         name: "size",
         message: "What size do you need",
-        choices: [ "Large", "Medium", "Small" ],
-        filter: function( val: string ) { return val.toLowerCase(); }
+        choices: ["Large", "Medium", "Small"],
+        filter: function(val: string) {
+            return val.toLowerCase();
+        }
     },
     {
         type: "input",
         name: "quantity",
         message: "How many do you need",
-        validate: function( value: string ) {
+        validate: function(value: string) {
             var valid = !isNaN(parseFloat(value));
             return valid || "Please enter a number";
         },
@@ -375,7 +402,7 @@ var questions2 = [
         type: "rawlist",
         name: "beverage",
         message: "You also get a free 2L beverage",
-        choices: [ "Pepsi", "7up", "Coke" ]
+        choices: ["Pepsi", "7up", "Coke"]
     },
     {
         type: "input",
@@ -387,16 +414,16 @@ var questions2 = [
         type: "list",
         name: "prize",
         message: "For leaving a comments, you get a freebie",
-        choices: [ "cake", "fries" ],
-        when: function( answers: inquirer.Answers ) {
-            return answers['comments'] !== "Nope, all good!";
+        choices: ["cake", "fries"],
+        when: function(answers: inquirer.Answers) {
+            return answers["comments"] !== "Nope, all good!";
         }
     }
 ];
 
-inquirer.prompt( questions, function( answers ) {
+inquirer.prompt(questions, function(answers) {
     console.log("\nOrder receipt:");
-    console.log( JSON.stringify(answers, null, "  ") );
+    console.log(JSON.stringify(answers, null, "  "));
 });
 
 //
@@ -410,29 +437,34 @@ inquirer.prompt( questions, function( answers ) {
 "use strict";
 //var inquirer = require("../lib/inquirer");
 
-inquirer.prompt([
-    {
-        type: "rawlist",
-        name: "theme",
-        message: "What do you want to do?",
-        choices: [
-            "Order a pizza",
-            "Make a reservation",
-            new inquirer.Separator(),
-            "Ask opening hours",
-            "Talk to the receptionist"
-        ]
-    },
-    {
-        type: "rawlist",
-        name: "size",
-        message: "What size do you need",
-        choices: [ "Jumbo", "Large", "Standard", "Medium", "Small", "Micro" ],
-        filter: function( val: string ) { return val.toLowerCase(); }
+inquirer.prompt(
+    [
+        {
+            type: "rawlist",
+            name: "theme",
+            message: "What do you want to do?",
+            choices: [
+                "Order a pizza",
+                "Make a reservation",
+                new inquirer.Separator(),
+                "Ask opening hours",
+                "Talk to the receptionist"
+            ]
+        },
+        {
+            type: "rawlist",
+            name: "size",
+            message: "What size do you need",
+            choices: ["Jumbo", "Large", "Standard", "Medium", "Small", "Micro"],
+            filter: function(val: string) {
+                return val.toLowerCase();
+            }
+        }
+    ],
+    function(answers: inquirer.Answers) {
+        console.log(JSON.stringify(answers, null, "  "));
     }
-], function( answers: inquirer.Answers ) {
-    console.log( JSON.stringify(answers, null, "  ") );
-});
+);
 
 //
 // examples/recursive.js
@@ -445,7 +477,7 @@ inquirer.prompt([
 
 "use strict";
 //var inquirer = require("../lib/inquirer");
-var output2: (string|boolean)[] = [];
+var output2: (string | boolean)[] = [];
 
 var questions3 = [
     {
@@ -456,18 +488,21 @@ var questions3 = [
     {
         type: "confirm",
         name: "askAgain",
-        message: "Want to enter another TV show favorite (just hit enter for YES)?",
+        message:
+            "Want to enter another TV show favorite (just hit enter for YES)?",
         default: true
     }
 ];
 
 function ask() {
-    inquirer.prompt( questions3, function( answers: inquirer.Answers ) {
-        output2.push( answers['tvShow'] );
-        if ( answers['askAgain'] ) {
+    inquirer.prompt<{ tvShow: string; askAgain: boolean }>(questions3, function(
+        answers
+    ) {
+        output2.push(answers.tvShow);
+        if (answers.askAgain) {
             ask();
         } else {
-            console.log( "Your favorite TV Shows:", output2.join(", ") );
+            console.log("Your favorite TV Shows:", output2.join(", "));
         }
     });
 }
@@ -478,14 +513,17 @@ ask();
 // examples/when.js
 //
 
-
 /**
  * When example
  */
 
 "use strict";
 //var inquirer = require("../lib/inquirer");
-
+interface Answers4 {
+    bacon: boolean;
+    favorite: string;
+    pizza: boolean;
+}
 var questions4 = [
     {
         type: "confirm",
@@ -496,32 +534,32 @@ var questions4 = [
         type: "input",
         name: "favorite",
         message: "Bacon lover, what is your favorite type of bacon?",
-        when: function ( answers: inquirer.Answers ) {
-            return answers['bacon'];
+        when: function(answers: Answers4) {
+            return answers.bacon;
         }
     },
     {
         type: "confirm",
         name: "pizza",
         message: "Ok... Do you like pizza?",
-        when: function (answers: inquirer.Answers) {
-            return !likesFood( "bacon" )(answers);
+        when: function(answers: Answers4) {
+            return !likesFood("bacon")(answers);
         }
     },
     {
         type: "input",
         name: "favorite",
         message: "Whew! What is your favorite type of pizza?",
-        when: likesFood( "pizza" )
+        when: likesFood("pizza")
     }
 ];
 
-function likesFood ( aFood: string ) {
-    return function ( answers: inquirer.Answers ) {
-        return answers[ aFood ];
-    }
+function likesFood(aFood: string) {
+    return function(answers: inquirer.Answers) {
+        return answers[aFood];
+    };
 }
 
-inquirer.prompt(questions, function (answers) {
-    console.log( JSON.stringify(answers, null, "  ") );
+inquirer.prompt<Answers4>(questions, function(answers) {
+    console.log(JSON.stringify(answers, null, "  "));
 });

From 1afde3032cd8eb0639598ddd99fdd208b15e3a5b Mon Sep 17 00:00:00 2001
From: bang <sqibang@gmail.com>
Date: Fri, 2 Mar 2018 09:32:21 +0800
Subject: [PATCH 0157/1382] fix: miss

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

diff --git a/types/inquirer/index.d.ts b/types/inquirer/index.d.ts
index 530d3c63cd..67d8fd29ac 100644
--- a/types/inquirer/index.d.ts
+++ b/types/inquirer/index.d.ts
@@ -1,4 +1,3 @@
-// TypeScript Version: 2.3
 // Type definitions for Inquirer.js
 // Project: https://github.com/SBoudrias/Inquirer.js
 // Definitions by: Qubo <https://github.com/tkQubo>
@@ -7,6 +6,7 @@
 //                 Qibang <https://github.com/bang88>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+// TypeScript Version: 2.3
 /// <reference types="rx" />
 
 import through = require("through");

From 3f4ada9cab39b6dff852fcd0c072fbdcbdfdcdc2 Mon Sep 17 00:00:00 2001
From: Almir Kadric <github@almirkadric.com>
Date: Fri, 2 Mar 2018 10:49:46 +0900
Subject: [PATCH 0158/1382] fixed according to PR comments

---
 types/react-router-native/index.d.ts | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/types/react-router-native/index.d.ts b/types/react-router-native/index.d.ts
index 600ac53ce9..b98759edf8 100644
--- a/types/react-router-native/index.d.ts
+++ b/types/react-router-native/index.d.ts
@@ -35,16 +35,10 @@ export interface LinkProps {
   replace?: boolean;
   style?: any;
   to: H.LocationDescriptor;
+  [propName: string]: any;
 }
 
-/**
- * Disable the "no-any-union" rule here as the Link component can accept any property.
- * It will feed them to the given component. However if we just use any we will lose
- * autocomplete on known properties. So it is better to disable this rule in this one
- * instance.
- */
-// tslint:disable-next-line:no-any-union
-export class Link extends React.Component<LinkProps | any> {}
+export class Link extends React.Component<LinkProps> {}
 
 export interface NativeRouterProps {
   initialEntries?: string[];

From c41775c81474078e1183e991898f522d69d44a09 Mon Sep 17 00:00:00 2001
From: dineshsaravanan <dkumaraswamy@zendesk.com>
Date: Wed, 28 Feb 2018 10:50:50 +0800
Subject: [PATCH 0159/1382] Add type definitions for datadog-tracer

---
 types/datadog-tracer/datadog-tracer-tests.ts |  9 ++++++++
 types/datadog-tracer/index.d.ts              | 24 ++++++++++++++++++++
 types/datadog-tracer/package.json            |  6 +++++
 types/datadog-tracer/tsconfig.json           | 23 +++++++++++++++++++
 types/datadog-tracer/tslint.json             |  6 +++++
 5 files changed, 68 insertions(+)
 create mode 100644 types/datadog-tracer/datadog-tracer-tests.ts
 create mode 100644 types/datadog-tracer/index.d.ts
 create mode 100644 types/datadog-tracer/package.json
 create mode 100644 types/datadog-tracer/tsconfig.json
 create mode 100644 types/datadog-tracer/tslint.json

diff --git a/types/datadog-tracer/datadog-tracer-tests.ts b/types/datadog-tracer/datadog-tracer-tests.ts
new file mode 100644
index 0000000000..b0fa4744b1
--- /dev/null
+++ b/types/datadog-tracer/datadog-tracer-tests.ts
@@ -0,0 +1,9 @@
+import Tracer = require('datadog-tracer');
+
+const tracer = new Tracer({
+    service: 'test'
+});
+
+tracer.on('error', (e: any) => {
+    void(0);
+});
diff --git a/types/datadog-tracer/index.d.ts b/types/datadog-tracer/index.d.ts
new file mode 100644
index 0000000000..e7a11245fe
--- /dev/null
+++ b/types/datadog-tracer/index.d.ts
@@ -0,0 +1,24 @@
+// Type definitions for datadog-tracer 0.4
+// Project: https://github.com/rochdev/datadog-tracer-js#readme
+// Definitions by: Dinesh Saravanan Kumaraswamy <https://github.com/dineshsaravanan>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+import * as opentracing from "opentracing";
+import { EventEmitter } from "events";
+
+export as namespace Tracer;
+export = Tracer;
+
+interface TracerOptions {
+    service: string;
+    hostname?: string;
+    port?: number;
+    protocol?: string;
+    endpoint?: string;
+}
+
+declare class Tracer extends opentracing.Tracer {
+    constructor(tracerOptions: TracerOptions);
+
+    on(method: "error", cb?: (e: any) => void): void;
+    addEventListener(method: "error", cb?: (e: any) => void): void;
+}
diff --git a/types/datadog-tracer/package.json b/types/datadog-tracer/package.json
new file mode 100644
index 0000000000..ce14cc9e91
--- /dev/null
+++ b/types/datadog-tracer/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "opentracing": "^0.14.1"
+    }
+}
diff --git a/types/datadog-tracer/tsconfig.json b/types/datadog-tracer/tsconfig.json
new file mode 100644
index 0000000000..f117daa17e
--- /dev/null
+++ b/types/datadog-tracer/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "datadog-tracer-tests.ts"
+    ]
+}
diff --git a/types/datadog-tracer/tslint.json b/types/datadog-tracer/tslint.json
new file mode 100644
index 0000000000..4c4fc86ace
--- /dev/null
+++ b/types/datadog-tracer/tslint.json
@@ -0,0 +1,6 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "strict-export-declare-modifiers": false
+    }
+}

From 9a9bc685ae2ed0ab4e474cb69a00be35b885647c Mon Sep 17 00:00:00 2001
From: Simon Schick <demwizzy@gmail.com>
Date: Fri, 2 Mar 2018 03:37:59 +0100
Subject: [PATCH 0160/1382] hapi-auth-jwt2: update to hapi 17

---
 types/hapi-auth-jwt2/hapi-auth-jwt2-tests.ts  |  43 +--
 types/hapi-auth-jwt2/index.d.ts               | 263 ++++++++++--------
 types/hapi-auth-jwt2/tsconfig.json            |  14 -
 types/hapi-auth-jwt2/tslint.json              |   7 +-
 .../hapi-auth-jwt2/v7/hapi-auth-jwt2-tests.ts |  38 +++
 types/hapi-auth-jwt2/v7/index.d.ts            | 132 +++++++++
 types/hapi-auth-jwt2/v7/tsconfig.json         |  40 +++
 types/hapi-auth-jwt2/v7/tslint.json           |   1 +
 8 files changed, 383 insertions(+), 155 deletions(-)
 create mode 100644 types/hapi-auth-jwt2/v7/hapi-auth-jwt2-tests.ts
 create mode 100644 types/hapi-auth-jwt2/v7/index.d.ts
 create mode 100644 types/hapi-auth-jwt2/v7/tsconfig.json
 create mode 100644 types/hapi-auth-jwt2/v7/tslint.json

diff --git a/types/hapi-auth-jwt2/hapi-auth-jwt2-tests.ts b/types/hapi-auth-jwt2/hapi-auth-jwt2-tests.ts
index fa28253a88..dedc9d81b4 100644
--- a/types/hapi-auth-jwt2/hapi-auth-jwt2-tests.ts
+++ b/types/hapi-auth-jwt2/hapi-auth-jwt2-tests.ts
@@ -1,8 +1,7 @@
-import Hapi = require('hapi');
-import hapiAuthJwt2 = require('hapi-auth-jwt2');
+import { Server } from 'hapi';
+import * as hapiAuthJwt2 from 'hapi-auth-jwt2';
 
-const server = new Hapi.Server();
-server.connection({port: 8000});
+const server = new Server({port: 8000});
 
 interface User {
   id: number;
@@ -20,19 +19,27 @@ const users: Users = {
   }
 };
 
-function validate(decoded: User, request: Hapi.Request, callback: hapiAuthJwt2.ValidateCallback) {
-  callback(null, !!users[decoded.id]);
-}
-
-server.register(hapiAuthJwt2, err => {
-  const options: hapiAuthJwt2.Options = {
-    key: 'NeverShareYourSecret',
-    validateFunc: validate,
-    verifyOptions: {
-      algorithms: ['HS256']
+server.register({
+    plugin: hapiAuthJwt2.plugin,
+    options: {
+        async verify() {
+            return {
+                isValid: true,
+            };
+        }
     }
-  };
-  server.auth.strategy('jwt', 'jwt', options);
+})
+.then(() => {
+    const opts: hapiAuthJwt2.Options = {
+        key: 'NeverShareYourSecret',
+        async validate(decoded: { id: number }, request) {
+            return {
+                isValid: !!users[decoded.id],
+            };
+        },
+        verifyOptions: {
+            algorithms: ['HS256']
+        }
+    };
+    server.auth.strategy('jwt', 'jwt', opts);
 });
-
-server.start();
diff --git a/types/hapi-auth-jwt2/index.d.ts b/types/hapi-auth-jwt2/index.d.ts
index 91e8ef931e..65ef647aca 100644
--- a/types/hapi-auth-jwt2/index.d.ts
+++ b/types/hapi-auth-jwt2/index.d.ts
@@ -1,132 +1,151 @@
-// Type definitions for hapi-auth-jwt2 7.0
+// Type definitions for hapi-auth-jwt2 8.0
 // Project: https://github.com/dwyl/hapi-auth-jwt2
 // Definitions by: Warren Seymour <https://github.com/warrenseymour>
+//                 Simon Schick <https://github.com/SimonSchick>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
-import { Request, Response, PluginFunction } from 'hapi';
+import { Request, ResponseObject, Plugin, ResponseToolkit } from 'hapi';
 
-declare namespace hapiAuthJwt2 {
-    /**
-     * A key lookup function
-     *
-     * @param decoded the *decoded* but *unverified* JWT received from client
-     * @param callback the key lookup callback
-     */
-    type KeyLookup = (decoded: any, callback: KeyLookupCallback) => void;
-
-    /**
-     * Called when key lookup function has completed
-     *
-     * @param err an internal error
-     * @param key the secret key
-     * @param extraInfo any additional information that you would like
-     * to use in `validateFunc` which can be accessed via
-     * `request.plugins['hapi-auth-jwt2'].extraInfo`
-     */
-    type KeyLookupCallback = (err: any, key: string, extraInfo?: any) => void;
-
-    /**
-     * Called when Validation has completed
-     *
-     * @param err an internal error
-     * @param valid `true` if the JWT was valid, otherwise `false`
-     * @param credentials alternative credentials to be set instead of `decoded`
-     */
-    type ValidateCallback = (err: any, valid: boolean, credentials?: any) => void;
-
-    /**
-     * Options passed to `hapi.auth.strategy` when this plugin is used
-     */
-    interface Options {
-        /**
-         * The secret key used to check the signature of the token *or* a *key lookup function*
-         */
-        key?: string | KeyLookup;
-
-        /**
-         * The function which is run once the Token has been decoded
-         *
-         * @param decoded the *decoded* and *verified* JWT received from the client in *request.headers.authorization*
-         * @param request the original *request* received from the client
-         * @param callback the validation callback
-         */
-        validateFunc(decoded: {}, request: Request, callback: ValidateCallback): void;
-
-        /**
-         * Settings to define how tokens are verified by the jsonwebtoken library
-         */
-        verifyOptions?: {
-            /**
-             * Ignore expired tokens
-             */
-            ignoreExpiration?: boolean;
-
-            /**
-             * Do not enforce token audience
-             */
-            audience?: boolean;
-
-            /**
-             * Do not require the issuer to be valid
-             */
-            issuer?: boolean;
-
-            /**
-             * List of allowed algorithms
-             */
-            algorithms?: string[];
-        };
-
-        /**
-         * function called to decorate the response with authentication headers
-         * before the response headers or payload is written
-         *
-         * @param request the Request object
-         * @param reply is called if an error occurred
-         */
-        responseFunc?(request: Request, reply: (err: any, response: Response) => void): void;
-
-        /**
-         * If you prefer to pass your token via url, simply add a token url
-         * parameter to your request or use a custom parameter by setting `urlKey.
-         * To disable the url parameter set urlKey to `false` or ''.
-         * @default 'token'
-         */
-        urlKey?: string | boolean;
-
-        /**
-         * If you prefer to set your own cookie key or your project has a cookie
-         * called 'token' for another purpose, you can set a custom key for your
-         * cookie by setting `options.cookieKey='yourkeyhere'`. To disable cookies
-         * set cookieKey to `false` or ''.
-         * @default 'token'
-         */
-        cookieKey?: string | boolean;
-
-        /**
-         * If you want to set a custom key for your header token use the
-         * `headerKey` option. To disable header token set headerKey to `false` or
-         * ''.
-         * @default 'authorization'
-         */
-        headerKey?: string | boolean;
-
-        /**
-         * Allow custom token type, e.g. `Authorization: <tokenType> 12345678`
-         */
-        tokenType?: string;
-
-        /**
-         * Set to `true` to receive the complete token (`decoded.header`,
-         * `decoded.payload` and `decoded.signature`) as decoded argument to key
-         * lookup and `verifyFunc` callbacks (*not `validateFunc`*)
-         * @default false
-         */
-        complete?: boolean;
+declare module 'hapi' {
+    interface ServerAuth {
+        strategy(name: string, scheme: 'jwt', options?: Options): void;
     }
 }
 
-declare var hapiAuthJwt2: PluginFunction<{}>;
+export interface ExtraInfo {
+}
 
-export = hapiAuthJwt2;
+export interface ErrorContext {
+    /**
+     * Boom method to call (eg. unauthorized)
+     */
+    errorType: string;
+    /**
+     * message passed into the Boom method call
+     */
+    message?: string;
+    /**
+     * schema passed into the Boom method call
+     */
+    schema: string;
+    /**
+     * attributes passed into the Boom method call
+     */
+    attributes?: {
+        [key: string]: string;
+    };
+}
+
+/**
+ * Options passed to `hapi.auth.strategy` when this plugin is used
+ */
+export interface Options {
+    /**
+     * The secret key used to check the signature of the token *or* a *key lookup function*
+     */
+    key?: string | string[] | Promise<{ isValid: boolean; key: string; extraInfo?: ExtraInfo }>;
+
+    /**
+     * The function which is run once the Token has been decoded
+     *
+     * @param decoded the *decoded* and *verified* JWT received from the client in *request.headers.authorization*
+     * @param request the original *request* received from the client
+     */
+    validate(decoded: {}, request: Request, tk: ResponseToolkit): Promise<{
+        isValid: boolean;
+        credentials?: any;
+        response?: ResponseObject
+    }>;
+
+    /**
+     * Settings to define how tokens are verified by the jsonwebtoken library
+     */
+    verifyOptions?: {
+        /**
+         * Ignore expired tokens
+         */
+        ignoreExpiration?: boolean;
+
+        /**
+         * Do not enforce token audience
+         */
+        audience?: boolean;
+
+        /**
+         * Do not require the issuer to be valid
+         */
+        issuer?: boolean;
+
+        /**
+         * List of allowed algorithms
+         */
+        algorithms?: string[];
+    };
+
+    /**
+     * function called to decorate the response with authentication headers
+     * before the response headers or payload is written
+     *
+     * @param request the Request object
+     * @param reply is called if an error occurred
+     */
+    responseFunc?(request: Request, reply: (err: any, response: ResponseObject) => void): void;
+
+    /**
+     *
+     * @param ctx called when an error has been raised.
+     * It provides an extension point to allow the host the ability to customise the error messages returned.
+     */
+    errorFunc?(ctx: ErrorContext): ErrorContext;
+
+    /**
+     * If you prefer to pass your token via url, simply add a token url
+     * parameter to your request or use a custom parameter by setting `urlKey.
+     * To disable the url parameter set urlKey to `false` or ''.
+     * @default 'token'
+     */
+    urlKey?: string | boolean;
+
+    /**
+     * If you prefer to set your own cookie key or your project has a cookie
+     * called 'token' for another purpose, you can set a custom key for your
+     * cookie by setting `options.cookieKey='yourkeyhere'`. To disable cookies
+     * set cookieKey to `false` or ''.
+     * @default 'token'
+     */
+    cookieKey?: string | boolean;
+
+    /**
+     * If you want to set a custom key for your header token use the
+     * `headerKey` option. To disable header token set headerKey to `false` or
+     * ''.
+     * @default 'authorization'
+     */
+    headerKey?: string | boolean;
+
+    /**
+     * Allow custom token type, e.g. `Authorization: <tokenType> 12345678`
+     */
+    tokenType?: string;
+
+    /**
+     * Set to `true` to receive the complete token (`decoded.header`,
+     * `decoded.payload` and `decoded.signature`) as decoded argument to key
+     * lookup and `verifyFunc` callbacks (*not `validateFunc`*)
+     * @default false
+     */
+    complete?: boolean;
+}
+
+export interface RegisterOptions {
+    /**
+     * function which is run once the Token has been decoded (instead of a validate) with signature async function(decoded, request) where:
+     */
+    verify?(decoded: any, request: Request): Promise<{
+        isValid: boolean;
+        credentials?: any;
+    }>;
+}
+
+export const plugin: Plugin<RegisterOptions>;
diff --git a/types/hapi-auth-jwt2/tsconfig.json b/types/hapi-auth-jwt2/tsconfig.json
index 19a6e785ac..0d58c0f507 100644
--- a/types/hapi-auth-jwt2/tsconfig.json
+++ b/types/hapi-auth-jwt2/tsconfig.json
@@ -13,20 +13,6 @@
             "../"
         ],
         "types": [],
-        "paths": {
-            "boom": [
-                "boom/v4"
-            ],
-            "catbox": [
-                "catbox/v7"
-            ],
-            "hapi": [
-                "hapi/v16"
-            ],
-            "inert": [
-                "inert/v4"
-            ]
-        },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
diff --git a/types/hapi-auth-jwt2/tslint.json b/types/hapi-auth-jwt2/tslint.json
index 3db14f85ea..4f44991c3c 100644
--- a/types/hapi-auth-jwt2/tslint.json
+++ b/types/hapi-auth-jwt2/tslint.json
@@ -1 +1,6 @@
-{ "extends": "dtslint/dt.json" }
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-empty-interface": false
+    }
+}
diff --git a/types/hapi-auth-jwt2/v7/hapi-auth-jwt2-tests.ts b/types/hapi-auth-jwt2/v7/hapi-auth-jwt2-tests.ts
new file mode 100644
index 0000000000..fa28253a88
--- /dev/null
+++ b/types/hapi-auth-jwt2/v7/hapi-auth-jwt2-tests.ts
@@ -0,0 +1,38 @@
+import Hapi = require('hapi');
+import hapiAuthJwt2 = require('hapi-auth-jwt2');
+
+const server = new Hapi.Server();
+server.connection({port: 8000});
+
+interface User {
+  id: number;
+  name: string;
+}
+
+interface Users {
+  [id: number]: User;
+}
+
+const users: Users = {
+  1: {
+    id: 1,
+    name: 'Test User'
+  }
+};
+
+function validate(decoded: User, request: Hapi.Request, callback: hapiAuthJwt2.ValidateCallback) {
+  callback(null, !!users[decoded.id]);
+}
+
+server.register(hapiAuthJwt2, err => {
+  const options: hapiAuthJwt2.Options = {
+    key: 'NeverShareYourSecret',
+    validateFunc: validate,
+    verifyOptions: {
+      algorithms: ['HS256']
+    }
+  };
+  server.auth.strategy('jwt', 'jwt', options);
+});
+
+server.start();
diff --git a/types/hapi-auth-jwt2/v7/index.d.ts b/types/hapi-auth-jwt2/v7/index.d.ts
new file mode 100644
index 0000000000..91e8ef931e
--- /dev/null
+++ b/types/hapi-auth-jwt2/v7/index.d.ts
@@ -0,0 +1,132 @@
+// Type definitions for hapi-auth-jwt2 7.0
+// Project: https://github.com/dwyl/hapi-auth-jwt2
+// Definitions by: Warren Seymour <https://github.com/warrenseymour>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+import { Request, Response, PluginFunction } from 'hapi';
+
+declare namespace hapiAuthJwt2 {
+    /**
+     * A key lookup function
+     *
+     * @param decoded the *decoded* but *unverified* JWT received from client
+     * @param callback the key lookup callback
+     */
+    type KeyLookup = (decoded: any, callback: KeyLookupCallback) => void;
+
+    /**
+     * Called when key lookup function has completed
+     *
+     * @param err an internal error
+     * @param key the secret key
+     * @param extraInfo any additional information that you would like
+     * to use in `validateFunc` which can be accessed via
+     * `request.plugins['hapi-auth-jwt2'].extraInfo`
+     */
+    type KeyLookupCallback = (err: any, key: string, extraInfo?: any) => void;
+
+    /**
+     * Called when Validation has completed
+     *
+     * @param err an internal error
+     * @param valid `true` if the JWT was valid, otherwise `false`
+     * @param credentials alternative credentials to be set instead of `decoded`
+     */
+    type ValidateCallback = (err: any, valid: boolean, credentials?: any) => void;
+
+    /**
+     * Options passed to `hapi.auth.strategy` when this plugin is used
+     */
+    interface Options {
+        /**
+         * The secret key used to check the signature of the token *or* a *key lookup function*
+         */
+        key?: string | KeyLookup;
+
+        /**
+         * The function which is run once the Token has been decoded
+         *
+         * @param decoded the *decoded* and *verified* JWT received from the client in *request.headers.authorization*
+         * @param request the original *request* received from the client
+         * @param callback the validation callback
+         */
+        validateFunc(decoded: {}, request: Request, callback: ValidateCallback): void;
+
+        /**
+         * Settings to define how tokens are verified by the jsonwebtoken library
+         */
+        verifyOptions?: {
+            /**
+             * Ignore expired tokens
+             */
+            ignoreExpiration?: boolean;
+
+            /**
+             * Do not enforce token audience
+             */
+            audience?: boolean;
+
+            /**
+             * Do not require the issuer to be valid
+             */
+            issuer?: boolean;
+
+            /**
+             * List of allowed algorithms
+             */
+            algorithms?: string[];
+        };
+
+        /**
+         * function called to decorate the response with authentication headers
+         * before the response headers or payload is written
+         *
+         * @param request the Request object
+         * @param reply is called if an error occurred
+         */
+        responseFunc?(request: Request, reply: (err: any, response: Response) => void): void;
+
+        /**
+         * If you prefer to pass your token via url, simply add a token url
+         * parameter to your request or use a custom parameter by setting `urlKey.
+         * To disable the url parameter set urlKey to `false` or ''.
+         * @default 'token'
+         */
+        urlKey?: string | boolean;
+
+        /**
+         * If you prefer to set your own cookie key or your project has a cookie
+         * called 'token' for another purpose, you can set a custom key for your
+         * cookie by setting `options.cookieKey='yourkeyhere'`. To disable cookies
+         * set cookieKey to `false` or ''.
+         * @default 'token'
+         */
+        cookieKey?: string | boolean;
+
+        /**
+         * If you want to set a custom key for your header token use the
+         * `headerKey` option. To disable header token set headerKey to `false` or
+         * ''.
+         * @default 'authorization'
+         */
+        headerKey?: string | boolean;
+
+        /**
+         * Allow custom token type, e.g. `Authorization: <tokenType> 12345678`
+         */
+        tokenType?: string;
+
+        /**
+         * Set to `true` to receive the complete token (`decoded.header`,
+         * `decoded.payload` and `decoded.signature`) as decoded argument to key
+         * lookup and `verifyFunc` callbacks (*not `validateFunc`*)
+         * @default false
+         */
+        complete?: boolean;
+    }
+}
+
+declare var hapiAuthJwt2: PluginFunction<{}>;
+
+export = hapiAuthJwt2;
diff --git a/types/hapi-auth-jwt2/v7/tsconfig.json b/types/hapi-auth-jwt2/v7/tsconfig.json
new file mode 100644
index 0000000000..45c3371617
--- /dev/null
+++ b/types/hapi-auth-jwt2/v7/tsconfig.json
@@ -0,0 +1,40 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "types": [],
+        "paths": {
+            "hapi-auth-jwt2": [
+                "hapi-auth-jwt2/v7"
+            ],
+            "boom": [
+                "boom/v4"
+            ],
+            "catbox": [
+                "catbox/v7"
+            ],
+            "hapi": [
+                "hapi/v16"
+            ],
+            "inert": [
+                "inert/v4"
+            ]
+        },
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "hapi-auth-jwt2-tests.ts"
+    ]
+}
diff --git a/types/hapi-auth-jwt2/v7/tslint.json b/types/hapi-auth-jwt2/v7/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/hapi-auth-jwt2/v7/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From b32853073c166472f961dd55ebd0639fb67934a9 Mon Sep 17 00:00:00 2001
From: Simon Schick <demwizzy@gmail.com>
Date: Fri, 2 Mar 2018 04:29:12 +0100
Subject: [PATCH 0161/1382] fixup! hapi-auth-jwt2: update to hapi 17

---
 types/hapi-auth-jwt2/hapi-auth-jwt2-tests.ts |   2 +-
 types/hapi-auth-jwt2/index.d.ts              | 234 ++++++++++---------
 2 files changed, 120 insertions(+), 116 deletions(-)

diff --git a/types/hapi-auth-jwt2/hapi-auth-jwt2-tests.ts b/types/hapi-auth-jwt2/hapi-auth-jwt2-tests.ts
index dedc9d81b4..bcf226cbbf 100644
--- a/types/hapi-auth-jwt2/hapi-auth-jwt2-tests.ts
+++ b/types/hapi-auth-jwt2/hapi-auth-jwt2-tests.ts
@@ -20,7 +20,7 @@ const users: Users = {
 };
 
 server.register({
-    plugin: hapiAuthJwt2.plugin,
+    plugin: hapiAuthJwt2,
     options: {
         async verify() {
             return {
diff --git a/types/hapi-auth-jwt2/index.d.ts b/types/hapi-auth-jwt2/index.d.ts
index 65ef647aca..efc4010cb4 100644
--- a/types/hapi-auth-jwt2/index.d.ts
+++ b/types/hapi-auth-jwt2/index.d.ts
@@ -9,143 +9,147 @@ import { Request, ResponseObject, Plugin, ResponseToolkit } from 'hapi';
 
 declare module 'hapi' {
     interface ServerAuth {
-        strategy(name: string, scheme: 'jwt', options?: Options): void;
+        strategy(name: string, scheme: 'jwt', options?: hapiAuthJwt2.Options): void;
     }
 }
 
-export interface ExtraInfo {
-}
+declare namespace hapiAuthJwt2 {
+    interface ExtraInfo {
+    }
 
-export interface ErrorContext {
-    /**
-     * Boom method to call (eg. unauthorized)
-     */
-    errorType: string;
-    /**
-     * message passed into the Boom method call
-     */
-    message?: string;
-    /**
-     * schema passed into the Boom method call
-     */
-    schema: string;
-    /**
-     * attributes passed into the Boom method call
-     */
-    attributes?: {
-        [key: string]: string;
-    };
-}
-
-/**
- * Options passed to `hapi.auth.strategy` when this plugin is used
- */
-export interface Options {
-    /**
-     * The secret key used to check the signature of the token *or* a *key lookup function*
-     */
-    key?: string | string[] | Promise<{ isValid: boolean; key: string; extraInfo?: ExtraInfo }>;
-
-    /**
-     * The function which is run once the Token has been decoded
-     *
-     * @param decoded the *decoded* and *verified* JWT received from the client in *request.headers.authorization*
-     * @param request the original *request* received from the client
-     */
-    validate(decoded: {}, request: Request, tk: ResponseToolkit): Promise<{
-        isValid: boolean;
-        credentials?: any;
-        response?: ResponseObject
-    }>;
-
-    /**
-     * Settings to define how tokens are verified by the jsonwebtoken library
-     */
-    verifyOptions?: {
+    interface ErrorContext {
         /**
-         * Ignore expired tokens
+         * Boom method to call (eg. unauthorized)
          */
-        ignoreExpiration?: boolean;
+        errorType: string;
+        /**
+         * message passed into the Boom method call
+         */
+        message?: string;
+        /**
+         * schema passed into the Boom method call
+         */
+        schema: string;
+        /**
+         * attributes passed into the Boom method call
+         */
+        attributes?: {
+            [key: string]: string;
+        };
+    }
+
+    /**
+     * Options passed to `hapi.auth.strategy` when this plugin is used
+     */
+    interface Options {
+        /**
+         * The secret key used to check the signature of the token *or* a *key lookup function*
+         */
+        key?: string | string[] | Promise<{ isValid: boolean; key: string; extraInfo?: ExtraInfo }>;
 
         /**
-         * Do not enforce token audience
+         * The function which is run once the Token has been decoded
+         *
+         * @param decoded the *decoded* and *verified* JWT received from the client in *request.headers.authorization*
+         * @param request the original *request* received from the client
          */
-        audience?: boolean;
+        validate(decoded: {}, request: Request, tk: ResponseToolkit): Promise<{
+            isValid: boolean;
+            credentials?: any;
+            response?: ResponseObject
+        }>;
 
         /**
-         * Do not require the issuer to be valid
+         * Settings to define how tokens are verified by the jsonwebtoken library
          */
-        issuer?: boolean;
+        verifyOptions?: {
+            /**
+             * Ignore expired tokens
+             */
+            ignoreExpiration?: boolean;
+
+            /**
+             * Do not enforce token audience
+             */
+            audience?: boolean;
+
+            /**
+             * Do not require the issuer to be valid
+             */
+            issuer?: boolean;
+
+            /**
+             * List of allowed algorithms
+             */
+            algorithms?: string[];
+        };
 
         /**
-         * List of allowed algorithms
+         * function called to decorate the response with authentication headers
+         * before the response headers or payload is written
+         *
+         * @param request the Request object
+         * @param reply is called if an error occurred
          */
-        algorithms?: string[];
-    };
+        responseFunc?(request: Request, reply: (err: any, response: ResponseObject) => void): void;
 
-    /**
-     * function called to decorate the response with authentication headers
-     * before the response headers or payload is written
-     *
-     * @param request the Request object
-     * @param reply is called if an error occurred
-     */
-    responseFunc?(request: Request, reply: (err: any, response: ResponseObject) => void): void;
+        /**
+         *
+         * @param ctx called when an error has been raised.
+         * It provides an extension point to allow the host the ability to customise the error messages returned.
+         */
+        errorFunc?(ctx: ErrorContext): ErrorContext;
 
-    /**
-     *
-     * @param ctx called when an error has been raised.
-     * It provides an extension point to allow the host the ability to customise the error messages returned.
-     */
-    errorFunc?(ctx: ErrorContext): ErrorContext;
+        /**
+         * If you prefer to pass your token via url, simply add a token url
+         * parameter to your request or use a custom parameter by setting `urlKey.
+         * To disable the url parameter set urlKey to `false` or ''.
+         * @default 'token'
+         */
+        urlKey?: string | boolean;
 
-    /**
-     * If you prefer to pass your token via url, simply add a token url
-     * parameter to your request or use a custom parameter by setting `urlKey.
-     * To disable the url parameter set urlKey to `false` or ''.
-     * @default 'token'
-     */
-    urlKey?: string | boolean;
+        /**
+         * If you prefer to set your own cookie key or your project has a cookie
+         * called 'token' for another purpose, you can set a custom key for your
+         * cookie by setting `options.cookieKey='yourkeyhere'`. To disable cookies
+         * set cookieKey to `false` or ''.
+         * @default 'token'
+         */
+        cookieKey?: string | boolean;
 
-    /**
-     * If you prefer to set your own cookie key or your project has a cookie
-     * called 'token' for another purpose, you can set a custom key for your
-     * cookie by setting `options.cookieKey='yourkeyhere'`. To disable cookies
-     * set cookieKey to `false` or ''.
-     * @default 'token'
-     */
-    cookieKey?: string | boolean;
+        /**
+         * If you want to set a custom key for your header token use the
+         * `headerKey` option. To disable header token set headerKey to `false` or
+         * ''.
+         * @default 'authorization'
+         */
+        headerKey?: string | boolean;
 
-    /**
-     * If you want to set a custom key for your header token use the
-     * `headerKey` option. To disable header token set headerKey to `false` or
-     * ''.
-     * @default 'authorization'
-     */
-    headerKey?: string | boolean;
+        /**
+         * Allow custom token type, e.g. `Authorization: <tokenType> 12345678`
+         */
+        tokenType?: string;
 
-    /**
-     * Allow custom token type, e.g. `Authorization: <tokenType> 12345678`
-     */
-    tokenType?: string;
+        /**
+         * Set to `true` to receive the complete token (`decoded.header`,
+         * `decoded.payload` and `decoded.signature`) as decoded argument to key
+         * lookup and `verifyFunc` callbacks (*not `validateFunc`*)
+         * @default false
+         */
+        complete?: boolean;
+    }
 
-    /**
-     * Set to `true` to receive the complete token (`decoded.header`,
-     * `decoded.payload` and `decoded.signature`) as decoded argument to key
-     * lookup and `verifyFunc` callbacks (*not `validateFunc`*)
-     * @default false
-     */
-    complete?: boolean;
+    interface RegisterOptions {
+        /**
+         * function which is run once the Token has been decoded (instead of a validate) with signature async function(decoded, request) where:
+         */
+        verify?(decoded: any, request: Request): Promise<{
+            isValid: boolean;
+            credentials?: any;
+        }>;
+    }
 }
 
-export interface RegisterOptions {
-    /**
-     * function which is run once the Token has been decoded (instead of a validate) with signature async function(decoded, request) where:
-     */
-    verify?(decoded: any, request: Request): Promise<{
-        isValid: boolean;
-        credentials?: any;
-    }>;
-}
+declare const hapiAuthJwt2: Plugin<hapiAuthJwt2.RegisterOptions>;
 
-export const plugin: Plugin<RegisterOptions>;
+export = hapiAuthJwt2;

From e115c06ec877e4aee9c4c75ed366c5f1b5ef5c37 Mon Sep 17 00:00:00 2001
From: Simon Schick <demwizzy@gmail.com>
Date: Fri, 2 Mar 2018 04:25:55 +0100
Subject: [PATCH 0162/1382] yar: fix incorrect option location

---
 types/yar/index.d.ts | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/types/yar/index.d.ts b/types/yar/index.d.ts
index 8f78544c9d..79d55c1138 100644
--- a/types/yar/index.d.ts
+++ b/types/yar/index.d.ts
@@ -13,27 +13,6 @@ import {
 } from 'hapi';
 declare namespace yar {
     interface YarOptions {
-        /**
-         * Tells Hapi that it should not respond with a HTTP 400 error if the session cookie cannot decrypt.
-         * This could happen if the cookie is changed on the client, or more likely, if you change the cookie password in your settings.
-         * If you want to make this condition send an error like it did in prior versions, change this to `false`,
-         * but be aware that if you change your cookie password you will cause 400 errors to be returned to end users.
-         * In that case you should probably change this back to true for a short time to allow session cookies to get reset for the best user experience.
-         * Defaults to true.
-         */
-        ignoreErrors?: boolean;
-
-        /**
-         * Tells Hapi that if a session cookie is invalid for any reason,
-         * to clear it from the browser.
-         * This prevents Hapi from having to reprocess the bad cookie on future requests.
-         * In general you'll probably want this on,
-         * but if you'd prefer that session cookies be dealt with in some
-         * other way you may set this to false.
-         * Defaults to true
-         */
-        clearInvalid?: boolean;
-
         /**
          * Determines the name of the cookie used to store session information.
          * Defaults to session.
@@ -72,6 +51,26 @@ declare namespace yar {
          * the configuration for cookie-specific features:
          */
         cookieOptions: {
+            /**
+             * Tells Hapi that it should not respond with a HTTP 400 error if the session cookie cannot decrypt.
+             * This could happen if the cookie is changed on the client, or more likely, if you change the cookie password in your settings.
+             * If you want to make this condition send an error like it did in prior versions, change this to `false`,
+             * but be aware that if you change your cookie password you will cause 400 errors to be returned to end users.
+             * In that case you should probably change this back to true for a short time to allow session cookies to get reset for the best user experience.
+             * Defaults to true.
+             */
+            ignoreErrors?: boolean;
+
+            /**
+             * Tells Hapi that if a session cookie is invalid for any reason,
+             * to clear it from the browser.
+             * This prevents Hapi from having to reprocess the bad cookie on future requests.
+             * In general you'll probably want this on,
+             * but if you'd prefer that session cookies be dealt with in some
+             * other way you may set this to false.
+             * Defaults to true
+             */
+            clearInvalid?: boolean;
             /**
              * (Required) used to encrypt and sign the cookie data.
              * Must be at least 32 chars.

From 689065bd14fa7429bf563ea18705d6ca8f78e941 Mon Sep 17 00:00:00 2001
From: Simon Schick <demwizzy@gmail.com>
Date: Fri, 2 Mar 2018 04:46:48 +0100
Subject: [PATCH 0163/1382] correct previous mistakes due to bad docs

---
 types/hapi-auth-jwt2/hapi-auth-jwt2-tests.ts |  3 ++-
 types/hapi-auth-jwt2/index.d.ts              | 23 ++------------------
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/types/hapi-auth-jwt2/hapi-auth-jwt2-tests.ts b/types/hapi-auth-jwt2/hapi-auth-jwt2-tests.ts
index bcf226cbbf..cf51162eb4 100644
--- a/types/hapi-auth-jwt2/hapi-auth-jwt2-tests.ts
+++ b/types/hapi-auth-jwt2/hapi-auth-jwt2-tests.ts
@@ -38,7 +38,8 @@ server.register({
             };
         },
         verifyOptions: {
-            algorithms: ['HS256']
+            algorithms: ['HS256'],
+            issuer: 'test',
         }
     };
     server.auth.strategy('jwt', 'jwt', opts);
diff --git a/types/hapi-auth-jwt2/index.d.ts b/types/hapi-auth-jwt2/index.d.ts
index efc4010cb4..a93f740bfc 100644
--- a/types/hapi-auth-jwt2/index.d.ts
+++ b/types/hapi-auth-jwt2/index.d.ts
@@ -6,6 +6,7 @@
 // TypeScript Version: 2.4
 
 import { Request, ResponseObject, Plugin, ResponseToolkit } from 'hapi';
+import { VerifyOptions } from 'jsonwebtoken';
 
 declare module 'hapi' {
     interface ServerAuth {
@@ -62,27 +63,7 @@ declare namespace hapiAuthJwt2 {
         /**
          * Settings to define how tokens are verified by the jsonwebtoken library
          */
-        verifyOptions?: {
-            /**
-             * Ignore expired tokens
-             */
-            ignoreExpiration?: boolean;
-
-            /**
-             * Do not enforce token audience
-             */
-            audience?: boolean;
-
-            /**
-             * Do not require the issuer to be valid
-             */
-            issuer?: boolean;
-
-            /**
-             * List of allowed algorithms
-             */
-            algorithms?: string[];
-        };
+        verifyOptions?: VerifyOptions;
 
         /**
          * function called to decorate the response with authentication headers

From 81172581521ab6bf61934224dbe402279554b140 Mon Sep 17 00:00:00 2001
From: William Hayward <haywardwilliam1996@gmail.com>
Date: Fri, 2 Mar 2018 18:25:14 +1000
Subject: [PATCH 0164/1382] +Fixed websocket to allow for https and arrays

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

diff --git a/types/websocket/index.d.ts b/types/websocket/index.d.ts
index f67a5da142..0087c7a3d1 100644
--- a/types/websocket/index.d.ts
+++ b/types/websocket/index.d.ts
@@ -62,8 +62,8 @@ export interface IConfig {
 }
 
 export interface IServerConfig extends IConfig {
-    /** The http server instance to attach to */
-    httpServer: http.Server;
+    /** The http or https server instance(s) to attach to */
+    httpServer: http.Server | https.Server | (http.Server | https.Server)[];
 
     /**
      * The maximum allowed received frame size in bytes.

From 0fc135e887d9a87193a22f539dc82f1dca16a8b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Victor=20Glind=C3=A5s?= <glinkis@gmail.com>
Date: Fri, 2 Mar 2018 09:54:19 +0100
Subject: [PATCH 0165/1382] Updates mesh to use a optional material array.

The material property on Mesh should be a material or an array of materials.
---
 types/three/three-core.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/three/three-core.d.ts b/types/three/three-core.d.ts
index a5e2b6486c..31c8cbebe0 100644
--- a/types/three/three-core.d.ts
+++ b/types/three/three-core.d.ts
@@ -5020,10 +5020,10 @@ export class LineSegments extends Line {
 }
 
 export class Mesh extends Object3D {
-    constructor(geometry?: Geometry | BufferGeometry, material?: Material);
+    constructor(geometry?: Geometry | BufferGeometry, material?: Material | Material[]);
 
     geometry: Geometry|BufferGeometry;
-    material: Material;
+    material: Material | Material[];
     drawMode: TrianglesDrawModes;
     morphTargetInfluences?: number[];
     morphTargetDictionary?: { [key: string]: number; };

From 6d34274043e4766edc107bc65048cd9e21448a54 Mon Sep 17 00:00:00 2001
From: Daniel Machado <dmachado@privacycloud.com>
Date: Fri, 2 Mar 2018 11:31:28 +0100
Subject: [PATCH 0166/1382] Add new failedDependency method for hapijs/boom
 7.2.0

---
 types/boom/boom-tests.ts    | 4 ++++
 types/boom/index.d.ts       | 8 ++++++++
 types/boom/v3/index.d.ts    | 1 +
 types/boom/v4/boom-tests.ts | 4 ++++
 types/boom/v4/index.d.ts    | 9 +++++++++
 5 files changed, 26 insertions(+)

diff --git a/types/boom/boom-tests.ts b/types/boom/boom-tests.ts
index 4d133b2545..d143148cf8 100644
--- a/types/boom/boom-tests.ts
+++ b/types/boom/boom-tests.ts
@@ -97,6 +97,10 @@ const lockedError = Boom.locked('message', {some: 'data'});
 lockedError.data.some;
 const lockedError2: Boom.Boom = Boom.locked('message');
 
+const failedDependencyError = Boom.failedDependency('message', {some: 'data'});
+failedDependencyError.data.some;
+const failedDependencyError2: Boom.Boom = Boom.failedDependency('message');
+
 const preconditionRequiredError = Boom.preconditionRequired('message', {some: 'data'});
 preconditionRequiredError.data.some;
 const preconditionRequiredError2: Boom.Boom = Boom.preconditionRequired('message');
diff --git a/types/boom/index.d.ts b/types/boom/index.d.ts
index ed48f181cf..f83c978109 100644
--- a/types/boom/index.d.ts
+++ b/types/boom/index.d.ts
@@ -264,6 +264,14 @@ declare namespace Boom {
      */
     export function locked<Data = null>(message?: string, data?: Data): Boom<Data>;
 
+    /**
+     * Returns a 424 Failed Dependency error
+     * @param message optional message.
+     * @param data optional additional error data.
+     * @see {@link https://github.com/hapijs/boom#boomfaileddependencymessage-data}
+     */
+    export function failedDependency<Data = null>(message?: string, data?: Data): Boom<Data>;
+
     /**
      * Returns a 428 Precondition Required error
      * @param message optional message.
diff --git a/types/boom/v3/index.d.ts b/types/boom/v3/index.d.ts
index adf433c9f4..d9c34be4fb 100644
--- a/types/boom/v3/index.d.ts
+++ b/types/boom/v3/index.d.ts
@@ -48,6 +48,7 @@ declare namespace Boom {
     export function expectationFailed(message?: string, data?: any): BoomError;
     export function badData(message?: string, data?: any): BoomError;
     export function locked(message?: string, data?: any): BoomError;
+    export function failedDependency(message?: string, data?: any): BoomError;
     export function preconditionRequired(message?: string, data?: any): BoomError;
     export function tooManyRequests(message?: string, data?: any): BoomError;
     export function illegal(message?: string, data?: any): BoomError;
diff --git a/types/boom/v4/boom-tests.ts b/types/boom/v4/boom-tests.ts
index 1819be25cb..33e86699e8 100644
--- a/types/boom/v4/boom-tests.ts
+++ b/types/boom/v4/boom-tests.ts
@@ -98,6 +98,10 @@ const lockedError = Boom.locked('message', {some: 'data'});
 lockedError.data.some;
 const lockedError2: Boom.BoomError = Boom.locked('message');
 
+const failedDependencyError = Boom.failedDependency('message', {some: 'data'});
+failedDependencyError.data.some;
+const failedDependencyError2: Boom.BoomError = Boom.failedDependency('message');
+
 const preconditionRequiredError = Boom.preconditionRequired('message', {some: 'data'});
 preconditionRequiredError.data.some;
 const preconditionRequiredError2: Boom.BoomError = Boom.preconditionRequired('message');
diff --git a/types/boom/v4/index.d.ts b/types/boom/v4/index.d.ts
index 76cd2d6b46..50d7a7d59a 100644
--- a/types/boom/v4/index.d.ts
+++ b/types/boom/v4/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: Igor Rogatty <https://github.com/rogatty>
 //                 AJP <https://github.com/AJamesPhillips>
 //                 Jinesh Shah <https://github.com/jineshshah36>
+//                 Daniel Machado <https://github.com/danielmachado>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
@@ -258,6 +259,14 @@ declare namespace Boom {
      */
     export function locked<Data = null>(message?: string, data?: Data): BoomError<Data>;
 
+    /**
+     * Returns a 424 Failed Dependency error
+     * @param message optional message.
+     * @param data optional additional error data.
+     * @see {@link https://github.com/hapijs/boom#boomfaileddependencymessage-data}
+     */
+    export function failedDependency<Data = null>(message?: string, data?: Data): BoomError<Data>;
+
     /**
      * Returns a 428 Precondition Required error
      * @param message optional message.

From c6883b775ebf0b72d4f3f1e1182ee7e1c2b39337 Mon Sep 17 00:00:00 2001
From: Daniel Machado <dmachado@privacycloud.com>
Date: Fri, 2 Mar 2018 11:34:54 +0100
Subject: [PATCH 0167/1382] Missing upgrade version in headers

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

diff --git a/types/boom/index.d.ts b/types/boom/index.d.ts
index f83c978109..3d9c83dabf 100644
--- a/types/boom/index.d.ts
+++ b/types/boom/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for boom 7.1.1
+// Type definitions for boom 7.2.0
 // Project: https://github.com/hapijs/boom
 // Definitions by: Igor Rogatty <https://github.com/rogatty>
 //                 AJP <https://github.com/AJamesPhillips>

From ba372b251e4df7c0da47a2b24e57bc8fac02b0f7 Mon Sep 17 00:00:00 2001
From: penrico <enrico.piccinin@gmail.com>
Date: Fri, 2 Mar 2018 11:40:40 +0100
Subject: [PATCH 0168/1382] InsertWriteOpResult of mongodb updated

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

diff --git a/types/mongodb/index.d.ts b/types/mongodb/index.d.ts
index dd4f44f38a..099c164605 100644
--- a/types/mongodb/index.d.ts
+++ b/types/mongodb/index.d.ts
@@ -1070,7 +1070,7 @@ export interface FindOneOptions {
 export interface InsertWriteOpResult {
     insertedCount: number;
     ops: Array<any>;
-    insertedIds: Array<ObjectID>;
+    insertedIds: {[key: number]: ObjectID};
     connection: any;
     result: { ok: number, n: number }
 }

From 9bfd82b8fd8c7e94930c19432b199733825e539e Mon Sep 17 00:00:00 2001
From: Daniel Machado <dmachado@privacycloud.com>
Date: Fri, 2 Mar 2018 11:41:03 +0100
Subject: [PATCH 0169/1382] Add me as a new author

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

diff --git a/types/boom/index.d.ts b/types/boom/index.d.ts
index 3d9c83dabf..a1e11a341a 100644
--- a/types/boom/index.d.ts
+++ b/types/boom/index.d.ts
@@ -4,6 +4,7 @@
 //                 AJP <https://github.com/AJamesPhillips>
 //                 Jinesh Shah <https://github.com/jineshshah36>
 //                 Timon van Spronsen <https://github.com/TimonVS>
+//                 Daniel Machado <https://github.com/danielmachado>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 

From 6e48ecde74885e50b187f374bdf72bd5e008ed3a Mon Sep 17 00:00:00 2001
From: penrico <enrico.piccinin@gmail.com>
Date: Fri, 2 Mar 2018 12:07:34 +0100
Subject: [PATCH 0170/1382]  InsertWriteOpResult of mongodb updated - with 
 contributor

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

diff --git a/types/mongodb/index.d.ts b/types/mongodb/index.d.ts
index 099c164605..c47f2fc0ee 100644
--- a/types/mongodb/index.d.ts
+++ b/types/mongodb/index.d.ts
@@ -6,6 +6,7 @@
 //                 Jason Dreyzehner <https://github.com/bitjson>
 //                 Gaurav Lahoti <https://github.com/dante-101>
 //                 Mariano Cortesi <https://github.com/mcortesi>
+//                 Enrico Picci <https://github.com/EnricoPicci>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 

From eeddbd48bdc53a764caa68a8bf478332f4e33840 Mon Sep 17 00:00:00 2001
From: nekoziroo <nekoziroo@outlook.com>
Date: Fri, 2 Mar 2018 21:47:51 +0900
Subject: [PATCH 0171/1382] Fix postMessage so that it can send message

---
 types/firefox-webext-browser/firefox-webext-browser-tests.ts | 4 ++++
 types/firefox-webext-browser/index.d.ts                      | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/types/firefox-webext-browser/firefox-webext-browser-tests.ts b/types/firefox-webext-browser/firefox-webext-browser-tests.ts
index 01d9cf9f3d..38169d573a 100644
--- a/types/firefox-webext-browser/firefox-webext-browser-tests.ts
+++ b/types/firefox-webext-browser/firefox-webext-browser-tests.ts
@@ -8,3 +8,7 @@ browser.manifest; // $ExpectError
 browser._manifest; // $ExpectType typeof _manifest
 browser._manifest.WebExtensionLangpackManifest; // $ExpectError
 browser._manifest.NativeManifest; // $ExpectError
+
+// browser.runtime
+const port = browser.runtime.connect();
+port.postMessage(); // $ExpectError
diff --git a/types/firefox-webext-browser/index.d.ts b/types/firefox-webext-browser/index.d.ts
index dcbfb48648..cba61923de 100644
--- a/types/firefox-webext-browser/index.d.ts
+++ b/types/firefox-webext-browser/index.d.ts
@@ -2299,7 +2299,7 @@ declare namespace browser.runtime {
         disconnect: () => void;
         onDisconnect: events.Event;
         onMessage: events.Event;
-        postMessage: () => void;
+        postMessage(message: object): void;
         /** This property will **only** be present on ports passed to onConnect/onConnectExternal listeners. */
         sender?: MessageSender;
     }

From bf680a164fad55204d67e61700bae23b21d0dc0b Mon Sep 17 00:00:00 2001
From: nekoziroo <nekoziroo@outlook.com>
Date: Fri, 2 Mar 2018 21:48:20 +0900
Subject: [PATCH 0172/1382] Use method shorthand

---
 types/firefox-webext-browser/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/firefox-webext-browser/index.d.ts b/types/firefox-webext-browser/index.d.ts
index cba61923de..d04b7f6aca 100644
--- a/types/firefox-webext-browser/index.d.ts
+++ b/types/firefox-webext-browser/index.d.ts
@@ -2296,7 +2296,7 @@ declare namespace browser.runtime {
     /** An object which allows two way communication with other pages. */
     interface Port {
         name: string;
-        disconnect: () => void;
+        disconnect(): void;
         onDisconnect: events.Event;
         onMessage: events.Event;
         postMessage(message: object): void;

From f23f06b301377fb81e79ef57be624e8a99828171 Mon Sep 17 00:00:00 2001
From: Yuliya <yuliya_haluza@epam.com>
Date: Fri, 2 Mar 2018 17:55:56 +0300
Subject: [PATCH 0173/1382] fix(react-table): fix FilterRender params

---
 types/react-table/index.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/react-table/index.d.ts b/types/react-table/index.d.ts
index 2ab2d2a821..2915a24857 100644
--- a/types/react-table/index.d.ts
+++ b/types/react-table/index.d.ts
@@ -5,12 +5,12 @@
 // TypeScript Version: 2.6
 import * as React from 'react';
 
-export type ReactTableFunction = () => void;
+export type ReactTableFunction = (value?: any) => void;
 export type AccessorFunction = (row: object) => any;
 export type Accessor = string | string[] | object | AccessorFunction;
 export type Aggregator = (values: any, rows: any) => any;
 export type TableCellRenderer = ((data: any, column: any) => React.ReactNode) | React.ReactNode;
-export type FilterRender = (params: { column: Column, filter: any, onFilterChange: ReactTableFunction, key?: string }) => React.ReactElement<any>;
+export type FilterRender = (params: { column: Column, filter: any, onChange: ReactTableFunction, key?: string }) => React.ReactElement<any>;
 export type PivotRenderer = ((cellInfo: any) => React.ReactNode) | (() => any) | string | React.ReactNode;
 
 export type ComponentPropsGetter0 = (finalState: any, rowInfo: undefined, column: undefined, instance?: any) => object | undefined;

From 407c264b357f9c7f0b857dfbd4cfc9744aec508c Mon Sep 17 00:00:00 2001
From: Nick Zelei <nick.zelei@garmin.com>
Date: Fri, 2 Mar 2018 09:53:16 -0600
Subject: [PATCH 0174/1382] Updated message properties and fields

Updated message properties and fields
---
 types/amqplib/index.d.ts      |  2 +-
 types/amqplib/properties.d.ts | 49 +++++++++++++++++++++++++++++++++--
 2 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/types/amqplib/index.d.ts b/types/amqplib/index.d.ts
index 25b0ef04e9..269ed0112e 100644
--- a/types/amqplib/index.d.ts
+++ b/types/amqplib/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for amqplib 0.5
 // Project: https://github.com/squaremo/amqp.node
-// Definitions by: Michael Nahkies <https://github.com/mnahkies>, Ab Reitsma <https://github.com/abreits>, Nicolás Fantone <https://github.com/nfantone>
+// Definitions by: Michael Nahkies <https://github.com/mnahkies>, Ab Reitsma <https://github.com/abreits>, Nicolás Fantone <https://github.com/nfantone>, Nick Zelei <https://github.com/zelein>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
diff --git a/types/amqplib/properties.d.ts b/types/amqplib/properties.d.ts
index af90909d8c..2445a6f401 100644
--- a/types/amqplib/properties.d.ts
+++ b/types/amqplib/properties.d.ts
@@ -141,6 +141,51 @@ export namespace Options {
 
 export interface Message {
     content: Buffer;
-    fields: any;
-    properties: any;
+    fields: MessageFields;
+    properties: MessageProperties;
+}
+
+export interface MessageFields {
+    deliveryTag: number;
+    redelivered: boolean;
+    exchange: string;
+    routingKey: string;
+    messageCount: string;
+}
+
+export interface MessageProperties {
+    contentType: any | undefined;
+    contentEncoding: any | undefined;
+    headers: MessagePropertyHeaders;
+    deliveryMode: any | undefined;
+    priority: any | undefined;
+    correlationId: any | undefined;
+    replyTo: any | undefined;
+    expiration: any | undefined;
+    messageId: any | undefined;
+    timestamp: any | undefined;
+    type: any | undefined;
+    userId: any | undefined;
+    appId: any | undefined;
+    clusterId: any | undefined;
+}
+
+export interface MessagePropertyHeaders {
+    "x-first-death-exchange"?: string;
+    "x-first-death-queue"?: string;
+    "x-first-death-reason"?: string;
+    "x-death"?: XDeath[];
+    [key: string]: any;
+}
+
+export interface XDeath {
+    count: number;
+    reason: string;
+    queue: string;
+    time: {
+        "!": "timestamp";
+        value: number;
+    };
+    exchange: string;
+    "routing-keys": string[];
 }

From 2915a02f3160b26107fdeca419ce5809ac38a3f8 Mon Sep 17 00:00:00 2001
From: Nick Zelei <nick.zelei@garmin.com>
Date: Fri, 2 Mar 2018 10:04:11 -0600
Subject: [PATCH 0175/1382] tweaked types per documentation

---
 types/amqplib/properties.d.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/amqplib/properties.d.ts b/types/amqplib/properties.d.ts
index 2445a6f401..9f96b14f5c 100644
--- a/types/amqplib/properties.d.ts
+++ b/types/amqplib/properties.d.ts
@@ -180,12 +180,13 @@ export interface MessagePropertyHeaders {
 
 export interface XDeath {
     count: number;
-    reason: string;
+    reason: "rejected" | "expired" | "maxlen";
     queue: string;
     time: {
         "!": "timestamp";
         value: number;
     };
     exchange: string;
+    "original-expiration"?: any;
     "routing-keys": string[];
 }

From 382209af87824d634c5e68efdb89a2af91360ca1 Mon Sep 17 00:00:00 2001
From: divyapchandran <26032788+divyapchandran@users.noreply.github.com>
Date: Fri, 2 Mar 2018 16:37:35 +0000
Subject: [PATCH 0176/1382] Update index.d.ts

Fix warning "Argument of type '{ id: string; data: any; }' is not assignable to parameter of type 'Parameters'."
---
 types/twig/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/twig/index.d.ts b/types/twig/index.d.ts
index cdbf94a8b4..de9af9f90a 100644
--- a/types/twig/index.d.ts
+++ b/types/twig/index.d.ts
@@ -16,6 +16,7 @@ export interface Parameters {
     name?: any;
     method?: any;
     options?: any;
+    data?: any
 }
 
 export interface Template {

From 072dfde3a8d7b47a001bafcae0109133c62e63ae Mon Sep 17 00:00:00 2001
From: divyapchandran <26032788+divyapchandran@users.noreply.github.com>
Date: Fri, 2 Mar 2018 16:39:59 +0000
Subject: [PATCH 0177/1382] Update index.d.ts

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

diff --git a/types/twig/index.d.ts b/types/twig/index.d.ts
index de9af9f90a..742958535d 100644
--- a/types/twig/index.d.ts
+++ b/types/twig/index.d.ts
@@ -16,7 +16,7 @@ export interface Parameters {
     name?: any;
     method?: any;
     options?: any;
-    data?: any
+    data?: any;
 }
 
 export interface Template {

From 4edfe80d9c60f414825f79644de6d508c35d4d4b Mon Sep 17 00:00:00 2001
From: Matthew James <matthew.d.james87@gmail.com>
Date: Fri, 2 Mar 2018 17:07:23 +0000
Subject: [PATCH 0178/1382] Added react-resize-router module types definition

---
 types/react-resize-detector/index.d.ts    | 18 ++++++++++++++++++
 types/react-resize-detector/tsconfig.json | 21 +++++++++++++++++++++
 types/react-resize-detector/tslint.json   |  1 +
 3 files changed, 40 insertions(+)
 create mode 100644 types/react-resize-detector/index.d.ts
 create mode 100644 types/react-resize-detector/tsconfig.json
 create mode 100644 types/react-resize-detector/tslint.json

diff --git a/types/react-resize-detector/index.d.ts b/types/react-resize-detector/index.d.ts
new file mode 100644
index 0000000000..87b6c2df6a
--- /dev/null
+++ b/types/react-resize-detector/index.d.ts
@@ -0,0 +1,18 @@
+// Type definitions for react-resize-detector 2.1
+// Project: https://github.com/maslianok/react-resize-detector
+// Definitions by: Matthew James <https://github.com/matthew-matvei>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as React from "react";
+
+interface ReactResizeDetectorProps extends React.Props<ReactResizeDetector> {
+    onResize: (width: number, height: number) => void;
+    handleHeight?: boolean;
+    handleWidth?: boolean;
+    skipOnMount?: boolean;
+    resizableElementId?: string;
+}
+
+declare class ReactResizeDetector extends React.Component<ReactResizeDetectorProps> { }
+
+export = ReactResizeDetector;
diff --git a/types/react-resize-detector/tsconfig.json b/types/react-resize-detector/tsconfig.json
new file mode 100644
index 0000000000..a2cbd4e379
--- /dev/null
+++ b/types/react-resize-detector/tsconfig.json
@@ -0,0 +1,21 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
diff --git a/types/react-resize-detector/tslint.json b/types/react-resize-detector/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-resize-detector/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 0cbf2b2b2e0513f160e9312345daff8adcbcfc36 Mon Sep 17 00:00:00 2001
From: Matthew James <matthew.d.james87@gmail.com>
Date: Fri, 2 Mar 2018 17:15:35 +0000
Subject: [PATCH 0179/1382] Set strictFunctionTypes

---
 types/react-resize-detector/tsconfig.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/react-resize-detector/tsconfig.json b/types/react-resize-detector/tsconfig.json
index a2cbd4e379..ecc22c8314 100644
--- a/types/react-resize-detector/tsconfig.json
+++ b/types/react-resize-detector/tsconfig.json
@@ -7,6 +7,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"

From 7ab6fcc74489e5cb5e5378016b34870398788184 Mon Sep 17 00:00:00 2001
From: Matthew James <matthew.d.james87@gmail.com>
Date: Fri, 2 Mar 2018 17:16:13 +0000
Subject: [PATCH 0180/1382] Fixed linting issues

---
 types/react-resize-detector/index.d.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/react-resize-detector/index.d.ts b/types/react-resize-detector/index.d.ts
index 87b6c2df6a..7b6f6a3596 100644
--- a/types/react-resize-detector/index.d.ts
+++ b/types/react-resize-detector/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/maslianok/react-resize-detector
 // Definitions by: Matthew James <https://github.com/matthew-matvei>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as React from "react";
 
@@ -13,6 +14,6 @@ interface ReactResizeDetectorProps extends React.Props<ReactResizeDetector> {
     resizableElementId?: string;
 }
 
-declare class ReactResizeDetector extends React.Component<ReactResizeDetectorProps> { }
+declare class ReactResizeDetector extends React.PureComponent<ReactResizeDetectorProps> { }
 
 export = ReactResizeDetector;

From c34bcf86c7d69e1453f6eee3d739685060b9a496 Mon Sep 17 00:00:00 2001
From: Matthew James <matthew.d.james87@gmail.com>
Date: Fri, 2 Mar 2018 17:36:59 +0000
Subject: [PATCH 0181/1382] Updated TypeScript version requirement

---
 types/react-resize-detector/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/react-resize-detector/index.d.ts b/types/react-resize-detector/index.d.ts
index 7b6f6a3596..cc6dc8221b 100644
--- a/types/react-resize-detector/index.d.ts
+++ b/types/react-resize-detector/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/maslianok/react-resize-detector
 // Definitions by: Matthew James <https://github.com/matthew-matvei>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 

From 58f409739741f79118c294af8530a294845648b6 Mon Sep 17 00:00:00 2001
From: Troy McKinnon <troy.t.mckinnon@gmail.com>
Date: Fri, 2 Mar 2018 15:09:54 -0600
Subject: [PATCH 0182/1382] Umzug: custom storage option

---
 types/umzug/index.d.ts | 33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/types/umzug/index.d.ts b/types/umzug/index.d.ts
index 931434aea3..b60028c566 100644
--- a/types/umzug/index.d.ts
+++ b/types/umzug/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/sequelize/umzug
 // Definitions by: Ivan Drinchev <https://github.com/drinchev>
 //                 Margus Lamp <https://github.com/mlamp>
+//                 Troy McKinnon <https://github.com/trodi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -39,10 +40,32 @@ declare namespace umzug {
          * for examples.
          */
         customResolver?(path: string): { up: () => Promise<any>, down?: () => Promise<any> };
-        
+
     }
 
-    interface JSONStorageOptions {
+    /**
+     * In order to keep track of already executed tasks, umzug logs successfully executed migrations.
+     * This is done in order to allow rollbacks of tasks. This is the interface these `Storages` must
+     * follow.
+     */
+    interface Storage {
+        /**
+         * Logs migration to be considered as executed.
+         *
+         * @param migrationName - Name of the migration to be logged.
+         */
+        logMigration(migrationName: string): Promise<void>;
+        /**
+         * Unlogs migration to be considered as pending.
+         *
+         * @param migrationName - Name of the migration to be unlogged.
+         */
+        unlogMigration(migrationName: string): Promise<void>;
+        /** Gets list of executed migrations. */
+        executed(): Promise<String[]>;
+    }
+
+    interface JSONStorageOptions extends Storage {
 
         /**
          * The path to the json storage.
@@ -52,7 +75,7 @@ declare namespace umzug {
 
     }
 
-    interface SequelizeStorageOptions {
+    interface SequelizeStorageOptions extends Storage {
 
         /**
          * The configured instance of Sequelize.
@@ -99,12 +122,10 @@ declare namespace umzug {
     }
 
     interface UmzugOptions {
-
         /**
          * The storage.
-         * Possible values: 'json', 'sequelize', an object
          */
-        storage?: string;
+        storage?: "json" | "sequelize" | Storage;
 
         /**
          * The options for the storage.

From 5e125557340ef360a4114c9e62ec7e04faea766a Mon Sep 17 00:00:00 2001
From: Jamie Bliss <astronouth7303@gmail.com>
Date: Fri, 2 Mar 2018 16:31:12 -0500
Subject: [PATCH 0183/1382] Add missing label to WrappedFieldProps

All of the redux-form examples show `label` being passed to the `component` of a `Field`, and `label` is on `BaseFieldProps` for what's passed to the `Field`. However, `label` is missing from `WrappedFieldProps`, which is what's passed to the thing referenced by `component`.
---
 types/redux-form/lib/Field.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/redux-form/lib/Field.d.ts b/types/redux-form/lib/Field.d.ts
index 7a3c11af3f..a6c2b2e5bb 100644
--- a/types/redux-form/lib/Field.d.ts
+++ b/types/redux-form/lib/Field.d.ts
@@ -72,6 +72,7 @@ export class Field<P = GenericFieldHTMLAttributes | BaseFieldProps> extends Comp
 export interface WrappedFieldProps {
     input: WrappedFieldInputProps;
     meta: WrappedFieldMetaProps;
+    label?: string;
 }
 
 export interface WrappedFieldInputProps extends CommonFieldInputProps {

From 9bab3c124dda39791fb327a0ba6bcc5ee8a26df6 Mon Sep 17 00:00:00 2001
From: cynecx <me@cynecx.net>
Date: Fri, 2 Mar 2018 22:35:11 +0100
Subject: [PATCH 0184/1382] Add missing valid prop to FormFeedback

---
 types/reactstrap/lib/FormFeedback.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/reactstrap/lib/FormFeedback.d.ts b/types/reactstrap/lib/FormFeedback.d.ts
index b5c8f04eae..946aab01d8 100644
--- a/types/reactstrap/lib/FormFeedback.d.ts
+++ b/types/reactstrap/lib/FormFeedback.d.ts
@@ -4,6 +4,7 @@ export interface FormFeedbackProps extends React.HTMLAttributes<HTMLElement> {
   tag?: string;
   className?: string;
   cssModule?: CSSModule;
+  valid?: boolean;
 }
 
 declare const FormFeedback: React.StatelessComponent<FormFeedbackProps>;

From 7d467467b6ed4ab662ca4b32f43f7e257a5d55b9 Mon Sep 17 00:00:00 2001
From: PINGUET Julien <pinguet62@gmail.com>
Date: Fri, 2 Mar 2018 22:27:39 +0100
Subject: [PATCH 0185/1382] [swagger-express-validator] Typing for version 0.0

---
 types/swagger-express-validator/index.d.ts    | 24 ++++++++++++++++++
 .../swagger-express-validator-tests.ts        | 25 +++++++++++++++++++
 types/swagger-express-validator/tsconfig.json | 23 +++++++++++++++++
 types/swagger-express-validator/tslint.json   |  3 +++
 4 files changed, 75 insertions(+)
 create mode 100644 types/swagger-express-validator/index.d.ts
 create mode 100644 types/swagger-express-validator/swagger-express-validator-tests.ts
 create mode 100644 types/swagger-express-validator/tsconfig.json
 create mode 100644 types/swagger-express-validator/tslint.json

diff --git a/types/swagger-express-validator/index.d.ts b/types/swagger-express-validator/index.d.ts
new file mode 100644
index 0000000000..e9e08347b9
--- /dev/null
+++ b/types/swagger-express-validator/index.d.ts
@@ -0,0 +1,24 @@
+// Type definitions for swagger-express-validator 0.0
+// Project: https://github.com/gargol/swagger-express-validator
+// Definitions by: Pinguet62 <https://github.com/pinguet62>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+import { Request, RequestHandler } from "express";
+
+declare function SwaggerExpressValidator(options: SwaggerExpressValidator.Options): RequestHandler;
+
+declare namespace SwaggerExpressValidator {
+    interface Options {
+        schema: string;
+        validateRequest?: boolean;
+        validateResponse?: boolean;
+        allowNullable?: boolean;
+        requestValidationFn?: (req: Request, data: any, errors: any) => void;
+        responseValidationFn?: (req: Request, data: any, errors: any) => void;
+    }
+
+    function validator(options: Options): RequestHandler;
+}
+
+export = SwaggerExpressValidator;
diff --git a/types/swagger-express-validator/swagger-express-validator-tests.ts b/types/swagger-express-validator/swagger-express-validator-tests.ts
new file mode 100644
index 0000000000..f41aa9e829
--- /dev/null
+++ b/types/swagger-express-validator/swagger-express-validator-tests.ts
@@ -0,0 +1,25 @@
+import { Request } from "express";
+import { Options } from "swagger-express-validator";
+import validator = require("swagger-express-validator");
+
+const options: Options = {
+    schema: 'string'
+};
+validator(options);
+
+// minimal required parameter
+validator({
+    schema: 'string'
+});
+
+// all parameters
+validator({
+    schema: 'string',
+    validateRequest: true,
+    validateResponse: true,
+    allowNullable: true,
+    requestValidationFn: (req: Request, data: any, errors: any) => {
+    },
+    responseValidationFn: (req: Request, data: any, errors: any) => {
+    }
+});
diff --git a/types/swagger-express-validator/tsconfig.json b/types/swagger-express-validator/tsconfig.json
new file mode 100644
index 0000000000..a831b44ee7
--- /dev/null
+++ b/types/swagger-express-validator/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "swagger-express-validator-tests.ts"
+    ]
+}
diff --git a/types/swagger-express-validator/tslint.json b/types/swagger-express-validator/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/swagger-express-validator/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}

From 61a3511bdeaba47501942d1cf1cc1bbecd00df71 Mon Sep 17 00:00:00 2001
From: Jamie Bliss <astronouth7303@gmail.com>
Date: Fri, 2 Mar 2018 16:55:30 -0500
Subject: [PATCH 0186/1382] Update tests

---
 types/redux-form/redux-form-tests.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/redux-form/redux-form-tests.tsx b/types/redux-form/redux-form-tests.tsx
index 8949fa6ec2..f4317ade87 100644
--- a/types/redux-form/redux-form-tests.tsx
+++ b/types/redux-form/redux-form-tests.tsx
@@ -109,6 +109,7 @@ interface MyFieldCustomProps {
 type MyFieldProps = MyFieldCustomProps & WrappedFieldProps;
 const MyField: React.StatelessComponent<MyFieldProps> = ({
     children,
+    label,
     input,
     meta,
     foo

From 364becebfae5ec80cc11ff6a227e68ac37713b81 Mon Sep 17 00:00:00 2001
From: shrey <shrey-jain@hotmail.com>
Date: Fri, 2 Mar 2018 17:19:46 -0500
Subject: [PATCH 0187/1382] Update missing functions/deprecated functions.

---
 types/raven/index.d.ts     | 71 ++++++++++++++++++++++++--------------
 types/raven/raven-tests.ts |  3 +-
 2 files changed, 46 insertions(+), 28 deletions(-)

diff --git a/types/raven/index.d.ts b/types/raven/index.d.ts
index 21aee49169..db59721513 100644
--- a/types/raven/index.d.ts
+++ b/types/raven/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/getsentry/raven-node
 // Definitions by: Scott Cooper <https://github.com/scttcper>
 //                 Dmitrii Sorin <https://github.com/1999>
+//                 Shrey Jain <https://github.com/shreyjain1994>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -9,34 +10,50 @@
 import { IncomingMessage, ServerResponse } from 'http';
 import { EventEmitter } from 'events';
 
-export const version: string;
+// expose all methods of `Client` class since raven exposes a singleton instance
+// todo: there has to be a better way of doing this that doesn't require duplicating so much stuff
 export function config(options?: ConstructorOptions): Client;
 export function config(dsn?: string | false, options?: ConstructorOptions): Client;
+export function install(cb?: FatalErrorCallback): Client;
+export function uninstall(): Client;
 export function wrap<T>(func: () => T): () => T;
 export function wrap<T>(options: any, func: () => T): () => T;
-export function interceptErr(ctx: any): Client;
+export function interceptErr(ctx: any): Client; // todo: part of public?
 export function setContext(ctx: any): Client;
-export function captureException(e: Error, cb?: CaptureCallback): string;
-export function captureException(e: Error, options?: CaptureOptions, cb?: CaptureCallback): string;
-export function captureMessage(message: string, cb?: CaptureCallback): string;
-export function captureMessage(message: string, options?: CaptureOptions, cb?: CaptureCallback): string;
 export function mergeContext(ctx: any): Client;
 export function getContext(): any;
 export function requestHandler(): (req: IncomingMessage, res: ServerResponse, next: () => void) => void;
 export function errorHandler(): (e: Error, req: IncomingMessage, res: ServerResponse, next: () => void) => void;
+export function captureException(e: Error, cb?: CaptureCallback): string;
+export function captureException(e: Error, options?: CaptureOptions, cb?: CaptureCallback): string;
+export function captureMessage(message: string, cb?: CaptureCallback): string;
+export function captureMessage(message: string, options?: CaptureOptions, cb?: CaptureCallback): string;
+export function captureBreadcrumb(breadcrumb: any): void;
+export function setDataCallback(fn: DataCallback): Client;
+export function setShouldSendCallback(fn: ShouldSendCallback): Client;
 export function context<T>(ctx: any, func: () => T): T;
 export function context<T>(func: () => T): T;
-export function captureBreadcrumb(breadcrumb: any): void;
+
+export const version: string;
 export function disableConsoleAlerts(): void;
-export function consoleAlert(msg: string): void;
-export function parseDSN(dsn: string | false): parsedDSN;
+
+export namespace utils {
+    function consoleAlert(msg: string): void;
+    function parseDSN(dsn: string | false): parsedDSN | false;
+}
 
 export class Client extends EventEmitter {
-    constructor(options: ConstructorOptions);
-    constructor(dsn: string, options?: ConstructorOptions);
-    config(dsn: string, options?: ConstructorOptions): this;
-    install(options?: ConstructorOptions, cb?: () => void): this;
+    constructor(options?: ConstructorOptions);
+    constructor(dsn?: string | false, options?: ConstructorOptions);
+    config(options?: ConstructorOptions): this;
+    config(dsn?: string | false, options?: ConstructorOptions): this;
+    install(cb?: FatalErrorCallback): this;
+    uninstall(): this;
+    wrap<T>(func: () => T): () => T;
+    wrap<T>(options: any, func: () => T): () => T;
     setContext(ctx: any): this;
+    mergeContext(ctx: any): this;
+    getContext(): any;
     requestHandler(): (req: IncomingMessage, res: ServerResponse, next: () => void) => void;
     errorHandler(): (e: Error, req: IncomingMessage, res: ServerResponse, next: () => void) => void;
     captureException(error: Error, cb?: CaptureCallback): string;
@@ -44,13 +61,12 @@ export class Client extends EventEmitter {
     captureMessage(message: string, cb?: CaptureCallback): string;
     captureMessage(message: string, options?: CaptureOptions, cb?: CaptureCallback): string;
     captureBreadcrumb(breadcrumb: any): void;
-    setUserContext(data: UserData): void;
-    setDataCallback(fn: DataCallback): void;
+    setDataCallback(fn: DataCallback): this;
     setShouldSendCallback(fn: ShouldSendCallback): this;
     context<T>(ctx: any, func: () => T): T;
     context<T>(func: () => T): T;
-    process(kwargs: any, cb?: () => void): void;
-    process(eventId: string, kwargs: any, cb?: () => void): void;
+    process(kwargs: any, cb?: () => void): void; // todo: part of public API?
+    process(eventId: string, kwargs: any, cb?: () => void): void; // todo: part of public API?
 }
 
 export interface ConstructorOptions {
@@ -65,19 +81,15 @@ export interface ConstructorOptions {
     sampleRate?: number;
     sendTimeout?: number;
     shouldSendCallback?: ShouldSendCallback;
-    transport?(): void;
+    transport?: TransportCallback;
     captureUnhandledRejections?: boolean;
-    autoBreadcrumbs?: boolean | any;
+    maxBreadcrumbs?: number;
+    autoBreadcrumbs?: boolean | { [breadcrumbType: string]: boolean };
     parseUser?: boolean | string[] | parseUserCallback;
 }
 
 export type parseUserCallback = (req: any) => any;
 
-export interface UserData {
-    id: string;
-    handle?: string;
-}
-
 export interface parsedDSN {
     protocol: string;
     public_key: string;
@@ -88,9 +100,16 @@ export interface parsedDSN {
     port: number;
 }
 
-export type CaptureCallback = (err: { [key: string]: any }, eventId: any) => void;
+export type FatalErrorCallback = (err: Error, sendErr: Error | null | undefined, eventId: string) => void;
 
-export type DataCallback = (data: { [key: string]: any }) => void;
+export type CaptureCallback = (sendErr: Error | null | undefined, eventId: any) => void;
+
+/**
+ * Needs to return the modified data. It is not enough
+ * to just mutate the data and return nothing.
+ * https://github.com/getsentry/raven-node/blob/6f7145161a33134168ca87b53bb99b9b6d3c89e4/lib/client.js#L246-L248
+ */
+export type DataCallback = (data: { [key: string]: any }) => any;
 
 export type ShouldSendCallback = (data: { [key: string]: any }) => boolean;
 
diff --git a/types/raven/raven-tests.ts b/types/raven/raven-tests.ts
index 71f9b54038..927125f84f 100644
--- a/types/raven/raven-tests.ts
+++ b/types/raven/raven-tests.ts
@@ -13,7 +13,6 @@ console.log(Raven.version);
 Raven.config({
     release: 'foobar'
 });
-Raven.config(dsn).install({ captureUnhandledRejections: true });
 client.setContext({});
 client.on('logged', () => { });
 client.process({});
@@ -34,4 +33,4 @@ Raven.context(() => {
     Raven.captureBreadcrumb({});
 });
 setTimeout(Raven.wrap(() => {}), 1000);
-Raven.parseDSN('https://8769c40cf49c4cc58b51fa45d8e2d166:296768aa91084e17b5ac02d3ad5bc7e7@app.getsentry.com/269');
+Raven.utils.parseDSN('https://8769c40cf49c4cc58b51fa45d8e2d166:296768aa91084e17b5ac02d3ad5bc7e7@app.getsentry.com/269');

From 3f1fafbac699e6fa0c2912f634c0334482d2727d Mon Sep 17 00:00:00 2001
From: Matthew James <matthew.d.james87@gmail.com>
Date: Fri, 2 Mar 2018 22:32:45 +0000
Subject: [PATCH 0188/1382] Added comments

---
 types/react-resize-detector/index.d.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/types/react-resize-detector/index.d.ts b/types/react-resize-detector/index.d.ts
index cc6dc8221b..cb275de3ff 100644
--- a/types/react-resize-detector/index.d.ts
+++ b/types/react-resize-detector/index.d.ts
@@ -7,10 +7,15 @@
 import * as React from "react";
 
 interface ReactResizeDetectorProps extends React.Props<ReactResizeDetector> {
+    /** Function that will be invoked with width and height arguments */
     onResize: (width: number, height: number) => void;
+    /** Trigger onResize on height change. Default: false */
     handleHeight?: boolean;
+    /** Trigger onResize on width change. Default: false */
     handleWidth?: boolean;
+    /** Do not trigger onResize when a component mounts. Default: false */
     skipOnMount?: boolean;
+    /** Id of the element we want to observe. If none provided, parentElement of the component will be used. Default: "" */
     resizableElementId?: string;
 }
 

From 6a0889aef2047bdc396446c7a19d3c560129759c Mon Sep 17 00:00:00 2001
From: Ahn <anhpnnd@gmail.com>
Date: Sat, 3 Mar 2018 00:02:03 +0100
Subject: [PATCH 0189/1382] Add types for creating async functions in Jest 22.2

---
 types/jest/index.d.ts    | 10 +++++++---
 types/jest/jest-tests.ts | 39 ++++++++++++++++++++++++++++++++++-----
 2 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/types/jest/index.d.ts b/types/jest/index.d.ts
index e82da44d3c..80957f32ad 100644
--- a/types/jest/index.d.ts
+++ b/types/jest/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Jest 22.1
+// Type definitions for Jest 22.2
 // Project: http://facebook.github.io/jest/
 // Definitions by: Asana <https://asana.com>
 //                 Ivo Stratev <https://github.com/NoHomey>
@@ -527,16 +527,20 @@ declare namespace jest {
     } & T;
 
     interface MockInstance<T> {
+        getMockName(): string;
         mock: MockContext<T>;
         mockClear(): void;
         mockReset(): void;
         mockImplementation(fn: (...args: any[]) => any): Mock<T>;
         mockImplementationOnce(fn: (...args: any[]) => any): Mock<T>;
+        mockName(name: string): Mock<T>;
         mockReturnThis(): Mock<T>;
         mockReturnValue(value: any): Mock<T>;
         mockReturnValueOnce(value: any): Mock<T>;
-        mockName(name: string): Mock<T>;
-        getMockName(): string;
+        mockResolvedValue(value: any): Mock<T>;
+        mockResolvedValueOnce(value: any): Mock<T>;
+        mockRejectedValue(value: any): Mock<T>;
+        mockRejectedValueOnce(value: any): Mock<T>;
     }
 
     interface MockContext<T> {
diff --git a/types/jest/jest-tests.ts b/types/jest/jest-tests.ts
index 4c37f2bb65..cc73b0b054 100644
--- a/types/jest/jest-tests.ts
+++ b/types/jest/jest-tests.ts
@@ -309,7 +309,7 @@ describe('missing tests', () => {
        expect(spy).lastCalledWith('jest');
        expect(spy).toBeCalledWith('jest');
        expect(jest.isMockFunction(spy)).toBeTruthy();
-   });
+    });
 
     it('tests all missing Mocks functionality', () => {
        type FruitsGetter = () => string[];
@@ -328,6 +328,35 @@ describe('missing tests', () => {
        expect(thisMock()).toBe(this);
    });
 
+    it('async test with mockResolvedValue and mockResolvedValueOnce', async () => {
+      const asyncMock = jest
+        .fn()
+        .mockResolvedValue('default')
+        .mockResolvedValueOnce('first call')
+        .mockResolvedValueOnce('second call');
+
+      await asyncMock(); // first call
+      await asyncMock(); // second call
+      await asyncMock(); // default
+      await asyncMock(); // default
+    });
+
+    it('async test with mockRejectedValue', async () => {
+      const asyncMock = jest.fn().mockRejectedValue(new Error('Async error'));
+
+      await asyncMock(); // throws "Async error"
+    });
+
+    it('async test with mockResolvedValueOnce and mockRejectedValueOnce', async () => {
+      const asyncMock = jest
+        .fn()
+        .mockResolvedValueOnce('first call')
+        .mockRejectedValueOnce(new Error('Async error'));
+
+      await asyncMock(); // first call
+      await asyncMock(); // throws "Async error"
+    });
+
     it('tests mock name functionality', () => {
         const mock: jest.Mock = jest.fn();
         mock.mockName('Carrot');
@@ -339,27 +368,27 @@ describe('missing tests', () => {
        const render: () => string = require('./render');
        expect(render()).toMatch(/Link/);
        jest.enableAutomock();
-   });
+    });
 
     it('runs only pending timers', () => {
         jest.useRealTimers();
         setTimeout(() => expect(1).not.toEqual(0), 3000);
         jest.runOnlyPendingTimers().runTimersToTime(300);
-   });
+    });
 
     it('runs all timers', () => {
         jest.clearAllTimers();
         jest.useFakeTimers();
         setTimeout(() => expect(0).not.toEqual(1), 3000);
         jest.runAllTimers();
-   });
+    });
 
     it('cleares cache', () => {
        const sum1 = require('../sum');
        jest.resetModules();
        const sum2 = require('../sum');
        expect(sum1).not.toBe(sum2);
-   });
+    });
 });
 
 describe('toMatchSnapshot', () => {

From 9f791324d5df5065d539a9b474105f74d5d22b9b Mon Sep 17 00:00:00 2001
From: Dusan Radovanovic <dusan.radovanovic@elasticpath.com>
Date: Fri, 2 Mar 2018 15:18:22 -0800
Subject: [PATCH 0190/1382] Added type definitions for listr module

---
 types/listr/index.d.ts     |  49 ++++++++++++
 types/listr/listr-tests.ts | 153 +++++++++++++++++++++++++++++++++++++
 types/listr/tsconfig.json  |  24 ++++++
 types/listr/tslint.json    |   1 +
 4 files changed, 227 insertions(+)
 create mode 100644 types/listr/index.d.ts
 create mode 100644 types/listr/listr-tests.ts
 create mode 100644 types/listr/tsconfig.json
 create mode 100644 types/listr/tslint.json

diff --git a/types/listr/index.d.ts b/types/listr/index.d.ts
new file mode 100644
index 0000000000..288c387bd9
--- /dev/null
+++ b/types/listr/index.d.ts
@@ -0,0 +1,49 @@
+// Type definitions for listr 0.13
+// Project: https://github.com/samverschueren/listr#readme
+// Definitions by: Dusan Radovanovic <https://github.com/durad>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import * as stream from "stream";
+
+interface ListrRenderer {
+    nonTTY: boolean;
+    render(): void;
+    end(): void;
+}
+
+interface ListrOptions {
+    concurrent?: boolean | number;
+    exitOnError?: boolean;
+    renderer?: "silent" | "default" | "verbose" | ListrRenderer;
+    nonTTYRenderer?: "silent" | "default" | "verbose" | ListrRenderer;
+}
+
+interface ListrTask {
+    title: string;
+    output?: string;
+    task: (ctx: any, task: ListrTaskWrapper) => void | string | Promise<any> | stream.Readable | Listr;
+    skip?: (ctx: any, task: ListrTaskWrapper) => boolean | Promise<boolean> | string | void;
+    enabled?: (ctx: any, task: ListrTaskWrapper) => boolean | Promise<boolean>;
+}
+
+interface ListrTaskWrapper {
+    title: string;
+    output: any;
+    report(error: Error): void;
+    skip(message: string): void;
+    run(ctx?: any): Promise<any>;
+}
+
+declare class Listr {
+    constructor(tasks?: ListrTask[], options?: ListrOptions);
+    constructor(options?: ListrOptions);
+    add(tasks: ListrTask | ListrTask[]): void;
+    run(ctx?: any): Promise<any>;
+}
+
+declare namespace Listr {
+}
+
+export = Listr;
diff --git a/types/listr/listr-tests.ts b/types/listr/listr-tests.ts
new file mode 100644
index 0000000000..528a207658
--- /dev/null
+++ b/types/listr/listr-tests.ts
@@ -0,0 +1,153 @@
+import * as Listr from "listr";
+import * as fs from "fs";
+
+const tasks = new Listr([
+    {
+        title: 'Git',
+        task: () => {
+            return new Listr([
+                {
+                    title: 'Checking git status',
+                    task: () => new Promise(resolve => resolve())
+                        .then(result => {
+                        if (result !== '') {
+                            throw new Error('Unclean working tree. Commit or stash changes first.');
+                        }
+                    })
+                },
+                {
+                    title: 'Checking remote history',
+                    task: () => new Promise(resolve => resolve())
+                        .then(result => {
+                        if (result !== '0') {
+                            throw new Error('Remote history differ. Please pull changes.');
+                        }
+                    })
+                }
+            ],
+            { concurrent: true });
+        }
+    },
+    {
+        title: 'Install package dependencies with Yarn',
+        task: (ctx, task) => new Promise(resolve => resolve())
+            .catch(() => {
+                ctx.yarn = false;
+
+                task.skip('Yarn not available, install it via `npm install -g yarn`');
+            })
+    },
+    {
+        title: 'Install package dependencies with npm',
+        enabled: ctx => ctx.yarn === false,
+        task: () => new Promise(resolve => resolve())
+    },
+    {
+        title: 'Run tests',
+        task: () => new Promise(resolve => resolve())
+    },
+    {
+        title: 'Publish package',
+        task: () => new Promise(resolve => resolve())
+    }
+]);
+
+tasks.run().catch(err => {
+});
+
+const tasks2 = new Listr([
+    {
+        title: 'Success',
+        task: () => 'Foo'
+    },
+    {
+        title: 'Failure',
+        task: () => {
+            throw new Error('Bar');
+        }
+    }
+]);
+
+const tasks3 = new Listr([
+    {
+        title: 'Success',
+        task: () => Promise.resolve('Foo')
+    },
+    {
+        title: 'Failure',
+        task: () => Promise.reject(new Error('Bar'))
+    }
+]);
+
+const tasks4 = new Listr([
+    {
+        title: 'File',
+        task: () => fs.createReadStream('data.txt', 'utf8')
+    }
+]);
+
+const tasks5 = new Listr([
+    {
+        title: 'Task 1',
+        task: () => Promise.resolve('Foo')
+    },
+    {
+        title: 'Can be skipped',
+        skip: () => {
+            if (Math.random() > 0.5) {
+                return 'Reason for skipping';
+            }
+        },
+        task: () => 'Bar'
+    },
+    {
+        title: 'Task 3',
+        task: () => Promise.resolve('Bar')
+    }
+]);
+
+const tasks6 = new Listr([
+    {
+        title: 'Install package dependencies with Yarn',
+        task: (ctx, task) => new Promise(resolve => resolve())
+            .catch(() => {
+                ctx.yarn = false;
+
+                task.skip('Yarn not available, install it via `npm install -g yarn`');
+            })
+    },
+    {
+        title: 'Install package dependencies with npm',
+        enabled: ctx => ctx.yarn === false,
+        task: () => new Promise(resolve => resolve())
+    }
+]);
+
+const tasks7 = new Listr([
+    {
+        title: 'Task 1',
+        skip: ctx => ctx.foo === 'bar',
+        task: () => Promise.resolve('Foo')
+    },
+    {
+        title: 'Can be skipped',
+        skip: () => {
+            if (Math.random() > 0.5) {
+                return 'Reason for skipping';
+            }
+        },
+        task: ctx => {
+            ctx.unicorn = 'rainbow';
+        }
+    },
+    {
+        title: 'Task 3',
+        task: ctx => Promise.resolve(`${ctx.foo} ${ctx.bar}`)
+    }
+]);
+
+tasks.run({
+    foo: 'bar'
+}).then(ctx => {
+    console.log(ctx);
+});
diff --git a/types/listr/tsconfig.json b/types/listr/tsconfig.json
new file mode 100644
index 0000000000..cae79d1480
--- /dev/null
+++ b/types/listr/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "listr-tests.ts"
+    ]
+}
diff --git a/types/listr/tslint.json b/types/listr/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/listr/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 3d5b4b45b0ddd2087cecfe98a09076de84765b5f Mon Sep 17 00:00:00 2001
From: Patrick Metcalfe <spam@patrickmetcalfe.com>
Date: Fri, 2 Mar 2018 16:07:05 -0800
Subject: [PATCH 0191/1382] Webpack Definition: Fix typo in comment

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

diff --git a/types/webpack/index.d.ts b/types/webpack/index.d.ts
index d6102808b6..7ac0df3196 100644
--- a/types/webpack/index.d.ts
+++ b/types/webpack/index.d.ts
@@ -168,7 +168,7 @@ declare namespace webpack {
          *   <li>"commonjs2" - Export by setting module.exports: module.exports = xxx</li>
          *   <li>"amd" - Export to AMD (optionally named)</li>
          *   <li>"umd" - Export to AMD, CommonJS2 or as property in root</li>
-         *   <li>"window" - Assign to widnow</li>
+         *   <li>"window" - Assign to window</li>
          *   <li>"assign" - Assign to a global variable</li>
          *   <li>"jsonp" - Generate Webpack JSONP module<li>
          * </ul>

From fa04697ee1fc62a8cbfe1c5f3998fe903812b399 Mon Sep 17 00:00:00 2001
From: ArmandoAssuncao <armando.assuncao.93@gmail.com>
Date: Fri, 2 Mar 2018 23:07:22 -0300
Subject: [PATCH 0192/1382] [react-navigation]: added types in navigate params

---
 types/react-navigation/index.d.ts                 | 5 +++--
 types/react-navigation/react-navigation-tests.tsx | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index c4e396783f..b6897b11c8 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -14,6 +14,7 @@
 //                 Veit Lehmann: <https://github.com/levito>
 //                 Roberto Huertas: <https://github.com/robertohuertasm>
 //                 Steven Miller <https://github.com/YourGamesBeOver>
+//                 Armando Assuncao <https://github.com/ArmandoAssuncao>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -396,13 +397,13 @@ export interface NavigationEventSubscription {
   remove: () => void;
 }
 
-export interface NavigationScreenProp<S> {
+export interface NavigationScreenProp<S, P = NavigationParams> {
   state: S;
   dispatch: NavigationDispatch;
   goBack: (routeKey?: (string | null)) => boolean;
   navigate: (
     routeName: string,
-    params?: NavigationParams,
+    params?: P,
     action?: NavigationAction
   ) => boolean;
   setParams: (newParams: NavigationParams) => boolean;
diff --git a/types/react-navigation/react-navigation-tests.tsx b/types/react-navigation/react-navigation-tests.tsx
index 017a9b9153..54489ba722 100644
--- a/types/react-navigation/react-navigation-tests.tsx
+++ b/types/react-navigation/react-navigation-tests.tsx
@@ -250,7 +250,7 @@ function renderBasicDrawerNavigator(): JSX.Element {
 }
 
 interface CustomTransitionerProps {
-    navigation: NavigationScreenProp<any>;
+    navigation: NavigationScreenProp<any, any>;
 }
 /**
  * @desc Custom transitioner component. Follows react-navigation/src/views/CardStackTransitioner.js.

From 7c51b4f0031e340800a7716dcff1e679f6b8f3ca Mon Sep 17 00:00:00 2001
From: Dusan Radovanovic <dusan.radovanovic@elasticpath.com>
Date: Fri, 2 Mar 2018 19:01:31 -0800
Subject: [PATCH 0193/1382] Converted arrays to ReadOnlyArray

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

diff --git a/types/listr/index.d.ts b/types/listr/index.d.ts
index 288c387bd9..18f32ec3c0 100644
--- a/types/listr/index.d.ts
+++ b/types/listr/index.d.ts
@@ -37,9 +37,9 @@ interface ListrTaskWrapper {
 }
 
 declare class Listr {
-    constructor(tasks?: ListrTask[], options?: ListrOptions);
+    constructor(tasks?: ReadonlyArray<ListrTask>, options?: ListrOptions);
     constructor(options?: ListrOptions);
-    add(tasks: ListrTask | ListrTask[]): void;
+    add(tasks: ListrTask | ReadonlyArray<ListrTask>): void;
     run(ctx?: any): Promise<any>;
 }
 

From 4b342d3cf1fb78b2a092147bf7237713e47d75b6 Mon Sep 17 00:00:00 2001
From: Matthew James <matthew.d.james87@gmail.com>
Date: Sat, 3 Mar 2018 08:26:02 +0000
Subject: [PATCH 0194/1382] Added usage test

---
 types/react-resize-detector/index.d.ts        |  2 +-
 .../react-resize-detector-tests.tsx           | 31 +++++++++++++++++++
 types/react-resize-detector/tsconfig.json     |  7 +++--
 3 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 types/react-resize-detector/react-resize-detector-tests.tsx

diff --git a/types/react-resize-detector/index.d.ts b/types/react-resize-detector/index.d.ts
index cb275de3ff..1bf1ebfb39 100644
--- a/types/react-resize-detector/index.d.ts
+++ b/types/react-resize-detector/index.d.ts
@@ -21,4 +21,4 @@ interface ReactResizeDetectorProps extends React.Props<ReactResizeDetector> {
 
 declare class ReactResizeDetector extends React.PureComponent<ReactResizeDetectorProps> { }
 
-export = ReactResizeDetector;
+export default ReactResizeDetector;
diff --git a/types/react-resize-detector/react-resize-detector-tests.tsx b/types/react-resize-detector/react-resize-detector-tests.tsx
new file mode 100644
index 0000000000..785b5cc7fe
--- /dev/null
+++ b/types/react-resize-detector/react-resize-detector-tests.tsx
@@ -0,0 +1,31 @@
+// Adapted from example provided at https://github.com/maslianok/react-resize-detector
+
+import * as React from "react";
+import * as ReactDOM from "react-dom";
+
+import ReactResizeRouter from "./index";
+
+class App extends React.PureComponent {
+    constructor(props: {}) {
+        super(props);
+
+        this.handleResize = this.handleResize.bind;
+    }
+
+    render(): JSX.Element {
+        return <div>
+            <div>Some child content</div>
+            <ReactResizeRouter
+                onResize={this.handleResize}
+                handleWidth
+                handleHeight
+                skipOnMount
+                resizableElementId="someElement" />
+        </div>;
+    }
+
+    private handleResize(width: number, height: number) {
+        console.log(`width = ${width}`);
+        console.log(`height = ${height}`);
+    }
+}
diff --git a/types/react-resize-detector/tsconfig.json b/types/react-resize-detector/tsconfig.json
index ecc22c8314..b6f1863fc0 100644
--- a/types/react-resize-detector/tsconfig.json
+++ b/types/react-resize-detector/tsconfig.json
@@ -2,12 +2,14 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es6"
+            "es6",
+            "dom"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
         "strictFunctionTypes": true,
+        "jsx": "react",
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -17,6 +19,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "index.d.ts"
+        "index.d.ts",
+        "react-resize-detector-tests.tsx"
     ]
 }

From 375676a4f3225ae07b0095f2e476be5adefc39c3 Mon Sep 17 00:00:00 2001
From: Matthew James <matthew.d.james87@gmail.com>
Date: Sat, 3 Mar 2018 08:36:59 +0000
Subject: [PATCH 0195/1382] Avoiding relative import

---
 types/react-resize-detector/react-resize-detector-tests.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/react-resize-detector/react-resize-detector-tests.tsx b/types/react-resize-detector/react-resize-detector-tests.tsx
index 785b5cc7fe..33b4fcec40 100644
--- a/types/react-resize-detector/react-resize-detector-tests.tsx
+++ b/types/react-resize-detector/react-resize-detector-tests.tsx
@@ -3,7 +3,7 @@
 import * as React from "react";
 import * as ReactDOM from "react-dom";
 
-import ReactResizeRouter from "./index";
+import ReactResizeRouter from "react-resize-detector";
 
 class App extends React.PureComponent {
     constructor(props: {}) {

From 465bcc532a1d41cef2d6f31822d5305faeffd033 Mon Sep 17 00:00:00 2001
From: Ragg <Ragg-@users.noreply.github.com>
Date: Sat, 3 Mar 2018 18:42:10 +0900
Subject: [PATCH 0196/1382] Add type for `react-rnd`

---
 types/react-rnd/index.d.ts          | 105 ++++++++++++++++++++++++++++
 types/react-rnd/react-rnd-tests.tsx |   4 ++
 types/react-rnd/tsconfig.json       |  24 +++++++
 types/react-rnd/tslint.json         |   1 +
 4 files changed, 134 insertions(+)
 create mode 100644 types/react-rnd/index.d.ts
 create mode 100644 types/react-rnd/react-rnd-tests.tsx
 create mode 100644 types/react-rnd/tsconfig.json
 create mode 100644 types/react-rnd/tslint.json

diff --git a/types/react-rnd/index.d.ts b/types/react-rnd/index.d.ts
new file mode 100644
index 0000000000..24cef31e45
--- /dev/null
+++ b/types/react-rnd/index.d.ts
@@ -0,0 +1,105 @@
+// Type definitions for react-rnd 7.3
+// Project: https://github.com/bokuweb/react-rnd
+// Definitions by: Ragg <https://github.com/Ragg->
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+import * as React from 'react';
+
+type CSSProperties = React.CSSProperties;
+
+interface HandleClasses {
+    bottom?: string;
+    bottomLeft?: string;
+    bottomRight?: string;
+    left?: string;
+    right?: string;
+    top?: string;
+    topLeft?: string;
+    topRight?: string;
+}
+
+interface HandleStyles {
+    bottom?: CSSProperties;
+    bottomLeft?: CSSProperties;
+    bottomRight?: CSSProperties;
+    left?: CSSProperties;
+    right?: CSSProperties;
+    top?: CSSProperties;
+    topLeft?: CSSProperties;
+    topRight?: CSSProperties;
+}
+
+type Direction =
+    | 'bottom'
+    | 'bottomLeft'
+    | 'bottomRight'
+    | 'left'
+    | 'right'
+    | 'top'
+    | 'topLeft'
+    | 'topRight';
+
+interface Position {
+    x: number;
+    y: number;
+}
+
+interface Size {
+    width: number;
+    height: number;
+}
+
+interface DraggableData {
+    node: HTMLElement;
+    x: number;
+    y: number;
+    deltaX: number;
+    deltaY: number;
+    lastX: number;
+    lastY: number;
+}
+
+type DraggableEventHandler = (e: MouseEvent | TouchEvent, data: DraggableData) => void|false;
+
+type ResizeHandler = (
+    e: MouseEvent|TouchEvent,
+    direction: Direction,
+    ref: HTMLDivElement,
+    delta: Size,
+    position: Position
+) => void;
+
+interface Options {
+    default: {
+        x?: number;
+        y?: number;
+        width?: number|string;
+        height?: number|string;
+    };
+    className: string;
+    style: any;
+    width: number|string;
+    height: number|string;
+    minWidth: number|string;
+    minHeight: number|string;
+    maxWidth: number|string;
+    maxHeight: number|string;
+    z: number;
+    resizeHandleClasses: HandleClasses;
+    resizeHandleStyles: HandleStyles;
+
+    lockAspectRatio: boolean;
+    enableResizing: boolean;
+
+    onResizeStart: () => void;
+    onResize: () => void;
+    onResizeStop: ResizeHandler;
+
+    onDragStart: DraggableEventHandler;
+    onDrag: DraggableEventHandler;
+    onDragStop: DraggableEventHandler;
+}
+
+declare class Rnd extends React.Component<Partial<Options>> {}
+
+export default Rnd;
diff --git a/types/react-rnd/react-rnd-tests.tsx b/types/react-rnd/react-rnd-tests.tsx
new file mode 100644
index 0000000000..1586daadbf
--- /dev/null
+++ b/types/react-rnd/react-rnd-tests.tsx
@@ -0,0 +1,4 @@
+import * as React from 'react';
+import Rnd from 'react-rnd';
+
+<Rnd  />;
diff --git a/types/react-rnd/tsconfig.json b/types/react-rnd/tsconfig.json
new file mode 100644
index 0000000000..b28250424f
--- /dev/null
+++ b/types/react-rnd/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react"
+    },
+    "files": [
+        "index.d.ts",
+        "react-rnd-tests.tsx"
+    ]
+}
diff --git a/types/react-rnd/tslint.json b/types/react-rnd/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-rnd/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 55e319a33580fc89fbcab067c4368f23e0655100 Mon Sep 17 00:00:00 2001
From: Ragg <Ragg-@users.noreply.github.com>
Date: Sat, 3 Mar 2018 18:56:54 +0900
Subject: [PATCH 0197/1382] Export handler and options types

---
 types/react-rnd/index.d.ts          | 188 ++++++++++++++--------------
 types/react-rnd/react-rnd-tests.tsx |  18 ++-
 types/react-rnd/tsconfig.json       |   1 +
 3 files changed, 113 insertions(+), 94 deletions(-)

diff --git a/types/react-rnd/index.d.ts b/types/react-rnd/index.d.ts
index 24cef31e45..5e053c28c4 100644
--- a/types/react-rnd/index.d.ts
+++ b/types/react-rnd/index.d.ts
@@ -2,104 +2,106 @@
 // Project: https://github.com/bokuweb/react-rnd
 // Definitions by: Ragg <https://github.com/Ragg->
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 import * as React from 'react';
 
 type CSSProperties = React.CSSProperties;
 
-interface HandleClasses {
-    bottom?: string;
-    bottomLeft?: string;
-    bottomRight?: string;
-    left?: string;
-    right?: string;
-    top?: string;
-    topLeft?: string;
-    topRight?: string;
+declare namespace Rnd {
+    type Direction =
+        | 'bottom'
+        | 'bottomLeft'
+        | 'bottomRight'
+        | 'left'
+        | 'right'
+        | 'top'
+        | 'topLeft'
+        | 'topRight';
+
+    export interface HandleClasses {
+        bottom?: string;
+        bottomLeft?: string;
+        bottomRight?: string;
+        left?: string;
+        right?: string;
+        top?: string;
+        topLeft?: string;
+        topRight?: string;
+    }
+
+    export interface HandleStyles {
+        bottom?: CSSProperties;
+        bottomLeft?: CSSProperties;
+        bottomRight?: CSSProperties;
+        left?: CSSProperties;
+        right?: CSSProperties;
+        top?: CSSProperties;
+        topLeft?: CSSProperties;
+        topRight?: CSSProperties;
+    }
+
+    export interface Position {
+        x: number;
+        y: number;
+    }
+
+    export interface Size {
+        width: number;
+        height: number;
+    }
+
+    export interface DraggableData {
+        node: HTMLElement;
+        x: number;
+        y: number;
+        deltaX: number;
+        deltaY: number;
+        lastX: number;
+        lastY: number;
+    }
+
+    export type DraggableEventHandler = (e: MouseEvent | TouchEvent, data: DraggableData) => void|false;
+
+    export type ResizeHandler = (
+        e: MouseEvent|TouchEvent,
+        direction: Direction,
+        ref: HTMLDivElement,
+        delta: Size,
+        position: Position
+    ) => void;
+
+    export interface Options {
+        default: {
+            x?: number;
+            y?: number;
+            width?: number|string;
+            height?: number|string;
+        };
+        className: string;
+        style: any;
+        width: number|string;
+        height: number|string;
+        minWidth: number|string;
+        minHeight: number|string;
+        maxWidth: number|string;
+        maxHeight: number|string;
+        z: number;
+        resizeHandleClasses: HandleClasses;
+        resizeHandleStyles: HandleStyles;
+
+        lockAspectRatio: boolean;
+        enableResizing: boolean;
+
+        onResizeStart: () => void;
+        onResize: () => void;
+        onResizeStop: ResizeHandler;
+
+        onDragStart: DraggableEventHandler;
+        onDrag: DraggableEventHandler;
+        onDragStop: DraggableEventHandler;
+    }
 }
 
-interface HandleStyles {
-    bottom?: CSSProperties;
-    bottomLeft?: CSSProperties;
-    bottomRight?: CSSProperties;
-    left?: CSSProperties;
-    right?: CSSProperties;
-    top?: CSSProperties;
-    topLeft?: CSSProperties;
-    topRight?: CSSProperties;
-}
-
-type Direction =
-    | 'bottom'
-    | 'bottomLeft'
-    | 'bottomRight'
-    | 'left'
-    | 'right'
-    | 'top'
-    | 'topLeft'
-    | 'topRight';
-
-interface Position {
-    x: number;
-    y: number;
-}
-
-interface Size {
-    width: number;
-    height: number;
-}
-
-interface DraggableData {
-    node: HTMLElement;
-    x: number;
-    y: number;
-    deltaX: number;
-    deltaY: number;
-    lastX: number;
-    lastY: number;
-}
-
-type DraggableEventHandler = (e: MouseEvent | TouchEvent, data: DraggableData) => void|false;
-
-type ResizeHandler = (
-    e: MouseEvent|TouchEvent,
-    direction: Direction,
-    ref: HTMLDivElement,
-    delta: Size,
-    position: Position
-) => void;
-
-interface Options {
-    default: {
-        x?: number;
-        y?: number;
-        width?: number|string;
-        height?: number|string;
-    };
-    className: string;
-    style: any;
-    width: number|string;
-    height: number|string;
-    minWidth: number|string;
-    minHeight: number|string;
-    maxWidth: number|string;
-    maxHeight: number|string;
-    z: number;
-    resizeHandleClasses: HandleClasses;
-    resizeHandleStyles: HandleStyles;
-
-    lockAspectRatio: boolean;
-    enableResizing: boolean;
-
-    onResizeStart: () => void;
-    onResize: () => void;
-    onResizeStop: ResizeHandler;
-
-    onDragStart: DraggableEventHandler;
-    onDrag: DraggableEventHandler;
-    onDragStop: DraggableEventHandler;
-}
-
-declare class Rnd extends React.Component<Partial<Options>> {}
+declare class Rnd extends React.Component<Partial<Rnd.Options>> {}
 
 export default Rnd;
diff --git a/types/react-rnd/react-rnd-tests.tsx b/types/react-rnd/react-rnd-tests.tsx
index 1586daadbf..1e29d0c5d7 100644
--- a/types/react-rnd/react-rnd-tests.tsx
+++ b/types/react-rnd/react-rnd-tests.tsx
@@ -1,4 +1,20 @@
 import * as React from 'react';
 import Rnd from 'react-rnd';
 
-<Rnd  />;
+const onResize: Rnd.ResizeHandler = (e, direction, ref, delta, position) => {
+    direction === 'right';
+    delta.width;
+    delta.height;
+    position.x;
+    position.y;
+};
+
+<Rnd
+    className="class"
+    lockAspectRatio
+    maxWidth={100}
+    enableResizing={false}
+    resizeHandleStyles={{
+        top: { background: '#000' }
+    }}
+/>;
diff --git a/types/react-rnd/tsconfig.json b/types/react-rnd/tsconfig.json
index b28250424f..61a1ff7b55 100644
--- a/types/react-rnd/tsconfig.json
+++ b/types/react-rnd/tsconfig.json
@@ -2,6 +2,7 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
+            "dom",
             "es6"
         ],
         "noImplicitAny": true,

From a6dc77b61c9a15f17e778b6a3beab865464f0a9a Mon Sep 17 00:00:00 2001
From: Ragg <Ragg-@users.noreply.github.com>
Date: Sat, 3 Mar 2018 19:02:08 +0900
Subject: [PATCH 0198/1382] Fix exporting

---
 types/react-rnd/index.d.ts          | 2 +-
 types/react-rnd/react-rnd-tests.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/react-rnd/index.d.ts b/types/react-rnd/index.d.ts
index 5e053c28c4..2c34ff7e74 100644
--- a/types/react-rnd/index.d.ts
+++ b/types/react-rnd/index.d.ts
@@ -104,4 +104,4 @@ declare namespace Rnd {
 
 declare class Rnd extends React.Component<Partial<Rnd.Options>> {}
 
-export default Rnd;
+export = Rnd;
diff --git a/types/react-rnd/react-rnd-tests.tsx b/types/react-rnd/react-rnd-tests.tsx
index 1e29d0c5d7..46f964603b 100644
--- a/types/react-rnd/react-rnd-tests.tsx
+++ b/types/react-rnd/react-rnd-tests.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import Rnd from 'react-rnd';
+import * as Rnd from 'react-rnd';
 
 const onResize: Rnd.ResizeHandler = (e, direction, ref, delta, position) => {
     direction === 'right';

From a6476a715fbb473f13b5d35a9e4a41f34b35bde8 Mon Sep 17 00:00:00 2001
From: kuba <kanatkubash@gmail.com>
Date: Sat, 3 Mar 2018 18:45:59 +0600
Subject: [PATCH 0199/1382] Added type definitions for js-money

---
 types/js-money/index.d.ts        | 187 +++++++++++++++++++++++++++++++
 types/js-money/js-money-tests.ts |  63 +++++++++++
 types/js-money/lib/currency.d.ts | 144 ++++++++++++++++++++++++
 types/js-money/tsconfig.json     |  23 ++++
 types/js-money/tslint.json       |   1 +
 5 files changed, 418 insertions(+)
 create mode 100644 types/js-money/index.d.ts
 create mode 100644 types/js-money/js-money-tests.ts
 create mode 100644 types/js-money/lib/currency.d.ts
 create mode 100644 types/js-money/tsconfig.json
 create mode 100644 types/js-money/tslint.json

diff --git a/types/js-money/index.d.ts b/types/js-money/index.d.ts
new file mode 100644
index 0000000000..5288384f6e
--- /dev/null
+++ b/types/js-money/index.d.ts
@@ -0,0 +1,187 @@
+// Type definitions for js-money 0.6
+// Project: https://github.com/davidkalosi/js-money
+// Definitions by: Kanat Kubash <https://github.com/kanatkubash>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import { Currency } from './lib/currency';
+
+type Currencies = 'USD' | 'CAD' | 'EUR' | 'BTC' | 'AED' | 'AFN'
+    | 'ALL' | 'AMD' | 'ARS' | 'AUD' | 'AZN' | 'BAM' | 'BDT'
+    | 'BGN' | 'BHD' | 'BIF' | 'BND' | 'BOB' | 'BRL' | 'BWP'
+    | 'BYR' | 'BZD' | 'CDF' | 'CHF' | 'CLP' | 'CNY' | 'COP'
+    | 'CRC' | 'CVE' | 'CZK' | 'DJF' | 'DKK' | 'DOP' | 'DZD'
+    | 'EEK' | 'EGP' | 'ERN' | 'ETB' | 'GBP' | 'GEL' | 'GHS'
+    | 'GNF' | 'GTQ' | 'HKD' | 'HNL' | 'HRK' | 'HUF' | 'IDR'
+    | 'ILS' | 'INR' | 'IQD' | 'IRR' | 'ISK' | 'JMD' | 'JOD'
+    | 'JPY' | 'KES' | 'KHR' | 'KMF' | 'KRW' | 'KWD' | 'KZT'
+    | 'LAK' | 'LBP' | 'LKR' | 'LTL' | 'LVL' | 'LYD' | 'MAD'
+    | 'MDL' | 'MGA' | 'MKD' | 'MMK' | 'MOP' | 'MUR' | 'MXN'
+    | 'MYR' | 'MZN' | 'NAD' | 'NGN' | 'NIO' | 'NOK' | 'NPR'
+    | 'NZD' | 'OMR' | 'PAB' | 'PEN' | 'PHP' | 'PKR' | 'PLN'
+    | 'PYG' | 'QAR' | 'RON' | 'RSD' | 'RUB' | 'RWF' | 'SAR'
+    | 'SDG' | 'SEK' | 'SGD' | 'SOS' | 'SYP' | 'THB' | 'TND'
+    | 'TOP' | 'TRY' | 'TTD' | 'TWD' | 'TZS' | 'UAH' | 'UGX'
+    | 'UYU' | 'UZS' | 'VEF' | 'VND' | 'XAF' | 'XOF' | 'YER'
+    | 'ZAR' | 'ZMK' | string;
+
+interface MoneyObjectOut {
+    amount: number;
+    currency: string;
+}
+
+type Rounders = 'round' | 'floor' | 'ceil';
+
+type RoundFunction = (num: number) => number;
+
+declare class Money {
+    constructor(amount: number, currency: Currencies | Currency);
+    amount: number;
+    currency: string;
+    static fromInteger(amount: number, currency: Currencies | Currency): Money;
+    static fromDecimal(amount: number, currency: Currencies | Currency, rounder?: Rounders | RoundFunction): Money;
+    equals(other: Money): boolean;
+    add(other: Money): Money;
+    subtract(other: Money): Money;
+    multiply(multiplier: number, rounder?: RoundFunction): Money;
+    divide(divisor: number, rounder?: RoundFunction): Money;
+    allocate(ratios: number[]): Money[];
+    compare(other: Money): number;
+    greaterThan(other: Money): boolean;
+    greaterThanOrEqual(other: Money): boolean;
+    lessThan(other: Money): boolean;
+    lessThanOrEqual(other: Money): boolean;
+    isZero(): boolean;
+    isPositive(): boolean;
+    isNegative(): boolean;
+    toDecimal(): number;
+    toString(): string;
+    toJSON(): MoneyObjectOut;
+    getAmount(): number;
+    getCurrency(): string;
+    //#region Currencies
+    static USD: Currency;
+    static CAD: Currency;
+    static EUR: Currency;
+    static BTC: Currency;
+    static AED: Currency;
+    static AFN: Currency;
+    static ALL: Currency;
+    static AMD: Currency;
+    static ARS: Currency;
+    static AUD: Currency;
+    static AZN: Currency;
+    static BAM: Currency;
+    static BDT: Currency;
+    static BGN: Currency;
+    static BHD: Currency;
+    static BIF: Currency;
+    static BND: Currency;
+    static BOB: Currency;
+    static BRL: Currency;
+    static BWP: Currency;
+    static BYR: Currency;
+    static BZD: Currency;
+    static CDF: Currency;
+    static CHF: Currency;
+    static CLP: Currency;
+    static CNY: Currency;
+    static COP: Currency;
+    static CRC: Currency;
+    static CVE: Currency;
+    static CZK: Currency;
+    static DJF: Currency;
+    static DKK: Currency;
+    static DOP: Currency;
+    static DZD: Currency;
+    static EEK: Currency;
+    static EGP: Currency;
+    static ERN: Currency;
+    static ETB: Currency;
+    static GBP: Currency;
+    static GEL: Currency;
+    static GHS: Currency;
+    static GNF: Currency;
+    static GTQ: Currency;
+    static HKD: Currency;
+    static HNL: Currency;
+    static HRK: Currency;
+    static HUF: Currency;
+    static IDR: Currency;
+    static ILS: Currency;
+    static INR: Currency;
+    static IQD: Currency;
+    static IRR: Currency;
+    static ISK: Currency;
+    static JMD: Currency;
+    static JOD: Currency;
+    static JPY: Currency;
+    static KES: Currency;
+    static KHR: Currency;
+    static KMF: Currency;
+    static KRW: Currency;
+    static KWD: Currency;
+    static KZT: Currency;
+    static LAK: Currency;
+    static LBP: Currency;
+    static LKR: Currency;
+    static LTL: Currency;
+    static LVL: Currency;
+    static LYD: Currency;
+    static MAD: Currency;
+    static MDL: Currency;
+    static MGA: Currency;
+    static MKD: Currency;
+    static MMK: Currency;
+    static MOP: Currency;
+    static MUR: Currency;
+    static MXN: Currency;
+    static MYR: Currency;
+    static MZN: Currency;
+    static NAD: Currency;
+    static NGN: Currency;
+    static NIO: Currency;
+    static NOK: Currency;
+    static NPR: Currency;
+    static NZD: Currency;
+    static OMR: Currency;
+    static PAB: Currency;
+    static PEN: Currency;
+    static PHP: Currency;
+    static PKR: Currency;
+    static PLN: Currency;
+    static PYG: Currency;
+    static QAR: Currency;
+    static RON: Currency;
+    static RSD: Currency;
+    static RUB: Currency;
+    static RWF: Currency;
+    static SAR: Currency;
+    static SDG: Currency;
+    static SEK: Currency;
+    static SGD: Currency;
+    static SOS: Currency;
+    static SYP: Currency;
+    static THB: Currency;
+    static TND: Currency;
+    static TOP: Currency;
+    static TRY: Currency;
+    static TTD: Currency;
+    static TWD: Currency;
+    static TZS: Currency;
+    static UAH: Currency;
+    static UGX: Currency;
+    static UYU: Currency;
+    static UZS: Currency;
+    static VEF: Currency;
+    static VND: Currency;
+    static XAF: Currency;
+    static XOF: Currency;
+    static YER: Currency;
+    static ZAR: Currency;
+    static ZMK: Currency;
+    //#endregion
+}
+
+/// to supress new Money() error
+declare namespace Money { }
+export = Money;
diff --git a/types/js-money/js-money-tests.ts b/types/js-money/js-money-tests.ts
new file mode 100644
index 0000000000..8c28cc554e
--- /dev/null
+++ b/types/js-money/js-money-tests.ts
@@ -0,0 +1,63 @@
+import * as Money from "js-money";
+import * as CurrencyObjects from "js-money/lib/currency";
+
+const money = new Money(1500, 'USD');
+const other = new Money(100, Money.THB);
+
+// instance method checks
+new Money(123, Money.TRY); // $ExpectType Money
+new Money(1500, 'USD'); // $ExpectType Money
+money.amount; // $ExpectType number
+money.currency; // $ExpectType string
+money.equals(other); // $ExpectType boolean
+money.add(other); // $ExpectType Money
+money.subtract(other); // $ExpectType Money
+money.multiply(1); // $ExpectType Money
+money.multiply(2, Math.round); // $ExpectType Money
+money.divide(1); // $ExpectType Money
+money.divide(1, Math.ceil); // $ExpectType Money
+money.allocate([1, 2, 3]); // $ExpectType Money[]
+money.compare(other); // $ExpectType number
+money.greaterThan(other); // $ExpectType boolean
+money.greaterThanOrEqual(other); // $ExpectType boolean
+money.lessThan(other); // $ExpectType boolean
+money.lessThanOrEqual(other); // $ExpectType boolean
+money.isZero(); // $ExpectType boolean
+money.isPositive(); // $ExpectType boolean
+money.isNegative(); // $ExpectType boolean
+money.toDecimal(); // $ExpectType number
+money.toString(); // $ExpectType string
+money.toJSON(); // $ExpectType MoneyObjectOut
+money.toJSON().amount; // $ExpectType number
+money.toJSON().currency; // $ExpectType string
+money.getAmount(); // $ExpectType number
+money.getCurrency(); // $ExpectType string
+
+// static method checks
+Money.fromInteger(100, 'USD'); // $ExpectType Money
+Money.fromDecimal(100, Money.KZT, 'ceil'); // $ExpectType Money
+Money.fromDecimal(100, Money.KZT); // $ExpectType Money
+Money.fromDecimal(100, Money.KZT, Math.ceil); // $ExpectType Money
+
+// static properties (currency) check
+Money.KZT; // $ExpectType Currency
+Money.RUB; // $ExpectType Currency
+Money.BLABLA; // $ExpectError
+// currency object check
+Money.RUB.code; // $ExpectType string
+Money.RUB.decimal_digits; // $ExpectType number
+Money.RUB.name; // $ExpectType string
+Money.RUB.name_plural; // $ExpectType string
+Money.RUB.rounding; // $ExpectType number
+Money.RUB.symbol; // $ExpectType string
+Money.RUB.symbol_native; // $ExpectType string
+
+// Currency module check
+CurrencyObjects.NIO.code; // $ExpectType string
+CurrencyObjects.NIO.decimal_digits; // $ExpectType number
+CurrencyObjects.NIO.name; // $ExpectType string
+CurrencyObjects.NIO.name_plural; // $ExpectType string
+CurrencyObjects.NIO.rounding; // $ExpectType number
+CurrencyObjects.NIO.symbol; // $ExpectType string
+CurrencyObjects.NIO.symbol_native; // $ExpectType string
+CurrencyObjects['UAH'].code;  // $ExpectType string
diff --git a/types/js-money/lib/currency.d.ts b/types/js-money/lib/currency.d.ts
new file mode 100644
index 0000000000..1abac4a9ca
--- /dev/null
+++ b/types/js-money/lib/currency.d.ts
@@ -0,0 +1,144 @@
+// Type definitions for js-money 0.6
+// Project: https://github.com/davidkalosi/js-money#readme
+// Definitions by: Kanat Kubash <https://github.com/kanatkubash>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace Currencies {
+	interface Currency {
+		symbol: string;
+		name: string;
+		symbol_native: string;
+		decimal_digits: number;
+		rounding: number;
+		code: string;
+		name_plural: string;
+	}
+	interface Currencies {
+		[key: string]: Currencies.Currency;
+		USD: Currencies.Currency;
+		CAD: Currencies.Currency;
+		EUR: Currencies.Currency;
+		BTC: Currencies.Currency;
+		AED: Currencies.Currency;
+		AFN: Currencies.Currency;
+		ALL: Currencies.Currency;
+		AMD: Currencies.Currency;
+		ARS: Currencies.Currency;
+		AUD: Currencies.Currency;
+		AZN: Currencies.Currency;
+		BAM: Currencies.Currency;
+		BDT: Currencies.Currency;
+		BGN: Currencies.Currency;
+		BHD: Currencies.Currency;
+		BIF: Currencies.Currency;
+		BND: Currencies.Currency;
+		BOB: Currencies.Currency;
+		BRL: Currencies.Currency;
+		BWP: Currencies.Currency;
+		BYR: Currencies.Currency;
+		BZD: Currencies.Currency;
+		CDF: Currencies.Currency;
+		CHF: Currencies.Currency;
+		CLP: Currencies.Currency;
+		CNY: Currencies.Currency;
+		COP: Currencies.Currency;
+		CRC: Currencies.Currency;
+		CVE: Currencies.Currency;
+		CZK: Currencies.Currency;
+		DJF: Currencies.Currency;
+		DKK: Currencies.Currency;
+		DOP: Currencies.Currency;
+		DZD: Currencies.Currency;
+		EEK: Currencies.Currency;
+		EGP: Currencies.Currency;
+		ERN: Currencies.Currency;
+		ETB: Currencies.Currency;
+		GBP: Currencies.Currency;
+		GEL: Currencies.Currency;
+		GHS: Currencies.Currency;
+		GNF: Currencies.Currency;
+		GTQ: Currencies.Currency;
+		HKD: Currencies.Currency;
+		HNL: Currencies.Currency;
+		HRK: Currencies.Currency;
+		HUF: Currencies.Currency;
+		IDR: Currencies.Currency;
+		ILS: Currencies.Currency;
+		INR: Currencies.Currency;
+		IQD: Currencies.Currency;
+		IRR: Currencies.Currency;
+		ISK: Currencies.Currency;
+		JMD: Currencies.Currency;
+		JOD: Currencies.Currency;
+		JPY: Currencies.Currency;
+		KES: Currencies.Currency;
+		KHR: Currencies.Currency;
+		KMF: Currencies.Currency;
+		KRW: Currencies.Currency;
+		KWD: Currencies.Currency;
+		KZT: Currencies.Currency;
+		LAK: Currencies.Currency;
+		LBP: Currencies.Currency;
+		LKR: Currencies.Currency;
+		LTL: Currencies.Currency;
+		LVL: Currencies.Currency;
+		LYD: Currencies.Currency;
+		MAD: Currencies.Currency;
+		MDL: Currencies.Currency;
+		MGA: Currencies.Currency;
+		MKD: Currencies.Currency;
+		MMK: Currencies.Currency;
+		MOP: Currencies.Currency;
+		MUR: Currencies.Currency;
+		MXN: Currencies.Currency;
+		MYR: Currencies.Currency;
+		MZN: Currencies.Currency;
+		NAD: Currencies.Currency;
+		NGN: Currencies.Currency;
+		NIO: Currencies.Currency;
+		NOK: Currencies.Currency;
+		NPR: Currencies.Currency;
+		NZD: Currencies.Currency;
+		OMR: Currencies.Currency;
+		PAB: Currencies.Currency;
+		PEN: Currencies.Currency;
+		PHP: Currencies.Currency;
+		PKR: Currencies.Currency;
+		PLN: Currencies.Currency;
+		PYG: Currencies.Currency;
+		QAR: Currencies.Currency;
+		RON: Currencies.Currency;
+		RSD: Currencies.Currency;
+		RUB: Currencies.Currency;
+		RWF: Currencies.Currency;
+		SAR: Currencies.Currency;
+		SDG: Currencies.Currency;
+		SEK: Currencies.Currency;
+		SGD: Currencies.Currency;
+		SOS: Currencies.Currency;
+		SYP: Currencies.Currency;
+		THB: Currencies.Currency;
+		TND: Currencies.Currency;
+		TOP: Currencies.Currency;
+		TRY: Currencies.Currency;
+		TTD: Currencies.Currency;
+		TWD: Currencies.Currency;
+		TZS: Currencies.Currency;
+		UAH: Currencies.Currency;
+		UGX: Currencies.Currency;
+		UYU: Currencies.Currency;
+		UZS: Currencies.Currency;
+		VEF: Currencies.Currency;
+		VND: Currencies.Currency;
+		XAF: Currencies.Currency;
+		XOF: Currencies.Currency;
+		YER: Currencies.Currency;
+		ZAR: Currencies.Currency;
+		ZMK: Currencies.Currency;
+	}
+}
+
+
+
+declare var Currencies: Currencies.Currencies;
+export = Currencies;
\ No newline at end of file
diff --git a/types/js-money/tsconfig.json b/types/js-money/tsconfig.json
new file mode 100644
index 0000000000..9277913003
--- /dev/null
+++ b/types/js-money/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "strictFunctionTypes": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "js-money-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/js-money/tslint.json b/types/js-money/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/js-money/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From aaafc25a532f02b99348139596487e9fe0c8765c Mon Sep 17 00:00:00 2001
From: shrey <shrey-jain@hotmail.com>
Date: Sat, 3 Mar 2018 10:11:00 -0500
Subject: [PATCH 0200/1382] Add typings for `settings` module.

---
 types/settings/index.d.ts        | 30 +++++++++++++++++++++++++++++
 types/settings/settings-tests.ts | 33 ++++++++++++++++++++++++++++++++
 types/settings/tsconfig.json     | 23 ++++++++++++++++++++++
 types/settings/tslint.json       |  3 +++
 4 files changed, 89 insertions(+)
 create mode 100644 types/settings/index.d.ts
 create mode 100644 types/settings/settings-tests.ts
 create mode 100644 types/settings/tsconfig.json
 create mode 100644 types/settings/tslint.json

diff --git a/types/settings/index.d.ts b/types/settings/index.d.ts
new file mode 100644
index 0000000000..1c7ec115de
--- /dev/null
+++ b/types/settings/index.d.ts
@@ -0,0 +1,30 @@
+// Type definitions for settings 0.1
+// Project: https://github.com/mgutz/node-settings
+// Definitions by: Shrey Jain <https://github.com/shreyjain1994>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+// This wierd looking class definition is necessary since the function that the module
+// exposes NEEDS (will throw error otherwise) to be called with the `new` keyword
+// BUT returns a random object...not an instance of the class
+declare class Settings {
+    constructor(pathOrModule: Settings.PathOrModule, options?: Settings.Options);
+
+    [setting: string]: any;
+}
+
+declare namespace Settings {
+    interface Options {
+        env?: string;
+        root?: string;
+        defaults?: any;
+    }
+
+    type PathOrModule = string |
+        {
+            forceEnv?: string,
+            common: any, // error is thrown if 'common' object is not provided
+            [envName: string]: any
+        };
+}
+export = Settings;
diff --git a/types/settings/settings-tests.ts b/types/settings/settings-tests.ts
new file mode 100644
index 0000000000..e872298796
--- /dev/null
+++ b/types/settings/settings-tests.ts
@@ -0,0 +1,33 @@
+import Settings = require('settings');
+
+// works without options
+new Settings('foo');
+
+// works with path to module containing settings
+const settings = new Settings('./path/to/my/config');
+// any prop is accessible on returned value
+settings.hello = 'world';
+const foo = settings.bar;
+
+// works with settings object
+const settings2 = new Settings({
+    common: {setting: 'mySetting'}, production: {
+        hello: 'bar'
+    }
+});
+settings2.hello = 'world';
+
+// allows for forceEnv in settings object
+const settings3 = new Settings({
+    common: {},
+    forceEnv: 'production'
+});
+
+// allows options
+const settings4 = new Settings('./path/to/my/settings', {
+    root: 'someRoot',
+    env: 'development',
+    defaults: {
+        someSetting: 'settingValue'
+    }
+});
diff --git a/types/settings/tsconfig.json b/types/settings/tsconfig.json
new file mode 100644
index 0000000000..5fefeda97d
--- /dev/null
+++ b/types/settings/tsconfig.json
@@ -0,0 +1,23 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": [
+      "es6"
+    ],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": true,
+    "strictFunctionTypes": true,
+    "baseUrl": "../",
+    "typeRoots": [
+      "../"
+    ],
+    "types": [],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "files": [
+    "index.d.ts",
+    "settings-tests.ts"
+  ]
+}
\ No newline at end of file
diff --git a/types/settings/tslint.json b/types/settings/tslint.json
new file mode 100644
index 0000000000..30a1bdde2e
--- /dev/null
+++ b/types/settings/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}
\ No newline at end of file

From 33cb41e573e260ccacaf4523c98be6b80cabf6b5 Mon Sep 17 00:00:00 2001
From: Ragg <Ragg-@users.noreply.github.com>
Date: Sun, 4 Mar 2018 00:17:35 +0900
Subject: [PATCH 0201/1382] Lint fixes

---
 types/react-rnd/index.d.ts | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/types/react-rnd/index.d.ts b/types/react-rnd/index.d.ts
index 2c34ff7e74..e358ceb3d1 100644
--- a/types/react-rnd/index.d.ts
+++ b/types/react-rnd/index.d.ts
@@ -18,7 +18,7 @@ declare namespace Rnd {
         | 'topLeft'
         | 'topRight';
 
-    export interface HandleClasses {
+    interface HandleClasses {
         bottom?: string;
         bottomLeft?: string;
         bottomRight?: string;
@@ -29,7 +29,7 @@ declare namespace Rnd {
         topRight?: string;
     }
 
-    export interface HandleStyles {
+    interface HandleStyles {
         bottom?: CSSProperties;
         bottomLeft?: CSSProperties;
         bottomRight?: CSSProperties;
@@ -40,17 +40,17 @@ declare namespace Rnd {
         topRight?: CSSProperties;
     }
 
-    export interface Position {
+    interface Position {
         x: number;
         y: number;
     }
 
-    export interface Size {
+    interface Size {
         width: number;
         height: number;
     }
 
-    export interface DraggableData {
+    interface DraggableData {
         node: HTMLElement;
         x: number;
         y: number;
@@ -60,9 +60,9 @@ declare namespace Rnd {
         lastY: number;
     }
 
-    export type DraggableEventHandler = (e: MouseEvent | TouchEvent, data: DraggableData) => void|false;
+    type DraggableEventHandler = (e: MouseEvent | TouchEvent, data: DraggableData) => void|false;
 
-    export type ResizeHandler = (
+    type ResizeHandler = (
         e: MouseEvent|TouchEvent,
         direction: Direction,
         ref: HTMLDivElement,
@@ -70,7 +70,7 @@ declare namespace Rnd {
         position: Position
     ) => void;
 
-    export interface Options {
+    interface Options {
         default: {
             x?: number;
             y?: number;

From c1404a4a14f2d6a2bde7af7daf46cabcbb7ae5a6 Mon Sep 17 00:00:00 2001
From: shrey <shrey-jain@hotmail.com>
Date: Sat, 3 Mar 2018 10:26:30 -0500
Subject: [PATCH 0202/1382] Add new lines to end of file.

---
 types/settings/tsconfig.json | 2 +-
 types/settings/tslint.json   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/settings/tsconfig.json b/types/settings/tsconfig.json
index 5fefeda97d..d565388a77 100644
--- a/types/settings/tsconfig.json
+++ b/types/settings/tsconfig.json
@@ -20,4 +20,4 @@
     "index.d.ts",
     "settings-tests.ts"
   ]
-}
\ No newline at end of file
+}
diff --git a/types/settings/tslint.json b/types/settings/tslint.json
index 30a1bdde2e..d88586e5bd 100644
--- a/types/settings/tslint.json
+++ b/types/settings/tslint.json
@@ -1,3 +1,3 @@
 {
   "extends": "dtslint/dt.json"
-}
\ No newline at end of file
+}

From 1465d62d6e1eb5eecde9aae43820b51a03c03b42 Mon Sep 17 00:00:00 2001
From: Matt Steele <orphum@gmail.com>
Date: Sat, 3 Mar 2018 11:37:51 -0600
Subject: [PATCH 0203/1382] Update pin.read callback

See http://johnny-five.io/api/pin/
---
 types/johnny-five/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/johnny-five/index.d.ts b/types/johnny-five/index.d.ts
index b8c108f63b..0bd9f75a31 100644
--- a/types/johnny-five/index.d.ts
+++ b/types/johnny-five/index.d.ts
@@ -602,7 +602,7 @@ export declare class Pin {
     high(): void;
     low(): void;
     write(value: number): void;
-    read(cb: (value: number) => void): void;
+    read(cb: (error: Error, value: number) => void): void;
     on(event: string, cb: () => void): this;
     on(event: "high", cb: () => void): this;
     on(event: "low", cb: () => void): this;

From c73250cb664a2edbff1ae9ab99b99ea2768a07cc Mon Sep 17 00:00:00 2001
From: Vladimir Bloshchitsyn <bloshchitsyn@gmail.com>
Date: Tue, 20 Feb 2018 10:12:56 +0300
Subject: [PATCH 0204/1382] fix Model.remove, deleteOne and deleteMany
 definitions

---
 types/mongoose/index.d.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/types/mongoose/index.d.ts b/types/mongoose/index.d.ts
index 5994c15d2f..5cc7df3f7a 100644
--- a/types/mongoose/index.d.ts
+++ b/types/mongoose/index.d.ts
@@ -7,6 +7,7 @@
 //                 Alorel <https://github.com/Alorel>
 //                 jendrikw <https://github.com/jendrikw>
 //                 Ethan Resnick <https://github.com/ethanresnick>
+//                 vologa <https://github.com/vologab>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -2626,9 +2627,9 @@ declare module "mongoose" {
       callback?: (err: any, res: T) => void): Promise<T>;
 
     /** Removes documents from the collection. */
-    remove(conditions: any, callback?: (err: any) => void): Query<void>;
-    deleteOne(conditions: any, callback?: (err: any) => void): Query<void>;
-    deleteMany(conditions: any, callback?: (err: any) => void): Query<void>;
+    remove(conditions: any, callback?: (err: any) => void): Query<mongodb.WriteOpResult['result']>;
+    deleteOne(conditions: any, callback?: (err: any) => void): Query<mongodb.WriteOpResult['result']>;
+    deleteMany(conditions: any, callback?: (err: any) => void): Query<mongodb.WriteOpResult['result']>;
 
     /**
      * Same as update(), except MongoDB replace the existing document with the given document (no atomic operators like $set).

From b26647b7ca4a76cef39acfb757b20dda233d8b5e Mon Sep 17 00:00:00 2001
From: Matt Steele <orphum@gmail.com>
Date: Sat, 3 Mar 2018 11:49:02 -0600
Subject: [PATCH 0205/1382] Update Ping.read() callback

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

diff --git a/types/johnny-five/index.d.ts b/types/johnny-five/index.d.ts
index 0bd9f75a31..297069f0f1 100644
--- a/types/johnny-five/index.d.ts
+++ b/types/johnny-five/index.d.ts
@@ -597,7 +597,7 @@ export declare class Pin {
     mode: number;
 
     static write(pin: number, value: number): void;
-    static read(pin: number, cb: (data: number) => void): void;
+    static read(pin: number, cb: (error: Error, data: number) => void): void;
     query(cb: (pin: PinState) => void): void;
     high(): void;
     low(): void;

From 51ce93f07c11e3cba154b6bcc2af221e49d3f665 Mon Sep 17 00:00:00 2001
From: Simon Xiong <simoncxiong@gmail.com>
Date: Sat, 3 Mar 2018 10:19:02 -0800
Subject: [PATCH 0206/1382] Remove simonxca from list of maintainers

Unfortunately don't have time to maintain these definitions.
---
 types/mongoose/index.d.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/types/mongoose/index.d.ts b/types/mongoose/index.d.ts
index b555c86729..3545d1aa1a 100644
--- a/types/mongoose/index.d.ts
+++ b/types/mongoose/index.d.ts
@@ -1,7 +1,6 @@
 // Type definitions for Mongoose 5.0.1
 // Project: http://mongoosejs.com/
-// Definitions by: simonxca <https://github.com/simonxca>
-//                 horiuchi <https://github.com/horiuchi>
+// Definitions by: horiuchi <https://github.com/horiuchi>
 //                 sindrenm <https://github.com/sindrenm>
 //                 lukasz-zak <https://github.com/lukasz-zak>
 //                 Alorel <https://github.com/Alorel>

From f6761be6ba8f430303f2121748433dbd4a770553 Mon Sep 17 00:00:00 2001
From: paolostyle <tuptus95@gmail.com>
Date: Sat, 3 Mar 2018 20:03:07 +0100
Subject: [PATCH 0207/1382] added type property to WorkbookSheetRow

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

diff --git a/types/kendo-ui/index.d.ts b/types/kendo-ui/index.d.ts
index 6ea7fea725..b854d92b29 100644
--- a/types/kendo-ui/index.d.ts
+++ b/types/kendo-ui/index.d.ts
@@ -18894,6 +18894,7 @@ declare namespace kendo.ooxml {
         cells?: WorkbookSheetRowCell[];
         index?: number;
         height?: number;
+        type?: "header" | "footer" | "groupHeader" | "groupFooter" | "data";
     }
 
     interface WorkbookSheet {

From ca01c72d2a1d25595dc810df6e7b1a64b855778a Mon Sep 17 00:00:00 2001
From: Nikolay Yakimov <root@livid.pp.ru>
Date: Sat, 3 Mar 2018 23:30:45 +0300
Subject: [PATCH 0208/1382] [atom] File.read can return Promise<null>

https://github.com/atom/node-pathwatcher/blob/ea686aeffc33d99445a6480d3eafd477b8738ef8/src/file.coffee#L270
---
 types/atom/atom-tests.ts | 3 ++-
 types/atom/index.d.ts    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/types/atom/atom-tests.ts b/types/atom/atom-tests.ts
index e53e29b176..b295259d79 100644
--- a/types/atom/atom-tests.ts
+++ b/types/atom/atom-tests.ts
@@ -953,7 +953,8 @@ function testFile() {
 
     // Reading and Writing
     async function readFile() {
-        str = await file.read();
+        const res = await file.read();
+        if (res !== null) str = res;
     }
 
     const stream = file.createReadStream();
diff --git a/types/atom/index.d.ts b/types/atom/index.d.ts
index 9b0d194976..5cc136f7a6 100644
--- a/types/atom/index.d.ts
+++ b/types/atom/index.d.ts
@@ -3547,7 +3547,7 @@ export class File {
 
     // Reading and Writing
     /** Reads the contents of the file. */
-    read(flushCache?: boolean): Promise<string>;
+    read(flushCache?: boolean): Promise<string | null>;
 
     /** Returns a stream to read the content of the file. */
     createReadStream(): ReadStream;

From fa0acf4ba18b1a247055700b0a9e1a6585227662 Mon Sep 17 00:00:00 2001
From: Igor Bezkrovnyi <1188919+ibezkrovnyi@users.noreply.github.com>
Date: Sat, 3 Mar 2018 23:42:29 +0100
Subject: [PATCH 0209/1382] include and exclude options support multiple
 entries

---
 types/pify/index.d.ts    |  4 ++--
 types/pify/pify-tests.ts | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/types/pify/index.d.ts b/types/pify/index.d.ts
index fc4b13df5d..b0c8ce4b92 100644
--- a/types/pify/index.d.ts
+++ b/types/pify/index.d.ts
@@ -9,8 +9,8 @@ interface PromiseModule {
 
 interface PifyOptions {
     multiArgs?: boolean,
-    include?: [string | RegExp],
-    exclude?: [string | RegExp],
+    include?: Array<string | RegExp>,
+    exclude?: Array<string | RegExp>,
     excludeMain?: boolean,
     errorFirst?: boolean,
     promiseModule?: PromiseModule
diff --git a/types/pify/pify-tests.ts b/types/pify/pify-tests.ts
index 27022b7390..cadf3ba408 100644
--- a/types/pify/pify-tests.ts
+++ b/types/pify/pify-tests.ts
@@ -31,3 +31,20 @@ pify(fs.readFile, { promiseModule: Promise})('bar.txt').then((result: string) =>
 
 
 pify(fs.exists, { errorFirst: false })('foo.txt').then((result: boolean) => assert(result.toString(), true.toString()));
+
+// include/exclude with multiple entries
+const module = {
+    f1: (callback: Function) => callback(),
+    f2: (callback: Function) => callback(),
+    f3: (callback: Function) => callback(),
+};
+
+const include = pify(module, { include: ['f1', 'f2'] });
+if (include.f1 === module.f1) throw new Error();
+if (include.f2 === module.f2) throw new Error();
+if (include.f3 !== module.f3) throw new Error();
+
+const exclude = pify(module, { exclude: ['f1', 'f2'] });
+if (include.f1 !== module.f1) throw new Error();
+if (include.f2 !== module.f2) throw new Error();
+if (include.f3 === module.f3) throw new Error();

From f84d7c79522f7127280fc9e482009b3c112da1c7 Mon Sep 17 00:00:00 2001
From: Mike Deverell <mike@pelotoncycle.com>
Date: Fri, 2 Mar 2018 23:25:48 -0500
Subject: [PATCH 0210/1382] add test to reproduce issue

---
 types/ramda/ramda-tests.ts | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/types/ramda/ramda-tests.ts b/types/ramda/ramda-tests.ts
index c32ab72028..4b5abfe19f 100644
--- a/types/ramda/ramda-tests.ts
+++ b/types/ramda/ramda-tests.ts
@@ -664,6 +664,36 @@ interface Obj {
     byGrade(students);
 };
 
+() => {
+    interface MyObject {
+        id: string;
+        quantity: number;
+    }
+
+    const reduceWithCombinedQuantities = (items: MyObject[]) =>
+        items.reduce<MyObject>(
+            (acc, item) => ({...item, quantity: acc.quantity + item.quantity}),
+            {id: '', quantity: 0},
+        );
+
+    const combineMyObjects = R.pipe(
+        R.groupBy<MyObject>(s => s.id),
+        R.values,
+        R.map(reduceWithCombinedQuantities),
+    );
+
+    const combined = combineMyObjects([
+        {id: 'foo', quantity: 4},
+        {id: 'bar', quantity: 3},
+        {id: 'foo', quantity: 2},
+    ]);
+
+    return {
+        id: combined[0].id,
+        quantity: combined[0].quantity
+    };
+};
+
 () => {
     R.groupWith(R.equals)([0, 1, 1, 2, 3, 5, 8, 13, 21]);
 

From 5455a50acd67587bbccf12233386a8ee9f84de72 Mon Sep 17 00:00:00 2001
From: Mike Deverell <mike@pelotoncycle.com>
Date: Fri, 2 Mar 2018 23:30:06 -0500
Subject: [PATCH 0211/1382] remove extra generic type on curried function

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

diff --git a/types/ramda/index.d.ts b/types/ramda/index.d.ts
index 081a62cbd7..fcd3b2b06f 100644
--- a/types/ramda/index.d.ts
+++ b/types/ramda/index.d.ts
@@ -679,7 +679,7 @@ declare namespace R {
          * on each element, and grouping the results according to values returned.
          */
         groupBy<T>(fn: (a: T) => string, list: ReadonlyArray<T>): { [index: string]: T[] };
-        groupBy<T>(fn: (a: T) => string): <T>(list: ReadonlyArray<T>) => { [index: string]: T[] };
+        groupBy<T>(fn: (a: T) => string): (list: ReadonlyArray<T>) => { [index: string]: T[] };
 
         /**
          * Takes a list and returns a list of lists where each sublist's elements are all "equal" according to the provided equality function

From 99ccbdcdfc6b79d7a9388332ac7b570debae0c3e Mon Sep 17 00:00:00 2001
From: Mike Deverell <mike@pelotoncycle.com>
Date: Fri, 2 Mar 2018 23:48:54 -0500
Subject: [PATCH 0212/1382] bump TypeScript version to 2.6 in header

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

diff --git a/types/ramda/index.d.ts b/types/ramda/index.d.ts
index fcd3b2b06f..9004ec7651 100644
--- a/types/ramda/index.d.ts
+++ b/types/ramda/index.d.ts
@@ -16,7 +16,7 @@
 //                 Nikita Moshensky <https://github.com/moshensky>
 //                 Ethan Resnick <https://github.com/ethanresnick>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.6
 
 declare let R: R.Static;
 

From 37d658df188cdc73ebe94c710cdbe7d96f4c5aed Mon Sep 17 00:00:00 2001
From: Thomas Chia <thomas.chia@amaas.com>
Date: Sat, 3 Mar 2018 16:55:29 +0800
Subject: [PATCH 0213/1382] [react-stripe-elements] - allow id prop to be
 passed to *Element components.

---
 types/react-stripe-elements/index.d.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/types/react-stripe-elements/index.d.ts b/types/react-stripe-elements/index.d.ts
index 23389a9df9..56f0f3c33a 100644
--- a/types/react-stripe-elements/index.d.ts
+++ b/types/react-stripe-elements/index.d.ts
@@ -1,9 +1,10 @@
-// Type definitions for react-stripe-elements 1.0
+// Type definitions for react-stripe-elements 1.1
 // Project: https://github.com/stripe/react-stripe-elements#readme
 // Definitions by: dan-j <https://github.com/dan-j>
 //                 Santiago Doldan <https://github.com/santiagodoldan>
 //                 sonnysangha <https://github.com/sonnysangha>
 //                 Andrew Goh Yisheng <https://github.com/9y5>
+//                 Thomas Chia <https://github.com/thchia>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -42,6 +43,8 @@ export namespace ReactStripeElements {
 	}
 
 	interface ElementProps extends ElementsOptions {
+		id?: string;
+
 		className?: string;
 
 		elementRef?(): void;

From 1170f3ee7310e551ba94747bea6b9e0b9afa7fb8 Mon Sep 17 00:00:00 2001
From: RetroCraft <retrocraft314@gmail.com>
Date: Sat, 3 Mar 2018 22:11:20 -0500
Subject: [PATCH 0214/1382] Add submitFailed

---
 types/redux-form/lib/FieldArray.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/redux-form/lib/FieldArray.d.ts b/types/redux-form/lib/FieldArray.d.ts
index 44ca7806ca..a6bd442fab 100644
--- a/types/redux-form/lib/FieldArray.d.ts
+++ b/types/redux-form/lib/FieldArray.d.ts
@@ -51,6 +51,7 @@ interface FieldArrayMetaProps {
     form: string;
     invalid: boolean;
     pristine: boolean;
+    submitFailed: boolean;
     submitting: boolean;
     valid: boolean;
     warning?: any;

From ce1b7e8971e3d2e1393cd4d990308d6a6f349b38 Mon Sep 17 00:00:00 2001
From: AndersonFriaca <afriacaxd@gmail.com>
Date: Sun, 4 Mar 2018 00:08:05 -0400
Subject: [PATCH 0215/1382] Types for JQuery ElevateZoom Plus Plugin

---
 types/ez-plus/ez-plus-tests.ts |  14 +++
 types/ez-plus/index.d.ts       | 167 +++++++++++++++++++++++++++++++++
 types/ez-plus/tsconfig.json    |  25 +++++
 types/ez-plus/tslint.json      |   1 +
 4 files changed, 207 insertions(+)
 create mode 100644 types/ez-plus/ez-plus-tests.ts
 create mode 100644 types/ez-plus/index.d.ts
 create mode 100644 types/ez-plus/tsconfig.json
 create mode 100644 types/ez-plus/tslint.json

diff --git a/types/ez-plus/ez-plus-tests.ts b/types/ez-plus/ez-plus-tests.ts
new file mode 100644
index 0000000000..df442607f4
--- /dev/null
+++ b/types/ez-plus/ez-plus-tests.ts
@@ -0,0 +1,14 @@
+import { Options } from "ez-plus";
+
+$(document).ready(() => {
+    // basic usage
+    $('#image').ezPlus();
+
+    // with options
+    const options: Options = {
+        zoomLens: true,
+        zoomType: 'lens',
+        cursor: 'crosshair'
+    };
+    $('#image').ezPlus(options);
+});
diff --git a/types/ez-plus/index.d.ts b/types/ez-plus/index.d.ts
new file mode 100644
index 0000000000..177816118c
--- /dev/null
+++ b/types/ez-plus/index.d.ts
@@ -0,0 +1,167 @@
+// Type definitions for jQuery ElevateZoom Plus Plugin 1.2
+// Project: https://github.com/igorlino/elevatezoom-plus
+// Definitions by: Anderson Friaça <https://github.com/AndersonFriaca>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="jquery" />
+
+export interface Options {
+    /**
+     * Activate responsivenes
+     */
+    responsive?: boolean;
+
+    /**
+     * Activate zoom on mouse scroll
+     */
+    scrollZoom?: boolean;
+
+    /**
+     * Activate simultaneous crossfade of images on gallery change
+     */
+    imageCrossfade?: boolean;
+
+    /**
+     * Activate spinner icon
+     */
+    loadingIcon?: boolean;
+
+    /**
+     * Activate easing
+     */
+    easing?: boolean;
+    easingType?: string;
+    easingDuration?: number;
+
+    /**
+     * Used when zoomType set to lens
+     */
+    lensSize?: number;
+
+    /**
+     * Width of the zoomWindow
+     */
+    zoomWindowWidth?: number;
+
+    /**
+     * Height of the zoomWindow
+     */
+    zoomWindowHeight?: number;
+
+    /**
+     * x-axis offset of the zoom window
+     */
+    zoomWindowOffsetX?: number;
+
+    /**
+     * y-axis offset of the zoom window
+     */
+    zoomWindowOffsetY?: number;
+    zoomWindowPosition?: number|string;
+
+    /**
+     * Speed of Lens fadeIn
+     */
+    lensFadeIn?: number;
+
+    /**
+     * Speed of Lens fadeOut
+     */
+    lensFadeOut?: number;
+
+    /**
+     * Speed of Window fadeIn
+     */
+    zoomWindowFadeIn?: number;
+
+    /**
+     * Speed of Window fadeOut
+     */
+    zoomWindowFadeOut?: number;
+
+    /**
+     * Speed of Tint fadeIn
+     */
+    zoomTintFadeIn?: number;
+
+    /**
+     * Speed of Tint fadeOut
+     */
+    zoomTintFadeOut?: number;
+
+    /**
+     * Border Size of the ZoomBox
+     */
+    borderSize?: number;
+
+    /**
+     * Enable Lens
+     */
+    zoomLens?: boolean;
+
+    /**
+     * Border Colour
+     */
+    borderColour?: string;
+
+    /**
+     * Width in pixels of the lens border
+     */
+    lensBorder?: number;
+
+    /**
+     * Type of lens
+     */
+    lensShape?: 'square' | 'round';
+
+    /**
+     * Type of zoom
+     */
+    zoomType?: 'lens' | 'window' | 'inner';
+    containLensZoom?: boolean;
+
+    /**
+     * Colour of the lens background
+     */
+    lensColour?: string;
+
+    /**
+     * Opacity of lens
+     */
+    lensOpacity?: number;
+    lenszoom?: boolean;
+
+    /**
+     * Enable a tint overlay
+     */
+    tint?: boolean;
+
+    /**
+     * Colour of the tin
+     */
+    tintColour?: string;
+
+    /**
+     * Opacity of the tint
+     */
+    tintOpacity?: number;
+
+    /**
+     * This assigns a set of gallery links to the zoom image
+     */
+    gallery?: string;
+
+    /**
+     * Type of cursor
+     */
+    cursor?: 'default' | 'cursor' | 'crosshair';
+}
+declare global {
+    interface JQuery {
+        /**
+         * Initialize ElevateZoom Plugin
+         */
+        ezPlus(options?: Options): JQuery;
+    }
+}
diff --git a/types/ez-plus/tsconfig.json b/types/ez-plus/tsconfig.json
new file mode 100644
index 0000000000..14e9266312
--- /dev/null
+++ b/types/ez-plus/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "esModuleInterop": true
+    },
+    "files": [
+        "index.d.ts",
+        "ez-plus-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/ez-plus/tslint.json b/types/ez-plus/tslint.json
new file mode 100644
index 0000000000..d04fe2e1fa
--- /dev/null
+++ b/types/ez-plus/tslint.json
@@ -0,0 +1 @@
+{"extends": "dtslint/dt.json"}
\ No newline at end of file

From f804578e48d70a0b859c7f176442ab8cbe3c2461 Mon Sep 17 00:00:00 2001
From: AndersonFriaca <afriacaxd@gmail.com>
Date: Sun, 4 Mar 2018 00:26:00 -0400
Subject: [PATCH 0216/1382] Types for JQuery ElevateZoom Plus Plugin

---
 types/ez-plus/index.d.ts | 53 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 50 insertions(+), 3 deletions(-)

diff --git a/types/ez-plus/index.d.ts b/types/ez-plus/index.d.ts
index 177816118c..3a372108d3 100644
--- a/types/ez-plus/index.d.ts
+++ b/types/ez-plus/index.d.ts
@@ -23,9 +23,9 @@ export interface Options {
     imageCrossfade?: boolean;
 
     /**
-     * Activate spinner icon
+     * Activate spinner icon or url
      */
-    loadingIcon?: boolean;
+    loadingIcon?: boolean | string;
 
     /**
      * Activate easing
@@ -58,7 +58,7 @@ export interface Options {
      * y-axis offset of the zoom window
      */
     zoomWindowOffsetY?: number;
-    zoomWindowPosition?: number|string;
+    zoomWindowPosition?: number | string;
 
     /**
      * Speed of Lens fadeIn
@@ -156,6 +156,53 @@ export interface Options {
      * Type of cursor
      */
     cursor?: 'default' | 'cursor' | 'crosshair';
+    container?: string;
+
+    /**
+     * Attribute to plugin use for zoom
+     */
+    attrImageZoomSrc?: string;
+
+    /**
+     * In pixels the dimensions you want to constrain on
+     */
+    constrainSize?: number | false;
+    constrainType?: 'width' | 'height';
+    debug?: boolean;
+    easingAmount?: number;
+    enabled?: boolean;
+    galleryActiveClass?: string;
+    gallerySelector?: string | false;
+    galleryItem?: string;
+    galleryEvent?: string;
+    mantainZoomAspectRatio?: boolean;
+    maxZoomLevel?: number | false;
+    minZoomLevel?: number;
+    preloading?: 0 | 1;
+    respond?: any[];
+
+    /**
+     * Steps of the scrollzoom
+     */
+    scrollZoomIncrement?: number;
+    touchEnabled?: boolean;
+    zoomActivation?: 'click' | 'hover';
+
+    /**
+     * Zoom container parent selector
+     */
+    zoomContainerAppendTo?: string;
+
+    /**
+     * Identifier for the zoom container
+     */
+    zoomId?: number;
+
+    /**
+     * Zoom level of image
+     */
+    zoomLevel?: number;
+    zIndex?: number;
 }
 declare global {
     interface JQuery {

From 70742da0d0c98342c3cea87ac4458689dc19bf5b Mon Sep 17 00:00:00 2001
From: Kanat Kubash <kanatkubash@gmail.com>
Date: Sun, 4 Mar 2018 13:12:27 +0600
Subject: [PATCH 0217/1382] Removed declare namespace hack Fixed tests to use
 require instead of import from Removed useless Currencies union

---
 types/js-money/index.d.ts        | 317 +++++++++++++++----------------
 types/js-money/js-money-tests.ts |   4 +-
 types/js-money/lib/currency.d.ts |   2 -
 3 files changed, 150 insertions(+), 173 deletions(-)

diff --git a/types/js-money/index.d.ts b/types/js-money/index.d.ts
index 5288384f6e..e778cf1fdb 100644
--- a/types/js-money/index.d.ts
+++ b/types/js-money/index.d.ts
@@ -5,28 +5,9 @@
 
 import { Currency } from './lib/currency';
 
-type Currencies = 'USD' | 'CAD' | 'EUR' | 'BTC' | 'AED' | 'AFN'
-    | 'ALL' | 'AMD' | 'ARS' | 'AUD' | 'AZN' | 'BAM' | 'BDT'
-    | 'BGN' | 'BHD' | 'BIF' | 'BND' | 'BOB' | 'BRL' | 'BWP'
-    | 'BYR' | 'BZD' | 'CDF' | 'CHF' | 'CLP' | 'CNY' | 'COP'
-    | 'CRC' | 'CVE' | 'CZK' | 'DJF' | 'DKK' | 'DOP' | 'DZD'
-    | 'EEK' | 'EGP' | 'ERN' | 'ETB' | 'GBP' | 'GEL' | 'GHS'
-    | 'GNF' | 'GTQ' | 'HKD' | 'HNL' | 'HRK' | 'HUF' | 'IDR'
-    | 'ILS' | 'INR' | 'IQD' | 'IRR' | 'ISK' | 'JMD' | 'JOD'
-    | 'JPY' | 'KES' | 'KHR' | 'KMF' | 'KRW' | 'KWD' | 'KZT'
-    | 'LAK' | 'LBP' | 'LKR' | 'LTL' | 'LVL' | 'LYD' | 'MAD'
-    | 'MDL' | 'MGA' | 'MKD' | 'MMK' | 'MOP' | 'MUR' | 'MXN'
-    | 'MYR' | 'MZN' | 'NAD' | 'NGN' | 'NIO' | 'NOK' | 'NPR'
-    | 'NZD' | 'OMR' | 'PAB' | 'PEN' | 'PHP' | 'PKR' | 'PLN'
-    | 'PYG' | 'QAR' | 'RON' | 'RSD' | 'RUB' | 'RWF' | 'SAR'
-    | 'SDG' | 'SEK' | 'SGD' | 'SOS' | 'SYP' | 'THB' | 'TND'
-    | 'TOP' | 'TRY' | 'TTD' | 'TWD' | 'TZS' | 'UAH' | 'UGX'
-    | 'UYU' | 'UZS' | 'VEF' | 'VND' | 'XAF' | 'XOF' | 'YER'
-    | 'ZAR' | 'ZMK' | string;
-
 interface MoneyObjectOut {
-    amount: number;
-    currency: string;
+	amount: number;
+	currency: string;
 }
 
 type Rounders = 'round' | 'floor' | 'ceil';
@@ -34,154 +15,152 @@ type Rounders = 'round' | 'floor' | 'ceil';
 type RoundFunction = (num: number) => number;
 
 declare class Money {
-    constructor(amount: number, currency: Currencies | Currency);
-    amount: number;
-    currency: string;
-    static fromInteger(amount: number, currency: Currencies | Currency): Money;
-    static fromDecimal(amount: number, currency: Currencies | Currency, rounder?: Rounders | RoundFunction): Money;
-    equals(other: Money): boolean;
-    add(other: Money): Money;
-    subtract(other: Money): Money;
-    multiply(multiplier: number, rounder?: RoundFunction): Money;
-    divide(divisor: number, rounder?: RoundFunction): Money;
-    allocate(ratios: number[]): Money[];
-    compare(other: Money): number;
-    greaterThan(other: Money): boolean;
-    greaterThanOrEqual(other: Money): boolean;
-    lessThan(other: Money): boolean;
-    lessThanOrEqual(other: Money): boolean;
-    isZero(): boolean;
-    isPositive(): boolean;
-    isNegative(): boolean;
-    toDecimal(): number;
-    toString(): string;
-    toJSON(): MoneyObjectOut;
-    getAmount(): number;
-    getCurrency(): string;
-    //#region Currencies
-    static USD: Currency;
-    static CAD: Currency;
-    static EUR: Currency;
-    static BTC: Currency;
-    static AED: Currency;
-    static AFN: Currency;
-    static ALL: Currency;
-    static AMD: Currency;
-    static ARS: Currency;
-    static AUD: Currency;
-    static AZN: Currency;
-    static BAM: Currency;
-    static BDT: Currency;
-    static BGN: Currency;
-    static BHD: Currency;
-    static BIF: Currency;
-    static BND: Currency;
-    static BOB: Currency;
-    static BRL: Currency;
-    static BWP: Currency;
-    static BYR: Currency;
-    static BZD: Currency;
-    static CDF: Currency;
-    static CHF: Currency;
-    static CLP: Currency;
-    static CNY: Currency;
-    static COP: Currency;
-    static CRC: Currency;
-    static CVE: Currency;
-    static CZK: Currency;
-    static DJF: Currency;
-    static DKK: Currency;
-    static DOP: Currency;
-    static DZD: Currency;
-    static EEK: Currency;
-    static EGP: Currency;
-    static ERN: Currency;
-    static ETB: Currency;
-    static GBP: Currency;
-    static GEL: Currency;
-    static GHS: Currency;
-    static GNF: Currency;
-    static GTQ: Currency;
-    static HKD: Currency;
-    static HNL: Currency;
-    static HRK: Currency;
-    static HUF: Currency;
-    static IDR: Currency;
-    static ILS: Currency;
-    static INR: Currency;
-    static IQD: Currency;
-    static IRR: Currency;
-    static ISK: Currency;
-    static JMD: Currency;
-    static JOD: Currency;
-    static JPY: Currency;
-    static KES: Currency;
-    static KHR: Currency;
-    static KMF: Currency;
-    static KRW: Currency;
-    static KWD: Currency;
-    static KZT: Currency;
-    static LAK: Currency;
-    static LBP: Currency;
-    static LKR: Currency;
-    static LTL: Currency;
-    static LVL: Currency;
-    static LYD: Currency;
-    static MAD: Currency;
-    static MDL: Currency;
-    static MGA: Currency;
-    static MKD: Currency;
-    static MMK: Currency;
-    static MOP: Currency;
-    static MUR: Currency;
-    static MXN: Currency;
-    static MYR: Currency;
-    static MZN: Currency;
-    static NAD: Currency;
-    static NGN: Currency;
-    static NIO: Currency;
-    static NOK: Currency;
-    static NPR: Currency;
-    static NZD: Currency;
-    static OMR: Currency;
-    static PAB: Currency;
-    static PEN: Currency;
-    static PHP: Currency;
-    static PKR: Currency;
-    static PLN: Currency;
-    static PYG: Currency;
-    static QAR: Currency;
-    static RON: Currency;
-    static RSD: Currency;
-    static RUB: Currency;
-    static RWF: Currency;
-    static SAR: Currency;
-    static SDG: Currency;
-    static SEK: Currency;
-    static SGD: Currency;
-    static SOS: Currency;
-    static SYP: Currency;
-    static THB: Currency;
-    static TND: Currency;
-    static TOP: Currency;
-    static TRY: Currency;
-    static TTD: Currency;
-    static TWD: Currency;
-    static TZS: Currency;
-    static UAH: Currency;
-    static UGX: Currency;
-    static UYU: Currency;
-    static UZS: Currency;
-    static VEF: Currency;
-    static VND: Currency;
-    static XAF: Currency;
-    static XOF: Currency;
-    static YER: Currency;
-    static ZAR: Currency;
-    static ZMK: Currency;
-    //#endregion
+	constructor(amount: number, currency: string | Currency);
+	amount: number;
+	currency: string;
+	static fromInteger(amount: number, currency: string | Currency): Money;
+	static fromDecimal(amount: number, currency: string | Currency, rounder?: Rounders | RoundFunction): Money;
+	equals(other: Money): boolean;
+	add(other: Money): Money;
+	subtract(other: Money): Money;
+	multiply(multiplier: number, rounder?: RoundFunction): Money;
+	divide(divisor: number, rounder?: RoundFunction): Money;
+	allocate(ratios: number[]): Money[];
+	compare(other: Money): number;
+	greaterThan(other: Money): boolean;
+	greaterThanOrEqual(other: Money): boolean;
+	lessThan(other: Money): boolean;
+	lessThanOrEqual(other: Money): boolean;
+	isZero(): boolean;
+	isPositive(): boolean;
+	isNegative(): boolean;
+	toDecimal(): number;
+	toString(): string;
+	toJSON(): MoneyObjectOut;
+	getAmount(): number;
+	getCurrency(): string;
+	//#region Currencies
+	static USD: Currency;
+	static CAD: Currency;
+	static EUR: Currency;
+	static BTC: Currency;
+	static AED: Currency;
+	static AFN: Currency;
+	static ALL: Currency;
+	static AMD: Currency;
+	static ARS: Currency;
+	static AUD: Currency;
+	static AZN: Currency;
+	static BAM: Currency;
+	static BDT: Currency;
+	static BGN: Currency;
+	static BHD: Currency;
+	static BIF: Currency;
+	static BND: Currency;
+	static BOB: Currency;
+	static BRL: Currency;
+	static BWP: Currency;
+	static BYR: Currency;
+	static BZD: Currency;
+	static CDF: Currency;
+	static CHF: Currency;
+	static CLP: Currency;
+	static CNY: Currency;
+	static COP: Currency;
+	static CRC: Currency;
+	static CVE: Currency;
+	static CZK: Currency;
+	static DJF: Currency;
+	static DKK: Currency;
+	static DOP: Currency;
+	static DZD: Currency;
+	static EEK: Currency;
+	static EGP: Currency;
+	static ERN: Currency;
+	static ETB: Currency;
+	static GBP: Currency;
+	static GEL: Currency;
+	static GHS: Currency;
+	static GNF: Currency;
+	static GTQ: Currency;
+	static HKD: Currency;
+	static HNL: Currency;
+	static HRK: Currency;
+	static HUF: Currency;
+	static IDR: Currency;
+	static ILS: Currency;
+	static INR: Currency;
+	static IQD: Currency;
+	static IRR: Currency;
+	static ISK: Currency;
+	static JMD: Currency;
+	static JOD: Currency;
+	static JPY: Currency;
+	static KES: Currency;
+	static KHR: Currency;
+	static KMF: Currency;
+	static KRW: Currency;
+	static KWD: Currency;
+	static KZT: Currency;
+	static LAK: Currency;
+	static LBP: Currency;
+	static LKR: Currency;
+	static LTL: Currency;
+	static LVL: Currency;
+	static LYD: Currency;
+	static MAD: Currency;
+	static MDL: Currency;
+	static MGA: Currency;
+	static MKD: Currency;
+	static MMK: Currency;
+	static MOP: Currency;
+	static MUR: Currency;
+	static MXN: Currency;
+	static MYR: Currency;
+	static MZN: Currency;
+	static NAD: Currency;
+	static NGN: Currency;
+	static NIO: Currency;
+	static NOK: Currency;
+	static NPR: Currency;
+	static NZD: Currency;
+	static OMR: Currency;
+	static PAB: Currency;
+	static PEN: Currency;
+	static PHP: Currency;
+	static PKR: Currency;
+	static PLN: Currency;
+	static PYG: Currency;
+	static QAR: Currency;
+	static RON: Currency;
+	static RSD: Currency;
+	static RUB: Currency;
+	static RWF: Currency;
+	static SAR: Currency;
+	static SDG: Currency;
+	static SEK: Currency;
+	static SGD: Currency;
+	static SOS: Currency;
+	static SYP: Currency;
+	static THB: Currency;
+	static TND: Currency;
+	static TOP: Currency;
+	static TRY: Currency;
+	static TTD: Currency;
+	static TWD: Currency;
+	static TZS: Currency;
+	static UAH: Currency;
+	static UGX: Currency;
+	static UYU: Currency;
+	static UZS: Currency;
+	static VEF: Currency;
+	static VND: Currency;
+	static XAF: Currency;
+	static XOF: Currency;
+	static YER: Currency;
+	static ZAR: Currency;
+	static ZMK: Currency;
+	//#endregion
 }
 
-/// to supress new Money() error
-declare namespace Money { }
 export = Money;
diff --git a/types/js-money/js-money-tests.ts b/types/js-money/js-money-tests.ts
index 8c28cc554e..a75d41ac53 100644
--- a/types/js-money/js-money-tests.ts
+++ b/types/js-money/js-money-tests.ts
@@ -1,5 +1,5 @@
-import * as Money from "js-money";
-import * as CurrencyObjects from "js-money/lib/currency";
+import Money = require('js-money');
+import * as CurrencyObjects from 'js-money/lib/currency';
 
 const money = new Money(1500, 'USD');
 const other = new Money(100, Money.THB);
diff --git a/types/js-money/lib/currency.d.ts b/types/js-money/lib/currency.d.ts
index 1abac4a9ca..20be23cc7e 100644
--- a/types/js-money/lib/currency.d.ts
+++ b/types/js-money/lib/currency.d.ts
@@ -138,7 +138,5 @@ declare namespace Currencies {
 	}
 }
 
-
-
 declare var Currencies: Currencies.Currencies;
 export = Currencies;
\ No newline at end of file

From 95b77c041ffd928751edbea44a7823895d4311fe Mon Sep 17 00:00:00 2001
From: Wayne Dela Cruz <ddwwcruz@gmail.com>
Date: Sun, 4 Mar 2018 15:21:08 +0800
Subject: [PATCH 0218/1382] Add more support for different kinds of queries

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

diff --git a/types/mongodb/index.d.ts b/types/mongodb/index.d.ts
index 2b67462c7c..28173780a8 100644
--- a/types/mongodb/index.d.ts
+++ b/types/mongodb/index.d.ts
@@ -672,7 +672,7 @@ type FilterQuery<T> = {
         $bitsAnySet?: Object;
         [key: string]: any;
     };
-};
+} | { [key:string]: any };
 
 // Documentation: http://docs.mongodb.org/manual/reference/command/collStats/
 export interface CollStats {

From 2e07611204e9cc5830e9f4f080db93fa28c359db Mon Sep 17 00:00:00 2001
From: Daniel Machado <daniel.machado.fernandez@gmail.com>
Date: Sun, 4 Mar 2018 11:29:15 +0100
Subject: [PATCH 0219/1382] Fix construtor problems

---
 types/boom/boom-tests.ts | 74 ++++++++++++++++----------------
 types/boom/index.d.ts    | 92 ++++++++++++++++++++--------------------
 types/hapi/index.d.ts    |  4 +-
 3 files changed, 84 insertions(+), 86 deletions(-)

diff --git a/types/boom/boom-tests.ts b/types/boom/boom-tests.ts
index d143148cf8..5ffd808de4 100644
--- a/types/boom/boom-tests.ts
+++ b/types/boom/boom-tests.ts
@@ -1,10 +1,10 @@
-import Boom = require('boom');
+import * as Boom from 'boom';
 
 // 4xx and data type
 
 const badRequestError = Boom.badRequest('message', {some: 'data'});
 badRequestError.data.some;
-const badRequestError2: Boom.Boom = Boom.badImplementation('message');
+const badRequestError2: Boom = Boom.badImplementation('message');
 
 const unauthorizedError1 = Boom.unauthorized('message', 'scheme', {some: 'attribute'});
 unauthorizedError1.output.payload.attributes === { some: 'attribute', error: 'message' };
@@ -24,131 +24,131 @@ unauthorizedError4.output.headers === { 'WWW-Authenticate': 'scheme some="attrib
 
 const paymentRequiredError = Boom.paymentRequired('message', {some: 'data'});
 paymentRequiredError.data.some;
-const paymentRequiredError2: Boom.Boom = Boom.paymentRequired('message');
+const paymentRequiredError2: Boom = Boom.paymentRequired('message');
 
 const forbiddenError = Boom.forbidden('message', {some: 'data'});
 forbiddenError.data.some;
-const forbiddenError2: Boom.Boom = Boom.forbidden('message');
+const forbiddenError2: Boom = Boom.forbidden('message');
 
 const notFoundError = Boom.notFound('message', {some: 'data'});
 notFoundError.data.some;
-const notFoundError2: Boom.Boom = Boom.notFound('message');
+const notFoundError2: Boom = Boom.notFound('message');
 
 const methodNotAllowedError = Boom.methodNotAllowed('message', {some: 'data'});
 methodNotAllowedError.data.some;
-const methodNotAllowedError2: Boom.Boom = Boom.methodNotAllowed('message');
+const methodNotAllowedError2: Boom = Boom.methodNotAllowed('message');
 
 const notAcceptableError = Boom.notAcceptable('message', {some: 'data'});
 notAcceptableError.data.some;
-const notAcceptableError2: Boom.Boom = Boom.notAcceptable('message');
+const notAcceptableError2: Boom = Boom.notAcceptable('message');
 
 const proxyAuthRequiredError = Boom.proxyAuthRequired('message', {some: 'data'});
 proxyAuthRequiredError.data.some;
-const proxyAuthRequiredError2: Boom.Boom = Boom.proxyAuthRequired('message');
+const proxyAuthRequiredError2: Boom = Boom.proxyAuthRequired('message');
 
 const clientTimeoutError = Boom.clientTimeout('message', {some: 'data'});
 clientTimeoutError.data.some;
-const clientTimeoutError2: Boom.Boom = Boom.clientTimeout('message');
+const clientTimeoutError2: Boom = Boom.clientTimeout('message');
 
 const conflictError = Boom.conflict('message', {some: 'data'});
 conflictError.data.some;
 
 const resourceGoneError = Boom.resourceGone('message', {some: 'data'});
 resourceGoneError.data.some;
-const resourceGoneError2: Boom.Boom = Boom.resourceGone('message');
+const resourceGoneError2: Boom = Boom.resourceGone('message');
 
 const lengthRequiredError = Boom.lengthRequired('message', {some: 'data'});
 lengthRequiredError.data.some;
-const lengthRequiredError2: Boom.Boom = Boom.lengthRequired('message');
+const lengthRequiredError2: Boom = Boom.lengthRequired('message');
 
 const preconditionFailedError = Boom.preconditionFailed('message', {some: 'data'});
 preconditionFailedError.data.some;
-const preconditionFailedError2: Boom.Boom = Boom.preconditionFailed('message');
+const preconditionFailedError2: Boom = Boom.preconditionFailed('message');
 
 const entityTooLargeError = Boom.entityTooLarge('message', {some: 'data'});
 entityTooLargeError.data.some;
-const entityTooLargeError2: Boom.Boom = Boom.lengthRequired('message');
+const entityTooLargeError2: Boom = Boom.lengthRequired('message');
 
 const uriTooLongError = Boom.uriTooLong('message', {some: 'data'});
 uriTooLongError.data.some;
-const uriTooLongError2: Boom.Boom = Boom.uriTooLong('message');
+const uriTooLongError2: Boom = Boom.uriTooLong('message');
 
 const unsupportedMediaTypeError = Boom.unsupportedMediaType('message', {some: 'data'});
 unsupportedMediaTypeError.data.some;
-const unsupportedMediaTypeError2: Boom.Boom = Boom.unsupportedMediaType('message');
+const unsupportedMediaTypeError2: Boom = Boom.unsupportedMediaType('message');
 
 const rangeNotSatisfiableError = Boom.rangeNotSatisfiable('message', {some: 'data'});
 rangeNotSatisfiableError.data.some;
-const rangeNotSatisfiableError2: Boom.Boom = Boom.rangeNotSatisfiable('message');
+const rangeNotSatisfiableError2: Boom = Boom.rangeNotSatisfiable('message');
 
 const expectationFailedError = Boom.expectationFailed('message', {some: 'data'});
 expectationFailedError.data.some;
-const expectationFailedError2: Boom.Boom = Boom.expectationFailed('message');
+const expectationFailedError2: Boom = Boom.expectationFailed('message');
 
 const teapotError = Boom.teapot('message', {some: 'data'});
 teapotError.data.some;
-const teapotError2: Boom.Boom = Boom.teapot('message');
+const teapotError2: Boom = Boom.teapot('message');
 
 const badDataError = Boom.badData('message', {some: 'data'});
 badDataError.data.some;
-const badDataError2: Boom.Boom = Boom.badData('message');
+const badDataError2: Boom = Boom.badData('message');
 
 const lockedError = Boom.locked('message', {some: 'data'});
 lockedError.data.some;
-const lockedError2: Boom.Boom = Boom.locked('message');
+const lockedError2: Boom = Boom.locked('message');
 
 const failedDependencyError = Boom.failedDependency('message', {some: 'data'});
 failedDependencyError.data.some;
-const failedDependencyError2: Boom.Boom = Boom.failedDependency('message');
+const failedDependencyError2: Boom = Boom.failedDependency('message');
 
 const preconditionRequiredError = Boom.preconditionRequired('message', {some: 'data'});
 preconditionRequiredError.data.some;
-const preconditionRequiredError2: Boom.Boom = Boom.preconditionRequired('message');
+const preconditionRequiredError2: Boom = Boom.preconditionRequired('message');
 
 const tooManyRequestsError = Boom.tooManyRequests('message', {some: 'data'});
 tooManyRequestsError.data.some;
-const tooManyRequestsError2: Boom.Boom = Boom.tooManyRequests('message');
+const tooManyRequestsError2: Boom = Boom.tooManyRequests('message');
 
 const illegalError = Boom.illegal('message', {some: 'data'});
 illegalError.data.some;
-const illegalError2: Boom.Boom = Boom.illegal('message');
+const illegalError2: Boom = Boom.illegal('message');
 
 // 5xx and data type
 
 const badImplementationError = Boom.badImplementation('message', {some: 'data'});
 badImplementationError.data.some;
-const badImplementationError2: Boom.Boom = Boom.badImplementation('message');
+const badImplementationError2: Boom = Boom.badImplementation('message');
 
 const internalError = Boom.internal('message', {some: 'data'});
 internalError.data.some;
-const internalError2: Boom.Boom = Boom.internal('message');
+const internalError2: Boom = Boom.internal('message');
 
 const notImplementedError = Boom.notImplemented('message', {some: 'data'});
 notImplementedError.data.some;
-const notImplementedError2: Boom.Boom = Boom.notImplemented('message');
+const notImplementedError2: Boom = Boom.notImplemented('message');
 
 const badGatewayError = Boom.badGateway('message', {some: 'data'});
 badGatewayError.data.some;
-const badGatewayError2: Boom.Boom = Boom.badGateway('message');
+const badGatewayError2: Boom = Boom.badGateway('message');
 
 const serverUnavailableError = Boom.serverUnavailable('message', {some: 'data'});
 serverUnavailableError.data.some;
-const serverUnavailableError2: Boom.Boom = Boom.serverUnavailable('message');
+const serverUnavailableError2: Boom = Boom.serverUnavailable('message');
 
 const gatewayTimeoutError = Boom.gatewayTimeout('message', {some: 'data'});
 gatewayTimeoutError.data.some;
-const gatewayTimeoutError2: Boom.Boom = Boom.gatewayTimeout('message');
+const gatewayTimeoutError2: Boom = Boom.gatewayTimeout('message');
 
 // boomify
 const boomifiedError = Boom.boomify(new Error('test'), { statusCode: 400, message: 'some message' });
 
 // isBoom
 
-const isBoomError = new Boom.Boom('test')
+const isBoomError = new Boom('test')
 
 Boom.isBoom(isBoomError);
 
-const maybeBoom = <any>new Boom.Boom('test');
+const maybeBoom = <any>new Boom('test');
 if(Boom.isBoom(maybeBoom)) {
     // isBoom is a type guard that allows accessing these properties:
     maybeBoom.output.headers;
@@ -156,7 +156,7 @@ if(Boom.isBoom(maybeBoom)) {
 
 // constructor
 
-const constructorError: Boom.Boom = new Boom.Boom('test');
+const constructorError: Boom = new Boom('test');
 
 constructorError.message;
 
@@ -184,11 +184,11 @@ interface CustomPayload extends Boom.Payload {
  * Test assignment of custom error data:
  */
 const errorWithData = Boom.badImplementation('', { custom1: 'test', customType: 'Custom1', isCustom: true } as CustomData1);
-const errorWithNoExplicitDataType: Boom.Boom = errorWithData; // can assign to error without explicit data type
-const errorWithExplicitType: Boom.Boom<CustomData> = errorWithData; // can assign to union data type
-const errorWithConcreteCustomData: Boom.Boom<CustomData1> = errorWithData; // can assign to concrete data type
+const errorWithNoExplicitDataType: Boom = errorWithData; // can assign to error without explicit data type
+const errorWithExplicitType: Boom<CustomData> = errorWithData; // can assign to union data type
+const errorWithConcreteCustomData: Boom<CustomData1> = errorWithData; // can assign to concrete data type
 // assignment to CustomData2 would not be possible
-// const errorWithConcreteCustomData2: Boom.Boom<CustomData2> = errorWithData;
+// const errorWithConcreteCustomData2: Boom<CustomData2> = errorWithData;
 
 // Some complex error data types for testing purposes:
 interface CustomDataBase {
diff --git a/types/boom/index.d.ts b/types/boom/index.d.ts
index a1e11a341a..b38dafe038 100644
--- a/types/boom/index.d.ts
+++ b/types/boom/index.d.ts
@@ -8,17 +8,15 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
-export = Boom;
-
-declare namespace Boom {
-
-    /**
+ export = 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:
      * @see {@link https://github.com/hapijs/boom#boom}
      */
-    export class Boom<Data = any> extends Error {
+declare class Boom<Data = any> extends Error {
+
         /** Creates a new Boom object using the provided message and then calling boomify() to decorate the error with the Boom properties. */
-        constructor(message?: string | Error, options?: Options<Data>);
+        constructor(message?: string | Error, options?: Boom.Options<Data>);
         /** isBoom - if true, indicates this is a Boom object instance. */
         isBoom: boolean;
         /** isServer - convenience bool indicating status code >= 500. */
@@ -26,7 +24,7 @@ declare namespace Boom {
         /** message - the error message. */
         message: string;
         /** output - the formatted response. Can be directly manipulated after object construction to return a custom error response. Allowed root keys: */
-        output: Output;
+        output: Boom.Output;
         /** reformat() - rebuilds error.output using the other object properties. */
         reformat: () => string;
         /** "If message is unset, the 'error' segment of the header will not be present and isMissing will be true on the error object." mentioned in @see {@link https://github.com/hapijs/boom#boomunauthorizedmessage-scheme-attributes} */
@@ -34,7 +32,7 @@ declare namespace Boom {
         /** https://github.com/hapijs/boom#createstatuscode-message-data and https://github.com/hapijs/boom/blob/v4.3.0/lib/index.js#L99 */
         data: Data;
     }
-
+declare namespace Boom {
     interface Options<Data> {
         /** statusCode - the HTTP status code. Defaults to 500 if no status code is already set. */
         statusCode?: number;
@@ -50,7 +48,7 @@ declare namespace Boom {
         override?: boolean;
     }
 
-    export interface Output {
+    interface Output {
         /** statusCode - the HTTP status code (typically 4xx or 5xx). */
         statusCode: number;
         /** headers - an object containing any HTTP headers where each key is a header name and value is the header content. (Limited value type to string https://github.com/hapijs/boom/issues/151 ) */
@@ -59,7 +57,7 @@ declare namespace Boom {
         payload: Payload;
     }
 
-    export interface Payload {
+     interface Payload {
         /** statusCode - the HTTP status code, derived from error.output.statusCode. */
         statusCode: number;
         /** error - the HTTP status message (e.g. 'Bad Request', 'Internal Server Error') derived from statusCode. */
@@ -81,13 +79,13 @@ declare namespace Boom {
      * @param options optional additional options
      * @see {@link https://github.com/hapijs/boom#boomifyerror-options}
      */
-    export function boomify(error: Error, options?: { statusCode?: number, message?: string, override?: boolean }): Boom<null>;
+     function boomify(error: Error, options?: { statusCode?: number, message?: string, override?: boolean }): Boom<null>;
 
     /**
      * Identifies whether an error is a Boom object. Same as calling instanceof Boom.
      * @param error the error object to identify.
      */
-    export function isBoom(error: Error): error is Boom
+     function isBoom(error: Error): error is Boom
 
     // 4xx
     /**
@@ -96,7 +94,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boombadrequestmessage-data}
      */
-    export function badRequest<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function badRequest<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 401 Unauthorized error
@@ -107,10 +105,10 @@ declare namespace Boom {
      * @param attributes an object of values to use while setting the 'WWW-Authenticate' header. This value is only used when scheme is a string, otherwise it is ignored. Every key/value pair will be included in the 'WWW-Authenticate' in the format of 'key="value"' as well as in the response payload under the attributes key. Alternatively value can be a string which is use to set the value of the scheme, for example setting the token value for negotiate header. If string is used message parameter must be null. null and undefined will be replaced with an empty string. If attributes is set, message will be used as the 'error' segment of the 'WWW-Authenticate' header. If message is unset, the 'error' segment of the header will not be present and isMissing will be true on the error object.
      * @see {@link https://github.com/hapijs/boom#boomunauthorizedmessage-scheme-attributes}
      */
-    export function unauthorized(message?: string, scheme?: string, attributes?: {[index: string]: string}): Boom<null>;
-    export function unauthorized(message?: string, scheme?: string[]): Boom<null>;
-    export function unauthorized(message?: null, scheme?: string, attributes?: {[index: string]: string} | string): Boom<null>;
-    export function unauthorized(message?: null, scheme?: string[]): Boom<null>;
+     function unauthorized(message?: string, scheme?: string, attributes?: {[index: string]: string}): Boom<null>;
+     function unauthorized(message?: string, scheme?: string[]): Boom<null>;
+     function unauthorized(message?: null, scheme?: string, attributes?: {[index: string]: string} | string): Boom<null>;
+     function unauthorized(message?: null, scheme?: string[]): Boom<null>;
 
     /**
      * Returns a 402 Payment Required error
@@ -118,7 +116,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boompaymentrequiredmessage-data}
      */
-    export function paymentRequired<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function paymentRequired<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 403 Forbidden error
@@ -126,7 +124,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomforbiddenmessage-data}
      */
-    export function forbidden<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function forbidden<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 404 Not Found error
@@ -134,7 +132,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomnotfoundmessage-data}
      */
-    export function notFound<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function notFound<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 405 Method Not Allowed error
@@ -143,7 +141,7 @@ declare namespace Boom {
      * @param allow optional string or array of strings (to be combined and separated by ', ') which is set to the 'Allow' header.
      * @see {@link https://github.com/hapijs/boom#boommethodnotallowedmessage-data-allow}
      */
-    export function methodNotAllowed<Data = null>(message?: string, data?: Data, allow?: string | string[]): Boom<Data>;
+     function methodNotAllowed<Data = null>(message?: string, data?: Data, allow?: string | string[]): Boom<Data>;
 
     /**
      * Returns a 406 Not Acceptable error
@@ -151,7 +149,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomnotacceptablemessage-data}
      */
-    export function notAcceptable<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function notAcceptable<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 407 Proxy Authentication Required error
@@ -159,7 +157,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomproxyauthrequiredmessage-data}
      */
-    export function proxyAuthRequired<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function proxyAuthRequired<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 408 Request Time-out error
@@ -167,7 +165,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomclienttimeoutmessage-data}
      */
-    export function clientTimeout<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function clientTimeout<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 409 Conflict error
@@ -175,7 +173,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomconflictmessage-data}
      */
-    export function conflict<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function conflict<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 410 Gone error
@@ -183,7 +181,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomresourcegonemessage-data}
      */
-    export function resourceGone<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function resourceGone<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 411 Length Required error
@@ -191,7 +189,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomlengthrequiredmessage-data}
      */
-    export function lengthRequired<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function lengthRequired<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 412 Precondition Failed error
@@ -199,7 +197,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boompreconditionfailedmessage-data}
      */
-    export function preconditionFailed<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function preconditionFailed<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 413 Request Entity Too Large error
@@ -207,7 +205,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomentitytoolargemessage-data}
      */
-    export function entityTooLarge<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function entityTooLarge<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 414 Request-URI Too Large error
@@ -215,7 +213,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomuritoolongmessage-data}
      */
-    export function uriTooLong<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function uriTooLong<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 415 Unsupported Media Type error
@@ -223,7 +221,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomunsupportedmediatypemessage-data}
      */
-    export function unsupportedMediaType<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function unsupportedMediaType<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 416 Requested Range Not Satisfiable error
@@ -231,7 +229,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomrangenotsatisfiablemessage-data}
      */
-    export function rangeNotSatisfiable<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function rangeNotSatisfiable<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 417 Expectation Failed error
@@ -239,7 +237,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomexpectationfailedmessage-data}
      */
-    export function expectationFailed<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function expectationFailed<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 418 I'm a Teapot error
@@ -247,7 +245,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomteapotmessage-data}
      */
-    export function teapot<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function teapot<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 422 Unprocessable Entity error
@@ -255,7 +253,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boombaddatamessage-data}
      */
-    export function badData<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function badData<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 423 Locked error
@@ -263,7 +261,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomlockedmessage-data}
      */
-    export function locked<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function locked<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 424 Failed Dependency error
@@ -271,7 +269,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomfaileddependencymessage-data}
      */
-    export function failedDependency<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function failedDependency<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 428 Precondition Required error
@@ -279,7 +277,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boompreconditionrequiredmessage-data}
      */
-    export function preconditionRequired<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function preconditionRequired<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 429 Too Many Requests error
@@ -287,7 +285,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomtoomanyrequestsmessage-data}
      */
-    export function tooManyRequests<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function tooManyRequests<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 451 Unavailable For Legal Reasons error
@@ -295,7 +293,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomillegalmessage-data}
      */
-    export function illegal<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function illegal<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     // 5xx
     /**
@@ -305,7 +303,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boombadimplementationmessage-data---alias-internal}
      */
-    export function badImplementation<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function badImplementation<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 500 Internal Server Error error
@@ -314,7 +312,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boombadimplementationmessage-data---alias-internal}
      */
-    export function internal<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function internal<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 501 Not Implemented error with your error message to the user
@@ -322,7 +320,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomnotimplementedmessage-data}
      */
-    export function notImplemented<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function notImplemented<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 502 Bad Gateway error with your error message to the user
@@ -330,7 +328,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boombadgatewaymessage-data}
      */
-    export function badGateway<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function badGateway<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 503 Service Unavailable error with your error message to the user
@@ -338,7 +336,7 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomserverunavailablemessage-data}
      */
-    export function serverUnavailable<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function serverUnavailable<Data = null>(message?: string, data?: Data): Boom<Data>;
 
     /**
      * Returns a 504 Gateway Time-out error with your error message to the user
@@ -346,5 +344,5 @@ declare namespace Boom {
      * @param data optional additional error data.
      * @see {@link https://github.com/hapijs/boom#boomgatewaytimeoutmessage-data}
      */
-    export function gatewayTimeout<Data = null>(message?: string, data?: Data): Boom<Data>;
+     function gatewayTimeout<Data = null>(message?: string, data?: Data): Boom<Data>;
 }
diff --git a/types/hapi/index.d.ts b/types/hapi/index.d.ts
index de1542f33f..210e1cc332 100644
--- a/types/hapi/index.d.ts
+++ b/types/hapi/index.d.ts
@@ -457,7 +457,7 @@ export interface Request extends Podium {
      * 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: ResponseObject | Boom.Boom | null;
+    response: ResponseObject | Boom | null;
 
     /**
      * Same as pre but represented as the response object created by the pre method.
@@ -3873,7 +3873,7 @@ export namespace Lifecycle {
     type ReturnValueTypes =
         (null | string | number | boolean) |
         (Buffer) |
-        (Error | Boom.Boom) |
+        (Error | Boom) |
         (stream.Stream) |
         (object | object[]) |
         symbol |

From eac89a740ee9ea81df39b476445308462d7b2e7f Mon Sep 17 00:00:00 2001
From: Almir Kadric <github@almirkadric.com>
Date: Mon, 5 Mar 2018 01:18:23 +0900
Subject: [PATCH 0220/1382] fixed merge issue with master

---
 types/react-router-native/index.d.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/types/react-router-native/index.d.ts b/types/react-router-native/index.d.ts
index c8236e6b79..17601361bd 100644
--- a/types/react-router-native/index.d.ts
+++ b/types/react-router-native/index.d.ts
@@ -43,8 +43,6 @@ export interface LinkProps {
 export class Link extends React.Component<LinkProps> {}
 
 export interface NativeRouterProps {
-  initialEntries?: string[];
-  initialIndex?: number;
   getUserConfirmation?: Function;
   keyLength?: number;
   initialEntries?: string[];

From c8f7a59cc8a61416cc0dfbba0f7c2f80688f636f Mon Sep 17 00:00:00 2001
From: shrey <shrey-jain@hotmail.com>
Date: Sun, 4 Mar 2018 12:46:27 -0500
Subject: [PATCH 0221/1382] Add types for `express-bunyan-logger` module.

---
 .../express-bunyan-logger-tests.ts            | 24 +++++++++++++
 types/express-bunyan-logger/index.d.ts        | 34 +++++++++++++++++++
 types/express-bunyan-logger/tsconfig.json     | 23 +++++++++++++
 types/express-bunyan-logger/tslint.json       |  1 +
 4 files changed, 82 insertions(+)
 create mode 100644 types/express-bunyan-logger/express-bunyan-logger-tests.ts
 create mode 100644 types/express-bunyan-logger/index.d.ts
 create mode 100644 types/express-bunyan-logger/tsconfig.json
 create mode 100644 types/express-bunyan-logger/tslint.json

diff --git a/types/express-bunyan-logger/express-bunyan-logger-tests.ts b/types/express-bunyan-logger/express-bunyan-logger-tests.ts
new file mode 100644
index 0000000000..daac949c0e
--- /dev/null
+++ b/types/express-bunyan-logger/express-bunyan-logger-tests.ts
@@ -0,0 +1,24 @@
+import Bunyan = require('bunyan');
+import expressBunyan = require('express-bunyan-logger');
+
+// works with no options
+const middleware = expressBunyan({});
+const middleware2 = expressBunyan.errorLogger({});
+
+// format accepts both string and function
+const middleware3 = expressBunyan({
+    format: ':name'
+});
+const middleware4 = expressBunyan({
+    format(meta: any) {
+        return 'foo';
+    }
+});
+
+// works when provided a bunyan logger
+const logger = Bunyan.createLogger({
+    name: 'myLogger'
+});
+const middleware5 = expressBunyan({
+    logger
+});
diff --git a/types/express-bunyan-logger/index.d.ts b/types/express-bunyan-logger/index.d.ts
new file mode 100644
index 0000000000..aa9c5cc831
--- /dev/null
+++ b/types/express-bunyan-logger/index.d.ts
@@ -0,0 +1,34 @@
+// Type definitions for express-bunyan-logger 1.3
+// Project: https://github.com/villadora/express-bunyan-logger
+// Definitions by: Shrey Jain <https://github.com/shreyjain1994>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import Bunyan = require('bunyan');
+import express = require('express');
+
+export = Factory;
+
+declare function Factory(options?: Factory.Options): express.RequestHandler;
+
+declare namespace Factory {
+    type FormatFunction = (meta: any) => string;
+    type IncludesFunction = (req: express.Request, res: express.Response) => any;
+    type RequestIdGenFunction = (req: express.Request) => string;
+    type LevelFunction = (status: number, err: Error | null, meta: any) => string;
+
+    interface Options {
+        logger?: Bunyan;
+        format?: string | FormatFunction;
+        parseUA?: boolean;
+        levelFn?: LevelFunction;
+        includesFn?: IncludesFunction;
+        excludes?: string[];
+        obfuscate?: string[];
+        obfuscatePlaceholder?: string;
+        serializers?: { [field: string]: Bunyan.Serializer };
+        immediate?: boolean;
+        genReqId?: RequestIdGenFunction;
+    }
+
+    function errorLogger(options?: Options): express.ErrorRequestHandler;
+}
diff --git a/types/express-bunyan-logger/tsconfig.json b/types/express-bunyan-logger/tsconfig.json
new file mode 100644
index 0000000000..8079293b99
--- /dev/null
+++ b/types/express-bunyan-logger/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "express-bunyan-logger-tests.ts"
+    ]
+}
diff --git a/types/express-bunyan-logger/tslint.json b/types/express-bunyan-logger/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/express-bunyan-logger/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 9d5ace7819b8ffaaa2f426ef1336ec19973c48c6 Mon Sep 17 00:00:00 2001
From: Nicolas Even <n-e@users.noreply.github.com>
Date: Sun, 4 Mar 2018 18:58:21 +0100
Subject: [PATCH 0222/1382] Fix: node: util/promisify: Allow null as the first
 argument for the callback

---
 types/node/index.d.ts    | 25 +++++++++++++------------
 types/node/v8/index.d.ts | 25 +++++++++++++------------
 2 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index 717b906b28..41831a6a73 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -19,6 +19,7 @@
 //                 Alberto Schiabel <https://github.com/jkomyno>
 //                 Klaus Meinhardt <https://github.com/ajafff>
 //                 Huw <https://github.com/hoo29>
+//                 Nicolas Even <https://github.com/n-e>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /** inspector module types */
@@ -5562,18 +5563,18 @@ declare module "util" {
     export function callbackify<T1, T2, T3, T4, T5, T6, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6) => Promise<TResult>): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6, callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
 
     export function promisify<TCustom extends Function>(fn: CustomPromisify<TCustom>): TCustom;
-    export function promisify<TResult>(fn: (callback: (err: Error, result: TResult) => void) => void): () => Promise<TResult>;
-    export function promisify(fn: (callback: (err: Error) => void) => void): () => Promise<void>;
-    export function promisify<T1, TResult>(fn: (arg1: T1, callback: (err: Error, result: TResult) => void) => void): (arg1: T1) => Promise<TResult>;
-    export function promisify<T1>(fn: (arg1: T1, callback: (err: Error) => void) => void): (arg1: T1) => Promise<void>;
-    export function promisify<T1, T2, TResult>(fn: (arg1: T1, arg2: T2, callback: (err: Error, result: TResult) => void) => void): (arg1: T1, arg2: T2) => Promise<TResult>;
-    export function promisify<T1, T2>(fn: (arg1: T1, arg2: T2, callback: (err: Error) => void) => void): (arg1: T1, arg2: T2) => Promise<void>;
-    export function promisify<T1, T2, T3, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3, callback: (err: Error, result: TResult) => void) => void): (arg1: T1, arg2: T2, arg3: T3) => Promise<TResult>;
-    export function promisify<T1, T2, T3>(fn: (arg1: T1, arg2: T2, arg3: T3, callback: (err: Error) => void) => void): (arg1: T1, arg2: T2, arg3: T3) => Promise<void>;
-    export function promisify<T1, T2, T3, T4, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, callback: (err: Error, result: TResult) => void) => void): (arg1: T1, arg2: T2, arg3: T3, arg4: T4) => Promise<TResult>;
-    export function promisify<T1, T2, T3, T4>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, callback: (err: Error) => void) => void): (arg1: T1, arg2: T2, arg3: T3, arg4: T4) => Promise<void>;
-    export function promisify<T1, T2, T3, T4, T5, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, callback: (err: Error, result: TResult) => void) => void): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5) => Promise<TResult>;
-    export function promisify<T1, T2, T3, T4, T5>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, callback: (err: Error) => void) => void): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5) => Promise<void>;
+    export function promisify<TResult>(fn: (callback: (err: Error | null, result: TResult) => void) => void): () => Promise<TResult>;
+    export function promisify(fn: (callback: (err: Error | null) => void) => void): () => Promise<void>;
+    export function promisify<T1, TResult>(fn: (arg1: T1, callback: (err: Error | null, result: TResult) => void) => void): (arg1: T1) => Promise<TResult>;
+    export function promisify<T1>(fn: (arg1: T1, callback: (err: Error | null) => void) => void): (arg1: T1) => Promise<void>;
+    export function promisify<T1, T2, TResult>(fn: (arg1: T1, arg2: T2, callback: (err: Error | null, result: TResult) => void) => void): (arg1: T1, arg2: T2) => Promise<TResult>;
+    export function promisify<T1, T2>(fn: (arg1: T1, arg2: T2, callback: (err: Error | null) => void) => void): (arg1: T1, arg2: T2) => Promise<void>;
+    export function promisify<T1, T2, T3, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3, callback: (err: Error | null, result: TResult) => void) => void): (arg1: T1, arg2: T2, arg3: T3) => Promise<TResult>;
+    export function promisify<T1, T2, T3>(fn: (arg1: T1, arg2: T2, arg3: T3, callback: (err: Error | null) => void) => void): (arg1: T1, arg2: T2, arg3: T3) => Promise<void>;
+    export function promisify<T1, T2, T3, T4, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, callback: (err: Error | null, result: TResult) => void) => void): (arg1: T1, arg2: T2, arg3: T3, arg4: T4) => Promise<TResult>;
+    export function promisify<T1, T2, T3, T4>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, callback: (err: Error | null) => void) => void): (arg1: T1, arg2: T2, arg3: T3, arg4: T4) => Promise<void>;
+    export function promisify<T1, T2, T3, T4, T5, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, callback: (err: Error | null, result: TResult) => void) => void): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5) => Promise<TResult>;
+    export function promisify<T1, T2, T3, T4, T5>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, callback: (err: Error | null) => void) => void): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5) => Promise<void>;
     export function promisify(fn: Function): Function;
     export namespace promisify {
         const custom: symbol;
diff --git a/types/node/v8/index.d.ts b/types/node/v8/index.d.ts
index 5d672296f2..7ee216c569 100644
--- a/types/node/v8/index.d.ts
+++ b/types/node/v8/index.d.ts
@@ -18,6 +18,7 @@
 //                 Hannes Magnusson <https://github.com/Hannes-Magnusson-CK>
 //                 Alberto Schiabel <https://github.com/jkomyno>
 //                 Huw <https://github.com/hoo29>
+//                 Nicolas Even <https://github.com/n-e>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
@@ -5532,18 +5533,18 @@ declare module "util" {
     export function callbackify<T1, T2, T3, T4, T5, T6, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6) => Promise<TResult>): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, arg6: T6, callback: (err: NodeJS.ErrnoException, result: TResult) => void) => void;
 
     export function promisify<TCustom extends Function>(fn: CustomPromisify<TCustom>): TCustom;
-    export function promisify<TResult>(fn: (callback: (err: Error, result: TResult) => void) => void): () => Promise<TResult>;
-    export function promisify(fn: (callback: (err: Error) => void) => void): () => Promise<void>;
-    export function promisify<T1, TResult>(fn: (arg1: T1, callback: (err: Error, result: TResult) => void) => void): (arg1: T1) => Promise<TResult>;
-    export function promisify<T1>(fn: (arg1: T1, callback: (err: Error) => void) => void): (arg1: T1) => Promise<void>;
-    export function promisify<T1, T2, TResult>(fn: (arg1: T1, arg2: T2, callback: (err: Error, result: TResult) => void) => void): (arg1: T1, arg2: T2) => Promise<TResult>;
-    export function promisify<T1, T2>(fn: (arg1: T1, arg2: T2, callback: (err: Error) => void) => void): (arg1: T1, arg2: T2) => Promise<void>;
-    export function promisify<T1, T2, T3, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3, callback: (err: Error, result: TResult) => void) => void): (arg1: T1, arg2: T2, arg3: T3) => Promise<TResult>;
-    export function promisify<T1, T2, T3>(fn: (arg1: T1, arg2: T2, arg3: T3, callback: (err: Error) => void) => void): (arg1: T1, arg2: T2, arg3: T3) => Promise<void>;
-    export function promisify<T1, T2, T3, T4, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, callback: (err: Error, result: TResult) => void) => void): (arg1: T1, arg2: T2, arg3: T3, arg4: T4) => Promise<TResult>;
-    export function promisify<T1, T2, T3, T4>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, callback: (err: Error) => void) => void): (arg1: T1, arg2: T2, arg3: T3, arg4: T4) => Promise<void>;
-    export function promisify<T1, T2, T3, T4, T5, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, callback: (err: Error, result: TResult) => void) => void): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5) => Promise<TResult>;
-    export function promisify<T1, T2, T3, T4, T5>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, callback: (err: Error) => void) => void): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5) => Promise<void>;
+    export function promisify<TResult>(fn: (callback: (err: Error | null, result: TResult) => void) => void): () => Promise<TResult>;
+    export function promisify(fn: (callback: (err: Error | null) => void) => void): () => Promise<void>;
+    export function promisify<T1, TResult>(fn: (arg1: T1, callback: (err: Error | null, result: TResult) => void) => void): (arg1: T1) => Promise<TResult>;
+    export function promisify<T1>(fn: (arg1: T1, callback: (err: Error | null) => void) => void): (arg1: T1) => Promise<void>;
+    export function promisify<T1, T2, TResult>(fn: (arg1: T1, arg2: T2, callback: (err: Error | null, result: TResult) => void) => void): (arg1: T1, arg2: T2) => Promise<TResult>;
+    export function promisify<T1, T2>(fn: (arg1: T1, arg2: T2, callback: (err: Error | null) => void) => void): (arg1: T1, arg2: T2) => Promise<void>;
+    export function promisify<T1, T2, T3, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3, callback: (err: Error | null, result: TResult) => void) => void): (arg1: T1, arg2: T2, arg3: T3) => Promise<TResult>;
+    export function promisify<T1, T2, T3>(fn: (arg1: T1, arg2: T2, arg3: T3, callback: (err: Error | null) => void) => void): (arg1: T1, arg2: T2, arg3: T3) => Promise<void>;
+    export function promisify<T1, T2, T3, T4, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, callback: (err: Error | null, result: TResult) => void) => void): (arg1: T1, arg2: T2, arg3: T3, arg4: T4) => Promise<TResult>;
+    export function promisify<T1, T2, T3, T4>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, callback: (err: Error | null) => void) => void): (arg1: T1, arg2: T2, arg3: T3, arg4: T4) => Promise<void>;
+    export function promisify<T1, T2, T3, T4, T5, TResult>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, callback: (err: Error | null, result: TResult) => void) => void): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5) => Promise<TResult>;
+    export function promisify<T1, T2, T3, T4, T5>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, callback: (err: Error | null) => void) => void): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5) => Promise<void>;
     export function promisify(fn: Function): Function;
     export namespace promisify {
         const custom: symbol;

From 3e552b76f696cf37520d8ba7d7d1f77dcefcc2d6 Mon Sep 17 00:00:00 2001
From: Jan Pilzer <jan.pilzer@gmx.de>
Date: Sun, 4 Mar 2018 18:23:29 -0800
Subject: [PATCH 0223/1382] Atom: Add id to MarkerLayer

---
 types/atom/index.d.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/types/atom/index.d.ts b/types/atom/index.d.ts
index 9b0d194976..925061ed63 100644
--- a/types/atom/index.d.ts
+++ b/types/atom/index.d.ts
@@ -949,6 +949,9 @@ export interface Marker {
 
 /** Experimental: A container for a related set of markers. */
 export interface MarkerLayer {
+    /** The identifier for this MarkerLayer. */
+    id: string;
+
     // Lifecycle
     /** Create a copy of this layer with markers in the same state and locations. */
     copy(): MarkerLayer;

From ed5d407ac198a85b6d8e4eaf2e9d77b446d93071 Mon Sep 17 00:00:00 2001
From: RetroCraft <retrocraft314@gmail.com>
Date: Sun, 4 Mar 2018 22:20:40 -0500
Subject: [PATCH 0224/1382] Add id prop to ReactWidgetsCommonProps

---
 types/react-widgets/lib/CommonProps.d.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/types/react-widgets/lib/CommonProps.d.ts b/types/react-widgets/lib/CommonProps.d.ts
index b407b96fe5..85ab05f073 100644
--- a/types/react-widgets/lib/CommonProps.d.ts
+++ b/types/react-widgets/lib/CommonProps.d.ts
@@ -19,6 +19,10 @@ interface ReactWidgetsCommonProps<C> extends React.Props<C> {
      * @default false
      */
     isRtl?: boolean;
+    /**
+     * Used to label and annotate aria- attributes
+     */
+    id?: string;
 }
 
 export interface AutoFocus {

From 0566b0452891c9aacc9ac0a3f77d322d7fdcb142 Mon Sep 17 00:00:00 2001
From: Dusan Radovanovic <dusan.radovanovic@elasticpath.com>
Date: Sun, 4 Mar 2018 21:36:42 -0800
Subject: [PATCH 0225/1382] Remove empty namespace

---
 types/listr/index.d.ts     | 3 ---
 types/listr/listr-tests.ts | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/types/listr/index.d.ts b/types/listr/index.d.ts
index 18f32ec3c0..c9eb6c78f1 100644
--- a/types/listr/index.d.ts
+++ b/types/listr/index.d.ts
@@ -43,7 +43,4 @@ declare class Listr {
     run(ctx?: any): Promise<any>;
 }
 
-declare namespace Listr {
-}
-
 export = Listr;
diff --git a/types/listr/listr-tests.ts b/types/listr/listr-tests.ts
index 528a207658..a8db1a4216 100644
--- a/types/listr/listr-tests.ts
+++ b/types/listr/listr-tests.ts
@@ -1,4 +1,4 @@
-import * as Listr from "listr";
+import Listr = require("listr");
 import * as fs from "fs";
 
 const tasks = new Listr([

From 0361317c9c5c1b1979728af7b09781180f4f622d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Louis=20Roch=C3=A9?= <mail+github@louisroche.net>
Date: Mon, 5 Mar 2018 01:34:40 +0000
Subject: [PATCH 0226/1382] puppeteer: add fromCache and fromServiceWorker

Add two functions from v1.1.0 in Response interface:
- Response.fromCache: https://github.com/GoogleChrome/puppeteer/blob/v1.1.0/docs/api.md#responsefromcache
- Response.fromServiceWorker: https://github.com/GoogleChrome/puppeteer/blob/v1.1.0/docs/api.md#responsefromserviceworker

Bump version to 1.1.0
---
 types/puppeteer/index.d.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/types/puppeteer/index.d.ts b/types/puppeteer/index.d.ts
index 0cce35fc95..a549871070 100644
--- a/types/puppeteer/index.d.ts
+++ b/types/puppeteer/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for puppeteer 1.0
+// Type definitions for puppeteer 1.1
 // Project: https://github.com/GoogleChrome/puppeteer#readme
 // Definitions by: Marvin Hagemeister <https://github.com/marvinhagemeister>
 //                 Christopher Deutsch <https://github.com/cdeutsch>
@@ -673,6 +673,10 @@ export interface RespondOptions {
 export interface Response {
   /** Promise which resolves to a buffer with response body. */
   buffer(): Promise<Buffer>;
+  /** True if the response was served from either the browser's disk cache or memory cache. */
+  fromCache(): boolean;
+  /** True if the response was served by a service worker. */
+  fromServiceWorker(): boolean;
   /** An object with HTTP headers associated with the response. All header names are lower-case. */
   headers(): Headers;
   /**

From 8434f97c667c7486181b2cdb8b11594943e2b688 Mon Sep 17 00:00:00 2001
From: Tom Crockett <pelotom@gmail.com>
Date: Mon, 22 Jan 2018 22:22:44 -0800
Subject: [PATCH 0227/1382] Make JSS use a Name type parameter consistently,
 more accurate Style type

---
 types/jss/index.d.ts   | 255 ++++++++++++++++++++++++++++++++++-------
 types/jss/jss-tests.ts |   9 +-
 2 files changed, 221 insertions(+), 43 deletions(-)

diff --git a/types/jss/index.d.ts b/types/jss/index.d.ts
index d0136216ed..89c38d5223 100644
--- a/types/jss/index.d.ts
+++ b/types/jss/index.d.ts
@@ -3,7 +3,187 @@
 // Definitions by: Brenton Simpson <https://github.com/appsforartists>
 //                 Oleg Slobodskoi <https://github.com/kof>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
+
+import { CSSProperties } from 'react';
+
+export type PseudoCssKey =
+	| ':active'
+	| ':any'
+	| ':checked'
+	| ':default'
+	| ':disabled'
+	| ':empty'
+	| ':enabled'
+	| ':first'
+	| ':first-child'
+	| ':first-of-type'
+	| ':fullscreen'
+	| ':focus'
+	| ':hover'
+	| ':indeterminate'
+	| ':in-range'
+	| ':invalid'
+	| ':last-child'
+	| ':last-of-type'
+	| ':left'
+	| ':link'
+	| ':only-child'
+	| ':only-of-type'
+	| ':optional'
+	| ':out-of-range'
+	| ':read-only'
+	| ':read-write'
+	| ':required'
+	| ':right'
+	| ':root'
+	| ':scope'
+	| ':target'
+	| ':valid'
+	| ':visited'
+	// TODO
+	// | ':dir()'
+	// | ':lang()'
+	// | ':not()'
+	// | ':nth-child()'
+	// | ':nth-last-child()'
+	// | ':nth-last-of-type()'
+	// | ':nth-of-type()'
+	| '::after'
+	| '::before'
+	| '::cue'
+	| '::first-letter'
+	| '::first-line'
+	| '::selection'
+	| '::backdrop '
+	| '::placeholder '
+	| '::marker '
+	| '::spelling-error '
+	| '::grammar-error ';
+
+export type PseudoCss = Partial<Record<PseudoCssKey, CSSProperties>>;
+
+export interface JssProps {
+	'@global'?: React.CSSProperties & PseudoCss;
+	extend?: string;
+	composes?: string | string[];
+}
+
+export type css = React.CSSProperties;
+
+export interface JssExpand {
+	animation:
+		| {
+				delay: css['animationDelay'];
+				direction: css['animationDirection'];
+				duration: css['animationDuration'];
+				iterationCount: css['animationIterationCount'];
+				name: css['animationName'];
+				playState: css['animationPlayState'];
+				timingFunction: any;
+			}
+		| css['animation'];
+	background:
+		| {
+				attachment: css['backgroundAttachment'];
+				color: css['backgroundColor'];
+				image: css['backgroundImage'];
+				position: css['backgroundPosition'] | number[]; // Can be written using array e.g. `[0 0]`
+				repeat: css['backgroundRepeat'];
+				size: Array<css['backgroundSize'] | css['backgroundSize']>; // Can be written using array e.g. `['center' 'center']`
+			}
+		| css['background'];
+	border:
+		| {
+				color: css['borderColor'];
+				style: css['borderStyle'];
+				width: css['borderWidth'];
+			}
+		| css['border'];
+	boxShadow:
+		| {
+				x: any;
+				y: any;
+				blur: any;
+				spread: any;
+				color: css['color'];
+				inset?: 'inset'; // If you want to add inset you need to write "inset: 'inset'"
+			}
+		| css['boxShadow'];
+	flex:
+		| {
+				basis: css['flexBasis'];
+				direction: css['flexDirection'];
+				flow: css['flexFlow'];
+				grow: css['flexGrow'];
+				shrink: css['flexShrink'];
+				wrap: css['flexWrap'];
+			}
+		| css['flex'];
+	font:
+		| {
+				family: css['fontFamily'];
+				size: css['fontSize'];
+				stretch: css['fontStretch'];
+				style: css['fontStyle'];
+				variant: css['fontVariant'];
+				weight: css['fontWeight'];
+			}
+		| css['font'];
+	listStyle:
+		| {
+				image: css['listStyleImage'];
+				position: css['listStylePosition'];
+				type: css['listStyleType'];
+			}
+		| css['listStyle'];
+	margin:
+		| {
+				bottom: css['marginBottom'];
+				left: css['marginLeft'];
+				right: css['marginRight'];
+				top: css['marginTop'];
+			}
+		| css['margin'];
+	padding:
+		| {
+				bottom: css['paddingBottom'];
+				left: css['paddingLeft'];
+				right: css['paddingRight'];
+				top: css['paddingTop'];
+			}
+		| css['padding'];
+	outline:
+		| {
+				color: css['outlineColor'];
+				style: 'none' | 'hidden' | 'dotted' | 'dashed' | 'solid' | 'double' | 'groove' | 'ridge' | 'inset' | 'outset';
+				width: any;
+			}
+		| css['outline'];
+	textShadow:
+		| {
+				x: any;
+				y: any;
+				blur: any;
+				color: css['color'];
+			}
+		| css['textShadow'];
+	transition:
+		| {
+				delay: css['transitionDelay'];
+				duration: css['transitionDuration'];
+				property: css['transitionProperty'];
+				timingFunction: css['transitionTimingFunction'];
+			}
+		| css['transition'];
+}
+
+export type JssExpandArr = { [k in keyof JssExpand]?: JssExpand[k] | Array<JssExpand[k]> };
+
+export type Style = React.CSSProperties & PseudoCss & JssProps & JssExpandArr;
+
+export type Styles<Name extends string = any> = Record<Name, Style>;
+export type Classes<Name extends string = any> = Record<Name, string>;
 
 export interface Rule {
 	className: string;
@@ -13,13 +193,12 @@ export interface Rule {
 	prop(key: string, value: any): this;
 	toJSON(): string;
 }
-export interface StyleSheet<T> {
+
+export interface StyleSheet<Name extends string = any> {
 	// Gives auto-completion on the rules declared in `createStyleSheet` without
 	// causing errors for rules added dynamically after creation.
-	classes: {
-		[K in keyof T]: string;
-	} & { [key: string]: string };
-	options: any;
+	classes: Classes<Name>;
+	options: RuleOptions;
 	linked: boolean;
 	attached: boolean;
 	/**
@@ -35,21 +214,21 @@ export interface StyleSheet<T> {
 	 * Will insert a rule also after the stylesheet has been rendered first time.
 	 */
 	addRule(style: Style, options?: Partial<RuleOptions>): Rule;
-	addRule(name: string, style: Style, options?: Partial<RuleOptions>): Rule;
+	addRule(name: Name, style: Style, options?: Partial<RuleOptions>): Rule;
 	/**
 	 * Create and add rules.
 	 * Will render also after Style Sheet was rendered the first time.
 	 */
-	addRules(styles: { [key: string]: Style }, options?: Partial<RuleOptions>): Rule[];
+	addRules(styles: Partial<Styles<Name>>, options?: Partial<RuleOptions>): Rule[];
 	/**
 	 * Get a rule by name.
 	 */
-	getRule(name: string): Rule;
+	getRule(name: Name): Rule;
 	/**
 	 * Delete a rule by name.
 	 * Returns `true`: if rule has been deleted from the DOM.
 	 */
-	deleteRule(name: string): boolean;
+	deleteRule(name: Name): boolean;
 	/**
 	 * Get index of a rule.
 	 */
@@ -58,39 +237,37 @@ export interface StyleSheet<T> {
 	 * Update the function values with a new data.
 	 */
 	update(data?: {}): this;
-	update(name: string, data: {}): this;
+	update(name: Name, data: {}): this;
 	/**
 	 * Convert rules to a CSS string.
 	 */
 	toString(options?: { indent?: number }): string;
 }
-export type GenerateClassName<T> = (rule: Rule, sheet?: StyleSheet<T>) => string;
-export interface Style {
-	[key: string]: any;
-}
+export type GenerateClassName<Name extends string = any> = (rule: Rule, sheet?: StyleSheet<Name>) => string;
+
 export interface JSSPlugin {
 	[key: string]: () => Partial<{
-		onCreateRule(name: string, style: Style, options: RuleOptions): Rule,
-		onProcessRule(rule: Rule, sheet: StyleSheet<any>): void,
-		onProcessStyle(style: Style, rule: Rule, sheet: StyleSheet<any>): Style,
-		onProcessSheet(sheet: StyleSheet<any>): void,
-		onChangeValue(value: any, prop: string, rule: Rule): any,
-		onUpdate(data: {}, rule: Rule, sheet: StyleSheet<any>): void,
+		onCreateRule(name: string, style: Style, options: RuleOptions): Rule;
+		onProcessRule(rule: Rule, sheet: StyleSheet): void;
+		onProcessStyle(style: Style, rule: Rule, sheet: StyleSheet): Style;
+		onProcessSheet(sheet: StyleSheet): void;
+		onChangeValue(value: any, prop: string, rule: Rule): any;
+		onUpdate(data: {}, rule: Rule, sheet: StyleSheet): void;
 	}>;
 }
 export interface JSSOptions {
-	createGenerateClassName(): GenerateClassName<any>;
+	createGenerateClassName(): GenerateClassName;
 	plugins: ReadonlyArray<JSSPlugin>;
 	virtual: boolean;
 	insertionPoint: string | HTMLElement;
 }
-export interface RuleFactoryOptions {
+export interface RuleFactoryOptions<Name extends string = any> {
 	selector: string;
-	classes: { [key: string]: string };
-	sheet: StyleSheet<any>;
+	classes: Classes<Name>;
+	sheet: StyleSheet<Name>;
 	index: number;
 	jss: JSS;
-	generateClassName: GenerateClassName<any>;
+	generateClassName: GenerateClassName<Name>;
 }
 export interface RuleOptions {
 	index: number;
@@ -98,23 +275,23 @@ export interface RuleOptions {
 }
 declare class JSS {
 	constructor(options?: Partial<JSSOptions>);
-	createStyleSheet<T>(
-		styles: T,
+	createStyleSheet<Name extends string>(
+		styles: Partial<Styles<Name>>,
 		options?: Partial<{
-			media: string,
-			meta: string,
-			link: boolean,
-			element: HTMLStyleElement,
-			index: number,
-			generateClassName: GenerateClassName<T>,
-			classNamePrefix: string,
+			media: string;
+			meta: string;
+			link: boolean;
+			element: HTMLStyleElement;
+			index: number;
+			generateClassName: GenerateClassName<Name>;
+			classNamePrefix: string;
 		}>,
-	): StyleSheet<T>;
-	removeStyleSheet(sheet: StyleSheet<any>): this;
+	): StyleSheet<Name>;
+	removeStyleSheet(sheet: StyleSheet): this;
 	setup(options?: Partial<JSSOptions>): this;
 	use(plugin: JSSPlugin): this;
-	createRule(style: Style, options?: Partial<RuleFactoryOptions>): Rule;
-	createRule(name: string, style: Style, options?: Partial<RuleFactoryOptions>): Rule;
+	createRule(style: Style, options?: RuleFactoryOptions): Rule;
+	createRule<Name extends string>(name: Name, style: Style, options?: RuleFactoryOptions<Name>): Rule;
 }
 /**
  * Creates a new instance of JSS.
diff --git a/types/jss/jss-tests.ts b/types/jss/jss-tests.ts
index 0cf3f51350..cd9387492c 100644
--- a/types/jss/jss-tests.ts
+++ b/types/jss/jss-tests.ts
@@ -7,10 +7,11 @@ import {
 
 const jss = createJSS().setup({});
 
-const styleSheet = jss.createStyleSheet(
+// use <string> because we will be dynamically augmenting
+const styleSheet = jss.createStyleSheet<string>(
 	{
-		ruleWithMockObservable: {
-			subscribe() {}
+		root: {
+			backgroundColor: 'red',
 		},
 		container: {
 			display: 'flex',
@@ -23,8 +24,8 @@ const styleSheet = jss.createStyleSheet(
 	}
 ).attach();
 
+styleSheet.classes.root; // $ExpectType string
 styleSheet.classes.container; // $ExpectType string
-styleSheet.classes.ruleWithMockObservable; // $ExpectType string
 
 const rule = styleSheet.addRule('dynamicRule', { color: 'indigo' });
 rule.prop('border-radius', 5).prop('color'); // $ExpectType string

From 5c8383cb8cfb9565c99ba935e1b8104d60bd95a8 Mon Sep 17 00:00:00 2001
From: Tom Crockett <pelotom@gmail.com>
Date: Mon, 22 Jan 2018 23:47:53 -0800
Subject: [PATCH 0228/1382] Allow Style to be an Observable

---
 types/jss/index.d.ts   | 4 +++-
 types/jss/jss-tests.ts | 8 ++++----
 types/jss/package.json | 6 ++++++
 3 files changed, 13 insertions(+), 5 deletions(-)
 create mode 100644 types/jss/package.json

diff --git a/types/jss/index.d.ts b/types/jss/index.d.ts
index 89c38d5223..40af88ea8b 100644
--- a/types/jss/index.d.ts
+++ b/types/jss/index.d.ts
@@ -6,6 +6,7 @@
 // TypeScript Version: 2.3
 
 import { CSSProperties } from 'react';
+import { Observable } from 'rxjs';
 
 export type PseudoCssKey =
 	| ':active'
@@ -180,7 +181,8 @@ export interface JssExpand {
 
 export type JssExpandArr = { [k in keyof JssExpand]?: JssExpand[k] | Array<JssExpand[k]> };
 
-export type Style = React.CSSProperties & PseudoCss & JssProps & JssExpandArr;
+export type SimpleStyle = React.CSSProperties & PseudoCss & JssProps & JssExpandArr;
+export type Style = Observable<SimpleStyle> | SimpleStyle
 
 export type Styles<Name extends string = any> = Record<Name, Style>;
 export type Classes<Name extends string = any> = Record<Name, string>;
diff --git a/types/jss/jss-tests.ts b/types/jss/jss-tests.ts
index cd9387492c..c40d024040 100644
--- a/types/jss/jss-tests.ts
+++ b/types/jss/jss-tests.ts
@@ -4,15 +4,15 @@ import {
 	create as createJSS,
 	default as sharedInstance
 } from 'jss';
+import { Observable } from 'rxjs';
 
 const jss = createJSS().setup({});
 
-// use <string> because we will be dynamically augmenting
 const styleSheet = jss.createStyleSheet<string>(
 	{
-		root: {
+		ruleWithMockObservable: Observable.of({
 			backgroundColor: 'red',
-		},
+		}),
 		container: {
 			display: 'flex',
 			width: 100,
@@ -24,8 +24,8 @@ const styleSheet = jss.createStyleSheet<string>(
 	}
 ).attach();
 
-styleSheet.classes.root; // $ExpectType string
 styleSheet.classes.container; // $ExpectType string
+styleSheet.classes.ruleWithMockObservable; // $ExpectType string
 
 const rule = styleSheet.addRule('dynamicRule', { color: 'indigo' });
 rule.prop('border-radius', 5).prop('color'); // $ExpectType string
diff --git a/types/jss/package.json b/types/jss/package.json
new file mode 100644
index 0000000000..33ba8bf22b
--- /dev/null
+++ b/types/jss/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "rxjs": "*"
+    }
+}

From 255cd1aa0c806eb1ec6f6a3fb7d5626954996caa Mon Sep 17 00:00:00 2001
From: Tom Crockett <pelotom@gmail.com>
Date: Tue, 23 Jan 2018 00:00:12 -0800
Subject: [PATCH 0229/1382] Use TypeStyle's CSSProperties

---
 types/jss/index.d.ts   | 10 +++++-----
 types/jss/package.json |  3 ++-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/types/jss/index.d.ts b/types/jss/index.d.ts
index 40af88ea8b..f923ab0976 100644
--- a/types/jss/index.d.ts
+++ b/types/jss/index.d.ts
@@ -5,7 +5,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-import { CSSProperties } from 'react';
+import { types } from 'typestyle';
 import { Observable } from 'rxjs';
 
 export type PseudoCssKey =
@@ -62,15 +62,15 @@ export type PseudoCssKey =
 	| '::spelling-error '
 	| '::grammar-error ';
 
-export type PseudoCss = Partial<Record<PseudoCssKey, CSSProperties>>;
+export type PseudoCss = Partial<Record<PseudoCssKey, types.CSSProperties>>;
 
 export interface JssProps {
-	'@global'?: React.CSSProperties & PseudoCss;
+	'@global'?: types.CSSProperties & PseudoCss;
 	extend?: string;
 	composes?: string | string[];
 }
 
-export type css = React.CSSProperties;
+export type css = types.CSSProperties;
 
 export interface JssExpand {
 	animation:
@@ -181,7 +181,7 @@ export interface JssExpand {
 
 export type JssExpandArr = { [k in keyof JssExpand]?: JssExpand[k] | Array<JssExpand[k]> };
 
-export type SimpleStyle = React.CSSProperties & PseudoCss & JssProps & JssExpandArr;
+export type SimpleStyle = types.CSSProperties & PseudoCss & JssProps & JssExpandArr;
 export type Style = Observable<SimpleStyle> | SimpleStyle
 
 export type Styles<Name extends string = any> = Record<Name, Style>;
diff --git a/types/jss/package.json b/types/jss/package.json
index 33ba8bf22b..2605ce6189 100644
--- a/types/jss/package.json
+++ b/types/jss/package.json
@@ -1,6 +1,7 @@
 {
     "private": true,
     "dependencies": {
-        "rxjs": "*"
+        "rxjs": "*",
+        "typestyle": "*"
     }
 }

From c0928c641784b74d98034084d0fa8c1caf772834 Mon Sep 17 00:00:00 2001
From: Tom Crockett <pelotom@gmail.com>
Date: Tue, 23 Jan 2018 00:11:13 -0800
Subject: [PATCH 0230/1382] Remove rxjs dependency, use observable defn from
 flow

---
 types/jss/index.d.ts      |  4 ++--
 types/jss/jss-tests.ts    |  9 +++++----
 types/jss/observable.d.ts | 17 +++++++++++++++++
 types/jss/package.json    |  1 -
 4 files changed, 24 insertions(+), 7 deletions(-)
 create mode 100644 types/jss/observable.d.ts

diff --git a/types/jss/index.d.ts b/types/jss/index.d.ts
index f923ab0976..8054d7f6a6 100644
--- a/types/jss/index.d.ts
+++ b/types/jss/index.d.ts
@@ -6,7 +6,7 @@
 // TypeScript Version: 2.3
 
 import { types } from 'typestyle';
-import { Observable } from 'rxjs';
+import { Observable } from './observable';
 
 export type PseudoCssKey =
 	| ':active'
@@ -182,7 +182,7 @@ export interface JssExpand {
 export type JssExpandArr = { [k in keyof JssExpand]?: JssExpand[k] | Array<JssExpand[k]> };
 
 export type SimpleStyle = types.CSSProperties & PseudoCss & JssProps & JssExpandArr;
-export type Style = Observable<SimpleStyle> | SimpleStyle
+export type Style = Observable<SimpleStyle> | SimpleStyle;
 
 export type Styles<Name extends string = any> = Record<Name, Style>;
 export type Classes<Name extends string = any> = Record<Name, string>;
diff --git a/types/jss/jss-tests.ts b/types/jss/jss-tests.ts
index c40d024040..fab2665bed 100644
--- a/types/jss/jss-tests.ts
+++ b/types/jss/jss-tests.ts
@@ -4,15 +4,16 @@ import {
 	create as createJSS,
 	default as sharedInstance
 } from 'jss';
-import { Observable } from 'rxjs';
 
 const jss = createJSS().setup({});
 
 const styleSheet = jss.createStyleSheet<string>(
 	{
-		ruleWithMockObservable: Observable.of({
-			backgroundColor: 'red',
-		}),
+		ruleWithMockObservable: {
+			subscribe: () => ({
+				unsubscribe() {}
+			})
+		},
 		container: {
 			display: 'flex',
 			width: 100,
diff --git a/types/jss/observable.d.ts b/types/jss/observable.d.ts
new file mode 100644
index 0000000000..ff6a5f0219
--- /dev/null
+++ b/types/jss/observable.d.ts
@@ -0,0 +1,17 @@
+// Copied from https://github.com/cssinjs/jss/blob/6ed7963786d5ef899075e95f81efc9530342154f/src/types.js
+
+export type Observable<T> = {
+	subscribe(observerOrNext: ObserverOrNext<T>): Subscription
+}
+
+export type Observer<T> = {
+	next: NextChannel<T>
+}
+
+export type NextChannel<T> = (value: T) => void
+export type ObserverOrNext<T> = Observer<T> | NextChannel<T>
+
+export type Unsubscribe = () => void
+export type Subscription = {
+	unsubscribe: Unsubscribe
+}
diff --git a/types/jss/package.json b/types/jss/package.json
index 2605ce6189..a85944f70e 100644
--- a/types/jss/package.json
+++ b/types/jss/package.json
@@ -1,7 +1,6 @@
 {
     "private": true,
     "dependencies": {
-        "rxjs": "*",
         "typestyle": "*"
     }
 }

From d265ffc5449e970d732763336d96c24158ee86f3 Mon Sep 17 00:00:00 2001
From: Tom Crockett <pelotom@gmail.com>
Date: Tue, 23 Jan 2018 00:25:00 -0800
Subject: [PATCH 0231/1382] Adapt TypeStyle's CSS typings to JSS

---
 types/jss/css.d.ts     | 2880 ++++++++++++++++++++++++++++++++++++++++
 types/jss/index.d.ts   |  179 +--
 types/jss/package.json |    6 -
 3 files changed, 2881 insertions(+), 184 deletions(-)
 create mode 100644 types/jss/css.d.ts
 delete mode 100644 types/jss/package.json

diff --git a/types/jss/css.d.ts b/types/jss/css.d.ts
new file mode 100644
index 0000000000..348948f814
--- /dev/null
+++ b/types/jss/css.d.ts
@@ -0,0 +1,2880 @@
+// These CSS typings adapted from TypeStyle: https://github.com/typestyle/typestyle
+
+import { Observable } from './observable'
+
+/**
+ * Value of a CSS Property.  Could be a single value or a list of fallbacks
+ * NOTE: array is for fallbacks
+ */
+export type CSSValue<T> = T | Observable<T>;
+
+/**
+ * For general purpose CSS values
+ **/
+export type CSSValueGeneral = CSSValue<number | string>;
+
+/**
+ * When you are sure that the value must be a string
+ **/
+export type CSSValueString = CSSValue<string>;
+
+/**
+ * CSS properties that cascade also support these
+ * @see https://drafts.csswg.org/css-cascade/#defaulting-keywords
+ */
+export type CSSGlobalValues
+  = 'initial'
+  | 'inherit'
+  | /** combination of `initial` and `inherit` */ 'unset'
+  | 'revert';
+
+export interface FontFace {
+  fontFamily?: string;
+
+  /**
+   * Location of a font-face.  Used with the @font-face at rule
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/src
+   */
+  src?: CSSValueString;
+  unicodeRange?: any;
+  fontVariant?: 'common-ligatures' | 'small-caps' | CSSGlobalValues;
+  fontFeatureSettings?: string;
+  fontWeight?: CSSFontWeight;
+  fontStyle?: 'normal' | 'italic' | 'oblique' | CSSGlobalValues;
+}
+
+/**
+ * Absolute size keywords
+ * @see https://drafts.csswg.org/css-fonts-3/#absolute-size-value
+ */
+export type CSSAbsoluteSize = 'xx-small' | 'x-small' | 'small' | 'medium' | 'large'
+  | 'x-large' | 'xx-large';
+
+/**
+ * an angle; 0' | '0deg' | '0grad' | '0rad' | '0turn' | 'etc.
+ * @see https://drafts.csswg.org/css-values-3/#angles
+ */
+export type CSSAngle = CSSGlobalValues | string | 0;
+
+/**
+ * initial state of an animation.
+ * @see https://drafts.csswg.org/css-animations/#animation-play-state
+ */
+export type CSSAnimationPlayState = CSSGlobalValues | string | 'paused' | 'running';
+
+/**
+ * blend mode
+ * @see https://drafts.fxtf.org/compositing-1/#ltblendmodegt
+ */
+export type CSSBlendMode = 'normal' | 'multiply' | 'screen' | 'overlay' | 'darken' | 'lighten' | 'color-dodge' | 'color-burn'
+  | 'hard-light' | 'soft-light' | 'difference' | 'exclusion' | 'hue' | 'saturation' | 'color' | 'luminosity';
+
+/**
+ * border shorthand for style color and width
+ * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-bottom
+ * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-left
+ * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-right
+ * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-top
+ */
+export type CSSBorderShorthand = CSSGlobalValues | CSSColor | CSSLength | CSSLineStyleSet | string;
+
+/**
+ * Determines the area within which the background is painted.
+ * @see https://drafts.csswg.org/css-backgrounds/#box
+ */
+export type CSSBox = CSSGlobalValues | string | 'border-box' | 'padding-box' | 'content-box';
+
+/**
+ * Color can be a named color, transparent, or a color function
+ * @see https://drafts.csswg.org/css-color-3/#valuea-def-color
+ */
+export type CSSColor = CSSNamedColor | CSSGlobalValues | 'currentColor' | string;
+
+export type CSSNamedColor =
+  'aliceblue' | 'antiquewhite' | 'aqua' | 'aquamarine' | 'azure' | 'beige' | 'bisque' | 'black' | 'blanchedalmond' | 'blue'
+  | 'blueviolet' | 'brown' | 'burlywood' | 'cadetblue' | 'chartreuse' | 'chocolate' | 'coral' | 'cornflowerblue' | 'cornsilk'
+  | 'crimson' | 'cyan' | 'darkblue' | 'darkcyan' | 'darkgoldenrod' | 'darkgray' | 'darkgreen' | 'darkgrey' | 'darkkhaki'
+  | 'darkmagenta' | 'darkolivegreen' | 'darkorange' | 'darkorchid' | 'darkred' | 'darksalmon' | 'darkseagreen'
+  | 'darkslateblue' | 'darkslategray' | 'darkslategrey' | 'darkturquoise' | 'darkviolet' | 'deeppink' | 'deepskyblue'
+  | 'dimgray' | 'dimgrey' | 'dodgerblue' | 'firebrick' | 'floralwhite' | 'forestgreen' | 'fuchsia' | 'gainsboro'
+  | 'ghostwhite' | 'gold' | 'goldenrod' | 'gray' | 'green' | 'greenyellow' | 'grey' | 'honeydew' | 'hotpink' | 'indianred'
+  | 'indigo' | 'ivory' | 'khaki' | 'lavender' | 'lavenderblush' | 'lawngreen' | 'lemonchiffon' | 'lightblue' | 'lightcoral'
+  | 'lightcyan' | 'lightgoldenrodyellow' | 'lightgray' | 'lightgreen' | 'lightgrey' | 'lightpink' | 'lightsalmon'
+  | 'lightseagreen' | 'lightskyblue' | 'lightslategray' | 'lightslategrey' | 'lightsteelblue' | 'lightyellow' | 'lime'
+  | 'limegreen' | 'linen' | 'maroon' | 'mediumaquamarine' | 'mediumblue' | 'mediumorchid' | 'mediumpurple' | 'mediumseagreen'
+  | 'mediumslateblue' | 'mediumspringgreen' | 'mediumturquoise' | 'mediumvioletred' | 'midnightblue' | 'mintcream'
+  | 'mistyrose' | 'moccasin' | 'navajowhite' | 'navy' | 'oldlace' | 'olive' | 'olivedrab' | 'orange' | 'purple'
+  | 'rebeccapurple' | 'red' | 'silver' | 'teal' | 'transparent' | 'white' | 'yellow';
+
+/**
+ * Special type for border-color which can use 1 or 4 colors
+ * @see https://drafts.csswg.org/css-backgrounds-3/#border-color
+ */
+export type CSSColorSet = string | CSSColor;
+
+/**
+  * This property specifies the type of rendering box used for an element. It is a shorthand property for many other display properties.
+  * @see https://developer.mozilla.org/en-US/docs/Web/CSS/display
+  */
+export type CSSDisplay =
+  /* <display-outside> values */
+  'block' | 'inline' | 'run-in'
+  /* <display-inside> values */
+  | 'flow' | 'flow-root' | 'table' | 'flex' | 'grid' | 'ruby' | 'subgrid'
+  /* <display-outside> plus <display-inside> values */
+  | 'block flow' | 'inline table' | 'flex run-in'
+  /* <display-listitem> values */
+  | 'list-item' | 'list-item block' | 'list-item inline' | 'list-item flow' | 'list-item flow-root'
+  | 'list-item block flow' | 'list-item block flow-root' | 'flow list-item block'
+  /* <display-internal> values */
+  | 'table-row-group' | 'table-header-group' | 'table-footer-group' | 'table-row' | 'table-cell'
+  | 'table-column-group' | 'table-column' | 'table-caption' | 'ruby-base' | 'ruby-text'
+  | 'ruby-base-container' | 'ruby-text-container'
+  /* <display-box> values */
+  | 'contents' | 'none'
+  /* <display-legacy> values */
+  | 'inline-block' | 'inline-list-item' | 'inline-table' | 'inline-flex' | 'inline-grid';
+
+/**
+  * CSS Type <baseline-position> of Box Alignment
+  * @see https://www.w3.org/TR/css-align-3/#typedef-baseline-position
+  */
+export type CSSBoxAlignmentBaselinePosition = 'baseline' | 'first baseline' | 'last baseline';
+
+/**
+  * CSS Type <content-distribution> of Box Alignment
+  * @see https://www.w3.org/TR/css-align-3/#typedef-content-distribution
+  */
+export type CSSBoxAlignmentContentDistribution = 'space-between' | 'space-around' | 'space-evenly' | 'stretch';
+
+export type CSSBoxAlignmentContentPositionWithOverflow =
+  | 'center' | 'start' | 'end' | 'flex-start' | 'flex-end'
+  | 'unsafe center' | 'unsafe start' | 'unsafe end' | 'unsafe flex-start' | 'unsafe flex-end'
+  | 'safe center' | 'safe start' | 'safe end' | 'safe flex-start' | 'safe flex-end';
+
+export type CSSBoxAlignmentSelfPositionWithOverflow =
+  | 'center' | 'start' | 'end' | 'self-start' | 'self-end' | 'flex-start' | 'flex-end'
+  | 'unsafe center' | 'unsafe start' | 'unsafe end' | 'unsafe self-start' | 'unsafe self-end' | 'unsafe flex-start' | 'unsafe flex-end'
+  | 'safe center' | 'safe start' | 'safe end' | 'safe self-start' | 'safe self-end' | 'safe flex-start' | 'safe flex-end';
+
+export type CSSBoxAlignmentLeftRightWithOverflow = 'left' | 'right' | 'unsafe left' | 'unsafe right' | 'safe left' | 'safe right';
+
+/**
+  * Type for justify-content in flex or grid
+  * @see https://www.w3.org/TR/css-align-3/#propdef-justify-content
+  */
+export type JustifyContent =
+  | 'normal'
+  | CSSBoxAlignmentContentDistribution
+  | CSSBoxAlignmentContentPositionWithOverflow
+  | 'left'
+  | 'right';
+
+/**
+  * Type for align-content in flex or grid
+  * @see https://www.w3.org/TR/css-align-3/#propdef-align-content
+  */
+export type AlignContent =
+  | 'normal'
+  | CSSBoxAlignmentBaselinePosition
+  | CSSBoxAlignmentContentDistribution
+  | CSSBoxAlignmentContentPositionWithOverflow;
+
+/**
+  * Type for justify-items in flex or grid
+  * @see https://www.w3.org/TR/css-align-3/#propdef-justify-items
+  */
+export type JustifyItems =
+  | 'normal'
+  | 'stretch'
+  | CSSBoxAlignmentBaselinePosition
+  | CSSBoxAlignmentSelfPositionWithOverflow
+  | 'left'
+  | 'right'
+  | 'center'
+  | 'legacy left'
+  | 'legacy right'
+  | 'legacy center';
+
+/**
+  * Type for align-items in flex or grid
+  * @see https://www.w3.org/TR/css-align-3/#propdef-align-items
+  */
+export type AlignItems =
+  | 'normal'
+  | 'stretch'
+  | CSSBoxAlignmentBaselinePosition
+  | CSSBoxAlignmentSelfPositionWithOverflow;
+
+/**
+  * Type for justify-self in flex or grid
+  * @see https://www.w3.org/TR/css-align-3/#propdef-justify-self
+  */
+export type JustifySelf =
+  | 'auto'
+  | 'normal'
+  | 'stretch'
+  | CSSBoxAlignmentBaselinePosition
+  | CSSBoxAlignmentSelfPositionWithOverflow
+  | CSSBoxAlignmentLeftRightWithOverflow;
+
+/**
+  * Type for align-self in flex or grid
+  * @see https://www.w3.org/TR/css-align-3/#propdef-align-self
+  */
+export type AlignSelf =
+  | 'auto'
+  | 'normal'
+  | 'stretch'
+  | CSSBoxAlignmentBaselinePosition
+  | CSSBoxAlignmentSelfPositionWithOverflow;
+
+/**
+ * a gradient function like linear-gradient
+ * @see https://drafts.csswg.org/css-images-3/#gradients
+ */
+export type CSSGradient = CSSGlobalValues | string;
+
+/**
+ * complex type that describes the size of fonts
+ * @see https://drafts.csswg.org/css-fonts-3/#propdef-font-size
+ */
+export type CSSFontSize = CSSGlobalValues | CSSLength | CSSPercentage | CSSAbsoluteSize | CSSRelativeSize;
+
+/**
+ * a value that serves as an image
+ * @see https://drafts.csswg.org/css-images-3/#typedef-image
+ */
+export type CSSImage = CSSGlobalValues | string | CSSGradient | CSSUrl;
+
+/**
+ * an length; 0 | '0px' | '0em' etc.
+ * @see https://drafts.csswg.org/css-values-3/#lengths
+ */
+export type CSSLength = CSSGlobalValues | string | number;
+
+/**
+ * Style of a line (e.g. border-style)
+ * @see https://drafts.csswg.org/css-backgrounds-3/#line-style
+ */
+export type CSSLineStyle = string | 'none' | 'hidden' | 'dotted'
+  | 'dashed' | 'solid' | 'double' | 'groove' | 'ridge' | 'inset'
+  | 'outset';
+
+/**
+ * Special type for border-style which can use 1 or 4 line-style
+ * @see https://drafts.csswg.org/css-backgrounds-3/#border-style
+ */
+export type CSSLineStyleSet = string | CSSLineStyle;
+
+/**
+ * Specifies how the contents of a replaced element should be fitted to the box established by its used height and width.
+ * @see https://developer.mozilla.org/en-US/docs/Web/CSS/object-fit
+ */
+export type CSSObjectFit = "fill" | "contain" | "cover" | "none" | "scale-down" | CSSGlobalValues;
+
+/**
+ * Overflow modes
+ * @see https://drafts.csswg.org/css-overflow-3/#propdef-overflow
+ */
+export type CSSOverflow = 'visible' | 'hidden' | 'scroll' | 'clip' | 'auto';
+
+/**
+ * a percentage; 0 | '0%' etc.
+ * @see https://drafts.csswg.org/css-values-3/#percentage
+ */
+export type CSSPercentage = CSSGlobalValues | string | 0;
+
+/**
+ * Defines a position (e.g. background-position)
+ * @see https://drafts.csswg.org/css-backgrounds-3/#position
+ */
+export type CSSPosition = CSSAngle | string;
+
+/**
+ * Relative size keywords
+ * @see https://drafts.csswg.org/css-fonts-3/#relative-size-value
+ */
+export type CSSRelativeSize = 'larger' | 'smaller';
+
+/**
+ * Specifies how background images are tiled after they have been sized and positioned
+ * @see https://drafts.csswg.org/css-backgrounds/#repeat-style
+ */
+export type CSSRepeatStyle = 'repeat-x'
+  | 'repeat-y'
+  | 'repeat'
+  | 'space'
+  | 'round'
+  | 'no-repeat'
+  | 'repeat repeat'
+  | 'repeat space'
+  | 'repeat round'
+  | 'repeat no-repeat'
+  | 'space repeat'
+  | 'space space'
+  | 'space round'
+  | 'space no-repeat'
+  | 'round repeat'
+  | 'round space'
+  | 'round round'
+  | 'round no-repeat'
+  | 'no-repeat repeat'
+  | 'no-repeat space'
+  | 'no-repeat round'
+  | 'no-repeat no-repeat';
+
+/**
+ * Tranform list for the element.
+ * @see https://developer.mozilla.org/en-US/docs/Web/CSS/transform-function
+ */
+export type CSSTransformFunction = string | 'none';
+
+/**
+ * Starting position for many gradients
+ * @see https://drafts.csswg.org/css-images-3/#typedef-side-or-corner
+ */
+export type CSSSideOrCorner = CSSAngle
+  | 'left' | 'right' | 'top' | 'bottom'
+  | 'to left' | 'to right' | 'to top' | 'to bottom'
+  | 'left top' | 'right top' | 'left bottom' | 'right bottom'
+  | 'top left' | 'top right' | 'bottom left' | 'bottom right'
+  | 'to left top' | 'to right top' | 'to left bottom' | 'to right bottom'
+  | 'to top left' | 'to top right' | 'to bottom left' | 'to bottom right';
+
+export type CSSRadialGradientEndingShape = 'circle' | 'ellipse';
+
+/**
+ * Radial Gradient Size.
+ * @see https://drafts.csswg.org/css-images-3/#ending-shape
+ */
+export type CSSRadialGradientSize = CSSLength | Array<CSSLength>
+  | 'closest-side' | 'farthest-side'
+  | 'closest-corner' | 'closest-side'
+  ;
+
+/** Supporting by `-timing-function` properties */
+export type CSSTimingFunction
+  = /** e.g. steps(int,start|end)|cubic-bezier(n,n,n,n) */ string
+  | CSSGlobalValues
+  | 'ease' | 'ease-in' | 'ease-out' | 'ease-in-out' | 'linear' | 'step-start' | 'step-end';
+
+/**
+ * Expressed as url('protocol://')
+ * @see https://drafts.csswg.org/css-values-3/#urls
+ */
+export type CSSUrl = string;
+
+/**
+ * Font weights
+ */
+export type CSSFontWeight = 'normal' | 'bold' | 'bolder' | 'lighter' | 100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900 | number | CSSGlobalValues;
+
+/**
+ * This interface documents key CSS properties for autocomplete
+ */
+export interface CSSProperties {
+  /**
+   * Typestyle configuration options
+   **/
+  /**
+   * The generated CSS selector gets its own unique location in the generated CSS (disables deduping).
+   * So instead of `.classA,.classB{same properties}`
+   * you get `.classA {same properties} .classB {same properties}`
+   * This is needed for certain browser edge cases like placeholder styling
+   **/
+  $unique?: boolean;
+
+  /**
+   * Smooth scrolling on an iPhone. Specifies whether to use native-style scrolling in an element.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/-webkit-overflow-scrolling
+   */
+  '-webkit-overflow-scrolling'?: 'auto' | 'touch';
+
+  /**
+   * Aligns a flex container's lines within the flex container when there is extra space in the cross-axis, similar to how justify-content aligns individual items within the main-axis.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/align-content
+   */
+  alignContent?: AlignContent;
+
+  /**
+   * Sets the default alignment in the cross axis for all of the flex container's items, including anonymous flex items, similarly to how justify-content aligns items along the main axis.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/align-items
+   */
+  alignItems?: CSSValue<AlignItems>;
+  '-ms-align-items'?: CSSValue<AlignItems>;
+  '-webkit-align-items'?: CSSValue<AlignItems>;
+
+  /**
+   * Allows the default alignment to be overridden for individual flex items.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/align-self
+   */
+  alignSelf?: CSSValue<AlignSelf>;
+  '-webkit-align-self'?: CSSValue<AlignSelf>;
+  '-ms-flex-item-align'?: string;
+
+  /**
+   * This property allows precise alignment of elements, such as graphics, that do not have a baseline-table or lack the desired baseline in their baseline-table. With the alignment-adjust property, the position of the baseline identified by the alignment-baseline can be explicitly determined. It also determines precisely the alignment point for each glyph within a textual element.
+   */
+  alignmentAdjust?: any;
+
+  /**
+   * The alignment-baseline attribute specifies how an object is aligned with respect to its parent.
+   * @see https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute/alignment-baseline
+   */
+  alignmentBaseline?: 'auto' | 'baseline' | 'before-edge' | 'text-before-edge' | 'middle' | 'central' | 'after-edge' | 'text-after-edge' | 'ideographic' | 'alphabetic' | 'hanging' | 'mathematical' | 'inherit';
+
+  /**
+   * Shorthand property for animation-name, animation-duration, animation-timing-function, animation-delay,
+   * animation-iteration-count, animation-direction, animation-fill-mode, and animation-play-state.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/animation
+   */
+  animation?: CSSValueString;
+
+  /**
+   * Defines a length of time to elapse before an animation starts, allowing an animation to begin execution some time after it is applied.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/animation-delay
+   */
+  animationDelay?: any;
+
+  /**
+   * Defines whether an animation should run in reverse on some or all cycles.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/animation-direction
+   */
+  animationDirection?: CSSGlobalValues | 'normal' | 'alternate' | 'reverse' | 'alternate-reverse';
+
+  /**
+   * The animation-duration CSS property specifies the length of time that an animation should take to complete one cycle.
+   * A value of '0s', which is the default value, indicates that no animation should occur.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/animation-duration
+   */
+  animationDuration?: CSSValue<string>;
+
+  /**
+   * Specifies how a CSS animation should apply styles to its target before and after it is executing.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/animation-fill-mode
+   */
+  animationFillMode?: 'none' | 'forwards' | 'backwards' | 'both';
+
+  /**
+   * Specifies how many times an animation cycle should play.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/animation-iteration-count
+   */
+  animationIterationCount?: CSSValue<number | 'infinite'>;
+
+  /**
+   * Defines the list of animations that apply to the element.
+   * Note: You probably want animationDuration as well
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/animation-name
+   */
+  animationName?: CSSValue<string>;
+
+  /**
+   * Defines whether an animation is running or paused.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/animation-play-state
+   */
+  animationPlayState?: CSSValue<CSSAnimationPlayState>;
+
+  /**
+   * Sets the pace of an animation
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/animation-timing-function
+   */
+  animationTimingFunction?: CSSValue<CSSTimingFunction>;
+
+  /**
+   * Allows changing the style of any element to platform-based interface elements or vice versa.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/appearance
+   */
+  appearance?: CSSValue<'auto' | 'none'>;
+
+  /**
+   * Determines whether or not the “back” side of a transformed element is visible when facing the viewer.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/backface-visibility
+   */
+  backfaceVisibility?: CSSGlobalValues | 'visible' | 'hidden';
+
+  /**
+   * Shorthand property to set the values for one or more of:
+   * background-clip, background-color, background-image,
+   * background-origin, background-position, background-repeat,
+   * background-size, and background-attachment.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/background
+   */
+  background?: any;
+
+  /**
+   * If a background-image is specified, this property determines
+   * whether that image's position is fixed within the viewport,
+   * or scrolls along with its containing block.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/background-attachment
+   */
+  backgroundAttachment?: 'scroll' | 'fixed' | 'local';
+
+  /**
+   * This property describes how the element's background images should blend with each other and the element's background color.
+   * The value is a list of blend modes that corresponds to each background image. Each element in the list will apply to the corresponding element of background-image. If a property doesn’t have enough comma-separated values to match the number of layers, the UA must calculate its used value by repeating the list of values until there are enough.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/background-blend-mode
+   */
+  backgroundBlendMode?: CSSValue<CSSBlendMode>;
+
+  /**
+   * Specifies whether an element's background, either the color or image, extends underneath its border.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/background-clip
+   */
+  backgroundClip?: CSSValue<CSSBox | 'text'>;
+
+  /**
+   * Sets the background color of an element.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/background-color
+   */
+  backgroundColor?: CSSValue<CSSColor>;
+
+  /**
+   * Sets a compositing style for background images and colors.
+   */
+  backgroundComposite?: any;
+
+  /**
+   * Applies one or more background images to an element. These can be any valid CSS image, including url() paths to image files or CSS gradients.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/background-image
+   */
+  backgroundImage?: CSSValue<CSSImage>;
+
+  /**
+   * Specifies what the background-position property is relative to.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/background-origin
+   */
+  backgroundOrigin?: CSSValue<CSSBox>;
+
+  /**
+   * Sets the position of a background image.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/background-position
+   */
+  backgroundPosition?: CSSValue<CSSPosition>;
+
+  /**
+   * Background-repeat defines if and how background images will be repeated after they have been sized and positioned
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/background-repeat
+   */
+  backgroundRepeat?: CSSValue<CSSRepeatStyle | string>;
+
+  /**
+   * Background-size specifies the size of a background image
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/background-size
+   */
+  backgroundSize?: 'auto' | 'cover' | 'contain' | CSSLength | CSSPercentage | CSSGlobalValues;
+
+  /**
+   * Obsolete - spec retired, not implemented.
+   * @see https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute/baseline-shift
+   */
+  baselineShift?: any;
+
+  /**
+   * Non standard. Sets or retrieves the location of the Dynamic HTML (DHTML) behavior.
+   * @see https://msdn.microsoft.com/en-us/library/ms530723(v=vs.85).aspx
+   */
+  behavior?: any;
+
+  /**
+   * Shorthand property that defines the different properties of all four sides of an element's border in a single declaration. It can be used to set border-width, border-style and border-color, or a subset of these.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border
+   */
+  border?: any;
+
+  /**
+   * Shorthand that sets the values of border-bottom-color,
+   * border-bottom-style, and border-bottom-width.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-bottom
+   */
+  borderBottom?: CSSBorderShorthand;
+
+  /**
+   * Sets the color of the bottom border of an element.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-bottom-color
+   */
+  borderBottomColor?: CSSValue<CSSColor>;
+
+  /**
+   * Defines the shape of the border of the bottom-left corner.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-bottom-left-radius
+   */
+  borderBottomLeftRadius?: any;
+
+  /**
+   * Defines the shape of the border of the bottom-right corner.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-bottom-right-radius
+   */
+  borderBottomRightRadius?: any;
+
+  /**
+   * Sets the line style of the bottom border of a box.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-bottom-style
+   */
+  borderBottomStyle?: CSSValue<CSSLineStyle>;
+
+  /**
+   * Sets the width of an element's bottom border. To set all four borders, use the border-width shorthand property which sets the values simultaneously for border-top-width, border-right-width, border-bottom-width, and border-left-width.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-bottom-width
+   */
+  borderBottomWidth?: CSSValue<CSSLength | CSSPercentage>;
+
+  /**
+   * Border-collapse can be used for collapsing the borders between table cells
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-collapse
+   */
+  borderCollapse?: any;
+
+  /**
+   * The CSS border-color property sets the color of an element's four borders. This property can have from one to four values, made up of the elementary properties:
+   *      •       border-top-color
+   *      •       border-right-color
+   *      •       border-bottom-color
+   *      •       border-left-color The default color is the currentColor of each of these values.
+   * If you provide one value, it sets the color for the element. Two values set the horizontal and vertical values, respectively. Providing three values sets the top, vertical, and bottom values, in that order. Four values set all for sides: top, right, bottom, and left, in that order.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-color
+   */
+  borderColor?: CSSValue<CSSColorSet>;
+
+  /**
+   * Specifies different corner clipping effects, such as scoop (inner curves), bevel (straight cuts) or notch (cut-off rectangles). Works along with border-radius to specify the size of each corner effect.
+   */
+  borderCornerShape?: any;
+
+  /**
+   * The property border-image-source is used to set the image to be used instead of the border style. If this is set to none the border-style is used instead.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-image-source
+   */
+  borderImageSource?: CSSValue<CSSImage>;
+
+  /**
+   * The border-image-width CSS property defines the offset to use for dividing the border image in nine parts, the top-left corner, central top edge, top-right-corner, central right edge, bottom-right corner, central bottom edge, bottom-left corner, and central right edge. They represent inward distance from the top, right, bottom, and left edges.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-image-width
+   */
+  borderImageWidth?: CSSValue<CSSLength | CSSPercentage>;
+
+  /**
+   * Shorthand property that defines the border-width, border-style and border-color of an element's left border in a single declaration. Note that you can use the corresponding longhand properties to set specific individual properties of the left border — border-left-width, border-left-style and border-left-color.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-left
+   */
+  borderLeft?: CSSBorderShorthand;
+
+  /**
+   * The CSS border-left-color property sets the color of an element's left border. This page explains the border-left-color value, but often you will find it more convenient to fix the border's left color as part of a shorthand set, either border-left or border-color.
+   * Colors can be defined several ways. For more information, see Usage.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-left-color
+   */
+  borderLeftColor?: CSSValue<CSSColor>;
+
+  /**
+   * Sets the style of an element's left border. To set all four borders, use the shorthand property, border-style. Otherwise, you can set the borders individually with border-top-style, border-right-style, border-bottom-style, border-left-style.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-left-style
+   */
+  borderLeftStyle?: CSSValue<CSSLineStyle>;
+
+  /**
+   * Sets the width of an element's left border. To set all four borders, use the border-width shorthand property which sets the values simultaneously for border-top-width, border-right-width, border-bottom-width, and border-left-width.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-left-width
+   */
+  borderLeftWidth?: CSSValue<CSSLength | CSSPercentage>;
+
+  /**
+   * Allows Web authors to define how rounded border corners are
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-radius
+   */
+  borderRadius?: CSSValue<CSSLength | CSSPercentage>;
+
+  /**
+   * Shorthand property that defines the border-width, border-style and border-color of an element's right border in a single declaration. Note that you can use the corresponding longhand properties to set specific individual properties of the right border — border-right-width, border-right-style and border-right-color.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-right
+   */
+  borderRight?: CSSBorderShorthand;
+
+  /**
+   * Sets the color of an element's right border. This page explains the border-right-color value, but often you will find it more convenient to fix the border's right color as part of a shorthand set, either border-right or border-color.
+   * Colors can be defined several ways. For more information, see Usage.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-right-color
+   */
+  borderRightColor?: CSSValue<CSSColor>;
+
+  /**
+   * Sets the style of an element's right border. To set all four borders, use the shorthand property, border-style. Otherwise, you can set the borders individually with border-top-style, border-right-style, border-bottom-style, border-left-style.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-right-style
+   */
+  borderRightStyle?: CSSValue<CSSLineStyle>;
+
+  /**
+   * Sets the width of an element's right border. To set all four borders, use the border-width shorthand property which sets the values simultaneously for border-top-width, border-right-width, border-bottom-width, and border-left-width.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-right-width
+   */
+  borderRightWidth?: CSSValue<CSSLength | CSSPercentage>;
+
+  /**
+   * Specifies the distance between the borders of adjacent cells.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-spacing
+   */
+  borderSpacing?: CSSLength | string | 'inherit';
+
+  /**
+   * Sets the style of an element's four borders. This property can have from one to four values. With only one value, the value will be applied to all four borders; otherwise, this works as a shorthand property for each of border-top-style, border-right-style, border-bottom-style, border-left-style, where each border style may be assigned a separate value.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-style
+   */
+  borderStyle?: CSSValue<CSSLineStyleSet>;
+
+  /**
+   * Shorthand property that defines the border-width, border-style and border-color of an element's top border in a single declaration. Note that you can use the corresponding longhand properties to set specific individual properties of the top border — border-top-width, border-top-style and border-top-color.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-top
+   */
+  borderTop?: CSSBorderShorthand;
+
+  /**
+   * Sets the color of an element's top border. This page explains the border-top-color value, but often you will find it more convenient to fix the border's top color as part of a shorthand set, either border-top or border-color.
+   * Colors can be defined several ways. For more information, see Usage.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-top-color
+   */
+  borderTopColor?: CSSValue<CSSColor>;
+
+  /**
+   * Sets the rounding of the top-left corner of the element.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-top-left-radius
+   */
+  borderTopLeftRadius?: any;
+
+  /**
+   * Sets the rounding of the top-right corner of the element.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-top-right-radius
+   */
+  borderTopRightRadius?: any;
+
+  /**
+   * Sets the style of an element's top border. To set all four borders, use the shorthand property, border-style. Otherwise, you can set the borders individually with border-top-style, border-right-style, border-bottom-style, border-left-style.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-top-style
+   */
+  borderTopStyle?: CSSValue<CSSLineStyle>;
+
+  /**
+   * Sets the width of an element's top border. To set all four borders, use the border-width shorthand property which sets the values simultaneously for border-top-width, border-right-width, border-bottom-width, and border-left-width.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-top-width
+   */
+  borderTopWidth?: CSSValue<CSSLength | CSSPercentage>;
+
+  /**
+   * Sets the width of an element's four borders. This property can have from one to four values. This is a shorthand property for setting values simultaneously for border-top-width, border-right-width, border-bottom-width, and border-left-width.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-width
+   */
+  borderWidth?: CSSValue<CSSLength | CSSPercentage>;
+
+  /**
+   * This property specifies how far an absolutely positioned box's bottom margin edge is offset above the bottom edge of the box's containing block. For relatively positioned boxes, the offset is with respect to the bottom edges of the box itself (i.e., the box is given a position in the normal flow, then offset from that position according to these properties).
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/bottom
+   */
+  bottom?: CSSValue<'auto' | CSSLength | CSSPercentage | CSSGlobalValues>;
+
+  /**
+   * Obsolete.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/box-align
+   */
+  boxAlign?: any;
+
+  /**
+   * Breaks a box into fragments creating new borders, padding and repeating backgrounds or lets it stay as a continuous box on a page break, column break, or, for inline elements, at a line break.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/box-decoration-break
+   */
+  boxDecorationBreak?: any;
+
+  /**
+   * Deprecated
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/box-direction
+   */
+  boxDirection?: any;
+
+  /**
+   * Do not use. This property has been replaced by the flex-wrap property.
+   * Gets or sets a value that specifies the direction to add successive rows or columns when the value of box-lines is set to multiple.
+   */
+  boxLineProgression?: any;
+
+  /**
+   * Do not use. This property has been replaced by the flex-wrap property.
+   * Gets or sets a value that specifies whether child elements wrap onto multiple lines or columns based on the space available in the object.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/box-lines
+   */
+  boxLines?: any;
+
+  /**
+   * Do not use. This property has been replaced by flex-order.
+   * Specifies the ordinal group that a child element of the object belongs to. This ordinal value identifies the display order (along the axis defined by the box-orient property) for the group.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/box-ordinal-group
+   */
+  boxOrdinalGroup?: any;
+
+  /**
+   * Deprecated.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/box-flex
+   */
+  boxFlex?: number;
+
+  /**
+   * box sizing
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/box-sizing
+   */
+  boxSizing?: CSSGlobalValues | 'content-box' | 'border-box';
+  '-moz-box-sizing'?: CSSGlobalValues | 'content-box' | 'border-box';
+  '-webkit-box-sizing'?: CSSGlobalValues | 'content-box' | 'border-box';
+
+  /**
+   * Box shadow
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/box-shadow
+   */
+  boxShadow?: CSSValueGeneral;
+
+  /**
+   * Deprecated.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/box-flex-group
+   */
+  boxFlexGroup?: number;
+
+  /**
+   * The CSS break-after property allows you to force a break on multi-column layouts. More specifically, it allows you to force a break after an element. It allows you to determine if a break should occur, and what type of break it should be. The break-after CSS property describes how the page, column or region break behaves after the generated box. If there is no generated box, the property is ignored.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/break-after
+   */
+  breakAfter?: 'auto' | 'avoid' | 'avoid-page' | 'page' | 'left' | 'right' | 'recto' | 'verso' | 'avoid-column' | 'column' | 'avoid-region' | 'region';
+
+  /**
+   * Control page/column/region breaks that fall above a block of content
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/break-before
+   */
+  breakBefore?: 'auto' | 'avoid' | 'avoid-page' | 'page' | 'left' | 'right' | 'recto' | 'verso' | 'avoid-column' | 'column' | 'avoid-region' | 'region';
+
+  /**
+   * Control page/column/region breaks that fall within a block of content
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/break-inside
+   */
+  breakInside?: 'auto' | 'avoid' | 'avoid-page' | 'avoid-column' | 'avoid-region';
+
+  /**
+   * The caption-side CSS property positions the content of a table's <caption> on the specified side.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/caption-side
+   */
+  captionSide?: CSSGlobalValues | 'top' | 'bottom' | 'block-start' | 'block-end' | 'inline-start' | 'inline-end';
+
+  /**
+   * The clear CSS property specifies if an element can be positioned next to or must be positioned below the floating elements that precede it in the markup.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/clear
+   */
+  clear?: CSSGlobalValues | 'none' | 'left' | 'right' | 'both';
+
+  /**
+   * Deprecated; see clip-path.
+   * Lets you specify the dimensions of an absolutely positioned element that should be visible, and the element is clipped into this shape, and displayed.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/clip
+   */
+  clip?: any;
+
+  /**
+   * Clipping crops an graphic, so that only a portion of the graphic is rendered, or filled. This clip-rule property, when used with the clip-path property, defines which clip rule, or algorithm, to use when filling the different parts of a graphics.
+   * @see https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute/clip-rule
+   */
+  clipRule?: any;
+
+  /**
+   * The color property sets the color of an element's foreground content (usually text), accepting any standard CSS color from keywords and hex values to RGB(a) and HSL(a).
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/color
+   */
+  color?: CSSValue<CSSColor>;
+
+  /**
+   * Describes the number of columns of the element.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/column-count
+   */
+  columnCount?: number;
+
+  /**
+   * Specifies how to fill columns (balanced or sequential).
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/column-fill
+   */
+  columnFill?: any;
+
+  /**
+   * The column-gap property controls the width of the gap between columns in multi-column elements.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/column-gap
+   */
+  columnGap?: any;
+
+  /**
+   * Sets the width, style, and color of the rule between columns.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/column-rule
+   */
+  columnRule?: any;
+
+  /**
+   * Specifies the color of the rule between columns.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/column-rule-color
+   */
+  columnRuleColor?: CSSValue<CSSColor>;
+
+  /**
+   * Specifies the width of the rule between columns.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/column-rule-width
+   */
+  columnRuleWidth?: CSSValue<CSSLength | CSSPercentage>;
+
+  /**
+   * The column-span CSS property makes it possible for an element to span across all columns when its value is set to all. An element that spans more than one column is called a spanning element.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/column-span
+   */
+  columnSpan?: any;
+
+  /**
+   * Specifies the width of columns in multi-column elements.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/column-width
+   */
+  columnWidth?: CSSValue<CSSLength | CSSPercentage>;
+
+  /**
+   * This property is a shorthand property for setting column-width and/or column-count.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/columns
+   */
+  columns?: any;
+
+  /**
+   * The content property is used with the :before and :after pseudo-elements, to insert generated content.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/content
+   */
+  content?: CSSValueString;
+
+  /**
+   * The counter-increment property accepts one or more names of counters (identifiers), each one optionally followed by an integer which specifies the value by which the counter should be incremented (e.g. if the value is 2, the counter increases by 2 each time it is invoked).
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/counter-increment
+   */
+  counterIncrement?: any;
+
+  /**
+   * The counter-reset property contains a list of one or more names of counters, each one optionally followed by an integer (otherwise, the integer defaults to 0.) Each time the given element is invoked, the counters specified by the property are set to the given integer.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/counter-reset
+   */
+  counterReset?: any;
+
+  /**
+   * The cue property specifies sound files (known as an "auditory icon") to be played by speech media agents before and after presenting an element's content; if only one file is specified, it is played both before and after. The volume at which the file(s) should be played, relative to the volume of the main element, may also be specified. The icon files may also be set separately with the cue-before and cue-after properties.
+   */
+  cue?: any;
+
+  /**
+   * The cue-after property specifies a sound file (known as an "auditory icon") to be played by speech media agents after presenting an element's content; the volume at which the file should be played may also be specified. The shorthand property cue sets cue sounds for both before and after the element is presented.
+   */
+  cueAfter?: any;
+
+  /**
+   * Specifies the mouse cursor displayed when the mouse pointer is over an element.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/cursor
+   */
+  cursor?: CSSValue<CSSGlobalValues | string | 'auto' | 'default' | 'none' | 'context-menu' | 'help' | 'pointer' | 'progress' | 'wait' | 'cell' | 'crosshair' | 'text' | 'vertical-text' | 'alias' | 'copy' | 'move' | 'no-drop' | 'not-allowed' | 'e-resize' | 'n-resize' | 'ne-resize' | 'nw-resize' | 's-resize' | 'se-resize' | 'sw-resize' | 'w-resize' | 'ew-resize' | 'ns-resize' | 'nesw-resize' | 'nwse-resize' | 'col-resize' | 'row-resize' | 'all-scroll' | 'zoom-in' | 'zoom-out' | 'grab' | 'grabbing'>;
+
+  /**
+   * The direction CSS property specifies the text direction/writing direction. The rtl is used for Hebrew or Arabic text, the ltr is for other languages.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/direction
+   */
+  direction?: CSSGlobalValues | 'ltr' | 'rtl';
+
+  /**
+   * This property specifies the type of rendering box used for an element. It is a shorthand property for many other display properties.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/display
+   */
+  display?: CSSValue<CSSGlobalValues | CSSDisplay>;
+
+  /**
+   * SVG: Used to determine or re-determine a scaled-baseline-table.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/dominant-baseline
+   */
+  dominantBaseline?: 'auto' | 'use-script' | 'no-change' | 'reset-size' | 'ideographic' | 'alphabetic' | 'hanging' | 'mathematical' | 'central' | 'middle' | 'text-after-edge' | 'text-before-edge' | 'inherit';
+
+  /**
+   * The ‘empty-cells’ CSS property specifies how the user agent should render borders and backgrounds around <table> cells that have no visible content.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/empty-cells
+   */
+  emptyCells?: CSSGlobalValues | 'show' | 'hide';
+
+  /**
+   * The ‘fill’ property paints the interior of the given graphical element. The area to be painted consists of any areas inside the outline of the shape. To determine the inside of the shape, all subpaths are considered, and the interior is determined according to the rules associated with the current value of the ‘fill-rule’ property. The zero-width geometric outline of a shape is included in the area to be painted.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/fill
+   */
+  fill?: CSSColor | 'context-stroke' | 'context-fill';
+
+  /**
+   * SVG: Specifies the opacity of the color or the content the current object is filled with.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/fill-opacity
+   */
+  fillOpacity?: number;
+
+  /**
+   * The ‘fill-rule’ property indicates the algorithm which is to be used to determine what parts of the canvas are included inside the shape. For a simple, non-intersecting path, it is intuitively clear what region lies "inside"; however, for a more complex path, such as a path that intersects itself or where one subpath encloses another, the interpretation of "inside" is not so obvious.
+   * The ‘fill-rule’ property provides two options for how the inside of a shape is determined:
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/fill-rule
+   */
+  fillRule?: 'nonzero' | 'evenodd';
+
+  /**
+   * Applies various image processing effects. This property is largely unsupported. See Compatibility section for more information.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/filter
+   */
+  filter?: string;
+
+  /**
+   * Shorthand for `flex-grow`, `flex-shrink`, and `flex-basis`.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/flex
+   */
+  flex?: number | string;
+  '-webkit-flex'?: number | string;
+  '-ms-flex'?: number | string;
+
+  /**
+   * Obsolete, do not use. This property has been renamed to align-items.
+   * Specifies the alignment (perpendicular to the layout axis defined by the flex-direction property) of child elements of the object.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/flex-align
+   */
+  flexAlign?: any;
+  '-ms-flex-align'?: any;
+  '-webkit-flex-align'?: any;
+
+  /**
+   * The flex-basis CSS property describes the initial main size of the flex item before any free space is distributed according to the flex factors described in the flex property (flex-grow and flex-shrink).
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/flex-basis
+   */
+  flexBasis?: any;
+
+  /**
+   * The flex-direction CSS property describes how flex items are placed in the flex container, by setting the direction of the flex container's main axis.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/flex-direction
+   */
+  flexDirection?: any;
+  '-ms-flex-direction'?: any;
+  '-webkit-flex-direction'?: any;
+
+  /**
+   * The flex-flow CSS property defines the flex container's main and cross axis. It is a shorthand property for the flex-direction and flex-wrap properties.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/flex-flow
+   */
+  flexFlow?: any;
+
+  /**
+   * Specifies the flex grow factor of a flex item.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/flex-grow
+   */
+  flexGrow?: number;
+  '-ms-flex-grow'?: number;
+  '-webkit-flex-grow'?: number;
+
+  /**
+   * Do not use. This property has been renamed to align-self
+   * Specifies the alignment (perpendicular to the layout axis defined by flex-direction) of child elements of the object.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/flex-item-align
+   */
+  flexItemAlign?: any;
+
+  /**
+   * Do not use. This property has been renamed to align-content.
+   * Specifies how a flexbox's lines align within the flexbox when there is extra space along the axis that is perpendicular to the axis defined by the flex-direction property.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/flex-line-pack
+   */
+  flexLinePack?: any;
+
+  flexPositive?: any;
+  '-ms-flex-positive'?: any;
+  '-webkit-flex-positive'?: any;
+
+  flexNegative?: any;
+  '-ms-flex-negative'?: any;
+  '-webkit-flex-negative'?: any;
+
+  /**
+   * Gets or sets a value that specifies the ordinal group that a flexbox element belongs to. This ordinal value identifies the display order for the group.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/flex-order
+   */
+  flexOrder?: any;
+
+  /**
+   * Specifies the flex shrink factor of a flex item.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/flex-shrink
+   */
+  flexShrink?: number;
+  '-ms-flex-shrink'?: number;
+  '-webkit-flex-shrink'?: number;
+
+  /**
+   * Specifies whether flex items are forced into a single line or can be wrapped onto multiple lines.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/flex-wrap
+   */
+  flexWrap?: CSSGlobalValues | 'nowrap' | 'wrap' | 'wrap-reverse';
+  '-ms-flex-wrap'?: CSSGlobalValues | 'nowrap' | 'wrap' | 'wrap-reverse';
+  '-webkit-flex-wrap'?: CSSGlobalValues | 'nowrap' | 'wrap' | 'wrap-reverse';
+
+  /**
+   * Elements which have the style float are floated horizontally. These elements can move as far to the left or right of the containing element. All elements after the floating element will flow around it, but elements before the floating element are not impacted. If several floating elements are placed after each other, they will float next to each other as long as there is room.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/float
+   */
+  float?: CSSGlobalValues | 'left' | 'right' | 'none' | 'inline-start' | 'inline-end';
+
+  /**
+   * Flows content from a named flow (specified by a corresponding flow-into) through selected elements to form a dynamic chain of layout regions.
+   */
+  flowFrom?: any;
+
+  /**
+   * The font property is shorthand that allows you to do one of two things: you can either set up six of the most mature font properties in one line, or you can set one of a choice of keywords to adopt a system font setting.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/font
+   */
+  font?: any;
+
+  /**
+   * The font-family property allows one or more font family names and/or generic family names to be specified for usage on the selected element(s)' text. The browser then goes through the list; for each character in the selection it applies the first font family that has an available glyph for that character.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/font-family
+   */
+  fontFamily?: any;
+
+  /**
+   * The font-kerning property allows contextual adjustment of inter-glyph spacing, i.e. the spaces between the characters in text. This property controls <bold>metric kerning</bold> - that utilizes adjustment data contained in the font. Optical Kerning is not supported as yet.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/font-kerning
+   */
+  fontKerning?: CSSGlobalValues | 'auto' | 'normal' | 'none';
+
+  /**
+   * Specifies the size of the font. Used to compute em and ex units.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/font-size
+   */
+  fontSize?: CSSValue<CSSFontSize>;
+
+  /**
+   * The font-size-adjust property adjusts the font-size of the fallback fonts defined with font-family, so that the x-height is the same no matter what font is used. This preserves the readability of the text when fallback happens.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/font-size-adjust
+   */
+  fontSizeAdjust?: any;
+
+  /**
+   * Allows you to expand or condense the widths for a normal, condensed, or expanded font face.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/font-stretch
+   */
+  fontStretch?: CSSGlobalValues | 'normal' | 'ultra-condensed' | 'extra-condensed' | 'condensed' | 'semi-condensed' | 'semi-expanded' | 'expanded' | 'extra-expanded' | 'ultra-expanded';
+
+  /**
+   * The font-style property allows normal, italic, or oblique faces to be selected. Italic forms are generally cursive in nature while oblique faces are typically sloped versions of the regular face. Oblique faces can be simulated by artificially sloping the glyphs of the regular face.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/font-style
+   */
+  fontStyle?: CSSGlobalValues | 'normal' | 'italic' | 'oblique';
+
+  /**
+   * This value specifies whether the user agent is allowed to synthesize bold or oblique font faces when a font family lacks bold or italic faces.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/font-synthesis
+   */
+  fontSynthesis?: any;
+
+  /**
+   * The font-variant property enables you to select the small-caps font within a font family.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/font-variant
+   */
+  fontVariant?: any;
+
+  /**
+   * Fonts can provide alternate glyphs in addition to default glyph for a character. This property provides control over the selection of these alternate glyphs.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/font-variant-alternates
+   */
+  fontVariantAlternates?: any;
+
+  /**
+   * Specifies the weight or boldness of the font.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/font-weight
+   */
+  fontWeight?: CSSFontWeight;
+
+  /**
+   * Lays out one or more grid items bound by 4 grid lines. Shorthand for setting grid-column-start, grid-column-end, grid-row-start, and grid-row-end in a single declaration.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/grid-area
+   */
+  gridArea?: any;
+
+  /**
+   * Specifies the size of an implicitly-created grid column track.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/grid-auto-columns
+   */
+  gridAutoColumns?: any;
+
+  /**
+   * Controls how the auto-placement algorithm works, specifying exactly how auto-placed items get flowed into the grid.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/grid-auto-flow
+   */
+  gridAutoFlow?: any;
+
+  /**
+   * Specifies the size of an implicitly-created grid row track.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/grid-auto-rows
+   */
+  gridAutoRows?: any;
+
+  /**
+   * Controls a grid item's placement in a grid area, particularly grid position and a grid span. Shorthand for setting grid-column-start and grid-column-end in a single declaration.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/grid-column
+   */
+  gridColumn?: any;
+
+  /**
+   * Specifies the gutter between grid columns.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/grid-column-gap
+   */
+  gridColumnGap?: any;
+
+  /**
+   * Controls a grid item's placement in a grid area as well as grid position and a grid span. The grid-column-end property (with grid-row-start, grid-row-end, and grid-column-start) determines a grid item's placement by specifying the grid lines of a grid item's grid area.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/grid-column-end
+   */
+  gridColumnEnd?: any;
+
+  /**
+   * Determines a grid item's placement by specifying the starting grid lines of a grid item's grid area . A grid item's placement in a grid area consists of a grid position and a grid span. See also ( grid-row-start, grid-row-end, and grid-column-end)
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/grid-column-start
+   */
+  gridColumnStart?: any;
+
+  /**
+   * Specifies the gutters between grid rows and columns, Shorthand for for grid-row-gap and grid-column-gap in a single declaration.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/grid-gap
+   */
+  gridGap?: any;
+
+  /**
+   * Gets or sets a value that indicates which row an element within a Grid should appear in. Shorthand for setting grid-row-start and grid-row-end in a single declaration.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/grid-row
+   */
+  gridRow?: any;
+
+  /**
+   * Determines a grid item’s placement by specifying the block-end. A grid item's placement in a grid area consists of a grid position and a grid span. The grid-row-end property (with grid-row-start, grid-column-start, and grid-column-end) determines a grid item's placement by specifying the grid lines of a grid item's grid area.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/grid-row-end
+   */
+  gridRowEnd?: any;
+
+  /**
+   * Specifies the gutter between grid rows.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/grid-row-gap
+   */
+  gridRowGap?: any;
+
+  /**
+   * Determines a grid item’s start position within the grid row by contributing a line, a span, or nothing (automatic) to its grid placement, thereby specifying the inline-start edge of its grid area.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/grid-row-start
+   */
+  gridRowStart?: any;
+
+  /**
+   * Specifies a row position based upon an integer location, string value, or desired row size.
+   * css/properties/grid-row is used as short-hand for grid-row-position and grid-row-position
+   */
+  gridRowPosition?: any;
+
+  gridRowSpan?: any;
+
+  /**
+   * Is a shorthand property for defining grid columns, rows, and areas.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/grid-template-areas
+   */
+  gridTemplate?: any;
+
+  /**
+   * Specifies named grid areas which are not associated with any particular grid item, but can be referenced from the grid-placement properties. The syntax of the grid-template-areas property also provides a visualization of the structure of the grid, making the overall layout of the grid container easier to understand.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/grid-template-areas
+   */
+  gridTemplateAreas?: any;
+
+  /**
+   * Specifies (with grid-template-rows) the line names and track sizing functions of the grid. Each sizing function can be specified as a length, a percentage of the grid container’s size, a measurement of the contents occupying the column or row, or a fraction of the free space in the grid.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/grid-template-columns
+   */
+  gridTemplateColumns?: any;
+
+  /**
+   * Specifies (with grid-template-columns) the line names and track sizing functions of the grid. Each sizing function can be specified as a length, a percentage of the grid container’s size, a measurement of the contents occupying the column or row, or a fraction of the free space in the grid.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/grid-template-rows
+   */
+  gridTemplateRows?: any;
+
+  /**
+   * Sets the height of an element. The content area of the element height does not include the padding, border, and margin of the element.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/height
+   */
+  height?: CSSValue<'auto' | CSSLength | CSSPercentage | CSSGlobalValues>;
+
+  /**
+   * Specifies the minimum number of characters in a hyphenated word
+   * @see https://msdn.microsoft.com/en-us/library/hh771865(v=vs.85).aspx
+   */
+  hyphenateLimitChars?: any;
+
+  /**
+   * Indicates the maximum number of successive hyphenated lines in an element. The ‘no-limit’ value means that there is no limit.
+   * @see https://msdn.microsoft.com/en-us/library/hh771867(v=vs.85).aspx
+   */
+  hyphenateLimitLines?: any;
+
+  /**
+   * Specifies the maximum amount of trailing whitespace (before justification) that may be left in a line before hyphenation is triggered to pull part of a word from the next line back up into the current one.
+   * @see https://msdn.microsoft.com/en-us/library/hh771869(v=vs.85).aspx
+   */
+  hyphenateLimitZone?: any;
+
+  /**
+   * Specifies whether or not words in a sentence can be split by the use of a manual or automatic hyphenation mechanism.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/hyphens
+   */
+  hyphens?: CSSGlobalValues | string | 'none' | 'manual' | 'auto';
+
+  /**
+   * Controls the state of the input method editor for text fields.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/ime-mode
+   */
+  imeMode?: CSSGlobalValues | 'auto' | 'normal' | 'active' | 'inactive' | 'disabled';
+
+  /**
+   * Defines how the browser distributes space between and around flex items
+   * along the main-axis of their container.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/justify-content
+   */
+  justifyContent?: JustifyContent;
+  '-webkit-justify-content'?: JustifyContent;
+  '-ms-flex-pack'?: string;
+
+  /**
+   * Defines the default justify-self for all items of the box, given them the
+   * default way of justifying each box along the appropriate axis
+   */
+  justifyItems?: JustifyItems;
+
+  /**
+   * Defines the way of justifying a box inside its container along the appropriate axis.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/justify-self
+   */
+  justifySelf?: JustifySelf;
+
+  layoutGrid?: any;
+
+  layoutGridChar?: any;
+
+  layoutGridLine?: any;
+
+  layoutGridMode?: any;
+
+  layoutGridType?: any;
+
+  /**
+   * Sets the left edge of an element
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/left
+   */
+  left?: CSSValue<'auto' | CSSLength | CSSPercentage | CSSGlobalValues>;
+
+  /**
+   * The letter-spacing CSS property specifies the spacing behavior between text characters.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/letter-spacing
+   */
+  letterSpacing?: any;
+
+  /**
+   * Deprecated. Gets or sets line-breaking rules for text in selected languages such as Japanese, Chinese, and Korean.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/line-break
+   */
+  lineBreak?: any;
+
+  lineClamp?: number;
+
+  /**
+   * Specifies the height of an inline block level element.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/line-height
+   */
+  lineHeight?: CSSValue<CSSLength | CSSPercentage>;
+
+  /**
+   * Shorthand property that sets the list-style-type, list-style-position and list-style-image properties in one declaration.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/list-style
+   */
+  listStyle?: any;
+
+  /**
+   * This property sets the image that will be used as the list item marker. When the image is available, it will replace the marker set with the 'list-style-type' marker. That also means that if the image is not available, it will show the style specified by list-style-property
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/list-style-image
+   */
+  listStyleImage?: any;
+
+  /**
+   * Specifies if the list-item markers should appear inside or outside the content flow.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/list-style-position
+   */
+  listStylePosition?: CSSGlobalValues | 'inside' | 'outside';
+
+  /**
+   * Specifies the type of list-item marker in a list.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/list-style-type
+   */
+  listStyleType?: any;
+
+  /**
+   * The margin property is shorthand to allow you to set all four margins of an element at once. Its equivalent longhand properties are margin-top, margin-right, margin-bottom and margin-left. Negative values are also allowed.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/margin
+   */
+  margin?: any;
+
+  /**
+   * margin-bottom sets the bottom margin of an element.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/margin-bottom
+   */
+  marginBottom?: any;
+
+  /**
+   * margin-left sets the left margin of an element.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/margin-left
+   */
+  marginLeft?: any;
+
+  /**
+   * margin-right sets the right margin of an element.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/margin-right
+   */
+  marginRight?: any;
+
+  /**
+   * margin-top sets the top margin of an element.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/margin-top
+   */
+  marginTop?: CSSValueGeneral;
+
+  /**
+   * The marquee-direction determines the initial direction in which the marquee content moves.
+   */
+  marqueeDirection?: any;
+
+  /**
+   * The 'marquee-style' property determines a marquee's scrolling behavior.
+   */
+  marqueeStyle?: any;
+
+  /**
+   * This property is shorthand for setting mask-image, mask-mode, mask-repeat, mask-position, mask-clip, mask-origin, mask-composite and mask-size. Omitted values are set to their original properties' initial values.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/mask
+   */
+  mask?: any;
+
+  /**
+   * This property is shorthand for setting mask-border-source, mask-border-slice, mask-border-width, mask-border-outset, and mask-border-repeat. Omitted values are set to their original properties' initial values.
+   */
+  maskBorder?: any;
+
+  /**
+   * This property specifies how the images for the sides and the middle part of the mask image are scaled and tiled. The first keyword applies to the horizontal sides, the second one applies to the vertical ones. If the second keyword is absent, it is assumed to be the same as the first, similar to the CSS border-image-repeat property.
+   */
+  maskBorderRepeat?: any;
+
+  /**
+   * This property specifies inward offsets from the top, right, bottom, and left edges of the mask image, dividing it into nine regions: four corners, four edges, and a middle. The middle image part is discarded and treated as fully transparent black unless the fill keyword is present. The four values set the top, right, bottom and left offsets in that order, similar to the CSS border-image-slice property.
+   */
+  maskBorderSlice?: any;
+
+  /**
+   * Specifies an image to be used as a mask. An image that is empty, fails to download, is non-existent, or cannot be displayed is ignored and does not mask the element.
+   */
+  maskBorderSource?: any;
+
+  /**
+   * This property sets the width of the mask box image, similar to the CSS border-image-width property.
+   */
+  maskBorderWidth?: CSSValue<CSSLength | CSSPercentage>;
+
+  /**
+   * Determines the mask painting area, which defines the area that is affected by the mask. The painted content of an element may be restricted to this area.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/mask-clip
+   */
+  maskClip?: any;
+
+  /**
+   * For elements rendered as a single box, specifies the mask positioning area. For elements rendered as multiple boxes (e.g., inline boxes on several lines, boxes on several pages) specifies which boxes box-decoration-break operates on to determine the mask positioning area(s).
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/mask-origin
+   */
+  maskOrigin?: any;
+
+  /**
+   * This property must not be used. It is no longer included in any standard or standard track specification, nor is it implemented in any browser. It is only used when the text-align-last property is set to size. It controls allowed adjustments of font-size to fit line content.
+   */
+  maxFontSize?: any;
+
+  /**
+   * Sets the maximum height for an element. It prevents the height of the element to exceed the specified value. If min-height is specified and is greater than max-height, max-height is overridden.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/max-height
+   */
+  maxHeight?: CSSValue<CSSLength | CSSPercentage>;
+
+  /**
+   * Sets the maximum width for an element. It limits the width property to be larger than the value specified in max-width.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/max-width
+   */
+  maxWidth?: CSSValue<CSSLength | CSSPercentage>;
+
+  /**
+   * Sets the minimum height for an element. It prevents the height of the element to be smaller than the specified value. The value of min-height overrides both max-height and height.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/min-height
+   */
+  minHeight?: CSSValue<CSSLength | CSSPercentage>;
+
+  /**
+   * Sets the minimum width of an element. It limits the width property to be not smaller than the value specified in min-width.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/min-width
+   */
+  minWidth?: CSSValue<CSSLength | CSSPercentage>;
+
+  /**
+   * The blend mode defines the formula that must be used to mix the colors with the backdrop
+   * @see https://drafts.fxtf.org/compositing-1/#mix-blend-mode
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/mix-blend-mode
+   */
+  mixBlendMode?: CSSValue<CSSBlendMode>;
+
+  /**
+   * Specifies how the contents of a replaced element should be fitted to the box established by its used height and width.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/object-fit
+   */
+  objectFit?: CSSObjectFit;
+
+  /**
+   * Determines the alignment of the element inside its box.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/object-position
+   */
+  objectPosition?: string | CSSGlobalValues;
+
+  /**
+   * Specifies the transparency of an element.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/opacity
+   */
+  opacity?: number | CSSGlobalValues;
+
+  /**
+   * Specifies the order used to lay out flex items in their flex container.
+   * Elements are laid out in the ascending order of the order value.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/order
+   */
+  order?: number;
+
+  /**
+   * In paged media, this property defines the minimum number of lines in
+   * a block container that must be left at the bottom of the page.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/orphans
+   */
+  orphans?: number;
+
+  /**
+   * The CSS outline property is a shorthand property for setting one or more of the individual outline properties outline-style, outline-width and outline-color in a single rule. In most cases the use of this shortcut is preferable and more convenient.
+   * Outlines differ from borders in the following ways:  •       Outlines do not take up space, they are drawn above the content.
+   *      •       Outlines may be non-rectangular. They are rectangular in Gecko/Firefox. Internet Explorer attempts to place the smallest contiguous outline around all elements or shapes that are indicated to have an outline. Opera draws a non-rectangular shape around a construct.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/outline
+   */
+  outline?: any;
+
+  /**
+   * The outline-color property sets the color of the outline of an element. An outline is a line that is drawn around elements, outside the border edge, to make the element stand out.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/outline-color
+   */
+  outlineColor?: CSSValue<CSSColor>;
+
+  /**
+   * The outline-style property sets the style of the outline of an element.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/outline-style
+   */
+  outlineStyle?: CSSGlobalValues | 'auto' | 'none' | 'dotted' | 'dashed' | 'solid' | 'double' | 'groove' | 'ridge' | 'inset' | 'outset';
+
+  /**
+   * The outline-offset property offsets the outline and draw it beyond the border edge.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/outline-offset
+   */
+  outlineOffset?: any;
+
+  /**
+   * The outline-width CSS property is used to set the width of the outline of an element. An outline is a line that is drawn around elements, outside the border edge, to make the element stand out
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/outline-width
+   */
+  outlineWidth?: CSSGlobalValues | 'thin' | 'medium' | 'thick' | CSSLength;
+
+  /**
+   * The overflow property controls how extra content exceeding the bounding box of an element is rendered. It can be used in conjunction with an element that has a fixed width and height, to eliminate text-induced page distortion.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/overflow
+   */
+  overflow?: CSSValue<CSSOverflow>;
+
+  /**
+   * Specifies the preferred scrolling methods for elements that overflow.
+   */
+  overflowStyle?: any;
+
+  /**
+    * The overflow-wrap CSS property specifies whether or not the browser should insert line breaks within words to prevent
+    * text from overflowing its content box. In contrast to word-break, overflow-wrap will only create a break if an entire
+    * word cannot be placed on its own line without overflowing.
+    * @see https://developer.mozilla.org/en-US/docs/Web/CSS/overflow-wrap
+    */
+  overflowWrap?: CSSGlobalValues | 'normal' | 'break-word';
+
+  /**
+   * Controls how extra content exceeding the x-axis of the bounding box of an element is rendered.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/overflow-x
+   */
+  overflowX?: CSSValue<CSSOverflow>;
+
+  /**
+   * Controls how extra content exceeding the y-axis of the bounding box of an element is rendered.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/overflow-y
+   */
+  overflowY?: CSSValue<CSSOverflow>;
+
+  /**
+   * The padding optional CSS property sets the required padding space on one to four sides of an element. The padding area is the space between an element and its border. Negative values are not allowed but decimal values are permitted. The element size is treated as fixed, and the content of the element shifts toward the center as padding is increased.
+   * The padding property is a shorthand to avoid setting each side separately (padding-top, padding-right, padding-bottom, padding-left).
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/padding
+   */
+  padding?: any;
+
+  /**
+   * The padding-bottom CSS property of an element sets the padding space required on the bottom of an element. The padding area is the space between the content of the element and its border. Contrary to margin-bottom values, negative values of padding-bottom are invalid.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/padding-bottom
+   */
+  paddingBottom?: CSSValue<CSSLength | CSSPercentage>;
+
+  /**
+   * The padding-left CSS property of an element sets the padding space required on the left side of an element. The padding area is the space between the content of the element and its border. Contrary to margin-left values, negative values of padding-left are invalid.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/padding-left
+   */
+  paddingLeft?: CSSValue<CSSLength | CSSPercentage>;
+
+  /**
+   * The padding-right CSS property of an element sets the padding space required on the right side of an element. The padding area is the space between the content of the element and its border. Contrary to margin-right values, negative values of padding-right are invalid.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/padding-right
+   */
+  paddingRight?: CSSValue<CSSLength | CSSPercentage>;
+
+  /**
+   * The padding-top CSS property of an element sets the padding space required on the top of an element. The padding area is the space between the content of the element and its border. Contrary to margin-top values, negative values of padding-top are invalid.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/padding-top
+   */
+  paddingTop?: CSSValue<CSSLength | CSSPercentage>;
+
+  /**
+   * The page-break-after property is supported in all major browsers. With CSS3, page-break-* properties are only aliases of the break-* properties. The CSS3 Fragmentation spec defines breaks for all CSS box fragmentation.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/page-break-after
+   */
+  pageBreakAfter?: CSSGlobalValues | 'auto' | 'always' | 'avoid' | 'left' | 'right' | 'recto' | 'verso';
+
+  /**
+   * The page-break-before property sets the page-breaking behavior before an element. With CSS3, page-break-* properties are only aliases of the break-* properties. The CSS3 Fragmentation spec defines breaks for all CSS box fragmentation.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/page-break-before
+   */
+  pageBreakBefore?: CSSGlobalValues | 'auto' | 'always' | 'avoid' | 'left' | 'right' | 'recto' | 'verso';
+
+  /**
+   * Sets the page-breaking behavior inside an element. With CSS3, page-break-* properties are only aliases of the break-* properties. The CSS3 Fragmentation spec defines breaks for all CSS box fragmentation.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/page-break-inside
+   */
+  pageBreakInside?: CSSGlobalValues | 'auto' | 'avoid';
+
+  /**
+   * The pause property determines how long a speech media agent should pause before and after presenting an element. It is a shorthand for the pause-before and pause-after properties.
+   */
+  pause?: any;
+
+  /**
+   * The pause-after property determines how long a speech media agent should pause after presenting an element. It may be replaced by the shorthand property pause, which sets pause time before and after.
+   */
+  pauseAfter?: any;
+
+  /**
+   * The pause-before property determines how long a speech media agent should pause before presenting an element. It may be replaced by the shorthand property pause, which sets pause time before and after.
+   */
+  pauseBefore?: any;
+
+  /**
+   * The perspective property defines how far an element is placed from the view on the z-axis, from the screen to the viewer.
+   * Perspective defines how an object is viewed. In graphic arts, perspective is the representation on a flat surface of what the viewer's eye would see in a 3D space. (See Wikipedia for more information about graphical perspective and for related illustrations.)
+   * The illusion of perspective on a flat surface, such as a computer screen, is created by projecting points on the flat surface as they would appear if the flat surface were a window through which the viewer was looking at the object. In discussion of virtual environments, this flat surface is called a projection plane.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/perspective
+   */
+  perspective?: any;
+
+  /**
+   * The perspective-origin property establishes the origin for the perspective property. It effectively sets the X and Y position at which the viewer appears to be looking at the children of the element.
+   * When used with perspective, perspective-origin changes the appearance of an object, as if a viewer were looking at it from a different origin. An object appears differently if a viewer is looking directly at it versus looking at it from below, above, or from the side. Thus, the perspective-origin is like a vanishing point.
+   * The default value of perspective-origin is 50% 50%. This displays an object as if the viewer's eye were positioned directly at the center of the screen, both top-to-bottom and left-to-right. A value of 0% 0% changes the object as if the viewer was looking toward the top left angle. A value of 100% 100% changes the appearance as if viewed toward the bottom right angle.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/perspective-origin
+   */
+  perspectiveOrigin?: any;
+
+  /**
+   * The pointer-events property allows you to control whether an element can be the target for the pointing device (e.g, mouse, pen) events.
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/pointer-events
+   */
+  pointerEvents?: CSSGlobalValues | 'auto' | 'none' | 'visiblePainted' | 'visibleFill' | 'visibleStroke' | 'visible' | 'painted' | 'fill' | 'stroke' | 'all';
+
+  /**
+   * The position property controls the type of positioning used by an element within its parent elements. The effect of the position property depends on a lot of factors, for example the position property of parent elements.
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/position
+   */
+  position?: CSSValue<CSSGlobalValues | 'static' | 'relative' | 'absolute' | 'sticky' | '-webkit-sticky' | 'fixed'>;
+
+  /**
+   * Obsolete: unsupported.
+   * This property determines whether or not a full-width punctuation mark character should be trimmed if it appears at the beginning of a line, so that its "ink" lines up with the first glyph in the line above and below.
+   */
+  punctuationTrim?: any;
+
+  /**
+   * Sets the type of quotation marks for embedded quotations.
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/quotes
+   */
+  quotes?: any;
+
+  /**
+   * Controls whether the last region in a chain displays additional 'overset' content according its default overflow property, or if it displays a fragment of content as if it were flowing into a subsequent region.
+   */
+  regionFragment?: any;
+
+  /**
+   * The resize CSS property lets you control the resizability of an element.
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/resize
+   */
+  resize?: CSSGlobalValues | 'none' | 'both ' | 'horizontal' | 'vertical';
+
+  /**
+   * The rest-after property determines how long a speech media agent should pause after presenting an element's main content, before presenting that element's exit cue sound. It may be replaced by the shorthand property rest, which sets rest time before and after.
+   */
+  restAfter?: any;
+
+  /**
+   * The rest-before property determines how long a speech media agent should pause after presenting an intro cue sound for an element, before presenting that element's main content. It may be replaced by the shorthand property rest, which sets rest time before and after.
+   */
+  restBefore?: any;
+
+  /**
+   * Specifies the position an element in relation to the right side of the containing element.
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/right
+   */
+  right?: CSSValue<'auto' | CSSLength | CSSPercentage | CSSGlobalValues>;
+
+  /**
+   * Specifies the distribution of the different ruby elements over the base.
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/ruby-align
+   */
+  rubyAlign?: CSSGlobalValues | 'start' | 'center' | 'space-between' | 'space-around';
+
+  /**
+   * Specifies the position of a ruby element relatives to its base element. It can be position over the element (over), under it (under), or between the characters, on their right side (inter-character).
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/ruby-position
+   */
+  rubyPosition?: CSSGlobalValues | 'over' | 'under' | 'inter-character';
+
+  /**
+   * SVG: For the <ellipse> element, this attribute defines the x-radius of the element. A value of zero disables rendering of the element.
+   * https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute/rx
+   */
+  rx?: number;
+
+  /**
+   * SVG: For the <ellipse> element, this attribute defines the y-radius of the element. A value of zero disables rendering of the element.
+   * https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute/ry
+   */
+  ry?: number;
+
+  /**
+   * Defines the alpha channel threshold used to extract a shape from an image. Can be thought of as a "minimum opacity" threshold; that is, a value of 0.5 means that the shape will enclose all the pixels that are more than 50% opaque.
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/shape-image-threshold
+   */
+  shapeImageThreshold?: any;
+
+  /**
+   * A future level of CSS Shapes will define a shape-inside property, which will define a shape to wrap content within the element. See Editor's Draft <http://dev.w3.org/csswg/css-shapes/> and CSSWG wiki page on next-level plans <http://wiki.csswg.org/spec/css-shapes>
+   */
+  shapeInside?: any;
+
+  /**
+   * Adds a margin to a shape-outside. In effect, defines a new shape that is the smallest contour around all the points that are the shape-margin distance outward perpendicular to each point on the underlying shape. For points where a perpendicular direction is not defined (e.g., a triangle corner), takes all points on a circle centered at the point and with a radius of the shape-margin distance. This property accepts only non-negative values.
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/shape-margin
+   */
+  shapeMargin?: any;
+
+  /**
+   * Declares a shape around which text should be wrapped, with possible modifications from the shape-margin property. The shape defined by shape-outside and shape-margin changes the geometry of a float element's float area.
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/shape-outside
+   */
+  shapeOutside?: any;
+
+  /**
+   * The speak property determines whether or not a speech synthesizer will read aloud the contents of an element.
+   */
+  speak?: any;
+
+  /**
+   * The speak-as property determines how the speech synthesizer interprets the content: words as whole words or as a sequence of letters, numbers as a numerical value or a sequence of digits, punctuation as pauses in speech or named punctuation characters.
+   */
+  speakAs?: any;
+
+  /**
+   * Location of a font-face.  Used with the @font-face at rule
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/src
+   */
+  src?: CSSValueString;
+
+  /**
+   * SVG: Defines the color of the outline on a given graphical element.
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/stroke
+   */
+  stroke?: string;
+
+  /**
+   * SVG: Controls the pattern of dashes and gaps used to stroke paths.
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/stroke-dasharray
+   */
+  strokeDasharray?: number[];
+
+  /**
+   * SVG: Specifies the distance into the dash pattern to start the dash
+   * @see https://developer.mozilla.org/en/docs/Web/SVG/Attribute/stroke-dashoffset
+   */
+  strokeDashoffset?: CSSValue<CSSGlobalValues | CSSLength | CSSPercentage>;
+
+  /**
+   * SVG: Specifies the shape to be used at the end of open subpaths when they are stroked.
+   * @see https://developer.mozilla.org/en/docs/Web/SVG/Attribute/stroke-linecap
+   */
+  strokeLinecap?: CSSGlobalValues | 'butt' | 'round' | 'square';
+
+  /**
+   * SVG: Specifies the opacity of the outline on the current object.
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/stroke-opacity
+   */
+  strokeOpacity?: number;
+
+  /**
+   * SVG: Specifies the width of the outline on the current object.
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/stroke-width
+   */
+  strokeWidth?: CSSValue<CSSLength | CSSPercentage>;
+
+  /**
+   * The tab-size CSS property is used to customise the width of a tab (U+0009) character.
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/tab-size
+   */
+  tabSize?: any;
+
+  /**
+   * The 'table-layout' property controls the algorithm used to lay out the table cells, rows, and columns.
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/table-layout
+   */
+  tableLayout?: any;
+
+  /**
+   * SVG: The text-anchor attribute is used to align (start-, middle- or end-alignment) a string of text relative to a given point.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/text-anchor
+   */
+  textAnchor?: 'start' | 'middle' | 'end' | 'inherit';
+
+  /**
+   * The text-align CSS property describes how inline content like text is aligned in its parent block element. text-align does not control the alignment of block elements itself, only their inline content.
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/text-align
+   */
+  textAlign?: CSSGlobalValues | 'start' | 'end' | 'left' | 'right' | 'center' | 'justify' | 'justify-all' | 'match-parent';
+
+  /**
+   * The text-align-last CSS property describes how the last line of a block element or a line before line break is aligned in its parent block element.
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/text-align-last
+   */
+  textAlignLast?: CSSGlobalValues | 'auto' | 'start' | 'end' | 'left' | 'right' | 'center' | 'justify';
+
+  /**
+   * The text-decoration CSS property is used to set the text formatting to underline, overline, line-through or blink.
+   * underline and overline decorations are positioned under the text, line-through over it.
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/text-decoration
+   */
+  textDecoration?: any;
+
+  /**
+   * Sets the color of any text decoration, such as underlines, overlines, and strike throughs.
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/text-decoration-color
+   */
+  textDecorationColor?: CSSValue<CSSColor>;
+
+  /**
+   * Sets what kind of line decorations are added to an element, such as underlines, overlines, etc.
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/text-decoration-line
+   */
+  textDecorationLine?: any;
+
+  textDecorationLineThrough?: any;
+
+  textDecorationNone?: any;
+
+  textDecorationOverline?: any;
+
+  /**
+   * Specifies what parts of an element’s content are skipped over when applying any text decoration.
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/text-decoration-skip
+   */
+  textDecorationSkip?: any;
+
+  /**
+   * This property specifies the style of the text decoration line drawn on the specified element. The intended meaning for the values are the same as those of the border-style-properties.
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/text-decoration-style
+   */
+  textDecorationStyle?: CSSGlobalValues | 'solid' | 'double' | 'dotted' | 'dashed' | 'wavy';
+
+  textDecorationUnderline?: any;
+
+  /**
+   * The text-emphasis property will apply special emphasis marks to the elements text. Slightly similar to the text-decoration property only that this property can have affect on the line-height. It also is noted that this is shorthand for text-emphasis-style and for text-emphasis-color.
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/text-emphasis
+   */
+  textEmphasis?: any;
+
+  /**
+   * The text-emphasis-color property specifies the foreground color of the emphasis marks.
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/text-emphasis-color
+   */
+  textEmphasisColor?: CSSValue<CSSColor>;
+
+  /**
+   * The text-emphasis-style property applies special emphasis marks to an element's text.
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/text-emphasis-style
+   */
+  textEmphasisStyle?: any;
+
+  /**
+   * This property helps determine an inline box's block-progression dimension, derived from the text-height and font-size properties for non-replaced elements, the height or the width for replaced elements, and the stacked block-progression dimension for inline-block elements. The block-progression dimension determines the position of the padding, border and margin for the element.
+   */
+  textHeight?: CSSValue<CSSLength | CSSPercentage>;
+
+  /**
+   * Specifies the amount of space horizontally that should be left on the first line of the text of an element. This horizontal spacing is at the beginning of the first line and is in respect to the left edge of the containing block box.
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/text-indent
+   */
+  textIndent?: any;
+
+  textJustifyTrim?: any;
+
+  textKashidaSpace?: any;
+
+  /**
+   * The text-line-through property is a shorthand property for text-line-through-style, text-line-through-color and text-line-through-mode. (Considered obsolete; use text-decoration instead.)
+   */
+  textLineThrough?: any;
+
+  /**
+   * Specifies the line colors for the line-through text decoration.
+   * (Considered obsolete; use text-decoration-color instead.)
+   */
+  textLineThroughColor?: CSSValue<CSSColor>;
+
+  /**
+   * Sets the mode for the line-through text decoration, determining whether the text decoration affects the space characters or not.
+   * (Considered obsolete; use text-decoration-skip instead.)
+   */
+  textLineThroughMode?: any;
+
+  /**
+   * Specifies the line style for line-through text decoration.
+   * (Considered obsolete; use text-decoration-style instead.)
+   */
+  textLineThroughStyle?: any;
+
+  /**
+   * Specifies the line width for the line-through text decoration.
+   */
+  textLineThroughWidth?: CSSValue<CSSLength | CSSPercentage>;
+
+  /**
+   * The text-overflow shorthand CSS property determines how overflowed content that is not displayed is signaled to the users. It can be clipped, display an ellipsis ('…', U+2026 HORIZONTAL ELLIPSIS) or a Web author-defined string. It covers the two long-hand properties text-overflow-mode and text-overflow-ellipsis
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/text-overflow
+   */
+  textOverflow?: CSSGlobalValues | 'clip' | 'ellipsis' | string;
+
+  /**
+   * The text-overline property is the shorthand for the text-overline-style, text-overline-width, text-overline-color, and text-overline-mode properties.
+   */
+  textOverline?: any;
+
+  /**
+   * Specifies the line color for the overline text decoration.
+   */
+  textOverlineColor?: CSSValue<CSSColor>;
+
+  /**
+   * Sets the mode for the overline text decoration, determining whether the text decoration affects the space characters or not.
+   */
+  textOverlineMode?: any;
+
+  /**
+   * Specifies the line style for overline text decoration.
+   */
+  textOverlineStyle?: any;
+
+  /**
+   * Specifies the line width for the overline text decoration.
+   */
+  textOverlineWidth?: CSSValue<CSSLength | CSSPercentage>;
+
+  /**
+   * The text-rendering CSS property provides information to the browser about how to optimize when rendering text. Options are: legibility, speed or geometric precision.
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/text-rendering
+   */
+  textRendering?: CSSGlobalValues | 'auto' | 'optimizeSpeed' | 'optimizeLegibility' | 'geometricPrecision';
+
+  /**
+   * Obsolete: unsupported.
+   */
+  textScript?: any;
+
+  /**
+   * The CSS text-shadow property applies one or more drop shadows to the text and <text-decorations> of an element. Each shadow is specified as an offset from the text, along with optional color and blur radius values.
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/text-shadow
+   */
+  textShadow?: any;
+
+  /**
+   * This property transforms text for styling purposes. (It has no effect on the underlying content.)
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/text-transform
+   */
+  textTransform?: CSSGlobalValues | 'none' | 'capitalize' | 'uppercase' | 'lowercase' | 'full-width';
+
+  /**
+   * Unsupported.
+   * This property will add a underline position value to the element that has an underline defined.
+   */
+  textUnderlinePosition?: any;
+
+  /**
+   * After review this should be replaced by text-decoration should it not?
+   * This property will set the underline style for text with a line value for underline, overline, and line-through.
+   */
+  textUnderlineStyle?: any;
+
+  /**
+   * This property specifies how far an absolutely positioned box's top margin edge is offset below the top edge of the box's containing block. For relatively positioned boxes, the offset is with respect to the top edges of the box itself (i.e., the box is given a position in the normal flow, then offset from that position according to these properties).
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/top
+   */
+  top?: CSSValue<'auto' | CSSLength | CSSPercentage | CSSGlobalValues>;
+
+  /**
+   * Determines whether touch input may trigger default behavior supplied by the user agent, such as panning or zooming.
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/touch-action
+   */
+  touchAction?: CSSGlobalValues | 'auto' | 'none' | 'pan-x' | 'pan-left' | 'pan-right' | 'pan-y' | 'pan-up' | 'pan-down' | 'manipulation';
+
+  /**
+   * CSS transforms allow elements styled with CSS to be transformed in two-dimensional or three-dimensional space. Using this property, elements can be translated, rotated, scaled, and skewed. The value list may consist of 2D and/or 3D transform values.
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/transform
+   */
+  transform?: CSSTransformFunction;
+
+  /**
+   * This property defines the origin of the transformation axes relative to the element to which the transformation is applied.
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/transform-origin
+   */
+  transformOrigin?: any;
+
+  /**
+   * This property allows you to define the relative position of the origin of the transformation grid along the z-axis.
+   */
+  transformOriginZ?: any;
+
+  /**
+   * This property specifies how nested elements are rendered in 3D space relative to their parent.
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/transform-style
+   */
+  transformStyle?: CSSGlobalValues | 'flat' | 'preserve-3d';
+
+  /**
+   * The transition CSS property is a shorthand property for transition-property, transition-duration, transition-timing-function, and transition-delay. It allows to define the transition between two states of an element.
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/transition
+   */
+  transition?: any;
+
+  /**
+   * Defines when the transition will start. A value of ‘0s’ means the transition will execute as soon as the property is changed. Otherwise, the value specifies an offset from the moment the property is changed, and the transition will delay execution by that offset.
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/transition-delay
+   */
+  transitionDelay?: any;
+
+  /**
+   * The 'transition-duration' property specifies the length of time a transition animation takes to complete.
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/transition-duration
+   */
+  transitionDuration?: any;
+
+  /**
+   * The 'transition-property' property specifies the name of the CSS property to which the transition is applied.
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/transition-property
+   */
+  transitionProperty?: CSSValueString;
+
+  /**
+   * Sets the pace of action within a transition
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/transition-timing-function
+   */
+  transitionTimingFunction?: CSSTimingFunction;
+
+  /**
+   * The unicode-bidi CSS property specifies the level of embedding with respect to the bidirectional algorithm.
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/unicode-bidi
+   */
+  unicodeBidi?: any;
+
+  /**
+   * unicode-range allows you to set a specific range of characters to be downloaded from a font (embedded using @font-face) and made available for use on the current page.
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/unicode-range
+   */
+  unicodeRange?: any;
+
+  /**
+   * This is for all the high level UX stuff.
+   */
+  userFocus?: any;
+
+  /**
+   * For inputing user content
+   */
+  userInput?: any;
+
+  /**
+   * User select
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/user-select
+   */
+  userSelect?: 'auto' | 'text' | 'none' | 'contain' | 'all';
+  '-moz-user-select'?: 'auto' | 'text' | 'none' | 'contain' | 'all';
+  '-webkit-user-select'?: 'auto' | 'text' | 'none' | 'contain' | 'all';
+  '-ms-user-select'?: 'auto' | 'text' | 'none' | 'contain' | 'all';
+
+  /**
+   * The vertical-align property controls how inline elements or text are vertically aligned compared to the baseline. If this property is used on table-cells it controls the vertical alignment of content of the table cell.
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/vertical-align
+   */
+  verticalAlign?: CSSGlobalValues | 'baseline' | 'sub' | 'super' | 'text-top' | 'text-bottom' | 'middle' | 'top' | 'bottom' | CSSLength | CSSPercentage;
+
+  /**
+   * The visibility property specifies whether the boxes generated by an element are rendered.
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/visibility
+   */
+  visibility?: CSSGlobalValues | 'visible' | 'hidden' | 'collapse';
+
+  /**
+   * The voice-balance property sets the apparent position (in stereo sound) of the synthesized voice for spoken media.
+   */
+  voiceBalance?: any;
+
+  /**
+   * The voice-duration property allows the author to explicitly set the amount of time it should take a speech synthesizer to read an element's content, for example to allow the speech to be synchronized with other media. With a value of auto (the default) the length of time it takes to read the content is determined by the content itself and the voice-rate property.
+   */
+  voiceDuration?: any;
+
+  /**
+   * The voice-family property sets the speaker's voice used by a speech media agent to read an element. The speaker may be specified as a named character (to match a voice option in the speech reading software) or as a generic description of the age and gender of the voice. Similar to the font-family property for visual media, a comma-separated list of fallback options may be given in case the speech reader does not recognize the character name or cannot synthesize the requested combination of generic properties.
+   */
+  voiceFamily?: any;
+
+  /**
+   * The voice-pitch property sets pitch or tone (high or low) for the synthesized speech when reading an element; the pitch may be specified absolutely or relative to the normal pitch for the voice-family used to read the text.
+   */
+  voicePitch?: any;
+
+  /**
+   * The voice-range property determines how much variation in pitch or tone will be created by the speech synthesize when reading an element. Emphasized text, grammatical structures and punctuation may all be rendered as changes in pitch, this property determines how strong or obvious those changes are; large ranges are associated with enthusiastic or emotional speech, while small ranges are associated with flat or mechanical speech.
+   */
+  voiceRange?: any;
+
+  /**
+   * The voice-rate property sets the speed at which the voice synthesized by a speech media agent will read content.
+   */
+  voiceRate?: any;
+
+  /**
+   * The voice-stress property sets the level of vocal emphasis to be used for synthesized speech reading the element.
+   */
+  voiceStress?: any;
+
+  /**
+   * The voice-volume property sets the volume for spoken content in speech media. It replaces the deprecated volume property.
+   */
+  voiceVolume?: any;
+
+  /**
+   * The white-space property controls whether and how white space inside the element is collapsed, and whether lines may wrap at unforced "soft wrap" opportunities.
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/white-space
+   */
+  whiteSpace?: CSSGlobalValues | 'normal' | 'nowrap' | 'pre' | 'pre-line' | 'pre-wrap';
+
+  /**
+   * Obsolete: unsupported.
+   */
+  whiteSpaceTreatment?: any;
+
+  /**
+   * In paged media, this property defines the mimimum number of lines
+   * that must be left at the top of the second page.
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/widows
+   */
+  widows?: number;
+
+  /**
+   * Specifies the width of the content area of an element. The content area of the element width does not include the padding, border, and margin of the element.
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/width
+   */
+  width?: CSSValue<'auto' | CSSLength | CSSPercentage | CSSGlobalValues>;
+
+  /**
+   * The ‘will-change’ CSS property provides a way for authors to hint browsers about the kind of changes to be expected on an element, so that the browser can set up appropriate optimizations ahead of time before the element is actually changed. These kind of optimizations can increase the responsiveness of a page by doing potentially expensive work ahead of time before they are actually required.
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/will-change
+   */
+  willChange?: CSSValue<'auto' | 'scroll-position' | 'contents' | CSSValueString>;
+
+  /**
+   * The word-break property is often used when there is long generated content that is strung together without and spaces or hyphens to beak apart. A common case of this is when there is a long URL that does not have any hyphens. This case could potentially cause the breaking of the layout as it could extend past the parent element.
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/word-break
+   */
+  wordBreak?: CSSGlobalValues | 'normal' | 'break-all' | 'keep-all';
+
+  /**
+   * The word-spacing CSS property specifies the spacing behavior between "words".
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/word-spacing
+   */
+  wordSpacing?: CSSGlobalValues | 'normal' | CSSLength | CSSPercentage;
+
+  /**
+   * An alias of css/properties/overflow-wrap, word-wrap defines whether to break words when the content exceeds the boundaries of its container.
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/word-wrap
+   */
+  wordWrap?: CSSGlobalValues | 'normal' | 'break-word';
+
+  /**
+   * Specifies how exclusions affect inline content within block-level elements. Elements lay out their inline content in their content area but wrap around exclusion areas.
+   */
+  wrapFlow?: any;
+
+  /**
+   * Set the value that is used to offset the inner wrap shape from other shapes. Inline content that intersects a shape with this property will be pushed by this shape's margin.
+   */
+  wrapMargin?: any;
+
+  /**
+   * Obsolete and unsupported. Do not use.
+   * This CSS property controls the text when it reaches the end of the block in which it is enclosed.
+   */
+  wrapOption?: any;
+
+  /**
+   * writing-mode specifies if lines of text are laid out horizontally or vertically, and the direction which lines of text and blocks progress.
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/writing-mode
+   */
+  writingMode?: CSSGlobalValues | 'horizontal-tb' | 'vertical-rl' | 'vertical-lr' | 'sideways-rl' | 'sideways-lr';
+
+  /**
+   * The z-index property specifies the z-order of an element and its descendants.
+   * When elements overlap, z-order determines which one covers the other.
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/z-index
+   */
+  zIndex?: CSSGlobalValues | 'auto' | number;
+
+  /**
+   * Sets the initial zoom factor of a document defined by @viewport.
+   * @see https://developer.mozilla.org/en/docs/Web/CSS/zoom
+   */
+  zoom?: 'auto' | number;
+
+  // VENDOR prefixes
+  // non-authoritative source: http://peter.sh/experiments/vendor-prefixed-css-property-overview/
+  '-apple-trailing-word'?: CSSValueGeneral;
+  '-epub-caption-side'?: CSSValueGeneral;
+  '-epub-hyphens'?: CSSValueGeneral;
+  '-epub-text-combine'?: CSSValueGeneral;
+  '-epub-text-emphasis'?: CSSValueGeneral;
+  '-epub-text-emphasis-color'?: CSSValueGeneral;
+  '-epub-text-emphasis-style'?: CSSValueGeneral;
+  '-epub-text-orientation'?: CSSValueGeneral;
+  '-epub-text-transform'?: CSSValueGeneral;
+  '-epub-word-break'?: CSSValueGeneral;
+  '-epub-writing-mode'?: CSSValueGeneral;
+  '-internal-marquee-direction'?: CSSValueGeneral;
+  '-internal-marquee-increment'?: CSSValueGeneral;
+  '-internal-marquee-repetition'?: CSSValueGeneral;
+  '-internal-marquee-speed'?: CSSValueGeneral;
+  '-internal-marquee-style'?: CSSValueGeneral;
+  '-moz-appearance'?: CSSValueGeneral;
+  '-moz-binding'?: CSSValueGeneral;
+  '-moz-border-bottom-colors'?: CSSValueGeneral;
+  '-moz-border-end'?: CSSValueGeneral;
+  '-moz-border-end-color'?: CSSValueGeneral;
+  '-moz-border-end-style'?: CSSValueGeneral;
+  '-moz-border-end-width'?: CSSValueGeneral;
+  '-moz-border-left-colors'?: CSSValueGeneral;
+  '-moz-border-right-colors'?: CSSValueGeneral;
+  '-moz-border-start'?: CSSValueGeneral;
+  '-moz-border-start-color'?: CSSValueGeneral;
+  '-moz-border-start-style'?: CSSValueGeneral;
+  '-moz-border-start-width'?: CSSValueGeneral;
+  '-moz-border-top-colors'?: CSSValueGeneral;
+  '-moz-box-align'?: CSSValueGeneral;
+  '-moz-box-direction'?: CSSValueGeneral;
+  '-moz-box-flex'?: CSSValueGeneral;
+  '-moz-box-ordinal-group'?: CSSValueGeneral;
+  '-moz-box-orient'?: CSSValueGeneral;
+  '-moz-box-pack'?: CSSValueGeneral;
+  '-moz-column-count'?: CSSValueGeneral;
+  '-moz-column-fill'?: CSSValueGeneral;
+  '-moz-column-gap'?: CSSValueGeneral;
+  '-moz-column-rule'?: CSSValueGeneral;
+  '-moz-column-rule-color'?: CSSValueGeneral;
+  '-moz-column-rule-style'?: CSSValueGeneral;
+  '-moz-column-rule-width'?: CSSValueGeneral;
+  '-moz-column-width'?: CSSValueGeneral;
+  '-moz-columns'?: CSSValueGeneral;
+  '-moz-control-character-visibility'?: CSSValueGeneral;
+  '-moz-float-edge'?: CSSValueGeneral;
+  '-moz-force-broken-image-icon'?: CSSValueGeneral;
+  '-moz-hyphens'?: CSSValueGeneral;
+  '-moz-image-region'?: CSSValueGeneral;
+  '-moz-margin-end'?: CSSValueGeneral;
+  '-moz-margin-start'?: CSSValueGeneral;
+  '-moz-math-display'?: CSSValueGeneral;
+  '-moz-math-variant'?: CSSValueGeneral;
+  '-moz-min-font-size-ratio'?: CSSValueGeneral;
+  '-moz-orient'?: CSSValueGeneral;
+  '-moz-osx-font-smoothing'?: CSSValueGeneral;
+  '-moz-outline-radius'?: CSSValueGeneral;
+  '-moz-outline-radius-bottomleft'?: CSSValueGeneral;
+  '-moz-outline-radius-bottomright'?: CSSValueGeneral;
+  '-moz-outline-radius-topleft'?: CSSValueGeneral;
+  '-moz-outline-radius-topright'?: CSSValueGeneral;
+  '-moz-padding-end'?: CSSValueGeneral;
+  '-moz-padding-start'?: CSSValueGeneral;
+  '-moz-script-level'?: CSSValueGeneral;
+  '-moz-script-min-size'?: CSSValueGeneral;
+  '-moz-script-size-multiplier'?: CSSValueGeneral;
+  '-moz-stack-sizing'?: CSSValueGeneral;
+  '-moz-tab-size'?: CSSValueGeneral;
+  '-moz-text-align-last'?: CSSValueGeneral;
+  '-moz-text-decoration-color'?: CSSValueGeneral;
+  '-moz-text-decoration-line'?: CSSValueGeneral;
+  '-moz-text-decoration-style'?: CSSValueGeneral;
+  '-moz-text-size-adjust'?: CSSValueGeneral;
+  '-moz-top-layer'?: CSSValueGeneral;
+  '-moz-transform'?: CSSValueGeneral;
+  '-moz-user-focus'?: CSSValueGeneral;
+  '-moz-user-input'?: CSSValueGeneral;
+  '-moz-user-modify'?: CSSValueGeneral;
+  '-moz-window-dragging'?: CSSValueGeneral;
+  '-moz-window-shadow'?: CSSValueGeneral;
+  '-ms-accelerator'?: CSSValueGeneral;
+  '-ms-animation'?: CSSValueGeneral;
+  '-ms-animation-delay'?: CSSValueGeneral;
+  '-ms-animation-direction'?: CSSValueGeneral;
+  '-ms-animation-duration'?: CSSValueGeneral;
+  '-ms-animation-fill-mode'?: CSSValueGeneral;
+  '-ms-animation-iteration-count'?: CSSValueGeneral;
+  '-ms-animation-name'?: CSSValueGeneral;
+  '-ms-animation-play-state'?: CSSValueGeneral;
+  '-ms-animation-timing-function'?: CSSValueGeneral;
+  '-ms-backface-visibility'?: CSSValueGeneral;
+  '-ms-background-position-x'?: CSSValueGeneral;
+  '-ms-background-position-y'?: CSSValueGeneral;
+  '-ms-behavior'?: CSSValueGeneral;
+  '-ms-block-progression'?: CSSValueGeneral;
+  '-ms-content-zoom-chaining'?: CSSValueGeneral;
+  '-ms-content-zoom-limit'?: CSSValueGeneral;
+  '-ms-content-zoom-limit-max'?: CSSValueGeneral;
+  '-ms-content-zoom-limit-min'?: CSSValueGeneral;
+  '-ms-content-zoom-snap'?: CSSValueGeneral;
+  '-ms-content-zoom-snap-points'?: CSSValueGeneral;
+  '-ms-content-zoom-snap-type'?: CSSValueGeneral;
+  '-ms-content-zooming'?: CSSValueGeneral;
+  '-ms-filter'?: CSSValueGeneral;
+  '-ms-flex-flow'?: CSSValueGeneral;
+  '-ms-flex-line-pack'?: CSSValueGeneral;
+  '-ms-flex-order'?: CSSValueGeneral;
+  '-ms-flex-preferred-size'?: CSSValueGeneral;
+  '-ms-flow-from'?: CSSValueGeneral;
+  '-ms-flow-into'?: CSSValueGeneral;
+  '-ms-font-feature-settings'?: CSSValueGeneral;
+  '-ms-grid-column'?: CSSValueGeneral;
+  '-ms-grid-column-align'?: CSSValueGeneral;
+  '-ms-grid-column-span'?: CSSValueGeneral;
+  '-ms-grid-columns'?: CSSValueGeneral;
+  '-ms-grid-row'?: CSSValueGeneral;
+  '-ms-grid-row-align'?: CSSValueGeneral;
+  '-ms-grid-row-span'?: CSSValueGeneral;
+  '-ms-grid-rows'?: CSSValueGeneral;
+  '-ms-high-contrast-adjust'?: CSSValueGeneral;
+  '-ms-hyphenate-limit-chars'?: CSSValueGeneral;
+  '-ms-hyphenate-limit-lines'?: CSSValueGeneral;
+  '-ms-hyphenate-limit-zone'?: CSSValueGeneral;
+  '-ms-hyphens'?: CSSValueGeneral;
+  '-ms-ime-align'?: CSSValueGeneral;
+  '-ms-ime-mode'?: CSSValueGeneral;
+  '-ms-interpolation-mode'?: CSSValueGeneral;
+  '-ms-layout-flow'?: CSSValueGeneral;
+  '-ms-layout-grid'?: CSSValueGeneral;
+  '-ms-layout-grid-char'?: CSSValueGeneral;
+  '-ms-layout-grid-line'?: CSSValueGeneral;
+  '-ms-layout-grid-mode'?: CSSValueGeneral;
+  '-ms-layout-grid-type'?: CSSValueGeneral;
+  '-ms-line-break'?: CSSValueGeneral;
+  '-ms-overflow-style'?: CSSValueGeneral;
+  '-ms-overflow-x'?: CSSValueGeneral;
+  '-ms-overflow-y'?: CSSValueGeneral;
+  '-ms-perspective'?: CSSValueGeneral;
+  '-ms-perspective-origin'?: CSSValueGeneral;
+  '-ms-perspective-origin-x'?: CSSValueGeneral;
+  '-ms-perspective-origin-y'?: CSSValueGeneral;
+  '-ms-scroll-chaining'?: CSSValueGeneral;
+  '-ms-scroll-limit'?: CSSValueGeneral;
+  '-ms-scroll-limit-x-max'?: CSSValueGeneral;
+  '-ms-scroll-limit-x-min'?: CSSValueGeneral;
+  '-ms-scroll-limit-y-max'?: CSSValueGeneral;
+  '-ms-scroll-limit-y-min'?: CSSValueGeneral;
+  '-ms-scroll-rails'?: CSSValueGeneral;
+  '-ms-scroll-snap-points-x'?: CSSValueGeneral;
+  '-ms-scroll-snap-points-y'?: CSSValueGeneral;
+  '-ms-scroll-snap-type'?: CSSValueGeneral;
+  '-ms-scroll-snap-x'?: CSSValueGeneral;
+  '-ms-scroll-snap-y'?: CSSValueGeneral;
+  '-ms-scroll-translation'?: CSSValueGeneral;
+  '-ms-scrollbar-3dlight-color'?: CSSValueGeneral;
+  '-ms-scrollbar-arrow-color'?: CSSValueGeneral;
+  '-ms-scrollbar-base-color'?: CSSValueGeneral;
+  '-ms-scrollbar-darkshadow-color'?: CSSValueGeneral;
+  '-ms-scrollbar-face-color'?: CSSValueGeneral;
+  '-ms-scrollbar-highlight-color'?: CSSValueGeneral;
+  '-ms-scrollbar-shadow-color'?: CSSValueGeneral;
+  '-ms-scrollbar-track-color'?: CSSValueGeneral;
+  '-ms-text-align-last'?: CSSValueGeneral;
+  '-ms-text-autospace'?: CSSValueGeneral;
+  '-ms-text-combine-horizontal'?: CSSValueGeneral;
+  '-ms-text-justify'?: CSSValueGeneral;
+  '-ms-text-kashida-space'?: CSSValueGeneral;
+  '-ms-text-overflow'?: CSSValueGeneral;
+  '-ms-text-size-adjust'?: CSSValueGeneral;
+  '-ms-text-underline-position'?: CSSValueGeneral;
+  '-ms-touch-action'?: CSSValueGeneral;
+  '-ms-touch-select'?: CSSValueGeneral;
+  '-ms-transform'?: CSSValueGeneral;
+  '-ms-transform-origin'?: CSSValueGeneral;
+  '-ms-transform-origin-x'?: CSSValueGeneral;
+  '-ms-transform-origin-y'?: CSSValueGeneral;
+  '-ms-transform-origin-z'?: CSSValueGeneral;
+  '-ms-transform-style'?: CSSValueGeneral;
+  '-ms-transition'?: CSSValueGeneral;
+  '-ms-transition-delay'?: CSSValueGeneral;
+  '-ms-transition-duration'?: CSSValueGeneral;
+  '-ms-transition-property'?: CSSValueGeneral;
+  '-ms-transition-timing-function'?: CSSValueGeneral;
+  '-ms-word-break'?: CSSValueGeneral;
+  '-ms-word-wrap'?: CSSValueGeneral;
+  '-ms-wrap-flow'?: CSSValueGeneral;
+  '-ms-wrap-margin'?: CSSValueGeneral;
+  '-ms-wrap-through'?: CSSValueGeneral;
+  '-ms-writing-mode'?: CSSValueGeneral;
+  '-ms-zoom'?: CSSValueGeneral;
+  '-webkit-align-content'?: CSSValueGeneral;
+  '-webkit-alt'?: CSSValueGeneral;
+  '-webkit-animation'?: CSSValueGeneral;
+  '-webkit-animation-delay'?: CSSValueGeneral;
+  '-webkit-animation-direction'?: CSSValueGeneral;
+  '-webkit-animation-duration'?: CSSValueGeneral;
+  '-webkit-animation-fill-mode'?: CSSValueGeneral;
+  '-webkit-animation-iteration-count'?: CSSValueGeneral;
+  '-webkit-animation-name'?: CSSValueGeneral;
+  '-webkit-animation-play-state'?: CSSValueGeneral;
+  '-webkit-animation-timing-function'?: CSSValueGeneral;
+  '-webkit-animation-trigger'?: CSSValueGeneral;
+  '-webkit-app-region'?: CSSValueGeneral;
+  '-webkit-appearance'?: CSSValueGeneral;
+  '-webkit-aspect-ratio'?: CSSValueGeneral;
+  '-webkit-backdrop-filter'?: CSSValueGeneral;
+  '-webkit-backface-visibility'?: CSSValueGeneral;
+  '-webkit-background-clip'?: CSSValueGeneral;
+  '-webkit-background-composite'?: CSSValueGeneral;
+  '-webkit-background-origin'?: CSSValueGeneral;
+  '-webkit-background-size'?: CSSValueGeneral;
+  '-webkit-border-after'?: CSSValueGeneral;
+  '-webkit-border-after-color'?: CSSValueGeneral;
+  '-webkit-border-after-style'?: CSSValueGeneral;
+  '-webkit-border-after-width'?: CSSValueGeneral;
+  '-webkit-border-before'?: CSSValueGeneral;
+  '-webkit-border-before-color'?: CSSValueGeneral;
+  '-webkit-border-before-style'?: CSSValueGeneral;
+  '-webkit-border-before-width'?: CSSValueGeneral;
+  '-webkit-border-bottom-left-radius'?: CSSValueGeneral;
+  '-webkit-border-bottom-right-radius'?: CSSValueGeneral;
+  '-webkit-border-end'?: CSSValueGeneral;
+  '-webkit-border-end-color'?: CSSValueGeneral;
+  '-webkit-border-end-style'?: CSSValueGeneral;
+  '-webkit-border-end-width'?: CSSValueGeneral;
+  '-webkit-border-fit'?: CSSValueGeneral;
+  '-webkit-border-horizontal-spacing'?: CSSValueGeneral;
+  '-webkit-border-image'?: CSSValueGeneral;
+  '-webkit-border-radius'?: CSSValueGeneral;
+  '-webkit-border-start'?: CSSValueGeneral;
+  '-webkit-border-start-color'?: CSSValueGeneral;
+  '-webkit-border-start-style'?: CSSValueGeneral;
+  '-webkit-border-start-width'?: CSSValueGeneral;
+  '-webkit-border-top-left-radius'?: CSSValueGeneral;
+  '-webkit-border-top-right-radius'?: CSSValueGeneral;
+  '-webkit-border-vertical-spacing'?: CSSValueGeneral;
+  '-webkit-box-align'?: CSSValueGeneral;
+  '-webkit-box-decoration-break'?: CSSValueGeneral;
+  '-webkit-box-direction'?: CSSValueGeneral;
+  '-webkit-box-flex'?: CSSValueGeneral;
+  '-webkit-box-flex-group'?: CSSValueGeneral;
+  '-webkit-box-lines'?: CSSValueGeneral;
+  '-webkit-box-ordinal-group'?: CSSValueGeneral;
+  '-webkit-box-orient'?: CSSValueGeneral;
+  '-webkit-box-pack'?: CSSValueGeneral;
+  '-webkit-box-reflect'?: CSSValueGeneral;
+  '-webkit-box-shadow'?: CSSValueGeneral;
+  '-webkit-clip-path'?: CSSValueGeneral;
+  '-webkit-color-correction'?: CSSValueGeneral;
+  '-webkit-column-axis'?: CSSValueGeneral;
+  '-webkit-column-break-after'?: CSSValueGeneral;
+  '-webkit-column-break-before'?: CSSValueGeneral;
+  '-webkit-column-break-inside'?: CSSValueGeneral;
+  '-webkit-column-count'?: CSSValueGeneral;
+  '-webkit-column-fill'?: CSSValueGeneral;
+  '-webkit-column-gap'?: CSSValueGeneral;
+  '-webkit-column-progression'?: CSSValueGeneral;
+  '-webkit-column-rule'?: CSSValueGeneral;
+  '-webkit-column-rule-color'?: CSSValueGeneral;
+  '-webkit-column-rule-style'?: CSSValueGeneral;
+  '-webkit-column-rule-width'?: CSSValueGeneral;
+  '-webkit-column-span'?: CSSValueGeneral;
+  '-webkit-column-width'?: CSSValueGeneral;
+  '-webkit-columns'?: CSSValueGeneral;
+  '-webkit-cursor-visibility'?: CSSValueGeneral;
+  '-webkit-dashboard-region'?: CSSValueGeneral;
+  '-webkit-filter'?: CSSValueGeneral;
+  '-webkit-flex-basis'?: CSSValueGeneral;
+  '-webkit-flex-flow'?: CSSValueGeneral;
+  '-webkit-flow-from'?: CSSValueGeneral;
+  '-webkit-flow-into'?: CSSValueGeneral;
+  '-webkit-font-feature-settings'?: CSSValueGeneral;
+  '-webkit-font-kerning'?: CSSValueGeneral;
+  '-webkit-font-size-delta'?: CSSValueGeneral;
+  '-webkit-font-smoothing'?: CSSValueGeneral;
+  '-webkit-font-variant-ligatures'?: CSSValueGeneral;
+  '-webkit-grid'?: CSSValueGeneral;
+  '-webkit-grid-area'?: CSSValueGeneral;
+  '-webkit-grid-auto-columns'?: CSSValueGeneral;
+  '-webkit-grid-auto-flow'?: CSSValueGeneral;
+  '-webkit-grid-auto-rows'?: CSSValueGeneral;
+  '-webkit-grid-column'?: CSSValueGeneral;
+  '-webkit-grid-column-end'?: CSSValueGeneral;
+  '-webkit-grid-column-gap'?: CSSValueGeneral;
+  '-webkit-grid-column-start'?: CSSValueGeneral;
+  '-webkit-grid-gap'?: CSSValueGeneral;
+  '-webkit-grid-row'?: CSSValueGeneral;
+  '-webkit-grid-row-end'?: CSSValueGeneral;
+  '-webkit-grid-row-gap'?: CSSValueGeneral;
+  '-webkit-grid-row-start'?: CSSValueGeneral;
+  '-webkit-grid-template'?: CSSValueGeneral;
+  '-webkit-grid-template-areas'?: CSSValueGeneral;
+  '-webkit-grid-template-columns'?: CSSValueGeneral;
+  '-webkit-grid-template-rows'?: CSSValueGeneral;
+  '-webkit-highlight'?: CSSValueGeneral;
+  '-webkit-hyphenate-character'?: CSSValueGeneral;
+  '-webkit-hyphenate-limit-after'?: CSSValueGeneral;
+  '-webkit-hyphenate-limit-before'?: CSSValueGeneral;
+  '-webkit-hyphenate-limit-lines'?: CSSValueGeneral;
+  '-webkit-hyphens'?: CSSValueGeneral;
+  '-webkit-initial-letter'?: CSSValueGeneral;
+  '-webkit-justify-items'?: CSSValueGeneral;
+  '-webkit-justify-self'?: CSSValueGeneral;
+  '-webkit-line-align'?: CSSValueGeneral;
+  '-webkit-line-box-contain'?: CSSValueGeneral;
+  '-webkit-line-break'?: CSSValueGeneral;
+  '-webkit-line-clamp'?: CSSValueGeneral;
+  '-webkit-line-grid'?: CSSValueGeneral;
+  '-webkit-line-snap'?: CSSValueGeneral;
+  '-webkit-locale'?: CSSValueGeneral;
+  '-webkit-logical-height'?: CSSValueGeneral;
+  '-webkit-logical-width'?: CSSValueGeneral;
+  '-webkit-margin-after'?: CSSValueGeneral;
+  '-webkit-margin-after-collapse'?: CSSValueGeneral;
+  '-webkit-margin-before'?: CSSValueGeneral;
+  '-webkit-margin-before-collapse'?: CSSValueGeneral;
+  '-webkit-margin-bottom-collapse'?: CSSValueGeneral;
+  '-webkit-margin-collapse'?: CSSValueGeneral;
+  '-webkit-margin-end'?: CSSValueGeneral;
+  '-webkit-margin-start'?: CSSValueGeneral;
+  '-webkit-margin-top-collapse'?: CSSValueGeneral;
+  '-webkit-marquee'?: CSSValueGeneral;
+  '-webkit-marquee-direction'?: CSSValueGeneral;
+  '-webkit-marquee-increment'?: CSSValueGeneral;
+  '-webkit-marquee-repetition'?: CSSValueGeneral;
+  '-webkit-marquee-speed'?: CSSValueGeneral;
+  '-webkit-marquee-style'?: CSSValueGeneral;
+  '-webkit-mask'?: CSSValueGeneral;
+  '-webkit-mask-box-image'?: CSSValueGeneral;
+  '-webkit-mask-box-image-outset'?: CSSValueGeneral;
+  '-webkit-mask-box-image-repeat'?: CSSValueGeneral;
+  '-webkit-mask-box-image-slice'?: CSSValueGeneral;
+  '-webkit-mask-box-image-source'?: CSSValueGeneral;
+  '-webkit-mask-box-image-width'?: CSSValueGeneral;
+  '-webkit-mask-clip'?: CSSValueGeneral;
+  '-webkit-mask-composite'?: CSSValueGeneral;
+  '-webkit-mask-image'?: CSSValueGeneral;
+  '-webkit-mask-origin'?: CSSValueGeneral;
+  '-webkit-mask-position'?: CSSValueGeneral;
+  '-webkit-mask-position-x'?: CSSValueGeneral;
+  '-webkit-mask-position-y'?: CSSValueGeneral;
+  '-webkit-mask-repeat'?: CSSValueGeneral;
+  '-webkit-mask-repeat-x'?: CSSValueGeneral;
+  '-webkit-mask-repeat-y'?: CSSValueGeneral;
+  '-webkit-mask-size'?: CSSValueGeneral;
+  '-webkit-mask-source-type'?: CSSValueGeneral;
+  '-webkit-max-logical-height'?: CSSValueGeneral;
+  '-webkit-max-logical-width'?: CSSValueGeneral;
+  '-webkit-min-logical-height'?: CSSValueGeneral;
+  '-webkit-min-logical-width'?: CSSValueGeneral;
+  '-webkit-nbsp-mode'?: CSSValueGeneral;
+  '-webkit-opacity'?: CSSValueGeneral;
+  '-webkit-order'?: CSSValueGeneral;
+  '-webkit-padding-after'?: CSSValueGeneral;
+  '-webkit-padding-before'?: CSSValueGeneral;
+  '-webkit-padding-end'?: CSSValueGeneral;
+  '-webkit-padding-start'?: CSSValueGeneral;
+  '-webkit-perspective'?: CSSValueGeneral;
+  '-webkit-perspective-origin'?: CSSValueGeneral;
+  '-webkit-perspective-origin-x'?: CSSValueGeneral;
+  '-webkit-perspective-origin-y'?: CSSValueGeneral;
+  '-webkit-print-color-adjust'?: CSSValueGeneral;
+  '-webkit-region-break-after'?: CSSValueGeneral;
+  '-webkit-region-break-before'?: CSSValueGeneral;
+  '-webkit-region-break-inside'?: CSSValueGeneral;
+  '-webkit-region-fragment'?: CSSValueGeneral;
+  '-webkit-rtl-ordering'?: CSSValueGeneral;
+  '-webkit-ruby-position'?: CSSValueGeneral;
+  '-webkit-scroll-snap-coordinate'?: CSSValueGeneral;
+  '-webkit-scroll-snap-destination'?: CSSValueGeneral;
+  '-webkit-scroll-snap-points-x'?: CSSValueGeneral;
+  '-webkit-scroll-snap-points-y'?: CSSValueGeneral;
+  '-webkit-scroll-snap-type'?: CSSValueGeneral;
+  '-webkit-shape-image-threshold'?: CSSValueGeneral;
+  '-webkit-shape-margin'?: CSSValueGeneral;
+  '-webkit-shape-outside'?: CSSValueGeneral;
+  '-webkit-svg-shadow'?: CSSValueGeneral;
+  '-webkit-tap-highlight-color'?: CSSValueGeneral;
+  '-webkit-text-align-last'?: CSSValueGeneral;
+  '-webkit-text-combine'?: CSSValueGeneral;
+  '-webkit-text-decoration'?: CSSValueGeneral;
+  '-webkit-text-decoration-color'?: CSSValueGeneral;
+  '-webkit-text-decoration-line'?: CSSValueGeneral;
+  '-webkit-text-decoration-skip'?: CSSValueGeneral;
+  '-webkit-text-decoration-style'?: CSSValueGeneral;
+  '-webkit-text-decorations-in-effect'?: CSSValueGeneral;
+  '-webkit-text-emphasis'?: CSSValueGeneral;
+  '-webkit-text-emphasis-color'?: CSSValueGeneral;
+  '-webkit-text-emphasis-position'?: CSSValueGeneral;
+  '-webkit-text-emphasis-style'?: CSSValueGeneral;
+  '-webkit-text-fill-color'?: CSSValueGeneral;
+  '-webkit-text-justify'?: CSSValueGeneral;
+  '-webkit-text-orientation'?: CSSValueGeneral;
+  '-webkit-text-security'?: CSSValueGeneral;
+  '-webkit-text-size-adjust'?: CSSValueGeneral;
+  '-webkit-text-stroke'?: CSSValueGeneral;
+  '-webkit-text-stroke-color'?: CSSValueGeneral;
+  '-webkit-text-stroke-width'?: CSSValueGeneral;
+  '-webkit-text-underline-position'?: CSSValueGeneral;
+  '-webkit-text-zoom'?: CSSValueGeneral;
+  '-webkit-touch-callout'?: CSSValueGeneral;
+  '-webkit-transform'?: CSSValueGeneral;
+  '-webkit-transform-origin'?: CSSValueGeneral;
+  '-webkit-transform-origin-x'?: CSSValueGeneral;
+  '-webkit-transform-origin-y'?: CSSValueGeneral;
+  '-webkit-transform-origin-z'?: CSSValueGeneral;
+  '-webkit-transform-style'?: CSSValueGeneral;
+  '-webkit-transition'?: CSSValueGeneral;
+  '-webkit-transition-delay'?: CSSValueGeneral;
+  '-webkit-transition-duration'?: CSSValueGeneral;
+  '-webkit-transition-property'?: CSSValueGeneral;
+  '-webkit-transition-timing-function'?: CSSValueGeneral;
+  '-webkit-user-drag'?: CSSValueGeneral;
+  '-webkit-user-modify'?: CSSValueGeneral;
+  '-webkit-writing-mode'?: CSSValueGeneral;
+}
+
+
+export type PseudoCssKey =
+	| ':active'
+	| ':any'
+	| ':checked'
+	| ':default'
+	| ':disabled'
+	| ':empty'
+	| ':enabled'
+	| ':first'
+	| ':first-child'
+	| ':first-of-type'
+	| ':fullscreen'
+	| ':focus'
+	| ':hover'
+	| ':indeterminate'
+	| ':in-range'
+	| ':invalid'
+	| ':last-child'
+	| ':last-of-type'
+	| ':left'
+	| ':link'
+	| ':only-child'
+	| ':only-of-type'
+	| ':optional'
+	| ':out-of-range'
+	| ':read-only'
+	| ':read-write'
+	| ':required'
+	| ':right'
+	| ':root'
+	| ':scope'
+	| ':target'
+	| ':valid'
+	| ':visited'
+	// TODO
+	// | ':dir()'
+	// | ':lang()'
+	// | ':not()'
+	// | ':nth-child()'
+	// | ':nth-last-child()'
+	// | ':nth-last-of-type()'
+	// | ':nth-of-type()'
+	| '::after'
+	| '::before'
+	| '::cue'
+	| '::first-letter'
+	| '::first-line'
+	| '::selection'
+	| '::backdrop '
+	| '::placeholder '
+	| '::marker '
+	| '::spelling-error '
+	| '::grammar-error ';
+
+export type PseudoCss = Partial<Record<PseudoCssKey, CSSProperties>>;
+
+export interface JssProps {
+	'@global'?: CSSProperties & PseudoCss;
+	extend?: string;
+	composes?: string | string[];
+}
+
+export interface JssExpand {
+	animation:
+		| {
+				delay: CSSProperties['animationDelay'];
+				direction: CSSProperties['animationDirection'];
+				duration: CSSProperties['animationDuration'];
+				iterationCount: CSSProperties['animationIterationCount'];
+				name: CSSProperties['animationName'];
+				playState: CSSProperties['animationPlayState'];
+				timingFunction: any;
+			}
+		| CSSProperties['animation'];
+	background:
+		| {
+				attachment: CSSProperties['backgroundAttachment'];
+				color: CSSProperties['backgroundColor'];
+				image: CSSProperties['backgroundImage'];
+				position: CSSProperties['backgroundPosition'] | number[]; // Can be written using array e.g. `[0 0]`
+				repeat: CSSProperties['backgroundRepeat'];
+				size: Array<CSSProperties['backgroundSize'] | CSSProperties['backgroundSize']>; // Can be written using array e.g. `['center' 'center']`
+			}
+		| CSSProperties['background'];
+	border:
+		| {
+				color: CSSProperties['borderColor'];
+				style: CSSProperties['borderStyle'];
+				width: CSSProperties['borderWidth'];
+			}
+		| CSSProperties['border'];
+	boxShadow:
+		| {
+				x: any;
+				y: any;
+				blur: any;
+				spread: any;
+				color: CSSProperties['color'];
+				inset?: 'inset'; // If you want to add inset you need to write "inset: 'inset'"
+			}
+		| CSSProperties['boxShadow'];
+	flex:
+		| {
+				basis: CSSProperties['flexBasis'];
+				direction: CSSProperties['flexDirection'];
+				flow: CSSProperties['flexFlow'];
+				grow: CSSProperties['flexGrow'];
+				shrink: CSSProperties['flexShrink'];
+				wrap: CSSProperties['flexWrap'];
+			}
+		| CSSProperties['flex'];
+	font:
+		| {
+				family: CSSProperties['fontFamily'];
+				size: CSSProperties['fontSize'];
+				stretch: CSSProperties['fontStretch'];
+				style: CSSProperties['fontStyle'];
+				variant: CSSProperties['fontVariant'];
+				weight: CSSProperties['fontWeight'];
+			}
+		| CSSProperties['font'];
+	listStyle:
+		| {
+				image: CSSProperties['listStyleImage'];
+				position: CSSProperties['listStylePosition'];
+				type: CSSProperties['listStyleType'];
+			}
+		| CSSProperties['listStyle'];
+	margin:
+		| {
+				bottom: CSSProperties['marginBottom'];
+				left: CSSProperties['marginLeft'];
+				right: CSSProperties['marginRight'];
+				top: CSSProperties['marginTop'];
+			}
+		| CSSProperties['margin'];
+	padding:
+		| {
+				bottom: CSSProperties['paddingBottom'];
+				left: CSSProperties['paddingLeft'];
+				right: CSSProperties['paddingRight'];
+				top: CSSProperties['paddingTop'];
+			}
+		| CSSProperties['padding'];
+	outline:
+		| {
+				color: CSSProperties['outlineColor'];
+				style: 'none' | 'hidden' | 'dotted' | 'dashed' | 'solid' | 'double' | 'groove' | 'ridge' | 'inset' | 'outset';
+				width: any;
+			}
+		| CSSProperties['outline'];
+	textShadow:
+		| {
+				x: any;
+				y: any;
+				blur: any;
+				color: CSSProperties['color'];
+			}
+		| CSSProperties['textShadow'];
+	transition:
+		| {
+				delay: CSSProperties['transitionDelay'];
+				duration: CSSProperties['transitionDuration'];
+				property: CSSProperties['transitionProperty'];
+				timingFunction: CSSProperties['transitionTimingFunction'];
+			}
+		| CSSProperties['transition'];
+}
+
+export type JssExpandArr = { [k in keyof JssExpand]?: JssExpand[k] | Array<JssExpand[k]> };
+
+export type SimpleStyle = CSSProperties & PseudoCss & JssProps & JssExpandArr;
+export type Style = Observable<SimpleStyle> | SimpleStyle;
diff --git a/types/jss/index.d.ts b/types/jss/index.d.ts
index 8054d7f6a6..f6ce6999d8 100644
--- a/types/jss/index.d.ts
+++ b/types/jss/index.d.ts
@@ -5,184 +5,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-import { types } from 'typestyle';
-import { Observable } from './observable';
-
-export type PseudoCssKey =
-	| ':active'
-	| ':any'
-	| ':checked'
-	| ':default'
-	| ':disabled'
-	| ':empty'
-	| ':enabled'
-	| ':first'
-	| ':first-child'
-	| ':first-of-type'
-	| ':fullscreen'
-	| ':focus'
-	| ':hover'
-	| ':indeterminate'
-	| ':in-range'
-	| ':invalid'
-	| ':last-child'
-	| ':last-of-type'
-	| ':left'
-	| ':link'
-	| ':only-child'
-	| ':only-of-type'
-	| ':optional'
-	| ':out-of-range'
-	| ':read-only'
-	| ':read-write'
-	| ':required'
-	| ':right'
-	| ':root'
-	| ':scope'
-	| ':target'
-	| ':valid'
-	| ':visited'
-	// TODO
-	// | ':dir()'
-	// | ':lang()'
-	// | ':not()'
-	// | ':nth-child()'
-	// | ':nth-last-child()'
-	// | ':nth-last-of-type()'
-	// | ':nth-of-type()'
-	| '::after'
-	| '::before'
-	| '::cue'
-	| '::first-letter'
-	| '::first-line'
-	| '::selection'
-	| '::backdrop '
-	| '::placeholder '
-	| '::marker '
-	| '::spelling-error '
-	| '::grammar-error ';
-
-export type PseudoCss = Partial<Record<PseudoCssKey, types.CSSProperties>>;
-
-export interface JssProps {
-	'@global'?: types.CSSProperties & PseudoCss;
-	extend?: string;
-	composes?: string | string[];
-}
-
-export type css = types.CSSProperties;
-
-export interface JssExpand {
-	animation:
-		| {
-				delay: css['animationDelay'];
-				direction: css['animationDirection'];
-				duration: css['animationDuration'];
-				iterationCount: css['animationIterationCount'];
-				name: css['animationName'];
-				playState: css['animationPlayState'];
-				timingFunction: any;
-			}
-		| css['animation'];
-	background:
-		| {
-				attachment: css['backgroundAttachment'];
-				color: css['backgroundColor'];
-				image: css['backgroundImage'];
-				position: css['backgroundPosition'] | number[]; // Can be written using array e.g. `[0 0]`
-				repeat: css['backgroundRepeat'];
-				size: Array<css['backgroundSize'] | css['backgroundSize']>; // Can be written using array e.g. `['center' 'center']`
-			}
-		| css['background'];
-	border:
-		| {
-				color: css['borderColor'];
-				style: css['borderStyle'];
-				width: css['borderWidth'];
-			}
-		| css['border'];
-	boxShadow:
-		| {
-				x: any;
-				y: any;
-				blur: any;
-				spread: any;
-				color: css['color'];
-				inset?: 'inset'; // If you want to add inset you need to write "inset: 'inset'"
-			}
-		| css['boxShadow'];
-	flex:
-		| {
-				basis: css['flexBasis'];
-				direction: css['flexDirection'];
-				flow: css['flexFlow'];
-				grow: css['flexGrow'];
-				shrink: css['flexShrink'];
-				wrap: css['flexWrap'];
-			}
-		| css['flex'];
-	font:
-		| {
-				family: css['fontFamily'];
-				size: css['fontSize'];
-				stretch: css['fontStretch'];
-				style: css['fontStyle'];
-				variant: css['fontVariant'];
-				weight: css['fontWeight'];
-			}
-		| css['font'];
-	listStyle:
-		| {
-				image: css['listStyleImage'];
-				position: css['listStylePosition'];
-				type: css['listStyleType'];
-			}
-		| css['listStyle'];
-	margin:
-		| {
-				bottom: css['marginBottom'];
-				left: css['marginLeft'];
-				right: css['marginRight'];
-				top: css['marginTop'];
-			}
-		| css['margin'];
-	padding:
-		| {
-				bottom: css['paddingBottom'];
-				left: css['paddingLeft'];
-				right: css['paddingRight'];
-				top: css['paddingTop'];
-			}
-		| css['padding'];
-	outline:
-		| {
-				color: css['outlineColor'];
-				style: 'none' | 'hidden' | 'dotted' | 'dashed' | 'solid' | 'double' | 'groove' | 'ridge' | 'inset' | 'outset';
-				width: any;
-			}
-		| css['outline'];
-	textShadow:
-		| {
-				x: any;
-				y: any;
-				blur: any;
-				color: css['color'];
-			}
-		| css['textShadow'];
-	transition:
-		| {
-				delay: css['transitionDelay'];
-				duration: css['transitionDuration'];
-				property: css['transitionProperty'];
-				timingFunction: css['transitionTimingFunction'];
-			}
-		| css['transition'];
-}
-
-export type JssExpandArr = { [k in keyof JssExpand]?: JssExpand[k] | Array<JssExpand[k]> };
-
-export type SimpleStyle = types.CSSProperties & PseudoCss & JssProps & JssExpandArr;
-export type Style = Observable<SimpleStyle> | SimpleStyle;
+import { Style } from './css';
 
 export type Styles<Name extends string = any> = Record<Name, Style>;
 export type Classes<Name extends string = any> = Record<Name, string>;
diff --git a/types/jss/package.json b/types/jss/package.json
deleted file mode 100644
index a85944f70e..0000000000
--- a/types/jss/package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "private": true,
-    "dependencies": {
-        "typestyle": "*"
-    }
-}

From 5acc5ac6154e9e21f62d23b9cc0b06c9ea47583d Mon Sep 17 00:00:00 2001
From: Tom Crockett <pelotom@gmail.com>
Date: Tue, 23 Jan 2018 00:33:24 -0800
Subject: [PATCH 0232/1382] Add some type error expectations

---
 types/jss/jss-tests.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/types/jss/jss-tests.ts b/types/jss/jss-tests.ts
index fab2665bed..0b100ddc5f 100644
--- a/types/jss/jss-tests.ts
+++ b/types/jss/jss-tests.ts
@@ -55,6 +55,14 @@ styleSheet.addRules({
 	},
 });
 
+styleSheet.addRule('badProperty', {
+	thisIsNotAValidProperty: 'blah', // $ExpectError
+});
+
+styleSheet.addRule('badValue', { // $ExpectError
+	display: 'thisIsNotAValidDisplayValue',
+});
+
 styleSheet.detach();
 
 sharedInstance.createStyleSheet({

From 542a94c964f1d4f899fae54bfe7001310ffcc5fe Mon Sep 17 00:00:00 2001
From: Tom Crockett <pelotom@gmail.com>
Date: Tue, 23 Jan 2018 00:36:55 -0800
Subject: [PATCH 0233/1382] Add some more type assertions to the test

---
 types/jss/jss-tests.ts | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/types/jss/jss-tests.ts b/types/jss/jss-tests.ts
index 0b100ddc5f..72974aeaca 100644
--- a/types/jss/jss-tests.ts
+++ b/types/jss/jss-tests.ts
@@ -70,3 +70,19 @@ sharedInstance.createStyleSheet({
 		background: '#000099',
 	}
 });
+
+const styleSheet2 = jss.createStyleSheet(
+	{
+		foo: {
+			display: 'flex',
+			width: 100,
+			opacity: .5,
+		},
+	},
+	{
+		link: true,
+	}
+);
+
+styleSheet2.classes.foo; // $ExpectType string
+styleSheet2.classes.bar; // $ExpectError

From 00b79ed03b32fe60225a7312e74dc88950658574 Mon Sep 17 00:00:00 2001
From: Tom Crockett <pelotom@gmail.com>
Date: Tue, 23 Jan 2018 00:39:49 -0800
Subject: [PATCH 0234/1382] Tweak

---
 types/jss/jss-tests.ts | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/types/jss/jss-tests.ts b/types/jss/jss-tests.ts
index 72974aeaca..0ba36b2cfb 100644
--- a/types/jss/jss-tests.ts
+++ b/types/jss/jss-tests.ts
@@ -65,24 +65,11 @@ styleSheet.addRule('badValue', { // $ExpectError
 
 styleSheet.detach();
 
-sharedInstance.createStyleSheet({
+const styleSheet2 = sharedInstance.createStyleSheet({
 	container: {
 		background: '#000099',
 	}
 });
 
-const styleSheet2 = jss.createStyleSheet(
-	{
-		foo: {
-			display: 'flex',
-			width: 100,
-			opacity: .5,
-		},
-	},
-	{
-		link: true,
-	}
-);
-
-styleSheet2.classes.foo; // $ExpectType string
-styleSheet2.classes.bar; // $ExpectError
+styleSheet2.classes.container; // $ExpectType string
+styleSheet2.classes.notAValidKey; // $ExpectError

From 3310f73f729ce2dff583be9c85dfeb6c9dc3ea76 Mon Sep 17 00:00:00 2001
From: Tom Crockett <pelotom@gmail.com>
Date: Tue, 23 Jan 2018 08:56:53 -0800
Subject: [PATCH 0235/1382] Bump version number, add author

---
 types/jss/index.d.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/jss/index.d.ts b/types/jss/index.d.ts
index f6ce6999d8..767c777bb3 100644
--- a/types/jss/index.d.ts
+++ b/types/jss/index.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for jss 9.3
+// Type definitions for jss 9.5
 // Project: https://github.com/cssinjs/jss#readme
 // Definitions by: Brenton Simpson <https://github.com/appsforartists>
 //                 Oleg Slobodskoi <https://github.com/kof>
+//                 Thomas Crockett <https://github.com/pelotom>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 

From b4b5d78ea1aa9aa6681703c6ae3482f3b2d27e9f Mon Sep 17 00:00:00 2001
From: Tom Crockett <pelotom@gmail.com>
Date: Tue, 23 Jan 2018 13:00:24 -0800
Subject: [PATCH 0236/1382] Elaborate on observable testing

---
 types/jss/jss-tests.ts | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/types/jss/jss-tests.ts b/types/jss/jss-tests.ts
index 0ba36b2cfb..06e4ab2eb6 100644
--- a/types/jss/jss-tests.ts
+++ b/types/jss/jss-tests.ts
@@ -10,9 +10,14 @@ const jss = createJSS().setup({});
 const styleSheet = jss.createStyleSheet<string>(
 	{
 		ruleWithMockObservable: {
-			subscribe: () => ({
-				unsubscribe() {}
-			})
+			subscribe: observer => {
+				const next = typeof observer === 'function' ? observer : observer.next;
+				next({ background: 'blue', display: 'flex' });
+				next({ invalidKey: 'blueish' }); // $ExpectError
+				return {
+					unsubscribe() {}
+				};
+			}
 		},
 		container: {
 			display: 'flex',

From 3573402a499f161bc5fd4f7f32650619a11a2fbe Mon Sep 17 00:00:00 2001
From: Tom Crockett <pelotom@gmail.com>
Date: Sun, 11 Feb 2018 16:24:17 -0800
Subject: [PATCH 0237/1382] Use csstype

---
 types/jss/css.d.ts     | 2779 +---------------------------------------
 types/jss/package.json |    6 +
 2 files changed, 38 insertions(+), 2747 deletions(-)
 create mode 100644 types/jss/package.json

diff --git a/types/jss/css.d.ts b/types/jss/css.d.ts
index 348948f814..fb886a6a61 100644
--- a/types/jss/css.d.ts
+++ b/types/jss/css.d.ts
@@ -1,6 +1,7 @@
 // These CSS typings adapted from TypeStyle: https://github.com/typestyle/typestyle
 
 import { Observable } from './observable'
+import * as csstype from 'csstype'
 
 /**
  * Value of a CSS Property.  Could be a single value or a list of fallbacks
@@ -9,2760 +10,44 @@ import { Observable } from './observable'
 export type CSSValue<T> = T | Observable<T>;
 
 /**
- * For general purpose CSS values
- **/
-export type CSSValueGeneral = CSSValue<number | string>;
-
-/**
- * When you are sure that the value must be a string
- **/
-export type CSSValueString = CSSValue<string>;
-
-/**
- * CSS properties that cascade also support these
- * @see https://drafts.csswg.org/css-cascade/#defaulting-keywords
+ * Remove the variants of the second union of string literals from
+ * the first.
  */
-export type CSSGlobalValues
-  = 'initial'
-  | 'inherit'
-  | /** combination of `initial` and `inherit` */ 'unset'
-  | 'revert';
+export type Diff<T extends string, U extends string> = (
+  & { [P in T]: P }
+  & { [P in U]: never }
+  & { [x: string]: never }
+)[T];
 
-export interface FontFace {
-  fontFamily?: string;
+/**
+ * Drop keys `K` from `T`.
+ */
+export type Omit<T, K extends keyof T> = Pick<T, Diff<keyof T, K>>;
 
-  /**
-   * Location of a font-face.  Used with the @font-face at rule
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/src
-   */
-  src?: CSSValueString;
-  unicodeRange?: any;
-  fontVariant?: 'common-ligatures' | 'small-caps' | CSSGlobalValues;
-  fontFeatureSettings?: string;
-  fontWeight?: CSSFontWeight;
-  fontStyle?: 'normal' | 'italic' | 'oblique' | CSSGlobalValues;
+export interface SimpleProperties extends Omit<
+  csstype.Properties<number>,
+  'display' | 'width' | 'height'
+> {
+  // https://github.com/frenic/csstype/issues/7
+  width: number | string;
+  height: number | string;
+  // https://github.com/frenic/csstype/issues/8
+  display:
+    | csstype.All
+    | csstype.DisplayOutside
+    | csstype.DisplayInside
+    | csstype.DisplayInternal
+    | csstype.DisplayBox
+    | csstype.DisplayLegacy
+    ;
 }
 
-/**
- * Absolute size keywords
- * @see https://drafts.csswg.org/css-fonts-3/#absolute-size-value
- */
-export type CSSAbsoluteSize = 'xx-small' | 'x-small' | 'small' | 'medium' | 'large'
-  | 'x-large' | 'xx-large';
-
-/**
- * an angle; 0' | '0deg' | '0grad' | '0rad' | '0turn' | 'etc.
- * @see https://drafts.csswg.org/css-values-3/#angles
- */
-export type CSSAngle = CSSGlobalValues | string | 0;
-
-/**
- * initial state of an animation.
- * @see https://drafts.csswg.org/css-animations/#animation-play-state
- */
-export type CSSAnimationPlayState = CSSGlobalValues | string | 'paused' | 'running';
-
-/**
- * blend mode
- * @see https://drafts.fxtf.org/compositing-1/#ltblendmodegt
- */
-export type CSSBlendMode = 'normal' | 'multiply' | 'screen' | 'overlay' | 'darken' | 'lighten' | 'color-dodge' | 'color-burn'
-  | 'hard-light' | 'soft-light' | 'difference' | 'exclusion' | 'hue' | 'saturation' | 'color' | 'luminosity';
-
-/**
- * border shorthand for style color and width
- * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-bottom
- * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-left
- * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-right
- * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-top
- */
-export type CSSBorderShorthand = CSSGlobalValues | CSSColor | CSSLength | CSSLineStyleSet | string;
-
-/**
- * Determines the area within which the background is painted.
- * @see https://drafts.csswg.org/css-backgrounds/#box
- */
-export type CSSBox = CSSGlobalValues | string | 'border-box' | 'padding-box' | 'content-box';
-
-/**
- * Color can be a named color, transparent, or a color function
- * @see https://drafts.csswg.org/css-color-3/#valuea-def-color
- */
-export type CSSColor = CSSNamedColor | CSSGlobalValues | 'currentColor' | string;
-
-export type CSSNamedColor =
-  'aliceblue' | 'antiquewhite' | 'aqua' | 'aquamarine' | 'azure' | 'beige' | 'bisque' | 'black' | 'blanchedalmond' | 'blue'
-  | 'blueviolet' | 'brown' | 'burlywood' | 'cadetblue' | 'chartreuse' | 'chocolate' | 'coral' | 'cornflowerblue' | 'cornsilk'
-  | 'crimson' | 'cyan' | 'darkblue' | 'darkcyan' | 'darkgoldenrod' | 'darkgray' | 'darkgreen' | 'darkgrey' | 'darkkhaki'
-  | 'darkmagenta' | 'darkolivegreen' | 'darkorange' | 'darkorchid' | 'darkred' | 'darksalmon' | 'darkseagreen'
-  | 'darkslateblue' | 'darkslategray' | 'darkslategrey' | 'darkturquoise' | 'darkviolet' | 'deeppink' | 'deepskyblue'
-  | 'dimgray' | 'dimgrey' | 'dodgerblue' | 'firebrick' | 'floralwhite' | 'forestgreen' | 'fuchsia' | 'gainsboro'
-  | 'ghostwhite' | 'gold' | 'goldenrod' | 'gray' | 'green' | 'greenyellow' | 'grey' | 'honeydew' | 'hotpink' | 'indianred'
-  | 'indigo' | 'ivory' | 'khaki' | 'lavender' | 'lavenderblush' | 'lawngreen' | 'lemonchiffon' | 'lightblue' | 'lightcoral'
-  | 'lightcyan' | 'lightgoldenrodyellow' | 'lightgray' | 'lightgreen' | 'lightgrey' | 'lightpink' | 'lightsalmon'
-  | 'lightseagreen' | 'lightskyblue' | 'lightslategray' | 'lightslategrey' | 'lightsteelblue' | 'lightyellow' | 'lime'
-  | 'limegreen' | 'linen' | 'maroon' | 'mediumaquamarine' | 'mediumblue' | 'mediumorchid' | 'mediumpurple' | 'mediumseagreen'
-  | 'mediumslateblue' | 'mediumspringgreen' | 'mediumturquoise' | 'mediumvioletred' | 'midnightblue' | 'mintcream'
-  | 'mistyrose' | 'moccasin' | 'navajowhite' | 'navy' | 'oldlace' | 'olive' | 'olivedrab' | 'orange' | 'purple'
-  | 'rebeccapurple' | 'red' | 'silver' | 'teal' | 'transparent' | 'white' | 'yellow';
-
-/**
- * Special type for border-color which can use 1 or 4 colors
- * @see https://drafts.csswg.org/css-backgrounds-3/#border-color
- */
-export type CSSColorSet = string | CSSColor;
-
-/**
-  * This property specifies the type of rendering box used for an element. It is a shorthand property for many other display properties.
-  * @see https://developer.mozilla.org/en-US/docs/Web/CSS/display
-  */
-export type CSSDisplay =
-  /* <display-outside> values */
-  'block' | 'inline' | 'run-in'
-  /* <display-inside> values */
-  | 'flow' | 'flow-root' | 'table' | 'flex' | 'grid' | 'ruby' | 'subgrid'
-  /* <display-outside> plus <display-inside> values */
-  | 'block flow' | 'inline table' | 'flex run-in'
-  /* <display-listitem> values */
-  | 'list-item' | 'list-item block' | 'list-item inline' | 'list-item flow' | 'list-item flow-root'
-  | 'list-item block flow' | 'list-item block flow-root' | 'flow list-item block'
-  /* <display-internal> values */
-  | 'table-row-group' | 'table-header-group' | 'table-footer-group' | 'table-row' | 'table-cell'
-  | 'table-column-group' | 'table-column' | 'table-caption' | 'ruby-base' | 'ruby-text'
-  | 'ruby-base-container' | 'ruby-text-container'
-  /* <display-box> values */
-  | 'contents' | 'none'
-  /* <display-legacy> values */
-  | 'inline-block' | 'inline-list-item' | 'inline-table' | 'inline-flex' | 'inline-grid';
-
-/**
-  * CSS Type <baseline-position> of Box Alignment
-  * @see https://www.w3.org/TR/css-align-3/#typedef-baseline-position
-  */
-export type CSSBoxAlignmentBaselinePosition = 'baseline' | 'first baseline' | 'last baseline';
-
-/**
-  * CSS Type <content-distribution> of Box Alignment
-  * @see https://www.w3.org/TR/css-align-3/#typedef-content-distribution
-  */
-export type CSSBoxAlignmentContentDistribution = 'space-between' | 'space-around' | 'space-evenly' | 'stretch';
-
-export type CSSBoxAlignmentContentPositionWithOverflow =
-  | 'center' | 'start' | 'end' | 'flex-start' | 'flex-end'
-  | 'unsafe center' | 'unsafe start' | 'unsafe end' | 'unsafe flex-start' | 'unsafe flex-end'
-  | 'safe center' | 'safe start' | 'safe end' | 'safe flex-start' | 'safe flex-end';
-
-export type CSSBoxAlignmentSelfPositionWithOverflow =
-  | 'center' | 'start' | 'end' | 'self-start' | 'self-end' | 'flex-start' | 'flex-end'
-  | 'unsafe center' | 'unsafe start' | 'unsafe end' | 'unsafe self-start' | 'unsafe self-end' | 'unsafe flex-start' | 'unsafe flex-end'
-  | 'safe center' | 'safe start' | 'safe end' | 'safe self-start' | 'safe self-end' | 'safe flex-start' | 'safe flex-end';
-
-export type CSSBoxAlignmentLeftRightWithOverflow = 'left' | 'right' | 'unsafe left' | 'unsafe right' | 'safe left' | 'safe right';
-
-/**
-  * Type for justify-content in flex or grid
-  * @see https://www.w3.org/TR/css-align-3/#propdef-justify-content
-  */
-export type JustifyContent =
-  | 'normal'
-  | CSSBoxAlignmentContentDistribution
-  | CSSBoxAlignmentContentPositionWithOverflow
-  | 'left'
-  | 'right';
-
-/**
-  * Type for align-content in flex or grid
-  * @see https://www.w3.org/TR/css-align-3/#propdef-align-content
-  */
-export type AlignContent =
-  | 'normal'
-  | CSSBoxAlignmentBaselinePosition
-  | CSSBoxAlignmentContentDistribution
-  | CSSBoxAlignmentContentPositionWithOverflow;
-
-/**
-  * Type for justify-items in flex or grid
-  * @see https://www.w3.org/TR/css-align-3/#propdef-justify-items
-  */
-export type JustifyItems =
-  | 'normal'
-  | 'stretch'
-  | CSSBoxAlignmentBaselinePosition
-  | CSSBoxAlignmentSelfPositionWithOverflow
-  | 'left'
-  | 'right'
-  | 'center'
-  | 'legacy left'
-  | 'legacy right'
-  | 'legacy center';
-
-/**
-  * Type for align-items in flex or grid
-  * @see https://www.w3.org/TR/css-align-3/#propdef-align-items
-  */
-export type AlignItems =
-  | 'normal'
-  | 'stretch'
-  | CSSBoxAlignmentBaselinePosition
-  | CSSBoxAlignmentSelfPositionWithOverflow;
-
-/**
-  * Type for justify-self in flex or grid
-  * @see https://www.w3.org/TR/css-align-3/#propdef-justify-self
-  */
-export type JustifySelf =
-  | 'auto'
-  | 'normal'
-  | 'stretch'
-  | CSSBoxAlignmentBaselinePosition
-  | CSSBoxAlignmentSelfPositionWithOverflow
-  | CSSBoxAlignmentLeftRightWithOverflow;
-
-/**
-  * Type for align-self in flex or grid
-  * @see https://www.w3.org/TR/css-align-3/#propdef-align-self
-  */
-export type AlignSelf =
-  | 'auto'
-  | 'normal'
-  | 'stretch'
-  | CSSBoxAlignmentBaselinePosition
-  | CSSBoxAlignmentSelfPositionWithOverflow;
-
-/**
- * a gradient function like linear-gradient
- * @see https://drafts.csswg.org/css-images-3/#gradients
- */
-export type CSSGradient = CSSGlobalValues | string;
-
-/**
- * complex type that describes the size of fonts
- * @see https://drafts.csswg.org/css-fonts-3/#propdef-font-size
- */
-export type CSSFontSize = CSSGlobalValues | CSSLength | CSSPercentage | CSSAbsoluteSize | CSSRelativeSize;
-
-/**
- * a value that serves as an image
- * @see https://drafts.csswg.org/css-images-3/#typedef-image
- */
-export type CSSImage = CSSGlobalValues | string | CSSGradient | CSSUrl;
-
-/**
- * an length; 0 | '0px' | '0em' etc.
- * @see https://drafts.csswg.org/css-values-3/#lengths
- */
-export type CSSLength = CSSGlobalValues | string | number;
-
-/**
- * Style of a line (e.g. border-style)
- * @see https://drafts.csswg.org/css-backgrounds-3/#line-style
- */
-export type CSSLineStyle = string | 'none' | 'hidden' | 'dotted'
-  | 'dashed' | 'solid' | 'double' | 'groove' | 'ridge' | 'inset'
-  | 'outset';
-
-/**
- * Special type for border-style which can use 1 or 4 line-style
- * @see https://drafts.csswg.org/css-backgrounds-3/#border-style
- */
-export type CSSLineStyleSet = string | CSSLineStyle;
-
-/**
- * Specifies how the contents of a replaced element should be fitted to the box established by its used height and width.
- * @see https://developer.mozilla.org/en-US/docs/Web/CSS/object-fit
- */
-export type CSSObjectFit = "fill" | "contain" | "cover" | "none" | "scale-down" | CSSGlobalValues;
-
-/**
- * Overflow modes
- * @see https://drafts.csswg.org/css-overflow-3/#propdef-overflow
- */
-export type CSSOverflow = 'visible' | 'hidden' | 'scroll' | 'clip' | 'auto';
-
-/**
- * a percentage; 0 | '0%' etc.
- * @see https://drafts.csswg.org/css-values-3/#percentage
- */
-export type CSSPercentage = CSSGlobalValues | string | 0;
-
-/**
- * Defines a position (e.g. background-position)
- * @see https://drafts.csswg.org/css-backgrounds-3/#position
- */
-export type CSSPosition = CSSAngle | string;
-
-/**
- * Relative size keywords
- * @see https://drafts.csswg.org/css-fonts-3/#relative-size-value
- */
-export type CSSRelativeSize = 'larger' | 'smaller';
-
-/**
- * Specifies how background images are tiled after they have been sized and positioned
- * @see https://drafts.csswg.org/css-backgrounds/#repeat-style
- */
-export type CSSRepeatStyle = 'repeat-x'
-  | 'repeat-y'
-  | 'repeat'
-  | 'space'
-  | 'round'
-  | 'no-repeat'
-  | 'repeat repeat'
-  | 'repeat space'
-  | 'repeat round'
-  | 'repeat no-repeat'
-  | 'space repeat'
-  | 'space space'
-  | 'space round'
-  | 'space no-repeat'
-  | 'round repeat'
-  | 'round space'
-  | 'round round'
-  | 'round no-repeat'
-  | 'no-repeat repeat'
-  | 'no-repeat space'
-  | 'no-repeat round'
-  | 'no-repeat no-repeat';
-
-/**
- * Tranform list for the element.
- * @see https://developer.mozilla.org/en-US/docs/Web/CSS/transform-function
- */
-export type CSSTransformFunction = string | 'none';
-
-/**
- * Starting position for many gradients
- * @see https://drafts.csswg.org/css-images-3/#typedef-side-or-corner
- */
-export type CSSSideOrCorner = CSSAngle
-  | 'left' | 'right' | 'top' | 'bottom'
-  | 'to left' | 'to right' | 'to top' | 'to bottom'
-  | 'left top' | 'right top' | 'left bottom' | 'right bottom'
-  | 'top left' | 'top right' | 'bottom left' | 'bottom right'
-  | 'to left top' | 'to right top' | 'to left bottom' | 'to right bottom'
-  | 'to top left' | 'to top right' | 'to bottom left' | 'to bottom right';
-
-export type CSSRadialGradientEndingShape = 'circle' | 'ellipse';
-
-/**
- * Radial Gradient Size.
- * @see https://drafts.csswg.org/css-images-3/#ending-shape
- */
-export type CSSRadialGradientSize = CSSLength | Array<CSSLength>
-  | 'closest-side' | 'farthest-side'
-  | 'closest-corner' | 'closest-side'
-  ;
-
-/** Supporting by `-timing-function` properties */
-export type CSSTimingFunction
-  = /** e.g. steps(int,start|end)|cubic-bezier(n,n,n,n) */ string
-  | CSSGlobalValues
-  | 'ease' | 'ease-in' | 'ease-out' | 'ease-in-out' | 'linear' | 'step-start' | 'step-end';
-
-/**
- * Expressed as url('protocol://')
- * @see https://drafts.csswg.org/css-values-3/#urls
- */
-export type CSSUrl = string;
-
-/**
- * Font weights
- */
-export type CSSFontWeight = 'normal' | 'bold' | 'bolder' | 'lighter' | 100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900 | number | CSSGlobalValues;
-
-/**
- * This interface documents key CSS properties for autocomplete
- */
-export interface CSSProperties {
-  /**
-   * Typestyle configuration options
-   **/
-  /**
-   * The generated CSS selector gets its own unique location in the generated CSS (disables deduping).
-   * So instead of `.classA,.classB{same properties}`
-   * you get `.classA {same properties} .classB {same properties}`
-   * This is needed for certain browser edge cases like placeholder styling
-   **/
-  $unique?: boolean;
-
-  /**
-   * Smooth scrolling on an iPhone. Specifies whether to use native-style scrolling in an element.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/-webkit-overflow-scrolling
-   */
-  '-webkit-overflow-scrolling'?: 'auto' | 'touch';
-
-  /**
-   * Aligns a flex container's lines within the flex container when there is extra space in the cross-axis, similar to how justify-content aligns individual items within the main-axis.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/align-content
-   */
-  alignContent?: AlignContent;
-
-  /**
-   * Sets the default alignment in the cross axis for all of the flex container's items, including anonymous flex items, similarly to how justify-content aligns items along the main axis.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/align-items
-   */
-  alignItems?: CSSValue<AlignItems>;
-  '-ms-align-items'?: CSSValue<AlignItems>;
-  '-webkit-align-items'?: CSSValue<AlignItems>;
-
-  /**
-   * Allows the default alignment to be overridden for individual flex items.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/align-self
-   */
-  alignSelf?: CSSValue<AlignSelf>;
-  '-webkit-align-self'?: CSSValue<AlignSelf>;
-  '-ms-flex-item-align'?: string;
-
-  /**
-   * This property allows precise alignment of elements, such as graphics, that do not have a baseline-table or lack the desired baseline in their baseline-table. With the alignment-adjust property, the position of the baseline identified by the alignment-baseline can be explicitly determined. It also determines precisely the alignment point for each glyph within a textual element.
-   */
-  alignmentAdjust?: any;
-
-  /**
-   * The alignment-baseline attribute specifies how an object is aligned with respect to its parent.
-   * @see https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute/alignment-baseline
-   */
-  alignmentBaseline?: 'auto' | 'baseline' | 'before-edge' | 'text-before-edge' | 'middle' | 'central' | 'after-edge' | 'text-after-edge' | 'ideographic' | 'alphabetic' | 'hanging' | 'mathematical' | 'inherit';
-
-  /**
-   * Shorthand property for animation-name, animation-duration, animation-timing-function, animation-delay,
-   * animation-iteration-count, animation-direction, animation-fill-mode, and animation-play-state.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/animation
-   */
-  animation?: CSSValueString;
-
-  /**
-   * Defines a length of time to elapse before an animation starts, allowing an animation to begin execution some time after it is applied.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/animation-delay
-   */
-  animationDelay?: any;
-
-  /**
-   * Defines whether an animation should run in reverse on some or all cycles.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/animation-direction
-   */
-  animationDirection?: CSSGlobalValues | 'normal' | 'alternate' | 'reverse' | 'alternate-reverse';
-
-  /**
-   * The animation-duration CSS property specifies the length of time that an animation should take to complete one cycle.
-   * A value of '0s', which is the default value, indicates that no animation should occur.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/animation-duration
-   */
-  animationDuration?: CSSValue<string>;
-
-  /**
-   * Specifies how a CSS animation should apply styles to its target before and after it is executing.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/animation-fill-mode
-   */
-  animationFillMode?: 'none' | 'forwards' | 'backwards' | 'both';
-
-  /**
-   * Specifies how many times an animation cycle should play.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/animation-iteration-count
-   */
-  animationIterationCount?: CSSValue<number | 'infinite'>;
-
-  /**
-   * Defines the list of animations that apply to the element.
-   * Note: You probably want animationDuration as well
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/animation-name
-   */
-  animationName?: CSSValue<string>;
-
-  /**
-   * Defines whether an animation is running or paused.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/animation-play-state
-   */
-  animationPlayState?: CSSValue<CSSAnimationPlayState>;
-
-  /**
-   * Sets the pace of an animation
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/animation-timing-function
-   */
-  animationTimingFunction?: CSSValue<CSSTimingFunction>;
-
-  /**
-   * Allows changing the style of any element to platform-based interface elements or vice versa.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/appearance
-   */
-  appearance?: CSSValue<'auto' | 'none'>;
-
-  /**
-   * Determines whether or not the “back” side of a transformed element is visible when facing the viewer.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/backface-visibility
-   */
-  backfaceVisibility?: CSSGlobalValues | 'visible' | 'hidden';
-
-  /**
-   * Shorthand property to set the values for one or more of:
-   * background-clip, background-color, background-image,
-   * background-origin, background-position, background-repeat,
-   * background-size, and background-attachment.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/background
-   */
-  background?: any;
-
-  /**
-   * If a background-image is specified, this property determines
-   * whether that image's position is fixed within the viewport,
-   * or scrolls along with its containing block.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/background-attachment
-   */
-  backgroundAttachment?: 'scroll' | 'fixed' | 'local';
-
-  /**
-   * This property describes how the element's background images should blend with each other and the element's background color.
-   * The value is a list of blend modes that corresponds to each background image. Each element in the list will apply to the corresponding element of background-image. If a property doesn’t have enough comma-separated values to match the number of layers, the UA must calculate its used value by repeating the list of values until there are enough.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/background-blend-mode
-   */
-  backgroundBlendMode?: CSSValue<CSSBlendMode>;
-
-  /**
-   * Specifies whether an element's background, either the color or image, extends underneath its border.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/background-clip
-   */
-  backgroundClip?: CSSValue<CSSBox | 'text'>;
-
-  /**
-   * Sets the background color of an element.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/background-color
-   */
-  backgroundColor?: CSSValue<CSSColor>;
-
-  /**
-   * Sets a compositing style for background images and colors.
-   */
-  backgroundComposite?: any;
-
-  /**
-   * Applies one or more background images to an element. These can be any valid CSS image, including url() paths to image files or CSS gradients.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/background-image
-   */
-  backgroundImage?: CSSValue<CSSImage>;
-
-  /**
-   * Specifies what the background-position property is relative to.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/background-origin
-   */
-  backgroundOrigin?: CSSValue<CSSBox>;
-
-  /**
-   * Sets the position of a background image.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/background-position
-   */
-  backgroundPosition?: CSSValue<CSSPosition>;
-
-  /**
-   * Background-repeat defines if and how background images will be repeated after they have been sized and positioned
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/background-repeat
-   */
-  backgroundRepeat?: CSSValue<CSSRepeatStyle | string>;
-
-  /**
-   * Background-size specifies the size of a background image
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/background-size
-   */
-  backgroundSize?: 'auto' | 'cover' | 'contain' | CSSLength | CSSPercentage | CSSGlobalValues;
-
-  /**
-   * Obsolete - spec retired, not implemented.
-   * @see https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute/baseline-shift
-   */
-  baselineShift?: any;
-
-  /**
-   * Non standard. Sets or retrieves the location of the Dynamic HTML (DHTML) behavior.
-   * @see https://msdn.microsoft.com/en-us/library/ms530723(v=vs.85).aspx
-   */
-  behavior?: any;
-
-  /**
-   * Shorthand property that defines the different properties of all four sides of an element's border in a single declaration. It can be used to set border-width, border-style and border-color, or a subset of these.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border
-   */
-  border?: any;
-
-  /**
-   * Shorthand that sets the values of border-bottom-color,
-   * border-bottom-style, and border-bottom-width.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-bottom
-   */
-  borderBottom?: CSSBorderShorthand;
-
-  /**
-   * Sets the color of the bottom border of an element.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-bottom-color
-   */
-  borderBottomColor?: CSSValue<CSSColor>;
-
-  /**
-   * Defines the shape of the border of the bottom-left corner.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-bottom-left-radius
-   */
-  borderBottomLeftRadius?: any;
-
-  /**
-   * Defines the shape of the border of the bottom-right corner.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-bottom-right-radius
-   */
-  borderBottomRightRadius?: any;
-
-  /**
-   * Sets the line style of the bottom border of a box.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-bottom-style
-   */
-  borderBottomStyle?: CSSValue<CSSLineStyle>;
-
-  /**
-   * Sets the width of an element's bottom border. To set all four borders, use the border-width shorthand property which sets the values simultaneously for border-top-width, border-right-width, border-bottom-width, and border-left-width.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-bottom-width
-   */
-  borderBottomWidth?: CSSValue<CSSLength | CSSPercentage>;
-
-  /**
-   * Border-collapse can be used for collapsing the borders between table cells
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-collapse
-   */
-  borderCollapse?: any;
-
-  /**
-   * The CSS border-color property sets the color of an element's four borders. This property can have from one to four values, made up of the elementary properties:
-   *      •       border-top-color
-   *      •       border-right-color
-   *      •       border-bottom-color
-   *      •       border-left-color The default color is the currentColor of each of these values.
-   * If you provide one value, it sets the color for the element. Two values set the horizontal and vertical values, respectively. Providing three values sets the top, vertical, and bottom values, in that order. Four values set all for sides: top, right, bottom, and left, in that order.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-color
-   */
-  borderColor?: CSSValue<CSSColorSet>;
-
-  /**
-   * Specifies different corner clipping effects, such as scoop (inner curves), bevel (straight cuts) or notch (cut-off rectangles). Works along with border-radius to specify the size of each corner effect.
-   */
-  borderCornerShape?: any;
-
-  /**
-   * The property border-image-source is used to set the image to be used instead of the border style. If this is set to none the border-style is used instead.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-image-source
-   */
-  borderImageSource?: CSSValue<CSSImage>;
-
-  /**
-   * The border-image-width CSS property defines the offset to use for dividing the border image in nine parts, the top-left corner, central top edge, top-right-corner, central right edge, bottom-right corner, central bottom edge, bottom-left corner, and central right edge. They represent inward distance from the top, right, bottom, and left edges.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-image-width
-   */
-  borderImageWidth?: CSSValue<CSSLength | CSSPercentage>;
-
-  /**
-   * Shorthand property that defines the border-width, border-style and border-color of an element's left border in a single declaration. Note that you can use the corresponding longhand properties to set specific individual properties of the left border — border-left-width, border-left-style and border-left-color.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-left
-   */
-  borderLeft?: CSSBorderShorthand;
-
-  /**
-   * The CSS border-left-color property sets the color of an element's left border. This page explains the border-left-color value, but often you will find it more convenient to fix the border's left color as part of a shorthand set, either border-left or border-color.
-   * Colors can be defined several ways. For more information, see Usage.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-left-color
-   */
-  borderLeftColor?: CSSValue<CSSColor>;
-
-  /**
-   * Sets the style of an element's left border. To set all four borders, use the shorthand property, border-style. Otherwise, you can set the borders individually with border-top-style, border-right-style, border-bottom-style, border-left-style.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-left-style
-   */
-  borderLeftStyle?: CSSValue<CSSLineStyle>;
-
-  /**
-   * Sets the width of an element's left border. To set all four borders, use the border-width shorthand property which sets the values simultaneously for border-top-width, border-right-width, border-bottom-width, and border-left-width.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-left-width
-   */
-  borderLeftWidth?: CSSValue<CSSLength | CSSPercentage>;
-
-  /**
-   * Allows Web authors to define how rounded border corners are
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-radius
-   */
-  borderRadius?: CSSValue<CSSLength | CSSPercentage>;
-
-  /**
-   * Shorthand property that defines the border-width, border-style and border-color of an element's right border in a single declaration. Note that you can use the corresponding longhand properties to set specific individual properties of the right border — border-right-width, border-right-style and border-right-color.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-right
-   */
-  borderRight?: CSSBorderShorthand;
-
-  /**
-   * Sets the color of an element's right border. This page explains the border-right-color value, but often you will find it more convenient to fix the border's right color as part of a shorthand set, either border-right or border-color.
-   * Colors can be defined several ways. For more information, see Usage.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-right-color
-   */
-  borderRightColor?: CSSValue<CSSColor>;
-
-  /**
-   * Sets the style of an element's right border. To set all four borders, use the shorthand property, border-style. Otherwise, you can set the borders individually with border-top-style, border-right-style, border-bottom-style, border-left-style.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-right-style
-   */
-  borderRightStyle?: CSSValue<CSSLineStyle>;
-
-  /**
-   * Sets the width of an element's right border. To set all four borders, use the border-width shorthand property which sets the values simultaneously for border-top-width, border-right-width, border-bottom-width, and border-left-width.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-right-width
-   */
-  borderRightWidth?: CSSValue<CSSLength | CSSPercentage>;
-
-  /**
-   * Specifies the distance between the borders of adjacent cells.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-spacing
-   */
-  borderSpacing?: CSSLength | string | 'inherit';
-
-  /**
-   * Sets the style of an element's four borders. This property can have from one to four values. With only one value, the value will be applied to all four borders; otherwise, this works as a shorthand property for each of border-top-style, border-right-style, border-bottom-style, border-left-style, where each border style may be assigned a separate value.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-style
-   */
-  borderStyle?: CSSValue<CSSLineStyleSet>;
-
-  /**
-   * Shorthand property that defines the border-width, border-style and border-color of an element's top border in a single declaration. Note that you can use the corresponding longhand properties to set specific individual properties of the top border — border-top-width, border-top-style and border-top-color.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-top
-   */
-  borderTop?: CSSBorderShorthand;
-
-  /**
-   * Sets the color of an element's top border. This page explains the border-top-color value, but often you will find it more convenient to fix the border's top color as part of a shorthand set, either border-top or border-color.
-   * Colors can be defined several ways. For more information, see Usage.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-top-color
-   */
-  borderTopColor?: CSSValue<CSSColor>;
-
-  /**
-   * Sets the rounding of the top-left corner of the element.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-top-left-radius
-   */
-  borderTopLeftRadius?: any;
-
-  /**
-   * Sets the rounding of the top-right corner of the element.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-top-right-radius
-   */
-  borderTopRightRadius?: any;
-
-  /**
-   * Sets the style of an element's top border. To set all four borders, use the shorthand property, border-style. Otherwise, you can set the borders individually with border-top-style, border-right-style, border-bottom-style, border-left-style.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-top-style
-   */
-  borderTopStyle?: CSSValue<CSSLineStyle>;
-
-  /**
-   * Sets the width of an element's top border. To set all four borders, use the border-width shorthand property which sets the values simultaneously for border-top-width, border-right-width, border-bottom-width, and border-left-width.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-top-width
-   */
-  borderTopWidth?: CSSValue<CSSLength | CSSPercentage>;
-
-  /**
-   * Sets the width of an element's four borders. This property can have from one to four values. This is a shorthand property for setting values simultaneously for border-top-width, border-right-width, border-bottom-width, and border-left-width.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/border-width
-   */
-  borderWidth?: CSSValue<CSSLength | CSSPercentage>;
-
-  /**
-   * This property specifies how far an absolutely positioned box's bottom margin edge is offset above the bottom edge of the box's containing block. For relatively positioned boxes, the offset is with respect to the bottom edges of the box itself (i.e., the box is given a position in the normal flow, then offset from that position according to these properties).
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/bottom
-   */
-  bottom?: CSSValue<'auto' | CSSLength | CSSPercentage | CSSGlobalValues>;
-
-  /**
-   * Obsolete.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/box-align
-   */
-  boxAlign?: any;
-
-  /**
-   * Breaks a box into fragments creating new borders, padding and repeating backgrounds or lets it stay as a continuous box on a page break, column break, or, for inline elements, at a line break.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/box-decoration-break
-   */
-  boxDecorationBreak?: any;
-
-  /**
-   * Deprecated
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/box-direction
-   */
-  boxDirection?: any;
-
-  /**
-   * Do not use. This property has been replaced by the flex-wrap property.
-   * Gets or sets a value that specifies the direction to add successive rows or columns when the value of box-lines is set to multiple.
-   */
-  boxLineProgression?: any;
-
-  /**
-   * Do not use. This property has been replaced by the flex-wrap property.
-   * Gets or sets a value that specifies whether child elements wrap onto multiple lines or columns based on the space available in the object.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/box-lines
-   */
-  boxLines?: any;
-
-  /**
-   * Do not use. This property has been replaced by flex-order.
-   * Specifies the ordinal group that a child element of the object belongs to. This ordinal value identifies the display order (along the axis defined by the box-orient property) for the group.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/box-ordinal-group
-   */
-  boxOrdinalGroup?: any;
-
-  /**
-   * Deprecated.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/box-flex
-   */
-  boxFlex?: number;
-
-  /**
-   * box sizing
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/box-sizing
-   */
-  boxSizing?: CSSGlobalValues | 'content-box' | 'border-box';
-  '-moz-box-sizing'?: CSSGlobalValues | 'content-box' | 'border-box';
-  '-webkit-box-sizing'?: CSSGlobalValues | 'content-box' | 'border-box';
-
-  /**
-   * Box shadow
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/box-shadow
-   */
-  boxShadow?: CSSValueGeneral;
-
-  /**
-   * Deprecated.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/box-flex-group
-   */
-  boxFlexGroup?: number;
-
-  /**
-   * The CSS break-after property allows you to force a break on multi-column layouts. More specifically, it allows you to force a break after an element. It allows you to determine if a break should occur, and what type of break it should be. The break-after CSS property describes how the page, column or region break behaves after the generated box. If there is no generated box, the property is ignored.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/break-after
-   */
-  breakAfter?: 'auto' | 'avoid' | 'avoid-page' | 'page' | 'left' | 'right' | 'recto' | 'verso' | 'avoid-column' | 'column' | 'avoid-region' | 'region';
-
-  /**
-   * Control page/column/region breaks that fall above a block of content
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/break-before
-   */
-  breakBefore?: 'auto' | 'avoid' | 'avoid-page' | 'page' | 'left' | 'right' | 'recto' | 'verso' | 'avoid-column' | 'column' | 'avoid-region' | 'region';
-
-  /**
-   * Control page/column/region breaks that fall within a block of content
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/break-inside
-   */
-  breakInside?: 'auto' | 'avoid' | 'avoid-page' | 'avoid-column' | 'avoid-region';
-
-  /**
-   * The caption-side CSS property positions the content of a table's <caption> on the specified side.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/caption-side
-   */
-  captionSide?: CSSGlobalValues | 'top' | 'bottom' | 'block-start' | 'block-end' | 'inline-start' | 'inline-end';
-
-  /**
-   * The clear CSS property specifies if an element can be positioned next to or must be positioned below the floating elements that precede it in the markup.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/clear
-   */
-  clear?: CSSGlobalValues | 'none' | 'left' | 'right' | 'both';
-
-  /**
-   * Deprecated; see clip-path.
-   * Lets you specify the dimensions of an absolutely positioned element that should be visible, and the element is clipped into this shape, and displayed.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/clip
-   */
-  clip?: any;
-
-  /**
-   * Clipping crops an graphic, so that only a portion of the graphic is rendered, or filled. This clip-rule property, when used with the clip-path property, defines which clip rule, or algorithm, to use when filling the different parts of a graphics.
-   * @see https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute/clip-rule
-   */
-  clipRule?: any;
-
-  /**
-   * The color property sets the color of an element's foreground content (usually text), accepting any standard CSS color from keywords and hex values to RGB(a) and HSL(a).
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/color
-   */
-  color?: CSSValue<CSSColor>;
-
-  /**
-   * Describes the number of columns of the element.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/column-count
-   */
-  columnCount?: number;
-
-  /**
-   * Specifies how to fill columns (balanced or sequential).
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/column-fill
-   */
-  columnFill?: any;
-
-  /**
-   * The column-gap property controls the width of the gap between columns in multi-column elements.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/column-gap
-   */
-  columnGap?: any;
-
-  /**
-   * Sets the width, style, and color of the rule between columns.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/column-rule
-   */
-  columnRule?: any;
-
-  /**
-   * Specifies the color of the rule between columns.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/column-rule-color
-   */
-  columnRuleColor?: CSSValue<CSSColor>;
-
-  /**
-   * Specifies the width of the rule between columns.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/column-rule-width
-   */
-  columnRuleWidth?: CSSValue<CSSLength | CSSPercentage>;
-
-  /**
-   * The column-span CSS property makes it possible for an element to span across all columns when its value is set to all. An element that spans more than one column is called a spanning element.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/column-span
-   */
-  columnSpan?: any;
-
-  /**
-   * Specifies the width of columns in multi-column elements.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/column-width
-   */
-  columnWidth?: CSSValue<CSSLength | CSSPercentage>;
-
-  /**
-   * This property is a shorthand property for setting column-width and/or column-count.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/columns
-   */
-  columns?: any;
-
-  /**
-   * The content property is used with the :before and :after pseudo-elements, to insert generated content.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/content
-   */
-  content?: CSSValueString;
-
-  /**
-   * The counter-increment property accepts one or more names of counters (identifiers), each one optionally followed by an integer which specifies the value by which the counter should be incremented (e.g. if the value is 2, the counter increases by 2 each time it is invoked).
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/counter-increment
-   */
-  counterIncrement?: any;
-
-  /**
-   * The counter-reset property contains a list of one or more names of counters, each one optionally followed by an integer (otherwise, the integer defaults to 0.) Each time the given element is invoked, the counters specified by the property are set to the given integer.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/counter-reset
-   */
-  counterReset?: any;
-
-  /**
-   * The cue property specifies sound files (known as an "auditory icon") to be played by speech media agents before and after presenting an element's content; if only one file is specified, it is played both before and after. The volume at which the file(s) should be played, relative to the volume of the main element, may also be specified. The icon files may also be set separately with the cue-before and cue-after properties.
-   */
-  cue?: any;
-
-  /**
-   * The cue-after property specifies a sound file (known as an "auditory icon") to be played by speech media agents after presenting an element's content; the volume at which the file should be played may also be specified. The shorthand property cue sets cue sounds for both before and after the element is presented.
-   */
-  cueAfter?: any;
-
-  /**
-   * Specifies the mouse cursor displayed when the mouse pointer is over an element.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/cursor
-   */
-  cursor?: CSSValue<CSSGlobalValues | string | 'auto' | 'default' | 'none' | 'context-menu' | 'help' | 'pointer' | 'progress' | 'wait' | 'cell' | 'crosshair' | 'text' | 'vertical-text' | 'alias' | 'copy' | 'move' | 'no-drop' | 'not-allowed' | 'e-resize' | 'n-resize' | 'ne-resize' | 'nw-resize' | 's-resize' | 'se-resize' | 'sw-resize' | 'w-resize' | 'ew-resize' | 'ns-resize' | 'nesw-resize' | 'nwse-resize' | 'col-resize' | 'row-resize' | 'all-scroll' | 'zoom-in' | 'zoom-out' | 'grab' | 'grabbing'>;
-
-  /**
-   * The direction CSS property specifies the text direction/writing direction. The rtl is used for Hebrew or Arabic text, the ltr is for other languages.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/direction
-   */
-  direction?: CSSGlobalValues | 'ltr' | 'rtl';
-
-  /**
-   * This property specifies the type of rendering box used for an element. It is a shorthand property for many other display properties.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/display
-   */
-  display?: CSSValue<CSSGlobalValues | CSSDisplay>;
-
-  /**
-   * SVG: Used to determine or re-determine a scaled-baseline-table.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/dominant-baseline
-   */
-  dominantBaseline?: 'auto' | 'use-script' | 'no-change' | 'reset-size' | 'ideographic' | 'alphabetic' | 'hanging' | 'mathematical' | 'central' | 'middle' | 'text-after-edge' | 'text-before-edge' | 'inherit';
-
-  /**
-   * The ‘empty-cells’ CSS property specifies how the user agent should render borders and backgrounds around <table> cells that have no visible content.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/empty-cells
-   */
-  emptyCells?: CSSGlobalValues | 'show' | 'hide';
-
-  /**
-   * The ‘fill’ property paints the interior of the given graphical element. The area to be painted consists of any areas inside the outline of the shape. To determine the inside of the shape, all subpaths are considered, and the interior is determined according to the rules associated with the current value of the ‘fill-rule’ property. The zero-width geometric outline of a shape is included in the area to be painted.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/fill
-   */
-  fill?: CSSColor | 'context-stroke' | 'context-fill';
-
-  /**
-   * SVG: Specifies the opacity of the color or the content the current object is filled with.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/fill-opacity
-   */
-  fillOpacity?: number;
-
-  /**
-   * The ‘fill-rule’ property indicates the algorithm which is to be used to determine what parts of the canvas are included inside the shape. For a simple, non-intersecting path, it is intuitively clear what region lies "inside"; however, for a more complex path, such as a path that intersects itself or where one subpath encloses another, the interpretation of "inside" is not so obvious.
-   * The ‘fill-rule’ property provides two options for how the inside of a shape is determined:
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/fill-rule
-   */
-  fillRule?: 'nonzero' | 'evenodd';
-
-  /**
-   * Applies various image processing effects. This property is largely unsupported. See Compatibility section for more information.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/filter
-   */
-  filter?: string;
-
-  /**
-   * Shorthand for `flex-grow`, `flex-shrink`, and `flex-basis`.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/flex
-   */
-  flex?: number | string;
-  '-webkit-flex'?: number | string;
-  '-ms-flex'?: number | string;
-
-  /**
-   * Obsolete, do not use. This property has been renamed to align-items.
-   * Specifies the alignment (perpendicular to the layout axis defined by the flex-direction property) of child elements of the object.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/flex-align
-   */
-  flexAlign?: any;
-  '-ms-flex-align'?: any;
-  '-webkit-flex-align'?: any;
-
-  /**
-   * The flex-basis CSS property describes the initial main size of the flex item before any free space is distributed according to the flex factors described in the flex property (flex-grow and flex-shrink).
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/flex-basis
-   */
-  flexBasis?: any;
-
-  /**
-   * The flex-direction CSS property describes how flex items are placed in the flex container, by setting the direction of the flex container's main axis.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/flex-direction
-   */
-  flexDirection?: any;
-  '-ms-flex-direction'?: any;
-  '-webkit-flex-direction'?: any;
-
-  /**
-   * The flex-flow CSS property defines the flex container's main and cross axis. It is a shorthand property for the flex-direction and flex-wrap properties.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/flex-flow
-   */
-  flexFlow?: any;
-
-  /**
-   * Specifies the flex grow factor of a flex item.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/flex-grow
-   */
-  flexGrow?: number;
-  '-ms-flex-grow'?: number;
-  '-webkit-flex-grow'?: number;
-
-  /**
-   * Do not use. This property has been renamed to align-self
-   * Specifies the alignment (perpendicular to the layout axis defined by flex-direction) of child elements of the object.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/flex-item-align
-   */
-  flexItemAlign?: any;
-
-  /**
-   * Do not use. This property has been renamed to align-content.
-   * Specifies how a flexbox's lines align within the flexbox when there is extra space along the axis that is perpendicular to the axis defined by the flex-direction property.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/flex-line-pack
-   */
-  flexLinePack?: any;
-
-  flexPositive?: any;
-  '-ms-flex-positive'?: any;
-  '-webkit-flex-positive'?: any;
-
-  flexNegative?: any;
-  '-ms-flex-negative'?: any;
-  '-webkit-flex-negative'?: any;
-
-  /**
-   * Gets or sets a value that specifies the ordinal group that a flexbox element belongs to. This ordinal value identifies the display order for the group.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/flex-order
-   */
-  flexOrder?: any;
-
-  /**
-   * Specifies the flex shrink factor of a flex item.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/flex-shrink
-   */
-  flexShrink?: number;
-  '-ms-flex-shrink'?: number;
-  '-webkit-flex-shrink'?: number;
-
-  /**
-   * Specifies whether flex items are forced into a single line or can be wrapped onto multiple lines.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/flex-wrap
-   */
-  flexWrap?: CSSGlobalValues | 'nowrap' | 'wrap' | 'wrap-reverse';
-  '-ms-flex-wrap'?: CSSGlobalValues | 'nowrap' | 'wrap' | 'wrap-reverse';
-  '-webkit-flex-wrap'?: CSSGlobalValues | 'nowrap' | 'wrap' | 'wrap-reverse';
-
-  /**
-   * Elements which have the style float are floated horizontally. These elements can move as far to the left or right of the containing element. All elements after the floating element will flow around it, but elements before the floating element are not impacted. If several floating elements are placed after each other, they will float next to each other as long as there is room.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/float
-   */
-  float?: CSSGlobalValues | 'left' | 'right' | 'none' | 'inline-start' | 'inline-end';
-
-  /**
-   * Flows content from a named flow (specified by a corresponding flow-into) through selected elements to form a dynamic chain of layout regions.
-   */
-  flowFrom?: any;
-
-  /**
-   * The font property is shorthand that allows you to do one of two things: you can either set up six of the most mature font properties in one line, or you can set one of a choice of keywords to adopt a system font setting.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/font
-   */
-  font?: any;
-
-  /**
-   * The font-family property allows one or more font family names and/or generic family names to be specified for usage on the selected element(s)' text. The browser then goes through the list; for each character in the selection it applies the first font family that has an available glyph for that character.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/font-family
-   */
-  fontFamily?: any;
-
-  /**
-   * The font-kerning property allows contextual adjustment of inter-glyph spacing, i.e. the spaces between the characters in text. This property controls <bold>metric kerning</bold> - that utilizes adjustment data contained in the font. Optical Kerning is not supported as yet.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/font-kerning
-   */
-  fontKerning?: CSSGlobalValues | 'auto' | 'normal' | 'none';
-
-  /**
-   * Specifies the size of the font. Used to compute em and ex units.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/font-size
-   */
-  fontSize?: CSSValue<CSSFontSize>;
-
-  /**
-   * The font-size-adjust property adjusts the font-size of the fallback fonts defined with font-family, so that the x-height is the same no matter what font is used. This preserves the readability of the text when fallback happens.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/font-size-adjust
-   */
-  fontSizeAdjust?: any;
-
-  /**
-   * Allows you to expand or condense the widths for a normal, condensed, or expanded font face.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/font-stretch
-   */
-  fontStretch?: CSSGlobalValues | 'normal' | 'ultra-condensed' | 'extra-condensed' | 'condensed' | 'semi-condensed' | 'semi-expanded' | 'expanded' | 'extra-expanded' | 'ultra-expanded';
-
-  /**
-   * The font-style property allows normal, italic, or oblique faces to be selected. Italic forms are generally cursive in nature while oblique faces are typically sloped versions of the regular face. Oblique faces can be simulated by artificially sloping the glyphs of the regular face.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/font-style
-   */
-  fontStyle?: CSSGlobalValues | 'normal' | 'italic' | 'oblique';
-
-  /**
-   * This value specifies whether the user agent is allowed to synthesize bold or oblique font faces when a font family lacks bold or italic faces.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/font-synthesis
-   */
-  fontSynthesis?: any;
-
-  /**
-   * The font-variant property enables you to select the small-caps font within a font family.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/font-variant
-   */
-  fontVariant?: any;
-
-  /**
-   * Fonts can provide alternate glyphs in addition to default glyph for a character. This property provides control over the selection of these alternate glyphs.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/font-variant-alternates
-   */
-  fontVariantAlternates?: any;
-
-  /**
-   * Specifies the weight or boldness of the font.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/font-weight
-   */
-  fontWeight?: CSSFontWeight;
-
-  /**
-   * Lays out one or more grid items bound by 4 grid lines. Shorthand for setting grid-column-start, grid-column-end, grid-row-start, and grid-row-end in a single declaration.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/grid-area
-   */
-  gridArea?: any;
-
-  /**
-   * Specifies the size of an implicitly-created grid column track.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/grid-auto-columns
-   */
-  gridAutoColumns?: any;
-
-  /**
-   * Controls how the auto-placement algorithm works, specifying exactly how auto-placed items get flowed into the grid.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/grid-auto-flow
-   */
-  gridAutoFlow?: any;
-
-  /**
-   * Specifies the size of an implicitly-created grid row track.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/grid-auto-rows
-   */
-  gridAutoRows?: any;
-
-  /**
-   * Controls a grid item's placement in a grid area, particularly grid position and a grid span. Shorthand for setting grid-column-start and grid-column-end in a single declaration.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/grid-column
-   */
-  gridColumn?: any;
-
-  /**
-   * Specifies the gutter between grid columns.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/grid-column-gap
-   */
-  gridColumnGap?: any;
-
-  /**
-   * Controls a grid item's placement in a grid area as well as grid position and a grid span. The grid-column-end property (with grid-row-start, grid-row-end, and grid-column-start) determines a grid item's placement by specifying the grid lines of a grid item's grid area.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/grid-column-end
-   */
-  gridColumnEnd?: any;
-
-  /**
-   * Determines a grid item's placement by specifying the starting grid lines of a grid item's grid area . A grid item's placement in a grid area consists of a grid position and a grid span. See also ( grid-row-start, grid-row-end, and grid-column-end)
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/grid-column-start
-   */
-  gridColumnStart?: any;
-
-  /**
-   * Specifies the gutters between grid rows and columns, Shorthand for for grid-row-gap and grid-column-gap in a single declaration.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/grid-gap
-   */
-  gridGap?: any;
-
-  /**
-   * Gets or sets a value that indicates which row an element within a Grid should appear in. Shorthand for setting grid-row-start and grid-row-end in a single declaration.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/grid-row
-   */
-  gridRow?: any;
-
-  /**
-   * Determines a grid item’s placement by specifying the block-end. A grid item's placement in a grid area consists of a grid position and a grid span. The grid-row-end property (with grid-row-start, grid-column-start, and grid-column-end) determines a grid item's placement by specifying the grid lines of a grid item's grid area.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/grid-row-end
-   */
-  gridRowEnd?: any;
-
-  /**
-   * Specifies the gutter between grid rows.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/grid-row-gap
-   */
-  gridRowGap?: any;
-
-  /**
-   * Determines a grid item’s start position within the grid row by contributing a line, a span, or nothing (automatic) to its grid placement, thereby specifying the inline-start edge of its grid area.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/grid-row-start
-   */
-  gridRowStart?: any;
-
-  /**
-   * Specifies a row position based upon an integer location, string value, or desired row size.
-   * css/properties/grid-row is used as short-hand for grid-row-position and grid-row-position
-   */
-  gridRowPosition?: any;
-
-  gridRowSpan?: any;
-
-  /**
-   * Is a shorthand property for defining grid columns, rows, and areas.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/grid-template-areas
-   */
-  gridTemplate?: any;
-
-  /**
-   * Specifies named grid areas which are not associated with any particular grid item, but can be referenced from the grid-placement properties. The syntax of the grid-template-areas property also provides a visualization of the structure of the grid, making the overall layout of the grid container easier to understand.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/grid-template-areas
-   */
-  gridTemplateAreas?: any;
-
-  /**
-   * Specifies (with grid-template-rows) the line names and track sizing functions of the grid. Each sizing function can be specified as a length, a percentage of the grid container’s size, a measurement of the contents occupying the column or row, or a fraction of the free space in the grid.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/grid-template-columns
-   */
-  gridTemplateColumns?: any;
-
-  /**
-   * Specifies (with grid-template-columns) the line names and track sizing functions of the grid. Each sizing function can be specified as a length, a percentage of the grid container’s size, a measurement of the contents occupying the column or row, or a fraction of the free space in the grid.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/grid-template-rows
-   */
-  gridTemplateRows?: any;
-
-  /**
-   * Sets the height of an element. The content area of the element height does not include the padding, border, and margin of the element.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/height
-   */
-  height?: CSSValue<'auto' | CSSLength | CSSPercentage | CSSGlobalValues>;
-
-  /**
-   * Specifies the minimum number of characters in a hyphenated word
-   * @see https://msdn.microsoft.com/en-us/library/hh771865(v=vs.85).aspx
-   */
-  hyphenateLimitChars?: any;
-
-  /**
-   * Indicates the maximum number of successive hyphenated lines in an element. The ‘no-limit’ value means that there is no limit.
-   * @see https://msdn.microsoft.com/en-us/library/hh771867(v=vs.85).aspx
-   */
-  hyphenateLimitLines?: any;
-
-  /**
-   * Specifies the maximum amount of trailing whitespace (before justification) that may be left in a line before hyphenation is triggered to pull part of a word from the next line back up into the current one.
-   * @see https://msdn.microsoft.com/en-us/library/hh771869(v=vs.85).aspx
-   */
-  hyphenateLimitZone?: any;
-
-  /**
-   * Specifies whether or not words in a sentence can be split by the use of a manual or automatic hyphenation mechanism.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/hyphens
-   */
-  hyphens?: CSSGlobalValues | string | 'none' | 'manual' | 'auto';
-
-  /**
-   * Controls the state of the input method editor for text fields.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/ime-mode
-   */
-  imeMode?: CSSGlobalValues | 'auto' | 'normal' | 'active' | 'inactive' | 'disabled';
-
-  /**
-   * Defines how the browser distributes space between and around flex items
-   * along the main-axis of their container.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/justify-content
-   */
-  justifyContent?: JustifyContent;
-  '-webkit-justify-content'?: JustifyContent;
-  '-ms-flex-pack'?: string;
-
-  /**
-   * Defines the default justify-self for all items of the box, given them the
-   * default way of justifying each box along the appropriate axis
-   */
-  justifyItems?: JustifyItems;
-
-  /**
-   * Defines the way of justifying a box inside its container along the appropriate axis.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/justify-self
-   */
-  justifySelf?: JustifySelf;
-
-  layoutGrid?: any;
-
-  layoutGridChar?: any;
-
-  layoutGridLine?: any;
-
-  layoutGridMode?: any;
-
-  layoutGridType?: any;
-
-  /**
-   * Sets the left edge of an element
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/left
-   */
-  left?: CSSValue<'auto' | CSSLength | CSSPercentage | CSSGlobalValues>;
-
-  /**
-   * The letter-spacing CSS property specifies the spacing behavior between text characters.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/letter-spacing
-   */
-  letterSpacing?: any;
-
-  /**
-   * Deprecated. Gets or sets line-breaking rules for text in selected languages such as Japanese, Chinese, and Korean.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/line-break
-   */
-  lineBreak?: any;
-
-  lineClamp?: number;
-
-  /**
-   * Specifies the height of an inline block level element.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/line-height
-   */
-  lineHeight?: CSSValue<CSSLength | CSSPercentage>;
-
-  /**
-   * Shorthand property that sets the list-style-type, list-style-position and list-style-image properties in one declaration.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/list-style
-   */
-  listStyle?: any;
-
-  /**
-   * This property sets the image that will be used as the list item marker. When the image is available, it will replace the marker set with the 'list-style-type' marker. That also means that if the image is not available, it will show the style specified by list-style-property
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/list-style-image
-   */
-  listStyleImage?: any;
-
-  /**
-   * Specifies if the list-item markers should appear inside or outside the content flow.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/list-style-position
-   */
-  listStylePosition?: CSSGlobalValues | 'inside' | 'outside';
-
-  /**
-   * Specifies the type of list-item marker in a list.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/list-style-type
-   */
-  listStyleType?: any;
-
-  /**
-   * The margin property is shorthand to allow you to set all four margins of an element at once. Its equivalent longhand properties are margin-top, margin-right, margin-bottom and margin-left. Negative values are also allowed.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/margin
-   */
-  margin?: any;
-
-  /**
-   * margin-bottom sets the bottom margin of an element.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/margin-bottom
-   */
-  marginBottom?: any;
-
-  /**
-   * margin-left sets the left margin of an element.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/margin-left
-   */
-  marginLeft?: any;
-
-  /**
-   * margin-right sets the right margin of an element.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/margin-right
-   */
-  marginRight?: any;
-
-  /**
-   * margin-top sets the top margin of an element.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/margin-top
-   */
-  marginTop?: CSSValueGeneral;
-
-  /**
-   * The marquee-direction determines the initial direction in which the marquee content moves.
-   */
-  marqueeDirection?: any;
-
-  /**
-   * The 'marquee-style' property determines a marquee's scrolling behavior.
-   */
-  marqueeStyle?: any;
-
-  /**
-   * This property is shorthand for setting mask-image, mask-mode, mask-repeat, mask-position, mask-clip, mask-origin, mask-composite and mask-size. Omitted values are set to their original properties' initial values.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/mask
-   */
-  mask?: any;
-
-  /**
-   * This property is shorthand for setting mask-border-source, mask-border-slice, mask-border-width, mask-border-outset, and mask-border-repeat. Omitted values are set to their original properties' initial values.
-   */
-  maskBorder?: any;
-
-  /**
-   * This property specifies how the images for the sides and the middle part of the mask image are scaled and tiled. The first keyword applies to the horizontal sides, the second one applies to the vertical ones. If the second keyword is absent, it is assumed to be the same as the first, similar to the CSS border-image-repeat property.
-   */
-  maskBorderRepeat?: any;
-
-  /**
-   * This property specifies inward offsets from the top, right, bottom, and left edges of the mask image, dividing it into nine regions: four corners, four edges, and a middle. The middle image part is discarded and treated as fully transparent black unless the fill keyword is present. The four values set the top, right, bottom and left offsets in that order, similar to the CSS border-image-slice property.
-   */
-  maskBorderSlice?: any;
-
-  /**
-   * Specifies an image to be used as a mask. An image that is empty, fails to download, is non-existent, or cannot be displayed is ignored and does not mask the element.
-   */
-  maskBorderSource?: any;
-
-  /**
-   * This property sets the width of the mask box image, similar to the CSS border-image-width property.
-   */
-  maskBorderWidth?: CSSValue<CSSLength | CSSPercentage>;
-
-  /**
-   * Determines the mask painting area, which defines the area that is affected by the mask. The painted content of an element may be restricted to this area.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/mask-clip
-   */
-  maskClip?: any;
-
-  /**
-   * For elements rendered as a single box, specifies the mask positioning area. For elements rendered as multiple boxes (e.g., inline boxes on several lines, boxes on several pages) specifies which boxes box-decoration-break operates on to determine the mask positioning area(s).
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/mask-origin
-   */
-  maskOrigin?: any;
-
-  /**
-   * This property must not be used. It is no longer included in any standard or standard track specification, nor is it implemented in any browser. It is only used when the text-align-last property is set to size. It controls allowed adjustments of font-size to fit line content.
-   */
-  maxFontSize?: any;
-
-  /**
-   * Sets the maximum height for an element. It prevents the height of the element to exceed the specified value. If min-height is specified and is greater than max-height, max-height is overridden.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/max-height
-   */
-  maxHeight?: CSSValue<CSSLength | CSSPercentage>;
-
-  /**
-   * Sets the maximum width for an element. It limits the width property to be larger than the value specified in max-width.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/max-width
-   */
-  maxWidth?: CSSValue<CSSLength | CSSPercentage>;
-
-  /**
-   * Sets the minimum height for an element. It prevents the height of the element to be smaller than the specified value. The value of min-height overrides both max-height and height.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/min-height
-   */
-  minHeight?: CSSValue<CSSLength | CSSPercentage>;
-
-  /**
-   * Sets the minimum width of an element. It limits the width property to be not smaller than the value specified in min-width.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/min-width
-   */
-  minWidth?: CSSValue<CSSLength | CSSPercentage>;
-
-  /**
-   * The blend mode defines the formula that must be used to mix the colors with the backdrop
-   * @see https://drafts.fxtf.org/compositing-1/#mix-blend-mode
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/mix-blend-mode
-   */
-  mixBlendMode?: CSSValue<CSSBlendMode>;
-
-  /**
-   * Specifies how the contents of a replaced element should be fitted to the box established by its used height and width.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/object-fit
-   */
-  objectFit?: CSSObjectFit;
-
-  /**
-   * Determines the alignment of the element inside its box.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/object-position
-   */
-  objectPosition?: string | CSSGlobalValues;
-
-  /**
-   * Specifies the transparency of an element.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/opacity
-   */
-  opacity?: number | CSSGlobalValues;
-
-  /**
-   * Specifies the order used to lay out flex items in their flex container.
-   * Elements are laid out in the ascending order of the order value.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/order
-   */
-  order?: number;
-
-  /**
-   * In paged media, this property defines the minimum number of lines in
-   * a block container that must be left at the bottom of the page.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/orphans
-   */
-  orphans?: number;
-
-  /**
-   * The CSS outline property is a shorthand property for setting one or more of the individual outline properties outline-style, outline-width and outline-color in a single rule. In most cases the use of this shortcut is preferable and more convenient.
-   * Outlines differ from borders in the following ways:  •       Outlines do not take up space, they are drawn above the content.
-   *      •       Outlines may be non-rectangular. They are rectangular in Gecko/Firefox. Internet Explorer attempts to place the smallest contiguous outline around all elements or shapes that are indicated to have an outline. Opera draws a non-rectangular shape around a construct.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/outline
-   */
-  outline?: any;
-
-  /**
-   * The outline-color property sets the color of the outline of an element. An outline is a line that is drawn around elements, outside the border edge, to make the element stand out.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/outline-color
-   */
-  outlineColor?: CSSValue<CSSColor>;
-
-  /**
-   * The outline-style property sets the style of the outline of an element.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/outline-style
-   */
-  outlineStyle?: CSSGlobalValues | 'auto' | 'none' | 'dotted' | 'dashed' | 'solid' | 'double' | 'groove' | 'ridge' | 'inset' | 'outset';
-
-  /**
-   * The outline-offset property offsets the outline and draw it beyond the border edge.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/outline-offset
-   */
-  outlineOffset?: any;
-
-  /**
-   * The outline-width CSS property is used to set the width of the outline of an element. An outline is a line that is drawn around elements, outside the border edge, to make the element stand out
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/outline-width
-   */
-  outlineWidth?: CSSGlobalValues | 'thin' | 'medium' | 'thick' | CSSLength;
-
-  /**
-   * The overflow property controls how extra content exceeding the bounding box of an element is rendered. It can be used in conjunction with an element that has a fixed width and height, to eliminate text-induced page distortion.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/overflow
-   */
-  overflow?: CSSValue<CSSOverflow>;
-
-  /**
-   * Specifies the preferred scrolling methods for elements that overflow.
-   */
-  overflowStyle?: any;
-
-  /**
-    * The overflow-wrap CSS property specifies whether or not the browser should insert line breaks within words to prevent
-    * text from overflowing its content box. In contrast to word-break, overflow-wrap will only create a break if an entire
-    * word cannot be placed on its own line without overflowing.
-    * @see https://developer.mozilla.org/en-US/docs/Web/CSS/overflow-wrap
-    */
-  overflowWrap?: CSSGlobalValues | 'normal' | 'break-word';
-
-  /**
-   * Controls how extra content exceeding the x-axis of the bounding box of an element is rendered.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/overflow-x
-   */
-  overflowX?: CSSValue<CSSOverflow>;
-
-  /**
-   * Controls how extra content exceeding the y-axis of the bounding box of an element is rendered.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/overflow-y
-   */
-  overflowY?: CSSValue<CSSOverflow>;
-
-  /**
-   * The padding optional CSS property sets the required padding space on one to four sides of an element. The padding area is the space between an element and its border. Negative values are not allowed but decimal values are permitted. The element size is treated as fixed, and the content of the element shifts toward the center as padding is increased.
-   * The padding property is a shorthand to avoid setting each side separately (padding-top, padding-right, padding-bottom, padding-left).
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/padding
-   */
-  padding?: any;
-
-  /**
-   * The padding-bottom CSS property of an element sets the padding space required on the bottom of an element. The padding area is the space between the content of the element and its border. Contrary to margin-bottom values, negative values of padding-bottom are invalid.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/padding-bottom
-   */
-  paddingBottom?: CSSValue<CSSLength | CSSPercentage>;
-
-  /**
-   * The padding-left CSS property of an element sets the padding space required on the left side of an element. The padding area is the space between the content of the element and its border. Contrary to margin-left values, negative values of padding-left are invalid.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/padding-left
-   */
-  paddingLeft?: CSSValue<CSSLength | CSSPercentage>;
-
-  /**
-   * The padding-right CSS property of an element sets the padding space required on the right side of an element. The padding area is the space between the content of the element and its border. Contrary to margin-right values, negative values of padding-right are invalid.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/padding-right
-   */
-  paddingRight?: CSSValue<CSSLength | CSSPercentage>;
-
-  /**
-   * The padding-top CSS property of an element sets the padding space required on the top of an element. The padding area is the space between the content of the element and its border. Contrary to margin-top values, negative values of padding-top are invalid.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/padding-top
-   */
-  paddingTop?: CSSValue<CSSLength | CSSPercentage>;
-
-  /**
-   * The page-break-after property is supported in all major browsers. With CSS3, page-break-* properties are only aliases of the break-* properties. The CSS3 Fragmentation spec defines breaks for all CSS box fragmentation.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/page-break-after
-   */
-  pageBreakAfter?: CSSGlobalValues | 'auto' | 'always' | 'avoid' | 'left' | 'right' | 'recto' | 'verso';
-
-  /**
-   * The page-break-before property sets the page-breaking behavior before an element. With CSS3, page-break-* properties are only aliases of the break-* properties. The CSS3 Fragmentation spec defines breaks for all CSS box fragmentation.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/page-break-before
-   */
-  pageBreakBefore?: CSSGlobalValues | 'auto' | 'always' | 'avoid' | 'left' | 'right' | 'recto' | 'verso';
-
-  /**
-   * Sets the page-breaking behavior inside an element. With CSS3, page-break-* properties are only aliases of the break-* properties. The CSS3 Fragmentation spec defines breaks for all CSS box fragmentation.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/page-break-inside
-   */
-  pageBreakInside?: CSSGlobalValues | 'auto' | 'avoid';
-
-  /**
-   * The pause property determines how long a speech media agent should pause before and after presenting an element. It is a shorthand for the pause-before and pause-after properties.
-   */
-  pause?: any;
-
-  /**
-   * The pause-after property determines how long a speech media agent should pause after presenting an element. It may be replaced by the shorthand property pause, which sets pause time before and after.
-   */
-  pauseAfter?: any;
-
-  /**
-   * The pause-before property determines how long a speech media agent should pause before presenting an element. It may be replaced by the shorthand property pause, which sets pause time before and after.
-   */
-  pauseBefore?: any;
-
-  /**
-   * The perspective property defines how far an element is placed from the view on the z-axis, from the screen to the viewer.
-   * Perspective defines how an object is viewed. In graphic arts, perspective is the representation on a flat surface of what the viewer's eye would see in a 3D space. (See Wikipedia for more information about graphical perspective and for related illustrations.)
-   * The illusion of perspective on a flat surface, such as a computer screen, is created by projecting points on the flat surface as they would appear if the flat surface were a window through which the viewer was looking at the object. In discussion of virtual environments, this flat surface is called a projection plane.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/perspective
-   */
-  perspective?: any;
-
-  /**
-   * The perspective-origin property establishes the origin for the perspective property. It effectively sets the X and Y position at which the viewer appears to be looking at the children of the element.
-   * When used with perspective, perspective-origin changes the appearance of an object, as if a viewer were looking at it from a different origin. An object appears differently if a viewer is looking directly at it versus looking at it from below, above, or from the side. Thus, the perspective-origin is like a vanishing point.
-   * The default value of perspective-origin is 50% 50%. This displays an object as if the viewer's eye were positioned directly at the center of the screen, both top-to-bottom and left-to-right. A value of 0% 0% changes the object as if the viewer was looking toward the top left angle. A value of 100% 100% changes the appearance as if viewed toward the bottom right angle.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/perspective-origin
-   */
-  perspectiveOrigin?: any;
-
-  /**
-   * The pointer-events property allows you to control whether an element can be the target for the pointing device (e.g, mouse, pen) events.
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/pointer-events
-   */
-  pointerEvents?: CSSGlobalValues | 'auto' | 'none' | 'visiblePainted' | 'visibleFill' | 'visibleStroke' | 'visible' | 'painted' | 'fill' | 'stroke' | 'all';
-
-  /**
-   * The position property controls the type of positioning used by an element within its parent elements. The effect of the position property depends on a lot of factors, for example the position property of parent elements.
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/position
-   */
-  position?: CSSValue<CSSGlobalValues | 'static' | 'relative' | 'absolute' | 'sticky' | '-webkit-sticky' | 'fixed'>;
-
-  /**
-   * Obsolete: unsupported.
-   * This property determines whether or not a full-width punctuation mark character should be trimmed if it appears at the beginning of a line, so that its "ink" lines up with the first glyph in the line above and below.
-   */
-  punctuationTrim?: any;
-
-  /**
-   * Sets the type of quotation marks for embedded quotations.
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/quotes
-   */
-  quotes?: any;
-
-  /**
-   * Controls whether the last region in a chain displays additional 'overset' content according its default overflow property, or if it displays a fragment of content as if it were flowing into a subsequent region.
-   */
-  regionFragment?: any;
-
-  /**
-   * The resize CSS property lets you control the resizability of an element.
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/resize
-   */
-  resize?: CSSGlobalValues | 'none' | 'both ' | 'horizontal' | 'vertical';
-
-  /**
-   * The rest-after property determines how long a speech media agent should pause after presenting an element's main content, before presenting that element's exit cue sound. It may be replaced by the shorthand property rest, which sets rest time before and after.
-   */
-  restAfter?: any;
-
-  /**
-   * The rest-before property determines how long a speech media agent should pause after presenting an intro cue sound for an element, before presenting that element's main content. It may be replaced by the shorthand property rest, which sets rest time before and after.
-   */
-  restBefore?: any;
-
-  /**
-   * Specifies the position an element in relation to the right side of the containing element.
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/right
-   */
-  right?: CSSValue<'auto' | CSSLength | CSSPercentage | CSSGlobalValues>;
-
-  /**
-   * Specifies the distribution of the different ruby elements over the base.
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/ruby-align
-   */
-  rubyAlign?: CSSGlobalValues | 'start' | 'center' | 'space-between' | 'space-around';
-
-  /**
-   * Specifies the position of a ruby element relatives to its base element. It can be position over the element (over), under it (under), or between the characters, on their right side (inter-character).
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/ruby-position
-   */
-  rubyPosition?: CSSGlobalValues | 'over' | 'under' | 'inter-character';
-
-  /**
-   * SVG: For the <ellipse> element, this attribute defines the x-radius of the element. A value of zero disables rendering of the element.
-   * https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute/rx
-   */
-  rx?: number;
-
-  /**
-   * SVG: For the <ellipse> element, this attribute defines the y-radius of the element. A value of zero disables rendering of the element.
-   * https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute/ry
-   */
-  ry?: number;
-
-  /**
-   * Defines the alpha channel threshold used to extract a shape from an image. Can be thought of as a "minimum opacity" threshold; that is, a value of 0.5 means that the shape will enclose all the pixels that are more than 50% opaque.
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/shape-image-threshold
-   */
-  shapeImageThreshold?: any;
-
-  /**
-   * A future level of CSS Shapes will define a shape-inside property, which will define a shape to wrap content within the element. See Editor's Draft <http://dev.w3.org/csswg/css-shapes/> and CSSWG wiki page on next-level plans <http://wiki.csswg.org/spec/css-shapes>
-   */
-  shapeInside?: any;
-
-  /**
-   * Adds a margin to a shape-outside. In effect, defines a new shape that is the smallest contour around all the points that are the shape-margin distance outward perpendicular to each point on the underlying shape. For points where a perpendicular direction is not defined (e.g., a triangle corner), takes all points on a circle centered at the point and with a radius of the shape-margin distance. This property accepts only non-negative values.
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/shape-margin
-   */
-  shapeMargin?: any;
-
-  /**
-   * Declares a shape around which text should be wrapped, with possible modifications from the shape-margin property. The shape defined by shape-outside and shape-margin changes the geometry of a float element's float area.
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/shape-outside
-   */
-  shapeOutside?: any;
-
-  /**
-   * The speak property determines whether or not a speech synthesizer will read aloud the contents of an element.
-   */
-  speak?: any;
-
-  /**
-   * The speak-as property determines how the speech synthesizer interprets the content: words as whole words or as a sequence of letters, numbers as a numerical value or a sequence of digits, punctuation as pauses in speech or named punctuation characters.
-   */
-  speakAs?: any;
-
-  /**
-   * Location of a font-face.  Used with the @font-face at rule
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/src
-   */
-  src?: CSSValueString;
-
-  /**
-   * SVG: Defines the color of the outline on a given graphical element.
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/stroke
-   */
-  stroke?: string;
-
-  /**
-   * SVG: Controls the pattern of dashes and gaps used to stroke paths.
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/stroke-dasharray
-   */
-  strokeDasharray?: number[];
-
-  /**
-   * SVG: Specifies the distance into the dash pattern to start the dash
-   * @see https://developer.mozilla.org/en/docs/Web/SVG/Attribute/stroke-dashoffset
-   */
-  strokeDashoffset?: CSSValue<CSSGlobalValues | CSSLength | CSSPercentage>;
-
-  /**
-   * SVG: Specifies the shape to be used at the end of open subpaths when they are stroked.
-   * @see https://developer.mozilla.org/en/docs/Web/SVG/Attribute/stroke-linecap
-   */
-  strokeLinecap?: CSSGlobalValues | 'butt' | 'round' | 'square';
-
-  /**
-   * SVG: Specifies the opacity of the outline on the current object.
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/stroke-opacity
-   */
-  strokeOpacity?: number;
-
-  /**
-   * SVG: Specifies the width of the outline on the current object.
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/stroke-width
-   */
-  strokeWidth?: CSSValue<CSSLength | CSSPercentage>;
-
-  /**
-   * The tab-size CSS property is used to customise the width of a tab (U+0009) character.
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/tab-size
-   */
-  tabSize?: any;
-
-  /**
-   * The 'table-layout' property controls the algorithm used to lay out the table cells, rows, and columns.
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/table-layout
-   */
-  tableLayout?: any;
-
-  /**
-   * SVG: The text-anchor attribute is used to align (start-, middle- or end-alignment) a string of text relative to a given point.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/text-anchor
-   */
-  textAnchor?: 'start' | 'middle' | 'end' | 'inherit';
-
-  /**
-   * The text-align CSS property describes how inline content like text is aligned in its parent block element. text-align does not control the alignment of block elements itself, only their inline content.
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/text-align
-   */
-  textAlign?: CSSGlobalValues | 'start' | 'end' | 'left' | 'right' | 'center' | 'justify' | 'justify-all' | 'match-parent';
-
-  /**
-   * The text-align-last CSS property describes how the last line of a block element or a line before line break is aligned in its parent block element.
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/text-align-last
-   */
-  textAlignLast?: CSSGlobalValues | 'auto' | 'start' | 'end' | 'left' | 'right' | 'center' | 'justify';
-
-  /**
-   * The text-decoration CSS property is used to set the text formatting to underline, overline, line-through or blink.
-   * underline and overline decorations are positioned under the text, line-through over it.
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/text-decoration
-   */
-  textDecoration?: any;
-
-  /**
-   * Sets the color of any text decoration, such as underlines, overlines, and strike throughs.
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/text-decoration-color
-   */
-  textDecorationColor?: CSSValue<CSSColor>;
-
-  /**
-   * Sets what kind of line decorations are added to an element, such as underlines, overlines, etc.
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/text-decoration-line
-   */
-  textDecorationLine?: any;
-
-  textDecorationLineThrough?: any;
-
-  textDecorationNone?: any;
-
-  textDecorationOverline?: any;
-
-  /**
-   * Specifies what parts of an element’s content are skipped over when applying any text decoration.
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/text-decoration-skip
-   */
-  textDecorationSkip?: any;
-
-  /**
-   * This property specifies the style of the text decoration line drawn on the specified element. The intended meaning for the values are the same as those of the border-style-properties.
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/text-decoration-style
-   */
-  textDecorationStyle?: CSSGlobalValues | 'solid' | 'double' | 'dotted' | 'dashed' | 'wavy';
-
-  textDecorationUnderline?: any;
-
-  /**
-   * The text-emphasis property will apply special emphasis marks to the elements text. Slightly similar to the text-decoration property only that this property can have affect on the line-height. It also is noted that this is shorthand for text-emphasis-style and for text-emphasis-color.
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/text-emphasis
-   */
-  textEmphasis?: any;
-
-  /**
-   * The text-emphasis-color property specifies the foreground color of the emphasis marks.
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/text-emphasis-color
-   */
-  textEmphasisColor?: CSSValue<CSSColor>;
-
-  /**
-   * The text-emphasis-style property applies special emphasis marks to an element's text.
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/text-emphasis-style
-   */
-  textEmphasisStyle?: any;
-
-  /**
-   * This property helps determine an inline box's block-progression dimension, derived from the text-height and font-size properties for non-replaced elements, the height or the width for replaced elements, and the stacked block-progression dimension for inline-block elements. The block-progression dimension determines the position of the padding, border and margin for the element.
-   */
-  textHeight?: CSSValue<CSSLength | CSSPercentage>;
-
-  /**
-   * Specifies the amount of space horizontally that should be left on the first line of the text of an element. This horizontal spacing is at the beginning of the first line and is in respect to the left edge of the containing block box.
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/text-indent
-   */
-  textIndent?: any;
-
-  textJustifyTrim?: any;
-
-  textKashidaSpace?: any;
-
-  /**
-   * The text-line-through property is a shorthand property for text-line-through-style, text-line-through-color and text-line-through-mode. (Considered obsolete; use text-decoration instead.)
-   */
-  textLineThrough?: any;
-
-  /**
-   * Specifies the line colors for the line-through text decoration.
-   * (Considered obsolete; use text-decoration-color instead.)
-   */
-  textLineThroughColor?: CSSValue<CSSColor>;
-
-  /**
-   * Sets the mode for the line-through text decoration, determining whether the text decoration affects the space characters or not.
-   * (Considered obsolete; use text-decoration-skip instead.)
-   */
-  textLineThroughMode?: any;
-
-  /**
-   * Specifies the line style for line-through text decoration.
-   * (Considered obsolete; use text-decoration-style instead.)
-   */
-  textLineThroughStyle?: any;
-
-  /**
-   * Specifies the line width for the line-through text decoration.
-   */
-  textLineThroughWidth?: CSSValue<CSSLength | CSSPercentage>;
-
-  /**
-   * The text-overflow shorthand CSS property determines how overflowed content that is not displayed is signaled to the users. It can be clipped, display an ellipsis ('…', U+2026 HORIZONTAL ELLIPSIS) or a Web author-defined string. It covers the two long-hand properties text-overflow-mode and text-overflow-ellipsis
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/text-overflow
-   */
-  textOverflow?: CSSGlobalValues | 'clip' | 'ellipsis' | string;
-
-  /**
-   * The text-overline property is the shorthand for the text-overline-style, text-overline-width, text-overline-color, and text-overline-mode properties.
-   */
-  textOverline?: any;
-
-  /**
-   * Specifies the line color for the overline text decoration.
-   */
-  textOverlineColor?: CSSValue<CSSColor>;
-
-  /**
-   * Sets the mode for the overline text decoration, determining whether the text decoration affects the space characters or not.
-   */
-  textOverlineMode?: any;
-
-  /**
-   * Specifies the line style for overline text decoration.
-   */
-  textOverlineStyle?: any;
-
-  /**
-   * Specifies the line width for the overline text decoration.
-   */
-  textOverlineWidth?: CSSValue<CSSLength | CSSPercentage>;
-
-  /**
-   * The text-rendering CSS property provides information to the browser about how to optimize when rendering text. Options are: legibility, speed or geometric precision.
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/text-rendering
-   */
-  textRendering?: CSSGlobalValues | 'auto' | 'optimizeSpeed' | 'optimizeLegibility' | 'geometricPrecision';
-
-  /**
-   * Obsolete: unsupported.
-   */
-  textScript?: any;
-
-  /**
-   * The CSS text-shadow property applies one or more drop shadows to the text and <text-decorations> of an element. Each shadow is specified as an offset from the text, along with optional color and blur radius values.
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/text-shadow
-   */
-  textShadow?: any;
-
-  /**
-   * This property transforms text for styling purposes. (It has no effect on the underlying content.)
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/text-transform
-   */
-  textTransform?: CSSGlobalValues | 'none' | 'capitalize' | 'uppercase' | 'lowercase' | 'full-width';
-
-  /**
-   * Unsupported.
-   * This property will add a underline position value to the element that has an underline defined.
-   */
-  textUnderlinePosition?: any;
-
-  /**
-   * After review this should be replaced by text-decoration should it not?
-   * This property will set the underline style for text with a line value for underline, overline, and line-through.
-   */
-  textUnderlineStyle?: any;
-
-  /**
-   * This property specifies how far an absolutely positioned box's top margin edge is offset below the top edge of the box's containing block. For relatively positioned boxes, the offset is with respect to the top edges of the box itself (i.e., the box is given a position in the normal flow, then offset from that position according to these properties).
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/top
-   */
-  top?: CSSValue<'auto' | CSSLength | CSSPercentage | CSSGlobalValues>;
-
-  /**
-   * Determines whether touch input may trigger default behavior supplied by the user agent, such as panning or zooming.
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/touch-action
-   */
-  touchAction?: CSSGlobalValues | 'auto' | 'none' | 'pan-x' | 'pan-left' | 'pan-right' | 'pan-y' | 'pan-up' | 'pan-down' | 'manipulation';
-
-  /**
-   * CSS transforms allow elements styled with CSS to be transformed in two-dimensional or three-dimensional space. Using this property, elements can be translated, rotated, scaled, and skewed. The value list may consist of 2D and/or 3D transform values.
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/transform
-   */
-  transform?: CSSTransformFunction;
-
-  /**
-   * This property defines the origin of the transformation axes relative to the element to which the transformation is applied.
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/transform-origin
-   */
-  transformOrigin?: any;
-
-  /**
-   * This property allows you to define the relative position of the origin of the transformation grid along the z-axis.
-   */
-  transformOriginZ?: any;
-
-  /**
-   * This property specifies how nested elements are rendered in 3D space relative to their parent.
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/transform-style
-   */
-  transformStyle?: CSSGlobalValues | 'flat' | 'preserve-3d';
-
-  /**
-   * The transition CSS property is a shorthand property for transition-property, transition-duration, transition-timing-function, and transition-delay. It allows to define the transition between two states of an element.
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/transition
-   */
-  transition?: any;
-
-  /**
-   * Defines when the transition will start. A value of ‘0s’ means the transition will execute as soon as the property is changed. Otherwise, the value specifies an offset from the moment the property is changed, and the transition will delay execution by that offset.
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/transition-delay
-   */
-  transitionDelay?: any;
-
-  /**
-   * The 'transition-duration' property specifies the length of time a transition animation takes to complete.
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/transition-duration
-   */
-  transitionDuration?: any;
-
-  /**
-   * The 'transition-property' property specifies the name of the CSS property to which the transition is applied.
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/transition-property
-   */
-  transitionProperty?: CSSValueString;
-
-  /**
-   * Sets the pace of action within a transition
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/transition-timing-function
-   */
-  transitionTimingFunction?: CSSTimingFunction;
-
-  /**
-   * The unicode-bidi CSS property specifies the level of embedding with respect to the bidirectional algorithm.
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/unicode-bidi
-   */
-  unicodeBidi?: any;
-
-  /**
-   * unicode-range allows you to set a specific range of characters to be downloaded from a font (embedded using @font-face) and made available for use on the current page.
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/unicode-range
-   */
-  unicodeRange?: any;
-
-  /**
-   * This is for all the high level UX stuff.
-   */
-  userFocus?: any;
-
-  /**
-   * For inputing user content
-   */
-  userInput?: any;
-
-  /**
-   * User select
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/user-select
-   */
-  userSelect?: 'auto' | 'text' | 'none' | 'contain' | 'all';
-  '-moz-user-select'?: 'auto' | 'text' | 'none' | 'contain' | 'all';
-  '-webkit-user-select'?: 'auto' | 'text' | 'none' | 'contain' | 'all';
-  '-ms-user-select'?: 'auto' | 'text' | 'none' | 'contain' | 'all';
-
-  /**
-   * The vertical-align property controls how inline elements or text are vertically aligned compared to the baseline. If this property is used on table-cells it controls the vertical alignment of content of the table cell.
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/vertical-align
-   */
-  verticalAlign?: CSSGlobalValues | 'baseline' | 'sub' | 'super' | 'text-top' | 'text-bottom' | 'middle' | 'top' | 'bottom' | CSSLength | CSSPercentage;
-
-  /**
-   * The visibility property specifies whether the boxes generated by an element are rendered.
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/visibility
-   */
-  visibility?: CSSGlobalValues | 'visible' | 'hidden' | 'collapse';
-
-  /**
-   * The voice-balance property sets the apparent position (in stereo sound) of the synthesized voice for spoken media.
-   */
-  voiceBalance?: any;
-
-  /**
-   * The voice-duration property allows the author to explicitly set the amount of time it should take a speech synthesizer to read an element's content, for example to allow the speech to be synchronized with other media. With a value of auto (the default) the length of time it takes to read the content is determined by the content itself and the voice-rate property.
-   */
-  voiceDuration?: any;
-
-  /**
-   * The voice-family property sets the speaker's voice used by a speech media agent to read an element. The speaker may be specified as a named character (to match a voice option in the speech reading software) or as a generic description of the age and gender of the voice. Similar to the font-family property for visual media, a comma-separated list of fallback options may be given in case the speech reader does not recognize the character name or cannot synthesize the requested combination of generic properties.
-   */
-  voiceFamily?: any;
-
-  /**
-   * The voice-pitch property sets pitch or tone (high or low) for the synthesized speech when reading an element; the pitch may be specified absolutely or relative to the normal pitch for the voice-family used to read the text.
-   */
-  voicePitch?: any;
-
-  /**
-   * The voice-range property determines how much variation in pitch or tone will be created by the speech synthesize when reading an element. Emphasized text, grammatical structures and punctuation may all be rendered as changes in pitch, this property determines how strong or obvious those changes are; large ranges are associated with enthusiastic or emotional speech, while small ranges are associated with flat or mechanical speech.
-   */
-  voiceRange?: any;
-
-  /**
-   * The voice-rate property sets the speed at which the voice synthesized by a speech media agent will read content.
-   */
-  voiceRate?: any;
-
-  /**
-   * The voice-stress property sets the level of vocal emphasis to be used for synthesized speech reading the element.
-   */
-  voiceStress?: any;
-
-  /**
-   * The voice-volume property sets the volume for spoken content in speech media. It replaces the deprecated volume property.
-   */
-  voiceVolume?: any;
-
-  /**
-   * The white-space property controls whether and how white space inside the element is collapsed, and whether lines may wrap at unforced "soft wrap" opportunities.
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/white-space
-   */
-  whiteSpace?: CSSGlobalValues | 'normal' | 'nowrap' | 'pre' | 'pre-line' | 'pre-wrap';
-
-  /**
-   * Obsolete: unsupported.
-   */
-  whiteSpaceTreatment?: any;
-
-  /**
-   * In paged media, this property defines the mimimum number of lines
-   * that must be left at the top of the second page.
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/widows
-   */
-  widows?: number;
-
-  /**
-   * Specifies the width of the content area of an element. The content area of the element width does not include the padding, border, and margin of the element.
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/width
-   */
-  width?: CSSValue<'auto' | CSSLength | CSSPercentage | CSSGlobalValues>;
-
-  /**
-   * The ‘will-change’ CSS property provides a way for authors to hint browsers about the kind of changes to be expected on an element, so that the browser can set up appropriate optimizations ahead of time before the element is actually changed. These kind of optimizations can increase the responsiveness of a page by doing potentially expensive work ahead of time before they are actually required.
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/will-change
-   */
-  willChange?: CSSValue<'auto' | 'scroll-position' | 'contents' | CSSValueString>;
-
-  /**
-   * The word-break property is often used when there is long generated content that is strung together without and spaces or hyphens to beak apart. A common case of this is when there is a long URL that does not have any hyphens. This case could potentially cause the breaking of the layout as it could extend past the parent element.
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/word-break
-   */
-  wordBreak?: CSSGlobalValues | 'normal' | 'break-all' | 'keep-all';
-
-  /**
-   * The word-spacing CSS property specifies the spacing behavior between "words".
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/word-spacing
-   */
-  wordSpacing?: CSSGlobalValues | 'normal' | CSSLength | CSSPercentage;
-
-  /**
-   * An alias of css/properties/overflow-wrap, word-wrap defines whether to break words when the content exceeds the boundaries of its container.
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/word-wrap
-   */
-  wordWrap?: CSSGlobalValues | 'normal' | 'break-word';
-
-  /**
-   * Specifies how exclusions affect inline content within block-level elements. Elements lay out their inline content in their content area but wrap around exclusion areas.
-   */
-  wrapFlow?: any;
-
-  /**
-   * Set the value that is used to offset the inner wrap shape from other shapes. Inline content that intersects a shape with this property will be pushed by this shape's margin.
-   */
-  wrapMargin?: any;
-
-  /**
-   * Obsolete and unsupported. Do not use.
-   * This CSS property controls the text when it reaches the end of the block in which it is enclosed.
-   */
-  wrapOption?: any;
-
-  /**
-   * writing-mode specifies if lines of text are laid out horizontally or vertically, and the direction which lines of text and blocks progress.
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/writing-mode
-   */
-  writingMode?: CSSGlobalValues | 'horizontal-tb' | 'vertical-rl' | 'vertical-lr' | 'sideways-rl' | 'sideways-lr';
-
-  /**
-   * The z-index property specifies the z-order of an element and its descendants.
-   * When elements overlap, z-order determines which one covers the other.
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/z-index
-   */
-  zIndex?: CSSGlobalValues | 'auto' | number;
-
-  /**
-   * Sets the initial zoom factor of a document defined by @viewport.
-   * @see https://developer.mozilla.org/en/docs/Web/CSS/zoom
-   */
-  zoom?: 'auto' | number;
-
-  // VENDOR prefixes
-  // non-authoritative source: http://peter.sh/experiments/vendor-prefixed-css-property-overview/
-  '-apple-trailing-word'?: CSSValueGeneral;
-  '-epub-caption-side'?: CSSValueGeneral;
-  '-epub-hyphens'?: CSSValueGeneral;
-  '-epub-text-combine'?: CSSValueGeneral;
-  '-epub-text-emphasis'?: CSSValueGeneral;
-  '-epub-text-emphasis-color'?: CSSValueGeneral;
-  '-epub-text-emphasis-style'?: CSSValueGeneral;
-  '-epub-text-orientation'?: CSSValueGeneral;
-  '-epub-text-transform'?: CSSValueGeneral;
-  '-epub-word-break'?: CSSValueGeneral;
-  '-epub-writing-mode'?: CSSValueGeneral;
-  '-internal-marquee-direction'?: CSSValueGeneral;
-  '-internal-marquee-increment'?: CSSValueGeneral;
-  '-internal-marquee-repetition'?: CSSValueGeneral;
-  '-internal-marquee-speed'?: CSSValueGeneral;
-  '-internal-marquee-style'?: CSSValueGeneral;
-  '-moz-appearance'?: CSSValueGeneral;
-  '-moz-binding'?: CSSValueGeneral;
-  '-moz-border-bottom-colors'?: CSSValueGeneral;
-  '-moz-border-end'?: CSSValueGeneral;
-  '-moz-border-end-color'?: CSSValueGeneral;
-  '-moz-border-end-style'?: CSSValueGeneral;
-  '-moz-border-end-width'?: CSSValueGeneral;
-  '-moz-border-left-colors'?: CSSValueGeneral;
-  '-moz-border-right-colors'?: CSSValueGeneral;
-  '-moz-border-start'?: CSSValueGeneral;
-  '-moz-border-start-color'?: CSSValueGeneral;
-  '-moz-border-start-style'?: CSSValueGeneral;
-  '-moz-border-start-width'?: CSSValueGeneral;
-  '-moz-border-top-colors'?: CSSValueGeneral;
-  '-moz-box-align'?: CSSValueGeneral;
-  '-moz-box-direction'?: CSSValueGeneral;
-  '-moz-box-flex'?: CSSValueGeneral;
-  '-moz-box-ordinal-group'?: CSSValueGeneral;
-  '-moz-box-orient'?: CSSValueGeneral;
-  '-moz-box-pack'?: CSSValueGeneral;
-  '-moz-column-count'?: CSSValueGeneral;
-  '-moz-column-fill'?: CSSValueGeneral;
-  '-moz-column-gap'?: CSSValueGeneral;
-  '-moz-column-rule'?: CSSValueGeneral;
-  '-moz-column-rule-color'?: CSSValueGeneral;
-  '-moz-column-rule-style'?: CSSValueGeneral;
-  '-moz-column-rule-width'?: CSSValueGeneral;
-  '-moz-column-width'?: CSSValueGeneral;
-  '-moz-columns'?: CSSValueGeneral;
-  '-moz-control-character-visibility'?: CSSValueGeneral;
-  '-moz-float-edge'?: CSSValueGeneral;
-  '-moz-force-broken-image-icon'?: CSSValueGeneral;
-  '-moz-hyphens'?: CSSValueGeneral;
-  '-moz-image-region'?: CSSValueGeneral;
-  '-moz-margin-end'?: CSSValueGeneral;
-  '-moz-margin-start'?: CSSValueGeneral;
-  '-moz-math-display'?: CSSValueGeneral;
-  '-moz-math-variant'?: CSSValueGeneral;
-  '-moz-min-font-size-ratio'?: CSSValueGeneral;
-  '-moz-orient'?: CSSValueGeneral;
-  '-moz-osx-font-smoothing'?: CSSValueGeneral;
-  '-moz-outline-radius'?: CSSValueGeneral;
-  '-moz-outline-radius-bottomleft'?: CSSValueGeneral;
-  '-moz-outline-radius-bottomright'?: CSSValueGeneral;
-  '-moz-outline-radius-topleft'?: CSSValueGeneral;
-  '-moz-outline-radius-topright'?: CSSValueGeneral;
-  '-moz-padding-end'?: CSSValueGeneral;
-  '-moz-padding-start'?: CSSValueGeneral;
-  '-moz-script-level'?: CSSValueGeneral;
-  '-moz-script-min-size'?: CSSValueGeneral;
-  '-moz-script-size-multiplier'?: CSSValueGeneral;
-  '-moz-stack-sizing'?: CSSValueGeneral;
-  '-moz-tab-size'?: CSSValueGeneral;
-  '-moz-text-align-last'?: CSSValueGeneral;
-  '-moz-text-decoration-color'?: CSSValueGeneral;
-  '-moz-text-decoration-line'?: CSSValueGeneral;
-  '-moz-text-decoration-style'?: CSSValueGeneral;
-  '-moz-text-size-adjust'?: CSSValueGeneral;
-  '-moz-top-layer'?: CSSValueGeneral;
-  '-moz-transform'?: CSSValueGeneral;
-  '-moz-user-focus'?: CSSValueGeneral;
-  '-moz-user-input'?: CSSValueGeneral;
-  '-moz-user-modify'?: CSSValueGeneral;
-  '-moz-window-dragging'?: CSSValueGeneral;
-  '-moz-window-shadow'?: CSSValueGeneral;
-  '-ms-accelerator'?: CSSValueGeneral;
-  '-ms-animation'?: CSSValueGeneral;
-  '-ms-animation-delay'?: CSSValueGeneral;
-  '-ms-animation-direction'?: CSSValueGeneral;
-  '-ms-animation-duration'?: CSSValueGeneral;
-  '-ms-animation-fill-mode'?: CSSValueGeneral;
-  '-ms-animation-iteration-count'?: CSSValueGeneral;
-  '-ms-animation-name'?: CSSValueGeneral;
-  '-ms-animation-play-state'?: CSSValueGeneral;
-  '-ms-animation-timing-function'?: CSSValueGeneral;
-  '-ms-backface-visibility'?: CSSValueGeneral;
-  '-ms-background-position-x'?: CSSValueGeneral;
-  '-ms-background-position-y'?: CSSValueGeneral;
-  '-ms-behavior'?: CSSValueGeneral;
-  '-ms-block-progression'?: CSSValueGeneral;
-  '-ms-content-zoom-chaining'?: CSSValueGeneral;
-  '-ms-content-zoom-limit'?: CSSValueGeneral;
-  '-ms-content-zoom-limit-max'?: CSSValueGeneral;
-  '-ms-content-zoom-limit-min'?: CSSValueGeneral;
-  '-ms-content-zoom-snap'?: CSSValueGeneral;
-  '-ms-content-zoom-snap-points'?: CSSValueGeneral;
-  '-ms-content-zoom-snap-type'?: CSSValueGeneral;
-  '-ms-content-zooming'?: CSSValueGeneral;
-  '-ms-filter'?: CSSValueGeneral;
-  '-ms-flex-flow'?: CSSValueGeneral;
-  '-ms-flex-line-pack'?: CSSValueGeneral;
-  '-ms-flex-order'?: CSSValueGeneral;
-  '-ms-flex-preferred-size'?: CSSValueGeneral;
-  '-ms-flow-from'?: CSSValueGeneral;
-  '-ms-flow-into'?: CSSValueGeneral;
-  '-ms-font-feature-settings'?: CSSValueGeneral;
-  '-ms-grid-column'?: CSSValueGeneral;
-  '-ms-grid-column-align'?: CSSValueGeneral;
-  '-ms-grid-column-span'?: CSSValueGeneral;
-  '-ms-grid-columns'?: CSSValueGeneral;
-  '-ms-grid-row'?: CSSValueGeneral;
-  '-ms-grid-row-align'?: CSSValueGeneral;
-  '-ms-grid-row-span'?: CSSValueGeneral;
-  '-ms-grid-rows'?: CSSValueGeneral;
-  '-ms-high-contrast-adjust'?: CSSValueGeneral;
-  '-ms-hyphenate-limit-chars'?: CSSValueGeneral;
-  '-ms-hyphenate-limit-lines'?: CSSValueGeneral;
-  '-ms-hyphenate-limit-zone'?: CSSValueGeneral;
-  '-ms-hyphens'?: CSSValueGeneral;
-  '-ms-ime-align'?: CSSValueGeneral;
-  '-ms-ime-mode'?: CSSValueGeneral;
-  '-ms-interpolation-mode'?: CSSValueGeneral;
-  '-ms-layout-flow'?: CSSValueGeneral;
-  '-ms-layout-grid'?: CSSValueGeneral;
-  '-ms-layout-grid-char'?: CSSValueGeneral;
-  '-ms-layout-grid-line'?: CSSValueGeneral;
-  '-ms-layout-grid-mode'?: CSSValueGeneral;
-  '-ms-layout-grid-type'?: CSSValueGeneral;
-  '-ms-line-break'?: CSSValueGeneral;
-  '-ms-overflow-style'?: CSSValueGeneral;
-  '-ms-overflow-x'?: CSSValueGeneral;
-  '-ms-overflow-y'?: CSSValueGeneral;
-  '-ms-perspective'?: CSSValueGeneral;
-  '-ms-perspective-origin'?: CSSValueGeneral;
-  '-ms-perspective-origin-x'?: CSSValueGeneral;
-  '-ms-perspective-origin-y'?: CSSValueGeneral;
-  '-ms-scroll-chaining'?: CSSValueGeneral;
-  '-ms-scroll-limit'?: CSSValueGeneral;
-  '-ms-scroll-limit-x-max'?: CSSValueGeneral;
-  '-ms-scroll-limit-x-min'?: CSSValueGeneral;
-  '-ms-scroll-limit-y-max'?: CSSValueGeneral;
-  '-ms-scroll-limit-y-min'?: CSSValueGeneral;
-  '-ms-scroll-rails'?: CSSValueGeneral;
-  '-ms-scroll-snap-points-x'?: CSSValueGeneral;
-  '-ms-scroll-snap-points-y'?: CSSValueGeneral;
-  '-ms-scroll-snap-type'?: CSSValueGeneral;
-  '-ms-scroll-snap-x'?: CSSValueGeneral;
-  '-ms-scroll-snap-y'?: CSSValueGeneral;
-  '-ms-scroll-translation'?: CSSValueGeneral;
-  '-ms-scrollbar-3dlight-color'?: CSSValueGeneral;
-  '-ms-scrollbar-arrow-color'?: CSSValueGeneral;
-  '-ms-scrollbar-base-color'?: CSSValueGeneral;
-  '-ms-scrollbar-darkshadow-color'?: CSSValueGeneral;
-  '-ms-scrollbar-face-color'?: CSSValueGeneral;
-  '-ms-scrollbar-highlight-color'?: CSSValueGeneral;
-  '-ms-scrollbar-shadow-color'?: CSSValueGeneral;
-  '-ms-scrollbar-track-color'?: CSSValueGeneral;
-  '-ms-text-align-last'?: CSSValueGeneral;
-  '-ms-text-autospace'?: CSSValueGeneral;
-  '-ms-text-combine-horizontal'?: CSSValueGeneral;
-  '-ms-text-justify'?: CSSValueGeneral;
-  '-ms-text-kashida-space'?: CSSValueGeneral;
-  '-ms-text-overflow'?: CSSValueGeneral;
-  '-ms-text-size-adjust'?: CSSValueGeneral;
-  '-ms-text-underline-position'?: CSSValueGeneral;
-  '-ms-touch-action'?: CSSValueGeneral;
-  '-ms-touch-select'?: CSSValueGeneral;
-  '-ms-transform'?: CSSValueGeneral;
-  '-ms-transform-origin'?: CSSValueGeneral;
-  '-ms-transform-origin-x'?: CSSValueGeneral;
-  '-ms-transform-origin-y'?: CSSValueGeneral;
-  '-ms-transform-origin-z'?: CSSValueGeneral;
-  '-ms-transform-style'?: CSSValueGeneral;
-  '-ms-transition'?: CSSValueGeneral;
-  '-ms-transition-delay'?: CSSValueGeneral;
-  '-ms-transition-duration'?: CSSValueGeneral;
-  '-ms-transition-property'?: CSSValueGeneral;
-  '-ms-transition-timing-function'?: CSSValueGeneral;
-  '-ms-word-break'?: CSSValueGeneral;
-  '-ms-word-wrap'?: CSSValueGeneral;
-  '-ms-wrap-flow'?: CSSValueGeneral;
-  '-ms-wrap-margin'?: CSSValueGeneral;
-  '-ms-wrap-through'?: CSSValueGeneral;
-  '-ms-writing-mode'?: CSSValueGeneral;
-  '-ms-zoom'?: CSSValueGeneral;
-  '-webkit-align-content'?: CSSValueGeneral;
-  '-webkit-alt'?: CSSValueGeneral;
-  '-webkit-animation'?: CSSValueGeneral;
-  '-webkit-animation-delay'?: CSSValueGeneral;
-  '-webkit-animation-direction'?: CSSValueGeneral;
-  '-webkit-animation-duration'?: CSSValueGeneral;
-  '-webkit-animation-fill-mode'?: CSSValueGeneral;
-  '-webkit-animation-iteration-count'?: CSSValueGeneral;
-  '-webkit-animation-name'?: CSSValueGeneral;
-  '-webkit-animation-play-state'?: CSSValueGeneral;
-  '-webkit-animation-timing-function'?: CSSValueGeneral;
-  '-webkit-animation-trigger'?: CSSValueGeneral;
-  '-webkit-app-region'?: CSSValueGeneral;
-  '-webkit-appearance'?: CSSValueGeneral;
-  '-webkit-aspect-ratio'?: CSSValueGeneral;
-  '-webkit-backdrop-filter'?: CSSValueGeneral;
-  '-webkit-backface-visibility'?: CSSValueGeneral;
-  '-webkit-background-clip'?: CSSValueGeneral;
-  '-webkit-background-composite'?: CSSValueGeneral;
-  '-webkit-background-origin'?: CSSValueGeneral;
-  '-webkit-background-size'?: CSSValueGeneral;
-  '-webkit-border-after'?: CSSValueGeneral;
-  '-webkit-border-after-color'?: CSSValueGeneral;
-  '-webkit-border-after-style'?: CSSValueGeneral;
-  '-webkit-border-after-width'?: CSSValueGeneral;
-  '-webkit-border-before'?: CSSValueGeneral;
-  '-webkit-border-before-color'?: CSSValueGeneral;
-  '-webkit-border-before-style'?: CSSValueGeneral;
-  '-webkit-border-before-width'?: CSSValueGeneral;
-  '-webkit-border-bottom-left-radius'?: CSSValueGeneral;
-  '-webkit-border-bottom-right-radius'?: CSSValueGeneral;
-  '-webkit-border-end'?: CSSValueGeneral;
-  '-webkit-border-end-color'?: CSSValueGeneral;
-  '-webkit-border-end-style'?: CSSValueGeneral;
-  '-webkit-border-end-width'?: CSSValueGeneral;
-  '-webkit-border-fit'?: CSSValueGeneral;
-  '-webkit-border-horizontal-spacing'?: CSSValueGeneral;
-  '-webkit-border-image'?: CSSValueGeneral;
-  '-webkit-border-radius'?: CSSValueGeneral;
-  '-webkit-border-start'?: CSSValueGeneral;
-  '-webkit-border-start-color'?: CSSValueGeneral;
-  '-webkit-border-start-style'?: CSSValueGeneral;
-  '-webkit-border-start-width'?: CSSValueGeneral;
-  '-webkit-border-top-left-radius'?: CSSValueGeneral;
-  '-webkit-border-top-right-radius'?: CSSValueGeneral;
-  '-webkit-border-vertical-spacing'?: CSSValueGeneral;
-  '-webkit-box-align'?: CSSValueGeneral;
-  '-webkit-box-decoration-break'?: CSSValueGeneral;
-  '-webkit-box-direction'?: CSSValueGeneral;
-  '-webkit-box-flex'?: CSSValueGeneral;
-  '-webkit-box-flex-group'?: CSSValueGeneral;
-  '-webkit-box-lines'?: CSSValueGeneral;
-  '-webkit-box-ordinal-group'?: CSSValueGeneral;
-  '-webkit-box-orient'?: CSSValueGeneral;
-  '-webkit-box-pack'?: CSSValueGeneral;
-  '-webkit-box-reflect'?: CSSValueGeneral;
-  '-webkit-box-shadow'?: CSSValueGeneral;
-  '-webkit-clip-path'?: CSSValueGeneral;
-  '-webkit-color-correction'?: CSSValueGeneral;
-  '-webkit-column-axis'?: CSSValueGeneral;
-  '-webkit-column-break-after'?: CSSValueGeneral;
-  '-webkit-column-break-before'?: CSSValueGeneral;
-  '-webkit-column-break-inside'?: CSSValueGeneral;
-  '-webkit-column-count'?: CSSValueGeneral;
-  '-webkit-column-fill'?: CSSValueGeneral;
-  '-webkit-column-gap'?: CSSValueGeneral;
-  '-webkit-column-progression'?: CSSValueGeneral;
-  '-webkit-column-rule'?: CSSValueGeneral;
-  '-webkit-column-rule-color'?: CSSValueGeneral;
-  '-webkit-column-rule-style'?: CSSValueGeneral;
-  '-webkit-column-rule-width'?: CSSValueGeneral;
-  '-webkit-column-span'?: CSSValueGeneral;
-  '-webkit-column-width'?: CSSValueGeneral;
-  '-webkit-columns'?: CSSValueGeneral;
-  '-webkit-cursor-visibility'?: CSSValueGeneral;
-  '-webkit-dashboard-region'?: CSSValueGeneral;
-  '-webkit-filter'?: CSSValueGeneral;
-  '-webkit-flex-basis'?: CSSValueGeneral;
-  '-webkit-flex-flow'?: CSSValueGeneral;
-  '-webkit-flow-from'?: CSSValueGeneral;
-  '-webkit-flow-into'?: CSSValueGeneral;
-  '-webkit-font-feature-settings'?: CSSValueGeneral;
-  '-webkit-font-kerning'?: CSSValueGeneral;
-  '-webkit-font-size-delta'?: CSSValueGeneral;
-  '-webkit-font-smoothing'?: CSSValueGeneral;
-  '-webkit-font-variant-ligatures'?: CSSValueGeneral;
-  '-webkit-grid'?: CSSValueGeneral;
-  '-webkit-grid-area'?: CSSValueGeneral;
-  '-webkit-grid-auto-columns'?: CSSValueGeneral;
-  '-webkit-grid-auto-flow'?: CSSValueGeneral;
-  '-webkit-grid-auto-rows'?: CSSValueGeneral;
-  '-webkit-grid-column'?: CSSValueGeneral;
-  '-webkit-grid-column-end'?: CSSValueGeneral;
-  '-webkit-grid-column-gap'?: CSSValueGeneral;
-  '-webkit-grid-column-start'?: CSSValueGeneral;
-  '-webkit-grid-gap'?: CSSValueGeneral;
-  '-webkit-grid-row'?: CSSValueGeneral;
-  '-webkit-grid-row-end'?: CSSValueGeneral;
-  '-webkit-grid-row-gap'?: CSSValueGeneral;
-  '-webkit-grid-row-start'?: CSSValueGeneral;
-  '-webkit-grid-template'?: CSSValueGeneral;
-  '-webkit-grid-template-areas'?: CSSValueGeneral;
-  '-webkit-grid-template-columns'?: CSSValueGeneral;
-  '-webkit-grid-template-rows'?: CSSValueGeneral;
-  '-webkit-highlight'?: CSSValueGeneral;
-  '-webkit-hyphenate-character'?: CSSValueGeneral;
-  '-webkit-hyphenate-limit-after'?: CSSValueGeneral;
-  '-webkit-hyphenate-limit-before'?: CSSValueGeneral;
-  '-webkit-hyphenate-limit-lines'?: CSSValueGeneral;
-  '-webkit-hyphens'?: CSSValueGeneral;
-  '-webkit-initial-letter'?: CSSValueGeneral;
-  '-webkit-justify-items'?: CSSValueGeneral;
-  '-webkit-justify-self'?: CSSValueGeneral;
-  '-webkit-line-align'?: CSSValueGeneral;
-  '-webkit-line-box-contain'?: CSSValueGeneral;
-  '-webkit-line-break'?: CSSValueGeneral;
-  '-webkit-line-clamp'?: CSSValueGeneral;
-  '-webkit-line-grid'?: CSSValueGeneral;
-  '-webkit-line-snap'?: CSSValueGeneral;
-  '-webkit-locale'?: CSSValueGeneral;
-  '-webkit-logical-height'?: CSSValueGeneral;
-  '-webkit-logical-width'?: CSSValueGeneral;
-  '-webkit-margin-after'?: CSSValueGeneral;
-  '-webkit-margin-after-collapse'?: CSSValueGeneral;
-  '-webkit-margin-before'?: CSSValueGeneral;
-  '-webkit-margin-before-collapse'?: CSSValueGeneral;
-  '-webkit-margin-bottom-collapse'?: CSSValueGeneral;
-  '-webkit-margin-collapse'?: CSSValueGeneral;
-  '-webkit-margin-end'?: CSSValueGeneral;
-  '-webkit-margin-start'?: CSSValueGeneral;
-  '-webkit-margin-top-collapse'?: CSSValueGeneral;
-  '-webkit-marquee'?: CSSValueGeneral;
-  '-webkit-marquee-direction'?: CSSValueGeneral;
-  '-webkit-marquee-increment'?: CSSValueGeneral;
-  '-webkit-marquee-repetition'?: CSSValueGeneral;
-  '-webkit-marquee-speed'?: CSSValueGeneral;
-  '-webkit-marquee-style'?: CSSValueGeneral;
-  '-webkit-mask'?: CSSValueGeneral;
-  '-webkit-mask-box-image'?: CSSValueGeneral;
-  '-webkit-mask-box-image-outset'?: CSSValueGeneral;
-  '-webkit-mask-box-image-repeat'?: CSSValueGeneral;
-  '-webkit-mask-box-image-slice'?: CSSValueGeneral;
-  '-webkit-mask-box-image-source'?: CSSValueGeneral;
-  '-webkit-mask-box-image-width'?: CSSValueGeneral;
-  '-webkit-mask-clip'?: CSSValueGeneral;
-  '-webkit-mask-composite'?: CSSValueGeneral;
-  '-webkit-mask-image'?: CSSValueGeneral;
-  '-webkit-mask-origin'?: CSSValueGeneral;
-  '-webkit-mask-position'?: CSSValueGeneral;
-  '-webkit-mask-position-x'?: CSSValueGeneral;
-  '-webkit-mask-position-y'?: CSSValueGeneral;
-  '-webkit-mask-repeat'?: CSSValueGeneral;
-  '-webkit-mask-repeat-x'?: CSSValueGeneral;
-  '-webkit-mask-repeat-y'?: CSSValueGeneral;
-  '-webkit-mask-size'?: CSSValueGeneral;
-  '-webkit-mask-source-type'?: CSSValueGeneral;
-  '-webkit-max-logical-height'?: CSSValueGeneral;
-  '-webkit-max-logical-width'?: CSSValueGeneral;
-  '-webkit-min-logical-height'?: CSSValueGeneral;
-  '-webkit-min-logical-width'?: CSSValueGeneral;
-  '-webkit-nbsp-mode'?: CSSValueGeneral;
-  '-webkit-opacity'?: CSSValueGeneral;
-  '-webkit-order'?: CSSValueGeneral;
-  '-webkit-padding-after'?: CSSValueGeneral;
-  '-webkit-padding-before'?: CSSValueGeneral;
-  '-webkit-padding-end'?: CSSValueGeneral;
-  '-webkit-padding-start'?: CSSValueGeneral;
-  '-webkit-perspective'?: CSSValueGeneral;
-  '-webkit-perspective-origin'?: CSSValueGeneral;
-  '-webkit-perspective-origin-x'?: CSSValueGeneral;
-  '-webkit-perspective-origin-y'?: CSSValueGeneral;
-  '-webkit-print-color-adjust'?: CSSValueGeneral;
-  '-webkit-region-break-after'?: CSSValueGeneral;
-  '-webkit-region-break-before'?: CSSValueGeneral;
-  '-webkit-region-break-inside'?: CSSValueGeneral;
-  '-webkit-region-fragment'?: CSSValueGeneral;
-  '-webkit-rtl-ordering'?: CSSValueGeneral;
-  '-webkit-ruby-position'?: CSSValueGeneral;
-  '-webkit-scroll-snap-coordinate'?: CSSValueGeneral;
-  '-webkit-scroll-snap-destination'?: CSSValueGeneral;
-  '-webkit-scroll-snap-points-x'?: CSSValueGeneral;
-  '-webkit-scroll-snap-points-y'?: CSSValueGeneral;
-  '-webkit-scroll-snap-type'?: CSSValueGeneral;
-  '-webkit-shape-image-threshold'?: CSSValueGeneral;
-  '-webkit-shape-margin'?: CSSValueGeneral;
-  '-webkit-shape-outside'?: CSSValueGeneral;
-  '-webkit-svg-shadow'?: CSSValueGeneral;
-  '-webkit-tap-highlight-color'?: CSSValueGeneral;
-  '-webkit-text-align-last'?: CSSValueGeneral;
-  '-webkit-text-combine'?: CSSValueGeneral;
-  '-webkit-text-decoration'?: CSSValueGeneral;
-  '-webkit-text-decoration-color'?: CSSValueGeneral;
-  '-webkit-text-decoration-line'?: CSSValueGeneral;
-  '-webkit-text-decoration-skip'?: CSSValueGeneral;
-  '-webkit-text-decoration-style'?: CSSValueGeneral;
-  '-webkit-text-decorations-in-effect'?: CSSValueGeneral;
-  '-webkit-text-emphasis'?: CSSValueGeneral;
-  '-webkit-text-emphasis-color'?: CSSValueGeneral;
-  '-webkit-text-emphasis-position'?: CSSValueGeneral;
-  '-webkit-text-emphasis-style'?: CSSValueGeneral;
-  '-webkit-text-fill-color'?: CSSValueGeneral;
-  '-webkit-text-justify'?: CSSValueGeneral;
-  '-webkit-text-orientation'?: CSSValueGeneral;
-  '-webkit-text-security'?: CSSValueGeneral;
-  '-webkit-text-size-adjust'?: CSSValueGeneral;
-  '-webkit-text-stroke'?: CSSValueGeneral;
-  '-webkit-text-stroke-color'?: CSSValueGeneral;
-  '-webkit-text-stroke-width'?: CSSValueGeneral;
-  '-webkit-text-underline-position'?: CSSValueGeneral;
-  '-webkit-text-zoom'?: CSSValueGeneral;
-  '-webkit-touch-callout'?: CSSValueGeneral;
-  '-webkit-transform'?: CSSValueGeneral;
-  '-webkit-transform-origin'?: CSSValueGeneral;
-  '-webkit-transform-origin-x'?: CSSValueGeneral;
-  '-webkit-transform-origin-y'?: CSSValueGeneral;
-  '-webkit-transform-origin-z'?: CSSValueGeneral;
-  '-webkit-transform-style'?: CSSValueGeneral;
-  '-webkit-transition'?: CSSValueGeneral;
-  '-webkit-transition-delay'?: CSSValueGeneral;
-  '-webkit-transition-duration'?: CSSValueGeneral;
-  '-webkit-transition-property'?: CSSValueGeneral;
-  '-webkit-transition-timing-function'?: CSSValueGeneral;
-  '-webkit-user-drag'?: CSSValueGeneral;
-  '-webkit-user-modify'?: CSSValueGeneral;
-  '-webkit-writing-mode'?: CSSValueGeneral;
+export type CSSProperties = {
+  [K in keyof csstype.Properties]: CSSValue<SimpleProperties[K]>
 }
 
-
-export type PseudoCssKey =
-	| ':active'
-	| ':any'
-	| ':checked'
-	| ':default'
-	| ':disabled'
-	| ':empty'
-	| ':enabled'
-	| ':first'
-	| ':first-child'
-	| ':first-of-type'
-	| ':fullscreen'
-	| ':focus'
-	| ':hover'
-	| ':indeterminate'
-	| ':in-range'
-	| ':invalid'
-	| ':last-child'
-	| ':last-of-type'
-	| ':left'
-	| ':link'
-	| ':only-child'
-	| ':only-of-type'
-	| ':optional'
-	| ':out-of-range'
-	| ':read-only'
-	| ':read-write'
-	| ':required'
-	| ':right'
-	| ':root'
-	| ':scope'
-	| ':target'
-	| ':valid'
-	| ':visited'
-	// TODO
-	// | ':dir()'
-	// | ':lang()'
-	// | ':not()'
-	// | ':nth-child()'
-	// | ':nth-last-child()'
-	// | ':nth-last-of-type()'
-	// | ':nth-of-type()'
-	| '::after'
-	| '::before'
-	| '::cue'
-	| '::first-letter'
-	| '::first-line'
-	| '::selection'
-	| '::backdrop '
-	| '::placeholder '
-	| '::marker '
-	| '::spelling-error '
-	| '::grammar-error ';
-
-export type PseudoCss = Partial<Record<PseudoCssKey, CSSProperties>>;
-
 export interface JssProps {
-	'@global'?: CSSProperties & PseudoCss;
+	'@global'?: CSSProperties;
 	extend?: string;
 	composes?: string | string[];
 }
@@ -2876,5 +161,5 @@ export interface JssExpand {
 
 export type JssExpandArr = { [k in keyof JssExpand]?: JssExpand[k] | Array<JssExpand[k]> };
 
-export type SimpleStyle = CSSProperties & PseudoCss & JssProps & JssExpandArr;
+export type SimpleStyle = CSSProperties & JssProps & JssExpandArr;
 export type Style = Observable<SimpleStyle> | SimpleStyle;
diff --git a/types/jss/package.json b/types/jss/package.json
new file mode 100644
index 0000000000..448ec0ab3f
--- /dev/null
+++ b/types/jss/package.json
@@ -0,0 +1,6 @@
+{
+  "private": true,
+  "dependencies": {
+    "csstype": "^1.5.0"
+  }
+}

From 53952c7f36ad40bc38bd4ef35bc58b70e0c89820 Mon Sep 17 00:00:00 2001
From: Tom Crockett <pelotom@gmail.com>
Date: Mon, 12 Feb 2018 09:24:31 -0800
Subject: [PATCH 0238/1382] Upgrade csstype, remove hacks

---
 types/jss/css.d.ts     | 41 +----------------------------------------
 types/jss/jss-tests.ts |  2 +-
 2 files changed, 2 insertions(+), 41 deletions(-)

diff --git a/types/jss/css.d.ts b/types/jss/css.d.ts
index fb886a6a61..125571309d 100644
--- a/types/jss/css.d.ts
+++ b/types/jss/css.d.ts
@@ -3,47 +3,8 @@
 import { Observable } from './observable'
 import * as csstype from 'csstype'
 
-/**
- * Value of a CSS Property.  Could be a single value or a list of fallbacks
- * NOTE: array is for fallbacks
- */
-export type CSSValue<T> = T | Observable<T>;
-
-/**
- * Remove the variants of the second union of string literals from
- * the first.
- */
-export type Diff<T extends string, U extends string> = (
-  & { [P in T]: P }
-  & { [P in U]: never }
-  & { [x: string]: never }
-)[T];
-
-/**
- * Drop keys `K` from `T`.
- */
-export type Omit<T, K extends keyof T> = Pick<T, Diff<keyof T, K>>;
-
-export interface SimpleProperties extends Omit<
-  csstype.Properties<number>,
-  'display' | 'width' | 'height'
-> {
-  // https://github.com/frenic/csstype/issues/7
-  width: number | string;
-  height: number | string;
-  // https://github.com/frenic/csstype/issues/8
-  display:
-    | csstype.All
-    | csstype.DisplayOutside
-    | csstype.DisplayInside
-    | csstype.DisplayInternal
-    | csstype.DisplayBox
-    | csstype.DisplayLegacy
-    ;
-}
-
 export type CSSProperties = {
-  [K in keyof csstype.Properties]: CSSValue<SimpleProperties[K]>
+  [K in keyof csstype.Properties]: csstype.Properties[K] | Observable<csstype.Properties[K]>
 }
 
 export interface JssProps {
diff --git a/types/jss/jss-tests.ts b/types/jss/jss-tests.ts
index 06e4ab2eb6..28db02b91b 100644
--- a/types/jss/jss-tests.ts
+++ b/types/jss/jss-tests.ts
@@ -65,7 +65,7 @@ styleSheet.addRule('badProperty', {
 });
 
 styleSheet.addRule('badValue', { // $ExpectError
-	display: 'thisIsNotAValidDisplayValue',
+	alignItems: 'thisIsNotAValidValue',
 });
 
 styleSheet.detach();

From 310a20441b46d9405113cf2e6499f9fe86b64478 Mon Sep 17 00:00:00 2001
From: Tom Crockett <pelotom@gmail.com>
Date: Mon, 12 Feb 2018 09:41:26 -0800
Subject: [PATCH 0239/1382] Allow kebab case anywhere, and allow only kebab
 case in observables

---
 types/jss/css.d.ts     | 10 +++++++---
 types/jss/jss-tests.ts |  7 ++++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/types/jss/css.d.ts b/types/jss/css.d.ts
index 125571309d..06a9c620cf 100644
--- a/types/jss/css.d.ts
+++ b/types/jss/css.d.ts
@@ -3,10 +3,14 @@
 import { Observable } from './observable'
 import * as csstype from 'csstype'
 
-export type CSSProperties = {
-  [K in keyof csstype.Properties]: csstype.Properties[K] | Observable<csstype.Properties[K]>
+export type ObservableProperties<P> = {
+  [K in keyof P]: P[K] | Observable<P[K]>
 }
 
+export type CSSProperties =
+	& ObservableProperties<csstype.Properties>
+	& ObservableProperties<csstype.PropertiesHyphen>;
+
 export interface JssProps {
 	'@global'?: CSSProperties;
 	extend?: string;
@@ -123,4 +127,4 @@ export interface JssExpand {
 export type JssExpandArr = { [k in keyof JssExpand]?: JssExpand[k] | Array<JssExpand[k]> };
 
 export type SimpleStyle = CSSProperties & JssProps & JssExpandArr;
-export type Style = Observable<SimpleStyle> | SimpleStyle;
+export type Style = SimpleStyle | Observable<csstype.PropertiesHyphen>;
diff --git a/types/jss/jss-tests.ts b/types/jss/jss-tests.ts
index 28db02b91b..8e53780988 100644
--- a/types/jss/jss-tests.ts
+++ b/types/jss/jss-tests.ts
@@ -14,6 +14,10 @@ const styleSheet = jss.createStyleSheet<string>(
 				const next = typeof observer === 'function' ? observer : observer.next;
 				next({ background: 'blue', display: 'flex' });
 				next({ invalidKey: 'blueish' }); // $ExpectError
+
+				// only kebab case allowed in observables
+				next({ 'align-items': 'center' });
+				next({ alignItems: 'center' }); // $ExpectError
 				return {
 					unsubscribe() {}
 				};
@@ -21,6 +25,7 @@ const styleSheet = jss.createStyleSheet<string>(
 		},
 		container: {
 			display: 'flex',
+			'align-items': 'center',
 			width: 100,
 			opacity: .5,
 		},
@@ -65,7 +70,7 @@ styleSheet.addRule('badProperty', {
 });
 
 styleSheet.addRule('badValue', { // $ExpectError
-	alignItems: 'thisIsNotAValidValue',
+	'align-items': 'thisIsNotAValidValue',
 });
 
 styleSheet.detach();

From 3d625ea5b689b29092fc9cb35ac52132b2a1a8b3 Mon Sep 17 00:00:00 2001
From: Tom Crockett <pelotom@gmail.com>
Date: Mon, 12 Feb 2018 09:44:36 -0800
Subject: [PATCH 0240/1382] Require at least csstype 1.6

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

diff --git a/types/jss/package.json b/types/jss/package.json
index 448ec0ab3f..201f7e2d14 100644
--- a/types/jss/package.json
+++ b/types/jss/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
   "dependencies": {
-    "csstype": "^1.5.0"
+    "csstype": "^1.6.0"
   }
 }

From aac52dbc24f74f55a6e24a187255ff4e5f42a41c Mon Sep 17 00:00:00 2001
From: Dan Torberg <dan.torberg@caspeco.se>
Date: Wed, 28 Feb 2018 08:18:39 +0100
Subject: [PATCH 0241/1382] Update index.d.ts

Added missing properties 'data' and 'name' to interface ScatterProps
---
 types/recharts/index.d.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/types/recharts/index.d.ts b/types/recharts/index.d.ts
index 5de42776b9..dd2a262384 100644
--- a/types/recharts/index.d.ts
+++ b/types/recharts/index.d.ts
@@ -5,6 +5,7 @@
 //                 Roy Xue <https://github.com/royxue>
 //                 Zheyang Song <https://github.com/ZheyangSong>
 //                 Rich Baird <https://github.com/richbai90>
+//                 Dan Torberg <https://github.com/caspeco-dan>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -719,6 +720,8 @@ export interface ScatterProps extends EventAttributes, Partial<PresentationAttri
     shape?: 'circle' | 'cross' | 'diamond' | 'square' | 'star' | 'triangle' | 'wye' | React.ReactElement<any> | ContentRenderer<any>;
     points?: ScatterPoint[];
     hide?: boolean;
+    data?: object[];
+    name?: string | number;
 }
 
 export class Scatter extends React.Component<ScatterProps> { }

From 0fed82625bf97dcab56c42a3144809596c998a96 Mon Sep 17 00:00:00 2001
From: Dan Torberg <dan.torberg@caspeco.se>
Date: Wed, 28 Feb 2018 11:09:34 +0100
Subject: [PATCH 0242/1382] Added scatter chart entry to tests file.

---
 types/recharts/recharts-tests.tsx | 93 ++++++++++++++++++-------------
 1 file changed, 54 insertions(+), 39 deletions(-)

diff --git a/types/recharts/recharts-tests.tsx b/types/recharts/recharts-tests.tsx
index e052d692a5..39bcf69c89 100644
--- a/types/recharts/recharts-tests.tsx
+++ b/types/recharts/recharts-tests.tsx
@@ -4,7 +4,8 @@ import * as ReactDOM from 'react-dom';
 import {
     CartesianGrid, Line, LineChart, PieChart, Pie,
     Sector, XAxis, YAxis, Tooltip, ReferenceLine,
-    ReferenceArea, ResponsiveContainer, Label, Brush
+    ReferenceArea, ResponsiveContainer, Label, Brush,
+    ScatterChart, ZAxis, Legend, Scatter
 } from 'recharts';
 
 interface ComponentState {
@@ -86,44 +87,58 @@ class Component extends React.Component<{}, ComponentState> {
             );
         };
         return (
-            <ResponsiveContainer>
-                <LineChart width={500} height={300} data={data}>
-                    <XAxis dataKey="name">
-                        <Label>X axis - name</Label>
-                    </XAxis>
-                    <YAxis>
-                        <Label>Y axis</Label>
-                    </YAxis>
-                    <CartesianGrid stroke="#eee" strokeDasharray="5 5" />
-                    <Line type="monotone" dataKey="uv" stroke="#8884d8" onClick={ this.clickHandler } />
-                    <Line type="monotone" dataKey="pv" stroke="#82ca9d" />
-                    <Tooltip />
-                    <Brush dataKey="name" />
-                    <ReferenceLine />
-                    <ReferenceArea
-                        stroke="red"
-                        fill="red"
-                        y2={1}
-                        strokeOpacity={0.2}
-                        fillOpacity={0.1}
-                    />
-                </LineChart>
-                <PieChart width={800} height={400}>
-                    <Pie
-                        dataKey="value"
-                        activeIndex={this.state.activeIndex}
-                        activeShape={renderActiveShape}
-                        data={data}
-                        cx={300}
-                        cy={200}
-                        innerRadius={60}
-                        outerRadius={80}
-                        fill="#8884d8"
-                    >
-                        <Label>A Pie Chart</Label>
-                    </Pie>
-                </PieChart>
-            </ResponsiveContainer>
+            <div style={{width: "100%", height: "100%"}}>
+                <ResponsiveContainer>
+                    <LineChart width={500} height={300} data={data}>
+                        <XAxis dataKey="name">
+                            <Label>X axis - name</Label>
+                        </XAxis>
+                        <YAxis>
+                            <Label>Y axis</Label>
+                        </YAxis>
+                        <CartesianGrid stroke="#eee" strokeDasharray="5 5" />
+                        <Line type="monotone" dataKey="uv" stroke="#8884d8" onClick={ this.clickHandler } />
+                        <Line type="monotone" dataKey="pv" stroke="#82ca9d" />
+                        <Tooltip />
+                        <Brush dataKey="name" />
+                        <ReferenceLine />
+                        <ReferenceArea
+                            stroke="red"
+                            fill="red"
+                            y2={1}
+                            strokeOpacity={0.2}
+                            fillOpacity={0.1}
+                        />
+                    </LineChart>
+                </ResponsiveContainer>
+                <ResponsiveContainer>
+                    <PieChart width={800} height={400}>
+                        <Pie
+                            dataKey="value"
+                            activeIndex={this.state.activeIndex}
+                            activeShape={renderActiveShape}
+                            data={data}
+                            cx={300}
+                            cy={200}
+                            innerRadius={60}
+                            outerRadius={80}
+                            fill="#8884d8"
+                        >
+                            <Label>A Pie Chart</Label>
+                        </Pie>
+                    </PieChart>
+                </ResponsiveContainer>
+                <ResponsiveContainer>
+                    <ScatterChart width={500} height={300}>
+                        <XAxis type="number" dataKey="uv" name="stature" unit="cm" />
+                        <YAxis dataKey="pv" name="weight" unit="kg" />
+                        <ZAxis dataKey="amt" range={[64, 144]} name="score" unit="km" />
+                        <Tooltip cursor={{ strokeDasharray: "3 3" }} />
+                        <Legend />
+                        <Scatter name="A school" data={data} fill="#8884d8" />
+                    </ScatterChart>
+                </ResponsiveContainer>
+            </div>
         );
     }
 }

From 858289bfccaed5dedb9d6025805eb8e398b82e4a Mon Sep 17 00:00:00 2001
From: Fredrik Nicol <fredrik.nicol@gmail.com>
Date: Mon, 5 Mar 2018 08:40:11 +0100
Subject: [PATCH 0243/1382] Add generic argument to csstype interfaces

---
 types/jss/css.d.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/types/jss/css.d.ts b/types/jss/css.d.ts
index 06a9c620cf..3f01be6a62 100644
--- a/types/jss/css.d.ts
+++ b/types/jss/css.d.ts
@@ -8,8 +8,8 @@ export type ObservableProperties<P> = {
 }
 
 export type CSSProperties =
-	& ObservableProperties<csstype.Properties>
-	& ObservableProperties<csstype.PropertiesHyphen>;
+	& ObservableProperties<csstype.Properties<string | number>>
+	& ObservableProperties<csstype.PropertiesHyphen<string | number>>;
 
 export interface JssProps {
 	'@global'?: CSSProperties;
@@ -127,4 +127,4 @@ export interface JssExpand {
 export type JssExpandArr = { [k in keyof JssExpand]?: JssExpand[k] | Array<JssExpand[k]> };
 
 export type SimpleStyle = CSSProperties & JssProps & JssExpandArr;
-export type Style = SimpleStyle | Observable<csstype.PropertiesHyphen>;
+export type Style = SimpleStyle | Observable<csstype.PropertiesHyphen<string | number>>;

From 578ce030e0a57abad1dfb6e1c7e2143d00817422 Mon Sep 17 00:00:00 2001
From: Dusan Radovanovic <dusan.radovanovic@elasticpath.com>
Date: Mon, 5 Mar 2018 00:55:16 -0800
Subject: [PATCH 0244/1382] Exported Listr types through namespace

---
 types/listr/index.d.ts     | 56 ++++++++++++++++++++------------------
 types/listr/listr-tests.ts | 18 ++++++++++--
 2 files changed, 45 insertions(+), 29 deletions(-)

diff --git a/types/listr/index.d.ts b/types/listr/index.d.ts
index c9eb6c78f1..303c1d4a07 100644
--- a/types/listr/index.d.ts
+++ b/types/listr/index.d.ts
@@ -7,39 +7,41 @@
 
 import * as stream from "stream";
 
-interface ListrRenderer {
-    nonTTY: boolean;
-    render(): void;
-    end(): void;
-}
+declare namespace Listr {
+    interface ListrRenderer {
+        nonTTY: boolean;
+        render(): void;
+        end(): void;
+    }
 
-interface ListrOptions {
-    concurrent?: boolean | number;
-    exitOnError?: boolean;
-    renderer?: "silent" | "default" | "verbose" | ListrRenderer;
-    nonTTYRenderer?: "silent" | "default" | "verbose" | ListrRenderer;
-}
+    interface ListrOptions {
+        concurrent?: boolean | number;
+        exitOnError?: boolean;
+        renderer?: "silent" | "default" | "verbose" | ListrRenderer;
+        nonTTYRenderer?: "silent" | "default" | "verbose" | ListrRenderer;
+    }
 
-interface ListrTask {
-    title: string;
-    output?: string;
-    task: (ctx: any, task: ListrTaskWrapper) => void | string | Promise<any> | stream.Readable | Listr;
-    skip?: (ctx: any, task: ListrTaskWrapper) => boolean | Promise<boolean> | string | void;
-    enabled?: (ctx: any, task: ListrTaskWrapper) => boolean | Promise<boolean>;
-}
+    interface ListrTask {
+        title: string;
+        output?: string;
+        task: (ctx: any, task: ListrTaskWrapper) => void | string | Promise<any> | stream.Readable | Listr;
+        skip?: (ctx: any, task: ListrTaskWrapper) => boolean | Promise<boolean> | string | void;
+        enabled?: (ctx: any, task: ListrTaskWrapper) => boolean | Promise<boolean>;
+    }
 
-interface ListrTaskWrapper {
-    title: string;
-    output: any;
-    report(error: Error): void;
-    skip(message: string): void;
-    run(ctx?: any): Promise<any>;
+    interface ListrTaskWrapper {
+        title: string;
+        output: any;
+        report(error: Error): void;
+        skip(message: string): void;
+        run(ctx?: any): Promise<any>;
+    }
 }
 
 declare class Listr {
-    constructor(tasks?: ReadonlyArray<ListrTask>, options?: ListrOptions);
-    constructor(options?: ListrOptions);
-    add(tasks: ListrTask | ReadonlyArray<ListrTask>): void;
+    constructor(tasks?: ReadonlyArray<Listr.ListrTask>, options?: Listr.ListrOptions);
+    constructor(options?: Listr.ListrOptions);
+    add(tasks: Listr.ListrTask | ReadonlyArray<Listr.ListrTask>): void;
     run(ctx?: any): Promise<any>;
 }
 
diff --git a/types/listr/listr-tests.ts b/types/listr/listr-tests.ts
index a8db1a4216..68b80360f8 100644
--- a/types/listr/listr-tests.ts
+++ b/types/listr/listr-tests.ts
@@ -1,4 +1,4 @@
-import Listr = require("listr");
+import * as Listr from "listr";
 import * as fs from "fs";
 
 const tasks = new Listr([
@@ -55,7 +55,7 @@ const tasks = new Listr([
 tasks.run().catch(err => {
 });
 
-const tasks2 = new Listr([
+const tasks21 = new Listr([
     {
         title: 'Success',
         task: () => 'Foo'
@@ -68,6 +68,20 @@ const tasks2 = new Listr([
     }
 ]);
 
+const taskA: Listr.ListrTask = {
+    title: 'Success',
+    task: () => 'Foo'
+};
+
+const taskB: Listr.ListrTask = {
+    title: 'Failure',
+    task: () => {
+        throw new Error('Bar');
+    }
+};
+
+const tasks22 = new Listr([taskA, taskB]);
+
 const tasks3 = new Listr([
     {
         title: 'Success',

From 7331a33996300d5643ebcb6b0cf6a94bcabb4248 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20=C3=96llinger?= <markus.oellinger@unycom.com>
Date: Mon, 5 Mar 2018 10:16:30 +0100
Subject: [PATCH 0245/1382] add generic types for Options with async support
 for react-virtualized-select

---
 types/react-virtualized-select/index.d.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/types/react-virtualized-select/index.d.ts b/types/react-virtualized-select/index.d.ts
index d3cec048cb..ab496a0213 100644
--- a/types/react-virtualized-select/index.d.ts
+++ b/types/react-virtualized-select/index.d.ts
@@ -5,7 +5,7 @@
 // TypeScript Version: 2.3
 
 import * as React from "react";
-import { ReactSelectProps } from "react-select";
+import { ReactAsyncSelectProps, OptionValues } from "react-select";
 import { ListProps } from "react-virtualized";
 
 export interface VirtualizedOptionRenderOptions<T> {
@@ -26,10 +26,10 @@ export interface VirtualizedOptionRenderOptions<T> {
  * Dummy interface to allow `VirtualizedSelectProps` to have an `optionRenderer` type
  * incompatible with the one in `ReactSelectProps`.
  */
-interface VirtualizedSelectPropsBase extends ReactSelectProps {
+interface VirtualizedSelectPropsBase<TValue = OptionValues> extends ReactAsyncSelectProps<TValue> {
     optionRenderer?: any;
 }
-export interface VirtualizedSelectProps extends VirtualizedSelectPropsBase {
+export interface VirtualizedSelectProps<TValue = OptionValues> extends VirtualizedSelectPropsBase<TValue> {
     async?: boolean;
     maxHeight?: number;
     optionHeight?: number;
@@ -37,5 +37,5 @@ export interface VirtualizedSelectProps extends VirtualizedSelectPropsBase {
     selectComponent?: React.ComponentClass<any> | React.StatelessComponent<any>;
 }
 
-declare class VirtualizedSelect extends React.PureComponent<VirtualizedSelectProps> {}
+declare class VirtualizedSelect<TValue = OptionValues> extends React.PureComponent<VirtualizedSelectProps<TValue>> {}
 export default VirtualizedSelect;

From 9ad2aeb4fb983595d6e8c2538ef187c7349fd328 Mon Sep 17 00:00:00 2001
From: Piotr Roszatycki <piotr.roszatycki@gmail.com>
Date: Mon, 5 Mar 2018 10:29:28 +0100
Subject: [PATCH 0246/1382] Compatibility with TypeScript < 2.7

---
 types/csv2json/csv2json-tests.ts |  2 +-
 types/csv2json/index.d.ts        | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/types/csv2json/csv2json-tests.ts b/types/csv2json/csv2json-tests.ts
index 9e4e6cbdd3..b211fd9aee 100644
--- a/types/csv2json/csv2json-tests.ts
+++ b/types/csv2json/csv2json-tests.ts
@@ -1,4 +1,4 @@
-import csv2json from "csv2json";
+import csv2json = require("csv2json");
 import fs = require("fs");
 
 fs.createReadStream('data.csv')
diff --git a/types/csv2json/index.d.ts b/types/csv2json/index.d.ts
index 713f4a05bc..6906d3e925 100644
--- a/types/csv2json/index.d.ts
+++ b/types/csv2json/index.d.ts
@@ -7,9 +7,13 @@
 
 import { Writable } from "stream";
 
-export interface CSV2JSONOptions {
-  dynamicTyping?: boolean;
-  separator?: string;
+declare namespace csv2json {
+  interface Options {
+    dynamicTyping?: boolean;
+    separator?: string;
+  }
 }
 
-export default function csv2json(options: CSV2JSONOptions): Writable;
+declare function csv2json(options?: csv2json.Options): Writable;
+
+export = csv2json;

From e637f7eb201019b12f9afc83c99f4a60338c18e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sami=20M=C3=A4ki?= <sami.maki@cybercom.com>
Date: Mon, 5 Mar 2018 11:36:46 +0200
Subject: [PATCH 0247/1382] Update navs props and examples.

Updated and checked components: Nav, NavItem, NavLink.
---
 types/reactstrap/lib/Nav.d.ts         | 9 +++++----
 types/reactstrap/lib/NavItem.d.ts     | 1 +
 types/reactstrap/reactstrap-tests.tsx | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/types/reactstrap/lib/Nav.d.ts b/types/reactstrap/lib/Nav.d.ts
index c29c9a6460..d96ab6e5d6 100644
--- a/types/reactstrap/lib/Nav.d.ts
+++ b/types/reactstrap/lib/Nav.d.ts
@@ -1,16 +1,17 @@
 import { CSSModule } from '../index';
 
 export interface NavProps extends React.HTMLProps<HTMLUListElement> {
-  inline?: boolean;
-  disabled?: boolean;
   tabs?: boolean;
   pills?: boolean;
-  stacked?: boolean;
+  vertical?: boolean | string;
+  horizontal?: string;
+  justified?: boolean;
+  fill?: boolean;
   navbar?: boolean;
+  card?: boolean;
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-  vertical?: boolean;
 }
 
 declare const Nav: React.StatelessComponent<NavProps>;
diff --git a/types/reactstrap/lib/NavItem.d.ts b/types/reactstrap/lib/NavItem.d.ts
index 6d5e0dd9cb..e42e4c8e5e 100644
--- a/types/reactstrap/lib/NavItem.d.ts
+++ b/types/reactstrap/lib/NavItem.d.ts
@@ -2,6 +2,7 @@ import { CSSModule } from '../index';
 
 export interface NavItemProps extends React.HTMLAttributes<HTMLElement> {
   tag?: React.ReactType;
+  active?: boolean;
   className?: string;
   cssModule?: CSSModule;
 }
diff --git a/types/reactstrap/reactstrap-tests.tsx b/types/reactstrap/reactstrap-tests.tsx
index 756d3acbd0..3e93ecb5bc 100644
--- a/types/reactstrap/reactstrap-tests.tsx
+++ b/types/reactstrap/reactstrap-tests.tsx
@@ -2197,7 +2197,7 @@ class Example78 extends React.Component<any, any> {
     return (
       <div>
         <p>List Based</p>
-        <Nav inline>
+        <Nav vertical>
           <NavItem>
             <NavLink href="#">Link</NavLink>
           </NavItem>
@@ -2213,7 +2213,7 @@ class Example78 extends React.Component<any, any> {
         </Nav>
         <hr />
         <p>Link based</p>
-        <Nav inline>
+        <Nav vertical>
           <NavLink href="#">Link</NavLink> <NavLink href="#">Link</NavLink> <NavLink href="#">Another Link</NavLink> <NavLink disabled href="#">Disabled Link</NavLink>
         </Nav>
       </div>

From ca578cd348771fc1296384c73a7c24a14e55d908 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sami=20M=C3=A4ki?= <sami.maki@cybercom.com>
Date: Mon, 5 Mar 2018 11:36:46 +0200
Subject: [PATCH 0248/1382] Update navbar props and examples.

Updated and checked components: Navbar, NavbarBrand, NavbarToggler.
---
 types/reactstrap/lib/NavbarToggler.d.ts |  2 --
 types/reactstrap/reactstrap-tests.tsx   | 37 ++++++++++++++++++-------
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/types/reactstrap/lib/NavbarToggler.d.ts b/types/reactstrap/lib/NavbarToggler.d.ts
index 1eea9880a5..542b671d28 100644
--- a/types/reactstrap/lib/NavbarToggler.d.ts
+++ b/types/reactstrap/lib/NavbarToggler.d.ts
@@ -5,8 +5,6 @@ export interface NavbarTogglerProps extends React.HTMLProps<HTMLAnchorElement> {
   type?: string;
   className?: string;
   cssModule?: CSSModule;
-  right?: boolean;
-  left?: boolean;
 }
 
 declare const NavbarToggler: React.StatelessComponent<NavbarTogglerProps>;
diff --git a/types/reactstrap/reactstrap-tests.tsx b/types/reactstrap/reactstrap-tests.tsx
index 3e93ecb5bc..8b58c9f886 100644
--- a/types/reactstrap/reactstrap-tests.tsx
+++ b/types/reactstrap/reactstrap-tests.tsx
@@ -2107,9 +2107,9 @@ class Example75 extends React.Component<any, any> {
   render() {
     return (
       <div>
-        <Navbar color="faded" light toggleable>
-          <NavbarToggler right onClick={this.toggle} />
+        <Navbar color="faded" light expand="md">
           <NavbarBrand href="/">reactstrap</NavbarBrand>
+          <NavbarToggler onClick={this.toggle} />
           <Collapse isOpen={this.state.isOpen} navbar>
             <Nav className="ml-auto" navbar>
               <NavItem>
@@ -2118,6 +2118,23 @@ class Example75 extends React.Component<any, any> {
               <NavItem>
                 <NavLink href="https://github.com/reactstrap/reactstrap">Github</NavLink>
               </NavItem>
+              <UncontrolledDropdown nav inNavbar>
+                <DropdownToggle nav caret>
+                  Options
+                </DropdownToggle>
+                <DropdownMenu >
+                  <DropdownItem>
+                    Option 1
+                  </DropdownItem>
+                  <DropdownItem>
+                    Option 2
+                  </DropdownItem>
+                  <DropdownItem divider />
+                  <DropdownItem>
+                    Reset
+                  </DropdownItem>
+                </DropdownMenu>
+              </UncontrolledDropdown>
             </Nav>
           </Collapse>
         </Navbar>
@@ -2145,9 +2162,9 @@ class Example76 extends React.Component<any, any> {
     return (
       <div>
         <Navbar color="faded" light>
-          <NavbarToggler onClick={this.toggleNavbar} />
-          <Collapse className="navbar-toggleable-md" isOpen={!this.state.collapsed}>
-            <NavbarBrand href="/">reactstrap</NavbarBrand>
+          <NavbarBrand href="/" className="mr-auto">reactstrap</NavbarBrand>
+          <NavbarToggler onClick={this.toggleNavbar} className="mr-2" />
+          <Collapse isOpen={!this.state.collapsed} navbar>
             <Nav navbar>
               <NavItem>
                 <NavLink href="/components/">Components</NavLink>
@@ -3330,7 +3347,7 @@ class Example108 extends React.Component<any, any> {
     return (
       <div>
         <Navbar color="faded" dark toggleable>
-          <NavbarToggler right onClick={this.toggle} />
+          <NavbarToggler onClick={this.toggle} />
           <NavbarBrand href="/">reactstrap</NavbarBrand>
           <Collapse isOpen={this.state.isOpen} navbar>
             <Nav className="ml-auto" navbar>
@@ -3366,7 +3383,7 @@ class Example109 extends React.Component<any, any> {
     return (
       <div>
         <Navbar color="faded" light expand>
-          <NavbarToggler right onClick={this.toggle} />
+          <NavbarToggler onClick={this.toggle} />
           <NavbarBrand href="/">reactstrap</NavbarBrand>
           <Collapse isOpen={this.state.isOpen} navbar>
             <Nav className="ml-auto" navbar>
@@ -3402,7 +3419,7 @@ class Example110 extends React.Component<any, any> {
     return (
       <div>
         <Navbar color="faded" light expand="md">
-          <NavbarToggler right onClick={this.toggle} />
+          <NavbarToggler onClick={this.toggle} />
           <NavbarBrand href="/">reactstrap</NavbarBrand>
           <Collapse isOpen={this.state.isOpen} navbar>
             <Nav className="ml-auto" navbar>
@@ -3438,7 +3455,7 @@ class Example111 extends React.Component<any, any> {
     return (
       <div>
         <Navbar color="faded" light expand="md">
-          <NavbarToggler right onClick={this.toggle} />
+          <NavbarToggler onClick={this.toggle} />
           <NavbarBrand tag="a" href="/">reactstrap</NavbarBrand>
           <Collapse isOpen={this.state.isOpen} navbar>
             <Nav className="ml-auto" navbar>
@@ -3474,7 +3491,7 @@ class Example112 extends React.Component<any, any> {
     return (
       <div>
         <Navbar color="faded" light expand="md">
-          <NavbarToggler right onClick={this.toggle} />
+          <NavbarToggler onClick={this.toggle} />
           <NavbarBrand className="logo" href="/">reactstrap</NavbarBrand>
           <Collapse isOpen={this.state.isOpen} navbar>
             <Nav className="ml-auto" navbar>

From bbc47bfe49f5d42bf8742ab671b44a1baab0e3cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20=C3=96llinger?= <markus.oellinger@unycom.com>
Date: Mon, 5 Mar 2018 10:37:39 +0100
Subject: [PATCH 0249/1382] explicitly define an optional loadOptions

---
 types/react-virtualized-select/index.d.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/types/react-virtualized-select/index.d.ts b/types/react-virtualized-select/index.d.ts
index ab496a0213..234d0a5b97 100644
--- a/types/react-virtualized-select/index.d.ts
+++ b/types/react-virtualized-select/index.d.ts
@@ -5,7 +5,7 @@
 // TypeScript Version: 2.3
 
 import * as React from "react";
-import { ReactAsyncSelectProps, OptionValues } from "react-select";
+import { ReactSelectProps, LoadOptionsHandler, OptionValues } from "react-select";
 import { ListProps } from "react-virtualized";
 
 export interface VirtualizedOptionRenderOptions<T> {
@@ -26,11 +26,12 @@ export interface VirtualizedOptionRenderOptions<T> {
  * Dummy interface to allow `VirtualizedSelectProps` to have an `optionRenderer` type
  * incompatible with the one in `ReactSelectProps`.
  */
-interface VirtualizedSelectPropsBase<TValue = OptionValues> extends ReactAsyncSelectProps<TValue> {
+interface VirtualizedSelectPropsBase<TValue = OptionValues> extends ReactSelectProps<TValue> {
     optionRenderer?: any;
 }
 export interface VirtualizedSelectProps<TValue = OptionValues> extends VirtualizedSelectPropsBase<TValue> {
     async?: boolean;
+    loadOptions?: LoadOptionsHandler<TValue>;
     maxHeight?: number;
     optionHeight?: number;
     optionRenderer?(options: VirtualizedOptionRenderOptions<any>): JSX.Element;

From 7f4c340aa99f88990a40781f06705fb96447d15e Mon Sep 17 00:00:00 2001
From: Piotr Roszatycki <piotr.roszatycki@gmail.com>
Date: Mon, 5 Mar 2018 10:39:13 +0100
Subject: [PATCH 0250/1382] Compatibility with TypeScript < 2.7

---
 types/simple-websocket/index.d.ts              | 18 +++++++++++-------
 types/simple-websocket/server.d.ts             | 14 +++++++++-----
 .../simple-websocket/simple-websocket-tests.ts |  4 ++--
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/types/simple-websocket/index.d.ts b/types/simple-websocket/index.d.ts
index fa4a5d492c..7e2ec0f6b8 100644
--- a/types/simple-websocket/index.d.ts
+++ b/types/simple-websocket/index.d.ts
@@ -8,17 +8,19 @@
 import { Duplex, DuplexOptions } from "stream";
 import WebSocket = require("ws");
 
-export interface SocketOptions extends DuplexOptions {
-  /** websocket server url */
-  url?: string;
-  /** raw websocket instance to wrap */
-  socket?: WebSocket;
+declare namespace Socket {
+  interface Options extends DuplexOptions {
+    /** websocket server url */
+    url?: string;
+    /** raw websocket instance to wrap */
+    socket?: WebSocket;
+  }
 }
 
-export default class Socket extends Duplex {
+declare class Socket extends Duplex {
   static WEBSOCKET_SUPPORT: boolean;
 
-  constructor(options: SocketOptions | string);
+  constructor(options: Socket.Options | string);
 
   /** Send text/binary data to the WebSocket server */
   send(chunk: any): void;
@@ -26,3 +28,5 @@ export default class Socket extends Duplex {
   /** Destroy and cleanup this websocket connection */
   destroy(err?: Error): void;
 }
+
+export = Socket;
diff --git a/types/simple-websocket/server.d.ts b/types/simple-websocket/server.d.ts
index ec88a300ff..72f4c59c30 100644
--- a/types/simple-websocket/server.d.ts
+++ b/types/simple-websocket/server.d.ts
@@ -5,16 +5,18 @@ import * as http from "http";
 import * as net from "net";
 import WebSocket = require("ws");
 
-import Socket from ".";
+import Socket = require(".");
 
-export type SocketServerOptions = WebSocket.ServerOptions;
+declare namespace SocketServer {
+  type Options = WebSocket.ServerOptions;
+}
 
-export default class SocketServer extends EventEmitter {
-  options: SocketServerOptions;
+declare class SocketServer extends EventEmitter {
+  options: SocketServer.Options;
   path: string;
   clients: Set<WebSocket>;
 
-  constructor(options?: SocketServerOptions, callback?: () => void);
+  constructor(options?: SocketServer.Options, callback?: () => void);
 
   close(cb?: (err?: Error) => void): void;
   handleUpgrade(request: http.IncomingMessage, socket: net.Socket,
@@ -64,3 +66,5 @@ export default class SocketServer extends EventEmitter {
   removeListener(event: "listening", cb: () => void): this;
   removeListener(event: string | symbol, listener: (...args: any[]) => void): this;
 }
+
+export = SocketServer;
diff --git a/types/simple-websocket/simple-websocket-tests.ts b/types/simple-websocket/simple-websocket-tests.ts
index 9103d1c191..0a31b08f22 100644
--- a/types/simple-websocket/simple-websocket-tests.ts
+++ b/types/simple-websocket/simple-websocket-tests.ts
@@ -1,4 +1,4 @@
-import Socket from "simple-websocket";
+import Socket = require("simple-websocket");
 
 if (Socket.WEBSOCKET_SUPPORT) {
   const socket = new Socket('ws://echo.websocket.org');
@@ -16,7 +16,7 @@ if (Socket.WEBSOCKET_SUPPORT) {
   });
 }
 
-import Server from "simple-websocket/server";
+import Server = require("simple-websocket/server");
 
 const server = new Server({ port: 8080 });
 

From d98ccef23d53eb8c600b9ab9710e5853c38eb13d Mon Sep 17 00:00:00 2001
From: orblazer <orblazer@relonar.fr>
Date: Mon, 5 Mar 2018 11:50:12 +0100
Subject: [PATCH 0251/1382] Fix "this" context on "on" functions

---
 types/uws/index.d.ts | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/types/uws/index.d.ts b/types/uws/index.d.ts
index 6072c41534..20a024c1b8 100644
--- a/types/uws/index.d.ts
+++ b/types/uws/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for uWS 0.13
 // Project: https://github.com/uWebSockets/uWebSockets
 // Definitions by: York Yao <https://github.com/plantain-00>
+//                 Orblazer <https://github.com/orblazer>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -59,13 +60,13 @@ declare class WebSocket extends events.EventEmitter {
     addEventListener(method: string, listener?: (...args: any[]) => void): void;
 
     // Events
-    on(event: 'error', cb: (err: Error) => void): this;
-    on(event: 'close', cb: (code: number, message: string) => void): this;
-    on(event: 'message', cb: (data: any, flags: { binary: boolean }) => void): this;
-    on(event: 'ping', cb: (data: any, flags: { binary: boolean }) => void): this;
-    on(event: 'pong', cb: (data: any, flags: { binary: boolean }) => void): this;
-    on(event: 'open', cb: () => void): this;
-    on(event: string, listener: (...args: any[]) => void): this;
+    on(event: 'error', cb: (this: this, err: Error) => void): this;
+    on(event: 'close', cb: (this: this, code: number, message: string) => void): this;
+    on(event: 'message', cb: (this: this, data: any, flags: { binary: boolean }) => void): this;
+    on(event: 'ping', cb: (this: this, data: any, flags: { binary: boolean }) => void): this;
+    on(event: 'pong', cb: (this: this, data: any, flags: { binary: boolean }) => void): this;
+    on(event: 'open', cb: (this: this) => void): this;
+    on(event: string, listener: (this: this, ...args: any[]) => void): this;
 
     addListener(event: 'error', cb: (err: Error) => void): this;
     addListener(event: 'close', cb: (code: number, message: string) => void): this;
@@ -141,7 +142,7 @@ declare namespace WebSocket {
         // Events
         on(event: 'error', cb: (err: Error) => void): this;
         on(event: 'headers', cb: (headers: string[]) => void): this;
-        on(event: 'connection', cb: (client: WebSocket) => void): this;
+        on(event: 'connection', cb: (this: WebSocket, client: WebSocket) => void): this;
         on(event: string, listener: (...args: any[]) => void): this;
 
         addListener(event: 'error', cb: (err: Error) => void): this;

From 36948c9e5d00ca0c9f7e93797e9e0f5078688681 Mon Sep 17 00:00:00 2001
From: Lukas Elmer <lukas.elmer@gmail.com>
Date: Mon, 5 Mar 2018 16:14:41 +0100
Subject: [PATCH 0252/1382] react-onsenui: Add list title

added list title, see https://onsen.io/v2/api/react/ListTitle.html
---
 types/react-onsenui/index.d.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/types/react-onsenui/index.d.ts b/types/react-onsenui/index.d.ts
index 1e413dc3ec..27a664d27a 100644
--- a/types/react-onsenui/index.d.ts
+++ b/types/react-onsenui/index.d.ts
@@ -414,6 +414,13 @@ export class ListItem extends Component<{
     style?: React.CSSProperties,
 }, any> {}
 
+export class ListTitle extends Component<{
+    modifier?: string,
+    onClick?: React.MouseEventHandler<any>,
+    className?: string,
+    style?: React.CSSProperties,
+}, any> {}
+
 export class Card extends Component<{
     modifier?: string,
 }, any> {}

From 0b879f7ed3f3313ce57a3df2a725a7a58d571329 Mon Sep 17 00:00:00 2001
From: Sam Nau <sam.nau@vml.com>
Date: Mon, 5 Mar 2018 11:18:57 -0600
Subject: [PATCH 0253/1382] updating types for

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

diff --git a/types/vanilla-modal/index.d.ts b/types/vanilla-modal/index.d.ts
index 6c15609ce2..478d87565b 100644
--- a/types/vanilla-modal/index.d.ts
+++ b/types/vanilla-modal/index.d.ts
@@ -13,7 +13,7 @@ export interface VanillaModalConfig {
   class?: string;
   loadClass?: string;
   clickOutside?: boolean;
-  closeKeys?: [number];
+  closeKeys?: number[] | void[] | boolean;
   transitions?: string;
   transitionEnd?(): undefined;
   onBeforeOpen?(): undefined;

From 7c31e14e12af487bbf55dea298329b0dfee1cf9f Mon Sep 17 00:00:00 2001
From: Sam Nau <sam.nau@vml.com>
Date: Mon, 5 Mar 2018 11:37:43 -0600
Subject: [PATCH 0254/1382] updating array types for

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

diff --git a/types/vanilla-modal/index.d.ts b/types/vanilla-modal/index.d.ts
index 478d87565b..41356846e3 100644
--- a/types/vanilla-modal/index.d.ts
+++ b/types/vanilla-modal/index.d.ts
@@ -13,7 +13,7 @@ export interface VanillaModalConfig {
   class?: string;
   loadClass?: string;
   clickOutside?: boolean;
-  closeKeys?: number[] | void[] | boolean;
+  closeKeys?: number[] | undefined[] | boolean;
   transitions?: string;
   transitionEnd?(): undefined;
   onBeforeOpen?(): undefined;

From 8a4095b718955698a17d473eb95fc4aa31244042 Mon Sep 17 00:00:00 2001
From: Anthony Rosequist <arosequist@casestack.com>
Date: Mon, 5 Mar 2018 13:00:50 -0600
Subject: [PATCH 0255/1382] Add Node.value to yallist types

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

diff --git a/types/yallist/index.d.ts b/types/yallist/index.d.ts
index 8a89697d82..11e2462a74 100644
--- a/types/yallist/index.d.ts
+++ b/types/yallist/index.d.ts
@@ -58,6 +58,7 @@ declare namespace Yallist {
     interface Node<T> {
         prev: Node<T> | null;
         next: Node<T> | null;
+        value: T;
         list?: Yallist<T>;
     }
 }
diff --git a/types/yallist/yallist-tests.ts b/types/yallist/yallist-tests.ts
index 69099c0da9..ffdef9ad79 100644
--- a/types/yallist/yallist-tests.ts
+++ b/types/yallist/yallist-tests.ts
@@ -115,3 +115,4 @@ new Yallist.Node('foo', node, node, myList);
 node.list; // $ExpectType Yallist<string> | undefined
 node.next; // $ExpectType Node<string> | null
 node.prev; // $ExpectType Node<string> | null
+node.value; // $ExpectType string

From 1fa4f9597fec4f21caf306bddffc013018dde54d Mon Sep 17 00:00:00 2001
From: Maarten Mulders <m.th.mulders@xs4all.nl>
Date: Mon, 5 Mar 2018 20:55:11 +0100
Subject: [PATCH 0256/1382] [recharts] Add 'fill' prop to Bar component

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

diff --git a/types/recharts/index.d.ts b/types/recharts/index.d.ts
index 5de42776b9..0bccedc017 100644
--- a/types/recharts/index.d.ts
+++ b/types/recharts/index.d.ts
@@ -189,6 +189,7 @@ export interface BarData {
 export interface BarProps extends EventAttributes, Partial<PresentationAttributes>, Animatable {
     dataKey: DataKey; // As the source code states, dataKey will replace valueKey in 1.1.0 and it'll be required (it's already required in current implementation).
     className?: string;
+    fill?: string;
     layout?: LayoutType;
     xAxisId?: string | number;
     yAxisId?: string | number;

From 2a9e5b6e9f48ba1ae7f2ad30a502fdca20988d8e Mon Sep 17 00:00:00 2001
From: Christopher Woodland <christopher.woodland@pearson.com>
Date: Mon, 5 Mar 2018 15:25:07 -0500
Subject: [PATCH 0257/1382] - Update _Frisbyspec.get_, _Frisbyspec.post_,
 _Frisbyspec.put_, _Frisbyspec.del_, _Frisbyspec.patch_,  _Frisbyspec.fetch_
 to allow _params_ to be optional. - Update _FrisbySpec.then_ to allow
 _onRejected_ to be optional.

---
 types/frisby/CHANGELOG.md | 10 ++++++++++
 types/frisby/index.d.ts   | 14 +++++++-------
 2 files changed, 17 insertions(+), 7 deletions(-)
 create mode 100644 types/frisby/CHANGELOG.md

diff --git a/types/frisby/CHANGELOG.md b/types/frisby/CHANGELOG.md
new file mode 100644
index 0000000000..4b07f01aca
--- /dev/null
+++ b/types/frisby/CHANGELOG.md
@@ -0,0 +1,10 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/)
+and this project adheres to [Semantic Versioning](http://semver.org/).
+
+## 2018-03-05
+### Changed
+- Update _Frisbyspec.get_, _Frisbyspec.post_, _Frisbyspec.put_, _Frisbyspec.del_, _Frisbyspec.patch_,  _Frisbyspec.fetch_ to allow _params_ to be optional.
+- Update _FrisbySpec.then_ to allow _onRejected_ to be optional.
diff --git a/types/frisby/index.d.ts b/types/frisby/index.d.ts
index 366a3998d7..e931b8b4cd 100644
--- a/types/frisby/index.d.ts
+++ b/types/frisby/index.d.ts
@@ -21,13 +21,13 @@ export import Joi = require("joi");
 export class FrisbySpec {
     constructor(...args: any[]);
     catch(onRejected?: (error: Error) => void): FrisbySpec;
-    del(url: string, params: {}): FrisbySpec;
+    del(url: string, params?: {}): FrisbySpec;
     done(doneFn: (...args: any[]) => void): FrisbySpec;
     expect(expectName: string, ...args: any[]): FrisbySpec;
     expectNot(expectName: string): FrisbySpec;
-    fetch(url: string, params: {}, options?: {}): FrisbySpec;
+    fetch(url: string, params?: {}, options?: {}): FrisbySpec;
     fromJSON(json: {}): FrisbySpec;
-    get(url: string, params: {}): FrisbySpec;
+    get(url: string, params?: {}): FrisbySpec;
     getBaseUrl(): string | boolean;
     inspectBody(): FrisbySpec;
     inspectHeaders(): FrisbySpec;
@@ -37,12 +37,12 @@ export class FrisbySpec {
     inspectRequestHeaders(): FrisbySpec;
     inspectResponse(): FrisbySpec;
     inspectStatus(): FrisbySpec;
-    patch(url: string, params: {}): FrisbySpec;
-    post(url: string, params: {}): FrisbySpec;
+    patch(url: string, params?: {}): FrisbySpec;
+    post(url: string, params?: {}): FrisbySpec;
     promise(): Promise<nodeFetch.Response>;
-    put(url: string, params: {}): FrisbySpec;
+    put(url: string, params?: {}): FrisbySpec;
     setup(opts: {}, replace: boolean): FrisbySpec;
-    then(onFulfilled: {} | ((...args: any[]) => void), onRejected: (...args: any[]) => void): FrisbySpec;
+    then(onFulfilled: {} | ((...args: any[]) => void), onRejected?: (...args: any[]) => void): FrisbySpec;
     timeout(timeout: number): number;
     use(fn: (...args: any[]) => void): FrisbySpec;
     static addExpectHandler(expectName: string, expectFn: (...args: any[]) => any): void;

From d9df4c106d9ffc295e6727381eb8602a00dc5eeb Mon Sep 17 00:00:00 2001
From: Christopher Woodland <christopher.woodland@pearson.com>
Date: Mon, 5 Mar 2018 15:31:23 -0500
Subject: [PATCH 0258/1382] remove changelog

---
 types/frisby/CHANGELOG.md | 10 ----------
 types/frisby/index.d.ts   | 12 ++++++++++++
 2 files changed, 12 insertions(+), 10 deletions(-)
 delete mode 100644 types/frisby/CHANGELOG.md

diff --git a/types/frisby/CHANGELOG.md b/types/frisby/CHANGELOG.md
deleted file mode 100644
index 4b07f01aca..0000000000
--- a/types/frisby/CHANGELOG.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Change Log
-All notable changes to this project will be documented in this file.
-
-The format is based on [Keep a Changelog](http://keepachangelog.com/)
-and this project adheres to [Semantic Versioning](http://semver.org/).
-
-## 2018-03-05
-### Changed
-- Update _Frisbyspec.get_, _Frisbyspec.post_, _Frisbyspec.put_, _Frisbyspec.del_, _Frisbyspec.patch_,  _Frisbyspec.fetch_ to allow _params_ to be optional.
-- Update _FrisbySpec.then_ to allow _onRejected_ to be optional.
diff --git a/types/frisby/index.d.ts b/types/frisby/index.d.ts
index e931b8b4cd..0586f99ed2 100644
--- a/types/frisby/index.d.ts
+++ b/types/frisby/index.d.ts
@@ -18,6 +18,18 @@ export import Joi = require("joi");
 
 // #region Frisby FrisbySpec Methods
 // Reference file: https://github.com/vlucas/frisby/blob/master/src/frisby/spec.js
+
+
+// **************************************CHANGE LOG**************************************
+// C.E.W. This is an attempt to create some sort of changelog for these types.
+// If you make any changes, please try and note those changes in this section.
+// If this section gets too long we can always trim it.
+// ## 2018-03-05
+// ### Changed
+// - Update _Frisbyspec.get_, _Frisbyspec.post_, _Frisbyspec.put_, _Frisbyspec.del_, _Frisbyspec.patch_,  _Frisbyspec.fetch_ to allow _params_ to be optional.
+// - Update _FrisbySpec.then_ to allow _onRejected_ to be optional.
+// **************************************CHANGE LOG**************************************
+
 export class FrisbySpec {
     constructor(...args: any[]);
     catch(onRejected?: (error: Error) => void): FrisbySpec;

From 1277b7b0b5b0b57d2c83c25d600c317f5d8ec7ee Mon Sep 17 00:00:00 2001
From: denis <denisname@users.noreply.github.com>
Date: Mon, 5 Mar 2018 21:34:42 +0100
Subject: [PATCH 0259/1382] Add collapse, tab and scrollspy definitions

Add more definitions and use popper.js definition for offset and behavor
---
 types/bootstrap/bootstrap-tests.ts | 97 +++++++++++++++++++++++++++---
 types/bootstrap/index.d.ts         | 78 +++++++++++++++++++-----
 types/bootstrap/package.json       |  6 ++
 3 files changed, 159 insertions(+), 22 deletions(-)
 create mode 100644 types/bootstrap/package.json

diff --git a/types/bootstrap/bootstrap-tests.ts b/types/bootstrap/bootstrap-tests.ts
index 17d6e088cf..9ab7654373 100755
--- a/types/bootstrap/bootstrap-tests.ts
+++ b/types/bootstrap/bootstrap-tests.ts
@@ -2,8 +2,10 @@
 // Alert
 // --------------------------------------------------------------------------------------
 
+// $ExpectType JQuery<HTMLElement>
 $("#alert").alert();
 
+// $ExpectType JQuery<HTMLElement>
 $("#alert").alert("close");
 
 $("#alert").on("close.bs.alert", () => {});
@@ -12,20 +14,32 @@ $("#alert").on("close.bs.alert", () => {});
 // Button
 // --------------------------------------------------------------------------------------
 
-// $("#button").button(); // must fail
+// $ExpectError
+$("#button").button();
 
+// $ExpectType JQuery<HTMLElement>
 $("#button").button("toggle");
 
 // --------------------------------------------------------------------------------------
 // Carousel
 // --------------------------------------------------------------------------------------
 
+// $ExpectType JQuery<HTMLElement>
 $("#carousel").carousel();
 
+// $ExpectType JQuery<HTMLElement>
 $("#carousel").carousel("pause");
 
 $("#carousel").carousel(100);
 
+$("#carousel").on("slide.bs.carousel", function(ev) {
+    const that: HTMLElement = this;
+    const from: number = ev.from;
+    const to: number = ev.to;
+    const direction: string = ev.direction;
+    const data: undefined = ev.data;
+});
+
 $("#carousel").carousel({
     interval: 5000,
     keyboard: true,
@@ -37,20 +51,43 @@ $("#carousel").carousel({
     pause: false,
 });
 
-$("#carousel").on("slide.bs.carousel", function(ev) {
-    const that: HTMLElement = this;
-    const from: number = ev.from;
-    const to: number = ev.to;
-    const direction: string = ev.direction;
-    const data: undefined = ev.data;
+// --------------------------------------------------------------------------------------
+// Collapse
+// --------------------------------------------------------------------------------------
+
+// $ExpectType JQuery<HTMLElement>
+$("#collapse").collapse();
+
+// $ExpectType JQuery<HTMLElement>
+$("#collapse").collapse("toggle");
+
+$("#collapse").on("show.bs.collapse", () => {});
+
+$("#collapse").collapse({
+    parent: "#parent",
+    toggle: true,
+});
+
+$("#collapse").collapse({
+    parent: document.body,
+});
+
+$("#collapse").collapse({
+    parent: $("#parent"),
+});
+
+$("#collapse").collapse({
+    toggle: false,
 });
 
 // --------------------------------------------------------------------------------------
 // Dropdown
 // --------------------------------------------------------------------------------------
 
+// $ExpectType JQuery<HTMLElement>
 $("#dropdown").dropdown();
 
+// $ExpectType JQuery<HTMLElement>
 $("#dropdown").dropdown("update");
 
 $("#dropdown").on("hide.bs.dropdown", () => {});
@@ -81,8 +118,10 @@ $("#dropdown").dropdown({
 // Modal
 // --------------------------------------------------------------------------------------
 
+// $ExpectType JQuery<HTMLElement>
 $("#modal").modal();
 
+// $ExpectType JQuery<HTMLElement>
 $("#modal").modal("show");
 
 $("#modal").on("hide.bs.modal", () => {});
@@ -98,12 +137,56 @@ $("#modal").modal({
     backdrop: "static",
 });
 
+// --------------------------------------------------------------------------------------
+// Popover
+// --------------------------------------------------------------------------------------
+
+// $ExpectType JQuery<HTMLElement>
+$("#scrollspy").popover();
+
+// $ExpectType JQuery<HTMLElement>
+$("#scrollspy").popover("toggle");
+
+$("#scrollspy").on("activate.bs.scrollspy", () => {});
+
+// TODO: test popover with options
+
+// --------------------------------------------------------------------------------------
+// Scrollspy
+// --------------------------------------------------------------------------------------
+
+// $ExpectType JQuery<HTMLElement>
+$("#scrollspy").scrollspy();
+
+// $ExpectType JQuery<HTMLElement>
+$("#scrollspy").scrollspy("refresh");
+
+$("#scrollspy").on("activate.bs.scrollspy", () => {});
+
+$("#scrollspy").scrollspy({
+    offset: 100,
+});
+
+// --------------------------------------------------------------------------------------
+// Tab
+// --------------------------------------------------------------------------------------
+
+// $ExpectType JQuery<HTMLElement>
+$("#someListItem").tab("show");
+
+$("a[data-toggle=\"list\"]").on("shown.bs.tab", (e) => {
+    e.target; // newly activated tab
+    e.relatedTarget; // previous active tab
+});
+
 // --------------------------------------------------------------------------------------
 // Tooltip
 // --------------------------------------------------------------------------------------
 
+// $ExpectType JQuery<HTMLElement>
 $("#tooltip").tooltip();
 
+// $ExpectType JQuery<HTMLElement>
 $("#tooltip").tooltip("show");
 
 $("#tooltip").on("hide.bs.tooltip", () => {});
diff --git a/types/bootstrap/index.d.ts b/types/bootstrap/index.d.ts
index c158bbd807..5e7fea80f7 100755
--- a/types/bootstrap/index.d.ts
+++ b/types/bootstrap/index.d.ts
@@ -4,16 +4,16 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-// TODO: collapse, tab (list-group, navs), popovers, scrollspy
+// TODO: popovers options
 
 /// <reference types="jquery" />
+/// <reference types="popper.js" />
 
 // --------------------------------------------------------------------------
 // Some Types and Interfaces
 // --------------------------------------------------------------------------
 
 type BootstrapPlacement = "auto" | "top" | "bottom" | "left" | "right";
-type PopperBehavior = "flip" | "clockwise" | "counterclockwise";
 
 interface BootstrapDelay {
     show: number;
@@ -26,16 +26,9 @@ interface BootstrapTooltipInstance {
     tip: HTMLElement;
 }
 
-interface BootstrapOffsetExtend {
-    top?: number;
-    left?: number;
-    width?: number;
-    height?: number;
-}
-
 interface BootstrapOffsetsExtend {
-    popper?: BootstrapOffsetExtend;
-    reference?: BootstrapOffsetExtend;
+    popper?: Partial<Popper.Offset>;
+    reference?: Partial<Popper.Offset>;
 }
 
 // --------------------------------------------------------------------------------------
@@ -75,6 +68,24 @@ interface BootstrapCarouselOption {
     wrap?: boolean;
 }
 
+interface BootstrapCollapseOption {
+    /**
+     * If parent is provided, then all collapsible elements under the specified parent will be closed when
+     * this collapsible item is shown. (similar to traditional accordion behavior - this is dependent on the card class).
+     * The attribute has to be set on the target collapsible area.
+     *
+     * @default ""
+     */
+    parent?: string | JQuery | Element;
+
+    /**
+     * Toggles the collapsible element on invocation.
+     *
+     * @default true
+     */
+    toggle?: boolean;
+}
+
 interface BootstrapDropdownOption {
     /**
      * Offset of the dropdown relative to its target.
@@ -99,7 +110,7 @@ interface BootstrapDropdownOption {
      *
      * @default "scrollParent"
      */
-    boundary?: "viewport" | "window" | "scrollParent" | HTMLElement;
+    boundary?: Popper.Boundary | HTMLElement;
 }
 
 interface BootstrapModalOption {
@@ -133,6 +144,26 @@ interface BootstrapModalOption {
     show?: boolean;
 }
 
+interface BootstrapPoppoverOption {
+    /**
+     * Apply a CSS fade transition to the popover.
+     *
+     * @default true
+     */
+    animation: boolean;
+
+    // TODO
+}
+
+interface BootstrapScrollspyOption {
+    /**
+     * Pixels to offset from top when calculating position of scroll.
+     *
+     * @default 10
+     */
+    offset?: number;
+}
+
 interface BootstrapTooltipOption {
     /**
      * Apply a CSS fade transition to the tooltip.
@@ -232,7 +263,7 @@ interface BootstrapTooltipOption {
      *
      * @default "flip"
      */
-    fallbackPlacement?: PopperBehavior | PopperBehavior[];
+    fallbackPlacement?: Popper.Behavior | ReadonlyArray<Popper.Behavior>;
 
     /**
      * Overflow constraint boundary of the tooltip.
@@ -242,7 +273,7 @@ interface BootstrapTooltipOption {
      *
      * @default "scrollParent"
      */
-    boundary?: "viewport" | "window" | "scrollParent" | HTMLElement;
+    boundary?: Popper.Boundary | HTMLElement;
 }
 
 // --------------------------------------------------------------------------------------
@@ -268,8 +299,12 @@ interface BootstrapCarouselEventHandler<TElement> extends JQuery.Event<TElement,
 
 type BootstrapAlertEvent = "close.bs.alert" | "closed.bs.alert";
 type BootstrapCarouselEvent = "slide.bs.carousel" | "slid.bs.carousel";
+type BootstrapCollapseEvent = "show.bs.collapse" | "shown.bs.collapse" | "hide.bs.collapse" | "hidden.bs.collapse";
 type BootstrapDropdownEvent = "show.bs.dropdown" | "shown.bs.dropdown" | "hide.bs.dropdown" | "hidden.bs.dropdown";
 type BootstrapModalEvent = "show.bs.modal" | "shown.bs.modal" | "hide.bs.modal" |  "hidden.bs.modal";
+type BootstrapPopoverEvent = "show.bs.popover" | "shown.bs.popover" | "hide.bs.popover" | "hidden.bs.popover" | "inserted.bs.popover";
+type BootstrapScrollspyEvent = "activate.bs.scrollspy";
+type BootstrapTapEvent = "show.bs.tab" | "shown.bs.tab" | "hide.bs.tab" | "hidden.bs.tab";
 type BootstrapTooltipEvent = "show.bs.tooltip" | "shown.bs.tooltip" | "hide.bs.tooltip" |  "hidden.bs.tooltip" | "inserted.bs.tooltip";
 
 // --------------------------------------------------------------------------------------
@@ -284,16 +319,29 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
     carousel(action: "cycle" | "pause" | number | "prev" | "next" | "dispose"): this;
     carousel(options?: BootstrapCarouselOption): this;
 
+    collapse(action: "toggle" | "show" | "hide" | "dispose"): this;
+    collapse(options?: BootstrapCollapseOption): this;
+
     dropdown(action: "toggle" | "update" | "dispose"): this;
     dropdown(options?: BootstrapDropdownOption): this;
 
     modal(action: "toggle" | "show" | "hide" | "handleUpdate" | "dispose"): this;
     modal(options?: BootstrapModalOption): this;
 
+    popover(action: "show" | "hide" | "toggle" | "dispose" | "enable" | "disable" | "toggleEnabled" | "update"): this;
+    popover(options?: BootstrapPoppoverOption): this;
+
+    scrollspy(action: "refresh" | "dispose"): this;
+    scrollspy(options?: BootstrapScrollspyOption): this;
+
+    tab(action: "show" | "dispose"): this;
+
     tooltip(action: "show" | "hide" | "toggle" | "dispose" | "enable" | "disable" | "toggleEnabled" | "update"): this;
     tooltip(options?: BootstrapTooltipOption): this;
 
     on(events: BootstrapCarouselEvent, handler: JQuery.EventHandlerBase<TElement, BootstrapCarouselEventHandler<TElement>>): this;
-    on(events: BootstrapAlertEvent | BootstrapDropdownEvent | BootstrapModalEvent | BootstrapTooltipEvent,
+    on(events:
+        BootstrapAlertEvent | BootstrapCollapseEvent | BootstrapDropdownEvent | BootstrapModalEvent |
+        BootstrapPopoverEvent | BootstrapScrollspyEvent | BootstrapTapEvent | BootstrapTooltipEvent,
         handler: JQuery.EventHandler<TElement>): this;
 }
diff --git a/types/bootstrap/package.json b/types/bootstrap/package.json
new file mode 100644
index 0000000000..7f11c30706
--- /dev/null
+++ b/types/bootstrap/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "popper.js": "^1.12.9"
+    }
+}
\ No newline at end of file

From c84aeac456c8e8cb71141df87563d04a67d2be37 Mon Sep 17 00:00:00 2001
From: Christopher Woodland <christopher.woodland@pearson.com>
Date: Mon, 5 Mar 2018 15:38:24 -0500
Subject: [PATCH 0260/1382] remove white space

---
 types/frisby/index.d.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/types/frisby/index.d.ts b/types/frisby/index.d.ts
index 0586f99ed2..9057edae6d 100644
--- a/types/frisby/index.d.ts
+++ b/types/frisby/index.d.ts
@@ -19,7 +19,6 @@ export import Joi = require("joi");
 // #region Frisby FrisbySpec Methods
 // Reference file: https://github.com/vlucas/frisby/blob/master/src/frisby/spec.js
 
-
 // **************************************CHANGE LOG**************************************
 // C.E.W. This is an attempt to create some sort of changelog for these types.
 // If you make any changes, please try and note those changes in this section.

From d329cf5430b4580d07e3c43dec6f3a778810dcf1 Mon Sep 17 00:00:00 2001
From: "yohann.poli" <yohann.poli@gmail.com>
Date: Mon, 5 Mar 2018 22:44:50 +0100
Subject: [PATCH 0261/1382] fix nw.js JSON type as any

---
 types/nw.js/index.d.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/types/nw.js/index.d.ts b/types/nw.js/index.d.ts
index b4e941b0a7..93307f9e87 100644
--- a/types/nw.js/index.d.ts
+++ b/types/nw.js/index.d.ts
@@ -372,7 +372,7 @@ declare module NWJS_Helpers {
          * The paper size spec
          * example: 'mediaSize':{'name': 'CUSTOM', 'width_microns': 279400, 'height_microns': 215900, 'custom_display_name':'Letter', 'is_default': true}
          */
-        mediaSize: JSON;
+        mediaSize: any;
 
         /**
          * Whether to print CSS backgrounds
@@ -1072,9 +1072,9 @@ declare module NWJS_Helpers {
          * Enumerate the printers in the system.
          *
          * @param callback {function(dev_win?)} callback with the native window of the DevTools window.
-         * - (optional) printers {JSON[]} An array of JSON objects for the printer information.
+         * - (optional) printers {any[]} An array of json objects for the printer information.
          */
-        getPrinters( callback: ( printers?: JSON[] ) => void ): void;
+        getPrinters( callback: ( printers?: any[] ) => void ): void;
 
         /**
          * Query the status of devtools window.
@@ -1084,9 +1084,9 @@ declare module NWJS_Helpers {
         /**
          * Print the web contents in the window without the need for user’s interaction.
          *
-         * @param options {Object} Specify whether to close the window forcely and bypass close event.
+         * @param options {any | PrintOption} Specify whether to close the window forcely and bypass close event.
          */
-        print( options: JSON | PrintOption ): void;
+        print( options: any | PrintOption ): void;
 
         /**
          * Set window's maximum size.
@@ -1381,9 +1381,9 @@ declare namespace nw {
         dataPath: string;
 
         /**
-         * Get the JSON object of the manifest file.
+         * Get the json object of the manifest file.
          */
-        manifest: JSON;
+        manifest: any;
 
         /**
          * Clear the HTTP cache in memory and the one on disk. This method call is synchronized.

From 922c6e1f7d2a3397899282d515d1b71098646f8e Mon Sep 17 00:00:00 2001
From: rander1870 <rander1870@gmail.com>
Date: Mon, 5 Mar 2018 16:48:33 -0500
Subject: [PATCH 0262/1382] Update index.d.ts

Include definition for useViewBoxResizing as part of the BaseMixin interface.
---
 types/dc/index.d.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/dc/index.d.ts b/types/dc/index.d.ts
index 69ee20a93e..4ba0e5e4ab 100644
--- a/types/dc/index.d.ts
+++ b/types/dc/index.d.ts
@@ -176,6 +176,7 @@ declare namespace dc {
         legend: IGetSet<Legend, T>;
         options(optionsObject: any): T;
         renderlet(fn: (chart: T) => any): T;
+        useViewBoxResizing: IGetSet<boolean, T>;
 
         on(event: "renderlet", fn: (chart: T, filter: any) => any): T;
         on(event: "pretransition", fn: (chart: T, filter: any) => any): T;
@@ -484,4 +485,4 @@ declare namespace dc {
         boxPlot(parent: string, chartGroup?: string): BoxPlot;
         selectMenu(parent: string, chartGroup?: string): SelectMenu;
     }
-}
\ No newline at end of file
+}

From a72347d6542716442681e302ba8d47b0e886ccd3 Mon Sep 17 00:00:00 2001
From: denis <denisname@users.noreply.github.com>
Date: Mon, 5 Mar 2018 22:55:57 +0100
Subject: [PATCH 0263/1382] Use Bootstrap namespace

Use a Bootstrap namespace instead of prefixing names.
---
 types/bootstrap/bootstrap-tests.ts |   2 +-
 types/bootstrap/index.d.ts         | 102 +++++++++++++++--------------
 2 files changed, 54 insertions(+), 50 deletions(-)

diff --git a/types/bootstrap/bootstrap-tests.ts b/types/bootstrap/bootstrap-tests.ts
index 9ab7654373..f8934ebbfc 100755
--- a/types/bootstrap/bootstrap-tests.ts
+++ b/types/bootstrap/bootstrap-tests.ts
@@ -103,7 +103,7 @@ $("#dropdown").dropdown({
 });
 
 $("#dropdown").dropdown({
-    offset(offsets: BootstrapOffsetsExtend) {
+    offset(offsets: Bootstrap.OffsetsExtend) {
         if (!this.flip)
             return { popper: { left: 100 } };
         return {};
diff --git a/types/bootstrap/index.d.ts b/types/bootstrap/index.d.ts
index 5e7fea80f7..01089126fb 100755
--- a/types/bootstrap/index.d.ts
+++ b/types/bootstrap/index.d.ts
@@ -6,27 +6,29 @@
 
 // TODO: popovers options
 
-/// <reference types="jquery" />
 /// <reference types="popper.js" />
+/// <reference types="jquery"/>
+
+export as namespace Bootstrap;
 
 // --------------------------------------------------------------------------
 // Some Types and Interfaces
 // --------------------------------------------------------------------------
 
-type BootstrapPlacement = "auto" | "top" | "bottom" | "left" | "right";
+export type Placement = "auto" | "top" | "bottom" | "left" | "right";
 
-interface BootstrapDelay {
+export interface Delay {
     show: number;
     hide: number;
 }
 
-interface BootstrapTooltipInstance {
-    config: BootstrapTooltipOption;
+export interface TooltipInstance {
+    config: TooltipOption;
     element: Element;
     tip: HTMLElement;
 }
 
-interface BootstrapOffsetsExtend {
+export interface OffsetsExtend {
     popper?: Partial<Popper.Offset>;
     reference?: Partial<Popper.Offset>;
 }
@@ -35,7 +37,7 @@ interface BootstrapOffsetsExtend {
 // Options Interfaces
 // --------------------------------------------------------------------------------------
 
-interface BootstrapCarouselOption {
+export interface CarouselOption {
     /**
      * The amount of time to delay between automatically cycling an item. If false, carousel will not automatically cycle.
      *
@@ -68,7 +70,7 @@ interface BootstrapCarouselOption {
     wrap?: boolean;
 }
 
-interface BootstrapCollapseOption {
+export interface CollapseOption {
     /**
      * If parent is provided, then all collapsible elements under the specified parent will be closed when
      * this collapsible item is shown. (similar to traditional accordion behavior - this is dependent on the card class).
@@ -86,14 +88,14 @@ interface BootstrapCollapseOption {
     toggle?: boolean;
 }
 
-interface BootstrapDropdownOption {
+export interface DropdownOption {
     /**
      * Offset of the dropdown relative to its target.
      * For more information refer to Popper.js's offset docs.
      *
      * @default 0
      */
-    offset?: number | string | ((this: BootstrapDropdownOption, offset: BootstrapOffsetsExtend) => BootstrapOffsetsExtend);
+    offset?: number | string | ((this: DropdownOption, offset: OffsetsExtend) => OffsetsExtend);
 
     /**
      * Allow Dropdown to flip in case of an overlapping on the reference element.
@@ -113,7 +115,7 @@ interface BootstrapDropdownOption {
     boundary?: Popper.Boundary | HTMLElement;
 }
 
-interface BootstrapModalOption {
+export interface ModalOption {
     /**
      * Includes a modal-backdrop element.
      * Alternatively, specify static for a backdrop which doesn't close the modal on click.
@@ -144,7 +146,7 @@ interface BootstrapModalOption {
     show?: boolean;
 }
 
-interface BootstrapPoppoverOption {
+export interface PoppoverOption {
     /**
      * Apply a CSS fade transition to the popover.
      *
@@ -155,7 +157,7 @@ interface BootstrapPoppoverOption {
     // TODO
 }
 
-interface BootstrapScrollspyOption {
+export interface ScrollspyOption {
     /**
      * Pixels to offset from top when calculating position of scroll.
      *
@@ -164,7 +166,7 @@ interface BootstrapScrollspyOption {
     offset?: number;
 }
 
-interface BootstrapTooltipOption {
+export interface TooltipOption {
     /**
      * Apply a CSS fade transition to the tooltip.
      *
@@ -189,7 +191,7 @@ interface BootstrapTooltipOption {
      *
      * @default 0
      */
-    delay?: number | BootstrapDelay;
+    delay?: number | Delay;
 
     /**
      * Allow HTML in the tooltip.
@@ -210,7 +212,7 @@ interface BootstrapTooltipOption {
      *
      * @default "top"
      */
-    placement?: BootstrapPlacement | ((this: BootstrapTooltipInstance, tooltip: HTMLElement, trigger: Element) => BootstrapPlacement);
+    placement?: Placement | ((this: TooltipInstance, tooltip: HTMLElement, trigger: Element) => Placement);
 
     /**
      * If a selector is provided, tooltip objects will be delegated to the specified targets.
@@ -280,7 +282,7 @@ interface BootstrapTooltipOption {
 // Events
 // --------------------------------------------------------------------------------------
 
-interface BootstrapCarouselEventHandler<TElement> extends JQuery.Event<TElement, undefined> {
+export interface CarouselEventHandler<TElement> extends JQuery.Event<TElement, undefined> {
     /**
      * The direction in which the carousel is sliding.
      */
@@ -297,51 +299,53 @@ interface BootstrapCarouselEventHandler<TElement> extends JQuery.Event<TElement,
     to: number;
 }
 
-type BootstrapAlertEvent = "close.bs.alert" | "closed.bs.alert";
-type BootstrapCarouselEvent = "slide.bs.carousel" | "slid.bs.carousel";
-type BootstrapCollapseEvent = "show.bs.collapse" | "shown.bs.collapse" | "hide.bs.collapse" | "hidden.bs.collapse";
-type BootstrapDropdownEvent = "show.bs.dropdown" | "shown.bs.dropdown" | "hide.bs.dropdown" | "hidden.bs.dropdown";
-type BootstrapModalEvent = "show.bs.modal" | "shown.bs.modal" | "hide.bs.modal" |  "hidden.bs.modal";
-type BootstrapPopoverEvent = "show.bs.popover" | "shown.bs.popover" | "hide.bs.popover" | "hidden.bs.popover" | "inserted.bs.popover";
-type BootstrapScrollspyEvent = "activate.bs.scrollspy";
-type BootstrapTapEvent = "show.bs.tab" | "shown.bs.tab" | "hide.bs.tab" | "hidden.bs.tab";
-type BootstrapTooltipEvent = "show.bs.tooltip" | "shown.bs.tooltip" | "hide.bs.tooltip" |  "hidden.bs.tooltip" | "inserted.bs.tooltip";
+export type AlertEvent = "close.bs.alert" | "closed.bs.alert";
+export type CarouselEvent = "slide.bs.carousel" | "slid.bs.carousel";
+export type CollapseEvent = "show.bs.collapse" | "shown.bs.collapse" | "hide.bs.collapse" | "hidden.bs.collapse";
+export type DropdownEvent = "show.bs.dropdown" | "shown.bs.dropdown" | "hide.bs.dropdown" | "hidden.bs.dropdown";
+export type ModalEvent = "show.bs.modal" | "shown.bs.modal" | "hide.bs.modal" |  "hidden.bs.modal";
+export type PopoverEvent = "show.bs.popover" | "shown.bs.popover" | "hide.bs.popover" | "hidden.bs.popover" | "inserted.bs.popover";
+export type ScrollspyEvent = "activate.bs.scrollspy";
+export type TapEvent = "show.bs.tab" | "shown.bs.tab" | "hide.bs.tab" | "hidden.bs.tab";
+export type TooltipEvent = "show.bs.tooltip" | "shown.bs.tooltip" | "hide.bs.tooltip" |  "hidden.bs.tooltip" | "inserted.bs.tooltip";
 
 // --------------------------------------------------------------------------------------
 // jQuery
 // --------------------------------------------------------------------------------------
 
-interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement> {
-    alert(action?: "close" | "dispose"): this;
+declare global {
+    interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement> {
+        alert(action?: "close" | "dispose"): this;
 
-    button(action: "toggle" | "dispose"): this;
+        button(action: "toggle" | "dispose"): this;
 
-    carousel(action: "cycle" | "pause" | number | "prev" | "next" | "dispose"): this;
-    carousel(options?: BootstrapCarouselOption): this;
+        carousel(action: "cycle" | "pause" | number | "prev" | "next" | "dispose"): this;
+        carousel(options?: CarouselOption): this;
 
-    collapse(action: "toggle" | "show" | "hide" | "dispose"): this;
-    collapse(options?: BootstrapCollapseOption): this;
+        collapse(action: "toggle" | "show" | "hide" | "dispose"): this;
+        collapse(options?: CollapseOption): this;
 
-    dropdown(action: "toggle" | "update" | "dispose"): this;
-    dropdown(options?: BootstrapDropdownOption): this;
+        dropdown(action: "toggle" | "update" | "dispose"): this;
+        dropdown(options?: DropdownOption): this;
 
-    modal(action: "toggle" | "show" | "hide" | "handleUpdate" | "dispose"): this;
-    modal(options?: BootstrapModalOption): this;
+        modal(action: "toggle" | "show" | "hide" | "handleUpdate" | "dispose"): this;
+        modal(options?: ModalOption): this;
 
-    popover(action: "show" | "hide" | "toggle" | "dispose" | "enable" | "disable" | "toggleEnabled" | "update"): this;
-    popover(options?: BootstrapPoppoverOption): this;
+        popover(action: "show" | "hide" | "toggle" | "dispose" | "enable" | "disable" | "toggleEnabled" | "update"): this;
+        popover(options?: PoppoverOption): this;
 
-    scrollspy(action: "refresh" | "dispose"): this;
-    scrollspy(options?: BootstrapScrollspyOption): this;
+        scrollspy(action: "refresh" | "dispose"): this;
+        scrollspy(options?: ScrollspyOption): this;
 
-    tab(action: "show" | "dispose"): this;
+        tab(action: "show" | "dispose"): this;
 
-    tooltip(action: "show" | "hide" | "toggle" | "dispose" | "enable" | "disable" | "toggleEnabled" | "update"): this;
-    tooltip(options?: BootstrapTooltipOption): this;
+        tooltip(action: "show" | "hide" | "toggle" | "dispose" | "enable" | "disable" | "toggleEnabled" | "update"): this;
+        tooltip(options?: TooltipOption): this;
 
-    on(events: BootstrapCarouselEvent, handler: JQuery.EventHandlerBase<TElement, BootstrapCarouselEventHandler<TElement>>): this;
-    on(events:
-        BootstrapAlertEvent | BootstrapCollapseEvent | BootstrapDropdownEvent | BootstrapModalEvent |
-        BootstrapPopoverEvent | BootstrapScrollspyEvent | BootstrapTapEvent | BootstrapTooltipEvent,
-        handler: JQuery.EventHandler<TElement>): this;
+        on(events: CarouselEvent, handler: JQuery.EventHandlerBase<TElement, CarouselEventHandler<TElement>>): this;
+        on(events:
+            AlertEvent | CollapseEvent | DropdownEvent | ModalEvent |
+            PopoverEvent | ScrollspyEvent | TapEvent | TooltipEvent,
+            handler: JQuery.EventHandler<TElement>): this;
+    }
 }

From 351a918bfbe86af29b8902031fb53416692f0d1e Mon Sep 17 00:00:00 2001
From: Jan Pilzer <jan.pilzer@gmx.de>
Date: Mon, 5 Mar 2018 14:17:02 -0800
Subject: [PATCH 0264/1382] Atom: Add id to DisplayMarkerLayer

---
 types/atom/index.d.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/types/atom/index.d.ts b/types/atom/index.d.ts
index 925061ed63..ba933e21e0 100644
--- a/types/atom/index.d.ts
+++ b/types/atom/index.d.ts
@@ -654,6 +654,9 @@ export interface DisplayMarker {
  *  This API is experimental and subject to change on any release.
  */
 export interface DisplayMarkerLayer {
+    /** The identifier for the underlying MarkerLayer. */
+    id: string;
+
     // Lifecycle
     /** Destroy this layer. */
     destroy(): void;

From cdd1c694882addaffcc8bab5bbe1c7f63997a7db Mon Sep 17 00:00:00 2001
From: Jan Pilzer <jan.pilzer@gmx.de>
Date: Mon, 5 Mar 2018 14:17:40 -0800
Subject: [PATCH 0265/1382] Atom: Add tests for MarkerLayer id

---
 types/atom/atom-tests.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/types/atom/atom-tests.ts b/types/atom/atom-tests.ts
index e53e29b176..adf1697015 100644
--- a/types/atom/atom-tests.ts
+++ b/types/atom/atom-tests.ts
@@ -719,6 +719,9 @@ function testDisplayMarker() {
 
 // DisplayMarkerLayer =========================================================
 function testDisplayMarkerLayer() {
+    // Properties
+    str = displayMarkerLayer.id;
+
     // Lifecycle
     displayMarkerLayer.destroy();
     displayMarkerLayer.clear();
@@ -1274,6 +1277,9 @@ function testMarker() {
 
 // MarkerLayer ================================================================
 function testMarkerLayer() {
+    // Properties
+    str = markerLayer.id;
+
     // Lifecycle
     markerLayer = markerLayer.copy();
     bool = markerLayer.destroy();

From e3692acebbb1a51f948ccb1b7cedd709d236ab06 Mon Sep 17 00:00:00 2001
From: Juanjo Diaz <juanjo.diaz@intopalo.com>
Date: Mon, 5 Mar 2018 23:50:08 +0200
Subject: [PATCH 0266/1382] Add json2csv types

---
 types/json2csv/JSON2CSVBase.d.ts      | 108 ++++++++++++++++++++++++++
 types/json2csv/JSON2CSVParser.d.ts    |  30 +++++++
 types/json2csv/JSON2CSVTransform.d.ts |  97 +++++++++++++++++++++++
 types/json2csv/index.d.ts             |  18 +++++
 types/json2csv/json2csv-tests.ts      |  98 +++++++++++++++++++++++
 types/json2csv/tsconfig.json          |  23 ++++++
 types/json2csv/tslint.json            |   1 +
 7 files changed, 375 insertions(+)
 create mode 100644 types/json2csv/JSON2CSVBase.d.ts
 create mode 100644 types/json2csv/JSON2CSVParser.d.ts
 create mode 100644 types/json2csv/JSON2CSVTransform.d.ts
 create mode 100644 types/json2csv/index.d.ts
 create mode 100644 types/json2csv/json2csv-tests.ts
 create mode 100644 types/json2csv/tsconfig.json
 create mode 100644 types/json2csv/tslint.json

diff --git a/types/json2csv/JSON2CSVBase.d.ts b/types/json2csv/JSON2CSVBase.d.ts
new file mode 100644
index 0000000000..165497b4c8
--- /dev/null
+++ b/types/json2csv/JSON2CSVBase.d.ts
@@ -0,0 +1,108 @@
+export declare namespace json2csv {
+    export interface FieldValueCallback<T> {
+        (row: T, field: string): string;
+    }
+
+    export interface FieldInfo<T> {
+        label: string;
+        default?: string;
+        value?: string | FieldValueCallback<T>;
+    }
+
+    export interface Options<T> {
+        fields?: (string | FieldInfo<T>);
+        ndjson?: boolean;
+        unwind?: string | string[];
+        flatten?: boolean;
+        defaultValue?: string;
+        quote?: string;
+        doubleQuote?: string;
+        delimiter?: string;
+        eol?: string;
+        excelStrings?: boolean;
+        header?: boolean;
+        includeEmptyRows?: boolean;
+        withBOM?: boolean;
+    }
+}
+
+declare abstract class JSON2CSVBase<T> {
+    constructor(opts?: json2csv.Options<T>);
+
+    /**
+     * Check passing opts and set defaults.
+     *
+     * @param {json2csv.Options} opts Options object containing fields,
+     * delimiter, default value, quote mark, header, etc.
+     * @returns {json2csv.Options} preprocessed Options object
+     */
+    protected preprocessOpts(opts?: json2csv.Options<T>) : json2csv.Options<T>;
+
+    /**
+     * Create the title row with all the provided fields as column headings
+     *
+     * @returns {string} titles as a string
+     */
+    protected getHeader(): string;
+
+    /**
+     * Preprocess each object according to the give opts (unwind, flatten, etc.).
+     *
+     * @param {object} row JSON object to be converted in a CSV row
+     */
+    protected preprocessRow(row: T): object;
+
+    /**
+     * Create the content of a specific CSV row
+     *
+     * @param {object} row JSON object to be converted in a CSV row
+     * @returns {string} CSV string (row)
+     */
+    protected processRow(row: T): string;
+
+    /**
+     * Create the content of a specfic CSV row cell
+     *
+     * @param {object} row JSON object representing the  CSV row that the cell belongs to
+     * @param {object} fieldInfo Details of the field to process to be a CSV cell
+     * @returns {string} CSV string (cell)
+     */
+    protected processCell(row: T, fieldInfo: json2csv.FieldInfo<T>) : string;
+
+    /**
+     * Create the content of a specfic CSV row cell
+     *
+     * @param {object} row JSON object representing the  CSV row that the cell belongs to
+     * @param {json2csv.FieldInfo} fieldInfo Details of the field to process to be a CSV cell
+     * @returns {any} Field value
+     */
+    protected getValue(row: T, fieldInfo: json2csv.FieldInfo<T>): any;
+
+    /**
+     * Create the content of a specfic CSV row cell
+     *
+     * @param {any} value Value to be included in a CSV cell
+     * @param {Boolean} stringify Details of the field to process to be a CSV cell
+     * @returns {string} Value stringified and processed
+     */
+    protected processValue(value: any, stringify: Boolean): string;
+
+    /**
+     * Performs the flattening of a data row recursively
+     *
+     * @param {object} dataRow Original JSON object
+     * @returns {object} Flattened object
+     */
+    protected flatten(dataRow: T): object;
+
+    /**
+     * Performs the unwind recursively in specified sequence
+     *
+     * @param {object[]} dataRow Original JSON object
+     * @param {string[]} unwindPaths The paths as strings to be used to deconstruct the array
+     * @returns {Array} Array of objects containing all rows after unwind of chosen paths
+     */
+    protected unwindData(dataRow: Array<T>, unwindPaths: Array<string>): Array<object>;
+}
+
+export default JSON2CSVBase;
diff --git a/types/json2csv/JSON2CSVParser.d.ts b/types/json2csv/JSON2CSVParser.d.ts
new file mode 100644
index 0000000000..1f134f874c
--- /dev/null
+++ b/types/json2csv/JSON2CSVParser.d.ts
@@ -0,0 +1,30 @@
+import JSON2CSVBase from './JSON2CSVBase';
+
+declare class JSON2CSVParser<T> extends JSON2CSVBase<T> {
+    /**
+     * Main function that converts json to csv.
+     *
+     * @param {object|object[]} data Array of JSON objects to be converted to CSV
+     * @returns {string} The CSV formated data as a string
+     */
+    public parse(data: Readonly<T> | ReadonlyArray<T>): string;
+
+    /**
+     * Preprocess the data according to the give opts (unwind, flatten, etc.)
+        and calculate the fields and field names if they are not provided.
+     *
+     * @param {object|object[]} data Array or object to be converted to CSV
+     * @returns {object[]} Preprocessed data ready to be processed
+     */
+    protected preprocessData(data: T | Array<T>): Array<T>;
+
+    /**
+     * Create the content row by row below the header
+     *
+     * @param {object[]} data Array of JSON objects to be converted to CSV
+     * @returns {string} CSV string (body)
+     */
+    protected processData(data: Array<T>): string;
+}
+
+export default JSON2CSVParser;
diff --git a/types/json2csv/JSON2CSVTransform.d.ts b/types/json2csv/JSON2CSVTransform.d.ts
new file mode 100644
index 0000000000..1785e09214
--- /dev/null
+++ b/types/json2csv/JSON2CSVTransform.d.ts
@@ -0,0 +1,97 @@
+/// <reference types="node" />
+
+import { json2csv } from './JSON2CSVBase';
+import JSON2CSVBase from './JSON2CSVBase';
+import { Transform, TransformOptions } from 'stream';
+
+declare class JSON2CSVTransform<T> extends Transform { // implements JSON2CSVBase<T>
+    constructor(opts?: json2csv.Options<T>, transformOpts?: TransformOptions);
+
+    /**
+     * Transforms an incoming json data to csv and pushes it downstream.
+     *
+     * @param {object} data JSON object to be converted in a CSV row
+     */
+    protected pushLine(data: T): void;
+
+    /*******************************************************************************
+    * Everything below is copy-pasted from JSON2CSVBase and should be keep in sync *
+    ********************************************************************************/
+
+    /**
+     * Check passing opts and set defaults.
+     *
+     * @param {json2csv.Options} opts Options object containing fields,
+     * delimiter, default value, quote mark, header, etc.
+     * @returns {json2csv.Options} preprocessed Options object
+     */
+    protected preprocessOpts(opts?: json2csv.Options<T>) : json2csv.Options<T>;
+
+    /**
+     * Create the title row with all the provided fields as column headings
+     *
+     * @returns {string} titles as a string
+     */
+    protected getHeader(): string;
+
+    /**
+     * Preprocess each object according to the give opts (unwind, flatten, etc.).
+     *
+     * @param {object} row JSON object to be converted in a CSV row
+     */
+    protected preprocessRow(row: T): object;
+
+    /**
+     * Create the content of a specific CSV row
+     *
+     * @param {object} row JSON object to be converted in a CSV row
+     * @returns {string} CSV string (row)
+     */
+    protected processRow(row: T): string;
+
+    /**
+     * Create the content of a specfic CSV row cell
+     *
+     * @param {object} row JSON object representing the  CSV row that the cell belongs to
+     * @param {object} fieldInfo Details of the field to process to be a CSV cell
+     * @returns {string} CSV string (cell)
+     */
+    protected processCell(row: T, fieldInfo: json2csv.FieldInfo<T>) : string;
+
+    /**
+     * Create the content of a specfic CSV row cell
+     *
+     * @param {object} row JSON object representing the  CSV row that the cell belongs to
+     * @param {json2csv.FieldInfo} fieldInfo Details of the field to process to be a CSV cell
+     * @returns {any} Field value
+     */
+    protected getValue(row: T, fieldInfo: json2csv.FieldInfo<T>): any;
+
+    /**
+     * Create the content of a specfic CSV row cell
+     *
+     * @param {any} value Value to be included in a CSV cell
+     * @param {Boolean} stringify Details of the field to process to be a CSV cell
+     * @returns {string} Value stringified and processed
+     */
+    protected processValue(value: any, stringify: Boolean): string;
+
+    /**
+     * Performs the flattening of a data row recursively
+     *
+     * @param {object} dataRow Original JSON object
+     * @returns {object} Flattened object
+     */
+    protected flatten(dataRow: T): object;
+
+    /**
+     * Performs the unwind recursively in specified sequence
+     *
+     * @param {object[]} dataRow Original JSON object
+     * @param {string[]} unwindPaths The paths as strings to be used to deconstruct the array
+     * @returns {Array} Array of objects containing all rows after unwind of chosen paths
+     */
+    protected unwindData(dataRow: Array<T>, unwindPaths: Array<string>): Array<object>;
+}
+
+export default JSON2CSVTransform;
diff --git a/types/json2csv/index.d.ts b/types/json2csv/index.d.ts
new file mode 100644
index 0000000000..159dec6eb1
--- /dev/null
+++ b/types/json2csv/index.d.ts
@@ -0,0 +1,18 @@
+// Type definitions for json2csv 4.0
+// Project: https://github.com/zemirco/json2csv
+// Definitions by: Juanjo Diaz <https://github.com/juanjoDiaz>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+import { json2csv } from './JSON2CSVBase';
+import JSON2CSVParser from './JSON2CSVParser';
+import JSON2CSVTransform from './JSON2CSVTransform';
+
+export {
+	json2csv,
+	JSON2CSVParser as Parser,
+	JSON2CSVTransform as Transform
+};
+
+// Convenience method to keep the API similar to version 3.X
+export function parse<T>(data: Readonly<T> | ReadonlyArray<T>, opts?: json2csv.Options<T>): string;
diff --git a/types/json2csv/json2csv-tests.ts b/types/json2csv/json2csv-tests.ts
new file mode 100644
index 0000000000..566cc06cee
--- /dev/null
+++ b/types/json2csv/json2csv-tests.ts
@@ -0,0 +1,98 @@
+import { json2csv, parse, Parser, Transform } from 'json2csv';
+import { Transform as NodeTransform } from 'stream';
+
+let s: string;
+let obj: object;
+
+interface ExampleObj {
+    str?: string;
+    num?: number;
+    obj?: object;
+}
+
+/**************
+ * Public API *
+ **************/
+parse({});
+parse([]);
+parse({}, {});
+
+new Parser();
+const parser: Parser<ExampleObj> = new Parser({});
+s = parser.parse({ str: '', num: 1, obj: {} });
+parser.parse([]);
+const transform: Transform<ExampleObj> = new Transform<ExampleObj>({ quote: '' });
+const nodeTransform: NodeTransform = transform;
+
+/********************
+ * Internal Methods *
+ ********************/
+class ParserExt extends Parser<ExampleObj> {
+    constructor() {
+        super();
+        // Parser methods
+        obj = this.preprocessData({});
+        obj = this.preprocessData({ str: '', num: 1, obj: {} });
+        obj = this.preprocessData([]);
+        s = this.processData([]);
+
+        // JSON2CSVBase methods
+        let opts: json2csv.Options<ExampleObj>;
+        opts = this.preprocessOpts();
+        opts = this.preprocessOpts(opts);
+        s = this.getHeader();
+        obj = this.preprocessRow({});
+        obj = this.preprocessRow({ str: '', num: 1, obj: {} });
+        s = this.processRow({});
+        s = this.processRow({ str: '', num: 1, obj: {} });
+        s = this.processCell({}, { label: 'test', default: 'test2', value: 'field' });
+        s = this.processCell({ str: '', num: 1, obj: {} }, { label: 'test', default: 'test2', value: 'field' });
+        s = this.processCell({}, { label: 'test', default: 'test2', value: (row: object, field: string) => 'string' });
+        s = this.processCell({ str: '', num: 1, obj: {} }, { label: 'test', default: 'test2', value: (row: object, field: string) => 'string' });
+        this.getValue({}, { label: 'test' });
+        this.getValue({ str: '', num: 1, obj: {} }, { label: 'test' });
+        s = this.processValue(undefined, true);
+        s = this.processValue(null, true);
+        s = this.processValue(1, true);
+        s = this.processValue('test', true);
+        s = this.processValue(new Date(), true);
+        s = this.processValue({}, true);
+        s = this.processValue([], true);
+        const flattenedData: object = this.flatten({});
+        const unwindedData: object[] = this.unwindData([], []);
+    }
+}
+
+class TransformExt extends Transform<ExampleObj> {
+    constructor() {
+        super();
+        // Transform methods
+        this.pushLine({});
+        this.pushLine({ str: '', num: 1, obj: {} });
+
+        // JSON2CSVBase methods
+        let opts: json2csv.Options<ExampleObj>;
+        opts = this.preprocessOpts();
+        opts = this.preprocessOpts(opts);
+        s = this.getHeader();
+        obj = this.preprocessRow({});
+        obj = this.preprocessRow({ str: '', num: 1, obj: {} });
+        s = this.processRow({});
+        s = this.processRow({ str: '', num: 1, obj: {} });
+        s = this.processCell({}, { label: 'test', default: 'test2', value: 'field' });
+        s = this.processCell({ str: '', num: 1, obj: {} }, { label: 'test', default: 'test2', value: 'field' });
+        s = this.processCell({}, { label: 'test', default: 'test2', value: (row: object, field: string) => 'string' });
+        s = this.processCell({ str: '', num: 1, obj: {} }, { label: 'test', default: 'test2', value: (row: object, field: string) => 'string' });
+        this.getValue({}, { label: 'test' });
+        this.getValue({ str: '', num: 1, obj: {} }, { label: 'test' });
+        s = this.processValue(undefined, true);
+        s = this.processValue(null, true);
+        s = this.processValue(1, true);
+        s = this.processValue('test', true);
+        s = this.processValue(new Date(), true);
+        s = this.processValue({}, true);
+        s = this.processValue([], true);
+        const flattenedData: object = this.flatten({});
+        const unwindedData: object[] = this.unwindData([], []);
+    }
+}
diff --git a/types/json2csv/tsconfig.json b/types/json2csv/tsconfig.json
new file mode 100644
index 0000000000..23d379918c
--- /dev/null
+++ b/types/json2csv/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "json2csv-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/json2csv/tslint.json b/types/json2csv/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/json2csv/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From ec8691b39d337922665dfdc4d73b5491d3b8cf44 Mon Sep 17 00:00:00 2001
From: Dennis George <dennispg@gmail.com>
Date: Mon, 5 Mar 2018 16:25:58 -0600
Subject: [PATCH 0267/1382] added Compiler and Compilation hooks defs

---
 types/tapable/index.d.ts          |  72 ++++++-
 types/tapable/v0/index.d.ts       | 213 +++++++++++++++++++
 types/tapable/v0/tapable-tests.ts |  45 ++++
 types/tapable/v0/tsconfig.json    |  27 +++
 types/webpack/index.d.ts          | 338 +++++++++++++++++++++++++++++-
 types/webpack/tsconfig.json       |   5 +-
 types/webpack/webpack-tests.ts    |  77 +++++++
 7 files changed, 774 insertions(+), 3 deletions(-)
 create mode 100644 types/tapable/v0/index.d.ts
 create mode 100644 types/tapable/v0/tapable-tests.ts
 create mode 100644 types/tapable/v0/tsconfig.json

diff --git a/types/tapable/index.d.ts b/types/tapable/index.d.ts
index b291b4ae40..7df29da48b 100644
--- a/types/tapable/index.d.ts
+++ b/types/tapable/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for tapable v0.2.5
+// Type definitions for tapable v1.0.0
 // Project: https://github.com/webpack/tapable.git
 // Definitions by: e-cloud <https://github.com/e-cloud>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -9,6 +9,7 @@ declare abstract class Tapable {
     }
 
     /**
+     * @deprecated Tapable.plugin is deprecated. Use new API on `.hooks` instead
      * Register plugin(s)
      * This acts as the same as on() of EventEmitter, for registering a handler/listener to do something when the
      * signal/event happens.
@@ -18,9 +19,11 @@ declare abstract class Tapable {
      */
     plugin(names: string, handler: (this: this, ...args: any[]) => void): void;
 
+    /** @deprecated Tapable.plugin is deprecated. Use new API on `.hooks` instead */
     plugin(names: string[], handler: (this: this, ...args: any[]) => void): void;
 
     /**
+     * @deprecated Tapable.apply is deprecated. Call apply on the plugin directly instead
      * invoke all plugins with this attached.
      * This method is just to "apply" plugins' definition, so that the real event listeners can be registered into
      * registry. Mostly the `apply` method of a plugin is the main place to place extension logic.
@@ -28,6 +31,7 @@ declare abstract class Tapable {
     apply(...plugins: (((this: this) => any) | Tapable.Plugin)[]): void;
 
     /**
+     * @deprecated Tapable.apply is deprecated. Call apply on the plugin directly instead
      * synchronously applies all registered handlers for target name(event id).
      *
      * The handlers are called with all the rest arguments.
@@ -44,6 +48,7 @@ declare abstract class Tapable {
     applyPlugins2(name: string, param1: any, param2: any): void;
 
     /**
+     * @deprecated Tapable.apply is deprecated. Call apply on the plugin directly instead
      * synchronously applies all registered handlers for target name(event id).
      *
      * The handlers are called with the return value of the previous handler and all the rest arguments.
@@ -55,6 +60,7 @@ declare abstract class Tapable {
     applyPluginsWaterfall(name: string, init: any, ...args: any[]): any;
 
     /**
+     * @deprecated Tapable.apply is deprecated. Call apply on the plugin directly instead
      * synchronously applies all registered handlers for target name(event id).
      *
      * The handlers are called ONLY with the return value of the previous handler.
@@ -66,6 +72,7 @@ declare abstract class Tapable {
     applyPluginsWaterfall0(name: string, init: any): any;
 
     /**
+     * @deprecated Tapable.apply is deprecated. Call apply on the plugin directly instead
      * synchronously applies all registered handlers for target name(event id).
      *
      * The handlers are called with all the rest arguments.
@@ -75,6 +82,7 @@ declare abstract class Tapable {
     applyPluginsBailResult(name: string, ...args: any[]): any;
 
     /**
+     * @deprecated Tapable.apply is deprecated. Call apply on the plugin directly instead
      * synchronously applies all registered handlers for target name(event id).
      *
      * The handlers are called with target param
@@ -88,6 +96,7 @@ declare abstract class Tapable {
     applyPluginsBailResult1(name: string, param: any): any;
 
     /**
+     * @deprecated Tapable.apply is deprecated. Call apply on the plugin directly instead
      * asynchronously applies all registered handlers for target name(event id).
      *
      * The handlers are called with all the rest arguments
@@ -101,6 +110,7 @@ declare abstract class Tapable {
     applyPluginsAsync(name: string, ...args: any[]): void;
 
     /**
+     * @deprecated Tapable.apply is deprecated. Call apply on the plugin directly instead
      * same as `applyPluginsAsync`
      * @see applyPluginsAsync
      * @alias Tapable.applyPluginsAsync
@@ -112,6 +122,7 @@ declare abstract class Tapable {
     applyPluginsAsyncSeries1(name: string, param: any, callback: Tapable.CallbackFunction): void
 
     /**
+     * @deprecated Tapable.apply is deprecated. Call apply on the plugin directly instead
      * asynchronously applies all registered handlers for target name(event id).
      *
      * The handlers are called with all the rest arguments
@@ -127,6 +138,7 @@ declare abstract class Tapable {
     applyPluginsAsyncSeriesBailResult(name: string, ...args: any[]): void;
 
     /**
+     * @deprecated Tapable.apply is deprecated. Call apply on the plugin directly instead
      * asynchronously applies all registered handlers for target name(event id).
      *
      * @see applyPluginsAsyncSeriesBailResult
@@ -139,6 +151,7 @@ declare abstract class Tapable {
     applyPluginsAsyncSeriesBailResult1(name: string, param: any, callback: Tapable.CallbackFunction): void;
 
     /**
+     * @deprecated Tapable.apply is deprecated. Call apply on the plugin directly instead
      * Asynchronously applies all registered handlers for target name(event id).
      *
      * The handlers are called with the current value and a callback function with the signature (err: Error,
@@ -155,6 +168,7 @@ declare abstract class Tapable {
     applyPluginsAsyncWaterfall(name: string, init: any, callback: Tapable.CallbackFunction): void;
 
     /**
+     * @deprecated Tapable.apply is deprecated. Call apply on the plugin directly instead
      * applies all registered handlers for target name(event id) in parallel.
      *
      * The handlers are called with all the rest arguments
@@ -168,6 +182,7 @@ declare abstract class Tapable {
     applyPluginsParallel(name: string, ...args: any[]): void;
 
     /**
+     * @deprecated Tapable.apply is deprecated. Call apply on the plugin directly instead
      * applies all registered handlers for target name(event id) in parallel.
      *
      * The handlers are called with all the rest arguments
@@ -182,6 +197,7 @@ declare abstract class Tapable {
     applyPluginsParallelBailResult(name: string, ...args: any[]): void;
 
     /**
+     * @deprecated Tapable.apply is deprecated. Call apply on the plugin directly instead
      * applies all registered handlers for target name(event id) in parallel.
      *
      * @see applyPluginsParallelBailResult
@@ -208,6 +224,60 @@ declare namespace Tapable {
     interface CallbackFunction {
         (err?: Error, result?: any, ...args: any[]): void;
     }
+
+    type TapType = "sync" | "async" | "promise";
+
+    interface HookCompileOptions {
+        type: TapType;
+    }
+
+    interface Tap {
+        name: string;
+        type: TapType;
+        fn: Function;
+        stage: number;
+        context: boolean;
+    }
+
+    interface Hook<TContext = any> {
+        compile(options: HookCompileOptions) : Function;
+        tap: (name: string | Tap, fn: (context: TContext, ...args: any[]) => any) => void;
+        tapAsync: (name: string | Tap, fn: (context: TContext, ...args: any[]) => void) => void;
+        tapPromise: (name: string | Tap, fn: (context: TContext, ...args: any[]) => Promise<any>) => void;
+        intercept: (interceptor: HookInterceptor) => void;
+    }
+
+    interface SyncHook<TContext = any> extends Hook<TContext> {}
+    interface SyncBailHook <TContext = any>extends Hook<TContext> {}
+    interface SyncLoopHook<TContext = any> extends Hook<TContext> {}
+    interface SyncWaterfallHook<TContext = any> extends Hook<TContext> {}
+
+    interface AsyncParallelHook<TContext = any> extends Hook<TContext> {}
+    interface AsyncParallelBailHook<TContext = any> extends Hook<TContext> {}
+    interface AsyncSeriesHook<TContext = any> extends Hook<TContext> {}
+    interface AsyncSeriesBailHook<TContext = any> extends Hook<TContext> {}
+    interface AsyncSeriesWaterfallHook<TContext = any> extends Hook<TContext> {}
+
+    interface HookInterceptor {
+        call: (...args: any[]) => void;
+        loop: (...args: any[]) => void;
+        tap: (tap: Tap) => void;
+        register: (tap: Tap) => Tap | undefined;
+        context: boolean;
+    }
+
+    interface HookMap<TContext = any> {
+        get: (key: any) => Hook<TContext> | undefined;
+        for: (key: any) => Hook<TContext>;
+        tap: (key: any, name: string | Tap, fn: (context: TContext, ...args: any[]) => any) => void;
+        tapAsync: (key: any, name: string | Tap, fn: (context: TContext, ...args: any[]) => void) => void;
+        tapPromise: (key: any, name: string | Tap, fn: (context: any, ...args: any[]) => Promise<any>) => void;
+        intercept: (interceptor: HookMapInterceptor<TContext>) => TContext;
+    }
+
+    interface HookMapInterceptor<TContext = any> {
+        factory: (key: any, hook: Hook<TContext>) => Hook<TContext>;
+    }
 }
 
 export = Tapable
diff --git a/types/tapable/v0/index.d.ts b/types/tapable/v0/index.d.ts
new file mode 100644
index 0000000000..b291b4ae40
--- /dev/null
+++ b/types/tapable/v0/index.d.ts
@@ -0,0 +1,213 @@
+// Type definitions for tapable v0.2.5
+// Project: https://github.com/webpack/tapable.git
+// Definitions by: e-cloud <https://github.com/e-cloud>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare abstract class Tapable {
+    private _plugins: {
+        [propName: string]: Tapable.Handler[]
+    }
+
+    /**
+     * Register plugin(s)
+     * This acts as the same as on() of EventEmitter, for registering a handler/listener to do something when the
+     * signal/event happens.
+     *
+     * @param names a string or an array of strings to generate the id(group name) of plugins
+     * @param handler a function which provides the plugin functionality *
+     */
+    plugin(names: string, handler: (this: this, ...args: any[]) => void): void;
+
+    plugin(names: string[], handler: (this: this, ...args: any[]) => void): void;
+
+    /**
+     * invoke all plugins with this attached.
+     * This method is just to "apply" plugins' definition, so that the real event listeners can be registered into
+     * registry. Mostly the `apply` method of a plugin is the main place to place extension logic.
+     */
+    apply(...plugins: (((this: this) => any) | Tapable.Plugin)[]): void;
+
+    /**
+     * synchronously applies all registered handlers for target name(event id).
+     *
+     * The handlers are called with all the rest arguments.
+     *
+     * @param name - plugin group name
+     * @param args
+     */
+    applyPlugins(name: string, ...args: any[]): void;
+
+    applyPlugins0(name: string): void;
+
+    applyPlugins1(name: string, param: any): void;
+
+    applyPlugins2(name: string, param1: any, param2: any): void;
+
+    /**
+     * synchronously applies all registered handlers for target name(event id).
+     *
+     * The handlers are called with the return value of the previous handler and all the rest arguments.
+     *
+     * `init` is used for the first handler.
+     *
+     * return the returned value of the last handler
+     */
+    applyPluginsWaterfall(name: string, init: any, ...args: any[]): any;
+
+    /**
+     * synchronously applies all registered handlers for target name(event id).
+     *
+     * The handlers are called ONLY with the return value of the previous handler.
+     *
+     * `init` is used for the first handler.
+     *
+     * return the returned value of the last handler
+     */
+    applyPluginsWaterfall0(name: string, init: any): any;
+
+    /**
+     * synchronously applies all registered handlers for target name(event id).
+     *
+     * The handlers are called with all the rest arguments.
+     *
+     * If a handler returns something !== undefined, that value is returned and no more handlers will be applied.
+     */
+    applyPluginsBailResult(name: string, ...args: any[]): any;
+
+    /**
+     * synchronously applies all registered handlers for target name(event id).
+     *
+     * The handlers are called with target param
+     *
+     * If a handler returns something !== undefined, the value is returned and no more handlers are applied.
+     *
+     * Note: the fundamental difference with `{@link applyPluginsBailResult}`, is that,
+     *       `{@link applyPluginsBailResult}` passes the arguments as arguments list for plugins
+     *       while `{@link applyPluginsBailResult1}` passes the arguments as single param(any type) for plugins
+     */
+    applyPluginsBailResult1(name: string, param: any): any;
+
+    /**
+     * asynchronously applies all registered handlers for target name(event id).
+     *
+     * The handlers are called with all the rest arguments
+     * and a callback function with the signature (err: Error) => void.
+     *
+     * The handlers are called in series, one at a time. After all handlers are applied, callback is called.
+     *
+     * If any handler invokes the (anonymous)callback with error, no more handlers will be called
+     * and the real callback is call with that error.
+     */
+    applyPluginsAsync(name: string, ...args: any[]): void;
+
+    /**
+     * same as `applyPluginsAsync`
+     * @see applyPluginsAsync
+     * @alias Tapable.applyPluginsAsync
+     * @param name
+     * @param args
+     */
+    applyPluginsAsyncSeries(name: string, ...args: any[]): void;
+
+    applyPluginsAsyncSeries1(name: string, param: any, callback: Tapable.CallbackFunction): void
+
+    /**
+     * asynchronously applies all registered handlers for target name(event id).
+     *
+     * The handlers are called with all the rest arguments
+     * and a callback function with the signature (...params) => void.
+     *
+     * Handlers must invoke the (anonymous)callback, otherwise the series is cut down and real callback won't be
+     * invoked.
+     *
+     * The order is defined by registration order not by speed of the handler function.
+     *
+     * If a handler returns something !== undefined, that value is returned and no more handlers will be applied.
+     */
+    applyPluginsAsyncSeriesBailResult(name: string, ...args: any[]): void;
+
+    /**
+     * asynchronously applies all registered handlers for target name(event id).
+     *
+     * @see applyPluginsAsyncSeriesBailResult
+     *
+     * Note: the fundamental difference with `{@link applyPluginsAsyncSeriesBailResult}`, is that,
+     *       `{@link applyPluginsAsyncSeriesBailResult}` passes the arguments as arguments list for plugins
+     *       while `{@link applyPluginsAsyncSeriesBailResult1}` passes the arguments as single param(any type)
+     *       and a callback for plugins
+     */
+    applyPluginsAsyncSeriesBailResult1(name: string, param: any, callback: Tapable.CallbackFunction): void;
+
+    /**
+     * Asynchronously applies all registered handlers for target name(event id).
+     *
+     * The handlers are called with the current value and a callback function with the signature (err: Error,
+     * nextValue: any) => void.
+     *
+     * `init` is used for the first handler. The rest handles are called with the value which previous handler uses
+     * to invoke the (anonymous)callback invoked
+     *
+     * After all handlers are applied, callback is called with the last value.
+     *
+     * If any handler invokes the (anonymous)callback with error, no more handlers will be called
+     * and the real callback is call with that error.
+     */
+    applyPluginsAsyncWaterfall(name: string, init: any, callback: Tapable.CallbackFunction): void;
+
+    /**
+     * applies all registered handlers for target name(event id) in parallel.
+     *
+     * The handlers are called with all the rest arguments
+     * and a callback function with the signature (err?: Error) => void.
+     *
+     * The callback function is called when all handlers call the callback without err.
+     *
+     * If any handler invokes the callback with err, callback is invoked with this error and the other handlers are
+     * skipped.
+     */
+    applyPluginsParallel(name: string, ...args: any[]): void;
+
+    /**
+     * applies all registered handlers for target name(event id) in parallel.
+     *
+     * The handlers are called with all the rest arguments
+     * and a callback function with the signature (currentResult?: []) => void.
+     *
+     * Handlers must call the callback.
+     *
+     * The first result (either error or value) with is not undefined is passed to the callback.
+     *
+     * The order is defined by registration not by speed of the handler function.
+     */
+    applyPluginsParallelBailResult(name: string, ...args: any[]): void;
+
+    /**
+     * applies all registered handlers for target name(event id) in parallel.
+     *
+     * @see applyPluginsParallelBailResult
+     *
+     * Note: the fundamental difference with `{@link applyPluginsParallelBailResult}`, is that,
+     *       `{@link applyPluginsParallelBailResult}` passes the arguments as arguments list for plugins
+     *       while `{@link applyPluginsParallelBailResult1}` passes the arguments as single param(any type)
+     *       and a callback for plugins
+     */
+    applyPluginsParallelBailResult1(name: string, param: any, callback: Tapable.CallbackFunction): void;
+
+    static mixin(proto: any): void;
+}
+
+declare namespace Tapable {
+    interface Handler {
+        (...args: any[]): void;
+    }
+
+    interface Plugin {
+        apply(...args: any[]): void;
+    }
+
+    interface CallbackFunction {
+        (err?: Error, result?: any, ...args: any[]): void;
+    }
+}
+
+export = Tapable
diff --git a/types/tapable/v0/tapable-tests.ts b/types/tapable/v0/tapable-tests.ts
new file mode 100644
index 0000000000..60e299b4a0
--- /dev/null
+++ b/types/tapable/v0/tapable-tests.ts
@@ -0,0 +1,45 @@
+import Tapable = require('tapable');
+
+class DllPlugin {
+    apply(compiler: Compiler) {
+        compiler.plugin('doSomething', function (...args: string[]) {
+            console.log(args);
+        });
+
+        compiler.plugin(['doSomething', 'doNothing'], function (...args: string[]) {
+            console.log(args);
+        });
+    }
+}
+
+class Compiler extends Tapable {
+    constructor(){
+        super()
+    }
+}
+
+const compiler = new Compiler();
+
+let callback: Tapable.CallbackFunction = function () {
+
+};
+
+compiler.apply(new DllPlugin());
+
+compiler.applyPlugins('doSomething', 'a', 'b');
+compiler.applyPlugins0('doSomething');
+compiler.applyPlugins1('doSomething', 'a');
+compiler.applyPlugins2('doSomething', 'a', 'b');
+compiler.applyPluginsWaterfall('doSomething', 'a', 'b');
+compiler.applyPluginsWaterfall0('doSomething', 'a');
+compiler.applyPluginsBailResult('doSomething', 'a', 'b');
+compiler.applyPluginsBailResult1('doSomething', ['a', 'b']);
+compiler.applyPluginsAsync('doSomething', 'a', 'b');
+compiler.applyPluginsAsyncSeries('doSomething', 'a', 'b');
+compiler.applyPluginsAsyncSeries1('doSomething', 'a', callback);
+compiler.applyPluginsAsyncSeriesBailResult('doSomething', 'a', 'b');
+compiler.applyPluginsAsyncSeriesBailResult1('doSomething', 'a', callback);
+compiler.applyPluginsAsyncWaterfall('doSomething', 'a', callback);
+compiler.applyPluginsParallel('doSomething', 'a', 'b');
+compiler.applyPluginsParallelBailResult('doSomething', 'a', 'b');
+compiler.applyPluginsParallelBailResult1('doSomething', 'a', callback);
diff --git a/types/tapable/v0/tsconfig.json b/types/tapable/v0/tsconfig.json
new file mode 100644
index 0000000000..bef7e6f016
--- /dev/null
+++ b/types/tapable/v0/tsconfig.json
@@ -0,0 +1,27 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "paths": {
+            "tapable": ["tapable/v0"]
+        }
+    },
+    "files": [
+        "index.d.ts",
+        "tapable-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/webpack/index.d.ts b/types/webpack/index.d.ts
index 58333632cd..4c2dc207bb 100644
--- a/types/webpack/index.d.ts
+++ b/types/webpack/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for webpack 4.0
+// Type definitions for webpack 4.1.0
 // Project: https://github.com/webpack/webpack
 // Definitions by: Qubo <https://github.com/tkqubo>
 //                 Benjamin Lim <https://github.com/bumbleblym>
@@ -10,6 +10,7 @@
 //                 Alan Agius <https://github.com/alan-agius4>
 //                 Spencer Elliott <https://github.com/elliottsj>
 //                 Jason Cheatham <https://github.com/jason0x43>
+//                 Dennis George <https://github.com/dennispg>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -599,6 +600,311 @@ declare namespace webpack {
         }
     }
 
+    class Chunk {
+        constructor(name: string);
+        id: any;
+        ids: any;
+        debugId: number;
+        name: any;
+        entryModule: any;
+        files: any[];
+        rendered: boolean;
+        hash: any;
+        renderedHash: any;
+        chunkReason: any;
+        extraAsync: boolean;
+
+        hasRuntime(): boolean;
+        canBeInitial(): boolean;
+        isOnlyInitial(): boolean;
+        hasEntryModule() : boolean;
+
+        addModule(module: any): boolean;
+        removeModule(module: any): boolean;
+        setModules(modules: any): void;
+        getNumberOfModules(): number;
+        modulesIterable: any[];
+
+        addGroup(chunkGroup: any): boolean;
+        removeGroup(chunkGroup: any): boolean;
+        isInGroup(chunkGroup: any): boolean;
+        getNumberOfGroups(): number;
+        groupsIterable: any[];
+
+        compareTo(otherChunk: any): -1 | 0 | 1;
+        containsModule(module: any): boolean;
+        getModules(): any[];
+        getModulesIdent(): any[];
+        remove(reason: any): void;
+        moveModule(module: any, otherChunk: any): void;
+        integrate(otherChunk: any, reason: any): boolean;
+        split(newChunk: any): void;
+        isEmpty(): boolean;
+        updateHash(hash: any): void;
+        canBeIntegrated(otherChunk: any): boolean;
+        addMultiplierAndOverhead(size: number, options: any): number;
+        modulesSize(): number;
+        size(options: any): number;
+        integratedSize(otherChunk: any, options: any): number;
+        sortModules(sortByFn: Function): void;
+        getAllAsyncChunks(): Set<any>;
+        getChunkMaps(realHash: any): { hash: any, name: any };
+        getChunkModuleMaps(filterFn: Function): { id: any, hash: any };
+        hasModuleInGraph(filterFn: Function, filterChunkFn: Function): boolean;
+        toString(): string;
+    }
+
+    class Dependency {
+        constructor();
+        getResourceIdentifier(): any;
+        getReference(): any;
+        getExports() : any;
+        getWarnings(): any;
+        getErrors(): any;
+        updateHash(hash: any): void;
+        disconnect(): void;
+        static compare(a: any, b: any): any;
+    }
+
+    interface NormalModuleFactoryHooks {
+        resolver: Tapable.SyncWaterfallHook;
+        factory: Tapable.SyncWaterfallHook;
+        beforeResolve: Tapable.AsyncSeriesWaterfallHook;
+        afterResolve: Tapable.AsyncSeriesWaterfallHook;
+        createModule: Tapable.SyncBailHook;
+        module: Tapable.SyncWaterfallHook;
+        createParser: Tapable.HookMap;
+        parser: Tapable.HookMap;
+        createGenerator: Tapable.HookMap;
+        generator: Tapable.HookMap;
+    }
+
+    class NormalModuleFactory extends Tapable {
+        hooks: NormalModuleFactoryHooks;
+    }
+
+    interface ContextModuleFactoryHooks {
+        beforeResolve: Tapable.AsyncSeriesWaterfallHook;
+        afterResolve: Tapable.AsyncSeriesWaterfallHook;
+        contextModuleFiles: Tapable.SyncWaterfallHook;
+        alternatives: Tapable.AsyncSeriesWaterfallHook;
+    }
+
+    class ContextModuleFactory extends Tapable {
+        hooks: ContextModuleFactoryHooks;
+    }
+
+    class DllModuleFactory extends Tapable {
+        hooks: {};
+    }
+
+    interface CompilationHooks {
+        buildModule: Tapable.SyncHook;
+        rebuildModule: Tapable.SyncHook;
+        failedModule: Tapable.SyncHook;
+        succeedModule: Tapable.SyncHook;
+
+        finishModules: Tapable.SyncHook;
+        finishRebuildingModule: Tapable.SyncHook;
+
+        unseal: Tapable.SyncHook;
+        seal: Tapable.SyncHook;
+
+        optimizeDependenciesBasic: Tapable.SyncBailHook;
+        optimizeDependencies: Tapable.SyncBailHook;
+        optimizeDependenciesAdvanced: Tapable.SyncBailHook;
+        afterOptimizeDependencies: Tapable.SyncHook;
+
+        optimize: Tapable.SyncHook;
+
+        optimizeModulesBasic: Tapable.SyncBailHook;
+        optimizeModules: Tapable.SyncBailHook;
+        optimizeModulesAdvanced: Tapable.SyncBailHook;
+        afterOptimizeModules: Tapable.SyncHook;
+
+        optimizeChunksBasic: Tapable.SyncBailHook;
+        optimizeChunks: Tapable.SyncBailHook;
+        optimizeChunksAdvanced: Tapable.SyncBailHook;
+        afterOptimizeChunks: Tapable.SyncHook;
+
+        optimizeTree: Tapable.AsyncSeriesHook;
+        afterOptimizeTree: Tapable.SyncHook;
+
+        optimizeChunkModulesBasic: Tapable.SyncBailHook;
+        optimizeChunkModules: Tapable.SyncBailHook;
+        optimizeChunkModulesAdvanced: Tapable.SyncBailHook;
+        afterOptimizeChunkModules: Tapable.SyncHook;
+        shouldRecord: Tapable.SyncBailHook;
+
+        reviveModules: Tapable.SyncHook;
+        optimizeModuleOrder: Tapable.SyncHook;
+        advancedOptimizeModuleOrder: Tapable.SyncHook;
+        beforeModuleIds: Tapable.SyncHook;
+        moduleIds: Tapable.SyncHook;
+        optimizeModuleIds: Tapable.SyncHook;
+        afterOptimizeModuleIds: Tapable.SyncHook;
+
+        reviveChunks: Tapable.SyncHook;
+        optimizeChunkOrder: Tapable.SyncHook;
+        beforeChunkIds: Tapable.SyncHook;
+        optimizeChunkIds: Tapable.SyncHook;
+        afterOptimizeChunkIds: Tapable.SyncHook;
+
+        recordModules: Tapable.SyncHook;
+        recordChunks: Tapable.SyncHook;
+
+        beforeHash: Tapable.SyncHook;
+        afterHash: Tapable.SyncHook;
+
+        recordHash: Tapable.SyncHook;
+
+        record: Tapable.SyncHook;
+
+        beforeModuleAssets: Tapable.SyncHook;
+        shouldGenerateChunkAssets: Tapable.SyncBailHook;
+        beforeChunkAssets: Tapable.SyncHook;
+        additionalChunkAssets: Tapable.SyncHook;
+
+        records: Tapable.SyncHook;
+
+        additionalAssets: Tapable.AsyncSeriesHook;
+        optimizeChunkAssets: Tapable.AsyncSeriesHook<Chunk[]>;
+        afterOptimizeChunkAssets: Tapable.SyncHook;
+        optimizeAssets: Tapable.AsyncSeriesHook;
+        afterOptimizeAssets: Tapable.SyncHook;
+
+        needAdditionalSeal: Tapable.SyncBailHook;
+        afterSeal: Tapable.AsyncSeriesHook;
+
+        chunkHash: Tapable.SyncHook;
+        moduleAsset: Tapable.SyncHook;
+        chunkAsset: Tapable.SyncHook;
+
+        assetPath: Tapable.SyncWaterfallHook;
+
+        needAdditionalPass: Tapable.SyncBailHook;
+        childCompiler: Tapable.SyncHook;
+
+        normalModuleLoader: Tapable.SyncHook;
+
+        optimizeExtractedChunksBasic: Tapable.SyncBailHook;
+        optimizeExtractedChunks: Tapable.SyncBailHook;
+        optimizeExtractedChunksAdvanced: Tapable.SyncBailHook;
+        afterOptimizeExtractedChunks: Tapable.SyncHook;
+    }
+
+    interface CompilationModule {
+        module: any;
+        issuer: boolean;
+        build: boolean;
+        dependencies: boolean;
+    }
+
+    class MainTemplate extends Tapable {}
+    class ChunkTemplate extends Tapable {}
+    class HotUpdateChunkTemplate extends Tapable {}
+    class RuntimeTemplate {}
+
+    interface ModuleTemplateHooks {
+        content: Tapable.SyncWaterfallHook;
+        module: Tapable.SyncWaterfallHook;
+        render: Tapable.SyncWaterfallHook;
+        package: Tapable.SyncWaterfallHook;
+        hash: Tapable.SyncHook
+    }
+
+    class ModuleTemplate extends Tapable {
+        hooks: ModuleTemplateHooks;
+    }
+
+    class Compilation extends Tapable {
+        hooks: CompilationHooks;
+        compiler: Compiler;
+
+        resolverFactory: any;
+		inputFileSystem: any;
+		requestShortener: any;
+
+		outputOptions: any;
+		bail: any;
+		profile: any;
+		performance: any;
+
+		mainTemplate: MainTemplate;
+		chunkTemplate: ChunkTemplate;
+		hotUpdateChunkTemplate: HotUpdateChunkTemplate;
+        runtimeTemplate: RuntimeTemplate;
+		moduleTemplates: {
+			javascript: ModuleTemplate;
+            webassembly: ModuleTemplate;
+        };
+
+        entries: any[];
+		_preparedEntrypoints: any[];
+		entrypoints: Map<any, any>;
+		chunks: any[];
+		chunkGroups: any[];
+		namedChunkGroups: Map<any, any>;
+		namedChunks: Map<any, any>;
+		modules: any[];
+		_modules: Map<any, any>;
+		cache: any;
+		records: any;
+		nextFreeModuleIndex: any;
+		nextFreeModuleIndex2: any;
+		additionalChunkAssets: any[];
+		assets: any;
+		errors: any[];
+		warnings: any[];
+		children: any[];
+        dependencyFactories : Map<typeof Dependency, Tapable>;
+        dependencyTemplates : Map<typeof Dependency, Tapable>;
+        childrenCounters: any;
+		usedChunkIds: any;
+        usedModuleIds: any;
+        getStats(): Stats;
+        addModule(module: CompilationModule, cacheGroup: any): any;
+        // getModule(module)
+        // findModule(identifier)
+        // waitForBuildingFinished(module, callback)
+        // buildModule(module, optional, origin, dependencies, thisCallback)
+        // processModuleDependencies(module, callback)
+        // addModuleDependencies(module, dependencies, bail, cacheGroup, recursive, callback)
+        addEntry(context: any, entry: any, name: any, callback: Function): void;
+        // prefetch(context, dependency, callback)
+        // rebuildModule(module, thisCallback)
+        // finish()
+        // unseal()
+        // seal(callback)
+        // sortModules(modules)
+        // reportDependencyErrorsAndWarnings(module, blocks)
+        // addChunkInGroup(name, module, loc, request)
+        // addChunk(name)
+        // assignIndex(module)
+        // assignDepth(module)
+        // processDependenciesBlocksForChunkGroups(inputChunkGroups)
+        // removeReasonsOfDependencyBlock(module, block)
+        // patchChunksAfterReasonRemoval(module, chunk)
+        // removeChunkFromDependencies(block, chunk)
+        // applyModuleIds()
+        // applyChunkIds()
+        // sortItemsWithModuleIds()
+        // sortItemsWithChunkIds()
+        // summarizeDependencies()
+        // createHash()
+        // modifyHash(update)
+        // createModuleAssets()
+        // createChunkAssets()
+        getPath(filename: string, data: {hash?: any, chunk?: any, filename?: string, basename?: string, query?: any}): string;
+        // createChildCompiler(name, outputOptions, plugins)
+        // checkConstraints()
+
+        /**
+         * @deprecated Compilation.applyPlugins is deprecated. Use new API on `.hooks` instead
+         */
+        applyPlugins(name: string, ...args: any[]): void;
+    }
+
     // tslint:disable-next-line:interface-name
     interface ICompiler {
         run(handler: ICompiler.Handler): void;
@@ -631,9 +937,39 @@ declare namespace webpack {
         invalidate(): void;
     }
 
+    interface CompilerHooks {
+        shouldEmit: Tapable.SyncBailHook;
+        done: Tapable.AsyncSeriesHook;
+        additionalPass: Tapable.AsyncSeriesHook;
+        beforeRun: Tapable.AsyncSeriesHook;
+        run: Tapable.AsyncSeriesHook;
+        emit: Tapable.AsyncSeriesHook;
+        afterEmit: Tapable.AsyncSeriesHook;
+        thisCompilation: Tapable.SyncHook;
+        compilation: Tapable.SyncHook<Compilation>;
+        normalModuleFactory: Tapable.SyncHook<NormalModuleFactory>;
+        contextModuleFactory: Tapable.SyncHook<ContextModuleFactory>;
+        beforeCompile: Tapable.AsyncSeriesHook;
+        compile: Tapable.SyncHook;
+        make: Tapable.AsyncParallelHook;
+        afterCompile: Tapable.AsyncSeriesHook;
+        watchRun: Tapable.AsyncSeriesHook;
+        failed: Tapable.SyncHook;
+        invalid: Tapable.SyncHook;
+        watchClose: Tapable.SyncHook;
+        environment: Tapable.SyncHook;
+        afterEnvironment: Tapable.SyncHook;
+        afterPlugins: Tapable.SyncHook;
+        afterResolvers: Tapable.SyncHook;
+        entryOption: Tapable.SyncBailHook;
+    }
+
     class Compiler extends Tapable implements ICompiler {
         constructor();
 
+        hooks: CompilerHooks;
+        _pluginCompat: Tapable.SyncBailHook<Compilation>;
+
         name: string;
         options: Configuration;
         outputFileSystem: any;
diff --git a/types/webpack/tsconfig.json b/types/webpack/tsconfig.json
index 4cf3324827..dc9eca83d6 100644
--- a/types/webpack/tsconfig.json
+++ b/types/webpack/tsconfig.json
@@ -14,7 +14,10 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true
+        "forceConsistentCasingInFileNames": true,
+        "paths": {
+            "tapable": ["tapable"]
+        }
     },
     "files": [
         "index.d.ts",
diff --git a/types/webpack/webpack-tests.ts b/types/webpack/webpack-tests.ts
index 46a9fb0ca0..e645a568f8 100644
--- a/types/webpack/webpack-tests.ts
+++ b/types/webpack/webpack-tests.ts
@@ -1,4 +1,5 @@
 import webpack = require('webpack');
+import Tapable = require('tapable');
 import { RawSourceMap } from 'source-map';
 
 const {
@@ -580,3 +581,79 @@ configuration = {
 };
 
 plugin = new webpack.SplitChunksPlugin({ chunks: "async", minChunks: 2 });
+
+class SingleEntryDependency extends webpack.Dependency {}
+class MultiEntryDependency extends webpack.Dependency {}
+class MultiModuleFactory extends Tapable {}
+class MultiEntryPlugin extends webpack.Plugin {
+    apply(compiler: webpack.Compiler) {
+        compiler.hooks.compilation.tap(
+            "MultiEntryPlugin",
+            (compilation, { normalModuleFactor }) => {
+                compilation.dependencyFactories.set(MultiEntryDependency, new MultiModuleFactory());
+            }
+        );
+        compiler.hooks.make.tapAsync(
+            "MultiEntryPlugin",
+            (compilation, callback) => {
+                const dep = new MultiEntryPlugin();
+                compilation.addEntry("", {}, "", () => {});
+            }
+        );
+    }
+}
+
+class IgnorePlugin extends webpack.Plugin {
+    checkIgnore(result: any) {
+    }
+
+    apply(compiler: webpack.Compiler) {
+        compiler.hooks.normalModuleFactory.tap("IgnorePlugin", nmf => {
+            nmf.hooks.beforeResolve.tap("IgnorePlugin", this.checkIgnore);
+        });
+        compiler.hooks.contextModuleFactory.tap("IgnorePlugin", cmf => {
+            cmf.hooks.beforeResolve.tap("IgnorePlugin", this.checkIgnore);
+        });
+    }
+}
+
+class DllEntryDependency extends webpack.Dependency {}
+class DllModuleFactory extends Tapable {}
+class DllEntryPlugin extends webpack.Plugin {
+	apply(compiler: webpack.Compiler) {
+		compiler.hooks.compilation.tap(
+			"DllEntryPlugin",
+			(compilation, { normalModuleFactory }) => {
+				const dllModuleFactory = new DllModuleFactory();
+				compilation.dependencyFactories.set(
+					DllEntryDependency,
+					dllModuleFactory
+				);
+				compilation.dependencyFactories.set(
+					SingleEntryDependency,
+					normalModuleFactory
+				);
+			}
+		);
+		compiler.hooks.make.tapAsync("DllEntryPlugin", (compilation, callback) => {
+			compilation.addEntry("", new DllEntryDependency(), "", callback);
+		});
+	}
+}
+
+class BannerPlugin extends webpack.Plugin {
+	apply(compiler: webpack.Compiler) {
+        compiler.hooks.compilation.tap("BannerPlugin", compilation  => {
+            compilation.hooks.optimizeChunkAssets.tap("BannerPlugin", chunks => {
+                for (const chunk of chunks) {
+                    if (!chunk.canBeInitial()) {
+                        continue;
+                    }
+                    for (const file of chunk.files) {
+                        compilation.getPath("", {});
+                    }
+                }
+            });
+        });
+    }
+}

From f9b76522696d0d9ecd22fd940de523b779f81c09 Mon Sep 17 00:00:00 2001
From: Craig Boland <craig.boland@gmail.com>
Date: Mon, 5 Mar 2018 10:24:13 -0600
Subject: [PATCH 0268/1382] Type definition for Bootstrap3-Dialog version
 1.35.4.

---
 .../bootstrap3-dialog-tests.ts                | 123 +++++++++++
 types/bootstrap3-dialog/index.d.ts            | 194 ++++++++++++++++++
 types/bootstrap3-dialog/tsconfig.json         |  23 +++
 types/bootstrap3-dialog/tslint.json           |   1 +
 4 files changed, 341 insertions(+)
 create mode 100644 types/bootstrap3-dialog/bootstrap3-dialog-tests.ts
 create mode 100644 types/bootstrap3-dialog/index.d.ts
 create mode 100644 types/bootstrap3-dialog/tsconfig.json
 create mode 100644 types/bootstrap3-dialog/tslint.json

diff --git a/types/bootstrap3-dialog/bootstrap3-dialog-tests.ts b/types/bootstrap3-dialog/bootstrap3-dialog-tests.ts
new file mode 100644
index 0000000000..5cb019a24a
--- /dev/null
+++ b/types/bootstrap3-dialog/bootstrap3-dialog-tests.ts
@@ -0,0 +1,123 @@
+function BootstrapDialogOptionsTests() {
+    const options1: BootstrapDialogOptions = { };
+    const options2: BootstrapDialogOptions = {
+        animate: false,
+        buttons: [{id: "btn-1"}],
+        callback: (result: boolean) => { },
+        closable: false,
+        closeByBackdrop: false,
+        closeByKeyboard: false,
+        data: {name: "value"},
+        draggable: false,
+        description: "",
+        buttonLabel: "",
+        message: "",
+        onhide: (dialog: BootstrapDialogContext) => { },
+        onhidden: (dialog: BootstrapDialogContext) => { },
+        onshow: (dialog: BootstrapDialogContext) => { },
+        onshown: (dialog: BootstrapDialogContext) => { },
+        size: BootstrapDialog.SIZE_LARGE,
+        title: "",
+        type: BootstrapDialog.TYPE_DEFAULT,
+        btnCancelLabel: "",
+        btnOKClass: "",
+        btnOKLabel: "",
+        cssClass: "",
+        spinicon: "",
+        autodestroy: false,
+        nl2br: false,
+    };
+    options2.onhide = (dialog: BootstrapDialogContext): void => { };
+    options2.onhide = (dialog: BootstrapDialogContext): boolean => false;
+    options2.message = "";
+    options2.message = $("#element");
+    options2.message = (dialog?: BootstrapDialogContext): string => {
+        return "";
+    };
+    options2.message = (dialog?: BootstrapDialogContext): JQuery => {
+        return $("#element");
+    };
+    // BootstrapDialog.SIZE_xxx constants.
+    options2.size = BootstrapDialog.SIZE_LARGE;
+    options2.size = BootstrapDialog.SIZE_NORMAL;
+    options2.size = BootstrapDialog.SIZE_SMALL;
+    options2.size = BootstrapDialog.SIZE_WIDE;
+    options2.title = "";
+    options2.title = $("#element");
+    // BootstrapDialog.TYPE_xxx constants.
+    options2.type = BootstrapDialog.TYPE_DANGER;
+    options2.type = BootstrapDialog.TYPE_DEFAULT;
+    options2.type = BootstrapDialog.TYPE_INFO;
+    options2.type = BootstrapDialog.TYPE_PRIMARY;
+    options2.type = BootstrapDialog.TYPE_SUCCESS;
+    options2.type = BootstrapDialog.TYPE_WARNING;
+}
+
+function BootstrapDialogStaticTests() {
+    BootstrapDialog.alert("");
+    BootstrapDialog.alert("", () => { });
+    BootstrapDialog.confirm("");
+    BootstrapDialog.confirm("", (result: boolean) => { });
+    const instance1: BootstrapDialogInstance = BootstrapDialog.show({});
+    // BUTTON_SIZES
+    BootstrapDialog.BUTTON_SIZES[BootstrapDialog.SIZE_NORMAL] = '';
+    const buttonSize: string = BootstrapDialog.BUTTON_SIZES[BootstrapDialog.SIZE_NORMAL];
+    // Buttons order
+    BootstrapDialog.BUTTONS_ORDER_CANCEL_OK = "";
+    BootstrapDialog.BUTTONS_ORDER_OK_CANCEL = "";
+    // DEFAULT_TEXTS
+    BootstrapDialog.DEFAULT_TEXTS[BootstrapDialog.TYPE_DEFAULT] = 'Information';
+    const defaultText: string = BootstrapDialog.DEFAULT_TEXTS[BootstrapDialog.TYPE_DEFAULT];
+    // Miscellaneous
+    BootstrapDialog.ICON_SPINNER = "";
+    BootstrapDialog.NAMESPACE = "";
+}
+
+function BootstrapDialogContextTests() {
+    const dialog1: BootstrapDialogContext = BootstrapDialog({});
+    dialog1.close();
+    dialog1.enableButtons(false);
+    const button: JQuery = dialog1.getButton("");
+    const value: any = dialog1.getData("name");
+    const modal: JQuery = dialog1.getModal();
+    const content: JQuery = dialog1.getModalContent();
+    const dialog: JQuery = dialog1.getModalDialog();
+    const header: JQuery = dialog1.getModalHeader();
+    const footer: JQuery = dialog1.getModalFooter();
+    const body: JQuery = dialog1.getModalBody();
+    const title: string = dialog1.getTitle();
+    dialog1.open();
+    dialog1.realize();
+    dialog1.setClosable(false);
+    dialog1.setData("name", "value");
+    dialog1.setData("", null);
+    dialog1.setMessage("");
+    dialog1.setTitle("");
+    dialog1.setType(BootstrapDialog.TYPE_DEFAULT);
+}
+
+function BootstrapDialogInstanceTests() {
+    const instance1: BootstrapDialogInstance = BootstrapDialog.show({});
+    const modal: JQuery = instance1.$modal;
+    const modalBody: JQuery = instance1.$modalBody;
+    const modalContent: JQuery = instance1.$modalContent;
+    const modalDialog: JQuery = instance1.$modalDialog;
+    const modalHeader: JQuery = instance1.$modalHeader;
+    const modalFooter: JQuery = instance1.$modalFooter;
+    const options: BootstrapDialogOptions = instance1.options;
+    const opened: boolean = instance1.opened;
+}
+
+function BootstrapDialogButtonTests() {
+    const button1: BootstrapDialogButton = { };
+    const button2: BootstrapDialogButton = {
+        id: "",
+        label: "",
+        hotkey: 0,
+        icon: "",
+        cssClass: "",
+        data: {name: "value"},
+        autospin: false,
+        action: (dialog: BootstrapDialogContext) => { },
+    };
+}
diff --git a/types/bootstrap3-dialog/index.d.ts b/types/bootstrap3-dialog/index.d.ts
new file mode 100644
index 0000000000..231908de88
--- /dev/null
+++ b/types/bootstrap3-dialog/index.d.ts
@@ -0,0 +1,194 @@
+// Type definitions for bootstrap3-dialog 1.35
+// Project: http://nakupanda.github.io/bootstrap3-dialog
+// Definitions by: Craig Boland <https://github.com/cnboland>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="jquery" />
+
+interface BootstrapDialogStatic {
+    BUTTON_SIZES: any;
+    BUTTONS_ORDER_CANCEL_OK: string;
+    BUTTONS_ORDER_OK_CANCEL: string;
+    DEFAULT_TEXTS: any;                 /** For text localization. */
+    ICON_SPINNER: string;
+    NAMESPACE: string;
+
+    SIZE_NORMAL: string;
+    SIZE_SMALL: string;
+    SIZE_WIDE: string;
+    SIZE_LARGE: string;
+
+    TYPE_DEFAULT: string;
+    TYPE_INFO: string;
+    TYPE_PRIMARY: string;
+    TYPE_SUCCESS: string;
+    TYPE_WARNING: string;
+    TYPE_DANGER: string;
+
+    (options: BootstrapDialogOptions): BootstrapDialogContext;
+    alert(message: string, closeCallback?: () => void): void;
+    confirm(message: string, closeCallback?: (result: boolean) => void): void;
+    show(options: BootstrapDialogOptions): BootstrapDialogInstance;
+}
+
+interface BootstrapDialogOptions {
+    /** Dialog header type. See BootstrapDialog.TYPE_xxx constants. */
+    type?: string;
+    /** Text size. See BootstrapDialog.SIZE_xxx constants. By default - SIZE_NORMAL */
+    size?: string;
+    /** Dialog title. Either string or JQuery element. */
+    title?: string | JQuery;
+    /** Dialog message. Either string, JQuery element, or function that returns either string or JQuery element. */
+    message?: string | JQuery | ((dialog?: BootstrapDialogContext) => string | JQuery);
+    /**
+     * When set to true, you can close the dialog by:
+     *  - Clicking the close icon in dialog header.
+     *  - Clicking outside the dialog.
+     *  - ESC key.
+     *
+     * FALSE by default.
+     */
+    closable?: boolean;
+    /** Whether dialog will close by clicking outside of it. */
+    closeByBackdrop?: boolean;
+    /** Whether dialog will close by ESC. */
+    closeByKeyboard?: boolean;
+    /** Whether fade-out background while showing the dialog. TRUE by default. */
+    animate?: boolean;
+    /** Data to be bound to the dialog. */
+    data?: any;
+    /** Whether dialog could be dragged by its header. Cursor could be changed (see doc)! FALSE by default. */
+    draggable?: boolean;
+    /**
+     * If provided, 'aria-describedby' attribute will be added to the dialog with the description string as its value. This can improve accessibility, as the description can be read by screen
+     * readers.
+     */
+    description?: string;
+    /** Default button title. OK by default. */
+    buttonLabel?: string;
+    buttons?: BootstrapDialogButton[];
+    /** Result will be true if button was click, while it will be false if users close the dialog directly. */
+    callback?: (result: boolean) => void;
+    /** If provided, it will be invoked when the dialog is popping up. */
+    onshow?(dialog?: BootstrapDialogContext): void;
+    /** If provided, it will be invoked when the dialog is popped up. */
+    onshown?(dialog?: BootstrapDialogContext): void;
+    /**
+     * If provided, it will be invoked when the dialog is popping down.
+     * Return FALSE to don`t close the dialog. Don`t return anything by default.
+     */
+    onhide?(dialog?: BootstrapDialogContext): any;
+    /** If provided, it will be invoked when the dialog is popped down. */
+    onhidden?(dialog?: BootstrapDialogContext): void;
+
+    /** 'Cancel' by default. */
+    btnCancelLabel?: string;
+    /** 'OK' by default. */
+    btnOKLabel?: string;
+    /** If you didn't specify it, dialog type will be used. */
+    btnOKClass?: string;
+    /** Additional css classes that will be added to your dialog. */
+    cssClass?: string;
+    /** Icon class name, for example 'glyphicon glyphicon-check'. */
+    spinicon?: string;
+    /**
+     * When it's true, all modal stuff will be removed from the DOM tree after the dialog is popped down,
+     * set it to false if you need your dialog (same instance) pups up and down again and again.
+     * Default is true.
+     */
+    autodestroy?: boolean;
+    /**
+     * Automatically convert line breaking character to <br /> if it's set to true,
+     * everything keeps original if it's false.
+     */
+    nl2br?: boolean;
+}
+
+interface BootstrapDialogInstance {
+    $modal: JQuery;
+    $modalBody: JQuery;
+    $modalContent: JQuery;
+    $modalDialog: JQuery;
+    $modalHeader: JQuery;
+    $modalFooter: JQuery;
+    options: BootstrapDialogOptions;
+    opened: boolean;
+}
+
+interface BootstrapDialogButton {
+    /** If id is set, you can use dialogInstance.getButton(id) to get the button later. */
+    id?: string;
+    label?: string;
+    /** Hotkey char code */
+    hotkey?: number;
+    /** If set, the specified icon will be added to the button. */
+    icon?: string;
+    /** Additional css class to be added to the button. */
+    cssClass?: string;
+    /** Object containing data attributes to be added to the button. */
+    data?: any;
+    /**  If it's true, after clicked the button a spinning icon appears. */
+    autospin?: boolean;
+    /**
+     * If provided, the callback will be invoked after the button is clicked, and the dialog instance
+     * will be passed to the callback function.
+     */
+    action?: (dialog: BootstrapDialogContext) => void;
+}
+
+interface BootstrapDialogButtonInstance {
+    toggleEnable(enabled: boolean): void;
+    /** Equals to $button.toggleEnable(true); */
+    enable(): void;
+    /** Equals to $button.toggleEnable(false); */
+    disable(): void;
+    toggleSpin(spin: boolean): void;
+    /** Equals to $button.toggleSpin(true); */
+    spin(): void;
+    /** Equals to $button.toggleSpin(false); */
+    stopSpin(): void;
+}
+
+interface BootstrapDialogContext {
+    /** Open the dialog. Usage: dialogInstance.open() */
+    open(): void;
+    /**  	Close the dialog. Usage: dialogInstance.close() */
+    close(): void;
+    /**
+     * Calling dialog.open() will automatically get this method called first, but if you want to do something on your dialog
+     * before it's shown, you can manually call dialog.realize() before calling dialog.open().
+     */
+    realize(): void;
+    getTitle(): string;
+    setTitle(title: string): void;
+    setMessage(message: string): void;
+    /** Bind data entry to dialog instance, value can be any types that javascript supports. */
+    setData(dataName: string, value: any): void;
+    /** Get data entry according to the given key, returns null if no data entry found. */
+    getData(dataName: string): any;
+    getButton(buttonId: string): JQuery;
+    /**
+     * When set to true (default), dialog can be closed by clicking close icon in dialog header,
+     * or by clicking outside the dialog, or, ESC key is pressed.
+     */
+    setClosable(closable: boolean): void;
+    /** See BootstrapDialog.TYPE_xxx constants. */
+    setType(dialogType: string): void;
+    /** Disable all buttons in dialog footer when it's false, enable all when it's true. */
+    enableButtons(enable: boolean): void;
+    /** Return the raw modal, equivalent to $('<div class='modal fade'...></div>') */
+    getModal(): JQuery;
+    /** Return the raw modal content. */
+    getModalContent(): JQuery;
+    /** Return the raw modal dialog. */
+    getModalDialog(): JQuery;
+    /** Return the raw modal header. */
+    getModalHeader(): JQuery;
+    /** Return the raw modal footer. */
+    getModalFooter(): JQuery;
+    /** Return the raw modal body. */
+    getModalBody(): JQuery;
+}
+
+declare var BootstrapDialog: BootstrapDialogStatic;
diff --git a/types/bootstrap3-dialog/tsconfig.json b/types/bootstrap3-dialog/tsconfig.json
new file mode 100644
index 0000000000..cdf93479b7
--- /dev/null
+++ b/types/bootstrap3-dialog/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "bootstrap3-dialog-tests.ts"
+    ]
+}
diff --git a/types/bootstrap3-dialog/tslint.json b/types/bootstrap3-dialog/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/bootstrap3-dialog/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From df9c4e0762919438f80bb34fec6f264bc6a14665 Mon Sep 17 00:00:00 2001
From: Will Sabransky <will.sabransky@postmates.com>
Date: Mon, 5 Mar 2018 15:26:16 -0800
Subject: [PATCH 0269/1382] Add optional value param to selectSuggest

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

diff --git a/types/react-geosuggest/index.d.ts b/types/react-geosuggest/index.d.ts
index 30db05ddb0..2537754b02 100644
--- a/types/react-geosuggest/index.d.ts
+++ b/types/react-geosuggest/index.d.ts
@@ -13,7 +13,7 @@ export default class Geosuggest extends Component<GeosuggestProps> {
     blur(): void;
     update(value: string): void;
     clear(): void;
-    selectSuggest(): void;
+    selectSuggest(value?: Suggest): void;
 }
 
 export interface GeosuggestProps extends InputHTMLAttributes<HTMLInputElement> {

From 311bfefd68e56dafc7411fa898654fded5241b6d Mon Sep 17 00:00:00 2001
From: Andy <anhans@microsoft.com>
Date: Mon, 5 Mar 2018 16:19:20 -0800
Subject: [PATCH 0270/1382] Fix feathersjs dependers (#24091)

---
 types/feathersjs__authentication-client/index.d.ts | 1 +
 types/feathersjs__authentication-jwt/index.d.ts    | 4 ++--
 types/feathersjs__authentication-local/index.d.ts  | 4 ++--
 types/feathersjs__authentication-oauth1/index.d.ts | 4 ++--
 types/feathersjs__authentication-oauth2/index.d.ts | 4 ++--
 types/feathersjs__configuration/index.d.ts         | 1 +
 types/feathersjs__express/index.d.ts               | 2 +-
 types/feathersjs__primus-client/index.d.ts         | 1 +
 types/feathersjs__socketio-client/index.d.ts       | 1 +
 9 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/types/feathersjs__authentication-client/index.d.ts b/types/feathersjs__authentication-client/index.d.ts
index 16f4f4a415..04275eb93c 100644
--- a/types/feathersjs__authentication-client/index.d.ts
+++ b/types/feathersjs__authentication-client/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://feathersjs.com/
 // Definitions by: Abraao Alves <https://github.com/AbraaoAlves>, Jan Lohage <https://github.com/j2L4e>
 // Definitions: https://github.com/feathersjs-ecosystem/feathers-typescript
+// TypeScript Version: 2.3
 
 export default function feathersAuthClient(config?: FeathersAuthClientConfig): () => void;
 
diff --git a/types/feathersjs__authentication-jwt/index.d.ts b/types/feathersjs__authentication-jwt/index.d.ts
index cc9e58be0d..b55adeed46 100644
--- a/types/feathersjs__authentication-jwt/index.d.ts
+++ b/types/feathersjs__authentication-jwt/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://feathersjs.com/
 // Definitions by: Jan Lohage <https://github.com/j2L4e>
 // Definitions: https://github.com/feathersjs-ecosystem/feathers-typescript
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import { Application } from '@feathersjs/feathers';
 import { Request } from 'express';
@@ -45,7 +45,7 @@ export interface FeathersAuthenticationJWTOptions {
 }
 
 export class JWTVerifier {
-    constructor(app: Application<any>, options: any); // the class constructor
+    constructor(app: Application, options: any); // the class constructor
 
     verify(req: Request, payload: any, done: (error: any, user?: any, info?: any) => void): void;
 }
diff --git a/types/feathersjs__authentication-local/index.d.ts b/types/feathersjs__authentication-local/index.d.ts
index 8b6af17a33..e935419263 100644
--- a/types/feathersjs__authentication-local/index.d.ts
+++ b/types/feathersjs__authentication-local/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://feathersjs.com/
 // Definitions by: Jan Lohage <https://github.com/j2L4e>
 // Definitions: https://github.com/feathersjs-ecosystem/feathers-typescript
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import {
     Application,
@@ -57,7 +57,7 @@ export interface FeathersAuthenticationLocalOptions {
 }
 
 export class LocalVerifier {
-    constructor(app: Application<any>, options: any);
+    constructor(app: Application, options: any);
 
     _comparePassword<T>(entity: T, password: string): Promise<T>; // compares password using bcrypt
     _normalizeResult<T>(results: T[] | Paginated<T>): Promise<T>; // normalizes result from service to account for pagination
diff --git a/types/feathersjs__authentication-oauth1/index.d.ts b/types/feathersjs__authentication-oauth1/index.d.ts
index 54d4d2614a..eee59fd64a 100644
--- a/types/feathersjs__authentication-oauth1/index.d.ts
+++ b/types/feathersjs__authentication-oauth1/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://feathersjs.com/
 // Definitions by: Jan Lohage <https://github.com/j2L4e>
 // Definitions: https://github.com/feathersjs-ecosystem/feathers-typescript
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import {
     Application,
@@ -60,7 +60,7 @@ export interface FeathersAuthenticationOAuth1Options {
 }
 
 export class OAuth1Verifier {
-    constructor(app: Application<any>, options: any);
+    constructor(app: Application, options: any);
 
     _updateEntity(entity: any, data: { profile: any, accessToken: string, refreshToken: string }): Promise<any>; // updates an existing entity
     _createEntity(data: { profile: any, accessToken: string, refreshToken: string }): Promise<any>; // creates an entity if they didn't exist already
diff --git a/types/feathersjs__authentication-oauth2/index.d.ts b/types/feathersjs__authentication-oauth2/index.d.ts
index 5ac6976dac..fbce7514cd 100644
--- a/types/feathersjs__authentication-oauth2/index.d.ts
+++ b/types/feathersjs__authentication-oauth2/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://feathersjs.com/
 // Definitions by: Jan Lohage <https://github.com/j2L4e>
 // Definitions: https://github.com/feathersjs-ecosystem/feathers-typescript
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import {
     Application,
@@ -62,7 +62,7 @@ export interface FeathersAuthenticationOAuth2Options {
 }
 
 export class OAuth2Verifier {
-    constructor(app: Application<any>, options: any)
+    constructor(app: Application, options: any)
 
     _updateEntity(entity: any, data: { profile: any, accessToken: string, refreshToken: string }): Promise<any>; // updates an existing entity
     _createEntity(data: { profile: any, accessToken: string, refreshToken: string }): Promise<any>; // creates an entity if they didn't exist already
diff --git a/types/feathersjs__configuration/index.d.ts b/types/feathersjs__configuration/index.d.ts
index fe597c8360..abd7e53d70 100644
--- a/types/feathersjs__configuration/index.d.ts
+++ b/types/feathersjs__configuration/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://feathersjs.com/
 // Definitions by: Jan Lohage <https://github.com/j2L4e>
 // Definitions: https://github.com/feathersjs-ecosystem/feathers-typescript
+// TypeScript Version: 2.3
 
 import { Application } from '@feathersjs/feathers';
 
diff --git a/types/feathersjs__express/index.d.ts b/types/feathersjs__express/index.d.ts
index eb49f00a78..f50203432f 100644
--- a/types/feathersjs__express/index.d.ts
+++ b/types/feathersjs__express/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://feathersjs.com/
 // Definitions by: Jan Lohage <https://github.com/j2L4e>
 // Definitions: https://github.com/feathersjs-ecosystem/feathers-typescript
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import { Application as FeathersApplication } from '@feathersjs/feathers';
 import * as express from 'express';
diff --git a/types/feathersjs__primus-client/index.d.ts b/types/feathersjs__primus-client/index.d.ts
index 4e51cd159c..fb348379ea 100644
--- a/types/feathersjs__primus-client/index.d.ts
+++ b/types/feathersjs__primus-client/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://feathersjs.com/
 // Definitions by: Jan Lohage <https://github.com/j2L4e>
 // Definitions: https://github.com/feathersjs-ecosystem/feathers-typescript
+// TypeScript Version: 2.3
 
 // primus removed its typings from the repo https://github.com/primus/primus/pull/623, as of 01/2018 there are none on DT
 export default function feathersPrimusClient(socket: any, options?: FeathersPrimusClientOptions): () => void;
diff --git a/types/feathersjs__socketio-client/index.d.ts b/types/feathersjs__socketio-client/index.d.ts
index f155bc50de..83fd71b0ed 100644
--- a/types/feathersjs__socketio-client/index.d.ts
+++ b/types/feathersjs__socketio-client/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://feathersjs.com/
 // Definitions by: Jan Lohage <https://github.com/j2L4e>
 // Definitions: https://github.com/feathersjs-ecosystem/feathers-typescript
+// TypeScript Version: 2.3
 
 /// <reference types="socket.io-client" />
 

From dfbdf8c6c63db33ba17ffbe0c678b7f673bfa949 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kr=C3=A6n=20Hansen?= <mail@kraenhansen.dk>
Date: Tue, 6 Mar 2018 01:32:08 +0100
Subject: [PATCH 0271/1382] Removed myself as a maintainer

I was not contributing as much as I hoped for
---
 types/reactstrap/index.d.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/types/reactstrap/index.d.ts b/types/reactstrap/index.d.ts
index 32d2ab7c0d..359090b5b2 100644
--- a/types/reactstrap/index.d.ts
+++ b/types/reactstrap/index.d.ts
@@ -6,7 +6,6 @@
 //                 Fábio Paiva <https://github.com/fabiopaiva>
 //                 FaithForHumans <https://github.com/FaithForHumans>
 //                 Kurt Preston <https://github.com/KurtPreston>
-//                 Kræn Hansen <https://github.com/kraenhansen>
 //                 Tim Chen <https://github.com/timc13>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6

From c8357c63f664f16595535bb6ffac421097f4c9fa Mon Sep 17 00:00:00 2001
From: Dennis George <dennispg@gmail.com>
Date: Mon, 5 Mar 2018 18:59:53 -0600
Subject: [PATCH 0272/1382] updated TS version to 2.3 for all webpack consumers

---
 types/assets-webpack-plugin/index.d.ts        |  2 +-
 .../index.d.ts                                |  2 +-
 types/clean-webpack-plugin/index.d.ts         |  2 +-
 types/compression-webpack-plugin/index.d.ts   |  2 +-
 types/copy-webpack-plugin/index.d.ts          |  2 +-
 .../index.d.ts                                |  2 +-
 types/enhanced-resolve/index.d.ts             |  3 +-
 types/extract-text-webpack-plugin/index.d.ts  |  2 +-
 types/html-webpack-plugin/index.d.ts          |  2 +-
 types/html-webpack-template/index.d.ts        |  2 +-
 types/loader-utils/index.d.ts                 |  2 +-
 types/lodash-webpack-plugin/index.d.ts        |  2 +-
 .../index.d.ts                                |  2 +-
 types/stylelint-webpack-plugin/index.d.ts     |  2 +-
 types/tapable/index.d.ts                      |  1 +
 types/tapable/v0/tsconfig.json                |  4 +-
 types/tapable/v0/tslint.json                  | 79 +++++++++++++++++++
 types/webpack-bundle-analyzer/index.d.ts      |  2 +-
 types/webpack-chain/index.d.ts                |  2 +-
 types/webpack-chunk-hash/index.d.ts           |  2 +-
 types/webpack-cleanup-plugin/index.d.ts       |  2 +-
 types/webpack-dev-middleware/index.d.ts       |  2 +-
 types/webpack-dev-middleware/v1/index.d.ts    |  2 +-
 types/webpack-dev-server/index.d.ts           |  2 +-
 types/webpack-dotenv-plugin/index.d.ts        |  2 +-
 types/webpack-fail-plugin/index.d.ts          |  2 +-
 types/webpack-hot-middleware/index.d.ts       |  2 +-
 types/webpack-manifest-plugin/index.d.ts      |  2 +-
 types/webpack-merge/index.d.ts                |  2 +-
 types/webpack-merge/v0/index.d.ts             |  2 +-
 types/webpack-node-externals/index.d.ts       |  2 +-
 types/webpack-notifier/index.d.ts             |  2 +-
 types/webpack-stream/index.d.ts               |  2 +-
 types/webpack-validator/index.d.ts            |  2 +-
 types/webpack/index.d.ts                      | 54 +++++++------
 types/webpack/tsconfig.json                   |  5 +-
 types/webpack/v3/tsconfig.json                |  3 +-
 37 files changed, 146 insertions(+), 63 deletions(-)
 create mode 100644 types/tapable/v0/tslint.json

diff --git a/types/assets-webpack-plugin/index.d.ts b/types/assets-webpack-plugin/index.d.ts
index 660fbc6052..7644d8f9ad 100644
--- a/types/assets-webpack-plugin/index.d.ts
+++ b/types/assets-webpack-plugin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/sporto/assets-webpack-plugin
 // Definitions by: Michael Strobel <https://github.com/kryops>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import * as webpack from 'webpack';
 
diff --git a/types/case-sensitive-paths-webpack-plugin/index.d.ts b/types/case-sensitive-paths-webpack-plugin/index.d.ts
index 38fdd9c032..58cdccf25f 100644
--- a/types/case-sensitive-paths-webpack-plugin/index.d.ts
+++ b/types/case-sensitive-paths-webpack-plugin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/Urthen/case-sensitive-paths-webpack-plugin#readme
 // Definitions by: Andrew Makarov <https://github.com/r3nya>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import { Plugin } from 'webpack';
 
diff --git a/types/clean-webpack-plugin/index.d.ts b/types/clean-webpack-plugin/index.d.ts
index afe8a65b69..7c23e51df5 100644
--- a/types/clean-webpack-plugin/index.d.ts
+++ b/types/clean-webpack-plugin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/johnagan/clean-webpack-plugin
 // Definitions by: Jed Fox <https://github.com/j-f1>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import { Plugin } from 'webpack';
 
diff --git a/types/compression-webpack-plugin/index.d.ts b/types/compression-webpack-plugin/index.d.ts
index bfb769ed2f..a7b38383ef 100644
--- a/types/compression-webpack-plugin/index.d.ts
+++ b/types/compression-webpack-plugin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/webpack-contrib/compression-webpack-plugin
 // Definitions by: Anton Kandybo <https://github.com/dublicator>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import { Plugin } from 'webpack';
 
diff --git a/types/copy-webpack-plugin/index.d.ts b/types/copy-webpack-plugin/index.d.ts
index 72331b4c6d..eedf42f450 100644
--- a/types/copy-webpack-plugin/index.d.ts
+++ b/types/copy-webpack-plugin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/kevlened/copy-webpack-plugin
 // Definitions by: flying-sheep <https://github.com/flying-sheep>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import { Plugin } from 'webpack'
 import { IOptions } from 'minimatch'
diff --git a/types/duplicate-package-checker-webpack-plugin/index.d.ts b/types/duplicate-package-checker-webpack-plugin/index.d.ts
index fd2906aa46..1eff56e9d5 100644
--- a/types/duplicate-package-checker-webpack-plugin/index.d.ts
+++ b/types/duplicate-package-checker-webpack-plugin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/darrenscerri/duplicate-package-checker-webpack-plugin#readme
 // Definitions by: Matt Traynham <https://github.com/mtraynham>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import { Plugin } from 'webpack';
 
diff --git a/types/enhanced-resolve/index.d.ts b/types/enhanced-resolve/index.d.ts
index 5a39b4f6d0..1cf3a3397a 100644
--- a/types/enhanced-resolve/index.d.ts
+++ b/types/enhanced-resolve/index.d.ts
@@ -1,7 +1,8 @@
 // Type definitions for enhanced-resolve v3.0.0
 // Project: https://github.com/webpack/enhanced-resolve.git
-// Definitions by: e-cloud <https://github.com/e-cloud>, Onigoetz <https://github.com/onigoetz> 
+// Definitions by: e-cloud <https://github.com/e-cloud>, Onigoetz <https://github.com/onigoetz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="node" />
 /// <reference types="tapable" />
diff --git a/types/extract-text-webpack-plugin/index.d.ts b/types/extract-text-webpack-plugin/index.d.ts
index 9f17a66da0..61b381d253 100644
--- a/types/extract-text-webpack-plugin/index.d.ts
+++ b/types/extract-text-webpack-plugin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/webpack-contrib/extract-text-webpack-plugin
 // Definitions by: flying-sheep <https://github.com/flying-sheep>, kayo <https://github.com/katyo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import { Plugin, NewLoader, OldLoader } from 'webpack';
 
diff --git a/types/html-webpack-plugin/index.d.ts b/types/html-webpack-plugin/index.d.ts
index 35774c1ac6..c3db12f4e7 100644
--- a/types/html-webpack-plugin/index.d.ts
+++ b/types/html-webpack-plugin/index.d.ts
@@ -4,7 +4,7 @@
 //                 Benjamin Lim <https://github.com/bumbleblym>
 //                 Tomek Łaziuk <https://github.com/tlaziuk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import { Plugin } from 'webpack';
 import { Options as HtmlMinifierOptions } from 'html-minifier';
diff --git a/types/html-webpack-template/index.d.ts b/types/html-webpack-template/index.d.ts
index b02be3c463..1436728a72 100644
--- a/types/html-webpack-template/index.d.ts
+++ b/types/html-webpack-template/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/jaketrent/html-webpack-template
 // Definitions by: Benjamin Lim <https://github.com/bumbleblym>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import { Options as HtmlWebpackPluginOptions } from 'html-webpack-plugin';
 
diff --git a/types/loader-utils/index.d.ts b/types/loader-utils/index.d.ts
index 37ce2e461f..18aa16d7e4 100644
--- a/types/loader-utils/index.d.ts
+++ b/types/loader-utils/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Gyusun Yeom <https://github.com/Perlmint>
 //                 Totooria Hyperion <https://github.com/TotooriaHyperion>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 /// <reference types="node" />
 
diff --git a/types/lodash-webpack-plugin/index.d.ts b/types/lodash-webpack-plugin/index.d.ts
index e7e2dfd4db..505c54b5c4 100644
--- a/types/lodash-webpack-plugin/index.d.ts
+++ b/types/lodash-webpack-plugin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/lodash/lodash-webpack-plugin#readme
 // Definitions by: Benjamin Lim <https://github.com/bumbleblym>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import { Plugin } from 'webpack';
 
diff --git a/types/optimize-css-assets-webpack-plugin/index.d.ts b/types/optimize-css-assets-webpack-plugin/index.d.ts
index 788b2e6a1f..79a510a12b 100644
--- a/types/optimize-css-assets-webpack-plugin/index.d.ts
+++ b/types/optimize-css-assets-webpack-plugin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/NMFR/optimize-css-assets-webpack-plugin
 // Definitions by: Armando Meziat <https://github.com/odnamrataizem>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import { Plugin } from 'webpack';
 
diff --git a/types/stylelint-webpack-plugin/index.d.ts b/types/stylelint-webpack-plugin/index.d.ts
index dfaf0a4f05..21405d739d 100644
--- a/types/stylelint-webpack-plugin/index.d.ts
+++ b/types/stylelint-webpack-plugin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/JaKXz/stylelint-webpack-plugin
 // Definitions by: Arne Bahlo <https://github.com/bahlo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import { Plugin } from 'webpack';
 
diff --git a/types/tapable/index.d.ts b/types/tapable/index.d.ts
index 7df29da48b..ba36704429 100644
--- a/types/tapable/index.d.ts
+++ b/types/tapable/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/webpack/tapable.git
 // Definitions by: e-cloud <https://github.com/e-cloud>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 declare abstract class Tapable {
     private _plugins: {
diff --git a/types/tapable/v0/tsconfig.json b/types/tapable/v0/tsconfig.json
index bef7e6f016..aef97e4141 100644
--- a/types/tapable/v0/tsconfig.json
+++ b/types/tapable/v0/tsconfig.json
@@ -9,9 +9,9 @@
         "noImplicitThis": true,
         "strictNullChecks": true,
         "strictFunctionTypes": true,
-        "baseUrl": "../",
+        "baseUrl": "../../",
         "typeRoots": [
-            "../"
+            "../../"
         ],
         "types": [],
         "noEmit": true,
diff --git a/types/tapable/v0/tslint.json b/types/tapable/v0/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/tapable/v0/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/webpack-bundle-analyzer/index.d.ts b/types/webpack-bundle-analyzer/index.d.ts
index 3f856a7328..6b2db94b65 100644
--- a/types/webpack-bundle-analyzer/index.d.ts
+++ b/types/webpack-bundle-analyzer/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/th0r/webpack-bundle-analyzer
 // Definitions by: Michael Strobel <https://github.com/kryops>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import * as webpack from 'webpack';
 
diff --git a/types/webpack-chain/index.d.ts b/types/webpack-chain/index.d.ts
index 05aa4e5845..a5b8349faa 100644
--- a/types/webpack-chain/index.d.ts
+++ b/types/webpack-chain/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/mozilla-neutrino/webpack-chain
 // Definitions by: Eirikur Nilsson <https://github.com/eirikurn>, Paul Sachs <https://github.com/psachs21>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import * as webpack from 'webpack';
 import * as https from 'https';
diff --git a/types/webpack-chunk-hash/index.d.ts b/types/webpack-chunk-hash/index.d.ts
index f499a00dc9..f6ef6ea08b 100644
--- a/types/webpack-chunk-hash/index.d.ts
+++ b/types/webpack-chunk-hash/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/alexindigo/webpack-chunk-hash#readme
 // Definitions by: Matt Traynham <https://github.com/mtraynham>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import { Plugin } from 'webpack';
 
diff --git a/types/webpack-cleanup-plugin/index.d.ts b/types/webpack-cleanup-plugin/index.d.ts
index a6efd31af7..4cac414a3a 100644
--- a/types/webpack-cleanup-plugin/index.d.ts
+++ b/types/webpack-cleanup-plugin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/gpbl/webpack-cleanup-plugin#readme
 // Definitions by: Luka Maljic <https://github.com/malj>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import { Plugin } from 'webpack';
 export = WebpackCleanupPlugin;
diff --git a/types/webpack-dev-middleware/index.d.ts b/types/webpack-dev-middleware/index.d.ts
index cc3e7e03dd..6a7d1bc4b3 100644
--- a/types/webpack-dev-middleware/index.d.ts
+++ b/types/webpack-dev-middleware/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Benjamin Lim <https://github.com/bumbleblym>
 //                 reduckted <https://github.com/reduckted>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import * as webpack from 'webpack';
 import * as loglevel from 'loglevel';
diff --git a/types/webpack-dev-middleware/v1/index.d.ts b/types/webpack-dev-middleware/v1/index.d.ts
index e88cec98ef..af97857a45 100644
--- a/types/webpack-dev-middleware/v1/index.d.ts
+++ b/types/webpack-dev-middleware/v1/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Benjamin Lim <https://github.com/bumbleblym>
 //                 reduckted <https://github.com/reduckted>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import { NextHandleFunction } from 'connect';
 import * as webpack from 'webpack';
diff --git a/types/webpack-dev-server/index.d.ts b/types/webpack-dev-server/index.d.ts
index c6bab12c3b..4dc419bd3a 100644
--- a/types/webpack-dev-server/index.d.ts
+++ b/types/webpack-dev-server/index.d.ts
@@ -5,7 +5,7 @@
 //                 Zheyang Song <https://github.com/ZheyangSong>
 //                 Alan Agius <https://github.com/alan-agius4>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import * as webpack from 'webpack';
 import * as core from 'express-serve-static-core';
diff --git a/types/webpack-dotenv-plugin/index.d.ts b/types/webpack-dotenv-plugin/index.d.ts
index b8cfb33ef8..086b0c4fda 100644
--- a/types/webpack-dotenv-plugin/index.d.ts
+++ b/types/webpack-dotenv-plugin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/nwinch/webpack-dotenv-plugin#readme
 // Definitions by: Michael Strobel <https://github.com/kryops>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import * as webpack from 'webpack';
 
diff --git a/types/webpack-fail-plugin/index.d.ts b/types/webpack-fail-plugin/index.d.ts
index 2db28733c2..095a5ec7f0 100644
--- a/types/webpack-fail-plugin/index.d.ts
+++ b/types/webpack-fail-plugin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/TiddoLangerak/webpack-fail-plugin
 // Definitions by: Simon Hartcher <https://github.com/deevus>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 ///<reference types="webpack" />
 
diff --git a/types/webpack-hot-middleware/index.d.ts b/types/webpack-hot-middleware/index.d.ts
index d1a591801a..ca0abd7d69 100644
--- a/types/webpack-hot-middleware/index.d.ts
+++ b/types/webpack-hot-middleware/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/glenjamin/webpack-hot-middleware#readme
 // Definitions by: Benjamin Lim <https://github.com/bumbleblym>, Ron Martinez <https://github.com/icylace>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import { NextHandleFunction } from 'connect';
 import * as webpack from 'webpack';
diff --git a/types/webpack-manifest-plugin/index.d.ts b/types/webpack-manifest-plugin/index.d.ts
index cb61e42c18..22cf2e6eba 100644
--- a/types/webpack-manifest-plugin/index.d.ts
+++ b/types/webpack-manifest-plugin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/danethurber/webpack-manifest-plugin
 // Definitions by: Andrew Makarov <https://github.com/r3nya>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import { Plugin } from 'webpack';
 
diff --git a/types/webpack-merge/index.d.ts b/types/webpack-merge/index.d.ts
index 23caff9575..e612105c3c 100644
--- a/types/webpack-merge/index.d.ts
+++ b/types/webpack-merge/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/survivejs/webpack-merge
 // Definitions by: Simon Hartcher <https://github.com/deevus>, Matt Traynham <https://github.com/mtraynham>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import { Configuration } from 'webpack';
 
diff --git a/types/webpack-merge/v0/index.d.ts b/types/webpack-merge/v0/index.d.ts
index 4cf82afd88..8be5346ee3 100644
--- a/types/webpack-merge/v0/index.d.ts
+++ b/types/webpack-merge/v0/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/survivejs/webpack-merge
 // Definitions by: Simon Hartcher <https://github.com/deevus>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 ///<reference types="webpack" />
 
diff --git a/types/webpack-node-externals/index.d.ts b/types/webpack-node-externals/index.d.ts
index c93d3edecf..88f871cef5 100644
--- a/types/webpack-node-externals/index.d.ts
+++ b/types/webpack-node-externals/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/liady/webpack-node-externals
 // Definitions by: Matt Traynham <https://github.com/mtraynham>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import { ExternalsFunctionElement } from 'webpack';
 
diff --git a/types/webpack-notifier/index.d.ts b/types/webpack-notifier/index.d.ts
index 372b4f2b1c..429d511bab 100644
--- a/types/webpack-notifier/index.d.ts
+++ b/types/webpack-notifier/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/Turbo87/webpack-notifier#readme
 // Definitions by: Benjamin Lim <https://github.com/bumbleblym>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import { Plugin } from 'webpack';
 
diff --git a/types/webpack-stream/index.d.ts b/types/webpack-stream/index.d.ts
index 19159f402d..99b0f4fd93 100644
--- a/types/webpack-stream/index.d.ts
+++ b/types/webpack-stream/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/shama/webpack-stream
 // Definitions by: Ian Clanton-Thuon <https://github.com/iclanton>, Benjamin Lim <https://github.com/bumbleblym>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 /// <reference types="node" />
 
diff --git a/types/webpack-validator/index.d.ts b/types/webpack-validator/index.d.ts
index 242a71e6f4..198efa2c1f 100644
--- a/types/webpack-validator/index.d.ts
+++ b/types/webpack-validator/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/js-dxtools/webpack-validator
 // Definitions by: Simon Hartcher <https://github.com/deevus>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 ///<reference types="webpack" />
 
diff --git a/types/webpack/index.d.ts b/types/webpack/index.d.ts
index 4c2dc207bb..6b947a4bdb 100644
--- a/types/webpack/index.d.ts
+++ b/types/webpack/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for webpack 4.1.0
+// Type definitions for webpack 4.1
 // Project: https://github.com/webpack/webpack
 // Definitions by: Qubo <https://github.com/tkqubo>
 //                 Benjamin Lim <https://github.com/bumbleblym>
@@ -12,7 +12,7 @@
 //                 Jason Cheatham <https://github.com/jason0x43>
 //                 Dennis George <https://github.com/dennispg>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 /// <reference types="node" />
 
@@ -617,7 +617,7 @@ declare namespace webpack {
         hasRuntime(): boolean;
         canBeInitial(): boolean;
         isOnlyInitial(): boolean;
-        hasEntryModule() : boolean;
+        hasEntryModule(): boolean;
 
         addModule(module: any): boolean;
         removeModule(module: any): boolean;
@@ -646,10 +646,13 @@ declare namespace webpack {
         modulesSize(): number;
         size(options: any): number;
         integratedSize(otherChunk: any, options: any): number;
+        // tslint:disable-next-line:ban-types
         sortModules(sortByFn: Function): void;
         getAllAsyncChunks(): Set<any>;
         getChunkMaps(realHash: any): { hash: any, name: any };
+        // tslint:disable-next-line:ban-types
         getChunkModuleMaps(filterFn: Function): { id: any, hash: any };
+        // tslint:disable-next-line:ban-types
         hasModuleInGraph(filterFn: Function, filterChunkFn: Function): boolean;
         toString(): string;
     }
@@ -658,7 +661,7 @@ declare namespace webpack {
         constructor();
         getResourceIdentifier(): any;
         getReference(): any;
-        getExports() : any;
+        getExports(): any;
         getWarnings(): any;
         getErrors(): any;
         updateHash(hash: any): void;
@@ -810,7 +813,7 @@ declare namespace webpack {
         module: Tapable.SyncWaterfallHook;
         render: Tapable.SyncWaterfallHook;
         package: Tapable.SyncWaterfallHook;
-        hash: Tapable.SyncHook
+        hash: Tapable.SyncHook;
     }
 
     class ModuleTemplate extends Tapable {
@@ -840,27 +843,27 @@ declare namespace webpack {
         };
 
         entries: any[];
-		_preparedEntrypoints: any[];
-		entrypoints: Map<any, any>;
-		chunks: any[];
-		chunkGroups: any[];
-		namedChunkGroups: Map<any, any>;
-		namedChunks: Map<any, any>;
-		modules: any[];
-		_modules: Map<any, any>;
-		cache: any;
-		records: any;
-		nextFreeModuleIndex: any;
-		nextFreeModuleIndex2: any;
-		additionalChunkAssets: any[];
-		assets: any;
-		errors: any[];
-		warnings: any[];
-		children: any[];
-        dependencyFactories : Map<typeof Dependency, Tapable>;
-        dependencyTemplates : Map<typeof Dependency, Tapable>;
+        _preparedEntrypoints: any[];
+        entrypoints: Map<any, any>;
+        chunks: any[];
+        chunkGroups: any[];
+        namedChunkGroups: Map<any, any>;
+        namedChunks: Map<any, any>;
+        modules: any[];
+        _modules: Map<any, any>;
+        cache: any;
+        records: any;
+        nextFreeModuleIndex: any;
+        nextFreeModuleIndex2: any;
+        additionalChunkAssets: any[];
+        assets: any;
+        errors: any[];
+        warnings: any[];
+        children: any[];
+        dependencyFactories: Map<typeof Dependency, Tapable>;
+        dependencyTemplates: Map<typeof Dependency, Tapable>;
         childrenCounters: any;
-		usedChunkIds: any;
+        usedChunkIds: any;
         usedModuleIds: any;
         getStats(): Stats;
         addModule(module: CompilationModule, cacheGroup: any): any;
@@ -870,6 +873,7 @@ declare namespace webpack {
         // buildModule(module, optional, origin, dependencies, thisCallback)
         // processModuleDependencies(module, callback)
         // addModuleDependencies(module, dependencies, bail, cacheGroup, recursive, callback)
+        // tslint:disable-next-line:ban-types
         addEntry(context: any, entry: any, name: any, callback: Function): void;
         // prefetch(context, dependency, callback)
         // rebuildModule(module, thisCallback)
diff --git a/types/webpack/tsconfig.json b/types/webpack/tsconfig.json
index dc9eca83d6..4cf3324827 100644
--- a/types/webpack/tsconfig.json
+++ b/types/webpack/tsconfig.json
@@ -14,10 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,
-        "paths": {
-            "tapable": ["tapable"]
-        }
+        "forceConsistentCasingInFileNames": true
     },
     "files": [
         "index.d.ts",
diff --git a/types/webpack/v3/tsconfig.json b/types/webpack/v3/tsconfig.json
index a6671e38b4..0ef8b21875 100644
--- a/types/webpack/v3/tsconfig.json
+++ b/types/webpack/v3/tsconfig.json
@@ -16,7 +16,8 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true,
         "paths": {
-            "webpack": ["webpack/v3"]
+            "webpack": ["webpack/v3"],
+            "tapable": ["tapable/v0"]
         }
     },
     "files": [

From b1bc4182c4a233d8b1324fc1870119b38781a870 Mon Sep 17 00:00:00 2001
From: Armando Aguirre <armando.aguirre@microsoft.com>
Date: Mon, 5 Mar 2018 18:10:07 -0800
Subject: [PATCH 0273/1382] Changed 'import *' syntax for 'require()'

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

diff --git a/types/listr/listr-tests.ts b/types/listr/listr-tests.ts
index 68b80360f8..e9ac72b5dc 100644
--- a/types/listr/listr-tests.ts
+++ b/types/listr/listr-tests.ts
@@ -1,4 +1,4 @@
-import * as Listr from "listr";
+import Listr = require("listr");
 import * as fs from "fs";
 
 const tasks = new Listr([

From 8d7f6a54bcdd1c4835a3e3019cc88e1c1e73bcfa Mon Sep 17 00:00:00 2001
From: Jason Dreyzehner <jason@dreyzehner.com>
Date: Mon, 5 Mar 2018 23:12:18 -0500
Subject: [PATCH 0274/1382] inquirer: array params are not required to be
 mutable

---
 types/inquirer/index.d.ts        | 22 ++++++++++++++++------
 types/inquirer/inquirer-tests.ts | 21 +++++++++++++++++++++
 2 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/types/inquirer/index.d.ts b/types/inquirer/index.d.ts
index 32c54fa99e..22157ecce0 100644
--- a/types/inquirer/index.d.ts
+++ b/types/inquirer/index.d.ts
@@ -3,7 +3,9 @@
 // Definitions by: Qubo <https://github.com/tkQubo>
 //                 Parvez <https://github.com/ppathan>
 //                 Jouderian <https://github.com/jouderianjr>
+//                 Jason Dreyzehner <https://github.com/bitjson>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
 
 /// <reference types="rx" />
 
@@ -12,7 +14,10 @@ import through = require('through');
 declare namespace inquirer {
     type Prompts = { [name: string]: PromptModule };
     type ChoiceType = string | objects.ChoiceOption | objects.Separator;
-    type Questions = Question | Question[] | Rx.Observable<Question>;
+    type Questions =
+        | Question
+        | ReadonlyArray<Question>
+        | Rx.Observable<Question>;
 
     interface Inquirer {
         restoreDefaultPrompts(): void;
@@ -39,7 +44,7 @@ declare namespace inquirer {
         ui: {
             BottomBar: ui.BottomBar;
             Prompt: ui.Prompt;
-        }
+        };
     }
 
     interface PromptModule {
@@ -91,7 +96,9 @@ declare namespace inquirer {
          * Array values can be simple strings, or objects containing a name (to display) and a value properties
          * (to save in the answers hash). Values can also be a Separator.
          */
-        choices?: ChoiceType[] | ((answers: Answers) => ChoiceType[]);
+        choices?:
+            | ReadonlyArray<ChoiceType>
+            | ((answers: Answers) => ReadonlyArray<ChoiceType>);
         /**
          * Receive the user input and should return true if the value is valid, and an error message (String)
          * otherwise. If false is returned, a default error message is provided.
@@ -247,9 +254,12 @@ declare namespace inquirer {
          * @param choices  All `choice` to keep in the collection
          */
         interface Choices {
-            new (choices: (string | Separator | ChoiceOption)[], answers?: Answers): Choices;
-            choices: Choice[];
-            realChoices: Choice[];
+            new (
+                choices: ReadonlyArray<string | Separator | ChoiceOption>,
+                answers?: Answers
+            ): Choices;
+            choices: ReadonlyArray<Choice>;
+            realChoices: ReadonlyArray<Choice>;
             length: number;
             realLength: number;
             /**
diff --git a/types/inquirer/inquirer-tests.ts b/types/inquirer/inquirer-tests.ts
index 4a43dcc98e..1afce2e378 100644
--- a/types/inquirer/inquirer-tests.ts
+++ b/types/inquirer/inquirer-tests.ts
@@ -525,3 +525,24 @@ function likesFood ( aFood: string ) {
 inquirer.prompt(questions, function (answers) {
     console.log( JSON.stringify(answers, null, "  ") );
 });
+
+// immutable usage
+const immutableChoices: ReadonlyArray<string> = [
+    'Order a pizza',
+    'Make a reservation',
+    'Ask opening hours',
+    'Talk to the receptionist'
+];
+inquirer.prompt(
+    [
+        {
+            type: 'rawlist',
+            name: 'theme',
+            message: 'What do you want to do?',
+            choices: immutableChoices
+        }
+    ],
+    function(answers: inquirer.Answers) {
+        console.log(JSON.stringify(answers, null, '  '));
+    }
+);

From dd878f4839ceafe8b55ff64cf5c7ff1de6d08629 Mon Sep 17 00:00:00 2001
From: Jason Dreyzehner <jason@dreyzehner.com>
Date: Mon, 5 Mar 2018 23:22:44 -0500
Subject: [PATCH 0275/1382] meow: array params are not required to be mutable

---
 types/meow/index.d.ts    | 17 ++++++++++++-----
 types/meow/meow-tests.ts | 36 +++++++++++++++++++-----------------
 2 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/types/meow/index.d.ts b/types/meow/index.d.ts
index 20e40c63f7..98004a1a9a 100644
--- a/types/meow/index.d.ts
+++ b/types/meow/index.d.ts
@@ -1,20 +1,27 @@
 // Type definitions for meow 4.x
 // Project: https://github.com/sindresorhus/meow
-// Definitions by: KnisterPeter <https://github.com/KnisterPeter>, Lindsey Smith <https://github.com/praxxis>
+// Definitions by: KnisterPeter <https://github.com/KnisterPeter>
+//                 Lindsey Smith <https://github.com/praxxis>
+//                 Jason Dreyzehner <https://github.com/bitjson>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
-import * as buildOptions from "minimist-options";
+import * as buildOptions from 'minimist-options';
 
-declare function meow(helpMessage: string | string[], options: meow.Options): meow.Result;
-declare function meow(options: string | string[] | meow.Options): meow.Result;
+declare function meow(
+    helpMessage: string | ReadonlyArray<string>,
+    options: meow.Options
+): meow.Result;
+declare function meow(
+    options: string | ReadonlyArray<string> | meow.Options
+): meow.Result;
 declare namespace meow {
     interface Options {
         description?: string | boolean;
         help?: string | boolean;
         version?: string | boolean;
         pkg?: any;
-        argv?: string[];
+        argv?: ReadonlyArray<string>;
         inferType?: boolean;
         flags?: buildOptions.Options;
         autoHelp?: boolean;
diff --git a/types/meow/meow-tests.ts b/types/meow/meow-tests.ts
index 8915603292..2a0820b33c 100644
--- a/types/meow/meow-tests.ts
+++ b/types/meow/meow-tests.ts
@@ -1,28 +1,30 @@
 import meow = require('meow');
 
-const cli = meow("Help text",
-    {
-        flags: {
-            unicorn: {
-                type: 'boolean',
-                alias: 'u'
-            },
-            fooBar: {
-                type: 'string',
-                default: 'foo'
-            }
+const cli = meow('Help text', {
+    flags: {
+        unicorn: {
+            type: 'boolean',
+            alias: 'u'
+        },
+        fooBar: {
+            type: 'string',
+            default: 'foo'
         }
     }
-);
+});
 
-const cli2 = meow("Help text");
+const input: string = cli.input[0];
+
+const cli2 = meow('Help text');
+
+const args: ReadonlyArray<string> = ['foo', 'bar'];
 
 const cli3 = meow({
-    description: "version string",
-    help: "help string",
-    version: "1.0.0",
+    description: 'version string',
+    help: 'help string',
+    version: '1.0.0',
     pkg: {},
-    argv: ['foo', 'bar'],
+    argv: args,
     inferType: true,
     autoHelp: true,
     autoVersion: true,

From dc4147a0b628df00acd089e93123e2e4f3cc37bd Mon Sep 17 00:00:00 2001
From: Ethan Resnick <ethan.resnick@gmail.com>
Date: Mon, 5 Mar 2018 23:25:39 -0500
Subject: [PATCH 0276/1382] mongoose: remove null from result type when doc
 must exist

---
 types/mongoose/index.d.ts           | 9 +++++++++
 types/mongoose/mongoose-tests.ts    | 3 +++
 types/mongoose/v4/index.d.ts        | 9 +++++++++
 types/mongoose/v4/mongoose-tests.ts | 4 ++++
 4 files changed, 25 insertions(+)

diff --git a/types/mongoose/index.d.ts b/types/mongoose/index.d.ts
index a6d8a7b822..d4f80af795 100644
--- a/types/mongoose/index.d.ts
+++ b/types/mongoose/index.d.ts
@@ -1545,6 +1545,9 @@ declare module "mongoose" {
       callback?: (err: any, doc: DocType | null, res: any) => void): DocumentQuery<DocType | null, DocType>;
     findOneAndUpdate(query: any | Query<any>, update: any,
       callback?: (err: any, doc: DocType | null, res: any) => void): DocumentQuery<DocType | null, DocType>;
+    findOneAndUpdate(query: any | Query<any>, update: any,
+      options: { upsert: true, new: true } & QueryFindOneAndUpdateOptions,
+      callback?: (err: any, doc: DocType, res: any) => void): DocumentQuery<DocType, DocType>;
     findOneAndUpdate(query: any | Query<any>, update: any, options: QueryFindOneAndUpdateOptions,
       callback?: (err: any, doc: DocType | null, res: any) => void): DocumentQuery<DocType | null, DocType>;
 
@@ -2520,6 +2523,9 @@ declare module "mongoose" {
     findByIdAndUpdate(): DocumentQuery<T | null, T>;
     findByIdAndUpdate(id: any | number | string, update: any,
       callback?: (err: any, res: T | null) => void): DocumentQuery<T | null, T>;
+    findByIdAndUpdate(id: any | number | string, update: any,
+      options: { upsert: true, new: true } & ModelFindByIdAndUpdateOptions,
+      callback?: (err: any, res: T) => void): DocumentQuery<T, T>;
     findByIdAndUpdate(id: any | number | string, update: any,
       options: ModelFindByIdAndUpdateOptions,
       callback?: (err: any, res: T | null) => void): DocumentQuery<T | null, T>;
@@ -2565,6 +2571,9 @@ declare module "mongoose" {
     findOneAndUpdate(): DocumentQuery<T | null, T>;
     findOneAndUpdate(conditions: any, update: any,
       callback?: (err: any, doc: T | null, res: any) => void): DocumentQuery<T | null, T>;
+    findOneAndUpdate(conditions: any, update: any,
+      options: { upsert: true, new: true } & ModelFindOneAndUpdateOptions,
+      callback?: (err: any, doc: T, res: any) => void): DocumentQuery<T, T>;
     findOneAndUpdate(conditions: any, update: any,
       options: ModelFindOneAndUpdateOptions,
       callback?: (err: any, doc: T | null, res: any) => void): DocumentQuery<T | null, T>;
diff --git a/types/mongoose/mongoose-tests.ts b/types/mongoose/mongoose-tests.ts
index bf2f61f4a3..fc43549f8e 100644
--- a/types/mongoose/mongoose-tests.ts
+++ b/types/mongoose/mongoose-tests.ts
@@ -758,6 +758,7 @@ query.findOneAndUpdate({name: 'aa'}, {name: 'bb'}, {
 }, cb);
 query.findOneAndUpdate({name: 'aa'}, {name: 'bb'}, cb);
 query.findOneAndUpdate({name: 'aa'}, {name: 'bb'});
+query.findOneAndUpdate({}, {}, { upsert: true, new: true });
 query.findOneAndUpdate({name: 'bb'}, cb);
 query.findOneAndUpdate({name: 'bb'});
 query.findOneAndUpdate(cb);
@@ -1387,6 +1388,7 @@ MongoModel.findByIdAndRemove(999);
 MongoModel.findByIdAndRemove();
 MongoModel.findByIdAndUpdate(999, {}, {}, cb);
 MongoModel.findByIdAndUpdate(999, {}, {});
+MongoModel.findByIdAndUpdate(999, {}, { upsert: true, new: true });
 MongoModel.findByIdAndUpdate(999, {}, cb);
 MongoModel.findByIdAndUpdate(999, {});
 MongoModel.findByIdAndUpdate();
@@ -1415,6 +1417,7 @@ MongoModel.findOneAndRemove({});
 MongoModel.findOneAndRemove();
 MongoModel.findOneAndUpdate({}, {}, {}, cb);
 MongoModel.findOneAndUpdate({}, {}, {});
+MongoModel.findOneAndUpdate({}, {}, { upsert: true, new: true });
 MongoModel.findOneAndUpdate({}, {}, cb);
 MongoModel.findOneAndUpdate({}, {});
 MongoModel.findOneAndUpdate();
diff --git a/types/mongoose/v4/index.d.ts b/types/mongoose/v4/index.d.ts
index 4a4b7d224e..6cd9c5e152 100644
--- a/types/mongoose/v4/index.d.ts
+++ b/types/mongoose/v4/index.d.ts
@@ -1602,6 +1602,9 @@ declare module "mongoose" {
       callback?: (err: any, doc: DocType | null, res: any) => void): DocumentQuery<DocType | null, DocType>;
     findOneAndUpdate(query: any | Query<any>, update: any,
       callback?: (err: any, doc: DocType | null, res: any) => void): DocumentQuery<DocType | null, DocType>;
+    findOneAndUpdate(query: any | Query<any>, update: any,
+      options: { upsert: true, new: true } & QueryFindOneAndUpdateOptions,
+      callback?: (err: any, doc: DocType, res: any) => void): DocumentQuery<DocType, DocType>;
     findOneAndUpdate(query: any | Query<any>, update: any, options: QueryFindOneAndUpdateOptions,
       callback?: (err: any, doc: DocType | null, res: any) => void): DocumentQuery<DocType | null, DocType>;
 
@@ -2528,6 +2531,9 @@ declare module "mongoose" {
     findByIdAndUpdate(): DocumentQuery<T | null, T>;
     findByIdAndUpdate(id: any | number | string, update: any,
       callback?: (err: any, res: T | null) => void): DocumentQuery<T | null, T>;
+    findByIdAndUpdate(id: any | number | string, update: any,
+      options: { upsert: true, new: true } & ModelFindByIdAndUpdateOptions,
+      callback?: (err: any, res: T) => void): DocumentQuery<T, T>;
     findByIdAndUpdate(id: any | number | string, update: any,
       options: ModelFindByIdAndUpdateOptions,
       callback?: (err: any, res: T | null) => void): DocumentQuery<T | null, T>;
@@ -2573,6 +2579,9 @@ declare module "mongoose" {
     findOneAndUpdate(): DocumentQuery<T | null, T>;
     findOneAndUpdate(conditions: any, update: any,
       callback?: (err: any, doc: T | null, res: any) => void): DocumentQuery<T | null, T>;
+    findOneAndUpdate(conditions: any, update: any,
+      options: { upsert: true, new: true } & ModelFindOneAndUpdateOptions,
+      callback?: (err: any, doc: T, res: any) => void): DocumentQuery<T, T>;
     findOneAndUpdate(conditions: any, update: any,
       options: ModelFindOneAndUpdateOptions,
       callback?: (err: any, doc: T | null, res: any) => void): DocumentQuery<T | null, T>;
diff --git a/types/mongoose/v4/mongoose-tests.ts b/types/mongoose/v4/mongoose-tests.ts
index 64214fe983..170a005b49 100644
--- a/types/mongoose/v4/mongoose-tests.ts
+++ b/types/mongoose/v4/mongoose-tests.ts
@@ -743,6 +743,8 @@ query.findOneAndUpdate({name: 'aa'}, {name: 'bb'}, {
 }, cb);
 query.findOneAndUpdate({name: 'aa'}, {name: 'bb'}, cb);
 query.findOneAndUpdate({name: 'aa'}, {name: 'bb'});
+query.findOneAndUpdate({name: 'aa'}, {name: 'bb'}, { });
+query.findOneAndUpdate({name: 'aa'}, {name: 'bb'}, { upsert: true, new: true });
 query.findOneAndUpdate({name: 'bb'}, cb);
 query.findOneAndUpdate({name: 'bb'});
 query.findOneAndUpdate(cb);
@@ -1371,6 +1373,7 @@ MongoModel.findByIdAndRemove(999);
 MongoModel.findByIdAndRemove();
 MongoModel.findByIdAndUpdate(999, {}, {}, cb);
 MongoModel.findByIdAndUpdate(999, {}, {});
+MongoModel.findByIdAndUpdate(999, {}, { new: true, upsert: true }, cb);
 MongoModel.findByIdAndUpdate(999, {}, cb);
 MongoModel.findByIdAndUpdate(999, {});
 MongoModel.findByIdAndUpdate();
@@ -1399,6 +1402,7 @@ MongoModel.findOneAndRemove({});
 MongoModel.findOneAndRemove();
 MongoModel.findOneAndUpdate({}, {}, {}, cb);
 MongoModel.findOneAndUpdate({}, {}, {});
+MongoModel.findOneAndUpdate({}, {}, { upsert: true, new: true });
 MongoModel.findOneAndUpdate({}, {}, cb);
 MongoModel.findOneAndUpdate({}, {});
 MongoModel.findOneAndUpdate();

From 6eb0a51a6916b989171710e868f646e9b2f6032e Mon Sep 17 00:00:00 2001
From: Jason Dreyzehner <jason@dreyzehner.com>
Date: Mon, 5 Mar 2018 23:25:59 -0500
Subject: [PATCH 0277/1382] meow: Result.pkg should return any, not object

https://github.com/Microsoft/TypeScript/issues/15225#issuecomment-294565052
---
 types/meow/index.d.ts    | 2 +-
 types/meow/meow-tests.ts | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/meow/index.d.ts b/types/meow/index.d.ts
index 98004a1a9a..db3d697691 100644
--- a/types/meow/index.d.ts
+++ b/types/meow/index.d.ts
@@ -31,7 +31,7 @@ declare namespace meow {
     interface Result {
         input: string[];
         flags: { [name: string]: any };
-        pkg: object;
+        pkg: any;
         help: string;
         showHelp(code?: number): void;
         showVersion(): void;
diff --git a/types/meow/meow-tests.ts b/types/meow/meow-tests.ts
index 2a0820b33c..1b044881b5 100644
--- a/types/meow/meow-tests.ts
+++ b/types/meow/meow-tests.ts
@@ -14,6 +14,7 @@ const cli = meow('Help text', {
 });
 
 const input: string = cli.input[0];
+const version: string = cli.pkg.version;
 
 const cli2 = meow('Help text');
 

From eb0e9edf12de0bebd3afb39f0067fadebb716627 Mon Sep 17 00:00:00 2001
From: Jason Dreyzehner <jason@dreyzehner.com>
Date: Mon, 5 Mar 2018 23:38:21 -0500
Subject: [PATCH 0278/1382] update-notifier: correct signature of callback
 param, mark update as optional

---
 types/update-notifier/index.d.ts              | 14 +++++++----
 .../update-notifier/update-notifier-tests.ts  | 25 +++++++++++++++----
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/types/update-notifier/index.d.ts b/types/update-notifier/index.d.ts
index 11f6e5616e..98c71d87f6 100644
--- a/types/update-notifier/index.d.ts
+++ b/types/update-notifier/index.d.ts
@@ -1,17 +1,21 @@
-// Type definitions for update-notifier 2.0
+// Type definitions for update-notifier 2.2
 // Project: https://github.com/yeoman/update-notifier
-// Definitions by: vvakame <https://github.com/vvakame>, Noah Chen <https://github.com/nchen63>
+// Definitions by: vvakame <https://github.com/vvakame>
+//                 Noah Chen <https://github.com/nchen63>
+//                 Jason Dreyzehner <https://github.com/bitjson>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export = UpdateNotifier;
 
-declare function UpdateNotifier(settings?: UpdateNotifier.Settings): UpdateNotifier.UpdateNotifier;
+declare function UpdateNotifier(
+    settings?: UpdateNotifier.Settings
+): UpdateNotifier.UpdateNotifier;
 
 declare namespace UpdateNotifier {
     class UpdateNotifier {
         constructor(settings?: Settings);
 
-        update: UpdateInfo;
+        update?: UpdateInfo;
         check(): void;
         checkNpm(): void;
         notify(customMessage?: NotifyOptions): void;
@@ -19,7 +23,7 @@ declare namespace UpdateNotifier {
 
     interface Settings {
         pkg?: Package;
-        callback?(update?: UpdateInfo): any;
+        callback?(error: Error | null, update?: UpdateInfo): any;
         packageName?: string;
         packageVersion?: string;
         updateCheckInterval?: number; // in milliseconds, default 1000 * 60 * 60 * 24 (1 day)
diff --git a/types/update-notifier/update-notifier-tests.ts b/types/update-notifier/update-notifier-tests.ts
index fc55c3286a..c09fcf556a 100644
--- a/types/update-notifier/update-notifier-tests.ts
+++ b/types/update-notifier/update-notifier-tests.ts
@@ -1,16 +1,16 @@
-import UpdateNotifier = require("update-notifier");
+import UpdateNotifier = require('update-notifier');
 
 let notifier = UpdateNotifier();
 
 if (notifier.update) {
-	notifier.notify();
+    notifier.notify();
 }
 
 console.log(notifier.update);
 
 // Also exposed as a class
 notifier = new UpdateNotifier.UpdateNotifier({
-	updateCheckInterval: 1000 * 60 * 60 * 24 * 7 // 1 week
+    updateCheckInterval: 1000 * 60 * 60 * 24 * 7 // 1 week
 });
 
 if (notifier.update) {
@@ -27,7 +27,22 @@ if (notifier.update) {
             margin: 1,
             align: 'center',
             borderColor: 'yellow',
-            borderStyle: 'round',
-        },
+            borderStyle: 'round'
+        }
     });
 }
+
+// Using the callback option
+notifier = new UpdateNotifier.UpdateNotifier({
+    callback: (err, update) => {
+        if (err) throw err;
+        if (update) {
+            console.log(
+                update.current,
+                update.latest,
+                update.name,
+                update.type
+            );
+        }
+    }
+});

From 2100880c79886fa21e2df4bee46807c48494d5a6 Mon Sep 17 00:00:00 2001
From: Piotr Roszatycki <piotr.roszatycki@gmail.com>
Date: Tue, 6 Mar 2018 10:56:04 +0100
Subject: [PATCH 0279/1382] nodemailer: fetch returns Writable with extra
 properties

---
 types/nodemailer/lib/fetch/index.d.ts | 8 +++++++-
 types/nodemailer/nodemailer-tests.ts  | 6 +++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/types/nodemailer/lib/fetch/index.d.ts b/types/nodemailer/lib/fetch/index.d.ts
index 8fc814c517..765debb179 100644
--- a/types/nodemailer/lib/fetch/index.d.ts
+++ b/types/nodemailer/lib/fetch/index.d.ts
@@ -4,12 +4,18 @@ type ms = number;
 
 import _Cookies = require('./cookies');
 
+import * as http from 'http';
 import { Writable } from 'stream';
 import * as tls from 'tls';
 
 declare namespace fetch {
     type Cookies = _Cookies;
 
+    interface WritableResponse extends Writable {
+        statusCode: number;
+        headers: http.IncomingHttpHeaders;
+    }
+
     interface Options {
         fetchRes?: Writable;
         cookies?: Cookies;
@@ -27,6 +33,6 @@ declare namespace fetch {
     }
 }
 
-declare function fetch(url: string, options?: fetch.Options): Writable;
+declare function fetch(url: string, options?: fetch.Options): fetch.WritableResponse;
 
 export = fetch;
diff --git a/types/nodemailer/nodemailer-tests.ts b/types/nodemailer/nodemailer-tests.ts
index 9761cb73e4..db7ba336a8 100644
--- a/types/nodemailer/nodemailer-tests.ts
+++ b/types/nodemailer/nodemailer-tests.ts
@@ -1090,7 +1090,11 @@ function base64_test() {
 // fetch
 
 function fetch_test() {
-    fetch('http://localhost/');
+    const stream = fetch('http://localhost/');
+
+    const statusCode: number = stream.statusCode;
+    const headers = stream.headers;
+    const contentType: string | undefined = headers['content-type'];
 
     fetch('http://localhost:/', {
         allowErrorResponse: true,

From cb4a467c5b5ce0d471cdf82725ff26669342327f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anton=20Str=C3=B6mkvist?= <anton@stromkvist.com>
Date: Tue, 6 Mar 2018 11:05:11 +0100
Subject: [PATCH 0280/1382] Add types for event-emitter-es6

---
 .../event-emitter-es6-tests.ts                | 17 ++++++++++++++
 types/event-emitter-es6/index.d.ts            | 23 +++++++++++++++++++
 types/event-emitter-es6/tsconfig.json         | 23 +++++++++++++++++++
 types/event-emitter-es6/tslint.json           |  1 +
 4 files changed, 64 insertions(+)
 create mode 100644 types/event-emitter-es6/event-emitter-es6-tests.ts
 create mode 100644 types/event-emitter-es6/index.d.ts
 create mode 100644 types/event-emitter-es6/tsconfig.json
 create mode 100644 types/event-emitter-es6/tslint.json

diff --git a/types/event-emitter-es6/event-emitter-es6-tests.ts b/types/event-emitter-es6/event-emitter-es6-tests.ts
new file mode 100644
index 0000000000..8001d2605e
--- /dev/null
+++ b/types/event-emitter-es6/event-emitter-es6-tests.ts
@@ -0,0 +1,17 @@
+import EventEmitter = require("event-emitter-es6");
+
+const ee = new EventEmitter();
+const ee1 = new EventEmitter({ emitDelay: 50 });
+const ee2 = new EventEmitter({ strictMode: true });
+const ee3 = new EventEmitter({ strictMode: false, emitDelay: 5 });
+const ee4 = new EventEmitter({});
+
+ee.on("test", () => {});
+ee.once("test", () => {});
+ee.off("test", () => {});
+ee.off("test");
+ee.emit("test");
+ee.emit("test", 1, 2, 3, "a", "b", "c");
+ee.emitSync("test");
+ee.emitSync("test", 1, 2, 3, "a", "b", "c");
+ee.destroy();
diff --git a/types/event-emitter-es6/index.d.ts b/types/event-emitter-es6/index.d.ts
new file mode 100644
index 0000000000..840f2ddf38
--- /dev/null
+++ b/types/event-emitter-es6/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for event-emitter-es6 1.1
+// Project: https://github.com/insane-jo/event-emitter#readme
+// Definitions by: Anton Strömkvist <https://github.com/ahstro>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface Options {
+  emitDelay?: number;
+  strictMode?: boolean;
+}
+
+type Listener = (...args: any[]) => void;
+
+declare class EventEmitter {
+  constructor(options?: Options);
+  on(type: string, listener: Listener): void;
+  once(type: string, listener: Listener): void;
+  off(type: string, listener?: Listener): void;
+  emit(type: string, ...eventArgs: any[]): void;
+  emitSync(type: string, ...eventArgs: any[]): void;
+  destroy(): void;
+}
+
+export = EventEmitter;
diff --git a/types/event-emitter-es6/tsconfig.json b/types/event-emitter-es6/tsconfig.json
new file mode 100644
index 0000000000..f450ea2a8a
--- /dev/null
+++ b/types/event-emitter-es6/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "event-emitter-es6-tests.ts"
+    ]
+}
diff --git a/types/event-emitter-es6/tslint.json b/types/event-emitter-es6/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/event-emitter-es6/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From ac615801489c098a4c17a404a45fd5e2c2a1b7ad Mon Sep 17 00:00:00 2001
From: Piotr Roszatycki <piotr.roszatycki@gmail.com>
Date: Tue, 6 Mar 2018 11:59:37 +0100
Subject: [PATCH 0281/1382] nodemailer: correct typings for MimeNode

---
 types/nodemailer/index.d.ts          |  2 +-
 types/nodemailer/lib/mime-node.d.ts  | 10 ++++---
 types/nodemailer/nodemailer-tests.ts | 45 ++++++++++++++++++++++++++++
 3 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/types/nodemailer/index.d.ts b/types/nodemailer/index.d.ts
index bee4649e94..0b46c67789 100644
--- a/types/nodemailer/index.d.ts
+++ b/types/nodemailer/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Nodemailer 4.3
+// Type definitions for Nodemailer 4.6
 // Project: https://github.com/nodemailer/nodemailer
 // Definitions by: Rogier Schouten <https://github.com/rogierschouten>
 //                 Piotr Roszatycki <https://github.com/dex4er>
diff --git a/types/nodemailer/lib/mime-node.d.ts b/types/nodemailer/lib/mime-node.d.ts
index 98eda91874..047770ce57 100644
--- a/types/nodemailer/lib/mime-node.d.ts
+++ b/types/nodemailer/lib/mime-node.d.ts
@@ -34,7 +34,9 @@ declare namespace MimeNode {
         /** If true, do not exclude Bcc from the generated headers */
         keepBcc?: boolean;
         /** either 'Q' (the default) or 'B' */
-        textEncoding: 'B' | 'Q';
+        textEncoding?: 'B' | 'Q';
+        /** method to normalize header keys for custom caseing */
+        normalizeHeaderKey?(key: string): string;
     }
 }
 
@@ -44,10 +46,10 @@ declare namespace MimeNode {
  * the options, assumes this is the root.
  */
 declare class MimeNode {
-    constructor(contentType: string, options: MimeNode.Options);
+    constructor(contentType: string, options?: MimeNode.Options);
 
     /** Creates and appends a child node.Arguments provided are passed to MimeNode constructor */
-    createChild(contentType: string, options: MimeNode.Options): MimeNode;
+    createChild(contentType: string, options?: MimeNode.Options): MimeNode;
 
     /** Appends an existing node to the mime tree. Removes the node from an existing tree if needed */
     appendChild(childNode: MimeNode): MimeNode;
@@ -63,7 +65,7 @@ declare class MimeNode {
      * You can set multiple values as well by using [{key:'', value:''}] or
      * {key: 'value'} as the first argument.
      */
-    setHeader(key: string, value: string): this;
+    setHeader(key: string, value: string | string[]): this;
     setHeader(headers: { [key: string]: string } | Array<{ key: string, value: string }>): this;
 
     /**
diff --git a/types/nodemailer/nodemailer-tests.ts b/types/nodemailer/nodemailer-tests.ts
index db7ba336a8..5fee4adf1b 100644
--- a/types/nodemailer/nodemailer-tests.ts
+++ b/types/nodemailer/nodemailer-tests.ts
@@ -10,6 +10,7 @@ import MailComposer = require('nodemailer/lib/mail-composer');
 import MailMessage = require('nodemailer/lib/mailer/mail-message');
 import mimeFuncs = require('nodemailer/lib/mime-funcs');
 import mimeTypes = require('nodemailer/lib/mime-funcs/mime-types');
+import MimeNode = require('nodemailer/lib/mime-node');
 import qp = require('nodemailer/lib/qp');
 import SendmailTransport = require('nodemailer/lib/sendmail-transport');
 import SESTransport = require('nodemailer/lib/ses-transport');
@@ -1205,6 +1206,50 @@ function mime_funcs_test() {
     mimeFuncs.foldLines('Testin command line', 76);
 }
 
+// mime-node
+
+function mime_node_test() {
+    const mb = new MimeNode('text/plain', {
+        normalizeHeaderKey: (key) => key.toUpperCase()
+    });
+
+    const child = mb.createChild('multipart/mixed');
+    mb.appendChild(child);
+    child.replace(child);
+
+    mb.setHeader('key', 'value');
+    const value: string = mb.getHeader('key');
+
+    mb.addHeader({
+        key: 'value4',
+        key2: 'value5'
+    });
+
+    mb.setHeader([
+        {
+            key: 'key',
+            value: 'value2'
+        },
+        {
+            key: 'key2',
+            value: 'value3'
+        }
+    ]);
+
+    mb.setHeader('key', ['value1', 'value2', 'value3']);
+
+    mb.setContent('abc');
+
+    mb.build((err, msg) => {
+        const msgAsString: string = msg.toString();
+    });
+
+    mb.processFunc((input) => {
+        const isReadable: boolean = input.readable;
+        return input;
+    });
+}
+
 // mime-types
 
 function mime_types_test() {

From ed091dbe4535291c851dc779f111698010a39a1b Mon Sep 17 00:00:00 2001
From: Piotr Roszatycki <piotr.roszatycki@gmail.com>
Date: Tue, 6 Mar 2018 12:05:54 +0100
Subject: [PATCH 0282/1382] normalizeHeaderKey is a part of Mail.Options too

---
 types/nodemailer/lib/mailer/index.d.ts | 2 ++
 types/nodemailer/nodemailer-tests.ts   | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/types/nodemailer/lib/mailer/index.d.ts b/types/nodemailer/lib/mailer/index.d.ts
index bd9dd7ba8d..9be39f9d79 100644
--- a/types/nodemailer/lib/mailer/index.d.ts
+++ b/types/nodemailer/lib/mailer/index.d.ts
@@ -135,6 +135,8 @@ declare namespace Mail {
         disableFileAccess?: boolean;
         /** is an object with DKIM options */
         dkim?: DKIM.Options;
+        /** method to normalize header keys for custom caseing */
+        normalizeHeaderKey?(key: string): string;
     }
 
     type PluginFunction = (mail: MailMessage, callback: (err?: Error | null) => void) => void;
diff --git a/types/nodemailer/nodemailer-tests.ts b/types/nodemailer/nodemailer-tests.ts
index 5fee4adf1b..0caa84b0e0 100644
--- a/types/nodemailer/nodemailer-tests.ts
+++ b/types/nodemailer/nodemailer-tests.ts
@@ -791,7 +791,8 @@ function stream_buffer_unix_newlines_test() {
     const transporter = nodemailer.createTransport({
         streamTransport: true,
         newline: 'unix',
-        buffer: true
+        buffer: true,
+        normalizeHeaderKey: (key) => key.toUpperCase()
     });
     transporter.sendMail({
         from: 'sender@example.com',

From 6a7dd656f58d3d0e353592f4c480ff8505b47176 Mon Sep 17 00:00:00 2001
From: Piotr Roszatycki <piotr.roszatycki@gmail.com>
Date: Tue, 6 Mar 2018 12:10:51 +0100
Subject: [PATCH 0283/1382] Better doc for contentTransferEncoding

---
 types/nodemailer/lib/mailer/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/nodemailer/lib/mailer/index.d.ts b/types/nodemailer/lib/mailer/index.d.ts
index 9be39f9d79..f9d36d7efb 100644
--- a/types/nodemailer/lib/mailer/index.d.ts
+++ b/types/nodemailer/lib/mailer/index.d.ts
@@ -46,7 +46,7 @@ declare namespace Mail {
         encoding?: string;
         /** optional content type for the attachment, if not set will be derived from the filename property */
         contentType?: string;
-        /** optional transfer encoding for the attachment, if not set it will be derived from the contentType property. Example values: quoted-printable, base64 */
+        /** optional transfer encoding for the attachment, if not set it will be derived from the contentType property. Example values: quoted-printable, base64. If it is unset then base64 encoding is used for the attachment. If it is set to false then previous default applies (base64 for most, 7bit for text). */
         contentTransferEncoding?: string;
         /** optional content disposition type for the attachment, defaults to ‘attachment’ */
         contentDisposition?: string;

From f85d5b4341296ef83a1603fc6c8af431027e31c1 Mon Sep 17 00:00:00 2001
From: Budi Irawan <deerawan@gmail.com>
Date: Tue, 6 Mar 2018 22:11:36 +1100
Subject: [PATCH 0284/1382] Add UpdateDocumentByQueryResponse elasticsearch

---
 types/elasticsearch/elasticsearch-tests.ts | 24 ++++++++++++++++++++++
 types/elasticsearch/index.d.ts             | 23 +++++++++++++++++++--
 2 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/types/elasticsearch/elasticsearch-tests.ts b/types/elasticsearch/elasticsearch-tests.ts
index 10c4659998..e21f84dc48 100644
--- a/types/elasticsearch/elasticsearch-tests.ts
+++ b/types/elasticsearch/elasticsearch-tests.ts
@@ -266,6 +266,30 @@ client.search({
   }
 });
 
+client.updateByQuery({
+  index: 'myIndex',
+  type: 'mytype',
+}, (error, response) => {
+  const {
+    took,
+    timed_out,
+    updated,
+    deleted,
+    batches,
+    version_conflicts,
+    noops,
+    retries,
+    throttled_millis,
+    throttled_until_millis,
+    total,
+    failures
+  } = response;
+
+  const { bulk, search } = retries;
+
+  // ...
+});
+
 client.indices.updateAliases({
   body: {
     actions: [
diff --git a/types/elasticsearch/index.d.ts b/types/elasticsearch/index.d.ts
index c6b05da9a0..e60e8d86c3 100644
--- a/types/elasticsearch/index.d.ts
+++ b/types/elasticsearch/index.d.ts
@@ -89,8 +89,8 @@ export class Client {
     termvectors(params: TermvectorsParams, callback: (error: any, response: any) => void): void;
     update(params: UpdateDocumentParams): Promise<any>;
     update(params: UpdateDocumentParams, callback: (error: any, response: any) => void): void;
-    updateByQuery(params: UpdateDocumentByQueryParams): Promise<any>;
-    updateByQuery(params: UpdateDocumentByQueryParams, callback: (error: any, response: any) => void): void;
+    updateByQuery(params: UpdateDocumentByQueryParams): Promise<UpdateDocumentByQueryResponse>;
+    updateByQuery(params: UpdateDocumentByQueryParams, callback: (error: any, response: UpdateDocumentByQueryResponse) => void): void;
     close(): void;
 }
 
@@ -785,6 +785,25 @@ export interface UpdateDocumentByQueryParams extends GenericParams {
     type: NameList;
 }
 
+export interface UpdateDocumentByQueryResponse {
+    took: number;
+    timed_out: boolean;
+    updated: number;
+    deleted: number;
+    batches: number;
+    version_conflicts: number;
+    noops: number;
+    retries: {
+        bulk: number;
+        search: number;
+    };
+    throttled_millis: number;
+    requests_per_second: number;
+    throttled_until_millis: number;
+    total: number;
+    failures: any[];
+}
+
 export interface Cat {
     aliases(params: CatAliasesParams, callback: (error: any, response: any) => void): void;
     aliases(params: CatAliasesParams): Promise<any>;

From 06aa888812b7b7e55fd61de3fae5166178fb22a7 Mon Sep 17 00:00:00 2001
From: Andrea Ascari <andrea.ascari@buildo.io>
Date: Tue, 6 Mar 2018 13:42:50 +0100
Subject: [PATCH 0285/1382] Diable tslint rule

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

diff --git a/types/react-native-auth0/index.d.ts b/types/react-native-auth0/index.d.ts
index 152da0655c..153bfd65d9 100644
--- a/types/react-native-auth0/index.d.ts
+++ b/types/react-native-auth0/index.d.ts
@@ -80,6 +80,7 @@ export interface UserInfo {
 }
 export class Auth {
     authorizationUrl(params: AuthorizationUrlParams): string;
+    /* tslint:disable-next-line no-unnecessary-generics */
     createUser<T>(user: CreateUserParams<T>): Promise<CreateUserResponse>;
     exchange(params: ExchangeParams): Promise<string>;
     logoutUrl(params: LogoutParams): string;

From 0dde12db1ffc484ec00f2f7e208059cbb5df6bdd Mon Sep 17 00:00:00 2001
From: Quentin Bouygues <qbouygues@zendesk.com>
Date: Tue, 6 Mar 2018 14:37:03 +0100
Subject: [PATCH 0286/1382] [fetch-mock] Add Mock Configuration Options

---
 types/fetch-mock/fetch-mock-tests.ts | 1 +
 types/fetch-mock/index.d.ts          | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/types/fetch-mock/fetch-mock-tests.ts b/types/fetch-mock/fetch-mock-tests.ts
index 1d4b706105..84218fb9e1 100644
--- a/types/fetch-mock/fetch-mock-tests.ts
+++ b/types/fetch-mock/fetch-mock-tests.ts
@@ -61,6 +61,7 @@ fetchMock.patch("http://test.com", 200);
 fetchMock.patchOnce("http://test.com", 200);
 
 fetchMock.get("http://test.com", 200, {method: "GET"});
+fetchMock.get("http://test.com", 200, {method: "GET", overwriteRoutes: true});
 fetchMock.post("http://test.com", 200, {method: "POST"});
 fetchMock.put("http://test.com", 200, {method: "PUT"});
 fetchMock.delete("http://test.com", 200, {method: "DELETE"});
diff --git a/types/fetch-mock/index.d.ts b/types/fetch-mock/index.d.ts
index 15babcba34..fc94b18106 100644
--- a/types/fetch-mock/index.d.ts
+++ b/types/fetch-mock/index.d.ts
@@ -5,6 +5,7 @@
 //                 Risto Keravuori <https://github.com/merrywhether>
 //                 Chris Sinclair <https://github.com/chrissinclair>
 //                 Matt Tennison <https://github.com/matttennison>
+//                 Quentin Bouygues <https://github.com/quentinbouygues>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -120,6 +121,12 @@ declare namespace fetchMock {
          * as specified above
          */
         matcher?: MockMatcher;
+        /**
+         * This option allows for existing routes in a mock to be overwritten.
+         * It’s also possible to define multiple routes with ‘the same’ matcher.
+         * Default behaviour is to error
+         */
+        overwriteRoutes?: boolean;
         /**
          * as specified above
          */

From 3c476312ab09e22932eb95f95dc132612bf865c3 Mon Sep 17 00:00:00 2001
From: dekster <ambarcumyanjuriy@mail.ru>
Date: Tue, 6 Mar 2018 16:46:32 +0300
Subject: [PATCH 0287/1382] Duplcate line

---
 types/react-truncate/index.d.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/types/react-truncate/index.d.ts b/types/react-truncate/index.d.ts
index 3c21c15150..15c72616c0 100644
--- a/types/react-truncate/index.d.ts
+++ b/types/react-truncate/index.d.ts
@@ -11,7 +11,6 @@ export interface TruncateProps extends React.HTMLProps<Truncate> {
     ellipsis?: React.ReactNode;
     trimWhitespace?: boolean;
     onTruncate?(isTruncated: boolean): void;
-    trimWhitespace?: boolean;
 }
 
 declare class Truncate extends React.Component<TruncateProps> { }

From f75e7eb5cce3342524dfa523fdeda0cc9d1b6f67 Mon Sep 17 00:00:00 2001
From: YairTawil <yairtawil@gmail.com>
Date: Tue, 6 Mar 2018 16:41:48 +0200
Subject: [PATCH 0288/1382] fix(openlayers): add transition property

---
 types/openlayers/index.d.ts | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/types/openlayers/index.d.ts b/types/openlayers/index.d.ts
index a01f6b25ad..333ee0f621 100644
--- a/types/openlayers/index.d.ts
+++ b/types/openlayers/index.d.ts
@@ -13517,7 +13517,8 @@ declare module olx {
          *            tileUrlFunction: (ol.TileUrlFunctionType|undefined),
          *            url: (string|undefined),
          *            urls: (Array.<string>|undefined),
-         *            wrapX: (boolean|undefined)}}
+         *            wrapX: (boolean|undefined),
+         *            transition: (number|undefined)}}
          */
         interface TileImageOptions {
             attributions?: ol.AttributionLike;
@@ -13536,6 +13537,7 @@ declare module olx {
             url?: string;
             urls?: string[];
             wrapX?: boolean;
+            transition?: number;
         }
 
         /**
@@ -13806,8 +13808,9 @@ declare module olx {
          *     reprojectionErrorThreshold: (number|undefined),
          *     tileLoadFunction: (ol.TileLoadFunctionType|undefined),
          *     url: (string|undefined),
-         *     urls: (Array.<string>|undefined),
-         *     wrapX: (boolean|undefined)}}
+         *     wrapX: (boolean|undefined),
+         *     transition: (number|undefined),
+         *     urls: (Array.<string>|undefined)}}
          */
         interface TileArcGISRestOptions {
             attributions?: ol.AttributionLike;
@@ -13821,6 +13824,7 @@ declare module olx {
             tileLoadFunction?: ol.TileLoadFunctionType;
             url?: string;
             wrapX?: boolean;
+            transition?: number;
             urls?: string[];
         }
 
@@ -13832,7 +13836,8 @@ declare module olx {
          *     reprojectionErrorThreshold: (number|undefined),
          *     tileLoadFunction: (ol.TileLoadFunctionType|undefined),
          *     url: string,
-         *     wrapX: (boolean|undefined)}}
+         *     wrapX: (boolean|undefined),
+         *     transition: (number|undefined)}}
          */
         interface TileJSONOptions {
             attributions?: ol.AttributionLike;
@@ -13843,6 +13848,7 @@ declare module olx {
             tileLoadFunction?: ol.TileLoadFunctionType;
             url: string;
             wrapX?: boolean;
+            transition?: number;
         }
 
         /**
@@ -13860,7 +13866,8 @@ declare module olx {
          *     tileLoadFunction: (ol.TileLoadFunctionType|undefined),
          *     url: (string|undefined),
          *     urls: (Array.<string>|undefined),
-         *     wrapX: (boolean|undefined)}}
+         *     wrapX: (boolean|undefined),
+         *     transition: (number|undefined)}}
          */
         interface TileWMSOptions {
             attributions?: ol.AttributionLike;
@@ -13878,6 +13885,7 @@ declare module olx {
             url?: string;
             urls?: string[];
             wrapX?: boolean;
+            transition?: number;
         }
 
         /**

From fc945e7fe9190bd589ddf3d70894f1f501ced059 Mon Sep 17 00:00:00 2001
From: YairTawil <yairtawil@gmail.com>
Date: Tue, 6 Mar 2018 16:42:12 +0200
Subject: [PATCH 0289/1382] test(openlayers): test transition property on
 TileWMS

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

diff --git a/types/openlayers/openlayers-tests.ts b/types/openlayers/openlayers-tests.ts
index 2d2d22d411..ce13ae8385 100644
--- a/types/openlayers/openlayers-tests.ts
+++ b/types/openlayers/openlayers-tests.ts
@@ -638,7 +638,8 @@ let tileWMS: ol.source.TileWMS = new ol.source.TileWMS({
     params: {},
     projection,
     serverType: stringValue,
-    url: stringValue
+    url: stringValue,
+    transition: 0.5
 });
 
 // test without projection

From c933e4be28c15806e885edda6678282017305092 Mon Sep 17 00:00:00 2001
From: Alexey Svirschevskiy <svirschevskiy@mercurydevelopment.com>
Date: Tue, 6 Mar 2018 19:05:38 +0400
Subject: [PATCH 0290/1382] react-truncate: Remove a duplicate property

---
 types/react-truncate/index.d.ts               | 1 -
 types/react-truncate/react-truncate-tests.tsx | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/types/react-truncate/index.d.ts b/types/react-truncate/index.d.ts
index 3c21c15150..15c72616c0 100644
--- a/types/react-truncate/index.d.ts
+++ b/types/react-truncate/index.d.ts
@@ -11,7 +11,6 @@ export interface TruncateProps extends React.HTMLProps<Truncate> {
     ellipsis?: React.ReactNode;
     trimWhitespace?: boolean;
     onTruncate?(isTruncated: boolean): void;
-    trimWhitespace?: boolean;
 }
 
 declare class Truncate extends React.Component<TruncateProps> { }
diff --git a/types/react-truncate/react-truncate-tests.tsx b/types/react-truncate/react-truncate-tests.tsx
index 5a97f7183f..b0afc2b970 100644
--- a/types/react-truncate/react-truncate-tests.tsx
+++ b/types/react-truncate/react-truncate-tests.tsx
@@ -15,8 +15,8 @@ const TruncateTest: React.SFC = _ => (
             <div>Test string</div>
         </Truncate>
 
-	<Truncate trimWhitespace={true}>
+        <Truncate trimWhitespace={true}>
             <div>Test string</div>
-	</Truncate>
+        </Truncate>
     </div>
 );

From c7dac525137b669616faef20d5a0bde180e116ba Mon Sep 17 00:00:00 2001
From: Jamie Davies <jamie@iamjamiedavies.com>
Date: Tue, 6 Mar 2018 15:30:19 +0000
Subject: [PATCH 0291/1382] Added types for js-string-escape

---
 types/js-string-escape/index.d.ts             |  8 +++++++
 .../js-string-escape-tests.ts                 |  3 +++
 types/js-string-escape/tsconfig.json          | 23 +++++++++++++++++++
 types/js-string-escape/tslint.json            |  1 +
 4 files changed, 35 insertions(+)
 create mode 100644 types/js-string-escape/index.d.ts
 create mode 100644 types/js-string-escape/js-string-escape-tests.ts
 create mode 100644 types/js-string-escape/tsconfig.json
 create mode 100644 types/js-string-escape/tslint.json

diff --git a/types/js-string-escape/index.d.ts b/types/js-string-escape/index.d.ts
new file mode 100644
index 0000000000..e9f888e6d0
--- /dev/null
+++ b/types/js-string-escape/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for js-string-escape 1.0
+// Project: https://github.com/joliss/js-string-escape
+// Definitions by: Jamie Davies <https://github.com/viralpickaxe>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function jsStringEscape(str: string): string;
+
+export = jsStringEscape;
diff --git a/types/js-string-escape/js-string-escape-tests.ts b/types/js-string-escape/js-string-escape-tests.ts
new file mode 100644
index 0000000000..88d691beeb
--- /dev/null
+++ b/types/js-string-escape/js-string-escape-tests.ts
@@ -0,0 +1,3 @@
+import jsStringEscape = require('js-string-escape');
+
+jsStringEscape('hello world');
diff --git a/types/js-string-escape/tsconfig.json b/types/js-string-escape/tsconfig.json
new file mode 100644
index 0000000000..b119a31f6e
--- /dev/null
+++ b/types/js-string-escape/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": true
+    },
+    "files": [
+        "index.d.ts",
+        "js-string-escape-tests.ts"
+    ]
+}
diff --git a/types/js-string-escape/tslint.json b/types/js-string-escape/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/js-string-escape/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From ae08714357b9827fd5ff3569202255d1cab29d45 Mon Sep 17 00:00:00 2001
From: Andrew Pinkham <code@andrewsforge.com>
Date: Tue, 6 Mar 2018 10:37:08 -0500
Subject: [PATCH 0292/1382] Protect internal props; createTile on GridLayer

---
 types/leaflet/index.d.ts | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/types/leaflet/index.d.ts b/types/leaflet/index.d.ts
index 922b9ab686..41b4fbd84c 100644
--- a/types/leaflet/index.d.ts
+++ b/types/leaflet/index.d.ts
@@ -392,7 +392,6 @@ export interface InteractiveLayerOptions extends LayerOptions {
 }
 
 export class Layer extends Evented {
-    _map: Map;
     constructor(options?: LayerOptions);
     addTo(map: Map|LayerGroup): this;
     remove(): this;
@@ -425,6 +424,8 @@ export class Layer extends Evented {
     getEvents?(): {[name: string]: (event: LeafletEvent) => void};
     getAttribution?(): string | null;
     beforeAdd?(map: Map): this;
+
+    protected _map: Map;
 }
 
 export interface GridLayerOptions {
@@ -444,6 +445,8 @@ export interface GridLayerOptions {
     keepBuffer?: number;
 }
 
+export type DoneCallback = (error?: Error, tile?: HTMLElement) => void;
+
 export interface InternalTiles {
     [key: string]: {
         active?: boolean,
@@ -466,10 +469,11 @@ export class GridLayer extends Layer {
     redraw(): this;
     getTileSize(): Point;
 
-    _tileCoordsToKey(coords: Coords): string;
+    protected createTile(coords: Coords, done: DoneCallback): HTMLElement;
+    protected _tileCoordsToKey(coords: Coords): string;
 
-    _tiles: InternalTiles;
-    _tileZoom?: number;
+    protected _tiles: InternalTiles;
+    protected _tileZoom?: number;
 }
 
 export function gridLayer(options?: GridLayerOptions): GridLayer;
@@ -489,15 +493,12 @@ export interface TileLayerOptions extends GridLayerOptions {
     [name: string]: any;
 }
 
-export type DoneCallback = (error?: Error, tile?: HTMLElement) => void;
-
 export class TileLayer extends GridLayer {
     constructor(urlTemplate: string, options?: TileLayerOptions);
-    createTile(coords: Coords, done: DoneCallback): HTMLElement;
     setUrl(url: string, noRedraw?: boolean): this;
 
-    _abortLoading(): void;
-    _getZoomForUrl(): number;
+    protected _abortLoading(): void;
+    protected _getZoomForUrl(): number;
 
     options: TileLayerOptions;
 }

From 18630d4757726a09b0614c925ee2c9f0fbc251c8 Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Tue, 6 Mar 2018 08:03:56 -0800
Subject: [PATCH 0293/1382] remove lint disable

---
 types/datadog-tracer/tslint.json | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/types/datadog-tracer/tslint.json b/types/datadog-tracer/tslint.json
index 4c4fc86ace..3db14f85ea 100644
--- a/types/datadog-tracer/tslint.json
+++ b/types/datadog-tracer/tslint.json
@@ -1,6 +1 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "strict-export-declare-modifiers": false
-    }
-}
+{ "extends": "dtslint/dt.json" }

From 54a74688e75d9b364f07f724a17f4e787df542ec Mon Sep 17 00:00:00 2001
From: Hugues Stefanski <hugues.stefanski@gmail.com>
Date: Tue, 6 Mar 2018 19:29:31 +0100
Subject: [PATCH 0294/1382] Update d3-contour to 1.2.0 Added contour method

---
 types/d3-contour/index.d.ts | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/types/d3-contour/index.d.ts b/types/d3-contour/index.d.ts
index 1d82faae40..f9c102f431 100644
--- a/types/d3-contour/index.d.ts
+++ b/types/d3-contour/index.d.ts
@@ -1,10 +1,10 @@
-// Type definitions for d3-contour 1.1
+// Type definitions for d3-contour 1.2
 // Project: https://d3js.org/d3-contour/
 // Definitions by: Tom Wanzek <https://github.com/tomwanzek>, Hugues Stefanski <https://github.com/Ledragon>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-// Last module patch version validated against: 1.1.0
+// Last module patch version validated against: 1.2.0
 
 import { MultiPolygon } from 'geojson';
 import { ThresholdArrayGenerator, ThresholdCountGenerator } from 'd3-array';
@@ -41,6 +41,16 @@ export interface Contours {
      */
     (values: number[]): ContourMultiPolygon[];
 
+    /**
+     * Computes a single contour, returning a GeoJSON MultiPolygon geometry object.
+     * This geometry object represents the area where the input values are greater than or equal to the given threshold value;
+     * the threshold value for the geometry object is exposed as geometry.value.
+     *
+     * @param values  Array of input values. The input values must be an array of length n×m where [n, m] is the contour generator’s size; furthermore, each values[i + jn] must represent the value at the position ⟨i, j⟩.
+     * @param threshold Threshold value.
+     * */
+    contour(values: number[], threshold: number): ContourMultiPolygon;
+
     /**
      * Return the expected size of the input values grid, which defaults to [1,1].
      */

From f16a97bc3120e870108133752a3f6105efa44c45 Mon Sep 17 00:00:00 2001
From: Hugues Stefanski <hugues.stefanski@gmail.com>
Date: Tue, 6 Mar 2018 19:33:29 +0100
Subject: [PATCH 0295/1382] Fix linting errors

---
 types/d3-contour/index.d.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/types/d3-contour/index.d.ts b/types/d3-contour/index.d.ts
index f9c102f431..ba9c8e075d 100644
--- a/types/d3-contour/index.d.ts
+++ b/types/d3-contour/index.d.ts
@@ -46,9 +46,10 @@ export interface Contours {
      * This geometry object represents the area where the input values are greater than or equal to the given threshold value;
      * the threshold value for the geometry object is exposed as geometry.value.
      *
-     * @param values  Array of input values. The input values must be an array of length n×m where [n, m] is the contour generator’s size; furthermore, each values[i + jn] must represent the value at the position ⟨i, j⟩.
+     * @param values  Array of input values. The input values must be an array of length n×m where [n, m] is the contour generator’s size;
+     * furthermore, each values[i + jn] must represent the value at the position ⟨i, j⟩.
      * @param threshold Threshold value.
-     * */
+     */
     contour(values: number[], threshold: number): ContourMultiPolygon;
 
     /**

From 088c5e4f4ecf146cd07beaf9636607ec464a0914 Mon Sep 17 00:00:00 2001
From: Craig Boland <craig.boland@gmail.com>
Date: Tue, 6 Mar 2018 12:42:37 -0600
Subject: [PATCH 0296/1382] Added author credits

---
 types/bootstrap3-dialog/index.d.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/bootstrap3-dialog/index.d.ts b/types/bootstrap3-dialog/index.d.ts
index 231908de88..3d4082f14e 100644
--- a/types/bootstrap3-dialog/index.d.ts
+++ b/types/bootstrap3-dialog/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for bootstrap3-dialog 1.35
 // Project: http://nakupanda.github.io/bootstrap3-dialog
-// Definitions by: Craig Boland <https://github.com/cnboland>
+// Definitions by: Dante <https://github.com/nakupanda>
+//                 Craig Boland <https://github.com/cnboland>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 

From 83fc5ca975099a5a1ab31ca36effe75afc3edd5c Mon Sep 17 00:00:00 2001
From: Andy <anhans@microsoft.com>
Date: Tue, 6 Mar 2018 11:49:38 -0800
Subject: [PATCH 0297/1382] react-truncate: Remove duplicate property (#24120)

---
 types/react-truncate/index.d.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/types/react-truncate/index.d.ts b/types/react-truncate/index.d.ts
index 3c21c15150..15c72616c0 100644
--- a/types/react-truncate/index.d.ts
+++ b/types/react-truncate/index.d.ts
@@ -11,7 +11,6 @@ export interface TruncateProps extends React.HTMLProps<Truncate> {
     ellipsis?: React.ReactNode;
     trimWhitespace?: boolean;
     onTruncate?(isTruncated: boolean): void;
-    trimWhitespace?: boolean;
 }
 
 declare class Truncate extends React.Component<TruncateProps> { }

From 2e08f2c2b9215a0f6b45fec2b5d14c0d84efe9d6 Mon Sep 17 00:00:00 2001
From: shrey <shrey-jain@hotmail.com>
Date: Tue, 6 Mar 2018 14:49:40 -0500
Subject: [PATCH 0298/1382] Add typescript version dependency.

---
 types/express-bunyan-logger/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/express-bunyan-logger/index.d.ts b/types/express-bunyan-logger/index.d.ts
index aa9c5cc831..6697a26a20 100644
--- a/types/express-bunyan-logger/index.d.ts
+++ b/types/express-bunyan-logger/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/villadora/express-bunyan-logger
 // Definitions by: Shrey Jain <https://github.com/shreyjain1994>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 import Bunyan = require('bunyan');
 import express = require('express');

From 8817fefb18b423a3457f29eabe985e0eb472d9c2 Mon Sep 17 00:00:00 2001
From: Hugues Stefanski <hugues.stefanski@gmail.com>
Date: Tue, 6 Mar 2018 20:54:36 +0100
Subject: [PATCH 0299/1382] contour test

---
 types/d3-contour/d3-contour-tests.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/types/d3-contour/d3-contour-tests.ts b/types/d3-contour/d3-contour-tests.ts
index 2879e71e79..ce9d50717f 100644
--- a/types/d3-contour/d3-contour-tests.ts
+++ b/types/d3-contour/d3-contour-tests.ts
@@ -63,6 +63,8 @@ let contGen: d3Contour.Contours = d3Contour.contours();
 
 // size(...) -------------------------------------------------------------------
 
+const multiPolygon: d3Contour.ContourMultiPolygon = contGen.contour(values, 5);
+
 // set with chainability
 contGen = contGen.size([n, m]);
 

From 65c0159b81054c92054e4c3842e2059f1ed5216f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gerhard=20St=C3=B6bich?= <Flarna@users.noreply.github.com>
Date: Tue, 6 Mar 2018 21:27:26 +0100
Subject: [PATCH 0300/1382] [p-event] Fix test to work with latest typescript
 (#23931)

---
 types/p-event/p-event-tests.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/p-event/p-event-tests.ts b/types/p-event/p-event-tests.ts
index d963e22bed..0295cdb34b 100644
--- a/types/p-event/p-event-tests.ts
+++ b/types/p-event/p-event-tests.ts
@@ -8,14 +8,14 @@ class MyEmitter extends events.EventEmitter {
 }
 
 class MyDomEmitter implements EventTarget {
-    addEventListener(type: 'foo', listener?: (event: Event) => void): void {
+    addEventListener(type: 'foo', listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void {
     }
 
     dispatchEvent(event: Event): boolean {
         return false;
     }
 
-    removeEventListener(type: 'foo', listener?: (event: Event) => void): void {
+    removeEventListener(type: 'foo', listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void {
     }
 }
 

From 8ae9759111e8343b38156660ccb1aeb75b58c439 Mon Sep 17 00:00:00 2001
From: Lance Ivy <lance@cainlevy.net>
Date: Tue, 6 Mar 2018 12:56:45 -0800
Subject: [PATCH 0301/1382] update pusher-js to 4.2.2

---
 types/pusher-js/index.d.ts         |  87 +++++++++++---------
 types/pusher-js/pusher-js-tests.ts | 122 ++++++++++++++++++-----------
 2 files changed, 125 insertions(+), 84 deletions(-)

diff --git a/types/pusher-js/index.d.ts b/types/pusher-js/index.d.ts
index 383277f121..9ea0b96268 100644
--- a/types/pusher-js/index.d.ts
+++ b/types/pusher-js/index.d.ts
@@ -1,24 +1,23 @@
-// Type definitions for pusher-js 3.0.0
+// Type definitions for pusher-js 4.2.2
 // Project: https://github.com/pusher/pusher-js
 // Definitions by: Qubo <https://github.com/tkqubo>
+//                 Lance Ivy <https://github.com/cainlevy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
-
 declare namespace pusher {
     interface PusherStatic {
         new (apiKey: string, config?: Config): Pusher;
     }
 
-    interface Pusher {
+    interface Pusher extends EventsDispatcher {
+        channel(name: string): Channel;
+        allChannels(): Channel[];
+        connect(): void;
+        disconnect(): void;
         subscribe(name: string): Channel;
         subscribeAll(): void;
         unsubscribe(name: string): void;
-        channel(name: string): Channel;
-        allChannels(): Channel[];
-        bind(eventName: string, callback: Function): Pusher;
-        bind_all(callback: Function): Pusher;
-        disconnect(): void;
+        isEncrypted(): boolean;
         key: string;
         config: Config; //TODO: add GlobalConfig typings
         channels: any; //TODO: Type this
@@ -43,7 +42,7 @@ declare namespace pusher {
          * Defines how the authentication endpoint, defined using authEndpoint, will be called.
          * There are two options available: ajax and jsonp.
          */
-        authTransport?: string;
+        authTransport?: 'ajax' | 'jsonp';
 
         /**
          * Allows passing additional data to authorizers. Supports query string params and headers (AJAX only).
@@ -51,15 +50,19 @@ declare namespace pusher {
          */
         auth?: AuthConfig;
 
+        /**
+         * If you need custom authorization behavior you can provide your own authorizer function as follows:
+         */
+        authorizer?: Authorizer;
 
         /**
          * Allows connecting to a different datacenter by setting up correct hostnames and ports for the connection.
          */
         cluster?: string;
 
-
         /**
-         * Disables stats collection, so that connection metrics are not submitted to Pusher’s servers.
+         * Disables stats collection, so that connection metrics are not submitted to Pusher’s servers. These stats
+         * are used for internal monitoring only and they do not affect the account stats.
          */
         disableStats?: boolean;
 
@@ -69,8 +72,7 @@ declare namespace pusher {
          * Available transports: ws, wss, xhr_streaming, xhr_polling, sockjs.
          * Additional transports may be added in the future and without adding them to this list, they will be disabled.
          */
-        enabledTransports?: string[];
-
+        enabledTransports?: Transport[];
 
         /**
          * Specified which transports must not be used by Pusher to establish a connection.
@@ -78,7 +80,7 @@ declare namespace pusher {
          * Available transports: ws, wss, xhr_streaming, xhr_polling, sockjs.
          * Additional transports may be added in the future and without adding them to this list, they will be enabled.
          */
-        disabledTransports?: string[];
+        disabledTransports?: Transport[];
 
         /**
          * Ignores null origin checks for HTTP fallbacks. Use with care, it should be disabled only if necessary (i.e. PhoneGap).
@@ -99,6 +101,7 @@ declare namespace pusher {
         pongTimeout?: number;
 
         wsHost?: string;
+        wsPath?: string;
         wsPort?: number;
         wssPort?: number;
         httpHost?: string;
@@ -106,20 +109,34 @@ declare namespace pusher {
         httpsPort?: number;
     }
 
+    type Transport = 'ws' | 'wss' | 'xhr_streaming' | 'xhr_polling' | 'sockjs';
+
     interface AuthConfig {
         params?: { [key: string]: any };
         headers?: { [key: string]: any };
     }
 
-    interface GenericEventsDispatcher<Self extends EventsDispatcher> extends EventsDispatcher {
-        bind(eventName: string, callback: Function, context?: any): Self;
-        bind_all(callback: Function): Self;
-        unbind(eventName?: string, callback?: Function, context?: any): Self;
-        unbind_all(eventName?: string, callback?: Function): Self;
-        emit(eventName: string, data?: any): Self;
+    interface AuthInfo {
+        auth: string;
+        channel_data?: string;
     }
 
-    interface Channel extends GenericEventsDispatcher<Channel> {
+    type Authorizer = (channel: Channel, options: Config) => {
+        authorize: (socketId: string, callback: (errored: boolean, authInfo?: AuthInfo) => void) => void
+    }
+
+    type EventCallback = (context: any, data: any) => void;
+
+    interface EventsDispatcher {
+        bind(eventName: string, callback: EventCallback, context?: any): this;
+        bind_global(callback: EventCallback): this;
+        unbind(eventName?: string | null, callback?: EventCallback | null, context?: any): this;
+        unbind_global(callback?: EventCallback): this;
+        unbind_all(): this;
+        emit(eventName: string, data?: any): this;
+    }
+
+    interface Channel extends EventsDispatcher {
         /** Triggers an event */
         trigger(eventName: string, data?: any): boolean;
         pusher: Pusher;
@@ -133,15 +150,7 @@ declare namespace pusher {
         authorize(socketId: string, callback: (data: any) => void): void;
     }
 
-    interface EventsDispatcher {
-        bind(eventName: string, callback: Function, context?: any): EventsDispatcher;
-        bind_all(callback: Function): EventsDispatcher;
-        unbind(eventName?: string, callback?: Function, context?: any): EventsDispatcher;
-        unbind_all(eventName?: string, callback?: Function): EventsDispatcher;
-        emit(eventName: string, data?: any): EventsDispatcher;
-    }
-
-    interface ConnectionManager extends GenericEventsDispatcher<ConnectionManager> {
+    interface ConnectionManager extends EventsDispatcher {
         key: string;
         options: any; //TODO: Timeline.js
         state: string;
@@ -204,24 +213,24 @@ declare namespace pusher {
          *
          * Resulting object containts two fields - id and info.
          *
-         * @param {Number} id
+         * @param {String} id
          * @return {Object} member's info or null
          */
-        get(id: number): T;
+        get(id: string): null | T;
         /**
          * Calls back for each member in unspecified order.
          *
          * @param  {Function} callback
          */
-        each(callback: (member: any) => void): void;
-        members: { [id: number]: UserInfo<T> };
+        each(callback: (member: Member<T>) => void): void;
+        members: { [id: string]: Member<T> };
         count: number;
-        myID: number;
-        me: UserInfo<T>;
+        myID: string;
+        me: Member<T>;
     }
 
-    interface UserInfo<T> {
-        id: number;
+    interface Member<T> {
+        id: string;
         info: T;
     }
 }
diff --git a/types/pusher-js/pusher-js-tests.ts b/types/pusher-js/pusher-js-tests.ts
index b393d6cb75..1eec5ef200 100644
--- a/types/pusher-js/pusher-js-tests.ts
+++ b/types/pusher-js/pusher-js-tests.ts
@@ -2,39 +2,50 @@
 import Pusher = require('pusher-js');
 import { PresenceChannel } from "pusher-js";
 
-var API_KEY: string;
+var APP_KEY: string;
 var pusher: Pusher.Pusher;
 
 //
 // Configuration
 //
 
-pusher = new Pusher(API_KEY, {
+pusher = new Pusher(APP_KEY, {
     authEndpoint: "http://example.com/pusher/auth"
 });
 
-pusher = new Pusher(API_KEY, {
+pusher = new Pusher(APP_KEY, {
     auth: {
         params: { foo: "bar" },
         headers: { baz: "boo" }
     }
 });
 
-pusher = new Pusher(API_KEY, {
+pusher = new Pusher(APP_KEY, {
     auth: {
         params: { foo: "bar" },
         headers: { "X-CSRF-Token": "SOME_CSRF_TOKEN" }
     }
 });
 
-pusher = new Pusher(API_KEY, { cluster: "eu" });
+pusher = new Pusher(APP_KEY, {
+    authorizer: function (channel, options) {
+        return {
+        authorize: function (socketId, callback) {
+            // Do some ajax to get the auth information
+            var authInformation = {"auth": "hash"};
+            callback(false, authInformation);
+        }
+        };
+    }
+})
+pusher = new Pusher(APP_KEY, { cluster: "eu" });
 
-pusher = new Pusher(API_KEY, { enabledTransports: ["ws"] });
+pusher = new Pusher(APP_KEY, { enabledTransports: ["ws"] });
 
-pusher = new Pusher(API_KEY, { disabledTransports: ["sockjs"] });
+pusher = new Pusher(APP_KEY, { disabledTransports: ["sockjs"] });
 
 // will only use WebSockets
-pusher = new Pusher(API_KEY, {
+pusher = new Pusher(APP_KEY, {
     enabledTransports: ["ws", "xhr_streaming"],
     disabledTransports: ["xhr_streaming"]
 });
@@ -44,47 +55,68 @@ pusher = new Pusher(API_KEY, {
 //
 
 var socket: Pusher.Pusher;
-var my_channel: Pusher.Channel;
-var channels: Pusher.Channel[];
+var channel: Pusher.Channel;
+
+socket = new Pusher(APP_KEY);
+
+socket.disconnect();
 
-socket = new Pusher(API_KEY);
 
 //
 // Subscribing to channels
 //
 
-my_channel = socket.subscribe('my-channel');
+channel = socket.subscribe('my-channel');
 
-my_channel = socket.subscribe('private-my-channel');
+channel = socket.subscribe('private-my-channel');
 
-channels = socket.allChannels();
-console.group('Pusher - subscribed to:');
-for (var i = 0; i < channels.length; i++) {
-    var channel = channels[i];
-    console.log(channel.name);
-}
-console.groupEnd();
+socket.allChannels().forEach(channel => console.log(channel.name));
 
-my_channel = socket.subscribe('my-channel');
-socket.bind('new-comment',
-    function(data: any) {
-        // add comment into page
-    }
-);
+//
+// Unsubscribing from channels
+//
 
-var channel: Pusher.Channel;
+socket.unsubscribe('my-channel');
 
-var context = { title: 'Pusher' };
-var handler = function(){
-    console.log('My name is ' + this.title);
-};
-channel.bind('new-comment', handler, context);
+socket.unsubscribe('private-my-channel');
 
-channel.unbind('new-comment', handler); // removes just `handler` for the `new-comment` event
-channel.unbind('new-comment'); // removes all handlers for the `new-comment` event
-channel.unbind(null, handler); // removes `handler` for all events
-channel.unbind(null, null, context); // removes all handlers for `context`
-channel.unbind(); // removes all handlers on `channel`
+//
+// Binding to events
+//
+
+channel.bind('new-message', function (data) {
+    console.log(data.message);
+});
+
+channel.bind('my-event', function () {
+    console.log(`hi ${this.name}`);
+}, { name: 'Pusher' });
+
+channel.unbind('new-comment', console.log);
+
+channel.unbind('new-comment');
+
+channel.unbind(null, console.log);
+
+channel.unbind(null, null, context);
+
+channel.unbind();
+
+channel.bind_global(function (event, data) {
+    console.log(`The event ${event} was triggered with data ${data}`);
+});
+
+channel.unbind_global(console.log);
+
+channel.unbind_global();
+
+channel.unbind_all();
+
+//
+// Connection Events
+//
+
+socket.connection.bind('connected', console.log);
 
 
 //
@@ -110,11 +142,11 @@ var options: Pusher.Config;
 var channelName: string;
 var privateChannelName: string;
 var presenceChannelName: string;
-var add_member: Function;
-var remove_member: Function;
-var update_member_count: Function;
+var add_member: (ctx: any, data?: any) => void;
+var remove_member: (ctx: any, data?: any) => void;
+var update_member_count: (ctx: any, data?: any) => void;
 var eventName: string;
-var callback: Function;
+var callback: (ctx: any, data?: any) => void;
 var applicationKey: string;
 var log: Function;
 var $: any;
@@ -209,12 +241,12 @@ var presenceChannel: PresenceChannel<any> = <any>pusher.subscribe(presenceChanne
 
 var count: number = presenceChannel.members.count;
 
-presenceChannel.members.each(function(member: Pusher.UserInfo<any>) {
+presenceChannel.members.each(function(member) {
     var userId = member.id;
     var userInfo = member.info;
 });
 
-var some_user_id: number;
+var some_user_id: string;
 var user = presenceChannel.members.get(some_user_id);
 
 var me = presenceChannel.members.me;
@@ -239,12 +271,12 @@ channel.bind('pusher:subscription_succeeded', function(members: Pusher.Members<a
     });
 });
 
-channel.bind('pusher:member_added', function(member: Pusher.UserInfo<any>) {
+channel.bind('pusher:member_added', function(member: Pusher.Member<any>) {
     // for example:
     add_member(member.id, member.info);
 });
 
-channel.bind('pusher:member_removed', function(member: Pusher.UserInfo<any>) {
+channel.bind('pusher:member_removed', function(member: Pusher.Member<any>) {
     // for example:
     remove_member(member.id, member.info);
 });

From 143f327125a8ac208ba31727a78876c11596e448 Mon Sep 17 00:00:00 2001
From: denis <denisname@users.noreply.github.com>
Date: Tue, 6 Mar 2018 22:12:08 +0100
Subject: [PATCH 0302/1382] Add popover options

---
 types/bootstrap/bootstrap-tests.ts | 42 ++++++++++++++--
 types/bootstrap/index.d.ts         | 79 +++++++++++++++---------------
 2 files changed, 76 insertions(+), 45 deletions(-)

diff --git a/types/bootstrap/bootstrap-tests.ts b/types/bootstrap/bootstrap-tests.ts
index f8934ebbfc..f6b6246724 100755
--- a/types/bootstrap/bootstrap-tests.ts
+++ b/types/bootstrap/bootstrap-tests.ts
@@ -142,14 +142,38 @@ $("#modal").modal({
 // --------------------------------------------------------------------------------------
 
 // $ExpectType JQuery<HTMLElement>
-$("#scrollspy").popover();
+$("#popover").popover();
 
 // $ExpectType JQuery<HTMLElement>
-$("#scrollspy").popover("toggle");
+$("#popover").popover("toggle");
 
-$("#scrollspy").on("activate.bs.scrollspy", () => {});
+$("#popover").on("show.bs.popover", () => {});
 
-// TODO: test popover with options
+$("#popover").popover({});
+
+$("#popover").popover({
+    animation: false,
+    container: "#container",
+    delay: {show: 500, hide: 100},
+    html: true,
+    placement: "auto",
+    selector: "[rel=\"popover\"]",
+    template: '<div class="popover empty" role="popover"></div>',
+    title: "Hello world",
+    trigger: "hover focus",
+    offset: 10,
+    fallbackPlacement: ["flip", "clockwise"],
+    boundary: "scrollParent",
+});
+
+$("#popover").popover({
+    placement(this, popover, trigger) {
+        console.log(this.tip === popover);
+        console.log(this.element === trigger);
+        console.log(this.config.content);
+        return "left";
+    },
+});
 
 // --------------------------------------------------------------------------------------
 // Scrollspy
@@ -232,6 +256,14 @@ $("#tooltip").tooltip({
     },
 });
 
+$("#tooltip").tooltip({
+    placement(this, tooltip, trigger) {
+        // $ExpectError
+        console.log(this.config.content); // only for PopoverOption, not TooltipOption
+        return "left";
+    },
+});
+
 $("#tooltip").tooltip({
     selector: "[rel=\"tooltip\"]",
 });
@@ -259,7 +291,7 @@ $("#tooltip").tooltip({
 });
 
 $("#tooltip").tooltip({
-    trigger: "focus hover",
+    trigger: "hover focus",
 });
 
 $("#tooltip").tooltip({
diff --git a/types/bootstrap/index.d.ts b/types/bootstrap/index.d.ts
index 01089126fb..15ef7a5f12 100755
--- a/types/bootstrap/index.d.ts
+++ b/types/bootstrap/index.d.ts
@@ -4,8 +4,6 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-// TODO: popovers options
-
 /// <reference types="popper.js" />
 /// <reference types="jquery"/>
 
@@ -17,13 +15,17 @@ export as namespace Bootstrap;
 
 export type Placement = "auto" | "top" | "bottom" | "left" | "right";
 
+export type Trigger = "click" | "hover" | "focus" | "manual" |
+    "click hover" | "click focus" | "hover focus" |
+    "click hover focus";
+
 export interface Delay {
     show: number;
     hide: number;
 }
 
-export interface TooltipInstance {
-    config: TooltipOption;
+export interface TooltipInstance<T extends TooltipOption> {
+    config: T;
     element: Element;
     tip: HTMLElement;
 }
@@ -146,15 +148,13 @@ export interface ModalOption {
     show?: boolean;
 }
 
-export interface PoppoverOption {
+export interface PopoverOption extends TooltipOption {
     /**
-     * Apply a CSS fade transition to the popover.
-     *
-     * @default true
+     * Default content value if data-content attribute isn't present.
+     * If a function is given, it will be called with its this reference
+     * set to the element that the popover is attached to.
      */
-    animation: boolean;
-
-    // TODO
+    content?: string | Element | ((this: Element) => string | Element);
 }
 
 export interface ScrollspyOption {
@@ -168,24 +168,24 @@ export interface ScrollspyOption {
 
 export interface TooltipOption {
     /**
-     * Apply a CSS fade transition to the tooltip.
+     * Apply a CSS fade transition to the tooltip or popover.
      *
      * @default true
      */
     animation?: boolean;
 
     /**
-     * Appends the tooltip to a specific element. Example: `container: 'body'`.
-     * This option is particularly useful in that it allows you to position the tooltip
+     * Appends the tooltip or popover to a specific element. Example: `container: 'body'`.
+     * This option is particularly useful in that it allows you to position the tooltip or popover
      * in the flow of the document near the triggering element - which will prevent
-     * the tooltip from floating away from the triggering element during a window resize.
+     * it from floating away from the triggering element during a window resize.
      *
      * @default false
      */
     container?: string | Element | false;
 
     /**
-     * Delay showing and hiding the tooltip (ms) - does not apply to manual trigger type.
+     * Delay showing and hiding the tooltip or popover (ms) - does not apply to manual trigger type.
      * If a number is supplied, delay is applied to both hide/show.
      * Object structure is: `delay: { "show": 500, "hide": 100 }`.
      *
@@ -194,8 +194,8 @@ export interface TooltipOption {
     delay?: number | Delay;
 
     /**
-     * Allow HTML in the tooltip.
-     * If true, HTML tags in the tooltip's title will be rendered in the tooltip.
+     * Allow HTML in the tooltip or popover.
+     * If true, HTML tags will be rendered in the tooltip or popover.
      * If false, jQuery's text method will be used to insert content into the DOM.
      * Use text if you're worried about XSS attacks.
      *
@@ -204,18 +204,18 @@ export interface TooltipOption {
     html?: boolean;
 
     /**
-     * How to position the tooltip - auto | top | bottom | left | right.
-     * When auto is specified, it will dynamically reorient the tooltip.
+     * How to position the tooltip or popover - auto | top | bottom | left | right.
+     * When auto is specified, it will dynamically reorient the tooltip or popover.
      * When a function is used to determine the placement, it is called with
-     * the tooltip DOM node as its first argument and the triggering element DOM node as its second.
-     * The this context is set to the tooltip instance.
+     * the tooltip or popover DOM node as its first argument and the triggering element DOM node as its second.
+     * The this context is set to the tooltip or popover instance.
      *
      * @default "top"
      */
-    placement?: Placement | ((this: TooltipInstance, tooltip: HTMLElement, trigger: Element) => Placement);
+    placement?: Placement | ((this: TooltipInstance<this>, node: HTMLElement, trigger: Element) => Placement);
 
     /**
-     * If a selector is provided, tooltip objects will be delegated to the specified targets.
+     * If a selector is provided, tooltip or popover objects will be delegated to the specified targets.
      * In practice, this is used to enable dynamic HTML content to have popovers added.
      *
      * @default false
@@ -223,41 +223,40 @@ export interface TooltipOption {
     selector?: string | false;
 
     /**
-     * Base HTML to use when creating the tooltip. The tooltip's title will be injected into
-     * the `.tooltip-inner`. The `.arrow` will become the tooltip's arrow.
-     * The outermost wrapper element should have the `.tooltip` class and `role="tooltip"`.
+     * Base HTML to use when creating the tooltip or popover. The tooltip's (resp., popover's) title will be injected into
+     * the `.tooltip-inner` (resp., `.popover-header`). The `.arrow` will become the tooltip's (resp., popover's) arrow.
+     * The outermost wrapper element should have the `.tooltip` (resp., .popover) class and `role="tooltip"`.
      *
      * @default '<div class="tooltip" role="tooltip"><div class="arrow"></div><div class="tooltip-inner"></div></div>'
+     * @default '<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-header"></h3><div class="popover-body"></div></div>'
      */
     template?: string;
 
     /**
      * Default title value if title attribute isn't present.
      * If a function is given, it will be called with its this reference set to the element
-     * that the tooltip is attached to.
+     * that the tooltip or popover is attached to.
      *
      * @default ""
      */
-    title?: string | Element | ((this: Element) => string);
+    title?: string | Element | ((this: Element) => string | Element);
 
     /**
-     * How tooltip is triggered - click | hover | focus | manual. You may pass multiple triggers; separate them with a space.
-     * 'manual' indicates that the tooltip will be triggered programmatically via the .tooltip('show'), .tooltip('hide') and
-     * .tooltip('toggle') methods; this value cannot be combined with any other trigger.
-     * 'hover' on its own will result in tooltips that cannot be triggered via the keyboard, and should only be used if
-     * alternative methods for conveying the same information for keyboard users is present.
+     * How tooltip or popover is triggered - click | hover | focus | manual. You may pass multiple triggers; separate them with a space.
+     * 'manual' indicates that the tooltip will be triggered programmatically; this value cannot be combined with any other trigger.
+     * 'hover' should only be used if alternative methods for conveying the same information for keyboard users is present.
      *
-     * @default "hover focus"
+     * @default tooltip: "hover focus", popover: "click"
      */
-    trigger?: string;
+    trigger?: Trigger;
 
     /**
-     * Offset of the tooltip relative to its target.
+     * Offset of the tooltip or popover relative to its target.
      * For more information refer to Popper.js's offset docs.
      *
      * @default 0
      */
-     offset?: number | string;
+    offset?: number | string;
 
     /**
      * Allow to specify which position Popper will use on fallback.
@@ -268,7 +267,7 @@ export interface TooltipOption {
     fallbackPlacement?: Popper.Behavior | ReadonlyArray<Popper.Behavior>;
 
     /**
-     * Overflow constraint boundary of the tooltip.
+     * Overflow constraint boundary of the tooltip or popover.
      * Accepts the values of 'viewport', 'window', 'scrollParent',
      * or an HTMLElement reference (JavaScript only).
      * For more information refer to Popper.js's preventOverflow docs.
@@ -332,7 +331,7 @@ declare global {
         modal(options?: ModalOption): this;
 
         popover(action: "show" | "hide" | "toggle" | "dispose" | "enable" | "disable" | "toggleEnabled" | "update"): this;
-        popover(options?: PoppoverOption): this;
+        popover(options?: PopoverOption): this;
 
         scrollspy(action: "refresh" | "dispose"): this;
         scrollspy(options?: ScrollspyOption): this;

From 42f71113be2d1e05b208ed258e850e02f83c0b3d Mon Sep 17 00:00:00 2001
From: rob <rallsopp@commercialtribe.com>
Date: Tue, 6 Mar 2018 11:15:17 -0700
Subject: [PATCH 0303/1382] make connection config relay spec compliant:
 https://facebook.github.io/relay/graphql/connections.htm#sec-Node

---
 types/graphql-relay/index.d.ts | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/types/graphql-relay/index.d.ts b/types/graphql-relay/index.d.ts
index 50ed0c3b7d..fc1eb3aa1e 100644
--- a/types/graphql-relay/index.d.ts
+++ b/types/graphql-relay/index.d.ts
@@ -21,6 +21,9 @@ import {
     GraphQLOutputType,
     GraphQLFieldResolver,
     GraphQLTypeResolver,
+    GraphQLUnionType,
+    GraphQLEnumType,
+    GraphQLScalarType,
     Thunk
 } from "graphql";
 
@@ -58,9 +61,20 @@ export const backwardConnectionArgs: GraphQLFieldConfigArgumentMap & {
  */
 export const connectionArgs: GraphQLFieldConfigArgumentMap & ForwardConnectionArgs & BackwardConnectionArgs;
 
+export type ConnectionConfigNodeTypeNullable =
+    | GraphQLScalarType
+    | GraphQLObjectType
+    | GraphQLInterfaceType
+    | GraphQLUnionType
+    | GraphQLEnumType;
+
+export type ConnectionConfigNodeType =
+    | ConnectionConfigNodeTypeNullable
+    | GraphQLNonNull<ConnectionConfigNodeTypeNullable>;
+
 export interface ConnectionConfig {
     name?: string | null;
-    nodeType: GraphQLObjectType;
+    nodeType: ConnectionConfigNodeType;
     resolveNode?: GraphQLFieldResolver<any, any> | null;
     resolveCursor?: GraphQLFieldResolver<any, any> | null;
     edgeFields?: Thunk<GraphQLFieldConfigMap<any, any>> | null;

From c48ba02bfab614861a5a0a8abb6610b62b3d08d4 Mon Sep 17 00:00:00 2001
From: Lance Ivy <lance@cainlevy.net>
Date: Tue, 6 Mar 2018 13:25:48 -0800
Subject: [PATCH 0304/1382] fix many lint rules

not all lint rules have been fixed because these tests are copied from
documentation and should remain recognizable.
---
 types/pusher-js/index.d.ts         | 36 +++++----------
 types/pusher-js/pusher-js-tests.ts | 47 ++++++++++----------
 types/pusher-js/tslint.json        | 70 +-----------------------------
 3 files changed, 35 insertions(+), 118 deletions(-)

diff --git a/types/pusher-js/index.d.ts b/types/pusher-js/index.d.ts
index 9ea0b96268..a81170d09c 100644
--- a/types/pusher-js/index.d.ts
+++ b/types/pusher-js/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for pusher-js 4.2.2
+// Type definitions for pusher-js 4.2
 // Project: https://github.com/pusher/pusher-js
 // Definitions by: Qubo <https://github.com/tkqubo>
 //                 Lance Ivy <https://github.com/cainlevy>
@@ -19,11 +19,11 @@ declare namespace pusher {
         unsubscribe(name: string): void;
         isEncrypted(): boolean;
         key: string;
-        config: Config; //TODO: add GlobalConfig typings
-        channels: any; //TODO: Type this
+        config: Config; // TODO: add GlobalConfig typings
+        channels: any; // TODO: Type this
         global_emitter: EventsDispatcher;
         sessionID: number;
-        timeline: any; //TODO: Type this
+        timeline: any; // TODO: Type this
         connection: ConnectionManager;
     }
 
@@ -122,8 +122,8 @@ declare namespace pusher {
     }
 
     type Authorizer = (channel: Channel, options: Config) => {
-        authorize: (socketId: string, callback: (errored: boolean, authInfo?: AuthInfo) => void) => void
-    }
+        authorize: (socketId: string, callback: (errored: boolean, authInfo?: AuthInfo) => void) => void;
+    };
 
     type EventCallback = (context: any, data: any) => void;
 
@@ -144,20 +144,18 @@ declare namespace pusher {
         subscribed: boolean;
         /**
          * Authenticates the connection as a member of the channel.
-         * @param  {String} socketId
-         * @param  {Function} callback
          */
         authorize(socketId: string, callback: (data: any) => void): void;
     }
 
     interface ConnectionManager extends EventsDispatcher {
         key: string;
-        options: any; //TODO: Timeline.js
+        options: any; // TODO: Timeline.js
         state: string;
         socket_id: string;
-        connection: any; //TODO: Type this
+        connection: any; // TODO: Type this
         encrypted: boolean;
-        timeline: any; //TODO: Type this
+        timeline: any; // TODO: Type this
         connectionCallbacks: {
             message: (message: string) => void;
             ping: () => void;
@@ -176,7 +174,7 @@ declare namespace pusher {
             refused: () => void;
             backoff: () => void;
             retry: () => void;
-            connected: (handshake: any) => void; //TODO: Type this
+            connected: (handshake: any) => void; // TODO: Type this
         };
         /**
          * Establishes a connection to Pusher.
@@ -187,15 +185,10 @@ declare namespace pusher {
         connect(): void;
         /**
          * Sends raw data.
-         * @param {String} data
          */
         send(data: string): boolean;
-        /** Sends an event.
-         *
-         * @param {String} name
-         * @param {String} data
-         * @param {String} [channel]
-         * @returns {Boolean} whether message was sent or not
+        /**
+         * Sends an event.
          */
         send_event(name: string, data: string, channel: string): boolean;
         /** Closes the connection. */
@@ -212,15 +205,10 @@ declare namespace pusher {
          * Returns member's info for given id.
          *
          * Resulting object containts two fields - id and info.
-         *
-         * @param {String} id
-         * @return {Object} member's info or null
          */
         get(id: string): null | T;
         /**
          * Calls back for each member in unspecified order.
-         *
-         * @param  {Function} callback
          */
         each(callback: (member: Member<T>) => void): void;
         members: { [id: string]: Member<T> };
diff --git a/types/pusher-js/pusher-js-tests.ts b/types/pusher-js/pusher-js-tests.ts
index 1eec5ef200..dc6a9eedd7 100644
--- a/types/pusher-js/pusher-js-tests.ts
+++ b/types/pusher-js/pusher-js-tests.ts
@@ -1,4 +1,3 @@
-
 import Pusher = require('pusher-js');
 import { PresenceChannel } from "pusher-js";
 
@@ -28,16 +27,17 @@ pusher = new Pusher(APP_KEY, {
 });
 
 pusher = new Pusher(APP_KEY, {
-    authorizer: function (channel, options) {
+    authorizer: function(channel, options) {
         return {
-        authorize: function (socketId, callback) {
+        authorize: function(socketId, callback) {
             // Do some ajax to get the auth information
-            var authInformation = {"auth": "hash"};
+            var authInformation = {auth: "hash"};
             callback(false, authInformation);
         }
         };
     }
-})
+});
+
 pusher = new Pusher(APP_KEY, { cluster: "eu" });
 
 pusher = new Pusher(APP_KEY, { enabledTransports: ["ws"] });
@@ -61,7 +61,6 @@ socket = new Pusher(APP_KEY);
 
 socket.disconnect();
 
-
 //
 // Subscribing to channels
 //
@@ -84,11 +83,11 @@ socket.unsubscribe('private-my-channel');
 // Binding to events
 //
 
-channel.bind('new-message', function (data) {
+channel.bind('new-message', function(data) {
     console.log(data.message);
 });
 
-channel.bind('my-event', function () {
+channel.bind('my-event', function() {
     console.log(`hi ${this.name}`);
 }, { name: 'Pusher' });
 
@@ -102,7 +101,7 @@ channel.unbind(null, null, context);
 
 channel.unbind();
 
-channel.bind_global(function (event, data) {
+channel.bind_global(function(event, data) {
     console.log(`The event ${event} was triggered with data ${data}`);
 });
 
@@ -118,7 +117,6 @@ channel.unbind_all();
 
 socket.connection.bind('connected', console.log);
 
-
 //
 //
 // Samples from Pusher Documentation
@@ -148,7 +146,7 @@ var update_member_count: (ctx: any, data?: any) => void;
 var eventName: string;
 var callback: (ctx: any, data?: any) => void;
 var applicationKey: string;
-var log: Function;
+var log: (msg: string) => void;
 var $: any;
 var data: any;
 
@@ -188,11 +186,11 @@ pusher = new Pusher('app_key', {
 
 pusher = new Pusher('app_key', { cluster: 'eu' });
 
-pusher = new Pusher('app_key', { encrypted: true } );
+pusher = new Pusher('app_key', { encrypted: true });
 
 pusher = new Pusher('app_key');
-pusher.connection.bind( 'error', function( err: any ) {
-    if( err.data.code === 4004 ) {
+pusher.connection.bind('error', function(err: any) {
+    if (err.data.code === 4004) {
         log('>>> detected limit error');
     }
 });
@@ -211,7 +209,7 @@ pusher.connection.bind('connected', function() {
 
 pusher.connection.bind('connecting_in', function(delay: any) {
     alert("I haven't been able to establish a connection for this feature.  " +
-        "I will try again in " + delay + " seconds.")
+        "I will try again in " + delay + " seconds.");
 });
 
 pusher.connection.bind('state_change', function(states: any) {
@@ -237,7 +235,7 @@ var privateChannel = pusher.subscribe(privateChannelName);
 
 // Presence channels
 
-var presenceChannel: PresenceChannel<any> = <any>pusher.subscribe(presenceChannelName);
+var presenceChannel = pusher.subscribe(presenceChannelName) as Pusher.PresenceChannel<any>;
 
 var count: number = presenceChannel.members.count;
 
@@ -252,7 +250,7 @@ var user = presenceChannel.members.get(some_user_id);
 var me = presenceChannel.members.me;
 
 pusher = new Pusher('app_key');
-presenceChannel = <any>pusher.subscribe('presence-example');
+presenceChannel = pusher.subscribe('presence-example') as Pusher.PresenceChannel<any>;
 presenceChannel.bind('pusher:subscription_succeeded', function() {
     var me = presenceChannel.members.me;
     var userId = me.id;
@@ -294,7 +292,7 @@ channel.bind('new-price',
 );
 
 var context = { title: 'Pusher' };
-var handler = function(){
+var handler = function() {
     console.log('My name is ' + this.title);
 };
 channel.bind('new-comment', handler, context);
@@ -333,7 +331,7 @@ channel.bind('pusher:subscription_succeeded', function() {
 pusher = new Pusher('APP_KEY');
 channel = pusher.subscribe('private-channel');
 channel.bind('pusher:subscription_error', function(status: number) {
-    if(status == 408 || status == 503){
+    if (status === 408 || status === 503) {
         // retry?
     }
 });
@@ -362,23 +360,22 @@ channel = pusher.subscribe("private-mousemoves");
 
 // this method should be bound as a 'mousemove' event listener
 document.body.addEventListener('mousemove', onMouseMove, false);
-function onMouseMove(ev: any){
+function onMouseMove(ev: any) {
     ev = ev || window.event;
     state.currentX = ev.pageX || ev.clientX;
     state.currentY = ev.pageY || ev.clientY;
 }
 
-setInterval(function(){
-    if(state.currentX !== state.lastX || state.currentY !== state.lastY){
+setInterval(function() {
+    if (state.currentX !== state.lastX || state.currentY !== state.lastY) {
         state.lastX = state.currentX;
         state.lastY = state.currentY;
 
         var text = document.createTextNode(
             'Triggering event due to state change: x: ' + state.currentX + ', y: ' + state.currentY
         );
-        outputEl.replaceChild( text, outputEl.firstChild );
+        outputEl.replaceChild(text, outputEl.firstChild);
 
-        channel.trigger("client-mouse-moved", {x:state.currentX, y: state.currentY});
+        channel.trigger("client-mouse-moved", {x: state.currentX, y: state.currentY});
     }
 }, 300); // send every 300 milliseconds if position has changed
-
diff --git a/types/pusher-js/tslint.json b/types/pusher-js/tslint.json
index a41bf5d19a..2cf1b5c31e 100644
--- a/types/pusher-js/tslint.json
+++ b/types/pusher-js/tslint.json
@@ -1,79 +1,11 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
-        "ban-types": false,
-        "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
-        "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
         "no-duplicate-variable": false,
-        "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
-        "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
         "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
         "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
         "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
         "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
+        "prefer-template": false
     }
 }

From c9cdb41d11d370ab4b51b799a875bc3ee0f1e8df Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Tue, 6 Mar 2018 13:32:07 -0800
Subject: [PATCH 0305/1382] Fixes in preparation of lib changes (#24019)

* Fixes in preparation of lib changes

See https://github.com/Microsoft/TSJS-lib-generator/pull/383

* Fix breakes

* revert changes to knuddels-userapps-api

* Fix compressedTexSubImage2D overload

* Fix event emitter methods

* Remove duplicate declaration

* Fix ScreenOrientation.type
---
 types/aframe/index.d.ts                 |   9 +-
 types/d3-drag/d3-drag-tests.ts          |   6 +-
 types/snapsvg/test/3.ts                 |   2 +-
 types/w3c-screen-orientation/index.d.ts |   4 +-
 types/webgl2/index.d.ts                 |   6 +-
 types/webvr-api/index.d.ts              | 312 ++++++++++++------------
 6 files changed, 165 insertions(+), 174 deletions(-)

diff --git a/types/aframe/index.d.ts b/types/aframe/index.d.ts
index 803318a754..0da1ed0ef5 100644
--- a/types/aframe/index.d.ts
+++ b/types/aframe/index.d.ts
@@ -16,16 +16,13 @@
 declare var AFRAME: AFrame.AFrameGlobal;
 declare var hasNativeWebVRImplementation: boolean;
 
-interface NodeSelector {
-	querySelector(selectors: 'a-scene'): AFrame.Scene;
+interface Document {
+    createElement(tagName: string): AFrame.Entity;
+    querySelector(selectors: 'a-scene'): AFrame.Scene;
 	querySelector<T extends AFrame.Entity<any>>(selectors: string): T;
 	querySelectorAll(selectors: string): NodeListOf<AFrame.Entity<any> | Element>;
 }
 
-interface Document {
-	createElement(tagName: string): AFrame.Entity;
-}
-
 // Interfaces
 declare namespace AFrame {
 	interface ObjectMap<T = any> {
diff --git a/types/d3-drag/d3-drag-tests.ts b/types/d3-drag/d3-drag-tests.ts
index 848e3d1256..3bc7e6f851 100644
--- a/types/d3-drag/d3-drag-tests.ts
+++ b/types/d3-drag/d3-drag-tests.ts
@@ -67,7 +67,8 @@ let containerAccessor: (this: SVGCircleElement, d: CircleDatum, i: number, group
 containerAccessor = function(d, i, group) {
     console.log('Node Id of circle: ', d.nodeId);
     // console.log(this.a); // fails, a is not a property of SVGCircleElement
-    return this.ownerSVGElement; // this-type is SVGCircleElement
+    /* tslint:disable-next-line:no-unnecessary-type-assertion */
+    return this.ownerSVGElement!; // this-type is SVGCircleElement
 };
 
 // Test chainability
@@ -75,7 +76,8 @@ circleDrag = circleDrag
     .container(function(d, i, group) { // container accessor function setter
         console.log('Node Id of circle: ', d.nodeId); // CircleDatum type
         // console.log(this.a); // fails, a is not a property of SVGCircleElement
-        return this.ownerSVGElement; // this-type is SVGCircleElement
+        /* tslint:disable-next-line:no-unnecessary-type-assertion */
+        return this.ownerSVGElement!; // this-type is SVGCircleElement
     });
 
 // Test chainability
diff --git a/types/snapsvg/test/3.ts b/types/snapsvg/test/3.ts
index a97caefa45..45e7024c0a 100644
--- a/types/snapsvg/test/3.ts
+++ b/types/snapsvg/test/3.ts
@@ -54,7 +54,7 @@ window.onload=()=>{
 
         var f = s.filter(Snap.filter.blur(5, 10));
         var shadow = s.filter(Snap.filter.shadow(0, 2, 3));
-        var filterChild = f.node.firstChild;
+        var filterChild = f.node.firstElementChild;
 
         var r = s.rect(100,100,100,100,20,20).attr({ stroke: '#123456', 'strokeWidth': 20, fill: 'red', filter:  f });
         Snap.animate( 0, 10, function( value ) { filterChild.attributes[0].value = value + ',' + value;  }, 1000 );
diff --git a/types/w3c-screen-orientation/index.d.ts b/types/w3c-screen-orientation/index.d.ts
index 12954e6f59..7cac6c33f3 100644
--- a/types/w3c-screen-orientation/index.d.ts
+++ b/types/w3c-screen-orientation/index.d.ts
@@ -4,10 +4,10 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 type OrientationType = "portrait-primary" | "portrait-secondary" | "landscape-primary" | "landscape-secondary";
-type OrientationLockType = "any" | "natural" | "landscape" | "portrait" | "portrait-primary" | "portrait-secondary" | "landscape-primary" | "landscape-secondary";
+type ScreenOrientationLockType = "any" | "natural" | "landscape" | "portrait" | "portrait-primary" | "portrait-secondary" | "landscape-primary" | "landscape-secondary";
 
 interface ScreenOrientation extends EventTarget {
-    lock(orientation: OrientationLockType): Promise<void>;
+    lock(orientation: ScreenOrientationLockType): Promise<void>;
     unlock(): void;
     readonly type: OrientationType;
     readonly angle: number;
diff --git a/types/webgl2/index.d.ts b/types/webgl2/index.d.ts
index 690f11cf50..8c59b117b3 100644
--- a/types/webgl2/index.d.ts
+++ b/types/webgl2/index.d.ts
@@ -288,7 +288,7 @@ interface WebGL2RenderingContext extends WebGLRenderingContext {
     // WebGL1:
     bufferData(target: number, size: number, usage: number): void;
     bufferData(target: number, srcData: ArrayBuffer | ArrayBufferView | null, usage: number): void;
-    bufferSubData(target: number, dstByteOffset: number, srcData: ArrayBuffer | ArrayBufferView): void;
+    bufferSubData(target: number, dstByteOffset: number, srcData: ArrayBuffer | ArrayBufferView | null): void;
     // WebGL2:
     bufferData(target: number, srcData: ArrayBufferView, usage: number, srcOffset: number,
         length?: number): void;
@@ -387,7 +387,7 @@ interface WebGL2RenderingContext extends WebGLRenderingContext {
     compressedTexImage2D(target: number, level: number, internalformat: number, width: number,
         height: number, border: number, imageSize: number, offset: number): void;
     compressedTexImage2D(target: number, level: number, internalformat: number, width: number,
-        height: number, border: number, srcData: ArrayBufferView,
+        height: number, border: number, srcData: ArrayBufferView | null,
         srcOffset?: number, srcLengthOverride?: number): void;
 
     compressedTexImage3D(target: number, level: number, internalformat: number, width: number,
@@ -400,7 +400,7 @@ interface WebGL2RenderingContext extends WebGLRenderingContext {
         width: number, height: number, format: number, imageSize: number, offset: number): void;
     compressedTexSubImage2D(target: number, level: number, xoffset: number, yoffset: number,
         width: number, height: number, format: number,
-        srcData: ArrayBufferView,
+        srcData: ArrayBufferView | null,
         srcOffset?: number,
         srcLengthOverride?: number): void;
 
diff --git a/types/webvr-api/index.d.ts b/types/webvr-api/index.d.ts
index 6300d12b78..afebeda0a9 100644
--- a/types/webvr-api/index.d.ts
+++ b/types/webvr-api/index.d.ts
@@ -3,203 +3,195 @@
 // Definitions by: six a <https://github.com/lostfictions>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare class VRDisplay extends EventTarget {
-  isConnected: boolean;
-  isPresenting: boolean;
 
-  /**
-   * Dictionary of capabilities describing the VRDisplay.
-   */
-  capabilities: VRDisplayCapabilities;
+interface VRDisplay extends EventTarget {
+    /**
+     * Dictionary of capabilities describing the VRDisplay.
+     */
+    readonly capabilities: VRDisplayCapabilities;
 
-  /**
-   * If this VRDisplay supports room-scale experiences, the optional
-   * stage attribute contains details on the room-scale parameters.
-   */
-  stageParameters: VRStageParameters;
+    /**
+     * z-depth defining the far plane of the eye view frustum
+     * enables mapping of values in the render target depth
+     * attachment to scene coordinates. Initially set to 10000.0.
+     */
+    depthFar: number;
 
-  /* Return the current VREyeParameters for the given eye. */
-  getEyeParameters(whichEye: VREye): VREyeParameters;
+    /**
+     * z-depth defining the near plane of the eye view frustum
+     * enables mapping of values in the render target depth
+     * attachment to scene coordinates. Initially set to 0.01.
+     */
+    depthNear: number;
 
-  /**
-   * An identifier for this distinct VRDisplay. Used as an
-   * association point in the Gamepad API.
-   */
-  displayId: number;
+    /**
+     * An identifier for this distinct VRDisplay. Used as an
+     * association point in the Gamepad API.
+     */
+    readonly displayId: number;
 
-  /**
-   * A display name, a user-readable name identifying it.
-   */
-  displayName: string;
+    /**
+     * A display name, a user-readable name identifying it.
+     */
+    readonly displayName: string;
+    readonly isConnected: boolean;
+    readonly isPresenting: boolean;
 
-  /**
-   * Populates the passed VRFrameData with the information required to render
-   * the current frame.
-   */
-  getFrameData(frameData: VRFrameData): boolean;
+    /**
+     * If this VRDisplay supports room-scale experiences, the optional
+     * stage attribute contains details on the room-scale parameters.
+     */
+    readonly stageParameters: VRStageParameters | null;
 
-  /**
-   * Return a VRPose containing the future predicted pose of the VRDisplay
-   * when the current frame will be presented. The value returned will not
-   * change until JavaScript has returned control to the browser.
-   *
-   * The VRPose will contain the position, orientation, velocity,
-   * and acceleration of each of these properties.
-   */
-  getPose(): VRPose;
+    /**
+     * Passing the value returned by `requestAnimationFrame` to
+     * `cancelAnimationFrame` will unregister the callback.
+     */
+    cancelAnimationFrame(handle: number): void;
 
-  /**
-   * Return the current instantaneous pose of the VRDisplay, with no
-   * prediction applied.
-   */
-  getImmediatePose(): VRPose;
+    /**
+     * Stops presenting to the VRDisplay.
+     */
+    exitPresent(): Promise<void>;
 
-  /**
-   * Reset the pose for this display, treating its current position and
-   * orientation as the "origin/zero" values. VRPose.position,
-   * VRPose.orientation, and VRStageParameters.sittingToStandingTransform may be
-   * updated when calling resetPose(). This should be called in only
-   * sitting-space experiences.
-   */
-  resetPose(): void;
+    /* Return the current VREyeParameters for the given eye. */
+    getEyeParameters(whichEye: string): VREyeParameters;
 
-  /**
-   * z-depth defining the near plane of the eye view frustum
-   * enables mapping of values in the render target depth
-   * attachment to scene coordinates. Initially set to 0.01.
-   */
-  depthNear: number;
+    /**
+     * Populates the passed VRFrameData with the information required to render
+     * the current frame.
+     */
+    getFrameData(frameData: VRFrameData): boolean;
 
-  /**
-   * z-depth defining the far plane of the eye view frustum
-   * enables mapping of values in the render target depth
-   * attachment to scene coordinates. Initially set to 10000.0.
-   */
-  depthFar: number;
+    /**
+     * Get the layers currently being presented.
+     */
+    getLayers(): VRLayer[];
 
-  /**
-   * The callback passed to `requestAnimationFrame` will be called
-   * any time a new frame should be rendered. When the VRDisplay is
-   * presenting the callback will be called at the native refresh
-   * rate of the HMD. When not presenting this function acts
-   * identically to how window.requestAnimationFrame acts. Content should
-   * make no assumptions of frame rate or vsync behavior as the HMD runs
-   * asynchronously from other displays and at differing refresh rates.
-   */
-  requestAnimationFrame(callback: FrameRequestCallback): number;
+    /**
+     * Return a VRPose containing the future predicted pose of the VRDisplay
+     * when the current frame will be presented. The value returned will not
+     * change until JavaScript has returned control to the browser.
+     *
+     * The VRPose will contain the position, orientation, velocity,
+     * and acceleration of each of these properties.
+     */
+    getPose(): VRPose;
 
-  /**
-   * Passing the value returned by `requestAnimationFrame` to
-   * `cancelAnimationFrame` will unregister the callback.
-   */
-  cancelAnimationFrame(handle: number): void;
+    /**
+     * Return the current instantaneous pose of the VRDisplay, with no
+     * prediction applied.
+     */
+    getImmediatePose(): VRPose;
 
-  /**
-   * Begin presenting to the VRDisplay. Must be called in response to a user gesture.
-   * Repeat calls while already presenting will update the VRLayers being displayed.
-   */
-  requestPresent(layers: Array<VRLayer>): Promise<void>;
+    /**
+     * The callback passed to `requestAnimationFrame` will be called
+     * any time a new frame should be rendered. When the VRDisplay is
+     * presenting the callback will be called at the native refresh
+     * rate of the HMD. When not presenting this function acts
+     * identically to how window.requestAnimationFrame acts. Content should
+     * make no assumptions of frame rate or vsync behavior as the HMD runs
+     * asynchronously from other displays and at differing refresh rates.
+     */
+    requestAnimationFrame(callback: FrameRequestCallback): number;
 
-  /**
-   * Stops presenting to the VRDisplay.
-   */
-  exitPresent(): Promise<void>;
+    /**
+     * Begin presenting to the VRDisplay. Must be called in response to a user gesture.
+     * Repeat calls while already presenting will update the VRLayers being displayed.
+     */
+    requestPresent(layers: VRLayer[]): Promise<void>;
 
-  /**
-   * Get the layers currently being presented.
-   */
-  getLayers(): Array<VRLayer>;
+    /**
+     * Reset the pose for this display, treating its current position and
+     * orientation as the "origin/zero" values. VRPose.position,
+     * VRPose.orientation, and VRStageParameters.sittingToStandingTransform may be
+     * updated when calling resetPose(). This should be called in only
+     * sitting-space experiences.
+     */
+    resetPose(): void;
 
-  /**
-   * The VRLayer provided to the VRDisplay will be captured and presented
-   * in the HMD. Calling this function has the same effect on the source
-   * canvas as any other operation that uses its source image, and canvases
-   * created without preserveDrawingBuffer set to true will be cleared.
-   */
-  submitFrame(pose?: VRPose): void;
+    /**
+     * The VRLayer provided to the VRDisplay will be captured and presented
+     * in the HMD. Calling this function has the same effect on the source
+     * canvas as any other operation that uses its source image, and canvases
+     * created without preserveDrawingBuffer set to true will be cleared.
+     */
+    submitFrame(pose?: VRPose): void;
 }
 
-type VRSource = HTMLCanvasElement;
-
-
-type VRLayer = {
-  source?: VRSource;
-
-  leftBounds?: Array<number>;
-  rightBounds?: Array<number>;
+declare var VRDisplay: {
+    prototype: VRDisplay;
+    new(): VRDisplay;
 };
 
+interface VRLayer {
+    leftBounds?: number[] | null;
+    rightBounds?: number[] | null;
+    source?: HTMLCanvasElement | null;
+}
+
 interface VRDisplayCapabilities {
-  hasPosition: boolean;
-  hasOrientation: boolean;
-  hasExternalDisplay: boolean;
-  canPresent: boolean;
-  maxLayers: number;
-}
-
-type VREye = "left" | "right";
-
-interface VRFieldOfView {
-  upDegrees: number;
-  rightDegrees: number;
-  downDegrees: number;
-  leftDegrees: number;
-}
-
-interface VRPose {
-  timestamp: number;
-
-  position: Float32Array;
-  linearVelocity: Float32Array;
-  linearAcceleration: Float32Array;
-
-  orientation: Float32Array;
-  angularVelocity: Float32Array;
-  angularAcceleration: Float32Array;
-}
-
-declare class VRFrameData {
-  timestamp: number; // Should be DOMHighResTimeStamp
-
-  leftProjectionMatrix: Float32Array;
-  leftViewMatrix: Float32Array;
-
-  rightProjectionMatrix: Float32Array;
-  rightViewMatrix: Float32Array;
-
-  pose: VRPose;
+    readonly canPresent: boolean;
+    readonly hasExternalDisplay: boolean;
+    readonly hasOrientation: boolean;
+    readonly hasPosition: boolean;
+    readonly maxLayers: number;
 }
 
 interface VREyeParameters {
-  offset: Float32Array;
+    /** @deprecated */
+    readonly fieldOfView: VRFieldOfView;
+    readonly offset: Float32Array;
+    readonly renderHeight: number;
+    readonly renderWidth: number;
+}
 
-  fieldOfView: VRFieldOfView;
+interface VRFieldOfView {
+    readonly downDegrees: number;
+    readonly leftDegrees: number;
+    readonly rightDegrees: number;
+    readonly upDegrees: number;
+}
 
-  renderWidth: number;
-  renderHeight: number;
+interface VRFrameData {
+    readonly leftProjectionMatrix: Float32Array;
+    readonly leftViewMatrix: Float32Array;
+    readonly pose: VRPose;
+    readonly rightProjectionMatrix: Float32Array;
+    readonly rightViewMatrix: Float32Array;
+    readonly timestamp: number;
+}
+
+interface VRPose {
+    readonly angularAcceleration: Float32Array | null;
+    readonly angularVelocity: Float32Array | null;
+    readonly linearAcceleration: Float32Array | null;
+    readonly linearVelocity: Float32Array | null;
+    readonly orientation: Float32Array | null;
+    readonly position: Float32Array | null;
+    readonly timestamp: number;
 }
 
 interface VRStageParameters {
-  sittingToStandingTransform: Float32Array;
-
-  sizeX: number;
-  sizeZ: number;
+    sittingToStandingTransform?: Float32Array;
+    sizeX?: number;
+    sizeY?: number;
 }
 
 interface Navigator {
-  getVRDisplays(): Promise<Array<VRDisplay>>;
-  activeVRDisplays: Array<VRDisplay>;
+    getVRDisplays(): Promise<VRDisplay[]>;
+    readonly activeVRDisplays: ReadonlyArray<VRDisplay>;
 }
 
 interface Window {
-  onvrdisplayconnected: (ev: Event) => any;
-  onvrdisplaydisconnected: (ev: Event) => any;
-  onvrdisplaypresentchange: (ev: Event) => any;
-  addEventListener(type: "vrdisplayconnected", listener: (ev: Event) => any, useCapture?: boolean): void;
-  addEventListener(type: "vrdisplaydisconnected", listener: (ev: Event) => any, useCapture?: boolean): void;
-  addEventListener(type: "vrdisplaypresentchange", listener: (ev: Event) => any, useCapture?: boolean): void;
+    onvrdisplayconnected: ((this: Window, ev: Event) => any) | null;
+    onvrdisplaydisconnected: ((this: Window, ev: Event) => any) | null;
+    onvrdisplaypresentchange: ((this: Window, ev: Event) => any) | null;
+    addEventListener(type: "vrdisplayconnected", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "vrdisplaydisconnected", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "vrdisplaypresentchange", listener: (ev: Event) => any, useCapture?: boolean): void;
 }
 
 interface Gamepad {
-  displayId: number;
+    readonly displayId: number;
 }

From 1700ece8dee2e954dfcbae66d2abf395a8410db3 Mon Sep 17 00:00:00 2001
From: Steven <steven@ceriously.com>
Date: Tue, 6 Mar 2018 17:26:07 -0500
Subject: [PATCH 0306/1382] Add TlsSocket.getProtocol() to node (#24116)

---
 types/node/index.d.ts    | 8 ++++++++
 types/node/v6/index.d.ts | 8 ++++++++
 types/node/v7/index.d.ts | 8 ++++++++
 types/node/v8/index.d.ts | 8 ++++++++
 4 files changed, 32 insertions(+)

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index 717b906b28..b5cc3b094f 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -4895,6 +4895,14 @@ declare module "tls" {
         getPeerCertificate(detailed: true): DetailedPeerCertificate;
         getPeerCertificate(detailed?: false): PeerCertificate;
         getPeerCertificate(detailed?: boolean): PeerCertificate | DetailedPeerCertificate;
+        /**
+         * Returns a string containing the negotiated SSL/TLS protocol version of the current connection.
+         * The value `'unknown'` will be returned for connected sockets that have not completed the handshaking process.
+         * The value `null` will be returned for server sockets or disconnected client sockets.
+         * See https://www.openssl.org/docs/man1.0.2/ssl/SSL_get_version.html for more information.
+         * @returns negotiated SSL/TLS protocol version of the current connection
+         */
+        getProtocol(): string | null;
         /**
          * Could be used to speed up handshake establishment when reconnecting to the server.
          * @returns ASN.1 encoded TLS session or undefined if none was negotiated.
diff --git a/types/node/v6/index.d.ts b/types/node/v6/index.d.ts
index 3c81e212b7..152507c3a8 100644
--- a/types/node/v6/index.d.ts
+++ b/types/node/v6/index.d.ts
@@ -3215,6 +3215,14 @@ declare module "tls" {
             fingerprint: string;
             serialNumber: string;
         };
+        /**
+         * Returns a string containing the negotiated SSL/TLS protocol version of the current connection.
+         * The value `'unknown'` will be returned for connected sockets that have not completed the handshaking process.
+         * The value `null` will be returned for server sockets or disconnected client sockets.
+         * See https://www.openssl.org/docs/man1.0.2/ssl/SSL_get_version.html for more information.
+         * @returns negotiated SSL/TLS protocol version of the current connection
+         */
+        getProtocol(): string | null;
         /**
          * Could be used to speed up handshake establishment when reconnecting to the server.
          * @returns ASN.1 encoded TLS session or undefined if none was negotiated.
diff --git a/types/node/v7/index.d.ts b/types/node/v7/index.d.ts
index de69dc94c3..bdcb47d2e1 100644
--- a/types/node/v7/index.d.ts
+++ b/types/node/v7/index.d.ts
@@ -3313,6 +3313,14 @@ declare module "tls" {
         getPeerCertificate(detailed: true): DetailedPeerCertificate;
         getPeerCertificate(detailed?: false): PeerCertificate;
         getPeerCertificate(detailed?: boolean): PeerCertificate | DetailedPeerCertificate;
+        /**
+         * Returns a string containing the negotiated SSL/TLS protocol version of the current connection.
+         * The value `'unknown'` will be returned for connected sockets that have not completed the handshaking process.
+         * The value `null` will be returned for server sockets or disconnected client sockets.
+         * See https://www.openssl.org/docs/man1.0.2/ssl/SSL_get_version.html for more information.
+         * @returns negotiated SSL/TLS protocol version of the current connection
+         */
+        getProtocol(): string | null;
         /**
          * Could be used to speed up handshake establishment when reconnecting to the server.
          * @returns ASN.1 encoded TLS session or undefined if none was negotiated.
diff --git a/types/node/v8/index.d.ts b/types/node/v8/index.d.ts
index 5d672296f2..929aa9b642 100644
--- a/types/node/v8/index.d.ts
+++ b/types/node/v8/index.d.ts
@@ -4873,6 +4873,14 @@ declare module "tls" {
         getPeerCertificate(detailed: true): DetailedPeerCertificate;
         getPeerCertificate(detailed?: false): PeerCertificate;
         getPeerCertificate(detailed?: boolean): PeerCertificate | DetailedPeerCertificate;
+        /**
+         * Returns a string containing the negotiated SSL/TLS protocol version of the current connection.
+         * The value `'unknown'` will be returned for connected sockets that have not completed the handshaking process.
+         * The value `null` will be returned for server sockets or disconnected client sockets.
+         * See https://www.openssl.org/docs/man1.0.2/ssl/SSL_get_version.html for more information.
+         * @returns negotiated SSL/TLS protocol version of the current connection
+         */
+        getProtocol(): string | null;
         /**
          * Could be used to speed up handshake establishment when reconnecting to the server.
          * @returns ASN.1 encoded TLS session or undefined if none was negotiated.

From 7966bd48afd471ab2aba19d5c2d33fc287e826fe Mon Sep 17 00:00:00 2001
From: Luke Sanwick <lsanwick@gmail.com>
Date: Tue, 6 Mar 2018 14:33:39 -0800
Subject: [PATCH 0307/1382] [react-select] [bugfix] Properly provide types for
 optionComponent attribute.

---
 types/react-select/index.d.ts             | 63 ++++++++++++++++++++++-
 types/react-select/react-select-tests.tsx | 10 ++++
 2 files changed, 72 insertions(+), 1 deletion(-)

diff --git a/types/react-select/index.d.ts b/types/react-select/index.d.ts
index 084f878618..d256bb437e 100644
--- a/types/react-select/index.d.ts
+++ b/types/react-select/index.d.ts
@@ -130,6 +130,67 @@ export interface MenuRendererProps<TValue = OptionValues> {
     valueArray: Options<TValue>;
 }
 
+export interface OptionComponentProps<TValue = OptionValues> {
+    /**
+     * Classname(s) to apply to the option component.
+     */
+    className?: string;
+
+    /**
+     * Currently focused option.
+     */
+    focusOption?: Option<TValue>;
+
+    inputValue?: string;
+    instancePrefix?: string;
+
+    /**
+     * True if this option is disabled.
+     */
+    isDisabled?: boolean;
+
+    /**
+     * True if this option is focused.
+     */
+    isFocused?: boolean;
+
+    /**
+     * True if this option is selected.
+     */
+    isSelected?: boolean;
+
+    /**
+     * Callback to be invoked when this option is focused.
+     */
+    onFocus?: (option: Option<TValue>, event: any) => void;
+
+    /**
+     * Callback to be invoked when this option is selected.
+     */
+    onSelect?: (option: Option<TValue>, event: any) => void;
+
+    /**
+     * Option to be rendered by this component.
+     */
+    option: Option<TValue>;
+
+    /**
+     * Index of the option being rendered in the list
+     */
+    optionIndex?: number;
+
+    /**
+     * Callback to invoke when removing an option from a multi-selection. (Not necessarily the one
+     * being rendered)
+     */
+    removeValue?: (value: TValue | TValue[]) => void;
+
+    /**
+     * Callback to invoke to select an option. (Not necessarily the one being rendered)
+     */
+    selectValue?: (value: TValue | TValue[]) => void;
+}
+
 export interface ArrowRendererProps {
     /**
      * Arrow mouse down event handler.
@@ -388,7 +449,7 @@ export interface ReactSelectProps<TValue = OptionValues> extends React.Props<Rea
     /**
      * option component to render in dropdown
      */
-    optionComponent?: React.ComponentType<TValue>;
+    optionComponent?: React.ComponentType<OptionComponentProps<TValue>>;
     /**
      * function which returns a custom way to render the options in the menu
      */
diff --git a/types/react-select/react-select-tests.tsx b/types/react-select/react-select-tests.tsx
index b048343555..3635fe3145 100644
--- a/types/react-select/react-select-tests.tsx
+++ b/types/react-select/react-select-tests.tsx
@@ -339,6 +339,16 @@ describe("Examples", () => {
         />;
     });
 
+    it("Custom option component", () => {
+        class OptionComponent extends React.Component<ReactSelectModule.OptionComponentProps> {
+            render() {
+                return <div>{this.props.option.label}</div>;
+            }
+        }
+
+        <ReactSelect optionComponent={OptionComponent} />;
+    });
+
     it("Value render with custom value option", () => {
         const valueRenderer = (option: ReactSelectModule.Option<CustomValueType>): ReactSelectModule.HandlerRendererResult =>
             null;

From dac33e93f3ede263e7a820241bd8c49ab512104d Mon Sep 17 00:00:00 2001
From: Ethan Resnick <ethan.resnick@gmail.com>
Date: Tue, 6 Mar 2018 18:29:40 -0500
Subject: [PATCH 0308/1382] mongoose: remove unneeded union constituent from
 `any | ...`

---
 types/mongoose/index.d.ts    | 6 +++---
 types/mongoose/v4/index.d.ts | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/types/mongoose/index.d.ts b/types/mongoose/index.d.ts
index d4f80af795..50496fc9da 100644
--- a/types/mongoose/index.d.ts
+++ b/types/mongoose/index.d.ts
@@ -1543,12 +1543,12 @@ declare module "mongoose" {
     findOneAndUpdate(callback?: (err: any, doc: DocType | null) => void): DocumentQuery<DocType | null, DocType>;
     findOneAndUpdate(update: any,
       callback?: (err: any, doc: DocType | null, res: any) => void): DocumentQuery<DocType | null, DocType>;
-    findOneAndUpdate(query: any | Query<any>, update: any,
+    findOneAndUpdate(query: any, update: any,
       callback?: (err: any, doc: DocType | null, res: any) => void): DocumentQuery<DocType | null, DocType>;
-    findOneAndUpdate(query: any | Query<any>, update: any,
+    findOneAndUpdate(query: any, update: any,
       options: { upsert: true, new: true } & QueryFindOneAndUpdateOptions,
       callback?: (err: any, doc: DocType, res: any) => void): DocumentQuery<DocType, DocType>;
-    findOneAndUpdate(query: any | Query<any>, update: any, options: QueryFindOneAndUpdateOptions,
+    findOneAndUpdate(query: any, update: any, options: QueryFindOneAndUpdateOptions,
       callback?: (err: any, doc: DocType | null, res: any) => void): DocumentQuery<DocType | null, DocType>;
 
     /**
diff --git a/types/mongoose/v4/index.d.ts b/types/mongoose/v4/index.d.ts
index 6cd9c5e152..c680f3c980 100644
--- a/types/mongoose/v4/index.d.ts
+++ b/types/mongoose/v4/index.d.ts
@@ -1600,12 +1600,12 @@ declare module "mongoose" {
     findOneAndUpdate(callback?: (err: any, doc: DocType | null) => void): DocumentQuery<DocType | null, DocType>;
     findOneAndUpdate(update: any,
       callback?: (err: any, doc: DocType | null, res: any) => void): DocumentQuery<DocType | null, DocType>;
-    findOneAndUpdate(query: any | Query<any>, update: any,
+    findOneAndUpdate(query: any, update: any,
       callback?: (err: any, doc: DocType | null, res: any) => void): DocumentQuery<DocType | null, DocType>;
-    findOneAndUpdate(query: any | Query<any>, update: any,
+    findOneAndUpdate(query: any, update: any,
       options: { upsert: true, new: true } & QueryFindOneAndUpdateOptions,
       callback?: (err: any, doc: DocType, res: any) => void): DocumentQuery<DocType, DocType>;
-    findOneAndUpdate(query: any | Query<any>, update: any, options: QueryFindOneAndUpdateOptions,
+    findOneAndUpdate(query: any, update: any, options: QueryFindOneAndUpdateOptions,
       callback?: (err: any, doc: DocType | null, res: any) => void): DocumentQuery<DocType | null, DocType>;
 
     /**

From 346be5d729d7f1b6964665583460aa3b3148ba93 Mon Sep 17 00:00:00 2001
From: Dennis George <dennispg@gmail.com>
Date: Tue, 6 Mar 2018 17:54:01 -0600
Subject: [PATCH 0309/1382] updated to new Tapable export approach

---
 types/enhanced-resolve/tsconfig.json |   5 +-
 types/tapable/index.d.ts             | 111 +++++++------
 types/tapable/tapable-tests.ts       |   2 +-
 types/webpack/index.d.ts             | 230 ++++++++++++++-------------
 types/webpack/webpack-tests.ts       |   2 +-
 5 files changed, 177 insertions(+), 173 deletions(-)

diff --git a/types/enhanced-resolve/tsconfig.json b/types/enhanced-resolve/tsconfig.json
index 9c87f7e7a1..c2716adaa1 100644
--- a/types/enhanced-resolve/tsconfig.json
+++ b/types/enhanced-resolve/tsconfig.json
@@ -14,7 +14,10 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true
+        "forceConsistentCasingInFileNames": true,
+        "paths": {
+            "tapable": ["tapable/v0"]
+        }
     },
     "files": [
         "index.d.ts",
diff --git a/types/tapable/index.d.ts b/types/tapable/index.d.ts
index ba36704429..15ab768e69 100644
--- a/types/tapable/index.d.ts
+++ b/types/tapable/index.d.ts
@@ -4,7 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-declare abstract class Tapable {
+export declare abstract class Tapable {
     private _plugins: {
         [propName: string]: Tapable.Handler[]
     }
@@ -225,60 +225,59 @@ declare namespace Tapable {
     interface CallbackFunction {
         (err?: Error, result?: any, ...args: any[]): void;
     }
-
-    type TapType = "sync" | "async" | "promise";
-
-    interface HookCompileOptions {
-        type: TapType;
-    }
-
-    interface Tap {
-        name: string;
-        type: TapType;
-        fn: Function;
-        stage: number;
-        context: boolean;
-    }
-
-    interface Hook<TContext = any> {
-        compile(options: HookCompileOptions) : Function;
-        tap: (name: string | Tap, fn: (context: TContext, ...args: any[]) => any) => void;
-        tapAsync: (name: string | Tap, fn: (context: TContext, ...args: any[]) => void) => void;
-        tapPromise: (name: string | Tap, fn: (context: TContext, ...args: any[]) => Promise<any>) => void;
-        intercept: (interceptor: HookInterceptor) => void;
-    }
-
-    interface SyncHook<TContext = any> extends Hook<TContext> {}
-    interface SyncBailHook <TContext = any>extends Hook<TContext> {}
-    interface SyncLoopHook<TContext = any> extends Hook<TContext> {}
-    interface SyncWaterfallHook<TContext = any> extends Hook<TContext> {}
-
-    interface AsyncParallelHook<TContext = any> extends Hook<TContext> {}
-    interface AsyncParallelBailHook<TContext = any> extends Hook<TContext> {}
-    interface AsyncSeriesHook<TContext = any> extends Hook<TContext> {}
-    interface AsyncSeriesBailHook<TContext = any> extends Hook<TContext> {}
-    interface AsyncSeriesWaterfallHook<TContext = any> extends Hook<TContext> {}
-
-    interface HookInterceptor {
-        call: (...args: any[]) => void;
-        loop: (...args: any[]) => void;
-        tap: (tap: Tap) => void;
-        register: (tap: Tap) => Tap | undefined;
-        context: boolean;
-    }
-
-    interface HookMap<TContext = any> {
-        get: (key: any) => Hook<TContext> | undefined;
-        for: (key: any) => Hook<TContext>;
-        tap: (key: any, name: string | Tap, fn: (context: TContext, ...args: any[]) => any) => void;
-        tapAsync: (key: any, name: string | Tap, fn: (context: TContext, ...args: any[]) => void) => void;
-        tapPromise: (key: any, name: string | Tap, fn: (context: any, ...args: any[]) => Promise<any>) => void;
-        intercept: (interceptor: HookMapInterceptor<TContext>) => TContext;
-    }
-
-    interface HookMapInterceptor<TContext = any> {
-        factory: (key: any, hook: Hook<TContext>) => Hook<TContext>;
-    }
 }
 
-export = Tapable
+type TapType = "sync" | "async" | "promise";
+
+export interface HookCompileOptions {
+    type: TapType;
+}
+
+export interface Tap {
+    name: string;
+    type: TapType;
+    fn: Function;
+    stage: number;
+    context: boolean;
+}
+
+export class Hook<TContext = any> {
+    constructor(...args: any[]);
+    compile(options: HookCompileOptions) : Function;
+    tap: (name: string | Tap, fn: (context: TContext, ...args: any[]) => any) => void;
+    tapAsync: (name: string | Tap, fn: (context: TContext, ...args: any[]) => void) => void;
+    tapPromise: (name: string | Tap, fn: (context: TContext, ...args: any[]) => Promise<any>) => void;
+    intercept: (interceptor: HookInterceptor) => void;
+}
+
+export class SyncHook<TContext = any> extends Hook<TContext> {}
+export class SyncBailHook <TContext = any>extends Hook<TContext> {}
+export class SyncLoopHook<TContext = any> extends Hook<TContext> {}
+export class SyncWaterfallHook<TContext = any> extends Hook<TContext> {}
+
+export class AsyncParallelHook<TContext = any> extends Hook<TContext> {}
+export class AsyncParallelBailHook<TContext = any> extends Hook<TContext> {}
+export class AsyncSeriesHook<TContext = any> extends Hook<TContext> {}
+export class AsyncSeriesBailHook<TContext = any> extends Hook<TContext> {}
+export class AsyncSeriesWaterfallHook<TContext = any> extends Hook<TContext> {}
+
+export class HookInterceptor {
+    call: (...args: any[]) => void;
+    loop: (...args: any[]) => void;
+    tap: (tap: Tap) => void;
+    register: (tap: Tap) => Tap | undefined;
+    context: boolean;
+}
+
+export class HookMap<TContext = any> {
+    get: (key: any) => Hook<TContext> | undefined;
+    for: (key: any) => Hook<TContext>;
+    tap: (key: any, name: string | Tap, fn: (context: TContext, ...args: any[]) => any) => void;
+    tapAsync: (key: any, name: string | Tap, fn: (context: TContext, ...args: any[]) => void) => void;
+    tapPromise: (key: any, name: string | Tap, fn: (context: any, ...args: any[]) => Promise<any>) => void;
+    intercept: (interceptor: HookMapInterceptor<TContext>) => TContext;
+}
+
+export class HookMapInterceptor<TContext = any> {
+    factory: (key: any, hook: Hook<TContext>) => Hook<TContext>;
+}
diff --git a/types/tapable/tapable-tests.ts b/types/tapable/tapable-tests.ts
index 60e299b4a0..4d82e60a66 100644
--- a/types/tapable/tapable-tests.ts
+++ b/types/tapable/tapable-tests.ts
@@ -1,4 +1,4 @@
-import Tapable = require('tapable');
+import {Tapable} from "tapable";
 
 class DllPlugin {
     apply(compiler: Compiler) {
diff --git a/types/webpack/index.d.ts b/types/webpack/index.d.ts
index 6b947a4bdb..dc5bdcc80f 100644
--- a/types/webpack/index.d.ts
+++ b/types/webpack/index.d.ts
@@ -16,7 +16,9 @@
 
 /// <reference types="node" />
 
-import Tapable = require('tapable');
+import { Tapable, HookMap,
+         SyncBailHook, SyncHook, SyncLoopHook, SyncWaterfallHook,
+         AsyncParallelBailHook, AsyncParallelHook, AsyncSeriesBailHook, AsyncSeriesHook, AsyncSeriesWaterfallHook } from 'tapable';
 import * as UglifyJS from 'uglify-js';
 import { RawSourceMap } from 'source-map';
 
@@ -670,16 +672,16 @@ declare namespace webpack {
     }
 
     interface NormalModuleFactoryHooks {
-        resolver: Tapable.SyncWaterfallHook;
-        factory: Tapable.SyncWaterfallHook;
-        beforeResolve: Tapable.AsyncSeriesWaterfallHook;
-        afterResolve: Tapable.AsyncSeriesWaterfallHook;
-        createModule: Tapable.SyncBailHook;
-        module: Tapable.SyncWaterfallHook;
-        createParser: Tapable.HookMap;
-        parser: Tapable.HookMap;
-        createGenerator: Tapable.HookMap;
-        generator: Tapable.HookMap;
+        resolver: SyncWaterfallHook;
+        factory: SyncWaterfallHook;
+        beforeResolve: AsyncSeriesWaterfallHook;
+        afterResolve: AsyncSeriesWaterfallHook;
+        createModule: SyncBailHook;
+        module: SyncWaterfallHook;
+        createParser: HookMap;
+        parser: HookMap;
+        createGenerator: HookMap;
+        generator: HookMap;
     }
 
     class NormalModuleFactory extends Tapable {
@@ -687,10 +689,10 @@ declare namespace webpack {
     }
 
     interface ContextModuleFactoryHooks {
-        beforeResolve: Tapable.AsyncSeriesWaterfallHook;
-        afterResolve: Tapable.AsyncSeriesWaterfallHook;
-        contextModuleFiles: Tapable.SyncWaterfallHook;
-        alternatives: Tapable.AsyncSeriesWaterfallHook;
+        beforeResolve: AsyncSeriesWaterfallHook;
+        afterResolve: AsyncSeriesWaterfallHook;
+        contextModuleFiles: SyncWaterfallHook;
+        alternatives: AsyncSeriesWaterfallHook;
     }
 
     class ContextModuleFactory extends Tapable {
@@ -702,98 +704,98 @@ declare namespace webpack {
     }
 
     interface CompilationHooks {
-        buildModule: Tapable.SyncHook;
-        rebuildModule: Tapable.SyncHook;
-        failedModule: Tapable.SyncHook;
-        succeedModule: Tapable.SyncHook;
+        buildModule: SyncHook;
+        rebuildModule: SyncHook;
+        failedModule: SyncHook;
+        succeedModule: SyncHook;
 
-        finishModules: Tapable.SyncHook;
-        finishRebuildingModule: Tapable.SyncHook;
+        finishModules: SyncHook;
+        finishRebuildingModule: SyncHook;
 
-        unseal: Tapable.SyncHook;
-        seal: Tapable.SyncHook;
+        unseal: SyncHook;
+        seal: SyncHook;
 
-        optimizeDependenciesBasic: Tapable.SyncBailHook;
-        optimizeDependencies: Tapable.SyncBailHook;
-        optimizeDependenciesAdvanced: Tapable.SyncBailHook;
-        afterOptimizeDependencies: Tapable.SyncHook;
+        optimizeDependenciesBasic: SyncBailHook;
+        optimizeDependencies: SyncBailHook;
+        optimizeDependenciesAdvanced: SyncBailHook;
+        afterOptimizeDependencies: SyncHook;
 
-        optimize: Tapable.SyncHook;
+        optimize: SyncHook;
 
-        optimizeModulesBasic: Tapable.SyncBailHook;
-        optimizeModules: Tapable.SyncBailHook;
-        optimizeModulesAdvanced: Tapable.SyncBailHook;
-        afterOptimizeModules: Tapable.SyncHook;
+        optimizeModulesBasic: SyncBailHook;
+        optimizeModules: SyncBailHook;
+        optimizeModulesAdvanced: SyncBailHook;
+        afterOptimizeModules: SyncHook;
 
-        optimizeChunksBasic: Tapable.SyncBailHook;
-        optimizeChunks: Tapable.SyncBailHook;
-        optimizeChunksAdvanced: Tapable.SyncBailHook;
-        afterOptimizeChunks: Tapable.SyncHook;
+        optimizeChunksBasic: SyncBailHook;
+        optimizeChunks: SyncBailHook;
+        optimizeChunksAdvanced: SyncBailHook;
+        afterOptimizeChunks: SyncHook;
 
-        optimizeTree: Tapable.AsyncSeriesHook;
-        afterOptimizeTree: Tapable.SyncHook;
+        optimizeTree: AsyncSeriesHook;
+        afterOptimizeTree: SyncHook;
 
-        optimizeChunkModulesBasic: Tapable.SyncBailHook;
-        optimizeChunkModules: Tapable.SyncBailHook;
-        optimizeChunkModulesAdvanced: Tapable.SyncBailHook;
-        afterOptimizeChunkModules: Tapable.SyncHook;
-        shouldRecord: Tapable.SyncBailHook;
+        optimizeChunkModulesBasic: SyncBailHook;
+        optimizeChunkModules: SyncBailHook;
+        optimizeChunkModulesAdvanced: SyncBailHook;
+        afterOptimizeChunkModules: SyncHook;
+        shouldRecord: SyncBailHook;
 
-        reviveModules: Tapable.SyncHook;
-        optimizeModuleOrder: Tapable.SyncHook;
-        advancedOptimizeModuleOrder: Tapable.SyncHook;
-        beforeModuleIds: Tapable.SyncHook;
-        moduleIds: Tapable.SyncHook;
-        optimizeModuleIds: Tapable.SyncHook;
-        afterOptimizeModuleIds: Tapable.SyncHook;
+        reviveModules: SyncHook;
+        optimizeModuleOrder: SyncHook;
+        advancedOptimizeModuleOrder: SyncHook;
+        beforeModuleIds: SyncHook;
+        moduleIds: SyncHook;
+        optimizeModuleIds: SyncHook;
+        afterOptimizeModuleIds: SyncHook;
 
-        reviveChunks: Tapable.SyncHook;
-        optimizeChunkOrder: Tapable.SyncHook;
-        beforeChunkIds: Tapable.SyncHook;
-        optimizeChunkIds: Tapable.SyncHook;
-        afterOptimizeChunkIds: Tapable.SyncHook;
+        reviveChunks: SyncHook;
+        optimizeChunkOrder: SyncHook;
+        beforeChunkIds: SyncHook;
+        optimizeChunkIds: SyncHook;
+        afterOptimizeChunkIds: SyncHook;
 
-        recordModules: Tapable.SyncHook;
-        recordChunks: Tapable.SyncHook;
+        recordModules: SyncHook;
+        recordChunks: SyncHook;
 
-        beforeHash: Tapable.SyncHook;
-        afterHash: Tapable.SyncHook;
+        beforeHash: SyncHook;
+        afterHash: SyncHook;
 
-        recordHash: Tapable.SyncHook;
+        recordHash: SyncHook;
 
-        record: Tapable.SyncHook;
+        record: SyncHook;
 
-        beforeModuleAssets: Tapable.SyncHook;
-        shouldGenerateChunkAssets: Tapable.SyncBailHook;
-        beforeChunkAssets: Tapable.SyncHook;
-        additionalChunkAssets: Tapable.SyncHook;
+        beforeModuleAssets: SyncHook;
+        shouldGenerateChunkAssets: SyncBailHook;
+        beforeChunkAssets: SyncHook;
+        additionalChunkAssets: SyncHook;
 
-        records: Tapable.SyncHook;
+        records: SyncHook;
 
-        additionalAssets: Tapable.AsyncSeriesHook;
-        optimizeChunkAssets: Tapable.AsyncSeriesHook<Chunk[]>;
-        afterOptimizeChunkAssets: Tapable.SyncHook;
-        optimizeAssets: Tapable.AsyncSeriesHook;
-        afterOptimizeAssets: Tapable.SyncHook;
+        additionalAssets: AsyncSeriesHook;
+        optimizeChunkAssets: AsyncSeriesHook<Chunk[]>;
+        afterOptimizeChunkAssets: SyncHook;
+        optimizeAssets: AsyncSeriesHook;
+        afterOptimizeAssets: SyncHook;
 
-        needAdditionalSeal: Tapable.SyncBailHook;
-        afterSeal: Tapable.AsyncSeriesHook;
+        needAdditionalSeal: SyncBailHook;
+        afterSeal: AsyncSeriesHook;
 
-        chunkHash: Tapable.SyncHook;
-        moduleAsset: Tapable.SyncHook;
-        chunkAsset: Tapable.SyncHook;
+        chunkHash: SyncHook;
+        moduleAsset: SyncHook;
+        chunkAsset: SyncHook;
 
-        assetPath: Tapable.SyncWaterfallHook;
+        assetPath: SyncWaterfallHook;
 
-        needAdditionalPass: Tapable.SyncBailHook;
-        childCompiler: Tapable.SyncHook;
+        needAdditionalPass: SyncBailHook;
+        childCompiler: SyncHook;
 
-        normalModuleLoader: Tapable.SyncHook;
+        normalModuleLoader: SyncHook;
 
-        optimizeExtractedChunksBasic: Tapable.SyncBailHook;
-        optimizeExtractedChunks: Tapable.SyncBailHook;
-        optimizeExtractedChunksAdvanced: Tapable.SyncBailHook;
-        afterOptimizeExtractedChunks: Tapable.SyncHook;
+        optimizeExtractedChunksBasic: SyncBailHook;
+        optimizeExtractedChunks: SyncBailHook;
+        optimizeExtractedChunksAdvanced: SyncBailHook;
+        afterOptimizeExtractedChunks: SyncHook;
     }
 
     interface CompilationModule {
@@ -809,11 +811,11 @@ declare namespace webpack {
     class RuntimeTemplate {}
 
     interface ModuleTemplateHooks {
-        content: Tapable.SyncWaterfallHook;
-        module: Tapable.SyncWaterfallHook;
-        render: Tapable.SyncWaterfallHook;
-        package: Tapable.SyncWaterfallHook;
-        hash: Tapable.SyncHook;
+        content: SyncWaterfallHook;
+        module: SyncWaterfallHook;
+        render: SyncWaterfallHook;
+        package: SyncWaterfallHook;
+        hash: SyncHook;
     }
 
     class ModuleTemplate extends Tapable {
@@ -942,37 +944,37 @@ declare namespace webpack {
     }
 
     interface CompilerHooks {
-        shouldEmit: Tapable.SyncBailHook;
-        done: Tapable.AsyncSeriesHook;
-        additionalPass: Tapable.AsyncSeriesHook;
-        beforeRun: Tapable.AsyncSeriesHook;
-        run: Tapable.AsyncSeriesHook;
-        emit: Tapable.AsyncSeriesHook;
-        afterEmit: Tapable.AsyncSeriesHook;
-        thisCompilation: Tapable.SyncHook;
-        compilation: Tapable.SyncHook<Compilation>;
-        normalModuleFactory: Tapable.SyncHook<NormalModuleFactory>;
-        contextModuleFactory: Tapable.SyncHook<ContextModuleFactory>;
-        beforeCompile: Tapable.AsyncSeriesHook;
-        compile: Tapable.SyncHook;
-        make: Tapable.AsyncParallelHook;
-        afterCompile: Tapable.AsyncSeriesHook;
-        watchRun: Tapable.AsyncSeriesHook;
-        failed: Tapable.SyncHook;
-        invalid: Tapable.SyncHook;
-        watchClose: Tapable.SyncHook;
-        environment: Tapable.SyncHook;
-        afterEnvironment: Tapable.SyncHook;
-        afterPlugins: Tapable.SyncHook;
-        afterResolvers: Tapable.SyncHook;
-        entryOption: Tapable.SyncBailHook;
+        shouldEmit: SyncBailHook;
+        done: AsyncSeriesHook;
+        additionalPass: AsyncSeriesHook;
+        beforeRun: AsyncSeriesHook;
+        run: AsyncSeriesHook;
+        emit: AsyncSeriesHook;
+        afterEmit: AsyncSeriesHook;
+        thisCompilation: SyncHook;
+        compilation: SyncHook<Compilation>;
+        normalModuleFactory: SyncHook<NormalModuleFactory>;
+        contextModuleFactory: SyncHook<ContextModuleFactory>;
+        beforeCompile: AsyncSeriesHook;
+        compile: SyncHook;
+        make: AsyncParallelHook;
+        afterCompile: AsyncSeriesHook;
+        watchRun: AsyncSeriesHook;
+        failed: SyncHook;
+        invalid: SyncHook;
+        watchClose: SyncHook;
+        environment: SyncHook;
+        afterEnvironment: SyncHook;
+        afterPlugins: SyncHook;
+        afterResolvers: SyncHook;
+        entryOption: SyncBailHook;
     }
 
     class Compiler extends Tapable implements ICompiler {
         constructor();
 
         hooks: CompilerHooks;
-        _pluginCompat: Tapable.SyncBailHook<Compilation>;
+        _pluginCompat: SyncBailHook<Compilation>;
 
         name: string;
         options: Configuration;
diff --git a/types/webpack/webpack-tests.ts b/types/webpack/webpack-tests.ts
index e645a568f8..a49541f796 100644
--- a/types/webpack/webpack-tests.ts
+++ b/types/webpack/webpack-tests.ts
@@ -1,5 +1,5 @@
 import webpack = require('webpack');
-import Tapable = require('tapable');
+import { Tapable } from 'tapable';
 import { RawSourceMap } from 'source-map';
 
 const {

From 81514fb7bc9263497e94eb4b726f495bf7bcf564 Mon Sep 17 00:00:00 2001
From: Dennis George <dennispg@gmail.com>
Date: Tue, 6 Mar 2018 19:19:52 -0600
Subject: [PATCH 0310/1382] added multiple type params for Tapable,
 webpack.compilation namespace

---
 types/tapable/index.d.ts       |  50 +--
 types/webpack/index.d.ts       | 681 +++++++++++++++++----------------
 types/webpack/webpack-tests.ts |   8 +-
 3 files changed, 380 insertions(+), 359 deletions(-)

diff --git a/types/tapable/index.d.ts b/types/tapable/index.d.ts
index 15ab768e69..c044a245ce 100644
--- a/types/tapable/index.d.ts
+++ b/types/tapable/index.d.ts
@@ -241,25 +241,31 @@ export interface Tap {
     context: boolean;
 }
 
-export class Hook<TContext = any> {
+export class Hook<T1 = any, T2 = any, T3 = any> {
     constructor(...args: any[]);
+    taps: any[];
+    interceptors: any[];
+    call: (arg1?: T1, arg2?: T2, arg3?: T3, ...args: any[]) => any;
+    promise:(arg1?: T1, arg2?: T2, arg3?: T3, ...args: any[]) => Promise<any>;
+    callAsync: (arg1?: T1, arg2?: T2, arg3?: T3, ...args: any[]) => any;
+
     compile(options: HookCompileOptions) : Function;
-    tap: (name: string | Tap, fn: (context: TContext, ...args: any[]) => any) => void;
-    tapAsync: (name: string | Tap, fn: (context: TContext, ...args: any[]) => void) => void;
-    tapPromise: (name: string | Tap, fn: (context: TContext, ...args: any[]) => Promise<any>) => void;
+    tap: (name: string | Tap, fn: (arg1: T1, arg2: T2, arg3: T3, ...args: any[]) => any) => void;
+    tapAsync: (name: string | Tap, fn: (arg1: T1, arg2: T2, arg3: T3, ...args: any[]) => void) => void;
+    tapPromise: (name: string | Tap, fn: (arg1: T1, arg2: T2, arg3: T3, ...args: any[]) => Promise<any>) => void;
     intercept: (interceptor: HookInterceptor) => void;
 }
 
-export class SyncHook<TContext = any> extends Hook<TContext> {}
-export class SyncBailHook <TContext = any>extends Hook<TContext> {}
-export class SyncLoopHook<TContext = any> extends Hook<TContext> {}
-export class SyncWaterfallHook<TContext = any> extends Hook<TContext> {}
+export class SyncHook<T1 = any, T2 = any, T3 = any> extends Hook<T1, T2, T3> {}
+export class SyncBailHook <T1 = any, T2 = any, T3 = any>extends Hook<T1, T2, T3> {}
+export class SyncLoopHook<T1 = any, T2 = any, T3 = any> extends Hook<T1, T2, T3> {}
+export class SyncWaterfallHook<T1 = any, T2 = any, T3 = any> extends Hook<T1, T2, T3> {}
 
-export class AsyncParallelHook<TContext = any> extends Hook<TContext> {}
-export class AsyncParallelBailHook<TContext = any> extends Hook<TContext> {}
-export class AsyncSeriesHook<TContext = any> extends Hook<TContext> {}
-export class AsyncSeriesBailHook<TContext = any> extends Hook<TContext> {}
-export class AsyncSeriesWaterfallHook<TContext = any> extends Hook<TContext> {}
+export class AsyncParallelHook<T1 = any, T2 = any, T3 = any> extends Hook<T1, T2, T3> {}
+export class AsyncParallelBailHook<T1 = any, T2 = any, T3 = any> extends Hook<T1, T2, T3> {}
+export class AsyncSeriesHook<T1 = any, T2 = any, T3 = any> extends Hook<T1, T2, T3> {}
+export class AsyncSeriesBailHook<T1 = any, T2 = any, T3 = any> extends Hook<T1, T2, T3> {}
+export class AsyncSeriesWaterfallHook<T1 = any, T2 = any, T3 = any> extends Hook<T1, T2, T3> {}
 
 export class HookInterceptor {
     call: (...args: any[]) => void;
@@ -269,15 +275,15 @@ export class HookInterceptor {
     context: boolean;
 }
 
-export class HookMap<TContext = any> {
-    get: (key: any) => Hook<TContext> | undefined;
-    for: (key: any) => Hook<TContext>;
-    tap: (key: any, name: string | Tap, fn: (context: TContext, ...args: any[]) => any) => void;
-    tapAsync: (key: any, name: string | Tap, fn: (context: TContext, ...args: any[]) => void) => void;
-    tapPromise: (key: any, name: string | Tap, fn: (context: any, ...args: any[]) => Promise<any>) => void;
-    intercept: (interceptor: HookMapInterceptor<TContext>) => TContext;
+export class HookMap<T1 = any, T2 = any, T3 = any> {
+    get: (key: any) => Hook<T1, T2, T3> | undefined;
+    for: (key: any) => Hook<T1, T2, T3>;
+    tap: (key: any, name: string | Tap, fn: (arg1: T1, arg2: T2, arg3: T3, ...args: any[]) => any) => void;
+    tapAsync: (key: any, name: string | Tap, fn: (arg1: T1, arg2: T2, arg3: T3, ...args: any[]) => void) => void;
+    tapPromise: (key: any, name: string | Tap, fn: (arg1: T1, arg2: T2, arg3: T3, ...args: any[]) => Promise<any>) => void;
+    intercept: (interceptor: HookMapInterceptor<T1, T2, T3>) => void;
 }
 
-export class HookMapInterceptor<TContext = any> {
-    factory: (key: any, hook: Hook<TContext>) => Hook<TContext>;
+export class HookMapInterceptor<T1 = any, T2 = any, T3 = any> {
+    factory: (key: any, hook: Hook<T1, T2, T3>) => Hook<T1, T2, T3>;
 }
diff --git a/types/webpack/index.d.ts b/types/webpack/index.d.ts
index dc5bdcc80f..5f7d31b20b 100644
--- a/types/webpack/index.d.ts
+++ b/types/webpack/index.d.ts
@@ -601,316 +601,358 @@ declare namespace webpack {
             portableRecords?: boolean;
         }
     }
+    namespace compilation {
+        class Asset {
+        }
 
-    class Chunk {
-        constructor(name: string);
-        id: any;
-        ids: any;
-        debugId: number;
-        name: any;
-        entryModule: any;
-        files: any[];
-        rendered: boolean;
-        hash: any;
-        renderedHash: any;
-        chunkReason: any;
-        extraAsync: boolean;
+        class Module {
+        }
 
-        hasRuntime(): boolean;
-        canBeInitial(): boolean;
-        isOnlyInitial(): boolean;
-        hasEntryModule(): boolean;
+        class Record {
+        }
 
-        addModule(module: any): boolean;
-        removeModule(module: any): boolean;
-        setModules(modules: any): void;
-        getNumberOfModules(): number;
-        modulesIterable: any[];
+        class Chunk {
+            constructor(name: string);
+            id: any;
+            ids: any;
+            debugId: number;
+            name: any;
+            entryModule: any;
+            files: any[];
+            rendered: boolean;
+            hash: any;
+            renderedHash: any;
+            chunkReason: any;
+            extraAsync: boolean;
 
-        addGroup(chunkGroup: any): boolean;
-        removeGroup(chunkGroup: any): boolean;
-        isInGroup(chunkGroup: any): boolean;
-        getNumberOfGroups(): number;
-        groupsIterable: any[];
+            hasRuntime(): boolean;
+            canBeInitial(): boolean;
+            isOnlyInitial(): boolean;
+            hasEntryModule(): boolean;
 
-        compareTo(otherChunk: any): -1 | 0 | 1;
-        containsModule(module: any): boolean;
-        getModules(): any[];
-        getModulesIdent(): any[];
-        remove(reason: any): void;
-        moveModule(module: any, otherChunk: any): void;
-        integrate(otherChunk: any, reason: any): boolean;
-        split(newChunk: any): void;
-        isEmpty(): boolean;
-        updateHash(hash: any): void;
-        canBeIntegrated(otherChunk: any): boolean;
-        addMultiplierAndOverhead(size: number, options: any): number;
-        modulesSize(): number;
-        size(options: any): number;
-        integratedSize(otherChunk: any, options: any): number;
-        // tslint:disable-next-line:ban-types
-        sortModules(sortByFn: Function): void;
-        getAllAsyncChunks(): Set<any>;
-        getChunkMaps(realHash: any): { hash: any, name: any };
-        // tslint:disable-next-line:ban-types
-        getChunkModuleMaps(filterFn: Function): { id: any, hash: any };
-        // tslint:disable-next-line:ban-types
-        hasModuleInGraph(filterFn: Function, filterChunkFn: Function): boolean;
-        toString(): string;
+            addModule(module: any): boolean;
+            removeModule(module: any): boolean;
+            setModules(modules: any): void;
+            getNumberOfModules(): number;
+            modulesIterable: any[];
+
+            addGroup(chunkGroup: any): boolean;
+            removeGroup(chunkGroup: any): boolean;
+            isInGroup(chunkGroup: any): boolean;
+            getNumberOfGroups(): number;
+            groupsIterable: any[];
+
+            compareTo(otherChunk: any): -1 | 0 | 1;
+            containsModule(module: any): boolean;
+            getModules(): any[];
+            getModulesIdent(): any[];
+            remove(reason: any): void;
+            moveModule(module: any, otherChunk: any): void;
+            integrate(otherChunk: any, reason: any): boolean;
+            split(newChunk: any): void;
+            isEmpty(): boolean;
+            updateHash(hash: any): void;
+            canBeIntegrated(otherChunk: any): boolean;
+            addMultiplierAndOverhead(size: number, options: any): number;
+            modulesSize(): number;
+            size(options: any): number;
+            integratedSize(otherChunk: any, options: any): number;
+            // tslint:disable-next-line:ban-types
+            sortModules(sortByFn: Function): void;
+            getAllAsyncChunks(): Set<any>;
+            getChunkMaps(realHash: any): { hash: any, name: any };
+            // tslint:disable-next-line:ban-types
+            getChunkModuleMaps(filterFn: Function): { id: any, hash: any };
+            // tslint:disable-next-line:ban-types
+            hasModuleInGraph(filterFn: Function, filterChunkFn: Function): boolean;
+            toString(): string;
+        }
+
+        class ChunkGroup {
+        }
+
+        class ChunkHash {
+        }
+
+        class Dependency {
+            constructor();
+            getResourceIdentifier(): any;
+            getReference(): any;
+            getExports(): any;
+            getWarnings(): any;
+            getErrors(): any;
+            updateHash(hash: any): void;
+            disconnect(): void;
+            static compare(a: any, b: any): any;
+        }
+
+        interface NormalModuleFactoryHooks {
+            resolver: SyncWaterfallHook;
+            factory: SyncWaterfallHook;
+            beforeResolve: AsyncSeriesWaterfallHook;
+            afterResolve: AsyncSeriesWaterfallHook;
+            createModule: SyncBailHook;
+            module: SyncWaterfallHook;
+            createParser: HookMap;
+            parser: HookMap;
+            createGenerator: HookMap;
+            generator: HookMap;
+        }
+
+        class NormalModuleFactory extends Tapable {
+            hooks: NormalModuleFactoryHooks;
+        }
+
+        interface ContextModuleFactoryHooks {
+            beforeResolve: AsyncSeriesWaterfallHook;
+            afterResolve: AsyncSeriesWaterfallHook;
+            contextModuleFiles: SyncWaterfallHook;
+            alternatives: AsyncSeriesWaterfallHook;
+        }
+
+        class ContextModuleFactory extends Tapable {
+            hooks: ContextModuleFactoryHooks;
+        }
+
+        class DllModuleFactory extends Tapable {
+            hooks: {};
+        }
+
+        interface CompilationHooks {
+            buildModule: SyncHook<Module>;
+            rebuildModule: SyncHook<Module>;
+            failedModule: SyncHook<Module, Error>;
+            succeedModule: SyncHook<Module>;
+
+            finishModules: SyncHook<Module[]>;
+            finishRebuildingModule: SyncHook<Module>;
+
+            unseal: SyncHook;
+            seal: SyncHook;
+
+            optimizeDependenciesBasic: SyncBailHook<Module[]>;
+            optimizeDependencies: SyncBailHook<Module[]>;
+            optimizeDependenciesAdvanced: SyncBailHook<Module[]>;
+            afterOptimizeDependencies: SyncHook<Module[]>;
+
+            optimize: SyncHook;
+
+            optimizeModulesBasic: SyncBailHook<Module[]>;
+            optimizeModules: SyncBailHook<Module[]>;
+            optimizeModulesAdvanced: SyncBailHook<Module[]>;
+            afterOptimizeModules: SyncHook<Module[]>;
+
+            optimizeChunksBasic: SyncBailHook<Chunk[], ChunkGroup[]>;
+            optimizeChunks: SyncBailHook<Chunk[], ChunkGroup[]>;
+            optimizeChunksAdvanced: SyncBailHook<Chunk[], ChunkGroup[]>;
+            afterOptimizeChunks: SyncHook<Chunk[], ChunkGroup[]>;
+
+            optimizeTree: AsyncSeriesHook<Chunk[], Module[]>;
+            afterOptimizeTree: SyncHook<Chunk[], Module[]>;
+
+            optimizeChunkModulesBasic: SyncBailHook<Chunk[], Module[]>;
+            optimizeChunkModules: SyncBailHook<Chunk[], Module[]>;
+            optimizeChunkModulesAdvanced: SyncBailHook<Chunk[], Module[]>;
+            afterOptimizeChunkModules: SyncHook<Chunk[], Module[]>;
+            shouldRecord: SyncBailHook;
+
+            reviveModules: SyncHook<Module[], Record[]>;
+            optimizeModuleOrder: SyncHook<Module[]>;
+            advancedOptimizeModuleOrder: SyncHook<Module[]>;
+            beforeModuleIds: SyncHook<Module[]>;
+            moduleIds: SyncHook<Module[]>;
+            optimizeModuleIds: SyncHook<Module[]>;
+            afterOptimizeModuleIds: SyncHook<Module[]>;
+
+            reviveChunks: SyncHook<Chunk[], Record[]>;
+            optimizeChunkOrder: SyncHook<Chunk[]>;
+            beforeChunkIds: SyncHook<Chunk[]>;
+            optimizeChunkIds: SyncHook<Chunk[]>;
+            afterOptimizeChunkIds: SyncHook<Chunk[]>;
+
+            recordModules: SyncHook<Module[], Record[]>;
+            recordChunks: SyncHook<Chunk[], Record[]>;
+
+            beforeHash: SyncHook;
+            afterHash: SyncHook;
+
+            recordHash: SyncHook<Record[]>;
+
+            record: SyncHook<Compilation, Record[]>;
+
+            beforeModuleAssets: SyncHook;
+            shouldGenerateChunkAssets: SyncBailHook;
+            beforeChunkAssets: SyncHook;
+            additionalChunkAssets: SyncHook<Chunk[]>;
+
+            records: SyncHook<Compilation, Record[]>;
+
+            additionalAssets: AsyncSeriesHook;
+            optimizeChunkAssets: AsyncSeriesHook<Chunk[]>;
+            afterOptimizeChunkAssets: SyncHook<Chunk[]>;
+            optimizeAssets: AsyncSeriesHook<Asset[]>;
+            afterOptimizeAssets: SyncHook<Asset[]>;
+
+            needAdditionalSeal: SyncBailHook;
+            afterSeal: AsyncSeriesHook;
+
+            chunkHash: SyncHook<Chunk, ChunkHash>;
+            moduleAsset: SyncHook<Module, string>;
+            chunkAsset: SyncHook<Chunk, string>;
+
+            assetPath: SyncWaterfallHook<string>;
+
+            needAdditionalPass: SyncBailHook;
+            childCompiler: SyncHook;
+
+            normalModuleLoader: SyncHook<any, Module>;
+
+            optimizeExtractedChunksBasic: SyncBailHook<Chunk[]>;
+            optimizeExtractedChunks: SyncBailHook<Chunk[]>;
+            optimizeExtractedChunksAdvanced: SyncBailHook<Chunk[]>;
+            afterOptimizeExtractedChunks: SyncHook<Chunk[]>;
+        }
+
+        interface CompilationModule {
+            module: any;
+            issuer: boolean;
+            build: boolean;
+            dependencies: boolean;
+        }
+
+        class MainTemplate extends Tapable {}
+        class ChunkTemplate extends Tapable {}
+        class HotUpdateChunkTemplate extends Tapable {}
+        class RuntimeTemplate {}
+
+        interface ModuleTemplateHooks {
+            content: SyncWaterfallHook;
+            module: SyncWaterfallHook;
+            render: SyncWaterfallHook;
+            package: SyncWaterfallHook;
+            hash: SyncHook;
+        }
+
+        class ModuleTemplate extends Tapable {
+            hooks: ModuleTemplateHooks;
+        }
+
+        class Compilation extends Tapable {
+            hooks: CompilationHooks;
+            compiler: Compiler;
+
+            resolverFactory: any;
+            inputFileSystem: any;
+            requestShortener: any;
+
+            outputOptions: any;
+            bail: any;
+            profile: any;
+            performance: any;
+
+            mainTemplate: MainTemplate;
+            chunkTemplate: ChunkTemplate;
+            hotUpdateChunkTemplate: HotUpdateChunkTemplate;
+            runtimeTemplate: RuntimeTemplate;
+            moduleTemplates: {
+                javascript: ModuleTemplate;
+                webassembly: ModuleTemplate;
+            };
+
+            entries: any[];
+            _preparedEntrypoints: any[];
+            entrypoints: Map<any, any>;
+            chunks: any[];
+            chunkGroups: any[];
+            namedChunkGroups: Map<any, any>;
+            namedChunks: Map<any, any>;
+            modules: any[];
+            _modules: Map<any, any>;
+            cache: any;
+            records: any;
+            nextFreeModuleIndex: any;
+            nextFreeModuleIndex2: any;
+            additionalChunkAssets: any[];
+            assets: any;
+            errors: any[];
+            warnings: any[];
+            children: any[];
+            dependencyFactories: Map<typeof Dependency, Tapable>;
+            dependencyTemplates: Map<typeof Dependency, Tapable>;
+            childrenCounters: any;
+            usedChunkIds: any;
+            usedModuleIds: any;
+            getStats(): Stats;
+            addModule(module: CompilationModule, cacheGroup: any): any;
+            // getModule(module)
+            // findModule(identifier)
+            // waitForBuildingFinished(module, callback)
+            // buildModule(module, optional, origin, dependencies, thisCallback)
+            // processModuleDependencies(module, callback)
+            // addModuleDependencies(module, dependencies, bail, cacheGroup, recursive, callback)
+            // tslint:disable-next-line:ban-types
+            addEntry(context: any, entry: any, name: any, callback: Function): void;
+            // prefetch(context, dependency, callback)
+            // rebuildModule(module, thisCallback)
+            // finish()
+            // unseal()
+            // seal(callback)
+            // sortModules(modules)
+            // reportDependencyErrorsAndWarnings(module, blocks)
+            // addChunkInGroup(name, module, loc, request)
+            // addChunk(name)
+            // assignIndex(module)
+            // assignDepth(module)
+            // processDependenciesBlocksForChunkGroups(inputChunkGroups)
+            // removeReasonsOfDependencyBlock(module, block)
+            // patchChunksAfterReasonRemoval(module, chunk)
+            // removeChunkFromDependencies(block, chunk)
+            // applyModuleIds()
+            // applyChunkIds()
+            // sortItemsWithModuleIds()
+            // sortItemsWithChunkIds()
+            // summarizeDependencies()
+            // createHash()
+            // modifyHash(update)
+            // createModuleAssets()
+            // createChunkAssets()
+            getPath(filename: string, data: {hash?: any, chunk?: any, filename?: string, basename?: string, query?: any}): string;
+            // createChildCompiler(name, outputOptions, plugins)
+            // checkConstraints()
+
+            /**
+             * @deprecated Compilation.applyPlugins is deprecated. Use new API on `.hooks` instead
+             */
+            applyPlugins(name: string, ...args: any[]): void;
+        }
+
+        interface CompilerHooks {
+            shouldEmit: SyncBailHook<Compilation>;
+            done: AsyncSeriesHook<Stats>;
+            additionalPass: AsyncSeriesHook;
+            beforeRun: AsyncSeriesHook<Compilation>;
+            run: AsyncSeriesHook<Compilation>;
+            emit: AsyncSeriesHook<Compilation>;
+            afterEmit: AsyncSeriesHook<Compilation>;
+            thisCompilation: SyncHook<Compilation, { normalModuleFactory: NormalModuleFactory }>;
+            compilation: SyncHook<Compilation, { normalModuleFactory: NormalModuleFactory }>;
+            normalModuleFactory: SyncHook<NormalModuleFactory>;
+            contextModuleFactory: SyncHook<ContextModuleFactory>;
+            beforeCompile: AsyncSeriesHook<{}>;
+            compile: SyncHook<{}>;
+            make: AsyncParallelHook<Compilation>;
+            afterCompile: AsyncSeriesHook<Compilation>;
+            watchRun: AsyncSeriesHook<Compiler>;
+            failed: SyncHook<Error>;
+            invalid: SyncHook<string, Date>;
+            watchClose: SyncHook;
+            environment: SyncHook;
+            afterEnvironment: SyncHook;
+            afterPlugins: SyncHook<Compiler>;
+            afterResolvers: SyncHook<Compiler>;
+            entryOption: SyncBailHook;
+        }
     }
-
-    class Dependency {
-        constructor();
-        getResourceIdentifier(): any;
-        getReference(): any;
-        getExports(): any;
-        getWarnings(): any;
-        getErrors(): any;
-        updateHash(hash: any): void;
-        disconnect(): void;
-        static compare(a: any, b: any): any;
-    }
-
-    interface NormalModuleFactoryHooks {
-        resolver: SyncWaterfallHook;
-        factory: SyncWaterfallHook;
-        beforeResolve: AsyncSeriesWaterfallHook;
-        afterResolve: AsyncSeriesWaterfallHook;
-        createModule: SyncBailHook;
-        module: SyncWaterfallHook;
-        createParser: HookMap;
-        parser: HookMap;
-        createGenerator: HookMap;
-        generator: HookMap;
-    }
-
-    class NormalModuleFactory extends Tapable {
-        hooks: NormalModuleFactoryHooks;
-    }
-
-    interface ContextModuleFactoryHooks {
-        beforeResolve: AsyncSeriesWaterfallHook;
-        afterResolve: AsyncSeriesWaterfallHook;
-        contextModuleFiles: SyncWaterfallHook;
-        alternatives: AsyncSeriesWaterfallHook;
-    }
-
-    class ContextModuleFactory extends Tapable {
-        hooks: ContextModuleFactoryHooks;
-    }
-
-    class DllModuleFactory extends Tapable {
-        hooks: {};
-    }
-
-    interface CompilationHooks {
-        buildModule: SyncHook;
-        rebuildModule: SyncHook;
-        failedModule: SyncHook;
-        succeedModule: SyncHook;
-
-        finishModules: SyncHook;
-        finishRebuildingModule: SyncHook;
-
-        unseal: SyncHook;
-        seal: SyncHook;
-
-        optimizeDependenciesBasic: SyncBailHook;
-        optimizeDependencies: SyncBailHook;
-        optimizeDependenciesAdvanced: SyncBailHook;
-        afterOptimizeDependencies: SyncHook;
-
-        optimize: SyncHook;
-
-        optimizeModulesBasic: SyncBailHook;
-        optimizeModules: SyncBailHook;
-        optimizeModulesAdvanced: SyncBailHook;
-        afterOptimizeModules: SyncHook;
-
-        optimizeChunksBasic: SyncBailHook;
-        optimizeChunks: SyncBailHook;
-        optimizeChunksAdvanced: SyncBailHook;
-        afterOptimizeChunks: SyncHook;
-
-        optimizeTree: AsyncSeriesHook;
-        afterOptimizeTree: SyncHook;
-
-        optimizeChunkModulesBasic: SyncBailHook;
-        optimizeChunkModules: SyncBailHook;
-        optimizeChunkModulesAdvanced: SyncBailHook;
-        afterOptimizeChunkModules: SyncHook;
-        shouldRecord: SyncBailHook;
-
-        reviveModules: SyncHook;
-        optimizeModuleOrder: SyncHook;
-        advancedOptimizeModuleOrder: SyncHook;
-        beforeModuleIds: SyncHook;
-        moduleIds: SyncHook;
-        optimizeModuleIds: SyncHook;
-        afterOptimizeModuleIds: SyncHook;
-
-        reviveChunks: SyncHook;
-        optimizeChunkOrder: SyncHook;
-        beforeChunkIds: SyncHook;
-        optimizeChunkIds: SyncHook;
-        afterOptimizeChunkIds: SyncHook;
-
-        recordModules: SyncHook;
-        recordChunks: SyncHook;
-
-        beforeHash: SyncHook;
-        afterHash: SyncHook;
-
-        recordHash: SyncHook;
-
-        record: SyncHook;
-
-        beforeModuleAssets: SyncHook;
-        shouldGenerateChunkAssets: SyncBailHook;
-        beforeChunkAssets: SyncHook;
-        additionalChunkAssets: SyncHook;
-
-        records: SyncHook;
-
-        additionalAssets: AsyncSeriesHook;
-        optimizeChunkAssets: AsyncSeriesHook<Chunk[]>;
-        afterOptimizeChunkAssets: SyncHook;
-        optimizeAssets: AsyncSeriesHook;
-        afterOptimizeAssets: SyncHook;
-
-        needAdditionalSeal: SyncBailHook;
-        afterSeal: AsyncSeriesHook;
-
-        chunkHash: SyncHook;
-        moduleAsset: SyncHook;
-        chunkAsset: SyncHook;
-
-        assetPath: SyncWaterfallHook;
-
-        needAdditionalPass: SyncBailHook;
-        childCompiler: SyncHook;
-
-        normalModuleLoader: SyncHook;
-
-        optimizeExtractedChunksBasic: SyncBailHook;
-        optimizeExtractedChunks: SyncBailHook;
-        optimizeExtractedChunksAdvanced: SyncBailHook;
-        afterOptimizeExtractedChunks: SyncHook;
-    }
-
-    interface CompilationModule {
-        module: any;
-        issuer: boolean;
-        build: boolean;
-        dependencies: boolean;
-    }
-
-    class MainTemplate extends Tapable {}
-    class ChunkTemplate extends Tapable {}
-    class HotUpdateChunkTemplate extends Tapable {}
-    class RuntimeTemplate {}
-
-    interface ModuleTemplateHooks {
-        content: SyncWaterfallHook;
-        module: SyncWaterfallHook;
-        render: SyncWaterfallHook;
-        package: SyncWaterfallHook;
-        hash: SyncHook;
-    }
-
-    class ModuleTemplate extends Tapable {
-        hooks: ModuleTemplateHooks;
-    }
-
-    class Compilation extends Tapable {
-        hooks: CompilationHooks;
-        compiler: Compiler;
-
-        resolverFactory: any;
-		inputFileSystem: any;
-		requestShortener: any;
-
-		outputOptions: any;
-		bail: any;
-		profile: any;
-		performance: any;
-
-		mainTemplate: MainTemplate;
-		chunkTemplate: ChunkTemplate;
-		hotUpdateChunkTemplate: HotUpdateChunkTemplate;
-        runtimeTemplate: RuntimeTemplate;
-		moduleTemplates: {
-			javascript: ModuleTemplate;
-            webassembly: ModuleTemplate;
-        };
-
-        entries: any[];
-        _preparedEntrypoints: any[];
-        entrypoints: Map<any, any>;
-        chunks: any[];
-        chunkGroups: any[];
-        namedChunkGroups: Map<any, any>;
-        namedChunks: Map<any, any>;
-        modules: any[];
-        _modules: Map<any, any>;
-        cache: any;
-        records: any;
-        nextFreeModuleIndex: any;
-        nextFreeModuleIndex2: any;
-        additionalChunkAssets: any[];
-        assets: any;
-        errors: any[];
-        warnings: any[];
-        children: any[];
-        dependencyFactories: Map<typeof Dependency, Tapable>;
-        dependencyTemplates: Map<typeof Dependency, Tapable>;
-        childrenCounters: any;
-        usedChunkIds: any;
-        usedModuleIds: any;
-        getStats(): Stats;
-        addModule(module: CompilationModule, cacheGroup: any): any;
-        // getModule(module)
-        // findModule(identifier)
-        // waitForBuildingFinished(module, callback)
-        // buildModule(module, optional, origin, dependencies, thisCallback)
-        // processModuleDependencies(module, callback)
-        // addModuleDependencies(module, dependencies, bail, cacheGroup, recursive, callback)
-        // tslint:disable-next-line:ban-types
-        addEntry(context: any, entry: any, name: any, callback: Function): void;
-        // prefetch(context, dependency, callback)
-        // rebuildModule(module, thisCallback)
-        // finish()
-        // unseal()
-        // seal(callback)
-        // sortModules(modules)
-        // reportDependencyErrorsAndWarnings(module, blocks)
-        // addChunkInGroup(name, module, loc, request)
-        // addChunk(name)
-        // assignIndex(module)
-        // assignDepth(module)
-        // processDependenciesBlocksForChunkGroups(inputChunkGroups)
-        // removeReasonsOfDependencyBlock(module, block)
-        // patchChunksAfterReasonRemoval(module, chunk)
-        // removeChunkFromDependencies(block, chunk)
-        // applyModuleIds()
-        // applyChunkIds()
-        // sortItemsWithModuleIds()
-        // sortItemsWithChunkIds()
-        // summarizeDependencies()
-        // createHash()
-        // modifyHash(update)
-        // createModuleAssets()
-        // createChunkAssets()
-        getPath(filename: string, data: {hash?: any, chunk?: any, filename?: string, basename?: string, query?: any}): string;
-        // createChildCompiler(name, outputOptions, plugins)
-        // checkConstraints()
-
-        /**
-         * @deprecated Compilation.applyPlugins is deprecated. Use new API on `.hooks` instead
-         */
-        applyPlugins(name: string, ...args: any[]): void;
-    }
-
     // tslint:disable-next-line:interface-name
     interface ICompiler {
         run(handler: ICompiler.Handler): void;
@@ -943,38 +985,11 @@ declare namespace webpack {
         invalidate(): void;
     }
 
-    interface CompilerHooks {
-        shouldEmit: SyncBailHook;
-        done: AsyncSeriesHook;
-        additionalPass: AsyncSeriesHook;
-        beforeRun: AsyncSeriesHook;
-        run: AsyncSeriesHook;
-        emit: AsyncSeriesHook;
-        afterEmit: AsyncSeriesHook;
-        thisCompilation: SyncHook;
-        compilation: SyncHook<Compilation>;
-        normalModuleFactory: SyncHook<NormalModuleFactory>;
-        contextModuleFactory: SyncHook<ContextModuleFactory>;
-        beforeCompile: AsyncSeriesHook;
-        compile: SyncHook;
-        make: AsyncParallelHook;
-        afterCompile: AsyncSeriesHook;
-        watchRun: AsyncSeriesHook;
-        failed: SyncHook;
-        invalid: SyncHook;
-        watchClose: SyncHook;
-        environment: SyncHook;
-        afterEnvironment: SyncHook;
-        afterPlugins: SyncHook;
-        afterResolvers: SyncHook;
-        entryOption: SyncBailHook;
-    }
-
     class Compiler extends Tapable implements ICompiler {
         constructor();
 
-        hooks: CompilerHooks;
-        _pluginCompat: SyncBailHook<Compilation>;
+        hooks: compilation.CompilerHooks;
+        _pluginCompat: SyncBailHook<compilation.Compilation>;
 
         name: string;
         options: Configuration;
diff --git a/types/webpack/webpack-tests.ts b/types/webpack/webpack-tests.ts
index a49541f796..d6bd908357 100644
--- a/types/webpack/webpack-tests.ts
+++ b/types/webpack/webpack-tests.ts
@@ -582,14 +582,14 @@ configuration = {
 
 plugin = new webpack.SplitChunksPlugin({ chunks: "async", minChunks: 2 });
 
-class SingleEntryDependency extends webpack.Dependency {}
-class MultiEntryDependency extends webpack.Dependency {}
+class SingleEntryDependency extends webpack.compilation.Dependency {}
+class MultiEntryDependency extends webpack.compilation.Dependency {}
 class MultiModuleFactory extends Tapable {}
 class MultiEntryPlugin extends webpack.Plugin {
     apply(compiler: webpack.Compiler) {
         compiler.hooks.compilation.tap(
             "MultiEntryPlugin",
-            (compilation, { normalModuleFactor }) => {
+            (compilation, { normalModuleFactory }) => {
                 compilation.dependencyFactories.set(MultiEntryDependency, new MultiModuleFactory());
             }
         );
@@ -617,7 +617,7 @@ class IgnorePlugin extends webpack.Plugin {
     }
 }
 
-class DllEntryDependency extends webpack.Dependency {}
+class DllEntryDependency extends webpack.compilation.Dependency {}
 class DllModuleFactory extends Tapable {}
 class DllEntryPlugin extends webpack.Plugin {
 	apply(compiler: webpack.Compiler) {

From 7cfa54ab5b6f1b646e77aec0f843de5fcd297492 Mon Sep 17 00:00:00 2001
From: Robert Imig <rimig@palantir.com>
Date: Tue, 6 Mar 2018 21:37:01 -0500
Subject: [PATCH 0311/1382] Add types for react-map-gl

---
 types/react-map-gl/index.d.ts             | 258 ++++++++++++++++++++++
 types/react-map-gl/react-map-gl-tests.tsx | 122 ++++++++++
 types/react-map-gl/tsconfig.json          |  24 ++
 types/react-map-gl/tslint.json            |   1 +
 4 files changed, 405 insertions(+)
 create mode 100644 types/react-map-gl/index.d.ts
 create mode 100644 types/react-map-gl/react-map-gl-tests.tsx
 create mode 100644 types/react-map-gl/tsconfig.json
 create mode 100644 types/react-map-gl/tslint.json

diff --git a/types/react-map-gl/index.d.ts b/types/react-map-gl/index.d.ts
new file mode 100644
index 0000000000..2efb70caee
--- /dev/null
+++ b/types/react-map-gl/index.d.ts
@@ -0,0 +1,258 @@
+// Type definitions for react-map-gl 3.2
+// Project: https://github.com/uber/react-map-gl#readme
+// Definitions by: Robert Imig <https://github.com/rimig>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as React from "react";
+import * as MapboxGL from "mapbox-gl";
+import * as GeoJSON from "geojson";
+
+export interface IViewport {
+    bearing: number;
+    isDragging: boolean;
+    latitude: number;
+    longitude: number;
+    pitch?: number;
+    startBearing?: number;
+    startDragLngLat?: number[];
+    startPitch?: number;
+    zoom: number;
+}
+
+export interface IStaticMapProps {
+    /** Mapbox API access token for MapboxGL.
+     *  Required when using Mapbox vector tiles/styles Mapbox WebGL context creation option.
+     *  Useful when you want to export the canvas as a PNG
+     */
+    mapboxApiAccessToken: string;
+
+    /** The Mapbox style. A string url or a MapboxGL style object (regular JS object or Immutable.Map). */
+    mapStyle?: string; // TODO can also be immutable map
+
+    /** The width of the map. */
+    width: number;
+    /** The height of the map. */
+    height: number;
+    /** The latitude of the center of the map. */
+
+    latitude: number;
+    /** The longitude of the center of the map. */
+    longitude: number;
+    /** The tile zoom level of the map. Bounded implicitly by default minZoom and maxZoom of MapboxGL. */
+
+    zoom: number;
+    /** Specify the bearing of the viewport */
+    bearing?: number;
+    /** Specify the pitch of the viewport */
+    pitch?: number;
+    /** Altitude of the viewport camera. Default 1.5 "screen heights" */
+    altitude?: number; // Note: Non-public API, see https://github.com/mapbox/mapbox-gl-js/issues/1137
+
+    /**
+     *  Whether the map is visible.
+     *  Unmounting and re-mounting a Mapbox instance is known to be costly.
+     *  This option offers a way to hide a map using CSS style.
+     */
+    visible?: boolean;
+
+    /**
+     * Equivalent to Mapbox's preserveDrawingBuffer option.
+     * If true, the map's canvas can be exported to a PNG using map.getCanvas().toDataURL().
+     */
+    preserveDrawingBuffer?: boolean;
+
+    /** Show attribution control or not. */
+    attributionControl?: boolean;
+
+    /**
+     * If mapStyle is assigned an Immutable object, when the prop changes, StaticMap can diff between the two values and call the appropriate Mapbox API such as addLayer, removeLayer, setStyle, setData, etc.
+     * This allows apps to update data sources and layer styles efficiently.
+     * In use cases such as animation or dynamic showing/hiding layers, style diffing prevents the map from reloading and flickering when the map style changes.
+     * There are known issues with style diffing. As stopgap, use this option to prevent style diffing.
+     */
+    preventStyleDiffing?: boolean;
+
+    /**
+     * This prop is experimental.
+     * If true, when the map component is unmounted, instead of calling remove on the Mapbox map instance, save it for later reuse.
+     * This will avoid repeatedly creating new Mapbox map instances if possible.
+     * Applications that frequently mount and unmount maps may try this prop to help work around a mapbox-gl resource leak issue that can lead to a browser crash in certain situations.
+     */
+    resuseMaps?: boolean;
+
+    /**
+     * A callback run when the map emits a load event.
+     */
+    onLoad?: () => void;
+
+    /**
+     * A callback run when the map emits an error event.
+     */
+    onError?: () => void;
+}
+
+export class StaticMap extends React.Component<IStaticMapProps, {}> {
+    /**
+     * Returns the Mapbox instance if initialized. The Map instance will have full access to MapboxGL's API.
+     */
+    public getMap(): MapboxGL.Map;
+
+    /**
+     * Use Mapbox's queryRenderedFeatures API to find features at point or in a bounding box. If the parameters argument is not specified, only queries the layers with the interactive property in the layer style.
+     * @param geometry: {[Number, Number| [[Number, Number, [Number, Number``` Point or an array of two points defining the bounding box. Coordinates in pixels.
+     * @param parameters: Query options. For more details, see Mapbox API documentation.
+     */
+    public queryRenderedFeatures(geometry?: MapboxGL.PointLike | MapboxGL.PointLike[], parameters?: { layers?: string[], filter?: any[] }): GeoJSON.Feature<GeoJSON.GeometryObject>[];
+}
+
+export interface IInteractiveMapProps extends IStaticMapProps {
+    /** Max zoom level */
+    maxZoom?: number;
+    /** Min zoom level */
+    minZoom?: number;
+    /** Max pitch in degrees */
+    maxPitch?: number;
+    /** Min pitch in degrees */
+    minPitch?: number;
+
+    /** Scroll to zoom */
+    scrollZoom?: boolean;
+    /** Drag to pan */
+    dragPan?: boolean;
+    /** Drag to rotate */
+    dragRotate?: boolean;
+    /** Double click to zoom */
+    doubleClickZoom?: boolean;
+    /** Enable multitouch zoom. */
+    touchZoom?: boolean;
+    /** Enable multitouch rotate. */
+    touchRotate?: boolean;
+    /** Radius to detect features around a clicked point */
+    clickRadius?: number
+
+    /**
+     * Callback that is fired when the user interacted with the map. 
+     * @callback
+     * @param {IViewport} viewport
+     * The object passed to the callback contains viewport properties such as longitude, latitude, zoom etc.
+     * 
+     * If the map is intended to be interactive, the app use this prop to listen to map updates and update the props accordingly.
+     */
+    onViewportChange?: (viewport: IViewport) => void;
+
+    /**
+     * Called when the map is hovered over.
+     * @callback
+     * @param {Object} event - The mouse event.
+     * @param {[number, number]} lngLat - The coordinates of the pointer
+     * @param {Array} features - The features under the pointer, using Mapbox's
+     * queryRenderedFeatures API:
+     * https://www.mapbox.com/mapbox-gl-js/api/#Map#queryRenderedFeatures
+     * To make a layer interactive, set the `interactive` property in the
+     * layer style to `true`. See Mapbox's style spec
+     * https://www.mapbox.com/mapbox-gl-style-spec/#layer-interactive
+     */
+    onHover?: (event: any, lngLat: number[], features: any) => void;
+
+    /**
+     * Called when the map is clicked.
+     * @callback
+     * @param {Object} event - The mouse event.
+     * @param {[number, number]} lngLat - The coordinates of the pointer
+     * @param {Array} features - The features under the pointer, using Mapbox's
+     * queryRenderedFeatures API:
+     * https://www.mapbox.com/mapbox-gl-js/api/#Map#queryRenderedFeatures
+     * To make a layer interactive, set the `interactive` property in the
+     * layer style to `true`. See Mapbox's style spec
+     * https://www.mapbox.com/mapbox-gl-style-spec/#layer-interactive
+     */
+    onClick?: (event: any, lngLat: number[], features: any) => void;
+
+    /** Accessor that returns a cursor style to show interactive state */
+    getCursor?: () => any;
+}
+
+export class InteractiveMap extends React.Component<IInteractiveMapProps, {}> {
+    public _map: MapboxGL.Map;
+
+    /** Returns the Mapbox Map Instance */
+    public getMap(): MapboxGL.Map;
+}
+
+/**
+ * 
+ * React Map Overlays
+ * 
+ */
+
+export interface IBaseControlProps {
+    /** Event handling */
+    captureScroll?: boolean;
+    /** Stop map pan & rotate */
+    captureDrag?: boolean;
+    /** Stop map click */
+    captureClick?: boolean;
+    /** Stop map double click */
+    captureDoubleClick?: boolean;
+}
+
+export class BaseControl<T extends IBaseControlProps> extends React.Component<T, {}> { }
+
+/**
+ * Allows applications to overlay data on top of maps using a HTML container.
+ */
+export class HTMLOverlay extends BaseControl<IHTMLOverlayProps> { }
+
+export interface IHTMLRedrawOptions {
+    /** width {Number} - width of the viewport */
+    width: number;
+    /** height {Number} - height of the viewport */
+    height: number;
+    /** project {Function} - get screen position [x, y] from geo coordinates [lng, lat] */
+    project: (lnglat: number[]) => number[];
+    /** unproject {Function} - get geo coordinates [lng, lat] from screen position [x, y] */
+    unproject: (xy: number[]) => number[];
+}
+
+export interface IHTMLOverlayProps extends IBaseControlProps {
+    /**
+     * Called every time the map updates.
+     */
+    redraw: (opts: IHTMLRedrawOptions) => void;
+    /** Additional css styles of the div container. */
+    style?: React.CSSProperties;
+}
+
+/**
+ * Allows applications to overlay data on top of maps using a canvas.
+ */
+export class CanvasOverlay extends BaseControl<ICanvasOverlayProps> { }
+
+export interface ICanvasRedrawOptions extends IHTMLRedrawOptions {
+    /** ctx {CanvasRenderingContext2D} - rendering context of the canvas */
+    ctx: CanvasRenderingContext2D;
+}
+
+export interface ICanvasOverlayProps extends IBaseControlProps {
+    /**
+     * Called every time the map updates.
+     */
+    redraw: (opts: ICanvasRedrawOptions) => void;
+}
+
+/**
+ * Allows applications to overlay data on top of maps using a SVG container.
+ */
+export class SVGOverlay extends BaseControl<ISVGOverlayProps> { }
+
+export interface ISVGRedrawOptions extends IHTMLRedrawOptions { }
+
+export interface ISVGOverlayProps extends IBaseControlProps {
+    /**
+     * Called every time the map updates.
+     */
+    redraw: (opts: ISVGRedrawOptions) => void;
+    /** Additional css styles of the svg container. */
+    style?: React.CSSProperties;
+}
+
diff --git a/types/react-map-gl/react-map-gl-tests.tsx b/types/react-map-gl/react-map-gl-tests.tsx
new file mode 100644
index 0000000000..b214a0d2d8
--- /dev/null
+++ b/types/react-map-gl/react-map-gl-tests.tsx
@@ -0,0 +1,122 @@
+import * as React from "react";
+import { 
+    IViewport,
+    IStaticMapProps,
+    IInteractiveMapProps, 
+    InteractiveMap,
+    CanvasOverlay,
+    SVGOverlay,
+    HTMLOverlay,
+    IHTMLOverlayProps,
+    ICanvasRedrawOptions,
+    IHTMLRedrawOptions,
+    ISVGOverlayProps,
+    ISVGRedrawOptions,
+    StaticMap
+} from 'react-map-gl';
+import * as MapboxGL from "mapbox-gl";
+
+interface MyMapState {
+    viewport: IViewport; 
+}
+
+class MyMap extends React.Component<{}, MyMapState> {
+    public state: MyMapState = {
+        viewport: {
+            bearing: 0,
+            isDragging: false,
+            latitude: 0,
+            longitude: 0,
+            zoom: 3,
+        }
+    }
+
+    public render() {
+        return (
+            <div>
+                <InteractiveMap
+                    {...this.state.viewport}
+                    mapboxApiAccessToken="pk.test"
+                    height={400}
+                    width={400}
+                    ref={this.setRefInteractive}
+                >
+                    <CanvasOverlay
+                        redraw={(opts: ICanvasRedrawOptions) => {
+                            const {
+                                ctx,
+                                height,
+                                project,
+                                unproject,
+                                width,
+                            } = opts;
+                            const xy: number[] = unproject(project([20,20]));
+                            ctx.clearRect(0, 0, width, height);
+                        }}
+                    />
+                    <CanvasOverlay
+                        redraw={(opts: ICanvasRedrawOptions) => {}}
+                        captureScroll={true}
+                        captureDrag={true}
+                        captureClick={true}
+                        captureDoubleClick={true}
+                    />
+                    <SVGOverlay
+                        redraw={() => {}}
+                    />
+                    <SVGOverlay
+                        redraw={(opts: ISVGRedrawOptions) => {
+                            const {
+                                height,
+                                project,
+                                unproject,
+                                width,
+                            } = opts;
+                            const xy: number[] = unproject(project([20,20]));
+                        }}
+                        captureScroll={true}
+                        captureDrag={true}
+                        captureClick={true}
+                        captureDoubleClick={true}
+                    />
+                    <HTMLOverlay
+                        redraw={() => {}}
+                    />
+                    <HTMLOverlay
+                        redraw={(opts: IHTMLRedrawOptions) => {
+                            const {
+                                height,
+                                project,
+                                unproject,
+                                width,
+                            } = opts;
+                            const xy: number[] = unproject(project([20,20]));
+                        }}
+                        style={{
+                            border: "2px solid black"
+                        }}
+                        captureScroll={true}
+                        captureDrag={true}
+                        captureClick={true}
+                        captureDoubleClick={true}
+                    />
+                </InteractiveMap>
+                <StaticMap
+                    {...this.state.viewport}
+                    mapboxApiAccessToken="pk.test"
+                    height={400}
+                    width={400}
+                    ref={this.setRefStatic}
+                />
+            </div>
+        )
+    }
+
+    private setRefInteractive = (el: InteractiveMap) => {
+        const map: MapboxGL.Map = el.getMap();
+    }
+
+    private setRefStatic = (el: StaticMap) => {
+        const map: MapboxGL.Map = el.getMap();
+    }
+}
diff --git a/types/react-map-gl/tsconfig.json b/types/react-map-gl/tsconfig.json
new file mode 100644
index 0000000000..31220d322c
--- /dev/null
+++ b/types/react-map-gl/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "jsx": "react",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-map-gl-tests.tsx"
+    ]
+}
diff --git a/types/react-map-gl/tslint.json b/types/react-map-gl/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-map-gl/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From b34c9e5511005de486112cf0b4d077f85c7973fb Mon Sep 17 00:00:00 2001
From: Robert Imig <rimig@palantir.com>
Date: Tue, 6 Mar 2018 22:12:46 -0500
Subject: [PATCH 0312/1382] fix lint issues

---
 types/react-map-gl/index.d.ts             | 91 +++++++++++------------
 types/react-map-gl/react-map-gl-tests.tsx | 52 ++++++-------
 types/react-map-gl/tsconfig.json          |  1 +
 3 files changed, 73 insertions(+), 71 deletions(-)

diff --git a/types/react-map-gl/index.d.ts b/types/react-map-gl/index.d.ts
index 2efb70caee..9a7e069bf9 100644
--- a/types/react-map-gl/index.d.ts
+++ b/types/react-map-gl/index.d.ts
@@ -2,12 +2,13 @@
 // Project: https://github.com/uber/react-map-gl#readme
 // Definitions by: Robert Imig <https://github.com/rimig>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import * as React from "react";
 import * as MapboxGL from "mapbox-gl";
 import * as GeoJSON from "geojson";
 
-export interface IViewport {
+export interface Viewport {
     bearing: number;
     isDragging: boolean;
     latitude: number;
@@ -19,8 +20,9 @@ export interface IViewport {
     zoom: number;
 }
 
-export interface IStaticMapProps {
-    /** Mapbox API access token for MapboxGL.
+export interface StaticMapProps {
+    /**
+     *  Mapbox API access token for MapboxGL.
      *  Required when using Mapbox vector tiles/styles Mapbox WebGL context creation option.
      *  Useful when you want to export the canvas as a PNG
      */
@@ -65,9 +67,14 @@ export interface IStaticMapProps {
     attributionControl?: boolean;
 
     /**
-     * If mapStyle is assigned an Immutable object, when the prop changes, StaticMap can diff between the two values and call the appropriate Mapbox API such as addLayer, removeLayer, setStyle, setData, etc.
+     * If mapStyle is assigned an Immutable object, when the prop changes,
+     * StaticMap can diff between the two values and call the appropriate Mapbox API such as
+     * addLayer, removeLayer, setStyle, setData, etc.
+     *
      * This allows apps to update data sources and layer styles efficiently.
-     * In use cases such as animation or dynamic showing/hiding layers, style diffing prevents the map from reloading and flickering when the map style changes.
+     * In use cases such as animation or dynamic showing/hiding layers, style diffing prevents the map
+     * from reloading and flickering when the map style changes.
+     *
      * There are known issues with style diffing. As stopgap, use this option to prevent style diffing.
      */
     preventStyleDiffing?: boolean;
@@ -91,21 +98,20 @@ export interface IStaticMapProps {
     onError?: () => void;
 }
 
-export class StaticMap extends React.Component<IStaticMapProps, {}> {
+export class StaticMap extends React.Component<StaticMapProps> {
     /**
      * Returns the Mapbox instance if initialized. The Map instance will have full access to MapboxGL's API.
      */
-    public getMap(): MapboxGL.Map;
+    getMap(): MapboxGL.Map;
 
     /**
-     * Use Mapbox's queryRenderedFeatures API to find features at point or in a bounding box. If the parameters argument is not specified, only queries the layers with the interactive property in the layer style.
-     * @param geometry: {[Number, Number| [[Number, Number, [Number, Number``` Point or an array of two points defining the bounding box. Coordinates in pixels.
-     * @param parameters: Query options. For more details, see Mapbox API documentation.
+     * Use Mapbox's queryRenderedFeatures API to find features at point or in a bounding box.
+     * If the parameters argument is not specified, only queries the layers with the interactive property in the layer style.
      */
-    public queryRenderedFeatures(geometry?: MapboxGL.PointLike | MapboxGL.PointLike[], parameters?: { layers?: string[], filter?: any[] }): GeoJSON.Feature<GeoJSON.GeometryObject>[];
+    queryRenderedFeatures(geometry?: MapboxGL.PointLike | MapboxGL.PointLike[], parameters?: { layers?: string[], filter?: any[] }): Array<GeoJSON.Feature<GeoJSON.GeometryObject>>;
 }
 
-export interface IInteractiveMapProps extends IStaticMapProps {
+export interface InteractiveMapProps extends StaticMapProps {
     /** Max zoom level */
     maxZoom?: number;
     /** Min zoom level */
@@ -128,24 +134,21 @@ export interface IInteractiveMapProps extends IStaticMapProps {
     /** Enable multitouch rotate. */
     touchRotate?: boolean;
     /** Radius to detect features around a clicked point */
-    clickRadius?: number
+    clickRadius?: number;
 
     /**
-     * Callback that is fired when the user interacted with the map. 
-     * @callback
-     * @param {IViewport} viewport
+     * Callback that is fired when the user interacted with the map.
      * The object passed to the callback contains viewport properties such as longitude, latitude, zoom etc.
-     * 
+     *
      * If the map is intended to be interactive, the app use this prop to listen to map updates and update the props accordingly.
      */
-    onViewportChange?: (viewport: IViewport) => void;
+    onViewportChange?: (viewport: Viewport) => void;
 
     /**
      * Called when the map is hovered over.
-     * @callback
-     * @param {Object} event - The mouse event.
-     * @param {[number, number]} lngLat - The coordinates of the pointer
-     * @param {Array} features - The features under the pointer, using Mapbox's
+     * event - The mouse event.
+     * lngLat - The coordinates of the pointer
+     * features - The features under the pointer, using Mapbox's
      * queryRenderedFeatures API:
      * https://www.mapbox.com/mapbox-gl-js/api/#Map#queryRenderedFeatures
      * To make a layer interactive, set the `interactive` property in the
@@ -156,10 +159,6 @@ export interface IInteractiveMapProps extends IStaticMapProps {
 
     /**
      * Called when the map is clicked.
-     * @callback
-     * @param {Object} event - The mouse event.
-     * @param {[number, number]} lngLat - The coordinates of the pointer
-     * @param {Array} features - The features under the pointer, using Mapbox's
      * queryRenderedFeatures API:
      * https://www.mapbox.com/mapbox-gl-js/api/#Map#queryRenderedFeatures
      * To make a layer interactive, set the `interactive` property in the
@@ -172,20 +171,20 @@ export interface IInteractiveMapProps extends IStaticMapProps {
     getCursor?: () => any;
 }
 
-export class InteractiveMap extends React.Component<IInteractiveMapProps, {}> {
-    public _map: MapboxGL.Map;
+export class InteractiveMap extends React.Component<InteractiveMapProps> {
+    _map: MapboxGL.Map;
 
     /** Returns the Mapbox Map Instance */
-    public getMap(): MapboxGL.Map;
+    getMap(): MapboxGL.Map;
 }
 
 /**
- * 
+ *
  * React Map Overlays
- * 
+ *
  */
 
-export interface IBaseControlProps {
+export interface BaseControlProps {
     /** Event handling */
     captureScroll?: boolean;
     /** Stop map pan & rotate */
@@ -196,14 +195,14 @@ export interface IBaseControlProps {
     captureDoubleClick?: boolean;
 }
 
-export class BaseControl<T extends IBaseControlProps> extends React.Component<T, {}> { }
+export class BaseControl<T extends BaseControlProps> extends React.Component<T> { }
 
 /**
  * Allows applications to overlay data on top of maps using a HTML container.
  */
-export class HTMLOverlay extends BaseControl<IHTMLOverlayProps> { }
+export class HTMLOverlay extends BaseControl<HTMLOverlayProps> { }
 
-export interface IHTMLRedrawOptions {
+export interface HTMLRedrawOptions {
     /** width {Number} - width of the viewport */
     width: number;
     /** height {Number} - height of the viewport */
@@ -214,11 +213,11 @@ export interface IHTMLRedrawOptions {
     unproject: (xy: number[]) => number[];
 }
 
-export interface IHTMLOverlayProps extends IBaseControlProps {
+export interface HTMLOverlayProps extends BaseControlProps {
     /**
      * Called every time the map updates.
      */
-    redraw: (opts: IHTMLRedrawOptions) => void;
+    redraw: (opts: HTMLRedrawOptions) => void;
     /** Additional css styles of the div container. */
     style?: React.CSSProperties;
 }
@@ -226,33 +225,33 @@ export interface IHTMLOverlayProps extends IBaseControlProps {
 /**
  * Allows applications to overlay data on top of maps using a canvas.
  */
-export class CanvasOverlay extends BaseControl<ICanvasOverlayProps> { }
+export class CanvasOverlay extends BaseControl<CanvasOverlayProps> { }
 
-export interface ICanvasRedrawOptions extends IHTMLRedrawOptions {
+export interface CanvasRedrawOptions extends HTMLRedrawOptions {
     /** ctx {CanvasRenderingContext2D} - rendering context of the canvas */
     ctx: CanvasRenderingContext2D;
 }
 
-export interface ICanvasOverlayProps extends IBaseControlProps {
+export interface CanvasOverlayProps extends BaseControlProps {
     /**
      * Called every time the map updates.
      */
-    redraw: (opts: ICanvasRedrawOptions) => void;
+    redraw: (opts: CanvasRedrawOptions) => void;
 }
 
 /**
  * Allows applications to overlay data on top of maps using a SVG container.
  */
-export class SVGOverlay extends BaseControl<ISVGOverlayProps> { }
+export class SVGOverlay extends BaseControl<SVGOverlayProps> { }
 
-export interface ISVGRedrawOptions extends IHTMLRedrawOptions { }
+// tslint:disable-next-line:no-empty-interface
+export interface SVGRedrawOptions extends HTMLRedrawOptions { }
 
-export interface ISVGOverlayProps extends IBaseControlProps {
+export interface SVGOverlayProps extends BaseControlProps {
     /**
      * Called every time the map updates.
      */
-    redraw: (opts: ISVGRedrawOptions) => void;
+    redraw: (opts: SVGRedrawOptions) => void;
     /** Additional css styles of the svg container. */
     style?: React.CSSProperties;
 }
-
diff --git a/types/react-map-gl/react-map-gl-tests.tsx b/types/react-map-gl/react-map-gl-tests.tsx
index b214a0d2d8..2fcb0157a2 100644
--- a/types/react-map-gl/react-map-gl-tests.tsx
+++ b/types/react-map-gl/react-map-gl-tests.tsx
@@ -1,27 +1,27 @@
 import * as React from "react";
-import { 
-    IViewport,
-    IStaticMapProps,
-    IInteractiveMapProps, 
+import {
+    Viewport,
+    StaticMapProps,
+    InteractiveMapProps,
     InteractiveMap,
     CanvasOverlay,
     SVGOverlay,
     HTMLOverlay,
-    IHTMLOverlayProps,
-    ICanvasRedrawOptions,
-    IHTMLRedrawOptions,
-    ISVGOverlayProps,
-    ISVGRedrawOptions,
+    HTMLOverlayProps,
+    CanvasRedrawOptions,
+    HTMLRedrawOptions,
+    SVGOverlayProps,
+    SVGRedrawOptions,
     StaticMap
 } from 'react-map-gl';
 import * as MapboxGL from "mapbox-gl";
 
 interface MyMapState {
-    viewport: IViewport; 
+    viewport: Viewport;
 }
 
 class MyMap extends React.Component<{}, MyMapState> {
-    public state: MyMapState = {
+    state: MyMapState = {
         viewport: {
             bearing: 0,
             isDragging: false,
@@ -29,9 +29,11 @@ class MyMap extends React.Component<{}, MyMapState> {
             longitude: 0,
             zoom: 3,
         }
-    }
+    };
 
-    public render() {
+    private map: MapboxGL.Map;
+
+    render() {
         return (
             <div>
                 <InteractiveMap
@@ -42,7 +44,7 @@ class MyMap extends React.Component<{}, MyMapState> {
                     ref={this.setRefInteractive}
                 >
                     <CanvasOverlay
-                        redraw={(opts: ICanvasRedrawOptions) => {
+                        redraw={(opts: CanvasRedrawOptions) => {
                             const {
                                 ctx,
                                 height,
@@ -50,12 +52,12 @@ class MyMap extends React.Component<{}, MyMapState> {
                                 unproject,
                                 width,
                             } = opts;
-                            const xy: number[] = unproject(project([20,20]));
+                            const xy: number[] = unproject(project([20, 20]));
                             ctx.clearRect(0, 0, width, height);
                         }}
                     />
                     <CanvasOverlay
-                        redraw={(opts: ICanvasRedrawOptions) => {}}
+                        redraw={(opts: CanvasRedrawOptions) => {}}
                         captureScroll={true}
                         captureDrag={true}
                         captureClick={true}
@@ -65,14 +67,14 @@ class MyMap extends React.Component<{}, MyMapState> {
                         redraw={() => {}}
                     />
                     <SVGOverlay
-                        redraw={(opts: ISVGRedrawOptions) => {
+                        redraw={(opts: SVGRedrawOptions) => {
                             const {
                                 height,
                                 project,
                                 unproject,
                                 width,
                             } = opts;
-                            const xy: number[] = unproject(project([20,20]));
+                            const xy: number[] = unproject(project([20, 20]));
                         }}
                         captureScroll={true}
                         captureDrag={true}
@@ -83,14 +85,14 @@ class MyMap extends React.Component<{}, MyMapState> {
                         redraw={() => {}}
                     />
                     <HTMLOverlay
-                        redraw={(opts: IHTMLRedrawOptions) => {
+                        redraw={(opts: HTMLRedrawOptions) => {
                             const {
                                 height,
                                 project,
                                 unproject,
                                 width,
                             } = opts;
-                            const xy: number[] = unproject(project([20,20]));
+                            const xy: number[] = unproject(project([20, 20]));
                         }}
                         style={{
                             border: "2px solid black"
@@ -109,14 +111,14 @@ class MyMap extends React.Component<{}, MyMapState> {
                     ref={this.setRefStatic}
                 />
             </div>
-        )
+        );
     }
 
-    private setRefInteractive = (el: InteractiveMap) => {
-        const map: MapboxGL.Map = el.getMap();
+    private readonly setRefInteractive = (el: InteractiveMap) => {
+        this.map = el.getMap();
     }
 
-    private setRefStatic = (el: StaticMap) => {
-        const map: MapboxGL.Map = el.getMap();
+    private readonly setRefStatic = (el: StaticMap) => {
+        this.map = el.getMap();
     }
 }
diff --git a/types/react-map-gl/tsconfig.json b/types/react-map-gl/tsconfig.json
index 31220d322c..d41854e1c5 100644
--- a/types/react-map-gl/tsconfig.json
+++ b/types/react-map-gl/tsconfig.json
@@ -9,6 +9,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"

From 6a11051b079a464a2e13209494794d7af507c5e1 Mon Sep 17 00:00:00 2001
From: Art <a.molcanovas@gmail.com>
Date: Wed, 7 Mar 2018 09:14:16 +0000
Subject: [PATCH 0313/1382] Update index.d.ts

---
 types/stream-to-promise/index.d.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/types/stream-to-promise/index.d.ts b/types/stream-to-promise/index.d.ts
index 09ca3a5ca3..ee9688ffda 100644
--- a/types/stream-to-promise/index.d.ts
+++ b/types/stream-to-promise/index.d.ts
@@ -18,6 +18,4 @@ declare function streamToPromise(stream: NodeJS.ReadableStream): Promise<Buffer>
  */
 declare function streamToPromise(stream: NodeJS.WritableStream): Promise<void>;
 
-declare namespace streamToPromise {} // Add a namespace so we can do import * instead of import x = require()
-
 export = streamToPromise;

From da58e5fa9612eead8cf2999666db5b55efbdb23b Mon Sep 17 00:00:00 2001
From: Art <a.molcanovas@gmail.com>
Date: Wed, 7 Mar 2018 09:14:41 +0000
Subject: [PATCH 0314/1382] Update stream-to-promise-tests.ts

---
 types/stream-to-promise/stream-to-promise-tests.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/stream-to-promise/stream-to-promise-tests.ts b/types/stream-to-promise/stream-to-promise-tests.ts
index 95ce74b3aa..6ed2ee7b71 100644
--- a/types/stream-to-promise/stream-to-promise-tests.ts
+++ b/types/stream-to-promise/stream-to-promise-tests.ts
@@ -1,4 +1,4 @@
-import * as stp from 'stream-to-promise';
+import stp = require('stream-to-promise');
 import * as fs from 'fs';
 
 const read = fs.createReadStream(__filename);

From 4462b34e0914ea7d8c850e15fdcf1bdbc00b67c3 Mon Sep 17 00:00:00 2001
From: makino <makino@arte-inc.co.jp>
Date: Wed, 7 Mar 2018 19:10:40 +0900
Subject: [PATCH 0315/1382] Added plugins option property to ChartOption

---
 types/chart.js/index.d.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/types/chart.js/index.d.ts b/types/chart.js/index.d.ts
index 338e38e223..45d9ea8c0b 100644
--- a/types/chart.js/index.d.ts
+++ b/types/chart.js/index.d.ts
@@ -198,6 +198,8 @@ declare namespace Chart {
         cutoutPercentage?: number;
         circumference?: number;
         rotation?: number;
+        // Plugins can require any options
+        plugins?: any;
     }
 
     interface ChartFontOptions {

From 4ae28a2adec9370c18384b22a9cdeec1fa31e23f Mon Sep 17 00:00:00 2001
From: Bernd Hacker <hacker.bernd@gmail.com>
Date: Wed, 7 Mar 2018 11:32:27 +0100
Subject: [PATCH 0316/1382] add types for H.geo.LineString

---
 types/heremaps/index.d.ts | 139 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 139 insertions(+)

diff --git a/types/heremaps/index.d.ts b/types/heremaps/index.d.ts
index 8b68f11278..dc3e51427f 100644
--- a/types/heremaps/index.d.ts
+++ b/types/heremaps/index.d.ts
@@ -812,6 +812,145 @@ declare namespace H {
          */
         type Longitude = number;
 
+        class LineString {
+            /**
+             * Constructor
+             * @param opt_latLngAlts {number[]=} - An optional array of latitude, longitude and altitude triples to initialize the LineString with.
+             * @param opt_ctx {H.geo.AltitudeContext=} - An optional altitude context for all altitudes contained in this LineString.
+             * @throws {H.lang.InvalidArgumentError} - in case of invalid lat, lng, alt values
+             */
+            constructor(opt_latLngAlts?: number[], opt_ctx?: H.geo.AltitudeContext);
+
+            /**
+             * This method pushes a lat, lng, alt to the end of this LineString.
+             * @param lat {H.geo.Latitude}
+             * @param lng {H.geo.Longitude}
+             * @param alt {H.geo.Altitude}
+             * @throws {H.lang.InvalidArgumentError} - in case of invalid lat, lng, alt value
+             */
+            pushLatLngAlt(lat: H.geo.Latitude, lng: H.geo.Longitude, alt: H.geo.Altitude): void;
+
+            /**
+             * This method splices the LineString at the provided index, removing the specified number of items at that index and inserting the lat, lng, alt array.
+             * @param index {number} - The index at which to splice
+             * @param opt_nRemove {number=} - The number of lat, lng, alt values to remove
+             * @param opt_latLngAlts {number[]=} - The lat, lng, alt values to add
+             * @return {number[]} - An array of removed elements
+             * @throws {H.lang.InvalidArgumentError} - in case of invalid opt_latLngAlts argument
+             */
+            spliceLatLngAlts(index: number, opt_nRemove?: number, opt_latLngAlts?: number[]): number[];
+
+            /**
+             * This method inserts one set of lat, lng, alt values into the LineString at the specified index.
+             * @param index {number} - the index at which to add the element
+             * @param lat {H.geo.Latitude} - the latitude to insert
+             * @param lng {H.geo.Longitude} - the longitude to insert
+             * @param alt {H.geo.Altitude} - the altitude to insert
+             */
+            insertLatLngAlt(index: number, lat: H.geo.Latitude, lng: H.geo.Longitude, alt: H.geo.Altitude): void;
+
+            /**
+             * This method removes one set of lat, lng, alt values from the LineString at the specified index
+             * @param index {number}
+             */
+            removeLatLngAlt(index: number): void;
+
+            /**
+             * This method pushes the lat, lng, alt values of a {H.geo.Point} to the end of this LineString.
+             * @param geoPoint {H.geo.IPoint}
+             * @throws {H.lang.InvalidArgumentError} - in case of invalid geoPoint argument
+             */
+            pushPoint(geoPoint: H.geo.IPoint): void;
+
+            /**
+             * This method inserts the lat, lng, alt values of a H.geo.Point into the list at the specified index.
+             * @param pointIndex {number}
+             * @param geoPoint {H.geo.IPoint}
+             */
+            insertPoint(pointIndex: number, geoPoint: H.geo.IPoint): void;
+
+            /**
+             * This method removes one set of lat, lng, alt values from this LineString at the virtual point index specified.
+             * @param pointIndex {number} - the virtual point index
+             */
+            removePoint(pointIndex: number): void;
+
+            /**
+             * This method extracts a H.geo.Point from this LineString at the virtual point index.
+             * If the extracted point has an alt value, the LineString's altitude context will be supplied to the point.
+             * @param pointIndex {number} - the virtual point index in the LineString
+             * @param opt_out {H.geo.Point=} - an optional point object to store the lat, lng, alt values
+             * @return {H.geo.Point} - Returns either the 'opt_out' point object or a new point object.
+             */
+            extractPoint(pointIndex: number, opt_out?: H.geo.Point): H.geo.Point;
+
+            /**
+             * A utility method to iterate over the points of a line string.
+             * @param eachFn {function(lat, lng, alt, index)} - The function to invoke for every point. It gets the point's latitude, longitude, altitude and index as arguments.
+             * @param opt_start {number=} - The point's start index (inclusive) to iterate from, defaults to 0.
+             * @param opt_end {number=} - The point's end index (exclusive) to iterate to, defaults to Infinity.
+             */
+            eachLatLngAlt(eachFn: (lat: H.geo.Latitude, lng: H.geo.Longitude, alt: H.geo.Altitude, index: number) => void, opt_start?: number, opt_end?: number): void;
+
+            /**
+             * To obtain whether a leg (formed by the given two longitudes) crosses the International Date Line.
+             * @param lng1 {H.geo.Longitude} - The start longitude of the leg
+             * @param lng2 {H.geo.Longitude} - The end longitude of the leg
+             * @return {boolean}
+             */
+            static isDBC(lng1: H.geo.Longitude, lng2: H.geo.Longitude): boolean;
+
+            /**
+             * To obtain the number of times that this LineString cross the International Date Line.
+             * @param opt_asClosed {boolean=} - Indicates whether the LineString is treated as closed (the LineString's last and first coordinates form the closing leg of a polygon).
+             * It defaults to false.
+             * @return {number}
+             */
+            getDBCs(opt_asClosed?: boolean): number;
+
+            /**
+             * This method return the number of points stored in this LineString.
+             * @return {number} - The number of points in this LineString
+             */
+            getPointCount(): number;
+
+            /**
+             * Returns the vertices of the line segments as an array of alternating latitude, longitude and altitude coordinates.
+             * The returned array must be treated as read-only to not violate the integrity of the line-string.
+             * @return {number[]} - Returns the raw lat, lng, alt values of this LineString
+             */
+            getLatLngAltArray(): number[];
+
+            /**
+             * This method returns the bounding box of this LineString.
+             * Note: The LineString is treated as an open path. If the bounding rectangle for a closed shape is required, the closing leg must be merged in an extra step.
+             * @return {H.geo.Rect} - This LineString's bounding rectangle
+             */
+            getBounds(): H.geo.Rect;
+
+            /**
+             * This method initializes a new LineString with an array of lat, lng values. Arrays are expected to have an even length with the format [lat, lng, lat, lng, ...].
+             * @param latLngs {number[]} - the array of lat, lng value.
+             * @return {H.geo.LineString} - The LineString containing the lat, lng values
+             * @throws {H.lang.InvalidArgumentError} - throws an error in case the latLngs array has an odd length
+             */
+            static fromLatLngArray(latLngs: number[]): H.geo.LineString;
+
+            /**
+             * Checks whether the geometry is equal to the geometry supplied by the caller.
+             * Two geometries are considered as equal if they represent the same geometry type and have equal coordinate values.
+             * @param other {any} - The geometry to check against
+             * @return {boolean} - true if the two geometries are equal, otherwise false
+             */
+            equals(other: any): boolean;
+
+            /**
+             * To obtain a Well-Known-Text (WKT) representation of the geometry.
+             * @return {string} - the resulting WKT string
+             */
+            toString(): string;
+        }
+
         /**
          * PixelProjection transforms pixel world coordinates at a certain scale (zoom level) to geographical coordinates and vice versa.
          * By default, it uses the Mercator projection to transform geographic points into the 2d plane map points, which are adjusted to the current scale.

From 79610aca3c393f13867fc108d731121294660d50 Mon Sep 17 00:00:00 2001
From: Aluan Haddad <aluanh@gmail.com>
Date: Wed, 7 Mar 2018 04:19:52 -0500
Subject: [PATCH 0317/1382] add Ora.prototype.frameIndex

Adds the `Ora.prototype.frameIndex` member.
https://github.com/sindresorhus/ora/blob/master/index.js#L37

add Ora.prototype.frameIndex
---
 types/ora/index.d.ts    | 2 ++
 types/ora/tsconfig.json | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/types/ora/index.d.ts b/types/ora/index.d.ts
index f5dd605073..d43a01c7cf 100644
--- a/types/ora/index.d.ts
+++ b/types/ora/index.d.ts
@@ -119,6 +119,8 @@ declare class Ora {
     text: string;
 
     color: Color;
+
+    frameIndex: number;
 }
 
 interface oraFactory {
diff --git a/types/ora/tsconfig.json b/types/ora/tsconfig.json
index 4092876efe..d283fa111a 100644
--- a/types/ora/tsconfig.json
+++ b/types/ora/tsconfig.json
@@ -14,10 +14,11 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true
+        "forceConsistentCasingInFileNames": true,
+        "esModuleInterop": true
     },
     "files": [
         "index.d.ts",
         "ora-tests.ts"
     ]
-}
\ No newline at end of file
+}

From bd9c5cf1b7c74ce820611f62c102c672c2e97e35 Mon Sep 17 00:00:00 2001
From: Bernd Hacker <hacker.bernd@gmail.com>
Date: Wed, 7 Mar 2018 12:14:12 +0100
Subject: [PATCH 0318/1382] add tests for H.geo.LineString

---
 types/heremaps/heremaps-tests.ts | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/types/heremaps/heremaps-tests.ts b/types/heremaps/heremaps-tests.ts
index 9e92b92d72..263fd727be 100644
--- a/types/heremaps/heremaps-tests.ts
+++ b/types/heremaps/heremaps-tests.ts
@@ -86,6 +86,19 @@ let polyline = new H.map.Polyline(new H.geo.Strip());
 let clipArr: Array<Array<number>>;
 clipArr = polyline.clip(new H.geo.Rect(5, 5, 5, 5));
 
+let lineString = new H.geo.LineString();
+lineString.pushPoint({ lat: 53.3477, lng: -6.2597 });
+lineString.pushPoint({ lat: 51.5008, lng: -0.1224 });
+lineString.pushPoint({ lat: 48.8567, lng: 2.3508 });
+lineString.pushPoint({ lat: 52.5166, lng: 13.3833 });
+lineString.eachLatLngAlt((lat: number, lng: number, alt: number, i: number) => {
+    console.log(lat, lng, alt, i);
+});
+lineString.getBounds();
+lineString.getPointCount();
+lineString.insertPoint(2, { lat: 53.3477, lng: -6.2597 });
+lineString.removePoint(2);
+
 let router = platform.getRoutingService();
 let calculateRouteParams = {
     waypoint0: 'geo!52.5,13.4',

From f81c6064cabfd50cdf9c7acf10d0e4af49440e5e Mon Sep 17 00:00:00 2001
From: Dado <dado@dadodesign.de>
Date: Wed, 7 Mar 2018 13:00:33 +0100
Subject: [PATCH 0319/1382] Select2 options selectionAdapter and resultsAdapter

---
 types/select2/index.d.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/types/select2/index.d.ts b/types/select2/index.d.ts
index e7a974f92d..51e297a9a8 100644
--- a/types/select2/index.d.ts
+++ b/types/select2/index.d.ts
@@ -92,6 +92,8 @@ interface Select2Options {
     dropdownParent?: JQuery;
     debug?: boolean;
     dropdownAdapter?: any;
+    selectionAdapter?: any;
+    resultsAdapter?: any;
 }
 
 interface Select2JQueryEventObject extends JQueryEventObject {

From 9b0cdc63e624b9e15b38a3184506b207fee6948a Mon Sep 17 00:00:00 2001
From: Artem Nechunaev <bungu@users.noreply.github.com>
Date: Wed, 7 Mar 2018 15:31:20 +0300
Subject: [PATCH 0320/1382] Add inputRef prop definition

---
 types/react-input-mask/index.d.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/types/react-input-mask/index.d.ts b/types/react-input-mask/index.d.ts
index 6ed7660196..2bc3bda94f 100644
--- a/types/react-input-mask/index.d.ts
+++ b/types/react-input-mask/index.d.ts
@@ -36,6 +36,10 @@ declare namespace reactInputMask {
          * Show mask even in empty input without focus.
          */
         alwaysShowMask?: boolean;
+        /**
+         * Use inputRef instead of ref if you need input node to manage focus, selection, etc.
+         */
+        inputRef?: React.Ref<HTMLInputElement>
     }
     class ReactInputMask extends React.Component<ReactInputMaskProps> {
     }

From f15efe5921009e64586ac5a5e6d7d04af503d925 Mon Sep 17 00:00:00 2001
From: Janeene Beeforth <gh@dawnmist.net>
Date: Wed, 7 Mar 2018 23:31:42 +1100
Subject: [PATCH 0321/1382] [@storybook/addon-actions]: Fix faulty
 decoratedAction definition.

The decoratedAction function is supposed to return a function equivalent
to the action function, rather than the return value of running the
action function. The reason that the original tests were passing was
because it is valid typescript to set the onClick handler of a button to
undefined.
---
 types/storybook__addon-actions/index.d.ts      |  2 +-
 .../storybook__addon-actions-tests.tsx         | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/types/storybook__addon-actions/index.d.ts b/types/storybook__addon-actions/index.d.ts
index 9b7009fbad..2d5cc73ef8 100644
--- a/types/storybook__addon-actions/index.d.ts
+++ b/types/storybook__addon-actions/index.d.ts
@@ -7,5 +7,5 @@
 export type HandlerFunction = (...args: any[]) => undefined;
 export type DecoratorFunction = (args: any[]) => any[];
 
-export function decorateAction(decorators: DecoratorFunction[]): HandlerFunction;
+export function decorateAction(decorators: DecoratorFunction[]): (name: string) => HandlerFunction;
 export function action(name: string): HandlerFunction;
diff --git a/types/storybook__addon-actions/storybook__addon-actions-tests.tsx b/types/storybook__addon-actions/storybook__addon-actions-tests.tsx
index 77ba80985b..b9c9bbba7f 100644
--- a/types/storybook__addon-actions/storybook__addon-actions-tests.tsx
+++ b/types/storybook__addon-actions/storybook__addon-actions-tests.tsx
@@ -19,3 +19,21 @@ storiesOf('Button', module)
           Hello World!
         </button>
     ));
+
+interface CustomComponentProps {
+    id: string;
+    setValues(id: string, values: string[]): void;
+}
+class CustomComponent extends React.Component<CustomComponentProps> {
+    setSomeValues = () => {
+        this.props.setValues(this.props.id, ['one', 'two', 'three']);
+    }
+    render() {
+        return <button onClick={this.setSomeValues}>Set some values</button>;
+    }
+}
+
+storiesOf('CustomComponent', module)
+    .add('decorated custom action', () => (
+        <CustomComponent id="test" setValues={firstArgAction('set-values')} />
+    ));

From edf2bd560299c4033cf2e3ff19f75fd0e082655b Mon Sep 17 00:00:00 2001
From: Artem Nechunaev <nechunaev@tutu.ru>
Date: Wed, 7 Mar 2018 15:47:14 +0300
Subject: [PATCH 0322/1382] Add test for inputRef prop

---
 types/react-input-mask/react-input-mask-tests.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/types/react-input-mask/react-input-mask-tests.tsx b/types/react-input-mask/react-input-mask-tests.tsx
index d116b2b27a..a34b15ac99 100644
--- a/types/react-input-mask/react-input-mask-tests.tsx
+++ b/types/react-input-mask/react-input-mask-tests.tsx
@@ -1,10 +1,13 @@
 import ReactInputMask from 'react-input-mask';
 import * as React from 'react';
 
+let ref: HTMLInputElement | null = null;
+
 <div>
     <ReactInputMask mask="+4\9 99 999 99" maskChar={null} />
     <ReactInputMask mask="+7 (999) 999-99-99" />
     <ReactInputMask mask="99-99-9999" defaultValue= "13-00-2017" />
     <ReactInputMask mask="99/99/9999" placeholder= "Enter birthdate" />
     <ReactInputMask mask="+7 (999) 999-99-99" />
+    <ReactInputMask mask="+7 (999) 999-99-99" inputRef={(node) => ref = node} />
 </div>;

From 38998ea10a52e176d72b5055cf81647c167b682d Mon Sep 17 00:00:00 2001
From: Artem Nechunaev <nechunaev@tutu.ru>
Date: Wed, 7 Mar 2018 15:53:35 +0300
Subject: [PATCH 0323/1382] Fix lint errors

---
 types/react-input-mask/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/react-input-mask/index.d.ts b/types/react-input-mask/index.d.ts
index 2bc3bda94f..de3853642f 100644
--- a/types/react-input-mask/index.d.ts
+++ b/types/react-input-mask/index.d.ts
@@ -39,7 +39,7 @@ declare namespace reactInputMask {
         /**
          * Use inputRef instead of ref if you need input node to manage focus, selection, etc.
          */
-        inputRef?: React.Ref<HTMLInputElement>
+        inputRef?: React.Ref<HTMLInputElement>;
     }
     class ReactInputMask extends React.Component<ReactInputMaskProps> {
     }

From 0c038b19a814ef079b86bdc502ebcfd17a74d759 Mon Sep 17 00:00:00 2001
From: Ragg <Ragg-@users.noreply.github.com>
Date: Wed, 7 Mar 2018 22:03:59 +0900
Subject: [PATCH 0324/1382] Fix import statements

---
 types/react-rnd/index.d.ts          | 2 +-
 types/react-rnd/react-rnd-tests.tsx | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/types/react-rnd/index.d.ts b/types/react-rnd/index.d.ts
index e358ceb3d1..9164b409ce 100644
--- a/types/react-rnd/index.d.ts
+++ b/types/react-rnd/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Ragg <https://github.com/Ragg->
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
-import * as React from 'react';
+import React = require('react');
 
 type CSSProperties = React.CSSProperties;
 
diff --git a/types/react-rnd/react-rnd-tests.tsx b/types/react-rnd/react-rnd-tests.tsx
index 46f964603b..ee434117fe 100644
--- a/types/react-rnd/react-rnd-tests.tsx
+++ b/types/react-rnd/react-rnd-tests.tsx
@@ -1,5 +1,5 @@
-import * as React from 'react';
-import * as Rnd from 'react-rnd';
+import React = require('react');
+import Rnd = require('react-rnd');
 
 const onResize: Rnd.ResizeHandler = (e, direction, ref, delta, position) => {
     direction === 'right';

From 3f2825672b7f9ae401ad0a32577dafe007cf4c9b Mon Sep 17 00:00:00 2001
From: Artem Nechunaev <nechunaev@tutu.ru>
Date: Wed, 7 Mar 2018 16:07:06 +0300
Subject: [PATCH 0325/1382] Fix package version

---
 types/react-input-mask/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/react-input-mask/index.d.ts b/types/react-input-mask/index.d.ts
index de3853642f..034c3b4f9d 100644
--- a/types/react-input-mask/index.d.ts
+++ b/types/react-input-mask/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-input-mask 0.7
+// Type definitions for react-input-mask 1.2.2
 // Project: https://github.com/sanniassin/react-input-mask
 // Definitions by: Alexandre Paré <https://github.com/apare>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From bdaeaa47d76ecd5b93e60d3d44747fa93b748b87 Mon Sep 17 00:00:00 2001
From: Bernd Hacker <hacker.bernd@gmail.com>
Date: Wed, 7 Mar 2018 14:19:24 +0100
Subject: [PATCH 0326/1382] add types for H.geo.AbstractGeometry,
 H.geo.MultiGeometry, H.geo.MultiLineString and extend H.geo.Polyline

---
 types/heremaps/heremaps-tests.ts |   2 +
 types/heremaps/index.d.ts        | 384 +++++++++++++++++++++++++++++--
 2 files changed, 372 insertions(+), 14 deletions(-)

diff --git a/types/heremaps/heremaps-tests.ts b/types/heremaps/heremaps-tests.ts
index 263fd727be..40c0e92c5c 100644
--- a/types/heremaps/heremaps-tests.ts
+++ b/types/heremaps/heremaps-tests.ts
@@ -99,6 +99,8 @@ lineString.getPointCount();
 lineString.insertPoint(2, { lat: 53.3477, lng: -6.2597 });
 lineString.removePoint(2);
 
+let polyline2 = new H.map.Polyline(lineString);
+
 let router = platform.getRoutingService();
 let calculateRouteParams = {
     waypoint0: 'geo!52.5,13.4',
diff --git a/types/heremaps/index.d.ts b/types/heremaps/index.d.ts
index dc3e51427f..1fd1f3da29 100644
--- a/types/heremaps/index.d.ts
+++ b/types/heremaps/index.d.ts
@@ -756,6 +756,31 @@ declare namespace H {
 
     /***** geo *****/
     namespace geo {
+        /**
+         * The base class for all geometry types.
+         */
+        class AbstractGeometry {
+            /**
+             * Returns the bounding rectangle of the geometry.
+             * @return {H.geo.Rect} - the bounding rectangle of the geometry or null if the bounding rectangle can't be computed (e.g. for a geometry without coordinates)
+             */
+            getBounds(): H.geo.Rect;
+
+            /**
+             * Checks whether the geometry is equal to the geometry supplied by the caller.
+             * Two geometries are considered as equal if they represent the same geometry type and have equal coordinate values.
+             * @param other {any} - The geometry to check against
+             * @return {boolean} - true if the two geometries are equal, otherwise false
+             */
+            equals(other: any): boolean;
+
+            /**
+             * To obtain a Well-Known-Text (WKT) representation of the geometry.
+             * @return {string} - the resulting WKT string
+             */
+            toString(): string;
+        }
+
         /**
          * A Geographic coordinate that specifies the height of a point in meters. A value of undefined is treated as 0.
          */
@@ -951,6 +976,138 @@ declare namespace H {
             toString(): string;
         }
 
+        class MultiGeometry<T> extends H.geo.AbstractGeometry {
+            /**
+             * The base class for a geometry that is a container for multiple geometries of a generic type. The type of the contained geometries is specified by the generic type parameter T
+             * @param geometries {T[]} - The list of geometries which are initially aggregated.
+             * @throws {H.lang.InvalidArgumentError} - if geometries parameter is not valid
+             */
+            constructor(geometries: T[]);
+
+            /**
+             * This method splices the specified MultiGeometry at the provided index, removing the specified number of items at that index and inserting new items.
+             * @param index {number} - The index at which to start changing the list.
+             * @param opt_deleteCount {number=} - The number of geometries to remove.
+             * @param opt_items {T[]=} - The geometries to add.
+             * @return {T[]} - the removed geometries.
+             */
+            splice(index: number, opt_deleteCount?: number, opt_items?: T[]): T[];
+
+            /**
+             * Removes a contained geometry at the given index.
+             * @param index {number} - The index of the geometry to remove.
+             * @return {T} - the removed geometry.
+             * @throws {H.lang.OutOfRangeError} - if no geometry exists at the given index.
+             */
+            removeAt(index: number): T;
+
+            /**
+             * Removes the specified geometry from the multi-geometry
+             * @param geometry {T} - The geometry (by reference) to remove from this multi-geometry.
+             * @return {T} - the removed geometry or null if the geometry was not found
+             */
+            remove(geometry: T): T;
+
+            /**
+             * Returns the aggregated geometries of the multi-geometry. The returned geometries must be treated as read-only to not violate the integrity of the multi-geometry.
+             * @return {T[]} - An array of geometries
+             */
+            getGeometries(): T[];
+
+            /**
+             * Adds the specified geometry to the current multi-geometry.
+             * @param geometry {T} - A geometry which will be added to the current multi-geometry
+             * @throws {H.lang.InvalidArgumentError} - in case of invalid geometry argument
+             */
+            push(geometry: T): void;
+
+            /**
+             * Returns the bounding rectangle of the geometry.
+             * @return {H.geo.Rect} - the bounding rectangle of the geometry or null if the bounding rectangle can't be computed (e.g. for a geometry without coordinates)
+             */
+            getBounds(): H.geo.Rect;
+
+            /**
+             * Checks whether the geometry is equal to the geometry supplied by the caller.
+             * Two geometries are considered as equal if they represent the same geometry type and have equal coordinate values.
+             * @param other {any} - The geometry to check against
+             * @return {boolean} - true if the two geometries are equal, otherwise false
+             */
+            equals(other: any): boolean;
+
+            /**
+             * To obtain a Well-Known-Text (WKT) representation of the geometry.
+             * @return {string} - the resulting WKT string
+             */
+            toString(): string;
+        }
+
+        class MultiLineString extends H.geo.MultiGeometry<H.geo.LineString> {
+            /**
+             * A MultiLineString is a collection of line strings represented as a H.geo.MultiGeometry with a H.geo.LineString as generic type parameter T.
+             * @param lineStrings {H.geo.LineString[]} - The list of line-strings which are initially represented by the MultiLineString.
+             * @throws {H.lang.InvalidArgumentError} - if the lineStrings argument is not valid
+             */
+            constructor(lineStrings: H.geo.LineString[]);
+
+            /**
+             * This method splices the specified MultiGeometry at the provided index, removing the specified number of items at that index and inserting new items.
+             * @param index {number} - The index at which to start changing the list.
+             * @param opt_deleteCount {number?} - The number of geometries to remove.
+             * @param opt_items {H.geo.LineString[]?} - The geometries to add.
+             * @return {H.geo.LineString[]} - the removed geometries
+             */
+            splice(index: number, opt_deleteCount?: number, opt_items?: H.geo.LineString[]): H.geo.LineString[];
+
+            /**
+             * Removes a contained geometry at the given index.
+             * @param index {number} - The index of the geometry to remove.
+             * @return {H.geo.LineString} - the removed geometry.
+             * @throws {H.lang.OutOfRangeError} - if no geometry exists at the given index.
+             */
+            removeAt(index: number): H.geo.LineString;
+
+            /**
+             * Removes the specified geometry from the multi-geometry
+             * @param geometry {H.geo.LineString} -The geometry (by reference) to remove from this multi-geometry
+             * @return {H.geo.LineString} -the removed geometry or null if the geometry was not found
+             */
+            remove(geometry: H.geo.LineString): H.geo.LineString;
+
+            /**
+             * Returns the aggregated geometries of the multi-geometry. The returned geometries must be treated as read-only to not violate the integrity of the multi-geometry.
+             * @return {H.geo.LineString[]} - An array of geometries
+             */
+            getGeometries(): H.geo.LineString[];
+
+            /**
+             * Adds the specified geometry to the current multi-geometry.
+             * @param geometry {H.geo.LineString} - A geometry which will be added to the current multi-geometry
+             * @throws {H.lang.InvalidArgumentError} - in case of invalid geometry argument
+             */
+            push(geometry: H.geo.LineString): void;
+
+            /**
+             * Returns the bounding rectangle of the geometry.
+             * @return {H.geo.Rect} - the bounding rectangle of the geometry or null if the bounding rectangle can't be computed (e.g. for a geometry without coordinates)
+             */
+            getBounds(): H.geo.Rect;
+
+            /**
+             * Checks whether the geometry is equal to the geometry supplied by the caller.
+             * Two geometries are considered as equal if they represent the same geometry type and have equal coordinate values.
+             * @param other {any} - The geometry to check against
+             * @return {boolean} - true if the two geometries are equal, otherwise false
+             */
+            equals(other: any): boolean;
+
+            /**
+             * To obtain a Well-Known-Text (WKT) representation of the geometry.
+             * @return {string} - the resulting WKT string
+             */
+            toString(): string;
+        }
+
         /**
          * PixelProjection transforms pixel world coordinates at a certain scale (zoom level) to geographical coordinates and vice versa.
          * By default, it uses the Mercator projection to transform geographic points into the 2d plane map points, which are adjusted to the current scale.
@@ -2379,17 +2536,216 @@ declare namespace H {
         class Polyline extends H.map.GeoShape {
           /**
            * Constructor
-           * @param strip {H.geo.Strip} - the strip describing this polygon's vertices
+           * @param geometry {H.geo.Strip | H.geo.LineString | H.geo.MultiLineString} - The geometry that defines the line segments of the polyline
            * @param opt_options {H.map.Polyline.Options=} - optional initialization parameters
            */
-          constructor(strip: H.geo.Strip, opt_options?: H.map.Polyline.Options);
+          constructor(geometry: H.geo.Strip | H.geo.LineString | H.geo.MultiLineString, opt_options?: H.map.Polyline.Options);
 
           /**
-           * This method clips this polyline against a rectangular area and returns the intersecting sub-lines.
-           * @param geoRect {H.geo.Rect}
-           * @returns {Array<Array<number>>}
+           * To set the polyline's geometry. If the given geometry is modified afterwards, it must be set again via setGeometry(geometry) to not violate the integrity of the polyline.
+           * @param geometry {H.geo.LineString | H.geo.MultiLineString} - the geometry to set.
+           * @return {H.map.Polyline} - The polyline instance itself.
+           */
+          setGeometry(geometry: H.geo.LineString | H.geo.MultiLineString): H.map.Polyline;
+
+          /**
+           * To obtain the polyline's geometry. If you modify the obtained geometry, you must call setGeometry(geometry) afterwards to not violate the integrity of the polyline.
+           * @return {H.geo.LineString | H.geo.MultiLineString}
+           */
+          getGeometry(): H.geo.LineString | H.geo.MultiLineString;
+
+          /**
+           * Clips the geometry of the Polyline to a rectangular area
+           * @param geoRect {H.geo.Rect} - The rectangle to clip against.
+           * @returns {Array<Array<number>>} - a list of geometry segments that intersecting the given rectangle.
+           * Each segment is represented as a list of alternating latitude and longitude coordinates that describes a line string.
            */
           clip(geoRect: H.geo.Rect): number[][];
+
+          /**
+           * Returns the geometry.
+           * @deprecated since 3.0.15.0
+           * @return {H.geo.Strip} - spatial object.
+           */
+          getStrip(): H.geo.Strip;
+
+          /**
+           * Sets the geometry.
+           * @deprecated since 3.0.15.0
+           * @param strip {H.geo.Strip} - The strip which represents geometry.
+           * @return {H.map.GeoShape} - The given spatial object
+           */
+          setStrip(strip: H.geo.Strip): H.map.GeoShape;
+
+          /**
+           * Returns the smallest rectangle which encloses the whole geometry of the GeoShape.
+           * @return {H.geo.Rect}
+           */
+          getBounds(): H.geo.Rect;
+
+          /**
+           * This method retrieves the drawing style of the given spatial object. The returned style is treated as immutable and must not be modified afterwards to prevent inconsistencies!
+           * @return {H.map.SpatialStyle} - The given spatial object
+           */
+          getStyle(): H.map.SpatialStyle;
+
+          /**
+           * This method sets the drawing style of the given spatial object. If the argument opt_style is an instance of H.map.SpatialStyle,
+           * it is treated as immutable and must not be modified afterwards to prevent inconsistencies!
+           * @param opt_style {(H.map.SpatialStyle | H.map.SpatialStyle.Options)=} - The style to set. If it evaluates to a false, the H.map.SpatialStyle.DEFAULT_STYLE is used.
+           * @return {H.map.Spatial} - The given spatial object
+           */
+          setStyle(opt_style?: H.map.SpatialStyle | H.map.SpatialStyle.Options): H.map.Spatial;
+
+          /**
+           * This method retrieves the arrow style of the given spatial object or undefined if the style is not defined.
+           * The returned arrow style is treated as immutable and must not be modified afterwards to prevent inconsistencies!
+           * @return {H.map.ArrowStyle} - An object encapsulating information about the arrow style or undefined if the arrow style is not defined.
+           */
+          getArrows(): H.map.ArrowStyle | undefined;
+
+          /**
+           * This method sets the arrow style of the given spatial object.
+           * @param opt_arrows {(H.map.ArrowStyle | H.map.ArrowStyle.Options)=} - The arrow style to be applied
+           * @return {H.map.Spatial} - The given spatial object
+           */
+          setArrows(opt_arrows?: H.map.ArrowStyle | H.map.ArrowStyle.Options): H.map.Spatial;
+
+          /**
+           * This method indicates whether this spatial object represents a closed shape
+           * @return {boolean} - true if the given spatial object is a closed shape, false otherwise
+           */
+          isClosed(): boolean;
+
+          /**
+           * This method retrieves the ID of the given object.
+           * @return {any} The identifier of the given object.
+           */
+          getId(): any;
+
+          /**
+           * This method sets the visibility of the given object.
+           * @param opt_visibility {boolean=} - Indicates whether the map object should be visible.
+           * @return {H.map.Object} - The given object
+           */
+          setVisibility(opt_visibility?: boolean): H.map.Object;
+
+          /**
+           * This method retrieves a value indicating the visibility of the given object.
+           * @param opt_effective {boolean} - Indicates that the effective visibility is requested. In this case the visibility of all possible ancestor groups is also taken into account
+           * @return {boolean} - A value indicating if the object is visible (true) or not false
+           */
+          getVisibility(opt_effective?: boolean): boolean;
+
+          /**
+           * This method retrieves the z-index of the given object.
+           * @return {number} - A value reflecting the z-index of the given object.
+           */
+          getZIndex(): number | undefined;
+
+          /**
+           * This method sets the z-index of the given object.
+           * @param zIndex {number | undefined} - A value indicating the new z-index
+           * @return {H.map.Object} - The given object
+           */
+          setZIndex(zIndex: number | undefined): H.map.Object;
+
+          /**
+           * This method compares the rendering z-order of the given object with another object. (The 'given object' mean the object on which the method has been invoke.)
+           * @param other {H.map.Object} -The map object with which to compare the given object.
+           * @return {number} - A value lower than 0 indicates that the given object has a lower z-order. 0 indicates that both objects have the same z-order.
+           * A value greater than 0, indicates that the given object has a higher z-order.
+           */
+          compareZOrder(other: H.map.Object): number;
+
+          /**
+           * This method retrieves the parent group which contains the given object or null if the object is not contained in any group.
+           * @return {H.map.Group} - An object representing the containing group object or null if the given object is not contained in any group.
+           */
+          getParentGroup(): H.map.Group;
+
+          /**
+           * The root object to which the given object is attached or the object itself if it is not attached to another.
+           * @return {H.map.Object} - An object representing the root group for the given object or the given object if it is not part of a group.
+           */
+          getRootGroup(): H.map.Object;
+
+          /**
+           * This method checks whether the received object is an inclusive descendant of the given object.
+           * @param object {any} - The object to check.
+           * @return {boolean} - true if the given object is contained in the given object, otherwise false
+           */
+          contains(object: any): boolean;
+
+          /**
+           * This method obtains the current provider of the given object
+           * @return {H.map.provider.ObjectProvider} - An object representing the provider
+           */
+          getProvider(): H.map.provider.ObjectProvider;
+
+          /**
+           * This method retrieves the invalidation states for the given object.
+           * @return {H.map.provider.Invalidations} - An object containing the invalidation states
+           */
+          getInvalidations(): H.map.provider.Invalidations;
+
+          /**
+           * This method invalidates the given map object.
+           * @param flags {H.math.BitMask} - The flags indicating the types of changes to the given object
+           * @return {boolean} - Indicates whether a validation was executed (only if the object has a provider)
+           */
+          invalidate(flags: H.math.BitMask): boolean;
+
+          /**
+           * This method retrieves previously stored arbitrary data from the given object.
+           * @return {any} - The previously stored data or undefined if no data was stored.
+           */
+          getData(): any;
+
+          /**
+           * This method stores arbitrary data with the given map object.
+           * @param data {any} - The data to be stored
+           * @return {H.map.Object} - The given map object
+           */
+          setData(data: any): H.map.Object;
+
+          /**
+           * This method adds a listener for a specific event.
+           * Note that to prevent potential memory leaks, you must either call removeEventListener or dispose on the given object when you no longer need it.
+           * @param type {string} - The name of the event
+           * @param handler {function()} - An event handler function
+           * @param opt_capture {boolean=} - true indicates that the method should listen in the capture phase (bubble otherwise)
+           * @param opt_scope {{}=} - An object defining the scope for the handler function
+           */
+          addEventListener(type: string, handler: () => void, opt_capture?: boolean, opt_scope?: {}): void;
+
+          /**
+           * This method removes a previously added listener from the EventTarget instance.
+           * @param type {string} - The name of the event
+           * @param handler {function()} - An event handler function
+           * @param opt_capture {boolean=} - true indicates that the method should listen in the capture phase (bubble otherwise)
+           * @param opt_scope {{}=} - An object defining the scope for the handler function
+           */
+          removeEventListener(type: string, handler: () => void, opt_capture?: boolean, opt_scope?: {}): void;
+
+          /**
+           * This method dispatches an event on the EventTarget object.
+           * @param evt {H.util.Event | string} - An object representing the event or a string with the event name
+           */
+          dispatchEvent(evt: H.util.Event | string): void;
+
+          /**
+           * This method removes listeners from the given object.
+           * Classes that extend EventTarget may need to override this method in order to remove references to DOM Elements and additional listeners.
+           */
+          dispose(): void;
+
+          /**
+           * This method adds a callback which is triggered when the EventTarget object is being disposed.
+           * @param callback {function()} - The callback function.
+           * @param opt_scope {{}=} - An optional scope for the callback function
+           */
+          addOnDisposeCallback(callback: () => void, opt_scope?: {}): void;
         }
 
         namespace Polyline {
@@ -3303,7 +3659,7 @@ declare namespace H {
                  * sessions consistent IDs is needed (e.g. for storing provider data) this property must be specified.
                  * @property min {number=} - The minimal supported zoom level, default is 0
                  * @property max {number=} - The maximal supported zoom level, default is 22
-                 * @property getCopyrights {(function(H.geo.Rect, number) : ?Array<H.map.ICopyright>)=} - A function to replace the default implementation of H.map.provider.Provider#getCopyrights
+                 * @property getCopyrights {(function(H.geo.Rect, number): ?Array<H.map.ICopyright>)=} - A function to replace the default implementation of H.map.provider.Provider#getCopyrights
                  * @property tileSize {number=} - The size of a tile as edge length in pixels. It must be 2^n where n is in range [0 ... 30], default is 256
                  * @property getURL {function(number, number, number)} - The function to create an URL for the specified tile. If it returns a falsy the tile is not requested.
                  * @property crossOrigin {(string | boolean=)} - The CORS settings to use for the crossOrigin attribute for the image, if omitted or if the value evaluates to false no CORS settings
@@ -3438,7 +3794,7 @@ declare namespace H {
                  * Options which are used to initialize the MarkerTileProvider object.
                  * @property min {number=} - The minimal supported zoom level, default is 0
                  * @property max {number=} - The maximal supported zoom level, default is 22
-                 * @property requestData {function(number, number, number, function(Array<H.map.AbstractMarker>), Function) : H.util.ICancelable} - function that fetches marker data and creates array
+                 * @property requestData {function(number, number, number, function(Array<H.map.AbstractMarker>), Function): H.util.ICancelable} - function that fetches marker data and creates array
                  * of H.map.AbstractMarker that is passed success callback, if function fails to fetch data onError callback must be called
                  * @property providesDomMarkers {boolean=} - indicates if markers provided are of type H.map.DomMarker or H.map.Marker, default is H.map.Marker
                  */
@@ -3602,7 +3958,7 @@ declare namespace H {
                  * sessions consistent IDs is needed (e.g. for storing provider data) this property must be specified.
                  * @property min {number=} - The minimal supported zoom level, default is 0
                  * @property max {number=} - The maximal supported zoom level, default is 22
-                 * @property getCopyrights {(function(H.geo.Rect, number) : ?Array<H.map.ICopyright>)=} - A function to replace the default implementation of H.map.provider.Provider#getCopyrights
+                 * @property getCopyrights {(function(H.geo.Rect, number): ?Array<H.map.ICopyright>)=} - A function to replace the default implementation of H.map.provider.Provider#getCopyrights
                  */
                 interface Options {
                     uri?: string;
@@ -6276,7 +6632,7 @@ declare namespace H {
         namespace ZoomRectangle {
             /**
              * @property alignment {H.ui.LayoutAlignment=} - the layout alignment which should be applied to this control, default is H.ui.LayoutAlignment.BOTTOM_RIGHT
-             * @property adjustZoom {function(number, H.Map) : number=} - optional function that defines how zoom level should be changed, by default zoom level is picked to fit the
+             * @property adjustZoom {function(number, H.Map): number=} - optional function that defines how zoom level should be changed, by default zoom level is picked to fit the
              * bounding rectangle into the view port.
              */
             interface Options {
@@ -6520,7 +6876,7 @@ declare namespace H {
              * Constructor
              * @param maxSize {number} - the maximum size of the cache
              * @param opt_onDrop {function(string, ?, number)=} - A callback to be invoked when a data element is dropped from the cache
-             * @param opt_filter {(function(string, ?, number) : boolean)=} - A function to filter data elements that are not to be cached
+             * @param opt_filter {(function(string, ?, number): boolean)=} - A function to filter data elements that are not to be cached
              */
             constructor(maxSize: number, opt_onDrop?: (s: string, i: any, n: number) => void, opt_filter?: (s: string, i: any, n: number) => boolean);
 
@@ -6571,14 +6927,14 @@ declare namespace H {
              * on those entries for which the predicated returns true.
              * @param callback {function(string, ?, number)} - the callback to be invoked for each entry
              * @param opt_ctx {Object=} - an optional context object to be used as this within the callback
-             * @param opt_matcher {(function(string, ?, number) : boolean)=} - an optional match predicate to customize on which entries the callback will be called
+             * @param opt_matcher {(function(string, ?, number): boolean)=} - an optional match predicate to customize on which entries the callback will be called
              */
             forEach(callback: (s: string, i: any, n: number) => void, opt_ctx?: any, opt_matcher?: (s: string, i: any, n: number) => boolean): void;
 
             /**
              * This method removes all data elements from the cache. If the optional match predicate is passed to this method only those data elements will be removed for which the predicate
              * return true.
-             * @param opt_matcher {(function(string, ?, number) : boolean)=} - an optional function that receives an entries id, data and size and may return true or false to either remove it or
+             * @param opt_matcher {(function(string, ?, number): boolean)=} - an optional function that receives an entries id, data and size and may return true or false to either remove it or
              * leave the entry in the cache respectively
              */
             removeAll(opt_matcher?: (s: string, i: any, n: number) => boolean): void;
@@ -6822,14 +7178,14 @@ declare namespace H {
              * those entries for which the predicated returns true.
              * @param callback {function(string, ?, number)} - the callback to be invoked for each entry
              * @param opt_ctx {Object=} - an optional context object to be used as this within the callback
-             * @param opt_matcher {(function(string, ?, number) : boolean)=} - an optional match predicate to customize on which entries the callback will be called
+             * @param opt_matcher {(function(string, ?, number): boolean)=} - an optional match predicate to customize on which entries the callback will be called
              */
             forEach(callback: (s: string, t: any, n: number) => void, opt_ctx?: {}, opt_matcher?: ((s: string, t: any, n: number) => boolean)): void;
 
             /**
              * This method removes all data elements from the cache. If the optional match predicate is passed to this method only those data elements will be removed for which the predicate
              * return true.
-             * @param opt_matcher {(function(string, ?, number) : boolean)=} - an optional function that receives an entries id, data and size and may return true or false to either remove it or
+             * @param opt_matcher {(function(string, ?, number): boolean)=} - an optional function that receives an entries id, data and size and may return true or false to either remove it or
              * leave the entry in the cache respectively
              */
             removeAll(opt_matcher?: ((s: string, t: any, n: number) => boolean)): void;

From bc1e2d97212935217194003ef5cc0c4ac8d5732e Mon Sep 17 00:00:00 2001
From: Artem Nechunaev <nechunaev@tutu.ru>
Date: Wed, 7 Mar 2018 16:50:17 +0300
Subject: [PATCH 0327/1382] Fix package version

---
 types/react-input-mask/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/react-input-mask/index.d.ts b/types/react-input-mask/index.d.ts
index 034c3b4f9d..8716cda0e6 100644
--- a/types/react-input-mask/index.d.ts
+++ b/types/react-input-mask/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-input-mask 1.2.2
+// Type definitions for react-input-mask 1.2
 // Project: https://github.com/sanniassin/react-input-mask
 // Definitions by: Alexandre Paré <https://github.com/apare>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From 091f2f42713c6da7da0ebad60fbaecc5bb95ef05 Mon Sep 17 00:00:00 2001
From: Stephan Schneider <stephanschndr@gmail.com>
Date: Wed, 7 Mar 2018 15:23:58 +0100
Subject: [PATCH 0328/1382] fix: allow for synchronous Hapi plugin register fn

---
 types/hapi/index.d.ts                    |  2 +-
 types/hapi/test/server/server-plugins.ts | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/types/hapi/index.d.ts b/types/hapi/index.d.ts
index de1542f33f..8ad9b6f4c4 100644
--- a/types/hapi/index.d.ts
+++ b/types/hapi/index.d.ts
@@ -120,7 +120,7 @@ export interface PluginBase<T> {
      * * server - the server object with a plugin-specific server.realm.
      * * options - any options passed to the plugin during registration via server.register().
      */
-    register: (server: Server, options: T) => Promise<void>;
+    register: (server: Server, options: T) => void | Promise<void>;
 
     /** (optional) if true, allows the plugin to be registered multiple times with the same server. Defaults to false. */
     multiple?: boolean;
diff --git a/types/hapi/test/server/server-plugins.ts b/types/hapi/test/server/server-plugins.ts
index 7f3d194f84..8de3fdc24f 100644
--- a/types/hapi/test/server/server-plugins.ts
+++ b/types/hapi/test/server/server-plugins.ts
@@ -13,6 +13,10 @@ interface Plugin3 {
 	three: 3;
 }
 
+interface Plugin4 {
+	four: 4;
+}
+
 declare module 'hapi' {
 	interface PluginProperties {
 		example: {
@@ -42,6 +46,11 @@ const plugin3: Plugin<Plugin3> = {
 	register: async (server: Server, options: Plugin3) => {}
 };
 
+const plugin4: Plugin<Plugin4> = {
+	name: 'plugin4',
+	register: (server: Server, options: Plugin4) => {}
+};
+
 const server = new Server({
     port: 8000,
 });
@@ -90,5 +99,9 @@ server.register([
 	{
 		plugin: plugin1,
 		options: {one: 1}
+	},
+	{
+		plugin: plugin4,
+		options: {four: 4}
 	}
 ]);

From 8a148d777e2dd54222334978d86bec7991d8ff59 Mon Sep 17 00:00:00 2001
From: Robert Imig <rimig@palantir.com>
Date: Wed, 7 Mar 2018 09:38:26 -0500
Subject: [PATCH 0329/1382] bump up ts version

---
 types/react-map-gl/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/react-map-gl/index.d.ts b/types/react-map-gl/index.d.ts
index 9a7e069bf9..9f99433cfa 100644
--- a/types/react-map-gl/index.d.ts
+++ b/types/react-map-gl/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/uber/react-map-gl#readme
 // Definitions by: Robert Imig <https://github.com/rimig>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 import * as React from "react";
 import * as MapboxGL from "mapbox-gl";

From a3c4aadbeb3bdfcbdceb1c6e74a7e3142a3b2351 Mon Sep 17 00:00:00 2001
From: Chris Barth <chrisjbarth@hotmail.com>
Date: Wed, 7 Mar 2018 10:25:21 -0500
Subject: [PATCH 0330/1382] Add typings for winston-syslog

---
 types/winston-syslog/index.d.ts              | 25 ++++++++++++++
 types/winston-syslog/tsconfig.json           | 24 +++++++++++++
 types/winston-syslog/tslint.json             |  6 ++++
 types/winston-syslog/winston-syslog-tests.ts | 36 ++++++++++++++++++++
 4 files changed, 91 insertions(+)
 create mode 100644 types/winston-syslog/index.d.ts
 create mode 100644 types/winston-syslog/tsconfig.json
 create mode 100644 types/winston-syslog/tslint.json
 create mode 100644 types/winston-syslog/winston-syslog-tests.ts

diff --git a/types/winston-syslog/index.d.ts b/types/winston-syslog/index.d.ts
new file mode 100644
index 0000000000..816274ded8
--- /dev/null
+++ b/types/winston-syslog/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for winston-syslog 1.0
+// Project: https://github.com/indexzero/winston-syslog#readme
+// Definitions by: Chris Barth <https://github.com/cjbarth>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as winston from "winston";
+export interface SyslogTransportOptions extends winston.GenericTextTransportOptions {
+	host?: string;
+	port?: number;
+	path?: string;
+	protocol?: string;
+	pid?: number;
+	facility?: string;
+	localhost?: string;
+	type?: string;
+	app_name?: string;
+	eol?: string;
+}
+export class Syslog extends winston.Transport implements winston.TransportInstance {
+}
+declare module "winston" {
+	interface Transports {
+		Syslog: Syslog;
+	}
+}
diff --git a/types/winston-syslog/tsconfig.json b/types/winston-syslog/tsconfig.json
new file mode 100644
index 0000000000..e11a89c680
--- /dev/null
+++ b/types/winston-syslog/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "esModuleInterop": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "winston-syslog-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/winston-syslog/tslint.json b/types/winston-syslog/tslint.json
new file mode 100644
index 0000000000..1e30988418
--- /dev/null
+++ b/types/winston-syslog/tslint.json
@@ -0,0 +1,6 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-var-requires": false
+    }
+}
diff --git a/types/winston-syslog/winston-syslog-tests.ts b/types/winston-syslog/winston-syslog-tests.ts
new file mode 100644
index 0000000000..ce83bbb918
--- /dev/null
+++ b/types/winston-syslog/winston-syslog-tests.ts
@@ -0,0 +1,36 @@
+import winston = require('winston');
+import { SyslogTransportOptions } from 'winston-syslog';
+require('winston-syslog').Syslog;
+
+const str = "";
+const bool  = true;
+const num = 1;
+const obj: any = {};
+
+const syslogOptions: SyslogTransportOptions = {
+    host: str,
+    port: num,
+    path: str,
+    protocol: str,
+    pid: num,
+    facility: str,
+    localhost: str,
+    type: str,
+    app_name: str,
+    eol: str,
+    json: bool,
+    colorize: bool,
+    colors: str,
+    prettyPrint: bool,
+    showLevel: bool,
+    label: str,
+    depth: num,
+};
+
+winston.add(winston.transports.Syslog, syslogOptions);
+
+const logger: winston.LoggerInstance = new (winston.Logger)({
+  transports: [
+    new (winston.transports.Syslog)(syslogOptions),
+  ]
+});

From 063b3d77a8d060030285d3114edd5b0394983363 Mon Sep 17 00:00:00 2001
From: Vidar Tonaas Fauske <vidartf@gmail.com>
Date: Fri, 16 Feb 2018 09:55:15 +0100
Subject: [PATCH 0331/1382] node: Add windowsHide opt to v8 docs also

---
 types/node/v8/index.d.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/types/node/v8/index.d.ts b/types/node/v8/index.d.ts
index 5d672296f2..3a35a3841f 100644
--- a/types/node/v8/index.d.ts
+++ b/types/node/v8/index.d.ts
@@ -2093,6 +2093,7 @@ declare module "child_process" {
         killSignal?: string;
         uid?: number;
         gid?: number;
+        windowsHide?: boolean;
     }
 
     export interface ExecOptionsWithStringEncoding extends ExecOptions {
@@ -2139,6 +2140,7 @@ declare module "child_process" {
         killSignal?: string;
         uid?: number;
         gid?: number;
+        windowsHide?: boolean;
         windowsVerbatimArguments?: boolean;
     }
     export interface ExecFileOptionsWithStringEncoding extends ExecFileOptions {
@@ -2222,6 +2224,7 @@ declare module "child_process" {
         maxBuffer?: number;
         encoding?: string;
         shell?: boolean | string;
+        windowsHide?: boolean;
         windowsVerbatimArguments?: boolean;
     }
     export interface SpawnSyncOptionsWithStringEncoding extends SpawnSyncOptions {
@@ -2259,6 +2262,7 @@ declare module "child_process" {
         killSignal?: string;
         maxBuffer?: number;
         encoding?: string;
+        windowsHide?: boolean;
     }
     export interface ExecSyncOptionsWithStringEncoding extends ExecSyncOptions {
         encoding: BufferEncoding;
@@ -2282,6 +2286,7 @@ declare module "child_process" {
         killSignal?: string;
         maxBuffer?: number;
         encoding?: string;
+        windowsHide?: boolean;
     }
     export interface ExecFileSyncOptionsWithStringEncoding extends ExecFileSyncOptions {
         encoding: BufferEncoding;

From d08842321385a7ed1457fa8de69c5f17aeb41bed Mon Sep 17 00:00:00 2001
From: Craig Boland <craig.boland@gmail.com>
Date: Wed, 7 Mar 2018 13:22:37 -0600
Subject: [PATCH 0332/1382] Applying changes requested by @armanio123

- Wrapped type declarations in namespace.
- Shortened type names to account for new namespace.
- Use 'const' instead of 'var'.
---
 .../bootstrap3-dialog-tests.ts                |  34 +-
 types/bootstrap3-dialog/index.d.ts            | 364 +++++++++---------
 2 files changed, 200 insertions(+), 198 deletions(-)

diff --git a/types/bootstrap3-dialog/bootstrap3-dialog-tests.ts b/types/bootstrap3-dialog/bootstrap3-dialog-tests.ts
index 5cb019a24a..5434971f41 100644
--- a/types/bootstrap3-dialog/bootstrap3-dialog-tests.ts
+++ b/types/bootstrap3-dialog/bootstrap3-dialog-tests.ts
@@ -1,6 +1,6 @@
 function BootstrapDialogOptionsTests() {
-    const options1: BootstrapDialogOptions = { };
-    const options2: BootstrapDialogOptions = {
+    const options1: BootstrapDialog.DialogOptions = { };
+    const options2: BootstrapDialog.DialogOptions = {
         animate: false,
         buttons: [{id: "btn-1"}],
         callback: (result: boolean) => { },
@@ -12,10 +12,10 @@ function BootstrapDialogOptionsTests() {
         description: "",
         buttonLabel: "",
         message: "",
-        onhide: (dialog: BootstrapDialogContext) => { },
-        onhidden: (dialog: BootstrapDialogContext) => { },
-        onshow: (dialog: BootstrapDialogContext) => { },
-        onshown: (dialog: BootstrapDialogContext) => { },
+        onhide: (dialog: BootstrapDialog.DialogContext) => { },
+        onhidden: (dialog: BootstrapDialog.DialogContext) => { },
+        onshow: (dialog: BootstrapDialog.DialogContext) => { },
+        onshown: (dialog: BootstrapDialog.DialogContext) => { },
         size: BootstrapDialog.SIZE_LARGE,
         title: "",
         type: BootstrapDialog.TYPE_DEFAULT,
@@ -27,14 +27,14 @@ function BootstrapDialogOptionsTests() {
         autodestroy: false,
         nl2br: false,
     };
-    options2.onhide = (dialog: BootstrapDialogContext): void => { };
-    options2.onhide = (dialog: BootstrapDialogContext): boolean => false;
+    options2.onhide = (dialog: BootstrapDialog.DialogContext): void => { };
+    options2.onhide = (dialog: BootstrapDialog.DialogContext): boolean => false;
     options2.message = "";
     options2.message = $("#element");
-    options2.message = (dialog?: BootstrapDialogContext): string => {
+    options2.message = (dialog?: BootstrapDialog.DialogContext): string => {
         return "";
     };
-    options2.message = (dialog?: BootstrapDialogContext): JQuery => {
+    options2.message = (dialog?: BootstrapDialog.DialogContext): JQuery => {
         return $("#element");
     };
     // BootstrapDialog.SIZE_xxx constants.
@@ -58,7 +58,7 @@ function BootstrapDialogStaticTests() {
     BootstrapDialog.alert("", () => { });
     BootstrapDialog.confirm("");
     BootstrapDialog.confirm("", (result: boolean) => { });
-    const instance1: BootstrapDialogInstance = BootstrapDialog.show({});
+    const instance1: BootstrapDialog.DialogInstance = BootstrapDialog.show({});
     // BUTTON_SIZES
     BootstrapDialog.BUTTON_SIZES[BootstrapDialog.SIZE_NORMAL] = '';
     const buttonSize: string = BootstrapDialog.BUTTON_SIZES[BootstrapDialog.SIZE_NORMAL];
@@ -74,7 +74,7 @@ function BootstrapDialogStaticTests() {
 }
 
 function BootstrapDialogContextTests() {
-    const dialog1: BootstrapDialogContext = BootstrapDialog({});
+    const dialog1: BootstrapDialog.DialogContext = BootstrapDialog({});
     dialog1.close();
     dialog1.enableButtons(false);
     const button: JQuery = dialog1.getButton("");
@@ -97,20 +97,20 @@ function BootstrapDialogContextTests() {
 }
 
 function BootstrapDialogInstanceTests() {
-    const instance1: BootstrapDialogInstance = BootstrapDialog.show({});
+    const instance1: BootstrapDialog.DialogInstance = BootstrapDialog.show({});
     const modal: JQuery = instance1.$modal;
     const modalBody: JQuery = instance1.$modalBody;
     const modalContent: JQuery = instance1.$modalContent;
     const modalDialog: JQuery = instance1.$modalDialog;
     const modalHeader: JQuery = instance1.$modalHeader;
     const modalFooter: JQuery = instance1.$modalFooter;
-    const options: BootstrapDialogOptions = instance1.options;
+    const options: BootstrapDialog.DialogOptions = instance1.options;
     const opened: boolean = instance1.opened;
 }
 
 function BootstrapDialogButtonTests() {
-    const button1: BootstrapDialogButton = { };
-    const button2: BootstrapDialogButton = {
+    const button1: BootstrapDialog.DialogButton = { };
+    const button2: BootstrapDialog.DialogButton = {
         id: "",
         label: "",
         hotkey: 0,
@@ -118,6 +118,6 @@ function BootstrapDialogButtonTests() {
         cssClass: "",
         data: {name: "value"},
         autospin: false,
-        action: (dialog: BootstrapDialogContext) => { },
+        action: (dialog: BootstrapDialog.DialogContext) => { },
     };
 }
diff --git a/types/bootstrap3-dialog/index.d.ts b/types/bootstrap3-dialog/index.d.ts
index 3d4082f14e..d9612167f8 100644
--- a/types/bootstrap3-dialog/index.d.ts
+++ b/types/bootstrap3-dialog/index.d.ts
@@ -7,189 +7,191 @@
 
 /// <reference types="jquery" />
 
-interface BootstrapDialogStatic {
-    BUTTON_SIZES: any;
-    BUTTONS_ORDER_CANCEL_OK: string;
-    BUTTONS_ORDER_OK_CANCEL: string;
-    DEFAULT_TEXTS: any;                 /** For text localization. */
-    ICON_SPINNER: string;
-    NAMESPACE: string;
+declare namespace BootstrapDialog {
+    interface DialogStatic {
+        BUTTON_SIZES: any;
+        BUTTONS_ORDER_CANCEL_OK: string;
+        BUTTONS_ORDER_OK_CANCEL: string;
+        DEFAULT_TEXTS: any;                 /** For text localization. */
+        ICON_SPINNER: string;
+        NAMESPACE: string;
 
-    SIZE_NORMAL: string;
-    SIZE_SMALL: string;
-    SIZE_WIDE: string;
-    SIZE_LARGE: string;
+        SIZE_NORMAL: string;
+        SIZE_SMALL: string;
+        SIZE_WIDE: string;
+        SIZE_LARGE: string;
 
-    TYPE_DEFAULT: string;
-    TYPE_INFO: string;
-    TYPE_PRIMARY: string;
-    TYPE_SUCCESS: string;
-    TYPE_WARNING: string;
-    TYPE_DANGER: string;
+        TYPE_DEFAULT: string;
+        TYPE_INFO: string;
+        TYPE_PRIMARY: string;
+        TYPE_SUCCESS: string;
+        TYPE_WARNING: string;
+        TYPE_DANGER: string;
 
-    (options: BootstrapDialogOptions): BootstrapDialogContext;
-    alert(message: string, closeCallback?: () => void): void;
-    confirm(message: string, closeCallback?: (result: boolean) => void): void;
-    show(options: BootstrapDialogOptions): BootstrapDialogInstance;
+        (options: DialogOptions): DialogContext;
+        alert(message: string, closeCallback?: () => void): void;
+        confirm(message: string, closeCallback?: (result: boolean) => void): void;
+        show(options: DialogOptions): DialogInstance;
+    }
+
+    interface DialogOptions {
+        /** Dialog header type. See BootstrapDialog.TYPE_xxx constants. */
+        type?: string;
+        /** Text size. See BootstrapDialog.SIZE_xxx constants. By default - SIZE_NORMAL */
+        size?: string;
+        /** Dialog title. Either string or JQuery element. */
+        title?: string | JQuery;
+        /** Dialog message. Either string, JQuery element, or function that returns either string or JQuery element. */
+        message?: string | JQuery | ((dialog?: DialogContext) => string | JQuery);
+        /**
+         * When set to true, you can close the dialog by:
+         *  - Clicking the close icon in dialog header.
+         *  - Clicking outside the dialog.
+         *  - ESC key.
+         *
+         * FALSE by default.
+         */
+        closable?: boolean;
+        /** Whether dialog will close by clicking outside of it. */
+        closeByBackdrop?: boolean;
+        /** Whether dialog will close by ESC. */
+        closeByKeyboard?: boolean;
+        /** Whether fade-out background while showing the dialog. TRUE by default. */
+        animate?: boolean;
+        /** Data to be bound to the dialog. */
+        data?: any;
+        /** Whether dialog could be dragged by its header. Cursor could be changed (see doc)! FALSE by default. */
+        draggable?: boolean;
+        /**
+         * If provided, 'aria-describedby' attribute will be added to the dialog with the description string as its value. This can improve accessibility, as the description can be read by screen
+         * readers.
+         */
+        description?: string;
+        /** Default button title. OK by default. */
+        buttonLabel?: string;
+        buttons?: DialogButton[];
+        /** Result will be true if button was click, while it will be false if users close the dialog directly. */
+        callback?: (result: boolean) => void;
+        /** If provided, it will be invoked when the dialog is popping up. */
+        onshow?(dialog?: DialogContext): void;
+        /** If provided, it will be invoked when the dialog is popped up. */
+        onshown?(dialog?: DialogContext): void;
+        /**
+         * If provided, it will be invoked when the dialog is popping down.
+         * Return FALSE to don`t close the dialog. Don`t return anything by default.
+         */
+        onhide?(dialog?: DialogContext): any;
+        /** If provided, it will be invoked when the dialog is popped down. */
+        onhidden?(dialog?: DialogContext): void;
+
+        /** 'Cancel' by default. */
+        btnCancelLabel?: string;
+        /** 'OK' by default. */
+        btnOKLabel?: string;
+        /** If you didn't specify it, dialog type will be used. */
+        btnOKClass?: string;
+        /** Additional css classes that will be added to your dialog. */
+        cssClass?: string;
+        /** Icon class name, for example 'glyphicon glyphicon-check'. */
+        spinicon?: string;
+        /**
+         * When it's true, all modal stuff will be removed from the DOM tree after the dialog is popped down,
+         * set it to false if you need your dialog (same instance) pups up and down again and again.
+         * Default is true.
+         */
+        autodestroy?: boolean;
+        /**
+         * Automatically convert line breaking character to <br /> if it's set to true,
+         * everything keeps original if it's false.
+         */
+        nl2br?: boolean;
+    }
+
+    interface DialogInstance {
+        $modal: JQuery;
+        $modalBody: JQuery;
+        $modalContent: JQuery;
+        $modalDialog: JQuery;
+        $modalHeader: JQuery;
+        $modalFooter: JQuery;
+        options: DialogOptions;
+        opened: boolean;
+    }
+
+    interface DialogButton {
+        /** If id is set, you can use dialogInstance.getButton(id) to get the button later. */
+        id?: string;
+        label?: string;
+        /** Hotkey char code */
+        hotkey?: number;
+        /** If set, the specified icon will be added to the button. */
+        icon?: string;
+        /** Additional css class to be added to the button. */
+        cssClass?: string;
+        /** Object containing data attributes to be added to the button. */
+        data?: any;
+        /**  If it's true, after clicked the button a spinning icon appears. */
+        autospin?: boolean;
+        /**
+         * If provided, the callback will be invoked after the button is clicked, and the dialog instance
+         * will be passed to the callback function.
+         */
+        action?: (dialog: DialogContext) => void;
+    }
+
+    interface DialogButtonInstance {
+        toggleEnable(enabled: boolean): void;
+        /** Equals to $button.toggleEnable(true); */
+        enable(): void;
+        /** Equals to $button.toggleEnable(false); */
+        disable(): void;
+        toggleSpin(spin: boolean): void;
+        /** Equals to $button.toggleSpin(true); */
+        spin(): void;
+        /** Equals to $button.toggleSpin(false); */
+        stopSpin(): void;
+    }
+
+    interface DialogContext {
+        /** Open the dialog. Usage: dialogInstance.open() */
+        open(): void;
+        /**  	Close the dialog. Usage: dialogInstance.close() */
+        close(): void;
+        /**
+         * Calling dialog.open() will automatically get this method called first, but if you want to do something on your dialog
+         * before it's shown, you can manually call dialog.realize() before calling dialog.open().
+         */
+        realize(): void;
+        getTitle(): string;
+        setTitle(title: string): void;
+        setMessage(message: string): void;
+        /** Bind data entry to dialog instance, value can be any types that javascript supports. */
+        setData(dataName: string, value: any): void;
+        /** Get data entry according to the given key, returns null if no data entry found. */
+        getData(dataName: string): any;
+        getButton(buttonId: string): JQuery;
+        /**
+         * When set to true (default), dialog can be closed by clicking close icon in dialog header,
+         * or by clicking outside the dialog, or, ESC key is pressed.
+         */
+        setClosable(closable: boolean): void;
+        /** See BootstrapDialog.TYPE_xxx constants. */
+        setType(dialogType: string): void;
+        /** Disable all buttons in dialog footer when it's false, enable all when it's true. */
+        enableButtons(enable: boolean): void;
+        /** Return the raw modal, equivalent to $('<div class='modal fade'...></div>') */
+        getModal(): JQuery;
+        /** Return the raw modal content. */
+        getModalContent(): JQuery;
+        /** Return the raw modal dialog. */
+        getModalDialog(): JQuery;
+        /** Return the raw modal header. */
+        getModalHeader(): JQuery;
+        /** Return the raw modal footer. */
+        getModalFooter(): JQuery;
+        /** Return the raw modal body. */
+        getModalBody(): JQuery;
+    }
 }
 
-interface BootstrapDialogOptions {
-    /** Dialog header type. See BootstrapDialog.TYPE_xxx constants. */
-    type?: string;
-    /** Text size. See BootstrapDialog.SIZE_xxx constants. By default - SIZE_NORMAL */
-    size?: string;
-    /** Dialog title. Either string or JQuery element. */
-    title?: string | JQuery;
-    /** Dialog message. Either string, JQuery element, or function that returns either string or JQuery element. */
-    message?: string | JQuery | ((dialog?: BootstrapDialogContext) => string | JQuery);
-    /**
-     * When set to true, you can close the dialog by:
-     *  - Clicking the close icon in dialog header.
-     *  - Clicking outside the dialog.
-     *  - ESC key.
-     *
-     * FALSE by default.
-     */
-    closable?: boolean;
-    /** Whether dialog will close by clicking outside of it. */
-    closeByBackdrop?: boolean;
-    /** Whether dialog will close by ESC. */
-    closeByKeyboard?: boolean;
-    /** Whether fade-out background while showing the dialog. TRUE by default. */
-    animate?: boolean;
-    /** Data to be bound to the dialog. */
-    data?: any;
-    /** Whether dialog could be dragged by its header. Cursor could be changed (see doc)! FALSE by default. */
-    draggable?: boolean;
-    /**
-     * If provided, 'aria-describedby' attribute will be added to the dialog with the description string as its value. This can improve accessibility, as the description can be read by screen
-     * readers.
-     */
-    description?: string;
-    /** Default button title. OK by default. */
-    buttonLabel?: string;
-    buttons?: BootstrapDialogButton[];
-    /** Result will be true if button was click, while it will be false if users close the dialog directly. */
-    callback?: (result: boolean) => void;
-    /** If provided, it will be invoked when the dialog is popping up. */
-    onshow?(dialog?: BootstrapDialogContext): void;
-    /** If provided, it will be invoked when the dialog is popped up. */
-    onshown?(dialog?: BootstrapDialogContext): void;
-    /**
-     * If provided, it will be invoked when the dialog is popping down.
-     * Return FALSE to don`t close the dialog. Don`t return anything by default.
-     */
-    onhide?(dialog?: BootstrapDialogContext): any;
-    /** If provided, it will be invoked when the dialog is popped down. */
-    onhidden?(dialog?: BootstrapDialogContext): void;
-
-    /** 'Cancel' by default. */
-    btnCancelLabel?: string;
-    /** 'OK' by default. */
-    btnOKLabel?: string;
-    /** If you didn't specify it, dialog type will be used. */
-    btnOKClass?: string;
-    /** Additional css classes that will be added to your dialog. */
-    cssClass?: string;
-    /** Icon class name, for example 'glyphicon glyphicon-check'. */
-    spinicon?: string;
-    /**
-     * When it's true, all modal stuff will be removed from the DOM tree after the dialog is popped down,
-     * set it to false if you need your dialog (same instance) pups up and down again and again.
-     * Default is true.
-     */
-    autodestroy?: boolean;
-    /**
-     * Automatically convert line breaking character to <br /> if it's set to true,
-     * everything keeps original if it's false.
-     */
-    nl2br?: boolean;
-}
-
-interface BootstrapDialogInstance {
-    $modal: JQuery;
-    $modalBody: JQuery;
-    $modalContent: JQuery;
-    $modalDialog: JQuery;
-    $modalHeader: JQuery;
-    $modalFooter: JQuery;
-    options: BootstrapDialogOptions;
-    opened: boolean;
-}
-
-interface BootstrapDialogButton {
-    /** If id is set, you can use dialogInstance.getButton(id) to get the button later. */
-    id?: string;
-    label?: string;
-    /** Hotkey char code */
-    hotkey?: number;
-    /** If set, the specified icon will be added to the button. */
-    icon?: string;
-    /** Additional css class to be added to the button. */
-    cssClass?: string;
-    /** Object containing data attributes to be added to the button. */
-    data?: any;
-    /**  If it's true, after clicked the button a spinning icon appears. */
-    autospin?: boolean;
-    /**
-     * If provided, the callback will be invoked after the button is clicked, and the dialog instance
-     * will be passed to the callback function.
-     */
-    action?: (dialog: BootstrapDialogContext) => void;
-}
-
-interface BootstrapDialogButtonInstance {
-    toggleEnable(enabled: boolean): void;
-    /** Equals to $button.toggleEnable(true); */
-    enable(): void;
-    /** Equals to $button.toggleEnable(false); */
-    disable(): void;
-    toggleSpin(spin: boolean): void;
-    /** Equals to $button.toggleSpin(true); */
-    spin(): void;
-    /** Equals to $button.toggleSpin(false); */
-    stopSpin(): void;
-}
-
-interface BootstrapDialogContext {
-    /** Open the dialog. Usage: dialogInstance.open() */
-    open(): void;
-    /**  	Close the dialog. Usage: dialogInstance.close() */
-    close(): void;
-    /**
-     * Calling dialog.open() will automatically get this method called first, but if you want to do something on your dialog
-     * before it's shown, you can manually call dialog.realize() before calling dialog.open().
-     */
-    realize(): void;
-    getTitle(): string;
-    setTitle(title: string): void;
-    setMessage(message: string): void;
-    /** Bind data entry to dialog instance, value can be any types that javascript supports. */
-    setData(dataName: string, value: any): void;
-    /** Get data entry according to the given key, returns null if no data entry found. */
-    getData(dataName: string): any;
-    getButton(buttonId: string): JQuery;
-    /**
-     * When set to true (default), dialog can be closed by clicking close icon in dialog header,
-     * or by clicking outside the dialog, or, ESC key is pressed.
-     */
-    setClosable(closable: boolean): void;
-    /** See BootstrapDialog.TYPE_xxx constants. */
-    setType(dialogType: string): void;
-    /** Disable all buttons in dialog footer when it's false, enable all when it's true. */
-    enableButtons(enable: boolean): void;
-    /** Return the raw modal, equivalent to $('<div class='modal fade'...></div>') */
-    getModal(): JQuery;
-    /** Return the raw modal content. */
-    getModalContent(): JQuery;
-    /** Return the raw modal dialog. */
-    getModalDialog(): JQuery;
-    /** Return the raw modal header. */
-    getModalHeader(): JQuery;
-    /** Return the raw modal footer. */
-    getModalFooter(): JQuery;
-    /** Return the raw modal body. */
-    getModalBody(): JQuery;
-}
-
-declare var BootstrapDialog: BootstrapDialogStatic;
+declare const BootstrapDialog: BootstrapDialog.DialogStatic;

From d3aa7f7578ebbc36a84acd0b4a06de51dc94bdc2 Mon Sep 17 00:00:00 2001
From: denis <denisname@users.noreply.github.com>
Date: Wed, 7 Mar 2018 23:34:04 +0100
Subject: [PATCH 0333/1382] Improve topojson types

Remove all `any`
Add tests
Activate StrictNullChecks
---
 types/topojson/index.d.ts                  | 216 ++++++++++++++++++---
 types/topojson/test/atlas-tests.ts         |  66 +++++++
 types/topojson/test/client-tests.ts        |  97 +++++++++
 types/topojson/test/server-tests.ts        |  14 ++
 types/topojson/test/simplify-tests.ts      |  92 +++++++++
 types/topojson/test/specification-tests.ts | 196 +++++++++++++++++++
 types/topojson/topojson-tests.ts           |   8 +-
 types/topojson/tsconfig.json               |   9 +-
 8 files changed, 667 insertions(+), 31 deletions(-)
 create mode 100644 types/topojson/test/atlas-tests.ts
 create mode 100644 types/topojson/test/client-tests.ts
 create mode 100644 types/topojson/test/server-tests.ts
 create mode 100644 types/topojson/test/simplify-tests.ts
 create mode 100644 types/topojson/test/specification-tests.ts

diff --git a/types/topojson/index.d.ts b/types/topojson/index.d.ts
index 67f71310d0..6330f23b1c 100644
--- a/types/topojson/index.d.ts
+++ b/types/topojson/index.d.ts
@@ -1,49 +1,217 @@
-// Type definitions for topojson 3.0
+// Type definitions for topojson 3.2
 // Project: https://github.com/topojson/topojson
 // Definitions by: Ricardo Mello <https://github.com/ricardo-mello>
-//                 Zhutian Chen  <https://github.com/chenzhutian>
+//                 Zhutian Chen <https://github.com/chenzhutian>
+//                 denisname <https://github.com/denisname>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.5
 
-export function bbox(topology: any): any;
+import * as GeoJSON from "geojson";
 
-export function feature(topology: any, o: any): { features: any[]; type: string };
+export as namespace topojson;
 
-export function filter(topology: any, filter: any): any;
+// ---------------------------------------------------------------
+// TopoJSON Format Specification
+// ---------------------------------------------------------------
 
-export function filterAttached(topology: any): any;
+// See: https://github.com/topojson/topojson-specification/
 
-export function filterAttachedWeight(topology: any, minWeight: any, weight: any): any;
+// 2. TopoJSON Objects
+export interface TopoJSON {
+    type: "Topology" | GeoJSON.GeoJsonGeometryTypes | null;
+    bbox?: GeoJSON.BBox;
+}
 
-export function filterWeight(topology: any, minWeight: any, weight: any): any;
+// 2.1. Topology Objects
+export interface Topology<T extends Objects<Properties> = Objects<Properties>> extends TopoJSON {
+    type: "Topology";
+    objects: T;
+    arcs: Arc[];
+    transform?: Transform;
+}
 
-export function merge(topology: any, ...args: any[]): { type: any, coordinates: any[] };
+// 2.1.1. Positions
+export type Positions = number[]; // at least two elements
 
-export function mergeArcs(topology: any, objects: any): any;
+// 2.1.2. Transforms
+export interface Transform {
+    scale: [number, number];
+    translate: [number, number];
+}
 
-export function mesh(topology: any, ...args: any[]): { type: any; coordinates: any[]; };
+// 2.1.3. Arcs
+export type Arc = Positions[]; // at least two elements
 
-export function meshArcs(topology: any, object$$1: any, filter: any, ...args: any[]): { type: any; coordinates: any[]; };
+// 2.1.4. Arc Indexes
+export type ArcIndexes = number[];
 
-export function neighbors(objects: any): any[];
+// 2.1.5. Objects
+export type Properties = GeoJSON.GeoJsonProperties;
 
-export function planarRingArea(ring: any): any;
+export interface Objects<P extends Properties = {}> {
+    [key: string]: GeometryObject<P>;
+}
 
-export function planarTriangleArea(triangle: any): any;
+// 2.2. Geometry Objects
+export interface GeometryObjectA<P extends Properties = {}> extends TopoJSON {
+    type: GeoJSON.GeoJsonGeometryTypes | null;
+    id?: number | string;
+    properties?: P;
+}
 
-export function presimplify(topology: any, weight: any): any[];
+export type GeometryObject<P extends Properties = {}> =
+    Point<P> | MultiPoint<P> |
+    LineString<P> | MultiLineString<P> |
+    Polygon<P> | MultiPolygon<P> |
+    GeometryCollection<P> |
+    NullObject;
 
-export function quantile(topology: any, p: any): any;
+// 2.2.1. Point
+export interface Point<P extends Properties = {}> extends GeometryObjectA<P> {
+    type: "Point";
+    coordinates: Positions;
+}
 
-export function quantize(topology: any, transform: any): any;
+// 2.2.2. MultiPoint
+export interface MultiPoint<P extends Properties = {}> extends GeometryObjectA<P> {
+    type: "MultiPoint";
+    coordinates: Positions[];
+}
 
-export function simplify(topology: any, minWeight: any): any;
+// 2.2.3. LineString
+export interface LineString<P extends Properties = {}> extends GeometryObjectA<P> {
+    type: "LineString";
+    arcs: ArcIndexes;
+}
 
-export function sphericalRingArea(ring: any, interior: any): any;
+// 2.2.4. MultiLineString
+export interface MultiLineString<P extends Properties = {}> extends GeometryObjectA<P> {
+    type: "MultiLineString";
+    arcs: ArcIndexes[];
+}
 
-export function sphericalTriangleArea(t: any): any;
+// 2.2.5. Polygon
+export interface Polygon<P extends Properties = {}> extends GeometryObjectA<P> {
+    type: "Polygon";
+    arcs: ArcIndexes[];
+}
 
-export function topology(objects: any, quantization: any): any;
+// 2.2.6. MultiPolygon
+export interface MultiPolygon<P extends Properties = {}> extends GeometryObjectA<P> {
+    type: "MultiPolygon";
+    arcs: ArcIndexes[][];
+}
 
-export function transform(transform: any): any;
+// 2.2.7. Geometry Collection
+export interface GeometryCollection<P extends Properties = {}> extends GeometryObjectA<P> {
+    type: "GeometryCollection";
+    geometries: Array<GeometryObject<P>>;
+}
 
-export function untransform(transform: any): any;
+// More
+export interface NullObject extends GeometryObjectA {
+    type: null;
+}
+
+export type OrNull<T extends Objects> = {
+    [P in keyof T]: T[P] | NullObject;
+};
+
+// ---------------------------------------------------------------
+// TopoJSON Server
+// ---------------------------------------------------------------
+
+export function topology(objects: {[k: string]: GeoJSON.GeoJsonObject}, quantization?: number): Topology;
+
+// ---------------------------------------------------------------
+// TopoJSON Simplify
+// ---------------------------------------------------------------
+
+export type Triangle = [[number, number], [number, number], [number, number]];
+export type TriangleWeighter = (triangle: Triangle) => number;
+export type Ring = Array<[number, number]>;
+export type RingWeighter = (triangle: Ring) => number;
+export type Filter = (ring: Ring, interior: boolean) => boolean;
+
+export function presimplify<T extends Objects>(topology: Topology<T>, weight?: TriangleWeighter): Topology<T>;
+
+export function simplify<T extends Objects>(topology: Topology<T>, minWeight?: number): Topology<T>;
+
+export function quantile(topology: Topology, p: number): number;
+
+export function filter<K extends Objects>(topology: Topology<K>, filter: Filter): Topology<OrNull<K>>;
+
+export function filterAttached(topology: Topology): Filter;
+
+export function filterAttachedWeight(topology: Topology, minWeight?: number, weight?: RingWeighter): Filter;
+
+export function filterWeight(topology: Topology, minWeight?: number, weight?: RingWeighter): Filter;
+
+export function planarRingArea(ring: Ring): number;
+
+export function planarTriangleArea(triangle: Triangle): number;
+
+export function sphericalRingArea(ring: Ring, interior: true): number;
+
+export function sphericalTriangleArea(triangle: Triangle): number;
+
+// ---------------------------------------------------------------
+// TopoJSON Client
+// ---------------------------------------------------------------
+
+export type Transformer = (point: number[], index?: boolean) => number[];
+
+export function feature<P = GeoJSON.GeoJsonProperties>(topology: Topology, object: Point<P>): GeoJSON.Feature<GeoJSON.Point, P>;
+export function feature<P = GeoJSON.GeoJsonProperties>(topology: Topology, object: MultiPoint<P>): GeoJSON.Feature<GeoJSON.MultiPoint, P>;
+export function feature<P = GeoJSON.GeoJsonProperties>(topology: Topology, object: LineString<P>): GeoJSON.Feature<GeoJSON.LineString, P>;
+export function feature<P = GeoJSON.GeoJsonProperties>(topology: Topology, object: MultiLineString<P>): GeoJSON.Feature<GeoJSON.MultiLineString, P>;
+export function feature<P = GeoJSON.GeoJsonProperties>(topology: Topology, object: Polygon<P>): GeoJSON.Feature<GeoJSON.Polygon, P>;
+export function feature<P = GeoJSON.GeoJsonProperties>(topology: Topology, object: MultiPolygon<P>): GeoJSON.Feature<GeoJSON.MultiPolygon, P>;
+export function feature<P = GeoJSON.GeoJsonProperties>(topology: Topology, object: GeometryCollection<P>): GeoJSON.FeatureCollection<GeoJSON.GeometryObject, P>;
+export function feature<P = GeoJSON.GeoJsonProperties>(topology: Topology, object: GeometryObject<P>)
+    : GeoJSON.Feature<GeoJSON.GeometryObject, P> | GeoJSON.FeatureCollection<GeoJSON.GeometryObject, P>;
+
+export function merge(topology: Topology, objects: Array<Polygon | MultiPolygon>): GeoJSON.MultiPolygon;
+
+export function mergeArcs(topology: Topology, objects: Array<Polygon | MultiPolygon>): MultiPolygon;
+
+export function mesh(topology: Topology, obj?: GeometryObject, filter?: (a: GeometryObject, b: GeometryObject) => boolean): GeoJSON.MultiLineString;
+
+export function meshArcs(topology: Topology, obj?: GeometryObject, filter?: (a: GeometryObject, b: GeometryObject) => boolean): MultiLineString;
+
+export function neighbors(objects: GeometryObject[]): number[][];
+
+export function bbox(topology: Topology): GeoJSON.BBox;
+
+export function quantize<T extends Objects>(topology: Topology<T>, transform: Transform | number): Topology<T>;
+
+export function transform(transform: Transform | null): Transformer;
+
+export function untransform(transform: Transform | null): Transformer;
+
+// ---------------------------------------------------------------
+// U.S. Atlas TopoJSON
+// ---------------------------------------------------------------
+
+export interface UsAtlas extends topojson.Topology {
+    objects: {
+        counties: {type: "GeometryCollection", geometries: Array<Polygon | MultiPolygon>};
+        states: {type: "GeometryCollection", geometries: Array<Polygon | MultiPolygon>};
+        nation: topojson.GeometryCollection;
+    };
+    bbox: [number, number, number, number];
+    transform: topojson.Transform;
+}
+
+// ---------------------------------------------------------------
+// World Atlas TopoJSON
+// ---------------------------------------------------------------
+
+export interface WorldAtlas extends topojson.Topology {
+    objects: {
+        countries: {type: "GeometryCollection", geometries: Array<Polygon | MultiPolygon>};
+        land: topojson.GeometryCollection;
+    };
+    bbox: [number, number, number, number];
+    transform: topojson.Transform;
+}
diff --git a/types/topojson/test/atlas-tests.ts b/types/topojson/test/atlas-tests.ts
new file mode 100644
index 0000000000..3cbb9c12f2
--- /dev/null
+++ b/types/topojson/test/atlas-tests.ts
@@ -0,0 +1,66 @@
+// Tests for: https://github.com/topojson/us-atlas and https://github.com/topojson/world-atlas
+
+const world: topojson.WorldAtlas = {
+    type: "Topology",
+    objects: {
+        countries: {
+            type: "GeometryCollection",
+            geometries: [{
+                type: "Polygon",
+                arcs: [[]],
+                id: "004",
+            }],
+        },
+        land: {
+            type: "GeometryCollection",
+            geometries: [{
+                type: "MultiPolygon",
+                arcs: [[[]]],
+            }],
+        },
+    },
+    arcs: [[]],
+    bbox: [-180, -85, 180, 83],
+    transform: {
+        scale: [0, 0],
+        translate: [-180, -85],
+    },
+};
+
+const us: topojson.UsAtlas = {
+    type: "Topology",
+    bbox: [-56, 12, 942, 596],
+    transform: {
+        scale: [0, 0],
+        translate: [-56, 12],
+    },
+    objects: {
+        counties: {
+            type: "GeometryCollection",
+            geometries: [{
+                type: "Polygon",
+                arcs: [[]],
+                id: "05089",
+            }],
+        },
+        states: {
+            type: "GeometryCollection",
+            geometries: [{
+                type: "MultiPolygon",
+                arcs: [[[]]],
+                id: "11",
+            }],
+        },
+        nation: {
+            type: "GeometryCollection",
+            geometries: [{
+                type: "MultiPolygon",
+                arcs: [[[]]],
+            }],
+        },
+    },
+    arcs: [[[]]],
+};
+
+// $ExpectError
+us.objects.xxx;
diff --git a/types/topojson/test/client-tests.ts b/types/topojson/test/client-tests.ts
new file mode 100644
index 0000000000..2e21e2b665
--- /dev/null
+++ b/types/topojson/test/client-tests.ts
@@ -0,0 +1,97 @@
+// Tests for: https://github.com/topojson/topojson-client
+
+let geoMP: GeoJSON.MultiPolygon;
+let geoMLS: GeoJSON.MultiLineString;
+let topoMP: topojson.MultiPolygon;
+let topoMLS: topojson.MultiLineString;
+let bbox: GeoJSON.BBox;
+let transformer: topojson.Transformer;
+let color: string;
+let size: number;
+
+interface TestProp {
+    color: string;
+    size: number;
+}
+
+const selectedGeometries: Array<topojson.Polygon | topojson.MultiPolygon> =
+    us.objects.states.geometries.filter((g) => ["be", 2, undefined].indexOf(g.id) >= 0);
+
+const topoWithProp = {
+    type: "Topology" as "Topology",
+    transform: {scale: [1, 1] as [number, number], translate: [0, 0] as [number, number]},
+    objects: {
+        foo: {type: "Polygon" as "Polygon", properties: {color: "orange", size: 42}, arcs: [[0]]},
+        bar: {type: "Polygon" as "Polygon", properties: {name: "hello"}, arcs: [[0]]},
+        more: {type: "Polygon" as "Polygon", arcs: [[0]]},
+        coll: {
+            type: "GeometryCollection" as "GeometryCollection", geometries: [
+                {type: "Polygon" as "Polygon", properties: {color: "orange", size: 42}, arcs: [[0]]},
+            ],
+        },
+    },
+    arcs: [
+        [[0, 0], [1, 0], [0, 1], [-1, 0], [0, -1]],
+        [[0, 0], [1, 0], [0, 1]],
+        [[1, 1], [-1, 0], [0, -1]],
+        [[1, 1]],
+        [[0, 0]]
+    ],
+};
+
+const featurePolygon: GeoJSON.Feature<GeoJSON.Polygon> =
+    topojson.feature(topoWithProp, topoWithProp.objects.foo);
+
+const featurePolygonWithProp: GeoJSON.Feature<GeoJSON.Polygon, TestProp> =
+    topojson.feature(topoWithProp, topoWithProp.objects.foo);
+
+const featureCollection: GeoJSON.FeatureCollection<GeoJSON.GeometryObject> =
+    topojson.feature(us, us.objects.counties);
+
+const featureObject: GeoJSON.Feature<GeoJSON.GeometryObject> | GeoJSON.FeatureCollection<GeoJSON.GeometryObject, {}> =
+    topojson.feature(topoWithProp, topoWithProp.objects.foo as topojson.GeometryObject);
+
+const propColor = topojson.feature(topoWithProp, topoWithProp.objects.foo).properties;
+color = propColor.color;
+size = propColor.size;
+
+const propName = topojson.feature(topoWithProp, topoWithProp.objects.bar).properties;
+const aName: string = propName.name;
+
+const propCollection = topojson.feature(topoWithProp, topoWithProp.objects.coll).features[0].properties;
+color = propCollection.color;
+size = propCollection.size;
+
+const prop3: GeoJSON.GeoJsonProperties = topojson.feature(topoWithProp, topoWithProp.objects.more).properties;
+
+geoMP = topojson.merge(us, selectedGeometries);
+
+topoMP = topojson.mergeArcs(us, selectedGeometries);
+
+geoMLS = topojson.mesh(us);
+geoMLS = topojson.mesh(us, us.objects.states);
+geoMLS = topojson.mesh(us, us.objects.states, (a, b) => a !== b);
+
+topoMLS = topojson.meshArcs(us);
+topoMLS = topojson.meshArcs(us, us.objects.states);
+topoMLS = topojson.meshArcs(us, us.objects.states, (a, b) => a !== b);
+
+const n: number[][] = topojson.neighbors(world.objects.countries.geometries);
+
+// Transforms
+const usTransform: topojson.Transform = us.transform;
+
+bbox = topojson.bbox(us);
+bbox = topojson.bbox({type: "Topology", objects: {}, arcs: []});
+
+newUs = topojson.quantize(us, 1e4);
+newUs = topojson.quantize(us, {scale: [1, 1], translate: [0, 0]});
+newUs = topojson.quantize(us, us.transform);
+
+transformer = topojson.transform(null);
+transformer = topojson.transform({scale: [1, 1], translate: [0, 0]});
+transformer = topojson.transform(usTransform);
+
+transformer = topojson.untransform(null);
+transformer = topojson.untransform({scale: [1, 1], translate: [0, 0]});
+transformer = topojson.untransform(usTransform);
diff --git a/types/topojson/test/server-tests.ts b/types/topojson/test/server-tests.ts
new file mode 100644
index 0000000000..262fa8e6f5
--- /dev/null
+++ b/types/topojson/test/server-tests.ts
@@ -0,0 +1,14 @@
+// Tests for: https://github.com/topojson/topojson-server
+
+let topo: topojson.Topology;
+
+const aPoint: GeoJSON.Point = {type: "Point", coordinates: [30, 10]};
+const aPolygon: GeoJSON.Polygon = {type: "Polygon", coordinates: [[[30, 10], [40, 40], [20, 40], [30, 10]]]};
+
+const objects = {
+    aPoint,
+    aPolygon,
+};
+
+topo = topojson.topology(objects);
+topo = topojson.topology(objects, 1e4);
diff --git a/types/topojson/test/simplify-tests.ts b/types/topojson/test/simplify-tests.ts
new file mode 100644
index 0000000000..6347466236
--- /dev/null
+++ b/types/topojson/test/simplify-tests.ts
@@ -0,0 +1,92 @@
+// Tests for: https://github.com/topojson/topojson-simplify
+
+interface UsAtlasObjects extends topojson.Objects {
+    counties: {type: "GeometryCollection", geometries: Array<topojson.Polygon | topojson.MultiPolygon>};
+    states: {type: "GeometryCollection", geometries: Array<topojson.Polygon | topojson.MultiPolygon>};
+    nation: topojson.GeometryCollection;
+}
+
+interface UsEmpty extends topojson.Objects {
+    counties: topojson.NullObject;
+    states: topojson.NullObject;
+    nation: topojson.NullObject;
+}
+
+let aTopology: topojson.Topology;
+let presimplifiedUs: topojson.Topology<UsAtlasObjects>;
+let newUs: topojson.Topology<UsAtlasObjects>;
+let emptyUs: topojson.Topology<UsEmpty>;
+let geomCollection: topojson.GeometryCollection;
+let geomCollectionOrNull: topojson.GeometryCollection | topojson.NullObject;
+let aNullObject: topojson.NullObject;
+let filter: topojson.Filter;
+
+presimplifiedUs = topojson.presimplify(us);
+presimplifiedUs = topojson.presimplify(us, topojson.planarTriangleArea);
+presimplifiedUs = topojson.presimplify(us, topojson.sphericalTriangleArea);
+presimplifiedUs = topojson.presimplify(us, (points: Array<[number, number]>) => 1.5);
+
+geomCollection = topojson.presimplify(us).objects.counties;
+geomCollection = topojson.presimplify(us).objects.nation;
+geomCollection = topojson.presimplify(us).objects.states;
+
+let minWeight = topojson.quantile(presimplifiedUs, 0.5);
+
+newUs = topojson.simplify(presimplifiedUs);
+newUs = topojson.simplify(presimplifiedUs, 1.23);
+newUs = topojson.simplify(presimplifiedUs, minWeight);
+
+geomCollection = topojson.simplify(presimplifiedUs).objects.counties;
+geomCollection = topojson.simplify(presimplifiedUs).objects.nation;
+geomCollection = topojson.simplify(presimplifiedUs).objects.states;
+
+// Filtering
+
+filter = topojson.filterAttached(us);
+
+filter = topojson.filterAttachedWeight(us);
+filter = topojson.filterAttachedWeight(us, 0.5);
+filter = topojson.filterAttachedWeight(us, 0.5, topojson.planarRingArea);
+filter = topojson.filterAttachedWeight(us, 0.5, (points: Array<[number, number]>) => 1.5);
+
+filter = topojson.filterWeight(us);
+filter = topojson.filterWeight(us, 0.5);
+filter = topojson.filterWeight(us, 0.5, topojson.planarRingArea);
+filter = topojson.filterWeight(us, 0.5, (points: Array<[number, number]>) => 1.5);
+
+aTopology = topojson.filter(us, filter);
+newUs = topojson.filter(us, (ring: topojson.Ring, interior: boolean) => true) as topojson.UsAtlas;
+emptyUs = topojson.filter(us, () => false) as topojson.Topology<UsEmpty>;
+
+geomCollectionOrNull = topojson.filter(us, () => Math.random() > 0.9).objects.nation;
+aNullObject = topojson.filter(us, () => false).objects.nation as topojson.NullObject;
+geomCollection = topojson.filter(us, () => true).objects.nation as topojson.GeometryCollection;
+
+// Geometry
+
+let area: number;
+area = topojson.planarRingArea([[0, 0], [0, 1], [1, 1], [1, 0], [0, 0]]);
+area = topojson.planarTriangleArea([[0, 0], [0, 1], [1, 1]]);
+area = topojson.sphericalRingArea([[0, 0], [0, 90], [90, 180], [0, 0]], true);
+area = topojson.sphericalTriangleArea([[0, 0], [0, 90], [90, 180]]);
+
+// Fails
+
+interface MyAtlas extends topojson.Topology {
+    objects: {
+        obj: topojson.GeometryCollection;
+    };
+    more: "hello";
+}
+
+let myAtlas: MyAtlas = null as any; // shortcut...
+console.log(myAtlas.more);
+
+let s: string;
+// $ExpectError
+s = topojson.presimplify(myAtlas).more; // must fail
+// $ExpectError
+s = topojson.simplify(myAtlas).more; // must fail
+
+// // $ExpectError
+// area = topojson.planarTriangleArea([[0, 0], [0, 1], [1, 1], [1, 0]]); // must fail in 2.7
diff --git a/types/topojson/test/specification-tests.ts b/types/topojson/test/specification-tests.ts
new file mode 100644
index 0000000000..ccb4275468
--- /dev/null
+++ b/types/topojson/test/specification-tests.ts
@@ -0,0 +1,196 @@
+// Tests for: https://github.com/topojson/topojson-specification
+
+// Geometry Objects
+
+const point: topojson.Point = {
+    type: "Point",
+    coordinates: [0, 0],
+};
+
+const multiPoint: topojson.MultiPoint = {
+    type: "MultiPoint",
+    coordinates: [[0, 0]],
+};
+
+const lineString: topojson.LineString = {
+    type: "LineString",
+    arcs: [0],
+};
+
+const multiLineString: topojson.MultiLineString = {
+    type: "MultiLineString",
+    arcs: [[3], [4]],
+};
+
+const polygon: topojson.Polygon = {
+    type: "Polygon",
+    arcs: [[0]],
+};
+
+const multiPolygon: topojson.MultiPolygon = {
+    type: "MultiPolygon",
+    arcs: [[[0]]],
+};
+
+const geometryCollection: topojson.GeometryCollection = {
+    type: "GeometryCollection",
+    geometries: [
+        {type: "Polygon", arcs: [[0]]},
+        {type: "MultiPolygon", arcs: [[[0]]]},
+        {type: "GeometryCollection", geometries: [
+            {type: "Point", coordinates: [0, 0]}
+        ]}
+    ],
+};
+
+const nullObject: topojson.NullObject = {
+    type: null,
+};
+
+// Properties
+
+interface TestProp {
+    color: string;
+    size: number;
+}
+
+const pointWithProp: topojson.Point<TestProp> = {
+    type: "Point",
+    coordinates: [0, 0],
+    properties: {color: "orange", size: 42},
+};
+
+const str: string = pointWithProp.properties!.color;
+const nbr: number = pointWithProp.properties!.size;
+
+// Topology
+
+let topology: topojson.Topology;
+
+topology = {
+    type: "Topology",
+    objects: {},
+    arcs: [],
+};
+
+topology = {
+    type: "Topology",
+    bbox: [0, 0, 1, 1],
+    transform: {
+        scale: [1, 1],
+        translate: [0, 0],
+    },
+    objects: {
+        foo: {
+            type: "Polygon",
+            arcs: [[0]],
+        },
+    },
+    arcs: [[[0, 0], [1, 1]], [[1, 1], [-1, -1]]],
+};
+
+topology = {
+    type: "Topology",
+    transform: {
+        scale: [1, 1],
+        translate: [0, 0],
+    },
+    objects: {
+        point,
+        lineString,
+        multiLineString,
+        multiPoint,
+        polygon,
+        multiPolygon,
+        geometryCollection,
+        nullObject,
+    },
+    arcs: [
+        [[0, 0], [1, 0], [0, 1], [-1, 0], [0, -1]],
+        [[0, 0], [1, 0], [0, 1]],
+        [[1, 1], [-1, 0], [0, -1]],
+        [[1, 1]],
+        [[0, 0]]
+    ],
+};
+
+topology = {
+    type: "Topology",
+    objects: {
+        example: {
+            type: "GeometryCollection",
+            geometries: [
+            {
+                type: "Point",
+                properties: {
+                    prop0: "value0",
+                },
+                coordinates: [102, 0.5],
+            },
+            {
+                type: "LineString",
+                properties: {
+                    prop0: "value0",
+                    prop1: 0,
+                },
+                arcs: [0],
+            },
+            {
+                type: "Polygon",
+                properties: {
+                    prop0: "value0",
+                    prop1: {
+                        this: "that",
+                    },
+                },
+                arcs: [[-2]],
+            }
+            ],
+        },
+    },
+    arcs: [
+        [[102, 0], [103, 1], [104, 0], [105, 1]],
+        [[100, 0], [101, 0], [101, 1], [100, 1], [100, 0]]
+    ],
+};
+
+// Fails
+
+// $ExpectError
+topology = {
+    type: "Topology",
+    objects: {
+        foo: {
+            type: "hello", // must fail
+            arcs: [[0]],
+        },
+    },
+    arcs: [],
+};
+
+// $ExpectError
+topology = {
+    type: "Topology",
+    objects: {
+        foo: {
+            type: "Point",
+            // must fail:  Property 'coordinates' is missing in type '{ type: "Point"; }'.
+        },
+    },
+    arcs: [],
+};
+
+// $ExpectError
+topology = {
+    type: "Topology",
+    objects: {
+        foo: {
+            type: "GeometryCollection",
+            geometries: [
+                {type: "Polygon"}
+                // must fail: Property 'arcs' is missing in type '{ type: "Polygon"; }'
+            ],
+        },
+    },
+    arcs: [],
+};
diff --git a/types/topojson/topojson-tests.ts b/types/topojson/topojson-tests.ts
index 68171809d5..953fda4743 100644
--- a/types/topojson/topojson-tests.ts
+++ b/types/topojson/topojson-tests.ts
@@ -1,6 +1,4 @@
-import * as topojson from 'topojson';
+const hello = "world";
 
-// TODO: complete tests.
-
-topojson.feature(null, null); // $ExpectType { features: any[]; type: string; }
-topojson.mesh(null, null, (a: any, b: any) => a !== b); // $ExpectType { type: any; coordinates: any[]; }
+// NOTE: The standard bundle definition has no particular function.
+// See ./test/ for per bundle tests.
diff --git a/types/topojson/tsconfig.json b/types/topojson/tsconfig.json
index 339e9a307d..65b6cd1f07 100644
--- a/types/topojson/tsconfig.json
+++ b/types/topojson/tsconfig.json
@@ -7,7 +7,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
@@ -19,6 +19,11 @@
     },
     "files": [
         "index.d.ts",
-        "topojson-tests.ts"
+        "topojson-tests.ts",
+        "test/atlas-tests.ts",
+        "test/client-tests.ts",
+        "test/server-tests.ts",
+        "test/simplify-tests.ts",
+        "test/specification-tests.ts"
     ]
 }
\ No newline at end of file

From 4387312b094f0ce2c5e7456b68909e713399705d Mon Sep 17 00:00:00 2001
From: Olivier Sechet <osechet@gmail.com>
Date: Wed, 7 Mar 2018 23:42:04 +0100
Subject: [PATCH 0334/1382] Issue #24115 - Fix DragAndDropOptions'
 formatConstructors

---
 types/openlayers/index.d.ts          |  2 +-
 types/openlayers/openlayers-tests.ts | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/types/openlayers/index.d.ts b/types/openlayers/index.d.ts
index 333ee0f621..0fdb353fd7 100644
--- a/types/openlayers/index.d.ts
+++ b/types/openlayers/index.d.ts
@@ -12962,7 +12962,7 @@ declare module olx {
          *     source: (ol.source.Vector|undefined)}}
          */
         interface DragAndDropOptions {
-            formatConstructors?: Array<((n: ol.format.Feature) => any)>;
+            formatConstructors?: Array<typeof ol.format.Feature>;
             projection: ol.ProjectionLike;
             target?: Element;
             source?: ol.source.Vector;
diff --git a/types/openlayers/openlayers-tests.ts b/types/openlayers/openlayers-tests.ts
index ce13ae8385..77985150d1 100644
--- a/types/openlayers/openlayers-tests.ts
+++ b/types/openlayers/openlayers-tests.ts
@@ -896,6 +896,16 @@ let modifySource: ol.interaction.Modify = new ol.interaction.Modify({
     }),
 });
 
+const dragAndDrop: ol.interaction.DragAndDrop = new ol.interaction.DragAndDrop({
+    formatConstructors: [ol.format.KML],
+    projection: projectionLike,
+    source: vectorSource,
+});
+
+const dragAndDropWithUndefined: ol.interaction.DragAndDrop = new ol.interaction.DragAndDrop({
+    projection: projectionLike,
+});
+
 let draw: ol.interaction.Draw = new ol.interaction.Draw({
     type: "Point",
     clickTolerance: numberValue,

From ce5502be72636585bf25d292958a25c5d79e9639 Mon Sep 17 00:00:00 2001
From: Olivier Sechet <osechet@gmail.com>
Date: Thu, 8 Mar 2018 00:09:14 +0100
Subject: [PATCH 0335/1382] Clean no-redundant-jsdoc lint

---
 types/openlayers/index.d.ts  | 3600 ----------------------------------
 types/openlayers/tslint.json |    3 +-
 2 files changed, 1 insertion(+), 3602 deletions(-)

diff --git a/types/openlayers/index.d.ts b/types/openlayers/index.d.ts
index 333ee0f621..4454efdeb9 100644
--- a/types/openlayers/index.d.ts
+++ b/types/openlayers/index.d.ts
@@ -13,28 +13,17 @@
 
 declare type GlobalObject = Object;
 
-/**
- * @namespace ol
- */
 declare module ol {
     /**
      * Error object thrown when an assertion failed. This is an ECMA-262 Error,
      * extended with a `code` property.
      * @see {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error}
-     * @constructor
-     * @extends {Error}
-     * @implements {oli.AssertionError}
-     * @param {number} code Error code.
      */
     class AssertionError extends Error {
         /**
          * Error object thrown when an assertion failed. This is an ECMA-262 Error,
          * extended with a `code` property.
          * @see {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error}
-         * @constructor
-         * @extends {Error}
-         * @implements {oli.AssertionError}
-         * @param {number} code Error code.
          */
         constructor(code: number);
 
@@ -43,7 +32,6 @@ declare module ol {
          * {@link http://openlayers.org/en/latest/errors.html} (replace `latest` with
          * the version found in the OpenLayers script's header comment if a version
          * other than the latest is used).
-         * @type {number}
          * @api
          */
         code: number;
@@ -65,8 +53,6 @@ declare module ol {
      *       ],
      *     ..
      *
-     * @constructor
-     * @param {olx.AttributionOptions} options Attribution options.
      * @struct
      * @api stable
      */
@@ -87,8 +73,6 @@ declare module ol {
          *       ],
          *     ..
          *
-         * @constructor
-         * @param {olx.AttributionOptions} options Attribution options.
          * @struct
          * @api stable
          */
@@ -96,7 +80,6 @@ declare module ol {
 
         /**
          * Get the attribution markup.
-         * @return {string} The attribution HTML.
          * @api stable
          */
         getHTML(): string;
@@ -110,10 +93,7 @@ declare module ol {
      * Collection; they trigger events on the appropriate object, not on the
      * Collection as a whole.
      *
-     * @constructor
-     * @extends {ol.Object}
      * @fires ol.Collection.Event
-     * @param {!Array.<T>=} opt_array Array.
      * @template T
      * @api stable
      */
@@ -126,10 +106,7 @@ declare module ol {
          * Collection; they trigger events on the appropriate object, not on the
          * Collection as a whole.
          *
-         * @constructor
-         * @extends {ol.Object}
          * @fires ol.Collection.Event
-         * @param {!Array.<T>=} opt_array Array.
          * @template T
          * @api stable
          */
@@ -144,18 +121,14 @@ declare module ol {
         /**
          * Add elements to the collection.  This pushes each item in the provided array
          * to the end of the collection.
-         * @param {!Array.<T>} arr Array.
-         * @return {ol.Collection.<T>} This collection.
          * @api stable
          */
         extend(arr: T[]): ol.Collection<T>;
 
         /**
          * Iterate over each element, calling the provided callback.
-         * @param {function(this: S, T, number, Array.<T>): *} f The function to call
          *     for every element. This function takes 3 arguments (the element, the
          *     index and the array). The return value is ignored.
-         * @param {S=} opt_this The object to use as `this` in `f`.
          * @template S
          * @api stable
          */
@@ -166,22 +139,18 @@ declare module ol {
          * is mutated, no events will be dispatched by the collection, and the
          * collection's "length" property won't be in sync with the actual length
          * of the array.
-         * @return {!Array.<T>} Array.
          * @api stable
          */
         getArray(): T[];
 
         /**
          * Get the element at the provided index.
-         * @param {number} index Index.
-         * @return {T} Element.
          * @api stable
          */
         item(index: number): T;
 
         /**
          * Get the length of this collection.
-         * @return {number} The length of the array.
          * @observable
          * @api stable
          */
@@ -189,8 +158,6 @@ declare module ol {
 
         /**
          * Insert an element at the provided index.
-         * @param {number} index Index.
-         * @param {T} elem Element.
          * @api stable
          */
         insertAt(index: number, elem: T): void;
@@ -198,23 +165,18 @@ declare module ol {
         /**
          * Remove the last element of the collection and return it.
          * Return `undefined` if the collection is empty.
-         * @return {T|undefined} Element.
          * @api stable
          */
         pop(): (T);
 
         /**
          * Insert the provided element at the end of the collection.
-         * @param {T} elem Element.
-         * @return {number} Length.
          * @api stable
          */
         push(elem: T): number;
 
         /**
          * Remove the first occurrence of an element from the collection.
-         * @param {T} elem Element.
-         * @return {T|undefined} The removed element or undefined if none found.
          * @api stable
          */
         remove(elem: T): (T);
@@ -222,16 +184,12 @@ declare module ol {
         /**
          * Remove the element at the provided index and return it.
          * Return `undefined` if the collection does not contain this index.
-         * @param {number} index Index.
-         * @return {T|undefined} Value.
          * @api stable
          */
         removeAt(index: number): (T);
 
         /**
          * Set the element at the provided index.
-         * @param {number} index Index.
-         * @param {T} elem Element.
          * @api stable
          */
         setAt(index: number, elem: T): void;
@@ -245,11 +203,6 @@ declare module ol {
          * Events emitted by {@link ol.Collection} instances are instances of this
          * type.
          *
-         * @constructor
-         * @extends {ol.events.Event}
-         * @implements {oli.Collection.Event}
-         * @param {ol.Collection.EventType} type Type.
-         * @param {*=} opt_element Element.
          */
         class Event extends ol.events.Event {
             /**
@@ -257,17 +210,11 @@ declare module ol {
              * Events emitted by {@link ol.Collection} instances are instances of this
              * type.
              *
-             * @constructor
-             * @extends {ol.events.Event}
-             * @implements {oli.Collection.Event}
-             * @param {ol.Collection.EventType} type Type.
-             * @param {*=} opt_element Element.
              */
             constructor(type: ol.Collection.EventType, opt_element?: any);
 
             /**
              * The element that is added to or removed from the collection.
-             * @type {*}
              * @api stable
              */
             element: any;
@@ -279,23 +226,17 @@ declare module ol {
      * `rgb(r,g,b)` or `rgba(r,g,b,a)` format, or in hex `#rrggbb` or `#rgb` format.
      * Color names, like 'red', 'blue' or 'green', may also be used with the
      * Canvas renderer.
-     *
-     * @namespace ol.color
      */
     module color {
         /**
          * Return the color as an array. This function maintains a cache of calculated
          * arrays which means the result should not be modified.
-         * @param {ol.Color|string} color Color.
-         * @return {ol.Color} Color.
          * @api
          */
         function asArray(color: (ol.Color | string)): ol.Color;
 
         /**
          * Return the color as an rgba string.
-         * @param {ol.Color|string} color Color.
-         * @return {string} Rgba string.
          * @api
          */
         function asString(color: (ol.Color | string)): string;
@@ -304,20 +245,14 @@ declare module ol {
     /**
      * An {@link ol.ColorLike} can be a color, gradient or pattern accepted by
      * [CanvasRenderingContext2D.fillStyle](https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/fillStyle).
-     * @namespace ol.colorlike
      */
     module colorlike {
         /**
-         * @param {ol.Color|ol.ColorLike} color Color.
-         * @return {ol.ColorLike} The color as an ol.ColorLike
          * @api
          */
         function asColorLike(color: (ol.Color | ol.ColorLike)): ol.ColorLike;
     }
 
-    /**
-     * @namespace ol.control
-     */
     module control {
         /**
          * @classdesc
@@ -326,9 +261,6 @@ declare module ol {
          * By default it will show in the bottom right portion of the map, but this can
          * be changed by using a css selector for `.ol-attribution`.
          *
-         * @constructor
-         * @extends {ol.control.Control}
-         * @param {olx.control.AttributionOptions=} opt_options Attribution options.
          * @api stable
          */
         class Attribution extends ol.control.Control {
@@ -338,32 +270,24 @@ declare module ol {
              * in the map. This control is one of the default controls included in maps.
              * By default it will show in the bottom right portion of the map, but this can
              * be changed by using a css selector for `.ol-attribution`.
-             *
-             * @constructor
-             * @extends {ol.control.Control}
-             * @param {olx.control.AttributionOptions=} opt_options Attribution options.
              * @api stable
              */
             constructor(opt_options?: olx.control.AttributionOptions);
 
             /**
              * Update the attribution element.
-             * @param {ol.MapEvent} mapEvent Map event.
-             * @this {ol.control.Attribution}
              * @api
              */
             static render(mapEvent: ol.MapEvent): void;
 
             /**
              * Return `true` if the attribution is collapsible, `false` otherwise.
-             * @return {boolean} True if the widget is collapsible.
              * @api stable
              */
             getCollapsible(): boolean;
 
             /**
              * Set whether the attribution should be collapsible.
-             * @param {boolean} collapsible True if the widget is collapsible.
              * @api stable
              */
             setCollapsible(collapsible: boolean): void;
@@ -372,7 +296,6 @@ declare module ol {
              * Collapse or expand the attribution according to the passed parameter. Will
              * not do anything if the attribution isn't collapsible or if the current
              * collapsed state is already the one requested.
-             * @param {boolean} collapsed True if the widget is collapsed.
              * @api stable
              */
             setCollapsed(collapsed: boolean): void;
@@ -380,7 +303,6 @@ declare module ol {
             /**
              * Return `true` when the attribution is currently collapsed or `false`
              * otherwise.
-             * @return {boolean} True if the widget is collapsed.
              * @api stable
              */
             getCollapsed(): boolean;
@@ -409,10 +331,6 @@ declare module ol {
          * You can also extend this base for your own control class. See
          * examples/custom-controls for an example of how to do this.
          *
-         * @constructor
-         * @extends {ol.Object}
-         * @implements {oli.control.Control}
-         * @param {olx.control.ControlOptions} options Control options.
          * @api stable
          */
         class Control extends ol.Object {
@@ -439,17 +357,12 @@ declare module ol {
              * You can also extend this base for your own control class. See
              * examples/custom-controls for an example of how to do this.
              *
-             * @constructor
-             * @extends {ol.Object}
-             * @implements {oli.control.Control}
-             * @param {olx.control.ControlOptions} options Control options.
              * @api stable
              */
             constructor(options: olx.control.ControlOptions);
 
             /**
              * Get the map associated with this control.
-             * @return {ol.Map} Map.
              * @api stable
              */
             getMap(): ol.Map;
@@ -458,7 +371,6 @@ declare module ol {
              * Remove the control from its current map and attach it to the new map.
              * Subclasses may set up event handlers to get notified about changes to
              * the map here.
-             * @param {ol.Map} map Map.
              * @api stable
              */
             setMap(map: ol.Map): void;
@@ -469,7 +381,6 @@ declare module ol {
              * after `setMap` is called on the control). If no `target` is set in the
              * options passed to the control constructor and if `setTarget` is not called
              * then the control is added to the map's overlay container.
-             * @param {Element|string} target Target.
              * @api
              */
             setTarget(target: (Element | string)): void;
@@ -487,9 +398,6 @@ declare module ol {
          * toggle the map in full screen mode.
          *
          *
-         * @constructor
-         * @extends {ol.control.Control}
-         * @param {olx.control.FullScreenOptions=} opt_options Options.
          * @api stable
          */
         class FullScreen extends ol.control.Control {
@@ -505,9 +413,6 @@ declare module ol {
              * toggle the map in full screen mode.
              *
              *
-             * @constructor
-             * @extends {ol.control.Control}
-             * @param {olx.control.FullScreenOptions=} opt_options Options.
              * @api stable
              */
             constructor(opt_options?: olx.control.FullScreenOptions);
@@ -521,8 +426,6 @@ declare module ol {
          * * {@link ol.control.Rotate}
          * * {@link ol.control.Attribution}
          *
-         * @param {olx.control.DefaultsOptions=} opt_options Defaults options.
-         * @return {ol.Collection.<ol.control.Control>} Controls.
          * @api stable
          */
         function defaults(opt_options?: olx.control.DefaultsOptions): ol.Collection<ol.control.Control>;
@@ -534,9 +437,6 @@ declare module ol {
          * By default the control is shown in the top right corner of the map, but this
          * can be changed by using the css selector `.ol-mouse-position`.
          *
-         * @constructor
-         * @extends {ol.control.Control}
-         * @param {olx.control.MousePositionOptions=} opt_options Mouse position
          *     options.
          * @api stable
          */
@@ -548,9 +448,6 @@ declare module ol {
              * By default the control is shown in the top right corner of the map, but this
              * can be changed by using the css selector `.ol-mouse-position`.
              *
-             * @constructor
-             * @extends {ol.control.Control}
-             * @param {olx.control.MousePositionOptions=} opt_options Mouse position
              *     options.
              * @api stable
              */
@@ -558,8 +455,6 @@ declare module ol {
 
             /**
              * Update the mouseposition element.
-             * @param {ol.MapEvent} mapEvent Map event.
-             * @this {ol.control.MousePosition}
              * @api
              */
             static render(mapEvent: ol.MapEvent): void;
@@ -567,7 +462,6 @@ declare module ol {
             /**
              * Return the coordinate format type used to render the current position or
              * undefined.
-             * @return {ol.CoordinateFormatType|undefined} The format to render the current
              *     position in.
              * @observable
              * @api stable
@@ -576,7 +470,6 @@ declare module ol {
 
             /**
              * Return the projection that is used to report the mouse position.
-             * @return {ol.proj.Projection|undefined} The projection to report mouse
              *     position in.
              * @observable
              * @api stable
@@ -585,7 +478,6 @@ declare module ol {
 
             /**
              * Set the coordinate format type used to render the current position.
-             * @param {ol.CoordinateFormatType} format The format to render the current
              *     position in.
              * @observable
              * @api stable
@@ -594,7 +486,6 @@ declare module ol {
 
             /**
              * Set the projection that is used to report the mouse position.
-             * @param {ol.proj.Projection} projection The projection to report mouse
              *     position in.
              * @observable
              * @api stable
@@ -605,40 +496,30 @@ declare module ol {
         /**
          * Create a new control with a map acting as an overview map for an other
          * defined map.
-         * @constructor
-         * @extends {ol.control.Control}
-         * @param {olx.control.OverviewMapOptions=} opt_options OverviewMap options.
          * @api
          */
         class OverviewMap extends ol.control.Control {
             /**
              * Create a new control with a map acting as an overview map for an other
              * defined map.
-             * @constructor
-             * @extends {ol.control.Control}
-             * @param {olx.control.OverviewMapOptions=} opt_options OverviewMap options.
              * @api
              */
             constructor(opt_options?: olx.control.OverviewMapOptions);
 
             /**
              * Update the overview map element.
-             * @param {ol.MapEvent} mapEvent Map event.
-             * @this {ol.control.OverviewMap}
              * @api
              */
             static render(mapEvent: ol.MapEvent): void;
 
             /**
              * Return `true` if the overview map is collapsible, `false` otherwise.
-             * @return {boolean} True if the widget is collapsible.
              * @api stable
              */
             getCollapsible(): boolean;
 
             /**
              * Set whether the overview map should be collapsible.
-             * @param {boolean} collapsible True if the widget is collapsible.
              * @api stable
              */
             setCollapsible(collapsible: boolean): void;
@@ -647,21 +528,18 @@ declare module ol {
              * Collapse or expand the overview map according to the passed parameter. Will
              * not do anything if the overview map isn't collapsible or if the current
              * collapsed state is already the one requested.
-             * @param {boolean} collapsed True if the widget is collapsed.
              * @api stable
              */
             setCollapsed(collapsed: boolean): void;
 
             /**
              * Determine if the overview map is collapsed.
-             * @return {boolean} The overview map is collapsed.
              * @api stable
              */
             getCollapsed(): boolean;
 
             /**
              * Return the overview map.
-             * @return {ol.Map} Overview map.
              * @api
              */
             getOverviewMap(): ol.Map;
@@ -673,9 +551,6 @@ declare module ol {
          * To style this control use css selector `.ol-rotate`. A `.ol-hidden` css
          * selector is added to the button when the rotation is 0.
          *
-         * @constructor
-         * @extends {ol.control.Control}
-         * @param {olx.control.RotateOptions=} opt_options Rotate options.
          * @api stable
          */
         class Rotate extends ol.control.Control {
@@ -685,17 +560,12 @@ declare module ol {
              * To style this control use css selector `.ol-rotate`. A `.ol-hidden` css
              * selector is added to the button when the rotation is 0.
              *
-             * @constructor
-             * @extends {ol.control.Control}
-             * @param {olx.control.RotateOptions=} opt_options Rotate options.
              * @api stable
              */
             constructor(opt_options?: olx.control.RotateOptions);
 
             /**
              * Update the rotate control element.
-             * @param {ol.MapEvent} mapEvent Map event.
-             * @this {ol.control.Rotate}
              * @api
              */
             static render(mapEvent: ol.MapEvent): void;
@@ -711,9 +581,6 @@ declare module ol {
          * By default the scale line will show in the bottom left portion of the map,
          * but this can be changed by using the css selector `.ol-scale-line`.
          *
-         * @constructor
-         * @extends {ol.control.Control}
-         * @param {olx.control.ScaleLineOptions=} opt_options Scale line options.
          * @api stable
          */
         class ScaleLine extends ol.control.Control {
@@ -727,16 +594,12 @@ declare module ol {
              * By default the scale line will show in the bottom left portion of the map,
              * but this can be changed by using the css selector `.ol-scale-line`.
              *
-             * @constructor
-             * @extends {ol.control.Control}
-             * @param {olx.control.ScaleLineOptions=} opt_options Scale line options.
              * @api stable
              */
             constructor(opt_options?: olx.control.ScaleLineOptions);
 
             /**
              * Return the units to use in the scale line.
-             * @return {ol.control.ScaleLine.Units|undefined} The units to use in the scale
              *     line.
              * @observable
              * @api stable
@@ -745,15 +608,12 @@ declare module ol {
 
             /**
              * Update the scale line element.
-             * @param {ol.MapEvent} mapEvent Map event.
-             * @this {ol.control.ScaleLine}
              * @api
              */
             static render(mapEvent: ol.MapEvent): void;
 
             /**
              * Set the units to use in the scale line.
-             * @param {ol.control.ScaleLine.Units} units The units to use in the scale line.
              * @observable
              * @api stable
              */
@@ -762,7 +622,6 @@ declare module ol {
 
         module ScaleLine {
             /**
-             * @enum {string}
              * @api
              */
             type Property = string;
@@ -770,7 +629,6 @@ declare module ol {
             /**
              * Units for the scale line. Supported values are `'degrees'`, `'imperial'`,
              * `'nautical'`, `'metric'`, `'us'`.
-             * @enum {string}
              */
             type Units = "degrees" | "imperial" | "nautical" | "metric" | "us";
         }
@@ -781,9 +639,6 @@ declare module ol {
          * This control is one of the default controls of a map. To style this control
          * use css selectors `.ol-zoom-in` and `.ol-zoom-out`.
          *
-         * @constructor
-         * @extends {ol.control.Control}
-         * @param {olx.control.ZoomOptions=} opt_options Zoom options.
          * @api stable
          */
         class Zoom extends ol.control.Control {
@@ -793,9 +648,6 @@ declare module ol {
              * This control is one of the default controls of a map. To style this control
              * use css selectors `.ol-zoom-in` and `.ol-zoom-out`.
              *
-             * @constructor
-             * @extends {ol.control.Control}
-             * @param {olx.control.ZoomOptions=} opt_options Zoom options.
              * @api stable
              */
             constructor(opt_options?: olx.control.ZoomOptions);
@@ -809,9 +661,6 @@ declare module ol {
          *
          *     map.addControl(new ol.control.ZoomSlider());
          *
-         * @constructor
-         * @extends {ol.control.Control}
-         * @param {olx.control.ZoomSliderOptions=} opt_options Zoom slider options.
          * @api stable
          */
         class ZoomSlider extends ol.control.Control {
@@ -823,17 +672,12 @@ declare module ol {
              *
              *     map.addControl(new ol.control.ZoomSlider());
              *
-             * @constructor
-             * @extends {ol.control.Control}
-             * @param {olx.control.ZoomSliderOptions=} opt_options Zoom slider options.
              * @api stable
              */
             constructor(opt_options?: olx.control.ZoomSliderOptions);
 
             /**
              * Update the zoomslider element.
-             * @param {ol.MapEvent} mapEvent Map event.
-             * @this {ol.control.ZoomSlider}
              * @api
              */
             static render(mapEvent: ol.MapEvent): void;
@@ -844,9 +688,6 @@ declare module ol {
          * A button control which, when pressed, changes the map view to a specific
          * extent. To style this control use the css selector `.ol-zoom-extent`.
          *
-         * @constructor
-         * @extends {ol.control.Control}
-         * @param {olx.control.ZoomToExtentOptions=} opt_options Options.
          * @api stable
          */
         class ZoomToExtent extends ol.control.Control {
@@ -855,18 +696,12 @@ declare module ol {
              * A button control which, when pressed, changes the map view to a specific
              * extent. To style this control use the css selector `.ol-zoom-extent`.
              *
-             * @constructor
-             * @extends {ol.control.Control}
-             * @param {olx.control.ZoomToExtentOptions=} opt_options Options.
              * @api stable
              */
             constructor(opt_options?: olx.control.ZoomToExtentOptions);
         }
     }
 
-    /**
-     * @namespace ol.coordinate
-     */
     module coordinate {
         /**
          * Add `delta` to `coordinate`. `coordinate` is modified in place and returned
@@ -878,9 +713,6 @@ declare module ol {
          *     ol.coordinate.add(coord, [-2, 4]);
          *     // coord is now [5.85, 51.983333]
          *
-         * @param {ol.Coordinate} coordinate Coordinate.
-         * @param {ol.Coordinate} delta Delta.
-         * @return {ol.Coordinate} The input coordinate adjusted by the given delta.
          * @api stable
          */
         function add(coordinate: ol.Coordinate, delta: ol.Coordinate): ol.Coordinate;
@@ -903,9 +735,7 @@ declare module ol {
          *     var out = stringifyFunc(coord);
          *     // out is now '7.85, 47.98'
          *
-         * @param {number=} opt_fractionDigits The number of digits to include
          *    after the decimal point. Default is `0`.
-         * @return {ol.CoordinateFormatType} Coordinate format.
          * @api stable
          */
         function createStringXY(opt_fractionDigits?: number): ol.CoordinateFormatType;
@@ -929,12 +759,8 @@ declare module ol {
          *     var out = ol.coordinate.format(coord, template, 2);
          *     // out is now 'Coordinate is (7.85|47.98).'
          *
-         * @param {ol.Coordinate|undefined} coordinate Coordinate.
-         * @param {string} template A template string with `{x}` and `{y}` placeholders
          *     that will be replaced by first and second coordinate values.
-         * @param {number=} opt_fractionDigits The number of digits to include
          *    after the decimal point. Default is `0`.
-         * @return {string} Formatted coordinate.
          * @api stable
          */
         function format(coordinate: (ol.Coordinate), template: string, opt_fractionDigits?: number): string;
@@ -950,9 +776,6 @@ declare module ol {
          *     ol.coordinate.rotate(coord, rotateRadians);
          *     // coord is now [-47.983333, 7.85]
          *
-         * @param {ol.Coordinate} coordinate Coordinate.
-         * @param {number} angle Angle in radian.
-         * @return {ol.Coordinate} Coordinate.
          * @api stable
          */
         function rotate(coordinate: ol.Coordinate, angle: number): ol.Coordinate;
@@ -973,10 +796,7 @@ declare module ol {
          *     var out = ol.coordinate.toStringHDMS(coord, 1);
          *     // out is now '47° 58′ 60.0″ N 7° 50′ 60.0″ E'
          *
-         * @param {ol.Coordinate|undefined} coordinate Coordinate.
-         * @param {number=} opt_fractionDigits The number of digits to include
          *    after the decimal point. Default is `0`.
-         * @return {string} Hemisphere, degrees, minutes and seconds.
          * @api stable
          */
         function toStringHDMS(coordinate?: ol.Coordinate, opt_fractionDigits?: number): string;
@@ -996,10 +816,7 @@ declare module ol {
          *     var out = ol.coordinate.toStringXY(coord, 1);
          *     // out is now '7.8, 48.0'
          *
-         * @param {ol.Coordinate|undefined} coordinate Coordinate.
-         * @param {number=} opt_fractionDigits The number of digits to include
          *    after the decimal point. Default is `0`.
-         * @return {string} XY.
          * @api stable
          */
         function toStringXY(coordinate?: ol.Coordinate, opt_fractionDigits?: number): string;
@@ -1055,9 +872,6 @@ declare module ol {
      *
      * @see {@link http://www.w3.org/TR/orientation-event/}
      *
-     * @constructor
-     * @extends {ol.Object}
-     * @param {olx.DeviceOrientationOptions=} opt_options Options.
      * @api
      */
     class DeviceOrientation extends ol.Object {
@@ -1111,16 +925,12 @@ declare module ol {
          *
          * @see {@link http://www.w3.org/TR/orientation-event/}
          *
-         * @constructor
-         * @extends {ol.Object}
-         * @param {olx.DeviceOrientationOptions=} opt_options Options.
          * @api
          */
         constructor(opt_options?: olx.DeviceOrientationOptions);
 
         /**
          * Rotation around the device z-axis (in radians).
-         * @return {number|undefined} The euler angle in radians of the device from the
          *     standard Z axis.
          * @observable
          * @api
@@ -1129,7 +939,6 @@ declare module ol {
 
         /**
          * Rotation around the device x-axis (in radians).
-         * @return {number|undefined} The euler angle in radians of the device from the
          *     planar X axis.
          * @observable
          * @api
@@ -1138,7 +947,6 @@ declare module ol {
 
         /**
          * Rotation around the device y-axis (in radians).
-         * @return {number|undefined} The euler angle in radians of the device from the
          *     planar Y axis.
          * @observable
          * @api
@@ -1147,7 +955,6 @@ declare module ol {
 
         /**
          * The heading of the device relative to north (in radians).
-         * @return {number|undefined} The heading of the device relative to north, in
          *     radians, normalizing for different browser behavior.
          * @observable
          * @api
@@ -1156,7 +963,6 @@ declare module ol {
 
         /**
          * Determine if orientation is being tracked.
-         * @return {boolean} Changes in device orientation are being tracked.
          * @observable
          * @api
          */
@@ -1164,7 +970,6 @@ declare module ol {
 
         /**
          * Enable or disable tracking of device orientation events.
-         * @param {boolean} tracking The status of tracking changes to alpha, beta and
          *     gamma. If true, changes are tracked and reported immediately.
          * @observable
          * @api
@@ -1174,49 +979,38 @@ declare module ol {
 
     /**
      * Objects that need to clean up after themselves.
-     * @constructor
      */
     class Disposable {
         /**
          * Objects that need to clean up after themselves.
-         * @constructor
          */
         constructor();
     }
 
     /**
      * Easing functions for {@link ol.animation}.
-     * @namespace ol.easing
      */
     module easing {
         /**
          * Start slow and speed up.
-         * @param {number} t Input between 0 and 1.
-         * @return {number} Output between 0 and 1.
          * @api
          */
         function easeIn(t: number): number;
 
         /**
          * Start fast and slow down.
-         * @param {number} t Input between 0 and 1.
-         * @return {number} Output between 0 and 1.
          * @api
          */
         function easeOut(t: number): number;
 
         /**
          * Start slow, speed up, and then slow down again.
-         * @param {number} t Input between 0 and 1.
-         * @return {number} Output between 0 and 1.
          * @api
          */
         function inAndOut(t: number): number;
 
         /**
          * Maintain a constant speed over time.
-         * @param {number} t Input between 0 and 1.
-         * @return {number} Output between 0 and 1.
          * @api
          */
         function linear(t: number): number;
@@ -1225,8 +1019,6 @@ declare module ol {
          * Start slow, speed up, and at the very end slow down again.  This has the
          * same general behavior as {@link ol.easing.inAndOut}, but the final slowdown
          * is delayed.
-         * @param {number} t Input between 0 and 1.
-         * @return {number} Output between 0 and 1.
          * @api
          */
         function upAndDown(t: number): number;
@@ -1243,20 +1035,13 @@ declare module ol {
      * this can be configured in the listener registration function.
      * Some classes have their own event type, which return additional
      * properties; see the specific event class page for details.
-     *
-     * @namespace ol.events
      */
     module events {
-        /**
-         * @namespace ol.events.condition
-         */
         module condition {
             /**
              * Return `true` if only the alt-key is pressed, `false` otherwise (e.g. when
              * additionally the shift-key is pressed).
              *
-             * @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event.
-             * @return {boolean} True if only the alt key is pressed.
              * @api stable
              */
             function altKeyOnly(mapBrowserEvent: ol.MapBrowserEvent): boolean;
@@ -1265,8 +1050,6 @@ declare module ol {
              * Return `true` if only the alt-key and shift-key is pressed, `false` otherwise
              * (e.g. when additionally the platform-modifier-key is pressed).
              *
-             * @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event.
-             * @return {boolean} True if only the alt and shift keys are pressed.
              * @api stable
              */
             function altShiftKeysOnly(mapBrowserEvent: ol.MapBrowserEvent): boolean;
@@ -1274,9 +1057,6 @@ declare module ol {
             /**
              * Return always true.
              *
-             * @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event.
-             * @return {boolean} True.
-             * @function
              * @api stable
              */
             function always(mapBrowserEvent: ol.MapBrowserEvent): boolean;
@@ -1284,8 +1064,6 @@ declare module ol {
             /**
              * Return `true` if the event is a `click` event, `false` otherwise.
              *
-             * @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event.
-             * @return {boolean} True if the event is a map `click` event.
              * @api stable
              */
             function click(mapBrowserEvent: ol.MapBrowserEvent): boolean;
@@ -1293,9 +1071,6 @@ declare module ol {
             /**
              * Return always false.
              *
-             * @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event.
-             * @return {boolean} False.
-             * @function
              * @api stable
              */
             function never(mapBrowserEvent: ol.MapBrowserEvent): boolean;
@@ -1304,8 +1079,6 @@ declare module ol {
              * Return `true` if the browser event is a `pointermove` event, `false`
              * otherwise.
              *
-             * @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event.
-             * @return {boolean} True if the browser event is a `pointermove` event.
              * @api
              */
             function pointerMove(mapBrowserEvent: ol.MapBrowserEvent): boolean;
@@ -1313,8 +1086,6 @@ declare module ol {
             /**
              * Return `true` if the event is a map `singleclick` event, `false` otherwise.
              *
-             * @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event.
-             * @return {boolean} True if the event is a map `singleclick` event.
              * @api stable
              */
             function singleClick(mapBrowserEvent: ol.MapBrowserEvent): boolean;
@@ -1322,8 +1093,6 @@ declare module ol {
             /**
              * Return `true` if the event is a map `dblclick` event, `false` otherwise.
              *
-             * @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event.
-             * @return {boolean} True if the event is a map `dblclick` event.
              * @api stable
              */
             function doubleClick(mapBrowserEvent: ol.MapBrowserEvent): boolean;
@@ -1332,8 +1101,6 @@ declare module ol {
              * Return `true` if no modifier key (alt-, shift- or platform-modifier-key) is
              * pressed.
              *
-             * @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event.
-             * @return {boolean} True only if there no modifier keys are pressed.
              * @api stable
              */
             function noModifierKeys(mapBrowserEvent: ol.MapBrowserEvent): boolean;
@@ -1343,8 +1110,6 @@ declare module ol {
              * ctrl-key otherwise) is pressed, `false` otherwise (e.g. when additionally
              * the shift-key is pressed).
              *
-             * @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event.
-             * @return {boolean} True if only the platform modifier key is pressed.
              * @api stable
              */
             function platformModifierKeyOnly(mapBrowserEvent: ol.MapBrowserEvent): boolean;
@@ -1353,8 +1118,6 @@ declare module ol {
              * Return `true` if only the shift-key is pressed, `false` otherwise (e.g. when
              * additionally the alt-key is pressed).
              *
-             * @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event.
-             * @return {boolean} True if only the shift key is pressed.
              * @api stable
              */
             function shiftKeyOnly(mapBrowserEvent: ol.MapBrowserEvent): boolean;
@@ -1363,8 +1126,6 @@ declare module ol {
              * Return `true` if the target element is not editable, i.e. not a `<input>`-,
              * `<select>`- or `<textarea>`-element, `false` otherwise.
              *
-             * @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event.
-             * @return {boolean} True only if the target element is not editable.
              * @api
              */
             function targetNotEditable(mapBrowserEvent: ol.MapBrowserEvent): boolean;
@@ -1372,8 +1133,6 @@ declare module ol {
             /**
              * Return `true` if the event originates from a mouse device.
              *
-             * @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event.
-             * @return {boolean} True if the event originates from a mouse device.
              * @api stable
              */
             function mouseOnly(mapBrowserEvent: ol.MapBrowserEvent): boolean;
@@ -1383,8 +1142,6 @@ declare module ol {
              * contact with the surface or if the left mouse button is pressed.
              * @see http://www.w3.org/TR/pointerevents/#button-states
              *
-             * @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event.
-             * @return {boolean} True if the event originates from a primary pointer.
              * @api
              */
             function primaryAction(mapBrowserEvent: ol.MapBrowserEvent): boolean;
@@ -1400,9 +1157,6 @@ declare module ol {
          * for higher level events defined in the library, and works with
          * {@link ol.events.EventTarget}.
          *
-         * @constructor
-         * @implements {oli.events.Event}
-         * @param {string} type Type.
          */
         class Event {
             /**
@@ -1415,36 +1169,29 @@ declare module ol {
              * for higher level events defined in the library, and works with
              * {@link ol.events.EventTarget}.
              *
-             * @constructor
-             * @implements {oli.events.Event}
-             * @param {string} type Type.
              */
             constructor(type: string);
 
             /**
              * The event type.
-             * @type {string}
              * @api stable
              */
             type: string;
 
             /**
              * The event target.
-             * @type {Object}
              * @api stable
              */
             target: GlobalObject;
 
             /**
              * Stop event propagation.
-             * @function
              * @api stable
              */
             preventDefault(): void;
 
             /**
              * Stop event propagation.
-             * @function
              * @api stable
              */
             stopPropagation(): void;
@@ -1465,8 +1212,6 @@ declare module ol {
          *    more listeners after this one will be called. Same as when the listener
          *    returns false.
          *
-         * @constructor
-         * @extends {ol.Disposable}
          */
         class EventTarget extends ol.Disposable {
             /**
@@ -1484,32 +1229,21 @@ declare module ol {
              *    more listeners after this one will be called. Same as when the listener
              *    returns false.
              *
-             * @constructor
-             * @extends {ol.Disposable}
              */
             constructor();
         }
     }
 
-    /**
-     * @namespace ol.extent
-     */
     module extent {
         /**
          * Build an extent that includes all given coordinates.
          *
-         * @param {Array.<ol.Coordinate>} coordinates Coordinates.
-         * @return {ol.Extent} Bounding extent.
          * @api stable
          */
         function boundingExtent(coordinates: ol.Coordinate[]): ol.Extent;
 
         /**
          * Return extent increased by the provided value.
-         * @param {ol.Extent} extent Extent.
-         * @param {number} value The amount by which the extent should be buffered.
-         * @param {ol.Extent=} opt_extent Extent.
-         * @return {ol.Extent} Extent.
          * @api stable
          */
         function buffer(extent: ol.Extent, value: number, opt_extent?: ol.Extent): ol.Extent;
@@ -1517,9 +1251,6 @@ declare module ol {
         /**
          * Check if the passed coordinate is contained or on the edge of the extent.
          *
-         * @param {ol.Extent} extent Extent.
-         * @param {ol.Coordinate} coordinate Coordinate.
-         * @return {boolean} The coordinate is contained in the extent.
          * @api stable
          */
         function containsCoordinate(extent: ol.Extent, coordinate: ol.Coordinate): boolean;
@@ -1530,9 +1261,6 @@ declare module ol {
          * An extent is deemed contained if it lies completely within the other extent,
          * including if they share one or more edges.
          *
-         * @param {ol.Extent} extent1 Extent 1.
-         * @param {ol.Extent} extent2 Extent 2.
-         * @return {boolean} The second extent is contained by or on the edge of the
          *     first.
          * @api stable
          */
@@ -1541,137 +1269,97 @@ declare module ol {
         /**
          * Check if the passed coordinate is contained or on the edge of the extent.
          *
-         * @param {ol.Extent} extent Extent.
-         * @param {number} x X coordinate.
-         * @param {number} y Y coordinate.
-         * @return {boolean} The x, y values are contained in the extent.
          * @api stable
          */
         function containsXY(extent: ol.Extent, x: number, y: number): boolean;
 
         /**
          * Create an empty extent.
-         * @return {ol.Extent} Empty extent.
          * @api stable
          */
         function createEmpty(): ol.Extent;
 
         /**
          * Determine if two extents are equivalent.
-         * @param {ol.Extent} extent1 Extent 1.
-         * @param {ol.Extent} extent2 Extent 2.
-         * @return {boolean} The two extents are equivalent.
          * @api stable
          */
         function equals(extent1: ol.Extent, extent2: ol.Extent): boolean;
 
         /**
          * Modify an extent to include another extent.
-         * @param {ol.Extent} extent1 The extent to be modified.
-         * @param {ol.Extent} extent2 The extent that will be included in the first.
-         * @return {ol.Extent} A reference to the first (extended) extent.
          * @api stable
          */
         function extend(extent1: ol.Extent, extent2: ol.Extent): ol.Extent;
 
         /**
          * Get the bottom left coordinate of an extent.
-         * @param {ol.Extent} extent Extent.
-         * @return {ol.Coordinate} Bottom left coordinate.
          * @api stable
          */
         function getBottomLeft(extent: ol.Extent): ol.Coordinate;
 
         /**
          * Get the bottom right coordinate of an extent.
-         * @param {ol.Extent} extent Extent.
-         * @return {ol.Coordinate} Bottom right coordinate.
          * @api stable
          */
         function getBottomRight(extent: ol.Extent): ol.Coordinate;
 
         /**
          * Get the center coordinate of an extent.
-         * @param {ol.Extent} extent Extent.
-         * @return {ol.Coordinate} Center.
          * @api stable
          */
         function getCenter(extent: ol.Extent): ol.Coordinate;
 
         /**
          * Get the height of an extent.
-         * @param {ol.Extent} extent Extent.
-         * @return {number} Height.
          * @api stable
          */
         function getHeight(extent: ol.Extent): number;
 
         /**
          * Get the intersection of two extents.
-         * @param {ol.Extent} extent1 Extent 1.
-         * @param {ol.Extent} extent2 Extent 2.
-         * @param {ol.Extent=} opt_extent Optional extent to populate with intersection.
-         * @return {ol.Extent} Intersecting extent.
          * @api stable
          */
         function getIntersection(extent1: ol.Extent, extent2: ol.Extent, opt_extent?: ol.Extent): ol.Extent;
 
         /**
          * Get the size (width, height) of an extent.
-         * @param {ol.Extent} extent The extent.
-         * @return {ol.Size} The extent size.
          * @api stable
          */
         function getSize(extent: ol.Extent): ol.Size;
 
         /**
          * Get the top left coordinate of an extent.
-         * @param {ol.Extent} extent Extent.
-         * @return {ol.Coordinate} Top left coordinate.
          * @api stable
          */
         function getTopLeft(extent: ol.Extent): ol.Coordinate;
 
         /**
          * Get the top right coordinate of an extent.
-         * @param {ol.Extent} extent Extent.
-         * @return {ol.Coordinate} Top right coordinate.
          * @api stable
          */
         function getTopRight(extent: ol.Extent): ol.Coordinate;
 
         /**
          * Get the width of an extent.
-         * @param {ol.Extent} extent Extent.
-         * @return {number} Width.
          * @api stable
          */
         function getWidth(extent: ol.Extent): number;
 
         /**
          * Determine if one extent intersects another.
-         * @param {ol.Extent} extent1 Extent 1.
-         * @param {ol.Extent} extent2 Extent.
-         * @return {boolean} The two extents intersect.
          * @api stable
          */
         function intersects(extent1: ol.Extent, extent2: ol.Extent): boolean;
 
         /**
          * Determine if an extent is empty.
-         * @param {ol.Extent} extent Extent.
-         * @return {boolean} Is empty.
          * @api stable
          */
         function isEmpty(extent: ol.Extent): boolean;
 
         /**
          * Apply a transform function to the extent.
-         * @param {ol.Extent} extent Extent.
-         * @param {ol.TransformFunction} transformFn Transform function.  Called with
          * [minX, minY, maxX, maxY] extent coordinates.
-         * @param {ol.Extent=} opt_extent Destination extent.
-         * @return {ol.Extent} Extent.
          * @api stable
          */
         function applyTransform(extent: ol.Extent, transformFn: ol.TransformFunction, opt_extent?: ol.Extent): ol.Extent;
@@ -1714,9 +1402,6 @@ declare module ol {
      * var point = feature.getGeometry();
      * ```
      *
-     * @constructor
-     * @extends {ol.Object}
-     * @param {ol.geom.Geometry|Object.<string, *>=} opt_geometryOrProperties
      *     You may pass a Geometry object directly, or an object literal
      *     containing properties.  If you pass an object literal, you may
      *     include a Geometry associated with a `geometry` key.
@@ -1760,9 +1445,6 @@ declare module ol {
          * var point = feature.getGeometry();
          * ```
          *
-         * @constructor
-         * @extends {ol.Object}
-         * @param {ol.geom.Geometry|Object.<string, *>=} opt_geometryOrProperties
          *     You may pass a Geometry object directly, or an object literal
          *     containing properties.  If you pass an object literal, you may
          *     include a Geometry associated with a `geometry` key.
@@ -1773,7 +1455,6 @@ declare module ol {
         /**
          * Clone this feature. If the original feature has a geometry it
          * is also cloned. The feature id is not set in the clone.
-         * @return {ol.Feature} The clone.
          * @api stable
          */
         clone(): ol.Feature;
@@ -1782,7 +1463,6 @@ declare module ol {
          * Get the feature's default geometry.  A feature may have any number of named
          * geometries.  The "default" geometry (the one that is rendered by default) is
          * set when calling {@link ol.Feature#setGeometry}.
-         * @return {ol.geom.Geometry|undefined} The default geometry for the feature.
          * @api stable
          * @observable
          */
@@ -1792,7 +1472,6 @@ declare module ol {
          * Get the feature identifier.  This is a stable identifier for the feature and
          * is either set when reading data from a remote source or set explicitly by
          * calling {@link ol.Feature#setId}.
-         * @return {number|string|undefined} Id.
          * @api stable
          * @observable
          */
@@ -1801,7 +1480,6 @@ declare module ol {
         /**
          * Get the name of the feature's default geometry.  By default, the default
          * geometry is named `geometry`.
-         * @return {string} Get the property name associated with the default geometry
          *     for this feature.
          * @api stable
          */
@@ -1810,7 +1488,6 @@ declare module ol {
         /**
          * Get the feature's style.  This return for this method depends on what was
          * provided to the {@link ol.Feature#setStyle} method.
-         * @return {ol.style.Style|Array.<ol.style.Style>|
          *     ol.FeatureStyleFunction|ol.StyleFunction} The feature style.
          * @api stable
          * @observable
@@ -1819,7 +1496,6 @@ declare module ol {
 
         /**
          * Get the feature's style function.
-         * @return {ol.FeatureStyleFunction|undefined} Return a function
          * representing the current style of this feature.
          * @api stable
          */
@@ -1828,7 +1504,6 @@ declare module ol {
         /**
          * Set the default geometry for the feature.  This will update the property
          * with the name returned by {@link ol.Feature#getGeometryName}.
-         * @param {ol.geom.Geometry|undefined} geometry The new geometry.
          * @api stable
          * @observable
          */
@@ -1838,7 +1513,6 @@ declare module ol {
          * Set the style for the feature.  This can be a single style object, an array
          * of styles, or a function that takes a resolution and returns an array of
          * styles. If it is `null` the feature has no style (a `null` style).
-         * @param {ol.style.Style|Array.<ol.style.Style>|
          *     ol.FeatureStyleFunction|ol.StyleFunction} style Style for this feature.
          * @api stable
          * @observable
@@ -1850,7 +1524,6 @@ declare module ol {
          * requesting features or comparing identifiers returned from a remote source.
          * The feature id can be used with the {@link ol.source.Vector#getFeatureById}
          * method.
-         * @param {number|string|undefined} id The feature id.
          * @api stable
          * @observable
          */
@@ -1860,7 +1533,6 @@ declare module ol {
          * Set the property name to be used when getting the feature's default geometry.
          * When calling {@link ol.Feature#getGeometry}, the value of the property with
          * this name will be returned.
-         * @param {string} name The property name of the default geometry.
          * @api stable
          */
         setGeometryName(name: string): void;
@@ -1868,16 +1540,12 @@ declare module ol {
 
     /**
      * Loading mechanisms for vector data.
-     * @namespace ol.featureloader
      */
     module featureloader {
         /**
          * Create an XHR feature loader for a `url` and `format`. The feature loader
          * loads features (with XHR), parses the features, and adds them to the
          * vector tile.
-         * @param {string|ol.FeatureUrlFunction} url Feature URL service.
-         * @param {ol.format.Feature} format Feature format.
-         * @return {ol.FeatureLoader} The feature loader.
          * @api
          */
         function tile(url: (string | ol.FeatureUrlFunction), format: ol.format.Feature): ol.FeatureLoader;
@@ -1886,25 +1554,16 @@ declare module ol {
          * Create an XHR feature loader for a `url` and `format`. The feature loader
          * loads features (with XHR), parses the features, and adds them to the
          * vector source.
-         * @param {string|ol.FeatureUrlFunction} url Feature URL service.
-         * @param {ol.format.Feature} format Feature format.
-         * @return {ol.FeatureLoader} The feature loader.
          * @api
          */
         function xhr(url: (string | ol.FeatureUrlFunction), format: ol.format.Feature): ol.FeatureLoader;
     }
 
-    /**
-     * @namespace ol.format
-     */
     module format {
         /**
          * @classdesc
          * Feature format for reading and writing data in the EsriJSON format.
          *
-         * @constructor
-         * @extends {ol.format.JSONFeature}
-         * @param {olx.format.EsriJSONOptions=} opt_options Options.
          * @api
          */
         class EsriJSON extends ol.format.JSONFeature {
@@ -1912,9 +1571,6 @@ declare module ol {
              * @classdesc
              * Feature format for reading and writing data in the EsriJSON format.
              *
-             * @constructor
-             * @extends {ol.format.JSONFeature}
-             * @param {olx.format.EsriJSONOptions=} opt_options Options.
              * @api
              */
             constructor(opt_options?: olx.format.EsriJSONOptions);
@@ -1923,10 +1579,6 @@ declare module ol {
              * Read a feature from a EsriJSON Feature source.  Only works for Feature,
              * use `readFeatures` to read FeatureCollection source.
              *
-             * @function
-             * @param {ArrayBuffer|Document|Node|Object|string} source Source.
-             * @param {olx.format.ReadOptions=} opt_options Read options.
-             * @return {ol.Feature} Feature.
              * @api
              */
             readFeature(source: (ArrayBuffer | Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
@@ -1935,10 +1587,6 @@ declare module ol {
              * Read all features from a EsriJSON source.  Works with both Feature and
              * FeatureCollection sources.
              *
-             * @function
-             * @param {ArrayBuffer|Document|Node|Object|string} source Source.
-             * @param {olx.format.ReadOptions=} opt_options Read options.
-             * @return {Array.<ol.Feature>} Features.
              * @api
              */
             readFeatures(source: (ArrayBuffer | Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
@@ -1946,10 +1594,6 @@ declare module ol {
             /**
              * Read a geometry from a EsriJSON source.
              *
-             * @function
-             * @param {ArrayBuffer|Document|Node|Object|string} source Source.
-             * @param {olx.format.ReadOptions=} opt_options Read options.
-             * @return {ol.geom.Geometry} Geometry.
              * @api
              */
             readGeometry(source: (ArrayBuffer | Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.geom.Geometry;
@@ -1957,9 +1601,6 @@ declare module ol {
             /**
              * Read the projection from a EsriJSON source.
              *
-             * @function
-             * @param {ArrayBuffer|Document|Node|Object|string} source Source.
-             * @return {ol.proj.Projection} Projection.
              * @api
              */
             readProjection(source: (ArrayBuffer | Document | Node | GlobalObject | string)): ol.proj.Projection;
@@ -1967,10 +1608,6 @@ declare module ol {
             /**
              * Encode a geometry as a EsriJSON string.
              *
-             * @function
-             * @param {ol.geom.Geometry} geometry Geometry.
-             * @param {olx.format.WriteOptions=} opt_options Write options.
-             * @return {string} EsriJSON.
              * @api
              */
             writeGeometry(geometry: ol.geom.Geometry, opt_options?: olx.format.WriteOptions): string;
@@ -1978,9 +1615,6 @@ declare module ol {
             /**
              * Encode a geometry as a EsriJSON object.
              *
-             * @param {ol.geom.Geometry} geometry Geometry.
-             * @param {olx.format.WriteOptions=} opt_options Write options.
-             * @return {EsriJSONGeometry} Object.
              * @api
              */
             writeGeometryObject(geometry: ol.geom.Geometry, opt_options?: olx.format.WriteOptions): EsriJSONGeometry;
@@ -1988,10 +1622,6 @@ declare module ol {
             /**
              * Encode a feature as a EsriJSON Feature string.
              *
-             * @function
-             * @param {ol.Feature} feature Feature.
-             * @param {olx.format.WriteOptions=} opt_options Write options.
-             * @return {string} EsriJSON.
              * @api
              */
             writeFeature(feature: ol.Feature, opt_options?: olx.format.WriteOptions): string;
@@ -1999,9 +1629,6 @@ declare module ol {
             /**
              * Encode a feature as a esriJSON Feature object.
              *
-             * @param {ol.Feature} feature Feature.
-             * @param {olx.format.WriteOptions=} opt_options Write options.
-             * @return {Object} Object.
              * @api
              */
             writeFeatureObject(feature: ol.Feature, opt_options?: olx.format.WriteOptions): GlobalObject;
@@ -2009,10 +1636,6 @@ declare module ol {
             /**
              * Encode an array of features as EsriJSON.
              *
-             * @function
-             * @param {Array.<ol.Feature>} features Features.
-             * @param {olx.format.WriteOptions=} opt_options Write options.
-             * @return {string} EsriJSON.
              * @api
              */
             writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
@@ -2020,9 +1643,6 @@ declare module ol {
             /**
              * Encode an array of features as a EsriJSON object.
              *
-             * @param {Array.<ol.Feature>} features Features.
-             * @param {olx.format.WriteOptions=} opt_options Write options.
-             * @return {Object} EsriJSON Object.
              * @api
              */
             writeFeaturesObject(features: ol.Feature[], opt_options?: olx.format.WriteOptions): GlobalObject;
@@ -2039,7 +1659,6 @@ declare module ol {
          * {@link ol.Feature} objects from a variety of commonly used geospatial
          * file formats.  See the documentation for each format for more details.
          *
-         * @constructor
          * @api stable
          */
         class Feature {
@@ -2052,7 +1671,6 @@ declare module ol {
              * {@link ol.Feature} objects from a variety of commonly used geospatial
              * file formats.  See the documentation for each format for more details.
              *
-             * @constructor
              * @api stable
              */
             constructor();
@@ -2067,9 +1685,6 @@ declare module ol {
          * @classdesc
          * Feature format for reading and writing data in the GeoJSON format.
          *
-         * @constructor
-         * @extends {ol.format.JSONFeature}
-         * @param {olx.format.GeoJSONOptions=} opt_options Options.
          * @api stable
          */
         class GeoJSON extends ol.format.JSONFeature {
@@ -2077,9 +1692,6 @@ declare module ol {
              * @classdesc
              * Feature format for reading and writing data in the GeoJSON format.
              *
-             * @constructor
-             * @extends {ol.format.JSONFeature}
-             * @param {olx.format.GeoJSONOptions=} opt_options Options.
              * @api stable
              */
             constructor(opt_options?: olx.format.GeoJSONOptions);
@@ -2088,10 +1700,6 @@ declare module ol {
              * Read a feature from a GeoJSON Feature source.  Only works for Feature,
              * use `readFeatures` to read FeatureCollection source.
              *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @param {olx.format.ReadOptions=} opt_options Read options.
-             * @return {ol.Feature} Feature.
              * @api stable
              */
             readFeature(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
@@ -2100,10 +1708,6 @@ declare module ol {
              * Read all features from a GeoJSON source.  Works with both Feature and
              * FeatureCollection sources.
              *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @param {olx.format.ReadOptions=} opt_options Read options.
-             * @return {Array.<ol.Feature>} Features.
              * @api stable
              */
             readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
@@ -2111,10 +1715,6 @@ declare module ol {
             /**
              * Read a geometry from a GeoJSON source.
              *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @param {olx.format.ReadOptions=} opt_options Read options.
-             * @return {ol.geom.Geometry} Geometry.
              * @api stable
              */
             readGeometry(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.geom.Geometry;
@@ -2122,9 +1722,6 @@ declare module ol {
             /**
              * Read the projection from a GeoJSON source.
              *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @return {ol.proj.Projection} Projection.
              * @api stable
              */
             readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
@@ -2132,10 +1729,6 @@ declare module ol {
             /**
              * Encode a feature as a GeoJSON Feature string.
              *
-             * @function
-             * @param {ol.Feature} feature Feature.
-             * @param {olx.format.WriteOptions=} opt_options Write options.
-             * @return {string} GeoJSON.
              * @api stable
              */
             writeFeature(feature: ol.Feature, opt_options?: olx.format.WriteOptions): string;
@@ -2143,9 +1736,6 @@ declare module ol {
             /**
              * Encode a feature as a GeoJSON Feature object.
              *
-             * @param {ol.Feature} feature Feature.
-             * @param {olx.format.WriteOptions=} opt_options Write options.
-             * @return {GeoJSONFeature} Object.
              * @api stable
              */
             writeFeatureObject(feature: ol.Feature, opt_options?: olx.format.WriteOptions): GeoJSONFeature;
@@ -2153,10 +1743,6 @@ declare module ol {
             /**
              * Encode an array of features as GeoJSON.
              *
-             * @function
-             * @param {Array.<ol.Feature>} features Features.
-             * @param {olx.format.WriteOptions=} opt_options Write options.
-             * @return {string} GeoJSON.
              * @api stable
              */
             writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
@@ -2164,9 +1750,6 @@ declare module ol {
             /**
              * Encode an array of features as a GeoJSON object.
              *
-             * @param {Array.<ol.Feature>} features Features.
-             * @param {olx.format.WriteOptions=} opt_options Write options.
-             * @return {GeoJSONFeatureCollection} GeoJSON Object.
              * @api stable
              */
             writeFeaturesObject(features: ol.Feature[], opt_options?: olx.format.WriteOptions): GeoJSONFeatureCollection;
@@ -2174,10 +1757,6 @@ declare module ol {
             /**
              * Encode a geometry as a GeoJSON string.
              *
-             * @function
-             * @param {ol.geom.Geometry} geometry Geometry.
-             * @param {olx.format.WriteOptions=} opt_options Write options.
-             * @return {string} GeoJSON.
              * @api stable
              */
             writeGeometry(geometry: ol.geom.Geometry, opt_options?: olx.format.WriteOptions): string;
@@ -2185,9 +1764,6 @@ declare module ol {
             /**
              * Encode a geometry as a GeoJSON object.
              *
-             * @param {ol.geom.Geometry} geometry Geometry.
-             * @param {olx.format.WriteOptions=} opt_options Write options.
-             * @return {GeoJSONGeometry|GeoJSONGeometryCollection} Object.
              * @api stable
              */
             writeGeometryObject(geometry: ol.geom.Geometry, opt_options?: olx.format.WriteOptions): (GeoJSONGeometry | GeoJSONGeometryCollection);
@@ -2199,10 +1775,7 @@ declare module ol {
          * version 3.1.1.
          * Currently only supports GML 3.1.1 Simple Features profile.
          *
-         * @constructor
-         * @param {olx.format.GMLOptions=} opt_options
          *     Optional configuration object.
-         * @extends {ol.format.GMLBase}
          * @api stable
          */
         class GML extends ol.format.GMLBase {
@@ -2212,10 +1785,7 @@ declare module ol {
              * version 3.1.1.
              * Currently only supports GML 3.1.1 Simple Features profile.
              *
-             * @constructor
-             * @param {olx.format.GMLOptions=} opt_options
              *     Optional configuration object.
-             * @extends {ol.format.GMLBase}
              * @api stable
              */
             constructor(opt_options?: olx.format.GMLOptions);
@@ -2223,10 +1793,6 @@ declare module ol {
             /**
              * Encode an array of features in GML 3.1.1 Simple Features.
              *
-             * @function
-             * @param {Array.<ol.Feature>} features Features.
-             * @param {olx.format.WriteOptions=} opt_options Options.
-             * @return {string} Result.
              * @api stable
              */
             writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
@@ -2234,10 +1800,6 @@ declare module ol {
             /**
              * Encode an array of features in the GML 3.1.1 format as an XML node.
              *
-             * @function
-             * @param {Array.<ol.Feature>} features Features.
-             * @param {olx.format.WriteOptions=} opt_options Options.
-             * @return {Node} Node.
              * @api
              */
             writeFeaturesNode(features: ol.Feature[], opt_options?: olx.format.WriteOptions): Node;
@@ -2248,9 +1810,6 @@ declare module ol {
          * Feature format for reading and writing data in the GML format,
          * version 2.1.2.
          *
-         * @constructor
-         * @param {olx.format.GMLOptions=} opt_options Optional configuration object.
-         * @extends {ol.format.GMLBase}
          * @api
          */
         class GML2 extends ol.format.GMLBase {
@@ -2259,9 +1818,6 @@ declare module ol {
              * Feature format for reading and writing data in the GML format,
              * version 2.1.2.
              *
-             * @constructor
-             * @param {olx.format.GMLOptions=} opt_options Optional configuration object.
-             * @extends {ol.format.GMLBase}
              * @api
              */
             constructor(opt_options?: olx.format.GMLOptions);
@@ -2273,10 +1829,7 @@ declare module ol {
          * version 3.1.1.
          * Currently only supports GML 3.1.1 Simple Features profile.
          *
-         * @constructor
-         * @param {olx.format.GMLOptions=} opt_options
          *     Optional configuration object.
-         * @extends {ol.format.GMLBase}
          * @api
          */
         class GML3 extends ol.format.GMLBase {
@@ -2286,10 +1839,7 @@ declare module ol {
              * version 3.1.1.
              * Currently only supports GML 3.1.1 Simple Features profile.
              *
-             * @constructor
-             * @param {olx.format.GMLOptions=} opt_options
              *     Optional configuration object.
-             * @extends {ol.format.GMLBase}
              * @api
              */
             constructor(opt_options?: olx.format.GMLOptions);
@@ -2297,9 +1847,6 @@ declare module ol {
             /**
              * Encode a geometry in GML 3.1.1 Simple Features.
              *
-             * @param {ol.geom.Geometry} geometry Geometry.
-             * @param {olx.format.WriteOptions=} opt_options Options.
-             * @return {Node} Node.
              * @api
              */
             writeGeometryNode(geometry: ol.geom.Geometry, opt_options?: olx.format.WriteOptions): Node;
@@ -2307,10 +1854,6 @@ declare module ol {
             /**
              * Encode an array of features in GML 3.1.1 Simple Features.
              *
-             * @function
-             * @param {Array.<ol.Feature>} features Features.
-             * @param {olx.format.WriteOptions=} opt_options Options.
-             * @return {string} Result.
              * @api stable
              */
             writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
@@ -2318,9 +1861,6 @@ declare module ol {
             /**
              * Encode an array of features in the GML 3.1.1 format as an XML node.
              *
-             * @param {Array.<ol.Feature>} features Features.
-             * @param {olx.format.WriteOptions=} opt_options Options.
-             * @return {Node} Node.
              * @api
              */
             writeFeaturesNode(features: ol.Feature[], opt_options?: olx.format.WriteOptions): Node;
@@ -2335,10 +1875,7 @@ declare module ol {
          * is shared with versioned format classes ol.format.GML2 and
          * ol.format.GML3.
          *
-         * @constructor
-         * @param {olx.format.GMLOptions=} opt_options
          *     Optional configuration object.
-         * @extends {ol.format.XMLFeature}
          */
         class GMLBase extends ol.format.XMLFeature {
             /**
@@ -2350,20 +1887,13 @@ declare module ol {
              * is shared with versioned format classes ol.format.GML2 and
              * ol.format.GML3.
              *
-             * @constructor
-             * @param {olx.format.GMLOptions=} opt_options
              *     Optional configuration object.
-             * @extends {ol.format.XMLFeature}
              */
             constructor(opt_options?: olx.format.GMLOptions);
 
             /**
              * Read all features from a GML FeatureCollection.
              *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @param {olx.format.ReadOptions=} opt_options Options.
-             * @return {Array.<ol.Feature>} Features.
              * @api stable
              */
             readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
@@ -2373,9 +1903,6 @@ declare module ol {
          * @classdesc
          * Feature format for reading and writing data in the GPX format.
          *
-         * @constructor
-         * @extends {ol.format.XMLFeature}
-         * @param {olx.format.GPXOptions=} opt_options Options.
          * @api stable
          */
         class GPX extends ol.format.XMLFeature {
@@ -2383,9 +1910,6 @@ declare module ol {
              * @classdesc
              * Feature format for reading and writing data in the GPX format.
              *
-             * @constructor
-             * @extends {ol.format.XMLFeature}
-             * @param {olx.format.GPXOptions=} opt_options Options.
              * @api stable
              */
             constructor(opt_options?: olx.format.GPXOptions);
@@ -2395,10 +1919,6 @@ declare module ol {
              * Routes (`<rte>`) are converted into LineString geometries, and tracks (`<trk>`)
              * into MultiLineString. Any properties on route and track waypoints are ignored.
              *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @param {olx.format.ReadOptions=} opt_options Read options.
-             * @return {ol.Feature} Feature.
              * @api stable
              */
             readFeature(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
@@ -2408,10 +1928,6 @@ declare module ol {
              * Routes (`<rte>`) are converted into LineString geometries, and tracks (`<trk>`)
              * into MultiLineString. Any properties on route and track waypoints are ignored.
              *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @param {olx.format.ReadOptions=} opt_options Read options.
-             * @return {Array.<ol.Feature>} Features.
              * @api stable
              */
             readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
@@ -2419,9 +1935,6 @@ declare module ol {
             /**
              * Read the projection from a GPX source.
              *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @return {ol.proj.Projection} Projection.
              * @api stable
              */
             readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
@@ -2431,10 +1944,6 @@ declare module ol {
              * LineString geometries are output as routes (`<rte>`), and MultiLineString
              * as tracks (`<trk>`).
              *
-             * @function
-             * @param {Array.<ol.Feature>} features Features.
-             * @param {olx.format.WriteOptions=} opt_options Write options.
-             * @return {string} Result.
              * @api stable
              */
             writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
@@ -2444,9 +1953,6 @@ declare module ol {
              * LineString geometries are output as routes (`<rte>`), and MultiLineString
              * as tracks (`<trk>`).
              *
-             * @param {Array.<ol.Feature>} features Features.
-             * @param {olx.format.WriteOptions=} opt_options Options.
-             * @return {Node} Node.
              * @api
              */
             writeFeaturesNode(features: ol.Feature[], opt_options?: olx.format.WriteOptions): Node;
@@ -2454,7 +1960,6 @@ declare module ol {
 
         /**
          * IGC altitude/z. One of 'barometric', 'gps', 'none'.
-         * @enum {string}
          */
         type IGCZ = "barometric" | "gps" | "none";
 
@@ -2462,9 +1967,6 @@ declare module ol {
          * @classdesc
          * Feature format for `*.igc` flight recording files.
          *
-         * @constructor
-         * @extends {ol.format.TextFeature}
-         * @param {olx.format.IGCOptions=} opt_options Options.
          * @api
          */
         class IGC extends ol.format.TextFeature {
@@ -2472,9 +1974,6 @@ declare module ol {
              * @classdesc
              * Feature format for `*.igc` flight recording files.
              *
-             * @constructor
-             * @extends {ol.format.TextFeature}
-             * @param {olx.format.IGCOptions=} opt_options Options.
              * @api
              */
             constructor(opt_options?: olx.format.IGCOptions);
@@ -2482,10 +1981,6 @@ declare module ol {
             /**
              * Read the feature from the IGC source.
              *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @param {olx.format.ReadOptions=} opt_options Read options.
-             * @return {ol.Feature} Feature.
              * @api
              */
             readFeature(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
@@ -2494,10 +1989,6 @@ declare module ol {
              * Read the feature from the source. As IGC sources contain a single
              * feature, this will return the feature in an array.
              *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @param {olx.format.ReadOptions=} opt_options Read options.
-             * @return {Array.<ol.Feature>} Features.
              * @api
              */
             readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
@@ -2505,9 +1996,6 @@ declare module ol {
             /**
              * Read the projection from the IGC source.
              *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @return {ol.proj.Projection} Projection.
              * @api
              */
             readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
@@ -2519,8 +2007,6 @@ declare module ol {
          * instantiated in apps.
          * Base class for JSON feature formats.
          *
-         * @constructor
-         * @extends {ol.format.Feature}
          */
         class JSONFeature extends ol.format.Feature {
             /**
@@ -2529,8 +2015,6 @@ declare module ol {
              * instantiated in apps.
              * Base class for JSON feature formats.
              *
-             * @constructor
-             * @extends {ol.format.Feature}
              */
             constructor();
         }
@@ -2542,9 +2026,6 @@ declare module ol {
          * Note that the KML format uses the URL() constructor. Older browsers such as IE
          * which do not support this will need a URL polyfill to be loaded before use.
          *
-         * @constructor
-         * @extends {ol.format.XMLFeature}
-         * @param {olx.format.KMLOptions=} opt_options Options.
          * @api stable
          */
         class KML extends ol.format.XMLFeature {
@@ -2555,9 +2036,6 @@ declare module ol {
              * Note that the KML format uses the URL() constructor. Older browsers such as IE
              * which do not support this will need a URL polyfill to be loaded before use.
              *
-             * @constructor
-             * @extends {ol.format.XMLFeature}
-             * @param {olx.format.KMLOptions=} opt_options Options.
              * @api stable
              */
             constructor(opt_options?: olx.format.KMLOptions);
@@ -2567,10 +2045,6 @@ declare module ol {
              * GeometryCollections if they are a mix of geometry types, and into MultiPoint/
              * MultiLineString/MultiPolygon if they are all of the same type.
              *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @param {olx.format.ReadOptions=} opt_options Read options.
-             * @return {ol.Feature} Feature.
              * @api stable
              */
             readFeature(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
@@ -2580,10 +2054,6 @@ declare module ol {
              * GeometryCollections if they are a mix of geometry types, and into MultiPoint/
              * MultiLineString/MultiPolygon if they are all of the same type.
              *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @param {olx.format.ReadOptions=} opt_options Read options.
-             * @return {Array.<ol.Feature>} Features.
              * @api stable
              */
             readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
@@ -2591,8 +2061,6 @@ declare module ol {
             /**
              * Read the name of the KML.
              *
-             * @param {Document|Node|string} source Souce.
-             * @return {string|undefined} Name.
              * @api stable
              */
             readName(source: (Document | Node | string)): (string);
@@ -2600,8 +2068,6 @@ declare module ol {
             /**
              * Read the network links of the KML.
              *
-             * @param {Document|Node|string} source Source.
-             * @return {Array.<Object>} Network links.
              * @api
              */
             readNetworkLinks(source: (Document | Node | string)): GlobalObject[];
@@ -2609,9 +2075,6 @@ declare module ol {
             /**
              * Read the projection from a KML source.
              *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @return {ol.proj.Projection} Projection.
              * @api stable
              */
             readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
@@ -2620,10 +2083,6 @@ declare module ol {
              * Encode an array of features in the KML format. GeometryCollections, MultiPoints,
              * MultiLineStrings, and MultiPolygons are output as MultiGeometries.
              *
-             * @function
-             * @param {Array.<ol.Feature>} features Features.
-             * @param {olx.format.WriteOptions=} opt_options Options.
-             * @return {string} Result.
              * @api stable
              */
             writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
@@ -2632,9 +2091,6 @@ declare module ol {
              * Encode an array of features in the KML format as an XML node. GeometryCollections,
              * MultiPoints, MultiLineStrings, and MultiPolygons are output as MultiGeometries.
              *
-             * @param {Array.<ol.Feature>} features Features.
-             * @param {olx.format.WriteOptions=} opt_options Options.
-             * @return {Node} Node.
              * @api
              */
             writeFeaturesNode(features: ol.Feature[], opt_options?: olx.format.WriteOptions): Node;
@@ -2644,9 +2100,6 @@ declare module ol {
          * @classdesc
          * Feature format for reading data in the Mapbox MVT format.
          *
-         * @constructor
-         * @extends {ol.format.Feature}
-         * @param {olx.format.MVTOptions=} opt_options Options.
          * @api
          */
         class MVT extends ol.format.Feature {
@@ -2654,9 +2107,6 @@ declare module ol {
              * @classdesc
              * Feature format for reading data in the Mapbox MVT format.
              *
-             * @constructor
-             * @extends {ol.format.Feature}
-             * @param {olx.format.MVTOptions=} opt_options Options.
              * @api
              */
             constructor(opt_options?: olx.format.MVTOptions);
@@ -2675,7 +2125,6 @@ declare module ol {
 
             /**
              * Sets the layers that features will be read from.
-             * @param {Array.<string>} layers Layers.
              * @api
              */
             setLayers(layers: string[]): void;
@@ -2686,11 +2135,7 @@ declare module ol {
              * Create a `<Intersects>` operator to test whether a geometry-valued property
              * intersects a given geometry.
              *
-             * @param {!string} geometryName Geometry name to use.
-             * @param {!ol.geom.Geometry} geometry Geometry.
-             * @param {string=} opt_srsName SRS name. No srsName attribute will be
              *    set on geometries when this is not provided.
-             * @returns {!ol.format.filter.Intersects} `<Intersects>` operator.
              * @api
              */
             function intersects(geometryName: string, geometry: ol.geom.Geometry, opt_srsName?: string): ol.format.filter.Intersects;
@@ -2698,8 +2143,6 @@ declare module ol {
             /**
              * Create a logical `<Or>` operator between two or more filter conditions.
              *
-             * @param {...ol.format.filter.Filter} conditions Filter conditions.
-             * @returns {!ol.format.filter.Or} `<Or>` operator.
              * @api
              */
             function or(...conditions: ol.format.filter.Filter[]): ol.format.filter.Or;
@@ -2707,8 +2150,6 @@ declare module ol {
             /**
              * Create a logical `<And>` operator between two or more filter conditions.
              *
-             * @param {...ol.format.filter.Filter} conditions Filter conditions.
-             * @returns {!ol.format.filter.And} `<And>` operator.
              * @api
              */
             function and(...conditions: ol.format.filter.Filter[]): ol.format.filter.And;
@@ -2716,8 +2157,6 @@ declare module ol {
             /**
              * Represents a logical `<Not>` operator for a filter condition.
              *
-             * @param {!ol.format.filter.Filter} condition Filter condition.
-             * @returns {!ol.format.filter.Not} `<Not>` operator.
              * @api
              */
             function not(condition: ol.format.filter.Filter): ol.format.filter.Not;
@@ -2726,11 +2165,7 @@ declare module ol {
              * Create a `<BBOX>` operator to test whether a geometry-valued property
              * intersects a fixed bounding box
              *
-             * @param {!string} geometryName Geometry name to use.
-             * @param {!ol.Extent} extent Extent.
-             * @param {string=} opt_srsName SRS name. No srsName attribute will be
              *    set on geometries when this is not provided.
-             * @returns {!ol.format.filter.Bbox} `<BBOX>` operator.
              * @api
              */
             function bbox(geometryName: string, extent: ol.Extent, opt_srsName?: string): ol.format.filter.Bbox;
@@ -2739,11 +2174,7 @@ declare module ol {
              * Create a `<Within>` operator to test whether a geometry-valued property
              * is within a given geometry.
              *
-             * @param {!string} geometryName Geometry name to use.
-             * @param {!ol.geom.Geometry} geometry Geometry.
-             * @param {string=} opt_srsName SRS name. No srsName attribute will be
              *    set on geometries when this is not provided.
-             * @returns {!ol.format.filter.Within} `<Within>` operator.
              * @api
              */
             function within(geometryName: string, geometry: ol.geom.Geometry, opt_srsName?: string): ol.format.filter.Within;
@@ -2751,10 +2182,6 @@ declare module ol {
             /**
              * Creates a `<PropertyIsEqualTo>` comparison operator.
              *
-             * @param {!string} propertyName Name of the context property to compare.
-             * @param {!(string|number)} expression The value to compare.
-             * @param {boolean=} opt_matchCase Case-sensitive?
-             * @returns {!ol.format.filter.EqualTo} `<PropertyIsEqualTo>` operator.
              * @api
              */
             function equalTo(propertyName: string, expression: string | number, opt_matchCase?: boolean): ol.format.filter.EqualTo;
@@ -2762,10 +2189,6 @@ declare module ol {
             /**
              * Creates a `<PropertyIsNotEqualTo>` comparison operator.
              *
-             * @param {!string} propertyName Name of the context property to compare.
-             * @param {!(string|number)} expression The value to compare.
-             * @param {boolean=} opt_matchCase Case-sensitive?
-             * @returns {!ol.format.filter.NotEqualTo} `<PropertyIsNotEqualTo>` operator.
              * @api
              */
             function notEqualTo(propertyName: string, expression: string | number, opt_matchCase?: boolean): ol.format.filter.NotEqualTo;
@@ -2773,9 +2196,6 @@ declare module ol {
             /**
              * Creates a `<PropertyIsLessThan>` comparison operator.
              *
-             * @param {!string} propertyName Name of the context property to compare.
-             * @param {!number} expression The value to compare.
-             * @returns {!ol.format.filter.LessThan} `<PropertyIsLessThan>` operator.
              * @api
              */
             function lessThan(propertyName: string, expression: number): ol.format.filter.LessThan;
@@ -2783,9 +2203,6 @@ declare module ol {
             /**
              * Creates a `<PropertyIsLessThanOrEqualTo>` comparison operator.
              *
-             * @param {!string} propertyName Name of the context property to compare.
-             * @param {!number} expression The value to compare.
-             * @returns {!ol.format.filter.LessThanOrEqualTo} `<PropertyIsLessThanOrEqualTo>` operator.
              * @api
              */
             function lessThanOrEqualTo(propertyName: string, expression: number): ol.format.filter.LessThanOrEqualTo;
@@ -2793,9 +2210,6 @@ declare module ol {
             /**
              * Creates a `<PropertyIsGreaterThan>` comparison operator.
              *
-             * @param {!string} propertyName Name of the context property to compare.
-             * @param {!number} expression The value to compare.
-             * @returns {!ol.format.filter.GreaterThan} `<PropertyIsGreaterThan>` operator.
              * @api
              */
             function greaterThan(propertyName: string, expression: number): ol.format.filter.GreaterThan;
@@ -2803,9 +2217,6 @@ declare module ol {
             /**
              * Creates a `<PropertyIsGreaterThanOrEqualTo>` comparison operator.
              *
-             * @param {!string} propertyName Name of the context property to compare.
-             * @param {!number} expression The value to compare.
-             * @returns {!ol.format.filter.GreaterThanOrEqualTo} `<PropertyIsGreaterThanOrEqualTo>` operator.
              * @api
              */
             function greaterThanOrEqualTo(propertyName: string, expression: number): ol.format.filter.GreaterThanOrEqualTo;
@@ -2814,8 +2225,6 @@ declare module ol {
              * Creates a `<PropertyIsNull>` comparison operator to test whether a property value
              * is null.
              *
-             * @param {!string} propertyName Name of the context property to compare.
-             * @returns {!ol.format.filter.IsNull} `<PropertyIsNull>` operator.
              * @api
              */
             function isNull(propertyName: string): ol.format.filter.IsNull;
@@ -2824,10 +2233,6 @@ declare module ol {
              * Creates a `<PropertyIsBetween>` comparison operator to test whether an expression
              * value lies within a range given by a lower and upper bound (inclusive).
              *
-             * @param {!string} propertyName Name of the context property to compare.
-             * @param {!number} lowerBoundary The lower bound of the range.
-             * @param {!number} upperBoundary The upper bound of the range.
-             * @returns {!ol.format.filter.IsBetween} `<PropertyIsBetween>` operator.
              * @api
              */
             function between(propertyName: string, lowerBoundary: number, upperBoundary: number): ol.format.filter.IsBetween;
@@ -2836,16 +2241,9 @@ declare module ol {
              * Represents a `<PropertyIsLike>` comparison operator that matches a string property
              * value against a text pattern.
              *
-             * @param {!string} propertyName Name of the context property to compare.
-             * @param {!string} pattern Text pattern.
-             * @param {string=} opt_wildCard Pattern character which matches any sequence of
              *    zero or more string characters. Default is '*'.
-             * @param {string=} opt_singleChar pattern character which matches any single
              *    string character. Default is '.'.
-             * @param {string=} opt_escapeChar Escape character which can be used to escape
              *    the pattern characters. Default is '!'.
-             * @param {boolean=} opt_matchCase Case-sensitive?
-             * @returns {!ol.format.filter.IsLike} `<PropertyIsLike>` operator.
              * @api
              */
             function like(propertyName: string, pattern: string, opt_wildCard?: string, opt_singleChar?: string, opt_escapeChar?: string, opt_matchCase?: boolean): ol.format.filter.IsLike;
@@ -2853,10 +2251,6 @@ declare module ol {
             /**
              * Create a `<During>` temporal operator.
              *
-             * @param {!string} propertyName Name of the context property to compare.
-             * @param {!string} begin The begin date in ISO-8601 format.
-             * @param {!string} end The end date in ISO-8601 format.
-             * @returns {!ol.format.filter.During} `<During>` operator.
              * @api
              */
             function during(propertyName: string, begin: string, end: string): ol.format.filter.During;
@@ -2866,8 +2260,6 @@ declare module ol {
              * Abstract class; normally only used for creating subclasses and not instantiated in apps.
              * Base class for WFS GetFeature filters.
              *
-             * @constructor
-             * @param {!string} tagName The XML tag name for this filter.
              * @struct
              * @api
              */
@@ -2877,8 +2269,6 @@ declare module ol {
                  * Abstract class; normally only used for creating subclasses and not instantiated in apps.
                  * Base class for WFS GetFeature filters.
                  *
-                 * @constructor
-                 * @param {!string} tagName The XML tag name for this filter.
                  * @struct
                  * @api
                  */
@@ -2886,7 +2276,6 @@ declare module ol {
 
                 /**
                  * The XML tag name for a filter.
-                 * @returns {!string} Name.
                  */
                 getTagName(): string;
             }
@@ -2896,13 +2285,7 @@ declare module ol {
              * Represents a spatial operator to test whether a geometry-valued property
              * relates to a given geometry.
              *
-             * @constructor
-             * @param {!string} tagName The XML tag name for this filter.
-             * @param {!string} geometryName Geometry name to use.
-             * @param {!ol.geom.Geometry} geometry Geometry.
-             * @param {string=} opt_srsName SRS name. No srsName attribute will be
              *    set on geometries when this is not provided.
-             * @extends {ol.format.filter.Filter}
              * @api
              */
             class Spatial extends ol.format.filter.Filter {
@@ -2911,13 +2294,7 @@ declare module ol {
                  * Represents a spatial operator to test whether a geometry-valued property
                  * relates to a given geometry.
                  *
-                 * @constructor
-                 * @param {!string} tagName The XML tag name for this filter.
-                 * @param {!string} geometryName Geometry name to use.
-                 * @param {!ol.geom.Geometry} geometry Geometry.
-                 * @param {string=} opt_srsName SRS name. No srsName attribute will be
                  *    set on geometries when this is not provided.
-                 * @extends {ol.format.filter.Filter}
                  * @api
                  */
                 constructor(tagName: string, geometryName: string, geometry: ol.geom.Geometry, opt_srsName?: string);
@@ -2928,12 +2305,7 @@ declare module ol {
              * Represents a `<Intersects>` operator to test whether a geometry-valued property
              * intersects a given geometry.
              *
-             * @constructor
-             * @param {!string} geometryName Geometry name to use.
-             * @param {!ol.geom.Geometry} geometry Geometry.
-             * @param {string=} opt_srsName SRS name. No srsName attribute will be
              *    set on geometries when this is not provided.
-             * @extends {ol.format.filter.Spatial}
              * @api
              */
             class Intersects extends ol.format.filter.Spatial {
@@ -2942,12 +2314,7 @@ declare module ol {
                  * Represents a `<Intersects>` operator to test whether a geometry-valued property
                  * intersects a given geometry.
                  *
-                 * @constructor
-                 * @param {!string} geometryName Geometry name to use.
-                 * @param {!ol.geom.Geometry} geometry Geometry.
-                 * @param {string=} opt_srsName SRS name. No srsName attribute will be
                  *    set on geometries when this is not provided.
-                 * @extends {ol.format.filter.Spatial}
                  * @api
                  */
                 constructor(geometryName: string, geometry: ol.geom.Geometry, opt_srsName?: string);
@@ -2958,12 +2325,7 @@ declare module ol {
              * Represents a `<Within>` operator to test whether a geometry-valued property
              * is within a given geometry.
              *
-             * @constructor
-             * @param {!string} geometryName Geometry name to use.
-             * @param {!ol.geom.Geometry} geometry Geometry.
-             * @param {string=} opt_srsName SRS name. No srsName attribute will be
              *    set on geometries when this is not provided.
-             * @extends {ol.format.filter.Spatial}
              * @api
              */
             class Within extends ol.format.filter.Spatial {
@@ -2972,12 +2334,7 @@ declare module ol {
                  * Represents a `<Within>` operator to test whether a geometry-valued property
                  * is within a given geometry.
                  *
-                 * @constructor
-                 * @param {!string} geometryName Geometry name to use.
-                 * @param {!ol.geom.Geometry} geometry Geometry.
-                 * @param {string=} opt_srsName SRS name. No srsName attribute will be
                  *    set on geometries when this is not provided.
-                 * @extends {ol.format.filter.Spatial}
                  * @api
                  */
                 constructor(geometryName: string, geometry: ol.geom.Geometry, opt_srsName?: string);
@@ -2994,9 +2351,6 @@ declare module ol {
              * @classdesc
              * Represents a logical <And> operator between two or more filter conditions.
              *
-             * @constructor
-             * @param {!ol.format.filter.Filter} conditions Conditions
-             * @extends {ol.format.filter.LogicalNary}
              * @api
              */
             class And extends ol.format.filter.LogicalNary {
@@ -3004,9 +2358,6 @@ declare module ol {
                  * @classdesc
                  * Represents a logical <And> operator between two or more filter conditions.
                  *
-                 * @constructor
-                 * @param {!ol.format.filter.Filter} conditions Conditions
-                 * @extends {ol.format.filter.LogicalNary}
                  * @api
                  */
                 constructor(...conditions: ol.format.filter.Filter[]);
@@ -3016,9 +2367,6 @@ declare module ol {
              * @classdesc
              * Represents a logical <Or> operator between two or more filter conditions.
              *
-             * @constructor
-             * @param {!ol.format.filter.Filter} conditions Conditions
-             * @extends {ol.format.filter.LogicalNary}
              * @api
              */
             class Or extends ol.format.filter.LogicalNary {
@@ -3026,9 +2374,6 @@ declare module ol {
                  * @classdesc
                  * Represents a logical <Or> operator between two or more filter conditions.
                  *
-                 * @constructor
-                 * @param {!ol.format.filter.Filter} conditions Conditions
-                 * @extends {ol.format.filter.LogicalNary}
                  * @api
                  */
                 constructor(...conditions: ol.format.filter.Filter[]);
@@ -3041,11 +2386,6 @@ declare module ol {
              *
              * deprecated: This class will no longer be exported starting from the next major version.
              *
-             * @constructor
-             * @abstract
-             * @param {!string} tagName The XML tag name for this filter.
-             * @param {!string} propertyName Name of the context property to compare.
-             * @extends {ol.format.filter.Filter}
              * @api
              */
             class Comparison extends ol.format.filter.Filter {
@@ -3056,11 +2396,6 @@ declare module ol {
                  *
                  * deprecated: This class will no longer be exported starting from the next major version.
                  *
-                 * @constructor
-                 * @abstract
-                 * @param {!string} tagName The XML tag name for this filter.
-                 * @param {!string} propertyName Name of the context property to compare.
-                 * @extends {ol.format.filter.Filter}
                  * @api
                  */
                 constructor(tagName: string, propertyName: string);
@@ -3073,13 +2408,6 @@ declare module ol {
              *
              * deprecated: This class will no longer be exported starting from the next major version.
              *
-             * @constructor
-             * @abstract
-             * @param {!string} tagName The XML tag name for this filter.
-             * @param {!string} propertyName Name of the context property to compare.
-             * @param {!(string|number)} expression The value to compare.
-             * @param {boolean=} opt_matchCase Case-sensitive?
-             * @extends {ol.format.filter.Comparison}
              * @api
              */
             class ComparisonBinary extends ol.format.filter.Comparison {
@@ -3090,13 +2418,6 @@ declare module ol {
                  *
                  * deprecated: This class will no longer be exported starting from the next major version.
                  *
-                 * @constructor
-                 * @abstract
-                 * @param {!string} tagName The XML tag name for this filter.
-                 * @param {!string} propertyName Name of the context property to compare.
-                 * @param {!(string|number)} expression The value to compare.
-                 * @param {boolean=} opt_matchCase Case-sensitive?
-                 * @extends {ol.format.filter.Comparison}
                  * @api
                  */
                 constructor(tagName: string, propertyName: string, expression: string | number, opt_matchCase?: boolean);
@@ -3106,11 +2427,6 @@ declare module ol {
              * @classdesc
              * Represents a `<PropertyIsEqualTo>` comparison operator.
              *
-             * @constructor
-             * @param {!string} propertyName Name of the context property to compare.
-             * @param {!(string|number)} expression The value to compare.
-             * @param {boolean=} opt_matchCase Case-sensitive?
-             * @extends {ol.format.filter.ComparisonBinary}
              * @api
              */
             class EqualTo extends ol.format.filter.ComparisonBinary {
@@ -3118,11 +2434,6 @@ declare module ol {
                  * @classdesc
                  * Represents a `<PropertyIsEqualTo>` comparison operator.
                  *
-                 * @constructor
-                 * @param {!string} propertyName Name of the context property to compare.
-                 * @param {!(string|number)} expression The value to compare.
-                 * @param {boolean=} opt_matchCase Case-sensitive?
-                 * @extends {ol.format.filter.ComparisonBinary}
                  * @api
                  */
                 constructor(propertyName: string, expression: string | number, opt_matchCase?: boolean);
@@ -3132,10 +2443,6 @@ declare module ol {
              * @classdesc
              * Represents a `<PropertyIsGreaterThan>` comparison operator.
              *
-             * @constructor
-             * @param {!string} propertyName Name of the context property to compare.
-             * @param {!number} expression The value to compare.
-             * @extends {ol.format.filter.ComparisonBinary}
              * @api
              */
             class GreaterThan extends ol.format.filter.ComparisonBinary {
@@ -3143,10 +2450,6 @@ declare module ol {
                  * @classdesc
                  * Represents a `<PropertyIsGreaterThan>` comparison operator.
                  *
-                 * @constructor
-                 * @param {!string} propertyName Name of the context property to compare.
-                 * @param {!number} expression The value to compare.
-                 * @extends {ol.format.filter.ComparisonBinary}
                  * @api
                  */
                 constructor(propertyName: string, expression: number);
@@ -3156,10 +2459,6 @@ declare module ol {
              * @classdesc
              * Represents a `<PropertyIsGreaterThanOrEqualTo>` comparison operator.
              *
-             * @constructor
-             * @param {!string} propertyName Name of the context property to compare.
-             * @param {!number} expression The value to compare.
-             * @extends {ol.format.filter.ComparisonBinary}
              * @api
              */
             class GreaterThanOrEqualTo extends ol.format.filter.ComparisonBinary {
@@ -3167,10 +2466,6 @@ declare module ol {
                  * @classdesc
                  * Represents a `<PropertyIsGreaterThanOrEqualTo>` comparison operator.
                  *
-                 * @constructor
-                 * @param {!string} propertyName Name of the context property to compare.
-                 * @param {!number} expression The value to compare.
-                 * @extends {ol.format.filter.ComparisonBinary}
                  * @api
                  */
                 constructor(propertyName: string, expression: number);
@@ -3180,10 +2475,6 @@ declare module ol {
              * @classdesc
              * Represents a `<PropertyIsLessThan>` comparison operator.
              *
-             * @constructor
-             * @param {!string} propertyName Name of the context property to compare.
-             * @param {!number} expression The value to compare.
-             * @extends {ol.format.filter.ComparisonBinary}
              * @api
              */
             class LessThan extends ol.format.filter.ComparisonBinary {
@@ -3191,10 +2482,6 @@ declare module ol {
                  * @classdesc
                  * Represents a `<PropertyIsLessThan>` comparison operator.
                  *
-                 * @constructor
-                 * @param {!string} propertyName Name of the context property to compare.
-                 * @param {!number} expression The value to compare.
-                 * @extends {ol.format.filter.ComparisonBinary}
                  * @api
                  */
                 constructor(propertyName: string, expression: number);
@@ -3204,10 +2491,6 @@ declare module ol {
              * @classdesc
              * Represents a `<PropertyIsLessThanOrEqualTo>` comparison operator.
              *
-             * @constructor
-             * @param {!string} propertyName Name of the context property to compare.
-             * @param {!number} expression The value to compare.
-             * @extends {ol.format.filter.ComparisonBinary}
              * @api
              */
             class LessThanOrEqualTo extends ol.format.filter.ComparisonBinary {
@@ -3215,10 +2498,6 @@ declare module ol {
                  * @classdesc
                  * Represents a `<PropertyIsLessThanOrEqualTo>` comparison operator.
                  *
-                 * @constructor
-                 * @param {!string} propertyName Name of the context property to compare.
-                 * @param {!number} expression The value to compare.
-                 * @extends {ol.format.filter.ComparisonBinary}
                  * @api
                  */
                 constructor(propertyName: string, expression: number);
@@ -3228,11 +2507,6 @@ declare module ol {
              * @classdesc
              * Represents a `<PropertyIsNotEqualTo>` comparison operator.
              *
-             * @constructor
-             * @param {!string} propertyName Name of the context property to compare.
-             * @param {!(string|number)} expression The value to compare.
-             * @param {boolean=} opt_matchCase Case-sensitive?
-             * @extends {ol.format.filter.ComparisonBinary}
              * @api
              */
             class NotEqualTo extends ol.format.filter.ComparisonBinary {
@@ -3240,11 +2514,6 @@ declare module ol {
                  * @classdesc
                  * Represents a `<PropertyIsNotEqualTo>` comparison operator.
                  *
-                 * @constructor
-                 * @param {!string} propertyName Name of the context property to compare.
-                 * @param {!(string|number)} expression The value to compare.
-                 * @param {boolean=} opt_matchCase Case-sensitive?
-                 * @extends {ol.format.filter.ComparisonBinary}
                  * @api
                  */
                 constructor(propertyName: string, expression: string | number, opt_matchCase?: boolean);
@@ -3254,11 +2523,6 @@ declare module ol {
              * @classdesc
              * Represents a `<During>` comparison operator.
              *
-             * @constructor
-             * @param {!string} propertyName Name of the context property to compare.
-             * @param {!string} begin The begin date in ISO-8601 format.
-             * @param {!string} end The end date in ISO-8601 format.
-             * @extends {ol.format.filter.Comparison}
              * @api
              */
             class During extends ol.format.filter.Comparison {
@@ -3266,11 +2530,6 @@ declare module ol {
                  * @classdesc
                  * Represents a `<During>` comparison operator.
                  *
-                 * @constructor
-                 * @param {!string} propertyName Name of the context property to compare.
-                 * @param {!string} begin The begin date in ISO-8601 format.
-                 * @param {!string} end The end date in ISO-8601 format.
-                 * @extends {ol.format.filter.Comparison}
                  * @api
                  */
                 constructor(propertyName: string, begin: string, end: string);
@@ -3280,11 +2539,6 @@ declare module ol {
              * @classdesc
              * Represents a `<PropertyIsBetween>` comparison operator.
              *
-             * @constructor
-             * @param {!string} propertyName Name of the context property to compare.
-             * @param {!number} lowerBoundary The lower bound of the range.
-             * @param {!number} upperBoundary The upper bound of the range.
-             * @extends {ol.format.filter.Comparison}
              * @api
              */
             class IsBetween extends ol.format.filter.Comparison {
@@ -3292,11 +2546,6 @@ declare module ol {
                  * @classdesc
                  * Represents a `<PropertyIsBetween>` comparison operator.
                  *
-                 * @constructor
-                 * @param {!string} propertyName Name of the context property to compare.
-                 * @param {!number} lowerBoundary The lower bound of the range.
-                 * @param {!number} upperBoundary The upper bound of the range.
-                 * @extends {ol.format.filter.Comparison}
                  * @api
                  */
                 constructor(propertyName: string, lowerBoundary: number, upperBoundary: number);
@@ -3306,17 +2555,9 @@ declare module ol {
              * @classdesc
              * Represents a `<PropertyIsLike>` comparison operator.
              *
-             * @constructor
-             * @param {!string} propertyName Name of the context property to compare.
-             * @param {!string} pattern Text pattern.
-             * @param {string=} opt_wildCard Pattern character which matches any sequence of
              *    zero or more string characters. Default is '*'.
-             * @param {string=} opt_singleChar pattern character which matches any single
              *    string character. Default is '.'.
-             * @param {string=} opt_escapeChar Escape character which can be used to escape
              *    the pattern characters. Default is '!'.
-             * @param {boolean=} opt_matchCase Case-sensitive?
-             * @extends {ol.format.filter.Comparison}
              * @api
              */
             class IsLike extends ol.format.filter.Comparison {
@@ -3324,17 +2565,9 @@ declare module ol {
                  * @classdesc
                  * Represents a `<PropertyIsLike>` comparison operator.
                  *
-                 * @constructor
-                 * @param {!string} propertyName Name of the context property to compare.
-                 * @param {!string} pattern Text pattern.
-                 * @param {string=} opt_wildCard Pattern character which matches any sequence of
                  *    zero or more string characters. Default is '*'.
-                 * @param {string=} opt_singleChar pattern character which matches any single
                  *    string character. Default is '.'.
-                 * @param {string=} opt_escapeChar Escape character which can be used to escape
                  *    the pattern characters. Default is '!'.
-                 * @param {boolean=} opt_matchCase Case-sensitive?
-                 * @extends {ol.format.filter.Comparison}
                  * @api
                  */
                 constructor(propertyName: string, pattern: string, opt_wildCard?: string, opt_singleChar?: string, opt_escapeChar?: string, opt_matchCase?: boolean);
@@ -3344,9 +2577,6 @@ declare module ol {
              * @classdesc
              * Represents a `<PropertyIsNull>` comparison operator.
              *
-             * @constructor
-             * @param {!string} propertyName Name of the context property to compare.
-             * @extends {ol.format.filter.Comparison}
              * @api
              */
             class IsNull extends ol.format.filter.Comparison {
@@ -3354,9 +2584,6 @@ declare module ol {
                  * @classdesc
                  * Represents a `<PropertyIsNull>` comparison operator.
                  *
-                 * @constructor
-                 * @param {!string} propertyName Name of the context property to compare.
-                 * @extends {ol.format.filter.Comparison}
                  * @api
                  */
                 constructor(propertyName: string);
@@ -3366,9 +2593,6 @@ declare module ol {
              * @classdesc
              * Represents a logical `<Not>` operator for a filter condition.
              *
-             * @constructor
-             * @param {!ol.format.filter.Filter} condition Filter condition.
-             * @extends {ol.format.filter.Filter}
              * @api
              */
             class Not extends ol.format.filter.Filter {
@@ -3376,9 +2600,6 @@ declare module ol {
                  * @classdesc
                  * Represents a logical `<Not>` operator for a filter condition.
                  *
-                 * @constructor
-                 * @param {!ol.format.filter.Filter} condition Filter condition.
-                 * @extends {ol.format.filter.Filter}
                  * @api
                  */
                 constructor(condition: ol.format.filter.Filter);
@@ -3389,12 +2610,7 @@ declare module ol {
              * Represents a `<BBOX>` operator to test whether a geometry-valued property
              * intersects a fixed bounding box
              *
-             * @constructor
-             * @param {!string} geometryName Geometry name to use.
-             * @param {!ol.Extent} extent Extent.
-             * @param {string=} opt_srsName SRS name. No srsName attribute will be
              *    set on geometries when this is not provided.
-             * @extends {ol.format.filter.Filter}
              * @api
              */
             class Bbox extends ol.format.filter.Filter {
@@ -3403,12 +2619,7 @@ declare module ol {
                  * Represents a `<BBOX>` operator to test whether a geometry-valued property
                  * intersects a fixed bounding box
                  *
-                 * @constructor
-                 * @param {!string} geometryName Geometry name to use.
-                 * @param {!ol.Extent} extent Extent.
-                 * @param {string=} opt_srsName SRS name. No srsName attribute will be
                  *    set on geometries when this is not provided.
-                 * @extends {ol.format.filter.Filter}
                  * @api
                  */
                 constructor(geometryName: string, extent: ol.Extent, opt_srsName?: string);
@@ -3420,8 +2631,6 @@ declare module ol {
          * Feature format for reading data in the
          * [OSMXML format](http://wiki.openstreetmap.org/wiki/OSM_XML).
          *
-         * @constructor
-         * @extends {ol.format.XMLFeature}
          * @api stable
          */
         class OSMXML extends ol.format.XMLFeature {
@@ -3430,8 +2639,6 @@ declare module ol {
              * Feature format for reading data in the
              * [OSMXML format](http://wiki.openstreetmap.org/wiki/OSM_XML).
              *
-             * @constructor
-             * @extends {ol.format.XMLFeature}
              * @api stable
              */
             constructor();
@@ -3439,10 +2646,6 @@ declare module ol {
             /**
              * Read all features from an OSM source.
              *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @param {olx.format.ReadOptions=} opt_options Read options.
-             * @return {Array.<ol.Feature>} Features.
              * @api stable
              */
             readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
@@ -3450,9 +2653,6 @@ declare module ol {
             /**
              * Read the projection from an OSM source.
              *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @return {ol.proj.Projection} Projection.
              * @api stable
              */
             readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
@@ -3463,9 +2663,6 @@ declare module ol {
          * Feature format for reading and writing data in the Encoded
          * Polyline Algorithm Format.
          *
-         * @constructor
-         * @extends {ol.format.TextFeature}
-         * @param {olx.format.PolylineOptions=} opt_options
          *     Optional configuration object.
          * @api stable
          */
@@ -3475,9 +2672,6 @@ declare module ol {
              * Feature format for reading and writing data in the Encoded
              * Polyline Algorithm Format.
              *
-             * @constructor
-             * @extends {ol.format.TextFeature}
-             * @param {olx.format.PolylineOptions=} opt_options
              *     Optional configuration object.
              * @api stable
              */
@@ -3488,12 +2682,8 @@ declare module ol {
              *
              * Attention: This function will modify the passed array!
              *
-             * @param {Array.<number>} numbers A list of n-dimensional points.
-             * @param {number} stride The number of dimension of the points in the list.
-             * @param {number=} opt_factor The factor by which the numbers will be
              *     multiplied. The remaining decimal places will get rounded away.
              *     Default is `1e5`.
-             * @return {string} The encoded string.
              * @api
              */
             static encodeDeltas(numbers: number[], stride: number, opt_factor?: number): string;
@@ -3501,12 +2691,8 @@ declare module ol {
             /**
              * Decode a list of n-dimensional points from an encoded string
              *
-             * @param {string} encoded An encoded string.
-             * @param {number} stride The number of dimension of the points in the
              *     encoded string.
-             * @param {number=} opt_factor The factor by which the resulting numbers will
              *     be divided. Default is `1e5`.
-             * @return {Array.<number>} A list of n-dimensional points.
              * @api
              */
             static decodeDeltas(encoded: string, stride: number, opt_factor?: number): number[];
@@ -3516,11 +2702,8 @@ declare module ol {
              *
              * Attention: This function will modify the passed array!
              *
-             * @param {Array.<number>} numbers A list of floating point numbers.
-             * @param {number=} opt_factor The factor by which the numbers will be
              *     multiplied. The remaining decimal places will get rounded away.
              *     Default is `1e5`.
-             * @return {string} The encoded string.
              * @api
              */
             static encodeFloats(numbers: number[], opt_factor?: number): string;
@@ -3528,10 +2711,7 @@ declare module ol {
             /**
              * Decode a list of floating point numbers from an encoded string
              *
-             * @param {string} encoded An encoded string.
-             * @param {number=} opt_factor The factor by which the result will be divided.
              *     Default is `1e5`.
-             * @return {Array.<number>} A list of floating point numbers.
              * @api
              */
             static decodeFloats(encoded: string, opt_factor?: number): number[];
@@ -3540,10 +2720,6 @@ declare module ol {
              * Read the feature from the Polyline source. The coordinates are assumed to be
              * in two dimensions and in latitude, longitude order.
              *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @param {olx.format.ReadOptions=} opt_options Read options.
-             * @return {ol.Feature} Feature.
              * @api stable
              */
             readFeature(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
@@ -3552,10 +2728,6 @@ declare module ol {
              * Read the feature from the source. As Polyline sources contain a single
              * feature, this will return the feature in an array.
              *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @param {olx.format.ReadOptions=} opt_options Read options.
-             * @return {Array.<ol.Feature>} Features.
              * @api stable
              */
             readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
@@ -3563,10 +2735,6 @@ declare module ol {
             /**
              * Read the geometry from the source.
              *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @param {olx.format.ReadOptions=} opt_options Read options.
-             * @return {ol.geom.Geometry} Geometry.
              * @api stable
              */
             readGeometry(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.geom.Geometry;
@@ -3574,9 +2742,6 @@ declare module ol {
             /**
              * Read the projection from a Polyline source.
              *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @return {ol.proj.Projection} Projection.
              * @api stable
              */
             readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
@@ -3584,10 +2749,6 @@ declare module ol {
             /**
              * Write a single geometry in Polyline format.
              *
-             * @function
-             * @param {ol.geom.Geometry} geometry Geometry.
-             * @param {olx.format.WriteOptions=} opt_options Write options.
-             * @return {string} Geometry.
              * @api stable
              */
             writeGeometry(geometry: ol.geom.Geometry, opt_options?: olx.format.WriteOptions): string;
@@ -3599,8 +2760,6 @@ declare module ol {
          * instantiated in apps.
          * Base class for text feature formats.
          *
-         * @constructor
-         * @extends {ol.format.Feature}
          */
         class TextFeature extends ol.format.Feature {
             /**
@@ -3609,8 +2768,6 @@ declare module ol {
              * instantiated in apps.
              * Base class for text feature formats.
              *
-             * @constructor
-             * @extends {ol.format.Feature}
              */
             constructor();
         }
@@ -3619,9 +2776,6 @@ declare module ol {
          * @classdesc
          * Feature format for reading data in the TopoJSON format.
          *
-         * @constructor
-         * @extends {ol.format.JSONFeature}
-         * @param {olx.format.TopoJSONOptions=} opt_options Options.
          * @api stable
          */
         class TopoJSON extends ol.format.JSONFeature {
@@ -3629,9 +2783,6 @@ declare module ol {
              * @classdesc
              * Feature format for reading data in the TopoJSON format.
              *
-             * @constructor
-             * @extends {ol.format.JSONFeature}
-             * @param {olx.format.TopoJSONOptions=} opt_options Options.
              * @api stable
              */
             constructor(opt_options?: olx.format.TopoJSONOptions);
@@ -3639,9 +2790,6 @@ declare module ol {
             /**
              * Read all features from a TopoJSON source.
              *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @return {Array.<ol.Feature>} Features.
              * @api stable
              */
             readFeatures(source: (Document | Node | GlobalObject | string)): ol.Feature[];
@@ -3649,9 +2797,6 @@ declare module ol {
             /**
              * Read the projection from a TopoJSON source.
              *
-             * @function
-             * @param {Document|Node|Object|string} object Source.
-             * @return {ol.proj.Projection} Projection.
              * @api stable
              */
             readProjection(object: (Document | Node | GlobalObject | string)): ol.proj.Projection;
@@ -3664,10 +2809,7 @@ declare module ol {
          * as option if you want to read a WFS that contains GML2 (WFS 1.0.0).
          * Also see {@link ol.format.GMLBase} which is used by this format.
          *
-         * @constructor
-         * @param {olx.format.WFSOptions=} opt_options
          *     Optional configuration object.
-         * @extends {ol.format.XMLFeature}
          * @api stable
          */
         class WFS extends ol.format.XMLFeature {
@@ -3678,10 +2820,7 @@ declare module ol {
              * as option if you want to read a WFS that contains GML2 (WFS 1.0.0).
              * Also see {@link ol.format.GMLBase} which is used by this format.
              *
-             * @constructor
-             * @param {olx.format.WFSOptions=} opt_options
              *     Optional configuration object.
-             * @extends {ol.format.XMLFeature}
              * @api stable
              */
             constructor(opt_options?: olx.format.WFSOptions);
@@ -3689,10 +2828,6 @@ declare module ol {
             /**
              * Read all features from a WFS FeatureCollection.
              *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @param {olx.format.ReadOptions=} opt_options Read options.
-             * @return {Array.<ol.Feature>} Features.
              * @api stable
              */
             readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
@@ -3700,8 +2835,6 @@ declare module ol {
             /**
              * Read transaction response of the source.
              *
-             * @param {Document|Node|Object|string} source Source.
-             * @return {ol.WFSTransactionResponse|undefined} Transaction response.
              * @api stable
              */
             readTransactionResponse(source: (Document | Node | GlobalObject | string)): (ol.WFSTransactionResponse);
@@ -3709,8 +2842,6 @@ declare module ol {
             /**
              * Read feature collection metadata of the source.
              *
-             * @param {Document|Node|Object|string} source Source.
-             * @return {ol.WFSFeatureCollectionMetadata|undefined}
              *     FeatureCollection metadata.
              * @api stable
              */
@@ -3719,8 +2850,6 @@ declare module ol {
             /**
              * Encode format as WFS `GetFeature` and return the Node.
              *
-             * @param {olx.format.WFSWriteGetFeatureOptions} options Options.
-             * @return {Node} Result.
              * @api stable
              */
             writeGetFeature(options: olx.format.WFSWriteGetFeatureOptions): Node;
@@ -3728,11 +2857,6 @@ declare module ol {
             /**
              * Encode format as WFS `Transaction` and return the Node.
              *
-             * @param {Array.<ol.Feature>} inserts The features to insert.
-             * @param {Array.<ol.Feature>} updates The features to update.
-             * @param {Array.<ol.Feature>} deletes The features to delete.
-             * @param {olx.format.WFSWriteTransactionOptions} options Write options.
-             * @return {Node} Result.
              * @api stable
              */
             writeTransaction(inserts: ol.Feature[], updates: ol.Feature[], deletes: ol.Feature[], options: olx.format.WFSWriteTransactionOptions): Node;
@@ -3740,9 +2864,6 @@ declare module ol {
             /**
              * Read the projection from a WFS source.
              *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @return {?ol.proj.Projection} Projection.
              * @api stable
              */
             readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
@@ -3753,9 +2874,6 @@ declare module ol {
          * Geometry format for reading and writing data in the `WellKnownText` (WKT)
          * format.
          *
-         * @constructor
-         * @extends {ol.format.TextFeature}
-         * @param {olx.format.WKTOptions=} opt_options Options.
          * @api stable
          */
         class WKT extends ol.format.TextFeature {
@@ -3764,9 +2882,6 @@ declare module ol {
              * Geometry format for reading and writing data in the `WellKnownText` (WKT)
              * format.
              *
-             * @constructor
-             * @extends {ol.format.TextFeature}
-             * @param {olx.format.WKTOptions=} opt_options Options.
              * @api stable
              */
             constructor(opt_options?: olx.format.WKTOptions);
@@ -3774,10 +2889,6 @@ declare module ol {
             /**
              * Read a feature from a WKT source.
              *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @param {olx.format.ReadOptions=} opt_options Read options.
-             * @return {ol.Feature} Feature.
              * @api stable
              */
             readFeature(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
@@ -3785,10 +2896,6 @@ declare module ol {
             /**
              * Read all features from a WKT source.
              *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @param {olx.format.ReadOptions=} opt_options Read options.
-             * @return {Array.<ol.Feature>} Features.
              * @api stable
              */
             readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
@@ -3796,10 +2903,6 @@ declare module ol {
             /**
              * Read a single geometry from a WKT source.
              *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @param {olx.format.ReadOptions=} opt_options Read options.
-             * @return {ol.geom.Geometry} Geometry.
              * @api stable
              */
             readGeometry(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.geom.Geometry;
@@ -3807,10 +2910,6 @@ declare module ol {
             /**
              * Encode a feature as a WKT string.
              *
-             * @function
-             * @param {ol.Feature} feature Feature.
-             * @param {olx.format.WriteOptions=} opt_options Write options.
-             * @return {string} WKT string.
              * @api stable
              */
             writeFeature(feature: ol.Feature, opt_options?: olx.format.WriteOptions): string;
@@ -3818,10 +2917,6 @@ declare module ol {
             /**
              * Encode an array of features as a WKT string.
              *
-             * @function
-             * @param {Array.<ol.Feature>} features Features.
-             * @param {olx.format.WriteOptions=} opt_options Write options.
-             * @return {string} WKT string.
              * @api stable
              */
             writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
@@ -3829,9 +2924,6 @@ declare module ol {
             /**
              * Write a single geometry as a WKT string.
              *
-             * @function
-             * @param {ol.geom.Geometry} geometry Geometry.
-             * @return {string} WKT string.
              * @api stable
              */
             writeGeometry(geometry: ol.geom.Geometry): string;
@@ -3841,8 +2933,6 @@ declare module ol {
          * @classdesc
          * Format for reading WMS capabilities data
          *
-         * @constructor
-         * @extends {ol.format.XML}
          * @api
          */
         class WMSCapabilities extends ol.format.XML {
@@ -3850,8 +2940,6 @@ declare module ol {
              * @classdesc
              * Format for reading WMS capabilities data
              *
-             * @constructor
-             * @extends {ol.format.XML}
              * @api
              */
             constructor();
@@ -3859,9 +2947,6 @@ declare module ol {
             /**
              * Read a WMS capabilities document.
              *
-             * @function
-             * @param {Document|Node|string} source The XML source.
-             * @return {Object} An object representing the WMS capabilities.
              * @api
              */
             read(source: (Document | Node | string)): GlobalObject;
@@ -3872,9 +2957,6 @@ declare module ol {
          * Format for reading WMSGetFeatureInfo format. It uses
          * {@link ol.format.GML2} to read features.
          *
-         * @constructor
-         * @extends {ol.format.XMLFeature}
-         * @param {olx.format.WMSGetFeatureInfoOptions=} opt_options Options.
          * @api
          */
         class WMSGetFeatureInfo extends ol.format.XMLFeature {
@@ -3883,9 +2965,6 @@ declare module ol {
              * Format for reading WMSGetFeatureInfo format. It uses
              * {@link ol.format.GML2} to read features.
              *
-             * @constructor
-             * @extends {ol.format.XMLFeature}
-             * @param {olx.format.WMSGetFeatureInfoOptions=} opt_options Options.
              * @api
              */
             constructor(opt_options?: olx.format.WMSGetFeatureInfoOptions);
@@ -3893,10 +2972,6 @@ declare module ol {
             /**
              * Read all features from a WMSGetFeatureInfo response.
              *
-             * @function
-             * @param {Document|Node|Object|string} source Source.
-             * @param {olx.format.ReadOptions=} opt_options Options.
-             * @return {Array.<ol.Feature>} Features.
              * @api stable
              */
             readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
@@ -3906,8 +2981,6 @@ declare module ol {
          * @classdesc
          * Format for reading WMTS capabilities data.
          *
-         * @constructor
-         * @extends {ol.format.XML}
          * @api
          */
         class WMTSCapabilities extends ol.format.XML {
@@ -3915,8 +2988,6 @@ declare module ol {
              * @classdesc
              * Format for reading WMTS capabilities data.
              *
-             * @constructor
-             * @extends {ol.format.XML}
              * @api
              */
             constructor();
@@ -3924,9 +2995,6 @@ declare module ol {
             /**
              * Read a WMTS capabilities document.
              *
-             * @function
-             * @param {Document|Node|string} source The XML source.
-             * @return {Object} An object representing the WMTS capabilities.
              * @api
              */
             read(source: (Document | Node | string)): GlobalObject;
@@ -3936,7 +3004,6 @@ declare module ol {
          * @classdesc
          * Generic format for reading non-feature XML data
          *
-         * @constructor
          * @struct
          */
         class XML {
@@ -3944,7 +3011,6 @@ declare module ol {
              * @classdesc
              * Generic format for reading non-feature XML data
              *
-             * @constructor
              * @struct
              */
             constructor();
@@ -3956,8 +3022,6 @@ declare module ol {
          * instantiated in apps.
          * Base class for XML feature formats.
          *
-         * @constructor
-         * @extends {ol.format.Feature}
          */
         class XMLFeature extends ol.format.Feature {
             /**
@@ -3966,8 +3030,6 @@ declare module ol {
              * instantiated in apps.
              * Base class for XML feature formats.
              *
-             * @constructor
-             * @extends {ol.format.Feature}
              */
             constructor();
         }
@@ -3994,9 +3056,6 @@ declare module ol {
      *     });
      *
      * @fires error
-     * @constructor
-     * @extends {ol.Object}
-     * @param {olx.GeolocationOptions=} opt_options Options.
      * @api stable
      */
     class Geolocation extends ol.Object {
@@ -4021,16 +3080,12 @@ declare module ol {
          *     });
          *
          * @fires error
-         * @constructor
-         * @extends {ol.Object}
-         * @param {olx.GeolocationOptions=} opt_options Options.
          * @api stable
          */
         constructor(opt_options?: olx.GeolocationOptions);
 
         /**
          * Get the accuracy of the position in meters.
-         * @return {number|undefined} The accuracy of the position measurement in
          *     meters.
          * @observable
          * @api stable
@@ -4039,7 +3094,6 @@ declare module ol {
 
         /**
          * Get a geometry of the position accuracy.
-         * @return {?ol.geom.Geometry} A geometry of the position accuracy.
          * @observable
          * @api stable
          */
@@ -4047,7 +3101,6 @@ declare module ol {
 
         /**
          * Get the altitude associated with the position.
-         * @return {number|undefined} The altitude of the position in meters above mean
          *     sea level.
          * @observable
          * @api stable
@@ -4056,7 +3109,6 @@ declare module ol {
 
         /**
          * Get the altitude accuracy of the position.
-         * @return {number|undefined} The accuracy of the altitude measurement in
          *     meters.
          * @observable
          * @api stable
@@ -4065,7 +3117,6 @@ declare module ol {
 
         /**
          * Get the heading as radians clockwise from North.
-         * @return {number|undefined} The heading of the device in radians from north.
          * @observable
          * @api stable
          */
@@ -4073,7 +3124,6 @@ declare module ol {
 
         /**
          * Get the position of the device.
-         * @return {ol.Coordinate|undefined} The current position of the device reported
          *     in the current projection.
          * @observable
          * @api stable
@@ -4082,7 +3132,6 @@ declare module ol {
 
         /**
          * Get the projection associated with the position.
-         * @return {ol.proj.Projection|undefined} The projection the position is
          *     reported in.
          * @observable
          * @api stable
@@ -4091,7 +3140,6 @@ declare module ol {
 
         /**
          * Get the speed in meters per second.
-         * @return {number|undefined} The instantaneous speed of the device in meters
          *     per second.
          * @observable
          * @api stable
@@ -4100,7 +3148,6 @@ declare module ol {
 
         /**
          * Determine if the device location is being tracked.
-         * @return {boolean} The device location is being tracked.
          * @observable
          * @api stable
          */
@@ -4109,7 +3156,6 @@ declare module ol {
         /**
          * Get the tracking options.
          * @see http://www.w3.org/TR/geolocation-API/#position-options
-         * @return {GeolocationPositionOptions|undefined} PositionOptions as defined by
          *     the [HTML5 Geolocation spec
          *     ](http://www.w3.org/TR/geolocation-API/#position_options_interface).
          * @observable
@@ -4119,7 +3165,6 @@ declare module ol {
 
         /**
          * Set the projection to use for transforming the coordinates.
-         * @param {ol.proj.Projection} projection The projection the position is
          *     reported in.
          * @observable
          * @api stable
@@ -4128,7 +3173,6 @@ declare module ol {
 
         /**
          * Enable or disable tracking.
-         * @param {boolean} tracking Enable tracking.
          * @observable
          * @api stable
          */
@@ -4137,7 +3181,6 @@ declare module ol {
         /**
          * Set the tracking options.
          * @see http://www.w3.org/TR/geolocation-API/#position-options
-         * @param {GeolocationPositionOptions} options PositionOptions as defined by the
          *     [HTML5 Geolocation spec
          *     ](http://www.w3.org/TR/geolocation-API/#position_options_interface).
          * @observable
@@ -4146,19 +3189,11 @@ declare module ol {
         setTrackingOptions(options: PositionOptions): void;
     }
 
-    /**
-     * @namespace ol.geom
-     */
     module geom {
         /**
          * @classdesc
          * Circle geometry.
          *
-         * @constructor
-         * @extends {ol.geom.SimpleGeometry}
-         * @param {ol.Coordinate} center Center.
-         * @param {number=} opt_radius Radius.
-         * @param {ol.geom.GeometryLayout=} opt_layout Layout.
          * @api
          */
         class Circle extends ol.geom.SimpleGeometry {
@@ -4166,32 +3201,24 @@ declare module ol {
              * @classdesc
              * Circle geometry.
              *
-             * @constructor
-             * @extends {ol.geom.SimpleGeometry}
-             * @param {ol.Coordinate} center Center.
-             * @param {number=} opt_radius Radius.
-             * @param {ol.geom.GeometryLayout=} opt_layout Layout.
              * @api
              */
             constructor(center: ol.Coordinate, opt_radius?: number, opt_layout?: ol.geom.GeometryLayout);
 
             /**
              * Make a complete copy of the geometry.
-             * @return {!ol.geom.Circle} Clone.
              * @api
              */
             clone(): ol.geom.Circle;
 
             /**
              * Return the center of the circle as {@link ol.Coordinate coordinate}.
-             * @return {ol.Coordinate} Center.
              * @api
              */
             getCenter(): ol.Coordinate;
 
             /**
              * Return the radius of the circle.
-             * @return {number} Radius.
              * @api
              */
             getRadius(): number;
@@ -4210,7 +3237,6 @@ declare module ol {
 
             /**
              * Set the center of the circle as {@link ol.Coordinate coordinate}.
-             * @param {ol.Coordinate} center Center.
              * @api
              */
             setCenter(center: ol.Coordinate): void;
@@ -4218,16 +3244,12 @@ declare module ol {
             /**
              * Set the center (as {@link ol.Coordinate coordinate}) and the radius (as
              * number) of the circle.
-             * @param {ol.Coordinate} center Center.
-             * @param {number} radius Radius.
-             * @param {ol.geom.GeometryLayout=} opt_layout Layout.
              * @api
              */
             setCenterAndRadius(center: ol.Coordinate, radius: number, opt_layout?: ol.geom.GeometryLayout): void;
 
             /**
              * Set the radius of the circle. The radius is in the units of the projection.
-             * @param {number} radius Radius.
              * @api
              */
             setRadius(radius: number): void;
@@ -4237,7 +3259,6 @@ declare module ol {
          * The geometry type. One of `'Point'`, `'LineString'`, `'LinearRing'`,
          * `'Polygon'`, `'MultiPoint'`, `'MultiLineString'`, `'MultiPolygon'`,
          * `'GeometryCollection'`, `'Circle'`.
-         * @enum {string}
          */
         type GeometryType = "Point" | "LineString" | "LinearRing" | "Polygon" | "MultiPoint" | "MultiLineString" | "MultiPolygon" | "GeometryCollection" | "Circle";
 
@@ -4245,7 +3266,6 @@ declare module ol {
          * The coordinate layout for geometries, indicating whether a 3rd or 4th z ('Z')
          * or measure ('M') coordinate is available. Supported values are `'XY'`,
          * `'XYZ'`, `'XYM'`, `'XYZM'`.
-         * @enum {string}
          */
         type GeometryLayout = "XY" | "XYZ" | "XYM" | "XYZM";
 
@@ -4258,8 +3278,6 @@ declare module ol {
          * To get notified of changes to the geometry, register a listener for the
          * generic `change` event on your geometry instance.
          *
-         * @constructor
-         * @extends {ol.Object}
          * @api stable
          */
         class Geometry extends ol.Object {
@@ -4272,8 +3290,6 @@ declare module ol {
              * To get notified of changes to the geometry, register a listener for the
              * generic `change` event on your geometry instance.
              *
-             * @constructor
-             * @extends {ol.Object}
              * @api stable
              */
             constructor();
@@ -4281,9 +3297,6 @@ declare module ol {
             /**
              * Return the closest point of the geometry to the passed point as
              * {@link ol.Coordinate coordinate}.
-             * @param {ol.Coordinate} point Point.
-             * @param {ol.Coordinate=} opt_closestPoint Closest point.
-             * @return {ol.Coordinate} Closest point.
              * @api stable
              */
             getClosestPoint(point: ol.Coordinate, opt_closestPoint?: ol.Coordinate): ol.Coordinate;
@@ -4291,16 +3304,12 @@ declare module ol {
             /**
              * Returns true if this geometry includes the specified coordinate. If the
              * coordinate is on the boundary of the geometry, returns false.
-             * @param {ol.Coordinate} coordinate Coordinate.
-             * @return {boolean} Contains coordinate.
              * @api
              */
             intersectsCoordinate(coordinate: ol.Coordinate): boolean;
 
             /**
              * Get the extent of the geometry.
-             * @param {ol.Extent=} opt_extent Extent.
-             * @return {ol.Extent} extent Extent.
              * @api stable
              */
             getExtent(opt_extent?: ol.Extent): ol.Extent;
@@ -4308,9 +3317,6 @@ declare module ol {
             /**
              * Rotate the geometry around a given coordinate. This modifies the geometry
              * coordinates in place.
-             * @abstract
-             * @param {number} angle Rotation angle in radians.
-             * @param {ol.Coordinate} anchor The rotation center.
              * @api
              */
             rotate(angle: number, anchor: ol.Coordinate): void;
@@ -4318,11 +3324,7 @@ declare module ol {
             /**
              * Scale the geometry (with an optional origin).  This modifies the geometry
              * coordinates in place.
-             * @abstract
-             * @param {number} sx The scaling factor in the x-direction.
-             * @param {number=} opt_sy The scaling factor in the y-direction (defaults to
              *     sx).
-             * @param {ol.Coordinate=} opt_anchor The scale origin (defaults to the center
              *     of the geometry extent).
              * @api
              */
@@ -4334,9 +3336,6 @@ declare module ol {
              * https://en.wikipedia.org/wiki/Ramer-Douglas-Peucker_algorithm
              * Douglas Peucker} algorithm.  For polygons, a quantization-based
              * simplification is used to preserve topology.
-             * @function
-             * @param {number} tolerance The tolerance distance for simplification.
-             * @return {ol.geom.Geometry} A new, simplified version of the original
              *     geometry.
              * @api
              */
@@ -4349,11 +3348,8 @@ declare module ol {
              * If you do not want the geometry modified in place, first `clone()` it and
              * then use this function on the clone.
              *
-             * @param {ol.ProjectionLike} source The current projection.  Can be a
              *     string identifier or a {@link ol.proj.Projection} object.
-             * @param {ol.ProjectionLike} destination The desired projection.  Can be a
              *     string identifier or a {@link ol.proj.Projection} object.
-             * @return {ol.geom.Geometry} This geometry.  Note that original geometry is
              *     modified in place.
              * @api stable
              */
@@ -4361,8 +3357,6 @@ declare module ol {
 
             /**
              * Get the type of this geometry.
-             * @abstract
-             * @return {ol.geom.GeometryType} Geometry type.
              */
             getType(): ol.geom.GeometryType;
         }
@@ -4371,9 +3365,6 @@ declare module ol {
          * @classdesc
          * An array of {@link ol.geom.Geometry} objects.
          *
-         * @constructor
-         * @extends {ol.geom.Geometry}
-         * @param {Array.<ol.geom.Geometry>=} opt_geometries Geometries.
          * @api stable
          */
         class GeometryCollection extends ol.geom.Geometry {
@@ -4381,23 +3372,18 @@ declare module ol {
              * @classdesc
              * An array of {@link ol.geom.Geometry} objects.
              *
-             * @constructor
-             * @extends {ol.geom.Geometry}
-             * @param {Array.<ol.geom.Geometry>=} opt_geometries Geometries.
              * @api stable
              */
             constructor(opt_geometries?: ol.geom.Geometry[]);
 
             /**
              * Make a complete copy of the geometry.
-             * @return {!ol.geom.GeometryCollection} Clone.
              * @api stable
              */
             clone(): ol.geom.GeometryCollection;
 
             /**
              * Return the geometries that make up this geometry collection.
-             * @return {Array.<ol.geom.Geometry>} Geometries.
              * @api stable
              */
             getGeometries(): ol.geom.Geometry[];
@@ -4416,7 +3402,6 @@ declare module ol {
 
             /**
              * Set the geometries that make up this geometry collection.
-             * @param {Array.<ol.geom.Geometry>} geometries Geometries.
              * @api stable
              */
             setGeometries(geometries: ol.geom.Geometry[]): void;
@@ -4429,8 +3414,6 @@ declare module ol {
 
             /**
              * Translate the geometry.
-             * @param {number} deltaX Delta X.
-             * @param {number} deltaY Delta Y.
              * @api
              */
             translate(deltaX: number, deltaY: number): void;
@@ -4441,10 +3424,6 @@ declare module ol {
          * Linear ring geometry. Only used as part of polygon; cannot be rendered
          * on its own.
          *
-         * @constructor
-         * @extends {ol.geom.SimpleGeometry}
-         * @param {Array.<ol.Coordinate>} coordinates Coordinates.
-         * @param {ol.geom.GeometryLayout=} opt_layout Layout.
          * @api stable
          */
         class LinearRing extends ol.geom.SimpleGeometry {
@@ -4453,31 +3432,24 @@ declare module ol {
              * Linear ring geometry. Only used as part of polygon; cannot be rendered
              * on its own.
              *
-             * @constructor
-             * @extends {ol.geom.SimpleGeometry}
-             * @param {Array.<ol.Coordinate>} coordinates Coordinates.
-             * @param {ol.geom.GeometryLayout=} opt_layout Layout.
              * @api stable
              */
             constructor(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout);
 
             /**
              * Make a complete copy of the geometry.
-             * @return {!ol.geom.LinearRing} Clone.
              * @api stable
              */
             clone(): ol.geom.LinearRing;
 
             /**
              * Return the area of the linear ring on projected plane.
-             * @return {number} Area (on projected plane).
              * @api stable
              */
             getArea(): number;
 
             /**
              * Return the coordinates of the linear ring.
-             * @return {Array.<ol.Coordinate>} Coordinates.
              * @api stable
              */
             getCoordinates(): ol.Coordinate[];
@@ -4490,8 +3462,6 @@ declare module ol {
 
             /**
              * Set the coordinates of the linear ring.
-             * @param {Array.<ol.Coordinate>} coordinates Coordinates.
-             * @param {ol.geom.GeometryLayout=} opt_layout Layout.
              * @api stable
              */
             setCoordinates(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout): void;
@@ -4501,10 +3471,6 @@ declare module ol {
          * @classdesc
          * Linestring geometry.
          *
-         * @constructor
-         * @extends {ol.geom.SimpleGeometry}
-         * @param {Array.<ol.Coordinate>} coordinates Coordinates.
-         * @param {ol.geom.GeometryLayout=} opt_layout Layout.
          * @api stable
          */
         class LineString extends ol.geom.SimpleGeometry {
@@ -4512,24 +3478,18 @@ declare module ol {
              * @classdesc
              * Linestring geometry.
              *
-             * @constructor
-             * @extends {ol.geom.SimpleGeometry}
-             * @param {Array.<ol.Coordinate>} coordinates Coordinates.
-             * @param {ol.geom.GeometryLayout=} opt_layout Layout.
              * @api stable
              */
             constructor(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout);
 
             /**
              * Append the passed coordinate to the coordinates of the linestring.
-             * @param {ol.Coordinate} coordinate Coordinate.
              * @api stable
              */
             appendCoordinate(coordinate: ol.Coordinate): void;
 
             /**
              * Make a complete copy of the geometry.
-             * @return {!ol.geom.LineString} Clone.
              * @api stable
              */
             clone(): ol.geom.LineString;
@@ -4539,11 +3499,8 @@ declare module ol {
              * If the callback returns a truthy value the function returns that
              * value immediately. Otherwise the function returns `false`.
              *
-             * @param {function(this: S, ol.Coordinate, ol.Coordinate): T} callback Function
              *     called for each segment.
-             * @param {S=} opt_this The object to be used as the value of 'this'
              *     within callback.
-             * @return {T|boolean} Value.
              * @template T,S
              * @api
              */
@@ -4558,16 +3515,12 @@ declare module ol {
              * M will return the first coordinate and Ms greater than the last M will
              * return the last coordinate.
              *
-             * @param {number} m M.
-             * @param {boolean=} opt_extrapolate Extrapolate. Default is `false`.
-             * @return {ol.Coordinate} Coordinate.
              * @api stable
              */
             getCoordinateAtM(m: number, opt_extrapolate?: boolean): ol.Coordinate;
 
             /**
              * Return the coordinates of the linestring.
-             * @return {Array.<ol.Coordinate>} Coordinates.
              * @api stable
              */
             getCoordinates(): ol.Coordinate[];
@@ -4576,17 +3529,13 @@ declare module ol {
              * Return the coordinate at the provided fraction along the linestring.
              * The `fraction` is a number between 0 and 1, where 0 is the start of the
              * linestring and 1 is the end.
-             * @param {number} fraction Fraction.
-             * @param {ol.Coordinate=} opt_dest Optional coordinate whose values will
              *     be modified. If not provided, a new coordinate will be returned.
-             * @return {ol.Coordinate} Coordinate of the interpolated point.
              * @api
              */
             getCoordinateAt(fraction: number, opt_dest?: ol.Coordinate): ol.Coordinate;
 
             /**
              * Return the length of the linestring on projected plane.
-             * @return {number} Length (on projected plane).
              * @api stable
              */
             getLength(): number;
@@ -4605,8 +3554,6 @@ declare module ol {
 
             /**
              * Set the coordinates of the linestring.
-             * @param {Array.<ol.Coordinate>} coordinates Coordinates.
-             * @param {ol.geom.GeometryLayout=} opt_layout Layout.
              * @api stable
              */
             setCoordinates(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout): void;
@@ -4616,10 +3563,6 @@ declare module ol {
          * @classdesc
          * Multi-linestring geometry.
          *
-         * @constructor
-         * @extends {ol.geom.SimpleGeometry}
-         * @param {Array.<Array.<ol.Coordinate>>} coordinates Coordinates.
-         * @param {ol.geom.GeometryLayout=} opt_layout Layout.
          * @api stable
          */
         class MultiLineString extends ol.geom.SimpleGeometry {
@@ -4627,24 +3570,18 @@ declare module ol {
              * @classdesc
              * Multi-linestring geometry.
              *
-             * @constructor
-             * @extends {ol.geom.SimpleGeometry}
-             * @param {Array.<Array.<ol.Coordinate>>} coordinates Coordinates.
-             * @param {ol.geom.GeometryLayout=} opt_layout Layout.
              * @api stable
              */
             constructor(coordinates: ol.Coordinate[][], opt_layout?: ol.geom.GeometryLayout);
 
             /**
              * Append the passed linestring to the multilinestring.
-             * @param {ol.geom.LineString} lineString LineString.
              * @api stable
              */
             appendLineString(lineString: ol.geom.LineString): void;
 
             /**
              * Make a complete copy of the geometry.
-             * @return {!ol.geom.MultiLineString} Clone.
              * @api stable
              */
             clone(): ol.geom.MultiLineString;
@@ -4665,32 +3602,24 @@ declare module ol {
              * `false` then the function will return `null` for Ms falling between
              * LineStrings.
              *
-             * @param {number} m M.
-             * @param {boolean=} opt_extrapolate Extrapolate. Default is `false`.
-             * @param {boolean=} opt_interpolate Interpolate. Default is `false`.
-             * @return {ol.Coordinate} Coordinate.
              * @api stable
              */
             getCoordinateAtM(m: number, opt_extrapolate?: boolean, opt_interpolate?: boolean): ol.Coordinate;
 
             /**
              * Return the coordinates of the multilinestring.
-             * @return {Array.<Array.<ol.Coordinate>>} Coordinates.
              * @api stable
              */
             getCoordinates(): ol.Coordinate[][];
 
             /**
              * Return the linestring at the specified index.
-             * @param {number} index Index.
-             * @return {ol.geom.LineString} LineString.
              * @api stable
              */
             getLineString(index: number): ol.geom.LineString;
 
             /**
              * Return the linestrings of this multilinestring.
-             * @return {Array.<ol.geom.LineString>} LineStrings.
              * @api stable
              */
             getLineStrings(): ol.geom.LineString[];
@@ -4709,8 +3638,6 @@ declare module ol {
 
             /**
              * Set the coordinates of the multilinestring.
-             * @param {Array.<Array.<ol.Coordinate>>} coordinates Coordinates.
-             * @param {ol.geom.GeometryLayout=} opt_layout Layout.
              * @api stable
              */
             setCoordinates(coordinates: ol.Coordinate[][], opt_layout?: ol.geom.GeometryLayout): void;
@@ -4720,10 +3647,6 @@ declare module ol {
          * @classdesc
          * Multi-point geometry.
          *
-         * @constructor
-         * @extends {ol.geom.SimpleGeometry}
-         * @param {Array.<ol.Coordinate>} coordinates Coordinates.
-         * @param {ol.geom.GeometryLayout=} opt_layout Layout.
          * @api stable
          */
         class MultiPoint extends ol.geom.SimpleGeometry {
@@ -4731,46 +3654,36 @@ declare module ol {
              * @classdesc
              * Multi-point geometry.
              *
-             * @constructor
-             * @extends {ol.geom.SimpleGeometry}
-             * @param {Array.<ol.Coordinate>} coordinates Coordinates.
-             * @param {ol.geom.GeometryLayout=} opt_layout Layout.
              * @api stable
              */
             constructor(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout);
 
             /**
              * Append the passed point to this multipoint.
-             * @param {ol.geom.Point} point Point.
              * @api stable
              */
             appendPoint(point: ol.geom.Point): void;
 
             /**
              * Make a complete copy of the geometry.
-             * @return {!ol.geom.MultiPoint} Clone.
              * @api stable
              */
             clone(): ol.geom.MultiPoint;
 
             /**
              * Return the coordinates of the multipoint.
-             * @return {Array.<ol.Coordinate>} Coordinates.
              * @api stable
              */
             getCoordinates(): ol.Coordinate[];
 
             /**
              * Return the point at the specified index.
-             * @param {number} index Index.
-             * @return {ol.geom.Point} Point.
              * @api stable
              */
             getPoint(index: number): ol.geom.Point;
 
             /**
              * Return the points of this multipoint.
-             * @return {Array.<ol.geom.Point>} Points.
              * @api stable
              */
             getPoints(): ol.geom.Point[];
@@ -4789,8 +3702,6 @@ declare module ol {
 
             /**
              * Set the coordinates of the multipoint.
-             * @param {Array.<ol.Coordinate>} coordinates Coordinates.
-             * @param {ol.geom.GeometryLayout=} opt_layout Layout.
              * @api stable
              */
             setCoordinates(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout): void;
@@ -4800,10 +3711,6 @@ declare module ol {
          * @classdesc
          * Multi-polygon geometry.
          *
-         * @constructor
-         * @extends {ol.geom.SimpleGeometry}
-         * @param {Array.<Array.<Array.<ol.Coordinate>>>} coordinates Coordinates.
-         * @param {ol.geom.GeometryLayout=} opt_layout Layout.
          * @api stable
          */
         class MultiPolygon extends ol.geom.SimpleGeometry {
@@ -4811,31 +3718,24 @@ declare module ol {
              * @classdesc
              * Multi-polygon geometry.
              *
-             * @constructor
-             * @extends {ol.geom.SimpleGeometry}
-             * @param {Array.<Array.<Array.<ol.Coordinate>>>} coordinates Coordinates.
-             * @param {ol.geom.GeometryLayout=} opt_layout Layout.
              * @api stable
              */
             constructor(coordinates: ol.Coordinate[][][], opt_layout?: ol.geom.GeometryLayout);
 
             /**
              * Append the passed polygon to this multipolygon.
-             * @param {ol.geom.Polygon} polygon Polygon.
              * @api stable
              */
             appendPolygon(polygon: ol.geom.Polygon): void;
 
             /**
              * Make a complete copy of the geometry.
-             * @return {!ol.geom.MultiPolygon} Clone.
              * @api stable
              */
             clone(): ol.geom.MultiPolygon;
 
             /**
              * Return the area of the multipolygon on projected plane.
-             * @return {number} Area (on projected plane).
              * @api stable
              */
             getArea(): number;
@@ -4844,35 +3744,29 @@ declare module ol {
              * Get the coordinate array for this geometry.  This array has the structure
              * of a GeoJSON coordinate array for multi-polygons.
              *
-             * @param {boolean=} opt_right Orient coordinates according to the right-hand
              *     rule (counter-clockwise for exterior and clockwise for interior rings).
              *     If `false`, coordinates will be oriented according to the left-hand rule
              *     (clockwise for exterior and counter-clockwise for interior rings).
              *     By default, coordinate orientation will depend on how the geometry was
              *     constructed.
-             * @return {Array.<Array.<Array.<ol.Coordinate>>>} Coordinates.
              * @api stable
              */
             getCoordinates(opt_right?: boolean): ol.Coordinate[][][];
 
             /**
              * Return the interior points as {@link ol.geom.MultiPoint multipoint}.
-             * @return {ol.geom.MultiPoint} Interior points.
              * @api stable
              */
             getInteriorPoints(): ol.geom.MultiPoint;
 
             /**
              * Return the polygon at the specified index.
-             * @param {number} index Index.
-             * @return {ol.geom.Polygon} Polygon.
              * @api stable
              */
             getPolygon(index: number): ol.geom.Polygon;
 
             /**
              * Return the polygons of this multipolygon.
-             * @return {Array.<ol.geom.Polygon>} Polygons.
              * @api stable
              */
             getPolygons(): ol.geom.Polygon[];
@@ -4891,8 +3785,6 @@ declare module ol {
 
             /**
              * Set the coordinates of the multipolygon.
-             * @param {Array.<Array.<Array.<ol.Coordinate>>>} coordinates Coordinates.
-             * @param {ol.geom.GeometryLayout=} opt_layout Layout.
              * @api stable
              */
             setCoordinates(coordinates: ol.Coordinate[][][], opt_layout?: ol.geom.GeometryLayout): void;
@@ -4902,10 +3794,6 @@ declare module ol {
          * @classdesc
          * Point geometry.
          *
-         * @constructor
-         * @extends {ol.geom.SimpleGeometry}
-         * @param {ol.Coordinate} coordinates Coordinates.
-         * @param {ol.geom.GeometryLayout=} opt_layout Layout.
          * @api stable
          */
         class Point extends ol.geom.SimpleGeometry {
@@ -4913,24 +3801,18 @@ declare module ol {
              * @classdesc
              * Point geometry.
              *
-             * @constructor
-             * @extends {ol.geom.SimpleGeometry}
-             * @param {ol.Coordinate} coordinates Coordinates.
-             * @param {ol.geom.GeometryLayout=} opt_layout Layout.
              * @api stable
              */
             constructor(coordinates: ol.Coordinate, opt_layout?: ol.geom.GeometryLayout);
 
             /**
              * Make a complete copy of the geometry.
-             * @return {!ol.geom.Point} Clone.
              * @api stable
              */
             clone(): ol.geom.Point;
 
             /**
              * Return the coordinate of the point.
-             * @return {ol.Coordinate} Coordinates.
              * @api stable
              */
             getCoordinates(): ol.Coordinate;
@@ -4949,8 +3831,6 @@ declare module ol {
 
             /**
              * Set the coordinate of the point.
-             * @param {ol.Coordinate} coordinates Coordinates.
-             * @param {ol.geom.GeometryLayout=} opt_layout Layout.
              * @api stable
              */
             setCoordinates(coordinates: ol.Coordinate, opt_layout?: ol.geom.GeometryLayout): void;
@@ -4960,10 +3840,6 @@ declare module ol {
          * @classdesc
          * Polygon geometry.
          *
-         * @constructor
-         * @extends {ol.geom.SimpleGeometry}
-         * @param {Array.<Array.<ol.Coordinate>>} coordinates Coordinates.
-         * @param {ol.geom.GeometryLayout=} opt_layout Layout.
          * @api stable
          */
         class Polygon extends ol.geom.SimpleGeometry {
@@ -4971,31 +3847,24 @@ declare module ol {
              * @classdesc
              * Polygon geometry.
              *
-             * @constructor
-             * @extends {ol.geom.SimpleGeometry}
-             * @param {Array.<Array.<ol.Coordinate>>} coordinates Coordinates.
-             * @param {ol.geom.GeometryLayout=} opt_layout Layout.
              * @api stable
              */
             constructor(coordinates: ol.Coordinate[][], opt_layout?: ol.geom.GeometryLayout);
 
             /**
              * Append the passed linear ring to this polygon.
-             * @param {ol.geom.LinearRing} linearRing Linear ring.
              * @api stable
              */
             appendLinearRing(linearRing: ol.geom.LinearRing): void;
 
             /**
              * Make a complete copy of the geometry.
-             * @return {!ol.geom.Polygon} Clone.
              * @api stable
              */
             clone(): ol.geom.Polygon;
 
             /**
              * Return the area of the polygon on projected plane.
-             * @return {number} Area (on projected plane).
              * @api stable
              */
             getArea(): number;
@@ -5004,20 +3873,17 @@ declare module ol {
              * Get the coordinate array for this geometry.  This array has the structure
              * of a GeoJSON coordinate array for polygons.
              *
-             * @param {boolean=} opt_right Orient coordinates according to the right-hand
              *     rule (counter-clockwise for exterior and clockwise for interior rings).
              *     If `false`, coordinates will be oriented according to the left-hand rule
              *     (clockwise for exterior and counter-clockwise for interior rings).
              *     By default, coordinate orientation will depend on how the geometry was
              *     constructed.
-             * @return {Array.<Array.<ol.Coordinate>>} Coordinates.
              * @api stable
              */
             getCoordinates(opt_right?: boolean): ol.Coordinate[][];
 
             /**
              * Return an interior point of the polygon.
-             * @return {ol.geom.Point} Interior point.
              * @api stable
              */
             getInteriorPoint(): ol.geom.Point;
@@ -5026,7 +3892,6 @@ declare module ol {
              * Return the number of rings of the polygon,  this includes the exterior
              * ring and any interior rings.
              *
-             * @return {number} Number of rings.
              * @api
              */
             getLinearRingCount(): number;
@@ -5037,15 +3902,12 @@ declare module ol {
              * The exterior linear ring is available at index `0` and the interior rings
              * at index `1` and beyond.
              *
-             * @param {number} index Index.
-             * @return {ol.geom.LinearRing} Linear ring.
              * @api stable
              */
             getLinearRing(index: number): ol.geom.LinearRing;
 
             /**
              * Return the linear rings of the polygon.
-             * @return {Array.<ol.geom.LinearRing>} Linear rings.
              * @api stable
              */
             getLinearRings(): ol.geom.LinearRing[];
@@ -5064,40 +3926,27 @@ declare module ol {
 
             /**
              * Set the coordinates of the polygon.
-             * @param {Array.<Array.<ol.Coordinate>>} coordinates Coordinates.
-             * @param {ol.geom.GeometryLayout=} opt_layout Layout.
              * @api stable
              */
             setCoordinates(coordinates: ol.Coordinate[][], opt_layout?: ol.geom.GeometryLayout): void;
 
             /**
              * Create an approximation of a circle on the surface of a sphere.
-             * @param {ol.Sphere} sphere The sphere.
-             * @param {ol.Coordinate} center Center (`[lon, lat]` in degrees).
-             * @param {number} radius The great-circle distance from the center to
              *     the polygon vertices.
-             * @param {number=} opt_n Optional number of vertices for the resulting
              *     polygon. Default is `32`.
-             * @return {ol.geom.Polygon} The "circular" polygon.
              * @api stable
              */
             static circular(sphere: ol.Sphere, center: ol.Coordinate, radius: number, opt_n?: number): ol.geom.Polygon;
 
             /**
              * Create a polygon from an extent. The layout used is `XY`.
-             * @param {ol.Extent} extent The extent.
-             * @return {ol.geom.Polygon} The polygon.
              * @api
              */
             static fromExtent(extent: ol.Extent): ol.geom.Polygon;
 
             /**
              * Create a regular polygon from a circle.
-             * @param {ol.geom.Circle} circle Circle geometry.
-             * @param {number=} opt_sides Number of sides of the polygon. Default is 32.
-             * @param {number=} opt_angle Start angle for the first vertex of the polygon in
              *     radians. Default is 0.
-             * @return {ol.geom.Polygon} Polygon geometry.
              * @api
              */
             static fromCircle(circle: ol.geom.Circle, opt_sides?: number, opt_angle?: number): ol.geom.Polygon;
@@ -5108,8 +3957,6 @@ declare module ol {
          * Abstract base class; only used for creating subclasses; do not instantiate
          * in apps, as cannot be rendered.
          *
-         * @constructor
-         * @extends {ol.geom.Geometry}
          * @api stable
          */
         class SimpleGeometry extends ol.geom.Geometry {
@@ -5118,29 +3965,24 @@ declare module ol {
              * Abstract base class; only used for creating subclasses; do not instantiate
              * in apps, as cannot be rendered.
              *
-             * @constructor
-             * @extends {ol.geom.Geometry}
              * @api stable
              */
             constructor();
 
             /**
              * Return the first coordinate of the geometry.
-             * @return {ol.Coordinate} First coordinate.
              * @api stable
              */
             getFirstCoordinate(): ol.Coordinate;
 
             /**
              * Return the last coordinate of the geometry.
-             * @return {ol.Coordinate} Last point.
              * @api stable
              */
             getLastCoordinate(): ol.Coordinate;
 
             /**
              * Return the {@link ol.geom.GeometryLayout layout} of the geometry.
-             * @return {ol.geom.GeometryLayout} Layout.
              * @api stable
              */
             getLayout(): ol.geom.GeometryLayout;
@@ -5161,36 +4003,29 @@ declare module ol {
 
     /**
      * Render a grid for a coordinate system on a map.
-     * @constructor
-     * @param {olx.GraticuleOptions=} opt_options Options.
      * @api
      */
     class Graticule {
         /**
          * Render a grid for a coordinate system on a map.
-         * @constructor
-         * @param {olx.GraticuleOptions=} opt_options Options.
          * @api
          */
         constructor(opt_options?: olx.GraticuleOptions);
 
         /**
          * Get the map associated with this graticule.
-         * @return {ol.Map} The map.
          * @api
          */
         getMap(): ol.Map;
 
         /**
          * Get the list of meridians.  Meridians are lines of equal longitude.
-         * @return {Array.<ol.geom.LineString>} The meridians.
          * @api
          */
         getMeridians(): ol.geom.LineString[];
 
         /**
          * Get the list of parallels.  Pallels are lines of equal latitude.
-         * @return {Array.<ol.geom.LineString>} The parallels.
          * @api
          */
         getParallels(): ol.geom.LineString[];
@@ -5198,21 +4033,16 @@ declare module ol {
         /**
          * Set the map for this graticule.  The graticule will be rendered on the
          * provided map.
-         * @param {ol.Map} map Map.
          * @api
          */
         setMap(map: ol.Map): void;
     }
 
-    /**
-     * @namespace ol.has
-     */
     module has {
         /**
          * The ratio between physical pixels and device-independent pixels
          * (dips) on the device (`window.devicePixelRatio`).
          * @const
-         * @type {number}
          * @api stable
          */
         const DEVICE_PIXEL_RATIO: number;
@@ -5221,7 +4051,6 @@ declare module ol {
          * True if both the library and browser support Canvas.  Always `false`
          * if `ol.ENABLE_CANVAS` is set to `false` at compile time.
          * @const
-         * @type {boolean}
          * @api stable
          */
         const CANVAS: boolean;
@@ -5229,7 +4058,6 @@ declare module ol {
         /**
          * Indicates if DeviceOrientation is supported in the user's browser.
          * @const
-         * @type {boolean}
          * @api stable
          */
         const DEVICE_ORIENTATION: boolean;
@@ -5237,7 +4065,6 @@ declare module ol {
         /**
          * Is HTML5 geolocation supported in the current browser?
          * @const
-         * @type {boolean}
          * @api stable
          */
         const GEOLOCATION: boolean;
@@ -5245,7 +4072,6 @@ declare module ol {
         /**
          * True if browser supports touch events.
          * @const
-         * @type {boolean}
          * @api stable
          */
         const TOUCH: boolean;
@@ -5254,41 +4080,16 @@ declare module ol {
          * True if both OpenLayers and browser support WebGL.  Always `false`
          * if `ol.ENABLE_WEBGL` is set to `false` at compile time.
          * @const
-         * @type {boolean}
          * @api stable
          */
         const WEBGL: boolean;
     }
 
-    /**
-     * @constructor
-     * @extends {ol.ImageBase}
-     * @param {ol.Extent} extent Extent.
-     * @param {number|undefined} resolution Resolution.
-     * @param {number} pixelRatio Pixel ratio.
-     * @param {Array.<ol.Attribution>} attributions Attributions.
-     * @param {string} src Image source URI.
-     * @param {?string} crossOrigin Cross origin.
-     * @param {ol.ImageLoadFunctionType} imageLoadFunction Image load function.
-     */
     class Image extends ol.ImageBase {
-        /**
-         * @constructor
-         * @extends {ol.ImageBase}
-         * @param {ol.Extent} extent Extent.
-         * @param {number|undefined} resolution Resolution.
-         * @param {number} pixelRatio Pixel ratio.
-         * @param {Array.<ol.Attribution>} attributions Attributions.
-         * @param {string} src Image source URI.
-         * @param {?string} crossOrigin Cross origin.
-         * @param {ol.ImageLoadFunctionType} imageLoadFunction Image load function.
-         */
         constructor(extent: ol.Extent, resolution: (number), pixelRatio: number, attributions: ol.Attribution[], src: string, crossOrigin?: string, imageLoadFunction?: ol.ImageLoadFunctionType);
 
         /**
          * Get the HTML image element (may be a Canvas, Image, or Video).
-         * @param {Object=} opt_context Object.
-         * @return {HTMLCanvasElement|Image|HTMLVideoElement} Image.
          * @api
          */
         getImage(opt_context?: GlobalObject): (HTMLCanvasElement | Image | HTMLVideoElement);
@@ -5302,49 +4103,13 @@ declare module ol {
         load(): void;
     }
 
-    /**
-     * @constructor
-     * @extends {ol.events.EventTarget}
-     * @param {ol.Extent} extent Extent.
-     * @param {number|undefined} resolution Resolution.
-     * @param {number} pixelRatio Pixel ratio.
-     * @param {ol.ImageState} state State.
-     * @param {Array.<ol.Attribution>} attributions Attributions.
-     */
     class ImageBase extends ol.events.EventTarget {
-        /**
-         * @constructor
-         * @extends {ol.events.EventTarget}
-         * @param {ol.Extent} extent Extent.
-         * @param {number|undefined} resolution Resolution.
-         * @param {number} pixelRatio Pixel ratio.
-         * @param {ol.ImageState} state State.
-         * @param {Array.<ol.Attribution>} attributions Attributions.
-         */
         constructor(extent: ol.Extent, resolution: (number), pixelRatio: number, state: ol.ImageState, attributions: ol.Attribution[]);
     }
 
     type ImageState = number;
 
-    /**
-     * @constructor
-     * @extends {ol.Tile}
-     * @param {ol.TileCoord} tileCoord Tile coordinate.
-     * @param {ol.Tile.State} state State.
-     * @param {string} src Image source URI.
-     * @param {?string} crossOrigin Cross origin.
-     * @param {ol.TileLoadFunctionType} tileLoadFunction Tile load function.
-     */
     class ImageTile extends ol.Tile {
-        /**
-         * @constructor
-         * @extends {ol.Tile}
-         * @param {ol.TileCoord} tileCoord Tile coordinate.
-         * @param {ol.Tile.State} state State.
-         * @param {string} src Image source URI.
-         * @param {?string} crossOrigin Cross origin.
-         * @param {ol.TileLoadFunctionType} tileLoadFunction Tile load function.
-         */
         constructor(tileCoord: ol.TileCoord, state: ol.Tile.State, src: string, crossOrigin?: string, tileLoadFunction?: ol.TileLoadFunctionType);
 
         /**
@@ -5372,24 +4137,15 @@ declare module ol {
      *     var child = new ChildClass('a', 'b', 'see');
      *     child.foo(); // This works.
      *
-     * @param {!Function} childCtor Child constructor.
-     * @param {!Function} parentCtor Parent constructor.
-     * @function
      * @api
      */
     function inherits(childCtor: (() => any), parentCtor: (() => any)): void;
 
-    /**
-     * @namespace ol.interaction
-     */
     module interaction {
         /**
          * @classdesc
          * Allows the user to zoom by double-clicking on the map.
          *
-         * @constructor
-         * @extends {ol.interaction.Interaction}
-         * @param {olx.interaction.DoubleClickZoomOptions=} opt_options Options.
          * @api stable
          */
         class DoubleClickZoom extends ol.interaction.Interaction {
@@ -5397,9 +4153,6 @@ declare module ol {
              * @classdesc
              * Allows the user to zoom by double-clicking on the map.
              *
-             * @constructor
-             * @extends {ol.interaction.Interaction}
-             * @param {olx.interaction.DoubleClickZoomOptions=} opt_options Options.
              * @api stable
              */
             constructor(opt_options?: olx.interaction.DoubleClickZoomOptions);
@@ -5407,9 +4160,6 @@ declare module ol {
             /**
              * Handles the {@link ol.MapBrowserEvent map browser event} (if it was a
              * doubleclick) and eventually zooms the map.
-             * @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event.
-             * @return {boolean} `false` to stop event propagation.
-             * @this {ol.interaction.DoubleClickZoom}
              * @api
              */
             static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
@@ -5419,10 +4169,7 @@ declare module ol {
          * @classdesc
          * Handles input of vector data by drag and drop.
          *
-         * @constructor
-         * @extends {ol.interaction.Interaction}
          * @fires ol.interaction.DragAndDropEvent
-         * @param {olx.interaction.DragAndDropOptions=} opt_options Options.
          * @api stable
          */
         class DragAndDrop extends ol.interaction.Interaction {
@@ -5430,10 +4177,7 @@ declare module ol {
              * @classdesc
              * Handles input of vector data by drag and drop.
              *
-             * @constructor
-             * @extends {ol.interaction.Interaction}
              * @fires ol.interaction.DragAndDropEvent
-             * @param {olx.interaction.DragAndDropOptions=} opt_options Options.
              * @api stable
              */
             constructor(opt_options?: olx.interaction.DragAndDropOptions);
@@ -5441,30 +4185,17 @@ declare module ol {
             /**
              * Handles the {@link ol.MapBrowserEvent map browser event} unconditionally and
              * neither prevents the browser default nor stops event propagation.
-             * @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event.
-             * @return {boolean} `false` to stop event propagation.
-             * @this {ol.interaction.DragAndDrop}
              * @api
              */
             static handleEvent: any;
         }
 
-        /**
-         * @namespace ol.interaction.DragAndDrop
-         */
         module DragAndDrop {
             /**
              * @classdesc
              * Events emitted by {@link ol.interaction.DragAndDrop} instances are instances
              * of this type.
              *
-             * @constructor
-             * @extends {ol.events.Event}
-             * @implements {oli.interaction.DragAndDropEvent}
-             * @param {ol.interaction.DragAndDropEventType} type Type.
-             * @param {File} file File.
-             * @param {Array.<ol.Feature>=} opt_features Features.
-             * @param {ol.proj.Projection=} opt_projection Projection.
              */
             class Event extends ol.events.Event {
                 /**
@@ -5472,33 +4203,23 @@ declare module ol {
                  * Events emitted by {@link ol.interaction.DragAndDrop} instances are instances
                  * of this type.
                  *
-                 * @constructor
-                 * @extends {ol.events.Event}
-                 * @implements {oli.interaction.DragAndDropEvent}
-                 * @param {ol.interaction.DragAndDropEventType} type Type.
-                 * @param {File} file File.
-                 * @param {Array.<ol.Feature>=} opt_features Features.
-                 * @param {ol.proj.Projection=} opt_projection Projection.
                  */
                 constructor(type: ol.interaction.DragAndDropEventType, file: File, opt_features?: ol.Feature[], opt_projection?: ol.proj.Projection);
 
                 /**
                  * The features parsed from dropped data.
-                 * @type {Array.<ol.Feature>|undefined}
                  * @api stable
                  */
                 features: ol.Feature[];
 
                 /**
                  * The dropped file.
-                 * @type {File}
                  * @api stable
                  */
                 file: File;
 
                 /**
                  * The feature projection.
-                 * @type {ol.proj.Projection|undefined}
                  * @api
                  */
                 projection: ol.proj.Projection;
@@ -5518,10 +4239,7 @@ declare module ol {
          *
          * This interaction is only supported for mouse devices.
          *
-         * @constructor
-         * @extends {ol.interaction.Pointer}
          * @fires ol.DragBoxEvent
-         * @param {olx.interaction.DragBoxOptions=} opt_options Options.
          * @api stable
          */
         class DragBox extends ol.interaction.Pointer {
@@ -5536,37 +4254,24 @@ declare module ol {
              *
              * This interaction is only supported for mouse devices.
              *
-             * @constructor
-             * @extends {ol.interaction.Pointer}
              * @fires ol.DragBoxEvent
-             * @param {olx.interaction.DragBoxOptions=} opt_options Options.
              * @api stable
              */
             constructor(opt_options?: olx.interaction.DragBoxOptions);
 
             /**
              * Returns geometry of last drawn box.
-             * @return {ol.geom.Polygon} Geometry.
              * @api stable
              */
             getGeometry(): ol.geom.Polygon;
         }
 
-        /**
-         * @namespace ol.interaction.DragBox
-         */
         module DragBox {
             /**
              * @classdesc
              * Events emitted by {@link ol.interaction.DragBox} instances are instances of
              * this type.
              *
-             * @param {string} type The event type.
-             * @param {ol.Coordinate} coordinate The event coordinate.
-             * @param {ol.MapBrowserEvent} mapBrowserEvent Originating event.
-             * @extends {ol.events.Event}
-             * @constructor
-             * @implements {oli.DragBoxEvent}
              */
             class Event extends ol.events.Event {
                 /**
@@ -5574,26 +4279,18 @@ declare module ol {
                  * Events emitted by {@link ol.interaction.DragBox} instances are instances of
                  * this type.
                  *
-                 * @param {string} type The event type.
-                 * @param {ol.Coordinate} coordinate The event coordinate.
-                 * @param {ol.MapBrowserEvent} mapBrowserEvent Originating event.
-                 * @extends {ol.events.Event}
-                 * @constructor
-                 * @implements {oli.DragBoxEvent}
                  */
                 constructor(type: string, coordinate: ol.Coordinate, mapBrowserEvent: ol.MapBrowserEvent);
 
                 /**
                  * The coordinate of the drag event.
                  * @const
-                 * @type {ol.Coordinate}
                  * @api stable
                  */
                 coordinate: ol.Coordinate;
 
                 /**
                  * @const
-                 * @type {ol.MapBrowserEvent}
                  * @api
                  */
                 mapBrowserEvent: ol.MapBrowserEvent;
@@ -5606,9 +4303,6 @@ declare module ol {
          * @classdesc
          * Allows the user to pan the map by dragging the map.
          *
-         * @constructor
-         * @extends {ol.interaction.Pointer}
-         * @param {olx.interaction.DragPanOptions=} opt_options Options.
          * @api stable
          */
         class DragPan extends ol.interaction.Pointer {
@@ -5616,9 +4310,6 @@ declare module ol {
              * @classdesc
              * Allows the user to pan the map by dragging the map.
              *
-             * @constructor
-             * @extends {ol.interaction.Pointer}
-             * @param {olx.interaction.DragPanOptions=} opt_options Options.
              * @api stable
              */
             constructor(opt_options?: olx.interaction.DragPanOptions);
@@ -5632,9 +4323,6 @@ declare module ol {
          *
          * This interaction is only supported for mouse devices.
          *
-         * @constructor
-         * @extends {ol.interaction.Pointer}
-         * @param {olx.interaction.DragRotateOptions=} opt_options Options.
          * @api stable
          */
         class DragRotate extends ol.interaction.Pointer {
@@ -5646,9 +4334,6 @@ declare module ol {
              *
              * This interaction is only supported for mouse devices.
              *
-             * @constructor
-             * @extends {ol.interaction.Pointer}
-             * @param {olx.interaction.DragRotateOptions=} opt_options Options.
              * @api stable
              */
             constructor(opt_options?: olx.interaction.DragRotateOptions);
@@ -5664,9 +4349,6 @@ declare module ol {
          *
          * And this interaction is not included in the default interactions.
          *
-         * @constructor
-         * @extends {ol.interaction.Pointer}
-         * @param {olx.interaction.DragRotateAndZoomOptions=} opt_options Options.
          * @api stable
          */
         class DragRotateAndZoom extends ol.interaction.Pointer {
@@ -5680,9 +4362,6 @@ declare module ol {
              *
              * And this interaction is not included in the default interactions.
              *
-             * @constructor
-             * @extends {ol.interaction.Pointer}
-             * @param {olx.interaction.DragRotateAndZoomOptions=} opt_options Options.
              * @api stable
              */
             constructor(opt_options?: olx.interaction.DragRotateAndZoomOptions);
@@ -5697,9 +4376,6 @@ declare module ol {
          * To change the style of the box, use CSS and the `.ol-dragzoom` selector, or
          * your custom one configured with `className`.
          *
-         * @constructor
-         * @extends {ol.interaction.DragBox}
-         * @param {olx.interaction.DragZoomOptions=} opt_options Options.
          * @api stable
          */
         class DragZoom extends ol.interaction.DragBox {
@@ -5712,28 +4388,17 @@ declare module ol {
              * To change the style of the box, use CSS and the `.ol-dragzoom` selector, or
              * your custom one configured with `className`.
              *
-             * @constructor
-             * @extends {ol.interaction.DragBox}
-             * @param {olx.interaction.DragZoomOptions=} opt_options Options.
              * @api stable
              */
             constructor(opt_options?: olx.interaction.DragZoomOptions);
         }
 
-        /**
-         * @namespace ol.interaction.Draw
-         */
         module Draw {
             /**
              * @classdesc
              * Events emitted by {@link ol.interaction.Draw} instances are instances of
              * this type.
              *
-             * @constructor
-             * @extends {ol.events.Event}
-             * @implements {oli.DrawEvent}
-             * @param {ol.interaction.DrawEventType} type Type.
-             * @param {ol.Feature} feature The feature drawn.
              */
             class Event extends ol.events.Event {
                 /**
@@ -5741,17 +4406,11 @@ declare module ol {
                  * Events emitted by {@link ol.interaction.Draw} instances are instances of
                  * this type.
                  *
-                 * @constructor
-                 * @extends {ol.events.Event}
-                 * @implements {oli.DrawEvent}
-                 * @param {ol.interaction.DrawEventType} type Type.
-                 * @param {ol.Feature} feature The feature drawn.
                  */
                 constructor(type: ol.interaction.DrawEventType, feature: ol.Feature);
 
                 /**
                  * The feature being drawn.
-                 * @type {ol.Feature}
                  * @api stable
                  */
                 feature: ol.Feature;
@@ -5764,10 +4423,7 @@ declare module ol {
          * @classdesc
          * Interaction for drawing feature geometries.
          *
-         * @constructor
-         * @extends {ol.interaction.Pointer}
          * @fires ol.interaction.DrawEvent
-         * @param {olx.interaction.DrawOptions} options Options.
          * @api stable
          */
         class Draw extends ol.interaction.Pointer {
@@ -5775,10 +4431,7 @@ declare module ol {
              * @classdesc
              * Interaction for drawing feature geometries.
              *
-             * @constructor
-             * @extends {ol.interaction.Pointer}
              * @fires ol.interaction.DrawEvent
-             * @param {olx.interaction.DrawOptions} options Options.
              * @api stable
              */
             constructor(options: olx.interaction.DrawOptions);
@@ -5801,7 +4454,6 @@ declare module ol {
              * Extend an existing geometry by adding additional points. This only works
              * on features with `LineString` geometries, where the interaction will
              * extend lines by adding points to the end of the coordinates array.
-             * @param {!ol.Feature} feature Feature to be extended.
              * @api
              */
             extend(feature: ol.Feature): void;
@@ -5810,7 +4462,6 @@ declare module ol {
              * Create a `geometryFunction` that will create a box-shaped polygon (aligned
              * with the coordinate system axes).  Use this with the draw interaction and
              * `type: 'Circle'` to return a box instead of a circle geometry.
-             * @return {ol.DrawGeometryFunctionType} Function that draws a box-shaped polygon.
              * @api
              */
             static createBox(): ol.DrawGeometryFunctionType;
@@ -5819,12 +4470,9 @@ declare module ol {
              * Create a `geometryFunction` for `mode: 'Circle'` that will create a regular
              * polygon with a user specified number of sides and start angle instead of an
              * `ol.geom.Circle` geometry.
-             * @param {number=} opt_sides Number of sides of the regular polygon. Default is
              *     32.
-             * @param {number=} opt_angle Angle of the first point in radians. 0 means East.
              *     Default is the angle defined by the heading from the center of the
              *     regular polygon to the current pointer position.
-             * @return {ol.DrawGeometryFunctionType} Function that draws a
              *     polygon.
              * @api
              */
@@ -5849,8 +4497,6 @@ declare module ol {
          * * {@link ol.interaction.MouseWheelZoom}
          * * {@link ol.interaction.DragZoom}
          *
-         * @param {olx.interaction.DefaultsOptions=} opt_options Defaults options.
-         * @return {ol.Collection.<ol.interaction.Interaction>} A collection of
          * interactions to be used with the ol.Map constructor's interactions option.
          * @api stable
          */
@@ -5868,9 +4514,6 @@ declare module ol {
          * Although interactions do not have a DOM element, some of them do render
          * vectors and so are visible on the screen.
          *
-         * @constructor
-         * @param {olx.interaction.InteractionOptions} options Options.
-         * @extends {ol.Object}
          * @api
          */
         class Interaction extends ol.Object {
@@ -5886,16 +4529,12 @@ declare module ol {
              * Although interactions do not have a DOM element, some of them do render
              * vectors and so are visible on the screen.
              *
-             * @constructor
-             * @param {olx.interaction.InteractionOptions} options Options.
-             * @extends {ol.Object}
              * @api
              */
             constructor(options: olx.interaction.InteractionOptions);
 
             /**
              * Return whether the interaction is currently active.
-             * @return {boolean} `true` if the interaction is active, `false` otherwise.
              * @observable
              * @api
              */
@@ -5903,14 +4542,12 @@ declare module ol {
 
             /**
              * Get the map associated with this interaction.
-             * @return {ol.Map} Map.
              * @api
              */
             getMap(): ol.Map;
 
             /**
              * Activate or deactivate the interaction.
-             * @param {boolean} active Active.
              * @observable
              * @api
              */
@@ -5929,9 +4566,6 @@ declare module ol {
          * function.
          * See also {@link ol.interaction.KeyboardZoom}.
          *
-         * @constructor
-         * @extends {ol.interaction.Interaction}
-         * @param {olx.interaction.KeyboardPanOptions=} opt_options Options.
          * @api stable
          */
         class KeyboardPan extends ol.interaction.Interaction {
@@ -5947,9 +4581,6 @@ declare module ol {
              * function.
              * See also {@link ol.interaction.KeyboardZoom}.
              *
-             * @constructor
-             * @extends {ol.interaction.Interaction}
-             * @param {olx.interaction.KeyboardPanOptions=} opt_options Options.
              * @api stable
              */
             constructor(opt_options?: olx.interaction.KeyboardPanOptions);
@@ -5958,9 +4589,6 @@ declare module ol {
              * Handles the {@link ol.MapBrowserEvent map browser event} if it was a
              * `KeyEvent`, and decides the direction to pan to (if an arrow key was
              * pressed).
-             * @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event.
-             * @return {boolean} `false` to stop event propagation.
-             * @this {ol.interaction.KeyboardPan}
              * @api
              */
             static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
@@ -5978,9 +4606,6 @@ declare module ol {
          * function.
          * See also {@link ol.interaction.KeyboardPan}.
          *
-         * @constructor
-         * @param {olx.interaction.KeyboardZoomOptions=} opt_options Options.
-         * @extends {ol.interaction.Interaction}
          * @api stable
          */
         class KeyboardZoom extends ol.interaction.Interaction {
@@ -5996,9 +4621,6 @@ declare module ol {
              * function.
              * See also {@link ol.interaction.KeyboardPan}.
              *
-             * @constructor
-             * @param {olx.interaction.KeyboardZoomOptions=} opt_options Options.
-             * @extends {ol.interaction.Interaction}
              * @api stable
              */
             constructor(opt_options?: olx.interaction.KeyboardZoomOptions);
@@ -6007,29 +4629,17 @@ declare module ol {
              * Handles the {@link ol.MapBrowserEvent map browser event} if it was a
              * `KeyEvent`, and decides whether to zoom in or out (depending on whether the
              * key pressed was '+' or '-').
-             * @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event.
-             * @return {boolean} `false` to stop event propagation.
-             * @this {ol.interaction.KeyboardZoom}
              * @api
              */
             static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
         }
 
-        /**
-         * @namespace ol.interaction.Modify
-         */
         module Modify {
             /**
              * @classdesc
              * Events emitted by {@link ol.interaction.Modify} instances are instances of
              * this type.
              *
-             * @constructor
-             * @extends {ol.events.Event}
-             * @implements {oli.ModifyEvent}
-             * @param {ol.ModifyEventType} type Type.
-             * @param {ol.Collection.<ol.Feature>} features The features modified.
-             * @param {ol.MapBrowserPointerEvent} mapBrowserPointerEvent Associated
              *     {@link ol.MapBrowserPointerEvent}.
              */
             class Event extends ol.events.Event {
@@ -6038,26 +4648,18 @@ declare module ol {
                  * Events emitted by {@link ol.interaction.Modify} instances are instances of
                  * this type.
                  *
-                 * @constructor
-                 * @extends {ol.events.Event}
-                 * @implements {oli.ModifyEvent}
-                 * @param {ol.ModifyEventType} type Type.
-                 * @param {ol.Collection.<ol.Feature>} features The features modified.
-                 * @param {ol.MapBrowserPointerEvent} mapBrowserPointerEvent Associated
                  *     {@link ol.MapBrowserPointerEvent}.
                  */
                 constructor(type: ol.ModifyEventType, features: ol.Collection<ol.Feature>, mapBrowserPointerEvent: ol.MapBrowserPointerEvent);
 
                 /**
                  * The features being modified.
-                 * @type {ol.Collection.<ol.Feature>}
                  * @api
                  */
                 features: ol.Collection<ol.Feature>;
 
                 /**
                  * Associated {@link ol.MapBrowserEvent}.
-                 * @type {ol.MapBrowserEvent}
                  * @api
                  */
                 mapBrowserEvent: ol.MapBrowserEvent;
@@ -6068,9 +4670,6 @@ declare module ol {
          * @classdesc
          * Interaction for modifying feature geometries.
          *
-         * @constructor
-         * @extends {ol.interaction.Pointer}
-         * @param {olx.interaction.ModifyOptions} options Options.
          * @fires ol.interaction.ModifyEvent
          * @api
          */
@@ -6079,9 +4678,6 @@ declare module ol {
              * @classdesc
              * Interaction for modifying feature geometries.
              *
-             * @constructor
-             * @extends {ol.interaction.Pointer}
-             * @param {olx.interaction.ModifyOptions} options Options.
              * @fires ol.interaction.ModifyEvent
              * @api
              */
@@ -6089,7 +4685,6 @@ declare module ol {
 
             /**
              * Removes the vertex currently being pointed.
-             * @return {boolean} True when a vertex was removed.
              * @api
              */
             removePoint(): boolean;
@@ -6099,9 +4694,6 @@ declare module ol {
          * @classdesc
          * Allows the user to zoom the map by scrolling the mouse wheel.
          *
-         * @constructor
-         * @extends {ol.interaction.Interaction}
-         * @param {olx.interaction.MouseWheelZoomOptions=} opt_options Options.
          * @api stable
          */
         class MouseWheelZoom extends ol.interaction.Interaction {
@@ -6109,9 +4701,6 @@ declare module ol {
              * @classdesc
              * Allows the user to zoom the map by scrolling the mouse wheel.
              *
-             * @constructor
-             * @extends {ol.interaction.Interaction}
-             * @param {olx.interaction.MouseWheelZoomOptions=} opt_options Options.
              * @api stable
              */
             constructor(opt_options?: olx.interaction.MouseWheelZoomOptions);
@@ -6119,16 +4708,12 @@ declare module ol {
             /**
              * Handles the {@link ol.MapBrowserEvent map browser event} (if it was a
              * mousewheel-event) and eventually zooms the map.
-             * @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event.
-             * @return {boolean} `false` to stop event propagation.
-             * @this {ol.interaction.MouseWheelZoom}
              * @api
              */
             static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
 
             /**
              * Enable or disable using the mouse's location as an anchor when zooming
-             * @param {boolean} useAnchor true to zoom to the mouse's location, false
              * to zoom to the center of the map
              * @api
              */
@@ -6140,9 +4725,6 @@ declare module ol {
          * Allows the user to rotate the map by twisting with two fingers
          * on a touch screen.
          *
-         * @constructor
-         * @extends {ol.interaction.Pointer}
-         * @param {olx.interaction.PinchRotateOptions=} opt_options Options.
          * @api stable
          */
         class PinchRotate extends ol.interaction.Pointer {
@@ -6151,9 +4733,6 @@ declare module ol {
              * Allows the user to rotate the map by twisting with two fingers
              * on a touch screen.
              *
-             * @constructor
-             * @extends {ol.interaction.Pointer}
-             * @param {olx.interaction.PinchRotateOptions=} opt_options Options.
              * @api stable
              */
             constructor(opt_options?: olx.interaction.PinchRotateOptions);
@@ -6164,9 +4743,6 @@ declare module ol {
          * Allows the user to zoom the map by pinching with two fingers
          * on a touch screen.
          *
-         * @constructor
-         * @extends {ol.interaction.Pointer}
-         * @param {olx.interaction.PinchZoomOptions=} opt_options Options.
          * @api stable
          */
         class PinchZoom extends ol.interaction.Pointer {
@@ -6175,9 +4751,6 @@ declare module ol {
              * Allows the user to zoom the map by pinching with two fingers
              * on a touch screen.
              *
-             * @constructor
-             * @extends {ol.interaction.Pointer}
-             * @param {olx.interaction.PinchZoomOptions=} opt_options Options.
              * @api stable
              */
             constructor(opt_options?: olx.interaction.PinchZoomOptions);
@@ -6193,9 +4766,6 @@ declare module ol {
          * called on `move` events. The drag sequence ends when the `handleUpEvent`
          * user function is called and returns `false`.
          *
-         * @constructor
-         * @param {olx.interaction.PointerOptions=} opt_options Options.
-         * @extends {ol.interaction.Interaction}
          * @api
          */
         class Pointer extends ol.interaction.Interaction {
@@ -6209,9 +4779,6 @@ declare module ol {
              * called on `move` events. The drag sequence ends when the `handleUpEvent`
              * user function is called and returns `false`.
              *
-             * @constructor
-             * @param {olx.interaction.PointerOptions=} opt_options Options.
-             * @extends {ol.interaction.Interaction}
              * @api
              */
             constructor(opt_options?: olx.interaction.PointerOptions);
@@ -6220,31 +4787,18 @@ declare module ol {
              * Handles the {@link ol.MapBrowserEvent map browser event} and may call into
              * other functions, if event sequences like e.g. 'drag' or 'down-up' etc. are
              * detected.
-             * @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event.
-             * @return {boolean} `false` to stop event propagation.
-             * @this {ol.interaction.Pointer}
              * @api
              */
             static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
         }
 
-        /**
-         * @namespace ol.interaction.Select
-         */
         module Select {
             /**
              * @classdesc
              * Events emitted by {@link ol.interaction.Select} instances are instances of
              * this type.
              *
-             * @param {string} type The event type.
-             * @param {Array.<ol.Feature>} selected Selected features.
-             * @param {Array.<ol.Feature>} deselected Deselected features.
-             * @param {ol.MapBrowserEvent} mapBrowserEvent Associated
              *     {@link ol.MapBrowserEvent}.
-             * @implements {oli.SelectEvent}
-             * @extends {ol.events.Event}
-             * @constructor
              */
             class Event extends ol.events.Event {
                 /**
@@ -6252,34 +4806,24 @@ declare module ol {
                  * Events emitted by {@link ol.interaction.Select} instances are instances of
                  * this type.
                  *
-                 * @param {string} type The event type.
-                 * @param {Array.<ol.Feature>} selected Selected features.
-                 * @param {Array.<ol.Feature>} deselected Deselected features.
-                 * @param {ol.MapBrowserEvent} mapBrowserEvent Associated
                  *     {@link ol.MapBrowserEvent}.
-                 * @implements {oli.SelectEvent}
-                 * @extends {ol.events.Event}
-                 * @constructor
                  */
                 constructor(type: string, selected: ol.Feature[], deselected: ol.Feature[], mapBrowserEvent: ol.MapBrowserEvent);
 
                 /**
                  * Selected features array.
-                 * @type {Array.<ol.Feature>}
                  * @api
                  */
                 selected: ol.Feature[];
 
                 /**
                  * Deselected features array.
-                 * @type {Array.<ol.Feature>}
                  * @api
                  */
                 deselected: ol.Feature[];
 
                 /**
                  * Associated {@link ol.MapBrowserEvent}.
-                 * @type {ol.MapBrowserEvent}
                  * @api
                  */
                 mapBrowserEvent: ol.MapBrowserEvent;
@@ -6298,9 +4842,6 @@ declare module ol {
          *
          * Selected features are added to an internal unmanaged layer.
          *
-         * @constructor
-         * @extends {ol.interaction.Interaction}
-         * @param {olx.interaction.SelectOptions=} opt_options Options.
          * @fires ol.interaction.SelectEvent
          * @api stable
          */
@@ -6317,9 +4858,6 @@ declare module ol {
              *
              * Selected features are added to an internal unmanaged layer.
              *
-             * @constructor
-             * @extends {ol.interaction.Interaction}
-             * @param {olx.interaction.SelectOptions=} opt_options Options.
              * @fires ol.interaction.SelectEvent
              * @api stable
              */
@@ -6327,7 +4865,6 @@ declare module ol {
 
             /**
              * Get the selected features.
-             * @return {ol.Collection.<ol.Feature>} Features collection.
              * @api stable
              */
             getFeatures(): ol.Collection<ol.Feature>;
@@ -6337,8 +4874,6 @@ declare module ol {
              * the (last) selected feature. Note that this will not work with any
              * programmatic method like pushing features to
              * {@link ol.interaction.Select#getFeatures collection}.
-             * @param {ol.Feature|ol.render.Feature} feature Feature
-             * @return {ol.layer.Vector} Layer.
              * @api
              */
             getLayer(feature: (ol.Feature | ol.render.Feature)): ol.layer.Vector;
@@ -6346,9 +4881,6 @@ declare module ol {
             /**
              * Handles the {@link ol.MapBrowserEvent map browser event} and may change the
              * selected state of features.
-             * @param {ol.MapBrowserEvent} mapBrowserEvent Map browser event.
-             * @return {boolean} `false` to stop event propagation.
-             * @this {ol.interaction.Select}
              * @api
              */
             static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
@@ -6356,7 +4888,6 @@ declare module ol {
             /**
              * Remove the interaction from its current map, if any,  and attach it to a new
              * map, if any. Pass `null` to just remove the interaction from the current map.
-             * @param {ol.Map} map Map.
              * @api stable
              */
             setMap(map: ol.Map): void;
@@ -6379,9 +4910,6 @@ declare module ol {
          *       source: source
          *     });
          *
-         * @constructor
-         * @extends {ol.interaction.Pointer}
-         * @param {olx.interaction.SnapOptions=} opt_options Options.
          * @api
          */
         class Snap extends ol.interaction.Pointer {
@@ -6402,17 +4930,12 @@ declare module ol {
              *       source: source
              *     });
              *
-             * @constructor
-             * @extends {ol.interaction.Pointer}
-             * @param {olx.interaction.SnapOptions=} opt_options Options.
              * @api
              */
             constructor(opt_options?: olx.interaction.SnapOptions);
 
             /**
              * Add a feature to the collection of features that we may snap to.
-             * @param {ol.Feature} feature Feature.
-             * @param {boolean=} opt_listen Whether to listen to the geometry change or not
              *     Defaults to `true`.
              * @api
              */
@@ -6420,29 +4943,18 @@ declare module ol {
 
             /**
              * Remove a feature from the collection of features that we may snap to.
-             * @param {ol.Feature} feature Feature
-             * @param {boolean=} opt_unlisten Whether to unlisten to the geometry change
              *     or not. Defaults to `true`.
              * @api
              */
             removeFeature(feature: ol.Feature, opt_unlisten?: boolean): void;
         }
 
-        /**
-         * @namespace ol.interaction.Translate
-         */
         module Translate {
             /**
              * @classdesc
              * Events emitted by {@link ol.interaction.Translate} instances are instances of
              * this type.
              *
-             * @constructor
-             * @extends {ol.events.Event}
-             * @implements {oli.interaction.TranslateEvent}
-             * @param {ol.interaction.TranslateEventType} type Type.
-             * @param {ol.Collection.<ol.Feature>} features The features translated.
-             * @param {ol.Coordinate} coordinate The event coordinate.
              */
             class Event extends ol.events.Event {
                 /**
@@ -6450,18 +4962,11 @@ declare module ol {
                  * Events emitted by {@link ol.interaction.Translate} instances are instances of
                  * this type.
                  *
-                 * @constructor
-                 * @extends {ol.events.Event}
-                 * @implements {oli.interaction.TranslateEvent}
-                 * @param {ol.interaction.TranslateEventType} type Type.
-                 * @param {ol.Collection.<ol.Feature>} features The features translated.
-                 * @param {ol.Coordinate} coordinate The event coordinate.
                  */
                 constructor(type: ol.interaction.TranslateEventType, features: ol.Collection<ol.Feature>, coordinate: ol.Coordinate);
 
                 /**
                  * The features being translated.
-                 * @type {ol.Collection.<ol.Feature>}
                  * @api
                  */
                 features: ol.Collection<ol.Feature>;
@@ -6469,7 +4974,6 @@ declare module ol {
                 /**
                  * The coordinate of the drag event.
                  * @const
-                 * @type {ol.Coordinate}
                  * @api
                  */
                 coordinate: ol.Coordinate;
@@ -6482,10 +4986,7 @@ declare module ol {
          * @classdesc
          * Interaction for translating (moving) features.
          *
-         * @constructor
-         * @extends {ol.interaction.Pointer}
          * @fires ol.interaction.TranslateEvent
-         * @param {olx.interaction.TranslateOptions} options Options.
          * @api
          */
         class Translate extends ol.interaction.Pointer {
@@ -6493,10 +4994,7 @@ declare module ol {
              * @classdesc
              * Interaction for translating (moving) features.
              *
-             * @constructor
-             * @extends {ol.interaction.Pointer}
              * @fires ol.interaction.TranslateEvent
-             * @param {olx.interaction.TranslateOptions} options Options.
              * @api
              */
             constructor(options: olx.interaction.TranslateOptions);
@@ -6507,10 +5005,6 @@ declare module ol {
      * @classdesc
      * Implementation of inertial deceleration for map movement.
      *
-     * @constructor
-     * @param {number} decay Rate of decay (must be negative).
-     * @param {number} minVelocity Minimum velocity (pixels/millisecond).
-     * @param {number} delay Delay to consider to calculate the kinetic
      *     initial values (milliseconds).
      * @struct
      * @api
@@ -6520,10 +5014,6 @@ declare module ol {
          * @classdesc
          * Implementation of inertial deceleration for map movement.
          *
-         * @constructor
-         * @param {number} decay Rate of decay (must be negative).
-         * @param {number} minVelocity Minimum velocity (pixels/millisecond).
-         * @param {number} delay Delay to consider to calculate the kinetic
          *     initial values (milliseconds).
          * @struct
          * @api
@@ -6531,9 +5021,6 @@ declare module ol {
         constructor(decay: number, minVelocity: number, delay: number);
     }
 
-    /**
-     * @namespace ol.layer
-     */
     module layer {
         /**
          * @classdesc
@@ -6543,9 +5030,6 @@ declare module ol {
          * the options is set as a {@link ol.Object} property on the layer object, so
          * is observable, and has get/set accessors.
          *
-         * @constructor
-         * @extends {ol.Object}
-         * @param {olx.layer.BaseOptions} options Layer options.
          * @api stable
          */
         class Base extends ol.Object {
@@ -6557,9 +5041,6 @@ declare module ol {
              * the options is set as a {@link ol.Object} property on the layer object, so
              * is observable, and has get/set accessors.
              *
-             * @constructor
-             * @extends {ol.Object}
-             * @param {olx.layer.BaseOptions} options Layer options.
              * @api stable
              */
             constructor(options: olx.layer.BaseOptions);
@@ -6567,7 +5048,6 @@ declare module ol {
             /**
              * Return the {@link ol.Extent extent} of the layer or `undefined` if it
              * will be visible regardless of extent.
-             * @return {ol.Extent|undefined} The layer extent.
              * @observable
              * @api stable
              */
@@ -6575,7 +5055,6 @@ declare module ol {
 
             /**
              * Return the maximum resolution of the layer.
-             * @return {number} The maximum resolution of the layer.
              * @observable
              * @api stable
              */
@@ -6583,7 +5062,6 @@ declare module ol {
 
             /**
              * Return the minimum resolution of the layer.
-             * @return {number} The minimum resolution of the layer.
              * @observable
              * @api stable
              */
@@ -6591,7 +5069,6 @@ declare module ol {
 
             /**
              * Return the opacity of the layer (between 0 and 1).
-             * @return {number} The opacity of the layer.
              * @observable
              * @api stable
              */
@@ -6599,7 +5076,6 @@ declare module ol {
 
             /**
              * Return the visibility of the layer (`true` or `false`).
-             * @return {boolean} The visibility of the layer.
              * @observable
              * @api stable
              */
@@ -6608,7 +5084,6 @@ declare module ol {
             /**
              * Return the Z-index of the layer, which is used to order layers before
              * rendering. The default Z-index is 0.
-             * @return {number} The Z-index of the layer.
              * @observable
              * @api
              */
@@ -6617,7 +5092,6 @@ declare module ol {
             /**
              * Set the extent at which the layer is visible.  If `undefined`, the layer
              * will be visible at all extents.
-             * @param {ol.Extent|undefined} extent The extent of the layer.
              * @observable
              * @api stable
              */
@@ -6625,7 +5099,6 @@ declare module ol {
 
             /**
              * Set the maximum resolution at which the layer is visible.
-             * @param {number} maxResolution The maximum resolution of the layer.
              * @observable
              * @api stable
              */
@@ -6633,7 +5106,6 @@ declare module ol {
 
             /**
              * Set the minimum resolution at which the layer is visible.
-             * @param {number} minResolution The minimum resolution of the layer.
              * @observable
              * @api stable
              */
@@ -6641,7 +5113,6 @@ declare module ol {
 
             /**
              * Set the opacity of the layer, allowed values range from 0 to 1.
-             * @param {number} opacity The opacity of the layer.
              * @observable
              * @api stable
              */
@@ -6649,7 +5120,6 @@ declare module ol {
 
             /**
              * Set the visibility of the layer (`true` or `false`).
-             * @param {boolean} visible The visibility of the layer.
              * @observable
              * @api stable
              */
@@ -6658,7 +5128,6 @@ declare module ol {
             /**
              * Set Z-index of the layer, which is used to order layers before rendering.
              * The default Z-index is 0.
-             * @param {number} zindex The z-index of the layer.
              * @observable
              * @api
              */
@@ -6671,9 +5140,6 @@ declare module ol {
          *
          * A generic `change` event is triggered when the group/Collection changes.
          *
-         * @constructor
-         * @extends {ol.layer.Base}
-         * @param {olx.layer.GroupOptions=} opt_options Layer options.
          * @api stable
          */
         class Group extends ol.layer.Base {
@@ -6683,9 +5149,6 @@ declare module ol {
              *
              * A generic `change` event is triggered when the group/Collection changes.
              *
-             * @constructor
-             * @extends {ol.layer.Base}
-             * @param {olx.layer.GroupOptions=} opt_options Layer options.
              * @api stable
              */
             constructor(opt_options?: olx.layer.GroupOptions);
@@ -6693,7 +5156,6 @@ declare module ol {
             /**
              * Returns the {@link ol.Collection collection} of {@link ol.layer.Layer layers}
              * in this group.
-             * @return {!ol.Collection.<ol.layer.Base>} Collection of
              *   {@link ol.layer.Base layers} that are part of this group.
              * @observable
              * @api stable
@@ -6703,7 +5165,6 @@ declare module ol {
             /**
              * Set the {@link ol.Collection collection} of {@link ol.layer.Layer layers}
              * in this group.
-             * @param {!ol.Collection.<ol.layer.Base>} layers Collection of
              *   {@link ol.layer.Base layers} that are part of this group.
              * @observable
              * @api stable
@@ -6718,10 +5179,7 @@ declare module ol {
          * property on the layer object; for example, setting `title: 'My Title'` in the
          * options means that `title` is observable, and has get/set accessors.
          *
-         * @constructor
-         * @extends {ol.layer.Vector}
          * @fires ol.render.Event
-         * @param {olx.layer.HeatmapOptions=} opt_options Options.
          * @api
          */
         class Heatmap extends ol.layer.Vector {
@@ -6732,17 +5190,13 @@ declare module ol {
              * property on the layer object; for example, setting `title: 'My Title'` in the
              * options means that `title` is observable, and has get/set accessors.
              *
-             * @constructor
-             * @extends {ol.layer.Vector}
              * @fires ol.render.Event
-             * @param {olx.layer.HeatmapOptions=} opt_options Options.
              * @api
              */
             constructor(opt_options?: olx.layer.HeatmapOptions);
 
             /**
              * Return the blur size in pixels.
-             * @return {number} Blur size in pixels.
              * @api
              * @observable
              */
@@ -6750,7 +5204,6 @@ declare module ol {
 
             /**
              * Return the gradient colors as array of strings.
-             * @return {Array.<string>} Colors.
              * @api
              * @observable
              */
@@ -6758,7 +5211,6 @@ declare module ol {
 
             /**
              * Return the size of the radius in pixels.
-             * @return {number} Radius size in pixel.
              * @api
              * @observable
              */
@@ -6766,7 +5218,6 @@ declare module ol {
 
             /**
              * Set the blur size in pixels.
-             * @param {number} blur Blur size in pixels.
              * @api
              * @observable
              */
@@ -6774,7 +5225,6 @@ declare module ol {
 
             /**
              * Set the gradient colors as array of strings.
-             * @param {Array.<string>} colors Gradient.
              * @api
              * @observable
              */
@@ -6782,7 +5232,6 @@ declare module ol {
 
             /**
              * Set the size of the radius in pixels.
-             * @param {number} radius Radius size in pixel.
              * @api
              * @observable
              */
@@ -6797,10 +5246,7 @@ declare module ol {
          * property on the layer object; for example, setting `title: 'My Title'` in the
          * options means that `title` is observable, and has get/set accessors.
          *
-         * @constructor
-         * @extends {ol.layer.Layer}
          * @fires ol.render.Event
-         * @param {olx.layer.ImageOptions=} opt_options Layer options.
          * @api stable
          */
         class Image extends ol.layer.Layer {
@@ -6812,10 +5258,7 @@ declare module ol {
              * property on the layer object; for example, setting `title: 'My Title'` in the
              * options means that `title` is observable, and has get/set accessors.
              *
-             * @constructor
-             * @extends {ol.layer.Layer}
              * @fires ol.render.Event
-             * @param {olx.layer.ImageOptions=} opt_options Layer options.
              * @api stable
              */
             constructor(opt_options?: olx.layer.ImageOptions);
@@ -6836,10 +5279,7 @@ declare module ol {
          *
          * A generic `change` event is fired when the state of the source changes.
          *
-         * @constructor
-         * @extends {ol.layer.Base}
          * @fires ol.render.Event
-         * @param {olx.layer.LayerOptions} options Layer options.
          * @api stable
          */
         class Layer extends ol.layer.Base {
@@ -6858,17 +5298,13 @@ declare module ol {
              *
              * A generic `change` event is fired when the state of the source changes.
              *
-             * @constructor
-             * @extends {ol.layer.Base}
              * @fires ol.render.Event
-             * @param {olx.layer.LayerOptions} options Layer options.
              * @api stable
              */
             constructor(options: olx.layer.LayerOptions);
 
             /**
              * Get the layer source.
-             * @return {ol.source.Source} The layer source (or `null` if not yet set).
              * @observable
              * @api stable
              */
@@ -6883,14 +5319,12 @@ declare module ol {
              *
              * To add the layer to a map and have it managed by the map, use
              * {@link ol.Map#addLayer} instead.
-             * @param {ol.Map} map Map.
              * @api
              */
             setMap(map: ol.Map): void;
 
             /**
              * Set the layer source.
-             * @param {ol.source.Source} source The layer source.
              * @observable
              * @api stable
              */
@@ -6905,10 +5339,7 @@ declare module ol {
          * property on the layer object; for example, setting `title: 'My Title'` in the
          * options means that `title` is observable, and has get/set accessors.
          *
-         * @constructor
-         * @extends {ol.layer.Layer}
          * @fires ol.render.Event
-         * @param {olx.layer.TileOptions=} opt_options Tile layer options.
          * @api stable
          */
         class Tile extends ol.layer.Layer {
@@ -6920,17 +5351,13 @@ declare module ol {
              * property on the layer object; for example, setting `title: 'My Title'` in the
              * options means that `title` is observable, and has get/set accessors.
              *
-             * @constructor
-             * @extends {ol.layer.Layer}
              * @fires ol.render.Event
-             * @param {olx.layer.TileOptions=} opt_options Tile layer options.
              * @api stable
              */
             constructor(opt_options?: olx.layer.TileOptions);
 
             /**
              * Return the level as number to which we will preload tiles up to.
-             * @return {number} The level to preload tiles up to.
              * @observable
              * @api
              */
@@ -6938,7 +5365,6 @@ declare module ol {
 
             /**
              * Set the level as number to which we will preload tiles up to.
-             * @param {number} preload The level to preload tiles up to.
              * @observable
              * @api
              */
@@ -6946,7 +5372,6 @@ declare module ol {
 
             /**
              * Whether we use interim tiles on error.
-             * @return {boolean} Use interim tiles on error.
              * @observable
              * @api
              */
@@ -6954,7 +5379,6 @@ declare module ol {
 
             /**
              * Set whether we use interim tiles on error.
-             * @param {boolean} useInterimTilesOnError Use interim tiles on error.
              * @observable
              * @api
              */
@@ -6968,10 +5392,7 @@ declare module ol {
          * property on the layer object; for example, setting `title: 'My Title'` in the
          * options means that `title` is observable, and has get/set accessors.
          *
-         * @constructor
-         * @extends {ol.layer.Layer}
          * @fires ol.render.Event
-         * @param {olx.layer.VectorOptions=} opt_options Options.
          * @api stable
          */
         class Vector extends ol.layer.Layer {
@@ -6982,17 +5403,13 @@ declare module ol {
              * property on the layer object; for example, setting `title: 'My Title'` in the
              * options means that `title` is observable, and has get/set accessors.
              *
-             * @constructor
-             * @extends {ol.layer.Layer}
              * @fires ol.render.Event
-             * @param {olx.layer.VectorOptions=} opt_options Options.
              * @api stable
              */
             constructor(opt_options?: olx.layer.VectorOptions);
 
             /**
              * Return the associated {@link ol.source.Vector vectorsource} of the layer.
-             * @return {ol.source.Vector} Source.
              * @api stable
              */
             getSource(): ol.source.Vector;
@@ -7000,7 +5417,6 @@ declare module ol {
             /**
              * Get the style for features.  This returns whatever was passed to the `style`
              * option at construction or to the `setStyle` method.
-             * @return {ol.style.Style|Array.<ol.style.Style>|ol.StyleFunction}
              *     Layer style.
              * @api stable
              */
@@ -7008,7 +5424,6 @@ declare module ol {
 
             /**
              * Get the style function.
-             * @return {ol.StyleFunction|undefined} Layer style function.
              * @api stable
              */
             getStyleFunction(): (ol.StyleFunction);
@@ -7020,7 +5435,6 @@ declare module ol {
              * it is `null` the layer has no style (a `null` style), so only features
              * that have their own styles will be rendered in the layer. See
              * {@link ol.style} for information on the default style.
-             * @param {ol.style.Style|Array.<ol.style.Style>|ol.StyleFunction|null|undefined}
              *     style Layer style.
              * @api stable
              */
@@ -7028,7 +5442,6 @@ declare module ol {
         }
 
         /**
-         * @enum {string}
          * Render mode for vector tiles:
          *  * `'image'`: Vector tiles are rendered as images. Great performance, but
          *    point symbols and texts are always rotated with the view and pixels are
@@ -7049,9 +5462,6 @@ declare module ol {
          * property on the layer object; for example, setting `title: 'My Title'` in the
          * options means that `title` is observable, and has get/set accessors.
          *
-         * @constructor
-         * @extends {ol.layer.Vector}
-         * @param {olx.layer.VectorTileOptions=} opt_options Options.
          * @api
          */
         class VectorTile extends ol.layer.Vector {
@@ -7062,16 +5472,12 @@ declare module ol {
              * property on the layer object; for example, setting `title: 'My Title'` in the
              * options means that `title` is observable, and has get/set accessors.
              *
-             * @constructor
-             * @extends {ol.layer.Vector}
-             * @param {olx.layer.VectorTileOptions=} opt_options Options.
              * @api
              */
             constructor(opt_options?: olx.layer.VectorTileOptions);
 
             /**
              * Return the level as number to which we will preload tiles up to.
-             * @return {number} The level to preload tiles up to.
              * @observable
              * @api
              */
@@ -7079,7 +5485,6 @@ declare module ol {
 
             /**
              * Whether we use interim tiles on error.
-             * @return {boolean} Use interim tiles on error.
              * @observable
              * @api
              */
@@ -7087,7 +5492,6 @@ declare module ol {
 
             /**
              * Set the level as number to which we will preload tiles up to.
-             * @param {number} preload The level to preload tiles up to.
              * @observable
              * @api
              */
@@ -7095,7 +5499,6 @@ declare module ol {
 
             /**
              * Set whether we use interim tiles on error.
-             * @param {boolean} useInterimTilesOnError Use interim tiles on error.
              * @observable
              * @api
              */
@@ -7105,14 +5508,10 @@ declare module ol {
 
     /**
      * Strategies for loading vector data.
-     * @namespace ol.loadingstrategy
      */
     module loadingstrategy {
         /**
          * Strategy function for loading all features with a single request.
-         * @param {ol.Extent} extent Extent.
-         * @param {number} resolution Resolution.
-         * @return {Array.<ol.Extent>} Extents.
          * @api
          */
         function all(extent: ol.Extent, resolution: number): ol.Extent[];
@@ -7120,17 +5519,12 @@ declare module ol {
         /**
          * Strategy function for loading features based on the view's extent and
          * resolution.
-         * @param {ol.Extent} extent Extent.
-         * @param {number} resolution Resolution.
-         * @return {Array.<ol.Extent>} Extents.
          * @api
          */
         function bbox(extent: ol.Extent, resolution: number): ol.Extent[];
 
         /**
          * Creates a strategy function for loading features based on a tile grid.
-         * @param {ol.tilegrid.TileGrid} tileGrid Tile grid.
-         * @return {function(ol.Extent, number): Array.<ol.Extent>} Loading strategy.
          * @api
          */
         function tile(tileGrid: ol.tilegrid.TileGrid): ((extent: ol.Extent, i: number) => ol.Extent[]);
@@ -7176,9 +5570,6 @@ declare module ol {
      * entered in the options or added with `addLayer` can be groups, which can
      * contain further groups, and so on.
      *
-     * @constructor
-     * @extends {ol.Object}
-     * @param {olx.MapOptions} options Map options.
      * @fires ol.MapBrowserEvent
      * @fires ol.MapEvent
      * @fires ol.render.Event#postcompose
@@ -7226,9 +5617,6 @@ declare module ol {
          * entered in the options or added with `addLayer` can be groups, which can
          * contain further groups, and so on.
          *
-         * @constructor
-         * @extends {ol.Object}
-         * @param {olx.MapOptions} options Map options.
          * @fires ol.MapBrowserEvent
          * @fires ol.MapEvent
          * @fires ol.render.Event#postcompose
@@ -7239,14 +5627,12 @@ declare module ol {
 
         /**
          * Add the given control to the map.
-         * @param {ol.control.Control} control Control.
          * @api stable
          */
         addControl(control: ol.control.Control): void;
 
         /**
          * Add the given interaction to the map.
-         * @param {ol.interaction.Interaction} interaction Interaction to add.
          * @api stable
          */
         addInteraction(interaction: ol.interaction.Interaction): void;
@@ -7255,14 +5641,12 @@ declare module ol {
          * Adds the given layer to the top of this map. If you want to add a layer
          * elsewhere in the stack, use `getLayers()` and the methods available on
          * {@link ol.Collection}.
-         * @param {ol.layer.Base} layer Layer.
          * @api stable
          */
         addLayer(layer: ol.layer.Base): void;
 
         /**
          * Add the given overlay to the map.
-         * @param {ol.Overlay} overlay Overlay.
          * @api stable
          */
         addOverlay(overlay: ol.Overlay): void;
@@ -7271,8 +5655,6 @@ declare module ol {
          * Detect features that intersect a pixel on the viewport, and execute a
          * callback with each intersecting feature. Layers included in the detection can
          * be configured through `opt_layerFilter`.
-         * @param {ol.Pixel} pixel Pixel.
-         * @param {function(this: S, (ol.Feature|ol.render.Feature),
          *     ol.layer.Layer): T} callback Feature callback. The callback will be
          *     called with two arguments. The first argument is one
          *     {@link ol.Feature feature} or
@@ -7280,8 +5662,6 @@ declare module ol {
          *     the {@link ol.layer.Layer layer} of the feature and will be null for
          *     unmanaged layers. To stop detection, callback functions can return a
          *     truthy value.
-         * @param {olx.AtPixelOptions=} opt_options Optional options.
-         * @return {T|undefined} Callback result, i.e. the return value of last
          * callback execution, or the first truthy callback return value.
          * @template T
          * @api stable
@@ -7294,9 +5674,6 @@ declare module ol {
 
         /**
          * Get all features that intersect a pixel on the viewport.
-         * @param {ol.Pixel} pixel Pixel.
-         * @param {olx.AtPixelOptions=} opt_options Optional options.
-         * @return {?Array.<(ol.Feature|ol.render.Feature)>} The detected features or null if none were found.
          * @api stable
          */
         getFeaturesAtPixel(
@@ -7308,21 +5685,15 @@ declare module ol {
          * Detect layers that have a color value at a pixel on the viewport, and
          * execute a callback with each matching layer. Layers included in the
          * detection can be configured through `opt_layerFilter`.
-         * @param {ol.Pixel} pixel Pixel.
-         * @param {function(this: S, ol.layer.Layer, ol.Color): T} callback Layer
          *     callback. This callback will recieve two arguments: first is the
          *     {@link ol.layer.Layer layer}, second argument is {@link ol.Color}
          *     and will be null for layer types that do not currently support this
          *     argument. To stop detection callback functions can return a truthy value.
-         * @param {S=} opt_this Value to use as `this` when executing `callback`.
-         * @param {(function(this: U, ol.layer.Layer): boolean)=} opt_layerFilter Layer
          *     filter function. The filter function will receive one argument, the
          *     {@link ol.layer.Layer layer-candidate} and it should return a boolean
          *     value. Only layers which are visible and for which this function returns
          *     `true` will be tested for features. By default, all visible layers will
          *     be tested.
-         * @param {U=} opt_this2 Value to use as `this` when executing `layerFilter`.
-         * @return {T|undefined} Callback result, i.e. the return value of last
          * callback execution, or the first truthy callback return value.
          * @template S,T,U
          * @api stable
@@ -7336,9 +5707,6 @@ declare module ol {
         /**
          * Detect if features intersect a pixel on the viewport. Layers included in the
          * detection can be configured through `opt_layerFilter`.
-         * @param {ol.Pixel} pixel Pixel.
-         * @param {olx.AtPixelOptions=} opt_options Optional options.
-         * @return {boolean} Is there a feature at the given pixel?
          * @api
          */
         hasFeatureAtPixel(
@@ -7348,16 +5716,12 @@ declare module ol {
 
         /**
          * Returns the geographical coordinate for a browser event.
-         * @param {Event} event Event.
-         * @return {ol.Coordinate} Coordinate.
          * @api stable
          */
         getEventCoordinate(event: Event): ol.Coordinate;
 
         /**
          * Returns the map pixel position for a browser event relative to the viewport.
-         * @param {Event} event Event.
-         * @return {ol.Pixel} Pixel.
          * @api stable
          */
         getEventPixel(event: Event): ol.Pixel;
@@ -7366,7 +5730,6 @@ declare module ol {
          * Get the target in which this map is rendered.
          * Note that this returns what is entered as an option or in setTarget:
          * if that was an element, it returns an element; if a string, it returns that.
-         * @return {Element|string|undefined} The Element or id of the Element that the
          *     map is rendered in.
          * @observable
          * @api stable
@@ -7377,7 +5740,6 @@ declare module ol {
          * Get the DOM element into which this map is rendered. In contrast to
          * `getTarget` this method always return an `Element`, or `null` if the
          * map has no target.
-         * @return {Element} The element that the map is rendered in.
          * @api
          */
         getTargetElement(): Element;
@@ -7385,8 +5747,6 @@ declare module ol {
         /**
          * Get the coordinate for a given pixel.  This returns a coordinate in the
          * map view projection.
-         * @param {ol.Pixel} pixel Pixel position in the map viewport.
-         * @return {ol.Coordinate} The coordinate for the pixel position.
          * @api stable
          */
         getCoordinateFromPixel(pixel: ol.Pixel): ol.Coordinate;
@@ -7394,7 +5754,6 @@ declare module ol {
         /**
          * Get the map controls. Modifying this collection changes the controls
          * associated with the map.
-         * @return {ol.Collection.<ol.control.Control>} Controls.
          * @api stable
          */
         getControls(): ol.Collection<ol.control.Control>;
@@ -7402,7 +5761,6 @@ declare module ol {
         /**
          * Get the map overlays. Modifying this collection changes the overlays
          * associated with the map.
-         * @return {ol.Collection.<ol.Overlay>} Overlays.
          * @api stable
          */
         getOverlays(): ol.Collection<ol.Overlay>;
@@ -7411,8 +5769,6 @@ declare module ol {
          * Get an overlay by its identifier (the value returned by overlay.getId()).
          * Note that the index treats string and numeric identifiers as the same. So
          * `map.getOverlayById(2)` will return an overlay with id `'2'` or `2`.
-         * @param {string|number} id Overlay identifier.
-         * @return {ol.Overlay} Overlay.
          * @api
          */
         getOverlayById(id: (string | number)): ol.Overlay;
@@ -7422,14 +5778,12 @@ declare module ol {
          * associated with the map.
          *
          * Interactions are used for e.g. pan, zoom and rotate.
-         * @return {ol.Collection.<ol.interaction.Interaction>} Interactions.
          * @api stable
          */
         getInteractions(): ol.Collection<ol.interaction.Interaction>;
 
         /**
          * Get the layergroup associated with this map.
-         * @return {ol.layer.Group} A layer group containing the layers in this map.
          * @observable
          * @api stable
          */
@@ -7437,7 +5791,6 @@ declare module ol {
 
         /**
          * Get the collection of layers associated with this map.
-         * @return {!ol.Collection.<ol.layer.Base>} Layers.
          * @api stable
          */
         getLayers(): ol.Collection<ol.layer.Base>;
@@ -7445,15 +5798,12 @@ declare module ol {
         /**
          * Get the pixel for a coordinate.  This takes a coordinate in the map view
          * projection and returns the corresponding pixel.
-         * @param {ol.Coordinate} coordinate A map coordinate.
-         * @return {ol.Pixel} A pixel position in the map viewport.
          * @api stable
          */
         getPixelFromCoordinate(coordinate: ol.Coordinate): ol.Pixel;
 
         /**
          * Get the size of this map.
-         * @return {ol.Size|undefined} The size in pixels of the map in the DOM.
          * @observable
          * @api stable
          */
@@ -7462,7 +5812,6 @@ declare module ol {
         /**
          * Get the view associated with this map. A view manages properties such as
          * center and resolution.
-         * @return {ol.View} The view that controls this map.
          * @observable
          * @api stable
          */
@@ -7470,7 +5819,6 @@ declare module ol {
 
         /**
          * Get the element that serves as the map viewport.
-         * @return {Element} Viewport.
          * @api stable
          */
         getViewport(): Element;
@@ -7489,8 +5837,6 @@ declare module ol {
 
         /**
          * Remove the given control from the map.
-         * @param {ol.control.Control} control Control.
-         * @return {ol.control.Control|undefined} The removed control (or undefined
          *     if the control was not found).
          * @api stable
          */
@@ -7498,8 +5844,6 @@ declare module ol {
 
         /**
          * Remove the given interaction from the map.
-         * @param {ol.interaction.Interaction} interaction Interaction to remove.
-         * @return {ol.interaction.Interaction|undefined} The removed interaction (or
          *     undefined if the interaction was not found).
          * @api stable
          */
@@ -7507,8 +5851,6 @@ declare module ol {
 
         /**
          * Removes the given layer from the map.
-         * @param {ol.layer.Base} layer Layer.
-         * @return {ol.layer.Base|undefined} The removed layer (or undefined if the
          *     layer was not found).
          * @api stable
          */
@@ -7516,8 +5858,6 @@ declare module ol {
 
         /**
          * Remove the given overlay from the map.
-         * @param {ol.Overlay} overlay Overlay.
-         * @return {ol.Overlay|undefined} The removed overlay (or undefined
          *     if the overlay was not found).
          * @api stable
          */
@@ -7525,7 +5865,6 @@ declare module ol {
 
         /**
          * Sets the layergroup of this map.
-         * @param {ol.layer.Group} layerGroup A layer group containing the layers in
          *     this map.
          * @observable
          * @api stable
@@ -7534,7 +5873,6 @@ declare module ol {
 
         /**
          * Set the size of this map.
-         * @param {ol.Size|undefined} size The size in pixels of the map in the DOM.
          * @observable
          * @api
          */
@@ -7542,7 +5880,6 @@ declare module ol {
 
         /**
          * Set the target element to render this map into.
-         * @param {Element|string|undefined} target The Element or id of the Element
          *     that the map is rendered in.
          * @observable
          * @api stable
@@ -7551,7 +5888,6 @@ declare module ol {
 
         /**
          * Set the view for this map.
-         * @param {ol.View} view The view that controls this map.
          * @observable
          * @api stable
          */
@@ -7570,14 +5906,6 @@ declare module ol {
      * Events emitted as map browser events are instances of this type.
      * See {@link ol.Map} for which events trigger a map browser event.
      *
-     * @constructor
-     * @extends {ol.MapEvent}
-     * @implements {oli.MapBrowserEvent}
-     * @param {string} type Event type.
-     * @param {ol.Map} map Map.
-     * @param {Event} browserEvent Browser event.
-     * @param {boolean=} opt_dragging Is the map currently being dragged?
-     * @param {?olx.FrameState=} opt_frameState Frame state.
      */
     class MapBrowserEvent extends ol.MapEvent {
         /**
@@ -7585,35 +5913,24 @@ declare module ol {
          * Events emitted as map browser events are instances of this type.
          * See {@link ol.Map} for which events trigger a map browser event.
          *
-         * @constructor
-         * @extends {ol.MapEvent}
-         * @implements {oli.MapBrowserEvent}
-         * @param {string} type Event type.
-         * @param {ol.Map} map Map.
-         * @param {Event} browserEvent Browser event.
-         * @param {boolean=} opt_dragging Is the map currently being dragged?
-         * @param {?olx.FrameState=} opt_frameState Frame state.
          */
         constructor(type: string, map: ol.Map, browserEvent: Event, opt_dragging?: boolean, opt_frameState?: olx.FrameState);
 
         /**
          * The original browser event.
          * @const
-         * @type {Event}
          * @api stable
          */
         originalEvent: Event;
 
         /**
          * The pixel of the original browser event.
-         * @type {ol.Pixel}
          * @api stable
          */
         pixel: ol.Pixel;
 
         /**
          * The coordinate of the original browser event.
-         * @type {ol.Coordinate}
          * @api stable
          */
         coordinate: ol.Coordinate;
@@ -7622,30 +5939,13 @@ declare module ol {
          * Indicates if the map is currently being dragged. Only set for
          * `POINTERDRAG` and `POINTERMOVE` events. Default is `false`.
          *
-         * @type {boolean}
          * @api stable
          */
         dragging: boolean;
     }
 
-    /**
-     * @constructor
-     * @extends {ol.MapBrowserEvent}
-     * @param {string} type Event type.
-     * @param {ol.Map} map Map.
-     * @param {ol.pointer.PointerEvent} pointerEvent Pointer event.
-     * @param {boolean=} opt_dragging Is the map currently being dragged?
-     * @param {?olx.FrameState=} opt_frameState Frame state.
-     */
     class MapBrowserPointerEvent extends ol.MapBrowserEvent {
         // /**
-        //  * @constructor
-        //  * @extends {ol.MapBrowserEvent}
-        //  * @param {string} type Event type.
-        //  * @param {ol.Map} map Map.
-        //  * @param {ol.pointer.PointerEvent} pointerEvent Pointer event.
-        //  * @param {boolean=} opt_dragging Is the map currently being dragged?
-        //  * @param {?olx.FrameState=} opt_frameState Frame state.
         //  */
         // constructor (type: string,
         //           map: ol.Map,
@@ -7661,12 +5961,6 @@ declare module ol {
      * Events emitted as map events are instances of this type.
      * See {@link ol.Map} for which events trigger a map event.
      *
-     * @constructor
-     * @extends {ol.events.Event}
-     * @implements {oli.MapEvent}
-     * @param {string} type Event type.
-     * @param {ol.Map} map Map.
-     * @param {?olx.FrameState=} opt_frameState Frame state.
      */
     class MapEvent extends ol.events.Event {
         /**
@@ -7674,25 +5968,17 @@ declare module ol {
          * Events emitted as map events are instances of this type.
          * See {@link ol.Map} for which events trigger a map event.
          *
-         * @constructor
-         * @extends {ol.events.Event}
-         * @implements {oli.MapEvent}
-         * @param {string} type Event type.
-         * @param {ol.Map} map Map.
-         * @param {?olx.FrameState=} opt_frameState Frame state.
          */
         constructor(type: string, map: ol.Map, opt_frameState?: olx.FrameState);
 
         /**
          * The map where the event occurred.
-         * @type {ol.Map}
          * @api stable
          */
         map: ol.Map;
 
         /**
          * The frame state at the time of the event.
-         * @type {?olx.FrameState}
          * @api
          */
         frameState: olx.FrameState;
@@ -7702,30 +5988,17 @@ declare module ol {
      * @classdesc
      * Events emitted by {@link ol.Object} instances are instances of this type.
      *
-     * @param {string} type The event type.
-     * @param {string} key The property name.
-     * @param {*} oldValue The old value for `key`.
-     * @extends {ol.events.Event}
-     * @implements {oli.ObjectEvent}
-     * @constructor
      */
     class ObjectEvent extends ol.events.Event {
         /**
          * @classdesc
          * Events emitted by {@link ol.Object} instances are instances of this type.
          *
-         * @param {string} type The event type.
-         * @param {string} key The property name.
-         * @param {*} oldValue The old value for `key`.
-         * @extends {ol.events.Event}
-         * @implements {oli.ObjectEvent}
-         * @constructor
          */
         constructor(type: string, key: string, oldValue: any);
 
         /**
          * The name of the property whose value is changing.
-         * @type {string}
          * @api stable
          */
         key: string;
@@ -7733,7 +6006,6 @@ declare module ol {
         /**
          * The old value. To get the new value use `e.target.get(e.key)` where
          * `e` is the event object.
-         * @type {*}
          * @api stable
          */
         oldValue: any;
@@ -7778,9 +6050,6 @@ declare module ol {
      * Properties can be deleted by using the unset method. E.g.
      * object.unset('foo').
      *
-     * @constructor
-     * @extends {ol.Observable}
-     * @param {Object.<string, *>=} opt_values An object with key-value pairs.
      * @fires ol.ObjectEvent
      * @api
      */
@@ -7824,9 +6093,6 @@ declare module ol {
          * Properties can be deleted by using the unset method. E.g.
          * object.unset('foo').
          *
-         * @constructor
-         * @extends {ol.Observable}
-         * @param {Object.<string, *>=} opt_values An object with key-value pairs.
          * @fires ol.ObjectEvent
          * @api
          */
@@ -7834,31 +6100,24 @@ declare module ol {
 
         /**
          * Gets a value.
-         * @param {string} key Key name.
-         * @return {*} Value.
          * @api stable
          */
         get(key: string): any;
 
         /**
          * Get a list of object property names.
-         * @return {Array.<string>} List of property names.
          * @api stable
          */
         getKeys(): string[];
 
         /**
          * Get an object of all property names and values.
-         * @return {Object.<string, *>} Object.
          * @api stable
          */
         getProperties(): { [k: string]: any };
 
         /**
          * Sets a value.
-         * @param {string} key Key name.
-         * @param {*} value Value.
-         * @param {boolean=} opt_silent Update without triggering an event.
          * @api stable
          */
         set(key: string, value: any, opt_silent?: boolean): void;
@@ -7866,16 +6125,12 @@ declare module ol {
         /**
          * Sets a collection of key-value pairs.  Note that this changes any existing
          * properties and adds new ones (it does not remove any existing properties).
-         * @param {Object.<string, *>} values Values.
-         * @param {boolean=} opt_silent Update without triggering an event.
          * @api stable
          */
         setProperties(values: { [k: string]: any }, opt_silent?: boolean): void;
 
         /**
          * Unsets a property.
-         * @param {string} key Key name.
-         * @param {boolean=} opt_silent Unset without triggering an event.
          * @api stable
          */
         unset(key: string, opt_silent?: boolean): void;
@@ -7889,8 +6144,6 @@ declare module ol {
      * and unregistration. A generic `change` event is always available through
      * {@link ol.Observable#changed}.
      *
-     * @constructor
-     * @extends {ol.events.EventTarget}
      * @fires ol.events.Event
      * @struct
      * @api stable
@@ -7904,8 +6157,6 @@ declare module ol {
          * and unregistration. A generic `change` event is always available through
          * {@link ol.Observable#changed}.
          *
-         * @constructor
-         * @extends {ol.events.EventTarget}
          * @fires ol.events.Event
          * @struct
          * @api stable
@@ -7914,7 +6165,6 @@ declare module ol {
 
         /**
          * Removes an event listener using the key returned by `on()` or `once()`.
-         * @param {ol.EventsKey|Array.<ol.EventsKey>} key The key returned by `on()`
          *     or `once()` (or an array of keys).
          * @api stable
          */
@@ -7931,10 +6181,8 @@ declare module ol {
          * of this type. The event parameter can either be a string or an
          * Object with a `type` property.
          *
-         * @param {{type: string,
          *     target: (EventTarget|ol.events.EventTarget|undefined)}|ol.events.Event|
          *     string} event Event object.
-         * @function
          * @api
          */
         dispatchEvent(event: (GlobalObject | ol.events.Event | string)): void;
@@ -7942,17 +6190,12 @@ declare module ol {
         /**
          * Get the version number for this object.  Each time the object is modified,
          * its version number will be incremented.
-         * @return {number} Revision.
          * @api
          */
         getRevision(): number;
 
         /**
          * Listen for a certain type of event.
-         * @param {string|Array.<string>} type The event type or array of event types.
-         * @param {function(?): ?} listener The listener function.
-         * @param {Object=} opt_this The object to use as `this` in `listener`.
-         * @return {ol.EventsKey|Array.<ol.EventsKey>} Unique key for the listener. If
          *     called with an array of event types as the first argument, the return
          *     will be an array of keys.
          * @api stable
@@ -7961,10 +6204,6 @@ declare module ol {
 
         /**
          * Listen once for a certain type of event.
-         * @param {string|Array.<string>} type The event type or array of event types.
-         * @param {function(?): ?} listener The listener function.
-         * @param {Object=} opt_this The object to use as `this` in `listener`.
-         * @return {ol.EventsKey|Array.<ol.EventsKey>} Unique key for the listener. If
          *     called with an array of event types as the first argument, the return
          *     will be an array of keys.
          * @api stable
@@ -7973,9 +6212,6 @@ declare module ol {
 
         /**
          * Unlisten for a certain type of event.
-         * @param {string|Array.<string>} type The event type or array of event types.
-         * @param {function(?): ?} listener The listener function.
-         * @param {Object=} opt_this The object which was used as `this` by the
          * `listener`.
          * @api stable
          */
@@ -7986,7 +6222,6 @@ declare module ol {
      * Overlay position: `'bottom-left'`, `'bottom-center'`,  `'bottom-right'`,
      * `'center-left'`, `'center-center'`, `'center-right'`, `'top-left'`,
      * `'top-center'`, `'top-right'`
-     * @enum {string}
      */
     type OverlayPositioning = "bottom-left" | "bottom-center" | "bottom-right" | "center-left" | "center-center" | "center-right" | "top-left" | "top-center" | "top-right";
 
@@ -8006,9 +6241,6 @@ declare module ol {
      *     popup.setPosition(coordinate);
      *     map.addOverlay(popup);
      *
-     * @constructor
-     * @extends {ol.Object}
-     * @param {olx.OverlayOptions} options Overlay options.
      * @api stable
      */
     class Overlay extends ol.Object {
@@ -8028,16 +6260,12 @@ declare module ol {
          *     popup.setPosition(coordinate);
          *     map.addOverlay(popup);
          *
-         * @constructor
-         * @extends {ol.Object}
-         * @param {olx.OverlayOptions} options Overlay options.
          * @api stable
          */
         constructor(options: olx.OverlayOptions);
 
         /**
          * Get the DOM element of this overlay.
-         * @return {Element|undefined} The Element containing the overlay.
          * @observable
          * @api stable
          */
@@ -8045,14 +6273,12 @@ declare module ol {
 
         /**
          * Get the overlay identifier which is set on constructor.
-         * @return {number|string|undefined} Id.
          * @api
          */
         getId(): (number | string);
 
         /**
          * Get the map associated with this overlay.
-         * @return {ol.Map|undefined} The map that the overlay is part of.
          * @observable
          * @api stable
          */
@@ -8060,7 +6286,6 @@ declare module ol {
 
         /**
          * Get the offset of this overlay.
-         * @return {Array.<number>} The offset.
          * @observable
          * @api stable
          */
@@ -8068,7 +6293,6 @@ declare module ol {
 
         /**
          * Get the current position of this overlay.
-         * @return {ol.Coordinate|undefined} The spatial point that the overlay is
          *     anchored at.
          * @observable
          * @api stable
@@ -8077,7 +6301,6 @@ declare module ol {
 
         /**
          * Get the current positioning of this overlay.
-         * @return {ol.OverlayPositioning} How the overlay is positioned
          *     relative to its point on the map.
          * @observable
          * @api stable
@@ -8086,7 +6309,6 @@ declare module ol {
 
         /**
          * Set the DOM element to be associated with this overlay.
-         * @param {Element|undefined} element The Element containing the overlay.
          * @observable
          * @api stable
          */
@@ -8094,7 +6316,6 @@ declare module ol {
 
         /**
          * Set the map to be associated with this overlay.
-         * @param {ol.Map|undefined} map The map that the overlay is part of.
          * @observable
          * @api stable
          */
@@ -8102,7 +6323,6 @@ declare module ol {
 
         /**
          * Set the offset for this overlay.
-         * @param {Array.<number>} offset Offset.
          * @observable
          * @api stable
          */
@@ -8111,7 +6331,6 @@ declare module ol {
         /**
          * Set the position for this overlay. If the position is `undefined` the
          * overlay is hidden.
-         * @param {ol.Coordinate|undefined} position The spatial point that the overlay
          *     is anchored at.
          * @observable
          * @api stable
@@ -8120,7 +6339,6 @@ declare module ol {
 
         /**
          * Set the positioning for this overlay.
-         * @param {ol.OverlayPositioning} positioning how the overlay is
          *     positioned relative to its point on the map.
          * @observable
          * @api stable
@@ -8136,11 +6354,6 @@ declare module ol {
          * This class is used as an abstraction for mouse events,
          * touch events and even native pointer events.
          *
-         * @constructor
-         * @extends {ol.events.Event}
-         * @param {string} type The type of the event to create.
-         * @param {Event} originalEvent The event.
-         * @param {Object.<string, ?>=} opt_eventDict An optional dictionary of
          *    initial event properties.
          */
         class PointerEvent {
@@ -8198,21 +6411,17 @@ declare module ol {
      * projection, just add a {@link ol.proj.Projection} with
      * {@link ol.proj.addProjection}. See examples/wms-no-proj for an example of
      * this.
-     *
-     * @namespace ol.proj
      */
     module proj {
         /**
          * Projection units: `'degrees'`, `'ft'`, `'m'`, `'pixels'`, `'tile-pixels'` or
          * `'us-ft'`.
-         * @enum {string}
          */
         type Units = "degress" | "ft" | "m" | "pixels" | "tile-pixels" | "us-ft";
 
         /**
          * Meters per unit lookup table.
          * @const
-         * @type {Object.<ol.proj.Units, number>}
          * @api stable
          */
         const METERS_PER_UNIT: { [k: string]: number };
@@ -8242,8 +6451,6 @@ declare module ol {
          * [documentation](https://github.com/proj4js/proj4js). To set an alternative
          * namespace for proj4, use {@link ol.proj.setProj4}.
          *
-         * @constructor
-         * @param {olx.ProjectionOptions} options Projection options.
          * @struct
          * @api stable
          */
@@ -8273,8 +6480,6 @@ declare module ol {
              * [documentation](https://github.com/proj4js/proj4js). To set an alternative
              * namespace for proj4, use {@link ol.proj.setProj4}.
              *
-             * @constructor
-             * @param {olx.ProjectionOptions} options Projection options.
              * @struct
              * @api stable
              */
@@ -8282,21 +6487,18 @@ declare module ol {
 
             /**
              * Get the code for this projection, e.g. 'EPSG:4326'.
-             * @return {string} Code.
              * @api stable
              */
             getCode(): string;
 
             /**
              * Get the validity extent for this projection.
-             * @return {ol.Extent} Extent.
              * @api stable
              */
             getExtent(): ol.Extent;
 
             /**
              * Get the units of this projection.
-             * @return {ol.proj.Units} Units.
              * @api stable
              */
             getUnits(): ol.proj.Units;
@@ -8305,42 +6507,36 @@ declare module ol {
              * Get the amount of meters per unit of this projection.  If the projection is
              * not configured with `metersPerUnit` or a units identifier, the return is
              * `undefined`.
-             * @return {number|undefined} Meters.
              * @api stable
              */
             getMetersPerUnit(): (number);
 
             /**
              * Get the world extent for this projection.
-             * @return {ol.Extent} Extent.
              * @api
              */
             getWorldExtent(): ol.Extent;
 
             /**
              * Is this projection a global projection which spans the whole world?
-             * @return {boolean} Whether the projection is global.
              * @api stable
              */
             isGlobal(): boolean;
 
             /**
              * Set if the projection is a global projection which spans the whole world
-             * @param {boolean} global Whether the projection is global.
              * @api stable
              */
             setGlobal(global: boolean): void;
 
             /**
              * Set the validity extent for this projection.
-             * @param {ol.Extent} extent Extent.
              * @api stable
              */
             setExtent(extent: ol.Extent): void;
 
             /**
              * Set the world extent for this projection.
-             * @param {ol.Extent} worldExtent World extent
              *     [minlon, minlat, maxlon, maxlat].
              * @api
              */
@@ -8348,7 +6544,6 @@ declare module ol {
 
             /**
              * Set the getPointResolution function for this projection.
-             * @param {function(number, ol.Coordinate):number} func Function
              * @api
              */
             setGetPointResolution(func: ((resolution: number, coords: ol.Coordinate) => number)): void;
@@ -8363,9 +6558,6 @@ declare module ol {
              * An alternative implementation may be given when constructing a
              * projection. For many local projections,
              * such a custom function will return the resolution unchanged.
-             * @param {number} resolution Resolution in projection units.
-             * @param {ol.Coordinate} point Point.
-             * @return {number} Point resolution in projection units.
              * @api
              */
             getPointResolution(resolution: number, point: ol.Coordinate): number;
@@ -8380,7 +6572,6 @@ declare module ol {
          *     import proj4 from 'proj4';
          *     ol.proj.setProj4(proj4);
          *
-         * @param {any} proj4 Proj4.
          * @api
          */
         function setProj4(proj4: any): void;
@@ -8389,7 +6580,6 @@ declare module ol {
          * Registers transformation functions that don't alter coordinates. Those allow
          * to transform between projections with equal meaning.
          *
-         * @param {Array.<ol.proj.Projection>} projections Projections.
          * @api
          */
         function addEquivalentProjections(projections: ol.proj.Projection[]): void;
@@ -8398,7 +6588,6 @@ declare module ol {
          * Add a Projection object to the list of supported projections that can be
          * looked up by their code.
          *
-         * @param {ol.proj.Projection} projection Projection instance.
          * @api stable
          */
         function addProjection(projection: ol.proj.Projection): void;
@@ -8410,13 +6599,9 @@ declare module ol {
          * converts these into the functions used internally which also handle
          * extents and coordinate arrays.
          *
-         * @param {ol.ProjectionLike} source Source projection.
-         * @param {ol.ProjectionLike} destination Destination projection.
-         * @param {function(ol.Coordinate): ol.Coordinate} forward The forward transform
          *     function (that is, from the source projection to the destination
          *     projection) that takes a {@link ol.Coordinate} as argument and returns
          *     the transformed {@link ol.Coordinate}.
-         * @param {function(ol.Coordinate): ol.Coordinate} inverse The inverse transform
          *     function (that is, from the destination projection to the source
          *     projection) that takes a {@link ol.Coordinate} as argument and returns
          *     the transformed {@link ol.Coordinate}.
@@ -8429,21 +6614,15 @@ declare module ol {
 
         /**
          * Transforms a coordinate from longitude/latitude to a different projection.
-         * @param {ol.Coordinate} coordinate Coordinate as longitude and latitude, i.e.
          *     an array with longitude as 1st and latitude as 2nd element.
-         * @param {ol.ProjectionLike=} opt_projection Target projection. The
          *     default is Web Mercator, i.e. 'EPSG:3857'.
-         * @return {ol.Coordinate} Coordinate projected to the target projection.
          * @api stable
          */
         function fromLonLat(coordinate: ol.Coordinate, opt_projection?: ol.ProjectionLike): ol.Coordinate;
 
         /**
          * Transforms a coordinate to longitude/latitude.
-         * @param {ol.Coordinate} coordinate Projected coordinate.
-         * @param {ol.ProjectionLike=} opt_projection Projection of the coordinate.
          *     The default is Web Mercator, i.e. 'EPSG:3857'.
-         * @return {ol.Coordinate} Coordinate as longitude and latitude, i.e. an array
          *     with longitude as 1st and latitude as 2nd element.
          * @api stable
          */
@@ -8452,10 +6631,8 @@ declare module ol {
         /**
          * Fetches a Projection object for the code specified.
          *
-         * @param {ol.ProjectionLike} projectionLike Either a code string which is
          *     a combination of authority and identifier such as "EPSG:4326", or an
          *     existing projection object, or undefined.
-         * @return {ol.proj.Projection} Projection object, or null if not in list.
          * @api stable
          */
         function get(projectionLike: ol.ProjectionLike): ol.proj.Projection;
@@ -8465,9 +6642,6 @@ declare module ol {
          * projection does represent the same geographic point as the same coordinate in
          * the other projection.
          *
-         * @param {ol.proj.Projection} projection1 Projection 1.
-         * @param {ol.proj.Projection} projection2 Projection 2.
-         * @return {boolean} Equivalent.
          * @api
          */
         function equivalent(projection1: ol.proj.Projection, projection2: ol.proj.Projection): boolean;
@@ -8477,9 +6651,6 @@ declare module ol {
          * function to convert a coordinates array from the source projection to the
          * destination projection.
          *
-         * @param {ol.ProjectionLike} source Source.
-         * @param {ol.ProjectionLike} destination Destination.
-         * @return {ol.TransformFunction} Transform function.
          * @api stable
          */
         function getTransform(source: ol.ProjectionLike, destination: ol.ProjectionLike): ol.TransformFunction;
@@ -8492,9 +6663,6 @@ declare module ol {
          * See the transform method of {@link ol.geom.Geometry} and its subclasses for
          * geometry transforms.
          *
-         * @param {ol.Coordinate} coordinate Coordinate.
-         * @param {ol.ProjectionLike} source Source projection-like.
-         * @param {ol.ProjectionLike} destination Destination projection-like.
          */
         function transform(coordinate: ol.Coordinate, source: ol.ProjectionLike, destination: ol.ProjectionLike): ol.Coordinate;
 
@@ -8502,10 +6670,6 @@ declare module ol {
          * Transforms an extent from source projection to destination projection.  This
          * returns a new extent (and does not modify the original).
          *
-         * @param {ol.Extent} extent The extent to transform.
-         * @param {ol.ProjectionLike} source Source projection-like.
-         * @param {ol.ProjectionLike} destination Destination projection-like.
-         * @return {ol.Extent} The transformed extent.
          * @api stable
          */
         function transformExtent(extent: ol.Extent, source: ol.ProjectionLike, destination: ol.ProjectionLike): ol.Extent;
@@ -8517,10 +6681,6 @@ declare module ol {
          * estimated by transforming the 'point' pixel to EPSG:4326, measuring
          * its width and height on the normal sphere, and taking the average of
          * the width and height.
-         * @param {ol.proj.Projection} projection The projection.
-         * @param {number} resolution Nominal resolution in projection units.
-         * @param {ol.Coordinate} point Point to find adjusted resolution at.
-         * @return {number} Point to find adjusted resolution at.
          */
         function getPointResolution(
             projection: ol.proj.Projection,
@@ -8529,13 +6689,7 @@ declare module ol {
         ): number;
     }
 
-    /**
-     * @namespace ol.render
-     */
     module render {
-        /**
-         * @namespace ol.render.canvas
-         */
         module canvas {
             /**
              * @classdesc
@@ -8546,13 +6700,6 @@ declare module ol {
              * {@link ol.render.Event} object associated with postcompose, precompose and
              * render events emitted by layers and maps.
              *
-             * @constructor
-             * @extends {ol.render.VectorContext}
-             * @param {CanvasRenderingContext2D} context Context.
-             * @param {number} pixelRatio Pixel ratio.
-             * @param {ol.Extent} extent Extent.
-             * @param {ol.Transform} transform Transform.
-             * @param {number} viewRotation View rotation.
              * @struct
              */
             class Immediate extends ol.render.VectorContext {
@@ -8565,13 +6712,6 @@ declare module ol {
                  * {@link ol.render.Event} object associated with postcompose, precompose and
                  * render events emitted by layers and maps.
                  *
-                 * @constructor
-                 * @extends {ol.render.VectorContext}
-                 * @param {CanvasRenderingContext2D} context Context.
-                 * @param {number} pixelRatio Pixel ratio.
-                 * @param {ol.Extent} extent Extent.
-                 * @param {ol.Transform} transform Transform.
-                 * @param {number} viewRotation View rotation.
                  * @struct
                  */
                 constructor(context: CanvasRenderingContext2D, pixelRatio: number, extent: ol.Extent, transform: any, viewRotation: number);
@@ -8580,7 +6720,6 @@ declare module ol {
                  * Render a circle geometry into the canvas.  Rendering is immediate and uses
                  * the current fill and stroke styles.
                  *
-                 * @param {ol.geom.Circle} geometry Circle geometry.
                  * @api
                  */
                 drawCircle(geometry: ol.geom.Circle): void;
@@ -8589,7 +6728,6 @@ declare module ol {
                  * Set the rendering style.  Note that since this is an immediate rendering API,
                  * any `zIndex` on the provided style will be ignored.
                  *
-                 * @param {ol.style.Style} style The rendering style.
                  * @api
                  */
                 setStyle(style: ol.style.Style): void;
@@ -8598,7 +6736,6 @@ declare module ol {
                  * Render a geometry into the canvas.  Call
                  * {@link ol.render.canvas.Immediate#setStyle} first to set the rendering style.
                  *
-                 * @param {ol.geom.Geometry|ol.render.Feature} geometry The geometry to render.
                  * @api
                  */
                 drawGeometry(geometry: (ol.geom.Geometry | ol.render.Feature)): void;
@@ -8609,47 +6746,23 @@ declare module ol {
                  * this method is called.  If you need `zIndex` support, you should be using an
                  * {@link ol.layer.Vector} instead.
                  *
-                 * @param {ol.Feature} feature Feature.
-                 * @param {ol.style.Style} style Style.
                  * @api
                  */
                 drawFeature(feature: ol.Feature, style: ol.style.Style): void;
             }
         }
 
-        /**
-         * @constructor
-         * @extends {ol.events.Event}
-         * @implements {oli.render.Event}
-         * @param {ol.render.EventType} type Type.
-         * @param {ol.render.VectorContext=} opt_vectorContext Vector context.
-         * @param {olx.FrameState=} opt_frameState Frame state.
-         * @param {?CanvasRenderingContext2D=} opt_context Context.
-         * @param {?ol.webgl.Context=} opt_glContext WebGL Context.
-         */
         class Event extends ol.events.Event {
-            /**
-             * @constructor
-             * @extends {ol.events.Event}
-             * @implements {oli.render.Event}
-             * @param {ol.render.EventType} type Type.
-             * @param {ol.render.VectorContext=} opt_vectorContext Vector context.
-             * @param {olx.FrameState=} opt_frameState Frame state.
-             * @param {?CanvasRenderingContext2D=} opt_context Context.
-             * @param {?ol.webgl.Context=} opt_glContext WebGL Context.
-             */
             constructor(type: ol.render.EventType, opt_vectorContext?: ol.render.VectorContext, opt_frameState?: olx.FrameState, opt_context?: CanvasRenderingContext2D, opt_glContext?: any);
 
             /**
              * For canvas, this is an instance of {@link ol.render.canvas.Immediate}.
-             * @type {ol.render.VectorContext|undefined}
              * @api
              */
             vectorContext: ol.render.VectorContext;
 
             /**
              * An object representing the current render frame state.
-             * @type {olx.FrameState|undefined}
              * @api
              */
             frameState: olx.FrameState;
@@ -8657,7 +6770,6 @@ declare module ol {
             /**
              * Canvas context. Only available when a Canvas renderer is used, null
              * otherwise.
-             * @type {CanvasRenderingContext2D|null|undefined}
              * @api
              */
             context: CanvasRenderingContext2D;
@@ -8665,7 +6777,6 @@ declare module ol {
             /**
              * WebGL context. Only available when a WebGL renderer is used, null
              * otherwise.
-             * @type {ol.webgl.Context|null|undefined}
              * @api
              */
             glContext: any;
@@ -8678,12 +6789,7 @@ declare module ol {
          * structure, optimized for rendering and styling. Geometry access through the
          * API is limited to getting the type and extent of the geometry.
          *
-         * @constructor
-         * @param {ol.geom.GeometryType} type Geometry type.
-         * @param {Array.<number>} flatCoordinates Flat coordinates. These always need
          *     to be right-handed for polygons.
-         * @param {Array.<number>|Array.<Array.<number>>} ends Ends or Endss.
-         * @param {Object.<string, *>} properties Properties.
          */
         class Feature {
             /**
@@ -8691,47 +6797,36 @@ declare module ol {
              * structure, optimized for rendering and styling. Geometry access through the
              * API is limited to getting the type and extent of the geometry.
              *
-             * @constructor
-             * @param {ol.geom.GeometryType} type Geometry type.
-             * @param {Array.<number>} flatCoordinates Flat coordinates. These always need
              *     to be right-handed for polygons.
-             * @param {Array.<number>|Array.<Array.<number>>} ends Ends or Endss.
-             * @param {Object.<string, *>} properties Properties.
              */
             constructor(type: ol.geom.GeometryType, flatCoordinates: number[], ends: (number[] | number[][]), properties: { [k: string]: any });
 
             /**
              * Get a feature property by its key.
-             * @param {string} key Key
-             * @return {*} Value for the requested key.
              * @api
              */
             get(key: string): any;
 
             /**
              * Get the extent of this feature's geometry.
-             * @return {ol.Extent} Extent.
              * @api
              */
             getExtent(): ol.Extent;
 
             /**
              * Get the feature for working with its geometry.
-             * @return {ol.render.Feature} Feature.
              * @api
              */
             getGeometry(): ol.render.Feature;
 
             /**
              * Get the feature properties.
-             * @return {Object.<string, *>} Feature properties.
              * @api
              */
             getProperties(): { [k: string]: any };
 
             /**
              * Get the type of this feature's geometry.
-             * @return {ol.geom.GeometryType} Geometry type.
              * @api
              */
             getType(): ol.geom.GeometryType;
@@ -8740,7 +6835,6 @@ declare module ol {
         /**
          * Context for drawing geometries.  A vector context is available on render
          * events and does not need to be constructed directly.
-         * @constructor
          * @struct
          * @api
          */
@@ -8748,7 +6842,6 @@ declare module ol {
             /**
              * Context for drawing geometries.  A vector context is available on render
              * events and does not need to be constructed directly.
-             * @constructor
              * @struct
              * @api
              */
@@ -8770,9 +6863,6 @@ declare module ol {
          *     new ol.geom.Polygon([[[0, 0], [100, 100], [100, 0], [0, 0]]]));
          * ```
          *
-         * @param {CanvasRenderingContext2D} context Canvas context.
-         * @param {olx.render.ToContextOptions=} opt_options Options.
-         * @return {ol.render.canvas.Immediate} Canvas Immediate.
          * @api
          */
         function toContext(context: CanvasRenderingContext2D, opt_options?: olx.render.ToContextOptions): ol.render.canvas.Immediate;
@@ -8780,27 +6870,19 @@ declare module ol {
 
     /**
      * Available renderers: `'canvas'`, `'dom'` or `'webgl'`.
-     * @enum {string}
      */
     type RendererType = "canvas" | "dom" | "webgl";
 
     /**
      * Raster operation type. Supported values are `'pixel'` and `'image'`.
-     * @enum {string}
      */
     type RasterOperationType = "pixel" | "image";
 
-    /**
-     * @namespace ol.source
-     */
     module source {
         /**
          * @classdesc
          * Layer source for Bing Maps tile data.
          *
-         * @constructor
-         * @extends {ol.source.TileImage}
-         * @param {olx.source.BingMapsOptions} options Bing Maps options.
          * @api stable
          */
         class BingMaps extends ol.source.TileImage {
@@ -8808,9 +6890,6 @@ declare module ol {
              * @classdesc
              * Layer source for Bing Maps tile data.
              *
-             * @constructor
-             * @extends {ol.source.TileImage}
-             * @param {olx.source.BingMapsOptions} options Bing Maps options.
              * @api stable
              */
             constructor(options: olx.source.BingMapsOptions);
@@ -8819,7 +6898,6 @@ declare module ol {
              * The attribution containing a link to the Microsoft® Bing™ Maps Platform APIs’
              * Terms Of Use.
              * @const
-             * @type {ol.Attribution}
              * @api
              */
             static TOS_ATTRIBUTION: ol.Attribution;
@@ -8829,9 +6907,6 @@ declare module ol {
          * @classdesc
          * Layer source for the CartoDB tiles.
          *
-         * @constructor
-         * @extends {ol.source.XYZ}
-         * @param {olx.source.CartoDBOptions} options CartoDB options.
          * @api
          */
         class CartoDB extends ol.source.XYZ {
@@ -8839,23 +6914,18 @@ declare module ol {
              * @classdesc
              * Layer source for the CartoDB tiles.
              *
-             * @constructor
-             * @extends {ol.source.XYZ}
-             * @param {olx.source.CartoDBOptions} options CartoDB options.
              * @api
              */
             constructor(options: olx.source.CartoDBOptions);
 
             /**
              * Returns the current config.
-             * @return {!Object} The current configuration.
              * @api
              */
             getConfig(): GlobalObject;
 
             /**
              * Updates the carto db config.
-             * @param {Object} config a key-value lookup. Values will replace current values
              *     in the config.
              * @api
              */
@@ -8863,7 +6933,6 @@ declare module ol {
 
             /**
              * Sets the CartoDB config
-             * @param {Object} config In the case of anonymous maps, a CartoDB configuration
              *     object.
              * If using named maps, a key-value lookup with the template parameters.
              * @api
@@ -8877,9 +6946,6 @@ declare module ol {
          * geometries. For other geometry types, or if not all geometries should be
          * considered for clustering, a custom `geometryFunction` can be defined.
          *
-         * @constructor
-         * @param {olx.source.ClusterOptions} options Constructor options.
-         * @extends {ol.source.Vector}
          * @api
          */
         class Cluster extends ol.source.Vector {
@@ -8889,30 +6955,24 @@ declare module ol {
              * geometries. For other geometry types, or if not all geometries should be
              * considered for clustering, a custom `geometryFunction` can be defined.
              *
-             * @constructor
-             * @param {olx.source.ClusterOptions} options Constructor options.
-             * @extends {ol.source.Vector}
              * @api
              */
             constructor(options: olx.source.ClusterOptions);
 
             /**
              * Get a reference to the wrapped source.
-             * @return {ol.source.Vector} Source.
              * @api
              */
             getSource(): ol.source.Vector;
 
             /**
              * Get the distance in pixels between clusters.
-             * @return {number} The distance in pixels.
              * @api
              */
             getDistance(): number;
 
             /**
              * Set the distance in pixels between clusters.
-             * @param {number} distance The distance in pixels.
              * @api
              */
             setDistance(distance: number): void;
@@ -8924,9 +6984,6 @@ declare module ol {
          * instantiated in apps.
          * Base class for sources providing a single image.
          *
-         * @constructor
-         * @extends {ol.source.Source}
-         * @param {ol.SourceImageOptions} options Single image source options.
          * @api
          */
         class Image extends ol.source.Source {
@@ -8936,9 +6993,6 @@ declare module ol {
              * instantiated in apps.
              * Base class for sources providing a single image.
              *
-             * @constructor
-             * @extends {ol.source.Source}
-             * @param {ol.SourceImageOptions} options Single image source options.
              * @api
              */
             constructor(options: ol.SourceImageOptions);
@@ -8949,11 +7003,6 @@ declare module ol {
          * Events emitted by {@link ol.source.Image} instances are instances of this
          * type.
          *
-         * @constructor
-         * @extends {ol.events.Event}
-         * @implements {oli.source.ImageEvent}
-         * @param {string} type Type.
-         * @param {ol.Image} image The image.
          */
         class ImageEvent extends ol.events.Event {
             /**
@@ -8961,17 +7010,11 @@ declare module ol {
              * Events emitted by {@link ol.source.Image} instances are instances of this
              * type.
              *
-             * @constructor
-             * @extends {ol.events.Event}
-             * @implements {oli.source.ImageEvent}
-             * @param {string} type Type.
-             * @param {ol.Image} image The image.
              */
             constructor(type: string, image: ol.Image);
 
             /**
              * The image related to the event.
-             * @type {ol.Image}
              * @api
              */
             image: ol.Image;
@@ -8986,10 +7029,7 @@ declare module ol {
          * take advantage of ol image caching and use
          * {@link ol.source.TileArcGISRest} data source.
          *
-         * @constructor
          * @fires ol.source.ImageEvent
-         * @extends {ol.source.Image}
-         * @param {olx.source.ImageArcGISRestOptions=} opt_options Image ArcGIS Rest Options.
          * @api
          */
         class ImageArcGISRest extends ol.source.Image {
@@ -9002,10 +7042,7 @@ declare module ol {
              * take advantage of ol image caching and use
              * {@link ol.source.TileArcGISRest} data source.
              *
-             * @constructor
              * @fires ol.source.ImageEvent
-             * @extends {ol.source.Image}
-             * @param {olx.source.ImageArcGISRestOptions=} opt_options Image ArcGIS Rest Options.
              * @api
              */
             constructor(opt_options?: olx.source.ImageArcGISRestOptions);
@@ -9013,42 +7050,36 @@ declare module ol {
             /**
              * Get the user-provided params, i.e. those passed to the constructor through
              * the "params" option, and possibly updated using the updateParams method.
-             * @return {Object} Params.
              * @api stable
              */
             getParams(): GlobalObject;
 
             /**
              * Return the image load function of the source.
-             * @return {ol.ImageLoadFunctionType} The image load function.
              * @api
              */
             getImageLoadFunction(): ol.ImageLoadFunctionType;
 
             /**
              * Return the URL used for this ArcGIS source.
-             * @return {string|undefined} URL.
              * @api stable
              */
             getUrl(): (string);
 
             /**
              * Set the image load function of the source.
-             * @param {ol.ImageLoadFunctionType} imageLoadFunction Image load function.
              * @api
              */
             setImageLoadFunction(imageLoadFunction: ol.ImageLoadFunctionType): void;
 
             /**
              * Set the URL to use for requests.
-             * @param {string|undefined} url URL.
              * @api stable
              */
             setUrl(url: (string)): void;
 
             /**
              * Update the user-provided params.
-             * @param {Object} params Params.
              * @api stable
              */
             updateParams(params: GlobalObject): void;
@@ -9058,9 +7089,6 @@ declare module ol {
          * @classdesc
          * Base class for image sources where a canvas element is the image.
          *
-         * @constructor
-         * @extends {ol.source.Image}
-         * @param {olx.source.ImageCanvasOptions} options Constructor options.
          * @api
          */
         class ImageCanvas extends ol.source.Image {
@@ -9068,9 +7096,6 @@ declare module ol {
              * @classdesc
              * Base class for image sources where a canvas element is the image.
              *
-             * @constructor
-             * @extends {ol.source.Image}
-             * @param {olx.source.ImageCanvasOptions} options Constructor options.
              * @api
              */
             constructor(options: olx.source.ImageCanvasOptions);
@@ -9080,10 +7105,7 @@ declare module ol {
          * @classdesc
          * Source for images from Mapguide servers
          *
-         * @constructor
          * @fires ol.source.ImageEvent
-         * @extends {ol.source.Image}
-         * @param {olx.source.ImageMapGuideOptions} options Options.
          * @api stable
          */
         class ImageMapGuide extends ol.source.Image {
@@ -9091,10 +7113,7 @@ declare module ol {
              * @classdesc
              * Source for images from Mapguide servers
              *
-             * @constructor
              * @fires ol.source.ImageEvent
-             * @extends {ol.source.Image}
-             * @param {olx.source.ImageMapGuideOptions} options Options.
              * @api stable
              */
             constructor(options: olx.source.ImageMapGuideOptions);
@@ -9102,28 +7121,24 @@ declare module ol {
             /**
              * Get the user-provided params, i.e. those passed to the constructor through
              * the "params" option, and possibly updated using the updateParams method.
-             * @return {Object} Params.
              * @api stable
              */
             getParams(): GlobalObject;
 
             /**
              * Return the image load function of the source.
-             * @return {ol.ImageLoadFunctionType} The image load function.
              * @api
              */
             getImageLoadFunction(): ol.ImageLoadFunctionType;
 
             /**
              * Update the user-provided params.
-             * @param {Object} params Params.
              * @api stable
              */
             updateParams(params: GlobalObject): void;
 
             /**
              * Set the image load function of the MapGuide source.
-             * @param {ol.ImageLoadFunctionType} imageLoadFunction Image load function.
              * @api
              */
             setImageLoadFunction(imageLoadFunction: ol.ImageLoadFunctionType): void;
@@ -9133,9 +7148,6 @@ declare module ol {
          * @classdesc
          * A layer source for displaying a single, static image.
          *
-         * @constructor
-         * @extends {ol.source.Image}
-         * @param {olx.source.ImageStaticOptions} options Options.
          * @api stable
          */
         class ImageStatic extends ol.source.Image {
@@ -9143,9 +7155,6 @@ declare module ol {
              * @classdesc
              * A layer source for displaying a single, static image.
              *
-             * @constructor
-             * @extends {ol.source.Image}
-             * @param {olx.source.ImageStaticOptions} options Options.
              * @api stable
              */
             constructor(options: olx.source.ImageStaticOptions);
@@ -9163,9 +7172,6 @@ declare module ol {
          * vector layer, where vector features are re-drawn during animations and
          * interactions.
          *
-         * @constructor
-         * @extends {ol.source.ImageCanvas}
-         * @param {olx.source.ImageVectorOptions} options Options.
          * @api
          */
         class ImageVector extends ol.source.ImageCanvas {
@@ -9181,16 +7187,12 @@ declare module ol {
              * vector layer, where vector features are re-drawn during animations and
              * interactions.
              *
-             * @constructor
-             * @extends {ol.source.ImageCanvas}
-             * @param {olx.source.ImageVectorOptions} options Options.
              * @api
              */
             constructor(options: olx.source.ImageVectorOptions);
 
             /**
              * Get a reference to the wrapped source.
-             * @return {ol.source.Vector} Source.
              * @api
              */
             getSource(): ol.source.Vector;
@@ -9198,7 +7200,6 @@ declare module ol {
             /**
              * Get the style for features.  This returns whatever was passed to the `style`
              * option at construction or to the `setStyle` method.
-             * @return {ol.style.Style|Array.<ol.style.Style>|ol.StyleFunction}
              *     Layer style.
              * @api stable
              */
@@ -9206,7 +7207,6 @@ declare module ol {
 
             /**
              * Get the style function.
-             * @return {ol.StyleFunction|undefined} Layer style function.
              * @api stable
              */
             getStyleFunction(): (ol.StyleFunction);
@@ -9218,7 +7218,6 @@ declare module ol {
              * it is `null` the layer has no style (a `null` style), so only features
              * that have their own styles will be rendered in the layer. See
              * {@link ol.style} for information on the default style.
-             * @param {ol.style.Style|Array.<ol.style.Style>|ol.StyleFunction|undefined}
              *     style Layer style.
              * @api stable
              */
@@ -9229,10 +7228,7 @@ declare module ol {
          * @classdesc
          * Source for WMS servers providing single, untiled images.
          *
-         * @constructor
          * @fires ol.source.ImageEvent
-         * @extends {ol.source.Image}
-         * @param {olx.source.ImageWMSOptions=} opt_options Options.
          * @api stable
          */
         class ImageWMS extends ol.source.Image {
@@ -9240,10 +7236,7 @@ declare module ol {
              * @classdesc
              * Source for WMS servers providing single, untiled images.
              *
-             * @constructor
              * @fires ol.source.ImageEvent
-             * @extends {ol.source.Image}
-             * @param {olx.source.ImageWMSOptions=} opt_options Options.
              * @api stable
              */
             constructor(opt_options?: olx.source.ImageWMSOptions);
@@ -9252,14 +7245,9 @@ declare module ol {
              * Return the GetFeatureInfo URL for the passed coordinate, resolution, and
              * projection. Return `undefined` if the GetFeatureInfo URL cannot be
              * constructed.
-             * @param {ol.Coordinate} coordinate Coordinate.
-             * @param {number} resolution Resolution.
-             * @param {ol.ProjectionLike} projection Projection.
-             * @param {!Object} params GetFeatureInfo params. `INFO_FORMAT` at least should
              *     be provided. If `QUERY_LAYERS` is not provided then the layers specified
              *     in the `LAYERS` parameter will be used. `VERSION` should not be
              *     specified here.
-             * @return {string|undefined} GetFeatureInfo URL.
              * @api stable
              */
             getGetFeatureInfoUrl(coordinate: ol.Coordinate, resolution: number, projection: ol.ProjectionLike, params: GlobalObject): (string);
@@ -9267,42 +7255,36 @@ declare module ol {
             /**
              * Get the user-provided params, i.e. those passed to the constructor through
              * the "params" option, and possibly updated using the updateParams method.
-             * @return {Object} Params.
              * @api stable
              */
             getParams(): GlobalObject;
 
             /**
              * Return the image load function of the source.
-             * @return {ol.ImageLoadFunctionType} The image load function.
              * @api
              */
             getImageLoadFunction(): ol.ImageLoadFunctionType;
 
             /**
              * Return the URL used for this WMS source.
-             * @return {string|undefined} URL.
              * @api stable
              */
             getUrl(): (string);
 
             /**
              * Set the image load function of the source.
-             * @param {ol.ImageLoadFunctionType} imageLoadFunction Image load function.
              * @api
              */
             setImageLoadFunction(imageLoadFunction: ol.ImageLoadFunctionType): void;
 
             /**
              * Set the URL to use for requests.
-             * @param {string|undefined} url URL.
              * @api stable
              */
             setUrl(url: (string)): void;
 
             /**
              * Update the user-provided params.
-             * @param {Object} params Params.
              * @api stable
              */
             updateParams(params: GlobalObject): void;
@@ -9312,9 +7294,6 @@ declare module ol {
          * @classdesc
          * Layer source for the OpenStreetMap tile server.
          *
-         * @constructor
-         * @extends {ol.source.XYZ}
-         * @param {olx.source.OSMOptions=} opt_options Open Street Map options.
          * @api stable
          */
         class OSM extends ol.source.XYZ {
@@ -9322,9 +7301,6 @@ declare module ol {
              * @classdesc
              * Layer source for the OpenStreetMap tile server.
              *
-             * @constructor
-             * @extends {ol.source.XYZ}
-             * @param {olx.source.OSMOptions=} opt_options Open Street Map options.
              * @api stable
              */
             constructor(opt_options?: olx.source.OSMOptions);
@@ -9333,7 +7309,6 @@ declare module ol {
              * The attribution containing a link to the OpenStreetMap Copyright and License
              * page.
              * @const
-             * @type {ol.Attribution}
              * @api
              */
             static ATTRIBUTION: ol.Attribution;
@@ -9345,10 +7320,7 @@ declare module ol {
          * of {@link ol.RasterOperation} functions to transform input pixel values into
          * output pixel values.
          *
-         * @constructor
-         * @extends {ol.source.Image}
          * @fires ol.source.RasterEvent
-         * @param {olx.source.RasterOptions} options Options.
          * @api
          */
         class Raster extends ol.source.Image {
@@ -9358,18 +7330,13 @@ declare module ol {
              * of {@link ol.RasterOperation} functions to transform input pixel values into
              * output pixel values.
              *
-             * @constructor
-             * @extends {ol.source.Image}
              * @fires ol.source.RasterEvent
-             * @param {olx.source.RasterOptions} options Options.
              * @api
              */
             constructor(options: olx.source.RasterOptions);
 
             /**
              * Set the operation.
-             * @param {ol.RasterOperation} operation New operation.
-             * @param {Object=} opt_lib Functions that will be available to operations run
              *     in a worker.
              * @api
              */
@@ -9381,12 +7348,6 @@ declare module ol {
          * Events emitted by {@link ol.source.Raster} instances are instances of this
          * type.
          *
-         * @constructor
-         * @extends {ol.events.Event}
-         * @implements {oli.source.RasterEvent}
-         * @param {string} type Type.
-         * @param {olx.FrameState} frameState The frame state.
-         * @param {Object} data An object made available to operations.
          */
         class RasterEvent extends ol.events.Event {
             /**
@@ -9394,25 +7355,17 @@ declare module ol {
              * Events emitted by {@link ol.source.Raster} instances are instances of this
              * type.
              *
-             * @constructor
-             * @extends {ol.events.Event}
-             * @implements {oli.source.RasterEvent}
-             * @param {string} type Type.
-             * @param {olx.FrameState} frameState The frame state.
-             * @param {Object} data An object made available to operations.
              */
             constructor(type: string, frameState: olx.FrameState, data: GlobalObject);
 
             /**
              * The raster extent.
-             * @type {ol.Extent}
              * @api
              */
             extent: ol.Extent;
 
             /**
              * The pixel resolution (map units per pixel).
-             * @type {number}
              * @api
              */
             resolution: number;
@@ -9420,7 +7373,6 @@ declare module ol {
             /**
              * An object made available to all operations.  This can be used by operations
              * as a storage object (e.g. for calculating statistics).
-             * @type {Object}
              * @api
              */
             data: GlobalObject;
@@ -9428,7 +7380,6 @@ declare module ol {
 
         /**
          * State of the source, one of 'undefined', 'loading', 'ready' or 'error'.
-         * @enum {string}
          */
         type State = "undefined" | "loading" | "ready" | "error";
 
@@ -9440,9 +7391,6 @@ declare module ol {
          *
          * A generic `change` event is triggered when the state of the source changes.
          *
-         * @constructor
-         * @extends {ol.Object}
-         * @param {ol.SourceSourceOptions} options Source options.
          * @api stable
          */
         class Source extends ol.Object {
@@ -9454,37 +7402,30 @@ declare module ol {
              *
              * A generic `change` event is triggered when the state of the source changes.
              *
-             * @constructor
-             * @extends {ol.Object}
-             * @param {ol.SourceSourceOptions} options Source options.
              * @api stable
              */
             constructor(options: ol.SourceSourceOptions);
 
             /**
              * Get the attributions of the source.
-             * @return {Array.<ol.Attribution>} Attributions.
              * @api stable
              */
             getAttributions(): ol.Attribution[];
 
             /**
              * Get the logo of the source.
-             * @return {string|olx.LogoOptions|undefined} Logo.
              * @api stable
              */
             getLogo(): (string | olx.LogoOptions);
 
             /**
              * Get the projection of the source.
-             * @return {ol.proj.Projection} Projection.
              * @api
              */
             getProjection(): ol.proj.Projection;
 
             /**
              * Get the state of the source, see {@link ol.source.State} for possible states.
-             * @return {ol.source.State} State.
              * @api
              */
             getState(): ol.source.State;
@@ -9497,7 +7438,6 @@ declare module ol {
 
             /**
              * Set the attributions of the source.
-             * @param {ol.AttributionLike|undefined} attributions Attributions.
              *     Can be passed as `string`, `Array<string>`, `{@link ol.Attribution}`,
              *     `Array<{@link ol.Attribution}>` or `undefined`.
              * @api
@@ -9509,9 +7449,6 @@ declare module ol {
          * @classdesc
          * Layer source for the Stamen tile server.
          *
-         * @constructor
-         * @extends {ol.source.XYZ}
-         * @param {olx.source.StamenOptions} options Stamen options.
          * @api stable
          */
         class Stamen extends ol.source.XYZ {
@@ -9519,9 +7456,6 @@ declare module ol {
              * @classdesc
              * Layer source for the Stamen tile server.
              *
-             * @constructor
-             * @extends {ol.source.XYZ}
-             * @param {olx.source.StamenOptions} options Stamen options.
              * @api stable
              */
             constructor(options: olx.source.StamenOptions);
@@ -9533,9 +7467,6 @@ declare module ol {
          * instantiated in apps.
          * Base class for sources providing images divided into a tile grid.
          *
-         * @constructor
-         * @extends {ol.source.Source}
-         * @param {ol.SourceTileOptions} options Tile source options.
          * @api
          */
         class Tile extends ol.source.Source {
@@ -9545,16 +7476,12 @@ declare module ol {
              * instantiated in apps.
              * Base class for sources providing images divided into a tile grid.
              *
-             * @constructor
-             * @extends {ol.source.Source}
-             * @param {ol.SourceTileOptions} options Tile source options.
              * @api
              */
             constructor(options: ol.SourceTileOptions);
 
             /**
              * Return the tile grid of the tile source.
-             * @return {ol.tilegrid.TileGrid} Tile grid.
              * @api stable
              */
             getTileGrid(): ol.tilegrid.TileGrid;
@@ -9565,11 +7492,6 @@ declare module ol {
          * Events emitted by {@link ol.source.Tile} instances are instances of this
          * type.
          *
-         * @constructor
-         * @extends {ol.events.Event}
-         * @implements {oli.source.TileEvent}
-         * @param {string} type Type.
-         * @param {ol.Tile} tile The tile.
          */
         class TileEvent extends ol.events.Event {
             /**
@@ -9577,17 +7499,11 @@ declare module ol {
              * Events emitted by {@link ol.source.Tile} instances are instances of this
              * type.
              *
-             * @constructor
-             * @extends {ol.events.Event}
-             * @implements {oli.source.TileEvent}
-             * @param {string} type Type.
-             * @param {ol.Tile} tile The tile.
              */
             constructor(type: string, tile: ol.Tile);
 
             /**
              * The tile related to the event.
-             * @type {ol.Tile}
              * @api
              */
             tile: ol.Tile;
@@ -9601,9 +7517,6 @@ declare module ol {
          * For cached ArcGIS services, better performance is available using the
          * {@link ol.source.XYZ} data source.
          *
-         * @constructor
-         * @extends {ol.source.TileImage}
-         * @param {olx.source.TileArcGISRestOptions=} opt_options Tile ArcGIS Rest
          *     options.
          * @api
          */
@@ -9616,9 +7529,6 @@ declare module ol {
              * For cached ArcGIS services, better performance is available using the
              * {@link ol.source.XYZ} data source.
              *
-             * @constructor
-             * @extends {ol.source.TileImage}
-             * @param {olx.source.TileArcGISRestOptions=} opt_options Tile ArcGIS Rest
              *     options.
              * @api
              */
@@ -9627,14 +7537,12 @@ declare module ol {
             /**
              * Get the user-provided params, i.e. those passed to the constructor through
              * the "params" option, and possibly updated using the updateParams method.
-             * @return {Object} Params.
              * @api
              */
             getParams(): GlobalObject;
 
             /**
              * Update the user-provided params.
-             * @param {Object} params Params.
              * @api stable
              */
             updateParams(params: GlobalObject): void;
@@ -9648,9 +7556,6 @@ declare module ol {
          *
          * Uses Canvas context2d, so requires Canvas support.
          *
-         * @constructor
-         * @extends {ol.source.Tile}
-         * @param {olx.source.TileDebugOptions} options Debug tile options.
          * @api
          */
         class TileDebug extends ol.source.Tile {
@@ -9662,9 +7567,6 @@ declare module ol {
              *
              * Uses Canvas context2d, so requires Canvas support.
              *
-             * @constructor
-             * @extends {ol.source.Tile}
-             * @param {olx.source.TileDebugOptions} options Debug tile options.
              * @api
              */
             constructor(options: olx.source.TileDebugOptions);
@@ -9674,10 +7576,7 @@ declare module ol {
          * @classdesc
          * Base class for sources providing images divided into a tile grid.
          *
-         * @constructor
          * @fires ol.source.TileEvent
-         * @extends {ol.source.UrlTile}
-         * @param {olx.source.TileImageOptions} options Image tile options.
          * @api
          */
         class TileImage extends ol.source.UrlTile {
@@ -9685,17 +7584,13 @@ declare module ol {
              * @classdesc
              * Base class for sources providing images divided into a tile grid.
              *
-             * @constructor
              * @fires ol.source.TileEvent
-             * @extends {ol.source.UrlTile}
-             * @param {olx.source.TileImageOptions} options Image tile options.
              * @api
              */
             constructor(options: olx.source.TileImageOptions);
 
             /**
              * Sets whether to render reprojection edges or not (usually for debugging).
-             * @param {boolean} render Render the edges.
              * @api
              */
             setRenderReprojectionEdges(render: boolean): void;
@@ -9708,8 +7603,6 @@ declare module ol {
              * (e.g. projection has no extent defined) or
              * for optimization reasons (custom tile size, resolutions, ...).
              *
-             * @param {ol.ProjectionLike} projection Projection.
-             * @param {ol.tilegrid.TileGrid} tilegrid Tile grid to use for the projection.
              * @api
              */
             setTileGridForProjection(projection: ol.ProjectionLike, tilegrid: ol.tilegrid.TileGrid): void;
@@ -9719,9 +7612,6 @@ declare module ol {
          * @classdesc
          * Layer source for tile data in TileJSON format.
          *
-         * @constructor
-         * @extends {ol.source.TileImage}
-         * @param {olx.source.TileJSONOptions} options TileJSON options.
          * @api stable
          */
         class TileJSON extends ol.source.TileImage {
@@ -9729,15 +7619,11 @@ declare module ol {
              * @classdesc
              * Layer source for tile data in TileJSON format.
              *
-             * @constructor
-             * @extends {ol.source.TileImage}
-             * @param {olx.source.TileJSONOptions} options TileJSON options.
              * @api stable
              */
             constructor(options: olx.source.TileJSONOptions);
 
             /**
-             * @return {TileJSON} The tilejson object.
              * @api
              */
             getTileJSON(): TileJSON;
@@ -9747,9 +7633,6 @@ declare module ol {
          * @classdesc
          * Layer source for UTFGrid interaction data loaded from TileJSON format.
          *
-         * @constructor
-         * @extends {ol.source.Tile}
-         * @param {olx.source.TileUTFGridOptions} options Source options.
          * @api
          */
         class TileUTFGrid extends ol.source.Tile {
@@ -9757,16 +7640,12 @@ declare module ol {
              * @classdesc
              * Layer source for UTFGrid interaction data loaded from TileJSON format.
              *
-             * @constructor
-             * @extends {ol.source.Tile}
-             * @param {olx.source.TileUTFGridOptions} options Source options.
              * @api
              */
             constructor(options: olx.source.TileUTFGridOptions);
 
             /**
              * Return the template from TileJSON.
-             * @return {string|undefined} The template from TileJSON.
              * @api
              */
             getTemplate(): (string);
@@ -9775,11 +7654,6 @@ declare module ol {
              * Calls the callback (synchronously by default) with the available data
              * for given coordinate and resolution (or `null` if not yet loaded or
              * in case of an error).
-             * @param {ol.Coordinate} coordinate Coordinate.
-             * @param {number} resolution Resolution.
-             * @param {function(this: T, *)} callback Callback.
-             * @param {T=} opt_this The object to use as `this` in the callback.
-             * @param {boolean=} opt_request If `true` the callback is always async.
              *                               The tile data is requested if not yet loaded.
              * @template T
              * @api
@@ -9791,9 +7665,6 @@ declare module ol {
          * @classdesc
          * Layer source for tile data from WMS servers.
          *
-         * @constructor
-         * @extends {ol.source.TileImage}
-         * @param {olx.source.TileWMSOptions=} opt_options Tile WMS options.
          * @api stable
          */
         class TileWMS extends ol.source.TileImage {
@@ -9801,9 +7672,6 @@ declare module ol {
              * @classdesc
              * Layer source for tile data from WMS servers.
              *
-             * @constructor
-             * @extends {ol.source.TileImage}
-             * @param {olx.source.TileWMSOptions=} opt_options Tile WMS options.
              * @api stable
              */
             constructor(opt_options?: olx.source.TileWMSOptions);
@@ -9812,14 +7680,9 @@ declare module ol {
              * Return the GetFeatureInfo URL for the passed coordinate, resolution, and
              * projection. Return `undefined` if the GetFeatureInfo URL cannot be
              * constructed.
-             * @param {ol.Coordinate} coordinate Coordinate.
-             * @param {number} resolution Resolution.
-             * @param {ol.ProjectionLike} projection Projection.
-             * @param {!Object} params GetFeatureInfo params. `INFO_FORMAT` at least should
              *     be provided. If `QUERY_LAYERS` is not provided then the layers specified
              *     in the `LAYERS` parameter will be used. `VERSION` should not be
              *     specified here.
-             * @return {string|undefined} GetFeatureInfo URL.
              * @api stable
              */
             getGetFeatureInfoUrl(coordinate: ol.Coordinate, resolution: number, projection: ol.ProjectionLike, params: GlobalObject): (string);
@@ -9827,14 +7690,12 @@ declare module ol {
             /**
              * Get the user-provided params, i.e. those passed to the constructor through
              * the "params" option, and possibly updated using the updateParams method.
-             * @return {Object} Params.
              * @api stable
              */
             getParams(): GlobalObject;
 
             /**
              * Update the user-provided params.
-             * @param {Object} params Params.
              * @api stable
              */
             updateParams(params: GlobalObject): void;
@@ -9844,33 +7705,25 @@ declare module ol {
          * @classdesc
          * Base class for sources providing tiles divided into a tile grid over http.
          *
-         * @constructor
          * @fires ol.source.TileEvent
-         * @extends {ol.source.Tile}
-         * @param {ol.SourceUrlTileOptions} options Image tile options.
          */
         class UrlTile extends ol.source.Tile {
             /**
              * @classdesc
              * Base class for sources providing tiles divided into a tile grid over http.
              *
-             * @constructor
              * @fires ol.source.TileEvent
-             * @extends {ol.source.Tile}
-             * @param {ol.SourceUrlTileOptions} options Image tile options.
              */
             constructor(options: ol.SourceUrlTileOptions);
 
             /**
              * Return the tile load function of the source.
-             * @return {ol.TileLoadFunctionType} TileLoadFunction
              * @api
              */
             getTileLoadFunction(): ol.TileLoadFunctionType;
 
             /**
              * Return the tile URL function of the source.
-             * @return {ol.TileUrlFunctionType} TileUrlFunction
              * @api
              */
             getTileUrlFunction(): ol.TileUrlFunctionType;
@@ -9879,36 +7732,30 @@ declare module ol {
              * Return the URLs used for this source.
              * When a tileUrlFunction is used instead of url or urls,
              * null will be returned.
-             * @return {!Array.<string>|null} URLs.
              * @api
              */
             getUrls(): (string[]);
 
             /**
              * Set the tile load function of the source.
-             * @param {ol.TileLoadFunctionType} tileLoadFunction Tile load function.
              * @api
              */
             setTileLoadFunction(tileLoadFunction: ol.TileLoadFunctionType): void;
 
             /**
              * Set the tile URL function of the source.
-             * @param {ol.TileUrlFunctionType} tileUrlFunction Tile URL function.
-             * @param {string=} opt_key Optional new tile key for the source.
              * @api
              */
             setTileUrlFunction(tileUrlFunction: ol.TileUrlFunctionType, opt_key?: string): void;
 
             /**
              * Set the URL to use for requests.
-             * @param {string} url URL.
              * @api stable
              */
             setUrl(url: string): void;
 
             /**
              * Set the URLs to use for requests.
-             * @param {Array.<string>} urls URLs.
              * @api stable
              */
             setUrls(urls: string[]): void;
@@ -9920,10 +7767,7 @@ declare module ol {
          * by this source are suitable for editing. See {@link ol.source.VectorTile} for
          * vector data that is optimized for rendering.
          *
-         * @constructor
-         * @extends {ol.source.Source}
          * @fires ol.source.VectorEvent
-         * @param {olx.source.VectorOptions=} opt_options Vector source options.
          * @api stable
          */
         class Vector extends ol.source.Source {
@@ -9933,10 +7777,7 @@ declare module ol {
              * by this source are suitable for editing. See {@link ol.source.VectorTile} for
              * vector data that is optimized for rendering.
              *
-             * @constructor
-             * @extends {ol.source.Source}
              * @fires ol.source.VectorEvent
-             * @param {olx.source.VectorOptions=} opt_options Vector source options.
              * @api stable
              */
             constructor(opt_options?: olx.source.VectorOptions);
@@ -9945,21 +7786,18 @@ declare module ol {
              * Add a single feature to the source.  If you want to add a batch of features
              * at once, call {@link ol.source.Vector#addFeatures source.addFeatures()}
              * instead.
-             * @param {ol.Feature} feature Feature to add.
              * @api stable
              */
             addFeature(feature: ol.Feature): void;
 
             /**
              * Add a batch of features to the source.
-             * @param {Array.<ol.Feature>} features Features to add.
              * @api stable
              */
             addFeatures(features: ol.Feature[]): void;
 
             /**
              * Remove all features from the source.
-             * @param {boolean=} opt_fast Skip dispatching of {@link removefeature} events.
              * @api stable
              */
             clear(opt_fast?: boolean): void;
@@ -9969,10 +7807,7 @@ declare module ol {
              * with each one.  If the callback returns any "truthy" value, iteration will
              * stop and the function will return the same value.
              *
-             * @param {function(this: T, ol.Feature): S} callback Called with each feature
              *     on the source.  Return a truthy value to stop iteration.
-             * @param {T=} opt_this The object to use as `this` in the callback.
-             * @return {S|undefined} The return value from the last call to the callback.
              * @template T,S
              * @api stable
              */
@@ -9991,11 +7826,7 @@ declare module ol {
              * When `useSpatialIndex` is set to false, this method will loop through all
              * features, equivalent to {@link ol.source.Vector#forEachFeature}.
              *
-             * @param {ol.Extent} extent Extent.
-             * @param {function(this: T, ol.Feature): S} callback Called with each feature
              *     whose bounding box intersects the provided extent.
-             * @param {T=} opt_this The object to use as `this` in the callback.
-             * @return {S|undefined} The return value from the last call to the callback.
              * @template T,S
              * @api
              */
@@ -10010,11 +7841,7 @@ declare module ol {
              * {@link ol.source.Vector#forEachFeatureInExtent
              * source.forEachFeatureInExtent()} method instead.
              *
-             * @param {ol.Extent} extent Extent.
-             * @param {function(this: T, ol.Feature): S} callback Called with each feature
              *     whose geometry intersects the provided extent.
-             * @param {T=} opt_this The object to use as `this` in the callback.
-             * @return {S|undefined} The return value from the last call to the callback.
              * @template T,S
              * @api
              */
@@ -10024,22 +7851,18 @@ declare module ol {
              * Get the features collection associated with this source. Will be `null`
              * unless the source was configured with `useSpatialIndex` set to `false`, or
              * with an {@link ol.Collection} as `features`.
-             * @return {ol.Collection.<ol.Feature>} The collection of features.
              * @api
              */
             getFeaturesCollection(): ol.Collection<ol.Feature>;
 
             /**
              * Get all features on the source.
-             * @return {Array.<ol.Feature>} Features.
              * @api stable
              */
             getFeatures(): ol.Feature[];
 
             /**
              * Get all features whose geometry intersects the provided coordinate.
-             * @param {ol.Coordinate} coordinate Coordinate.
-             * @return {Array.<ol.Feature>} Features.
              * @api stable
              */
             getFeaturesAtCoordinate(coordinate: ol.Coordinate): ol.Feature[];
@@ -10051,8 +7874,6 @@ declare module ol {
              *
              * This method is not available when the source is configured with
              * `useSpatialIndex` set to `false`.
-             * @param {ol.Extent} extent Extent.
-             * @return {Array.<ol.Feature>} Features.
              * @api
              */
             getFeaturesInExtent(extent: ol.Extent): ol.Feature[];
@@ -10062,11 +7883,8 @@ declare module ol {
              *
              * This method is not available when the source is configured with
              * `useSpatialIndex` set to `false`.
-             * @param {ol.Coordinate} coordinate Coordinate.
-             * @param {function(ol.Feature):boolean=} opt_filter Feature filter function.
              *     The filter function will receive one argument, the {@link ol.Feature feature}
              *     and it should return a boolean value. By default, no filtering is made.
-             * @return {ol.Feature} Closest feature.
              * @api stable
              */
             getClosestFeatureToCoordinate(coordinate: ol.Coordinate, opt_filter?: ((feature: ol.Feature) => boolean)): ol.Feature;
@@ -10076,7 +7894,6 @@ declare module ol {
              *
              * This method is not available when the source is configured with
              * `useSpatialIndex` set to `false`.
-             * @return {!ol.Extent} Extent.
              * @api stable
              */
             getExtent(): ol.Extent;
@@ -10086,8 +7903,6 @@ declare module ol {
              * Note that the index treats string and numeric identifiers as the same.  So
              * `source.getFeatureById(2)` will return a feature with id `'2'` or `2`.
              *
-             * @param {string|number} id Feature identifier.
-             * @return {ol.Feature} The feature (or `null` if not found).
              * @api stable
              */
             getFeatureById(id: (string | number)): ol.Feature;
@@ -10095,7 +7910,6 @@ declare module ol {
             /**
              * Get the format associated with this source.
              *
-             * @return {ol.format.Feature|undefined} The feature format.
              * @api
              */
             getFormat(): (ol.format.Feature);
@@ -10103,7 +7917,6 @@ declare module ol {
             /**
              * Get the url associated with this source.
              *
-             * @return {string|ol.FeatureUrlFunction|undefined} The url.
              * @api
              */
             getUrl(): (string | ol.FeatureUrlFunction);
@@ -10112,7 +7925,6 @@ declare module ol {
              * Remove a single feature from the source.  If you want to remove all features
              * at once, use the {@link ol.source.Vector#clear source.clear()} method
              * instead.
-             * @param {ol.Feature} feature Feature to remove.
              * @api stable
              */
             removeFeature(feature: ol.Feature): void;
@@ -10123,11 +7935,6 @@ declare module ol {
          * Events emitted by {@link ol.source.Vector} instances are instances of this
          * type.
          *
-         * @constructor
-         * @extends {ol.events.Event}
-         * @implements {oli.source.VectorEvent}
-         * @param {string} type Type.
-         * @param {ol.Feature=} opt_feature Feature.
          */
         class VectorEvent extends ol.events.Event {
             /**
@@ -10135,17 +7942,11 @@ declare module ol {
              * Events emitted by {@link ol.source.Vector} instances are instances of this
              * type.
              *
-             * @constructor
-             * @extends {ol.events.Event}
-             * @implements {oli.source.VectorEvent}
-             * @param {string} type Type.
-             * @param {ol.Feature=} opt_feature Feature.
              */
             constructor(type: string, opt_feature?: ol.Feature);
 
             /**
              * The feature being added or removed.
-             * @type {ol.Feature|undefined}
              * @api stable
              */
             feature: ol.Feature;
@@ -10161,10 +7962,7 @@ declare module ol {
          * {@link ol.source.Vector} for vector sources that are suitable for feature
          * editing.
          *
-         * @constructor
          * @fires ol.source.TileEvent
-         * @extends {ol.source.UrlTile}
-         * @param {olx.source.VectorTileOptions} options Vector tile options.
          * @api
          */
         class VectorTile extends ol.source.UrlTile {
@@ -10178,31 +7976,23 @@ declare module ol {
              * {@link ol.source.Vector} for vector sources that are suitable for feature
              * editing.
              *
-             * @constructor
              * @fires ol.source.TileEvent
-             * @extends {ol.source.UrlTile}
-             * @param {olx.source.VectorTileOptions} options Vector tile options.
              * @api
              */
             constructor(options: olx.source.VectorTileOptions);
         }
 
-        /**
-         * @namespace ol.source.wms
-         */
         module wms {
             /**
              * Available server types: `'carmentaserver'`, `'geoserver'`, `'mapserver'`,
              *     `'qgis'`. These are servers that have vendor parameters beyond the WMS
              *     specification that OpenLayers can make use of.
-             * @enum {string}
              */
             type ServerType = "carmentaserver" | "geoserver" | "mapserver" | "qgis";
         }
 
         /**
          * Request encoding. One of 'KVP', 'REST'.
-         * @enum {string}
          */
         type WMTSRequestEncoding = "KVP" | "REST";
 
@@ -10210,9 +8000,6 @@ declare module ol {
          * @classdesc
          * Layer source for tile data from WMTS servers.
          *
-         * @constructor
-         * @extends {ol.source.TileImage}
-         * @param {olx.source.WMTSOptions} options WMTS options.
          * @api stable
          */
         class WMTS extends ol.source.TileImage {
@@ -10220,9 +8007,6 @@ declare module ol {
              * @classdesc
              * Layer source for tile data from WMTS servers.
              *
-             * @constructor
-             * @extends {ol.source.TileImage}
-             * @param {olx.source.WMTSOptions} options WMTS options.
              * @api stable
              */
             constructor(options: olx.source.WMTSOptions);
@@ -10231,64 +8015,54 @@ declare module ol {
              * Get the dimensions, i.e. those passed to the constructor through the
              * "dimensions" option, and possibly updated using the updateDimensions
              * method.
-             * @return {!Object} Dimensions.
              * @api
              */
             getDimensions(): GlobalObject;
 
             /**
              * Return the image format of the WMTS source.
-             * @return {string} Format.
              * @api
              */
             getFormat(): string;
 
             /**
              * Return the layer of the WMTS source.
-             * @return {string} Layer.
              * @api
              */
             getLayer(): string;
 
             /**
              * Return the matrix set of the WMTS source.
-             * @return {string} MatrixSet.
              * @api
              */
             getMatrixSet(): string;
 
             /**
              * Return the request encoding, either "KVP" or "REST".
-             * @return {ol.source.WMTSRequestEncoding} Request encoding.
              * @api
              */
             getRequestEncoding(): ol.source.WMTSRequestEncoding;
 
             /**
              * Return the style of the WMTS source.
-             * @return {string} Style.
              * @api
              */
             getStyle(): string;
 
             /**
              * Return the version of the WMTS source.
-             * @return {string} Version.
              * @api
              */
             getVersion(): string;
 
             /**
              * Update the dimensions.
-             * @param {Object} dimensions Dimensions.
              * @api
              */
             updateDimensions(dimensions: GlobalObject): void;
 
             /**
              * Generate source options from a capabilities object.
-             * @param {Object} wmtsCap An object representing the capabilities document.
-             * @param {Object} config Configuration properties for the layer.  Defaults for
              *                  the layer will apply if not provided.
              *
              * Required config properties:
@@ -10305,7 +8079,6 @@ declare module ol {
              *  - style - {string} The name of the style
              *  - format - {string} Image format for the layer. Default is the first
              *       format returned in the GetCapabilities response.
-             * @return {olx.source.WMTSOptions} WMTS source options object.
              * @api
              */
             static optionsFromCapabilities(wmtsCap: GlobalObject, config: GlobalObject): olx.source.WMTSOptions;
@@ -10328,9 +8101,6 @@ declare module ol {
          *    }
          *
          *
-         * @constructor
-         * @extends {ol.source.TileImage}
-         * @param {olx.source.XYZOptions=} opt_options XYZ options.
          * @api stable
          */
         class XYZ extends ol.source.TileImage {
@@ -10351,9 +8121,6 @@ declare module ol {
              *    }
              *
              *
-             * @constructor
-             * @extends {ol.source.TileImage}
-             * @param {olx.source.XYZOptions=} opt_options XYZ options.
              * @api stable
              */
             constructor(opt_options?: olx.source.XYZOptions);
@@ -10363,9 +8130,6 @@ declare module ol {
          * @classdesc
          * Layer source for tile data in Zoomify format.
          *
-         * @constructor
-         * @extends {ol.source.TileImage}
-         * @param {olx.source.ZoomifyOptions=} opt_options Options.
          * @api stable
          */
         class Zoomify extends ol.source.TileImage {
@@ -10373,9 +8137,6 @@ declare module ol {
              * @classdesc
              * Layer source for tile data in Zoomify format.
              *
-             * @constructor
-             * @extends {ol.source.TileImage}
-             * @param {olx.source.ZoomifyOptions=} opt_options Options.
              * @api stable
              */
             constructor(opt_options?: olx.source.ZoomifyOptions);
@@ -10396,7 +8157,6 @@ declare module ol {
         /**
          * Sphere radius.  By default, the radius of the earth is used (Clarke 1866
          * Authalic Sphere).
-         * @type {(number|undefined)}
          * @api
          */
         radius?: number;
@@ -10414,8 +8174,6 @@ declare module ol {
      * var wgs84Sphere= new ol.Sphere(6378137);
      * ```
      *
-     * @constructor
-     * @param {number} radius Radius.
      * @api
      */
     class Sphere {
@@ -10431,8 +8189,6 @@ declare module ol {
          * var wgs84Sphere= new ol.Sphere(6378137);
          * ```
          *
-         * @constructor
-         * @param {number} radius Radius.
          * @api
          */
         constructor(radius: number);
@@ -10445,10 +8201,8 @@ declare module ol {
          * Polygons on a Sphere", JPL Publication 07-03, Jet Propulsion
          * Laboratory, Pasadena, CA, June 2007
          *
-         * @param {Array.<ol.Coordinate>} coordinates List of coordinates of a linear
          * ring. If the ring is oriented clockwise, the area will be positive,
          * otherwise it will be negative.
-         * @return {number} Area.
          * @api
          */
         geodesicArea(coordinates: ol.Coordinate[]): number;
@@ -10456,9 +8210,6 @@ declare module ol {
         /**
          * Returns the distance from c1 to c2 using the haversine formula.
          *
-         * @param {ol.Coordinate} c1 Coordinate 1.
-         * @param {ol.Coordinate} c2 Coordinate 2.
-         * @return {number} Haversine distance.
          * @api
          */
         haversineDistance(c1: ol.Coordinate, c2: ol.Coordinate): number;
@@ -10466,11 +8217,8 @@ declare module ol {
         /**
          * Get the spherical area of a geometry.  This is the area (in meters) assuming
          * that polygon edges are segments of great circles on a sphere.
-         * @param {ol.geom.Geometry} geometry A geometry.
-         * @param {olx.SphereMetricOptions=} opt_options Options for the area
          *     calculation.  By default, geometries are assumed to be in 'EPSG:3857'.
          *     You can change this by providing a `projection` option.
-         * @return {number} The spherical area (in square meters).
          * @api
          */
         static getArea(geometry: geom.Geometry, opt_options?: SphereMetricOptions): number;
@@ -10480,11 +8228,8 @@ declare module ol {
          * great circle distances between coordinates.  For polygons, the length is
          * the sum of all rings.  For points, the length is zero.  For multi-part
          * geometries, the length is the sum of the length of each part.
-         * @param {ol.geom.Geometry} geometry A geometry.
-         * @param {olx.SphereMetricOptions=} opt_options Options for the length
          *     calculation.  By default, geometries are assumed to be in 'EPSG:3857'.
          *     You can change this by providing a `projection` option.
-         * @return {number} The spherical length (in meters).
          * @api
          */
         static getLength(geometry: geom.Geometry, opt_options?: SphereMetricOptions): number;
@@ -10567,8 +8312,6 @@ declare module ol {
      *          styles[ol.geom.GeometryType.POINT]
      *      );
      * ```
-     *
-     * @namespace ol.style
      */
     module style {
         /**
@@ -10583,10 +8326,8 @@ declare module ol {
          * If an application uses many images or very large images, it is recommended
          * to set a higher `size` value to avoid the creation of too many atlases.
          *
-         * @constructor
          * @struct
          * @api
-         * @param {olx.style.AtlasManagerOptions=} opt_options Options.
          */
         class AtlasManager {
             /**
@@ -10601,10 +8342,8 @@ declare module ol {
              * If an application uses many images or very large images, it is recommended
              * to set a higher `size` value to avoid the creation of too many atlases.
              *
-             * @constructor
              * @struct
              * @api
-             * @param {olx.style.AtlasManagerOptions=} opt_options Options.
              */
             constructor(opt_options?: olx.style.AtlasManagerOptions);
         }
@@ -10613,9 +8352,6 @@ declare module ol {
          * @classdesc
          * Set circle style for vector features.
          *
-         * @constructor
-         * @param {olx.style.CircleOptions=} opt_options Options.
-         * @extends {ol.style.Image}
          * @api
          */
         class Circle extends ol.style.Image {
@@ -10623,38 +8359,30 @@ declare module ol {
              * @classdesc
              * Set circle style for vector features.
              *
-             * @constructor
-             * @param {olx.style.CircleOptions=} opt_options Options.
-             * @extends {ol.style.Image}
              * @api
              */
             constructor(opt_options?: olx.style.CircleOptions);
 
             /**
              * Get the fill style for the circle.
-             * @return {ol.style.Fill} Fill style.
              * @api
              */
             getFill(): ol.style.Fill;
 
             /**
              * Get the image used to render the circle.
-             * @param {number} pixelRatio Pixel ratio.
-             * @return {HTMLCanvasElement} Canvas element.
              * @api
              */
             getImage(pixelRatio: number): HTMLCanvasElement;
 
             /**
              * Get the circle radius.
-             * @return {number} Radius.
              * @api
              */
             getRadius(): number;
 
             /**
              * Get the stroke style for the circle.
-             * @return {ol.style.Stroke} Stroke style.
              * @api
              */
             getStroke(): ol.style.Stroke;
@@ -10662,7 +8390,6 @@ declare module ol {
             /**
              * Set the circle radius.
              *
-             * @param {number} radius Circle radius.
              * @api
              */
             setRadius(radius: number): void;
@@ -10672,8 +8399,6 @@ declare module ol {
          * @classdesc
          * Set fill style for vector features.
          *
-         * @constructor
-         * @param {olx.style.FillOptions=} opt_options Options.
          * @api
          */
         class Fill {
@@ -10681,15 +8406,12 @@ declare module ol {
              * @classdesc
              * Set fill style for vector features.
              *
-             * @constructor
-             * @param {olx.style.FillOptions=} opt_options Options.
              * @api
              */
             constructor(opt_options?: olx.style.FillOptions);
 
             /**
              * Get the fill color.
-             * @return {ol.Color|ol.ColorLike} Color.
              * @api
              */
             getColor(): (ol.Color | ol.ColorLike);
@@ -10697,7 +8419,6 @@ declare module ol {
             /**
              * Set the color.
              *
-             * @param {ol.Color|ol.ColorLike} color Color.
              * @api
              */
             setColor(color: (ol.Color | ol.ColorLike)): void;
@@ -10705,13 +8426,11 @@ declare module ol {
 
         /**
          * Icon anchor units. One of 'fraction', 'pixels'.
-         * @enum {string}
          */
         type IconAnchorUnits = "fraction" | "pixels";
 
         /**
          * Icon origin. One of 'bottom-left', 'bottom-right', 'top-left', 'top-right'.
-         * @enum {string}
          */
         type IconOrigin = "bottom-left" | "bottom-right" | "top-left" | "top-right";
 
@@ -10719,9 +8438,6 @@ declare module ol {
          * @classdesc
          * Set icon style for vector features.
          *
-         * @constructor
-         * @param {olx.style.IconOptions=} opt_options Options.
-         * @extends {ol.style.Image}
          * @api
          */
         class Icon extends ol.style.Image {
@@ -10729,9 +8445,6 @@ declare module ol {
              * @classdesc
              * Set icon style for vector features.
              *
-             * @constructor
-             * @param {olx.style.IconOptions=} opt_options Options.
-             * @extends {ol.style.Image}
              * @api
              */
             constructor(opt_options?: olx.style.IconOptions);
@@ -10744,8 +8457,6 @@ declare module ol {
 
             /**
              * Get the image icon.
-             * @param {number} pixelRatio Pixel ratio.
-             * @return {Image|HTMLCanvasElement} Image or Canvas element.
              * @api
              */
             getImage(pixelRatio: number): (Image | HTMLCanvasElement);
@@ -10758,7 +8469,6 @@ declare module ol {
 
             /**
              * Get the image URL.
-             * @return {string|undefined} Image src.
              * @api
              */
             getSrc(): (string);
@@ -10785,8 +8495,6 @@ declare module ol {
          * apps. Base class for {@link ol.style.Icon}, {@link ol.style.Circle} and
          * {@link ol.style.RegularShape}.
          *
-         * @constructor
-         * @param {ol.StyleImageOptions} options Options.
          * @api
          */
         class Image {
@@ -10796,43 +8504,36 @@ declare module ol {
              * apps. Base class for {@link ol.style.Icon}, {@link ol.style.Circle} and
              * {@link ol.style.RegularShape}.
              *
-             * @constructor
-             * @param {ol.StyleImageOptions} options Options.
              * @api
              */
             constructor(options: ol.StyleImageOptions);
 
             /**
              * Get the symbolizer opacity.
-             * @return {number} Opacity.
              * @api
              */
             getOpacity(): number;
 
             /**
              * Determine whether the symbolizer rotates with the map.
-             * @return {boolean} Rotate with map.
              * @api
              */
             getRotateWithView(): boolean;
 
             /**
              * Get the symoblizer rotation.
-             * @return {number} Rotation.
              * @api
              */
             getRotation(): number;
 
             /**
              * Get the symbolizer scale.
-             * @return {number} Scale.
              * @api
              */
             getScale(): number;
 
             /**
              * Determine whether the symbolizer should be snapped to a pixel.
-             * @return {boolean} The symbolizer should snap to a pixel.
              * @api
              */
             getSnapToPixel(): boolean;
@@ -10840,7 +8541,6 @@ declare module ol {
             /**
              * Set the opacity.
              *
-             * @param {number} opacity Opacity.
              * @api
              */
             setOpacity(opacity: number): void;
@@ -10848,7 +8548,6 @@ declare module ol {
             /**
              * Set the rotation.
              *
-             * @param {number} rotation Rotation.
              * @api
              */
             setRotation(rotation: number): void;
@@ -10856,7 +8555,6 @@ declare module ol {
             /**
              * Set the scale.
              *
-             * @param {number} scale Scale.
              * @api
              */
             setScale(scale: number): void;
@@ -10868,9 +8566,6 @@ declare module ol {
          * a regular polygon when `radius` is provided, or a star when `radius1` and
          * `radius2` are provided.
          *
-         * @constructor
-         * @param {olx.style.RegularShapeOptions} options Options.
-         * @extends {ol.style.Image}
          * @api
          */
         class RegularShape extends ol.style.Image {
@@ -10880,9 +8575,6 @@ declare module ol {
              * a regular polygon when `radius` is provided, or a star when `radius1` and
              * `radius2` are provided.
              *
-             * @constructor
-             * @param {olx.style.RegularShapeOptions} options Options.
-             * @extends {ol.style.Image}
              * @api
              */
             constructor(options: olx.style.RegularShapeOptions);
@@ -10895,14 +8587,12 @@ declare module ol {
 
             /**
              * Get the angle used in generating the shape.
-             * @return {number} Shape's rotation in radians.
              * @api
              */
             getAngle(): number;
 
             /**
              * Get the fill style for the shape.
-             * @return {ol.style.Fill} Fill style.
              * @api
              */
             getFill(): ol.style.Fill;
@@ -10921,21 +8611,18 @@ declare module ol {
 
             /**
              * Get the number of points for generating the shape.
-             * @return {number} Number of points for stars and regular polygons.
              * @api
              */
             getPoints(): number;
 
             /**
              * Get the (primary) radius for the shape.
-             * @return {number} Radius.
              * @api
              */
             getRadius(): number;
 
             /**
              * Get the secondary radius for the shape.
-             * @return {number} Radius2.
              * @api
              */
             getRadius2(): number;
@@ -10948,7 +8635,6 @@ declare module ol {
 
             /**
              * Get the stroke style for the shape.
-             * @return {ol.style.Stroke} Stroke style.
              * @api
              */
             getStroke(): ol.style.Stroke;
@@ -10961,8 +8647,6 @@ declare module ol {
          * option is not defined. The `get` functions return whatever was entered in
          * the options; they will not return the default.
          *
-         * @constructor
-         * @param {olx.style.StrokeOptions=} opt_options Options.
          * @api
          */
         class Stroke {
@@ -10973,50 +8657,42 @@ declare module ol {
              * option is not defined. The `get` functions return whatever was entered in
              * the options; they will not return the default.
              *
-             * @constructor
-             * @param {olx.style.StrokeOptions=} opt_options Options.
              * @api
              */
             constructor(opt_options?: olx.style.StrokeOptions);
 
             /**
              * Get the stroke color.
-             * @return {ol.Color|string} Color.
              * @api
              */
             getColor(): (ol.Color | string);
 
             /**
              * Get the line cap type for the stroke.
-             * @return {string|undefined} Line cap.
              * @api
              */
             getLineCap(): (string);
 
             /**
              * Get the line dash style for the stroke.
-             * @return {Array.<number>} Line dash.
              * @api
              */
             getLineDash(): number[];
 
             /**
              * Get the line join type for the stroke.
-             * @return {string|undefined} Line join.
              * @api
              */
             getLineJoin(): (string);
 
             /**
              * Get the miter limit for the stroke.
-             * @return {number|undefined} Miter limit.
              * @api
              */
             getMiterLimit(): (number);
 
             /**
              * Get the stroke width.
-             * @return {number|undefined} Width.
              * @api
              */
             getWidth(): (number);
@@ -11024,7 +8700,6 @@ declare module ol {
             /**
              * Set the color.
              *
-             * @param {ol.Color|string} color Color.
              * @api
              */
             setColor(color: (ol.Color | string)): void;
@@ -11032,7 +8707,6 @@ declare module ol {
             /**
              * Set the line cap.
              *
-             * @param {string|undefined} lineCap Line cap.
              * @api
              */
             setLineCap(lineCap: (string)): void;
@@ -11046,7 +8720,6 @@ declare module ol {
              *
              * [mdn]: https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/setLineDash#Browser_compatibility
              *
-             * @param {Array.<number>} lineDash Line dash.
              * @api
              */
             setLineDash(lineDash: number[]): void;
@@ -11054,7 +8727,6 @@ declare module ol {
             /**
              * Set the line join.
              *
-             * @param {string|undefined} lineJoin Line join.
              * @api
              */
             setLineJoin(lineJoin: (string)): void;
@@ -11062,7 +8734,6 @@ declare module ol {
             /**
              * Set the miter limit.
              *
-             * @param {number|undefined} miterLimit Miter limit.
              * @api
              */
             setMiterLimit(miterLimit: (number)): void;
@@ -11070,7 +8741,6 @@ declare module ol {
             /**
              * Set the width.
              *
-             * @param {number|undefined} width Width.
              * @api
              */
             setWidth(width: (number)): void;
@@ -11082,9 +8752,7 @@ declare module ol {
          * or its children through `set*()` methods will not take effect until the
          * feature or layer that uses the style is re-rendered.
          *
-         * @constructor
          * @struct
-         * @param {olx.style.StyleOptions=} opt_options Style options.
          * @api
          */
         class Style {
@@ -11094,23 +8762,19 @@ declare module ol {
              * or its children through `set*()` methods will not take effect until the
              * feature or layer that uses the style is re-rendered.
              *
-             * @constructor
              * @struct
-             * @param {olx.style.StyleOptions=} opt_options Style options.
              * @api
              */
             constructor(opt_options?: olx.style.StyleOptions);
 
             /**
              * Clones the style.
-             * @return {ol.style.Style} The cloned style.
              * @api
              */
             clone(): ol.style.Style;
 
             /**
              * Get the geometry to be rendered.
-             * @return {string|ol.geom.Geometry|ol.StyleGeometryFunction}
              * Feature property or geometry or function that returns the geometry that will
              * be rendered with this style.
              * @api
@@ -11119,7 +8783,6 @@ declare module ol {
 
             /**
              * Get the function used to generate a geometry for rendering.
-             * @return {!ol.StyleGeometryFunction} Function that is called with a feature
              * and returns the geometry to render instead of the feature's geometry.
              * @api
              */
@@ -11127,42 +8790,36 @@ declare module ol {
 
             /**
              * Get the fill style.
-             * @return {ol.style.Fill} Fill style.
              * @api
              */
             getFill(): ol.style.Fill;
 
             /**
              * Get the image style.
-             * @return {ol.style.Image} Image style.
              * @api
              */
             getImage(): ol.style.Image;
 
             /**
              * Get the stroke style.
-             * @return {ol.style.Stroke} Stroke style.
              * @api
              */
             getStroke(): ol.style.Stroke;
 
             /**
              * Get the text style.
-             * @return {ol.style.Text} Text style.
              * @api
              */
             getText(): ol.style.Text;
 
             /**
              * Get the z-index for the style.
-             * @return {number|undefined} ZIndex.
              * @api
              */
             getZIndex(): (number);
 
             /**
              * Set the fill style.
-             * @param {ol.style.Fill} fill Fill style.
              * @api
              */
             setFill(fill: ol.style.Fill): void;
@@ -11170,7 +8827,6 @@ declare module ol {
             /**
              * Set a geometry that is rendered instead of the feature's geometry.
              *
-             * @param {string|ol.geom.Geometry|ol.StyleGeometryFunction} geometry
              *     Feature property or geometry or function returning a geometry to render
              *     for this style.
              * @api
@@ -11179,21 +8835,18 @@ declare module ol {
 
             /**
              * Set the image style.
-             * @param {ol.style.Image} image Image style.
              * @api
              */
             setImage(image: ol.style.Image): void;
 
             /**
              * Set the stroke style.
-             * @param {ol.style.Stroke} stroke Stroke style.
              * @api
              */
             setStroke(stroke: ol.style.Stroke): void;
 
             /**
              * Set the text style.
-             * @param {ol.style.Text} text Text style.
              * @api
              */
             setText(text: ol.style.Text): void;
@@ -11201,7 +8854,6 @@ declare module ol {
             /**
              * Set the z-index.
              *
-             * @param {number|undefined} zIndex ZIndex.
              * @api
              */
             setZIndex(zIndex: (number)): void;
@@ -11211,8 +8863,6 @@ declare module ol {
          * @classdesc
          * Set text style for vector features.
          *
-         * @constructor
-         * @param {olx.style.TextOptions=} opt_options Options.
          * @api
          */
         class Text {
@@ -11220,85 +8870,72 @@ declare module ol {
              * @classdesc
              * Set text style for vector features.
              *
-             * @constructor
-             * @param {olx.style.TextOptions=} opt_options Options.
              * @api
              */
             constructor(opt_options?: olx.style.TextOptions);
 
             /**
              * Get the font name.
-             * @return {string|undefined} Font.
              * @api
              */
             getFont(): (string);
 
             /**
              * Get the x-offset for the text.
-             * @return {number} Horizontal text offset.
              * @api
              */
             getOffsetX(): number;
 
             /**
              * Get the y-offset for the text.
-             * @return {number} Vertical text offset.
              * @api
              */
             getOffsetY(): number;
 
             /**
              * Get the fill style for the text.
-             * @return {ol.style.Fill} Fill style.
              * @api
              */
             getFill(): ol.style.Fill;
 
             /**
              * Determine whether the text rotates with the map.
-             * @return {boolean|undefined} Rotate with map.
              * @api
              */
             getRotateWithView(): (boolean);
 
             /**
              * Get the text rotation.
-             * @return {number|undefined} Rotation.
              * @api
              */
             getRotation(): (number);
 
             /**
              * Get the text scale.
-             * @return {number|undefined} Scale.
              * @api
              */
             getScale(): (number);
 
             /**
              * Get the stroke style for the text.
-             * @return {ol.style.Stroke} Stroke style.
              * @api
              */
             getStroke(): ol.style.Stroke;
 
             /**
              * Get the text to be rendered.
-             * @return {string|undefined} Text.
              * @api
              */
             getText(): (string);
 
             /**
              * Get the text alignment.
-             * @return {string|undefined} Text align.
              * @api
              */
             getTextAlign(): (string);
 
             /**
              * Get the text baseline.
-             * @return {string|undefined} Text baseline.
              * @api
              */
             getTextBaseline(): (string);
@@ -11306,7 +8943,6 @@ declare module ol {
             /**
              * Set the font.
              *
-             * @param {string|undefined} font Font.
              * @api
              */
             setFont(font: (string)): void;
@@ -11314,7 +8950,6 @@ declare module ol {
             /**
              * Set the x offset.
              *
-             * @param {number} offsetX Horizontal text offset.
              * @api
              */
             setOffsetX(offsetX: number): void;
@@ -11322,7 +8957,6 @@ declare module ol {
             /**
              * Set the y offset.
              *
-             * @param {number} offsetY Vertical text offset.
              * @api
              */
             setOffsetY(offsetY: number): void;
@@ -11330,7 +8964,6 @@ declare module ol {
             /**
              * Set the fill.
              *
-             * @param {ol.style.Fill} fill Fill style.
              * @api
              */
             setFill(fill: ol.style.Fill): void;
@@ -11338,7 +8971,6 @@ declare module ol {
             /**
              * Set the rotation.
              *
-             * @param {number|undefined} rotation Rotation.
              * @api
              */
             setRotation(rotation: (number)): void;
@@ -11346,7 +8978,6 @@ declare module ol {
             /**
              * Set the scale.
              *
-             * @param {number|undefined} scale Scale.
              * @api
              */
             setScale(scale: (number)): void;
@@ -11354,7 +8985,6 @@ declare module ol {
             /**
              * Set the stroke.
              *
-             * @param {ol.style.Stroke} stroke Stroke style.
              * @api
              */
             setStroke(stroke: ol.style.Stroke): void;
@@ -11362,7 +8992,6 @@ declare module ol {
             /**
              * Set the text.
              *
-             * @param {string|undefined} text Text.
              * @api
              */
             setText(text: (string)): void;
@@ -11370,7 +8999,6 @@ declare module ol {
             /**
              * Set the text alignment.
              *
-             * @param {string|undefined} textAlign Text align.
              * @api
              */
             setTextAlign(textAlign: (string)): void;
@@ -11378,7 +9006,6 @@ declare module ol {
             /**
              * Set the text baseline.
              *
-             * @param {string|undefined} textBaseline Text baseline.
              * @api
              */
             setTextBaseline(textBaseline: (string)): void;
@@ -11389,26 +9016,17 @@ declare module ol {
      * @classdesc
      * Base class for tiles.
      *
-     * @constructor
-     * @extends {ol.events.EventTarget}
-     * @param {ol.TileCoord} tileCoord Tile coordinate.
-     * @param {ol.Tile.State} state State.
      */
     class Tile extends ol.events.EventTarget {
         /**
          * @classdesc
          * Base class for tiles.
          *
-         * @constructor
-         * @extends {ol.events.EventTarget}
-         * @param {ol.TileCoord} tileCoord Tile coordinate.
-         * @param {ol.Tile.State} state State.
          */
         constructor(tileCoord: ol.TileCoord, state: ol.Tile.State);
 
         /**
          * Get the tile coordinate for this tile.
-         * @return {ol.TileCoord} The tile coordinate.
          * @api
          */
         getTileCoord(): ol.TileCoord;
@@ -11417,7 +9035,6 @@ declare module ol {
          * Load the image or retry if loading previously failed.
          * Loading is taken care of by the tile queue, and calling this method is
          * only needed for preloading or for reloading in case of an error.
-         * @abstract
          * @api
          */
         load(): void;
@@ -11427,14 +9044,9 @@ declare module ol {
         type State = number;
     }
 
-    /**
-     * @namespace ol.tilegrid
-     */
     module tilegrid {
         /**
          * Creates a tile grid with a standard XYZ tiling scheme.
-         * @param {olx.tilegrid.XYZOptions=} opt_options Tile grid options.
-         * @return {ol.tilegrid.TileGrid} Tile grid instance.
          * @api
          */
         function createXYZ(opt_options?: olx.tilegrid.XYZOptions): ol.tilegrid.TileGrid;
@@ -11444,8 +9056,6 @@ declare module ol {
          * Base class for setting the grid pattern for sources accessing tiled-image
          * servers.
          *
-         * @constructor
-         * @param {olx.tilegrid.TileGridOptions} options Tile grid options.
          * @struct
          * @api stable
          */
@@ -11455,8 +9065,6 @@ declare module ol {
              * Base class for setting the grid pattern for sources accessing tiled-image
              * servers.
              *
-             * @constructor
-             * @param {olx.tilegrid.TileGridOptions} options Tile grid options.
              * @struct
              * @api stable
              */
@@ -11465,46 +9073,36 @@ declare module ol {
             /**
              * Call a function with each tile coordinate for a given extent and zoom level.
              *
-             * @param {ol.Extent} extent Extent.
-             * @param {number} zoom Zoom level.
-             * @param {function(ol.TileCoord)} callback Function called with each tile coordinate.
              * @api
              */
             forEachTileCoord(extent: ol.Extent, zoom: number, callback: ((coords: ol.TileCoord) => any)): void;
 
             /**
              * Get the maximum zoom level for the grid.
-             * @return {number} Max zoom.
              * @api
              */
             getMaxZoom(): number;
 
             /**
              * Get the minimum zoom level for the grid.
-             * @return {number} Min zoom.
              * @api
              */
             getMinZoom(): number;
 
             /**
              * Get the origin for the grid at the given zoom level.
-             * @param {number} z Z.
-             * @return {ol.Coordinate} Origin.
              * @api stable
              */
             getOrigin(z: number): ol.Coordinate;
 
             /**
              * Get the resolution for the given zoom level.
-             * @param {number} z Z.
-             * @return {number} Resolution.
              * @api stable
              */
             getResolution(z: number): number;
 
             /**
              * Get the list of resolutions for the tile grid.
-             * @return {Array.<number>} Resolutions.
              * @api stable
              */
             getResolutions(): number[];
@@ -11512,9 +9110,6 @@ declare module ol {
             /**
              * Get the extent of a tile coordinate.
              *
-             * @param {ol.TileCoord} tileCoord Tile coordinate.
-             * @param {ol.Extent=} opt_extent Temporary extent object.
-             * @return {ol.Extent} Extent.
              * @api
              */
             getTileCoordExtent(tileCoord: ol.TileCoord, opt_extent?: ol.Extent): ol.Extent;
@@ -11524,20 +9119,12 @@ declare module ol {
              * method considers that coordinates that intersect tile boundaries should be
              * assigned the higher tile coordinate.
              *
-             * @param {ol.Coordinate} coordinate Coordinate.
-             * @param {number} resolution Resolution.
-             * @param {ol.TileCoord=} opt_tileCoord Destination ol.TileCoord object.
-             * @return {ol.TileCoord} Tile coordinate.
              * @api
              */
             getTileCoordForCoordAndResolution(coordinate: ol.Coordinate, resolution: number, opt_tileCoord?: ol.TileCoord): ol.TileCoord;
 
             /**
              * Get a tile coordinate given a map coordinate and zoom level.
-             * @param {ol.Coordinate} coordinate Coordinate.
-             * @param {number} z Zoom level.
-             * @param {ol.TileCoord=} opt_tileCoord Destination ol.TileCoord object.
-             * @return {ol.TileCoord} Tile coordinate.
              * @api
              */
             getTileCoordForCoordAndZ(coordinate: ol.Coordinate, z: number, opt_tileCoord?: ol.TileCoord): ol.TileCoord;
@@ -11546,18 +9133,13 @@ declare module ol {
              * Get the tile size for a zoom level. The type of the return value matches the
              * `tileSize` or `tileSizes` that the tile grid was configured with. To always
              * get an `ol.Size`, run the result through `ol.size.toSize()`.
-             * @param {number} z Z.
-             * @return {number|ol.Size} Tile size.
              * @api stable
              */
             getTileSize(z: number): (number | ol.Size);
 
             /**
-             * @param {number} resolution Resolution.
-             * @param {number=} opt_direction If 0, the nearest resolution will be used.
              *     If 1, the nearest lower resolution will be used. If -1, the nearest
              *     higher resolution will be used. Default is 0.
-             * @return {number} Z.
              * @api
              */
             getZForResolution(resolution: number, opt_direction?: number): number;
@@ -11567,9 +9149,6 @@ declare module ol {
          * @classdesc
          * Set the grid pattern for sources accessing WMTS tiled-image servers.
          *
-         * @constructor
-         * @extends {ol.tilegrid.TileGrid}
-         * @param {olx.tilegrid.WMTSOptions} options WMTS options.
          * @struct
          * @api
          */
@@ -11578,9 +9157,6 @@ declare module ol {
              * @classdesc
              * Set the grid pattern for sources accessing WMTS tiled-image servers.
              *
-             * @constructor
-             * @extends {ol.tilegrid.TileGrid}
-             * @param {olx.tilegrid.WMTSOptions} options WMTS options.
              * @struct
              * @api
              */
@@ -11588,27 +9164,20 @@ declare module ol {
 
             /**
              * Get the list of matrix identifiers.
-             * @return {Array.<string>} MatrixIds.
              * @api
              */
             getMatrixIds(): string[];
 
             /**
              * Create a tile grid from a WMTS capabilities matrix set.
-             * @param {Object} matrixSet An object representing a matrixSet in the
              *     capabilities document.
-             * @param {ol.Extent=} opt_extent An optional extent to restrict the tile
              *     ranges the server provides.
-             * @return {ol.tilegrid.WMTS} WMTS tileGrid instance.
              * @api
              */
             static createFromCapabilitiesMatrixSet(matrixSet: GlobalObject, opt_extent?: ol.Extent): ol.tilegrid.WMTS;
         }
     }
 
-    /**
-     * @typedef {string|Array.<string>|ol.Attribution|Array.<ol.Attribution>}
-     */
     type AttributionLike = (string | string[] | ol.Attribution | ol.Attribution[]);
 
     /**
@@ -11619,9 +9188,6 @@ declare module ol {
      * {@link ol.proj.Projection} the image projection. The canvas returned by
      * this function is cached by the source. The this keyword inside the function
      * references the {@link ol.source.ImageCanvas}.
-     *
-     * @typedef {function(this:ol.source.ImageCanvas, ol.Extent, number,
-     *     number, ol.Size, ol.proj.Projection): HTMLCanvasElement}
      */
     type CanvasFunctionType = (extent: ol.Extent, resolution: number, pixelRatio: number, size: ol.Size, proj: ol.proj.Projection) => HTMLCanvasElement;
 
@@ -11630,29 +9196,23 @@ declare module ol {
      * red, green, and blue should be integers in the range 0..255 inclusive.
      * alpha should be a float in the range 0..1 inclusive. If no alpha value is
      * given then `1` will be used.
-     * @typedef {Array.<number>|Uint8Array|Uint8ClampedArray}
      */
     type Color = ([number, number, number, number] | Uint8Array | Uint8ClampedArray);
 
     /**
      * A type accepted by CanvasRenderingContext2D.fillStyle.
      * Represents a color, pattern, or gradient.
-     *
-     * @typedef {string|CanvasPattern|CanvasGradient}
      */
     type ColorLike = (string | CanvasPattern | CanvasGradient);
 
     /**
      * An array of numbers representing an xy coordinate. Example: `[16, 48]`.
-     * @typedef {Array.<number>}
      */
     type Coordinate = [number, number];
 
     /**
      * A function that takes a {@link ol.Coordinate} and transforms it into a
      * `{string}`.
-     *
-     * @typedef {function((ol.Coordinate|undefined)): string}
      */
     type CoordinateFormatType = (coords?: ol.Coordinate) => string;
 
@@ -11660,7 +9220,6 @@ declare module ol {
      * A function that takes a {@link ol.MapBrowserEvent} and two
      * {@link ol.Pixel}s and returns a `{boolean}`. If the condition is met,
      * true should be returned.
-     * @typedef {function(ol.MapBrowserEvent, ol.Pixel, ol.Pixel):boolean}
      */
     type DragBoxEndConditionType = (event: ol.MapBrowserEvent, pixel1: ol.Pixel, pixel2: ol.Pixel) => boolean;
 
@@ -11669,36 +9228,22 @@ declare module ol {
      * arguments, and returns a geometry. The optional existing geometry is the
      * geometry that is returned when the function is called without a second
      * argument.
-     * @typedef {function(!(ol.Coordinate|Array.<ol.Coordinate>|
-     *     Array.<Array.<ol.Coordinate>>), ol.geom.SimpleGeometry=):
-     *     ol.geom.SimpleGeometry}
      */
     type DrawGeometryFunctionType = (coords: (ol.Coordinate | ol.Coordinate[] | ol.Coordinate[][]), geo?: ol.geom.SimpleGeometry) => ol.geom.SimpleGeometry;
 
     /**
      * A function that takes an {@link ol.MapBrowserEvent} and returns a
      * `{boolean}`. If the condition is met, true should be returned.
-     *
-     * @typedef {function(ol.MapBrowserEvent): boolean}
      */
     type EventsConditionType = (event: ol.MapBrowserEvent) => boolean;
 
     /**
      * Key to use with {@link ol.Observable#unByKey}.
-     *
-     * @typedef {{bindTo: (Object|undefined),
-     *     boundListener: (ol.EventsListenerFunctionType|undefined),
-     *     callOnce: boolean,
-     *     deleteIndex: (number|undefined),
-     *     listener: ol.EventsListenerFunctionType,
-     *     target: (EventTarget|ol.events.EventTarget),
-     *     type: string}}
      */
     type EventsKey = Object;
 
     /**
      * An array of numbers representing an extent: `[minx, miny, maxx, maxy]`.
-     * @typedef {Array.<number>}
      */
     type Extent = [number, number, number, number];
 
@@ -11713,8 +9258,6 @@ declare module ol {
      *
      * The function is responsible for loading the features and adding them to the
      * source.
-     * @typedef {function(this:ol.source.Vector, ol.Extent, number,
-     *                    ol.proj.Projection)}
      */
     type FeatureLoader = (extent: ol.Extent, resolution: number, proj: ol.proj.Projection) => void;
 
@@ -11722,9 +9265,6 @@ declare module ol {
      * A function that returns an array of {@link ol.style.Style styles} given a
      * resolution. The `this` keyword inside the function references the
      * {@link ol.Feature} to be styled.
-     *
-     * @typedef {function(this: ol.Feature, number):
-     *     (ol.style.Style|Array.<ol.style.Style>)}
      */
     type FeatureStyleFunction = (resolution: number) => (ol.style.Style | ol.style.Style[]);
 
@@ -11736,7 +9276,6 @@ declare module ol {
      * a `{number}` representing the resolution (map units per pixel) and an
      * {@link ol.proj.Projection} for the projection  as arguments and returns a
      * `{string}` representing the URL.
-     * @typedef {function(ol.Extent, number, ol.proj.Projection) : string}
      */
     type FeatureUrlFunction = (extent: ol.Extent, resolution: number, proj: ol.proj.Projection) => string;
 
@@ -11753,8 +9292,6 @@ declare module ol {
      * Providing a custom `imageLoadFunction` can be useful to load images with
      * post requests or - in general - through XHR requests, where the src of the
      * image element would be set to a data URI when the content is loaded.
-     *
-     * @typedef {function(ol.Image, string)}
      */
     type ImageLoadFunctionType = (image: ol.Image, url: string) => void;
 
@@ -11762,8 +9299,6 @@ declare module ol {
      * A function that takes an {@link ol.Extent} and a resolution as arguments, and
      * returns an array of {@link ol.Extent} with the extents to load. Usually this
      * is one of the standard {@link ol.loadingstrategy} strategies.
-     *
-     * @typedef {function(ol.Extent, number): Array.<ol.Extent>}
      */
     type LoadingStrategy = (extent: ol.Extent, resolution: number) => ol.Extent[];
 
@@ -11772,7 +9307,6 @@ declare module ol {
     /**
      * An array with two elements, representing a pixel. The first element is the
      * x-coordinate, the second the y-coordinate of the pixel.
-     * @typedef {Array.<number>}
      */
     type Pixel = [number, number];
 
@@ -11781,14 +9315,12 @@ declare module ol {
      * with the {@link ol.Map} as first and an optional {@link olx.FrameState} as
      * second argument. Return `true` to keep this function for the next frame,
      * `false` to remove it.
-     * @typedef {function(ol.Map, ?olx.FrameState): boolean}
      */
     type PreRenderFunction = (map: ol.Map, state?: olx.FrameState) => boolean;
 
     /**
      * A projection as {@link ol.proj.Projection}, SRS identifier string or
      * undefined.
-     * @typedef {ol.proj.Projection|string|undefined} ol.ProjectionLike
      */
     type ProjectionLike = (ol.proj.Projection | string | undefined);
 
@@ -11805,9 +9337,6 @@ declare module ol {
      * are called with a second "data" argument, which can be used for storage.  The
      * data object is accessible from raster events, where it can be initialized in
      * "beforeoperations" and accessed again in "afteroperations".
-     *
-     * @typedef {function((Array.<Array.<number>>|Array.<ImageData>), Object):
-     *     (Array.<number>|ImageData)}
      */
     type RasterOperation = (data: (number[][] | ImageData[]), obj: GlobalObject) => (number[] | ImageData);
 
@@ -11815,25 +9344,14 @@ declare module ol {
      * A function that takes an {@link ol.Feature} or {@link ol.render.Feature} and
      * an {@link ol.layer.Layer} and returns `true` if the feature may be selected
      * or `false` otherwise.
-     * @typedef {function((ol.Feature|ol.render.Feature), ol.layer.Layer):
-     *     boolean}
      */
     type SelectFilterFunction = (feature: (ol.Feature | ol.render.Feature), layer: ol.layer.Layer) => boolean;
 
     /**
      * An array of numbers representing a size: `[width, height]`.
-     * @typedef {Array.<number>}
      */
     type Size = [number, number];
 
-    /**
-     * @typedef {{attributions: (ol.AttributionLike|undefined),
-     *            extent: (null|ol.Extent|undefined),
-     *            logo: (string|olx.LogoOptions|undefined),
-     *            projection: ol.ProjectionLike,
-     *            resolutions: (Array.<number>|undefined),
-     *            state: (ol.source.State|undefined)}}
-     */
     interface SourceImageOptions {
         attributions?: ol.AttributionLike;
         extent?: (ol.Extent);
@@ -11843,13 +9361,6 @@ declare module ol {
         state?: ol.source.State;
     }
 
-    /**
-     * @typedef {{attributions: (ol.AttributionLike|undefined),
-     *            logo: (string|olx.LogoOptions|undefined),
-     *            projection: ol.ProjectionLike,
-     *            state: (ol.source.State|undefined),
-     *            wrapX: (boolean|undefined)}}
-     */
     interface SourceSourceOptions {
         attributions?: ol.AttributionLike;
         logo?: (string | olx.LogoOptions);
@@ -11858,22 +9369,6 @@ declare module ol {
         wrapX?: boolean;
     }
 
-    /**
-     * @typedef {{attributions: (ol.AttributionLike|undefined),
-     *            cacheSize: (number|undefined),
-     *            extent: (ol.Extent|undefined),
-     *            logo: (string|olx.LogoOptions|undefined),
-     *            opaque: (boolean|undefined),
-     *            projection: ol.ProjectionLike,
-     *            state: (ol.source.State|undefined),
-     *            tileGrid: (ol.tilegrid.TileGrid|undefined),
-     *            tileLoadFunction: ol.TileLoadFunctionType,
-     *            tilePixelRatio: (number|undefined),
-     *            tileUrlFunction: (ol.TileUrlFunctionType|undefined),
-     *            url: (string|undefined),
-     *            urls: (Array.<string>|undefined),
-     *            wrapX: (boolean|undefined)}}
-     */
     interface SourceUrlTileOptions {
         attributions?: ol.AttributionLike;
         cacheSize?: number;
@@ -11891,18 +9386,6 @@ declare module ol {
         wrapX?: boolean;
     }
 
-    /**
-     * @typedef {{attributions: (ol.AttributionLike|undefined),
-     *            cacheSize: (number|undefined),
-     *            extent: (ol.Extent|undefined),
-     *            logo: (string|olx.LogoOptions|undefined),
-     *            opaque: (boolean|undefined),
-     *            tilePixelRatio: (number|undefined),
-     *            projection: ol.ProjectionLike,
-     *            state: (ol.source.State|undefined),
-     *            tileGrid: (ol.tilegrid.TileGrid|undefined),
-     *            wrapX: (boolean|undefined)}}
-     */
     interface SourceTileOptions {
         attributions?: ol.AttributionLike;
         cacheSize?: number;
@@ -11916,13 +9399,6 @@ declare module ol {
         wrapX?: boolean;
     }
 
-    /**
-     * @typedef {{opacity: number,
-     *            rotateWithView: boolean,
-     *            rotation: number,
-     *            scale: number,
-     *            snapToPixel: boolean}}
-     */
     interface StyleImageOptions {
         opacity: number;
         rotateWithView: boolean;
@@ -11935,33 +9411,24 @@ declare module ol {
      * A function that takes an {@link ol.Feature} and a `{number}` representing
      * the view's resolution. The function should return a {@link ol.style.Style}
      * or an array of them. This way e.g. a vector layer can be styled.
-     *
-     * @typedef {function((ol.Feature|ol.render.Feature), number):
-     *     (ol.style.Style|Array.<ol.style.Style>)}
      */
     type StyleFunction = (feature: (ol.Feature | ol.render.Feature), resolution: number) => (ol.style.Style | ol.style.Style[]);
 
     /**
      * A function that takes an {@link ol.Feature} as argument and returns an
      * {@link ol.geom.Geometry} that will be rendered and styled for the feature.
-     *
-     * @typedef {function((ol.Feature|ol.render.Feature)):
-     *     (ol.geom.Geometry|ol.render.Feature|undefined)}
      */
     type StyleGeometryFunction = (feature: (ol.Feature | ol.render.Feature)) => (ol.geom.Geometry | ol.render.Feature);
 
     /**
      * An array of three numbers representing the location of a tile in a tile
      * grid. The order is `z`, `x`, and `y`. `z` is the zoom level.
-     * @typedef {Array.<number>} ol.TileCoord
      */
     type TileCoord = [number, number, number];
 
     /**
      * A function that takes an {@link ol.Tile} for the tile and a `{string}` for
      * the url as arguments.
-     *
-     * @typedef {function(ol.Tile, string)}
      */
     type TileLoadFunctionType = (tile: ol.Tile, url: string) => void;
 
@@ -11974,9 +9441,6 @@ declare module ol {
      * the projection  as arguments and returns a `{string}` representing the tile
      * URL, or undefined if no tile should be requested for the passed tile
      * coordinate.
-     *
-     * @typedef {function(ol.TileCoord, number,
-     *           ol.proj.Projection): (string|undefined)}
      */
     type TileUrlFunctionType = (coords: ol.TileCoord, pixelRatio: number, proj: ol.proj.Projection) => string;
 
@@ -11985,71 +9449,41 @@ declare module ol {
      * output array, and an optional dimension (default should be 2).  The function
      * transforms the input coordinate values, populates the output array, and
      * returns the output array.
-     *
-     * @typedef {function(Array.<number>, Array.<number>=, number=): Array.<number>}
      */
     type TransformFunction = (array: number[], out?: number[], dimension?: number) => number[];
 
     /**
      * Number of features; bounds/extent.
-     * @typedef {{numberOfFeatures: number,
-     *            bounds: ol.Extent}}
      */
     type WFSFeatureCollectionMetadata = Object;
 
     /**
      * Total deleted; total inserted; total updated; array of insert ids.
-     * @typedef {{totalDeleted: number,
-     *            totalInserted: number,
-     *            totalUpdated: number,
-     *            insertIds: Array.<string>}}
      */
     type WFSTransactionResponse = Object;
 
-    /**
-     * @constructor
-     * @extends {ol.Tile}
-     * @param {ol.TileCoord} tileCoord Tile coordinate.
-     * @param {ol.Tile.State} state State.
-     * @param {string} src Data source url.
-     * @param {ol.format.Feature} format Feature format.
-     * @param {ol.TileLoadFunctionType} tileLoadFunction Tile load function.
-     */
     class VectorTile extends ol.Tile {
-        /**
-         * @constructor
-         * @extends {ol.Tile}
-         * @param {ol.TileCoord} tileCoord Tile coordinate.
-         * @param {ol.Tile.State} state State.
-         * @param {string} src Data source url.
-         * @param {ol.format.Feature} format Feature format.
-         * @param {ol.TileLoadFunctionType} tileLoadFunction Tile load function.
-         */
         constructor(tileCoord: ol.TileCoord, state: ol.Tile.State, src: string, format: ol.format.Feature, tileLoadFunction: ol.TileLoadFunctionType);
 
         /**
          * Get the feature format assigned for reading this tile's features.
-         * @return {ol.format.Feature} Feature format.
          * @api
          */
         getFormat(): ol.format.Feature;
 
         /**
-         * @param {Array.<ol.Feature>} features Features.
          * @api
          */
         setFeatures(features: ol.Feature[]): void;
 
         /**
          * Set the projection of the features that were added with {@link #setFeatures}.
-         * @param {ol.proj.Projection} projection Feature projection.
          * @api
          */
         setProjection(projection: ol.proj.Projection): void;
 
         /**
          * Set the feature loader for reading this tile's features.
-         * @param {ol.FeatureLoader} loader Feature loader.
          * @api
          */
         setLoader(loader: ol.FeatureLoader): void;
@@ -12107,9 +9541,6 @@ declare module ol {
      * The *center constraint* is determined by the `extent` option. By
      * default the center is not constrained at all.
      *
-     * @constructor
-     * @extends {ol.Object}
-     * @param {olx.ViewOptions=} opt_options View options.
      * @api stable
      */
     class View extends ol.Object {
@@ -12165,9 +9596,6 @@ declare module ol {
          * The *center constraint* is determined by the `extent` option. By
          * default the center is not constrained at all.
          *
-         * @constructor
-         * @extends {ol.Object}
-         * @param {olx.ViewOptions=} opt_options View options.
          * @api stable
          */
         constructor(opt_options?: olx.ViewOptions);
@@ -12175,22 +9603,18 @@ declare module ol {
         /**
          * Animate the view. The view's center, zoom (or resolution), and
          * rotation can be animated for smooth transitions between view states.
-         * @param {olx.AnimateOptions} var_args Animation options.
-         * @param {olx.AnimateOptions | (completed: boolean) => void } restArgs
          * @api experimental
          */
         animate(...var_args: Array<olx.animation.AnimateOptions | olx.animation.AnimateCallback>): void;
 
         /**
          * Determine if the view is being animated.
-         * @return {boolean} The view is being animated.
          * @api
          */
         getAnimating(): boolean;
 
         /**
          * Determine if the user is interacting with the view, such as panning or zooming.
-         * @return {boolean} The view is being interacted with.
          * @api
          */
         getInteracting(): boolean;
@@ -12203,34 +9627,24 @@ declare module ol {
 
         /**
          * Get the constrained center of this view.
-         * @param {ol.Coordinate|undefined} center Center.
-         * @return {ol.Coordinate|undefined} Constrained center.
          * @api
          */
         constrainCenter(center?: ol.Coordinate): ol.Coordinate;
 
         /**
          * Get the constrained resolution of this view.
-         * @param {number|undefined} resolution Resolution.
-         * @param {number=} opt_delta Delta. Default is `0`.
-         * @param {number=} opt_direction Direction. Default is `0`.
-         * @return {number|undefined} Constrained resolution.
          * @api
          */
         constrainResolution(resolution?: number, opt_delta?: number, opt_direction?: number): number;
 
         /**
          * Get the constrained rotation of this view.
-         * @param {number|undefined} rotation Rotation.
-         * @param {number=} opt_delta Delta. Default is `0`.
-         * @return {number|undefined} Constrained rotation.
          * @api
          */
         constrainRotation(rotation?: number, opt_delta?: number): number;
 
         /**
          * Get the view center.
-         * @return {ol.Coordinate|undefined} The center of the view.
          * @observable
          * @api stable
          */
@@ -12241,64 +9655,54 @@ declare module ol {
          * The size is the pixel dimensions of the box into which the calculated extent
          * should fit. In most cases you want to get the extent of the entire map,
          * that is `map.getSize()`.
-         * @param {ol.Size=} size Box pixel size.
-         * @return {ol.Extent} Extent.
          * @api stable
          */
         calculateExtent(size?: ol.Size): ol.Extent;
 
         /**
          * Get the maximum resolution of the view.
-         * @return {number} The maximum resolution of the view.
          * @api
          */
         getMaxResolution(): number;
 
         /**
          * Get the minimum resolution of the view.
-         * @return {number} The minimum resolution of the view.
          * @api
          */
         getMinResolution(): number;
 
         /**
          * Get the maximum zoom level for the view.
-         * @return {number} The maximum zoom level.
          * @api
          */
         getMaxZoom(): number;
 
         /**
          * Set a new maximum zoom level for the view.
-         * @param {number} zoom The maximum zoom level.
          * @api stable
          */
         setMaxZoom(zoom: number): void;
 
         /**
          * Get the minimum zoom level for the view.
-         * @return {number} The minimum zoom level.
          * @api
          */
         getMinZoom(): number;
 
         /**
          * Set a new minimum zoom level for the view.
-         * @param {number} zoom The minimum zoom level.
          * @api stable
          */
         setMinZoom(zoom: number): void;
 
         /**
          * Get the view projection.
-         * @return {ol.proj.Projection} The projection of the view.
          * @api stable
          */
         getProjection(): ol.proj.Projection;
 
         /**
          * Get the view resolution.
-         * @return {number|undefined} The resolution of the view.
          * @observable
          * @api stable
          */
@@ -12307,16 +9711,12 @@ declare module ol {
         /**
          * Get the resolutions for the view. This returns the array of resolutions
          * passed to the constructor of the {ol.View}, or undefined if none were given.
-         * @return {Array.<number>|undefined} The resolutions of the view.
          * @api stable
          */
         getResolutions(): number[];
 
         /**
          * Get the resolution for a provided extent (in map units) and size (in pixels).
-         * @param {ol.Extent} extent Extent.
-         * @param {ol.Size=} opt_size Box pixel size.
-         * @return {number} The resolution at which the provided extent will render at
          *     the given size.
          * @api
          */
@@ -12324,7 +9724,6 @@ declare module ol {
 
         /**
          * Get the view rotation.
-         * @return {number} The rotation of the view in radians.
          * @observable
          * @api stable
          */
@@ -12334,23 +9733,18 @@ declare module ol {
          * Get the current zoom level.  If you configured your view with a resolutions
          * array (this is rare), this method may return non-integer zoom levels (so
          * the zoom level is not safe to use as an index into a resolutions array).
-         * @return {number|undefined} Zoom.
          * @api
          */
         getZoom(): number;
 
         /**
          * Get the zoom level for a resolution.
-         * @param {number} resolution The resolution.
-         * @return {number|undefined} The zoom level for the provided resolution.
          * @api
          */
         getZoomForResolution(resolution: number): number;
 
         /**
          * Get the resolution for a zoom level.
-         * @param {number} zoom Zoom level.
-         * @return {number} The view resolution for the provided zoom level.
          * @api
          */
         getResolutionForZoom(zoom: number): number;
@@ -12360,32 +9754,24 @@ declare module ol {
          * The size is pixel dimensions of the box to fit the extent into.
          * In most cases you will want to use the map size, that is `map.getSize()`.
          * Takes care of the map angle.
-         * @param {ol.geom.SimpleGeometry|ol.Extent} geometry Geometry.
-         * @param {olx.view.FitOptions=} opt_options Options.
          * @api
          */
         fit(geometryOrExtent: (ol.geom.SimpleGeometry | ol.Extent), opt_options?: olx.view.FitOptions): void;
 
         /**
          * Center on coordinate and view position.
-         * @param {ol.Coordinate} coordinate Coordinate.
-         * @param {ol.Size} size Box pixel size.
-         * @param {ol.Pixel} position Position on the view to center on.
          * @api
          */
         centerOn(coordinate: ol.Coordinate, size: ol.Size, position: ol.Pixel): void;
 
         /**
          * Rotate the view around a given coordinate.
-         * @param {number} rotation New rotation value for the view.
-         * @param {ol.Coordinate=} opt_anchor The rotation center.
          * @api stable
          */
         rotate(rotation: number, opt_anchor?: ol.Coordinate): void;
 
         /**
          * Set the center of the current view.
-         * @param {ol.Coordinate|undefined} center The center of the view.
          * @observable
          * @api stable
          */
@@ -12393,7 +9779,6 @@ declare module ol {
 
         /**
          * Set the resolution for this view.
-         * @param {number|undefined} resolution The resolution of the view.
          * @observable
          * @api stable
          */
@@ -12401,7 +9786,6 @@ declare module ol {
 
         /**
          * Set the rotation for this view.
-         * @param {number} rotation The rotation of the view in radians.
          * @observable
          * @api stable
          */
@@ -12409,27 +9793,14 @@ declare module ol {
 
         /**
          * Zoom to a specific zoom level.
-         * @param {number} zoom Zoom level.
          * @api stable
          */
         setZoom(zoom: number): void;
     }
 }
 
-/**
- * @namespace olx
- */
 declare module olx {
-    /**
-     * @namespace olx.animation
-     */
     module animation {
-        /**
-         * @typedef {{resolution: number,
-         *     start: (number|undefined),
-         *     duration: (number|undefined),
-         *     easing: (function(number):number|undefined)}}
-         */
         interface BounceOptions {
             resolution: number;
             start?: number;
@@ -12437,12 +9808,6 @@ declare module olx {
             easing?: ((t: number) => number);
         }
 
-        /**
-         * @typedef {{source: ol.Coordinate,
-         *     start: (number|undefined),
-         *     duration: (number|undefined),
-         *     easing: (function(number):number|undefined)}}
-         */
         interface PanOptions {
             source: ol.Coordinate;
             start?: number;
@@ -12450,13 +9815,6 @@ declare module olx {
             easing?: ((t: number) => number);
         }
 
-        /**
-         * @typedef {{rotation: (number|undefined),
-         *     anchor: (ol.Coordinate|undefined),
-         *     start: (number|undefined),
-         *     duration: (number|undefined),
-         *     easing: (function(number):number|undefined)}}
-         */
         interface RotateOptions {
             rotation?: number;
             anchor?: ol.Coordinate;
@@ -12465,12 +9823,6 @@ declare module olx {
             easing?: ((t: number) => number);
         }
 
-        /**
-         * @typedef {{resolution: number,
-         *     start: (number|undefined),
-         *     duration: (number|undefined),
-         *     easing: (function(number):number|undefined)}}
-         */
         interface ZoomOptions {
             resolution: number;
             start?: number;
@@ -12498,20 +9850,7 @@ declare module olx {
         type AnimateCallback = (completed: boolean) => void;
     }
 
-    /**
-     * @namespace olx.control
-     */
     module control {
-        /**
-         * @typedef {{className: (string|undefined),
-         *     collapsible: (boolean|undefined),
-         *     collapsed: (boolean|undefined),
-         *     tipLabel: (string|undefined),
-         *     label: (string|Node|undefined),
-         *     collapseLabel: (string|Node|undefined),
-         *     render: (function(ol.MapEvent)|undefined),
-         *     target: (Element|undefined)}}
-         */
         interface AttributionOptions {
             className?: string;
             target?: Element;
@@ -12523,25 +9862,12 @@ declare module olx {
             render?: ((event: ol.MapEvent) => any);
         }
 
-        /**
-         * @typedef {{element: (Element|undefined),
-         *     render: (function(ol.MapEvent)|undefined),
-         *     target: (Element|string|undefined)}}
-         */
         interface ControlOptions {
             element?: Element;
             render?: ((event: ol.MapEvent) => any);
             target?: (Element | string);
         }
 
-        /**
-         * @typedef {{attribution: (boolean|undefined),
-         *     attributionOptions: (olx.control.AttributionOptions|undefined),
-         *     rotate: (boolean|undefined),
-         *     rotateOptions: (olx.control.RotateOptions|undefined),
-         *     zoom: (boolean|undefined),
-         *     zoomOptions: (olx.control.ZoomOptions|undefined)}}
-         */
         interface DefaultsOptions {
             attribution?: boolean;
             attributionOptions?: olx.control.AttributionOptions;
@@ -12551,15 +9877,6 @@ declare module olx {
             zoomOptions?: olx.control.ZoomOptions;
         }
 
-        /**
-         * @typedef {{className: (string|undefined),
-         *     label: (string|Node|undefined),
-         *     labelActive: (string|Node|undefined),
-         *     tipLabel: (string|undefined),
-         *     keys: (boolean|undefined),
-         *     target: (Element|undefined),
-         *     source: (Element|string|undefined)}}
-         */
         interface FullScreenOptions {
             className?: string;
             label?: (string | Node);
@@ -12570,14 +9887,6 @@ declare module olx {
             source?: (Element | string);
         }
 
-        /**
-         * @typedef {{className: (string|undefined),
-         *     coordinateFormat: (ol.CoordinateFormatType|undefined),
-         *     projection: ol.ProjectionLike,
-         *     render: (function(ol.MapEvent)|undefined),
-         *     target: (Element|undefined),
-         *     undefinedHTML: (string|undefined)}}
-         */
         interface MousePositionOptions {
             className?: string;
             coordinateFormat?: ol.CoordinateFormatType;
@@ -12587,17 +9896,6 @@ declare module olx {
             undefinedHTML?: string;
         }
 
-        /**
-         * @typedef {{collapsed: (boolean|undefined),
-         *     collapseLabel: (string|Node|undefined),
-         *     collapsible: (boolean|undefined),
-         *     label: (string|Node|undefined),
-         *     layers: (Array.<ol.layer.Layer>|ol.Collection.<ol.layer.Layer>|undefined),
-         *     render: (function(ol.MapEvent)|undefined),
-         *     target: (Element|undefined),
-         *     tipLabel: (string|undefined),
-         *     view: (ol.View|undefined)}}
-         */
         interface OverviewMapOptions {
             collapsed?: boolean;
             collapseLabel?: (string | Node);
@@ -12610,13 +9908,6 @@ declare module olx {
             view?: ol.View;
         }
 
-        /**
-         * @typedef {{className: (string|undefined),
-         *     minWidth: (number|undefined),
-         *     render: (function(ol.MapEvent)|undefined),
-         *     target: (Element|undefined),
-         *     units: (ol.control.ScaleLine.Units|string|undefined)}}
-         */
         interface ScaleLineOptions {
             className?: string;
             minWidth?: number;
@@ -12625,16 +9916,6 @@ declare module olx {
             units?: (ol.control.ScaleLine.Units | string);
         }
 
-        /**
-         * @typedef {{duration: (number|undefined),
-         *     className: (string|undefined),
-         *     label: (string|Element|undefined),
-         *     tipLabel: (string|undefined),
-         *     target: (Element|undefined),
-         *     render: (function(ol.MapEvent)|undefined),
-         *     resetNorth: (function()|undefined),
-         *     autoHide: (boolean|undefined)}}
-         */
         interface RotateOptions {
             className?: string;
             label?: (string | Element);
@@ -12646,16 +9927,6 @@ declare module olx {
             target?: Element;
         }
 
-        /**
-         * @typedef {{duration: (number|undefined),
-         *     className: (string|undefined),
-         *     zoomInLabel: (string|Node|undefined),
-         *     zoomOutLabel: (string|Node|undefined),
-         *     zoomInTipLabel: (string|undefined),
-         *     zoomOutTipLabel: (string|undefined),
-         *     delta: (number|undefined),
-         *     target: (Element|undefined)}}
-         */
         interface ZoomOptions {
             duration?: number;
             className?: string;
@@ -12667,13 +9938,6 @@ declare module olx {
             target?: Element;
         }
 
-        /**
-         * @typedef {{className: (string|undefined),
-         *     duration: (number|undefined),
-         *     maxResolution: (number|undefined),
-         *     minResolution: (number|undefined),
-         *     render: (function(ol.MapEvent)|undefined)}}
-         */
         interface ZoomSliderOptions {
             className?: string;
             duration?: number;
@@ -12682,13 +9946,6 @@ declare module olx {
             render?: ((event: ol.MapEvent) => any);
         }
 
-        /**
-         * @typedef {{className: (string|undefined),
-         *     target: (Element|undefined),
-         *     label: (string|Node|undefined),
-         *     tipLabel: (string|undefined),
-         *     extent: (ol.Extent|undefined)}}
-         */
         interface ZoomToExtentOptions {
             className?: string;
             target?: Element;
@@ -12698,26 +9955,12 @@ declare module olx {
         }
     }
 
-    /**
-     * @namespace olx.format
-     */
     module format {
-        /**
-         * @typedef {{dataProjection: ol.ProjectionLike,
-         *     featureProjection: ol.ProjectionLike,
-         *     rightHanded: (boolean|undefined)}}
-         */
         interface ReadOptions {
             dataProjection: ol.ProjectionLike;
             featureProjection: ol.ProjectionLike;
         }
 
-        /**
-         * @typedef {{dataProjection: ol.ProjectionLike,
-         *     featureProjection: ol.ProjectionLike,
-         *     rightHanded: (boolean|undefined),
-         *     decimals: (number|undefined)}}
-         */
         interface WriteOptions {
             dataProjection: ol.ProjectionLike;
             featureProjection?: ol.ProjectionLike;
@@ -12725,32 +9968,16 @@ declare module olx {
             decimals?: number;
         }
 
-        /**
-         * @typedef {{defaultDataProjection: ol.ProjectionLike,
-         *     geometryName: (string|undefined)}}
-         */
         interface GeoJSONOptions {
             defaultDataProjection: ol.ProjectionLike;
             featureProjection: ol.ProjectionLike;
             geometryName?: string;
         }
 
-        /**
-         * @typedef {{geometryName: (string|undefined)}}
-         */
         interface EsriJSONOptions {
             geometryName?: string;
         }
 
-        /**
-         * @typedef {{featureClass: (function((ol.geom.Geometry|Object.<string, *>)=)|
-         *         function(ol.geom.GeometryType,Array.<number>,
-         *             (Array.<number>|Array.<Array.<number>>),Object.<string, *>)|
-         *         undefined),
-         *     geometryName: (string|undefined),
-         *     layers: (Array.<string>|undefined),
-         *     layerName: (string|undefined)}}
-         */
         interface MVTOptions {
             featureClass?: (((geom: (ol.geom.Geometry | { [k: string]: any })) => any) | ((geom: ol.geom.GeometryType, arg2: number[],
                            arg3: (number[] | number[][]),
@@ -12760,36 +9987,20 @@ declare module olx {
             layers?: string[];
         }
 
-        /**
-         * @typedef {{factor: (number|undefined),
-         *     geometryLayout: (ol.geom.GeometryLayout|undefined)}}
-         */
         interface PolylineOptions {
             factor?: number;
             geometryLayout?: ol.geom.GeometryLayout;
         }
 
-        /**
-         * @typedef {{defaultDataProjection: ol.ProjectionLike}}
-         */
         interface TopoJSONOptions {
             defaultDataProjection: ol.ProjectionLike;
         }
 
-        /**
-         * @typedef {{altitudeMode: (ol.format.IGCZ|undefined)}}
-         */
         /* tslint:disable-next-line:interface-name */
         interface IGCOptions {
             altitudeMode?: ol.format.IGCZ;
         }
 
-        /**
-         * @typedef {{extractStyles: (boolean|undefined),
-         *     defaultStyle: (Array.<ol.style.Style>|undefined),
-         *     showPointNames: (boolean|undefined),
-         *     writeStyles: (boolean|undefined)}}
-         */
         interface KMLOptions {
             extractStyles?: boolean;
             showPointNames?: boolean;
@@ -12797,16 +10008,6 @@ declare module olx {
             writeStyles?: boolean;
         }
 
-        /**
-         * @typedef {{featureNS: (Object.<string, string>|string|undefined),
-         *     featureType: (Array.<string>|string|undefined),
-         *     srsName: string,
-         *     surface: (boolean|undefined),
-         *     curve: (boolean|undefined),
-         *     multiCurve: (boolean|undefined),
-         *     multiSurface: (boolean|undefined),
-         *     schemaLocation: (string|undefined)}}
-         */
         interface GMLOptions {
             featureNS?: ({ [k: string]: string } | string);
             featureType?: (string[] | string);
@@ -12818,19 +10019,10 @@ declare module olx {
             schemaLocation?: string;
         }
 
-        /**
-         * @typedef {{readExtensions: (function(ol.Feature, Node)|undefined)}}
-         */
         interface GPXOptions {
             readExtensions?: ((feature: ol.Feature, node: Node) => any);
         }
 
-        /**
-         * @typedef {{featureNS: (Object.<string, string>|string|undefined),
-         *     featureType: (Array.<string>|string|undefined),
-         *     gmlFormat: (ol.format.GMLBase|undefined),
-         *     schemaLocation: (string|undefined)}}
-         */
         interface WFSOptions {
             featureNS?: ({ [k: string]: string } | string);
             featureType?: (string[] | string);
@@ -12838,22 +10030,6 @@ declare module olx {
             schemaLocation?: string;
         }
 
-        /**
-         * @typedef {{featureNS: string,
-         *     featurePrefix: string,
-         *     featureTypes: Array.<string>,
-         *     srsName: (string|undefined),
-         *     handle: (string|undefined),
-         *     outputFormat: (string|undefined),
-         *     maxFeatures: (number|undefined),
-         *     geometryName: (string|undefined),
-         *     propertyNames: (Array.<string>|undefined),
-         *     startIndex: (number|undefined),
-         *     count: (number|undefined),
-         *     bbox: (ol.Extent|undefined),
-         *     filter: (ol.format.ogc.filter.Filter|undefined),
-         *     resultType: (string|undefined)}}
-         */
         interface WFSWriteGetFeatureOptions {
             featureNS: string;
             featurePrefix: string;
@@ -12871,15 +10047,6 @@ declare module olx {
             resultType?: string;
         }
 
-        /**
-         * @typedef {{featureNS: string,
-         *     featurePrefix: string,
-         *     featureType: string,
-         *     srsName: (string|undefined),
-         *     handle: (string|undefined),
-         *     nativeElements: Array.<Object>,
-         *     gmlOptions: (olx.format.GMLOptions|undefined)}}
-         */
         interface WFSWriteTransactionOptions {
             featureNS: string;
             featurePrefix: string;
@@ -12890,47 +10057,22 @@ declare module olx {
             gmlOptions?: olx.format.GMLOptions;
         }
 
-        /**
-         * @typedef {{splitCollection: (boolean|undefined)}}
-         */
         interface WKTOptions {
             splitCollection?: boolean;
         }
 
-        /**
-         * @typedef {{
-         *     layers: (Array.<string>|undefined)
-         * }}
-         */
         interface WMSGetFeatureInfoOptions {
             layers?: string[];
         }
     }
 
-    /**
-     * @namespace olx.interaction
-     */
     module interaction {
-        /**
-         * Object literal with config options for interactions.
-         * @typedef {{handleEvent: function(ol.MapBrowserEvent):boolean}}
-         */
         interface InteractionOptions {
             handleEvent: (event: ol.MapBrowserEvent) => boolean;
         }
 
         /**
          * Interactions for the map. Default is `true` for all options.
-         * @typedef {{altShiftDragRotate: (boolean|undefined),
-         *     doubleClickZoom: (boolean|undefined),
-         *     keyboard: (boolean|undefined),
-         *     mouseWheelZoom: (boolean|undefined),
-         *     shiftDragZoom: (boolean|undefined),
-         *     dragPan: (boolean|undefined),
-         *     pinchRotate: (boolean|undefined),
-         *     pinchZoom: (boolean|undefined),
-         *     zoomDelta: (number|undefined),
-         *     zoomDuration: (number|undefined)}}
          */
         interface DefaultsOptions {
             altShiftDragRotate?: boolean;
@@ -12946,21 +10088,11 @@ declare module olx {
             zoomDuration?: number;
         }
 
-        /**
-         * @typedef {{duration: (number|undefined),
-         *     delta: (number|undefined)}}
-         */
         interface DoubleClickZoomOptions {
             duration?: number;
             delta?: number;
         }
 
-        /**
-         * @typedef {{formatConstructors: (Array.<function(new: ol.format.Feature)>|undefined),
-         *     projection: ol.ProjectionLike,
-         *     target: (Element|undefined),
-         *     source: (ol.source.Vector|undefined)}}
-         */
         interface DragAndDropOptions {
             formatConstructors?: Array<((n: ol.format.Feature) => any)>;
             projection: ol.ProjectionLike;
@@ -12968,12 +10100,6 @@ declare module olx {
             source?: ol.source.Vector;
         }
 
-        /**
-         * @typedef {{className: (string|undefined),
-         *     condition: (ol.EventsConditionType|undefined),
-         *     minArea: (number|undefined),
-         *     boxEndCondition: (ol.DragBoxEndConditionType|undefined)}}
-         */
         interface DragBoxOptions {
             className?: string;
             condition?: ol.EventsConditionType;
@@ -12981,39 +10107,21 @@ declare module olx {
             boxEndCondition?: ol.DragBoxEndConditionType;
         }
 
-        /**
-         * @typedef {{condition: (ol.EventsConditionType|undefined),
-         *     kinetic: (ol.Kinetic|undefined)}}
-         */
         interface DragPanOptions {
             condition?: ol.EventsConditionType;
             kinetic?: ol.Kinetic;
         }
 
-        /**
-         * @typedef {{condition: (ol.EventsConditionType|undefined),
-         *     duration: (number|undefined)}}
-         */
         interface DragRotateAndZoomOptions {
             condition?: ol.EventsConditionType;
             duration?: number;
         }
 
-        /**
-         * @typedef {{condition: (ol.EventsConditionType|undefined),
-         *     duration: (number|undefined)}}
-         */
         interface DragRotateOptions {
             condition?: ol.EventsConditionType;
             duration?: number;
         }
 
-        /**
-         * @typedef {{className: (string|undefined),
-         *     condition: (ol.EventsConditionType|undefined),
-         *     duration: (number|undefined),
-         *     out: (boolean|undefined)}}
-         */
         interface DragZoomOptions {
             className?: string;
             condition?: ol.EventsConditionType;
@@ -13021,23 +10129,6 @@ declare module olx {
             out?: boolean;
         }
 
-        /**
-         * @typedef {{clickTolerance: (number|undefined),
-         *     features: (ol.Collection.<ol.Feature>|undefined),
-         *     source: (ol.source.Vector|undefined),
-         *     snapTolerance: (number|undefined),
-         *     type: ol.geom.GeometryType,
-         *     maxPoints: (number|undefined),
-         *     minPoints: (number|undefined),
-         *     finishCondition: (ol.EventsConditionType|undefined),
-         *     style: (ol.style.Style|Array.<ol.style.Style>|ol.StyleFunction|undefined),
-         *     geometryFunction: (ol.DrawGeometryFunctionType|undefined),
-         *     geometryName: (string|undefined),
-         *     condition: (ol.EventsConditionType|undefined),
-         *     freehandCondition: (ol.EventsConditionType|undefined),
-         *     freehand: (boolean|undefined)
-         *     wrapX: (boolean|undefined)}}
-         */
         interface DrawOptions {
             clickTolerance?: number;
             features?: ol.Collection<ol.Feature>;
@@ -13056,49 +10147,23 @@ declare module olx {
             wrapX?: boolean;
         }
 
-        /**
-         * @typedef {{
-         *     features: (ol.Collection.<ol.Feature>|undefined),
-         *     layers: (undefined|Array.<ol.layer.Layer>|function(ol.layer.Layer): boolean)
-         * }}
-         */
         interface TranslateOptions {
             features?: ol.Collection<ol.Feature>;
             layers?: (ol.layer.Layer[] | ((layer: ol.layer.Layer) => boolean));
         }
 
-        /**
-         * @typedef {{condition: (ol.EventsConditionType|undefined),
-         *     duration: (number|undefined),
-         *     pixelDelta: (number|undefined)}}
-         */
         interface KeyboardPanOptions {
             condition?: ol.EventsConditionType;
             duration?: number;
             pixelDelta?: number;
         }
 
-        /**
-         * @typedef {{duration: (number|undefined),
-         *     condition: (ol.EventsConditionType|undefined),
-         *     delta: (number|undefined)}}
-         */
         interface KeyboardZoomOptions {
             duration?: number;
             condition?: ol.EventsConditionType;
             delta?: number;
         }
 
-        /**
-         * @typedef {{condition: (ol.EventsConditionType|undefined),
-         *     deleteCondition: (ol.EventsConditionType|undefined),
-         *     insertVertexCondition: (ol.EventsConditionType|undefined),
-         *     pixelTolerance: (number|undefined),
-         *     style: (ol.style.Style|Array.<ol.style.Style>|ol.StyleFunction|undefined),
-         *     features: (ol.Collection.<ol.Feature>|undefined),
-         *     wrapX: (boolean|undefined),
-         *     source: (ol.source.Vector|undefined)}}
-         */
         interface ModifyOptions {
             condition?: ol.EventsConditionType;
             deleteCondition?: ol.EventsConditionType;
@@ -13110,12 +10175,6 @@ declare module olx {
             source?: ol.source.Vector;
         }
 
-        /**
-         * @typedef {{constrainResolution: (boolean|undefined),
-         *     duration: (number|undefined),
-         *     timeout: (number|undefined),
-         *     useAnchor: (boolean|undefined)}}
-         */
         interface MouseWheelZoomOptions {
             constrainResolution?: boolean;
             duration?: number;
@@ -13123,31 +10182,16 @@ declare module olx {
             useAnchor?: boolean;
         }
 
-        /**
-         * @typedef {{threshold: (number|undefined),
-         *     duration: (number|undefined)}}
-         */
         interface PinchRotateOptions {
             duration?: number;
             threshold?: number;
         }
 
-        /**
-         * @typedef {{constrainResolution: (boolean|undefined)
-         *     duration: (number|undefined)}}
-         */
         interface PinchZoomOptions {
             constrainResolution?: boolean;
             duration?: number;
         }
 
-        /**
-         * @typedef {{handleDownEvent: (function(ol.MapBrowserPointerEvent):boolean|undefined),
-         *     handleDragEvent: (function(ol.MapBrowserPointerEvent)|undefined),
-         *     handleEvent: (function(ol.MapBrowserEvent):boolean|undefined),
-         *     handleMoveEvent: (function(ol.MapBrowserPointerEvent)|undefined),
-         *     handleUpEvent: (function(ol.MapBrowserPointerEvent):boolean|undefined)}}
-         */
         interface PointerOptions {
             handleDownEvent?: ((event: ol.MapBrowserPointerEvent) => boolean);
             handleDragEvent?: ((event: ol.MapBrowserPointerEvent) => boolean);
@@ -13156,19 +10200,6 @@ declare module olx {
             handleUpEvent?: ((event: ol.MapBrowserPointerEvent) => boolean);
         }
 
-        /**
-         * @typedef {{addCondition: (ol.EventsConditionType|undefined),
-         *     condition: (ol.EventsConditionType|undefined),
-         *     layers: (undefined|Array.<ol.layer.Layer>|function(ol.layer.Layer): boolean),
-         *     style: (ol.style.Style|Array.<ol.style.Style>|ol.StyleFunction|undefined),
-         *     removeCondition: (ol.EventsConditionType|undefined),
-         *     toggleCondition: (ol.EventsConditionType|undefined),
-         *     multi: (boolean|undefined),
-         *     features: (ol.Collection.<ol.Feature>|undefined),
-         *     filter: (ol.SelectFilterFunction|undefined),
-         *     wrapX: (boolean|undefined),
-         *     hitTolerance: (number|undefined)}}
-         */
         interface SelectOptions {
             addCondition?: ol.EventsConditionType;
             condition?: ol.EventsConditionType;
@@ -13185,13 +10216,6 @@ declare module olx {
 
         /**
          * Options for snap
-         * @typedef {{
-         *     features: (ol.Collection.<ol.Feature>|undefined),
-         *     pixelTolerance: (number|undefined),
-         *     source: (ol.source.Vector|undefined),
-         *     edge: (boolean|undefined),
-         *     vertex: (boolean|undefined)
-         * }}
          */
         interface SnapOptions {
             features?: ol.Collection<ol.Feature>;
@@ -13202,18 +10226,7 @@ declare module olx {
         }
     }
 
-    /**
-     * @namespace olx.layer
-     */
     module layer {
-        /**
-         * @typedef {{opacity: (number|undefined),
-         *     visible: (boolean|undefined),
-         *     extent: (ol.Extent|undefined),
-         *     zIndex: (number|undefined),
-         *     minResolution: (number|undefined),
-         *     maxResolution: (number|undefined)}}
-         */
         interface BaseOptions {
             opacity?: number;
             visible?: boolean;
@@ -13223,15 +10236,6 @@ declare module olx {
             maxResolution?: number;
         }
 
-        /**
-         * @typedef {{opacity: (number|undefined),
-         *     source: (ol.source.Source|undefined),
-         *     visible: (boolean|undefined),
-         *     extent: (ol.Extent|undefined),
-         *     zIndex: (number|undefined),
-         *     minResolution: (number|undefined),
-         *     maxResolution: (number|undefined)}}
-         */
         interface LayerOptions {
             opacity?: number;
             source?: ol.source.Source;
@@ -13242,15 +10246,6 @@ declare module olx {
             maxResolution?: number;
         }
 
-        /**
-         * @typedef {{opacity: (number|undefined),
-         *     visible: (boolean|undefined),
-         *     extent: (ol.Extent|undefined),
-         *     zIndex: (number|undefined),
-         *     minResolution: (number|undefined),
-         *     maxResolution: (number|undefined),
-         *     layers: (Array.<ol.layer.Base>|ol.Collection.<ol.layer.Base>|undefined)}}
-         */
         interface GroupOptions {
             opacity?: number;
             visible?: boolean;
@@ -13261,20 +10256,6 @@ declare module olx {
             layers?: (ol.layer.Base[] | ol.Collection<ol.layer.Base>);
         }
 
-        /**
-         * @typedef {{gradient: (Array.<string>|undefined),
-         *     radius: (number|undefined),
-         *     blur: (number|undefined),
-         *     shadow: (number|undefined),
-         *     weight: (string|function(ol.Feature):number|undefined),
-         *     extent: (ol.Extent|undefined),
-         *     minResolution: (number|undefined),
-         *     maxResolution: (number|undefined),
-         *     opacity: (number|undefined),
-         *     source: (ol.source.Vector|undefined),
-         *     visible: (boolean|undefined),
-         *     zIndex: (number|undefined)}}
-         */
         interface HeatmapOptions {
             gradient?: string[];
             radius?: number;
@@ -13290,16 +10271,6 @@ declare module olx {
             zIndex?: number;
         }
 
-        /**
-         * @typedef {{opacity: (number|undefined),
-         *     map: (ol.Map|undefined),
-         *     source: (ol.source.Image|undefined),
-         *     visible: (boolean|undefined),
-         *     extent: (ol.Extent|undefined),
-         *     minResolution: (number|undefined),
-         *     maxResolution: (number|undefined),
-         *     zIndex: (number|undefined)}}
-         */
         interface ImageOptions {
             opacity?: number;
             source: ol.source.Image;
@@ -13311,18 +10282,6 @@ declare module olx {
             zIndex?: number;
         }
 
-        /**
-         * @typedef {{opacity: (number|undefined),
-         *     preload: (number|undefined),
-         *     source: (ol.source.Tile|undefined),
-         *     map: (ol.Map|undefined),
-         *     visible: (boolean|undefined),
-         *     extent: (ol.Extent|undefined),
-         *     minResolution: (number|undefined),
-         *     maxResolution: (number|undefined),
-         *     useInterimTilesOnError: (boolean|undefined),
-         *     zIndex: (number|undefined)}}
-         */
         interface TileOptions {
             opacity?: number;
             preload?: number;
@@ -13337,7 +10296,6 @@ declare module olx {
         }
 
         /**
-         * @enum {string}
          * Render mode for vector layers:
          *  * `'image'`: Vector layers are rendered as images. Great performance, but
          *    point symbols and texts are always rotated with the view and pixels are
@@ -13345,25 +10303,10 @@ declare module olx {
          *  * `'vector'`: Vector layers are rendered as vectors. Most accurate rendering
          *    even during animations, but slower performance.
          * Default is `vector`.
-         * @type {ol.layer.VectorRenderType|string|undefined}
          * @api
          */
         type VectorRenderType = "image" | "vector";
 
-        /**
-         * @typedef {{renderOrder: (function(ol.Feature, ol.Feature):number|null|undefined),
-         *     minResolution: (number|undefined),
-         *     maxResolution: (number|undefined),
-         *     opacity: (number|undefined),
-         *     renderBuffer: (number|undefined),
-         *     source: (ol.source.Vector|undefined),
-         *     map: (ol.Map|undefined),
-         *     style: (ol.style.Style|Array.<ol.style.Style>|ol.StyleFunction|undefined),
-         *     updateWhileAnimating: (boolean|undefined),
-         *     updateWhileInteracting: (boolean|undefined),
-         *     visible: (boolean|undefined),
-         *     zIndex: (number|undefined)}}
-         */
         interface VectorOptions {
             renderMode?: (olx.layer.VectorRenderType | string);
             renderOrder?: (feature1: ol.Feature, feature2: ol.Feature) => number;
@@ -13382,22 +10325,6 @@ declare module olx {
             zIndex?: number;
         }
 
-        /**
-         * @typedef {{extent: (ol.Extent|undefined),
-         *     map: (ol.Map|undefined),
-         *     minResolution: (number|undefined),
-         *     maxResolution: (number|undefined),
-         *     opacity: (number|undefined),
-         *     renderBuffer: (number|undefined),
-         *     renderMode: (ol.layer.VectorTileRenderType|string|undefined),
-         *     renderOrder: (function(ol.Feature, ol.Feature):number|undefined),
-         *     source: (ol.source.VectorTile|undefined),
-         *     style: (ol.style.Style|Array.<ol.style.Style>|ol.StyleFunction|undefined),
-         *     updateWhileAnimating: (boolean|undefined),
-         *     updateWhileInteracting: (boolean|undefined),
-         *     visible: (boolean|undefined),
-         *     zIndex: (number|undefined)}}
-         */
         interface VectorTileOptions {
             renderBuffer?: number;
             renderMode?: (ol.layer.VectorTileRenderType | string);
@@ -13416,40 +10343,17 @@ declare module olx {
         }
     }
 
-    /**
-     * @namespace olx.parser
-     */
     module parser {
     }
 
-    /**
-     * @namespace olx.render
-     */
     module render {
-        /**
-         * @typedef {{size: (ol.Size|undefined),
-         *     pixelRatio: (number|undefined)}}
-         */
         interface ToContextOptions {
             size?: ol.Size;
             pixelRatio?: number;
         }
     }
 
-    /**
-     * @namespace olx.source
-     */
     module source {
-        /**
-         * @typedef {{cacheSize: (number|undefined),
-         *     culture: (string|undefined),
-         *     key: string,
-         *     imagerySet: string,
-         *     maxZoom: (number|undefined),
-         *     reprojectionErrorThreshold: (number|undefined),
-         *     tileLoadFunction: (ol.TileLoadFunctionType|undefined),
-         *     wrapX: (boolean|undefined)}}
-         */
         interface BingMapsOptions {
             cacheSize?: number;
             culture?: string;
@@ -13461,17 +10365,6 @@ declare module olx {
             wrapX?: boolean;
         }
 
-        /**
-         * @typedef {{attributions: (ol.AttributionLike|undefined),
-         *     distance: (number|undefined),
-         *     extent: (ol.Extent|undefined),
-         *     format: (ol.format.Feature|undefined),
-         *     geometryFunction: (undefined|function(ol.Feature):ol.geom.Point),
-         *     logo: (string|undefined),
-         *     projection: ol.ProjectionLike,
-         *     source: ol.source.Vector,
-         *     wrapX: (boolean|undefined)}}
-         */
         interface ClusterOptions {
             attributions?: ol.AttributionLike;
             distance?: number;
@@ -13486,12 +10379,6 @@ declare module olx {
 
         type TileJSON = JSON;
 
-        /**
-         * @typedef {{preemptive: (boolean|undefined),
-         *     jsonp: (boolean|undefined),
-         *     tileJSON: (TileJSON|undefined),
-         *     url: (string|undefined)}}
-         */
         interface TileUTFGridOptions {
             jsonp?: boolean;
             preemptive?: boolean;
@@ -13499,27 +10386,6 @@ declare module olx {
             url?: string;
         }
 
-        /**
-         * @typedef {{attributions: (ol.AttributionLike|undefined),
-         *            cacheSize: (number|undefined),
-         *            crossOrigin: (null|string|undefined),
-         *            logo: (string|olx.LogoOptions|undefined),
-         *            opaque: (boolean|undefined),
-         *            projection: ol.ProjectionLike,
-         *            reprojectionErrorThreshold: (number|undefined),
-         *            state: (ol.source.State|undefined),
-         *            tileClass: (function(new: ol.ImageTile, ol.TileCoord,
-         *                                 ol.Tile.State, string, ?string,
-         *                                 ol.TileLoadFunctionType)|undefined),
-         *            tileGrid: (ol.tilegrid.TileGrid|undefined),
-         *            tileLoadFunction: (ol.TileLoadFunctionType|undefined),
-         *            tilePixelRatio: (number|undefined),
-         *            tileUrlFunction: (ol.TileUrlFunctionType|undefined),
-         *            url: (string|undefined),
-         *            urls: (Array.<string>|undefined),
-         *            wrapX: (boolean|undefined),
-         *            transition: (number|undefined)}}
-         */
         interface TileImageOptions {
             attributions?: ol.AttributionLike;
             cacheSize?: number;
@@ -13540,24 +10406,6 @@ declare module olx {
             transition?: number;
         }
 
-        /**
-         * @typedef {{attributions: (ol.AttributionLike|undefined),
-         *            cacheSize: (number|undefined),
-         *            format: (ol.format.Feature|undefined),
-         *            logo: (string|olx.LogoOptions|undefined),
-         *            overlaps: (boolean|undefined),
-         *            projection: ol.ProjectionLike,
-         *            state: (ol.source.State|undefined),
-         *            tileClass: (function(new: ol.VectorTile, ol.TileCoord,
-         *                 ol.Tile.State, string, ol.format.Feature,
-         *                 ol.TileLoadFunctionType)|undefined),
-         *            tileGrid: (ol.tilegrid.TileGrid|undefined),
-         *            tileLoadFunction: (ol.TileLoadFunctionType|undefined),
-         *            tileUrlFunction: (ol.TileUrlFunctionType|undefined),
-         *            url: (string|undefined),
-         *            urls: (Array.<string>|undefined),
-         *            wrapX: (boolean|undefined)}}
-         */
         interface VectorTileOptions {
             attributions?: ol.AttributionLike;
             cacheSize?: number;
@@ -13575,18 +10423,6 @@ declare module olx {
             wrapX?: boolean;
         }
 
-        /**
-         * @typedef {{url: (string|undefined),
-         *     displayDpi: (number|undefined),
-         *     metersPerUnit: (number|undefined),
-         *     hidpi: (boolean|undefined),
-         *     useOverlay: (boolean|undefined),
-         *     projection: ol.ProjectionLike,
-         *     ratio: (number|undefined),
-         *     resolutions: (Array.<number>|undefined),
-         *     imageLoadFunction: (ol.ImageLoadFunctionType|undefined),
-         *     params: (Object|undefined)}}
-         */
         interface ImageMapGuideOptions {
             url?: string;
             displayDpi?: number;
@@ -13600,13 +10436,6 @@ declare module olx {
             params?: GlobalObject;
         }
 
-        /**
-         * @typedef {{cacheSize: (number|undefined),
-         *     layer: string,
-         *     reprojectionErrorThreshold: (number|undefined),
-         *     tileLoadFunction: (ol.TileLoadFunctionType|undefined),
-         *     url: (string|undefined)}}
-         */
         interface MapQuestOptions {
             cacheSize?: number;
             layer: string;
@@ -13615,28 +10444,12 @@ declare module olx {
             url?: string;
         }
 
-        /**
-         * @typedef {{projection: ol.ProjectionLike,
-         *     tileGrid: (ol.tilegrid.TileGrid|undefined),
-         *     wrapX: (boolean|undefined)}}
-         */
         interface TileDebugOptions {
             projection: ol.ProjectionLike;
             tileGrid?: ol.tilegrid.TileGrid;
             wrapX?: boolean;
         }
 
-        /**
-         * @typedef {{attributions: (ol.AttributionLike|undefined),
-         *     cacheSize: (number|undefined),
-         *     crossOrigin: (null|string|undefined),
-         *     maxZoom: (number|undefined),
-         *     opaque: (boolean|undefined),
-         *     reprojectionErrorThreshold: (number|undefined),
-         *     tileLoadFunction: (ol.TileLoadFunctionType|undefined),
-         *     url: (string|undefined),
-         *     wrapX: (boolean|undefined)}}
-         */
         interface OSMOptions {
             attributions?: ol.AttributionLike;
             cacheSize?: number;
@@ -13649,17 +10462,6 @@ declare module olx {
             wrapX?: boolean;
         }
 
-        /**
-         * @typedef {{attributions: (Array.<ol.Attribution>|undefined),
-         *     crossOrigin: (null|string|undefined),
-         *     logo: (string|olx.LogoOptions|undefined),
-         *     imageLoadFunction: (ol.ImageLoadFunctionType|undefined),
-         *     params: Object.<string,*>,
-         *     projection: ol.ProjectionLike,
-         *     ratio: (number|undefined),
-         *     resolutions: (Array.<number>|undefined),
-         *     url: (string|undefined)}}
-         */
         interface ImageArcGISRestOptions {
             attributions?: ol.Attribution[];
             crossOrigin?: (string);
@@ -13672,15 +10474,6 @@ declare module olx {
             url?: string;
         }
 
-        /**
-         * @typedef {{attributions: (ol.AttributionLike|undefined),
-         *     canvasFunction: ol.CanvasFunctionType,
-         *     logo: (string|olx.LogoOptions|undefined),
-         *     projection: ol.ProjectionLike,
-         *     ratio: (number|undefined),
-         *     resolutions: (Array.<number>|undefined),
-         *     state: (ol.source.State|undefined)}}
-         */
         interface ImageCanvasOptions {
             attributions?: ol.AttributionLike;
             canvasFunction: ol.CanvasFunctionType;
@@ -13691,16 +10484,6 @@ declare module olx {
             state?: ol.source.State;
         }
 
-        /**
-         * @typedef {{attributions: (ol.AttributionLike|undefined),
-         *     logo: (string|olx.LogoOptions|undefined),
-         *     projection: ol.ProjectionLike,
-         *     ratio: (number|undefined),
-         *     renderBuffer: (number|undefined),
-         *     resolutions: (Array.<number>|undefined),
-         *     source: ol.source.Vector,
-         *     style: (ol.style.Style|Array.<ol.style.Style>|ol.StyleFunction|undefined)}}
-         */
         interface ImageVectorOptions {
             attributions?: ol.AttributionLike;
             logo?: (string | olx.LogoOptions);
@@ -13712,14 +10495,6 @@ declare module olx {
             style?: (ol.style.Style | ol.style.Style[] | ol.StyleFunction);
         }
 
-        /**
-         * @typedef {{sources: Array.<ol.source.Source>,
-         *     operation: (ol.RasterOperation|undefined),
-         *     lib: (Object|undefined),
-         *     threads: (number|undefined),
-         *     operationType: (ol.RasterOperationType|undefined)}}
-         * @api
-         */
         interface RasterOptions {
             sources: ol.source.Source[];
             operation?: ol.RasterOperation;
@@ -13728,19 +10503,6 @@ declare module olx {
             operationType?: ol.RasterOperationType;
         }
 
-        /**
-         * @typedef {{attributions: (ol.AttributionLike|undefined),
-         *     crossOrigin: (null|string|undefined),
-         *     hidpi: (boolean|undefined),
-         *     serverType: (ol.source.wms.ServerType|string|undefined),
-         *     logo: (string|olx.LogoOptions|undefined),
-         *     imageLoadFunction: (ol.ImageLoadFunctionType|undefined),
-         *     params: Object.<string,*>,
-         *     projection: ol.ProjectionLike,
-         *     ratio: (number|undefined),
-         *     resolutions: (Array.<number>|undefined),
-         *     url: (string|undefined)}}
-         */
         interface ImageWMSOptions {
             attributions?: ol.AttributionLike;
             crossOrigin?: (string);
@@ -13755,16 +10517,6 @@ declare module olx {
             url?: string;
         }
 
-        /**
-         * @typedef {{cacheSize: (number|undefined),
-         *     layer: string,
-         *     minZoom: (number|undefined),
-         *     maxZoom: (number|undefined),
-         *     opaque: (boolean|undefined),
-         *     reprojectionErrorThreshold: (number|undefined),
-         *     tileLoadFunction: (ol.TileLoadFunctionType|undefined),
-         *     url: (string|undefined)}}
-         */
         interface StamenOptions {
             cacheSize?: number;
             layer: string;
@@ -13776,16 +10528,6 @@ declare module olx {
             url?: string;
         }
 
-        /**
-         * @typedef {{attributions: (ol.AttributionLike|undefined),
-         *     crossOrigin: (null|string|undefined),
-         *     imageExtent: (ol.Extent),
-         *     imageLoadFunction: (ol.ImageLoadFunctionType|undefined),
-         *     imageSize: (ol.Size|undefined),
-         *     logo: (string|olx.LogoOptions|undefined),
-         *     projection: ol.ProjectionLike,
-         *     url: string}}
-         */
         interface ImageStaticOptions {
             attributions?: ol.AttributionLike;
             crossOrigin?: (string);
@@ -13797,21 +10539,6 @@ declare module olx {
             url: string;
         }
 
-        /**
-         * @typedef {{attributions: (ol.AttributionLike|undefined),
-         *     cacheSize: (number|undefined),
-         *     crossOrigin: (null|string|undefined),
-         *     params: (Object.<string, *>|undefined),
-         *     logo: (string|olx.LogoOptions|undefined),
-         *     tileGrid: (ol.tilegrid.TileGrid|undefined),
-         *     projection: ol.ProjectionLike,
-         *     reprojectionErrorThreshold: (number|undefined),
-         *     tileLoadFunction: (ol.TileLoadFunctionType|undefined),
-         *     url: (string|undefined),
-         *     wrapX: (boolean|undefined),
-         *     transition: (number|undefined),
-         *     urls: (Array.<string>|undefined)}}
-         */
         interface TileArcGISRestOptions {
             attributions?: ol.AttributionLike;
             cacheSize?: number;
@@ -13828,17 +10555,6 @@ declare module olx {
             urls?: string[];
         }
 
-        /**
-         * @typedef {{attributions: (ol.AttributionLike|undefined),
-         *     cacheSize: (number|undefined),
-         *     crossOrigin: (null|string|undefined),
-         *     jsonp: (boolean|undefined),
-         *     reprojectionErrorThreshold: (number|undefined),
-         *     tileLoadFunction: (ol.TileLoadFunctionType|undefined),
-         *     url: string,
-         *     wrapX: (boolean|undefined),
-         *     transition: (number|undefined)}}
-         */
         interface TileJSONOptions {
             attributions?: ol.AttributionLike;
             cacheSize?: number;
@@ -13851,24 +10567,6 @@ declare module olx {
             transition?: number;
         }
 
-        /**
-         * @typedef {{attributions: (ol.AttributionLike|undefined),
-         *     cacheSize: (number|undefined),
-         *     params: Object.<string,*>,
-         *     crossOrigin: (null|string|undefined),
-         *     gutter: (number|undefined),
-         *     hidpi: (boolean|undefined),
-         *     logo: (string|olx.LogoOptions|undefined),
-         *     tileGrid: (ol.tilegrid.TileGrid|undefined),
-         *     projection: ol.ProjectionLike,
-         *     reprojectionErrorThreshold: (number|undefined),
-         *     serverType: (ol.source.wms.ServerType|string|undefined),
-         *     tileLoadFunction: (ol.TileLoadFunctionType|undefined),
-         *     url: (string|undefined),
-         *     urls: (Array.<string>|undefined),
-         *     wrapX: (boolean|undefined),
-         *     transition: (number|undefined)}}
-         */
         interface TileWMSOptions {
             attributions?: ol.AttributionLike;
             cacheSize?: number;
@@ -13888,18 +10586,6 @@ declare module olx {
             transition?: number;
         }
 
-        /**
-         * @typedef {{attributions: (ol.AttributionLike|undefined),
-         *     features: (Array.<ol.Feature>|ol.Collection.<ol.Feature>|undefined),
-         *     format: (ol.format.Feature|undefined),
-         *     loader: (ol.FeatureLoader|undefined),
-         *     logo: (string|olx.LogoOptions|undefined),
-         *     overlaps: (boolean|undefined),
-         *     strategy: (ol.LoadingStrategy|undefined),
-         *     url: (string|ol.FeatureUrlFunction|undefined),
-         *     useSpatialIndex: (boolean|undefined),
-         *     wrapX: (boolean|undefined)}}
-         */
         interface VectorOptions {
             attributions?: ol.AttributionLike;
             features?: (ol.Feature[] | ol.Collection<ol.Feature>);
@@ -13913,30 +10599,6 @@ declare module olx {
             wrapX?: boolean;
         }
 
-        /**
-         * @typedef {{attributions: (ol.AttributionLike|undefined),
-         *     cacheSize: (number|undefined),
-         *     crossOrigin: (string|null|undefined),
-         *     logo: (string|olx.LogoOptions|undefined),
-         *     tileGrid: ol.tilegrid.WMTS,
-         *     projection: ol.ProjectionLike,
-         *     reprojectionErrorThreshold: (number|undefined),
-         *     requestEncoding: (ol.source.WMTSRequestEncoding|string|undefined),
-         *     layer: string,
-         *     style: string,
-         *     tilePixelRatio: (number|undefined),
-         *     version: (string|undefined),
-         *     format: (string|undefined),
-         *     matrixSet: string,
-         *     dimensions: (!Object|undefined),
-         *     url: (string|undefined),
-         *     tileLoadFunction: (ol.TileLoadFunctionType|undefined),
-         *     urls: (Array.<string>|undefined),
-         *     tileClass: (function(new: ol.ImageTile, ol.TileCoord,
-         *                          ol.Tile.State, string, ?string,
-         *                          ol.TileLoadFunctionType)|undefined),
-         *     wrapX: (boolean|undefined)}}
-         */
         interface WMTSOptions {
             attributions?: ol.AttributionLike;
             cacheSize?: number;
@@ -13960,25 +10622,6 @@ declare module olx {
             wrapX?: boolean;
         }
 
-        /**
-         * @typedef {{attributions: (ol.AttributionLike|undefined),
-         *     cacheSize: (number|undefined),
-         *     crossOrigin: (null|string|undefined),
-         *     logo: (string|olx.LogoOptions|undefined),
-         *     opaque: (boolean|undefined),
-         *     projection: ol.ProjectionLike,
-         *     reprojectionErrorThreshold: (number|undefined),
-         *     maxZoom: (number|undefined),
-         *     minZoom: (number|undefined),
-         *     tileGrid: (ol.tilegrid.TileGrid|undefined),
-         *     tileLoadFunction: (ol.TileLoadFunctionType|undefined),
-         *     tilePixelRatio: (number|undefined),
-         *     tileSize: (number|ol.Size|undefined),
-         *     tileUrlFunction: (ol.TileUrlFunctionType|undefined),
-         *     url: (string|undefined),
-         *     urls: (Array.<string>|undefined),
-         *     wrapX: (boolean|undefined)}}
-         */
         interface XYZOptions {
             attributions?: ol.AttributionLike;
             cacheSize?: number;
@@ -13999,19 +10642,6 @@ declare module olx {
             wrapX?: boolean;
         }
 
-        /**
-         * @typedef {{attributions: (ol.AttributionLike|undefined),
-         *     cacheSize: (number|undefined),
-         *     crossOrigin: (null|string|undefined),
-         *     logo: (string|olx.LogoOptions|undefined),
-         *     projection: ol.ProjectionLike,
-         *     maxZoom: (number|undefined),
-         *     minZoom: (number|undefined),
-         *     wrapX: (boolean|undefined),
-         *     config: (Object|undefined),
-         *     map: (string|undefined),
-         *     account: string}}
-         */
         interface CartoDBOptions {
             attributions?: ol.AttributionLike;
             cacheSize?: number;
@@ -14026,16 +10656,6 @@ declare module olx {
             account: string;
         }
 
-        /**
-         * @typedef {{attributions: (ol.AttributionLike|undefined),
-         *     cacheSize: (number|undefined),
-         *     crossOrigin: (null|string|undefined),
-         *     logo: (string|olx.LogoOptions|undefined),
-         *     reprojectionErrorThreshold: (number|undefined),
-         *     url: !string,
-         *     tierSizeCalculation: (string|undefined),
-         *     size: ol.Size}}
-         */
         interface ZoomifyOptions {
             attributions?: ol.AttributionLike;
             cacheSize?: number;
@@ -14048,17 +10668,7 @@ declare module olx {
         }
     }
 
-    /**
-     * @namespace olx.style
-     */
     module style {
-        /**
-         * @typedef {{fill: (ol.style.Fill|undefined),
-         *     radius: number,
-         *     snapToPixel: (boolean|undefined),
-         *     stroke: (ol.style.Stroke|undefined),
-         *     atlasManager: (ol.style.AtlasManager|undefined)}}
-         */
         interface CircleOptions {
             fill?: ol.style.Fill;
             radius: number;
@@ -14067,32 +10677,10 @@ declare module olx {
             atlasManager?: ol.style.AtlasManager;
         }
 
-        /**
-         * @typedef {{color: (ol.Color|ol.ColorLike|undefined)}}
-         */
         interface FillOptions {
             color?: (ol.Color | ol.ColorLike);
         }
 
-        /**
-         * @typedef {{anchor: (Array.<number>|undefined),
-         *     anchorOrigin: (ol.style.IconOrigin|undefined),
-         *     anchorXUnits: (ol.style.IconAnchorUnits|undefined),
-         *     anchorYUnits: (ol.style.IconAnchorUnits|undefined),
-         *     color: (ol.Color|string|undefined),
-         *     crossOrigin: (null|string|undefined),
-         *     img: (Image|HTMLCanvasElement|undefined),
-         *     offset: (Array.<number>|undefined),
-         *     offsetOrigin: (ol.style.IconOrigin|undefined),
-         *     opacity: (number|undefined),
-         *     scale: (number|undefined),
-         *     snapToPixel: (boolean|undefined),
-         *     rotateWithView: (boolean|undefined),
-         *     rotation: (number|undefined),
-         *     size: (ol.Size|undefined),
-         *     imgSize: (ol.Size|undefined),
-         *     src: (string|undefined)}}
-         */
         interface IconOptions {
             anchor?: number[];
             anchorOrigin?: ol.style.IconOrigin;
@@ -14113,20 +10701,6 @@ declare module olx {
             src?: string;
         }
 
-        /**
-         * Specify radius for regular polygons, or radius1 and radius2 for stars.
-         * @typedef {{fill: (ol.style.Fill|undefined),
-         *     points: number,
-         *     radius: (number|undefined),
-         *     radius1: (number|undefined),
-         *     radius2: (number|undefined),
-         *     angle: (number|undefined),
-         *     snapToPixel: (boolean|undefined),
-         *     stroke: (ol.style.Stroke|undefined),
-         *     rotation: (number|undefined),
-         *     rotateWithView: (boolean|undefined),
-         *     atlasManager: (ol.style.AtlasManager|undefined)}}
-         */
         interface RegularShapeOptions {
             fill?: ol.style.Fill;
             points: number;
@@ -14139,14 +10713,6 @@ declare module olx {
             rotation?: number;
         }
 
-        /**
-         * @typedef {{color: (ol.Color|string|undefined),
-         *     lineCap: (string|undefined),
-         *     lineJoin: (string|undefined),
-         *     lineDash: (Array.<number>|undefined),
-         *     miterLimit: (number|undefined),
-         *     width: (number|undefined)}}
-         */
         interface StrokeOptions {
             color?: ol.Color | string;
             lineCap?: string;
@@ -14161,29 +10727,9 @@ declare module olx {
          * `'line'` requires the underlying geometry to be a {@link ol.geom.LineString},
          * {@link ol.geom.Polygon}, {@link ol.geom.MultiLineString} or
          * {@link ol.geom.MultiPolygon}.
-         * @enum {string}
          */
         type TextPlacement = 'point' | 'line';
 
-        /**
-         * @typedef {{font: (string|undefined),
-         *     maxAngle: (number|undefined),
-         *     offsetX: (number|undefined),
-         *     offsetY: (number|undefined),
-         *     overflow: (boolean|undefined),
-         *     placement: (ol.style.TextPlacement|string|undefined),
-         *     scale: (number|undefined),
-         *     rotateWithView: (boolean|undefined),
-         *     rotation: (number|undefined),
-         *     text: (string|undefined),
-         *     textAlign: (string|undefined),
-         *     textBaseline: (string|undefined),
-         *     fill: (ol.style.Fill|undefined),
-         *     stroke: (ol.style.Stroke|undefined),
-         *     backgroundFill: (ol.style.Fill|undefined),
-         *     backgroundStroke: (ol.style.Stroke|undefined),
-         *     padding: (Array.<number>|undefined)}}
-         */
         interface TextOptions {
             font?: string;
             maxAngle?: boolean;
@@ -14204,14 +10750,6 @@ declare module olx {
             padding?: number[];
         }
 
-        /**
-         * @typedef {{geometry: (undefined|string|ol.geom.Geometry|ol.StyleGeometryFunction),
-         *     fill: (ol.style.Fill|undefined),
-         *     image: (ol.style.Image|undefined),
-         *     stroke: (ol.style.Stroke|undefined),
-         *     text: (ol.style.Text|undefined),
-         *     zIndex: (number|undefined)}}
-         */
         interface StyleOptions {
             geometry?: (string | ol.geom.Geometry | ol.StyleGeometryFunction);
             fill?: ol.style.Fill;
@@ -14221,11 +10759,6 @@ declare module olx {
             zIndex?: number;
         }
 
-        /**
-         * @typedef {{initialSize: (number|undefined),
-         *     maxSize: (number|undefined),
-         *     space: (number|undefined)}}
-         */
         interface AtlasManagerOptions {
             initialSize?: number;
             maxSize?: number;
@@ -14233,20 +10766,7 @@ declare module olx {
         }
     }
 
-    /**
-     * @namespace olx.tilegrid
-     */
     module tilegrid {
-        /**
-         * @typedef {{extent: (ol.Extent|undefined),
-         *     minZoom: (number|undefined),
-         *     origin: (ol.Coordinate|undefined),
-         *     origins: (Array.<ol.Coordinate>|undefined),
-         *     resolutions: !Array.<number>,
-         *     sizes: (Array.<ol.Size>|undefined),
-         *     tileSize: (number|ol.Size|undefined),
-         *     tileSizes: (Array.<number|ol.Size>|undefined)}}
-         */
         interface TileGridOptions {
             extent?: ol.Extent;
             minZoom?: number;
@@ -14257,16 +10777,6 @@ declare module olx {
             tileSizes?: (Array<(number | ol.Size)>);
         }
 
-        /**
-         * @typedef {{extent: (ol.Extent|undefined),
-         *     origin: (ol.Coordinate|undefined),
-         *     origins: (Array.<ol.Coordinate>|undefined),
-         *     resolutions: !Array.<number>,
-         *     matrixIds: !Array.<string>,
-         *     sizes: (Array.<ol.Size>|undefined),
-         *     tileSize: (number|ol.Size|undefined),
-         *     tileSizes: (Array.<number|ol.Size>|undefined)}}
-         */
         interface WMTSOptions {
             extent?: ol.Extent;
             origin?: ol.Coordinate;
@@ -14279,12 +10789,6 @@ declare module olx {
             widths?: number[];
         }
 
-        /**
-         * @typedef {{extent: (ol.Extent|undefined),
-         *     maxZoom: (number|undefined),
-         *     minZoom: (number|undefined),
-         *     tileSize: (number|ol.Size|undefined)}}
-         */
         interface XYZOptions {
             extent?: ol.Extent;
             maxZoom?: number;
@@ -14293,26 +10797,14 @@ declare module olx {
         }
     }
 
-    /**
-     * @typedef {{html: string,
-     *     tileRanges: (Object.<string, Array.<ol.TileRange>>|undefined)}}
-     */
     interface AttributionOptions {
         html: string;
     }
 
-    /**
-     * @typedef {{tracking: (boolean|undefined)}}
-     */
     interface DeviceOrientationOptions {
         tracking?: boolean;
     }
 
-    /**
-     * @typedef {{tracking: (boolean|undefined),
-     *     trackingOptions: (PositionOptions|undefined),
-     *     projection: ol.ProjectionLike}}
-     */
     interface GeolocationOptions {
         tracking?: boolean;
         trackingOptions?: PositionOptions;
@@ -14321,19 +10813,12 @@ declare module olx {
 
     /**
      * Object literal with config options for the map logo.
-     * @typedef {{href: (string), src: (string)}}
      */
     interface LogoOptions {
         href: string;
         src: string;
     }
 
-    /**
-     * @typedef {{map: (ol.Map|undefined),
-     *     maxLines: (number|undefined),
-     *     strokeStyle: (ol.style.Stroke|undefined),
-     *     targetSize: (number|undefined)}}
-     */
     interface GraticuleOptions {
         map?: ol.Map;
         maxLines?: number;
@@ -14350,18 +10835,6 @@ declare module olx {
 
     /**
      * Object literal with config options for the map.
-     * @typedef {{controls: (ol.Collection.<ol.control.Control>|Array.<ol.control.Control>|undefined),
-     *     pixelRatio: (number|undefined),
-     *     interactions: (ol.Collection.<ol.interaction.Interaction>|Array.<ol.interaction.Interaction>|undefined),
-     *     keyboardEventTarget: (Element|Document|string|undefined),
-     *     layers: (Array.<ol.layer.Base>|ol.Collection.<ol.layer.Base>|undefined),
-     *     loadTilesWhileAnimating: (boolean|undefined),
-     *     loadTilesWhileInteracting: (boolean|undefined),
-     *     logo: (boolean|string|olx.LogoOptions|Element|undefined),
-     *     overlays: (ol.Collection.<ol.Overlay>|Array.<ol.Overlay>|undefined),
-     *     renderer: (ol.RendererType|Array.<ol.RendererType|string>|string|undefined),
-     *     target: (Element|string|undefined),
-     *     view: (ol.View|undefined)}}
      */
     interface MapOptions {
         controls?: (ol.Collection<ol.control.Control> | ol.control.Control[]);
@@ -14380,16 +10853,6 @@ declare module olx {
 
     /**
      * Object literal with config options for the overlay.
-     * @typedef {{id: (number|string|undefined),
-     *     element: (Element|undefined),
-     *     offset: (Array.<number>|undefined),
-     *     position: (ol.Coordinate|undefined),
-     *     positioning: (ol.OverlayPositioning|string|undefined),
-     *     stopEvent: (boolean|undefined),
-     *     insertFirst: (boolean|undefined),
-     *     autoPan: (boolean|undefined),
-     *     autoPanAnimation: (olx.animation.PanOptions|undefined),
-     *     autoPanMargin: (number|undefined)}}
      */
     interface OverlayOptions {
         id?: (number | string);
@@ -14406,14 +10869,6 @@ declare module olx {
 
     /**
      * Object literal with config options for the projection.
-     * @typedef {{code: string,
-     *     units: (ol.proj.Units|string|undefined),
-     *     extent: (ol.Extent|undefined),
-     *     axisOrientation: (string|undefined),
-     *     global: (boolean|undefined),
-     *     metersPerUnit: (number|undefined),
-     *     worldExtent: (ol.Extent|undefined),
-     *     getPointResolution: (function(number, ol.Coordinate):number|undefined) }}
      */
     interface ProjectionOptions {
         code: string;
@@ -14427,17 +10882,6 @@ declare module olx {
     }
 
     module view {
-        /**
-         * @typedef {{
-         *     size: (ol.Size|undefined),
-         *     padding: (!Array.<number>|undefined),
-         *     constrainResolution: (boolean|undefined),
-         *     duration: (number|undefined),
-         *     nearest: (boolean|undefined),
-         *     maxZoom: (number|undefined),
-         *     minResolution: (number|undefined),
-         *     easing: (function(t: number) => number) }}
-         */
         interface FitOptions {
             size?: ol.Size;
             padding?: number[];
@@ -14453,20 +10897,6 @@ declare module olx {
 
     /**
      * Object literal with config options for the view.
-     * @typedef {{center: (ol.Coordinate|undefined),
-     *     constrainRotation: (boolean|number|undefined),
-     *     enableRotation: (boolean|undefined),
-     *     extent: (ol.Extent|undefined),
-     *     minResolution: (number|undefined),
-     *     maxResolution: (number|undefined),
-     *     minZoom: (number|undefined),
-     *     maxZoom: (number|undefined),
-     *     projection: ol.ProjectionLike,
-     *     resolution: (number|undefined),
-     *     resolutions: (Array.<number>|undefined),
-     *     rotation: (number|undefined),
-     *     zoom: (number|undefined),
-     *     zoomFactor: (number|undefined)}}
      */
     interface ViewOptions {
         center?: ol.Coordinate;
@@ -14488,48 +10918,18 @@ declare module olx {
     /**
      * Object literal with options for the {@link ol.Map#forEachFeatureAtPixel} and
      * {@link ol.Map#hasFeatureAtPixel} methods.
-     * @typedef {{layerFilter: ((function(ol.layer.Layer): boolean)|undefined),
-     *     hitTolerance: (number|undefined)}}
      */
     interface AtPixelOptions {
         layerFilter?: ((layer: ol.layer.Layer) => boolean);
         hitTolerance?: number;
     }
 
-    /**
-     * @typedef {{animate: boolean,
-     *     attributions: Object.<string, ol.Attribution>,
-     *     coordinateToPixelTransform: ol.Transform,
-     *     extent: (null|ol.Extent),
-     *     focus: ol.Coordinate,
-     *     index: number,
-     *     layerStates: Object.<number, ol.LayerState>,
-     *     layerStatesArray: Array.<ol.LayerState>,
-     *     logos: Object.<string, (string|Element)>,
-     *     pixelRatio: number,
-     *     pixelToCoordinateTransform: ol.Transform,
-     *     postRenderFunctions: Array.<ol.PostRenderFunction>,
-     *     size: ol.Size,
-     *     skippedFeatureUids: Object.<string, boolean>,
-     *     tileQueue: ol.TileQueue,
-     *     time: number,
-     *     usedTiles: Object.<string, Object.<string, ol.TileRange>>,
-     *     viewState: olx.ViewState,
-     *     viewHints: Array.<number>,
-     *     wantedTiles: !Object.<string, Object.<string, boolean>>}}
-     */
     interface FrameState {
         pixelRatio: number;
         time: number;
         viewState: olx.ViewState;
     }
 
-    /**
-     * @typedef {{center: ol.Coordinate,
-     *     projection: ol.proj.Projection,
-     *     resolution: number,
-     *     rotation: number}}
-     */
     interface ViewState {
         center: ol.Coordinate;
         projection: ol.proj.Projection;
diff --git a/types/openlayers/tslint.json b/types/openlayers/tslint.json
index 2effdd6100..16d8a26011 100644
--- a/types/openlayers/tslint.json
+++ b/types/openlayers/tslint.json
@@ -5,10 +5,9 @@
         "ban-types": false,
         // This currently fails for an option that does not appear to be in OL 4
         "no-any-union": false,
-        // Not sure how to work around this, or if it's necessary to        
+        // Not sure how to work around this, or if it's necessary to
         "no-declare-current-package": false,
         "no-internal-module": false,
-        "no-redundant-jsdoc-2": false,
         "no-single-declare-module": false,
         "no-unnecessary-class": false,
         "no-unnecessary-generics": false,

From 7277381533f80f40bf11a191187ef4348063351c Mon Sep 17 00:00:00 2001
From: Ricardo De Pena <ricardo@isnull.co>
Date: Wed, 7 Mar 2018 23:23:25 -0500
Subject: [PATCH 0336/1382] OpenFin Application namespace in line with .30
 release.

---
 types/openfin/v30/index.d.ts       | 1756 ++++++++++++++++++++++++++++
 types/openfin/v30/openfin-tests.ts |  728 ++++++++++++
 types/openfin/v30/tsconfig.json    |   24 +
 types/openfin/v30/tslint.json      |    6 +
 types/openfin/v30/v30              | 1736 +++++++++++++++++++++++++++
 5 files changed, 4250 insertions(+)
 create mode 100644 types/openfin/v30/index.d.ts
 create mode 100644 types/openfin/v30/openfin-tests.ts
 create mode 100644 types/openfin/v30/tsconfig.json
 create mode 100644 types/openfin/v30/tslint.json
 create mode 100644 types/openfin/v30/v30

diff --git a/types/openfin/v30/index.d.ts b/types/openfin/v30/index.d.ts
new file mode 100644
index 0000000000..1e69b3b713
--- /dev/null
+++ b/types/openfin/v30/index.d.ts
@@ -0,0 +1,1756 @@
+// Type definitions for OpenFin API 17.0
+// Project: https://openfin.co/
+// Definitions by: Chris Barker <https://github.com/chrisbarker>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// based on v6.49.17.14
+// see https://openfin.co/support/technical-faq/#what-do-the-numbers-in-the-runtime-version-mean
+
+/**
+ * JavaScript API
+ * The JavaScript API allows you to create an HTML/JavaScript application that has access to the native windowing environment,
+ * can communicate with other applications and has access to sandboxed system-level features.
+ *
+ * API Ready
+ * When using the OpenFin API, it is important to ensure that it has been fully loaded before making any API calls. To verify
+ * that the API is in fact ready, be sure to make any API calls either from within the fin.desktop.main() method or explicitly
+ * after it has returned. This avoids the situation of trying to access methods that are not yet fully injected.
+ *
+ * Overview
+ * When running within the OpenFin Runtime your web applications have access to the "fin" namespace and all the modules within the API
+ * without the need to include additional source files. You can treat the "fin" namespace as you would the "window", "navigator" or "document" objects.
+ */
+declare namespace fin {
+	const desktop: OpenFinDesktop;
+
+	interface OpenFinDesktop {
+		main(f: () => any): void;
+		Application: OpenFinApplicationStatic;
+		ExternalApp: OpenFinExternalApplicationStatic;
+		InterApplicationBus: OpenFinInterApplicationBus;
+		Notification: OpenFinNotificationStatic;
+		System: OpenFinSystem;
+		Window: OpenFinWindowStatic;
+	}
+
+	interface OpenFinApplicationStatic {
+		/**
+		 * Creates a new Application.
+		 * An object representing an application. Allows the developer to create, execute, show/close an application as well as listen to application events.
+		 */
+		new (
+			options: ApplicationOptions,
+			callback?: (successObj: { httpResponseCode: number }) => void,
+			errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): OpenFinApplication;
+		/**
+		 * Launches the given Application manifest.
+		 */
+		createFromManifest(manifestUrl: string, callback?: (app: OpenFinApplication) => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+		/**
+		 * Returns an Application object that represents an existing application.
+		 */
+		getCurrent(): OpenFinApplication;
+		/**
+		 * Returns an Application object that represents an existing application.
+		 */
+		wrap(uuid: string): OpenFinApplication;
+	}
+
+	/**
+	 * Application
+	 * An object representing an application.Allows the developer to create, execute, show / close an application as well as listen to application events.
+	 */
+	interface OpenFinApplication {
+		/**
+		 * Returns an instance of the main Window of the application
+		 */
+		getWindow(): OpenFinWindow;
+		/**
+		 * Registers an event listener on the specified event.
+		 */
+		addEventListener(
+			type: OpenFinApplicationEventType,
+			listener: (event: ApplicationBaseEvent
+				| TrayIconClickedEvent
+				| WindowEvent
+				| WindowAlertRequestedEvent
+				| WindowAuthRequested
+				| WindowNavigationRejectedEvent
+				| WindowEndLoadEvent) => void,
+			callback?: () => void,
+			errorCallback?: (reason: string) => void): void;
+		/**
+		 * Closes the application and any child windows created by the application.
+		 */
+		close(force?: boolean, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves an array of wrapped fin.desktop.Windows for each of the application's child windows.
+		 */
+		getChildWindows(callback?: (children: OpenFinWindow[]) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves an array of active window groups for all of the application's windows. Each group is represented as an array of wrapped fin.desktop.Windows.
+		 */
+		getGroups(callback?: (groups: OpenFinWindow[][]) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves the JSON manifest that was used to create the application. Invokes the error callback if the application was not created from a manifest.
+		 */
+		getManifest(callback?: (manifest: any) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves UUID of the application that launches this application. Invokes the error callback if the application was created from a manifest.
+		 */
+		getParentUuid(callback?: (uuid: string) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves current configuration of application's shortcuts.
+		 */
+		getShortcuts(callback?: (config: ShortCutConfig) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves information about the application.
+		 */
+		getInfo(callback?: (info: LaunchInfo) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves information about the system tray.
+		 */
+		getTrayIconInfo(callback?: (trayInfo: TrayIconInfo) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Determines if the application is currently running.
+		 */
+		isRunning(callback?: (running: boolean) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Registers a username and an app name for licensing purposes.
+		 */
+		registerUser(userName: string, appName: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Removes a previously registered event listener from the specified event.
+		 */
+		removeEventListener(
+			type: OpenFinApplicationEventType,
+			previouslyRegisteredListener: (event: ApplicationBaseEvent
+				| TrayIconClickedEvent
+				| WindowEvent
+				| WindowAlertRequestedEvent
+				| WindowAuthRequested
+				| WindowNavigationRejectedEvent
+				| WindowEndLoadEvent) => any,
+			callback?: () => void,
+			errorCallback?: (reason: string) => void): void;
+		/**
+		 * Removes the application's icon from the tray.
+		 */
+		removeTrayIcon(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Restarts the application.
+		 */
+		restart(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Runs the application. When the application is created, run must be called.
+		 */
+		run(callback?: (successObj: SuccessObj) => void, errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): void;
+		/**
+		 * Tells the rvm to relaunch the main application once upon a complete shutdown
+		 */
+		scheduleRestart(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Sets new shortcut configuration for current application.
+		 * Application has to be launched with a manifest and has to have shortcut configuration (icon url, name, etc.) in its manifest to
+		 * be able to change shortcut states.
+		 */
+		setShortcuts(config: ShortCutConfig, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Adds a customizable icon in the system tray and notifies the application when clicked.
+		 */
+		setTrayIcon(iconUrl: string, listener: (clickInfo: TrayIconClickedEvent) => void, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Closes the application by terminating its process.
+		 */
+		terminate(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Waits for a hanging application. This method can be called in response to an application "not-responding" to allow the application
+		 * to continue and to generate another "not-responding" message after a certain period of time.
+		 */
+		wait(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * The Application's uuid
+		 */
+		uuid: string;
+	}
+
+	interface ShortCutConfig {
+		/**
+		 * application has a shortcut on the desktop
+		 */
+		desktop?: boolean;
+		/**
+		 * application has no shortcut in the start menu
+		 */
+		startMenu?: boolean;
+		/**
+		 * application will be launched on system startup
+		 */
+		systemStartup?: boolean;
+	}
+
+	interface SuccessObj {
+		httpResponseCode: number;
+	}
+
+	interface NetworkErrorInfo extends ErrorInfo {
+		networkErrorCode: number;
+	}
+
+	interface ErrorInfo {
+		stack: string;
+		message: string;
+	}
+
+	interface ApplicationOptions {
+		/**
+		 * The name of the application.
+		 */
+		name?: string;
+		/**
+		 * The url to the application.
+		 */
+		url?: string;
+		/**
+		 * The UUID of the application, unique within the set of all other applications running in the OpenFin Runtime. name and uuid must match.
+		 */
+		uuid?: string;
+		/**
+		 * Enable Flash at the application level. Default: false.
+		 */
+		plugins?: boolean;
+		/**
+		 * The options of the main window of the application.
+		 */
+		mainWindowOptions?: WindowOptions;
+	}
+
+	interface WindowOptions {
+		/**
+		 * Enable keyboard shortcuts for devtools and zoom. Default: false for both.
+		 */
+		accelerator?: {
+			devtools?: boolean,
+			zoom?: boolean,
+			reload?: boolean,
+			reloadIgnoreCache?: boolean,
+		};
+		/**
+		 * A flag to always position the window at the top of the window stack. Default: false.
+		 * Updatable
+		 */
+		alwaysOnTop?: boolean;
+		/**
+		 * A flag to automatically show the Window when it is created. Default: false.
+		 */
+		autoShow?: boolean;
+		/**
+		 * A flag to show the context menu when right-clicking on a window. Gives access to the Developer Console for the Window. Default: true
+		 * Updatable
+		 */
+		contextMenu?: boolean;
+		/**
+		 * This defines and applies rounded corners for a frameless window. Default for both width and height: 0.
+		 * Updatable
+		 */
+		cornerRounding?: {
+			width?: number;
+			height?: number;
+		};
+		/**
+		 * A field that the user can attach serializable data to to be ferried around with the window options. Default: ''.
+		 */
+		customData?: any;
+		/**
+		 * Specifies that the window will be positioned in the center of the primary monitor when loaded for the first time on a machine.
+		 * When the window corresponding to that id is loaded again, the position from before the window was closed is used.
+		 * This option overrides defaultLeft and defaultTop. Default: false.
+		 */
+		defaultCentered?: boolean;
+		/**
+		 * The default height of the window. Specifies the height of the window when loaded for the first time on a machine.
+		 *  When the window corresponding to that id is loaded again, the height is taken to be the last height of the window before it was closed. Default: 500.
+		 */
+		defaultHeight?: number;
+		/**
+		 * The default left position of the window. Specifies the position of the left of the window when loaded for the first time on a machine.
+		 *  When the window corresponding to that id is loaded again, the value of left is taken to be the last value before the window was closed. Default: 100.
+		 */
+		defaultWidth?: number;
+		/**
+		 * The default top position of the window. Specifies the position of the top of the window when loaded for the first time on a machine.
+		 * When the window corresponding to that id is loaded again, the value of top is taken to be the last value before the window was closed. Default: 100.
+		 */
+		defaultTop?: number;
+		/**
+		 * The default width of the window. Specifies the width of the window when loaded for the first time on a machine.
+		 * When the window corresponding to that id is loaded again, the width is taken to be the last width of the window before it was closed. Default: 800.
+		 */
+		defaultLeft?: number;
+		/**
+		 * A flag to show the frame. Default: true.
+		 * Updatable
+		 */
+		frame?: boolean;
+		/**
+		 * A flag to allow a window to be hidden when the close button is clicked.Default: false.
+		 * Updatable
+		 */
+		hideOnClose?: boolean;
+		/**
+		 * A URL for the icon to be shown in the window title bar and the taskbar.Default: The parent application's applicationIcon.
+		 * Updatable
+		 */
+		icon?: string;
+		/**
+		 * The maximum height of a window.Will default to the OS defined value if set to - 1. Default: -1.
+		 * Updatable
+		 */
+		maxHeight?: number;
+		/**
+		 * A flag that lets the window be maximized.Default: true.
+		 * Updatable
+		 */
+		maximizable?: boolean;
+		/**
+		 * The maximum width of a window.Will default to the OS defined value if set to - 1. Default: -1.
+		 * Updatable
+		 */
+		maxWidth?: number;
+		/**
+		 * The minimum height of a window.Default: 0.
+		 * Updatable
+		 */
+		minHeight?: number;
+		/**
+		 * A flag that lets the window be minimized.Default: true.
+		 */
+		minimizable?: boolean;
+		/**
+		 * The minimum width of a window.Default: 0.
+		 */
+		minWidth?: number;
+		/**
+		 * The name for the window which must be unique within the context of the invoking Application.
+		 */
+		name?: string;
+		/**
+		 * A flag that specifies how transparent the window will be.This value is clamped between 0.0 and 1.0.Default: 1.0.
+		 * Updatable
+		 */
+		opacity?: number;
+		/**
+		 * A flag to drop to allow the user to resize the window.Default: true.
+		 * Updatable
+		 */
+		resizable?: boolean;
+		/**
+		 * Defines a region in pixels that will respond to user mouse interaction for resizing a frameless window.
+		 * Updatable
+		 */
+		resizeRegion?: {
+			/**
+			 * The size in pixels (Default: 2),
+			 */
+			size?: number;
+			/**
+			 * The size in pixels of an additional
+			 * square resizable region located at the
+			 * bottom right corner of a
+			 * frameless window. (Default: 4)
+			 */
+			bottomRightCorner?: number;
+		};
+		/**
+		 * A flag to show the Window's icon in the taskbar. Default: true.
+		 */
+		showTaskbarIcon?: boolean;
+		/**
+		 * A flag to cache the location of the window or not. Default: true.
+		 */
+		saveWindowState?: boolean;
+		/**
+		 * Specify a taskbar group for the window. Default: app's uuid.
+		 */
+		taskbarIconGroup?: string;
+		/**
+		 * A string that sets the window to be "minimized", "maximized", or "normal" on creation. Default: "normal".
+		 */
+		state?: string;
+		/**
+		 * The URL of the window. Default: "about:blank".
+		 */
+		url?: string;
+		/**
+		 * When set to false, the window will render before the "load" event is fired on the content's window.
+		 * Caution, when false you will see an initial empty white window. Default: true.
+		 */
+		waitForPageLoad?: boolean;
+	}
+
+	/**
+	 * Clipboard
+	 * Clipboard API allows reading and writting to the clipboard in multiple formats.
+	 */
+	interface OpenFinClipboard {
+		/**
+		 * Reads available formats for the clipboard type
+		 */
+		availableFormats(type: string | null, callback?: (formats: string[]) => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+		/**
+		 * Reads available formats for the clipboard type
+		 */
+		readHtml(type: string | null, callback?: (html: string) => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+		/**
+		 * Read the content of the clipboard as Rtf
+		 */
+		readRtf(type: string | null, callback?: (rtf: string) => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+		/**
+		 * Read the content of the clipboard as plain text
+		 */
+		readText(type: string | null, callback?: (text: string) => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+		/**
+		 * Writes data into the clipboard
+		 */
+		write(data: any, type: string | null, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+		/**
+		 * Writes data into the clipboard as Html
+		 */
+		writeHtml(data: string, type: string | null, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+		/**
+		 * Writes data into the clipboard as Rtf
+		 */
+		writeRtf(data: string, type: string | null, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+		/**
+		 * Writes data into the clipboard as plain text
+		 */
+		writeText(data: string, type: string | null, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+	}
+
+	interface OpenFinExternalApplicationStatic {
+		/**
+		 * Returns an External Application object that represents an existing external application.
+		 */
+		wrap(uuid: string): OpenFinExternalApplication;
+	}
+	/**
+	 * ExternalApplication
+	 * An object representing an application. Allows the developer to create, execute, show and close an application, as well as listen to application events.
+	 */
+	interface OpenFinExternalApplication {
+		/**
+		 * Registers an event listener on the specified event.
+		 */
+		addEventListener(
+			type: OpenFinExternalApplicationEventType,
+			listener: () => void,
+			callback?: () => void,
+			errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+		/**
+		 * Removes a previously registered event listener from the specified event.
+		 */
+		removeEventListener(
+			type: OpenFinExternalApplicationEventType,
+			listener: () => void,
+			callback?: () => void,
+			errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+	}
+
+	/**
+	 * InterApplicationBus
+	 * A messaging bus that allows for pub/sub messaging between different applications.
+	 */
+	interface OpenFinInterApplicationBus {
+		/**
+		 * Adds a listener that gets called when applications subscribe to the current application's messages.
+		 */
+		addSubscribeListener(listener: (uuid: string, topic: string, name: string) => void): void;
+		/**
+		 * Adds a listener that gets called when applications unsubscribe to the current application's messages.
+		 */
+		addUnsubscribeListener(listener: (uuid: string, topic: string, name: string) => void): void;
+		/**
+		 * Removes a previously registered subscribe listener.
+		 */
+		removeSubscribeListener(listener: (uuid: string, topic: string, name: string) => void): void;
+		/**
+		 * Removes a previously registered unsubscribe listener.
+		 */
+		removeUnsubscribeListener(listener: (uuid: string, topic: string, name: string) => void): void;
+		/**
+		 * Publishes a message to all applications running on OpenFin Runtime that are subscribed to the specified topic.
+		 */
+		publish(topic: string, message: any, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Sends a message to a specific application on a specific topic.
+		 */
+		send(destinationUuid: string, name: string, topic: string, message: any, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		send(destinationUuid: string, topic: string, message: any, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Subscribes to messages from the specified application on the specified topic. If the subscription is for a uuid, [name],
+		 * topic combination that has already been published to upon subscription you will receive the last 20 missed messages in the order they were published.
+		 */
+		subscribe(
+			senderUuid: string,
+			name: string,
+			topic: string,
+			listener: (message: any, uuid: string, name: string) => void,
+			callback?: () => void,
+			errorCallback?: (reason: string) => void): void;
+		subscribe(
+			senderUuid: string,
+			topic: string,
+			listener: (message: any, uuid: string, name: string) => void,
+			callback?: () => void,
+			errorCallback?: (reason: string) => void): void;
+		/**
+		 * Unsubscribes to messages from the specified application on the specified topic.
+		 */
+		unsubscribe(
+			senderUuid: string,
+			name: string,
+			topic: string,
+			listener: (message: any, uuid: string, name: string) => void,
+			callback?: () => void,
+			errorCallback?: (reason: string) => void): void;
+		unsubscribe(
+			senderUuid: string,
+			topic: string,
+			listener: (message: any, uuid: string, name: string) => void,
+			callback?: () => void,
+			errorCallback?: (reason: string) => void): void;
+	}
+
+	interface OpenFinNotificationStatic {
+		/**
+		 * ctor
+		 */
+		new (options: NotificationOptions, callback?: () => void, errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): OpenFinNotification;
+		/**
+		 * Gets an instance of the current notification. For use within a notification window to close the window or send a message back to its parent application.
+		 */
+		getCurrent(): OpenFinNotification;
+	}
+
+	/**
+	 * Notification
+	 * Notification represents a window on OpenFin Runtime which is shown briefly to the user on the bottom-right corner of the primary monitor.
+	 * A notification is typically used to alert the user of some important event which requires his or her attention.
+	 * Notifications are a child or your application that are controlled by the runtime.
+	 */
+	interface OpenFinNotification {
+		/**
+		 * Closes the notification.
+		 */
+		close(callback?: () => void): void;
+		/**
+		 * Sends a message to the notification.
+		 */
+		sendMessage(message: any, callback?: () => void): void;
+		/**
+		 * Sends a message from the notification to the application that created the notification. The message is handled by the notification's onMessage callback.
+		 */
+		sendMessageToApplication(message: any, callback?: () => void): void;
+	}
+
+	interface NotificationOptions {
+		/**
+		 * A boolean that will force dismissal even if the mouse is hovering over the notification
+		 */
+		ignoreMouseOver?: boolean;
+		/**
+		 * A message of any primitive or composite-primitive type to be passed to the notification upon creation.
+		 */
+		message?: any;
+		/**
+		 * The timeout for displaying a notification.Can be in milliseconds or "never".
+		 */
+		duration?: number | "never";
+		/**
+		 * The url of the notification
+		 */
+		url?: string;
+		/**
+		 * A function that is called when a notification is clicked.
+		 */
+		onClick?(callback: () => void): void;
+		/**
+		 * Invoked when the notification is closed via .close() method on the created notification instance
+		 * or the by the notification itself via fin.desktop.Notification.getCurrent().close().
+		 * NOTE: this is not invoked when the notification is dismissed via a swipe. For the swipe dismissal callback see onDismiss
+		 */
+		onClose?(callback: () => void): void;
+		/**
+		 * Invoked when a the notification is dismissed by swiping it off the screen to the right. NOTE: this is no fired on a programmatic close.
+		 */
+		onDismiss?(callback: () => void): void;
+		/**
+		 * A function that is called when an error occurs.The reason for the error is passed as an argument.
+		 */
+		onError?(errorCallback: (reason: string, errorObj: NetworkErrorInfo) => void): void;
+		/**
+		 * The onMessage function will respond to messages sent from notification.sendMessageToApplication.
+		 * The function is passed the message, which can be of any primitive or composite-primitive type.
+		 */
+		onMessage?(callback: (message: any) => void): void;
+		/**
+		 * A function that is called when a notification is shown.
+		 */
+		onShow?(callback: (successObj: SuccessObj) => void): void;
+	}
+
+	/**
+	 * System
+	 * An object representing the core of OpenFin Runtime.
+	 * Allows the developer to perform system-level actions, such as accessing logs, viewing processes, clearing the cache and exiting the runtime.
+	 */
+	interface OpenFinSystem {
+		Clipboard: OpenFinClipboard;
+		/**
+		 * Registers an event listener on the specified event.
+		 */
+		addEventListener(
+			type: OpenFinSystemEventType,
+			listener: (event: SystemBaseEvent | DesktopIconClickedEvent | IdleStateChangedEvent | MonitorInfoChangedEvent | SessionChangedEvent) => void,
+			callback?: () => void,
+			errorCallback?: (reason: string) => void): void;
+		/**
+		 * Clears cached data containing window state/positions,
+		 * application resource files (images, HTML, JavaScript files), cookies, and items stored in the Local Storage.
+		 */
+		clearCache(options: CacheOptions, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Clears all cached data when OpenFin Runtime exits.
+		 */
+		deleteCacheOnExit(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Downloads the given application asset
+		 */
+		downloadAsset(
+			assetObj: AppAssetInfo,
+			progressListener?: (progress: { downloadedBytes: number, totalBytes: number }) => void,
+			callback?: (successObj: { path: string }) => void,
+			errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): void;
+		/**
+		 * Exits the Runtime.
+		 */
+		exit(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves an array of data for all applications.
+		 */
+		getAllApplications(callback?: (applicationInfoList: ApplicationInfo[]) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves an array of data for all external applications.
+		 */
+		getAllExternalApplications(callback?: (applicationInfoList: ApplicationInfo[]) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves an array of data (name, ids, bounds) for all application windows.
+		 */
+		getAllWindows(callback?: (windowInfoList: WindowDetails[]) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves the command line argument string that started OpenFin Runtime.
+		 */
+		getCommandLineArguments(callback?: (args: string) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves the configuration object that started the OpenFin Runtime.
+		 */
+		getDeviceId(callback?: (uuid: string) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Gets the value of a given environment variable on the computer on which the runtime is installed.
+		 */
+		getEnvironmentVariable(envVar: string, callback?: (variable: string) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves system information.
+		 */
+		getHostSpecs(callback?: (info: HostSpecInfo) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves the contents of the log with the specified filename.
+		 */
+		getLog(logFileName: string, callback?: (variable: string) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves an array containing information for each log file.
+		 */
+		getLogList(callback?: (logInfoList: LogInfo[]) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves an object that contains data about the about the monitor setup of the computer that the runtime is running on.
+		 */
+		getMonitorInfo(callback?: (monitorInfo: MonitorInfo) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Returns the mouse in virtual screen coordinates (left, top).
+		 */
+		getMousePosition(callback?: (mousePosition: VirtualScreenCoordinates) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves an array of all of the runtime processes that are currently running.
+		 * Each element in the array is an object containing the uuid and the name of the application to which the process belongs.
+		 */
+		getProcessList(callback?: (processInfoList: ProcessInfo[]) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves the Proxy settings.
+		 */
+		getProxySettings(callback?: (proxy: ProxyInfo) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Returns information about the running RVM in an object.
+		 */
+		getRvmInfo(callback?: (rvmInfo: RvmInfo) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Returns the version of the runtime. The version contains the major, minor, build and revision numbers.
+		 */
+		getVersion(callback?: (version: string) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Runs an executable or batch file.
+		 */
+		launchExternalProcess(options: ExternalProcessLaunchInfo, callback?: (payload: { uuid: string }) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Writes the passed message into both the log file and the console.
+		 */
+		log(level: "debug" | "info" | "warn" | "error", message: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Monitors a running process.
+		 */
+		monitorExternalProcess(options: ExternalProcessInfo, callback?: (payload: { uuid: string }) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Opens the passed URL in the default web browser.
+		 */
+		openUrlWithBrowser(url: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * This function call will register a unique id and produce a token. The token can be used to broker an external connection.
+		 */
+		registerExternalConnection(
+			uuid: string,
+			callback?: (detail: {
+				/**
+				 * this will be unique each time
+				 */
+				token: string;
+				/**
+				 * "remote-connection-uuid"
+				 */
+				uuid: string;
+			}) => void,
+			errorCallback?: (reason: string) => void): void;
+		/**
+		 * Removes the process entry for the passed UUID obtained from a prior call of fin.desktop.System.launchExternalProcess().
+		 */
+		releaseExternalProcess(processUuid: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Removes a previously registered event listener from the specified event.
+		 */
+		removeEventListener(
+			type: OpenFinSystemEventType,
+			listener: (event: SystemBaseEvent | DesktopIconClickedEvent | IdleStateChangedEvent | MonitorInfoChangedEvent | SessionChangedEvent) => void,
+			callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Shows the Chrome Developer Tools for the specified window.
+		 */
+		showDeveloperTools(uuid: string, name: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Attempt to close an external process. The process will be terminated if it has not closed after the elapsed timeout in milliseconds.
+		 */
+		terminateExternalProcess(
+			processUuid: string,
+			timeout: number,
+			killTree: boolean,
+			callback?: (info: { result: "clean" | "terminated" | "failed" }) => void,
+			errorCallback?: (reason: string) => void): void;
+		terminateExternalProcess(
+			processUuid: string,
+			timeout: number,
+			callback?: (info: { result: "clean" | "terminated" | "failed" }) => void,
+			errorCallback?: (reason: string) => void): void;
+		/**
+		 * Update the OpenFin Runtime Proxy settings.
+		 */
+		updateProxySettings(type: string, address: string, port: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
+	}
+
+	interface CacheOptions {
+		cache?: boolean;
+		cookies?: boolean;
+		localStorage?: boolean;
+		appcache?: boolean;
+		userData?: boolean;
+	}
+
+	interface AppAssetInfo {
+		src?: string;
+		alias?: string;
+		version?: string;
+		target?: string;
+		args?: string;
+	}
+
+	interface ApplicationInfo {
+		/**
+		 * true when the application is running.
+		 */
+		isRunning?: boolean;
+		/**
+		 * uuid of the application.
+		 */
+		uuid?: string;
+		/**
+		 * uuid of the application that launches this application.
+		 */
+		parentUuid?: string;
+	}
+
+	interface WindowDetails {
+		uuid?: string;
+		mainWindow?: WindowInfo;
+		childWindows?: WindowInfo[];
+	}
+
+	interface WindowInfo {
+		/**
+		 * name of the child window
+		 */
+		name?: string;
+		/**
+		 * top-most coordinate of the child window
+		 */
+		top?: number;
+		/**
+		 * right-most coordinate of the child window
+		 */
+		right?: number;
+		/**
+		 * bottom-most coordinate of the child window
+		 */
+		bottom?: number;
+		/**
+		 * left-most coordinate of the child window
+		 */
+		left?: number;
+	}
+
+	interface HostSpecInfo {
+		/**
+		 * "x86" for 32-bit or "x86_64" for 64-bit
+		 */
+		arch: string;
+		/**
+		 * Same payload as Node's os.cpus()
+		 */
+		cpus: NodeCpuInfo[];
+		gpu: {
+			/**
+			 * Graphics card name
+			 */
+			name: string;
+		};
+		/**
+		 * Same payload as Node's os.totalmem()
+		 */
+		memory: number;
+		/**
+		 * OS name and version/edition
+		 */
+		name: string;
+	}
+
+	interface NodeCpuInfo {
+		model: string;
+		/**
+		 * in MHz
+		 */
+		speed: number;
+		times: {
+			/**
+			 * The number of milliseconds the CPU has spent in user mode.
+			 */
+			user: number;
+			/**
+			 * The number of milliseconds the CPU has spent in nice mode.
+			 */
+			nice: number;
+			/**
+			 * The number of milliseconds the CPU has spent in sys mode.
+			 */
+			sys: number;
+			/**
+			 * The number of milliseconds the CPU has spent in idle mode.
+			 */
+			idle: number;
+			/**
+			 * The number of milliseconds the CPU has spent in irq mode.
+			 */
+			irq: number;
+		};
+	}
+
+	interface LogInfo {
+		/**
+		 * the filename of the log
+		 */
+		name?: string;
+		/**
+		 * the size of the log in bytes
+		 */
+		size?: number;
+		/**
+		 * the unix time at which the log was created "Thu Jan 08 2015 14:40:30 GMT-0500 (Eastern Standard Time)"
+		 */
+		date?: string;
+	}
+
+	interface ProcessInfo {
+		/**
+		 * the percentage of total CPU usage
+		 */
+		cpuUsage?: number;
+		/**
+		 * the application name
+		 */
+		name?: string;
+		/**
+		 * the current nonpaged pool usage in bytes
+		 */
+		nonPagedPoolUsage?: number;
+		/**
+		 * the number of page faults
+		 */
+		pageFaultCount?: number;
+		/**
+		 * the current paged pool usage in bytes
+		 */
+		pagedPoolUsage?: number;
+		/**
+		 * the total amount of memory in bytes that the memory manager has committed
+		 */
+		pagefileUsage?: number;
+		/**
+		 * the peak nonpaged pool usage in bytes
+		 */
+		peakNonPagedPoolUsage?: number;
+		/**
+		 * the peak paged pool usage in bytes
+		 */
+		peakPagedPoolUsage?: number;
+		/**
+		 * the peak value in bytes of pagefileUsage during the lifetime of this process
+		 */
+		peakPagefileUsage?: number;
+		/**
+		 * the peak working set size in bytes
+		 */
+		peakWorkingSetSize?: number;
+		/**
+		 * the native process identifier
+		 */
+		processId?: number;
+		/**
+		 * the application UUID
+		 */
+		uuid?: string;
+		/**
+		 * the current working set size (both shared and private data) in bytes
+		 */
+		workingSetSize?: number;
+	}
+
+	interface ProxyInfo {
+		/**
+		 * the configured Proxy Address
+		 */
+		proxyAddress?: string;
+		/**
+		 * the configured Proxy port
+		 */
+		proxyPort?: number;
+		/**
+		 * Proxy Type
+		 */
+		type?: string;
+	}
+
+	interface RvmInfo {
+		version?: string;
+		"start-time"?: string;
+	}
+
+	interface ExternalProcessLaunchInfo {
+		path?: string;
+		/**
+		 * Additionally note that the executable found in the zip file specified in appAssets
+		 * will default to the one mentioned by appAssets.target
+		 * If the the path below refers to a specific path it will override this default
+		 */
+		alias?: string;
+		/**
+		 * When using alias; if no arguments are passed then the arguments (if any)
+		 * are taken from the 'app.json' file, from the  'args' parameter
+		 * of the 'appAssets' Object with the relevant 'alias'.
+		 * If 'arguments' is passed as a parameter it takes precedence
+		 * over any 'args' set in the 'app.json'.
+		 */
+		arguments?: string;
+		listener?(result: {
+			/**
+			 * "Exited" Or "released" on a call to releaseExternalProcess
+			 */
+			topic?: string;
+			/**
+			 * The mapped UUID which identifies the launched process
+			 */
+			uuid?: string;
+			/*
+			 * Process exit code
+			 */
+			exitCode?: number;
+		}): void;
+		certificate?: CertificationInfo;
+	}
+
+	interface CertificationInfo {
+		/**
+		 * A hex string with or without spaces
+		 */
+		serial?: string;
+		/**
+		 * An internally tokenized and comma delimited string allowing partial or full checks of the subject fields
+		 */
+		subject?: string;
+		/**
+		 * A hex string with or without spaces
+		 */
+		publickey?: string;
+		/**
+		 * A hex string with or without spaces
+		 */
+		thumbprint?: string;
+		/**
+		 * A boolean indicating that the certificate is trusted and not revoked
+		 */
+		trusted?: boolean;
+	}
+
+	interface ExternalProcessInfo {
+		pid?: number;
+		listener?(result: {
+			/**
+			 * "Exited" Or "released" on a call to releaseExternalProcess
+			 */
+			topic?: string;
+			/**
+			 * The mapped UUID which identifies the launched process
+			 */
+			uuid?: string;
+			/*
+				* Process exit code
+				*/
+			exitCode?: number;
+		}): void;
+	}
+
+	interface OpenFinWindowStatic {
+		/**
+		 * Class: Window
+		 *
+		 * new Window(options, callbackopt, errorCallbackopt)
+		 *
+		 * Creates a new OpenFin Window
+		 *
+		 * A basic window that wraps a native HTML window. Provides more fine-grained control over the window state such as the ability to minimize,
+		 * maximize, restore, etc. By default a window does not show upon instantiation; instead the window's show() method must be invoked manually.
+		 * The new window appears in the same process as the parent window.
+		 * @param options - The options of the window
+		 * @param [callback] - Called if the window creation was successful
+		 * @param [callback.successObj] - httpResponseCode
+		 */
+		new (
+			options: WindowOptions,
+			callback?: (successObj: { httpResponseCode: number }) => void,
+			errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): OpenFinWindow;
+		/**
+		 * Returns an instance of the current window.
+		 * @returns Current window
+		 */
+		getCurrent(): OpenFinWindow;
+		/**
+		 * Returns a Window object that wraps an existing window.
+		 */
+		wrap(appUuid: string, windowName: string): OpenFinWindow;
+	}
+
+	/**
+	 * Window
+	 * A basic window that wraps a native HTML window. Provides more fine-grained control over the window state such as the ability to minimize,
+	 * maximize, restore, etc. By default a window does not show upon instantiation; instead the window's show() method must be invoked manually.
+	 * The new window appears in the same process as the parent window.
+	 */
+	interface OpenFinWindow {
+		/**
+		 * Name of window
+		 */
+		name: string;
+		/**
+		 * Returns the native JavaScript "window" object for the window. This method can only be used by the parent application or the window itself,
+		 * otherwise it will return undefined. The same Single-Origin-Policy (SOP) rules apply for child windows created by window.open(url) in that the
+		 * contents of the window object are only accessible if the URL has the same origin as the invoking window. See example below.
+		 * Also, will not work with fin.desktop.Window objects created with fin.desktop.Window.wrap().
+		 * @returns Native window
+		 */
+		getNativeWindow(): Window;
+		/**
+		 * Gets the parent application.
+		 * @returns Parent application
+		 */
+		getParentApplication(): OpenFinApplication;
+		/**
+		 * Gets the parent window.
+		 */
+		getParentWindow(): OpenFinWindow;
+		/**
+		 * Registers an event listener on the specified event.
+		 */
+		addEventListener(
+			type: OpenFinWindowEventType,
+			listener: (event: WindowBaseEvent
+				| WindowAuthRequestedEvent
+				| WindowBoundsEvent
+				| WindowExternalProcessStartedEvent
+				| WindowExternalProcessExited
+				| WindowGroupChangedEvent
+				| WindowHiddenEvent
+				| Window_NavigationRejectedEvent) => void,
+			callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Performs the specified window transitions
+		 */
+		animate(transitions: AnimationTransition, options: AnimationOptions, callback?: (event: any) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Provides credentials to authentication requests
+		 */
+		authenticate(userName: string, password: string, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+		/**
+		 * Removes focus from the window.
+		 */
+		blur(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Brings the window to the front of the OpenFin window stack.
+		 */
+		bringToFront(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Closes the window.
+		 * @param Close will be prevented from closing when force is false and 'close-requested' has been subscribed to for application's main window.
+		 */
+		close(force?: boolean, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Prevents a user from changing a window's size/position when using the window's frame.
+		 * 'disabled-frame-bounds-changing' is generated at the start of and during a user move/size operation.
+		 * 'disabled-frame-bounds-changed' is generated after a user move/size operation.
+		 * The events provide the bounds that would have been applied if the frame was enabled.
+		 * 'frame-disabled' is generated when an enabled frame becomes disabled.
+		 */
+		disableFrame(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Re-enables user changes to a window's size/position when using the window's frame.
+		 * 'disabled-frame-bounds-changing' is generated at the start of and during a user move/size operation.
+		 * 'disabled-frame-bounds-changed' is generated after a user move/size operation.
+		 * The events provide the bounds that would have been applied if the frame was enabled.
+		 * 'frame-enabled' is generated when a disabled frame has becomes enabled.
+		 */
+		enableFrame(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Flashes the window's frame and taskbar icon until the window is activated.
+		 */
+		flash(options?: any, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Gives focus to the window.
+		 */
+		focus(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Gets the current bounds (top, left, width, height) of the window.
+		 */
+		getBounds(callback?: (bounds: WindowBounds) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves an array containing wrapped fin.desktop.Windows that are grouped with this window. If a window is not in a group an empty array is returned.
+		 * Please note that calling window is included in the result array.
+		 */
+		getGroup(callback?: (group: OpenFinWindow[]) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Gets the current settings of the window.
+		 */
+		getOptions(callback?: (options: WindowOptions) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Gets a base64 encoded PNG snapshot of the window.
+		 */
+		getSnapshot(callback?: (base64Snapshot: string) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Gets the current state ("minimized", "maximized", or "restored") of the window.
+		 */
+		getState(callback?: (state: "minimized" | "maximized" | "restored") => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Returns the zoom level of the window.
+		 */
+		getZoomLevel(callback?: (level: number) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Hides the window.
+		 */
+		hide(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Determines if the window is currently showing.
+		 */
+		isShowing(callback?: (showing: boolean) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Joins the same window group as the specified window.
+		 */
+		joinGroup(target: OpenFinWindow, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Leaves the current window group so that the window can be move independently of those in the group.
+		 */
+		leaveGroup(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Maximizes the window.
+		 */
+		maximize(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Merges the instance's window group with the same window group as the specified window
+		 */
+		mergeGroups(target: OpenFinWindow, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Minimizes the window.
+		 */
+		minimize(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Moves the window by a specified amount.
+		 */
+		moveBy(deltaLeft: number, deltaTop: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Moves the window to a specified location.
+		 */
+		moveTo(left: number, top: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Removes a previously registered event listener from the specified event.
+		 */
+		removeEventListener(
+			type: OpenFinWindowEventType,
+			listener: (event: WindowBaseEvent
+				| WindowAuthRequestedEvent
+				| WindowBoundsEvent
+				| WindowExternalProcessStartedEvent
+				| WindowExternalProcessExited
+				| WindowGroupChangedEvent
+				| WindowHiddenEvent
+				| Window_NavigationRejectedEvent) => void,
+			callback?: () => void,
+			errorCallback?: (reason: string) => void): void;
+		/**
+		 * Resizes the window by a specified amount.
+		 */
+		resizeBy(deltaWidth: number, deltaHeight: number, anchor: OpenFinAnchor, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Resizes the window by a specified amount.
+		 */
+		resizeTo(width: number, height: number, anchor: OpenFinAnchor, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Restores the window to its normal state (i.e., unminimized, unmaximized).
+		 */
+		restore(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Will bring the window to the front of the entire stack and give it focus.
+		 */
+		setAsForeground(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Sets the window's size and position
+		 */
+		setBounds(left: number, top: number, width: number, height: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Sets the zoom level of the window.
+		 */
+		setZoomLevel(level: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Shows the window if it is hidden.
+		 * @param Show will be prevented from closing when force is false and 'show-requested' has been subscribed to for application's main window.
+		 */
+		show(force?: boolean, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Shows the window if it is hidden at the specified location. If the toggle parameter is set to true, the window will alternate between showing and hiding.
+		 */
+		showAt(left: number, top: number, force?: boolean, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Stops the taskbar icon from flashing.
+		 */
+		stopFlashing(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Updates the window using the passed options
+		 */
+		updateOptions(options: WindowOptions, callback?: () => void, errorCallback?: (reason: string) => void): void;
+	}
+
+	interface ApplicationBaseEvent {
+		topic: string;
+		type: OpenFinApplicationEventType;
+		uuid: string;
+	}
+
+	interface TrayIconClickedEvent extends ApplicationBaseEvent {
+		button: number; // 0 for left, 1 for middle, 2 for right
+		monitorInfo: MonitorInfo;
+		x: number; // the cursor x coordinate
+		y: number; // the cursor y coordinate
+	}
+
+	interface WindowEvent extends ApplicationBaseEvent {
+		name: string;
+	}
+
+	interface WindowAlertRequestedEvent extends WindowEvent {
+		message: string;
+		url: string;
+	}
+
+	interface WindowAuthRequested extends WindowEvent {
+		authInfo: {
+			host: string;
+			isProxy: boolean;
+			port: number;
+			realm: string;
+			scheme: string;
+		};
+	}
+
+	interface WindowNavigationRejectedEvent extends WindowEvent {
+		sourceName: string;
+		url: string;
+	}
+
+	interface WindowEndLoadEvent extends WindowEvent {
+		documentName: string;
+		isMain: boolean;
+	}
+
+	interface MonitorInfoChangedEvent extends MonitorInfo {
+		topic: "system";
+		type: "monitor-info-changed";
+	}
+
+	interface MonitorInfo {
+		nonPrimaryMonitors: MonitorInfoDetail[];
+		primaryMonitor: MonitorInfoDetail;
+		reason: string;
+		taskbar: {
+			edge: "left" | "right" | "top" | "bottom",
+			rect: MontiorCoordinates
+		};
+		topic: "system";
+		type: "monitor-info-changed";
+		virtualScreen: MontiorCoordinates;
+	}
+
+		interface TrayIconInfo {
+			x: number;
+			y: number;
+			bounds: {
+				x: number;
+				y: number;
+				width: number;
+				height: number;
+			}
+			monitorInfo: MonitorInfo
+		}
+
+	interface MonitorInfoDetail {
+		availableRect: MontiorCoordinates;
+		deviceId: string;
+		displayDeviceActive: boolean;
+		monitorRect: MontiorCoordinates;
+		name: string;
+	}
+
+	interface MontiorCoordinates {
+		bottom: number;
+		left: number;
+		right: number;
+		top: number;
+	}
+
+	interface VirtualScreenCoordinates {
+		left: number;
+		top: number;
+	}
+
+	interface SystemBaseEvent {
+		topic: string;
+		type: OpenFinSystemEventType;
+		uuid: string;
+	}
+
+	interface DesktopIconClickedEvent {
+		mouse: {
+			/**
+			 * the left virtual screen coordinate of the mouse
+			 */
+			left: number,
+			/**
+			 * the top virtual screen coordinate of the mouse
+			 */
+			top: number
+		};
+		/**
+		 * the number of milliseconds that have elapsed since the system was started,
+		 */
+		tickCount: number;
+		topic: "system";
+		type: "desktop-icon-clicked";
+	}
+
+	interface IdleStateChangedEvent {
+		/**
+		 * How long in milliseconds since the user has been idle.
+		 */
+		elapsedTime: number;
+		/**
+		 * true when the user is idle,false when the user has returned;
+		 */
+		isIdle: boolean;
+		topic: "system";
+		type: "idle-state-changed";
+	}
+
+	interface WindowBaseEvent {
+		/**
+		 * the name of the window
+		 */
+		name: string;
+		/**
+		 * always window
+		 */
+		topic: "window";
+		/**
+		 * window event type
+		 */
+		type: OpenFinWindowEventType;
+		/**
+		 * the UUID of the application the window belongs to
+		 */
+		uuid: string;
+	}
+
+	interface WindowAuthRequestedEvent extends WindowBaseEvent {
+		authInfo: {
+			host: string;
+			isProxy: boolean;
+			port: number;
+			realm: string;
+			scheme: string;
+		};
+	}
+
+	interface WindowBoundsEvent extends WindowBaseEvent {
+		/**
+		 * describes what kind of change occurred.
+		 * 0 means a change in position.
+		 * 1 means a change in size.
+		 * 2 means a change in position and size.
+		 */
+		changeType: number;
+		/**
+		 * true when pending changes have been applied to the window.
+		 */
+		deferred: boolean;
+		/**
+		 * the new height of the window.
+		 */
+		height: number;
+		/**
+		 * the left-most coordinate of the window.
+		 */
+		left: number;
+		/**
+		 * the top-most coordinate of the window.
+		 */
+		top: number;
+
+		type: "bounds-changed" | "bounds-changing" | "disabled-frame-bounds-changed" | "disabled-frame-bounds-changing";
+		/**
+		 * the new width of the window.
+		 */
+		width: number;
+	}
+
+	interface WindowExternalProcessStartedEvent extends WindowBaseEvent {
+		/**
+		 * the process handle uuid
+		 */
+		processUuid: string;
+		type: "external-process-started";
+	}
+
+	interface WindowExternalProcessExited extends WindowBaseEvent {
+		/**
+		 * the process exit code
+		 */
+		exitCode: number;
+		/**
+		 * the process handle uuid
+		 */
+		processUuid: string;
+		type: "external-process-exited";
+	}
+
+	interface WindowGroupChangedEvent extends WindowBaseEvent {
+		/**
+		 * Which group array the window that the event listener was registered on is included in:
+		 * 'source' The window is included in sourceGroup.
+		 * 'target' The window is included in targetGroup.
+		 * 'nothing' The window is not included in sourceGroup nor targetGroup.
+		 */
+		memberOf: "source" | "target" | "nothing";
+		/**
+		 * The reason this event was triggered.
+		 * 'leave' A window has left the group due to a leave or merge with group.
+		 * 'join' A window has joined the group.
+		 * 'merge' Two groups have been merged together.
+		 * 'disband' There are no other windows in the group.
+		 */
+		reason: "leave" | "join" | "merge" | "disband";
+		/**
+		 * All the windows in the group the sourceWindow originated from.
+		 */
+		sourceGroup: WindowOfGroupInfo[];
+		/**
+		 * The UUID of the application the sourceWindow belongs to The source window is the window in which (merge/join/leave)group(s) was called.
+		 */
+		sourceWindowAppUuid: string;
+		/**
+		 * the name of the sourcewindow.The source window is the window in which(merge / join / leave) group(s) was called.
+		 */
+		sourceWindowName: string;
+		/**
+		 * All the windows in the group the targetWindow orginated from
+		 */
+		targetGroup: WindowOfGroupInfo[];
+		/**
+		 * The UUID of the application the targetWindow belongs to. The target window is the window that was passed into (merge/join) group(s).
+		 */
+		targetWindowAppUuid: string;
+		/**
+		 * The name of the targetWindow. The target window is the window that was passed into (merge/join) group(s).
+		 */
+		targetWindowName: string;
+		type: "group-changed";
+	}
+
+	interface WindowOfGroupInfo {
+		/**
+		 * The UUID of the application this window entry belongs to.
+		 */
+		appUuid: string;
+		/**
+		 * The name of this window entry.
+		 */
+		windowName: string;
+	}
+
+	interface WindowHiddenEvent extends WindowBaseEvent {
+		/**
+		 * What action prompted the close.
+		 * The reasons are: "hide", "hide-on-close"
+		 */
+		reason: "hide" | "hide-on-close";
+		type: "hidden";
+	}
+
+	interface Window_NavigationRejectedEvent {
+		name: string;
+		/**
+		 * source of navigation window name
+		 */
+		sourceName: string;
+		topic: "navigation-rejected";
+		/**
+		 * Url that was not reached "http://blocked-content.url"
+		 */
+		url: string;
+		/**
+		 * the UUID of the application the window belongs to.
+		 */
+		uuid: string;
+	}
+
+	interface AnimationTransition {
+		opacity?: {
+			/**
+			 * This value is clamped from 0.0 to 1.0
+			 */
+			opacity?: number;
+			/**
+			 * The total time in milliseconds this transition should take.
+			 */
+			duration?: number;
+			/**
+			 * Treat 'opacity' as absolute or as a delta. Defaults to false.
+			 */
+			relative?: boolean;
+		};
+		position?: {
+			/**
+			 * Defaults to the window's current left position in virtual screen coordinates.
+			 */
+			left?: number;
+			/**
+			 * Defaults to the window's current top position in virtual screen coordinates.
+			 */
+			top?: number;
+			/**
+			 * The total time in milliseconds this transition should take.
+			 */
+			duration?: number;
+			/**
+			 * Treat 'left' and 'top' as absolute or as deltas. Defaults to false.
+			 */
+			relative?: boolean;
+		};
+		size?: {
+			/**
+			 * Optional if height is present. Defaults to the window's current width.
+			 */
+			width?: number;
+			/**
+			 * Optional if width is present. Defaults to the window's current height.
+			 */
+			height?: number;
+			/**
+			 * The total time in milliseconds this transition should take.
+			 */
+			duration?: number;
+			/**
+			 * Treat 'width' and 'height' as absolute or as deltas. Defaults to false.
+			 */
+			relative?: boolean;
+		};
+	}
+
+	interface AnimationOptions {
+		/**
+		 * This option interrupts the current animation. When false it pushes this animation onto the end of the animation queue.
+		 */
+		interrupt?: boolean;
+		/**
+		 * Transition effect. Defaults to 'ease-in-out'.
+		 */
+		tween?: OpenFinTweenType;
+	}
+
+	interface WindowBounds {
+		/**
+		 * the height of the window.
+		 */
+		height?: number;
+		/**
+		 * left-most coordinate of the window.
+		 */
+		left?: number;
+		/**
+		 * top-most coordinate of the window.
+		 */
+		top?: number;
+		/**
+		 * the width of the window.
+		 */
+		width?: number;
+	}
+
+	interface SessionChangedEvent {
+		/**
+		 * the action that triggered this event:
+		 */
+		reason: "lock"
+		| "unlock"
+		| "remote-connect"
+		| "remote-disconnect"
+		| "unknown";
+		topic: "system";
+		type: "session-changed";
+	}
+
+	interface LaunchInfo {
+		launchMode: "fin-protocol"
+		| "fins-protocol"
+		| "shortcut"
+		| "command-line"
+		| "adapter"
+		| "other"
+		| string;
+	}
+
+	type OpenFinTweenType = "linear"
+		| "ease-in"
+		| "ease-out"
+		| "ease-in-out"
+		| "ease-in-quad"
+		| "ease-out-quad"
+		| "ease-in-out-quad"
+		| "ease-in-cubic"
+		| "ease-out-cubic"
+		| "ease-in-out-cubic"
+		| "ease-out-bounce"
+		| "ease-in-back"
+		| "ease-out-back"
+		| "ease-in-out-back"
+		| "ease-in-elastic"
+		| "ease-out-elastic"
+		| "ease-in-out-elastic";
+
+	type OpenFinApplicationEventType = "closed"
+		| "connected"
+		| "crashed"
+		| "initialized"
+		| "manifest-changed"
+		| "not-responding"
+		| "out-of-memory"
+		| "responding"
+		| "run-requested"
+		| "started"
+		| "tray-icon-clicked"
+		| "window-alert-requested"
+		| "window-auth-requested"
+		| "window-closed"
+		| "window-created"
+		| "window-end-load"
+		| "window-navigation-rejected"
+		| "window-show-requested"
+		| "window-start-load";
+
+	type OpenFinExternalApplicationEventType = "connected"
+		| "disconnected";
+
+	type OpenFinSystemEventType = "application-closed"
+		| "application-crashed"
+		| "application-created"
+		| "application-started"
+		| "desktop-icon-clicked"
+		| "idle-state-changed"
+		| "monitor-info-changed"
+		| "session-changed";
+
+	type OpenFinWindowEventType = "auth-requested"
+		| "blurred"
+		| "bounds-changed"
+		| "bounds-changing"
+		| "close-requested"
+		| "closed"
+		| "disabled-frame-bounds-changed"
+		| "disabled-frame-bounds-changing"
+		| "embedded"
+		| "external-process-exited"
+		| "external-process-started"
+		| "focused"
+		| "frame-disabled"
+		| "frame-enabled"
+		| "group-changed"
+		| "hidden"
+		| "initialized"
+		| "maximized"
+		| "minimized"
+		| "navigation-rejected"
+		| "restored"
+		| "show-requested"
+		| "shown";
+
+	type OpenFinAnchor = "top-left"
+		| "top-right"
+		| "bottom-left"
+		| "bottom-right";
+}
diff --git a/types/openfin/v30/openfin-tests.ts b/types/openfin/v30/openfin-tests.ts
new file mode 100644
index 0000000000..ce49b14f5c
--- /dev/null
+++ b/types/openfin/v30/openfin-tests.ts
@@ -0,0 +1,728 @@
+/// <reference path="./index.d.ts" />
+
+function test_application() {
+	let application: fin.OpenFinApplication;
+	// constructor
+	application = new fin.desktop.Application({
+		url: "application.html",
+		uuid: "74BED629-2D8E-4141-8582-73E364BDFA74",
+		name: "Application Name",
+		plugins: false,
+		mainWindowOptions: {
+			defaultHeight: 600,
+			defaultWidth: 800,
+			defaultTop: 300,
+			defaultLeft: 300,
+			autoShow: true
+		}
+	}, (successObj) => {
+		console.log("Application successfully created, HTTP response code:", successObj);
+		application.run();
+	}, (error) => {
+		console.log("Error creating application:", error);
+	});
+		//createFromManifest
+	fin.desktop.Application.createFromManifest("http://stuf.com/app.json", (app) => {
+		console.log(app.uuid);
+	}, err => console.log(err));
+	// getCurrent
+	application = fin.desktop.Application.getCurrent();
+	// wrap
+	application = fin.desktop.Application.wrap("454C7F31-A915-4EA2-83F2-CFA655453C52");
+	// getWindow
+	application.getWindow();
+	// addEventListener
+	application.addEventListener("closed", (event) => {
+		console.log("The application has closed");
+	}, () => {
+		console.log("The registration was successful");
+	}, reason => {
+		console.log("failure: " + reason);
+	});
+	// close
+	application.close();
+	// getChildWindows
+	application.getChildWindows(children => {
+		children.forEach(childWindow => {
+			console.log("Showing child: " + childWindow.name);
+			childWindow.show();
+		});
+	});
+	// getGroups
+	application.getGroups(allGroups => {
+		console.log(`There are a total of ${allGroups.length} groups.`);
+
+		let groupCounter = 1;
+		allGroups.forEach(windowGroup => {
+			console.log(`Group ${groupCounter} contains ${windowGroup.length} windows.`);
+			++groupCounter;
+		});
+	});
+	// getManifest
+	application.getManifest(manifest => {
+		console.log("Application manifest:");
+		console.log(manifest);
+	});
+	// getParentUuid
+	application.getParentUuid(parentUuid => {
+		console.log("UUID of parent application:");
+		console.log(parentUuid);
+	});
+	// getShortcuts
+	application.getShortcuts(config => {
+		console.log("Desktop shortcut is enabled: ", config.desktop);
+		console.log("Start Menu shortcut is enabled: ", config.startMenu);
+		console.log("System Startup shortcut is enabled: ", config.systemStartup);
+	});
+	// getInfo
+	application.getInfo(info => {
+		console.log(`Launch mode: ${info.launchMode}`);
+	});
+	// getTrayIconInfo
+	application.getTrayIconInfo(info => {
+		console.log(info.x, info.y, info.bounds.x, info.bounds.y, info.bounds.height, info.bounds.width,
+					info.monitorInfo.type, info.monitorInfo.reason);
+	});
+	// isRunning
+	application.isRunning(running => {
+		console.log("the application is", running ? "running" : "not running");
+	});
+	// registerCustomData
+	application.registerUser("a", "b", () => console.log("done"), err => console.log(err));
+	// removeEventListener
+	const previousCallback = (event: fin.WindowEvent) => { };
+	application.removeEventListener("closed", previousCallback, () => {
+		console.log("The unregistration was successful");
+	}, err => {
+		console.log("failure:", err);
+	});
+	// removeTrayIcon
+	application.removeTrayIcon(() => {
+		console.log("Removed the tray icon.");
+	}, err => {
+		console.log("failure:", err);
+	});
+	// restart
+	application.restart(() => {
+		console.log("You will not read this.");
+	}, err => {
+		console.log("failure:", err);
+	});
+	// schedule restart
+	application.scheduleRestart(() => {
+		console.log("You will not read this.");
+	}, err => {
+		console.log("failure:", err);
+	});
+	// setShortcuts
+	application.setShortcuts({
+		desktop: true,
+		startMenu: false,
+		systemStartup: true
+	}, () => {
+		console.log("Successfully set new shortcut states");
+	}, error => {
+		console.log("Failed to set new shortcut states. Error: ", error);
+	});
+	// setTrayIcon
+	application.setTrayIcon("https://developer.openf.in/download/openfin.png", clickInfo => {
+		console.log(`The mouse has clicked at (${clickInfo.x}, ${clickInfo.y})`);
+	});
+	// terminate
+	application.terminate();
+	// wait
+	application.addEventListener("not-responding", () => {
+		console.log("waiting for hung application");
+		application.wait();
+	});
+	//uuid
+	let hasUuid = application.uuid;
+}
+
+function test_external_application() {
+	let externalApp: fin.OpenFinExternalApplication;
+	// wrap
+	externalApp = fin.desktop.ExternalApp.wrap('my-uuid');
+	// addEventListener
+	externalApp.addEventListener('connected', () => {
+		console.log('external app connected');
+	}, () => {
+		console.log('The registration was successful');
+	}, (reason, err) => {
+		console.log(`Error Message: ${err.message} Error Stack: ${err.stack}`);
+	});
+	// removeEventListener
+	const previousCallback = () => { };
+	externalApp.removeEventListener('connected', previousCallback, () => {
+		console.log('The unregistration was successful');
+	}, (reason, err) => {
+		console.log(`Error Message: ${err.message} Error Stack: ${err.stack}`);
+	});
+}
+
+function test_inter_application_bus() {
+	// addSubscribeListener
+	fin.desktop.InterApplicationBus.addSubscribeListener((uuid, topic, name) => {
+		console.log(`The application ${uuid} has subscribed to ${topic}`);
+	});
+	// addUnsubscribeListener
+	fin.desktop.InterApplicationBus.addUnsubscribeListener((uuid, topic, name) => {
+		console.log(`The application ${uuid} has unsubscribed to ${topic}`);
+	});
+	// removeSubscribeListener
+	const aRegisteredListener = (uuid: string, topic: string, name: string) => { };
+	fin.desktop.InterApplicationBus.removeSubscribeListener(aRegisteredListener);
+	// removeUnsubscribeListener
+	fin.desktop.InterApplicationBus.removeUnsubscribeListener(aRegisteredListener);
+	// publish
+	fin.desktop.InterApplicationBus.publish("a topic", {
+		field1: "value1",
+		field2: "value2"
+	});
+	// send
+	fin.desktop.InterApplicationBus.send("an application's uuid", "a topic", {
+		field1: "value1",
+		field2: "value2"
+	});
+	// subscribe
+	fin.desktop.InterApplicationBus.subscribe("*", "a topic", (message, uuid, name) => {
+		console.log(`The application ${uuid} sent this message: ${message}`);
+	});
+	// unsubscribe
+	const aRegisteredMessageListener = (message: any, senderUuid: string) => {
+		console.log(message, senderUuid);
+	};
+	fin.desktop.InterApplicationBus.unsubscribe("*", "a topic", aRegisteredMessageListener);
+}
+
+function test_notification() {
+	let notification: fin.OpenFinNotification;
+	// getCurrent
+	notification = fin.desktop.Notification.getCurrent();
+	// close
+	notification.close();
+	// sendMessage
+	notification = new fin.desktop.Notification({
+		duration: 10,
+		url: "http://localhost:5000/Account/Register",
+		message: "Hello",
+		onShow: () => { },
+		// onClose: () => { },
+		onDismiss: () => { },
+		// onClick: () => { },
+		onMessage: () => { },
+		onError: () => { }
+	});
+	// sendMessageToApplication
+	notification.sendMessageToApplication("some message");
+}
+
+function test_system() {
+	// addEventListener
+	fin.desktop.System.addEventListener('monitor-info-changed', event => {
+		console.log("The monitor information has changed to: ", event);
+	}, () => {
+		console.log("The registration was successful");
+	}, err => {
+		console.log("failure: " + err);
+	});
+	// clearCache
+	fin.desktop.System.clearCache({
+		cache: true,
+		cookies: true,
+		localStorage: true,
+		appcache: true,
+		userData: true
+	});
+	// deleteCacheOnExit
+	fin.desktop.System.deleteCacheOnExit(() => {
+		console.log("successful");
+	}, err => {
+		console.log("failure: " + err);
+	});
+	// downloadAsset
+	const dirAppAsset = {
+		src: 'http://local:8000/dir.zip',
+		alias: 'dirApp',
+		version: '1.23.24',
+		target: 'dir.bat',
+		args: ''
+	};
+	fin.desktop.System.downloadAsset(dirAppAsset, progress => {
+		const downloadedPercent = Math.floor((progress.downloadedBytes / progress.totalBytes) * 100);
+		console.log(`Downloaded ${downloadedPercent}%`);
+	}, p => {
+		console.log(`Downlod complete, can be found on ${p.path}`);
+		// lets launch our application asset.
+		// launchDirApp();
+	}, (reason, err) => {
+		console.log(reason, err);
+	});
+	// exit
+	fin.desktop.System.exit(() => {
+		console.log("successful");
+	}, err => {
+		console.log("failure: " + err);
+	});
+	// getAllApplications
+	fin.desktop.System.getAllApplications(applicationInfoList => {
+		applicationInfoList.forEach(applicationInfo => {
+			console.log("Showing information for application with uuid: "
+				+ applicationInfo.uuid);
+			console.log("isRunning: ", applicationInfo.isRunning);
+		});
+	});
+	// getAllExternalApplications
+	fin.desktop.System.getAllExternalApplications(externalAppsInfoList => {
+		externalAppsInfoList.forEach(appInfo => {
+			console.log(`External app connected to the runtime with UUID ${appInfo.uuid}`);
+		});
+	});
+	// getAllWindows
+	fin.desktop.System.getAllWindows(windowInfoList => {
+		windowInfoList.forEach(windowInfo => {
+			console.log("Showing information for application with uuid: ", windowInfo.uuid);
+			console.log("Main window: ", windowInfo.mainWindow);
+			console.log("Child windows: ", windowInfo.childWindows);
+		});
+	});
+	// getCommandLineArguments
+	fin.desktop.System.getCommandLineArguments(args => {
+		console.log("The command line arguments are " + args);
+	});
+	// getDeviceId
+	fin.desktop.System.getDeviceId(id => {
+		console.log("The id of the device is: " + id);
+	});
+	// getEnvironmentVariable
+	fin.desktop.System.getEnvironmentVariable("APPDATA", variable => {
+		console.log("this is the APPDATA value", variable);
+	});
+	// getHostSpecs
+	fin.desktop.System.getHostSpecs(info => {
+		console.log(info);
+	}, error => {
+		console.log('There was an error:', error);
+	});
+	// getLog
+	fin.desktop.System.getLog('debug-2015-01-08-22-27-53.log', log => {
+		console.log(log);
+	});
+	// getLogList
+	fin.desktop.System.getLogList(logList => {
+		logList.forEach(logInfo => {
+			console.log(`The filename of the log is ${logInfo.name}, the size is ${logInfo.size}, and the date of creation is ${logInfo.date}`);
+		});
+	});
+	// getMonitorInfo
+	fin.desktop.System.getMonitorInfo(monitorInfo => {
+		console.log("This object contains information about all monitors: ", monitorInfo);
+	});
+	// getMousePosition
+	fin.desktop.System.getMousePosition(mousePosition => {
+		console.log(`The mouse is located at left: ${mousePosition.left}, top: ${mousePosition.top}`);
+	});
+	// getProcessList
+	fin.desktop.System.getProcessList(list => {
+		list.forEach(process => {
+			console.log(`UUID: ${process.uuid}, Application Name: ${process.name}`);
+		});
+	});
+	// getProxySettings
+	fin.desktop.System.getProxySettings(proxy => {
+		console.log(proxy);
+	});
+	// getRvmInfo
+	fin.desktop.System.getRvmInfo(rvmInfoObject => {
+		console.log("RVM version:", rvmInfoObject.version);
+		console.log("RVM has been running since:", rvmInfoObject["start-time"]);
+	}, err => {
+		console.log("Failed to get rvm info, error message:", err);
+	});
+	// getVersion
+	fin.desktop.System.getVersion(version => {
+		console.log("The version is " + version);
+	});
+	// launchExternalProcess
+	fin.desktop.System.launchExternalProcess({
+		path: "notepad",
+		arguments: "",
+		listener(result) {
+			console.log('the exit code', result.exitCode);
+		}
+	}, payload => {
+		console.log('Success:', payload.uuid);
+	}, error => {
+		console.log('Error:', error);
+	});
+	//
+	fin.desktop.System.launchExternalProcess({
+		// Additionally note that the executable found in the zip file specified in appAssets
+		// will default to the one mentioned by appAssets.target
+		// If the the path below refers to a specific path it will override this default
+		alias: "myApp",
+		listener(result) {
+			console.log('the exit code', result.exitCode);
+		}
+	}, payload => {
+		console.log('Success:', payload.uuid);
+	}, error => {
+		console.log('Error:', error);
+	});
+	//
+	fin.desktop.System.launchExternalProcess({
+		alias: "myApp",
+		arguments: "e f g",
+		listener(result) {
+			console.log('the exit code', result.exitCode);
+		}
+	}, payload => {
+		console.log('Success:', payload.uuid);
+	}, error => {
+		console.log('Error:', error);
+	});
+	//
+	fin.desktop.System.launchExternalProcess({
+		path: "C:\Users\ExampleUser\AppData\Local\OpenFin\OpenFinRVM.exe",
+		arguments: "--version",
+		certificate: {
+			trusted: true,
+			subject: 'O=OpenFin INC., L=New York, S=NY, C=US',
+			thumbprint: '3c a5 28 19 83 05 fe 69 88 e6 8f 4b 3a af c5 c5 1b 07 80 5b'
+		},
+		listener(result) {
+			console.log('the exit code', result.exitCode);
+		}
+	}, payload => {
+		console.log('Success:', payload.uuid);
+	}, error => {
+		console.log('Error:', error);
+	});
+	// log
+	fin.desktop.System.log("info", "An example log message", () => {
+		console.log("message successfully logged");
+	}, err => {
+		console.log(err);
+	});
+	// monitorExternalProcess
+	fin.desktop.System.monitorExternalProcess({
+		pid: 2508,
+		listener(result) {
+			console.log('the exit code', result.exitCode);
+		}
+	}, payload => {
+		console.log("The process is now being monitored: ", payload.uuid);
+	}, error => {
+		console.log("Error:", error);
+	});
+	// openUrlWithBrowser
+	fin.desktop.System.openUrlWithBrowser("https://developer.openf.in/", () => {
+		console.log("successful");
+	}, err => {
+		console.log("failure: " + err);
+	});
+	// registerExternalConnection
+	fin.desktop.System.registerExternalConnection("remote-connection-uuid", (...args: any[]) => {
+		console.log(args);
+	});
+	// releaseExternalProcess
+	fin.desktop.System.launchExternalProcess({
+		path: "notepad",
+		arguments: "",
+		listener(result) {
+			console.log("The exit code", result.exitCode);
+		}
+	}, result => {
+		console.log("Result UUID is " + result.uuid);
+
+		// release it.
+		fin.desktop.System.releaseExternalProcess(result.uuid, () => {
+			console.log("Process has been unmapped!");
+		}, reason => {
+			console.log("failure: " + reason);
+		});
+	});
+	// removeEventListener
+	const aRegisteredListener = (event: fin.SystemBaseEvent) => { };
+	fin.desktop.System.removeEventListener("monitor-info-changed", aRegisteredListener, () => {
+		console.log("successful");
+	}, err => {
+		console.log("failure: " + err);
+	});
+	// showDeveloperTools
+	fin.desktop.System.showDeveloperTools("uuid", "name", () => {
+		console.log("successful");
+	}, err => {
+		console.log("failure: " + err);
+	});
+	// terminateExternalProcess
+	fin.desktop.System.launchExternalProcess({
+		// notepad is in the system's PATH
+		path: "notepad",
+		arguments: "",
+		listener(result) {
+			console.log("The exit code", result.exitCode);
+		}
+	}, result => {
+		console.log("Result UUID is " + result.uuid);
+
+		// Attempt to close the process. Terminate after 4 seconds if it
+		// has not done so.
+		fin.desktop.System.terminateExternalProcess(result.uuid, 4000, info => {
+			console.log("Termination result " + info.result);
+		}, reason => {
+			console.log("failure: " + reason);
+		});
+	});
+	// updateProxySettings
+	fin.desktop.System.updateProxySettings("type", "proxyAddress", 8080, () => {
+		console.log('success');
+	}, err => {
+		console.log(err);
+	});
+}
+
+function test_system_clipboard() {
+	// availableFormats
+	fin.desktop.System.Clipboard.availableFormats(null, formats => {
+		formats.forEach(format => console.log(`The format ${format} is available to read`));
+	}, (reason, err) => {
+		console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
+	});
+	// readHtml
+	fin.desktop.System.Clipboard.readHtml(null, html => {
+		console.log(`This is the html from the clipboard: ${html}`);
+	}, (reason, err) => {
+		console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
+	});
+	// readRtf
+	fin.desktop.System.Clipboard.readRtf(null, rtf => {
+		console.log(`This is the rtf from the clipboard: ${rtf}`);
+	}, (reason, err) => {
+		console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
+	});
+	// readText
+	fin.desktop.System.Clipboard.readText(null, text => {
+		console.log(`This is the text from the clipboard: ${text}`);
+	}, (reason, err) => {
+		console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
+	});
+	// write
+	fin.desktop.System.Clipboard.write({
+		text: 'Hello Text!',
+		html: '<h1>Hello Html</h1>',
+		rtf: 'Hello Rtf'
+	}, null, () => {
+		console.log('Success!!');
+	}, (reason, err) => {
+		console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
+	});
+	// writeHtml
+	fin.desktop.System.Clipboard.writeHtml('<h1>Hello World</h1>', null, () => {
+		console.log('Success!!');
+	}, (reason, err) => {
+		console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
+	});
+	// writeRtf
+	fin.desktop.System.Clipboard.writeRtf('Hello World!', null, () => {
+		console.log('Success!!');
+	}, (reason, err) => {
+		console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
+	});
+	// writeText
+	fin.desktop.System.Clipboard.writeText('Hello World', null, () => {
+		console.log('Success!!');
+	}, (reason, err) => {
+		console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
+	});
+}
+
+function test_window() {
+	let finWindow: fin.OpenFinWindow;
+	// constructor
+	finWindow = new fin.desktop.Window({
+		name: "childWindow",
+		url: "child.html",
+		defaultWidth: 320,
+		defaultHeight: 320,
+		defaultTop: 10,
+		defaultLeft: 300,
+		frame: false,
+		resizable: false,
+		state: "normal"
+	}, () => {
+		const _win = finWindow.getNativeWindow();
+		_win.addEventListener("DOMContentLoaded", () => { finWindow.show(); });
+	}, error => {
+		console.log("Error creating window:", error);
+	});
+	// getCurrent
+	finWindow = fin.desktop.Window.getCurrent();
+	// getNativeWindow
+	let nativeWindow: Window;
+	nativeWindow = finWindow.getNativeWindow();
+	// getParentApplication
+	let parentApp: fin.OpenFinApplication;
+	parentApp = finWindow.getParentApplication();
+	// getParentWindow
+	let parentFinWindow: fin.OpenFinWindow;
+	parentFinWindow = finWindow.getParentWindow();
+	// wrap
+	finWindow = fin.desktop.Window.wrap("uuid", "name");
+	// addEventListener
+	finWindow.addEventListener("bounds-changed", event => {
+		console.log("The window has been moved or resized");
+	}, () => {
+		console.log("The registration was successful");
+	}, reason => {
+		console.log("failure:" + reason);
+	});
+	// animate
+	finWindow.animate({
+		opacity: {
+			opacity: 0.15,
+			duration: 1000
+		},
+		position: {
+			left: 10,
+			top: 10,
+			duration: 3000
+		}
+	}, {
+			interrupt: false
+		}, evt => {
+			// Callback will only fire after both "opacity" and "position" have finished animating.
+		});
+	// authenticate
+	finWindow.addEventListener('auth-requested', evt => {
+		finWindow.authenticate('userName', 'P@assw0rd', () => { }, (reason, err) => {
+			console.log("failure:", err);
+		});
+	});
+	// blur
+	finWindow.blur();
+	// bringToFront
+	finWindow.bringToFront();
+	// close
+	finWindow.close();
+	// disableFrame
+	finWindow.disableFrame();
+	// enableFrame
+	finWindow.enableFrame();
+	// flash
+	finWindow.flash();
+	// focus
+	finWindow.focus();
+	// getBounds
+	finWindow.getBounds(bounds => {
+		console.log(`top: ${bounds.top} left: ${bounds.left} height: ${bounds.height} width: ${bounds.width}`);
+	});
+	// getOptions
+	finWindow.getOptions(options => {
+		console.log(options);
+	});
+	// getSnapshot
+	finWindow.getSnapshot(base64Snapshot => {
+		console.log("data:image/png;base64," + base64Snapshot);
+	});
+	// getState
+	finWindow.getState(state => {
+		console.log("state: " + state);
+	});
+	// getZoomLevel
+	finWindow.getZoomLevel(level => {
+		console.log("zoom level: " + level);
+	}, error => {
+		console.log('error:', error);
+	});
+	// hide
+	finWindow.hide();
+	// isShowing
+	finWindow.isShowing(showing => {
+		console.log("the window is " + (showing ? "showing" : "hidden"));
+	});
+	// joinGroup
+	let secondWindow = new fin.desktop.Window({
+		url: "http://www.openfin.co",
+		name: "secondWindow",
+		autoShow: true
+	}, () => {
+		// When mainWindow moves or is moved, secondWindow moves by the same amount
+		secondWindow.joinGroup(finWindow);
+	});
+	// leaveGroup
+	secondWindow = new fin.desktop.Window({
+		url: "http://www.openfin.co",
+		name: "secondWindow",
+		autoShow: true
+	}, () => {
+		// When finWindow moves or is moved, secondWindow moves by the same amount
+		secondWindow.joinGroup(finWindow, () => {
+			// once we are in the group, lets leave it.
+			secondWindow.leaveGroup();
+		});
+	});
+	// maximize
+	finWindow.maximize();
+	// mergeGroups
+	{
+		const finWindowOne = new fin.desktop.Window({
+			url: "http://www.openfin.co",
+			name: "finWindowOne",
+			autoShow: true
+		});
+		const finWindowTwo = new fin.desktop.Window({
+			url: "http://www.openfin.co",
+			name: "finWindowTwo",
+			autoShow: true
+		});
+		const finWindowThree = new fin.desktop.Window({
+			url: "http://www.openfin.co",
+			name: "finWindowThree",
+			autoShow: true
+		});
+		const finWindowFour = new fin.desktop.Window({
+			url: "http://www.openfin.co",
+			name: "finWindowFour",
+			autoShow: true
+		});
+		// When finWindowOne moves or is moved, finWindowTwo moves by the same amount
+		finWindowOne.joinGroup(finWindowTwo);
+		// When finWindowThree moves or is moved, finWindowFour moves by the same amount
+		finWindowThree.joinGroup(finWindowFour);
+		// finWindowOne, finWindowTwo, finWindowThree, and finWindowFour now move together in the same group
+		finWindowOne.mergeGroups(finWindowThree);
+	}
+	// minimize
+	finWindow.minimize();
+	// moveBy
+	finWindow.moveBy(10, 10);
+	// moveTo
+	finWindow.moveTo(100, 200);
+	// removeEventListener
+	const aRegisteredListener = (event: fin.WindowBaseEvent) => { };
+	finWindow.removeEventListener("bounds-changed", aRegisteredListener);
+	// resizeBy
+	finWindow.resizeBy(10, 10, "top-right");
+	// resizeTo
+	finWindow.resizeTo(10, 10, "top-right");
+	// restore
+	finWindow.restore();
+	// setAsForeground
+	finWindow.setAsForeground();
+	// setBounds
+	finWindow.setBounds(100, 200, 400, 400);
+	// setZoomLevel
+	finWindow.setZoomLevel(10);
+	// show
+	finWindow.show();
+	// showAt
+	finWindow.showAt(10, 10, false);
+	// stopFlashing
+	finWindow.stopFlashing();
+	// updateOptions
+	finWindow.updateOptions({
+		frame: false,
+		maxWidth: 500
+	});
+}
diff --git a/types/openfin/v30/tsconfig.json b/types/openfin/v30/tsconfig.json
new file mode 100644
index 0000000000..fd3199ceb7
--- /dev/null
+++ b/types/openfin/v30/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": false,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "openfin-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/openfin/v30/tslint.json b/types/openfin/v30/tslint.json
new file mode 100644
index 0000000000..64aace11d6
--- /dev/null
+++ b/types/openfin/v30/tslint.json
@@ -0,0 +1,6 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "max-line-length": false
+    }
+}
diff --git a/types/openfin/v30/v30 b/types/openfin/v30/v30
new file mode 100644
index 0000000000..5c40c47ae0
--- /dev/null
+++ b/types/openfin/v30/v30
@@ -0,0 +1,1736 @@
+// Type definitions for OpenFin API 17.0
+// Project: https://openfin.co/
+// Definitions by: Chris Barker <https://github.com/chrisbarker>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// based on v6.49.17.14
+// see https://openfin.co/support/technical-faq/#what-do-the-numbers-in-the-runtime-version-mean
+
+/**
+ * JavaScript API
+ * The JavaScript API allows you to create an HTML/JavaScript application that has access to the native windowing environment,
+ * can communicate with other applications and has access to sandboxed system-level features.
+ *
+ * API Ready
+ * When using the OpenFin API, it is important to ensure that it has been fully loaded before making any API calls. To verify
+ * that the API is in fact ready, be sure to make any API calls either from within the fin.desktop.main() method or explicitly
+ * after it has returned. This avoids the situation of trying to access methods that are not yet fully injected.
+ *
+ * Overview
+ * When running within the OpenFin Runtime your web applications have access to the "fin" namespace and all the modules within the API
+ * without the need to include additional source files. You can treat the "fin" namespace as you would the "window", "navigator" or "document" objects.
+ */
+declare namespace fin {
+	const desktop: OpenFinDesktop;
+
+	interface OpenFinDesktop {
+		main(f: () => any): void;
+		Application: OpenFinApplicationStatic;
+		ExternalApp: OpenFinExternalApplicationStatic;
+		InterApplicationBus: OpenFinInterApplicationBus;
+		Notification: OpenFinNotificationStatic;
+		System: OpenFinSystem;
+		Window: OpenFinWindowStatic;
+	}
+
+	interface OpenFinApplicationStatic {
+		/**
+		 * Creates a new Application.
+		 * An object representing an application. Allows the developer to create, execute, show/close an application as well as listen to application events.
+		 */
+		new (
+			options: ApplicationOptions,
+			callback?: (successObj: { httpResponseCode: number }) => void,
+			errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): OpenFinApplication;
+		/**
+		 * Returns an Application object that represents an existing application.
+		 */
+		getCurrent(): OpenFinApplication;
+		/**
+		 * Returns an Application object that represents an existing application.
+		 */
+		wrap(uuid: string): OpenFinApplication;
+	}
+
+	/**
+	 * Application
+	 * An object representing an application.Allows the developer to create, execute, show / close an application as well as listen to application events.
+	 */
+	interface OpenFinApplication {
+		/**
+		 * Returns an instance of the main Window of the application
+		 */
+		getWindow(): OpenFinWindow;
+		/**
+		 * Registers an event listener on the specified event.
+		 */
+		addEventListener(
+			type: OpenFinApplicationEventType,
+			listener: (event: ApplicationBaseEvent
+				| TrayIconClickedEvent
+				| WindowEvent
+				| WindowAlertRequestedEvent
+				| WindowAuthRequested
+				| WindowNavigationRejectedEvent
+				| WindowEndLoadEvent) => void,
+			callback?: () => void,
+			errorCallback?: (reason: string) => void): void;
+		/**
+		 * Closes the application and any child windows created by the application.
+		 */
+		close(force?: boolean, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves an array of wrapped fin.desktop.Windows for each of the application's child windows.
+		 */
+		getChildWindows(callback?: (children: OpenFinWindow[]) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves an array of active window groups for all of the application's windows. Each group is represented as an array of wrapped fin.desktop.Windows.
+		 */
+		getGroups(callback?: (groups: OpenFinWindow[][]) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves the JSON manifest that was used to create the application. Invokes the error callback if the application was not created from a manifest.
+		 */
+		getManifest(callback?: (manifest: any) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves UUID of the application that launches this application. Invokes the error callback if the application was created from a manifest.
+		 */
+		getParentUuid(callback?: (uuid: string) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves current configuration of application's shortcuts.
+		 */
+		getShortcuts(callback?: (config: ShortCutConfig) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves information about the application.
+		 */
+		getInfo(callback?: (info: LaunchInfo) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Determines if the application is currently running.
+		 */
+		isRunning(callback?: (running: boolean) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Passes in custom data that will be relayed to the RVM
+		 */
+		registerCustomData(data: any, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Removes a previously registered event listener from the specified event.
+		 */
+		removeEventListener(
+			type: OpenFinApplicationEventType,
+			previouslyRegisteredListener: (event: ApplicationBaseEvent
+				| TrayIconClickedEvent
+				| WindowEvent
+				| WindowAlertRequestedEvent
+				| WindowAuthRequested
+				| WindowNavigationRejectedEvent
+				| WindowEndLoadEvent) => any,
+			callback?: () => void,
+			errorCallback?: (reason: string) => void): void;
+		/**
+		 * Removes the application's icon from the tray.
+		 */
+		removeTrayIcon(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Restarts the application.
+		 */
+		restart(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Runs the application. When the application is created, run must be called.
+		 */
+		run(callback?: (successObj: SuccessObj) => void, errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): void;
+		/**
+		 * Tells the rvm to relaunch the main application once upon a complete shutdown
+		 */
+		scheduleRestart(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Sets new shortcut configuration for current application.
+		 * Application has to be launched with a manifest and has to have shortcut configuration (icon url, name, etc.) in its manifest to
+		 * be able to change shortcut states.
+		 */
+		setShortcuts(config: ShortCutConfig, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Adds a customizable icon in the system tray and notifies the application when clicked.
+		 */
+		setTrayIcon(iconUrl: string, listener: (clickInfo: TrayIconClickedEvent) => void, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Closes the application by terminating its process.
+		 */
+		terminate(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Waits for a hanging application. This method can be called in response to an application "not-responding" to allow the application
+		 * to continue and to generate another "not-responding" message after a certain period of time.
+		 */
+		wait(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * The Application's uuid
+		 */
+		uuid: string;
+	}
+
+	interface ShortCutConfig {
+		/**
+		 * application has a shortcut on the desktop
+		 */
+		desktop?: boolean;
+		/**
+		 * application has no shortcut in the start menu
+		 */
+		startMenu?: boolean;
+		/**
+		 * application will be launched on system startup
+		 */
+		systemStartup?: boolean;
+	}
+
+	interface SuccessObj {
+		httpResponseCode: number;
+	}
+
+	interface NetworkErrorInfo extends ErrorInfo {
+		networkErrorCode: number;
+	}
+
+	interface ErrorInfo {
+		stack: string;
+		message: string;
+	}
+
+	interface ApplicationOptions {
+		/**
+		 * The name of the application.
+		 */
+		name?: string;
+		/**
+		 * The url to the application.
+		 */
+		url?: string;
+		/**
+		 * The UUID of the application, unique within the set of all other applications running in the OpenFin Runtime. name and uuid must match.
+		 */
+		uuid?: string;
+		/**
+		 * Enable Flash at the application level. Default: false.
+		 */
+		plugins?: boolean;
+		/**
+		 * The options of the main window of the application.
+		 */
+		mainWindowOptions?: WindowOptions;
+	}
+
+	interface WindowOptions {
+		/**
+		 * Enable keyboard shortcuts for devtools and zoom. Default: false for both.
+		 */
+		accelerator?: {
+			devtools?: boolean,
+			zoom?: boolean,
+			reload?: boolean,
+			reloadIgnoreCache?: boolean,
+		};
+		/**
+		 * A flag to always position the window at the top of the window stack. Default: false.
+		 * Updatable
+		 */
+		alwaysOnTop?: boolean;
+		/**
+		 * A flag to automatically show the Window when it is created. Default: false.
+		 */
+		autoShow?: boolean;
+		/**
+		 * A flag to show the context menu when right-clicking on a window. Gives access to the Developer Console for the Window. Default: true
+		 * Updatable
+		 */
+		contextMenu?: boolean;
+		/**
+		 * This defines and applies rounded corners for a frameless window. Default for both width and height: 0.
+		 * Updatable
+		 */
+		cornerRounding?: {
+			width?: number;
+			height?: number;
+		};
+		/**
+		 * A field that the user can attach serializable data to to be ferried around with the window options. Default: ''.
+		 */
+		customData?: any;
+		/**
+		 * Specifies that the window will be positioned in the center of the primary monitor when loaded for the first time on a machine.
+		 * When the window corresponding to that id is loaded again, the position from before the window was closed is used.
+		 * This option overrides defaultLeft and defaultTop. Default: false.
+		 */
+		defaultCentered?: boolean;
+		/**
+		 * The default height of the window. Specifies the height of the window when loaded for the first time on a machine.
+		 *  When the window corresponding to that id is loaded again, the height is taken to be the last height of the window before it was closed. Default: 500.
+		 */
+		defaultHeight?: number;
+		/**
+		 * The default left position of the window. Specifies the position of the left of the window when loaded for the first time on a machine.
+		 *  When the window corresponding to that id is loaded again, the value of left is taken to be the last value before the window was closed. Default: 100.
+		 */
+		defaultWidth?: number;
+		/**
+		 * The default top position of the window. Specifies the position of the top of the window when loaded for the first time on a machine.
+		 * When the window corresponding to that id is loaded again, the value of top is taken to be the last value before the window was closed. Default: 100.
+		 */
+		defaultTop?: number;
+		/**
+		 * The default width of the window. Specifies the width of the window when loaded for the first time on a machine.
+		 * When the window corresponding to that id is loaded again, the width is taken to be the last width of the window before it was closed. Default: 800.
+		 */
+		defaultLeft?: number;
+		/**
+		 * A flag to show the frame. Default: true.
+		 * Updatable
+		 */
+		frame?: boolean;
+		/**
+		 * A flag to allow a window to be hidden when the close button is clicked.Default: false.
+		 * Updatable
+		 */
+		hideOnClose?: boolean;
+		/**
+		 * A URL for the icon to be shown in the window title bar and the taskbar.Default: The parent application's applicationIcon.
+		 * Updatable
+		 */
+		icon?: string;
+		/**
+		 * The maximum height of a window.Will default to the OS defined value if set to - 1. Default: -1.
+		 * Updatable
+		 */
+		maxHeight?: number;
+		/**
+		 * A flag that lets the window be maximized.Default: true.
+		 * Updatable
+		 */
+		maximizable?: boolean;
+		/**
+		 * The maximum width of a window.Will default to the OS defined value if set to - 1. Default: -1.
+		 * Updatable
+		 */
+		maxWidth?: number;
+		/**
+		 * The minimum height of a window.Default: 0.
+		 * Updatable
+		 */
+		minHeight?: number;
+		/**
+		 * A flag that lets the window be minimized.Default: true.
+		 */
+		minimizable?: boolean;
+		/**
+		 * The minimum width of a window.Default: 0.
+		 */
+		minWidth?: number;
+		/**
+		 * The name for the window which must be unique within the context of the invoking Application.
+		 */
+		name?: string;
+		/**
+		 * A flag that specifies how transparent the window will be.This value is clamped between 0.0 and 1.0.Default: 1.0.
+		 * Updatable
+		 */
+		opacity?: number;
+		/**
+		 * A flag to drop to allow the user to resize the window.Default: true.
+		 * Updatable
+		 */
+		resizable?: boolean;
+		/**
+		 * Defines a region in pixels that will respond to user mouse interaction for resizing a frameless window.
+		 * Updatable
+		 */
+		resizeRegion?: {
+			/**
+			 * The size in pixels (Default: 2),
+			 */
+			size?: number;
+			/**
+			 * The size in pixels of an additional
+			 * square resizable region located at the
+			 * bottom right corner of a
+			 * frameless window. (Default: 4)
+			 */
+			bottomRightCorner?: number;
+		};
+		/**
+		 * A flag to show the Window's icon in the taskbar. Default: true.
+		 */
+		showTaskbarIcon?: boolean;
+		/**
+		 * A flag to cache the location of the window or not. Default: true.
+		 */
+		saveWindowState?: boolean;
+		/**
+		 * Specify a taskbar group for the window. Default: app's uuid.
+		 */
+		taskbarIconGroup?: string;
+		/**
+		 * A string that sets the window to be "minimized", "maximized", or "normal" on creation. Default: "normal".
+		 */
+		state?: string;
+		/**
+		 * The URL of the window. Default: "about:blank".
+		 */
+		url?: string;
+		/**
+		 * When set to false, the window will render before the "load" event is fired on the content's window.
+		 * Caution, when false you will see an initial empty white window. Default: true.
+		 */
+		waitForPageLoad?: boolean;
+	}
+
+	/**
+	 * Clipboard
+	 * Clipboard API allows reading and writting to the clipboard in multiple formats.
+	 */
+	interface OpenFinClipboard {
+		/**
+		 * Reads available formats for the clipboard type
+		 */
+		availableFormats(type: string | null, callback?: (formats: string[]) => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+		/**
+		 * Reads available formats for the clipboard type
+		 */
+		readHtml(type: string | null, callback?: (html: string) => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+		/**
+		 * Read the content of the clipboard as Rtf
+		 */
+		readRtf(type: string | null, callback?: (rtf: string) => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+		/**
+		 * Read the content of the clipboard as plain text
+		 */
+		readText(type: string | null, callback?: (text: string) => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+		/**
+		 * Writes data into the clipboard
+		 */
+		write(data: any, type: string | null, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+		/**
+		 * Writes data into the clipboard as Html
+		 */
+		writeHtml(data: string, type: string | null, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+		/**
+		 * Writes data into the clipboard as Rtf
+		 */
+		writeRtf(data: string, type: string | null, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+		/**
+		 * Writes data into the clipboard as plain text
+		 */
+		writeText(data: string, type: string | null, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+	}
+
+	interface OpenFinExternalApplicationStatic {
+		/**
+		 * Returns an External Application object that represents an existing external application.
+		 */
+		wrap(uuid: string): OpenFinExternalApplication;
+	}
+	/**
+	 * ExternalApplication
+	 * An object representing an application. Allows the developer to create, execute, show and close an application, as well as listen to application events.
+	 */
+	interface OpenFinExternalApplication {
+		/**
+		 * Registers an event listener on the specified event.
+		 */
+		addEventListener(
+			type: OpenFinExternalApplicationEventType,
+			listener: () => void,
+			callback?: () => void,
+			errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+		/**
+		 * Removes a previously registered event listener from the specified event.
+		 */
+		removeEventListener(
+			type: OpenFinExternalApplicationEventType,
+			listener: () => void,
+			callback?: () => void,
+			errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+	}
+
+	/**
+	 * InterApplicationBus
+	 * A messaging bus that allows for pub/sub messaging between different applications.
+	 */
+	interface OpenFinInterApplicationBus {
+		/**
+		 * Adds a listener that gets called when applications subscribe to the current application's messages.
+		 */
+		addSubscribeListener(listener: (uuid: string, topic: string, name: string) => void): void;
+		/**
+		 * Adds a listener that gets called when applications unsubscribe to the current application's messages.
+		 */
+		addUnsubscribeListener(listener: (uuid: string, topic: string, name: string) => void): void;
+		/**
+		 * Removes a previously registered subscribe listener.
+		 */
+		removeSubscribeListener(listener: (uuid: string, topic: string, name: string) => void): void;
+		/**
+		 * Removes a previously registered unsubscribe listener.
+		 */
+		removeUnsubscribeListener(listener: (uuid: string, topic: string, name: string) => void): void;
+		/**
+		 * Publishes a message to all applications running on OpenFin Runtime that are subscribed to the specified topic.
+		 */
+		publish(topic: string, message: any, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Sends a message to a specific application on a specific topic.
+		 */
+		send(destinationUuid: string, name: string, topic: string, message: any, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		send(destinationUuid: string, topic: string, message: any, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Subscribes to messages from the specified application on the specified topic. If the subscription is for a uuid, [name],
+		 * topic combination that has already been published to upon subscription you will receive the last 20 missed messages in the order they were published.
+		 */
+		subscribe(
+			senderUuid: string,
+			name: string,
+			topic: string,
+			listener: (message: any, uuid: string, name: string) => void,
+			callback?: () => void,
+			errorCallback?: (reason: string) => void): void;
+		subscribe(
+			senderUuid: string,
+			topic: string,
+			listener: (message: any, uuid: string, name: string) => void,
+			callback?: () => void,
+			errorCallback?: (reason: string) => void): void;
+		/**
+		 * Unsubscribes to messages from the specified application on the specified topic.
+		 */
+		unsubscribe(
+			senderUuid: string,
+			name: string,
+			topic: string,
+			listener: (message: any, uuid: string, name: string) => void,
+			callback?: () => void,
+			errorCallback?: (reason: string) => void): void;
+		unsubscribe(
+			senderUuid: string,
+			topic: string,
+			listener: (message: any, uuid: string, name: string) => void,
+			callback?: () => void,
+			errorCallback?: (reason: string) => void): void;
+	}
+
+	interface OpenFinNotificationStatic {
+		/**
+		 * ctor
+		 */
+		new (options: NotificationOptions, callback?: () => void, errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): OpenFinNotification;
+		/**
+		 * Gets an instance of the current notification. For use within a notification window to close the window or send a message back to its parent application.
+		 */
+		getCurrent(): OpenFinNotification;
+	}
+
+	/**
+	 * Notification
+	 * Notification represents a window on OpenFin Runtime which is shown briefly to the user on the bottom-right corner of the primary monitor.
+	 * A notification is typically used to alert the user of some important event which requires his or her attention.
+	 * Notifications are a child or your application that are controlled by the runtime.
+	 */
+	interface OpenFinNotification {
+		/**
+		 * Closes the notification.
+		 */
+		close(callback?: () => void): void;
+		/**
+		 * Sends a message to the notification.
+		 */
+		sendMessage(message: any, callback?: () => void): void;
+		/**
+		 * Sends a message from the notification to the application that created the notification. The message is handled by the notification's onMessage callback.
+		 */
+		sendMessageToApplication(message: any, callback?: () => void): void;
+	}
+
+	interface NotificationOptions {
+		/**
+		 * A boolean that will force dismissal even if the mouse is hovering over the notification
+		 */
+		ignoreMouseOver?: boolean;
+		/**
+		 * A message of any primitive or composite-primitive type to be passed to the notification upon creation.
+		 */
+		message?: any;
+		/**
+		 * The timeout for displaying a notification.Can be in milliseconds or "never".
+		 */
+		duration?: number | "never";
+		/**
+		 * The url of the notification
+		 */
+		url?: string;
+		/**
+		 * A function that is called when a notification is clicked.
+		 */
+		onClick?(callback: () => void): void;
+		/**
+		 * Invoked when the notification is closed via .close() method on the created notification instance
+		 * or the by the notification itself via fin.desktop.Notification.getCurrent().close().
+		 * NOTE: this is not invoked when the notification is dismissed via a swipe. For the swipe dismissal callback see onDismiss
+		 */
+		onClose?(callback: () => void): void;
+		/**
+		 * Invoked when a the notification is dismissed by swiping it off the screen to the right. NOTE: this is no fired on a programmatic close.
+		 */
+		onDismiss?(callback: () => void): void;
+		/**
+		 * A function that is called when an error occurs.The reason for the error is passed as an argument.
+		 */
+		onError?(errorCallback: (reason: string, errorObj: NetworkErrorInfo) => void): void;
+		/**
+		 * The onMessage function will respond to messages sent from notification.sendMessageToApplication.
+		 * The function is passed the message, which can be of any primitive or composite-primitive type.
+		 */
+		onMessage?(callback: (message: any) => void): void;
+		/**
+		 * A function that is called when a notification is shown.
+		 */
+		onShow?(callback: (successObj: SuccessObj) => void): void;
+	}
+
+	/**
+	 * System
+	 * An object representing the core of OpenFin Runtime.
+	 * Allows the developer to perform system-level actions, such as accessing logs, viewing processes, clearing the cache and exiting the runtime.
+	 */
+	interface OpenFinSystem {
+		Clipboard: OpenFinClipboard;
+		/**
+		 * Registers an event listener on the specified event.
+		 */
+		addEventListener(
+			type: OpenFinSystemEventType,
+			listener: (event: SystemBaseEvent | DesktopIconClickedEvent | IdleStateChangedEvent | MonitorInfoChangedEvent | SessionChangedEvent) => void,
+			callback?: () => void,
+			errorCallback?: (reason: string) => void): void;
+		/**
+		 * Clears cached data containing window state/positions,
+		 * application resource files (images, HTML, JavaScript files), cookies, and items stored in the Local Storage.
+		 */
+		clearCache(options: CacheOptions, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Clears all cached data when OpenFin Runtime exits.
+		 */
+		deleteCacheOnExit(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Downloads the given application asset
+		 */
+		downloadAsset(
+			assetObj: AppAssetInfo,
+			progressListener?: (progress: { downloadedBytes: number, totalBytes: number }) => void,
+			callback?: (successObj: { path: string }) => void,
+			errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): void;
+		/**
+		 * Exits the Runtime.
+		 */
+		exit(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves an array of data for all applications.
+		 */
+		getAllApplications(callback?: (applicationInfoList: ApplicationInfo[]) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves an array of data for all external applications.
+		 */
+		getAllExternalApplications(callback?: (applicationInfoList: ApplicationInfo[]) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves an array of data (name, ids, bounds) for all application windows.
+		 */
+		getAllWindows(callback?: (windowInfoList: WindowDetails[]) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves the command line argument string that started OpenFin Runtime.
+		 */
+		getCommandLineArguments(callback?: (args: string) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves the configuration object that started the OpenFin Runtime.
+		 */
+		getDeviceId(callback?: (uuid: string) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Gets the value of a given environment variable on the computer on which the runtime is installed.
+		 */
+		getEnvironmentVariable(envVar: string, callback?: (variable: string) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves system information.
+		 */
+		getHostSpecs(callback?: (info: HostSpecInfo) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves the contents of the log with the specified filename.
+		 */
+		getLog(logFileName: string, callback?: (variable: string) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves an array containing information for each log file.
+		 */
+		getLogList(callback?: (logInfoList: LogInfo[]) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves an object that contains data about the about the monitor setup of the computer that the runtime is running on.
+		 */
+		getMonitorInfo(callback?: (monitorInfo: MonitorInfo) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Returns the mouse in virtual screen coordinates (left, top).
+		 */
+		getMousePosition(callback?: (mousePosition: VirtualScreenCoordinates) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves an array of all of the runtime processes that are currently running.
+		 * Each element in the array is an object containing the uuid and the name of the application to which the process belongs.
+		 */
+		getProcessList(callback?: (processInfoList: ProcessInfo[]) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves the Proxy settings.
+		 */
+		getProxySettings(callback?: (proxy: ProxyInfo) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Returns information about the running RVM in an object.
+		 */
+		getRvmInfo(callback?: (rvmInfo: RvmInfo) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Returns the version of the runtime. The version contains the major, minor, build and revision numbers.
+		 */
+		getVersion(callback?: (version: string) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Runs an executable or batch file.
+		 */
+		launchExternalProcess(options: ExternalProcessLaunchInfo, callback?: (payload: { uuid: string }) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Writes the passed message into both the log file and the console.
+		 */
+		log(level: "debug" | "info" | "warn" | "error", message: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Monitors a running process.
+		 */
+		monitorExternalProcess(options: ExternalProcessInfo, callback?: (payload: { uuid: string }) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Opens the passed URL in the default web browser.
+		 */
+		openUrlWithBrowser(url: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * This function call will register a unique id and produce a token. The token can be used to broker an external connection.
+		 */
+		registerExternalConnection(
+			uuid: string,
+			callback?: (detail: {
+				/**
+				 * this will be unique each time
+				 */
+				token: string;
+				/**
+				 * "remote-connection-uuid"
+				 */
+				uuid: string;
+			}) => void,
+			errorCallback?: (reason: string) => void): void;
+		/**
+		 * Removes the process entry for the passed UUID obtained from a prior call of fin.desktop.System.launchExternalProcess().
+		 */
+		releaseExternalProcess(processUuid: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Removes a previously registered event listener from the specified event.
+		 */
+		removeEventListener(
+			type: OpenFinSystemEventType,
+			listener: (event: SystemBaseEvent | DesktopIconClickedEvent | IdleStateChangedEvent | MonitorInfoChangedEvent | SessionChangedEvent) => void,
+			callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Shows the Chrome Developer Tools for the specified window.
+		 */
+		showDeveloperTools(uuid: string, name: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Attempt to close an external process. The process will be terminated if it has not closed after the elapsed timeout in milliseconds.
+		 */
+		terminateExternalProcess(
+			processUuid: string,
+			timeout: number,
+			killTree: boolean,
+			callback?: (info: { result: "clean" | "terminated" | "failed" }) => void,
+			errorCallback?: (reason: string) => void): void;
+		terminateExternalProcess(
+			processUuid: string,
+			timeout: number,
+			callback?: (info: { result: "clean" | "terminated" | "failed" }) => void,
+			errorCallback?: (reason: string) => void): void;
+		/**
+		 * Update the OpenFin Runtime Proxy settings.
+		 */
+		updateProxySettings(type: string, address: string, port: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
+	}
+
+	interface CacheOptions {
+		cache?: boolean;
+		cookies?: boolean;
+		localStorage?: boolean;
+		appcache?: boolean;
+		userData?: boolean;
+	}
+
+	interface AppAssetInfo {
+		src?: string;
+		alias?: string;
+		version?: string;
+		target?: string;
+		args?: string;
+	}
+
+	interface ApplicationInfo {
+		/**
+		 * true when the application is running.
+		 */
+		isRunning?: boolean;
+		/**
+		 * uuid of the application.
+		 */
+		uuid?: string;
+		/**
+		 * uuid of the application that launches this application.
+		 */
+		parentUuid?: string;
+	}
+
+	interface WindowDetails {
+		uuid?: string;
+		mainWindow?: WindowInfo;
+		childWindows?: WindowInfo[];
+	}
+
+	interface WindowInfo {
+		/**
+		 * name of the child window
+		 */
+		name?: string;
+		/**
+		 * top-most coordinate of the child window
+		 */
+		top?: number;
+		/**
+		 * right-most coordinate of the child window
+		 */
+		right?: number;
+		/**
+		 * bottom-most coordinate of the child window
+		 */
+		bottom?: number;
+		/**
+		 * left-most coordinate of the child window
+		 */
+		left?: number;
+	}
+
+	interface HostSpecInfo {
+		/**
+		 * "x86" for 32-bit or "x86_64" for 64-bit
+		 */
+		arch: string;
+		/**
+		 * Same payload as Node's os.cpus()
+		 */
+		cpus: NodeCpuInfo[];
+		gpu: {
+			/**
+			 * Graphics card name
+			 */
+			name: string;
+		};
+		/**
+		 * Same payload as Node's os.totalmem()
+		 */
+		memory: number;
+		/**
+		 * OS name and version/edition
+		 */
+		name: string;
+	}
+
+	interface NodeCpuInfo {
+		model: string;
+		/**
+		 * in MHz
+		 */
+		speed: number;
+		times: {
+			/**
+			 * The number of milliseconds the CPU has spent in user mode.
+			 */
+			user: number;
+			/**
+			 * The number of milliseconds the CPU has spent in nice mode.
+			 */
+			nice: number;
+			/**
+			 * The number of milliseconds the CPU has spent in sys mode.
+			 */
+			sys: number;
+			/**
+			 * The number of milliseconds the CPU has spent in idle mode.
+			 */
+			idle: number;
+			/**
+			 * The number of milliseconds the CPU has spent in irq mode.
+			 */
+			irq: number;
+		};
+	}
+
+	interface LogInfo {
+		/**
+		 * the filename of the log
+		 */
+		name?: string;
+		/**
+		 * the size of the log in bytes
+		 */
+		size?: number;
+		/**
+		 * the unix time at which the log was created "Thu Jan 08 2015 14:40:30 GMT-0500 (Eastern Standard Time)"
+		 */
+		date?: string;
+	}
+
+	interface ProcessInfo {
+		/**
+		 * the percentage of total CPU usage
+		 */
+		cpuUsage?: number;
+		/**
+		 * the application name
+		 */
+		name?: string;
+		/**
+		 * the current nonpaged pool usage in bytes
+		 */
+		nonPagedPoolUsage?: number;
+		/**
+		 * the number of page faults
+		 */
+		pageFaultCount?: number;
+		/**
+		 * the current paged pool usage in bytes
+		 */
+		pagedPoolUsage?: number;
+		/**
+		 * the total amount of memory in bytes that the memory manager has committed
+		 */
+		pagefileUsage?: number;
+		/**
+		 * the peak nonpaged pool usage in bytes
+		 */
+		peakNonPagedPoolUsage?: number;
+		/**
+		 * the peak paged pool usage in bytes
+		 */
+		peakPagedPoolUsage?: number;
+		/**
+		 * the peak value in bytes of pagefileUsage during the lifetime of this process
+		 */
+		peakPagefileUsage?: number;
+		/**
+		 * the peak working set size in bytes
+		 */
+		peakWorkingSetSize?: number;
+		/**
+		 * the native process identifier
+		 */
+		processId?: number;
+		/**
+		 * the application UUID
+		 */
+		uuid?: string;
+		/**
+		 * the current working set size (both shared and private data) in bytes
+		 */
+		workingSetSize?: number;
+	}
+
+	interface ProxyInfo {
+		/**
+		 * the configured Proxy Address
+		 */
+		proxyAddress?: string;
+		/**
+		 * the configured Proxy port
+		 */
+		proxyPort?: number;
+		/**
+		 * Proxy Type
+		 */
+		type?: string;
+	}
+
+	interface RvmInfo {
+		version?: string;
+		"start-time"?: string;
+	}
+
+	interface ExternalProcessLaunchInfo {
+		path?: string;
+		/**
+		 * Additionally note that the executable found in the zip file specified in appAssets
+		 * will default to the one mentioned by appAssets.target
+		 * If the the path below refers to a specific path it will override this default
+		 */
+		alias?: string;
+		/**
+		 * When using alias; if no arguments are passed then the arguments (if any)
+		 * are taken from the 'app.json' file, from the  'args' parameter
+		 * of the 'appAssets' Object with the relevant 'alias'.
+		 * If 'arguments' is passed as a parameter it takes precedence
+		 * over any 'args' set in the 'app.json'.
+		 */
+		arguments?: string;
+		listener?(result: {
+			/**
+			 * "Exited" Or "released" on a call to releaseExternalProcess
+			 */
+			topic?: string;
+			/**
+			 * The mapped UUID which identifies the launched process
+			 */
+			uuid?: string;
+			/*
+			 * Process exit code
+			 */
+			exitCode?: number;
+		}): void;
+		certificate?: CertificationInfo;
+	}
+
+	interface CertificationInfo {
+		/**
+		 * A hex string with or without spaces
+		 */
+		serial?: string;
+		/**
+		 * An internally tokenized and comma delimited string allowing partial or full checks of the subject fields
+		 */
+		subject?: string;
+		/**
+		 * A hex string with or without spaces
+		 */
+		publickey?: string;
+		/**
+		 * A hex string with or without spaces
+		 */
+		thumbprint?: string;
+		/**
+		 * A boolean indicating that the certificate is trusted and not revoked
+		 */
+		trusted?: boolean;
+	}
+
+	interface ExternalProcessInfo {
+		pid?: number;
+		listener?(result: {
+			/**
+			 * "Exited" Or "released" on a call to releaseExternalProcess
+			 */
+			topic?: string;
+			/**
+			 * The mapped UUID which identifies the launched process
+			 */
+			uuid?: string;
+			/*
+				* Process exit code
+				*/
+			exitCode?: number;
+		}): void;
+	}
+
+	interface OpenFinWindowStatic {
+		/**
+		 * Class: Window
+		 *
+		 * new Window(options, callbackopt, errorCallbackopt)
+		 *
+		 * Creates a new OpenFin Window
+		 *
+		 * A basic window that wraps a native HTML window. Provides more fine-grained control over the window state such as the ability to minimize,
+		 * maximize, restore, etc. By default a window does not show upon instantiation; instead the window's show() method must be invoked manually.
+		 * The new window appears in the same process as the parent window.
+		 * @param options - The options of the window
+		 * @param [callback] - Called if the window creation was successful
+		 * @param [callback.successObj] - httpResponseCode
+		 */
+		new (
+			options: WindowOptions,
+			callback?: (successObj: { httpResponseCode: number }) => void,
+			errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): OpenFinWindow;
+		/**
+		 * Returns an instance of the current window.
+		 * @returns Current window
+		 */
+		getCurrent(): OpenFinWindow;
+		/**
+		 * Returns a Window object that wraps an existing window.
+		 */
+		wrap(appUuid: string, windowName: string): OpenFinWindow;
+	}
+
+	/**
+	 * Window
+	 * A basic window that wraps a native HTML window. Provides more fine-grained control over the window state such as the ability to minimize,
+	 * maximize, restore, etc. By default a window does not show upon instantiation; instead the window's show() method must be invoked manually.
+	 * The new window appears in the same process as the parent window.
+	 */
+	interface OpenFinWindow {
+		/**
+		 * Name of window
+		 */
+		name: string;
+		/**
+		 * Returns the native JavaScript "window" object for the window. This method can only be used by the parent application or the window itself,
+		 * otherwise it will return undefined. The same Single-Origin-Policy (SOP) rules apply for child windows created by window.open(url) in that the
+		 * contents of the window object are only accessible if the URL has the same origin as the invoking window. See example below.
+		 * Also, will not work with fin.desktop.Window objects created with fin.desktop.Window.wrap().
+		 * @returns Native window
+		 */
+		getNativeWindow(): Window;
+		/**
+		 * Gets the parent application.
+		 * @returns Parent application
+		 */
+		getParentApplication(): OpenFinApplication;
+		/**
+		 * Gets the parent window.
+		 */
+		getParentWindow(): OpenFinWindow;
+		/**
+		 * Registers an event listener on the specified event.
+		 */
+		addEventListener(
+			type: OpenFinWindowEventType,
+			listener: (event: WindowBaseEvent
+				| WindowAuthRequestedEvent
+				| WindowBoundsEvent
+				| WindowExternalProcessStartedEvent
+				| WindowExternalProcessExited
+				| WindowGroupChangedEvent
+				| WindowHiddenEvent
+				| Window_NavigationRejectedEvent) => void,
+			callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Performs the specified window transitions
+		 */
+		animate(transitions: AnimationTransition, options: AnimationOptions, callback?: (event: any) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Provides credentials to authentication requests
+		 */
+		authenticate(userName: string, password: string, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+		/**
+		 * Removes focus from the window.
+		 */
+		blur(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Brings the window to the front of the OpenFin window stack.
+		 */
+		bringToFront(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Closes the window.
+		 * @param Close will be prevented from closing when force is false and 'close-requested' has been subscribed to for application's main window.
+		 */
+		close(force?: boolean, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Prevents a user from changing a window's size/position when using the window's frame.
+		 * 'disabled-frame-bounds-changing' is generated at the start of and during a user move/size operation.
+		 * 'disabled-frame-bounds-changed' is generated after a user move/size operation.
+		 * The events provide the bounds that would have been applied if the frame was enabled.
+		 * 'frame-disabled' is generated when an enabled frame becomes disabled.
+		 */
+		disableFrame(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Re-enables user changes to a window's size/position when using the window's frame.
+		 * 'disabled-frame-bounds-changing' is generated at the start of and during a user move/size operation.
+		 * 'disabled-frame-bounds-changed' is generated after a user move/size operation.
+		 * The events provide the bounds that would have been applied if the frame was enabled.
+		 * 'frame-enabled' is generated when a disabled frame has becomes enabled.
+		 */
+		enableFrame(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Flashes the window's frame and taskbar icon until the window is activated.
+		 */
+		flash(options?: any, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Gives focus to the window.
+		 */
+		focus(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Gets the current bounds (top, left, width, height) of the window.
+		 */
+		getBounds(callback?: (bounds: WindowBounds) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves an array containing wrapped fin.desktop.Windows that are grouped with this window. If a window is not in a group an empty array is returned.
+		 * Please note that calling window is included in the result array.
+		 */
+		getGroup(callback?: (group: OpenFinWindow[]) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Gets the current settings of the window.
+		 */
+		getOptions(callback?: (options: WindowOptions) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Gets a base64 encoded PNG snapshot of the window.
+		 */
+		getSnapshot(callback?: (base64Snapshot: string) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Gets the current state ("minimized", "maximized", or "restored") of the window.
+		 */
+		getState(callback?: (state: "minimized" | "maximized" | "restored") => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Returns the zoom level of the window.
+		 */
+		getZoomLevel(callback?: (level: number) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Hides the window.
+		 */
+		hide(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Determines if the window is currently showing.
+		 */
+		isShowing(callback?: (showing: boolean) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Joins the same window group as the specified window.
+		 */
+		joinGroup(target: OpenFinWindow, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Leaves the current window group so that the window can be move independently of those in the group.
+		 */
+		leaveGroup(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Maximizes the window.
+		 */
+		maximize(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Merges the instance's window group with the same window group as the specified window
+		 */
+		mergeGroups(target: OpenFinWindow, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Minimizes the window.
+		 */
+		minimize(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Moves the window by a specified amount.
+		 */
+		moveBy(deltaLeft: number, deltaTop: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Moves the window to a specified location.
+		 */
+		moveTo(left: number, top: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Removes a previously registered event listener from the specified event.
+		 */
+		removeEventListener(
+			type: OpenFinWindowEventType,
+			listener: (event: WindowBaseEvent
+				| WindowAuthRequestedEvent
+				| WindowBoundsEvent
+				| WindowExternalProcessStartedEvent
+				| WindowExternalProcessExited
+				| WindowGroupChangedEvent
+				| WindowHiddenEvent
+				| Window_NavigationRejectedEvent) => void,
+			callback?: () => void,
+			errorCallback?: (reason: string) => void): void;
+		/**
+		 * Resizes the window by a specified amount.
+		 */
+		resizeBy(deltaWidth: number, deltaHeight: number, anchor: OpenFinAnchor, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Resizes the window by a specified amount.
+		 */
+		resizeTo(width: number, height: number, anchor: OpenFinAnchor, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Restores the window to its normal state (i.e., unminimized, unmaximized).
+		 */
+		restore(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Will bring the window to the front of the entire stack and give it focus.
+		 */
+		setAsForeground(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Sets the window's size and position
+		 */
+		setBounds(left: number, top: number, width: number, height: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Sets the zoom level of the window.
+		 */
+		setZoomLevel(level: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Shows the window if it is hidden.
+		 * @param Show will be prevented from closing when force is false and 'show-requested' has been subscribed to for application's main window.
+		 */
+		show(force?: boolean, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Shows the window if it is hidden at the specified location. If the toggle parameter is set to true, the window will alternate between showing and hiding.
+		 */
+		showAt(left: number, top: number, force?: boolean, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Stops the taskbar icon from flashing.
+		 */
+		stopFlashing(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Updates the window using the passed options
+		 */
+		updateOptions(options: WindowOptions, callback?: () => void, errorCallback?: (reason: string) => void): void;
+	}
+
+	interface ApplicationBaseEvent {
+		topic: string;
+		type: OpenFinApplicationEventType;
+		uuid: string;
+	}
+
+	interface TrayIconClickedEvent extends ApplicationBaseEvent {
+		button: number; // 0 for left, 1 for middle, 2 for right
+		monitorInfo: MonitorInfo;
+		x: number; // the cursor x coordinate
+		y: number; // the cursor y coordinate
+	}
+
+	interface WindowEvent extends ApplicationBaseEvent {
+		name: string;
+	}
+
+	interface WindowAlertRequestedEvent extends WindowEvent {
+		message: string;
+		url: string;
+	}
+
+	interface WindowAuthRequested extends WindowEvent {
+		authInfo: {
+			host: string;
+			isProxy: boolean;
+			port: number;
+			realm: string;
+			scheme: string;
+		};
+	}
+
+	interface WindowNavigationRejectedEvent extends WindowEvent {
+		sourceName: string;
+		url: string;
+	}
+
+	interface WindowEndLoadEvent extends WindowEvent {
+		documentName: string;
+		isMain: boolean;
+	}
+
+	interface MonitorInfoChangedEvent extends MonitorInfo {
+		topic: "system";
+		type: "monitor-info-changed";
+	}
+
+	interface MonitorInfo {
+		nonPrimaryMonitors: MonitorInfoDetail[];
+		primaryMonitor: MonitorInfoDetail;
+		reason: string;
+		taskbar: {
+			edge: "left" | "right" | "top" | "bottom",
+			rect: MontiorCoordinates
+		};
+		topic: "system";
+		type: "monitor-info-changed";
+		virtualScreen: MontiorCoordinates;
+	}
+
+	interface MonitorInfoDetail {
+		availableRect: MontiorCoordinates;
+		deviceId: string;
+		displayDeviceActive: boolean;
+		monitorRect: MontiorCoordinates;
+		name: string;
+	}
+
+	interface MontiorCoordinates {
+		bottom: number;
+		left: number;
+		right: number;
+		top: number;
+	}
+
+	interface VirtualScreenCoordinates {
+		left: number;
+		top: number;
+	}
+
+	interface SystemBaseEvent {
+		topic: string;
+		type: OpenFinSystemEventType;
+		uuid: string;
+	}
+
+	interface DesktopIconClickedEvent {
+		mouse: {
+			/**
+			 * the left virtual screen coordinate of the mouse
+			 */
+			left: number,
+			/**
+			 * the top virtual screen coordinate of the mouse
+			 */
+			top: number
+		};
+		/**
+		 * the number of milliseconds that have elapsed since the system was started,
+		 */
+		tickCount: number;
+		topic: "system";
+		type: "desktop-icon-clicked";
+	}
+
+	interface IdleStateChangedEvent {
+		/**
+		 * How long in milliseconds since the user has been idle.
+		 */
+		elapsedTime: number;
+		/**
+		 * true when the user is idle,false when the user has returned;
+		 */
+		isIdle: boolean;
+		topic: "system";
+		type: "idle-state-changed";
+	}
+
+	interface WindowBaseEvent {
+		/**
+		 * the name of the window
+		 */
+		name: string;
+		/**
+		 * always window
+		 */
+		topic: "window";
+		/**
+		 * window event type
+		 */
+		type: OpenFinWindowEventType;
+		/**
+		 * the UUID of the application the window belongs to
+		 */
+		uuid: string;
+	}
+
+	interface WindowAuthRequestedEvent extends WindowBaseEvent {
+		authInfo: {
+			host: string;
+			isProxy: boolean;
+			port: number;
+			realm: string;
+			scheme: string;
+		};
+	}
+
+	interface WindowBoundsEvent extends WindowBaseEvent {
+		/**
+		 * describes what kind of change occurred.
+		 * 0 means a change in position.
+		 * 1 means a change in size.
+		 * 2 means a change in position and size.
+		 */
+		changeType: number;
+		/**
+		 * true when pending changes have been applied to the window.
+		 */
+		deferred: boolean;
+		/**
+		 * the new height of the window.
+		 */
+		height: number;
+		/**
+		 * the left-most coordinate of the window.
+		 */
+		left: number;
+		/**
+		 * the top-most coordinate of the window.
+		 */
+		top: number;
+
+		type: "bounds-changed" | "bounds-changing" | "disabled-frame-bounds-changed" | "disabled-frame-bounds-changing";
+		/**
+		 * the new width of the window.
+		 */
+		width: number;
+	}
+
+	interface WindowExternalProcessStartedEvent extends WindowBaseEvent {
+		/**
+		 * the process handle uuid
+		 */
+		processUuid: string;
+		type: "external-process-started";
+	}
+
+	interface WindowExternalProcessExited extends WindowBaseEvent {
+		/**
+		 * the process exit code
+		 */
+		exitCode: number;
+		/**
+		 * the process handle uuid
+		 */
+		processUuid: string;
+		type: "external-process-exited";
+	}
+
+	interface WindowGroupChangedEvent extends WindowBaseEvent {
+		/**
+		 * Which group array the window that the event listener was registered on is included in:
+		 * 'source' The window is included in sourceGroup.
+		 * 'target' The window is included in targetGroup.
+		 * 'nothing' The window is not included in sourceGroup nor targetGroup.
+		 */
+		memberOf: "source" | "target" | "nothing";
+		/**
+		 * The reason this event was triggered.
+		 * 'leave' A window has left the group due to a leave or merge with group.
+		 * 'join' A window has joined the group.
+		 * 'merge' Two groups have been merged together.
+		 * 'disband' There are no other windows in the group.
+		 */
+		reason: "leave" | "join" | "merge" | "disband";
+		/**
+		 * All the windows in the group the sourceWindow originated from.
+		 */
+		sourceGroup: WindowOfGroupInfo[];
+		/**
+		 * The UUID of the application the sourceWindow belongs to The source window is the window in which (merge/join/leave)group(s) was called.
+		 */
+		sourceWindowAppUuid: string;
+		/**
+		 * the name of the sourcewindow.The source window is the window in which(merge / join / leave) group(s) was called.
+		 */
+		sourceWindowName: string;
+		/**
+		 * All the windows in the group the targetWindow orginated from
+		 */
+		targetGroup: WindowOfGroupInfo[];
+		/**
+		 * The UUID of the application the targetWindow belongs to. The target window is the window that was passed into (merge/join) group(s).
+		 */
+		targetWindowAppUuid: string;
+		/**
+		 * The name of the targetWindow. The target window is the window that was passed into (merge/join) group(s).
+		 */
+		targetWindowName: string;
+		type: "group-changed";
+	}
+
+	interface WindowOfGroupInfo {
+		/**
+		 * The UUID of the application this window entry belongs to.
+		 */
+		appUuid: string;
+		/**
+		 * The name of this window entry.
+		 */
+		windowName: string;
+	}
+
+	interface WindowHiddenEvent extends WindowBaseEvent {
+		/**
+		 * What action prompted the close.
+		 * The reasons are: "hide", "hide-on-close"
+		 */
+		reason: "hide" | "hide-on-close";
+		type: "hidden";
+	}
+
+	interface Window_NavigationRejectedEvent {
+		name: string;
+		/**
+		 * source of navigation window name
+		 */
+		sourceName: string;
+		topic: "navigation-rejected";
+		/**
+		 * Url that was not reached "http://blocked-content.url"
+		 */
+		url: string;
+		/**
+		 * the UUID of the application the window belongs to.
+		 */
+		uuid: string;
+	}
+
+	interface AnimationTransition {
+		opacity?: {
+			/**
+			 * This value is clamped from 0.0 to 1.0
+			 */
+			opacity?: number;
+			/**
+			 * The total time in milliseconds this transition should take.
+			 */
+			duration?: number;
+			/**
+			 * Treat 'opacity' as absolute or as a delta. Defaults to false.
+			 */
+			relative?: boolean;
+		};
+		position?: {
+			/**
+			 * Defaults to the window's current left position in virtual screen coordinates.
+			 */
+			left?: number;
+			/**
+			 * Defaults to the window's current top position in virtual screen coordinates.
+			 */
+			top?: number;
+			/**
+			 * The total time in milliseconds this transition should take.
+			 */
+			duration?: number;
+			/**
+			 * Treat 'left' and 'top' as absolute or as deltas. Defaults to false.
+			 */
+			relative?: boolean;
+		};
+		size?: {
+			/**
+			 * Optional if height is present. Defaults to the window's current width.
+			 */
+			width?: number;
+			/**
+			 * Optional if width is present. Defaults to the window's current height.
+			 */
+			height?: number;
+			/**
+			 * The total time in milliseconds this transition should take.
+			 */
+			duration?: number;
+			/**
+			 * Treat 'width' and 'height' as absolute or as deltas. Defaults to false.
+			 */
+			relative?: boolean;
+		};
+	}
+
+	interface AnimationOptions {
+		/**
+		 * This option interrupts the current animation. When false it pushes this animation onto the end of the animation queue.
+		 */
+		interrupt?: boolean;
+		/**
+		 * Transition effect. Defaults to 'ease-in-out'.
+		 */
+		tween?: OpenFinTweenType;
+	}
+
+	interface WindowBounds {
+		/**
+		 * the height of the window.
+		 */
+		height?: number;
+		/**
+		 * left-most coordinate of the window.
+		 */
+		left?: number;
+		/**
+		 * top-most coordinate of the window.
+		 */
+		top?: number;
+		/**
+		 * the width of the window.
+		 */
+		width?: number;
+	}
+
+	interface SessionChangedEvent {
+		/**
+		 * the action that triggered this event:
+		 */
+		reason: "lock"
+		| "unlock"
+		| "remote-connect"
+		| "remote-disconnect"
+		| "unknown";
+		topic: "system";
+		type: "session-changed";
+	}
+
+	interface LaunchInfo {
+		launchMode: "fin-protocol"
+		| "fins-protocol"
+		| "shortcut"
+		| "command-line"
+		| "adapter"
+		| "other"
+		| string;
+	}
+
+	type OpenFinTweenType = "linear"
+		| "ease-in"
+		| "ease-out"
+		| "ease-in-out"
+		| "ease-in-quad"
+		| "ease-out-quad"
+		| "ease-in-out-quad"
+		| "ease-in-cubic"
+		| "ease-out-cubic"
+		| "ease-in-out-cubic"
+		| "ease-out-bounce"
+		| "ease-in-back"
+		| "ease-out-back"
+		| "ease-in-out-back"
+		| "ease-in-elastic"
+		| "ease-out-elastic"
+		| "ease-in-out-elastic";
+
+	type OpenFinApplicationEventType = "closed"
+		| "connected"
+		| "crashed"
+		| "initialized"
+		| "manifest-changed"
+		| "not-responding"
+		| "out-of-memory"
+		| "responding"
+		| "run-requested"
+		| "started"
+		| "tray-icon-clicked"
+		| "window-alert-requested"
+		| "window-auth-requested"
+		| "window-closed"
+		| "window-created"
+		| "window-end-load"
+		| "window-navigation-rejected"
+		| "window-show-requested"
+		| "window-start-load";
+
+	type OpenFinExternalApplicationEventType = "connected"
+		| "disconnected";
+
+	type OpenFinSystemEventType = "application-closed"
+		| "application-crashed"
+		| "application-created"
+		| "application-started"
+		| "desktop-icon-clicked"
+		| "idle-state-changed"
+		| "monitor-info-changed"
+		| "session-changed";
+
+	type OpenFinWindowEventType = "auth-requested"
+		| "blurred"
+		| "bounds-changed"
+		| "bounds-changing"
+		| "close-requested"
+		| "closed"
+		| "disabled-frame-bounds-changed"
+		| "disabled-frame-bounds-changing"
+		| "embedded"
+		| "external-process-exited"
+		| "external-process-started"
+		| "focused"
+		| "frame-disabled"
+		| "frame-enabled"
+		| "group-changed"
+		| "hidden"
+		| "initialized"
+		| "maximized"
+		| "minimized"
+		| "navigation-rejected"
+		| "restored"
+		| "show-requested"
+		| "shown";
+
+	type OpenFinAnchor = "top-left"
+		| "top-right"
+		| "bottom-left"
+		| "bottom-right";
+}

From c1295d24ee35d2e5254a6f8e73f921fcaabab045 Mon Sep 17 00:00:00 2001
From: Olivier Sechet <osechet@gmail.com>
Date: Thu, 8 Mar 2018 07:25:27 +0100
Subject: [PATCH 0337/1382] Fix ban-type lint

---
 types/openlayers/index.d.ts          | 17 ++++++++++-------
 types/openlayers/openlayers-tests.ts | 17 +++++++++--------
 types/openlayers/tslint.json         |  2 --
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/types/openlayers/index.d.ts b/types/openlayers/index.d.ts
index 333ee0f621..09e22cce96 100644
--- a/types/openlayers/index.d.ts
+++ b/types/openlayers/index.d.ts
@@ -11,7 +11,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // Definitions partially generated using tsd-jsdoc (https://github.com/englercj/tsd-jsdoc)
 
-declare type GlobalObject = Object;
+interface GlobalObject { [key: string]: any; }
 
 /**
  * @namespace ol
@@ -1491,6 +1491,9 @@ declare module ol {
         }
     }
 
+    /* From ol/typedefs.js */
+    type EventsListenerFunctionType = ((evt: ol.events.Event) => void) | ((evt: ol.events.Event) => boolean);
+
     /**
      * @namespace ol.extent
      */
@@ -7957,7 +7960,7 @@ declare module ol {
          *     will be an array of keys.
          * @api stable
          */
-        on(type: (string | string[]), listener: Function, opt_this?: GlobalObject): (ol.EventsKey | ol.EventsKey[]);
+        on(type: (string | string[]), listener: ol.EventsListenerFunctionType, opt_this?: GlobalObject): (ol.EventsKey | ol.EventsKey[]);
 
         /**
          * Listen once for a certain type of event.
@@ -7969,7 +7972,7 @@ declare module ol {
          *     will be an array of keys.
          * @api stable
          */
-        once(type: (string | string[]), listener: Function, opt_this?: GlobalObject): (ol.EventsKey | ol.EventsKey[]);
+        once(type: (string | string[]), listener: ol.EventsListenerFunctionType, opt_this?: GlobalObject): (ol.EventsKey | ol.EventsKey[]);
 
         /**
          * Unlisten for a certain type of event.
@@ -7979,7 +7982,7 @@ declare module ol {
          * `listener`.
          * @api stable
          */
-        un(type: (string | string[]), listener: Function, opt_this?: GlobalObject): void;
+        un(type: (string | string[]), listener: ol.EventsListenerFunctionType, opt_this?: GlobalObject): void;
     }
 
     /**
@@ -11694,7 +11697,7 @@ declare module ol {
      *     target: (EventTarget|ol.events.EventTarget),
      *     type: string}}
      */
-    type EventsKey = Object;
+    type EventsKey = GlobalObject;
 
     /**
      * An array of numbers representing an extent: `[minx, miny, maxx, maxy]`.
@@ -11995,7 +11998,7 @@ declare module ol {
      * @typedef {{numberOfFeatures: number,
      *            bounds: ol.Extent}}
      */
-    type WFSFeatureCollectionMetadata = Object;
+    type WFSFeatureCollectionMetadata = GlobalObject;
 
     /**
      * Total deleted; total inserted; total updated; array of insert ids.
@@ -12004,7 +12007,7 @@ declare module ol {
      *            totalUpdated: number,
      *            insertIds: Array.<string>}}
      */
-    type WFSTransactionResponse = Object;
+    type WFSTransactionResponse = GlobalObject;
 
     /**
      * @constructor
diff --git a/types/openlayers/openlayers-tests.ts b/types/openlayers/openlayers-tests.ts
index ce13ae8385..3941345625 100644
--- a/types/openlayers/openlayers-tests.ts
+++ b/types/openlayers/openlayers-tests.ts
@@ -6,8 +6,9 @@ let stringValue: string;
 let stringArray: string[];
 let jsonValue: JSON;
 let domEventTarget: EventTarget;
-let fn: Function;
-let object: Object;
+let listener: ol.EventsListenerFunctionType;
+let object: { [key: string]: any };
+let fn: () => void;
 
 // Callback predefinitions for OpenLayers
 let preRenderFunction: ol.PreRenderFunction;
@@ -579,12 +580,12 @@ observable.dispatchEvent({ type: stringValue, a: numberValue, b: stringValue, c:
 observable.dispatchEvent(olEvent);
 observable.dispatchEvent(stringValue);
 numberValue = observable.getRevision();
-eventKeyMixed = observable.on(stringValue, fn);
-eventKeyMixed = observable.on([stringValue, stringValue], fn, {});
-eventKeyMixed = observable.once(stringValue, fn);
-eventKeyMixed = observable.once([stringValue, stringValue], fn, {});
-observable.un(stringValue, fn);
-observable.un([stringValue, stringValue], fn, {});
+eventKeyMixed = observable.on(stringValue, listener);
+eventKeyMixed = observable.on([stringValue, stringValue], listener, {});
+eventKeyMixed = observable.once(stringValue, listener);
+eventKeyMixed = observable.once([stringValue, stringValue], listener, {});
+observable.un(stringValue, listener);
+observable.un([stringValue, stringValue], listener, {});
 
 //
 // ol.proj
diff --git a/types/openlayers/tslint.json b/types/openlayers/tslint.json
index 2effdd6100..d44bbdd733 100644
--- a/types/openlayers/tslint.json
+++ b/types/openlayers/tslint.json
@@ -1,8 +1,6 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        // It appears somewhat difficult to remove the Function and Object types
-        "ban-types": false,
         // This currently fails for an option that does not appear to be in OL 4
         "no-any-union": false,
         // Not sure how to work around this, or if it's necessary to        

From 2f28923c35b1370089c3d1f3fd49bfc07b58fe27 Mon Sep 17 00:00:00 2001
From: Jack Leigh <jack.leigh@candide.eu>
Date: Thu, 8 Mar 2018 10:40:05 +0000
Subject: [PATCH 0338/1382] ramda: Reduce genericity of `toPairs`

The first element of the tuple is always a string.
See http://ramdajs.com/0.25.0/docs/#toPairs.
---
 types/ramda/index.d.ts     | 5 +++--
 types/ramda/ramda-tests.ts | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/types/ramda/index.d.ts b/types/ramda/index.d.ts
index 081a62cbd7..51de02e97e 100644
--- a/types/ramda/index.d.ts
+++ b/types/ramda/index.d.ts
@@ -15,6 +15,7 @@
 //                 Miika Hänninen <https://github.com/googol>
 //                 Nikita Moshensky <https://github.com/moshensky>
 //                 Ethan Resnick <https://github.com/ethanresnick>
+//                 Jack Leigh <https://github.com/leighman>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
@@ -1802,7 +1803,7 @@ declare namespace R {
          * Note that the order of the output array is not guaranteed to be
          * consistent across different JS platforms.
          */
-        toPairs<F, S>(obj: { [k: string]: S } | { [k: number]: S }): Array<[F, S]>;
+        toPairs<S>(obj: { [k: string]: S } | { [k: number]: S }): Array<[string, S]>;
 
         /**
          * Converts an object into an array of key, value arrays.
@@ -1810,7 +1811,7 @@ declare namespace R {
          * Note that the order of the output array is not guaranteed to be
          * consistent across different JS platforms.
          */
-        toPairsIn<F, S>(obj: { [k: string]: S } | { [k: number]: S }): Array<[F, S]>;
+        toPairsIn<S>(obj: { [k: string]: S } | { [k: number]: S }): Array<[string, S]>;
 
         /**
          * Returns the string representation of the given value. eval'ing the output should
diff --git a/types/ramda/ramda-tests.ts b/types/ramda/ramda-tests.ts
index c32ab72028..056009ed02 100644
--- a/types/ramda/ramda-tests.ts
+++ b/types/ramda/ramda-tests.ts
@@ -1597,13 +1597,14 @@ class Rectangle {
 };
 
 () => {
-    const a = R.toPairs<string, number>({a: 1, b: 2, c: 3}); // => [['a', 1], ['b', 2], ['c', 3]]
+    const a = R.toPairs<number>({a: 1, b: 2, c: 3}); // => [['a', 1], ['b', 2], ['c', 3]]
+    const b = R.toPairs({1: 'a'}); // => [['1', 'something']]
 };
 
 () => {
     const f    = new F();
     const a1 = R.toPairsIn(f); // => [['x','X'], ['y','Y']]
-    const a2 = R.toPairsIn<string, string>(f); // => [['x','X'], ['y','Y']]
+    const a2 = R.toPairsIn<string>(f); // => [['x','X'], ['y','Y']]
 };
 
 () => {

From 9077dd95025ef8b49508312b10efe6d82745be29 Mon Sep 17 00:00:00 2001
From: Bram Schulting <bramschulting@me.com>
Date: Thu, 8 Mar 2018 13:07:36 +0100
Subject: [PATCH 0339/1382] Add onFailure prop to react-facebook-login

This prop was missing:
https://github.com/keppelen/react-facebook-login/blob/master/src/facebook.js#L39
---
 types/react-facebook-login/index.d.ts           | 10 +++++++++-
 .../react-facebook-login-tests.tsx              | 17 ++++++++++++++++-
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/types/react-facebook-login/index.d.ts b/types/react-facebook-login/index.d.ts
index 3cb1c21605..1c81ffc3c8 100644
--- a/types/react-facebook-login/index.d.ts
+++ b/types/react-facebook-login/index.d.ts
@@ -9,6 +9,7 @@ import * as React from "react";
 interface ReactFacebookLoginProps {
     appId: string;
     callback(userInfo: ReactFacebookLoginInfo): void;
+    onFailure?(response: ReactFacebookFailureResponse): void;
 
     autoLoad?: boolean;
     buttonStyle?: React.CSSProperties;
@@ -33,6 +34,10 @@ interface ReactFacebookLoginProps {
     tag?: Node | React.Component<any>;
 }
 
+export interface ReactFacebookFailureResponse {
+    status?: string;
+}
+
 export interface ReactFacebookLoginInfo {
     id: string;
     name: string;
@@ -43,6 +48,9 @@ interface ReactFacebookLoginState {
     isProcessing?: boolean;
 }
 
-declare class ReactFacebookLogin extends React.Component<ReactFacebookLoginProps, ReactFacebookLoginState> { }
+declare class ReactFacebookLogin extends React.Component<
+    ReactFacebookLoginProps,
+    ReactFacebookLoginState
+> {}
 
 export default ReactFacebookLogin;
diff --git a/types/react-facebook-login/react-facebook-login-tests.tsx b/types/react-facebook-login/react-facebook-login-tests.tsx
index 6aab1ccd71..d7b2ebcde8 100644
--- a/types/react-facebook-login/react-facebook-login-tests.tsx
+++ b/types/react-facebook-login/react-facebook-login-tests.tsx
@@ -1,12 +1,16 @@
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 
-import FacebookLogin, { ReactFacebookLoginInfo } from 'react-facebook-login';
+import FacebookLogin, { ReactFacebookLoginInfo, ReactFacebookFailureResponse } from 'react-facebook-login';
 
 const responseFacebook = (response: ReactFacebookLoginInfo) => {
     console.log(response);
 };
 
+const failureResponseFacebook = (response: ReactFacebookFailureResponse) => {
+    console.log(response);
+};
+
 const componentClicked = () => {
     console.log("component clicked");
 };
@@ -21,6 +25,17 @@ ReactDOM.render(
     document.getElementById('demo')
 );
 
+ReactDOM.render(
+    <FacebookLogin
+        appId="1088597931155576"
+        autoLoad={true}
+        fields="name,email,picture"
+        onClick={componentClicked}
+        callback={responseFacebook}
+        onFailure={failureResponseFacebook} />,
+    document.getElementById('demo')
+);
+
 ReactDOM.render(
     <FacebookLogin
         appId="1088597931155576"

From 0f99dbb97dfd8ce606a81e143d6242c7e0f3251a Mon Sep 17 00:00:00 2001
From: Max <max.uetrecht@protonmail.com>
Date: Thu, 8 Mar 2018 13:25:48 +0100
Subject: [PATCH 0340/1382] [steam-totp] Add types

---
 types/steam-totp/index.d.ts          | 68 ++++++++++++++++++++++++++++
 types/steam-totp/steam-totp-tests.ts |  3 ++
 types/steam-totp/tsconfig.json       | 23 ++++++++++
 types/steam-totp/tslint.json         |  1 +
 4 files changed, 95 insertions(+)
 create mode 100644 types/steam-totp/index.d.ts
 create mode 100644 types/steam-totp/steam-totp-tests.ts
 create mode 100644 types/steam-totp/tsconfig.json
 create mode 100644 types/steam-totp/tslint.json

diff --git a/types/steam-totp/index.d.ts b/types/steam-totp/index.d.ts
new file mode 100644
index 0000000000..e405ef7ea1
--- /dev/null
+++ b/types/steam-totp/index.d.ts
@@ -0,0 +1,68 @@
+// Type definitions for steam-totp 2.0
+// Project: https://github.com/DoctorMcKay/node-steam-totp
+// Definitions by: Max Uetrecht <https://github.com/phenomax>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+export type TimeOffsetFunction = () => number;
+
+/**
+ * Returns the current local Unix time
+ * @param [timeOffset=0] - This many seconds will be added to the returned time
+ * @returns the current local Unix time
+ */
+export function time(timeOffset?: number): number;
+
+/**
+ * Generate a Steam-style TOTP authentication code.
+ * @param secret - Your TOTP shared_secret as a Buffer, hex, or base64
+ * @param [timeOffset=0] - If you know how far off your clock is from the Steam servers, put the offset here in seconds
+ * @returns the generated auth code
+ */
+export function generateAuthCode(secret: string, timeOffset: number | TimeOffsetFunction): string;
+
+/**
+ * Generate a Steam-style TOTP authentication code.
+ * @param secret - Your TOTP shared_secret as a Buffer, hex, or base64
+ * @param [timeOffset=0] - If you know how far off your clock is from the Steam servers, put the offset here in seconds
+ * @returns the generated auth code
+ */
+export function getAuthCode(secret: string, timeOffset: number | TimeOffsetFunction): string;
+
+/**
+ * Generate a base64 confirmation key for use with mobile trade confirmations. The key can only be used once.
+ * @param identitySecret - The identity_secret that you received when enabling two-factor authentication
+ * @param time - The Unix time for which you are generating this secret. Generally should be the current time.
+ * @param tag - The tag which identifies what this request (and therefore key) will be for.
+ * "conf" to load the confirmations page, "details" to load details about a trade, "allow" to confirm a trade, "cancel" to cancel it.
+ * @returns the generated confirmation key
+ */
+export function generateConfirmationKey(identitySecret: Buffer | string, time: number, tag: string): string;
+
+/**
+ * Generate a base64 confirmation key for use with mobile trade confirmations. The key can only be used once.
+ * @param identitySecret - The identity_secret that you received when enabling two-factor authentication
+ * @param time - The Unix time for which you are generating this secret. Generally should be the current time.
+ * @param tag - The tag which identifies what this request (and therefore key) will be for.
+ * "conf" to load the confirmations page, "details" to load details about a trade, "allow" to confirm a trade, "cancel" to cancel it.
+ * @returns the generated confirmation key
+ */
+export function getConfirmationKey(identitySecret: Buffer | string, time: number, tag: string): string;
+
+export type Callback = (error: Error, offset?: number, elapsedTime?: number) => void;
+
+/**
+ * Requests the time offset from the Steam API.
+ * @param callback - The result of the steam api request
+ * @param [timeOffset=0] - If you know how far off your clock is from the Steam servers, put the offset here in seconds
+ * @returns the time offset
+ */
+export function getTimeOffset(callback: Callback): void;
+
+/**
+ * Get a standardized device ID based on your SteamID.
+ * @param steamID - Your SteamID, either as a string or as an object which has a toString() method that returns the SteamID
+ * @returns the device ID
+ */
+export function getDeviceID(steamID: string | object): string;
diff --git a/types/steam-totp/steam-totp-tests.ts b/types/steam-totp/steam-totp-tests.ts
new file mode 100644
index 0000000000..57702ccaaa
--- /dev/null
+++ b/types/steam-totp/steam-totp-tests.ts
@@ -0,0 +1,3 @@
+import steamTotp = require('steam-totp');
+
+const time: number = steamTotp.time();
diff --git a/types/steam-totp/tsconfig.json b/types/steam-totp/tsconfig.json
new file mode 100644
index 0000000000..01223cacba
--- /dev/null
+++ b/types/steam-totp/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "steam-totp-tests.ts"
+    ]
+}
diff --git a/types/steam-totp/tslint.json b/types/steam-totp/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/steam-totp/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From dfb8f459ae50d1470ba6821d8ae24ddf7636f7d0 Mon Sep 17 00:00:00 2001
From: Juan Paucar <jpaucar@stackbuilders.com>
Date: Wed, 7 Mar 2018 18:08:31 -0500
Subject: [PATCH 0341/1382] sequelize: Correct some typings

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

diff --git a/types/sequelize/index.d.ts b/types/sequelize/index.d.ts
index 395f5b9d23..40de978fac 100644
--- a/types/sequelize/index.d.ts
+++ b/types/sequelize/index.d.ts
@@ -3136,11 +3136,11 @@ declare namespace sequelize {
         $ilike: string | WherePGStatement;
         $notLike: string | WherePGStatement;
         $notILike: string | WherePGStatement;
-        $between: [number, number];
+        $between: [number, number] | [Date, Date];
         "..": [number, number];
         $notBetween: [number, number];
         "!..": [number, number];
-        $overlap: [number, number];
+        $overlap: [number, number] | [string, string];
         "&&": [number, number];
         $contains: any;
         "@>": any;
@@ -3155,7 +3155,7 @@ declare namespace sequelize {
      * typesafety, but there is no way to pass the tests if we just remove it.
      */
     type WhereOptions<T> = {
-        [P in keyof T]?: string | number | boolean | WhereLogic | WhereOptions<T[P]> | col | and | or | WhereGeometryOptions | Array<string | number> | null;
+        [P in keyof T]?: string | number | boolean | WhereLogic | WhereOptions<T[P]> | col | and | or | WhereGeometryOptions | WhereNested | Array<string | number> | null;
     };
 
     /**
diff --git a/types/sequelize/sequelize-tests.ts b/types/sequelize/sequelize-tests.ts
index eea19959bd..a6f6cb0038 100644
--- a/types/sequelize/sequelize-tests.ts
+++ b/types/sequelize/sequelize-tests.ts
@@ -915,6 +915,8 @@ User.findAll( { where : { intVal : { '!..' : [8, 10] } } } );
 User.findAll( { where : { theDate : { between : ['2013-01-02', '2013-01-11'] } } } );
 User.findAll( { where : { theDate : { between : ['2013-01-02', '2013-01-11'] }, intVal : 10 } } );
 User.findAll( { where : { theDate : { between : ['2012-12-10', '2013-01-02'] } } } );
+User.findAll( { where : { theDate : { between : [1, 3] } } } );
+User.findAll( { where : { theDate : { between : [new Date(0), new Date(1000)] } } } );
 User.findAll( { where : { theDate : { nbetween : ['2013-01-04', '2013-01-20'] } } } );
 User.findAll( { order : [s.col( 'name' )] } );
 User.findAll( { order : [['theDate', 'DESC']] } );
@@ -948,6 +950,11 @@ User.findAll( { where: s.where(s.fn('lower', s.col('email')), s.fn('lower', 'TES
 User.findAll( { subQuery: false, include : [User], order : [[User, User, 'numYears', 'c']] } );
 User.findAll( { rejectOnEmpty: true });
 
+User.findAll( { where: { $and:[ { username: "user" }, { theDate: new Date() } ] } } );
+User.findAll( { where: { $or:[ { username: "user" }, { theDate: new Date() } ] } } );
+User.findAll( { where: { $and:[ { username: { $not: "user" } }, { theDate: new Date() } ] } } );
+User.findAll( { where: { $or:[ { username: { $not: "user" } }, { theDate: new Date() } ] } } );
+User.findAll( { where: { emails: { $overlap: ["me@mail.com", "you@mail.com"] } } } );
 
 User.findById( 'a string' );
 

From daaff7eff4f47ac886e7dfd3f9cea5fa844b77b8 Mon Sep 17 00:00:00 2001
From: york yao <yaoao12306@outlook.com>
Date: Thu, 8 Mar 2018 20:37:49 +0800
Subject: [PATCH 0342/1382] fix: update zipkin versions of zipkin-context-cls,
 zipkin-instrumentation-express, zipkin-transport-http

---
 types/zipkin-context-cls/package.json             | 2 +-
 types/zipkin-instrumentation-express/package.json | 2 +-
 types/zipkin-transport-http/package.json          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/types/zipkin-context-cls/package.json b/types/zipkin-context-cls/package.json
index 371d115490..07bdb0d223 100644
--- a/types/zipkin-context-cls/package.json
+++ b/types/zipkin-context-cls/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
   "dependencies": {
-    "zipkin": "^0.11.2"
+    "zipkin": ">=0.11.0"
   }
 }
diff --git a/types/zipkin-instrumentation-express/package.json b/types/zipkin-instrumentation-express/package.json
index 371d115490..07bdb0d223 100644
--- a/types/zipkin-instrumentation-express/package.json
+++ b/types/zipkin-instrumentation-express/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
   "dependencies": {
-    "zipkin": "^0.11.2"
+    "zipkin": ">=0.11.0"
   }
 }
diff --git a/types/zipkin-transport-http/package.json b/types/zipkin-transport-http/package.json
index 371d115490..07bdb0d223 100644
--- a/types/zipkin-transport-http/package.json
+++ b/types/zipkin-transport-http/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
   "dependencies": {
-    "zipkin": "^0.11.2"
+    "zipkin": ">=0.11.0"
   }
 }

From c62431bda9b64c99d9f98e1e671135902dae9b24 Mon Sep 17 00:00:00 2001
From: AppLover69 <26137752+AppLover69@users.noreply.github.com>
Date: Thu, 8 Mar 2018 15:09:17 +0200
Subject: [PATCH 0343/1382] Add isMergeableObject to options

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

diff --git a/types/deepmerge/index.d.ts b/types/deepmerge/index.d.ts
index 05f5c96d2e..04313282b1 100644
--- a/types/deepmerge/index.d.ts
+++ b/types/deepmerge/index.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for deepmerge 1.3
+// Type definitions for deepmerge 2.1
 // Project: https://github.com/KyleAMathews/deepmerge
 // Definitions by: marvinscharle <https://github.com/marvinscharle>
 //                 syy1125 <https://github.com/syy1125>
+//                 AppLover69 <https://github.com/AppLover69>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
@@ -14,6 +15,7 @@ declare namespace deepmerge {
     interface Options {
         clone?: boolean;
         arrayMerge?(destination: any[], source: any[], options?: Options): any[];
+        isMergeableObject?(value: object): boolean;
     }
 
     function all<T>(objects: Array<Partial<T>>, options?: Options): T;

From 2f0902873c07893813df5c99b0259f722d1bdc95 Mon Sep 17 00:00:00 2001
From: AppLover69 <26137752+AppLover69@users.noreply.github.com>
Date: Thu, 8 Mar 2018 15:26:57 +0200
Subject: [PATCH 0344/1382] Updated TypeScript version to 2.2

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

diff --git a/types/deepmerge/index.d.ts b/types/deepmerge/index.d.ts
index 04313282b1..39158354de 100644
--- a/types/deepmerge/index.d.ts
+++ b/types/deepmerge/index.d.ts
@@ -4,7 +4,7 @@
 //                 syy1125 <https://github.com/syy1125>
 //                 AppLover69 <https://github.com/AppLover69>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.2
 
 export = deepmerge;
 

From 155bf9571e6e33ca43c7880119d8a1084f854e25 Mon Sep 17 00:00:00 2001
From: Chris Barth <chrisjbarth@hotmail.com>
Date: Thu, 8 Mar 2018 10:06:59 -0500
Subject: [PATCH 0345/1382] Enable more linting

---
 types/winston-syslog/tslint.json             | 5 +----
 types/winston-syslog/winston-syslog-tests.ts | 1 -
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/types/winston-syslog/tslint.json b/types/winston-syslog/tslint.json
index 1e30988418..f93cf8562a 100644
--- a/types/winston-syslog/tslint.json
+++ b/types/winston-syslog/tslint.json
@@ -1,6 +1,3 @@
 {
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "no-var-requires": false
-    }
+    "extends": "dtslint/dt.json"
 }
diff --git a/types/winston-syslog/winston-syslog-tests.ts b/types/winston-syslog/winston-syslog-tests.ts
index ce83bbb918..a08b80b045 100644
--- a/types/winston-syslog/winston-syslog-tests.ts
+++ b/types/winston-syslog/winston-syslog-tests.ts
@@ -1,6 +1,5 @@
 import winston = require('winston');
 import { SyslogTransportOptions } from 'winston-syslog';
-require('winston-syslog').Syslog;
 
 const str = "";
 const bool  = true;

From b4f8c54fa3f99d8808d60cf24bfa79cb4bf4c940 Mon Sep 17 00:00:00 2001
From: Silas Rech <silas@panascais.io>
Date: Thu, 8 Mar 2018 16:28:17 +0100
Subject: [PATCH 0346/1382] Fix CI

---
 types/steam-totp/index.d.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/types/steam-totp/index.d.ts b/types/steam-totp/index.d.ts
index e405ef7ea1..a3ff963428 100644
--- a/types/steam-totp/index.d.ts
+++ b/types/steam-totp/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/DoctorMcKay/node-steam-totp
 // Definitions by: Max Uetrecht <https://github.com/phenomax>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 /// <reference types="node" />
 
@@ -50,15 +51,13 @@ export function generateConfirmationKey(identitySecret: Buffer | string, time: n
  */
 export function getConfirmationKey(identitySecret: Buffer | string, time: number, tag: string): string;
 
-export type Callback = (error: Error, offset?: number, elapsedTime?: number) => void;
-
 /**
  * Requests the time offset from the Steam API.
  * @param callback - The result of the steam api request
  * @param [timeOffset=0] - If you know how far off your clock is from the Steam servers, put the offset here in seconds
  * @returns the time offset
  */
-export function getTimeOffset(callback: Callback): void;
+export function getTimeOffset(callback: (error: Error, offset?: number, elapsedTime?: number) => void): void;
 
 /**
  * Get a standardized device ID based on your SteamID.

From 0d61fbd75ba3dfb186d9a0c4cbf988175312ce51 Mon Sep 17 00:00:00 2001
From: nayni <rutgerhendrickx@gmail.com>
Date: Thu, 8 Mar 2018 18:12:23 +0100
Subject: [PATCH 0347/1382] graphql-resolve-batch: Batch function should return
 an array or a promise with an array - This solves: issue #24153

---
 .../graphql-resolve-batch-tests.ts            | 51 ++++++++-----------
 types/graphql-resolve-batch/index.d.ts        |  4 +-
 2 files changed, 22 insertions(+), 33 deletions(-)

diff --git a/types/graphql-resolve-batch/graphql-resolve-batch-tests.ts b/types/graphql-resolve-batch/graphql-resolve-batch-tests.ts
index 1e9a2395a4..519a3a4088 100644
--- a/types/graphql-resolve-batch/graphql-resolve-batch-tests.ts
+++ b/types/graphql-resolve-batch/graphql-resolve-batch-tests.ts
@@ -16,6 +16,17 @@ interface SomeTestResult {
     someTestResultProp: string;
 }
 
+const asyncBatchFunction = async (sources: ReadonlyArray<SomeTestSource>) => {
+    return new Promise<SomeTestResult[]>(resolve => {
+        const res = [
+            {
+                someTestResultProp: ""
+            }
+        ];
+        resolve(res);
+    });
+};
+
 const withSourceAndResultTyped = createBatchResolver<
     SomeTestSource,
     SomeTestResult
@@ -32,40 +43,25 @@ const withSourceAndResultTyped = createBatchResolver<
 const withSourceAndResultTypedAsPromise = createBatchResolver<
     SomeTestSource,
     SomeTestResult
->((sources, _, __) => {
+>(async (sources, _, __) => {
     // $ExpectType ReadonlyArray<SomeTestSource>
     const verifySources = sources;
-
-    return sources.map(source => {
-        return new Promise<SomeTestResult>(resolve => {
-            const res: SomeTestResult = {
-                someTestResultProp: ""
-            };
-
-            resolve(res);
-        });
-    });
+    const result = await asyncBatchFunction(sources);
+    return result;
 });
 
 const withSourceAndArgsAndResultTyped = createBatchResolver<
     SomeTestSource,
     SomeTestResult,
     SomeTestArgs
->((sources, args, _) => {
+>(async (sources, args, _) => {
     // $ExpectType ReadonlyArray<SomeTestSource>
     const verifySources = sources;
     // $ExpectType string
     const verifyArgs = args.someArg;
 
-    return sources.map(source => {
-        return new Promise<SomeTestResult>(resolve => {
-            const res: SomeTestResult = {
-                someTestResultProp: ""
-            };
-
-            resolve(res);
-        });
-    });
+    const result = await asyncBatchFunction(sources);
+    return result;
 });
 
 const withSourceAndArgsAndContextTyped = createBatchResolver<
@@ -73,7 +69,7 @@ const withSourceAndArgsAndContextTyped = createBatchResolver<
     SomeTestResult,
     SomeTestArgs,
     SomeTestContext
->((sources, args, context) => {
+>(async (sources, args, context) => {
     // $ExpectType ReadonlyArray<SomeTestSource>
     const verifySources = sources;
     // $ExpectType string
@@ -81,13 +77,6 @@ const withSourceAndArgsAndContextTyped = createBatchResolver<
     // $ExpectType string
     const verifyContext = context.someContextProp;
 
-    return sources.map(source => {
-        return new Promise<SomeTestResult>(resolve => {
-            const res: SomeTestResult = {
-                someTestResultProp: ""
-            };
-
-            resolve(res);
-        });
-    });
+    const result = await asyncBatchFunction(sources);
+    return result;
 });
diff --git a/types/graphql-resolve-batch/index.d.ts b/types/graphql-resolve-batch/index.d.ts
index 46f354f7b7..ef188e536a 100644
--- a/types/graphql-resolve-batch/index.d.ts
+++ b/types/graphql-resolve-batch/index.d.ts
@@ -17,10 +17,10 @@ export type ResolverFunction<TSource, TArgs, TContext, TReturn> = (
     source: TSource,
     args: TArgs,
     context: TContext
-) => Promise<TReturn>;
+) => Promise<TReturn[]>;
 
 export type BatchResolveFunction<TSource, TArgs, TContext, TReturn> = (
     sources: ReadonlyArray<TSource>,
     args: TArgs,
     context: TContext
-) => TReturn[] | Array<Promise<TReturn>>;
+) => TReturn[] | Promise<TReturn[]>;

From 4b05fa0d9ddbdcf32f412f3e932f06967f7194e6 Mon Sep 17 00:00:00 2001
From: nayni <rutgerhendrickx@gmail.com>
Date: Thu, 8 Mar 2018 18:17:09 +0100
Subject: [PATCH 0348/1382] graphql-resolve-batch: bump version

---
 types/graphql-resolve-batch/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/graphql-resolve-batch/index.d.ts b/types/graphql-resolve-batch/index.d.ts
index ef188e536a..ec0c0249e7 100644
--- a/types/graphql-resolve-batch/index.d.ts
+++ b/types/graphql-resolve-batch/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for graphql-resolve-batch 1.0
+// Type definitions for graphql-resolve-batch 1.1
 // Project: https://github.com/calebmer/graphql-resolve-batch#readme
 // Definitions by: Rutger Hendrickx <https://github.com/nayni>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From d8c5833d338c60058981bc80ddc0796b63dd8064 Mon Sep 17 00:00:00 2001
From: nayni <rutgerhendrickx@gmail.com>
Date: Thu, 8 Mar 2018 18:45:02 +0100
Subject: [PATCH 0349/1382] graphql-resolve-batch: resulting resolver can also
 return a single value

---
 types/graphql-resolve-batch/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/graphql-resolve-batch/index.d.ts b/types/graphql-resolve-batch/index.d.ts
index ec0c0249e7..e78ddafb37 100644
--- a/types/graphql-resolve-batch/index.d.ts
+++ b/types/graphql-resolve-batch/index.d.ts
@@ -17,7 +17,7 @@ export type ResolverFunction<TSource, TArgs, TContext, TReturn> = (
     source: TSource,
     args: TArgs,
     context: TContext
-) => Promise<TReturn[]>;
+) => Promise<TReturn> | Promise<TReturn[]>;
 
 export type BatchResolveFunction<TSource, TArgs, TContext, TReturn> = (
     sources: ReadonlyArray<TSource>,

From 7f6d46d071fdb4ae032d14f49e340f6413a8abaf Mon Sep 17 00:00:00 2001
From: Olivier Sechet <osechet@gmail.com>
Date: Thu, 8 Mar 2018 19:10:16 +0100
Subject: [PATCH 0350/1382] Revert @param and @return Avoid dangling comments

---
 types/openlayers/index.d.ts | 1649 ++++++++++++++++++++++++++++++++++-
 1 file changed, 1633 insertions(+), 16 deletions(-)

diff --git a/types/openlayers/index.d.ts b/types/openlayers/index.d.ts
index 4454efdeb9..0a12c36d13 100644
--- a/types/openlayers/index.d.ts
+++ b/types/openlayers/index.d.ts
@@ -18,12 +18,14 @@ declare module ol {
      * Error object thrown when an assertion failed. This is an ECMA-262 Error,
      * extended with a `code` property.
      * @see {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error}
+     * @param code Error code.
      */
     class AssertionError extends Error {
         /**
          * Error object thrown when an assertion failed. This is an ECMA-262 Error,
          * extended with a `code` property.
          * @see {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error}
+         * @param code Error code.
          */
         constructor(code: number);
 
@@ -53,6 +55,7 @@ declare module ol {
      *       ],
      *     ..
      *
+     * @param options Attribution options.
      * @struct
      * @api stable
      */
@@ -73,6 +76,7 @@ declare module ol {
          *       ],
          *     ..
          *
+         * @param options Attribution options.
          * @struct
          * @api stable
          */
@@ -80,6 +84,7 @@ declare module ol {
 
         /**
          * Get the attribution markup.
+         * @return The attribution HTML.
          * @api stable
          */
         getHTML(): string;
@@ -94,6 +99,7 @@ declare module ol {
      * Collection as a whole.
      *
      * @fires ol.Collection.Event
+     * @param opt_array Array.
      * @template T
      * @api stable
      */
@@ -107,6 +113,7 @@ declare module ol {
          * Collection as a whole.
          *
          * @fires ol.Collection.Event
+         * @param opt_array Array.
          * @template T
          * @api stable
          */
@@ -121,14 +128,18 @@ declare module ol {
         /**
          * Add elements to the collection.  This pushes each item in the provided array
          * to the end of the collection.
+         * @param arr Array.
+         * @return This collection.
          * @api stable
          */
         extend(arr: T[]): ol.Collection<T>;
 
         /**
          * Iterate over each element, calling the provided callback.
+         * @param f The function to call
          *     for every element. This function takes 3 arguments (the element, the
          *     index and the array). The return value is ignored.
+         * @param opt_this The object to use as `this` in `f`.
          * @template S
          * @api stable
          */
@@ -139,18 +150,22 @@ declare module ol {
          * is mutated, no events will be dispatched by the collection, and the
          * collection's "length" property won't be in sync with the actual length
          * of the array.
+         * @return Array.
          * @api stable
          */
         getArray(): T[];
 
         /**
          * Get the element at the provided index.
+         * @param index Index.
+         * @return Element.
          * @api stable
          */
         item(index: number): T;
 
         /**
          * Get the length of this collection.
+         * @return The length of the array.
          * @observable
          * @api stable
          */
@@ -158,6 +173,8 @@ declare module ol {
 
         /**
          * Insert an element at the provided index.
+         * @param index Index.
+         * @param elem Element.
          * @api stable
          */
         insertAt(index: number, elem: T): void;
@@ -165,18 +182,23 @@ declare module ol {
         /**
          * Remove the last element of the collection and return it.
          * Return `undefined` if the collection is empty.
+         * @return Element.
          * @api stable
          */
         pop(): (T);
 
         /**
          * Insert the provided element at the end of the collection.
+         * @param elem Element.
+         * @return Length.
          * @api stable
          */
         push(elem: T): number;
 
         /**
          * Remove the first occurrence of an element from the collection.
+         * @param elem Element.
+         * @return The removed element or undefined if none found.
          * @api stable
          */
         remove(elem: T): (T);
@@ -184,12 +206,16 @@ declare module ol {
         /**
          * Remove the element at the provided index and return it.
          * Return `undefined` if the collection does not contain this index.
+         * @param index Index.
+         * @return Value.
          * @api stable
          */
         removeAt(index: number): (T);
 
         /**
          * Set the element at the provided index.
+         * @param index Index.
+         * @param elem Element.
          * @api stable
          */
         setAt(index: number, elem: T): void;
@@ -203,6 +229,8 @@ declare module ol {
          * Events emitted by {@link ol.Collection} instances are instances of this
          * type.
          *
+         * @param type Type.
+         * @param opt_element Element.
          */
         class Event extends ol.events.Event {
             /**
@@ -210,6 +238,8 @@ declare module ol {
              * Events emitted by {@link ol.Collection} instances are instances of this
              * type.
              *
+             * @param type Type.
+             * @param opt_element Element.
              */
             constructor(type: ol.Collection.EventType, opt_element?: any);
 
@@ -226,17 +256,22 @@ declare module ol {
      * `rgb(r,g,b)` or `rgba(r,g,b,a)` format, or in hex `#rrggbb` or `#rgb` format.
      * Color names, like 'red', 'blue' or 'green', may also be used with the
      * Canvas renderer.
+     *
      */
     module color {
         /**
          * Return the color as an array. This function maintains a cache of calculated
          * arrays which means the result should not be modified.
+         * @param color Color.
+         * @return Color.
          * @api
          */
         function asArray(color: (ol.Color | string)): ol.Color;
 
         /**
          * Return the color as an rgba string.
+         * @param color Color.
+         * @return Rgba string.
          * @api
          */
         function asString(color: (ol.Color | string)): string;
@@ -248,6 +283,8 @@ declare module ol {
      */
     module colorlike {
         /**
+         * @param color Color.
+         * @return The color as an ol.ColorLike
          * @api
          */
         function asColorLike(color: (ol.Color | ol.ColorLike)): ol.ColorLike;
@@ -261,6 +298,7 @@ declare module ol {
          * By default it will show in the bottom right portion of the map, but this can
          * be changed by using a css selector for `.ol-attribution`.
          *
+         * @param opt_options Attribution options.
          * @api stable
          */
         class Attribution extends ol.control.Control {
@@ -270,24 +308,29 @@ declare module ol {
              * in the map. This control is one of the default controls included in maps.
              * By default it will show in the bottom right portion of the map, but this can
              * be changed by using a css selector for `.ol-attribution`.
+             *
+             * @param opt_options Attribution options.
              * @api stable
              */
             constructor(opt_options?: olx.control.AttributionOptions);
 
             /**
              * Update the attribution element.
+             * @param mapEvent Map event.
              * @api
              */
             static render(mapEvent: ol.MapEvent): void;
 
             /**
              * Return `true` if the attribution is collapsible, `false` otherwise.
+             * @return True if the widget is collapsible.
              * @api stable
              */
             getCollapsible(): boolean;
 
             /**
              * Set whether the attribution should be collapsible.
+             * @param collapsible True if the widget is collapsible.
              * @api stable
              */
             setCollapsible(collapsible: boolean): void;
@@ -296,6 +339,7 @@ declare module ol {
              * Collapse or expand the attribution according to the passed parameter. Will
              * not do anything if the attribution isn't collapsible or if the current
              * collapsed state is already the one requested.
+             * @param collapsed True if the widget is collapsed.
              * @api stable
              */
             setCollapsed(collapsed: boolean): void;
@@ -303,6 +347,7 @@ declare module ol {
             /**
              * Return `true` when the attribution is currently collapsed or `false`
              * otherwise.
+             * @return True if the widget is collapsed.
              * @api stable
              */
             getCollapsed(): boolean;
@@ -331,6 +376,7 @@ declare module ol {
          * You can also extend this base for your own control class. See
          * examples/custom-controls for an example of how to do this.
          *
+         * @param options Control options.
          * @api stable
          */
         class Control extends ol.Object {
@@ -357,12 +403,14 @@ declare module ol {
              * You can also extend this base for your own control class. See
              * examples/custom-controls for an example of how to do this.
              *
+             * @param options Control options.
              * @api stable
              */
             constructor(options: olx.control.ControlOptions);
 
             /**
              * Get the map associated with this control.
+             * @return Map.
              * @api stable
              */
             getMap(): ol.Map;
@@ -371,6 +419,7 @@ declare module ol {
              * Remove the control from its current map and attach it to the new map.
              * Subclasses may set up event handlers to get notified about changes to
              * the map here.
+             * @param map Map.
              * @api stable
              */
             setMap(map: ol.Map): void;
@@ -381,6 +430,7 @@ declare module ol {
              * after `setMap` is called on the control). If no `target` is set in the
              * options passed to the control constructor and if `setTarget` is not called
              * then the control is added to the map's overlay container.
+             * @param target Target.
              * @api
              */
             setTarget(target: (Element | string)): void;
@@ -398,6 +448,7 @@ declare module ol {
          * toggle the map in full screen mode.
          *
          *
+         * @param opt_options Options.
          * @api stable
          */
         class FullScreen extends ol.control.Control {
@@ -413,6 +464,7 @@ declare module ol {
              * toggle the map in full screen mode.
              *
              *
+             * @param opt_options Options.
              * @api stable
              */
             constructor(opt_options?: olx.control.FullScreenOptions);
@@ -426,6 +478,8 @@ declare module ol {
          * * {@link ol.control.Rotate}
          * * {@link ol.control.Attribution}
          *
+         * @param opt_options Defaults options.
+         * @return Controls.
          * @api stable
          */
         function defaults(opt_options?: olx.control.DefaultsOptions): ol.Collection<ol.control.Control>;
@@ -437,6 +491,7 @@ declare module ol {
          * By default the control is shown in the top right corner of the map, but this
          * can be changed by using the css selector `.ol-mouse-position`.
          *
+         * @param opt_options Mouse position
          *     options.
          * @api stable
          */
@@ -448,6 +503,7 @@ declare module ol {
              * By default the control is shown in the top right corner of the map, but this
              * can be changed by using the css selector `.ol-mouse-position`.
              *
+             * @param opt_options Mouse position
              *     options.
              * @api stable
              */
@@ -455,6 +511,7 @@ declare module ol {
 
             /**
              * Update the mouseposition element.
+             * @param mapEvent Map event.
              * @api
              */
             static render(mapEvent: ol.MapEvent): void;
@@ -462,6 +519,7 @@ declare module ol {
             /**
              * Return the coordinate format type used to render the current position or
              * undefined.
+             * @return The format to render the current
              *     position in.
              * @observable
              * @api stable
@@ -470,6 +528,7 @@ declare module ol {
 
             /**
              * Return the projection that is used to report the mouse position.
+             * @return The projection to report mouse
              *     position in.
              * @observable
              * @api stable
@@ -478,6 +537,7 @@ declare module ol {
 
             /**
              * Set the coordinate format type used to render the current position.
+             * @param format The format to render the current
              *     position in.
              * @observable
              * @api stable
@@ -486,6 +546,7 @@ declare module ol {
 
             /**
              * Set the projection that is used to report the mouse position.
+             * @param projection The projection to report mouse
              *     position in.
              * @observable
              * @api stable
@@ -496,30 +557,35 @@ declare module ol {
         /**
          * Create a new control with a map acting as an overview map for an other
          * defined map.
+         * @param opt_options OverviewMap options.
          * @api
          */
         class OverviewMap extends ol.control.Control {
             /**
              * Create a new control with a map acting as an overview map for an other
              * defined map.
+             * @param opt_options OverviewMap options.
              * @api
              */
             constructor(opt_options?: olx.control.OverviewMapOptions);
 
             /**
              * Update the overview map element.
+             * @param mapEvent Map event.
              * @api
              */
             static render(mapEvent: ol.MapEvent): void;
 
             /**
              * Return `true` if the overview map is collapsible, `false` otherwise.
+             * @return True if the widget is collapsible.
              * @api stable
              */
             getCollapsible(): boolean;
 
             /**
              * Set whether the overview map should be collapsible.
+             * @param collapsible True if the widget is collapsible.
              * @api stable
              */
             setCollapsible(collapsible: boolean): void;
@@ -528,18 +594,21 @@ declare module ol {
              * Collapse or expand the overview map according to the passed parameter. Will
              * not do anything if the overview map isn't collapsible or if the current
              * collapsed state is already the one requested.
+             * @param collapsed True if the widget is collapsed.
              * @api stable
              */
             setCollapsed(collapsed: boolean): void;
 
             /**
              * Determine if the overview map is collapsed.
+             * @return The overview map is collapsed.
              * @api stable
              */
             getCollapsed(): boolean;
 
             /**
              * Return the overview map.
+             * @return Overview map.
              * @api
              */
             getOverviewMap(): ol.Map;
@@ -551,6 +620,7 @@ declare module ol {
          * To style this control use css selector `.ol-rotate`. A `.ol-hidden` css
          * selector is added to the button when the rotation is 0.
          *
+         * @param opt_options Rotate options.
          * @api stable
          */
         class Rotate extends ol.control.Control {
@@ -560,12 +630,14 @@ declare module ol {
              * To style this control use css selector `.ol-rotate`. A `.ol-hidden` css
              * selector is added to the button when the rotation is 0.
              *
+             * @param opt_options Rotate options.
              * @api stable
              */
             constructor(opt_options?: olx.control.RotateOptions);
 
             /**
              * Update the rotate control element.
+             * @param mapEvent Map event.
              * @api
              */
             static render(mapEvent: ol.MapEvent): void;
@@ -581,6 +653,7 @@ declare module ol {
          * By default the scale line will show in the bottom left portion of the map,
          * but this can be changed by using the css selector `.ol-scale-line`.
          *
+         * @param opt_options Scale line options.
          * @api stable
          */
         class ScaleLine extends ol.control.Control {
@@ -594,12 +667,14 @@ declare module ol {
              * By default the scale line will show in the bottom left portion of the map,
              * but this can be changed by using the css selector `.ol-scale-line`.
              *
+             * @param opt_options Scale line options.
              * @api stable
              */
             constructor(opt_options?: olx.control.ScaleLineOptions);
 
             /**
              * Return the units to use in the scale line.
+             * @return The units to use in the scale
              *     line.
              * @observable
              * @api stable
@@ -608,12 +683,14 @@ declare module ol {
 
             /**
              * Update the scale line element.
+             * @param mapEvent Map event.
              * @api
              */
             static render(mapEvent: ol.MapEvent): void;
 
             /**
              * Set the units to use in the scale line.
+             * @param units The units to use in the scale line.
              * @observable
              * @api stable
              */
@@ -639,6 +716,7 @@ declare module ol {
          * This control is one of the default controls of a map. To style this control
          * use css selectors `.ol-zoom-in` and `.ol-zoom-out`.
          *
+         * @param opt_options Zoom options.
          * @api stable
          */
         class Zoom extends ol.control.Control {
@@ -648,6 +726,7 @@ declare module ol {
              * This control is one of the default controls of a map. To style this control
              * use css selectors `.ol-zoom-in` and `.ol-zoom-out`.
              *
+             * @param opt_options Zoom options.
              * @api stable
              */
             constructor(opt_options?: olx.control.ZoomOptions);
@@ -661,6 +740,7 @@ declare module ol {
          *
          *     map.addControl(new ol.control.ZoomSlider());
          *
+         * @param opt_options Zoom slider options.
          * @api stable
          */
         class ZoomSlider extends ol.control.Control {
@@ -672,12 +752,14 @@ declare module ol {
              *
              *     map.addControl(new ol.control.ZoomSlider());
              *
+             * @param opt_options Zoom slider options.
              * @api stable
              */
             constructor(opt_options?: olx.control.ZoomSliderOptions);
 
             /**
              * Update the zoomslider element.
+             * @param mapEvent Map event.
              * @api
              */
             static render(mapEvent: ol.MapEvent): void;
@@ -688,6 +770,7 @@ declare module ol {
          * A button control which, when pressed, changes the map view to a specific
          * extent. To style this control use the css selector `.ol-zoom-extent`.
          *
+         * @param opt_options Options.
          * @api stable
          */
         class ZoomToExtent extends ol.control.Control {
@@ -696,6 +779,7 @@ declare module ol {
              * A button control which, when pressed, changes the map view to a specific
              * extent. To style this control use the css selector `.ol-zoom-extent`.
              *
+             * @param opt_options Options.
              * @api stable
              */
             constructor(opt_options?: olx.control.ZoomToExtentOptions);
@@ -713,6 +797,9 @@ declare module ol {
          *     ol.coordinate.add(coord, [-2, 4]);
          *     // coord is now [5.85, 51.983333]
          *
+         * @param coordinate Coordinate.
+         * @param delta Delta.
+         * @return The input coordinate adjusted by the given delta.
          * @api stable
          */
         function add(coordinate: ol.Coordinate, delta: ol.Coordinate): ol.Coordinate;
@@ -735,7 +822,9 @@ declare module ol {
          *     var out = stringifyFunc(coord);
          *     // out is now '7.85, 47.98'
          *
+         * @param opt_fractionDigits The number of digits to include
          *    after the decimal point. Default is `0`.
+         * @return Coordinate format.
          * @api stable
          */
         function createStringXY(opt_fractionDigits?: number): ol.CoordinateFormatType;
@@ -759,8 +848,12 @@ declare module ol {
          *     var out = ol.coordinate.format(coord, template, 2);
          *     // out is now 'Coordinate is (7.85|47.98).'
          *
+         * @param coordinate Coordinate.
+         * @param template A template string with `{x}` and `{y}` placeholders
          *     that will be replaced by first and second coordinate values.
+         * @param opt_fractionDigits The number of digits to include
          *    after the decimal point. Default is `0`.
+         * @return Formatted coordinate.
          * @api stable
          */
         function format(coordinate: (ol.Coordinate), template: string, opt_fractionDigits?: number): string;
@@ -776,6 +869,9 @@ declare module ol {
          *     ol.coordinate.rotate(coord, rotateRadians);
          *     // coord is now [-47.983333, 7.85]
          *
+         * @param coordinate Coordinate.
+         * @param angle Angle in radian.
+         * @return Coordinate.
          * @api stable
          */
         function rotate(coordinate: ol.Coordinate, angle: number): ol.Coordinate;
@@ -796,7 +892,10 @@ declare module ol {
          *     var out = ol.coordinate.toStringHDMS(coord, 1);
          *     // out is now '47° 58′ 60.0″ N 7° 50′ 60.0″ E'
          *
+         * @param coordinate Coordinate.
+         * @param opt_fractionDigits The number of digits to include
          *    after the decimal point. Default is `0`.
+         * @return Hemisphere, degrees, minutes and seconds.
          * @api stable
          */
         function toStringHDMS(coordinate?: ol.Coordinate, opt_fractionDigits?: number): string;
@@ -816,7 +915,10 @@ declare module ol {
          *     var out = ol.coordinate.toStringXY(coord, 1);
          *     // out is now '7.8, 48.0'
          *
+         * @param coordinate Coordinate.
+         * @param opt_fractionDigits The number of digits to include
          *    after the decimal point. Default is `0`.
+         * @return XY.
          * @api stable
          */
         function toStringXY(coordinate?: ol.Coordinate, opt_fractionDigits?: number): string;
@@ -872,6 +974,7 @@ declare module ol {
      *
      * @see {@link http://www.w3.org/TR/orientation-event/}
      *
+     * @param opt_options Options.
      * @api
      */
     class DeviceOrientation extends ol.Object {
@@ -925,12 +1028,14 @@ declare module ol {
          *
          * @see {@link http://www.w3.org/TR/orientation-event/}
          *
+         * @param opt_options Options.
          * @api
          */
         constructor(opt_options?: olx.DeviceOrientationOptions);
 
         /**
          * Rotation around the device z-axis (in radians).
+         * @return The euler angle in radians of the device from the
          *     standard Z axis.
          * @observable
          * @api
@@ -939,6 +1044,7 @@ declare module ol {
 
         /**
          * Rotation around the device x-axis (in radians).
+         * @return The euler angle in radians of the device from the
          *     planar X axis.
          * @observable
          * @api
@@ -947,6 +1053,7 @@ declare module ol {
 
         /**
          * Rotation around the device y-axis (in radians).
+         * @return The euler angle in radians of the device from the
          *     planar Y axis.
          * @observable
          * @api
@@ -955,6 +1062,7 @@ declare module ol {
 
         /**
          * The heading of the device relative to north (in radians).
+         * @return The heading of the device relative to north, in
          *     radians, normalizing for different browser behavior.
          * @observable
          * @api
@@ -963,6 +1071,7 @@ declare module ol {
 
         /**
          * Determine if orientation is being tracked.
+         * @return Changes in device orientation are being tracked.
          * @observable
          * @api
          */
@@ -970,6 +1079,7 @@ declare module ol {
 
         /**
          * Enable or disable tracking of device orientation events.
+         * @param tracking The status of tracking changes to alpha, beta and
          *     gamma. If true, changes are tracked and reported immediately.
          * @observable
          * @api
@@ -993,24 +1103,32 @@ declare module ol {
     module easing {
         /**
          * Start slow and speed up.
+         * @param t Input between 0 and 1.
+         * @return Output between 0 and 1.
          * @api
          */
         function easeIn(t: number): number;
 
         /**
          * Start fast and slow down.
+         * @param t Input between 0 and 1.
+         * @return Output between 0 and 1.
          * @api
          */
         function easeOut(t: number): number;
 
         /**
          * Start slow, speed up, and then slow down again.
+         * @param t Input between 0 and 1.
+         * @return Output between 0 and 1.
          * @api
          */
         function inAndOut(t: number): number;
 
         /**
          * Maintain a constant speed over time.
+         * @param t Input between 0 and 1.
+         * @return Output between 0 and 1.
          * @api
          */
         function linear(t: number): number;
@@ -1019,6 +1137,8 @@ declare module ol {
          * Start slow, speed up, and at the very end slow down again.  This has the
          * same general behavior as {@link ol.easing.inAndOut}, but the final slowdown
          * is delayed.
+         * @param t Input between 0 and 1.
+         * @return Output between 0 and 1.
          * @api
          */
         function upAndDown(t: number): number;
@@ -1035,6 +1155,7 @@ declare module ol {
      * this can be configured in the listener registration function.
      * Some classes have their own event type, which return additional
      * properties; see the specific event class page for details.
+     *
      */
     module events {
         module condition {
@@ -1042,6 +1163,8 @@ declare module ol {
              * Return `true` if only the alt-key is pressed, `false` otherwise (e.g. when
              * additionally the shift-key is pressed).
              *
+             * @param mapBrowserEvent Map browser event.
+             * @return True if only the alt key is pressed.
              * @api stable
              */
             function altKeyOnly(mapBrowserEvent: ol.MapBrowserEvent): boolean;
@@ -1050,6 +1173,8 @@ declare module ol {
              * Return `true` if only the alt-key and shift-key is pressed, `false` otherwise
              * (e.g. when additionally the platform-modifier-key is pressed).
              *
+             * @param mapBrowserEvent Map browser event.
+             * @return True if only the alt and shift keys are pressed.
              * @api stable
              */
             function altShiftKeysOnly(mapBrowserEvent: ol.MapBrowserEvent): boolean;
@@ -1057,6 +1182,8 @@ declare module ol {
             /**
              * Return always true.
              *
+             * @param mapBrowserEvent Map browser event.
+             * @return True.
              * @api stable
              */
             function always(mapBrowserEvent: ol.MapBrowserEvent): boolean;
@@ -1064,6 +1191,8 @@ declare module ol {
             /**
              * Return `true` if the event is a `click` event, `false` otherwise.
              *
+             * @param mapBrowserEvent Map browser event.
+             * @return True if the event is a map `click` event.
              * @api stable
              */
             function click(mapBrowserEvent: ol.MapBrowserEvent): boolean;
@@ -1071,6 +1200,8 @@ declare module ol {
             /**
              * Return always false.
              *
+             * @param mapBrowserEvent Map browser event.
+             * @return False.
              * @api stable
              */
             function never(mapBrowserEvent: ol.MapBrowserEvent): boolean;
@@ -1079,6 +1210,8 @@ declare module ol {
              * Return `true` if the browser event is a `pointermove` event, `false`
              * otherwise.
              *
+             * @param mapBrowserEvent Map browser event.
+             * @return True if the browser event is a `pointermove` event.
              * @api
              */
             function pointerMove(mapBrowserEvent: ol.MapBrowserEvent): boolean;
@@ -1086,6 +1219,8 @@ declare module ol {
             /**
              * Return `true` if the event is a map `singleclick` event, `false` otherwise.
              *
+             * @param mapBrowserEvent Map browser event.
+             * @return True if the event is a map `singleclick` event.
              * @api stable
              */
             function singleClick(mapBrowserEvent: ol.MapBrowserEvent): boolean;
@@ -1093,6 +1228,8 @@ declare module ol {
             /**
              * Return `true` if the event is a map `dblclick` event, `false` otherwise.
              *
+             * @param mapBrowserEvent Map browser event.
+             * @return True if the event is a map `dblclick` event.
              * @api stable
              */
             function doubleClick(mapBrowserEvent: ol.MapBrowserEvent): boolean;
@@ -1101,6 +1238,8 @@ declare module ol {
              * Return `true` if no modifier key (alt-, shift- or platform-modifier-key) is
              * pressed.
              *
+             * @param mapBrowserEvent Map browser event.
+             * @return True only if there no modifier keys are pressed.
              * @api stable
              */
             function noModifierKeys(mapBrowserEvent: ol.MapBrowserEvent): boolean;
@@ -1110,6 +1249,8 @@ declare module ol {
              * ctrl-key otherwise) is pressed, `false` otherwise (e.g. when additionally
              * the shift-key is pressed).
              *
+             * @param mapBrowserEvent Map browser event.
+             * @return True if only the platform modifier key is pressed.
              * @api stable
              */
             function platformModifierKeyOnly(mapBrowserEvent: ol.MapBrowserEvent): boolean;
@@ -1118,6 +1259,8 @@ declare module ol {
              * Return `true` if only the shift-key is pressed, `false` otherwise (e.g. when
              * additionally the alt-key is pressed).
              *
+             * @param mapBrowserEvent Map browser event.
+             * @return True if only the shift key is pressed.
              * @api stable
              */
             function shiftKeyOnly(mapBrowserEvent: ol.MapBrowserEvent): boolean;
@@ -1126,6 +1269,8 @@ declare module ol {
              * Return `true` if the target element is not editable, i.e. not a `<input>`-,
              * `<select>`- or `<textarea>`-element, `false` otherwise.
              *
+             * @param mapBrowserEvent Map browser event.
+             * @return True only if the target element is not editable.
              * @api
              */
             function targetNotEditable(mapBrowserEvent: ol.MapBrowserEvent): boolean;
@@ -1133,6 +1278,8 @@ declare module ol {
             /**
              * Return `true` if the event originates from a mouse device.
              *
+             * @param mapBrowserEvent Map browser event.
+             * @return True if the event originates from a mouse device.
              * @api stable
              */
             function mouseOnly(mapBrowserEvent: ol.MapBrowserEvent): boolean;
@@ -1142,6 +1289,8 @@ declare module ol {
              * contact with the surface or if the left mouse button is pressed.
              * @see http://www.w3.org/TR/pointerevents/#button-states
              *
+             * @param mapBrowserEvent Map browser event.
+             * @return True if the event originates from a primary pointer.
              * @api
              */
             function primaryAction(mapBrowserEvent: ol.MapBrowserEvent): boolean;
@@ -1157,6 +1306,7 @@ declare module ol {
          * for higher level events defined in the library, and works with
          * {@link ol.events.EventTarget}.
          *
+         * @param type Type.
          */
         class Event {
             /**
@@ -1169,6 +1319,7 @@ declare module ol {
              * for higher level events defined in the library, and works with
              * {@link ol.events.EventTarget}.
              *
+             * @param type Type.
              */
             constructor(type: string);
 
@@ -1238,12 +1389,18 @@ declare module ol {
         /**
          * Build an extent that includes all given coordinates.
          *
+         * @param coordinates Coordinates.
+         * @return Bounding extent.
          * @api stable
          */
         function boundingExtent(coordinates: ol.Coordinate[]): ol.Extent;
 
         /**
          * Return extent increased by the provided value.
+         * @param extent Extent.
+         * @param value The amount by which the extent should be buffered.
+         * @param opt_extent Extent.
+         * @return Extent.
          * @api stable
          */
         function buffer(extent: ol.Extent, value: number, opt_extent?: ol.Extent): ol.Extent;
@@ -1251,6 +1408,9 @@ declare module ol {
         /**
          * Check if the passed coordinate is contained or on the edge of the extent.
          *
+         * @param extent Extent.
+         * @param coordinate Coordinate.
+         * @return The coordinate is contained in the extent.
          * @api stable
          */
         function containsCoordinate(extent: ol.Extent, coordinate: ol.Coordinate): boolean;
@@ -1261,6 +1421,9 @@ declare module ol {
          * An extent is deemed contained if it lies completely within the other extent,
          * including if they share one or more edges.
          *
+         * @param extent1 Extent 1.
+         * @param extent2 Extent 2.
+         * @return The second extent is contained by or on the edge of the
          *     first.
          * @api stable
          */
@@ -1269,97 +1432,137 @@ declare module ol {
         /**
          * Check if the passed coordinate is contained or on the edge of the extent.
          *
+         * @param extent Extent.
+         * @param x X coordinate.
+         * @param y Y coordinate.
+         * @return The x, y values are contained in the extent.
          * @api stable
          */
         function containsXY(extent: ol.Extent, x: number, y: number): boolean;
 
         /**
          * Create an empty extent.
+         * @return Empty extent.
          * @api stable
          */
         function createEmpty(): ol.Extent;
 
         /**
          * Determine if two extents are equivalent.
+         * @param extent1 Extent 1.
+         * @param extent2 Extent 2.
+         * @return The two extents are equivalent.
          * @api stable
          */
         function equals(extent1: ol.Extent, extent2: ol.Extent): boolean;
 
         /**
          * Modify an extent to include another extent.
+         * @param extent1 The extent to be modified.
+         * @param extent2 The extent that will be included in the first.
+         * @return A reference to the first (extended) extent.
          * @api stable
          */
         function extend(extent1: ol.Extent, extent2: ol.Extent): ol.Extent;
 
         /**
          * Get the bottom left coordinate of an extent.
+         * @param extent Extent.
+         * @return Bottom left coordinate.
          * @api stable
          */
         function getBottomLeft(extent: ol.Extent): ol.Coordinate;
 
         /**
          * Get the bottom right coordinate of an extent.
+         * @param extent Extent.
+         * @return Bottom right coordinate.
          * @api stable
          */
         function getBottomRight(extent: ol.Extent): ol.Coordinate;
 
         /**
          * Get the center coordinate of an extent.
+         * @param extent Extent.
+         * @return Center.
          * @api stable
          */
         function getCenter(extent: ol.Extent): ol.Coordinate;
 
         /**
          * Get the height of an extent.
+         * @param extent Extent.
+         * @return Height.
          * @api stable
          */
         function getHeight(extent: ol.Extent): number;
 
         /**
          * Get the intersection of two extents.
+         * @param extent1 Extent 1.
+         * @param extent2 Extent 2.
+         * @param opt_extent Optional extent to populate with intersection.
+         * @return Intersecting extent.
          * @api stable
          */
         function getIntersection(extent1: ol.Extent, extent2: ol.Extent, opt_extent?: ol.Extent): ol.Extent;
 
         /**
          * Get the size (width, height) of an extent.
+         * @param extent The extent.
+         * @return The extent size.
          * @api stable
          */
         function getSize(extent: ol.Extent): ol.Size;
 
         /**
          * Get the top left coordinate of an extent.
+         * @param extent Extent.
+         * @return Top left coordinate.
          * @api stable
          */
         function getTopLeft(extent: ol.Extent): ol.Coordinate;
 
         /**
          * Get the top right coordinate of an extent.
+         * @param extent Extent.
+         * @return Top right coordinate.
          * @api stable
          */
         function getTopRight(extent: ol.Extent): ol.Coordinate;
 
         /**
          * Get the width of an extent.
+         * @param extent Extent.
+         * @return Width.
          * @api stable
          */
         function getWidth(extent: ol.Extent): number;
 
         /**
          * Determine if one extent intersects another.
+         * @param extent1 Extent 1.
+         * @param extent2 Extent.
+         * @return The two extents intersect.
          * @api stable
          */
         function intersects(extent1: ol.Extent, extent2: ol.Extent): boolean;
 
         /**
          * Determine if an extent is empty.
+         * @param extent Extent.
+         * @return Is empty.
          * @api stable
          */
         function isEmpty(extent: ol.Extent): boolean;
 
         /**
          * Apply a transform function to the extent.
+         * @param extent Extent.
+         * @param transformFn Transform function.  Called with
          * [minX, minY, maxX, maxY] extent coordinates.
+         * @param opt_extent Destination extent.
+         * @return Extent.
          * @api stable
          */
         function applyTransform(extent: ol.Extent, transformFn: ol.TransformFunction, opt_extent?: ol.Extent): ol.Extent;
@@ -1402,6 +1605,7 @@ declare module ol {
      * var point = feature.getGeometry();
      * ```
      *
+     * @param opt_geometryOrProperties
      *     You may pass a Geometry object directly, or an object literal
      *     containing properties.  If you pass an object literal, you may
      *     include a Geometry associated with a `geometry` key.
@@ -1445,6 +1649,7 @@ declare module ol {
          * var point = feature.getGeometry();
          * ```
          *
+         * @param opt_geometryOrProperties
          *     You may pass a Geometry object directly, or an object literal
          *     containing properties.  If you pass an object literal, you may
          *     include a Geometry associated with a `geometry` key.
@@ -1455,6 +1660,7 @@ declare module ol {
         /**
          * Clone this feature. If the original feature has a geometry it
          * is also cloned. The feature id is not set in the clone.
+         * @return The clone.
          * @api stable
          */
         clone(): ol.Feature;
@@ -1463,6 +1669,7 @@ declare module ol {
          * Get the feature's default geometry.  A feature may have any number of named
          * geometries.  The "default" geometry (the one that is rendered by default) is
          * set when calling {@link ol.Feature#setGeometry}.
+         * @return The default geometry for the feature.
          * @api stable
          * @observable
          */
@@ -1472,6 +1679,7 @@ declare module ol {
          * Get the feature identifier.  This is a stable identifier for the feature and
          * is either set when reading data from a remote source or set explicitly by
          * calling {@link ol.Feature#setId}.
+         * @return Id.
          * @api stable
          * @observable
          */
@@ -1480,6 +1688,7 @@ declare module ol {
         /**
          * Get the name of the feature's default geometry.  By default, the default
          * geometry is named `geometry`.
+         * @return Get the property name associated with the default geometry
          *     for this feature.
          * @api stable
          */
@@ -1488,7 +1697,7 @@ declare module ol {
         /**
          * Get the feature's style.  This return for this method depends on what was
          * provided to the {@link ol.Feature#setStyle} method.
-         *     ol.FeatureStyleFunction|ol.StyleFunction} The feature style.
+         * @return The feature style.
          * @api stable
          * @observable
          */
@@ -1496,6 +1705,7 @@ declare module ol {
 
         /**
          * Get the feature's style function.
+         * @return Return a function
          * representing the current style of this feature.
          * @api stable
          */
@@ -1504,6 +1714,7 @@ declare module ol {
         /**
          * Set the default geometry for the feature.  This will update the property
          * with the name returned by {@link ol.Feature#getGeometryName}.
+         * @param geometry The new geometry.
          * @api stable
          * @observable
          */
@@ -1513,7 +1724,7 @@ declare module ol {
          * Set the style for the feature.  This can be a single style object, an array
          * of styles, or a function that takes a resolution and returns an array of
          * styles. If it is `null` the feature has no style (a `null` style).
-         *     ol.FeatureStyleFunction|ol.StyleFunction} style Style for this feature.
+         * @param style Style for this feature.
          * @api stable
          * @observable
          */
@@ -1524,6 +1735,7 @@ declare module ol {
          * requesting features or comparing identifiers returned from a remote source.
          * The feature id can be used with the {@link ol.source.Vector#getFeatureById}
          * method.
+         * @param id The feature id.
          * @api stable
          * @observable
          */
@@ -1533,6 +1745,7 @@ declare module ol {
          * Set the property name to be used when getting the feature's default geometry.
          * When calling {@link ol.Feature#getGeometry}, the value of the property with
          * this name will be returned.
+         * @param name The property name of the default geometry.
          * @api stable
          */
         setGeometryName(name: string): void;
@@ -1546,6 +1759,9 @@ declare module ol {
          * Create an XHR feature loader for a `url` and `format`. The feature loader
          * loads features (with XHR), parses the features, and adds them to the
          * vector tile.
+         * @param url Feature URL service.
+         * @param format Feature format.
+         * @return The feature loader.
          * @api
          */
         function tile(url: (string | ol.FeatureUrlFunction), format: ol.format.Feature): ol.FeatureLoader;
@@ -1554,6 +1770,9 @@ declare module ol {
          * Create an XHR feature loader for a `url` and `format`. The feature loader
          * loads features (with XHR), parses the features, and adds them to the
          * vector source.
+         * @param url Feature URL service.
+         * @param format Feature format.
+         * @return The feature loader.
          * @api
          */
         function xhr(url: (string | ol.FeatureUrlFunction), format: ol.format.Feature): ol.FeatureLoader;
@@ -1564,6 +1783,7 @@ declare module ol {
          * @classdesc
          * Feature format for reading and writing data in the EsriJSON format.
          *
+         * @param opt_options Options.
          * @api
          */
         class EsriJSON extends ol.format.JSONFeature {
@@ -1571,6 +1791,7 @@ declare module ol {
              * @classdesc
              * Feature format for reading and writing data in the EsriJSON format.
              *
+             * @param opt_options Options.
              * @api
              */
             constructor(opt_options?: olx.format.EsriJSONOptions);
@@ -1579,6 +1800,9 @@ declare module ol {
              * Read a feature from a EsriJSON Feature source.  Only works for Feature,
              * use `readFeatures` to read FeatureCollection source.
              *
+             * @param source Source.
+             * @param opt_options Read options.
+             * @return Feature.
              * @api
              */
             readFeature(source: (ArrayBuffer | Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
@@ -1587,6 +1811,9 @@ declare module ol {
              * Read all features from a EsriJSON source.  Works with both Feature and
              * FeatureCollection sources.
              *
+             * @param source Source.
+             * @param opt_options Read options.
+             * @return Features.
              * @api
              */
             readFeatures(source: (ArrayBuffer | Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
@@ -1594,6 +1821,9 @@ declare module ol {
             /**
              * Read a geometry from a EsriJSON source.
              *
+             * @param source Source.
+             * @param opt_options Read options.
+             * @return Geometry.
              * @api
              */
             readGeometry(source: (ArrayBuffer | Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.geom.Geometry;
@@ -1601,6 +1831,8 @@ declare module ol {
             /**
              * Read the projection from a EsriJSON source.
              *
+             * @param source Source.
+             * @return Projection.
              * @api
              */
             readProjection(source: (ArrayBuffer | Document | Node | GlobalObject | string)): ol.proj.Projection;
@@ -1608,6 +1840,9 @@ declare module ol {
             /**
              * Encode a geometry as a EsriJSON string.
              *
+             * @param geometry Geometry.
+             * @param opt_options Write options.
+             * @return EsriJSON.
              * @api
              */
             writeGeometry(geometry: ol.geom.Geometry, opt_options?: olx.format.WriteOptions): string;
@@ -1615,6 +1850,9 @@ declare module ol {
             /**
              * Encode a geometry as a EsriJSON object.
              *
+             * @param geometry Geometry.
+             * @param opt_options Write options.
+             * @return Object.
              * @api
              */
             writeGeometryObject(geometry: ol.geom.Geometry, opt_options?: olx.format.WriteOptions): EsriJSONGeometry;
@@ -1622,6 +1860,9 @@ declare module ol {
             /**
              * Encode a feature as a EsriJSON Feature string.
              *
+             * @param feature Feature.
+             * @param opt_options Write options.
+             * @return EsriJSON.
              * @api
              */
             writeFeature(feature: ol.Feature, opt_options?: olx.format.WriteOptions): string;
@@ -1629,6 +1870,9 @@ declare module ol {
             /**
              * Encode a feature as a esriJSON Feature object.
              *
+             * @param feature Feature.
+             * @param opt_options Write options.
+             * @return Object.
              * @api
              */
             writeFeatureObject(feature: ol.Feature, opt_options?: olx.format.WriteOptions): GlobalObject;
@@ -1636,6 +1880,9 @@ declare module ol {
             /**
              * Encode an array of features as EsriJSON.
              *
+             * @param features Features.
+             * @param opt_options Write options.
+             * @return EsriJSON.
              * @api
              */
             writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
@@ -1643,6 +1890,9 @@ declare module ol {
             /**
              * Encode an array of features as a EsriJSON object.
              *
+             * @param features Features.
+             * @param opt_options Write options.
+             * @return EsriJSON Object.
              * @api
              */
             writeFeaturesObject(features: ol.Feature[], opt_options?: olx.format.WriteOptions): GlobalObject;
@@ -1685,6 +1935,7 @@ declare module ol {
          * @classdesc
          * Feature format for reading and writing data in the GeoJSON format.
          *
+         * @param opt_options Options.
          * @api stable
          */
         class GeoJSON extends ol.format.JSONFeature {
@@ -1692,6 +1943,7 @@ declare module ol {
              * @classdesc
              * Feature format for reading and writing data in the GeoJSON format.
              *
+             * @param opt_options Options.
              * @api stable
              */
             constructor(opt_options?: olx.format.GeoJSONOptions);
@@ -1700,6 +1952,9 @@ declare module ol {
              * Read a feature from a GeoJSON Feature source.  Only works for Feature,
              * use `readFeatures` to read FeatureCollection source.
              *
+             * @param source Source.
+             * @param opt_options Read options.
+             * @return Feature.
              * @api stable
              */
             readFeature(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
@@ -1708,6 +1963,9 @@ declare module ol {
              * Read all features from a GeoJSON source.  Works with both Feature and
              * FeatureCollection sources.
              *
+             * @param source Source.
+             * @param opt_options Read options.
+             * @return Features.
              * @api stable
              */
             readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
@@ -1715,6 +1973,9 @@ declare module ol {
             /**
              * Read a geometry from a GeoJSON source.
              *
+             * @param source Source.
+             * @param opt_options Read options.
+             * @return Geometry.
              * @api stable
              */
             readGeometry(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.geom.Geometry;
@@ -1722,6 +1983,8 @@ declare module ol {
             /**
              * Read the projection from a GeoJSON source.
              *
+             * @param source Source.
+             * @return Projection.
              * @api stable
              */
             readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
@@ -1729,6 +1992,9 @@ declare module ol {
             /**
              * Encode a feature as a GeoJSON Feature string.
              *
+             * @param feature Feature.
+             * @param opt_options Write options.
+             * @return GeoJSON.
              * @api stable
              */
             writeFeature(feature: ol.Feature, opt_options?: olx.format.WriteOptions): string;
@@ -1736,6 +2002,9 @@ declare module ol {
             /**
              * Encode a feature as a GeoJSON Feature object.
              *
+             * @param feature Feature.
+             * @param opt_options Write options.
+             * @return Object.
              * @api stable
              */
             writeFeatureObject(feature: ol.Feature, opt_options?: olx.format.WriteOptions): GeoJSONFeature;
@@ -1743,6 +2012,9 @@ declare module ol {
             /**
              * Encode an array of features as GeoJSON.
              *
+             * @param features Features.
+             * @param opt_options Write options.
+             * @return GeoJSON.
              * @api stable
              */
             writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
@@ -1750,6 +2022,9 @@ declare module ol {
             /**
              * Encode an array of features as a GeoJSON object.
              *
+             * @param features Features.
+             * @param opt_options Write options.
+             * @return GeoJSON Object.
              * @api stable
              */
             writeFeaturesObject(features: ol.Feature[], opt_options?: olx.format.WriteOptions): GeoJSONFeatureCollection;
@@ -1757,6 +2032,9 @@ declare module ol {
             /**
              * Encode a geometry as a GeoJSON string.
              *
+             * @param geometry Geometry.
+             * @param opt_options Write options.
+             * @return GeoJSON.
              * @api stable
              */
             writeGeometry(geometry: ol.geom.Geometry, opt_options?: olx.format.WriteOptions): string;
@@ -1764,6 +2042,9 @@ declare module ol {
             /**
              * Encode a geometry as a GeoJSON object.
              *
+             * @param geometry Geometry.
+             * @param opt_options Write options.
+             * @return Object.
              * @api stable
              */
             writeGeometryObject(geometry: ol.geom.Geometry, opt_options?: olx.format.WriteOptions): (GeoJSONGeometry | GeoJSONGeometryCollection);
@@ -1775,6 +2056,7 @@ declare module ol {
          * version 3.1.1.
          * Currently only supports GML 3.1.1 Simple Features profile.
          *
+         * @param opt_options
          *     Optional configuration object.
          * @api stable
          */
@@ -1785,6 +2067,7 @@ declare module ol {
              * version 3.1.1.
              * Currently only supports GML 3.1.1 Simple Features profile.
              *
+             * @param opt_options
              *     Optional configuration object.
              * @api stable
              */
@@ -1793,6 +2076,9 @@ declare module ol {
             /**
              * Encode an array of features in GML 3.1.1 Simple Features.
              *
+             * @param features Features.
+             * @param opt_options Options.
+             * @return Result.
              * @api stable
              */
             writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
@@ -1800,6 +2086,9 @@ declare module ol {
             /**
              * Encode an array of features in the GML 3.1.1 format as an XML node.
              *
+             * @param features Features.
+             * @param opt_options Options.
+             * @return Node.
              * @api
              */
             writeFeaturesNode(features: ol.Feature[], opt_options?: olx.format.WriteOptions): Node;
@@ -1810,6 +2099,7 @@ declare module ol {
          * Feature format for reading and writing data in the GML format,
          * version 2.1.2.
          *
+         * @param opt_options Optional configuration object.
          * @api
          */
         class GML2 extends ol.format.GMLBase {
@@ -1818,6 +2108,7 @@ declare module ol {
              * Feature format for reading and writing data in the GML format,
              * version 2.1.2.
              *
+             * @param opt_options Optional configuration object.
              * @api
              */
             constructor(opt_options?: olx.format.GMLOptions);
@@ -1829,6 +2120,7 @@ declare module ol {
          * version 3.1.1.
          * Currently only supports GML 3.1.1 Simple Features profile.
          *
+         * @param opt_options
          *     Optional configuration object.
          * @api
          */
@@ -1839,6 +2131,7 @@ declare module ol {
              * version 3.1.1.
              * Currently only supports GML 3.1.1 Simple Features profile.
              *
+             * @param opt_options
              *     Optional configuration object.
              * @api
              */
@@ -1847,6 +2140,9 @@ declare module ol {
             /**
              * Encode a geometry in GML 3.1.1 Simple Features.
              *
+             * @param geometry Geometry.
+             * @param opt_options Options.
+             * @return Node.
              * @api
              */
             writeGeometryNode(geometry: ol.geom.Geometry, opt_options?: olx.format.WriteOptions): Node;
@@ -1854,6 +2150,9 @@ declare module ol {
             /**
              * Encode an array of features in GML 3.1.1 Simple Features.
              *
+             * @param features Features.
+             * @param opt_options Options.
+             * @return Result.
              * @api stable
              */
             writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
@@ -1861,6 +2160,9 @@ declare module ol {
             /**
              * Encode an array of features in the GML 3.1.1 format as an XML node.
              *
+             * @param features Features.
+             * @param opt_options Options.
+             * @return Node.
              * @api
              */
             writeFeaturesNode(features: ol.Feature[], opt_options?: olx.format.WriteOptions): Node;
@@ -1875,6 +2177,7 @@ declare module ol {
          * is shared with versioned format classes ol.format.GML2 and
          * ol.format.GML3.
          *
+         * @param opt_options
          *     Optional configuration object.
          */
         class GMLBase extends ol.format.XMLFeature {
@@ -1887,6 +2190,7 @@ declare module ol {
              * is shared with versioned format classes ol.format.GML2 and
              * ol.format.GML3.
              *
+             * @param opt_options
              *     Optional configuration object.
              */
             constructor(opt_options?: olx.format.GMLOptions);
@@ -1894,6 +2198,9 @@ declare module ol {
             /**
              * Read all features from a GML FeatureCollection.
              *
+             * @param source Source.
+             * @param opt_options Options.
+             * @return Features.
              * @api stable
              */
             readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
@@ -1903,6 +2210,7 @@ declare module ol {
          * @classdesc
          * Feature format for reading and writing data in the GPX format.
          *
+         * @param opt_options Options.
          * @api stable
          */
         class GPX extends ol.format.XMLFeature {
@@ -1910,6 +2218,7 @@ declare module ol {
              * @classdesc
              * Feature format for reading and writing data in the GPX format.
              *
+             * @param opt_options Options.
              * @api stable
              */
             constructor(opt_options?: olx.format.GPXOptions);
@@ -1919,6 +2228,9 @@ declare module ol {
              * Routes (`<rte>`) are converted into LineString geometries, and tracks (`<trk>`)
              * into MultiLineString. Any properties on route and track waypoints are ignored.
              *
+             * @param source Source.
+             * @param opt_options Read options.
+             * @return Feature.
              * @api stable
              */
             readFeature(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
@@ -1928,6 +2240,9 @@ declare module ol {
              * Routes (`<rte>`) are converted into LineString geometries, and tracks (`<trk>`)
              * into MultiLineString. Any properties on route and track waypoints are ignored.
              *
+             * @param source Source.
+             * @param opt_options Read options.
+             * @return Features.
              * @api stable
              */
             readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
@@ -1935,6 +2250,8 @@ declare module ol {
             /**
              * Read the projection from a GPX source.
              *
+             * @param source Source.
+             * @return Projection.
              * @api stable
              */
             readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
@@ -1944,6 +2261,9 @@ declare module ol {
              * LineString geometries are output as routes (`<rte>`), and MultiLineString
              * as tracks (`<trk>`).
              *
+             * @param features Features.
+             * @param opt_options Write options.
+             * @return Result.
              * @api stable
              */
             writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
@@ -1953,6 +2273,9 @@ declare module ol {
              * LineString geometries are output as routes (`<rte>`), and MultiLineString
              * as tracks (`<trk>`).
              *
+             * @param features Features.
+             * @param opt_options Options.
+             * @return Node.
              * @api
              */
             writeFeaturesNode(features: ol.Feature[], opt_options?: olx.format.WriteOptions): Node;
@@ -1967,6 +2290,7 @@ declare module ol {
          * @classdesc
          * Feature format for `*.igc` flight recording files.
          *
+         * @param opt_options Options.
          * @api
          */
         class IGC extends ol.format.TextFeature {
@@ -1974,6 +2298,7 @@ declare module ol {
              * @classdesc
              * Feature format for `*.igc` flight recording files.
              *
+             * @param opt_options Options.
              * @api
              */
             constructor(opt_options?: olx.format.IGCOptions);
@@ -1981,6 +2306,9 @@ declare module ol {
             /**
              * Read the feature from the IGC source.
              *
+             * @param source Source.
+             * @param opt_options Read options.
+             * @return Feature.
              * @api
              */
             readFeature(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
@@ -1989,6 +2317,9 @@ declare module ol {
              * Read the feature from the source. As IGC sources contain a single
              * feature, this will return the feature in an array.
              *
+             * @param source Source.
+             * @param opt_options Read options.
+             * @return Features.
              * @api
              */
             readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
@@ -1996,6 +2327,8 @@ declare module ol {
             /**
              * Read the projection from the IGC source.
              *
+             * @param source Source.
+             * @return Projection.
              * @api
              */
             readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
@@ -2026,6 +2359,7 @@ declare module ol {
          * Note that the KML format uses the URL() constructor. Older browsers such as IE
          * which do not support this will need a URL polyfill to be loaded before use.
          *
+         * @param opt_options Options.
          * @api stable
          */
         class KML extends ol.format.XMLFeature {
@@ -2036,6 +2370,7 @@ declare module ol {
              * Note that the KML format uses the URL() constructor. Older browsers such as IE
              * which do not support this will need a URL polyfill to be loaded before use.
              *
+             * @param opt_options Options.
              * @api stable
              */
             constructor(opt_options?: olx.format.KMLOptions);
@@ -2045,6 +2380,9 @@ declare module ol {
              * GeometryCollections if they are a mix of geometry types, and into MultiPoint/
              * MultiLineString/MultiPolygon if they are all of the same type.
              *
+             * @param source Source.
+             * @param opt_options Read options.
+             * @return Feature.
              * @api stable
              */
             readFeature(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
@@ -2054,6 +2392,9 @@ declare module ol {
              * GeometryCollections if they are a mix of geometry types, and into MultiPoint/
              * MultiLineString/MultiPolygon if they are all of the same type.
              *
+             * @param source Source.
+             * @param opt_options Read options.
+             * @return Features.
              * @api stable
              */
             readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
@@ -2061,6 +2402,8 @@ declare module ol {
             /**
              * Read the name of the KML.
              *
+             * @param source Souce.
+             * @return Name.
              * @api stable
              */
             readName(source: (Document | Node | string)): (string);
@@ -2068,6 +2411,8 @@ declare module ol {
             /**
              * Read the network links of the KML.
              *
+             * @param source Source.
+             * @return Network links.
              * @api
              */
             readNetworkLinks(source: (Document | Node | string)): GlobalObject[];
@@ -2075,6 +2420,8 @@ declare module ol {
             /**
              * Read the projection from a KML source.
              *
+             * @param source Source.
+             * @return Projection.
              * @api stable
              */
             readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
@@ -2083,6 +2430,9 @@ declare module ol {
              * Encode an array of features in the KML format. GeometryCollections, MultiPoints,
              * MultiLineStrings, and MultiPolygons are output as MultiGeometries.
              *
+             * @param features Features.
+             * @param opt_options Options.
+             * @return Result.
              * @api stable
              */
             writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
@@ -2091,6 +2441,9 @@ declare module ol {
              * Encode an array of features in the KML format as an XML node. GeometryCollections,
              * MultiPoints, MultiLineStrings, and MultiPolygons are output as MultiGeometries.
              *
+             * @param features Features.
+             * @param opt_options Options.
+             * @return Node.
              * @api
              */
             writeFeaturesNode(features: ol.Feature[], opt_options?: olx.format.WriteOptions): Node;
@@ -2100,6 +2453,7 @@ declare module ol {
          * @classdesc
          * Feature format for reading data in the Mapbox MVT format.
          *
+         * @param opt_options Options.
          * @api
          */
         class MVT extends ol.format.Feature {
@@ -2107,6 +2461,7 @@ declare module ol {
              * @classdesc
              * Feature format for reading data in the Mapbox MVT format.
              *
+             * @param opt_options Options.
              * @api
              */
             constructor(opt_options?: olx.format.MVTOptions);
@@ -2125,6 +2480,7 @@ declare module ol {
 
             /**
              * Sets the layers that features will be read from.
+             * @param layers Layers.
              * @api
              */
             setLayers(layers: string[]): void;
@@ -2135,7 +2491,11 @@ declare module ol {
              * Create a `<Intersects>` operator to test whether a geometry-valued property
              * intersects a given geometry.
              *
+             * @param geometryName Geometry name to use.
+             * @param geometry Geometry.
+             * @param opt_srsName SRS name. No srsName attribute will be
              *    set on geometries when this is not provided.
+             * @returns `<Intersects>` operator.
              * @api
              */
             function intersects(geometryName: string, geometry: ol.geom.Geometry, opt_srsName?: string): ol.format.filter.Intersects;
@@ -2143,6 +2503,8 @@ declare module ol {
             /**
              * Create a logical `<Or>` operator between two or more filter conditions.
              *
+             * @param conditions Filter conditions.
+             * @returns `<Or>` operator.
              * @api
              */
             function or(...conditions: ol.format.filter.Filter[]): ol.format.filter.Or;
@@ -2150,6 +2512,8 @@ declare module ol {
             /**
              * Create a logical `<And>` operator between two or more filter conditions.
              *
+             * @param conditions Filter conditions.
+             * @returns `<And>` operator.
              * @api
              */
             function and(...conditions: ol.format.filter.Filter[]): ol.format.filter.And;
@@ -2157,6 +2521,8 @@ declare module ol {
             /**
              * Represents a logical `<Not>` operator for a filter condition.
              *
+             * @param condition Filter condition.
+             * @returns `<Not>` operator.
              * @api
              */
             function not(condition: ol.format.filter.Filter): ol.format.filter.Not;
@@ -2165,7 +2531,11 @@ declare module ol {
              * Create a `<BBOX>` operator to test whether a geometry-valued property
              * intersects a fixed bounding box
              *
+             * @param geometryName Geometry name to use.
+             * @param extent Extent.
+             * @param opt_srsName SRS name. No srsName attribute will be
              *    set on geometries when this is not provided.
+             * @returns `<BBOX>` operator.
              * @api
              */
             function bbox(geometryName: string, extent: ol.Extent, opt_srsName?: string): ol.format.filter.Bbox;
@@ -2174,7 +2544,11 @@ declare module ol {
              * Create a `<Within>` operator to test whether a geometry-valued property
              * is within a given geometry.
              *
+             * @param geometryName Geometry name to use.
+             * @param geometry Geometry.
+             * @param opt_srsName SRS name. No srsName attribute will be
              *    set on geometries when this is not provided.
+             * @returns `<Within>` operator.
              * @api
              */
             function within(geometryName: string, geometry: ol.geom.Geometry, opt_srsName?: string): ol.format.filter.Within;
@@ -2182,6 +2556,10 @@ declare module ol {
             /**
              * Creates a `<PropertyIsEqualTo>` comparison operator.
              *
+             * @param propertyName Name of the context property to compare.
+             * @param expression The value to compare.
+             * @param opt_matchCase Case-sensitive?
+             * @returns `<PropertyIsEqualTo>` operator.
              * @api
              */
             function equalTo(propertyName: string, expression: string | number, opt_matchCase?: boolean): ol.format.filter.EqualTo;
@@ -2189,6 +2567,10 @@ declare module ol {
             /**
              * Creates a `<PropertyIsNotEqualTo>` comparison operator.
              *
+             * @param propertyName Name of the context property to compare.
+             * @param expression The value to compare.
+             * @param opt_matchCase Case-sensitive?
+             * @returns `<PropertyIsNotEqualTo>` operator.
              * @api
              */
             function notEqualTo(propertyName: string, expression: string | number, opt_matchCase?: boolean): ol.format.filter.NotEqualTo;
@@ -2196,6 +2578,9 @@ declare module ol {
             /**
              * Creates a `<PropertyIsLessThan>` comparison operator.
              *
+             * @param propertyName Name of the context property to compare.
+             * @param expression The value to compare.
+             * @returns `<PropertyIsLessThan>` operator.
              * @api
              */
             function lessThan(propertyName: string, expression: number): ol.format.filter.LessThan;
@@ -2203,6 +2588,9 @@ declare module ol {
             /**
              * Creates a `<PropertyIsLessThanOrEqualTo>` comparison operator.
              *
+             * @param propertyName Name of the context property to compare.
+             * @param expression The value to compare.
+             * @returns `<PropertyIsLessThanOrEqualTo>` operator.
              * @api
              */
             function lessThanOrEqualTo(propertyName: string, expression: number): ol.format.filter.LessThanOrEqualTo;
@@ -2210,6 +2598,9 @@ declare module ol {
             /**
              * Creates a `<PropertyIsGreaterThan>` comparison operator.
              *
+             * @param propertyName Name of the context property to compare.
+             * @param expression The value to compare.
+             * @returns `<PropertyIsGreaterThan>` operator.
              * @api
              */
             function greaterThan(propertyName: string, expression: number): ol.format.filter.GreaterThan;
@@ -2217,6 +2608,9 @@ declare module ol {
             /**
              * Creates a `<PropertyIsGreaterThanOrEqualTo>` comparison operator.
              *
+             * @param propertyName Name of the context property to compare.
+             * @param expression The value to compare.
+             * @returns `<PropertyIsGreaterThanOrEqualTo>` operator.
              * @api
              */
             function greaterThanOrEqualTo(propertyName: string, expression: number): ol.format.filter.GreaterThanOrEqualTo;
@@ -2225,6 +2619,8 @@ declare module ol {
              * Creates a `<PropertyIsNull>` comparison operator to test whether a property value
              * is null.
              *
+             * @param propertyName Name of the context property to compare.
+             * @returns `<PropertyIsNull>` operator.
              * @api
              */
             function isNull(propertyName: string): ol.format.filter.IsNull;
@@ -2233,6 +2629,10 @@ declare module ol {
              * Creates a `<PropertyIsBetween>` comparison operator to test whether an expression
              * value lies within a range given by a lower and upper bound (inclusive).
              *
+             * @param propertyName Name of the context property to compare.
+             * @param lowerBoundary The lower bound of the range.
+             * @param upperBoundary The upper bound of the range.
+             * @returns `<PropertyIsBetween>` operator.
              * @api
              */
             function between(propertyName: string, lowerBoundary: number, upperBoundary: number): ol.format.filter.IsBetween;
@@ -2241,9 +2641,16 @@ declare module ol {
              * Represents a `<PropertyIsLike>` comparison operator that matches a string property
              * value against a text pattern.
              *
+             * @param propertyName Name of the context property to compare.
+             * @param pattern Text pattern.
+             * @param opt_wildCard Pattern character which matches any sequence of
              *    zero or more string characters. Default is '*'.
+             * @param opt_singleChar pattern character which matches any single
              *    string character. Default is '.'.
+             * @param opt_escapeChar Escape character which can be used to escape
              *    the pattern characters. Default is '!'.
+             * @param opt_matchCase Case-sensitive?
+             * @returns `<PropertyIsLike>` operator.
              * @api
              */
             function like(propertyName: string, pattern: string, opt_wildCard?: string, opt_singleChar?: string, opt_escapeChar?: string, opt_matchCase?: boolean): ol.format.filter.IsLike;
@@ -2251,6 +2658,10 @@ declare module ol {
             /**
              * Create a `<During>` temporal operator.
              *
+             * @param propertyName Name of the context property to compare.
+             * @param begin The begin date in ISO-8601 format.
+             * @param end The end date in ISO-8601 format.
+             * @returns `<During>` operator.
              * @api
              */
             function during(propertyName: string, begin: string, end: string): ol.format.filter.During;
@@ -2260,6 +2671,7 @@ declare module ol {
              * Abstract class; normally only used for creating subclasses and not instantiated in apps.
              * Base class for WFS GetFeature filters.
              *
+             * @param tagName The XML tag name for this filter.
              * @struct
              * @api
              */
@@ -2269,6 +2681,7 @@ declare module ol {
                  * Abstract class; normally only used for creating subclasses and not instantiated in apps.
                  * Base class for WFS GetFeature filters.
                  *
+                 * @param tagName The XML tag name for this filter.
                  * @struct
                  * @api
                  */
@@ -2276,6 +2689,7 @@ declare module ol {
 
                 /**
                  * The XML tag name for a filter.
+                 * @returns Name.
                  */
                 getTagName(): string;
             }
@@ -2285,6 +2699,10 @@ declare module ol {
              * Represents a spatial operator to test whether a geometry-valued property
              * relates to a given geometry.
              *
+             * @param tagName The XML tag name for this filter.
+             * @param geometryName Geometry name to use.
+             * @param geometry Geometry.
+             * @param opt_srsName SRS name. No srsName attribute will be
              *    set on geometries when this is not provided.
              * @api
              */
@@ -2294,6 +2712,10 @@ declare module ol {
                  * Represents a spatial operator to test whether a geometry-valued property
                  * relates to a given geometry.
                  *
+                 * @param tagName The XML tag name for this filter.
+                 * @param geometryName Geometry name to use.
+                 * @param geometry Geometry.
+                 * @param opt_srsName SRS name. No srsName attribute will be
                  *    set on geometries when this is not provided.
                  * @api
                  */
@@ -2305,6 +2727,9 @@ declare module ol {
              * Represents a `<Intersects>` operator to test whether a geometry-valued property
              * intersects a given geometry.
              *
+             * @param geometryName Geometry name to use.
+             * @param geometry Geometry.
+             * @param opt_srsName SRS name. No srsName attribute will be
              *    set on geometries when this is not provided.
              * @api
              */
@@ -2314,6 +2739,9 @@ declare module ol {
                  * Represents a `<Intersects>` operator to test whether a geometry-valued property
                  * intersects a given geometry.
                  *
+                 * @param geometryName Geometry name to use.
+                 * @param geometry Geometry.
+                 * @param opt_srsName SRS name. No srsName attribute will be
                  *    set on geometries when this is not provided.
                  * @api
                  */
@@ -2325,6 +2753,9 @@ declare module ol {
              * Represents a `<Within>` operator to test whether a geometry-valued property
              * is within a given geometry.
              *
+             * @param geometryName Geometry name to use.
+             * @param geometry Geometry.
+             * @param opt_srsName SRS name. No srsName attribute will be
              *    set on geometries when this is not provided.
              * @api
              */
@@ -2334,6 +2765,9 @@ declare module ol {
                  * Represents a `<Within>` operator to test whether a geometry-valued property
                  * is within a given geometry.
                  *
+                 * @param geometryName Geometry name to use.
+                 * @param geometry Geometry.
+                 * @param opt_srsName SRS name. No srsName attribute will be
                  *    set on geometries when this is not provided.
                  * @api
                  */
@@ -2351,6 +2785,7 @@ declare module ol {
              * @classdesc
              * Represents a logical <And> operator between two or more filter conditions.
              *
+             * @param conditions Conditions
              * @api
              */
             class And extends ol.format.filter.LogicalNary {
@@ -2358,6 +2793,7 @@ declare module ol {
                  * @classdesc
                  * Represents a logical <And> operator between two or more filter conditions.
                  *
+                 * @param conditions Conditions
                  * @api
                  */
                 constructor(...conditions: ol.format.filter.Filter[]);
@@ -2367,6 +2803,7 @@ declare module ol {
              * @classdesc
              * Represents a logical <Or> operator between two or more filter conditions.
              *
+             * @param conditions Conditions
              * @api
              */
             class Or extends ol.format.filter.LogicalNary {
@@ -2374,6 +2811,7 @@ declare module ol {
                  * @classdesc
                  * Represents a logical <Or> operator between two or more filter conditions.
                  *
+                 * @param conditions Conditions
                  * @api
                  */
                 constructor(...conditions: ol.format.filter.Filter[]);
@@ -2386,6 +2824,8 @@ declare module ol {
              *
              * deprecated: This class will no longer be exported starting from the next major version.
              *
+             * @param tagName The XML tag name for this filter.
+             * @param propertyName Name of the context property to compare.
              * @api
              */
             class Comparison extends ol.format.filter.Filter {
@@ -2396,6 +2836,8 @@ declare module ol {
                  *
                  * deprecated: This class will no longer be exported starting from the next major version.
                  *
+                 * @param tagName The XML tag name for this filter.
+                 * @param propertyName Name of the context property to compare.
                  * @api
                  */
                 constructor(tagName: string, propertyName: string);
@@ -2408,6 +2850,10 @@ declare module ol {
              *
              * deprecated: This class will no longer be exported starting from the next major version.
              *
+             * @param tagName The XML tag name for this filter.
+             * @param propertyName Name of the context property to compare.
+             * @param expression The value to compare.
+             * @param opt_matchCase Case-sensitive?
              * @api
              */
             class ComparisonBinary extends ol.format.filter.Comparison {
@@ -2418,6 +2864,10 @@ declare module ol {
                  *
                  * deprecated: This class will no longer be exported starting from the next major version.
                  *
+                 * @param tagName The XML tag name for this filter.
+                 * @param propertyName Name of the context property to compare.
+                 * @param expression The value to compare.
+                 * @param opt_matchCase Case-sensitive?
                  * @api
                  */
                 constructor(tagName: string, propertyName: string, expression: string | number, opt_matchCase?: boolean);
@@ -2427,6 +2877,9 @@ declare module ol {
              * @classdesc
              * Represents a `<PropertyIsEqualTo>` comparison operator.
              *
+             * @param propertyName Name of the context property to compare.
+             * @param expression The value to compare.
+             * @param opt_matchCase Case-sensitive?
              * @api
              */
             class EqualTo extends ol.format.filter.ComparisonBinary {
@@ -2434,6 +2887,9 @@ declare module ol {
                  * @classdesc
                  * Represents a `<PropertyIsEqualTo>` comparison operator.
                  *
+                 * @param propertyName Name of the context property to compare.
+                 * @param expression The value to compare.
+                 * @param opt_matchCase Case-sensitive?
                  * @api
                  */
                 constructor(propertyName: string, expression: string | number, opt_matchCase?: boolean);
@@ -2443,6 +2899,8 @@ declare module ol {
              * @classdesc
              * Represents a `<PropertyIsGreaterThan>` comparison operator.
              *
+             * @param propertyName Name of the context property to compare.
+             * @param expression The value to compare.
              * @api
              */
             class GreaterThan extends ol.format.filter.ComparisonBinary {
@@ -2450,6 +2908,8 @@ declare module ol {
                  * @classdesc
                  * Represents a `<PropertyIsGreaterThan>` comparison operator.
                  *
+                 * @param propertyName Name of the context property to compare.
+                 * @param expression The value to compare.
                  * @api
                  */
                 constructor(propertyName: string, expression: number);
@@ -2459,6 +2919,8 @@ declare module ol {
              * @classdesc
              * Represents a `<PropertyIsGreaterThanOrEqualTo>` comparison operator.
              *
+             * @param propertyName Name of the context property to compare.
+             * @param expression The value to compare.
              * @api
              */
             class GreaterThanOrEqualTo extends ol.format.filter.ComparisonBinary {
@@ -2466,6 +2928,8 @@ declare module ol {
                  * @classdesc
                  * Represents a `<PropertyIsGreaterThanOrEqualTo>` comparison operator.
                  *
+                 * @param propertyName Name of the context property to compare.
+                 * @param expression The value to compare.
                  * @api
                  */
                 constructor(propertyName: string, expression: number);
@@ -2475,6 +2939,8 @@ declare module ol {
              * @classdesc
              * Represents a `<PropertyIsLessThan>` comparison operator.
              *
+             * @param propertyName Name of the context property to compare.
+             * @param expression The value to compare.
              * @api
              */
             class LessThan extends ol.format.filter.ComparisonBinary {
@@ -2482,6 +2948,8 @@ declare module ol {
                  * @classdesc
                  * Represents a `<PropertyIsLessThan>` comparison operator.
                  *
+                 * @param propertyName Name of the context property to compare.
+                 * @param expression The value to compare.
                  * @api
                  */
                 constructor(propertyName: string, expression: number);
@@ -2491,6 +2959,8 @@ declare module ol {
              * @classdesc
              * Represents a `<PropertyIsLessThanOrEqualTo>` comparison operator.
              *
+             * @param propertyName Name of the context property to compare.
+             * @param expression The value to compare.
              * @api
              */
             class LessThanOrEqualTo extends ol.format.filter.ComparisonBinary {
@@ -2498,6 +2968,8 @@ declare module ol {
                  * @classdesc
                  * Represents a `<PropertyIsLessThanOrEqualTo>` comparison operator.
                  *
+                 * @param propertyName Name of the context property to compare.
+                 * @param expression The value to compare.
                  * @api
                  */
                 constructor(propertyName: string, expression: number);
@@ -2507,6 +2979,9 @@ declare module ol {
              * @classdesc
              * Represents a `<PropertyIsNotEqualTo>` comparison operator.
              *
+             * @param propertyName Name of the context property to compare.
+             * @param expression The value to compare.
+             * @param opt_matchCase Case-sensitive?
              * @api
              */
             class NotEqualTo extends ol.format.filter.ComparisonBinary {
@@ -2514,6 +2989,9 @@ declare module ol {
                  * @classdesc
                  * Represents a `<PropertyIsNotEqualTo>` comparison operator.
                  *
+                 * @param propertyName Name of the context property to compare.
+                 * @param expression The value to compare.
+                 * @param opt_matchCase Case-sensitive?
                  * @api
                  */
                 constructor(propertyName: string, expression: string | number, opt_matchCase?: boolean);
@@ -2523,6 +3001,9 @@ declare module ol {
              * @classdesc
              * Represents a `<During>` comparison operator.
              *
+             * @param propertyName Name of the context property to compare.
+             * @param begin The begin date in ISO-8601 format.
+             * @param end The end date in ISO-8601 format.
              * @api
              */
             class During extends ol.format.filter.Comparison {
@@ -2530,6 +3011,9 @@ declare module ol {
                  * @classdesc
                  * Represents a `<During>` comparison operator.
                  *
+                 * @param propertyName Name of the context property to compare.
+                 * @param begin The begin date in ISO-8601 format.
+                 * @param end The end date in ISO-8601 format.
                  * @api
                  */
                 constructor(propertyName: string, begin: string, end: string);
@@ -2539,6 +3023,9 @@ declare module ol {
              * @classdesc
              * Represents a `<PropertyIsBetween>` comparison operator.
              *
+             * @param propertyName Name of the context property to compare.
+             * @param lowerBoundary The lower bound of the range.
+             * @param upperBoundary The upper bound of the range.
              * @api
              */
             class IsBetween extends ol.format.filter.Comparison {
@@ -2546,6 +3033,9 @@ declare module ol {
                  * @classdesc
                  * Represents a `<PropertyIsBetween>` comparison operator.
                  *
+                 * @param propertyName Name of the context property to compare.
+                 * @param lowerBoundary The lower bound of the range.
+                 * @param upperBoundary The upper bound of the range.
                  * @api
                  */
                 constructor(propertyName: string, lowerBoundary: number, upperBoundary: number);
@@ -2555,9 +3045,15 @@ declare module ol {
              * @classdesc
              * Represents a `<PropertyIsLike>` comparison operator.
              *
+             * @param propertyName Name of the context property to compare.
+             * @param pattern Text pattern.
+             * @param opt_wildCard Pattern character which matches any sequence of
              *    zero or more string characters. Default is '*'.
+             * @param opt_singleChar pattern character which matches any single
              *    string character. Default is '.'.
+             * @param opt_escapeChar Escape character which can be used to escape
              *    the pattern characters. Default is '!'.
+             * @param opt_matchCase Case-sensitive?
              * @api
              */
             class IsLike extends ol.format.filter.Comparison {
@@ -2565,9 +3061,15 @@ declare module ol {
                  * @classdesc
                  * Represents a `<PropertyIsLike>` comparison operator.
                  *
+                 * @param propertyName Name of the context property to compare.
+                 * @param pattern Text pattern.
+                 * @param opt_wildCard Pattern character which matches any sequence of
                  *    zero or more string characters. Default is '*'.
+                 * @param opt_singleChar pattern character which matches any single
                  *    string character. Default is '.'.
+                 * @param opt_escapeChar Escape character which can be used to escape
                  *    the pattern characters. Default is '!'.
+                 * @param opt_matchCase Case-sensitive?
                  * @api
                  */
                 constructor(propertyName: string, pattern: string, opt_wildCard?: string, opt_singleChar?: string, opt_escapeChar?: string, opt_matchCase?: boolean);
@@ -2577,6 +3079,7 @@ declare module ol {
              * @classdesc
              * Represents a `<PropertyIsNull>` comparison operator.
              *
+             * @param propertyName Name of the context property to compare.
              * @api
              */
             class IsNull extends ol.format.filter.Comparison {
@@ -2584,6 +3087,7 @@ declare module ol {
                  * @classdesc
                  * Represents a `<PropertyIsNull>` comparison operator.
                  *
+                 * @param propertyName Name of the context property to compare.
                  * @api
                  */
                 constructor(propertyName: string);
@@ -2593,6 +3097,7 @@ declare module ol {
              * @classdesc
              * Represents a logical `<Not>` operator for a filter condition.
              *
+             * @param condition Filter condition.
              * @api
              */
             class Not extends ol.format.filter.Filter {
@@ -2600,6 +3105,7 @@ declare module ol {
                  * @classdesc
                  * Represents a logical `<Not>` operator for a filter condition.
                  *
+                 * @param condition Filter condition.
                  * @api
                  */
                 constructor(condition: ol.format.filter.Filter);
@@ -2610,6 +3116,9 @@ declare module ol {
              * Represents a `<BBOX>` operator to test whether a geometry-valued property
              * intersects a fixed bounding box
              *
+             * @param geometryName Geometry name to use.
+             * @param extent Extent.
+             * @param opt_srsName SRS name. No srsName attribute will be
              *    set on geometries when this is not provided.
              * @api
              */
@@ -2619,6 +3128,9 @@ declare module ol {
                  * Represents a `<BBOX>` operator to test whether a geometry-valued property
                  * intersects a fixed bounding box
                  *
+                 * @param geometryName Geometry name to use.
+                 * @param extent Extent.
+                 * @param opt_srsName SRS name. No srsName attribute will be
                  *    set on geometries when this is not provided.
                  * @api
                  */
@@ -2646,6 +3158,9 @@ declare module ol {
             /**
              * Read all features from an OSM source.
              *
+             * @param source Source.
+             * @param opt_options Read options.
+             * @return Features.
              * @api stable
              */
             readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
@@ -2653,6 +3168,8 @@ declare module ol {
             /**
              * Read the projection from an OSM source.
              *
+             * @param source Source.
+             * @return Projection.
              * @api stable
              */
             readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
@@ -2663,6 +3180,7 @@ declare module ol {
          * Feature format for reading and writing data in the Encoded
          * Polyline Algorithm Format.
          *
+         * @param opt_options
          *     Optional configuration object.
          * @api stable
          */
@@ -2672,6 +3190,7 @@ declare module ol {
              * Feature format for reading and writing data in the Encoded
              * Polyline Algorithm Format.
              *
+             * @param opt_options
              *     Optional configuration object.
              * @api stable
              */
@@ -2682,8 +3201,12 @@ declare module ol {
              *
              * Attention: This function will modify the passed array!
              *
+             * @param numbers A list of n-dimensional points.
+             * @param stride The number of dimension of the points in the list.
+             * @param opt_factor The factor by which the numbers will be
              *     multiplied. The remaining decimal places will get rounded away.
              *     Default is `1e5`.
+             * @return The encoded string.
              * @api
              */
             static encodeDeltas(numbers: number[], stride: number, opt_factor?: number): string;
@@ -2691,8 +3214,12 @@ declare module ol {
             /**
              * Decode a list of n-dimensional points from an encoded string
              *
+             * @param encoded An encoded string.
+             * @param stride The number of dimension of the points in the
              *     encoded string.
+             * @param opt_factor The factor by which the resulting numbers will
              *     be divided. Default is `1e5`.
+             * @return A list of n-dimensional points.
              * @api
              */
             static decodeDeltas(encoded: string, stride: number, opt_factor?: number): number[];
@@ -2702,8 +3229,11 @@ declare module ol {
              *
              * Attention: This function will modify the passed array!
              *
+             * @param numbers A list of floating point numbers.
+             * @param opt_factor The factor by which the numbers will be
              *     multiplied. The remaining decimal places will get rounded away.
              *     Default is `1e5`.
+             * @return The encoded string.
              * @api
              */
             static encodeFloats(numbers: number[], opt_factor?: number): string;
@@ -2711,7 +3241,10 @@ declare module ol {
             /**
              * Decode a list of floating point numbers from an encoded string
              *
+             * @param encoded An encoded string.
+             * @param opt_factor The factor by which the result will be divided.
              *     Default is `1e5`.
+             * @return A list of floating point numbers.
              * @api
              */
             static decodeFloats(encoded: string, opt_factor?: number): number[];
@@ -2720,6 +3253,9 @@ declare module ol {
              * Read the feature from the Polyline source. The coordinates are assumed to be
              * in two dimensions and in latitude, longitude order.
              *
+             * @param source Source.
+             * @param opt_options Read options.
+             * @return Feature.
              * @api stable
              */
             readFeature(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
@@ -2728,6 +3264,9 @@ declare module ol {
              * Read the feature from the source. As Polyline sources contain a single
              * feature, this will return the feature in an array.
              *
+             * @param source Source.
+             * @param opt_options Read options.
+             * @return Features.
              * @api stable
              */
             readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
@@ -2735,6 +3274,9 @@ declare module ol {
             /**
              * Read the geometry from the source.
              *
+             * @param source Source.
+             * @param opt_options Read options.
+             * @return Geometry.
              * @api stable
              */
             readGeometry(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.geom.Geometry;
@@ -2742,6 +3284,8 @@ declare module ol {
             /**
              * Read the projection from a Polyline source.
              *
+             * @param source Source.
+             * @return Projection.
              * @api stable
              */
             readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
@@ -2749,6 +3293,9 @@ declare module ol {
             /**
              * Write a single geometry in Polyline format.
              *
+             * @param geometry Geometry.
+             * @param opt_options Write options.
+             * @return Geometry.
              * @api stable
              */
             writeGeometry(geometry: ol.geom.Geometry, opt_options?: olx.format.WriteOptions): string;
@@ -2776,6 +3323,7 @@ declare module ol {
          * @classdesc
          * Feature format for reading data in the TopoJSON format.
          *
+         * @param opt_options Options.
          * @api stable
          */
         class TopoJSON extends ol.format.JSONFeature {
@@ -2783,6 +3331,7 @@ declare module ol {
              * @classdesc
              * Feature format for reading data in the TopoJSON format.
              *
+             * @param opt_options Options.
              * @api stable
              */
             constructor(opt_options?: olx.format.TopoJSONOptions);
@@ -2790,6 +3339,8 @@ declare module ol {
             /**
              * Read all features from a TopoJSON source.
              *
+             * @param source Source.
+             * @return Features.
              * @api stable
              */
             readFeatures(source: (Document | Node | GlobalObject | string)): ol.Feature[];
@@ -2797,6 +3348,8 @@ declare module ol {
             /**
              * Read the projection from a TopoJSON source.
              *
+             * @param object Source.
+             * @return Projection.
              * @api stable
              */
             readProjection(object: (Document | Node | GlobalObject | string)): ol.proj.Projection;
@@ -2809,6 +3362,7 @@ declare module ol {
          * as option if you want to read a WFS that contains GML2 (WFS 1.0.0).
          * Also see {@link ol.format.GMLBase} which is used by this format.
          *
+         * @param opt_options
          *     Optional configuration object.
          * @api stable
          */
@@ -2820,6 +3374,7 @@ declare module ol {
              * as option if you want to read a WFS that contains GML2 (WFS 1.0.0).
              * Also see {@link ol.format.GMLBase} which is used by this format.
              *
+             * @param opt_options
              *     Optional configuration object.
              * @api stable
              */
@@ -2828,6 +3383,9 @@ declare module ol {
             /**
              * Read all features from a WFS FeatureCollection.
              *
+             * @param source Source.
+             * @param opt_options Read options.
+             * @return Features.
              * @api stable
              */
             readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
@@ -2835,6 +3393,8 @@ declare module ol {
             /**
              * Read transaction response of the source.
              *
+             * @param source Source.
+             * @return Transaction response.
              * @api stable
              */
             readTransactionResponse(source: (Document | Node | GlobalObject | string)): (ol.WFSTransactionResponse);
@@ -2842,7 +3402,8 @@ declare module ol {
             /**
              * Read feature collection metadata of the source.
              *
-             *     FeatureCollection metadata.
+             * @param source Source.
+             * @return FeatureCollection metadata.
              * @api stable
              */
             readFeatureCollectionMetadata(source: (Document | Node | GlobalObject | string)): (ol.WFSFeatureCollectionMetadata);
@@ -2850,6 +3411,8 @@ declare module ol {
             /**
              * Encode format as WFS `GetFeature` and return the Node.
              *
+             * @param options Options.
+             * @return Result.
              * @api stable
              */
             writeGetFeature(options: olx.format.WFSWriteGetFeatureOptions): Node;
@@ -2857,6 +3420,11 @@ declare module ol {
             /**
              * Encode format as WFS `Transaction` and return the Node.
              *
+             * @param inserts The features to insert.
+             * @param updates The features to update.
+             * @param deletes The features to delete.
+             * @param options Write options.
+             * @return Result.
              * @api stable
              */
             writeTransaction(inserts: ol.Feature[], updates: ol.Feature[], deletes: ol.Feature[], options: olx.format.WFSWriteTransactionOptions): Node;
@@ -2864,6 +3432,8 @@ declare module ol {
             /**
              * Read the projection from a WFS source.
              *
+             * @param source Source.
+             * @return Projection.
              * @api stable
              */
             readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
@@ -2874,6 +3444,7 @@ declare module ol {
          * Geometry format for reading and writing data in the `WellKnownText` (WKT)
          * format.
          *
+         * @param opt_options Options.
          * @api stable
          */
         class WKT extends ol.format.TextFeature {
@@ -2882,6 +3453,7 @@ declare module ol {
              * Geometry format for reading and writing data in the `WellKnownText` (WKT)
              * format.
              *
+             * @param opt_options Options.
              * @api stable
              */
             constructor(opt_options?: olx.format.WKTOptions);
@@ -2889,6 +3461,9 @@ declare module ol {
             /**
              * Read a feature from a WKT source.
              *
+             * @param source Source.
+             * @param opt_options Read options.
+             * @return Feature.
              * @api stable
              */
             readFeature(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
@@ -2896,6 +3471,9 @@ declare module ol {
             /**
              * Read all features from a WKT source.
              *
+             * @param source Source.
+             * @param opt_options Read options.
+             * @return Features.
              * @api stable
              */
             readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
@@ -2903,6 +3481,9 @@ declare module ol {
             /**
              * Read a single geometry from a WKT source.
              *
+             * @param source Source.
+             * @param opt_options Read options.
+             * @return Geometry.
              * @api stable
              */
             readGeometry(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.geom.Geometry;
@@ -2910,6 +3491,9 @@ declare module ol {
             /**
              * Encode a feature as a WKT string.
              *
+             * @param feature Feature.
+             * @param opt_options Write options.
+             * @return WKT string.
              * @api stable
              */
             writeFeature(feature: ol.Feature, opt_options?: olx.format.WriteOptions): string;
@@ -2917,6 +3501,9 @@ declare module ol {
             /**
              * Encode an array of features as a WKT string.
              *
+             * @param features Features.
+             * @param opt_options Write options.
+             * @return WKT string.
              * @api stable
              */
             writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
@@ -2924,6 +3511,8 @@ declare module ol {
             /**
              * Write a single geometry as a WKT string.
              *
+             * @param geometry Geometry.
+             * @return WKT string.
              * @api stable
              */
             writeGeometry(geometry: ol.geom.Geometry): string;
@@ -2947,6 +3536,8 @@ declare module ol {
             /**
              * Read a WMS capabilities document.
              *
+             * @param source The XML source.
+             * @return An object representing the WMS capabilities.
              * @api
              */
             read(source: (Document | Node | string)): GlobalObject;
@@ -2957,6 +3548,7 @@ declare module ol {
          * Format for reading WMSGetFeatureInfo format. It uses
          * {@link ol.format.GML2} to read features.
          *
+         * @param opt_options Options.
          * @api
          */
         class WMSGetFeatureInfo extends ol.format.XMLFeature {
@@ -2965,6 +3557,7 @@ declare module ol {
              * Format for reading WMSGetFeatureInfo format. It uses
              * {@link ol.format.GML2} to read features.
              *
+             * @param opt_options Options.
              * @api
              */
             constructor(opt_options?: olx.format.WMSGetFeatureInfoOptions);
@@ -2972,6 +3565,9 @@ declare module ol {
             /**
              * Read all features from a WMSGetFeatureInfo response.
              *
+             * @param source Source.
+             * @param opt_options Options.
+             * @return Features.
              * @api stable
              */
             readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
@@ -2995,6 +3591,8 @@ declare module ol {
             /**
              * Read a WMTS capabilities document.
              *
+             * @param source The XML source.
+             * @return An object representing the WMTS capabilities.
              * @api
              */
             read(source: (Document | Node | string)): GlobalObject;
@@ -3056,6 +3654,7 @@ declare module ol {
      *     });
      *
      * @fires error
+     * @param opt_options Options.
      * @api stable
      */
     class Geolocation extends ol.Object {
@@ -3080,12 +3679,14 @@ declare module ol {
          *     });
          *
          * @fires error
+         * @param opt_options Options.
          * @api stable
          */
         constructor(opt_options?: olx.GeolocationOptions);
 
         /**
          * Get the accuracy of the position in meters.
+         * @return The accuracy of the position measurement in
          *     meters.
          * @observable
          * @api stable
@@ -3094,6 +3695,7 @@ declare module ol {
 
         /**
          * Get a geometry of the position accuracy.
+         * @return A geometry of the position accuracy.
          * @observable
          * @api stable
          */
@@ -3101,6 +3703,7 @@ declare module ol {
 
         /**
          * Get the altitude associated with the position.
+         * @return The altitude of the position in meters above mean
          *     sea level.
          * @observable
          * @api stable
@@ -3109,6 +3712,7 @@ declare module ol {
 
         /**
          * Get the altitude accuracy of the position.
+         * @return The accuracy of the altitude measurement in
          *     meters.
          * @observable
          * @api stable
@@ -3117,6 +3721,7 @@ declare module ol {
 
         /**
          * Get the heading as radians clockwise from North.
+         * @return The heading of the device in radians from north.
          * @observable
          * @api stable
          */
@@ -3124,6 +3729,7 @@ declare module ol {
 
         /**
          * Get the position of the device.
+         * @return The current position of the device reported
          *     in the current projection.
          * @observable
          * @api stable
@@ -3132,6 +3738,7 @@ declare module ol {
 
         /**
          * Get the projection associated with the position.
+         * @return The projection the position is
          *     reported in.
          * @observable
          * @api stable
@@ -3140,6 +3747,7 @@ declare module ol {
 
         /**
          * Get the speed in meters per second.
+         * @return The instantaneous speed of the device in meters
          *     per second.
          * @observable
          * @api stable
@@ -3148,6 +3756,7 @@ declare module ol {
 
         /**
          * Determine if the device location is being tracked.
+         * @return The device location is being tracked.
          * @observable
          * @api stable
          */
@@ -3156,6 +3765,7 @@ declare module ol {
         /**
          * Get the tracking options.
          * @see http://www.w3.org/TR/geolocation-API/#position-options
+         * @return PositionOptions as defined by
          *     the [HTML5 Geolocation spec
          *     ](http://www.w3.org/TR/geolocation-API/#position_options_interface).
          * @observable
@@ -3165,6 +3775,7 @@ declare module ol {
 
         /**
          * Set the projection to use for transforming the coordinates.
+         * @param projection The projection the position is
          *     reported in.
          * @observable
          * @api stable
@@ -3173,6 +3784,7 @@ declare module ol {
 
         /**
          * Enable or disable tracking.
+         * @param tracking Enable tracking.
          * @observable
          * @api stable
          */
@@ -3181,6 +3793,7 @@ declare module ol {
         /**
          * Set the tracking options.
          * @see http://www.w3.org/TR/geolocation-API/#position-options
+         * @param options PositionOptions as defined by the
          *     [HTML5 Geolocation spec
          *     ](http://www.w3.org/TR/geolocation-API/#position_options_interface).
          * @observable
@@ -3194,6 +3807,9 @@ declare module ol {
          * @classdesc
          * Circle geometry.
          *
+         * @param center Center.
+         * @param opt_radius Radius.
+         * @param opt_layout Layout.
          * @api
          */
         class Circle extends ol.geom.SimpleGeometry {
@@ -3201,24 +3817,30 @@ declare module ol {
              * @classdesc
              * Circle geometry.
              *
+             * @param center Center.
+             * @param opt_radius Radius.
+             * @param opt_layout Layout.
              * @api
              */
             constructor(center: ol.Coordinate, opt_radius?: number, opt_layout?: ol.geom.GeometryLayout);
 
             /**
              * Make a complete copy of the geometry.
+             * @return Clone.
              * @api
              */
             clone(): ol.geom.Circle;
 
             /**
              * Return the center of the circle as {@link ol.Coordinate coordinate}.
+             * @return Center.
              * @api
              */
             getCenter(): ol.Coordinate;
 
             /**
              * Return the radius of the circle.
+             * @return Radius.
              * @api
              */
             getRadius(): number;
@@ -3237,6 +3859,7 @@ declare module ol {
 
             /**
              * Set the center of the circle as {@link ol.Coordinate coordinate}.
+             * @param center Center.
              * @api
              */
             setCenter(center: ol.Coordinate): void;
@@ -3244,12 +3867,16 @@ declare module ol {
             /**
              * Set the center (as {@link ol.Coordinate coordinate}) and the radius (as
              * number) of the circle.
+             * @param center Center.
+             * @param radius Radius.
+             * @param opt_layout Layout.
              * @api
              */
             setCenterAndRadius(center: ol.Coordinate, radius: number, opt_layout?: ol.geom.GeometryLayout): void;
 
             /**
              * Set the radius of the circle. The radius is in the units of the projection.
+             * @param radius Radius.
              * @api
              */
             setRadius(radius: number): void;
@@ -3297,6 +3924,9 @@ declare module ol {
             /**
              * Return the closest point of the geometry to the passed point as
              * {@link ol.Coordinate coordinate}.
+             * @param point Point.
+             * @param opt_closestPoint Closest point.
+             * @return Closest point.
              * @api stable
              */
             getClosestPoint(point: ol.Coordinate, opt_closestPoint?: ol.Coordinate): ol.Coordinate;
@@ -3304,12 +3934,16 @@ declare module ol {
             /**
              * Returns true if this geometry includes the specified coordinate. If the
              * coordinate is on the boundary of the geometry, returns false.
+             * @param coordinate Coordinate.
+             * @return Contains coordinate.
              * @api
              */
             intersectsCoordinate(coordinate: ol.Coordinate): boolean;
 
             /**
              * Get the extent of the geometry.
+             * @param opt_extent Extent.
+             * @return extent Extent.
              * @api stable
              */
             getExtent(opt_extent?: ol.Extent): ol.Extent;
@@ -3317,6 +3951,8 @@ declare module ol {
             /**
              * Rotate the geometry around a given coordinate. This modifies the geometry
              * coordinates in place.
+             * @param angle Rotation angle in radians.
+             * @param anchor The rotation center.
              * @api
              */
             rotate(angle: number, anchor: ol.Coordinate): void;
@@ -3324,7 +3960,10 @@ declare module ol {
             /**
              * Scale the geometry (with an optional origin).  This modifies the geometry
              * coordinates in place.
+             * @param sx The scaling factor in the x-direction.
+             * @param opt_sy The scaling factor in the y-direction (defaults to
              *     sx).
+             * @param opt_anchor The scale origin (defaults to the center
              *     of the geometry extent).
              * @api
              */
@@ -3336,6 +3975,8 @@ declare module ol {
              * https://en.wikipedia.org/wiki/Ramer-Douglas-Peucker_algorithm
              * Douglas Peucker} algorithm.  For polygons, a quantization-based
              * simplification is used to preserve topology.
+             * @param tolerance The tolerance distance for simplification.
+             * @return A new, simplified version of the original
              *     geometry.
              * @api
              */
@@ -3348,8 +3989,11 @@ declare module ol {
              * If you do not want the geometry modified in place, first `clone()` it and
              * then use this function on the clone.
              *
+             * @param source The current projection.  Can be a
              *     string identifier or a {@link ol.proj.Projection} object.
+             * @param destination The desired projection.  Can be a
              *     string identifier or a {@link ol.proj.Projection} object.
+             * @return This geometry.  Note that original geometry is
              *     modified in place.
              * @api stable
              */
@@ -3357,6 +4001,7 @@ declare module ol {
 
             /**
              * Get the type of this geometry.
+             * @return Geometry type.
              */
             getType(): ol.geom.GeometryType;
         }
@@ -3365,6 +4010,7 @@ declare module ol {
          * @classdesc
          * An array of {@link ol.geom.Geometry} objects.
          *
+         * @param opt_geometries Geometries.
          * @api stable
          */
         class GeometryCollection extends ol.geom.Geometry {
@@ -3372,18 +4018,21 @@ declare module ol {
              * @classdesc
              * An array of {@link ol.geom.Geometry} objects.
              *
+             * @param opt_geometries Geometries.
              * @api stable
              */
             constructor(opt_geometries?: ol.geom.Geometry[]);
 
             /**
              * Make a complete copy of the geometry.
+             * @return Clone.
              * @api stable
              */
             clone(): ol.geom.GeometryCollection;
 
             /**
              * Return the geometries that make up this geometry collection.
+             * @return Geometries.
              * @api stable
              */
             getGeometries(): ol.geom.Geometry[];
@@ -3402,6 +4051,7 @@ declare module ol {
 
             /**
              * Set the geometries that make up this geometry collection.
+             * @param geometries Geometries.
              * @api stable
              */
             setGeometries(geometries: ol.geom.Geometry[]): void;
@@ -3414,6 +4064,8 @@ declare module ol {
 
             /**
              * Translate the geometry.
+             * @param deltaX Delta X.
+             * @param deltaY Delta Y.
              * @api
              */
             translate(deltaX: number, deltaY: number): void;
@@ -3424,6 +4076,8 @@ declare module ol {
          * Linear ring geometry. Only used as part of polygon; cannot be rendered
          * on its own.
          *
+         * @param coordinates Coordinates.
+         * @param opt_layout Layout.
          * @api stable
          */
         class LinearRing extends ol.geom.SimpleGeometry {
@@ -3432,24 +4086,29 @@ declare module ol {
              * Linear ring geometry. Only used as part of polygon; cannot be rendered
              * on its own.
              *
+             * @param coordinates Coordinates.
+             * @param opt_layout Layout.
              * @api stable
              */
             constructor(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout);
 
             /**
              * Make a complete copy of the geometry.
+             * @return Clone.
              * @api stable
              */
             clone(): ol.geom.LinearRing;
 
             /**
              * Return the area of the linear ring on projected plane.
+             * @return Area (on projected plane).
              * @api stable
              */
             getArea(): number;
 
             /**
              * Return the coordinates of the linear ring.
+             * @return Coordinates.
              * @api stable
              */
             getCoordinates(): ol.Coordinate[];
@@ -3462,6 +4121,8 @@ declare module ol {
 
             /**
              * Set the coordinates of the linear ring.
+             * @param coordinates Coordinates.
+             * @param opt_layout Layout.
              * @api stable
              */
             setCoordinates(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout): void;
@@ -3471,6 +4132,8 @@ declare module ol {
          * @classdesc
          * Linestring geometry.
          *
+         * @param coordinates Coordinates.
+         * @param opt_layout Layout.
          * @api stable
          */
         class LineString extends ol.geom.SimpleGeometry {
@@ -3478,18 +4141,22 @@ declare module ol {
              * @classdesc
              * Linestring geometry.
              *
+             * @param coordinates Coordinates.
+             * @param opt_layout Layout.
              * @api stable
              */
             constructor(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout);
 
             /**
              * Append the passed coordinate to the coordinates of the linestring.
+             * @param coordinate Coordinate.
              * @api stable
              */
             appendCoordinate(coordinate: ol.Coordinate): void;
 
             /**
              * Make a complete copy of the geometry.
+             * @return Clone.
              * @api stable
              */
             clone(): ol.geom.LineString;
@@ -3499,8 +4166,11 @@ declare module ol {
              * If the callback returns a truthy value the function returns that
              * value immediately. Otherwise the function returns `false`.
              *
+             * @param callback Function
              *     called for each segment.
+             * @param opt_this The object to be used as the value of 'this'
              *     within callback.
+             * @return Value.
              * @template T,S
              * @api
              */
@@ -3515,12 +4185,16 @@ declare module ol {
              * M will return the first coordinate and Ms greater than the last M will
              * return the last coordinate.
              *
+             * @param m M.
+             * @param opt_extrapolate Extrapolate. Default is `false`.
+             * @return Coordinate.
              * @api stable
              */
             getCoordinateAtM(m: number, opt_extrapolate?: boolean): ol.Coordinate;
 
             /**
              * Return the coordinates of the linestring.
+             * @return Coordinates.
              * @api stable
              */
             getCoordinates(): ol.Coordinate[];
@@ -3529,13 +4203,17 @@ declare module ol {
              * Return the coordinate at the provided fraction along the linestring.
              * The `fraction` is a number between 0 and 1, where 0 is the start of the
              * linestring and 1 is the end.
+             * @param fraction Fraction.
+             * @param opt_dest Optional coordinate whose values will
              *     be modified. If not provided, a new coordinate will be returned.
+             * @return Coordinate of the interpolated point.
              * @api
              */
             getCoordinateAt(fraction: number, opt_dest?: ol.Coordinate): ol.Coordinate;
 
             /**
              * Return the length of the linestring on projected plane.
+             * @return Length (on projected plane).
              * @api stable
              */
             getLength(): number;
@@ -3554,6 +4232,8 @@ declare module ol {
 
             /**
              * Set the coordinates of the linestring.
+             * @param coordinates Coordinates.
+             * @param opt_layout Layout.
              * @api stable
              */
             setCoordinates(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout): void;
@@ -3563,6 +4243,8 @@ declare module ol {
          * @classdesc
          * Multi-linestring geometry.
          *
+         * @param coordinates Coordinates.
+         * @param opt_layout Layout.
          * @api stable
          */
         class MultiLineString extends ol.geom.SimpleGeometry {
@@ -3570,18 +4252,22 @@ declare module ol {
              * @classdesc
              * Multi-linestring geometry.
              *
+             * @param coordinates Coordinates.
+             * @param opt_layout Layout.
              * @api stable
              */
             constructor(coordinates: ol.Coordinate[][], opt_layout?: ol.geom.GeometryLayout);
 
             /**
              * Append the passed linestring to the multilinestring.
+             * @param lineString LineString.
              * @api stable
              */
             appendLineString(lineString: ol.geom.LineString): void;
 
             /**
              * Make a complete copy of the geometry.
+             * @return Clone.
              * @api stable
              */
             clone(): ol.geom.MultiLineString;
@@ -3602,24 +4288,32 @@ declare module ol {
              * `false` then the function will return `null` for Ms falling between
              * LineStrings.
              *
+             * @param m M.
+             * @param opt_extrapolate Extrapolate. Default is `false`.
+             * @param opt_interpolate Interpolate. Default is `false`.
+             * @return Coordinate.
              * @api stable
              */
             getCoordinateAtM(m: number, opt_extrapolate?: boolean, opt_interpolate?: boolean): ol.Coordinate;
 
             /**
              * Return the coordinates of the multilinestring.
+             * @return Coordinates.
              * @api stable
              */
             getCoordinates(): ol.Coordinate[][];
 
             /**
              * Return the linestring at the specified index.
+             * @param index Index.
+             * @return LineString.
              * @api stable
              */
             getLineString(index: number): ol.geom.LineString;
 
             /**
              * Return the linestrings of this multilinestring.
+             * @return LineStrings.
              * @api stable
              */
             getLineStrings(): ol.geom.LineString[];
@@ -3638,6 +4332,8 @@ declare module ol {
 
             /**
              * Set the coordinates of the multilinestring.
+             * @param coordinates Coordinates.
+             * @param opt_layout Layout.
              * @api stable
              */
             setCoordinates(coordinates: ol.Coordinate[][], opt_layout?: ol.geom.GeometryLayout): void;
@@ -3647,6 +4343,8 @@ declare module ol {
          * @classdesc
          * Multi-point geometry.
          *
+         * @param coordinates Coordinates.
+         * @param opt_layout Layout.
          * @api stable
          */
         class MultiPoint extends ol.geom.SimpleGeometry {
@@ -3654,36 +4352,44 @@ declare module ol {
              * @classdesc
              * Multi-point geometry.
              *
+             * @param coordinates Coordinates.
+             * @param opt_layout Layout.
              * @api stable
              */
             constructor(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout);
 
             /**
              * Append the passed point to this multipoint.
+             * @param point Point.
              * @api stable
              */
             appendPoint(point: ol.geom.Point): void;
 
             /**
              * Make a complete copy of the geometry.
+             * @return Clone.
              * @api stable
              */
             clone(): ol.geom.MultiPoint;
 
             /**
              * Return the coordinates of the multipoint.
+             * @return Coordinates.
              * @api stable
              */
             getCoordinates(): ol.Coordinate[];
 
             /**
              * Return the point at the specified index.
+             * @param index Index.
+             * @return Point.
              * @api stable
              */
             getPoint(index: number): ol.geom.Point;
 
             /**
              * Return the points of this multipoint.
+             * @return Points.
              * @api stable
              */
             getPoints(): ol.geom.Point[];
@@ -3702,6 +4408,8 @@ declare module ol {
 
             /**
              * Set the coordinates of the multipoint.
+             * @param coordinates Coordinates.
+             * @param opt_layout Layout.
              * @api stable
              */
             setCoordinates(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout): void;
@@ -3711,6 +4419,8 @@ declare module ol {
          * @classdesc
          * Multi-polygon geometry.
          *
+         * @param coordinates Coordinates.
+         * @param opt_layout Layout.
          * @api stable
          */
         class MultiPolygon extends ol.geom.SimpleGeometry {
@@ -3718,24 +4428,29 @@ declare module ol {
              * @classdesc
              * Multi-polygon geometry.
              *
+             * @param coordinates Coordinates.
+             * @param opt_layout Layout.
              * @api stable
              */
             constructor(coordinates: ol.Coordinate[][][], opt_layout?: ol.geom.GeometryLayout);
 
             /**
              * Append the passed polygon to this multipolygon.
+             * @param polygon Polygon.
              * @api stable
              */
             appendPolygon(polygon: ol.geom.Polygon): void;
 
             /**
              * Make a complete copy of the geometry.
+             * @return Clone.
              * @api stable
              */
             clone(): ol.geom.MultiPolygon;
 
             /**
              * Return the area of the multipolygon on projected plane.
+             * @return Area (on projected plane).
              * @api stable
              */
             getArea(): number;
@@ -3744,29 +4459,35 @@ declare module ol {
              * Get the coordinate array for this geometry.  This array has the structure
              * of a GeoJSON coordinate array for multi-polygons.
              *
+             * @param opt_right Orient coordinates according to the right-hand
              *     rule (counter-clockwise for exterior and clockwise for interior rings).
              *     If `false`, coordinates will be oriented according to the left-hand rule
              *     (clockwise for exterior and counter-clockwise for interior rings).
              *     By default, coordinate orientation will depend on how the geometry was
              *     constructed.
+             * @return Coordinates.
              * @api stable
              */
             getCoordinates(opt_right?: boolean): ol.Coordinate[][][];
 
             /**
              * Return the interior points as {@link ol.geom.MultiPoint multipoint}.
+             * @return Interior points.
              * @api stable
              */
             getInteriorPoints(): ol.geom.MultiPoint;
 
             /**
              * Return the polygon at the specified index.
+             * @param index Index.
+             * @return Polygon.
              * @api stable
              */
             getPolygon(index: number): ol.geom.Polygon;
 
             /**
              * Return the polygons of this multipolygon.
+             * @return Polygons.
              * @api stable
              */
             getPolygons(): ol.geom.Polygon[];
@@ -3785,6 +4506,8 @@ declare module ol {
 
             /**
              * Set the coordinates of the multipolygon.
+             * @param coordinates Coordinates.
+             * @param opt_layout Layout.
              * @api stable
              */
             setCoordinates(coordinates: ol.Coordinate[][][], opt_layout?: ol.geom.GeometryLayout): void;
@@ -3794,6 +4517,8 @@ declare module ol {
          * @classdesc
          * Point geometry.
          *
+         * @param coordinates Coordinates.
+         * @param opt_layout Layout.
          * @api stable
          */
         class Point extends ol.geom.SimpleGeometry {
@@ -3801,18 +4526,22 @@ declare module ol {
              * @classdesc
              * Point geometry.
              *
+             * @param coordinates Coordinates.
+             * @param opt_layout Layout.
              * @api stable
              */
             constructor(coordinates: ol.Coordinate, opt_layout?: ol.geom.GeometryLayout);
 
             /**
              * Make a complete copy of the geometry.
+             * @return Clone.
              * @api stable
              */
             clone(): ol.geom.Point;
 
             /**
              * Return the coordinate of the point.
+             * @return Coordinates.
              * @api stable
              */
             getCoordinates(): ol.Coordinate;
@@ -3831,6 +4560,8 @@ declare module ol {
 
             /**
              * Set the coordinate of the point.
+             * @param coordinates Coordinates.
+             * @param opt_layout Layout.
              * @api stable
              */
             setCoordinates(coordinates: ol.Coordinate, opt_layout?: ol.geom.GeometryLayout): void;
@@ -3840,6 +4571,8 @@ declare module ol {
          * @classdesc
          * Polygon geometry.
          *
+         * @param coordinates Coordinates.
+         * @param opt_layout Layout.
          * @api stable
          */
         class Polygon extends ol.geom.SimpleGeometry {
@@ -3847,24 +4580,29 @@ declare module ol {
              * @classdesc
              * Polygon geometry.
              *
+             * @param coordinates Coordinates.
+             * @param opt_layout Layout.
              * @api stable
              */
             constructor(coordinates: ol.Coordinate[][], opt_layout?: ol.geom.GeometryLayout);
 
             /**
              * Append the passed linear ring to this polygon.
+             * @param linearRing Linear ring.
              * @api stable
              */
             appendLinearRing(linearRing: ol.geom.LinearRing): void;
 
             /**
              * Make a complete copy of the geometry.
+             * @return Clone.
              * @api stable
              */
             clone(): ol.geom.Polygon;
 
             /**
              * Return the area of the polygon on projected plane.
+             * @return Area (on projected plane).
              * @api stable
              */
             getArea(): number;
@@ -3873,17 +4611,20 @@ declare module ol {
              * Get the coordinate array for this geometry.  This array has the structure
              * of a GeoJSON coordinate array for polygons.
              *
+             * @param opt_right Orient coordinates according to the right-hand
              *     rule (counter-clockwise for exterior and clockwise for interior rings).
              *     If `false`, coordinates will be oriented according to the left-hand rule
              *     (clockwise for exterior and counter-clockwise for interior rings).
              *     By default, coordinate orientation will depend on how the geometry was
              *     constructed.
+             * @return Coordinates.
              * @api stable
              */
             getCoordinates(opt_right?: boolean): ol.Coordinate[][];
 
             /**
              * Return an interior point of the polygon.
+             * @return Interior point.
              * @api stable
              */
             getInteriorPoint(): ol.geom.Point;
@@ -3892,6 +4633,7 @@ declare module ol {
              * Return the number of rings of the polygon,  this includes the exterior
              * ring and any interior rings.
              *
+             * @return Number of rings.
              * @api
              */
             getLinearRingCount(): number;
@@ -3902,12 +4644,15 @@ declare module ol {
              * The exterior linear ring is available at index `0` and the interior rings
              * at index `1` and beyond.
              *
+             * @param index Index.
+             * @return Linear ring.
              * @api stable
              */
             getLinearRing(index: number): ol.geom.LinearRing;
 
             /**
              * Return the linear rings of the polygon.
+             * @return Linear rings.
              * @api stable
              */
             getLinearRings(): ol.geom.LinearRing[];
@@ -3926,27 +4671,40 @@ declare module ol {
 
             /**
              * Set the coordinates of the polygon.
+             * @param coordinates Coordinates.
+             * @param opt_layout Layout.
              * @api stable
              */
             setCoordinates(coordinates: ol.Coordinate[][], opt_layout?: ol.geom.GeometryLayout): void;
 
             /**
              * Create an approximation of a circle on the surface of a sphere.
+             * @param sphere The sphere.
+             * @param center Center (`[lon, lat]` in degrees).
+             * @param radius The great-circle distance from the center to
              *     the polygon vertices.
+             * @param opt_n Optional number of vertices for the resulting
              *     polygon. Default is `32`.
+             * @return The "circular" polygon.
              * @api stable
              */
             static circular(sphere: ol.Sphere, center: ol.Coordinate, radius: number, opt_n?: number): ol.geom.Polygon;
 
             /**
              * Create a polygon from an extent. The layout used is `XY`.
+             * @param extent The extent.
+             * @return The polygon.
              * @api
              */
             static fromExtent(extent: ol.Extent): ol.geom.Polygon;
 
             /**
              * Create a regular polygon from a circle.
+             * @param circle Circle geometry.
+             * @param opt_sides Number of sides of the polygon. Default is 32.
+             * @param opt_angle Start angle for the first vertex of the polygon in
              *     radians. Default is 0.
+             * @return Polygon geometry.
              * @api
              */
             static fromCircle(circle: ol.geom.Circle, opt_sides?: number, opt_angle?: number): ol.geom.Polygon;
@@ -3971,18 +4729,21 @@ declare module ol {
 
             /**
              * Return the first coordinate of the geometry.
+             * @return First coordinate.
              * @api stable
              */
             getFirstCoordinate(): ol.Coordinate;
 
             /**
              * Return the last coordinate of the geometry.
+             * @return Last point.
              * @api stable
              */
             getLastCoordinate(): ol.Coordinate;
 
             /**
              * Return the {@link ol.geom.GeometryLayout layout} of the geometry.
+             * @return Layout.
              * @api stable
              */
             getLayout(): ol.geom.GeometryLayout;
@@ -4003,29 +4764,34 @@ declare module ol {
 
     /**
      * Render a grid for a coordinate system on a map.
+     * @param opt_options Options.
      * @api
      */
     class Graticule {
         /**
          * Render a grid for a coordinate system on a map.
+         * @param opt_options Options.
          * @api
          */
         constructor(opt_options?: olx.GraticuleOptions);
 
         /**
          * Get the map associated with this graticule.
+         * @return The map.
          * @api
          */
         getMap(): ol.Map;
 
         /**
          * Get the list of meridians.  Meridians are lines of equal longitude.
+         * @return The meridians.
          * @api
          */
         getMeridians(): ol.geom.LineString[];
 
         /**
          * Get the list of parallels.  Pallels are lines of equal latitude.
+         * @return The parallels.
          * @api
          */
         getParallels(): ol.geom.LineString[];
@@ -4033,6 +4799,7 @@ declare module ol {
         /**
          * Set the map for this graticule.  The graticule will be rendered on the
          * provided map.
+         * @param map Map.
          * @api
          */
         setMap(map: ol.Map): void;
@@ -4085,11 +4852,31 @@ declare module ol {
         const WEBGL: boolean;
     }
 
+    /**
+     * @param extent Extent.
+     * @param resolution Resolution.
+     * @param pixelRatio Pixel ratio.
+     * @param attributions Attributions.
+     * @param src Image source URI.
+     * @param crossOrigin Cross origin.
+     * @param imageLoadFunction Image load function.
+     */
     class Image extends ol.ImageBase {
+        /**
+         * @param extent Extent.
+         * @param resolution Resolution.
+         * @param pixelRatio Pixel ratio.
+         * @param attributions Attributions.
+         * @param src Image source URI.
+         * @param crossOrigin Cross origin.
+         * @param imageLoadFunction Image load function.
+         */
         constructor(extent: ol.Extent, resolution: (number), pixelRatio: number, attributions: ol.Attribution[], src: string, crossOrigin?: string, imageLoadFunction?: ol.ImageLoadFunctionType);
 
         /**
          * Get the HTML image element (may be a Canvas, Image, or Video).
+         * @param opt_context Object.
+         * @return Image.
          * @api
          */
         getImage(opt_context?: GlobalObject): (HTMLCanvasElement | Image | HTMLVideoElement);
@@ -4103,13 +4890,41 @@ declare module ol {
         load(): void;
     }
 
+    /**
+     * @param extent Extent.
+     * @param resolution Resolution.
+     * @param pixelRatio Pixel ratio.
+     * @param state State.
+     * @param attributions Attributions.
+     */
     class ImageBase extends ol.events.EventTarget {
+        /**
+         * @param extent Extent.
+         * @param resolution Resolution.
+         * @param pixelRatio Pixel ratio.
+         * @param state State.
+         * @param attributions Attributions.
+         */
         constructor(extent: ol.Extent, resolution: (number), pixelRatio: number, state: ol.ImageState, attributions: ol.Attribution[]);
     }
 
     type ImageState = number;
 
+    /**
+     * @param tileCoord Tile coordinate.
+     * @param state State.
+     * @param src Image source URI.
+     * @param crossOrigin Cross origin.
+     * @param tileLoadFunction Tile load function.
+     */
     class ImageTile extends ol.Tile {
+        /**
+         * @param tileCoord Tile coordinate.
+         * @param state State.
+         * @param src Image source URI.
+         * @param crossOrigin Cross origin.
+         * @param tileLoadFunction Tile load function.
+         */
         constructor(tileCoord: ol.TileCoord, state: ol.Tile.State, src: string, crossOrigin?: string, tileLoadFunction?: ol.TileLoadFunctionType);
 
         /**
@@ -4137,6 +4952,8 @@ declare module ol {
      *     var child = new ChildClass('a', 'b', 'see');
      *     child.foo(); // This works.
      *
+     * @param childCtor Child constructor.
+     * @param parentCtor Parent constructor.
      * @api
      */
     function inherits(childCtor: (() => any), parentCtor: (() => any)): void;
@@ -4146,6 +4963,7 @@ declare module ol {
          * @classdesc
          * Allows the user to zoom by double-clicking on the map.
          *
+         * @param opt_options Options.
          * @api stable
          */
         class DoubleClickZoom extends ol.interaction.Interaction {
@@ -4153,6 +4971,7 @@ declare module ol {
              * @classdesc
              * Allows the user to zoom by double-clicking on the map.
              *
+             * @param opt_options Options.
              * @api stable
              */
             constructor(opt_options?: olx.interaction.DoubleClickZoomOptions);
@@ -4160,6 +4979,8 @@ declare module ol {
             /**
              * Handles the {@link ol.MapBrowserEvent map browser event} (if it was a
              * doubleclick) and eventually zooms the map.
+             * @param mapBrowserEvent Map browser event.
+             * @return `false` to stop event propagation.
              * @api
              */
             static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
@@ -4170,6 +4991,7 @@ declare module ol {
          * Handles input of vector data by drag and drop.
          *
          * @fires ol.interaction.DragAndDropEvent
+         * @param opt_options Options.
          * @api stable
          */
         class DragAndDrop extends ol.interaction.Interaction {
@@ -4178,6 +5000,7 @@ declare module ol {
              * Handles input of vector data by drag and drop.
              *
              * @fires ol.interaction.DragAndDropEvent
+             * @param opt_options Options.
              * @api stable
              */
             constructor(opt_options?: olx.interaction.DragAndDropOptions);
@@ -4185,6 +5008,8 @@ declare module ol {
             /**
              * Handles the {@link ol.MapBrowserEvent map browser event} unconditionally and
              * neither prevents the browser default nor stops event propagation.
+             * @param mapBrowserEvent Map browser event.
+             * @return `false` to stop event propagation.
              * @api
              */
             static handleEvent: any;
@@ -4196,6 +5021,10 @@ declare module ol {
              * Events emitted by {@link ol.interaction.DragAndDrop} instances are instances
              * of this type.
              *
+             * @param type Type.
+             * @param file File.
+             * @param opt_features Features.
+             * @param opt_projection Projection.
              */
             class Event extends ol.events.Event {
                 /**
@@ -4203,6 +5032,10 @@ declare module ol {
                  * Events emitted by {@link ol.interaction.DragAndDrop} instances are instances
                  * of this type.
                  *
+                 * @param type Type.
+                 * @param file File.
+                 * @param opt_features Features.
+                 * @param opt_projection Projection.
                  */
                 constructor(type: ol.interaction.DragAndDropEventType, file: File, opt_features?: ol.Feature[], opt_projection?: ol.proj.Projection);
 
@@ -4240,6 +5073,7 @@ declare module ol {
          * This interaction is only supported for mouse devices.
          *
          * @fires ol.DragBoxEvent
+         * @param opt_options Options.
          * @api stable
          */
         class DragBox extends ol.interaction.Pointer {
@@ -4255,12 +5089,14 @@ declare module ol {
              * This interaction is only supported for mouse devices.
              *
              * @fires ol.DragBoxEvent
+             * @param opt_options Options.
              * @api stable
              */
             constructor(opt_options?: olx.interaction.DragBoxOptions);
 
             /**
              * Returns geometry of last drawn box.
+             * @return Geometry.
              * @api stable
              */
             getGeometry(): ol.geom.Polygon;
@@ -4272,6 +5108,9 @@ declare module ol {
              * Events emitted by {@link ol.interaction.DragBox} instances are instances of
              * this type.
              *
+             * @param type The event type.
+             * @param coordinate The event coordinate.
+             * @param mapBrowserEvent Originating event.
              */
             class Event extends ol.events.Event {
                 /**
@@ -4279,6 +5118,9 @@ declare module ol {
                  * Events emitted by {@link ol.interaction.DragBox} instances are instances of
                  * this type.
                  *
+                 * @param type The event type.
+                 * @param coordinate The event coordinate.
+                 * @param mapBrowserEvent Originating event.
                  */
                 constructor(type: string, coordinate: ol.Coordinate, mapBrowserEvent: ol.MapBrowserEvent);
 
@@ -4303,6 +5145,7 @@ declare module ol {
          * @classdesc
          * Allows the user to pan the map by dragging the map.
          *
+         * @param opt_options Options.
          * @api stable
          */
         class DragPan extends ol.interaction.Pointer {
@@ -4310,6 +5153,7 @@ declare module ol {
              * @classdesc
              * Allows the user to pan the map by dragging the map.
              *
+             * @param opt_options Options.
              * @api stable
              */
             constructor(opt_options?: olx.interaction.DragPanOptions);
@@ -4323,6 +5167,7 @@ declare module ol {
          *
          * This interaction is only supported for mouse devices.
          *
+         * @param opt_options Options.
          * @api stable
          */
         class DragRotate extends ol.interaction.Pointer {
@@ -4334,6 +5179,7 @@ declare module ol {
              *
              * This interaction is only supported for mouse devices.
              *
+             * @param opt_options Options.
              * @api stable
              */
             constructor(opt_options?: olx.interaction.DragRotateOptions);
@@ -4349,6 +5195,7 @@ declare module ol {
          *
          * And this interaction is not included in the default interactions.
          *
+         * @param opt_options Options.
          * @api stable
          */
         class DragRotateAndZoom extends ol.interaction.Pointer {
@@ -4362,6 +5209,7 @@ declare module ol {
              *
              * And this interaction is not included in the default interactions.
              *
+             * @param opt_options Options.
              * @api stable
              */
             constructor(opt_options?: olx.interaction.DragRotateAndZoomOptions);
@@ -4376,6 +5224,7 @@ declare module ol {
          * To change the style of the box, use CSS and the `.ol-dragzoom` selector, or
          * your custom one configured with `className`.
          *
+         * @param opt_options Options.
          * @api stable
          */
         class DragZoom extends ol.interaction.DragBox {
@@ -4388,6 +5237,7 @@ declare module ol {
              * To change the style of the box, use CSS and the `.ol-dragzoom` selector, or
              * your custom one configured with `className`.
              *
+             * @param opt_options Options.
              * @api stable
              */
             constructor(opt_options?: olx.interaction.DragZoomOptions);
@@ -4399,6 +5249,8 @@ declare module ol {
              * Events emitted by {@link ol.interaction.Draw} instances are instances of
              * this type.
              *
+             * @param type Type.
+             * @param feature The feature drawn.
              */
             class Event extends ol.events.Event {
                 /**
@@ -4406,6 +5258,8 @@ declare module ol {
                  * Events emitted by {@link ol.interaction.Draw} instances are instances of
                  * this type.
                  *
+                 * @param type Type.
+                 * @param feature The feature drawn.
                  */
                 constructor(type: ol.interaction.DrawEventType, feature: ol.Feature);
 
@@ -4424,6 +5278,7 @@ declare module ol {
          * Interaction for drawing feature geometries.
          *
          * @fires ol.interaction.DrawEvent
+         * @param options Options.
          * @api stable
          */
         class Draw extends ol.interaction.Pointer {
@@ -4432,6 +5287,7 @@ declare module ol {
              * Interaction for drawing feature geometries.
              *
              * @fires ol.interaction.DrawEvent
+             * @param options Options.
              * @api stable
              */
             constructor(options: olx.interaction.DrawOptions);
@@ -4454,6 +5310,7 @@ declare module ol {
              * Extend an existing geometry by adding additional points. This only works
              * on features with `LineString` geometries, where the interaction will
              * extend lines by adding points to the end of the coordinates array.
+             * @param feature Feature to be extended.
              * @api
              */
             extend(feature: ol.Feature): void;
@@ -4462,6 +5319,7 @@ declare module ol {
              * Create a `geometryFunction` that will create a box-shaped polygon (aligned
              * with the coordinate system axes).  Use this with the draw interaction and
              * `type: 'Circle'` to return a box instead of a circle geometry.
+             * @return Function that draws a box-shaped polygon.
              * @api
              */
             static createBox(): ol.DrawGeometryFunctionType;
@@ -4470,9 +5328,12 @@ declare module ol {
              * Create a `geometryFunction` for `mode: 'Circle'` that will create a regular
              * polygon with a user specified number of sides and start angle instead of an
              * `ol.geom.Circle` geometry.
+             * @param opt_sides Number of sides of the regular polygon. Default is
              *     32.
+             * @param opt_angle Angle of the first point in radians. 0 means East.
              *     Default is the angle defined by the heading from the center of the
              *     regular polygon to the current pointer position.
+             * @return Function that draws a
              *     polygon.
              * @api
              */
@@ -4497,6 +5358,8 @@ declare module ol {
          * * {@link ol.interaction.MouseWheelZoom}
          * * {@link ol.interaction.DragZoom}
          *
+         * @param opt_options Defaults options.
+         * @return A collection of
          * interactions to be used with the ol.Map constructor's interactions option.
          * @api stable
          */
@@ -4514,6 +5377,7 @@ declare module ol {
          * Although interactions do not have a DOM element, some of them do render
          * vectors and so are visible on the screen.
          *
+         * @param options Options.
          * @api
          */
         class Interaction extends ol.Object {
@@ -4529,12 +5393,14 @@ declare module ol {
              * Although interactions do not have a DOM element, some of them do render
              * vectors and so are visible on the screen.
              *
+             * @param options Options.
              * @api
              */
             constructor(options: olx.interaction.InteractionOptions);
 
             /**
              * Return whether the interaction is currently active.
+             * @return `true` if the interaction is active, `false` otherwise.
              * @observable
              * @api
              */
@@ -4542,12 +5408,14 @@ declare module ol {
 
             /**
              * Get the map associated with this interaction.
+             * @return Map.
              * @api
              */
             getMap(): ol.Map;
 
             /**
              * Activate or deactivate the interaction.
+             * @param active Active.
              * @observable
              * @api
              */
@@ -4566,6 +5434,7 @@ declare module ol {
          * function.
          * See also {@link ol.interaction.KeyboardZoom}.
          *
+         * @param opt_options Options.
          * @api stable
          */
         class KeyboardPan extends ol.interaction.Interaction {
@@ -4581,6 +5450,7 @@ declare module ol {
              * function.
              * See also {@link ol.interaction.KeyboardZoom}.
              *
+             * @param opt_options Options.
              * @api stable
              */
             constructor(opt_options?: olx.interaction.KeyboardPanOptions);
@@ -4589,6 +5459,8 @@ declare module ol {
              * Handles the {@link ol.MapBrowserEvent map browser event} if it was a
              * `KeyEvent`, and decides the direction to pan to (if an arrow key was
              * pressed).
+             * @param mapBrowserEvent Map browser event.
+             * @return `false` to stop event propagation.
              * @api
              */
             static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
@@ -4606,6 +5478,7 @@ declare module ol {
          * function.
          * See also {@link ol.interaction.KeyboardPan}.
          *
+         * @param opt_options Options.
          * @api stable
          */
         class KeyboardZoom extends ol.interaction.Interaction {
@@ -4621,6 +5494,7 @@ declare module ol {
              * function.
              * See also {@link ol.interaction.KeyboardPan}.
              *
+             * @param opt_options Options.
              * @api stable
              */
             constructor(opt_options?: olx.interaction.KeyboardZoomOptions);
@@ -4629,6 +5503,8 @@ declare module ol {
              * Handles the {@link ol.MapBrowserEvent map browser event} if it was a
              * `KeyEvent`, and decides whether to zoom in or out (depending on whether the
              * key pressed was '+' or '-').
+             * @param mapBrowserEvent Map browser event.
+             * @return `false` to stop event propagation.
              * @api
              */
             static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
@@ -4640,6 +5516,9 @@ declare module ol {
              * Events emitted by {@link ol.interaction.Modify} instances are instances of
              * this type.
              *
+             * @param type Type.
+             * @param features The features modified.
+             * @param mapBrowserPointerEvent Associated
              *     {@link ol.MapBrowserPointerEvent}.
              */
             class Event extends ol.events.Event {
@@ -4648,6 +5527,9 @@ declare module ol {
                  * Events emitted by {@link ol.interaction.Modify} instances are instances of
                  * this type.
                  *
+                 * @param type Type.
+                 * @param features The features modified.
+                 * @param mapBrowserPointerEvent Associated
                  *     {@link ol.MapBrowserPointerEvent}.
                  */
                 constructor(type: ol.ModifyEventType, features: ol.Collection<ol.Feature>, mapBrowserPointerEvent: ol.MapBrowserPointerEvent);
@@ -4670,6 +5552,7 @@ declare module ol {
          * @classdesc
          * Interaction for modifying feature geometries.
          *
+         * @param options Options.
          * @fires ol.interaction.ModifyEvent
          * @api
          */
@@ -4678,6 +5561,7 @@ declare module ol {
              * @classdesc
              * Interaction for modifying feature geometries.
              *
+             * @param options Options.
              * @fires ol.interaction.ModifyEvent
              * @api
              */
@@ -4685,6 +5569,7 @@ declare module ol {
 
             /**
              * Removes the vertex currently being pointed.
+             * @return True when a vertex was removed.
              * @api
              */
             removePoint(): boolean;
@@ -4694,6 +5579,7 @@ declare module ol {
          * @classdesc
          * Allows the user to zoom the map by scrolling the mouse wheel.
          *
+         * @param opt_options Options.
          * @api stable
          */
         class MouseWheelZoom extends ol.interaction.Interaction {
@@ -4701,6 +5587,7 @@ declare module ol {
              * @classdesc
              * Allows the user to zoom the map by scrolling the mouse wheel.
              *
+             * @param opt_options Options.
              * @api stable
              */
             constructor(opt_options?: olx.interaction.MouseWheelZoomOptions);
@@ -4708,12 +5595,15 @@ declare module ol {
             /**
              * Handles the {@link ol.MapBrowserEvent map browser event} (if it was a
              * mousewheel-event) and eventually zooms the map.
+             * @param mapBrowserEvent Map browser event.
+             * @return `false` to stop event propagation.
              * @api
              */
             static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
 
             /**
              * Enable or disable using the mouse's location as an anchor when zooming
+             * @param useAnchor true to zoom to the mouse's location, false
              * to zoom to the center of the map
              * @api
              */
@@ -4725,6 +5615,7 @@ declare module ol {
          * Allows the user to rotate the map by twisting with two fingers
          * on a touch screen.
          *
+         * @param opt_options Options.
          * @api stable
          */
         class PinchRotate extends ol.interaction.Pointer {
@@ -4733,6 +5624,7 @@ declare module ol {
              * Allows the user to rotate the map by twisting with two fingers
              * on a touch screen.
              *
+             * @param opt_options Options.
              * @api stable
              */
             constructor(opt_options?: olx.interaction.PinchRotateOptions);
@@ -4743,6 +5635,7 @@ declare module ol {
          * Allows the user to zoom the map by pinching with two fingers
          * on a touch screen.
          *
+         * @param opt_options Options.
          * @api stable
          */
         class PinchZoom extends ol.interaction.Pointer {
@@ -4751,6 +5644,7 @@ declare module ol {
              * Allows the user to zoom the map by pinching with two fingers
              * on a touch screen.
              *
+             * @param opt_options Options.
              * @api stable
              */
             constructor(opt_options?: olx.interaction.PinchZoomOptions);
@@ -4766,6 +5660,7 @@ declare module ol {
          * called on `move` events. The drag sequence ends when the `handleUpEvent`
          * user function is called and returns `false`.
          *
+         * @param opt_options Options.
          * @api
          */
         class Pointer extends ol.interaction.Interaction {
@@ -4779,6 +5674,7 @@ declare module ol {
              * called on `move` events. The drag sequence ends when the `handleUpEvent`
              * user function is called and returns `false`.
              *
+             * @param opt_options Options.
              * @api
              */
             constructor(opt_options?: olx.interaction.PointerOptions);
@@ -4787,6 +5683,8 @@ declare module ol {
              * Handles the {@link ol.MapBrowserEvent map browser event} and may call into
              * other functions, if event sequences like e.g. 'drag' or 'down-up' etc. are
              * detected.
+             * @param mapBrowserEvent Map browser event.
+             * @return `false` to stop event propagation.
              * @api
              */
             static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
@@ -4798,6 +5696,10 @@ declare module ol {
              * Events emitted by {@link ol.interaction.Select} instances are instances of
              * this type.
              *
+             * @param type The event type.
+             * @param selected Selected features.
+             * @param deselected Deselected features.
+             * @param mapBrowserEvent Associated
              *     {@link ol.MapBrowserEvent}.
              */
             class Event extends ol.events.Event {
@@ -4806,6 +5708,10 @@ declare module ol {
                  * Events emitted by {@link ol.interaction.Select} instances are instances of
                  * this type.
                  *
+                 * @param type The event type.
+                 * @param selected Selected features.
+                 * @param deselected Deselected features.
+                 * @param mapBrowserEvent Associated
                  *     {@link ol.MapBrowserEvent}.
                  */
                 constructor(type: string, selected: ol.Feature[], deselected: ol.Feature[], mapBrowserEvent: ol.MapBrowserEvent);
@@ -4842,6 +5748,7 @@ declare module ol {
          *
          * Selected features are added to an internal unmanaged layer.
          *
+         * @param opt_options Options.
          * @fires ol.interaction.SelectEvent
          * @api stable
          */
@@ -4858,6 +5765,7 @@ declare module ol {
              *
              * Selected features are added to an internal unmanaged layer.
              *
+             * @param opt_options Options.
              * @fires ol.interaction.SelectEvent
              * @api stable
              */
@@ -4865,6 +5773,7 @@ declare module ol {
 
             /**
              * Get the selected features.
+             * @return Features collection.
              * @api stable
              */
             getFeatures(): ol.Collection<ol.Feature>;
@@ -4874,6 +5783,8 @@ declare module ol {
              * the (last) selected feature. Note that this will not work with any
              * programmatic method like pushing features to
              * {@link ol.interaction.Select#getFeatures collection}.
+             * @param feature Feature
+             * @return Layer.
              * @api
              */
             getLayer(feature: (ol.Feature | ol.render.Feature)): ol.layer.Vector;
@@ -4881,6 +5792,8 @@ declare module ol {
             /**
              * Handles the {@link ol.MapBrowserEvent map browser event} and may change the
              * selected state of features.
+             * @param mapBrowserEvent Map browser event.
+             * @return `false` to stop event propagation.
              * @api
              */
             static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
@@ -4888,6 +5801,7 @@ declare module ol {
             /**
              * Remove the interaction from its current map, if any,  and attach it to a new
              * map, if any. Pass `null` to just remove the interaction from the current map.
+             * @param map Map.
              * @api stable
              */
             setMap(map: ol.Map): void;
@@ -4910,6 +5824,7 @@ declare module ol {
          *       source: source
          *     });
          *
+         * @param opt_options Options.
          * @api
          */
         class Snap extends ol.interaction.Pointer {
@@ -4930,12 +5845,15 @@ declare module ol {
              *       source: source
              *     });
              *
+             * @param opt_options Options.
              * @api
              */
             constructor(opt_options?: olx.interaction.SnapOptions);
 
             /**
              * Add a feature to the collection of features that we may snap to.
+             * @param feature Feature.
+             * @param opt_listen Whether to listen to the geometry change or not
              *     Defaults to `true`.
              * @api
              */
@@ -4943,6 +5861,8 @@ declare module ol {
 
             /**
              * Remove a feature from the collection of features that we may snap to.
+             * @param feature Feature
+             * @param opt_unlisten Whether to unlisten to the geometry change
              *     or not. Defaults to `true`.
              * @api
              */
@@ -4955,6 +5875,9 @@ declare module ol {
              * Events emitted by {@link ol.interaction.Translate} instances are instances of
              * this type.
              *
+             * @param type Type.
+             * @param features The features translated.
+             * @param coordinate The event coordinate.
              */
             class Event extends ol.events.Event {
                 /**
@@ -4962,6 +5885,9 @@ declare module ol {
                  * Events emitted by {@link ol.interaction.Translate} instances are instances of
                  * this type.
                  *
+                 * @param type Type.
+                 * @param features The features translated.
+                 * @param coordinate The event coordinate.
                  */
                 constructor(type: ol.interaction.TranslateEventType, features: ol.Collection<ol.Feature>, coordinate: ol.Coordinate);
 
@@ -4987,6 +5913,7 @@ declare module ol {
          * Interaction for translating (moving) features.
          *
          * @fires ol.interaction.TranslateEvent
+         * @param options Options.
          * @api
          */
         class Translate extends ol.interaction.Pointer {
@@ -4995,6 +5922,7 @@ declare module ol {
              * Interaction for translating (moving) features.
              *
              * @fires ol.interaction.TranslateEvent
+             * @param options Options.
              * @api
              */
             constructor(options: olx.interaction.TranslateOptions);
@@ -5005,6 +5933,9 @@ declare module ol {
      * @classdesc
      * Implementation of inertial deceleration for map movement.
      *
+     * @param decay Rate of decay (must be negative).
+     * @param minVelocity Minimum velocity (pixels/millisecond).
+     * @param delay Delay to consider to calculate the kinetic
      *     initial values (milliseconds).
      * @struct
      * @api
@@ -5014,6 +5945,9 @@ declare module ol {
          * @classdesc
          * Implementation of inertial deceleration for map movement.
          *
+         * @param decay Rate of decay (must be negative).
+         * @param minVelocity Minimum velocity (pixels/millisecond).
+         * @param delay Delay to consider to calculate the kinetic
          *     initial values (milliseconds).
          * @struct
          * @api
@@ -5030,6 +5964,7 @@ declare module ol {
          * the options is set as a {@link ol.Object} property on the layer object, so
          * is observable, and has get/set accessors.
          *
+         * @param options Layer options.
          * @api stable
          */
         class Base extends ol.Object {
@@ -5041,6 +5976,7 @@ declare module ol {
              * the options is set as a {@link ol.Object} property on the layer object, so
              * is observable, and has get/set accessors.
              *
+             * @param options Layer options.
              * @api stable
              */
             constructor(options: olx.layer.BaseOptions);
@@ -5048,6 +5984,7 @@ declare module ol {
             /**
              * Return the {@link ol.Extent extent} of the layer or `undefined` if it
              * will be visible regardless of extent.
+             * @return The layer extent.
              * @observable
              * @api stable
              */
@@ -5055,6 +5992,7 @@ declare module ol {
 
             /**
              * Return the maximum resolution of the layer.
+             * @return The maximum resolution of the layer.
              * @observable
              * @api stable
              */
@@ -5062,6 +6000,7 @@ declare module ol {
 
             /**
              * Return the minimum resolution of the layer.
+             * @return The minimum resolution of the layer.
              * @observable
              * @api stable
              */
@@ -5069,6 +6008,7 @@ declare module ol {
 
             /**
              * Return the opacity of the layer (between 0 and 1).
+             * @return The opacity of the layer.
              * @observable
              * @api stable
              */
@@ -5076,6 +6016,7 @@ declare module ol {
 
             /**
              * Return the visibility of the layer (`true` or `false`).
+             * @return The visibility of the layer.
              * @observable
              * @api stable
              */
@@ -5084,6 +6025,7 @@ declare module ol {
             /**
              * Return the Z-index of the layer, which is used to order layers before
              * rendering. The default Z-index is 0.
+             * @return The Z-index of the layer.
              * @observable
              * @api
              */
@@ -5092,6 +6034,7 @@ declare module ol {
             /**
              * Set the extent at which the layer is visible.  If `undefined`, the layer
              * will be visible at all extents.
+             * @param extent The extent of the layer.
              * @observable
              * @api stable
              */
@@ -5099,6 +6042,7 @@ declare module ol {
 
             /**
              * Set the maximum resolution at which the layer is visible.
+             * @param maxResolution The maximum resolution of the layer.
              * @observable
              * @api stable
              */
@@ -5106,6 +6050,7 @@ declare module ol {
 
             /**
              * Set the minimum resolution at which the layer is visible.
+             * @param minResolution The minimum resolution of the layer.
              * @observable
              * @api stable
              */
@@ -5113,6 +6058,7 @@ declare module ol {
 
             /**
              * Set the opacity of the layer, allowed values range from 0 to 1.
+             * @param opacity The opacity of the layer.
              * @observable
              * @api stable
              */
@@ -5120,6 +6066,7 @@ declare module ol {
 
             /**
              * Set the visibility of the layer (`true` or `false`).
+             * @param visible The visibility of the layer.
              * @observable
              * @api stable
              */
@@ -5128,6 +6075,7 @@ declare module ol {
             /**
              * Set Z-index of the layer, which is used to order layers before rendering.
              * The default Z-index is 0.
+             * @param zindex The z-index of the layer.
              * @observable
              * @api
              */
@@ -5140,6 +6088,7 @@ declare module ol {
          *
          * A generic `change` event is triggered when the group/Collection changes.
          *
+         * @param opt_options Layer options.
          * @api stable
          */
         class Group extends ol.layer.Base {
@@ -5149,6 +6098,7 @@ declare module ol {
              *
              * A generic `change` event is triggered when the group/Collection changes.
              *
+             * @param opt_options Layer options.
              * @api stable
              */
             constructor(opt_options?: olx.layer.GroupOptions);
@@ -5156,6 +6106,7 @@ declare module ol {
             /**
              * Returns the {@link ol.Collection collection} of {@link ol.layer.Layer layers}
              * in this group.
+             * @return Collection of
              *   {@link ol.layer.Base layers} that are part of this group.
              * @observable
              * @api stable
@@ -5165,6 +6116,7 @@ declare module ol {
             /**
              * Set the {@link ol.Collection collection} of {@link ol.layer.Layer layers}
              * in this group.
+             * @param layers Collection of
              *   {@link ol.layer.Base layers} that are part of this group.
              * @observable
              * @api stable
@@ -5180,6 +6132,7 @@ declare module ol {
          * options means that `title` is observable, and has get/set accessors.
          *
          * @fires ol.render.Event
+         * @param opt_options Options.
          * @api
          */
         class Heatmap extends ol.layer.Vector {
@@ -5191,12 +6144,14 @@ declare module ol {
              * options means that `title` is observable, and has get/set accessors.
              *
              * @fires ol.render.Event
+             * @param opt_options Options.
              * @api
              */
             constructor(opt_options?: olx.layer.HeatmapOptions);
 
             /**
              * Return the blur size in pixels.
+             * @return Blur size in pixels.
              * @api
              * @observable
              */
@@ -5204,6 +6159,7 @@ declare module ol {
 
             /**
              * Return the gradient colors as array of strings.
+             * @return Colors.
              * @api
              * @observable
              */
@@ -5211,6 +6167,7 @@ declare module ol {
 
             /**
              * Return the size of the radius in pixels.
+             * @return Radius size in pixel.
              * @api
              * @observable
              */
@@ -5218,6 +6175,7 @@ declare module ol {
 
             /**
              * Set the blur size in pixels.
+             * @param blur Blur size in pixels.
              * @api
              * @observable
              */
@@ -5225,6 +6183,7 @@ declare module ol {
 
             /**
              * Set the gradient colors as array of strings.
+             * @param colors Gradient.
              * @api
              * @observable
              */
@@ -5232,6 +6191,7 @@ declare module ol {
 
             /**
              * Set the size of the radius in pixels.
+             * @param radius Radius size in pixel.
              * @api
              * @observable
              */
@@ -5247,6 +6207,7 @@ declare module ol {
          * options means that `title` is observable, and has get/set accessors.
          *
          * @fires ol.render.Event
+         * @param opt_options Layer options.
          * @api stable
          */
         class Image extends ol.layer.Layer {
@@ -5259,6 +6220,7 @@ declare module ol {
              * options means that `title` is observable, and has get/set accessors.
              *
              * @fires ol.render.Event
+             * @param opt_options Layer options.
              * @api stable
              */
             constructor(opt_options?: olx.layer.ImageOptions);
@@ -5280,6 +6242,7 @@ declare module ol {
          * A generic `change` event is fired when the state of the source changes.
          *
          * @fires ol.render.Event
+         * @param options Layer options.
          * @api stable
          */
         class Layer extends ol.layer.Base {
@@ -5299,12 +6262,14 @@ declare module ol {
              * A generic `change` event is fired when the state of the source changes.
              *
              * @fires ol.render.Event
+             * @param options Layer options.
              * @api stable
              */
             constructor(options: olx.layer.LayerOptions);
 
             /**
              * Get the layer source.
+             * @return The layer source (or `null` if not yet set).
              * @observable
              * @api stable
              */
@@ -5319,12 +6284,14 @@ declare module ol {
              *
              * To add the layer to a map and have it managed by the map, use
              * {@link ol.Map#addLayer} instead.
+             * @param map Map.
              * @api
              */
             setMap(map: ol.Map): void;
 
             /**
              * Set the layer source.
+             * @param source The layer source.
              * @observable
              * @api stable
              */
@@ -5340,6 +6307,7 @@ declare module ol {
          * options means that `title` is observable, and has get/set accessors.
          *
          * @fires ol.render.Event
+         * @param opt_options Tile layer options.
          * @api stable
          */
         class Tile extends ol.layer.Layer {
@@ -5352,12 +6320,14 @@ declare module ol {
              * options means that `title` is observable, and has get/set accessors.
              *
              * @fires ol.render.Event
+             * @param opt_options Tile layer options.
              * @api stable
              */
             constructor(opt_options?: olx.layer.TileOptions);
 
             /**
              * Return the level as number to which we will preload tiles up to.
+             * @return The level to preload tiles up to.
              * @observable
              * @api
              */
@@ -5365,6 +6335,7 @@ declare module ol {
 
             /**
              * Set the level as number to which we will preload tiles up to.
+             * @param preload The level to preload tiles up to.
              * @observable
              * @api
              */
@@ -5372,6 +6343,7 @@ declare module ol {
 
             /**
              * Whether we use interim tiles on error.
+             * @return Use interim tiles on error.
              * @observable
              * @api
              */
@@ -5379,6 +6351,7 @@ declare module ol {
 
             /**
              * Set whether we use interim tiles on error.
+             * @param useInterimTilesOnError Use interim tiles on error.
              * @observable
              * @api
              */
@@ -5393,6 +6366,7 @@ declare module ol {
          * options means that `title` is observable, and has get/set accessors.
          *
          * @fires ol.render.Event
+         * @param opt_options Options.
          * @api stable
          */
         class Vector extends ol.layer.Layer {
@@ -5404,12 +6378,14 @@ declare module ol {
              * options means that `title` is observable, and has get/set accessors.
              *
              * @fires ol.render.Event
+             * @param opt_options Options.
              * @api stable
              */
             constructor(opt_options?: olx.layer.VectorOptions);
 
             /**
              * Return the associated {@link ol.source.Vector vectorsource} of the layer.
+             * @return Source.
              * @api stable
              */
             getSource(): ol.source.Vector;
@@ -5417,13 +6393,14 @@ declare module ol {
             /**
              * Get the style for features.  This returns whatever was passed to the `style`
              * option at construction or to the `setStyle` method.
-             *     Layer style.
+             * @return Layer style.
              * @api stable
              */
             getStyle(): (ol.style.Style | ol.style.Style[] | ol.StyleFunction);
 
             /**
              * Get the style function.
+             * @return Layer style function.
              * @api stable
              */
             getStyleFunction(): (ol.StyleFunction);
@@ -5435,7 +6412,7 @@ declare module ol {
              * it is `null` the layer has no style (a `null` style), so only features
              * that have their own styles will be rendered in the layer. See
              * {@link ol.style} for information on the default style.
-             *     style Layer style.
+             * @param style Layer style.
              * @api stable
              */
             setStyle(style: (ol.style.Style | ol.style.Style[] | ol.StyleFunction)): void;
@@ -5462,6 +6439,7 @@ declare module ol {
          * property on the layer object; for example, setting `title: 'My Title'` in the
          * options means that `title` is observable, and has get/set accessors.
          *
+         * @param opt_options Options.
          * @api
          */
         class VectorTile extends ol.layer.Vector {
@@ -5472,12 +6450,14 @@ declare module ol {
              * property on the layer object; for example, setting `title: 'My Title'` in the
              * options means that `title` is observable, and has get/set accessors.
              *
+             * @param opt_options Options.
              * @api
              */
             constructor(opt_options?: olx.layer.VectorTileOptions);
 
             /**
              * Return the level as number to which we will preload tiles up to.
+             * @return The level to preload tiles up to.
              * @observable
              * @api
              */
@@ -5485,6 +6465,7 @@ declare module ol {
 
             /**
              * Whether we use interim tiles on error.
+             * @return Use interim tiles on error.
              * @observable
              * @api
              */
@@ -5492,6 +6473,7 @@ declare module ol {
 
             /**
              * Set the level as number to which we will preload tiles up to.
+             * @param preload The level to preload tiles up to.
              * @observable
              * @api
              */
@@ -5499,6 +6481,7 @@ declare module ol {
 
             /**
              * Set whether we use interim tiles on error.
+             * @param useInterimTilesOnError Use interim tiles on error.
              * @observable
              * @api
              */
@@ -5512,6 +6495,9 @@ declare module ol {
     module loadingstrategy {
         /**
          * Strategy function for loading all features with a single request.
+         * @param extent Extent.
+         * @param resolution Resolution.
+         * @return Extents.
          * @api
          */
         function all(extent: ol.Extent, resolution: number): ol.Extent[];
@@ -5519,12 +6505,17 @@ declare module ol {
         /**
          * Strategy function for loading features based on the view's extent and
          * resolution.
+         * @param extent Extent.
+         * @param resolution Resolution.
+         * @return Extents.
          * @api
          */
         function bbox(extent: ol.Extent, resolution: number): ol.Extent[];
 
         /**
          * Creates a strategy function for loading features based on a tile grid.
+         * @param tileGrid Tile grid.
+         * @return Loading strategy.
          * @api
          */
         function tile(tileGrid: ol.tilegrid.TileGrid): ((extent: ol.Extent, i: number) => ol.Extent[]);
@@ -5570,6 +6561,7 @@ declare module ol {
      * entered in the options or added with `addLayer` can be groups, which can
      * contain further groups, and so on.
      *
+     * @param options Map options.
      * @fires ol.MapBrowserEvent
      * @fires ol.MapEvent
      * @fires ol.render.Event#postcompose
@@ -5617,6 +6609,7 @@ declare module ol {
          * entered in the options or added with `addLayer` can be groups, which can
          * contain further groups, and so on.
          *
+         * @param options Map options.
          * @fires ol.MapBrowserEvent
          * @fires ol.MapEvent
          * @fires ol.render.Event#postcompose
@@ -5627,12 +6620,14 @@ declare module ol {
 
         /**
          * Add the given control to the map.
+         * @param control Control.
          * @api stable
          */
         addControl(control: ol.control.Control): void;
 
         /**
          * Add the given interaction to the map.
+         * @param interaction Interaction to add.
          * @api stable
          */
         addInteraction(interaction: ol.interaction.Interaction): void;
@@ -5641,12 +6636,14 @@ declare module ol {
          * Adds the given layer to the top of this map. If you want to add a layer
          * elsewhere in the stack, use `getLayers()` and the methods available on
          * {@link ol.Collection}.
+         * @param layer Layer.
          * @api stable
          */
         addLayer(layer: ol.layer.Base): void;
 
         /**
          * Add the given overlay to the map.
+         * @param overlay Overlay.
          * @api stable
          */
         addOverlay(overlay: ol.Overlay): void;
@@ -5655,13 +6652,16 @@ declare module ol {
          * Detect features that intersect a pixel on the viewport, and execute a
          * callback with each intersecting feature. Layers included in the detection can
          * be configured through `opt_layerFilter`.
-         *     ol.layer.Layer): T} callback Feature callback. The callback will be
+         * @param pixel Pixel.
+         * @param callback Feature callback. The callback will be
          *     called with two arguments. The first argument is one
          *     {@link ol.Feature feature} or
          *     {@link ol.render.Feature render feature} at the pixel, the second is
          *     the {@link ol.layer.Layer layer} of the feature and will be null for
          *     unmanaged layers. To stop detection, callback functions can return a
          *     truthy value.
+         * @param opt_options Optional options.
+         * @return Callback result, i.e. the return value of last
          * callback execution, or the first truthy callback return value.
          * @template T
          * @api stable
@@ -5674,6 +6674,9 @@ declare module ol {
 
         /**
          * Get all features that intersect a pixel on the viewport.
+         * @param pixel Pixel.
+         * @param opt_options Optional options.
+         * @return The detected features or null if none were found.
          * @api stable
          */
         getFeaturesAtPixel(
@@ -5685,15 +6688,21 @@ declare module ol {
          * Detect layers that have a color value at a pixel on the viewport, and
          * execute a callback with each matching layer. Layers included in the
          * detection can be configured through `opt_layerFilter`.
+         * @param pixel Pixel.
+         * @param callback Layer
          *     callback. This callback will recieve two arguments: first is the
          *     {@link ol.layer.Layer layer}, second argument is {@link ol.Color}
          *     and will be null for layer types that do not currently support this
          *     argument. To stop detection callback functions can return a truthy value.
+         * @param opt_this Value to use as `this` when executing `callback`.
+         * @param opt_layerFilter Layer
          *     filter function. The filter function will receive one argument, the
          *     {@link ol.layer.Layer layer-candidate} and it should return a boolean
          *     value. Only layers which are visible and for which this function returns
          *     `true` will be tested for features. By default, all visible layers will
          *     be tested.
+         * @param opt_this2 Value to use as `this` when executing `layerFilter`.
+         * @return Callback result, i.e. the return value of last
          * callback execution, or the first truthy callback return value.
          * @template S,T,U
          * @api stable
@@ -5707,6 +6716,9 @@ declare module ol {
         /**
          * Detect if features intersect a pixel on the viewport. Layers included in the
          * detection can be configured through `opt_layerFilter`.
+         * @param pixel Pixel.
+         * @param opt_options Optional options.
+         * @return Is there a feature at the given pixel?
          * @api
          */
         hasFeatureAtPixel(
@@ -5716,12 +6728,16 @@ declare module ol {
 
         /**
          * Returns the geographical coordinate for a browser event.
+         * @param event Event.
+         * @return Coordinate.
          * @api stable
          */
         getEventCoordinate(event: Event): ol.Coordinate;
 
         /**
          * Returns the map pixel position for a browser event relative to the viewport.
+         * @param event Event.
+         * @return Pixel.
          * @api stable
          */
         getEventPixel(event: Event): ol.Pixel;
@@ -5730,6 +6746,7 @@ declare module ol {
          * Get the target in which this map is rendered.
          * Note that this returns what is entered as an option or in setTarget:
          * if that was an element, it returns an element; if a string, it returns that.
+         * @return The Element or id of the Element that the
          *     map is rendered in.
          * @observable
          * @api stable
@@ -5740,6 +6757,7 @@ declare module ol {
          * Get the DOM element into which this map is rendered. In contrast to
          * `getTarget` this method always return an `Element`, or `null` if the
          * map has no target.
+         * @return The element that the map is rendered in.
          * @api
          */
         getTargetElement(): Element;
@@ -5747,6 +6765,8 @@ declare module ol {
         /**
          * Get the coordinate for a given pixel.  This returns a coordinate in the
          * map view projection.
+         * @param pixel Pixel position in the map viewport.
+         * @return The coordinate for the pixel position.
          * @api stable
          */
         getCoordinateFromPixel(pixel: ol.Pixel): ol.Coordinate;
@@ -5754,6 +6774,7 @@ declare module ol {
         /**
          * Get the map controls. Modifying this collection changes the controls
          * associated with the map.
+         * @return Controls.
          * @api stable
          */
         getControls(): ol.Collection<ol.control.Control>;
@@ -5761,6 +6782,7 @@ declare module ol {
         /**
          * Get the map overlays. Modifying this collection changes the overlays
          * associated with the map.
+         * @return Overlays.
          * @api stable
          */
         getOverlays(): ol.Collection<ol.Overlay>;
@@ -5769,6 +6791,8 @@ declare module ol {
          * Get an overlay by its identifier (the value returned by overlay.getId()).
          * Note that the index treats string and numeric identifiers as the same. So
          * `map.getOverlayById(2)` will return an overlay with id `'2'` or `2`.
+         * @param id Overlay identifier.
+         * @return Overlay.
          * @api
          */
         getOverlayById(id: (string | number)): ol.Overlay;
@@ -5778,12 +6802,14 @@ declare module ol {
          * associated with the map.
          *
          * Interactions are used for e.g. pan, zoom and rotate.
+         * @return Interactions.
          * @api stable
          */
         getInteractions(): ol.Collection<ol.interaction.Interaction>;
 
         /**
          * Get the layergroup associated with this map.
+         * @return A layer group containing the layers in this map.
          * @observable
          * @api stable
          */
@@ -5791,6 +6817,7 @@ declare module ol {
 
         /**
          * Get the collection of layers associated with this map.
+         * @return Layers.
          * @api stable
          */
         getLayers(): ol.Collection<ol.layer.Base>;
@@ -5798,12 +6825,15 @@ declare module ol {
         /**
          * Get the pixel for a coordinate.  This takes a coordinate in the map view
          * projection and returns the corresponding pixel.
+         * @param coordinate A map coordinate.
+         * @return A pixel position in the map viewport.
          * @api stable
          */
         getPixelFromCoordinate(coordinate: ol.Coordinate): ol.Pixel;
 
         /**
          * Get the size of this map.
+         * @return The size in pixels of the map in the DOM.
          * @observable
          * @api stable
          */
@@ -5812,6 +6842,7 @@ declare module ol {
         /**
          * Get the view associated with this map. A view manages properties such as
          * center and resolution.
+         * @return The view that controls this map.
          * @observable
          * @api stable
          */
@@ -5819,6 +6850,7 @@ declare module ol {
 
         /**
          * Get the element that serves as the map viewport.
+         * @return Viewport.
          * @api stable
          */
         getViewport(): Element;
@@ -5837,6 +6869,8 @@ declare module ol {
 
         /**
          * Remove the given control from the map.
+         * @param control Control.
+         * @return The removed control (or undefined
          *     if the control was not found).
          * @api stable
          */
@@ -5844,6 +6878,8 @@ declare module ol {
 
         /**
          * Remove the given interaction from the map.
+         * @param interaction Interaction to remove.
+         * @return The removed interaction (or
          *     undefined if the interaction was not found).
          * @api stable
          */
@@ -5851,6 +6887,8 @@ declare module ol {
 
         /**
          * Removes the given layer from the map.
+         * @param layer Layer.
+         * @return The removed layer (or undefined if the
          *     layer was not found).
          * @api stable
          */
@@ -5858,6 +6896,8 @@ declare module ol {
 
         /**
          * Remove the given overlay from the map.
+         * @param overlay Overlay.
+         * @return The removed overlay (or undefined
          *     if the overlay was not found).
          * @api stable
          */
@@ -5865,6 +6905,7 @@ declare module ol {
 
         /**
          * Sets the layergroup of this map.
+         * @param layerGroup A layer group containing the layers in
          *     this map.
          * @observable
          * @api stable
@@ -5873,6 +6914,7 @@ declare module ol {
 
         /**
          * Set the size of this map.
+         * @param size The size in pixels of the map in the DOM.
          * @observable
          * @api
          */
@@ -5880,6 +6922,7 @@ declare module ol {
 
         /**
          * Set the target element to render this map into.
+         * @param target The Element or id of the Element
          *     that the map is rendered in.
          * @observable
          * @api stable
@@ -5888,6 +6931,7 @@ declare module ol {
 
         /**
          * Set the view for this map.
+         * @param view The view that controls this map.
          * @observable
          * @api stable
          */
@@ -5906,6 +6950,11 @@ declare module ol {
      * Events emitted as map browser events are instances of this type.
      * See {@link ol.Map} for which events trigger a map browser event.
      *
+     * @param type Event type.
+     * @param map Map.
+     * @param browserEvent Browser event.
+     * @param opt_dragging Is the map currently being dragged?
+     * @param opt_frameState Frame state.
      */
     class MapBrowserEvent extends ol.MapEvent {
         /**
@@ -5913,6 +6962,11 @@ declare module ol {
          * Events emitted as map browser events are instances of this type.
          * See {@link ol.Map} for which events trigger a map browser event.
          *
+         * @param type Event type.
+         * @param map Map.
+         * @param browserEvent Browser event.
+         * @param opt_dragging Is the map currently being dragged?
+         * @param opt_frameState Frame state.
          */
         constructor(type: string, map: ol.Map, browserEvent: Event, opt_dragging?: boolean, opt_frameState?: olx.FrameState);
 
@@ -5944,8 +6998,20 @@ declare module ol {
         dragging: boolean;
     }
 
+    /**
+     * @param type Event type.
+     * @param map Map.
+     * @param pointerEvent Pointer event.
+     * @param opt_dragging Is the map currently being dragged?
+     * @param opt_frameState Frame state.
+     */
     class MapBrowserPointerEvent extends ol.MapBrowserEvent {
         // /**
+        //  * @param type Event type.
+        //  * @param map Map.
+        //  * @param pointerEvent Pointer event.
+        //  * @param opt_dragging Is the map currently being dragged?
+        //  * @param opt_frameState Frame state.
         //  */
         // constructor (type: string,
         //           map: ol.Map,
@@ -5961,6 +7027,9 @@ declare module ol {
      * Events emitted as map events are instances of this type.
      * See {@link ol.Map} for which events trigger a map event.
      *
+     * @param type Event type.
+     * @param map Map.
+     * @param opt_frameState Frame state.
      */
     class MapEvent extends ol.events.Event {
         /**
@@ -5968,6 +7037,9 @@ declare module ol {
          * Events emitted as map events are instances of this type.
          * See {@link ol.Map} for which events trigger a map event.
          *
+         * @param type Event type.
+         * @param map Map.
+         * @param opt_frameState Frame state.
          */
         constructor(type: string, map: ol.Map, opt_frameState?: olx.FrameState);
 
@@ -5988,12 +7060,18 @@ declare module ol {
      * @classdesc
      * Events emitted by {@link ol.Object} instances are instances of this type.
      *
+     * @param type The event type.
+     * @param key The property name.
+     * @param oldValue The old value for `key`.
      */
     class ObjectEvent extends ol.events.Event {
         /**
          * @classdesc
          * Events emitted by {@link ol.Object} instances are instances of this type.
          *
+         * @param type The event type.
+         * @param key The property name.
+         * @param oldValue The old value for `key`.
          */
         constructor(type: string, key: string, oldValue: any);
 
@@ -6050,6 +7128,7 @@ declare module ol {
      * Properties can be deleted by using the unset method. E.g.
      * object.unset('foo').
      *
+     * @param opt_values An object with key-value pairs.
      * @fires ol.ObjectEvent
      * @api
      */
@@ -6093,6 +7172,7 @@ declare module ol {
          * Properties can be deleted by using the unset method. E.g.
          * object.unset('foo').
          *
+         * @param opt_values An object with key-value pairs.
          * @fires ol.ObjectEvent
          * @api
          */
@@ -6100,24 +7180,31 @@ declare module ol {
 
         /**
          * Gets a value.
+         * @param key Key name.
+         * @return Value.
          * @api stable
          */
         get(key: string): any;
 
         /**
          * Get a list of object property names.
+         * @return List of property names.
          * @api stable
          */
         getKeys(): string[];
 
         /**
          * Get an object of all property names and values.
+         * @return Object.
          * @api stable
          */
         getProperties(): { [k: string]: any };
 
         /**
          * Sets a value.
+         * @param key Key name.
+         * @param value Value.
+         * @param opt_silent Update without triggering an event.
          * @api stable
          */
         set(key: string, value: any, opt_silent?: boolean): void;
@@ -6125,12 +7212,16 @@ declare module ol {
         /**
          * Sets a collection of key-value pairs.  Note that this changes any existing
          * properties and adds new ones (it does not remove any existing properties).
+         * @param values Values.
+         * @param opt_silent Update without triggering an event.
          * @api stable
          */
         setProperties(values: { [k: string]: any }, opt_silent?: boolean): void;
 
         /**
          * Unsets a property.
+         * @param key Key name.
+         * @param opt_silent Unset without triggering an event.
          * @api stable
          */
         unset(key: string, opt_silent?: boolean): void;
@@ -6165,6 +7256,7 @@ declare module ol {
 
         /**
          * Removes an event listener using the key returned by `on()` or `once()`.
+         * @param key The key returned by `on()`
          *     or `once()` (or an array of keys).
          * @api stable
          */
@@ -6181,8 +7273,7 @@ declare module ol {
          * of this type. The event parameter can either be a string or an
          * Object with a `type` property.
          *
-         *     target: (EventTarget|ol.events.EventTarget|undefined)}|ol.events.Event|
-         *     string} event Event object.
+         * @param event Event object.
          * @api
          */
         dispatchEvent(event: (GlobalObject | ol.events.Event | string)): void;
@@ -6190,12 +7281,17 @@ declare module ol {
         /**
          * Get the version number for this object.  Each time the object is modified,
          * its version number will be incremented.
+         * @return Revision.
          * @api
          */
         getRevision(): number;
 
         /**
          * Listen for a certain type of event.
+         * @param type The event type or array of event types.
+         * @param listener The listener function.
+         * @param opt_this The object to use as `this` in `listener`.
+         * @return Unique key for the listener. If
          *     called with an array of event types as the first argument, the return
          *     will be an array of keys.
          * @api stable
@@ -6204,6 +7300,10 @@ declare module ol {
 
         /**
          * Listen once for a certain type of event.
+         * @param type The event type or array of event types.
+         * @param listener The listener function.
+         * @param opt_this The object to use as `this` in `listener`.
+         * @return Unique key for the listener. If
          *     called with an array of event types as the first argument, the return
          *     will be an array of keys.
          * @api stable
@@ -6212,6 +7312,9 @@ declare module ol {
 
         /**
          * Unlisten for a certain type of event.
+         * @param type The event type or array of event types.
+         * @param listener The listener function.
+         * @param opt_this The object which was used as `this` by the
          * `listener`.
          * @api stable
          */
@@ -6241,6 +7344,7 @@ declare module ol {
      *     popup.setPosition(coordinate);
      *     map.addOverlay(popup);
      *
+     * @param options Overlay options.
      * @api stable
      */
     class Overlay extends ol.Object {
@@ -6260,12 +7364,14 @@ declare module ol {
          *     popup.setPosition(coordinate);
          *     map.addOverlay(popup);
          *
+         * @param options Overlay options.
          * @api stable
          */
         constructor(options: olx.OverlayOptions);
 
         /**
          * Get the DOM element of this overlay.
+         * @return The Element containing the overlay.
          * @observable
          * @api stable
          */
@@ -6273,12 +7379,14 @@ declare module ol {
 
         /**
          * Get the overlay identifier which is set on constructor.
+         * @return Id.
          * @api
          */
         getId(): (number | string);
 
         /**
          * Get the map associated with this overlay.
+         * @return The map that the overlay is part of.
          * @observable
          * @api stable
          */
@@ -6286,6 +7394,7 @@ declare module ol {
 
         /**
          * Get the offset of this overlay.
+         * @return The offset.
          * @observable
          * @api stable
          */
@@ -6293,6 +7402,7 @@ declare module ol {
 
         /**
          * Get the current position of this overlay.
+         * @return The spatial point that the overlay is
          *     anchored at.
          * @observable
          * @api stable
@@ -6301,6 +7411,7 @@ declare module ol {
 
         /**
          * Get the current positioning of this overlay.
+         * @return How the overlay is positioned
          *     relative to its point on the map.
          * @observable
          * @api stable
@@ -6309,6 +7420,7 @@ declare module ol {
 
         /**
          * Set the DOM element to be associated with this overlay.
+         * @param element The Element containing the overlay.
          * @observable
          * @api stable
          */
@@ -6316,6 +7428,7 @@ declare module ol {
 
         /**
          * Set the map to be associated with this overlay.
+         * @param map The map that the overlay is part of.
          * @observable
          * @api stable
          */
@@ -6323,6 +7436,7 @@ declare module ol {
 
         /**
          * Set the offset for this overlay.
+         * @param offset Offset.
          * @observable
          * @api stable
          */
@@ -6331,6 +7445,7 @@ declare module ol {
         /**
          * Set the position for this overlay. If the position is `undefined` the
          * overlay is hidden.
+         * @param position The spatial point that the overlay
          *     is anchored at.
          * @observable
          * @api stable
@@ -6339,6 +7454,7 @@ declare module ol {
 
         /**
          * Set the positioning for this overlay.
+         * @param positioning how the overlay is
          *     positioned relative to its point on the map.
          * @observable
          * @api stable
@@ -6354,6 +7470,9 @@ declare module ol {
          * This class is used as an abstraction for mouse events,
          * touch events and even native pointer events.
          *
+         * @param type The type of the event to create.
+         * @param originalEvent The event.
+         * @param opt_eventDict An optional dictionary of
          *    initial event properties.
          */
         class PointerEvent {
@@ -6411,6 +7530,7 @@ declare module ol {
      * projection, just add a {@link ol.proj.Projection} with
      * {@link ol.proj.addProjection}. See examples/wms-no-proj for an example of
      * this.
+     *
      */
     module proj {
         /**
@@ -6451,6 +7571,7 @@ declare module ol {
          * [documentation](https://github.com/proj4js/proj4js). To set an alternative
          * namespace for proj4, use {@link ol.proj.setProj4}.
          *
+         * @param options Projection options.
          * @struct
          * @api stable
          */
@@ -6480,6 +7601,7 @@ declare module ol {
              * [documentation](https://github.com/proj4js/proj4js). To set an alternative
              * namespace for proj4, use {@link ol.proj.setProj4}.
              *
+             * @param options Projection options.
              * @struct
              * @api stable
              */
@@ -6487,18 +7609,21 @@ declare module ol {
 
             /**
              * Get the code for this projection, e.g. 'EPSG:4326'.
+             * @return Code.
              * @api stable
              */
             getCode(): string;
 
             /**
              * Get the validity extent for this projection.
+             * @return Extent.
              * @api stable
              */
             getExtent(): ol.Extent;
 
             /**
              * Get the units of this projection.
+             * @return Units.
              * @api stable
              */
             getUnits(): ol.proj.Units;
@@ -6507,36 +7632,42 @@ declare module ol {
              * Get the amount of meters per unit of this projection.  If the projection is
              * not configured with `metersPerUnit` or a units identifier, the return is
              * `undefined`.
+             * @return Meters.
              * @api stable
              */
             getMetersPerUnit(): (number);
 
             /**
              * Get the world extent for this projection.
+             * @return Extent.
              * @api
              */
             getWorldExtent(): ol.Extent;
 
             /**
              * Is this projection a global projection which spans the whole world?
+             * @return Whether the projection is global.
              * @api stable
              */
             isGlobal(): boolean;
 
             /**
              * Set if the projection is a global projection which spans the whole world
+             * @param global Whether the projection is global.
              * @api stable
              */
             setGlobal(global: boolean): void;
 
             /**
              * Set the validity extent for this projection.
+             * @param extent Extent.
              * @api stable
              */
             setExtent(extent: ol.Extent): void;
 
             /**
              * Set the world extent for this projection.
+             * @param worldExtent World extent
              *     [minlon, minlat, maxlon, maxlat].
              * @api
              */
@@ -6544,6 +7675,7 @@ declare module ol {
 
             /**
              * Set the getPointResolution function for this projection.
+             * @param func Function
              * @api
              */
             setGetPointResolution(func: ((resolution: number, coords: ol.Coordinate) => number)): void;
@@ -6558,6 +7690,9 @@ declare module ol {
              * An alternative implementation may be given when constructing a
              * projection. For many local projections,
              * such a custom function will return the resolution unchanged.
+             * @param resolution Resolution in projection units.
+             * @param point Point.
+             * @return Point resolution in projection units.
              * @api
              */
             getPointResolution(resolution: number, point: ol.Coordinate): number;
@@ -6572,6 +7707,7 @@ declare module ol {
          *     import proj4 from 'proj4';
          *     ol.proj.setProj4(proj4);
          *
+         * @param proj4 Proj4.
          * @api
          */
         function setProj4(proj4: any): void;
@@ -6580,6 +7716,7 @@ declare module ol {
          * Registers transformation functions that don't alter coordinates. Those allow
          * to transform between projections with equal meaning.
          *
+         * @param projections Projections.
          * @api
          */
         function addEquivalentProjections(projections: ol.proj.Projection[]): void;
@@ -6588,6 +7725,7 @@ declare module ol {
          * Add a Projection object to the list of supported projections that can be
          * looked up by their code.
          *
+         * @param projection Projection instance.
          * @api stable
          */
         function addProjection(projection: ol.proj.Projection): void;
@@ -6599,9 +7737,13 @@ declare module ol {
          * converts these into the functions used internally which also handle
          * extents and coordinate arrays.
          *
+         * @param source Source projection.
+         * @param destination Destination projection.
+         * @param forward The forward transform
          *     function (that is, from the source projection to the destination
          *     projection) that takes a {@link ol.Coordinate} as argument and returns
          *     the transformed {@link ol.Coordinate}.
+         * @param inverse The inverse transform
          *     function (that is, from the destination projection to the source
          *     projection) that takes a {@link ol.Coordinate} as argument and returns
          *     the transformed {@link ol.Coordinate}.
@@ -6614,15 +7756,21 @@ declare module ol {
 
         /**
          * Transforms a coordinate from longitude/latitude to a different projection.
+         * @param coordinate Coordinate as longitude and latitude, i.e.
          *     an array with longitude as 1st and latitude as 2nd element.
+         * @param opt_projection Target projection. The
          *     default is Web Mercator, i.e. 'EPSG:3857'.
+         * @return Coordinate projected to the target projection.
          * @api stable
          */
         function fromLonLat(coordinate: ol.Coordinate, opt_projection?: ol.ProjectionLike): ol.Coordinate;
 
         /**
          * Transforms a coordinate to longitude/latitude.
+         * @param coordinate Projected coordinate.
+         * @param opt_projection Projection of the coordinate.
          *     The default is Web Mercator, i.e. 'EPSG:3857'.
+         * @return Coordinate as longitude and latitude, i.e. an array
          *     with longitude as 1st and latitude as 2nd element.
          * @api stable
          */
@@ -6631,8 +7779,10 @@ declare module ol {
         /**
          * Fetches a Projection object for the code specified.
          *
+         * @param projectionLike Either a code string which is
          *     a combination of authority and identifier such as "EPSG:4326", or an
          *     existing projection object, or undefined.
+         * @return Projection object, or null if not in list.
          * @api stable
          */
         function get(projectionLike: ol.ProjectionLike): ol.proj.Projection;
@@ -6642,6 +7792,9 @@ declare module ol {
          * projection does represent the same geographic point as the same coordinate in
          * the other projection.
          *
+         * @param projection1 Projection 1.
+         * @param projection2 Projection 2.
+         * @return Equivalent.
          * @api
          */
         function equivalent(projection1: ol.proj.Projection, projection2: ol.proj.Projection): boolean;
@@ -6651,6 +7804,9 @@ declare module ol {
          * function to convert a coordinates array from the source projection to the
          * destination projection.
          *
+         * @param source Source.
+         * @param destination Destination.
+         * @return Transform function.
          * @api stable
          */
         function getTransform(source: ol.ProjectionLike, destination: ol.ProjectionLike): ol.TransformFunction;
@@ -6663,6 +7819,9 @@ declare module ol {
          * See the transform method of {@link ol.geom.Geometry} and its subclasses for
          * geometry transforms.
          *
+         * @param coordinate Coordinate.
+         * @param source Source projection-like.
+         * @param destination Destination projection-like.
          */
         function transform(coordinate: ol.Coordinate, source: ol.ProjectionLike, destination: ol.ProjectionLike): ol.Coordinate;
 
@@ -6670,6 +7829,10 @@ declare module ol {
          * Transforms an extent from source projection to destination projection.  This
          * returns a new extent (and does not modify the original).
          *
+         * @param extent The extent to transform.
+         * @param source Source projection-like.
+         * @param destination Destination projection-like.
+         * @return The transformed extent.
          * @api stable
          */
         function transformExtent(extent: ol.Extent, source: ol.ProjectionLike, destination: ol.ProjectionLike): ol.Extent;
@@ -6681,6 +7844,10 @@ declare module ol {
          * estimated by transforming the 'point' pixel to EPSG:4326, measuring
          * its width and height on the normal sphere, and taking the average of
          * the width and height.
+         * @param projection The projection.
+         * @param resolution Nominal resolution in projection units.
+         * @param point Point to find adjusted resolution at.
+         * @return Point to find adjusted resolution at.
          */
         function getPointResolution(
             projection: ol.proj.Projection,
@@ -6700,6 +7867,11 @@ declare module ol {
              * {@link ol.render.Event} object associated with postcompose, precompose and
              * render events emitted by layers and maps.
              *
+             * @param context Context.
+             * @param pixelRatio Pixel ratio.
+             * @param extent Extent.
+             * @param transform Transform.
+             * @param viewRotation View rotation.
              * @struct
              */
             class Immediate extends ol.render.VectorContext {
@@ -6712,6 +7884,11 @@ declare module ol {
                  * {@link ol.render.Event} object associated with postcompose, precompose and
                  * render events emitted by layers and maps.
                  *
+                 * @param context Context.
+                 * @param pixelRatio Pixel ratio.
+                 * @param extent Extent.
+                 * @param transform Transform.
+                 * @param viewRotation View rotation.
                  * @struct
                  */
                 constructor(context: CanvasRenderingContext2D, pixelRatio: number, extent: ol.Extent, transform: any, viewRotation: number);
@@ -6720,6 +7897,7 @@ declare module ol {
                  * Render a circle geometry into the canvas.  Rendering is immediate and uses
                  * the current fill and stroke styles.
                  *
+                 * @param geometry Circle geometry.
                  * @api
                  */
                 drawCircle(geometry: ol.geom.Circle): void;
@@ -6728,6 +7906,7 @@ declare module ol {
                  * Set the rendering style.  Note that since this is an immediate rendering API,
                  * any `zIndex` on the provided style will be ignored.
                  *
+                 * @param style The rendering style.
                  * @api
                  */
                 setStyle(style: ol.style.Style): void;
@@ -6736,6 +7915,7 @@ declare module ol {
                  * Render a geometry into the canvas.  Call
                  * {@link ol.render.canvas.Immediate#setStyle} first to set the rendering style.
                  *
+                 * @param geometry The geometry to render.
                  * @api
                  */
                 drawGeometry(geometry: (ol.geom.Geometry | ol.render.Feature)): void;
@@ -6746,13 +7926,29 @@ declare module ol {
                  * this method is called.  If you need `zIndex` support, you should be using an
                  * {@link ol.layer.Vector} instead.
                  *
+                 * @param feature Feature.
+                 * @param style Style.
                  * @api
                  */
                 drawFeature(feature: ol.Feature, style: ol.style.Style): void;
             }
         }
 
+        /**
+         * @param type Type.
+         * @param opt_vectorContext Vector context.
+         * @param opt_frameState Frame state.
+         * @param opt_context Context.
+         * @param opt_glContext WebGL Context.
+         */
         class Event extends ol.events.Event {
+            /**
+             * @param type Type.
+             * @param opt_vectorContext Vector context.
+             * @param opt_frameState Frame state.
+             * @param opt_context Context.
+             * @param opt_glContext WebGL Context.
+             */
             constructor(type: ol.render.EventType, opt_vectorContext?: ol.render.VectorContext, opt_frameState?: olx.FrameState, opt_context?: CanvasRenderingContext2D, opt_glContext?: any);
 
             /**
@@ -6789,7 +7985,11 @@ declare module ol {
          * structure, optimized for rendering and styling. Geometry access through the
          * API is limited to getting the type and extent of the geometry.
          *
+         * @param type Geometry type.
+         * @param flatCoordinates Flat coordinates. These always need
          *     to be right-handed for polygons.
+         * @param ends Ends or Endss.
+         * @param properties Properties.
          */
         class Feature {
             /**
@@ -6797,36 +7997,46 @@ declare module ol {
              * structure, optimized for rendering and styling. Geometry access through the
              * API is limited to getting the type and extent of the geometry.
              *
+             * @param type Geometry type.
+             * @param flatCoordinates Flat coordinates. These always need
              *     to be right-handed for polygons.
+             * @param ends Ends or Endss.
+             * @param properties Properties.
              */
             constructor(type: ol.geom.GeometryType, flatCoordinates: number[], ends: (number[] | number[][]), properties: { [k: string]: any });
 
             /**
              * Get a feature property by its key.
+             * @param key Key
+             * @return Value for the requested key.
              * @api
              */
             get(key: string): any;
 
             /**
              * Get the extent of this feature's geometry.
+             * @return Extent.
              * @api
              */
             getExtent(): ol.Extent;
 
             /**
              * Get the feature for working with its geometry.
+             * @return Feature.
              * @api
              */
             getGeometry(): ol.render.Feature;
 
             /**
              * Get the feature properties.
+             * @return Feature properties.
              * @api
              */
             getProperties(): { [k: string]: any };
 
             /**
              * Get the type of this feature's geometry.
+             * @return Geometry type.
              * @api
              */
             getType(): ol.geom.GeometryType;
@@ -6863,6 +8073,9 @@ declare module ol {
          *     new ol.geom.Polygon([[[0, 0], [100, 100], [100, 0], [0, 0]]]));
          * ```
          *
+         * @param context Canvas context.
+         * @param opt_options Options.
+         * @return Canvas Immediate.
          * @api
          */
         function toContext(context: CanvasRenderingContext2D, opt_options?: olx.render.ToContextOptions): ol.render.canvas.Immediate;
@@ -6883,6 +8096,7 @@ declare module ol {
          * @classdesc
          * Layer source for Bing Maps tile data.
          *
+         * @param options Bing Maps options.
          * @api stable
          */
         class BingMaps extends ol.source.TileImage {
@@ -6890,6 +8104,7 @@ declare module ol {
              * @classdesc
              * Layer source for Bing Maps tile data.
              *
+             * @param options Bing Maps options.
              * @api stable
              */
             constructor(options: olx.source.BingMapsOptions);
@@ -6907,6 +8122,7 @@ declare module ol {
          * @classdesc
          * Layer source for the CartoDB tiles.
          *
+         * @param options CartoDB options.
          * @api
          */
         class CartoDB extends ol.source.XYZ {
@@ -6914,18 +8130,21 @@ declare module ol {
              * @classdesc
              * Layer source for the CartoDB tiles.
              *
+             * @param options CartoDB options.
              * @api
              */
             constructor(options: olx.source.CartoDBOptions);
 
             /**
              * Returns the current config.
+             * @return The current configuration.
              * @api
              */
             getConfig(): GlobalObject;
 
             /**
              * Updates the carto db config.
+             * @param config a key-value lookup. Values will replace current values
              *     in the config.
              * @api
              */
@@ -6933,6 +8152,7 @@ declare module ol {
 
             /**
              * Sets the CartoDB config
+             * @param config In the case of anonymous maps, a CartoDB configuration
              *     object.
              * If using named maps, a key-value lookup with the template parameters.
              * @api
@@ -6946,6 +8166,7 @@ declare module ol {
          * geometries. For other geometry types, or if not all geometries should be
          * considered for clustering, a custom `geometryFunction` can be defined.
          *
+         * @param options Constructor options.
          * @api
          */
         class Cluster extends ol.source.Vector {
@@ -6955,24 +8176,28 @@ declare module ol {
              * geometries. For other geometry types, or if not all geometries should be
              * considered for clustering, a custom `geometryFunction` can be defined.
              *
+             * @param options Constructor options.
              * @api
              */
             constructor(options: olx.source.ClusterOptions);
 
             /**
              * Get a reference to the wrapped source.
+             * @return Source.
              * @api
              */
             getSource(): ol.source.Vector;
 
             /**
              * Get the distance in pixels between clusters.
+             * @return The distance in pixels.
              * @api
              */
             getDistance(): number;
 
             /**
              * Set the distance in pixels between clusters.
+             * @param distance The distance in pixels.
              * @api
              */
             setDistance(distance: number): void;
@@ -6984,6 +8209,7 @@ declare module ol {
          * instantiated in apps.
          * Base class for sources providing a single image.
          *
+         * @param options Single image source options.
          * @api
          */
         class Image extends ol.source.Source {
@@ -6993,6 +8219,7 @@ declare module ol {
              * instantiated in apps.
              * Base class for sources providing a single image.
              *
+             * @param options Single image source options.
              * @api
              */
             constructor(options: ol.SourceImageOptions);
@@ -7003,6 +8230,8 @@ declare module ol {
          * Events emitted by {@link ol.source.Image} instances are instances of this
          * type.
          *
+         * @param type Type.
+         * @param image The image.
          */
         class ImageEvent extends ol.events.Event {
             /**
@@ -7010,6 +8239,8 @@ declare module ol {
              * Events emitted by {@link ol.source.Image} instances are instances of this
              * type.
              *
+             * @param type Type.
+             * @param image The image.
              */
             constructor(type: string, image: ol.Image);
 
@@ -7030,6 +8261,7 @@ declare module ol {
          * {@link ol.source.TileArcGISRest} data source.
          *
          * @fires ol.source.ImageEvent
+         * @param opt_options Image ArcGIS Rest Options.
          * @api
          */
         class ImageArcGISRest extends ol.source.Image {
@@ -7043,6 +8275,7 @@ declare module ol {
              * {@link ol.source.TileArcGISRest} data source.
              *
              * @fires ol.source.ImageEvent
+             * @param opt_options Image ArcGIS Rest Options.
              * @api
              */
             constructor(opt_options?: olx.source.ImageArcGISRestOptions);
@@ -7050,36 +8283,42 @@ declare module ol {
             /**
              * Get the user-provided params, i.e. those passed to the constructor through
              * the "params" option, and possibly updated using the updateParams method.
+             * @return Params.
              * @api stable
              */
             getParams(): GlobalObject;
 
             /**
              * Return the image load function of the source.
+             * @return The image load function.
              * @api
              */
             getImageLoadFunction(): ol.ImageLoadFunctionType;
 
             /**
              * Return the URL used for this ArcGIS source.
+             * @return URL.
              * @api stable
              */
             getUrl(): (string);
 
             /**
              * Set the image load function of the source.
+             * @param imageLoadFunction Image load function.
              * @api
              */
             setImageLoadFunction(imageLoadFunction: ol.ImageLoadFunctionType): void;
 
             /**
              * Set the URL to use for requests.
+             * @param url URL.
              * @api stable
              */
             setUrl(url: (string)): void;
 
             /**
              * Update the user-provided params.
+             * @param params Params.
              * @api stable
              */
             updateParams(params: GlobalObject): void;
@@ -7089,6 +8328,7 @@ declare module ol {
          * @classdesc
          * Base class for image sources where a canvas element is the image.
          *
+         * @param options Constructor options.
          * @api
          */
         class ImageCanvas extends ol.source.Image {
@@ -7096,6 +8336,7 @@ declare module ol {
              * @classdesc
              * Base class for image sources where a canvas element is the image.
              *
+             * @param options Constructor options.
              * @api
              */
             constructor(options: olx.source.ImageCanvasOptions);
@@ -7106,6 +8347,7 @@ declare module ol {
          * Source for images from Mapguide servers
          *
          * @fires ol.source.ImageEvent
+         * @param options Options.
          * @api stable
          */
         class ImageMapGuide extends ol.source.Image {
@@ -7114,6 +8356,7 @@ declare module ol {
              * Source for images from Mapguide servers
              *
              * @fires ol.source.ImageEvent
+             * @param options Options.
              * @api stable
              */
             constructor(options: olx.source.ImageMapGuideOptions);
@@ -7121,24 +8364,28 @@ declare module ol {
             /**
              * Get the user-provided params, i.e. those passed to the constructor through
              * the "params" option, and possibly updated using the updateParams method.
+             * @return Params.
              * @api stable
              */
             getParams(): GlobalObject;
 
             /**
              * Return the image load function of the source.
+             * @return The image load function.
              * @api
              */
             getImageLoadFunction(): ol.ImageLoadFunctionType;
 
             /**
              * Update the user-provided params.
+             * @param params Params.
              * @api stable
              */
             updateParams(params: GlobalObject): void;
 
             /**
              * Set the image load function of the MapGuide source.
+             * @param imageLoadFunction Image load function.
              * @api
              */
             setImageLoadFunction(imageLoadFunction: ol.ImageLoadFunctionType): void;
@@ -7148,6 +8395,7 @@ declare module ol {
          * @classdesc
          * A layer source for displaying a single, static image.
          *
+         * @param options Options.
          * @api stable
          */
         class ImageStatic extends ol.source.Image {
@@ -7155,6 +8403,7 @@ declare module ol {
              * @classdesc
              * A layer source for displaying a single, static image.
              *
+             * @param options Options.
              * @api stable
              */
             constructor(options: olx.source.ImageStaticOptions);
@@ -7172,6 +8421,7 @@ declare module ol {
          * vector layer, where vector features are re-drawn during animations and
          * interactions.
          *
+         * @param options Options.
          * @api
          */
         class ImageVector extends ol.source.ImageCanvas {
@@ -7187,12 +8437,14 @@ declare module ol {
              * vector layer, where vector features are re-drawn during animations and
              * interactions.
              *
+             * @param options Options.
              * @api
              */
             constructor(options: olx.source.ImageVectorOptions);
 
             /**
              * Get a reference to the wrapped source.
+             * @return Source.
              * @api
              */
             getSource(): ol.source.Vector;
@@ -7200,13 +8452,14 @@ declare module ol {
             /**
              * Get the style for features.  This returns whatever was passed to the `style`
              * option at construction or to the `setStyle` method.
-             *     Layer style.
+             * @return Layer style.
              * @api stable
              */
             getStyle(): (ol.style.Style | ol.style.Style[] | ol.StyleFunction);
 
             /**
              * Get the style function.
+             * @return Layer style function.
              * @api stable
              */
             getStyleFunction(): (ol.StyleFunction);
@@ -7218,7 +8471,7 @@ declare module ol {
              * it is `null` the layer has no style (a `null` style), so only features
              * that have their own styles will be rendered in the layer. See
              * {@link ol.style} for information on the default style.
-             *     style Layer style.
+             * @param style Layer style.
              * @api stable
              */
             setStyle(style: (ol.style.Style | ol.style.Style[] | ol.StyleFunction)): void;
@@ -7229,6 +8482,7 @@ declare module ol {
          * Source for WMS servers providing single, untiled images.
          *
          * @fires ol.source.ImageEvent
+         * @param opt_options Options.
          * @api stable
          */
         class ImageWMS extends ol.source.Image {
@@ -7237,6 +8491,7 @@ declare module ol {
              * Source for WMS servers providing single, untiled images.
              *
              * @fires ol.source.ImageEvent
+             * @param opt_options Options.
              * @api stable
              */
             constructor(opt_options?: olx.source.ImageWMSOptions);
@@ -7245,9 +8500,14 @@ declare module ol {
              * Return the GetFeatureInfo URL for the passed coordinate, resolution, and
              * projection. Return `undefined` if the GetFeatureInfo URL cannot be
              * constructed.
+             * @param coordinate Coordinate.
+             * @param resolution Resolution.
+             * @param projection Projection.
+             * @param params GetFeatureInfo params. `INFO_FORMAT` at least should
              *     be provided. If `QUERY_LAYERS` is not provided then the layers specified
              *     in the `LAYERS` parameter will be used. `VERSION` should not be
              *     specified here.
+             * @return GetFeatureInfo URL.
              * @api stable
              */
             getGetFeatureInfoUrl(coordinate: ol.Coordinate, resolution: number, projection: ol.ProjectionLike, params: GlobalObject): (string);
@@ -7255,36 +8515,42 @@ declare module ol {
             /**
              * Get the user-provided params, i.e. those passed to the constructor through
              * the "params" option, and possibly updated using the updateParams method.
+             * @return Params.
              * @api stable
              */
             getParams(): GlobalObject;
 
             /**
              * Return the image load function of the source.
+             * @return The image load function.
              * @api
              */
             getImageLoadFunction(): ol.ImageLoadFunctionType;
 
             /**
              * Return the URL used for this WMS source.
+             * @return URL.
              * @api stable
              */
             getUrl(): (string);
 
             /**
              * Set the image load function of the source.
+             * @param imageLoadFunction Image load function.
              * @api
              */
             setImageLoadFunction(imageLoadFunction: ol.ImageLoadFunctionType): void;
 
             /**
              * Set the URL to use for requests.
+             * @param url URL.
              * @api stable
              */
             setUrl(url: (string)): void;
 
             /**
              * Update the user-provided params.
+             * @param params Params.
              * @api stable
              */
             updateParams(params: GlobalObject): void;
@@ -7294,6 +8560,7 @@ declare module ol {
          * @classdesc
          * Layer source for the OpenStreetMap tile server.
          *
+         * @param opt_options Open Street Map options.
          * @api stable
          */
         class OSM extends ol.source.XYZ {
@@ -7301,6 +8568,7 @@ declare module ol {
              * @classdesc
              * Layer source for the OpenStreetMap tile server.
              *
+             * @param opt_options Open Street Map options.
              * @api stable
              */
             constructor(opt_options?: olx.source.OSMOptions);
@@ -7321,6 +8589,7 @@ declare module ol {
          * output pixel values.
          *
          * @fires ol.source.RasterEvent
+         * @param options Options.
          * @api
          */
         class Raster extends ol.source.Image {
@@ -7331,12 +8600,15 @@ declare module ol {
              * output pixel values.
              *
              * @fires ol.source.RasterEvent
+             * @param options Options.
              * @api
              */
             constructor(options: olx.source.RasterOptions);
 
             /**
              * Set the operation.
+             * @param operation New operation.
+             * @param opt_lib Functions that will be available to operations run
              *     in a worker.
              * @api
              */
@@ -7348,6 +8620,9 @@ declare module ol {
          * Events emitted by {@link ol.source.Raster} instances are instances of this
          * type.
          *
+         * @param type Type.
+         * @param frameState The frame state.
+         * @param data An object made available to operations.
          */
         class RasterEvent extends ol.events.Event {
             /**
@@ -7355,6 +8630,9 @@ declare module ol {
              * Events emitted by {@link ol.source.Raster} instances are instances of this
              * type.
              *
+             * @param type Type.
+             * @param frameState The frame state.
+             * @param data An object made available to operations.
              */
             constructor(type: string, frameState: olx.FrameState, data: GlobalObject);
 
@@ -7391,6 +8669,7 @@ declare module ol {
          *
          * A generic `change` event is triggered when the state of the source changes.
          *
+         * @param options Source options.
          * @api stable
          */
         class Source extends ol.Object {
@@ -7402,30 +8681,35 @@ declare module ol {
              *
              * A generic `change` event is triggered when the state of the source changes.
              *
+             * @param options Source options.
              * @api stable
              */
             constructor(options: ol.SourceSourceOptions);
 
             /**
              * Get the attributions of the source.
+             * @return Attributions.
              * @api stable
              */
             getAttributions(): ol.Attribution[];
 
             /**
              * Get the logo of the source.
+             * @return Logo.
              * @api stable
              */
             getLogo(): (string | olx.LogoOptions);
 
             /**
              * Get the projection of the source.
+             * @return Projection.
              * @api
              */
             getProjection(): ol.proj.Projection;
 
             /**
              * Get the state of the source, see {@link ol.source.State} for possible states.
+             * @return State.
              * @api
              */
             getState(): ol.source.State;
@@ -7438,6 +8722,7 @@ declare module ol {
 
             /**
              * Set the attributions of the source.
+             * @param attributions Attributions.
              *     Can be passed as `string`, `Array<string>`, `{@link ol.Attribution}`,
              *     `Array<{@link ol.Attribution}>` or `undefined`.
              * @api
@@ -7449,6 +8734,7 @@ declare module ol {
          * @classdesc
          * Layer source for the Stamen tile server.
          *
+         * @param options Stamen options.
          * @api stable
          */
         class Stamen extends ol.source.XYZ {
@@ -7456,6 +8742,7 @@ declare module ol {
              * @classdesc
              * Layer source for the Stamen tile server.
              *
+             * @param options Stamen options.
              * @api stable
              */
             constructor(options: olx.source.StamenOptions);
@@ -7467,6 +8754,7 @@ declare module ol {
          * instantiated in apps.
          * Base class for sources providing images divided into a tile grid.
          *
+         * @param options Tile source options.
          * @api
          */
         class Tile extends ol.source.Source {
@@ -7476,12 +8764,14 @@ declare module ol {
              * instantiated in apps.
              * Base class for sources providing images divided into a tile grid.
              *
+             * @param options Tile source options.
              * @api
              */
             constructor(options: ol.SourceTileOptions);
 
             /**
              * Return the tile grid of the tile source.
+             * @return Tile grid.
              * @api stable
              */
             getTileGrid(): ol.tilegrid.TileGrid;
@@ -7492,6 +8782,8 @@ declare module ol {
          * Events emitted by {@link ol.source.Tile} instances are instances of this
          * type.
          *
+         * @param type Type.
+         * @param tile The tile.
          */
         class TileEvent extends ol.events.Event {
             /**
@@ -7499,6 +8791,8 @@ declare module ol {
              * Events emitted by {@link ol.source.Tile} instances are instances of this
              * type.
              *
+             * @param type Type.
+             * @param tile The tile.
              */
             constructor(type: string, tile: ol.Tile);
 
@@ -7517,6 +8811,7 @@ declare module ol {
          * For cached ArcGIS services, better performance is available using the
          * {@link ol.source.XYZ} data source.
          *
+         * @param opt_options Tile ArcGIS Rest
          *     options.
          * @api
          */
@@ -7529,6 +8824,7 @@ declare module ol {
              * For cached ArcGIS services, better performance is available using the
              * {@link ol.source.XYZ} data source.
              *
+             * @param opt_options Tile ArcGIS Rest
              *     options.
              * @api
              */
@@ -7537,12 +8833,14 @@ declare module ol {
             /**
              * Get the user-provided params, i.e. those passed to the constructor through
              * the "params" option, and possibly updated using the updateParams method.
+             * @return Params.
              * @api
              */
             getParams(): GlobalObject;
 
             /**
              * Update the user-provided params.
+             * @param params Params.
              * @api stable
              */
             updateParams(params: GlobalObject): void;
@@ -7556,6 +8854,7 @@ declare module ol {
          *
          * Uses Canvas context2d, so requires Canvas support.
          *
+         * @param options Debug tile options.
          * @api
          */
         class TileDebug extends ol.source.Tile {
@@ -7567,6 +8866,7 @@ declare module ol {
              *
              * Uses Canvas context2d, so requires Canvas support.
              *
+             * @param options Debug tile options.
              * @api
              */
             constructor(options: olx.source.TileDebugOptions);
@@ -7577,6 +8877,7 @@ declare module ol {
          * Base class for sources providing images divided into a tile grid.
          *
          * @fires ol.source.TileEvent
+         * @param options Image tile options.
          * @api
          */
         class TileImage extends ol.source.UrlTile {
@@ -7585,12 +8886,14 @@ declare module ol {
              * Base class for sources providing images divided into a tile grid.
              *
              * @fires ol.source.TileEvent
+             * @param options Image tile options.
              * @api
              */
             constructor(options: olx.source.TileImageOptions);
 
             /**
              * Sets whether to render reprojection edges or not (usually for debugging).
+             * @param render Render the edges.
              * @api
              */
             setRenderReprojectionEdges(render: boolean): void;
@@ -7603,6 +8906,8 @@ declare module ol {
              * (e.g. projection has no extent defined) or
              * for optimization reasons (custom tile size, resolutions, ...).
              *
+             * @param projection Projection.
+             * @param tilegrid Tile grid to use for the projection.
              * @api
              */
             setTileGridForProjection(projection: ol.ProjectionLike, tilegrid: ol.tilegrid.TileGrid): void;
@@ -7612,6 +8917,7 @@ declare module ol {
          * @classdesc
          * Layer source for tile data in TileJSON format.
          *
+         * @param options TileJSON options.
          * @api stable
          */
         class TileJSON extends ol.source.TileImage {
@@ -7619,11 +8925,13 @@ declare module ol {
              * @classdesc
              * Layer source for tile data in TileJSON format.
              *
+             * @param options TileJSON options.
              * @api stable
              */
             constructor(options: olx.source.TileJSONOptions);
 
             /**
+             * @return The tilejson object.
              * @api
              */
             getTileJSON(): TileJSON;
@@ -7633,6 +8941,7 @@ declare module ol {
          * @classdesc
          * Layer source for UTFGrid interaction data loaded from TileJSON format.
          *
+         * @param options Source options.
          * @api
          */
         class TileUTFGrid extends ol.source.Tile {
@@ -7640,12 +8949,14 @@ declare module ol {
              * @classdesc
              * Layer source for UTFGrid interaction data loaded from TileJSON format.
              *
+             * @param options Source options.
              * @api
              */
             constructor(options: olx.source.TileUTFGridOptions);
 
             /**
              * Return the template from TileJSON.
+             * @return The template from TileJSON.
              * @api
              */
             getTemplate(): (string);
@@ -7654,6 +8965,11 @@ declare module ol {
              * Calls the callback (synchronously by default) with the available data
              * for given coordinate and resolution (or `null` if not yet loaded or
              * in case of an error).
+             * @param coordinate Coordinate.
+             * @param resolution Resolution.
+             * @param callback Callback.
+             * @param opt_this The object to use as `this` in the callback.
+             * @param opt_request If `true` the callback is always async.
              *                               The tile data is requested if not yet loaded.
              * @template T
              * @api
@@ -7665,6 +8981,7 @@ declare module ol {
          * @classdesc
          * Layer source for tile data from WMS servers.
          *
+         * @param opt_options Tile WMS options.
          * @api stable
          */
         class TileWMS extends ol.source.TileImage {
@@ -7672,6 +8989,7 @@ declare module ol {
              * @classdesc
              * Layer source for tile data from WMS servers.
              *
+             * @param opt_options Tile WMS options.
              * @api stable
              */
             constructor(opt_options?: olx.source.TileWMSOptions);
@@ -7680,9 +8998,14 @@ declare module ol {
              * Return the GetFeatureInfo URL for the passed coordinate, resolution, and
              * projection. Return `undefined` if the GetFeatureInfo URL cannot be
              * constructed.
+             * @param coordinate Coordinate.
+             * @param resolution Resolution.
+             * @param projection Projection.
+             * @param params GetFeatureInfo params. `INFO_FORMAT` at least should
              *     be provided. If `QUERY_LAYERS` is not provided then the layers specified
              *     in the `LAYERS` parameter will be used. `VERSION` should not be
              *     specified here.
+             * @return GetFeatureInfo URL.
              * @api stable
              */
             getGetFeatureInfoUrl(coordinate: ol.Coordinate, resolution: number, projection: ol.ProjectionLike, params: GlobalObject): (string);
@@ -7690,12 +9013,14 @@ declare module ol {
             /**
              * Get the user-provided params, i.e. those passed to the constructor through
              * the "params" option, and possibly updated using the updateParams method.
+             * @return Params.
              * @api stable
              */
             getParams(): GlobalObject;
 
             /**
              * Update the user-provided params.
+             * @param params Params.
              * @api stable
              */
             updateParams(params: GlobalObject): void;
@@ -7706,6 +9031,7 @@ declare module ol {
          * Base class for sources providing tiles divided into a tile grid over http.
          *
          * @fires ol.source.TileEvent
+         * @param options Image tile options.
          */
         class UrlTile extends ol.source.Tile {
             /**
@@ -7713,17 +9039,20 @@ declare module ol {
              * Base class for sources providing tiles divided into a tile grid over http.
              *
              * @fires ol.source.TileEvent
+             * @param options Image tile options.
              */
             constructor(options: ol.SourceUrlTileOptions);
 
             /**
              * Return the tile load function of the source.
+             * @return TileLoadFunction
              * @api
              */
             getTileLoadFunction(): ol.TileLoadFunctionType;
 
             /**
              * Return the tile URL function of the source.
+             * @return TileUrlFunction
              * @api
              */
             getTileUrlFunction(): ol.TileUrlFunctionType;
@@ -7732,30 +9061,36 @@ declare module ol {
              * Return the URLs used for this source.
              * When a tileUrlFunction is used instead of url or urls,
              * null will be returned.
+             * @return URLs.
              * @api
              */
             getUrls(): (string[]);
 
             /**
              * Set the tile load function of the source.
+             * @param tileLoadFunction Tile load function.
              * @api
              */
             setTileLoadFunction(tileLoadFunction: ol.TileLoadFunctionType): void;
 
             /**
              * Set the tile URL function of the source.
+             * @param tileUrlFunction Tile URL function.
+             * @param opt_key Optional new tile key for the source.
              * @api
              */
             setTileUrlFunction(tileUrlFunction: ol.TileUrlFunctionType, opt_key?: string): void;
 
             /**
              * Set the URL to use for requests.
+             * @param url URL.
              * @api stable
              */
             setUrl(url: string): void;
 
             /**
              * Set the URLs to use for requests.
+             * @param urls URLs.
              * @api stable
              */
             setUrls(urls: string[]): void;
@@ -7768,6 +9103,7 @@ declare module ol {
          * vector data that is optimized for rendering.
          *
          * @fires ol.source.VectorEvent
+         * @param opt_options Vector source options.
          * @api stable
          */
         class Vector extends ol.source.Source {
@@ -7778,6 +9114,7 @@ declare module ol {
              * vector data that is optimized for rendering.
              *
              * @fires ol.source.VectorEvent
+             * @param opt_options Vector source options.
              * @api stable
              */
             constructor(opt_options?: olx.source.VectorOptions);
@@ -7786,18 +9123,21 @@ declare module ol {
              * Add a single feature to the source.  If you want to add a batch of features
              * at once, call {@link ol.source.Vector#addFeatures source.addFeatures()}
              * instead.
+             * @param feature Feature to add.
              * @api stable
              */
             addFeature(feature: ol.Feature): void;
 
             /**
              * Add a batch of features to the source.
+             * @param features Features to add.
              * @api stable
              */
             addFeatures(features: ol.Feature[]): void;
 
             /**
              * Remove all features from the source.
+             * @param events.
              * @api stable
              */
             clear(opt_fast?: boolean): void;
@@ -7807,7 +9147,10 @@ declare module ol {
              * with each one.  If the callback returns any "truthy" value, iteration will
              * stop and the function will return the same value.
              *
+             * @param callback Called with each feature
              *     on the source.  Return a truthy value to stop iteration.
+             * @param opt_this The object to use as `this` in the callback.
+             * @return The return value from the last call to the callback.
              * @template T,S
              * @api stable
              */
@@ -7826,7 +9169,11 @@ declare module ol {
              * When `useSpatialIndex` is set to false, this method will loop through all
              * features, equivalent to {@link ol.source.Vector#forEachFeature}.
              *
+             * @param extent Extent.
+             * @param callback Called with each feature
              *     whose bounding box intersects the provided extent.
+             * @param opt_this The object to use as `this` in the callback.
+             * @return The return value from the last call to the callback.
              * @template T,S
              * @api
              */
@@ -7841,7 +9188,11 @@ declare module ol {
              * {@link ol.source.Vector#forEachFeatureInExtent
              * source.forEachFeatureInExtent()} method instead.
              *
+             * @param extent Extent.
+             * @param callback Called with each feature
              *     whose geometry intersects the provided extent.
+             * @param opt_this The object to use as `this` in the callback.
+             * @return The return value from the last call to the callback.
              * @template T,S
              * @api
              */
@@ -7851,18 +9202,22 @@ declare module ol {
              * Get the features collection associated with this source. Will be `null`
              * unless the source was configured with `useSpatialIndex` set to `false`, or
              * with an {@link ol.Collection} as `features`.
+             * @return The collection of features.
              * @api
              */
             getFeaturesCollection(): ol.Collection<ol.Feature>;
 
             /**
              * Get all features on the source.
+             * @return Features.
              * @api stable
              */
             getFeatures(): ol.Feature[];
 
             /**
              * Get all features whose geometry intersects the provided coordinate.
+             * @param coordinate Coordinate.
+             * @return Features.
              * @api stable
              */
             getFeaturesAtCoordinate(coordinate: ol.Coordinate): ol.Feature[];
@@ -7874,6 +9229,8 @@ declare module ol {
              *
              * This method is not available when the source is configured with
              * `useSpatialIndex` set to `false`.
+             * @param extent Extent.
+             * @return Features.
              * @api
              */
             getFeaturesInExtent(extent: ol.Extent): ol.Feature[];
@@ -7883,8 +9240,11 @@ declare module ol {
              *
              * This method is not available when the source is configured with
              * `useSpatialIndex` set to `false`.
+             * @param coordinate Coordinate.
+             * @param opt_filter Feature filter function.
              *     The filter function will receive one argument, the {@link ol.Feature feature}
              *     and it should return a boolean value. By default, no filtering is made.
+             * @return Closest feature.
              * @api stable
              */
             getClosestFeatureToCoordinate(coordinate: ol.Coordinate, opt_filter?: ((feature: ol.Feature) => boolean)): ol.Feature;
@@ -7894,6 +9254,7 @@ declare module ol {
              *
              * This method is not available when the source is configured with
              * `useSpatialIndex` set to `false`.
+             * @return Extent.
              * @api stable
              */
             getExtent(): ol.Extent;
@@ -7903,6 +9264,8 @@ declare module ol {
              * Note that the index treats string and numeric identifiers as the same.  So
              * `source.getFeatureById(2)` will return a feature with id `'2'` or `2`.
              *
+             * @param id Feature identifier.
+             * @return The feature (or `null` if not found).
              * @api stable
              */
             getFeatureById(id: (string | number)): ol.Feature;
@@ -7910,6 +9273,7 @@ declare module ol {
             /**
              * Get the format associated with this source.
              *
+             * @return The feature format.
              * @api
              */
             getFormat(): (ol.format.Feature);
@@ -7917,6 +9281,7 @@ declare module ol {
             /**
              * Get the url associated with this source.
              *
+             * @return The url.
              * @api
              */
             getUrl(): (string | ol.FeatureUrlFunction);
@@ -7925,6 +9290,7 @@ declare module ol {
              * Remove a single feature from the source.  If you want to remove all features
              * at once, use the {@link ol.source.Vector#clear source.clear()} method
              * instead.
+             * @param feature Feature to remove.
              * @api stable
              */
             removeFeature(feature: ol.Feature): void;
@@ -7935,6 +9301,8 @@ declare module ol {
          * Events emitted by {@link ol.source.Vector} instances are instances of this
          * type.
          *
+         * @param type Type.
+         * @param opt_feature Feature.
          */
         class VectorEvent extends ol.events.Event {
             /**
@@ -7942,6 +9310,8 @@ declare module ol {
              * Events emitted by {@link ol.source.Vector} instances are instances of this
              * type.
              *
+             * @param type Type.
+             * @param opt_feature Feature.
              */
             constructor(type: string, opt_feature?: ol.Feature);
 
@@ -7963,6 +9333,7 @@ declare module ol {
          * editing.
          *
          * @fires ol.source.TileEvent
+         * @param options Vector tile options.
          * @api
          */
         class VectorTile extends ol.source.UrlTile {
@@ -7977,6 +9348,7 @@ declare module ol {
              * editing.
              *
              * @fires ol.source.TileEvent
+             * @param options Vector tile options.
              * @api
              */
             constructor(options: olx.source.VectorTileOptions);
@@ -8000,6 +9372,7 @@ declare module ol {
          * @classdesc
          * Layer source for tile data from WMTS servers.
          *
+         * @param options WMTS options.
          * @api stable
          */
         class WMTS extends ol.source.TileImage {
@@ -8007,6 +9380,7 @@ declare module ol {
              * @classdesc
              * Layer source for tile data from WMTS servers.
              *
+             * @param options WMTS options.
              * @api stable
              */
             constructor(options: olx.source.WMTSOptions);
@@ -8015,54 +9389,64 @@ declare module ol {
              * Get the dimensions, i.e. those passed to the constructor through the
              * "dimensions" option, and possibly updated using the updateDimensions
              * method.
+             * @return Dimensions.
              * @api
              */
             getDimensions(): GlobalObject;
 
             /**
              * Return the image format of the WMTS source.
+             * @return Format.
              * @api
              */
             getFormat(): string;
 
             /**
              * Return the layer of the WMTS source.
+             * @return Layer.
              * @api
              */
             getLayer(): string;
 
             /**
              * Return the matrix set of the WMTS source.
+             * @return MatrixSet.
              * @api
              */
             getMatrixSet(): string;
 
             /**
              * Return the request encoding, either "KVP" or "REST".
+             * @return Request encoding.
              * @api
              */
             getRequestEncoding(): ol.source.WMTSRequestEncoding;
 
             /**
              * Return the style of the WMTS source.
+             * @return Style.
              * @api
              */
             getStyle(): string;
 
             /**
              * Return the version of the WMTS source.
+             * @return Version.
              * @api
              */
             getVersion(): string;
 
             /**
              * Update the dimensions.
+             * @param dimensions Dimensions.
              * @api
              */
             updateDimensions(dimensions: GlobalObject): void;
 
             /**
              * Generate source options from a capabilities object.
+             * @param wmtsCap An object representing the capabilities document.
+             * @param config Configuration properties for the layer.  Defaults for
              *                  the layer will apply if not provided.
              *
              * Required config properties:
@@ -8079,6 +9463,7 @@ declare module ol {
              *  - style - {string} The name of the style
              *  - format - {string} Image format for the layer. Default is the first
              *       format returned in the GetCapabilities response.
+             * @return WMTS source options object.
              * @api
              */
             static optionsFromCapabilities(wmtsCap: GlobalObject, config: GlobalObject): olx.source.WMTSOptions;
@@ -8101,6 +9486,7 @@ declare module ol {
          *    }
          *
          *
+         * @param opt_options XYZ options.
          * @api stable
          */
         class XYZ extends ol.source.TileImage {
@@ -8121,6 +9507,7 @@ declare module ol {
              *    }
              *
              *
+             * @param opt_options XYZ options.
              * @api stable
              */
             constructor(opt_options?: olx.source.XYZOptions);
@@ -8130,6 +9517,7 @@ declare module ol {
          * @classdesc
          * Layer source for tile data in Zoomify format.
          *
+         * @param opt_options Options.
          * @api stable
          */
         class Zoomify extends ol.source.TileImage {
@@ -8137,6 +9525,7 @@ declare module ol {
              * @classdesc
              * Layer source for tile data in Zoomify format.
              *
+             * @param opt_options Options.
              * @api stable
              */
             constructor(opt_options?: olx.source.ZoomifyOptions);
@@ -8174,6 +9563,7 @@ declare module ol {
      * var wgs84Sphere= new ol.Sphere(6378137);
      * ```
      *
+     * @param radius Radius.
      * @api
      */
     class Sphere {
@@ -8189,6 +9579,7 @@ declare module ol {
          * var wgs84Sphere= new ol.Sphere(6378137);
          * ```
          *
+         * @param radius Radius.
          * @api
          */
         constructor(radius: number);
@@ -8201,8 +9592,10 @@ declare module ol {
          * Polygons on a Sphere", JPL Publication 07-03, Jet Propulsion
          * Laboratory, Pasadena, CA, June 2007
          *
+         * @param coordinates List of coordinates of a linear
          * ring. If the ring is oriented clockwise, the area will be positive,
          * otherwise it will be negative.
+         * @return Area.
          * @api
          */
         geodesicArea(coordinates: ol.Coordinate[]): number;
@@ -8210,6 +9603,9 @@ declare module ol {
         /**
          * Returns the distance from c1 to c2 using the haversine formula.
          *
+         * @param c1 Coordinate 1.
+         * @param c2 Coordinate 2.
+         * @return Haversine distance.
          * @api
          */
         haversineDistance(c1: ol.Coordinate, c2: ol.Coordinate): number;
@@ -8217,8 +9613,11 @@ declare module ol {
         /**
          * Get the spherical area of a geometry.  This is the area (in meters) assuming
          * that polygon edges are segments of great circles on a sphere.
+         * @param geometry A geometry.
+         * @param opt_options Options for the area
          *     calculation.  By default, geometries are assumed to be in 'EPSG:3857'.
          *     You can change this by providing a `projection` option.
+         * @return The spherical area (in square meters).
          * @api
          */
         static getArea(geometry: geom.Geometry, opt_options?: SphereMetricOptions): number;
@@ -8228,8 +9627,11 @@ declare module ol {
          * great circle distances between coordinates.  For polygons, the length is
          * the sum of all rings.  For points, the length is zero.  For multi-part
          * geometries, the length is the sum of the length of each part.
+         * @param geometry A geometry.
+         * @param opt_options Options for the length
          *     calculation.  By default, geometries are assumed to be in 'EPSG:3857'.
          *     You can change this by providing a `projection` option.
+         * @return The spherical length (in meters).
          * @api
          */
         static getLength(geometry: geom.Geometry, opt_options?: SphereMetricOptions): number;
@@ -8312,6 +9714,7 @@ declare module ol {
      *          styles[ol.geom.GeometryType.POINT]
      *      );
      * ```
+     *
      */
     module style {
         /**
@@ -8328,6 +9731,7 @@ declare module ol {
          *
          * @struct
          * @api
+         * @param opt_options Options.
          */
         class AtlasManager {
             /**
@@ -8344,6 +9748,7 @@ declare module ol {
              *
              * @struct
              * @api
+             * @param opt_options Options.
              */
             constructor(opt_options?: olx.style.AtlasManagerOptions);
         }
@@ -8352,6 +9757,7 @@ declare module ol {
          * @classdesc
          * Set circle style for vector features.
          *
+         * @param opt_options Options.
          * @api
          */
         class Circle extends ol.style.Image {
@@ -8359,30 +9765,36 @@ declare module ol {
              * @classdesc
              * Set circle style for vector features.
              *
+             * @param opt_options Options.
              * @api
              */
             constructor(opt_options?: olx.style.CircleOptions);
 
             /**
              * Get the fill style for the circle.
+             * @return Fill style.
              * @api
              */
             getFill(): ol.style.Fill;
 
             /**
              * Get the image used to render the circle.
+             * @param pixelRatio Pixel ratio.
+             * @return Canvas element.
              * @api
              */
             getImage(pixelRatio: number): HTMLCanvasElement;
 
             /**
              * Get the circle radius.
+             * @return Radius.
              * @api
              */
             getRadius(): number;
 
             /**
              * Get the stroke style for the circle.
+             * @return Stroke style.
              * @api
              */
             getStroke(): ol.style.Stroke;
@@ -8390,6 +9802,7 @@ declare module ol {
             /**
              * Set the circle radius.
              *
+             * @param radius Circle radius.
              * @api
              */
             setRadius(radius: number): void;
@@ -8399,6 +9812,7 @@ declare module ol {
          * @classdesc
          * Set fill style for vector features.
          *
+         * @param opt_options Options.
          * @api
          */
         class Fill {
@@ -8406,12 +9820,14 @@ declare module ol {
              * @classdesc
              * Set fill style for vector features.
              *
+             * @param opt_options Options.
              * @api
              */
             constructor(opt_options?: olx.style.FillOptions);
 
             /**
              * Get the fill color.
+             * @return Color.
              * @api
              */
             getColor(): (ol.Color | ol.ColorLike);
@@ -8419,6 +9835,7 @@ declare module ol {
             /**
              * Set the color.
              *
+             * @param color Color.
              * @api
              */
             setColor(color: (ol.Color | ol.ColorLike)): void;
@@ -8438,6 +9855,7 @@ declare module ol {
          * @classdesc
          * Set icon style for vector features.
          *
+         * @param opt_options Options.
          * @api
          */
         class Icon extends ol.style.Image {
@@ -8445,6 +9863,7 @@ declare module ol {
              * @classdesc
              * Set icon style for vector features.
              *
+             * @param opt_options Options.
              * @api
              */
             constructor(opt_options?: olx.style.IconOptions);
@@ -8457,6 +9876,8 @@ declare module ol {
 
             /**
              * Get the image icon.
+             * @param pixelRatio Pixel ratio.
+             * @return Image or Canvas element.
              * @api
              */
             getImage(pixelRatio: number): (Image | HTMLCanvasElement);
@@ -8469,6 +9890,7 @@ declare module ol {
 
             /**
              * Get the image URL.
+             * @return Image src.
              * @api
              */
             getSrc(): (string);
@@ -8495,6 +9917,7 @@ declare module ol {
          * apps. Base class for {@link ol.style.Icon}, {@link ol.style.Circle} and
          * {@link ol.style.RegularShape}.
          *
+         * @param options Options.
          * @api
          */
         class Image {
@@ -8504,36 +9927,42 @@ declare module ol {
              * apps. Base class for {@link ol.style.Icon}, {@link ol.style.Circle} and
              * {@link ol.style.RegularShape}.
              *
+             * @param options Options.
              * @api
              */
             constructor(options: ol.StyleImageOptions);
 
             /**
              * Get the symbolizer opacity.
+             * @return Opacity.
              * @api
              */
             getOpacity(): number;
 
             /**
              * Determine whether the symbolizer rotates with the map.
+             * @return Rotate with map.
              * @api
              */
             getRotateWithView(): boolean;
 
             /**
              * Get the symoblizer rotation.
+             * @return Rotation.
              * @api
              */
             getRotation(): number;
 
             /**
              * Get the symbolizer scale.
+             * @return Scale.
              * @api
              */
             getScale(): number;
 
             /**
              * Determine whether the symbolizer should be snapped to a pixel.
+             * @return The symbolizer should snap to a pixel.
              * @api
              */
             getSnapToPixel(): boolean;
@@ -8541,6 +9970,7 @@ declare module ol {
             /**
              * Set the opacity.
              *
+             * @param opacity Opacity.
              * @api
              */
             setOpacity(opacity: number): void;
@@ -8548,6 +9978,7 @@ declare module ol {
             /**
              * Set the rotation.
              *
+             * @param rotation Rotation.
              * @api
              */
             setRotation(rotation: number): void;
@@ -8555,6 +9986,7 @@ declare module ol {
             /**
              * Set the scale.
              *
+             * @param scale Scale.
              * @api
              */
             setScale(scale: number): void;
@@ -8566,6 +9998,7 @@ declare module ol {
          * a regular polygon when `radius` is provided, or a star when `radius1` and
          * `radius2` are provided.
          *
+         * @param options Options.
          * @api
          */
         class RegularShape extends ol.style.Image {
@@ -8575,6 +10008,7 @@ declare module ol {
              * a regular polygon when `radius` is provided, or a star when `radius1` and
              * `radius2` are provided.
              *
+             * @param options Options.
              * @api
              */
             constructor(options: olx.style.RegularShapeOptions);
@@ -8587,12 +10021,14 @@ declare module ol {
 
             /**
              * Get the angle used in generating the shape.
+             * @return Shape's rotation in radians.
              * @api
              */
             getAngle(): number;
 
             /**
              * Get the fill style for the shape.
+             * @return Fill style.
              * @api
              */
             getFill(): ol.style.Fill;
@@ -8611,18 +10047,21 @@ declare module ol {
 
             /**
              * Get the number of points for generating the shape.
+             * @return Number of points for stars and regular polygons.
              * @api
              */
             getPoints(): number;
 
             /**
              * Get the (primary) radius for the shape.
+             * @return Radius.
              * @api
              */
             getRadius(): number;
 
             /**
              * Get the secondary radius for the shape.
+             * @return Radius2.
              * @api
              */
             getRadius2(): number;
@@ -8635,6 +10074,7 @@ declare module ol {
 
             /**
              * Get the stroke style for the shape.
+             * @return Stroke style.
              * @api
              */
             getStroke(): ol.style.Stroke;
@@ -8647,6 +10087,7 @@ declare module ol {
          * option is not defined. The `get` functions return whatever was entered in
          * the options; they will not return the default.
          *
+         * @param opt_options Options.
          * @api
          */
         class Stroke {
@@ -8657,42 +10098,49 @@ declare module ol {
              * option is not defined. The `get` functions return whatever was entered in
              * the options; they will not return the default.
              *
+             * @param opt_options Options.
              * @api
              */
             constructor(opt_options?: olx.style.StrokeOptions);
 
             /**
              * Get the stroke color.
+             * @return Color.
              * @api
              */
             getColor(): (ol.Color | string);
 
             /**
              * Get the line cap type for the stroke.
+             * @return Line cap.
              * @api
              */
             getLineCap(): (string);
 
             /**
              * Get the line dash style for the stroke.
+             * @return Line dash.
              * @api
              */
             getLineDash(): number[];
 
             /**
              * Get the line join type for the stroke.
+             * @return Line join.
              * @api
              */
             getLineJoin(): (string);
 
             /**
              * Get the miter limit for the stroke.
+             * @return Miter limit.
              * @api
              */
             getMiterLimit(): (number);
 
             /**
              * Get the stroke width.
+             * @return Width.
              * @api
              */
             getWidth(): (number);
@@ -8700,6 +10148,7 @@ declare module ol {
             /**
              * Set the color.
              *
+             * @param color Color.
              * @api
              */
             setColor(color: (ol.Color | string)): void;
@@ -8707,6 +10156,7 @@ declare module ol {
             /**
              * Set the line cap.
              *
+             * @param lineCap Line cap.
              * @api
              */
             setLineCap(lineCap: (string)): void;
@@ -8720,6 +10170,7 @@ declare module ol {
              *
              * [mdn]: https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/setLineDash#Browser_compatibility
              *
+             * @param lineDash Line dash.
              * @api
              */
             setLineDash(lineDash: number[]): void;
@@ -8727,6 +10178,7 @@ declare module ol {
             /**
              * Set the line join.
              *
+             * @param lineJoin Line join.
              * @api
              */
             setLineJoin(lineJoin: (string)): void;
@@ -8734,6 +10186,7 @@ declare module ol {
             /**
              * Set the miter limit.
              *
+             * @param miterLimit Miter limit.
              * @api
              */
             setMiterLimit(miterLimit: (number)): void;
@@ -8741,6 +10194,7 @@ declare module ol {
             /**
              * Set the width.
              *
+             * @param width Width.
              * @api
              */
             setWidth(width: (number)): void;
@@ -8753,6 +10207,7 @@ declare module ol {
          * feature or layer that uses the style is re-rendered.
          *
          * @struct
+         * @param opt_options Style options.
          * @api
          */
         class Style {
@@ -8763,26 +10218,29 @@ declare module ol {
              * feature or layer that uses the style is re-rendered.
              *
              * @struct
+             * @param opt_options Style options.
              * @api
              */
             constructor(opt_options?: olx.style.StyleOptions);
 
             /**
              * Clones the style.
+             * @return The cloned style.
              * @api
              */
             clone(): ol.style.Style;
 
             /**
              * Get the geometry to be rendered.
-             * Feature property or geometry or function that returns the geometry that will
-             * be rendered with this style.
+             * @return Feature property or geometry or function that returns the geometry that will
+             *     be rendered with this style.
              * @api
              */
             getGeometry(): (string | ol.geom.Geometry | ol.StyleGeometryFunction);
 
             /**
              * Get the function used to generate a geometry for rendering.
+             * @return Function that is called with a feature
              * and returns the geometry to render instead of the feature's geometry.
              * @api
              */
@@ -8790,36 +10248,42 @@ declare module ol {
 
             /**
              * Get the fill style.
+             * @return Fill style.
              * @api
              */
             getFill(): ol.style.Fill;
 
             /**
              * Get the image style.
+             * @return Image style.
              * @api
              */
             getImage(): ol.style.Image;
 
             /**
              * Get the stroke style.
+             * @return Stroke style.
              * @api
              */
             getStroke(): ol.style.Stroke;
 
             /**
              * Get the text style.
+             * @return Text style.
              * @api
              */
             getText(): ol.style.Text;
 
             /**
              * Get the z-index for the style.
+             * @return ZIndex.
              * @api
              */
             getZIndex(): (number);
 
             /**
              * Set the fill style.
+             * @param fill Fill style.
              * @api
              */
             setFill(fill: ol.style.Fill): void;
@@ -8827,6 +10291,7 @@ declare module ol {
             /**
              * Set a geometry that is rendered instead of the feature's geometry.
              *
+             * @param geometry
              *     Feature property or geometry or function returning a geometry to render
              *     for this style.
              * @api
@@ -8835,18 +10300,21 @@ declare module ol {
 
             /**
              * Set the image style.
+             * @param image Image style.
              * @api
              */
             setImage(image: ol.style.Image): void;
 
             /**
              * Set the stroke style.
+             * @param stroke Stroke style.
              * @api
              */
             setStroke(stroke: ol.style.Stroke): void;
 
             /**
              * Set the text style.
+             * @param text Text style.
              * @api
              */
             setText(text: ol.style.Text): void;
@@ -8854,6 +10322,7 @@ declare module ol {
             /**
              * Set the z-index.
              *
+             * @param zIndex ZIndex.
              * @api
              */
             setZIndex(zIndex: (number)): void;
@@ -8863,6 +10332,7 @@ declare module ol {
          * @classdesc
          * Set text style for vector features.
          *
+         * @param opt_options Options.
          * @api
          */
         class Text {
@@ -8870,72 +10340,84 @@ declare module ol {
              * @classdesc
              * Set text style for vector features.
              *
+             * @param opt_options Options.
              * @api
              */
             constructor(opt_options?: olx.style.TextOptions);
 
             /**
              * Get the font name.
+             * @return Font.
              * @api
              */
             getFont(): (string);
 
             /**
              * Get the x-offset for the text.
+             * @return Horizontal text offset.
              * @api
              */
             getOffsetX(): number;
 
             /**
              * Get the y-offset for the text.
+             * @return Vertical text offset.
              * @api
              */
             getOffsetY(): number;
 
             /**
              * Get the fill style for the text.
+             * @return Fill style.
              * @api
              */
             getFill(): ol.style.Fill;
 
             /**
              * Determine whether the text rotates with the map.
+             * @return Rotate with map.
              * @api
              */
             getRotateWithView(): (boolean);
 
             /**
              * Get the text rotation.
+             * @return Rotation.
              * @api
              */
             getRotation(): (number);
 
             /**
              * Get the text scale.
+             * @return Scale.
              * @api
              */
             getScale(): (number);
 
             /**
              * Get the stroke style for the text.
+             * @return Stroke style.
              * @api
              */
             getStroke(): ol.style.Stroke;
 
             /**
              * Get the text to be rendered.
+             * @return Text.
              * @api
              */
             getText(): (string);
 
             /**
              * Get the text alignment.
+             * @return Text align.
              * @api
              */
             getTextAlign(): (string);
 
             /**
              * Get the text baseline.
+             * @return Text baseline.
              * @api
              */
             getTextBaseline(): (string);
@@ -8943,6 +10425,7 @@ declare module ol {
             /**
              * Set the font.
              *
+             * @param font Font.
              * @api
              */
             setFont(font: (string)): void;
@@ -8950,6 +10433,7 @@ declare module ol {
             /**
              * Set the x offset.
              *
+             * @param offsetX Horizontal text offset.
              * @api
              */
             setOffsetX(offsetX: number): void;
@@ -8957,6 +10441,7 @@ declare module ol {
             /**
              * Set the y offset.
              *
+             * @param offsetY Vertical text offset.
              * @api
              */
             setOffsetY(offsetY: number): void;
@@ -8964,6 +10449,7 @@ declare module ol {
             /**
              * Set the fill.
              *
+             * @param fill Fill style.
              * @api
              */
             setFill(fill: ol.style.Fill): void;
@@ -8971,6 +10457,7 @@ declare module ol {
             /**
              * Set the rotation.
              *
+             * @param rotation Rotation.
              * @api
              */
             setRotation(rotation: (number)): void;
@@ -8978,6 +10465,7 @@ declare module ol {
             /**
              * Set the scale.
              *
+             * @param scale Scale.
              * @api
              */
             setScale(scale: (number)): void;
@@ -8985,6 +10473,7 @@ declare module ol {
             /**
              * Set the stroke.
              *
+             * @param stroke Stroke style.
              * @api
              */
             setStroke(stroke: ol.style.Stroke): void;
@@ -8992,6 +10481,7 @@ declare module ol {
             /**
              * Set the text.
              *
+             * @param text Text.
              * @api
              */
             setText(text: (string)): void;
@@ -8999,6 +10489,7 @@ declare module ol {
             /**
              * Set the text alignment.
              *
+             * @param textAlign Text align.
              * @api
              */
             setTextAlign(textAlign: (string)): void;
@@ -9006,6 +10497,7 @@ declare module ol {
             /**
              * Set the text baseline.
              *
+             * @param textBaseline Text baseline.
              * @api
              */
             setTextBaseline(textBaseline: (string)): void;
@@ -9016,17 +10508,22 @@ declare module ol {
      * @classdesc
      * Base class for tiles.
      *
+     * @param tileCoord Tile coordinate.
+     * @param state State.
      */
     class Tile extends ol.events.EventTarget {
         /**
          * @classdesc
          * Base class for tiles.
          *
+         * @param tileCoord Tile coordinate.
+         * @param state State.
          */
         constructor(tileCoord: ol.TileCoord, state: ol.Tile.State);
 
         /**
          * Get the tile coordinate for this tile.
+         * @return The tile coordinate.
          * @api
          */
         getTileCoord(): ol.TileCoord;
@@ -9047,6 +10544,8 @@ declare module ol {
     module tilegrid {
         /**
          * Creates a tile grid with a standard XYZ tiling scheme.
+         * @param opt_options Tile grid options.
+         * @return Tile grid instance.
          * @api
          */
         function createXYZ(opt_options?: olx.tilegrid.XYZOptions): ol.tilegrid.TileGrid;
@@ -9056,6 +10555,7 @@ declare module ol {
          * Base class for setting the grid pattern for sources accessing tiled-image
          * servers.
          *
+         * @param options Tile grid options.
          * @struct
          * @api stable
          */
@@ -9065,6 +10565,7 @@ declare module ol {
              * Base class for setting the grid pattern for sources accessing tiled-image
              * servers.
              *
+             * @param options Tile grid options.
              * @struct
              * @api stable
              */
@@ -9073,36 +10574,46 @@ declare module ol {
             /**
              * Call a function with each tile coordinate for a given extent and zoom level.
              *
+             * @param extent Extent.
+             * @param zoom Zoom level.
+             * @param callback Function called with each tile coordinate.
              * @api
              */
             forEachTileCoord(extent: ol.Extent, zoom: number, callback: ((coords: ol.TileCoord) => any)): void;
 
             /**
              * Get the maximum zoom level for the grid.
+             * @return Max zoom.
              * @api
              */
             getMaxZoom(): number;
 
             /**
              * Get the minimum zoom level for the grid.
+             * @return Min zoom.
              * @api
              */
             getMinZoom(): number;
 
             /**
              * Get the origin for the grid at the given zoom level.
+             * @param z Z.
+             * @return Origin.
              * @api stable
              */
             getOrigin(z: number): ol.Coordinate;
 
             /**
              * Get the resolution for the given zoom level.
+             * @param z Z.
+             * @return Resolution.
              * @api stable
              */
             getResolution(z: number): number;
 
             /**
              * Get the list of resolutions for the tile grid.
+             * @return Resolutions.
              * @api stable
              */
             getResolutions(): number[];
@@ -9110,6 +10621,9 @@ declare module ol {
             /**
              * Get the extent of a tile coordinate.
              *
+             * @param tileCoord Tile coordinate.
+             * @param opt_extent Temporary extent object.
+             * @return Extent.
              * @api
              */
             getTileCoordExtent(tileCoord: ol.TileCoord, opt_extent?: ol.Extent): ol.Extent;
@@ -9119,12 +10633,20 @@ declare module ol {
              * method considers that coordinates that intersect tile boundaries should be
              * assigned the higher tile coordinate.
              *
+             * @param coordinate Coordinate.
+             * @param resolution Resolution.
+             * @param opt_tileCoord Destination ol.TileCoord object.
+             * @return Tile coordinate.
              * @api
              */
             getTileCoordForCoordAndResolution(coordinate: ol.Coordinate, resolution: number, opt_tileCoord?: ol.TileCoord): ol.TileCoord;
 
             /**
              * Get a tile coordinate given a map coordinate and zoom level.
+             * @param coordinate Coordinate.
+             * @param z Zoom level.
+             * @param opt_tileCoord Destination ol.TileCoord object.
+             * @return Tile coordinate.
              * @api
              */
             getTileCoordForCoordAndZ(coordinate: ol.Coordinate, z: number, opt_tileCoord?: ol.TileCoord): ol.TileCoord;
@@ -9133,13 +10655,18 @@ declare module ol {
              * Get the tile size for a zoom level. The type of the return value matches the
              * `tileSize` or `tileSizes` that the tile grid was configured with. To always
              * get an `ol.Size`, run the result through `ol.size.toSize()`.
+             * @param z Z.
+             * @return Tile size.
              * @api stable
              */
             getTileSize(z: number): (number | ol.Size);
 
             /**
+             * @param resolution Resolution.
+             * @param opt_direction If 0, the nearest resolution will be used.
              *     If 1, the nearest lower resolution will be used. If -1, the nearest
              *     higher resolution will be used. Default is 0.
+             * @return Z.
              * @api
              */
             getZForResolution(resolution: number, opt_direction?: number): number;
@@ -9149,6 +10676,7 @@ declare module ol {
          * @classdesc
          * Set the grid pattern for sources accessing WMTS tiled-image servers.
          *
+         * @param options WMTS options.
          * @struct
          * @api
          */
@@ -9157,6 +10685,7 @@ declare module ol {
              * @classdesc
              * Set the grid pattern for sources accessing WMTS tiled-image servers.
              *
+             * @param options WMTS options.
              * @struct
              * @api
              */
@@ -9164,14 +10693,18 @@ declare module ol {
 
             /**
              * Get the list of matrix identifiers.
+             * @return MatrixIds.
              * @api
              */
             getMatrixIds(): string[];
 
             /**
              * Create a tile grid from a WMTS capabilities matrix set.
+             * @param matrixSet An object representing a matrixSet in the
              *     capabilities document.
+             * @param opt_extent An optional extent to restrict the tile
              *     ranges the server provides.
+             * @return WMTS tileGrid instance.
              * @api
              */
             static createFromCapabilitiesMatrixSet(matrixSet: GlobalObject, opt_extent?: ol.Extent): ol.tilegrid.WMTS;
@@ -9188,6 +10721,7 @@ declare module ol {
      * {@link ol.proj.Projection} the image projection. The canvas returned by
      * this function is cached by the source. The this keyword inside the function
      * references the {@link ol.source.ImageCanvas}.
+     *
      */
     type CanvasFunctionType = (extent: ol.Extent, resolution: number, pixelRatio: number, size: ol.Size, proj: ol.proj.Projection) => HTMLCanvasElement;
 
@@ -9202,6 +10736,7 @@ declare module ol {
     /**
      * A type accepted by CanvasRenderingContext2D.fillStyle.
      * Represents a color, pattern, or gradient.
+     *
      */
     type ColorLike = (string | CanvasPattern | CanvasGradient);
 
@@ -9213,6 +10748,7 @@ declare module ol {
     /**
      * A function that takes a {@link ol.Coordinate} and transforms it into a
      * `{string}`.
+     *
      */
     type CoordinateFormatType = (coords?: ol.Coordinate) => string;
 
@@ -9234,11 +10770,13 @@ declare module ol {
     /**
      * A function that takes an {@link ol.MapBrowserEvent} and returns a
      * `{boolean}`. If the condition is met, true should be returned.
+     *
      */
     type EventsConditionType = (event: ol.MapBrowserEvent) => boolean;
 
     /**
      * Key to use with {@link ol.Observable#unByKey}.
+     *
      */
     type EventsKey = Object;
 
@@ -9265,6 +10803,7 @@ declare module ol {
      * A function that returns an array of {@link ol.style.Style styles} given a
      * resolution. The `this` keyword inside the function references the
      * {@link ol.Feature} to be styled.
+     *
      */
     type FeatureStyleFunction = (resolution: number) => (ol.style.Style | ol.style.Style[]);
 
@@ -9292,6 +10831,7 @@ declare module ol {
      * Providing a custom `imageLoadFunction` can be useful to load images with
      * post requests or - in general - through XHR requests, where the src of the
      * image element would be set to a data URI when the content is loaded.
+     *
      */
     type ImageLoadFunctionType = (image: ol.Image, url: string) => void;
 
@@ -9299,6 +10839,7 @@ declare module ol {
      * A function that takes an {@link ol.Extent} and a resolution as arguments, and
      * returns an array of {@link ol.Extent} with the extents to load. Usually this
      * is one of the standard {@link ol.loadingstrategy} strategies.
+     *
      */
     type LoadingStrategy = (extent: ol.Extent, resolution: number) => ol.Extent[];
 
@@ -9337,6 +10878,7 @@ declare module ol {
      * are called with a second "data" argument, which can be used for storage.  The
      * data object is accessible from raster events, where it can be initialized in
      * "beforeoperations" and accessed again in "afteroperations".
+     *
      */
     type RasterOperation = (data: (number[][] | ImageData[]), obj: GlobalObject) => (number[] | ImageData);
 
@@ -9411,12 +10953,14 @@ declare module ol {
      * A function that takes an {@link ol.Feature} and a `{number}` representing
      * the view's resolution. The function should return a {@link ol.style.Style}
      * or an array of them. This way e.g. a vector layer can be styled.
+     *
      */
     type StyleFunction = (feature: (ol.Feature | ol.render.Feature), resolution: number) => (ol.style.Style | ol.style.Style[]);
 
     /**
      * A function that takes an {@link ol.Feature} as argument and returns an
      * {@link ol.geom.Geometry} that will be rendered and styled for the feature.
+     *
      */
     type StyleGeometryFunction = (feature: (ol.Feature | ol.render.Feature)) => (ol.geom.Geometry | ol.render.Feature);
 
@@ -9429,6 +10973,7 @@ declare module ol {
     /**
      * A function that takes an {@link ol.Tile} for the tile and a `{string}` for
      * the url as arguments.
+     *
      */
     type TileLoadFunctionType = (tile: ol.Tile, url: string) => void;
 
@@ -9441,6 +10986,7 @@ declare module ol {
      * the projection  as arguments and returns a `{string}` representing the tile
      * URL, or undefined if no tile should be requested for the passed tile
      * coordinate.
+     *
      */
     type TileUrlFunctionType = (coords: ol.TileCoord, pixelRatio: number, proj: ol.proj.Projection) => string;
 
@@ -9449,6 +10995,7 @@ declare module ol {
      * output array, and an optional dimension (default should be 2).  The function
      * transforms the input coordinate values, populates the output array, and
      * returns the output array.
+     *
      */
     type TransformFunction = (array: number[], out?: number[], dimension?: number) => number[];
 
@@ -9462,28 +11009,46 @@ declare module ol {
      */
     type WFSTransactionResponse = Object;
 
+    /**
+     * @param tileCoord Tile coordinate.
+     * @param state State.
+     * @param src Data source url.
+     * @param format Feature format.
+     * @param tileLoadFunction Tile load function.
+     */
     class VectorTile extends ol.Tile {
+        /**
+         * @param tileCoord Tile coordinate.
+         * @param state State.
+         * @param src Data source url.
+         * @param format Feature format.
+         * @param tileLoadFunction Tile load function.
+         */
         constructor(tileCoord: ol.TileCoord, state: ol.Tile.State, src: string, format: ol.format.Feature, tileLoadFunction: ol.TileLoadFunctionType);
 
         /**
          * Get the feature format assigned for reading this tile's features.
+         * @return Feature format.
          * @api
          */
         getFormat(): ol.format.Feature;
 
         /**
+         * @param features Features.
          * @api
          */
         setFeatures(features: ol.Feature[]): void;
 
         /**
          * Set the projection of the features that were added with {@link #setFeatures}.
+         * @param projection Feature projection.
          * @api
          */
         setProjection(projection: ol.proj.Projection): void;
 
         /**
          * Set the feature loader for reading this tile's features.
+         * @param loader Feature loader.
          * @api
          */
         setLoader(loader: ol.FeatureLoader): void;
@@ -9541,6 +11106,7 @@ declare module ol {
      * The *center constraint* is determined by the `extent` option. By
      * default the center is not constrained at all.
      *
+     * @param opt_options View options.
      * @api stable
      */
     class View extends ol.Object {
@@ -9596,6 +11162,7 @@ declare module ol {
          * The *center constraint* is determined by the `extent` option. By
          * default the center is not constrained at all.
          *
+         * @param opt_options View options.
          * @api stable
          */
         constructor(opt_options?: olx.ViewOptions);
@@ -9603,18 +11170,22 @@ declare module ol {
         /**
          * Animate the view. The view's center, zoom (or resolution), and
          * rotation can be animated for smooth transitions between view states.
+         * @param var_args Animation options.
+         * @param restArgs
          * @api experimental
          */
         animate(...var_args: Array<olx.animation.AnimateOptions | olx.animation.AnimateCallback>): void;
 
         /**
          * Determine if the view is being animated.
+         * @return The view is being animated.
          * @api
          */
         getAnimating(): boolean;
 
         /**
          * Determine if the user is interacting with the view, such as panning or zooming.
+         * @return The view is being interacted with.
          * @api
          */
         getInteracting(): boolean;
@@ -9627,24 +11198,34 @@ declare module ol {
 
         /**
          * Get the constrained center of this view.
+         * @param center Center.
+         * @return Constrained center.
          * @api
          */
         constrainCenter(center?: ol.Coordinate): ol.Coordinate;
 
         /**
          * Get the constrained resolution of this view.
+         * @param resolution Resolution.
+         * @param opt_delta Delta. Default is `0`.
+         * @param opt_direction Direction. Default is `0`.
+         * @return Constrained resolution.
          * @api
          */
         constrainResolution(resolution?: number, opt_delta?: number, opt_direction?: number): number;
 
         /**
          * Get the constrained rotation of this view.
+         * @param rotation Rotation.
+         * @param opt_delta Delta. Default is `0`.
+         * @return Constrained rotation.
          * @api
          */
         constrainRotation(rotation?: number, opt_delta?: number): number;
 
         /**
          * Get the view center.
+         * @return The center of the view.
          * @observable
          * @api stable
          */
@@ -9655,54 +11236,64 @@ declare module ol {
          * The size is the pixel dimensions of the box into which the calculated extent
          * should fit. In most cases you want to get the extent of the entire map,
          * that is `map.getSize()`.
+         * @param size Box pixel size.
+         * @return Extent.
          * @api stable
          */
         calculateExtent(size?: ol.Size): ol.Extent;
 
         /**
          * Get the maximum resolution of the view.
+         * @return The maximum resolution of the view.
          * @api
          */
         getMaxResolution(): number;
 
         /**
          * Get the minimum resolution of the view.
+         * @return The minimum resolution of the view.
          * @api
          */
         getMinResolution(): number;
 
         /**
          * Get the maximum zoom level for the view.
+         * @return The maximum zoom level.
          * @api
          */
         getMaxZoom(): number;
 
         /**
          * Set a new maximum zoom level for the view.
+         * @param zoom The maximum zoom level.
          * @api stable
          */
         setMaxZoom(zoom: number): void;
 
         /**
          * Get the minimum zoom level for the view.
+         * @return The minimum zoom level.
          * @api
          */
         getMinZoom(): number;
 
         /**
          * Set a new minimum zoom level for the view.
+         * @param zoom The minimum zoom level.
          * @api stable
          */
         setMinZoom(zoom: number): void;
 
         /**
          * Get the view projection.
+         * @return The projection of the view.
          * @api stable
          */
         getProjection(): ol.proj.Projection;
 
         /**
          * Get the view resolution.
+         * @return The resolution of the view.
          * @observable
          * @api stable
          */
@@ -9711,12 +11302,16 @@ declare module ol {
         /**
          * Get the resolutions for the view. This returns the array of resolutions
          * passed to the constructor of the {ol.View}, or undefined if none were given.
+         * @return The resolutions of the view.
          * @api stable
          */
         getResolutions(): number[];
 
         /**
          * Get the resolution for a provided extent (in map units) and size (in pixels).
+         * @param extent Extent.
+         * @param opt_size Box pixel size.
+         * @return The resolution at which the provided extent will render at
          *     the given size.
          * @api
          */
@@ -9724,6 +11319,7 @@ declare module ol {
 
         /**
          * Get the view rotation.
+         * @return The rotation of the view in radians.
          * @observable
          * @api stable
          */
@@ -9733,18 +11329,23 @@ declare module ol {
          * Get the current zoom level.  If you configured your view with a resolutions
          * array (this is rare), this method may return non-integer zoom levels (so
          * the zoom level is not safe to use as an index into a resolutions array).
+         * @return Zoom.
          * @api
          */
         getZoom(): number;
 
         /**
          * Get the zoom level for a resolution.
+         * @param resolution The resolution.
+         * @return The zoom level for the provided resolution.
          * @api
          */
         getZoomForResolution(resolution: number): number;
 
         /**
          * Get the resolution for a zoom level.
+         * @param zoom Zoom level.
+         * @return The view resolution for the provided zoom level.
          * @api
          */
         getResolutionForZoom(zoom: number): number;
@@ -9754,24 +11355,32 @@ declare module ol {
          * The size is pixel dimensions of the box to fit the extent into.
          * In most cases you will want to use the map size, that is `map.getSize()`.
          * Takes care of the map angle.
+         * @param geometry Geometry.
+         * @param opt_options Options.
          * @api
          */
         fit(geometryOrExtent: (ol.geom.SimpleGeometry | ol.Extent), opt_options?: olx.view.FitOptions): void;
 
         /**
          * Center on coordinate and view position.
+         * @param coordinate Coordinate.
+         * @param size Box pixel size.
+         * @param position Position on the view to center on.
          * @api
          */
         centerOn(coordinate: ol.Coordinate, size: ol.Size, position: ol.Pixel): void;
 
         /**
          * Rotate the view around a given coordinate.
+         * @param rotation New rotation value for the view.
+         * @param opt_anchor The rotation center.
          * @api stable
          */
         rotate(rotation: number, opt_anchor?: ol.Coordinate): void;
 
         /**
          * Set the center of the current view.
+         * @param center The center of the view.
          * @observable
          * @api stable
          */
@@ -9779,6 +11388,7 @@ declare module ol {
 
         /**
          * Set the resolution for this view.
+         * @param resolution The resolution of the view.
          * @observable
          * @api stable
          */
@@ -9786,6 +11396,7 @@ declare module ol {
 
         /**
          * Set the rotation for this view.
+         * @param rotation The rotation of the view in radians.
          * @observable
          * @api stable
          */
@@ -9793,6 +11404,7 @@ declare module ol {
 
         /**
          * Zoom to a specific zoom level.
+         * @param zoom Zoom level.
          * @api stable
          */
         setZoom(zoom: number): void;
@@ -10067,6 +11679,9 @@ declare module olx {
     }
 
     module interaction {
+        /**
+         * Object literal with config options for interactions.
+         */
         interface InteractionOptions {
             handleEvent: (event: ol.MapBrowserEvent) => boolean;
         }
@@ -10345,14 +11960,12 @@ declare module olx {
 
     module parser {
     }
-
     module render {
         interface ToContextOptions {
             size?: ol.Size;
             pixelRatio?: number;
         }
     }
-
     module source {
         interface BingMapsOptions {
             cacheSize?: number;
@@ -10495,6 +12108,9 @@ declare module olx {
             style?: (ol.style.Style | ol.style.Style[] | ol.StyleFunction);
         }
 
+        /**
+         * @api
+         */
         interface RasterOptions {
             sources: ol.source.Source[];
             operation?: ol.RasterOperation;
@@ -10667,7 +12283,6 @@ declare module olx {
             size: ol.Size;
         }
     }
-
     module style {
         interface CircleOptions {
             fill?: ol.style.Fill;
@@ -10701,6 +12316,9 @@ declare module olx {
             src?: string;
         }
 
+        /**
+         * Specify radius for regular polygons, or radius1 and radius2 for stars.
+         */
         interface RegularShapeOptions {
             fill?: ol.style.Fill;
             points: number;
@@ -10765,7 +12383,6 @@ declare module olx {
             space?: number;
         }
     }
-
     module tilegrid {
         interface TileGridOptions {
             extent?: ol.Extent;

From 61c84aeeeec89a6bc5460a0dd3b55c79e38699b1 Mon Sep 17 00:00:00 2001
From: Olivier Sechet <osechet@gmail.com>
Date: Thu, 8 Mar 2018 19:56:34 +0100
Subject: [PATCH 0351/1382] Fix no-any-union lint

---
 types/openlayers/index.d.ts          |  2 +-
 types/openlayers/openlayers-tests.ts | 82 +++++++++++++++++++++++-----
 types/openlayers/tslint.json         |  4 +-
 3 files changed, 69 insertions(+), 19 deletions(-)

diff --git a/types/openlayers/index.d.ts b/types/openlayers/index.d.ts
index 333ee0f621..c75b3e2ef2 100644
--- a/types/openlayers/index.d.ts
+++ b/types/openlayers/index.d.ts
@@ -14100,7 +14100,7 @@ declare module olx {
             anchorYUnits?: ol.style.IconAnchorUnits;
             color?: (ol.Color | string);
             crossOrigin?: (string);
-            img?: (any | HTMLCanvasElement);
+            img?: (HTMLImageElement | HTMLCanvasElement);
             offset?: number[];
             offsetOrigin?: ol.style.IconOrigin;
             opacity?: number;
diff --git a/types/openlayers/openlayers-tests.ts b/types/openlayers/openlayers-tests.ts
index ce13ae8385..457ab61de4 100644
--- a/types/openlayers/openlayers-tests.ts
+++ b/types/openlayers/openlayers-tests.ts
@@ -1,22 +1,25 @@
 // Basic type variables for test functions
 let anyValue: any;
-let numberValue: number;
 let booleanValue: boolean;
-let stringValue: string;
-let stringArray: string[];
-let jsonValue: JSON;
+let canvas: HTMLCanvasElement;
 let domEventTarget: EventTarget;
 let fn: Function;
+let image: HTMLImageElement;
+let jsonValue: JSON;
+let numberArray: number[];
+let numberValue: number;
 let object: Object;
+let stringArray: string[];
+let stringValue: string;
 
 // Callback predefinitions for OpenLayers
+let coordinateFormatType: ol.CoordinateFormatType;
+let drawGeometryFunction: ol.DrawGeometryFunctionType;
+let easingFunction: (t: number) => number;
+let featureLoader: ol.FeatureLoader;
+let featureStyleFunction: ol.FeatureStyleFunction;
 let preRenderFunction: ol.PreRenderFunction;
 let transformFunction: ol.TransformFunction;
-let coordinateFormatType: ol.CoordinateFormatType;
-let featureStyleFunction: ol.FeatureStyleFunction;
-let featureLoader: ol.FeatureLoader;
-let easingFunction: (t: number) => number;
-let drawGeometryFunction: ol.DrawGeometryFunctionType;
 drawGeometryFunction([0, 0], new ol.geom.Point([0, 0]));
 drawGeometryFunction([0, 0]);
 
@@ -24,27 +27,29 @@ drawGeometryFunction([0, 0]);
 let attribution: ol.Attribution;
 let boundingCoordinates: ol.Coordinate[];
 let circle: ol.geom.Circle;
+let clusterSource: ol.source.Cluster;
 let color: ol.Color;
 let coordinate: ol.Coordinate;
 let coordinatesArray: ol.Coordinate[];
 let coordinatesArrayDim2: ol.Coordinate[][];
-let extent: ol.Extent;
-let olEvent: ol.events.Event;
 let eventKey: ol.EventsKey;
 let eventKeyArray: ol.EventsKey[];
 let eventKeyMixed: ol.EventsKey | ol.EventsKey[];
 let eventTarget: ol.events.EventTarget;
+let extent: ol.Extent;
 let feature: ol.Feature;
 let featureArray: ol.Feature[];
 let featureCollection: ol.Collection<ol.Feature>;
 let featureFormat: ol.format.Feature;
 let featureUrlFunction: ol.FeatureUrlFunction;
-let graticule: ol.Graticule;
 let geometriesArray: ol.geom.Geometry[];
 let geometry: ol.geom.Geometry;
 let geometryCollection: ol.geom.GeometryCollection;
 let geometryLayout: ol.geom.GeometryLayout;
 let geometryType: ol.geom.GeometryType;
+let graticule: ol.Graticule;
+let iconAnchorUnits: ol.style.IconAnchorUnits;
+let iconOrigin: ol.style.IconOrigin;
 let linearRing: ol.geom.LinearRing;
 let lineString: ol.geom.LineString;
 let loadingStrategy: ol.LoadingStrategy;
@@ -53,6 +58,7 @@ let mapBrowserEvent: ol.MapBrowserEvent;
 let multiLineString: ol.geom.MultiLineString;
 let multiPoint: ol.geom.MultiPoint;
 let multiPolygon: ol.geom.MultiPolygon;
+let olEvent: ol.events.Event;
 let pixel: ol.Pixel;
 let point: ol.geom.Point;
 let polygon: ol.geom.Polygon;
@@ -63,12 +69,11 @@ let size: ol.Size;
 let style: ol.style.Style;
 let styleArray: ol.style.Style[];
 let styleFunction: ol.StyleFunction;
+let styleRegularShape: ol.style.RegularShape;
 let tilegrid: ol.tilegrid.TileGrid;
 let transformFn: ol.TransformFunction;
-let clusterSource: ol.source.Cluster;
-let vectorSource: ol.source.Vector;
 let units: ol.proj.Units;
-let styleRegularShape: ol.style.RegularShape;
+let vectorSource: ol.source.Vector;
 
 //
 // ol.Attribution
@@ -975,6 +980,53 @@ let mouseWheelZoom: ol.interaction.MouseWheelZoom = new ol.interaction.MouseWhee
     timeout: numberValue,
     useAnchor: booleanValue
 });
+
+//
+// ol.style.Icon
+//
+
+let iconWithUndefined = new ol.style.Icon({});
+let icon: ol.style.Icon;
+
+icon = new ol.style.Icon({
+    anchor: numberArray,
+    anchorOrigin: iconOrigin,
+    anchorXUnits: iconAnchorUnits,
+    anchorYUnits: iconAnchorUnits,
+    color: stringValue,
+    crossOrigin: stringValue,
+    img: image,
+    offset: numberArray,
+    offsetOrigin: iconOrigin,
+    opacity: numberValue,
+    scale: numberValue,
+    snapToPixel: booleanValue,
+    rotateWithView: booleanValue,
+    rotation: numberValue,
+    size,
+    imgSize: size,
+    src: stringValue,
+});
+icon = new ol.style.Icon({
+    anchor: numberArray,
+    anchorOrigin: iconOrigin,
+    anchorXUnits: iconAnchorUnits,
+    anchorYUnits: iconAnchorUnits,
+    color,
+    crossOrigin: stringValue,
+    img: canvas,
+    offset: numberArray,
+    offsetOrigin: iconOrigin,
+    opacity: numberValue,
+    scale: numberValue,
+    snapToPixel: booleanValue,
+    rotateWithView: booleanValue,
+    rotation: numberValue,
+    size,
+    imgSize: size,
+    src: stringValue,
+});
+
 //
 // ol.style.RegularShape
 //
diff --git a/types/openlayers/tslint.json b/types/openlayers/tslint.json
index 2effdd6100..186a07be8c 100644
--- a/types/openlayers/tslint.json
+++ b/types/openlayers/tslint.json
@@ -3,9 +3,7 @@
     "rules": {
         // It appears somewhat difficult to remove the Function and Object types
         "ban-types": false,
-        // This currently fails for an option that does not appear to be in OL 4
-        "no-any-union": false,
-        // Not sure how to work around this, or if it's necessary to        
+        // Not sure how to work around this, or if it's necessary to
         "no-declare-current-package": false,
         "no-internal-module": false,
         "no-redundant-jsdoc-2": false,

From 36c2b3bf687497fa8193ba8c01b1bb14303e358f Mon Sep 17 00:00:00 2001
From: Benny Neugebauer <bn@bennyn.de>
Date: Thu, 8 Mar 2018 23:11:32 +0100
Subject: [PATCH 0352/1382] Fix MoneyHash to work with coinbase v2.0.0

---
 types/coinbase/index.d.ts | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/types/coinbase/index.d.ts b/types/coinbase/index.d.ts
index ae1e041203..d258b15a05 100644
--- a/types/coinbase/index.d.ts
+++ b/types/coinbase/index.d.ts
@@ -284,14 +284,27 @@ export interface WithdrawOpts {
  * Combination of an amount and a currency
  */
 export interface MoneyHash {
-    /**
-     * Amount as floating-point in a string
-     */
-    amount: string;
-    /**
-     * Currency e.g. "BTC" (see Client#getCurrencies() for available strings)
-     */
-    currency: string;
+    data: {
+        /**
+         * Currency e.g. "BTC" (see Client#getCurrencies() for available strings)
+         */
+        base: string;
+        /**
+         * Amount as floating-point in a string
+         */
+        amount: string;
+        /**
+         * Currency e.g. "EUR" (see Client#getCurrencies() for available strings)
+         */
+        currency: string;
+    }
+    warnings?: [
+        {
+            id: string
+            message: string
+            url: string
+        }
+    ]
 }
 
 export type ResourceType = "account" | "transaction" | "address" | "user" | "buy" | "sell" | "deposit" | "withdrawal" | "payment_method";

From e4aa17e077f28c88abc3f71f9f83c9785fc2242c Mon Sep 17 00:00:00 2001
From: Diogo Correa <diogodca@gmail.com>
Date: Wed, 7 Mar 2018 18:38:32 -0300
Subject: [PATCH 0353/1382] add react-avatar-editor definitions

---
 types/react-avatar-editor/index.d.ts          | 51 +++++++++++++++++++
 .../react-avatar-editor-tests.tsx             | 47 +++++++++++++++++
 types/react-avatar-editor/tsconfig.json       | 25 +++++++++
 types/react-avatar-editor/tslint.json         |  1 +
 4 files changed, 124 insertions(+)
 create mode 100644 types/react-avatar-editor/index.d.ts
 create mode 100644 types/react-avatar-editor/react-avatar-editor-tests.tsx
 create mode 100644 types/react-avatar-editor/tsconfig.json
 create mode 100644 types/react-avatar-editor/tslint.json

diff --git a/types/react-avatar-editor/index.d.ts b/types/react-avatar-editor/index.d.ts
new file mode 100644
index 0000000000..a3bbf49f3b
--- /dev/null
+++ b/types/react-avatar-editor/index.d.ts
@@ -0,0 +1,51 @@
+// Type definitions for react-avatar-editor 10.3
+// Project: https://github.com/mosch/react-avatar-editor
+// Definitions by: Diogo Corrêa <https://github.com/diogocorrea>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+import * as React from "react";
+
+export interface ImageState {
+    height: number;
+    width: number;
+    x: number;
+    y: number;
+    resource: ImageData;
+}
+
+export interface CroppedRect {
+    x: number;
+    y: number;
+    width: number;
+    height: number;
+}
+
+export interface AvatarEditorProps {
+    image: string | File;
+    width?: number;
+    height?: number;
+    border?: number | number[];
+    borderRadius?: number;
+    color?: number[];
+    style?: object;
+    scale?: number;
+    position?: object;
+    rotate?: number;
+    crossOrigin?: string;
+    disableDrop?: boolean;
+    onDropFile?(event: DragEvent): void;
+    onLoadFailure?(event: Event): void;
+    onLoadSuccess?(imgInfo: ImageState): void;
+    onImageReady?(event: Event): void;
+    onMouseUp?(): void;
+    onMouseMove?(event: Event): void;
+    onImageChange?(): void;
+    onPositionChange?(): void;
+}
+
+export default class AvatarEditor extends React.Component<AvatarEditorProps, any> {
+    static getImage(): HTMLCanvasElement;
+    static getImageScaledToCanvas(): HTMLCanvasElement;
+    static getCroppingRect(): CroppedRect;
+}
diff --git a/types/react-avatar-editor/react-avatar-editor-tests.tsx b/types/react-avatar-editor/react-avatar-editor-tests.tsx
new file mode 100644
index 0000000000..063d083f3f
--- /dev/null
+++ b/types/react-avatar-editor/react-avatar-editor-tests.tsx
@@ -0,0 +1,47 @@
+import * as React from "react";
+import AvatarEditor, { ImageState, CroppedRect } from "react-avatar-editor";
+
+const file: File = new File(["str"], "image.jpg");
+const image: ImageData = new ImageData(1, 2);
+const imageState: ImageState = {
+    height: 1,
+    width: 1,
+    x: 1,
+    y: 1,
+    resource: image
+};
+
+class AvatarEditorTest extends React.Component {
+    render() {
+        return (
+            <div>
+                <AvatarEditor image="" />
+                <AvatarEditor image={file} />
+                <AvatarEditor image="" width={1} />
+                <AvatarEditor image="" height={1} />
+                <AvatarEditor image="" border={1} />
+                <AvatarEditor image="" border={[1, 2]} />
+                <AvatarEditor image="" borderRadius={1} />
+                <AvatarEditor image="" color={[1]} />
+                <AvatarEditor image="" style={{}} />
+                <AvatarEditor image="" scale={1} />
+                <AvatarEditor image="" position={{}} />
+                <AvatarEditor image="" rotate={1} />
+                <AvatarEditor image="" crossOrigin="" />
+                <AvatarEditor image="" disableDrop={true} />
+                <AvatarEditor image="" onDropFile={event => {}} />
+                <AvatarEditor image="" onLoadFailure={event => {}} />
+                <AvatarEditor image="" onLoadSuccess={imageState => {}} />
+                <AvatarEditor image="" onImageReady={event => {}} />
+                <AvatarEditor image="" onMouseUp={() => {}} />
+                <AvatarEditor image="" onMouseMove={event => {}} />
+                <AvatarEditor image="" onImageChange={() => {}} />
+                <AvatarEditor image="" onPositionChange={() => {}} />
+            </div>
+        );
+    }
+}
+
+const getImage: HTMLCanvasElement = AvatarEditor.getImage();
+const getImageScaledToCanvas: HTMLCanvasElement = AvatarEditor.getImageScaledToCanvas();
+const getCroppingRect: CroppedRect = AvatarEditor.getCroppingRect();
diff --git a/types/react-avatar-editor/tsconfig.json b/types/react-avatar-editor/tsconfig.json
new file mode 100644
index 0000000000..b947d3271a
--- /dev/null
+++ b/types/react-avatar-editor/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "files": [
+        "index.d.ts",
+        "react-avatar-editor-tests.tsx"
+    ],
+    "compilerOptions": {
+        "jsx": "react",
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    }
+}
diff --git a/types/react-avatar-editor/tslint.json b/types/react-avatar-editor/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-avatar-editor/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From c0a162a2317203497d6148b50fa2a8bf11442084 Mon Sep 17 00:00:00 2001
From: Benny Neugebauer <bn@bennyn.de>
Date: Thu, 8 Mar 2018 23:30:53 +0100
Subject: [PATCH 0354/1382] Patched files and definition

---
 types/coinbase/coinbase-tests.ts |  8 ++++----
 types/coinbase/index.d.ts        | 20 +++++++++++++++++---
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/types/coinbase/coinbase-tests.ts b/types/coinbase/coinbase-tests.ts
index 793833355e..fb804ac566 100644
--- a/types/coinbase/coinbase-tests.ts
+++ b/types/coinbase/coinbase-tests.ts
@@ -85,7 +85,7 @@ client.getAccount("abcdef", (error: Error, account: coinbase.Account): void => {
     });
 });
 
-client.getBuyPrice({ currencyPair: "USD-BTC" }, (error: Error, result: coinbase.MoneyHash): void => undefined);
+client.getBuyPrice({ currencyPair: "USD-BTC" }, (error: Error, result: coinbase.Price): void => undefined);
 
 client.getCurrencies((error: Error, result: coinbase.Currency[]): void => undefined);
 
@@ -95,10 +95,10 @@ client.getPaymentMethod("foo", (error: Error, result: coinbase.PaymentMethod): v
 
 client.getPaymentMethods((error: Error, result: coinbase.PaymentMethod[]): void => undefined);
 
-client.getSellPrice({ currencyPair: "USD-BTC" }, (error: Error, result: coinbase.MoneyHash): void => undefined);
+client.getSellPrice({ currencyPair: "USD-BTC" }, (error: Error, result: coinbase.Price): void => undefined);
 
-client.getSpotPrice({ currencyPair: "USD-BTC" }, (error: Error, result: coinbase.MoneyHash): void => undefined);
-client.getSpotPrice({ currencyPair: "USD-BTC", date: "2017-22-01" }, (error: Error, result: coinbase.MoneyHash): void => undefined);
+client.getSpotPrice({ currencyPair: "USD-BTC" }, (error: Error, result: coinbase.Price): void => undefined);
+client.getSpotPrice({ currencyPair: "USD-BTC", date: "2017-22-01" }, (error: Error, result: coinbase.Price): void => undefined);
 
 client.getTime((error: Error, result: coinbase.Time): void => undefined);
 
diff --git a/types/coinbase/index.d.ts b/types/coinbase/index.d.ts
index d258b15a05..c042a8a2af 100644
--- a/types/coinbase/index.d.ts
+++ b/types/coinbase/index.d.ts
@@ -284,6 +284,20 @@ export interface WithdrawOpts {
  * Combination of an amount and a currency
  */
 export interface MoneyHash {
+    /**
+     * Amount as floating-point in a string
+     */
+    amount: string;
+    /**
+     * Currency e.g. "BTC" (see Client#getCurrencies() for available strings)
+     */
+    currency: string;
+}
+
+/**
+ * Price response
+ */
+export interface Price {
     data: {
         /**
          * Currency e.g. "BTC" (see Client#getCurrencies() for available strings)
@@ -1321,7 +1335,7 @@ export class Client {
      * If you need more accurate price estimate for a specific payment method or amount, @see Account#buy() and `quote: true` option.
      * Scope: none
      */
-    getBuyPrice(opts: GetBuyPriceOpts, cb: (error: Error, result: MoneyHash) => void): void;
+    getBuyPrice(opts: GetBuyPriceOpts, cb: (error: Error, result: Price) => void): void;
 
     /**
      * Get the total price to sell one bitcoin or ether. Note that exchange rates fluctuates so the price is only correct for seconds at the time.
@@ -1329,7 +1343,7 @@ export class Client {
      * estimate for a specific payment method or amount, see sell bitcoin endpoint and quote: true option.
      * Scope: none
      */
-    getSellPrice(opts: GetSellPriceOpts, cb: (error: Error, result: MoneyHash) => void): void;
+    getSellPrice(opts: GetSellPriceOpts, cb: (error: Error, result: Price) => void): void;
 
     /**
      * Get the current market price for bitcoin. This is usually somewhere in between the buy and sell price.
@@ -1337,7 +1351,7 @@ export class Client {
      * You can also get historic prices with date parameter.
      * Scope: none
      */
-    getSpotPrice(opts: GetSpotPriceOpts, cb: (error: Error, result: MoneyHash) => void): void;
+    getSpotPrice(opts: GetSpotPriceOpts, cb: (error: Error, result: Price) => void): void;
 
     /**
      * Get the API server time.

From 310334ee416f8272e3b34072c7d632f72e29ff60 Mon Sep 17 00:00:00 2001
From: Benny Neugebauer <bn@bennyn.de>
Date: Thu, 8 Mar 2018 23:31:22 +0100
Subject: [PATCH 0355/1382] Adjusted header file

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

diff --git a/types/coinbase/index.d.ts b/types/coinbase/index.d.ts
index c042a8a2af..6acae366b5 100644
--- a/types/coinbase/index.d.ts
+++ b/types/coinbase/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for coinbase 2.0
+// Type definitions for coinbase 2.0.0
 // Project: https://github.com/coinbase/coinbase-node
 // Definitions by: Rogier Schouten <https://github.com/rogierschouten>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From ad55131a5b4f180984473f08fcc9522f2fe25de7 Mon Sep 17 00:00:00 2001
From: Benny Neugebauer <bn@bennyn.de>
Date: Thu, 8 Mar 2018 23:33:36 +0100
Subject: [PATCH 0356/1382] v2.0.6

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

diff --git a/types/coinbase/index.d.ts b/types/coinbase/index.d.ts
index 6acae366b5..0adff59d46 100644
--- a/types/coinbase/index.d.ts
+++ b/types/coinbase/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for coinbase 2.0.0
+// Type definitions for coinbase 2.0.6
 // Project: https://github.com/coinbase/coinbase-node
 // Definitions by: Rogier Schouten <https://github.com/rogierschouten>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From ac40113cb2b1c1a8f9f4811394b2afe292a1150c Mon Sep 17 00:00:00 2001
From: Arthur White <arthur@whitedevops.com>
Date: Thu, 8 Mar 2018 23:40:50 +0100
Subject: [PATCH 0357/1382] Define Models and add name and associate(models)
 for Model

---
 types/sequelize/index.d.ts | 203 ++++++++++++++++++++-----------------
 1 file changed, 111 insertions(+), 92 deletions(-)

diff --git a/types/sequelize/index.d.ts b/types/sequelize/index.d.ts
index 40de978fac..e7d5f9637d 100644
--- a/types/sequelize/index.d.ts
+++ b/types/sequelize/index.d.ts
@@ -1894,8 +1894,8 @@ declare namespace sequelize {
      *
      * ```js
      * sequelize.define('model', {
- *   column: DataTypes.INTEGER
- * })
+     *   column: DataTypes.INTEGER
+     * })
      * ```
      * When defining a model you can just as easily pass a string as type, but often using the types defined here
      * is
@@ -1915,12 +1915,12 @@ declare namespace sequelize {
      *
      * ```js
      * sequelize.define('model', {
- *   uuid: {
- *     type: DataTypes.UUID,
- *     defaultValue: DataTypes.UUIDV1,
- *     primaryKey: true
- *   }
- * })
+     *   uuid: {
+     *     type: DataTypes.UUID,
+     *     defaultValue: DataTypes.UUIDV1,
+     *     primaryKey: true
+     *   }
+     * })
      * ```
      */
     interface DataTypes {
@@ -3611,12 +3611,12 @@ declare namespace sequelize {
         limit?: number;
 
         /**
-             * Transaction to run query under
+         * Transaction to run query under
          */
         transaction?: Transaction;
 
         /**
-        * If true, the updatedAt timestamp will not be updated.
+         * If true, the updatedAt timestamp will not be updated.
          */
         silent?: boolean;
     }
@@ -3655,6 +3655,13 @@ declare namespace sequelize {
         plain?: boolean;
     }
 
+    /**
+     * Models contains Model instances associated to their name
+     */
+    interface Models {
+        [index: string]: Model<any, any>;
+    }
+
     /**
      * A Model represents a table in the database. Sometimes you might also see it referred to as model, or simply
      * as factory. This class should _not_ be instantiated directly, it is created using `sequelize.define`, and
@@ -3667,6 +3674,11 @@ declare namespace sequelize {
          */
         Instance(): TInstance;
 
+        /**
+         * The singular name of the model
+         */
+        name: string;
+
         /**
          * Remove attribute from model definition
          *
@@ -3723,64 +3735,64 @@ declare namespace sequelize {
         addScope(name: string, scope: AnyFindOptions | Function, options?: AddScopeOptions): void;
 
         /**
-             * Add a new scope to the model. This is especially useful for adding scopes with includes, when the model you want to include is not available at the time this model is defined.
-             *
-             * By default this will throw an error if a scope with that name already exists. Pass `override: true` in the options object to silence this error.
-             *
-             * @param {String}          name The name of the scope. Use `defaultScope` to override the default scope
-             * @param {Object|Function} scope
-             * @param {Object}          [options]
-             * @param {Boolean}         [options.override=false]
-             */
+         * Add a new scope to the model. This is especially useful for adding scopes with includes, when the model you want to include is not available at the time this model is defined.
+         *
+         * By default this will throw an error if a scope with that name already exists. Pass `override: true` in the options object to silence this error.
+         *
+         * @param {String}          name The name of the scope. Use `defaultScope` to override the default scope
+         * @param {Object|Function} scope
+         * @param {Object}          [options]
+         * @param {Boolean}         [options.override=false]
+         */
         addScope(name: string, scope: AnyFindOptions | Function, options?: AddScopeOptions): void;
 
         /**
- * Apply a scope created in `define` to the model. First let's look at how to create scopes:
- * ```js
- * var Model = sequelize.define('model', attributes, {
- *   defaultScope: {
- *     where: {
- *       username: 'dan'
- *     },
- *     limit: 12
- *   },
- *   scopes: {
- *     isALie: {
- *       where: {
- *         stuff: 'cake'
- *       }
- *     },
- *     complexFunction: function(email, accessLevel) {
- *       return {
- *         where: {
- *           email: {
- *             $like: email
- *           },
- *           accesss_level {
- *             $gte: accessLevel
- *           }
- *         }
- *       }
- *     }
- *   }
- * })
- * ```
- * Now, since you defined a default scope, every time you do Model.find, the default scope is appended to
- * your query. Here's a couple of examples:
- * ```js
- * Model.findAll() // WHERE username = 'dan'
- * Model.findAll({ where: { age: { gt: 12 } } }) // WHERE age > 12 AND username = 'dan'
- * ```
- *
- * To invoke scope functions you can do:
- * ```js
- * Model.scope({ method: ['complexFunction' 'dan@sequelize.com', 42]}).findAll()
- * // WHERE email like 'dan@sequelize.com%' AND access_level >= 42
- * ```
- *
- * @return Model A reference to the model, with the scope(s) applied. Calling scope again on the returned
- *     model will clear the previous scope.
- */
+         * Apply a scope created in `define` to the model. First let's look at how to create scopes:
+         * ```js
+         * var Model = sequelize.define('model', attributes, {
+         *   defaultScope: {
+         *     where: {
+         *       username: 'dan'
+         *     },
+         *     limit: 12
+         *   },
+         *   scopes: {
+         *     isALie: {
+         *       where: {
+         *         stuff: 'cake'
+         *       }
+         *     },
+         *     complexFunction: function(email, accessLevel) {
+         *       return {
+         *         where: {
+         *           email: {
+         *             $like: email
+         *           },
+         *           accesss_level {
+         *             $gte: accessLevel
+         *           }
+         *         }
+         *       }
+         *     }
+         *   }
+         * })
+         * ```
+         * Now, since you defined a default scope, every time you do Model.find, the default scope is appended to
+         * your query. Here's a couple of examples:
+         * ```js
+         * Model.findAll() // WHERE username = 'dan'
+         * Model.findAll({ where: { age: { gt: 12 } } }) // WHERE age > 12 AND username = 'dan'
+         * ```
+         *
+         * To invoke scope functions you can do:
+         * ```js
+         * Model.scope({ method: ['complexFunction' 'dan@sequelize.com', 42]}).findAll()
+         * // WHERE email like 'dan@sequelize.com%' AND access_level >= 42
+         * ```
+         *
+         * @return Model A reference to the model, with the scope(s) applied. Calling scope again on the returned
+         *     model will clear the previous scope.
+         */
         scope(options?: string | ScopeOptions | AnyWhereOptions | Array<string | ScopeOptions | AnyWhereOptions>): Model<TInstance, TAttributes>;
 
         /**
@@ -3969,30 +3981,30 @@ declare namespace sequelize {
         findOrCreate(options: FindOrInitializeOptions<TAttributes>): Promise<[TInstance, boolean]>;
 
         /**
-             * A more performant findOrCreate that will not work under a transaction (at least not in postgres)
-             * Will execute a find call, if empty then attempt to create, if unique constraint then attempt to find again
-             */
+         * A more performant findOrCreate that will not work under a transaction (at least not in postgres)
+         * Will execute a find call, if empty then attempt to create, if unique constraint then attempt to find again
+         */
         findCreateFind<TCustomAttributes>(options: FindCreateFindOptions<TAttributes & TCustomAttributes>): Promise<[TInstance, boolean]>;
 
         /**
- * Insert or update a single row. An update will be executed if a row which matches the supplied values on
- * either the primary key or a unique key is found. Note that the unique index must be defined in your
- * sequelize model and not just in the table. Otherwise you may experience a unique constraint violation,
- * because sequelize fails to identify the row that should be updated.
- *
- * **Implementation details:**
- *
- * * MySQL - Implemented as a single query `INSERT values ON DUPLICATE KEY UPDATE values`
- * * PostgreSQL - Implemented as a temporary function with exception handling: INSERT EXCEPTION WHEN
- *   unique_constraint UPDATE
- * * SQLite - Implemented as two queries `INSERT; UPDATE`. This means that the update is executed
- * regardless
- *   of whether the row already existed or not
- *
- * **Note** that SQLite returns undefined for created, no matter if the row was created or updated. This is
- * because SQLite always runs INSERT OR IGNORE + UPDATE, in a single query, so there is no way to know
- * whether the row was inserted or not.
- */
+         * Insert or update a single row. An update will be executed if a row which matches the supplied values on
+         * either the primary key or a unique key is found. Note that the unique index must be defined in your
+         * sequelize model and not just in the table. Otherwise you may experience a unique constraint violation,
+         * because sequelize fails to identify the row that should be updated.
+         *
+         * **Implementation details:**
+         *
+         * * MySQL - Implemented as a single query `INSERT values ON DUPLICATE KEY UPDATE values`
+         * * PostgreSQL - Implemented as a temporary function with exception handling: INSERT EXCEPTION WHEN
+         *   unique_constraint UPDATE
+         * * SQLite - Implemented as two queries `INSERT; UPDATE`. This means that the update is executed
+         * regardless
+         *   of whether the row already existed or not
+         *
+         * **Note** that SQLite returns undefined for created, no matter if the row was created or updated. This is
+         * because SQLite always runs INSERT OR IGNORE + UPDATE, in a single query, so there is no way to know
+         * whether the row was inserted or not.
+         */
         upsert(values: TAttributes, options?: UpsertOptions): Promise<boolean>;
         insertOrUpdate(values: TAttributes, options?: UpsertOptions): Promise<boolean>;
 
@@ -4044,6 +4056,13 @@ declare namespace sequelize {
          */
         unscoped(): this;
 
+        /**
+         * Set associations with other models
+         *
+         * @param models
+         */
+        associate?(models: Models): void;
+
     }
 
     //
@@ -4062,12 +4081,12 @@ declare namespace sequelize {
         /**
          * A function that gets executed while running the query to log the sql.
          */
-        logging?: boolean | Function;            
+        logging?: boolean | Function;
 
         /**
          * An optional transaction to perform this query in
          */
-        transaction?: Transaction; 
+        transaction?: Transaction;
 
     }
 
@@ -4652,10 +4671,10 @@ declare namespace sequelize {
         bind?: Object | string[];
 
         /**
- * Force the query to use the write pool, regardless of the query type.
- *
- * Defaults to false
- */
+         * Force the query to use the write pool, regardless of the query type.
+         *
+         * Defaults to false
+         */
         useMaster?: boolean;
 
         /**

From 3ed377df2289b0f7aabfb92dea097fd4bbae9628 Mon Sep 17 00:00:00 2001
From: Ramon de Klein <mail@ramondeklein.nl>
Date: Fri, 9 Mar 2018 00:17:54 +0100
Subject: [PATCH 0358/1382] Fix typing of Model.createTable

---
 types/dynogels/index.d.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/dynogels/index.d.ts b/types/dynogels/index.d.ts
index 2e4c5acbf4..4742af5a04 100644
--- a/types/dynogels/index.d.ts
+++ b/types/dynogels/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for dynogels 8.0
 // Project: https://github.com/clarkie/dynogels#readme
 // Definitions by: Spartan Labs <https://github.com/SpartanLabs>
+//                 Ramon de Klein <https://github.com/ramondeklein>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
@@ -76,7 +77,7 @@ export interface Model {
     getItems(items: string[] | Array<{ [key: string]: string }>, options: GetItemOptions, callback: (err: Error, items: any[]) => void): void;
     batchGetItems(items: string[] | Array<{ [key: string]: string }>, callback: (err: Error, items: any[]) => void): void;
     batchGetItems(items: string[] | Array<{ [key: string]: string }>, options: GetItemOptions, callback: (err: Error, items: any[]) => void): void;
-    createTable(options: { [key: string]: CreateTablesOptions } | DynogelsGlobalOptions, callback: (err: Error, data: AWS.DynamoDB.CreateTableOutput) => void): void;
+    createTable(options: CreateTablesOptions, callback: (err: Error, data: AWS.DynamoDB.CreateTableOutput) => void): void;
     createTable(callback: (err: Error, data: AWS.DynamoDB.CreateTableOutput) => void): void;
     updateTable(throughput: Throughput, callback: (err: Error, data: AWS.DynamoDB.UpdateTableOutput) => void): void;
     updateTable(callback: (err: Error, data: AWS.DynamoDB.UpdateTableOutput) => void): void;

From 6b4889bc997d20eb6f2ceb797067fc5d63deb2d0 Mon Sep 17 00:00:00 2001
From: Benny Neugebauer <bn@bennyn.de>
Date: Fri, 9 Mar 2018 01:48:10 +0100
Subject: [PATCH 0359/1382] linting

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

diff --git a/types/coinbase/index.d.ts b/types/coinbase/index.d.ts
index 0adff59d46..6057f58142 100644
--- a/types/coinbase/index.d.ts
+++ b/types/coinbase/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for coinbase 2.0.6
+// Type definitions for coinbase 2.0
 // Project: https://github.com/coinbase/coinbase-node
 // Definitions by: Rogier Schouten <https://github.com/rogierschouten>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -311,14 +311,14 @@ export interface Price {
          * Currency e.g. "EUR" (see Client#getCurrencies() for available strings)
          */
         currency: string;
-    }
+    };
     warnings?: [
         {
             id: string
             message: string
             url: string
         }
-    ]
+    ];
 }
 
 export type ResourceType = "account" | "transaction" | "address" | "user" | "buy" | "sell" | "deposit" | "withdrawal" | "payment_method";

From e2000f841d10569407c9ba4b981d3971a5432670 Mon Sep 17 00:00:00 2001
From: GlenCFL <glencfl@gmail.com>
Date: Thu, 8 Mar 2018 20:20:32 -0500
Subject: [PATCH 0360/1382] atom: remove jQuery as a dependency.

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

diff --git a/types/atom/index.d.ts b/types/atom/index.d.ts
index 6a68d685a1..f45f209a90 100644
--- a/types/atom/index.d.ts
+++ b/types/atom/index.d.ts
@@ -9,7 +9,6 @@
 // NOTE: only those classes exported within this file should be retain that status below.
 // https://github.com/atom/atom/blob/v1.24.0/exports/atom.js
 
-/// <reference types="jquery" />
 /// <reference types="node" />
 
 import { ReadStream, WriteStream } from "fs";
@@ -6754,7 +6753,7 @@ export interface Tooltip {
     enabled: boolean;
     timeout: number;
     hoverState: "in"|"out"|null;
-    element: JQuery|HTMLElement;
+    element: HTMLElement;
 
     getTitle(): string;
     getTooltipElement(): HTMLElement;

From 393813902921572fbb99fd1a3f628a64edaf716b Mon Sep 17 00:00:00 2001
From: Nick Whyte <nick@nickwhyte.com>
Date: Fri, 9 Mar 2018 12:26:09 +1100
Subject: [PATCH 0361/1382] prismic-dom: Add initial typings

---
 types/prismic-dom/index.d.ts           |  8 ++++++++
 types/prismic-dom/prismic-dom-tests.ts |  3 +++
 types/prismic-dom/tsconfig.json        | 22 ++++++++++++++++++++++
 types/prismic-dom/tslint.json          |  1 +
 4 files changed, 34 insertions(+)
 create mode 100644 types/prismic-dom/index.d.ts
 create mode 100644 types/prismic-dom/prismic-dom-tests.ts
 create mode 100644 types/prismic-dom/tsconfig.json
 create mode 100644 types/prismic-dom/tslint.json

diff --git a/types/prismic-dom/index.d.ts b/types/prismic-dom/index.d.ts
new file mode 100644
index 0000000000..9588f1e25c
--- /dev/null
+++ b/types/prismic-dom/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for prismic-dom 2.0
+// Project: https://github.com/prismicio/prismic-dom#readme
+// Definitions by: Nick Whyte <https://github.com/nickw444/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export class RichText {
+    static asHtml(richText: any, linkResolver?: (doc: any) => string): string;
+}
diff --git a/types/prismic-dom/prismic-dom-tests.ts b/types/prismic-dom/prismic-dom-tests.ts
new file mode 100644
index 0000000000..9e123002f1
--- /dev/null
+++ b/types/prismic-dom/prismic-dom-tests.ts
@@ -0,0 +1,3 @@
+import prismicDom = require("prismic-dom");
+
+let rendered: string = prismicDom.RichText.asHtml({});
diff --git a/types/prismic-dom/tsconfig.json b/types/prismic-dom/tsconfig.json
new file mode 100644
index 0000000000..ef0b24f3a7
--- /dev/null
+++ b/types/prismic-dom/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "prismic-dom-tests.ts"
+    ]
+}
diff --git a/types/prismic-dom/tslint.json b/types/prismic-dom/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/prismic-dom/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 4377692a9b1e3dd06c9e7a9c1ce4d5e7a237d02c Mon Sep 17 00:00:00 2001
From: Nick Whyte <nick@nickwhyte.com>
Date: Fri, 9 Mar 2018 12:28:40 +1100
Subject: [PATCH 0362/1382] .

---
 types/prismic-dom/tsconfig.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/prismic-dom/tsconfig.json b/types/prismic-dom/tsconfig.json
index ef0b24f3a7..0687e7ae0e 100644
--- a/types/prismic-dom/tsconfig.json
+++ b/types/prismic-dom/tsconfig.json
@@ -7,6 +7,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"

From 2f3607131c9716b01fcd7e7f76cb82764fb9b4ac Mon Sep 17 00:00:00 2001
From: Nick Whyte <nick@nickwhyte.com>
Date: Fri, 9 Mar 2018 12:32:31 +1100
Subject: [PATCH 0363/1382] .

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

diff --git a/types/prismic-dom/index.d.ts b/types/prismic-dom/index.d.ts
index 9588f1e25c..82c766fda6 100644
--- a/types/prismic-dom/index.d.ts
+++ b/types/prismic-dom/index.d.ts
@@ -1,8 +1,8 @@
 // Type definitions for prismic-dom 2.0
 // Project: https://github.com/prismicio/prismic-dom#readme
-// Definitions by: Nick Whyte <https://github.com/nickw444/>
+// Definitions by: Nick Whyte <https://github.com/nickw444>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-export class RichText {
-    static asHtml(richText: any, linkResolver?: (doc: any) => string): string;
+export namespace RichText {
+    function asHtml(richText: any, linkResolver?: (doc: any) => string): string;
 }
diff --git a/types/prismic-dom/prismic-dom-tests.ts b/types/prismic-dom/prismic-dom-tests.ts
index 9e123002f1..598573cced 100644
--- a/types/prismic-dom/prismic-dom-tests.ts
+++ b/types/prismic-dom/prismic-dom-tests.ts
@@ -1,3 +1,3 @@
 import prismicDom = require("prismic-dom");
 
-let rendered: string = prismicDom.RichText.asHtml({});
+const rendered: string = prismicDom.RichText.asHtml({});

From 6a74caff79264a15bbc738e62109ed497e0a45da Mon Sep 17 00:00:00 2001
From: Carl Foster <carl.john.foster@gmail.com>
Date: Fri, 9 Mar 2018 11:59:33 +1000
Subject: [PATCH 0364/1382] Add types for stellar-sdk

---
 types/stellar-sdk/index.d.ts           | 862 +++++++++++++++++++++++++
 types/stellar-sdk/stellar-sdk-tests.ts |   9 +
 types/stellar-sdk/tsconfig.json        |  23 +
 types/stellar-sdk/tslint.json          |   7 +
 4 files changed, 901 insertions(+)
 create mode 100644 types/stellar-sdk/index.d.ts
 create mode 100644 types/stellar-sdk/stellar-sdk-tests.ts
 create mode 100644 types/stellar-sdk/tsconfig.json
 create mode 100644 types/stellar-sdk/tslint.json

diff --git a/types/stellar-sdk/index.d.ts b/types/stellar-sdk/index.d.ts
new file mode 100644
index 0000000000..307c6b44af
--- /dev/null
+++ b/types/stellar-sdk/index.d.ts
@@ -0,0 +1,862 @@
+// Type definitions for stellar-sdk 0.8
+// Project: https://github.com/stellar/js-stellar-sdk
+// Definitions by: Carl Foster <https://github.com/carl-foster>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+/// <reference types="node" />
+
+export class Account {
+    constructor(accountId: string, sequence: string | number)
+    accountId(): string
+    sequenceNumber(): string
+    incrementSequenceNumber(): void
+}
+
+export class CallBuilder<T extends Record> {
+    constructor(serverUrl: string)
+    call(): Promise<CollectionPage<T>>
+    cursor(cursor: string): this
+    limit(limit: number): this
+    order(direction: 'asc' | 'desc'): this
+    stream(options?: { onmessage?: () => void, onerror?: () => void }): () => void
+}
+
+export interface CollectionPage<T extends Record> {
+    records: T[],
+    next: () => Promise<CollectionPage<T>>,
+    prev: () => Promise<CollectionPage<T>>,
+}
+
+export interface Record {
+    _links: {
+        [key: string]: RecordLink
+    }
+}
+
+export interface RecordLink {
+    href: string
+    templated?: boolean
+}
+
+/* Due to a bug with the recursive function requests */
+export interface CollectionRecord<T extends Record> {
+    _links: {
+        next: RecordLink
+        prev: RecordLink
+        self: RecordLink
+    }
+    _embedded: {
+        records: T[]
+    }
+}
+
+export interface CallFunctionTemplateOptions {
+    cursor?: string | number
+    limit?: number
+    order?: 'asc' | 'desc'
+}
+
+export type CallFunction<T extends Record> = () => Promise<T>
+export type CallCollectionFunction<T extends Record> =
+    (options?: CallFunctionTemplateOptions) => Promise<CollectionRecord<T>>
+
+export interface AccountRecord extends Record {
+    id: string
+    paging_token: string
+    account_id: string
+    sequence: number
+    subentry_count: number
+    thresholds: {
+        low_threshold: number
+        med_threshold: number
+        high_threshold: number
+    }
+    flags: {
+        auth_required: boolean
+        auth_revocable: boolean
+    }
+    balances: Array<
+    {
+        balance: string
+        asset_type: 'native'
+    } |
+    {
+        balance: string
+        limit: string
+        asset_type: 'credit_alphanum4' | 'credit_alphanum12'
+        asset_code: string
+        asset_issuer: string
+    }
+    >
+    signers: Array<
+    {
+        _key: string
+        weight: number
+    }
+    >
+    data: {
+        [key: string]: string
+    }
+
+    effects: CallCollectionFunction<EffectRecord>
+    offers: CallCollectionFunction<OfferRecord>
+    operations: CallCollectionFunction<OperationRecord>
+    payments: CallCollectionFunction<PaymentOperationRecord>
+    trades: CallCollectionFunction<TradeRecord>
+}
+
+export interface AssetRecord extends Record {
+    asset_type: 'credit_alphanum4' | 'credit_alphanum12'
+    asset_code: string
+    asset_issuer: string
+    paging_token: string
+    amount: string
+    num_accounts: number
+    flags: {
+        auth_required: boolean
+        auth_revocable: boolean
+    }
+}
+
+export interface EffectRecord extends Record {
+    account: string
+    paging_token: string
+    starting_balance: string
+    type_i: string
+    type: string
+
+    operation?: CallFunction<OperationRecord>
+    precedes?: CallFunction<EffectRecord>
+    succeeds?: CallFunction<EffectRecord>
+}
+
+export interface LedgerRecord extends Record {
+    id: string
+    paging_token: string
+    hash: string
+    prev_hash: string
+    sequence: number
+    transaction_count: number
+    operation_count: number
+    closed_at: string
+    total_coins: string
+    fee_pool: string
+    base_fee: number
+    base_reserve: string
+    max_tx_set_size: number
+    protocol_version: number
+    header_xdr: string
+    base_fee_in_stroops: number
+    base_reserve_in_stroops: number
+
+    effects: CallCollectionFunction<EffectRecord>
+    operations: CallCollectionFunction<OperationRecord>
+    self: CallFunction<LedgerRecord>
+    transactions: CallCollectionFunction<TransactionRecord>
+}
+
+export interface OfferRecord extends Record {
+    id: string
+    paging_token: string
+    seller_attr: string
+    selling: Asset
+    buying: Asset
+    amount: string
+    price_r: { numerator: number, denominator: number }
+    price: string
+
+    seller?: CallFunction<AccountRecord>
+}
+
+export interface BaseOperationRecord extends Record {
+    id: string
+    paging_token: string
+    type: string
+    type_i: number
+
+    self: CallFunction<OperationRecord>
+    succeeds: CallFunction<OperationRecord>
+    precedes: CallFunction<OperationRecord>
+    effects: CallCollectionFunction<EffectRecord>
+    transaction: CallFunction<TransactionRecord>
+}
+
+export interface CreateAccountOperationRecord extends BaseOperationRecord {
+    type: 'create_account'
+    account: string
+    funder: string
+    starting_balance: string
+}
+
+export interface PaymentOperationRecord extends BaseOperationRecord {
+    type: 'payment'
+    from: string
+    to: string
+    asset_type: string
+    asset_code?: string
+    asset_issuer?: string
+    amount: string
+
+    sender: CallFunction<AccountRecord>
+    receiver: CallFunction<AccountRecord>
+}
+
+export interface PathPaymentOperationRecord extends BaseOperationRecord {
+    type: 'path_payment'
+    from: string
+    to: string
+    asset_code?: string
+    asset_issuer?: string
+    asset_type: string
+    amount: string
+    source_asset_code?: string
+    source_asset_issuer?: string
+    source_asset_type: string
+    source_max: string
+    source_amount: string
+}
+
+export interface ManageOfferOperationRecord extends BaseOperationRecord {
+    type: 'manage_offer'
+    offer_id: number
+    amount: string
+    buying_asset_code?: string
+    buying_asset_issuer?: string
+    buying_asset_type: string
+    price: string
+    price_r: { numerator: number, denominator: number }
+    selling_asset_code?: string
+    selling_asset_issuer?: string
+    selling_asset_type: string
+}
+
+export interface PassiveOfferOperationRecord extends BaseOperationRecord {
+    type: 'create_passive_offer'
+    offer_id: number
+    amount: string
+    buying_asset_code?: string
+    buying_asset_issuer?: string
+    buying_asset_type: string
+    price: string
+    price_r: { numerator: number, denominator: number }
+    selling_asset_code?: string
+    selling_asset_issuer?: string
+    selling_asset_type: string
+}
+
+export interface SetOptionsOperationRecord extends BaseOperationRecord {
+    type: 'set_options'
+    signer_key?: string
+    signer_weight?: number
+    master_key_weight?: number
+    low_threshold?: number
+    med_threshold?: number
+    high_threshold?: number
+    home_domain?: string
+    set_flags: Array<(1 | 2)>
+    set_flags_s: Array<('auth_required_flag' | 'auth_revocable_flag')>
+    clear_flags: Array<(1 | 2)>
+    clear_flags_s: Array<('auth_required_flag' | 'auth_revocable_flag')>
+}
+
+export interface ChangeTrustOperationRecord extends BaseOperationRecord {
+    type: 'change_trust'
+    asset_code: string
+    asset_issuer: string
+    asset_type: string
+    trustee: string
+    trustor: string
+    limit: string
+}
+
+export interface AllowTrustOperationRecord extends BaseOperationRecord {
+    type: 'allow_trust'
+    asset_code: string
+    asset_issuer: string
+    asset_type: string
+    authorize: boolean
+    trustee: string
+    trustor: string
+}
+
+export interface AccountMergeOperationRecord extends BaseOperationRecord {
+    type: 'account_merge'
+    into: string
+}
+
+export interface InflationOperationRecord extends BaseOperationRecord {
+    type: 'inflation'
+}
+
+export interface ManageDataOperationRecord extends BaseOperationRecord {
+    type: 'manage_data'
+    name: string
+    value: string
+}
+
+export type OperationRecord = CreateAccountOperationRecord
+    | PaymentOperationRecord
+    | PathPaymentOperationRecord
+    | ManageOfferOperationRecord
+    | PassiveOfferOperationRecord
+    | SetOptionsOperationRecord
+    | ChangeTrustOperationRecord
+    | AllowTrustOperationRecord
+    | AccountMergeOperationRecord
+    | InflationOperationRecord
+    | ManageDataOperationRecord
+
+export interface OrderbookRecord extends Record {
+    bids: Array<{ price_r: {}, price: number, amount: string }>
+    asks: Array<{ price_r: {}, price: number, amount: string }>
+    selling: Asset
+    buying: Asset
+}
+
+export interface PaymentPathRecord extends Record {
+    path: Array<{
+        asset_code: string
+        asset_issuer: string
+        asset_type: string
+    }>
+    source_amount: string
+    source_asset_type: string
+    source_asset_code: string
+    source_asset_issuer: string
+    destination_amount: string
+    destination_asset_type: string
+    destination_asset_code: string
+    destination_asset_issuer: string
+}
+
+export interface TradeRecord extends Record {
+    id: string
+    paging_token: string
+    ledger_close_time: string
+    base_account: string
+    base_amount: string
+    base_asset_type: string
+    base_asset_code: string
+    base_asset_issuer: string
+    counter_account: string
+    counter_amount: string
+    counter_asset_type: string
+    counter_asset_code: string
+    counter_asset_issuer: string
+    base_is_seller: boolean
+
+    base: CallFunction<AccountRecord>
+    counter: CallFunction<AccountRecord>
+    operation: CallFunction<OperationRecord>
+}
+
+export interface TradeAggregationRecord extends Record {
+    timestamp: string
+    trade_count: number
+    base_volume: string
+    counter_volume: string
+    avg: string
+    high: string
+    low: string
+    open: string
+    close: string
+}
+
+export interface TransactionRecord extends Record {
+    id: string
+    paging_token: string
+    hash: string
+    ledger_attr: number
+    created_at: string
+    max_fee: number
+    fee_paid: number
+    operation_count: number
+    result_code: number
+    result_code_s: string
+    source_account: string
+    source_account_sequence: string
+    envelope_xdr: string
+    result_xdr: string
+    result_meta_xdr: string
+    memo: string
+
+    account: CallFunction<AccountRecord>
+    effects: CallCollectionFunction<EffectRecord>
+    ledger: CallFunction<LedgerRecord>
+    operations: CallCollectionFunction<OperationRecord>
+    precedes: CallFunction<TransactionRecord>
+    self: CallFunction<TransactionRecord>
+    succeeds: CallFunction<TransactionRecord>
+}
+
+export class AccountCallBuilder extends CallBuilder<AccountRecord> {
+    accountId(id: string): this
+}
+export class AccountResponse implements AccountRecord {
+    _links: { [key: string]: { href: string } }
+    id: string
+    paging_token: string
+    account_id: string
+    sequence: number
+    subentry_count: number
+    thresholds: {
+        low_threshold: number
+        med_threshold: number
+        high_threshold: number
+    }
+    flags: {
+        auth_required: boolean
+        auth_revocable: boolean
+    }
+    balances: Array<
+        {
+            balance: string
+            asset_type: 'native'
+        } |
+        {
+            balance: string
+            limit: string
+            asset_type: 'credit_alphanum4' | 'credit_alphanum12'
+            asset_code: string
+            asset_issuer: string
+        }
+        >
+    signers: Array<
+        {
+            _key: string
+            weight: number
+        }
+        >
+    data: {
+        [key: string]: string
+    }
+
+    effects: CallCollectionFunction<EffectRecord>
+    offers: CallCollectionFunction<OfferRecord>
+    operations: CallCollectionFunction<OperationRecord>
+    payments: CallCollectionFunction<PaymentOperationRecord>
+    trades: CallCollectionFunction<TradeRecord>
+    constructor(response: AccountRecord)
+    accountId(): string
+    sequenceNumber(): string
+    incrementSequenceNumber(): void
+}
+
+export class Asset {
+    static native(): Asset
+    constructor(code: string, issuer: string)
+
+    getCode(): string
+    getIssuer(): string
+    getAssetType(): 'native' | 'credit_alphanum4' | 'credit_alphanum12'
+    isNative(): boolean
+    equals(other: Asset): boolean
+
+    code: string
+    issuer: string
+}
+
+export class AssetsCallBuilder extends CallBuilder<AssetRecord> {
+    forCode(value: string): this
+    forIssuer(value: string): this
+}
+
+export namespace Config {
+    function setAllowHttp(allow: boolean): void
+    function isAllowHttp(): boolean
+    function setDefault(): void
+}
+
+export class EffectCallBuilder extends CallBuilder<EffectRecord> {
+    forAccount(accountId: string): this
+    forLedger(sequence: string): this
+    forOperation(operationId: number): this
+    forTransaction(transactionId: string): this
+}
+
+export interface FederationRecord {
+    account_id: string
+    memo_type?: string
+    memo?: string
+}
+
+export interface FederationOptions {
+    allowHttp: boolean
+}
+export class FederationServer {
+    static createForDomain(domain: string, options?: FederationOptions): Promise<FederationServer>
+    static resolve(value: string, options?: FederationOptions): Promise<FederationRecord>
+
+    constructor(serverURL: string, domain: string, options?: FederationOptions)
+    resolveAccountId(account: string): Promise<FederationRecord>
+    resolveAddress(address: string): Promise<FederationRecord>
+    resolveTransactionId(transactionId: string): Promise<FederationRecord>
+}
+
+export class LedgerCallBuilder extends CallBuilder<LedgerRecord> { }
+
+export class Memo {
+    static fromXDRObject(memo: xdr.Memo): Memo
+    static hash(hash: string): Memo
+    static id(id: string): Memo
+    static none(): Memo
+    static return(hash: string): Memo
+    static text(text: string): Memo
+
+    constructor(type: 'MemoNone')
+    constructor(type: 'MemoID' | 'MemoText', value: string)
+    constructor(type: 'MemoHash' | 'MemoReturn', value: Buffer)
+
+    type: 'MemoNone' | 'MemoID' | 'MemoText' | 'MemoHash' | 'MemoReturn'
+    value: null | string | Buffer
+
+    toXDRObject(): xdr.Memo
+}
+
+export enum Networks {
+    PUBLIC = 'Public Global Stellar Network ; September 2015',
+    TESTNET = 'Test SDF Network ; September 2015',
+}
+
+export class Network {
+    static use(network: Network): void
+    static usePublicNetwork(): void
+    static useTestNetwork(): void
+    static current(): Network
+
+    constructor(passphrase: string)
+
+    networkPassphrase(): string
+    networkId(): string
+}
+
+export class OfferCallBuilder extends CallBuilder<OfferRecord> { }
+
+export type TransactionOperation =
+    Operation.CreateAccount
+    | Operation.Payment
+    | Operation.PathPayment
+    | Operation.CreatePassiveOffer
+    | Operation.ManageOffer
+    | Operation.SetOptions
+    | Operation.ChangeTrust
+    | Operation.AllowTrust
+    | Operation.AccountMerge
+    | Operation.Inflation
+    | Operation.ManageData
+
+export enum OperationType {
+    createAccount = 'createAccount',
+    payment = 'payment',
+    pathPayment = 'pathPayment',
+    createPassiveOffer = 'createPassiveOffer',
+    manageOffer = 'manageOffer',
+    setOptions = 'setOptions',
+    changeTrust = 'changeTrust',
+    allowTrust = 'allowTrust',
+    accountMerge = 'accountMerge',
+    inflation = 'inflation',
+    manageData = 'manageData',
+}
+
+export namespace Operation {
+    interface Operation {
+        type: OperationType
+        source: string | null
+    }
+    interface AccountMerge extends Operation {
+        type: OperationType.accountMerge
+        destination: string
+    }
+    interface AccountMergeOptions {
+        destination: string
+        source?: string
+    }
+    function accountMerge(options: AccountMergeOptions): xdr.Operation<AccountMerge>
+
+    interface AllowTrust extends Operation {
+        type: OperationType.allowTrust
+        trustor: string
+        assetCode: string
+        authorize: boolean
+    }
+    interface AllowTrustOptions {
+        trustor: string
+        assetCode: string
+        authorize: boolean
+        source?: string
+    }
+    function allowTrust(options: AllowTrustOptions): xdr.Operation<AllowTrust>
+
+    interface ChangeTrust extends Operation {
+        type: OperationType.changeTrust
+        line: Asset
+        limit: string | number
+    }
+    interface ChangeTrustOptions {
+        asset: Asset
+        limit: string
+        source?: string
+    }
+    function changeTrust(options: ChangeTrustOptions): xdr.Operation<ChangeTrust>
+
+    interface CreateAccount extends Operation {
+        type: OperationType.createAccount
+        source: string
+        destination: string
+        startingBalance: string | number
+    }
+    interface CreateAccountOptions {
+        destination: string
+        startingBalance: string
+        source?: string
+    }
+    function createAccount(options: CreateAccountOptions): xdr.Operation<CreateAccount>
+
+    interface CreatePassiveOffer extends Operation {
+        type: OperationType.createPassiveOffer
+        selling: Asset
+        buying: Asset
+        amount: string | number
+        price: string | number
+    }
+    interface CreatePassiveOfferOptions {
+        selling: Asset
+        buying: Asset
+        amount: string
+        price: number | string | object
+        source?: string
+    }
+    function createPassiveOffer(options: CreatePassiveOfferOptions): xdr.Operation<CreatePassiveOffer>
+
+    interface Inflation extends Operation {
+        type: OperationType.inflation
+    }
+    function inflation(options: { source?: string }): xdr.Operation<Inflation>
+
+    interface ManageData extends Operation {
+        type: OperationType.manageData
+        name: string
+        value: string
+    }
+    interface ManageDataOptions {
+        name: string
+        value: string | Buffer
+        source?: string
+    }
+    function manageData(options: ManageDataOptions): xdr.Operation<ManageData>
+
+    interface ManageOffer extends Operation {
+        type: OperationType.manageOffer
+        selling: Asset
+        buying: Asset
+        amount: string | number
+        price: string | number
+        offerId: string
+    }
+    interface ManageOfferOptions extends CreatePassiveOfferOptions {
+        offerId: number | string
+    }
+    function manageOffer(options: ManageOfferOptions): xdr.Operation<ManageOffer>
+
+    interface PathPayment extends Operation {
+        type: OperationType.pathPayment
+        sendAsset: Asset
+        sendMax: string | number
+        destination: string
+        destAsset: Asset
+        destAmount: string | number
+        path: Asset[]
+    }
+    interface PathPaymentOptions {
+        sendAsset: Asset
+        sendMax: string
+        destination: string
+        destAsset: Asset
+        destAmount: string
+        path: Asset[]
+        source?: string
+    }
+    function pathPayment(options: PathPaymentOptions): xdr.Operation<PathPayment>
+
+    interface Payment extends Operation {
+        type: OperationType.payment
+        destination: string
+        asset: Asset
+        amount: string | number
+    }
+    interface PaymentOptions {
+        destination: string
+        asset: Asset
+        amount: string
+        source?: string
+    }
+    function payment(options: PaymentOptions): xdr.Operation<Payment>
+
+    /*
+     * Required = 1 << 0
+     * Revocable = 1 << 1
+     * Immutable = 1 << 2
+     */
+    enum AuthFlags {
+        Required = 1,
+        Revocable = 2,
+        Immutable = 4,
+    }
+    interface Signer {
+        ed25519PublicKey?: string
+        sha256Hash?: Buffer | string
+        preAuthTx?: Buffer | string
+        weight?: number | string
+    }
+    interface SetOptions extends Operation {
+        type: OperationType.setOptions
+        inflationDest?: string
+        clearFlags?: AuthFlags
+        setFlags?: AuthFlags
+        masterWeight?: number | string
+        lowThreshold?: number | string
+        medThreshold?: number | string
+        highThreshold?: number | string
+        homeDomain?: string
+        signer?: Signer
+    }
+    interface SetOptionsOptions {
+        inflationDest?: string
+        clearFlags?: AuthFlags
+        setFlags?: AuthFlags
+        masterWeight?: number | string
+        lowThreshold?: number | string
+        medThreshold?: number | string
+        highThreshold?: number | string
+        signer?: Signer
+        homeDomain?: string
+        source?: string
+    }
+    function setOptions(options: SetOptionsOptions): xdr.Operation<SetOptions>
+
+    function fromXDRObject<T extends Operation>(xdrOperation: xdr.Operation<T>): T
+}
+
+export class OperationCallBuilder extends CallBuilder<OperationRecord> { }
+export class OrderbookCallBuilder extends CallBuilder<OrderbookRecord> { }
+export class PathCallBuilder extends CallBuilder<PaymentPathRecord> { }
+export class PaymentCallBuilder extends CallBuilder<PaymentOperationRecord> { }
+
+export class Server {
+    constructor(serverURL: string, options?: { allowHttp: boolean })
+    accounts(): AccountCallBuilder
+    assets(): AssetsCallBuilder
+    effects(): EffectCallBuilder
+    ledgers(): LedgerCallBuilder
+    loadAccount(accountId: string): Promise<AccountResponse>
+    offers(resource: string, ...parameters: string[]): OfferCallBuilder
+    operations(): OperationCallBuilder
+    orderbook(selling: Asset, buying: Asset): OrderbookCallBuilder
+    paths(
+        source: string,
+        destination: string,
+        destinationAsset: Asset,
+        destinationAmount: string,
+    ): PathCallBuilder
+    payments(): PaymentCallBuilder
+    submitTransaction(transaction: Transaction): Promise<any>
+    tradeAggregation(
+        base: Asset,
+        counter: Asset,
+        startTime: Date,
+        endTime: Date,
+        resolution: Date,
+    ): TradeAggregationCallBuilder
+    trades(): TradesCallBuilder
+    transactions(): TransactionCallBuilder
+}
+
+export namespace StrKey {
+    function encodeEd25519PublicKey(data: Buffer): string
+    function decodeEd25519PublicKey(data: string): Buffer
+    function isValidEd25519PublicKey(Key: string): boolean
+
+    function encodeEd25519SecretSeed(data: Buffer): string
+    function decodeEd25519SecretSeed(data: string): Buffer
+    function isValidEd25519SecretSeed(seed: string): boolean
+
+    function encodePreAuthTx(data: Buffer): string
+    function decodePreAuthTx(data: string): Buffer
+
+    function encodeSha256Hash(data: Buffer): string
+    function decodeSha256Hash(data: string): Buffer
+}
+
+export class TradeAggregationCallBuilder extends CallBuilder<TradeAggregationRecord> { }
+export class TradesCallBuilder extends CallBuilder<TradeRecord> {
+    forAssetPair(base: Asset, counter: Asset): this
+    forOffer(offerId: string): this
+}
+
+export class Transaction {
+    constructor(envelope: string | xdr.TransactionEnvelope)
+    hash(): Buffer
+    sign(...keypairs: Keypair[]): void
+    signatureBase(): Buffer
+    signHashX(preimage: Buffer | string): void
+    toEnvelope(): xdr.TransactionEnvelope
+
+    operations: TransactionOperation[]
+    sequence: number
+    fee: number
+    source: string
+    memo: Memo
+}
+
+export class TransactionBuilder {
+    constructor(sourceAccount: Account, options?: TransactionBuilder.TransactionBuilderOptions)
+    addOperation(operation: xdr.Operation<Operation.Operation>): this
+    addMemo(memo: Memo): this
+    build(): Transaction
+}
+
+export namespace TransactionBuilder {
+    interface TransactionBuilderOptions {
+        fee?: number
+        timebounds?: {
+            minTime?: number | string
+            maxTime?: number | string
+        }
+        memo?: Memo
+    }
+}
+
+export class TransactionCallBuilder extends CallBuilder<TransactionRecord> {
+    transaction(transactionId: string): this
+    forAccount(accountId: string): this
+    forLedger(sequence: string | number): this
+}
+
+export class Keypair {
+    static fromRawEd25519Seed(secretSeed: Buffer): Keypair
+    static fromSecret(secretKey: string): Keypair
+    static master(): Keypair
+    static fromPublicKey(publicKey: string): Keypair
+    static random(): Keypair
+
+    constructor(keys: { type: 'ed25519', secretKey: string } | { type: 'ed25519', Key: string })
+
+    publicKey(): string
+    secret(): string
+    rawSecretKey(): Buffer
+    canSign(): boolean
+    sign(data: Buffer): Buffer
+    verify(data: Buffer, signature: Buffer): boolean
+}
+
+export namespace xdr {
+    class XDRStruct {
+        toXDR(): Buffer
+    }
+    class Operation<T extends Operation.Operation> extends XDRStruct { }
+    class Asset extends XDRStruct { }
+    class Memo extends XDRStruct { }
+    class TransactionEnvelope extends XDRStruct { }
+}
diff --git a/types/stellar-sdk/stellar-sdk-tests.ts b/types/stellar-sdk/stellar-sdk-tests.ts
new file mode 100644
index 0000000000..c403b6bc56
--- /dev/null
+++ b/types/stellar-sdk/stellar-sdk-tests.ts
@@ -0,0 +1,9 @@
+import * as StellarSdk from 'stellar-sdk'
+
+const sourceKey = StellarSdk.Keypair.random() // $ExpectType Keypair
+const destKey = StellarSdk.Keypair.random()
+const account = new StellarSdk.Account(sourceKey.publicKey(), 1)
+const transaction = new StellarSdk.TransactionBuilder(account)
+    .addOperation(StellarSdk.Operation.accountMerge({destination: destKey.publicKey()}))
+    .build() // $ExpectType () => Transaction
+transaction // $ExpectType Transaction
diff --git a/types/stellar-sdk/tsconfig.json b/types/stellar-sdk/tsconfig.json
new file mode 100644
index 0000000000..12dfa57fa0
--- /dev/null
+++ b/types/stellar-sdk/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "stellar-sdk-tests.ts"
+    ]
+}
diff --git a/types/stellar-sdk/tslint.json b/types/stellar-sdk/tslint.json
new file mode 100644
index 0000000000..69ba71b727
--- /dev/null
+++ b/types/stellar-sdk/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "quotemark": [true, "single"],
+        "semicolon": [true, "never"]
+    }
+}

From ea5617c0506527093c39dc59e2dd4ed00ac7b688 Mon Sep 17 00:00:00 2001
From: GlenCFL <glencfl@gmail.com>
Date: Thu, 8 Mar 2018 23:13:21 -0500
Subject: [PATCH 0365/1382] atom: add the JQuery compatible type instead of
 using JQuery.

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

diff --git a/types/atom/index.d.ts b/types/atom/index.d.ts
index f45f209a90..df446d50c3 100644
--- a/types/atom/index.d.ts
+++ b/types/atom/index.d.ts
@@ -2524,6 +2524,10 @@ export interface TextEditorRegistry {
     observe(callback: (editor: TextEditor) => void): Disposable;
 }
 
+export interface JQueryCompatible<Element extends Node = HTMLElement> extends Iterable<Element> {
+    jquery: string;
+}
+
 export type TooltipPlacement =
     |"top"|"bottom"|"left"|"right"
     |"auto"|"auto top"|"auto bottom"|"auto left"|"auto right";
@@ -2531,7 +2535,7 @@ export type TooltipPlacement =
 /** Associates tooltips with HTML elements or selectors. */
 export interface TooltipManager {
     /** Add a tooltip to the given element. */
-    add(target: HTMLElement, options: {
+    add(target: HTMLElement | JQueryCompatible, options: {
         item?: object,
     } | {
         title?: string|(() => string),

From cc5ee919e42a9d99039407de39085e70c0a4c840 Mon Sep 17 00:00:00 2001
From: Kagami Sascha Rosylight <saschanaz@outlook.com>
Date: Fri, 9 Mar 2018 13:21:46 +0900
Subject: [PATCH 0366/1382] add webidl2.js types

---
 types/webidl2/index.d.ts       | 278 +++++++++++++++++++++++++++++++++
 types/webidl2/tsconfig.json    |  25 +++
 types/webidl2/tslint.json      |   1 +
 types/webidl2/webidl2-tests.ts | 138 ++++++++++++++++
 4 files changed, 442 insertions(+)
 create mode 100644 types/webidl2/index.d.ts
 create mode 100644 types/webidl2/tsconfig.json
 create mode 100644 types/webidl2/tslint.json
 create mode 100644 types/webidl2/webidl2-tests.ts

diff --git a/types/webidl2/index.d.ts b/types/webidl2/index.d.ts
new file mode 100644
index 0000000000..e9805357e1
--- /dev/null
+++ b/types/webidl2/index.d.ts
@@ -0,0 +1,278 @@
+// Type definitions for webidl2.js
+// Project: https://github.com/w3c/webidl2.js/
+// Definitions by: Kagama Sascha Rosylight <https://github.com/saschanaz>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export declare function parse(str: string, options?: ParseOptions): IDLRootType[];
+
+export type IDLRootType = InterfaceType | InterfaceMixinType | NamespaceType | CallbackType | DictionaryType | EnumType | TypedefType | ImplementsType | IncludesType;
+
+export type IDLInterfaceMemberType = OperationMemberType | AttributeMemberType | ConstantMemberType | DeclarationMemberType;
+
+export type IDLNamespaceMemberType = OperationMemberType | AttributeMemberType;
+
+export interface ParseOptions {
+    /** Boolean indicating whether the parser should accept typedefs as valid members of interfaces. */
+    allowNestedTypedefs?: boolean;
+}
+
+export interface WebIDLParseError {
+    /** the error message */
+    message: string;
+    /** the line at which the error occurred. */
+    line: number;
+    /** a short peek at the text at the point where the error happened */
+    input: string;
+    /** the five tokens at the point of error, as understood by the tokeniser */
+    tokens: ValueDescription[];
+
+    toString(): string;
+}
+
+export interface IDLTypeDescription {
+    type: string;
+    /** Boolean indicating if it is a sequence. Same as generic === "sequence" */
+    sequence: boolean;
+    /** String indicating the generic type (e.g. "Promise", "sequence"). null otherwise. */
+    generic: string | null;
+    /** Boolean indicating whether this is nullable or not. */
+    nullable: boolean;
+    /** Boolean indicating whether this is a union type or not. */
+    union: boolean;
+    /** In most cases, this will just be a string with the type name.
+    If the type is a union, then this contains an array of the types it unites.
+    If it is a generic type, it contains the IDL type description for the type in the sequence,
+    the eventual value of the promise, etc. */
+    idlType: string | IDLTypeDescription | IDLTypeDescription[];
+}
+
+export interface InterfaceType {
+    type: "interface" | "callback interface";
+    /** The name of the interface */
+    name: string;
+    /** A boolean indicating whether it's a partial interface. */
+    partial: boolean;
+    /** An array of interface members (attributes, operations, etc.). Empty if there are none. */
+    members: IDLInterfaceMemberType[];
+    /** A string giving the name of an interface this one inherits from, null otherwise. */
+    inheritance: string | null;
+    /** A list of extended attributes. */
+    extAttrs: ExtendedAttributes[];
+}
+
+export interface InterfaceMixinType {
+    type: "interface mixin";
+    /** The name of the interface mixin */
+    name: string;
+    /** A boolean indicating whether it's a partial interface mixin. */
+    partial: boolean;
+    /** An array of interface members (attributes, operations, etc.). Empty if there are none. */
+    members: IDLInterfaceMemberType[];
+    /** A list of extended attributes. */
+    extAttrs: ExtendedAttributes[];
+}
+
+export interface NamespaceType {
+    type: "namespace";
+    /** A boolean indicating whether it's a partial namespace. */
+    partial: boolean;
+    /** The enum's name. */
+    name: string;
+    /** An array of namespace members (attributes, operations). Empty if there are none. */
+    members: IDLNamespaceMemberType[];
+    /** A list of extended attributes. */
+    extAttrs: ExtendedAttributes[];
+}
+
+export interface CallbackType {
+    type: "callback";
+    /** The name of the callback. */
+    name: string;
+    /** An IDL Type describing what the callback returns. */
+    idlType: IDLTypeDescription;
+    /** A list of arguments, as in function paramters. */
+    arguments: Argument[];
+    /** A list of extended attributes. */
+    extAttrs: ExtendedAttributes[];
+}
+
+export interface DictionaryType {
+    type: "dictionary";
+    /** The dictionary name. */
+    name: string;
+    /** Boolean indicating whether it's a partial dictionary. */
+    partial: boolean;
+    /** An array of members (see below). */
+    members: DictionaryMemberType[];
+    /** A string indicating which dictionary is being inherited from, null otherwise. */
+    inheritance: string | null;
+    /** A list of extended attributes. */
+    extAttrs: ExtendedAttributes[];
+}
+
+export interface DictionaryMemberType extends FieldType {
+    /** Boolean indicating whether this is a required field. */
+    required: boolean;
+    /** A default value, absent if there is none. */
+    default: ValueDescription | null;
+}
+
+export interface FieldType {
+    type: "field";
+    /** The name of the field. */
+    name: string;
+    /** An IDL Type describing what field's type. */
+    idlType: IDLTypeDescription;
+    /** A list of extended attributes. */
+    extAttrs: ExtendedAttributes[];
+    /** A default value, absent if there is none. */
+    default: ValueDescription | null;
+}
+
+export interface EnumType {
+    type: "enum";
+    /** The enum's name. */
+    name: string;
+    /** An array of values (strings). */
+    values: { type: "string", value: string }[];
+    /** A list of extended attributes. */
+    extAttrs: ExtendedAttributes[];
+}
+
+export interface TypedefType {
+    type: "typedef";
+    /** The typedef's name. */
+    name: string;
+    /** An IDL Type describing what typedef's type. */
+    idlType: IDLTypeDescription;
+    /** A list of extended attributes. */
+    extAttrs: ExtendedAttributes[];
+}
+
+export interface ImplementsType {
+    type: "implements";
+    /** The interface that implements another. */
+    target: string;
+    /** The interface that is being implemented by the target. */
+    implements: string;
+    /** A list of extended attributes. */
+    extAttrs: ExtendedAttributes[];
+}
+
+export interface IncludesType {
+    type: "includes";
+    /** The interface that includes an interface mixin. */
+    target: string;
+    /** The interface mixin that is being included by the target. */
+    includes: string;
+    /** A list of extended attributes. */
+    extAttrs: ExtendedAttributes[];
+}
+
+export interface OperationMemberType {
+    type: "operation";
+    /** True if a getter operation. */
+    getter: boolean;
+    /** True if a setter operation. */
+    setter: boolean;
+    /** True if a deleter operation. */
+    deleter: boolean;
+    /** True if a static operation. */
+    static: boolean;
+    /** True if a stringifier operation. */
+    stringifier: boolean;
+    /** An IDL Type of what the operation returns. If a stringifier, may be absent. */
+    idlType: IDLTypeDescription | null;
+    /** The name of the operation. If a stringifier, may be null. */
+    name: string | null;
+    /** An array of arguments for the operation. */
+    arguments: Argument[] | null;
+    /** A list of extended attributes. */
+    extAttrs: ExtendedAttributes[];
+}
+
+export interface AttributeMemberType {
+    type: "attribute";
+    /** The attribute's name. */
+    name: string;
+    /** True if it's a static attribute. */
+    static: boolean;
+    /** True if it's a stringifier attribute. */
+    stringifier: boolean;
+    /** True if it's an inherit attribute. */
+    inherit: boolean;
+    /** True if it's a read-only attribute. */
+    readonly: boolean;
+    /** An IDL Type for the attribute. */
+    idlType: IDLTypeDescription;
+    /** A list of extended attributes. */
+    extAttrs: ExtendedAttributes[];
+}
+
+export interface ConstantMemberType {
+    type: "const";
+    /** Whether its type is nullable. */
+    nullable: boolean;
+    /** The type of the constant (a simple type, the type name). */
+    idlType: string;
+    /** The name of the constant. */
+    name: string;
+    /** The constant value */
+    value: ValueDescription;
+    /** A list of extended attributes. */
+    extAttrs: ExtendedAttributes[];
+}
+
+export interface Argument {
+    default: ValueDescription;
+    /** True if the argument is optional. */
+    optional: boolean;
+    /** True if the argument is variadic. */
+    variadic: boolean;
+    /** An IDL Type describing the type of the argument. */
+    idlType: IDLTypeDescription;
+    /** The argument's name. */
+    name: string;
+    /** A list of extended attributes. */
+    extAttrs: ExtendedAttributes[];
+}
+
+export interface ExtendedAttributes {
+    /** The extended attribute's name. */
+    name: string;
+    /** If the extended attribute takes arguments or if its right-hand side does they are listed here. */
+    arguments: Argument[];
+    /** If there is a right-hand side, this will capture its type ("identifier" or "identifier-list") and its value. */
+    rhs: ExtendedAttributeRightHandSideIdentifier | ExtendedAttributeRightHandSideIdentifierList;
+}
+
+export interface Token {
+    type: "float" | "integer" | "identifier" | "string" | "whitespace" | "other";
+    value: string;
+}
+
+export interface ExtendedAttributeRightHandSideIdentifier {
+    type: "identifier";
+    value: string;
+}
+
+export interface ExtendedAttributeRightHandSideIdentifierList {
+    type: "identifier-list"
+    value: string[];
+}
+
+export interface ValueDescription {
+    type: "string" | "number" | "boolean" | "null" | "Infinity" | "NaN" | "sequence";
+    value: string | any[] | null;
+    negative: boolean | null;
+}
+
+export interface DeclarationMemberType {
+    type: "iterable" | "legacyiterable" | "setlike" | "maplike";
+    /** An array with one or more IDL Types representing the declared type arguments. */
+    idlType: IDLTypeDescription[];
+    /** Whether the maplike or setlike is declared as read only. */
+    readonly: boolean;
+    /** A list of extended attributes. */
+    extAttrs: ExtendedAttributes[];
+}
diff --git a/types/webidl2/tsconfig.json b/types/webidl2/tsconfig.json
new file mode 100644
index 0000000000..3d3ff31d07
--- /dev/null
+++ b/types/webidl2/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": false,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "webidl2-tests.ts"
+    ]
+}
diff --git a/types/webidl2/tslint.json b/types/webidl2/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/webidl2/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/webidl2/webidl2-tests.ts b/types/webidl2/webidl2-tests.ts
new file mode 100644
index 0000000000..b008b4d11a
--- /dev/null
+++ b/types/webidl2/webidl2-tests.ts
@@ -0,0 +1,138 @@
+import * as webidl2 from "webidl2";
+
+const parsed = webidl2.parse("");
+
+for (const rootType of parsed) {
+    if (rootType.type !== "implements" && rootType.type !== "includes") {
+        console.log(rootType.name);
+    }
+    if (rootType.type === "interface") {
+        console.log(rootType.inheritance);
+        logMembers(rootType.members);
+        console.log(rootType.partial);
+    }
+    else if (rootType.type === "interface mixin") {
+        logMembers(rootType.members);
+        console.log(rootType.partial);
+    }
+    else if (rootType.type === "namespace") {
+        console.log(rootType.partial);
+        logNamespaceMembers(rootType.members);
+    }
+    else if (rootType.type === "callback interface") {
+        logMembers(rootType.members);
+        console.log(rootType.partial);
+    }
+    else if (rootType.type === "callback") {
+        logArguments(rootType.arguments);
+    }
+    else if (rootType.type === "dictionary") {
+        console.log(rootType.inheritance);
+        for (const member of rootType.members) {
+            console.log(member.required, member.default);
+        }
+    }
+    else if (rootType.type === "enum") {
+        for (const v of rootType.values) {
+            console.log(v.type);
+            console.log(v.value);
+        }
+    }
+    else if (rootType.type === "typedef") {
+        logIdlType(rootType.idlType);
+    }
+    else if (rootType.type === "implements") {
+        console.log(rootType.target);
+        console.log(rootType.implements);
+    }
+    else if (rootType.type === "includes") {
+        console.log(rootType.target);
+        console.log(rootType.includes);
+    }
+
+    logExtAttrs(rootType.extAttrs);
+}
+
+function logMembers(members: webidl2.IDLInterfaceMemberType[]) {
+    for (const member of members) {
+        if (member.type === "operation" || member.type === "attribute") {
+            logNamespaceMembers([member]);
+        }
+        else if (member.type === "const") {
+            console.log(member.name);
+            console.log(member.value);
+            console.log(member.nullable);
+        }
+        else if (member.type === "iterable") {
+            console.log(member.readonly);
+        }
+        else if (member.type === "legacyiterable") {
+            console.log(member.readonly);
+        }
+        else if (member.type === "setlike") {
+            console.log(member.readonly);
+        }
+        else if (member.type === "maplike") {
+            console.log(member.readonly);
+        }
+
+        logIdlType(member.idlType);
+        logExtAttrs(member.extAttrs);
+    }
+}
+
+function logNamespaceMembers(members: webidl2.IDLNamespaceMemberType[]) {
+    for (const member of members) {
+        if (member.type === "operation") {
+            console.log(member.name);
+            console.log(member.getter, member.setter, member.deleter);
+            console.log(member.static, member.stringifier);
+        }
+        else if (member.type === "attribute") {
+            console.log(member.name);
+            console.log(member.static, member.stringifier, member.readonly, member.inherit);
+        }
+    }
+}
+
+function logExtAttrs(extAttrs: webidl2.ExtendedAttributes[]) {
+    console.log(extAttrs[0].name);
+    logArguments(extAttrs[0].arguments);
+    const { rhs } = extAttrs[0];
+    if (rhs.type === "identifier") {
+        console.log(rhs);
+    }
+    else {
+        for (const v of rhs.value) {
+            console.log(v);
+        }
+    }
+}
+
+function logArguments(args: webidl2.Argument[]) {
+    for (const arg of args) {
+        console.log(arg.name);
+        console.log(arg.default, arg.optional, arg.variadic);
+        logIdlType(arg.idlType);
+        logExtAttrs(arg.extAttrs);
+    }
+}
+
+function logIdlType(idlType: string | webidl2.IDLTypeDescription | webidl2.IDLTypeDescription[]) {
+    if (typeof idlType === "string") {
+        return;
+    }
+    if (Array.isArray(idlType)) {
+        for (const t of idlType) {
+            logEachType(t);
+        }
+        return;
+    }
+    logEachType(idlType);
+
+    function logEachType(t: webidl2.IDLTypeDescription) {
+        console.log(t.type);
+        console.log(t.generic, t.nullable, t.sequence, t.union);
+        logIdlType(t.idlType);
+    }
+}

From 3246586fee8a43f4e075229fe2282d4ad7d38dc5 Mon Sep 17 00:00:00 2001
From: Kagami Sascha Rosylight <saschanaz@outlook.com>
Date: Fri, 9 Mar 2018 13:47:33 +0900
Subject: [PATCH 0367/1382] linting

---
 types/webidl2/index.d.ts       |  19 +++--
 types/webidl2/webidl2-tests.ts | 134 +++++++++++++++++----------------
 2 files changed, 79 insertions(+), 74 deletions(-)

diff --git a/types/webidl2/index.d.ts b/types/webidl2/index.d.ts
index e9805357e1..a1999c1c2e 100644
--- a/types/webidl2/index.d.ts
+++ b/types/webidl2/index.d.ts
@@ -1,9 +1,9 @@
-// Type definitions for webidl2.js
+// Type definitions for webidl2.js 10.2
 // Project: https://github.com/w3c/webidl2.js/
 // Definitions by: Kagama Sascha Rosylight <https://github.com/saschanaz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-export declare function parse(str: string, options?: ParseOptions): IDLRootType[];
+export function parse(str: string, options?: ParseOptions): IDLRootType[];
 
 export type IDLRootType = InterfaceType | InterfaceMixinType | NamespaceType | CallbackType | DictionaryType | EnumType | TypedefType | ImplementsType | IncludesType;
 
@@ -29,6 +29,7 @@ export interface WebIDLParseError {
     toString(): string;
 }
 
+// tslint:disable-next-line interface-name
 export interface IDLTypeDescription {
     type: string;
     /** Boolean indicating if it is a sequence. Same as generic === "sequence" */
@@ -39,10 +40,12 @@ export interface IDLTypeDescription {
     nullable: boolean;
     /** Boolean indicating whether this is a union type or not. */
     union: boolean;
-    /** In most cases, this will just be a string with the type name.
-    If the type is a union, then this contains an array of the types it unites.
-    If it is a generic type, it contains the IDL type description for the type in the sequence,
-    the eventual value of the promise, etc. */
+    /**
+     * In most cases, this will just be a string with the type name.
+     * If the type is a union, then this contains an array of the types it unites.
+     * If it is a generic type, it contains the IDL type description for the type in the sequence,
+     * the eventual value of the promise, etc.
+     */
     idlType: string | IDLTypeDescription | IDLTypeDescription[];
 }
 
@@ -134,7 +137,7 @@ export interface EnumType {
     /** The enum's name. */
     name: string;
     /** An array of values (strings). */
-    values: { type: "string", value: string }[];
+    values: Array<{ type: "string", value: string }>;
     /** A list of extended attributes. */
     extAttrs: ExtendedAttributes[];
 }
@@ -257,7 +260,7 @@ export interface ExtendedAttributeRightHandSideIdentifier {
 }
 
 export interface ExtendedAttributeRightHandSideIdentifierList {
-    type: "identifier-list"
+    type: "identifier-list";
     value: string[];
 }
 
diff --git a/types/webidl2/webidl2-tests.ts b/types/webidl2/webidl2-tests.ts
index b008b4d11a..e7b1168a68 100644
--- a/types/webidl2/webidl2-tests.ts
+++ b/types/webidl2/webidl2-tests.ts
@@ -6,48 +6,50 @@ for (const rootType of parsed) {
     if (rootType.type !== "implements" && rootType.type !== "includes") {
         console.log(rootType.name);
     }
-    if (rootType.type === "interface") {
-        console.log(rootType.inheritance);
-        logMembers(rootType.members);
-        console.log(rootType.partial);
-    }
-    else if (rootType.type === "interface mixin") {
-        logMembers(rootType.members);
-        console.log(rootType.partial);
-    }
-    else if (rootType.type === "namespace") {
-        console.log(rootType.partial);
-        logNamespaceMembers(rootType.members);
-    }
-    else if (rootType.type === "callback interface") {
-        logMembers(rootType.members);
-        console.log(rootType.partial);
-    }
-    else if (rootType.type === "callback") {
-        logArguments(rootType.arguments);
-    }
-    else if (rootType.type === "dictionary") {
-        console.log(rootType.inheritance);
-        for (const member of rootType.members) {
-            console.log(member.required, member.default);
-        }
-    }
-    else if (rootType.type === "enum") {
-        for (const v of rootType.values) {
-            console.log(v.type);
-            console.log(v.value);
-        }
-    }
-    else if (rootType.type === "typedef") {
-        logIdlType(rootType.idlType);
-    }
-    else if (rootType.type === "implements") {
-        console.log(rootType.target);
-        console.log(rootType.implements);
-    }
-    else if (rootType.type === "includes") {
-        console.log(rootType.target);
-        console.log(rootType.includes);
+    switch (rootType.type) {
+        case "interface":
+            console.log(rootType.inheritance);
+            logMembers(rootType.members);
+            console.log(rootType.partial);
+            break;
+        case "interface mixin":
+            logMembers(rootType.members);
+            console.log(rootType.partial);
+            break;
+        case "namespace":
+            console.log(rootType.partial);
+            logNamespaceMembers(rootType.members);
+            break;
+        case "callback interface":
+            logMembers(rootType.members);
+            console.log(rootType.partial);
+            break;
+        case "callback":
+            logArguments(rootType.arguments);
+            break;
+        case "dictionary":
+            console.log(rootType.inheritance);
+            for (const member of rootType.members) {
+                console.log(member.required, member.default);
+            }
+            break;
+        case "enum":
+            for (const v of rootType.values) {
+                console.log(v.type);
+                console.log(v.value);
+            }
+            break;
+        case "typedef":
+            logIdlType(rootType.idlType);
+            break;
+        case "implements":
+            console.log(rootType.target);
+            console.log(rootType.implements);
+            break;
+        case "includes":
+            console.log(rootType.target);
+            console.log(rootType.includes);
+            break;
     }
 
     logExtAttrs(rootType.extAttrs);
@@ -55,27 +57,29 @@ for (const rootType of parsed) {
 
 function logMembers(members: webidl2.IDLInterfaceMemberType[]) {
     for (const member of members) {
-        if (member.type === "operation" || member.type === "attribute") {
-            logNamespaceMembers([member]);
+        switch (member.type) {
+            case "operation":
+            case "attribute":
+                logNamespaceMembers([member]);
+                break;
+            case "const":
+                console.log(member.name);
+                console.log(member.value);
+                console.log(member.nullable);
+                break;
+            case "iterable":
+                console.log(member.readonly);
+                break;
+            case "legacyiterable":
+                console.log(member.readonly);
+                break;
+            case "setlike":
+                console.log(member.readonly);
+                break;
+            case "maplike":
+                console.log(member.readonly);
+                break;
         }
-        else if (member.type === "const") {
-            console.log(member.name);
-            console.log(member.value);
-            console.log(member.nullable);
-        }
-        else if (member.type === "iterable") {
-            console.log(member.readonly);
-        }
-        else if (member.type === "legacyiterable") {
-            console.log(member.readonly);
-        }
-        else if (member.type === "setlike") {
-            console.log(member.readonly);
-        }
-        else if (member.type === "maplike") {
-            console.log(member.readonly);
-        }
-
         logIdlType(member.idlType);
         logExtAttrs(member.extAttrs);
     }
@@ -87,8 +91,7 @@ function logNamespaceMembers(members: webidl2.IDLNamespaceMemberType[]) {
             console.log(member.name);
             console.log(member.getter, member.setter, member.deleter);
             console.log(member.static, member.stringifier);
-        }
-        else if (member.type === "attribute") {
+        } else if (member.type === "attribute") {
             console.log(member.name);
             console.log(member.static, member.stringifier, member.readonly, member.inherit);
         }
@@ -101,8 +104,7 @@ function logExtAttrs(extAttrs: webidl2.ExtendedAttributes[]) {
     const { rhs } = extAttrs[0];
     if (rhs.type === "identifier") {
         console.log(rhs);
-    }
-    else {
+    } else {
         for (const v of rhs.value) {
             console.log(v);
         }

From fec9ddca984cd5af89b0fe77c15b0705c41ec34b Mon Sep 17 00:00:00 2001
From: makino <makino@arte-inc.co.jp>
Date: Fri, 9 Mar 2018 13:49:02 +0900
Subject: [PATCH 0368/1382] Defined plugins option more precisely.

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

diff --git a/types/chart.js/index.d.ts b/types/chart.js/index.d.ts
index 45d9ea8c0b..c637164d30 100644
--- a/types/chart.js/index.d.ts
+++ b/types/chart.js/index.d.ts
@@ -199,7 +199,7 @@ declare namespace Chart {
         circumference?: number;
         rotation?: number;
         // Plugins can require any options
-        plugins?: any;
+        plugins?: { [plugin: string]: any };
     }
 
     interface ChartFontOptions {

From 5305f69e77728b820b396378837e277cf6ee98e0 Mon Sep 17 00:00:00 2001
From: Kagami Sascha Rosylight <saschanaz@outlook.com>
Date: Fri, 9 Mar 2018 14:01:58 +0900
Subject: [PATCH 0369/1382] use dts-gen

---
 types/webidl2/index.d.ts    | 6 ++++--
 types/webidl2/tsconfig.json | 6 ++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/types/webidl2/index.d.ts b/types/webidl2/index.d.ts
index a1999c1c2e..0dd0cc7f10 100644
--- a/types/webidl2/index.d.ts
+++ b/types/webidl2/index.d.ts
@@ -1,8 +1,10 @@
-// Type definitions for webidl2.js 10.2
-// Project: https://github.com/w3c/webidl2.js/
+// Type definitions for webidl2 10.2
+// Project: https://github.com/w3c/webidl2.js#readme
 // Definitions by: Kagama Sascha Rosylight <https://github.com/saschanaz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+export as namespace WebIDL2;
+
 export function parse(str: string, options?: ParseOptions): IDLRootType[];
 
 export type IDLRootType = InterfaceType | InterfaceMixinType | NamespaceType | CallbackType | DictionaryType | EnumType | TypedefType | ImplementsType | IncludesType;
diff --git a/types/webidl2/tsconfig.json b/types/webidl2/tsconfig.json
index 3d3ff31d07..acd7383a13 100644
--- a/types/webidl2/tsconfig.json
+++ b/types/webidl2/tsconfig.json
@@ -1,15 +1,13 @@
 {
     "compilerOptions": {
         "module": "commonjs",
-        "target": "es6",
         "lib": [
             "es6",
             "dom"
         ],
         "noImplicitAny": true,
-        "noImplicitThis": false,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"

From 4149e524b72f5354e0a894bd55c4b68f36704f98 Mon Sep 17 00:00:00 2001
From: Kagami Sascha Rosylight <saschanaz@outlook.com>
Date: Fri, 9 Mar 2018 14:03:48 +0900
Subject: [PATCH 0370/1382] re-add strictFunctionTypes

---
 types/webidl2/tsconfig.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/webidl2/tsconfig.json b/types/webidl2/tsconfig.json
index acd7383a13..04827a6268 100644
--- a/types/webidl2/tsconfig.json
+++ b/types/webidl2/tsconfig.json
@@ -8,6 +8,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"

From 0d3a8038e277e86a43d71fe158629d14b428223b Mon Sep 17 00:00:00 2001
From: Kagami Sascha Rosylight <saschanaz@outlook.com>
Date: Fri, 9 Mar 2018 14:17:47 +0900
Subject: [PATCH 0371/1382] fix null error

---
 types/webidl2/webidl2-tests.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/types/webidl2/webidl2-tests.ts b/types/webidl2/webidl2-tests.ts
index e7b1168a68..61b437f563 100644
--- a/types/webidl2/webidl2-tests.ts
+++ b/types/webidl2/webidl2-tests.ts
@@ -120,8 +120,12 @@ function logArguments(args: webidl2.Argument[]) {
     }
 }
 
-function logIdlType(idlType: string | webidl2.IDLTypeDescription | webidl2.IDLTypeDescription[]) {
+function logIdlType(idlType: string | webidl2.IDLTypeDescription | webidl2.IDLTypeDescription[] | null) {
+    if (!idlType) {
+        return;
+    }
     if (typeof idlType === "string") {
+        console.log(idlType);
         return;
     }
     if (Array.isArray(idlType)) {

From b21ecf8eecd7864233bd6e7c4dcc9c8eae51181f Mon Sep 17 00:00:00 2001
From: Rahul Raina <rahulr0609@hotmail.com>
Date: Thu, 8 Mar 2018 23:16:57 -0800
Subject: [PATCH 0372/1382] Updated to pull from H.History

---
 types/react-router/index.d.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/react-router/index.d.ts b/types/react-router/index.d.ts
index 47274d71e2..01654c8304 100644
--- a/types/react-router/index.d.ts
+++ b/types/react-router/index.d.ts
@@ -15,6 +15,7 @@
 //                 Daniel Roth <https://github.com/DaIgeb>
 //                 Egor Shulga <https://github.com/egorshulga>
 //                 Youen Toupin <https://github.com/neuoy>
+//                 Rahul Raina <https://github.com/rraina>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -76,7 +77,7 @@ export interface RouteProps {
 export class Route<T extends RouteProps = RouteProps> extends React.Component<T, any> { }
 
 export interface RouterProps {
-  history: any;
+  history: H.History;
 }
 export class Router extends React.Component<RouterProps, any> { }
 

From c96aea88fe331b610471dd436c8de36844f3aecd Mon Sep 17 00:00:00 2001
From: Divyendu Singh <divyendu.z@gmail.com>
Date: Fri, 9 Mar 2018 13:45:28 +0530
Subject: [PATCH 0373/1382] make graphql typing for getDescription conform with
 graphql-js

---
 types/graphql/index.d.ts                    |  4 ++++
 types/graphql/utilities/buildASTSchema.d.ts | 13 +++++++++++--
 types/graphql/utilities/index.d.ts          |  2 +-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/types/graphql/index.d.ts b/types/graphql/index.d.ts
index a8bead58fd..49185e11a1 100644
--- a/types/graphql/index.d.ts
+++ b/types/graphql/index.d.ts
@@ -12,6 +12,7 @@
 //                 Tim Griesser <https://github.com/tgriesser>
 //                 Dylan Stewart <https://github.com/dyst5422>
 //                 Alessio Dionisi <https://github.com/adnsio>
+//                 Divyendu Singh <https://github.com/divyenduz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -100,6 +101,9 @@ export {
     // Build a GraphQLSchema from a GraphQL schema language document.
     buildSchema,
 
+    // Get the description of an AST node
+    getDescription,
+
     // Extends an existing GraphQLSchema from a parsed GraphQL Schema
     // language AST.
     extendSchema,
diff --git a/types/graphql/utilities/buildASTSchema.d.ts b/types/graphql/utilities/buildASTSchema.d.ts
index b20c8fc856..8ba2fcc9e9 100644
--- a/types/graphql/utilities/buildASTSchema.d.ts
+++ b/types/graphql/utilities/buildASTSchema.d.ts
@@ -1,7 +1,13 @@
-import { DocumentNode, Location } from '../language/ast';
+import { DocumentNode, Location, StringValueNode } from '../language/ast';
 import { Source } from '../language/source';
 import { GraphQLSchema } from '../type/schema';
 
+type BuildSchemaOptions = {
+    assumeValid?: boolean;
+    allowedLegacyNames?: ReadonlyArray<string>;
+    commentDescriptions?: boolean;
+};
+
 /**
  * This takes the ast of a schema document produced by the parse function in
  * src/language/parser.js.
@@ -18,7 +24,10 @@ export function buildASTSchema(ast: DocumentNode): GraphQLSchema;
  * Given an ast node, returns its string description based on a contiguous
  * block full-line of comments preceding it.
  */
-export function getDescription(node: { loc?: Location }): string;
+export function getDescription(
+    node: { description?: StringValueNode; loc?: Location },
+    options: BuildSchemaOptions
+  ): string;
 
 /**
  * A helper function to build a GraphQLSchema directly from a source
diff --git a/types/graphql/utilities/index.d.ts b/types/graphql/utilities/index.d.ts
index cd0e23948f..c2b2c182ff 100644
--- a/types/graphql/utilities/index.d.ts
+++ b/types/graphql/utilities/index.d.ts
@@ -27,7 +27,7 @@ export { getOperationAST } from './getOperationAST';
 export { buildClientSchema } from './buildClientSchema';
 
 // Build a GraphQLSchema from GraphQL Schema language.
-export { buildASTSchema, buildSchema } from './buildASTSchema';
+export { buildASTSchema, buildSchema, getDescription } from './buildASTSchema';
 
 // Extends an existing GraphQLSchema from a parsed GraphQL Schema language AST.
 export { extendSchema } from './extendSchema';

From 9a9eee3858eb5af949b04215309f348c3ef94d0e Mon Sep 17 00:00:00 2001
From: Andreas Pfefferle <anp@secomba.com>
Date: Fri, 9 Mar 2018 10:52:36 +0100
Subject: [PATCH 0374/1382] added transaction: boolean to mock-knex

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

diff --git a/types/mock-knex/index.d.ts b/types/mock-knex/index.d.ts
index a21ab2eb0a..bad0aadb01 100644
--- a/types/mock-knex/index.d.ts
+++ b/types/mock-knex/index.d.ts
@@ -48,7 +48,10 @@ export interface Tracker extends EventEmitter {
      *
      * @param callback A function that gets executed on 'query' event.
      */
-    on(event: 'query', callback: (query: QueryDetails, step: number) => void): this;
+    on(
+        event: "query",
+        callback: (query: QueryDetails, step: number) => void
+    ): this;
 }
 
 /**
@@ -56,6 +59,8 @@ export interface Tracker extends EventEmitter {
  * Object properties signature matches with knex toSQL() output with additional method returns(values).
  */
 export interface QueryDetails extends Knex.Sql {
+    transacting: boolean;
+
     /**
      * Function that needs to be called to mock database query result for knex.
      *

From dd55fb4b217a5ef0c7eaf0046af3e0be5149c164 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20=C3=96llinger?= <markus.oellinger@unycom.com>
Date: Fri, 9 Mar 2018 11:37:18 +0100
Subject: [PATCH 0375/1382] add support for async and creatable

---
 types/react-virtualized-select/index.d.ts     | 25 +++++++------
 .../react-virtualized-select-tests.tsx        | 35 ++++++++++++++-----
 types/react-virtualized-select/tsconfig.json  |  1 +
 3 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/types/react-virtualized-select/index.d.ts b/types/react-virtualized-select/index.d.ts
index 234d0a5b97..843c5547d3 100644
--- a/types/react-virtualized-select/index.d.ts
+++ b/types/react-virtualized-select/index.d.ts
@@ -5,7 +5,7 @@
 // TypeScript Version: 2.3
 
 import * as React from "react";
-import { ReactSelectProps, LoadOptionsHandler, OptionValues } from "react-select";
+import { ReactSelectProps, ReactAsyncSelectProps, ReactCreatableSelectProps, LoadOptionsHandler, OptionValues } from "react-select";
 import { ListProps } from "react-virtualized";
 
 export interface VirtualizedOptionRenderOptions<T> {
@@ -22,21 +22,20 @@ export interface VirtualizedOptionRenderOptions<T> {
     valueArray: T[];
 }
 
-/**
- * Dummy interface to allow `VirtualizedSelectProps` to have an `optionRenderer` type
- * incompatible with the one in `ReactSelectProps`.
- */
-interface VirtualizedSelectPropsBase<TValue = OptionValues> extends ReactSelectProps<TValue> {
-    optionRenderer?: any;
-}
-export interface VirtualizedSelectProps<TValue = OptionValues> extends VirtualizedSelectPropsBase<TValue> {
-    async?: boolean;
-    loadOptions?: LoadOptionsHandler<TValue>;
+export interface AdditionalVirtualizedSelectProps<TValue> {
     maxHeight?: number;
     optionHeight?: number;
-    optionRenderer?(options: VirtualizedOptionRenderOptions<any>): JSX.Element;
+    optionRenderer?(options: VirtualizedOptionRenderOptions<TValue>): JSX.Element;
     selectComponent?: React.ComponentClass<any> | React.StatelessComponent<any>;
 }
 
-declare class VirtualizedSelect<TValue = OptionValues> extends React.PureComponent<VirtualizedSelectProps<TValue>> {}
+export declare class VirtualizedSelectCreatable<TValue = OptionValues> extends React.Component<ReactCreatableSelectProps<TValue> & AdditionalVirtualizedSelectProps<TValue>> {}
+
+export declare class VirtualizedSelectAsync<TValue = OptionValues> extends React.Component<ReactAsyncSelectProps<TValue> & AdditionalVirtualizedSelectProps<TValue> & { async: true }> {}
+
+export declare class VirtualizedSelectAsyncCreatable<TValue = OptionValues> extends React.Component<ReactAsyncSelectProps<TValue>
+& ReactCreatableSelectProps<TValue> & AdditionalVirtualizedSelectProps<TValue> & { async: true }> {}
+
+declare class VirtualizedSelect<TValue = OptionValues> extends React.PureComponent<ReactSelectProps<TValue> & AdditionalVirtualizedSelectProps<TValue>> {}
+
 export default VirtualizedSelect;
diff --git a/types/react-virtualized-select/react-virtualized-select-tests.tsx b/types/react-virtualized-select/react-virtualized-select-tests.tsx
index 6fe469bade..6216ab88d7 100644
--- a/types/react-virtualized-select/react-virtualized-select-tests.tsx
+++ b/types/react-virtualized-select/react-virtualized-select-tests.tsx
@@ -1,12 +1,29 @@
 import * as React from "react";
 import Select from "react-select";
-import VirtualizedSelect from "react-virtualized-select";
+import VirtualizedSelect, { VirtualizedSelectAsync } from "react-virtualized-select";
 
-<VirtualizedSelect
-  async={true}
-  maxHeight={0}
-  optionHeight={0}
-  optionRenderer={() => <div/>}
-  selectComponent={Select}
-  options={[]}
-/>;
+/*Example TValue.*/
+interface Example {
+	name: string;
+}
+
+/*Example generic class.*/
+class ExampleSelectAsync extends VirtualizedSelectAsync<Example> {
+}
+
+<div>
+	<VirtualizedSelect
+	  maxHeight={0}
+	  optionHeight={0}
+	  optionRenderer={() => <div/>}
+	  selectComponent={Select}
+	  options={[]}
+	/>
+	<ExampleSelectAsync async={true}
+	  maxHeight={0}
+	  optionHeight={0}
+	  optionRenderer={() => <div/>}
+	  selectComponent={Select}
+	  loadOptions={(input: string) => Promise.resolve([{name: 'Hi'}])}
+	/>
+</div>;
diff --git a/types/react-virtualized-select/tsconfig.json b/types/react-virtualized-select/tsconfig.json
index 4d528426c0..46df95341b 100644
--- a/types/react-virtualized-select/tsconfig.json
+++ b/types/react-virtualized-select/tsconfig.json
@@ -8,6 +8,7 @@
         "jsx": "react",
         "noImplicitAny": true,
         "noImplicitThis": true,
+		"strictFunctionTypes": true,
         "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [

From 439ab93ba59e1f30bcd157a6417a9f930655ffee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81rni=20Benedikt=20=C3=81rnason?=
 <arnibarnason@gmail.com>
Date: Fri, 9 Mar 2018 11:46:25 +0100
Subject: [PATCH 0376/1382] Added pop and popToTop NavigationActions for
 react-navigation

---
 types/react-navigation/index.d.ts             | 27 ++++++++++++++++++-
 .../react-navigation-tests.tsx                | 12 +++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index c4e396783f..2fdde0448e 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -247,6 +247,25 @@ export interface NavigationUriAction extends NavigationUriActionPayload {
   type: 'Navigation/URI';
 }
 
+export interface NavigationPopActionPayload {
+  // n: the number of routes to pop of the stack
+  n?: number;
+  immediate?: boolean;
+}
+
+export interface NavigationPopAction extends NavigationPopActionPayload {
+  type: 'Navigation/POP';
+}
+
+export interface NavigationPopToTopActionPayload {
+  key?: string;
+  immediate?: boolean;
+}
+
+export interface NavigationPopToTopAction extends NavigationPopToTopActionPayload {
+  type: 'Navigation/POP_TO_TOP';
+}
+
 export interface NavigationStackViewConfig {
   mode?: 'card' | 'modal';
   headerMode?: HeaderMode;
@@ -287,7 +306,9 @@ export type NavigationStackAction =
   | NavigationNavigateAction
   | NavigationBackAction
   | NavigationSetParamsAction
-  | NavigationResetAction;
+  | NavigationResetAction
+  | NavigationPopAction
+  | NavigationPopToTopAction;
 
 export type NavigationTabAction =
   NavigationInitAction
@@ -718,12 +739,16 @@ export namespace NavigationActions {
   const RESET: 'Navigation/RESET';
   const SET_PARAMS: 'Navigation/SET_PARAMS';
   const URI: 'Navigation/URI';
+  const POP: 'Navigation/POP';
+  const POP_TO_TOP: 'Navigation/POP_TO_TOP';
 
   function init(options?: NavigationInitActionPayload): NavigationInitAction;
   function navigate(options: NavigationNavigateActionPayload): NavigationNavigateAction;
   function reset(options: NavigationResetActionPayload): NavigationResetAction;
   function back(options?: NavigationBackActionPayload): NavigationBackAction;
   function setParams(options: NavigationSetParamsActionPayload): NavigationSetParamsAction;
+  function pop(options: NavigationPopActionPayload): NavigationPopAction;
+  function popToTop(options: NavigationPopToTopActionPayload): NavigationPopToTopAction;
 }
 
 /**
diff --git a/types/react-navigation/react-navigation-tests.tsx b/types/react-navigation/react-navigation-tests.tsx
index 017a9b9153..49e216a35a 100644
--- a/types/react-navigation/react-navigation-tests.tsx
+++ b/types/react-navigation/react-navigation-tests.tsx
@@ -32,6 +32,8 @@ import {
     HeaderBackButton,
     Header,
     NavigationParams,
+    NavigationPopAction,
+    NavigationPopToTopAction,
 } from 'react-navigation';
 
 // Constants
@@ -337,3 +339,13 @@ const setParamsAction: NavigationSetParamsAction = NavigationActions.setParams({
         foo: "bar"
     }
 });
+
+const popAction: NavigationPopAction = NavigationActions.pop({
+    n: 1,
+    immediate: true
+});
+
+const popToTopAction: NavigationPopToTopAction = NavigationActions.popToTop({
+    key: "foo",
+    immediate: true
+})
\ No newline at end of file

From 43ffb4e259323ad45add91a98c70502dd683c1ce Mon Sep 17 00:00:00 2001
From: kenji_imamura <kenji.imamura@kabuku.co.jp>
Date: Fri, 9 Mar 2018 19:48:42 +0900
Subject: [PATCH 0377/1382] fix: export lory

---
 types/lory.js/index.d.ts       | 2 +-
 types/lory.js/lory.js-tests.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/lory.js/index.d.ts b/types/lory.js/index.d.ts
index 37ff46d4be..dd37fb8efa 100644
--- a/types/lory.js/index.d.ts
+++ b/types/lory.js/index.d.ts
@@ -4,7 +4,7 @@
 //                 philip bulley <https://github.com/milkisevil>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare var lory: LoryStatic;
+export declare var lory: LoryStatic;
 
 interface LoryStatic {
     (element: Element, options?: LoryOptions): LoryStatic;
diff --git a/types/lory.js/lory.js-tests.ts b/types/lory.js/lory.js-tests.ts
index bad97dadf3..616073f180 100644
--- a/types/lory.js/lory.js-tests.ts
+++ b/types/lory.js/lory.js-tests.ts
@@ -1,4 +1,4 @@
-
+import { lory } from 'lory.js';
 
 (function() {
     var elm = document.querySelector('.js-foo');

From 7a1603d26fe51ec29158609a1333a9f8ff098a3e Mon Sep 17 00:00:00 2001
From: Arnaud Duforat <arnaud.duforat@protonmail.ch>
Date: Fri, 9 Mar 2018 12:00:59 +0100
Subject: [PATCH 0378/1382] [react-table] original property duplicated in
 RowInfo

After the merge https://github.com/DefinitelyTyped/DefinitelyTyped/commit/87d4d9cd52c84c1fc36f7545ff541899b7e6421e#diff-7f4f664c8c5ea0cb3bbb70b9a68ef166 RowInfo has two "original" property definition. This PR delete one of them.

I tried using the @types/react-table package and had problems.
I tried using the latest stable version of tsc. https://www.npmjs.com/package/typescript
Mention the authors so they can respond: @royxue @psakalo @Havret
---
 types/react-table/index.d.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/types/react-table/index.d.ts b/types/react-table/index.d.ts
index 20a1c5a1fb..503b5f4e02 100644
--- a/types/react-table/index.d.ts
+++ b/types/react-table/index.d.ts
@@ -613,9 +613,6 @@ export interface RowInfo {
     /** Materialized row of data */
     row: any;
 
-    /** Original row from your data */
-    original: any;
-
     /** The post-accessed values from the original row */
     rowValues: any;
 

From e5ef9ecef2e6abdf86a6ad9ef53f72136ab11bce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81rni=20Benedikt=20=C3=81rnason?=
 <arnibarnason@gmail.com>
Date: Fri, 9 Mar 2018 12:01:51 +0100
Subject: [PATCH 0379/1382] Fixed lint errors

---
 types/react-navigation/react-navigation-tests.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/react-navigation/react-navigation-tests.tsx b/types/react-navigation/react-navigation-tests.tsx
index 49e216a35a..0f68b653b1 100644
--- a/types/react-navigation/react-navigation-tests.tsx
+++ b/types/react-navigation/react-navigation-tests.tsx
@@ -348,4 +348,4 @@ const popAction: NavigationPopAction = NavigationActions.pop({
 const popToTopAction: NavigationPopToTopAction = NavigationActions.popToTop({
     key: "foo",
     immediate: true
-})
\ No newline at end of file
+});

From 72c16810021d3f1d5ef86ef0251277ccf3f7638a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20=C3=96llinger?= <markus.oellinger@unycom.com>
Date: Fri, 9 Mar 2018 12:16:47 +0100
Subject: [PATCH 0380/1382] add support for async via async property

---
 types/react-virtualized-select/index.d.ts           | 13 ++++---------
 .../react-virtualized-select-tests.tsx              |  4 ++--
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/types/react-virtualized-select/index.d.ts b/types/react-virtualized-select/index.d.ts
index 843c5547d3..707bba40f8 100644
--- a/types/react-virtualized-select/index.d.ts
+++ b/types/react-virtualized-select/index.d.ts
@@ -5,7 +5,7 @@
 // TypeScript Version: 2.3
 
 import * as React from "react";
-import { ReactSelectProps, ReactAsyncSelectProps, ReactCreatableSelectProps, LoadOptionsHandler, OptionValues } from "react-select";
+import { ReactSelectProps, ReactAsyncSelectProps, LoadOptionsHandler, OptionValues } from "react-select";
 import { ListProps } from "react-virtualized";
 
 export interface VirtualizedOptionRenderOptions<T> {
@@ -29,13 +29,8 @@ export interface AdditionalVirtualizedSelectProps<TValue> {
     selectComponent?: React.ComponentClass<any> | React.StatelessComponent<any>;
 }
 
-export declare class VirtualizedSelectCreatable<TValue = OptionValues> extends React.Component<ReactCreatableSelectProps<TValue> & AdditionalVirtualizedSelectProps<TValue>> {}
-
-export declare class VirtualizedSelectAsync<TValue = OptionValues> extends React.Component<ReactAsyncSelectProps<TValue> & AdditionalVirtualizedSelectProps<TValue> & { async: true }> {}
-
-export declare class VirtualizedSelectAsyncCreatable<TValue = OptionValues> extends React.Component<ReactAsyncSelectProps<TValue>
-& ReactCreatableSelectProps<TValue> & AdditionalVirtualizedSelectProps<TValue> & { async: true }> {}
-
-declare class VirtualizedSelect<TValue = OptionValues> extends React.PureComponent<ReactSelectProps<TValue> & AdditionalVirtualizedSelectProps<TValue>> {}
+type VirtualizedSelectProps<TValue = OptionValues> = (ReactAsyncSelectProps<TValue> & AdditionalVirtualizedSelectProps<TValue> & { async: true }) |
+    ReactSelectProps<TValue> & AdditionalVirtualizedSelectProps<TValue>;
 
+declare class VirtualizedSelect<TValue = OptionValues> extends React.PureComponent<VirtualizedSelectProps<TValue>> {}
 export default VirtualizedSelect;
diff --git a/types/react-virtualized-select/react-virtualized-select-tests.tsx b/types/react-virtualized-select/react-virtualized-select-tests.tsx
index 6216ab88d7..380828e864 100644
--- a/types/react-virtualized-select/react-virtualized-select-tests.tsx
+++ b/types/react-virtualized-select/react-virtualized-select-tests.tsx
@@ -1,6 +1,6 @@
 import * as React from "react";
 import Select from "react-select";
-import VirtualizedSelect, { VirtualizedSelectAsync } from "react-virtualized-select";
+import VirtualizedSelect from "react-virtualized-select";
 
 /*Example TValue.*/
 interface Example {
@@ -8,7 +8,7 @@ interface Example {
 }
 
 /*Example generic class.*/
-class ExampleSelectAsync extends VirtualizedSelectAsync<Example> {
+class ExampleSelectAsync extends VirtualizedSelect<Example> {
 }
 
 <div>

From d2afa6c8554eedbf5107209474718ca9b1ef7e86 Mon Sep 17 00:00:00 2001
From: Juan Jimenez-Anca <juan@j3a.solutions>
Date: Fri, 9 Mar 2018 11:21:11 +0000
Subject: [PATCH 0381/1382] create ethereumjs-util

---
 .../ethereumjs-util/ethereumjs-util-tests.ts  |  4 +
 types/ethereumjs-util/index.d.ts              | 83 +++++++++++++++++++
 types/ethereumjs-util/tsconfig.json           | 23 +++++
 types/ethereumjs-util/tslint.json             |  6 ++
 4 files changed, 116 insertions(+)
 create mode 100644 types/ethereumjs-util/ethereumjs-util-tests.ts
 create mode 100644 types/ethereumjs-util/index.d.ts
 create mode 100644 types/ethereumjs-util/tsconfig.json
 create mode 100644 types/ethereumjs-util/tslint.json

diff --git a/types/ethereumjs-util/ethereumjs-util-tests.ts b/types/ethereumjs-util/ethereumjs-util-tests.ts
new file mode 100644
index 0000000000..5159dcf758
--- /dev/null
+++ b/types/ethereumjs-util/ethereumjs-util-tests.ts
@@ -0,0 +1,4 @@
+import * as assert from "assert";
+import * as etherUtil from "ethereumjs-util";
+
+assert.ok(etherUtil.isValidAddress("0x0bfe6d9a4d4a73857db6fac276669ba45ee69b48"));
diff --git a/types/ethereumjs-util/index.d.ts b/types/ethereumjs-util/index.d.ts
new file mode 100644
index 0000000000..7a29b38ff5
--- /dev/null
+++ b/types/ethereumjs-util/index.d.ts
@@ -0,0 +1,83 @@
+// Type definitions for ethereumjs-util 5.1
+// Project: https://github.com/ethereumjs/ethereumjs-util#readme
+// Definitions by: Juan J. Jimenez-Anca <https://github.com/cortopy>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+// TODO: import types for [`BN`](https://github.com/indutny/bn.js)
+// TODO: MAX_INTEGER as type of BN
+// TODO: import types for [`rlp`](https://github.com/ethereumjs/rlp)
+// TODO: import types for [`secp256k1`](https://github.com/cryptocoinjs/secp256k1-node/)
+
+export const SHA3_NULL_S: string;
+
+export const SHA3_RLP_ARRAY_S: string;
+
+export const SHA3_RLP_S: string;
+
+export function addHexPrefix(str: string): string;
+
+export function arrayContainsArray(superset: any, subset: any, some: any): any;
+
+export function baToJSON(ba: Buffer | string[]): Buffer | string[];
+
+export function bufferToHex(buf: Buffer): string;
+
+export function bufferToInt(buf: Buffer): string;
+
+export function defineProperties(self: {[k: string]: any}, fields: string[], data: {[k: string]: any}): {[k: string]: any};
+
+export function ecrecover(msgHash: Buffer, v: number, r: Buffer, s: Buffer): Buffer;
+
+export function ecsign(msgHash: Buffer, privateKey: Buffer): {[k: string]: any};
+
+export function fromRpcSig(sig: string): {[k: string]: any};
+
+export function fromSigned(num: Buffer): any;
+
+export function generateAddress(from: Buffer, nonce: Buffer): Buffer;
+
+export function hashPersonalMessage(message: string): Buffer;
+
+export function importPublic(publicKey: Buffer): Buffer;
+
+export function isValidAddress(address: string): boolean;
+
+export function isValidChecksumAddress(address: Buffer): boolean;
+
+export function isValidPrivate(privateKey: Buffer): boolean;
+
+export function isValidPublic(publicKey: Buffer, sanitize?: boolean): any;
+
+export function isValidSignature(v: Buffer, r: Buffer, s: Buffer, homestead?: boolean): boolean;
+
+export function privateToAddress(privateKey: Buffer): Buffer;
+
+export function privateToPublic(privateKey: Buffer): Buffer;
+
+export function pubToAddress(pubKey: Buffer, sanitize: boolean): Buffer;
+
+export function ripemd160(a: Buffer | any[] | string | number, padded: boolean): Buffer;
+
+export function rlphash(a: Buffer | any[] | string | number): Buffer;
+
+export function setLengthLeft(msg: Buffer | any[], length: number, right?: boolean): Buffer | any[];
+
+export function setLengthRight(msg: Buffer | any[], length: number): Buffer | any[];
+
+export function sha256(a: Buffer | any[] | string | number): Buffer;
+
+export function sha3(a: Buffer | any[] | string | number, bits?: number): Buffer;
+
+export function toBuffer(v: any): Buffer;
+
+export function toChecksumAddress(address: string): string;
+
+export function toRpcSig(v: number, r: Buffer, s: Buffer): string;
+
+export function toUnsigned(num: any): Buffer;
+
+export function unpad<T extends Buffer | any[] | string>(a: T): T;
+
+export function zeros(bytes: number): Buffer;
diff --git a/types/ethereumjs-util/tsconfig.json b/types/ethereumjs-util/tsconfig.json
new file mode 100644
index 0000000000..53f8c15b5b
--- /dev/null
+++ b/types/ethereumjs-util/tsconfig.json
@@ -0,0 +1,23 @@
+{
+  "compilerOptions": {
+      "module": "commonjs",
+      "lib": [
+          "es6"
+      ],
+      "noImplicitAny": true,
+      "noImplicitThis": true,
+      "strictNullChecks": true,
+      "strictFunctionTypes": false,
+      "baseUrl": "../",
+      "typeRoots": [
+          "../"
+      ],
+      "types": [],
+      "noEmit": true,
+      "forceConsistentCasingInFileNames": true
+  },
+  "files": [
+      "index.d.ts",
+      "ethereumjs-util-tests.ts"
+  ]
+}
\ No newline at end of file
diff --git a/types/ethereumjs-util/tslint.json b/types/ethereumjs-util/tslint.json
new file mode 100644
index 0000000000..4547f250b4
--- /dev/null
+++ b/types/ethereumjs-util/tslint.json
@@ -0,0 +1,6 @@
+{ 
+  "extends": "dtslint/dt.json",
+  "rules": {
+    "no-empty-interface": false
+  }
+}

From d9c277aabef73facd86e499a46e6da5727c9f006 Mon Sep 17 00:00:00 2001
From: Olivier Sechet <osechet@gmail.com>
Date: Thu, 8 Mar 2018 20:32:43 +0100
Subject: [PATCH 0382/1382] Fix no-internal-module lint

---
 types/openlayers/index.d.ts  | 92 ++++++++++++++++++------------------
 types/openlayers/tslint.json |  1 -
 2 files changed, 46 insertions(+), 47 deletions(-)

diff --git a/types/openlayers/index.d.ts b/types/openlayers/index.d.ts
index 9a6dd11642..1c2e0d12c1 100644
--- a/types/openlayers/index.d.ts
+++ b/types/openlayers/index.d.ts
@@ -13,7 +13,7 @@
 
 declare type GlobalObject = Object;
 
-declare module ol {
+declare namespace ol {
     /**
      * Error object thrown when an assertion failed. This is an ECMA-262 Error,
      * extended with a `code` property.
@@ -221,7 +221,7 @@ declare module ol {
         setAt(index: number, elem: T): void;
     }
 
-    module Collection {
+    namespace Collection {
         type EventType = string;
 
         /**
@@ -258,7 +258,7 @@ declare module ol {
      * Canvas renderer.
      *
      */
-    module color {
+    namespace color {
         /**
          * Return the color as an array. This function maintains a cache of calculated
          * arrays which means the result should not be modified.
@@ -281,7 +281,7 @@ declare module ol {
      * An {@link ol.ColorLike} can be a color, gradient or pattern accepted by
      * [CanvasRenderingContext2D.fillStyle](https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/fillStyle).
      */
-    module colorlike {
+    namespace colorlike {
         /**
          * @param color Color.
          * @return The color as an ol.ColorLike
@@ -290,7 +290,7 @@ declare module ol {
         function asColorLike(color: (ol.Color | ol.ColorLike)): ol.ColorLike;
     }
 
-    module control {
+    namespace control {
         /**
          * @classdesc
          * Control to show all the attributions associated with the layer sources
@@ -697,7 +697,7 @@ declare module ol {
             setUnits(units: ol.control.ScaleLine.Units): void;
         }
 
-        module ScaleLine {
+        namespace ScaleLine {
             /**
              * @api
              */
@@ -786,7 +786,7 @@ declare module ol {
         }
     }
 
-    module coordinate {
+    namespace coordinate {
         /**
          * Add `delta` to `coordinate`. `coordinate` is modified in place and returned
          * by the function.
@@ -1100,7 +1100,7 @@ declare module ol {
     /**
      * Easing functions for {@link ol.animation}.
      */
-    module easing {
+    namespace easing {
         /**
          * Start slow and speed up.
          * @param t Input between 0 and 1.
@@ -1157,8 +1157,8 @@ declare module ol {
      * properties; see the specific event class page for details.
      *
      */
-    module events {
-        module condition {
+    namespace events {
+        namespace condition {
             /**
              * Return `true` if only the alt-key is pressed, `false` otherwise (e.g. when
              * additionally the shift-key is pressed).
@@ -1385,7 +1385,7 @@ declare module ol {
         }
     }
 
-    module extent {
+    namespace extent {
         /**
          * Build an extent that includes all given coordinates.
          *
@@ -1754,7 +1754,7 @@ declare module ol {
     /**
      * Loading mechanisms for vector data.
      */
-    module featureloader {
+    namespace featureloader {
         /**
          * Create an XHR feature loader for a `url` and `format`. The feature loader
          * loads features (with XHR), parses the features, and adds them to the
@@ -1778,7 +1778,7 @@ declare module ol {
         function xhr(url: (string | ol.FeatureUrlFunction), format: ol.format.Feature): ol.FeatureLoader;
     }
 
-    module format {
+    namespace format {
         /**
          * @classdesc
          * Feature format for reading and writing data in the EsriJSON format.
@@ -2486,7 +2486,7 @@ declare module ol {
             setLayers(layers: string[]): void;
         }
 
-        module filter {
+        namespace filter {
             /**
              * Create a `<Intersects>` operator to test whether a geometry-valued property
              * intersects a given geometry.
@@ -3802,7 +3802,7 @@ declare module ol {
         setTrackingOptions(options: PositionOptions): void;
     }
 
-    module geom {
+    namespace geom {
         /**
          * @classdesc
          * Circle geometry.
@@ -4805,7 +4805,7 @@ declare module ol {
         setMap(map: ol.Map): void;
     }
 
-    module has {
+    namespace has {
         /**
          * The ratio between physical pixels and device-independent pixels
          * (dips) on the device (`window.devicePixelRatio`).
@@ -4958,7 +4958,7 @@ declare module ol {
      */
     function inherits(childCtor: (() => any), parentCtor: (() => any)): void;
 
-    module interaction {
+    namespace interaction {
         /**
          * @classdesc
          * Allows the user to zoom by double-clicking on the map.
@@ -5015,7 +5015,7 @@ declare module ol {
             static handleEvent: any;
         }
 
-        module DragAndDrop {
+        namespace DragAndDrop {
             /**
              * @classdesc
              * Events emitted by {@link ol.interaction.DragAndDrop} instances are instances
@@ -5102,7 +5102,7 @@ declare module ol {
             getGeometry(): ol.geom.Polygon;
         }
 
-        module DragBox {
+        namespace DragBox {
             /**
              * @classdesc
              * Events emitted by {@link ol.interaction.DragBox} instances are instances of
@@ -5243,7 +5243,7 @@ declare module ol {
             constructor(opt_options?: olx.interaction.DragZoomOptions);
         }
 
-        module Draw {
+        namespace Draw {
             /**
              * @classdesc
              * Events emitted by {@link ol.interaction.Draw} instances are instances of
@@ -5510,7 +5510,7 @@ declare module ol {
             static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
         }
 
-        module Modify {
+        namespace Modify {
             /**
              * @classdesc
              * Events emitted by {@link ol.interaction.Modify} instances are instances of
@@ -5690,7 +5690,7 @@ declare module ol {
             static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
         }
 
-        module Select {
+        namespace Select {
             /**
              * @classdesc
              * Events emitted by {@link ol.interaction.Select} instances are instances of
@@ -5869,7 +5869,7 @@ declare module ol {
             removeFeature(feature: ol.Feature, opt_unlisten?: boolean): void;
         }
 
-        module Translate {
+        namespace Translate {
             /**
              * @classdesc
              * Events emitted by {@link ol.interaction.Translate} instances are instances of
@@ -5955,7 +5955,7 @@ declare module ol {
         constructor(decay: number, minVelocity: number, delay: number);
     }
 
-    module layer {
+    namespace layer {
         /**
          * @classdesc
          * Abstract base class; normally only used for creating subclasses and not
@@ -6492,7 +6492,7 @@ declare module ol {
     /**
      * Strategies for loading vector data.
      */
-    module loadingstrategy {
+    namespace loadingstrategy {
         /**
          * Strategy function for loading all features with a single request.
          * @param extent Extent.
@@ -7462,7 +7462,7 @@ declare module ol {
         setPositioning(positioning: ol.OverlayPositioning): void;
     }
 
-    module pointer {
+    namespace pointer {
         /**
          * @classdesc
          * A class for pointer events.
@@ -7532,7 +7532,7 @@ declare module ol {
      * this.
      *
      */
-    module proj {
+    namespace proj {
         /**
          * Projection units: `'degrees'`, `'ft'`, `'m'`, `'pixels'`, `'tile-pixels'` or
          * `'us-ft'`.
@@ -7856,8 +7856,8 @@ declare module ol {
         ): number;
     }
 
-    module render {
-        module canvas {
+    namespace render {
+        namespace canvas {
             /**
              * @classdesc
              * A concrete subclass of {@link ol.render.VectorContext} that implements
@@ -8091,7 +8091,7 @@ declare module ol {
      */
     type RasterOperationType = "pixel" | "image";
 
-    module source {
+    namespace source {
         /**
          * @classdesc
          * Layer source for Bing Maps tile data.
@@ -9354,7 +9354,7 @@ declare module ol {
             constructor(options: olx.source.VectorTileOptions);
         }
 
-        module wms {
+        namespace wms {
             /**
              * Available server types: `'carmentaserver'`, `'geoserver'`, `'mapserver'`,
              *     `'qgis'`. These are servers that have vendor parameters beyond the WMS
@@ -9716,7 +9716,7 @@ declare module ol {
      * ```
      *
      */
-    module style {
+    namespace style {
         /**
          * Manages the creation of image atlases.
          *
@@ -10537,11 +10537,11 @@ declare module ol {
         load(): void;
     }
 
-    module Tile {
+    namespace Tile {
         type State = number;
     }
 
-    module tilegrid {
+    namespace tilegrid {
         /**
          * Creates a tile grid with a standard XYZ tiling scheme.
          * @param opt_options Tile grid options.
@@ -11411,8 +11411,8 @@ declare module ol {
     }
 }
 
-declare module olx {
-    module animation {
+declare namespace olx {
+    namespace animation {
         interface BounceOptions {
             resolution: number;
             start?: number;
@@ -11462,7 +11462,7 @@ declare module olx {
         type AnimateCallback = (completed: boolean) => void;
     }
 
-    module control {
+    namespace control {
         interface AttributionOptions {
             className?: string;
             target?: Element;
@@ -11567,7 +11567,7 @@ declare module olx {
         }
     }
 
-    module format {
+    namespace format {
         interface ReadOptions {
             dataProjection: ol.ProjectionLike;
             featureProjection: ol.ProjectionLike;
@@ -11678,7 +11678,7 @@ declare module olx {
         }
     }
 
-    module interaction {
+    namespace interaction {
         /**
          * Object literal with config options for interactions.
          */
@@ -11841,7 +11841,7 @@ declare module olx {
         }
     }
 
-    module layer {
+    namespace layer {
         interface BaseOptions {
             opacity?: number;
             visible?: boolean;
@@ -11958,15 +11958,15 @@ declare module olx {
         }
     }
 
-    module parser {
+    namespace parser {
     }
-    module render {
+    namespace render {
         interface ToContextOptions {
             size?: ol.Size;
             pixelRatio?: number;
         }
     }
-    module source {
+    namespace source {
         interface BingMapsOptions {
             cacheSize?: number;
             culture?: string;
@@ -12283,7 +12283,7 @@ declare module olx {
             size: ol.Size;
         }
     }
-    module style {
+    namespace style {
         interface CircleOptions {
             fill?: ol.style.Fill;
             radius: number;
@@ -12383,7 +12383,7 @@ declare module olx {
             space?: number;
         }
     }
-    module tilegrid {
+    namespace tilegrid {
         interface TileGridOptions {
             extent?: ol.Extent;
             minZoom?: number;
@@ -12498,7 +12498,7 @@ declare module olx {
         getPointResolution?: ((resolution: number, coords: ol.Coordinate) => number);
     }
 
-    module view {
+    namespace view {
         interface FitOptions {
             size?: ol.Size;
             padding?: number[];
diff --git a/types/openlayers/tslint.json b/types/openlayers/tslint.json
index 1c4e20ccb2..85e089b995 100644
--- a/types/openlayers/tslint.json
+++ b/types/openlayers/tslint.json
@@ -5,7 +5,6 @@
         "ban-types": false,
         // Not sure how to work around this, or if it's necessary to
         "no-declare-current-package": false,
-        "no-internal-module": false,
         "no-single-declare-module": false,
         "no-unnecessary-class": false,
         "no-unnecessary-generics": false,

From 2e1cbf3f1028907418d6c26a6b1582d6c7d32430 Mon Sep 17 00:00:00 2001
From: Alvis HT Tang <alvis@hilbert.space>
Date: Sat, 18 Nov 2017 05:29:25 +0000
Subject: [PATCH 0383/1382] fix(highland): correct the definition of push

For each of the push function, it should accept Highland.Nil as a marker of
the end of the stream.

See http://highlandjs.org/#async
---
 types/highland/index.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/highland/index.d.ts b/types/highland/index.d.ts
index 3a2116a4d8..830857278f 100644
--- a/types/highland/index.d.ts
+++ b/types/highland/index.d.ts
@@ -75,7 +75,7 @@ interface HighlandStatic {
 	<R>(): Highland.Stream<R>;
   <R>(xs: Highland.Stream<R>[]): Highland.Stream<R>;
 	<R>(xs: R[]): Highland.Stream<R>;
-	<R>(xs: (push: (err: Error | null, x?: R) => void, next: () => void) => void): Highland.Stream<R>;
+	<R>(xs: (push: (err: Error | null, x?: R | Highland.Nil) => void, next: () => void) => void): Highland.Stream<R>;
 
 	<R>(xs: Highland.Stream<R>): Highland.Stream<R>;
 	<R>(xs: NodeJS.ReadableStream): Highland.Stream<R>;
@@ -563,7 +563,7 @@ declare namespace Highland {
 		 * @param {Function} f - the function to handle errors and values
 		 * @api public
 		 */
-		consume<U>(f: (err: Error, x: R, push: (err: Error | null, value?: U) => void, next: () => void) => void): Stream<U>;
+		consume<U>(f: (err: Error, x: R, push: (err: Error | null, value?: U | Highland.Nil) => void, next: () => void) => void): Stream<U>;
 
 		/**
 		 * Holds off pushing data events downstream until there has been no more

From aeb265279fba8af14e54fb9985c59b71e37294f2 Mon Sep 17 00:00:00 2001
From: Alvis HT Tang <alvis@hilbert.space>
Date: Sat, 18 Nov 2017 05:32:50 +0000
Subject: [PATCH 0384/1382] style(highland): fix some inconsistency to the
 style

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

diff --git a/types/highland/index.d.ts b/types/highland/index.d.ts
index 830857278f..acfaadd6ea 100644
--- a/types/highland/index.d.ts
+++ b/types/highland/index.d.ts
@@ -614,9 +614,9 @@ declare namespace Highland {
 		 *
 		 * _([1, 2, 3, 4]).drop(2) // => 3, 4
 		 */
-		 drop(n: number): Stream<R>;
+        drop(n: number): Stream<R>;
 
-		 /**
+		/**
 		 * Extracts errors from a Stream and applies them to an error handler
 		 * function. Returns a new Stream with the errors removed (unless the error
 		 * handler chooses to rethrow them using `push`). Errors can also be
@@ -653,7 +653,7 @@ declare namespace Highland {
 		 */
 		find(f: (x: R) => boolean): Stream<R>;
 
-		 /**
+		/**
 		 * A convenient form of [where](#where), which returns the first object from a
 		 * Stream that matches a set of property values. findWhere is to [where](#where) as [find](#find) is to [filter](#filter).
 		 *

From 93fb187bf1930e131ca710695f3f3246508b5258 Mon Sep 17 00:00:00 2001
From: maksis <maksis@adrenaline-network.com>
Date: Fri, 9 Mar 2018 17:17:12 +0200
Subject: [PATCH 0385/1382] react-select: export
 ReactAsyncCreatableSelectProps, fix incorrect ReactAsyncSelectProps

---
 types/react-select/index.d.ts | 45 ++++-------------------------------
 1 file changed, 4 insertions(+), 41 deletions(-)

diff --git a/types/react-select/index.d.ts b/types/react-select/index.d.ts
index d256bb437e..7adf0d0750 100644
--- a/types/react-select/index.d.ts
+++ b/types/react-select/index.d.ts
@@ -22,7 +22,7 @@ export default class ReactSelectClass<TValue = OptionValues> extends React.Compo
 // Other components
 export class Creatable<TValue = OptionValues> extends React.Component<ReactCreatableSelectProps<TValue>> { }
 export class Async<TValue = OptionValues> extends React.Component<ReactAsyncSelectProps<TValue>> { }
-export class AsyncCreatable<TValue = OptionValues> extends React.Component<ReactAsyncSelectProps<TValue> & ReactCreatableSelectProps<TValue>> { }
+export class AsyncCreatable<TValue = OptionValues> extends React.Component<ReactAsyncCreatableSelectProps<TValue>> { }
 
 export type HandlerRendererResult = JSX.Element | null | false;
 
@@ -591,21 +591,6 @@ export interface ReactAsyncSelectProps<TValue = OptionValues> extends ReactSelec
      */
     cache?: { [key: string]: any } | boolean;
 
-    /**
-     *  whether to strip diacritics when filtering (shared with Select)
-     */
-    ignoreAccents?: boolean;
-
-    /**
-     *  whether to perform case-insensitive filtering (shared with Select)
-     */
-    ignoreCase?: boolean;
-
-    /**
-     *  overrides the isLoading state when set to true
-     */
-    isLoading?: boolean;
-
     /**
      *  function to call to load options asynchronously
      */
@@ -614,29 +599,7 @@ export interface ReactAsyncSelectProps<TValue = OptionValues> extends ReactSelec
     /**
      *  replaces the placeholder while options are loading
      */
-    loadingPlaceholder?: string;
-
-    /**
-     *  the minimum number of characters that trigger loadOptions
-     */
-    minimumInput?: number;
-
-    /**
-     *  placeholder displayed when there are no matching search results (shared with Select)
-     */
-    noResultsText?: string | JSX.Element;
-    /**
-     *  field placeholder; displayed when there's no value (shared with Select)
-     */
-    placeholder?: string;
-
-    /**
-     *  label to prompt for search input
-     */
-    searchPromptText?: string;
-
-    /**
-     *  message to display while options are loading
-     */
-    searchingText?: string;
+    loadingPlaceholder?: string | JSX.Element;
 }
+
+export type ReactAsyncCreatableSelectProps<TValue = OptionValues> = ReactAsyncSelectProps<TValue> & ReactCreatableSelectProps<TValue>;

From 81db85e6eef178cc114fc095cd068a9997ef810f Mon Sep 17 00:00:00 2001
From: Alvis HT Tang <alvis@hilbert.space>
Date: Thu, 22 Feb 2018 19:12:00 +0000
Subject: [PATCH 0386/1382] fix(highland): correct the definition of consume

The record variable should contain the type of Highland.Nil for it also takes
the marker as a sign of the end of stream.

See http://highlandjs.org/#consume
---
 types/highland/highland-tests.ts | 101 +++++++++++++++----------------
 types/highland/index.d.ts        |   2 +-
 2 files changed, 49 insertions(+), 54 deletions(-)

diff --git a/types/highland/highland-tests.ts b/types/highland/highland-tests.ts
index e97c5c9416..5f1c734395 100644
--- a/types/highland/highland-tests.ts
+++ b/types/highland/highland-tests.ts
@@ -1,5 +1,3 @@
-
-
 // Note: try to maintain the ordering and separators
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -49,18 +47,18 @@ var anyArrStream: Highland.Stream<any[]>;
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 interface Foo {
-	foo(): string;
+  foo(): string;
 }
 interface Bar {
-	bar(): string;
+  bar(): string;
 }
 
 interface StrFooArrMap {
-	[key:string]: Foo[];
+  [key: string]: Foo[];
 }
 
 interface StrBarArrMap {
-	[key:string]: Bar[];
+  [key: string]: Bar[];
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -128,9 +126,9 @@ fooStream = streamRedirect.to;
 fooStream = _<Foo>();
 fooStream = _(fooArr);
 fooStream = _<Foo>((push, next) => {
-	push(null, foo);
-	push(err);
-	next();
+  push(null, foo);
+  push(err);
+  next();
 });
 
 fooStream = _(fooStream);
@@ -173,16 +171,23 @@ fooArrStream = fooStream.collect();
 
 fooStream = fooStream.compact();
 
-barStream = fooStream.consume((err: Error, x: Foo, push: (err: Error, value?: Bar) => void, next: () => void) => {
-	push(err);
-	push(null, bar);
-	next();
-});
+barStream = fooStream.consume(
+  (
+    err: Error,
+    x: Foo | Highland.Nil,
+    push: (err: Error, value?: Bar | Highland.Nil) => void,
+    next: () => void
+  ) => {
+    push(err);
+    push(null, bar);
+    next();
+  }
+);
 
 barStream = fooStream.consume<Bar>((err, x, push, next) => {
-	push(err);
-	push(null, bar);
-	next();
+  push(err);
+  push(null, bar);
+  next();
 });
 
 fooStream = fooStream.debounce(num);
@@ -191,30 +196,32 @@ fooStream = fooStream.doto((x: Foo) => {});
 
 fooStream = fooStream.drop(2);
 
-fooStream = fooStream.errors((err: Error, push: (e: Error, x?: Foo) => void) => {
-	push(err);
-	push(null, x);
-	push(null, foo);
-});
+fooStream = fooStream.errors(
+  (err: Error, push: (e: Error, x?: Foo) => void) => {
+    push(err);
+    push(null, x);
+    push(null, foo);
+  }
+);
 
 fooStream = fooStream.errors((err, push) => {
-	push(err);
-	push(null, x);
-	push(null, foo);
+  push(err);
+  push(null, x);
+  push(null, foo);
 });
 
 fooStream = fooStream.filter((x: Foo) => {
-	return bool;
+  return bool;
 });
 
 fooStream = fooStream.find((x: Foo) => {
-	return bool;
+  return bool;
 });
 
 fooStream = fooStream.findWhere(obj);
 
 strFooArrMapStream = fooStream.group((x: Foo) => {
-	return str;
+  return str;
 });
 strFooArrMapStream = fooStream.group(str);
 
@@ -227,7 +234,7 @@ fooStream = fooStream.last();
 fooStream = fooStream.latest();
 
 barStream = fooStream.map((x: Foo) => {
-	return bar;
+  return bar;
 });
 
 barStream = fooStream.pluck<Bar>(str);
@@ -235,26 +242,24 @@ barStream = fooStream.pluck<Bar>(str);
 fooStream = fooStream.ratelimit(3, 1000);
 
 barStream = fooStream.reduce(bar, (memo: Bar, x: Foo) => {
-	return memo;
+  return memo;
 });
 
 barStream = fooStream.reduce1(bar, (memo: Bar, x: Foo) => {
-	return memo;
+  return memo;
 });
 
 fooStream = fooStream.reject((x: Foo) => {
-	return bool;
+  return bool;
 });
 
 barStream = fooStream.scan(bar, (memo: Bar, x: Foo) => {
-	return memo;
+  return memo;
 });
 
 //missing scan1
 
-fooStream = fooStream.stopOnError((e: Error) => {
-
-});
+fooStream = fooStream.stopOnError((e: Error) => {});
 
 fooStream = fooStream.take(num);
 
@@ -264,7 +269,6 @@ fooStream = fooStream.throttle(num);
 
 fooStream = fooStream.where(obj);
 
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 // HIGHER-ORDER STREAMS
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -274,15 +278,15 @@ fooStream = fooStream.concat(fooStream);
 fooStream = fooStream.concat(fooArr);
 
 fooStream = fooStream.flatFilter((x: Foo) => {
-	return boolStream;
+  return boolStream;
 });
 
 barStream = fooStream.flatMap((x: Foo) => {
-	return barStream;
+  return barStream;
 });
 
 barStream = fooStream.flatMap((x: Foo) => {
-	return bar;
+  return bar;
 });
 
 barStream = fooStream.flatten<Bar>();
@@ -315,24 +319,16 @@ fooStream.apply(func);
 
 fooStream.done(() => {});
 
-fooStream.each((x: Foo) => {
-
-});
+fooStream.each((x: Foo) => {});
 
 fooStream = fooStream.pipe(fooStream);
 barStream = fooStream.pipe(barStream);
 
-fooStream.pull((err: Error, x: Foo) => {
+fooStream.pull((err: Error, x: Foo) => {});
 
-});
+fooStream.pull((err, x) => {});
 
-fooStream.pull((err, x) => {
-
-});
-
-fooStream.toArray((arr: Foo[]) => {
-
-});
+fooStream.toArray((arr: Foo[]) => {});
 
 fooStream.toCallback((err: Error, x: Foo) => {});
 fooStream.toCallback((err: Error) => {});
@@ -360,7 +356,6 @@ f = _.wrapCallback(func, num);
 f = _.wrapCallback(func, strArr);
 f = _.wrapCallback(func, fn);
 
-
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 // OBJECTS
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/types/highland/index.d.ts b/types/highland/index.d.ts
index acfaadd6ea..eff8fb2769 100644
--- a/types/highland/index.d.ts
+++ b/types/highland/index.d.ts
@@ -563,7 +563,7 @@ declare namespace Highland {
 		 * @param {Function} f - the function to handle errors and values
 		 * @api public
 		 */
-		consume<U>(f: (err: Error, x: R, push: (err: Error | null, value?: U | Highland.Nil) => void, next: () => void) => void): Stream<U>;
+		consume<U>(f: (err: Error, x: R | Highland.Nil, push: (err: Error | null, value?: U | Highland.Nil) => void, next: () => void) => void): Stream<U>;
 
 		/**
 		 * Holds off pushing data events downstream until there has been no more

From 6325442ec9055c14715742ba5178006d8d392796 Mon Sep 17 00:00:00 2001
From: Jeremy Hon <jeremy.hon.gy@gmail.com>
Date: Fri, 9 Mar 2018 23:59:04 +0800
Subject: [PATCH 0387/1382] replace overloaded array and dictionary params with
 union collection

---
 types/async/index.d.ts | 60 +++++++++++++-----------------------------
 1 file changed, 19 insertions(+), 41 deletions(-)

diff --git a/types/async/index.d.ts b/types/async/index.d.ts
index 17fecb467b..e2ecb522bc 100644
--- a/types/async/index.d.ts
+++ b/types/async/index.d.ts
@@ -7,6 +7,7 @@
 export as namespace async;
 
 export interface Dictionary<T> { [key: string]: T; }
+export type IterableCollection<T> = T[] | IterableIterator<T> | Dictionary<T>
 
 export interface ErrorCallback<T> { (err?: T): void; }
 export interface AsyncBooleanResultCallback<E> { (err?: E, truthValue?: boolean): void; }
@@ -36,11 +37,9 @@ export interface AsyncQueue<T> {
     running(): number;
     idle(): boolean;
     concurrency: number;
-    push<E>(task: T, callback?: ErrorCallback<E>): void;
+    push<E>(task: T | T[], callback?: ErrorCallback<E>): void;
     push<R,E>(task: T, callback?: AsyncResultCallback<R, 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;
+    unshift<E>(task: T | T[], callback?: ErrorCallback<E>): void;
     saturated: () => any;
     empty: () => any;
     drain: () => any;
@@ -62,8 +61,7 @@ export interface AsyncPriorityQueue<T> {
     concurrency: number;
     started: boolean;
     paused: boolean;
-    push<R,E>(task: T, priority: number, callback?: AsyncResultArrayCallback<R, E>): void;
-    push<R,E>(task: T[], priority: number, callback?: AsyncResultArrayCallback<R, E>): void;
+    push<R,E>(task: T | T[], priority: number, callback?: AsyncResultArrayCallback<R, E>): void;
     saturated: () => any;
     empty: () => any;
     drain: () => any;
@@ -86,7 +84,6 @@ export interface AsyncCargo {
     length(): number;
     payload?: number;
     push(task: any, callback? : Function): void;
-    push(task: any[], callback? : Function): void;
     saturated(): void;
     empty(): void;
     drain(): void;
@@ -97,39 +94,28 @@ export interface AsyncCargo {
 }
 
 // Collections
-export function each<T, E>(arr: T[] | IterableIterator<T>, iterator: AsyncIterator<T, E>, callback?: ErrorCallback<E>): void;
-export function each<T, E>(arr: Dictionary<T>, iterator: AsyncIterator<T, E>, callback?: ErrorCallback<E>): void;
+export function each<T, E>(arr: IterableCollection<T>, iterator: AsyncIterator<T, E>, callback?: ErrorCallback<E>): void;
 export const eachSeries: typeof each;
-export function eachLimit<T, E>(arr: T[] | IterableIterator<T>, limit: number, iterator: AsyncIterator<T, E>, callback?: ErrorCallback<E>): void;
-export function eachLimit<T, E>(arr: Dictionary<T>, limit: number, iterator: AsyncIterator<T, E>, callback?: ErrorCallback<E>): void;
+export function eachLimit<T, E>(arr: IterableCollection<T>, limit: number, iterator: AsyncIterator<T, E>, callback?: ErrorCallback<E>): void;
 export const forEach: typeof each;
 export const forEachSeries: typeof each;
 export const forEachLimit: typeof eachLimit;
-export function forEachOf<T, E>(obj: T[] | IterableIterator<T>, iterator: AsyncForEachOfIterator<T, E>, callback?: ErrorCallback<E>): void;
-export function forEachOf<T, E>(obj: Dictionary<T>, iterator: AsyncForEachOfIterator<T, E>, callback?: ErrorCallback<E>): void;
+export function forEachOf<T, E>(obj: IterableCollection<T>, iterator: AsyncForEachOfIterator<T, E>, callback?: ErrorCallback<E>): void;
 export const forEachOfSeries: typeof forEachOf;
-export function forEachOfLimit<T, E>(obj: T[] | IterableIterator<T>, limit: number, iterator: AsyncForEachOfIterator<T, E>, callback?: ErrorCallback<E>): void;
-export function forEachOfLimit<T, E>(obj: Dictionary<T>, limit: number, iterator: AsyncForEachOfIterator<T, E>, callback?: ErrorCallback<E>): void;
+export function forEachOfLimit<T, E>(obj: IterableCollection<T>, limit: number, iterator: AsyncForEachOfIterator<T, E>, callback?: ErrorCallback<E>): void;
 export const eachOf: typeof forEachOf;
 export const eachOfSeries: typeof forEachOf;
 export const eachOfLimit: typeof forEachOfLimit;
 export function map<T, R, E>(arr: T[] | IterableIterator<T>, iterator: AsyncResultIterator<T, R, E>, callback?: AsyncResultArrayCallback<R, E>): void;
 export function map<T, R, E>(arr: Dictionary<T>, iterator: AsyncResultIterator<T, R, E>, callback?: AsyncResultArrayCallback<R, E>): void;
 export const mapSeries: typeof map;
-export function mapLimit<T, R, E>(
-    arr: T[] | Dictionary<T> | IterableIterator<T>,
-    limit: number,
-    iterator: AsyncResultIterator<T, R, E>,
-    callback?: AsyncResultArrayCallback<R, E>
-): void;
+export function mapLimit<T, R, E>(arr: IterableCollection<T>, limit: number, iterator: AsyncResultIterator<T, R, E>, callback?: AsyncResultArrayCallback<R, E>): void;
 export function mapValuesLimit<T, R, E>(obj: Dictionary<T>, limit: number, iteratee: (value: T, key: string, callback: AsyncResultCallback<R, E>) => void, callback: AsyncResultObjectCallback<R, E>): void;
 export function mapValues<T, R, E>(obj: Dictionary<T>, iteratee: (value: T, key: string, callback: AsyncResultCallback<R, E>) => void, callback: AsyncResultObjectCallback<R, E>): void;
 export const mapValuesSeries: typeof mapValues;
-export function filter<T, E>(arr: T[] | IterableIterator<T>, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultArrayCallback<T, E>): void;
-export function filter<T, E>(arr: Dictionary<T>, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultArrayCallback<T, E>): void;
+export function filter<T, E>(arr: IterableCollection<T>, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultArrayCallback<T, E>): void;
 export const filterSeries: typeof filter;
-export function filterLimit<T, E>(arr: T[] | IterableIterator<T>, limit: number, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultArrayCallback<T, E>): void;
-export function filterLimit<T, E>(arr: Dictionary<T>, limit: number, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultArrayCallback<T, E>): void;
+export function filterLimit<T, E>(arr: IterableCollection<T>, limit: number, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultArrayCallback<T, E>): void;
 export const select: typeof filter;
 export const selectSeries: typeof filter;
 export const selectLimit: typeof filterLimit;
@@ -141,36 +127,28 @@ export const inject: typeof reduce;
 export const foldl: typeof reduce;
 export const reduceRight: typeof reduce;
 export const foldr: typeof reduce;
-export function detect<T, E>(arr: T[] | IterableIterator<T>, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultCallback<T, E>): void;
-export function detect<T, E>(arr: Dictionary<T>, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultCallback<T, E>): void;
+export function detect<T, E>(arr: IterableCollection<T>, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultCallback<T, E>): void;
 export const detectSeries: typeof detect;
-export function detectLimit<T, E>(arr: T[] | IterableIterator<T>, limit: number, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultCallback<T, E>): void;
-export function detectLimit<T, E>(arr: Dictionary<T>, limit: number, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultCallback<T, E>): void;
+export function detectLimit<T, E>(arr: IterableCollection<T>, limit: number, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultCallback<T, E>): void;
 export const find: typeof detect;
 export const findSeries: typeof detect;
 export const findLimit: typeof detectLimit;
 export function sortBy<T, V, E>(arr: T[] | IterableIterator<T>, iterator: AsyncResultIterator<T, V, E>, callback?: AsyncResultArrayCallback<T, E>): void;
-export function some<T, E>(arr: T[] | IterableIterator<T>, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncBooleanResultCallback<E>): void;
-export function some<T, E>(arr: Dictionary<T>, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncBooleanResultCallback<E>): void;
+export function some<T, E>(arr: IterableCollection<T>, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncBooleanResultCallback<E>): void;
 export const someSeries: typeof some;
-export function someLimit<T, E>(arr: T[] | IterableIterator<T>, limit: number, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncBooleanResultCallback<E>): void;
-export function someLimit<T, E>(arr: Dictionary<T>, limit: number, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncBooleanResultCallback<E>): void;
+export function someLimit<T, E>(arr: IterableCollection<T>, limit: number, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncBooleanResultCallback<E>): void;
 export const any: typeof some;
 export const anySeries: typeof someSeries;
 export const anyLimit: typeof someLimit;
-export function every<T, E>(arr: T[] | IterableIterator<T>, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncBooleanResultCallback<E>): void;
-export function every<T, E>(arr: Dictionary<T>, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncBooleanResultCallback<E>): void;
+export function every<T, E>(arr: IterableCollection<T>, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncBooleanResultCallback<E>): void;
 export const everySeries: typeof every;
-export function everyLimit<T, E>(arr: T[] | IterableIterator<T>, limit: number, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncBooleanResultCallback<E>): void;
-export function everyLimit<T, E>(arr: Dictionary<T>, limit: number, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncBooleanResultCallback<E>): void;
+export function everyLimit<T, E>(arr: IterableCollection<T>, limit: number, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncBooleanResultCallback<E>): void;
 export const all: typeof every;
 export const allSeries: typeof every;
 export const allLimit: typeof everyLimit;
 
-export function concat<T, R, E>(arr: T[] | IterableIterator<T>, iterator: AsyncResultIterator<T, R[], E>, callback?: AsyncResultArrayCallback<R, E>): void;
-export function concat<T, R, E>(arr: Dictionary<T>, iterator: AsyncResultIterator<T, R[], E>, callback?: AsyncResultArrayCallback<R, E>): void;
-export function concatLimit<T, R, E>(arr: T[] | IterableIterator<T>, limit: number, iterator: AsyncResultIterator<T, R[], E>, callback?: AsyncResultArrayCallback<R, E>): void;
-export function concatLimit<T, R, E>(arr: Dictionary<T>, limit: number,iterator: AsyncResultIterator<T, R[], E>, callback?: AsyncResultArrayCallback<R, E>): void;
+export function concat<T, R, E>(arr: IterableCollection<T>, iterator: AsyncResultIterator<T, R[], E>, callback?: AsyncResultArrayCallback<R, E>): void;
+export function concatLimit<T, R, E>(arr: IterableCollection<T>, limit: number, iterator: AsyncResultIterator<T, R[], E>, callback?: AsyncResultArrayCallback<R, E>): void;
 export const concatSeries: typeof concat;
 
 // Control Flow

From 1dc108cc756793babcc047f64dd399f18ca7e925 Mon Sep 17 00:00:00 2001
From: Atanas Atanasov <atanas.nk.atanasov@gmail.com>
Date: Fri, 9 Mar 2018 18:04:20 +0200
Subject: [PATCH 0388/1382] added type definitions for gijgo 1.8.2

---
 types/gijgo/index.d.ts | 298 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 287 insertions(+), 11 deletions(-)

diff --git a/types/gijgo/index.d.ts b/types/gijgo/index.d.ts
index a76d98dd7f..19d17deb22 100644
--- a/types/gijgo/index.d.ts
+++ b/types/gijgo/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Gijgo v0.6.2
+// Type definitions for Gijgo v1.8.2
 // Project: http://gijgo.com
 // Definitions by: Atanas Atanasov <https://github.com/atatanasov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -10,23 +10,28 @@ declare module Gijgo {
     interface GridPager {
         limit?: number;
         sizes?: Array<number>;
-        leftControls?: any;
-        rightControls?: any;
+        leftControls?: Array<any>;
+        rightControls?: Array<any>;
     }
 
     interface GridColumn {
         align?: string;
         cssClass?: string;
         decimalDigits?: number;
+        editField?: string;
         editor?: any;
         events?: any;
         field?: string;
+        filter?: any;
+        filterable?: boolean;
         format?: string;
         headerCssClass?: string;
         hidden?: boolean;
         icon?: string;
         minWidth?: number;
+        mode?: string;
         priority?: number;
+        renderer?: any;
         sortable?: boolean;
         stopPropagation?: boolean;
         title?: string;
@@ -36,11 +41,13 @@ declare module Gijgo {
         width?: number;
     }
 
-    interface GridDefaultParams {
+    interface GridParamNames {
         direction?: string;
         limit?: string;
         page?: string;
         sortBy?: string;
+        groupBy?: string;
+        groupByDirection?: string;
     }
 
     interface GridMapping {
@@ -48,24 +55,62 @@ declare module Gijgo {
         totalRecordsField?: string;
     }
 
+    interface GridIcons {
+        expandRow?: string;
+        collapseRow?: string;
+        expandGroup?: string;
+        collapseGroup?: string;
+    }
+
+    interface GridGrouping {
+        groupBy: string;
+    }
+
+    interface GridHeaderFilter {
+        type: string;
+    }
+
+    interface GridInlineEditing {
+        mode?: string;
+        managementColumn?: boolean;
+    }
+
+    interface GridOptimisticPersistence {
+        localStorage: Array<string>;
+        sessionStorage: Array<string>;
+    }
+
     interface GridSettings<Entity> {
         //Configuration options
         autoGenerateColumns?: boolean;
         autoLoad?: boolean;
+        columnReorder?: boolean;
         columns?: Array<GridColumn>;
         dataSource?: any;
         defaultColumnSettings?: GridColumn;
-        defaultParams?: GridDefaultParams;
         detailTemplate?: string;
+        fixedHeader?: boolean;
         fontSize?: string;
-        mapping?: string;
+        grouping?: GridGrouping;
+        headerFilter?: GridHeaderFilter;
+        icons?: GridIcons;
+        iconsLibrary?: string;
+        inlineEditing?: GridInlineEditing;
+        keepExpandedRows?: boolean;
+        locale?: string;
+        mapping?: any;
         minWidth?: number;
         notFoundText?: string;
+        optimisticPersistence?: GridOptimisticPersistence;
+        orderNumberField?: string;
         pager?: GridPager;
+        paramNames?: GridParamNames;
         primaryKey?: string;
         resizableColumns?: boolean;
         resizeCheckInterval?: number;
         responsive?: boolean;
+        rowReorder?: boolean;
+        rowReorderColumn?: string;
         selectionMethod?: string;
         selectionType?: string;
         showHiddenColumnsAsDetails?: boolean;
@@ -83,14 +128,16 @@ declare module Gijgo {
         columnShow?: (e: any, column: GridColumn) => any;
         dataBinding?: (e: any, records: Array<Entity>) => any;
         dataBound?: (e: any, records: Array<Entity>, totalRecords: number) => any;
+        dataFiltered?: (e: any, records: Array<Entity>) => any;
         destroying?: (e: any) => any;
-        detailCollapse?: (e: any, detailWrapper: JQuery, record: Entity) => any;
-        detailExpand?: (e: any, detailWrapper: JQuery, record: Entity) => any;
+        detailCollapse?: (e: any, detailWrapper: JQuery, id: string) => any;
+        detailExpand?: (e: any, detailWrapper: JQuery, id: string) => any;
         initialized?: (e: any) => any;
         pageChanging?: (e: any, newPage: number) => any;
         pageSizeChange?: (e: any, newPage: number) => any;
         resize?: (e: any, newWidth: number, oldWidth: number) => any;
         rowDataBound?: (e: any, $row: JQuery, id: string, record: Entity) => any;
+        rowDataChanged?: (e: any, id: string, record: Entity) => any;
         rowRemoving?: (e: any, $row: JQuery, id: string, record: Entity) => any;
         rowSelect?: (e: any, $row: JQuery, id: string, record: Entity) => any;
         rowUnselect?: (e: any, $row: JQuery, id: string, record: Entity) => any;
@@ -98,17 +145,23 @@ declare module Gijgo {
 
     interface Grid<Entity, Params> extends JQuery {
         addRow(record: Entity): Grid<Entity, Params>;
+        cancel(id: string): Grid<Entity, Params>; 
         clear(showNotFoundText?: boolean): Grid<Entity, Params>;
+        collapseAll(): Grid<Entity, Params>; 
         count(): number;
         destroy(keepTableTag?: boolean, keepWrapperTag?: boolean): void;
+        downloadCSV(filename?: string, includeAllRecords?: boolean): Grid<Entity, Params>;
+        edit(id: string): Grid<Entity, Params>; 
+        expandAll(): Grid<Entity, Params>; 
         //get(position: number): Entity; //TODO: rename to getByPosition to avoid conflicts with jquery.get
         getAll(): Array<Entity>;
         getById(id: string): Entity;
         getChanges(): Array<Entity>;
+        getCSV(includeAllRecords?: boolean): string;
         getSelected(): string;
         getSelections(): Array<string>;
         hideColumn(field: string): Grid<Entity, Params>;
-        makeResponsive(): void;
+        makeResponsive(): Grid<Entity, Params>;
         reload(params?: Params): Grid<Entity, Params>;
         removeRow(id: string): Grid<Entity, Params>;
         render(response: any): Grid<Entity, Params>;
@@ -117,22 +170,25 @@ declare module Gijgo {
         showColumn(field: string): Grid<Entity, Params>;
         title(text: any): any;
         unSelectAll(): Grid<Entity, Params>;
+        update(id: string): Grid<Entity, Params>; 
         updateRow(id: string, record: Entity): Grid<Entity, Params>;
     }
 
-    //Dialog
+    // Dialog
     interface DialogSettings {
-        //Configuration options
         autoOpen?: boolean;
+        closeButtonInHeader?: boolean;
         closeOnEscape?: boolean;
         draggable?: boolean;
         height?: number | string;
+        locale?: string;
         maxHeight?: number;
         maxWidth?: number;
         minHeight?: number;
         minWidth?: number;
         modal?: boolean;
         resizable?: boolean;
+        scrollable?: boolean;
         title?: string;
         uiLibrary?: string;
         width?: number;
@@ -153,9 +209,217 @@ declare module Gijgo {
 
     interface Dialog extends JQuery {
         close(): Dialog;
+        content(constent: string): string | Dialog;
+        destroy(keepHtml: boolean): void;
         isOpen(): boolean;
         open(): Dialog;
     }
+
+    // Checkbox
+    interface CheckboxSettings {
+        uiLibrary?: string;
+        iconsLibrary?: string;
+
+        //Events
+        change?: (e: any, state: string) => any;
+    }
+
+    interface Checkbox extends JQuery {
+        //toggle(): Checkbox;
+        state(value: string):  string | Checkbox;
+        destroy(): void;
+    }
+
+    // DatePicker
+    interface DatePickerIcons {
+        rightIcon?: string;
+    }
+
+    interface DatePickerSettings {
+        showOtherMonths?: boolean;
+        selectOtherMonths?: boolean;
+        width?: number;
+        minDate?: Date | string | Function;
+        maxDate?: Date | string | Function;
+        format?: string;
+        value?: string;
+        uiLibrary?: string;
+        iconsLibrary?: string;
+        weekStartDay?: number;
+        disableDates?: Array<any> | Function;
+        disableDaysOfWeek?: Array<number>;
+        calendarWeeks?: boolean;
+        keyboardNavigation?: boolean;
+        locale?: string;
+        icons?: DatePickerIcons;
+
+        //Events
+        change?: (e: any) => any;
+        open?: (e: any) => any;
+        close?: (e: any) => any;
+    }
+
+    interface DatePicker extends JQuery {
+        close(): DatePicker;
+        destroy(): void;
+        open(): DatePicker;
+        value(value: string):  string | DatePicker;
+    }
+
+    // DropDown
+    interface DropDownIcons {
+        dropdown?: string;
+    }
+
+    interface DropDownSettings {
+        dataSource?: any;
+        textField?: string;
+        valueField?: string;
+        selectedField?: string;
+        width?: number;
+        maxHeight?: any;
+        uiLibrary?: string;
+        iconsLibrary?: string;
+        icons?: DropDownIcons;
+
+        //Events
+        change?: (e: any) => any;
+        dataBound?: (e: any) => any;
+    }
+
+    interface DropDown extends JQuery {
+        value(value: string):  string | DropDown;
+        destroy(): void;
+    }
+
+    // Editor
+    interface EditorSettings {
+        height?: number | string;
+        width?: number | string;
+        uiLibrary?: string;
+        iconsLibrary?: string;
+        locale?: string;
+
+        //Events
+        changing?: (e: any) => any;
+        changed?: (e: any) => any;
+    }
+
+    interface Editor extends JQuery {
+        content(html: string):  string | Editor;
+        destroy(): void;
+    }
+
+    // TimePicker
+    interface TimePickerSettings {
+        width?: number;
+        modal?: boolean;
+        header?: boolean;
+        footer?: boolean;
+        format?: string;
+        uiLibrary?: string;
+        value?: string;
+        mode?: string;
+        locale?: string;
+
+        //Events
+        change?: (e: any) => any;
+        open?: (e: any) => any;
+        close?: (e: any) => any;
+    }
+
+    interface TimePicker extends JQuery {
+        close(): TimePicker;
+        destroy(): void;
+        open(): TimePicker;
+        value(value: string):  string | TimePicker;
+    }
+
+    // Tree
+    interface TreeIcons {
+        expand?: string;
+        collapse?: string;
+    }
+
+    interface TreeParamNames {
+        parentId?: string;
+    }
+
+    interface TreeSettings {
+        autoLoad?: boolean;
+        selectionType?: string;
+        cascadeSelection?: boolean;
+        dataSource?: any;
+        primaryKey?: string;
+        textField?: string;
+        childrenField?: string;
+        hasChildrenField?: string;
+        imageCssClassField?: string;
+        imageUrlField?: string;
+        imageHtmlField?: string;
+        disabledField?: string;
+        width?: number;
+        border?: boolean;
+        uiLibrary?: string;
+        iconsLibrary?: string;
+        icons?: TreeIcons;
+
+        checkboxes?: boolean;
+        checkedField?: string;
+        cascadeCheck?: boolean;
+        dragAndDrop?: boolean;
+        paramNames: TreeParamNames;
+        lazyLoading?: boolean;
+
+
+        //Events
+        initialized?: (e: any) => any;
+        dataBinding?: (e: any) => any;
+        dataBound?: (e: any) => any;
+        select?: (e: any, node: any, id: string) => any;
+        unselect?: (e: any, node: any, id: string) => any;
+        expand?: (e: any, node: any, id: string) => any;
+        collapse?: (e: any, node: any, id: string) => any;
+        enable?: (e: any, node: any, id: string) => any;
+        disable?: (e: any, node: any, id: string) => any;
+        destroying?: (e: any) => any;
+        nodeDataBound?: (e: any, node: any, id: string) => any;
+        checkboxChange?: (e: any, node: any, record: any, state: string) => any;
+        nodeDrop?: (e: any, id: string, parentId: string, orderNumber: number) => any;
+    }
+
+    interface Tree extends JQuery {
+        reload(params: any):  any;
+        render(response: any): any;
+        addNode(data: any, parentNode: any, position: number): Tree;
+        removeNode(node: any): Tree;
+        destroy(): void;
+        expand(node: any, cascade: boolean): Tree;
+        collapse(node: any, cascade: boolean) : Tree;
+        expandAll(): Tree;
+        collapseAll() : Tree;
+        getDataById(id: string) : any;
+        getDataByText(text: string) : any;
+        getNodeById(id: string) : any;
+        getNodeByText(id: string) : any;
+        getAll(): Array<any>;
+        //select(node: any) : Tree;
+        unselect(node: any) : Tree;
+        selectAll() : Tree;
+        unselectAll() : Tree;
+        getSelections() : Array<string>;
+        getChildren(node: any, cascade: boolean) : Array<any>;
+        enable(node: any, cascade: boolean) : Tree;
+        disable(node: any, cascade: boolean) : Tree;
+        enableAll() : Tree;
+        disableAll() : Tree;
+
+        getCheckedNodes() : Array<string>;
+        checkAll() : Tree;
+        uncheckAll(): Tree;
+        check(node: any) : Tree;
+        uncheck(node: any) : Tree;
+    }
 }
 
 
@@ -165,4 +429,16 @@ interface JQuery {
     grid<Entity, Params>(settings: Gijgo.GridSettings<Entity>): Gijgo.Grid<Entity, Params>;
 
     dialog(settings: Gijgo.DialogSettings): Gijgo.Dialog;
+
+    checkbox(settings: Gijgo.CheckboxSettings): Gijgo.Checkbox;
+
+    datepicker(settings: Gijgo.DatePickerSettings): Gijgo.DatePicker;
+
+    dropdown(settings: Gijgo.DropDownSettings): Gijgo.DropDown;
+
+    editor(settings: Gijgo.EditorSettings): Gijgo.Editor;
+
+    timepicker(settings: Gijgo.TimePickerSettings): Gijgo.TimePicker;
+
+    tree(settings: Gijgo.TreeSettings): Gijgo.Tree;
 }

From 0f34b6311cf5a163cf1c5e6deb92abe92f8cda07 Mon Sep 17 00:00:00 2001
From: Clark Stevenson <clark@drimlike.com>
Date: Fri, 9 Mar 2018 16:10:01 +0000
Subject: [PATCH 0389/1382] Minor Updates to pixi.js and paper

---
 types/paper/index.d.ts   | 42 ++++++++++++++++++++--------------------
 types/pixi.js/index.d.ts |  7 +++++--
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/types/paper/index.d.ts b/types/paper/index.d.ts
index 3f57526a19..5b3e46a146 100644
--- a/types/paper/index.d.ts
+++ b/types/paper/index.d.ts
@@ -213,7 +213,7 @@ declare module paper {
          * @param angle - the angle of rotation measured in degrees
          * @param center - the anchor point to rotate around
          */
-        rotate(angle: number, center: Point): Matrix;
+        rotate(angle: number, center?: Point): Matrix;
 
         /**
          * Concatenates this transform with a rotation transformation around an anchor point.
@@ -1369,7 +1369,7 @@ declare module paper {
          * Rasterizes the item into a newly created Raster object. The item itself is not removed after rasterization.
          * @param resolution [optional] - the resolution of the raster in pixels per inch (DPI). If not specified, the value of view.resolution is used. default: view.resolution
          */
-        rasterize(resolution: number): Raster;
+        rasterize(resolution?: number): Raster;
 
         /**
          * Checks whether the item's geometry contains the given point.
@@ -3359,99 +3359,99 @@ declare module paper {
          * The view that this style belongs to.
          * Read only.
          */
-        view: View;
+        view?: View;
 
         /**
          * The color of the stroke.
          */
-        strokeColor: Color | string;
+        strokeColor?: Color | string;
 
         /**
          * The width of the stroke.
          */
-        strokeWidth: number;
+        strokeWidth?: number;
 
         /**
          * The shape to be used at the beginning and end of open Path items, when they have a stroke.
          * String('round', 'square', 'butt'
          */
-        strokeCap: string;
+        strokeCap?: string;
 
         /**
          * The shape to be used at the segments and corners of Path items when they have a stroke.
          * String('miter', 'round', 'bevel')
          */
-        strokeJoin: string;
+        strokeJoin?: string;
 
         /**
          * Specifies whether the stroke is to be drawn taking the current affine transformation into account (the default behavior), or whether it should appear as a non-scaling stroke.
          */
-        strokeScaling: boolean;
+        strokeScaling?: boolean;
 
         /**
          * The dash offset of the stroke.
          */
-        dashOffset: number;
+        dashOffset?: number;
 
         /**
          * Specifies an array containing the dash and gap lengths of the stroke.
          */
-        dashArray: number[];
+        dashArray?: number[];
 
         /**
          * The miter limit of the stroke. When two line segments meet at a sharp angle and miter joins have been specified for strokeJoin, it is possible for the miter to extend far beyond the strokeWidth of the path. The miterLimit imposes a limit on the ratio of the miter length to the strokeWidth.
          */
-        miterLimit: number;
+        miterLimit?: number;
 
         /**
          * The fill color.
          */
-        fillColor: Color | string;
+        fillColor?: Color | string;
 
         /**
          * The shadow color.
          */
-        shadowColor: Color | string;
+        shadowColor?: Color | string;
 
         /**
          * The shadow's blur radius.
          */
-        shadowBlur: number;
+        shadowBlur?: number;
 
         /**
          * The shadow's offset.
          */
-        shadowOffset: Point;
+        shadowOffset?: Point;
 
         /**
          * The color the item is highlighted with when selected. If the item does not specify its own color, the color defined by its layer is used instead.
          */
-        selectedColor: Color | string;
+        selectedColor?: Color | string;
 
         /**
          * The font-family to be used in text content. default 'sans-serif'
          */
-        fontFamily: string;
+        fontFamily?: string;
 
         /**
          * The font-weight to be used in text content.
          */
-        fontWeight: string | number;
+        fontWeight?: string | number;
 
         /**
          * The font size of text content, as {@Number} in pixels, or as {@String} with optional units 'px', 'pt' and 'em'.
          */
-        fontSize: string | number;
+        fontSize?: string | number;
 
         /**
          * The text leading of text content.
          */
-        leading: number | string;
+        leading?: number | string;
 
         /**
          * The justification of text paragraphs. default "left"
          */
-        justification: string;
+        justification?: string;
 
     }
     export interface IHSBColor {
diff --git a/types/pixi.js/index.d.ts b/types/pixi.js/index.d.ts
index f75bb4a1ca..f503867b5b 100644
--- a/types/pixi.js/index.d.ts
+++ b/types/pixi.js/index.d.ts
@@ -1428,9 +1428,11 @@ declare namespace PIXI {
 
         constructor(text: string, style: TextStyle, width: number, height: number, lines: number[], lineWidths: number[], lineHeight: number, maxLineWidth: number, fontProperties: any);
 
+        static addLine(line: string, newLine?: boolean): string;
         static measureText(text: string, style: TextStyle, wordWrap?: boolean, canvas?: HTMLCanvasElement): TextMetrics;
         static wordWrap(text: string, style: TextStyle, canvas?: HTMLCanvasElement): string;
         static measureFont(font: string): FontMetrics;
+        static getFromCache(key: string, letterSpacing: number, cache: any, context: CanvasRenderingContext2D): number;
     }
     interface FontMetrics {
         ascent: number;
@@ -2057,6 +2059,7 @@ declare namespace PIXI {
             type: string;
             data: InteractionData;
             stopPropagation(): void;
+            reset(): void;
         }
         class InteractionData {
             global: Point;
@@ -2076,8 +2079,8 @@ declare namespace PIXI {
             twist: number;
             tangentialPressure: number;
             readonly pointerID: number;
-            protected _copyEvent(event: Touch | MouseEvent | PointerEvent): void;
-            protected _reset(): void;
+            copyEvent(event: Touch | MouseEvent | PointerEvent): void;
+            reset(): void;
             getLocalPosition(displayObject: DisplayObject, point?: Point, globalPos?: Point): Point;
         }
         type InteractionPointerEvents = "pointerdown" | "pointercancel" | "pointerup" |

From 94a484cff48cc620df26c5625bf6545361160fce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81rni=20Benedikt=20=C3=81rnason?=
 <arnibarnason@gmail.com>
Date: Fri, 9 Mar 2018 17:20:33 +0100
Subject: [PATCH 0390/1382] Overloaded navigate method to handle new navigation
 options parameters

---
 types/react-navigation/index.d.ts                | 16 +++++++++++-----
 .../react-navigation/react-navigation-tests.tsx  |  8 ++++++++
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index 2fdde0448e..50f384c34e 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -420,12 +420,18 @@ export interface NavigationEventSubscription {
 export interface NavigationScreenProp<S> {
   state: S;
   dispatch: NavigationDispatch;
-  goBack: (routeKey?: (string | null)) => boolean;
-  navigate: (
-    routeName: string,
+  goBack: (routeKey?: string | null) => boolean;
+  navigate(options: {
+    routeName: string;
+    params?: NavigationParams;
+    action?: NavigationAction;
+    key?: string;
+  }): boolean;
+  navigate(
+    routeNameOrOptions: string,
     params?: NavigationParams,
-    action?: NavigationAction
-  ) => boolean;
+    action?: NavigationAction,
+  ): boolean;
   setParams: (newParams: NavigationParams) => boolean;
   addListener: (
     eventName: string,
diff --git a/types/react-navigation/react-navigation-tests.tsx b/types/react-navigation/react-navigation-tests.tsx
index 0f68b653b1..2fcec1c53c 100644
--- a/types/react-navigation/react-navigation-tests.tsx
+++ b/types/react-navigation/react-navigation-tests.tsx
@@ -60,6 +60,7 @@ class StartScreen extends React.Component<NavigationScreenProps> {
         return (
             <View>
                 <TouchableOpacity onPress={this.navigateToNextScreen} />
+                <TouchableOpacity onPress={this.navigateDifferentlyToNextScreen} />
             </View>
         );
     }
@@ -70,6 +71,13 @@ class StartScreen extends React.Component<NavigationScreenProps> {
         };
         this.props.navigation.navigate(ROUTE_NAME_NEXT_SCREEN, params);
     }
+    private readonly navigateDifferentlyToNextScreen = (): void => {
+        const params = {
+            id: this.props.navigation.state.params && this.props.navigation.state.params.id,
+            name: this.props.navigation.state.params && this.props.navigation.state.params.s,
+        };
+        this.props.navigation.navigate({routeName: ROUTE_NAME_NEXT_SCREEN, params});
+    }
 }
 
 const ROUTE_NAME_NEXT_SCREEN = "NextScreen";

From 994f2993af4742a8e67ff15f08236b7c1f0ad7cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81rni=20Benedikt=20=C3=81rnason?=
 <arnibarnason@gmail.com>
Date: Fri, 9 Mar 2018 17:26:15 +0100
Subject: [PATCH 0391/1382] Revert "Overloaded navigate method to handle new
 navigation options parameters"

This reverts commit 94a484cff48cc620df26c5625bf6545361160fce.
---
 types/react-navigation/index.d.ts                | 16 +++++-----------
 .../react-navigation/react-navigation-tests.tsx  |  8 --------
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index 50f384c34e..2fdde0448e 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -420,18 +420,12 @@ export interface NavigationEventSubscription {
 export interface NavigationScreenProp<S> {
   state: S;
   dispatch: NavigationDispatch;
-  goBack: (routeKey?: string | null) => boolean;
-  navigate(options: {
-    routeName: string;
-    params?: NavigationParams;
-    action?: NavigationAction;
-    key?: string;
-  }): boolean;
-  navigate(
-    routeNameOrOptions: string,
+  goBack: (routeKey?: (string | null)) => boolean;
+  navigate: (
+    routeName: string,
     params?: NavigationParams,
-    action?: NavigationAction,
-  ): boolean;
+    action?: NavigationAction
+  ) => boolean;
   setParams: (newParams: NavigationParams) => boolean;
   addListener: (
     eventName: string,
diff --git a/types/react-navigation/react-navigation-tests.tsx b/types/react-navigation/react-navigation-tests.tsx
index 2fcec1c53c..0f68b653b1 100644
--- a/types/react-navigation/react-navigation-tests.tsx
+++ b/types/react-navigation/react-navigation-tests.tsx
@@ -60,7 +60,6 @@ class StartScreen extends React.Component<NavigationScreenProps> {
         return (
             <View>
                 <TouchableOpacity onPress={this.navigateToNextScreen} />
-                <TouchableOpacity onPress={this.navigateDifferentlyToNextScreen} />
             </View>
         );
     }
@@ -71,13 +70,6 @@ class StartScreen extends React.Component<NavigationScreenProps> {
         };
         this.props.navigation.navigate(ROUTE_NAME_NEXT_SCREEN, params);
     }
-    private readonly navigateDifferentlyToNextScreen = (): void => {
-        const params = {
-            id: this.props.navigation.state.params && this.props.navigation.state.params.id,
-            name: this.props.navigation.state.params && this.props.navigation.state.params.s,
-        };
-        this.props.navigation.navigate({routeName: ROUTE_NAME_NEXT_SCREEN, params});
-    }
 }
 
 const ROUTE_NAME_NEXT_SCREEN = "NextScreen";

From 15545cb2981172ae287168ea1b6ab26a9902dbe7 Mon Sep 17 00:00:00 2001
From: Lance Ivy <lance@cainlevy.net>
Date: Fri, 9 Mar 2018 08:52:04 -0800
Subject: [PATCH 0392/1382] add PusherStatic members

---
 types/pusher-js/index.d.ts         |  2 ++
 types/pusher-js/pusher-js-tests.ts | 14 ++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/types/pusher-js/index.d.ts b/types/pusher-js/index.d.ts
index a81170d09c..f73a84ee52 100644
--- a/types/pusher-js/index.d.ts
+++ b/types/pusher-js/index.d.ts
@@ -6,6 +6,8 @@
 
 declare namespace pusher {
     interface PusherStatic {
+        logToConsole: boolean;
+        log: (msg: string) => void;
         new (apiKey: string, config?: Config): Pusher;
     }
 
diff --git a/types/pusher-js/pusher-js-tests.ts b/types/pusher-js/pusher-js-tests.ts
index dc6a9eedd7..7381c48e73 100644
--- a/types/pusher-js/pusher-js-tests.ts
+++ b/types/pusher-js/pusher-js-tests.ts
@@ -4,6 +4,20 @@ import { PresenceChannel } from "pusher-js";
 var APP_KEY: string;
 var pusher: Pusher.Pusher;
 
+/*
+ * samples from https://github.com/pusher/pusher-js
+ */
+
+//
+// Global Configuration
+//
+
+Pusher.logToConsole = true;
+
+Pusher.log = (msg) => {
+    console.log(msg);
+};
+
 //
 // Configuration
 //

From 09d92860f8d6c27f4c18d6135514bb834b8bbd28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81rni=20Benedikt=20=C3=81rnason?=
 <arnibarnason@gmail.com>
Date: Fri, 9 Mar 2018 17:20:33 +0100
Subject: [PATCH 0393/1382] Overloaded navigate method to handle new navigation
 options parameters

---
 types/react-navigation/index.d.ts                | 16 +++++++++++-----
 .../react-navigation/react-navigation-tests.tsx  |  8 ++++++++
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index c4e396783f..52b54819f6 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -399,12 +399,18 @@ export interface NavigationEventSubscription {
 export interface NavigationScreenProp<S> {
   state: S;
   dispatch: NavigationDispatch;
-  goBack: (routeKey?: (string | null)) => boolean;
-  navigate: (
-    routeName: string,
+  goBack: (routeKey?: string | null) => boolean;
+  navigate(options: {
+    routeName: string;
+    params?: NavigationParams;
+    action?: NavigationAction;
+    key?: string;
+  }): boolean;
+  navigate(
+    routeNameOrOptions: string,
     params?: NavigationParams,
-    action?: NavigationAction
-  ) => boolean;
+    action?: NavigationAction,
+  ): boolean;
   setParams: (newParams: NavigationParams) => boolean;
   addListener: (
     eventName: string,
diff --git a/types/react-navigation/react-navigation-tests.tsx b/types/react-navigation/react-navigation-tests.tsx
index 017a9b9153..dabf0a95f5 100644
--- a/types/react-navigation/react-navigation-tests.tsx
+++ b/types/react-navigation/react-navigation-tests.tsx
@@ -58,6 +58,7 @@ class StartScreen extends React.Component<NavigationScreenProps> {
         return (
             <View>
                 <TouchableOpacity onPress={this.navigateToNextScreen} />
+                <TouchableOpacity onPress={this.navigateDifferentlyToNextScreen} />
             </View>
         );
     }
@@ -68,6 +69,13 @@ class StartScreen extends React.Component<NavigationScreenProps> {
         };
         this.props.navigation.navigate(ROUTE_NAME_NEXT_SCREEN, params);
     }
+    private readonly navigateDifferentlyToNextScreen = (): void => {
+        const params = {
+            id: this.props.navigation.state.params && this.props.navigation.state.params.id,
+            name: this.props.navigation.state.params && this.props.navigation.state.params.s,
+        };
+        this.props.navigation.navigate({routeName: ROUTE_NAME_NEXT_SCREEN, params});
+    }
 }
 
 const ROUTE_NAME_NEXT_SCREEN = "NextScreen";

From 2a8359f22bb00b35ac41b8fd7d2ecc7e89f7a3b7 Mon Sep 17 00:00:00 2001
From: dominuskernel <promodominus@gmail.com>
Date: Fri, 9 Mar 2018 18:10:38 +0100
Subject: [PATCH 0394/1382] change cors types according with the last version

---
 types/roads/index.d.ts     | 22 +++++++++++++++++++---
 types/roads/roads-tests.ts |  9 ++++++++-
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/types/roads/index.d.ts b/types/roads/index.d.ts
index 55028403b6..727bc1c819 100644
--- a/types/roads/index.d.ts
+++ b/types/roads/index.d.ts
@@ -11,6 +11,23 @@
 export type Keys = string;
 export type Option = {[k in Keys]: any};
 
+/**
+ * @param validOrigins An array of origin urls that can send requests to this API
+ * @param supportsCredentials A boolean, true if you want this endpoint to receive cookies
+ * @param responseHeaders An array of valid HTTP response headers
+ * @param requestHeaders An array of valid HTTP request headers
+ * @param validMethods An array of valid HTTP methods
+ * @param cacheMaxAge The maximum age to cache the cors information
+ */
+export interface Cors {
+    validOrigins: string[];
+    supportsCredentials?: boolean;
+    responseHeaders?: string[];
+    requestHeaders?: string[];
+    validMethods?: string[];
+    cacheMaxAge?: number;
+}
+
 /**
  * @param method The HTTP method that was provided to the request
  * @param url The URL that was provided to the request
@@ -126,10 +143,9 @@ export namespace middleware {
 
     /**
      * Middleware to Apply proper cors headers
-     * @param allow_origins Either * to allow all origins, or an explicit list of valid origins
-     * @param allow_headers A white list of headers that the client is allowed to send in their requests
+     * @param options Cors options
      */
-    function cors(allow_origins: string | string[], allow_headers?: string[]): any;
+    function cors(options: Cors): any;
 
     /**
      * Translate the request body into a usable value
diff --git a/types/roads/roads-tests.ts b/types/roads/roads-tests.ts
index 6914c3d218..9bc7f4e818 100644
--- a/types/roads/roads-tests.ts
+++ b/types/roads/roads-tests.ts
@@ -3,7 +3,14 @@ import { build, Road, middleware, integrations, Response, HttpError, PJAX } from
 const road = new Road();
 const router = new middleware.SimpleRouter(road);
 
-road.use(middleware.cors("*"));
+road.use(middleware.cors({
+    requestHeaders: ["content-type"],
+    responseHeaders: ["content-type"],
+    supportsCredentials: true,
+    validOrigins: ["http://localhost:8080"],
+    validMethods: ["GET", "POST"],
+    cacheMaxAge: 4
+}));
 
 road.use(middleware.killSlash);
 

From 832ce4c13fc03e318f71725584d023b63b294958 Mon Sep 17 00:00:00 2001
From: Ricky Brundritt <ricky_brundritt@hotmail.com>
Date: Fri, 9 Mar 2018 09:43:12 -0800
Subject: [PATCH 0395/1382] Remove Bing Maps definitions

These definitions are several releases behind the official deifintions
published by the Bing Maps team. These were planned to be reomoved last
summer but were due to a request from the Bing Maps team. Removing as
these are no longer maintained.
---
 types/bingmaps/Autosuggest.d.ts        |  112 -
 types/bingmaps/Clustering.d.ts         |  142 --
 types/bingmaps/Contour.d.ts            |   87 -
 types/bingmaps/DataBinning.d.ts        |  148 --
 types/bingmaps/Directions.d.ts         |  611 -----
 types/bingmaps/DrawingTools.d.ts       |  234 --
 types/bingmaps/GeoJson.d.ts            |   68 -
 types/bingmaps/HeatMapLayer.d.ts       |  106 -
 types/bingmaps/Search.d.ts             |  228 --
 types/bingmaps/SpatialDataService.d.ts |  440 ----
 types/bingmaps/SpatialMath.d.ts        |  530 -----
 types/bingmaps/Traffic.d.ts            |   68 -
 types/bingmaps/WellKnownText.d.ts      |   22 -
 types/bingmaps/bingmaps-tests.ts       |   83 -
 types/bingmaps/index.d.ts              | 2850 ------------------------
 types/bingmaps/tsconfig.json           |   37 -
 types/bingmaps/tslint.json             |   79 -
 17 files changed, 5845 deletions(-)
 delete mode 100644 types/bingmaps/Autosuggest.d.ts
 delete mode 100644 types/bingmaps/Clustering.d.ts
 delete mode 100644 types/bingmaps/Contour.d.ts
 delete mode 100644 types/bingmaps/DataBinning.d.ts
 delete mode 100644 types/bingmaps/Directions.d.ts
 delete mode 100644 types/bingmaps/DrawingTools.d.ts
 delete mode 100644 types/bingmaps/GeoJson.d.ts
 delete mode 100644 types/bingmaps/HeatMapLayer.d.ts
 delete mode 100644 types/bingmaps/Search.d.ts
 delete mode 100644 types/bingmaps/SpatialDataService.d.ts
 delete mode 100644 types/bingmaps/SpatialMath.d.ts
 delete mode 100644 types/bingmaps/Traffic.d.ts
 delete mode 100644 types/bingmaps/WellKnownText.d.ts
 delete mode 100644 types/bingmaps/bingmaps-tests.ts
 delete mode 100644 types/bingmaps/index.d.ts
 delete mode 100644 types/bingmaps/tsconfig.json
 delete mode 100644 types/bingmaps/tslint.json

diff --git a/types/bingmaps/Autosuggest.d.ts b/types/bingmaps/Autosuggest.d.ts
deleted file mode 100644
index 7d83ca6e4b..0000000000
--- a/types/bingmaps/Autosuggest.d.ts
+++ /dev/null
@@ -1,112 +0,0 @@
-declare module Microsoft.Maps {
-    /** Options used to customize the autosuggest functionality. */
-    export interface IAutosuggestOptions {
-        /** Specifies if street address suggestions should be returned. Default: true */
-        addressSuggestions?: boolean;
-
-        /**
-        * Specifies if the user’s location should be auto detected using their IP address, if no location information is provided
-        * in the userLocation property. Default: true
-        */
-        autoDetectLocation?: boolean;
-
-        /**
-        * A bounding box that is used to help influence the results such that locations that are in or near this bounding box
-        * are given more weight than they would normally.
-        */
-        bounds?: LocationRect;
-
-        /**
-        * A reference to a map instance. If the useMapView property is set to true, the bounding box of the map view will be used
-        * to influence the weight of suggestions.
-        */
-        map?: Map;
-
-        /** The maximum number of results to return. Can be any value between 1 and 10. Default: 5 */
-        maxResults?: number;
-
-        /** Specifies if place suggestions (city, landmark, etc.) should be returned. Default: true */
-        placeSuggestions?: boolean;
-
-        /**
-        * Indicates if the maps bounding box should be used to influence the suggested results. Ignored if the bounds property is
-        * set. Default: true
-        */
-        useMapView?: boolean;
-
-        /** A coordinate indicating where the user is located. This will influence the results to be more relevant to the user. */
-        userLocation?: Location;
-    }
-
-    /** Represents the suggestion result from the Autosuggest manager. */
-    export interface ISuggestionResult {
-        /** A structured address object for the result.  */
-        address: IAddress;
-
-        /** A LocationRect that can be used to set the map view over the result. */
-        bestView: LocationRect;
-
-        /** Unique entity id to be used for searching the entity. */
-        entityId: string;
-
-        /** The type of the result; Address, Place */
-        entityType: string;
-
-        /** The sub type of result; Address, RoadBlock, PopulatedPlace, CountryRegion, etc. */
-        entitySubType: string;
-
-        /** A nicely formatted suggestion string for the result based on market. */
-        formattedSuggestion: string;
-
-        /**
-        * The coordinate of the result. This value is only returned for place (city, landmarks) results and not for addresses.
-        * Street addresses will need to be geocoded to get their location.
-        */
-        location: Location;
-
-        /** A secondary title that provides additional context to the title value of the suggestion. **/
-        subtitle: string;
-
-        /** The display title for the result (i.e. “Redmond”). */
-        title: string;
-    }
-
-    /**
-     * The AutosuggestManager is the primary class in the Autosuggest module that powers the autosuggest functionality.
-     * @requires The Microsoft.Maps.Autosuggest module.
-     */
-    export class AutosuggestManager {
-       /**
-       * @constructor
-       * @requires The Microsoft.Maps.Autosuggest module.
-       * @param options The options to use with the autosuggest manager.
-       */
-        constructor(options?: IAutosuggestOptions);
-
-        /**
-        * Attaches the Autosuggest functionality to an input box.
-        * @param suggestionBoxId The HTML element identifier of the input box.
-        * @param suggestionContainerId The Id of container where suggestions will be displayed.
-        * @param selectedSuggestionCallback A reference to a callback function that will be called when a user selects a suggestion from the Autosuggest UI.
-        */
-        public attachAutosuggest(suggestionBoxId: string, suggestionContainerId: string, selectedSuggestionCallback: (result: ISuggestionResult) => void) : void;
-
-        /** Detaches the autosuggest functionality from the input box, freeing any resources it has or events it has tied to. */
-        public detachAutosuggest(): void;
-
-        /** Disposes the Autosuggest object, freeing any resources it has or events it has tied to. */
-        public dispose(): void;
-
-        /**
-        * Gets the options currently used by the autosuggest manager.
-        * @returns The options currently used by the autosuggest manager.
-        */
-        public getOptions(): IAutosuggestOptions;
-
-        /**
-        * Sets the options currently used by the autosuggest manager.
-        * @param options The options to use with the autosuggest manager.
-        */
-        public setOptions(options?: IAutosuggestOptions): void;
-    }
-}
\ No newline at end of file
diff --git a/types/bingmaps/Clustering.d.ts b/types/bingmaps/Clustering.d.ts
deleted file mode 100644
index 17c9425933..0000000000
--- a/types/bingmaps/Clustering.d.ts
+++ /dev/null
@@ -1,142 +0,0 @@
-declare module Microsoft.Maps {
-    /** The options used to customize how the ClusterLayer functions. */
-    export interface IClusterLayerOptions {
-        /**
-        * A callback function that is fired after the clustering for a map view has completed. This is useful if you want to generate a list of locations based on what is in the current view.
-        */
-        callback?: () => void;
-
-        /**
-        * A callback function that allows you to process a clustered pushpin before it is added to a layer. This is useful if you want to add events or set style options on the clustered pushpin.
-        */
-        clusteredPinCallback?: (pin: ClusterPushpin) => void;
-
-        /**
-        * Indicates if the layer should cluster the locations or not. Default: true
-        */
-        clusteringEnabled?: boolean;
-
-        /**
-        * Defines how clusters are positioned on the map. Default: MeanAverage
-        */
-        clusterPlacementType?: ClusterPlacementType;
-
-        /**
-        * The width and height of the gird cells used for clustering in pixels. Default: 45
-        */
-        gridSize?: number;
-
-        /**
-        * Offsets the placement of clustered pushpins by a set number of pixels. This option is only available when the placement type is set to GridCenter.
-        * This is useful if you have multiple cluster layers on the map and you want to offset the clustered pushpins between the layers so that they are visible,
-        * otherwise the clusters from the different layers would overlap completely.
-        */
-        layerOffset?: Point;
-
-        /**
-        * A boolean indicating if the layer is visible or not.
-        */
-        visible?: boolean;
-
-        /**
-        * The z-index of the layer.
-        */
-        zIndex?: number;
-    }
-
-    /**
-    * Used to specify how a clustered pushpin should be positioned relative to the pushpins it contains.
-    * @requires The Microsoft.Maps.Clustering module.
-    */
-    export enum ClusterPlacementType {
-        /**
-        * Mean Average placement calculates the average position of a group of coordinates. This method creates a more realistic representation of the data,
-        * however requires more processing power and increases the chances of pushpins overlapping.
-        */
-        MeanAverage,
-
-        /**
-        * This method is the simplest way to represent a cluster. It places the cluster at the first location in the cluster. This method may not accurately
-        * represent the data but requires little processing power.
-        */
-        FirstLocation
-    }
-
-    /**
-     * This class extends the Pushpin class and has all the same methods and properties plus the following properties.
-     * @requires The Microsoft.Maps.Clustering module.
-     */
-    export class ClusterPushpin extends Pushpin {
-        /** An array of all the pushpins that are in the cluster. */
-        containedPushpins: Pushpin[];
-
-        /**
-        * The grid cell key that can be used retrieve the clustered pushpin(s) from the clustering layer. This is useful when creating a clickable list that
-        * link items in the list to clusters or pushpins on the map. Your list just needs to store the gridKey value.
-        */
-        gridKey: number;
-    }
-
-    /**
-     * This class allows you to easily add in client side clustering to your application. Client Side Clustering is a method where pushpins that are close
-     * together are grouped and represented as a single pushpin, often using a different icon to indicate the cluster. This is a great way to improve both
-     * the user experience and performance of the map.
-     * @requires The Microsoft.Maps.Clustering module.
-     */
-    export class ClusterLayer implements IDataLayer {
-        /**
-        * @constructor
-        * @requires The Microsoft.Maps.Clustering module.
-        * @param pushpins An array of pushpins to cluster in the layer.
-        * @param options The options used to customize how the ClusterLayer functions.
-        */
-        constructor(pushpins: Pushpin[], options?: IClusterLayerOptions);
-
-        /** Clears all the data in the cluster layer. */
-        public clear(): void;
-
-        /**
-        * Gets all the pushpins that are in the current map view. If clustering is disabled, all pushpins in the clustering layer are returned.
-        * @returns All the pushpins that are in the current map view. If clustering is disabled, all pushpins in the clustering layer are returned.
-        */
-        public getDisplayedPushpins(): Pushpin[];
-
-        /**
-        * Gets the current options used by the cluster layer.
-        * @returns The current options used by the cluster layer.
-        */
-        public getOptions(): IClusterLayerOptions;
-
-        /**
-        * Gets all pushpins that are in the layers.
-        * @returns An array of all the pushpins that are in the layers.
-        */
-        public getPushpins(): Pushpin[];
-
-        /**
-        * Gets the original pushpins that are in the specified grid cell.
-        * @param The gridKey index to retrieve the pushpins for.
-        * @returns The original pushpins that are in the specified grid cell.
-        */
-        public getPushpinsByGridKey(gridKey: number): Pushpin[];
-
-        /**
-        * Gets the pushpin in the specified cluster grid cell which can be either a ClusterPushpin if there are multiple pushpins in a cell or a single Pushpin.
-        * @param The gridKey index to retrieve the pushpins for.
-        * @returns The pushpin in the specified cluster grid cell which can be either a ClusterPushpin if there are multiple pushpins in a cell or a single Pushpin.
-        */
-        public getClusterPushpinByGridKey(gridKey: number): ClusterPushpin | Pushpin;
-
-        /**
-        * Sets the clustering options to use in the layer.
-        * @params options The clustering options to use in the layer.
-        */
-        public setOptions(options: IClusterLayerOptions): void;
-
-        /**
-        * Sets the array of pushpins that are used in the clustering layer.
-        * @param pushpins An array of pushpins that are to be used by the clustering layer.
-        */
-        public setPushpins(pushpins: Pushpin[]): void;
-    }
-}
\ No newline at end of file
diff --git a/types/bingmaps/Contour.d.ts b/types/bingmaps/Contour.d.ts
deleted file mode 100644
index cd2d9767c7..0000000000
--- a/types/bingmaps/Contour.d.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-declare module Microsoft.Maps {
-
-    /**
-     * The contour layer options
-     */
-    interface IContourLayerOptions {
-        /** The z-index of this layer */
-        zIndex?: number;
-
-        /** Whether the layer is visible */
-        visible?: boolean;
-
-        /** A callback function which defines the color of the contour line fill. */
-        colorCallback?: (contourValue: number | string) => string | Color;
-
-        /** The polygon options that apply to all contour lines of this layer */
-        polygonOptions?: IPolygonOptions;
-    }
-
-    /**
-     * The contour line of a contour layer
-     */
-    export class ContourLine extends Polygon {
-        /** The contour lines that are directly nested inside this contour line */
-        public innerContourLines: ContourLine[];
-
-        /** The outer/parent contour line of this contour */
-        public outerContourLine: ContourLine;
-
-        /** The data value associated with this contour line */
-        public contourValue: number | string;
-
-        /**
-         * @constructor
-         * @param boundary The boundary of this contour line
-         * @param contourValue The value associated with this contour line
-         */
-        constructor(boundary: Location[], contourValue?: number | string);
-    }
-
-    /**
-     * The contour layer class.
-     */
-    export class ContourLayer extends Layer {
-        /**
-         * @constructor
-         * @param contourLines The contour lines that compose this layer.
-         * @param options The contour layer options.
-         */
-        constructor(contourLines: ContourLine[], options?: IContourLayerOptions);
-
-        /**
-         * Clears all data on the contour layer.
-         */
-        public clear(): void;
-
-        /**
-         * Gets the contour lines of this layer.
-         * @returns The contour lines of this layer.
-         */
-        public getContourLines(): ContourLine[];
-
-        /**
-         * Gets the polygons that were generated from the contour lines in this layer.
-         * @returns The polygons that were generated from the contour lines in this layer.
-         */
-        public getContourPolygons(): Polygon[];
-
-        /**
-         * Retrieves the options of this contour layer.
-         * @returns The options of this contour layer.
-         */
-        public getOptions(): IContourLayerOptions;
-
-        /**
-         * Sets the contour lines used to calculate the polygon areas of this layer.
-         * @param contourLines The contour lines used to calculate the polygon areas of this layer.
-         */
-        public setContourLines(contourLines: ContourLine[]): void;
-
-        /**
-         * Sets the options of the contour layer.
-         * @param options The new options to update the layer.
-         */
-        public setOptions(options: IContourLayerOptions): void;
-    }
-}
\ No newline at end of file
diff --git a/types/bingmaps/DataBinning.d.ts b/types/bingmaps/DataBinning.d.ts
deleted file mode 100644
index e33b2d5113..0000000000
--- a/types/bingmaps/DataBinning.d.ts
+++ /dev/null
@@ -1,148 +0,0 @@
-/// <reference path="SpatialMath.d.ts"/>
-
-declare module Microsoft.Maps {
-
-    /**
-     * Specifies the shape of data bin rendered in the layer.
-     */
-    export enum DataBinType {
-        /* Renders data bins as circles in a square grid. */
-        circle,
-
-        /* Renders data bins as hexagons with a flat top edge. */
-        hexagon,
-
-        /* Renders data bins as circles in a hexagonal grid. */
-        hexCircle,
-
-        /* Renders data bins as hexagons with a pointy top corner. */
-        pointyHexagon,
-
-        /* Renders data bins as a square grid. */
-        square
-    }
-
-    /**
-     * A set options the define how a data binning layer is rendered.
-     */
-    export interface IDataBinningOptions {
-        /* The name of a property in the Pushpin.metadata object on which to perform calculations (average, count, sum) against the pushpins in each data bin. */
-        aggregationProperty?: string;
-
-        /*
-         * A callback function which defines the color a data bin polygon should be. This callback recieves data bin information
-         * along with the min and max calculated metrics for the data set. If set, this callback function must return a color value.
-         */
-        colorCallback?: (binInfo: IDataBinInfo, min: IDataBinMetrics, max: IDataBinMetrics) => string | Color;
-
-        /* The shape of the data bin to generate. Default: hexagon */
-        dataBinType?: DataBinType;
-
-        /* The distance units of the radius option. Default: meters */
-        distanceUnits?: SpatialMath.DistanceUnits;
-
-        /* The default options used for rendering the data bin polygons. */
-        polygonOptions?: IPolygonOptions;
-
-        /*
-         * A spatial distance which will be converted into a pixel distance at the equater and used to generate symetrically sized data bins
-         * that have the apprimate spatial distance radius. Default: 1000
-         */
-        radius?: number;
-
-        /*
-         * A callback function which defines how much to scale a data bins size. This callback recieves data bin information
-         * along with the min and max calculated metrics for the data set. If set, this callback function must return a number between 0 and 1.
-         */
-        scaleCallback?: (binInfo: IDataBinInfo, min: IDataBinMetrics, max: IDataBinMetrics) => number;
-    }
-
-    /**
-    * A set of values calculated from the pushpins in a data bin.
-    */
-    export interface IDataBinMetrics {
-
-        /* The average value of the aggregation property of the pushpins in a data bin. */
-        average?: number;
-
-        /* The number of pushpins in a data bin. */
-        count?: number;
-
-        /* The number of pushpins in the data bin who's aggregation property has a value. */
-        countNotBlank?: number;
-
-        /* The number of pushpins in the data bin who's aggregation property is a valid number. */
-        countNumbers?: number;
-
-        /* The sum of the aggregation property of the pushpins in a data bin.  */
-        sum?: number;
-    }
-
-    /**
-    * The result of a calculated data bin.
-    */
-    export interface IDataBinInfo {
-        /* An array of all the pushpins that are in the data bin. */
-        containedPushpins: Microsoft.Maps.Pushpin[];
-
-        /* A set of calculated metric values determined using the aggregationProperty value of all the pushpins contained in the data bin. */
-        metrics: IDataBinMetrics;
-    }
-
-    /**
-     *  A polygon which represents a data bin on the map and contains the data bin information.
-     */
-
-    export class DataBinPolygon extends Polygon {
-        /* Information about the data bin; the contained pushpins and calculated metrics. */
-        public dataBinInfo: IDataBinInfo;
-    }
-
-    /**
-     * This class provides a data binning visualization for the map. It takes in an array of pushpins, groups them into
-     * symmetrical shapes that fit together in a grid such as hexagons. Aggregation of data values are done and can be
-     * used to customize how the data bins are rendered on the map (i.e. scale / color) .
-     */
-    export class DataBinningLayer extends Layer {
-        /**
-         * Initializes the data binning layer.
-         * @param pushpins The array of pushpins that are used to generate the data bins.
-         * @param options The options used for calculating and rendering the data bins.
-         */
-        constructor(pushpins?: Pushpin[], options?: IDataBinningOptions);
-
-        /**
-         * Gets the options used for calculating and rendering the data bins.
-         * @returns The options used for calculating and rendering the data bins.
-         */
-        public getOptions(): IDataBinningOptions;
-
-        /**
-         * Gets all pushpins that are in the layers.
-         * @returns All pushpins that are in the layers.
-         */
-        public getPushpins(): Pushpin[];
-
-        /**
-         * Sets the array of pushpins that are used to generate the data bins.
-         * @param pushpins The array of pushpins that are used to generate the data bins.
-         */
-        public setPushpins(pushpins: Pushpin[]): void;
-
-        /**
-         * Clears all the data in the data binning layer.
-         */
-        public clear(): void;
-
-        /**
-         * Cleans up any resources this object is consuming.
-         */
-        public dispose(): void;
-
-        /**
-         * Sets the options used for calculating and rendering the data bins.
-         * @param options The options used for calculating and rendering the data bins.
-         */
-        public setOptions(options: IDataBinningOptions): void;
-    }
-}
\ No newline at end of file
diff --git a/types/bingmaps/Directions.d.ts b/types/bingmaps/Directions.d.ts
deleted file mode 100644
index 3663fc8c21..0000000000
--- a/types/bingmaps/Directions.d.ts
+++ /dev/null
@@ -1,611 +0,0 @@
-declare module Microsoft.Maps.Directions {
-    /////////////////////////////////////
-    /// Enumerations
-    ////////////////////////////////////
-
-    /** Distance units for calculating the directions in. */
-    export enum DistanceUnit {
-
-        /** A distance in Kilometers. */
-        km,
-
-        /** A distance in Miles. */
-        miles
-    }
-
-    /** Defines the type of route to calculate. */
-    export enum RouteMode {
-        /** Driving directions are calculated. */
-        driving,
-
-        /** Transit directions are calculated. */
-        transit,
-
-        /** Walking directions are calculated. */
-        walking
-    }
-
-    /** Defines features to avoid when calculating the route. */
-    export enum RouteAvoidance {
-        /** Calculate the best route using any travel option available. */
-        none = 0,
-
-        /** Reduce the use of limited access highways when calculating the route. */
-        minimizeHighways = 1,
-
-        /** Reduce the use of roads with tolls when calculating the route. */
-        minimizeToll = 2,
-
-        /** Avoid using limited access highways when calculating the route. */
-        avoidHighways = 4,
-
-        /** Avoid using roads with tolls when calculating the route. */
-        avoidToll = 8,
-
-        /** Avoid using express trains when calculating the route. This option only affects routes with a transitRouteMode that have the culture set to ja-jp. */
-        avoidExpressTrain = 16,
-
-        /** Avoid using airlines when calculating the route. This option only affects routes with a transitRouteMode that have the culture set to ja-jp. */
-        avoidAirline = 32,
-
-        /** Avoid using bullet trains when calculating the route. This option only affects routes with a transitRouteMode that have the culture set to ja-jp. */
-        avoidBulletTrain = 64
-    }
-
-    /** Response codes for a route calculation request. */
-    export enum RouteResponseCode {
-        /** The route was successfully calculated. */
-        success = 0,
-
-        /** An unknown error has occurred. */
-        unknownError = 1,
-
-        /** A nearby road cannot be found for one or more of the route waypoints. */
-        cannotFindNearbyRoad = 2,
-
-        /**
-        * The distance between two route waypoints, or the total length of the route exceeds the limit of the route mode.
-        * Modify the waypoint locations so that they are closer together.
-        */
-        tooFar = 3,
-
-        /**
-        * A route cannot be calculated for the specified waypoints. For example, this code is returned when a route between
-        * “Seattle, WA” and “Honolulu, HI” is requested.
-        */
-        noSolution = 4,
-
-        /** There is no route data for the specified waypoints. */
-        dataSourceNotFound = 5,
-
-        /** There are no transit options available for the specified time. */
-        noAvailableTransitTrip = 7,
-
-        /** The transit stops are so close that walking is always a better option. */
-        transitStopsTooClose = 8,
-
-        /** The transit stops are so close that walking is a better option. */
-        walkingBestAlternative = 9,
-
-        /**
-        * There is no transit data available for the route or for one or more of the specified waypoints,
-        * or the waypoints are in different transit areas that do not overlap.
-        */
-        outOfTransitBounds = 10,
-
-        /** The directions calculation request has timed out. */
-        timeOut = 11,
-
-        /**
-        * One or more waypoints need to be disambiguated. This error does not occur if the
-        * autoDisplayDisambiguation directions render option is set to true.
-        */
-        waypointDisambiguation = 12,
-
-        /** One or more waypoints do not have an address or location specified. */
-        hasEmptyWaypoint = 13,
-
-        /** The maximum number of waypoints, which is 25, has been exceeded. */
-        exceedMaxWaypointLimit = 14,
-
-        /** At least two waypoints are required to calculate a route. */
-        atleastTwoWaypointRequired = 15,
-
-        /** The first or last waypoint is a via point, which is not allowed. */
-        firstOrLastStoppointIsVia = 16,
-
-        /** The search service failed to return results. */
-        searchServiceFailed = 17,
-
-        /** The credentials passed to the Directions module are invalid. */
-        invalidCredentials = 18
-    }
-
-    /** Defines optimization options for calculating directions. */
-    export enum RouteOptimization {
-        /** Calculate a route the shortest time. */
-        shortestTime = 0,
-
-        /** Calculate a route with the shortest distance. */
-        shortestDistance = 1,
-
-        /** The route is calculated to minimize the time and uses current traffic information. */
-        timeWithTraffic = 2,
-
-        /** The route is calculated to minimize the time and avoid road closures. Traffic information is not used in the calculation. */
-        timeAvoidClosure = 3,
-
-        /** Minimize the cost when calculating directions. This option only affects routes with a transitRouteMode that have the culture set to ja-jp.*/
-        minimizeMoney = 4,
-
-        /** Minimize transit transfers when calculating directions. This option only affects routes with a transitRouteMode that have the culture set to ja-jp.*/
-        minimizeTransfers = 5,
-
-        /** Minimize the amount of walking when calculating directions. This option only affects routes with a transitRouteMode that have the culture set to ja-jp.*/
-        minimizeWalking = 6
-    }
-
-    /** An enumeration that specifies the releance of a dateTime when calculating a route. */
-    export enum TimeType {
-        /** The dateTime parameter contains the desired arrival time for a transit request. */
-        arrival,
-
-        /** The dateTime parameter contains the desired departure time for a transit request. */
-        departure,
-
-        /** The dateTime parameter should be ignored and the first available transit taken. */
-        firstAvailable,
-
-        /** The dateTime parameter contains the latest departure time available for a transit request.  */
-        lastAvailable
-    }
-
-    /////////////////////////////////////
-    /// Interfaces
-    ////////////////////////////////////
-
-    /** Contains the arguments for directions events. */
-    export interface IDirectionsEventArgs {
-        /** The calculated route (or routes, if the route mode is transit). */
-        route: IRoute[];
-
-        /** The route summary (or summaries) of the route(s) defined in the route property. */
-        routeSummary: IRouteSummary[];
-    }
-
-    /** Contains arguments for directions error events. */
-    export interface IDirectionsErrorEventArgs {
-        /** The code which identifies the error that occurred. */
-        responseCode: RouteResponseCode;
-
-        /** The error message. */
-        message: string;
-    }
-
-    /** Represents one direction in a set of route directions. */
-    export interface IDirectionsStep {
-        /** The child direction items for this directions step. */
-        childItineraryItems: IDirectionsStep[];
-
-        /** The location of the start of the direction. */
-        coordinate: Location;
-
-        /** The total distance of the step in the unit specified in the distanceUnit property of the DirectionsRequestOptions. */
-        distance: string;
-
-        /** The total time, in seconds, of the direction step. */
-        durationInSeconds: number;
-
-        /** The HTML formatted route instruction associated with the step. */
-        formattedText: string;
-
-        /** A boolean indicating whether the maneuver image is a road shield image. */
-        isImageRoadShield: boolean;
-
-        /** The name of the maneuver image. */
-        maneuverImageName: string;
-
-        /** An array of strings, where each string is a hint to help determine when to move to the next direction step. Not all direction steps have hints. */
-        postIntersectionHints: string[];
-
-        /** An array of strings, where each string is a hint to help determine when you have arrived at this direction step. Not all direction steps have hints. */
-        preIntersectionHints: string[];
-
-        /** The name of the transit stop where this step originates. */
-        startStopName: string;
-
-        /** The transit line associated with this step. */
-        transitLine: ITransitLine;
-
-        /** The URL of the image to use for transit direction steps. */
-        transitStepIcon: string;
-
-        /** The ID of the transit stop. */
-        transitStopId: string;
-
-        /** The name of the transit line end. */
-        transitTerminus: string;
-    }
-
-    /** Represents a route. */
-    export interface IRoute {
-        /** The legs of the route. Each route leg represents the route between two waypoints. */
-        routeLegs: IRouteLeg[];
-
-        /** An array of locations that makes up the path of the route. */
-        routePath: Location[];
-    }
-
-    /** Represents a leg of a route. A route leg is the part of the route between two stop waypoints. */
-    export interface IRouteLeg {
-        /** The end time of the route leg. This property only applies when the routeMode of the DirectionsRequestOptions is set to transit. */
-        endTime: Date;
-
-        /** The location of the last waypoint of this leg. */
-        endWaypointLocation: Location;
-
-        /** The directions steps associated with this route leg. */
-        itineraryItems: IDirectionsStep[];
-
-        /** The index of the route to which this route leg belongs. */
-        originalRouteIndex: number;
-
-        /** The start time of the route leg. This property only applies when the routeMode of the DirectionsRequestOptions is set to transit. */
-        startTime: Date;
-
-        /** The location of the first waypoint of this route leg. */
-        startWaypointLocation: Location;
-
-        /** The sub legs of this route leg. A sub leg of a route is the part of the route between a stop point and a via point or between two via points.*/
-        subLegs: IRouteSubLeg[];
-
-        /** The summary which describes this route leg. */
-        summary: IRouteSummary;
-    }
-
-    /** Represents a route sub leg. A route sub leg is the part of the route between a stop point and a via point or between two via points. */
-    export interface IRouteSubLeg {
-        /** The location of the last waypoint of the sub leg. */
-        actualEnd: Location;
-
-        /** The location of the first waypoint of the sub leg. */
-        actualStart: Location;
-
-        /** The description of the last waypoint of the sub leg. */
-        endDescription: string;
-
-        /** The description of the first waypoint of the sub leg. */
-        startDescription: string;
-    }
-
-    /** Represents a route summary. */
-    export interface IRouteSummary {
-        /** The total travel distance of the route */
-        distance: number;
-
-        /** The cost of the route. This property is only returned if the routeMode of the IDirectionsRequestOptions is set to transit and the map culture is set to ja-jp. */
-        monetaryCost: number;
-
-        /** The location of the northeast corner of bounding box that defines the best map view of the route. */
-        northEast: Location;
-
-        /** The location of the southwest corner of bounding box that defines the best map view of the route. */
-        southWest: Location;
-
-        /** The total travel time, in seconds, for the route. */
-        time: number;
-
-        /**
-        * The total travel time, in seconds, taking into account traffic delays, for the route.
-        * This property is 0 if the avoidTraffic property of the IDirectionsRequestOptions is set to false.
-        */
-        timeWithTraffic: number;
-    }
-
-    /** Contains information about a transit line. */
-    export interface ITransitLine {
-        /** The short name for the transit line. */
-        abbreviatedName: string;
-
-        /** The ID of the agency that owns the transit line. */
-        agencyId: number;
-
-        /** The name of the agency that owns the transit line. */
-        agencyName: string;
-
-        /** The URL of the website of the agency that owns the transit line. */
-        agencyUrl: string;
-
-        /** Phone number for the transit agency. */
-        phoneNumber: string;
-
-        /** Information about the provider of this transit line data. */
-        providerInfo: string;
-
-        /** The uri for the transit agencies website. */
-        uri: string;
-
-        /** The full name of this transit line. */
-        verboseName: string;
-    }
-
-    /** Options that can be used to define a waypoint. */
-    export interface IWaypointOptions {
-        /**
-        * The address string of the waypoint. For example, the following strings are valid for this parameter: "Seattle", "1 Microsoft Way, Redmond, WA". Either the address or location property must be specified.
-        */
-        address?: string;
-
-        /**
-        * A boolean indicating whether the waypoint is a via point. A via point is a point along the route that is not a stop point. Set this property to
-        * true if you just want the route to pass through this location. Default: false
-        */
-        isViaPoint?: boolean;
-
-        /** The location of the waypoint. Either the address or location property must be specified. */
-        location?: Location;
-    }
-
-    /** Contains options for the directions to calculate. */
-    export interface IDirectionsRequestOptions {
-        /** The unit to use when displaying direction distances. */
-        distanceUnit?: DistanceUnit;
-
-        /** The number of routes to calculate. */
-        maxRoutes?: number;
-
-        /** The features to avoid when calculating the route. */
-        routeAvoidance?: RouteAvoidance[];
-
-        /** A boolean indicating whether the route line on the map can be dragged with the mouse cursor.  */
-        routeDraggable?: boolean;
-
-        /** If multiple routes are returned, the index of the route and directions to display. */
-        routeIndex?: number;
-
-        /** The type of directions to calculate. */
-        routeMode?: RouteMode;
-
-        /** The optimization setting for the route calculation. */
-        routeOptimization?: RouteOptimization;
-
-        /** The type of the time specified. The default value is departure. */
-        timeType?: TimeType;
-
-        /** The time to use when calculating the route. If this property is set to null, the current time is used */
-        time?: Date;
-    }
-
-    /** Represents render options for a route. */
-    export interface IDirectionsRenderOptions {
-        /** A boolean indicating whether to automatically set the map view to the best map view of the calculated route. Default: true */
-        autoUpdateMapView?: boolean;
-
-        /** A boolean indicating whether to display the disclaimer about the accuracy of the directions. Default: true */
-        displayDisclaimer?: boolean;
-
-        /** A boolean indicating whether to display the icons for each direction maneuver. Default: true */
-        displayManeuverIcons?: boolean;
-
-        /** A boolean indicating whether to display direction hints that describe when a direction step was missed. Default: true */
-        displayPostItineraryItemHints?: boolean;
-
-        /**
-        * A boolean indicating whether to display direction hints that describe what to look for before you come to the next
-        * direction step. The default value is true.
-        */
-        displayPreItineraryItemHints?: boolean;
-
-        /** A boolean indicating whether to display the route selector control. Default: true */
-        displayRouteSelector?: boolean;
-
-        /** A boolean indicating whether to display direction warnings. Default: true */
-        displayStepWarnings?: boolean;
-
-        /** A boolean indicating whether to display a warning about walking directions. Default: true */
-        displayWalkingWarning?: boolean;
-
-        /** The polyline options that define how to draw the route line on the map, if the RouteMode is driving. */
-        drivingPolylineOptions?: IPolylineOptions;
-
-        /** The pushpin options that define how the first waypoint should be rendered. */
-        firstWaypointPushpinOptions?: IPushpinOptions;
-
-        /** The DOM element inside which the directions itinerary will be rendered. */
-        itineraryContainer?: HTMLElement;
-
-        /** The pushpin options that define how the last waypoint should be rendered. */
-        lastWaypointPushpinOptions?: IPushpinOptions;
-
-        /** A boolean indicating whether to show the input panel. Default: false */
-        showInputPanel?: boolean;
-
-        /** The options that define how to draw the route line on the map, if the RouteMode is transit. */
-        transitPolylineOptions?: IPolylineOptions;
-
-        /** The options that define how to draw the route line on the map, if the RouteMode is walking. */
-        walkingPolylineOptions?: IPolylineOptions;
-
-        /** The options that define the pushpin to use for all route waypoints by default. The first and last waypoints in the route will be overriden by firstWaypointPushpinOptions and lastWaypointPushpinOptions if set.  */
-        waypointPushpinOptions?: IPushpinOptions;
-    }
-
-    /////////////////////////////////////
-    /// Classes
-    ////////////////////////////////////
-
-    /** An object used to define a start, end or stop location along a route. */
-    export class Waypoint {
-        /**
-         * @constructor
-         * @param options: Options used to define the Waypoint.
-         */
-        constructor(options: IWaypointOptions);
-
-        /** Releases any resources associated with the waypoint. */
-        public dispose(): void;
-
-        /**
-         * Gets the address associated with the waypoint.
-         * @returns The address associated with the waypoint.
-         */
-        public getAddress(): string;
-
-        /**
-         * Gets the location of the waypoint.
-         * @returns The location of the waypoint.
-         */
-        public getLocation(): Location;
-
-        /**
-         * Gets a boolean value indicating whether the waypoint is a via point.
-         * @returns A boolean value indicating whether the waypoint is a via point.
-         */
-        public isViapoint(): boolean;
-
-        /**
-         * Sets options for the waypoint. For these options to take effect, you must recalculate the route.
-         * @param options Options used to define the Waypoint.
-         */
-        public setOptions(options: IWaypointOptions): void;
-    }
-
-    /** The main class in the Directions module that process direction calculations and rendering. */
-    export class DirectionsManager {
-
-        /**
-         * @constructor
-         * @param map A map to calculate directions for.
-         * @param waypoints An array of waypoints to be added to the route.
-         */
-        constructor(map: Map, waypoints?: Waypoint[]);
-
-        /**
-         * Adds a waypoint to the route at the given index, if specified. If an index is not specified, the waypoint is added as the last waypoint in the route. The maximum number of walking or driving waypoints is 25. The maximum number of transit waypoints is 2. Up to 10 via points are allowed between two stop waypoints. To recalculate the route, use calculateDirections.
-         * @param waypoint The waypoint to be added to the directions manager.
-         * @param index An index at which the waypoint is to be added.
-         */
-        public addWaypoint(waypoint: Waypoint, index?: number): void;
-
-        /**
-         * Calculates directions based on request and render options set
-         */
-        public calculateDirections(): void;
-
-        /** Clears the directions request and render options and removes all waypoints */
-        public clearAll(): void;
-
-        /**
-         * Clears the directions displayed and removes the route line from the map.
-         * This method does not remove waypoints from the route and retains all calculated direction information and option settings.
-         */
-        public clearDisplay(): void;
-
-        /** Deletes the DirectionsManager object and releases any associated resources. */
-        public dispose(): void;
-
-        /**
-         * Gets all the waypoints in the directions manager.
-         * @returns All the waypoints in the directions manager.
-         */
-        public getAllWaypoints(): Waypoint[];
-
-        /**
-         * Gets the currently displayed route information.
-         * @returns The currently displayed route information.
-         */
-        public getCurrentRoute(): IRoute;
-
-        /**
-        * Gets the route render options.
-        * @returns The route render options
-        */
-        public getRenderOptions(): IDirectionsRenderOptions;
-
-        /**
-         * Gets the directions request options.
-         * @returns The directions request options.
-         */
-        public getRequestOptions(): IDirectionsRequestOptions;
-
-        /**
-         * Gets the current calculated route(s)
-         * @returns The current calculated route(s). If the route was not successfully calculated, null is returned.
-         */
-        public getRouteResult(): IRoute[];
-
-        /**
-        * Removes the given waypoint or the waypoint identified by the given index from the route.
-        * @param waypointOrIndex A Waypoint object to be removed or the index of the waypoint to be removed
-        */
-        public removeWaypoint(waypointOrIndex: Waypoint | number): void;
-
-        /**
-         * Sets the specified render options for the route.
-         * @param options The options that customize the rendering of the calculated route.
-         */
-        public setRenderOptions(options: IDirectionsRenderOptions): void;
-
-        /**
-         * Sets the specified route calculation options.
-         * @param options The route calculation options.
-         */
-        public setRequestOptions(options: IDirectionsRequestOptions): void;
-
-       /**
-        * Displays an input panel for calculating directions in the specified container. Provides autosuggest for location inputs.
-        * @param inputContainerId The id name of the HTML container in which to render the directions input panel.
-        */
-        public showInputPanel(inputContainerId: string): void;
-    }
-}
-
-declare module Microsoft.Maps {
-    /** A static class that manages events within the map SDK. */
-    module Events {
-        /////////////////////////////////////
-        /// addHandler Definitions
-        ////////////////////////////////////
-
-        /**
-        * Attaches the handler for the event that is thrown by the target. Use the return object to remove the handler using the removeHandler method.
-        * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-        * @param eventName The type of event to attach. Supported Events:
-        * • directionsError
-        * • directionsUpdated
-        * @param handler The callback function to handle the event when triggered.
-        * @returns The handler id.
-        */
-        export function addHandler(target: Directions.DirectionsManager, eventName: string, handler: (eventArg?: Directions.IDirectionsEventArgs | Directions.IDirectionsErrorEventArgs) => void): IHandlerId;
-
-        /////////////////////////////////////
-        /// addOne Definitions
-        ////////////////////////////////////
-
-        /**
-         * Attaches the handler for the event that is thrown by the target, but only triggers the handler the first once after being attached.
-         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-         * @param eventName The type of event to attach. Supported Events:
-         * • directionsError
-         * • directionsUpdated
-         * @param handler The callback function to handle the event when triggered.
-         */
-        export function addOne(target: Directions.DirectionsManager, eventName: string, handler: (eventArg?: Directions.IDirectionsEventArgs | Directions.IDirectionsErrorEventArgs) => void): void;
-
-        /////////////////////////////////////
-        /// addThrottledHandler Definitions
-        ////////////////////////////////////
-
-        /**
-         * Attaches the handler for the event that is thrown by the target, where the minimum interval between events (in milliseconds) is specified as a parameter.
-         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-         * @param eventName The type of event to attach. Supported Events:
-         * • directionsError
-         * • directionsUpdated
-         * @param handler The callback function to handle the event when triggered.
-         * @param throttleInterval throttle interval (in ms)
-         * @returns The handler id.
-         */
-        export function addThrottledHandler(target: Directions.DirectionsManager, eventName: string, handler: (eventArg?: Directions.IDirectionsEventArgs | Directions.IDirectionsErrorEventArgs) => void, throttleInterval: number): IHandlerId;
-    }
-}
diff --git a/types/bingmaps/DrawingTools.d.ts b/types/bingmaps/DrawingTools.d.ts
deleted file mode 100644
index bd5c938e4e..0000000000
--- a/types/bingmaps/DrawingTools.d.ts
+++ /dev/null
@@ -1,234 +0,0 @@
-declare module Microsoft.Maps {
-    /** An object that contains the event arguments for when the drawing mode changes in the drawing tools. **/
-    export interface IDrawingModeChangedData {
-
-        /** The shape being modified by the drawing tools. **/
-        shape: IPrimitive;
-
-        /** The new drawing mode. **/
-        mode: DrawingTools.DrawingMode;
-    }
-
-    /**
-     * The DrawingManager class manages the ability to draw and edit multiple shapes on the map. Shapes managed by this class are rendered on a separate drawing layer.
-     * User can use a mouse or a touch screen to draw on the map. When they are done, pressing the escape button or any button on the toolbar will exit the current drawing mode.
-     * This class does not have a publicly accessible constructor and can only be accessed using the showDrawingManager of the DrawingTools class.
-     */
-    export interface DrawingManager {
-        /**
-        * Adds a shapes to the layer, at the specified index if specified.
-        • @param data The shape(s) to be added to the layer.
-        • @param index The index at which to insert the shape into the layer.
-        */
-        add(data: IPrimitive | IPrimitive[], index?: number): void;
-
-        /**
-        * Disposes the drawing manager instance.
-        */
-        dispose(): void;
-
-        /**
-        * Resets the drawing manager and clears all shapes in the drawing layer.
-        */
-        clear(): void;
-
-        /**
-        * Gets the current drawing mode of the drawing manager.
-        * @returns The current drawing mode of the drawing manager.
-        */
-        getDrawingMode(): DrawingTools.DrawingMode;
-
-        /**
-        * Gets an array of shapes that are in the layer. This can be used to iterate over the individual shapes.
-        * @returns An array of shapes that are in the layer. This can be used to iterate over the individual shapes.
-        */
-        getPrimitives(): IPrimitive[];
-
-        /**
-        * Returns the index of the shape in the drawing layer.
-        * @param primitive The shape to find the index of.
-        * @param fromIndex The index to start the search from.
-        * @returns The index of the shape in the drawing layer. Returns -1 if shape is not found.
-        */
-        indexOf(primitive: IPrimitive, fromIndex?: number): number;
-
-        /**
-        * Removes a shape from the layer and returns it.
-        * @param primitive The shape to remove from the layer.
-        * @returns The shape that was removed from the layer.
-        */
-        remove(primitive: IPrimitive): IPrimitive;
-
-        /**
-        * Removes a shape from the layer at the specified index.
-        * @param index The index of the shape to remove from the layer.
-        * @returns The shape that was removed from the layer.
-        */
-        removeAt(index: number): IPrimitive;
-
-        /**
-        * Sets the drawing mode of the drawing manager.
-        * @param mode The drawing mode to set the DrawingManager to.
-        */
-        setDrawingMode(mode: DrawingTools.DrawingMode): void;
-
-        /**
-        * Replaces all shapes in the layer with the new array of shapes that have been provided.
-        * @param primitives An array of shapes to add to the drawing layer.
-        */
-        setPrimitives(primitives: IPrimitive[]): void;
-    }
-
-    /**
-    * Provides a set of tools for drawing and editing shapes on top of the map.
-    * @requires The Microsoft.Maps.DrawingTools module.
-    */
-    export class DrawingTools {
-        /**
-         * @constructor
-         * @requires The Microsoft.Maps.DrawingTools module.
-         * @param map A map instanct to attach the drawing tools to.
-         */
-        constructor(map: Map);
-
-        /**
-        * Initializes the drawing layer and instructs it to create a new shape of a given type.
-        * @param shapeType The type of new shape to create.
-        * @param created A callback function that is fired after the initial shape is created.
-        */
-        public create(shapeType: DrawingTools.ShapeType, created?: (shape: IPrimitive) => void): void;
-
-        /** Disposes the instance of the DrawingTools class. */
-        public dispose(): void;
-
-        /**
-        * Adds a shape to the drawing layer and puts it into edit mode.
-        * @param shape A shape to put into editting mode.
-        */
-        public edit(shape: IPrimitive): void;
-
-        /**
-         * Finishes any shape create / edit operation currently in progress, and returns the shape that was created or editted through a specified callback function.
-         * @param finished A callback function to return the completed shape with.
-         */
-        public finish(finished?: (shape: IPrimitive) => void): void;
-
-        /**
-        * Creates a drawing manager which allows multi-shape editing and displays the toolbar.
-        * @param callback A callback function that is triggered after the DrawingTools have loaded.
-        */
-        public showDrawingManager(callback?: (manager: DrawingManager) => void): void;
-    }
-
-    export module Events {
-        /////////////////////////////////////
-        /// addHandler Definitions
-        ////////////////////////////////////
-
-        /**
-        * Attaches the handler for the event that is thrown by the target. Use the return object to remove the handler using the removeHandler method.
-        * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-        * @param eventName The type of event to attach. Supported Events:
-        * drawingChanged, drawingChanging, drawingEnded, drawingModeChanged, drawingStarted
-        * @param handler The callback function to handle the event when triggered.
-        * @returns The handler id.
-        */
-        export function addHandler(target: DrawingTools, eventName: string, handler: (eventArg?: IPrimitive | IDrawingModeChangedData) => void): IHandlerId;
-
-        /**
-        * Attaches the handler for the event that is thrown by the target. Use the return object to remove the handler using the removeHandler method.
-        * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-        * @param eventName The type of event to attach. Supported Events:
-        * disposed, drawingChanged, drawingChanging, drawingEnded, drawingErased, drawingModeChanged, drawingStarted
-        * @param handler The callback function to handle the event when triggered.
-        * @returns The handler id.
-        */
-        export function addHandler(target: DrawingManager, eventName: string, handler: (eventArg?: IPrimitive | DrawingTools.DrawingMode) => void): IHandlerId;
-
-        /////////////////////////////////////
-        /// addOne Definitions
-        ////////////////////////////////////
-
-        /**
-        * Attaches the handler for the event that is thrown by the target, but only triggers the handler the first once after being attached.
-        * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-        * @param eventName The type of event to attach. Supported Events:
-        * drawingChanged, drawingChanging, drawingEnded, drawingModeChanged, drawingStarted
-        * @param handler The callback function to handle the event when triggered.
-        */
-        export function addOne(target: DrawingTools, eventName: string, handler: (eventArg?: IPrimitive | IDrawingModeChangedData) => void): void;
-
-        /**
-         * Attaches the handler for the event that is thrown by the target, but only triggers the handler the first once after being attached.
-         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-         * @param eventName The type of event to attach. Supported Events:
-         * disposed, drawingChanged, drawingChanging, drawingEnded, drawingErased, drawingModeChanged, drawingStarted
-         * @param handler The callback function to handle the event when triggered.
-         */
-        export function addOne(target: DrawingManager, eventName: string, handler: (eventArg?: IPrimitive | DrawingTools.DrawingMode) => void): void;
-
-        /////////////////////////////////////
-        /// addThrottledHandler Definitions
-        ////////////////////////////////////
-
-        /**
-        * Attaches the handler for the event that is thrown by the target, where the minimum interval between events (in milliseconds) is specified as a parameter.
-        * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-        * @param eventName The type of event to attach. Supported Events:
-        * drawingChanged, drawingChanging, drawingEnded, drawingModeChanged, drawingStarted
-        * @param handler The callback function to handle the event when triggered.
-        * @returns The handler id.
-        */
-        export function addThrottledHandler(target: DrawingTools, eventName: string, handler: (eventArg?: IPrimitive | IDrawingModeChangedData) => void): IHandlerId;
-
-        /**
-         * Attaches the handler for the event that is thrown by the target, where the minimum interval between events (in milliseconds) is specified as a parameter.
-         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-         * @param eventName The type of event to attach. Supported Events:
-         * disposed, drawingChanged, drawingChanging, drawingEnded, drawingErased, drawingModeChanged, drawingStarted
-         * @param handler The callback function to handle the event when triggered.
-         * @param throttleInterval throttle interval (in ms)
-         * @returns The handler id.
-         */
-        export function addThrottledHandler(target: DrawingManager, eventName: string, handler: (eventArg?: IPrimitive | DrawingTools.DrawingMode) => void, throttleInterval: number): IHandlerId;
-    }
-
-}
-
-declare module Microsoft.Maps.DrawingTools {
-    /**
-    * The different drawing modes that the drawing manager can be set to.
-    * @requires The Microsoft.Maps.DrawingTools module.
-    */
-    export enum DrawingMode {
-        /** Edit an existing shape. Click on a shape to edit it. */
-        edit,
-
-        /** Erase and existing shape. Click on the shapes to erase them. */
-        erase,
-
-        /** Sets the drawing manager into an idle mode. */
-        none,
-
-        /** Allow the user to draw a polygon. */
-        polygon,
-
-        /** Allow the user to draw a polyline. */
-        polyline,
-
-        /** Allow the user to draw a pushpin. */
-        pushpin
-    }
-
-    /**
-    * The different types of shapes that are created or edited by the drawing tools.
-    * @requires The Microsoft.Maps.DrawingTools module.
-    */
-    export enum ShapeType {
-        /** A polygon shape type. */
-        polygon,
-
-        /** A polyline shape type. */
-        polyline
-    }
-}
\ No newline at end of file
diff --git a/types/bingmaps/GeoJson.d.ts b/types/bingmaps/GeoJson.d.ts
deleted file mode 100644
index 94726ab542..0000000000
--- a/types/bingmaps/GeoJson.d.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-declare module Microsoft.Maps {
-
-    /** GeoJSON object definition */
-    export interface IGeoJsonObject {
-        /**
-         * Type of the object
-         * could be one of the following:
-         * Point
-         * LineString
-         * Polygon
-         * MultiPoint
-         * MultiLineString
-         * MultiPolygon
-         * GeometryCollection
-         * Feature
-         * FeatureCollection
-         */
-        type: string;
-
-        /** Geometric coordinates of the object */
-        coordinates?: number[] | number[][] | number[][][] | number[][][][];
-
-        /** Additional properties of the object as a key,value pair */
-        properties?: any;
-
-        /** Set of features (only applicable if the type is 'featurecollection') */
-        features?: IGeoJsonObject[];
-
-        /** Set of geometries (only applicable if the type is 'geometrycollection') */
-        geometries?: IGeoJsonObject[];
-
-        /** Geometry (only applicable if the type is 'feature') */
-        geometry?: IGeoJsonObject;
-
-        /** identifier of a feature (only applicable if the type is 'feature') */
-        id?: any;
-    }
-
-    /**
-     * Class responsible for reading/writing geo data in GeoJson format
-     * @requires The Microsoft.Maps.GeoJson module.
-     */
-    export module GeoJson {
-       /**
-       * Reads the data from a given url and returns the shapes.
-       * @param url GeoJson download url.
-       * @param callback Callback function that needs to be called once the data is downloaded and parsed.
-       * @param jsonpQueryParam The name of the url query param to make a jsonp request.
-       * @param styles Styles that needs to be applied.
-       */
-        export function readFromUrl(url: string, callback: (data: IPrimitive | IPrimitive[]) => void, jsonpQueryParam?: string, styles?: IStylesOptions): void;
-
-        /**
-         * Reads the data in geoJson format and returns the shapes.
-         * @param geoJson GeoJson data object that needs to be parsed into shapes.
-         * @param styles Styles that needs to be applied.
-         * @returns An array of shapes.
-         */
-        export function read(geoJson: IGeoJsonObject | string, styles?: IStylesOptions): IPrimitive | IPrimitive[];
-
-        /**
-        * Writes the data into geoJson format.
-        * @param data Data that needs to be serialized.
-        * @returns A geoJson formatted string.
-        */
-        export function write(data: IPrimitive | IPrimitive[]): IGeoJsonObject;
-    }
-}
\ No newline at end of file
diff --git a/types/bingmaps/HeatMapLayer.d.ts b/types/bingmaps/HeatMapLayer.d.ts
deleted file mode 100644
index c90813b00d..0000000000
--- a/types/bingmaps/HeatMapLayer.d.ts
+++ /dev/null
@@ -1,106 +0,0 @@
-declare module Microsoft.Maps {
-    /** A standard dictionary object (associative array). */
-    export interface IDictionary<T> {
-        [K: string]: T;
-    }
-
-    /** Options for customizing how the heat map is rendered. */
-    export interface IHeatMapLayerOptions {
-        /**
-        * The temperature gradient that is used to colorize the map. Default gradient:
-        *    {
-        *        '0.00': 'rgb(255,0,255)', // Magenta
-        *        '0.25': 'rgb(0,0,255)', // Blue
-        *        '0.50': 'rgb(0,255,0)', // Green
-        *        '0.75': 'rgb(255,255,0)', // Yellow
-        *        '1.00': 'rgb(255,0,0)' // Red
-        *    }
-        */
-        colorGradient?: IDictionary<string>;
-
-        /**
-        * The intensity of each heat point. This is a decimal value between 0 and 1. This is used to specify how "hot" a single data point should be. Default: 0.5
-        */
-        intensity?: number;
-
-        /**
-        * The opacity of the HeatMapLayer canvas. Value should be a decimal between 0 and 1. Default: 1
-        */
-        opacity?: number;
-
-        /**
-        * The radius to draw each data point on the map. Default: 10
-        */
-        radius?: number;
-
-        /**
-        * The distance units of the radius. Possible values are:
-        *
-        * • 'pixels' (defualt)
-        * • 'meters'
-        *
-        * When set to pixels the size of each data point will always be the same radius, regardless of zoom level. When set to meters, the size of the data points
-        * will scale based on zoom level so as to ensure that the radius is spatially accurate.
-        */
-        unit?: 'meters' | 'pixel';
-
-        /** A boolean indicating if the heat map layer is visible or not. **/
-        visible?: boolean;
-    }
-
-    /**
-     * Class for rendering data as a heat map layer.
-     * @requires The Microsoft.Maps.Heatmap module.
-     */
-    export class HeatMapLayer implements IDataLayer {
-        /**
-         * @constructor
-         * @requires The Microsoft.Maps.Heatmap module.
-         * @param locations Set of locations to visualize as a heat map.
-         * @param options Options for customizing how the heat map is rendered.
-         */
-        constructor(locations: (Location | Pushpin)[], options?: IHeatMapLayerOptions);
-
-        /** Clears all data in the heat map layer. */
-        public clear(): void;
-
-        /** Disposes the heat map layer. */
-        public dispose(): void;
-
-        /**
-         * Gets a boolean indicating if the heat map layer is visible or not.
-         * @returns A boolean indicating if the heat map layer is visible or not.
-         */
-        public getVisible(): boolean;
-
-        /**
-        * @deprecated
-        * Hides the heat map layer.
-        */
-        public hide(): void;
-
-        /**
-         * Specifies the locations to use when generating the heat map.
-         * @param locations Set of locations.
-         */
-        public setLocations(locations: (Location | Pushpin)[]): void;
-
-        /**
-        * Sets the options to use with the heat map layer.
-        * @param options Set of heat map layer options.
-        */
-        public setOptions(options: IHeatMapLayerOptions): void;
-
-        /**
-        * Sets the visibility of the heat map layer.
-        * @param visible A boolean indicating if the heat map layer is visible or not.
-        */
-        public setVisible(visible: boolean): void;
-
-        /**
-        * @deprecated
-        * Shows the heat map layer.
-        */
-        public show(): void;
-    }
-}
\ No newline at end of file
diff --git a/types/bingmaps/Search.d.ts b/types/bingmaps/Search.d.ts
deleted file mode 100644
index 0d799c7078..0000000000
--- a/types/bingmaps/Search.d.ts
+++ /dev/null
@@ -1,228 +0,0 @@
-/**
- * Provides an easy method for geocoding address and searching for points of interest from JavaScript.
- * @requires The Microsoft.Maps.Search module.
- */
-declare module Microsoft.Maps.Search {
-    /**
-     * Defines the match precision of a geocdoed result.
-     * @requires The Microsoft.Maps.Search module.
-     */
-    export enum LocationPrecision {
-        /** The geocode result was matched to a point on a road using interpolation. */
-        interpolated,
-
-        /**
-        * The geocode result was matched to a point on a road using interpolation with an additional offset to shift the
-        * Location to the side of the street.
-        */
-        InterpolatedOffset,
-
-        /** The geocode result was matched to the center of a parcel (property boundary). */
-        parcel,
-
-        /** The geocode result was matched to the rooftop of a building. */
-        rooftop
-    }
-
-    /**
-     * Defines the geocoding level of the location match found by the geocoder.
-     * @requires The Microsoft.Maps.Search module.
-     */
-    export enum MatchCode {
-        /** No match was found. */
-        none,
-
-        /** The match was good. */
-        good,
-
-        /** The match was ambiguous. Multiple results were returned. */
-        ambiguous,
-
-        /** The match was found by a broader search. */
-        upHierarchy,
-
-        /** The match was found, but possibly using a modified query. */
-        modified
-    }
-
-    /**
-     * Defines the confidence of the location match found by the geocoding service.
-     * @requires The Microsoft.Maps.Search module.
-     */
-    export enum MatchConfidence {
-        /** The confidence of the match is high. */
-        high,
-
-        /** The confidence of the match is medium. */
-        medium,
-
-        /** The confidence of the match is low. */
-        low,
-
-        /** The confidence of the match is unknown. */
-        unknown
-    }
-
-    /** A object that represents a geocoded location. */
-    export interface IGeocodeLocation {
-        /** The map location of this geocode location match. */
-        location: Location;
-
-        /** The name of this geocode location match. */
-        name: string;
-
-        /** The precision of this geocode location match. */
-        precision: string | LocationPrecision;
-    }
-
-    /** An object that represents an place result. */
-    export interface IPlaceResult {
-        /** The geocoded address of the place result. */
-        address: IAddress;
-
-        /** The location rectangle that defines the boundaries of the best map view of the place result. */
-        bestView: LocationRect;
-
-        /** The classification of the geographic entity returned, such as PopulatedPlace. */
-        entityType: string;
-
-        /** The geocoded location of the best result. */
-        location: Location;
-
-        /** The geocoded locations. */
-        locations: IGeocodeLocation[];
-
-        /** The match code of the best result. */
-        matchCode: string | MatchCode;
-
-        /** The match confidence of the best result. */
-        matchConfidence: string | MatchConfidence;
-
-        /** The name of the place result, if one exists. */
-        name: string;
-    }
-
-    /** An object that represents a geocode result returned by REST service. */
-    export interface IGeocodeResult {
-        /** An array of geocode results. */
-        results: IPlaceResult[];
-    }
-
-    /** The options for a geocode request. */
-    export interface IGeocodeRequestOptions {
-        /**
-         * A location rectangle that defines the boundaries of the area in which to search for
-         * location results. The default is the bounds of the map view associated with this
-         * instance of the SearchManager, which is usually the current map view.
-         */
-        bounds?: LocationRect;
-
-        /**
-         * The name of the function to call when a successful result is returned from the
-         * geocode request. The callback function must accept two parameters: result, which is
-         * a GeocodeResult type, and a userData object.
-         */
-        callback: (geocodeResult: IGeocodeResult, userData: any) => void;
-
-        /** The maximum number of results to return. Required. The maximum number than can be returned is 20. */
-        count?: number;
-
-        /**
-         * The name of the function to call when the request is returned with an error. The
-         * error callback function must accept an IGeocodeRequestOptions object.
-         */
-        errorCallback?: (geocodeRequestOptions: IGeocodeRequestOptions) => void;
-
-        /** Specifies to include the two-letter ISO country code. */
-        includeCountryIso2?: boolean;
-
-        /** Specifies to include the neighborhood in the response when it is available. */
-        includeNeighborhood?: boolean;
-
-        /** A number indicating how long to wait, in seconds, for the geocode request to return. The default value is 5 seconds. */
-        timeout?: number;
-
-        /** An object containing any data that needs to be passed to the callback when the request is completed. */
-        userData?: any;
-
-        /** A string containing the address or place to be matched to a location on the map.  */
-         where: string;
-    }
-
-    /** The options for a reverse geocode request. */
-    export interface ReverseGeocodeRequestOptions {
-        /**
-         * A reference to a function to call when a successful result is returned from the geocode request. The callback function
-         * will receive a PlaceResult object as an argument.
-         */
-        callback: (placeResult: IPlaceResult, userData: any) => void;
-
-        /**
-         * A reference to a function to call when the request is returned with an error. The error callback function will receive
-         * an object containing the geocode request options used in the request.
-         */
-        errorCallback?: (reverseGeocodeRequestOptions: ReverseGeocodeRequestOptions) => void;
-
-        /** Specifies to include the two-letter ISO country code. Default: false */
-        includeCountryIso2?: boolean;
-
-        /**
-         *  An array of entity types selected from the following options.
-         * • Address
-         * • Neighborhood
-         * • PopulatedPlace
-         * • Postcode1
-         * • AdminDivision1
-         * • AdminDivision2
-         * • CountryRegion
-         * These entity types are ordered from the most specific entity to the least specific entity. When entities of more than one entity type are found, only the most specific
-         * entity is returned. For example, if you specify Address and AdminDistrict1 as entity types and entities were found for both types, only the Address entity information is
-         * returned in the response. One exception to this rule is when both PopulatedPlace and Neighborhood entity types are specified and information is found for both. In this case,
-         * the information for both entity types is returned. Also, more than one Neighborhood may be returned because the area covered by two different neighborhoods can overlap.
-         */
-        includeEntityTypes?: string[];
-
-        /**
-         * Specifies to include the neighborhood in the response when it is available. Note: This feature isn’t
-         * available in all locations.
-         */
-        includeNeighborhood?: boolean;
-
-        /** The location to use to match to geographic entities and addresses. */
-        location: Location;
-
-        /** A number indicating how long to wait, in seconds, for the reverse geocode request to  return. The default value is 5 seconds. */
-        timeout?: number;
-
-        /** An object containing any data that needs to be passed to the callback when the request is completed. */
-        userData?: any;
-    }
-
-    /**
-    * A class that contains methods for returning search and location results.
-    * @requires The Microsoft.Maps.Search module.
-    */
-    export class SearchManager {
-        /**
-         * @constructor
-         * @requires The Microsoft.Maps.Search module.
-         * @param map A Map object
-         */
-        constructor(map: Map);
-
-        /**
-         * Matches the address or place query in the specified request
-         * options to a location and returns the results to the request
-         * options callback function.
-         * @param request Options for sending geocode request
-         */
-        public geocode(request: IGeocodeRequestOptions): void;
-
-        /**
-         * Matches the specified location to an address and returns the
-         * address results to the specified request options callback function.
-         * @param request Options for sending reverse geocode request
-         */
-        public reverseGeocode(request: ReverseGeocodeRequestOptions): void;
-    }
-}
\ No newline at end of file
diff --git a/types/bingmaps/SpatialDataService.d.ts b/types/bingmaps/SpatialDataService.d.ts
deleted file mode 100644
index 627ab7cbad..0000000000
--- a/types/bingmaps/SpatialDataService.d.ts
+++ /dev/null
@@ -1,440 +0,0 @@
-/**
- * This module wraps the Query and GeoData REST API’s in the Bing Spatial Dara Services and expose them as an easy to use JavaScript library.
- * @requires The Microsoft.Maps.SpatialDataService module.
- */
-declare module Microsoft.Maps.SpatialDataService {
-
-    //////////////////////////////////////////////
-    /// GeoData API
-    //////////////////////////////////////////////
-
-    /** Represents the options for requests boundary data from the GeoData API in the Bing Spatial Data Services. */
-    export interface IGetBoundaryRequestOptions {
-        /**
-        * The level of detail for the boundary polygons returned. An integer between 0 and 3, where 0 specifies the coarsest level of boundary detail and 3
-        * specifies the best. Default: 0
-        */
-        lod?: number;
-
-        /**
-        * The entity type to return. Default: CountryRegion
-        * Supported entity types:
-        * AdminDivision1, AdminDivision2, CountryRegion, eighborhood, PopulatedPlace, Postcode1, Postcode2, Postcode3, Postcode4
-        * Note: Not all entity types are available in all areas.
-        */
-        entityType?: string;
-
-        /**
-        * Specifies the preferred language to use for any metadata text about the entity or polygons. Defaults to the culture used by the map control, which
-        * usually automatically detected based on user's browser settings. Setting this property will override the default value.
-        */
-        culture?: string;
-
-        /**
-        * Specifies whether the response should include all of the boundary polygons for the requested entity or just return a single polygon that represents
-        * the main outline of the entity. Default: false
-        */
-        getAllPolygons?: boolean;
-
-        /**
-        * Specifies whether the response should include metadata about the entity, such as AreaSqKm and others. Default: false
-        */
-        getEntityMetadata?: boolean;
-
-        /**
-        * Specifies the user’s home country or region.Defaults to the region setting of the user who loads the map.
-        * Warning: Setting this property will override the default value, which is the region the user is actually in, and will allow the user to see boundaries
-        * which may not align with the views of their region.This could result in geopolitically sensitive borders being returned.
-        */
-        userRegion?: string;
-    }
-
-    /** Represents the primitive object for a boundary returned by the GeoData API. */
-    export interface IGeoDataPrimitive {
-        /** A unique ID associated with this polygon primitive. */
-        PrimitiveID: string;
-
-        /**
-        * A comma-delimited sequence starting with the version number of the polygon set followed by a list of compressed polygon
-         * "rings" (closed paths represented by sequences of latitude and-longitude points).
-        */
-        Shape: string;
-
-        /** The number of vertex points used to define the polygon. */
-        NumPoints: string;
-
-        /**
-        * An ID identifying the data provider that supplied the data. This ID number will reference one of the sources listed in the
-        * array of CopyrightSources in the Copyright property of the GeoDataResultSet object.
-        */
-        SourceID: string;
-    }
-
-    /** Represents the copyright source object for a boundary returned by the GeoData API. */
-    export interface ICopyrightSource {
-        /** The copyright string from the source. */
-        Copyright: string;
-
-        /** An ID identifying the data provider that supplied the data. */
-        SourceID: string;
-
-        /** The name of the data provider represented by this Source element. */
-        SourceName: string;
-    }
-
-    /** Represents the copyright object for a boundary returned by the GeoData API. */
-    export interface ICopyright {
-        /** The copyright URL for the GeoData service. */
-        CopyrightURL: string;
-
-        /** A collection of CopyrightSource objects that give information about the sources of the polygon data that is returned. */
-        Sources: ICopyrightSource[];
-    }
-
-    /** Represents the name object for a boundary returned by the GeoData API. */
-    export interface IName {
-        /** The name of boundary. Example: "United States" */
-        EntityName: string;
-
-        /** The culture of the region. */
-        Culture: string;
-
-        /** An ID identifying the data provider that supplied the data. */
-        SourceID: string;
-    }
-
-    /** Represents the metadata object for a boundary returned by the GeoData API. Not all properties will be returned for all results. */
-    export interface IMetadata {
-        /** The approximate total surface area (in square kilometers) covered by all the polygons that comprise this entity. */
-        AreaSqKm: string;
-
-        /**
-        * An area on the Earth that provides the best map view for this entity. This area is defined as a bounding box in the format of a
-        * “MULTIPOINT ((WestLongitude SouthLatitude), (EastLongitude NorthLatitude))”.
-        */
-        BestMapViewBox: string;
-
-        /** The culture associated with this entity. Example: en */
-        OfficialCulture: string;
-
-        /** The approximate population within this entity. Example: PopClass20000to99999 */
-        PopulationClass: string;
-
-        /** The regional culture associated with this entity. */
-        RegionalCulture: string;
-    }
-
-    /** Represents a single result object returned by the GeoData API. */
-    export interface IGeoDataResult {
-        /** Copyright information for the returned boundary data. */
-        Copyright: ICopyright;
-
-        /** A unique ID number associated with this entity. */
-        EntityID: string;
-
-        /**
-        * A collection of metadata information associated with the entity. The getEntityMetadata option of the request must be set
-        * to true. Note, not all boundaries will return this metadata.
-        */
-        EntityMetadata: IMetadata;
-
-        /** Information about the name of the boundary location. */
-        Name: IName;
-
-        /** A Polygon object that has been generated from the data in the Primitives property. */
-        Polygons: Polygon[];
-
-        /** An array of objects that contain the polygon information for the boundary. */
-        Primitives: IGeoDataPrimitive[];
-    }
-
-    /** Represents the set of results returned by the GeoData API. */
-    export interface IGeoDataResultSet {
-        /** Copyright information for the GeoData API. */
-        Copyright: string;
-
-        /** The location provided in the query that generated this result. */
-        location: string |  Location;
-
-        /** Results of the boundary data. */
-        results: IGeoDataResult[];
-    }
-
-    /**
-     * This is a static class that provides the ability to request polygons that describe the boundaries of a geographic entities, such as an AdminDivision1
-     * (such as a state or province) or a Postcode1 (such as a zip code) that contain a given point (latitude and longitude) or address. This uses the GeoData
-     * API in the Bing Spatial Data Services.
-     * @requires The Microsoft.Maps.SpatialDataService module.
-     */
-    export module GeoDataAPIManager {
-        /**
-         * Gets a boundary for the specified request. If the specified location value is a string, it will be geocoded and the coordinates of the result will
-         * be used to find a boundary of the specified entityType that intersects with this coordinate.
-         * @requires The Microsoft.Maps.SpatialDataService module.
-         * @param locations The locations to retrieve boundaries for. If the specified location value is a string, it will be geocoded and the coordinates of
-         * the result will be used to find a boundary of the specified entityType that intersects with this coordinate.
-         * @param request The request options for retrieving a boundary.
-         * @param credentials A bing maps key or a map instance which can be used to provide credentials to access the data source. Note that the map will need
-         * to be loaded with a bing maps key that has access to the data source.
-         * @param callback A callback function to return the results to. If an array of locations are specified the callback function will be triggered for each location in the array.
-         */
-        export function getBoundary(locations: string | Location | (string | Location)[], request: IGetBoundaryRequestOptions, credentials: string | Map, callback: (results: IGeoDataResultSet) => void): void;
-    }
-
-    //////////////////////////////////////////////
-    /// Query API
-    //////////////////////////////////////////////
-
-    /**
-    * An enumeration that defines how to compare the filters value against the corresponding property value.
-    * @requires The Microsoft.Maps.SpatialDataService module.
-    */
-    export enum FilterCompareOperator {
-        /** Determines if a string value ends with a specified string value. */
-        endsWith,
-
-        /** Determines if two values are equal. */
-        equals,
-
-        /** Determines if a first value is greater than a second value. */
-        greaterThan,
-
-        /** Determines if a first value is greater than or equal to a second value. */
-        greaterThanOrEqual,
-
-        /** Determines if a value is within an array. */
-        isIn,
-
-        /** Determines if a first value is less than a second value. */
-        lessThan,
-
-        /**  Determines if a first value is less than or equal a second value. */
-        lessThanOrEqual,
-
-        /** Determines if a string value does not end with a specified string value. */
-        notEndsWith,
-
-        /** Determines if two values are not equal. */
-        notEquals,
-
-        /** Determines if a string value does not start with a specified string value. */
-        notStartsWith,
-
-        /** Determines if a string value starts with a specified string value. */
-        startsWith
-    }
-
-    /**
-    * An enumeration that defines how two or more filters are linked together.
-    * @requires The Microsoft.Maps.SpatialDataService module.
-    */
-    export enum FilterLogicalOperator {
-        /** Connects two or more filters that both must be true. */
-        and,
-
-        /** Connects two or more filters where one of them must be true. */
-        or
-    }
-
-    /**
-    * A Fitler object that defines the logic behind a filter expression that can be executed against a JSON object or generate
-    * a filter string that can be used with the Bing Spatial Data Services.
-    */
-    export interface IFilter {
-        /**
-        * Executes the filter logic against a JSON object and returns a boolean indicating if the object meets the requirements of the Filter.
-        * @returns A boolean indicating if the specified object meets the requirements of the Filter.
-        */
-        execute(object: any): boolean;
-
-        /**
-        * Converts the filter logic into a string format that is compatible with the Bing Spatial Data Services.
-        * @returns A filter string that is formatted such that it is compatible with the Bing Spatial Data Services.
-        */
-        toString(): string;
-    }
-
-    /**
-     * The Fitler class defines the logic behind a filter expression that can be executed against a JSON object or generate
-     * a filter string that can be used with the Bing Spatial Data Services.
-     * @requires The Microsoft.Maps.SpatialDataService module.
-     */
-    export class Filter implements IFilter {
-        /**
-         * @constructor
-         * @requires The Microsoft.Maps.SpatialDataService module.
-         * @param propertyName The name of the property in the object to test against. Can also provide child properties i.e. 'root.child'.
-         * @param operator The operator to use when comparing the specified property to value to the provided value.
-         * @param value A value to compare against.
-         */
-        constructor(propertyName: string, operator: string | FilterCompareOperator, value: any);
-
-        /**
-        * Executes the filter logic against a JSON object and returns a boolean indicating if the object meets the requirements of the Filter.
-        * @returns A boolean indicating if the specified object meets the requirements of the Filter.
-        */
-        public execute(object: any): boolean;
-
-        /**
-        * Converts the filter logic into a string format that is compatible with the Bing Spatial Data Services.
-        * @returns A filter string that is formatted such that it is compatible with the Bing Spatial Data Services.
-        */
-        public toString(): string;
-    }
-
-    /**
-     * A class that groups two or more logical filters or filter groups together. It can be executed against a JSON or generate
-     * a filter string that can be used with the Bing Spatial Data Services.
-     * @requires The Microsoft.Maps.SpatialDataService module.
-     */
-    export class FilterGroup implements IFilter {
-        /**
-        * @constructor
-        * @requires The Microsoft.Maps.SpatialDataService module.
-        * @param filters An array consisting of Filter or FilterGroup objects to combine.
-        * @param operator The logical operator for combining the filters together.
-        * @param not A boolean is the logical inverse should of the filter should be used.
-        */
-        constructor(filters: IFilter[], operator: FilterLogicalOperator, not?: boolean)
-
-        /**
-        * Executes the filter logic against a JSON object and returns a boolean indicating if the object meets the requirements of the Filter.
-        * @returns A boolean indicating if the specified object meets the requirements of the Filter.
-        */
-        public execute(object: any): boolean;
-
-        /**
-        * Converts the filter logic into a string format that is compatible with the Bing Spatial Data Services.
-        * @returns A filter string that is formatted such that it is compatible with the Bing Spatial Data Services.
-        */
-        public toString(): string;
-    }
-
-    /** Options for find near route query API. */
-    export interface ISpatialFilterOptions {
-        /**
-         * One of the following values:
-         * • nearby – Searches in a radius around a location.
-         * • nearRoute – Searches for results that are within 1 mile of a route.
-         * • intersects – Searches for results that intersect with the specified geometry.
-         * Note: Note that the NavteqNA and NavteqEU data sources only support nearby queries.
-         */
-        spatialFilterType: string;
-
-        /** Location at which the filter should be applied (only for nearby filter). */
-        location?: string | Location;
-
-        /**
-         * Radius to use when performing a nearby search. The distance in kilometers and must be between 0.16 and 1000 kilometers
-         * (only for nearby filter).
-         */
-        radius?: number;
-
-        /** Start location of the route (only for nearroute filter). */
-        start?: string | Location;
-
-        /** End location of the route (only for nearroute filter). */
-        end?: string | Location;
-
-        /** Intersection object. Can be a well known text string or a LocationRect object (only for intersects filter). */
-        intersects?: string | LocationRect | IPrimitive;
-    }
-
-    /** Options for find near route query API. */
-    export interface IFindNearRouteOptions extends ISpatialFilterOptions {
-        /**
-         * One of the following values:
-         *  • Driving [default]
-         *  • Walking
-         */
-        travelMode?: string;
-
-        /**
-         * An integer value between 0 and 359 that represents degrees from north
-         * where north is 0 degrees and the heading is specified clockwise from north.
-         * For example, setting the heading of 270 degrees creates a route that initially heads west
-         */
-        heading?: number;
-
-        /**
-         * An integer distance specified in meters.
-         * Use this parameter to make sure that the moving vehicle has enough distance
-         * to make the first turn
-         */
-        distanceBeforeFirstTurn?: number;
-
-        /**
-         * A list of values that limit the use of highways and toll roads in the route.
-         * Use one of the following values:
-         * • highways - Avoids the use of highways in the route.
-         * • tolls - Avoids the use of toll roads in the route.
-         * • minimizeHighways - Minimizes (tries to avoid) the use of highways in the route.
-         * • minimizeTolls - Minimizes (tries to avoid) the use of toll roads in the route.
-         */
-        avoid?: string[];
-
-        /**
-         * One of the following values:
-         * • distance - The route is calculated to minimize the distance.Traffic information is not used.
-         * • time[default] - The route is calculated to minimize the time.Traffic information is not used.
-         * • timeWithTraffic - The route is calculated to minimize the time and uses current traffic information.
-         */
-        optimize?: string;
-    }
-
-    /** Set of options that can be specified for query APIs. */
-    export interface IQueryAPIOptions {
-        /** A queryurl containing the access id, data source name and the entity type name. */
-        queryUrl: string;
-
-        /** Specifies a conditional expression for a list of properties and values. */
-        filter?: IFilter;
-
-        /** Specifies whether or not to return a count of the results in the response. Default: false */
-        inlineCount?: boolean;
-
-        /** Specifies to query the staged version of the data source instead of the published version. Default: false */
-        isStaging?: boolean;
-
-        /**
-         * Specifies one or more properties to use to sort the results of a query.
-         * You can specify up to three (3) properties. Results are sorted in ascending order.
-         * Note: You cannot use the latitude and longitude properties to sort results. You can use the elevation property.
-         */
-        orderBy?: string[];
-
-        /**
-         * Specifies the data source properties to return in the response. If the $select query option is not specified or
-         * if it is set to "" ($select=), all data source properties are returned. Default: "*,_distance"
-         */
-        select?: string[];
-
-        /** Specifies to not return a specified number of query results. */
-        skip?: number;
-
-        /** Spatial filter options to apply. */
-        spatialFilter?: ISpatialFilterOptions | IFindNearRouteOptions;
-
-        /** Specifies the maximum number of results to return in the query response. Default: 25 */
-        top?: number;
-    }
-
-    /**
-     * This is a static class that provides that ability to query data sources that are hosted by the Bing Spatial Data Services using the Query API.
-     * @requires The Microsoft.Maps.SpatialDataService module.
-     */
-    export module QueryAPIManager {
-        /**
-         * Perform a search
-         * @requires The Microsoft.Maps.SpatialDataService module.
-         * @param queryOptions - Options for the query
-         * @param credentials - Credentials for the query
-         * @param callback - The function to call once the results are retrieved
-         * @param styles - (Optional) Styles of the data that needs to be rendered on map
-         */
-        export function search(queryOptions: IQueryAPIOptions,
-            credentials: string | Map,
-            callback: (data: IPrimitive[], inlineCount?: number) => void,
-            styles?: IStylesOptions): void;
-    }
-}
\ No newline at end of file
diff --git a/types/bingmaps/SpatialMath.d.ts b/types/bingmaps/SpatialMath.d.ts
deleted file mode 100644
index 4fe3b4ea12..0000000000
--- a/types/bingmaps/SpatialMath.d.ts
+++ /dev/null
@@ -1,530 +0,0 @@
-//////////////////////////////////////////////
-/// Core Library
-//////////////////////////////////////////////
-
-/**
- * This module provides a bunch of useful spatial math calculations.
- * @requires The Microsoft.Maps.SpatialMath module.
- */
-declare module Microsoft.Maps.SpatialMath {
-
-    /**
-     * Distance Unit enumerator
-     * @requires The Microsoft.Maps.SpatialMath module.
-     **/
-    export enum DistanceUnits {
-        /** A distance in meters */
-        Meters,
-
-        /** A distance in kilometers */
-        Kilometers,
-
-        /** A distance in miles */
-        Miles,
-
-        /** A distance in Feet */
-        Feet,
-
-        /** A distance in Yards */
-        Yards,
-
-        /** A distance in Nautical Miles */
-        NauticalMiles
-    }
-
-    /**
-     * Area units enumerator
-     * @requires The Microsoft.Maps.SpatialMath module.
-     **/
-    export enum AreaUnits {
-        /** Area in square meters */
-        SquareMeters,
-
-        /** Area in square kilometers */
-        SquareKilometers,
-
-        /** Area in square miles */
-        SquareMiles,
-
-        /** Area in square Feet */
-        SquareFeet,
-
-        /** Area in square Yards */
-        SquareYards,
-
-        /** Area in Acres */
-        Acres,
-
-        /** Area in Hectares */
-        Hectares
-    }
-
-    //////////////////////////////////////////////
-    /// Core Calculations
-    //////////////////////////////////////////////
-
-    /**
-     * Converts an area from one area units to another.
-     * @param area A number that represents an area to convert.
-     * @param fromUnits The area units the original area is in.
-     * @param toUnits The area units to convert to.
-     * @returns An area in the new units.
-     **/
-    export function convertArea(area: number, fromUnits: AreaUnits, toUnits: AreaUnits): number;
-
-    /**
-     * Converts a distance from one distance units to another.
-     * @param distance A number that represents a distance to convert.
-     * @param fromUnits The distance units the original distance is in.
-     * @param toUnits The disired distance units to convert to.
-     * @returns A distance in the new units.
-     **/
-    export function convertDistance(distance: number, fromUnits: DistanceUnits, toUnits: DistanceUnits): number;
-
-     /**
-     * Calculates an array of locations that form a cardinal spline between the specified array of locations.
-     * @param locations The array of locations to calculate the spline through.
-     * @param tension A number that indicates the tightness of the curve. Can be any number, although a value between 0 and 1 is usually used. Default: 0.5
-     * @param nodeSize Number of nodes to insert between each Location. Default: 15
-     * @param close A boolean indicating if the spline should be a closed ring or not. Default: false
-     * @returns An array of locations that form a cardinal spline between the specified array of locations.
-     */
-    export function getCardinalSpline(locations: Location[], tension ?: number, nodeSize ?: number, close ?: boolean): Location[];
-
-    /**
-     * Calculates a destination Location based on a starting Location, a heading, a distance, and a distance unit type.
-     * @param origin Location that the destination is relative to.
-     * @param bearing A heading angle between 0 - 360 degrees. 0 - North, 90 - East, 180 - South, 270 - West.
-     * @param distance Distance that destination is away.
-     * @param units Unit of distance measurement. Default is Meters.
-     * @returns A Location that is the specified distance away from the origin.
-     **/
-    export function getDestination(origin: Location, bearing: number, distance: number, units?: DistanceUnits): Location;
-
-    /**
-     * Calculate the distance between two Location objects on the surface of the earth using the Haversine formula.
-     * @param origin First Location to calculate distance between.
-     * @param destination Second Location to calculate distance between.
-     * @param units Unit of distance measurement. Default is Meters.
-     * @param highAccuracy When set enabled, will use the slower but more accurate Vincenty formula for calculating distances, rather than the Haversine formula.
-     * @returns The shortest distance between two Locations in the specifed units.
-     **/
-    export function getDistanceTo(origin: Location, destination: Location, units?: DistanceUnits, highAccuracy?: boolean): number;
-
-    /**
-     * Retrieves the radius of the earth in a specific distance unit for WGS84.
-     * @param units Unit of distance measurement. Default: Meters
-     * @returns A number that represents the radius of the earth in a specific distance unit.
-     **/
-    export function getEarthRadius(units?: DistanceUnits): number;
-
-    /**
-     * Takes an array of Locations objects and fills in the space between them with accurately positioned Locations to form an approximated Geodesic path.
-     * @param path Array of Location objects that form a path to fill in.
-     * @param nodeSize Number of nodes to insert between each Location. Default: 15
-     * @returns An array of Location objects that form a geodesic paths.
-     **/
-    export function getGeodesicPath(path: Location[], nodeSize?: number): Location[];
-
-    /**
-     * Calculates the heading from one Location object to another.
-     * @param origin Point of origin.
-     * @param destination Destination to calculate relative heading to.
-     * @returns A heading in degrees between 0 and 360. 0 degrees points due North.
-     **/
-    export function getHeading(origin: Location, destination: Location): number;
-
-    /**
-     * Calculates the distance between all Location objects in an array.
-     * @param path The array of Location objects that make up the path to calculate the length of.
-     * @param units Unit of distance measurement. Default: Meters
-     * @param highAccuracy If set to true, uses the more accurate Vincenty algorithm for calcuating distances. Otherwise the faster Haversine formula is used.
-     * @returns The distance between all Locations in between all Location objects in an array on the surface of a earth in the specifed units.
-     **/
-    export function getLengthOfPath(path: Location[], units?: DistanceUnits, highAccuracy?: boolean): number;
-
-    /**
-     * Calculates the Location object on a path that is a specified distance away from the start of the path. If the specified distance is longer
-     * than the length of the path, the last Location of the path will be returned.
-     * @param path A polyline or array of Location coordinates that form a path.
-     * @param distance The distance along the path (from the start) to calculate the location for.
-     * @param units Unit of distance measurement. Default is Meters.
-     * @returns A Location object that is the specified distance away from the start of the path when following the path.
-     **/
-    export function getLocationAlongPath(path: Polyline | Location[], distance: number, units?: DistanceUnits): Location;
-
-    /**
-     * Calculates an array of Location objects that are an equal distance away from a central point to create a regular polygon.
-     * @param origin Center of the regular polygon.
-     * @param radius Radius of the regular polygon.
-     * @param numberOfPoints Number of points the polygon should have.
-     * @param units Unit of distance measurement for radius. Default is Meters.
-     * @param offset An offset to rotate the polygon clockwise in degrees. When 0 the first Location will align with North.
-     * @returns An array of Location objects that form a regular polygon.
-     **/
-    export function getRegularPolygon(origin: Location, radius: number, numberOfPoints: number, units?: DistanceUnits, offset?: number): Location[];
-
-    /**
-     * Calculates a Location object that is a fractional distance between two Location objects.
-     * @param origin First Location to calculate mid-point between.
-     * @param destination Second Location to calculate mid-point between.
-     * @param fraction The fractional parameter to calculate a mid-point for. Default 0.5.
-     * @returns A Location that lies a fraction of the distance between two Location objects, relative to the first Location object.
-     **/
-    export function interpolate(origin: Location, destination: Location, fraction?: number): Location;
-
-    /**
-     * Takes a LocationRect and converts it to a polygon.
-     * @param bounds The LocationRect to convert to a Polygon.
-     * @returns A polygon representation of the LocationRect.
-     **/
-    export function locationRectToPolygon(bounds: LocationRect): Polygon;
-
-    /**
-     * Takes a Location object and converts it into a Degree Minute Seconds string in the format. For example: 40° 26′ 46″ N 79° 58′ 56″ W
-     * @param loc The Location object to convert into a Degree Minute Seconds string.
-     * @returns A string in Degree Minute Seconds format or null if invalid Location object is provided.
-     */
-    export function toDegMinSec(loc: Location): string;
-
-    /**
-     * Tries to parse the given string that is in Degree Minute Seconds format. For Example: 35° 26′ 31″ E or 40° 26′ 46″ N 79° 58′ 56″ W
-     * @param input A string in Degree Minute Seconds format to parse.
-     * @returns Returns a decimal degree value if only a single angle is provided. If two angles provided in the string, then a
-     * Location object is returned. If string is in an invalid format, null is returned.
-     */
-    export function tryParseDegMinSec(input: string): number | Location;
-}
-
-
-//////////////////////////////////////////////
-/// Tile Calculations
-//////////////////////////////////////////////
-
-/**
-* A colleciton of mathematical algorithms based on the tile pyramid used by Bign Maps.
-* @requires The Microsoft.Maps.SpatialMath module.
-*/
-declare module Microsoft.Maps.SpatialMath.Tiles {
-    //Based on https://msdn.microsoft.com/en-us/library/bb259689.aspx
-
-    /**
-     * Calculates the full width of the map in pixels at a specific zoom level from -180 degrees to 180 degrees.
-     * @param zoom Zoom level to calculate width at.
-     * @param tileWidth Width of tile.
-     * @returns Width of map in pixels.
-     **/
-    export function mapSize(zoom: number): number;
-
-    /**
-     * Calculates the Ground resolution at a specific degree of latitude in the specified units per pixel.
-     * @param latitude Degree of latitude to calculate resolution at.
-     * @param zoom Zoom level to calculate resolution at.
-     * @param units Distance unit type to calculate resolution in.
-     * @returns Ground resolution in distance unit per pixels.
-     **/
-    export function groundResolution(latitude: number, zoom: number, units?: SpatialMath.DistanceUnits): number;
-
-    /**
-     * Converts a Pixel coordinate into a Geospatial Location at a specified zoom level.
-     * Global Pixel coordinates are relative to the top left corner of the map (90, -180)
-     * @param point Pixel coordinate.
-     * @param zoom Zoom level.
-     * @returns A Location that is at the specified pixel location at a specified zoom level.
-     **/
-    export function globalPixelToLocation(point: Point, zoom: number): Location;
-
-    /**
-     * Converts a point from latitude/longitude WGS-84 Location (in degrees)
-     * into pixel XY coordinates at a specified level of detail.
-     * @param loc Location to convert to a global pixel.
-     * @param zoom Level of detail, from 1 (lowest detail) to 23 (highest detail).
-     * @returns Point object containing the the global pixel location of a Location.
-     **/
-    export function locationToGlobalPixel(loc: Location, zoom: number): Point;
-
-    /**
-     * Calculates the PyramidTileId that a global pixel intersects with at a specific zoom level.
-     * @param pixel The pixel coordinate to calculate the tile for.
-     * @param zoom The zoom level to calculate the tile for.
-     * @returns A PyramidTileId that a global pixel intersects with at a specific zoom level.
-     **/
-    export function globalPixelToTile(pixel: Point, zoom: number): PyramidTileId;
-
-    /**
-     * Converts a PyramidTileId into a global pixel coordinates of the upper-left pixel of the specified tile.
-     * @param tile A PyramidTileId to calculate the upper-left pixel for.
-     * @returns Global pixel coordinate of the top left corner of a tile.
-     **/
-    export function tileToGlobalPixel(tile: PyramidTileId): Point;
-
-    /**
-     * Calculates the PyramidTileId that a Location object intersects with at a specific zoom level.
-     * @param loc The location to calulate the tile for.
-     * @param zoom The zoom level to use to calculate the tile.
-     * @returns A PyramidTileId that a Location object intersects with at a specific zoom level.
-     **/
-    export function locationToTile(loc: Location, zoom: number): PyramidTileId;
-
-    /**
-     * Calculates all the PyramidTileId's that are within a LocationRect at a specific zoom level.
-     * @param bounds A LocationRect to search for tiles in.
-     * @param zoom The zoom level to calculate tiles for.
-     * @returns A list of PyramidTileId's that are within the specified LocationRect and zoom level.
-     **/
-    export function getTilesInBounds(bounds: LocationRect, zoom: number): PyramidTileId[];
-
-    /**
-     * Calculates the LocationRect (bounding box) of a PyramidTileId.
-     * @param tile A PyramidTileId to calculate the LocationRect of.
-     * @returns The bounding box of a tile.
-     **/
-    export function tileToLocationRect(tile: PyramidTileId): LocationRect;
-}
-
-
-//////////////////////////////////////////////
-/// Geometry Calculations
-//////////////////////////////////////////////
-
-/**
-* A colleciton of geometry calculations that can be performed against Bing Maps shapes.
-* @requires The Microsoft.Maps.SpatialMath module.
-*/
-declare module Microsoft.Maps.SpatialMath.Geometry {
-
-    /** Defines how the end of a line should be buffered. */
-    export enum BufferEndCap {
-        /** Adds a rounded end to a buffered line. */
-        Round,
-
-        /** Adds a flat end to a buffered line that touches the end of the line. */
-        Flat,
-
-        /** Adds a square end to a buffered line that has a buffer area at the end of the line. */
-        Square
-    }
-
-    /**
-     * Calculates the area of a shape.
-     * @param shape The shape to calculate the area of.
-     * @param areaUnits The unit of measurement to calculate the area in.
-     * @returns The area of a shape in the specified unit of measurement.
-     */
-    export function area(shape: IPrimitive | IPrimitive[], areaUnits?: AreaUnits): number;
-
-    /**
-     * Calculates a bounding box that encloses a set of shapes and/or locations.
-     * @param shapes The shape(s) to calculate the bounding box for.
-     * @returns A location rect that encloses the shapes and/or locations.
-     */
-    export function bounds(shapes: Location | IPrimitive | (Location | IPrimitive)[]): LocationRect;
-
-    /**
-     * Calcuates a shape with an updated boundary that has been inflated/deflated by a speicifed distance.
-     * @param shape The shape to buffer.
-     * @param distance The distance to buffer the shape by.
-     * @param units The distance units to buffer the shape by.
-     * @param endCapType The type of end cap to use for the joints of the buffer, default value is round.
-     * @param options A set of polygon options to apply to the generated shape.
-     * @returns A buffered version of the shape.
-     */
-    export function buffer(shape: Location | IPrimitive | (Location | IPrimitive)[], distance: number, units?: DistanceUnits, endCapType?: BufferEndCap, options?: IPolygonOptions): IPrimitive | IPrimitive[];
-
-    /**
-     * Calculates the center of a shape.
-     * @param shape The shape to calculate the center of.
-     * @returns The center of the specified shape.
-     */
-    export function centroid(shape: IPrimitive | IPrimitive[]): Location;
-
-    /**
-     * Calculates an approximate concave hull that best fits the data.
-     * A concave hull is a shape that represents that a possible concave geometry that encloses all shapes in the specified data set.
-     * If a single unique Location is in the data set, a Pushpin is returned. If only two unique Locations are provided, or if all Locations form a line, a Polyline is returned.
-     * If 3 or more unique Locations are in the data set a Polygon, or array of Polygons will be returned.
-     * @param shapes Shape(s) whose Location(s) or Location(s) are to be used to generate a concave hull.
-     * @param allowMultiPolygons A boolean indicating if the resulting concave hull can be a MultiPolygon. Default: false
-     * @param allowHoles A boolean indicating if the polygons in the resulting concave hull can have holes in them. Default: false
-     * @param options A set of polygon options to apply to the generated shape.
-     * @returns An approximate concave hull that best fits the data.
-     * If a single unique Location is in the data set, a Pushpin is returned. If only two unique Locations are provided, or if all Locations form a line, a Polyline is returned.
-     * If 3 or more unique Locations are in the data set a Polygon, or array of Polygons will be returned.
-     */
-    export function concaveHull(shapes: Location | IPrimitive | (Location | IPrimitive)[], allowMultiPolygons?: boolean, allowHoles?: boolean, options?: IPolygonOptions): IPrimitive | IPrimitive[];
-
-    /**
-     * Given two shapes, determines if the first one contains the second one
-     * (or, the second shape is a subset of the first shape) or not.
-     * @param shapeA The first shape to test against the second.
-     * @param shapeB The second shape to test against the first.
-     * @returns A boolean indicating if the first shape contains the second shape.
-     */
-    export function contains(shapeA: Location | IPrimitive | (Location | IPrimitive)[], shapeB: Location | IPrimitive | (Location | IPrimitive)[]): boolean;
-
-    /**
-     * Calculates a convex hull. A convex hull is a shape that represents that minimum convex geometry that encloses all shapes in the specified data set.
-     * @param shapes Shape(s) whose Location(s) or Location(s) are to be used to generate a convex hull.
-     * @param options A set of polygon options to apply to the generated shape.
-     * @returns An array of locations that form a convex hull that encloses all locations of the shapes provided in an array.
-     */
-    export function convexHull(shapes: Location | IPrimitive | (Location | IPrimitive)[], options?: IPolygonOptions): IPrimitive | IPrimitive[];
-
-    /**
-     * Creates Delaunay Triangles from the Location objects of the provided shapes.
-     * @param shapes Location(s) of shape(s) or Location(s) to generate a Delaunay Triangles from.
-     * @param options A set of polyline or polygon options to apply to the generated shape.
-     * @returns An array of shapes that form the polygon triangles of the delaunay triangles.
-     */
-    export function delaunayTriangles(shapes: Location | IPrimitive | (Location | IPrimitive)[], options?: IPolygonOptions): Polygon[];
-
-    /**
-     * Returns an object that represents area of an initial shape subtracted by the overlapping area of a second shape.
-     * @param shapeA The first shape.
-     * @param shapeB The second shape to subtract from the first.
-     * @returns A set of shapes that represent the area of the first shape that is not overlapped by the second shape.
-     */
-    export function difference(shapeA: IPrimitive | IPrimitive[], shapeB: IPrimitive | IPrimitive[]): IPrimitive | IPrimitive[];
-
-    /**
-     * Calculates the approximate shortest distance between any two shapes.
-     * @param shapeA The first shape to calculate the distance from.
-     * @param shapeB The second shape to calculate the distance to.
-     * @param units Unit of distance measurement. Default: Meters
-     * @param highAccuracy If set to true, uses the more accurate Vincenty algorithm for calcuating distances. Otherwise the faster Haversine formula is used.
-     * @returns The shorested distance between the shapes in the specified units.
-     */
-    export function distance(shapeA: Location | IPrimitive | (Location | IPrimitive)[], shapeB: Location | IPrimitive | (Location | IPrimitive)[], units?: DistanceUnits, highAccuracy?: boolean): number;
-
-    /**
-     * Returns an object that represents the area where two shapes intersect.
-     * @param shapeA The first shape.
-     * @param shapeB The second shape.
-     * @returns A set of shapes that represents the area where two shapes intersect.
-     */
-    export function intersection(shapeA: IPrimitive | IPrimitive[], shapeB: IPrimitive | IPrimitive[]): IPrimitive | IPrimitive[];
-
-    /**
-     * Determines if two shapes intersect or not.
-     * @param shapeA The first shape to test against the second.
-     * @param shapeB The second shape to test against the first.
-     * @returns A boolean indicating if the two shapes intersect.
-     */
-    export function intersects(shapeA: Location | IPrimitive | (Location | IPrimitive)[], shapeB: Location | IPrimitive | (Location | IPrimitive)[]): boolean;
-
-    /**
-     * Tests to see if the shape is valid and meets the requirements of an SQL Geography type and other OGC compliant systems. Polylines & Polygons can't be self intersecting. For Polygons,
-     * coordinates in an exterior rings have a counter-clockwise orientation, while holes have a clockwise orientation.
-     * @param shape The shape to test for validity.
-     * @returns Returns a boolean indicting if the specified shape(s) is valid or not.
-     */
-    export function isValid(shape: IPrimitive | IPrimitive[]): boolean;
-
-    /**
-     * Calculates the distance between all Locations in a shape. If the shape is a polygon, the length of the perimeter of all rings is calculated.
-     * @param shape The shape to calculate the length of.
-     * @param units Unit of distance measurement. Default: Meters
-     * @param highAccuracy If set to true, uses the more accurate Vincenty algorithm for calcuating distances. Otherwise the faster Haversine formula is used.
-     * @returns The distance between all Locations in a polyline or the perimeter of a ploygon on the surface of a earth in the specifed units.
-     */
-    export function calculateLength(shape: IPrimitive | IPrimitive[], units ?: DistanceUnits, highAccuracy ?: boolean): number;
-
-    /**
-     * Takes a shape and returns a copy of it that meets the requirements of an SQL Geography type and other OGC compliant systems. Polylines & Polygons can't be self intersecting. For Polygons,
-     * coordinates in an exterior rings have a counter-clockwise orientation, while holes have a clockwise orientation.
-     * @param shape The shape to make valid.
-     * @returns Valiated version of the provided shape. May be a different shape type than what was provided. i.e. A polygon may be broken up into an array of polygons (MultiPolygon).
-     */
-    export function makeValid(shape: IPrimitive | IPrimitive[]): IPrimitive | IPrimitive[];
-
-    /**
-     * Calculates the nearest Location objects between to shapes that lie on the shapes.
-     * If the shapes do not overlap, this calculates a location on each shape that is closest to the other shape.
-     * If the shapes overlap, a location that is within the intersection area of the shapes will be added twice to an array, once for each shape, and returned.
-     * @param shapeA The first shape.
-     * @param shapeB The second shape.
-     * @returns An array of two Location objects that represent the nearest points between two shapes.
-     * The Location objects are in the same order as the input shapes.
-     * Returns null if nearest points were unable to be computed.
-     */
-    export function nearestLocations(shapeA: Location | IPrimitive | (Location | IPrimitive)[], shapeB: Location | IPrimitive | (Location | IPrimitive)[]): Location[];
-
-    /**
-     * Reduces the resolution of a shape using the Douglas-Peucker algorithm.
-     * @param shape The shape to reduce the resolution of.
-     * @param tolerance A tolerance distance in meters used by the reduction algorithms.
-     * @returns A version of the specified shape that has been reduced.
-     */
-    export function reduce(shape: IPrimitive | IPrimitive[], tolerance: number): IPrimitive | IPrimitive[];
-
-    /**
-     * Rotates a shape around a given Location for the specified angle of rotation. If an origin is not provided, the centroid of the shape is used.
-     * @param shape The shape to be rotated.
-     * @param angle The amount to rotate the shape in degrees.
-     * @param origin The location to rotate the shape around. Defaults to the centroid of the shape.
-     */
-    export function rotate(shape: IPrimitive | IPrimitive[], angle: number, origin?: Location): void;
-
-    /**
-     * Calculates the shortest path that between two shapes and returns a Polyline.
-     * @param shapeA The first shape.
-     * @param shapeB The second shape.
-     * @param options A set of polyline options to apply to the generated polyline.
-     * @returns A polyline that represents the shortest path between two shapes.
-     */
-    export function shortestLineTo(shapeA: Location | IPrimitive | (Location | IPrimitive)[], shapeB: Location | IPrimitive | (Location | IPrimitive)[], options?: IPolylineOptions): Polyline;
-
-    /**
-     * Snaps the locations of one shape that are within the specified tolerance distance away from another shape.
-     * @param locs The locations to snap to the shape.
-     * @param shape The shape to snap the locations to.
-     * @param tolerance A maximum distance (in the specified units) that the snapped location can be from the input location. Default: Infinity
-     * @param toleranceUnits The distance units of the tolerance value. Default: Meters
-     * @returns A snapped location if only one location is provided, otherwise returns an array of snapped locations.
-     */
-    export function snapLocationsToShape(locs: Location | Location[], shape: IPrimitive | IPrimitive[], tolerance?: number, toleranceUnits?: DistanceUnits): Location | Location[];
-
-    /**
-     * Snaps the locations of one shape that are within the specified tolerance distance away from another shape.
-     * @param shapeToSnap The shape to snap the locations of.
-     * @param shape The shape to snap the locations to.
-     * @param tolerance A maximum distance (in the specified units) that the snapped location can be from the input location. Default: Infinity
-     * @param toleranceUnits The distance units of the tolerance value. Default: Meters
-     */
-    export function snapShapeToShape(shapeToSnap: IPrimitive | IPrimitive[], shape: IPrimitive | IPrimitive[], tolerance?: number, toleranceUnits?: DistanceUnits): void;
-
-    /**
-     * Returns an object that represents all points that are either in one shape instance or another, but not those points that lie in both instances.
-     * "Sym" stands for Symmetric. symDifference is an OGC standard name for this calculation used in most spatial math libraries, including SQL.
-     * @param shapeA The first shape.
-     * @param shapeB The second shape.
-     * @returns A shape that represents the symetric difference between two shapes.
-     */
-    export function symDifference(shapeA: IPrimitive | IPrimitive[], shapeB: IPrimitive | IPrimitive[]): IPrimitive | IPrimitive[];
-
-    /**
-     * Returns an object that represents the union of two shapes. If shapes don't overlap, an array of each individual shapes will be returned.
-     * @param shapeA The first shape.
-     * @param shapeB The second shape.
-     * @returns A shape that represents the union of two shapes.
-     */
-    export function union(shapeA: IPrimitive | IPrimitive[], shapeB: IPrimitive | IPrimitive[]): IPrimitive | IPrimitive[];
-
-    /**
-     * Performs a union operation on a set of shapes.
-     * If a shape doesn't overlap with the rest, the returned result will be an array of shapes containing this shape and the union of the rest.
-     * @param shapes An array of shapes to union together.
-     * @returns A shape that represents the union of all specified shapes.
-     */
-    export function unionAggregate(shapes: IPrimitive[]): IPrimitive | IPrimitive[];
-
-    /**
-     * Creates a Voronoi diagram from the Location objects of the provided shapes. The diagram is returned as an array of Polygons.
-     * If a clip region is specified, the diagram will be clipped accordingly.
-     * @param shapes Location(s) of shape(s) or Location(s) to generate a Voronoi diagram.
-     * @param clipRegion A region to clip the voronoi diagram to.
-     * @param options A set of polygon options to apply to the generated shape.
-     * @returns An array of polygons that form a Voronoi diagram.
-     */
-    export function voronoiDiagram(shapes: Location | IPrimitive | (Location | IPrimitive)[], clipRegion?: LocationRect | Polygon, options?: IPolygonOptions): Polygon[];
-}
\ No newline at end of file
diff --git a/types/bingmaps/Traffic.d.ts b/types/bingmaps/Traffic.d.ts
deleted file mode 100644
index 1c78256053..0000000000
--- a/types/bingmaps/Traffic.d.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * Adds a traffic incident and flow data to the map.
- * @requires The Microsoft.Maps.Traffic module.
- */
-declare module Microsoft.Maps.Traffic {
-    /** Options that can be customized in the Traffic manager. */
-    export interface ITrafficOptions {
-        /** Displays the traffic flow layer. */
-        flowVisible?: boolean;
-
-        /** Displays all traffic incidents. */
-        incidentsVisible?: boolean;
-
-        /** Displays the traffic legend. */
-        legendVisible?: boolean;
-
-        /**
-        * Sets the opacity of the traffic flow tile layer. Must be a number between 0 and 1. The default is 1 unless the map
-        * mode is set to lite, in which case the default is set to 0.7.
-        */
-        opacity?: number;
-    }
-
-    /**
-     * The TrafficManager class provides the ability to show traffic flow and incident data on top of the map. When creating an
-     * instance of the TrafficManager class the map must be passed as an argument to the constructor.
-     * @requires The Microsoft.Maps.Traffic module.
-     */
-    export class TrafficManager {
-        /**
-        * @constructor
-        * @requires The Microsoft.Maps.Traffic module.
-        * @param map A map instnce to attach the traffic manager to.
-        */
-        constructor(map: Map);
-
-        /** Hides all traffic data. */
-        public hide(): void;
-
-        /** Hides the traffic flow layer. */
-        public hideFlow(): void;
-
-        /** Hides all traffic incidents. */
-        public hideIncidents(): void;
-
-        /** Hides the traffic legend. */
-        public hideLegend(): void;
-
-        /**
-        * Sets the options for the traffic manager.
-        * @param options The options for the traffic manager.
-        */
-        public setOptions(options: ITrafficOptions): void;
-
-        /** Displays all traffic data. */
-        public show(): void;
-
-        /** Displays the traffic flow layer. */
-        public showFlow(): void;
-
-        /** Displays all traffic incidents. */
-        public showIncidents(): void;
-
-        /** Displays the traffic legend. */
-        public showLegend(): void;
-
-    }
-}
\ No newline at end of file
diff --git a/types/bingmaps/WellKnownText.d.ts b/types/bingmaps/WellKnownText.d.ts
deleted file mode 100644
index 51c42203ce..0000000000
--- a/types/bingmaps/WellKnownText.d.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-declare module Microsoft.Maps {
-    /**
-     * Class responsible for readon/writing geo data in well known text format
-     * @requires The Microsoft.Maps.WellKnownText module.
-     */
-    export module WellKnownText {
-        /**
-         * Reads the data in wellknowntext format and returns the shapes. Multi-Geometry type shapes are returned as an array of shapes.
-         * @param wkt The well known text string that needs to be parsed into shapes.
-         * @param styles Styles to apply to the shapes.
-         * @returns One of more shapes.
-         */
-        export function read(wkt: string, styles?: IStylesOptions): IPrimitive | IPrimitive[];
-
-        /**
-         * Writes the data into wellknowntext format.
-         * @param data The data that needs to be serialized.
-         * @returns Well known text formatted string.
-         */
-        export function write(data: IPrimitive | IPrimitive[]): string;
-    }
-}
\ No newline at end of file
diff --git a/types/bingmaps/bingmaps-tests.ts b/types/bingmaps/bingmaps-tests.ts
deleted file mode 100644
index 962c3047fa..0000000000
--- a/types/bingmaps/bingmaps-tests.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-namespace BingMapsTests {
- 
-    // An interactive set of Bing Maps AJAX control usages can be found at http://www.bingmapsportal.com/isdk/ajaxv7
-    // A full API description can be found at http://msdn.microsoft.com/en-us/library/gg427610.aspx
-    export class TestFixture {
-
-        public createMap(
-            // This key can be acquired at http://www.microsoft.com/maps/create-a-bing-maps-key.aspx
-            bingMapsApiKey: string,
-            // This is the HTML container that the map will be drawn inside of
-            target: HTMLElement,
-            // These positions will be placed as pushpins onto the map
-            mapPositions: Array<Position>,
-            // This will fire if the geolocation fails and will pass the original target (parameter 2)
-            onFailure: (element: HTMLElement) => any) {
-            
-            var self = this;
-            var map: Microsoft.Maps.Map;
-
-            navigator.geolocation.getCurrentPosition((position: Position) => {
-
-                var locations: Array<Microsoft.Maps.Location> = new Array<Microsoft.Maps.Location>();
-                var options: Microsoft.Maps.IMapLoadOptions;
-
-                function loadMap() {
-                    options = {
-                        credentials: bingMapsApiKey,
-                        enableClickableLogo: false,
-                        showDashboard: false,
-                        showScalebar: false,
-                        center: self.toLocation(position),
-                        zoom: 16,
-                        mapTypeId: Microsoft.Maps.MapTypeId.road
-                    };
-
-                    target.innerHTML = "";
-
-                    map = new Microsoft.Maps.Map(target, options);
-
-                    for (var i = 0; i < mapPositions.length; ++i) {
-
-                        var mapPosition: Position = mapPositions[i];
-                        var location: Microsoft.Maps.Location = self.createPushpin(map, mapPosition);
-
-                        locations.push(location);
-                    }
-
-                    // Sets the view of the map to the smallest size that contains all of the
-                    // specified locations (in this case the pusphin locations)
-                    map.setView({ bounds: Microsoft.Maps.LocationRect.fromLocations(locations) });
-                }
-
-                if ((<any>window).Windows != undefined) {
-                    // Running in Win8 app
-                    Microsoft.Maps.loadModule("Microsoft.Maps.Map", { callback: loadMap });
-                } else {
-                    // Running anywhere else
-                    loadMap();
-                }
-            }, () => onFailure(target), { maximumAge: 3000, timeout: 5000, enableHighAccuracy: true });
-
-        }
-
-        // Converts a standard HTML geolocation Position to a Location
-        private toLocation(position: Position): Microsoft.Maps.Location {
-            return new Microsoft.Maps.Location(position.coords.latitude, position.coords.longitude);
-        }
-
-        // Creates a pushpin on a specified map and returns the Location for potentially setting the map view
-        private createPushpin(map: Microsoft.Maps.Map, position: Position): Microsoft.Maps.Location {
-
-            var location: Microsoft.Maps.Location;
-            var pushpin: Microsoft.Maps.Pushpin;
-
-            location = this.toLocation(position);
-            pushpin = new Microsoft.Maps.Pushpin(location, null);
-
-            map.entities.push(pushpin);
-
-            return location;
-        }
-    }
-}
diff --git a/types/bingmaps/index.d.ts b/types/bingmaps/index.d.ts
deleted file mode 100644
index b629e3b903..0000000000
--- a/types/bingmaps/index.d.ts
+++ /dev/null
@@ -1,2850 +0,0 @@
-// Type definitions for Microsoft.Maps 8.0 (Change set e6d7cc4)
-// Project: https://github.com/Microsoft/Bing-Maps-V8-TypeScript-Definitions
-// Definitions by: Ricky Brundritt <https://github.com/rbrundritt>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="Autosuggest.d.ts" />
-/// <reference path="Clustering.d.ts" />
-/// <reference path="Contour.d.ts" />
-/// <reference path="DataBinning.d.ts" />
-/// <reference path="Directions.d.ts" />
-/// <reference path="DrawingTools.d.ts" />
-/// <reference path="GeoJson.d.ts" />
-/// <reference path="HeatMapLayer.d.ts" />
-/// <reference path="Search.d.ts" />
-/// <reference path="SpatialDataService.d.ts" />
-/// <reference path="SpatialMath.d.ts" />
-/// <reference path="Traffic.d.ts" />
-/// <reference path="WellKnownText.d.ts" />
-
-/**
- *  The Bing Maps V8 developer API.
- */
-declare module Microsoft.Maps {
-
-	//////////////////////////////////////////////
-    /// Custom Map Styles
-    //////////////////////////////////////////////
-
-	 /** The styles options that can be applied to map elements. */
-    export interface IMapElementStyle {
-        /**
-        * Hex color used for filling polygons, the background of point icons, and for the center of lines if they have split.
-        */
-        fillColor?: string;
-
-        /**
-        * The hex color of a map label.
-        */
-        labelColor?: string;
-
-        /**
-        * The outline hex color of a map label.
-        */
-        labelOutlineColor?: string;
-
-        /**
-        * Species if a map label type is visible or not.
-        */
-        labelVisible?: boolean;
-
-        /**
-        * Hex color used for the outline around polygons, the outline around point icons, and the color of lines.
-        */
-        strokeColor?: string;
-
-        /**
-        * Specifies if the map element is visible or not.
-        */
-        visible?: boolean;
-    }
-
-    /** The style options that can be appliction to bordered map elements. */
-    export interface IBorderedMapElementStyle extends IMapElementStyle {
-        /**
-        * Secondary/casing line hex color of the border of a filled polygon.
-        */
-        borderOutlineColor?: string;
-
-        /**
-        * Primary line hex color of the border of a filled polygon.
-        */
-        borderStrokeColor?: string;
-
-        /**
-        * Specifies if a border is visible or not.
-        */
-        borderVisible?: boolean;
-    }
-
-    /** Global style settings */
-    export interface ISettingsStyle {
-        /** A hex color value that all land is first flushed to before things are drawn on it. */
-        landColor?: string;
-
-		/** Specifies whether or not to draw elevation shading on the map. */
-		shadedReliefVisible?: boolean;
-    }
-
-    /** Map Elements which can be styled. */
-    export interface IMapElements {
-
-        /** Admin1, state, province, etc. */
-        adminDistrict?: IBorderedMapElementStyle;
-
-        /** Icon representing the capital of a state/province. */
-        adminDistrictCapital?: IMapElementStyle;
-
-        /** Area of land encompassing an airport. */
-        airport?: IMapElementStyle;
-
-        /** Area of land use, not to be confused with Structure */
-        area?: IMapElementStyle;
-
-        /** An arterial road is a high-capacity urban road. Its primary function is to deliver traffic from collector roads to freeways or expressways, and between urban centers efficiently. */
-        arterialRoad?: IMapElementStyle;
-
-        /** A structure such as a house, store, factory. */
-        building?: IMapElementStyle;
-
-        /** Restaurant, hospital, school, etc. */
-        business?: IMapElementStyle;
-
-        /** Icon representing the capital populated place. */
-        capital?: IMapElementStyle;
-
-        /** Area of a cemetery */
-        cemetery?: IMapElementStyle;
-
-        /** Area of a whole continent */
-        continent?: IMapElementStyle;
-
-        /** A controlled-access highway is a type of road which has been designed for high-speed vehicular traffic, with all traffic flow and ingress/egress regulated. Also known as a highway, freeway, motorway, expressway, interstate, parkway. */
-        controlledAccessHighway?: IMapElementStyle;
-
-        /** A country or independent sovereign state. */
-        countryRegion?: IBorderedMapElementStyle;
-
-        /** Icon representing the capital of a country/region. */
-        countryRegionCapital?: IMapElementStyle;
-
-        /** Admin2, county, etc. */
-        district?: IBorderedMapElementStyle;
-
-        /** An area of land used for educational purposes such as a school campus. */
-        education?: IMapElementStyle;
-
-        /** A school or other educational building. */
-        educationBuilding?: IMapElementStyle;
-
-        /** Restaurant, caf�, etc. */
-        foodPoint?: IMapElementStyle;
-
-        /** Area of forest land. */
-        forest?: IMapElementStyle;
-
-        /** An area of land where the game of golf is played. */
-        golfCourse?: IMapElementStyle;
-
-        /** Lines representing ramps typically alongside ControlledAccessHighways */
-        highSpeedRamp?: IMapElementStyle;
-
-        /** A highway. */
-        highway?: IMapElementStyle;
-
-        /** An area of land reserved for Indigenous people. */
-        indigenousPeoplesReserve?: IMapElementStyle;
-
-        /** Labeling of area of an island.  */
-        island?: IMapElementStyle;
-
-        /** Major roads. */
-        majorRoad?: IMapElementStyle;
-
-        /** The base map element in which all other map elements inherit from. */
-        mapElement?: IMapElementStyle;
-
-        /** Area of land used for medical purposes. Generally, hospital campuses. */
-        medical?: IMapElementStyle;
-
-        /** A building which provides medical services. */
-        medicalBuilding?: IMapElementStyle;
-
-		/** A military area. */
-        military?: IMapElementStyle;
-
-        /** A natural point of interest. */
-        naturalPoint?: IMapElementStyle;
-
-        /** Area of land used for nautical purposes. */
-        nautical?: IMapElementStyle;
-
-        /** Area defined as a neighborhood. Labels only. */
-        neighborhood?: IMapElementStyle;
-
-        /** Area of any kind of park. */
-        park?: IMapElementStyle;
-
-        /** Icon representing the peak of a mountain. */
-        peak?: IMapElementStyle;
-
-        /** All point features that are rendered with an icon of some sort */
-        point?: IMapElementStyle;
-
-        /** Restaurant, hospital, school, marina, ski area, etc. */
-        pointOfInterest?: IMapElementStyle;
-
-        /** A political border. */
-        political?: IBorderedMapElementStyle;
-
-        /** Icon representing size of populated place (city, town, etc). */
-        populatedPlace?: IMapElementStyle;
-
-        /** Railway lines */
-        railway?: IMapElementStyle;
-
-        /** Line representing the connecting entrance/exit to a highway. */
-        ramp?: IMapElementStyle;
-
-        /** Area of nature reserve. */
-        reserve?: IMapElementStyle;
-
-        /** River, stream, or other passage. Note that this may be a line or polygon and may connect to non-river water bodies. */
-        river?: IMapElementStyle;
-
-        /** Lines that represent all roads */
-        road?: IMapElementStyle;
-
-        /** Icon representing the exit, typically from a controlled access highway. */
-        roadExit?: IMapElementStyle;
-
-        /** Sign representing a compact name for a road. For example, I-5. */
-        //roadShield?: IMapElementStyle;
-
-        /** Land area covered by a runway. See also Airport for the land area of the whole airport. */
-        runway?: IMapElementStyle;
-
-        /** Area generally used for beaches, but could be used for sandy areas/golf bunkers in the future. */
-        sand?: IMapElementStyle;
-
-        /** A shopping center or mall. */
-        shoppingCenter?: IMapElementStyle;
-
-		/** Area of a stadium. */
-		stadium?: IMapElementStyle;
-
-        /** A street. */
-        street?: IMapElementStyle;
-
-        /** Buildings and other building-like structures */
-        structure?: IMapElementStyle;
-
-        /** A toll road. */
-        tollRoad?: IMapElementStyle;
-
-        /** Walking trail, either through park or hiking trail */
-        trail?: IMapElementStyle;
-
-        /** Icon representing a bus stop, train stop, airport, etc. */
-        transit?: IMapElementStyle;
-
-        /** A transit building. */
-        transitBuilding?: IMapElementStyle;
-
-        /** Lines that are part of the transportation network (roads, trains, ferries, etc) */
-        transportation?: IMapElementStyle;
-
-        /** An unpaved street. */
-        unpavedStreet?: IMapElementStyle;
-
-        /** Forests, grassy areas, etc. */
-        vegetation?: IMapElementStyle;
-
-        /** Icon representing the peak of a volcano. */
-        volcanicPeak?: IMapElementStyle;
-
-        /** Anything that looks like water */
-        water?: IMapElementStyle;
-
-        /** Icon representing a water feature location such as a waterfall. */
-        waterPoint?: IMapElementStyle;
-
-        /** Ferry route lines */
-        waterRoute?: IMapElementStyle;
-    }
-
-    /** Defines a custom map style. */
-    export interface ICustomMapStyle {
-        /** A list of map elements to be styled. */
-        elements?: IMapElements;
-
-        /** Global Settings. */
-        settings?: ISettingsStyle;
-
-        /** The version of the style syntax used. */
-        version: string;
-    }
-
-    //////////////////////////////////////////////
-    /// Enumerations
-    //////////////////////////////////////////////
-
-    /** This enumeration defines how the map labels are displayed. */
-    export enum LabelOverlay {
-        /**
-        * Map labels are hidden. Note that this will have no effect on road maps unless the allowHidingLabelsOfRoad map option
-        * is set to true.
-        */
-        hidden,
-
-        /**  Map labels are visible. */
-        visible
-    }
-
-    /** This enumeration is used to specify the type of map style that should be displayed by the map. */
-    export enum MapTypeId {
-        /** The aerial map type which uses top-down satellite & airplane imagery. */
-        aerial,
-
-        /** High resolution aerial imagery taken at 45 degrees to the ground, from 4 different directions. */
-        birdseye,
-
-        /** A darker version of the road maps. */
-        canvasDark,
-
-        /** A lighter version of the road maps which also has some of the details such as hill shading disabled. */
-        canvasLight,
-
-        /** A grayscale version of the road maps. */
-        grayscale,
-
-        /** Displays a blank canvas that uses the mercator map project. It basically removed the base maps layer. */
-        mercator,
-
-        /** Ordnance survey map type (en-gb only). */
-        ordnanceSurvey,
-
-        /** Road map type. */
-        road,
-
-        /** Provides streetside panoramas from the street level. */
-        streetside
-    }
-
-    /** The NavigationBarMode can be used to customize the layout and style of the navigation bar. */
-    export enum NavigationBarMode {
-        /**
-        * A compact navigation bar that includes a smaller drop down for the map type and zoom buttons. Recommended for small
-        * maps or screen such as a mobile device.
-        */
-        compact,
-
-        /**
-        * The default navigation bar that has a drop down for the map type, a locate me button, and zoom buttons. Recommended for
-        * medium to large maps in desktop browsers.
-        */
-        default,
-
-        /**
-        * A minified navigation bar that has a button to toggle between road and aerial maps, zoom buttons, and a button to turn
-        * traffic information on and off. Recommended for small maps or screen such as a mobile device.
-        */
-        minified
-    }
-
-    /** The NavigationBarOrientation enumeration is used to define how the navigation bar controls are laid out. */
-    export enum NavigationBarOrientation {
-        /** Repositions the buttons in the navigation bar such that they are aligned horizontally. */
-        horizontal,
-
-        /** Repositions the buttons in the navigation bar such that they are aligned vertically. */
-        vertical
-    }
-
-    /** This enumeration is used to specify how the overview map for the streetside map mode should be displayed. */
-    export enum OverviewMapMode {
-        /** Shows the overview map in an expanded state. */
-        expanded,
-
-        /** Hides the overview map. */
-        hidden,
-
-        /** Shows the overview map in a minimized state. */
-        minimized
-    }
-
-    /** Contains enum to show how pixels are defined. */
-    export enum PixelReference {
-        /** The pixel is defined relative to the map control�s root element, where the top left corner of the map control is (0, 0). */
-        control,
-
-        /** The pixel is defined relative to the page, where the top left corner of the HTML page is (0, 0). */
-        page,
-
-        /** The pixel is defined in viewport coordinates, relative to the center of the map, where the center of the map is (0, 0). */
-        viewport
-    }
-
-    //////////////////////////////////////////////
-    /// Interfaces
-    //////////////////////////////////////////////
-
-    /** Represents a structured address object. */
-    export interface IAddress {
-        /**
-        * The street line of an address. The addressLine property is the most precise, official line for an address relative to the postal agency
-        * servicing the area specified by the locality or postalCode properties.
-        */
-        addressLine: string;
-
-        /**
-        * The subdivision name within the country or region for an address. This element is also commonly treated as the first order administrative
-        * subdivision. An example is a US state, such as �Oregon�.
-        */
-        adminDistrict: string;
-
-        /** The country or region name of the address. */
-        countryRegion: string;
-
-        /** A string specifying the two-letter ISO country code. */
-        countryRegionISO2: string;
-
-        /** The second, third, or fourth order subdivision within a country, dependency, or region. An example is a US county, such as �King�. */
-        district: string;
-
-        /** A nicely formatted address string for the result. */
-        formattedAddress: string;
-
-        /** The locality, such as the primary city, that corresponds to an address. An example is �Seattle�. */
-        locality: string;
-
-        /** The post code, postal code, or ZIP code of an address. An example is a US ZIP code, such as �98152�. */
-        postalCode: string;
-    }
-
-    /** The event args for when a layer frame is being loaded in an AnimtedTileLayer. **/
-    export interface IAnimatedFrameEventArgs {
-        /** The animated tile layer that the frame belongs to. **/
-        animatedTileLayer: AnimatedTileLayer;
-
-        /** The index of the frame being loaded. **/
-        index: number;
-    }
-
-    /** An object that defines the options for an AnimatedTileLayer. **/
-    export interface IAnimatedTileLayerOptions {
-        /** A boolean that specifies whether the animation should auto-start when it is added to the map or not. Default: true **/
-        autoPlay?: boolean;
-
-        /** The number of miliseconds between two layer frames. Default: 1000 **/
-        frameRate?: number;
-
-        /** A custom loading screen to show on the map when the map tiles are being fetched. **/
-        loadingScreen?: CustomOverlay;
-
-        /** The max amount of total loading time of all tiles in a viewport in milliseconds. Default: 15000 **/
-        maxTotalLoadTime?: number;
-
-        /** The array of tile layer sources to animate through. **/
-        mercator: TileSource[];
-
-        /** A boolean specifying if the animated tile layer is visible or not. **/
-        visible?: boolean;
-    }
-
-    /** Represents the options that can be used when initializing a custom overlay. **/
-    export interface ICustomOverlayOptions {
-        /**
-        * Specifies if the custom overlay should eb rendered above or below the label layer of the map. When above,
-        * elements in the overlay can be clickable. Default: True
-        */
-        beneathLabels?: boolean;
-    }
-
-    /** Base data layer interface. */
-    export interface IDataLayer extends ILayer {
-        /** Clears all data in the layer. */
-        clear(): void;
-    }
-
-    /** Event args included in entity collection events. */
-    export interface IEntityCollectionChangedEventArgs {
-        /** The entity collection the event was triggered from. */
-        collection: EntityCollection;
-
-        /** The IPrimitive object that the event occurred for. */
-        data: IPrimitive;
-    }
-
-    /** An object the identifies an event that has been attached to an object. */
-    export interface IHandlerId {
-    }
-
-    /** Base layer interface. */
-    export interface ILayer {
-    }
-
-    /**
-     * @deprecated use IMouseEventArgs
-	 * A LayerMouseEventArgs object is returned by many the mouse event handlers attached to a Layer.
-	 */
-    export interface ILayerMouseEventArgs {
-        /**
-		* @deprecated use target
-		* The IPrimitive shape (pushpin, polyline, polygon) that the event occurred on.
-		*/
-        primitive: IPrimitive;
-    }
-
-    /** The options that can be used to customize an infobox. */
-    export interface IInfoboxOptions {
-        /**
-        * @deprecated Use HTML buttons and links in description instead.
-        */
-        actions?: IInfoboxActions[];
-
-        /** The string displayed inside the infobox. */
-        description?: string;
-
-        /**
-        * The HTML that represents the infobox. Note that infobox options are ignored if custom HTML is set. Also, if custom HTML is used to represent the
-        * infobox, the infobox is anchored at the top-left corner.
-        */
-        htmlContent?: string;
-
-        /** The location on the map where the infobox�s anchor is attached. */
-        location?: Location;
-
-        /** The maximium size that the infobox height can expand to based on it�s content. Default: 126 **/
-        maxHeight?: number;
-
-        /** The maximium size that the infobox width can expand to based on it�s content. Default: 256 **/
-        maxWidth?: number;
-
-        /**
-        * The amount the infobox pointer is shifted from the location of the infobox, or if showPointer is false, then it is the amount the info box bottom
-        * left edge is shifted from the location of the infobox. If custom HTML is set, it is the amount the top-left corner of the infobox is shifted from
-        * its location. The default offset value is (0,0), which means there is no offset.
-        */
-        offset?: Point;
-
-        /**
-        * A boolean indicating whether to show the close dialog button on the infobox. The default value is true. By default, the close button is displayed
-        * as an X in the top right corner of the infobox. This property is ignored if custom HTML is used to represent the infobox.
-        */
-        showCloseButton?: boolean;
-
-        /**
-        * A boolean indicating whether to display the infobox with a pointer. The default value is true. In this case the infobox is anchored at the bottom
-        * point of the pointer. If this property is set to false, the infobox is anchored at the bottom left corner. This property is ignored if custom HTML
-        * is used to represent the infobox.
-        */
-        showPointer?: boolean;
-
-        /** The title of the infobox. */
-        title?: string;
-
-        /**
-        * A boolean indicating whether to show or hide the infobox. The default value is true. A value of false indicates that the infobox is hidden,
-        * although it is still an entity on the map.
-        */
-        visible?: boolean;
-
-        /** The z-index of the infobox with respect to other items on the map. */
-        zIndex?: number;
-    }
-
-    /**
-    * @deprecated Use HTML buttons and links in description instead.
-    */
-    export interface IInfoboxActions {
-        /** The text to display for the action. */
-        label: string;
-
-        /** The function to call when the label is clicked.  */
-        eventHandler: (eventArg?: MouseEvent) => void;
-    }
-
-    /** An object that contains information about an infobox event. **/
-    export interface IInfoboxEventArgs {
-        /** The event that occurred. **/
-        eventName: string;
-
-        /** The x-value of the pixel coordinate on the page of the mouse cursor. **/
-        pageX: number;
-
-        /** The y-value of the pixel coordinate on the page of the mouse cursor. **/
-        pageY: number;
-
-        /** The infobox object that fired the event. **/
-        target: Infobox;
-
-        /** The type of the object that fired the event.This will always be 'infobox'. **/
-        targetType: string;
-
-        /** Original mouse event from the browser. */
-        originalEvent?: MouseEvent;
-    }
-
-    /** Map or View options */
-    export interface IMapLoadOptions extends IMapOptions, IViewOptions {
-        /** The Bing Maps Key used to authenticate the application. This property can only be set when using the Map constructor. */
-        credentials: string;
-    }
-
-    /**
-    * An object that can be used to customize the map. Some of the map options can be changed after the map has loaded by using
-    * the setOptions function on the map.
-    */
-    export interface IMapOptions {
-
-        /**
-        * A boolean that, when set to true, allows the road labels to be hidden. Default: false
-        * This property can only be set when using the Map constructor. This property can only be set when using the Map constructor.
-        */
-        allowHidingLabelsOfRoad?: boolean;
-
-        /** A boolean indicating if the infobox is allowed to overflow outside the bounds of the map. Default: false. */
-        allowInfoboxOverflow?: boolean;
-
-        /** The color to use for the map control background. The default color is #EAE8E1. This property can only be set when using the Map constructor. */
-        backgroundColor?: string | Color;
-
-        /** Custom map styles used to modify the look and feel of the base map. */
-        customMapStyle?: ICustomMapStyle;
-
-        /** A boolean value indicating whether to disable the user�s ability to control the using the keyboard. Default: false */
-        disableKeyboardInput?: boolean;
-
-        /** A boolean value indicating if mousing over the map type selector should open it or not. Default: true */
-        disableMapTypeSelectorMouseOver?: boolean;
-
-        /** A boolean value indicating whether to disable the user's ability to pan the map. Default: false */
-        disablePanning?: boolean;
-
-        /**
-        * Scrolling the mouse wheel over the map will zoom it in or out, but will not scroll the page.
-        * Setting this property to true disables the zooming of the map and instead reverts back to scrolling the page instea.
-        * Default: false
-        */
-        disableScrollWheelZoom?: boolean;
-
-        /**
-        * A boolean indicating whether to disable streetside mode.If this property is set to true, streetside will be removed from
-        * the navigation bar, and the automatic coverage overlay will be disabled when zoomed in at lower zoom levels. Default false
-        * This property can only be set when using the Map constructor.
-        */
-        disableStreetside?: boolean;
-
-        /**
-        * A boolean indicating whether to disable the automatic streetside coverage layer that appears when zoomed in at lower zoom
-        * levels. Default false
-        * This property can only be set when using the Map constructor.
-        **/
-        disableStreetsideAutoCoverage?: boolean;
-
-        /** A boolean value indicating whether to disable the user's ability to zoom in or out. Default: false */
-        disableZooming?: boolean;
-
-        /**
-        * A boolean value indicating whether the Bing(TM) logo on the map is clickable. Default: true.
-        * This property can only be set when using the Map constructor.
-        */
-        enableClickableLogo?: boolean;
-
-        /**
-        * A boolean value indicating whether to use the inertia animation effect during map navigation. Default: true
-        * This property can only be set when using the Map constructor.
-        */
-        enableInertia?: boolean;
-
-        /**
-        * A boolean that indicates if the map should be rendered using lite mode. When set to true vector map labels are
-        * disabled and map labels are rendered directly into the map tiles. This offers improved performance, but will result
-        * in the labels being rendered behind data on the map and the labels will also not use collision dection with pushpins.
-        * If this property is not set, the map set this value based on the target device and browser as vector labels perform
-        * better in some scenrarios than others.
-        * This property can only be set when using the Map constructor.
-        */
-        liteMode?: boolean;
-
-        /** A bounding area that restricts the map view. */
-        maxBounds?: LocationRect;
-
-        /** The maximum zoom level that the map can be zoomed into. */
-        maxZoom?: number;
-
-        /** The minimum zoom level that the map cab be zoomed out to. */
-        minZoom?: number;
-
-        /** Specifies how the navigation bar should be rendered on the map. */
-        navigationBarMode?: NavigationBarMode;
-
-        /** A boolean whether what orientation should be used when laying out the navigation controls. */
-        navigationBarOrientation?: NavigationBarOrientation;
-
-        /**
-        * A boolean value indicating whether to display the �breadcrumb control�. The breadcrumb control shows the current center location�s geography hierarchy.
-        * The default value is false. Requires the showLocateMeButton map option to be set to true. The breadcrumb control displays best when the width of the map
-        * is at least 400 pixels.
-        */
-        showBreadcrumb?: boolean;
-
-        /**
-        * A boolean value indicating whether to show the map navigation control. Default: true�This property can only be set when using the Map constructor.
-        */
-        showDashboard?: boolean;
-
-        /**
-        * A boolean value indicating whether to show a button that centers the map over the user's location in the map navigation control. Default: true
-        * This property can only be set when using the Map constructor.
-        */
-        showLocateMeButton?: boolean;
-
-        /**
-        * A boolean value indicating whether or not to show the map Bing logo. The default value is true.
-        * This property can only be set when using the Map constructor.
-        */
-        showLogo?: boolean;
-
-        /**
-        * A boolean value indicating whether to show the map type selector in the map navigation control. Default: true
-        * This property can only be set when using the Map constructor.
-        */
-        showMapTypeSelector?: boolean;
-
-        /**
-        * A boolean value indicating whether to show the scale bar. Default: true
-        * This property can only be set when using the Map constructor.
-        */
-        showScalebar?: boolean;
-
-        /** When using the minified navigation bar, a traffic button is displayed. Setting this option to false will hide this button. */
-        showTrafficButton?: boolean;
-
-        /**
-        * A boolean value indicating whether to show a link to the End User Terms of Use, which appears to the right of the copyrights, or not. Default: true
-        * This property can only be set when using the Map constructor.
-        */
-        showTermsLink?: boolean;
-
-        /**
-        * A boolean value indicating whether to show the zoom buttons in the map navigation control. Default: true
-        * This property can only be set when using the Map constructor.
-        */
-        showZoomButtons?: boolean;
-
-        /** A set of properties for the streetside mode of the map. */
-        streetsideOptions?: IStreetsideOptions;
-
-        /** Additional support map types that should be added to the navigaiton bar such as canvasDark, canvasLight, and grayscale.*/
-        supportedMapTypes?: MapTypeId[];
-    }
-
-    /** A MapTypeChangeEventArgs object is returned by the map when using the mapTypeChanged event. */
-    export interface IMapTypeChangeEventArgs {
-        /** The map type that map has changed to. */
-        newMapTypeId: MapTypeId;
-
-        /** The map type that the map has changed from. */
-        oldMapTypeId: MapTypeId;
-
-        /** The map instance the event occured on */
-        target: Map;
-
-        /** The type of object the event was attached to. Should always be "map" */
-        targetType: string;
-    }
-
-    /** Interface for module options. */
-    export interface IModuleOptions {
-        /** A callback function that is fired after the module has loaded. */
-        callback?: () => void;
-
-        /** A function that is called if there is an error loading the module. */
-        errorCallback?: () => void;
-
-        /** A Bing Maps key that is used with the module when the module is loaded without a map. */
-        credentials?: string;
-    }
-
-    /** A MouseEventArgs object is returned by many the mouse event handlers. */
-    export interface IMouseEventArgs extends ILayerMouseEventArgs {
-        /** The event that occurred. */
-        eventName: string;
-
-        /** A boolean indicating if the primary button, such as the left mouse button or a tap on a touch screen, was used during a mouse down or up event. */
-        isPrimary: boolean;
-
-        /** A boolean indicating if the secondary mouse button, such as the right mouse button, was used during a mouse down or up event. */
-        isSecondary: boolean;
-
-        /** If the target is a shape, this will be the layer that the shape is in. */
-        layer: Layer;
-
-        /** The map location of where the event occurred. */
-        location: Location;
-
-        /** The x-value of the pixel coordinate on the page of the mouse cursor. */
-        pageX: number;
-
-        /** The y-value of the pixel coordinate on the page of the mouse cursor. */
-        pageY: number;
-
-        /** The pixel coordinate of the mouse cusrsor relative to the top left corner of the map div. */
-        point: Point;
-
-        /** The object that triggered the event. */
-        target: Map | IPrimitive;
-
-        /** The type of the object that the event is attached to. Valid values include the following: �map�, 'layer', �polygon�, �polyline�, or �pushpin� */
-        targetType: string;
-
-        /**
-        * Returns the x-value of the pixel coordinate, relative to the map, of the mouse.
-        * @returns The x-value of the pixel coordinate, relative to the map, of the mouse.
-        */
-        getX(): number;
-
-        /**
-        * Returns the y-value of the pixel coordinate, relative to the map, of the mouse.
-        * @returns The y-value of the pixel coordinate, relative to the map, of the mouse.
-        */
-        getY(): number;
-    }
-
-    /**
-     * An object tthat contains information about a streetside scene.
-     */
-    export interface IPanoramaInfo {
-        /** The capture date of the streetside scene. */
-        cd?: string;
-    }
-
-    /**
-    * All shapes; Pushpins, Polylines and Polygons, derive from the IPrimitive interface. This means that they can be
-    * passed into any function that takes in an IPrimitive object. Also, any function that returns an IPrimitive is capable
-    * of returning any of these shapes.
-    */
-    export interface IPrimitive {
-        /** Optional property to store any additional metadata for this primitive. */
-        metadata?: any;
-
-        /**
-         * Gets the css cursor value when the primitive has events on it.
-         * @returns css cursor string when primitive has events on it.
-         */
-        getCursor(): string;
-
-        /**
-         * Gets whether the primitive is visible.
-         * @returns A boolean indicating whether the primitive is visible or not.
-         */
-        getVisible(): boolean;
-
-        /**
-        * Sets the options for customizing the IPrimitive.
-        * @param options The options for customizing the IPrimitive.
-        */
-        setOptions(options: IPrimitiveOptions): void;
-    }
-
-    /**  A IPrimitiveChangedEventArgs object is returned by the changed event on IPrimitive shapes. */
-    export interface IPrimitiveChangedEventArgs {
-        /** The IPrimitive shape the event occured on. */
-        sender: IPrimitive;
-
-        /** The name of the change that occured; 'locations' or 'options'. */
-        name: string;
-    }
-
-    /** Options used for customizing IPrimitive objects. */
-    export interface IPrimitiveOptions {
-        /** The css cursor to show when the IPrimitive has mouse events on it. Default value is pointer (hand). */
-        cursor?: string;
-
-        /** Boolean indicating whether the IPrimitive is visible. */
-        visible?: boolean;
-    }
-
-    /** Options used for customizing Polylines. */
-    export interface IPolylineOptions extends IPrimitiveOptions {
-        /** Indicates if drawn shape should be generalized based on the zoom level to improve rendering performance. Default true **/
-        generalizable?: boolean;
-
-        /** CSS string or Color object as the poly's color. */
-        strokeColor?: string | Color;
-
-        /** An array of numbers separated by spaces, or a string separated by spaces/commas specifying the repetitive stroke pattern. */
-        strokeDashArray?: number[] | string;
-
-        /** The thickness of the poly stroke. */
-        strokeThickness?: number;
-    }
-
-    /** Options used for customizing Polygons. */
-    export interface IPolygonOptions extends IPolylineOptions {
-        /** CSS string or Color object as the polygon's filling color. */
-        fillColor?: string | Color;
-    }
-
-    /** Options used for customizing Pushpins. */
-    export interface IPushpinOptions extends IPrimitiveOptions {
-        /** The point on the pushpin icon, in pixels, which is anchored to the pushpin location. An anchor of (0,0) is the top left corner of the icon. */
-        anchor?: Point;
-
-        /** Specifies what color to make the default pushpin. */
-        color?: string | Color;
-
-        /** A boolean indicating whether the pushpin can be dragged to a new position with the mouse or by touch. */
-        draggable?: boolean;
-
-        /** Specifies whether to enable the clicked style on the pushpin. */
-        enableClickedStyle?: boolean;
-
-        /** Specifies whether to enable the hover style on the pushpin. */
-        enableHoverStyle?: boolean;
-
-        /**
-        * Defines the the icon to use for the pushpin.This can be a URL to an Image or SVG file, an image data URI, or an inline SVG string.
-        * Tip: When using inline SVG, you can pass in placeholders `{color}` and `{text}` in your SVG string. This placeholder will be replaced by the pushpins color or text property value when rendered.
-        */
-        icon?: string;
-
-        /** Whether the clickable area of pushpin should be an ellipse instead of a rectangle. */
-        roundClickableArea?: boolean;
-
-        /**
-        * A secondary title label value to display under the pushpin. Uses label collision detection. This label automatically changes color between white
-        * and dark grey depending on which map style is selected. Requires the title label to be set.
-        */
-        subTitle?: string;
-
-        /**
-        * The title label value to display under the pushpin. This label automatically changes color between white and dark grey depending on which map
-        * style is selected. Pushpin Titles support label collision detection, as described below.
-        */
-        title?: string;
-
-        /** A short string of text that is overlaid on top of the pushpin. */
-        text?: string;
-
-        /** The amount the text is shifted from the pushpin icon. The default value is (0,5). */
-        textOffset?: Point;
-    }
-
-    /** An object that represents a min and max value range. */
-    export interface IRange {
-        /** The minimum value. */
-        min: number;
-
-        /** The maximum value. */
-        max: number;
-    }
-
-    /** The options that can be used to customize how the streetside map mode is displayed to the user. */
-    export interface IStreetsideOptions {
-        /** A boolean indicating if the ability to navigate between image bubbles should be disabled in streetside map mode. Default: false */
-        disablePanoramaNavigation?: boolean;
-
-        /** The location that the streetside panorama should be looking towards. This can be used instead of a heading. */
-        locationToLookAt?: Location;
-
-        /** A callback function that is triggered after the streetside view has not loaded successfully. */
-        onErrorLoading?: () => void;
-
-        /** A callback function that is triggered after the streetside view has loaded successfully. */
-        onSuccessLoading?: () => void;
-
-        /**
-        * Specifies how to render the overview map when in streetside mode.
-        * Default: Microsoft.Maps.OverviewMapMode.expanded
-        */
-        overviewMapMode?: OverviewMapMode;
-
-        /**
-        * Information for a streetside panorama scene to load.
-        */
-        panoramaInfo?: IPanoramaInfo;
-
-        /** The radius to search in for available streetside panoramas. */
-        panoramaLookupRadius?: number;
-
-        /** A boolean indicating if the current address being viewed should be hidden when in streetside map mode. Default: true */
-        showCurrentAddress?: boolean;
-
-        /** A boolean indicating if the exit button should be hidden when in streetside map mode. Default: true */
-        showExitButton?: boolean;
-
-        /** A boolean indicating if the heading compass button is hidden when in streetside map mode. Default: true */
-        showHeadingCompass?: boolean;
-
-        /** A boolean indicating if the link to report a problem with a streetside image is hidden when in streetside map mode. Default: true */
-        showProblemReporting?: boolean;
-
-        /** A boolean indicating if the zoom buttons should be displayed when in streetside map mode. Default: true */
-        showZoomButtons?: boolean;
-    }
-
-    /** Defines a set of styles for pushpins, polylines, and polygons. */
-    export interface IStylesOptions {
-        /** Sets the options for all pushpins. */
-        pushpinOptions?: IPushpinOptions;
-
-        /** Sets the options for all polylines. */
-        polylineOptions?: IPolylineOptions;
-
-        /** Sets the options for all polygons. */
-        polygonOptions?: IPolygonOptions;
-    }
-
-    /** Interface to specify style css while registering a module */
-    export interface IStyleUrl {
-        /** List of style css urls o be downloaded */
-        styleURLs: string[];
-    }
-
-    /** Represents options that can be used to customize a tile layer. */
-    export interface ITileLayerOptions {
-
-        /**
-        * The number of milliseconds allowed for the tile layer image download. If the timeout occurs before the image is fully
-        * downloaded, the map control considers the download a failure. The default value is 10000.
-        */
-        downloadTimeout?: number;
-
-        /** The tile source for the tile layer. */
-        mercator: TileSource;
-
-        /** The opacity of the tile layer, defined by a number between 0 (not visible) and 1. */
-        opacity?: number;
-
-        /**
-        * A boolean indicating whether to show or hide the tile layer. The default value is true. A value of false indicates that
-        * the tile layer is hidden, although it is still an entity on the map.
-        */
-        visible?: boolean;
-
-        /** The z-index of the tile layer. */
-        zIndex?: number;
-    }
-
-    /** Represents options that can be used to define a tile source. */
-    export interface ITileSourceOptions {
-        /**
-        * A bounding box that specifies where tiles are available.
-        * Note: This will not crop tiles to the specific bounding box, it limits the tiles it loads to those that intersect this bounding box.
-        */
-        bounds?: LocationRect;
-
-        /** The maximum zoom level tiles that tiles should be rendered at. */
-        maxZoom?: number;
-
-        /** The minimum zoom level tiles that tiles should be rendered at. */
-        minZoom?: number;
-
-        /**
-        * Required. This can be a string or a callback function that constructs the URLs used to retrieve tiles from the tile source.
-        * When using a string, the uriConstructor will allow you to specify placeholders that will be replaced with the tiles value (i.e. {quadkey}).
-        * See the Tile URL Parameters section for a list of supported parameters.
-        * Besides using formatted tile URLs, you can also specify a callback function as the uriConstructor. This is useful if you need to be able to
-        * build custom tile URL�s that may require some additional calculations for a tile.
-        */
-        uriConstructor: string | ((tile: PyramidTileId) => string);
-    }
-
-    /** Represents options that can be used to set the view of the map. */
-    export interface IViewOptions {
-        /** The bounding rectangle of the map view. If both bounds and center are specified, bounds takes precedence over center. */
-        bounds?: LocationRect;
-
-        /** The location of the center of the map view. If both bounds and center are specified, bounds takes precedence over center. */
-        center?: Location;
-
-        /**
-        * The directional heading of the map. The heading is represented in geometric degrees with 0 or 360 = North, 90 = East,
-        * 180 = South, and 270 = West.
-        */
-        heading?: number;
-
-        /** Indicates how the map labels are displayed. */
-        labelOverlay?: LabelOverlay;
-
-        /** The map type of the view. */
-        mapTypeId?: MapTypeId;
-
-        /** The amount of padding in pixels to be added to each side of the bounds of the map view. */
-        padding?: number;
-
-        /** The angle relative to the horizon to tilt a streetside panorama image. */
-        pitch?: number;
-
-        /** The zoom level of the map view. */
-        zoom?: number;
-    }
-
-    //////////////////////////////////////////////
-    /// Modular Framework
-    //////////////////////////////////////////////
-
-    /**
-     * Loads the specified registered module, making its functionality available. You can provide the name of a single module or an array of names in.
-     * Options or a callback function that is called when the module is loaded can be specified.
-     * @param moduleName Name of the module to load. Can be the name of a custom module or a built in module name. Built in modules:
-     * Microsoft.Maps.Autosuggest, Microsoft.Maps.Clustering, Microsoft.Maps.Directions, Microsoft.Maps.DrawingTools, Microsoft.Maps.GeoJSON,
-     * Microsoft.Maps.HeatMap, Microsoft.Maps.Search, Microsoft.Maps.SpatialDataService, Microsoft.Maps.SpatialMath, Microsoft.Maps.Traffic,
-     * Microsoft.Maps.WellKnownText
-     * @param options A callback function or options containing additional information and a callback to call once a module is loaded
-     */
-    export function loadModule(moduleName: string | string[], options?: (() => void) | IModuleOptions): void;
-
-    /**
-     * Registers a module with the map control. The name of the module is specified in moduleKey, the module script is defined in scriptURL, and the
-     * options provides the location of a *.css file to load with the module.
-     * @param moduleName Name of the module to load.
-     * @param url Url to where the module code is located.
-     * @param styles List of css files to download.
-     */
-    export function registerModule(moduleName: string, url: string, styles?: IStyleUrl): void;
-
-    /**
-     * Signals that the specified module has been loaded and if specified, calls the callback function in loadModule. Call this method at the end of your custom module script.
-     * @param moduleName Name of the module that is loaded.
-     */
-    export function moduleLoaded(moduleName: string): void;
-
-    //////////////////////////////////////////////
-    /// Classes
-    //////////////////////////////////////////////
-
-    /**
-     * Provides a layer which can smoothly animate through an array of tile layer sources.
-     */
-    export class AnimatedTileLayer {
-        /**
-         * @contstructor
-         * @param options Options that define how to animate between the specified tile layers.
-         */
-        constructor(options?: IAnimatedTileLayerOptions);
-
-        /**
-        * Gets the frame rate of this animated tile layer.
-        * @returns The frame rate of this animated tile layer.
-        **/
-        public getFrameRate(): number;
-
-        /**
-        * Gets the loading screen overlay when tiles are being fetched.
-        * @returns The loading screen overlay when tiles are being fetched.
-        **/
-        public getLoadingScreen(): CustomOverlay;
-
-        /**
-        * Gets the maximum total tile fetching time of this animated tile layer.
-        * @returns The maximum total tile fetching time of this animated tile layer
-        **/
-        public getMaxTotalLoadTime(): number;
-
-        /**
-        * Gets the tile sources associated with this layer.
-        * @returns The tile sources associated with this layer.
-        **/
-        public getTileSources(): TileSource[];
-
-        /**
-        * Gets the visibility of this animated tile layer.
-        * @returns The visibility of this animated tile layer.
-        **/
-        public getVisible(): boolean;
-
-        /** Pause the tile layer animation. **/
-        public pause(): void;
-
-        /** Play the animation either from start or where it was paused. **/
-        public play(): void;
-
-        /**
-        * Sets the options for the animated tile layer.
-        * @params Options that define how to animate between the specified tile layers.
-        **/
-        public setOptions(options: IAnimatedTileLayerOptions): void;
-
-        /** Stop the layer animation, hide layer, and reset frame to the beginning. **/
-        public stop(): void;
-    }
-
-    /** Class that represents a color */
-    export class Color {
-        /** The opacity of the color. The range of valid values are an interger between 0 and 255, or a decimal between 0 and 1. */
-        public a: number;
-
-        /** The red value of the color. The range of valid values is 0 to 255 */
-        public r: number;
-
-        /** The green value of the color. The range of valid values is 0 to 255 */
-        public g: number;
-
-        /** The blue value of the color. The range of valid values is 0 to 255 */
-        public b: number;
-
-        /**
-         * @constructor
-         * @param a The alpha value in argb format
-         * @param r The r value in argb format
-         * @param g The g value in argb format
-         * @param b The b value in argb format
-         */
-        constructor(a: number, r: number, g: number, b: number);
-
-        /**
-         * Clones the color.
-         * @param color The color class that needs to be clones.
-         * @returns The colne of the color.
-         */
-        public static clone(color: Color): Color;
-
-        /**
-         * Creates the color from a hex string.
-         * @param hex The color represented as '#rrggbb' format.
-         * @returns The color object.
-         */
-        public static fromHex(hex: string): Color;
-
-        /**
-         * Clones the color.
-         * @returns The clone of the color.
-         */
-        public clone(): Color;
-
-        /**
-         * Gets the opacity of this color.
-         * @returns The opacity between 0 and 1 of this color.
-         */
-        public getOpacity(): number;
-
-        /**
-         * Converts the color to hex notation.
-         * @returns The hex notation as '#rrggbb' (ignores a).
-         */
-        public toHex(): string;
-
-        /**
-         * Converts the color to rgba notation.
-         * @returns The rgba notation as rgba(rr, gg, bb, aa)
-         */
-        public toRgba(): string;
-    }
-
-    /**
-     * You can use this class to create custom overlays on top of the map. These can be static overlays such as custom
-     * navigation bars, or dynamic overlays such as custom visualization layers. CustomOverlays can be added to the map
-     * just like any other layer using the map.layers property.
-     */
-    export class CustomOverlay implements ILayer {
-        /** A reference the the map instance that the overlay was added to. This will be null until the onLoad function has fired. **/
-        _map: Map;
-
-        /**
-         * @constructor
-         * @param options The options to use when initializing the custom overlay.
-         */
-        constructor(options?: ICustomOverlayOptions);
-
-        /**
-         * Gets the html element of this custom overlay.
-         * @returns The htmlElement of this overlay.
-         */
-        public getHtmlElement(): HTMLElement;
-
-        /**
-         * Gets the map that this overlay is attached to.
-         * @returns The map that this overlay is attached to.
-         */
-        public getMap(): Map;
-
-        /**
-         * Updates the html element of this custom overlay.
-         * @param htmlElement The new htmlElement to set for the overlay.
-         */
-        public setHtmlElement(htmlElement: HTMLElement): void;
-
-        /**
-         * Implement this method to perform any task that should be done when the overlay is added to the map.
-         */
-        public onAdd(): void;
-
-        /**
-         * Implement this methof to perform any task that should be done after the overlay has been added to the map.
-         */
-        public onRemove(): void;
-
-        /**
-         * Implement this method to perform any tasks that should be done when the overlay is removed from the map.
-         */
-        public onLoad(): void;
-    }
-
-    /**
-     * Use the Layer class.
-     * @deprecated in V8
-     */
-    export class EntityCollection extends Layer {
-        /**
-         * @constructor Deprecated. Use the Layer class.
-         * @deprecated in V8
-         */
-        constructor();
-
-        /**
-         * Removes all shapes from the collection.
-         */
-        public clear(): void;
-
-        /**
-         * Gets the item at a specified index.
-         * @param index Index of the item to get.
-         * @returns The item at a specified index.
-         */
-        public get(index: number): IPrimitive;
-
-        /**
-         * Gets the number of items in this collection.
-         * @returns The count of the items.
-         */
-        public getLength(): number;
-
-        /**
-         * Gets the index of the item in the list.
-         * @param primitive The item to get the index of.
-         * @returns The index of the item in the list.
-         */
-        public indexOf(primitive: IPrimitive): number;
-
-        /**
-        * Inserts the item into the list at a specific index.
-        * @param primitive The item to insert.
-        * @param index Index of the item to be inserted.
-        */
-        public insert(primitive: IPrimitive, index: number): void;
-
-        /**
-         * Returns the last element in the list after removing it.
-         * @returns The last element in the list after removing it.
-         */
-        public pop(): IPrimitive;
-
-        /**
-         * Adds the item to the end of the list.
-         * @param primitive Item to be added.
-         */
-        public push(primitive: IPrimitive | IPrimitive[]): void;
-
-        /**
-         * Removes the item from the list.
-         * @param primitive Item to be removed.
-         * @returns The item to be removed.
-         */
-        public remove(primitive: IPrimitive): IPrimitive;
-
-        /**
-         * Removes the item from the list at a specified index.
-         * @param index Index of the item that needs to be removed.
-         * @returns The item to be removed at a specified index.
-         */
-        public removeAt(index: number): IPrimitive;
-    }
-
-    /** A static class that manages events within the map SDK. */
-    export module Events {
-        /////////////////////////////////////
-        /// addHandler Definitions
-        ////////////////////////////////////
-
-        /**
-         * Attaches the handler for the event that is thrown by the target. Use the return object to remove the handler using the removeHandler method.
-         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-         * @param eventName The type of event to attach. Supported events:
-         * click, dblclick, maptypechanged, mousedown, mousemove, mouseout, mouseover, mouseup, mousewheel, rightclick, viewchange, viewchangeend, viewchangestart
-         * @param handler The callback function to handle the event when triggered.
-         * @returns The handler id.
-         */
-        export function addHandler(target: Map, eventName: string, handler: (eventArg?: IMouseEventArgs | IMapTypeChangeEventArgs) => void): IHandlerId;
-
-        /**
-         * Attaches the handler for the event that is thrown by the target. Use the return object to remove the handler using the removeHandler method.
-         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-         * @param eventName The type of event to attach. Supported Events:
-         * changed, click, dblclick, drag, dragend, dragstart, mousedown, mouseout, mouseover, mouseup
-         * @param handler The callback function to handle the event when triggered.
-         * @returns The handler id.
-         */
-        export function addHandler(target: Pushpin, eventName: string, handler: (eventArg?: IMouseEventArgs | IPrimitiveChangedEventArgs) => void): IHandlerId;
-
-        /**
-        * Attaches the handler for the event that is thrown by the target. Use the return object to remove the handler using the removeHandler method.
-        * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-        * @param eventName The type of event to attach. Supported Events:
-        * changed, click, dblclick, mousedown, mouseout, mouseover, mouseup
-        * @param handler The callback function to handle the event when triggered.
-        * @returns The handler id.
-        */
-        export function addHandler(target: Polyline | Polygon, eventName: string, handler: (eventArg?: IMouseEventArgs | IPrimitiveChangedEventArgs) => void): IHandlerId;
-
-        /**
-         * Attaches the handler for the event that is thrown by the target. Use the return object to remove the handler using the removeHandler method.
-         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-         * @param eventName The type of event to attach. Supported Events:
-         * click, infoboxChanged, mouseenter, mouseleave
-         * @param handler The callback function to handle the event when triggered.
-         * @returns The handler id.
-         */
-        export function addHandler(target: Infobox, eventName: string, handler: (eventArg?: IInfoboxEventArgs) => void): IHandlerId;
-
-        /**
-         * Attaches the handler for the event that is thrown by the target. Use the return object to remove the handler using the removeHandler method.
-         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-         * @param eventName The type of event to attach. Supported Events:
-         * click, dblclick, mousedown, mouseout, mouseover, mouseup, rightclick
-         * @param handler The callback function to handle the event when triggered.
-         * @returns The handler id.
-         */
-        export function addHandler(target: Layer, eventName: string, handler: (eventArg?: IMouseEventArgs) => void): IHandlerId;
-
-        /**
-        * Attaches the handler for the event that is thrown by the target. Use the return object to remove the handler using the removeHandler method.
-        * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-        * @param eventName The type of event to attach. Supported Events:
-        * � entityadded
-        * � entityremoved
-        * @param handler The callback function to handle the event when triggered.
-        * @returns The handler id.
-        */
-        export function addHandler(target: EntityCollection, eventName: string, handler: (eventArg?: IEntityCollectionChangedEventArgs) => void): IHandlerId;
-
-        /**
-         * Attaches the handler for the event that is thrown by the target. Use the return object to remove the handler using the removeHandler method.
-         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-         * @param eventName The type of event to attach.
-         * @param handler The callback function to handle the event when triggered.
-         * @returns The handler id.
-         */
-        export function addHandler(target: any, eventName: string, handler: (eventArg?: any) => void): IHandlerId;
-
-        /////////////////////////////////////
-        /// addOne Definitions
-        ////////////////////////////////////
-
-        /**
-         * Attaches the handler for the event that is thrown by the target, but only triggers the handler the first once after being attached.
-         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-         * @param eventName The type of event to attach. Supported events:
-         * click, dblclick, maptypechanged, mousedown, mousemove, mouseout, mouseover, mouseup, mousewheel, rightclick, viewchange, viewchangeend, viewchangestart
-         * @param handler The callback function to handle the event when triggered.
-         */
-        export function addOne(target: Map, eventName: string, handler: (eventArg?: IMouseEventArgs | IMapTypeChangeEventArgs) => void): void;
-
-        /**
-         * Attaches the handler for the event that is thrown by the target, but only triggers the handler the first once after being attached.
-         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-         * @param eventName The type of event to attach. Supported Events:
-         * changed, click, dblclick, drag, dragend, dragstart, mousedown, mouseout, mouseover, mouseup
-         * @param handler The callback function to handle the event when triggered.
-         */
-        export function addOne(target: Pushpin, eventName: string, handler: (eventArg?: IMouseEventArgs | IPrimitiveChangedEventArgs) => void): void;
-
-        /**
-         * Attaches the handler for the event that is thrown by the target, but only triggers the handler the first once after being attached.
-         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-         * @param eventName The type of event to attach. Supported Events:
-         * changed, click, dblclick, mousedown, mouseout, mouseover, mouseup
-         * @param handler The callback function to handle the event when triggered.
-         */
-        export function addOne(target: Polyline | Polygon, eventName: string, handler: (eventArg?: IMouseEventArgs | IPrimitiveChangedEventArgs) => void): void;
-
-        /**
-         * Attaches the handler for the event that is thrown by the target, but only triggers the handler the first once after being attached.
-         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-         * @param eventName The type of event to attach. Supported Events:
-         * click, infoboxChanged, mouseenter, mouseleave
-         * @param handler The callback function to handle the event when triggered.
-         */
-        export function addOne(target: Infobox, eventName: string, handler: (eventArg?: IInfoboxEventArgs) => void): void;
-
-        /**
-         * Attaches the handler for the event that is thrown by the target, but only triggers the handler the first once after being attached.
-         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-         * @param eventName The type of event to attach. Supported Events:
-         * click, dblclick, mousedown, mouseout, mouseover, mouseup, rightclick
-         * @param handler The callback function to handle the event when triggered.
-         */
-        export function addOne(target: Layer, eventName: string, handler: (eventArg?: IMouseEventArgs) => void): void;
-
-        /**
-         * Attaches the handler for the event that is thrown by the target, but only triggers the handler the first once after being attached.
-         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-         * @param eventName The type of event to attach. Supported Events:
-         * � entityadded
-         * � entityremoved
-         * @param handler The callback function to handle the event when triggered.
-         */
-        export function addOne(target: EntityCollection, eventName: string, handler: (eventArg?: IEntityCollectionChangedEventArgs) => void): void;
-
-        /**
-         * Attaches the handler for the event that is thrown by the target, but only triggers the handler the first once after being attached.
-         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-         * @param eventName The type of event to attach.
-         * @param handler The callback function to handle the event when triggered.
-         */
-        export function addOne(target: any, eventName: string, handler: (eventArg?: any) => void): void;
-
-        /////////////////////////////////////
-        /// addThrottledHandler Definitions
-        ////////////////////////////////////
-
-        /**
-         * Attaches the handler for the event that is thrown by the target, where the minimum interval between events (in milliseconds) is specified as a parameter.
-         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-         * @param eventName The type of event to attach. Supported events:
-         * click, dblclick, maptypechanged, mousedown, mousemove, mouseout, mouseover, mouseup, mousewheel, rightclick, viewchange, viewchangeend, viewchangestart
-         * @param handler The callback function to handle the event when triggered.
-         * @param throttleInterval throttle interval (in ms)
-         * @returns The handler id.
-         */
-        export function addThrottledHandler(target: Map, eventName: string, handler: (eventArg?: IMouseEventArgs | IMapTypeChangeEventArgs) => void, throttleInterval: number): IHandlerId;
-
-        /**
-         * Attaches the handler for the event that is thrown by the target, where the minimum interval between events (in milliseconds) is specified as a parameter.
-         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-         * @param eventName The type of event to attach. Supported Events:
-         * changed, click, dblclick, drag, dragend, dragstart, mousedown, mouseout, mouseover, mouseup
-         * @param handler The callback function to handle the event when triggered.
-         * @param throttleInterval throttle interval (in ms)
-         * @returns The handler id.
-         */
-        export function addThrottledHandler(target: Pushpin, eventName: string, handler: (eventArg?: IMouseEventArgs | IPrimitiveChangedEventArgs) => void, throttleInterval: number): IHandlerId;
-
-        /**
-         * Attaches the handler for the event that is thrown by the target, where the minimum interval between events (in milliseconds) is specified as a parameter.
-         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-         * @param eventName The type of event to attach. Supported Events:
-         * changed, click, dblclick, mousedown, mouseout, mouseover, mouseup
-         * @param handler The callback function to handle the event when triggered.
-         * @param throttleInterval throttle interval (in ms)
-         * @returns The handler id.
-         */
-        export function addThrottledHandler(target: Polyline | Polygon, eventName: string, handler: (eventArg?: IMouseEventArgs | IPrimitiveChangedEventArgs) => void, throttleInterval: number): IHandlerId;
-
-        /**
-        * Attaches the handler for the event that is thrown by the target, where the minimum interval between events (in milliseconds) is specified as a parameter.
-        * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-        * @param eventName The type of event to attach. Supported Events:
-        * click, infoboxChanged, mouseenter, mouseleave
-        * @param handler The callback function to handle the event when triggered.
-        * @returns The handler id.
-        */
-        export function addThrottledHandler(target: Infobox, eventName: string, handler: (eventArg?: IInfoboxEventArgs) => void): IHandlerId;
-
-        /**
-         * Attaches the handler for the event that is thrown by the target, where the minimum interval between events (in milliseconds) is specified as a parameter.
-         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-         * @param eventName The type of event to attach. Supported Events:
-         * click, dblclick, mousedown, mouseout, mouseover, mouseup, rightclick
-         * @param handler The callback function to handle the event when triggered.
-         * @param throttleInterval throttle interval (in ms)
-         * @returns The handler id.
-         */
-        export function addThrottledHandler(target: Layer, eventName: string, handler: (eventArg?: IMouseEventArgs) => void, throttleInterval: number): IHandlerId;
-
-        /**
-         * Attaches the handler for the event that is thrown by the target, where the minimum interval between events (in milliseconds) is specified as a parameter.
-         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-         * @param eventName The type of event to attach. Supported Events:
-         * � entityadded
-         * � entityremoved
-         * @param handler The callback function to handle the event when triggered.
-         * @param throttleInterval throttle interval (in ms)
-         * @returns The handler id.
-         */
-        export function addThrottledHandler(target: EntityCollection, eventName: string, handler: (eventArg?: IEntityCollectionChangedEventArgs) => void, throttleInterval: number): IHandlerId;
-
-        /**
-         * Attaches the handler for the event that is thrown by the target, where the minimum interval between events (in milliseconds) is specified as a parameter.
-         * @param target The object to attach the event to; Map, IPrimitive, Infobox, Layer, DrawingTools, DrawingManager, DirectionsManager, etc.
-         * @param eventName The type of event to attach.
-         * @param handler The callback function to handle the event when triggered.
-         * @param throttleInterval throttle interval (in ms)
-         * @returns The handler id.
-         */
-        export function addThrottledHandler(target: any, eventName: string, handler: (eventArg?: any) => void, throttleInterval: number): IHandlerId;
-
-        /////////////////////////////////////
-        /// All other definitions
-        ////////////////////////////////////
-
-        /**
-         * Checks if the target has any attached event handler.
-         * @param target The object to check if an event is attached to it.
-         * @param eventName The name of the event to check to see is attached.
-         * @returns A boolean indicating if the specified event type is attached to the object.
-         */
-        export function hasHandler(target: any, eventName: string): boolean;
-
-        /**
-         * Invokes an event on the target. This causes all handlers for the specified event name to be called.
-         * @param target The object to invoke the event on.
-         * @param eventName The name of the event to invoke.
-         * @param args Arguments for the event handler.
-         */
-        export function invoke(target: any, evenName: string, args: any): void;
-
-        /**
-         * Detaches the specified handler from the event. The handlerId is returned by the addHandler and addThrottledHandler methods.
-         * @param handlerId The handler id of the event to remove.
-         */
-        export function removeHandler(handlerId: IHandlerId): void;
-    }
-
-    /**
-     * Standard compass headings; north, south, east, west.
-     */
-    export class Heading {
-        /** A heading pointing north, 0 degrees. */
-        static North: number;
-
-        /** A heading pointing south, 180 degrees. */
-        static South: number;
-
-        /** A heading pointing east, 90 degrees. */
-        static East: number;
-
-        /** A heading pointing west, 270 degrees. */
-        static West: number;
-    }
-
-    /**
-    * An infobox, also sometimes refer to as an info window or popup, is a simple panel that displays information over top the map. This is
-    * often used to display information linked to a location after clicking on a pushpin.
-    */
-    export class Infobox {
-
-        /**
-         * @constructor
-         * @param location The location to display the infobox at.
-         * @param options Options for rendering the infobox.
-         */
-        constructor(location: Location, options?: IInfoboxOptions);
-
-        /**
-        * @deprecated Use HTML buttons and links in description instead.
-        */
-        public getActions(): IInfoboxActions[];
-
-        /**
-        * Gets the point on the infobox which is anchored to the map. An anchor of (0,0) is the top left corner of the infobox.
-        * @returns The anchor point of the infobox.
-        */
-        public getAnchor(): Point;
-
-        /**
-        * Gets the string that is printed inside the infobox.
-        * @returns The description value of the infobox options.
-        */
-        public getDescription(): string;
-
-        /**
-        * Gets the height of the infobox.
-        * @returns The height of the infobox.
-        */
-        public getHeight(): number;
-
-        /**
-        * Gets the infobox as HTML.
-        * @returns The HTML string used to create a custom infobox.
-        */
-        public getHtmlContent(): string;
-
-        /**
-        * Gets the location on the map where the infobox�s anchor is attached.
-        * @returns The location of the infobox.
-        */
-        public getLocation(): Location;
-
-        /**
-         * Gets the maximium height setting for the infobox.
-         * @returns the maximium height setting for the infobox.
-         */
-        public getMaxHeight(): number;
-
-        /**
-         * Gets the maximium width setting for the infobox.
-         * @returns the maximium width setting for the infobox.
-         */
-        public getMaxWidth(): number;
-
-        /**
-        * Gets the amount the infobox pointer is shifted from the location of the infobox, or if showPointer is false, then it is the amount the infobox
-        * bottom left edge is shifted from the location of the infobox. The default value is (0,0), which means there is no offset.
-        * @returns The offset of the infobox.
-        */
-        public getOffset(): Point;
-
-        /**
-        * Gets the infobox options.
-        * @returns The infobox options currently used by the infobox.
-        */
-        public getOptions(): IInfoboxOptions;
-
-        /**
-        * Gets a boolean indicating whether the infobox close button is shown.
-        * @returns A boolean indicating if the close button is shown or not.
-        */
-        public getShowCloseButton(): boolean;
-
-        /**
-        * Gets a boolean indicating whether the infobox is drawn with a pointer.
-        * @returns A boolean indicating if the pointer of the infobox is shown or not.
-        */
-        public getShowPointer(): boolean;
-
-        /**
-        * Gets a string that is the title of the infobox.
-        * @returns The title property of the infobox.
-        */
-        public getTitle(): string;
-
-        /**
-        * Gets whether the infobox is visible. A value of false indicates that the infobox is hidden, although it is still an entity on the map.
-        * @returns A boolean indicating if the infobox is visible or not.
-        */
-        public getVisible(): boolean;
-
-        /**
-        * Gets the width of the infobox.
-        * @returns The width of the infobox.
-        */
-        public getWidth(): number;
-
-        /**
-        * Gets the z-index of the infobox.
-        * @returns The z-index of the infobox.
-        */
-        public getZIndex(): number;
-
-        /**
-        * Sets the HTML content of the infobox. You can use this method to change the look of the infobox. Note that infobox options are ignored if
-        * custom HTML is set. Also, when custom HTML is used to represent the infobox, the infobox is anchored at the bottom-left corner.
-        * @param content The HTML string to use to generate the infobox.
-        */
-        public setHtmlContent(content: string): void;
-
-        /**
-        * Sets the location on the map where the anchor of the infobox is attached.
-        * @param loc The location to display the infobox at.
-        */
-        public setLocation(loc: Location): void;
-
-        /**
-         * Adds the infobox to the map. To remove an Infobox from the map, simply pass null into this function.
-         * @param map A map instance to display the infoboox on, or null if removing infobox from map.
-         */
-        public setMap(map: Map): void;
-
-        /**
-        * Sets options for the infobox.
-        * @param options The options to assign to the infobox.
-        */
-        public setOptions(options: IInfoboxOptions): void;
-    }
-
-    /**
-    * The Layer class makes it easy to organize groups of data by storing them in separate layers on the map. Grouping your data into layers
-    * provides a number of benefits such as the ability to hide or attach events to all IPrimitive shapes in a layer with a single line of code,
-    * while also providing providing a performance benefit over manually looping through each shape and performing these tasks.
-    */
-    export class Layer implements IDataLayer {
-
-        /** Optional property to store any additional metadata for this layer. */
-        public metadata: any;
-
-        /**
-         * @constructor
-         * @param id Unique string identifier for the layer.
-         */
-        constructor(id?: string);
-
-        /**
-         * Adds a shapes to the layer, at the specified index if specified.
-         * @param primitive The shape(s) to be added to the layer.
-         * @param index The index at which to insert the shape into the layer.
-         */
-        public add(primitive: IPrimitive | IPrimitive[], index?: number): void;
-
-        /**
-         * Clears all the data
-         */
-        public clear(): void;
-
-        /**
-         * Cleans up any resources this object is consuming
-         */
-        public dispose(): void;
-
-        /**
-         * Gets the id of the layer.
-         * @returns The id assigned to the layer.
-         */
-        public getId(): string;
-
-        /**
-        * Gets an array of shapes that are in the layer. This can be used to iterate over the individual shapes.
-        * @returns An array of shapes that are in the layer.
-        */
-        public getPrimitives(): IPrimitive[];
-
-        /**
-         * Gets a value indicating whether the layer is visible or not.
-         * @returns A boolean indicating if the layer is visible or not.
-         */
-        public getVisible(): boolean;
-
-        /**
-         * Gets the zIndex of the layer.
-         * @returns The zIndex of the layer.
-         */
-        public getZIndex(): number;
-
-        /**
-         * Removes a primitive
-         * @param primitive primitive that needs to be removed
-         * @returns The primitive that needs to be removed
-         */
-        public remove(primitive: IPrimitive): IPrimitive;
-
-        /**
-         * Removes a primitive at a specified index
-         * @param index index of the primitive that needs to be removed
-         * @returns The primitive that needs to be removed at this index
-         */
-        public removeAt(index: number): IPrimitive;
-
-        /**
-         * Replaces all shapes in the layer with the new array of shapes that have been provided.
-         * @param primitives The array of shapes to add to the layer.
-         */
-        public setPrimitives(primitives: IPrimitive[]): void;
-
-        /**
-         * Sets whether the layer is visible or not.
-         * @param value A value indicating if the layer should be displayed or not.
-         */
-        public setVisible(value: boolean): void;
-
-        /**
-         * Sets the zIndex of the layer.
-         * @param zIndex The zIndex value to assign to the layer.
-         */
-        public setZIndex(zIndex: number): void;
-    }
-
-    /**
-    * The layers property of the map is a LayerCollection object and contains all the layers that have been added to the map.
-    * Note: This class is only exposed in the map.layers property. No other instance of this class can be created.
-    */
-    export class LayerCollection extends Array {
-        /** The number of layers in the collection. */
-        public length: number;
-
-        /**
-        * Removes all layers from the map.
-        */
-        public clear(): void;
-
-        /**
-        * Gets the index of a layer in the collection.
-        * @param layer The layer to get the index of.
-        * @returns The index of the specified layer.
-        */
-        public indexOf(layer: ILayer): number;
-
-        /**
-        * Adds a layer to the map.
-        * @param layer The layer to insert into the collection.
-        */
-        public insert(layer: ILayer): void;
-
-        /**
-        * Adds an array of layers to the map.
-        * @param layers The layers to insert into the collection.
-        */
-        public insertAll(layers: ILayer[]): void;
-
-        /**
-        * Removes a layer from the map.
-        * @param layer The layer to remove from the collection.
-        */
-        public remove(layer: ILayer): void;
-
-        /**
-        * Removes a layer from the map at the specified index in the collection.
-        * @param idx The index of the layer to remove.
-        */
-        public removeAt(idx: number): void;
-    }
-
-    /**
-  * This class stores the coordinate information needed to mark locations on a map. The Location class consists of two properties:
-  * latitude and longitude.
-  */
-    export class Location {
-        /** The location north or south of the equator from +90 to -90 */
-        public latitude: number;
-
-        /** The location east or west of the prime meridian +180 to -180 */
-        public longitude: number;
-
-        /**
-        * @constructor
-        * @param latitude The location north or south of the equator from +90 to -90
-        * @param longitude The location east or west of the prime meridian +180 to -180
-        */
-        constructor(latitude: any, longitude: any);
-
-        /**
-        * Determines if two locations are equal.
-        * @param location1 The first location to test.
-        * @param location2 The second location to test.
-        * @returns True if both locations are equivalent.
-        */
-        static areEqual(location1: Location, location2: Location): boolean;
-
-        /**
-        * Creates a deep copy of the map location.
-        * @returns A deep copy of the map location.
-        */
-        public clone(): Location;
-
-        /**
-        * Creates a proper Location from an object that has the same signature.
-        * @param source A Location or Location-like object that contains the same properties.
-        * @returns A copy of the map location.
-        */
-        static cloneFrom(source: Location): Location;
-
-        /**
-        * Normalizes the longitude by wrapping it around the earth.
-        * @param longitude The input longitude.
-        * @returns The longitude normalized to within -180 and +180.
-        */
-        static normalizeLongitude(longitude: number): number;
-
-        /**
-        * Parses a location string of the form "lat,long".
-        * @param str The location string.
-        * @returns The parsed location or null otherwise.
-        */
-        static parseLatLong(str: string): Location;
-
-        /**
-        * Converts the Location to a string representation.
-        * @returns A string representation of the location.
-        */
-        public toString(): string;
-    }
-
-    /**
-     * The LocationRect class, also known as a bounding box, consists of a set of coordinates that are used to represent rectangular area on the map.
-     */
-    export class LocationRect {
-        /** The location that defines the center of the rectangle. */
-        public center: Location;
-
-        /** The height, in degrees, of the rectangle. */
-        public height: number;
-
-        /** The width, in degrees, of the rectangle. */
-        public width: number;
-
-        /**
-        * @constructor
-        * @param center The center of the LocationRect.
-        * @param width The width of the LocationRect in degrees.
-        * @param height The height of the LocationRect in degrees.
-        */
-        constructor(center: Location, width: number, height: number);
-
-        /**
-        * Gets a LocationRect using the specified locations for the northwest and southeast corners.
-        * @param northwest The north west corner of the LocationRect.
-        * @param southeast The south east corner of the LocationRect.
-        * @returns A LocationRect using the specified locations for the northwest and southeast corners.
-        */
-        static fromCorners(northwest: Location, southeast: Location): LocationRect;
-
-        /**
-        * Gets a LocationRect using the specified northern and southern latitudes and western and eastern longitudes for the rectangle boundaries.
-        * @param north The northern latitude of the LocationRect.
-        * @param west The western longitude of the LocationRect.
-        * @param south The southern latitude of the LocationRect.
-        * @param east The eastern longitude of the LocationRect.
-        * @returns A LocationRect defined by the specified northern and southern latitudes and western and eastern longitudes for the rectangle boundaries.
-        */
-        static fromEdges(north: number, west: number, south: number, east: number): LocationRect;
-
-        /**
-        * Gets a LocationRect using a list of locations.
-        * @param locations A list of locations.
-        * @returns A LocationRect that encloses all the specified locations.
-        */
-        static fromLocations(...locations: Location[]): LocationRect;
-
-        /**
-        * Gets a LocationRect using an array of locations.
-        * @param locations An array of locations.
-        * @returns A LocationRect that encloses all the specified locations.
-        */
-        static fromLocations(locations: Location[]): LocationRect;
-
-        /**
-        * Creates a LocationRect from a string with the following format: "north,west,south,east". North, west, south and east specify the coordinate number values.
-        * @param str A string that repsents a LocationRect with the format "north,west,south,east".
-        * @returns A LocationRect defined by the specified northern and southern latitudes and western and eastern longitudes for the rectangle boundaries that have been parsed by the string.
-        */
-        static fromString(str: string): LocationRect;
-
-        /**
-        * Gets a copy of the LocationRect object.
-        * @retruns A copy of the LocationRect object.
-        */
-        public clone(): LocationRect;
-
-        /**
-        * Gets whether the specified Location is within the LocationRect.
-        * @returns A boolean indicating if a location is within a LocationRect.
-        */
-        public contains(location: Location): boolean;
-
-        /**
-         * Determines if the LocationRect crosses the 180th meridian.
-         * @returns A boolean indicating if the LocationRect crosses the international date line (-180/180 degrees longitude).
-         */
-        public crossesInternationalDateLine(): boolean;
-
-        /**
-        * Gets the longitude that defines the eastern edge of the LocationRect.
-        * @returns The eastern longitude value of the LocationRect.
-        */
-        public getEast(): number;
-
-        /**
-        * Gets the latitude that defines the northern edge of the LocationRect.
-        * @returns The northern latitude value of the LocationRect.
-        */
-        public getNorth(): number;
-
-        /**
-        * Gets the Location that defines the northwest corner of the LocationRect.
-        * @returns The northwest corner location of the LocationRect.
-        */
-        public getNorthwest(): Location;
-
-        /**
-        * Gets the latitude that defines the southern edge of the LocationRect.
-        * @returns The southern latitude value of the LocationRect.
-        */
-        public getSouth(): number;
-
-        /**
-        * Gets the Location that defines the southeast corner of the LocationRect.
-        * @returns The southeast corner location of the LocationRect.
-        */
-        public getSoutheast(): Location;
-
-        /**
-        * Gets the latitude that defines the western edge of the LocationRect.
-        * @returns The western longitude value of the LocationRect.
-        */
-        public getWest(): number;
-
-        /**
-        * Gets whether the specified LocationRect intersects with this LocationRect.
-        * @param rect A second LocationRect to test for intersection with.
-        * @returns A boolean indicating if a second LocationRect interests with this LocationRect.
-        */
-        public intersects(rect: LocationRect): boolean;
-
-        /**
-         * Scales the size of a LocationRect by multiplying the width and height properties by a percentage.
-         * @param percentage A percentage value to increase the size of the LocationRect by.
-         */
-        public inflate(percentage: number): void;
-
-        /**
-         * If a LocationRect crosses the international date line, this method splits it into two LocationRect objects and returns them as an array.
-         * @returns An array of LocationRects, that are split by the international date line (-180/180 degrees longitude)
-         */
-        public splitByInternationalDateLine(): LocationRect[];
-
-        /**
-        * Converts the LocationRect object to a string.
-        * @returns A string version of the LocationRect.
-        */
-        public toString(): string;
-    }
-
-    /** The map object generates an interactive map within a specified DOM element. */
-    export class Map {
-        /** Entities of the map */
-        public entities: EntityCollection;
-
-        /** Set of map layers */
-        public layers: LayerCollection;
-
-        /**
-         * @constructor
-         * @param parentElement The parent element of the map as a CSS selector string or HTMLElement.
-         * @param options Options used when creating the map.
-         */
-        constructor(parentElement: string | HTMLElement, options: IMapLoadOptions);
-
-		/**
-		* Gets the streetside panorama information closest to the specified bounding box and returns using a success callback function.
-		* This information can then be used to set the map view to that streetside panorama.
-		*/
-        public static getClosestPanorama(bounds: LocationRect, success: (panoramaInfo: IPanoramaInfo) => void, missingCoverage: () => void): void;
-
-        /** Returns the branch name; release, experimental, frozen. */
-        public static getVersion(): string;
-
-
-        /** Deletes the Map object and releases any associated resources. */
-        public dispose(): void;
-
-        /**
-         * Gets the location rectangle that defines the boundaries of the current map view.
-         * @returns The location rectangle that defines the boundaries of the current map view.
-         */
-        public getBounds(): LocationRect;
-
-        /**
-         * Gets the location of the center of the current map view.
-         * @returns The location of the center of the current map view.
-         */
-        public getCenter(): Location;
-
-        /**
-          * Gets to the specified callback an array of strings representing the attributions of the imagery currently displayed on the map.
-          * @param callback The callback function that needs to be called after retrieving the copyright information.
-          */
-        public getCopyrights(callback: (copyrights: string[]) => void): void;
-
-        /**
-         * Gets the session ID. This method calls the callback function with the session ID as the first parameter
-         * @param callback The callback function that needs to be called with the session id.
-         */
-        public getCredentials(callback: (creds: string) => void): void;
-
-        /**
-         * Gets the current culture.
-         * @returns The current culture.
-         */
-        public getCulture(): string;
-
-        /**
-         * Gets the height of the map control.
-         * @returns The height of the map control.
-         */
-        public getHeight(): number;
-
-        /**
-         * Returns the heading of the current map view.
-         * @returns Returns the heading of the current map view.
-         */
-        public getHeading(): number;
-
-        /**
-         * Gets the string that represents the imagery currently displayed on the map.
-         * @returns The string that represents the imagery currently displayed on the map.
-         */
-        public getImageryId(): string;
-
-        /**
-         * Gets a string that represents the current map type displayed on the map.
-         * @returns A string that represents the current map type displayed on the map.
-         */
-        public getMapTypeId(): MapTypeId;
-
-        /**
-         * Gets the current scale in meters per pixel of the center of the map.
-         * @returns The current scale in meters per pixel of the center of the map.
-         */
-        public getMetersPerPixel(): number;
-
-        /**
-         * Gets the map options that have been set.
-         * @returns the map options that have been set.
-         */
-        public getOptions(): IMapOptions;
-
-        /**
-         * Gets the x coordinate of the top left corner of the map control, relative to the page.
-         * @returns The x coordinate of the top left corner of the map control, relative to the page.
-         */
-        public getPageX(): number;
-
-        /**
-         * Gets the y coordinate of the top left corner of the map control, relative to the page.
-         * @returns The y coordinate of the top left corner of the map control, relative to the page.
-         */
-        public getPageY(): number;
-
-        /**
-         * Returns the pitch of the current streetside map view.
-         * @returns Returns the pitch of the current streetside map view.
-         */
-        public getPitch(): number;
-
-        /**
-         * Gets the map root node.
-         * @returns the map root node.
-         */
-        public getRootElement(): HTMLElement;
-
-        /**
-         * Gets the user region.
-         * @returns The user region.
-         */
-        public getUserRegion(): string;
-
-        /**
-         * Gets the width of the map control.
-         * @returns the width of the map control.
-         */
-        public getWidth(): number;
-
-        /**
-         * Gets the zoom level of the current map view.
-         * @returns Returns the zoom level of the current map view.
-         */
-        public getZoom(): number;
-
-        /**
-         * Gets the range of valid zoom levels for the current map view.
-         * @returns The range of valid zoom levels for the current map view.
-         */
-        public getZoomRange(): IRange;
-
-        /**
-         * Gets a boolean indicating whether the map is in a regular Mercator nadir mode.
-         * @returns A boolean indicating whether the map is in a regular Mercator nadir mode.
-         */
-        public isMercator(): boolean;
-
-        /**
-         * Gets a boolean indicating if the current map type allows the heading to change; false if the display heading is fixed.
-         * @returns true if the current map type allows the heading to change; false if the display heading is fixed.
-         */
-        public isRotationEnabled(): boolean;
-
-        /**
-         * Sets the current map type.
-         * @param mapTypeId The map imagery type of the map to set.
-         */
-        public setMapType(mapTypeId: MapTypeId): void;
-
-        /**
-         * Sets the map options.
-         * @param options The map options to be set.
-         */
-        public setOptions(options: IMapOptions): void;
-
-        /**
-         * Sets the view of the map.
-         * @param viewOptions The view options to be set.
-         */
-        public setView(viewOptions: IViewOptions): void;
-
-        /**
-         * Converts a specified Location or a Location array to a Point or Point array on the map
-         * relative to the specified PixelReference. If no reference is specified, PixelReference.viewport
-         * is taken.
-         * @param location The given Location or Location[] to convert.
-         * @param reference The PixelReference to specify the reference point.
-         * @returns The converted Point or Point[], or null if the conversion fails.
-         */
-        public tryLocationToPixel(location: Location | Location[], reference?: any): Point | Point[];
-
-        /**
-         * Converts a specified Point or a Point array to a Location or Location array on the map
-         * relative to the specified PixelReference. If no reference is specified, PixelReference.viewport
-         * is taken.
-         * @param point The given Point or Point[] to convert.
-         * @param reference The PixelReference to specify the reference point.
-         * @returns The converted Location or Location[], or null if the conversion fails.
-         */
-        public tryPixelToLocation(point: Point | Point[], reference?: any): Location | Location[];
-    }
-
-    /**
-    * This class is used to represent a pixel coordinate or offset. This is often used by pushpin anchors, and map location to pixel conversion calculations.
-    */
-    export class Point {
-        /** The x coordinate */
-        public x: number;
-
-        /** The y coordinate */
-        public y: number;
-
-        /**
-        * @constructor
-        * @param x The x coordinate.
-        * @param y The y coordinate.
-        */
-        constructor(x: number, y: number);
-
-        /**
-        * Adds the x and y values of two points and returns a new Point.
-        * @param point The point to add.
-        * @returns A new point created by the sum of two points.
-        */
-        public add(point: Point): Point;
-
-        /**
-        * Creates a copy of the current point.
-        * @returns A new instance of the current point.
-        */
-        public clone(): Point;
-
-        /**
-        * Compares the x and y values of two points to see if they are equal. If a tolerance value is specified, it checks to see if the linear distance between the points is less than or equal to the tolerance value.
-        * @param point The point to compare to.
-        * @param tolerance Optional, tolerance (>= 0) to avoid false result because of floating point errors.
-        * @returns true if this point equals point, false otherwise
-        */
-        public equals(point: Point, tolerance?: number): boolean;
-
-        /**
-        * Subtracts the x and y values of a points and returns a new Point.
-        * @param point The point to subtract.
-        * @returns A new point created by the subtraction of two points.
-        */
-        public subtract(point: Point): Point;
-
-        /**
-        * Converts the Point to a string representation.
-        * @returns A string representation of the point.
-        */
-        public toString(): string;
-    }
-
-    /**
-   * This compression algorithm encodes/decodes an array of locations into a string.
-   * This algorithm is used for generating a compressed collection of locations for use
-   * with the Bing Maps REST Elevation Service. This algorithm is also used for decoding
-   * the compressed coordinates returned by the GeoData API.
-   *
-   * These algorithms come from the following documentation:
-   * http://msdn.microsoft.com/en-us/library/jj158958.aspx
-   * http://msdn.microsoft.com/en-us/library/dn306801.aspx
-   */
-    export class PointCompression {
-        /**
-        * Decodes a collection of locations from a compressed string.
-        * @param value Compressed string to decode.
-        * @returns An array of locations that have been decoded from the compressed string.
-        */
-        public static decode(value: string): Location[];
-
-        /**
-        * Compresses an array of locations into a string.
-        * @param locations Collection of coordinates to compress.
-        * @returns A compressed string representing an array of locations.
-        */
-        public static encode(locations: Location[]): string;
-    }
-
-    /**
-   * A polygon is an area defined by a closed ring of locations. A simple polygon consists of an array of Location objects that form a boundary.
-   * A complex polygon consists of several arrays of Locations, where the first array is the outline of the polygon, and the subsequent arrays are holes in the polygon.
-   * The Polygon class derives from the IPrimitive interface.
-   */
-    export class Polygon implements IPrimitive {
-        /**
-         * Information that is linked to the polygon.
-         * Some modules such as the GeoJSON, and Spatial Data Service modules will also often add information to this property.
-         */
-        public metadata: any;
-
-        /**
-         * @constructor
-         * @param rings A Location array for basic polygon with single outer perimeter,
-         * or an array of Location arrays for advanced polygon (multi-polygon, polygon with holes, or combination of polygons).
-         * @param options Options used to customize polygon.
-         */
-        constructor(rings: Location[] | Location[][], options?: IPolygonOptions);
-
-        /**
-         * Gets the css cursor value when polygon has events on it.
-         * @returns CSS cursor string when polygon has events on it.
-         */
-        public getCursor(): string;
-
-        /**
-        * Gets the fill color of the inside of the polygon. Will be string or Color object depending on the the what method was used in the pushpin options.
-        * @returns The fill color of the inside of the polygon.
-        */
-        public getFillColor(): string | Color;
-
-        /**
-         * Returns whether the polygon is generalizable based on zoom level or not.
-         * @returns whether the polygon is generalizable based on zoom level or not.
-         */
-        public getGeneralizable(): boolean;
-
-        /**
-         * Gets the first ring of the polygon (for V7 compatability).
-         * @returns An array of Locations that is the first ring of the polygon; or an empty array if the polygon has no ring at all.
-         */
-        public getLocations(): Location[];
-
-        /**
-         * Gets an array of location arrays, where each location array defines a ring of the polygon.
-         * @returns An array of location arrays, where each location array defines a ring of the polygon.
-         */
-        public getRings(): Location[][];
-
-        /**
-         * Gets the color of the border stroke of the polygon. Will be string or Color object depending on the the what method was used in the pushpin options.
-         * @returns The color of the border stroke of the polygon.
-         */
-        public getStrokeColor(): string | Color;
-
-        /**
-         * Gets the stroke dash array of the polygon, in format of either array or string, whichever user provides.
-         * @returns The stroke dash array of the polygon.
-         */
-        public getStrokeDashArray(): number[] | string;
-
-        /**
-         * Gets the thickness of the border stroke of the polygon.
-         * @returns The thickness of the border stroke of the polygon as a number.
-         */
-        public getStrokeThickness(): number;
-
-        /**
-         * Gets whether the polygon is visible.
-         * @returns A boolean indicating whether the polygon is visible or not.
-         */
-        public getVisible(): boolean;
-
-        /**
-         * Sets locations (single ring) of the polygon. (for V7 compatability)
-         * @param locations A Location[] that defines the only ring of the polygon
-         */
-        public setLocations(locations: Location[]): void;
-
-        /**
-         * Sets the properties for the polygon.
-         * @param options The IPolygonOptions object containing the options to customize the polygon.
-         */
-        public setOptions(options: IPolygonOptions): void;
-
-        /**
-         * Sets rings of the polygon.
-         * @param rings A Location[][] where each Location[] defines a ring of the polygon.
-         */
-        public setRings(rings: Location[] | Location[][]): void;
-    }
-
-    /**
-    * Polylines allow you to draw connected lines on a map. In many spatial database systems, this is also known as a LineString.
-    * The Polyline class derives from the IPrimitive interface.
-    */
-    export class Polyline implements IPrimitive {
-        /**
-         * Information that is linked to the polyline.
-         * Some modules such as the GeoJSON, and Spatial Data Service modules will also often add information to this property.
-         */
-        public metadata: any;
-
-        /**
-        * @constructor
-        * @param locations An array of locations that make up the path of the polyine.
-        * @param options Options used to customize polyline.
-        */
-        constructor(locations: Location[], options?: IPolylineOptions);
-
-        /**
-         * Gets the css cursor value when polyline has events on it.
-         * @returns CSS cursor string when polyline has events on it.
-         */
-        public getCursor(): string;
-
-        /**
-         * Returns whether the polyline is generalizable based on zoom level or not.
-         * @returns whether the polyline is generalizable based on zoom level or not.
-         */
-        public getGeneralizable(): boolean;
-
-        /**
-         * Gets the locations that make up the polyline.
-         * @returns An array that defines the path of the polyline.
-         */
-        public getLocations(): Location[];
-
-        /**
-         * Gets the color of the border stroke of the polyline. Will be string or Color object depending on the the what method was used in the polyline options.
-         * @returns The stroke color of the polyline.
-         */
-        public getStrokeColor(): string | Color;
-
-        /**
-         * Gets the stroke dash array of the polyline, in format of either array or string, whichever user provides.
-         * @returns The stroke dash array of the polyline.
-         */
-        public getStrokeDashArray(): number[] | string;
-
-        /**
-         * Gets the thickness of the border stroke of the polyline.
-         * @returns The thickness of the border stroke of the polyline as a number.
-         */
-        public getStrokeThickness(): number;
-
-        /**
-         * Gets whether the polyline is visible.
-         * @returns A boolean indicating whether the polyline is visible or not.
-         */
-        public getVisible(): boolean;
-
-        /**
-         * Sets locations of the polyline.
-         * @param locations A Location[] that defines path of the polyline
-         */
-        public setLocations(locations: Location[]): void;
-
-        /**
-         * Sets the properties for the polyline.
-         * @param options The IPolylineOptions object containing the options to customize the polyline.
-         */
-        public setOptions(options: IPolylineOptions): void;
-    }
-
-    /**
-    * Pushpins, sometimes also referred to as markers or MapIcons on other mapping platforms, are one of the primary ways of marking a location on a map.
-    * The Pushpin class derives from the IPrimitive interface.
-    */
-    export class Pushpin implements IPrimitive {
-
-        /**
-         * Information that is linked to the pushpin.
-         * Some modules such as the GeoJSON, and Spatial Data Service modules will also often add information to this property.
-         */
-        public metadata: any;
-
-        /**
-        * @constructor
-        * @param location A Location object that specifies where to display the pushpin.
-        * @param options Options used when creating the Pushpin.
-        */
-        constructor(location: Location, options?: IPushpinOptions);
-
-        /**
-         * Gets the point on the Pushpin icon which is anchored to the pushpin location.
-         * An anchor of (0,0) is the top left corner of the icon.
-         * @returns The point on the Pushpin icon which is anchored to the pushpin location.
-         */
-        public getAnchor(): Point;
-
-        /**
-         * Gets whether the pushpin clicked style is enabled
-         * @returns Whether the pushpin clicked style is enabled.
-         */
-        public getClickedStyleEnabled(): boolean;
-
-        /**
-         * Gets the color option of the pushpin.
-         * @returns The color option of the pushpin.
-         */
-        public getColor(): string | Color;
-
-        /**
-        * Gets the css cursor value when pushpin has events on it.
-        * @returns CSS cursor string when pushpin has events on it.
-        */
-        public getCursor(): string;
-
-        /**
-         * Gets a boolean indicating if the pushpin is draggable or not.
-         * @returns A boolean indicating if the pushpin is draggable or not.
-         */
-        public getDraggable(): boolean;
-
-        /**
-         * Gets whether the pushpin hover style is enabled
-         * @returns Whether the pushpin hover style is enabled.
-         */
-        public getHoverStyleEnabled(): boolean;
-
-        /**
-         * Gets the custom Pushpin source icon string which can be a url to an image or SVG, inline SVG string, or data URI.
-         * @returns the custom Pushpin icon source string, which can be a url to an image or SVG, inline SVG string, or data URI.
-         */
-        public getIcon(): string;
-
-        /**
-         * Returns the location of the pushpin.
-         * @returns The location of the pushpin.
-         */
-        public getLocation(): Location;
-
-        /**
-         * Returns whether the clickable area of the pushpin is an ellipse.
-         * @returns A boolean indicating whether the clickable area of the pushpin is an ellipse.
-         */
-        public getRoundClickableArea(): boolean;
-
-        /**
-         * Gets the subtitle label of the Pushpin.
-         * @returns The subtitle label of the Pushpin.
-         */
-        public getSubTitle(): string;
-
-        /**
-         * Gets the text within the Pushpin icon.
-         * @returns The text within the Pushpin icon.
-         */
-        public getText(): string;
-
-        /**
-         * Gets the amount the text is shifted from the Pushpin icon.
-         * @returns the amount the text is shifted from the Pushpin icon.
-         */
-        public getTextOffset(): Point;
-
-        /**
-         * Gets the title label of the Pushpin.
-         * @returns the title label of the Pushpin.
-         */
-        public getTitle(): string;
-
-        /**
-         * Gets whether the pushpin is visible.
-         * @returns A boolean indicating whether the pushpin is visible or not.
-         */
-        public getVisible(): boolean;
-
-        /**
-         * Sets the location of the Pushpin.
-         * @param location The location of the Pushpin.
-         */
-        public setLocation(location: Location): void;
-
-        /**
-         * Sets the properties for the pushpin.
-         * @param options The IPushpinOptions object containing the options to customize the pushpin.
-         */
-        public setOptions(options: IPushpinOptions): void;
-    }
-
-    /**
-    * Used to represent the location of a map tile in the quadkey tile pyramid system used by the map.
-    * If using a tile source where the uriConstructor property is set to a callback function, that callback function will recieve
-    * an instance of the PyramidTileId class.
-    */
-    export class PyramidTileId {
-        /** The height of the tile. */
-        public pixelHeight: number;
-
-        /** The width of the tile. */
-        public pixelWidth: number;
-
-        /** The quadkey ID of the tile. */
-        public quadKey: string;
-
-        /** The x tile coordinate. */
-        public x: number;
-
-        /** The y tile coordinate. */
-        public y: number;
-
-        /** The zoom level of the tile. */
-        public zoom: number;
-
-        /**
-         * @constructor
-         * @param x The integer x position of the tile within the tile layer at the specified zoom level.
-         * @param y The integer y position of the tile within the tile layer at the specified zoom level.
-         * @param zoom The zoom level of the tile.
-         * @param width The tile's width in pixels. Default value: 256
-         * @param height The tile's height in pixels. Default value: 256
-         */
-        constructor(x: number, y: number, zoom: number, width?: number, height?: number)
-
-        /**
-         * Compares two PyramidTileId objects and returns a boolean indicating if the two PyramidTileId are equal.
-         * @param tileId1 The first PyramidTileId to compare to the second.
-         * @param tileId2 The second PyramidTileId to compare to the first.
-         * @returns A boolean indicating if the two PyramidTileId are equal.
-         */
-        public static areEqual(tileId1: PyramidTileId, tileId2: PyramidTileId): boolean;
-
-        /**
-         * Generates a PyramidTileId from a quadkey tile id string.
-         * @param quadkey The quadkey tile id string to convert into a PyramidTileId object.
-         * @param width The tile's width in pixels. Default value: 256
-         * @param height The tile's height in pixels. Default value: 256
-         */
-        public static fromQuadKey(quadkey: string, width?: number, height?: number): PyramidTileId;
-    }
-
-    /** Provides static functions for generating random test data. */
-    export class TestDataGenerator {
-        /**
-        * Generates a random hex or rgba color string.
-        * @param withAlpha A boolean indicating if the color should have an alpha value or not. if set to true, a rgba value will be returned with an alpha value of 0.5.
-        * @returns A css color string, hex or rgba.
-        */
-        public static getColor(withAlpha?: boolean): string;
-
-        /**
-        * Generates random Location objects.
-        * @param num The number of locations to generate. If set to one a single Location will be returned. If greater than one and array will be returned.
-        * @param bounds The bounding box in which all the locations should fall within.
-        * @returns One or more random Locations.
-        */
-        public static getLocations(num?: number, bounds?: LocationRect): Location | Location[];
-
-        /**
-        * Generates random pushpins.
-        * @param num The number of pushpins to generate. If set to one a single Pushpin will be returned. If greater than one and array will be returned.
-        * @param bounds The bounding box in which all the pushpins should fall within.
-        * @param options The options to use for rendering the pushpins. Default is random.
-        * @returns One or more random Pushpins.
-        */
-        public static getPushpins(num?: number, bounds?: LocationRect, options?: IPushpinOptions): Pushpin | Pushpin[];
-
-        /**
-        * Generates random polylines.
-        * @param num The number of polylines to generate. If set to one a single Polyline will be returned. If greater than one and array will be returned.
-        * @param bounds The bounding box in which all the locations of the polylines should fall within.
-        * @param size The number of locations each polylines should have. Default: random between 3 and 10.
-        * @param scaleFactor A number that scales the size of the polylines based on size of the bounding box. A value of 0.1 would generate polylines that are no larger than 10% of the width/height of the map. Default: 0.1
-        * @param options The options to use for rendering the polylines. Default is random.
-        * @returns One or more random Polylines.
-        */
-        public static getPolylines(num?: number, bounds?: LocationRect, size?: number, scaleFactor?: number, options?: IPolylineOptions): Polyline | Polyline[];
-
-        /**
-        * Generates random polygons.
-        * @param num The number of polygons to generate. If set to one a single Polygon will be returned. If greater than one and array will be returned.
-        * @param bounds The bounding box in which all the locations of the polygon should fall within.
-        * @param size The number of locations each polygon should have. Default: random between 3 and 10.
-        * @param scaleFactor A number that scales the size of the polygons based on the size of the bounding box. A value of 0.1 would generate polygons that are no larger than 10% of the width/height of the map. Default: 0.1
-        * @param options The options to use for rendering the polygons. Default is random.
-        * @param addHole A boolean indicating if the generated polygon should have a hole or not. Note that this will double the number of Location objects that are in the Polygon. Default: false
-        * @returns One or more random polygons.
-        */
-        public static getPolygons(num?: number, bounds?: LocationRect, size?: number, scaleFactor?: number, options?: IPolygonOptions, addHole?: boolean): Polygon | Polygon[];
-    }
-
-    /** Represents a tile layer that can be overlaid on top of the map. */
-    export class TileLayer implements ILayer {
-        /**
-        * @constructor
-        * @param options The options to use to define the tile layer.
-        */
-        constructor(options: ITileLayerOptions);
-
-        /**
-        * Gets the opacity of the tile layer, defined as a double between 0 (not visible) and 1.
-        * @returns The opacity of the tile layer, defined as a double between 0 (not visible) and 1.
-        */
-        public getOpacity(): number;
-
-        /**
-        * Gets the tile source of the tile layer.
-        * @returns The tile source of the tile layer.
-        */
-        public getTileSource(): TileSource;
-
-        /**
-        * Gets a boolean that indicates if the tile layer is visible or not.
-        * @returns A boolean that indicates if the tile layer is visible or not.
-        */
-        public getVisible(): boolean;
-
-        /**
-        * Gets the zIndex of the tile layer.
-        * @returns The zIndex of the tile layer.
-        */
-        public getZIndex(): number;
-
-        /**
-        * Sets the opacity of the tile layer. Value must be a number between 0 and 1.
-        * @param opacity The opacity of the tile layer. Value must be a number between 0 and 1.
-        */
-        public setOpacity(opacity: number): void;
-
-        /**
-        * Sets options for the tile layer.
-        * @param options The options for the tile layer.
-        */
-        public setOptions(options: ITileLayerOptions): void;
-
-        /**
-        * Sets the visibility of the tile layer.
-        * @param show A boolean indicating if the tile layer should be visible or not.
-        */
-        public setVisible(show: boolean): void;
-
-        /**
-        * Sets the zIndex of the tile layer.
-        * @param idx The zIndex of the tile layer.
-        */
-        public setZIndex(idx: number): void;
-    }
-
-    /** Defines the data source for a tile layer. */
-    export class TileSource {
-        /**
-        * @constructor
-        * @param options The options to use to define the tile source.
-        */
-        constructor(options: ITileSourceOptions);
-
-        /**
-        * Gets the specified bounding box of the of the tile source.
-        * @returns The specified bounding box of the of the tile source.
-        */
-        public getBounds(): LocationRect;
-
-        /**
-        * Gets the pixel height of each tile in the tile source.
-        * @returns The pixel height of each tile in the tile source.
-        */
-        public getHeight(): number;
-
-        /**
-        * Gets the maximum zoom level specified for the tile source.
-        * @returns The maximum zoom level specified for the tile source.
-        */
-        public getMaxZoom(): number;
-
-        /**
-        * Gets the minimum zoom level specified for the tile source.
-        * @returns The minimum zoom level specified for the tile source.
-        */
-        public getMinZoom(): number;
-
-        /**
-        * Gets a string that constructs tile URLs used to retrieve tiles for the tile layer.
-        * @returns A string that constructs tile URLs used to retrieve tiles for the tile layer.
-        */
-        public getUriConstructor(): string | ((tile: PyramidTileId) => string);
-
-        /**
-        * Gets the pixel width of each tile in the tile source.
-        * @returns The pixel width of each tile in the tile source.
-        */
-        public getWidth(): number;
-    }
-}
diff --git a/types/bingmaps/tsconfig.json b/types/bingmaps/tsconfig.json
deleted file mode 100644
index 421876221b..0000000000
--- a/types/bingmaps/tsconfig.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "Autosuggest.d.ts",
-        "Clustering.d.ts",
-        "Contour.d.ts",
-        "DataBinning.d.ts",
-        "Directions.d.ts",
-        "DrawingTools.d.ts",
-        "GeoJson.d.ts",
-        "HeatMapLayer.d.ts",
-        "Search.d.ts",
-        "SpatialDataService.d.ts",
-        "SpatialMath.d.ts",
-        "Traffic.d.ts",
-        "WellKnownText.d.ts",
-        "bingmaps-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/bingmaps/tslint.json b/types/bingmaps/tslint.json
deleted file mode 100644
index a41bf5d19a..0000000000
--- a/types/bingmaps/tslint.json
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
-        "ban-types": false,
-        "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
-        "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
-        "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
-        "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
-        "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
-        "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
-        "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
-    }
-}

From 55ece10c58c449a6a274194119881a1484258ba6 Mon Sep 17 00:00:00 2001
From: Alexander Wilczewski <alex@wilczewski.org>
Date: Fri, 9 Mar 2018 17:47:42 +0000
Subject: [PATCH 0396/1382] Updated otherwise to accept a string

---
 types/angular-route/angular-route-tests.ts | 3 ++-
 types/angular-route/index.d.ts             | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/types/angular-route/angular-route-tests.ts b/types/angular-route/angular-route-tests.ts
index 4d596cdfdf..677c1589ed 100644
--- a/types/angular-route/angular-route-tests.ts
+++ b/types/angular-route/angular-route-tests.ts
@@ -40,7 +40,8 @@ $routeProvider
         }
     })
     .otherwise({ redirectTo: '/' })
-    .otherwise({ redirectTo: ($routeParams?: ng.route.IRouteParamsService, $locationPath?: string, $locationSearch?: any) => "" });
+    .otherwise({ redirectTo: ($routeParams?: ng.route.IRouteParamsService, $locationPath?: string, $locationSearch?: any) => "" })
+    .otherwise("/");
 
 
 var current: ng.route.ICurrentRoute;
diff --git a/types/angular-route/index.d.ts b/types/angular-route/index.d.ts
index 29c59f955c..56bd3f2263 100644
--- a/types/angular-route/index.d.ts
+++ b/types/angular-route/index.d.ts
@@ -138,7 +138,7 @@ declare module 'angular' {
              *
              * @params Mapping information to be assigned to $route.current.
              */
-            otherwise(params: IRoute): IRouteProvider;
+            otherwise(params: IRoute | string): IRouteProvider;
             /**
              * Adds a new route definition to the $route service.
              *

From 8570f5b439539e02f963db22058325e9ecf63919 Mon Sep 17 00:00:00 2001
From: Blayze Wilhelm <blayze@carstickers.com>
Date: Fri, 9 Mar 2018 11:34:13 -0800
Subject: [PATCH 0397/1382] Sync from main repository

---
 types/paper/index.d.ts | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/types/paper/index.d.ts b/types/paper/index.d.ts
index 3f57526a19..73e8d36636 100644
--- a/types/paper/index.d.ts
+++ b/types/paper/index.d.ts
@@ -1369,7 +1369,7 @@ declare module paper {
          * Rasterizes the item into a newly created Raster object. The item itself is not removed after rasterization.
          * @param resolution [optional] - the resolution of the raster in pixels per inch (DPI). If not specified, the value of view.resolution is used. default: view.resolution
          */
-        rasterize(resolution: number): Raster;
+        rasterize(resolution?: number): Raster;
 
         /**
          * Checks whether the item's geometry contains the given point.
@@ -3359,99 +3359,99 @@ declare module paper {
          * The view that this style belongs to.
          * Read only.
          */
-        view: View;
+        view?: View;
 
         /**
          * The color of the stroke.
          */
-        strokeColor: Color | string;
+        strokeColor?: Color | string;
 
         /**
          * The width of the stroke.
          */
-        strokeWidth: number;
+        strokeWidth?: number;
 
         /**
          * The shape to be used at the beginning and end of open Path items, when they have a stroke.
          * String('round', 'square', 'butt'
          */
-        strokeCap: string;
+        strokeCap?: string;
 
         /**
          * The shape to be used at the segments and corners of Path items when they have a stroke.
          * String('miter', 'round', 'bevel')
          */
-        strokeJoin: string;
+        strokeJoin?: string;
 
         /**
          * Specifies whether the stroke is to be drawn taking the current affine transformation into account (the default behavior), or whether it should appear as a non-scaling stroke.
          */
-        strokeScaling: boolean;
+        strokeScaling?: boolean;
 
         /**
          * The dash offset of the stroke.
          */
-        dashOffset: number;
+        dashOffset?: number;
 
         /**
          * Specifies an array containing the dash and gap lengths of the stroke.
          */
-        dashArray: number[];
+        dashArray?: number[];
 
         /**
          * The miter limit of the stroke. When two line segments meet at a sharp angle and miter joins have been specified for strokeJoin, it is possible for the miter to extend far beyond the strokeWidth of the path. The miterLimit imposes a limit on the ratio of the miter length to the strokeWidth.
          */
-        miterLimit: number;
+        miterLimit?: number;
 
         /**
          * The fill color.
          */
-        fillColor: Color | string;
+        fillColor?: Color | string;
 
         /**
          * The shadow color.
          */
-        shadowColor: Color | string;
+        shadowColor?: Color | string;
 
         /**
          * The shadow's blur radius.
          */
-        shadowBlur: number;
+        shadowBlur?: number;
 
         /**
          * The shadow's offset.
          */
-        shadowOffset: Point;
+        shadowOffset?: Point;
 
         /**
          * The color the item is highlighted with when selected. If the item does not specify its own color, the color defined by its layer is used instead.
          */
-        selectedColor: Color | string;
+        selectedColor?: Color | string;
 
         /**
          * The font-family to be used in text content. default 'sans-serif'
          */
-        fontFamily: string;
+        fontFamily?: string;
 
         /**
          * The font-weight to be used in text content.
          */
-        fontWeight: string | number;
+        fontWeight?: string | number;
 
         /**
          * The font size of text content, as {@Number} in pixels, or as {@String} with optional units 'px', 'pt' and 'em'.
          */
-        fontSize: string | number;
+        fontSize?: string | number;
 
         /**
          * The text leading of text content.
          */
-        leading: number | string;
+        leading?: number | string;
 
         /**
          * The justification of text paragraphs. default "left"
          */
-        justification: string;
+        justification?: string;
 
     }
     export interface IHSBColor {

From e712c102ad69f5f49875719e22bc5261cfa68122 Mon Sep 17 00:00:00 2001
From: John Barela <barela@jpbarela.com>
Date: Fri, 9 Mar 2018 14:31:21 -0700
Subject: [PATCH 0398/1382] Update signature to enable responses to be used in
 the middleware.

---
 types/express-graphql/express-graphql-tests.ts | 4 ++--
 types/express-graphql/index.d.ts               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/types/express-graphql/express-graphql-tests.ts b/types/express-graphql/express-graphql-tests.ts
index 482b15c186..6fdfc0d945 100644
--- a/types/express-graphql/express-graphql-tests.ts
+++ b/types/express-graphql/express-graphql-tests.ts
@@ -14,13 +14,13 @@ const graphqlOption: graphqlHTTP.OptionsObj = {
     extensions: (args) => { }
 };
 
-const graphqlOptionRequest = (request: express.Request): graphqlHTTP.OptionsObj => ({
+const graphqlOptionRequest = (request: express.Request, response: express.Response): graphqlHTTP.OptionsObj => ({
     graphiql: true,
     schema: schema,
     context: request.session
 });
 
-const graphqlOptionRequestAsync = async (request: express.Request): Promise<graphqlHTTP.OptionsObj> => {
+const graphqlOptionRequestAsync = async (request: express.Request, response: express.Response): Promise<graphqlHTTP.OptionsObj> => {
     return {
         graphiql: true,
         schema: await Promise.resolve(schema),
diff --git a/types/express-graphql/index.d.ts b/types/express-graphql/index.d.ts
index 166bdae6e7..ade08f1729 100644
--- a/types/express-graphql/index.d.ts
+++ b/types/express-graphql/index.d.ts
@@ -16,7 +16,7 @@ declare namespace graphqlHTTP {
      * Used to configure the graphQLHTTP middleware by providing a schema
      * and other configuration options.
      */
-    export type Options = ((req: Request) => OptionsObj) | ((req: Request) => Promise<OptionsObj>) | OptionsObj
+    export type Options = ((req: Request, res: Response) => OptionsObj) | ((req: Request, res: Response) => Promise<OptionsObj>) | OptionsObj
     export type OptionsObj = {
         /**
          * A GraphQL schema from graphql-js.

From 8832145d26522e154185d3af5672e1ba4c9c99b7 Mon Sep 17 00:00:00 2001
From: Jared Szechy <jared.szechy@gmail.com>
Date: Fri, 9 Mar 2018 17:03:48 -0500
Subject: [PATCH 0399/1382] [plotly.js] Add several missing interfaces from
 latest version

---
 types/plotly.js/index.d.ts | 422 ++++++++++++++++++++++++++++++-------
 1 file changed, 342 insertions(+), 80 deletions(-)

diff --git a/types/plotly.js/index.d.ts b/types/plotly.js/index.d.ts
index 97d439c504..225afd8c38 100644
--- a/types/plotly.js/index.d.ts
+++ b/types/plotly.js/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for plotly.js 1.28
+// Type definitions for plotly.js 1.35
 // Project: https://plot.ly/javascript/
 // Definitions by: Chris Gervang <https://github.com/chrisgervang>
 // 				Martin Duparc <https://github.com/martinduparc>
@@ -25,9 +25,14 @@ export interface Point {
 }
 
 export interface PlotScatterDataPoint {
-	pointNumber: number;
-	curveNumber: number;
-	data: ScatterData;
+  curveNumber: number;
+  data: ScatterData;
+  pointIndex: number;
+  pointNumber: number;
+  x: number;
+  xaxis: LayoutAxis;
+  y: number;
+  yaxis: LayoutAxis;
 }
 
 export interface PlotMouseEvent {
@@ -106,6 +111,7 @@ export function extendTraces(root: Root, update: Data | Data[], indices: number
 export function prependTraces(root: Root, update: Data | Data[], indices: number | number[]): Promise<PlotlyHTMLElement>;
 export function toImage(root: Root, opts: ToImgopts): Promise<string>;
 export function downloadImage(root: Root, opts: DownloadImgopts): Promise<string>;
+export function react(root: Root, data: Data[], layout?: Partial<Layout>, config?: Partial<Config>): Promise<PlotlyHTMLElement>;
 
 // Layout
 export interface Layout {
@@ -113,7 +119,7 @@ export interface Layout {
 	titlefont: Partial<Font>;
 	autosize: boolean;
 	showlegend: boolean;
-	paper_bgcolor: Color;
+    paper_bgcolor: Color;
     plot_bgcolor: Color;
     separators: string;
     hidesources: boolean;
@@ -132,7 +138,7 @@ export interface Layout {
 	width: number;
 	hovermode: 'closest' | 'x' | 'y' | false;
 	hoverlabel: Partial<Label>;
-	calendar: Calendar;
+    calendar: Calendar;
     'xaxis.range': [Datum, Datum];
 	'xaxis.range[0]': Datum;
 	'xaxis.range[1]': Datum;
@@ -143,17 +149,17 @@ export interface Layout {
 	'xaxis.type': AxisType;
 	'xaxis.autorange': boolean;
 	'yaxis.autorange': boolean;
-	ternary: {}; // TODO
+    ternary: {}; // TODO
     geo: {}; // TODO
     mapbox: {}; // TODO
-	radialaxis: {}; // TODO
+    radialaxis: {}; // TODO
     angularaxis: {}; // TODO
     direction: 'clockwise' | 'counterclockwise';
     dragmode: 'zoom' | 'pan' | 'select' | 'lasso' | 'orbit' | 'turntable';
     orientation: number;
-    annotations: {}; // TODO
-	shapes: Array<Partial<Shape>>;
-    images: {}; // TODO
+    annotations: Array<Partial<Annotations>>;
+    shapes: Array<Partial<Shape>>;
+    images: Array<Partial<Image>>;
     updatemenus: {}; // TODO
     sliders: {}; // TODO
     legend: Partial<Legend>;
@@ -293,32 +299,39 @@ export type ButtonClickEvent = (gd: PlotlyHTMLElement, ev: MouseEvent) => void;
 
 export interface ModeBarButton {
 	/** name / id of the buttons (for tracking) */
-	name: string;
+    name: string;
+
 	/**
 	 * text that appears while hovering over the button,
 	 * enter null, false or '' for no hover text
 	 */
-	title: string;
+    title: string;
+
 	/**
 	 * svg icon object associated with the button
 	 * can be linked to Plotly.Icons to use the default plotly icons
 	 */
-	icon: string;
+    icon: string;
+
 	/** icon positioning */
-	gravity?: string;
+    gravity?: string;
+
 	/**
 	 * click handler associated with the button, a function of
 	 * 'gd' (the main graph object) and
 	 * 'ev' (the event object)
 	 */
-	click: ButtonClickEvent;
+    click: ButtonClickEvent;
+
 	/**
 	 * attribute associated with button,
 	 * use this with 'val' to keep track of the state
 	 */
-	attr?: string;
+    attr?: string;
+
 	/** initial 'attr' value, can be a function of gd */
-	val?: any;
+    val?: any;
+
 	/** is the button a toggle button? */
 	toggle?: boolean;
 }
@@ -378,7 +391,7 @@ export interface ScatterMarker {
 	cmax: boolean;
 	cmin: boolean;
 	autocolorscale: boolean;
-    reversescale: boolean;
+	reversescale: boolean;
 	opacity: number | number[];
 	size: number | number[];
 	maxdisplayed: number;
@@ -388,7 +401,7 @@ export interface ScatterMarker {
 	showscale: boolean;
 	line: Partial<ScatterMarkerLine>;
 	colorbar: {}; // TODO
-    gradient: {}; // TODO
+	gradient: {}; // TODO
 }
 
 export interface ScatterMarkerLine {
@@ -418,87 +431,91 @@ export interface Font {
 }
 
 export interface Config {
-	// no interactivity, for export or image generation
+	/** no interactivity, for export or image generation */
 	staticPlot: boolean;
 
-	// we can edit titles, move annotations, etc
+	/** we can edit titles, move annotations, etc */
 	editable: boolean;
 
-	// DO autosize once regardless of layout.autosize
-	// (use default width or height values otherwise)
+	/** DO autosize once regardless of layout.autosize (use default width or height values otherwise) */
 	autosizable: boolean;
 
-	// set the length of the undo/redo queue
+	/** set the length of the undo/redo queue */
 	queueLength: number;
 
-	// if we DO autosize, do we fill the container or the screen?
+	/** if we DO autosize, do we fill the container or the screen? */
 	fillFrame: boolean;
 
-	// if we DO autosize, set the frame margins in percents of plot size
+	/** if we DO autosize, set the frame margins in percents of plot size */
 	frameMargins: number;
 
-	// mousewheel or two-finger scroll zooms the plot
+	/** mousewheel or two-finger scroll zooms the plot */
 	scrollZoom: boolean;
 
-	// double click interaction (false, 'reset', 'autosize' or 'reset+autosize')
+	/** double click interaction (false, 'reset', 'autosize' or 'reset+autosize') */
 	doubleClick: 'reset+autosize' | 'reset' | 'autosize' | false;
 
-	// new users see some hints about interactivity
+	/** new users see some hints about interactivity */
 	showTips: boolean;
 
-	// link to open this plot in plotly
+	/** link to open this plot in plotly */
 	showLink: boolean;
 
-	// if we show a link, does it contain data or just link to a plotly file?
+	/** if we show a link, does it contain data or just link to a plotly file? */
 	sendData: boolean;
 
-	// text appearing in the sendData link
+	/** text appearing in the sendData link */
 	linkText: string;
 
-	// false or function adding source(s) to linkText <text>
+	/** false or function adding source(s) to linkText <text> */
 	showSources: boolean;
 
-	// display the mode bar (true, false, or 'hover')
+	/** display the mode bar (true, false, or 'hover') */
 	displayModeBar: 'hover' | boolean;
 
-	// remove mode bar button by name
-	// (see ./components/modebar/buttons.js for the list of names)
+	/** remove mode bar button by name (see ./components/modebar/buttons.js for the list of names) */
 	modeBarButtonsToRemove: ModeBarDefaultButtons[];
 
-	// add mode bar button using config objects
-	// (see ./components/modebar/buttons.js for list of arguments)
+	/** add mode bar button using config objects (see ./components/modebar/buttons.js for list of arguments) */
 	modeBarButtonsToAdd: ModeBarDefaultButtons[] | ModeBarButton[];
 
-	// fully custom mode bar buttons as nested array,
-	// where the outer arrays represents button groups, and
-	// the inner arrays have buttons config objects or names of default buttons
-	// (see ./components/modebar/buttons.js for more info)
+	/**
+	 * fully custom mode bar buttons as nested array, where the outer
+	 * arrays represents button groups, and the inner arrays have
+	 * buttons config objects or names of default buttons
+	 * (see ./components/modebar/buttons.js for more info)
+	 */
 	modeBarButtons: ModeBarDefaultButtons[][] | ModeBarButton[][];
 
-	// add the plotly logo on the end of the mode bar
+	/** add the plotly logo on the end of the mode bar */
 	displaylogo: boolean;
 
-	// increase the pixel ratio for Gl plot images
+	/** increase the pixel ratio for Gl plot images */
 	plotGlPixelRatio: number;
 
-	// function to add the background color to a different container
-	// or 'opaque' to ensure there's white behind it
+	/**
+	 * function to add the background color to a different container
+	 * or 'opaque' to ensure there's white behind it
+	 */
 	setBackground: string | 'opaque';
 
-	// URL to topojson files used in geo charts
+	/** URL to topojson files used in geo charts */
 	topojsonURL: string;
 
-	// Mapbox access token (required to plot mapbox trace types)
-	// If using an Mapbox Atlas server, set this option to '',
-	// so that plotly.js won't attempt to authenticate to the public Mapbox server.
+	/**
+	 * Mapbox access token (required to plot mapbox trace types)
+	 * If using an Mapbox Atlas server, set this option to '',
+	 * so that plotly.js won't attempt to authenticate to the public Mapbox server.
+	 */
 	mapboxAccessToken: string;
 
-	// Turn all console logging on or off (errors will be thrown)
-	// This should ONLY be set via Plotly.setPlotConfig
+	/**
+	 * Turn all console logging on or off (errors will be thrown)
+	 * This should ONLY be set via Plotly.setPlotConfig
+	 */
 	logging: boolean;
 
-	// Set global transform to be applied to all traces with no
-	// specification needed
+	/** Set global transform to be applied to all traces with no specification needed */
 	globalTransforms: any[];
 }
 
@@ -543,34 +560,279 @@ export interface Label {
 	font: Partial<Font>;
 }
 
-export interface Annotations extends Point, Label {
-	visible: boolean;
-	ax: number;
-	ay: number;
-	xanchor: 'auto' | 'left' | 'center' | 'right';
-	xshift: number;
-	yanchor: 'auto' | 'top' | 'middle' | 'bottom';
-	yshift: number;
-	text: string;
-	textangle: string;
-	width: number;
-	height: number;
-	opacity: number;
-	align: 'left' | 'center' | 'right';
-	valign: 'top' | 'middle' | 'bottom';
-	borderpad: number;
-	borderwidth: number;
-	showarrow: boolean;
-	arrowcolor: string;
-	arrowhead: number;
-	arrowsize: number;
-	arrowwidth: number;
-	standoff: number;
-	hovertext: string;
-	hoverlabel: Partial<Label>;
+export interface Annotations extends Label {
+  /** Determines whether or not this annotation is visible. */
+  visible: boolean;
+
+  /**
+   * Sets the text associated with this annotation.
+   * Plotly uses a subset of HTML tags to do things like
+   * newline (<br>), bold (<b></b>), italics (<i></i>),
+   * hyperlinks (<a href='...'></a>). Tags <em>, <sup>, <sub>
+   * <span> are also supported.
+   */
+  text: string;
+
+  /** Sets the angle at which the `text` is drawn with respect to the horizontal. */
+  textangle: string;
+
+  /**
+   * Sets an explicit width for the text box. null (default) lets the
+   * text set the box width. Wider text will be clipped.
+   * There is no automatic wrapping; use <br> to start a new line.
+   */
+  width: number;
+
+  /**
+   * Sets an explicit height for the text box. null (default) lets the
+   * text set the box height. Taller text will be clipped.
+   */
+  height: number;
+
+  /** Sets the opacity of the annotation (text + arrow). */
+  opacity: number;
+
+  /**
+   * Sets the horizontal alignment of the `text` within the box.
+   * Has an effect only if `text` spans more two or more lines
+   * (i.e. `text` contains one or more <br> HTML tags) or if an
+   * explicit width is set to override the text width.
+   */
+  align: 'left' | 'center' | 'right';
+
+  /**
+   * Sets the vertical alignment of the `text` within the box.
+   * Has an effect only if an explicit height is set to override the text height.
+   */
+  valign: 'top' | 'middle' | 'bottom';
+
+  /** Sets the padding (in px) between the `text` and the enclosing border. */
+  borderpad: number;
+
+  /** Sets the width (in px) of the border enclosing the annotation `text`. */
+  borderwidth: number;
+
+  /**
+   * Determines whether or not the annotation is drawn with an arrow.
+   * If *true*, `text` is placed near the arrow's tail.
+   * If *false*, `text` lines up with the `x` and `y` provided.
+   */
+  showarrow: boolean;
+
+  /** Sets the color of the annotation arrow. */
+  arrowcolor: string;
+
+  /** Sets the end annotation arrow head style. */
+  arrowhead: number;
+
+  /** Sets the start annotation arrow head style. */
+  startarrowhead: number;
+
+  /** Sets the annotation arrow head position. */
+  arrowside: 'end' | 'start';
+
+  /**
+   * Sets the size of the end annotation arrow head, relative to `arrowwidth`.
+   * A value of 1 (default) gives a head about 3x as wide as the line.
+   */
+  arrowsize: number;
+
+  /**
+   * Sets the size of the start annotation arrow head, relative to `arrowwidth`.
+   * A value of 1 (default) gives a head about 3x as wide as the line.
+   */
+  startarrowsize: number;
+
+  /** Sets the width (in px) of annotation arrow line. */
+  arrowwidth: number;
+
+  /**
+   * Sets a distance, in pixels, to move the end arrowhead away from the
+   * position it is pointing at, for example to point at the edge of
+   * a marker independent of zoom. Note that this shortens the arrow
+   * from the `ax` / `ay` vector, in contrast to `xshift` / `yshift`
+   * which moves everything by this amount.
+   */
+  standoff: number;
+
+  /**
+   * Sets a distance, in pixels, to move the start arrowhead away from the
+   * position it is pointing at, for example to point at the edge of
+   * a marker independent of zoom. Note that this shortens the arrow
+   * from the `ax` / `ay` vector, in contrast to `xshift` / `yshift`
+   * which moves everything by this amount.
+   */
+  startstandoff: number;
+
+  /**
+   * Sets the x component of the arrow tail about the arrow head.
+   * If `axref` is `pixel`, a positive (negative)
+   * component corresponds to an arrow pointing
+   * from right to left (left to right).
+   * If `axref` is an axis, this is an absolute value on that axis,
+   * like `x`, NOT a relative value.
+   */
+  ax: number;
+
+  /**
+   * Sets the y component of the arrow tail about the arrow head.
+   * If `ayref` is `pixel`, a positive (negative)
+   * component corresponds to an arrow pointing
+   * from bottom to top (top to bottom).
+   * If `ayref` is an axis, this is an absolute value on that axis,
+   * like `y`, NOT a relative value.
+   */
+  ay: number;
+
+  /**
+   * Indicates in what terms the tail of the annotation (ax,ay)
+   * is specified. If `pixel`, `ax` is a relative offset in pixels
+   * from `x`. If set to an x axis id (e.g. *x* or *x2*), `ax` is
+   * specified in the same terms as that axis. This is useful
+   * for trendline annotations which should continue to indicate
+   * the correct trend when zoomed.
+   */
+  axref: 'pixel';
+
+  /**
+   * Indicates in what terms the tail of the annotation (ax,ay)
+   * is specified. If `pixel`, `ay` is a relative offset in pixels
+   * from `y`. If set to a y axis id (e.g. *y* or *y2*), `ay` is
+   * specified in the same terms as that axis. This is useful
+   * for trendline annotations which should continue to indicate
+   * the correct trend when zoomed.
+   */
+  ayref: 'pixel';
+
+  /**
+   * Sets the annotation's x coordinate axis.
+   * If set to an x axis id (e.g. *x* or *x2*), the `x` position refers to an x coordinate
+   * If set to *paper*, the `x` position refers to the distance from
+   * the left side of the plotting area in normalized coordinates
+   * where 0 (1) corresponds to the left (right) side.
+   */
+  xref: 'paper' | 'x';
+
+  /**
+   * Sets the annotation's x position.
+   * If the axis `type` is *log*, then you must take the log of your desired range.
+   * If the axis `type` is *date*, it should be date strings, like date data,
+   * though Date objects and unix milliseconds will be accepted and converted to strings.
+   * If the axis `type` is *category*, it should be numbers, using the scale where each
+   * category is assigned a serial number from zero in the order it appears.
+   */
+  x: number | string;
+
+  /**
+   * Sets the text box's horizontal position anchor
+   * This anchor binds the `x` position to the *left*, *center* or *right* of the annotation.
+   * For example, if `x` is set to 1, `xref` to *paper* and `xanchor` to *right* then the
+   * right-most portion of the annotation lines up with the right-most edge of the plotting area.
+   * If *auto*, the anchor is equivalent to *center* for data-referenced annotations or if there
+   * is an arrow, whereas for paper-referenced with no arrow, the anchor picked corresponds to the closest side.
+   */
+  xanchor: 'auto' | 'left' | 'center' | 'right';
+
+  /**
+   * Shifts the position of the whole annotation and arrow to the
+   * right (positive) or left (negative) by this many pixels.
+   */
+  xshift: number;
+
+  /**
+   * Sets the annotation's y coordinate axis.
+   * If set to an y axis id (e.g. *y* or *y2*), the `y` position refers to an y coordinate
+   * If set to *paper*, the `y` position refers to the distance from
+   * the bottom of the plotting area in normalized coordinates
+   * where 0 (1) corresponds to the bottom (top).
+   */
+  yref: 'paper' | 'y';
+
+  /**
+   * Sets the annotation's y position.
+   * If the axis `type` is *log*, then you must take the log of your desired range.
+   * If the axis `type` is *date*, it should be date strings, like date data,
+   * though Date objects and unix milliseconds will be accepted and converted to strings.
+   * If the axis `type` is *category*, it should be numbers, using the scale where each
+   * category is assigned a serial number from zero in the order it appears.
+   */
+  y: number | string;
+
+  /**
+   * Sets the text box's vertical position anchor
+   * This anchor binds the `y` position to the *top*, *middle* or *bottom* of the annotation.
+   * For example, if `y` is set to 1, `yref` to *paper* and `yanchor` to *top* then the
+   * top-most portion of the annotation lines up with the top-most edge of the plotting area.
+   * If *auto*, the anchor is equivalent to *middle* for data-referenced annotations or if
+   * there is an arrow, whereas for paper-referenced with no arrow, the anchor picked
+   * corresponds to the closest side.
+   */
+  yanchor: 'auto' | 'top' | 'middle' | 'bottom';
+
+  /**
+   * Shifts the position of the whole annotation and arrow up
+   * (positive) or down (negative) by this many pixels.
+   */
+  yshift: number;
+
+  /**
+   * Makes this annotation respond to clicks on the plot.
+   * If you click a data point that exactly matches the `x` and `y` values of this annotation,
+   * and it is hidden (visible: false), it will appear. In *onoff* mode, you must click the same
+   * point again to make it disappear, so if you click multiple points, you can show multiple
+   * annotations. In *onout* mode, a click anywhere else in the plot (on another data point or not)
+   * will hide this annotation. If you need to show/hide this annotation in response to different
+   * `x` or `y` values, you can set `xclick` and/or `yclick`. This is useful for example to label
+   * the side of a bar. To label markers though, `standoff` is preferred over `xclick` and `yclick`.
+   */
+  clicktoshow: false | 'onoff' | 'onout';
+
+  /**
+   * Toggle this annotation when clicking a data point whose `x` value
+   * is `xclick` rather than the annotation's `x` value.
+   */
+  xclick: any;
+
+  /**
+   * Toggle this annotation when clicking a data point whose `y` value
+   * is `yclick` rather than the annotation's `y` value.
+   */
+  yclick: any;
+
+  /**
+   * Sets text to appear when hovering over this annotation.
+   * If omitted or blank, no hover label will appear.
+   */
+  hovertext: string;
+
+  hoverlabel: Partial<Label>;
+
+  /**
+   * Determines whether the annotation text box captures mouse move and click events,
+   * or allows those events to pass through to data points in the plot that may be
+   * behind the annotation. By default `captureevents` is *false* unless `hovertext`
+   * is provided. If you use the event `plotly_clickannotation` without `hovertext`
+   * you must explicitly enable `captureevents`.
+   */
 	captureevents: boolean;
 }
 
+export interface Image {
+  visible: boolean;
+  source: string;
+  layer: 'above' | 'below';
+  sizex: number;
+  sizey: number;
+  sizing: 'fill' | 'contain' | 'stretch';
+  opacity: number;
+  x: number | string;
+  y: number | string;
+  xanchor: 'left' | 'center' | 'right';
+  yanchor: 'top' | 'middle' | 'bottom';
+  xref: 'paper' | 'x';
+  yref: 'paper' | 'y';
+}
+
 export interface Scene {
 	bgcolor: string;
 	camera: Partial<Camera>;

From 832a10dc977ed6aca633abfbad5613e5ba9c5c23 Mon Sep 17 00:00:00 2001
From: Ricky Brundritt <ricky_brundritt@hotmail.com>
Date: Fri, 9 Mar 2018 16:02:31 -0800
Subject: [PATCH 0400/1382] Added bingmaps to notNeededPackages.json

---
 notNeededPackages.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/notNeededPackages.json b/notNeededPackages.json
index a3423d479c..8c587f7c43 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -173,6 +173,12 @@
             "typingsPackageName": "bignumber.js",
             "sourceRepoURL": "https://github.com/MikeMcl/bignumber.js/",
             "asOfVersion": "5.0.0"
+        },
+		{
+            "libraryName": "bingmaps",
+            "typingsPackageName": "bingmaps",
+            "sourceRepoURL": "https://github.com/Microsoft/Bing-Maps-V8-TypeScript-Definitions",
+            "asOfVersion": "2.0.15"
         },
         {
             "libraryName": "botvs",

From 7e5906f0b70809fe8d18fbdb0dc425eb296e4349 Mon Sep 17 00:00:00 2001
From: Grant Timmerman <granttimmerman@gmail.com>
Date: Fri, 9 Mar 2018 17:08:42 -0800
Subject: [PATCH 0401/1382] Simplify OAuth tests.

---
 .../google-apps-script-oauth2-tests.ts                   | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/types/google-apps-script-oauth2/google-apps-script-oauth2-tests.ts b/types/google-apps-script-oauth2/google-apps-script-oauth2-tests.ts
index ca6d874fa4..4bad3291ff 100644
--- a/types/google-apps-script-oauth2/google-apps-script-oauth2-tests.ts
+++ b/types/google-apps-script-oauth2/google-apps-script-oauth2-tests.ts
@@ -14,8 +14,7 @@ function getDriveService() {
         .setScope('https://www.googleapis.com/auth/drive')
         .setParam('login_hint', Session.getActiveUser().getEmail())
         .setParam('access_type', 'offline')
-        .setParam('approval_prompt', 'force')
-    ;
+        .setParam('approval_prompt', 'force');
 }
 
 /**
@@ -24,9 +23,5 @@ function getDriveService() {
 function authCallback(request: any) {
     const driveService = getDriveService();
     const isAuthorized = driveService.handleCallback(request);
-    if (isAuthorized) {
-        Logger.log('success');
-    } else {
-        Logger.log('denied');
-    }
+    Logger.log(isAuthorized ? 'success' : 'denied');
 }

From 93d6856546d0d3285cac2f71a1e8bfde5f04d060 Mon Sep 17 00:00:00 2001
From: Kevyn Bruyere <k.bruyere@optimiz.me>
Date: Sat, 10 Mar 2018 02:48:28 +0100
Subject: [PATCH 0402/1382] [seneca] Add generic types on add and act

---
 types/seneca/index.d.ts      | 30 ++++++++++++++++++----
 types/seneca/seneca-tests.ts | 50 ++++++++++++++++++++++++++++++++++++
 2 files changed, 75 insertions(+), 5 deletions(-)

diff --git a/types/seneca/index.d.ts b/types/seneca/index.d.ts
index ecf3c29096..4dfd82cb1c 100644
--- a/types/seneca/index.d.ts
+++ b/types/seneca/index.d.ts
@@ -1,7 +1,9 @@
 // Type definitions for seneca v2.1.0
 // Project: https://www.npmjs.com/package/seneca
 // Definitions by: Peter Snider <https://github.com/psnider>
+//                 Kevyn Bruyere <https://github.com/kevynb>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped/seneca
+// TypeScript Version: 2.3
 
 
 declare module "seneca" {
@@ -168,11 +170,21 @@ declare module "seneca" {
             sort$?: any;
         }
 
+        interface PartialMessagePayload {
+            transport$: object | {};
+            plugin$: any;
+            fatal$: boolean;
+            tx$: string;
+        }
 
+        type MessagePayload<T> = PartialMessagePayload & T;
 
         type Pattern = string | MinimalPattern;
         type GlobalErrorHandler = (error: Error) => void;
-        type AddCallback = (msg: any, respond: (error: Error | null, msg?: any) => void) => void;
+        type AddCallback<T = any> = (
+            msg: MessagePayload<T>,
+            respond: (error: Error | null, msg?: any) => void,
+        ) => void;
         type ActCallback = (error: Error | null, result?: any) => void;
         type CloseCallback = (optional: any, done: (error: Error) => void) => void;
         type DatabaseID = string;
@@ -199,10 +211,18 @@ declare module "seneca" {
 
             ready(callback: (error: Error) => void): void;
 
-            add(pattern: Pattern, action: AddCallback): this;
-            add(pattern: Pattern, paramspec: any, action: AddCallback): this;
-            act(pattern: Pattern, respond: ActCallback): void;
-            act(pattern: Pattern, msg: any, respond: ActCallback): void;
+            add<PatternType = any, CallBackParams = any>(
+                pattern: PatternType,
+                action: AddCallback<PatternType & CallBackParams>,
+            ): this;
+            add<PatternType = any, CallbackParams = any>(
+                pattern: PatternType,
+                paramspec: any,
+                action: AddCallback<PatternType & CallbackParams>,
+            ): this;
+
+            act<PatternWithArgs = Pattern>(pattern: PatternWithArgs, respond: ActCallback): void;
+            act<PatternWithArgs = Pattern>(pattern: PatternWithArgs, msg: any, respond: ActCallback): void;
             make(entity_canon: string, properties?: any): Entity;
             make(base: string, entity_canon: string, properties?: any): Entity;
             make(zone: string, base: string, entity_canon: string, properties?: any): Entity;
diff --git a/types/seneca/seneca-tests.ts b/types/seneca/seneca-tests.ts
index 6ff0331ff6..376cede3f1 100644
--- a/types/seneca/seneca-tests.ts
+++ b/types/seneca/seneca-tests.ts
@@ -126,3 +126,53 @@ seneca.act('cmd:salestax,net:100,country:US,state:NY', function (err, result) {
 seneca.act('cmd:salestax,net:100,country:IE,category:reduced', function (err, result) {
   console.log('IE: ' + result.total)
 })
+
+/** With Generic Type usage **/
+seneca.add<SalestaxPattern, SalestaxParams>({cmd: 'salestax'}, function(args, callback) {
+    var rate = 0.23;
+    var total = args.net * (1 + rate);
+    callback(null, {total: total});
+});
+
+seneca.act<SalesTaxRequest>({cmd: 'salestax', net: 100}, function(err, result) {
+    console.log(result.total);
+});
+
+seneca.add<ConfigPattern, ConfigParams>({cmd: 'config'}, function(args, callback) {
+    var config: any = {
+        // any added here due to following config[] access
+        rate: 0.23,
+    };
+    var value = config[args.prop];
+    callback(null, {value: value});
+});
+
+seneca.add<SalestaxPattern, SalestaxParams>({cmd: 'salestax'}, function(args, callback) {
+    seneca.act<ConfigRequest>({cmd: 'config', prop: 'rate'}, function(err, result) {
+        var rate = parseFloat(result.value);
+        var total = args.net * (1 + rate);
+        callback(null, {total: total});
+    });
+});
+
+
+interface SalestaxPattern {
+    cmd: 'salestax';
+}
+
+interface SalestaxParams {
+    net: number;
+}
+
+export interface SalesTaxRequest extends SalestaxPattern, SalestaxParams {}
+
+interface ConfigPattern {
+    cmd: 'config';
+}
+
+interface ConfigParams {
+    prop: string;
+}
+
+export interface ConfigRequest extends ConfigPattern, ConfigParams {}
+

From 0c8427bca4f4452717f4ff02a6477181af31e825 Mon Sep 17 00:00:00 2001
From: Carl Foster <carl.foster@abx.com>
Date: Sat, 10 Mar 2018 13:05:28 +1000
Subject: [PATCH 0403/1382] Update tslint rules

---
 types/stellar-sdk/index.d.ts           | 920 ++++++++++++-------------
 types/stellar-sdk/stellar-sdk-tests.ts |  12 +-
 types/stellar-sdk/tslint.json          |   6 +-
 3 files changed, 467 insertions(+), 471 deletions(-)

diff --git a/types/stellar-sdk/index.d.ts b/types/stellar-sdk/index.d.ts
index 307c6b44af..e4a6e6a06f 100644
--- a/types/stellar-sdk/index.d.ts
+++ b/types/stellar-sdk/index.d.ts
@@ -8,35 +8,35 @@
 
 export class Account {
     constructor(accountId: string, sequence: string | number)
-    accountId(): string
-    sequenceNumber(): string
-    incrementSequenceNumber(): void
+    accountId(): string;
+    sequenceNumber(): string;
+    incrementSequenceNumber(): void;
 }
 
 export class CallBuilder<T extends Record> {
     constructor(serverUrl: string)
-    call(): Promise<CollectionPage<T>>
-    cursor(cursor: string): this
-    limit(limit: number): this
-    order(direction: 'asc' | 'desc'): this
-    stream(options?: { onmessage?: () => void, onerror?: () => void }): () => void
+    call(): Promise<CollectionPage<T>>;
+    cursor(cursor: string): this;
+    limit(limit: number): this;
+    order(direction: 'asc' | 'desc'): this;
+    stream(options?: { onmessage?: () => void, onerror?: () => void }): () => void;
 }
 
 export interface CollectionPage<T extends Record> {
-    records: T[],
-    next: () => Promise<CollectionPage<T>>,
-    prev: () => Promise<CollectionPage<T>>,
+    records: T[];
+    next: () => Promise<CollectionPage<T>>;
+    prev: () => Promise<CollectionPage<T>>;
 }
 
 export interface Record {
     _links: {
         [key: string]: RecordLink
-    }
+    };
 }
 
 export interface RecordLink {
-    href: string
-    templated?: boolean
+    href: string;
+    templated?: boolean;
 }
 
 /* Due to a bug with the recursive function requests */
@@ -45,37 +45,37 @@ export interface CollectionRecord<T extends Record> {
         next: RecordLink
         prev: RecordLink
         self: RecordLink
-    }
+    };
     _embedded: {
         records: T[]
-    }
+    };
 }
 
 export interface CallFunctionTemplateOptions {
-    cursor?: string | number
-    limit?: number
-    order?: 'asc' | 'desc'
+    cursor?: string | number;
+    limit?: number;
+    order?: 'asc' | 'desc';
 }
 
-export type CallFunction<T extends Record> = () => Promise<T>
+export type CallFunction<T extends Record> = () => Promise<T>;
 export type CallCollectionFunction<T extends Record> =
-    (options?: CallFunctionTemplateOptions) => Promise<CollectionRecord<T>>
+    (options?: CallFunctionTemplateOptions) => Promise<CollectionRecord<T>>;
 
 export interface AccountRecord extends Record {
-    id: string
-    paging_token: string
-    account_id: string
-    sequence: number
-    subentry_count: number
+    id: string;
+    paging_token: string;
+    account_id: string;
+    sequence: number;
+    subentry_count: number;
     thresholds: {
         low_threshold: number
         med_threshold: number
         high_threshold: number
-    }
+    };
     flags: {
         auth_required: boolean
         auth_revocable: boolean
-    }
+    };
     balances: Array<
     {
         balance: string
@@ -88,211 +88,211 @@ export interface AccountRecord extends Record {
         asset_code: string
         asset_issuer: string
     }
-    >
+    >;
     signers: Array<
     {
         _key: string
         weight: number
     }
-    >
+    >;
     data: {
         [key: string]: string
-    }
+    };
 
-    effects: CallCollectionFunction<EffectRecord>
-    offers: CallCollectionFunction<OfferRecord>
-    operations: CallCollectionFunction<OperationRecord>
-    payments: CallCollectionFunction<PaymentOperationRecord>
-    trades: CallCollectionFunction<TradeRecord>
+    effects: CallCollectionFunction<EffectRecord>;
+    offers: CallCollectionFunction<OfferRecord>;
+    operations: CallCollectionFunction<OperationRecord>;
+    payments: CallCollectionFunction<PaymentOperationRecord>;
+    trades: CallCollectionFunction<TradeRecord>;
 }
 
 export interface AssetRecord extends Record {
-    asset_type: 'credit_alphanum4' | 'credit_alphanum12'
-    asset_code: string
-    asset_issuer: string
-    paging_token: string
-    amount: string
-    num_accounts: number
+    asset_type: 'credit_alphanum4' | 'credit_alphanum12';
+    asset_code: string;
+    asset_issuer: string;
+    paging_token: string;
+    amount: string;
+    num_accounts: number;
     flags: {
         auth_required: boolean
         auth_revocable: boolean
-    }
+    };
 }
 
 export interface EffectRecord extends Record {
-    account: string
-    paging_token: string
-    starting_balance: string
-    type_i: string
-    type: string
+    account: string;
+    paging_token: string;
+    starting_balance: string;
+    type_i: string;
+    type: string;
 
-    operation?: CallFunction<OperationRecord>
-    precedes?: CallFunction<EffectRecord>
-    succeeds?: CallFunction<EffectRecord>
+    operation?: CallFunction<OperationRecord>;
+    precedes?: CallFunction<EffectRecord>;
+    succeeds?: CallFunction<EffectRecord>;
 }
 
 export interface LedgerRecord extends Record {
-    id: string
-    paging_token: string
-    hash: string
-    prev_hash: string
-    sequence: number
-    transaction_count: number
-    operation_count: number
-    closed_at: string
-    total_coins: string
-    fee_pool: string
-    base_fee: number
-    base_reserve: string
-    max_tx_set_size: number
-    protocol_version: number
-    header_xdr: string
-    base_fee_in_stroops: number
-    base_reserve_in_stroops: number
+    id: string;
+    paging_token: string;
+    hash: string;
+    prev_hash: string;
+    sequence: number;
+    transaction_count: number;
+    operation_count: number;
+    closed_at: string;
+    total_coins: string;
+    fee_pool: string;
+    base_fee: number;
+    base_reserve: string;
+    max_tx_set_size: number;
+    protocol_version: number;
+    header_xdr: string;
+    base_fee_in_stroops: number;
+    base_reserve_in_stroops: number;
 
-    effects: CallCollectionFunction<EffectRecord>
-    operations: CallCollectionFunction<OperationRecord>
-    self: CallFunction<LedgerRecord>
-    transactions: CallCollectionFunction<TransactionRecord>
+    effects: CallCollectionFunction<EffectRecord>;
+    operations: CallCollectionFunction<OperationRecord>;
+    self: CallFunction<LedgerRecord>;
+    transactions: CallCollectionFunction<TransactionRecord>;
 }
 
 export interface OfferRecord extends Record {
-    id: string
-    paging_token: string
-    seller_attr: string
-    selling: Asset
-    buying: Asset
-    amount: string
-    price_r: { numerator: number, denominator: number }
-    price: string
+    id: string;
+    paging_token: string;
+    seller_attr: string;
+    selling: Asset;
+    buying: Asset;
+    amount: string;
+    price_r: { numerator: number, denominator: number };
+    price: string;
 
-    seller?: CallFunction<AccountRecord>
+    seller?: CallFunction<AccountRecord>;
 }
 
 export interface BaseOperationRecord extends Record {
-    id: string
-    paging_token: string
-    type: string
-    type_i: number
+    id: string;
+    paging_token: string;
+    type: string;
+    type_i: number;
 
-    self: CallFunction<OperationRecord>
-    succeeds: CallFunction<OperationRecord>
-    precedes: CallFunction<OperationRecord>
-    effects: CallCollectionFunction<EffectRecord>
-    transaction: CallFunction<TransactionRecord>
+    self: CallFunction<OperationRecord>;
+    succeeds: CallFunction<OperationRecord>;
+    precedes: CallFunction<OperationRecord>;
+    effects: CallCollectionFunction<EffectRecord>;
+    transaction: CallFunction<TransactionRecord>;
 }
 
 export interface CreateAccountOperationRecord extends BaseOperationRecord {
-    type: 'create_account'
-    account: string
-    funder: string
-    starting_balance: string
+    type: 'create_account';
+    account: string;
+    funder: string;
+    starting_balance: string;
 }
 
 export interface PaymentOperationRecord extends BaseOperationRecord {
-    type: 'payment'
-    from: string
-    to: string
-    asset_type: string
-    asset_code?: string
-    asset_issuer?: string
-    amount: string
+    type: 'payment';
+    from: string;
+    to: string;
+    asset_type: string;
+    asset_code?: string;
+    asset_issuer?: string;
+    amount: string;
 
-    sender: CallFunction<AccountRecord>
-    receiver: CallFunction<AccountRecord>
+    sender: CallFunction<AccountRecord>;
+    receiver: CallFunction<AccountRecord>;
 }
 
 export interface PathPaymentOperationRecord extends BaseOperationRecord {
-    type: 'path_payment'
-    from: string
-    to: string
-    asset_code?: string
-    asset_issuer?: string
-    asset_type: string
-    amount: string
-    source_asset_code?: string
-    source_asset_issuer?: string
-    source_asset_type: string
-    source_max: string
-    source_amount: string
+    type: 'path_payment';
+    from: string;
+    to: string;
+    asset_code?: string;
+    asset_issuer?: string;
+    asset_type: string;
+    amount: string;
+    source_asset_code?: string;
+    source_asset_issuer?: string;
+    source_asset_type: string;
+    source_max: string;
+    source_amount: string;
 }
 
 export interface ManageOfferOperationRecord extends BaseOperationRecord {
-    type: 'manage_offer'
-    offer_id: number
-    amount: string
-    buying_asset_code?: string
-    buying_asset_issuer?: string
-    buying_asset_type: string
-    price: string
-    price_r: { numerator: number, denominator: number }
-    selling_asset_code?: string
-    selling_asset_issuer?: string
-    selling_asset_type: string
+    type: 'manage_offer';
+    offer_id: number;
+    amount: string;
+    buying_asset_code?: string;
+    buying_asset_issuer?: string;
+    buying_asset_type: string;
+    price: string;
+    price_r: { numerator: number, denominator: number };
+    selling_asset_code?: string;
+    selling_asset_issuer?: string;
+    selling_asset_type: string;
 }
 
 export interface PassiveOfferOperationRecord extends BaseOperationRecord {
-    type: 'create_passive_offer'
-    offer_id: number
-    amount: string
-    buying_asset_code?: string
-    buying_asset_issuer?: string
-    buying_asset_type: string
-    price: string
-    price_r: { numerator: number, denominator: number }
-    selling_asset_code?: string
-    selling_asset_issuer?: string
-    selling_asset_type: string
+    type: 'create_passive_offer';
+    offer_id: number;
+    amount: string;
+    buying_asset_code?: string;
+    buying_asset_issuer?: string;
+    buying_asset_type: string;
+    price: string;
+    price_r: { numerator: number, denominator: number };
+    selling_asset_code?: string;
+    selling_asset_issuer?: string;
+    selling_asset_type: string;
 }
 
 export interface SetOptionsOperationRecord extends BaseOperationRecord {
-    type: 'set_options'
-    signer_key?: string
-    signer_weight?: number
-    master_key_weight?: number
-    low_threshold?: number
-    med_threshold?: number
-    high_threshold?: number
-    home_domain?: string
-    set_flags: Array<(1 | 2)>
-    set_flags_s: Array<('auth_required_flag' | 'auth_revocable_flag')>
-    clear_flags: Array<(1 | 2)>
-    clear_flags_s: Array<('auth_required_flag' | 'auth_revocable_flag')>
+    type: 'set_options';
+    signer_key?: string;
+    signer_weight?: number;
+    master_key_weight?: number;
+    low_threshold?: number;
+    med_threshold?: number;
+    high_threshold?: number;
+    home_domain?: string;
+    set_flags: Array<(1 | 2)>;
+    set_flags_s: Array<('auth_required_flag' | 'auth_revocable_flag')>;
+    clear_flags: Array<(1 | 2)>;
+    clear_flags_s: Array<('auth_required_flag' | 'auth_revocable_flag')>;
 }
 
 export interface ChangeTrustOperationRecord extends BaseOperationRecord {
-    type: 'change_trust'
-    asset_code: string
-    asset_issuer: string
-    asset_type: string
-    trustee: string
-    trustor: string
-    limit: string
+    type: 'change_trust';
+    asset_code: string;
+    asset_issuer: string;
+    asset_type: string;
+    trustee: string;
+    trustor: string;
+    limit: string;
 }
 
 export interface AllowTrustOperationRecord extends BaseOperationRecord {
-    type: 'allow_trust'
-    asset_code: string
-    asset_issuer: string
-    asset_type: string
-    authorize: boolean
-    trustee: string
-    trustor: string
+    type: 'allow_trust';
+    asset_code: string;
+    asset_issuer: string;
+    asset_type: string;
+    authorize: boolean;
+    trustee: string;
+    trustor: string;
 }
 
 export interface AccountMergeOperationRecord extends BaseOperationRecord {
-    type: 'account_merge'
-    into: string
+    type: 'account_merge';
+    into: string;
 }
 
 export interface InflationOperationRecord extends BaseOperationRecord {
-    type: 'inflation'
+    type: 'inflation';
 }
 
 export interface ManageDataOperationRecord extends BaseOperationRecord {
-    type: 'manage_data'
-    name: string
-    value: string
+    type: 'manage_data';
+    name: string;
+    value: string;
 }
 
 export type OperationRecord = CreateAccountOperationRecord
@@ -305,13 +305,13 @@ export type OperationRecord = CreateAccountOperationRecord
     | AllowTrustOperationRecord
     | AccountMergeOperationRecord
     | InflationOperationRecord
-    | ManageDataOperationRecord
+    | ManageDataOperationRecord;
 
 export interface OrderbookRecord extends Record {
-    bids: Array<{ price_r: {}, price: number, amount: string }>
-    asks: Array<{ price_r: {}, price: number, amount: string }>
-    selling: Asset
-    buying: Asset
+    bids: Array<{ price_r: {}, price: number, amount: string }>;
+    asks: Array<{ price_r: {}, price: number, amount: string }>;
+    selling: Asset;
+    buying: Asset;
 }
 
 export interface PaymentPathRecord extends Record {
@@ -319,96 +319,96 @@ export interface PaymentPathRecord extends Record {
         asset_code: string
         asset_issuer: string
         asset_type: string
-    }>
-    source_amount: string
-    source_asset_type: string
-    source_asset_code: string
-    source_asset_issuer: string
-    destination_amount: string
-    destination_asset_type: string
-    destination_asset_code: string
-    destination_asset_issuer: string
+    }>;
+    source_amount: string;
+    source_asset_type: string;
+    source_asset_code: string;
+    source_asset_issuer: string;
+    destination_amount: string;
+    destination_asset_type: string;
+    destination_asset_code: string;
+    destination_asset_issuer: string;
 }
 
 export interface TradeRecord extends Record {
-    id: string
-    paging_token: string
-    ledger_close_time: string
-    base_account: string
-    base_amount: string
-    base_asset_type: string
-    base_asset_code: string
-    base_asset_issuer: string
-    counter_account: string
-    counter_amount: string
-    counter_asset_type: string
-    counter_asset_code: string
-    counter_asset_issuer: string
-    base_is_seller: boolean
+    id: string;
+    paging_token: string;
+    ledger_close_time: string;
+    base_account: string;
+    base_amount: string;
+    base_asset_type: string;
+    base_asset_code: string;
+    base_asset_issuer: string;
+    counter_account: string;
+    counter_amount: string;
+    counter_asset_type: string;
+    counter_asset_code: string;
+    counter_asset_issuer: string;
+    base_is_seller: boolean;
 
-    base: CallFunction<AccountRecord>
-    counter: CallFunction<AccountRecord>
-    operation: CallFunction<OperationRecord>
+    base: CallFunction<AccountRecord>;
+    counter: CallFunction<AccountRecord>;
+    operation: CallFunction<OperationRecord>;
 }
 
 export interface TradeAggregationRecord extends Record {
-    timestamp: string
-    trade_count: number
-    base_volume: string
-    counter_volume: string
-    avg: string
-    high: string
-    low: string
-    open: string
-    close: string
+    timestamp: string;
+    trade_count: number;
+    base_volume: string;
+    counter_volume: string;
+    avg: string;
+    high: string;
+    low: string;
+    open: string;
+    close: string;
 }
 
 export interface TransactionRecord extends Record {
-    id: string
-    paging_token: string
-    hash: string
-    ledger_attr: number
-    created_at: string
-    max_fee: number
-    fee_paid: number
-    operation_count: number
-    result_code: number
-    result_code_s: string
-    source_account: string
-    source_account_sequence: string
-    envelope_xdr: string
-    result_xdr: string
-    result_meta_xdr: string
-    memo: string
+    id: string;
+    paging_token: string;
+    hash: string;
+    ledger_attr: number;
+    created_at: string;
+    max_fee: number;
+    fee_paid: number;
+    operation_count: number;
+    result_code: number;
+    result_code_s: string;
+    source_account: string;
+    source_account_sequence: string;
+    envelope_xdr: string;
+    result_xdr: string;
+    result_meta_xdr: string;
+    memo: string;
 
-    account: CallFunction<AccountRecord>
-    effects: CallCollectionFunction<EffectRecord>
-    ledger: CallFunction<LedgerRecord>
-    operations: CallCollectionFunction<OperationRecord>
-    precedes: CallFunction<TransactionRecord>
-    self: CallFunction<TransactionRecord>
-    succeeds: CallFunction<TransactionRecord>
+    account: CallFunction<AccountRecord>;
+    effects: CallCollectionFunction<EffectRecord>;
+    ledger: CallFunction<LedgerRecord>;
+    operations: CallCollectionFunction<OperationRecord>;
+    precedes: CallFunction<TransactionRecord>;
+    self: CallFunction<TransactionRecord>;
+    succeeds: CallFunction<TransactionRecord>;
 }
 
 export class AccountCallBuilder extends CallBuilder<AccountRecord> {
-    accountId(id: string): this
+    accountId(id: string): this;
 }
 export class AccountResponse implements AccountRecord {
-    _links: { [key: string]: { href: string } }
-    id: string
-    paging_token: string
-    account_id: string
-    sequence: number
-    subentry_count: number
+    _links: { [key: string]: { href: string } };
+    id: string;
+    paging_token: string;
+    account_id: string;
+    sequence: number;
+    subentry_count: number;
     thresholds: {
         low_threshold: number
         med_threshold: number
         high_threshold: number
-    }
+    };
     flags: {
         auth_required: boolean
         auth_revocable: boolean
-    }
+    };
     balances: Array<
         {
             balance: string
@@ -421,97 +421,97 @@ export class AccountResponse implements AccountRecord {
             asset_code: string
             asset_issuer: string
         }
-        >
+        >;
     signers: Array<
         {
             _key: string
             weight: number
         }
-        >
+        >;
     data: {
         [key: string]: string
-    }
+    };
 
-    effects: CallCollectionFunction<EffectRecord>
-    offers: CallCollectionFunction<OfferRecord>
-    operations: CallCollectionFunction<OperationRecord>
-    payments: CallCollectionFunction<PaymentOperationRecord>
-    trades: CallCollectionFunction<TradeRecord>
+    effects: CallCollectionFunction<EffectRecord>;
+    offers: CallCollectionFunction<OfferRecord>;
+    operations: CallCollectionFunction<OperationRecord>;
+    payments: CallCollectionFunction<PaymentOperationRecord>;
+    trades: CallCollectionFunction<TradeRecord>;
     constructor(response: AccountRecord)
-    accountId(): string
-    sequenceNumber(): string
-    incrementSequenceNumber(): void
+    accountId(): string;
+    sequenceNumber(): string;
+    incrementSequenceNumber(): void;
 }
 
 export class Asset {
-    static native(): Asset
+    static native(): Asset;
     constructor(code: string, issuer: string)
 
-    getCode(): string
-    getIssuer(): string
-    getAssetType(): 'native' | 'credit_alphanum4' | 'credit_alphanum12'
-    isNative(): boolean
-    equals(other: Asset): boolean
+    getCode(): string;
+    getIssuer(): string;
+    getAssetType(): 'native' | 'credit_alphanum4' | 'credit_alphanum12';
+    isNative(): boolean;
+    equals(other: Asset): boolean;
 
-    code: string
-    issuer: string
+    code: string;
+    issuer: string;
 }
 
 export class AssetsCallBuilder extends CallBuilder<AssetRecord> {
-    forCode(value: string): this
-    forIssuer(value: string): this
+    forCode(value: string): this;
+    forIssuer(value: string): this;
 }
 
 export namespace Config {
-    function setAllowHttp(allow: boolean): void
-    function isAllowHttp(): boolean
-    function setDefault(): void
+    function setAllowHttp(allow: boolean): void;
+    function isAllowHttp(): boolean;
+    function setDefault(): void;
 }
 
 export class EffectCallBuilder extends CallBuilder<EffectRecord> {
-    forAccount(accountId: string): this
-    forLedger(sequence: string): this
-    forOperation(operationId: number): this
-    forTransaction(transactionId: string): this
+    forAccount(accountId: string): this;
+    forLedger(sequence: string): this;
+    forOperation(operationId: number): this;
+    forTransaction(transactionId: string): this;
 }
 
 export interface FederationRecord {
-    account_id: string
-    memo_type?: string
-    memo?: string
+    account_id: string;
+    memo_type?: string;
+    memo?: string;
 }
 
 export interface FederationOptions {
-    allowHttp: boolean
+    allowHttp: boolean;
 }
 export class FederationServer {
-    static createForDomain(domain: string, options?: FederationOptions): Promise<FederationServer>
-    static resolve(value: string, options?: FederationOptions): Promise<FederationRecord>
+    static createForDomain(domain: string, options?: FederationOptions): Promise<FederationServer>;
+    static resolve(value: string, options?: FederationOptions): Promise<FederationRecord>;
 
     constructor(serverURL: string, domain: string, options?: FederationOptions)
-    resolveAccountId(account: string): Promise<FederationRecord>
-    resolveAddress(address: string): Promise<FederationRecord>
-    resolveTransactionId(transactionId: string): Promise<FederationRecord>
+    resolveAccountId(account: string): Promise<FederationRecord>;
+    resolveAddress(address: string): Promise<FederationRecord>;
+    resolveTransactionId(transactionId: string): Promise<FederationRecord>;
 }
 
 export class LedgerCallBuilder extends CallBuilder<LedgerRecord> { }
 
 export class Memo {
-    static fromXDRObject(memo: xdr.Memo): Memo
-    static hash(hash: string): Memo
-    static id(id: string): Memo
-    static none(): Memo
-    static return(hash: string): Memo
-    static text(text: string): Memo
+    static fromXDRObject(memo: xdr.Memo): Memo;
+    static hash(hash: string): Memo;
+    static id(id: string): Memo;
+    static none(): Memo;
+    static return(hash: string): Memo;
+    static text(text: string): Memo;
 
     constructor(type: 'MemoNone')
     constructor(type: 'MemoID' | 'MemoText', value: string)
     constructor(type: 'MemoHash' | 'MemoReturn', value: Buffer)
 
-    type: 'MemoNone' | 'MemoID' | 'MemoText' | 'MemoHash' | 'MemoReturn'
-    value: null | string | Buffer
+    type: 'MemoNone' | 'MemoID' | 'MemoText' | 'MemoHash' | 'MemoReturn';
+    value: null | string | Buffer;
 
-    toXDRObject(): xdr.Memo
+    toXDRObject(): xdr.Memo;
 }
 
 export enum Networks {
@@ -520,15 +520,15 @@ export enum Networks {
 }
 
 export class Network {
-    static use(network: Network): void
-    static usePublicNetwork(): void
-    static useTestNetwork(): void
-    static current(): Network
+    static use(network: Network): void;
+    static usePublicNetwork(): void;
+    static useTestNetwork(): void;
+    static current(): Network;
 
     constructor(passphrase: string)
 
-    networkPassphrase(): string
-    networkId(): string
+    networkPassphrase(): string;
+    networkId(): string;
 }
 
 export class OfferCallBuilder extends CallBuilder<OfferRecord> { }
@@ -544,7 +544,7 @@ export type TransactionOperation =
     | Operation.AllowTrust
     | Operation.AccountMerge
     | Operation.Inflation
-    | Operation.ManageData
+    | Operation.ManageData;
 
 export enum OperationType {
     createAccount = 'createAccount',
@@ -562,137 +562,137 @@ export enum OperationType {
 
 export namespace Operation {
     interface Operation {
-        type: OperationType
-        source: string | null
+        type: OperationType;
+        source: string | null;
     }
     interface AccountMerge extends Operation {
-        type: OperationType.accountMerge
-        destination: string
+        type: OperationType.accountMerge;
+        destination: string;
     }
     interface AccountMergeOptions {
-        destination: string
-        source?: string
+        destination: string;
+        source?: string;
     }
-    function accountMerge(options: AccountMergeOptions): xdr.Operation<AccountMerge>
+    function accountMerge(options: AccountMergeOptions): xdr.Operation<AccountMerge>;
 
     interface AllowTrust extends Operation {
-        type: OperationType.allowTrust
-        trustor: string
-        assetCode: string
-        authorize: boolean
+        type: OperationType.allowTrust;
+        trustor: string;
+        assetCode: string;
+        authorize: boolean;
     }
     interface AllowTrustOptions {
-        trustor: string
-        assetCode: string
-        authorize: boolean
-        source?: string
+        trustor: string;
+        assetCode: string;
+        authorize: boolean;
+        source?: string;
     }
-    function allowTrust(options: AllowTrustOptions): xdr.Operation<AllowTrust>
+    function allowTrust(options: AllowTrustOptions): xdr.Operation<AllowTrust>;
 
     interface ChangeTrust extends Operation {
-        type: OperationType.changeTrust
-        line: Asset
-        limit: string | number
+        type: OperationType.changeTrust;
+        line: Asset;
+        limit: string | number;
     }
     interface ChangeTrustOptions {
-        asset: Asset
-        limit: string
-        source?: string
+        asset: Asset;
+        limit: string;
+        source?: string;
     }
-    function changeTrust(options: ChangeTrustOptions): xdr.Operation<ChangeTrust>
+    function changeTrust(options: ChangeTrustOptions): xdr.Operation<ChangeTrust>;
 
     interface CreateAccount extends Operation {
-        type: OperationType.createAccount
-        source: string
-        destination: string
-        startingBalance: string | number
+        type: OperationType.createAccount;
+        source: string;
+        destination: string;
+        startingBalance: string | number;
     }
     interface CreateAccountOptions {
-        destination: string
-        startingBalance: string
-        source?: string
+        destination: string;
+        startingBalance: string;
+        source?: string;
     }
-    function createAccount(options: CreateAccountOptions): xdr.Operation<CreateAccount>
+    function createAccount(options: CreateAccountOptions): xdr.Operation<CreateAccount>;
 
     interface CreatePassiveOffer extends Operation {
-        type: OperationType.createPassiveOffer
-        selling: Asset
-        buying: Asset
-        amount: string | number
-        price: string | number
+        type: OperationType.createPassiveOffer;
+        selling: Asset;
+        buying: Asset;
+        amount: string | number;
+        price: string | number;
     }
     interface CreatePassiveOfferOptions {
-        selling: Asset
-        buying: Asset
-        amount: string
-        price: number | string | object
-        source?: string
+        selling: Asset;
+        buying: Asset;
+        amount: string;
+        price: number | string | object;
+        source?: string;
     }
-    function createPassiveOffer(options: CreatePassiveOfferOptions): xdr.Operation<CreatePassiveOffer>
+    function createPassiveOffer(options: CreatePassiveOfferOptions): xdr.Operation<CreatePassiveOffer>;
 
     interface Inflation extends Operation {
-        type: OperationType.inflation
+        type: OperationType.inflation;
     }
-    function inflation(options: { source?: string }): xdr.Operation<Inflation>
+    function inflation(options: { source?: string }): xdr.Operation<Inflation>;
 
     interface ManageData extends Operation {
-        type: OperationType.manageData
-        name: string
-        value: string
+        type: OperationType.manageData;
+        name: string;
+        value: string;
     }
     interface ManageDataOptions {
-        name: string
-        value: string | Buffer
-        source?: string
+        name: string;
+        value: string | Buffer;
+        source?: string;
     }
-    function manageData(options: ManageDataOptions): xdr.Operation<ManageData>
+    function manageData(options: ManageDataOptions): xdr.Operation<ManageData>;
 
     interface ManageOffer extends Operation {
-        type: OperationType.manageOffer
-        selling: Asset
-        buying: Asset
-        amount: string | number
-        price: string | number
-        offerId: string
+        type: OperationType.manageOffer;
+        selling: Asset;
+        buying: Asset;
+        amount: string | number;
+        price: string | number;
+        offerId: string;
     }
     interface ManageOfferOptions extends CreatePassiveOfferOptions {
-        offerId: number | string
+        offerId: number | string;
     }
-    function manageOffer(options: ManageOfferOptions): xdr.Operation<ManageOffer>
+    function manageOffer(options: ManageOfferOptions): xdr.Operation<ManageOffer>;
 
     interface PathPayment extends Operation {
-        type: OperationType.pathPayment
-        sendAsset: Asset
-        sendMax: string | number
-        destination: string
-        destAsset: Asset
-        destAmount: string | number
-        path: Asset[]
+        type: OperationType.pathPayment;
+        sendAsset: Asset;
+        sendMax: string | number;
+        destination: string;
+        destAsset: Asset;
+        destAmount: string | number;
+        path: Asset[];
     }
     interface PathPaymentOptions {
-        sendAsset: Asset
-        sendMax: string
-        destination: string
-        destAsset: Asset
-        destAmount: string
-        path: Asset[]
-        source?: string
+        sendAsset: Asset;
+        sendMax: string;
+        destination: string;
+        destAsset: Asset;
+        destAmount: string;
+        path: Asset[];
+        source?: string;
     }
-    function pathPayment(options: PathPaymentOptions): xdr.Operation<PathPayment>
+    function pathPayment(options: PathPaymentOptions): xdr.Operation<PathPayment>;
 
     interface Payment extends Operation {
-        type: OperationType.payment
-        destination: string
-        asset: Asset
-        amount: string | number
+        type: OperationType.payment;
+        destination: string;
+        asset: Asset;
+        amount: string | number;
     }
     interface PaymentOptions {
-        destination: string
-        asset: Asset
-        amount: string
-        source?: string
+        destination: string;
+        asset: Asset;
+        amount: string;
+        source?: string;
     }
-    function payment(options: PaymentOptions): xdr.Operation<Payment>
+    function payment(options: PaymentOptions): xdr.Operation<Payment>;
 
     /*
      * Required = 1 << 0
@@ -705,38 +705,38 @@ export namespace Operation {
         Immutable = 4,
     }
     interface Signer {
-        ed25519PublicKey?: string
-        sha256Hash?: Buffer | string
-        preAuthTx?: Buffer | string
-        weight?: number | string
+        ed25519PublicKey?: string;
+        sha256Hash?: Buffer | string;
+        preAuthTx?: Buffer | string;
+        weight?: number | string;
     }
     interface SetOptions extends Operation {
-        type: OperationType.setOptions
-        inflationDest?: string
-        clearFlags?: AuthFlags
-        setFlags?: AuthFlags
-        masterWeight?: number | string
-        lowThreshold?: number | string
-        medThreshold?: number | string
-        highThreshold?: number | string
-        homeDomain?: string
-        signer?: Signer
+        type: OperationType.setOptions;
+        inflationDest?: string;
+        clearFlags?: AuthFlags;
+        setFlags?: AuthFlags;
+        masterWeight?: number | string;
+        lowThreshold?: number | string;
+        medThreshold?: number | string;
+        highThreshold?: number | string;
+        homeDomain?: string;
+        signer?: Signer;
     }
     interface SetOptionsOptions {
-        inflationDest?: string
-        clearFlags?: AuthFlags
-        setFlags?: AuthFlags
-        masterWeight?: number | string
-        lowThreshold?: number | string
-        medThreshold?: number | string
-        highThreshold?: number | string
-        signer?: Signer
-        homeDomain?: string
-        source?: string
+        inflationDest?: string;
+        clearFlags?: AuthFlags;
+        setFlags?: AuthFlags;
+        masterWeight?: number | string;
+        lowThreshold?: number | string;
+        medThreshold?: number | string;
+        highThreshold?: number | string;
+        signer?: Signer;
+        homeDomain?: string;
+        source?: string;
     }
-    function setOptions(options: SetOptionsOptions): xdr.Operation<SetOptions>
+    function setOptions(options: SetOptionsOptions): xdr.Operation<SetOptions>;
 
-    function fromXDRObject<T extends Operation>(xdrOperation: xdr.Operation<T>): T
+    function fromXDRObject<T extends Operation>(xdrOperation: xdr.Operation<T>): T;
 }
 
 export class OperationCallBuilder extends CallBuilder<OperationRecord> { }
@@ -746,114 +746,114 @@ export class PaymentCallBuilder extends CallBuilder<PaymentOperationRecord> { }
 
 export class Server {
     constructor(serverURL: string, options?: { allowHttp: boolean })
-    accounts(): AccountCallBuilder
-    assets(): AssetsCallBuilder
-    effects(): EffectCallBuilder
-    ledgers(): LedgerCallBuilder
-    loadAccount(accountId: string): Promise<AccountResponse>
-    offers(resource: string, ...parameters: string[]): OfferCallBuilder
-    operations(): OperationCallBuilder
-    orderbook(selling: Asset, buying: Asset): OrderbookCallBuilder
+    accounts(): AccountCallBuilder;
+    assets(): AssetsCallBuilder;
+    effects(): EffectCallBuilder;
+    ledgers(): LedgerCallBuilder;
+    loadAccount(accountId: string): Promise<AccountResponse>;
+    offers(resource: string, ...parameters: string[]): OfferCallBuilder;
+    operations(): OperationCallBuilder;
+    orderbook(selling: Asset, buying: Asset): OrderbookCallBuilder;
     paths(
         source: string,
         destination: string,
         destinationAsset: Asset,
         destinationAmount: string,
-    ): PathCallBuilder
-    payments(): PaymentCallBuilder
-    submitTransaction(transaction: Transaction): Promise<any>
+    ): PathCallBuilder;
+    payments(): PaymentCallBuilder;
+    submitTransaction(transaction: Transaction): Promise<any>;
     tradeAggregation(
         base: Asset,
         counter: Asset,
         startTime: Date,
         endTime: Date,
         resolution: Date,
-    ): TradeAggregationCallBuilder
-    trades(): TradesCallBuilder
-    transactions(): TransactionCallBuilder
+    ): TradeAggregationCallBuilder;
+    trades(): TradesCallBuilder;
+    transactions(): TransactionCallBuilder;
 }
 
 export namespace StrKey {
-    function encodeEd25519PublicKey(data: Buffer): string
-    function decodeEd25519PublicKey(data: string): Buffer
-    function isValidEd25519PublicKey(Key: string): boolean
+    function encodeEd25519PublicKey(data: Buffer): string;
+    function decodeEd25519PublicKey(data: string): Buffer;
+    function isValidEd25519PublicKey(Key: string): boolean;
 
-    function encodeEd25519SecretSeed(data: Buffer): string
-    function decodeEd25519SecretSeed(data: string): Buffer
-    function isValidEd25519SecretSeed(seed: string): boolean
+    function encodeEd25519SecretSeed(data: Buffer): string;
+    function decodeEd25519SecretSeed(data: string): Buffer;
+    function isValidEd25519SecretSeed(seed: string): boolean;
 
-    function encodePreAuthTx(data: Buffer): string
-    function decodePreAuthTx(data: string): Buffer
+    function encodePreAuthTx(data: Buffer): string;
+    function decodePreAuthTx(data: string): Buffer;
 
-    function encodeSha256Hash(data: Buffer): string
-    function decodeSha256Hash(data: string): Buffer
+    function encodeSha256Hash(data: Buffer): string;
+    function decodeSha256Hash(data: string): Buffer;
 }
 
 export class TradeAggregationCallBuilder extends CallBuilder<TradeAggregationRecord> { }
 export class TradesCallBuilder extends CallBuilder<TradeRecord> {
-    forAssetPair(base: Asset, counter: Asset): this
-    forOffer(offerId: string): this
+    forAssetPair(base: Asset, counter: Asset): this;
+    forOffer(offerId: string): this;
 }
 
 export class Transaction {
     constructor(envelope: string | xdr.TransactionEnvelope)
-    hash(): Buffer
-    sign(...keypairs: Keypair[]): void
-    signatureBase(): Buffer
-    signHashX(preimage: Buffer | string): void
-    toEnvelope(): xdr.TransactionEnvelope
+    hash(): Buffer;
+    sign(...keypairs: Keypair[]): void;
+    signatureBase(): Buffer;
+    signHashX(preimage: Buffer | string): void;
+    toEnvelope(): xdr.TransactionEnvelope;
 
-    operations: TransactionOperation[]
-    sequence: number
-    fee: number
-    source: string
-    memo: Memo
+    operations: TransactionOperation[];
+    sequence: number;
+    fee: number;
+    source: string;
+    memo: Memo;
 }
 
 export class TransactionBuilder {
     constructor(sourceAccount: Account, options?: TransactionBuilder.TransactionBuilderOptions)
-    addOperation(operation: xdr.Operation<Operation.Operation>): this
-    addMemo(memo: Memo): this
-    build(): Transaction
+    addOperation(operation: xdr.Operation<Operation.Operation>): this;
+    addMemo(memo: Memo): this;
+    build(): Transaction;
 }
 
 export namespace TransactionBuilder {
     interface TransactionBuilderOptions {
-        fee?: number
+        fee?: number;
         timebounds?: {
             minTime?: number | string
             maxTime?: number | string
-        }
-        memo?: Memo
+        };
+        memo?: Memo;
     }
 }
 
 export class TransactionCallBuilder extends CallBuilder<TransactionRecord> {
-    transaction(transactionId: string): this
-    forAccount(accountId: string): this
-    forLedger(sequence: string | number): this
+    transaction(transactionId: string): this;
+    forAccount(accountId: string): this;
+    forLedger(sequence: string | number): this;
 }
 
 export class Keypair {
-    static fromRawEd25519Seed(secretSeed: Buffer): Keypair
-    static fromSecret(secretKey: string): Keypair
-    static master(): Keypair
-    static fromPublicKey(publicKey: string): Keypair
-    static random(): Keypair
+    static fromRawEd25519Seed(secretSeed: Buffer): Keypair;
+    static fromSecret(secretKey: string): Keypair;
+    static master(): Keypair;
+    static fromPublicKey(publicKey: string): Keypair;
+    static random(): Keypair;
 
     constructor(keys: { type: 'ed25519', secretKey: string } | { type: 'ed25519', Key: string })
 
-    publicKey(): string
-    secret(): string
-    rawSecretKey(): Buffer
-    canSign(): boolean
-    sign(data: Buffer): Buffer
-    verify(data: Buffer, signature: Buffer): boolean
+    publicKey(): string;
+    secret(): string;
+    rawSecretKey(): Buffer;
+    canSign(): boolean;
+    sign(data: Buffer): Buffer;
+    verify(data: Buffer, signature: Buffer): boolean;
 }
 
 export namespace xdr {
     class XDRStruct {
-        toXDR(): Buffer
+        toXDR(): Buffer;
     }
     class Operation<T extends Operation.Operation> extends XDRStruct { }
     class Asset extends XDRStruct { }
diff --git a/types/stellar-sdk/stellar-sdk-tests.ts b/types/stellar-sdk/stellar-sdk-tests.ts
index c403b6bc56..4bd84ccc33 100644
--- a/types/stellar-sdk/stellar-sdk-tests.ts
+++ b/types/stellar-sdk/stellar-sdk-tests.ts
@@ -1,9 +1,9 @@
-import * as StellarSdk from 'stellar-sdk'
+import * as StellarSdk from 'stellar-sdk';
 
-const sourceKey = StellarSdk.Keypair.random() // $ExpectType Keypair
-const destKey = StellarSdk.Keypair.random()
-const account = new StellarSdk.Account(sourceKey.publicKey(), 1)
+const sourceKey = StellarSdk.Keypair.random(); // $ExpectType Keypair
+const destKey = StellarSdk.Keypair.random();
+const account = new StellarSdk.Account(sourceKey.publicKey(), 1);
 const transaction = new StellarSdk.TransactionBuilder(account)
     .addOperation(StellarSdk.Operation.accountMerge({destination: destKey.publicKey()}))
-    .build() // $ExpectType () => Transaction
-transaction // $ExpectType Transaction
+    .build(); // $ExpectType () => Transaction
+transaction; // $ExpectType Transaction
diff --git a/types/stellar-sdk/tslint.json b/types/stellar-sdk/tslint.json
index 69ba71b727..f93cf8562a 100644
--- a/types/stellar-sdk/tslint.json
+++ b/types/stellar-sdk/tslint.json
@@ -1,7 +1,3 @@
 {
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "quotemark": [true, "single"],
-        "semicolon": [true, "never"]
-    }
+    "extends": "dtslint/dt.json"
 }

From 8e68a0155ef17eb534b41fbbbceab4659c732b21 Mon Sep 17 00:00:00 2001
From: Matthew Douglass <matthew@douglass.email>
Date: Fri, 9 Mar 2018 19:29:50 -0800
Subject: [PATCH 0404/1382] Add use method to Pool<T> that was added in
 generic-pool 3.3.0

---
 types/generic-pool/generic-pool-tests.ts | 3 +++
 types/generic-pool/index.d.ts            | 1 +
 2 files changed, 4 insertions(+)

diff --git a/types/generic-pool/generic-pool-tests.ts b/types/generic-pool/generic-pool-tests.ts
index 970e83d870..9cc8707c86 100644
--- a/types/generic-pool/generic-pool-tests.ts
+++ b/types/generic-pool/generic-pool-tests.ts
@@ -41,6 +41,9 @@ const opts = {
 
 const pool = genericPool.createPool<Connection>(factory, opts);
 
+pool.use((conn: Connection) => 'test')
+    .then((result: string) => { });
+
 pool.acquire()
     .then((conn: Connection) => {
         return pool.release(conn);
diff --git a/types/generic-pool/index.d.ts b/types/generic-pool/index.d.ts
index 00f8852823..bcfbb907e1 100644
--- a/types/generic-pool/index.d.ts
+++ b/types/generic-pool/index.d.ts
@@ -22,6 +22,7 @@ export class Pool<T> extends EventEmitter {
     destroy(resource: T): void;
     drain(): PromiseLike<undefined>;
     clear(): PromiseLike<undefined[]>;
+    use<U>(cb: (resource: T) => U): PromiseLike<U>;
 }
 
 export interface Factory<T> {

From a93c2e91b6925eccb2c19d30c146d87dc9e6d9a8 Mon Sep 17 00:00:00 2001
From: yinz <uinz.cn@gmail.com>
Date: Sat, 10 Mar 2018 13:34:46 +0800
Subject: [PATCH 0405/1382] export Redirect from `react-router`

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

diff --git a/types/react-router-dom/index.d.ts b/types/react-router-dom/index.d.ts
index 8286745998..c5b795761c 100644
--- a/types/react-router-dom/index.d.ts
+++ b/types/react-router-dom/index.d.ts
@@ -12,6 +12,7 @@ import * as H from 'history';
 export {
     Prompt,
     MemoryRouter,
+    RedirectProps,
     Redirect,
     RouteComponentProps,
     RouteProps,

From b82cc7afb982c10c2997249381920e2529d00b90 Mon Sep 17 00:00:00 2001
From: DABH <DABH@users.noreply.github.com>
Date: Fri, 9 Mar 2018 23:02:48 -0800
Subject: [PATCH 0406/1382] colors.js now bundles typings, remove from DT

---
 notNeededPackages.json       |   8 ++-
 types/colors/colors-tests.ts |  21 ------
 types/colors/index.d.ts      | 133 -----------------------------------
 types/colors/safe.d.ts       |  40 -----------
 types/colors/tsconfig.json   |  24 -------
 types/colors/tslint.json     |   1 -
 6 files changed, 7 insertions(+), 220 deletions(-)
 delete mode 100644 types/colors/colors-tests.ts
 delete mode 100644 types/colors/index.d.ts
 delete mode 100644 types/colors/safe.d.ts
 delete mode 100644 types/colors/tsconfig.json
 delete mode 100644 types/colors/tslint.json

diff --git a/notNeededPackages.json b/notNeededPackages.json
index 8c587f7c43..06417dd58d 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -174,7 +174,7 @@
             "sourceRepoURL": "https://github.com/MikeMcl/bignumber.js/",
             "asOfVersion": "5.0.0"
         },
-		{
+        {
             "libraryName": "bingmaps",
             "typingsPackageName": "bingmaps",
             "sourceRepoURL": "https://github.com/Microsoft/Bing-Maps-V8-TypeScript-Definitions",
@@ -234,6 +234,12 @@
             "sourceRepoURL": "https://github.com/saltyrtc/chunked-dc-js",
             "asOfVersion": "0.2.2"
         },
+        {
+            "libraryName": "colors.js (colors)",
+            "typingsPackageName": "colors",
+            "sourceRepoURL": "https://github.com/Marak/colors.js",
+            "asOfVersion": "1.2.0"
+        },
         {
             "libraryName": "commander",
             "typingsPackageName": "commander",
diff --git a/types/colors/colors-tests.ts b/types/colors/colors-tests.ts
deleted file mode 100644
index fcac0323f6..0000000000
--- a/types/colors/colors-tests.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import colors = require("colors");
-import { zalgo } from "colors/safe";
-
-let str: string;
-
-str = zalgo("");
-
-colors.enabled = true;
-
-str = colors.black.underline('test');
-str = colors.rainbow.black.blue.gray('test');
-str = colors.random.reset.bgWhite.dim('test');
-str = colors.random.reset.bgWhite.strip('test');
-str = 'test'.black.underline;
-str = 'test'.rainbow.black.blue.gray;
-str = 'test'.random.reset.bgWhite.dim;
-str = 'test'.random.reset.bgWhite.dim.stripColors;
-
-colors.enabled = false;
-
-str = colors.black.underline('test');
diff --git a/types/colors/index.d.ts b/types/colors/index.d.ts
deleted file mode 100644
index a5494aa945..0000000000
--- a/types/colors/index.d.ts
+++ /dev/null
@@ -1,133 +0,0 @@
-// Type definitions for Colors.js 1.1
-// Project: https://github.com/Marak/colors.js
-// Definitions by: Bart van der Schoor <https://github.com/Bartvds>, Staffan Eketorp <https://github.com/staeke>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export interface Color {
-    (text: string): string;
-
-    strip: Color;
-    stripColors: Color;
-
-    black: Color;
-    red: Color;
-    green: Color;
-    yellow: Color;
-    blue: Color;
-    magenta: Color;
-    cyan: Color;
-    white: Color;
-    gray: Color;
-    grey: Color;
-
-    bgBlack: Color;
-    bgRed: Color;
-    bgGreen: Color;
-    bgYellow: Color;
-    bgBlue: Color;
-    bgMagenta: Color;
-    bgCyan: Color;
-    bgWhite: Color;
-
-    reset: Color;
-    bold: Color;
-    dim: Color;
-    italic: Color;
-    underline: Color;
-    inverse: Color;
-    hidden: Color;
-    strikethrough: Color;
-
-    rainbow: Color;
-    zebra: Color;
-    america: Color;
-    trap: Color;
-    random: Color;
-    zalgo: Color;
-}
-
-export function setTheme(theme: any): void;
-
-export let enabled: boolean;
-
-export const strip: Color;
-export const stripColors: Color;
-
-export const black: Color;
-export const red: Color;
-export const green: Color;
-export const yellow: Color;
-export const blue: Color;
-export const magenta: Color;
-export const cyan: Color;
-export const white: Color;
-export const gray: Color;
-export const grey: Color;
-
-export const bgBlack: Color;
-export const bgRed: Color;
-export const bgGreen: Color;
-export const bgYellow: Color;
-export const bgBlue: Color;
-export const bgMagenta: Color;
-export const bgCyan: Color;
-export const bgWhite: Color;
-
-export const reset: Color;
-export const bold: Color;
-export const dim: Color;
-export const italic: Color;
-export const underline: Color;
-export const inverse: Color;
-export const hidden: Color;
-export const strikethrough: Color;
-
-export const rainbow: Color;
-export const zebra: Color;
-export const america: Color;
-export const trap: Color;
-export const random: Color;
-export const zalgo: Color;
-
-declare global {
-    interface String {
-        strip: string;
-        stripColors: string;
-
-        black: string;
-        red: string;
-        green: string;
-        yellow: string;
-        blue: string;
-        magenta: string;
-        cyan: string;
-        white: string;
-        gray: string;
-        grey: string;
-
-        bgBlack: string;
-        bgRed: string;
-        bgGreen: string;
-        bgYellow: string;
-        bgBlue: string;
-        bgMagenta: string;
-        bgCyan: string;
-        bgWhite: string;
-
-        reset: string;
-        bold: string;
-        dim: string;
-        italic: string;
-        underline: string;
-        inverse: string;
-        hidden: string;
-        strikethrough: string;
-
-        rainbow: string;
-        zebra: string;
-        america: string;
-        trap: string;
-        random: string;
-        zalgo: string;
-    }
-}
diff --git a/types/colors/safe.d.ts b/types/colors/safe.d.ts
deleted file mode 100644
index 306b656b2b..0000000000
--- a/types/colors/safe.d.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-export const enabled: boolean;
-
-export function strip(str: string): string;
-export function stripColors(str: string): string;
-
-export function black(str: string): string;
-export function red(str: string): string;
-export function green(str: string): string;
-export function yellow(str: string): string;
-export function blue(str: string): string;
-export function magenta(str: string): string;
-export function cyan(str: string): string;
-export function white(str: string): string;
-export function gray(str: string): string;
-export function grey(str: string): string;
-
-export function bgBlack(str: string): string;
-export function bgRed(str: string): string;
-export function bgGreen(str: string): string;
-export function bgYellow(str: string): string;
-export function bgBlue(str: string): string;
-export function bgMagenta(str: string): string;
-export function bgCyan(str: string): string;
-export function bgWhite(str: string): string;
-
-export function reset(str: string): string;
-export function bold(str: string): string;
-export function dim(str: string): string;
-export function italic(str: string): string;
-export function underline(str: string): string;
-export function inverse(str: string): string;
-export function hidden(str: string): string;
-export function strikethrough(str: string): string;
-
-export function rainbow(str: string): string;
-export function zebra(str: string): string;
-export function america(str: string): string;
-export function trap(str: string): string;
-export function random(str: string): string;
-export function zalgo(str: string): string;
diff --git a/types/colors/tsconfig.json b/types/colors/tsconfig.json
deleted file mode 100644
index 99d78ad72d..0000000000
--- a/types/colors/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es5"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "colors-tests.ts",
-        "safe.d.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/colors/tslint.json b/types/colors/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/colors/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }

From 87dc68d5ff4f171f42cd2438832b48e5e6ee1c55 Mon Sep 17 00:00:00 2001
From: Olivier Sechet <osechet@gmail.com>
Date: Sat, 10 Mar 2018 00:09:20 +0100
Subject: [PATCH 0407/1382] Fix no-declare-current-package lint Fix
 no-internal-module lint Fix no-single-declare-module lint

---
 types/openlayers/index.d.ts          | 17246 ++++++++++++-------------
 types/openlayers/openlayers-tests.ts |    10 +-
 types/openlayers/tslint.json         |     3 -
 3 files changed, 8626 insertions(+), 8633 deletions(-)

diff --git a/types/openlayers/index.d.ts b/types/openlayers/index.d.ts
index 3c87320827..0dfd1fe464 100644
--- a/types/openlayers/index.d.ts
+++ b/types/openlayers/index.d.ts
@@ -11,34 +11,56 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // Definitions partially generated using tsd-jsdoc (https://github.com/englercj/tsd-jsdoc)
 
+export as namespace ol;
+
 interface GlobalObject { [key: string]: any; }
 
-declare namespace ol {
+/**
+ * Error object thrown when an assertion failed. This is an ECMA-262 Error,
+ * extended with a `code` property.
+ * @see {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error}
+ * @param code Error code.
+ */
+export class AssertionError extends Error {
     /**
      * Error object thrown when an assertion failed. This is an ECMA-262 Error,
      * extended with a `code` property.
      * @see {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error}
      * @param code Error code.
      */
-    class AssertionError extends Error {
-        /**
-         * Error object thrown when an assertion failed. This is an ECMA-262 Error,
-         * extended with a `code` property.
-         * @see {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error}
-         * @param code Error code.
-         */
-        constructor(code: number);
+    constructor(code: number);
 
-        /**
-         * Error code. The meaning of the code can be found on
-         * {@link http://openlayers.org/en/latest/errors.html} (replace `latest` with
-         * the version found in the OpenLayers script's header comment if a version
-         * other than the latest is used).
-         * @api
-         */
-        code: number;
-    }
+    /**
+     * Error code. The meaning of the code can be found on
+     * {@link http://openlayers.org/en/latest/errors.html} (replace `latest` with
+     * the version found in the OpenLayers script's header comment if a version
+     * other than the latest is used).
+     * @api
+     */
+    code: number;
+}
 
+/**
+ * @classdesc
+ * An attribution for a layer source.
+ *
+ * Example:
+ *
+ *     source: new ol.source.OSM({
+ *       attributions: [
+ *         new ol.Attribution({
+ *           html: 'All maps &copy; ' +
+ *               '<a href="http://www.opencyclemap.org/">OpenCycleMap</a>'
+ *         }),
+ *         ol.source.OSM.ATTRIBUTION
+ *       ],
+ *     ..
+ *
+ * @param options Attribution options.
+ * @struct
+ * @api stable
+ */
+export class Attribution {
     /**
      * @classdesc
      * An attribution for a layer source.
@@ -59,37 +81,30 @@ declare namespace ol {
      * @struct
      * @api stable
      */
-    class Attribution {
-        /**
-         * @classdesc
-         * An attribution for a layer source.
-         *
-         * Example:
-         *
-         *     source: new ol.source.OSM({
-         *       attributions: [
-         *         new ol.Attribution({
-         *           html: 'All maps &copy; ' +
-         *               '<a href="http://www.opencyclemap.org/">OpenCycleMap</a>'
-         *         }),
-         *         ol.source.OSM.ATTRIBUTION
-         *       ],
-         *     ..
-         *
-         * @param options Attribution options.
-         * @struct
-         * @api stable
-         */
-        constructor(options: olx.AttributionOptions);
+    constructor(options: olx.AttributionOptions);
 
-        /**
-         * Get the attribution markup.
-         * @return The attribution HTML.
-         * @api stable
-         */
-        getHTML(): string;
-    }
+    /**
+     * Get the attribution markup.
+     * @return The attribution HTML.
+     * @api stable
+     */
+    getHTML(): string;
+}
 
+/**
+ * @classdesc
+ * An expanded version of standard JS Array, adding convenience methods for
+ * manipulation. Add and remove changes to the Collection trigger a Collection
+ * event. Note that this does not cover changes to the objects _within_ the
+ * Collection; they trigger events on the appropriate object, not on the
+ * Collection as a whole.
+ *
+ * @fires ol.Collection.Event
+ * @param opt_array Array.
+ * @template T
+ * @api stable
+ */
+export class Collection<T> extends Object {
     /**
      * @classdesc
      * An expanded version of standard JS Array, adding convenience methods for
@@ -103,127 +118,122 @@ declare namespace ol {
      * @template T
      * @api stable
      */
-    class Collection<T> extends ol.Object {
-        /**
-         * @classdesc
-         * An expanded version of standard JS Array, adding convenience methods for
-         * manipulation. Add and remove changes to the Collection trigger a Collection
-         * event. Note that this does not cover changes to the objects _within_ the
-         * Collection; they trigger events on the appropriate object, not on the
-         * Collection as a whole.
-         *
-         * @fires ol.Collection.Event
-         * @param opt_array Array.
-         * @template T
-         * @api stable
-         */
-        constructor(opt_array?: T[]);
+    constructor(opt_array?: T[]);
 
-        /**
-         * Remove all elements from the collection.
-         * @api stable
-         */
-        clear(): void;
+    /**
+     * Remove all elements from the collection.
+     * @api stable
+     */
+    clear(): void;
 
-        /**
-         * Add elements to the collection.  This pushes each item in the provided array
-         * to the end of the collection.
-         * @param arr Array.
-         * @return This collection.
-         * @api stable
-         */
-        extend(arr: T[]): ol.Collection<T>;
+    /**
+     * Add elements to the collection.  This pushes each item in the provided array
+     * to the end of the collection.
+     * @param arr Array.
+     * @return This collection.
+     * @api stable
+     */
+    extend(arr: T[]): ol.Collection<T>;
 
-        /**
-         * Iterate over each element, calling the provided callback.
-         * @param f The function to call
-         *     for every element. This function takes 3 arguments (the element, the
-         *     index and the array). The return value is ignored.
-         * @param opt_this The object to use as `this` in `f`.
-         * @template S
-         * @api stable
-         */
-        forEach<S>(f: ((item: T, index: number, array: T[]) => any), opt_this?: S): void;
+    /**
+     * Iterate over each element, calling the provided callback.
+     * @param f The function to call
+     *     for every element. This function takes 3 arguments (the element, the
+     *     index and the array). The return value is ignored.
+     * @param opt_this The object to use as `this` in `f`.
+     * @template S
+     * @api stable
+     */
+    forEach<S>(f: ((item: T, index: number, array: T[]) => any), opt_this?: S): void;
 
-        /**
-         * Get a reference to the underlying Array object. Warning: if the array
-         * is mutated, no events will be dispatched by the collection, and the
-         * collection's "length" property won't be in sync with the actual length
-         * of the array.
-         * @return Array.
-         * @api stable
-         */
-        getArray(): T[];
+    /**
+     * Get a reference to the underlying Array object. Warning: if the array
+     * is mutated, no events will be dispatched by the collection, and the
+     * collection's "length" property won't be in sync with the actual length
+     * of the array.
+     * @return Array.
+     * @api stable
+     */
+    getArray(): T[];
 
-        /**
-         * Get the element at the provided index.
-         * @param index Index.
-         * @return Element.
-         * @api stable
-         */
-        item(index: number): T;
+    /**
+     * Get the element at the provided index.
+     * @param index Index.
+     * @return Element.
+     * @api stable
+     */
+    item(index: number): T;
 
-        /**
-         * Get the length of this collection.
-         * @return The length of the array.
-         * @observable
-         * @api stable
-         */
-        getLength(): number;
+    /**
+     * Get the length of this collection.
+     * @return The length of the array.
+     * @observable
+     * @api stable
+     */
+    getLength(): number;
 
-        /**
-         * Insert an element at the provided index.
-         * @param index Index.
-         * @param elem Element.
-         * @api stable
-         */
-        insertAt(index: number, elem: T): void;
+    /**
+     * Insert an element at the provided index.
+     * @param index Index.
+     * @param elem Element.
+     * @api stable
+     */
+    insertAt(index: number, elem: T): void;
 
-        /**
-         * Remove the last element of the collection and return it.
-         * Return `undefined` if the collection is empty.
-         * @return Element.
-         * @api stable
-         */
-        pop(): (T);
+    /**
+     * Remove the last element of the collection and return it.
+     * Return `undefined` if the collection is empty.
+     * @return Element.
+     * @api stable
+     */
+    pop(): (T);
 
-        /**
-         * Insert the provided element at the end of the collection.
-         * @param elem Element.
-         * @return Length.
-         * @api stable
-         */
-        push(elem: T): number;
+    /**
+     * Insert the provided element at the end of the collection.
+     * @param elem Element.
+     * @return Length.
+     * @api stable
+     */
+    push(elem: T): number;
 
-        /**
-         * Remove the first occurrence of an element from the collection.
-         * @param elem Element.
-         * @return The removed element or undefined if none found.
-         * @api stable
-         */
-        remove(elem: T): (T);
+    /**
+     * Remove the first occurrence of an element from the collection.
+     * @param elem Element.
+     * @return The removed element or undefined if none found.
+     * @api stable
+     */
+    remove(elem: T): (T);
 
-        /**
-         * Remove the element at the provided index and return it.
-         * Return `undefined` if the collection does not contain this index.
-         * @param index Index.
-         * @return Value.
-         * @api stable
-         */
-        removeAt(index: number): (T);
+    /**
+     * Remove the element at the provided index and return it.
+     * Return `undefined` if the collection does not contain this index.
+     * @param index Index.
+     * @return Value.
+     * @api stable
+     */
+    removeAt(index: number): (T);
 
-        /**
-         * Set the element at the provided index.
-         * @param index Index.
-         * @param elem Element.
-         * @api stable
-         */
-        setAt(index: number, elem: T): void;
-    }
+    /**
+     * Set the element at the provided index.
+     * @param index Index.
+     * @param elem Element.
+     * @api stable
+     */
+    setAt(index: number, elem: T): void;
+}
 
-    namespace Collection {
-        type EventType = string;
+export namespace Collection {
+    type EventType = string;
 
+    /**
+     * @classdesc
+     * Events emitted by {@link ol.Collection} instances are instances of this
+     * type.
+     *
+     * @param type Type.
+     * @param opt_element Element.
+     */
+    class Event extends events.Event {
         /**
          * @classdesc
          * Events emitted by {@link ol.Collection} instances are instances of this
@@ -232,65 +242,67 @@ declare namespace ol {
          * @param type Type.
          * @param opt_element Element.
          */
-        class Event extends ol.events.Event {
-            /**
-             * @classdesc
-             * Events emitted by {@link ol.Collection} instances are instances of this
-             * type.
-             *
-             * @param type Type.
-             * @param opt_element Element.
-             */
-            constructor(type: ol.Collection.EventType, opt_element?: any);
+        constructor(type: ol.Collection.EventType, opt_element?: any);
 
-            /**
-             * The element that is added to or removed from the collection.
-             * @api stable
-             */
-            element: any;
-        }
+        /**
+         * The element that is added to or removed from the collection.
+         * @api stable
+         */
+        element: any;
     }
+}
+
+/**
+ * Colors can be defined as a {@link ol.Color} array, or as strings in
+ * `rgb(r,g,b)` or `rgba(r,g,b,a)` format, or in hex `#rrggbb` or `#rgb` format.
+ * Color names, like 'red', 'blue' or 'green', may also be used with the
+ * Canvas renderer.
+ *
+ */
+export namespace color {
+    /**
+     * Return the color as an array. This function maintains a cache of calculated
+     * arrays which means the result should not be modified.
+     * @param color Color.
+     * @return Color.
+     * @api
+     */
+    function asArray(color: (ol.Color | string)): ol.Color;
 
     /**
-     * Colors can be defined as a {@link ol.Color} array, or as strings in
-     * `rgb(r,g,b)` or `rgba(r,g,b,a)` format, or in hex `#rrggbb` or `#rgb` format.
-     * Color names, like 'red', 'blue' or 'green', may also be used with the
-     * Canvas renderer.
+     * Return the color as an rgba string.
+     * @param color Color.
+     * @return Rgba string.
+     * @api
+     */
+    function asString(color: (ol.Color | string)): string;
+}
+
+/**
+ * An {@link ol.ColorLike} can be a color, gradient or pattern accepted by
+ * [CanvasRenderingContext2D.fillStyle](https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/fillStyle).
+ */
+export namespace colorlike {
+    /**
+     * @param color Color.
+     * @return The color as an ol.ColorLike
+     * @api
+     */
+    function asColorLike(color: (ol.Color | ol.ColorLike)): ol.ColorLike;
+}
+
+export namespace control {
+    /**
+     * @classdesc
+     * Control to show all the attributions associated with the layer sources
+     * in the map. This control is one of the default controls included in maps.
+     * By default it will show in the bottom right portion of the map, but this can
+     * be changed by using a css selector for `.ol-attribution`.
      *
+     * @param opt_options Attribution options.
+     * @api stable
      */
-    namespace color {
-        /**
-         * Return the color as an array. This function maintains a cache of calculated
-         * arrays which means the result should not be modified.
-         * @param color Color.
-         * @return Color.
-         * @api
-         */
-        function asArray(color: (ol.Color | string)): ol.Color;
-
-        /**
-         * Return the color as an rgba string.
-         * @param color Color.
-         * @return Rgba string.
-         * @api
-         */
-        function asString(color: (ol.Color | string)): string;
-    }
-
-    /**
-     * An {@link ol.ColorLike} can be a color, gradient or pattern accepted by
-     * [CanvasRenderingContext2D.fillStyle](https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/fillStyle).
-     */
-    namespace colorlike {
-        /**
-         * @param color Color.
-         * @return The color as an ol.ColorLike
-         * @api
-         */
-        function asColorLike(color: (ol.Color | ol.ColorLike)): ol.ColorLike;
-    }
-
-    namespace control {
+    class Attribution extends control.Control {
         /**
          * @classdesc
          * Control to show all the attributions associated with the layer sources
@@ -301,58 +313,74 @@ declare namespace ol {
          * @param opt_options Attribution options.
          * @api stable
          */
-        class Attribution extends ol.control.Control {
-            /**
-             * @classdesc
-             * Control to show all the attributions associated with the layer sources
-             * in the map. This control is one of the default controls included in maps.
-             * By default it will show in the bottom right portion of the map, but this can
-             * be changed by using a css selector for `.ol-attribution`.
-             *
-             * @param opt_options Attribution options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.control.AttributionOptions);
+        constructor(opt_options?: olx.control.AttributionOptions);
 
-            /**
-             * Update the attribution element.
-             * @param mapEvent Map event.
-             * @api
-             */
-            static render(mapEvent: ol.MapEvent): void;
+        /**
+         * Update the attribution element.
+         * @param mapEvent Map event.
+         * @api
+         */
+        static render(mapEvent: ol.MapEvent): void;
 
-            /**
-             * Return `true` if the attribution is collapsible, `false` otherwise.
-             * @return True if the widget is collapsible.
-             * @api stable
-             */
-            getCollapsible(): boolean;
+        /**
+         * Return `true` if the attribution is collapsible, `false` otherwise.
+         * @return True if the widget is collapsible.
+         * @api stable
+         */
+        getCollapsible(): boolean;
 
-            /**
-             * Set whether the attribution should be collapsible.
-             * @param collapsible True if the widget is collapsible.
-             * @api stable
-             */
-            setCollapsible(collapsible: boolean): void;
+        /**
+         * Set whether the attribution should be collapsible.
+         * @param collapsible True if the widget is collapsible.
+         * @api stable
+         */
+        setCollapsible(collapsible: boolean): void;
 
-            /**
-             * Collapse or expand the attribution according to the passed parameter. Will
-             * not do anything if the attribution isn't collapsible or if the current
-             * collapsed state is already the one requested.
-             * @param collapsed True if the widget is collapsed.
-             * @api stable
-             */
-            setCollapsed(collapsed: boolean): void;
+        /**
+         * Collapse or expand the attribution according to the passed parameter. Will
+         * not do anything if the attribution isn't collapsible or if the current
+         * collapsed state is already the one requested.
+         * @param collapsed True if the widget is collapsed.
+         * @api stable
+         */
+        setCollapsed(collapsed: boolean): void;
 
-            /**
-             * Return `true` when the attribution is currently collapsed or `false`
-             * otherwise.
-             * @return True if the widget is collapsed.
-             * @api stable
-             */
-            getCollapsed(): boolean;
-        }
+        /**
+         * Return `true` when the attribution is currently collapsed or `false`
+         * otherwise.
+         * @return True if the widget is collapsed.
+         * @api stable
+         */
+        getCollapsed(): boolean;
+    }
 
+    /**
+     * @classdesc
+     * A control is a visible widget with a DOM element in a fixed position on the
+     * screen. They can involve user input (buttons), or be informational only;
+     * the position is determined using CSS. By default these are placed in the
+     * container with CSS class name `ol-overlaycontainer-stopevent`, but can use
+     * any outside DOM element.
+     *
+     * This is the base class for controls. You can use it for simple custom
+     * controls by creating the element with listeners, creating an instance:
+     * ```js
+     * var myControl = new ol.control.Control({element: myElement});
+     * ```
+     * and then adding this to the map.
+     *
+     * The main advantage of having this as a control rather than a simple separate
+     * DOM element is that preventing propagation is handled for you. Controls
+     * will also be `ol.Object`s in a `ol.Collection`, so you can use their
+     * methods.
+     *
+     * You can also extend this base for your own control class. See
+     * examples/custom-controls for an example of how to do this.
+     *
+     * @param options Control options.
+     * @api stable
+     */
+    class Control extends Object {
         /**
          * @classdesc
          * A control is a visible widget with a DOM element in a fixed position on the
@@ -379,63 +407,52 @@ declare namespace ol {
          * @param options Control options.
          * @api stable
          */
-        class Control extends ol.Object {
-            /**
-             * @classdesc
-             * A control is a visible widget with a DOM element in a fixed position on the
-             * screen. They can involve user input (buttons), or be informational only;
-             * the position is determined using CSS. By default these are placed in the
-             * container with CSS class name `ol-overlaycontainer-stopevent`, but can use
-             * any outside DOM element.
-             *
-             * This is the base class for controls. You can use it for simple custom
-             * controls by creating the element with listeners, creating an instance:
-             * ```js
-             * var myControl = new ol.control.Control({element: myElement});
-             * ```
-             * and then adding this to the map.
-             *
-             * The main advantage of having this as a control rather than a simple separate
-             * DOM element is that preventing propagation is handled for you. Controls
-             * will also be `ol.Object`s in a `ol.Collection`, so you can use their
-             * methods.
-             *
-             * You can also extend this base for your own control class. See
-             * examples/custom-controls for an example of how to do this.
-             *
-             * @param options Control options.
-             * @api stable
-             */
-            constructor(options: olx.control.ControlOptions);
+        constructor(options: olx.control.ControlOptions);
 
-            /**
-             * Get the map associated with this control.
-             * @return Map.
-             * @api stable
-             */
-            getMap(): ol.Map;
+        /**
+         * Get the map associated with this control.
+         * @return Map.
+         * @api stable
+         */
+        getMap(): ol.Map;
 
-            /**
-             * Remove the control from its current map and attach it to the new map.
-             * Subclasses may set up event handlers to get notified about changes to
-             * the map here.
-             * @param map Map.
-             * @api stable
-             */
-            setMap(map: ol.Map): void;
+        /**
+         * Remove the control from its current map and attach it to the new map.
+         * Subclasses may set up event handlers to get notified about changes to
+         * the map here.
+         * @param map Map.
+         * @api stable
+         */
+        setMap(map: ol.Map): void;
 
-            /**
-             * This function is used to set a target element for the control. It has no
-             * effect if it is called after the control has been added to the map (i.e.
-             * after `setMap` is called on the control). If no `target` is set in the
-             * options passed to the control constructor and if `setTarget` is not called
-             * then the control is added to the map's overlay container.
-             * @param target Target.
-             * @api
-             */
-            setTarget(target: (Element | string)): void;
-        }
+        /**
+         * This function is used to set a target element for the control. It has no
+         * effect if it is called after the control has been added to the map (i.e.
+         * after `setMap` is called on the control). If no `target` is set in the
+         * options passed to the control constructor and if `setTarget` is not called
+         * then the control is added to the map's overlay container.
+         * @param target Target.
+         * @api
+         */
+        setTarget(target: (Element | string)): void;
+    }
 
+    /**
+     * @classdesc
+     * Provides a button that when clicked fills up the full screen with the map.
+     * The full screen source element is by default the element containing the map viewport unless
+     * overriden by providing the `source` option. In which case, the dom
+     * element introduced using this parameter will be displayed in full screen.
+     *
+     * When in full screen mode, a close button is shown to exit full screen mode.
+     * The [Fullscreen API](http://www.w3.org/TR/fullscreen/) is used to
+     * toggle the map in full screen mode.
+     *
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class FullScreen extends control.Control {
         /**
          * @classdesc
          * Provides a button that when clicked fills up the full screen with the map.
@@ -451,39 +468,35 @@ declare namespace ol {
          * @param opt_options Options.
          * @api stable
          */
-        class FullScreen extends ol.control.Control {
-            /**
-             * @classdesc
-             * Provides a button that when clicked fills up the full screen with the map.
-             * The full screen source element is by default the element containing the map viewport unless
-             * overriden by providing the `source` option. In which case, the dom
-             * element introduced using this parameter will be displayed in full screen.
-             *
-             * When in full screen mode, a close button is shown to exit full screen mode.
-             * The [Fullscreen API](http://www.w3.org/TR/fullscreen/) is used to
-             * toggle the map in full screen mode.
-             *
-             *
-             * @param opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.control.FullScreenOptions);
-        }
+        constructor(opt_options?: olx.control.FullScreenOptions);
+    }
 
-        /**
-         * Set of controls included in maps by default. Unless configured otherwise,
-         * this returns a collection containing an instance of each of the following
-         * controls:
-         * * {@link ol.control.Zoom}
-         * * {@link ol.control.Rotate}
-         * * {@link ol.control.Attribution}
-         *
-         * @param opt_options Defaults options.
-         * @return Controls.
-         * @api stable
-         */
-        function defaults(opt_options?: olx.control.DefaultsOptions): ol.Collection<ol.control.Control>;
+    /**
+     * Set of controls included in maps by default. Unless configured otherwise,
+     * this returns a collection containing an instance of each of the following
+     * controls:
+     * * {@link ol.control.Zoom}
+     * * {@link ol.control.Rotate}
+     * * {@link ol.control.Attribution}
+     *
+     * @param opt_options Defaults options.
+     * @return Controls.
+     * @api stable
+     */
+    function defaults(opt_options?: olx.control.DefaultsOptions): ol.Collection<ol.control.Control>;
 
+    /**
+     * @classdesc
+     * A control to show the 2D coordinates of the mouse cursor. By default, these
+     * are in the view projection, but can be in any supported projection.
+     * By default the control is shown in the top right corner of the map, but this
+     * can be changed by using the css selector `.ol-mouse-position`.
+     *
+     * @param opt_options Mouse position
+     *     options.
+     * @api stable
+     */
+    class MousePosition extends control.Control {
         /**
          * @classdesc
          * A control to show the 2D coordinates of the mouse cursor. By default, these
@@ -495,125 +508,123 @@ declare namespace ol {
          *     options.
          * @api stable
          */
-        class MousePosition extends ol.control.Control {
-            /**
-             * @classdesc
-             * A control to show the 2D coordinates of the mouse cursor. By default, these
-             * are in the view projection, but can be in any supported projection.
-             * By default the control is shown in the top right corner of the map, but this
-             * can be changed by using the css selector `.ol-mouse-position`.
-             *
-             * @param opt_options Mouse position
-             *     options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.control.MousePositionOptions);
+        constructor(opt_options?: olx.control.MousePositionOptions);
 
-            /**
-             * Update the mouseposition element.
-             * @param mapEvent Map event.
-             * @api
-             */
-            static render(mapEvent: ol.MapEvent): void;
+        /**
+         * Update the mouseposition element.
+         * @param mapEvent Map event.
+         * @api
+         */
+        static render(mapEvent: ol.MapEvent): void;
 
-            /**
-             * Return the coordinate format type used to render the current position or
-             * undefined.
-             * @return The format to render the current
-             *     position in.
-             * @observable
-             * @api stable
-             */
-            getCoordinateFormat(): (ol.CoordinateFormatType);
+        /**
+         * Return the coordinate format type used to render the current position or
+         * undefined.
+         * @return The format to render the current
+         *     position in.
+         * @observable
+         * @api stable
+         */
+        getCoordinateFormat(): (ol.CoordinateFormatType);
 
-            /**
-             * Return the projection that is used to report the mouse position.
-             * @return The projection to report mouse
-             *     position in.
-             * @observable
-             * @api stable
-             */
-            getProjection(): (ol.proj.Projection);
+        /**
+         * Return the projection that is used to report the mouse position.
+         * @return The projection to report mouse
+         *     position in.
+         * @observable
+         * @api stable
+         */
+        getProjection(): (ol.proj.Projection);
 
-            /**
-             * Set the coordinate format type used to render the current position.
-             * @param format The format to render the current
-             *     position in.
-             * @observable
-             * @api stable
-             */
-            setCoordinateFormat(format: ol.CoordinateFormatType): void;
+        /**
+         * Set the coordinate format type used to render the current position.
+         * @param format The format to render the current
+         *     position in.
+         * @observable
+         * @api stable
+         */
+        setCoordinateFormat(format: ol.CoordinateFormatType): void;
 
-            /**
-             * Set the projection that is used to report the mouse position.
-             * @param projection The projection to report mouse
-             *     position in.
-             * @observable
-             * @api stable
-             */
-            setProjection(projection: ol.proj.Projection): void;
-        }
+        /**
+         * Set the projection that is used to report the mouse position.
+         * @param projection The projection to report mouse
+         *     position in.
+         * @observable
+         * @api stable
+         */
+        setProjection(projection: ol.proj.Projection): void;
+    }
 
+    /**
+     * Create a new control with a map acting as an overview map for an other
+     * defined map.
+     * @param opt_options OverviewMap options.
+     * @api
+     */
+    class OverviewMap extends control.Control {
         /**
          * Create a new control with a map acting as an overview map for an other
          * defined map.
          * @param opt_options OverviewMap options.
          * @api
          */
-        class OverviewMap extends ol.control.Control {
-            /**
-             * Create a new control with a map acting as an overview map for an other
-             * defined map.
-             * @param opt_options OverviewMap options.
-             * @api
-             */
-            constructor(opt_options?: olx.control.OverviewMapOptions);
+        constructor(opt_options?: olx.control.OverviewMapOptions);
 
-            /**
-             * Update the overview map element.
-             * @param mapEvent Map event.
-             * @api
-             */
-            static render(mapEvent: ol.MapEvent): void;
+        /**
+         * Update the overview map element.
+         * @param mapEvent Map event.
+         * @api
+         */
+        static render(mapEvent: ol.MapEvent): void;
 
-            /**
-             * Return `true` if the overview map is collapsible, `false` otherwise.
-             * @return True if the widget is collapsible.
-             * @api stable
-             */
-            getCollapsible(): boolean;
+        /**
+         * Return `true` if the overview map is collapsible, `false` otherwise.
+         * @return True if the widget is collapsible.
+         * @api stable
+         */
+        getCollapsible(): boolean;
 
-            /**
-             * Set whether the overview map should be collapsible.
-             * @param collapsible True if the widget is collapsible.
-             * @api stable
-             */
-            setCollapsible(collapsible: boolean): void;
+        /**
+         * Set whether the overview map should be collapsible.
+         * @param collapsible True if the widget is collapsible.
+         * @api stable
+         */
+        setCollapsible(collapsible: boolean): void;
 
-            /**
-             * Collapse or expand the overview map according to the passed parameter. Will
-             * not do anything if the overview map isn't collapsible or if the current
-             * collapsed state is already the one requested.
-             * @param collapsed True if the widget is collapsed.
-             * @api stable
-             */
-            setCollapsed(collapsed: boolean): void;
+        /**
+         * Collapse or expand the overview map according to the passed parameter. Will
+         * not do anything if the overview map isn't collapsible or if the current
+         * collapsed state is already the one requested.
+         * @param collapsed True if the widget is collapsed.
+         * @api stable
+         */
+        setCollapsed(collapsed: boolean): void;
 
-            /**
-             * Determine if the overview map is collapsed.
-             * @return The overview map is collapsed.
-             * @api stable
-             */
-            getCollapsed(): boolean;
+        /**
+         * Determine if the overview map is collapsed.
+         * @return The overview map is collapsed.
+         * @api stable
+         */
+        getCollapsed(): boolean;
 
-            /**
-             * Return the overview map.
-             * @return Overview map.
-             * @api
-             */
-            getOverviewMap(): ol.Map;
-        }
+        /**
+         * Return the overview map.
+         * @return Overview map.
+         * @api
+         */
+        getOverviewMap(): ol.Map;
+    }
 
+    /**
+     * @classdesc
+     * A button control to reset rotation to 0.
+     * To style this control use css selector `.ol-rotate`. A `.ol-hidden` css
+     * selector is added to the button when the rotation is 0.
+     *
+     * @param opt_options Rotate options.
+     * @api stable
+     */
+    class Rotate extends control.Control {
         /**
          * @classdesc
          * A button control to reset rotation to 0.
@@ -623,26 +634,30 @@ declare namespace ol {
          * @param opt_options Rotate options.
          * @api stable
          */
-        class Rotate extends ol.control.Control {
-            /**
-             * @classdesc
-             * A button control to reset rotation to 0.
-             * To style this control use css selector `.ol-rotate`. A `.ol-hidden` css
-             * selector is added to the button when the rotation is 0.
-             *
-             * @param opt_options Rotate options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.control.RotateOptions);
+        constructor(opt_options?: olx.control.RotateOptions);
 
-            /**
-             * Update the rotate control element.
-             * @param mapEvent Map event.
-             * @api
-             */
-            static render(mapEvent: ol.MapEvent): void;
-        }
+        /**
+         * Update the rotate control element.
+         * @param mapEvent Map event.
+         * @api
+         */
+        static render(mapEvent: ol.MapEvent): void;
+    }
 
+    /**
+     * @classdesc
+     * A control displaying rough y-axis distances, calculated for the center of the
+     * viewport. For conformal projections (e.g. EPSG:3857, the default view
+     * projection in OpenLayers), the scale is valid for all directions.
+     * No scale line will be shown when the y-axis distance of a pixel at the
+     * viewport center cannot be calculated in the view projection.
+     * By default the scale line will show in the bottom left portion of the map,
+     * but this can be changed by using the css selector `.ol-scale-line`.
+     *
+     * @param opt_options Scale line options.
+     * @api stable
+     */
+    class ScaleLine extends control.Control {
         /**
          * @classdesc
          * A control displaying rough y-axis distances, calculated for the center of the
@@ -656,60 +671,56 @@ declare namespace ol {
          * @param opt_options Scale line options.
          * @api stable
          */
-        class ScaleLine extends ol.control.Control {
-            /**
-             * @classdesc
-             * A control displaying rough y-axis distances, calculated for the center of the
-             * viewport. For conformal projections (e.g. EPSG:3857, the default view
-             * projection in OpenLayers), the scale is valid for all directions.
-             * No scale line will be shown when the y-axis distance of a pixel at the
-             * viewport center cannot be calculated in the view projection.
-             * By default the scale line will show in the bottom left portion of the map,
-             * but this can be changed by using the css selector `.ol-scale-line`.
-             *
-             * @param opt_options Scale line options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.control.ScaleLineOptions);
+        constructor(opt_options?: olx.control.ScaleLineOptions);
 
-            /**
-             * Return the units to use in the scale line.
-             * @return The units to use in the scale
-             *     line.
-             * @observable
-             * @api stable
-             */
-            getUnits(): (ol.control.ScaleLine.Units);
+        /**
+         * Return the units to use in the scale line.
+         * @return The units to use in the scale
+         *     line.
+         * @observable
+         * @api stable
+         */
+        getUnits(): (ol.control.ScaleLine.Units);
 
-            /**
-             * Update the scale line element.
-             * @param mapEvent Map event.
-             * @api
-             */
-            static render(mapEvent: ol.MapEvent): void;
+        /**
+         * Update the scale line element.
+         * @param mapEvent Map event.
+         * @api
+         */
+        static render(mapEvent: ol.MapEvent): void;
 
-            /**
-             * Set the units to use in the scale line.
-             * @param units The units to use in the scale line.
-             * @observable
-             * @api stable
-             */
-            setUnits(units: ol.control.ScaleLine.Units): void;
-        }
+        /**
+         * Set the units to use in the scale line.
+         * @param units The units to use in the scale line.
+         * @observable
+         * @api stable
+         */
+        setUnits(units: ol.control.ScaleLine.Units): void;
+    }
 
-        namespace ScaleLine {
-            /**
-             * @api
-             */
-            type Property = string;
+    namespace ScaleLine {
+        /**
+         * @api
+         */
+        type Property = string;
 
-            /**
-             * Units for the scale line. Supported values are `'degrees'`, `'imperial'`,
-             * `'nautical'`, `'metric'`, `'us'`.
-             */
-            type Units = "degrees" | "imperial" | "nautical" | "metric" | "us";
-        }
+        /**
+         * Units for the scale line. Supported values are `'degrees'`, `'imperial'`,
+         * `'nautical'`, `'metric'`, `'us'`.
+         */
+        type Units = "degrees" | "imperial" | "nautical" | "metric" | "us";
+    }
 
+    /**
+     * @classdesc
+     * A control with 2 buttons, one for zoom in and one for zoom out.
+     * This control is one of the default controls of a map. To style this control
+     * use css selectors `.ol-zoom-in` and `.ol-zoom-out`.
+     *
+     * @param opt_options Zoom options.
+     * @api stable
+     */
+    class Zoom extends control.Control {
         /**
          * @classdesc
          * A control with 2 buttons, one for zoom in and one for zoom out.
@@ -719,19 +730,21 @@ declare namespace ol {
          * @param opt_options Zoom options.
          * @api stable
          */
-        class Zoom extends ol.control.Control {
-            /**
-             * @classdesc
-             * A control with 2 buttons, one for zoom in and one for zoom out.
-             * This control is one of the default controls of a map. To style this control
-             * use css selectors `.ol-zoom-in` and `.ol-zoom-out`.
-             *
-             * @param opt_options Zoom options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.control.ZoomOptions);
-        }
+        constructor(opt_options?: olx.control.ZoomOptions);
+    }
 
+    /**
+     * @classdesc
+     * A slider type of control for zooming.
+     *
+     * Example:
+     *
+     *     map.addControl(new ol.control.ZoomSlider());
+     *
+     * @param opt_options Zoom slider options.
+     * @api stable
+     */
+    class ZoomSlider extends control.Control {
         /**
          * @classdesc
          * A slider type of control for zooming.
@@ -743,28 +756,25 @@ declare namespace ol {
          * @param opt_options Zoom slider options.
          * @api stable
          */
-        class ZoomSlider extends ol.control.Control {
-            /**
-             * @classdesc
-             * A slider type of control for zooming.
-             *
-             * Example:
-             *
-             *     map.addControl(new ol.control.ZoomSlider());
-             *
-             * @param opt_options Zoom slider options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.control.ZoomSliderOptions);
+        constructor(opt_options?: olx.control.ZoomSliderOptions);
 
-            /**
-             * Update the zoomslider element.
-             * @param mapEvent Map event.
-             * @api
-             */
-            static render(mapEvent: ol.MapEvent): void;
-        }
+        /**
+         * Update the zoomslider element.
+         * @param mapEvent Map event.
+         * @api
+         */
+        static render(mapEvent: ol.MapEvent): void;
+    }
 
+    /**
+     * @classdesc
+     * A button control which, when pressed, changes the map view to a specific
+     * extent. To style this control use the css selector `.ol-zoom-extent`.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class ZoomToExtent extends control.Control {
         /**
          * @classdesc
          * A button control which, when pressed, changes the map view to a specific
@@ -773,157 +783,202 @@ declare namespace ol {
          * @param opt_options Options.
          * @api stable
          */
-        class ZoomToExtent extends ol.control.Control {
-            /**
-             * @classdesc
-             * A button control which, when pressed, changes the map view to a specific
-             * extent. To style this control use the css selector `.ol-zoom-extent`.
-             *
-             * @param opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.control.ZoomToExtentOptions);
-        }
+        constructor(opt_options?: olx.control.ZoomToExtentOptions);
     }
+}
 
-    namespace coordinate {
-        /**
-         * Add `delta` to `coordinate`. `coordinate` is modified in place and returned
-         * by the function.
-         *
-         * Example:
-         *
-         *     var coord = [7.85, 47.983333];
-         *     ol.coordinate.add(coord, [-2, 4]);
-         *     // coord is now [5.85, 51.983333]
-         *
-         * @param coordinate Coordinate.
-         * @param delta Delta.
-         * @return The input coordinate adjusted by the given delta.
-         * @api stable
-         */
-        function add(coordinate: ol.Coordinate, delta: ol.Coordinate): ol.Coordinate;
+export namespace coordinate {
+    /**
+     * Add `delta` to `coordinate`. `coordinate` is modified in place and returned
+     * by the function.
+     *
+     * Example:
+     *
+     *     var coord = [7.85, 47.983333];
+     *     ol.coordinate.add(coord, [-2, 4]);
+     *     // coord is now [5.85, 51.983333]
+     *
+     * @param coordinate Coordinate.
+     * @param delta Delta.
+     * @return The input coordinate adjusted by the given delta.
+     * @api stable
+     */
+    function add(coordinate: ol.Coordinate, delta: ol.Coordinate): ol.Coordinate;
 
-        /**
-         * Returns a {@link ol.CoordinateFormatType} function that can be used to format
-         * a {ol.Coordinate} to a string.
-         *
-         * Example without specifying the fractional digits:
-         *
-         *     var coord = [7.85, 47.983333];
-         *     var stringifyFunc = ol.coordinate.createStringXY();
-         *     var out = stringifyFunc(coord);
-         *     // out is now '8, 48'
-         *
-         * Example with explicitly specifying 2 fractional digits:
-         *
-         *     var coord = [7.85, 47.983333];
-         *     var stringifyFunc = ol.coordinate.createStringXY(2);
-         *     var out = stringifyFunc(coord);
-         *     // out is now '7.85, 47.98'
-         *
-         * @param opt_fractionDigits The number of digits to include
-         *    after the decimal point. Default is `0`.
-         * @return Coordinate format.
-         * @api stable
-         */
-        function createStringXY(opt_fractionDigits?: number): ol.CoordinateFormatType;
+    /**
+     * Returns a {@link ol.CoordinateFormatType} function that can be used to format
+     * a {ol.Coordinate} to a string.
+     *
+     * Example without specifying the fractional digits:
+     *
+     *     var coord = [7.85, 47.983333];
+     *     var stringifyFunc = ol.coordinate.createStringXY();
+     *     var out = stringifyFunc(coord);
+     *     // out is now '8, 48'
+     *
+     * Example with explicitly specifying 2 fractional digits:
+     *
+     *     var coord = [7.85, 47.983333];
+     *     var stringifyFunc = ol.coordinate.createStringXY(2);
+     *     var out = stringifyFunc(coord);
+     *     // out is now '7.85, 47.98'
+     *
+     * @param opt_fractionDigits The number of digits to include
+     *    after the decimal point. Default is `0`.
+     * @return Coordinate format.
+     * @api stable
+     */
+    function createStringXY(opt_fractionDigits?: number): ol.CoordinateFormatType;
 
-        /**
-         * Transforms the given {@link ol.Coordinate} to a string using the given string
-         * template. The strings `{x}` and `{y}` in the template will be replaced with
-         * the first and second coordinate values respectively.
-         *
-         * Example without specifying the fractional digits:
-         *
-         *     var coord = [7.85, 47.983333];
-         *     var template = 'Coordinate is ({x}|{y}).';
-         *     var out = ol.coordinate.format(coord, template);
-         *     // out is now 'Coordinate is (8|48).'
-         *
-         * Example explicitly specifying the fractional digits:
-         *
-         *     var coord = [7.85, 47.983333];
-         *     var template = 'Coordinate is ({x}|{y}).';
-         *     var out = ol.coordinate.format(coord, template, 2);
-         *     // out is now 'Coordinate is (7.85|47.98).'
-         *
-         * @param coordinate Coordinate.
-         * @param template A template string with `{x}` and `{y}` placeholders
-         *     that will be replaced by first and second coordinate values.
-         * @param opt_fractionDigits The number of digits to include
-         *    after the decimal point. Default is `0`.
-         * @return Formatted coordinate.
-         * @api stable
-         */
-        function format(coordinate: (ol.Coordinate), template: string, opt_fractionDigits?: number): string;
+    /**
+     * Transforms the given {@link ol.Coordinate} to a string using the given string
+     * template. The strings `{x}` and `{y}` in the template will be replaced with
+     * the first and second coordinate values respectively.
+     *
+     * Example without specifying the fractional digits:
+     *
+     *     var coord = [7.85, 47.983333];
+     *     var template = 'Coordinate is ({x}|{y}).';
+     *     var out = ol.coordinate.format(coord, template);
+     *     // out is now 'Coordinate is (8|48).'
+     *
+     * Example explicitly specifying the fractional digits:
+     *
+     *     var coord = [7.85, 47.983333];
+     *     var template = 'Coordinate is ({x}|{y}).';
+     *     var out = ol.coordinate.format(coord, template, 2);
+     *     // out is now 'Coordinate is (7.85|47.98).'
+     *
+     * @param coordinate Coordinate.
+     * @param template A template string with `{x}` and `{y}` placeholders
+     *     that will be replaced by first and second coordinate values.
+     * @param opt_fractionDigits The number of digits to include
+     *    after the decimal point. Default is `0`.
+     * @return Formatted coordinate.
+     * @api stable
+     */
+    function format(coordinate: (ol.Coordinate), template: string, opt_fractionDigits?: number): string;
 
-        /**
-         * Rotate `coordinate` by `angle`. `coordinate` is modified in place and
-         * returned by the function.
-         *
-         * Example:
-         *
-         *     var coord = [7.85, 47.983333];
-         *     var rotateRadians = Math.PI / 2; // 90 degrees
-         *     ol.coordinate.rotate(coord, rotateRadians);
-         *     // coord is now [-47.983333, 7.85]
-         *
-         * @param coordinate Coordinate.
-         * @param angle Angle in radian.
-         * @return Coordinate.
-         * @api stable
-         */
-        function rotate(coordinate: ol.Coordinate, angle: number): ol.Coordinate;
+    /**
+     * Rotate `coordinate` by `angle`. `coordinate` is modified in place and
+     * returned by the function.
+     *
+     * Example:
+     *
+     *     var coord = [7.85, 47.983333];
+     *     var rotateRadians = Math.PI / 2; // 90 degrees
+     *     ol.coordinate.rotate(coord, rotateRadians);
+     *     // coord is now [-47.983333, 7.85]
+     *
+     * @param coordinate Coordinate.
+     * @param angle Angle in radian.
+     * @return Coordinate.
+     * @api stable
+     */
+    function rotate(coordinate: ol.Coordinate, angle: number): ol.Coordinate;
 
-        /**
-         * Format a geographic coordinate with the hemisphere, degrees, minutes, and
-         * seconds.
-         *
-         * Example without specifying fractional digits:
-         *
-         *     var coord = [7.85, 47.983333];
-         *     var out = ol.coordinate.toStringHDMS(coord);
-         *     // out is now '47° 58′ 60″ N 7° 50′ 60″ E'
-         *
-         * Example explicitly specifying 1 fractional digit:
-         *
-         *     var coord = [7.85, 47.983333];
-         *     var out = ol.coordinate.toStringHDMS(coord, 1);
-         *     // out is now '47° 58′ 60.0″ N 7° 50′ 60.0″ E'
-         *
-         * @param coordinate Coordinate.
-         * @param opt_fractionDigits The number of digits to include
-         *    after the decimal point. Default is `0`.
-         * @return Hemisphere, degrees, minutes and seconds.
-         * @api stable
-         */
-        function toStringHDMS(coordinate?: ol.Coordinate, opt_fractionDigits?: number): string;
+    /**
+     * Format a geographic coordinate with the hemisphere, degrees, minutes, and
+     * seconds.
+     *
+     * Example without specifying fractional digits:
+     *
+     *     var coord = [7.85, 47.983333];
+     *     var out = ol.coordinate.toStringHDMS(coord);
+     *     // out is now '47° 58′ 60″ N 7° 50′ 60″ E'
+     *
+     * Example explicitly specifying 1 fractional digit:
+     *
+     *     var coord = [7.85, 47.983333];
+     *     var out = ol.coordinate.toStringHDMS(coord, 1);
+     *     // out is now '47° 58′ 60.0″ N 7° 50′ 60.0″ E'
+     *
+     * @param coordinate Coordinate.
+     * @param opt_fractionDigits The number of digits to include
+     *    after the decimal point. Default is `0`.
+     * @return Hemisphere, degrees, minutes and seconds.
+     * @api stable
+     */
+    function toStringHDMS(coordinate?: ol.Coordinate, opt_fractionDigits?: number): string;
 
-        /**
-         * Format a coordinate as a comma delimited string.
-         *
-         * Example without specifying fractional digits:
-         *
-         *     var coord = [7.85, 47.983333];
-         *     var out = ol.coordinate.toStringXY(coord);
-         *     // out is now '8, 48'
-         *
-         * Example explicitly specifying 1 fractional digit:
-         *
-         *     var coord = [7.85, 47.983333];
-         *     var out = ol.coordinate.toStringXY(coord, 1);
-         *     // out is now '7.8, 48.0'
-         *
-         * @param coordinate Coordinate.
-         * @param opt_fractionDigits The number of digits to include
-         *    after the decimal point. Default is `0`.
-         * @return XY.
-         * @api stable
-         */
-        function toStringXY(coordinate?: ol.Coordinate, opt_fractionDigits?: number): string;
-    }
+    /**
+     * Format a coordinate as a comma delimited string.
+     *
+     * Example without specifying fractional digits:
+     *
+     *     var coord = [7.85, 47.983333];
+     *     var out = ol.coordinate.toStringXY(coord);
+     *     // out is now '8, 48'
+     *
+     * Example explicitly specifying 1 fractional digit:
+     *
+     *     var coord = [7.85, 47.983333];
+     *     var out = ol.coordinate.toStringXY(coord, 1);
+     *     // out is now '7.8, 48.0'
+     *
+     * @param coordinate Coordinate.
+     * @param opt_fractionDigits The number of digits to include
+     *    after the decimal point. Default is `0`.
+     * @return XY.
+     * @api stable
+     */
+    function toStringXY(coordinate?: ol.Coordinate, opt_fractionDigits?: number): string;
+}
 
+/**
+ * @classdesc
+ * The ol.DeviceOrientation class provides access to information from
+ * DeviceOrientation events.  See the [HTML 5 DeviceOrientation Specification](
+ * http://www.w3.org/TR/orientation-event/) for more details.
+ *
+ * Many new computers, and especially mobile phones
+ * and tablets, provide hardware support for device orientation. Web
+ * developers targeting mobile devices will be especially interested in this
+ * class.
+ *
+ * Device orientation data are relative to a common starting point. For mobile
+ * devices, the starting point is to lay your phone face up on a table with the
+ * top of the phone pointing north. This represents the zero state. All
+ * angles are then relative to this state. For computers, it is the same except
+ * the screen is open at 90 degrees.
+ *
+ * Device orientation is reported as three angles - `alpha`, `beta`, and
+ * `gamma` - relative to the starting position along the three planar axes X, Y
+ * and Z. The X axis runs from the left edge to the right edge through the
+ * middle of the device. Similarly, the Y axis runs from the bottom to the top
+ * of the device through the middle. The Z axis runs from the back to the front
+ * through the middle. In the starting position, the X axis points to the
+ * right, the Y axis points away from you and the Z axis points straight up
+ * from the device lying flat.
+ *
+ * The three angles representing the device orientation are relative to the
+ * three axes. `alpha` indicates how much the device has been rotated around the
+ * Z axis, which is commonly interpreted as the compass heading (see note
+ * below). `beta` indicates how much the device has been rotated around the X
+ * axis, or how much it is tilted from front to back.  `gamma` indicates how
+ * much the device has been rotated around the Y axis, or how much it is tilted
+ * from left to right.
+ *
+ * For most browsers, the `alpha` value returns the compass heading so if the
+ * device points north, it will be 0.  With Safari on iOS, the 0 value of
+ * `alpha` is calculated from when device orientation was first requested.
+ * ol.DeviceOrientation provides the `heading` property which normalizes this
+ * behavior across all browsers for you.
+ *
+ * It is important to note that the HTML 5 DeviceOrientation specification
+ * indicates that `alpha`, `beta` and `gamma` are in degrees while the
+ * equivalent properties in ol.DeviceOrientation are in radians for consistency
+ * with all other uses of angles throughout OpenLayers.
+ *
+ * To get notified of device orientation changes, register a listener for the
+ * generic `change` event on your `ol.DeviceOrientation` instance.
+ *
+ * @see {@link http://www.w3.org/TR/orientation-event/}
+ *
+ * @param opt_options Options.
+ * @api
+ */
+export class DeviceOrientation extends Object {
     /**
      * @classdesc
      * The ol.DeviceOrientation class provides access to information from
@@ -977,325 +1032,284 @@ declare namespace ol {
      * @param opt_options Options.
      * @api
      */
-    class DeviceOrientation extends ol.Object {
-        /**
-         * @classdesc
-         * The ol.DeviceOrientation class provides access to information from
-         * DeviceOrientation events.  See the [HTML 5 DeviceOrientation Specification](
-         * http://www.w3.org/TR/orientation-event/) for more details.
-         *
-         * Many new computers, and especially mobile phones
-         * and tablets, provide hardware support for device orientation. Web
-         * developers targeting mobile devices will be especially interested in this
-         * class.
-         *
-         * Device orientation data are relative to a common starting point. For mobile
-         * devices, the starting point is to lay your phone face up on a table with the
-         * top of the phone pointing north. This represents the zero state. All
-         * angles are then relative to this state. For computers, it is the same except
-         * the screen is open at 90 degrees.
-         *
-         * Device orientation is reported as three angles - `alpha`, `beta`, and
-         * `gamma` - relative to the starting position along the three planar axes X, Y
-         * and Z. The X axis runs from the left edge to the right edge through the
-         * middle of the device. Similarly, the Y axis runs from the bottom to the top
-         * of the device through the middle. The Z axis runs from the back to the front
-         * through the middle. In the starting position, the X axis points to the
-         * right, the Y axis points away from you and the Z axis points straight up
-         * from the device lying flat.
-         *
-         * The three angles representing the device orientation are relative to the
-         * three axes. `alpha` indicates how much the device has been rotated around the
-         * Z axis, which is commonly interpreted as the compass heading (see note
-         * below). `beta` indicates how much the device has been rotated around the X
-         * axis, or how much it is tilted from front to back.  `gamma` indicates how
-         * much the device has been rotated around the Y axis, or how much it is tilted
-         * from left to right.
-         *
-         * For most browsers, the `alpha` value returns the compass heading so if the
-         * device points north, it will be 0.  With Safari on iOS, the 0 value of
-         * `alpha` is calculated from when device orientation was first requested.
-         * ol.DeviceOrientation provides the `heading` property which normalizes this
-         * behavior across all browsers for you.
-         *
-         * It is important to note that the HTML 5 DeviceOrientation specification
-         * indicates that `alpha`, `beta` and `gamma` are in degrees while the
-         * equivalent properties in ol.DeviceOrientation are in radians for consistency
-         * with all other uses of angles throughout OpenLayers.
-         *
-         * To get notified of device orientation changes, register a listener for the
-         * generic `change` event on your `ol.DeviceOrientation` instance.
-         *
-         * @see {@link http://www.w3.org/TR/orientation-event/}
-         *
-         * @param opt_options Options.
-         * @api
-         */
-        constructor(opt_options?: olx.DeviceOrientationOptions);
+    constructor(opt_options?: olx.DeviceOrientationOptions);
 
-        /**
-         * Rotation around the device z-axis (in radians).
-         * @return The euler angle in radians of the device from the
-         *     standard Z axis.
-         * @observable
-         * @api
-         */
-        getAlpha(): (number);
+    /**
+     * Rotation around the device z-axis (in radians).
+     * @return The euler angle in radians of the device from the
+     *     standard Z axis.
+     * @observable
+     * @api
+     */
+    getAlpha(): (number);
 
-        /**
-         * Rotation around the device x-axis (in radians).
-         * @return The euler angle in radians of the device from the
-         *     planar X axis.
-         * @observable
-         * @api
-         */
-        getBeta(): (number);
+    /**
+     * Rotation around the device x-axis (in radians).
+     * @return The euler angle in radians of the device from the
+     *     planar X axis.
+     * @observable
+     * @api
+     */
+    getBeta(): (number);
 
-        /**
-         * Rotation around the device y-axis (in radians).
-         * @return The euler angle in radians of the device from the
-         *     planar Y axis.
-         * @observable
-         * @api
-         */
-        getGamma(): (number);
+    /**
+     * Rotation around the device y-axis (in radians).
+     * @return The euler angle in radians of the device from the
+     *     planar Y axis.
+     * @observable
+     * @api
+     */
+    getGamma(): (number);
 
-        /**
-         * The heading of the device relative to north (in radians).
-         * @return The heading of the device relative to north, in
-         *     radians, normalizing for different browser behavior.
-         * @observable
-         * @api
-         */
-        getHeading(): (number);
+    /**
+     * The heading of the device relative to north (in radians).
+     * @return The heading of the device relative to north, in
+     *     radians, normalizing for different browser behavior.
+     * @observable
+     * @api
+     */
+    getHeading(): (number);
 
-        /**
-         * Determine if orientation is being tracked.
-         * @return Changes in device orientation are being tracked.
-         * @observable
-         * @api
-         */
-        getTracking(): boolean;
+    /**
+     * Determine if orientation is being tracked.
+     * @return Changes in device orientation are being tracked.
+     * @observable
+     * @api
+     */
+    getTracking(): boolean;
 
-        /**
-         * Enable or disable tracking of device orientation events.
-         * @param tracking The status of tracking changes to alpha, beta and
-         *     gamma. If true, changes are tracked and reported immediately.
-         * @observable
-         * @api
-         */
-        setTracking(tracking: boolean): void;
-    }
+    /**
+     * Enable or disable tracking of device orientation events.
+     * @param tracking The status of tracking changes to alpha, beta and
+     *     gamma. If true, changes are tracked and reported immediately.
+     * @observable
+     * @api
+     */
+    setTracking(tracking: boolean): void;
+}
 
+/**
+ * Objects that need to clean up after themselves.
+ */
+export class Disposable {
     /**
      * Objects that need to clean up after themselves.
      */
-    class Disposable {
-        /**
-         * Objects that need to clean up after themselves.
-         */
-        constructor();
-    }
+    constructor();
+}
 
+/**
+ * Easing functions for {@link ol.animation}.
+ */
+export namespace easing {
     /**
-     * Easing functions for {@link ol.animation}.
+     * Start slow and speed up.
+     * @param t Input between 0 and 1.
+     * @return Output between 0 and 1.
+     * @api
      */
-    namespace easing {
+    function easeIn(t: number): number;
+
+    /**
+     * Start fast and slow down.
+     * @param t Input between 0 and 1.
+     * @return Output between 0 and 1.
+     * @api
+     */
+    function easeOut(t: number): number;
+
+    /**
+     * Start slow, speed up, and then slow down again.
+     * @param t Input between 0 and 1.
+     * @return Output between 0 and 1.
+     * @api
+     */
+    function inAndOut(t: number): number;
+
+    /**
+     * Maintain a constant speed over time.
+     * @param t Input between 0 and 1.
+     * @return Output between 0 and 1.
+     * @api
+     */
+    function linear(t: number): number;
+
+    /**
+     * Start slow, speed up, and at the very end slow down again.  This has the
+     * same general behavior as {@link ol.easing.inAndOut}, but the final slowdown
+     * is delayed.
+     * @param t Input between 0 and 1.
+     * @return Output between 0 and 1.
+     * @api
+     */
+    function upAndDown(t: number): number;
+}
+
+/**
+ * Applications do not normally create event instances. They register (and
+ * unregister) event listener functions, which, when called by the library as
+ * the result of an event being dispatched, are passed event instances as their
+ * first argument. Listeners can be registered and unregistered on all objects
+ * descending from {@link ol.Observable}. All event instances have a `target`
+ * property, which corresponds to the object on which the event was dispatched.
+ * By default, `this` within the listener also refers to the target, though
+ * this can be configured in the listener registration function.
+ * Some classes have their own event type, which return additional
+ * properties; see the specific event class page for details.
+ *
+ */
+export namespace events {
+    namespace condition {
         /**
-         * Start slow and speed up.
-         * @param t Input between 0 and 1.
-         * @return Output between 0 and 1.
-         * @api
+         * Return `true` if only the alt-key is pressed, `false` otherwise (e.g. when
+         * additionally the shift-key is pressed).
+         *
+         * @param mapBrowserEvent Map browser event.
+         * @return True if only the alt key is pressed.
+         * @api stable
          */
-        function easeIn(t: number): number;
+        function altKeyOnly(mapBrowserEvent: ol.MapBrowserEvent): boolean;
 
         /**
-         * Start fast and slow down.
-         * @param t Input between 0 and 1.
-         * @return Output between 0 and 1.
-         * @api
+         * Return `true` if only the alt-key and shift-key is pressed, `false` otherwise
+         * (e.g. when additionally the platform-modifier-key is pressed).
+         *
+         * @param mapBrowserEvent Map browser event.
+         * @return True if only the alt and shift keys are pressed.
+         * @api stable
          */
-        function easeOut(t: number): number;
+        function altShiftKeysOnly(mapBrowserEvent: ol.MapBrowserEvent): boolean;
 
         /**
-         * Start slow, speed up, and then slow down again.
-         * @param t Input between 0 and 1.
-         * @return Output between 0 and 1.
-         * @api
+         * Return always true.
+         *
+         * @param mapBrowserEvent Map browser event.
+         * @return True.
+         * @api stable
          */
-        function inAndOut(t: number): number;
+        function always(mapBrowserEvent: ol.MapBrowserEvent): boolean;
 
         /**
-         * Maintain a constant speed over time.
-         * @param t Input between 0 and 1.
-         * @return Output between 0 and 1.
-         * @api
+         * Return `true` if the event is a `click` event, `false` otherwise.
+         *
+         * @param mapBrowserEvent Map browser event.
+         * @return True if the event is a map `click` event.
+         * @api stable
          */
-        function linear(t: number): number;
+        function click(mapBrowserEvent: ol.MapBrowserEvent): boolean;
 
         /**
-         * Start slow, speed up, and at the very end slow down again.  This has the
-         * same general behavior as {@link ol.easing.inAndOut}, but the final slowdown
-         * is delayed.
-         * @param t Input between 0 and 1.
-         * @return Output between 0 and 1.
+         * Return always false.
+         *
+         * @param mapBrowserEvent Map browser event.
+         * @return False.
+         * @api stable
+         */
+        function never(mapBrowserEvent: ol.MapBrowserEvent): boolean;
+
+        /**
+         * Return `true` if the browser event is a `pointermove` event, `false`
+         * otherwise.
+         *
+         * @param mapBrowserEvent Map browser event.
+         * @return True if the browser event is a `pointermove` event.
          * @api
          */
-        function upAndDown(t: number): number;
+        function pointerMove(mapBrowserEvent: ol.MapBrowserEvent): boolean;
+
+        /**
+         * Return `true` if the event is a map `singleclick` event, `false` otherwise.
+         *
+         * @param mapBrowserEvent Map browser event.
+         * @return True if the event is a map `singleclick` event.
+         * @api stable
+         */
+        function singleClick(mapBrowserEvent: ol.MapBrowserEvent): boolean;
+
+        /**
+         * Return `true` if the event is a map `dblclick` event, `false` otherwise.
+         *
+         * @param mapBrowserEvent Map browser event.
+         * @return True if the event is a map `dblclick` event.
+         * @api stable
+         */
+        function doubleClick(mapBrowserEvent: ol.MapBrowserEvent): boolean;
+
+        /**
+         * Return `true` if no modifier key (alt-, shift- or platform-modifier-key) is
+         * pressed.
+         *
+         * @param mapBrowserEvent Map browser event.
+         * @return True only if there no modifier keys are pressed.
+         * @api stable
+         */
+        function noModifierKeys(mapBrowserEvent: ol.MapBrowserEvent): boolean;
+
+        /**
+         * Return `true` if only the platform-modifier-key (the meta-key on Mac,
+         * ctrl-key otherwise) is pressed, `false` otherwise (e.g. when additionally
+         * the shift-key is pressed).
+         *
+         * @param mapBrowserEvent Map browser event.
+         * @return True if only the platform modifier key is pressed.
+         * @api stable
+         */
+        function platformModifierKeyOnly(mapBrowserEvent: ol.MapBrowserEvent): boolean;
+
+        /**
+         * Return `true` if only the shift-key is pressed, `false` otherwise (e.g. when
+         * additionally the alt-key is pressed).
+         *
+         * @param mapBrowserEvent Map browser event.
+         * @return True if only the shift key is pressed.
+         * @api stable
+         */
+        function shiftKeyOnly(mapBrowserEvent: ol.MapBrowserEvent): boolean;
+
+        /**
+         * Return `true` if the target element is not editable, i.e. not a `<input>`-,
+         * `<select>`- or `<textarea>`-element, `false` otherwise.
+         *
+         * @param mapBrowserEvent Map browser event.
+         * @return True only if the target element is not editable.
+         * @api
+         */
+        function targetNotEditable(mapBrowserEvent: ol.MapBrowserEvent): boolean;
+
+        /**
+         * Return `true` if the event originates from a mouse device.
+         *
+         * @param mapBrowserEvent Map browser event.
+         * @return True if the event originates from a mouse device.
+         * @api stable
+         */
+        function mouseOnly(mapBrowserEvent: ol.MapBrowserEvent): boolean;
+
+        /**
+         * Return `true` if the event originates from a primary pointer in
+         * contact with the surface or if the left mouse button is pressed.
+         * @see http://www.w3.org/TR/pointerevents/#button-states
+         *
+         * @param mapBrowserEvent Map browser event.
+         * @return True if the event originates from a primary pointer.
+         * @api
+         */
+        function primaryAction(mapBrowserEvent: ol.MapBrowserEvent): boolean;
     }
 
     /**
-     * Applications do not normally create event instances. They register (and
-     * unregister) event listener functions, which, when called by the library as
-     * the result of an event being dispatched, are passed event instances as their
-     * first argument. Listeners can be registered and unregistered on all objects
-     * descending from {@link ol.Observable}. All event instances have a `target`
-     * property, which corresponds to the object on which the event was dispatched.
-     * By default, `this` within the listener also refers to the target, though
-     * this can be configured in the listener registration function.
-     * Some classes have their own event type, which return additional
-     * properties; see the specific event class page for details.
+     * @classdesc
+     * Stripped down implementation of the W3C DOM Level 2 Event interface.
+     * @see {@link https://www.w3.org/TR/DOM-Level-2-Events/events.html#Events-interface}
      *
+     * This implementation only provides `type` and `target` properties, and
+     * `stopPropagation` and `preventDefault` methods. It is meant as base class
+     * for higher level events defined in the library, and works with
+     * {@link ol.events.EventTarget}.
+     *
+     * @param type Type.
      */
-    namespace events {
-        namespace condition {
-            /**
-             * Return `true` if only the alt-key is pressed, `false` otherwise (e.g. when
-             * additionally the shift-key is pressed).
-             *
-             * @param mapBrowserEvent Map browser event.
-             * @return True if only the alt key is pressed.
-             * @api stable
-             */
-            function altKeyOnly(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-
-            /**
-             * Return `true` if only the alt-key and shift-key is pressed, `false` otherwise
-             * (e.g. when additionally the platform-modifier-key is pressed).
-             *
-             * @param mapBrowserEvent Map browser event.
-             * @return True if only the alt and shift keys are pressed.
-             * @api stable
-             */
-            function altShiftKeysOnly(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-
-            /**
-             * Return always true.
-             *
-             * @param mapBrowserEvent Map browser event.
-             * @return True.
-             * @api stable
-             */
-            function always(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-
-            /**
-             * Return `true` if the event is a `click` event, `false` otherwise.
-             *
-             * @param mapBrowserEvent Map browser event.
-             * @return True if the event is a map `click` event.
-             * @api stable
-             */
-            function click(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-
-            /**
-             * Return always false.
-             *
-             * @param mapBrowserEvent Map browser event.
-             * @return False.
-             * @api stable
-             */
-            function never(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-
-            /**
-             * Return `true` if the browser event is a `pointermove` event, `false`
-             * otherwise.
-             *
-             * @param mapBrowserEvent Map browser event.
-             * @return True if the browser event is a `pointermove` event.
-             * @api
-             */
-            function pointerMove(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-
-            /**
-             * Return `true` if the event is a map `singleclick` event, `false` otherwise.
-             *
-             * @param mapBrowserEvent Map browser event.
-             * @return True if the event is a map `singleclick` event.
-             * @api stable
-             */
-            function singleClick(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-
-            /**
-             * Return `true` if the event is a map `dblclick` event, `false` otherwise.
-             *
-             * @param mapBrowserEvent Map browser event.
-             * @return True if the event is a map `dblclick` event.
-             * @api stable
-             */
-            function doubleClick(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-
-            /**
-             * Return `true` if no modifier key (alt-, shift- or platform-modifier-key) is
-             * pressed.
-             *
-             * @param mapBrowserEvent Map browser event.
-             * @return True only if there no modifier keys are pressed.
-             * @api stable
-             */
-            function noModifierKeys(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-
-            /**
-             * Return `true` if only the platform-modifier-key (the meta-key on Mac,
-             * ctrl-key otherwise) is pressed, `false` otherwise (e.g. when additionally
-             * the shift-key is pressed).
-             *
-             * @param mapBrowserEvent Map browser event.
-             * @return True if only the platform modifier key is pressed.
-             * @api stable
-             */
-            function platformModifierKeyOnly(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-
-            /**
-             * Return `true` if only the shift-key is pressed, `false` otherwise (e.g. when
-             * additionally the alt-key is pressed).
-             *
-             * @param mapBrowserEvent Map browser event.
-             * @return True if only the shift key is pressed.
-             * @api stable
-             */
-            function shiftKeyOnly(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-
-            /**
-             * Return `true` if the target element is not editable, i.e. not a `<input>`-,
-             * `<select>`- or `<textarea>`-element, `false` otherwise.
-             *
-             * @param mapBrowserEvent Map browser event.
-             * @return True only if the target element is not editable.
-             * @api
-             */
-            function targetNotEditable(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-
-            /**
-             * Return `true` if the event originates from a mouse device.
-             *
-             * @param mapBrowserEvent Map browser event.
-             * @return True if the event originates from a mouse device.
-             * @api stable
-             */
-            function mouseOnly(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-
-            /**
-             * Return `true` if the event originates from a primary pointer in
-             * contact with the surface or if the left mouse button is pressed.
-             * @see http://www.w3.org/TR/pointerevents/#button-states
-             *
-             * @param mapBrowserEvent Map browser event.
-             * @return True if the event originates from a primary pointer.
-             * @api
-             */
-            function primaryAction(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-        }
-
+    class Event {
         /**
          * @classdesc
          * Stripped down implementation of the W3C DOM Level 2 Event interface.
@@ -1308,46 +1322,50 @@ declare namespace ol {
          *
          * @param type Type.
          */
-        class Event {
-            /**
-             * @classdesc
-             * Stripped down implementation of the W3C DOM Level 2 Event interface.
-             * @see {@link https://www.w3.org/TR/DOM-Level-2-Events/events.html#Events-interface}
-             *
-             * This implementation only provides `type` and `target` properties, and
-             * `stopPropagation` and `preventDefault` methods. It is meant as base class
-             * for higher level events defined in the library, and works with
-             * {@link ol.events.EventTarget}.
-             *
-             * @param type Type.
-             */
-            constructor(type: string);
+        constructor(type: string);
 
-            /**
-             * The event type.
-             * @api stable
-             */
-            type: string;
+        /**
+         * The event type.
+         * @api stable
+         */
+        type: string;
 
-            /**
-             * The event target.
-             * @api stable
-             */
-            target: GlobalObject;
+        /**
+         * The event target.
+         * @api stable
+         */
+        target: GlobalObject;
 
-            /**
-             * Stop event propagation.
-             * @api stable
-             */
-            preventDefault(): void;
+        /**
+         * Stop event propagation.
+         * @api stable
+         */
+        preventDefault(): void;
 
-            /**
-             * Stop event propagation.
-             * @api stable
-             */
-            stopPropagation(): void;
-        }
+        /**
+         * Stop event propagation.
+         * @api stable
+         */
+        stopPropagation(): void;
+    }
 
+    /**
+     * @classdesc
+     * A simplified implementation of the W3C DOM Level 2 EventTarget interface.
+     * @see {@link https://www.w3.org/TR/2000/REC-DOM-Level-2-Events-20001113/events.html#Events-EventTarget}
+     *
+     * There are two important simplifications compared to the specification:
+     *
+     * 1. The handling of `useCapture` in `addEventListener` and
+     *    `removeEventListener`. There is no real capture model.
+     * 2. The handling of `stopPropagation` and `preventDefault` on `dispatchEvent`.
+     *    There is no event target hierarchy. When a listener calls
+     *    `stopPropagation` or `preventDefault` on an event object, it means that no
+     *    more listeners after this one will be called. Same as when the listener
+     *    returns false.
+     *
+     */
+    class EventTarget extends Disposable {
         /**
          * @classdesc
          * A simplified implementation of the W3C DOM Level 2 EventTarget interface.
@@ -1364,213 +1382,240 @@ declare namespace ol {
          *    returns false.
          *
          */
-        class EventTarget extends ol.Disposable {
-            /**
-             * @classdesc
-             * A simplified implementation of the W3C DOM Level 2 EventTarget interface.
-             * @see {@link https://www.w3.org/TR/2000/REC-DOM-Level-2-Events-20001113/events.html#Events-EventTarget}
-             *
-             * There are two important simplifications compared to the specification:
-             *
-             * 1. The handling of `useCapture` in `addEventListener` and
-             *    `removeEventListener`. There is no real capture model.
-             * 2. The handling of `stopPropagation` and `preventDefault` on `dispatchEvent`.
-             *    There is no event target hierarchy. When a listener calls
-             *    `stopPropagation` or `preventDefault` on an event object, it means that no
-             *    more listeners after this one will be called. Same as when the listener
-             *    returns false.
-             *
-             */
-            constructor();
-        }
+        constructor();
     }
+}
 
-    /* From ol/typedefs.js */
-    type EventsListenerFunctionType = ((evt: ol.events.Event) => void) | ((evt: ol.events.Event) => boolean);
+/* From ol/typedefs.js */
+type EventsListenerFunctionType = ((evt: ol.events.Event) => void) | ((evt: ol.events.Event) => boolean);
 
-    namespace extent {
-        /**
-         * Build an extent that includes all given coordinates.
-         *
-         * @param coordinates Coordinates.
-         * @return Bounding extent.
-         * @api stable
-         */
-        function boundingExtent(coordinates: ol.Coordinate[]): ol.Extent;
+export namespace extent {
+    /**
+     * Build an extent that includes all given coordinates.
+     *
+     * @param coordinates Coordinates.
+     * @return Bounding extent.
+     * @api stable
+     */
+    function boundingExtent(coordinates: ol.Coordinate[]): ol.Extent;
 
-        /**
-         * Return extent increased by the provided value.
-         * @param extent Extent.
-         * @param value The amount by which the extent should be buffered.
-         * @param opt_extent Extent.
-         * @return Extent.
-         * @api stable
-         */
-        function buffer(extent: ol.Extent, value: number, opt_extent?: ol.Extent): ol.Extent;
+    /**
+     * Return extent increased by the provided value.
+     * @param extent Extent.
+     * @param value The amount by which the extent should be buffered.
+     * @param opt_extent Extent.
+     * @return Extent.
+     * @api stable
+     */
+    function buffer(extent: ol.Extent, value: number, opt_extent?: ol.Extent): ol.Extent;
 
-        /**
-         * Check if the passed coordinate is contained or on the edge of the extent.
-         *
-         * @param extent Extent.
-         * @param coordinate Coordinate.
-         * @return The coordinate is contained in the extent.
-         * @api stable
-         */
-        function containsCoordinate(extent: ol.Extent, coordinate: ol.Coordinate): boolean;
+    /**
+     * Check if the passed coordinate is contained or on the edge of the extent.
+     *
+     * @param extent Extent.
+     * @param coordinate Coordinate.
+     * @return The coordinate is contained in the extent.
+     * @api stable
+     */
+    function containsCoordinate(extent: ol.Extent, coordinate: ol.Coordinate): boolean;
 
-        /**
-         * Check if one extent contains another.
-         *
-         * An extent is deemed contained if it lies completely within the other extent,
-         * including if they share one or more edges.
-         *
-         * @param extent1 Extent 1.
-         * @param extent2 Extent 2.
-         * @return The second extent is contained by or on the edge of the
-         *     first.
-         * @api stable
-         */
-        function containsExtent(extent1: ol.Extent, extent2: ol.Extent): boolean;
+    /**
+     * Check if one extent contains another.
+     *
+     * An extent is deemed contained if it lies completely within the other extent,
+     * including if they share one or more edges.
+     *
+     * @param extent1 Extent 1.
+     * @param extent2 Extent 2.
+     * @return The second extent is contained by or on the edge of the
+     *     first.
+     * @api stable
+     */
+    function containsExtent(extent1: ol.Extent, extent2: ol.Extent): boolean;
 
-        /**
-         * Check if the passed coordinate is contained or on the edge of the extent.
-         *
-         * @param extent Extent.
-         * @param x X coordinate.
-         * @param y Y coordinate.
-         * @return The x, y values are contained in the extent.
-         * @api stable
-         */
-        function containsXY(extent: ol.Extent, x: number, y: number): boolean;
+    /**
+     * Check if the passed coordinate is contained or on the edge of the extent.
+     *
+     * @param extent Extent.
+     * @param x X coordinate.
+     * @param y Y coordinate.
+     * @return The x, y values are contained in the extent.
+     * @api stable
+     */
+    function containsXY(extent: ol.Extent, x: number, y: number): boolean;
 
-        /**
-         * Create an empty extent.
-         * @return Empty extent.
-         * @api stable
-         */
-        function createEmpty(): ol.Extent;
+    /**
+     * Create an empty extent.
+     * @return Empty extent.
+     * @api stable
+     */
+    function createEmpty(): ol.Extent;
 
-        /**
-         * Determine if two extents are equivalent.
-         * @param extent1 Extent 1.
-         * @param extent2 Extent 2.
-         * @return The two extents are equivalent.
-         * @api stable
-         */
-        function equals(extent1: ol.Extent, extent2: ol.Extent): boolean;
+    /**
+     * Determine if two extents are equivalent.
+     * @param extent1 Extent 1.
+     * @param extent2 Extent 2.
+     * @return The two extents are equivalent.
+     * @api stable
+     */
+    function equals(extent1: ol.Extent, extent2: ol.Extent): boolean;
 
-        /**
-         * Modify an extent to include another extent.
-         * @param extent1 The extent to be modified.
-         * @param extent2 The extent that will be included in the first.
-         * @return A reference to the first (extended) extent.
-         * @api stable
-         */
-        function extend(extent1: ol.Extent, extent2: ol.Extent): ol.Extent;
+    /**
+     * Modify an extent to include another extent.
+     * @param extent1 The extent to be modified.
+     * @param extent2 The extent that will be included in the first.
+     * @return A reference to the first (extended) extent.
+     * @api stable
+     */
+    function extend(extent1: ol.Extent, extent2: ol.Extent): ol.Extent;
 
-        /**
-         * Get the bottom left coordinate of an extent.
-         * @param extent Extent.
-         * @return Bottom left coordinate.
-         * @api stable
-         */
-        function getBottomLeft(extent: ol.Extent): ol.Coordinate;
+    /**
+     * Get the bottom left coordinate of an extent.
+     * @param extent Extent.
+     * @return Bottom left coordinate.
+     * @api stable
+     */
+    function getBottomLeft(extent: ol.Extent): ol.Coordinate;
 
-        /**
-         * Get the bottom right coordinate of an extent.
-         * @param extent Extent.
-         * @return Bottom right coordinate.
-         * @api stable
-         */
-        function getBottomRight(extent: ol.Extent): ol.Coordinate;
+    /**
+     * Get the bottom right coordinate of an extent.
+     * @param extent Extent.
+     * @return Bottom right coordinate.
+     * @api stable
+     */
+    function getBottomRight(extent: ol.Extent): ol.Coordinate;
 
-        /**
-         * Get the center coordinate of an extent.
-         * @param extent Extent.
-         * @return Center.
-         * @api stable
-         */
-        function getCenter(extent: ol.Extent): ol.Coordinate;
+    /**
+     * Get the center coordinate of an extent.
+     * @param extent Extent.
+     * @return Center.
+     * @api stable
+     */
+    function getCenter(extent: ol.Extent): ol.Coordinate;
 
-        /**
-         * Get the height of an extent.
-         * @param extent Extent.
-         * @return Height.
-         * @api stable
-         */
-        function getHeight(extent: ol.Extent): number;
+    /**
+     * Get the height of an extent.
+     * @param extent Extent.
+     * @return Height.
+     * @api stable
+     */
+    function getHeight(extent: ol.Extent): number;
 
-        /**
-         * Get the intersection of two extents.
-         * @param extent1 Extent 1.
-         * @param extent2 Extent 2.
-         * @param opt_extent Optional extent to populate with intersection.
-         * @return Intersecting extent.
-         * @api stable
-         */
-        function getIntersection(extent1: ol.Extent, extent2: ol.Extent, opt_extent?: ol.Extent): ol.Extent;
+    /**
+     * Get the intersection of two extents.
+     * @param extent1 Extent 1.
+     * @param extent2 Extent 2.
+     * @param opt_extent Optional extent to populate with intersection.
+     * @return Intersecting extent.
+     * @api stable
+     */
+    function getIntersection(extent1: ol.Extent, extent2: ol.Extent, opt_extent?: ol.Extent): ol.Extent;
 
-        /**
-         * Get the size (width, height) of an extent.
-         * @param extent The extent.
-         * @return The extent size.
-         * @api stable
-         */
-        function getSize(extent: ol.Extent): ol.Size;
+    /**
+     * Get the size (width, height) of an extent.
+     * @param extent The extent.
+     * @return The extent size.
+     * @api stable
+     */
+    function getSize(extent: ol.Extent): ol.Size;
 
-        /**
-         * Get the top left coordinate of an extent.
-         * @param extent Extent.
-         * @return Top left coordinate.
-         * @api stable
-         */
-        function getTopLeft(extent: ol.Extent): ol.Coordinate;
+    /**
+     * Get the top left coordinate of an extent.
+     * @param extent Extent.
+     * @return Top left coordinate.
+     * @api stable
+     */
+    function getTopLeft(extent: ol.Extent): ol.Coordinate;
 
-        /**
-         * Get the top right coordinate of an extent.
-         * @param extent Extent.
-         * @return Top right coordinate.
-         * @api stable
-         */
-        function getTopRight(extent: ol.Extent): ol.Coordinate;
+    /**
+     * Get the top right coordinate of an extent.
+     * @param extent Extent.
+     * @return Top right coordinate.
+     * @api stable
+     */
+    function getTopRight(extent: ol.Extent): ol.Coordinate;
 
-        /**
-         * Get the width of an extent.
-         * @param extent Extent.
-         * @return Width.
-         * @api stable
-         */
-        function getWidth(extent: ol.Extent): number;
+    /**
+     * Get the width of an extent.
+     * @param extent Extent.
+     * @return Width.
+     * @api stable
+     */
+    function getWidth(extent: ol.Extent): number;
 
-        /**
-         * Determine if one extent intersects another.
-         * @param extent1 Extent 1.
-         * @param extent2 Extent.
-         * @return The two extents intersect.
-         * @api stable
-         */
-        function intersects(extent1: ol.Extent, extent2: ol.Extent): boolean;
+    /**
+     * Determine if one extent intersects another.
+     * @param extent1 Extent 1.
+     * @param extent2 Extent.
+     * @return The two extents intersect.
+     * @api stable
+     */
+    function intersects(extent1: ol.Extent, extent2: ol.Extent): boolean;
 
-        /**
-         * Determine if an extent is empty.
-         * @param extent Extent.
-         * @return Is empty.
-         * @api stable
-         */
-        function isEmpty(extent: ol.Extent): boolean;
+    /**
+     * Determine if an extent is empty.
+     * @param extent Extent.
+     * @return Is empty.
+     * @api stable
+     */
+    function isEmpty(extent: ol.Extent): boolean;
 
-        /**
-         * Apply a transform function to the extent.
-         * @param extent Extent.
-         * @param transformFn Transform function.  Called with
-         * [minX, minY, maxX, maxY] extent coordinates.
-         * @param opt_extent Destination extent.
-         * @return Extent.
-         * @api stable
-         */
-        function applyTransform(extent: ol.Extent, transformFn: ol.TransformFunction, opt_extent?: ol.Extent): ol.Extent;
-    }
+    /**
+     * Apply a transform function to the extent.
+     * @param extent Extent.
+     * @param transformFn Transform function.  Called with
+     * [minX, minY, maxX, maxY] extent coordinates.
+     * @param opt_extent Destination extent.
+     * @return Extent.
+     * @api stable
+     */
+    function applyTransform(extent: ol.Extent, transformFn: ol.TransformFunction, opt_extent?: ol.Extent): ol.Extent;
+}
 
+/**
+ * @classdesc
+ * A vector object for geographic features with a geometry and other
+ * attribute properties, similar to the features in vector file formats like
+ * GeoJSON.
+ *
+ * Features can be styled individually with `setStyle`; otherwise they use the
+ * style of their vector layer.
+ *
+ * Note that attribute properties are set as {@link ol.Object} properties on
+ * the feature object, so they are observable, and have get/set accessors.
+ *
+ * Typically, a feature has a single geometry property. You can set the
+ * geometry using the `setGeometry` method and get it with `getGeometry`.
+ * It is possible to store more than one geometry on a feature using attribute
+ * properties. By default, the geometry used for rendering is identified by
+ * the property name `geometry`. If you want to use another geometry property
+ * for rendering, use the `setGeometryName` method to change the attribute
+ * property associated with the geometry for the feature.  For example:
+ *
+ * ```js
+ * var feature = new ol.Feature({
+ *   geometry: new ol.geom.Polygon(polyCoords),
+ *   labelPoint: new ol.geom.Point(labelCoords),
+ *   name: 'My Polygon'
+ * });
+ *
+ * // get the polygon geometry
+ * var poly = feature.getGeometry();
+ *
+ * // Render the feature as a point using the coordinates from labelPoint
+ * feature.setGeometryName('labelPoint');
+ *
+ * // get the point geometry
+ * var point = feature.getGeometry();
+ * ```
+ *
+ * @param opt_geometryOrProperties
+ *     You may pass a Geometry object directly, or an object literal
+ *     containing properties.  If you pass an object literal, you may
+ *     include a Geometry associated with a `geometry` key.
+ * @api stable
+ */
+export class Feature extends Object {
     /**
      * @classdesc
      * A vector object for geographic features with a geometry and other
@@ -1614,174 +1659,138 @@ declare namespace ol {
      *     include a Geometry associated with a `geometry` key.
      * @api stable
      */
-    class Feature extends ol.Object {
-        /**
-         * @classdesc
-         * A vector object for geographic features with a geometry and other
-         * attribute properties, similar to the features in vector file formats like
-         * GeoJSON.
-         *
-         * Features can be styled individually with `setStyle`; otherwise they use the
-         * style of their vector layer.
-         *
-         * Note that attribute properties are set as {@link ol.Object} properties on
-         * the feature object, so they are observable, and have get/set accessors.
-         *
-         * Typically, a feature has a single geometry property. You can set the
-         * geometry using the `setGeometry` method and get it with `getGeometry`.
-         * It is possible to store more than one geometry on a feature using attribute
-         * properties. By default, the geometry used for rendering is identified by
-         * the property name `geometry`. If you want to use another geometry property
-         * for rendering, use the `setGeometryName` method to change the attribute
-         * property associated with the geometry for the feature.  For example:
-         *
-         * ```js
-         * var feature = new ol.Feature({
-         *   geometry: new ol.geom.Polygon(polyCoords),
-         *   labelPoint: new ol.geom.Point(labelCoords),
-         *   name: 'My Polygon'
-         * });
-         *
-         * // get the polygon geometry
-         * var poly = feature.getGeometry();
-         *
-         * // Render the feature as a point using the coordinates from labelPoint
-         * feature.setGeometryName('labelPoint');
-         *
-         * // get the point geometry
-         * var point = feature.getGeometry();
-         * ```
-         *
-         * @param opt_geometryOrProperties
-         *     You may pass a Geometry object directly, or an object literal
-         *     containing properties.  If you pass an object literal, you may
-         *     include a Geometry associated with a `geometry` key.
-         * @api stable
-         */
-        constructor(opt_geometryOrProperties?: (ol.geom.Geometry | { [k: string]: any }));
-
-        /**
-         * Clone this feature. If the original feature has a geometry it
-         * is also cloned. The feature id is not set in the clone.
-         * @return The clone.
-         * @api stable
-         */
-        clone(): ol.Feature;
-
-        /**
-         * Get the feature's default geometry.  A feature may have any number of named
-         * geometries.  The "default" geometry (the one that is rendered by default) is
-         * set when calling {@link ol.Feature#setGeometry}.
-         * @return The default geometry for the feature.
-         * @api stable
-         * @observable
-         */
-        getGeometry(): (ol.geom.Geometry);
-
-        /**
-         * Get the feature identifier.  This is a stable identifier for the feature and
-         * is either set when reading data from a remote source or set explicitly by
-         * calling {@link ol.Feature#setId}.
-         * @return Id.
-         * @api stable
-         * @observable
-         */
-        getId(): (number | string);
-
-        /**
-         * Get the name of the feature's default geometry.  By default, the default
-         * geometry is named `geometry`.
-         * @return Get the property name associated with the default geometry
-         *     for this feature.
-         * @api stable
-         */
-        getGeometryName(): string;
-
-        /**
-         * Get the feature's style.  This return for this method depends on what was
-         * provided to the {@link ol.Feature#setStyle} method.
-         * @return The feature style.
-         * @api stable
-         * @observable
-         */
-        getStyle(): (ol.style.Style | ol.style.Style[] | ol.FeatureStyleFunction | ol.StyleFunction);
-
-        /**
-         * Get the feature's style function.
-         * @return Return a function
-         * representing the current style of this feature.
-         * @api stable
-         */
-        getStyleFunction(): (ol.FeatureStyleFunction);
-
-        /**
-         * Set the default geometry for the feature.  This will update the property
-         * with the name returned by {@link ol.Feature#getGeometryName}.
-         * @param geometry The new geometry.
-         * @api stable
-         * @observable
-         */
-        setGeometry(geometry: (ol.geom.Geometry)): void;
-
-        /**
-         * Set the style for the feature.  This can be a single style object, an array
-         * of styles, or a function that takes a resolution and returns an array of
-         * styles. If it is `null` the feature has no style (a `null` style).
-         * @param style Style for this feature.
-         * @api stable
-         * @observable
-         */
-        setStyle(style: (ol.style.Style | ol.style.Style[] | ol.FeatureStyleFunction | ol.StyleFunction)): void;
-
-        /**
-         * Set the feature id.  The feature id is considered stable and may be used when
-         * requesting features or comparing identifiers returned from a remote source.
-         * The feature id can be used with the {@link ol.source.Vector#getFeatureById}
-         * method.
-         * @param id The feature id.
-         * @api stable
-         * @observable
-         */
-        setId(id: (number | string)): void;
-
-        /**
-         * Set the property name to be used when getting the feature's default geometry.
-         * When calling {@link ol.Feature#getGeometry}, the value of the property with
-         * this name will be returned.
-         * @param name The property name of the default geometry.
-         * @api stable
-         */
-        setGeometryName(name: string): void;
-    }
+    constructor(opt_geometryOrProperties?: (ol.geom.Geometry | { [k: string]: any }));
 
     /**
-     * Loading mechanisms for vector data.
+     * Clone this feature. If the original feature has a geometry it
+     * is also cloned. The feature id is not set in the clone.
+     * @return The clone.
+     * @api stable
      */
-    namespace featureloader {
-        /**
-         * Create an XHR feature loader for a `url` and `format`. The feature loader
-         * loads features (with XHR), parses the features, and adds them to the
-         * vector tile.
-         * @param url Feature URL service.
-         * @param format Feature format.
-         * @return The feature loader.
-         * @api
-         */
-        function tile(url: (string | ol.FeatureUrlFunction), format: ol.format.Feature): ol.FeatureLoader;
+    clone(): ol.Feature;
 
-        /**
-         * Create an XHR feature loader for a `url` and `format`. The feature loader
-         * loads features (with XHR), parses the features, and adds them to the
-         * vector source.
-         * @param url Feature URL service.
-         * @param format Feature format.
-         * @return The feature loader.
-         * @api
-         */
-        function xhr(url: (string | ol.FeatureUrlFunction), format: ol.format.Feature): ol.FeatureLoader;
-    }
+    /**
+     * Get the feature's default geometry.  A feature may have any number of named
+     * geometries.  The "default" geometry (the one that is rendered by default) is
+     * set when calling {@link ol.Feature#setGeometry}.
+     * @return The default geometry for the feature.
+     * @api stable
+     * @observable
+     */
+    getGeometry(): (ol.geom.Geometry);
 
-    namespace format {
+    /**
+     * Get the feature identifier.  This is a stable identifier for the feature and
+     * is either set when reading data from a remote source or set explicitly by
+     * calling {@link ol.Feature#setId}.
+     * @return Id.
+     * @api stable
+     * @observable
+     */
+    getId(): (number | string);
+
+    /**
+     * Get the name of the feature's default geometry.  By default, the default
+     * geometry is named `geometry`.
+     * @return Get the property name associated with the default geometry
+     *     for this feature.
+     * @api stable
+     */
+    getGeometryName(): string;
+
+    /**
+     * Get the feature's style.  This return for this method depends on what was
+     * provided to the {@link ol.Feature#setStyle} method.
+     * @return The feature style.
+     * @api stable
+     * @observable
+     */
+    getStyle(): (ol.style.Style | ol.style.Style[] | ol.FeatureStyleFunction | ol.StyleFunction);
+
+    /**
+     * Get the feature's style function.
+     * @return Return a function
+     * representing the current style of this feature.
+     * @api stable
+     */
+    getStyleFunction(): (ol.FeatureStyleFunction);
+
+    /**
+     * Set the default geometry for the feature.  This will update the property
+     * with the name returned by {@link ol.Feature#getGeometryName}.
+     * @param geometry The new geometry.
+     * @api stable
+     * @observable
+     */
+    setGeometry(geometry: (ol.geom.Geometry)): void;
+
+    /**
+     * Set the style for the feature.  This can be a single style object, an array
+     * of styles, or a function that takes a resolution and returns an array of
+     * styles. If it is `null` the feature has no style (a `null` style).
+     * @param style Style for this feature.
+     * @api stable
+     * @observable
+     */
+    setStyle(style: (ol.style.Style | ol.style.Style[] | ol.FeatureStyleFunction | ol.StyleFunction)): void;
+
+    /**
+     * Set the feature id.  The feature id is considered stable and may be used when
+     * requesting features or comparing identifiers returned from a remote source.
+     * The feature id can be used with the {@link ol.source.Vector#getFeatureById}
+     * method.
+     * @param id The feature id.
+     * @api stable
+     * @observable
+     */
+    setId(id: (number | string)): void;
+
+    /**
+     * Set the property name to be used when getting the feature's default geometry.
+     * When calling {@link ol.Feature#getGeometry}, the value of the property with
+     * this name will be returned.
+     * @param name The property name of the default geometry.
+     * @api stable
+     */
+    setGeometryName(name: string): void;
+}
+
+/**
+ * Loading mechanisms for vector data.
+ */
+export namespace featureloader {
+    /**
+     * Create an XHR feature loader for a `url` and `format`. The feature loader
+     * loads features (with XHR), parses the features, and adds them to the
+     * vector tile.
+     * @param url Feature URL service.
+     * @param format Feature format.
+     * @return The feature loader.
+     * @api
+     */
+    function tile(url: (string | ol.FeatureUrlFunction), format: ol.format.Feature): ol.FeatureLoader;
+
+    /**
+     * Create an XHR feature loader for a `url` and `format`. The feature loader
+     * loads features (with XHR), parses the features, and adds them to the
+     * vector source.
+     * @param url Feature URL service.
+     * @param format Feature format.
+     * @return The feature loader.
+     * @api
+     */
+    function xhr(url: (string | ol.FeatureUrlFunction), format: ol.format.Feature): ol.FeatureLoader;
+}
+
+export namespace format {
+    /**
+     * @classdesc
+     * Feature format for reading and writing data in the EsriJSON format.
+     *
+     * @param opt_options Options.
+     * @api
+     */
+    class EsriJSON extends format.JSONFeature {
         /**
          * @classdesc
          * Feature format for reading and writing data in the EsriJSON format.
@@ -1789,120 +1798,124 @@ declare namespace ol {
          * @param opt_options Options.
          * @api
          */
-        class EsriJSON extends ol.format.JSONFeature {
-            /**
-             * @classdesc
-             * Feature format for reading and writing data in the EsriJSON format.
-             *
-             * @param opt_options Options.
-             * @api
-             */
-            constructor(opt_options?: olx.format.EsriJSONOptions);
+        constructor(opt_options?: olx.format.EsriJSONOptions);
 
-            /**
-             * Read a feature from a EsriJSON Feature source.  Only works for Feature,
-             * use `readFeatures` to read FeatureCollection source.
-             *
-             * @param source Source.
-             * @param opt_options Read options.
-             * @return Feature.
-             * @api
-             */
-            readFeature(source: (ArrayBuffer | Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
+        /**
+         * Read a feature from a EsriJSON Feature source.  Only works for Feature,
+         * use `readFeatures` to read FeatureCollection source.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Feature.
+         * @api
+         */
+        readFeature(source: (ArrayBuffer | Document | Node | GlobalObject| string), opt_options?: olx.format.ReadOptions): ol.Feature;
 
-            /**
-             * Read all features from a EsriJSON source.  Works with both Feature and
-             * FeatureCollection sources.
-             *
-             * @param source Source.
-             * @param opt_options Read options.
-             * @return Features.
-             * @api
-             */
-            readFeatures(source: (ArrayBuffer | Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
+        /**
+         * Read all features from a EsriJSON source.  Works with both Feature and
+         * FeatureCollection sources.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Features.
+         * @api
+         */
+        readFeatures(source: (ArrayBuffer | Document | Node | GlobalObject| string), opt_options?: olx.format.ReadOptions): ol.Feature[];
 
-            /**
-             * Read a geometry from a EsriJSON source.
-             *
-             * @param source Source.
-             * @param opt_options Read options.
-             * @return Geometry.
-             * @api
-             */
-            readGeometry(source: (ArrayBuffer | Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.geom.Geometry;
+        /**
+         * Read a geometry from a EsriJSON source.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Geometry.
+         * @api
+         */
+        readGeometry(source: (ArrayBuffer | Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.geom.Geometry;
 
-            /**
-             * Read the projection from a EsriJSON source.
-             *
-             * @param source Source.
-             * @return Projection.
-             * @api
-             */
-            readProjection(source: (ArrayBuffer | Document | Node | GlobalObject | string)): ol.proj.Projection;
+        /**
+         * Read the projection from a EsriJSON source.
+         *
+         * @param source Source.
+         * @return Projection.
+         * @api
+         */
+        readProjection(source: (ArrayBuffer | Document | Node | GlobalObject | string)): ol.proj.Projection;
 
-            /**
-             * Encode a geometry as a EsriJSON string.
-             *
-             * @param geometry Geometry.
-             * @param opt_options Write options.
-             * @return EsriJSON.
-             * @api
-             */
-            writeGeometry(geometry: ol.geom.Geometry, opt_options?: olx.format.WriteOptions): string;
+        /**
+         * Encode a geometry as a EsriJSON string.
+         *
+         * @param geometry Geometry.
+         * @param opt_options Write options.
+         * @return EsriJSON.
+         * @api
+         */
+        writeGeometry(geometry: ol.geom.Geometry, opt_options?: olx.format.WriteOptions): string;
 
-            /**
-             * Encode a geometry as a EsriJSON object.
-             *
-             * @param geometry Geometry.
-             * @param opt_options Write options.
-             * @return Object.
-             * @api
-             */
-            writeGeometryObject(geometry: ol.geom.Geometry, opt_options?: olx.format.WriteOptions): EsriJSONGeometry;
+        /**
+         * Encode a geometry as a EsriJSON object.
+         *
+         * @param geometry Geometry.
+         * @param opt_options Write options.
+         * @return Object.
+         * @api
+         */
+        writeGeometryObject(geometry: ol.geom.Geometry, opt_options?: olx.format.WriteOptions): EsriJSONGeometry;
 
-            /**
-             * Encode a feature as a EsriJSON Feature string.
-             *
-             * @param feature Feature.
-             * @param opt_options Write options.
-             * @return EsriJSON.
-             * @api
-             */
-            writeFeature(feature: ol.Feature, opt_options?: olx.format.WriteOptions): string;
+        /**
+         * Encode a feature as a EsriJSON Feature string.
+         *
+         * @param feature Feature.
+         * @param opt_options Write options.
+         * @return EsriJSON.
+         * @api
+         */
+        writeFeature(feature: ol.Feature, opt_options?: olx.format.WriteOptions): string;
 
-            /**
-             * Encode a feature as a esriJSON Feature object.
-             *
-             * @param feature Feature.
-             * @param opt_options Write options.
-             * @return Object.
-             * @api
-             */
-            writeFeatureObject(feature: ol.Feature, opt_options?: olx.format.WriteOptions): GlobalObject;
+        /**
+         * Encode a feature as a esriJSON Feature object.
+         *
+         * @param feature Feature.
+         * @param opt_options Write options.
+         * @return Object.
+         * @api
+         */
+        writeFeatureObject(feature: ol.Feature, opt_options?: olx.format.WriteOptions): GlobalObject;
 
-            /**
-             * Encode an array of features as EsriJSON.
-             *
-             * @param features Features.
-             * @param opt_options Write options.
-             * @return EsriJSON.
-             * @api
-             */
-            writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
+        /**
+         * Encode an array of features as EsriJSON.
+         *
+         * @param features Features.
+         * @param opt_options Write options.
+         * @return EsriJSON.
+         * @api
+         */
+        writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
 
-            /**
-             * Encode an array of features as a EsriJSON object.
-             *
-             * @param features Features.
-             * @param opt_options Write options.
-             * @return EsriJSON Object.
-             * @api
-             */
-            writeFeaturesObject(features: ol.Feature[], opt_options?: olx.format.WriteOptions): GlobalObject;
-        }
+        /**
+         * Encode an array of features as a EsriJSON object.
+         *
+         * @param features Features.
+         * @param opt_options Write options.
+         * @return EsriJSON Object.
+         * @api
+         */
+        writeFeaturesObject(features: ol.Feature[], opt_options?: olx.format.WriteOptions): GlobalObject;
+    }
 
-        type EsriJSONGeometry = JSON;
+    type EsriJSONGeometry = JSON;
 
+    /**
+     * @classdesc
+     * Abstract base class; normally only used for creating subclasses and not
+     * instantiated in apps.
+     * Base class for feature formats.
+     * {ol.format.Feature} subclasses provide the ability to decode and encode
+     * {@link ol.Feature} objects from a variety of commonly used geospatial
+     * file formats.  See the documentation for each format for more details.
+     *
+     * @api stable
+     */
+    class Feature {
         /**
          * @classdesc
          * Abstract base class; normally only used for creating subclasses and not
@@ -1914,26 +1927,22 @@ declare namespace ol {
          *
          * @api stable
          */
-        class Feature {
-            /**
-             * @classdesc
-             * Abstract base class; normally only used for creating subclasses and not
-             * instantiated in apps.
-             * Base class for feature formats.
-             * {ol.format.Feature} subclasses provide the ability to decode and encode
-             * {@link ol.Feature} objects from a variety of commonly used geospatial
-             * file formats.  See the documentation for each format for more details.
-             *
-             * @api stable
-             */
-            constructor();
-        }
+        constructor();
+    }
 
-        type GeoJSONFeature = JSON;
-        type GeoJSONFeatureCollection = JSON;
-        type GeoJSONGeometry = JSON;
-        type GeoJSONGeometryCollection = JSON;
+    type GeoJSONFeature = JSON;
+    type GeoJSONFeatureCollection = JSON;
+    type GeoJSONGeometry = JSON;
+    type GeoJSONGeometryCollection = JSON;
 
+    /**
+     * @classdesc
+     * Feature format for reading and writing data in the GeoJSON format.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class GeoJSON extends format.JSONFeature {
         /**
          * @classdesc
          * Feature format for reading and writing data in the GeoJSON format.
@@ -1941,118 +1950,121 @@ declare namespace ol {
          * @param opt_options Options.
          * @api stable
          */
-        class GeoJSON extends ol.format.JSONFeature {
-            /**
-             * @classdesc
-             * Feature format for reading and writing data in the GeoJSON format.
-             *
-             * @param opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.format.GeoJSONOptions);
+        constructor(opt_options?: olx.format.GeoJSONOptions);
 
-            /**
-             * Read a feature from a GeoJSON Feature source.  Only works for Feature,
-             * use `readFeatures` to read FeatureCollection source.
-             *
-             * @param source Source.
-             * @param opt_options Read options.
-             * @return Feature.
-             * @api stable
-             */
-            readFeature(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
+        /**
+         * Read a feature from a GeoJSON Feature source.  Only works for Feature,
+         * use `readFeatures` to read FeatureCollection source.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Feature.
+         * @api stable
+         */
+        readFeature(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
 
-            /**
-             * Read all features from a GeoJSON source.  Works with both Feature and
-             * FeatureCollection sources.
-             *
-             * @param source Source.
-             * @param opt_options Read options.
-             * @return Features.
-             * @api stable
-             */
-            readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
+        /**
+         * Read all features from a GeoJSON source.  Works with both Feature and
+         * FeatureCollection sources.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Features.
+         * @api stable
+         */
+        readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
 
-            /**
-             * Read a geometry from a GeoJSON source.
-             *
-             * @param source Source.
-             * @param opt_options Read options.
-             * @return Geometry.
-             * @api stable
-             */
-            readGeometry(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.geom.Geometry;
+        /**
+         * Read a geometry from a GeoJSON source.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Geometry.
+         * @api stable
+         */
+        readGeometry(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.geom.Geometry;
 
-            /**
-             * Read the projection from a GeoJSON source.
-             *
-             * @param source Source.
-             * @return Projection.
-             * @api stable
-             */
-            readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
+        /**
+         * Read the projection from a GeoJSON source.
+         *
+         * @param source Source.
+         * @return Projection.
+         * @api stable
+         */
+        readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
 
-            /**
-             * Encode a feature as a GeoJSON Feature string.
-             *
-             * @param feature Feature.
-             * @param opt_options Write options.
-             * @return GeoJSON.
-             * @api stable
-             */
-            writeFeature(feature: ol.Feature, opt_options?: olx.format.WriteOptions): string;
+        /**
+         * Encode a feature as a GeoJSON Feature string.
+         *
+         * @param feature Feature.
+         * @param opt_options Write options.
+         * @return GeoJSON.
+         * @api stable
+         */
+        writeFeature(feature: ol.Feature, opt_options?: olx.format.WriteOptions): string;
 
-            /**
-             * Encode a feature as a GeoJSON Feature object.
-             *
-             * @param feature Feature.
-             * @param opt_options Write options.
-             * @return Object.
-             * @api stable
-             */
-            writeFeatureObject(feature: ol.Feature, opt_options?: olx.format.WriteOptions): GeoJSONFeature;
+        /**
+         * Encode a feature as a GeoJSON Feature object.
+         *
+         * @param feature Feature.
+         * @param opt_options Write options.
+         * @return Object.
+         * @api stable
+         */
+        writeFeatureObject(feature: ol.Feature, opt_options?: olx.format.WriteOptions): GeoJSONFeature;
 
-            /**
-             * Encode an array of features as GeoJSON.
-             *
-             * @param features Features.
-             * @param opt_options Write options.
-             * @return GeoJSON.
-             * @api stable
-             */
-            writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
+        /**
+         * Encode an array of features as GeoJSON.
+         *
+         * @param features Features.
+         * @param opt_options Write options.
+         * @return GeoJSON.
+         * @api stable
+         */
+        writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
 
-            /**
-             * Encode an array of features as a GeoJSON object.
-             *
-             * @param features Features.
-             * @param opt_options Write options.
-             * @return GeoJSON Object.
-             * @api stable
-             */
-            writeFeaturesObject(features: ol.Feature[], opt_options?: olx.format.WriteOptions): GeoJSONFeatureCollection;
+        /**
+         * Encode an array of features as a GeoJSON object.
+         *
+         * @param features Features.
+         * @param opt_options Write options.
+         * @return GeoJSON Object.
+         * @api stable
+         */
+        writeFeaturesObject(features: ol.Feature[], opt_options?: olx.format.WriteOptions): GeoJSONFeatureCollection;
 
-            /**
-             * Encode a geometry as a GeoJSON string.
-             *
-             * @param geometry Geometry.
-             * @param opt_options Write options.
-             * @return GeoJSON.
-             * @api stable
-             */
-            writeGeometry(geometry: ol.geom.Geometry, opt_options?: olx.format.WriteOptions): string;
+        /**
+         * Encode a geometry as a GeoJSON string.
+         *
+         * @param geometry Geometry.
+         * @param opt_options Write options.
+         * @return GeoJSON.
+         * @api stable
+         */
+        writeGeometry(geometry: ol.geom.Geometry, opt_options?: olx.format.WriteOptions): string;
 
-            /**
-             * Encode a geometry as a GeoJSON object.
-             *
-             * @param geometry Geometry.
-             * @param opt_options Write options.
-             * @return Object.
-             * @api stable
-             */
-            writeGeometryObject(geometry: ol.geom.Geometry, opt_options?: olx.format.WriteOptions): (GeoJSONGeometry | GeoJSONGeometryCollection);
-        }
+        /**
+         * Encode a geometry as a GeoJSON object.
+         *
+         * @param geometry Geometry.
+         * @param opt_options Write options.
+         * @return Object.
+         * @api stable
+         */
+        writeGeometryObject(geometry: ol.geom.Geometry, opt_options?: olx.format.WriteOptions): (GeoJSONGeometry | GeoJSONGeometryCollection);
+    }
 
+    /**
+     * @classdesc
+     * Feature format for reading and writing data in the GML format
+     * version 3.1.1.
+     * Currently only supports GML 3.1.1 Simple Features profile.
+     *
+     * @param opt_options
+     *     Optional configuration object.
+     * @api stable
+     */
+    class GML extends format.GMLBase {
         /**
          * @classdesc
          * Feature format for reading and writing data in the GML format
@@ -2063,40 +2075,38 @@ declare namespace ol {
          *     Optional configuration object.
          * @api stable
          */
-        class GML extends ol.format.GMLBase {
-            /**
-             * @classdesc
-             * Feature format for reading and writing data in the GML format
-             * version 3.1.1.
-             * Currently only supports GML 3.1.1 Simple Features profile.
-             *
-             * @param opt_options
-             *     Optional configuration object.
-             * @api stable
-             */
-            constructor(opt_options?: olx.format.GMLOptions);
+        constructor(opt_options?: olx.format.GMLOptions);
 
-            /**
-             * Encode an array of features in GML 3.1.1 Simple Features.
-             *
-             * @param features Features.
-             * @param opt_options Options.
-             * @return Result.
-             * @api stable
-             */
-            writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
+        /**
+         * Encode an array of features in GML 3.1.1 Simple Features.
+         *
+         * @param features Features.
+         * @param opt_options Options.
+         * @return Result.
+         * @api stable
+         */
+        writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
 
-            /**
-             * Encode an array of features in the GML 3.1.1 format as an XML node.
-             *
-             * @param features Features.
-             * @param opt_options Options.
-             * @return Node.
-             * @api
-             */
-            writeFeaturesNode(features: ol.Feature[], opt_options?: olx.format.WriteOptions): Node;
-        }
+        /**
+         * Encode an array of features in the GML 3.1.1 format as an XML node.
+         *
+         * @param features Features.
+         * @param opt_options Options.
+         * @return Node.
+         * @api
+         */
+        writeFeaturesNode(features: ol.Feature[], opt_options?: olx.format.WriteOptions): Node;
+    }
 
+    /**
+     * @classdesc
+     * Feature format for reading and writing data in the GML format,
+     * version 2.1.2.
+     *
+     * @param opt_options Optional configuration object.
+     * @api
+     */
+    class GML2 extends format.GMLBase {
         /**
          * @classdesc
          * Feature format for reading and writing data in the GML format,
@@ -2105,18 +2115,20 @@ declare namespace ol {
          * @param opt_options Optional configuration object.
          * @api
          */
-        class GML2 extends ol.format.GMLBase {
-            /**
-             * @classdesc
-             * Feature format for reading and writing data in the GML format,
-             * version 2.1.2.
-             *
-             * @param opt_options Optional configuration object.
-             * @api
-             */
-            constructor(opt_options?: olx.format.GMLOptions);
-        }
+        constructor(opt_options?: olx.format.GMLOptions);
+    }
 
+    /**
+     * @classdesc
+     * Feature format for reading and writing data in the GML format
+     * version 3.1.1.
+     * Currently only supports GML 3.1.1 Simple Features profile.
+     *
+     * @param opt_options
+     *     Optional configuration object.
+     * @api
+     */
+    class GML3 extends format.GMLBase {
         /**
          * @classdesc
          * Feature format for reading and writing data in the GML format
@@ -2127,50 +2139,52 @@ declare namespace ol {
          *     Optional configuration object.
          * @api
          */
-        class GML3 extends ol.format.GMLBase {
-            /**
-             * @classdesc
-             * Feature format for reading and writing data in the GML format
-             * version 3.1.1.
-             * Currently only supports GML 3.1.1 Simple Features profile.
-             *
-             * @param opt_options
-             *     Optional configuration object.
-             * @api
-             */
-            constructor(opt_options?: olx.format.GMLOptions);
+        constructor(opt_options?: olx.format.GMLOptions);
 
-            /**
-             * Encode a geometry in GML 3.1.1 Simple Features.
-             *
-             * @param geometry Geometry.
-             * @param opt_options Options.
-             * @return Node.
-             * @api
-             */
-            writeGeometryNode(geometry: ol.geom.Geometry, opt_options?: olx.format.WriteOptions): Node;
+        /**
+         * Encode a geometry in GML 3.1.1 Simple Features.
+         *
+         * @param geometry Geometry.
+         * @param opt_options Options.
+         * @return Node.
+         * @api
+         */
+        writeGeometryNode(geometry: ol.geom.Geometry, opt_options?: olx.format.WriteOptions): Node;
 
-            /**
-             * Encode an array of features in GML 3.1.1 Simple Features.
-             *
-             * @param features Features.
-             * @param opt_options Options.
-             * @return Result.
-             * @api stable
-             */
-            writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
+        /**
+         * Encode an array of features in GML 3.1.1 Simple Features.
+         *
+         * @param features Features.
+         * @param opt_options Options.
+         * @return Result.
+         * @api stable
+         */
+        writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
 
-            /**
-             * Encode an array of features in the GML 3.1.1 format as an XML node.
-             *
-             * @param features Features.
-             * @param opt_options Options.
-             * @return Node.
-             * @api
-             */
-            writeFeaturesNode(features: ol.Feature[], opt_options?: olx.format.WriteOptions): Node;
-        }
+        /**
+         * Encode an array of features in the GML 3.1.1 format as an XML node.
+         *
+         * @param features Features.
+         * @param opt_options Options.
+         * @return Node.
+         * @api
+         */
+        writeFeaturesNode(features: ol.Feature[], opt_options?: olx.format.WriteOptions): Node;
+    }
 
+    /**
+     * @classdesc
+     * Abstract base class; normally only used for creating subclasses and not
+     * instantiated in apps.
+     * Feature base format for reading and writing data in the GML format.
+     * This class cannot be instantiated, it contains only base content that
+     * is shared with versioned format classes ol.format.GML2 and
+     * ol.format.GML3.
+     *
+     * @param opt_options
+     *     Optional configuration object.
+     */
+    class GMLBase extends format.XMLFeature {
         /**
          * @classdesc
          * Abstract base class; normally only used for creating subclasses and not
@@ -2183,32 +2197,27 @@ declare namespace ol {
          * @param opt_options
          *     Optional configuration object.
          */
-        class GMLBase extends ol.format.XMLFeature {
-            /**
-             * @classdesc
-             * Abstract base class; normally only used for creating subclasses and not
-             * instantiated in apps.
-             * Feature base format for reading and writing data in the GML format.
-             * This class cannot be instantiated, it contains only base content that
-             * is shared with versioned format classes ol.format.GML2 and
-             * ol.format.GML3.
-             *
-             * @param opt_options
-             *     Optional configuration object.
-             */
-            constructor(opt_options?: olx.format.GMLOptions);
+        constructor(opt_options?: olx.format.GMLOptions);
 
-            /**
-             * Read all features from a GML FeatureCollection.
-             *
-             * @param source Source.
-             * @param opt_options Options.
-             * @return Features.
-             * @api stable
-             */
-            readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
-        }
+        /**
+         * Read all features from a GML FeatureCollection.
+         *
+         * @param source Source.
+         * @param opt_options Options.
+         * @return Features.
+         * @api stable
+         */
+        readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
+    }
 
+    /**
+     * @classdesc
+     * Feature format for reading and writing data in the GPX format.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class GPX extends format.XMLFeature {
         /**
          * @classdesc
          * Feature format for reading and writing data in the GPX format.
@@ -2216,79 +2225,79 @@ declare namespace ol {
          * @param opt_options Options.
          * @api stable
          */
-        class GPX extends ol.format.XMLFeature {
-            /**
-             * @classdesc
-             * Feature format for reading and writing data in the GPX format.
-             *
-             * @param opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.format.GPXOptions);
-
-            /**
-             * Read the first feature from a GPX source.
-             * Routes (`<rte>`) are converted into LineString geometries, and tracks (`<trk>`)
-             * into MultiLineString. Any properties on route and track waypoints are ignored.
-             *
-             * @param source Source.
-             * @param opt_options Read options.
-             * @return Feature.
-             * @api stable
-             */
-            readFeature(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
-
-            /**
-             * Read all features from a GPX source.
-             * Routes (`<rte>`) are converted into LineString geometries, and tracks (`<trk>`)
-             * into MultiLineString. Any properties on route and track waypoints are ignored.
-             *
-             * @param source Source.
-             * @param opt_options Read options.
-             * @return Features.
-             * @api stable
-             */
-            readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
-
-            /**
-             * Read the projection from a GPX source.
-             *
-             * @param source Source.
-             * @return Projection.
-             * @api stable
-             */
-            readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
-
-            /**
-             * Encode an array of features in the GPX format.
-             * LineString geometries are output as routes (`<rte>`), and MultiLineString
-             * as tracks (`<trk>`).
-             *
-             * @param features Features.
-             * @param opt_options Write options.
-             * @return Result.
-             * @api stable
-             */
-            writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
-
-            /**
-             * Encode an array of features in the GPX format as an XML node.
-             * LineString geometries are output as routes (`<rte>`), and MultiLineString
-             * as tracks (`<trk>`).
-             *
-             * @param features Features.
-             * @param opt_options Options.
-             * @return Node.
-             * @api
-             */
-            writeFeaturesNode(features: ol.Feature[], opt_options?: olx.format.WriteOptions): Node;
-        }
+        constructor(opt_options?: olx.format.GPXOptions);
 
         /**
-         * IGC altitude/z. One of 'barometric', 'gps', 'none'.
+         * Read the first feature from a GPX source.
+         * Routes (`<rte>`) are converted into LineString geometries, and tracks (`<trk>`)
+         * into MultiLineString. Any properties on route and track waypoints are ignored.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Feature.
+         * @api stable
          */
-        type IGCZ = "barometric" | "gps" | "none";
+        readFeature(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
 
+        /**
+         * Read all features from a GPX source.
+         * Routes (`<rte>`) are converted into LineString geometries, and tracks (`<trk>`)
+         * into MultiLineString. Any properties on route and track waypoints are ignored.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Features.
+         * @api stable
+         */
+        readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
+
+        /**
+         * Read the projection from a GPX source.
+         *
+         * @param source Source.
+         * @return Projection.
+         * @api stable
+         */
+        readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
+
+        /**
+         * Encode an array of features in the GPX format.
+         * LineString geometries are output as routes (`<rte>`), and MultiLineString
+         * as tracks (`<trk>`).
+         *
+         * @param features Features.
+         * @param opt_options Write options.
+         * @return Result.
+         * @api stable
+         */
+        writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
+
+        /**
+         * Encode an array of features in the GPX format as an XML node.
+         * LineString geometries are output as routes (`<rte>`), and MultiLineString
+         * as tracks (`<trk>`).
+         *
+         * @param features Features.
+         * @param opt_options Options.
+         * @return Node.
+         * @api
+         */
+        writeFeaturesNode(features: ol.Feature[], opt_options?: olx.format.WriteOptions): Node;
+    }
+
+    /**
+     * IGC altitude/z. One of 'barometric', 'gps', 'none'.
+     */
+    type IGCZ = "barometric" | "gps" | "none";
+
+    /**
+     * @classdesc
+     * Feature format for `*.igc` flight recording files.
+     *
+     * @param opt_options Options.
+     * @api
+     */
+    class IGC extends format.TextFeature {
         /**
          * @classdesc
          * Feature format for `*.igc` flight recording files.
@@ -2296,47 +2305,47 @@ declare namespace ol {
          * @param opt_options Options.
          * @api
          */
-        class IGC extends ol.format.TextFeature {
-            /**
-             * @classdesc
-             * Feature format for `*.igc` flight recording files.
-             *
-             * @param opt_options Options.
-             * @api
-             */
-            constructor(opt_options?: olx.format.IGCOptions);
+        constructor(opt_options?: olx.format.IGCOptions);
 
-            /**
-             * Read the feature from the IGC source.
-             *
-             * @param source Source.
-             * @param opt_options Read options.
-             * @return Feature.
-             * @api
-             */
-            readFeature(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
+        /**
+         * Read the feature from the IGC source.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Feature.
+         * @api
+         */
+        readFeature(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
 
-            /**
-             * Read the feature from the source. As IGC sources contain a single
-             * feature, this will return the feature in an array.
-             *
-             * @param source Source.
-             * @param opt_options Read options.
-             * @return Features.
-             * @api
-             */
-            readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
+        /**
+         * Read the feature from the source. As IGC sources contain a single
+         * feature, this will return the feature in an array.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Features.
+         * @api
+         */
+        readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
 
-            /**
-             * Read the projection from the IGC source.
-             *
-             * @param source Source.
-             * @return Projection.
-             * @api
-             */
-            readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
-        }
+        /**
+         * Read the projection from the IGC source.
+         *
+         * @param source Source.
+         * @return Projection.
+         * @api
+         */
+        readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
+    }
 
+    /**
+     * @classdesc
+     * Abstract base class; normally only used for creating subclasses and not
+     * instantiated in apps.
+     * Base class for JSON feature formats.
+     *
+     */
+    class JSONFeature extends format.Feature {
         /**
          * @classdesc
          * Abstract base class; normally only used for creating subclasses and not
@@ -2344,17 +2353,20 @@ declare namespace ol {
          * Base class for JSON feature formats.
          *
          */
-        class JSONFeature extends ol.format.Feature {
-            /**
-             * @classdesc
-             * Abstract base class; normally only used for creating subclasses and not
-             * instantiated in apps.
-             * Base class for JSON feature formats.
-             *
-             */
-            constructor();
-        }
+        constructor();
+    }
 
+    /**
+     * @classdesc
+     * Feature format for reading and writing data in the KML format.
+     *
+     * Note that the KML format uses the URL() constructor. Older browsers such as IE
+     * which do not support this will need a URL polyfill to be loaded before use.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class KML extends format.XMLFeature {
         /**
          * @classdesc
          * Feature format for reading and writing data in the KML format.
@@ -2365,93 +2377,90 @@ declare namespace ol {
          * @param opt_options Options.
          * @api stable
          */
-        class KML extends ol.format.XMLFeature {
-            /**
-             * @classdesc
-             * Feature format for reading and writing data in the KML format.
-             *
-             * Note that the KML format uses the URL() constructor. Older browsers such as IE
-             * which do not support this will need a URL polyfill to be loaded before use.
-             *
-             * @param opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.format.KMLOptions);
+        constructor(opt_options?: olx.format.KMLOptions);
 
-            /**
-             * Read the first feature from a KML source. MultiGeometries are converted into
-             * GeometryCollections if they are a mix of geometry types, and into MultiPoint/
-             * MultiLineString/MultiPolygon if they are all of the same type.
-             *
-             * @param source Source.
-             * @param opt_options Read options.
-             * @return Feature.
-             * @api stable
-             */
-            readFeature(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
+        /**
+         * Read the first feature from a KML source. MultiGeometries are converted into
+         * GeometryCollections if they are a mix of geometry types, and into MultiPoint/
+         * MultiLineString/MultiPolygon if they are all of the same type.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Feature.
+         * @api stable
+         */
+        readFeature(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
 
-            /**
-             * Read all features from a KML source. MultiGeometries are converted into
-             * GeometryCollections if they are a mix of geometry types, and into MultiPoint/
-             * MultiLineString/MultiPolygon if they are all of the same type.
-             *
-             * @param source Source.
-             * @param opt_options Read options.
-             * @return Features.
-             * @api stable
-             */
-            readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
+        /**
+         * Read all features from a KML source. MultiGeometries are converted into
+         * GeometryCollections if they are a mix of geometry types, and into MultiPoint/
+         * MultiLineString/MultiPolygon if they are all of the same type.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Features.
+         * @api stable
+         */
+        readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
 
-            /**
-             * Read the name of the KML.
-             *
-             * @param source Souce.
-             * @return Name.
-             * @api stable
-             */
-            readName(source: (Document | Node | string)): (string);
+        /**
+         * Read the name of the KML.
+         *
+         * @param source Souce.
+         * @return Name.
+         * @api stable
+         */
+        readName(source: (Document | Node | string)): (string);
 
-            /**
-             * Read the network links of the KML.
-             *
-             * @param source Source.
-             * @return Network links.
-             * @api
-             */
-            readNetworkLinks(source: (Document | Node | string)): GlobalObject[];
+        /**
+         * Read the network links of the KML.
+         *
+         * @param source Source.
+         * @return Network links.
+         * @api
+         */
+        readNetworkLinks(source: (Document | Node | string)): GlobalObject[];
 
-            /**
-             * Read the projection from a KML source.
-             *
-             * @param source Source.
-             * @return Projection.
-             * @api stable
-             */
-            readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
+        /**
+         * Read the projection from a KML source.
+         *
+         * @param source Source.
+         * @return Projection.
+         * @api stable
+         */
+        readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
 
-            /**
-             * Encode an array of features in the KML format. GeometryCollections, MultiPoints,
-             * MultiLineStrings, and MultiPolygons are output as MultiGeometries.
-             *
-             * @param features Features.
-             * @param opt_options Options.
-             * @return Result.
-             * @api stable
-             */
-            writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
+        /**
+         * Encode an array of features in the KML format. GeometryCollections, MultiPoints,
+         * MultiLineStrings, and MultiPolygons are output as MultiGeometries.
+         *
+         * @param features Features.
+         * @param opt_options Options.
+         * @return Result.
+         * @api stable
+         */
+        writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
 
-            /**
-             * Encode an array of features in the KML format as an XML node. GeometryCollections,
-             * MultiPoints, MultiLineStrings, and MultiPolygons are output as MultiGeometries.
-             *
-             * @param features Features.
-             * @param opt_options Options.
-             * @return Node.
-             * @api
-             */
-            writeFeaturesNode(features: ol.Feature[], opt_options?: olx.format.WriteOptions): Node;
-        }
+        /**
+         * Encode an array of features in the KML format as an XML node. GeometryCollections,
+         * MultiPoints, MultiLineStrings, and MultiPolygons are output as MultiGeometries.
+         *
+         * @param features Features.
+         * @param opt_options Options.
+         * @return Node.
+         * @api
+         */
+        writeFeaturesNode(features: ol.Feature[], opt_options?: olx.format.WriteOptions): Node;
+    }
 
+    /**
+     * @classdesc
+     * Feature format for reading data in the Mapbox MVT format.
+     *
+     * @param opt_options Options.
+     * @api
+     */
+    class MVT extends format.Feature {
         /**
          * @classdesc
          * Feature format for reading data in the Mapbox MVT format.
@@ -2459,216 +2468,218 @@ declare namespace ol {
          * @param opt_options Options.
          * @api
          */
-        class MVT extends ol.format.Feature {
-            /**
-             * @classdesc
-             * Feature format for reading data in the Mapbox MVT format.
-             *
-             * @param opt_options Options.
-             * @api
-             */
-            constructor(opt_options?: olx.format.MVTOptions);
+        constructor(opt_options?: olx.format.MVTOptions);
 
-            /**
-             * @inheritDoc
-             * @api
-             */
-            readFeatures(source: (Document | Node | ArrayBuffer | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
+        /**
+         * @inheritDoc
+         * @api
+         */
+        readFeatures(source: (Document | Node | ArrayBuffer | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
 
-            /**
-             * @inheritDoc
-             * @api
-             */
-            readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
+        /**
+         * @inheritDoc
+         * @api
+         */
+        readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
 
-            /**
-             * Sets the layers that features will be read from.
-             * @param layers Layers.
-             * @api
-             */
-            setLayers(layers: string[]): void;
-        }
+        /**
+         * Sets the layers that features will be read from.
+         * @param layers Layers.
+         * @api
+         */
+        setLayers(layers: string[]): void;
+    }
 
-        namespace filter {
-            /**
-             * Create a `<Intersects>` operator to test whether a geometry-valued property
-             * intersects a given geometry.
-             *
-             * @param geometryName Geometry name to use.
-             * @param geometry Geometry.
-             * @param opt_srsName SRS name. No srsName attribute will be
-             *    set on geometries when this is not provided.
-             * @returns `<Intersects>` operator.
-             * @api
-             */
-            function intersects(geometryName: string, geometry: ol.geom.Geometry, opt_srsName?: string): ol.format.filter.Intersects;
+    namespace filter {
+        /**
+         * Create a `<Intersects>` operator to test whether a geometry-valued property
+         * intersects a given geometry.
+         *
+         * @param geometryName Geometry name to use.
+         * @param geometry Geometry.
+         * @param opt_srsName SRS name. No srsName attribute will be
+         *    set on geometries when this is not provided.
+         * @returns `<Intersects>` operator.
+         * @api
+         */
+        function intersects(geometryName: string, geometry: ol.geom.Geometry, opt_srsName?: string): ol.format.filter.Intersects;
 
-            /**
-             * Create a logical `<Or>` operator between two or more filter conditions.
-             *
-             * @param conditions Filter conditions.
-             * @returns `<Or>` operator.
-             * @api
-             */
-            function or(...conditions: ol.format.filter.Filter[]): ol.format.filter.Or;
+        /**
+         * Create a logical `<Or>` operator between two or more filter conditions.
+         *
+         * @param conditions Filter conditions.
+         * @returns `<Or>` operator.
+         * @api
+         */
+        function or(...conditions: ol.format.filter.Filter[]): ol.format.filter.Or;
 
-            /**
-             * Create a logical `<And>` operator between two or more filter conditions.
-             *
-             * @param conditions Filter conditions.
-             * @returns `<And>` operator.
-             * @api
-             */
-            function and(...conditions: ol.format.filter.Filter[]): ol.format.filter.And;
+        /**
+         * Create a logical `<And>` operator between two or more filter conditions.
+         *
+         * @param conditions Filter conditions.
+         * @returns `<And>` operator.
+         * @api
+         */
+        function and(...conditions: ol.format.filter.Filter[]): ol.format.filter.And;
 
-            /**
-             * Represents a logical `<Not>` operator for a filter condition.
-             *
-             * @param condition Filter condition.
-             * @returns `<Not>` operator.
-             * @api
-             */
-            function not(condition: ol.format.filter.Filter): ol.format.filter.Not;
+        /**
+         * Represents a logical `<Not>` operator for a filter condition.
+         *
+         * @param condition Filter condition.
+         * @returns `<Not>` operator.
+         * @api
+         */
+        function not(condition: ol.format.filter.Filter): ol.format.filter.Not;
 
-            /**
-             * Create a `<BBOX>` operator to test whether a geometry-valued property
-             * intersects a fixed bounding box
-             *
-             * @param geometryName Geometry name to use.
-             * @param extent Extent.
-             * @param opt_srsName SRS name. No srsName attribute will be
-             *    set on geometries when this is not provided.
-             * @returns `<BBOX>` operator.
-             * @api
-             */
-            function bbox(geometryName: string, extent: ol.Extent, opt_srsName?: string): ol.format.filter.Bbox;
+        /**
+         * Create a `<BBOX>` operator to test whether a geometry-valued property
+         * intersects a fixed bounding box
+         *
+         * @param geometryName Geometry name to use.
+         * @param extent Extent.
+         * @param opt_srsName SRS name. No srsName attribute will be
+         *    set on geometries when this is not provided.
+         * @returns `<BBOX>` operator.
+         * @api
+         */
+        function bbox(geometryName: string, extent: ol.Extent, opt_srsName?: string): ol.format.filter.Bbox;
 
-            /**
-             * Create a `<Within>` operator to test whether a geometry-valued property
-             * is within a given geometry.
-             *
-             * @param geometryName Geometry name to use.
-             * @param geometry Geometry.
-             * @param opt_srsName SRS name. No srsName attribute will be
-             *    set on geometries when this is not provided.
-             * @returns `<Within>` operator.
-             * @api
-             */
-            function within(geometryName: string, geometry: ol.geom.Geometry, opt_srsName?: string): ol.format.filter.Within;
+        /**
+         * Create a `<Within>` operator to test whether a geometry-valued property
+         * is within a given geometry.
+         *
+         * @param geometryName Geometry name to use.
+         * @param geometry Geometry.
+         * @param opt_srsName SRS name. No srsName attribute will be
+         *    set on geometries when this is not provided.
+         * @returns `<Within>` operator.
+         * @api
+         */
+        function within(geometryName: string, geometry: ol.geom.Geometry, opt_srsName?: string): ol.format.filter.Within;
 
-            /**
-             * Creates a `<PropertyIsEqualTo>` comparison operator.
-             *
-             * @param propertyName Name of the context property to compare.
-             * @param expression The value to compare.
-             * @param opt_matchCase Case-sensitive?
-             * @returns `<PropertyIsEqualTo>` operator.
-             * @api
-             */
-            function equalTo(propertyName: string, expression: string | number, opt_matchCase?: boolean): ol.format.filter.EqualTo;
+        /**
+         * Creates a `<PropertyIsEqualTo>` comparison operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param expression The value to compare.
+         * @param opt_matchCase Case-sensitive?
+         * @returns `<PropertyIsEqualTo>` operator.
+         * @api
+         */
+        function equalTo(propertyName: string, expression: string | number, opt_matchCase?: boolean): ol.format.filter.EqualTo;
 
-            /**
-             * Creates a `<PropertyIsNotEqualTo>` comparison operator.
-             *
-             * @param propertyName Name of the context property to compare.
-             * @param expression The value to compare.
-             * @param opt_matchCase Case-sensitive?
-             * @returns `<PropertyIsNotEqualTo>` operator.
-             * @api
-             */
-            function notEqualTo(propertyName: string, expression: string | number, opt_matchCase?: boolean): ol.format.filter.NotEqualTo;
+        /**
+         * Creates a `<PropertyIsNotEqualTo>` comparison operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param expression The value to compare.
+         * @param opt_matchCase Case-sensitive?
+         * @returns `<PropertyIsNotEqualTo>` operator.
+         * @api
+         */
+        function notEqualTo(propertyName: string, expression: string | number, opt_matchCase?: boolean): ol.format.filter.NotEqualTo;
 
-            /**
-             * Creates a `<PropertyIsLessThan>` comparison operator.
-             *
-             * @param propertyName Name of the context property to compare.
-             * @param expression The value to compare.
-             * @returns `<PropertyIsLessThan>` operator.
-             * @api
-             */
-            function lessThan(propertyName: string, expression: number): ol.format.filter.LessThan;
+        /**
+         * Creates a `<PropertyIsLessThan>` comparison operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param expression The value to compare.
+         * @returns `<PropertyIsLessThan>` operator.
+         * @api
+         */
+        function lessThan(propertyName: string, expression: number): ol.format.filter.LessThan;
 
-            /**
-             * Creates a `<PropertyIsLessThanOrEqualTo>` comparison operator.
-             *
-             * @param propertyName Name of the context property to compare.
-             * @param expression The value to compare.
-             * @returns `<PropertyIsLessThanOrEqualTo>` operator.
-             * @api
-             */
-            function lessThanOrEqualTo(propertyName: string, expression: number): ol.format.filter.LessThanOrEqualTo;
+        /**
+         * Creates a `<PropertyIsLessThanOrEqualTo>` comparison operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param expression The value to compare.
+         * @returns `<PropertyIsLessThanOrEqualTo>` operator.
+         * @api
+         */
+        function lessThanOrEqualTo(propertyName: string, expression: number): ol.format.filter.LessThanOrEqualTo;
 
-            /**
-             * Creates a `<PropertyIsGreaterThan>` comparison operator.
-             *
-             * @param propertyName Name of the context property to compare.
-             * @param expression The value to compare.
-             * @returns `<PropertyIsGreaterThan>` operator.
-             * @api
-             */
-            function greaterThan(propertyName: string, expression: number): ol.format.filter.GreaterThan;
+        /**
+         * Creates a `<PropertyIsGreaterThan>` comparison operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param expression The value to compare.
+         * @returns `<PropertyIsGreaterThan>` operator.
+         * @api
+         */
+        function greaterThan(propertyName: string, expression: number): ol.format.filter.GreaterThan;
 
-            /**
-             * Creates a `<PropertyIsGreaterThanOrEqualTo>` comparison operator.
-             *
-             * @param propertyName Name of the context property to compare.
-             * @param expression The value to compare.
-             * @returns `<PropertyIsGreaterThanOrEqualTo>` operator.
-             * @api
-             */
-            function greaterThanOrEqualTo(propertyName: string, expression: number): ol.format.filter.GreaterThanOrEqualTo;
+        /**
+         * Creates a `<PropertyIsGreaterThanOrEqualTo>` comparison operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param expression The value to compare.
+         * @returns `<PropertyIsGreaterThanOrEqualTo>` operator.
+         * @api
+         */
+        function greaterThanOrEqualTo(propertyName: string, expression: number): ol.format.filter.GreaterThanOrEqualTo;
 
-            /**
-             * Creates a `<PropertyIsNull>` comparison operator to test whether a property value
-             * is null.
-             *
-             * @param propertyName Name of the context property to compare.
-             * @returns `<PropertyIsNull>` operator.
-             * @api
-             */
-            function isNull(propertyName: string): ol.format.filter.IsNull;
+        /**
+         * Creates a `<PropertyIsNull>` comparison operator to test whether a property value
+         * is null.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @returns `<PropertyIsNull>` operator.
+         * @api
+         */
+        function isNull(propertyName: string): ol.format.filter.IsNull;
 
-            /**
-             * Creates a `<PropertyIsBetween>` comparison operator to test whether an expression
-             * value lies within a range given by a lower and upper bound (inclusive).
-             *
-             * @param propertyName Name of the context property to compare.
-             * @param lowerBoundary The lower bound of the range.
-             * @param upperBoundary The upper bound of the range.
-             * @returns `<PropertyIsBetween>` operator.
-             * @api
-             */
-            function between(propertyName: string, lowerBoundary: number, upperBoundary: number): ol.format.filter.IsBetween;
+        /**
+         * Creates a `<PropertyIsBetween>` comparison operator to test whether an expression
+         * value lies within a range given by a lower and upper bound (inclusive).
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param lowerBoundary The lower bound of the range.
+         * @param upperBoundary The upper bound of the range.
+         * @returns `<PropertyIsBetween>` operator.
+         * @api
+         */
+        function between(propertyName: string, lowerBoundary: number, upperBoundary: number): ol.format.filter.IsBetween;
 
-            /**
-             * Represents a `<PropertyIsLike>` comparison operator that matches a string property
-             * value against a text pattern.
-             *
-             * @param propertyName Name of the context property to compare.
-             * @param pattern Text pattern.
-             * @param opt_wildCard Pattern character which matches any sequence of
-             *    zero or more string characters. Default is '*'.
-             * @param opt_singleChar pattern character which matches any single
-             *    string character. Default is '.'.
-             * @param opt_escapeChar Escape character which can be used to escape
-             *    the pattern characters. Default is '!'.
-             * @param opt_matchCase Case-sensitive?
-             * @returns `<PropertyIsLike>` operator.
-             * @api
-             */
-            function like(propertyName: string, pattern: string, opt_wildCard?: string, opt_singleChar?: string, opt_escapeChar?: string, opt_matchCase?: boolean): ol.format.filter.IsLike;
+        /**
+         * Represents a `<PropertyIsLike>` comparison operator that matches a string property
+         * value against a text pattern.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param pattern Text pattern.
+         * @param opt_wildCard Pattern character which matches any sequence of
+         *    zero or more string characters. Default is '*'.
+         * @param opt_singleChar pattern character which matches any single
+         *    string character. Default is '.'.
+         * @param opt_escapeChar Escape character which can be used to escape
+         *    the pattern characters. Default is '!'.
+         * @param opt_matchCase Case-sensitive?
+         * @returns `<PropertyIsLike>` operator.
+         * @api
+         */
+        function like(propertyName: string, pattern: string, opt_wildCard?: string, opt_singleChar?: string, opt_escapeChar?: string, opt_matchCase?: boolean): ol.format.filter.IsLike;
 
-            /**
-             * Create a `<During>` temporal operator.
-             *
-             * @param propertyName Name of the context property to compare.
-             * @param begin The begin date in ISO-8601 format.
-             * @param end The end date in ISO-8601 format.
-             * @returns `<During>` operator.
-             * @api
-             */
-            function during(propertyName: string, begin: string, end: string): ol.format.filter.During;
+        /**
+         * Create a `<During>` temporal operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param begin The begin date in ISO-8601 format.
+         * @param end The end date in ISO-8601 format.
+         * @returns `<During>` operator.
+         * @api
+         */
+        function during(propertyName: string, begin: string, end: string): ol.format.filter.During;
 
+        /**
+         * @classdesc
+         * Abstract class; normally only used for creating subclasses and not instantiated in apps.
+         * Base class for WFS GetFeature filters.
+         *
+         * @param tagName The XML tag name for this filter.
+         * @struct
+         * @api
+         */
+        class Filter {
             /**
              * @classdesc
              * Abstract class; normally only used for creating subclasses and not instantiated in apps.
@@ -2678,25 +2689,28 @@ declare namespace ol {
              * @struct
              * @api
              */
-            class Filter {
-                /**
-                 * @classdesc
-                 * Abstract class; normally only used for creating subclasses and not instantiated in apps.
-                 * Base class for WFS GetFeature filters.
-                 *
-                 * @param tagName The XML tag name for this filter.
-                 * @struct
-                 * @api
-                 */
-                constructor(tagName: string);
+            constructor(tagName: string);
 
-                /**
-                 * The XML tag name for a filter.
-                 * @returns Name.
-                 */
-                getTagName(): string;
-            }
+            /**
+             * The XML tag name for a filter.
+             * @returns Name.
+             */
+            getTagName(): string;
+        }
 
+        /**
+         * @classdesc
+         * Represents a spatial operator to test whether a geometry-valued property
+         * relates to a given geometry.
+         *
+         * @param tagName The XML tag name for this filter.
+         * @param geometryName Geometry name to use.
+         * @param geometry Geometry.
+         * @param opt_srsName SRS name. No srsName attribute will be
+         *    set on geometries when this is not provided.
+         * @api
+         */
+        class Spatial extends format.filter.Filter {
             /**
              * @classdesc
              * Represents a spatial operator to test whether a geometry-valued property
@@ -2709,22 +2723,21 @@ declare namespace ol {
              *    set on geometries when this is not provided.
              * @api
              */
-            class Spatial extends ol.format.filter.Filter {
-                /**
-                 * @classdesc
-                 * Represents a spatial operator to test whether a geometry-valued property
-                 * relates to a given geometry.
-                 *
-                 * @param tagName The XML tag name for this filter.
-                 * @param geometryName Geometry name to use.
-                 * @param geometry Geometry.
-                 * @param opt_srsName SRS name. No srsName attribute will be
-                 *    set on geometries when this is not provided.
-                 * @api
-                 */
-                constructor(tagName: string, geometryName: string, geometry: ol.geom.Geometry, opt_srsName?: string);
-            }
+            constructor(tagName: string, geometryName: string, geometry: ol.geom.Geometry, opt_srsName?: string);
+        }
 
+        /**
+         * @classdesc
+         * Represents a `<Intersects>` operator to test whether a geometry-valued property
+         * intersects a given geometry.
+         *
+         * @param geometryName Geometry name to use.
+         * @param geometry Geometry.
+         * @param opt_srsName SRS name. No srsName attribute will be
+         *    set on geometries when this is not provided.
+         * @api
+         */
+        class Intersects extends format.filter.Spatial {
             /**
              * @classdesc
              * Represents a `<Intersects>` operator to test whether a geometry-valued property
@@ -2736,21 +2749,21 @@ declare namespace ol {
              *    set on geometries when this is not provided.
              * @api
              */
-            class Intersects extends ol.format.filter.Spatial {
-                /**
-                 * @classdesc
-                 * Represents a `<Intersects>` operator to test whether a geometry-valued property
-                 * intersects a given geometry.
-                 *
-                 * @param geometryName Geometry name to use.
-                 * @param geometry Geometry.
-                 * @param opt_srsName SRS name. No srsName attribute will be
-                 *    set on geometries when this is not provided.
-                 * @api
-                 */
-                constructor(geometryName: string, geometry: ol.geom.Geometry, opt_srsName?: string);
-            }
+            constructor(geometryName: string, geometry: ol.geom.Geometry, opt_srsName?: string);
+        }
 
+        /**
+         * @classdesc
+         * Represents a `<Within>` operator to test whether a geometry-valued property
+         * is within a given geometry.
+         *
+         * @param geometryName Geometry name to use.
+         * @param geometry Geometry.
+         * @param opt_srsName SRS name. No srsName attribute will be
+         *    set on geometries when this is not provided.
+         * @api
+         */
+        class Within extends format.filter.Spatial {
             /**
              * @classdesc
              * Represents a `<Within>` operator to test whether a geometry-valued property
@@ -2762,28 +2775,24 @@ declare namespace ol {
              *    set on geometries when this is not provided.
              * @api
              */
-            class Within extends ol.format.filter.Spatial {
-                /**
-                 * @classdesc
-                 * Represents a `<Within>` operator to test whether a geometry-valued property
-                 * is within a given geometry.
-                 *
-                 * @param geometryName Geometry name to use.
-                 * @param geometry Geometry.
-                 * @param opt_srsName SRS name. No srsName attribute will be
-                 *    set on geometries when this is not provided.
-                 * @api
-                 */
-                constructor(geometryName: string, geometry: ol.geom.Geometry, opt_srsName?: string);
-            }
+            constructor(geometryName: string, geometry: ol.geom.Geometry, opt_srsName?: string);
+        }
 
-            /**
-             * @classdesc
-             * Abstract class; normally only used for creating subclasses and not instantiated in apps.
-             * Base class for WFS GetFeature n-ary logical filters.
-             */
-            class LogicalNary extends ol.format.filter.Filter { }
+        /**
+         * @classdesc
+         * Abstract class; normally only used for creating subclasses and not instantiated in apps.
+         * Base class for WFS GetFeature n-ary logical filters.
+         */
+        class LogicalNary extends format.filter.Filter { }
 
+        /**
+         * @classdesc
+         * Represents a logical <And> operator between two or more filter conditions.
+         *
+         * @param conditions Conditions
+         * @api
+         */
+        class And extends format.filter.LogicalNary {
             /**
              * @classdesc
              * Represents a logical <And> operator between two or more filter conditions.
@@ -2791,17 +2800,17 @@ declare namespace ol {
              * @param conditions Conditions
              * @api
              */
-            class And extends ol.format.filter.LogicalNary {
-                /**
-                 * @classdesc
-                 * Represents a logical <And> operator between two or more filter conditions.
-                 *
-                 * @param conditions Conditions
-                 * @api
-                 */
-                constructor(...conditions: ol.format.filter.Filter[]);
-            }
+            constructor(...conditions: ol.format.filter.Filter[]);
+        }
 
+        /**
+         * @classdesc
+         * Represents a logical <Or> operator between two or more filter conditions.
+         *
+         * @param conditions Conditions
+         * @api
+         */
+        class Or extends format.filter.LogicalNary {
             /**
              * @classdesc
              * Represents a logical <Or> operator between two or more filter conditions.
@@ -2809,17 +2818,21 @@ declare namespace ol {
              * @param conditions Conditions
              * @api
              */
-            class Or extends ol.format.filter.LogicalNary {
-                /**
-                 * @classdesc
-                 * Represents a logical <Or> operator between two or more filter conditions.
-                 *
-                 * @param conditions Conditions
-                 * @api
-                 */
-                constructor(...conditions: ol.format.filter.Filter[]);
-            }
+            constructor(...conditions: ol.format.filter.Filter[]);
+        }
 
+        /**
+         * @classdesc
+         * Abstract class; normally only used for creating subclasses and not instantiated in apps.
+         * Base class for WFS GetFeature property comparison filters.
+         *
+         * deprecated: This class will no longer be exported starting from the next major version.
+         *
+         * @param tagName The XML tag name for this filter.
+         * @param propertyName Name of the context property to compare.
+         * @api
+         */
+        class Comparison extends format.filter.Filter {
             /**
              * @classdesc
              * Abstract class; normally only used for creating subclasses and not instantiated in apps.
@@ -2831,21 +2844,23 @@ declare namespace ol {
              * @param propertyName Name of the context property to compare.
              * @api
              */
-            class Comparison extends ol.format.filter.Filter {
-                /**
-                 * @classdesc
-                 * Abstract class; normally only used for creating subclasses and not instantiated in apps.
-                 * Base class for WFS GetFeature property comparison filters.
-                 *
-                 * deprecated: This class will no longer be exported starting from the next major version.
-                 *
-                 * @param tagName The XML tag name for this filter.
-                 * @param propertyName Name of the context property to compare.
-                 * @api
-                 */
-                constructor(tagName: string, propertyName: string);
-            }
+            constructor(tagName: string, propertyName: string);
+        }
 
+        /**
+         * @classdesc
+         * Abstract class; normally only used for creating subclasses and not instantiated in apps.
+         * Base class for WFS GetFeature property binary comparison filters.
+         *
+         * deprecated: This class will no longer be exported starting from the next major version.
+         *
+         * @param tagName The XML tag name for this filter.
+         * @param propertyName Name of the context property to compare.
+         * @param expression The value to compare.
+         * @param opt_matchCase Case-sensitive?
+         * @api
+         */
+        class ComparisonBinary extends format.filter.Comparison {
             /**
              * @classdesc
              * Abstract class; normally only used for creating subclasses and not instantiated in apps.
@@ -2859,23 +2874,19 @@ declare namespace ol {
              * @param opt_matchCase Case-sensitive?
              * @api
              */
-            class ComparisonBinary extends ol.format.filter.Comparison {
-                /**
-                 * @classdesc
-                 * Abstract class; normally only used for creating subclasses and not instantiated in apps.
-                 * Base class for WFS GetFeature property binary comparison filters.
-                 *
-                 * deprecated: This class will no longer be exported starting from the next major version.
-                 *
-                 * @param tagName The XML tag name for this filter.
-                 * @param propertyName Name of the context property to compare.
-                 * @param expression The value to compare.
-                 * @param opt_matchCase Case-sensitive?
-                 * @api
-                 */
-                constructor(tagName: string, propertyName: string, expression: string | number, opt_matchCase?: boolean);
-            }
+            constructor(tagName: string, propertyName: string, expression: string | number, opt_matchCase?: boolean);
+        }
 
+        /**
+         * @classdesc
+         * Represents a `<PropertyIsEqualTo>` comparison operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param expression The value to compare.
+         * @param opt_matchCase Case-sensitive?
+         * @api
+         */
+        class EqualTo extends format.filter.ComparisonBinary {
             /**
              * @classdesc
              * Represents a `<PropertyIsEqualTo>` comparison operator.
@@ -2885,19 +2896,18 @@ declare namespace ol {
              * @param opt_matchCase Case-sensitive?
              * @api
              */
-            class EqualTo extends ol.format.filter.ComparisonBinary {
-                /**
-                 * @classdesc
-                 * Represents a `<PropertyIsEqualTo>` comparison operator.
-                 *
-                 * @param propertyName Name of the context property to compare.
-                 * @param expression The value to compare.
-                 * @param opt_matchCase Case-sensitive?
-                 * @api
-                 */
-                constructor(propertyName: string, expression: string | number, opt_matchCase?: boolean);
-            }
+            constructor(propertyName: string, expression: string | number, opt_matchCase?: boolean);
+        }
 
+        /**
+         * @classdesc
+         * Represents a `<PropertyIsGreaterThan>` comparison operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param expression The value to compare.
+         * @api
+         */
+        class GreaterThan extends format.filter.ComparisonBinary {
             /**
              * @classdesc
              * Represents a `<PropertyIsGreaterThan>` comparison operator.
@@ -2906,18 +2916,18 @@ declare namespace ol {
              * @param expression The value to compare.
              * @api
              */
-            class GreaterThan extends ol.format.filter.ComparisonBinary {
-                /**
-                 * @classdesc
-                 * Represents a `<PropertyIsGreaterThan>` comparison operator.
-                 *
-                 * @param propertyName Name of the context property to compare.
-                 * @param expression The value to compare.
-                 * @api
-                 */
-                constructor(propertyName: string, expression: number);
-            }
+            constructor(propertyName: string, expression: number);
+        }
 
+        /**
+         * @classdesc
+         * Represents a `<PropertyIsGreaterThanOrEqualTo>` comparison operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param expression The value to compare.
+         * @api
+         */
+        class GreaterThanOrEqualTo extends format.filter.ComparisonBinary {
             /**
              * @classdesc
              * Represents a `<PropertyIsGreaterThanOrEqualTo>` comparison operator.
@@ -2926,18 +2936,18 @@ declare namespace ol {
              * @param expression The value to compare.
              * @api
              */
-            class GreaterThanOrEqualTo extends ol.format.filter.ComparisonBinary {
-                /**
-                 * @classdesc
-                 * Represents a `<PropertyIsGreaterThanOrEqualTo>` comparison operator.
-                 *
-                 * @param propertyName Name of the context property to compare.
-                 * @param expression The value to compare.
-                 * @api
-                 */
-                constructor(propertyName: string, expression: number);
-            }
+            constructor(propertyName: string, expression: number);
+        }
 
+        /**
+         * @classdesc
+         * Represents a `<PropertyIsLessThan>` comparison operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param expression The value to compare.
+         * @api
+         */
+        class LessThan extends format.filter.ComparisonBinary {
             /**
              * @classdesc
              * Represents a `<PropertyIsLessThan>` comparison operator.
@@ -2946,18 +2956,18 @@ declare namespace ol {
              * @param expression The value to compare.
              * @api
              */
-            class LessThan extends ol.format.filter.ComparisonBinary {
-                /**
-                 * @classdesc
-                 * Represents a `<PropertyIsLessThan>` comparison operator.
-                 *
-                 * @param propertyName Name of the context property to compare.
-                 * @param expression The value to compare.
-                 * @api
-                 */
-                constructor(propertyName: string, expression: number);
-            }
+            constructor(propertyName: string, expression: number);
+        }
 
+        /**
+         * @classdesc
+         * Represents a `<PropertyIsLessThanOrEqualTo>` comparison operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param expression The value to compare.
+         * @api
+         */
+        class LessThanOrEqualTo extends format.filter.ComparisonBinary {
             /**
              * @classdesc
              * Represents a `<PropertyIsLessThanOrEqualTo>` comparison operator.
@@ -2966,18 +2976,19 @@ declare namespace ol {
              * @param expression The value to compare.
              * @api
              */
-            class LessThanOrEqualTo extends ol.format.filter.ComparisonBinary {
-                /**
-                 * @classdesc
-                 * Represents a `<PropertyIsLessThanOrEqualTo>` comparison operator.
-                 *
-                 * @param propertyName Name of the context property to compare.
-                 * @param expression The value to compare.
-                 * @api
-                 */
-                constructor(propertyName: string, expression: number);
-            }
+            constructor(propertyName: string, expression: number);
+        }
 
+        /**
+         * @classdesc
+         * Represents a `<PropertyIsNotEqualTo>` comparison operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param expression The value to compare.
+         * @param opt_matchCase Case-sensitive?
+         * @api
+         */
+        class NotEqualTo extends format.filter.ComparisonBinary {
             /**
              * @classdesc
              * Represents a `<PropertyIsNotEqualTo>` comparison operator.
@@ -2987,19 +2998,19 @@ declare namespace ol {
              * @param opt_matchCase Case-sensitive?
              * @api
              */
-            class NotEqualTo extends ol.format.filter.ComparisonBinary {
-                /**
-                 * @classdesc
-                 * Represents a `<PropertyIsNotEqualTo>` comparison operator.
-                 *
-                 * @param propertyName Name of the context property to compare.
-                 * @param expression The value to compare.
-                 * @param opt_matchCase Case-sensitive?
-                 * @api
-                 */
-                constructor(propertyName: string, expression: string | number, opt_matchCase?: boolean);
-            }
+            constructor(propertyName: string, expression: string | number, opt_matchCase?: boolean);
+        }
 
+        /**
+         * @classdesc
+         * Represents a `<During>` comparison operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param begin The begin date in ISO-8601 format.
+         * @param end The end date in ISO-8601 format.
+         * @api
+         */
+        class During extends format.filter.Comparison {
             /**
              * @classdesc
              * Represents a `<During>` comparison operator.
@@ -3009,19 +3020,19 @@ declare namespace ol {
              * @param end The end date in ISO-8601 format.
              * @api
              */
-            class During extends ol.format.filter.Comparison {
-                /**
-                 * @classdesc
-                 * Represents a `<During>` comparison operator.
-                 *
-                 * @param propertyName Name of the context property to compare.
-                 * @param begin The begin date in ISO-8601 format.
-                 * @param end The end date in ISO-8601 format.
-                 * @api
-                 */
-                constructor(propertyName: string, begin: string, end: string);
-            }
+            constructor(propertyName: string, begin: string, end: string);
+        }
 
+        /**
+         * @classdesc
+         * Represents a `<PropertyIsBetween>` comparison operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param lowerBoundary The lower bound of the range.
+         * @param upperBoundary The upper bound of the range.
+         * @api
+         */
+        class IsBetween extends format.filter.Comparison {
             /**
              * @classdesc
              * Represents a `<PropertyIsBetween>` comparison operator.
@@ -3031,19 +3042,25 @@ declare namespace ol {
              * @param upperBoundary The upper bound of the range.
              * @api
              */
-            class IsBetween extends ol.format.filter.Comparison {
-                /**
-                 * @classdesc
-                 * Represents a `<PropertyIsBetween>` comparison operator.
-                 *
-                 * @param propertyName Name of the context property to compare.
-                 * @param lowerBoundary The lower bound of the range.
-                 * @param upperBoundary The upper bound of the range.
-                 * @api
-                 */
-                constructor(propertyName: string, lowerBoundary: number, upperBoundary: number);
-            }
+            constructor(propertyName: string, lowerBoundary: number, upperBoundary: number);
+        }
 
+        /**
+         * @classdesc
+         * Represents a `<PropertyIsLike>` comparison operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @param pattern Text pattern.
+         * @param opt_wildCard Pattern character which matches any sequence of
+         *    zero or more string characters. Default is '*'.
+         * @param opt_singleChar pattern character which matches any single
+         *    string character. Default is '.'.
+         * @param opt_escapeChar Escape character which can be used to escape
+         *    the pattern characters. Default is '!'.
+         * @param opt_matchCase Case-sensitive?
+         * @api
+         */
+        class IsLike extends format.filter.Comparison {
             /**
              * @classdesc
              * Represents a `<PropertyIsLike>` comparison operator.
@@ -3059,25 +3076,17 @@ declare namespace ol {
              * @param opt_matchCase Case-sensitive?
              * @api
              */
-            class IsLike extends ol.format.filter.Comparison {
-                /**
-                 * @classdesc
-                 * Represents a `<PropertyIsLike>` comparison operator.
-                 *
-                 * @param propertyName Name of the context property to compare.
-                 * @param pattern Text pattern.
-                 * @param opt_wildCard Pattern character which matches any sequence of
-                 *    zero or more string characters. Default is '*'.
-                 * @param opt_singleChar pattern character which matches any single
-                 *    string character. Default is '.'.
-                 * @param opt_escapeChar Escape character which can be used to escape
-                 *    the pattern characters. Default is '!'.
-                 * @param opt_matchCase Case-sensitive?
-                 * @api
-                 */
-                constructor(propertyName: string, pattern: string, opt_wildCard?: string, opt_singleChar?: string, opt_escapeChar?: string, opt_matchCase?: boolean);
-            }
+            constructor(propertyName: string, pattern: string, opt_wildCard?: string, opt_singleChar?: string, opt_escapeChar?: string, opt_matchCase?: boolean);
+        }
 
+        /**
+         * @classdesc
+         * Represents a `<PropertyIsNull>` comparison operator.
+         *
+         * @param propertyName Name of the context property to compare.
+         * @api
+         */
+        class IsNull extends format.filter.Comparison {
             /**
              * @classdesc
              * Represents a `<PropertyIsNull>` comparison operator.
@@ -3085,17 +3094,17 @@ declare namespace ol {
              * @param propertyName Name of the context property to compare.
              * @api
              */
-            class IsNull extends ol.format.filter.Comparison {
-                /**
-                 * @classdesc
-                 * Represents a `<PropertyIsNull>` comparison operator.
-                 *
-                 * @param propertyName Name of the context property to compare.
-                 * @api
-                 */
-                constructor(propertyName: string);
-            }
+            constructor(propertyName: string);
+        }
 
+        /**
+         * @classdesc
+         * Represents a logical `<Not>` operator for a filter condition.
+         *
+         * @param condition Filter condition.
+         * @api
+         */
+        class Not extends format.filter.Filter {
             /**
              * @classdesc
              * Represents a logical `<Not>` operator for a filter condition.
@@ -3103,17 +3112,21 @@ declare namespace ol {
              * @param condition Filter condition.
              * @api
              */
-            class Not extends ol.format.filter.Filter {
-                /**
-                 * @classdesc
-                 * Represents a logical `<Not>` operator for a filter condition.
-                 *
-                 * @param condition Filter condition.
-                 * @api
-                 */
-                constructor(condition: ol.format.filter.Filter);
-            }
+            constructor(condition: ol.format.filter.Filter);
+        }
 
+        /**
+         * @classdesc
+         * Represents a `<BBOX>` operator to test whether a geometry-valued property
+         * intersects a fixed bounding box
+         *
+         * @param geometryName Geometry name to use.
+         * @param extent Extent.
+         * @param opt_srsName SRS name. No srsName attribute will be
+         *    set on geometries when this is not provided.
+         * @api
+         */
+        class Bbox extends format.filter.Filter {
             /**
              * @classdesc
              * Represents a `<BBOX>` operator to test whether a geometry-valued property
@@ -3125,22 +3138,18 @@ declare namespace ol {
              *    set on geometries when this is not provided.
              * @api
              */
-            class Bbox extends ol.format.filter.Filter {
-                /**
-                 * @classdesc
-                 * Represents a `<BBOX>` operator to test whether a geometry-valued property
-                 * intersects a fixed bounding box
-                 *
-                 * @param geometryName Geometry name to use.
-                 * @param extent Extent.
-                 * @param opt_srsName SRS name. No srsName attribute will be
-                 *    set on geometries when this is not provided.
-                 * @api
-                 */
-                constructor(geometryName: string, extent: ol.Extent, opt_srsName?: string);
-            }
+            constructor(geometryName: string, extent: ol.Extent, opt_srsName?: string);
         }
+    }
 
+    /**
+     * @classdesc
+     * Feature format for reading data in the
+     * [OSMXML format](http://wiki.openstreetmap.org/wiki/OSM_XML).
+     *
+     * @api stable
+     */
+    class OSMXML extends format.XMLFeature {
         /**
          * @classdesc
          * Feature format for reading data in the
@@ -3148,36 +3157,38 @@ declare namespace ol {
          *
          * @api stable
          */
-        class OSMXML extends ol.format.XMLFeature {
-            /**
-             * @classdesc
-             * Feature format for reading data in the
-             * [OSMXML format](http://wiki.openstreetmap.org/wiki/OSM_XML).
-             *
-             * @api stable
-             */
-            constructor();
+        constructor();
 
-            /**
-             * Read all features from an OSM source.
-             *
-             * @param source Source.
-             * @param opt_options Read options.
-             * @return Features.
-             * @api stable
-             */
-            readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
+        /**
+         * Read all features from an OSM source.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Features.
+         * @api stable
+         */
+        readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
 
-            /**
-             * Read the projection from an OSM source.
-             *
-             * @param source Source.
-             * @return Projection.
-             * @api stable
-             */
-            readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
-        }
+        /**
+         * Read the projection from an OSM source.
+         *
+         * @param source Source.
+         * @return Projection.
+         * @api stable
+         */
+        readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
+    }
 
+    /**
+     * @classdesc
+     * Feature format for reading and writing data in the Encoded
+     * Polyline Algorithm Format.
+     *
+     * @param opt_options
+     *     Optional configuration object.
+     * @api stable
+     */
+    class Polyline extends format.TextFeature {
         /**
          * @classdesc
          * Feature format for reading and writing data in the Encoded
@@ -3187,123 +3198,121 @@ declare namespace ol {
          *     Optional configuration object.
          * @api stable
          */
-        class Polyline extends ol.format.TextFeature {
-            /**
-             * @classdesc
-             * Feature format for reading and writing data in the Encoded
-             * Polyline Algorithm Format.
-             *
-             * @param opt_options
-             *     Optional configuration object.
-             * @api stable
-             */
-            constructor(opt_options?: olx.format.PolylineOptions);
+        constructor(opt_options?: olx.format.PolylineOptions);
 
-            /**
-             * Encode a list of n-dimensional points and return an encoded string
-             *
-             * Attention: This function will modify the passed array!
-             *
-             * @param numbers A list of n-dimensional points.
-             * @param stride The number of dimension of the points in the list.
-             * @param opt_factor The factor by which the numbers will be
-             *     multiplied. The remaining decimal places will get rounded away.
-             *     Default is `1e5`.
-             * @return The encoded string.
-             * @api
-             */
-            static encodeDeltas(numbers: number[], stride: number, opt_factor?: number): string;
+        /**
+         * Encode a list of n-dimensional points and return an encoded string
+         *
+         * Attention: This function will modify the passed array!
+         *
+         * @param numbers A list of n-dimensional points.
+         * @param stride The number of dimension of the points in the list.
+         * @param opt_factor The factor by which the numbers will be
+         *     multiplied. The remaining decimal places will get rounded away.
+         *     Default is `1e5`.
+         * @return The encoded string.
+         * @api
+         */
+        static encodeDeltas(numbers: number[], stride: number, opt_factor?: number): string;
 
-            /**
-             * Decode a list of n-dimensional points from an encoded string
-             *
-             * @param encoded An encoded string.
-             * @param stride The number of dimension of the points in the
-             *     encoded string.
-             * @param opt_factor The factor by which the resulting numbers will
-             *     be divided. Default is `1e5`.
-             * @return A list of n-dimensional points.
-             * @api
-             */
-            static decodeDeltas(encoded: string, stride: number, opt_factor?: number): number[];
+        /**
+         * Decode a list of n-dimensional points from an encoded string
+         *
+         * @param encoded An encoded string.
+         * @param stride The number of dimension of the points in the
+         *     encoded string.
+         * @param opt_factor The factor by which the resulting numbers will
+         *     be divided. Default is `1e5`.
+         * @return A list of n-dimensional points.
+         * @api
+         */
+        static decodeDeltas(encoded: string, stride: number, opt_factor?: number): number[];
 
-            /**
-             * Encode a list of floating point numbers and return an encoded string
-             *
-             * Attention: This function will modify the passed array!
-             *
-             * @param numbers A list of floating point numbers.
-             * @param opt_factor The factor by which the numbers will be
-             *     multiplied. The remaining decimal places will get rounded away.
-             *     Default is `1e5`.
-             * @return The encoded string.
-             * @api
-             */
-            static encodeFloats(numbers: number[], opt_factor?: number): string;
+        /**
+         * Encode a list of floating point numbers and return an encoded string
+         *
+         * Attention: This function will modify the passed array!
+         *
+         * @param numbers A list of floating point numbers.
+         * @param opt_factor The factor by which the numbers will be
+         *     multiplied. The remaining decimal places will get rounded away.
+         *     Default is `1e5`.
+         * @return The encoded string.
+         * @api
+         */
+        static encodeFloats(numbers: number[], opt_factor?: number): string;
 
-            /**
-             * Decode a list of floating point numbers from an encoded string
-             *
-             * @param encoded An encoded string.
-             * @param opt_factor The factor by which the result will be divided.
-             *     Default is `1e5`.
-             * @return A list of floating point numbers.
-             * @api
-             */
-            static decodeFloats(encoded: string, opt_factor?: number): number[];
+        /**
+         * Decode a list of floating point numbers from an encoded string
+         *
+         * @param encoded An encoded string.
+         * @param opt_factor The factor by which the result will be divided.
+         *     Default is `1e5`.
+         * @return A list of floating point numbers.
+         * @api
+         */
+        static decodeFloats(encoded: string, opt_factor?: number): number[];
 
-            /**
-             * Read the feature from the Polyline source. The coordinates are assumed to be
-             * in two dimensions and in latitude, longitude order.
-             *
-             * @param source Source.
-             * @param opt_options Read options.
-             * @return Feature.
-             * @api stable
-             */
-            readFeature(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
+        /**
+         * Read the feature from the Polyline source. The coordinates are assumed to be
+         * in two dimensions and in latitude, longitude order.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Feature.
+         * @api stable
+         */
+        readFeature(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
 
-            /**
-             * Read the feature from the source. As Polyline sources contain a single
-             * feature, this will return the feature in an array.
-             *
-             * @param source Source.
-             * @param opt_options Read options.
-             * @return Features.
-             * @api stable
-             */
-            readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
+        /**
+         * Read the feature from the source. As Polyline sources contain a single
+         * feature, this will return the feature in an array.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Features.
+         * @api stable
+         */
+        readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
 
-            /**
-             * Read the geometry from the source.
-             *
-             * @param source Source.
-             * @param opt_options Read options.
-             * @return Geometry.
-             * @api stable
-             */
-            readGeometry(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.geom.Geometry;
+        /**
+         * Read the geometry from the source.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Geometry.
+         * @api stable
+         */
+        readGeometry(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.geom.Geometry;
 
-            /**
-             * Read the projection from a Polyline source.
-             *
-             * @param source Source.
-             * @return Projection.
-             * @api stable
-             */
-            readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
+        /**
+         * Read the projection from a Polyline source.
+         *
+         * @param source Source.
+         * @return Projection.
+         * @api stable
+         */
+        readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
 
-            /**
-             * Write a single geometry in Polyline format.
-             *
-             * @param geometry Geometry.
-             * @param opt_options Write options.
-             * @return Geometry.
-             * @api stable
-             */
-            writeGeometry(geometry: ol.geom.Geometry, opt_options?: olx.format.WriteOptions): string;
-        }
+        /**
+         * Write a single geometry in Polyline format.
+         *
+         * @param geometry Geometry.
+         * @param opt_options Write options.
+         * @return Geometry.
+         * @api stable
+         */
+        writeGeometry(geometry: ol.geom.Geometry, opt_options?: olx.format.WriteOptions): string;
+    }
 
+    /**
+     * @classdesc
+     * Abstract base class; normally only used for creating subclasses and not
+     * instantiated in apps.
+     * Base class for text feature formats.
+     *
+     */
+    class TextFeature extends format.Feature {
         /**
          * @classdesc
          * Abstract base class; normally only used for creating subclasses and not
@@ -3311,17 +3320,17 @@ declare namespace ol {
          * Base class for text feature formats.
          *
          */
-        class TextFeature extends ol.format.Feature {
-            /**
-             * @classdesc
-             * Abstract base class; normally only used for creating subclasses and not
-             * instantiated in apps.
-             * Base class for text feature formats.
-             *
-             */
-            constructor();
-        }
+        constructor();
+    }
 
+    /**
+     * @classdesc
+     * Feature format for reading data in the TopoJSON format.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class TopoJSON extends format.JSONFeature {
         /**
          * @classdesc
          * Feature format for reading data in the TopoJSON format.
@@ -3329,35 +3338,39 @@ declare namespace ol {
          * @param opt_options Options.
          * @api stable
          */
-        class TopoJSON extends ol.format.JSONFeature {
-            /**
-             * @classdesc
-             * Feature format for reading data in the TopoJSON format.
-             *
-             * @param opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.format.TopoJSONOptions);
+        constructor(opt_options?: olx.format.TopoJSONOptions);
 
-            /**
-             * Read all features from a TopoJSON source.
-             *
-             * @param source Source.
-             * @return Features.
-             * @api stable
-             */
-            readFeatures(source: (Document | Node | GlobalObject | string)): ol.Feature[];
+        /**
+         * Read all features from a TopoJSON source.
+         *
+         * @param source Source.
+         * @return Features.
+         * @api stable
+         */
+        readFeatures(source: (Document | Node | GlobalObject | string)): ol.Feature[];
 
-            /**
-             * Read the projection from a TopoJSON source.
-             *
-             * @param object Source.
-             * @return Projection.
-             * @api stable
-             */
-            readProjection(object: (Document | Node | GlobalObject | string)): ol.proj.Projection;
-        }
+        /**
+         * Read the projection from a TopoJSON source.
+         *
+         * @param object Source.
+         * @return Projection.
+         * @api stable
+         */
+        readProjection(object: (Document | Node | GlobalObject | string)): ol.proj.Projection;
+    }
 
+    /**
+     * @classdesc
+     * Feature format for reading and writing data in the WFS format.
+     * By default, supports WFS version 1.1.0. You can pass a GML format
+     * as option if you want to read a WFS that contains GML2 (WFS 1.0.0).
+     * Also see {@link ol.format.GMLBase} which is used by this format.
+     *
+     * @param opt_options
+     *     Optional configuration object.
+     * @api stable
+     */
+    class WFS extends format.XMLFeature {
         /**
          * @classdesc
          * Feature format for reading and writing data in the WFS format.
@@ -3369,79 +3382,76 @@ declare namespace ol {
          *     Optional configuration object.
          * @api stable
          */
-        class WFS extends ol.format.XMLFeature {
-            /**
-             * @classdesc
-             * Feature format for reading and writing data in the WFS format.
-             * By default, supports WFS version 1.1.0. You can pass a GML format
-             * as option if you want to read a WFS that contains GML2 (WFS 1.0.0).
-             * Also see {@link ol.format.GMLBase} which is used by this format.
-             *
-             * @param opt_options
-             *     Optional configuration object.
-             * @api stable
-             */
-            constructor(opt_options?: olx.format.WFSOptions);
+        constructor(opt_options?: olx.format.WFSOptions);
 
-            /**
-             * Read all features from a WFS FeatureCollection.
-             *
-             * @param source Source.
-             * @param opt_options Read options.
-             * @return Features.
-             * @api stable
-             */
-            readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
+        /**
+         * Read all features from a WFS FeatureCollection.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Features.
+         * @api stable
+         */
+        readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
 
-            /**
-             * Read transaction response of the source.
-             *
-             * @param source Source.
-             * @return Transaction response.
-             * @api stable
-             */
-            readTransactionResponse(source: (Document | Node | GlobalObject | string)): (ol.WFSTransactionResponse);
+        /**
+         * Read transaction response of the source.
+         *
+         * @param source Source.
+         * @return Transaction response.
+         * @api stable
+         */
+        readTransactionResponse(source: (Document | Node | GlobalObject | string)): (ol.WFSTransactionResponse);
 
-            /**
-             * Read feature collection metadata of the source.
-             *
-             * @param source Source.
-             * @return FeatureCollection metadata.
-             * @api stable
-             */
-            readFeatureCollectionMetadata(source: (Document | Node | GlobalObject | string)): (ol.WFSFeatureCollectionMetadata);
+        /**
+         * Read feature collection metadata of the source.
+         *
+         * @param source Source.
+         * @return FeatureCollection metadata.
+         * @api stable
+         */
+        readFeatureCollectionMetadata(source: (Document | Node | GlobalObject | string)): (ol.WFSFeatureCollectionMetadata);
 
-            /**
-             * Encode format as WFS `GetFeature` and return the Node.
-             *
-             * @param options Options.
-             * @return Result.
-             * @api stable
-             */
-            writeGetFeature(options: olx.format.WFSWriteGetFeatureOptions): Node;
+        /**
+         * Encode format as WFS `GetFeature` and return the Node.
+         *
+         * @param options Options.
+         * @return Result.
+         * @api stable
+         */
+        writeGetFeature(options: olx.format.WFSWriteGetFeatureOptions): Node;
 
-            /**
-             * Encode format as WFS `Transaction` and return the Node.
-             *
-             * @param inserts The features to insert.
-             * @param updates The features to update.
-             * @param deletes The features to delete.
-             * @param options Write options.
-             * @return Result.
-             * @api stable
-             */
-            writeTransaction(inserts: ol.Feature[], updates: ol.Feature[], deletes: ol.Feature[], options: olx.format.WFSWriteTransactionOptions): Node;
+        /**
+         * Encode format as WFS `Transaction` and return the Node.
+         *
+         * @param inserts The features to insert.
+         * @param updates The features to update.
+         * @param deletes The features to delete.
+         * @param options Write options.
+         * @return Result.
+         * @api stable
+         */
+        writeTransaction(inserts: ol.Feature[], updates: ol.Feature[], deletes: ol.Feature[], options: olx.format.WFSWriteTransactionOptions): Node;
 
-            /**
-             * Read the projection from a WFS source.
-             *
-             * @param source Source.
-             * @return Projection.
-             * @api stable
-             */
-            readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
-        }
+        /**
+         * Read the projection from a WFS source.
+         *
+         * @param source Source.
+         * @return Projection.
+         * @api stable
+         */
+        readProjection(source: (Document | Node | GlobalObject | string)): ol.proj.Projection;
+    }
 
+    /**
+     * @classdesc
+     * Geometry format for reading and writing data in the `WellKnownText` (WKT)
+     * format.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class WKT extends format.TextFeature {
         /**
          * @classdesc
          * Geometry format for reading and writing data in the `WellKnownText` (WKT)
@@ -3450,102 +3460,102 @@ declare namespace ol {
          * @param opt_options Options.
          * @api stable
          */
-        class WKT extends ol.format.TextFeature {
-            /**
-             * @classdesc
-             * Geometry format for reading and writing data in the `WellKnownText` (WKT)
-             * format.
-             *
-             * @param opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.format.WKTOptions);
+        constructor(opt_options?: olx.format.WKTOptions);
 
-            /**
-             * Read a feature from a WKT source.
-             *
-             * @param source Source.
-             * @param opt_options Read options.
-             * @return Feature.
-             * @api stable
-             */
-            readFeature(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
+        /**
+         * Read a feature from a WKT source.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Feature.
+         * @api stable
+         */
+        readFeature(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature;
 
-            /**
-             * Read all features from a WKT source.
-             *
-             * @param source Source.
-             * @param opt_options Read options.
-             * @return Features.
-             * @api stable
-             */
-            readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
+        /**
+         * Read all features from a WKT source.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Features.
+         * @api stable
+         */
+        readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
 
-            /**
-             * Read a single geometry from a WKT source.
-             *
-             * @param source Source.
-             * @param opt_options Read options.
-             * @return Geometry.
-             * @api stable
-             */
-            readGeometry(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.geom.Geometry;
+        /**
+         * Read a single geometry from a WKT source.
+         *
+         * @param source Source.
+         * @param opt_options Read options.
+         * @return Geometry.
+         * @api stable
+         */
+        readGeometry(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.geom.Geometry;
 
-            /**
-             * Encode a feature as a WKT string.
-             *
-             * @param feature Feature.
-             * @param opt_options Write options.
-             * @return WKT string.
-             * @api stable
-             */
-            writeFeature(feature: ol.Feature, opt_options?: olx.format.WriteOptions): string;
+        /**
+         * Encode a feature as a WKT string.
+         *
+         * @param feature Feature.
+         * @param opt_options Write options.
+         * @return WKT string.
+         * @api stable
+         */
+        writeFeature(feature: ol.Feature, opt_options?: olx.format.WriteOptions): string;
 
-            /**
-             * Encode an array of features as a WKT string.
-             *
-             * @param features Features.
-             * @param opt_options Write options.
-             * @return WKT string.
-             * @api stable
-             */
-            writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
+        /**
+         * Encode an array of features as a WKT string.
+         *
+         * @param features Features.
+         * @param opt_options Write options.
+         * @return WKT string.
+         * @api stable
+         */
+        writeFeatures(features: ol.Feature[], opt_options?: olx.format.WriteOptions): string;
 
-            /**
-             * Write a single geometry as a WKT string.
-             *
-             * @param geometry Geometry.
-             * @return WKT string.
-             * @api stable
-             */
-            writeGeometry(geometry: ol.geom.Geometry): string;
-        }
+        /**
+         * Write a single geometry as a WKT string.
+         *
+         * @param geometry Geometry.
+         * @return WKT string.
+         * @api stable
+         */
+        writeGeometry(geometry: ol.geom.Geometry): string;
+    }
 
+    /**
+     * @classdesc
+     * Format for reading WMS capabilities data
+     *
+     * @api
+     */
+    class WMSCapabilities extends format.XML {
         /**
          * @classdesc
          * Format for reading WMS capabilities data
          *
          * @api
          */
-        class WMSCapabilities extends ol.format.XML {
-            /**
-             * @classdesc
-             * Format for reading WMS capabilities data
-             *
-             * @api
-             */
-            constructor();
+        constructor();
 
-            /**
-             * Read a WMS capabilities document.
-             *
-             * @param source The XML source.
-             * @return An object representing the WMS capabilities.
-             * @api
-             */
-            read(source: (Document | Node | string)): GlobalObject;
-        }
+        /**
+         * Read a WMS capabilities document.
+         *
+         * @param source The XML source.
+         * @return An object representing the WMS capabilities.
+         * @api
+         */
+        read(source: (Document | Node | string)): GlobalObject;
+    }
 
+    /**
+     * @classdesc
+     * Format for reading WMSGetFeatureInfo format. It uses
+     * {@link ol.format.GML2} to read features.
+     *
+     * @param opt_options Options.
+     * @api
+     */
+    class WMSGetFeatureInfo extends format.XMLFeature {
         /**
          * @classdesc
          * Format for reading WMSGetFeatureInfo format. It uses
@@ -3554,69 +3564,68 @@ declare namespace ol {
          * @param opt_options Options.
          * @api
          */
-        class WMSGetFeatureInfo extends ol.format.XMLFeature {
-            /**
-             * @classdesc
-             * Format for reading WMSGetFeatureInfo format. It uses
-             * {@link ol.format.GML2} to read features.
-             *
-             * @param opt_options Options.
-             * @api
-             */
-            constructor(opt_options?: olx.format.WMSGetFeatureInfoOptions);
+        constructor(opt_options?: olx.format.WMSGetFeatureInfoOptions);
 
-            /**
-             * Read all features from a WMSGetFeatureInfo response.
-             *
-             * @param source Source.
-             * @param opt_options Options.
-             * @return Features.
-             * @api stable
-             */
-            readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
-        }
+        /**
+         * Read all features from a WMSGetFeatureInfo response.
+         *
+         * @param source Source.
+         * @param opt_options Options.
+         * @return Features.
+         * @api stable
+         */
+        readFeatures(source: (Document | Node | GlobalObject | string), opt_options?: olx.format.ReadOptions): ol.Feature[];
+    }
 
+    /**
+     * @classdesc
+     * Format for reading WMTS capabilities data.
+     *
+     * @api
+     */
+    class WMTSCapabilities extends format.XML {
         /**
          * @classdesc
          * Format for reading WMTS capabilities data.
          *
          * @api
          */
-        class WMTSCapabilities extends ol.format.XML {
-            /**
-             * @classdesc
-             * Format for reading WMTS capabilities data.
-             *
-             * @api
-             */
-            constructor();
+        constructor();
 
-            /**
-             * Read a WMTS capabilities document.
-             *
-             * @param source The XML source.
-             * @return An object representing the WMTS capabilities.
-             * @api
-             */
-            read(source: (Document | Node | string)): GlobalObject;
-        }
+        /**
+         * Read a WMTS capabilities document.
+         *
+         * @param source The XML source.
+         * @return An object representing the WMTS capabilities.
+         * @api
+         */
+        read(source: (Document | Node | string)): GlobalObject;
+    }
 
+    /**
+     * @classdesc
+     * Generic format for reading non-feature XML data
+     *
+     * @struct
+     */
+    class XML {
         /**
          * @classdesc
          * Generic format for reading non-feature XML data
          *
          * @struct
          */
-        class XML {
-            /**
-             * @classdesc
-             * Generic format for reading non-feature XML data
-             *
-             * @struct
-             */
-            constructor();
-        }
+        constructor();
+    }
 
+    /**
+     * @classdesc
+     * Abstract base class; normally only used for creating subclasses and not
+     * instantiated in apps.
+     * Base class for XML feature formats.
+     *
+     */
+    class XMLFeature extends format.Feature {
         /**
          * @classdesc
          * Abstract base class; normally only used for creating subclasses and not
@@ -3624,18 +3633,35 @@ declare namespace ol {
          * Base class for XML feature formats.
          *
          */
-        class XMLFeature extends ol.format.Feature {
-            /**
-             * @classdesc
-             * Abstract base class; normally only used for creating subclasses and not
-             * instantiated in apps.
-             * Base class for XML feature formats.
-             *
-             */
-            constructor();
-        }
+        constructor();
     }
+}
 
+/**
+ * @classdesc
+ * Helper class for providing HTML5 Geolocation capabilities.
+ * The [Geolocation API](http://www.w3.org/TR/geolocation-API/)
+ * is used to locate a user's position.
+ *
+ * To get notified of position changes, register a listener for the generic
+ * `change` event on your instance of `ol.Geolocation`.
+ *
+ * Example:
+ *
+ *     var geolocation = new ol.Geolocation({
+ *       // take the projection to use from the map's view
+ *       projection: view.getProjection()
+ *     });
+ *     // listen to changes in position
+ *     geolocation.on('change', function(evt) {
+ *       window.console.log(geolocation.getPosition());
+ *     });
+ *
+ * @fires error
+ * @param opt_options Options.
+ * @api stable
+ */
+export class Geolocation extends Object {
     /**
      * @classdesc
      * Helper class for providing HTML5 Geolocation capabilities.
@@ -3660,152 +3686,137 @@ declare namespace ol {
      * @param opt_options Options.
      * @api stable
      */
-    class Geolocation extends ol.Object {
-        /**
-         * @classdesc
-         * Helper class for providing HTML5 Geolocation capabilities.
-         * The [Geolocation API](http://www.w3.org/TR/geolocation-API/)
-         * is used to locate a user's position.
-         *
-         * To get notified of position changes, register a listener for the generic
-         * `change` event on your instance of `ol.Geolocation`.
-         *
-         * Example:
-         *
-         *     var geolocation = new ol.Geolocation({
-         *       // take the projection to use from the map's view
-         *       projection: view.getProjection()
-         *     });
-         *     // listen to changes in position
-         *     geolocation.on('change', function(evt) {
-         *       window.console.log(geolocation.getPosition());
-         *     });
-         *
-         * @fires error
-         * @param opt_options Options.
-         * @api stable
-         */
-        constructor(opt_options?: olx.GeolocationOptions);
+    constructor(opt_options?: olx.GeolocationOptions);
 
-        /**
-         * Get the accuracy of the position in meters.
-         * @return The accuracy of the position measurement in
-         *     meters.
-         * @observable
-         * @api stable
-         */
-        getAccuracy(): (number);
+    /**
+     * Get the accuracy of the position in meters.
+     * @return The accuracy of the position measurement in
+     *     meters.
+     * @observable
+     * @api stable
+     */
+    getAccuracy(): (number);
 
-        /**
-         * Get a geometry of the position accuracy.
-         * @return A geometry of the position accuracy.
-         * @observable
-         * @api stable
-         */
-        getAccuracyGeometry(): ol.geom.Geometry;
+    /**
+     * Get a geometry of the position accuracy.
+     * @return A geometry of the position accuracy.
+     * @observable
+     * @api stable
+     */
+    getAccuracyGeometry(): ol.geom.Geometry;
 
-        /**
-         * Get the altitude associated with the position.
-         * @return The altitude of the position in meters above mean
-         *     sea level.
-         * @observable
-         * @api stable
-         */
-        getAltitude(): (number);
+    /**
+     * Get the altitude associated with the position.
+     * @return The altitude of the position in meters above mean
+     *     sea level.
+     * @observable
+     * @api stable
+     */
+    getAltitude(): (number);
 
-        /**
-         * Get the altitude accuracy of the position.
-         * @return The accuracy of the altitude measurement in
-         *     meters.
-         * @observable
-         * @api stable
-         */
-        getAltitudeAccuracy(): (number);
+    /**
+     * Get the altitude accuracy of the position.
+     * @return The accuracy of the altitude measurement in
+     *     meters.
+     * @observable
+     * @api stable
+     */
+    getAltitudeAccuracy(): (number);
 
-        /**
-         * Get the heading as radians clockwise from North.
-         * @return The heading of the device in radians from north.
-         * @observable
-         * @api stable
-         */
-        getHeading(): (number);
+    /**
+     * Get the heading as radians clockwise from North.
+     * @return The heading of the device in radians from north.
+     * @observable
+     * @api stable
+     */
+    getHeading(): (number);
 
-        /**
-         * Get the position of the device.
-         * @return The current position of the device reported
-         *     in the current projection.
-         * @observable
-         * @api stable
-         */
-        getPosition(): (ol.Coordinate);
+    /**
+     * Get the position of the device.
+     * @return The current position of the device reported
+     *     in the current projection.
+     * @observable
+     * @api stable
+     */
+    getPosition(): (ol.Coordinate);
 
-        /**
-         * Get the projection associated with the position.
-         * @return The projection the position is
-         *     reported in.
-         * @observable
-         * @api stable
-         */
-        getProjection(): (ol.proj.Projection);
+    /**
+     * Get the projection associated with the position.
+     * @return The projection the position is
+     *     reported in.
+     * @observable
+     * @api stable
+     */
+    getProjection(): (ol.proj.Projection);
 
-        /**
-         * Get the speed in meters per second.
-         * @return The instantaneous speed of the device in meters
-         *     per second.
-         * @observable
-         * @api stable
-         */
-        getSpeed(): (number);
+    /**
+     * Get the speed in meters per second.
+     * @return The instantaneous speed of the device in meters
+     *     per second.
+     * @observable
+     * @api stable
+     */
+    getSpeed(): (number);
 
-        /**
-         * Determine if the device location is being tracked.
-         * @return The device location is being tracked.
-         * @observable
-         * @api stable
-         */
-        getTracking(): boolean;
+    /**
+     * Determine if the device location is being tracked.
+     * @return The device location is being tracked.
+     * @observable
+     * @api stable
+     */
+    getTracking(): boolean;
 
-        /**
-         * Get the tracking options.
-         * @see http://www.w3.org/TR/geolocation-API/#position-options
-         * @return PositionOptions as defined by
-         *     the [HTML5 Geolocation spec
-         *     ](http://www.w3.org/TR/geolocation-API/#position_options_interface).
-         * @observable
-         * @api stable
-         */
-        getTrackingOptions(): (PositionOptions);
+    /**
+     * Get the tracking options.
+     * @see http://www.w3.org/TR/geolocation-API/#position-options
+     * @return PositionOptions as defined by
+     *     the [HTML5 Geolocation spec
+     *     ](http://www.w3.org/TR/geolocation-API/#position_options_interface).
+     * @observable
+     * @api stable
+     */
+    getTrackingOptions(): (PositionOptions);
 
-        /**
-         * Set the projection to use for transforming the coordinates.
-         * @param projection The projection the position is
-         *     reported in.
-         * @observable
-         * @api stable
-         */
-        setProjection(projection: ol.proj.Projection): void;
+    /**
+     * Set the projection to use for transforming the coordinates.
+     * @param projection The projection the position is
+     *     reported in.
+     * @observable
+     * @api stable
+     */
+    setProjection(projection: ol.proj.Projection): void;
 
-        /**
-         * Enable or disable tracking.
-         * @param tracking Enable tracking.
-         * @observable
-         * @api stable
-         */
-        setTracking(tracking: boolean): void;
+    /**
+     * Enable or disable tracking.
+     * @param tracking Enable tracking.
+     * @observable
+     * @api stable
+     */
+    setTracking(tracking: boolean): void;
 
-        /**
-         * Set the tracking options.
-         * @see http://www.w3.org/TR/geolocation-API/#position-options
-         * @param options PositionOptions as defined by the
-         *     [HTML5 Geolocation spec
-         *     ](http://www.w3.org/TR/geolocation-API/#position_options_interface).
-         * @observable
-         * @api stable
-         */
-        setTrackingOptions(options: PositionOptions): void;
-    }
+    /**
+     * Set the tracking options.
+     * @see http://www.w3.org/TR/geolocation-API/#position-options
+     * @param options PositionOptions as defined by the
+     *     [HTML5 Geolocation spec
+     *     ](http://www.w3.org/TR/geolocation-API/#position_options_interface).
+     * @observable
+     * @api stable
+     */
+    setTrackingOptions(options: PositionOptions): void;
+}
 
-    namespace geom {
+export namespace geom {
+    /**
+     * @classdesc
+     * Circle geometry.
+     *
+     * @param center Center.
+     * @param opt_radius Radius.
+     * @param opt_layout Layout.
+     * @api
+     */
+    class Circle extends geom.SimpleGeometry {
         /**
          * @classdesc
          * Circle geometry.
@@ -3815,90 +3826,92 @@ declare namespace ol {
          * @param opt_layout Layout.
          * @api
          */
-        class Circle extends ol.geom.SimpleGeometry {
-            /**
-             * @classdesc
-             * Circle geometry.
-             *
-             * @param center Center.
-             * @param opt_radius Radius.
-             * @param opt_layout Layout.
-             * @api
-             */
-            constructor(center: ol.Coordinate, opt_radius?: number, opt_layout?: ol.geom.GeometryLayout);
-
-            /**
-             * Make a complete copy of the geometry.
-             * @return Clone.
-             * @api
-             */
-            clone(): ol.geom.Circle;
-
-            /**
-             * Return the center of the circle as {@link ol.Coordinate coordinate}.
-             * @return Center.
-             * @api
-             */
-            getCenter(): ol.Coordinate;
-
-            /**
-             * Return the radius of the circle.
-             * @return Radius.
-             * @api
-             */
-            getRadius(): number;
-
-            /**
-             * @inheritDoc
-             * @api
-             */
-            getType(): ol.geom.GeometryType;
-
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            intersectsExtent(extent: ol.Extent): boolean;
-
-            /**
-             * Set the center of the circle as {@link ol.Coordinate coordinate}.
-             * @param center Center.
-             * @api
-             */
-            setCenter(center: ol.Coordinate): void;
-
-            /**
-             * Set the center (as {@link ol.Coordinate coordinate}) and the radius (as
-             * number) of the circle.
-             * @param center Center.
-             * @param radius Radius.
-             * @param opt_layout Layout.
-             * @api
-             */
-            setCenterAndRadius(center: ol.Coordinate, radius: number, opt_layout?: ol.geom.GeometryLayout): void;
-
-            /**
-             * Set the radius of the circle. The radius is in the units of the projection.
-             * @param radius Radius.
-             * @api
-             */
-            setRadius(radius: number): void;
-        }
+        constructor(center: ol.Coordinate, opt_radius?: number, opt_layout?: ol.geom.GeometryLayout);
 
         /**
-         * The geometry type. One of `'Point'`, `'LineString'`, `'LinearRing'`,
-         * `'Polygon'`, `'MultiPoint'`, `'MultiLineString'`, `'MultiPolygon'`,
-         * `'GeometryCollection'`, `'Circle'`.
+         * Make a complete copy of the geometry.
+         * @return Clone.
+         * @api
          */
-        type GeometryType = "Point" | "LineString" | "LinearRing" | "Polygon" | "MultiPoint" | "MultiLineString" | "MultiPolygon" | "GeometryCollection" | "Circle";
+        clone(): ol.geom.Circle;
 
         /**
-         * The coordinate layout for geometries, indicating whether a 3rd or 4th z ('Z')
-         * or measure ('M') coordinate is available. Supported values are `'XY'`,
-         * `'XYZ'`, `'XYM'`, `'XYZM'`.
+         * Return the center of the circle as {@link ol.Coordinate coordinate}.
+         * @return Center.
+         * @api
          */
-        type GeometryLayout = "XY" | "XYZ" | "XYM" | "XYZM";
+        getCenter(): ol.Coordinate;
 
+        /**
+         * Return the radius of the circle.
+         * @return Radius.
+         * @api
+         */
+        getRadius(): number;
+
+        /**
+         * @inheritDoc
+         * @api
+         */
+        getType(): ol.geom.GeometryType;
+
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        intersectsExtent(extent: ol.Extent): boolean;
+
+        /**
+         * Set the center of the circle as {@link ol.Coordinate coordinate}.
+         * @param center Center.
+         * @api
+         */
+        setCenter(center: ol.Coordinate): void;
+
+        /**
+         * Set the center (as {@link ol.Coordinate coordinate}) and the radius (as
+         * number) of the circle.
+         * @param center Center.
+         * @param radius Radius.
+         * @param opt_layout Layout.
+         * @api
+         */
+        setCenterAndRadius(center: ol.Coordinate, radius: number, opt_layout?: ol.geom.GeometryLayout): void;
+
+        /**
+         * Set the radius of the circle. The radius is in the units of the projection.
+         * @param radius Radius.
+         * @api
+         */
+        setRadius(radius: number): void;
+    }
+
+    /**
+     * The geometry type. One of `'Point'`, `'LineString'`, `'LinearRing'`,
+     * `'Polygon'`, `'MultiPoint'`, `'MultiLineString'`, `'MultiPolygon'`,
+     * `'GeometryCollection'`, `'Circle'`.
+     */
+    type GeometryType = "Point" | "LineString" | "LinearRing" | "Polygon" | "MultiPoint" | "MultiLineString" | "MultiPolygon" | "GeometryCollection" | "Circle";
+
+    /**
+     * The coordinate layout for geometries, indicating whether a 3rd or 4th z ('Z')
+     * or measure ('M') coordinate is available. Supported values are `'XY'`,
+     * `'XYZ'`, `'XYM'`, `'XYZM'`.
+     */
+    type GeometryLayout = "XY" | "XYZ" | "XYM" | "XYZM";
+
+    /**
+     * @classdesc
+     * Abstract base class; normally only used for creating subclasses and not
+     * instantiated in apps.
+     * Base class for vector geometries.
+     *
+     * To get notified of changes to the geometry, register a listener for the
+     * generic `change` event on your geometry instance.
+     *
+     * @api stable
+     */
+    class Geometry extends Object {
         /**
          * @classdesc
          * Abstract base class; normally only used for creating subclasses and not
@@ -3910,105 +3923,101 @@ declare namespace ol {
          *
          * @api stable
          */
-        class Geometry extends ol.Object {
-            /**
-             * @classdesc
-             * Abstract base class; normally only used for creating subclasses and not
-             * instantiated in apps.
-             * Base class for vector geometries.
-             *
-             * To get notified of changes to the geometry, register a listener for the
-             * generic `change` event on your geometry instance.
-             *
-             * @api stable
-             */
-            constructor();
+        constructor();
 
-            /**
-             * Return the closest point of the geometry to the passed point as
-             * {@link ol.Coordinate coordinate}.
-             * @param point Point.
-             * @param opt_closestPoint Closest point.
-             * @return Closest point.
-             * @api stable
-             */
-            getClosestPoint(point: ol.Coordinate, opt_closestPoint?: ol.Coordinate): ol.Coordinate;
+        /**
+         * Return the closest point of the geometry to the passed point as
+         * {@link ol.Coordinate coordinate}.
+         * @param point Point.
+         * @param opt_closestPoint Closest point.
+         * @return Closest point.
+         * @api stable
+         */
+        getClosestPoint(point: ol.Coordinate, opt_closestPoint?: ol.Coordinate): ol.Coordinate;
 
-            /**
-             * Returns true if this geometry includes the specified coordinate. If the
-             * coordinate is on the boundary of the geometry, returns false.
-             * @param coordinate Coordinate.
-             * @return Contains coordinate.
-             * @api
-             */
-            intersectsCoordinate(coordinate: ol.Coordinate): boolean;
+        /**
+         * Returns true if this geometry includes the specified coordinate. If the
+         * coordinate is on the boundary of the geometry, returns false.
+         * @param coordinate Coordinate.
+         * @return Contains coordinate.
+         * @api
+         */
+        intersectsCoordinate(coordinate: ol.Coordinate): boolean;
 
-            /**
-             * Get the extent of the geometry.
-             * @param opt_extent Extent.
-             * @return extent Extent.
-             * @api stable
-             */
-            getExtent(opt_extent?: ol.Extent): ol.Extent;
+        /**
+         * Get the extent of the geometry.
+         * @param opt_extent Extent.
+         * @return extent Extent.
+         * @api stable
+         */
+        getExtent(opt_extent?: ol.Extent): ol.Extent;
 
-            /**
-             * Rotate the geometry around a given coordinate. This modifies the geometry
-             * coordinates in place.
-             * @param angle Rotation angle in radians.
-             * @param anchor The rotation center.
-             * @api
-             */
-            rotate(angle: number, anchor: ol.Coordinate): void;
+        /**
+         * Rotate the geometry around a given coordinate. This modifies the geometry
+         * coordinates in place.
+         * @param angle Rotation angle in radians.
+         * @param anchor The rotation center.
+         * @api
+         */
+        rotate(angle: number, anchor: ol.Coordinate): void;
 
-            /**
-             * Scale the geometry (with an optional origin).  This modifies the geometry
-             * coordinates in place.
-             * @param sx The scaling factor in the x-direction.
-             * @param opt_sy The scaling factor in the y-direction (defaults to
-             *     sx).
-             * @param opt_anchor The scale origin (defaults to the center
-             *     of the geometry extent).
-             * @api
-             */
-            scale(sx: number, opt_sy?: number, opt_anchor?: ol.Coordinate): void;
+        /**
+         * Scale the geometry (with an optional origin).  This modifies the geometry
+         * coordinates in place.
+         * @param sx The scaling factor in the x-direction.
+         * @param opt_sy The scaling factor in the y-direction (defaults to
+         *     sx).
+         * @param opt_anchor The scale origin (defaults to the center
+         *     of the geometry extent).
+         * @api
+         */
+        scale(sx: number, opt_sy?: number, opt_anchor?: ol.Coordinate): void;
 
-            /**
-             * Create a simplified version of this geometry.  For linestrings, this uses
-             * the the {@link
-             * https://en.wikipedia.org/wiki/Ramer-Douglas-Peucker_algorithm
-             * Douglas Peucker} algorithm.  For polygons, a quantization-based
-             * simplification is used to preserve topology.
-             * @param tolerance The tolerance distance for simplification.
-             * @return A new, simplified version of the original
-             *     geometry.
-             * @api
-             */
-            simplify(tolerance: number): ol.geom.Geometry;
+        /**
+         * Create a simplified version of this geometry.  For linestrings, this uses
+         * the the {@link
+         * https://en.wikipedia.org/wiki/Ramer-Douglas-Peucker_algorithm
+         * Douglas Peucker} algorithm.  For polygons, a quantization-based
+         * simplification is used to preserve topology.
+         * @param tolerance The tolerance distance for simplification.
+         * @return A new, simplified version of the original
+         *     geometry.
+         * @api
+         */
+        simplify(tolerance: number): ol.geom.Geometry;
 
-            /**
-             * Transform each coordinate of the geometry from one coordinate reference
-             * system to another. The geometry is modified in place.
-             * For example, a line will be transformed to a line and a circle to a circle.
-             * If you do not want the geometry modified in place, first `clone()` it and
-             * then use this function on the clone.
-             *
-             * @param source The current projection.  Can be a
-             *     string identifier or a {@link ol.proj.Projection} object.
-             * @param destination The desired projection.  Can be a
-             *     string identifier or a {@link ol.proj.Projection} object.
-             * @return This geometry.  Note that original geometry is
-             *     modified in place.
-             * @api stable
-             */
-            transform(source: ol.ProjectionLike, destination: ol.ProjectionLike): ol.geom.Geometry;
+        /**
+         * Transform each coordinate of the geometry from one coordinate reference
+         * system to another. The geometry is modified in place.
+         * For example, a line will be transformed to a line and a circle to a circle.
+         * If you do not want the geometry modified in place, first `clone()` it and
+         * then use this function on the clone.
+         *
+         * @param source The current projection.  Can be a
+         *     string identifier or a {@link ol.proj.Projection} object.
+         * @param destination The desired projection.  Can be a
+         *     string identifier or a {@link ol.proj.Projection} object.
+         * @return This geometry.  Note that original geometry is
+         *     modified in place.
+         * @api stable
+         */
+        transform(source: ol.ProjectionLike, destination: ol.ProjectionLike): ol.geom.Geometry;
 
-            /**
-             * Get the type of this geometry.
-             * @return Geometry type.
-             */
-            getType(): ol.geom.GeometryType;
-        }
+        /**
+         * Get the type of this geometry.
+         * @return Geometry type.
+         */
+        getType(): ol.geom.GeometryType;
+    }
 
+    /**
+     * @classdesc
+     * An array of {@link ol.geom.Geometry} objects.
+     *
+     * @param opt_geometries Geometries.
+     * @api stable
+     */
+    class GeometryCollection extends geom.Geometry {
         /**
          * @classdesc
          * An array of {@link ol.geom.Geometry} objects.
@@ -4016,64 +4025,66 @@ declare namespace ol {
          * @param opt_geometries Geometries.
          * @api stable
          */
-        class GeometryCollection extends ol.geom.Geometry {
-            /**
-             * @classdesc
-             * An array of {@link ol.geom.Geometry} objects.
-             *
-             * @param opt_geometries Geometries.
-             * @api stable
-             */
-            constructor(opt_geometries?: ol.geom.Geometry[]);
+        constructor(opt_geometries?: ol.geom.Geometry[]);
 
-            /**
-             * Make a complete copy of the geometry.
-             * @return Clone.
-             * @api stable
-             */
-            clone(): ol.geom.GeometryCollection;
+        /**
+         * Make a complete copy of the geometry.
+         * @return Clone.
+         * @api stable
+         */
+        clone(): ol.geom.GeometryCollection;
 
-            /**
-             * Return the geometries that make up this geometry collection.
-             * @return Geometries.
-             * @api stable
-             */
-            getGeometries(): ol.geom.Geometry[];
+        /**
+         * Return the geometries that make up this geometry collection.
+         * @return Geometries.
+         * @api stable
+         */
+        getGeometries(): ol.geom.Geometry[];
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            getType(): ol.geom.GeometryType;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        getType(): ol.geom.GeometryType;
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            intersectsExtent(extent: ol.Extent): boolean;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        intersectsExtent(extent: ol.Extent): boolean;
 
-            /**
-             * Set the geometries that make up this geometry collection.
-             * @param geometries Geometries.
-             * @api stable
-             */
-            setGeometries(geometries: ol.geom.Geometry[]): void;
+        /**
+         * Set the geometries that make up this geometry collection.
+         * @param geometries Geometries.
+         * @api stable
+         */
+        setGeometries(geometries: ol.geom.Geometry[]): void;
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            applyTransform(transformFn: ol.TransformFunction): void;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        applyTransform(transformFn: ol.TransformFunction): void;
 
-            /**
-             * Translate the geometry.
-             * @param deltaX Delta X.
-             * @param deltaY Delta Y.
-             * @api
-             */
-            translate(deltaX: number, deltaY: number): void;
-        }
+        /**
+         * Translate the geometry.
+         * @param deltaX Delta X.
+         * @param deltaY Delta Y.
+         * @api
+         */
+        translate(deltaX: number, deltaY: number): void;
+    }
 
+    /**
+     * @classdesc
+     * Linear ring geometry. Only used as part of polygon; cannot be rendered
+     * on its own.
+     *
+     * @param coordinates Coordinates.
+     * @param opt_layout Layout.
+     * @api stable
+     */
+    class LinearRing extends geom.SimpleGeometry {
         /**
          * @classdesc
          * Linear ring geometry. Only used as part of polygon; cannot be rendered
@@ -4083,54 +4094,53 @@ declare namespace ol {
          * @param opt_layout Layout.
          * @api stable
          */
-        class LinearRing extends ol.geom.SimpleGeometry {
-            /**
-             * @classdesc
-             * Linear ring geometry. Only used as part of polygon; cannot be rendered
-             * on its own.
-             *
-             * @param coordinates Coordinates.
-             * @param opt_layout Layout.
-             * @api stable
-             */
-            constructor(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout);
+        constructor(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout);
 
-            /**
-             * Make a complete copy of the geometry.
-             * @return Clone.
-             * @api stable
-             */
-            clone(): ol.geom.LinearRing;
+        /**
+         * Make a complete copy of the geometry.
+         * @return Clone.
+         * @api stable
+         */
+        clone(): ol.geom.LinearRing;
 
-            /**
-             * Return the area of the linear ring on projected plane.
-             * @return Area (on projected plane).
-             * @api stable
-             */
-            getArea(): number;
+        /**
+         * Return the area of the linear ring on projected plane.
+         * @return Area (on projected plane).
+         * @api stable
+         */
+        getArea(): number;
 
-            /**
-             * Return the coordinates of the linear ring.
-             * @return Coordinates.
-             * @api stable
-             */
-            getCoordinates(): ol.Coordinate[];
+        /**
+         * Return the coordinates of the linear ring.
+         * @return Coordinates.
+         * @api stable
+         */
+        getCoordinates(): ol.Coordinate[];
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            getType(): ol.geom.GeometryType;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        getType(): ol.geom.GeometryType;
 
-            /**
-             * Set the coordinates of the linear ring.
-             * @param coordinates Coordinates.
-             * @param opt_layout Layout.
-             * @api stable
-             */
-            setCoordinates(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout): void;
-        }
+        /**
+         * Set the coordinates of the linear ring.
+         * @param coordinates Coordinates.
+         * @param opt_layout Layout.
+         * @api stable
+         */
+        setCoordinates(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout): void;
+    }
 
+    /**
+     * @classdesc
+     * Linestring geometry.
+     *
+     * @param coordinates Coordinates.
+     * @param opt_layout Layout.
+     * @api stable
+     */
+    class LineString extends geom.SimpleGeometry {
         /**
          * @classdesc
          * Linestring geometry.
@@ -4139,109 +4149,109 @@ declare namespace ol {
          * @param opt_layout Layout.
          * @api stable
          */
-        class LineString extends ol.geom.SimpleGeometry {
-            /**
-             * @classdesc
-             * Linestring geometry.
-             *
-             * @param coordinates Coordinates.
-             * @param opt_layout Layout.
-             * @api stable
-             */
-            constructor(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout);
+        constructor(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout);
 
-            /**
-             * Append the passed coordinate to the coordinates of the linestring.
-             * @param coordinate Coordinate.
-             * @api stable
-             */
-            appendCoordinate(coordinate: ol.Coordinate): void;
+        /**
+         * Append the passed coordinate to the coordinates of the linestring.
+         * @param coordinate Coordinate.
+         * @api stable
+         */
+        appendCoordinate(coordinate: ol.Coordinate): void;
 
-            /**
-             * Make a complete copy of the geometry.
-             * @return Clone.
-             * @api stable
-             */
-            clone(): ol.geom.LineString;
+        /**
+         * Make a complete copy of the geometry.
+         * @return Clone.
+         * @api stable
+         */
+        clone(): ol.geom.LineString;
 
-            /**
-             * Iterate over each segment, calling the provided callback.
-             * If the callback returns a truthy value the function returns that
-             * value immediately. Otherwise the function returns `false`.
-             *
-             * @param callback Function
-             *     called for each segment.
-             * @param opt_this The object to be used as the value of 'this'
-             *     within callback.
-             * @return Value.
-             * @template T,S
-             * @api
-             */
-            forEachSegment<T, S>(callback: ((this: S, start: ol.Coordinate, end: ol.Coordinate) => T), opt_this?: S): (T | boolean);
+        /**
+         * Iterate over each segment, calling the provided callback.
+         * If the callback returns a truthy value the function returns that
+         * value immediately. Otherwise the function returns `false`.
+         *
+         * @param callback Function
+         *     called for each segment.
+         * @param opt_this The object to be used as the value of 'this'
+         *     within callback.
+         * @return Value.
+         * @template T,S
+         * @api
+         */
+        forEachSegment<T, S>(callback: ((this: S, start: ol.Coordinate, end: ol.Coordinate) => T), opt_this?: S): (T | boolean);
 
-            /**
-             * Returns the coordinate at `m` using linear interpolation, or `null` if no
-             * such coordinate exists.
-             *
-             * `opt_extrapolate` controls extrapolation beyond the range of Ms in the
-             * MultiLineString. If `opt_extrapolate` is `true` then Ms less than the first
-             * M will return the first coordinate and Ms greater than the last M will
-             * return the last coordinate.
-             *
-             * @param m M.
-             * @param opt_extrapolate Extrapolate. Default is `false`.
-             * @return Coordinate.
-             * @api stable
-             */
-            getCoordinateAtM(m: number, opt_extrapolate?: boolean): ol.Coordinate;
+        /**
+         * Returns the coordinate at `m` using linear interpolation, or `null` if no
+         * such coordinate exists.
+         *
+         * `opt_extrapolate` controls extrapolation beyond the range of Ms in the
+         * MultiLineString. If `opt_extrapolate` is `true` then Ms less than the first
+         * M will return the first coordinate and Ms greater than the last M will
+         * return the last coordinate.
+         *
+         * @param m M.
+         * @param opt_extrapolate Extrapolate. Default is `false`.
+         * @return Coordinate.
+         * @api stable
+         */
+        getCoordinateAtM(m: number, opt_extrapolate?: boolean): ol.Coordinate;
 
-            /**
-             * Return the coordinates of the linestring.
-             * @return Coordinates.
-             * @api stable
-             */
-            getCoordinates(): ol.Coordinate[];
+        /**
+         * Return the coordinates of the linestring.
+         * @return Coordinates.
+         * @api stable
+         */
+        getCoordinates(): ol.Coordinate[];
 
-            /**
-             * Return the coordinate at the provided fraction along the linestring.
-             * The `fraction` is a number between 0 and 1, where 0 is the start of the
-             * linestring and 1 is the end.
-             * @param fraction Fraction.
-             * @param opt_dest Optional coordinate whose values will
-             *     be modified. If not provided, a new coordinate will be returned.
-             * @return Coordinate of the interpolated point.
-             * @api
-             */
-            getCoordinateAt(fraction: number, opt_dest?: ol.Coordinate): ol.Coordinate;
+        /**
+         * Return the coordinate at the provided fraction along the linestring.
+         * The `fraction` is a number between 0 and 1, where 0 is the start of the
+         * linestring and 1 is the end.
+         * @param fraction Fraction.
+         * @param opt_dest Optional coordinate whose values will
+         *     be modified. If not provided, a new coordinate will be returned.
+         * @return Coordinate of the interpolated point.
+         * @api
+         */
+        getCoordinateAt(fraction: number, opt_dest?: ol.Coordinate): ol.Coordinate;
 
-            /**
-             * Return the length of the linestring on projected plane.
-             * @return Length (on projected plane).
-             * @api stable
-             */
-            getLength(): number;
+        /**
+         * Return the length of the linestring on projected plane.
+         * @return Length (on projected plane).
+         * @api stable
+         */
+        getLength(): number;
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            getType(): ol.geom.GeometryType;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        getType(): ol.geom.GeometryType;
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            intersectsExtent(extent: ol.Extent): boolean;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        intersectsExtent(extent: ol.Extent): boolean;
 
-            /**
-             * Set the coordinates of the linestring.
-             * @param coordinates Coordinates.
-             * @param opt_layout Layout.
-             * @api stable
-             */
-            setCoordinates(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout): void;
-        }
+        /**
+         * Set the coordinates of the linestring.
+         * @param coordinates Coordinates.
+         * @param opt_layout Layout.
+         * @api stable
+         */
+        setCoordinates(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout): void;
+    }
 
+    /**
+     * @classdesc
+     * Multi-linestring geometry.
+     *
+     * @param coordinates Coordinates.
+     * @param opt_layout Layout.
+     * @api stable
+     */
+    class MultiLineString extends geom.SimpleGeometry {
         /**
          * @classdesc
          * Multi-linestring geometry.
@@ -4250,98 +4260,98 @@ declare namespace ol {
          * @param opt_layout Layout.
          * @api stable
          */
-        class MultiLineString extends ol.geom.SimpleGeometry {
-            /**
-             * @classdesc
-             * Multi-linestring geometry.
-             *
-             * @param coordinates Coordinates.
-             * @param opt_layout Layout.
-             * @api stable
-             */
-            constructor(coordinates: ol.Coordinate[][], opt_layout?: ol.geom.GeometryLayout);
+        constructor(coordinates: ol.Coordinate[][], opt_layout?: ol.geom.GeometryLayout);
 
-            /**
-             * Append the passed linestring to the multilinestring.
-             * @param lineString LineString.
-             * @api stable
-             */
-            appendLineString(lineString: ol.geom.LineString): void;
+        /**
+         * Append the passed linestring to the multilinestring.
+         * @param lineString LineString.
+         * @api stable
+         */
+        appendLineString(lineString: ol.geom.LineString): void;
 
-            /**
-             * Make a complete copy of the geometry.
-             * @return Clone.
-             * @api stable
-             */
-            clone(): ol.geom.MultiLineString;
+        /**
+         * Make a complete copy of the geometry.
+         * @return Clone.
+         * @api stable
+         */
+        clone(): ol.geom.MultiLineString;
 
-            /**
-             * Returns the coordinate at `m` using linear interpolation, or `null` if no
-             * such coordinate exists.
-             *
-             * `opt_extrapolate` controls extrapolation beyond the range of Ms in the
-             * MultiLineString. If `opt_extrapolate` is `true` then Ms less than the first
-             * M will return the first coordinate and Ms greater than the last M will
-             * return the last coordinate.
-             *
-             * `opt_interpolate` controls interpolation between consecutive LineStrings
-             * within the MultiLineString. If `opt_interpolate` is `true` the coordinates
-             * will be linearly interpolated between the last coordinate of one LineString
-             * and the first coordinate of the next LineString.  If `opt_interpolate` is
-             * `false` then the function will return `null` for Ms falling between
-             * LineStrings.
-             *
-             * @param m M.
-             * @param opt_extrapolate Extrapolate. Default is `false`.
-             * @param opt_interpolate Interpolate. Default is `false`.
-             * @return Coordinate.
-             * @api stable
-             */
-            getCoordinateAtM(m: number, opt_extrapolate?: boolean, opt_interpolate?: boolean): ol.Coordinate;
+        /**
+         * Returns the coordinate at `m` using linear interpolation, or `null` if no
+         * such coordinate exists.
+         *
+         * `opt_extrapolate` controls extrapolation beyond the range of Ms in the
+         * MultiLineString. If `opt_extrapolate` is `true` then Ms less than the first
+         * M will return the first coordinate and Ms greater than the last M will
+         * return the last coordinate.
+         *
+         * `opt_interpolate` controls interpolation between consecutive LineStrings
+         * within the MultiLineString. If `opt_interpolate` is `true` the coordinates
+         * will be linearly interpolated between the last coordinate of one LineString
+         * and the first coordinate of the next LineString.  If `opt_interpolate` is
+         * `false` then the function will return `null` for Ms falling between
+         * LineStrings.
+         *
+         * @param m M.
+         * @param opt_extrapolate Extrapolate. Default is `false`.
+         * @param opt_interpolate Interpolate. Default is `false`.
+         * @return Coordinate.
+         * @api stable
+         */
+        getCoordinateAtM(m: number, opt_extrapolate?: boolean, opt_interpolate?: boolean): ol.Coordinate;
 
-            /**
-             * Return the coordinates of the multilinestring.
-             * @return Coordinates.
-             * @api stable
-             */
-            getCoordinates(): ol.Coordinate[][];
+        /**
+         * Return the coordinates of the multilinestring.
+         * @return Coordinates.
+         * @api stable
+         */
+        getCoordinates(): ol.Coordinate[][];
 
-            /**
-             * Return the linestring at the specified index.
-             * @param index Index.
-             * @return LineString.
-             * @api stable
-             */
-            getLineString(index: number): ol.geom.LineString;
+        /**
+         * Return the linestring at the specified index.
+         * @param index Index.
+         * @return LineString.
+         * @api stable
+         */
+        getLineString(index: number): ol.geom.LineString;
 
-            /**
-             * Return the linestrings of this multilinestring.
-             * @return LineStrings.
-             * @api stable
-             */
-            getLineStrings(): ol.geom.LineString[];
+        /**
+         * Return the linestrings of this multilinestring.
+         * @return LineStrings.
+         * @api stable
+         */
+        getLineStrings(): ol.geom.LineString[];
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            getType(): ol.geom.GeometryType;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        getType(): ol.geom.GeometryType;
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            intersectsExtent(extent: ol.Extent): boolean;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        intersectsExtent(extent: ol.Extent): boolean;
 
-            /**
-             * Set the coordinates of the multilinestring.
-             * @param coordinates Coordinates.
-             * @param opt_layout Layout.
-             * @api stable
-             */
-            setCoordinates(coordinates: ol.Coordinate[][], opt_layout?: ol.geom.GeometryLayout): void;
-        }
+        /**
+         * Set the coordinates of the multilinestring.
+         * @param coordinates Coordinates.
+         * @param opt_layout Layout.
+         * @api stable
+         */
+        setCoordinates(coordinates: ol.Coordinate[][], opt_layout?: ol.geom.GeometryLayout): void;
+    }
 
+    /**
+     * @classdesc
+     * Multi-point geometry.
+     *
+     * @param coordinates Coordinates.
+     * @param opt_layout Layout.
+     * @api stable
+     */
+    class MultiPoint extends geom.SimpleGeometry {
         /**
          * @classdesc
          * Multi-point geometry.
@@ -4350,74 +4360,74 @@ declare namespace ol {
          * @param opt_layout Layout.
          * @api stable
          */
-        class MultiPoint extends ol.geom.SimpleGeometry {
-            /**
-             * @classdesc
-             * Multi-point geometry.
-             *
-             * @param coordinates Coordinates.
-             * @param opt_layout Layout.
-             * @api stable
-             */
-            constructor(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout);
+        constructor(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout);
 
-            /**
-             * Append the passed point to this multipoint.
-             * @param point Point.
-             * @api stable
-             */
-            appendPoint(point: ol.geom.Point): void;
+        /**
+         * Append the passed point to this multipoint.
+         * @param point Point.
+         * @api stable
+         */
+        appendPoint(point: ol.geom.Point): void;
 
-            /**
-             * Make a complete copy of the geometry.
-             * @return Clone.
-             * @api stable
-             */
-            clone(): ol.geom.MultiPoint;
+        /**
+         * Make a complete copy of the geometry.
+         * @return Clone.
+         * @api stable
+         */
+        clone(): ol.geom.MultiPoint;
 
-            /**
-             * Return the coordinates of the multipoint.
-             * @return Coordinates.
-             * @api stable
-             */
-            getCoordinates(): ol.Coordinate[];
+        /**
+         * Return the coordinates of the multipoint.
+         * @return Coordinates.
+         * @api stable
+         */
+        getCoordinates(): ol.Coordinate[];
 
-            /**
-             * Return the point at the specified index.
-             * @param index Index.
-             * @return Point.
-             * @api stable
-             */
-            getPoint(index: number): ol.geom.Point;
+        /**
+         * Return the point at the specified index.
+         * @param index Index.
+         * @return Point.
+         * @api stable
+         */
+        getPoint(index: number): ol.geom.Point;
 
-            /**
-             * Return the points of this multipoint.
-             * @return Points.
-             * @api stable
-             */
-            getPoints(): ol.geom.Point[];
+        /**
+         * Return the points of this multipoint.
+         * @return Points.
+         * @api stable
+         */
+        getPoints(): ol.geom.Point[];
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            getType(): ol.geom.GeometryType;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        getType(): ol.geom.GeometryType;
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            intersectsExtent(extent: ol.Extent): boolean;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        intersectsExtent(extent: ol.Extent): boolean;
 
-            /**
-             * Set the coordinates of the multipoint.
-             * @param coordinates Coordinates.
-             * @param opt_layout Layout.
-             * @api stable
-             */
-            setCoordinates(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout): void;
-        }
+        /**
+         * Set the coordinates of the multipoint.
+         * @param coordinates Coordinates.
+         * @param opt_layout Layout.
+         * @api stable
+         */
+        setCoordinates(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout): void;
+    }
 
+    /**
+     * @classdesc
+     * Multi-polygon geometry.
+     *
+     * @param coordinates Coordinates.
+     * @param opt_layout Layout.
+     * @api stable
+     */
+    class MultiPolygon extends geom.SimpleGeometry {
         /**
          * @classdesc
          * Multi-polygon geometry.
@@ -4426,96 +4436,96 @@ declare namespace ol {
          * @param opt_layout Layout.
          * @api stable
          */
-        class MultiPolygon extends ol.geom.SimpleGeometry {
-            /**
-             * @classdesc
-             * Multi-polygon geometry.
-             *
-             * @param coordinates Coordinates.
-             * @param opt_layout Layout.
-             * @api stable
-             */
-            constructor(coordinates: ol.Coordinate[][][], opt_layout?: ol.geom.GeometryLayout);
+        constructor(coordinates: ol.Coordinate[][][], opt_layout?: ol.geom.GeometryLayout);
 
-            /**
-             * Append the passed polygon to this multipolygon.
-             * @param polygon Polygon.
-             * @api stable
-             */
-            appendPolygon(polygon: ol.geom.Polygon): void;
+        /**
+         * Append the passed polygon to this multipolygon.
+         * @param polygon Polygon.
+         * @api stable
+         */
+        appendPolygon(polygon: ol.geom.Polygon): void;
 
-            /**
-             * Make a complete copy of the geometry.
-             * @return Clone.
-             * @api stable
-             */
-            clone(): ol.geom.MultiPolygon;
+        /**
+         * Make a complete copy of the geometry.
+         * @return Clone.
+         * @api stable
+         */
+        clone(): ol.geom.MultiPolygon;
 
-            /**
-             * Return the area of the multipolygon on projected plane.
-             * @return Area (on projected plane).
-             * @api stable
-             */
-            getArea(): number;
+        /**
+         * Return the area of the multipolygon on projected plane.
+         * @return Area (on projected plane).
+         * @api stable
+         */
+        getArea(): number;
 
-            /**
-             * Get the coordinate array for this geometry.  This array has the structure
-             * of a GeoJSON coordinate array for multi-polygons.
-             *
-             * @param opt_right Orient coordinates according to the right-hand
-             *     rule (counter-clockwise for exterior and clockwise for interior rings).
-             *     If `false`, coordinates will be oriented according to the left-hand rule
-             *     (clockwise for exterior and counter-clockwise for interior rings).
-             *     By default, coordinate orientation will depend on how the geometry was
-             *     constructed.
-             * @return Coordinates.
-             * @api stable
-             */
-            getCoordinates(opt_right?: boolean): ol.Coordinate[][][];
+        /**
+         * Get the coordinate array for this geometry.  This array has the structure
+         * of a GeoJSON coordinate array for multi-polygons.
+         *
+         * @param opt_right Orient coordinates according to the right-hand
+         *     rule (counter-clockwise for exterior and clockwise for interior rings).
+         *     If `false`, coordinates will be oriented according to the left-hand rule
+         *     (clockwise for exterior and counter-clockwise for interior rings).
+         *     By default, coordinate orientation will depend on how the geometry was
+         *     constructed.
+         * @return Coordinates.
+         * @api stable
+         */
+        getCoordinates(opt_right?: boolean): ol.Coordinate[][][];
 
-            /**
-             * Return the interior points as {@link ol.geom.MultiPoint multipoint}.
-             * @return Interior points.
-             * @api stable
-             */
-            getInteriorPoints(): ol.geom.MultiPoint;
+        /**
+         * Return the interior points as {@link ol.geom.MultiPoint multipoint}.
+         * @return Interior points.
+         * @api stable
+         */
+        getInteriorPoints(): ol.geom.MultiPoint;
 
-            /**
-             * Return the polygon at the specified index.
-             * @param index Index.
-             * @return Polygon.
-             * @api stable
-             */
-            getPolygon(index: number): ol.geom.Polygon;
+        /**
+         * Return the polygon at the specified index.
+         * @param index Index.
+         * @return Polygon.
+         * @api stable
+         */
+        getPolygon(index: number): ol.geom.Polygon;
 
-            /**
-             * Return the polygons of this multipolygon.
-             * @return Polygons.
-             * @api stable
-             */
-            getPolygons(): ol.geom.Polygon[];
+        /**
+         * Return the polygons of this multipolygon.
+         * @return Polygons.
+         * @api stable
+         */
+        getPolygons(): ol.geom.Polygon[];
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            getType(): ol.geom.GeometryType;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        getType(): ol.geom.GeometryType;
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            intersectsExtent(extent: ol.Extent): boolean;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        intersectsExtent(extent: ol.Extent): boolean;
 
-            /**
-             * Set the coordinates of the multipolygon.
-             * @param coordinates Coordinates.
-             * @param opt_layout Layout.
-             * @api stable
-             */
-            setCoordinates(coordinates: ol.Coordinate[][][], opt_layout?: ol.geom.GeometryLayout): void;
-        }
+        /**
+         * Set the coordinates of the multipolygon.
+         * @param coordinates Coordinates.
+         * @param opt_layout Layout.
+         * @api stable
+         */
+        setCoordinates(coordinates: ol.Coordinate[][][], opt_layout?: ol.geom.GeometryLayout): void;
+    }
 
+    /**
+     * @classdesc
+     * Point geometry.
+     *
+     * @param coordinates Coordinates.
+     * @param opt_layout Layout.
+     * @api stable
+     */
+    class Point extends geom.SimpleGeometry {
         /**
          * @classdesc
          * Point geometry.
@@ -4524,52 +4534,52 @@ declare namespace ol {
          * @param opt_layout Layout.
          * @api stable
          */
-        class Point extends ol.geom.SimpleGeometry {
-            /**
-             * @classdesc
-             * Point geometry.
-             *
-             * @param coordinates Coordinates.
-             * @param opt_layout Layout.
-             * @api stable
-             */
-            constructor(coordinates: ol.Coordinate, opt_layout?: ol.geom.GeometryLayout);
+        constructor(coordinates: ol.Coordinate, opt_layout?: ol.geom.GeometryLayout);
 
-            /**
-             * Make a complete copy of the geometry.
-             * @return Clone.
-             * @api stable
-             */
-            clone(): ol.geom.Point;
+        /**
+         * Make a complete copy of the geometry.
+         * @return Clone.
+         * @api stable
+         */
+        clone(): ol.geom.Point;
 
-            /**
-             * Return the coordinate of the point.
-             * @return Coordinates.
-             * @api stable
-             */
-            getCoordinates(): ol.Coordinate;
+        /**
+         * Return the coordinate of the point.
+         * @return Coordinates.
+         * @api stable
+         */
+        getCoordinates(): ol.Coordinate;
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            getType(): ol.geom.GeometryType;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        getType(): ol.geom.GeometryType;
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            intersectsExtent(extent: ol.Extent): boolean;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        intersectsExtent(extent: ol.Extent): boolean;
 
-            /**
-             * Set the coordinate of the point.
-             * @param coordinates Coordinates.
-             * @param opt_layout Layout.
-             * @api stable
-             */
-            setCoordinates(coordinates: ol.Coordinate, opt_layout?: ol.geom.GeometryLayout): void;
-        }
+        /**
+         * Set the coordinate of the point.
+         * @param coordinates Coordinates.
+         * @param opt_layout Layout.
+         * @api stable
+         */
+        setCoordinates(coordinates: ol.Coordinate, opt_layout?: ol.geom.GeometryLayout): void;
+    }
 
+    /**
+     * @classdesc
+     * Polygon geometry.
+     *
+     * @param coordinates Coordinates.
+     * @param opt_layout Layout.
+     * @api stable
+     */
+    class Polygon extends geom.SimpleGeometry {
         /**
          * @classdesc
          * Polygon geometry.
@@ -4578,141 +4588,140 @@ declare namespace ol {
          * @param opt_layout Layout.
          * @api stable
          */
-        class Polygon extends ol.geom.SimpleGeometry {
-            /**
-             * @classdesc
-             * Polygon geometry.
-             *
-             * @param coordinates Coordinates.
-             * @param opt_layout Layout.
-             * @api stable
-             */
-            constructor(coordinates: ol.Coordinate[][], opt_layout?: ol.geom.GeometryLayout);
+        constructor(coordinates: ol.Coordinate[][], opt_layout?: ol.geom.GeometryLayout);
 
-            /**
-             * Append the passed linear ring to this polygon.
-             * @param linearRing Linear ring.
-             * @api stable
-             */
-            appendLinearRing(linearRing: ol.geom.LinearRing): void;
+        /**
+         * Append the passed linear ring to this polygon.
+         * @param linearRing Linear ring.
+         * @api stable
+         */
+        appendLinearRing(linearRing: ol.geom.LinearRing): void;
 
-            /**
-             * Make a complete copy of the geometry.
-             * @return Clone.
-             * @api stable
-             */
-            clone(): ol.geom.Polygon;
+        /**
+         * Make a complete copy of the geometry.
+         * @return Clone.
+         * @api stable
+         */
+        clone(): ol.geom.Polygon;
 
-            /**
-             * Return the area of the polygon on projected plane.
-             * @return Area (on projected plane).
-             * @api stable
-             */
-            getArea(): number;
+        /**
+         * Return the area of the polygon on projected plane.
+         * @return Area (on projected plane).
+         * @api stable
+         */
+        getArea(): number;
 
-            /**
-             * Get the coordinate array for this geometry.  This array has the structure
-             * of a GeoJSON coordinate array for polygons.
-             *
-             * @param opt_right Orient coordinates according to the right-hand
-             *     rule (counter-clockwise for exterior and clockwise for interior rings).
-             *     If `false`, coordinates will be oriented according to the left-hand rule
-             *     (clockwise for exterior and counter-clockwise for interior rings).
-             *     By default, coordinate orientation will depend on how the geometry was
-             *     constructed.
-             * @return Coordinates.
-             * @api stable
-             */
-            getCoordinates(opt_right?: boolean): ol.Coordinate[][];
+        /**
+         * Get the coordinate array for this geometry.  This array has the structure
+         * of a GeoJSON coordinate array for polygons.
+         *
+         * @param opt_right Orient coordinates according to the right-hand
+         *     rule (counter-clockwise for exterior and clockwise for interior rings).
+         *     If `false`, coordinates will be oriented according to the left-hand rule
+         *     (clockwise for exterior and counter-clockwise for interior rings).
+         *     By default, coordinate orientation will depend on how the geometry was
+         *     constructed.
+         * @return Coordinates.
+         * @api stable
+         */
+        getCoordinates(opt_right?: boolean): ol.Coordinate[][];
 
-            /**
-             * Return an interior point of the polygon.
-             * @return Interior point.
-             * @api stable
-             */
-            getInteriorPoint(): ol.geom.Point;
+        /**
+         * Return an interior point of the polygon.
+         * @return Interior point.
+         * @api stable
+         */
+        getInteriorPoint(): ol.geom.Point;
 
-            /**
-             * Return the number of rings of the polygon,  this includes the exterior
-             * ring and any interior rings.
-             *
-             * @return Number of rings.
-             * @api
-             */
-            getLinearRingCount(): number;
+        /**
+         * Return the number of rings of the polygon,  this includes the exterior
+         * ring and any interior rings.
+         *
+         * @return Number of rings.
+         * @api
+         */
+        getLinearRingCount(): number;
 
-            /**
-             * Return the Nth linear ring of the polygon geometry. Return `null` if the
-             * given index is out of range.
-             * The exterior linear ring is available at index `0` and the interior rings
-             * at index `1` and beyond.
-             *
-             * @param index Index.
-             * @return Linear ring.
-             * @api stable
-             */
-            getLinearRing(index: number): ol.geom.LinearRing;
+        /**
+         * Return the Nth linear ring of the polygon geometry. Return `null` if the
+         * given index is out of range.
+         * The exterior linear ring is available at index `0` and the interior rings
+         * at index `1` and beyond.
+         *
+         * @param index Index.
+         * @return Linear ring.
+         * @api stable
+         */
+        getLinearRing(index: number): ol.geom.LinearRing;
 
-            /**
-             * Return the linear rings of the polygon.
-             * @return Linear rings.
-             * @api stable
-             */
-            getLinearRings(): ol.geom.LinearRing[];
+        /**
+         * Return the linear rings of the polygon.
+         * @return Linear rings.
+         * @api stable
+         */
+        getLinearRings(): ol.geom.LinearRing[];
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            getType(): ol.geom.GeometryType;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        getType(): ol.geom.GeometryType;
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            intersectsExtent(extent: ol.Extent): boolean;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        intersectsExtent(extent: ol.Extent): boolean;
 
-            /**
-             * Set the coordinates of the polygon.
-             * @param coordinates Coordinates.
-             * @param opt_layout Layout.
-             * @api stable
-             */
-            setCoordinates(coordinates: ol.Coordinate[][], opt_layout?: ol.geom.GeometryLayout): void;
+        /**
+         * Set the coordinates of the polygon.
+         * @param coordinates Coordinates.
+         * @param opt_layout Layout.
+         * @api stable
+         */
+        setCoordinates(coordinates: ol.Coordinate[][], opt_layout?: ol.geom.GeometryLayout): void;
 
-            /**
-             * Create an approximation of a circle on the surface of a sphere.
-             * @param sphere The sphere.
-             * @param center Center (`[lon, lat]` in degrees).
-             * @param radius The great-circle distance from the center to
-             *     the polygon vertices.
-             * @param opt_n Optional number of vertices for the resulting
-             *     polygon. Default is `32`.
-             * @return The "circular" polygon.
-             * @api stable
-             */
-            static circular(sphere: ol.Sphere, center: ol.Coordinate, radius: number, opt_n?: number): ol.geom.Polygon;
+        /**
+         * Create an approximation of a circle on the surface of a sphere.
+         * @param sphere The sphere.
+         * @param center Center (`[lon, lat]` in degrees).
+         * @param radius The great-circle distance from the center to
+         *     the polygon vertices.
+         * @param opt_n Optional number of vertices for the resulting
+         *     polygon. Default is `32`.
+         * @return The "circular" polygon.
+         * @api stable
+         */
+        static circular(sphere: ol.Sphere, center: ol.Coordinate, radius: number, opt_n?: number): ol.geom.Polygon;
 
-            /**
-             * Create a polygon from an extent. The layout used is `XY`.
-             * @param extent The extent.
-             * @return The polygon.
-             * @api
-             */
-            static fromExtent(extent: ol.Extent): ol.geom.Polygon;
+        /**
+         * Create a polygon from an extent. The layout used is `XY`.
+         * @param extent The extent.
+         * @return The polygon.
+         * @api
+         */
+        static fromExtent(extent: ol.Extent): ol.geom.Polygon;
 
-            /**
-             * Create a regular polygon from a circle.
-             * @param circle Circle geometry.
-             * @param opt_sides Number of sides of the polygon. Default is 32.
-             * @param opt_angle Start angle for the first vertex of the polygon in
-             *     radians. Default is 0.
-             * @return Polygon geometry.
-             * @api
-             */
-            static fromCircle(circle: ol.geom.Circle, opt_sides?: number, opt_angle?: number): ol.geom.Polygon;
-        }
+        /**
+         * Create a regular polygon from a circle.
+         * @param circle Circle geometry.
+         * @param opt_sides Number of sides of the polygon. Default is 32.
+         * @param opt_angle Start angle for the first vertex of the polygon in
+         *     radians. Default is 0.
+         * @return Polygon geometry.
+         * @api
+         */
+        static fromCircle(circle: ol.geom.Circle, opt_sides?: number, opt_angle?: number): ol.geom.Polygon;
+    }
 
+    /**
+     * @classdesc
+     * Abstract base class; only used for creating subclasses; do not instantiate
+     * in apps, as cannot be rendered.
+     *
+     * @api stable
+     */
+    class SimpleGeometry extends geom.Geometry {
         /**
          * @classdesc
          * Abstract base class; only used for creating subclasses; do not instantiate
@@ -4720,141 +4729,143 @@ declare namespace ol {
          *
          * @api stable
          */
-        class SimpleGeometry extends ol.geom.Geometry {
-            /**
-             * @classdesc
-             * Abstract base class; only used for creating subclasses; do not instantiate
-             * in apps, as cannot be rendered.
-             *
-             * @api stable
-             */
-            constructor();
+        constructor();
 
-            /**
-             * Return the first coordinate of the geometry.
-             * @return First coordinate.
-             * @api stable
-             */
-            getFirstCoordinate(): ol.Coordinate;
+        /**
+         * Return the first coordinate of the geometry.
+         * @return First coordinate.
+         * @api stable
+         */
+        getFirstCoordinate(): ol.Coordinate;
 
-            /**
-             * Return the last coordinate of the geometry.
-             * @return Last point.
-             * @api stable
-             */
-            getLastCoordinate(): ol.Coordinate;
+        /**
+         * Return the last coordinate of the geometry.
+         * @return Last point.
+         * @api stable
+         */
+        getLastCoordinate(): ol.Coordinate;
 
-            /**
-             * Return the {@link ol.geom.GeometryLayout layout} of the geometry.
-             * @return Layout.
-             * @api stable
-             */
-            getLayout(): ol.geom.GeometryLayout;
+        /**
+         * Return the {@link ol.geom.GeometryLayout layout} of the geometry.
+         * @return Layout.
+         * @api stable
+         */
+        getLayout(): ol.geom.GeometryLayout;
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            applyTransform(transformFn: ol.TransformFunction): void;
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        applyTransform(transformFn: ol.TransformFunction): void;
 
-            /**
-             * @inheritDoc
-             * @api stable
-             */
-            translate(deltaX: number, deltaY: number): void;
-        }
+        /**
+         * @inheritDoc
+         * @api stable
+         */
+        translate(deltaX: number, deltaY: number): void;
     }
+}
 
+/**
+ * Render a grid for a coordinate system on a map.
+ * @param opt_options Options.
+ * @api
+ */
+export class Graticule {
     /**
      * Render a grid for a coordinate system on a map.
      * @param opt_options Options.
      * @api
      */
-    class Graticule {
-        /**
-         * Render a grid for a coordinate system on a map.
-         * @param opt_options Options.
-         * @api
-         */
-        constructor(opt_options?: olx.GraticuleOptions);
+    constructor(opt_options?: olx.GraticuleOptions);
 
-        /**
-         * Get the map associated with this graticule.
-         * @return The map.
-         * @api
-         */
-        getMap(): ol.Map;
+    /**
+     * Get the map associated with this graticule.
+     * @return The map.
+     * @api
+     */
+    getMap(): ol.Map;
 
-        /**
-         * Get the list of meridians.  Meridians are lines of equal longitude.
-         * @return The meridians.
-         * @api
-         */
-        getMeridians(): ol.geom.LineString[];
+    /**
+     * Get the list of meridians.  Meridians are lines of equal longitude.
+     * @return The meridians.
+     * @api
+     */
+    getMeridians(): ol.geom.LineString[];
 
-        /**
-         * Get the list of parallels.  Pallels are lines of equal latitude.
-         * @return The parallels.
-         * @api
-         */
-        getParallels(): ol.geom.LineString[];
+    /**
+     * Get the list of parallels.  Pallels are lines of equal latitude.
+     * @return The parallels.
+     * @api
+     */
+    getParallels(): ol.geom.LineString[];
 
-        /**
-         * Set the map for this graticule.  The graticule will be rendered on the
-         * provided map.
-         * @param map Map.
-         * @api
-         */
-        setMap(map: ol.Map): void;
-    }
+    /**
+     * Set the map for this graticule.  The graticule will be rendered on the
+     * provided map.
+     * @param map Map.
+     * @api
+     */
+    setMap(map: ol.Map): void;
+}
 
-    namespace has {
-        /**
-         * The ratio between physical pixels and device-independent pixels
-         * (dips) on the device (`window.devicePixelRatio`).
-         * @const
-         * @api stable
-         */
-        const DEVICE_PIXEL_RATIO: number;
+export namespace has {
+    /**
+     * The ratio between physical pixels and device-independent pixels
+     * (dips) on the device (`window.devicePixelRatio`).
+     * @const
+     * @api stable
+     */
+    const DEVICE_PIXEL_RATIO: number;
 
-        /**
-         * True if both the library and browser support Canvas.  Always `false`
-         * if `ol.ENABLE_CANVAS` is set to `false` at compile time.
-         * @const
-         * @api stable
-         */
-        const CANVAS: boolean;
+    /**
+     * True if both the library and browser support Canvas.  Always `false`
+     * if `ol.ENABLE_CANVAS` is set to `false` at compile time.
+     * @const
+     * @api stable
+     */
+    const CANVAS: boolean;
 
-        /**
-         * Indicates if DeviceOrientation is supported in the user's browser.
-         * @const
-         * @api stable
-         */
-        const DEVICE_ORIENTATION: boolean;
+    /**
+     * Indicates if DeviceOrientation is supported in the user's browser.
+     * @const
+     * @api stable
+     */
+    const DEVICE_ORIENTATION: boolean;
 
-        /**
-         * Is HTML5 geolocation supported in the current browser?
-         * @const
-         * @api stable
-         */
-        const GEOLOCATION: boolean;
+    /**
+     * Is HTML5 geolocation supported in the current browser?
+     * @const
+     * @api stable
+     */
+    const GEOLOCATION: boolean;
 
-        /**
-         * True if browser supports touch events.
-         * @const
-         * @api stable
-         */
-        const TOUCH: boolean;
+    /**
+     * True if browser supports touch events.
+     * @const
+     * @api stable
+     */
+    const TOUCH: boolean;
 
-        /**
-         * True if both OpenLayers and browser support WebGL.  Always `false`
-         * if `ol.ENABLE_WEBGL` is set to `false` at compile time.
-         * @const
-         * @api stable
-         */
-        const WEBGL: boolean;
-    }
+    /**
+     * True if both OpenLayers and browser support WebGL.  Always `false`
+     * if `ol.ENABLE_WEBGL` is set to `false` at compile time.
+     * @const
+     * @api stable
+     */
+    const WEBGL: boolean;
+}
 
+/**
+ * @param extent Extent.
+ * @param resolution Resolution.
+ * @param pixelRatio Pixel ratio.
+ * @param attributions Attributions.
+ * @param src Image source URI.
+ * @param crossOrigin Cross origin.
+ * @param imageLoadFunction Image load function.
+ */
+export class Image extends ImageBase {
     /**
      * @param extent Extent.
      * @param resolution Resolution.
@@ -4864,35 +4875,33 @@ declare namespace ol {
      * @param crossOrigin Cross origin.
      * @param imageLoadFunction Image load function.
      */
-    class Image extends ol.ImageBase {
-        /**
-         * @param extent Extent.
-         * @param resolution Resolution.
-         * @param pixelRatio Pixel ratio.
-         * @param attributions Attributions.
-         * @param src Image source URI.
-         * @param crossOrigin Cross origin.
-         * @param imageLoadFunction Image load function.
-         */
-        constructor(extent: ol.Extent, resolution: (number), pixelRatio: number, attributions: ol.Attribution[], src: string, crossOrigin?: string, imageLoadFunction?: ol.ImageLoadFunctionType);
+    constructor(extent: ol.Extent, resolution: (number), pixelRatio: number, attributions: ol.Attribution[], src: string, crossOrigin?: string, imageLoadFunction?: ol.ImageLoadFunctionType);
 
-        /**
-         * Get the HTML image element (may be a Canvas, Image, or Video).
-         * @param opt_context Object.
-         * @return Image.
-         * @api
-         */
-        getImage(opt_context?: GlobalObject): (HTMLCanvasElement | Image | HTMLVideoElement);
+    /**
+     * Get the HTML image element (may be a Canvas, Image, or Video).
+     * @param opt_context Object.
+     * @return Image.
+     * @api
+     */
+    getImage(opt_context?: GlobalObject): (HTMLCanvasElement | Image | HTMLVideoElement);
 
-        /**
-         * Load the image or retry if loading previously failed.
-         * Loading is taken care of by the tile queue, and calling this method is
-         * only needed for preloading or for reloading in case of an error.
-         * @api
-         */
-        load(): void;
-    }
+    /**
+     * Load the image or retry if loading previously failed.
+     * Loading is taken care of by the tile queue, and calling this method is
+     * only needed for preloading or for reloading in case of an error.
+     * @api
+     */
+    load(): void;
+}
 
+/**
+ * @param extent Extent.
+ * @param resolution Resolution.
+ * @param pixelRatio Pixel ratio.
+ * @param state State.
+ * @param attributions Attributions.
+ */
+export class ImageBase extends events.EventTarget {
     /**
      * @param extent Extent.
      * @param resolution Resolution.
@@ -4900,19 +4909,19 @@ declare namespace ol {
      * @param state State.
      * @param attributions Attributions.
      */
-    class ImageBase extends ol.events.EventTarget {
-        /**
-         * @param extent Extent.
-         * @param resolution Resolution.
-         * @param pixelRatio Pixel ratio.
-         * @param state State.
-         * @param attributions Attributions.
-         */
-        constructor(extent: ol.Extent, resolution: (number), pixelRatio: number, state: ol.ImageState, attributions: ol.Attribution[]);
-    }
+    constructor(extent: ol.Extent, resolution: (number), pixelRatio: number, state: ol.ImageState, attributions: ol.Attribution[]);
+}
 
-    type ImageState = number;
+export type ImageState = number;
 
+/**
+ * @param tileCoord Tile coordinate.
+ * @param state State.
+ * @param src Image source URI.
+ * @param crossOrigin Cross origin.
+ * @param tileLoadFunction Tile load function.
+ */
+export class ImageTile extends Tile {
     /**
      * @param tileCoord Tile coordinate.
      * @param state State.
@@ -4920,48 +4929,48 @@ declare namespace ol {
      * @param crossOrigin Cross origin.
      * @param tileLoadFunction Tile load function.
      */
-    class ImageTile extends ol.Tile {
-        /**
-         * @param tileCoord Tile coordinate.
-         * @param state State.
-         * @param src Image source URI.
-         * @param crossOrigin Cross origin.
-         * @param tileLoadFunction Tile load function.
-         */
-        constructor(tileCoord: ol.TileCoord, state: ol.Tile.State, src: string, crossOrigin?: string, tileLoadFunction?: ol.TileLoadFunctionType);
-
-        /**
-         * Get the image element for this tile.
-         * @inheritDoc
-         * @api
-         */
-        getImage(opt_context?: GlobalObject): (HTMLCanvasElement | HTMLImageElement | HTMLVideoElement);
-    }
+    constructor(tileCoord: ol.TileCoord, state: ol.Tile.State, src: string, crossOrigin?: string, tileLoadFunction?: ol.TileLoadFunctionType);
 
     /**
-     * Inherit the prototype methods from one constructor into another.
-     *
-     * Usage:
-     *
-     *     function ParentClass(a, b) { }
-     *     ParentClass.prototype.foo = function(a) { }
-     *
-     *     function ChildClass(a, b, c) {
-     *       // Call parent constructor
-     *       ParentClass.call(this, a, b);
-     *     }
-     *     ol.inherits(ChildClass, ParentClass);
-     *
-     *     var child = new ChildClass('a', 'b', 'see');
-     *     child.foo(); // This works.
-     *
-     * @param childCtor Child constructor.
-     * @param parentCtor Parent constructor.
+     * Get the image element for this tile.
+     * @inheritDoc
      * @api
      */
-    function inherits(childCtor: (() => any), parentCtor: (() => any)): void;
+    getImage(opt_context?: GlobalObject): (HTMLCanvasElement | HTMLImageElement | HTMLVideoElement);
+}
 
-    namespace interaction {
+/**
+ * Inherit the prototype methods from one constructor into another.
+ *
+ * Usage:
+ *
+ *     function ParentClass(a, b) { }
+ *     ParentClass.prototype.foo = function(a) { }
+ *
+ *     function ChildClass(a, b, c) {
+ *       // Call parent constructor
+ *       ParentClass.call(this, a, b);
+ *     }
+ *     ol.inherits(ChildClass, ParentClass);
+ *
+ *     var child = new ChildClass('a', 'b', 'see');
+ *     child.foo(); // This works.
+ *
+ * @param childCtor Child constructor.
+ * @param parentCtor Parent constructor.
+ * @api
+ */
+export function inherits(childCtor: (() => any), parentCtor: (() => any)): void;
+
+export namespace interaction {
+    /**
+     * @classdesc
+     * Allows the user to zoom by double-clicking on the map.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class DoubleClickZoom extends interaction.Interaction {
         /**
          * @classdesc
          * Allows the user to zoom by double-clicking on the map.
@@ -4969,26 +4978,27 @@ declare namespace ol {
          * @param opt_options Options.
          * @api stable
          */
-        class DoubleClickZoom extends ol.interaction.Interaction {
-            /**
-             * @classdesc
-             * Allows the user to zoom by double-clicking on the map.
-             *
-             * @param opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.interaction.DoubleClickZoomOptions);
+        constructor(opt_options?: olx.interaction.DoubleClickZoomOptions);
 
-            /**
-             * Handles the {@link ol.MapBrowserEvent map browser event} (if it was a
-             * doubleclick) and eventually zooms the map.
-             * @param mapBrowserEvent Map browser event.
-             * @return `false` to stop event propagation.
-             * @api
-             */
-            static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-        }
+        /**
+         * Handles the {@link ol.MapBrowserEvent map browser event} (if it was a
+         * doubleclick) and eventually zooms the map.
+         * @param mapBrowserEvent Map browser event.
+         * @return `false` to stop event propagation.
+         * @api
+         */
+        static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
+    }
 
+    /**
+     * @classdesc
+     * Handles input of vector data by drag and drop.
+     *
+     * @fires ol.interaction.DragAndDropEvent
+     * @param opt_options Options.
+     * @api stable
+     */
+    class DragAndDrop extends interaction.Interaction {
         /**
          * @classdesc
          * Handles input of vector data by drag and drop.
@@ -4997,28 +5007,30 @@ declare namespace ol {
          * @param opt_options Options.
          * @api stable
          */
-        class DragAndDrop extends ol.interaction.Interaction {
-            /**
-             * @classdesc
-             * Handles input of vector data by drag and drop.
-             *
-             * @fires ol.interaction.DragAndDropEvent
-             * @param opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.interaction.DragAndDropOptions);
+        constructor(opt_options?: olx.interaction.DragAndDropOptions);
 
-            /**
-             * Handles the {@link ol.MapBrowserEvent map browser event} unconditionally and
-             * neither prevents the browser default nor stops event propagation.
-             * @param mapBrowserEvent Map browser event.
-             * @return `false` to stop event propagation.
-             * @api
-             */
-            static handleEvent: any;
-        }
+        /**
+         * Handles the {@link ol.MapBrowserEvent map browser event} unconditionally and
+         * neither prevents the browser default nor stops event propagation.
+         * @param mapBrowserEvent Map browser event.
+         * @return `false` to stop event propagation.
+         * @api
+         */
+        static handleEvent: any;
+    }
 
-        namespace DragAndDrop {
+    namespace DragAndDrop {
+        /**
+         * @classdesc
+         * Events emitted by {@link ol.interaction.DragAndDrop} instances are instances
+         * of this type.
+         *
+         * @param type Type.
+         * @param file File.
+         * @param opt_features Features.
+         * @param opt_projection Projection.
+         */
+        class Event extends events.Event {
             /**
              * @classdesc
              * Events emitted by {@link ol.interaction.DragAndDrop} instances are instances
@@ -5029,41 +5041,46 @@ declare namespace ol {
              * @param opt_features Features.
              * @param opt_projection Projection.
              */
-            class Event extends ol.events.Event {
-                /**
-                 * @classdesc
-                 * Events emitted by {@link ol.interaction.DragAndDrop} instances are instances
-                 * of this type.
-                 *
-                 * @param type Type.
-                 * @param file File.
-                 * @param opt_features Features.
-                 * @param opt_projection Projection.
-                 */
-                constructor(type: ol.interaction.DragAndDropEventType, file: File, opt_features?: ol.Feature[], opt_projection?: ol.proj.Projection);
+            constructor(type: ol.interaction.DragAndDropEventType, file: File, opt_features?: ol.Feature[], opt_projection?: ol.proj.Projection);
 
-                /**
-                 * The features parsed from dropped data.
-                 * @api stable
-                 */
-                features: ol.Feature[];
+            /**
+             * The features parsed from dropped data.
+             * @api stable
+             */
+            features: ol.Feature[];
 
-                /**
-                 * The dropped file.
-                 * @api stable
-                 */
-                file: File;
+            /**
+             * The dropped file.
+             * @api stable
+             */
+            file: File;
 
-                /**
-                 * The feature projection.
-                 * @api
-                 */
-                projection: ol.proj.Projection;
-            }
+            /**
+             * The feature projection.
+             * @api
+             */
+            projection: ol.proj.Projection;
         }
+    }
 
-        type DragAndDropEventType = string;
+    type DragAndDropEventType = string;
 
+    /**
+     * @classdesc
+     * Allows the user to draw a vector box by clicking and dragging on the map,
+     * normally combined with an {@link ol.events.condition} that limits
+     * it to when the shift or other key is held down. This is used, for example,
+     * for zooming to a specific area of the map
+     * (see {@link ol.interaction.DragZoom} and
+     * {@link ol.interaction.DragRotateAndZoom}).
+     *
+     * This interaction is only supported for mouse devices.
+     *
+     * @fires ol.DragBoxEvent
+     * @param opt_options Options.
+     * @api stable
+     */
+    class DragBox extends interaction.Pointer {
         /**
          * @classdesc
          * Allows the user to draw a vector box by clicking and dragging on the map,
@@ -5079,33 +5096,27 @@ declare namespace ol {
          * @param opt_options Options.
          * @api stable
          */
-        class DragBox extends ol.interaction.Pointer {
-            /**
-             * @classdesc
-             * Allows the user to draw a vector box by clicking and dragging on the map,
-             * normally combined with an {@link ol.events.condition} that limits
-             * it to when the shift or other key is held down. This is used, for example,
-             * for zooming to a specific area of the map
-             * (see {@link ol.interaction.DragZoom} and
-             * {@link ol.interaction.DragRotateAndZoom}).
-             *
-             * This interaction is only supported for mouse devices.
-             *
-             * @fires ol.DragBoxEvent
-             * @param opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.interaction.DragBoxOptions);
+        constructor(opt_options?: olx.interaction.DragBoxOptions);
 
-            /**
-             * Returns geometry of last drawn box.
-             * @return Geometry.
-             * @api stable
-             */
-            getGeometry(): ol.geom.Polygon;
-        }
+        /**
+         * Returns geometry of last drawn box.
+         * @return Geometry.
+         * @api stable
+         */
+        getGeometry(): ol.geom.Polygon;
+    }
 
-        namespace DragBox {
+    namespace DragBox {
+        /**
+         * @classdesc
+         * Events emitted by {@link ol.interaction.DragBox} instances are instances of
+         * this type.
+         *
+         * @param type The event type.
+         * @param coordinate The event coordinate.
+         * @param mapBrowserEvent Originating event.
+         */
+        class Event extends events.Event {
             /**
              * @classdesc
              * Events emitted by {@link ol.interaction.DragBox} instances are instances of
@@ -5115,35 +5126,33 @@ declare namespace ol {
              * @param coordinate The event coordinate.
              * @param mapBrowserEvent Originating event.
              */
-            class Event extends ol.events.Event {
-                /**
-                 * @classdesc
-                 * Events emitted by {@link ol.interaction.DragBox} instances are instances of
-                 * this type.
-                 *
-                 * @param type The event type.
-                 * @param coordinate The event coordinate.
-                 * @param mapBrowserEvent Originating event.
-                 */
-                constructor(type: string, coordinate: ol.Coordinate, mapBrowserEvent: ol.MapBrowserEvent);
+            constructor(type: string, coordinate: ol.Coordinate, mapBrowserEvent: ol.MapBrowserEvent);
 
-                /**
-                 * The coordinate of the drag event.
-                 * @const
-                 * @api stable
-                 */
-                coordinate: ol.Coordinate;
+            /**
+             * The coordinate of the drag event.
+             * @const
+             * @api stable
+             */
+            coordinate: ol.Coordinate;
 
-                /**
-                 * @const
-                 * @api
-                 */
-                mapBrowserEvent: ol.MapBrowserEvent;
-            }
+            /**
+             * @const
+             * @api
+             */
+            mapBrowserEvent: ol.MapBrowserEvent;
         }
+    }
 
-        type DragBoxEventType = string;
+    type DragBoxEventType = string;
 
+    /**
+     * @classdesc
+     * Allows the user to pan the map by dragging the map.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class DragPan extends interaction.Pointer {
         /**
          * @classdesc
          * Allows the user to pan the map by dragging the map.
@@ -5151,17 +5160,21 @@ declare namespace ol {
          * @param opt_options Options.
          * @api stable
          */
-        class DragPan extends ol.interaction.Pointer {
-            /**
-             * @classdesc
-             * Allows the user to pan the map by dragging the map.
-             *
-             * @param opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.interaction.DragPanOptions);
-        }
+        constructor(opt_options?: olx.interaction.DragPanOptions);
+    }
 
+    /**
+     * @classdesc
+     * Allows the user to rotate the map by clicking and dragging on the map,
+     * normally combined with an {@link ol.events.condition} that limits
+     * it to when the alt and shift keys are held down.
+     *
+     * This interaction is only supported for mouse devices.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class DragRotate extends interaction.Pointer {
         /**
          * @classdesc
          * Allows the user to rotate the map by clicking and dragging on the map,
@@ -5173,21 +5186,23 @@ declare namespace ol {
          * @param opt_options Options.
          * @api stable
          */
-        class DragRotate extends ol.interaction.Pointer {
-            /**
-             * @classdesc
-             * Allows the user to rotate the map by clicking and dragging on the map,
-             * normally combined with an {@link ol.events.condition} that limits
-             * it to when the alt and shift keys are held down.
-             *
-             * This interaction is only supported for mouse devices.
-             *
-             * @param opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.interaction.DragRotateOptions);
-        }
+        constructor(opt_options?: olx.interaction.DragRotateOptions);
+    }
 
+    /**
+     * @classdesc
+     * Allows the user to zoom and rotate the map by clicking and dragging
+     * on the map.  By default, this interaction is limited to when the shift
+     * key is held down.
+     *
+     * This interaction is only supported for mouse devices.
+     *
+     * And this interaction is not included in the default interactions.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class DragRotateAndZoom extends interaction.Pointer {
         /**
          * @classdesc
          * Allows the user to zoom and rotate the map by clicking and dragging
@@ -5201,23 +5216,22 @@ declare namespace ol {
          * @param opt_options Options.
          * @api stable
          */
-        class DragRotateAndZoom extends ol.interaction.Pointer {
-            /**
-             * @classdesc
-             * Allows the user to zoom and rotate the map by clicking and dragging
-             * on the map.  By default, this interaction is limited to when the shift
-             * key is held down.
-             *
-             * This interaction is only supported for mouse devices.
-             *
-             * And this interaction is not included in the default interactions.
-             *
-             * @param opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.interaction.DragRotateAndZoomOptions);
-        }
+        constructor(opt_options?: olx.interaction.DragRotateAndZoomOptions);
+    }
 
+    /**
+     * @classdesc
+     * Allows the user to zoom the map by clicking and dragging on the map,
+     * normally combined with an {@link ol.events.condition} that limits
+     * it to when a key, shift by default, is held down.
+     *
+     * To change the style of the box, use CSS and the `.ol-dragzoom` selector, or
+     * your custom one configured with `className`.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class DragZoom extends interaction.DragBox {
         /**
          * @classdesc
          * Allows the user to zoom the map by clicking and dragging on the map,
@@ -5230,23 +5244,19 @@ declare namespace ol {
          * @param opt_options Options.
          * @api stable
          */
-        class DragZoom extends ol.interaction.DragBox {
-            /**
-             * @classdesc
-             * Allows the user to zoom the map by clicking and dragging on the map,
-             * normally combined with an {@link ol.events.condition} that limits
-             * it to when a key, shift by default, is held down.
-             *
-             * To change the style of the box, use CSS and the `.ol-dragzoom` selector, or
-             * your custom one configured with `className`.
-             *
-             * @param opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.interaction.DragZoomOptions);
-        }
+        constructor(opt_options?: olx.interaction.DragZoomOptions);
+    }
 
-        namespace Draw {
+    namespace Draw {
+        /**
+         * @classdesc
+         * Events emitted by {@link ol.interaction.Draw} instances are instances of
+         * this type.
+         *
+         * @param type Type.
+         * @param feature The feature drawn.
+         */
+        class Event extends events.Event {
             /**
              * @classdesc
              * Events emitted by {@link ol.interaction.Draw} instances are instances of
@@ -5255,27 +5265,27 @@ declare namespace ol {
              * @param type Type.
              * @param feature The feature drawn.
              */
-            class Event extends ol.events.Event {
-                /**
-                 * @classdesc
-                 * Events emitted by {@link ol.interaction.Draw} instances are instances of
-                 * this type.
-                 *
-                 * @param type Type.
-                 * @param feature The feature drawn.
-                 */
-                constructor(type: ol.interaction.DrawEventType, feature: ol.Feature);
+            constructor(type: ol.interaction.DrawEventType, feature: ol.Feature);
 
-                /**
-                 * The feature being drawn.
-                 * @api stable
-                 */
-                feature: ol.Feature;
-            }
+            /**
+             * The feature being drawn.
+             * @api stable
+             */
+            feature: ol.Feature;
         }
+    }
 
-        type DrawEventType = string;
+    type DrawEventType = string;
 
+    /**
+     * @classdesc
+     * Interaction for drawing feature geometries.
+     *
+     * @fires ol.interaction.DrawEvent
+     * @param options Options.
+     * @api stable
+     */
+    class Draw extends interaction.Pointer {
         /**
          * @classdesc
          * Interaction for drawing feature geometries.
@@ -5284,90 +5294,97 @@ declare namespace ol {
          * @param options Options.
          * @api stable
          */
-        class Draw extends ol.interaction.Pointer {
-            /**
-             * @classdesc
-             * Interaction for drawing feature geometries.
-             *
-             * @fires ol.interaction.DrawEvent
-             * @param options Options.
-             * @api stable
-             */
-            constructor(options: olx.interaction.DrawOptions);
-
-            /**
-             * Remove last point of the feature currently being drawn.
-             * @api
-             */
-            removeLastPoint(): void;
-
-            /**
-             * Stop drawing and add the sketch feature to the target layer.
-             * The {@link ol.interaction.DrawEventType.DRAWEND} event is dispatched before
-             * inserting the feature.
-             * @api
-             */
-            finishDrawing(): void;
-
-            /**
-             * Extend an existing geometry by adding additional points. This only works
-             * on features with `LineString` geometries, where the interaction will
-             * extend lines by adding points to the end of the coordinates array.
-             * @param feature Feature to be extended.
-             * @api
-             */
-            extend(feature: ol.Feature): void;
-
-            /**
-             * Create a `geometryFunction` that will create a box-shaped polygon (aligned
-             * with the coordinate system axes).  Use this with the draw interaction and
-             * `type: 'Circle'` to return a box instead of a circle geometry.
-             * @return Function that draws a box-shaped polygon.
-             * @api
-             */
-            static createBox(): ol.DrawGeometryFunctionType;
-
-            /**
-             * Create a `geometryFunction` for `mode: 'Circle'` that will create a regular
-             * polygon with a user specified number of sides and start angle instead of an
-             * `ol.geom.Circle` geometry.
-             * @param opt_sides Number of sides of the regular polygon. Default is
-             *     32.
-             * @param opt_angle Angle of the first point in radians. 0 means East.
-             *     Default is the angle defined by the heading from the center of the
-             *     regular polygon to the current pointer position.
-             * @return Function that draws a
-             *     polygon.
-             * @api
-             */
-            static createRegularPolygon(opt_sides?: number, opt_angle?: number): ol.DrawGeometryFunctionType;
-        }
+        constructor(options: olx.interaction.DrawOptions);
 
         /**
-         * Set of interactions included in maps by default. Specific interactions can be
-         * excluded by setting the appropriate option to false in the constructor
-         * options, but the order of the interactions is fixed.  If you want to specify
-         * a different order for interactions, you will need to create your own
-         * {@link ol.interaction.Interaction} instances and insert them into a
-         * {@link ol.Collection} in the order you want before creating your
-         * {@link ol.Map} instance. The default set of interactions, in sequence, is:
-         * * {@link ol.interaction.DragRotate}
-         * * {@link ol.interaction.DoubleClickZoom}
-         * * {@link ol.interaction.DragPan}
-         * * {@link ol.interaction.PinchRotate}
-         * * {@link ol.interaction.PinchZoom}
-         * * {@link ol.interaction.KeyboardPan}
-         * * {@link ol.interaction.KeyboardZoom}
-         * * {@link ol.interaction.MouseWheelZoom}
-         * * {@link ol.interaction.DragZoom}
-         *
-         * @param opt_options Defaults options.
-         * @return A collection of
-         * interactions to be used with the ol.Map constructor's interactions option.
-         * @api stable
+         * Remove last point of the feature currently being drawn.
+         * @api
          */
-        function defaults(opt_options?: olx.interaction.DefaultsOptions): ol.Collection<ol.interaction.Interaction>;
+        removeLastPoint(): void;
 
+        /**
+         * Stop drawing and add the sketch feature to the target layer.
+         * The {@link ol.interaction.DrawEventType.DRAWEND} event is dispatched before
+         * inserting the feature.
+         * @api
+         */
+        finishDrawing(): void;
+
+        /**
+         * Extend an existing geometry by adding additional points. This only works
+         * on features with `LineString` geometries, where the interaction will
+         * extend lines by adding points to the end of the coordinates array.
+         * @param feature Feature to be extended.
+         * @api
+         */
+        extend(feature: ol.Feature): void;
+
+        /**
+         * Create a `geometryFunction` that will create a box-shaped polygon (aligned
+         * with the coordinate system axes).  Use this with the draw interaction and
+         * `type: 'Circle'` to return a box instead of a circle geometry.
+         * @return Function that draws a box-shaped polygon.
+         * @api
+         */
+        static createBox(): ol.DrawGeometryFunctionType;
+
+        /**
+         * Create a `geometryFunction` for `mode: 'Circle'` that will create a regular
+         * polygon with a user specified number of sides and start angle instead of an
+         * `ol.geom.Circle` geometry.
+         * @param opt_sides Number of sides of the regular polygon. Default is
+         *     32.
+         * @param opt_angle Angle of the first point in radians. 0 means East.
+         *     Default is the angle defined by the heading from the center of the
+         *     regular polygon to the current pointer position.
+         * @return Function that draws a
+         *     polygon.
+         * @api
+         */
+        static createRegularPolygon(opt_sides?: number, opt_angle?: number): ol.DrawGeometryFunctionType;
+    }
+
+    /**
+     * Set of interactions included in maps by default. Specific interactions can be
+     * excluded by setting the appropriate option to false in the constructor
+     * options, but the order of the interactions is fixed.  If you want to specify
+     * a different order for interactions, you will need to create your own
+     * {@link ol.interaction.Interaction} instances and insert them into a
+     * {@link ol.Collection} in the order you want before creating your
+     * {@link ol.Map} instance. The default set of interactions, in sequence, is:
+     * * {@link ol.interaction.DragRotate}
+     * * {@link ol.interaction.DoubleClickZoom}
+     * * {@link ol.interaction.DragPan}
+     * * {@link ol.interaction.PinchRotate}
+     * * {@link ol.interaction.PinchZoom}
+     * * {@link ol.interaction.KeyboardPan}
+     * * {@link ol.interaction.KeyboardZoom}
+     * * {@link ol.interaction.MouseWheelZoom}
+     * * {@link ol.interaction.DragZoom}
+     *
+     * @param opt_options Defaults options.
+     * @return A collection of
+     * interactions to be used with the ol.Map constructor's interactions option.
+     * @api stable
+     */
+    function defaults(opt_options?: olx.interaction.DefaultsOptions): ol.Collection<ol.interaction.Interaction>;
+
+    /**
+     * @classdesc
+     * Abstract base class; normally only used for creating subclasses and not
+     * instantiated in apps.
+     * User actions that change the state of the map. Some are similar to controls,
+     * but are not associated with a DOM element.
+     * For example, {@link ol.interaction.KeyboardZoom} is functionally the same as
+     * {@link ol.control.Zoom}, but triggered by a keyboard event not a button
+     * element event.
+     * Although interactions do not have a DOM element, some of them do render
+     * vectors and so are visible on the screen.
+     *
+     * @param options Options.
+     * @api
+     */
+    class Interaction extends Object {
         /**
          * @classdesc
          * Abstract base class; normally only used for creating subclasses and not
@@ -5383,48 +5400,48 @@ declare namespace ol {
          * @param options Options.
          * @api
          */
-        class Interaction extends ol.Object {
-            /**
-             * @classdesc
-             * Abstract base class; normally only used for creating subclasses and not
-             * instantiated in apps.
-             * User actions that change the state of the map. Some are similar to controls,
-             * but are not associated with a DOM element.
-             * For example, {@link ol.interaction.KeyboardZoom} is functionally the same as
-             * {@link ol.control.Zoom}, but triggered by a keyboard event not a button
-             * element event.
-             * Although interactions do not have a DOM element, some of them do render
-             * vectors and so are visible on the screen.
-             *
-             * @param options Options.
-             * @api
-             */
-            constructor(options: olx.interaction.InteractionOptions);
+        constructor(options: olx.interaction.InteractionOptions);
 
-            /**
-             * Return whether the interaction is currently active.
-             * @return `true` if the interaction is active, `false` otherwise.
-             * @observable
-             * @api
-             */
-            getActive(): boolean;
+        /**
+         * Return whether the interaction is currently active.
+         * @return `true` if the interaction is active, `false` otherwise.
+         * @observable
+         * @api
+         */
+        getActive(): boolean;
 
-            /**
-             * Get the map associated with this interaction.
-             * @return Map.
-             * @api
-             */
-            getMap(): ol.Map;
+        /**
+         * Get the map associated with this interaction.
+         * @return Map.
+         * @api
+         */
+        getMap(): ol.Map;
 
-            /**
-             * Activate or deactivate the interaction.
-             * @param active Active.
-             * @observable
-             * @api
-             */
-            setActive(active: boolean): void;
-        }
+        /**
+         * Activate or deactivate the interaction.
+         * @param active Active.
+         * @observable
+         * @api
+         */
+        setActive(active: boolean): void;
+    }
 
+    /**
+     * @classdesc
+     * Allows the user to pan the map using keyboard arrows.
+     * Note that, although this interaction is by default included in maps,
+     * the keys can only be used when browser focus is on the element to which
+     * the keyboard events are attached. By default, this is the map div,
+     * though you can change this with the `keyboardEventTarget` in
+     * {@link ol.Map}. `document` never loses focus but, for any other element,
+     * focus will have to be on, and returned to, this element if the keys are to
+     * function.
+     * See also {@link ol.interaction.KeyboardZoom}.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class KeyboardPan extends interaction.Interaction {
         /**
          * @classdesc
          * Allows the user to pan the map using keyboard arrows.
@@ -5440,35 +5457,35 @@ declare namespace ol {
          * @param opt_options Options.
          * @api stable
          */
-        class KeyboardPan extends ol.interaction.Interaction {
-            /**
-             * @classdesc
-             * Allows the user to pan the map using keyboard arrows.
-             * Note that, although this interaction is by default included in maps,
-             * the keys can only be used when browser focus is on the element to which
-             * the keyboard events are attached. By default, this is the map div,
-             * though you can change this with the `keyboardEventTarget` in
-             * {@link ol.Map}. `document` never loses focus but, for any other element,
-             * focus will have to be on, and returned to, this element if the keys are to
-             * function.
-             * See also {@link ol.interaction.KeyboardZoom}.
-             *
-             * @param opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.interaction.KeyboardPanOptions);
+        constructor(opt_options?: olx.interaction.KeyboardPanOptions);
 
-            /**
-             * Handles the {@link ol.MapBrowserEvent map browser event} if it was a
-             * `KeyEvent`, and decides the direction to pan to (if an arrow key was
-             * pressed).
-             * @param mapBrowserEvent Map browser event.
-             * @return `false` to stop event propagation.
-             * @api
-             */
-            static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-        }
+        /**
+         * Handles the {@link ol.MapBrowserEvent map browser event} if it was a
+         * `KeyEvent`, and decides the direction to pan to (if an arrow key was
+         * pressed).
+         * @param mapBrowserEvent Map browser event.
+         * @return `false` to stop event propagation.
+         * @api
+         */
+        static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
+    }
 
+    /**
+     * @classdesc
+     * Allows the user to zoom the map using keyboard + and -.
+     * Note that, although this interaction is by default included in maps,
+     * the keys can only be used when browser focus is on the element to which
+     * the keyboard events are attached. By default, this is the map div,
+     * though you can change this with the `keyboardEventTarget` in
+     * {@link ol.Map}. `document` never loses focus but, for any other element,
+     * focus will have to be on, and returned to, this element if the keys are to
+     * function.
+     * See also {@link ol.interaction.KeyboardPan}.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class KeyboardZoom extends interaction.Interaction {
         /**
          * @classdesc
          * Allows the user to zoom the map using keyboard + and -.
@@ -5484,36 +5501,31 @@ declare namespace ol {
          * @param opt_options Options.
          * @api stable
          */
-        class KeyboardZoom extends ol.interaction.Interaction {
-            /**
-             * @classdesc
-             * Allows the user to zoom the map using keyboard + and -.
-             * Note that, although this interaction is by default included in maps,
-             * the keys can only be used when browser focus is on the element to which
-             * the keyboard events are attached. By default, this is the map div,
-             * though you can change this with the `keyboardEventTarget` in
-             * {@link ol.Map}. `document` never loses focus but, for any other element,
-             * focus will have to be on, and returned to, this element if the keys are to
-             * function.
-             * See also {@link ol.interaction.KeyboardPan}.
-             *
-             * @param opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.interaction.KeyboardZoomOptions);
+        constructor(opt_options?: olx.interaction.KeyboardZoomOptions);
 
-            /**
-             * Handles the {@link ol.MapBrowserEvent map browser event} if it was a
-             * `KeyEvent`, and decides whether to zoom in or out (depending on whether the
-             * key pressed was '+' or '-').
-             * @param mapBrowserEvent Map browser event.
-             * @return `false` to stop event propagation.
-             * @api
-             */
-            static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-        }
+        /**
+         * Handles the {@link ol.MapBrowserEvent map browser event} if it was a
+         * `KeyEvent`, and decides whether to zoom in or out (depending on whether the
+         * key pressed was '+' or '-').
+         * @param mapBrowserEvent Map browser event.
+         * @return `false` to stop event propagation.
+         * @api
+         */
+        static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
+    }
 
-        namespace Modify {
+    namespace Modify {
+        /**
+         * @classdesc
+         * Events emitted by {@link ol.interaction.Modify} instances are instances of
+         * this type.
+         *
+         * @param type Type.
+         * @param features The features modified.
+         * @param mapBrowserPointerEvent Associated
+         *     {@link ol.MapBrowserPointerEvent}.
+         */
+        class Event extends events.Event {
             /**
              * @classdesc
              * Events emitted by {@link ol.interaction.Modify} instances are instances of
@@ -5524,33 +5536,31 @@ declare namespace ol {
              * @param mapBrowserPointerEvent Associated
              *     {@link ol.MapBrowserPointerEvent}.
              */
-            class Event extends ol.events.Event {
-                /**
-                 * @classdesc
-                 * Events emitted by {@link ol.interaction.Modify} instances are instances of
-                 * this type.
-                 *
-                 * @param type Type.
-                 * @param features The features modified.
-                 * @param mapBrowserPointerEvent Associated
-                 *     {@link ol.MapBrowserPointerEvent}.
-                 */
-                constructor(type: ol.ModifyEventType, features: ol.Collection<ol.Feature>, mapBrowserPointerEvent: ol.MapBrowserPointerEvent);
+            constructor(type: ol.ModifyEventType, features: ol.Collection<ol.Feature>, mapBrowserPointerEvent: ol.MapBrowserPointerEvent);
 
-                /**
-                 * The features being modified.
-                 * @api
-                 */
-                features: ol.Collection<ol.Feature>;
+            /**
+             * The features being modified.
+             * @api
+             */
+            features: ol.Collection<ol.Feature>;
 
-                /**
-                 * Associated {@link ol.MapBrowserEvent}.
-                 * @api
-                 */
-                mapBrowserEvent: ol.MapBrowserEvent;
-            }
+            /**
+             * Associated {@link ol.MapBrowserEvent}.
+             * @api
+             */
+            mapBrowserEvent: ol.MapBrowserEvent;
         }
+    }
 
+    /**
+     * @classdesc
+     * Interaction for modifying feature geometries.
+     *
+     * @param options Options.
+     * @fires ol.interaction.ModifyEvent
+     * @api
+     */
+    class Modify extends interaction.Pointer {
         /**
          * @classdesc
          * Interaction for modifying feature geometries.
@@ -5559,25 +5569,24 @@ declare namespace ol {
          * @fires ol.interaction.ModifyEvent
          * @api
          */
-        class Modify extends ol.interaction.Pointer {
-            /**
-             * @classdesc
-             * Interaction for modifying feature geometries.
-             *
-             * @param options Options.
-             * @fires ol.interaction.ModifyEvent
-             * @api
-             */
-            constructor(options: olx.interaction.ModifyOptions);
+        constructor(options: olx.interaction.ModifyOptions);
 
-            /**
-             * Removes the vertex currently being pointed.
-             * @return True when a vertex was removed.
-             * @api
-             */
-            removePoint(): boolean;
-        }
+        /**
+         * Removes the vertex currently being pointed.
+         * @return True when a vertex was removed.
+         * @api
+         */
+        removePoint(): boolean;
+    }
 
+    /**
+     * @classdesc
+     * Allows the user to zoom the map by scrolling the mouse wheel.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class MouseWheelZoom extends interaction.Interaction {
         /**
          * @classdesc
          * Allows the user to zoom the map by scrolling the mouse wheel.
@@ -5585,34 +5594,35 @@ declare namespace ol {
          * @param opt_options Options.
          * @api stable
          */
-        class MouseWheelZoom extends ol.interaction.Interaction {
-            /**
-             * @classdesc
-             * Allows the user to zoom the map by scrolling the mouse wheel.
-             *
-             * @param opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.interaction.MouseWheelZoomOptions);
+        constructor(opt_options?: olx.interaction.MouseWheelZoomOptions);
 
-            /**
-             * Handles the {@link ol.MapBrowserEvent map browser event} (if it was a
-             * mousewheel-event) and eventually zooms the map.
-             * @param mapBrowserEvent Map browser event.
-             * @return `false` to stop event propagation.
-             * @api
-             */
-            static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
+        /**
+         * Handles the {@link ol.MapBrowserEvent map browser event} (if it was a
+         * mousewheel-event) and eventually zooms the map.
+         * @param mapBrowserEvent Map browser event.
+         * @return `false` to stop event propagation.
+         * @api
+         */
+        static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
 
-            /**
-             * Enable or disable using the mouse's location as an anchor when zooming
-             * @param useAnchor true to zoom to the mouse's location, false
-             * to zoom to the center of the map
-             * @api
-             */
-            setMouseAnchor(useAnchor: boolean): void;
-        }
+        /**
+         * Enable or disable using the mouse's location as an anchor when zooming
+         * @param useAnchor true to zoom to the mouse's location, false
+         * to zoom to the center of the map
+         * @api
+         */
+        setMouseAnchor(useAnchor: boolean): void;
+    }
 
+    /**
+     * @classdesc
+     * Allows the user to rotate the map by twisting with two fingers
+     * on a touch screen.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class PinchRotate extends interaction.Pointer {
         /**
          * @classdesc
          * Allows the user to rotate the map by twisting with two fingers
@@ -5621,18 +5631,18 @@ declare namespace ol {
          * @param opt_options Options.
          * @api stable
          */
-        class PinchRotate extends ol.interaction.Pointer {
-            /**
-             * @classdesc
-             * Allows the user to rotate the map by twisting with two fingers
-             * on a touch screen.
-             *
-             * @param opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.interaction.PinchRotateOptions);
-        }
+        constructor(opt_options?: olx.interaction.PinchRotateOptions);
+    }
 
+    /**
+     * @classdesc
+     * Allows the user to zoom the map by pinching with two fingers
+     * on a touch screen.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class PinchZoom extends interaction.Pointer {
         /**
          * @classdesc
          * Allows the user to zoom the map by pinching with two fingers
@@ -5641,18 +5651,23 @@ declare namespace ol {
          * @param opt_options Options.
          * @api stable
          */
-        class PinchZoom extends ol.interaction.Pointer {
-            /**
-             * @classdesc
-             * Allows the user to zoom the map by pinching with two fingers
-             * on a touch screen.
-             *
-             * @param opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.interaction.PinchZoomOptions);
-        }
+        constructor(opt_options?: olx.interaction.PinchZoomOptions);
+    }
 
+    /**
+     * @classdesc
+     * Base class that calls user-defined functions on `down`, `move` and `up`
+     * events. This class also manages "drag sequences".
+     *
+     * When the `handleDownEvent` user function returns `true` a drag sequence is
+     * started. During a drag sequence the `handleDragEvent` user function is
+     * called on `move` events. The drag sequence ends when the `handleUpEvent`
+     * user function is called and returns `false`.
+     *
+     * @param opt_options Options.
+     * @api
+     */
+    class Pointer extends interaction.Interaction {
         /**
          * @classdesc
          * Base class that calls user-defined functions on `down`, `move` and `up`
@@ -5666,34 +5681,32 @@ declare namespace ol {
          * @param opt_options Options.
          * @api
          */
-        class Pointer extends ol.interaction.Interaction {
-            /**
-             * @classdesc
-             * Base class that calls user-defined functions on `down`, `move` and `up`
-             * events. This class also manages "drag sequences".
-             *
-             * When the `handleDownEvent` user function returns `true` a drag sequence is
-             * started. During a drag sequence the `handleDragEvent` user function is
-             * called on `move` events. The drag sequence ends when the `handleUpEvent`
-             * user function is called and returns `false`.
-             *
-             * @param opt_options Options.
-             * @api
-             */
-            constructor(opt_options?: olx.interaction.PointerOptions);
+        constructor(opt_options?: olx.interaction.PointerOptions);
 
-            /**
-             * Handles the {@link ol.MapBrowserEvent map browser event} and may call into
-             * other functions, if event sequences like e.g. 'drag' or 'down-up' etc. are
-             * detected.
-             * @param mapBrowserEvent Map browser event.
-             * @return `false` to stop event propagation.
-             * @api
-             */
-            static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
-        }
+        /**
+         * Handles the {@link ol.MapBrowserEvent map browser event} and may call into
+         * other functions, if event sequences like e.g. 'drag' or 'down-up' etc. are
+         * detected.
+         * @param mapBrowserEvent Map browser event.
+         * @return `false` to stop event propagation.
+         * @api
+         */
+        static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
+    }
 
-        namespace Select {
+    namespace Select {
+        /**
+         * @classdesc
+         * Events emitted by {@link ol.interaction.Select} instances are instances of
+         * this type.
+         *
+         * @param type The event type.
+         * @param selected Selected features.
+         * @param deselected Deselected features.
+         * @param mapBrowserEvent Associated
+         *     {@link ol.MapBrowserEvent}.
+         */
+        class Event extends events.Event {
             /**
              * @classdesc
              * Events emitted by {@link ol.interaction.Select} instances are instances of
@@ -5705,40 +5718,45 @@ declare namespace ol {
              * @param mapBrowserEvent Associated
              *     {@link ol.MapBrowserEvent}.
              */
-            class Event extends ol.events.Event {
-                /**
-                 * @classdesc
-                 * Events emitted by {@link ol.interaction.Select} instances are instances of
-                 * this type.
-                 *
-                 * @param type The event type.
-                 * @param selected Selected features.
-                 * @param deselected Deselected features.
-                 * @param mapBrowserEvent Associated
-                 *     {@link ol.MapBrowserEvent}.
-                 */
-                constructor(type: string, selected: ol.Feature[], deselected: ol.Feature[], mapBrowserEvent: ol.MapBrowserEvent);
+            constructor(type: string, selected: ol.Feature[], deselected: ol.Feature[], mapBrowserEvent: ol.MapBrowserEvent);
 
-                /**
-                 * Selected features array.
-                 * @api
-                 */
-                selected: ol.Feature[];
+            /**
+             * Selected features array.
+             * @api
+             */
+            selected: ol.Feature[];
 
-                /**
-                 * Deselected features array.
-                 * @api
-                 */
-                deselected: ol.Feature[];
+            /**
+             * Deselected features array.
+             * @api
+             */
+            deselected: ol.Feature[];
 
-                /**
-                 * Associated {@link ol.MapBrowserEvent}.
-                 * @api
-                 */
-                mapBrowserEvent: ol.MapBrowserEvent;
-            }
+            /**
+             * Associated {@link ol.MapBrowserEvent}.
+             * @api
+             */
+            mapBrowserEvent: ol.MapBrowserEvent;
         }
+    }
 
+    /**
+     * @classdesc
+     * Interaction for selecting vector features. By default, selected features are
+     * styled differently, so this interaction can be used for visual highlighting,
+     * as well as selecting features for other actions, such as modification or
+     * output. There are three ways of controlling which features are selected:
+     * using the browser event as defined by the `condition` and optionally the
+     * `toggle`, `add`/`remove`, and `multi` options; a `layers` filter; and a
+     * further feature filter using the `filter` option.
+     *
+     * Selected features are added to an internal unmanaged layer.
+     *
+     * @param opt_options Options.
+     * @fires ol.interaction.SelectEvent
+     * @api stable
+     */
+    class Select extends interaction.Interaction {
         /**
          * @classdesc
          * Interaction for selecting vector features. By default, selected features are
@@ -5755,61 +5773,65 @@ declare namespace ol {
          * @fires ol.interaction.SelectEvent
          * @api stable
          */
-        class Select extends ol.interaction.Interaction {
-            /**
-             * @classdesc
-             * Interaction for selecting vector features. By default, selected features are
-             * styled differently, so this interaction can be used for visual highlighting,
-             * as well as selecting features for other actions, such as modification or
-             * output. There are three ways of controlling which features are selected:
-             * using the browser event as defined by the `condition` and optionally the
-             * `toggle`, `add`/`remove`, and `multi` options; a `layers` filter; and a
-             * further feature filter using the `filter` option.
-             *
-             * Selected features are added to an internal unmanaged layer.
-             *
-             * @param opt_options Options.
-             * @fires ol.interaction.SelectEvent
-             * @api stable
-             */
-            constructor(opt_options?: olx.interaction.SelectOptions);
+        constructor(opt_options?: olx.interaction.SelectOptions);
 
-            /**
-             * Get the selected features.
-             * @return Features collection.
-             * @api stable
-             */
-            getFeatures(): ol.Collection<ol.Feature>;
+        /**
+         * Get the selected features.
+         * @return Features collection.
+         * @api stable
+         */
+        getFeatures(): ol.Collection<ol.Feature>;
 
-            /**
-             * Returns the associated {@link ol.layer.Vector vectorlayer} of
-             * the (last) selected feature. Note that this will not work with any
-             * programmatic method like pushing features to
-             * {@link ol.interaction.Select#getFeatures collection}.
-             * @param feature Feature
-             * @return Layer.
-             * @api
-             */
-            getLayer(feature: (ol.Feature | ol.render.Feature)): ol.layer.Vector;
+        /**
+         * Returns the associated {@link ol.layer.Vector vectorlayer} of
+         * the (last) selected feature. Note that this will not work with any
+         * programmatic method like pushing features to
+         * {@link ol.interaction.Select#getFeatures collection}.
+         * @param feature Feature
+         * @return Layer.
+         * @api
+         */
+        getLayer(feature: (ol.Feature | ol.render.Feature)): ol.layer.Vector;
 
-            /**
-             * Handles the {@link ol.MapBrowserEvent map browser event} and may change the
-             * selected state of features.
-             * @param mapBrowserEvent Map browser event.
-             * @return `false` to stop event propagation.
-             * @api
-             */
-            static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
+        /**
+         * Handles the {@link ol.MapBrowserEvent map browser event} and may change the
+         * selected state of features.
+         * @param mapBrowserEvent Map browser event.
+         * @return `false` to stop event propagation.
+         * @api
+         */
+        static handleEvent(mapBrowserEvent: ol.MapBrowserEvent): boolean;
 
-            /**
-             * Remove the interaction from its current map, if any,  and attach it to a new
-             * map, if any. Pass `null` to just remove the interaction from the current map.
-             * @param map Map.
-             * @api stable
-             */
-            setMap(map: ol.Map): void;
-        }
+        /**
+         * Remove the interaction from its current map, if any,  and attach it to a new
+         * map, if any. Pass `null` to just remove the interaction from the current map.
+         * @param map Map.
+         * @api stable
+         */
+        setMap(map: ol.Map): void;
+    }
 
+    /**
+     * @classdesc
+     * Handles snapping of vector features while modifying or drawing them.  The
+     * features can come from a {@link ol.source.Vector} or {@link ol.Collection}
+     * Any interaction object that allows the user to interact
+     * with the features using the mouse can benefit from the snapping, as long
+     * as it is added before.
+     *
+     * The snap interaction modifies map browser event `coordinate` and `pixel`
+     * properties to force the snap to occur to any interaction that them.
+     *
+     * Example:
+     *
+     *     var snap = new ol.interaction.Snap({
+     *       source: source
+     *     });
+     *
+     * @param opt_options Options.
+     * @api
+     */
+    class Snap extends interaction.Pointer {
         /**
          * @classdesc
          * Handles snapping of vector features while modifying or drawing them.  The
@@ -5830,49 +5852,38 @@ declare namespace ol {
          * @param opt_options Options.
          * @api
          */
-        class Snap extends ol.interaction.Pointer {
-            /**
-             * @classdesc
-             * Handles snapping of vector features while modifying or drawing them.  The
-             * features can come from a {@link ol.source.Vector} or {@link ol.Collection}
-             * Any interaction object that allows the user to interact
-             * with the features using the mouse can benefit from the snapping, as long
-             * as it is added before.
-             *
-             * The snap interaction modifies map browser event `coordinate` and `pixel`
-             * properties to force the snap to occur to any interaction that them.
-             *
-             * Example:
-             *
-             *     var snap = new ol.interaction.Snap({
-             *       source: source
-             *     });
-             *
-             * @param opt_options Options.
-             * @api
-             */
-            constructor(opt_options?: olx.interaction.SnapOptions);
+        constructor(opt_options?: olx.interaction.SnapOptions);
 
-            /**
-             * Add a feature to the collection of features that we may snap to.
-             * @param feature Feature.
-             * @param opt_listen Whether to listen to the geometry change or not
-             *     Defaults to `true`.
-             * @api
-             */
-            addFeature(feature: ol.Feature, opt_listen?: boolean): void;
+        /**
+         * Add a feature to the collection of features that we may snap to.
+         * @param feature Feature.
+         * @param opt_listen Whether to listen to the geometry change or not
+         *     Defaults to `true`.
+         * @api
+         */
+        addFeature(feature: ol.Feature, opt_listen?: boolean): void;
 
-            /**
-             * Remove a feature from the collection of features that we may snap to.
-             * @param feature Feature
-             * @param opt_unlisten Whether to unlisten to the geometry change
-             *     or not. Defaults to `true`.
-             * @api
-             */
-            removeFeature(feature: ol.Feature, opt_unlisten?: boolean): void;
-        }
+        /**
+         * Remove a feature from the collection of features that we may snap to.
+         * @param feature Feature
+         * @param opt_unlisten Whether to unlisten to the geometry change
+         *     or not. Defaults to `true`.
+         * @api
+         */
+        removeFeature(feature: ol.Feature, opt_unlisten?: boolean): void;
+    }
 
-        namespace Translate {
+    namespace Translate {
+        /**
+         * @classdesc
+         * Events emitted by {@link ol.interaction.Translate} instances are instances of
+         * this type.
+         *
+         * @param type Type.
+         * @param features The features translated.
+         * @param coordinate The event coordinate.
+         */
+        class Event extends events.Event {
             /**
              * @classdesc
              * Events emitted by {@link ol.interaction.Translate} instances are instances of
@@ -5882,35 +5893,34 @@ declare namespace ol {
              * @param features The features translated.
              * @param coordinate The event coordinate.
              */
-            class Event extends ol.events.Event {
-                /**
-                 * @classdesc
-                 * Events emitted by {@link ol.interaction.Translate} instances are instances of
-                 * this type.
-                 *
-                 * @param type Type.
-                 * @param features The features translated.
-                 * @param coordinate The event coordinate.
-                 */
-                constructor(type: ol.interaction.TranslateEventType, features: ol.Collection<ol.Feature>, coordinate: ol.Coordinate);
+            constructor(type: ol.interaction.TranslateEventType, features: ol.Collection<ol.Feature>, coordinate: ol.Coordinate);
 
-                /**
-                 * The features being translated.
-                 * @api
-                 */
-                features: ol.Collection<ol.Feature>;
+            /**
+             * The features being translated.
+             * @api
+             */
+            features: ol.Collection<ol.Feature>;
 
-                /**
-                 * The coordinate of the drag event.
-                 * @const
-                 * @api
-                 */
-                coordinate: ol.Coordinate;
-            }
+            /**
+             * The coordinate of the drag event.
+             * @const
+             * @api
+             */
+            coordinate: ol.Coordinate;
         }
+    }
 
-        type TranslateEventType = string;
+    type TranslateEventType = string;
 
+    /**
+     * @classdesc
+     * Interaction for translating (moving) features.
+     *
+     * @fires ol.interaction.TranslateEvent
+     * @param options Options.
+     * @api
+     */
+    class Translate extends interaction.Pointer {
         /**
          * @classdesc
          * Interaction for translating (moving) features.
@@ -5919,19 +5929,22 @@ declare namespace ol {
          * @param options Options.
          * @api
          */
-        class Translate extends ol.interaction.Pointer {
-            /**
-             * @classdesc
-             * Interaction for translating (moving) features.
-             *
-             * @fires ol.interaction.TranslateEvent
-             * @param options Options.
-             * @api
-             */
-            constructor(options: olx.interaction.TranslateOptions);
-        }
+        constructor(options: olx.interaction.TranslateOptions);
     }
+}
 
+/**
+ * @classdesc
+ * Implementation of inertial deceleration for map movement.
+ *
+ * @param decay Rate of decay (must be negative).
+ * @param minVelocity Minimum velocity (pixels/millisecond).
+ * @param delay Delay to consider to calculate the kinetic
+ *     initial values (milliseconds).
+ * @struct
+ * @api
+ */
+export class Kinetic {
     /**
      * @classdesc
      * Implementation of inertial deceleration for map movement.
@@ -5943,22 +5956,22 @@ declare namespace ol {
      * @struct
      * @api
      */
-    class Kinetic {
-        /**
-         * @classdesc
-         * Implementation of inertial deceleration for map movement.
-         *
-         * @param decay Rate of decay (must be negative).
-         * @param minVelocity Minimum velocity (pixels/millisecond).
-         * @param delay Delay to consider to calculate the kinetic
-         *     initial values (milliseconds).
-         * @struct
-         * @api
-         */
-        constructor(decay: number, minVelocity: number, delay: number);
-    }
+    constructor(decay: number, minVelocity: number, delay: number);
+}
 
-    namespace layer {
+export namespace layer {
+    /**
+     * @classdesc
+     * Abstract base class; normally only used for creating subclasses and not
+     * instantiated in apps.
+     * Note that with `ol.layer.Base` and all its subclasses, any property set in
+     * the options is set as a {@link ol.Object} property on the layer object, so
+     * is observable, and has get/set accessors.
+     *
+     * @param options Layer options.
+     * @api stable
+     */
+    class Base extends Object {
         /**
          * @classdesc
          * Abstract base class; normally only used for creating subclasses and not
@@ -5970,121 +5983,119 @@ declare namespace ol {
          * @param options Layer options.
          * @api stable
          */
-        class Base extends ol.Object {
-            /**
-             * @classdesc
-             * Abstract base class; normally only used for creating subclasses and not
-             * instantiated in apps.
-             * Note that with `ol.layer.Base` and all its subclasses, any property set in
-             * the options is set as a {@link ol.Object} property on the layer object, so
-             * is observable, and has get/set accessors.
-             *
-             * @param options Layer options.
-             * @api stable
-             */
-            constructor(options: olx.layer.BaseOptions);
+        constructor(options: olx.layer.BaseOptions);
 
-            /**
-             * Return the {@link ol.Extent extent} of the layer or `undefined` if it
-             * will be visible regardless of extent.
-             * @return The layer extent.
-             * @observable
-             * @api stable
-             */
-            getExtent(): (ol.Extent);
+        /**
+         * Return the {@link ol.Extent extent} of the layer or `undefined` if it
+         * will be visible regardless of extent.
+         * @return The layer extent.
+         * @observable
+         * @api stable
+         */
+        getExtent(): (ol.Extent);
 
-            /**
-             * Return the maximum resolution of the layer.
-             * @return The maximum resolution of the layer.
-             * @observable
-             * @api stable
-             */
-            getMaxResolution(): number;
+        /**
+         * Return the maximum resolution of the layer.
+         * @return The maximum resolution of the layer.
+         * @observable
+         * @api stable
+         */
+        getMaxResolution(): number;
 
-            /**
-             * Return the minimum resolution of the layer.
-             * @return The minimum resolution of the layer.
-             * @observable
-             * @api stable
-             */
-            getMinResolution(): number;
+        /**
+         * Return the minimum resolution of the layer.
+         * @return The minimum resolution of the layer.
+         * @observable
+         * @api stable
+         */
+        getMinResolution(): number;
 
-            /**
-             * Return the opacity of the layer (between 0 and 1).
-             * @return The opacity of the layer.
-             * @observable
-             * @api stable
-             */
-            getOpacity(): number;
+        /**
+         * Return the opacity of the layer (between 0 and 1).
+         * @return The opacity of the layer.
+         * @observable
+         * @api stable
+         */
+        getOpacity(): number;
 
-            /**
-             * Return the visibility of the layer (`true` or `false`).
-             * @return The visibility of the layer.
-             * @observable
-             * @api stable
-             */
-            getVisible(): boolean;
+        /**
+         * Return the visibility of the layer (`true` or `false`).
+         * @return The visibility of the layer.
+         * @observable
+         * @api stable
+         */
+        getVisible(): boolean;
 
-            /**
-             * Return the Z-index of the layer, which is used to order layers before
-             * rendering. The default Z-index is 0.
-             * @return The Z-index of the layer.
-             * @observable
-             * @api
-             */
-            getZIndex(): number;
+        /**
+         * Return the Z-index of the layer, which is used to order layers before
+         * rendering. The default Z-index is 0.
+         * @return The Z-index of the layer.
+         * @observable
+         * @api
+         */
+        getZIndex(): number;
 
-            /**
-             * Set the extent at which the layer is visible.  If `undefined`, the layer
-             * will be visible at all extents.
-             * @param extent The extent of the layer.
-             * @observable
-             * @api stable
-             */
-            setExtent(extent: (ol.Extent)): void;
+        /**
+         * Set the extent at which the layer is visible.  If `undefined`, the layer
+         * will be visible at all extents.
+         * @param extent The extent of the layer.
+         * @observable
+         * @api stable
+         */
+        setExtent(extent: (ol.Extent)): void;
 
-            /**
-             * Set the maximum resolution at which the layer is visible.
-             * @param maxResolution The maximum resolution of the layer.
-             * @observable
-             * @api stable
-             */
-            setMaxResolution(maxResolution: number): void;
+        /**
+         * Set the maximum resolution at which the layer is visible.
+         * @param maxResolution The maximum resolution of the layer.
+         * @observable
+         * @api stable
+         */
+        setMaxResolution(maxResolution: number): void;
 
-            /**
-             * Set the minimum resolution at which the layer is visible.
-             * @param minResolution The minimum resolution of the layer.
-             * @observable
-             * @api stable
-             */
-            setMinResolution(minResolution: number): void;
+        /**
+         * Set the minimum resolution at which the layer is visible.
+         * @param minResolution The minimum resolution of the layer.
+         * @observable
+         * @api stable
+         */
+        setMinResolution(minResolution: number): void;
 
-            /**
-             * Set the opacity of the layer, allowed values range from 0 to 1.
-             * @param opacity The opacity of the layer.
-             * @observable
-             * @api stable
-             */
-            setOpacity(opacity: number): void;
+        /**
+         * Set the opacity of the layer, allowed values range from 0 to 1.
+         * @param opacity The opacity of the layer.
+         * @observable
+         * @api stable
+         */
+        setOpacity(opacity: number): void;
 
-            /**
-             * Set the visibility of the layer (`true` or `false`).
-             * @param visible The visibility of the layer.
-             * @observable
-             * @api stable
-             */
-            setVisible(visible: boolean): void;
+        /**
+         * Set the visibility of the layer (`true` or `false`).
+         * @param visible The visibility of the layer.
+         * @observable
+         * @api stable
+         */
+        setVisible(visible: boolean): void;
 
-            /**
-             * Set Z-index of the layer, which is used to order layers before rendering.
-             * The default Z-index is 0.
-             * @param zindex The z-index of the layer.
-             * @observable
-             * @api
-             */
-            setZIndex(zindex: number): void;
-        }
+        /**
+         * Set Z-index of the layer, which is used to order layers before rendering.
+         * The default Z-index is 0.
+         * @param zindex The z-index of the layer.
+         * @observable
+         * @api
+         */
+        setZIndex(zindex: number): void;
+    }
 
+    /**
+     * @classdesc
+     * A {@link ol.Collection} of layers that are handled together.
+     *
+     * A generic `change` event is triggered when the group/Collection changes.
+     *
+     * @param opt_options Layer options.
+     * @api stable
+     */
+    class Group extends layer.Base {
         /**
          * @classdesc
          * A {@link ol.Collection} of layers that are handled together.
@@ -6094,39 +6105,41 @@ declare namespace ol {
          * @param opt_options Layer options.
          * @api stable
          */
-        class Group extends ol.layer.Base {
-            /**
-             * @classdesc
-             * A {@link ol.Collection} of layers that are handled together.
-             *
-             * A generic `change` event is triggered when the group/Collection changes.
-             *
-             * @param opt_options Layer options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.layer.GroupOptions);
+        constructor(opt_options?: olx.layer.GroupOptions);
 
-            /**
-             * Returns the {@link ol.Collection collection} of {@link ol.layer.Layer layers}
-             * in this group.
-             * @return Collection of
-             *   {@link ol.layer.Base layers} that are part of this group.
-             * @observable
-             * @api stable
-             */
-            getLayers(): ol.Collection<ol.layer.Base>;
+        /**
+         * Returns the {@link ol.Collection collection} of {@link ol.layer.Layer layers}
+         * in this group.
+         * @return Collection of
+         *   {@link ol.layer.Base layers} that are part of this group.
+         * @observable
+         * @api stable
+         */
+        getLayers(): ol.Collection<ol.layer.Base>;
 
-            /**
-             * Set the {@link ol.Collection collection} of {@link ol.layer.Layer layers}
-             * in this group.
-             * @param layers Collection of
-             *   {@link ol.layer.Base layers} that are part of this group.
-             * @observable
-             * @api stable
-             */
-            setLayers(layers: ol.Collection<ol.layer.Base>): void;
-        }
+        /**
+         * Set the {@link ol.Collection collection} of {@link ol.layer.Layer layers}
+         * in this group.
+         * @param layers Collection of
+         *   {@link ol.layer.Base layers} that are part of this group.
+         * @observable
+         * @api stable
+         */
+        setLayers(layers: ol.Collection<ol.layer.Base>): void;
+    }
 
+    /**
+     * @classdesc
+     * Layer for rendering vector data as a heatmap.
+     * Note that any property set in the options is set as a {@link ol.Object}
+     * property on the layer object; for example, setting `title: 'My Title'` in the
+     * options means that `title` is observable, and has get/set accessors.
+     *
+     * @fires ol.render.Event
+     * @param opt_options Options.
+     * @api
+     */
+    class Heatmap extends layer.Vector {
         /**
          * @classdesc
          * Layer for rendering vector data as a heatmap.
@@ -6138,69 +6151,70 @@ declare namespace ol {
          * @param opt_options Options.
          * @api
          */
-        class Heatmap extends ol.layer.Vector {
-            /**
-             * @classdesc
-             * Layer for rendering vector data as a heatmap.
-             * Note that any property set in the options is set as a {@link ol.Object}
-             * property on the layer object; for example, setting `title: 'My Title'` in the
-             * options means that `title` is observable, and has get/set accessors.
-             *
-             * @fires ol.render.Event
-             * @param opt_options Options.
-             * @api
-             */
-            constructor(opt_options?: olx.layer.HeatmapOptions);
+        constructor(opt_options?: olx.layer.HeatmapOptions);
 
-            /**
-             * Return the blur size in pixels.
-             * @return Blur size in pixels.
-             * @api
-             * @observable
-             */
-            getBlur(): number;
+        /**
+         * Return the blur size in pixels.
+         * @return Blur size in pixels.
+         * @api
+         * @observable
+         */
+        getBlur(): number;
 
-            /**
-             * Return the gradient colors as array of strings.
-             * @return Colors.
-             * @api
-             * @observable
-             */
-            getGradient(): string[];
+        /**
+         * Return the gradient colors as array of strings.
+         * @return Colors.
+         * @api
+         * @observable
+         */
+        getGradient(): string[];
 
-            /**
-             * Return the size of the radius in pixels.
-             * @return Radius size in pixel.
-             * @api
-             * @observable
-             */
-            getRadius(): number;
+        /**
+         * Return the size of the radius in pixels.
+         * @return Radius size in pixel.
+         * @api
+         * @observable
+         */
+        getRadius(): number;
 
-            /**
-             * Set the blur size in pixels.
-             * @param blur Blur size in pixels.
-             * @api
-             * @observable
-             */
-            setBlur(blur: number): void;
+        /**
+         * Set the blur size in pixels.
+         * @param blur Blur size in pixels.
+         * @api
+         * @observable
+         */
+        setBlur(blur: number): void;
 
-            /**
-             * Set the gradient colors as array of strings.
-             * @param colors Gradient.
-             * @api
-             * @observable
-             */
-            setGradient(colors: string[]): void;
+        /**
+         * Set the gradient colors as array of strings.
+         * @param colors Gradient.
+         * @api
+         * @observable
+         */
+        setGradient(colors: string[]): void;
 
-            /**
-             * Set the size of the radius in pixels.
-             * @param radius Radius size in pixel.
-             * @api
-             * @observable
-             */
-            setRadius(radius: number): void;
-        }
+        /**
+         * Set the size of the radius in pixels.
+         * @param radius Radius size in pixel.
+         * @api
+         * @observable
+         */
+        setRadius(radius: number): void;
+    }
 
+    /**
+     * @classdesc
+     * Server-rendered images that are available for arbitrary extents and
+     * resolutions.
+     * Note that any property set in the options is set as a {@link ol.Object}
+     * property on the layer object; for example, setting `title: 'My Title'` in the
+     * options means that `title` is observable, and has get/set accessors.
+     *
+     * @fires ol.render.Event
+     * @param opt_options Layer options.
+     * @api stable
+     */
+    class Image extends layer.Layer {
         /**
          * @classdesc
          * Server-rendered images that are available for arbitrary extents and
@@ -6213,22 +6227,29 @@ declare namespace ol {
          * @param opt_options Layer options.
          * @api stable
          */
-        class Image extends ol.layer.Layer {
-            /**
-             * @classdesc
-             * Server-rendered images that are available for arbitrary extents and
-             * resolutions.
-             * Note that any property set in the options is set as a {@link ol.Object}
-             * property on the layer object; for example, setting `title: 'My Title'` in the
-             * options means that `title` is observable, and has get/set accessors.
-             *
-             * @fires ol.render.Event
-             * @param opt_options Layer options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.layer.ImageOptions);
-        }
+        constructor(opt_options?: olx.layer.ImageOptions);
+    }
 
+    /**
+     * @classdesc
+     * Abstract base class; normally only used for creating subclasses and not
+     * instantiated in apps.
+     * A visual representation of raster or vector map data.
+     * Layers group together those properties that pertain to how the data is to be
+     * displayed, irrespective of the source of that data.
+     *
+     * Layers are usually added to a map with {@link ol.Map#addLayer}. Components
+     * like {@link ol.interaction.Select} use unmanaged layers internally. These
+     * unmanaged layers are associated with the map using
+     * {@link ol.layer.Layer#setMap} instead.
+     *
+     * A generic `change` event is fired when the state of the source changes.
+     *
+     * @fires ol.render.Event
+     * @param options Layer options.
+     * @api stable
+     */
+    class Layer extends layer.Base {
         /**
          * @classdesc
          * Abstract base class; normally only used for creating subclasses and not
@@ -6248,59 +6269,52 @@ declare namespace ol {
          * @param options Layer options.
          * @api stable
          */
-        class Layer extends ol.layer.Base {
-            /**
-             * @classdesc
-             * Abstract base class; normally only used for creating subclasses and not
-             * instantiated in apps.
-             * A visual representation of raster or vector map data.
-             * Layers group together those properties that pertain to how the data is to be
-             * displayed, irrespective of the source of that data.
-             *
-             * Layers are usually added to a map with {@link ol.Map#addLayer}. Components
-             * like {@link ol.interaction.Select} use unmanaged layers internally. These
-             * unmanaged layers are associated with the map using
-             * {@link ol.layer.Layer#setMap} instead.
-             *
-             * A generic `change` event is fired when the state of the source changes.
-             *
-             * @fires ol.render.Event
-             * @param options Layer options.
-             * @api stable
-             */
-            constructor(options: olx.layer.LayerOptions);
+        constructor(options: olx.layer.LayerOptions);
 
-            /**
-             * Get the layer source.
-             * @return The layer source (or `null` if not yet set).
-             * @observable
-             * @api stable
-             */
-            getSource(): ol.source.Source;
+        /**
+         * Get the layer source.
+         * @return The layer source (or `null` if not yet set).
+         * @observable
+         * @api stable
+         */
+        getSource(): ol.source.Source;
 
-            /**
-             * Sets the layer to be rendered on top of other layers on a map. The map will
-             * not manage this layer in its layers collection, and the callback in
-             * {@link ol.Map#forEachLayerAtPixel} will receive `null` as layer. This
-             * is useful for temporary layers. To remove an unmanaged layer from the map,
-             * use `#setMap(null)`.
-             *
-             * To add the layer to a map and have it managed by the map, use
-             * {@link ol.Map#addLayer} instead.
-             * @param map Map.
-             * @api
-             */
-            setMap(map: ol.Map): void;
+        /**
+         * Sets the layer to be rendered on top of other layers on a map. The map will
+         * not manage this layer in its layers collection, and the callback in
+         * {@link ol.Map#forEachLayerAtPixel} will receive `null` as layer. This
+         * is useful for temporary layers. To remove an unmanaged layer from the map,
+         * use `#setMap(null)`.
+         *
+         * To add the layer to a map and have it managed by the map, use
+         * {@link ol.Map#addLayer} instead.
+         * @param map Map.
+         * @api
+         */
+        setMap(map: ol.Map): void;
 
-            /**
-             * Set the layer source.
-             * @param source The layer source.
-             * @observable
-             * @api stable
-             */
-            setSource(source: ol.source.Source): void;
-        }
+        /**
+         * Set the layer source.
+         * @param source The layer source.
+         * @observable
+         * @api stable
+         */
+        setSource(source: ol.source.Source): void;
+    }
 
+    /**
+     * @classdesc
+     * For layer sources that provide pre-rendered, tiled images in grids that are
+     * organized by zoom levels for specific resolutions.
+     * Note that any property set in the options is set as a {@link ol.Object}
+     * property on the layer object; for example, setting `title: 'My Title'` in the
+     * options means that `title` is observable, and has get/set accessors.
+     *
+     * @fires ol.render.Event
+     * @param opt_options Tile layer options.
+     * @api stable
+     */
+    class Tile extends layer.Layer {
         /**
          * @classdesc
          * For layer sources that provide pre-rendered, tiled images in grids that are
@@ -6313,54 +6327,53 @@ declare namespace ol {
          * @param opt_options Tile layer options.
          * @api stable
          */
-        class Tile extends ol.layer.Layer {
-            /**
-             * @classdesc
-             * For layer sources that provide pre-rendered, tiled images in grids that are
-             * organized by zoom levels for specific resolutions.
-             * Note that any property set in the options is set as a {@link ol.Object}
-             * property on the layer object; for example, setting `title: 'My Title'` in the
-             * options means that `title` is observable, and has get/set accessors.
-             *
-             * @fires ol.render.Event
-             * @param opt_options Tile layer options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.layer.TileOptions);
+        constructor(opt_options?: olx.layer.TileOptions);
 
-            /**
-             * Return the level as number to which we will preload tiles up to.
-             * @return The level to preload tiles up to.
-             * @observable
-             * @api
-             */
-            getPreload(): number;
+        /**
+         * Return the level as number to which we will preload tiles up to.
+         * @return The level to preload tiles up to.
+         * @observable
+         * @api
+         */
+        getPreload(): number;
 
-            /**
-             * Set the level as number to which we will preload tiles up to.
-             * @param preload The level to preload tiles up to.
-             * @observable
-             * @api
-             */
-            setPreload(preload: number): void;
+        /**
+         * Set the level as number to which we will preload tiles up to.
+         * @param preload The level to preload tiles up to.
+         * @observable
+         * @api
+         */
+        setPreload(preload: number): void;
 
-            /**
-             * Whether we use interim tiles on error.
-             * @return Use interim tiles on error.
-             * @observable
-             * @api
-             */
-            getUseInterimTilesOnError(): boolean;
+        /**
+         * Whether we use interim tiles on error.
+         * @return Use interim tiles on error.
+         * @observable
+         * @api
+         */
+        getUseInterimTilesOnError(): boolean;
 
-            /**
-             * Set whether we use interim tiles on error.
-             * @param useInterimTilesOnError Use interim tiles on error.
-             * @observable
-             * @api
-             */
-            setUseInterimTilesOnError(useInterimTilesOnError: boolean): void;
-        }
+        /**
+         * Set whether we use interim tiles on error.
+         * @param useInterimTilesOnError Use interim tiles on error.
+         * @observable
+         * @api
+         */
+        setUseInterimTilesOnError(useInterimTilesOnError: boolean): void;
+    }
 
+    /**
+     * @classdesc
+     * Vector data that is rendered client-side.
+     * Note that any property set in the options is set as a {@link ol.Object}
+     * property on the layer object; for example, setting `title: 'My Title'` in the
+     * options means that `title` is observable, and has get/set accessors.
+     *
+     * @fires ol.render.Event
+     * @param opt_options Options.
+     * @api stable
+     */
+    class Vector extends layer.Layer {
         /**
          * @classdesc
          * Vector data that is rendered client-side.
@@ -6372,69 +6385,68 @@ declare namespace ol {
          * @param opt_options Options.
          * @api stable
          */
-        class Vector extends ol.layer.Layer {
-            /**
-             * @classdesc
-             * Vector data that is rendered client-side.
-             * Note that any property set in the options is set as a {@link ol.Object}
-             * property on the layer object; for example, setting `title: 'My Title'` in the
-             * options means that `title` is observable, and has get/set accessors.
-             *
-             * @fires ol.render.Event
-             * @param opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.layer.VectorOptions);
-
-            /**
-             * Return the associated {@link ol.source.Vector vectorsource} of the layer.
-             * @return Source.
-             * @api stable
-             */
-            getSource(): ol.source.Vector;
-
-            /**
-             * Get the style for features.  This returns whatever was passed to the `style`
-             * option at construction or to the `setStyle` method.
-             * @return Layer style.
-             * @api stable
-             */
-            getStyle(): (ol.style.Style | ol.style.Style[] | ol.StyleFunction);
-
-            /**
-             * Get the style function.
-             * @return Layer style function.
-             * @api stable
-             */
-            getStyleFunction(): (ol.StyleFunction);
-
-            /**
-             * Set the style for features.  This can be a single style object, an array
-             * of styles, or a function that takes a feature and resolution and returns
-             * an array of styles. If it is `undefined` the default style is used. If
-             * it is `null` the layer has no style (a `null` style), so only features
-             * that have their own styles will be rendered in the layer. See
-             * {@link ol.style} for information on the default style.
-             * @param style Layer style.
-             * @api stable
-             */
-            setStyle(style: (ol.style.Style | ol.style.Style[] | ol.StyleFunction)): void;
-        }
+        constructor(opt_options?: olx.layer.VectorOptions);
 
         /**
-         * Render mode for vector tiles:
-         *  * `'image'`: Vector tiles are rendered as images. Great performance, but
-         *    point symbols and texts are always rotated with the view and pixels are
-         *    scaled during zoom animations.
-         *  * `'hybrid'`: Polygon and line elements are rendered as images, so pixels
-         *    are scaled during zoom animations. Point symbols and texts are accurately
-         *    rendered as vectors and can stay upright on rotated views.
-         *  * `'vector'`: Vector tiles are rendered as vectors. Most accurate rendering
-         *    even during animations, but slower performance than the other options.
-         * @api
+         * Return the associated {@link ol.source.Vector vectorsource} of the layer.
+         * @return Source.
+         * @api stable
          */
-        type VectorTileRenderType = "image" | "hybrid" | "vector";
+        getSource(): ol.source.Vector;
 
+        /**
+         * Get the style for features.  This returns whatever was passed to the `style`
+         * option at construction or to the `setStyle` method.
+         * @return Layer style.
+         * @api stable
+         */
+        getStyle(): (ol.style.Style | ol.style.Style[] | ol.StyleFunction);
+
+        /**
+         * Get the style function.
+         * @return Layer style function.
+         * @api stable
+         */
+        getStyleFunction(): (ol.StyleFunction);
+
+        /**
+         * Set the style for features.  This can be a single style object, an array
+         * of styles, or a function that takes a feature and resolution and returns
+         * an array of styles. If it is `undefined` the default style is used. If
+         * it is `null` the layer has no style (a `null` style), so only features
+         * that have their own styles will be rendered in the layer. See
+         * {@link ol.style} for information on the default style.
+         * @param style Layer style.
+         * @api stable
+         */
+        setStyle(style: (ol.style.Style | ol.style.Style[] | ol.StyleFunction)): void;
+    }
+
+    /**
+     * Render mode for vector tiles:
+     *  * `'image'`: Vector tiles are rendered as images. Great performance, but
+     *    point symbols and texts are always rotated with the view and pixels are
+     *    scaled during zoom animations.
+     *  * `'hybrid'`: Polygon and line elements are rendered as images, so pixels
+     *    are scaled during zoom animations. Point symbols and texts are accurately
+     *    rendered as vectors and can stay upright on rotated views.
+     *  * `'vector'`: Vector tiles are rendered as vectors. Most accurate rendering
+     *    even during animations, but slower performance than the other options.
+     * @api
+     */
+    type VectorTileRenderType = "image" | "hybrid" | "vector";
+
+    /**
+     * @classdesc
+     * Layer for vector tile data that is rendered client-side.
+     * Note that any property set in the options is set as a {@link ol.Object}
+     * property on the layer object; for example, setting `title: 'My Title'` in the
+     * options means that `title` is observable, and has get/set accessors.
+     *
+     * @param opt_options Options.
+     * @api
+     */
+    class VectorTile extends layer.Vector {
         /**
          * @classdesc
          * Layer for vector tile data that is rendered client-side.
@@ -6445,85 +6457,122 @@ declare namespace ol {
          * @param opt_options Options.
          * @api
          */
-        class VectorTile extends ol.layer.Vector {
-            /**
-             * @classdesc
-             * Layer for vector tile data that is rendered client-side.
-             * Note that any property set in the options is set as a {@link ol.Object}
-             * property on the layer object; for example, setting `title: 'My Title'` in the
-             * options means that `title` is observable, and has get/set accessors.
-             *
-             * @param opt_options Options.
-             * @api
-             */
-            constructor(opt_options?: olx.layer.VectorTileOptions);
+        constructor(opt_options?: olx.layer.VectorTileOptions);
 
-            /**
-             * Return the level as number to which we will preload tiles up to.
-             * @return The level to preload tiles up to.
-             * @observable
-             * @api
-             */
-            getPreload(): number;
+        /**
+         * Return the level as number to which we will preload tiles up to.
+         * @return The level to preload tiles up to.
+         * @observable
+         * @api
+         */
+        getPreload(): number;
 
-            /**
-             * Whether we use interim tiles on error.
-             * @return Use interim tiles on error.
-             * @observable
-             * @api
-             */
-            getUseInterimTilesOnError(): boolean;
+        /**
+         * Whether we use interim tiles on error.
+         * @return Use interim tiles on error.
+         * @observable
+         * @api
+         */
+        getUseInterimTilesOnError(): boolean;
 
-            /**
-             * Set the level as number to which we will preload tiles up to.
-             * @param preload The level to preload tiles up to.
-             * @observable
-             * @api
-             */
-            setPreload(preload: number): void;
+        /**
+         * Set the level as number to which we will preload tiles up to.
+         * @param preload The level to preload tiles up to.
+         * @observable
+         * @api
+         */
+        setPreload(preload: number): void;
 
-            /**
-             * Set whether we use interim tiles on error.
-             * @param useInterimTilesOnError Use interim tiles on error.
-             * @observable
-             * @api
-             */
-            setUseInterimTilesOnError(useInterimTilesOnError: boolean): void;
-        }
+        /**
+         * Set whether we use interim tiles on error.
+         * @param useInterimTilesOnError Use interim tiles on error.
+         * @observable
+         * @api
+         */
+        setUseInterimTilesOnError(useInterimTilesOnError: boolean): void;
     }
+}
+
+/**
+ * Strategies for loading vector data.
+ */
+export namespace loadingstrategy {
+    /**
+     * Strategy function for loading all features with a single request.
+     * @param extent Extent.
+     * @param resolution Resolution.
+     * @return Extents.
+     * @api
+     */
+    function all(extent: ol.Extent, resolution: number): ol.Extent[];
 
     /**
-     * Strategies for loading vector data.
+     * Strategy function for loading features based on the view's extent and
+     * resolution.
+     * @param extent Extent.
+     * @param resolution Resolution.
+     * @return Extents.
+     * @api
      */
-    namespace loadingstrategy {
-        /**
-         * Strategy function for loading all features with a single request.
-         * @param extent Extent.
-         * @param resolution Resolution.
-         * @return Extents.
-         * @api
-         */
-        function all(extent: ol.Extent, resolution: number): ol.Extent[];
+    function bbox(extent: ol.Extent, resolution: number): ol.Extent[];
 
-        /**
-         * Strategy function for loading features based on the view's extent and
-         * resolution.
-         * @param extent Extent.
-         * @param resolution Resolution.
-         * @return Extents.
-         * @api
-         */
-        function bbox(extent: ol.Extent, resolution: number): ol.Extent[];
-
-        /**
-         * Creates a strategy function for loading features based on a tile grid.
-         * @param tileGrid Tile grid.
-         * @return Loading strategy.
-         * @api
-         */
-        function tile(tileGrid: ol.tilegrid.TileGrid): ((extent: ol.Extent, i: number) => ol.Extent[]);
-    }
+    /**
+     * Creates a strategy function for loading features based on a tile grid.
+     * @param tileGrid Tile grid.
+     * @return Loading strategy.
+     * @api
+     */
+    function tile(tileGrid: ol.tilegrid.TileGrid): ((extent: ol.Extent, i: number) => ol.Extent[]);
+}
 
+/**
+ * @classdesc
+ * The map is the core component of OpenLayers. For a map to render, a view,
+ * one or more layers, and a target container are needed:
+ *
+ *     var map = new ol.Map({
+ *       view: new ol.View({
+ *         center: [0, 0],
+ *         zoom: 1
+ *       }),
+ *       layers: [
+ *         new ol.layer.Tile({
+ *           source: new ol.source.OSM()
+ *         })
+ *       ],
+ *       target: 'map'
+ *     });
+ *
+ * The above snippet creates a map using a {@link ol.layer.Tile} to display
+ * {@link ol.source.OSM} OSM data and render it to a DOM element with the
+ * id `map`.
+ *
+ * The constructor places a viewport container (with CSS class name
+ * `ol-viewport`) in the target element (see `getViewport()`), and then two
+ * further elements within the viewport: one with CSS class name
+ * `ol-overlaycontainer-stopevent` for controls and some overlays, and one with
+ * CSS class name `ol-overlaycontainer` for other overlays (see the `stopEvent`
+ * option of {@link ol.Overlay} for the difference). The map itself is placed in
+ * a further element within the viewport, either DOM or Canvas, depending on the
+ * renderer.
+ *
+ * Layers are stored as a `ol.Collection` in layerGroups. A top-level group is
+ * provided by the library. This is what is accessed by `getLayerGroup` and
+ * `setLayerGroup`. Layers entered in the options are added to this group, and
+ * `addLayer` and `removeLayer` change the layer collection in the group.
+ * `getLayers` is a convenience function for `getLayerGroup().getLayers()`.
+ * Note that `ol.layer.Group` is a subclass of `ol.layer.Base`, so layers
+ * entered in the options or added with `addLayer` can be groups, which can
+ * contain further groups, and so on.
+ *
+ * @param options Map options.
+ * @fires ol.MapBrowserEvent
+ * @fires ol.MapEvent
+ * @fires ol.render.Event#postcompose
+ * @fires ol.render.Event#precompose
+ * @api stable
+ */
+export class Map extends Object {
     /**
      * @classdesc
      * The map is the core component of OpenLayers. For a map to render, a view,
@@ -6571,383 +6620,347 @@ declare namespace ol {
      * @fires ol.render.Event#precompose
      * @api stable
      */
-    class Map extends ol.Object {
-        /**
-         * @classdesc
-         * The map is the core component of OpenLayers. For a map to render, a view,
-         * one or more layers, and a target container are needed:
-         *
-         *     var map = new ol.Map({
-         *       view: new ol.View({
-         *         center: [0, 0],
-         *         zoom: 1
-         *       }),
-         *       layers: [
-         *         new ol.layer.Tile({
-         *           source: new ol.source.OSM()
-         *         })
-         *       ],
-         *       target: 'map'
-         *     });
-         *
-         * The above snippet creates a map using a {@link ol.layer.Tile} to display
-         * {@link ol.source.OSM} OSM data and render it to a DOM element with the
-         * id `map`.
-         *
-         * The constructor places a viewport container (with CSS class name
-         * `ol-viewport`) in the target element (see `getViewport()`), and then two
-         * further elements within the viewport: one with CSS class name
-         * `ol-overlaycontainer-stopevent` for controls and some overlays, and one with
-         * CSS class name `ol-overlaycontainer` for other overlays (see the `stopEvent`
-         * option of {@link ol.Overlay} for the difference). The map itself is placed in
-         * a further element within the viewport, either DOM or Canvas, depending on the
-         * renderer.
-         *
-         * Layers are stored as a `ol.Collection` in layerGroups. A top-level group is
-         * provided by the library. This is what is accessed by `getLayerGroup` and
-         * `setLayerGroup`. Layers entered in the options are added to this group, and
-         * `addLayer` and `removeLayer` change the layer collection in the group.
-         * `getLayers` is a convenience function for `getLayerGroup().getLayers()`.
-         * Note that `ol.layer.Group` is a subclass of `ol.layer.Base`, so layers
-         * entered in the options or added with `addLayer` can be groups, which can
-         * contain further groups, and so on.
-         *
-         * @param options Map options.
-         * @fires ol.MapBrowserEvent
-         * @fires ol.MapEvent
-         * @fires ol.render.Event#postcompose
-         * @fires ol.render.Event#precompose
-         * @api stable
-         */
-        constructor(options: olx.MapOptions);
+    constructor(options: olx.MapOptions);
 
-        /**
-         * Add the given control to the map.
-         * @param control Control.
-         * @api stable
-         */
-        addControl(control: ol.control.Control): void;
+    /**
+     * Add the given control to the map.
+     * @param control Control.
+     * @api stable
+     */
+    addControl(control: ol.control.Control): void;
 
-        /**
-         * Add the given interaction to the map.
-         * @param interaction Interaction to add.
-         * @api stable
-         */
-        addInteraction(interaction: ol.interaction.Interaction): void;
+    /**
+     * Add the given interaction to the map.
+     * @param interaction Interaction to add.
+     * @api stable
+     */
+    addInteraction(interaction: ol.interaction.Interaction): void;
 
-        /**
-         * Adds the given layer to the top of this map. If you want to add a layer
-         * elsewhere in the stack, use `getLayers()` and the methods available on
-         * {@link ol.Collection}.
-         * @param layer Layer.
-         * @api stable
-         */
-        addLayer(layer: ol.layer.Base): void;
+    /**
+     * Adds the given layer to the top of this map. If you want to add a layer
+     * elsewhere in the stack, use `getLayers()` and the methods available on
+     * {@link ol.Collection}.
+     * @param layer Layer.
+     * @api stable
+     */
+    addLayer(layer: ol.layer.Base): void;
 
-        /**
-         * Add the given overlay to the map.
-         * @param overlay Overlay.
-         * @api stable
-         */
-        addOverlay(overlay: ol.Overlay): void;
+    /**
+     * Add the given overlay to the map.
+     * @param overlay Overlay.
+     * @api stable
+     */
+    addOverlay(overlay: ol.Overlay): void;
 
-        /**
-         * Detect features that intersect a pixel on the viewport, and execute a
-         * callback with each intersecting feature. Layers included in the detection can
-         * be configured through `opt_layerFilter`.
-         * @param pixel Pixel.
-         * @param callback Feature callback. The callback will be
-         *     called with two arguments. The first argument is one
-         *     {@link ol.Feature feature} or
-         *     {@link ol.render.Feature render feature} at the pixel, the second is
-         *     the {@link ol.layer.Layer layer} of the feature and will be null for
-         *     unmanaged layers. To stop detection, callback functions can return a
-         *     truthy value.
-         * @param opt_options Optional options.
-         * @return Callback result, i.e. the return value of last
-         * callback execution, or the first truthy callback return value.
-         * @template T
-         * @api stable
-         */
-        forEachFeatureAtPixel<T>(
-            pixel: ol.Pixel,
-            callback: ((feature: (ol.Feature | ol.render.Feature), layer: ol.layer.Layer) => T),
-            opt_options?: olx.AtPixelOptions
-        ): (T);
+    /**
+     * Detect features that intersect a pixel on the viewport, and execute a
+     * callback with each intersecting feature. Layers included in the detection can
+     * be configured through `opt_layerFilter`.
+     * @param pixel Pixel.
+     * @param callback Feature callback. The callback will be
+     *     called with two arguments. The first argument is one
+     *     {@link ol.Feature feature} or
+     *     {@link ol.render.Feature render feature} at the pixel, the second is
+     *     the {@link ol.layer.Layer layer} of the feature and will be null for
+     *     unmanaged layers. To stop detection, callback functions can return a
+     *     truthy value.
+     * @param opt_options Optional options.
+     * @return Callback result, i.e. the return value of last
+     * callback execution, or the first truthy callback return value.
+     * @template T
+     * @api stable
+     */
+    forEachFeatureAtPixel<T>(
+        pixel: ol.Pixel,
+        callback: ((feature: (ol.Feature | ol.render.Feature), layer: ol.layer.Layer) => T),
+        opt_options?: olx.AtPixelOptions
+    ): (T);
 
-        /**
-         * Get all features that intersect a pixel on the viewport.
-         * @param pixel Pixel.
-         * @param opt_options Optional options.
-         * @return The detected features or null if none were found.
-         * @api stable
-         */
-        getFeaturesAtPixel(
-            pixel: ol.Pixel,
-            opt_options?: olx.AtPixelOptions
-        ): (Array<ol.Feature | ol.render.Feature> | null);
+    /**
+     * Get all features that intersect a pixel on the viewport.
+     * @param pixel Pixel.
+     * @param opt_options Optional options.
+     * @return The detected features or null if none were found.
+     * @api stable
+     */
+    getFeaturesAtPixel(
+        pixel: ol.Pixel,
+        opt_options?: olx.AtPixelOptions
+    ): (Array<ol.Feature | ol.render.Feature> | null);
 
-        /**
-         * Detect layers that have a color value at a pixel on the viewport, and
-         * execute a callback with each matching layer. Layers included in the
-         * detection can be configured through `opt_layerFilter`.
-         * @param pixel Pixel.
-         * @param callback Layer
-         *     callback. This callback will recieve two arguments: first is the
-         *     {@link ol.layer.Layer layer}, second argument is {@link ol.Color}
-         *     and will be null for layer types that do not currently support this
-         *     argument. To stop detection callback functions can return a truthy value.
-         * @param opt_this Value to use as `this` when executing `callback`.
-         * @param opt_layerFilter Layer
-         *     filter function. The filter function will receive one argument, the
-         *     {@link ol.layer.Layer layer-candidate} and it should return a boolean
-         *     value. Only layers which are visible and for which this function returns
-         *     `true` will be tested for features. By default, all visible layers will
-         *     be tested.
-         * @param opt_this2 Value to use as `this` when executing `layerFilter`.
-         * @return Callback result, i.e. the return value of last
-         * callback execution, or the first truthy callback return value.
-         * @template S,T,U
-         * @api stable
-         */
-        forEachLayerAtPixel<S, T, U>(pixel: ol.Pixel,
-                                     callback: ((layer: ol.layer.Layer, color: ol.Color) => T),
-                                     opt_this?: S,
-                                     opt_layerFilter?: ((layer: ol.layer.Layer) => boolean),
-                                     opt_this2?: U): (T);
+    /**
+     * Detect layers that have a color value at a pixel on the viewport, and
+     * execute a callback with each matching layer. Layers included in the
+     * detection can be configured through `opt_layerFilter`.
+     * @param pixel Pixel.
+     * @param callback Layer
+     *     callback. This callback will recieve two arguments: first is the
+     *     {@link ol.layer.Layer layer}, second argument is {@link ol.Color}
+     *     and will be null for layer types that do not currently support this
+     *     argument. To stop detection callback functions can return a truthy value.
+     * @param opt_this Value to use as `this` when executing `callback`.
+     * @param opt_layerFilter Layer
+     *     filter function. The filter function will receive one argument, the
+     *     {@link ol.layer.Layer layer-candidate} and it should return a boolean
+     *     value. Only layers which are visible and for which this function returns
+     *     `true` will be tested for features. By default, all visible layers will
+     *     be tested.
+     * @param opt_this2 Value to use as `this` when executing `layerFilter`.
+     * @return Callback result, i.e. the return value of last
+     * callback execution, or the first truthy callback return value.
+     * @template S,T,U
+     * @api stable
+     */
+    forEachLayerAtPixel<S, T, U>(pixel: ol.Pixel,
+                                    callback: ((layer: ol.layer.Layer, color: ol.Color) => T),
+                                    opt_this?: S,
+                                    opt_layerFilter?: ((layer: ol.layer.Layer) => boolean),
+                                    opt_this2?: U): (T);
 
-        /**
-         * Detect if features intersect a pixel on the viewport. Layers included in the
-         * detection can be configured through `opt_layerFilter`.
-         * @param pixel Pixel.
-         * @param opt_options Optional options.
-         * @return Is there a feature at the given pixel?
-         * @api
-         */
-        hasFeatureAtPixel(
-            pixel: ol.Pixel,
-            opt_options?: olx.AtPixelOptions
-        ): boolean;
+    /**
+     * Detect if features intersect a pixel on the viewport. Layers included in the
+     * detection can be configured through `opt_layerFilter`.
+     * @param pixel Pixel.
+     * @param opt_options Optional options.
+     * @return Is there a feature at the given pixel?
+     * @api
+     */
+    hasFeatureAtPixel(
+        pixel: ol.Pixel,
+        opt_options?: olx.AtPixelOptions
+    ): boolean;
 
-        /**
-         * Returns the geographical coordinate for a browser event.
-         * @param event Event.
-         * @return Coordinate.
-         * @api stable
-         */
-        getEventCoordinate(event: Event): ol.Coordinate;
+    /**
+     * Returns the geographical coordinate for a browser event.
+     * @param event Event.
+     * @return Coordinate.
+     * @api stable
+     */
+    getEventCoordinate(event: Event): ol.Coordinate;
 
-        /**
-         * Returns the map pixel position for a browser event relative to the viewport.
-         * @param event Event.
-         * @return Pixel.
-         * @api stable
-         */
-        getEventPixel(event: Event): ol.Pixel;
+    /**
+     * Returns the map pixel position for a browser event relative to the viewport.
+     * @param event Event.
+     * @return Pixel.
+     * @api stable
+     */
+    getEventPixel(event: Event): ol.Pixel;
 
-        /**
-         * Get the target in which this map is rendered.
-         * Note that this returns what is entered as an option or in setTarget:
-         * if that was an element, it returns an element; if a string, it returns that.
-         * @return The Element or id of the Element that the
-         *     map is rendered in.
-         * @observable
-         * @api stable
-         */
-        getTarget(): (Element | string);
+    /**
+     * Get the target in which this map is rendered.
+     * Note that this returns what is entered as an option or in setTarget:
+     * if that was an element, it returns an element; if a string, it returns that.
+     * @return The Element or id of the Element that the
+     *     map is rendered in.
+     * @observable
+     * @api stable
+     */
+    getTarget(): (Element | string);
 
-        /**
-         * Get the DOM element into which this map is rendered. In contrast to
-         * `getTarget` this method always return an `Element`, or `null` if the
-         * map has no target.
-         * @return The element that the map is rendered in.
-         * @api
-         */
-        getTargetElement(): Element;
+    /**
+     * Get the DOM element into which this map is rendered. In contrast to
+     * `getTarget` this method always return an `Element`, or `null` if the
+     * map has no target.
+     * @return The element that the map is rendered in.
+     * @api
+     */
+    getTargetElement(): Element;
 
-        /**
-         * Get the coordinate for a given pixel.  This returns a coordinate in the
-         * map view projection.
-         * @param pixel Pixel position in the map viewport.
-         * @return The coordinate for the pixel position.
-         * @api stable
-         */
-        getCoordinateFromPixel(pixel: ol.Pixel): ol.Coordinate;
+    /**
+     * Get the coordinate for a given pixel.  This returns a coordinate in the
+     * map view projection.
+     * @param pixel Pixel position in the map viewport.
+     * @return The coordinate for the pixel position.
+     * @api stable
+     */
+    getCoordinateFromPixel(pixel: ol.Pixel): ol.Coordinate;
 
-        /**
-         * Get the map controls. Modifying this collection changes the controls
-         * associated with the map.
-         * @return Controls.
-         * @api stable
-         */
-        getControls(): ol.Collection<ol.control.Control>;
+    /**
+     * Get the map controls. Modifying this collection changes the controls
+     * associated with the map.
+     * @return Controls.
+     * @api stable
+     */
+    getControls(): ol.Collection<ol.control.Control>;
 
-        /**
-         * Get the map overlays. Modifying this collection changes the overlays
-         * associated with the map.
-         * @return Overlays.
-         * @api stable
-         */
-        getOverlays(): ol.Collection<ol.Overlay>;
+    /**
+     * Get the map overlays. Modifying this collection changes the overlays
+     * associated with the map.
+     * @return Overlays.
+     * @api stable
+     */
+    getOverlays(): ol.Collection<ol.Overlay>;
 
-        /**
-         * Get an overlay by its identifier (the value returned by overlay.getId()).
-         * Note that the index treats string and numeric identifiers as the same. So
-         * `map.getOverlayById(2)` will return an overlay with id `'2'` or `2`.
-         * @param id Overlay identifier.
-         * @return Overlay.
-         * @api
-         */
-        getOverlayById(id: (string | number)): ol.Overlay;
+    /**
+     * Get an overlay by its identifier (the value returned by overlay.getId()).
+     * Note that the index treats string and numeric identifiers as the same. So
+     * `map.getOverlayById(2)` will return an overlay with id `'2'` or `2`.
+     * @param id Overlay identifier.
+     * @return Overlay.
+     * @api
+     */
+    getOverlayById(id: (string | number)): ol.Overlay;
 
-        /**
-         * Get the map interactions. Modifying this collection changes the interactions
-         * associated with the map.
-         *
-         * Interactions are used for e.g. pan, zoom and rotate.
-         * @return Interactions.
-         * @api stable
-         */
-        getInteractions(): ol.Collection<ol.interaction.Interaction>;
+    /**
+     * Get the map interactions. Modifying this collection changes the interactions
+     * associated with the map.
+     *
+     * Interactions are used for e.g. pan, zoom and rotate.
+     * @return Interactions.
+     * @api stable
+     */
+    getInteractions(): ol.Collection<ol.interaction.Interaction>;
 
-        /**
-         * Get the layergroup associated with this map.
-         * @return A layer group containing the layers in this map.
-         * @observable
-         * @api stable
-         */
-        getLayerGroup(): ol.layer.Group;
+    /**
+     * Get the layergroup associated with this map.
+     * @return A layer group containing the layers in this map.
+     * @observable
+     * @api stable
+     */
+    getLayerGroup(): ol.layer.Group;
 
-        /**
-         * Get the collection of layers associated with this map.
-         * @return Layers.
-         * @api stable
-         */
-        getLayers(): ol.Collection<ol.layer.Base>;
+    /**
+     * Get the collection of layers associated with this map.
+     * @return Layers.
+     * @api stable
+     */
+    getLayers(): ol.Collection<ol.layer.Base>;
 
-        /**
-         * Get the pixel for a coordinate.  This takes a coordinate in the map view
-         * projection and returns the corresponding pixel.
-         * @param coordinate A map coordinate.
-         * @return A pixel position in the map viewport.
-         * @api stable
-         */
-        getPixelFromCoordinate(coordinate: ol.Coordinate): ol.Pixel;
+    /**
+     * Get the pixel for a coordinate.  This takes a coordinate in the map view
+     * projection and returns the corresponding pixel.
+     * @param coordinate A map coordinate.
+     * @return A pixel position in the map viewport.
+     * @api stable
+     */
+    getPixelFromCoordinate(coordinate: ol.Coordinate): ol.Pixel;
 
-        /**
-         * Get the size of this map.
-         * @return The size in pixels of the map in the DOM.
-         * @observable
-         * @api stable
-         */
-        getSize(): (ol.Size);
+    /**
+     * Get the size of this map.
+     * @return The size in pixels of the map in the DOM.
+     * @observable
+     * @api stable
+     */
+    getSize(): (ol.Size);
 
-        /**
-         * Get the view associated with this map. A view manages properties such as
-         * center and resolution.
-         * @return The view that controls this map.
-         * @observable
-         * @api stable
-         */
-        getView(): ol.View;
+    /**
+     * Get the view associated with this map. A view manages properties such as
+     * center and resolution.
+     * @return The view that controls this map.
+     * @observable
+     * @api stable
+     */
+    getView(): ol.View;
 
-        /**
-         * Get the element that serves as the map viewport.
-         * @return Viewport.
-         * @api stable
-         */
-        getViewport(): Element;
+    /**
+     * Get the element that serves as the map viewport.
+     * @return Viewport.
+     * @api stable
+     */
+    getViewport(): Element;
 
-        /**
-         * Requests an immediate render in a synchronous manner.
-         * @api stable
-         */
-        renderSync(): void;
+    /**
+     * Requests an immediate render in a synchronous manner.
+     * @api stable
+     */
+    renderSync(): void;
 
-        /**
-         * Request a map rendering (at the next animation frame).
-         * @api stable
-         */
-        render(): void;
+    /**
+     * Request a map rendering (at the next animation frame).
+     * @api stable
+     */
+    render(): void;
 
-        /**
-         * Remove the given control from the map.
-         * @param control Control.
-         * @return The removed control (or undefined
-         *     if the control was not found).
-         * @api stable
-         */
-        removeControl(control: ol.control.Control): (ol.control.Control);
+    /**
+     * Remove the given control from the map.
+     * @param control Control.
+     * @return The removed control (or undefined
+     *     if the control was not found).
+     * @api stable
+     */
+    removeControl(control: ol.control.Control): (ol.control.Control);
 
-        /**
-         * Remove the given interaction from the map.
-         * @param interaction Interaction to remove.
-         * @return The removed interaction (or
-         *     undefined if the interaction was not found).
-         * @api stable
-         */
-        removeInteraction(interaction: ol.interaction.Interaction): (ol.interaction.Interaction);
+    /**
+     * Remove the given interaction from the map.
+     * @param interaction Interaction to remove.
+     * @return The removed interaction (or
+     *     undefined if the interaction was not found).
+     * @api stable
+     */
+    removeInteraction(interaction: ol.interaction.Interaction): (ol.interaction.Interaction);
 
-        /**
-         * Removes the given layer from the map.
-         * @param layer Layer.
-         * @return The removed layer (or undefined if the
-         *     layer was not found).
-         * @api stable
-         */
-        removeLayer(layer: ol.layer.Base): (ol.layer.Base);
+    /**
+     * Removes the given layer from the map.
+     * @param layer Layer.
+     * @return The removed layer (or undefined if the
+     *     layer was not found).
+     * @api stable
+     */
+    removeLayer(layer: ol.layer.Base): (ol.layer.Base);
 
-        /**
-         * Remove the given overlay from the map.
-         * @param overlay Overlay.
-         * @return The removed overlay (or undefined
-         *     if the overlay was not found).
-         * @api stable
-         */
-        removeOverlay(overlay: ol.Overlay): (ol.Overlay);
+    /**
+     * Remove the given overlay from the map.
+     * @param overlay Overlay.
+     * @return The removed overlay (or undefined
+     *     if the overlay was not found).
+     * @api stable
+     */
+    removeOverlay(overlay: ol.Overlay): (ol.Overlay);
 
-        /**
-         * Sets the layergroup of this map.
-         * @param layerGroup A layer group containing the layers in
-         *     this map.
-         * @observable
-         * @api stable
-         */
-        setLayerGroup(layerGroup: ol.layer.Group): void;
+    /**
+     * Sets the layergroup of this map.
+     * @param layerGroup A layer group containing the layers in
+     *     this map.
+     * @observable
+     * @api stable
+     */
+    setLayerGroup(layerGroup: ol.layer.Group): void;
 
-        /**
-         * Set the size of this map.
-         * @param size The size in pixels of the map in the DOM.
-         * @observable
-         * @api
-         */
-        setSize(size: (ol.Size)): void;
+    /**
+     * Set the size of this map.
+     * @param size The size in pixels of the map in the DOM.
+     * @observable
+     * @api
+     */
+    setSize(size: (ol.Size)): void;
 
-        /**
-         * Set the target element to render this map into.
-         * @param target The Element or id of the Element
-         *     that the map is rendered in.
-         * @observable
-         * @api stable
-         */
-        setTarget(target: (Element | string)): void;
+    /**
+     * Set the target element to render this map into.
+     * @param target The Element or id of the Element
+     *     that the map is rendered in.
+     * @observable
+     * @api stable
+     */
+    setTarget(target: (Element | string)): void;
 
-        /**
-         * Set the view for this map.
-         * @param view The view that controls this map.
-         * @observable
-         * @api stable
-         */
-        setView(view: ol.View): void;
+    /**
+     * Set the view for this map.
+     * @param view The view that controls this map.
+     * @observable
+     * @api stable
+     */
+    setView(view: ol.View): void;
 
-        /**
-         * Force a recalculation of the map viewport size.  This should be called when
-         * third-party code changes the size of the map viewport.
-         * @api stable
-         */
-        updateSize(): void;
-    }
+    /**
+     * Force a recalculation of the map viewport size.  This should be called when
+     * third-party code changes the size of the map viewport.
+     * @api stable
+     */
+    updateSize(): void;
+}
 
+/**
+ * @classdesc
+ * Events emitted as map browser events are instances of this type.
+ * See {@link ol.Map} for which events trigger a map browser event.
+ *
+ * @param type Event type.
+ * @param map Map.
+ * @param browserEvent Browser event.
+ * @param opt_dragging Is the map currently being dragged?
+ * @param opt_frameState Frame state.
+ */
+export class MapBrowserEvent extends MapEvent {
     /**
      * @classdesc
      * Events emitted as map browser events are instances of this type.
@@ -6959,72 +6972,70 @@ declare namespace ol {
      * @param opt_dragging Is the map currently being dragged?
      * @param opt_frameState Frame state.
      */
-    class MapBrowserEvent extends ol.MapEvent {
-        /**
-         * @classdesc
-         * Events emitted as map browser events are instances of this type.
-         * See {@link ol.Map} for which events trigger a map browser event.
-         *
-         * @param type Event type.
-         * @param map Map.
-         * @param browserEvent Browser event.
-         * @param opt_dragging Is the map currently being dragged?
-         * @param opt_frameState Frame state.
-         */
-        constructor(type: string, map: ol.Map, browserEvent: Event, opt_dragging?: boolean, opt_frameState?: olx.FrameState);
-
-        /**
-         * The original browser event.
-         * @const
-         * @api stable
-         */
-        originalEvent: Event;
-
-        /**
-         * The pixel of the original browser event.
-         * @api stable
-         */
-        pixel: ol.Pixel;
-
-        /**
-         * The coordinate of the original browser event.
-         * @api stable
-         */
-        coordinate: ol.Coordinate;
-
-        /**
-         * Indicates if the map is currently being dragged. Only set for
-         * `POINTERDRAG` and `POINTERMOVE` events. Default is `false`.
-         *
-         * @api stable
-         */
-        dragging: boolean;
-    }
+    constructor(type: string, map: ol.Map, browserEvent: Event, opt_dragging?: boolean, opt_frameState?: olx.FrameState);
 
     /**
-     * @param type Event type.
-     * @param map Map.
-     * @param pointerEvent Pointer event.
-     * @param opt_dragging Is the map currently being dragged?
-     * @param opt_frameState Frame state.
+     * The original browser event.
+     * @const
+     * @api stable
      */
-    class MapBrowserPointerEvent extends ol.MapBrowserEvent {
-        // /**
-        //  * @param type Event type.
-        //  * @param map Map.
-        //  * @param pointerEvent Pointer event.
-        //  * @param opt_dragging Is the map currently being dragged?
-        //  * @param opt_frameState Frame state.
-        //  */
-        // constructor (type: string,
-        //           map: ol.Map,
-        //           pointerEvent: ol.pointer.PointerEvent,
-        //           opt_dragging?: boolean,
-        //           opt_frameState?: olx.FrameState)
+    originalEvent: Event;
 
-        pointerEvent: ol.pointer.PointerEvent;
-    }
+    /**
+     * The pixel of the original browser event.
+     * @api stable
+     */
+    pixel: ol.Pixel;
 
+    /**
+     * The coordinate of the original browser event.
+     * @api stable
+     */
+    coordinate: ol.Coordinate;
+
+    /**
+     * Indicates if the map is currently being dragged. Only set for
+     * `POINTERDRAG` and `POINTERMOVE` events. Default is `false`.
+     *
+     * @api stable
+     */
+    dragging: boolean;
+}
+
+/**
+ * @param type Event type.
+ * @param map Map.
+ * @param pointerEvent Pointer event.
+ * @param opt_dragging Is the map currently being dragged?
+ * @param opt_frameState Frame state.
+ */
+export class MapBrowserPointerEvent extends MapBrowserEvent {
+    // /**
+    //  * @param type Event type.
+    //  * @param map Map.
+    //  * @param pointerEvent Pointer event.
+    //  * @param opt_dragging Is the map currently being dragged?
+    //  * @param opt_frameState Frame state.
+    //  */
+    // constructor (type: string,
+    //           map: ol.Map,
+    //           pointerEvent: ol.pointer.PointerEvent,
+    //           opt_dragging?: boolean,
+    //           opt_frameState?: olx.FrameState)
+
+    pointerEvent: ol.pointer.PointerEvent;
+}
+
+/**
+ * @classdesc
+ * Events emitted as map events are instances of this type.
+ * See {@link ol.Map} for which events trigger a map event.
+ *
+ * @param type Event type.
+ * @param map Map.
+ * @param opt_frameState Frame state.
+ */
+export class MapEvent extends events.Event {
     /**
      * @classdesc
      * Events emitted as map events are instances of this type.
@@ -7034,31 +7045,30 @@ declare namespace ol {
      * @param map Map.
      * @param opt_frameState Frame state.
      */
-    class MapEvent extends ol.events.Event {
-        /**
-         * @classdesc
-         * Events emitted as map events are instances of this type.
-         * See {@link ol.Map} for which events trigger a map event.
-         *
-         * @param type Event type.
-         * @param map Map.
-         * @param opt_frameState Frame state.
-         */
-        constructor(type: string, map: ol.Map, opt_frameState?: olx.FrameState);
+    constructor(type: string, map: ol.Map, opt_frameState?: olx.FrameState);
 
-        /**
-         * The map where the event occurred.
-         * @api stable
-         */
-        map: ol.Map;
+    /**
+     * The map where the event occurred.
+     * @api stable
+     */
+    map: ol.Map;
 
-        /**
-         * The frame state at the time of the event.
-         * @api
-         */
-        frameState: olx.FrameState;
-    }
+    /**
+     * The frame state at the time of the event.
+     * @api
+     */
+    frameState: olx.FrameState;
+}
 
+/**
+ * @classdesc
+ * Events emitted by {@link ol.Object} instances are instances of this type.
+ *
+ * @param type The event type.
+ * @param key The property name.
+ * @param oldValue The old value for `key`.
+ */
+export class ObjectEvent extends events.Event {
     /**
      * @classdesc
      * Events emitted by {@link ol.Object} instances are instances of this type.
@@ -7067,31 +7077,66 @@ declare namespace ol {
      * @param key The property name.
      * @param oldValue The old value for `key`.
      */
-    class ObjectEvent extends ol.events.Event {
-        /**
-         * @classdesc
-         * Events emitted by {@link ol.Object} instances are instances of this type.
-         *
-         * @param type The event type.
-         * @param key The property name.
-         * @param oldValue The old value for `key`.
-         */
-        constructor(type: string, key: string, oldValue: any);
+    constructor(type: string, key: string, oldValue: any);
 
-        /**
-         * The name of the property whose value is changing.
-         * @api stable
-         */
-        key: string;
+    /**
+     * The name of the property whose value is changing.
+     * @api stable
+     */
+    key: string;
 
-        /**
-         * The old value. To get the new value use `e.target.get(e.key)` where
-         * `e` is the event object.
-         * @api stable
-         */
-        oldValue: any;
-    }
+    /**
+     * The old value. To get the new value use `e.target.get(e.key)` where
+     * `e` is the event object.
+     * @api stable
+     */
+    oldValue: any;
+}
 
+/**
+ * @classdesc
+ * Abstract base class; normally only used for creating subclasses and not
+ * instantiated in apps.
+ * Most non-trivial classes inherit from this.
+ *
+ * This extends {@link ol.Observable} with observable properties, where each
+ * property is observable as well as the object as a whole.
+ *
+ * Classes that inherit from this have pre-defined properties, to which you can
+ * add your owns. The pre-defined properties are listed in this documentation as
+ * 'Observable Properties', and have their own accessors; for example,
+ * {@link ol.Map} has a `target` property, accessed with `getTarget()`  and
+ * changed with `setTarget()`. Not all properties are however settable. There
+ * are also general-purpose accessors `get()` and `set()`. For example,
+ * `get('target')` is equivalent to `getTarget()`.
+ *
+ * The `set` accessors trigger a change event, and you can monitor this by
+ * registering a listener. For example, {@link ol.View} has a `center`
+ * property, so `view.on('change:center', function(evt) {...});` would call the
+ * function whenever the value of the center property changes. Within the
+ * function, `evt.target` would be the view, so `evt.target.getCenter()` would
+ * return the new center.
+ *
+ * You can add your own observable properties with
+ * `object.set('prop', 'value')`, and retrieve that with `object.get('prop')`.
+ * You can listen for changes on that property value with
+ * `object.on('change:prop', listener)`. You can get a list of all
+ * properties with {@link ol.Object#getProperties object.getProperties()}.
+ *
+ * Note that the observable properties are separate from standard JS properties.
+ * You can, for example, give your map object a title with
+ * `map.title='New title'` and with `map.set('title', 'Another title')`. The
+ * first will be a `hasOwnProperty`; the second will appear in
+ * `getProperties()`. Only the second is observable.
+ *
+ * Properties can be deleted by using the unset method. E.g.
+ * object.unset('foo').
+ *
+ * @param opt_values An object with key-value pairs.
+ * @fires ol.ObjectEvent
+ * @api
+ */
+export class Object extends Observable {
     /**
      * @classdesc
      * Abstract base class; normally only used for creating subclasses and not
@@ -7135,101 +7180,70 @@ declare namespace ol {
      * @fires ol.ObjectEvent
      * @api
      */
-    class Object extends ol.Observable {
-        /**
-         * @classdesc
-         * Abstract base class; normally only used for creating subclasses and not
-         * instantiated in apps.
-         * Most non-trivial classes inherit from this.
-         *
-         * This extends {@link ol.Observable} with observable properties, where each
-         * property is observable as well as the object as a whole.
-         *
-         * Classes that inherit from this have pre-defined properties, to which you can
-         * add your owns. The pre-defined properties are listed in this documentation as
-         * 'Observable Properties', and have their own accessors; for example,
-         * {@link ol.Map} has a `target` property, accessed with `getTarget()`  and
-         * changed with `setTarget()`. Not all properties are however settable. There
-         * are also general-purpose accessors `get()` and `set()`. For example,
-         * `get('target')` is equivalent to `getTarget()`.
-         *
-         * The `set` accessors trigger a change event, and you can monitor this by
-         * registering a listener. For example, {@link ol.View} has a `center`
-         * property, so `view.on('change:center', function(evt) {...});` would call the
-         * function whenever the value of the center property changes. Within the
-         * function, `evt.target` would be the view, so `evt.target.getCenter()` would
-         * return the new center.
-         *
-         * You can add your own observable properties with
-         * `object.set('prop', 'value')`, and retrieve that with `object.get('prop')`.
-         * You can listen for changes on that property value with
-         * `object.on('change:prop', listener)`. You can get a list of all
-         * properties with {@link ol.Object#getProperties object.getProperties()}.
-         *
-         * Note that the observable properties are separate from standard JS properties.
-         * You can, for example, give your map object a title with
-         * `map.title='New title'` and with `map.set('title', 'Another title')`. The
-         * first will be a `hasOwnProperty`; the second will appear in
-         * `getProperties()`. Only the second is observable.
-         *
-         * Properties can be deleted by using the unset method. E.g.
-         * object.unset('foo').
-         *
-         * @param opt_values An object with key-value pairs.
-         * @fires ol.ObjectEvent
-         * @api
-         */
-        constructor(opt_values?: { [k: string]: any });
+    constructor(opt_values?: { [k: string]: any });
 
-        /**
-         * Gets a value.
-         * @param key Key name.
-         * @return Value.
-         * @api stable
-         */
-        get(key: string): any;
+    /**
+     * Gets a value.
+     * @param key Key name.
+     * @return Value.
+     * @api stable
+     */
+    get(key: string): any;
 
-        /**
-         * Get a list of object property names.
-         * @return List of property names.
-         * @api stable
-         */
-        getKeys(): string[];
+    /**
+     * Get a list of object property names.
+     * @return List of property names.
+     * @api stable
+     */
+    getKeys(): string[];
 
-        /**
-         * Get an object of all property names and values.
-         * @return Object.
-         * @api stable
-         */
-        getProperties(): { [k: string]: any };
+    /**
+     * Get an object of all property names and values.
+     * @return Object.
+     * @api stable
+     */
+    getProperties(): { [k: string]: any };
 
-        /**
-         * Sets a value.
-         * @param key Key name.
-         * @param value Value.
-         * @param opt_silent Update without triggering an event.
-         * @api stable
-         */
-        set(key: string, value: any, opt_silent?: boolean): void;
+    /**
+     * Sets a value.
+     * @param key Key name.
+     * @param value Value.
+     * @param opt_silent Update without triggering an event.
+     * @api stable
+     */
+    set(key: string, value: any, opt_silent?: boolean): void;
 
-        /**
-         * Sets a collection of key-value pairs.  Note that this changes any existing
-         * properties and adds new ones (it does not remove any existing properties).
-         * @param values Values.
-         * @param opt_silent Update without triggering an event.
-         * @api stable
-         */
-        setProperties(values: { [k: string]: any }, opt_silent?: boolean): void;
+    /**
+     * Sets a collection of key-value pairs.  Note that this changes any existing
+     * properties and adds new ones (it does not remove any existing properties).
+     * @param values Values.
+     * @param opt_silent Update without triggering an event.
+     * @api stable
+     */
+    setProperties(values: { [k: string]: any }, opt_silent?: boolean): void;
 
-        /**
-         * Unsets a property.
-         * @param key Key name.
-         * @param opt_silent Unset without triggering an event.
-         * @api stable
-         */
-        unset(key: string, opt_silent?: boolean): void;
-    }
+    /**
+     * Unsets a property.
+     * @param key Key name.
+     * @param opt_silent Unset without triggering an event.
+     * @api stable
+     */
+    unset(key: string, opt_silent?: boolean): void;
+}
 
+/**
+ * @classdesc
+ * Abstract base class; normally only used for creating subclasses and not
+ * instantiated in apps.
+ * An event target providing convenient methods for listener registration
+ * and unregistration. A generic `change` event is always available through
+ * {@link ol.Observable#changed}.
+ *
+ * @fires ol.events.Event
+ * @struct
+ * @api stable
+ */
+export class Observable extends events.EventTarget {
     /**
      * @classdesc
      * Abstract base class; normally only used for creating subclasses and not
@@ -7242,95 +7256,102 @@ declare namespace ol {
      * @struct
      * @api stable
      */
-    class Observable extends ol.events.EventTarget {
-        /**
-         * @classdesc
-         * Abstract base class; normally only used for creating subclasses and not
-         * instantiated in apps.
-         * An event target providing convenient methods for listener registration
-         * and unregistration. A generic `change` event is always available through
-         * {@link ol.Observable#changed}.
-         *
-         * @fires ol.events.Event
-         * @struct
-         * @api stable
-         */
-        constructor();
-
-        /**
-         * Removes an event listener using the key returned by `on()` or `once()`.
-         * @param key The key returned by `on()`
-         *     or `once()` (or an array of keys).
-         * @api stable
-         */
-        static unByKey(key: (ol.EventsKey | ol.EventsKey[])): void;
-
-        /**
-         * Increases the revision counter and dispatches a 'change' event.
-         * @api
-         */
-        changed(): void;
-
-        /**
-         * Dispatches an event and calls all listeners listening for events
-         * of this type. The event parameter can either be a string or an
-         * Object with a `type` property.
-         *
-         * @param event Event object.
-         * @api
-         */
-        dispatchEvent(event: (GlobalObject | ol.events.Event | string)): void;
-
-        /**
-         * Get the version number for this object.  Each time the object is modified,
-         * its version number will be incremented.
-         * @return Revision.
-         * @api
-         */
-        getRevision(): number;
-
-        /**
-         * Listen for a certain type of event.
-         * @param type The event type or array of event types.
-         * @param listener The listener function.
-         * @param opt_this The object to use as `this` in `listener`.
-         * @return Unique key for the listener. If
-         *     called with an array of event types as the first argument, the return
-         *     will be an array of keys.
-         * @api stable
-         */
-        on(type: (string | string[]), listener: ol.EventsListenerFunctionType, opt_this?: GlobalObject): (ol.EventsKey | ol.EventsKey[]);
-
-        /**
-         * Listen once for a certain type of event.
-         * @param type The event type or array of event types.
-         * @param listener The listener function.
-         * @param opt_this The object to use as `this` in `listener`.
-         * @return Unique key for the listener. If
-         *     called with an array of event types as the first argument, the return
-         *     will be an array of keys.
-         * @api stable
-         */
-        once(type: (string | string[]), listener: ol.EventsListenerFunctionType, opt_this?: GlobalObject): (ol.EventsKey | ol.EventsKey[]);
-
-        /**
-         * Unlisten for a certain type of event.
-         * @param type The event type or array of event types.
-         * @param listener The listener function.
-         * @param opt_this The object which was used as `this` by the
-         * `listener`.
-         * @api stable
-         */
-        un(type: (string | string[]), listener: ol.EventsListenerFunctionType, opt_this?: GlobalObject): void;
-    }
+    constructor();
 
     /**
-     * Overlay position: `'bottom-left'`, `'bottom-center'`,  `'bottom-right'`,
-     * `'center-left'`, `'center-center'`, `'center-right'`, `'top-left'`,
-     * `'top-center'`, `'top-right'`
+     * Removes an event listener using the key returned by `on()` or `once()`.
+     * @param key The key returned by `on()`
+     *     or `once()` (or an array of keys).
+     * @api stable
      */
-    type OverlayPositioning = "bottom-left" | "bottom-center" | "bottom-right" | "center-left" | "center-center" | "center-right" | "top-left" | "top-center" | "top-right";
+    static unByKey(key: (ol.EventsKey | ol.EventsKey[])): void;
 
+    /**
+     * Increases the revision counter and dispatches a 'change' event.
+     * @api
+     */
+    changed(): void;
+
+    /**
+     * Dispatches an event and calls all listeners listening for events
+     * of this type. The event parameter can either be a string or an
+     * Object with a `type` property.
+     *
+     * @param event Event object.
+     * @api
+     */
+    dispatchEvent(event: (GlobalObject| ol.events.Event | string)): void;
+
+    /**
+     * Get the version number for this object.  Each time the object is modified,
+     * its version number will be incremented.
+     * @return Revision.
+     * @api
+     */
+    getRevision(): number;
+
+    /**
+     * Listen for a certain type of event.
+     * @param type The event type or array of event types.
+     * @param listener The listener function.
+     * @param opt_this The object to use as `this` in `listener`.
+     * @return Unique key for the listener. If
+     *     called with an array of event types as the first argument, the return
+     *     will be an array of keys.
+     * @api stable
+     */
+    on(type: (string | string[]), listener: ol.EventsListenerFunctionType, opt_this?: GlobalObject): (ol.EventsKey | ol.EventsKey[]);
+
+    /**
+     * Listen once for a certain type of event.
+     * @param type The event type or array of event types.
+     * @param listener The listener function.
+     * @param opt_this The object to use as `this` in `listener`.
+     * @return Unique key for the listener. If
+     *     called with an array of event types as the first argument, the return
+     *     will be an array of keys.
+     * @api stable
+     */
+    once(type: (string | string[]), listener: ol.EventsListenerFunctionType, opt_this?: GlobalObject): (ol.EventsKey | ol.EventsKey[]);
+
+    /**
+     * Unlisten for a certain type of event.
+     * @param type The event type or array of event types.
+     * @param listener The listener function.
+     * @param opt_this The object which was used as `this` by the
+     * `listener`.
+     * @api stable
+     */
+    un(type: (string | string[]), listener: ol.EventsListenerFunctionType, opt_this?: GlobalObject): void;
+}
+
+/**
+ * Overlay position: `'bottom-left'`, `'bottom-center'`,  `'bottom-right'`,
+ * `'center-left'`, `'center-center'`, `'center-right'`, `'top-left'`,
+ * `'top-center'`, `'top-right'`
+ */
+export type OverlayPositioning = "bottom-left" | "bottom-center" | "bottom-right" | "center-left" | "center-center" | "center-right" | "top-left" | "top-center" | "top-right";
+
+/**
+ * @classdesc
+ * An element to be displayed over the map and attached to a single map
+ * location.  Like {@link ol.control.Control}, Overlays are visible widgets.
+ * Unlike Controls, they are not in a fixed position on the screen, but are tied
+ * to a geographical coordinate, so panning the map will move an Overlay but not
+ * a Control.
+ *
+ * Example:
+ *
+ *     var popup = new ol.Overlay({
+ *       element: document.getElementById('popup')
+ *     });
+ *     popup.setPosition(coordinate);
+ *     map.addOverlay(popup);
+ *
+ * @param options Overlay options.
+ * @api stable
+ */
+export class Overlay extends Object {
     /**
      * @classdesc
      * An element to be displayed over the map and attached to a single map
@@ -7350,205 +7371,215 @@ declare namespace ol {
      * @param options Overlay options.
      * @api stable
      */
-    class Overlay extends ol.Object {
-        /**
-         * @classdesc
-         * An element to be displayed over the map and attached to a single map
-         * location.  Like {@link ol.control.Control}, Overlays are visible widgets.
-         * Unlike Controls, they are not in a fixed position on the screen, but are tied
-         * to a geographical coordinate, so panning the map will move an Overlay but not
-         * a Control.
-         *
-         * Example:
-         *
-         *     var popup = new ol.Overlay({
-         *       element: document.getElementById('popup')
-         *     });
-         *     popup.setPosition(coordinate);
-         *     map.addOverlay(popup);
-         *
-         * @param options Overlay options.
-         * @api stable
-         */
-        constructor(options: olx.OverlayOptions);
-
-        /**
-         * Get the DOM element of this overlay.
-         * @return The Element containing the overlay.
-         * @observable
-         * @api stable
-         */
-        getElement(): (Element);
-
-        /**
-         * Get the overlay identifier which is set on constructor.
-         * @return Id.
-         * @api
-         */
-        getId(): (number | string);
-
-        /**
-         * Get the map associated with this overlay.
-         * @return The map that the overlay is part of.
-         * @observable
-         * @api stable
-         */
-        getMap(): (ol.Map);
-
-        /**
-         * Get the offset of this overlay.
-         * @return The offset.
-         * @observable
-         * @api stable
-         */
-        getOffset(): number[];
-
-        /**
-         * Get the current position of this overlay.
-         * @return The spatial point that the overlay is
-         *     anchored at.
-         * @observable
-         * @api stable
-         */
-        getPosition(): (ol.Coordinate);
-
-        /**
-         * Get the current positioning of this overlay.
-         * @return How the overlay is positioned
-         *     relative to its point on the map.
-         * @observable
-         * @api stable
-         */
-        getPositioning(): ol.OverlayPositioning;
-
-        /**
-         * Set the DOM element to be associated with this overlay.
-         * @param element The Element containing the overlay.
-         * @observable
-         * @api stable
-         */
-        setElement(element: (Element)): void;
-
-        /**
-         * Set the map to be associated with this overlay.
-         * @param map The map that the overlay is part of.
-         * @observable
-         * @api stable
-         */
-        setMap(map: (ol.Map)): void;
-
-        /**
-         * Set the offset for this overlay.
-         * @param offset Offset.
-         * @observable
-         * @api stable
-         */
-        setOffset(offset: number[]): void;
-
-        /**
-         * Set the position for this overlay. If the position is `undefined` the
-         * overlay is hidden.
-         * @param position The spatial point that the overlay
-         *     is anchored at.
-         * @observable
-         * @api stable
-         */
-        setPosition(position: (ol.Coordinate | undefined)): void;
-
-        /**
-         * Set the positioning for this overlay.
-         * @param positioning how the overlay is
-         *     positioned relative to its point on the map.
-         * @observable
-         * @api stable
-         */
-        setPositioning(positioning: ol.OverlayPositioning): void;
-    }
-
-    namespace pointer {
-        /**
-         * @classdesc
-         * A class for pointer events.
-         *
-         * This class is used as an abstraction for mouse events,
-         * touch events and even native pointer events.
-         *
-         * @param type The type of the event to create.
-         * @param originalEvent The event.
-         * @param opt_eventDict An optional dictionary of
-         *    initial event properties.
-         */
-        class PointerEvent {
-        }
-    }
+    constructor(options: olx.OverlayOptions);
 
     /**
-     * The ol.proj namespace stores:
-     * * a list of {@link ol.proj.Projection}
-     * objects, one for each projection supported by the application
-     * * a list of transform functions needed to convert coordinates in one projection
-     * into another.
-     *
-     * The static functions are the methods used to maintain these.
-     * Each transform function can handle not only simple coordinate pairs, but also
-     * large arrays of coordinates such as vector geometries.
-     *
-     * When loaded, the library adds projection objects for EPSG:4326 (WGS84
-     * geographic coordinates) and EPSG:3857 (Web or Spherical Mercator, as used
-     * for example by Bing Maps or OpenStreetMap), together with the relevant
-     * transform functions.
-     *
-     * Additional transforms may be added by using the {@link http://proj4js.org/}
-     * library (version 2.2 or later). You can use the full build supplied by
-     * Proj4js, or create a custom build to support those projections you need; see
-     * the Proj4js website for how to do this. You also need the Proj4js definitions
-     * for the required projections. These definitions can be obtained from
-     * {@link http://epsg.io/}, and are a JS function, so can be loaded in a script
-     * tag (as in the examples) or pasted into your application.
-     * The first time there is a request for a projection, either with a
-     * {@link ol.proj.projectionLike} or directly with {@link ol.proj.get}, the
-     * code will check if the Proj4js library and the necessary definition are
-     * loaded; if so, it will register the appropriate {@link ol.proj.Projection}
-     * object and add transform functions between the new projection and all the
-     * existing ones. See examples/wms-image-custom-proj for an example of this.
-     * Because the check for presence of the Proj4js library and the definition only
-     * takes place on the first request for them, this means they can be loaded
-     * dynamically as needed; for example, with user-supplied data where you don't
-     * know in advance what projections are needed, you can initially load minimal
-     * support and then load whichever are requested.
-     *
-     * Note that Proj4js does not support projection extents. If you want to add
-     * one for creating default tile grids, you can add it after the Projection
-     * object has been created with `setExtent`, for example,
-     * `ol.proj.get('EPSG:1234').setExtent(extent)`.
-     *
-     * In addition to Proj4js support, any transform functions can be added with
-     * {@link ol.proj.addCoordinateTransforms}. To use this, you must first create
-     * a {@link ol.proj.Projection} object for the new projection and add it with
-     * {@link ol.proj.addProjection}. You can then add the forward and inverse
-     * functions with {@link ol.proj.addCoordinateTransforms}. See
-     * examples/wms-custom-proj for an example of this.
-     *
-     * Note that if no transforms are needed and you only need to define the
-     * projection, just add a {@link ol.proj.Projection} with
-     * {@link ol.proj.addProjection}. See examples/wms-no-proj for an example of
-     * this.
-     *
+     * Get the DOM element of this overlay.
+     * @return The Element containing the overlay.
+     * @observable
+     * @api stable
      */
-    namespace proj {
-        /**
-         * Projection units: `'degrees'`, `'ft'`, `'m'`, `'pixels'`, `'tile-pixels'` or
-         * `'us-ft'`.
-         */
-        type Units = "degress" | "ft" | "m" | "pixels" | "tile-pixels" | "us-ft";
+    getElement(): (Element);
 
-        /**
-         * Meters per unit lookup table.
-         * @const
-         * @api stable
-         */
-        const METERS_PER_UNIT: { [k: string]: number };
+    /**
+     * Get the overlay identifier which is set on constructor.
+     * @return Id.
+     * @api
+     */
+    getId(): (number | string);
 
+    /**
+     * Get the map associated with this overlay.
+     * @return The map that the overlay is part of.
+     * @observable
+     * @api stable
+     */
+    getMap(): (ol.Map);
+
+    /**
+     * Get the offset of this overlay.
+     * @return The offset.
+     * @observable
+     * @api stable
+     */
+    getOffset(): number[];
+
+    /**
+     * Get the current position of this overlay.
+     * @return The spatial point that the overlay is
+     *     anchored at.
+     * @observable
+     * @api stable
+     */
+    getPosition(): (ol.Coordinate);
+
+    /**
+     * Get the current positioning of this overlay.
+     * @return How the overlay is positioned
+     *     relative to its point on the map.
+     * @observable
+     * @api stable
+     */
+    getPositioning(): ol.OverlayPositioning;
+
+    /**
+     * Set the DOM element to be associated with this overlay.
+     * @param element The Element containing the overlay.
+     * @observable
+     * @api stable
+     */
+    setElement(element: (Element)): void;
+
+    /**
+     * Set the map to be associated with this overlay.
+     * @param map The map that the overlay is part of.
+     * @observable
+     * @api stable
+     */
+    setMap(map: (ol.Map)): void;
+
+    /**
+     * Set the offset for this overlay.
+     * @param offset Offset.
+     * @observable
+     * @api stable
+     */
+    setOffset(offset: number[]): void;
+
+    /**
+     * Set the position for this overlay. If the position is `undefined` the
+     * overlay is hidden.
+     * @param position The spatial point that the overlay
+     *     is anchored at.
+     * @observable
+     * @api stable
+     */
+    setPosition(position: (ol.Coordinate | undefined)): void;
+
+    /**
+     * Set the positioning for this overlay.
+     * @param positioning how the overlay is
+     *     positioned relative to its point on the map.
+     * @observable
+     * @api stable
+     */
+    setPositioning(positioning: ol.OverlayPositioning): void;
+}
+
+export namespace pointer {
+    /**
+     * @classdesc
+     * A class for pointer events.
+     *
+     * This class is used as an abstraction for mouse events,
+     * touch events and even native pointer events.
+     *
+     * @param type The type of the event to create.
+     * @param originalEvent The event.
+     * @param opt_eventDict An optional dictionary of
+     *    initial event properties.
+     */
+    class PointerEvent {
+    }
+}
+
+/**
+ * The ol.proj namespace stores:
+ * * a list of {@link ol.proj.Projection}
+ * objects, one for each projection supported by the application
+ * * a list of transform functions needed to convert coordinates in one projection
+ * into another.
+ *
+ * The static functions are the methods used to maintain these.
+ * Each transform function can handle not only simple coordinate pairs, but also
+ * large arrays of coordinates such as vector geometries.
+ *
+ * When loaded, the library adds projection objects for EPSG:4326 (WGS84
+ * geographic coordinates) and EPSG:3857 (Web or Spherical Mercator, as used
+ * for example by Bing Maps or OpenStreetMap), together with the relevant
+ * transform functions.
+ *
+ * Additional transforms may be added by using the {@link http://proj4js.org/}
+ * library (version 2.2 or later). You can use the full build supplied by
+ * Proj4js, or create a custom build to support those projections you need; see
+ * the Proj4js website for how to do this. You also need the Proj4js definitions
+ * for the required projections. These definitions can be obtained from
+ * {@link http://epsg.io/}, and are a JS function, so can be loaded in a script
+ * tag (as in the examples) or pasted into your application.
+ * The first time there is a request for a projection, either with a
+ * {@link ol.proj.projectionLike} or directly with {@link ol.proj.get}, the
+ * code will check if the Proj4js library and the necessary definition are
+ * loaded; if so, it will register the appropriate {@link ol.proj.Projection}
+ * object and add transform functions between the new projection and all the
+ * existing ones. See examples/wms-image-custom-proj for an example of this.
+ * Because the check for presence of the Proj4js library and the definition only
+ * takes place on the first request for them, this means they can be loaded
+ * dynamically as needed; for example, with user-supplied data where you don't
+ * know in advance what projections are needed, you can initially load minimal
+ * support and then load whichever are requested.
+ *
+ * Note that Proj4js does not support projection extents. If you want to add
+ * one for creating default tile grids, you can add it after the Projection
+ * object has been created with `setExtent`, for example,
+ * `ol.proj.get('EPSG:1234').setExtent(extent)`.
+ *
+ * In addition to Proj4js support, any transform functions can be added with
+ * {@link ol.proj.addCoordinateTransforms}. To use this, you must first create
+ * a {@link ol.proj.Projection} object for the new projection and add it with
+ * {@link ol.proj.addProjection}. You can then add the forward and inverse
+ * functions with {@link ol.proj.addCoordinateTransforms}. See
+ * examples/wms-custom-proj for an example of this.
+ *
+ * Note that if no transforms are needed and you only need to define the
+ * projection, just add a {@link ol.proj.Projection} with
+ * {@link ol.proj.addProjection}. See examples/wms-no-proj for an example of
+ * this.
+ *
+ */
+export namespace proj {
+    /**
+     * Projection units: `'degrees'`, `'ft'`, `'m'`, `'pixels'`, `'tile-pixels'` or
+     * `'us-ft'`.
+     */
+    type Units = "degress" | "ft" | "m" | "pixels" | "tile-pixels" | "us-ft";
+
+    /**
+     * Meters per unit lookup table.
+     * @const
+     * @api stable
+     */
+    const METERS_PER_UNIT: { [k: string]: number };
+
+    /**
+     * @classdesc
+     * Projection definition class. One of these is created for each projection
+     * supported in the application and stored in the {@link ol.proj} namespace.
+     * You can use these in applications, but this is not required, as API params
+     * and options use {@link ol.ProjectionLike} which means the simple string
+     * code will suffice.
+     *
+     * You can use {@link ol.proj.get} to retrieve the object for a particular
+     * projection.
+     *
+     * The library includes definitions for `EPSG:4326` and `EPSG:3857`, together
+     * with the following aliases:
+     * * `EPSG:4326`: CRS:84, urn:ogc:def:crs:EPSG:6.6:4326,
+     *     urn:ogc:def:crs:OGC:1.3:CRS84, urn:ogc:def:crs:OGC:2:84,
+     *     http://www.opengis.net/gml/srs/epsg.xml#4326,
+     *     urn:x-ogc:def:crs:EPSG:4326
+     * * `EPSG:3857`: EPSG:102100, EPSG:102113, EPSG:900913,
+     *     urn:ogc:def:crs:EPSG:6.18:3:3857,
+     *     http://www.opengis.net/gml/srs/epsg.xml#3857
+     *
+     * If you use proj4js, aliases can be added using `proj4.defs()`; see
+     * [documentation](https://github.com/proj4js/proj4js). To set an alternative
+     * namespace for proj4, use {@link ol.proj.setProj4}.
+     *
+     * @param options Projection options.
+     * @struct
+     * @api stable
+     */
+    class Projection {
         /**
          * @classdesc
          * Projection definition class. One of these is created for each projection
@@ -7578,289 +7609,276 @@ declare namespace ol {
          * @struct
          * @api stable
          */
-        class Projection {
-            /**
-             * @classdesc
-             * Projection definition class. One of these is created for each projection
-             * supported in the application and stored in the {@link ol.proj} namespace.
-             * You can use these in applications, but this is not required, as API params
-             * and options use {@link ol.ProjectionLike} which means the simple string
-             * code will suffice.
-             *
-             * You can use {@link ol.proj.get} to retrieve the object for a particular
-             * projection.
-             *
-             * The library includes definitions for `EPSG:4326` and `EPSG:3857`, together
-             * with the following aliases:
-             * * `EPSG:4326`: CRS:84, urn:ogc:def:crs:EPSG:6.6:4326,
-             *     urn:ogc:def:crs:OGC:1.3:CRS84, urn:ogc:def:crs:OGC:2:84,
-             *     http://www.opengis.net/gml/srs/epsg.xml#4326,
-             *     urn:x-ogc:def:crs:EPSG:4326
-             * * `EPSG:3857`: EPSG:102100, EPSG:102113, EPSG:900913,
-             *     urn:ogc:def:crs:EPSG:6.18:3:3857,
-             *     http://www.opengis.net/gml/srs/epsg.xml#3857
-             *
-             * If you use proj4js, aliases can be added using `proj4.defs()`; see
-             * [documentation](https://github.com/proj4js/proj4js). To set an alternative
-             * namespace for proj4, use {@link ol.proj.setProj4}.
-             *
-             * @param options Projection options.
-             * @struct
-             * @api stable
-             */
-            constructor(options: olx.ProjectionOptions);
-
-            /**
-             * Get the code for this projection, e.g. 'EPSG:4326'.
-             * @return Code.
-             * @api stable
-             */
-            getCode(): string;
-
-            /**
-             * Get the validity extent for this projection.
-             * @return Extent.
-             * @api stable
-             */
-            getExtent(): ol.Extent;
-
-            /**
-             * Get the units of this projection.
-             * @return Units.
-             * @api stable
-             */
-            getUnits(): ol.proj.Units;
-
-            /**
-             * Get the amount of meters per unit of this projection.  If the projection is
-             * not configured with `metersPerUnit` or a units identifier, the return is
-             * `undefined`.
-             * @return Meters.
-             * @api stable
-             */
-            getMetersPerUnit(): (number);
-
-            /**
-             * Get the world extent for this projection.
-             * @return Extent.
-             * @api
-             */
-            getWorldExtent(): ol.Extent;
-
-            /**
-             * Is this projection a global projection which spans the whole world?
-             * @return Whether the projection is global.
-             * @api stable
-             */
-            isGlobal(): boolean;
-
-            /**
-             * Set if the projection is a global projection which spans the whole world
-             * @param global Whether the projection is global.
-             * @api stable
-             */
-            setGlobal(global: boolean): void;
-
-            /**
-             * Set the validity extent for this projection.
-             * @param extent Extent.
-             * @api stable
-             */
-            setExtent(extent: ol.Extent): void;
-
-            /**
-             * Set the world extent for this projection.
-             * @param worldExtent World extent
-             *     [minlon, minlat, maxlon, maxlat].
-             * @api
-             */
-            setWorldExtent(worldExtent: ol.Extent): void;
-
-            /**
-             * Set the getPointResolution function for this projection.
-             * @param func Function
-             * @api
-             */
-            setGetPointResolution(func: ((resolution: number, coords: ol.Coordinate) => number)): void;
-
-            /**
-             * Get the resolution of the point in degrees or distance units.
-             * For projections with degrees as the unit this will simply return the
-             * provided resolution. The default for other projections is to estimate
-             * the point resolution by transforming the 'point' pixel to EPSG:4326,
-             * measuring its width and height on the normal sphere,
-             * and taking the average of the width and height.
-             * An alternative implementation may be given when constructing a
-             * projection. For many local projections,
-             * such a custom function will return the resolution unchanged.
-             * @param resolution Resolution in projection units.
-             * @param point Point.
-             * @return Point resolution in projection units.
-             * @api
-             */
-            getPointResolution(resolution: number, point: ol.Coordinate): number;
-        }
+        constructor(options: olx.ProjectionOptions);
 
         /**
-         * Register proj4. If not explicitly registered, it will be assumed that
-         * proj4js will be loaded in the global namespace. For example in a
-         * browserify ES6 environment you could use:
-         *
-         *     import ol from 'openlayers';
-         *     import proj4 from 'proj4';
-         *     ol.proj.setProj4(proj4);
-         *
-         * @param proj4 Proj4.
+         * Get the code for this projection, e.g. 'EPSG:4326'.
+         * @return Code.
+         * @api stable
+         */
+        getCode(): string;
+
+        /**
+         * Get the validity extent for this projection.
+         * @return Extent.
+         * @api stable
+         */
+        getExtent(): ol.Extent;
+
+        /**
+         * Get the units of this projection.
+         * @return Units.
+         * @api stable
+         */
+        getUnits(): ol.proj.Units;
+
+        /**
+         * Get the amount of meters per unit of this projection.  If the projection is
+         * not configured with `metersPerUnit` or a units identifier, the return is
+         * `undefined`.
+         * @return Meters.
+         * @api stable
+         */
+        getMetersPerUnit(): (number);
+
+        /**
+         * Get the world extent for this projection.
+         * @return Extent.
          * @api
          */
-        function setProj4(proj4: any): void;
+        getWorldExtent(): ol.Extent;
 
         /**
-         * Registers transformation functions that don't alter coordinates. Those allow
-         * to transform between projections with equal meaning.
-         *
-         * @param projections Projections.
+         * Is this projection a global projection which spans the whole world?
+         * @return Whether the projection is global.
+         * @api stable
+         */
+        isGlobal(): boolean;
+
+        /**
+         * Set if the projection is a global projection which spans the whole world
+         * @param global Whether the projection is global.
+         * @api stable
+         */
+        setGlobal(global: boolean): void;
+
+        /**
+         * Set the validity extent for this projection.
+         * @param extent Extent.
+         * @api stable
+         */
+        setExtent(extent: ol.Extent): void;
+
+        /**
+         * Set the world extent for this projection.
+         * @param worldExtent World extent
+         *     [minlon, minlat, maxlon, maxlat].
          * @api
          */
-        function addEquivalentProjections(projections: ol.proj.Projection[]): void;
+        setWorldExtent(worldExtent: ol.Extent): void;
 
         /**
-         * Add a Projection object to the list of supported projections that can be
-         * looked up by their code.
-         *
-         * @param projection Projection instance.
-         * @api stable
-         */
-        function addProjection(projection: ol.proj.Projection): void;
-
-        /**
-         * Registers coordinate transform functions to convert coordinates between the
-         * source projection and the destination projection.
-         * The forward and inverse functions convert coordinate pairs; this function
-         * converts these into the functions used internally which also handle
-         * extents and coordinate arrays.
-         *
-         * @param source Source projection.
-         * @param destination Destination projection.
-         * @param forward The forward transform
-         *     function (that is, from the source projection to the destination
-         *     projection) that takes a {@link ol.Coordinate} as argument and returns
-         *     the transformed {@link ol.Coordinate}.
-         * @param inverse The inverse transform
-         *     function (that is, from the destination projection to the source
-         *     projection) that takes a {@link ol.Coordinate} as argument and returns
-         *     the transformed {@link ol.Coordinate}.
-         * @api stable
-         */
-        function addCoordinateTransforms(source: ol.ProjectionLike,
-                                         destination: ol.ProjectionLike,
-                                         forward: ((coords: ol.Coordinate) => ol.Coordinate),
-                                         inverse: ((coords: ol.Coordinate) => ol.Coordinate)): void;
-
-        /**
-         * Transforms a coordinate from longitude/latitude to a different projection.
-         * @param coordinate Coordinate as longitude and latitude, i.e.
-         *     an array with longitude as 1st and latitude as 2nd element.
-         * @param opt_projection Target projection. The
-         *     default is Web Mercator, i.e. 'EPSG:3857'.
-         * @return Coordinate projected to the target projection.
-         * @api stable
-         */
-        function fromLonLat(coordinate: ol.Coordinate, opt_projection?: ol.ProjectionLike): ol.Coordinate;
-
-        /**
-         * Transforms a coordinate to longitude/latitude.
-         * @param coordinate Projected coordinate.
-         * @param opt_projection Projection of the coordinate.
-         *     The default is Web Mercator, i.e. 'EPSG:3857'.
-         * @return Coordinate as longitude and latitude, i.e. an array
-         *     with longitude as 1st and latitude as 2nd element.
-         * @api stable
-         */
-        function toLonLat(coordinate: ol.Coordinate, opt_projection?: ol.ProjectionLike): ol.Coordinate;
-
-        /**
-         * Fetches a Projection object for the code specified.
-         *
-         * @param projectionLike Either a code string which is
-         *     a combination of authority and identifier such as "EPSG:4326", or an
-         *     existing projection object, or undefined.
-         * @return Projection object, or null if not in list.
-         * @api stable
-         */
-        function get(projectionLike: ol.ProjectionLike): ol.proj.Projection;
-
-        /**
-         * Checks if two projections are the same, that is every coordinate in one
-         * projection does represent the same geographic point as the same coordinate in
-         * the other projection.
-         *
-         * @param projection1 Projection 1.
-         * @param projection2 Projection 2.
-         * @return Equivalent.
+         * Set the getPointResolution function for this projection.
+         * @param func Function
          * @api
          */
-        function equivalent(projection1: ol.proj.Projection, projection2: ol.proj.Projection): boolean;
+        setGetPointResolution(func: ((resolution: number, coords: ol.Coordinate) => number)): void;
 
         /**
-         * Given the projection-like objects, searches for a transformation
-         * function to convert a coordinates array from the source projection to the
-         * destination projection.
-         *
-         * @param source Source.
-         * @param destination Destination.
-         * @return Transform function.
-         * @api stable
+         * Get the resolution of the point in degrees or distance units.
+         * For projections with degrees as the unit this will simply return the
+         * provided resolution. The default for other projections is to estimate
+         * the point resolution by transforming the 'point' pixel to EPSG:4326,
+         * measuring its width and height on the normal sphere,
+         * and taking the average of the width and height.
+         * An alternative implementation may be given when constructing a
+         * projection. For many local projections,
+         * such a custom function will return the resolution unchanged.
+         * @param resolution Resolution in projection units.
+         * @param point Point.
+         * @return Point resolution in projection units.
+         * @api
          */
-        function getTransform(source: ol.ProjectionLike, destination: ol.ProjectionLike): ol.TransformFunction;
-
-        /**
-         * Transforms a coordinate from source projection to destination projection.
-         * This returns a new coordinate (and does not modify the original).
-         *
-         * See {@link ol.proj.transformExtent} for extent transformation.
-         * See the transform method of {@link ol.geom.Geometry} and its subclasses for
-         * geometry transforms.
-         *
-         * @param coordinate Coordinate.
-         * @param source Source projection-like.
-         * @param destination Destination projection-like.
-         */
-        function transform(coordinate: ol.Coordinate, source: ol.ProjectionLike, destination: ol.ProjectionLike): ol.Coordinate;
-
-        /**
-         * Transforms an extent from source projection to destination projection.  This
-         * returns a new extent (and does not modify the original).
-         *
-         * @param extent The extent to transform.
-         * @param source Source projection-like.
-         * @param destination Destination projection-like.
-         * @return The transformed extent.
-         * @api stable
-         */
-        function transformExtent(extent: ol.Extent, source: ol.ProjectionLike, destination: ol.ProjectionLike): ol.Extent;
-
-        /**
-         * Get the resolution of the point in degrees or distance units. For
-         * projections with degrees as the unit this will simply return the
-         * provided resolution. For other projections the point resolution is
-         * estimated by transforming the 'point' pixel to EPSG:4326, measuring
-         * its width and height on the normal sphere, and taking the average of
-         * the width and height.
-         * @param projection The projection.
-         * @param resolution Nominal resolution in projection units.
-         * @param point Point to find adjusted resolution at.
-         * @return Point to find adjusted resolution at.
-         */
-        function getPointResolution(
-            projection: ol.proj.Projection,
-            resolution: number,
-            point: ol.Coordinate
-        ): number;
+        getPointResolution(resolution: number, point: ol.Coordinate): number;
     }
 
-    namespace render {
-        namespace canvas {
+    /**
+     * Register proj4. If not explicitly registered, it will be assumed that
+     * proj4js will be loaded in the global namespace. For example in a
+     * browserify ES6 environment you could use:
+     *
+     *     import ol from 'openlayers';
+     *     import proj4 from 'proj4';
+     *     ol.proj.setProj4(proj4);
+     *
+     * @param proj4 Proj4.
+     * @api
+     */
+    function setProj4(proj4: any): void;
+
+    /**
+     * Registers transformation functions that don't alter coordinates. Those allow
+     * to transform between projections with equal meaning.
+     *
+     * @param projections Projections.
+     * @api
+     */
+    function addEquivalentProjections(projections: ol.proj.Projection[]): void;
+
+    /**
+     * Add a Projection object to the list of supported projections that can be
+     * looked up by their code.
+     *
+     * @param projection Projection instance.
+     * @api stable
+     */
+    function addProjection(projection: ol.proj.Projection): void;
+
+    /**
+     * Registers coordinate transform functions to convert coordinates between the
+     * source projection and the destination projection.
+     * The forward and inverse functions convert coordinate pairs; this function
+     * converts these into the functions used internally which also handle
+     * extents and coordinate arrays.
+     *
+     * @param source Source projection.
+     * @param destination Destination projection.
+     * @param forward The forward transform
+     *     function (that is, from the source projection to the destination
+     *     projection) that takes a {@link ol.Coordinate} as argument and returns
+     *     the transformed {@link ol.Coordinate}.
+     * @param inverse The inverse transform
+     *     function (that is, from the destination projection to the source
+     *     projection) that takes a {@link ol.Coordinate} as argument and returns
+     *     the transformed {@link ol.Coordinate}.
+     * @api stable
+     */
+    function addCoordinateTransforms(source: ol.ProjectionLike,
+                                        destination: ol.ProjectionLike,
+                                        forward: ((coords: ol.Coordinate) => ol.Coordinate),
+                                        inverse: ((coords: ol.Coordinate) => ol.Coordinate)): void;
+
+    /**
+     * Transforms a coordinate from longitude/latitude to a different projection.
+     * @param coordinate Coordinate as longitude and latitude, i.e.
+     *     an array with longitude as 1st and latitude as 2nd element.
+     * @param opt_projection Target projection. The
+     *     default is Web Mercator, i.e. 'EPSG:3857'.
+     * @return Coordinate projected to the target projection.
+     * @api stable
+     */
+    function fromLonLat(coordinate: ol.Coordinate, opt_projection?: ol.ProjectionLike): ol.Coordinate;
+
+    /**
+     * Transforms a coordinate to longitude/latitude.
+     * @param coordinate Projected coordinate.
+     * @param opt_projection Projection of the coordinate.
+     *     The default is Web Mercator, i.e. 'EPSG:3857'.
+     * @return Coordinate as longitude and latitude, i.e. an array
+     *     with longitude as 1st and latitude as 2nd element.
+     * @api stable
+     */
+    function toLonLat(coordinate: ol.Coordinate, opt_projection?: ol.ProjectionLike): ol.Coordinate;
+
+    /**
+     * Fetches a Projection object for the code specified.
+     *
+     * @param projectionLike Either a code string which is
+     *     a combination of authority and identifier such as "EPSG:4326", or an
+     *     existing projection object, or undefined.
+     * @return Projection object, or null if not in list.
+     * @api stable
+     */
+    function get(projectionLike: ol.ProjectionLike): ol.proj.Projection;
+
+    /**
+     * Checks if two projections are the same, that is every coordinate in one
+     * projection does represent the same geographic point as the same coordinate in
+     * the other projection.
+     *
+     * @param projection1 Projection 1.
+     * @param projection2 Projection 2.
+     * @return Equivalent.
+     * @api
+     */
+    function equivalent(projection1: ol.proj.Projection, projection2: ol.proj.Projection): boolean;
+
+    /**
+     * Given the projection-like objects, searches for a transformation
+     * function to convert a coordinates array from the source projection to the
+     * destination projection.
+     *
+     * @param source Source.
+     * @param destination Destination.
+     * @return Transform function.
+     * @api stable
+     */
+    function getTransform(source: ol.ProjectionLike, destination: ol.ProjectionLike): ol.TransformFunction;
+
+    /**
+     * Transforms a coordinate from source projection to destination projection.
+     * This returns a new coordinate (and does not modify the original).
+     *
+     * See {@link ol.proj.transformExtent} for extent transformation.
+     * See the transform method of {@link ol.geom.Geometry} and its subclasses for
+     * geometry transforms.
+     *
+     * @param coordinate Coordinate.
+     * @param source Source projection-like.
+     * @param destination Destination projection-like.
+     */
+    function transform(coordinate: ol.Coordinate, source: ol.ProjectionLike, destination: ol.ProjectionLike): ol.Coordinate;
+
+    /**
+     * Transforms an extent from source projection to destination projection.  This
+     * returns a new extent (and does not modify the original).
+     *
+     * @param extent The extent to transform.
+     * @param source Source projection-like.
+     * @param destination Destination projection-like.
+     * @return The transformed extent.
+     * @api stable
+     */
+    function transformExtent(extent: ol.Extent, source: ol.ProjectionLike, destination: ol.ProjectionLike): ol.Extent;
+
+    /**
+     * Get the resolution of the point in degrees or distance units. For
+     * projections with degrees as the unit this will simply return the
+     * provided resolution. For other projections the point resolution is
+     * estimated by transforming the 'point' pixel to EPSG:4326, measuring
+     * its width and height on the normal sphere, and taking the average of
+     * the width and height.
+     * @param projection The projection.
+     * @param resolution Nominal resolution in projection units.
+     * @param point Point to find adjusted resolution at.
+     * @return Point to find adjusted resolution at.
+     */
+    function getPointResolution(
+        projection: ol.proj.Projection,
+        resolution: number,
+        point: ol.Coordinate
+    ): number;
+}
+
+export namespace render {
+    namespace canvas {
+        /**
+         * @classdesc
+         * A concrete subclass of {@link ol.render.VectorContext} that implements
+         * direct rendering of features and geometries to an HTML5 Canvas context.
+         * Instances of this class are created internally by the library and
+         * provided to application code as vectorContext member of the
+         * {@link ol.render.Event} object associated with postcompose, precompose and
+         * render events emitted by layers and maps.
+         *
+         * @param context Context.
+         * @param pixelRatio Pixel ratio.
+         * @param extent Extent.
+         * @param transform Transform.
+         * @param viewRotation View rotation.
+         * @struct
+         */
+        class Immediate extends render.VectorContext {
             /**
              * @classdesc
              * A concrete subclass of {@link ol.render.VectorContext} that implements
@@ -7877,66 +7895,57 @@ declare namespace ol {
              * @param viewRotation View rotation.
              * @struct
              */
-            class Immediate extends ol.render.VectorContext {
-                /**
-                 * @classdesc
-                 * A concrete subclass of {@link ol.render.VectorContext} that implements
-                 * direct rendering of features and geometries to an HTML5 Canvas context.
-                 * Instances of this class are created internally by the library and
-                 * provided to application code as vectorContext member of the
-                 * {@link ol.render.Event} object associated with postcompose, precompose and
-                 * render events emitted by layers and maps.
-                 *
-                 * @param context Context.
-                 * @param pixelRatio Pixel ratio.
-                 * @param extent Extent.
-                 * @param transform Transform.
-                 * @param viewRotation View rotation.
-                 * @struct
-                 */
-                constructor(context: CanvasRenderingContext2D, pixelRatio: number, extent: ol.Extent, transform: any, viewRotation: number);
+            constructor(context: CanvasRenderingContext2D, pixelRatio: number, extent: ol.Extent, transform: any, viewRotation: number);
 
-                /**
-                 * Render a circle geometry into the canvas.  Rendering is immediate and uses
-                 * the current fill and stroke styles.
-                 *
-                 * @param geometry Circle geometry.
-                 * @api
-                 */
-                drawCircle(geometry: ol.geom.Circle): void;
+            /**
+             * Render a circle geometry into the canvas.  Rendering is immediate and uses
+             * the current fill and stroke styles.
+             *
+             * @param geometry Circle geometry.
+             * @api
+             */
+            drawCircle(geometry: ol.geom.Circle): void;
 
-                /**
-                 * Set the rendering style.  Note that since this is an immediate rendering API,
-                 * any `zIndex` on the provided style will be ignored.
-                 *
-                 * @param style The rendering style.
-                 * @api
-                 */
-                setStyle(style: ol.style.Style): void;
+            /**
+             * Set the rendering style.  Note that since this is an immediate rendering API,
+             * any `zIndex` on the provided style will be ignored.
+             *
+             * @param style The rendering style.
+             * @api
+             */
+            setStyle(style: ol.style.Style): void;
 
-                /**
-                 * Render a geometry into the canvas.  Call
-                 * {@link ol.render.canvas.Immediate#setStyle} first to set the rendering style.
-                 *
-                 * @param geometry The geometry to render.
-                 * @api
-                 */
-                drawGeometry(geometry: (ol.geom.Geometry | ol.render.Feature)): void;
+            /**
+             * Render a geometry into the canvas.  Call
+             * {@link ol.render.canvas.Immediate#setStyle} first to set the rendering style.
+             *
+             * @param geometry The geometry to render.
+             * @api
+             */
+            drawGeometry(geometry: (ol.geom.Geometry | ol.render.Feature)): void;
 
-                /**
-                 * Render a feature into the canvas.  Note that any `zIndex` on the provided
-                 * style will be ignored - features are rendered immediately in the order that
-                 * this method is called.  If you need `zIndex` support, you should be using an
-                 * {@link ol.layer.Vector} instead.
-                 *
-                 * @param feature Feature.
-                 * @param style Style.
-                 * @api
-                 */
-                drawFeature(feature: ol.Feature, style: ol.style.Style): void;
-            }
+            /**
+             * Render a feature into the canvas.  Note that any `zIndex` on the provided
+             * style will be ignored - features are rendered immediately in the order that
+             * this method is called.  If you need `zIndex` support, you should be using an
+             * {@link ol.layer.Vector} instead.
+             *
+             * @param feature Feature.
+             * @param style Style.
+             * @api
+             */
+            drawFeature(feature: ol.Feature, style: ol.style.Style): void;
         }
+    }
 
+    /**
+     * @param type Type.
+     * @param opt_vectorContext Vector context.
+     * @param opt_frameState Frame state.
+     * @param opt_context Context.
+     * @param opt_glContext WebGL Context.
+     */
+    class Event extends events.Event {
         /**
          * @param type Type.
          * @param opt_vectorContext Vector context.
@@ -7944,45 +7953,49 @@ declare namespace ol {
          * @param opt_context Context.
          * @param opt_glContext WebGL Context.
          */
-        class Event extends ol.events.Event {
-            /**
-             * @param type Type.
-             * @param opt_vectorContext Vector context.
-             * @param opt_frameState Frame state.
-             * @param opt_context Context.
-             * @param opt_glContext WebGL Context.
-             */
-            constructor(type: ol.render.EventType, opt_vectorContext?: ol.render.VectorContext, opt_frameState?: olx.FrameState, opt_context?: CanvasRenderingContext2D, opt_glContext?: any);
+        constructor(type: ol.render.EventType, opt_vectorContext?: ol.render.VectorContext, opt_frameState?: olx.FrameState, opt_context?: CanvasRenderingContext2D, opt_glContext?: any);
 
-            /**
-             * For canvas, this is an instance of {@link ol.render.canvas.Immediate}.
-             * @api
-             */
-            vectorContext: ol.render.VectorContext;
+        /**
+         * For canvas, this is an instance of {@link ol.render.canvas.Immediate}.
+         * @api
+         */
+        vectorContext: ol.render.VectorContext;
 
-            /**
-             * An object representing the current render frame state.
-             * @api
-             */
-            frameState: olx.FrameState;
+        /**
+         * An object representing the current render frame state.
+         * @api
+         */
+        frameState: olx.FrameState;
 
-            /**
-             * Canvas context. Only available when a Canvas renderer is used, null
-             * otherwise.
-             * @api
-             */
-            context: CanvasRenderingContext2D;
+        /**
+         * Canvas context. Only available when a Canvas renderer is used, null
+         * otherwise.
+         * @api
+         */
+        context: CanvasRenderingContext2D;
 
-            /**
-             * WebGL context. Only available when a WebGL renderer is used, null
-             * otherwise.
-             * @api
-             */
-            glContext: any;
-        }
+        /**
+         * WebGL context. Only available when a WebGL renderer is used, null
+         * otherwise.
+         * @api
+         */
+        glContext: any;
+    }
 
-        type EventType = string;
+    type EventType = string;
 
+    /**
+     * Lightweight, read-only, {@link ol.Feature} and {@link ol.geom.Geometry} like
+     * structure, optimized for rendering and styling. Geometry access through the
+     * API is limited to getting the type and extent of the geometry.
+     *
+     * @param type Geometry type.
+     * @param flatCoordinates Flat coordinates. These always need
+     *     to be right-handed for polygons.
+     * @param ends Ends or Endss.
+     * @param properties Properties.
+     */
+    class Feature {
         /**
          * Lightweight, read-only, {@link ol.Feature} and {@link ol.geom.Geometry} like
          * structure, optimized for rendering and styling. Geometry access through the
@@ -7994,107 +8007,103 @@ declare namespace ol {
          * @param ends Ends or Endss.
          * @param properties Properties.
          */
-        class Feature {
-            /**
-             * Lightweight, read-only, {@link ol.Feature} and {@link ol.geom.Geometry} like
-             * structure, optimized for rendering and styling. Geometry access through the
-             * API is limited to getting the type and extent of the geometry.
-             *
-             * @param type Geometry type.
-             * @param flatCoordinates Flat coordinates. These always need
-             *     to be right-handed for polygons.
-             * @param ends Ends or Endss.
-             * @param properties Properties.
-             */
-            constructor(type: ol.geom.GeometryType, flatCoordinates: number[], ends: (number[] | number[][]), properties: { [k: string]: any });
+        constructor(type: ol.geom.GeometryType, flatCoordinates: number[], ends: (number[] | number[][]), properties: { [k: string]: any });
 
-            /**
-             * Get a feature property by its key.
-             * @param key Key
-             * @return Value for the requested key.
-             * @api
-             */
-            get(key: string): any;
+        /**
+         * Get a feature property by its key.
+         * @param key Key
+         * @return Value for the requested key.
+         * @api
+         */
+        get(key: string): any;
 
-            /**
-             * Get the extent of this feature's geometry.
-             * @return Extent.
-             * @api
-             */
-            getExtent(): ol.Extent;
+        /**
+         * Get the extent of this feature's geometry.
+         * @return Extent.
+         * @api
+         */
+        getExtent(): ol.Extent;
 
-            /**
-             * Get the feature for working with its geometry.
-             * @return Feature.
-             * @api
-             */
-            getGeometry(): ol.render.Feature;
+        /**
+         * Get the feature for working with its geometry.
+         * @return Feature.
+         * @api
+         */
+        getGeometry(): ol.render.Feature;
 
-            /**
-             * Get the feature properties.
-             * @return Feature properties.
-             * @api
-             */
-            getProperties(): { [k: string]: any };
+        /**
+         * Get the feature properties.
+         * @return Feature properties.
+         * @api
+         */
+        getProperties(): { [k: string]: any };
 
-            /**
-             * Get the type of this feature's geometry.
-             * @return Geometry type.
-             * @api
-             */
-            getType(): ol.geom.GeometryType;
-        }
+        /**
+         * Get the type of this feature's geometry.
+         * @return Geometry type.
+         * @api
+         */
+        getType(): ol.geom.GeometryType;
+    }
 
+    /**
+     * Context for drawing geometries.  A vector context is available on render
+     * events and does not need to be constructed directly.
+     * @struct
+     * @api
+     */
+    class VectorContext {
         /**
          * Context for drawing geometries.  A vector context is available on render
          * events and does not need to be constructed directly.
          * @struct
          * @api
          */
-        class VectorContext {
-            /**
-             * Context for drawing geometries.  A vector context is available on render
-             * events and does not need to be constructed directly.
-             * @struct
-             * @api
-             */
-            constructor();
-        }
-
-        /**
-         * Binds a Canvas Immediate API to a canvas context, to allow drawing geometries
-         * to the context's canvas.
-         *
-         * The units for geometry coordinates are css pixels relative to the top left
-         * corner of the canvas element.
-         * ```js
-         * var canvas = document.createElement('canvas');
-         * var render = ol.render.toContext(canvas.getContext('2d'),
-         *     { size: [100, 100] });
-         * render.setFillStrokeStyle(new ol.style.Fill({ color: blue }));
-         * render.drawPolygon(
-         *     new ol.geom.Polygon([[[0, 0], [100, 100], [100, 0], [0, 0]]]));
-         * ```
-         *
-         * @param context Canvas context.
-         * @param opt_options Options.
-         * @return Canvas Immediate.
-         * @api
-         */
-        function toContext(context: CanvasRenderingContext2D, opt_options?: olx.render.ToContextOptions): ol.render.canvas.Immediate;
+        constructor();
     }
 
     /**
-     * Available renderers: `'canvas'`, `'dom'` or `'webgl'`.
+     * Binds a Canvas Immediate API to a canvas context, to allow drawing geometries
+     * to the context's canvas.
+     *
+     * The units for geometry coordinates are css pixels relative to the top left
+     * corner of the canvas element.
+     * ```js
+     * var canvas = document.createElement('canvas');
+     * var render = ol.render.toContext(canvas.getContext('2d'),
+     *     { size: [100, 100] });
+     * render.setFillStrokeStyle(new ol.style.Fill({ color: blue }));
+     * render.drawPolygon(
+     *     new ol.geom.Polygon([[[0, 0], [100, 100], [100, 0], [0, 0]]]));
+     * ```
+     *
+     * @param context Canvas context.
+     * @param opt_options Options.
+     * @return Canvas Immediate.
+     * @api
      */
-    type RendererType = "canvas" | "dom" | "webgl";
+    function toContext(context: CanvasRenderingContext2D, opt_options?: olx.render.ToContextOptions): ol.render.canvas.Immediate;
+}
 
+/**
+ * Available renderers: `'canvas'`, `'dom'` or `'webgl'`.
+ */
+export type RendererType = "canvas" | "dom" | "webgl";
+
+/**
+ * Raster operation type. Supported values are `'pixel'` and `'image'`.
+ */
+export type RasterOperationType = "pixel" | "image";
+
+export namespace source {
     /**
-     * Raster operation type. Supported values are `'pixel'` and `'image'`.
+     * @classdesc
+     * Layer source for Bing Maps tile data.
+     *
+     * @param options Bing Maps options.
+     * @api stable
      */
-    type RasterOperationType = "pixel" | "image";
-
-    namespace source {
+    class BingMaps extends source.TileImage {
         /**
          * @classdesc
          * Layer source for Bing Maps tile data.
@@ -8102,25 +8111,25 @@ declare namespace ol {
          * @param options Bing Maps options.
          * @api stable
          */
-        class BingMaps extends ol.source.TileImage {
-            /**
-             * @classdesc
-             * Layer source for Bing Maps tile data.
-             *
-             * @param options Bing Maps options.
-             * @api stable
-             */
-            constructor(options: olx.source.BingMapsOptions);
+        constructor(options: olx.source.BingMapsOptions);
 
-            /**
-             * The attribution containing a link to the Microsoft® Bing™ Maps Platform APIs’
-             * Terms Of Use.
-             * @const
-             * @api
-             */
-            static TOS_ATTRIBUTION: ol.Attribution;
-        }
+        /**
+         * The attribution containing a link to the Microsoft® Bing™ Maps Platform APIs’
+         * Terms Of Use.
+         * @const
+         * @api
+         */
+        static TOS_ATTRIBUTION: ol.Attribution;
+    }
 
+    /**
+     * @classdesc
+     * Layer source for the CartoDB tiles.
+     *
+     * @param options CartoDB options.
+     * @api
+     */
+    class CartoDB extends source.XYZ {
         /**
          * @classdesc
          * Layer source for the CartoDB tiles.
@@ -8128,41 +8137,43 @@ declare namespace ol {
          * @param options CartoDB options.
          * @api
          */
-        class CartoDB extends ol.source.XYZ {
-            /**
-             * @classdesc
-             * Layer source for the CartoDB tiles.
-             *
-             * @param options CartoDB options.
-             * @api
-             */
-            constructor(options: olx.source.CartoDBOptions);
+        constructor(options: olx.source.CartoDBOptions);
 
-            /**
-             * Returns the current config.
-             * @return The current configuration.
-             * @api
-             */
-            getConfig(): GlobalObject;
+        /**
+         * Returns the current config.
+         * @return The current configuration.
+         * @api
+         */
+        getConfig(): GlobalObject;
 
-            /**
-             * Updates the carto db config.
-             * @param config a key-value lookup. Values will replace current values
-             *     in the config.
-             * @api
-             */
-            updateConfig(config: GlobalObject): void;
+        /**
+         * Updates the carto db config.
+         * @param config a key-value lookup. Values will replace current values
+         *     in the config.
+         * @api
+         */
+        updateConfig(config: GlobalObject): void;
 
-            /**
-             * Sets the CartoDB config
-             * @param config In the case of anonymous maps, a CartoDB configuration
-             *     object.
-             * If using named maps, a key-value lookup with the template parameters.
-             * @api
-             */
-            setConfig(config: GlobalObject): void;
-        }
+        /**
+         * Sets the CartoDB config
+         * @param config In the case of anonymous maps, a CartoDB configuration
+         *     object.
+         * If using named maps, a key-value lookup with the template parameters.
+         * @api
+         */
+        setConfig(config: GlobalObject): void;
+    }
 
+    /**
+     * @classdesc
+     * Layer source to cluster vector data. Works out of the box with point
+     * geometries. For other geometry types, or if not all geometries should be
+     * considered for clustering, a custom `geometryFunction` can be defined.
+     *
+     * @param options Constructor options.
+     * @api
+     */
+    class Cluster extends source.Vector {
         /**
          * @classdesc
          * Layer source to cluster vector data. Works out of the box with point
@@ -8172,40 +8183,40 @@ declare namespace ol {
          * @param options Constructor options.
          * @api
          */
-        class Cluster extends ol.source.Vector {
-            /**
-             * @classdesc
-             * Layer source to cluster vector data. Works out of the box with point
-             * geometries. For other geometry types, or if not all geometries should be
-             * considered for clustering, a custom `geometryFunction` can be defined.
-             *
-             * @param options Constructor options.
-             * @api
-             */
-            constructor(options: olx.source.ClusterOptions);
+        constructor(options: olx.source.ClusterOptions);
 
-            /**
-             * Get a reference to the wrapped source.
-             * @return Source.
-             * @api
-             */
-            getSource(): ol.source.Vector;
+        /**
+         * Get a reference to the wrapped source.
+         * @return Source.
+         * @api
+         */
+        getSource(): ol.source.Vector;
 
-            /**
-             * Get the distance in pixels between clusters.
-             * @return The distance in pixels.
-             * @api
-             */
-            getDistance(): number;
+        /**
+         * Get the distance in pixels between clusters.
+         * @return The distance in pixels.
+         * @api
+         */
+        getDistance(): number;
 
-            /**
-             * Set the distance in pixels between clusters.
-             * @param distance The distance in pixels.
-             * @api
-             */
-            setDistance(distance: number): void;
-        }
+        /**
+         * Set the distance in pixels between clusters.
+         * @param distance The distance in pixels.
+         * @api
+         */
+        setDistance(distance: number): void;
+    }
 
+    /**
+     * @classdesc
+     * Abstract base class; normally only used for creating subclasses and not
+     * instantiated in apps.
+     * Base class for sources providing a single image.
+     *
+     * @param options Single image source options.
+     * @api
+     */
+    class Image extends source.Source {
         /**
          * @classdesc
          * Abstract base class; normally only used for creating subclasses and not
@@ -8215,19 +8226,18 @@ declare namespace ol {
          * @param options Single image source options.
          * @api
          */
-        class Image extends ol.source.Source {
-            /**
-             * @classdesc
-             * Abstract base class; normally only used for creating subclasses and not
-             * instantiated in apps.
-             * Base class for sources providing a single image.
-             *
-             * @param options Single image source options.
-             * @api
-             */
-            constructor(options: ol.SourceImageOptions);
-        }
+        constructor(options: ol.SourceImageOptions);
+    }
 
+    /**
+     * @classdesc
+     * Events emitted by {@link ol.source.Image} instances are instances of this
+     * type.
+     *
+     * @param type Type.
+     * @param image The image.
+     */
+    class ImageEvent extends events.Event {
         /**
          * @classdesc
          * Events emitted by {@link ol.source.Image} instances are instances of this
@@ -8236,24 +8246,29 @@ declare namespace ol {
          * @param type Type.
          * @param image The image.
          */
-        class ImageEvent extends ol.events.Event {
-            /**
-             * @classdesc
-             * Events emitted by {@link ol.source.Image} instances are instances of this
-             * type.
-             *
-             * @param type Type.
-             * @param image The image.
-             */
-            constructor(type: string, image: ol.Image);
+        constructor(type: string, image: ol.Image);
 
-            /**
-             * The image related to the event.
-             * @api
-             */
-            image: ol.Image;
-        }
+        /**
+         * The image related to the event.
+         * @api
+         */
+        image: ol.Image;
+    }
 
+    /**
+     * @classdesc
+     * Source for data from ArcGIS Rest services providing single, untiled images.
+     * Useful when underlying map service has labels.
+     *
+     * If underlying map service is not using labels,
+     * take advantage of ol image caching and use
+     * {@link ol.source.TileArcGISRest} data source.
+     *
+     * @fires ol.source.ImageEvent
+     * @param opt_options Image ArcGIS Rest Options.
+     * @api
+     */
+    class ImageArcGISRest extends source.Image {
         /**
          * @classdesc
          * Source for data from ArcGIS Rest services providing single, untiled images.
@@ -8267,66 +8282,60 @@ declare namespace ol {
          * @param opt_options Image ArcGIS Rest Options.
          * @api
          */
-        class ImageArcGISRest extends ol.source.Image {
-            /**
-             * @classdesc
-             * Source for data from ArcGIS Rest services providing single, untiled images.
-             * Useful when underlying map service has labels.
-             *
-             * If underlying map service is not using labels,
-             * take advantage of ol image caching and use
-             * {@link ol.source.TileArcGISRest} data source.
-             *
-             * @fires ol.source.ImageEvent
-             * @param opt_options Image ArcGIS Rest Options.
-             * @api
-             */
-            constructor(opt_options?: olx.source.ImageArcGISRestOptions);
+        constructor(opt_options?: olx.source.ImageArcGISRestOptions);
 
-            /**
-             * Get the user-provided params, i.e. those passed to the constructor through
-             * the "params" option, and possibly updated using the updateParams method.
-             * @return Params.
-             * @api stable
-             */
-            getParams(): GlobalObject;
+        /**
+         * Get the user-provided params, i.e. those passed to the constructor through
+         * the "params" option, and possibly updated using the updateParams method.
+         * @return Params.
+         * @api stable
+         */
+        getParams(): GlobalObject;
 
-            /**
-             * Return the image load function of the source.
-             * @return The image load function.
-             * @api
-             */
-            getImageLoadFunction(): ol.ImageLoadFunctionType;
+        /**
+         * Return the image load function of the source.
+         * @return The image load function.
+         * @api
+         */
+        getImageLoadFunction(): ol.ImageLoadFunctionType;
 
-            /**
-             * Return the URL used for this ArcGIS source.
-             * @return URL.
-             * @api stable
-             */
-            getUrl(): (string);
+        /**
+         * Return the URL used for this ArcGIS source.
+         * @return URL.
+         * @api stable
+         */
+        getUrl(): (string);
 
-            /**
-             * Set the image load function of the source.
-             * @param imageLoadFunction Image load function.
-             * @api
-             */
-            setImageLoadFunction(imageLoadFunction: ol.ImageLoadFunctionType): void;
+        /**
+         * Set the image load function of the source.
+         * @param imageLoadFunction Image load function.
+         * @api
+         */
+        setImageLoadFunction(imageLoadFunction: ol.ImageLoadFunctionType): void;
 
-            /**
-             * Set the URL to use for requests.
-             * @param url URL.
-             * @api stable
-             */
-            setUrl(url: (string)): void;
+        /**
+         * Set the URL to use for requests.
+         * @param url URL.
+         * @api stable
+         */
+        setUrl(url: (string)): void;
 
-            /**
-             * Update the user-provided params.
-             * @param params Params.
-             * @api stable
-             */
-            updateParams(params: GlobalObject): void;
-        }
+        /**
+         * Update the user-provided params.
+         * @param params Params.
+         * @api stable
+         */
+        updateParams(params: GlobalObject): void;
+    }
 
+    /**
+     * @classdesc
+     * Base class for image sources where a canvas element is the image.
+     *
+     * @param options Constructor options.
+     * @api
+     */
+    class ImageCanvas extends source.Image {
         /**
          * @classdesc
          * Base class for image sources where a canvas element is the image.
@@ -8334,17 +8343,18 @@ declare namespace ol {
          * @param options Constructor options.
          * @api
          */
-        class ImageCanvas extends ol.source.Image {
-            /**
-             * @classdesc
-             * Base class for image sources where a canvas element is the image.
-             *
-             * @param options Constructor options.
-             * @api
-             */
-            constructor(options: olx.source.ImageCanvasOptions);
-        }
+        constructor(options: olx.source.ImageCanvasOptions);
+    }
 
+    /**
+     * @classdesc
+     * Source for images from Mapguide servers
+     *
+     * @fires ol.source.ImageEvent
+     * @param options Options.
+     * @api stable
+     */
+    class ImageMapGuide extends source.Image {
         /**
          * @classdesc
          * Source for images from Mapguide servers
@@ -8353,47 +8363,46 @@ declare namespace ol {
          * @param options Options.
          * @api stable
          */
-        class ImageMapGuide extends ol.source.Image {
-            /**
-             * @classdesc
-             * Source for images from Mapguide servers
-             *
-             * @fires ol.source.ImageEvent
-             * @param options Options.
-             * @api stable
-             */
-            constructor(options: olx.source.ImageMapGuideOptions);
+        constructor(options: olx.source.ImageMapGuideOptions);
 
-            /**
-             * Get the user-provided params, i.e. those passed to the constructor through
-             * the "params" option, and possibly updated using the updateParams method.
-             * @return Params.
-             * @api stable
-             */
-            getParams(): GlobalObject;
+        /**
+         * Get the user-provided params, i.e. those passed to the constructor through
+         * the "params" option, and possibly updated using the updateParams method.
+         * @return Params.
+         * @api stable
+         */
+        getParams(): GlobalObject;
 
-            /**
-             * Return the image load function of the source.
-             * @return The image load function.
-             * @api
-             */
-            getImageLoadFunction(): ol.ImageLoadFunctionType;
+        /**
+         * Return the image load function of the source.
+         * @return The image load function.
+         * @api
+         */
+        getImageLoadFunction(): ol.ImageLoadFunctionType;
 
-            /**
-             * Update the user-provided params.
-             * @param params Params.
-             * @api stable
-             */
-            updateParams(params: GlobalObject): void;
+        /**
+         * Update the user-provided params.
+         * @param params Params.
+         * @api stable
+         */
+        updateParams(params: GlobalObject): void;
 
-            /**
-             * Set the image load function of the MapGuide source.
-             * @param imageLoadFunction Image load function.
-             * @api
-             */
-            setImageLoadFunction(imageLoadFunction: ol.ImageLoadFunctionType): void;
-        }
+        /**
+         * Set the image load function of the MapGuide source.
+         * @param imageLoadFunction Image load function.
+         * @api
+         */
+        setImageLoadFunction(imageLoadFunction: ol.ImageLoadFunctionType): void;
+    }
 
+    /**
+     * @classdesc
+     * A layer source for displaying a single, static image.
+     *
+     * @param options Options.
+     * @api stable
+     */
+    class ImageStatic extends source.Image {
         /**
          * @classdesc
          * A layer source for displaying a single, static image.
@@ -8401,17 +8410,25 @@ declare namespace ol {
          * @param options Options.
          * @api stable
          */
-        class ImageStatic extends ol.source.Image {
-            /**
-             * @classdesc
-             * A layer source for displaying a single, static image.
-             *
-             * @param options Options.
-             * @api stable
-             */
-            constructor(options: olx.source.ImageStaticOptions);
-        }
+        constructor(options: olx.source.ImageStaticOptions);
+    }
 
+    /**
+     * @classdesc
+     * An image source whose images are canvas elements into which vector features
+     * read from a vector source (`ol.source.Vector`) are drawn. An
+     * `ol.source.ImageVector` object is to be used as the `source` of an image
+     * layer (`ol.layer.Image`). Image layers are rotated, scaled, and translated,
+     * as opposed to being re-rendered, during animations and interactions. So, like
+     * any other image layer, an image layer configured with an
+     * `ol.source.ImageVector` will exhibit this behaviour. This is in contrast to a
+     * vector layer, where vector features are re-drawn during animations and
+     * interactions.
+     *
+     * @param options Options.
+     * @api
+     */
+    class ImageVector extends source.ImageCanvas {
         /**
          * @classdesc
          * An image source whose images are canvas elements into which vector features
@@ -8427,59 +8444,52 @@ declare namespace ol {
          * @param options Options.
          * @api
          */
-        class ImageVector extends ol.source.ImageCanvas {
-            /**
-             * @classdesc
-             * An image source whose images are canvas elements into which vector features
-             * read from a vector source (`ol.source.Vector`) are drawn. An
-             * `ol.source.ImageVector` object is to be used as the `source` of an image
-             * layer (`ol.layer.Image`). Image layers are rotated, scaled, and translated,
-             * as opposed to being re-rendered, during animations and interactions. So, like
-             * any other image layer, an image layer configured with an
-             * `ol.source.ImageVector` will exhibit this behaviour. This is in contrast to a
-             * vector layer, where vector features are re-drawn during animations and
-             * interactions.
-             *
-             * @param options Options.
-             * @api
-             */
-            constructor(options: olx.source.ImageVectorOptions);
+        constructor(options: olx.source.ImageVectorOptions);
 
-            /**
-             * Get a reference to the wrapped source.
-             * @return Source.
-             * @api
-             */
-            getSource(): ol.source.Vector;
+        /**
+         * Get a reference to the wrapped source.
+         * @return Source.
+         * @api
+         */
+        getSource(): ol.source.Vector;
 
-            /**
-             * Get the style for features.  This returns whatever was passed to the `style`
-             * option at construction or to the `setStyle` method.
-             * @return Layer style.
-             * @api stable
-             */
-            getStyle(): (ol.style.Style | ol.style.Style[] | ol.StyleFunction);
+        /**
+         * Get the style for features.  This returns whatever was passed to the `style`
+         * option at construction or to the `setStyle` method.
+         * @return Layer style.
+         * @api stable
+         */
+        getStyle(): (ol.style.Style | ol.style.Style[] | ol.StyleFunction);
 
-            /**
-             * Get the style function.
-             * @return Layer style function.
-             * @api stable
-             */
-            getStyleFunction(): (ol.StyleFunction);
+        /**
+         * Get the style function.
+         * @return Layer style function.
+         * @api stable
+         */
+        getStyleFunction(): (ol.StyleFunction);
 
-            /**
-             * Set the style for features.  This can be a single style object, an array
-             * of styles, or a function that takes a feature and resolution and returns
-             * an array of styles. If it is `undefined` the default style is used. If
-             * it is `null` the layer has no style (a `null` style), so only features
-             * that have their own styles will be rendered in the layer. See
-             * {@link ol.style} for information on the default style.
-             * @param style Layer style.
-             * @api stable
-             */
-            setStyle(style: (ol.style.Style | ol.style.Style[] | ol.StyleFunction)): void;
-        }
+        /**
+         * Set the style for features.  This can be a single style object, an array
+         * of styles, or a function that takes a feature and resolution and returns
+         * an array of styles. If it is `undefined` the default style is used. If
+         * it is `null` the layer has no style (a `null` style), so only features
+         * that have their own styles will be rendered in the layer. See
+         * {@link ol.style} for information on the default style.
+         * @param style Layer style.
+         * @api stable
+         */
+        setStyle(style: (ol.style.Style | ol.style.Style[] | ol.StyleFunction)): void;
+    }
 
+    /**
+     * @classdesc
+     * Source for WMS servers providing single, untiled images.
+     *
+     * @fires ol.source.ImageEvent
+     * @param opt_options Options.
+     * @api stable
+     */
+    class ImageWMS extends source.Image {
         /**
          * @classdesc
          * Source for WMS servers providing single, untiled images.
@@ -8488,77 +8498,76 @@ declare namespace ol {
          * @param opt_options Options.
          * @api stable
          */
-        class ImageWMS extends ol.source.Image {
-            /**
-             * @classdesc
-             * Source for WMS servers providing single, untiled images.
-             *
-             * @fires ol.source.ImageEvent
-             * @param opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.source.ImageWMSOptions);
+        constructor(opt_options?: olx.source.ImageWMSOptions);
 
-            /**
-             * Return the GetFeatureInfo URL for the passed coordinate, resolution, and
-             * projection. Return `undefined` if the GetFeatureInfo URL cannot be
-             * constructed.
-             * @param coordinate Coordinate.
-             * @param resolution Resolution.
-             * @param projection Projection.
-             * @param params GetFeatureInfo params. `INFO_FORMAT` at least should
-             *     be provided. If `QUERY_LAYERS` is not provided then the layers specified
-             *     in the `LAYERS` parameter will be used. `VERSION` should not be
-             *     specified here.
-             * @return GetFeatureInfo URL.
-             * @api stable
-             */
-            getGetFeatureInfoUrl(coordinate: ol.Coordinate, resolution: number, projection: ol.ProjectionLike, params: GlobalObject): (string);
+        /**
+         * Return the GetFeatureInfo URL for the passed coordinate, resolution, and
+         * projection. Return `undefined` if the GetFeatureInfo URL cannot be
+         * constructed.
+         * @param coordinate Coordinate.
+         * @param resolution Resolution.
+         * @param projection Projection.
+         * @param params GetFeatureInfo params. `INFO_FORMAT` at least should
+         *     be provided. If `QUERY_LAYERS` is not provided then the layers specified
+         *     in the `LAYERS` parameter will be used. `VERSION` should not be
+         *     specified here.
+         * @return GetFeatureInfo URL.
+         * @api stable
+         */
+        getGetFeatureInfoUrl(coordinate: ol.Coordinate, resolution: number, projection: ol.ProjectionLike, params: GlobalObject): (string);
 
-            /**
-             * Get the user-provided params, i.e. those passed to the constructor through
-             * the "params" option, and possibly updated using the updateParams method.
-             * @return Params.
-             * @api stable
-             */
-            getParams(): GlobalObject;
+        /**
+         * Get the user-provided params, i.e. those passed to the constructor through
+         * the "params" option, and possibly updated using the updateParams method.
+         * @return Params.
+         * @api stable
+         */
+        getParams(): GlobalObject;
 
-            /**
-             * Return the image load function of the source.
-             * @return The image load function.
-             * @api
-             */
-            getImageLoadFunction(): ol.ImageLoadFunctionType;
+        /**
+         * Return the image load function of the source.
+         * @return The image load function.
+         * @api
+         */
+        getImageLoadFunction(): ol.ImageLoadFunctionType;
 
-            /**
-             * Return the URL used for this WMS source.
-             * @return URL.
-             * @api stable
-             */
-            getUrl(): (string);
+        /**
+         * Return the URL used for this WMS source.
+         * @return URL.
+         * @api stable
+         */
+        getUrl(): (string);
 
-            /**
-             * Set the image load function of the source.
-             * @param imageLoadFunction Image load function.
-             * @api
-             */
-            setImageLoadFunction(imageLoadFunction: ol.ImageLoadFunctionType): void;
+        /**
+         * Set the image load function of the source.
+         * @param imageLoadFunction Image load function.
+         * @api
+         */
+        setImageLoadFunction(imageLoadFunction: ol.ImageLoadFunctionType): void;
 
-            /**
-             * Set the URL to use for requests.
-             * @param url URL.
-             * @api stable
-             */
-            setUrl(url: (string)): void;
+        /**
+         * Set the URL to use for requests.
+         * @param url URL.
+         * @api stable
+         */
+        setUrl(url: (string)): void;
 
-            /**
-             * Update the user-provided params.
-             * @param params Params.
-             * @api stable
-             */
-            updateParams(params: GlobalObject): void;
-        }
+        /**
+         * Update the user-provided params.
+         * @param params Params.
+         * @api stable
+         */
+        updateParams(params: GlobalObject): void;
+    }
 
+    /**
+     * @classdesc
+     * Layer source for the OpenStreetMap tile server.
+     *
+     * @param opt_options Open Street Map options.
+     * @api stable
+     */
+    class OSM extends source.XYZ {
         /**
          * @classdesc
          * Layer source for the OpenStreetMap tile server.
@@ -8566,25 +8575,28 @@ declare namespace ol {
          * @param opt_options Open Street Map options.
          * @api stable
          */
-        class OSM extends ol.source.XYZ {
-            /**
-             * @classdesc
-             * Layer source for the OpenStreetMap tile server.
-             *
-             * @param opt_options Open Street Map options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.source.OSMOptions);
+        constructor(opt_options?: olx.source.OSMOptions);
 
-            /**
-             * The attribution containing a link to the OpenStreetMap Copyright and License
-             * page.
-             * @const
-             * @api
-             */
-            static ATTRIBUTION: ol.Attribution;
-        }
+        /**
+         * The attribution containing a link to the OpenStreetMap Copyright and License
+         * page.
+         * @const
+         * @api
+         */
+        static ATTRIBUTION: ol.Attribution;
+    }
 
+    /**
+     * @classdesc
+     * A source that transforms data from any number of input sources using an array
+     * of {@link ol.RasterOperation} functions to transform input pixel values into
+     * output pixel values.
+     *
+     * @fires ol.source.RasterEvent
+     * @param options Options.
+     * @api
+     */
+    class Raster extends source.Image {
         /**
          * @classdesc
          * A source that transforms data from any number of input sources using an array
@@ -8595,29 +8607,28 @@ declare namespace ol {
          * @param options Options.
          * @api
          */
-        class Raster extends ol.source.Image {
-            /**
-             * @classdesc
-             * A source that transforms data from any number of input sources using an array
-             * of {@link ol.RasterOperation} functions to transform input pixel values into
-             * output pixel values.
-             *
-             * @fires ol.source.RasterEvent
-             * @param options Options.
-             * @api
-             */
-            constructor(options: olx.source.RasterOptions);
+        constructor(options: olx.source.RasterOptions);
 
-            /**
-             * Set the operation.
-             * @param operation New operation.
-             * @param opt_lib Functions that will be available to operations run
-             *     in a worker.
-             * @api
-             */
-            setOperation(operation: ol.RasterOperation, opt_lib?: GlobalObject): void;
-        }
+        /**
+         * Set the operation.
+         * @param operation New operation.
+         * @param opt_lib Functions that will be available to operations run
+         *     in a worker.
+         * @api
+         */
+        setOperation(operation: ol.RasterOperation, opt_lib?: GlobalObject): void;
+    }
 
+    /**
+     * @classdesc
+     * Events emitted by {@link ol.source.Raster} instances are instances of this
+     * type.
+     *
+     * @param type Type.
+     * @param frameState The frame state.
+     * @param data An object made available to operations.
+     */
+    class RasterEvent extends events.Event {
         /**
          * @classdesc
          * Events emitted by {@link ol.source.Raster} instances are instances of this
@@ -8627,43 +8638,45 @@ declare namespace ol {
          * @param frameState The frame state.
          * @param data An object made available to operations.
          */
-        class RasterEvent extends ol.events.Event {
-            /**
-             * @classdesc
-             * Events emitted by {@link ol.source.Raster} instances are instances of this
-             * type.
-             *
-             * @param type Type.
-             * @param frameState The frame state.
-             * @param data An object made available to operations.
-             */
-            constructor(type: string, frameState: olx.FrameState, data: GlobalObject);
-
-            /**
-             * The raster extent.
-             * @api
-             */
-            extent: ol.Extent;
-
-            /**
-             * The pixel resolution (map units per pixel).
-             * @api
-             */
-            resolution: number;
-
-            /**
-             * An object made available to all operations.  This can be used by operations
-             * as a storage object (e.g. for calculating statistics).
-             * @api
-             */
-            data: GlobalObject;
-        }
+        constructor(type: string, frameState: olx.FrameState, data: GlobalObject);
 
         /**
-         * State of the source, one of 'undefined', 'loading', 'ready' or 'error'.
+         * The raster extent.
+         * @api
          */
-        type State = "undefined" | "loading" | "ready" | "error";
+        extent: ol.Extent;
 
+        /**
+         * The pixel resolution (map units per pixel).
+         * @api
+         */
+        resolution: number;
+
+        /**
+         * An object made available to all operations.  This can be used by operations
+         * as a storage object (e.g. for calculating statistics).
+         * @api
+         */
+        data: GlobalObject;
+    }
+
+    /**
+     * State of the source, one of 'undefined', 'loading', 'ready' or 'error'.
+     */
+    type State = "undefined" | "loading" | "ready" | "error";
+
+    /**
+     * @classdesc
+     * Abstract base class; normally only used for creating subclasses and not
+     * instantiated in apps.
+     * Base class for {@link ol.layer.Layer} sources.
+     *
+     * A generic `change` event is triggered when the state of the source changes.
+     *
+     * @param options Source options.
+     * @api stable
+     */
+    class Source extends Object {
         /**
          * @classdesc
          * Abstract base class; normally only used for creating subclasses and not
@@ -8675,64 +8688,60 @@ declare namespace ol {
          * @param options Source options.
          * @api stable
          */
-        class Source extends ol.Object {
-            /**
-             * @classdesc
-             * Abstract base class; normally only used for creating subclasses and not
-             * instantiated in apps.
-             * Base class for {@link ol.layer.Layer} sources.
-             *
-             * A generic `change` event is triggered when the state of the source changes.
-             *
-             * @param options Source options.
-             * @api stable
-             */
-            constructor(options: ol.SourceSourceOptions);
+        constructor(options: ol.SourceSourceOptions);
 
-            /**
-             * Get the attributions of the source.
-             * @return Attributions.
-             * @api stable
-             */
-            getAttributions(): ol.Attribution[];
+        /**
+         * Get the attributions of the source.
+         * @return Attributions.
+         * @api stable
+         */
+        getAttributions(): ol.Attribution[];
 
-            /**
-             * Get the logo of the source.
-             * @return Logo.
-             * @api stable
-             */
-            getLogo(): (string | olx.LogoOptions);
+        /**
+         * Get the logo of the source.
+         * @return Logo.
+         * @api stable
+         */
+        getLogo(): (string | olx.LogoOptions);
 
-            /**
-             * Get the projection of the source.
-             * @return Projection.
-             * @api
-             */
-            getProjection(): ol.proj.Projection;
+        /**
+         * Get the projection of the source.
+         * @return Projection.
+         * @api
+         */
+        getProjection(): ol.proj.Projection;
 
-            /**
-             * Get the state of the source, see {@link ol.source.State} for possible states.
-             * @return State.
-             * @api
-             */
-            getState(): ol.source.State;
+        /**
+         * Get the state of the source, see {@link ol.source.State} for possible states.
+         * @return State.
+         * @api
+         */
+        getState(): ol.source.State;
 
-            /**
-             * Refreshes the source and finally dispatches a 'change' event.
-             * @api
-             */
-            refresh(): void;
+        /**
+         * Refreshes the source and finally dispatches a 'change' event.
+         * @api
+         */
+        refresh(): void;
 
-            /**
-             * Set the attributions of the source.
-             * @param attributions Attributions.
-             *     Can be passed as `string`, `Array<string>`, `{@link ol.Attribution}`,
-             *     `Array<{@link ol.Attribution}>` or `undefined`.
-             * @api
-             */
-            setAttributions(attributions: (ol.AttributionLike)): void;
-        }
+        /**
+         * Set the attributions of the source.
+         * @param attributions Attributions.
+         *     Can be passed as `string`, `Array<string>`, `{@link ol.Attribution}`,
+         *     `Array<{@link ol.Attribution}>` or `undefined`.
+         * @api
+         */
+        setAttributions(attributions: (ol.AttributionLike)): void;
+    }
 
+    /**
+     * @classdesc
+     * Layer source for the Stamen tile server.
+     *
+     * @param options Stamen options.
+     * @api stable
+     */
+    class Stamen extends source.XYZ {
         /**
          * @classdesc
          * Layer source for the Stamen tile server.
@@ -8740,17 +8749,19 @@ declare namespace ol {
          * @param options Stamen options.
          * @api stable
          */
-        class Stamen extends ol.source.XYZ {
-            /**
-             * @classdesc
-             * Layer source for the Stamen tile server.
-             *
-             * @param options Stamen options.
-             * @api stable
-             */
-            constructor(options: olx.source.StamenOptions);
-        }
+        constructor(options: olx.source.StamenOptions);
+    }
 
+    /**
+     * @classdesc
+     * Abstract base class; normally only used for creating subclasses and not
+     * instantiated in apps.
+     * Base class for sources providing images divided into a tile grid.
+     *
+     * @param options Tile source options.
+     * @api
+     */
+    class Tile extends source.Source {
         /**
          * @classdesc
          * Abstract base class; normally only used for creating subclasses and not
@@ -8760,26 +8771,25 @@ declare namespace ol {
          * @param options Tile source options.
          * @api
          */
-        class Tile extends ol.source.Source {
-            /**
-             * @classdesc
-             * Abstract base class; normally only used for creating subclasses and not
-             * instantiated in apps.
-             * Base class for sources providing images divided into a tile grid.
-             *
-             * @param options Tile source options.
-             * @api
-             */
-            constructor(options: ol.SourceTileOptions);
+        constructor(options: ol.SourceTileOptions);
 
-            /**
-             * Return the tile grid of the tile source.
-             * @return Tile grid.
-             * @api stable
-             */
-            getTileGrid(): ol.tilegrid.TileGrid;
-        }
+        /**
+         * Return the tile grid of the tile source.
+         * @return Tile grid.
+         * @api stable
+         */
+        getTileGrid(): ol.tilegrid.TileGrid;
+    }
 
+    /**
+     * @classdesc
+     * Events emitted by {@link ol.source.Tile} instances are instances of this
+     * type.
+     *
+     * @param type Type.
+     * @param tile The tile.
+     */
+    class TileEvent extends events.Event {
         /**
          * @classdesc
          * Events emitted by {@link ol.source.Tile} instances are instances of this
@@ -8788,24 +8798,28 @@ declare namespace ol {
          * @param type Type.
          * @param tile The tile.
          */
-        class TileEvent extends ol.events.Event {
-            /**
-             * @classdesc
-             * Events emitted by {@link ol.source.Tile} instances are instances of this
-             * type.
-             *
-             * @param type Type.
-             * @param tile The tile.
-             */
-            constructor(type: string, tile: ol.Tile);
+        constructor(type: string, tile: ol.Tile);
 
-            /**
-             * The tile related to the event.
-             * @api
-             */
-            tile: ol.Tile;
-        }
+        /**
+         * The tile related to the event.
+         * @api
+         */
+        tile: ol.Tile;
+    }
 
+    /**
+     * @classdesc
+     * Layer source for tile data from ArcGIS Rest services. Map and Image
+     * Services are supported.
+     *
+     * For cached ArcGIS services, better performance is available using the
+     * {@link ol.source.XYZ} data source.
+     *
+     * @param opt_options Tile ArcGIS Rest
+     *     options.
+     * @api
+     */
+    class TileArcGISRest extends source.TileImage {
         /**
          * @classdesc
          * Layer source for tile data from ArcGIS Rest services. Map and Image
@@ -8818,37 +8832,36 @@ declare namespace ol {
          *     options.
          * @api
          */
-        class TileArcGISRest extends ol.source.TileImage {
-            /**
-             * @classdesc
-             * Layer source for tile data from ArcGIS Rest services. Map and Image
-             * Services are supported.
-             *
-             * For cached ArcGIS services, better performance is available using the
-             * {@link ol.source.XYZ} data source.
-             *
-             * @param opt_options Tile ArcGIS Rest
-             *     options.
-             * @api
-             */
-            constructor(opt_options?: olx.source.TileArcGISRestOptions);
+        constructor(opt_options?: olx.source.TileArcGISRestOptions);
 
-            /**
-             * Get the user-provided params, i.e. those passed to the constructor through
-             * the "params" option, and possibly updated using the updateParams method.
-             * @return Params.
-             * @api
-             */
-            getParams(): GlobalObject;
+        /**
+         * Get the user-provided params, i.e. those passed to the constructor through
+         * the "params" option, and possibly updated using the updateParams method.
+         * @return Params.
+         * @api
+         */
+        getParams(): GlobalObject;
 
-            /**
-             * Update the user-provided params.
-             * @param params Params.
-             * @api stable
-             */
-            updateParams(params: GlobalObject): void;
-        }
+        /**
+         * Update the user-provided params.
+         * @param params Params.
+         * @api stable
+         */
+        updateParams(params: GlobalObject): void;
+    }
 
+    /**
+     * @classdesc
+     * A pseudo tile source, which does not fetch tiles from a server, but renders
+     * a grid outline for the tile grid/projection along with the coordinates for
+     * each tile. See examples/canvas-tiles for an example.
+     *
+     * Uses Canvas context2d, so requires Canvas support.
+     *
+     * @param options Debug tile options.
+     * @api
+     */
+    class TileDebug extends source.Tile {
         /**
          * @classdesc
          * A pseudo tile source, which does not fetch tiles from a server, but renders
@@ -8860,21 +8873,18 @@ declare namespace ol {
          * @param options Debug tile options.
          * @api
          */
-        class TileDebug extends ol.source.Tile {
-            /**
-             * @classdesc
-             * A pseudo tile source, which does not fetch tiles from a server, but renders
-             * a grid outline for the tile grid/projection along with the coordinates for
-             * each tile. See examples/canvas-tiles for an example.
-             *
-             * Uses Canvas context2d, so requires Canvas support.
-             *
-             * @param options Debug tile options.
-             * @api
-             */
-            constructor(options: olx.source.TileDebugOptions);
-        }
+        constructor(options: olx.source.TileDebugOptions);
+    }
 
+    /**
+     * @classdesc
+     * Base class for sources providing images divided into a tile grid.
+     *
+     * @fires ol.source.TileEvent
+     * @param options Image tile options.
+     * @api
+     */
+    class TileImage extends source.UrlTile {
         /**
          * @classdesc
          * Base class for sources providing images divided into a tile grid.
@@ -8883,39 +8893,38 @@ declare namespace ol {
          * @param options Image tile options.
          * @api
          */
-        class TileImage extends ol.source.UrlTile {
-            /**
-             * @classdesc
-             * Base class for sources providing images divided into a tile grid.
-             *
-             * @fires ol.source.TileEvent
-             * @param options Image tile options.
-             * @api
-             */
-            constructor(options: olx.source.TileImageOptions);
+        constructor(options: olx.source.TileImageOptions);
 
-            /**
-             * Sets whether to render reprojection edges or not (usually for debugging).
-             * @param render Render the edges.
-             * @api
-             */
-            setRenderReprojectionEdges(render: boolean): void;
+        /**
+         * Sets whether to render reprojection edges or not (usually for debugging).
+         * @param render Render the edges.
+         * @api
+         */
+        setRenderReprojectionEdges(render: boolean): void;
 
-            /**
-             * Sets the tile grid to use when reprojecting the tiles to the given
-             * projection instead of the default tile grid for the projection.
-             *
-             * This can be useful when the default tile grid cannot be created
-             * (e.g. projection has no extent defined) or
-             * for optimization reasons (custom tile size, resolutions, ...).
-             *
-             * @param projection Projection.
-             * @param tilegrid Tile grid to use for the projection.
-             * @api
-             */
-            setTileGridForProjection(projection: ol.ProjectionLike, tilegrid: ol.tilegrid.TileGrid): void;
-        }
+        /**
+         * Sets the tile grid to use when reprojecting the tiles to the given
+         * projection instead of the default tile grid for the projection.
+         *
+         * This can be useful when the default tile grid cannot be created
+         * (e.g. projection has no extent defined) or
+         * for optimization reasons (custom tile size, resolutions, ...).
+         *
+         * @param projection Projection.
+         * @param tilegrid Tile grid to use for the projection.
+         * @api
+         */
+        setTileGridForProjection(projection: ol.ProjectionLike, tilegrid: ol.tilegrid.TileGrid): void;
+    }
 
+    /**
+     * @classdesc
+     * Layer source for tile data in TileJSON format.
+     *
+     * @param options TileJSON options.
+     * @api stable
+     */
+    class TileJSON extends source.TileImage {
         /**
          * @classdesc
          * Layer source for tile data in TileJSON format.
@@ -8923,23 +8932,23 @@ declare namespace ol {
          * @param options TileJSON options.
          * @api stable
          */
-        class TileJSON extends ol.source.TileImage {
-            /**
-             * @classdesc
-             * Layer source for tile data in TileJSON format.
-             *
-             * @param options TileJSON options.
-             * @api stable
-             */
-            constructor(options: olx.source.TileJSONOptions);
+        constructor(options: olx.source.TileJSONOptions);
 
-            /**
-             * @return The tilejson object.
-             * @api
-             */
-            getTileJSON(): TileJSON;
-        }
+        /**
+         * @return The tilejson object.
+         * @api
+         */
+        getTileJSON(): TileJSON;
+    }
 
+    /**
+     * @classdesc
+     * Layer source for UTFGrid interaction data loaded from TileJSON format.
+     *
+     * @param options Source options.
+     * @api
+     */
+    class TileUTFGrid extends source.Tile {
         /**
          * @classdesc
          * Layer source for UTFGrid interaction data loaded from TileJSON format.
@@ -8947,39 +8956,39 @@ declare namespace ol {
          * @param options Source options.
          * @api
          */
-        class TileUTFGrid extends ol.source.Tile {
-            /**
-             * @classdesc
-             * Layer source for UTFGrid interaction data loaded from TileJSON format.
-             *
-             * @param options Source options.
-             * @api
-             */
-            constructor(options: olx.source.TileUTFGridOptions);
+        constructor(options: olx.source.TileUTFGridOptions);
 
-            /**
-             * Return the template from TileJSON.
-             * @return The template from TileJSON.
-             * @api
-             */
-            getTemplate(): (string);
+        /**
+         * Return the template from TileJSON.
+         * @return The template from TileJSON.
+         * @api
+         */
+        getTemplate(): (string);
 
-            /**
-             * Calls the callback (synchronously by default) with the available data
-             * for given coordinate and resolution (or `null` if not yet loaded or
-             * in case of an error).
-             * @param coordinate Coordinate.
-             * @param resolution Resolution.
-             * @param callback Callback.
-             * @param opt_this The object to use as `this` in the callback.
-             * @param opt_request If `true` the callback is always async.
-             *                               The tile data is requested if not yet loaded.
-             * @template T
-             * @api
-             */
-            forDataAtCoordinateAndResolution<T>(coordinate: ol.Coordinate, resolution: number, callback: ((d: any) => any), opt_this?: T, opt_request?: boolean): void;
-        }
+        /**
+         * Calls the callback (synchronously by default) with the available data
+         * for given coordinate and resolution (or `null` if not yet loaded or
+         * in case of an error).
+         * @param coordinate Coordinate.
+         * @param resolution Resolution.
+         * @param callback Callback.
+         * @param opt_this The object to use as `this` in the callback.
+         * @param opt_request If `true` the callback is always async.
+         *                               The tile data is requested if not yet loaded.
+         * @template T
+         * @api
+         */
+        forDataAtCoordinateAndResolution<T>(coordinate: ol.Coordinate, resolution: number, callback: ((d: any) => any), opt_this?: T, opt_request?: boolean): void;
+    }
 
+    /**
+     * @classdesc
+     * Layer source for tile data from WMS servers.
+     *
+     * @param opt_options Tile WMS options.
+     * @api stable
+     */
+    class TileWMS extends source.TileImage {
         /**
          * @classdesc
          * Layer source for tile data from WMS servers.
@@ -8987,48 +8996,48 @@ declare namespace ol {
          * @param opt_options Tile WMS options.
          * @api stable
          */
-        class TileWMS extends ol.source.TileImage {
-            /**
-             * @classdesc
-             * Layer source for tile data from WMS servers.
-             *
-             * @param opt_options Tile WMS options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.source.TileWMSOptions);
+        constructor(opt_options?: olx.source.TileWMSOptions);
 
-            /**
-             * Return the GetFeatureInfo URL for the passed coordinate, resolution, and
-             * projection. Return `undefined` if the GetFeatureInfo URL cannot be
-             * constructed.
-             * @param coordinate Coordinate.
-             * @param resolution Resolution.
-             * @param projection Projection.
-             * @param params GetFeatureInfo params. `INFO_FORMAT` at least should
-             *     be provided. If `QUERY_LAYERS` is not provided then the layers specified
-             *     in the `LAYERS` parameter will be used. `VERSION` should not be
-             *     specified here.
-             * @return GetFeatureInfo URL.
-             * @api stable
-             */
-            getGetFeatureInfoUrl(coordinate: ol.Coordinate, resolution: number, projection: ol.ProjectionLike, params: GlobalObject): (string);
+        /**
+         * Return the GetFeatureInfo URL for the passed coordinate, resolution, and
+         * projection. Return `undefined` if the GetFeatureInfo URL cannot be
+         * constructed.
+         * @param coordinate Coordinate.
+         * @param resolution Resolution.
+         * @param projection Projection.
+         * @param params GetFeatureInfo params. `INFO_FORMAT` at least should
+         *     be provided. If `QUERY_LAYERS` is not provided then the layers specified
+         *     in the `LAYERS` parameter will be used. `VERSION` should not be
+         *     specified here.
+         * @return GetFeatureInfo URL.
+         * @api stable
+         */
+        getGetFeatureInfoUrl(coordinate: ol.Coordinate, resolution: number, projection: ol.ProjectionLike, params: GlobalObject): (string);
 
-            /**
-             * Get the user-provided params, i.e. those passed to the constructor through
-             * the "params" option, and possibly updated using the updateParams method.
-             * @return Params.
-             * @api stable
-             */
-            getParams(): GlobalObject;
+        /**
+         * Get the user-provided params, i.e. those passed to the constructor through
+         * the "params" option, and possibly updated using the updateParams method.
+         * @return Params.
+         * @api stable
+         */
+        getParams(): GlobalObject;
 
-            /**
-             * Update the user-provided params.
-             * @param params Params.
-             * @api stable
-             */
-            updateParams(params: GlobalObject): void;
-        }
+        /**
+         * Update the user-provided params.
+         * @param params Params.
+         * @api stable
+         */
+        updateParams(params: GlobalObject): void;
+    }
 
+    /**
+     * @classdesc
+     * Base class for sources providing tiles divided into a tile grid over http.
+     *
+     * @fires ol.source.TileEvent
+     * @param options Image tile options.
+     */
+    class UrlTile extends source.Tile {
         /**
          * @classdesc
          * Base class for sources providing tiles divided into a tile grid over http.
@@ -9036,69 +9045,72 @@ declare namespace ol {
          * @fires ol.source.TileEvent
          * @param options Image tile options.
          */
-        class UrlTile extends ol.source.Tile {
-            /**
-             * @classdesc
-             * Base class for sources providing tiles divided into a tile grid over http.
-             *
-             * @fires ol.source.TileEvent
-             * @param options Image tile options.
-             */
-            constructor(options: ol.SourceUrlTileOptions);
+        constructor(options: ol.SourceUrlTileOptions);
 
-            /**
-             * Return the tile load function of the source.
-             * @return TileLoadFunction
-             * @api
-             */
-            getTileLoadFunction(): ol.TileLoadFunctionType;
+        /**
+         * Return the tile load function of the source.
+         * @return TileLoadFunction
+         * @api
+         */
+        getTileLoadFunction(): ol.TileLoadFunctionType;
 
-            /**
-             * Return the tile URL function of the source.
-             * @return TileUrlFunction
-             * @api
-             */
-            getTileUrlFunction(): ol.TileUrlFunctionType;
+        /**
+         * Return the tile URL function of the source.
+         * @return TileUrlFunction
+         * @api
+         */
+        getTileUrlFunction(): ol.TileUrlFunctionType;
 
-            /**
-             * Return the URLs used for this source.
-             * When a tileUrlFunction is used instead of url or urls,
-             * null will be returned.
-             * @return URLs.
-             * @api
-             */
-            getUrls(): (string[]);
+        /**
+         * Return the URLs used for this source.
+         * When a tileUrlFunction is used instead of url or urls,
+         * null will be returned.
+         * @return URLs.
+         * @api
+         */
+        getUrls(): (string[]);
 
-            /**
-             * Set the tile load function of the source.
-             * @param tileLoadFunction Tile load function.
-             * @api
-             */
-            setTileLoadFunction(tileLoadFunction: ol.TileLoadFunctionType): void;
+        /**
+         * Set the tile load function of the source.
+         * @param tileLoadFunction Tile load function.
+         * @api
+         */
+        setTileLoadFunction(tileLoadFunction: ol.TileLoadFunctionType): void;
 
-            /**
-             * Set the tile URL function of the source.
-             * @param tileUrlFunction Tile URL function.
-             * @param opt_key Optional new tile key for the source.
-             * @api
-             */
-            setTileUrlFunction(tileUrlFunction: ol.TileUrlFunctionType, opt_key?: string): void;
+        /**
+         * Set the tile URL function of the source.
+         * @param tileUrlFunction Tile URL function.
+         * @param opt_key Optional new tile key for the source.
+         * @api
+         */
+        setTileUrlFunction(tileUrlFunction: ol.TileUrlFunctionType, opt_key?: string): void;
 
-            /**
-             * Set the URL to use for requests.
-             * @param url URL.
-             * @api stable
-             */
-            setUrl(url: string): void;
+        /**
+         * Set the URL to use for requests.
+         * @param url URL.
+         * @api stable
+         */
+        setUrl(url: string): void;
 
-            /**
-             * Set the URLs to use for requests.
-             * @param urls URLs.
-             * @api stable
-             */
-            setUrls(urls: string[]): void;
-        }
+        /**
+         * Set the URLs to use for requests.
+         * @param urls URLs.
+         * @api stable
+         */
+        setUrls(urls: string[]): void;
+    }
 
+    /**
+     * @classdesc
+     * Provides a source of features for vector layers. Vector features provided
+     * by this source are suitable for editing. See {@link ol.source.VectorTile} for
+     * vector data that is optimized for rendering.
+     *
+     * @fires ol.source.VectorEvent
+     * @param opt_options Vector source options.
+     * @api stable
+     */
+    class Vector extends source.Source {
         /**
          * @classdesc
          * Provides a source of features for vector layers. Vector features provided
@@ -9109,196 +9121,194 @@ declare namespace ol {
          * @param opt_options Vector source options.
          * @api stable
          */
-        class Vector extends ol.source.Source {
-            /**
-             * @classdesc
-             * Provides a source of features for vector layers. Vector features provided
-             * by this source are suitable for editing. See {@link ol.source.VectorTile} for
-             * vector data that is optimized for rendering.
-             *
-             * @fires ol.source.VectorEvent
-             * @param opt_options Vector source options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.source.VectorOptions);
+        constructor(opt_options?: olx.source.VectorOptions);
 
-            /**
-             * Add a single feature to the source.  If you want to add a batch of features
-             * at once, call {@link ol.source.Vector#addFeatures source.addFeatures()}
-             * instead.
-             * @param feature Feature to add.
-             * @api stable
-             */
-            addFeature(feature: ol.Feature): void;
+        /**
+         * Add a single feature to the source.  If you want to add a batch of features
+         * at once, call {@link ol.source.Vector#addFeatures source.addFeatures()}
+         * instead.
+         * @param feature Feature to add.
+         * @api stable
+         */
+        addFeature(feature: ol.Feature): void;
 
-            /**
-             * Add a batch of features to the source.
-             * @param features Features to add.
-             * @api stable
-             */
-            addFeatures(features: ol.Feature[]): void;
+        /**
+         * Add a batch of features to the source.
+         * @param features Features to add.
+         * @api stable
+         */
+        addFeatures(features: ol.Feature[]): void;
 
-            /**
-             * Remove all features from the source.
-             * @param events.
-             * @api stable
-             */
-            clear(opt_fast?: boolean): void;
+        /**
+         * Remove all features from the source.
+         * @param events.
+         * @api stable
+         */
+        clear(opt_fast?: boolean): void;
 
-            /**
-             * Iterate through all features on the source, calling the provided callback
-             * with each one.  If the callback returns any "truthy" value, iteration will
-             * stop and the function will return the same value.
-             *
-             * @param callback Called with each feature
-             *     on the source.  Return a truthy value to stop iteration.
-             * @param opt_this The object to use as `this` in the callback.
-             * @return The return value from the last call to the callback.
-             * @template T,S
-             * @api stable
-             */
-            forEachFeature<T, S>(callback: ((feature: ol.Feature) => S), opt_this?: T): (S);
+        /**
+         * Iterate through all features on the source, calling the provided callback
+         * with each one.  If the callback returns any "truthy" value, iteration will
+         * stop and the function will return the same value.
+         *
+         * @param callback Called with each feature
+         *     on the source.  Return a truthy value to stop iteration.
+         * @param opt_this The object to use as `this` in the callback.
+         * @return The return value from the last call to the callback.
+         * @template T,S
+         * @api stable
+         */
+        forEachFeature<T, S>(callback: ((feature: ol.Feature) => S), opt_this?: T): (S);
 
-            /**
-             * Iterate through all features whose bounding box intersects the provided
-             * extent (note that the feature's geometry may not intersect the extent),
-             * calling the callback with each feature.  If the callback returns a "truthy"
-             * value, iteration will stop and the function will return the same value.
-             *
-             * If you are interested in features whose geometry intersects an extent, call
-             * the {@link ol.source.Vector#forEachFeatureIntersectingExtent
-             * source.forEachFeatureIntersectingExtent()} method instead.
-             *
-             * When `useSpatialIndex` is set to false, this method will loop through all
-             * features, equivalent to {@link ol.source.Vector#forEachFeature}.
-             *
-             * @param extent Extent.
-             * @param callback Called with each feature
-             *     whose bounding box intersects the provided extent.
-             * @param opt_this The object to use as `this` in the callback.
-             * @return The return value from the last call to the callback.
-             * @template T,S
-             * @api
-             */
-            forEachFeatureInExtent<T, S>(extent: ol.Extent, callback: ((feature: ol.Feature) => S), opt_this?: T): (S);
+        /**
+         * Iterate through all features whose bounding box intersects the provided
+         * extent (note that the feature's geometry may not intersect the extent),
+         * calling the callback with each feature.  If the callback returns a "truthy"
+         * value, iteration will stop and the function will return the same value.
+         *
+         * If you are interested in features whose geometry intersects an extent, call
+         * the {@link ol.source.Vector#forEachFeatureIntersectingExtent
+         * source.forEachFeatureIntersectingExtent()} method instead.
+         *
+         * When `useSpatialIndex` is set to false, this method will loop through all
+         * features, equivalent to {@link ol.source.Vector#forEachFeature}.
+         *
+         * @param extent Extent.
+         * @param callback Called with each feature
+         *     whose bounding box intersects the provided extent.
+         * @param opt_this The object to use as `this` in the callback.
+         * @return The return value from the last call to the callback.
+         * @template T,S
+         * @api
+         */
+        forEachFeatureInExtent<T, S>(extent: ol.Extent, callback: ((feature: ol.Feature) => S), opt_this?: T): (S);
 
-            /**
-             * Iterate through all features whose geometry intersects the provided extent,
-             * calling the callback with each feature.  If the callback returns a "truthy"
-             * value, iteration will stop and the function will return the same value.
-             *
-             * If you only want to test for bounding box intersection, call the
-             * {@link ol.source.Vector#forEachFeatureInExtent
-             * source.forEachFeatureInExtent()} method instead.
-             *
-             * @param extent Extent.
-             * @param callback Called with each feature
-             *     whose geometry intersects the provided extent.
-             * @param opt_this The object to use as `this` in the callback.
-             * @return The return value from the last call to the callback.
-             * @template T,S
-             * @api
-             */
-            forEachFeatureIntersectingExtent<T, S>(extent: ol.Extent, callback: ((feature: ol.Feature) => S), opt_this?: T): (S);
+        /**
+         * Iterate through all features whose geometry intersects the provided extent,
+         * calling the callback with each feature.  If the callback returns a "truthy"
+         * value, iteration will stop and the function will return the same value.
+         *
+         * If you only want to test for bounding box intersection, call the
+         * {@link ol.source.Vector#forEachFeatureInExtent
+         * source.forEachFeatureInExtent()} method instead.
+         *
+         * @param extent Extent.
+         * @param callback Called with each feature
+         *     whose geometry intersects the provided extent.
+         * @param opt_this The object to use as `this` in the callback.
+         * @return The return value from the last call to the callback.
+         * @template T,S
+         * @api
+         */
+        forEachFeatureIntersectingExtent<T, S>(extent: ol.Extent, callback: ((feature: ol.Feature) => S), opt_this?: T): (S);
 
-            /**
-             * Get the features collection associated with this source. Will be `null`
-             * unless the source was configured with `useSpatialIndex` set to `false`, or
-             * with an {@link ol.Collection} as `features`.
-             * @return The collection of features.
-             * @api
-             */
-            getFeaturesCollection(): ol.Collection<ol.Feature>;
+        /**
+         * Get the features collection associated with this source. Will be `null`
+         * unless the source was configured with `useSpatialIndex` set to `false`, or
+         * with an {@link ol.Collection} as `features`.
+         * @return The collection of features.
+         * @api
+         */
+        getFeaturesCollection(): ol.Collection<ol.Feature>;
 
-            /**
-             * Get all features on the source.
-             * @return Features.
-             * @api stable
-             */
-            getFeatures(): ol.Feature[];
+        /**
+         * Get all features on the source.
+         * @return Features.
+         * @api stable
+         */
+        getFeatures(): ol.Feature[];
 
-            /**
-             * Get all features whose geometry intersects the provided coordinate.
-             * @param coordinate Coordinate.
-             * @return Features.
-             * @api stable
-             */
-            getFeaturesAtCoordinate(coordinate: ol.Coordinate): ol.Feature[];
+        /**
+         * Get all features whose geometry intersects the provided coordinate.
+         * @param coordinate Coordinate.
+         * @return Features.
+         * @api stable
+         */
+        getFeaturesAtCoordinate(coordinate: ol.Coordinate): ol.Feature[];
 
-            /**
-             * Get all features in the provided extent.  Note that this returns all features
-             * whose bounding boxes intersect the given extent (so it may include features
-             * whose geometries do not intersect the extent).
-             *
-             * This method is not available when the source is configured with
-             * `useSpatialIndex` set to `false`.
-             * @param extent Extent.
-             * @return Features.
-             * @api
-             */
-            getFeaturesInExtent(extent: ol.Extent): ol.Feature[];
+        /**
+         * Get all features in the provided extent.  Note that this returns all features
+         * whose bounding boxes intersect the given extent (so it may include features
+         * whose geometries do not intersect the extent).
+         *
+         * This method is not available when the source is configured with
+         * `useSpatialIndex` set to `false`.
+         * @param extent Extent.
+         * @return Features.
+         * @api
+         */
+        getFeaturesInExtent(extent: ol.Extent): ol.Feature[];
 
-            /**
-             * Get the closest feature to the provided coordinate.
-             *
-             * This method is not available when the source is configured with
-             * `useSpatialIndex` set to `false`.
-             * @param coordinate Coordinate.
-             * @param opt_filter Feature filter function.
-             *     The filter function will receive one argument, the {@link ol.Feature feature}
-             *     and it should return a boolean value. By default, no filtering is made.
-             * @return Closest feature.
-             * @api stable
-             */
-            getClosestFeatureToCoordinate(coordinate: ol.Coordinate, opt_filter?: ((feature: ol.Feature) => boolean)): ol.Feature;
+        /**
+         * Get the closest feature to the provided coordinate.
+         *
+         * This method is not available when the source is configured with
+         * `useSpatialIndex` set to `false`.
+         * @param coordinate Coordinate.
+         * @param opt_filter Feature filter function.
+         *     The filter function will receive one argument, the {@link ol.Feature feature}
+         *     and it should return a boolean value. By default, no filtering is made.
+         * @return Closest feature.
+         * @api stable
+         */
+        getClosestFeatureToCoordinate(coordinate: ol.Coordinate, opt_filter?: ((feature: ol.Feature) => boolean)): ol.Feature;
 
-            /**
-             * Get the extent of the features currently in the source.
-             *
-             * This method is not available when the source is configured with
-             * `useSpatialIndex` set to `false`.
-             * @return Extent.
-             * @api stable
-             */
-            getExtent(): ol.Extent;
+        /**
+         * Get the extent of the features currently in the source.
+         *
+         * This method is not available when the source is configured with
+         * `useSpatialIndex` set to `false`.
+         * @return Extent.
+         * @api stable
+         */
+        getExtent(): ol.Extent;
 
-            /**
-             * Get a feature by its identifier (the value returned by feature.getId()).
-             * Note that the index treats string and numeric identifiers as the same.  So
-             * `source.getFeatureById(2)` will return a feature with id `'2'` or `2`.
-             *
-             * @param id Feature identifier.
-             * @return The feature (or `null` if not found).
-             * @api stable
-             */
-            getFeatureById(id: (string | number)): ol.Feature;
+        /**
+         * Get a feature by its identifier (the value returned by feature.getId()).
+         * Note that the index treats string and numeric identifiers as the same.  So
+         * `source.getFeatureById(2)` will return a feature with id `'2'` or `2`.
+         *
+         * @param id Feature identifier.
+         * @return The feature (or `null` if not found).
+         * @api stable
+         */
+        getFeatureById(id: (string | number)): ol.Feature;
 
-            /**
-             * Get the format associated with this source.
-             *
-             * @return The feature format.
-             * @api
-             */
-            getFormat(): (ol.format.Feature);
+        /**
+         * Get the format associated with this source.
+         *
+         * @return The feature format.
+         * @api
+         */
+        getFormat(): (ol.format.Feature);
 
-            /**
-             * Get the url associated with this source.
-             *
-             * @return The url.
-             * @api
-             */
-            getUrl(): (string | ol.FeatureUrlFunction);
+        /**
+         * Get the url associated with this source.
+         *
+         * @return The url.
+         * @api
+         */
+        getUrl(): (string | ol.FeatureUrlFunction);
 
-            /**
-             * Remove a single feature from the source.  If you want to remove all features
-             * at once, use the {@link ol.source.Vector#clear source.clear()} method
-             * instead.
-             * @param feature Feature to remove.
-             * @api stable
-             */
-            removeFeature(feature: ol.Feature): void;
-        }
+        /**
+         * Remove a single feature from the source.  If you want to remove all features
+         * at once, use the {@link ol.source.Vector#clear source.clear()} method
+         * instead.
+         * @param feature Feature to remove.
+         * @api stable
+         */
+        removeFeature(feature: ol.Feature): void;
+    }
 
+    /**
+     * @classdesc
+     * Events emitted by {@link ol.source.Vector} instances are instances of this
+     * type.
+     *
+     * @param type Type.
+     * @param opt_feature Feature.
+     */
+    class VectorEvent extends events.Event {
         /**
          * @classdesc
          * Events emitted by {@link ol.source.Vector} instances are instances of this
@@ -9307,24 +9317,30 @@ declare namespace ol {
          * @param type Type.
          * @param opt_feature Feature.
          */
-        class VectorEvent extends ol.events.Event {
-            /**
-             * @classdesc
-             * Events emitted by {@link ol.source.Vector} instances are instances of this
-             * type.
-             *
-             * @param type Type.
-             * @param opt_feature Feature.
-             */
-            constructor(type: string, opt_feature?: ol.Feature);
+        constructor(type: string, opt_feature?: ol.Feature);
 
-            /**
-             * The feature being added or removed.
-             * @api stable
-             */
-            feature: ol.Feature;
-        }
+        /**
+         * The feature being added or removed.
+         * @api stable
+         */
+        feature: ol.Feature;
+    }
 
+    /**
+     * @classdesc
+     * Class for layer sources providing vector data divided into a tile grid, to be
+     * used with {@link ol.layer.VectorTile}. Although this source receives tiles
+     * with vector features from the server, it is not meant for feature editing.
+     * Features are optimized for rendering, their geometries are clipped at or near
+     * tile boundaries and simplified for a view resolution. See
+     * {@link ol.source.Vector} for vector sources that are suitable for feature
+     * editing.
+     *
+     * @fires ol.source.TileEvent
+     * @param options Vector tile options.
+     * @api
+     */
+    class VectorTile extends source.UrlTile {
         /**
          * @classdesc
          * Class for layer sources providing vector data divided into a tile grid, to be
@@ -9339,38 +9355,31 @@ declare namespace ol {
          * @param options Vector tile options.
          * @api
          */
-        class VectorTile extends ol.source.UrlTile {
-            /**
-             * @classdesc
-             * Class for layer sources providing vector data divided into a tile grid, to be
-             * used with {@link ol.layer.VectorTile}. Although this source receives tiles
-             * with vector features from the server, it is not meant for feature editing.
-             * Features are optimized for rendering, their geometries are clipped at or near
-             * tile boundaries and simplified for a view resolution. See
-             * {@link ol.source.Vector} for vector sources that are suitable for feature
-             * editing.
-             *
-             * @fires ol.source.TileEvent
-             * @param options Vector tile options.
-             * @api
-             */
-            constructor(options: olx.source.VectorTileOptions);
-        }
-
-        namespace wms {
-            /**
-             * Available server types: `'carmentaserver'`, `'geoserver'`, `'mapserver'`,
-             *     `'qgis'`. These are servers that have vendor parameters beyond the WMS
-             *     specification that OpenLayers can make use of.
-             */
-            type ServerType = "carmentaserver" | "geoserver" | "mapserver" | "qgis";
-        }
+        constructor(options: olx.source.VectorTileOptions);
+    }
 
+    namespace wms {
         /**
-         * Request encoding. One of 'KVP', 'REST'.
+         * Available server types: `'carmentaserver'`, `'geoserver'`, `'mapserver'`,
+         *     `'qgis'`. These are servers that have vendor parameters beyond the WMS
+         *     specification that OpenLayers can make use of.
          */
-        type WMTSRequestEncoding = "KVP" | "REST";
+        type ServerType = "carmentaserver" | "geoserver" | "mapserver" | "qgis";
+    }
 
+    /**
+     * Request encoding. One of 'KVP', 'REST'.
+     */
+    type WMTSRequestEncoding = "KVP" | "REST";
+
+    /**
+     * @classdesc
+     * Layer source for tile data from WMTS servers.
+     *
+     * @param options WMTS options.
+     * @api stable
+     */
+    class WMTS extends source.TileImage {
         /**
          * @classdesc
          * Layer source for tile data from WMTS servers.
@@ -9378,100 +9387,113 @@ declare namespace ol {
          * @param options WMTS options.
          * @api stable
          */
-        class WMTS extends ol.source.TileImage {
-            /**
-             * @classdesc
-             * Layer source for tile data from WMTS servers.
-             *
-             * @param options WMTS options.
-             * @api stable
-             */
-            constructor(options: olx.source.WMTSOptions);
+        constructor(options: olx.source.WMTSOptions);
 
-            /**
-             * Get the dimensions, i.e. those passed to the constructor through the
-             * "dimensions" option, and possibly updated using the updateDimensions
-             * method.
-             * @return Dimensions.
-             * @api
-             */
-            getDimensions(): GlobalObject;
+        /**
+         * Get the dimensions, i.e. those passed to the constructor through the
+         * "dimensions" option, and possibly updated using the updateDimensions
+         * method.
+         * @return Dimensions.
+         * @api
+         */
+        getDimensions(): GlobalObject;
 
-            /**
-             * Return the image format of the WMTS source.
-             * @return Format.
-             * @api
-             */
-            getFormat(): string;
+        /**
+         * Return the image format of the WMTS source.
+         * @return Format.
+         * @api
+         */
+        getFormat(): string;
 
-            /**
-             * Return the layer of the WMTS source.
-             * @return Layer.
-             * @api
-             */
-            getLayer(): string;
+        /**
+         * Return the layer of the WMTS source.
+         * @return Layer.
+         * @api
+         */
+        getLayer(): string;
 
-            /**
-             * Return the matrix set of the WMTS source.
-             * @return MatrixSet.
-             * @api
-             */
-            getMatrixSet(): string;
+        /**
+         * Return the matrix set of the WMTS source.
+         * @return MatrixSet.
+         * @api
+         */
+        getMatrixSet(): string;
 
-            /**
-             * Return the request encoding, either "KVP" or "REST".
-             * @return Request encoding.
-             * @api
-             */
-            getRequestEncoding(): ol.source.WMTSRequestEncoding;
+        /**
+         * Return the request encoding, either "KVP" or "REST".
+         * @return Request encoding.
+         * @api
+         */
+        getRequestEncoding(): ol.source.WMTSRequestEncoding;
 
-            /**
-             * Return the style of the WMTS source.
-             * @return Style.
-             * @api
-             */
-            getStyle(): string;
+        /**
+         * Return the style of the WMTS source.
+         * @return Style.
+         * @api
+         */
+        getStyle(): string;
 
-            /**
-             * Return the version of the WMTS source.
-             * @return Version.
-             * @api
-             */
-            getVersion(): string;
+        /**
+         * Return the version of the WMTS source.
+         * @return Version.
+         * @api
+         */
+        getVersion(): string;
 
-            /**
-             * Update the dimensions.
-             * @param dimensions Dimensions.
-             * @api
-             */
-            updateDimensions(dimensions: GlobalObject): void;
+        /**
+         * Update the dimensions.
+         * @param dimensions Dimensions.
+         * @api
+         */
+        updateDimensions(dimensions: GlobalObject): void;
 
-            /**
-             * Generate source options from a capabilities object.
-             * @param wmtsCap An object representing the capabilities document.
-             * @param config Configuration properties for the layer.  Defaults for
-             *                  the layer will apply if not provided.
-             *
-             * Required config properties:
-             *  - layer - {string} The layer identifier.
-             *
-             * Optional config properties:
-             *  - matrixSet - {string} The matrix set identifier, required if there is
-             *       more than one matrix set in the layer capabilities.
-             *  - projection - {string} The desired CRS when no matrixSet is specified.
-             *       eg: "EPSG:3857". If the desired projection is not available,
-             *       an error is thrown.
-             *  - requestEncoding - {string} url encoding format for the layer. Default is
-             *       the first tile url format found in the GetCapabilities response.
-             *  - style - {string} The name of the style
-             *  - format - {string} Image format for the layer. Default is the first
-             *       format returned in the GetCapabilities response.
-             * @return WMTS source options object.
-             * @api
-             */
-            static optionsFromCapabilities(wmtsCap: GlobalObject, config: GlobalObject): olx.source.WMTSOptions;
-        }
+        /**
+         * Generate source options from a capabilities object.
+         * @param wmtsCap An object representing the capabilities document.
+         * @param config Configuration properties for the layer.  Defaults for
+         *                  the layer will apply if not provided.
+         *
+         * Required config properties:
+         *  - layer - {string} The layer identifier.
+         *
+         * Optional config properties:
+         *  - matrixSet - {string} The matrix set identifier, required if there is
+         *       more than one matrix set in the layer capabilities.
+         *  - projection - {string} The desired CRS when no matrixSet is specified.
+         *       eg: "EPSG:3857". If the desired projection is not available,
+         *       an error is thrown.
+         *  - requestEncoding - {string} url encoding format for the layer. Default is
+         *       the first tile url format found in the GetCapabilities response.
+         *  - style - {string} The name of the style
+         *  - format - {string} Image format for the layer. Default is the first
+         *       format returned in the GetCapabilities response.
+         * @return WMTS source options object.
+         * @api
+         */
+        static optionsFromCapabilities(wmtsCap: GlobalObject, config: GlobalObject): olx.source.WMTSOptions;
+    }
 
+    /**
+     * @classdesc
+     * Layer source for tile data with URLs in a set XYZ format that are
+     * defined in a URL template. By default, this follows the widely-used
+     * Google grid where `x` 0 and `y` 0 are in the top left. Grids like
+     * TMS where `x` 0 and `y` 0 are in the bottom left can be used by
+     * using the `{-y}` placeholder in the URL template, so long as the
+     * source does not have a custom tile grid. In this case,
+     * {@link ol.source.TileImage} can be used with a `tileUrlFunction`
+     * such as:
+     *
+     *  tileUrlFunction: function(coordinate) {
+     *    return 'http://mapserver.com/' + coordinate[0] + '/' +
+     *        coordinate[1] + '/' + coordinate[2] + '.png';
+     *    }
+     *
+     *
+     * @param opt_options XYZ options.
+     * @api stable
+     */
+    class XYZ extends source.TileImage {
         /**
          * @classdesc
          * Layer source for tile data with URLs in a set XYZ format that are
@@ -9492,30 +9514,17 @@ declare namespace ol {
          * @param opt_options XYZ options.
          * @api stable
          */
-        class XYZ extends ol.source.TileImage {
-            /**
-             * @classdesc
-             * Layer source for tile data with URLs in a set XYZ format that are
-             * defined in a URL template. By default, this follows the widely-used
-             * Google grid where `x` 0 and `y` 0 are in the top left. Grids like
-             * TMS where `x` 0 and `y` 0 are in the bottom left can be used by
-             * using the `{-y}` placeholder in the URL template, so long as the
-             * source does not have a custom tile grid. In this case,
-             * {@link ol.source.TileImage} can be used with a `tileUrlFunction`
-             * such as:
-             *
-             *  tileUrlFunction: function(coordinate) {
-             *    return 'http://mapserver.com/' + coordinate[0] + '/' +
-             *        coordinate[1] + '/' + coordinate[2] + '.png';
-             *    }
-             *
-             *
-             * @param opt_options XYZ options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.source.XYZOptions);
-        }
+        constructor(opt_options?: olx.source.XYZOptions);
+    }
 
+    /**
+     * @classdesc
+     * Layer source for tile data in Zoomify format.
+     *
+     * @param opt_options Options.
+     * @api stable
+     */
+    class Zoomify extends source.TileImage {
         /**
          * @classdesc
          * Layer source for tile data in Zoomify format.
@@ -9523,37 +9532,45 @@ declare namespace ol {
          * @param opt_options Options.
          * @api stable
          */
-        class Zoomify extends ol.source.TileImage {
-            /**
-             * @classdesc
-             * Layer source for tile data in Zoomify format.
-             *
-             * @param opt_options Options.
-             * @api stable
-             */
-            constructor(opt_options?: olx.source.ZoomifyOptions);
-        }
+        constructor(opt_options?: olx.source.ZoomifyOptions);
     }
+}
+
+/**
+ * Object literal with options for the {@link ol.Sphere.getLength} or
+ * {@link ol.Sphere.getArea} functions.
+ */
+export interface SphereMetricOptions {
+    /**
+     * Projection of the geometry.  By default, the geometry is assumed to be in
+     * EPSG:3857 (Web Mercator).
+     */
+    projection?: ol.proj.Projection;
 
     /**
-     * Object literal with options for the {@link ol.Sphere.getLength} or
-     * {@link ol.Sphere.getArea} functions.
+     * Sphere radius.  By default, the radius of the earth is used (Clarke 1866
+     * Authalic Sphere).
+     * @api
      */
-    interface SphereMetricOptions {
-        /**
-         * Projection of the geometry.  By default, the geometry is assumed to be in
-         * EPSG:3857 (Web Mercator).
-         */
-        projection?: ol.proj.Projection;
-
-        /**
-         * Sphere radius.  By default, the radius of the earth is used (Clarke 1866
-         * Authalic Sphere).
-         * @api
-         */
-        radius?: number;
-    }
+    radius?: number;
+}
 
+/**
+ * @classdesc
+ * Class to create objects that can be used with {@link
+ * ol.geom.Polygon.circular}.
+ *
+ * For example to create a sphere whose radius is equal to the semi-major
+ * axis of the WGS84 ellipsoid:
+ *
+ * ```js
+ * var wgs84Sphere= new ol.Sphere(6378137);
+ * ```
+ *
+ * @param radius Radius.
+ * @api
+ */
+export class Sphere {
     /**
      * @classdesc
      * Class to create objects that can be used with {@link
@@ -9569,157 +9586,158 @@ declare namespace ol {
      * @param radius Radius.
      * @api
      */
-    class Sphere {
-        /**
-         * @classdesc
-         * Class to create objects that can be used with {@link
-         * ol.geom.Polygon.circular}.
-         *
-         * For example to create a sphere whose radius is equal to the semi-major
-         * axis of the WGS84 ellipsoid:
-         *
-         * ```js
-         * var wgs84Sphere= new ol.Sphere(6378137);
-         * ```
-         *
-         * @param radius Radius.
-         * @api
-         */
-        constructor(radius: number);
-
-        /**
-         * Returns the geodesic area for a list of coordinates.
-         *
-         * [Reference](http://trs-new.jpl.nasa.gov/dspace/handle/2014/40409)
-         * Robert. G. Chamberlain and William H. Duquette, "Some Algorithms for
-         * Polygons on a Sphere", JPL Publication 07-03, Jet Propulsion
-         * Laboratory, Pasadena, CA, June 2007
-         *
-         * @param coordinates List of coordinates of a linear
-         * ring. If the ring is oriented clockwise, the area will be positive,
-         * otherwise it will be negative.
-         * @return Area.
-         * @api
-         */
-        geodesicArea(coordinates: ol.Coordinate[]): number;
-
-        /**
-         * Returns the distance from c1 to c2 using the haversine formula.
-         *
-         * @param c1 Coordinate 1.
-         * @param c2 Coordinate 2.
-         * @return Haversine distance.
-         * @api
-         */
-        haversineDistance(c1: ol.Coordinate, c2: ol.Coordinate): number;
-
-        /**
-         * Get the spherical area of a geometry.  This is the area (in meters) assuming
-         * that polygon edges are segments of great circles on a sphere.
-         * @param geometry A geometry.
-         * @param opt_options Options for the area
-         *     calculation.  By default, geometries are assumed to be in 'EPSG:3857'.
-         *     You can change this by providing a `projection` option.
-         * @return The spherical area (in square meters).
-         * @api
-         */
-        static getArea(geometry: geom.Geometry, opt_options?: SphereMetricOptions): number;
-
-        /**
-         * Get the spherical length of a geometry.  This length is the sum of the
-         * great circle distances between coordinates.  For polygons, the length is
-         * the sum of all rings.  For points, the length is zero.  For multi-part
-         * geometries, the length is the sum of the length of each part.
-         * @param geometry A geometry.
-         * @param opt_options Options for the length
-         *     calculation.  By default, geometries are assumed to be in 'EPSG:3857'.
-         *     You can change this by providing a `projection` option.
-         * @return The spherical length (in meters).
-         * @api
-         */
-        static getLength(geometry: geom.Geometry, opt_options?: SphereMetricOptions): number;
-    }
+    constructor(radius: number);
 
     /**
-     * Feature styles.
+     * Returns the geodesic area for a list of coordinates.
      *
-     * If no style is defined, the following default style is used:
-     * ```js
-     *  var fill = new ol.style.Fill({
-     *    color: 'rgba(255,255,255,0.4)'
-     *  });
-     *  var stroke = new ol.style.Stroke({
-     *    color: '#3399CC',
-     *    width: 1.25
-     *  });
-     *  var styles = [
-     *    new ol.style.Style({
-     *      image: new ol.style.Circle({
-     *        fill: fill,
-     *        stroke: stroke,
-     *        radius: 5
-     *      }),
-     *      fill: fill,
-     *      stroke: stroke
-     *    })
-     *  ];
-     * ```
-     *
-     * A separate editing style has the following defaults:
-     * ```js
-     *  var white = [255, 255, 255, 1];
-     *  var blue = [0, 153, 255, 1];
-     *  var width = 3;
-     *  styles[ol.geom.GeometryType.POLYGON] = [
-     *    new ol.style.Style({
-     *      fill: new ol.style.Fill({
-     *        color: [255, 255, 255, 0.5]
-     *      })
-     *    })
-     *  ];
-     *  styles[ol.geom.GeometryType.MULTI_POLYGON] =
-     *      styles[ol.geom.GeometryType.POLYGON];
-     *  styles[ol.geom.GeometryType.LINE_STRING] = [
-     *    new ol.style.Style({
-     *      stroke: new ol.style.Stroke({
-     *        color: white,
-     *        width: width + 2
-     *      })
-     *    }),
-     *    new ol.style.Style({
-     *      stroke: new ol.style.Stroke({
-     *        color: blue,
-     *        width: width
-     *      })
-     *    })
-     *  ];
-     *  styles[ol.geom.GeometryType.MULTI_LINE_STRING] =
-     *      styles[ol.geom.GeometryType.LINE_STRING];
-     *  styles[ol.geom.GeometryType.POINT] = [
-     *    new ol.style.Style({
-     *      image: new ol.style.Circle({
-     *        radius: width * 2,
-     *        fill: new ol.style.Fill({
-     *          color: blue
-     *        }),
-     *        stroke: new ol.style.Stroke({
-     *          color: white,
-     *          width: width / 2
-     *        })
-     *      }),
-     *      zIndex: Infinity
-     *    })
-     *  ];
-     *  styles[ol.geom.GeometryType.MULTI_POINT] =
-     *      styles[ol.geom.GeometryType.POINT];
-     *  styles[ol.geom.GeometryType.GEOMETRY_COLLECTION] =
-     *      styles[ol.geom.GeometryType.POLYGON].concat(
-     *          styles[ol.geom.GeometryType.POINT]
-     *      );
-     * ```
+     * [Reference](http://trs-new.jpl.nasa.gov/dspace/handle/2014/40409)
+     * Robert. G. Chamberlain and William H. Duquette, "Some Algorithms for
+     * Polygons on a Sphere", JPL Publication 07-03, Jet Propulsion
+     * Laboratory, Pasadena, CA, June 2007
      *
+     * @param coordinates List of coordinates of a linear
+     * ring. If the ring is oriented clockwise, the area will be positive,
+     * otherwise it will be negative.
+     * @return Area.
+     * @api
      */
-    namespace style {
+    geodesicArea(coordinates: ol.Coordinate[]): number;
+
+    /**
+     * Returns the distance from c1 to c2 using the haversine formula.
+     *
+     * @param c1 Coordinate 1.
+     * @param c2 Coordinate 2.
+     * @return Haversine distance.
+     * @api
+     */
+    haversineDistance(c1: ol.Coordinate, c2: ol.Coordinate): number;
+
+    /**
+     * Get the spherical area of a geometry.  This is the area (in meters) assuming
+     * that polygon edges are segments of great circles on a sphere.
+     * @param geometry A geometry.
+     * @param opt_options Options for the area
+     *     calculation.  By default, geometries are assumed to be in 'EPSG:3857'.
+     *     You can change this by providing a `projection` option.
+     * @return The spherical area (in square meters).
+     * @api
+     */
+    static getArea(geometry: geom.Geometry, opt_options?: SphereMetricOptions): number;
+
+    /**
+     * Get the spherical length of a geometry.  This length is the sum of the
+     * great circle distances between coordinates.  For polygons, the length is
+     * the sum of all rings.  For points, the length is zero.  For multi-part
+     * geometries, the length is the sum of the length of each part.
+     * @param geometry A geometry.
+     * @param opt_options Options for the length
+     *     calculation.  By default, geometries are assumed to be in 'EPSG:3857'.
+     *     You can change this by providing a `projection` option.
+     * @return The spherical length (in meters).
+     * @api
+     */
+    static getLength(geometry: geom.Geometry, opt_options?: SphereMetricOptions): number;
+}
+
+/**
+ * Feature styles.
+ *
+ * If no style is defined, the following default style is used:
+ * ```js
+ *  var fill = new ol.style.Fill({
+ *    color: 'rgba(255,255,255,0.4)'
+ *  });
+ *  var stroke = new ol.style.Stroke({
+ *    color: '#3399CC',
+ *    width: 1.25
+ *  });
+ *  var styles = [
+ *    new ol.style.Style({
+ *      image: new ol.style.Circle({
+ *        fill: fill,
+ *        stroke: stroke,
+ *        radius: 5
+ *      }),
+ *      fill: fill,
+ *      stroke: stroke
+ *    })
+ *  ];
+ * ```
+ *
+ * A separate editing style has the following defaults:
+ * ```js
+ *  var white = [255, 255, 255, 1];
+ *  var blue = [0, 153, 255, 1];
+ *  var width = 3;
+ *  styles[ol.geom.GeometryType.POLYGON] = [
+ *    new ol.style.Style({
+ *      fill: new ol.style.Fill({
+ *        color: [255, 255, 255, 0.5]
+ *      })
+ *    })
+ *  ];
+ *  styles[ol.geom.GeometryType.MULTI_POLYGON] =
+ *      styles[ol.geom.GeometryType.POLYGON];
+ *  styles[ol.geom.GeometryType.LINE_STRING] = [
+ *    new ol.style.Style({
+ *      stroke: new ol.style.Stroke({
+ *        color: white,
+ *        width: width + 2
+ *      })
+ *    }),
+ *    new ol.style.Style({
+ *      stroke: new ol.style.Stroke({
+ *        color: blue,
+ *        width: width
+ *      })
+ *    })
+ *  ];
+ *  styles[ol.geom.GeometryType.MULTI_LINE_STRING] =
+ *      styles[ol.geom.GeometryType.LINE_STRING];
+ *  styles[ol.geom.GeometryType.POINT] = [
+ *    new ol.style.Style({
+ *      image: new ol.style.Circle({
+ *        radius: width * 2,
+ *        fill: new ol.style.Fill({
+ *          color: blue
+ *        }),
+ *        stroke: new ol.style.Stroke({
+ *          color: white,
+ *          width: width / 2
+ *        })
+ *      }),
+ *      zIndex: Infinity
+ *    })
+ *  ];
+ *  styles[ol.geom.GeometryType.MULTI_POINT] =
+ *      styles[ol.geom.GeometryType.POINT];
+ *  styles[ol.geom.GeometryType.GEOMETRY_COLLECTION] =
+ *      styles[ol.geom.GeometryType.POLYGON].concat(
+ *          styles[ol.geom.GeometryType.POINT]
+ *      );
+ * ```
+ *
+ */
+export namespace style {
+    /**
+     * Manages the creation of image atlases.
+     *
+     * Images added to this manager will be inserted into an atlas, which
+     * will be used for rendering.
+     * The `size` given in the constructor is the size for the first
+     * atlas. After that, when new atlases are created, they will have
+     * twice the size as the latest atlas (until `maxSize` is reached).
+     *
+     * If an application uses many images or very large images, it is recommended
+     * to set a higher `size` value to avoid the creation of too many atlases.
+     *
+     * @struct
+     * @api
+     * @param opt_options Options.
+     */
+    class AtlasManager {
         /**
          * Manages the creation of image atlases.
          *
@@ -9736,26 +9754,17 @@ declare namespace ol {
          * @api
          * @param opt_options Options.
          */
-        class AtlasManager {
-            /**
-             * Manages the creation of image atlases.
-             *
-             * Images added to this manager will be inserted into an atlas, which
-             * will be used for rendering.
-             * The `size` given in the constructor is the size for the first
-             * atlas. After that, when new atlases are created, they will have
-             * twice the size as the latest atlas (until `maxSize` is reached).
-             *
-             * If an application uses many images or very large images, it is recommended
-             * to set a higher `size` value to avoid the creation of too many atlases.
-             *
-             * @struct
-             * @api
-             * @param opt_options Options.
-             */
-            constructor(opt_options?: olx.style.AtlasManagerOptions);
-        }
+        constructor(opt_options?: olx.style.AtlasManagerOptions);
+    }
 
+    /**
+     * @classdesc
+     * Set circle style for vector features.
+     *
+     * @param opt_options Options.
+     * @api
+     */
+    class Circle extends style.Image {
         /**
          * @classdesc
          * Set circle style for vector features.
@@ -9763,54 +9772,54 @@ declare namespace ol {
          * @param opt_options Options.
          * @api
          */
-        class Circle extends ol.style.Image {
-            /**
-             * @classdesc
-             * Set circle style for vector features.
-             *
-             * @param opt_options Options.
-             * @api
-             */
-            constructor(opt_options?: olx.style.CircleOptions);
+        constructor(opt_options?: olx.style.CircleOptions);
 
-            /**
-             * Get the fill style for the circle.
-             * @return Fill style.
-             * @api
-             */
-            getFill(): ol.style.Fill;
+        /**
+         * Get the fill style for the circle.
+         * @return Fill style.
+         * @api
+         */
+        getFill(): ol.style.Fill;
 
-            /**
-             * Get the image used to render the circle.
-             * @param pixelRatio Pixel ratio.
-             * @return Canvas element.
-             * @api
-             */
-            getImage(pixelRatio: number): HTMLCanvasElement;
+        /**
+         * Get the image used to render the circle.
+         * @param pixelRatio Pixel ratio.
+         * @return Canvas element.
+         * @api
+         */
+        getImage(pixelRatio: number): HTMLCanvasElement;
 
-            /**
-             * Get the circle radius.
-             * @return Radius.
-             * @api
-             */
-            getRadius(): number;
+        /**
+         * Get the circle radius.
+         * @return Radius.
+         * @api
+         */
+        getRadius(): number;
 
-            /**
-             * Get the stroke style for the circle.
-             * @return Stroke style.
-             * @api
-             */
-            getStroke(): ol.style.Stroke;
+        /**
+         * Get the stroke style for the circle.
+         * @return Stroke style.
+         * @api
+         */
+        getStroke(): ol.style.Stroke;
 
-            /**
-             * Set the circle radius.
-             *
-             * @param radius Circle radius.
-             * @api
-             */
-            setRadius(radius: number): void;
-        }
+        /**
+         * Set the circle radius.
+         *
+         * @param radius Circle radius.
+         * @api
+         */
+        setRadius(radius: number): void;
+    }
 
+    /**
+     * @classdesc
+     * Set fill style for vector features.
+     *
+     * @param opt_options Options.
+     * @api
+     */
+    class Fill {
         /**
          * @classdesc
          * Set fill style for vector features.
@@ -9818,42 +9827,42 @@ declare namespace ol {
          * @param opt_options Options.
          * @api
          */
-        class Fill {
-            /**
-             * @classdesc
-             * Set fill style for vector features.
-             *
-             * @param opt_options Options.
-             * @api
-             */
-            constructor(opt_options?: olx.style.FillOptions);
-
-            /**
-             * Get the fill color.
-             * @return Color.
-             * @api
-             */
-            getColor(): (ol.Color | ol.ColorLike);
-
-            /**
-             * Set the color.
-             *
-             * @param color Color.
-             * @api
-             */
-            setColor(color: (ol.Color | ol.ColorLike)): void;
-        }
+        constructor(opt_options?: olx.style.FillOptions);
 
         /**
-         * Icon anchor units. One of 'fraction', 'pixels'.
+         * Get the fill color.
+         * @return Color.
+         * @api
          */
-        type IconAnchorUnits = "fraction" | "pixels";
+        getColor(): (ol.Color | ol.ColorLike);
 
         /**
-         * Icon origin. One of 'bottom-left', 'bottom-right', 'top-left', 'top-right'.
+         * Set the color.
+         *
+         * @param color Color.
+         * @api
          */
-        type IconOrigin = "bottom-left" | "bottom-right" | "top-left" | "top-right";
+        setColor(color: (ol.Color | ol.ColorLike)): void;
+    }
 
+    /**
+     * Icon anchor units. One of 'fraction', 'pixels'.
+     */
+    type IconAnchorUnits = "fraction" | "pixels";
+
+    /**
+     * Icon origin. One of 'bottom-left', 'bottom-right', 'top-left', 'top-right'.
+     */
+    type IconOrigin = "bottom-left" | "bottom-right" | "top-left" | "top-right";
+
+    /**
+     * @classdesc
+     * Set icon style for vector features.
+     *
+     * @param opt_options Options.
+     * @api
+     */
+    class Icon extends style.Image {
         /**
          * @classdesc
          * Set icon style for vector features.
@@ -9861,59 +9870,61 @@ declare namespace ol {
          * @param opt_options Options.
          * @api
          */
-        class Icon extends ol.style.Image {
-            /**
-             * @classdesc
-             * Set icon style for vector features.
-             *
-             * @param opt_options Options.
-             * @api
-             */
-            constructor(opt_options?: olx.style.IconOptions);
+        constructor(opt_options?: olx.style.IconOptions);
 
-            /**
-             * @inheritDoc
-             * @api
-             */
-            getAnchor(): number[];
+        /**
+         * @inheritDoc
+         * @api
+         */
+        getAnchor(): number[];
 
-            /**
-             * Get the image icon.
-             * @param pixelRatio Pixel ratio.
-             * @return Image or Canvas element.
-             * @api
-             */
-            getImage(pixelRatio: number): (Image | HTMLCanvasElement);
+        /**
+         * Get the image icon.
+         * @param pixelRatio Pixel ratio.
+         * @return Image or Canvas element.
+         * @api
+         */
+        getImage(pixelRatio: number): (Image | HTMLCanvasElement);
 
-            /**
-             * @inheritDoc
-             * @api
-             */
-            getOrigin(): number[];
+        /**
+         * @inheritDoc
+         * @api
+         */
+        getOrigin(): number[];
 
-            /**
-             * Get the image URL.
-             * @return Image src.
-             * @api
-             */
-            getSrc(): (string);
+        /**
+         * Get the image URL.
+         * @return Image src.
+         * @api
+         */
+        getSrc(): (string);
 
-            /**
-             * @inheritDoc
-             * @api
-             */
-            getSize(): ol.Size;
+        /**
+         * @inheritDoc
+         * @api
+         */
+        getSize(): ol.Size;
 
-            /**
-             * Load not yet loaded URI.
-             * When rendering a feature with an icon style, the vector renderer will
-             * automatically call this method. However, you might want to call this
-             * method yourself for preloading or other purposes.
-             * @api
-             */
-            load(): void;
-        }
+        /**
+         * Load not yet loaded URI.
+         * When rendering a feature with an icon style, the vector renderer will
+         * automatically call this method. However, you might want to call this
+         * method yourself for preloading or other purposes.
+         * @api
+         */
+        load(): void;
+    }
 
+    /**
+     * @classdesc
+     * A base class used for creating subclasses and not instantiated in
+     * apps. Base class for {@link ol.style.Icon}, {@link ol.style.Circle} and
+     * {@link ol.style.RegularShape}.
+     *
+     * @param options Options.
+     * @api
+     */
+    class Image {
         /**
          * @classdesc
          * A base class used for creating subclasses and not instantiated in
@@ -9923,78 +9934,78 @@ declare namespace ol {
          * @param options Options.
          * @api
          */
-        class Image {
-            /**
-             * @classdesc
-             * A base class used for creating subclasses and not instantiated in
-             * apps. Base class for {@link ol.style.Icon}, {@link ol.style.Circle} and
-             * {@link ol.style.RegularShape}.
-             *
-             * @param options Options.
-             * @api
-             */
-            constructor(options: ol.StyleImageOptions);
+        constructor(options: ol.StyleImageOptions);
 
-            /**
-             * Get the symbolizer opacity.
-             * @return Opacity.
-             * @api
-             */
-            getOpacity(): number;
+        /**
+         * Get the symbolizer opacity.
+         * @return Opacity.
+         * @api
+         */
+        getOpacity(): number;
 
-            /**
-             * Determine whether the symbolizer rotates with the map.
-             * @return Rotate with map.
-             * @api
-             */
-            getRotateWithView(): boolean;
+        /**
+         * Determine whether the symbolizer rotates with the map.
+         * @return Rotate with map.
+         * @api
+         */
+        getRotateWithView(): boolean;
 
-            /**
-             * Get the symoblizer rotation.
-             * @return Rotation.
-             * @api
-             */
-            getRotation(): number;
+        /**
+         * Get the symoblizer rotation.
+         * @return Rotation.
+         * @api
+         */
+        getRotation(): number;
 
-            /**
-             * Get the symbolizer scale.
-             * @return Scale.
-             * @api
-             */
-            getScale(): number;
+        /**
+         * Get the symbolizer scale.
+         * @return Scale.
+         * @api
+         */
+        getScale(): number;
 
-            /**
-             * Determine whether the symbolizer should be snapped to a pixel.
-             * @return The symbolizer should snap to a pixel.
-             * @api
-             */
-            getSnapToPixel(): boolean;
+        /**
+         * Determine whether the symbolizer should be snapped to a pixel.
+         * @return The symbolizer should snap to a pixel.
+         * @api
+         */
+        getSnapToPixel(): boolean;
 
-            /**
-             * Set the opacity.
-             *
-             * @param opacity Opacity.
-             * @api
-             */
-            setOpacity(opacity: number): void;
+        /**
+         * Set the opacity.
+         *
+         * @param opacity Opacity.
+         * @api
+         */
+        setOpacity(opacity: number): void;
 
-            /**
-             * Set the rotation.
-             *
-             * @param rotation Rotation.
-             * @api
-             */
-            setRotation(rotation: number): void;
+        /**
+         * Set the rotation.
+         *
+         * @param rotation Rotation.
+         * @api
+         */
+        setRotation(rotation: number): void;
 
-            /**
-             * Set the scale.
-             *
-             * @param scale Scale.
-             * @api
-             */
-            setScale(scale: number): void;
-        }
+        /**
+         * Set the scale.
+         *
+         * @param scale Scale.
+         * @api
+         */
+        setScale(scale: number): void;
+    }
 
+    /**
+     * @classdesc
+     * Set regular shape style for vector features. The resulting shape will be
+     * a regular polygon when `radius` is provided, or a star when `radius1` and
+     * `radius2` are provided.
+     *
+     * @param options Options.
+     * @api
+     */
+    class RegularShape extends style.Image {
         /**
          * @classdesc
          * Set regular shape style for vector features. The resulting shape will be
@@ -10004,85 +10015,86 @@ declare namespace ol {
          * @param options Options.
          * @api
          */
-        class RegularShape extends ol.style.Image {
-            /**
-             * @classdesc
-             * Set regular shape style for vector features. The resulting shape will be
-             * a regular polygon when `radius` is provided, or a star when `radius1` and
-             * `radius2` are provided.
-             *
-             * @param options Options.
-             * @api
-             */
-            constructor(options: olx.style.RegularShapeOptions);
+        constructor(options: olx.style.RegularShapeOptions);
 
-            /**
-             * @inheritDoc
-             * @api
-             */
-            getAnchor(): number[];
+        /**
+         * @inheritDoc
+         * @api
+         */
+        getAnchor(): number[];
 
-            /**
-             * Get the angle used in generating the shape.
-             * @return Shape's rotation in radians.
-             * @api
-             */
-            getAngle(): number;
+        /**
+         * Get the angle used in generating the shape.
+         * @return Shape's rotation in radians.
+         * @api
+         */
+        getAngle(): number;
 
-            /**
-             * Get the fill style for the shape.
-             * @return Fill style.
-             * @api
-             */
-            getFill(): ol.style.Fill;
+        /**
+         * Get the fill style for the shape.
+         * @return Fill style.
+         * @api
+         */
+        getFill(): ol.style.Fill;
 
-            /**
-             * @inheritDoc
-             * @api
-             */
-            getImage(pixelRatio: number): (HTMLCanvasElement | HTMLVideoElement | Image);
+        /**
+         * @inheritDoc
+         * @api
+         */
+        getImage(pixelRatio: number): (HTMLCanvasElement | HTMLVideoElement | Image);
 
-            /**
-             * @inheritDoc
-             * @api
-             */
-            getOrigin(): number[];
+        /**
+         * @inheritDoc
+         * @api
+         */
+        getOrigin(): number[];
 
-            /**
-             * Get the number of points for generating the shape.
-             * @return Number of points for stars and regular polygons.
-             * @api
-             */
-            getPoints(): number;
+        /**
+         * Get the number of points for generating the shape.
+         * @return Number of points for stars and regular polygons.
+         * @api
+         */
+        getPoints(): number;
 
-            /**
-             * Get the (primary) radius for the shape.
-             * @return Radius.
-             * @api
-             */
-            getRadius(): number;
+        /**
+         * Get the (primary) radius for the shape.
+         * @return Radius.
+         * @api
+         */
+        getRadius(): number;
 
-            /**
-             * Get the secondary radius for the shape.
-             * @return Radius2.
-             * @api
-             */
-            getRadius2(): number;
+        /**
+         * Get the secondary radius for the shape.
+         * @return Radius2.
+         * @api
+         */
+        getRadius2(): number;
 
-            /**
-             * @inheritDoc
-             * @api
-             */
-            getSize(): ol.Size;
+        /**
+         * @inheritDoc
+         * @api
+         */
+        getSize(): ol.Size;
 
-            /**
-             * Get the stroke style for the shape.
-             * @return Stroke style.
-             * @api
-             */
-            getStroke(): ol.style.Stroke;
-        }
+        /**
+         * Get the stroke style for the shape.
+         * @return Stroke style.
+         * @api
+         */
+        getStroke(): ol.style.Stroke;
+    }
 
+    /**
+     * @classdesc
+     * Set stroke style for vector features.
+     * Note that the defaults given are the Canvas defaults, which will be used if
+     * option is not defined. The `get` functions return whatever was entered in
+     * the options; they will not return the default.
+     *
+     * @param opt_options Options.
+     * @api
+     */
+    class Stroke {
         /**
          * @classdesc
          * Set stroke style for vector features.
@@ -10093,116 +10105,116 @@ declare namespace ol {
          * @param opt_options Options.
          * @api
          */
-        class Stroke {
-            /**
-             * @classdesc
-             * Set stroke style for vector features.
-             * Note that the defaults given are the Canvas defaults, which will be used if
-             * option is not defined. The `get` functions return whatever was entered in
-             * the options; they will not return the default.
-             *
-             * @param opt_options Options.
-             * @api
-             */
-            constructor(opt_options?: olx.style.StrokeOptions);
+        constructor(opt_options?: olx.style.StrokeOptions);
 
-            /**
-             * Get the stroke color.
-             * @return Color.
-             * @api
-             */
-            getColor(): (ol.Color | string);
+        /**
+         * Get the stroke color.
+         * @return Color.
+         * @api
+         */
+        getColor(): (ol.Color | string);
 
-            /**
-             * Get the line cap type for the stroke.
-             * @return Line cap.
-             * @api
-             */
-            getLineCap(): (string);
+        /**
+         * Get the line cap type for the stroke.
+         * @return Line cap.
+         * @api
+         */
+        getLineCap(): (string);
 
-            /**
-             * Get the line dash style for the stroke.
-             * @return Line dash.
-             * @api
-             */
-            getLineDash(): number[];
+        /**
+         * Get the line dash style for the stroke.
+         * @return Line dash.
+         * @api
+         */
+        getLineDash(): number[];
 
-            /**
-             * Get the line join type for the stroke.
-             * @return Line join.
-             * @api
-             */
-            getLineJoin(): (string);
+        /**
+         * Get the line join type for the stroke.
+         * @return Line join.
+         * @api
+         */
+        getLineJoin(): (string);
 
-            /**
-             * Get the miter limit for the stroke.
-             * @return Miter limit.
-             * @api
-             */
-            getMiterLimit(): (number);
+        /**
+         * Get the miter limit for the stroke.
+         * @return Miter limit.
+         * @api
+         */
+        getMiterLimit(): (number);
 
-            /**
-             * Get the stroke width.
-             * @return Width.
-             * @api
-             */
-            getWidth(): (number);
+        /**
+         * Get the stroke width.
+         * @return Width.
+         * @api
+         */
+        getWidth(): (number);
 
-            /**
-             * Set the color.
-             *
-             * @param color Color.
-             * @api
-             */
-            setColor(color: (ol.Color | string)): void;
+        /**
+         * Set the color.
+         *
+         * @param color Color.
+         * @api
+         */
+        setColor(color: (ol.Color | string)): void;
 
-            /**
-             * Set the line cap.
-             *
-             * @param lineCap Line cap.
-             * @api
-             */
-            setLineCap(lineCap: (string)): void;
+        /**
+         * Set the line cap.
+         *
+         * @param lineCap Line cap.
+         * @api
+         */
+        setLineCap(lineCap: (string)): void;
 
-            /**
-             * Set the line dash.
-             *
-             * Please note that Internet Explorer 10 and lower [do not support][mdn] the
-             * `setLineDash` method on the `CanvasRenderingContext2D` and therefore this
-             * property will have no visual effect in these browsers.
-             *
-             * [mdn]: https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/setLineDash#Browser_compatibility
-             *
-             * @param lineDash Line dash.
-             * @api
-             */
-            setLineDash(lineDash: number[]): void;
+        /**
+         * Set the line dash.
+         *
+         * Please note that Internet Explorer 10 and lower [do not support][mdn] the
+         * `setLineDash` method on the `CanvasRenderingContext2D` and therefore this
+         * property will have no visual effect in these browsers.
+         *
+         * [mdn]: https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/setLineDash#Browser_compatibility
+         *
+         * @param lineDash Line dash.
+         * @api
+         */
+        setLineDash(lineDash: number[]): void;
 
-            /**
-             * Set the line join.
-             *
-             * @param lineJoin Line join.
-             * @api
-             */
-            setLineJoin(lineJoin: (string)): void;
+        /**
+         * Set the line join.
+         *
+         * @param lineJoin Line join.
+         * @api
+         */
+        setLineJoin(lineJoin: (string)): void;
 
-            /**
-             * Set the miter limit.
-             *
-             * @param miterLimit Miter limit.
-             * @api
-             */
-            setMiterLimit(miterLimit: (number)): void;
+        /**
+         * Set the miter limit.
+         *
+         * @param miterLimit Miter limit.
+         * @api
+         */
+        setMiterLimit(miterLimit: (number)): void;
 
-            /**
-             * Set the width.
-             *
-             * @param width Width.
-             * @api
-             */
-            setWidth(width: (number)): void;
-        }
+        /**
+         * Set the width.
+         *
+         * @param width Width.
+         * @api
+         */
+        setWidth(width: (number)): void;
+    }
 
+    /**
+     * @classdesc
+     * Container for vector feature rendering styles. Any changes made to the style
+     * or its children through `set*()` methods will not take effect until the
+     * feature or layer that uses the style is re-rendered.
+     *
+     * @struct
+     * @param opt_options Style options.
+     * @api
+     */
+    class Style {
         /**
          * @classdesc
          * Container for vector feature rendering styles. Any changes made to the style
@@ -10213,124 +10225,121 @@ declare namespace ol {
          * @param opt_options Style options.
          * @api
          */
-        class Style {
-            /**
-             * @classdesc
-             * Container for vector feature rendering styles. Any changes made to the style
-             * or its children through `set*()` methods will not take effect until the
-             * feature or layer that uses the style is re-rendered.
-             *
-             * @struct
-             * @param opt_options Style options.
-             * @api
-             */
-            constructor(opt_options?: olx.style.StyleOptions);
+        constructor(opt_options?: olx.style.StyleOptions);
 
-            /**
-             * Clones the style.
-             * @return The cloned style.
-             * @api
-             */
-            clone(): ol.style.Style;
+        /**
+         * Clones the style.
+         * @return The cloned style.
+         * @api
+         */
+        clone(): ol.style.Style;
 
-            /**
-             * Get the geometry to be rendered.
-             * @return Feature property or geometry or function that returns the geometry that will
-             *     be rendered with this style.
-             * @api
-             */
-            getGeometry(): (string | ol.geom.Geometry | ol.StyleGeometryFunction);
+        /**
+         * Get the geometry to be rendered.
+         * @return Feature property or geometry or function that returns the geometry that will
+         *     be rendered with this style.
+         * @api
+         */
+        getGeometry(): (string | ol.geom.Geometry | ol.StyleGeometryFunction);
 
-            /**
-             * Get the function used to generate a geometry for rendering.
-             * @return Function that is called with a feature
-             * and returns the geometry to render instead of the feature's geometry.
-             * @api
-             */
-            getGeometryFunction(): ol.StyleGeometryFunction;
+        /**
+         * Get the function used to generate a geometry for rendering.
+         * @return Function that is called with a feature
+         * and returns the geometry to render instead of the feature's geometry.
+         * @api
+         */
+        getGeometryFunction(): ol.StyleGeometryFunction;
 
-            /**
-             * Get the fill style.
-             * @return Fill style.
-             * @api
-             */
-            getFill(): ol.style.Fill;
+        /**
+         * Get the fill style.
+         * @return Fill style.
+         * @api
+         */
+        getFill(): ol.style.Fill;
 
-            /**
-             * Get the image style.
-             * @return Image style.
-             * @api
-             */
-            getImage(): ol.style.Image;
+        /**
+         * Get the image style.
+         * @return Image style.
+         * @api
+         */
+        getImage(): ol.style.Image;
 
-            /**
-             * Get the stroke style.
-             * @return Stroke style.
-             * @api
-             */
-            getStroke(): ol.style.Stroke;
+        /**
+         * Get the stroke style.
+         * @return Stroke style.
+         * @api
+         */
+        getStroke(): ol.style.Stroke;
 
-            /**
-             * Get the text style.
-             * @return Text style.
-             * @api
-             */
-            getText(): ol.style.Text;
+        /**
+         * Get the text style.
+         * @return Text style.
+         * @api
+         */
+        getText(): ol.style.Text;
 
-            /**
-             * Get the z-index for the style.
-             * @return ZIndex.
-             * @api
-             */
-            getZIndex(): (number);
+        /**
+         * Get the z-index for the style.
+         * @return ZIndex.
+         * @api
+         */
+        getZIndex(): (number);
 
-            /**
-             * Set the fill style.
-             * @param fill Fill style.
-             * @api
-             */
-            setFill(fill: ol.style.Fill): void;
+        /**
+         * Set the fill style.
+         * @param fill Fill style.
+         * @api
+         */
+        setFill(fill: ol.style.Fill): void;
 
-            /**
-             * Set a geometry that is rendered instead of the feature's geometry.
-             *
-             * @param geometry
-             *     Feature property or geometry or function returning a geometry to render
-             *     for this style.
-             * @api
-             */
-            setGeometry(geometry: (string | ol.geom.Geometry | ol.StyleGeometryFunction)): void;
+        /**
+         * Set a geometry that is rendered instead of the feature's geometry.
+         *
+         * @param geometry
+         *     Feature property or geometry or function returning a geometry to render
+         *     for this style.
+         * @api
+         */
+        setGeometry(geometry: (string | ol.geom.Geometry | ol.StyleGeometryFunction)): void;
 
-            /**
-             * Set the image style.
-             * @param image Image style.
-             * @api
-             */
-            setImage(image: ol.style.Image): void;
+        /**
+         * Set the image style.
+         * @param image Image style.
+         * @api
+         */
+        setImage(image: ol.style.Image): void;
 
-            /**
-             * Set the stroke style.
-             * @param stroke Stroke style.
-             * @api
-             */
-            setStroke(stroke: ol.style.Stroke): void;
+        /**
+         * Set the stroke style.
+         * @param stroke Stroke style.
+         * @api
+         */
+        setStroke(stroke: ol.style.Stroke): void;
 
-            /**
-             * Set the text style.
-             * @param text Text style.
-             * @api
-             */
-            setText(text: ol.style.Text): void;
+        /**
+         * Set the text style.
+         * @param text Text style.
+         * @api
+         */
+        setText(text: ol.style.Text): void;
 
-            /**
-             * Set the z-index.
-             *
-             * @param zIndex ZIndex.
-             * @api
-             */
-            setZIndex(zIndex: (number)): void;
-        }
+        /**
+         * Set the z-index.
+         *
+         * @param zIndex ZIndex.
+         * @api
+         */
+        setZIndex(zIndex: (number)): void;
+    }
 
+    /**
+     * @classdesc
+     * Set text style for vector features.
+     *
+     * @param opt_options Options.
+     * @api
+     */
+    class Text {
         /**
          * @classdesc
          * Set text style for vector features.
@@ -10338,175 +10347,175 @@ declare namespace ol {
          * @param opt_options Options.
          * @api
          */
-        class Text {
-            /**
-             * @classdesc
-             * Set text style for vector features.
-             *
-             * @param opt_options Options.
-             * @api
-             */
-            constructor(opt_options?: olx.style.TextOptions);
+        constructor(opt_options?: olx.style.TextOptions);
 
-            /**
-             * Get the font name.
-             * @return Font.
-             * @api
-             */
-            getFont(): (string);
+        /**
+         * Get the font name.
+         * @return Font.
+         * @api
+         */
+        getFont(): (string);
 
-            /**
-             * Get the x-offset for the text.
-             * @return Horizontal text offset.
-             * @api
-             */
-            getOffsetX(): number;
+        /**
+         * Get the x-offset for the text.
+         * @return Horizontal text offset.
+         * @api
+         */
+        getOffsetX(): number;
 
-            /**
-             * Get the y-offset for the text.
-             * @return Vertical text offset.
-             * @api
-             */
-            getOffsetY(): number;
+        /**
+         * Get the y-offset for the text.
+         * @return Vertical text offset.
+         * @api
+         */
+        getOffsetY(): number;
 
-            /**
-             * Get the fill style for the text.
-             * @return Fill style.
-             * @api
-             */
-            getFill(): ol.style.Fill;
+        /**
+         * Get the fill style for the text.
+         * @return Fill style.
+         * @api
+         */
+        getFill(): ol.style.Fill;
 
-            /**
-             * Determine whether the text rotates with the map.
-             * @return Rotate with map.
-             * @api
-             */
-            getRotateWithView(): (boolean);
+        /**
+         * Determine whether the text rotates with the map.
+         * @return Rotate with map.
+         * @api
+         */
+        getRotateWithView(): (boolean);
 
-            /**
-             * Get the text rotation.
-             * @return Rotation.
-             * @api
-             */
-            getRotation(): (number);
+        /**
+         * Get the text rotation.
+         * @return Rotation.
+         * @api
+         */
+        getRotation(): (number);
 
-            /**
-             * Get the text scale.
-             * @return Scale.
-             * @api
-             */
-            getScale(): (number);
+        /**
+         * Get the text scale.
+         * @return Scale.
+         * @api
+         */
+        getScale(): (number);
 
-            /**
-             * Get the stroke style for the text.
-             * @return Stroke style.
-             * @api
-             */
-            getStroke(): ol.style.Stroke;
+        /**
+         * Get the stroke style for the text.
+         * @return Stroke style.
+         * @api
+         */
+        getStroke(): ol.style.Stroke;
 
-            /**
-             * Get the text to be rendered.
-             * @return Text.
-             * @api
-             */
-            getText(): (string);
+        /**
+         * Get the text to be rendered.
+         * @return Text.
+         * @api
+         */
+        getText(): (string);
 
-            /**
-             * Get the text alignment.
-             * @return Text align.
-             * @api
-             */
-            getTextAlign(): (string);
+        /**
+         * Get the text alignment.
+         * @return Text align.
+         * @api
+         */
+        getTextAlign(): (string);
 
-            /**
-             * Get the text baseline.
-             * @return Text baseline.
-             * @api
-             */
-            getTextBaseline(): (string);
+        /**
+         * Get the text baseline.
+         * @return Text baseline.
+         * @api
+         */
+        getTextBaseline(): (string);
 
-            /**
-             * Set the font.
-             *
-             * @param font Font.
-             * @api
-             */
-            setFont(font: (string)): void;
+        /**
+         * Set the font.
+         *
+         * @param font Font.
+         * @api
+         */
+        setFont(font: (string)): void;
 
-            /**
-             * Set the x offset.
-             *
-             * @param offsetX Horizontal text offset.
-             * @api
-             */
-            setOffsetX(offsetX: number): void;
+        /**
+         * Set the x offset.
+         *
+         * @param offsetX Horizontal text offset.
+         * @api
+         */
+        setOffsetX(offsetX: number): void;
 
-            /**
-             * Set the y offset.
-             *
-             * @param offsetY Vertical text offset.
-             * @api
-             */
-            setOffsetY(offsetY: number): void;
+        /**
+         * Set the y offset.
+         *
+         * @param offsetY Vertical text offset.
+         * @api
+         */
+        setOffsetY(offsetY: number): void;
 
-            /**
-             * Set the fill.
-             *
-             * @param fill Fill style.
-             * @api
-             */
-            setFill(fill: ol.style.Fill): void;
+        /**
+         * Set the fill.
+         *
+         * @param fill Fill style.
+         * @api
+         */
+        setFill(fill: ol.style.Fill): void;
 
-            /**
-             * Set the rotation.
-             *
-             * @param rotation Rotation.
-             * @api
-             */
-            setRotation(rotation: (number)): void;
+        /**
+         * Set the rotation.
+         *
+         * @param rotation Rotation.
+         * @api
+         */
+        setRotation(rotation: (number)): void;
 
-            /**
-             * Set the scale.
-             *
-             * @param scale Scale.
-             * @api
-             */
-            setScale(scale: (number)): void;
+        /**
+         * Set the scale.
+         *
+         * @param scale Scale.
+         * @api
+         */
+        setScale(scale: (number)): void;
 
-            /**
-             * Set the stroke.
-             *
-             * @param stroke Stroke style.
-             * @api
-             */
-            setStroke(stroke: ol.style.Stroke): void;
+        /**
+         * Set the stroke.
+         *
+         * @param stroke Stroke style.
+         * @api
+         */
+        setStroke(stroke: ol.style.Stroke): void;
 
-            /**
-             * Set the text.
-             *
-             * @param text Text.
-             * @api
-             */
-            setText(text: (string)): void;
+        /**
+         * Set the text.
+         *
+         * @param text Text.
+         * @api
+         */
+        setText(text: (string)): void;
 
-            /**
-             * Set the text alignment.
-             *
-             * @param textAlign Text align.
-             * @api
-             */
-            setTextAlign(textAlign: (string)): void;
+        /**
+         * Set the text alignment.
+         *
+         * @param textAlign Text align.
+         * @api
+         */
+        setTextAlign(textAlign: (string)): void;
 
-            /**
-             * Set the text baseline.
-             *
-             * @param textBaseline Text baseline.
-             * @api
-             */
-            setTextBaseline(textBaseline: (string)): void;
-        }
+        /**
+         * Set the text baseline.
+         *
+         * @param textBaseline Text baseline.
+         * @api
+         */
+        setTextBaseline(textBaseline: (string)): void;
     }
+}
 
+/**
+ * @classdesc
+ * Base class for tiles.
+ *
+ * @param tileCoord Tile coordinate.
+ * @param state State.
+ */
+export class Tile extends events.EventTarget {
     /**
      * @classdesc
      * Base class for tiles.
@@ -10514,45 +10523,47 @@ declare namespace ol {
      * @param tileCoord Tile coordinate.
      * @param state State.
      */
-    class Tile extends ol.events.EventTarget {
-        /**
-         * @classdesc
-         * Base class for tiles.
-         *
-         * @param tileCoord Tile coordinate.
-         * @param state State.
-         */
-        constructor(tileCoord: ol.TileCoord, state: ol.Tile.State);
+    constructor(tileCoord: ol.TileCoord, state: ol.Tile.State);
 
-        /**
-         * Get the tile coordinate for this tile.
-         * @return The tile coordinate.
-         * @api
-         */
-        getTileCoord(): ol.TileCoord;
+    /**
+     * Get the tile coordinate for this tile.
+     * @return The tile coordinate.
+     * @api
+     */
+    getTileCoord(): ol.TileCoord;
 
-        /**
-         * Load the image or retry if loading previously failed.
-         * Loading is taken care of by the tile queue, and calling this method is
-         * only needed for preloading or for reloading in case of an error.
-         * @api
-         */
-        load(): void;
-    }
+    /**
+     * Load the image or retry if loading previously failed.
+     * Loading is taken care of by the tile queue, and calling this method is
+     * only needed for preloading or for reloading in case of an error.
+     * @api
+     */
+    load(): void;
+}
 
-    namespace Tile {
-        type State = number;
-    }
+export namespace Tile {
+    type State = number;
+}
 
-    namespace tilegrid {
-        /**
-         * Creates a tile grid with a standard XYZ tiling scheme.
-         * @param opt_options Tile grid options.
-         * @return Tile grid instance.
-         * @api
-         */
-        function createXYZ(opt_options?: olx.tilegrid.XYZOptions): ol.tilegrid.TileGrid;
+export namespace tilegrid {
+    /**
+     * Creates a tile grid with a standard XYZ tiling scheme.
+     * @param opt_options Tile grid options.
+     * @return Tile grid instance.
+     * @api
+     */
+    function createXYZ(opt_options?: olx.tilegrid.XYZOptions): ol.tilegrid.TileGrid;
 
+    /**
+     * @classdesc
+     * Base class for setting the grid pattern for sources accessing tiled-image
+     * servers.
+     *
+     * @param options Tile grid options.
+     * @struct
+     * @api stable
+     */
+    class TileGrid {
         /**
          * @classdesc
          * Base class for setting the grid pattern for sources accessing tiled-image
@@ -10562,119 +10573,118 @@ declare namespace ol {
          * @struct
          * @api stable
          */
-        class TileGrid {
-            /**
-             * @classdesc
-             * Base class for setting the grid pattern for sources accessing tiled-image
-             * servers.
-             *
-             * @param options Tile grid options.
-             * @struct
-             * @api stable
-             */
-            constructor(options: olx.tilegrid.TileGridOptions);
+        constructor(options: olx.tilegrid.TileGridOptions);
 
-            /**
-             * Call a function with each tile coordinate for a given extent and zoom level.
-             *
-             * @param extent Extent.
-             * @param zoom Zoom level.
-             * @param callback Function called with each tile coordinate.
-             * @api
-             */
-            forEachTileCoord(extent: ol.Extent, zoom: number, callback: ((coords: ol.TileCoord) => any)): void;
+        /**
+         * Call a function with each tile coordinate for a given extent and zoom level.
+         *
+         * @param extent Extent.
+         * @param zoom Zoom level.
+         * @param callback Function called with each tile coordinate.
+         * @api
+         */
+        forEachTileCoord(extent: ol.Extent, zoom: number, callback: ((coords: ol.TileCoord) => any)): void;
 
-            /**
-             * Get the maximum zoom level for the grid.
-             * @return Max zoom.
-             * @api
-             */
-            getMaxZoom(): number;
+        /**
+         * Get the maximum zoom level for the grid.
+         * @return Max zoom.
+         * @api
+         */
+        getMaxZoom(): number;
 
-            /**
-             * Get the minimum zoom level for the grid.
-             * @return Min zoom.
-             * @api
-             */
-            getMinZoom(): number;
+        /**
+         * Get the minimum zoom level for the grid.
+         * @return Min zoom.
+         * @api
+         */
+        getMinZoom(): number;
 
-            /**
-             * Get the origin for the grid at the given zoom level.
-             * @param z Z.
-             * @return Origin.
-             * @api stable
-             */
-            getOrigin(z: number): ol.Coordinate;
+        /**
+         * Get the origin for the grid at the given zoom level.
+         * @param z Z.
+         * @return Origin.
+         * @api stable
+         */
+        getOrigin(z: number): ol.Coordinate;
 
-            /**
-             * Get the resolution for the given zoom level.
-             * @param z Z.
-             * @return Resolution.
-             * @api stable
-             */
-            getResolution(z: number): number;
+        /**
+         * Get the resolution for the given zoom level.
+         * @param z Z.
+         * @return Resolution.
+         * @api stable
+         */
+        getResolution(z: number): number;
 
-            /**
-             * Get the list of resolutions for the tile grid.
-             * @return Resolutions.
-             * @api stable
-             */
-            getResolutions(): number[];
+        /**
+         * Get the list of resolutions for the tile grid.
+         * @return Resolutions.
+         * @api stable
+         */
+        getResolutions(): number[];
 
-            /**
-             * Get the extent of a tile coordinate.
-             *
-             * @param tileCoord Tile coordinate.
-             * @param opt_extent Temporary extent object.
-             * @return Extent.
-             * @api
-             */
-            getTileCoordExtent(tileCoord: ol.TileCoord, opt_extent?: ol.Extent): ol.Extent;
+        /**
+         * Get the extent of a tile coordinate.
+         *
+         * @param tileCoord Tile coordinate.
+         * @param opt_extent Temporary extent object.
+         * @return Extent.
+         * @api
+         */
+        getTileCoordExtent(tileCoord: ol.TileCoord, opt_extent?: ol.Extent): ol.Extent;
 
-            /**
-             * Get the tile coordinate for the given map coordinate and resolution.  This
-             * method considers that coordinates that intersect tile boundaries should be
-             * assigned the higher tile coordinate.
-             *
-             * @param coordinate Coordinate.
-             * @param resolution Resolution.
-             * @param opt_tileCoord Destination ol.TileCoord object.
-             * @return Tile coordinate.
-             * @api
-             */
-            getTileCoordForCoordAndResolution(coordinate: ol.Coordinate, resolution: number, opt_tileCoord?: ol.TileCoord): ol.TileCoord;
+        /**
+         * Get the tile coordinate for the given map coordinate and resolution.  This
+         * method considers that coordinates that intersect tile boundaries should be
+         * assigned the higher tile coordinate.
+         *
+         * @param coordinate Coordinate.
+         * @param resolution Resolution.
+         * @param opt_tileCoord Destination ol.TileCoord object.
+         * @return Tile coordinate.
+         * @api
+         */
+        getTileCoordForCoordAndResolution(coordinate: ol.Coordinate, resolution: number, opt_tileCoord?: ol.TileCoord): ol.TileCoord;
 
-            /**
-             * Get a tile coordinate given a map coordinate and zoom level.
-             * @param coordinate Coordinate.
-             * @param z Zoom level.
-             * @param opt_tileCoord Destination ol.TileCoord object.
-             * @return Tile coordinate.
-             * @api
-             */
-            getTileCoordForCoordAndZ(coordinate: ol.Coordinate, z: number, opt_tileCoord?: ol.TileCoord): ol.TileCoord;
+        /**
+         * Get a tile coordinate given a map coordinate and zoom level.
+         * @param coordinate Coordinate.
+         * @param z Zoom level.
+         * @param opt_tileCoord Destination ol.TileCoord object.
+         * @return Tile coordinate.
+         * @api
+         */
+        getTileCoordForCoordAndZ(coordinate: ol.Coordinate, z: number, opt_tileCoord?: ol.TileCoord): ol.TileCoord;
 
-            /**
-             * Get the tile size for a zoom level. The type of the return value matches the
-             * `tileSize` or `tileSizes` that the tile grid was configured with. To always
-             * get an `ol.Size`, run the result through `ol.size.toSize()`.
-             * @param z Z.
-             * @return Tile size.
-             * @api stable
-             */
-            getTileSize(z: number): (number | ol.Size);
+        /**
+         * Get the tile size for a zoom level. The type of the return value matches the
+         * `tileSize` or `tileSizes` that the tile grid was configured with. To always
+         * get an `ol.Size`, run the result through `ol.size.toSize()`.
+         * @param z Z.
+         * @return Tile size.
+         * @api stable
+         */
+        getTileSize(z: number): (number | ol.Size);
 
-            /**
-             * @param resolution Resolution.
-             * @param opt_direction If 0, the nearest resolution will be used.
-             *     If 1, the nearest lower resolution will be used. If -1, the nearest
-             *     higher resolution will be used. Default is 0.
-             * @return Z.
-             * @api
-             */
-            getZForResolution(resolution: number, opt_direction?: number): number;
-        }
+        /**
+         * @param resolution Resolution.
+         * @param opt_direction If 0, the nearest resolution will be used.
+         *     If 1, the nearest lower resolution will be used. If -1, the nearest
+         *     higher resolution will be used. Default is 0.
+         * @return Z.
+         * @api
+         */
+        getZForResolution(resolution: number, opt_direction?: number): number;
+    }
 
+    /**
+     * @classdesc
+     * Set the grid pattern for sources accessing WMTS tiled-image servers.
+     *
+     * @param options WMTS options.
+     * @struct
+     * @api
+     */
+    class WMTS extends tilegrid.TileGrid {
         /**
          * @classdesc
          * Set the grid pattern for sources accessing WMTS tiled-image servers.
@@ -10683,335 +10693,334 @@ declare namespace ol {
          * @struct
          * @api
          */
-        class WMTS extends ol.tilegrid.TileGrid {
-            /**
-             * @classdesc
-             * Set the grid pattern for sources accessing WMTS tiled-image servers.
-             *
-             * @param options WMTS options.
-             * @struct
-             * @api
-             */
-            constructor(options: olx.tilegrid.WMTSOptions);
+        constructor(options: olx.tilegrid.WMTSOptions);
 
-            /**
-             * Get the list of matrix identifiers.
-             * @return MatrixIds.
-             * @api
-             */
-            getMatrixIds(): string[];
+        /**
+         * Get the list of matrix identifiers.
+         * @return MatrixIds.
+         * @api
+         */
+        getMatrixIds(): string[];
 
-            /**
-             * Create a tile grid from a WMTS capabilities matrix set.
-             * @param matrixSet An object representing a matrixSet in the
-             *     capabilities document.
-             * @param opt_extent An optional extent to restrict the tile
-             *     ranges the server provides.
-             * @return WMTS tileGrid instance.
-             * @api
-             */
-            static createFromCapabilitiesMatrixSet(matrixSet: GlobalObject, opt_extent?: ol.Extent): ol.tilegrid.WMTS;
-        }
+        /**
+         * Create a tile grid from a WMTS capabilities matrix set.
+         * @param matrixSet An object representing a matrixSet in the
+         *     capabilities document.
+         * @param opt_extent An optional extent to restrict the tile
+         *     ranges the server provides.
+         * @return WMTS tileGrid instance.
+         * @api
+         */
+        static createFromCapabilitiesMatrixSet(matrixSet: GlobalObject, opt_extent?: ol.Extent): ol.tilegrid.WMTS;
     }
+}
 
-    type AttributionLike = (string | string[] | ol.Attribution | ol.Attribution[]);
+export type AttributionLike = (string | string[] | ol.Attribution | ol.Attribution[]);
 
-    /**
-     * A function returning the canvas element (`{HTMLCanvasElement}`)
-     * used by the source as an image. The arguments passed to the function are:
-     * {@link ol.Extent} the image extent, `{number}` the image resolution,
-     * `{number}` the device pixel ratio, {@link ol.Size} the image size, and
-     * {@link ol.proj.Projection} the image projection. The canvas returned by
-     * this function is cached by the source. The this keyword inside the function
-     * references the {@link ol.source.ImageCanvas}.
-     *
-     */
-    type CanvasFunctionType = (extent: ol.Extent, resolution: number, pixelRatio: number, size: ol.Size, proj: ol.proj.Projection) => HTMLCanvasElement;
+/**
+ * A function returning the canvas element (`{HTMLCanvasElement}`)
+ * used by the source as an image. The arguments passed to the function are:
+ * {@link ol.Extent} the image extent, `{number}` the image resolution,
+ * `{number}` the device pixel ratio, {@link ol.Size} the image size, and
+ * {@link ol.proj.Projection} the image projection. The canvas returned by
+ * this function is cached by the source. The this keyword inside the function
+ * references the {@link ol.source.ImageCanvas}.
+ *
+ */
+export type CanvasFunctionType = (extent: ol.Extent, resolution: number, pixelRatio: number, size: ol.Size, proj: ol.proj.Projection) => HTMLCanvasElement;
 
-    /**
-     * A color represented as a short array [red, green, blue, alpha].
-     * red, green, and blue should be integers in the range 0..255 inclusive.
-     * alpha should be a float in the range 0..1 inclusive. If no alpha value is
-     * given then `1` will be used.
-     */
-    type Color = ([number, number, number, number] | Uint8Array | Uint8ClampedArray);
+/**
+ * A color represented as a short array [red, green, blue, alpha].
+ * red, green, and blue should be integers in the range 0..255 inclusive.
+ * alpha should be a float in the range 0..1 inclusive. If no alpha value is
+ * given then `1` will be used.
+ */
+export type Color = ([number, number, number, number] | Uint8Array | Uint8ClampedArray);
 
-    /**
-     * A type accepted by CanvasRenderingContext2D.fillStyle.
-     * Represents a color, pattern, or gradient.
-     *
-     */
-    type ColorLike = (string | CanvasPattern | CanvasGradient);
+/**
+ * A type accepted by CanvasRenderingContext2D.fillStyle.
+ * Represents a color, pattern, or gradient.
+ *
+ */
+export type ColorLike = (string | CanvasPattern | CanvasGradient);
 
-    /**
-     * An array of numbers representing an xy coordinate. Example: `[16, 48]`.
-     */
-    type Coordinate = [number, number];
+/**
+ * An array of numbers representing an xy coordinate. Example: `[16, 48]`.
+ */
+export type Coordinate = [number, number];
 
-    /**
-     * A function that takes a {@link ol.Coordinate} and transforms it into a
-     * `{string}`.
-     *
-     */
-    type CoordinateFormatType = (coords?: ol.Coordinate) => string;
+/**
+ * A function that takes a {@link ol.Coordinate} and transforms it into a
+ * `{string}`.
+ *
+ */
+export type CoordinateFormatType = (coords?: ol.Coordinate) => string;
 
-    /**
-     * A function that takes a {@link ol.MapBrowserEvent} and two
-     * {@link ol.Pixel}s and returns a `{boolean}`. If the condition is met,
-     * true should be returned.
-     */
-    type DragBoxEndConditionType = (event: ol.MapBrowserEvent, pixel1: ol.Pixel, pixel2: ol.Pixel) => boolean;
+/**
+ * A function that takes a {@link ol.MapBrowserEvent} and two
+ * {@link ol.Pixel}s and returns a `{boolean}`. If the condition is met,
+ * true should be returned.
+ */
+export type DragBoxEndConditionType = (event: ol.MapBrowserEvent, pixel1: ol.Pixel, pixel2: ol.Pixel) => boolean;
 
-    /**
-     * Function that takes coordinates and an optional existing geometry as
-     * arguments, and returns a geometry. The optional existing geometry is the
-     * geometry that is returned when the function is called without a second
-     * argument.
-     */
-    type DrawGeometryFunctionType = (coords: (ol.Coordinate | ol.Coordinate[] | ol.Coordinate[][]), geo?: ol.geom.SimpleGeometry) => ol.geom.SimpleGeometry;
+/**
+ * Function that takes coordinates and an optional existing geometry as
+ * arguments, and returns a geometry. The optional existing geometry is the
+ * geometry that is returned when the function is called without a second
+ * argument.
+ */
+export type DrawGeometryFunctionType = (coords: (ol.Coordinate | ol.Coordinate[] | ol.Coordinate[][]), geo?: ol.geom.SimpleGeometry) => ol.geom.SimpleGeometry;
 
-    /**
-     * A function that takes an {@link ol.MapBrowserEvent} and returns a
-     * `{boolean}`. If the condition is met, true should be returned.
-     *
-     */
-    type EventsConditionType = (event: ol.MapBrowserEvent) => boolean;
+/**
+ * A function that takes an {@link ol.MapBrowserEvent} and returns a
+ * `{boolean}`. If the condition is met, true should be returned.
+ *
+ */
+export type EventsConditionType = (event: ol.MapBrowserEvent) => boolean;
 
-    /**
-     * Key to use with {@link ol.Observable#unByKey}.
-     *
-     */
-    type EventsKey = GlobalObject;
+/**
+ * Key to use with {@link ol.Observable#unByKey}.
+ *
+ */
+export type EventsKey = GlobalObject;
 
-    /**
-     * An array of numbers representing an extent: `[minx, miny, maxx, maxy]`.
-     */
-    type Extent = [number, number, number, number];
+/**
+ * An array of numbers representing an extent: `[minx, miny, maxx, maxy]`.
+ */
+export type Extent = [number, number, number, number];
 
-    /**
-     * {@link ol.source.Vector} sources use a function of this type to load
-     * features.
-     *
-     * This function takes an {@link ol.Extent} representing the area to be loaded,
-     * a `{number}` representing the resolution (map units per pixel) and an
-     * {@link ol.proj.Projection} for the projection  as arguments. `this` within
-     * the function is bound to the {@link ol.source.Vector} it's called from.
-     *
-     * The function is responsible for loading the features and adding them to the
-     * source.
-     */
-    type FeatureLoader = (extent: ol.Extent, resolution: number, proj: ol.proj.Projection) => void;
+/**
+ * {@link ol.source.Vector} sources use a function of this type to load
+ * features.
+ *
+ * This function takes an {@link ol.Extent} representing the area to be loaded,
+ * a `{number}` representing the resolution (map units per pixel) and an
+ * {@link ol.proj.Projection} for the projection  as arguments. `this` within
+ * the function is bound to the {@link ol.source.Vector} it's called from.
+ *
+ * The function is responsible for loading the features and adding them to the
+ * source.
+ */
+export type FeatureLoader = (extent: ol.Extent, resolution: number, proj: ol.proj.Projection) => void;
 
-    /**
-     * A function that returns an array of {@link ol.style.Style styles} given a
-     * resolution. The `this` keyword inside the function references the
-     * {@link ol.Feature} to be styled.
-     *
-     */
-    type FeatureStyleFunction = (resolution: number) => (ol.style.Style | ol.style.Style[]);
+/**
+ * A function that returns an array of {@link ol.style.Style styles} given a
+ * resolution. The `this` keyword inside the function references the
+ * {@link ol.Feature} to be styled.
+ *
+ */
+export type FeatureStyleFunction = (resolution: number) => (ol.style.Style | ol.style.Style[]);
 
-    /**
-     * {@link ol.source.Vector} sources use a function of this type to get the url
-     * to load features from.
-     *
-     * This function takes an {@link ol.Extent} representing the area to be loaded,
-     * a `{number}` representing the resolution (map units per pixel) and an
-     * {@link ol.proj.Projection} for the projection  as arguments and returns a
-     * `{string}` representing the URL.
-     */
-    type FeatureUrlFunction = (extent: ol.Extent, resolution: number, proj: ol.proj.Projection) => string;
+/**
+ * {@link ol.source.Vector} sources use a function of this type to get the url
+ * to load features from.
+ *
+ * This function takes an {@link ol.Extent} representing the area to be loaded,
+ * a `{number}` representing the resolution (map units per pixel) and an
+ * {@link ol.proj.Projection} for the projection  as arguments and returns a
+ * `{string}` representing the URL.
+ */
+export type FeatureUrlFunction = (extent: ol.Extent, resolution: number, proj: ol.proj.Projection) => string;
 
-    /**
-     * A function that takes an {@link ol.Image} for the image and a `{string}` for
-     * the src as arguments. It is supposed to make it so the underlying image
-     * {@link ol.Image#getImage} is assigned the content specified by the src. If
-     * not specified, the default is
-     *
-     *     function(image, src) {
-     *       image.getImage().src = src;
-     *     }
-     *
-     * Providing a custom `imageLoadFunction` can be useful to load images with
-     * post requests or - in general - through XHR requests, where the src of the
-     * image element would be set to a data URI when the content is loaded.
-     *
-     */
-    type ImageLoadFunctionType = (image: ol.Image, url: string) => void;
+/**
+ * A function that takes an {@link ol.Image} for the image and a `{string}` for
+ * the src as arguments. It is supposed to make it so the underlying image
+ * {@link ol.Image#getImage} is assigned the content specified by the src. If
+ * not specified, the default is
+ *
+ *     function(image, src) {
+ *       image.getImage().src = src;
+ *     }
+ *
+ * Providing a custom `imageLoadFunction` can be useful to load images with
+ * post requests or - in general - through XHR requests, where the src of the
+ * image element would be set to a data URI when the content is loaded.
+ *
+ */
+export type ImageLoadFunctionType = (image: ol.Image, url: string) => void;
 
-    /**
-     * A function that takes an {@link ol.Extent} and a resolution as arguments, and
-     * returns an array of {@link ol.Extent} with the extents to load. Usually this
-     * is one of the standard {@link ol.loadingstrategy} strategies.
-     *
-     */
-    type LoadingStrategy = (extent: ol.Extent, resolution: number) => ol.Extent[];
+/**
+ * A function that takes an {@link ol.Extent} and a resolution as arguments, and
+ * returns an array of {@link ol.Extent} with the extents to load. Usually this
+ * is one of the standard {@link ol.loadingstrategy} strategies.
+ *
+ */
+export type LoadingStrategy = (extent: ol.Extent, resolution: number) => ol.Extent[];
 
-    type ModifyEventType = string;
+export type ModifyEventType = string;
 
-    /**
-     * An array with two elements, representing a pixel. The first element is the
-     * x-coordinate, the second the y-coordinate of the pixel.
-     */
-    type Pixel = [number, number];
+/**
+ * An array with two elements, representing a pixel. The first element is the
+ * x-coordinate, the second the y-coordinate of the pixel.
+ */
+export type Pixel = [number, number];
 
-    /**
-     * Function to perform manipulations before rendering. This function is called
-     * with the {@link ol.Map} as first and an optional {@link olx.FrameState} as
-     * second argument. Return `true` to keep this function for the next frame,
-     * `false` to remove it.
-     */
-    type PreRenderFunction = (map: ol.Map, state?: olx.FrameState) => boolean;
+/**
+ * Function to perform manipulations before rendering. This function is called
+ * with the {@link ol.Map} as first and an optional {@link olx.FrameState} as
+ * second argument. Return `true` to keep this function for the next frame,
+ * `false` to remove it.
+ */
+export type PreRenderFunction = (map: ol.Map, state?: olx.FrameState) => boolean;
 
-    /**
-     * A projection as {@link ol.proj.Projection}, SRS identifier string or
-     * undefined.
-     */
-    type ProjectionLike = (ol.proj.Projection | string | undefined);
+/**
+ * A projection as {@link ol.proj.Projection}, SRS identifier string or
+ * undefined.
+ */
+export type ProjectionLike = (ol.proj.Projection | string | undefined);
 
-    /**
-     * A function that takes an array of input data, performs some operation, and
-     * returns an array of ouput data.
-     * For `pixel` type operations, the function will be called with an array of
-     * pixels, where each pixel is an array of four numbers (`[r, g, b, a]`) in the
-     * range of 0 - 255. It should return a single pixel array.
-     * For `'image'` type operations, functions will be called with an array of
-     * {@link ImageData https://developer.mozilla.org/en-US/docs/Web/API/ImageData}
-     * and should return a single {@link ImageData
-     * https://developer.mozilla.org/en-US/docs/Web/API/ImageData}.  The operations
-     * are called with a second "data" argument, which can be used for storage.  The
-     * data object is accessible from raster events, where it can be initialized in
-     * "beforeoperations" and accessed again in "afteroperations".
-     *
-     */
-    type RasterOperation = (data: (number[][] | ImageData[]), obj: GlobalObject) => (number[] | ImageData);
+/**
+ * A function that takes an array of input data, performs some operation, and
+ * returns an array of ouput data.
+ * For `pixel` type operations, the function will be called with an array of
+ * pixels, where each pixel is an array of four numbers (`[r, g, b, a]`) in the
+ * range of 0 - 255. It should return a single pixel array.
+ * For `'image'` type operations, functions will be called with an array of
+ * {@link ImageData https://developer.mozilla.org/en-US/docs/Web/API/ImageData}
+ * and should return a single {@link ImageData
+ * https://developer.mozilla.org/en-US/docs/Web/API/ImageData}.  The operations
+ * are called with a second "data" argument, which can be used for storage.  The
+ * data object is accessible from raster events, where it can be initialized in
+ * "beforeoperations" and accessed again in "afteroperations".
+ *
+ */
+export type RasterOperation = (data: (number[][] | ImageData[]), obj: GlobalObject) => (number[] | ImageData);
 
-    /**
-     * A function that takes an {@link ol.Feature} or {@link ol.render.Feature} and
-     * an {@link ol.layer.Layer} and returns `true` if the feature may be selected
-     * or `false` otherwise.
-     */
-    type SelectFilterFunction = (feature: (ol.Feature | ol.render.Feature), layer: ol.layer.Layer) => boolean;
+/**
+ * A function that takes an {@link ol.Feature} or {@link ol.render.Feature} and
+ * an {@link ol.layer.Layer} and returns `true` if the feature may be selected
+ * or `false` otherwise.
+ */
+export type SelectFilterFunction = (feature: (ol.Feature | ol.render.Feature), layer: ol.layer.Layer) => boolean;
 
-    /**
-     * An array of numbers representing a size: `[width, height]`.
-     */
-    type Size = [number, number];
+/**
+ * An array of numbers representing a size: `[width, height]`.
+ */
+export type Size = [number, number];
 
-    interface SourceImageOptions {
-        attributions?: ol.AttributionLike;
-        extent?: (ol.Extent);
-        logo?: (string | olx.LogoOptions);
-        projection: ol.ProjectionLike;
-        resolutions?: number[];
-        state?: ol.source.State;
-    }
+export interface SourceImageOptions {
+    attributions?: ol.AttributionLike;
+    extent?: (ol.Extent);
+    logo?: (string | olx.LogoOptions);
+    projection: ol.ProjectionLike;
+    resolutions?: number[];
+    state?: ol.source.State;
+}
 
-    interface SourceSourceOptions {
-        attributions?: ol.AttributionLike;
-        logo?: (string | olx.LogoOptions);
-        projection: ol.ProjectionLike;
-        state?: ol.source.State;
-        wrapX?: boolean;
-    }
+export interface SourceSourceOptions {
+    attributions?: ol.AttributionLike;
+    logo?: (string | olx.LogoOptions);
+    projection: ol.ProjectionLike;
+    state?: ol.source.State;
+    wrapX?: boolean;
+}
 
-    interface SourceUrlTileOptions {
-        attributions?: ol.AttributionLike;
-        cacheSize?: number;
-        extent?: ol.Extent;
-        logo?: (string | olx.LogoOptions);
-        opaque?: boolean;
-        projection: ol.ProjectionLike;
-        state?: ol.source.State;
-        tileGrid?: ol.tilegrid.TileGrid;
-        tileLoadFunction: ol.TileLoadFunctionType;
-        tilePixelRatio?: number;
-        tileUrlFunction?: ol.TileUrlFunctionType;
-        url?: string;
-        urls?: string[];
-        wrapX?: boolean;
-    }
+export interface SourceUrlTileOptions {
+    attributions?: ol.AttributionLike;
+    cacheSize?: number;
+    extent?: ol.Extent;
+    logo?: (string | olx.LogoOptions);
+    opaque?: boolean;
+    projection: ol.ProjectionLike;
+    state?: ol.source.State;
+    tileGrid?: ol.tilegrid.TileGrid;
+    tileLoadFunction: ol.TileLoadFunctionType;
+    tilePixelRatio?: number;
+    tileUrlFunction?: ol.TileUrlFunctionType;
+    url?: string;
+    urls?: string[];
+    wrapX?: boolean;
+}
 
-    interface SourceTileOptions {
-        attributions?: ol.AttributionLike;
-        cacheSize?: number;
-        extent?: ol.Extent;
-        logo?: (string | olx.LogoOptions);
-        opaque?: boolean;
-        tilePixelRatio?: number;
-        projection: ol.ProjectionLike;
-        state?: ol.source.State;
-        tileGrid?: ol.tilegrid.TileGrid;
-        wrapX?: boolean;
-    }
+export interface SourceTileOptions {
+    attributions?: ol.AttributionLike;
+    cacheSize?: number;
+    extent?: ol.Extent;
+    logo?: (string | olx.LogoOptions);
+    opaque?: boolean;
+    tilePixelRatio?: number;
+    projection: ol.ProjectionLike;
+    state?: ol.source.State;
+    tileGrid?: ol.tilegrid.TileGrid;
+    wrapX?: boolean;
+}
 
-    interface StyleImageOptions {
-        opacity: number;
-        rotateWithView: boolean;
-        rotation: number;
-        scale: number;
-        snapToPixel: boolean;
-    }
+export interface StyleImageOptions {
+    opacity: number;
+    rotateWithView: boolean;
+    rotation: number;
+    scale: number;
+    snapToPixel: boolean;
+}
 
-    /**
-     * A function that takes an {@link ol.Feature} and a `{number}` representing
-     * the view's resolution. The function should return a {@link ol.style.Style}
-     * or an array of them. This way e.g. a vector layer can be styled.
-     *
-     */
-    type StyleFunction = (feature: (ol.Feature | ol.render.Feature), resolution: number) => (ol.style.Style | ol.style.Style[]);
+/**
+ * A function that takes an {@link ol.Feature} and a `{number}` representing
+ * the view's resolution. The function should return a {@link ol.style.Style}
+ * or an array of them. This way e.g. a vector layer can be styled.
+ *
+ */
+export type StyleFunction = (feature: (ol.Feature | ol.render.Feature), resolution: number) => (ol.style.Style | ol.style.Style[]);
 
-    /**
-     * A function that takes an {@link ol.Feature} as argument and returns an
-     * {@link ol.geom.Geometry} that will be rendered and styled for the feature.
-     *
-     */
-    type StyleGeometryFunction = (feature: (ol.Feature | ol.render.Feature)) => (ol.geom.Geometry | ol.render.Feature);
+/**
+ * A function that takes an {@link ol.Feature} as argument and returns an
+ * {@link ol.geom.Geometry} that will be rendered and styled for the feature.
+ *
+ */
+export type StyleGeometryFunction = (feature: (ol.Feature | ol.render.Feature)) => (ol.geom.Geometry | ol.render.Feature);
 
-    /**
-     * An array of three numbers representing the location of a tile in a tile
-     * grid. The order is `z`, `x`, and `y`. `z` is the zoom level.
-     */
-    type TileCoord = [number, number, number];
+/**
+ * An array of three numbers representing the location of a tile in a tile
+ * grid. The order is `z`, `x`, and `y`. `z` is the zoom level.
+ */
+export type TileCoord = [number, number, number];
 
-    /**
-     * A function that takes an {@link ol.Tile} for the tile and a `{string}` for
-     * the url as arguments.
-     *
-     */
-    type TileLoadFunctionType = (tile: ol.Tile, url: string) => void;
+/**
+ * A function that takes an {@link ol.Tile} for the tile and a `{string}` for
+ * the url as arguments.
+ *
+ */
+export type TileLoadFunctionType = (tile: ol.Tile, url: string) => void;
 
-    /**
-     * {@link ol.source.Tile} sources use a function of this type to get the url
-     * that provides a tile for a given tile coordinate.
-     *
-     * This function takes an {@link ol.TileCoord} for the tile coordinate, a
-     * `{number}` representing the pixel ratio and an {@link ol.proj.Projection} for
-     * the projection  as arguments and returns a `{string}` representing the tile
-     * URL, or undefined if no tile should be requested for the passed tile
-     * coordinate.
-     *
-     */
-    type TileUrlFunctionType = (coords: ol.TileCoord, pixelRatio: number, proj: ol.proj.Projection) => string;
+/**
+ * {@link ol.source.Tile} sources use a function of this type to get the url
+ * that provides a tile for a given tile coordinate.
+ *
+ * This function takes an {@link ol.TileCoord} for the tile coordinate, a
+ * `{number}` representing the pixel ratio and an {@link ol.proj.Projection} for
+ * the projection  as arguments and returns a `{string}` representing the tile
+ * URL, or undefined if no tile should be requested for the passed tile
+ * coordinate.
+ *
+ */
+export type TileUrlFunctionType = (coords: ol.TileCoord, pixelRatio: number, proj: ol.proj.Projection) => string;
 
-    /**
-     * A transform function accepts an array of input coordinate values, an optional
-     * output array, and an optional dimension (default should be 2).  The function
-     * transforms the input coordinate values, populates the output array, and
-     * returns the output array.
-     *
-     */
-    type TransformFunction = (array: number[], out?: number[], dimension?: number) => number[];
+/**
+ * A transform function accepts an array of input coordinate values, an optional
+ * output array, and an optional dimension (default should be 2).  The function
+ * transforms the input coordinate values, populates the output array, and
+ * returns the output array.
+ *
+ */
+export type TransformFunction = (array: number[], out?: number[], dimension?: number) => number[];
 
-    /**
-     * Number of features; bounds/extent.
-     */
-    type WFSFeatureCollectionMetadata = GlobalObject;
+/**
+ * Number of features; bounds/extent.
+ */
+export type WFSFeatureCollectionMetadata = GlobalObject;
 
-    /**
-     * Total deleted; total inserted; total updated; array of insert ids.
-     */
-    type WFSTransactionResponse = GlobalObject;
+/**
+ * Total deleted; total inserted; total updated; array of insert ids.
+ */
+export type WFSTransactionResponse = GlobalObject;
 
+/**
+ * @param tileCoord Tile coordinate.
+ * @param state State.
+ * @param src Data source url.
+ * @param format Feature format.
+ * @param tileLoadFunction Tile load function.
+ */
+export class VectorTile extends Tile {
     /**
      * @param tileCoord Tile coordinate.
      * @param state State.
@@ -11019,44 +11028,92 @@ declare namespace ol {
      * @param format Feature format.
      * @param tileLoadFunction Tile load function.
      */
-    class VectorTile extends ol.Tile {
-        /**
-         * @param tileCoord Tile coordinate.
-         * @param state State.
-         * @param src Data source url.
-         * @param format Feature format.
-         * @param tileLoadFunction Tile load function.
-         */
-        constructor(tileCoord: ol.TileCoord, state: ol.Tile.State, src: string, format: ol.format.Feature, tileLoadFunction: ol.TileLoadFunctionType);
+    constructor(tileCoord: ol.TileCoord, state: ol.Tile.State, src: string, format: ol.format.Feature, tileLoadFunction: ol.TileLoadFunctionType);
 
-        /**
-         * Get the feature format assigned for reading this tile's features.
-         * @return Feature format.
-         * @api
-         */
-        getFormat(): ol.format.Feature;
+    /**
+     * Get the feature format assigned for reading this tile's features.
+     * @return Feature format.
+     * @api
+     */
+    getFormat(): ol.format.Feature;
 
-        /**
-         * @param features Features.
-         * @api
-         */
-        setFeatures(features: ol.Feature[]): void;
+    /**
+     * @param features Features.
+     * @api
+     */
+    setFeatures(features: ol.Feature[]): void;
 
-        /**
-         * Set the projection of the features that were added with {@link #setFeatures}.
-         * @param projection Feature projection.
-         * @api
-         */
-        setProjection(projection: ol.proj.Projection): void;
+    /**
+     * Set the projection of the features that were added with {@link #setFeatures}.
+     * @param projection Feature projection.
+     * @api
+     */
+    setProjection(projection: ol.proj.Projection): void;
 
-        /**
-         * Set the feature loader for reading this tile's features.
-         * @param loader Feature loader.
-         * @api
-         */
-        setLoader(loader: ol.FeatureLoader): void;
-    }
+    /**
+     * Set the feature loader for reading this tile's features.
+     * @param loader Feature loader.
+     * @api
+     */
+    setLoader(loader: ol.FeatureLoader): void;
+}
 
+/**
+ * @classdesc
+ * An ol.View object represents a simple 2D view of the map.
+ *
+ * This is the object to act upon to change the center, resolution,
+ * and rotation of the map.
+ *
+ * ### The view states
+ *
+ * An `ol.View` is determined by three states: `center`, `resolution`,
+ * and `rotation`. Each state has a corresponding getter and setter, e.g.
+ * `getCenter` and `setCenter` for the `center` state.
+ *
+ * An `ol.View` has a `projection`. The projection determines the
+ * coordinate system of the center, and its units determine the units of the
+ * resolution (projection units per pixel). The default projection is
+ * Spherical Mercator (EPSG:3857).
+ *
+ * ### The constraints
+ *
+ * `setCenter`, `setResolution` and `setRotation` can be used to change the
+ * states of the view. Any value can be passed to the setters. And the value
+ * that is passed to a setter will effectively be the value set in the view,
+ * and returned by the corresponding getter.
+ *
+ * But an `ol.View` object also has a *resolution constraint*, a
+ * *rotation constraint* and a *center constraint*.
+ *
+ * As said above, no constraints are applied when the setters are used to set
+ * new states for the view. Applying constraints is done explicitly through
+ * the use of the `constrain*` functions (`constrainResolution` and
+ * `constrainRotation` and `constrainCenter`).
+ *
+ * The main users of the constraints are the interactions and the
+ * controls. For example, double-clicking on the map changes the view to
+ * the "next" resolution. And releasing the fingers after pinch-zooming
+ * snaps to the closest resolution (with an animation).
+ *
+ * The *resolution constraint* snaps to specific resolutions. It is
+ * determined by the following options: `resolutions`, `maxResolution`,
+ * `maxZoom`, and `zoomFactor`. If `resolutions` is set, the other three
+ * options are ignored. See documentation for each option for more
+ * information.
+ *
+ * The *rotation constraint* snaps to specific angles. It is determined
+ * by the following options: `enableRotation` and `constrainRotation`.
+ * By default the rotation value is snapped to zero when approaching the
+ * horizontal.
+ *
+ * The *center constraint* is determined by the `extent` option. By
+ * default the center is not constrained at all.
+ *
+ * @param opt_options View options.
+ * @api stable
+ */
+export class View extends Object {
     /**
      * @classdesc
      * An ol.View object represents a simple 2D view of the map.
@@ -11112,310 +11169,253 @@ declare namespace ol {
      * @param opt_options View options.
      * @api stable
      */
-    class View extends ol.Object {
-        /**
-         * @classdesc
-         * An ol.View object represents a simple 2D view of the map.
-         *
-         * This is the object to act upon to change the center, resolution,
-         * and rotation of the map.
-         *
-         * ### The view states
-         *
-         * An `ol.View` is determined by three states: `center`, `resolution`,
-         * and `rotation`. Each state has a corresponding getter and setter, e.g.
-         * `getCenter` and `setCenter` for the `center` state.
-         *
-         * An `ol.View` has a `projection`. The projection determines the
-         * coordinate system of the center, and its units determine the units of the
-         * resolution (projection units per pixel). The default projection is
-         * Spherical Mercator (EPSG:3857).
-         *
-         * ### The constraints
-         *
-         * `setCenter`, `setResolution` and `setRotation` can be used to change the
-         * states of the view. Any value can be passed to the setters. And the value
-         * that is passed to a setter will effectively be the value set in the view,
-         * and returned by the corresponding getter.
-         *
-         * But an `ol.View` object also has a *resolution constraint*, a
-         * *rotation constraint* and a *center constraint*.
-         *
-         * As said above, no constraints are applied when the setters are used to set
-         * new states for the view. Applying constraints is done explicitly through
-         * the use of the `constrain*` functions (`constrainResolution` and
-         * `constrainRotation` and `constrainCenter`).
-         *
-         * The main users of the constraints are the interactions and the
-         * controls. For example, double-clicking on the map changes the view to
-         * the "next" resolution. And releasing the fingers after pinch-zooming
-         * snaps to the closest resolution (with an animation).
-         *
-         * The *resolution constraint* snaps to specific resolutions. It is
-         * determined by the following options: `resolutions`, `maxResolution`,
-         * `maxZoom`, and `zoomFactor`. If `resolutions` is set, the other three
-         * options are ignored. See documentation for each option for more
-         * information.
-         *
-         * The *rotation constraint* snaps to specific angles. It is determined
-         * by the following options: `enableRotation` and `constrainRotation`.
-         * By default the rotation value is snapped to zero when approaching the
-         * horizontal.
-         *
-         * The *center constraint* is determined by the `extent` option. By
-         * default the center is not constrained at all.
-         *
-         * @param opt_options View options.
-         * @api stable
-         */
-        constructor(opt_options?: olx.ViewOptions);
+    constructor(opt_options?: olx.ViewOptions);
 
-        /**
-         * Animate the view. The view's center, zoom (or resolution), and
-         * rotation can be animated for smooth transitions between view states.
-         * @param var_args Animation options.
-         * @param restArgs
-         * @api experimental
-         */
-        animate(...var_args: Array<olx.animation.AnimateOptions | olx.animation.AnimateCallback>): void;
+    /**
+     * Animate the view. The view's center, zoom (or resolution), and
+     * rotation can be animated for smooth transitions between view states.
+     * @param var_args Animation options.
+     * @param restArgs
+     * @api experimental
+     */
+    animate(...var_args: Array<olx.animation.AnimateOptions | olx.animation.AnimateCallback>): void;
 
-        /**
-         * Determine if the view is being animated.
-         * @return The view is being animated.
-         * @api
-         */
-        getAnimating(): boolean;
+    /**
+     * Determine if the view is being animated.
+     * @return The view is being animated.
+     * @api
+     */
+    getAnimating(): boolean;
 
-        /**
-         * Determine if the user is interacting with the view, such as panning or zooming.
-         * @return The view is being interacted with.
-         * @api
-         */
-        getInteracting(): boolean;
+    /**
+     * Determine if the user is interacting with the view, such as panning or zooming.
+     * @return The view is being interacted with.
+     * @api
+     */
+    getInteracting(): boolean;
 
-        /**
-         * Cancel any ongoing animations.
-         * @api
-         */
-        cancelAnimations(): void;
+    /**
+     * Cancel any ongoing animations.
+     * @api
+     */
+    cancelAnimations(): void;
 
-        /**
-         * Get the constrained center of this view.
-         * @param center Center.
-         * @return Constrained center.
-         * @api
-         */
-        constrainCenter(center?: ol.Coordinate): ol.Coordinate;
+    /**
+     * Get the constrained center of this view.
+     * @param center Center.
+     * @return Constrained center.
+     * @api
+     */
+    constrainCenter(center?: ol.Coordinate): ol.Coordinate;
 
-        /**
-         * Get the constrained resolution of this view.
-         * @param resolution Resolution.
-         * @param opt_delta Delta. Default is `0`.
-         * @param opt_direction Direction. Default is `0`.
-         * @return Constrained resolution.
-         * @api
-         */
-        constrainResolution(resolution?: number, opt_delta?: number, opt_direction?: number): number;
+    /**
+     * Get the constrained resolution of this view.
+     * @param resolution Resolution.
+     * @param opt_delta Delta. Default is `0`.
+     * @param opt_direction Direction. Default is `0`.
+     * @return Constrained resolution.
+     * @api
+     */
+    constrainResolution(resolution?: number, opt_delta?: number, opt_direction?: number): number;
 
-        /**
-         * Get the constrained rotation of this view.
-         * @param rotation Rotation.
-         * @param opt_delta Delta. Default is `0`.
-         * @return Constrained rotation.
-         * @api
-         */
-        constrainRotation(rotation?: number, opt_delta?: number): number;
+    /**
+     * Get the constrained rotation of this view.
+     * @param rotation Rotation.
+     * @param opt_delta Delta. Default is `0`.
+     * @return Constrained rotation.
+     * @api
+     */
+    constrainRotation(rotation?: number, opt_delta?: number): number;
 
-        /**
-         * Get the view center.
-         * @return The center of the view.
-         * @observable
-         * @api stable
-         */
-        getCenter(): ol.Coordinate;
+    /**
+     * Get the view center.
+     * @return The center of the view.
+     * @observable
+     * @api stable
+     */
+    getCenter(): ol.Coordinate;
 
-        /**
-         * Calculate the extent for the current view state and the passed size.
-         * The size is the pixel dimensions of the box into which the calculated extent
-         * should fit. In most cases you want to get the extent of the entire map,
-         * that is `map.getSize()`.
-         * @param size Box pixel size.
-         * @return Extent.
-         * @api stable
-         */
-        calculateExtent(size?: ol.Size): ol.Extent;
+    /**
+     * Calculate the extent for the current view state and the passed size.
+     * The size is the pixel dimensions of the box into which the calculated extent
+     * should fit. In most cases you want to get the extent of the entire map,
+     * that is `map.getSize()`.
+     * @param size Box pixel size.
+     * @return Extent.
+     * @api stable
+     */
+    calculateExtent(size?: ol.Size): ol.Extent;
 
-        /**
-         * Get the maximum resolution of the view.
-         * @return The maximum resolution of the view.
-         * @api
-         */
-        getMaxResolution(): number;
+    /**
+     * Get the maximum resolution of the view.
+     * @return The maximum resolution of the view.
+     * @api
+     */
+    getMaxResolution(): number;
 
-        /**
-         * Get the minimum resolution of the view.
-         * @return The minimum resolution of the view.
-         * @api
-         */
-        getMinResolution(): number;
+    /**
+     * Get the minimum resolution of the view.
+     * @return The minimum resolution of the view.
+     * @api
+     */
+    getMinResolution(): number;
 
-        /**
-         * Get the maximum zoom level for the view.
-         * @return The maximum zoom level.
-         * @api
-         */
-        getMaxZoom(): number;
+    /**
+     * Get the maximum zoom level for the view.
+     * @return The maximum zoom level.
+     * @api
+     */
+    getMaxZoom(): number;
 
-        /**
-         * Set a new maximum zoom level for the view.
-         * @param zoom The maximum zoom level.
-         * @api stable
-         */
-        setMaxZoom(zoom: number): void;
+    /**
+     * Set a new maximum zoom level for the view.
+     * @param zoom The maximum zoom level.
+     * @api stable
+     */
+    setMaxZoom(zoom: number): void;
 
-        /**
-         * Get the minimum zoom level for the view.
-         * @return The minimum zoom level.
-         * @api
-         */
-        getMinZoom(): number;
+    /**
+     * Get the minimum zoom level for the view.
+     * @return The minimum zoom level.
+     * @api
+     */
+    getMinZoom(): number;
 
-        /**
-         * Set a new minimum zoom level for the view.
-         * @param zoom The minimum zoom level.
-         * @api stable
-         */
-        setMinZoom(zoom: number): void;
+    /**
+     * Set a new minimum zoom level for the view.
+     * @param zoom The minimum zoom level.
+     * @api stable
+     */
+    setMinZoom(zoom: number): void;
 
-        /**
-         * Get the view projection.
-         * @return The projection of the view.
-         * @api stable
-         */
-        getProjection(): ol.proj.Projection;
+    /**
+     * Get the view projection.
+     * @return The projection of the view.
+     * @api stable
+     */
+    getProjection(): ol.proj.Projection;
 
-        /**
-         * Get the view resolution.
-         * @return The resolution of the view.
-         * @observable
-         * @api stable
-         */
-        getResolution(): number;
+    /**
+     * Get the view resolution.
+     * @return The resolution of the view.
+     * @observable
+     * @api stable
+     */
+    getResolution(): number;
 
-        /**
-         * Get the resolutions for the view. This returns the array of resolutions
-         * passed to the constructor of the {ol.View}, or undefined if none were given.
-         * @return The resolutions of the view.
-         * @api stable
-         */
-        getResolutions(): number[];
+    /**
+     * Get the resolutions for the view. This returns the array of resolutions
+     * passed to the constructor of the {ol.View}, or undefined if none were given.
+     * @return The resolutions of the view.
+     * @api stable
+     */
+    getResolutions(): number[];
 
-        /**
-         * Get the resolution for a provided extent (in map units) and size (in pixels).
-         * @param extent Extent.
-         * @param opt_size Box pixel size.
-         * @return The resolution at which the provided extent will render at
-         *     the given size.
-         * @api
-         */
-        getResolutionForExtent(extent: ol.Extent, opt_size?: ol.Size): number;
+    /**
+     * Get the resolution for a provided extent (in map units) and size (in pixels).
+     * @param extent Extent.
+     * @param opt_size Box pixel size.
+     * @return The resolution at which the provided extent will render at
+     *     the given size.
+     * @api
+     */
+    getResolutionForExtent(extent: ol.Extent, opt_size?: ol.Size): number;
 
-        /**
-         * Get the view rotation.
-         * @return The rotation of the view in radians.
-         * @observable
-         * @api stable
-         */
-        getRotation(): number;
+    /**
+     * Get the view rotation.
+     * @return The rotation of the view in radians.
+     * @observable
+     * @api stable
+     */
+    getRotation(): number;
 
-        /**
-         * Get the current zoom level.  If you configured your view with a resolutions
-         * array (this is rare), this method may return non-integer zoom levels (so
-         * the zoom level is not safe to use as an index into a resolutions array).
-         * @return Zoom.
-         * @api
-         */
-        getZoom(): number;
+    /**
+     * Get the current zoom level.  If you configured your view with a resolutions
+     * array (this is rare), this method may return non-integer zoom levels (so
+     * the zoom level is not safe to use as an index into a resolutions array).
+     * @return Zoom.
+     * @api
+     */
+    getZoom(): number;
 
-        /**
-         * Get the zoom level for a resolution.
-         * @param resolution The resolution.
-         * @return The zoom level for the provided resolution.
-         * @api
-         */
-        getZoomForResolution(resolution: number): number;
+    /**
+     * Get the zoom level for a resolution.
+     * @param resolution The resolution.
+     * @return The zoom level for the provided resolution.
+     * @api
+     */
+    getZoomForResolution(resolution: number): number;
 
-        /**
-         * Get the resolution for a zoom level.
-         * @param zoom Zoom level.
-         * @return The view resolution for the provided zoom level.
-         * @api
-         */
-        getResolutionForZoom(zoom: number): number;
+    /**
+     * Get the resolution for a zoom level.
+     * @param zoom Zoom level.
+     * @return The view resolution for the provided zoom level.
+     * @api
+     */
+    getResolutionForZoom(zoom: number): number;
 
-        /**
-         * Fit the given geometry or extent based on the given map size and border.
-         * The size is pixel dimensions of the box to fit the extent into.
-         * In most cases you will want to use the map size, that is `map.getSize()`.
-         * Takes care of the map angle.
-         * @param geometry Geometry.
-         * @param opt_options Options.
-         * @api
-         */
-        fit(geometryOrExtent: (ol.geom.SimpleGeometry | ol.Extent), opt_options?: olx.view.FitOptions): void;
+    /**
+     * Fit the given geometry or extent based on the given map size and border.
+     * The size is pixel dimensions of the box to fit the extent into.
+     * In most cases you will want to use the map size, that is `map.getSize()`.
+     * Takes care of the map angle.
+     * @param geometry Geometry.
+     * @param opt_options Options.
+     * @api
+     */
+    fit(geometryOrExtent: (ol.geom.SimpleGeometry | ol.Extent), opt_options?: olx.view.FitOptions): void;
 
-        /**
-         * Center on coordinate and view position.
-         * @param coordinate Coordinate.
-         * @param size Box pixel size.
-         * @param position Position on the view to center on.
-         * @api
-         */
-        centerOn(coordinate: ol.Coordinate, size: ol.Size, position: ol.Pixel): void;
+    /**
+     * Center on coordinate and view position.
+     * @param coordinate Coordinate.
+     * @param size Box pixel size.
+     * @param position Position on the view to center on.
+     * @api
+     */
+    centerOn(coordinate: ol.Coordinate, size: ol.Size, position: ol.Pixel): void;
 
-        /**
-         * Rotate the view around a given coordinate.
-         * @param rotation New rotation value for the view.
-         * @param opt_anchor The rotation center.
-         * @api stable
-         */
-        rotate(rotation: number, opt_anchor?: ol.Coordinate): void;
+    /**
+     * Rotate the view around a given coordinate.
+     * @param rotation New rotation value for the view.
+     * @param opt_anchor The rotation center.
+     * @api stable
+     */
+    rotate(rotation: number, opt_anchor?: ol.Coordinate): void;
 
-        /**
-         * Set the center of the current view.
-         * @param center The center of the view.
-         * @observable
-         * @api stable
-         */
-        setCenter(center: ol.Coordinate): void;
+    /**
+     * Set the center of the current view.
+     * @param center The center of the view.
+     * @observable
+     * @api stable
+     */
+    setCenter(center: ol.Coordinate): void;
 
-        /**
-         * Set the resolution for this view.
-         * @param resolution The resolution of the view.
-         * @observable
-         * @api stable
-         */
-        setResolution(resolution?: number): void;
+    /**
+     * Set the resolution for this view.
+     * @param resolution The resolution of the view.
+     * @observable
+     * @api stable
+     */
+    setResolution(resolution?: number): void;
 
-        /**
-         * Set the rotation for this view.
-         * @param rotation The rotation of the view in radians.
-         * @observable
-         * @api stable
-         */
-        setRotation(rotation: number): void;
+    /**
+     * Set the rotation for this view.
+     * @param rotation The rotation of the view in radians.
+     * @observable
+     * @api stable
+     */
+    setRotation(rotation: number): void;
 
-        /**
-         * Zoom to a specific zoom level.
-         * @param zoom Zoom level.
-         * @api stable
-         */
-        setZoom(zoom: number): void;
-    }
+    /**
+     * Zoom to a specific zoom level.
+     * @param zoom Zoom level.
+     * @api stable
+     */
+    setZoom(zoom: number): void;
 }
 
-declare namespace olx {
-    namespace animation {
+export namespace olx {
+    export namespace animation {
         interface BounceOptions {
             resolution: number;
             start?: number;
@@ -11465,7 +11465,7 @@ declare namespace olx {
         type AnimateCallback = (completed: boolean) => void;
     }
 
-    namespace control {
+    export namespace control {
         interface AttributionOptions {
             className?: string;
             target?: Element;
@@ -11570,7 +11570,7 @@ declare namespace olx {
         }
     }
 
-    namespace format {
+    export namespace format {
         interface ReadOptions {
             dataProjection: ol.ProjectionLike;
             featureProjection: ol.ProjectionLike;
@@ -11595,8 +11595,8 @@ declare namespace olx {
 
         interface MVTOptions {
             featureClass?: (((geom: (ol.geom.Geometry | { [k: string]: any })) => any) | ((geom: ol.geom.GeometryType, arg2: number[],
-                           arg3: (number[] | number[][]),
-                           arg4: { [k: string]: any }) => any));
+                            arg3: (number[] | number[][]),
+                            arg4: { [k: string]: any }) => any));
             geometryName?: string;
             layerName?: string;
             layers?: string[];
@@ -11681,7 +11681,7 @@ declare namespace olx {
         }
     }
 
-    namespace interaction {
+    export namespace interaction {
         /**
          * Object literal with config options for interactions.
          */
@@ -11712,7 +11712,7 @@ declare namespace olx {
         }
 
         interface DragAndDropOptions {
-            formatConstructors?: Array<typeof ol.format.Feature>;
+            formatConstructors?: Array<typeof format.Feature>;
             projection: ol.ProjectionLike;
             target?: Element;
             source?: ol.source.Vector;
@@ -11844,7 +11844,7 @@ declare namespace olx {
         }
     }
 
-    namespace layer {
+    export namespace layer {
         interface BaseOptions {
             opacity?: number;
             visible?: boolean;
@@ -11961,15 +11961,15 @@ declare namespace olx {
         }
     }
 
-    namespace parser {
+    export namespace parser {
     }
-    namespace render {
+    export namespace render {
         interface ToContextOptions {
             size?: ol.Size;
             pixelRatio?: number;
         }
     }
-    namespace source {
+    export namespace source {
         interface BingMapsOptions {
             cacheSize?: number;
             culture?: string;
@@ -12286,7 +12286,7 @@ declare namespace olx {
             size: ol.Size;
         }
     }
-    namespace style {
+    export namespace style {
         interface CircleOptions {
             fill?: ol.style.Fill;
             radius: number;
@@ -12386,7 +12386,7 @@ declare namespace olx {
             space?: number;
         }
     }
-    namespace tilegrid {
+    export namespace tilegrid {
         interface TileGridOptions {
             extent?: ol.Extent;
             minZoom?: number;
@@ -12417,15 +12417,15 @@ declare namespace olx {
         }
     }
 
-    interface AttributionOptions {
+    export interface AttributionOptions {
         html: string;
     }
 
-    interface DeviceOrientationOptions {
+    export interface DeviceOrientationOptions {
         tracking?: boolean;
     }
 
-    interface GeolocationOptions {
+    export interface GeolocationOptions {
         tracking?: boolean;
         trackingOptions?: PositionOptions;
         projection: ol.ProjectionLike;
@@ -12434,12 +12434,12 @@ declare namespace olx {
     /**
      * Object literal with config options for the map logo.
      */
-    interface LogoOptions {
+    export interface LogoOptions {
         href: string;
         src: string;
     }
 
-    interface GraticuleOptions {
+    export interface GraticuleOptions {
         map?: ol.Map;
         maxLines?: number;
         strokeStyle?: ol.style.Stroke;
@@ -12456,7 +12456,7 @@ declare namespace olx {
     /**
      * Object literal with config options for the map.
      */
-    interface MapOptions {
+    export interface MapOptions {
         controls?: (ol.Collection<ol.control.Control> | ol.control.Control[]);
         pixelRatio?: number;
         interactions?: (ol.Collection<ol.interaction.Interaction> | ol.interaction.Interaction[]);
@@ -12474,7 +12474,7 @@ declare namespace olx {
     /**
      * Object literal with config options for the overlay.
      */
-    interface OverlayOptions {
+    export interface OverlayOptions {
         id?: (number | string);
         element?: Element;
         offset?: number[];
@@ -12490,7 +12490,7 @@ declare namespace olx {
     /**
      * Object literal with config options for the projection.
      */
-    interface ProjectionOptions {
+    export interface ProjectionOptions {
         code: string;
         units?: (ol.proj.Units | string);
         extent?: ol.Extent;
@@ -12501,7 +12501,7 @@ declare namespace olx {
         getPointResolution?: ((resolution: number, coords: ol.Coordinate) => number);
     }
 
-    namespace view {
+    export namespace view {
         interface FitOptions {
             size?: ol.Size;
             padding?: number[];
@@ -12518,7 +12518,7 @@ declare namespace olx {
     /**
      * Object literal with config options for the view.
      */
-    interface ViewOptions {
+    export interface ViewOptions {
         center?: ol.Coordinate;
         constrainRotation?: (boolean | number);
         enableRotation?: boolean;
@@ -12539,25 +12539,21 @@ declare namespace olx {
      * Object literal with options for the {@link ol.Map#forEachFeatureAtPixel} and
      * {@link ol.Map#hasFeatureAtPixel} methods.
      */
-    interface AtPixelOptions {
+    export interface AtPixelOptions {
         layerFilter?: ((layer: ol.layer.Layer) => boolean);
         hitTolerance?: number;
     }
 
-    interface FrameState {
+    export interface FrameState {
         pixelRatio: number;
         time: number;
         viewState: olx.ViewState;
     }
 
-    interface ViewState {
+    export interface ViewState {
         center: ol.Coordinate;
         projection: ol.proj.Projection;
         resolution: number;
         rotation: number;
     }
 }
-
-declare module "openlayers" {
-    export = ol;
-}
diff --git a/types/openlayers/openlayers-tests.ts b/types/openlayers/openlayers-tests.ts
index ff37abb4dc..b792f732af 100644
--- a/types/openlayers/openlayers-tests.ts
+++ b/types/openlayers/openlayers-tests.ts
@@ -54,7 +54,7 @@ let iconOrigin: ol.style.IconOrigin;
 let linearRing: ol.geom.LinearRing;
 let lineString: ol.geom.LineString;
 let loadingStrategy: ol.LoadingStrategy;
-let logoOptions: olx.LogoOptions;
+let logoOptions: ol.olx.LogoOptions;
 let mapBrowserEvent: ol.MapBrowserEvent;
 let multiLineString: ol.geom.MultiLineString;
 let multiPoint: ol.geom.MultiPoint;
@@ -539,7 +539,7 @@ let tileLayer: ol.layer.Tile = new ol.layer.Tile({
 //
 // ol.layer.Vector
 //
-let vectorLayerRenderMode: olx.layer.VectorRenderType = 'image';
+let vectorLayerRenderMode: ol.olx.layer.VectorRenderType = 'image';
 let vectorLayer: ol.layer.Vector = new ol.layer.Vector({
     renderMode: vectorLayerRenderMode,
     source: new ol.source.Vector(),
@@ -751,7 +751,7 @@ popup.setPositioning(popupPositioning);
 // ol.format.GeoJSON
 //
 
-let geojsonOptions: olx.format.GeoJSONOptions;
+let geojsonOptions: ol.olx.format.GeoJSONOptions;
 geojsonOptions.defaultDataProjection = "EPSG";
 geojsonOptions.defaultDataProjection = projection;
 geojsonOptions.geometryName = "geom";
@@ -761,13 +761,13 @@ geojsonFormat = new ol.format.GeoJSON();
 geojsonFormat = new ol.format.GeoJSON(geojsonOptions);
 
 // Test options
-let readOptions: olx.format.ReadOptions;
+let readOptions: ol.olx.format.ReadOptions;
 readOptions.dataProjection = "EPSG";
 readOptions.dataProjection = projection;
 readOptions.featureProjection = "EPSG";
 readOptions.featureProjection = projection;
 
-let writeOptions: olx.format.WriteOptions;
+let writeOptions: ol.olx.format.WriteOptions;
 writeOptions.dataProjection = "EPSG";
 writeOptions.dataProjection = projection;
 writeOptions.featureProjection = "EPSG";
diff --git a/types/openlayers/tslint.json b/types/openlayers/tslint.json
index bbf9bf242a..70877b4c6c 100644
--- a/types/openlayers/tslint.json
+++ b/types/openlayers/tslint.json
@@ -1,9 +1,6 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        // Not sure how to work around this, or if it's necessary to
-        "no-declare-current-package": false,
-        "no-single-declare-module": false,
         "no-unnecessary-class": false,
         "no-unnecessary-generics": false,
         "no-unnecessary-qualifier": false,

From a3d91758ae82b88c2f4ef40b12073cdeb3a31947 Mon Sep 17 00:00:00 2001
From: Olivier Sechet <osechet@gmail.com>
Date: Sat, 10 Mar 2018 10:01:33 +0100
Subject: [PATCH 0408/1382] Update tests file using import

---
 types/openlayers/openlayers-tests.ts | 146 ++++++++++++++-------------
 1 file changed, 76 insertions(+), 70 deletions(-)

diff --git a/types/openlayers/openlayers-tests.ts b/types/openlayers/openlayers-tests.ts
index b792f732af..fa42579ba9 100644
--- a/types/openlayers/openlayers-tests.ts
+++ b/types/openlayers/openlayers-tests.ts
@@ -1,13 +1,15 @@
+import * as ol from 'openlayers';
+
 // Basic type variables for test functions
 let anyValue: any;
 let booleanValue: boolean;
-let canvas: HTMLCanvasElement;
-let domEventTarget: EventTarget;
-let fn: () => void;
-let image: HTMLImageElement;
+const canvas: HTMLCanvasElement = new HTMLCanvasElement();
+const domEventTarget: EventTarget = new EventTarget();
+const fn: () => void = () => {};
+const image: HTMLImageElement = new HTMLImageElement();
 let jsonValue: JSON;
-let listener: ol.EventsListenerFunctionType;
-let numberArray: number[];
+const listener: ol.EventsListenerFunctionType = (evt) => {};
+const numberArray: number[] = [];
 let numberValue: number;
 let object: { [key: string]: any };
 let stringArray: string[];
@@ -15,67 +17,71 @@ let stringValue: string;
 
 // Callback predefinitions for OpenLayers
 let coordinateFormatType: ol.CoordinateFormatType;
-let drawGeometryFunction: ol.DrawGeometryFunctionType;
+const drawGeometryFunction: ol.DrawGeometryFunctionType = (coords, geo) => new ol.geom.SimpleGeometry();
 let easingFunction: (t: number) => number;
 let featureLoader: ol.FeatureLoader;
 let featureStyleFunction: ol.FeatureStyleFunction;
-let preRenderFunction: ol.PreRenderFunction;
+const preRenderFunction: ol.PreRenderFunction = (map, state) => false;
 let transformFunction: ol.TransformFunction;
 drawGeometryFunction([0, 0], new ol.geom.Point([0, 0]));
 drawGeometryFunction([0, 0]);
 
 // Type variables for OpenLayers
 let attribution: ol.Attribution;
-let boundingCoordinates: ol.Coordinate[];
+const boundingCoordinates: ol.Coordinate[] = [];
 let circle: ol.geom.Circle;
 let clusterSource: ol.source.Cluster;
 let color: ol.Color;
 let coordinate: ol.Coordinate;
 let coordinatesArray: ol.Coordinate[];
 let coordinatesArrayDim2: ol.Coordinate[][];
-let eventKey: ol.EventsKey;
-let eventKeyArray: ol.EventsKey[];
+const eventKey: ol.EventsKey = {};
+const eventKeyArray: ol.EventsKey[] = [];
 let eventKeyMixed: ol.EventsKey | ol.EventsKey[];
-let eventTarget: ol.events.EventTarget;
+const eventTarget = new ol.events.EventTarget();
 let extent: ol.Extent;
 let feature: ol.Feature;
 let featureArray: ol.Feature[];
 let featureCollection: ol.Collection<ol.Feature>;
-let featureFormat: ol.format.Feature;
-let featureUrlFunction: ol.FeatureUrlFunction;
+const featureFormat = new ol.format.Feature();
+const featureUrlFunction: ol.FeatureUrlFunction = (extent, resolution, proj) => stringValue;
 let geometriesArray: ol.geom.Geometry[];
 let geometry: ol.geom.Geometry;
 let geometryCollection: ol.geom.GeometryCollection;
 let geometryLayout: ol.geom.GeometryLayout;
 let geometryType: ol.geom.GeometryType;
 let graticule: ol.Graticule;
-let iconAnchorUnits: ol.style.IconAnchorUnits;
-let iconOrigin: ol.style.IconOrigin;
+const iconAnchorUnits: ol.style.IconAnchorUnits = 'fraction';
+const iconOrigin: ol.style.IconOrigin = 'bottom-left';
 let linearRing: ol.geom.LinearRing;
 let lineString: ol.geom.LineString;
 let loadingStrategy: ol.LoadingStrategy;
-let logoOptions: ol.olx.LogoOptions;
-let mapBrowserEvent: ol.MapBrowserEvent;
+const logoOptions: ol.olx.LogoOptions = {href: stringValue, src: stringValue};
+let map: ol.Map;
 let multiLineString: ol.geom.MultiLineString;
 let multiPoint: ol.geom.MultiPoint;
 let multiPolygon: ol.geom.MultiPolygon;
-let olEvent: ol.events.Event;
-let pixel: ol.Pixel;
+const olEvent = new ol.events.Event(stringValue);
+const pixel: ol.Pixel = [numberValue, numberValue];
 let point: ol.geom.Point;
 let polygon: ol.geom.Polygon;
 let projection: ol.proj.Projection;
-let projectionLike: ol.ProjectionLike;
-let simpleGeometry: ol.geom.SimpleGeometry;
+const projectionLike: ol.ProjectionLike = stringValue;
+const simpleGeometry = new ol.geom.SimpleGeometry();
 let size: ol.Size;
-let style: ol.style.Style;
-let styleArray: ol.style.Style[];
-let styleFunction: ol.StyleFunction;
+const style = new ol.style.Style();
+const styleArray: ol.style.Style[] = [];
+const styleFunction: ol.StyleFunction = (feature, resolution) => style;
 let styleRegularShape: ol.style.RegularShape;
-let tilegrid: ol.tilegrid.TileGrid;
-let transformFn: ol.TransformFunction;
+const tilegrid = new ol.tilegrid.TileGrid({resolutions: numberArray});
+const transformFn: ol.TransformFunction = (array, out, dimension) => numberArray;
 let units: ol.proj.Units;
 let vectorSource: ol.source.Vector;
 
+const viewState: ol.olx.ViewState = {center: coordinate, projection, resolution: numberValue, rotation: numberValue};
+const frameState: ol.olx.FrameState = {pixelRatio: numberValue, time: numberValue, viewState};
+const mapBrowserEvent = new ol.MapBrowserEvent(stringValue, map, event, booleanValue, frameState);
+
 //
 // ol.Attribution
 //
@@ -155,7 +161,7 @@ circle = <ol.geom.Circle> circle.transform(projectionLike, projectionLike);
 //
 // ol.geom.Geometry
 //
-let geometryResult: ol.geom.Geometry;
+const geometryResult = new ol.geom.Geometry();
 coordinate = geometryResult.getClosestPoint(coordinate);
 geometryResult.getClosestPoint(coordinate, coordinate);
 extent = geometryResult.getExtent();
@@ -283,7 +289,7 @@ point.setCoordinates(coordinate, geometryLayout);
 //
 // ol.geom.Polygon
 //
-let localSphere: ol.Sphere;
+const localSphere = new ol.Sphere(numberValue);
 let linearRingsArray: ol.geom.LinearRing[];
 
 polygon = new ol.geom.Polygon(coordinatesArrayDim2);
@@ -321,7 +327,7 @@ simpleGeometry.translate(numberValue, numberValue);
 //
 // ol.source
 //
-let featureCallback: (f: ol.Feature) => any;
+const featureCallback = (f: ol.Feature) => anyValue;
 vectorSource = new ol.source.Vector({
     attributions: [attribution],
     features: featureCollection,
@@ -379,8 +385,8 @@ feature = new ol.Feature({
 feature = feature.clone();
 geometry = feature.getGeometry();
 stringValue = feature.getGeometryName();
-let featureGetId: string | number = feature.getId();
-let featureGetStyle: ol.style.Style | ol.style.Style[] | ol.FeatureStyleFunction | ol.StyleFunction = feature.getStyle();
+const featureGetId: string | number = feature.getId();
+const featureGetStyle: ol.style.Style | ol.style.Style[] | ol.FeatureStyleFunction | ol.StyleFunction = feature.getStyle();
 featureStyleFunction = feature.getStyleFunction();
 feature.setGeometry(geometry);
 feature.setGeometryName(stringValue);
@@ -491,21 +497,21 @@ view.setZoom(numberValue);
 //
 // ol.layer.Base
 //
-let baseLayer: ol.layer.Base = new ol.layer.Base({
+const baseLayer: ol.layer.Base = new ol.layer.Base({
     zIndex: 1
 });
 
 //
 // ol.layer.Group
 //
-let groupLayer: ol.layer.Group = new ol.layer.Group({
+const groupLayer: ol.layer.Group = new ol.layer.Group({
     zIndex: 2
 });
 
 //
 // ol.layer.Heatmap
 //
-let heatmapLayer: ol.layer.Heatmap = new ol.layer.Heatmap({
+const heatmapLayer: ol.layer.Heatmap = new ol.layer.Heatmap({
     source: new ol.source.Vector(),
     weight: '',
     zIndex: 1
@@ -514,7 +520,7 @@ let heatmapLayer: ol.layer.Heatmap = new ol.layer.Heatmap({
 //
 // ol.layer.Image
 //
-let imageLayer: ol.layer.Image = new ol.layer.Image({
+const imageLayer: ol.layer.Image = new ol.layer.Image({
     source: new ol.source.Image({
         projection: ''
     }),
@@ -524,14 +530,14 @@ let imageLayer: ol.layer.Image = new ol.layer.Image({
 //
 // ol.layer.Layer
 //
-let layerLayer: ol.layer.Layer = new ol.layer.Layer({
+const layerLayer: ol.layer.Layer = new ol.layer.Layer({
     zIndex: 2
 });
 
 //
 // ol.layer.Tile
 //
-let tileLayer: ol.layer.Tile = new ol.layer.Tile({
+const tileLayer: ol.layer.Tile = new ol.layer.Tile({
     source: new ol.source.OSM(),
     zIndex: 0
 });
@@ -539,8 +545,8 @@ let tileLayer: ol.layer.Tile = new ol.layer.Tile({
 //
 // ol.layer.Vector
 //
-let vectorLayerRenderMode: ol.olx.layer.VectorRenderType = 'image';
-let vectorLayer: ol.layer.Vector = new ol.layer.Vector({
+const vectorLayerRenderMode: ol.olx.layer.VectorRenderType = 'image';
+const vectorLayer: ol.layer.Vector = new ol.layer.Vector({
     renderMode: vectorLayerRenderMode,
     source: new ol.source.Vector(),
     zIndex: -1
@@ -549,7 +555,7 @@ let vectorLayer: ol.layer.Vector = new ol.layer.Vector({
 //
 // ol.layer.VectorTile
 //
-let vectorTileLayer: ol.layer.VectorTile = new ol.layer.VectorTile({
+const vectorTileLayer: ol.layer.VectorTile = new ol.layer.VectorTile({
     renderOrder: () => 1,
     zIndex: 2
 });
@@ -557,7 +563,7 @@ let vectorTileLayer: ol.layer.VectorTile = new ol.layer.VectorTile({
 //
 // ol.Object
 //
-let olObject: ol.Object = new ol.Object({
+const olObject: ol.Object = new ol.Object({
     a: numberValue,
     b: stringValue,
     c: booleanValue,
@@ -576,7 +582,7 @@ olObject.unset(stringValue, booleanValue);
 // ol.Observable
 //
 ol.Observable.unByKey(eventKey);
-let observable: ol.Observable = new ol.Observable();
+const observable: ol.Observable = new ol.Observable();
 observable.changed();
 observable.dispatchEvent({ type: stringValue });
 observable.dispatchEvent({ type: stringValue, target: domEventTarget });
@@ -595,7 +601,7 @@ observable.un([stringValue, stringValue], listener, {});
 //
 // ol.proj
 //
-let getPointResolutionFn: (n: number, c: ol.Coordinate) => number;
+const getPointResolutionFn = (n: number, c: ol.Coordinate) => numberValue;
 projection = new ol.proj.Projection({
     code: stringValue,
 });
@@ -615,7 +621,7 @@ projection.setWorldExtent(extent);
 // ol.Map
 //
 
-let map: ol.Map = new ol.Map({
+map = new ol.Map({
     view,
     layers: [tileLayer],
     target: stringValue
@@ -624,7 +630,7 @@ let map: ol.Map = new ol.Map({
 //
 // ol.source.ImageWMS
 //
-let imageWMS: ol.source.ImageWMS = new ol.source.ImageWMS({
+const imageWMS: ol.source.ImageWMS = new ol.source.ImageWMS({
     params: {},
     projection,
     serverType: stringValue,
@@ -660,7 +666,7 @@ stringValue = tileWMS.getGetFeatureInfoUrl([0, 0], 1, "EPSG:4326", {});
 //
 // ol.source.WMTS
 //
-let wmts: ol.source.WMTS = new ol.source.WMTS({
+const wmts: ol.source.WMTS = new ol.source.WMTS({
     layer: "",
     projection,
     matrixSet: "",
@@ -700,7 +706,7 @@ easingFunction = ol.easing.upAndDown;
 //
 // ol.Geolocation
 //
-let geolocation: ol.Geolocation = new ol.Geolocation({
+const geolocation: ol.Geolocation = new ol.Geolocation({
     projection
 });
 coordinate = geolocation.getPosition();
@@ -713,16 +719,16 @@ graticule = new ol.Graticule();
 graticule = new ol.Graticule({
     map,
 });
-let graticuleMap: ol.Map = graticule.getMap();
-let graticuleMeridians: ol.geom.LineString[] = graticule.getMeridians();
-let graticuleParallels: ol.geom.LineString[] = graticule.getParallels();
+const graticuleMap: ol.Map = graticule.getMap();
+const graticuleMeridians: ol.geom.LineString[] = graticule.getMeridians();
+const graticuleParallels: ol.geom.LineString[] = graticule.getParallels();
 graticule.setMap(graticuleMap);
 
 //
 // ol.DeviceOrientation
 //
 
-let deviceOrientation: ol.DeviceOrientation = new ol.DeviceOrientation({
+const deviceOrientation: ol.DeviceOrientation = new ol.DeviceOrientation({
     tracking: true,
 });
 numberValue = deviceOrientation.getHeading();
@@ -731,15 +737,15 @@ numberValue = deviceOrientation.getHeading();
 // ol.Overlay
 //
 
-let popup: ol.Overlay = new ol.Overlay({
+const popup: ol.Overlay = new ol.Overlay({
     element: document.getElementById('popup')
 });
 map.addOverlay(popup);
-let popupElement: Element = popup.getElement();
-let popupMap: ol.Map = popup.getMap();
-let popupOffset: number[] = popup.getOffset();
+const popupElement: Element = popup.getElement();
+const popupMap: ol.Map = popup.getMap();
+const popupOffset: number[] = popup.getOffset();
 coordinate = popup.getPosition();
-let popupPositioning: ol.OverlayPositioning = popup.getPositioning();
+const popupPositioning: ol.OverlayPositioning = popup.getPositioning();
 popup.setElement(popupElement);
 popup.setMap(popupMap);
 popup.setOffset(popupOffset);
@@ -751,7 +757,7 @@ popup.setPositioning(popupPositioning);
 // ol.format.GeoJSON
 //
 
-let geojsonOptions: ol.olx.format.GeoJSONOptions;
+const geojsonOptions: ol.olx.format.GeoJSONOptions = {defaultDataProjection: projectionLike, featureProjection: projectionLike, geometryName: stringValue};
 geojsonOptions.defaultDataProjection = "EPSG";
 geojsonOptions.defaultDataProjection = projection;
 geojsonOptions.geometryName = "geom";
@@ -761,13 +767,13 @@ geojsonFormat = new ol.format.GeoJSON();
 geojsonFormat = new ol.format.GeoJSON(geojsonOptions);
 
 // Test options
-let readOptions: ol.olx.format.ReadOptions;
+const readOptions: ol.olx.format.ReadOptions = {dataProjection: projectionLike, featureProjection: projectionLike};
 readOptions.dataProjection = "EPSG";
 readOptions.dataProjection = projection;
 readOptions.featureProjection = "EPSG";
 readOptions.featureProjection = projection;
 
-let writeOptions: ol.olx.format.WriteOptions;
+const writeOptions: ol.olx.format.WriteOptions = {dataProjection: projectionLike, featureProjection: projectionLike, rightHanded: booleanValue, decimals: numberValue};
 writeOptions.dataProjection = "EPSG";
 writeOptions.dataProjection = projection;
 writeOptions.featureProjection = "EPSG";
@@ -891,11 +897,11 @@ withinFilter = ol.format.filter.within("geometry", geometry, "srs");
 //
 // ol.interactions
 //
-let modifyFeature: ol.interaction.Modify = new ol.interaction.Modify({
+const modifyFeature: ol.interaction.Modify = new ol.interaction.Modify({
     insertVertexCondition: ol.events.condition.never,
     features: new ol.Collection<ol.Feature>(featureArray),
 });
-let modifySource: ol.interaction.Modify = new ol.interaction.Modify({
+const modifySource: ol.interaction.Modify = new ol.interaction.Modify({
     insertVertexCondition: ol.events.condition.never,
     source: new ol.source.Vector({
         features: new ol.Collection<ol.Feature>(featureArray),
@@ -935,7 +941,7 @@ draw = new ol.interaction.Draw({
     type: "Point",
     style: styleFunction
 });
-let styleFunctionAsStyle = (feature: ol.Feature, resolution: number): ol.style.Style => style;
+const styleFunctionAsStyle = (feature: ol.Feature, resolution: number): ol.style.Style => style;
 draw = new ol.interaction.Draw({
     type: "Point",
     style: styleFunctionAsStyle
@@ -949,13 +955,13 @@ ol.interaction.defaults({
     constrainResolution: booleanValue
 });
 
-let styleFunctionAsArray = (feature: ol.Feature, resolution: number): ol.style.Style[] => styleArray;
+const styleFunctionAsArray = (feature: ol.Feature, resolution: number): ol.style.Style[] => styleArray;
 draw = new ol.interaction.Draw({
     type: "Point",
     style: styleFunctionAsArray
 });
 
-let dragbox: ol.interaction.DragBox = new ol.interaction.DragBox({
+const dragbox: ol.interaction.DragBox = new ol.interaction.DragBox({
     className: stringValue,
     minArea: 10,
     condition: ol.events.condition.always,
@@ -967,7 +973,7 @@ let dragbox: ol.interaction.DragBox = new ol.interaction.DragBox({
 });
 polygon = dragbox.getGeometry();
 
-let interaction: ol.interaction.Interaction = new ol.interaction.Interaction({
+const interaction: ol.interaction.Interaction = new ol.interaction.Interaction({
     handleEvent: (e: ol.MapBrowserEvent) => {
         return booleanValue;
     }
@@ -980,12 +986,12 @@ const select: ol.interaction.Select = new ol.interaction.Select({
     layers: (layer: ol.layer.Layer) => true,
 });
 
-let pinchZoom: ol.interaction.PinchZoom = new ol.interaction.PinchZoom({
+const pinchZoom: ol.interaction.PinchZoom = new ol.interaction.PinchZoom({
     constrainResolution: booleanValue,
     duration: numberValue
 });
 
-let mouseWheelZoom: ol.interaction.MouseWheelZoom = new ol.interaction.MouseWheelZoom({
+const mouseWheelZoom: ol.interaction.MouseWheelZoom = new ol.interaction.MouseWheelZoom({
     constrainResolution: booleanValue,
     duration: numberValue,
     timeout: numberValue,
@@ -996,7 +1002,7 @@ let mouseWheelZoom: ol.interaction.MouseWheelZoom = new ol.interaction.MouseWhee
 // ol.style.Icon
 //
 
-let iconWithUndefined = new ol.style.Icon({});
+const iconWithUndefined = new ol.style.Icon({});
 let icon: ol.style.Icon;
 
 icon = new ol.style.Icon({
@@ -1051,7 +1057,7 @@ styleRegularShape = new ol.style.RegularShape({
 // ol.proj
 //
 
-let value = ol.proj.METERS_PER_UNIT['degrees'];
+const value = ol.proj.METERS_PER_UNIT['degrees'];
 
 numberValue = ol.Sphere.getArea(geometry, {
     projection,

From b542e6c165dafbc53bea9e474fc731373f5a5494 Mon Sep 17 00:00:00 2001
From: Divyendu Singh <divyendu.z@gmail.com>
Date: Sat, 10 Mar 2018 14:32:35 +0530
Subject: [PATCH 0409/1382] conform with structure of graphql-js in graphql
 typings

---
 types/graphql/type/schema.d.ts              | 21 ++++++++++++++
 types/graphql/utilities/buildASTSchema.d.ts | 32 ++++++++++++++-------
 2 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/types/graphql/type/schema.d.ts b/types/graphql/type/schema.d.ts
index 3263274dd9..26500c6ed3 100644
--- a/types/graphql/type/schema.d.ts
+++ b/types/graphql/type/schema.d.ts
@@ -61,6 +61,27 @@ export class GraphQLSchema {
   getDirective(name: string): GraphQLDirective;
 }
 
+export type GraphQLSchemaValidationOptions = {
+  /**
+   * When building a schema from a GraphQL service's introspection result, it
+   * might be safe to assume the schema is valid. Set to true to assume the
+   * produced schema is valid.
+   *
+   * Default: false
+   */
+  assumeValid?: boolean;
+
+  /**
+   * If provided, the schema will consider fields or types with names included
+   * in this list valid, even if they do not adhere to the specification's
+   * schema validation rules.
+   *
+   * This option is provided to ease adoption and may be removed in a future
+   * major release.
+   */
+  allowedLegacyNames?: ReadonlyArray<string>;
+};
+
 export interface GraphQLSchemaConfig {
   query: GraphQLObjectType;
   mutation?: GraphQLObjectType;
diff --git a/types/graphql/utilities/buildASTSchema.d.ts b/types/graphql/utilities/buildASTSchema.d.ts
index 8ba2fcc9e9..6b8aa56327 100644
--- a/types/graphql/utilities/buildASTSchema.d.ts
+++ b/types/graphql/utilities/buildASTSchema.d.ts
@@ -1,12 +1,17 @@
 import { DocumentNode, Location, StringValueNode } from '../language/ast';
 import { Source } from '../language/source';
-import { GraphQLSchema } from '../type/schema';
+import { GraphQLSchema, GraphQLSchemaValidationOptions } from '../type/schema';
 
-type BuildSchemaOptions = {
-    assumeValid?: boolean;
-    allowedLegacyNames?: ReadonlyArray<string>;
-    commentDescriptions?: boolean;
-};
+interface BuildSchemaOptions extends GraphQLSchemaValidationOptions {
+  /**
+   * Descriptions are defined as preceding string literals, however an older
+   * experimental version of the SDL supported preceding comments as
+   * descriptions. Set to true to enable this deprecated behavior.
+   *
+   * Default: false
+   */
+  commentDescriptions?: boolean;
+}
 
 /**
  * This takes the ast of a schema document produced by the parse function in
@@ -21,13 +26,18 @@ type BuildSchemaOptions = {
 export function buildASTSchema(ast: DocumentNode): GraphQLSchema;
 
 /**
- * Given an ast node, returns its string description based on a contiguous
- * block full-line of comments preceding it.
+ * Given an ast node, returns its string description.
+ *
+ * Accepts options as a second argument:
+ *
+ *    - commentDescriptions:
+ *        Provide true to use preceding comments as the description.
+ *
  */
 export function getDescription(
-    node: { description?: StringValueNode; loc?: Location },
-    options: BuildSchemaOptions
-  ): string;
+  node: { description?: StringValueNode; loc?: Location },
+  options: BuildSchemaOptions
+): string;
 
 /**
  * A helper function to build a GraphQLSchema directly from a source

From be81617ff7c423a69426537a88575c563b234d03 Mon Sep 17 00:00:00 2001
From: nayni <rutgerhendrickx@gmail.com>
Date: Sat, 10 Mar 2018 14:38:09 +0100
Subject: [PATCH 0410/1382] Add jsdocs + remove unnessecary union return type

---
 types/graphql-resolve-batch/index.d.ts | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/types/graphql-resolve-batch/index.d.ts b/types/graphql-resolve-batch/index.d.ts
index e78ddafb37..af0fd725f7 100644
--- a/types/graphql-resolve-batch/index.d.ts
+++ b/types/graphql-resolve-batch/index.d.ts
@@ -4,6 +4,21 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
+/**
+ * Creates a GraphQL.js field resolver that batches together multiple resolves
+ * together that share the *exact* same GraphQL field selection.
+ *
+ * Note:
+ *  The batchResolveFunction you supply always expects you to always return an array of TReturn (or a promise with this array).
+ *  This is because you will have to return a TReturn for every source given to you by the batch function.
+ *  For an example of this please see the examples in the original project repository:
+ *  https://github.com/calebmer/graphql-resolve-batch/tree/master/examples
+ *
+ * @template TSource The original type of a single source.
+ * @template TReturn The return type of the field resolver.
+ * @template TArgs The type of supplied arguments.
+ * @template TContext The type of the current resolver context.
+ */
 export function createBatchResolver<
     TSource,
     TReturn,
@@ -13,12 +28,19 @@ export function createBatchResolver<
     batchResolveFn: BatchResolveFunction<TSource, TArgs, TContext, TReturn>
 ): ResolverFunction<TSource, TArgs, TContext, TReturn>;
 
+/**
+ * The resulting field resolver that batches together multiple resolves.
+ * Graphql-resolve-batch will always return a promise for this resulting resolver.
+ */
 export type ResolverFunction<TSource, TArgs, TContext, TReturn> = (
     source: TSource,
     args: TArgs,
     context: TContext
-) => Promise<TReturn> | Promise<TReturn[]>;
+) => Promise<TReturn>;
 
+/**
+ * A batch function to resolve all fields for the given sources in a single batch.
+ */
 export type BatchResolveFunction<TSource, TArgs, TContext, TReturn> = (
     sources: ReadonlyArray<TSource>,
     args: TArgs,

From 71347423382b8babdfca1ea9e17cc98f6953d459 Mon Sep 17 00:00:00 2001
From: nayni <rutgerhendrickx@gmail.com>
Date: Sat, 10 Mar 2018 14:40:39 +0100
Subject: [PATCH 0411/1382] Add batchfn jsdocs

---
 types/graphql-resolve-batch/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/graphql-resolve-batch/index.d.ts b/types/graphql-resolve-batch/index.d.ts
index af0fd725f7..e0118fc026 100644
--- a/types/graphql-resolve-batch/index.d.ts
+++ b/types/graphql-resolve-batch/index.d.ts
@@ -18,6 +18,7 @@
  * @template TReturn The return type of the field resolver.
  * @template TArgs The type of supplied arguments.
  * @template TContext The type of the current resolver context.
+ * @returns A batch function to resolve all fields for the given sources in a single batch.
  */
 export function createBatchResolver<
     TSource,

From 64ca985e2a751f2ba5d778fad7dda0305e6ea90d Mon Sep 17 00:00:00 2001
From: nayni <rutgerhendrickx@gmail.com>
Date: Sat, 10 Mar 2018 14:50:26 +0100
Subject: [PATCH 0412/1382] improve test coverage

---
 .../graphql-resolve-batch-tests.ts            | 48 ++++++++++++++++---
 1 file changed, 42 insertions(+), 6 deletions(-)

diff --git a/types/graphql-resolve-batch/graphql-resolve-batch-tests.ts b/types/graphql-resolve-batch/graphql-resolve-batch-tests.ts
index 519a3a4088..9043cdaf0e 100644
--- a/types/graphql-resolve-batch/graphql-resolve-batch-tests.ts
+++ b/types/graphql-resolve-batch/graphql-resolve-batch-tests.ts
@@ -16,6 +16,14 @@ interface SomeTestResult {
     someTestResultProp: string;
 }
 
+const batchFunction = (sources: ReadonlyArray<SomeTestSource>) => {
+    const someTestResult: SomeTestResult = {
+        someTestResultProp: "Hello"
+    };
+
+    return sources.map(source => someTestResult);
+};
+
 const asyncBatchFunction = async (sources: ReadonlyArray<SomeTestSource>) => {
     return new Promise<SomeTestResult[]>(resolve => {
         const res = [
@@ -27,19 +35,35 @@ const asyncBatchFunction = async (sources: ReadonlyArray<SomeTestSource>) => {
     });
 };
 
+const asyncBatchFunctionWhenTReturnIsArray = async (
+    sources: ReadonlyArray<SomeTestSource>
+) => {
+    const sourceBatches = sources.map(() => {
+        return new Promise<SomeTestResult[]>(resolve => {
+            const res = [
+                {
+                    someTestResultProp: ""
+                }
+            ];
+            resolve(res);
+        });
+    });
+
+    return Promise.all(sourceBatches);
+};
+
+// $ExpectType ResolverFunction<SomeTestSource, any, any, SomeTestResult>
 const withSourceAndResultTyped = createBatchResolver<
     SomeTestSource,
     SomeTestResult
 >((sources, _, __) => {
-    return sources.map(source => {
-        const res: SomeTestResult = {
-            someTestResultProp: ""
-        };
+    // $ExpectType ReadonlyArray<SomeTestSource>
+    const verifySources = sources;
 
-        return res;
-    });
+    return batchFunction(sources);
 });
 
+// $ExpectType ResolverFunction<SomeTestSource, any, any, SomeTestResult>
 const withSourceAndResultTypedAsPromise = createBatchResolver<
     SomeTestSource,
     SomeTestResult
@@ -50,6 +74,7 @@ const withSourceAndResultTypedAsPromise = createBatchResolver<
     return result;
 });
 
+// $ExpectType ResolverFunction<SomeTestSource, SomeTestArgs, any, SomeTestResult>
 const withSourceAndArgsAndResultTyped = createBatchResolver<
     SomeTestSource,
     SomeTestResult,
@@ -64,6 +89,7 @@ const withSourceAndArgsAndResultTyped = createBatchResolver<
     return result;
 });
 
+// $ExpectType ResolverFunction<SomeTestSource, SomeTestArgs, SomeTestContext, SomeTestResult>
 const withSourceAndArgsAndContextTyped = createBatchResolver<
     SomeTestSource,
     SomeTestResult,
@@ -80,3 +106,13 @@ const withSourceAndArgsAndContextTyped = createBatchResolver<
     const result = await asyncBatchFunction(sources);
     return result;
 });
+
+// $ExpectType ResolverFunction<SomeTestSource, any, any, SomeTestResult[]>
+const withResultIsArray = createBatchResolver<SomeTestSource, SomeTestResult[]>(
+    (sources, _, __) => {
+        // $ExpectType ReadonlyArray<SomeTestSource>
+        const verifySources = sources;
+
+        return asyncBatchFunctionWhenTReturnIsArray(sources);
+    }
+);

From 3bd0059542296baefdf531fc24c0a37c8ccce713 Mon Sep 17 00:00:00 2001
From: nayni <rutgerhendrickx@gmail.com>
Date: Sat, 10 Mar 2018 14:57:02 +0100
Subject: [PATCH 0413/1382] clean up jsdocs

---
 types/graphql-resolve-batch/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/graphql-resolve-batch/index.d.ts b/types/graphql-resolve-batch/index.d.ts
index e0118fc026..3818304537 100644
--- a/types/graphql-resolve-batch/index.d.ts
+++ b/types/graphql-resolve-batch/index.d.ts
@@ -9,7 +9,7 @@
  * together that share the *exact* same GraphQL field selection.
  *
  * Note:
- *  The batchResolveFunction you supply always expects you to always return an array of TReturn (or a promise with this array).
+ *  The batchResolveFunction you supply always expects you to return an array of TReturn (or a promise with this array).
  *  This is because you will have to return a TReturn for every source given to you by the batch function.
  *  For an example of this please see the examples in the original project repository:
  *  https://github.com/calebmer/graphql-resolve-batch/tree/master/examples

From d7d3e0712cf35e2bba5932c2b56d8fbde878f9bf Mon Sep 17 00:00:00 2001
From: nayni <rutgerhendrickx@gmail.com>
Date: Sat, 10 Mar 2018 15:03:13 +0100
Subject: [PATCH 0414/1382] jsdocs: @return should be @param

---
 types/graphql-resolve-batch/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/graphql-resolve-batch/index.d.ts b/types/graphql-resolve-batch/index.d.ts
index 3818304537..ea90a83555 100644
--- a/types/graphql-resolve-batch/index.d.ts
+++ b/types/graphql-resolve-batch/index.d.ts
@@ -18,7 +18,7 @@
  * @template TReturn The return type of the field resolver.
  * @template TArgs The type of supplied arguments.
  * @template TContext The type of the current resolver context.
- * @returns A batch function to resolve all fields for the given sources in a single batch.
+ * @param batchResolveFn A batch function to resolve all fields for the given sources in a single batch.
  */
 export function createBatchResolver<
     TSource,

From 183fd0a5bcb6c9218a2316310f05f837081ab478 Mon Sep 17 00:00:00 2001
From: Kagami Sascha Rosylight <saschanaz@outlook.com>
Date: Sat, 10 Mar 2018 23:13:14 +0900
Subject: [PATCH 0415/1382] fix(webidl2): idlType is IDLTypeDescription

---
 types/webidl2/index.d.ts       |  2 +-
 types/webidl2/webidl2-tests.ts | 24 ++++++++++++++----------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/types/webidl2/index.d.ts b/types/webidl2/index.d.ts
index 0dd0cc7f10..f3ca7ff3e4 100644
--- a/types/webidl2/index.d.ts
+++ b/types/webidl2/index.d.ts
@@ -219,7 +219,7 @@ export interface ConstantMemberType {
     /** Whether its type is nullable. */
     nullable: boolean;
     /** The type of the constant (a simple type, the type name). */
-    idlType: string;
+    idlType: IDLTypeDescription;
     /** The name of the constant. */
     name: string;
     /** The constant value */
diff --git a/types/webidl2/webidl2-tests.ts b/types/webidl2/webidl2-tests.ts
index 61b437f563..a1c3165edf 100644
--- a/types/webidl2/webidl2-tests.ts
+++ b/types/webidl2/webidl2-tests.ts
@@ -64,23 +64,27 @@ function logMembers(members: webidl2.IDLInterfaceMemberType[]) {
                 break;
             case "const":
                 console.log(member.name);
+                logIdlType(member.idlType);
                 console.log(member.value);
                 console.log(member.nullable);
                 break;
             case "iterable":
                 console.log(member.readonly);
+                member.idlType.forEach(logIdlType);
                 break;
             case "legacyiterable":
                 console.log(member.readonly);
+                member.idlType.forEach(logIdlType);
                 break;
             case "setlike":
                 console.log(member.readonly);
+                member.idlType.forEach(logIdlType);
                 break;
             case "maplike":
                 console.log(member.readonly);
+                member.idlType.forEach(logIdlType);
                 break;
         }
-        logIdlType(member.idlType);
         logExtAttrs(member.extAttrs);
     }
 }
@@ -120,7 +124,13 @@ function logArguments(args: webidl2.Argument[]) {
     }
 }
 
-function logIdlType(idlType: string | webidl2.IDLTypeDescription | webidl2.IDLTypeDescription[] | null) {
+function logIdlType(idlType: webidl2.IDLTypeDescription) {
+    console.log(idlType.type);
+    console.log(idlType.generic, idlType.nullable, idlType.sequence, idlType.union);
+    logSubIdlType(idlType.idlType);
+}
+
+function logSubIdlType(idlType: string | webidl2.IDLTypeDescription | webidl2.IDLTypeDescription[] | null) {
     if (!idlType) {
         return;
     }
@@ -130,15 +140,9 @@ function logIdlType(idlType: string | webidl2.IDLTypeDescription | webidl2.IDLTy
     }
     if (Array.isArray(idlType)) {
         for (const t of idlType) {
-            logEachType(t);
+            logIdlType(t);
         }
         return;
     }
-    logEachType(idlType);
-
-    function logEachType(t: webidl2.IDLTypeDescription) {
-        console.log(t.type);
-        console.log(t.generic, t.nullable, t.sequence, t.union);
-        logIdlType(t.idlType);
-    }
+    logIdlType(idlType);
 }

From b5d5b00450ce1f0090fb5742baf0df5c68c25556 Mon Sep 17 00:00:00 2001
From: kenji_imamura <kenji.imamura@kabuku.co.jp>
Date: Sat, 10 Mar 2018 23:28:34 +0900
Subject: [PATCH 0416/1382] fix: define arguments of ndarray.pick as nullable

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

diff --git a/types/ndarray/index.d.ts b/types/ndarray/index.d.ts
index eb889d31af..039401b6e2 100644
--- a/types/ndarray/index.d.ts
+++ b/types/ndarray/index.d.ts
@@ -24,7 +24,7 @@ interface ndarray<T = number> {
 	hi(...args: number[]): ndarray<T>;
 	step(...args: number[]): ndarray<T>;
 	transpose(...args: number[]): ndarray<T>;
-	pick(...args: number[]): ndarray<T>;
+	pick(...args: Array<number | null>): ndarray<T>;
 	reshape(...shapes: number[]): ndarray<T>;
 	T: ndarray<T>;
 }
diff --git a/types/ndarray/ndarray-tests.ts b/types/ndarray/ndarray-tests.ts
index aa4f4fcefb..09bd7b2f00 100644
--- a/types/ndarray/ndarray-tests.ts
+++ b/types/ndarray/ndarray-tests.ts
@@ -22,3 +22,5 @@ console.log(a.get(0, 0, 0) === 1);
 console.log(a.index(1, 1, 1) === 12);
 
 const b = a.lo(0, 0, 0).hi(1, 1, 1);
+
+a.pick(null, null, 1);

From 721ef0978bc181a8e49d54fb4144b3fb9b11f597 Mon Sep 17 00:00:00 2001
From: Rafael Kallis <rk@rafaelkallis.com>
Date: Sat, 10 Mar 2018 14:55:00 +0000
Subject: [PATCH 0417/1382] Joi: ?error() -> error()

---
 types/joi/index.d.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/joi/index.d.ts b/types/joi/index.d.ts
index 94ffd188cf..6e2b7be6c7 100644
--- a/types/joi/index.d.ts
+++ b/types/joi/index.d.ts
@@ -10,6 +10,7 @@
 //                 Youngrok Kim <https://github.com/rokoroku>
 //                 Dan Kraus <https://github.com/dankraus>
 //                 Anjun Wang <https://github.com/wanganjun>
+//                 Rafael Kallis <https://github.com/rafaelkallis>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
@@ -376,7 +377,7 @@ export interface AnySchema extends JoiObject {
      * override, that error will be returned and the override will be ignored (unless the `abortEarly`
      * option has been set to `false`).
      */
-    error?(err: Error | ValidationErrorFunction): this;
+    error(err: Error | ValidationErrorFunction): this;
 
     /**
      * Returns a plain object representing the schema's rules and properties

From 5702a3378adedba0c8b305eff743798fcedb5c34 Mon Sep 17 00:00:00 2001
From: Jason Dreyzehner <jason@dreyzehner.com>
Date: Sat, 10 Mar 2018 12:31:28 -0500
Subject: [PATCH 0418/1382] execa: options are not required to be mutable

---
 types/execa/execa-tests.ts | 89 +++++++++++++++++++-------------------
 types/execa/index.d.ts     | 45 +++++++++++++++----
 2 files changed, 82 insertions(+), 52 deletions(-)

diff --git a/types/execa/execa-tests.ts b/types/execa/execa-tests.ts
index 2525091f2a..ecc966d3d5 100644
--- a/types/execa/execa-tests.ts
+++ b/types/execa/execa-tests.ts
@@ -1,46 +1,38 @@
 import assert = require('assert');
 import execa = require('execa');
-import { PassThrough } from "stream";
+import { PassThrough } from 'stream';
 
-execa('unicorns')
-    .then(result => {
-        assert(result.cmd === 'unicorns');
-        assert(result.code === 0);
-        assert(result.failed === false);
-        assert(result.killed === false);
-        assert(result.signal === null);
-        assert(result.stderr === 'bad unicorns');
-        assert(result.stdout === 'good unicorns');
-        assert(result.timedOut === false);
-    });
+execa('unicorns').then(result => {
+    assert(result.cmd === 'unicorns');
+    assert(result.code === 0);
+    assert(result.failed === false);
+    assert(result.killed === false);
+    assert(result.signal === null);
+    assert(result.stderr === 'bad unicorns');
+    assert(result.stdout === 'good unicorns');
+    assert(result.timedOut === false);
+});
 
-execa('foo')
-    .catch(error => {
-        assert(error.cmd === 'foo');
-        assert(error.code === 128);
-        assert(error.failed === true);
-        assert(error.killed === false);
-        assert(error.signal === 'SIGINT');
-        assert(error.stderr === 'stderr');
-        assert(error.stdout === 'stdout');
-        assert(error.timedOut === false);
-    });
+execa('foo').catch(error => {
+    assert(error.cmd === 'foo');
+    assert(error.code === 128);
+    assert(error.failed === true);
+    assert(error.killed === false);
+    assert(error.signal === 'SIGINT');
+    assert(error.stderr === 'stderr');
+    assert(error.stdout === 'stdout');
+    assert(error.timedOut === false);
+});
 
-execa('noop', ['foo'])
-    .then(result => result.stderr.toLocaleLowerCase());
+execa('noop', ['foo']).then(result => result.stderr.toLocaleLowerCase());
 
-execa.stdout('unicorns')
-    .then(stdout => stdout.toLocaleLowerCase());
-execa.stdout('echo', ['unicorns'])
-    .then(stdout => stdout.toLocaleLowerCase());
+execa.stdout('unicorns').then(stdout => stdout.toLocaleLowerCase());
+execa.stdout('echo', ['unicorns']).then(stdout => stdout.toLocaleLowerCase());
 
-execa.stderr('unicorns')
-    .then(stderr => stderr.toLocaleLowerCase());
-execa.stderr('echo', ['unicorns'])
-    .then(stderr => stderr.toLocaleLowerCase());
+execa.stderr('unicorns').then(stderr => stderr.toLocaleLowerCase());
+execa.stderr('echo', ['unicorns']).then(stderr => stderr.toLocaleLowerCase());
 
-execa.shell('echo unicorns')
-    .then(result => result.stdout.toLocaleLowerCase());
+execa.shell('echo unicorns').then(result => result.stdout.toLocaleLowerCase());
 
 {
     let result: string;
@@ -54,14 +46,14 @@ execa.shell('echo unicorns')
 execa('echo', ['unicorns']).stdout.pipe(process.stdout);
 execa('echo', ['unicorns']).stderr.pipe(process.stderr);
 
-execa('forever', {extendEnv: false}).pid;
-execa('forever', {argv0: 'hi'}).pid;
-execa('forever', {localDir: '~'}).pid;
-execa('forever', {reject: false}).pid;
-execa('forever', {cleanup: false}).pid;
-execa('forever', {stdin: 1}).pid;
-execa('forever', {stdout: 'ignore'}).pid;
-execa('forever', {stderr: undefined}).pid;
+execa('forever', { extendEnv: false }).pid;
+execa('forever', { argv0: 'hi' }).pid;
+execa('forever', { localDir: '~' }).pid;
+execa('forever', { reject: false }).pid;
+execa('forever', { cleanup: false }).pid;
+execa('forever', { stdin: 1 }).pid;
+execa('forever', { stdout: 'ignore' }).pid;
+execa('forever', { stderr: undefined }).pid;
 
 async () => {
     const { stdout } = await execa('noop', ['foo'], { stripEof: false });
@@ -119,7 +111,9 @@ async () => {
 }
 
 async () => {
-    const { timedOut, code } = await execa('delay', ['3000', '22'], { timeout: 9000 });
+    const { timedOut, code } = await execa('delay', ['3000', '22'], {
+        timeout: 9000
+    });
     assert(timedOut === true);
     assert(code === 22);
 };
@@ -131,3 +125,10 @@ async () => {
 
     assert(stdout === 'foo');
 };
+
+const args: ReadonlyArray<string> = ['bar'];
+const stdio: ReadonlyArray<'ignore'> = ['ignore'];
+execa('foo', args);
+execa('foo', args, {
+    stdio
+});
diff --git a/types/execa/index.d.ts b/types/execa/index.d.ts
index c3aced26ee..f771105736 100644
--- a/types/execa/index.d.ts
+++ b/types/execa/index.d.ts
@@ -23,7 +23,11 @@ declare namespace execa {
          * Think of this as a mix of `child_process.execFile` and `child_process.spawn`.
          * @returns a `child_process` instance which is enhanced to also be a `Promise` for a result `Object` with `stdout` and `stderr` properties.
          */
-        (file: string, args?: string[], options?: Options): ExecaChildProcess;
+        (
+            file: string,
+            args?: ReadonlyArray<string>,
+            options?: Options
+        ): ExecaChildProcess;
         (file: string, options?: Options): ExecaChildProcess;
 
         /**
@@ -32,7 +36,11 @@ declare namespace execa {
          * Think of this as a mix of `child_process.execFile` and `child_process.spawn`.
          * @returns a `child_process` instance which is enhanced to also be a `Promise` for `stdout`.
          */
-        stdout(file: string, args?: string[], options?: Options): Promise<string>;
+        stdout(
+            file: string,
+            args?: ReadonlyArray<string>,
+            options?: Options
+        ): Promise<string>;
         stdout(file: string, options?: Options): Promise<string>;
 
         /**
@@ -41,7 +49,11 @@ declare namespace execa {
          * Think of this as a mix of `child_process.execFile` and `child_process.spawn`.
          * @returns a `child_process` instance which is enhanced to also be a `Promise` for `stderr`.
          */
-        stderr(file: string, args?: string[], options?: Options): Promise<string>;
+        stderr(
+            file: string,
+            args?: ReadonlyArray<string>,
+            options?: Options
+        ): Promise<string>;
         stderr(file: string, options?: Options): Promise<string>;
 
         /**
@@ -59,7 +71,11 @@ declare namespace execa {
          * @returns the same result object as `child_process.spawnSync`.
          * @throws an `Error` if the command fails.
          */
-        sync(file: string, args?: string[], options?: SyncOptions): ExecaReturns;
+        sync(
+            file: string,
+            args?: ReadonlyArray<string>,
+            options?: SyncOptions
+        ): ExecaReturns;
         sync(file: string, options?: SyncOptions): ExecaReturns;
 
         /**
@@ -71,7 +87,14 @@ declare namespace execa {
         shellSync(command: string, options?: Options): ExecaReturns;
     }
 
-    type StdIOOption = 'pipe' | 'ipc' | 'ignore' | Stream | number | null | undefined;
+    type StdIOOption =
+        | 'pipe'
+        | 'ipc'
+        | 'ignore'
+        | Stream
+        | number
+        | null
+        | undefined;
 
     interface CommonOptions {
         /**
@@ -103,7 +126,7 @@ declare namespace execa {
          *
          * @see https://nodejs.org/api/child_process.html#child_process_options_stdio
          */
-        stdio?: 'pipe' | 'ignore' | 'inherit' | StdIOOption[];
+        stdio?: 'pipe' | 'ignore' | 'inherit' | ReadonlyArray<StdIOOption>;
         /**
          * Prepare child to run independently of its parent process.
          * Specific behavior depends on the platform.
@@ -253,10 +276,16 @@ declare namespace execa {
     type ExecaError = Error & ExecaReturns;
 
     interface ExecaChildPromise {
-        catch<TResult = never>(onrejected?: ((reason: ExecaError) => TResult | PromiseLike<TResult>) | null): Promise<ExecaReturns | TResult>;
+        catch<TResult = never>(
+            onrejected?:
+                | ((reason: ExecaError) => TResult | PromiseLike<TResult>)
+                | null
+        ): Promise<ExecaReturns | TResult>;
     }
 
-    type ExecaChildProcess = ChildProcess & ExecaChildPromise & Promise<ExecaReturns>;
+    type ExecaChildProcess = ChildProcess &
+        ExecaChildPromise &
+        Promise<ExecaReturns>;
 }
 
 declare var execa: execa.ExecaStatic;

From f5a5393e685ceec3132eb7471a2096555381772a Mon Sep 17 00:00:00 2001
From: Jason Dreyzehner <jason@dreyzehner.com>
Date: Sat, 10 Mar 2018 12:59:48 -0500
Subject: [PATCH 0419/1382] execa: add missing 'inherit' to StdIOOption

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

diff --git a/types/execa/index.d.ts b/types/execa/index.d.ts
index f771105736..992d046a03 100644
--- a/types/execa/index.d.ts
+++ b/types/execa/index.d.ts
@@ -91,6 +91,7 @@ declare namespace execa {
         | 'pipe'
         | 'ipc'
         | 'ignore'
+        | 'inherit'
         | Stream
         | number
         | null

From 2249f0eb21db02b2984ac52dfd857f00c9caa84e Mon Sep 17 00:00:00 2001
From: Jason Dreyzehner <jason@dreyzehner.com>
Date: Sat, 10 Mar 2018 13:04:24 -0500
Subject: [PATCH 0420/1382] execa: bump version

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

diff --git a/types/execa/index.d.ts b/types/execa/index.d.ts
index 992d046a03..067d36c368 100644
--- a/types/execa/index.d.ts
+++ b/types/execa/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for execa 0.8
+// Type definitions for execa 0.9
 // Project: https://github.com/sindresorhus/execa#readme
 // Definitions by: Douglas Duteil <https://github.com/douglasduteil>
 //                 BendingBender <https://github.com/BendingBender>

From f9083401863c617d17f5703d66f89dc55dd752b1 Mon Sep 17 00:00:00 2001
From: Rasmus Eneman <rse@learningwell.se>
Date: Fri, 1 Dec 2017 14:30:39 +0100
Subject: [PATCH 0421/1382] [recompose]: Improve type inference of withHandlers

I went ahead and added the correspondeing tests on withStateHandlers as well to make sure it also works as expected
---
 types/recompose/index.d.ts          | 23 +++++++++++---
 types/recompose/recompose-tests.tsx | 48 +++++++++++++++++++++++++++--
 2 files changed, 63 insertions(+), 8 deletions(-)

diff --git a/types/recompose/index.d.ts b/types/recompose/index.d.ts
index edff2061b5..c057521570 100644
--- a/types/recompose/index.d.ts
+++ b/types/recompose/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: Iskander Sierra <https://github.com/iskandersierra>
 //                 Samuel DeSota <https://github.com/mrapogee>
 //                 Curtis Layne <https://github.com/clayne11>
+//                 Rasmus Eneman <https://github.com/Pajn>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -78,13 +79,25 @@ declare module 'recompose' {
 
     // withHandlers: https://github.com/acdlite/recompose/blob/master/docs/API.md#withhandlers
     type EventHandler = Function;
-    type HandleCreators<TOutter, THandlers> = {
-        [handlerName in keyof THandlers]: mapper<TOutter, EventHandler>;
+    // This type is required to infer TOutter
+    type HandleCreatorsStructure<TOutter> = {
+        [handlerName: string]: mapper<TOutter, EventHandler>;
     };
-    type HandleCreatorsFactory<TOutter, THandlers> = (initialProps: TOutter) => HandleCreators<TOutter, THandlers>;
+    // This type is required to infer THandlers
+    type HandleCreatorsHandlers<TOutter, THandlers> = {
+        [P in keyof THandlers]: (props: TOutter) => THandlers[P];
+    };
+    type HandleCreators<TOutter, THandlers> =
+        & HandleCreatorsStructure<TOutter>
+        & HandleCreatorsHandlers<TOutter, THandlers>
+    type HandleCreatorsFactory<TOutter, THandlers> = (initialProps: TOutter) =>
+        HandleCreators<TOutter, THandlers>;
+
     export function withHandlers<TOutter, THandlers>(
-        handlerCreators: HandleCreators<TOutter, THandlers> | HandleCreatorsFactory<TOutter, THandlers>
-    ): InferableComponentEnhancerWithProps<TOutter & THandlers, TOutter>;
+        handlerCreators:
+            | HandleCreators<TOutter, THandlers>
+            | HandleCreatorsFactory<TOutter, THandlers>
+    ): InferableComponentEnhancerWithProps<THandlers & TOutter, TOutter>;
 
     // defaultProps: https://github.com/acdlite/recompose/blob/master/docs/API.md#defaultprops
     export function defaultProps<T = {}>(
diff --git a/types/recompose/recompose-tests.tsx b/types/recompose/recompose-tests.tsx
index 1504ab563a..c239cbacb1 100644
--- a/types/recompose/recompose-tests.tsx
+++ b/types/recompose/recompose-tests.tsx
@@ -120,10 +120,35 @@ function testWithHandlers() {
         />
     )
 
-    const handlerNameTypecheckProof = withHandlers<OutterProps, HandlerProps>({
+    const handlerNameTypecheckProof = withHandlers<OutterProps, HandlerProps>({ // $ExpectError
       onChange: () => () => {},
-      notAKeyOnHandlerProps: () => () => {},  // $ExpectError
+      notAKeyOnHandlerProps: () => () => {},
     });
+
+    // The inner props should be fully inferrable
+    const enhancer3 = withHandlers({
+      onChange: (props: OutterProps) => (e: any) => {},
+      onSubmit: (props: OutterProps) => (e: React.MouseEvent<any>) => {},
+    });
+    const Enhanced3 = enhancer3(({onChange, onSubmit, out}) =>
+        <div onClick={onSubmit}>{out}</div>);
+    const rendered3 = (
+        <Enhanced3
+            out={42}
+        />
+    )
+
+    const enhancer4 = withHandlers((props: OutterProps) => ({
+      onChange: (props) => (e: any) => {},
+      onSubmit: (props) => (e: React.MouseEvent<any>) => {},
+    }));
+    const Enhanced4 = enhancer4(({onChange, onSubmit, out}) =>
+        <div onClick={onSubmit}>{out}</div>);
+    const rendered4 = (
+        <Enhanced4
+            out={42}
+        />
+    )
 }
 
 function testDefaultProps() {
@@ -220,7 +245,24 @@ function testWithStateHandlers() {
         (props: OutterProps) => ({ counter: props.initialCounter }),
         { notAKeyOfUpdaters: (state, props) => n => ({ ...state, counter: state.counter + n ** props.power }), }, // $ExpectError
     );
-  }
+
+    // The inner props should be fully inferrable
+    const enhancer2 = withStateHandlers(
+        (props: OutterProps) => ({ counter: props.initialCounter }),
+        {
+            add: (state, props) => n => ({ ...state, counter: state.counter + n ** props.power }),
+        },
+    );
+    const Enhanced2 = enhancer((props) =>
+        <div>
+            <div>{`Counts from: ${props.initialCounter}`}</div>
+            <div>{`Counter: ${props.counter}`}</div>
+            <div onClick={() => props.add(2)}></div>
+        </div>);
+    const rendered2 = (
+        <Enhanced initialCounter={4} power={2} />
+    );
+}
 
 function testWithReducer() {
     interface State { count: number }

From 937cfc12f154b970b6dca28bfa9e2dca0f407682 Mon Sep 17 00:00:00 2001
From: Huw Martin <huwmartin@deloitte.co.uk>
Date: Sat, 10 Mar 2018 16:48:33 +0000
Subject: [PATCH 0422/1382] [redux-test-utils] typing for version 0.2

Add type definitions for redux-test-utils
---
 types/redux-test-utils/index.d.ts             | 23 ++++++++++++
 types/redux-test-utils/package.json           |  6 +++
 .../redux-test-utils-tests.ts                 | 37 +++++++++++++++++++
 types/redux-test-utils/tsconfig.json          | 23 ++++++++++++
 types/redux-test-utils/tslint.json            |  1 +
 5 files changed, 90 insertions(+)
 create mode 100644 types/redux-test-utils/index.d.ts
 create mode 100644 types/redux-test-utils/package.json
 create mode 100644 types/redux-test-utils/redux-test-utils-tests.ts
 create mode 100644 types/redux-test-utils/tsconfig.json
 create mode 100644 types/redux-test-utils/tslint.json

diff --git a/types/redux-test-utils/index.d.ts b/types/redux-test-utils/index.d.ts
new file mode 100644
index 0000000000..2c5a36e441
--- /dev/null
+++ b/types/redux-test-utils/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for redux-test-utils 0.2
+// Project: https://github.com/Knegusen/redux-test-utils#readme
+// Definitions by: Huw Martin <https://github.com/huwmartin>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { AnyAction, Store, Dispatch } from 'redux';
+
+export function createMockStore(
+  state?: any
+): mockStore<any>;
+
+export function createMockDispatch(): mockDispatch<any>;
+
+export interface mockStore<S> extends Store<S>, mockDispatch<S> {}
+
+export interface mockDispatch<S> {
+  dispatch: Dispatch<S>;
+  getActions: () => AnyAction[];
+  getAction: (type: any) => AnyAction | undefined;
+  isActionTypeDispatched: (type: any) => boolean;
+  isActionDispatched: (action: AnyAction) => boolean;
+}
diff --git a/types/redux-test-utils/package.json b/types/redux-test-utils/package.json
new file mode 100644
index 0000000000..6d68bf2f9b
--- /dev/null
+++ b/types/redux-test-utils/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "redux": "^3.6.0"
+    }
+}
diff --git a/types/redux-test-utils/redux-test-utils-tests.ts b/types/redux-test-utils/redux-test-utils-tests.ts
new file mode 100644
index 0000000000..9fc8df2c13
--- /dev/null
+++ b/types/redux-test-utils/redux-test-utils-tests.ts
@@ -0,0 +1,37 @@
+import * as chai from 'chai';
+
+import { createMockStore, createMockDispatch } from 'redux-test-utils';
+
+const expect = chai.expect;
+const assert = chai.assert;
+
+function test_creatMockStore() {
+  const state = 'state';
+  const store = createMockStore(state);
+  const action = {
+    type: 'type',
+    data: 'data'
+  };
+  store.dispatch(action);
+
+  expect(store.getAction(action.type)).to.equal(action);
+  expect(store.getActions()).to.equal([action]);
+  expect(store.isActionDispatched(action)).to.be.true;
+  expect(store.isActionTypeDispatched(action.type)).to.be.true;
+  expect(store.getState()).to.be(state);
+}
+
+function test_createMockDispatch() {
+  const state = 'state';
+  const dispatchMock = createMockDispatch();
+  const action = {
+    type: 'type',
+    data: 'data',
+  };
+  dispatchMock.dispatch(action);
+
+  expect(dispatchMock.getAction(action.type)).to.equal(action);
+  expect(dispatchMock.getActions()).to.equal([action]);
+  expect(dispatchMock.isActionDispatched(action)).to.be.true;
+  expect(dispatchMock.isActionTypeDispatched(action.type)).to.be.true;
+}
diff --git a/types/redux-test-utils/tsconfig.json b/types/redux-test-utils/tsconfig.json
new file mode 100644
index 0000000000..5b074d5fa2
--- /dev/null
+++ b/types/redux-test-utils/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "redux-test-utils-tests.ts"
+    ]
+}
diff --git a/types/redux-test-utils/tslint.json b/types/redux-test-utils/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/redux-test-utils/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 465b54ad74801d117ab4bcebcc3df58bb896b93f Mon Sep 17 00:00:00 2001
From: abrahambotros <abrahambotros@gmail.com>
Date: Sat, 10 Mar 2018 15:41:13 -0800
Subject: [PATCH 0423/1382] Remove self (abrahambotros) from contributor list

---
 types/react-native-video/index.d.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/types/react-native-video/index.d.ts b/types/react-native-video/index.d.ts
index 5353ea6de7..3ca2dc80fb 100644
--- a/types/react-native-video/index.d.ts
+++ b/types/react-native-video/index.d.ts
@@ -1,7 +1,6 @@
 // Type definitions for react-native-video 2.0
 // Project: https://github.com/react-native-community/react-native-video
 // Definitions by: HuHuanming <https://github.com/huhuanming>
-//                 abrahambotros <https://github.com/abrahambotros>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 

From edea86b3f428ff4826216bad394b3ff2d54b47d4 Mon Sep 17 00:00:00 2001
From: abrahambotros <abrahambotros@gmail.com>
Date: Sat, 10 Mar 2018 15:46:05 -0800
Subject: [PATCH 0424/1382] Remove self (abrahambotros) from contributor list

---
 types/react-navigation/index.d.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index c4e396783f..27f38a4dc9 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Huhuanming <https://github.com/huhuanming>
 //                 mhcgrq <https://github.com/mhcgrq>
 //                 fangpenlin <https://github.com/fangpenlin>
-//                 abrahambotros <https://github.com/abrahambotros>
 //                 petejkim <https://github.com/petejkim>
 //                 Kyle Roach <https://github.com/iRoachie>
 //                 phanalpha <https://github.com/phanalpha>

From f7682be37fe3a1ad3f5bae2628fbf4c66329c1ac Mon Sep 17 00:00:00 2001
From: Kagami Sascha Rosylight <saschanaz@outlook.com>
Date: Sun, 11 Mar 2018 11:30:45 +0900
Subject: [PATCH 0425/1382] update idl type documentation

---
 types/webidl2/index.d.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/types/webidl2/index.d.ts b/types/webidl2/index.d.ts
index f3ca7ff3e4..a31fa3550e 100644
--- a/types/webidl2/index.d.ts
+++ b/types/webidl2/index.d.ts
@@ -33,7 +33,8 @@ export interface WebIDLParseError {
 
 // tslint:disable-next-line interface-name
 export interface IDLTypeDescription {
-    type: string;
+    /** String indicating where this type is used. Can be null if not applicable. */
+    type: string | null;
     /** Boolean indicating if it is a sequence. Same as generic === "sequence" */
     sequence: boolean;
     /** String indicating the generic type (e.g. "Promise", "sequence"). null otherwise. */
@@ -218,7 +219,7 @@ export interface ConstantMemberType {
     type: "const";
     /** Whether its type is nullable. */
     nullable: boolean;
-    /** The type of the constant (a simple type, the type name). */
+    /** An IDL Type of the constant that represents a simple type, the type name. */
     idlType: IDLTypeDescription;
     /** The name of the constant. */
     name: string;

From 61543a66a2618497916deb72e623a64beda7c948 Mon Sep 17 00:00:00 2001
From: Eric Eslinger <eric.eslinger@gmail.com>
Date: Sat, 10 Mar 2018 19:59:16 -0800
Subject: [PATCH 0426/1382] Allow `true` as a cors option

Per the hapi documentation, setting `cors: true` is allowed, and will do default cors-ing.

[ref](https://hapijs.com/api#-routeoptionscors)
---
 types/hapi/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/hapi/index.d.ts b/types/hapi/index.d.ts
index 210e1cc332..6abfbefe87 100644
--- a/types/hapi/index.d.ts
+++ b/types/hapi/index.d.ts
@@ -1706,7 +1706,7 @@ export interface RouteOptions {
      * * credentials - if true, allows user credentials to be sent ('Access-Control-Allow-Credentials'). Defaults to false.
      * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionscors)
      */
-    cors?: false | RouteOptionsCors;
+    cors?: boolean | RouteOptionsCors;
 
     /**
      * Default value: none.

From 597f968b18c55406938f09da3f91c2112bd93529 Mon Sep 17 00:00:00 2001
From: AndersonFriaca <afriacaxd@gmail.com>
Date: Sun, 11 Mar 2018 00:17:11 -0400
Subject: [PATCH 0427/1382] Types for JQuery Browser Plugin

---
 types/jquery.browser/index.d.ts              | 47 ++++++++++++++++++++
 types/jquery.browser/jquery.browser-tests.ts |  7 +++
 types/jquery.browser/tsconfig.json           | 25 +++++++++++
 types/jquery.browser/tslint.json             |  1 +
 4 files changed, 80 insertions(+)
 create mode 100644 types/jquery.browser/index.d.ts
 create mode 100644 types/jquery.browser/jquery.browser-tests.ts
 create mode 100644 types/jquery.browser/tsconfig.json
 create mode 100644 types/jquery.browser/tslint.json

diff --git a/types/jquery.browser/index.d.ts b/types/jquery.browser/index.d.ts
new file mode 100644
index 0000000000..01141b67db
--- /dev/null
+++ b/types/jquery.browser/index.d.ts
@@ -0,0 +1,47 @@
+// Type definitions for jQuery Browser Plugin 0.1
+// Project: https://github.com/gabceb/jquery-browser-plugin
+// Definitions by: Anderson Friaça <https://github.com/AndersonFriaca>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="jquery" />
+
+export interface Matchs {
+    version?: string;
+    versionNumber?: number;
+    platform?: string;
+    mobile?: boolean;
+    desktop?: boolean;
+    webkit?: boolean;
+    name?: string;
+    android?: boolean;
+    bb?: boolean;
+    blackberry?: boolean;
+    ipad?: boolean;
+    iphone?: boolean;
+    ipod?: boolean;
+    kindle?: boolean;
+    playbook?: boolean;
+    silk?: boolean;
+    ['windows phone']?: boolean;
+    cros?: boolean;
+    mac?: boolean;
+    linux?: boolean;
+    win?: boolean;
+    chrome?: boolean;
+    opr?: boolean;
+    safari?: boolean;
+    rv?: boolean;
+    iemobile?: boolean;
+    msie?: boolean;
+    msedge?: boolean;
+    uaMatch: ((ua?: string) => Matchs);
+}
+declare global {
+    interface Window {
+        jQBrowser: Matchs;
+    }
+    interface JQueryStatic {
+        browser: Matchs;
+    }
+}
diff --git a/types/jquery.browser/jquery.browser-tests.ts b/types/jquery.browser/jquery.browser-tests.ts
new file mode 100644
index 0000000000..aacc014524
--- /dev/null
+++ b/types/jquery.browser/jquery.browser-tests.ts
@@ -0,0 +1,7 @@
+// basic usage
+$.browser;
+$.browser.android;
+$.browser.uaMatch();
+window.jQBrowser;
+window.jQBrowser.android;
+window.jQBrowser.uaMatch();
diff --git a/types/jquery.browser/tsconfig.json b/types/jquery.browser/tsconfig.json
new file mode 100644
index 0000000000..89c26d12bb
--- /dev/null
+++ b/types/jquery.browser/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "esModuleInterop": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.browser-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/jquery.browser/tslint.json b/types/jquery.browser/tslint.json
new file mode 100644
index 0000000000..d04fe2e1fa
--- /dev/null
+++ b/types/jquery.browser/tslint.json
@@ -0,0 +1 @@
+{"extends": "dtslint/dt.json"}
\ No newline at end of file

From 4d75110d7c886e21565488e6a577933ad644f5a1 Mon Sep 17 00:00:00 2001
From: Ragg <Ragg-@users.noreply.github.com>
Date: Sun, 11 Mar 2018 15:12:29 +0900
Subject: [PATCH 0428/1382] Enable `esModuleInterop`

---
 types/dispatchr/tsconfig.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/dispatchr/tsconfig.json b/types/dispatchr/tsconfig.json
index 47109880da..e94ec73c3c 100644
--- a/types/dispatchr/tsconfig.json
+++ b/types/dispatchr/tsconfig.json
@@ -8,6 +8,7 @@
         "noImplicitThis": true,
         "strictNullChecks": true,
         "strictFunctionTypes": true,
+        "esModuleInterop": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"

From 148fcdadb0014088ad353aa6e4f29caa6eb38398 Mon Sep 17 00:00:00 2001
From: Martin Feckie <mfeckie@gmail.com>
Date: Sun, 11 Mar 2018 18:56:58 +1100
Subject: [PATCH 0429/1382] Allow router service methods without models and add
 some tests

---
 types/ember/index.d.ts     |  5 +++++
 types/ember/test/router.ts | 18 ++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/types/ember/index.d.ts b/types/ember/index.d.ts
index a89d6bcc6f..dd3ed1ec64 100755
--- a/types/ember/index.d.ts
+++ b/types/ember/index.d.ts
@@ -2078,6 +2078,7 @@ declare module 'ember' {
              * Transition the application into another route. The route may
              * be either a single route or route path:
              */
+            transitionTo(name: string, options?: {}): Transition;
             transitionTo(name: string, ...models: any[]): Transition;
             transitionTo(name: string, options: {}): Transition;
         }
@@ -3305,6 +3306,7 @@ declare module 'ember' {
          * @param options   optional hash with a queryParams property containing a
          *                  mapping of query parameters
          */
+        isActive(routeName: string, options?: { queryParams: object }): boolean;
         isActive(routeName: string, models: RouteModel, options?: { queryParams: object }): boolean;
         isActive(routeName: string, modelsA: RouteModel, modelsB: RouteModel, options?: { queryParams: object }): boolean;
         isActive(routeName: string, modelsA: RouteModel, modelsB: RouteModel, modelsC: RouteModel, options?: { queryParams: object }): boolean;
@@ -3322,6 +3324,7 @@ declare module 'ember' {
          *                       containing a mapping of query parameters
          * @returns              the Transition object associated with this attempted transition
          */
+        replaceWith(routeNameOrUrl: string, options?: { queryParams: object }): Ember.Transition;
         replaceWith(routeNameOrUrl: string, models: RouteModel, options?: { queryParams: object }): Ember.Transition;
         replaceWith(routeNameOrUrl: string, modelsA: RouteModel, modelsB: RouteModel, options?: { queryParams: object }): Ember.Transition;
         replaceWith(routeNameOrUrl: string, modelsA: RouteModel, modelsB: RouteModel, modelsC: RouteModel, options?: { queryParams: object }): Ember.Transition;
@@ -3339,6 +3342,7 @@ declare module 'ember' {
          *                       containing a mapping of query parameters
          * @returns              the Transition object associated with this attempted transition
          */
+        transitionTo(routeNameOrUrl: string, options?: { queryParam: object }): Ember.Transition;
         transitionTo(routeNameOrUrl: string, models: RouteModel, options?: { queryParams: object }): Ember.Transition;
         transitionTo(routeNameOrUrl: string, modelsA: RouteModel, modelsB: RouteModel, options?: { queryParams: object }): Ember.Transition;
         transitionTo(routeNameOrUrl: string, modelsA: RouteModel, modelsB: RouteModel, modelsC: RouteModel, options?: { queryParams: object }): Ember.Transition;
@@ -3355,6 +3359,7 @@ declare module 'ember' {
          *                  a mapping of query parameters
          * @returns         the string representing the generated URL
          */
+        urlFor(routeName: string, options?: { queryParams: object }): string;
         urlFor(routeName: string, models: RouteModel, options?: { queryParams: object }): string;
         urlFor(routeName: string, modelsA: RouteModel, modelsB: RouteModel, options?: { queryParams: object }): string;
         urlFor(routeName: string, modelsA: RouteModel, modelsB: RouteModel, modelsC: RouteModel, options?: { queryParams: object }): string;
diff --git a/types/ember/test/router.ts b/types/ember/test/router.ts
index 9ec79ce281..c663083679 100755
--- a/types/ember/test/router.ts
+++ b/types/ember/test/router.ts
@@ -22,3 +22,21 @@ AppRouter.map(function() {
     this.mount('my-engine');
     this.mount('my-engine', { as: 'some-other-engine', path: '/some-other-engine'});
 });
+
+const RouterServiceConsumer = Ember.Service.extend({
+    router: Ember.inject.service('router'),
+    transitionWithoutModel() {
+        Ember.get(this, 'router')
+        .transitionTo('some-route');
+    },
+    transitionWithModel() {
+        const model = Ember.Object.create();
+        Ember.get(this, 'router')
+        .transitionTo('some.other.route', model);
+    },
+    transitionWithModelAndOptions() {
+        const model = Ember.Object.create();
+        Ember.get(this, 'router')
+        .transitionTo('index', model, { queryParams: { search: 'ember' }});
+    }
+});

From 57964d8b0cef033437717a01b92a0952b1ff2dd8 Mon Sep 17 00:00:00 2001
From: Martin Feckie <mfeckie@gmail.com>
Date: Sun, 11 Mar 2018 19:54:25 +1100
Subject: [PATCH 0430/1382] Add typing for .changedAttributes()

---
 types/ember-data/index.d.ts    | 5 ++++-
 types/ember-data/test/model.ts | 6 +++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/types/ember-data/index.d.ts b/types/ember-data/index.d.ts
index 7b78770489..9eec5ed467 100644
--- a/types/ember-data/index.d.ts
+++ b/types/ember-data/index.d.ts
@@ -23,6 +23,9 @@ declare module 'ember-data' {
     type AttributesFor<Model> = keyof Model; // TODO: filter to attr properties only (TS 2.8)
     type RelationshipsFor<Model> = keyof Model; // TODO: filter to hasMany/belongsTo properties only (TS 2.8)
 
+    export interface ChangedAttributes {
+        [key: string]: [any, any] | undefined;
+    }
     interface AttributeMeta<Model extends DS.Model> {
         type: keyof TransformRegistry;
         options: object;
@@ -500,7 +503,7 @@ declare module 'ember-data' {
              * Returns an object, whose keys are changed properties, and value is
              * an [oldProp, newProp] array.
              */
-            changedAttributes(): {};
+            changedAttributes(): ChangedAttributes;
             /**
              * If the model `hasDirtyAttributes` this function will discard any unsaved
              * changes. If the model `isNew` it will be removed from the store.
diff --git a/types/ember-data/test/model.ts b/types/ember-data/test/model.ts
index a18167dbee..63bda2588e 100644
--- a/types/ember-data/test/model.ts
+++ b/types/ember-data/test/model.ts
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import DS from 'ember-data';
+import DS, { ChangedAttributes } from 'ember-data';
 import { assertType } from "./lib/assert";
 
 const Person = DS.Model.extend({
@@ -30,3 +30,7 @@ assertType<Date>(user.get('createdAt'));
 
 user.serialize();
 user.serialize({ includeId: true });
+user.serialize({ includeId: true });
+
+const attributes = user.changedAttributes();
+assertType<ChangedAttributes>(attributes);

From a959f414dd42df8b1d2b7985081e324e5bcda153 Mon Sep 17 00:00:00 2001
From: Hum3 <horacioriverods@gmail.com>
Date: Sun, 11 Mar 2018 08:57:10 -0300
Subject: [PATCH 0431/1382] little change

`import { router, get, ServerRequest, ServerResponse } from 'microrouter';
const notfound = (req: ServerRequest, res: ServerResponse) => send(res, 404, 'Not found route');
export default router(
    get('/', notfound)`
);
---
 types/microrouter/index.d.ts | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/types/microrouter/index.d.ts b/types/microrouter/index.d.ts
index 6d65adc8a1..934affd630 100644
--- a/types/microrouter/index.d.ts
+++ b/types/microrouter/index.d.ts
@@ -8,12 +8,13 @@
 
 import { IncomingMessage, ServerResponse, Server } from 'http';
 import { RequestHandler } from 'micro';
-
+export type ServerResponse = ServerResponse;
+export type ServerRequest = IncomingMessage & {
+    params: { [key: string]: string },
+    query: { [key: string]: string }
+};
 export type AugmentedRequestHandler = (
-    req: IncomingMessage & {
-        params: {[key: string]: string},
-        query: {[key: string]: string}
-    },
+    req: ServerRequest,
     res: ServerResponse
 ) => any;
 

From 6ddadc78a618a9e0ba5c6632e7f32a2f40f5b99d Mon Sep 17 00:00:00 2001
From: Bukurov Alex <abukurov@hwdtech.ru>
Date: Thu, 1 Mar 2018 12:38:51 +0600
Subject: [PATCH 0432/1382] [rosie] Update "attributes" method definitions

---
 types/rosie/index.d.ts     | 8 +++++---
 types/rosie/rosie-tests.ts | 2 ++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/types/rosie/index.d.ts b/types/rosie/index.d.ts
index 51728127ea..1078b53573 100644
--- a/types/rosie/index.d.ts
+++ b/types/rosie/index.d.ts
@@ -1,6 +1,8 @@
 // Type definitions for rosie
 // Project: https://github.com/rosiejs/rosie
-// Definitions by: Abner Oliveira <https://github.com/abner>, Chris Grigg <https://github.com/subvertallchris>
+// Definitions by: Abner Oliveira <https://github.com/abner>,
+//                 Chris Grigg <https://github.com/subvertallchris>,
+//                 Alex Bukurov <https://github.com/abukurov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -191,7 +193,7 @@ declare namespace rosie {
      * @param {object=} options
      * @return {object}
      */
-    attributes(attributes: string, options?: { [k in keyof T]: T[k] }): T;
+    attributes(attributes?: { [k in keyof T]?: T[k] }, options?: any): T;
 
     /**
      * Generates values for all the registered options using the values given.
@@ -230,4 +232,4 @@ declare namespace rosie {
 declare var rosie: { Factory: rosie.IFactoryStatic };
 
 export = rosie;
-export as namespace Factory;
\ No newline at end of file
+export as namespace Factory;
diff --git a/types/rosie/rosie-tests.ts b/types/rosie/rosie-tests.ts
index 8d7c6d83b8..6c2152a9e7 100644
--- a/types/rosie/rosie-tests.ts
+++ b/types/rosie/rosie-tests.ts
@@ -47,10 +47,12 @@ const personFactory = Factory.define<Person>('Person').attr('firstName', 'John')
 // Building does not require the first (attributes) and second (options) arguments
 personFactory.build();
 personFactory.buildList(3);
+personFactory.attributes();
 
 // Building with attributes does not require the second (options) argument
 personFactory.build({ firstName: "John" });
 personFactory.buildList(3, { firstName: "John" });
+personFactory.attributes({ firstName: "John" });
 
 // It will automatically type up to five dependencies
 personFactory.attr('fullName', ['firstName'], firstName => firstName);

From d4d064b7c57f3feddfe25a417bed0cdf70ea214f Mon Sep 17 00:00:00 2001
From: orblazer <orblazer@relonar.fr>
Date: Sun, 11 Mar 2018 14:32:47 +0100
Subject: [PATCH 0433/1382] Fix "this" context on "on" functions

---
 types/ws/index.d.ts | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/types/ws/index.d.ts b/types/ws/index.d.ts
index 303dcc3875..fbfc3713c3 100644
--- a/types/ws/index.d.ts
+++ b/types/ws/index.d.ts
@@ -67,14 +67,14 @@ declare class WebSocket extends events.EventEmitter {
     removeEventListener(method: string, listener?: () => void): void;
 
     // Events
-    on(event: 'close', listener: (code: number, reason: string) => void): this;
-    on(event: 'error', listener: (err: Error) => void): this;
-    on(event: 'upgrade', listener: (request: http.IncomingMessage) => void): this;
-    on(event: 'message', listener: (data: WebSocket.Data) => void): this;
-    on(event: 'open' , listener: () => void): this;
-    on(event: 'ping' | 'pong', listener: (data: Buffer) => void): this;
-    on(event: 'unexpected-response', listener: (request: http.ClientRequest, response: http.IncomingMessage) => void): this;
-    on(event: string | symbol, listener: (...args: any[]) => void): this;
+    on(event: 'close', listener: (this: WebSocket, code: number, reason: string) => void): this;
+    on(event: 'error', listener: (this: WebSocket, err: Error) => void): this;
+    on(event: 'upgrade', listener: (this: WebSocket, request: http.IncomingMessage) => void): this;
+    on(event: 'message', listener: (this: WebSocket, data: WebSocket.Data) => void): this;
+    on(event: 'open' , listener: (this: WebSocket) => void): this;
+    on(event: 'ping' | 'pong', listener: (this: WebSocket, data: Buffer) => void): this;
+    on(event: 'unexpected-response', listener: (this: WebSocket, request: http.ClientRequest, response: http.IncomingMessage) => void): this;
+    on(event: string | symbol, listener: (this: WebSocket, ...args: any[]) => void): this;
 
     addListener(event: 'close', listener: (code: number, message: string) => void): this;
     addListener(event: 'error', listener: (err: Error) => void): this;
@@ -181,11 +181,11 @@ declare namespace WebSocket {
         shouldHandle(request: http.IncomingMessage): boolean;
 
         // Events
-        on(event: 'connection', cb: (socket: WebSocket, request: http.IncomingMessage) => void): this;
-        on(event: 'error', cb: (error: Error) => void): this;
-        on(event: 'headers', cb: (headers: string[], request: http.IncomingMessage) => void): this;
-        on(event: 'listening', cb: () => void): this;
-        on(event: string | symbol, listener: (...args: any[]) => void): this;
+        on(event: 'connection', cb: (this: WebSocket, socket: WebSocket, request: http.IncomingMessage) => void): this;
+        on(event: 'error', cb: (this: WebSocket, error: Error) => void): this;
+        on(event: 'headers', cb: (this: WebSocket, headers: string[], request: http.IncomingMessage) => void): this;
+        on(event: 'listening', cb: (this: WebSocket) => void): this;
+        on(event: string | symbol, listener: (this: WebSocket, ...args: any[]) => void): this;
 
         addListener(event: 'connection', cb: (client: WebSocket) => void): this;
         addListener(event: 'error', cb: (err: Error) => void): this;

From 15412bfd248a0efdafd8aa6641c74128d6eb5406 Mon Sep 17 00:00:00 2001
From: orblazer <orblazer@relonar.fr>
Date: Sun, 11 Mar 2018 14:36:07 +0100
Subject: [PATCH 0434/1382] Add missing contribution

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

diff --git a/types/ws/index.d.ts b/types/ws/index.d.ts
index fbfc3713c3..7848bf3992 100644
--- a/types/ws/index.d.ts
+++ b/types/ws/index.d.ts
@@ -4,6 +4,7 @@
 //                 Matt Silverlock <https://github.com/elithrar>
 //                 Margus Lamp <https://github.com/mlamp>
 //                 Philippe D'Alva <https://github.com/TitaneBoy>
+//                 Orblazer <https://github.com/orblazer>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />

From 6596fb459bf117117167dbf4eaa9684e59f092b2 Mon Sep 17 00:00:00 2001
From: kobanyan <kobanyan@users.noreply.github.com>
Date: Mon, 12 Mar 2018 01:26:35 +0900
Subject: [PATCH 0435/1382] [sinon-chrome] Support plugins

---
 types/sinon-chrome/index.d.ts            | 20 ++++++++++
 types/sinon-chrome/sinon-chrome-tests.ts | 47 ++++++++++++++++++++++++
 2 files changed, 67 insertions(+)

diff --git a/types/sinon-chrome/index.d.ts b/types/sinon-chrome/index.d.ts
index 67614ff6bc..d7fd948c63 100644
--- a/types/sinon-chrome/index.d.ts
+++ b/types/sinon-chrome/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/vitalets/sinon-chrome
 // Definitions by: Tim Perry <https://github.com/pimterry>
 //                 CRIMX <https://github.com/crimx>
+//                 kobanyan <https://github.com/kobanyan>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
@@ -37,6 +38,8 @@ declare namespace SinonChrome {
      */
     export function reset(): void;
 
+    export function registerPlugin(plugin: SinonChrome.plugins.Plugin): void;
+
     export var csi: Sinon.SinonSpy;
     export var loadTimes: Sinon.SinonSpy;
 }
@@ -353,6 +356,23 @@ declare namespace SinonChrome.permissions {
     export var request: SinonChromeStub;
 }
 
+declare namespace SinonChrome.plugins {
+    export interface Plugin {}
+    export interface Translation {
+        message: string;
+        placeholders?: object;
+    }
+    export interface Translations {
+        [key: string]: Translation;
+    }
+    export class I18nPlugin implements Plugin {
+        constructor(translations: Translations);
+    }
+    export class CookiePlugin implements Plugin {
+        constructor(state?: Array<chrome.cookies.Cookie>);
+    }
+}
+
 declare namespace SinonChrome.power {
     export var releaseKeepAwake: SinonChromeStub;
     export var requestKeepAwake: SinonChromeStub;
diff --git a/types/sinon-chrome/sinon-chrome-tests.ts b/types/sinon-chrome/sinon-chrome-tests.ts
index 58639b8a65..7ae8a3f862 100644
--- a/types/sinon-chrome/sinon-chrome-tests.ts
+++ b/types/sinon-chrome/sinon-chrome-tests.ts
@@ -32,3 +32,50 @@ var id: string = chromeStub.runtime.id;
 
 chromeStub.proxy.settings.set({value: { }, scope: 'regular'});
 chromeStub.proxy.settings.onChange.trigger();
+
+chromeStub.registerPlugin(new chromeStub.plugins.I18nPlugin({
+    one: {
+        message: 'Hi!'
+    },
+    two: {
+        message: 'Hi $first_name$ $last_name$!',
+        placeholders: {
+            first_name: {
+                content: '$1'
+            },
+            last_name: {
+                content: '$2'
+            }
+        }
+    }
+}));
+
+chromeStub.registerPlugin(new chromeStub.plugins.CookiePlugin());
+
+chromeStub.registerPlugin(new chromeStub.plugins.CookiePlugin(
+    [
+        {
+            domain: '.domain.com',
+            expirationDate: 1511612273,
+            hostOnly: false,
+            httpOnly: false,
+            name: 'COOKIE_NAME',
+            path: '/data',
+            secure: false,
+            session: false,
+            storeId: '0',
+            value: 'COOKIE_VALUE'
+        },
+        {
+            domain: 'other-domain.com',
+            hostOnly: false,
+            httpOnly: false,
+            name: 'other-cookie',
+            path: '/',
+            secure: false,
+            session: true,
+            storeId: '0',
+            value: '123'
+        }
+    ]
+));

From 7421b45cf08d43245366c1c74c40002b4bbbaadd Mon Sep 17 00:00:00 2001
From: Nikolay Yakimov <root@livid.pp.ru>
Date: Thu, 8 Mar 2018 18:56:26 +0300
Subject: [PATCH 0436/1382] [Atom] Add readonly qualifier to some properties

---
 types/atom/index.d.ts | 90 +++++++++++++++++++++----------------------
 1 file changed, 45 insertions(+), 45 deletions(-)

diff --git a/types/atom/index.d.ts b/types/atom/index.d.ts
index df446d50c3..5db8f55ce5 100644
--- a/types/atom/index.d.ts
+++ b/types/atom/index.d.ts
@@ -39,58 +39,58 @@ export function watchPath(rootPath: string, options: {}, eventCallback: (events:
 export interface AtomEnvironment {
     // Properties
     /** A CommandRegistry instance. */
-    commands: CommandRegistry;
+    readonly commands: CommandRegistry;
 
     /** A Config instance. */
-    config: Config;
+    readonly config: Config;
 
     /** A Clipboard instance. */
-    clipboard: Clipboard;
+    readonly clipboard: Clipboard;
 
     /** A ContextMenuManager instance. */
-    contextMenu: ContextMenuManager;
+    readonly contextMenu: ContextMenuManager;
 
     /** A MenuManager instance. */
-    menu: MenuManager;
+    readonly menu: MenuManager;
 
     /** A KeymapManager instance. */
-    keymaps: KeymapManager;
+    readonly keymaps: KeymapManager;
 
     /** A TooltipManager instance. */
-    tooltips: TooltipManager;
+    readonly tooltips: TooltipManager;
 
     /** A NotificationManager instance. */
-    notifications: NotificationManager;
+    readonly notifications: NotificationManager;
 
     /** A Project instance. */
-    project: Project;
+    readonly project: Project;
 
     /** A GrammarRegistry instance. */
-    grammars: GrammarRegistry;
+    readonly grammars: GrammarRegistry;
 
     /** A HistoryManager instance. */
-    history: HistoryManager;
+    readonly history: HistoryManager;
 
     /** A PackageManager instance. */
-    packages: PackageManager;
+    readonly packages: PackageManager;
 
     /** A ThemeManager instance. */
-    themes: ThemeManager;
+    readonly themes: ThemeManager;
 
     /** A StyleManager instance. */
-    styles: StyleManager;
+    readonly styles: StyleManager;
 
     /** A DeserializerManager instance. */
-    deserializers: DeserializerManager;
+    readonly deserializers: DeserializerManager;
 
     /** A ViewRegistry instance. */
-    views: ViewRegistry;
+    readonly views: ViewRegistry;
 
     /** A Workspace instance. */
-    workspace: Workspace;
+    readonly workspace: Workspace;
 
     /** A TextEditorRegistry instance. */
-    textEditors: TextEditorRegistry;
+    readonly textEditors: TextEditorRegistry;
 
     // Event Subscription
     /** Invoke the given callback whenever ::beep is called. */
@@ -446,7 +446,7 @@ export interface Config {
  */
 export interface Decoration {
     /** The identifier for this Decoration. */
-    id: number;
+    readonly id: number;
 
     // Construction and Destruction
     /**
@@ -654,7 +654,7 @@ export interface DisplayMarker {
  */
 export interface DisplayMarkerLayer {
     /** The identifier for the underlying MarkerLayer. */
-    id: string;
+    readonly id: string;
 
     // Lifecycle
     /** Destroy this layer. */
@@ -839,7 +839,7 @@ export interface LayerDecoration {
  */
 export interface Marker {
     /** The identifier for this Marker. */
-    id: number;
+    readonly id: number;
 
     // Lifecycle
     /**
@@ -952,7 +952,7 @@ export interface Marker {
 /** Experimental: A container for a related set of markers. */
 export interface MarkerLayer {
     /** The identifier for this MarkerLayer. */
-    id: string;
+    readonly id: string;
 
     // Lifecycle
     /** Create a copy of this layer with markers in the same state and locations. */
@@ -1036,7 +1036,7 @@ export class Notification {
 /** A notification manager used to create Notifications to be shown to the user. */
 export interface NotificationManager {
     // Properties
-    notifications: Notification[];
+    readonly notifications: Notification[];
 
     // Events
     /** Invoke the given callback after a notification has been added. */
@@ -1272,8 +1272,8 @@ export class Range {
  *  including cursor and selection positions, folds, and soft wraps.
  */
 export class TextEditor {
-    id: number;
-    buffer: TextBuffer;
+    readonly id: number;
+    readonly buffer: TextBuffer;
 
     // NOTE: undocumented within the public API. Don't go down the rabbit hole.
     constructor(options?: object);
@@ -2984,7 +2984,7 @@ export interface WorkspaceCenter {
  *  Node's ChildProcess.
  */
 export class BufferedProcess {
-    process?: ChildProcess;
+    readonly process?: ChildProcess;
 
     constructor(options: ProcessOptions);
 
@@ -4052,10 +4052,10 @@ export interface MenuManager {
  */
 export interface Package {
     /** The name of the Package. */
-    name: string;
+    readonly name: string;
 
     /** The path to the Package on disk. */
-    path: string;
+    readonly path: string;
 
     // Event Subscription
     /** Invoke the given callback when all packages have been activated. */
@@ -4377,7 +4377,7 @@ export interface Pane {
  */
 export interface Panel<T = object> {
     /** Whether or not the Panel is visible. */
-    visible: boolean;
+    readonly visible: boolean;
 
     // Construction and Destruction
     /** Destroy and remove this panel from the UI. */
@@ -4498,7 +4498,7 @@ export interface Project {
  *  syntax tree to a token including all scope names for the entire path.
  */
 export interface ScopeDescriptor {
-    scopes: string[];
+    readonly scopes: string[];
 
     /** Returns all scopes for this descriptor. */
     getScopesArray(): string[];
@@ -4894,13 +4894,13 @@ export class Task {
  */
 export class TextBuffer {
     /** The unique identifier for this buffer. */
-    id: string;
+    readonly id: string;
 
     /** The number of retainers for the buffer. */
-    refcount: number;
+    readonly refcount: number;
 
     /** Whether or not the bufffer has been destroyed. */
-    destroyed: boolean;
+    readonly destroyed: boolean;
 
     /** Create a new buffer backed by the given file path. */
     static load(filePath: string, params?: BufferLoadOptions): Promise<TextBuffer>;
@@ -6753,11 +6753,11 @@ export interface TokenizeLineResult {
  *  jQuery, which is an expensive dependency we want to eliminate.
  */
 export interface Tooltip {
-    options: TooltipOptions;
-    enabled: boolean;
-    timeout: number;
-    hoverState: "in"|"out"|null;
-    element: HTMLElement;
+    readonly options: TooltipOptions;
+    readonly enabled: boolean;
+    readonly timeout: number;
+    readonly hoverState: "in"|"out"|null;
+    readonly element: HTMLElement;
 
     getTitle(): string;
     getTooltipElement(): HTMLElement;
@@ -6774,11 +6774,11 @@ export interface ViewModel {
 }
 
 export interface WindowLoadSettings {
-    appVersion: string;
-    atomHome: string;
-    devMode: boolean;
-    resourcePath: string;
-    safeMode: boolean;
-    env?: { [key: string]: string|undefined };
-    profileStartup?: boolean;
+    readonly appVersion: string;
+    readonly atomHome: string;
+    readonly devMode: boolean;
+    readonly resourcePath: string;
+    readonly safeMode: boolean;
+    readonly env?: { [key: string]: string|undefined };
+    readonly profileStartup?: boolean;
 }

From 9d9950cb48e57cde2f5024f0e3796665d8373427 Mon Sep 17 00:00:00 2001
From: Juanjo Diaz <juanjo.diaz@intopalo.com>
Date: Sun, 11 Mar 2018 20:06:10 +0200
Subject: [PATCH 0437/1382] Fix bug in json2csv options

---
 types/json2csv/JSON2CSVBase.d.ts |  4 ++--
 types/json2csv/json2csv-tests.ts | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/types/json2csv/JSON2CSVBase.d.ts b/types/json2csv/JSON2CSVBase.d.ts
index 165497b4c8..d65a3cc297 100644
--- a/types/json2csv/JSON2CSVBase.d.ts
+++ b/types/json2csv/JSON2CSVBase.d.ts
@@ -10,9 +10,9 @@ export declare namespace json2csv {
     }
 
     export interface Options<T> {
-        fields?: (string | FieldInfo<T>);
+        fields?: Array<string | FieldInfo<T>>;
         ndjson?: boolean;
-        unwind?: string | string[];
+        unwind?: string | Array<string>;
         flatten?: boolean;
         defaultValue?: string;
         quote?: string;
diff --git a/types/json2csv/json2csv-tests.ts b/types/json2csv/json2csv-tests.ts
index 566cc06cee..67c46cd1c3 100644
--- a/types/json2csv/json2csv-tests.ts
+++ b/types/json2csv/json2csv-tests.ts
@@ -17,9 +17,27 @@ parse({});
 parse([]);
 parse({}, {});
 
+interface Car {
+    car: string;
+    price: number;
+}
+
 new Parser();
 const parser: Parser<ExampleObj> = new Parser({});
 s = parser.parse({ str: '', num: 1, obj: {} });
+
+const opts: json2csv.Options<Car> = {
+    fields: [{
+        label: 'Car Name',
+        value: 'car'
+    }, {
+        label: 'Price USD',
+        value: 'price'
+    }]
+};
+
+const json2csvParser = new Parser<Car>(opts);
+
 parser.parse([]);
 const transform: Transform<ExampleObj> = new Transform<ExampleObj>({ quote: '' });
 const nodeTransform: NodeTransform = transform;

From dbd9ce2952c633fe63ebe9a1a03103ce1a218742 Mon Sep 17 00:00:00 2001
From: Behind The Math <info@behindthemath.io>
Date: Sun, 11 Mar 2018 13:19:15 -0400
Subject: [PATCH 0438/1382] [sqlite3] Add return type for .verbose()

---
 types/sqlite3/index.d.ts       | 17 +++++++++++++++--
 types/sqlite3/sqlite3-tests.ts |  4 ++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/types/sqlite3/index.d.ts b/types/sqlite3/index.d.ts
index 921845e5a0..1116cc6388 100644
--- a/types/sqlite3/index.d.ts
+++ b/types/sqlite3/index.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for sqlite3 3.1
+// Type definitions for sqlite3 3.1.13
 // Project: https://github.com/mapbox/node-sqlite3
 // Definitions by: Nick Malaguti <https://github.com/nmalaguti>
 //                 Sumant Manne <https://github.com/dpyro>
+//                 Behind The Math <https://github.com/BehindTheMath>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -85,4 +86,16 @@ export class Database extends events.EventEmitter {
     on(event: string, listener: (...args: any[]) => void): this;
 }
 
-export function verbose(): void;
+export function verbose(): sqlite3;
+
+// tslint:disable-next-line:strict-export-declare-modifiers
+interface sqlite3 {
+	OPEN_READONLY: number;
+	OPEN_READWRITE: number;
+	OPEN_CREATE: number;
+    cached: typeof cached;
+    RunResult: RunResult;
+    Statement: typeof Statement;
+    Database: typeof Database;
+	verbose(): this;
+}
diff --git a/types/sqlite3/sqlite3-tests.ts b/types/sqlite3/sqlite3-tests.ts
index 4ddfa0a502..cc2ace853c 100644
--- a/types/sqlite3/sqlite3-tests.ts
+++ b/types/sqlite3/sqlite3-tests.ts
@@ -1,5 +1,5 @@
-import sqlite3 = require('sqlite3');
-sqlite3.verbose();
+import * as sqlite from 'sqlite3';
+const sqlite3 = sqlite.verbose();
 
 let db: sqlite3.Database = new sqlite3.Database('chain.sqlite3', () => {});
 

From 6d7596886844c498730bf91e34287d62a1459689 Mon Sep 17 00:00:00 2001
From: Behind The Math <info@behindthemath.io>
Date: Sun, 11 Mar 2018 16:10:12 -0400
Subject: [PATCH 0439/1382] Bug fixes

---
 types/sqlite3/index.d.ts       | 2 +-
 types/sqlite3/sqlite3-tests.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/sqlite3/index.d.ts b/types/sqlite3/index.d.ts
index 1116cc6388..7461cf82b7 100644
--- a/types/sqlite3/index.d.ts
+++ b/types/sqlite3/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for sqlite3 3.1.13
+// Type definitions for sqlite3 3.1
 // Project: https://github.com/mapbox/node-sqlite3
 // Definitions by: Nick Malaguti <https://github.com/nmalaguti>
 //                 Sumant Manne <https://github.com/dpyro>
diff --git a/types/sqlite3/sqlite3-tests.ts b/types/sqlite3/sqlite3-tests.ts
index cc2ace853c..fe897f73ec 100644
--- a/types/sqlite3/sqlite3-tests.ts
+++ b/types/sqlite3/sqlite3-tests.ts
@@ -1,7 +1,7 @@
 import * as sqlite from 'sqlite3';
 const sqlite3 = sqlite.verbose();
 
-let db: sqlite3.Database = new sqlite3.Database('chain.sqlite3', () => {});
+let db: sqlite.Database = new sqlite3.Database('chain.sqlite3', () => {});
 
 function createDb() {
     console.log("createDb chain");

From 30f94c40cc9cab5ed6445bab96c949b1c39bdea0 Mon Sep 17 00:00:00 2001
From: Jason Dreyzehner <jason@dreyzehner.com>
Date: Sun, 11 Mar 2018 16:38:30 -0400
Subject: [PATCH 0440/1382] del: arrays are not required to be mutable

---
 types/del/del-tests.ts | 58 ++++++++++++++++++++++++------------------
 types/del/index.d.ts   | 13 +++++++---
 2 files changed, 43 insertions(+), 28 deletions(-)

diff --git a/types/del/del-tests.ts b/types/del/del-tests.ts
index fc6c63b6fa..f9d01f644f 100644
--- a/types/del/del-tests.ts
+++ b/types/del/del-tests.ts
@@ -1,39 +1,47 @@
-import del = require("del");
+import del = require('del');
 
-let paths = ["build", "dist/**/*.js"];
+let paths = ['build', 'dist/**/*.js'];
 
-del(["tmp/*.js", "!tmp/unicorn.js"]);
-del(["tmp/*.js", "!tmp/unicorn.js"], {force: true});
-del(["tmp/*.js", "!tmp/unicorn.js"], {dryRun: true});
-del(["tmp/*.js", "!tmp/unicorn.js"], {concurrency: 20});
-del(["tmp/*.js", "!tmp/unicorn.js"], {cwd: ''});
+del(['tmp/*.js', '!tmp/unicorn.js']);
+del(['tmp/*.js', '!tmp/unicorn.js'], { force: true });
+del(['tmp/*.js', '!tmp/unicorn.js'], { dryRun: true });
+del(['tmp/*.js', '!tmp/unicorn.js'], { concurrency: 20 });
+del(['tmp/*.js', '!tmp/unicorn.js'], { cwd: '' });
 
-del(["tmp/*.js", "!tmp/unicorn.js"]).then((paths: string[]) => {
+del(['tmp/*.js', '!tmp/unicorn.js']).then((paths: string[]) => {
     console.log('Deleted files/folders:\n', paths.join('\n'));
 });
 
-del(["tmp/*.js", "!tmp/unicorn.js"], {force: true}).then((paths: string[]) => {
+del(['tmp/*.js', '!tmp/unicorn.js'], { force: true }).then(
+    (paths: string[]) => {
+        console.log('Deleted files/folders:\n', paths.join('\n'));
+    }
+);
+
+del('tmp/*.js');
+del('tmp/*.js', { force: true });
+del('tmp/*.js', { dryRun: true });
+del('tmp/*.js', { concurrency: 20 });
+del('tmp/*.js', { cwd: '' });
+del('tmp/*.js').then((paths: string[]) => {
     console.log('Deleted files/folders:\n', paths.join('\n'));
 });
 
-del("tmp/*.js");
-del("tmp/*.js", {force: true});
-del("tmp/*.js", {dryRun: true});
-del("tmp/*.js", {concurrency: 20});
-del("tmp/*.js", {cwd: ''});
-del("tmp/*.js").then((paths: string[]) => {
+del('tmp/*.js', { force: true }).then((paths: string[]) => {
     console.log('Deleted files/folders:\n', paths.join('\n'));
 });
 
-del("tmp/*.js", {force: true}).then((paths: string[]) => {
-    console.log('Deleted files/folders:\n', paths.join('\n'));
-});
+paths = del.sync(['tmp/*.js', '!tmp/unicorn.js']);
+paths = del.sync(['tmp/*.js', '!tmp/unicorn.js'], { force: true });
 
-paths = del.sync(["tmp/*.js", "!tmp/unicorn.js"]);
-paths = del.sync(["tmp/*.js", "!tmp/unicorn.js"], {force: true});
+paths = del.sync('tmp/*.js');
+paths = del.sync('tmp/*.js', { force: true });
+paths = del.sync('tmp/*.js', { dryRun: true });
+paths = del.sync('tmp/*.js', { concurrency: 20 });
+paths = del.sync('tmp/*.js', { cwd: '' });
 
-paths = del.sync("tmp/*.js");
-paths = del.sync("tmp/*.js", {force: true});
-paths = del.sync("tmp/*.js", {dryRun: true});
-paths = del.sync("tmp/*.js", {concurrency: 20});
-paths = del.sync("tmp/*.js", {cwd: ''});
+const immutable: ReadonlyArray<string> = ['tmp/*.js', '!tmp/unicorn.js'];
+const mutable = del(immutable);
+const mutablePaths = del.sync(immutable);
+mutable.then(paths => paths.push('test'));
+mutablePaths.push('test');
diff --git a/types/del/index.d.ts b/types/del/index.d.ts
index e3c250e69b..ec92f96c84 100644
--- a/types/del/index.d.ts
+++ b/types/del/index.d.ts
@@ -3,14 +3,21 @@
 // Definitions by: Asana <https://asana.com>
 //                 Aya Morisawa <https://github.com/AyaMorisawa>
 //                 BendingBender <https://github.com/BendingBender>
+//                 Jason Dreyzehner <https://github.com/bitjson>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-import glob = require("glob");
+import glob = require('glob');
 
-declare function del(patterns: string | string[], options?: del.Options): Promise<string[]>;
+declare function del(
+    patterns: string | ReadonlyArray<string>,
+    options?: del.Options
+): Promise<string[]>;
 
 declare namespace del {
-    function sync(patterns: string | string[], options?: Options): string[];
+    function sync(
+        patterns: string | ReadonlyArray<string>,
+        options?: Options
+    ): string[];
 
     interface Options extends glob.IOptions {
         force?: boolean;

From 5f6bf413a48d579248ad2bda329be18cf6ec7abb Mon Sep 17 00:00:00 2001
From: d-yokoi <daiki.kouu@gmail.com>
Date: Mon, 12 Mar 2018 08:22:20 +0900
Subject: [PATCH 0441/1382] Fixed ioredis.hmset in pipeline allowing support
 for data as object

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

diff --git a/types/ioredis/index.d.ts b/types/ioredis/index.d.ts
index de71a9f083..d072e003a8 100644
--- a/types/ioredis/index.d.ts
+++ b/types/ioredis/index.d.ts
@@ -595,6 +595,7 @@ declare namespace IORedis {
         hget(key: string, field: string, callback?: (err: Error, res: string) => void): Pipeline;
 
         hmset(key: string, field: string, value: any, ...args: string[]): Pipeline;
+        hmset(key: string, data: any, callback?: (err: Error, res: 0 | 1) => void): Pipeline;
 
         hmget(key: string, ...fields: string[]): Pipeline;
 

From c26e70977e412cdcb7367d59b7936ac848ebb2d8 Mon Sep 17 00:00:00 2001
From: Ulf Schwekendiek <sulf@me.com>
Date: Sun, 11 Mar 2018 16:44:49 -0700
Subject: [PATCH 0442/1382] Adding missing ContentState argument to draft
 decorators

See https://github.com/facebook/draft-js/blob/master/src/model/decorators/DraftDecoratorType.js
---
 types/draft-js/draft-js-tests.tsx | 29 ++++++++++++++++++++++++++---
 types/draft-js/index.d.ts         |  5 +++--
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/types/draft-js/draft-js-tests.tsx b/types/draft-js/draft-js-tests.tsx
index 63821eda98..857671d13d 100644
--- a/types/draft-js/draft-js-tests.tsx
+++ b/types/draft-js/draft-js-tests.tsx
@@ -22,7 +22,8 @@ import {
   DraftEntityMutability,
   DraftEntityType,
   convertFromHTML,
-  convertToRaw
+  convertToRaw,
+  CompositeDecorator,
 } from 'draft-js';
 
 const SPLIT_HEADER_BLOCK = 'split-header-block';
@@ -38,6 +39,14 @@ export const KEYCODES: Record<KeyName, KeyCode> = {
 
 type SyntheticKeyboardEvent = React.KeyboardEvent<{}>;
 
+const HANDLE_REGEX = /\@[\w]+/g;
+
+class HandleSpan extends React.Component {
+  render() {
+    return <span>{this.props.children}</span>
+  }
+}
+
 class RichEditorExample extends React.Component<{}, { editorState: EditorState }> {
   constructor() {
     super({});
@@ -51,8 +60,22 @@ class RichEditorExample extends React.Component<{}, { editorState: EditorState }
       blocksFromHTML.contentBlocks,
       blocksFromHTML.entityMap,
     );
-
-    this.state = { editorState: EditorState.createWithContent(state) };
+    const decorator = new CompositeDecorator([{
+      strategy: (
+        block: ContentBlock,
+        callback: (start: number, end: number) => void,
+        contentState: ContentState
+      ) => {
+        const text = block.getText();
+        let matchArr, start;
+        while ((matchArr = HANDLE_REGEX.exec(text)) !== null) {
+          start = matchArr.index;
+          callback(start, start + matchArr[0].length);
+        }
+      },
+      component: HandleSpan,
+    }]);
+    this.state = { editorState: EditorState.createWithContent(state, decorator) };
   }
 
   onChange: (editorState: EditorState) => void = (editorState: EditorState) => this.setState({ editorState });
diff --git a/types/draft-js/index.d.ts b/types/draft-js/index.d.ts
index e545fa347d..749841e71d 100644
--- a/types/draft-js/index.d.ts
+++ b/types/draft-js/index.d.ts
@@ -7,6 +7,7 @@
 //                 Michael Wu <https://github.com/michael-yx-wu>
 //                 Willis Plummer <https://github.com/willisplummer>
 //                 Santiago Vilar <https://github.com/smvilar>
+//                 Ulf Schwekendiek <https://github.com/sulf>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -398,7 +399,7 @@ declare namespace Draft {
                 /**
                  * Given a `ContentBlock`, return an immutable List of decorator keys.
                  */
-                getDecorations(block: ContentBlock): Immutable.List<string>;
+                getDecorations(block: ContentBlock, contentState: ContentState): Immutable.List<string>;
 
                 /**
                  * Given a decorator key, return the component to use when rendering
@@ -456,7 +457,7 @@ declare namespace Draft {
             class CompositeDraftDecorator {
                 constructor(decorators: Array<DraftDecorator>);
 
-                getDecorations(block: ContentBlock): Immutable.List<string>;
+                getDecorations(block: ContentBlock, contentState: ContentState): Immutable.List<string>;
                 getComponentForKey(key: string): Function;
                 getPropsForKey(key: string): Object;
             }

From 822ee026b2a11eeb85070b95d989d931047340b4 Mon Sep 17 00:00:00 2001
From: Ulf Schwekendiek <sulf@me.com>
Date: Sun, 11 Mar 2018 16:50:53 -0700
Subject: [PATCH 0443/1382] increase version number

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

diff --git a/types/draft-js/index.d.ts b/types/draft-js/index.d.ts
index 749841e71d..8227088418 100644
--- a/types/draft-js/index.d.ts
+++ b/types/draft-js/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Draft.js v0.10.4
+// Type definitions for Draft.js v0.10.5
 // Project: https://facebook.github.io/draft-js/
 // Definitions by: Dmitry Rogozhny <https://github.com/dmitryrogozhny>
 //                 Eelco Lempsink <https://github.com/eelco>

From 75178d3bdf290a817e997194aff407546a9901a3 Mon Sep 17 00:00:00 2001
From: Nick Whyte <nick@nickwhyte.com>
Date: Mon, 12 Mar 2018 11:07:34 +1100
Subject: [PATCH 0444/1382] PR Changes

---
 types/prismic-dom/index.d.ts | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/types/prismic-dom/index.d.ts b/types/prismic-dom/index.d.ts
index 82c766fda6..db3b85d4b8 100644
--- a/types/prismic-dom/index.d.ts
+++ b/types/prismic-dom/index.d.ts
@@ -3,6 +3,13 @@
 // Definitions by: Nick Whyte <https://github.com/nickw444>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-export namespace RichText {
-    function asHtml(richText: any, linkResolver?: (doc: any) => string): string;
+interface RichText {
+    asHtml(richText: any, linkResolver?: (doc: any) => string): string;
 }
+
+export const RichText: RichText;
+
+declare const PrismicDOM: {
+    RichText: RichText;
+};
+export default PrismicDOM;

From 6f0b81e2c509805d1a1348b7513340d1929200b9 Mon Sep 17 00:00:00 2001
From: Nick Whyte <nick@nickwhyte.com>
Date: Mon, 12 Mar 2018 11:25:31 +1100
Subject: [PATCH 0445/1382] PR Changes

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

diff --git a/types/prismic-dom/index.d.ts b/types/prismic-dom/index.d.ts
index db3b85d4b8..2849cc7791 100644
--- a/types/prismic-dom/index.d.ts
+++ b/types/prismic-dom/index.d.ts
@@ -9,7 +9,5 @@ interface RichText {
 
 export const RichText: RichText;
 
-declare const PrismicDOM: {
-    RichText: RichText;
-};
-export default PrismicDOM;
+declare const _default: { RichText: RichText };
+export default _default;

From 45b3a22d74a0c14154a3adc21cf79fd9aba386de Mon Sep 17 00:00:00 2001
From: Kyle Buzby <kbuzby@epic.com>
Date: Sun, 11 Mar 2018 21:02:53 -0500
Subject: [PATCH 0446/1382] implement types and tests

---
 types/postman-collection/index.d.ts           | 522 ++++++-----
 .../postman-collection-tests.ts               | 868 +++++++++++++++++-
 2 files changed, 1133 insertions(+), 257 deletions(-)

diff --git a/types/postman-collection/index.d.ts b/types/postman-collection/index.d.ts
index e0025d9bda..a02953720a 100644
--- a/types/postman-collection/index.d.ts
+++ b/types/postman-collection/index.d.ts
@@ -2,139 +2,140 @@
 // Project: https://github.com/postmanlabs/postman-collection
 // Definitions by: Kyle Buzby <https://github.com/kbuzby>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
 /// <reference types="node" />
 
-export class PropertyBase {
-    constructor(definition: any);
+export interface PropertyBaseDefinition {
+    description?: string | DescriptionDefinition;
+}
 
-    findInParents(property: string, customizer?: (item: any) => boolean): PropertyBase ;
+export class PropertyBase<TDefinition> implements PropertyBaseDefinition {
+    description?: string | DescriptionDefinition;
 
-    findParentContaining(property: any, customizer: (item: any) => boolean): PropertyBase;
+    constructor(definition?: PropertyBaseDefinition | {info: PropertyBaseDefinition} | string);
+
+    findInParents(property: string, customizer?: (item: PropertyBase<PropertyBaseDefinition>) => boolean): PropertyBase<PropertyBaseDefinition> ;
+
+    findParentContaining(property: any, customizer: (item: PropertyBase<PropertyBaseDefinition>) => boolean): PropertyBase<PropertyBaseDefinition>;
 
     forEachParent(iterator: (item: any) => void): void;
-    forEachParent(options: any /* TODO | boolean*/, iterator: (item: any) => void): void;
+    forEachParent(options: {withRoot: boolean}, iterator: (item: any) => void): void;
 
     meta(): any;
 
-    parent(): any;
+    parent(): PropertyBase<PropertyBaseDefinition> | undefined;
 
-    setParent(parent: any): void;
+    setParent(parent: PropertyBase<PropertyBaseDefinition>): void;
 
-    toJSON(): any;
+    toJSON(): TDefinition;
 
-    static propertyIsMeta(value: any, key: any): any;
+    static propertyIsMeta(_value: any, key: string): boolean;
 
-    static propertyUnprefixMeta(value: any, key: any): any;
+    static propertyUnprefixMeta(_value: any, key: string): string;
 
     static toJSON(obj: any): any;
 }
 
-export interface PropertyDefinition {
+export interface PropertyDefinition extends PropertyBaseDefinition {
     id?: string;
     name?: string;
     disabled?: boolean;
 }
 
-export class Property extends PropertyBase implements PropertyDefinition {
-    auth: RequestAuth;
+export class Property<TDefinition> extends PropertyBase<TDefinition> implements PropertyDefinition {
     disabled: boolean;
     id: string;
     name: string;
 
-    constructor(definition?: PropertyDefinition);
+    constructor(definition?: TDefinition | {info: TDefinition, disabled: boolean});
 
     describe(content: string, type?: string): void;
 
-    toObjectResolved(scope: any, overrides: any, options: any): any;
+    toObjectResolved(scope: {variables: VariableList} | null, overrides: any[], options?: {ignoreOwnVariables: boolean}): TDefinition;
 
     static replaceSubstitutions(str: string, variables: VariableList | VariableList[]): string;
 
-    static replaceSubstitutionsIn(obj: any, variables: VariableList[], mutate: boolean): any;
+    static replaceSubstitutionsIn<T>(obj: T, variables: VariableList[], mutate: boolean): T;
 }
 
 export interface CertificateDefinition extends PropertyDefinition {
-    name?: string;
-    matches?: any[];
-    key?: any;
-    cert?: any;
+    matches?: string[] | UrlMatchPatternList;
+    key?: {src?: string} | string;
+    cert?: {src?: string} | string;
     passphrase?: string;
 }
 
-export class Certificate extends Property implements CertificateDefinition {
-    cert: any;
-    id: string;
-    key: any;
-    matches: any[];
-    name: string;
+export class Certificate extends Property<CertificateDefinition> implements CertificateDefinition {
+    cert: {src?: string};
+    key: {src?: string};
+    matches: UrlMatchPatternList;
     passphrase: string;
 
-    constructor(options: any);
+    constructor(options: CertificateDefinition);
 
-    canApplyTo(url: string | Url): any;
-
-    toJSON(): CertificateDefinition;
+    canApplyTo(url: string | Url): boolean;
 
     update(options: CertificateDefinition): void;
 
     static isCertificate(obj: any): boolean;
 }
 
-export class PropertyList<TElement> {
-    constructor(type: any, parent: any, populate: any);
+export class PropertyList<TElement> extends PropertyBase<PropertyBaseDefinition> {
+    constructor(type: string, parent: any, populate: TElement[]);
 
     add(item: TElement): void;
 
-    all(): any;
+    all(): TElement[];
 
-    append(item: TElement): any;
+    append(item: TElement): void;
 
-    assimilate(source: PropertyList<TElement> | any[], prune: boolean): void;
+    assimilate(source: PropertyList<TElement> | TElement[], prune: boolean): void;
 
     clear(): void;
 
     count(): number;
 
-    each(iterator: any, context: any): void;
+    each(iterator: (item: TElement) => void, context?: any): void;
 
-    eachParent(iterator: any, context?: any): void;
+    eachParent(iterator: (item: any) => void, context?: any): void;
 
-    filter(rule: any, context: any): any;
+    filter(rule: (item: TElement) => boolean, context: any): TElement[];
 
-    find(rule: any, context?: any): Item | ItemGroup<TElement>;
+    find(rule: (item: TElement) => boolean, context: any): TElement;
 
-    get(key: /*TODO string |*/ any): TElement;
+    get(key: string): TElement | undefined;
 
     has(item: string | TElement, value?: any): boolean;
 
     idx(index: number): TElement;
 
-    indexOf(item: /*TODO string |*/ any): number;
+    indexOf(item: string): number;
 
     insert(item: TElement, before: TElement | string): void;
 
-    insertAfter(item: TElement, after: TElement | string): any;
+    insertAfter(item: TElement, after: TElement | string): void;
 
-    map(iterator: any, context: any): any;
+    map(iterator: (item: TElement) => any, context?: any): any;
 
     one(id: string): TElement;
 
-    populate(items: any): void;
+    populate(items: TElement[]): void;
 
-    prepend(item: TElement): any;
+    prepend(item: TElement): void;
 
-    remove(predicate: any /*TODO | string | TElement*/, context: any): any;
+    remove(predicate: ((item: TElement) => boolean) | string | TElement, context: any): void;
 
     repopulate(items: any): void;
 
     toJSON(): any;
 
-    toObject(excludeDisabled?: any, caseSensitive?: any, multiValue?: any, sanitizeKeys?: any): any;
+    toObject(excludeDisabled?: boolean, caseSensitive?: boolean, multiValue?: boolean, sanitizeKeys?: boolean): any;
 
     toString(): string;
 
     upsert(item: TElement): boolean | null;
 
-    static isPropertyList(obj: any): any;
+    static isPropertyList(obj: any): boolean;
 }
 
 export class CertificateList extends PropertyList<Certificate> {
@@ -151,17 +152,18 @@ export interface ItemGroupDefinition extends PropertyDefinition {
     event?: EventDefinition[];
 }
 
-export class ItemGroup<TItem> extends Property {
-    auth: RequestAuth;
+export class ItemGroup<TItem> extends Property<ItemGroupDefinition> {
+    auth?: RequestAuth;
     items: PropertyList<TItem>;
+    events: EventList;
 
     constructor(definition?: ItemGroupDefinition);
 
-    authorizeRequestsUsing(type: any, options: any): void; // TODO add better types for parameters
+    authorizeRequestsUsing(type: string | RequestAuthDefinition, options?: VariableList): void;
 
-    forEachItem(callback: any): any;
+    forEachItem(callback: (el: TItem) => void): void;
 
-    forEachItemGroup(callback: any): void;
+    forEachItemGroup(callback: (el: ItemGroup<TItem>) => void): void;
 
     oneDeep(idOrName: string): TItem;
 
@@ -174,25 +176,21 @@ export interface CollectionDefinition extends ItemGroupDefinition {
         name?: string;
         version?: string;
     };
-    item?: Array<ItemDefinition | ItemGroupDefinition>;
     variable?: VariableDefinition;
-    auth?: RequestAuthDefinition;
-    event?: EventDefinition[];
-    version?: string | Version;
 }
 
-export class Collection extends ItemGroup<Request> implements CollectionDefinition {
+export class Collection extends ItemGroup<Request> {
     events: EventList;
     variables: VariableList;
-    version: Version;
+    version?: Version;
 
     constructor(definition?: CollectionDefinition, environments?: any[]);
 
     syncVariablesFrom(obj: any, track?: boolean): any;
 
-    syncVariablesTo(obj?: any): any;
+    syncVariablesTo(obj: any): any;
 
-    toJSON(): any;
+    toJSON(): CollectionDefinition;
 
     static isCollection(obj: any): boolean;
 }
@@ -202,8 +200,8 @@ export interface CookieDefinition {
     value?: string;
     expires?: string | Date;
     maxAge?: number;
-    domain?: string;
-    path?: string;
+    domain: string;
+    path: string;
     secure?: boolean;
     httpOnly?: boolean;
     hostOnly?: boolean;
@@ -211,67 +209,66 @@ export interface CookieDefinition {
     extensions?: Array<{key: string; value: string}>;
 }
 
-export class Cookie extends PropertyBase implements CookieDefinition {
+export class Cookie extends PropertyBase<CookieDefinition> implements CookieDefinition {
     domain: string;
-    expires: Date | string;
-    extensions: Array<{key: string; value: string}>;
-    hostOnly: any;
-    httpOnly: any;
-    maxAge: number;
-    name: string;
+    expires: Date;
+    extensions?: Array<{key: string; value: string}>;
+    hostOnly?: boolean;
+    httpOnly?: boolean;
+    maxAge?: number;
     path: string;
-    secure: any;
-    session: any;
-    value: string;
+    secure?: boolean;
+    session?: boolean;
+    value?: string;
 
     constructor(options?: CookieDefinition);
 
-    update(options: any): void;
+    update(options: CookieDefinition): void;
 
     valueOf(): string;
 
     static isCookie(obj: any): boolean;
 
-    static parse(str: string): any;
+    static parse(str: string): CookieDefinition;
 
-    static splitParam(param: any): any;
+    static splitParam(param: string): {key: string, value: string | boolean };
 }
 
 export class CookieList extends PropertyList<Cookie> {
-    constructor(parent: any, cookies: any[]);
+    constructor(parent: any, cookies: Cookie[]);
 
     static isCookieList(obj: any): boolean;
 }
 
 export interface DescriptionDefinition {
     content: string;
-    format: string;
+    type?: string;
 }
 
 export class Description implements DescriptionDefinition {
-    format: string; // TODO huh?
     content: string;
     type: string;
 
-    constructor(definition?: DescriptionDefinition);
+    constructor(definition?: DescriptionDefinition | string);
 
-    toJSON(): any;
+    toJSON(): DescriptionDefinition;
 
     toString(): string;
 
-    update(content: string | DescriptionDefinition, type?: string): void;
+    update(content: DescriptionDefinition): void;
+    update(content: string, type?: string): void;
 
     static isDescription(obj: any): boolean;
 }
 
 export interface EventDefinition extends PropertyDefinition {
-    listen: string;
-    script: string | Script;
+    listen?: string;
+    script: string | string[] | ScriptDefinition | Script;
 }
 
-export class Event extends Property implements EventDefinition {
-    listen: string;
-    script: string;
+export class Event extends Property<EventDefinition> implements EventDefinition {
+    listen?: string;
+    script: Script;
 
     constructor(definition: EventDefinition);
 
@@ -279,7 +276,7 @@ export class Event extends Property implements EventDefinition {
 }
 
 export class EventList extends PropertyList<Event> {
-    constructor(parent: any, populate: any[]);
+    constructor(parent: any, populate: Event[]);
 
     listeners(name: string): Event[];
 
@@ -289,16 +286,13 @@ export class EventList extends PropertyList<Event> {
 }
 
 export interface FormParamDefinition extends PropertyDefinition {
-    key: string;
-    value: string;
+    key?: string;
+    value?: any;
 }
 
-export class FormParam extends Property implements FormParamDefinition {
+export class FormParam extends Property<FormParamDefinition> implements FormParamDefinition {
     key: string;
-    value: string;
-
-    static _postman_propertyAllowsMultipleValues: boolean;
-    static _postman_propertyIndex: string;
+    value: any;
 
     constructor(options: FormParamDefinition);
 
@@ -310,19 +304,20 @@ export class FormParam extends Property implements FormParamDefinition {
 }
 
 export interface HeaderDefinition extends PropertyDefinition {
-    key: string;
-    value: string;
+    key?: string;
+    value?: string;
+    system?: boolean;
 }
 
-export class Header extends Property implements HeaderDefinition {
+export class Header extends Property<HeaderDefinition> implements HeaderDefinition {
     key: string;
     value: string;
 
-    constructor(options: HeaderDefinition | string, name?: string);
+    constructor(options: string | HeaderDefinition, name?: string)
 
     toString(): string;
 
-    update(options: any): void;
+    update(options: HeaderDefinition): void;
 
     valueOf(): string;
 
@@ -334,9 +329,9 @@ export class Header extends Property implements HeaderDefinition {
 
     static parseSingle(header: string): HeaderDefinition;
 
-    static unparse(headers: HeaderList | any[], separator?: string): string;
+    static unparse(headers: HeaderList | HeaderDefinition[], separator?: string): string;
 
-    static unparseSingle(header: Header): string;
+    static unparseSingle(header: HeaderDefinition): string;
 }
 
 export class HeaderList extends PropertyList<Header> {
@@ -353,35 +348,34 @@ export interface ItemDefinition extends PropertyDefinition {
     events?: EventDefinition[];
 }
 
-export class Item extends Property implements ItemDefinition {
-    events: EventDefinition[];
+export class Item extends Property<ItemDefinition> {
+    events: EventList;
     request: Request;
-    responses: ResponseDefinition[];
+    responses: PropertyList<Response>;
 
     constructor(definition?: ItemDefinition);
 
-    authorizeRequestUsing(type: string | RequestAuthDefinition, options?: VariableList): any;
+    authorizeRequestUsing(type: string | RequestAuthDefinition, options?: VariableList): void;
 
     getAuth(): RequestAuth;
 
-    getEvents(name: string): Event[];
+    getEvents(name?: string): Event[];
 
     static isItem(obj: any): boolean;
 }
 
 export interface ProxyConfigDefinition extends PropertyDefinition {
-    match?: string;
+    match?: string | {pattern: string} | UrlMatchPattern;
     host?: string;
     port?: number;
     tunnel?: boolean;
-    disabled?: boolean;
 }
 
-export class ProxyConfig extends Property implements ProxyConfigDefinition {
-    static host: string;
-    static match: string;
-    static port: number;
-    static tunnel: boolean;
+export class ProxyConfig extends Property<ProxyConfigDefinition> implements ProxyConfigDefinition {
+    host: string;
+    match: UrlMatchPattern;
+    port: number;
+    tunnel: boolean;
 
     constructor(options?: ProxyConfigDefinition);
 
@@ -389,7 +383,7 @@ export class ProxyConfig extends Property implements ProxyConfigDefinition {
 
     getProxyUrl(): string;
 
-    test(urlStr?: string): any;
+    test(urlStr?: string): boolean;
 
     update(options: ProxyConfigDefinition): void;
 
@@ -401,22 +395,24 @@ export class ProxyConfig extends Property implements ProxyConfigDefinition {
 export class ProxyConfigList extends PropertyList<ProxyConfig> {
     constructor(parent: any, populate: ProxyConfig[]);
 
-    resolve(url?: Url): ProxyConfigDefinition;
+    resolve(url: string | Url): ProxyConfig;
 
     static isProxyConfigList(obj: any): boolean;
 }
 
 export interface QueryParamDefinition extends PropertyDefinition {
-    key: string;
-    value: string;
+    key: string | null;
+    value: string | null;
+    system?: boolean;
 }
 
-export class QueryParam extends Property implements QueryParamDefinition {
+export class QueryParam extends Property<QueryParamDefinition> implements QueryParamDefinition {
     static _postman_propertyAllowsMultipleValues: boolean;
     static _postman_propertyIndexKey: string;
 
-    key: string;
-    value: string;
+    key: string | null;
+    value: string | null;
+    system?: boolean;
 
     constructor(options: QueryParamDefinition | string);
 
@@ -424,61 +420,59 @@ export class QueryParam extends Property implements QueryParamDefinition {
 
     update(param: string | {key: string, value?: string}): void;
 
-    valueOf(): any;
+    valueOf(): string;
 
-    static parse(query: string): any[];
+    static parse(query: string): QueryParamDefinition[];
 
-    static parseSingle(param: string, idx: number, all: string[]): any;
+    static parseSingle(param: string, idx: number, all: string[]): QueryParamDefinition;
 
-    static unparse(params: any, options?: {encode?: boolean | null, ignoreDisabled?: boolean | null}): string;
+    static unparse(params: QueryParamDefinition[], options?: {encode?: boolean, ignoreDisabled?: boolean}): string;
 
-    static unparseSingle(obj: any, encode: boolean): string;
+    static unparseSingle(obj: QueryParamDefinition, encode: boolean): string;
 }
 
 export interface RequestDefinition extends PropertyDefinition {
     url: string | Url;
-    method: string;
+    method?: string;
     header?: HeaderDefinition;
     body?: RequestBody;
-    auth: RequestAuthDefinition;
-    proxy: ProxyConfigDefinition;
+    auth?: RequestAuthDefinition;
+    proxy?: ProxyConfigDefinition;
     certificate?: CertificateDefinition;
 }
 
-export class Request extends Property implements RequestDefinition {
-    auth: RequestAuth;
+export class Request extends Property<RequestDefinition> implements RequestDefinition {
+    auth?: RequestAuth;
     body?: RequestBody;
     certificate?: Certificate;
     headers: HeaderList;
     method: string;
-    proxy: ProxyConfig;
+    proxy?: ProxyConfig;
     url: Url;
 
-    constructor(options: RequestDefinition);
+    constructor(options: RequestDefinition | string);
 
     addHeader(header: Header | HeaderDefinition): void;
 
-    addQueryParams(params: string | QueryParam[]): void;
+    addQueryParams(params: string | QueryParamDefinition[]): void;
 
-    authorize(): Request;
-
-    authorizeUsing(type: string | RequestAuthDefinition, options?: VariableList): void;
+    authorizeUsing(type: string | RequestAuthDefinition | null, options?: VariableList): void;
 
     clone(): Request;
 
-    forEachHeader(callback: any): void;
+    forEachHeader(callback: (header: Header, context: Request) => void): void;
 
     getHeaders(options?: {ignoreCase?: boolean, enabled?: boolean}): any;
 
-    removeHeader(toRemove: string | Header, options: {ignoreCase: boolean}): any;
+    removeHeader(toRemove: string | Header, options?: {ignoreCase: boolean}): void;
 
-    removeQueryParams(params: string | string[]): void;
+    removeQueryParams(params: string | string[] | QueryParamDefinition[]): void;
 
-    toJSON(): any;
+    toJSON(): RequestDefinition;
 
     update(options: RequestDefinition): void;
 
-    upsertHeader(header: any): void;
+    upsertHeader(header: HeaderDefinition): void;
 
     static isRequest(obj: any): boolean;
 }
@@ -487,10 +481,10 @@ export interface RequestAuthDefinition extends PropertyDefinition {
     type?: string;
 }
 
-export class RequestAuth extends Property implements RequestAuthDefinition {
+export class RequestAuth extends Property<RequestAuthDefinition> implements RequestAuthDefinition {
     type: string;
 
-    constructor(options: RequestAuthDefinition, parent?: Property | PropertyList<RequestAuth>);
+    constructor(options: RequestAuthDefinition, parent?: Property<PropertyDefinition> | PropertyList<RequestAuth>);
 
     clear(type: string): void;
 
@@ -498,67 +492,76 @@ export class RequestAuth extends Property implements RequestAuthDefinition {
 
     parameters(): VariableList;
 
-    update(options: /*TODO VariableList | any[] |*/ any, type?: string): void;
+    update(options: VariableList | Array<{key: string, value: string}> | {key: string, value: string}, type?: string): void;
 
-    use(type: string, options: VariableList): void;
+    use(type: string, options: VariableList | Array<{key: string, value: string}> | {key: string, value: string}): void;
 
     static isValidType(type: any): boolean;
 }
 
-export class RequestBody extends PropertyBase {
+export interface RequestBodyDefinition extends PropertyBaseDefinition {
+    mode: string;
+    raw?: string;
+    urlencoded?: QueryParamDefinition[] | PropertyList<QueryParam> | string;
+    file?: string | {src: string};
+    formdata?: FormParamDefinition[] | PropertyList<FormParam>;
+}
+
+export class RequestBody extends PropertyBase<RequestBodyDefinition> implements RequestBodyDefinition {
     static MODES: {
         raw: string;
-        formadata: string;
+        formdata: string;
         urlencoded: string;
         file: string;
     };
 
-    file: string;
-    formdata: PropertyList<FormParam>;
+    file?: {src: string};
+    formdata?: PropertyList<FormParam>;
     mode: string;
-    raw: string;
-    urlencoded: PropertyList<QueryParam>;
+    raw?: string;
+    urlencoded?: PropertyList<QueryParam>;
 
-    constructor(options: any);
+    constructor(options: RequestBodyDefinition);
 
     isEmpty(): boolean;
 
     toString(): string;
 
-    update(options: any): void;
+    update(options: RequestBodyDefinition): void;
 }
 
 export interface ResponseDefinition extends PropertyDefinition {
     code: number;
-    reason?: string;
     header?: HeaderDefinition[];
     cookie?: CookieDefinition[];
     body?: string;
     stream?: Buffer | Uint8Array;
     responseTime: number;
+    originalRequest?: RequestDefinition;
 }
 
-export class Response extends Property implements ResponseDefinition {
-    body: string;
+export class Response extends Property<ResponseDefinition> implements ResponseDefinition {
+    body?: string;
     code: number;
     cookies: CookieList;
     headers: HeaderList;
-    originalRequest: Request;
+    originalRequest?: Request;
     responseTime: number;
     status: string;
-    reason?: string;
+    stream?: Buffer | Uint8Array;
+    responseSize?: number;
 
     constructor(options: ResponseDefinition);
 
     dataURI(): string;
 
-    details(): any;
+    details(): {name: string, detail: string, code: number, standardName: string} | undefined;
 
-    encoding(): any;
+    encoding(): {format: string, source: string};
 
     json(reviver?: any, strict?: boolean): any;
 
-    mime(contentType: any, contentDisposition: any): any; // TODO ??
+    reason(): string;
 
     size(): number;
 
@@ -566,130 +569,143 @@ export class Response extends Property implements ResponseDefinition {
 
     toJSON(): any;
 
-    update(options: any): void;
+    update(options: ResponseDefinition): void;
 
-    static createFromNode(response: any, cookies: any): any;
+    static createFromNode(response: {
+        body: string | Buffer | Uint8Array,
+        headers?: HeaderDefinition[],
+        statusCode: number,
+        statusMessage?: string,
+        elapsedTime: number
+    }, cookies: CookieDefinition[]): Response;
 
     static isResponse(obj: any): boolean;
-
-    static mimeInfo(type: any, disposition: any): any; // TODO ??
 }
 
-export class Script extends Property {
-    exec: string[];
-    src: Url;
+export interface ScriptDefinition extends PropertyDefinition {
+    type?: string;
+    src?: string | Url;
+    exec?: string | string[];
+}
+
+export class Script extends Property<ScriptDefinition> implements ScriptDefinition {
+    exec?: string[];
+    src?: Url;
     type: string;
 
-    constructor(options: any);
+    constructor(options?: ScriptDefinition | string | string[]);
 
-    toSource(): string;
+    toSource(): string | undefined;
 
-    update(options?: {type?: string, src?: string, exec?: string | string[]}): void;
+    update(options: ScriptDefinition | string | string[]): void;
 
     static isScript(obj: any): boolean;
 }
 
-export class Url extends PropertyBase {
-    auth: string;
-    hash: string;
-    host: string[];
+export interface UrlDefinition extends PropertyBaseDefinition {
+    auth?: {user: string, password: string};
+    hash?: string;
+    host?: string[] | string;
+    path: string[] | string;
+    port?: string;
+    query?: QueryParamDefinition[] | PropertyList<QueryParam> | string;
+    variable?: VariableDefinition[];
+    protocol?: string;
+}
+
+export class Url extends PropertyBase<UrlDefinition> implements UrlDefinition {
+    auth?: {user: string, password: string};
+    hash?: string;
+    host?: string[];
     path: string[];
-    port: string;
-    protocol: string;
+    port?: string;
+    protocol?: string;
     query: PropertyList<QueryParam>;
     variables: VariableList;
 
-    constructor(options: any /*TODO| string*/);
+    constructor(options: UrlDefinition | string);
 
-    addQueryParams(params: any /*TODO | string*/): void;
+    addQueryParams(params: QueryParamDefinition[] | string): void;
 
     getHost(): string;
 
-    getOAuth1BaseUrl(): any;
+    getOAuth1BaseUrl(): string;
 
     getPath(options?: {unresolved: boolean}): string;
 
-    getPathWithQuery(): any /*TODO | string*/;
+    getPathWithQuery(): string;
 
-    getQueryString(options?: {encode: boolean | null, ignoredDisabled: boolean | null} | null): string;
+    getQueryString(options?: {encode?: boolean, ignoredDisabled?: boolean}): string;
 
     getRaw(): string;
 
-    getRemote(options: {forcePort: boolean}): string;
+    getRemote(options?: {forcePort: boolean}): string;
 
-    removeQueryParams(params: QueryParam[] | string[] | string): void;
+    removeQueryParams(params: QueryParamDefinition[] | QueryParamDefinition | string[] | string): void;
 
     toString(forceProtocol?: boolean): string;
 
-    update(url: /*TODO string |*/ any): void;
+    update(url: UrlDefinition | string): void;
 
     static isUrl(obj: any): boolean;
 
-    static parse(url: string): any;
+    static parse(url: string): UrlDefinition;
 }
 
-/* No documentation for this right now?
 export class UrlMatchPattern {
-    constructor(options: any, ...args: any[]);
+    pattern?: string;
 
-    createMatchPattern(): any;
+    constructor(options: string | {pattern: string});
 
-    getProtocols(): any;
+    createMatchPattern(): {protocols: string[], host: string, path: RegExp} | undefined;
 
-    globPatternToRegexp(pattern: any): any;
+    getProtocols(): string[];
 
-    matchAbsoluteHostPattern(matchRegexObject: any, remote: any): any;
+    globPatternToRegexp(pattern: string): RegExp;
 
-    matchAnyHost(matchRegexObject: any): any;
+    matchAbsoluteHostPattern(matchRegexObject: {protocols: string[], host: string, path: RegExp}, remote: string): boolean;
 
-    matchSuffixHostPattern(matchRegexObject: any, remote: any): any;
+    matchAnyHost(matchRegexObject: {protocols: string[], host: string, path: RegExp}): boolean;
 
-    test(urlStr: any): any;
+    matchSuffixHostPattern(matchRegexObject: {protocols: string[], host: string, path: RegExp}, remote: string): boolean;
 
-    testHost(host: any): any;
+    test(urlStr: string): boolean;
 
-    testPath(path: any): any;
+    testHost(host: string): boolean;
 
-    testProtocol(protocol: any): any;
+    testPath(path: string): boolean;
 
-    toJSON(): any;
+    testProtocol(protocol: string): boolean;
 
-    toString(): any;
+    toJSON(): {pattern: string};
 
-    update(options: any): void;
+    toString(): string;
+
+    update(options: {pattern: string}): void;
 
     static MATCH_ALL_URLS: string;
 
     static PROTOCOL_DELIMITER: string;
-
 }
 
 export class UrlMatchPatternList extends PropertyList<UrlMatchPattern> {
-    constructor(parent: any, list: any);
+    constructor(parent: Property<PropertyDefinition>, list: string[]);
 
-    test(urlStr: any): any;
-
-}*/
+    test(urlStr: string): boolean;
+}
 
 export interface VariableDefinition extends PropertyDefinition {
     value?: any;
-    type?: VariableTypes;
+    type?: string;
+    key?: string;
 }
 
-export enum VariableTypes {
-    string = 'string',
-    boolean = 'boolean',
-    number = 'number',
-    json = 'json',
-    any = 'any'
-}
-
-export class Variable extends Property implements VariableDefinition {
-    key: string;
-    type: VariableTypes;
+export class Variable extends Property<VariableDefinition> implements VariableDefinition {
+    key?: string;
+    type: string;
     value: any;
 
-    constructor(definition?: VariableDefinition);
+    constructor(definition?: VariableDefinition | {[index: string]: VariableDefinition});
 
     cast(value: any): any;
 
@@ -705,39 +721,45 @@ export class Variable extends Property implements VariableDefinition {
 
     update(options: VariableDefinition): void;
 
-    valueOf(value?: any): any;
+    valueOf(value: any): any;
 
     valueType(typeName: string, _noCast: boolean): string;
 
     static isVariable(obj: any): boolean;
+
+    static types: {
+        string: StringConstructor;
+        boolean: BooleanConstructor;
+        number: NumberConstructor;
+        json: {in: (val: any) => string, out: (val: string) => any};
+        any: {in: <T>(val: T) => T, out: <T>(val: T) => T};
+    };
 }
 
 export class VariableList extends PropertyList<Variable> {
-    constructor(parent: Property, populate: any);
+    constructor(parent: Property<PropertyDefinition>, populate: Variable[]);
 
-    replace(str: string, overrides?: any): string;
+    replace(str: string, overrides?: VariableList): string;
 
-    substitute(obj: any, overrides?: any[] | null, mutate?: boolean): any;
+    substitute<T>(obj: T, overrides?: VariableList, mutate?: boolean): T;
 
-    syncFromObject(obj: any, track?: boolean, prune?: boolean): any;
+    syncFromObject(obj: {[key: string]: VariableDefinition}, track?: boolean, prune?: boolean): {created: string[], updated: string[], deleted: string[]} | undefined;
 
-    syncToObject(obj?: any): any;
+    syncToObject(obj?: {[key: string]: VariableDefinition}): {[key: string]: VariableDefinition};
 
     static isVariableList(obj: any): boolean;
 }
 
 export interface VariableScopeDefinition extends PropertyDefinition {
-    id?: string;
-    name?: string;
     values?: VariableDefinition[];
 }
 
-export class VariableScope extends Property implements VariableScopeDefinition {
+export class VariableScope extends Property<VariableScopeDefinition> implements VariableScopeDefinition {
     values?: VariableDefinition[];
 
-    constructor(definition: VariableScopeDefinition, layers?: VariableList[]);
+    constructor(definition: VariableScopeDefinition | VariableList | VariableDefinition[], layers?: VariableList[] | VariableList);
 
-    addLayer(list: any): void;
+    addLayer(list: VariableList): void;
 
     clear(): void;
 
@@ -745,11 +767,11 @@ export class VariableScope extends Property implements VariableScopeDefinition {
 
     has(variableName: string): boolean;
 
-    set(key: string, value: any, type: VariableTypes): void;
+    set(key: string, value: any, type: string): void;
 
-    syncVariablesFrom(obj: any, track: any): any;
+    syncVariablesFrom(obj: {[key: string]: VariableDefinition}, track?: boolean, prune?: boolean): {created: string[], updated: string[], deleted: string[]} | undefined;
 
-    syncVariablesTo(obj: any): any;
+    syncVariablesTo(obj?: {[key: string]: VariableDefinition}): {[key: string]: VariableDefinition};
 
     toJSON(): any;
 
@@ -757,23 +779,33 @@ export class VariableScope extends Property implements VariableScopeDefinition {
 
     unset(key: string): void;
 
-    variables(): any;
+    variables(): {[key: string]: VariableDefinition};
 
     static isVariableScope(obj: any): boolean;
 }
 
-export class Version extends PropertyBase {
-    build: string;
-    major: string;
-    minor: string;
-    patch: string;
-    prerelease: string;
-    raw: string;
-    string: string;
+export interface VersionDefinition extends PropertyBaseDefinition {
+    build?: string;
+    major?: string;
+    minor?: string;
+    patch?: string;
+    prerelease?: string;
+    raw?: string;
+    version?: string;
+}
 
-    constructor(options: any /*TODO | string*/);
+export class Version extends PropertyBase<VersionDefinition> implements VersionDefinition {
+    build?: string;
+    major?: string;
+    minor?: string;
+    patch?: string;
+    prerelease?: string;
+    raw?: string;
+    string?: string;
 
-    set(value: any /*TODO | string*/): void;
+    constructor(options?: VersionDefinition | string);
+
+    set(value?: VersionDefinition | string): void;
 
     toString(): string;
 }
diff --git a/types/postman-collection/postman-collection-tests.ts b/types/postman-collection/postman-collection-tests.ts
index 9f98e7d689..4e7cd41263 100644
--- a/types/postman-collection/postman-collection-tests.ts
+++ b/types/postman-collection/postman-collection-tests.ts
@@ -1,26 +1,870 @@
 import * as pmCollection from 'postman-collection';
 
+// PropertyBaseDefinition tests
+const pbDef: pmCollection.PropertyBaseDefinition = {};
+pbDef.description; // $ExpectType string | DescriptionDefinition | undefined
+
+// PropertyBase tests
+const PropertyBase = pmCollection.PropertyBase;
+
+let pb = new PropertyBase();
+pb = new PropertyBase("string definition");
+pb = new PropertyBase({description: "string description"});
+pb = new PropertyBase({info: {}});
+pb = new PropertyBase({info: {description: "string description"}});
+
+pb.description; // $ExpectType string | DescriptionDefinition | undefined
+pb.findInParents("string"); // $ExpectType PropertyBase<PropertyBaseDefinition>
+pb.findInParents("string", (el) => true); // $ExpectType PropertyBase<PropertyBaseDefinition>
+
+pb.findParentContaining("string", (el) => true); // $ExpectType PropertyBase<PropertyBaseDefinition>
+
+pb.forEachParent((el) => {}); // $ExpectType void
+pb.forEachParent({withRoot: true}, (el) => {}); // $ExpectType void
+
+pb.meta(); // $ExpectType any
+
+pb.parent(); // $ExpectType PropertyBase<PropertyBaseDefinition> | undefined
+
+pb.setParent(pb); // $ExpectType void
+
+pb.toJSON(); // $ExpectType {}
+
+PropertyBase.propertyIsMeta(null, "string"); // $ExpectType boolean
+
+PropertyBase.propertyUnprefixMeta(null, "_String"); // $ExpectType string
+
+PropertyBase.toJSON({}); // $ExpectType any
+
+// PropertyDefinition Tests
+const propDef: pmCollection.PropertyDefinition = {};
+propDef.id; // $ExpectType string | undefined
+propDef.name; // $ExpectType string | undefined
+propDef.disabled; // $$ExpectType boolean | undefined
+propDef.description; // $$ExpectType string | DescriptionDefinition | undefined
+
+// Property Tests
+const Property = pmCollection.Property;
+let p = new Property();
+p = new Property(propDef);
+p = new Property({info: propDef, disabled: true});
+
+p.id; // $ExpectType string
+p.name; // $ExpectType string
+p.disabled; // $ExpectType boolean
+
+p.describe("string"); // $ExpectType void
+p.describe("String", "string"); // $ExpectType void
+
+p.toObjectResolved(null, []); // $ExpectType {}
+p.toObjectResolved({variables: new pmCollection.VariableList(p, [])}, []); // $ExpectType {}
+p.toObjectResolved(null, [], {ignoreOwnVariables: true}); // $ExpectType {}
+
+Property.replaceSubstitutions("string", new pmCollection.VariableList(p, [])); // $ExpectType string
+Property.replaceSubstitutionsIn({}, [new pmCollection.VariableList(p, [])], false); // $ExpectType {}
+
+// CertificateDefinition Tests
+const certDef: pmCollection.CertificateDefinition = {};
+certDef.matches; // $ExpectType string[] | UrlMatchPatternList | undefined
+certDef.key; // $ExpectType string | { src?: string | undefined; } | undefined
+certDef.cert; // $ExpectType string | { src?: string | undefined; } | undefined
+certDef.passphrase; // $ExpectType string | undefined
+
+// Certificate Tests
 const certificate = new pmCollection.Certificate({});
-certificate.cert; // $ExpectType any
-certificate.id; // $ExpectType string
-certificate.key; // $ExpectType any
-certificate.matches; // $ExpectType any[]
-certificate.name; // $ExpectType string
+certificate.cert; // $ExpectType { src?: string | undefined; }
+certificate.key; // $ExpectType { src?: string | undefined; }
+certificate.matches; // $ExpectType UrlMatchPatternList
 certificate.passphrase; // $ExpectType string
-certificate.auth; // $ExpectType RequestAuth
-certificate.disabled; // $ExpectType boolean
 
-certificate.canApplyTo("string"); // $ExpectType any
-certificate.canApplyTo(new pmCollection.Url({})); // $ExpectType any
+certificate.canApplyTo("string"); // $ExpectType boolean
+certificate.canApplyTo(new pmCollection.Url({host: "string", path: "string"})); // $ExpectType boolean
 
-certificate.toJSON(); // $ExpectType CertificateDefinition
 certificate.update({}); // $ExpectType void
 
-certificate as pmCollection.Property; // $ExpectType Property
-
 pmCollection.Certificate.isCertificate(certificate); // $ExpectType boolean
 
+// PropertyList Tests
+const pList = new pmCollection.PropertyList<pmCollection.Certificate>("Certificate", null, []);
+pList.add(certificate); // $ExpectType void
+pList.all(); // $ExpectType Certificate[]
+pList.append(certificate); // $ExpectType void
+pList.assimilate(pList, false); // $ExpectType void
+pList.assimilate([certificate], false); // ExpectType void
+pList.clear(); // $ExpectType void
+pList.count(); // $ExpectType number
+pList.each((el: pmCollection.Certificate) => {}); // $ExpectType void
+pList.each((el: pmCollection.Certificate) => {}, pList); // $ExpectType void
+pList.eachParent((el: any) => {}); // $ExpectType void
+pList.eachParent((el: any) => {}, pList); // $ExpectType void
+pList.filter((el) => true, pList); // $ExpectType Certificate[]
+pList.find((el) => true, pList); // $ExpectType Certificate
+pList.get("string"); // $ExpectType Certificate | undefined
+pList.has("string"); // $ExpectType boolean
+pList.has("string", null); // $ExpectType boolean
+pList.has(certificate); // $ExpectType boolean
+pList.idx(1); // ExpectType Certificate
+pList.indexOf("string"); // ExpectType number
+pList.insert(certificate, "string"); // ExpectType void
+pList.insert(certificate, certificate); // ExpectType void
+pList.insertAfter(certificate, "string"); // ExpectType void
+pList.insertAfter(certificate, certificate); // ExpectType void
+pList.map((el) => el); // ExpectType any
+pList.map((el) => el, pList); // ExpectType any
+pList.one("string"); // ExpectType Certificate
+pList.populate([]); // ExpectType void
+pList.remove((el) => true, pList); // ExpectType void
+pList.remove("string", pList); // ExpectType void
+pList.remove(certificate, pList); // $ExpectType void
+pList.repopulate(null); // $ExpectType void
+pList.toJSON(); // $ExpectType any
+pList.toObject(true, true, true, true); // $ExpectType any
+pList.toString(); // $ExpectType string
+pList.upsert(certificate); // $ExpectType boolean | null
+pmCollection.PropertyList.isPropertyList(pList); // $ExpectType boolean
+
+// CertificateList Tests
+const certList = new pmCollection.CertificateList(null, [pList]);
+certList.resolveOne("string"); // $ExpectType CertificateDefinition
+pmCollection.CertificateList.isCertificateList(certList); // $ExpectType boolean
+
+// ItemGroupDefinition Tests
+const igDef: pmCollection.ItemGroupDefinition = {};
+igDef.item; // $ExpectType (ItemGroupDefinition | ItemDefinition)[] | undefined
+igDef.auth; // $ExpectType RequestAuthDefinition | undefined
+igDef.event; // $ExpectType EventDefinition[] | undefined
+
+// ItemGroup Tests
+const ig = new pmCollection.ItemGroup<pmCollection.Certificate>();
+ig.auth; // $ExpectType RequestAuth | undefined
+ig.items; // $ExpectType PropertyList<Certificate>
+ig.events; // $ExpectType EventList
+
+ig.authorizeRequestsUsing("string"); // $ExpectType void
+ig.authorizeRequestsUsing({}); // $ExpectType void
+ig.authorizeRequestsUsing("string", new pmCollection.VariableList(ig, [])); // $ExpectType void
+
+ig.forEachItem((el) => {}); // $ExpectType void
+ig.forEachItemGroup((el) => {}); // $ExpectType void
+
+ig.oneDeep("string"); // $ExpectType Certificate
+
+pmCollection.ItemGroup.isItemGroup(ig); // $ExpectType boolean
+
+// CollectionDefinition Tests
+const colDef: pmCollection.CollectionDefinition = {};
+colDef.info; // $ExpectType { id?: string | undefined; name?: string | undefined; version?: string | undefined; } | undefined
+colDef.variable; // $ExpectType VariableDefinition | undefined
+
 let collection: pmCollection.Collection;
 collection = new pmCollection.Collection();
 collection = new pmCollection.Collection({});
 collection = new pmCollection.Collection({}, []);
+
+collection.events; // $ExpectType EventList
+collection.variables; // $ExpectType VariableList
+collection.version; // $ExpectType Version | undefined
+// TODO update when get to VariableList
+collection.syncVariablesFrom({}); // $ExpectType any
+// TODO update
+collection.syncVariablesFrom({}, true); // ExpectType any
+
+// TODO update
+collection.syncVariablesTo({}); // ExpectType any
+collection.toJSON(); // $ExpectType CollectionDefinition
+
+pmCollection.Collection.isCollection(collection); // $ExpectType boolean
+
+// CookieDefinition Tests
+const cookieDef: pmCollection.CookieDefinition = {
+    domain: "string",
+    path: "string"
+};
+cookieDef.key; // $ExpectType string | undefined
+cookieDef.value; // ExpectType string | undefined
+cookieDef.expires; // $ExpectType string | Date | undefined
+cookieDef.maxAge; // $ExpectType number | undefined
+cookieDef.domain; // $ExpectType string
+cookieDef.path; // $ExpectType string
+cookieDef.secure; // $ExpectType boolean | undefined
+cookieDef.httpOnly; // $ExpectType boolean | undefined
+cookieDef.hostOnly; // $ExpectType boolean | undefined
+cookieDef.session; // $ExpectType boolean | undefined
+cookieDef.extensions; // $ExpectType { key: string; value: string; }[] | undefined
+
+// Cookie Tests
+
+let cookie = new pmCollection.Cookie();
+cookie = new pmCollection.Cookie(cookieDef);
+
+cookie.domain; // $ExpectType string
+cookie.expires; // $ExpectType Date
+cookie.extensions; // $ExpectType { key: string; value: string; }[] | undefined
+cookie.hostOnly; // $ExpectType boolean | undefined
+cookie.httpOnly; // $ExpectType boolean | undefined
+cookie.maxAge; // $ExpectType number | undefined
+cookie.path; // $ExpectType string
+cookie.secure; // $ExpectType boolean | undefined
+cookie.session; // $ExpectType boolean | undefined
+cookie.value; // $ExpectType string | undefined
+
+cookie.update(cookieDef); // $ExpectType void
+
+cookie.valueOf(); // $ExpectType string
+
+pmCollection.Cookie.isCookie({}); // $ExpectType boolean
+pmCollection.Cookie.parse("string"); // $ExpectType CookieDefinition
+pmCollection.Cookie.splitParam("string"); // $ExpectType { key: string; value: string | boolean; }
+
+// CookieList Tests
+
+const cookieList = new pmCollection.CookieList(null, [cookie]);
+
+pmCollection.CookieList.isCookieList(cookieList); // $ExpectType boolean
+
+// DescriptionDefinition Tests
+
+const descDef: pmCollection.DescriptionDefinition = {
+    content: "string",
+    type: "string"
+};
+descDef.content; // $ExpectType string
+descDef.type; // $ExpectType string | undefined
+
+// Description Tests
+
+let desc = new pmCollection.Description();
+desc = new pmCollection.Description("string");
+desc = new pmCollection.Description(descDef);
+
+desc.content; // $ExpectType string
+desc.type; // $ExpectType string
+
+desc.toJSON(); // $ExpectType DescriptionDefinition
+desc.toString(); // $ExpectType string
+desc.update("string"); // $ExpectType void
+desc.update("string", "string"); // $ExpectType void
+desc.update(descDef); // $ExpectType void
+
+pmCollection.Description.isDescription(desc); // $ExpectType boolean
+
+// EventDefinition Tests
+
+const eventDesc: pmCollection.EventDefinition = {
+    script: "string"
+};
+eventDesc.listen; // $ExpectType string | undefined
+eventDesc.script; // $ExpectType string | string[] | ScriptDefinition | Script
+
+// Event Tests
+
+const event = new pmCollection.Event(eventDesc);
+event.listen; // $ExpectType string | undefined
+event.script; // $ExpectType Script
+
+event.update(eventDesc); // $ExpectType void
+
+// EventList Tests
+
+const eventList = new pmCollection.EventList(null, [event]);
+eventList.listeners("string"); // $ExpectType Event[]
+eventList.listenersOwn("string"); // $ExpectType Event[]
+
+pmCollection.EventList.isEventList(eventList); // $ExpectType boolean
+
+// FormParamDefinition Tests
+
+const fpDef: pmCollection.FormParamDefinition = {};
+fpDef.key; // $ExpectType string | undefined
+fpDef.value; // $ExpectType any
+
+// FormParam Tests
+
+const fp = new pmCollection.FormParam(fpDef);
+fp.key; // $ExpectType string
+fp.value; // $ExpectType any
+
+fp.toString(); // $ExpectType string
+fp.valueOf(); // $ExpectType any
+
+// HeaderDefinition Tests
+
+const headerDef: pmCollection.HeaderDefinition = {
+    key: "string",
+    value: "string"
+};
+headerDef.key; // $ExpectType string | undefined
+headerDef.value; // $ExpectType string | undefined
+headerDef.system; // $ExpectType boolean | undefined
+
+// Header Tests
+
+let header = new pmCollection.Header("string");
+header = new pmCollection.Header("string", "string");
+header = new pmCollection.Header(headerDef);
+
+header.key; // $ExpectType string
+header.value; // $ExpectType string
+
+header.toString(); // $ExpectType string
+
+header.update(headerDef); // $ExpectType void
+
+header.valueOf(); // $ExpectType string
+
+pmCollection.Header.create("string"); // $ExpectType Header
+pmCollection.Header.create("string", "string"); // $ExpectType Header
+pmCollection.Header.create(headerDef, "string"); // $ExpectType Header
+
+pmCollection.Header.isHeader(header); // $ExpectType boolean
+
+pmCollection.Header.parse("string"); // $ExpectType HeaderDefinition[]
+
+pmCollection.Header.parseSingle("string"); // $ExpectType HeaderDefinition
+
+pmCollection.Header.unparse(new pmCollection.HeaderList(null, [header])); // $ExpectType string
+pmCollection.Header.unparse([headerDef]); // $ExpectType string
+pmCollection.Header.unparse([headerDef], "\n"); // $ExpectType string
+
+pmCollection.Header.unparseSingle(headerDef); // $ExpectType string
+
+// HeaderList Tests
+
+const headerList = new pmCollection.HeaderList(null, [header]);
+
+headerList.contentSize(); // $ExpectType number
+
+pmCollection.HeaderList.isHeaderList(headerList); // $ExpectType boolean
+
+// ItemDefinition Tests
+
+const itemDef: pmCollection.ItemDefinition = {};
+itemDef.request; // $ExpectType RequestDefinition | undefined
+itemDef.responses; // $ExpectType ResponseDefinition[] | undefined
+itemDef.events; // $ExpectType EventDefinition[] | undefined
+
+// Item Tests
+let item = new pmCollection.Item();
+item = new pmCollection.Item(itemDef);
+
+item.events; // $ExpectType EventList
+item.request; // $ExpectType Request
+item.responses; // $ExpectType PropertyList<Response>
+
+item.authorizeRequestUsing("string"); // $ExpectType void
+item.authorizeRequestUsing({}); // $ExpectType void
+item.authorizeRequestUsing("string", new pmCollection.VariableList(item, [])); // $ExpectType void
+
+item.getAuth(); // $ExpectType RequestAuth
+
+item.getEvents(); // $ExpectType Event[]
+item.getEvents("string"); // $ExpectType Event[]
+
+pmCollection.Item.isItem(item); // $ExpectType boolean
+
+// ProxyConfigDefinition Tests
+
+const proxyConfDef: pmCollection.ProxyConfigDefinition = {};
+proxyConfDef.match; // $ExpectType string | { pattern: string; } | UrlMatchPattern | undefined
+proxyConfDef.host; // $ExpectType string | undefined
+proxyConfDef.port; // $ExpectType number | undefined
+proxyConfDef.tunnel; // $ExpectType boolean | undefined
+
+// ProxyConfig Tests
+
+let proxyConf = new pmCollection.ProxyConfig();
+proxyConf = new pmCollection.ProxyConfig(proxyConfDef);
+
+proxyConf.host; // $ExpectType string
+proxyConf.match; // $ExpectType UrlMatchPattern
+proxyConf.port; // $ExpectType number
+proxyConf.tunnel; // $ExpectType boolean
+
+proxyConf.getProtocols(); // $ExpectType string[]
+
+proxyConf.getProxyUrl(); // $ExpectType string
+
+proxyConf.test("string"); // $ExpectType boolean
+
+proxyConf.update(proxyConfDef); // $ExpectType void
+
+proxyConf.updateProtocols(["string"]); // $ExpectType void
+
+pmCollection.ProxyConfig.isProxyConfig(proxyConf); // $ExpectType boolean
+
+// ProxyConfigList Tests
+
+const proxyConfigList = new pmCollection.ProxyConfigList(null, [proxyConf]);
+
+proxyConfigList.resolve("string"); // $ExpectType ProxyConfig
+proxyConfigList.resolve(new pmCollection.Url({host: "string", path: "string"})); // $ExpectType ProxyConfig
+
+pmCollection.ProxyConfigList.isProxyConfigList(proxyConfigList); // $ExpectType boolean
+
+// QueryParamDefinition Tests
+
+const qpDef: pmCollection.QueryParamDefinition = {
+    key: null,
+    value: null
+};
+qpDef.key; // $ExpectType string | null
+qpDef.value; // $ExpectType string | null
+qpDef.system; // $ExpectType boolean | undefined
+
+// QueryParam Tests
+
+let qp = new pmCollection.QueryParam("string");
+qp = new pmCollection.QueryParam(qpDef);
+
+qp.key; // $ExpectType string | null
+qp.value; // $ExpectType string | null
+qp.system; // $ExpectType boolean | undefined
+
+qp.toString(); // $ExpectType string
+
+qp.update("string"); // $ExpectType void
+qp.update({key: "string"}); // $ExpectType void
+qp.update({key: "string", value: "string"}); // $ExpectType void
+
+qp.valueOf(); // $ExpectType string
+
+pmCollection.QueryParam._postman_propertyAllowsMultipleValues; // $ExpectType boolean
+pmCollection.QueryParam._postman_propertyIndexKey; // $ExpectType string
+
+pmCollection.QueryParam.parse("string"); // $ExpectType QueryParamDefinition[]
+
+pmCollection.QueryParam.parseSingle("string", 1, ["string"]); // $ExpectType QueryParamDefinition
+
+pmCollection.QueryParam.unparse([qpDef]); // $ExpectType string
+pmCollection.QueryParam.unparse([qpDef], {encode: true}); // $ExpectType string
+pmCollection.QueryParam.unparse([qpDef], {encode: true, ignoreDisabled: true}); // $ExpectType string
+
+pmCollection.QueryParam.unparseSingle(qpDef, true); // $ExpectType string
+
+// RequestDefinition Tests
+
+const reqDef: pmCollection.RequestDefinition = {
+    url: "string"
+};
+reqDef.url; // $ExpectType string | Url
+reqDef.method; // $ExpectType string | undefined
+reqDef.header; // $ExpectType HeaderDefinition | undefined
+reqDef.body; // $ExpectType RequestBody | undefined
+reqDef.auth; // $ExpectType RequestAuthDefinition | undefined
+reqDef.proxy; // $ExpectType ProxyConfigDefinition | undefined
+reqDef.certificate; // $ExpectType CertificateDefinition | undefined
+
+// Request Tests
+let req = new pmCollection.Request("string");
+req = new pmCollection.Request(reqDef);
+
+req.auth; // $ExpectType RequestAuth | undefined
+req.body; // $ExpectType RequestBody | undefined
+req.certificate; // $ExpectType Certificate | undefined
+req.headers; // $ExpectType HeaderList
+req.method; // $ExpectType string
+req.proxy; // $ExpectType ProxyConfig | undefined
+req.url; // $ExpectType Url
+
+req.update(reqDef); // $ExpectType void
+
+req.authorizeUsing("string"); // $ExpectType void
+req.authorizeUsing({}); // $ExpectType void
+req.authorizeUsing(null); // $ExpectType void
+req.authorizeUsing("string", new pmCollection.VariableList(p, []));
+
+req.getHeaders(); // $ExpectType any
+req.getHeaders({ignoreCase: true}); // $ExpectType any
+req.getHeaders({enabled: true}); // $ExpectType any
+req.getHeaders({ignoreCase: true, enabled: true}); // $ExpectType any
+
+req.forEachHeader((header: pmCollection.Header, context: pmCollection.Request) => {}); // $ExpectType void
+
+req.addHeader(header); // $ExpectType void
+req.addHeader(headerDef); // $ExpectType void
+
+req.removeHeader("string"); // $ExpectType void
+req.removeHeader(header); // $ExpectType void
+req.removeHeader(header, {ignoreCase: true}); // $ExpectType void
+
+req.upsertHeader(headerDef); // $ExpectType void
+
+req.addQueryParams("string"); // $ExpectType void
+req.addQueryParams([qpDef]); // $ExpectType void
+
+// TODO check these - they might also need plain qpDef as a parameter
+req.removeQueryParams("string"); // $ExpectType void
+req.removeQueryParams(["string"]); // $ExpectType void
+req.removeQueryParams([qpDef]); // $ExpectType void
+
+req.toJSON(); // $ExpectType RequestDefinition
+
+req.clone(); // $ExpectType Request
+
+pmCollection.Request.isRequest(req); // $ExpectType boolean
+
+// RequestAuthDefinition Tests
+
+const reqAuthDef: pmCollection.RequestAuthDefinition = {};
+reqAuthDef.type; // $ExpectType string | undefined
+
+// RequestAuth Tests
+
+let reqAuth = new pmCollection.RequestAuth(reqAuthDef);
+reqAuth = new pmCollection.RequestAuth(reqAuthDef, collection);
+
+reqAuth.type; // $ExpectType string
+
+reqAuth.update(new pmCollection.VariableList(collection, [])); // $ExpectType void
+reqAuth.update({key: "string", value: "string"}); // $ExpectType void
+reqAuth.update([{key: "string", value: "string"}]); // $ExpectType void
+reqAuth.update([{key: "string", value: "string"}], "string"); // $ExpectType void
+
+reqAuth.use("string", new pmCollection.VariableList(collection, [])); // $ExpectType void
+reqAuth.use("string", {key: "string", value: "string"}); // $ExpectType void
+reqAuth.use("string", [{key: "string", value: "string"}]); // $ExpectType void
+
+reqAuth.current(); // $ExpectType any
+
+reqAuth.parameters(); // $ExpectType VariableList
+
+reqAuth.clear("string"); // $ExpectType void
+
+pmCollection.RequestAuth.isValidType(reqAuth); // $ExpectType boolean
+
+// RequestBodyDefinition Tests
+
+const reqBodyDef: pmCollection.RequestBodyDefinition = {mode: 'raw'};
+reqBodyDef.mode; // $ExpectType string
+reqBodyDef.raw; // $ExpectType string | undefined
+reqBodyDef.urlencoded; // $ExpectType string | QueryParamDefinition[] | PropertyList<QueryParam> | undefined
+reqBodyDef.file; // $ExpectType string | { src: string; } | undefined
+reqBodyDef.formdata; // $ExpectType FormParamDefinition[] | PropertyList<FormParam> | undefined
+
+// RequestBody Tests
+
+const reqBody = new pmCollection.RequestBody(reqBodyDef);
+
+reqBody.file; // $ExpectType { src: string; } | undefined
+reqBody.formdata; // $ExpectType PropertyList<FormParam> | undefined
+reqBody.mode; // $ExpectType string
+reqBody.raw; // $ExpectType string | undefined
+reqBody.urlencoded; // $ExpectType PropertyList<QueryParam> | undefined
+
+reqBody.update(reqBodyDef); // $ExpectType void
+
+reqBody.toString(); // $ExpectType string
+
+reqBody.isEmpty(); // $ExpectType boolean
+
+pmCollection.RequestBody.MODES.raw; // $ExpectType string
+pmCollection.RequestBody.MODES.formdata; // $ExpectType string
+pmCollection.RequestBody.MODES.urlencoded; // $ExpectType string
+pmCollection.RequestBody.MODES.file; // $ExpectType string
+
+// ResponseDefinition Tests
+const respDef: pmCollection.ResponseDefinition = {code: 200, responseTime: 1};
+respDef.code; // $ExpectType number
+respDef.header; // $ExpectType HeaderDefinition[] | undefined
+respDef.cookie; // $ExpectType CookieDefinition[] | undefined
+respDef.body; // $ExpectType string | undefined
+respDef.stream; // $ExpectType Buffer | Uint8Array | undefined
+respDef.responseTime; // $ExpectType number
+respDef.originalRequest; // $ExpectType RequestDefinition | undefined
+
+// Response Tests
+const response = new pmCollection.Response(respDef);
+response.body; // $ExpectType string | undefined
+response.code; // $ExpectType number
+response.cookies; // $ExpectType CookieList
+response.headers; // $ExpectType HeaderList
+response.originalRequest; // $ExpectType Request | undefined
+response.responseTime; // $ExpectType number
+response.status; // $ExpectType string
+response.stream; // $ExpectType Buffer | Uint8Array | undefined
+response.responseSize; // $ExpectType number | undefined
+
+response.update(respDef); // $ExpectType void
+
+response.toJSON(); // $ExpectType any
+
+response.reason(); // ExpectType string | undefined
+
+response.details(); // $ExpectType { name: string; detail: string; code: number; standardName: string; } | undefined
+
+response.text(); // $ExpectType string | undefined
+
+response.json(); // $ExpectType any
+
+response.dataURI(); // $ExpectType string
+
+response.size(); // $ExpectType number
+
+response.encoding(); // $ExpectType { format: string; source: string; }
+
+pmCollection.Response.createFromNode({body: "string", statusCode: 200, elapsedTime: 1}, []); // $ExpectType Response
+
+pmCollection.Response.isResponse(response); // $ExpectType boolean
+
+// ScriptDefinition Tests
+
+const scriptDef: pmCollection.ScriptDefinition = {};
+scriptDef.type; // $ExpectType string | undefined
+scriptDef.src; // $ExpectType string | Url | undefined
+scriptDef.exec; // $ExpectType string | string[] | undefined
+
+// Script Tests
+
+let script = new pmCollection.Script();
+script = new pmCollection.Script(scriptDef);
+script = new pmCollection.Script("string");
+script = new pmCollection.Script(["string"]);
+
+script.exec; // $ExpectType string[] | undefined
+script.src; // $ExpectType Url | undefined
+script.type; // $ExpectType string
+
+script.update(scriptDef); // $ExpectType void
+script.update("string"); // $ExpectType void
+script.update(["string"]); // $ExpectType void
+
+script.toSource(); // $ExpectType string | undefined
+
+pmCollection.Script.isScript(script); // $ExpectType boolean
+
+// UrlDefinition Tests
+
+let urlDef: pmCollection.UrlDefinition = {
+    host: "string",
+    path: "string"
+};
+urlDef = {
+    host: ["string"],
+    path: ["string"]
+};
+
+urlDef.auth; // $ExpectType { user: string; password: string; } | undefined
+urlDef.hash; // $ExpectType string | undefined
+urlDef.host; // $ExpectType string | string[] | undefined
+urlDef.path; // $ExpectType string | string[]
+urlDef.port; // $ExpectType string | undefined
+urlDef.query; // $ExpectType string | QueryParamDefinition[] | PropertyList<QueryParam> | undefined
+urlDef.variable; // $ExpectType VariableDefinition[] | undefined
+urlDef.protocol; // $ExpectType string | undefined
+
+// Url Tests
+
+let url = new pmCollection.Url(urlDef);
+url = new pmCollection.Url("string");
+
+url.auth; // $ExpectType { user: string; password: string; } | undefined
+url.hash; // $ExpectType string | undefined
+url.host; // $ExpectType string[] | undefined
+url.path; // $ExpectType string[]
+url.port; // $ExpectType string | undefined
+url.protocol; // $ExpectType string | undefined
+url.query; // $ExpectType PropertyList<QueryParam>
+url.variables; // $ExpectType VariableList
+
+url.addQueryParams("string"); // $ExpectType void
+url.addQueryParams([qp, qpDef]); // $ExpectType void
+
+url.removeQueryParams("string"); // $ExpectType void
+url.removeQueryParams(["string"]); // $ExpectType void
+url.removeQueryParams(qp); // $ExpectType void
+url.removeQueryParams([qp]); // $ExpectType void
+
+url.getRaw(); // $ExpectType string
+
+url.toString(); // $ExpectType string
+url.toString(false); // $ExpectType string
+
+url.getPath(); // $ExpectType string
+url.getPath({unresolved: true}); // $ExpectType string
+
+url.getQueryString(); // $ExpectType string
+url.getQueryString({encode: true}); // $ExpectType string
+url.getQueryString({ignoredDisabled: true}); // $ExpectType string
+url.getQueryString({encode: true, ignoredDisabled: true}); // $ExpectType string
+
+url.getPathWithQuery(); // $ExpectType string
+
+url.getHost(); // $ExpectType string
+
+url.getRemote(); // $ExpectType string
+url.getRemote({forcePort: true}); // $ExpectType string
+
+url.getOAuth1BaseUrl(); // $ExpectType string
+
+pmCollection.Url.parse("string"); // $ExpectType UrlDefinition
+
+pmCollection.Url.isUrl(url); // $ExpectType boolean
+
+// UrlMatchPattern Tests
+let urlMatch = new pmCollection.UrlMatchPattern("string");
+urlMatch = new pmCollection.UrlMatchPattern({pattern: "string"});
+
+urlMatch.pattern; // $ExpectType string | undefined
+
+urlMatch.update({pattern: "string"}); // $ExpectType void
+
+urlMatch.createMatchPattern(); // $ExpectType { protocols: string[]; host: string; path: RegExp; } | undefined
+
+urlMatch.globPatternToRegexp("string"); // $ExpectType RegExp
+
+urlMatch.testProtocol("string"); // $ExpectType boolean
+
+urlMatch.getProtocols(); // $ExpectType string[]
+
+urlMatch.testHost("string"); // $ExpectType boolean
+
+urlMatch.matchAnyHost({protocols: [], host: "string", path: new RegExp('')}); // $ExpectType boolean
+
+urlMatch.matchSuffixHostPattern({protocols: [], host: "string", path: new RegExp('')}, "string"); // $ExpectType boolean
+
+urlMatch.matchAbsoluteHostPattern({protocols: [], host: "string", path: new RegExp('')}, "string"); // $ExpectType boolean
+
+urlMatch.testPath("string"); // $ExpectType boolean
+
+urlMatch.test("string"); // $ExpectType boolean
+
+urlMatch.toString(); // $ExpectType string
+
+urlMatch.toJSON(); // $ExpectType { pattern: string; }
+
+pmCollection.UrlMatchPattern.MATCH_ALL_URLS; // $ExpectType string
+
+pmCollection.UrlMatchPattern.PROTOCOL_DELIMITER; // $ExpectType string
+
+// UrlMatchPatternList Tests
+const urlMatchList = new pmCollection.UrlMatchPatternList(collection, []);
+
+urlMatchList.test("string"); // $ExpectType boolean
+
+// VariableDefinition Tests
+const varDef: pmCollection.VariableDefinition = {};
+varDef.value; // $ExpectType any
+varDef.type; // $ExpectType string | undefined
+varDef.key; // $ExpectType string | undefined
+
+// Variable Tests
+let variable = new pmCollection.Variable(varDef);
+variable = new pmCollection.Variable({key: varDef});
+
+variable.key; // $ExpectType string | undefined
+variable.type; // $ExpectType string
+variable.value; // $ExpectType any
+
+variable.get(); // $ExpectType any
+
+variable.set(null); // $ExpectType void
+
+variable.valueOf(null); // $ExpectType any
+
+variable.toString(); // $ExpectType string
+
+variable.cast({}); // $ExpectType any
+
+variable.castIn({}); // $ExpectType any
+
+variable.castOut({}); // $ExpectType any
+
+variable.valueType("string", true); // $ExpectType string
+
+variable.update(varDef); // $ExpectType void
+
+pmCollection.Variable.isVariable(variable); // $ExpectType boolean
+
+pmCollection.Variable.types.string; // $ExpectType StringConstructor
+pmCollection.Variable.types.boolean; // $ExpectType BooleanConstructor
+pmCollection.Variable.types.number; // $ExpectType NumberConstructor
+pmCollection.Variable.types.json; // $ExpectType { in: (val: any) => string; out: (val: string) => any; }
+pmCollection.Variable.types.any; // $ExpectType { in: <T>(val: T) => T; out: <T>(val: T) => T; }
+
+// VariableList Tests
+
+const vList = new pmCollection.VariableList(collection, [variable]);
+
+vList.replace("string"); // $ExpectType string
+vList.replace("string", vList); // $ExpectType string
+
+vList.substitute("string"); // $ExpectType "string"
+vList.substitute({}, vList); // $ExpectType {}
+vList.substitute(null, vList, false); // $ExpectType null
+
+vList.syncFromObject({}); // $ExpectType { created: string[]; updated: string[]; deleted: string[]; } | undefined
+vList.syncFromObject({}, false); // $ExpectType { created: string[]; updated: string[]; deleted: string[]; } | undefined
+vList.syncFromObject({}, false, false); // $ExpectType { created: string[]; updated: string[]; deleted: string[]; } | undefined
+
+vList.syncToObject(); // $ExpectType { [key: string]: VariableDefinition; }
+vList.syncToObject({key: varDef}); // $ExpectType { [key: string]: VariableDefinition; }
+
+pmCollection.VariableList.isVariableList(vList); // $ExpectType boolean
+
+// VariableScopeDefinition Tests
+const varScopeDef: pmCollection.VariableScopeDefinition = {};
+varScopeDef.values; // $ExpectType VariableDefinition[] | undefined
+
+// VariableScope Tests
+let varScope = new pmCollection.VariableScope(varScopeDef, []);
+varScope = new pmCollection.VariableScope(vList, []);
+varScope = new pmCollection.VariableScope([varDef], []);
+varScope = new pmCollection.VariableScope(varScopeDef, [vList]);
+
+varScope.values; // $ExpectType VariableDefinition[] | undefined
+
+varScope.variables(); // ExpectType { [key: string]: VariableDefinition; }
+
+varScope.toObject(false, false); // $ExpectType any
+
+varScope.has("string"); // $ExpectType boolean
+
+varScope.get("string"); // $ExpectType any
+
+varScope.set("string", {}, "any"); // $ExpectType void
+
+varScope.unset("string"); // $ExpectType void
+
+varScope.clear(); // $ExpectType void
+
+varScope.syncVariablesFrom({}); // $ExpectType { created: string[]; updated: string[]; deleted: string[]; } | undefined
+varScope.syncVariablesFrom({}, false); // $ExpectType { created: string[]; updated: string[]; deleted: string[]; } | undefined
+varScope.syncVariablesFrom({}, false, false); // $ExpectType { created: string[]; updated: string[]; deleted: string[]; } | undefined
+
+varScope.syncVariablesTo(); // $ExpectType { [key: string]: VariableDefinition; }
+varScope.syncVariablesTo({key: varDef}); // $ExpectType { [key: string]: VariableDefinition; }
+
+varScope.toJSON(); // $ExpectType any
+
+varScope.addLayer(vList); // $ExpectType void
+
+pmCollection.VariableScope.isVariableScope(varScope); // $ExpectType boolean
+
+// VersionDefinition Tests
+const verDef: pmCollection.VersionDefinition = {};
+verDef.build; // $ExpectType string | undefined
+verDef.major; // $ExpectType string | undefined
+verDef.minor; // $ExpectType string | undefined
+verDef.patch; // $ExpectType string | undefined
+verDef.prerelease; // $ExpectType string | undefined
+verDef.raw; // $ExpectType string | undefined
+verDef.version; // $ExpectType string | undefined
+
+// Version Tests
+let version = new pmCollection.Version();
+version = new pmCollection.Version(verDef);
+version = new pmCollection.Version("string");
+
+version.build; // $ExpectType string | undefined
+version.major; // $ExpectType string | undefined
+version.minor; // $ExpectType string | undefined
+version.patch; // $ExpectType string | undefined
+version.prerelease; // $ExpectType string | undefined
+version.raw; // $ExpectType string | undefined
+version.string; // $ExpectType string | undefined
+
+version.set(); // ExpectType void
+version.set(verDef); // $ExpectType void
+version.set("string"); // $ExpectType void
+
+version.toString(); // $ExpectType string

From fd99d9184ecd3a5f3eb6560e4989533e77268332 Mon Sep 17 00:00:00 2001
From: Kyle Buzby <kbuzby@epic.com>
Date: Sun, 11 Mar 2018 21:13:02 -0500
Subject: [PATCH 0447/1382] fix some todos

---
 types/postman-collection/index.d.ts                 |  6 +++---
 .../postman-collection/postman-collection-tests.ts  | 13 ++++++-------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/types/postman-collection/index.d.ts b/types/postman-collection/index.d.ts
index a02953720a..ba8e0e581a 100644
--- a/types/postman-collection/index.d.ts
+++ b/types/postman-collection/index.d.ts
@@ -186,9 +186,9 @@ export class Collection extends ItemGroup<Request> {
 
     constructor(definition?: CollectionDefinition, environments?: any[]);
 
-    syncVariablesFrom(obj: any, track?: boolean): any;
+    syncVariablesFrom(obj: {[key: string]: VariableDefinition}, track?: boolean, prune?: boolean): {created: string[], updated: string[], deleted: string[]} | undefined;
 
-    syncVariablesTo(obj: any): any;
+    syncVariablesTo(obj?: {[key: string]: VariableDefinition}): {[key: string]: VariableDefinition};
 
     toJSON(): CollectionDefinition;
 
@@ -466,7 +466,7 @@ export class Request extends Property<RequestDefinition> implements RequestDefin
 
     removeHeader(toRemove: string | Header, options?: {ignoreCase: boolean}): void;
 
-    removeQueryParams(params: string | string[] | QueryParamDefinition[]): void;
+    removeQueryParams(params: string | string[] | QueryParamDefinition[] | QueryParamDefinition): void;
 
     toJSON(): RequestDefinition;
 
diff --git a/types/postman-collection/postman-collection-tests.ts b/types/postman-collection/postman-collection-tests.ts
index 4e7cd41263..2574aa5917 100644
--- a/types/postman-collection/postman-collection-tests.ts
+++ b/types/postman-collection/postman-collection-tests.ts
@@ -164,13 +164,12 @@ collection = new pmCollection.Collection({}, []);
 collection.events; // $ExpectType EventList
 collection.variables; // $ExpectType VariableList
 collection.version; // $ExpectType Version | undefined
-// TODO update when get to VariableList
-collection.syncVariablesFrom({}); // $ExpectType any
-// TODO update
-collection.syncVariablesFrom({}, true); // ExpectType any
 
-// TODO update
-collection.syncVariablesTo({}); // ExpectType any
+collection.syncVariablesFrom({}); // $ExpectType { created: string[]; updated: string[]; deleted: string[]; } | undefined
+collection.syncVariablesFrom({}, true); // $ExpectType { created: string[]; updated: string[]; deleted: string[]; } | undefined
+
+collection.syncVariablesTo({}); // ExpectType $ExpectType { [key: string]: VariableDefinition; }
+
 collection.toJSON(); // $ExpectType CollectionDefinition
 
 pmCollection.Collection.isCollection(collection); // $ExpectType boolean
@@ -492,10 +491,10 @@ req.upsertHeader(headerDef); // $ExpectType void
 req.addQueryParams("string"); // $ExpectType void
 req.addQueryParams([qpDef]); // $ExpectType void
 
-// TODO check these - they might also need plain qpDef as a parameter
 req.removeQueryParams("string"); // $ExpectType void
 req.removeQueryParams(["string"]); // $ExpectType void
 req.removeQueryParams([qpDef]); // $ExpectType void
+req.removeQueryParams(qpDef); // $ExpectType void
 
 req.toJSON(); // $ExpectType RequestDefinition
 

From 2c742a405926c84884e4bb5c718b799e60294530 Mon Sep 17 00:00:00 2001
From: DABH <DABH@users.noreply.github.com>
Date: Mon, 12 Mar 2018 05:56:10 +0000
Subject: [PATCH 0448/1382] should be v1.2.1; v1.2.0 had an issue with npm
 pubilsh

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

diff --git a/notNeededPackages.json b/notNeededPackages.json
index 06417dd58d..5c649d2368 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -238,7 +238,7 @@
             "libraryName": "colors.js (colors)",
             "typingsPackageName": "colors",
             "sourceRepoURL": "https://github.com/Marak/colors.js",
-            "asOfVersion": "1.2.0"
+            "asOfVersion": "1.2.1"
         },
         {
             "libraryName": "commander",

From ad8dfa2ef24852f204f9cf889101b9e6c273162b Mon Sep 17 00:00:00 2001
From: Brendan Forster <github@brendanforster.com>
Date: Mon, 12 Mar 2018 00:26:34 -0700
Subject: [PATCH 0449/1382] remove cruft

---
 types/textarea-caret/index.d.ts | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/types/textarea-caret/index.d.ts b/types/textarea-caret/index.d.ts
index 3306b62544..cf1cb3bb5d 100644
--- a/types/textarea-caret/index.d.ts
+++ b/types/textarea-caret/index.d.ts
@@ -17,8 +17,3 @@ interface Options {
 }
 
 declare function textarea_caret(element: HTMLElement, position: number, options?: Options): Caret;
-
-declare namespace textarea_caret {
-    const prototype: {
-    };
-}

From 8dda31f4f0a1e583cfc20159d0ec3fcacfc0b1c1 Mon Sep 17 00:00:00 2001
From: Fredrik Nicol <fredrik.nicol@gmail.com>
Date: Mon, 12 Mar 2018 08:49:18 +0100
Subject: [PATCH 0450/1382] Add length to expanded properties

---
 types/jss/css.d.ts | 232 +++++++++++++++++++++++----------------------
 1 file changed, 118 insertions(+), 114 deletions(-)

diff --git a/types/jss/css.d.ts b/types/jss/css.d.ts
index 3f01be6a62..3e5f81c582 100644
--- a/types/jss/css.d.ts
+++ b/types/jss/css.d.ts
@@ -1,130 +1,134 @@
 // These CSS typings adapted from TypeStyle: https://github.com/typestyle/typestyle
 
-import { Observable } from './observable'
-import * as csstype from 'csstype'
+import { Observable } from './observable';
+import * as csstype from 'csstype';
+
+type Length = string | number;
 
 export type ObservableProperties<P> = {
-  [K in keyof P]: P[K] | Observable<P[K]>
-}
+    [K in keyof P]: P[K] | Observable<P[K]>
+};
 
 export type CSSProperties =
-	& ObservableProperties<csstype.Properties<string | number>>
-	& ObservableProperties<csstype.PropertiesHyphen<string | number>>;
+	& ObservableProperties<csstype.Properties<Length>>
+	& ObservableProperties<csstype.PropertiesHyphen<Length>>;
 
 export interface JssProps {
-	'@global'?: CSSProperties;
-	extend?: string;
-	composes?: string | string[];
+    '@global'?: CSSProperties;
+    extend?: string;
+    composes?: string | string[];
 }
 
 export interface JssExpand {
-	animation:
-		| {
-				delay: CSSProperties['animationDelay'];
-				direction: CSSProperties['animationDirection'];
-				duration: CSSProperties['animationDuration'];
-				iterationCount: CSSProperties['animationIterationCount'];
-				name: CSSProperties['animationName'];
-				playState: CSSProperties['animationPlayState'];
-				timingFunction: any;
-			}
-		| CSSProperties['animation'];
-	background:
-		| {
-				attachment: CSSProperties['backgroundAttachment'];
-				color: CSSProperties['backgroundColor'];
-				image: CSSProperties['backgroundImage'];
-				position: CSSProperties['backgroundPosition'] | number[]; // Can be written using array e.g. `[0 0]`
-				repeat: CSSProperties['backgroundRepeat'];
-				size: Array<CSSProperties['backgroundSize'] | CSSProperties['backgroundSize']>; // Can be written using array e.g. `['center' 'center']`
-			}
-		| CSSProperties['background'];
-	border:
-		| {
-				color: CSSProperties['borderColor'];
-				style: CSSProperties['borderStyle'];
-				width: CSSProperties['borderWidth'];
-			}
-		| CSSProperties['border'];
-	boxShadow:
-		| {
-				x: any;
-				y: any;
-				blur: any;
-				spread: any;
-				color: CSSProperties['color'];
-				inset?: 'inset'; // If you want to add inset you need to write "inset: 'inset'"
-			}
-		| CSSProperties['boxShadow'];
-	flex:
-		| {
-				basis: CSSProperties['flexBasis'];
-				direction: CSSProperties['flexDirection'];
-				flow: CSSProperties['flexFlow'];
-				grow: CSSProperties['flexGrow'];
-				shrink: CSSProperties['flexShrink'];
-				wrap: CSSProperties['flexWrap'];
-			}
-		| CSSProperties['flex'];
-	font:
-		| {
-				family: CSSProperties['fontFamily'];
-				size: CSSProperties['fontSize'];
-				stretch: CSSProperties['fontStretch'];
-				style: CSSProperties['fontStyle'];
-				variant: CSSProperties['fontVariant'];
-				weight: CSSProperties['fontWeight'];
-			}
-		| CSSProperties['font'];
-	listStyle:
-		| {
-				image: CSSProperties['listStyleImage'];
-				position: CSSProperties['listStylePosition'];
-				type: CSSProperties['listStyleType'];
-			}
-		| CSSProperties['listStyle'];
-	margin:
-		| {
-				bottom: CSSProperties['marginBottom'];
-				left: CSSProperties['marginLeft'];
-				right: CSSProperties['marginRight'];
-				top: CSSProperties['marginTop'];
-			}
-		| CSSProperties['margin'];
-	padding:
-		| {
-				bottom: CSSProperties['paddingBottom'];
-				left: CSSProperties['paddingLeft'];
-				right: CSSProperties['paddingRight'];
-				top: CSSProperties['paddingTop'];
-			}
-		| CSSProperties['padding'];
-	outline:
-		| {
-				color: CSSProperties['outlineColor'];
-				style: 'none' | 'hidden' | 'dotted' | 'dashed' | 'solid' | 'double' | 'groove' | 'ridge' | 'inset' | 'outset';
-				width: any;
-			}
-		| CSSProperties['outline'];
-	textShadow:
-		| {
-				x: any;
-				y: any;
-				blur: any;
-				color: CSSProperties['color'];
-			}
-		| CSSProperties['textShadow'];
-	transition:
-		| {
-				delay: CSSProperties['transitionDelay'];
-				duration: CSSProperties['transitionDuration'];
-				property: CSSProperties['transitionProperty'];
-				timingFunction: CSSProperties['transitionTimingFunction'];
-			}
-		| CSSProperties['transition'];
+    animation:
+        | {
+              delay: CSSProperties['animationDelay'];
+              direction: CSSProperties['animationDirection'];
+              duration: CSSProperties['animationDuration'];
+              iterationCount: CSSProperties['animationIterationCount'];
+              name: CSSProperties['animationName'];
+              playState: CSSProperties['animationPlayState'];
+              timingFunction: CSSProperties['animationTimingFunction'];
+          }
+        | CSSProperties['animation'];
+    background:
+        | {
+              attachment: CSSProperties['backgroundAttachment'];
+              color: CSSProperties['backgroundColor'];
+              image: CSSProperties['backgroundImage'];
+              position: CSSProperties['backgroundPosition'] | number[]; // Can be written using array e.g. `[0 0]`
+              repeat: CSSProperties['backgroundRepeat'];
+              size:
+                  | CSSProperties['backgroundSize']
+                  | Array<CSSProperties['backgroundSize']>; // Can be written using array e.g. `['center' 'center']`
+          }
+        | CSSProperties['background'];
+    border:
+        | {
+              color: CSSProperties['borderColor'];
+              style: CSSProperties['borderStyle'];
+              width: CSSProperties['borderWidth'];
+          }
+        | CSSProperties['border'];
+    boxShadow:
+        | {
+              x: Length;
+              y: Length;
+              blur: Length;
+              spread: Length;
+              color: CSSProperties['color'];
+              inset?: 'inset'; // If you want to add inset you need to write 'inset: 'inset''
+          }
+        | CSSProperties['boxShadow'];
+    flex:
+        | {
+              basis: CSSProperties['flexBasis'];
+              direction: CSSProperties['flexDirection'];
+              flow: CSSProperties['flexFlow'];
+              grow: CSSProperties['flexGrow'];
+              shrink: CSSProperties['flexShrink'];
+              wrap: CSSProperties['flexWrap'];
+          }
+        | CSSProperties['flex'];
+    font:
+        | {
+              family: CSSProperties['fontFamily'];
+              size: CSSProperties['fontSize'];
+              stretch: CSSProperties['fontStretch'];
+              style: CSSProperties['fontStyle'];
+              variant: CSSProperties['fontVariant'];
+              weight: CSSProperties['fontWeight'];
+          }
+        | CSSProperties['font'];
+    listStyle:
+        | {
+              image: CSSProperties['listStyleImage'];
+              position: CSSProperties['listStylePosition'];
+              type: CSSProperties['listStyleType'];
+          }
+        | CSSProperties['listStyle'];
+    margin:
+        | {
+              bottom: CSSProperties['marginBottom'];
+              left: CSSProperties['marginLeft'];
+              right: CSSProperties['marginRight'];
+              top: CSSProperties['marginTop'];
+          }
+        | CSSProperties['margin'];
+    padding:
+        | {
+              bottom: CSSProperties['paddingBottom'];
+              left: CSSProperties['paddingLeft'];
+              right: CSSProperties['paddingRight'];
+              top: CSSProperties['paddingTop'];
+          }
+        | CSSProperties['padding'];
+    outline:
+        | {
+              color: CSSProperties['outlineColor'];
+              style: CSSProperties['outlineStyle'];
+              width: CSSProperties['outlineWidth'];
+          }
+        | CSSProperties['outline'];
+    textShadow:
+        | {
+              x: Length;
+              y: Length;
+              blur: Length;
+              color: CSSProperties['color'];
+          }
+        | CSSProperties['textShadow'];
+    transition:
+        | {
+              delay: CSSProperties['transitionDelay'];
+              duration: CSSProperties['transitionDuration'];
+              property: CSSProperties['transitionProperty'];
+              timingFunction: CSSProperties['transitionTimingFunction'];
+          }
+        | CSSProperties['transition'];
 }
 
 export type JssExpandArr = { [k in keyof JssExpand]?: JssExpand[k] | Array<JssExpand[k]> };
 
 export type SimpleStyle = CSSProperties & JssProps & JssExpandArr;
-export type Style = SimpleStyle | Observable<csstype.PropertiesHyphen<string | number>>;
+export type Style = SimpleStyle | Observable<csstype.PropertiesHyphen<Length>>;

From fe7d82324d69b1e8592e7fee69e9126d218a6600 Mon Sep 17 00:00:00 2001
From: rhysd <lin90162@yahoo.co.jp>
Date: Mon, 12 Mar 2018 17:27:02 +0900
Subject: [PATCH 0451/1382] Add 'html-void-elements' package

---
 .../html-void-elements-tests.ts               |  3 +++
 types/html-void-elements/index.d.ts           |  7 ++++++
 types/html-void-elements/tsconfig.json        | 23 +++++++++++++++++++
 types/html-void-elements/tslint.json          |  1 +
 4 files changed, 34 insertions(+)
 create mode 100644 types/html-void-elements/html-void-elements-tests.ts
 create mode 100644 types/html-void-elements/index.d.ts
 create mode 100644 types/html-void-elements/tsconfig.json
 create mode 100644 types/html-void-elements/tslint.json

diff --git a/types/html-void-elements/html-void-elements-tests.ts b/types/html-void-elements/html-void-elements-tests.ts
new file mode 100644
index 0000000000..584c353455
--- /dev/null
+++ b/types/html-void-elements/html-void-elements-tests.ts
@@ -0,0 +1,3 @@
+import voidElements = require('html-void-elements');
+
+voidElements.indexOf('br');
diff --git a/types/html-void-elements/index.d.ts b/types/html-void-elements/index.d.ts
new file mode 100644
index 0000000000..47f903aad0
--- /dev/null
+++ b/types/html-void-elements/index.d.ts
@@ -0,0 +1,7 @@
+// Type definitions for html-void-elements 1.0
+// Project: https://github.com/wooorm/html-void-elements
+// Definitions by: rhysd <https://github.com/rhysd>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare const TagNames: string[];
+export = TagNames;
diff --git a/types/html-void-elements/tsconfig.json b/types/html-void-elements/tsconfig.json
new file mode 100644
index 0000000000..964e5ebdd2
--- /dev/null
+++ b/types/html-void-elements/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "html-void-elements-tests.ts"
+    ]
+}
diff --git a/types/html-void-elements/tslint.json b/types/html-void-elements/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/html-void-elements/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 9ac108dbc2bcc3bbf2ef35ac2915b580149a8188 Mon Sep 17 00:00:00 2001
From: Kagami Sascha Rosylight <saschanaz@outlook.com>
Date: Mon, 12 Mar 2018 17:59:14 +0900
Subject: [PATCH 0452/1382] arguments cannot be null

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

diff --git a/types/webidl2/index.d.ts b/types/webidl2/index.d.ts
index a31fa3550e..9992642749 100644
--- a/types/webidl2/index.d.ts
+++ b/types/webidl2/index.d.ts
@@ -192,7 +192,7 @@ export interface OperationMemberType {
     /** The name of the operation. If a stringifier, may be null. */
     name: string | null;
     /** An array of arguments for the operation. */
-    arguments: Argument[] | null;
+    arguments: Argument[];
     /** A list of extended attributes. */
     extAttrs: ExtendedAttributes[];
 }

From 705de9c4e568d7d6629d03249a41bba575e94bf1 Mon Sep 17 00:00:00 2001
From: Islam Temirbek <aitemr16@gmail.com>
Date: Mon, 12 Mar 2018 16:34:30 +0600
Subject: [PATCH 0453/1382] fix(react-navigation): add iconStyle

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

diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index c4e396783f..6574c9f55c 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -623,7 +623,7 @@ export interface TabViewConfig {
     showLabel?: boolean,
     style?: StyleProp<ViewStyle>,
     labelStyle?: StyleProp<TextStyle>,
-
+    iconStyle?: StyleProp<ViewStyle>,
     // Top
     showIcon?: boolean,
     upperCaseLabel?: boolean,

From 9001491e046ab067f8e58558de067d2075f177ae Mon Sep 17 00:00:00 2001
From: MaShizhen <2473872761@qq.com>
Date: Mon, 12 Mar 2018 19:41:00 +0800
Subject: [PATCH 0454/1382] centerAndZoom(city: string): void

---
 .../baidumap-web-sdk-tests.ts                 |  45 +--
 types/baidumap-web-sdk/baidumap.core.d.ts     | 261 +++++++++---------
 2 files changed, 155 insertions(+), 151 deletions(-)

diff --git a/types/baidumap-web-sdk/baidumap-web-sdk-tests.ts b/types/baidumap-web-sdk/baidumap-web-sdk-tests.ts
index 8ac6457975..9954fd487c 100644
--- a/types/baidumap-web-sdk/baidumap-web-sdk-tests.ts
+++ b/types/baidumap-web-sdk/baidumap-web-sdk-tests.ts
@@ -1,24 +1,27 @@
 import "./index"
 namespace BMapTests {
-    export class TestFixture {
-        //document: http://lbsyun.baidu.com/index.php?title=jspopular
-        public createMap(container: string | HTMLElement) {
-            navigator.geolocation.getCurrentPosition((position: Position) => {
-                const point = new BMap.Point(position.coords.longitude, position.coords.latitude);
-                const map = new BMap.Map(container);
-                map.centerAndZoom(point, 15);
-            }, console.log, { maximumAge: 3000, timeout: 5000, enableHighAccuracy: true });
-        }
-        public addControl(map: BMap.Map) {
-            map.addControl(new BMap.ScaleControl({ anchor: BMAP_ANCHOR_TOP_LEFT }));
-            map.addControl(new BMap.NavigationControl());
-            map.addControl(new BMap.MapTypeControl({ mapTypes: [BMAP_NORMAL_MAP, BMAP_HYBRID_MAP] }));
-            map.addControl(new BMap.OverviewMapControl({ isOpen: true, anchor: BMAP_ANCHOR_BOTTOM_RIGHT }));
-        }
-        public addMarker(map: BMap.Map, point: BMap.Point) {
-            const marker = new BMap.Marker(point);
-            map.addOverlay(marker);
-            marker.setAnimation(BMAP_ANIMATION_BOUNCE);
-        }
-    }
+	export class TestFixture {
+		//document: http://lbsyun.baidu.com/index.php?title=jspopular
+		public createMap(container: string | HTMLElement) {
+			navigator.geolocation.getCurrentPosition((position: Position) => {
+				const point = new BMap.Point(position.coords.longitude, position.coords.latitude);
+				const map = new BMap.Map(container);
+				map.centerAndZoom(point, 15);
+			}, console.log, { maximumAge: 3000, timeout: 5000, enableHighAccuracy: true });
+		}
+		public addControl(map: BMap.Map) {
+			map.addControl(new BMap.ScaleControl({ anchor: BMAP_ANCHOR_TOP_LEFT }));
+			map.addControl(new BMap.NavigationControl());
+			map.addControl(new BMap.MapTypeControl({ mapTypes: [BMAP_NORMAL_MAP, BMAP_HYBRID_MAP] }));
+			map.addControl(new BMap.OverviewMapControl({ isOpen: true, anchor: BMAP_ANCHOR_BOTTOM_RIGHT }));
+		}
+		public addMarker(map: BMap.Map, point: BMap.Point) {
+			const marker = new BMap.Marker(point);
+			map.addOverlay(marker);
+			marker.setAnimation(BMAP_ANIMATION_BOUNCE);
+		}
+		public create_map(map: BMap.Map, city: string) {
+			map.centerAndZoom(city);
+		}
+	}
 }
diff --git a/types/baidumap-web-sdk/baidumap.core.d.ts b/types/baidumap-web-sdk/baidumap.core.d.ts
index 24d1aed9f0..98782a1c1e 100644
--- a/types/baidumap-web-sdk/baidumap.core.d.ts
+++ b/types/baidumap-web-sdk/baidumap.core.d.ts
@@ -20,135 +20,136 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 /// <reference path="./baidumap.maptype.d.ts" />
 /// <reference path="./baidumap.panorama.d.ts" />
 declare namespace BMap {
-    class Map {
-        constructor(container: string | HTMLElement, opts?: MapOptions)
-        enableDragging(): void
-        disableDragging(): void
-        enableScrollWheelZoom(): void
-        disableScrollWheelZoom(): void
-        enableDoubleClickZoom(): void
-        disableDoubleClickZoom(): void
-        enableKeyboard(): void
-        disableKeyboard(): void
-        enableInertialDragging(): void
-        disableInertialDragging(): void
-        enableContinuousZoom(): void
-        disableContinuousZoom(): void
-        enablePinchToZoom(): void
-        disablePinchToZoom(): void
-        enableAutoResize(): void
-        disableAutoResize(): void
-        setDefaultCursor(cursor: string): void
-        getDefaultCursor(): string
-        setDraggingCursor(cursor: string): void
-        getDraggingCursor(): string
-        setMinZoom(zoom: number): void
-        setMaxZoom(zoom: number): void
-        setMapStyle(mapStyle: MapStyle): void
-        setPanorama(pano: Panorama): void
-        disable3DBuilding(): void
-        getBounds(): Bounds
-        getCenter(): Point
-        getDistance(start: Point, end: Point): number
-        getMapType(): MapType
-        getSize(): Size
-        getViewport(view: Point[], viewportOptions?: ViewportOptions): Viewport
-        getZoom(): number
-        getPanorama(): Panorama
-        centerAndZoom(center: Point, zoom: number): void
-        panTo(center: Point, opts?: PanOptions): void
-        panBy(x: number, y: number, opts?: PanOptions): void
-        reset(): void
-        setCenter(center: Point | string): void
-        setCurrentCity(city: string): void
-        setMapType(mapType: MapType): void
-        setViewport(view: Point[], viewportOptions?: ViewportOptions): void
-        setZoom(zoom: number): void
-        highResolutionEnabled(): boolean
-        zoomIn(): void
-        zoomOut(): void
-        addHotspot(hotspot: Hotspot): void
-        removeHotspot(hotspot: Hotspot): void
-        clearHotspots(): void
-        addControl(control: Control): void
-        removeControl(control: Control): void
-        getContainer(): HTMLElement
-        addContextMenu(menu: ContextMenu): void
-        removeContextMenu(menu: ContextMenu): void
-        addOverlay(overlay: Overlay): void
-        removeOverlay(overlay: Overlay): void
-        clearOverlays(): void
-        openInfoWindow(infoWnd: InfoWindow, point: Point): void
-        closeInfoWindow(): void
-        pointToOverlayPixel(point: Point): Pixel
-        overlayPixelToPoint(pixel: Pixel): Point
-        getInfoWindow(): InfoWindow
-        getOverlays(): Overlay[]
-        getPanes(): MapPanes
-        addTileLayer(tileLayer: TileLayer): void
-        removeTileLayer(tilelayer: TileLayer): void
-        getTileLayer(mapType: string): TileLayer
-        pixelToPoint(pixel: Pixel): Point
-        pointToPixel(point: Point): Pixel
-        onclick: (event: { type: string, target: any, point: Point, pixel: Pixel, overlay: Overlay }) => void
-        ondblclick: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
-        onrightclick: (event: { type: string, target: any, point: Point, pixel: Pixel, overlay: Overlay }) => void
-        onrightdblclick: (event: { type: string, target: any, point: Point, pixel: Pixel, overlay: Overlay }) => void
-        onmaptypechange: (event: { type: string, target: any }) => void
-        onmousemove: (event: { type: string, target: any, point: Point, pixel: Pixel, overlay: Overlay }) => void
-        onmouseover: (event: { type: string, target: any }) => void
-        onmouseout: (event: { type: string, target: any }) => void
-        onmovestart: (event: { type: string, target: any }) => void
-        onmoving: (event: { type: string, target: any }) => void
-        onmoveend: (event: { type: string, target: any }) => void
-        onzoomstart: (event: { type: string, target: any }) => void
-        onzoomend: (event: { type: string, target: any }) => void
-        onaddoverlay: (event: { type: string, target: any }) => void
-        onaddcontrol: (event: { type: string, target: any }) => void
-        onremovecontrol: (event: { type: string, target: any }) => void
-        onremoveoverlay: (event: { type: string, target: any }) => void
-        onclearoverlays: (event: { type: string, target: any }) => void
-        ondragstart: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
-        ondragging: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
-        ondragend: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
-        onaddtilelayer: (event: { type: string, target: any }) => void
-        onremovetilelayer: (event: { type: string, target: any }) => void
-        onload: (event: { type: string, target: any, point: Point, pixel: Pixel, zoom: number }) => void
-        onresize: (event: { type: string, target: any, size: Size }) => void
-        onhotspotclick: (event: { type: string, target: any, spots: HotspotOptions }) => void
-        onhotspotover: (event: { type: string, target: any, spots: HotspotOptions }) => void
-        onhotspotout: (event: { type: string, target: any, spots: HotspotOptions }) => void
-        ontilesloaded: (event: { type: string, target: any }) => void
-        ontouchstart: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
-        ontouchmove: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
-        ontouchend: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
-        onlongpress: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
-    }
-    interface PanOptions {
-        noAnimation?: boolean
-    }
-    interface MapOptions {
-        minZoom?: number
-        maxZoom?: number
-        mapType?: MapType
-        enableHighResolution?: boolean
-        enableAutoResize?: boolean
-        enableMapClick?: boolean
-    }
-    interface Viewport {
-        center: Point
-        zoom: number
-    }
-    interface ViewportOptions {
-        enableAnimation?: boolean
-        margins?: number[]
-        zoomFactor?: number
-        delay?: number
-    }
-    type APIVersion = number
-    interface MapStyle {
-        features: any[]
-        style: string
-    }
+	class Map {
+		constructor(container: string | HTMLElement, opts?: MapOptions)
+		enableDragging(): void
+		disableDragging(): void
+		enableScrollWheelZoom(): void
+		disableScrollWheelZoom(): void
+		enableDoubleClickZoom(): void
+		disableDoubleClickZoom(): void
+		enableKeyboard(): void
+		disableKeyboard(): void
+		enableInertialDragging(): void
+		disableInertialDragging(): void
+		enableContinuousZoom(): void
+		disableContinuousZoom(): void
+		enablePinchToZoom(): void
+		disablePinchToZoom(): void
+		enableAutoResize(): void
+		disableAutoResize(): void
+		setDefaultCursor(cursor: string): void
+		getDefaultCursor(): string
+		setDraggingCursor(cursor: string): void
+		getDraggingCursor(): string
+		setMinZoom(zoom: number): void
+		setMaxZoom(zoom: number): void
+		setMapStyle(mapStyle: MapStyle): void
+		setPanorama(pano: Panorama): void
+		disable3DBuilding(): void
+		getBounds(): Bounds
+		getCenter(): Point
+		getDistance(start: Point, end: Point): number
+		getMapType(): MapType
+		getSize(): Size
+		getViewport(view: Point[], viewportOptions?: ViewportOptions): Viewport
+		getZoom(): number
+		getPanorama(): Panorama
+		centerAndZoom(center: Point, zoom: number): void
+		centerAndZoom(city: string): void
+		panTo(center: Point, opts?: PanOptions): void
+		panBy(x: number, y: number, opts?: PanOptions): void
+		reset(): void
+		setCenter(center: Point | string): void
+		setCurrentCity(city: string): void
+		setMapType(mapType: MapType): void
+		setViewport(view: Point[], viewportOptions?: ViewportOptions): void
+		setZoom(zoom: number): void
+		highResolutionEnabled(): boolean
+		zoomIn(): void
+		zoomOut(): void
+		addHotspot(hotspot: Hotspot): void
+		removeHotspot(hotspot: Hotspot): void
+		clearHotspots(): void
+		addControl(control: Control): void
+		removeControl(control: Control): void
+		getContainer(): HTMLElement
+		addContextMenu(menu: ContextMenu): void
+		removeContextMenu(menu: ContextMenu): void
+		addOverlay(overlay: Overlay): void
+		removeOverlay(overlay: Overlay): void
+		clearOverlays(): void
+		openInfoWindow(infoWnd: InfoWindow, point: Point): void
+		closeInfoWindow(): void
+		pointToOverlayPixel(point: Point): Pixel
+		overlayPixelToPoint(pixel: Pixel): Point
+		getInfoWindow(): InfoWindow
+		getOverlays(): Overlay[]
+		getPanes(): MapPanes
+		addTileLayer(tileLayer: TileLayer): void
+		removeTileLayer(tilelayer: TileLayer): void
+		getTileLayer(mapType: string): TileLayer
+		pixelToPoint(pixel: Pixel): Point
+		pointToPixel(point: Point): Pixel
+		onclick: (event: { type: string, target: any, point: Point, pixel: Pixel, overlay: Overlay }) => void
+		ondblclick: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
+		onrightclick: (event: { type: string, target: any, point: Point, pixel: Pixel, overlay: Overlay }) => void
+		onrightdblclick: (event: { type: string, target: any, point: Point, pixel: Pixel, overlay: Overlay }) => void
+		onmaptypechange: (event: { type: string, target: any }) => void
+		onmousemove: (event: { type: string, target: any, point: Point, pixel: Pixel, overlay: Overlay }) => void
+		onmouseover: (event: { type: string, target: any }) => void
+		onmouseout: (event: { type: string, target: any }) => void
+		onmovestart: (event: { type: string, target: any }) => void
+		onmoving: (event: { type: string, target: any }) => void
+		onmoveend: (event: { type: string, target: any }) => void
+		onzoomstart: (event: { type: string, target: any }) => void
+		onzoomend: (event: { type: string, target: any }) => void
+		onaddoverlay: (event: { type: string, target: any }) => void
+		onaddcontrol: (event: { type: string, target: any }) => void
+		onremovecontrol: (event: { type: string, target: any }) => void
+		onremoveoverlay: (event: { type: string, target: any }) => void
+		onclearoverlays: (event: { type: string, target: any }) => void
+		ondragstart: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
+		ondragging: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
+		ondragend: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
+		onaddtilelayer: (event: { type: string, target: any }) => void
+		onremovetilelayer: (event: { type: string, target: any }) => void
+		onload: (event: { type: string, target: any, point: Point, pixel: Pixel, zoom: number }) => void
+		onresize: (event: { type: string, target: any, size: Size }) => void
+		onhotspotclick: (event: { type: string, target: any, spots: HotspotOptions }) => void
+		onhotspotover: (event: { type: string, target: any, spots: HotspotOptions }) => void
+		onhotspotout: (event: { type: string, target: any, spots: HotspotOptions }) => void
+		ontilesloaded: (event: { type: string, target: any }) => void
+		ontouchstart: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
+		ontouchmove: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
+		ontouchend: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
+		onlongpress: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
+	}
+	interface PanOptions {
+		noAnimation?: boolean
+	}
+	interface MapOptions {
+		minZoom?: number
+		maxZoom?: number
+		mapType?: MapType
+		enableHighResolution?: boolean
+		enableAutoResize?: boolean
+		enableMapClick?: boolean
+	}
+	interface Viewport {
+		center: Point
+		zoom: number
+	}
+	interface ViewportOptions {
+		enableAnimation?: boolean
+		margins?: number[]
+		zoomFactor?: number
+		delay?: number
+	}
+	type APIVersion = number
+	interface MapStyle {
+		features: any[]
+		style: string
+	}
 }
 declare const BMAP_API_VERSION: BMap.APIVersion
\ No newline at end of file

From d6637051ab0ad52970a72ca72753edfcb13b62fe Mon Sep 17 00:00:00 2001
From: MaShizhen <2473872761@qq.com>
Date: Mon, 12 Mar 2018 19:57:41 +0800
Subject: [PATCH 0455/1382] create_map(map: BMap.Map, city: string)

---
 types/baidumap-web-sdk/baidumap-web-sdk-tests.ts | 3 +++
 types/baidumap-web-sdk/baidumap.core.d.ts        | 1 +
 2 files changed, 4 insertions(+)

diff --git a/types/baidumap-web-sdk/baidumap-web-sdk-tests.ts b/types/baidumap-web-sdk/baidumap-web-sdk-tests.ts
index 8ac6457975..3ac593a651 100644
--- a/types/baidumap-web-sdk/baidumap-web-sdk-tests.ts
+++ b/types/baidumap-web-sdk/baidumap-web-sdk-tests.ts
@@ -20,5 +20,8 @@ namespace BMapTests {
             map.addOverlay(marker);
             marker.setAnimation(BMAP_ANIMATION_BOUNCE);
         }
+        public create_map(map: BMap.Map, city: string) {
+            map.centerAndZoom(city);
+        }
     }
 }
diff --git a/types/baidumap-web-sdk/baidumap.core.d.ts b/types/baidumap-web-sdk/baidumap.core.d.ts
index 24d1aed9f0..a12b78788a 100644
--- a/types/baidumap-web-sdk/baidumap.core.d.ts
+++ b/types/baidumap-web-sdk/baidumap.core.d.ts
@@ -56,6 +56,7 @@ declare namespace BMap {
         getZoom(): number
         getPanorama(): Panorama
         centerAndZoom(center: Point, zoom: number): void
+        centerAndZoom(city: string): void
         panTo(center: Point, opts?: PanOptions): void
         panBy(x: number, y: number, opts?: PanOptions): void
         reset(): void

From 2271071fb5e296fe3063e942e16eb49cc72271ed Mon Sep 17 00:00:00 2001
From: "yu.zhang" <yu.zhang@chaitin.com>
Date: Mon, 12 Mar 2018 20:14:23 +0800
Subject: [PATCH 0456/1382] fixed GridCellProps parent type, which incompatible
 with CellMeasurer parent type

---
 types/react-virtualized/dist/es/Grid.d.ts | 2 +-
 types/react-virtualized/index.d.ts        | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/react-virtualized/dist/es/Grid.d.ts b/types/react-virtualized/dist/es/Grid.d.ts
index 9a6492f368..630e64df69 100644
--- a/types/react-virtualized/dist/es/Grid.d.ts
+++ b/types/react-virtualized/dist/es/Grid.d.ts
@@ -9,7 +9,7 @@ export type GridCellProps = {
     isScrolling: boolean;
     isVisible: boolean;
     key: string;
-    parent: Grid | List | Table;
+    parent: typeof Grid | typeof List | typeof Table;
     rowIndex: number;
     style: React.CSSProperties;
 };
diff --git a/types/react-virtualized/index.d.ts b/types/react-virtualized/index.d.ts
index 6293d20c9e..8159c49ff2 100644
--- a/types/react-virtualized/index.d.ts
+++ b/types/react-virtualized/index.d.ts
@@ -5,6 +5,7 @@
 //                 Konstantin Nesterov <https://github.com/wasd171>
 //                 Szőke Szabolcs <https://github.com/szabolcsx>
 //                 Kræn Hansen <https://github.com/kraenhansen>
+//                 Steve Zhang <https://github.com/Stevearzh>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 

From 26ca06f493969175e10f7b96260e1fc40a453cd4 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Mon, 12 Mar 2018 13:20:20 +0100
Subject: [PATCH 0457/1382] Add type for getFinalCoverage

http://gotwarlost.github.io/istanbul/public/apidocs/files/lib_collector.js.html#l97
---
 types/istanbul/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/istanbul/index.d.ts b/types/istanbul/index.d.ts
index ee23e27782..fe45802865 100644
--- a/types/istanbul/index.d.ts
+++ b/types/istanbul/index.d.ts
@@ -24,6 +24,7 @@ declare namespace istanbul {
     interface Collector {
         new (options?: any): Collector;
         add(coverage: any, testName?: string): void;
+        getFinalCoverage(): any;
     }
 
     interface Config {

From 84a5437c97f3ff4f60b175863f8c4133c5606da9 Mon Sep 17 00:00:00 2001
From: Sarah Sporck <ss@secomba.com>
Date: Mon, 12 Mar 2018 14:32:35 +0100
Subject: [PATCH 0458/1382] added modify to knex QueryInterface

---
 types/knex/index.d.ts    | 1 +
 types/knex/knex-tests.ts | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/types/knex/index.d.ts b/types/knex/index.d.ts
index eecfde8774..4dcbab481b 100644
--- a/types/knex/index.d.ts
+++ b/types/knex/index.d.ts
@@ -153,6 +153,7 @@ declare namespace Knex {
         pluck(column: string): QueryBuilder;
 
         insert(data: any, returning?: string | string[]): QueryBuilder;
+        modify(callback: QueryCallback): QueryBuilder;
         update(data: any, returning?: string | string[]): QueryBuilder;
         update(columnName: string, value: Value, returning?: string | string[]): QueryBuilder;
         returning(column: string | string[]): QueryBuilder;
diff --git a/types/knex/knex-tests.ts b/types/knex/knex-tests.ts
index 3e8e798212..dae9bf66fc 100644
--- a/types/knex/knex-tests.ts
+++ b/types/knex/knex-tests.ts
@@ -1026,6 +1026,9 @@ knex('users')
   }).unionAll(function(builder) {
     let self: Knex.QueryBuilder = this;
     self = builder;
+  }).modify(function(builder) {
+    let self: Knex.QueryBuilder = this;
+    self = builder;
   });
 
 //

From 5009ea66ebad9963bab8ec782a3b1adb691e3add Mon Sep 17 00:00:00 2001
From: Chris Filipowski <kfilipowski+git@gmail.com>
Date: Mon, 12 Mar 2018 23:11:38 +0800
Subject: [PATCH 0459/1382] Add typings for graphql-list-fields

---
 .../graphql-list-fields-tests.ts              | 42 +++++++++++++++++++
 types/graphql-list-fields/index.d.ts          | 12 ++++++
 types/graphql-list-fields/tsconfig.json       | 23 ++++++++++
 types/graphql-list-fields/tslint.json         |  1 +
 4 files changed, 78 insertions(+)
 create mode 100644 types/graphql-list-fields/graphql-list-fields-tests.ts
 create mode 100644 types/graphql-list-fields/index.d.ts
 create mode 100644 types/graphql-list-fields/tsconfig.json
 create mode 100644 types/graphql-list-fields/tslint.json

diff --git a/types/graphql-list-fields/graphql-list-fields-tests.ts b/types/graphql-list-fields/graphql-list-fields-tests.ts
new file mode 100644
index 0000000000..7624a3cbd8
--- /dev/null
+++ b/types/graphql-list-fields/graphql-list-fields-tests.ts
@@ -0,0 +1,42 @@
+import getFieldNames = require("graphql-list-fields");
+
+import {
+    GraphQLID,
+    GraphQLInterfaceType,
+    GraphQLObjectType,
+    GraphQLResolveInfo,
+    GraphQLSchema,
+    GraphQLString
+} from "graphql";
+
+const sampleGraphQLResolveInfo: GraphQLResolveInfo = {
+    fieldName: "",
+    fieldNodes: [],
+    returnType: GraphQLString,
+    parentType: new GraphQLInterfaceType({
+        name: "Sample",
+        fields: {
+            name: { type: GraphQLString }
+        }
+    }),
+    path: undefined,
+    schema: new GraphQLSchema({
+        query: new GraphQLObjectType({
+            name: "SampleType",
+            fields: {}
+        })
+    }),
+    fragments: {},
+    rootValue: null,
+    operation: {
+        kind: "OperationDefinition",
+        operation: "query",
+        selectionSet: {
+            kind: "SelectionSet",
+            selections: []
+        }
+    },
+    variableValues: {}
+};
+
+const fieldNames: string[] = getFieldNames(sampleGraphQLResolveInfo);
diff --git a/types/graphql-list-fields/index.d.ts b/types/graphql-list-fields/index.d.ts
new file mode 100644
index 0000000000..1cd4a1c005
--- /dev/null
+++ b/types/graphql-list-fields/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for graphql-list-fields 2.0
+// Project: https://github.com/jakepusateri/graphql-list-fields#readme
+// Definitions by: Chris Filipowski <https://github.com/filipows>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { GraphQLResolveInfo } from "graphql";
+
+declare namespace getFieldList {}
+declare function getFieldList(info: GraphQLResolveInfo): string[];
+
+export = getFieldList;
diff --git a/types/graphql-list-fields/tsconfig.json b/types/graphql-list-fields/tsconfig.json
new file mode 100644
index 0000000000..6f53c2c900
--- /dev/null
+++ b/types/graphql-list-fields/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "graphql-list-fields-tests.ts"
+    ]
+}
diff --git a/types/graphql-list-fields/tslint.json b/types/graphql-list-fields/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/graphql-list-fields/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 46673df4bb096c17b876f83f771127b585131663 Mon Sep 17 00:00:00 2001
From: Calum MacRae <cm@mipass.me>
Date: Mon, 12 Mar 2018 15:41:33 +0000
Subject: [PATCH 0460/1382] Return date

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

diff --git a/types/twix/index.d.ts b/types/twix/index.d.ts
index 8ca402e8e6..5b37054eb9 100644
--- a/types/twix/index.d.ts
+++ b/types/twix/index.d.ts
@@ -80,6 +80,7 @@ export interface Twix {
 
     asDuration(period: string): Duration;
     isValid(): boolean;
+    toDate(): Date;
 }
 
 export interface TwixStatic {

From 5ce583f901bd3dcf7013d1288d2981345e2aeffe Mon Sep 17 00:00:00 2001
From: Margaret Schervish <mschervish@predictiveTechnologies.com>
Date: Mon, 12 Mar 2018 14:11:33 -0400
Subject: [PATCH 0461/1382] add overflow to CSSObject in highcharts

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

diff --git a/types/highcharts/index.d.ts b/types/highcharts/index.d.ts
index 347c82576d..93c65c9eaa 100644
--- a/types/highcharts/index.d.ts
+++ b/types/highcharts/index.d.ts
@@ -1995,6 +1995,7 @@ declare namespace Highcharts {
         fontWeight?: string;
         left?: string;
         opacity?: number;
+		overflow?: string;
         padding?: string | number;
         position?: string;
         top?: string;

From 3a4a00ee552fc1c614a1fbec09932b5188c53f64 Mon Sep 17 00:00:00 2001
From: Kevin Perrine <kperrine@gmail.com>
Date: Mon, 12 Mar 2018 14:47:02 -0500
Subject: [PATCH 0462/1382] Update Easing.poly definition to accept number

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

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index 01b7651dec..f4be32ade0 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -7737,7 +7737,7 @@ export interface EasingStatic {
     ease: EasingFunction;
     quad: EasingFunction;
     cubic: EasingFunction;
-    poly: EasingFunction;
+    poly(n: number): EasingFunction;
     sin: EasingFunction;
     circle: EasingFunction;
     exp: EasingFunction;

From 875640f00ec5c833d45163560c44ac451542c00f Mon Sep 17 00:00:00 2001
From: Brian Caruso <carusobp@gmail.com>
Date: Mon, 12 Mar 2018 13:09:42 -0700
Subject: [PATCH 0463/1382] Add 'Other' constructor parameters

---
 types/auth0-lock/auth0-lock-tests.ts | 12 ++++++++++++
 types/auth0-lock/index.d.ts          |  7 ++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/types/auth0-lock/auth0-lock-tests.ts b/types/auth0-lock/auth0-lock-tests.ts
index 119bbb3c37..3ef12e327b 100644
--- a/types/auth0-lock/auth0-lock-tests.ts
+++ b/types/auth0-lock/auth0-lock-tests.ts
@@ -117,6 +117,18 @@ const authOptions : Auth0LockConstructorOptions = {
 
 new Auth0Lock(CLIENT_ID, DOMAIN, authOptions);
 
+// test "other" properties
+
+const otherOptions : Auth0LockConstructorOptions = {
+  clientBaseUrl: "http://www.example.com",
+  configurationBaseUrl: "https://cdn.auth0.com",
+  languageBaseUrl: "http://www.example.com",
+  hashCleanup: false,
+  leeway: 30
+};
+
+new Auth0Lock(CLIENT_ID, DOMAIN, otherOptions);
+
 // test multi-variant example
 
 const multiVariantOptions : Auth0LockConstructorOptions = {
diff --git a/types/auth0-lock/index.d.ts b/types/auth0-lock/index.d.ts
index 352d9c71a9..7dd99af9e6 100644
--- a/types/auth0-lock/index.d.ts
+++ b/types/auth0-lock/index.d.ts
@@ -119,17 +119,23 @@ interface Auth0LockConstructorOptions {
     autoclose?: boolean;
     autofocus?: boolean;
     avatar?: Auth0LockAvatarOptions;
+    clientBaseUrl?: string;
     closable?: boolean;
+    configurationBaseUrl?: string;
     container?: string;
     defaultADUsernameFromEmailPrefix?: string;
     defaultDatabaseConnection?: string;
     defaultEnterpriseConnection?: string;
     forgotPasswordLink?: string;
+    hashCleanup?: boolean;
     initialScreen?: "login" | "signUp" | "forgotPassword";
     language?: string;
+    languageBaseUrl?: string;
     languageDictionary?: any;
+    leeway?: number;
     loginAfterSignUp?: boolean;
     mustAcceptTerms?: boolean;
+    oidcConformant?: boolean;
     popupOptions?: Auth0LockPopupOptions;
     prefill?: { email?: string, username?: string};
     rememberLastLogin?: boolean;
@@ -137,7 +143,6 @@ interface Auth0LockConstructorOptions {
     socialButtonStyle?: "big" | "small";
     theme?: Auth0LockThemeOptions;
     usernameStyle?: string;
-    oidcConformant?: boolean;
 }
 
 interface Auth0LockFlashMessageOptions {

From a8903fc7645c2570bf4a81d066a8c7792c4eca54 Mon Sep 17 00:00:00 2001
From: Julien Berube <julien.berube@gmail.com>
Date: Mon, 12 Mar 2018 19:14:21 -0400
Subject: [PATCH 0464/1382] @types/w3c-permissions add Web Permissions API type
 definitions

---
 types/w3c-permissions/index.d.ts              | 92 +++++++++++++++++++
 types/w3c-permissions/tsconfig.json           | 24 +++++
 types/w3c-permissions/tslint.json             |  1 +
 .../w3c-permissions/w3c-permissions-tests.ts  | 47 ++++++++++
 4 files changed, 164 insertions(+)
 create mode 100644 types/w3c-permissions/index.d.ts
 create mode 100644 types/w3c-permissions/tsconfig.json
 create mode 100644 types/w3c-permissions/tslint.json
 create mode 100644 types/w3c-permissions/w3c-permissions-tests.ts

diff --git a/types/w3c-permissions/index.d.ts b/types/w3c-permissions/index.d.ts
new file mode 100644
index 0000000000..2fc6269f42
--- /dev/null
+++ b/types/w3c-permissions/index.d.ts
@@ -0,0 +1,92 @@
+// Type definitions for W3C Image Capture 1.0
+// Project: https://www.w3.org/TR/permissions/
+// Definitions by: Julien Bérubé <https://github.com/jberube>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+// https://www.w3.org/TR/permissions/#permissions-interface
+declare class Permissions {
+    query(permissionDesc: PermissionDescriptor): Promise<PermissionStatus>;
+}
+
+// https://www.w3.org/TR/permissions/#status-of-a-permission
+type PermissionState = "granted" | "denied" | "prompt";
+
+// https://www.w3.org/TR/permissions/#permission-registry
+type PermissionName =
+    "geolocation" |
+    "notifications" |
+    "push" |
+    "midi" |
+    "camera" |
+    "microphone" |
+    "speaker" |
+    "device-info" |
+    "background-sync" |
+    "bluetooth" |
+    "persistent-storage" |
+    "ambient-light-sensor" |
+    "accelerometer" |
+    "gyroscope" |
+    "magnetometer" |
+    "clipboard";
+
+// https://www.w3.org/TR/permissions/#status-of-a-permission
+declare class PermissionStatus extends EventTarget {
+    readonly state: PermissionState;
+    onchange(): (this: this, ev: Event) => any;
+}
+
+// https://www.w3.org/TR/permissions/#permission-descriptor
+interface PermissionDescriptor {
+    name: string;
+}
+
+// https://www.w3.org/TR/permissions/#geolocation
+type GeolocationPermissionDescriptor = PermissionDescriptor;
+
+// https://www.w3.org/TR/permissions/#notifications
+type NotificationsPermissionDescriptor = PermissionDescriptor;
+
+// https://www.w3.org/TR/permissions/#push
+interface PushPermissionDescriptor extends PermissionDescriptor {
+    userVisibleOnly?: boolean;
+}
+
+// https://www.w3.org/TR/permissions/#midi
+interface MidiPermissionDescriptor extends PermissionDescriptor {
+    sysex: boolean;
+}
+
+// https://www.w3.org/TR/permissions/#media-devices
+interface DevicePermissionDescriptor extends PermissionDescriptor {
+    deviceId: string;
+}
+
+// https://www.w3.org/TR/permissions/#background-sync
+type BackgroundSyncPermissionDescriptor = PermissionDescriptor;
+
+// https://www.w3.org/TR/permissions/#ambient-light-sensor
+type AmbientLightSensorPermissionDescriptor = PermissionDescriptor;
+
+// https://www.w3.org/TR/permissions/#accelerometer
+type AccelerometerPermissionDescriptor = PermissionDescriptor;
+
+// https://www.w3.org/TR/permissions/#gyroscope
+type GyroscopePermissionDescriptor = PermissionDescriptor;
+
+// https://www.w3.org/TR/permissions/#magnetometer
+type MagnetometerPermissionDescriptor = PermissionDescriptor;
+
+// https://www.w3.org/TR/permissions/#clipboard
+type ClipboardPermissionDescriptor = PermissionDescriptor;
+
+// https://www.w3.org/TR/permissions/#navigator-and-workernavigator-extension
+interface Navigator {
+    readonly permissions: Permissions;
+}
+
+// https://www.w3.org/TR/permissions/#navigator-and-workernavigator-extension
+interface WorkerNavigator {
+    readonly permissions: Permissions;
+}
diff --git a/types/w3c-permissions/tsconfig.json b/types/w3c-permissions/tsconfig.json
new file mode 100644
index 0000000000..1443bb27e1
--- /dev/null
+++ b/types/w3c-permissions/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "w3c-permissions-tests.ts"
+    ]
+}
diff --git a/types/w3c-permissions/tslint.json b/types/w3c-permissions/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/w3c-permissions/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/w3c-permissions/w3c-permissions-tests.ts b/types/w3c-permissions/w3c-permissions-tests.ts
new file mode 100644
index 0000000000..a22307a2f5
--- /dev/null
+++ b/types/w3c-permissions/w3c-permissions-tests.ts
@@ -0,0 +1,47 @@
+// Modified from Permissions API spec: https://w3c.github.io/permissions/#examples
+// NOTE: Code kept as close to spec examples as possible
+
+// import {} from ".";
+
+// Example 3
+function showLocalNewsWithGeolocation() {}
+function showButtonToEnableLocalNews() {}
+
+const test = navigator.permissions.query({ name: "geolocation" }).then(({ state }) => {
+    switch (state) {
+      case "granted":
+        showLocalNewsWithGeolocation();
+        break;
+      case "prompt":
+        showButtonToEnableLocalNews();
+        break;
+      default:
+        // Don’t do anything if the permission was denied.
+        break;
+    }
+});
+
+// Example 4
+function updateNotificationButton(state: PermissionState) {
+    const button = document.getElementById('chat-notification-button');
+    if (button) {
+        button.setAttribute('disabled', state === 'denied' ? 'disabled' : '');
+    }
+}
+
+navigator.permissions.query({ name: 'notifications' }).then((result) => {
+    updateNotificationButton(result.state);
+    result.addEventListener('change', () => {
+        updateNotificationButton(result.state);
+    });
+});
+
+// Example 5
+Promise.all([
+    navigator.permissions.query({ name: "geolocation" }),
+    navigator.permissions.query({ name: "notifications" })
+])
+.then(([{ state: geoState }, { state: notifState }]) => {
+    console.log("Geolocation permission state is:", geoState);
+    console.log("Notifications permission state is:", notifState);
+});

From 0ce1bd2b27d31e8e78ca730e3259448e7e5ca8e9 Mon Sep 17 00:00:00 2001
From: Julien Berube <julien.berube@gmail.com>
Date: Mon, 12 Mar 2018 19:56:35 -0400
Subject: [PATCH 0465/1382] fixed error in comments (no functional change) and
 removed trailing comment

---
 types/w3c-permissions/index.d.ts               | 2 +-
 types/w3c-permissions/w3c-permissions-tests.ts | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/types/w3c-permissions/index.d.ts b/types/w3c-permissions/index.d.ts
index 2fc6269f42..1cb1aaea0d 100644
--- a/types/w3c-permissions/index.d.ts
+++ b/types/w3c-permissions/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for W3C Image Capture 1.0
+// Type definitions for W3C Permissions API
 // Project: https://www.w3.org/TR/permissions/
 // Definitions by: Julien Bérubé <https://github.com/jberube>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/w3c-permissions/w3c-permissions-tests.ts b/types/w3c-permissions/w3c-permissions-tests.ts
index a22307a2f5..0cb878e2a7 100644
--- a/types/w3c-permissions/w3c-permissions-tests.ts
+++ b/types/w3c-permissions/w3c-permissions-tests.ts
@@ -1,8 +1,6 @@
 // Modified from Permissions API spec: https://w3c.github.io/permissions/#examples
 // NOTE: Code kept as close to spec examples as possible
 
-// import {} from ".";
-
 // Example 3
 function showLocalNewsWithGeolocation() {}
 function showButtonToEnableLocalNews() {}

From 91a40945397f508e1fc55c85aa84618a28842d57 Mon Sep 17 00:00:00 2001
From: huqingyu <hu.qingyu@qq.com>
Date: Tue, 13 Mar 2018 08:55:03 +0800
Subject: [PATCH 0466/1382] change to version 13.4

---
 types/dwt/addon.pdf.d.ts | 62 ++++++++++++++++++++++++++++++++++++++
 types/dwt/dwt-tests.ts   |  2 --
 types/dwt/index.d.ts     | 65 +++-------------------------------------
 3 files changed, 66 insertions(+), 63 deletions(-)
 create mode 100644 types/dwt/addon.pdf.d.ts

diff --git a/types/dwt/addon.pdf.d.ts b/types/dwt/addon.pdf.d.ts
new file mode 100644
index 0000000000..90422d2f26
--- /dev/null
+++ b/types/dwt/addon.pdf.d.ts
@@ -0,0 +1,62 @@
+/**
+ * Dynamsoft WebTwain Addon PDF
+ */
+declare enum EnumDWT_ConverMode {
+    CM_DEFAULT = 0,
+    TWPT_CM_RENDERALLGRAY = 1
+}
+
+/**
+ * @class
+ */
+interface PDF {
+    /**
+     * Download and install pdf rasterizer add-on on the local system.
+     * @method Dynamsoft.WebTwain#Download
+     * @param {string} remoteFile specifies the value of which frame to get.
+     * @param {function} optionalAsyncSuccessFunc optional.
+     * The function to call when the download succeeds. Please refer to the function prototype OnSuccess.
+     * @param {function} optionalAsyncFailureFunc optional.
+     * The function to call when the download fails. Please refer to the function prototype OnFailure.
+     * @return {bool}
+     */
+    Download(remoteFile: string,
+        optionalAsyncSuccessFunc?: () => void,
+        optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
+
+    /**
+     *  Input the password to decrypt PDF files using PDF Rasterizer add-on.
+     * @method Dynamsoft.WebTwain#SetPassword
+     * @param {string} password Specifies the PDF password.
+     * @return {bool}
+     */
+    SetPassword(password: string): boolean;
+
+    /**
+     *  Set the image convert mode for PDF Rasterizer in Dynamic Web TWAIN.
+     * @method Dynamsoft.WebTwain#SetConvertMode
+     * @param {EnumDWT_ConverMode} convertMode Specifies the image convert mode.
+     * @return {bool}
+     */
+    SetConvertMode(convertMode: EnumDWT_ConverMode): boolean;
+
+    /**
+     *  Set the output resolution for the PDF Rasterizer in Dynamic Web TWAIN.
+     * @method Dynamsoft.WebTwain#ReadRect
+     * @param {float} fResolution Specifies the resolution for convert image from PDF file.
+     * @return {bool}
+     */
+    SetResolution(fResolution: number): boolean;
+
+    /**
+     * Judges whether the local PDF is text-based or not.
+     * @method Dynamsoft.WebTwain#ReadRect
+     * @param {string} localFile specifies the local path of the target PDF.
+     * @return {bool}
+     */
+    IsTextBasedPDF(localFile: string): boolean;
+}
+
+interface WebTwainAddon {
+    PDF: PDF;
+}
diff --git a/types/dwt/dwt-tests.ts b/types/dwt/dwt-tests.ts
index 16a56f1cd2..7c9e96bf6a 100644
--- a/types/dwt/dwt-tests.ts
+++ b/types/dwt/dwt-tests.ts
@@ -103,8 +103,6 @@ function downloadImage() {
 function loadPDF() {
     const DWObject = Dynamsoft.WebTwainEnv.GetWebTwain('dwtcontrolContainer');
     if (DWObject) {
-        DWObject.Addon.PDF.SetResolution(200);
-        DWObject.Addon.PDF.SetConvertMode(1);
         DWObject.IfShowFileDialog = true;
         DWObject.LoadImageEx(" ", 5);
     }
diff --git a/types/dwt/index.d.ts b/types/dwt/index.d.ts
index b19980603e..63125cadd5 100644
--- a/types/dwt/index.d.ts
+++ b/types/dwt/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for dwt 13.3
+// Type definitions for dwt 13.4
 // Project: http://www.dynamsoft.com/Products/WebTWAIN_Overview.aspx
 // Definitions by: Xiao Ling <https://github.com/yushulx>
 //                 Josh Hall <https://github.com/jbh>
@@ -10,68 +10,11 @@
 * Product: Dynamsoft Web Twain
 * Web Site: http://www.dynamsoft.com
 *
-* Copyright 2017, Dynamsoft Corporation
+* Copyright 2018, Dynamsoft Corporation
 * Author: Dynamsoft Support Team
-* Version: 13.3
+* Version: 13
 */
 
-/**
- * Dynamsoft WebTwain Addon PDF
- */
-declare enum EnumDWT_ConverMode {
-    CM_DEFAULT = 0,
-    TWPT_CM_RENDERALLGRAY = 1
-}
-
-/**
- * @class
- */
-interface PDF {
-    /**
-     * Download and install pdf rasterizer add-on on the local system. 
-     * @method Dynamsoft.WebTwain#Download 
-     * @param {string} remoteFile specifies the value of which frame to get.
-     * @param {function} optionalAsyncSuccessFunc optional. The function to call when the download succeeds. Please refer to the function prototype OnSuccess.
-     * @param {function} optionalAsyncFailureFunc optional. The function to call when the download fails. Please refer to the function prototype OnFailure.
-     * @return {bool}
-     */
-    Download(remoteFile: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
-
-    /**
-     *  Input the password to decrypt PDF files using PDF Rasterizer add-on. 
-     * @method Dynamsoft.WebTwain#SetPassword 
-     * @param {string} password Specifies the PDF password.
-     * @return {bool}
-     */
-    SetPassword(password: string): boolean;
-
-    /**
-     *  Set the image convert mode for PDF Rasterizer in Dynamic Web TWAIN. 
-     * @method Dynamsoft.WebTwain#SetConvertMode 
-     * @param {EnumDWT_ConverMode} convertMode Specifies the image convert mode.
-     * @return {bool}
-     */
-    SetConvertMode(convertMode: EnumDWT_ConverMode): boolean;
-
-    /**
-     *  Set the output resolution for the PDF Rasterizer in Dynamic Web TWAIN.
-     * @method Dynamsoft.WebTwain#ReadRect 
-     * @param {float} fResolution Specifies the resolution for convert image from PDF file.
-     * @return {bool}
-     */
-    SetResolution(fResolution: number): boolean;
-
-    /**
-     * Judges whether the local PDF is text-based or not.
-     * @method Dynamsoft.WebTwain#ReadRect 
-     * @param {string} localFile specifies the local path of the target PDF.
-     * @return {bool}
-     */
-    IsTextBasedPDF(localFile: string): boolean;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
 /**
  * @namespace Dynamsoft
  */
@@ -1319,7 +1262,7 @@ interface Container {
 }
 
 interface WebTwainAddon {
-    PDF: PDF;
+
 }
 
 /**

From 4423e921ab0a318b0ffece8632ab5660670b6c50 Mon Sep 17 00:00:00 2001
From: MaShizhen <2473872761@qq.com>
Date: Tue, 13 Mar 2018 09:14:12 +0800
Subject: [PATCH 0467/1382] fix

---
 types/baidumap-web-sdk/baidumap.core.d.ts | 134 ----------------------
 1 file changed, 134 deletions(-)

diff --git a/types/baidumap-web-sdk/baidumap.core.d.ts b/types/baidumap-web-sdk/baidumap.core.d.ts
index d0c0bb9504..a12b78788a 100644
--- a/types/baidumap-web-sdk/baidumap.core.d.ts
+++ b/types/baidumap-web-sdk/baidumap.core.d.ts
@@ -20,7 +20,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 /// <reference path="./baidumap.maptype.d.ts" />
 /// <reference path="./baidumap.panorama.d.ts" />
 declare namespace BMap {
-<<<<<<< HEAD
     class Map {
         constructor(container: string | HTMLElement, opts?: MapOptions)
         enableDragging(): void
@@ -152,138 +151,5 @@ declare namespace BMap {
         features: any[]
         style: string
     }
-=======
-	class Map {
-		constructor(container: string | HTMLElement, opts?: MapOptions)
-		enableDragging(): void
-		disableDragging(): void
-		enableScrollWheelZoom(): void
-		disableScrollWheelZoom(): void
-		enableDoubleClickZoom(): void
-		disableDoubleClickZoom(): void
-		enableKeyboard(): void
-		disableKeyboard(): void
-		enableInertialDragging(): void
-		disableInertialDragging(): void
-		enableContinuousZoom(): void
-		disableContinuousZoom(): void
-		enablePinchToZoom(): void
-		disablePinchToZoom(): void
-		enableAutoResize(): void
-		disableAutoResize(): void
-		setDefaultCursor(cursor: string): void
-		getDefaultCursor(): string
-		setDraggingCursor(cursor: string): void
-		getDraggingCursor(): string
-		setMinZoom(zoom: number): void
-		setMaxZoom(zoom: number): void
-		setMapStyle(mapStyle: MapStyle): void
-		setPanorama(pano: Panorama): void
-		disable3DBuilding(): void
-		getBounds(): Bounds
-		getCenter(): Point
-		getDistance(start: Point, end: Point): number
-		getMapType(): MapType
-		getSize(): Size
-		getViewport(view: Point[], viewportOptions?: ViewportOptions): Viewport
-		getZoom(): number
-		getPanorama(): Panorama
-		centerAndZoom(center: Point, zoom: number): void
-		centerAndZoom(city: string): void
-		panTo(center: Point, opts?: PanOptions): void
-		panBy(x: number, y: number, opts?: PanOptions): void
-		reset(): void
-		setCenter(center: Point | string): void
-		setCurrentCity(city: string): void
-		setMapType(mapType: MapType): void
-		setViewport(view: Point[], viewportOptions?: ViewportOptions): void
-		setZoom(zoom: number): void
-		highResolutionEnabled(): boolean
-		zoomIn(): void
-		zoomOut(): void
-		addHotspot(hotspot: Hotspot): void
-		removeHotspot(hotspot: Hotspot): void
-		clearHotspots(): void
-		addControl(control: Control): void
-		removeControl(control: Control): void
-		getContainer(): HTMLElement
-		addContextMenu(menu: ContextMenu): void
-		removeContextMenu(menu: ContextMenu): void
-		addOverlay(overlay: Overlay): void
-		removeOverlay(overlay: Overlay): void
-		clearOverlays(): void
-		openInfoWindow(infoWnd: InfoWindow, point: Point): void
-		closeInfoWindow(): void
-		pointToOverlayPixel(point: Point): Pixel
-		overlayPixelToPoint(pixel: Pixel): Point
-		getInfoWindow(): InfoWindow
-		getOverlays(): Overlay[]
-		getPanes(): MapPanes
-		addTileLayer(tileLayer: TileLayer): void
-		removeTileLayer(tilelayer: TileLayer): void
-		getTileLayer(mapType: string): TileLayer
-		pixelToPoint(pixel: Pixel): Point
-		pointToPixel(point: Point): Pixel
-		onclick: (event: { type: string, target: any, point: Point, pixel: Pixel, overlay: Overlay }) => void
-		ondblclick: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
-		onrightclick: (event: { type: string, target: any, point: Point, pixel: Pixel, overlay: Overlay }) => void
-		onrightdblclick: (event: { type: string, target: any, point: Point, pixel: Pixel, overlay: Overlay }) => void
-		onmaptypechange: (event: { type: string, target: any }) => void
-		onmousemove: (event: { type: string, target: any, point: Point, pixel: Pixel, overlay: Overlay }) => void
-		onmouseover: (event: { type: string, target: any }) => void
-		onmouseout: (event: { type: string, target: any }) => void
-		onmovestart: (event: { type: string, target: any }) => void
-		onmoving: (event: { type: string, target: any }) => void
-		onmoveend: (event: { type: string, target: any }) => void
-		onzoomstart: (event: { type: string, target: any }) => void
-		onzoomend: (event: { type: string, target: any }) => void
-		onaddoverlay: (event: { type: string, target: any }) => void
-		onaddcontrol: (event: { type: string, target: any }) => void
-		onremovecontrol: (event: { type: string, target: any }) => void
-		onremoveoverlay: (event: { type: string, target: any }) => void
-		onclearoverlays: (event: { type: string, target: any }) => void
-		ondragstart: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
-		ondragging: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
-		ondragend: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
-		onaddtilelayer: (event: { type: string, target: any }) => void
-		onremovetilelayer: (event: { type: string, target: any }) => void
-		onload: (event: { type: string, target: any, point: Point, pixel: Pixel, zoom: number }) => void
-		onresize: (event: { type: string, target: any, size: Size }) => void
-		onhotspotclick: (event: { type: string, target: any, spots: HotspotOptions }) => void
-		onhotspotover: (event: { type: string, target: any, spots: HotspotOptions }) => void
-		onhotspotout: (event: { type: string, target: any, spots: HotspotOptions }) => void
-		ontilesloaded: (event: { type: string, target: any }) => void
-		ontouchstart: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
-		ontouchmove: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
-		ontouchend: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
-		onlongpress: (event: { type: string, target: any, point: Point, pixel: Pixel }) => void
-	}
-	interface PanOptions {
-		noAnimation?: boolean
-	}
-	interface MapOptions {
-		minZoom?: number
-		maxZoom?: number
-		mapType?: MapType
-		enableHighResolution?: boolean
-		enableAutoResize?: boolean
-		enableMapClick?: boolean
-	}
-	interface Viewport {
-		center: Point
-		zoom: number
-	}
-	interface ViewportOptions {
-		enableAnimation?: boolean
-		margins?: number[]
-		zoomFactor?: number
-		delay?: number
-	}
-	type APIVersion = number
-	interface MapStyle {
-		features: any[]
-		style: string
-	}
->>>>>>> 9001491e046ab067f8e58558de067d2075f177ae
 }
 declare const BMAP_API_VERSION: BMap.APIVersion
\ No newline at end of file

From 8b75f13e8d265d496a210aee5f66a344a11ccdca Mon Sep 17 00:00:00 2001
From: lincoln <lincoln@dynamsoft.com>
Date: Tue, 13 Mar 2018 14:20:45 +0800
Subject: [PATCH 0468/1382] create pdf addon

---
 types/dwt/addon.pdf.d.ts |  4 ++++
 types/dwt/index.d.ts     | 11 +----------
 types/dwt/tsconfig.json  |  1 +
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/types/dwt/addon.pdf.d.ts b/types/dwt/addon.pdf.d.ts
index 90422d2f26..73f270c7a4 100644
--- a/types/dwt/addon.pdf.d.ts
+++ b/types/dwt/addon.pdf.d.ts
@@ -60,3 +60,7 @@ interface PDF {
 interface WebTwainAddon {
     PDF: PDF;
 }
+
+interface WebTwain {
+	Addon: WebTwainAddon;
+}
diff --git a/types/dwt/index.d.ts b/types/dwt/index.d.ts
index 63125cadd5..752e0a8e0a 100644
--- a/types/dwt/index.d.ts
+++ b/types/dwt/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://www.dynamsoft.com/Products/WebTWAIN_Overview.aspx
 // Definitions by: Xiao Ling <https://github.com/yushulx>
 //                 Josh Hall <https://github.com/jbh>
+//                 Lincoln Hu <https://github.com/lincoln2018>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -1261,21 +1262,11 @@ interface Container {
     Height: string | number;
 }
 
-interface WebTwainAddon {
-
-}
-
 /**
  * @class
  */
 // properties (get/set) / sync functions
 interface WebTwain {
-    /**
-     * Returns addon.
-     * @type {WebTwainAddon}
-     */
-    Addon: WebTwainAddon;
-
     /**
      * Returns or sets whether multi-page selection is supported.
      * @type {bool}
diff --git a/types/dwt/tsconfig.json b/types/dwt/tsconfig.json
index db2ac6bbf4..13f35fcfbf 100644
--- a/types/dwt/tsconfig.json
+++ b/types/dwt/tsconfig.json
@@ -18,6 +18,7 @@
     },
     "files": [
         "index.d.ts",
+        "addon.pdf.d.ts",
         "dwt-tests.ts"
     ]
 }
\ No newline at end of file

From 3d41a380dfb312e998ea6ca1afce0d5284565519 Mon Sep 17 00:00:00 2001
From: lincoln <lincoln@dynamsoft.com>
Date: Tue, 13 Mar 2018 14:37:31 +0800
Subject: [PATCH 0469/1382] change back for test

---
 types/dwt/addon.pdf.d.ts | 13 ++++++++++---
 types/dwt/dwt-tests.ts   |  2 ++
 types/dwt/index.d.ts     |  2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/types/dwt/addon.pdf.d.ts b/types/dwt/addon.pdf.d.ts
index 73f270c7a4..ef0980abfd 100644
--- a/types/dwt/addon.pdf.d.ts
+++ b/types/dwt/addon.pdf.d.ts
@@ -1,6 +1,13 @@
-/**
- * Dynamsoft WebTwain Addon PDF
- */
+/*!
+* Dynamsoft WebTwain PDF Addon
+* Product: Dynamsoft Web Twain
+* Web Site: http://www.dynamsoft.com
+*
+* Copyright 2018, Dynamsoft Corporation
+* Author: Dynamsoft Support Team
+* Version: 13.4
+*/
+
 declare enum EnumDWT_ConverMode {
     CM_DEFAULT = 0,
     TWPT_CM_RENDERALLGRAY = 1
diff --git a/types/dwt/dwt-tests.ts b/types/dwt/dwt-tests.ts
index 7c9e96bf6a..1be94acca1 100644
--- a/types/dwt/dwt-tests.ts
+++ b/types/dwt/dwt-tests.ts
@@ -103,6 +103,8 @@ function downloadImage() {
 function loadPDF() {
     const DWObject = Dynamsoft.WebTwainEnv.GetWebTwain('dwtcontrolContainer');
     if (DWObject) {
+		DWObject.Addon.PDF.SetResolution(200);
+		DWObject.Addon.PDF.SetConvertMode(1);
         DWObject.IfShowFileDialog = true;
         DWObject.LoadImageEx(" ", 5);
     }
diff --git a/types/dwt/index.d.ts b/types/dwt/index.d.ts
index 752e0a8e0a..b940c6ae4e 100644
--- a/types/dwt/index.d.ts
+++ b/types/dwt/index.d.ts
@@ -13,7 +13,7 @@
 *
 * Copyright 2018, Dynamsoft Corporation
 * Author: Dynamsoft Support Team
-* Version: 13
+* Version: 13.4
 */
 
 /**

From 73cbb770780005e11a3bbb71dd66ea76d1b7553e Mon Sep 17 00:00:00 2001
From: frantic1048 <i@frantic1048.com>
Date: Tue, 13 Mar 2018 15:30:21 +0800
Subject: [PATCH 0470/1382] yup: add definition for `.notRequired()` added in
 0.24.1

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

diff --git a/types/yup/index.d.ts b/types/yup/index.d.ts
index e6dc35c1ea..c8c3f2dda4 100644
--- a/types/yup/index.d.ts
+++ b/types/yup/index.d.ts
@@ -46,6 +46,7 @@ export interface Schema<T> {
     default(value?: any): this;
     nullable(isNullable: boolean): this;
     required(message?: string): this;
+    notRequired(): this;
     typeError(message?: string): this;
     oneOf(arrayOfValues: any[], message?: string): this;
     notOneOf(arrayOfValues: any[], message?: string): this;
diff --git a/types/yup/yup-tests.ts b/types/yup/yup-tests.ts
index 9dd02ced73..0c0aa04c47 100644
--- a/types/yup/yup-tests.ts
+++ b/types/yup/yup-tests.ts
@@ -100,6 +100,7 @@ mixed.default(() => ({ number: 5}));
 mixed.default();
 mixed.nullable(true);
 mixed.required();
+mixed.notRequired(); // $ExpectType MixedSchema
 mixed.typeError('type error');
 mixed.oneOf(['hello', 'world'], 'message');
 mixed.notOneOf(['hello', 'world'], 'message');

From 9497f9773621be00d5ea6a0132d97fd1b5c69be1 Mon Sep 17 00:00:00 2001
From: John Zwarthoed <john.zwarthoed@gmail.com>
Date: Tue, 13 Mar 2018 09:04:57 +0100
Subject: [PATCH 0471/1382] Fix array definitions for gauge

---
 types/highcharts/index.d.ts    | 4 ++--
 types/highcharts/test/index.ts | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/types/highcharts/index.d.ts b/types/highcharts/index.d.ts
index 347c82576d..6f346e0c38 100644
--- a/types/highcharts/index.d.ts
+++ b/types/highcharts/index.d.ts
@@ -961,7 +961,7 @@ declare namespace Highcharts {
          * Use this in cases where a linear gradient between a minColor and maxColor is not sufficient.
          * The stops is an array of tuples, where the first item is a float between 0 and 1 assigning the relative position in the gradient, and the second item is the color.
          */
-        stops?: Array<[number, string]>;
+        stops?: Array<Array<number|string>>;
         /**
          * The amount of ticks to draw on the axis. This opens up for aligning the ticks of multiple charts or panes within
          * a chart. This option overrides the tickPixelInterval option.
@@ -3076,7 +3076,7 @@ declare namespace Highcharts {
          * @default ['50%', '50%']
          * @since 2.3.0
          */
-        center?: [number | string, number | string];
+        center?: Array<number|string>;
         /**
          * The end angle of the polar X axis or gauge value axis, given in degrees where 0 is north.
          * @default startAngle + 360
diff --git a/types/highcharts/test/index.ts b/types/highcharts/test/index.ts
index ad026a1e52..c4ea1bd7a8 100644
--- a/types/highcharts/test/index.ts
+++ b/types/highcharts/test/index.ts
@@ -1631,12 +1631,18 @@ function test_Gauge() {
             type: 'gauge'
         },
         pane: {
+            center: ['50%', '85%'],
             startAngle: -150,
             endAngle: 150
         },
         yAxis: {
             min: 0,
-            max: 100
+            max: 100,
+            stops: [
+                [0.1, '#DF5353'],
+                [0.5, '#DDDF0D'],
+                [0.9, '#55BF3B'],
+            ],
         },
         plotOptions: {
             gauge: {

From 858b86eb70b56f8bb1d20fe6ce320383d81161ce Mon Sep 17 00:00:00 2001
From: Sander de Waal <s.dewaal@spiritit.com>
Date: Tue, 13 Mar 2018 10:20:53 +0100
Subject: [PATCH 0472/1382] excel-style-dataformatter

---
 .../excel-style-dataformatter-tests.ts        | 33 ++++++++
 types/excel-style-dataformatter/index.d.ts    | 77 +++++++++++++++++++
 types/excel-style-dataformatter/tsconfig.json | 22 ++++++
 types/excel-style-dataformatter/tslint.json   |  1 +
 4 files changed, 133 insertions(+)
 create mode 100644 types/excel-style-dataformatter/excel-style-dataformatter-tests.ts
 create mode 100644 types/excel-style-dataformatter/index.d.ts
 create mode 100644 types/excel-style-dataformatter/tsconfig.json
 create mode 100644 types/excel-style-dataformatter/tslint.json

diff --git a/types/excel-style-dataformatter/excel-style-dataformatter-tests.ts b/types/excel-style-dataformatter/excel-style-dataformatter-tests.ts
new file mode 100644
index 0000000000..828771242e
--- /dev/null
+++ b/types/excel-style-dataformatter/excel-style-dataformatter-tests.ts
@@ -0,0 +1,33 @@
+import * as DataFormatter from "excel-style-dataformatter";
+import * as enLocales from "excel-style-dataformatter/lib/locales/en-US";
+import * as ruLocales from "excel-style-dataformatter/lib/locales/ru";
+
+const localesOptions: DataFormatter.LocalesOptions = {
+	name: "test",
+	months: ['january', 'february', 'march', 'april', 'may', 'june', 'july', 'august', 'september', 'october', 'november', 'december'],
+	monthsShort: ['jan', 'feb', 'mar', 'apr', 'may', 'jun', 'jul', 'aug', 'sep', 'oct', 'nov', 'dec'],
+	days: ['sunday', 'monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday'],
+	daysShort: ['su', 'mo', 'tu', 'we', 'th', 'fr', 'sa'],
+	thousandSeparator: ',',
+	decimalSeparator: '.',
+	formats: {
+		'Test format 1': '#.#',
+		'Test format 2': '$ #,##0.00;[Red]$ -#,##0.00',
+	}
+};
+const formatterOptions: DataFormatter.FormatterOptions = {
+	debug: true,
+	UTCOffset: 100,
+	locale: "test",
+	transformCode: (code: string): string => {
+		return code + "string";
+	},
+	locales: [localesOptions, ruLocales]
+};
+const dataFormatter1 = new DataFormatter(formatterOptions);
+const dataFormatter2 = new DataFormatter();
+dataFormatter2.defineLocales([enLocales, ruLocales]);
+dataFormatter2.setLocale("ru");
+dataFormatter2.setUTCOffset(null);
+dataFormatter2.setUTCOffset(100);
+const result: DataFormatter.FormatResult = dataFormatter2.format("testValue", "testType", "testFormat");
diff --git a/types/excel-style-dataformatter/index.d.ts b/types/excel-style-dataformatter/index.d.ts
new file mode 100644
index 0000000000..277d3b549f
--- /dev/null
+++ b/types/excel-style-dataformatter/index.d.ts
@@ -0,0 +1,77 @@
+// Type definitions for excel-style-dataformatter v2.0.1
+// Project: https://github.com/fakundo/Excel-Style-Javascript-DataFormatter
+// Definitions by: SanderDeWaal1992 <https://github.com/SanderDeWaal1992>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare module "excel-style-dataformatter" {
+	class DataFormatter {
+		constructor(options?: DataFormatter.FormatterOptions);
+
+		/**
+		 * Format a value
+		 * @param value
+		 * @param type value type
+		 * @param format format preset
+		 */
+		public format(value: any, type: string, format: string): DataFormatter.FormatResult;
+		/**
+		 * Defines locales
+		 * @param  locales
+		 */
+		public defineLocales(locales: DataFormatter.LocalesOptions[]): void;
+		/**
+		 * Sets locale
+		 * If locale doesn't exist, sets default
+		 * @param locale
+		 */
+		public setLocale(locale: string): void;
+		/**
+		 * Sets UTC offset for dates
+		 * @param offset in minutes
+		 */
+		public setUTCOffset(offset: number | null): void;
+	}
+
+	namespace DataFormatter {
+		export interface LocalesOptions {
+			name: string,
+			months: string[],
+			monthsShort: string[],
+			days: string[],
+			daysShort: string[],
+			thousandSeparator: string,
+			decimalSeparator: string,
+			formats: {
+				[index: string]: string
+			}
+		}
+		export interface FormatterOptions {
+			debug?: boolean,
+			UTCOffset?: number | null,
+			locale?: string,
+			transformCode?: (code: any) => any,
+			locales?: LocalesOptions[]
+		}
+
+		export interface FormatResult {
+			value: string,
+			align: string,
+			color: string,
+			pattern: string
+		}
+	}
+
+	export = DataFormatter;
+}
+
+declare module "excel-style-dataformatter/lib/locales/en-US" {
+	import * as DataFormatter from "excel-style-dataformatter";
+	const locale: DataFormatter.LocalesOptions;
+	export = locale;
+}
+
+declare module "excel-style-dataformatter/lib/locales/ru" {
+	import * as DataFormatter from "excel-style-dataformatter";
+	const locale: DataFormatter.LocalesOptions;
+	export = locale;
+}
diff --git a/types/excel-style-dataformatter/tsconfig.json b/types/excel-style-dataformatter/tsconfig.json
new file mode 100644
index 0000000000..ddb0837830
--- /dev/null
+++ b/types/excel-style-dataformatter/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "excel-style-dataformatter-tests.ts"
+    ]
+}
diff --git a/types/excel-style-dataformatter/tslint.json b/types/excel-style-dataformatter/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/excel-style-dataformatter/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From c86365e2fc5609b466de1636a02234a90ff4e64a Mon Sep 17 00:00:00 2001
From: Leonard Thieu <leonard-thieu@users.noreply.github.com>
Date: Thu, 1 Mar 2018 18:30:34 +0300
Subject: [PATCH 0473/1382] react-select typings update:

 - defaultMenuRenderer
 - Option component
 - other minor updates
---
 types/react-select/index.d.ts                 | 21 +++++-
 types/react-select/lib/Option/index.d.ts      |  5 ++
 .../lib/utils/defaultMenuRenderer/index.d.ts  |  3 +
 types/react-select/react-select-tests.tsx     | 74 ++++++++++++++++++-
 types/react-select/tsconfig.json              |  4 +-
 5 files changed, 104 insertions(+), 3 deletions(-)
 create mode 100644 types/react-select/lib/Option/index.d.ts
 create mode 100644 types/react-select/lib/utils/defaultMenuRenderer/index.d.ts

diff --git a/types/react-select/index.d.ts b/types/react-select/index.d.ts
index d256bb437e..d5383d3d86 100644
--- a/types/react-select/index.d.ts
+++ b/types/react-select/index.d.ts
@@ -11,6 +11,7 @@
 //                 Ian Johnson <https://github.com/ninjaferret>
 //                 Anton Novik <https://github.com/tehbi4>
 //                 David Schkalee <https://github.com/misantronic>
+//                 Arthur Udalov <https://github.com/darkartur>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -18,12 +19,15 @@ import * as React from 'react';
 
 export default class ReactSelectClass<TValue = OptionValues> extends React.Component<ReactSelectProps<TValue>> {
     focus(): void;
+    setValue(value: Option<TValue>): void;
 }
 // Other components
 export class Creatable<TValue = OptionValues> extends React.Component<ReactCreatableSelectProps<TValue>> { }
 export class Async<TValue = OptionValues> extends React.Component<ReactAsyncSelectProps<TValue>> { }
 export class AsyncCreatable<TValue = OptionValues> extends React.Component<ReactAsyncSelectProps<TValue> & ReactCreatableSelectProps<TValue>> { }
 
+export type OptionComponentType<TValue = OptionValues> = React.ComponentType<OptionComponentProps<TValue>>;
+
 export type HandlerRendererResult = JSX.Element | null | false;
 
 // Handlers
@@ -128,6 +132,16 @@ export interface MenuRendererProps<TValue = OptionValues> {
      * Array of currently selected options.
      */
     valueArray: Options<TValue>;
+
+    /**
+     * Callback to remove selection from option; receives the option as a parameter.
+     */
+    removeValue: SelectValueHandler<TValue>;
+
+    /**
+     * function which returns a custom way to render the options in the menu
+     */
+    optionRenderer: OptionRendererHandler<TValue>;
 }
 
 export interface OptionComponentProps<TValue = OptionValues> {
@@ -196,6 +210,11 @@ export interface ArrowRendererProps {
      * Arrow mouse down event handler.
      */
     onMouseDown: React.MouseEventHandler<any>;
+
+    /**
+     * whether the Select is open or not.
+     */
+    isOpen: boolean;
 }
 
 export interface ReactSelectProps<TValue = OptionValues> extends React.Props<ReactSelectClass<TValue>> {
@@ -449,7 +468,7 @@ export interface ReactSelectProps<TValue = OptionValues> extends React.Props<Rea
     /**
      * option component to render in dropdown
      */
-    optionComponent?: React.ComponentType<OptionComponentProps<TValue>>;
+    optionComponent?: OptionComponentType<TValue>;
     /**
      * function which returns a custom way to render the options in the menu
      */
diff --git a/types/react-select/lib/Option/index.d.ts b/types/react-select/lib/Option/index.d.ts
new file mode 100644
index 0000000000..0f9e97d540
--- /dev/null
+++ b/types/react-select/lib/Option/index.d.ts
@@ -0,0 +1,5 @@
+import { OptionComponentType } from '../../';
+
+declare const OptionComponent: OptionComponentType;
+
+export default OptionComponent;
diff --git a/types/react-select/lib/utils/defaultMenuRenderer/index.d.ts b/types/react-select/lib/utils/defaultMenuRenderer/index.d.ts
new file mode 100644
index 0000000000..baf530d59d
--- /dev/null
+++ b/types/react-select/lib/utils/defaultMenuRenderer/index.d.ts
@@ -0,0 +1,3 @@
+import { MenuRendererProps } from '../../../';
+
+export default function defaultMenuRenderer(props: MenuRendererProps): JSX.Element[];
diff --git a/types/react-select/react-select-tests.tsx b/types/react-select/react-select-tests.tsx
index 3635fe3145..a6b450f513 100644
--- a/types/react-select/react-select-tests.tsx
+++ b/types/react-select/react-select-tests.tsx
@@ -1,5 +1,7 @@
 import * as React from "react";
 import ReactSelect, * as ReactSelectModule from "react-select";
+import defaultMenuRenderer from 'react-select/lib/utils/defaultMenuRenderer';
+import DefaultOptionComponent from 'react-select/lib/Option';
 
 declare function describe(desc: string, f: () => void): void;
 declare function it(desc: string, f: () => void): void;
@@ -126,6 +128,22 @@ describe("react-select", () => {
         }
     });
 
+    it("setValue method", () => {
+        class Component extends React.PureComponent {
+            private readonly selectRef = (component: ReactSelect) => {
+                component.setValue({
+                    value: 'value'
+                });
+            }
+
+            render() {
+                return <ReactSelect
+                    ref={this.selectRef}
+                />;
+            }
+        }
+    });
+
     it("Overriding default key-down behavior with onInputKeyDown", () => {
         const keyDownHandler: ReactSelectModule.OnInputKeyDownHandler = (event => {
             const divEvent = event as React.KeyboardEvent<HTMLDivElement>;
@@ -246,7 +264,13 @@ describe("Examples", () => {
 
             private readonly menuRenderer: ReactSelectModule.MenuRendererHandler = props => {
                 const options = props.options.map(option => {
-                    return <div className="option">{option.label}</div>;
+                    return (
+                        <div className="option">
+                            <div>{option.label}</div>
+                            <div>{props.optionRenderer({})}</div>
+                            <button onClick={() => props.removeValue(option)}/>
+                        </div>
+                    );
                 });
 
                 return <div className="menu">{options}</div>;
@@ -289,6 +313,41 @@ describe("Examples", () => {
         }
     });
 
+    it("Extend default menu renderer", () => {
+        return class Component extends React.Component {
+            private readonly menuRenderer: ReactSelectModule.MenuRendererHandler = props => {
+                return <div className="menu">defaultMenuRenderer(props)</div>;
+            }
+
+            render() {
+                return <ReactSelect
+                    menuRenderer={this.menuRenderer}
+                />;
+            }
+        };
+    });
+
+    it("Extend default Option component", () => {
+        function OptionComponent(props: ReactSelectModule.OptionComponentProps) {
+            const {option, isFocused, isSelected} = props;
+
+            return (
+                <DefaultOptionComponent {...props}>
+                    <span className={isFocused ? 'focused' : ''}>
+                        {isSelected ? '+' : '-'}
+                        {option.label}
+                    </span>
+                </DefaultOptionComponent>
+            );
+        }
+
+        return (
+            <ReactSelect
+                optionComponent={OptionComponent}
+            />
+        );
+    });
+
     it("Input render example", () => {
         class Component extends React.Component {
             private readonly onSelectChange: ReactSelectModule.OnChangeSingleHandler<string> = option => {
@@ -330,6 +389,19 @@ describe("Examples", () => {
         />;
     });
 
+    it("Arrow render example", () => {
+        return (
+            <ReactSelect
+                arrowRenderer={({onMouseDown, isOpen}) => (
+                    <div
+                        className={isOpen ? 'open' : 'closed'}
+                        onMouseDown={onMouseDown}
+                    />
+                )}
+            />
+        );
+    });
+
     it("Option render with custom value option", () => {
         const optionRenderer = (option: ReactSelectModule.Option<CustomValueType>): ReactSelectModule.HandlerRendererResult =>
             null;
diff --git a/types/react-select/tsconfig.json b/types/react-select/tsconfig.json
index 727747e72c..7855eceaf1 100644
--- a/types/react-select/tsconfig.json
+++ b/types/react-select/tsconfig.json
@@ -1,6 +1,8 @@
 {
     "files": [
         "index.d.ts",
+        "lib/Option/index.d.ts",
+        "lib/utils/defaultMenuRenderer/index.d.ts",
         "react-select-tests.tsx"
     ],
     "compilerOptions": {
@@ -22,4 +24,4 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     }
-}
\ No newline at end of file
+}

From e1f45b78869a73caa99cc1bc89f72b048511bc2a Mon Sep 17 00:00:00 2001
From: Sander de Waal <s.dewaal@spiritit.com>
Date: Tue, 13 Mar 2018 10:54:09 +0100
Subject: [PATCH 0474/1382] Fix problems for npm test

---
 types/excel-style-dataformatter/index.d.ts    | 120 ++++++++----------
 .../lib/locales/en-US.d.ts                    |   4 +
 .../lib/locales/ru.d.ts                       |   4 +
 types/excel-style-dataformatter/tsconfig.json |   3 +
 4 files changed, 64 insertions(+), 67 deletions(-)
 create mode 100644 types/excel-style-dataformatter/lib/locales/en-US.d.ts
 create mode 100644 types/excel-style-dataformatter/lib/locales/ru.d.ts

diff --git a/types/excel-style-dataformatter/index.d.ts b/types/excel-style-dataformatter/index.d.ts
index 277d3b549f..7f76ee6987 100644
--- a/types/excel-style-dataformatter/index.d.ts
+++ b/types/excel-style-dataformatter/index.d.ts
@@ -1,77 +1,63 @@
-// Type definitions for excel-style-dataformatter v2.0.1
+// Type definitions for excel-style-dataformatter 2.0
 // Project: https://github.com/fakundo/Excel-Style-Javascript-DataFormatter
 // Definitions by: SanderDeWaal1992 <https://github.com/SanderDeWaal1992>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "excel-style-dataformatter" {
-	class DataFormatter {
-		constructor(options?: DataFormatter.FormatterOptions);
+declare class DataFormatter {
+	constructor(options?: DataFormatter.FormatterOptions);
 
-		/**
-		 * Format a value
-		 * @param value
-		 * @param type value type
-		 * @param format format preset
-		 */
-		public format(value: any, type: string, format: string): DataFormatter.FormatResult;
-		/**
-		 * Defines locales
-		 * @param  locales
-		 */
-		public defineLocales(locales: DataFormatter.LocalesOptions[]): void;
-		/**
-		 * Sets locale
-		 * If locale doesn't exist, sets default
-		 * @param locale
-		 */
-		public setLocale(locale: string): void;
-		/**
-		 * Sets UTC offset for dates
-		 * @param offset in minutes
-		 */
-		public setUTCOffset(offset: number | null): void;
+	/**
+	 * Format a value
+	 * @param value
+	 * @param type value type
+	 * @param format format preset
+	 */
+	format(value: any, type: string, format: string): DataFormatter.FormatResult;
+	/**
+	 * Defines locales
+	 * @param  locales
+	 */
+	defineLocales(locales: DataFormatter.LocalesOptions[]): void;
+	/**
+	 * Sets locale
+	 * If locale doesn't exist, sets default
+	 * @param locale
+	 */
+	setLocale(locale: string): void;
+	/**
+	 * Sets UTC offset for dates
+	 * @param offset in minutes
+	 */
+	setUTCOffset(offset: number | null): void;
+}
+
+declare namespace DataFormatter {
+	interface LocalesOptions {
+		name: string;
+		months: string[];
+		monthsShort: string[];
+		days: string[];
+		daysShort: string[];
+		thousandSeparator: string;
+		decimalSeparator: string;
+		formats: {
+			[index: string]: string
+		};
+	}
+	interface FormatterOptions {
+		debug?: boolean;
+		UTCOffset?: number | null;
+		locale?: string;
+		transformCode?: (code: any) => any;
+		locales?: LocalesOptions[];
 	}
 
-	namespace DataFormatter {
-		export interface LocalesOptions {
-			name: string,
-			months: string[],
-			monthsShort: string[],
-			days: string[],
-			daysShort: string[],
-			thousandSeparator: string,
-			decimalSeparator: string,
-			formats: {
-				[index: string]: string
-			}
-		}
-		export interface FormatterOptions {
-			debug?: boolean,
-			UTCOffset?: number | null,
-			locale?: string,
-			transformCode?: (code: any) => any,
-			locales?: LocalesOptions[]
-		}
-
-		export interface FormatResult {
-			value: string,
-			align: string,
-			color: string,
-			pattern: string
-		}
+	interface FormatResult {
+		value: string;
+		align: string;
+		color: string;
+		pattern: string;
 	}
-
-	export = DataFormatter;
 }
 
-declare module "excel-style-dataformatter/lib/locales/en-US" {
-	import * as DataFormatter from "excel-style-dataformatter";
-	const locale: DataFormatter.LocalesOptions;
-	export = locale;
-}
-
-declare module "excel-style-dataformatter/lib/locales/ru" {
-	import * as DataFormatter from "excel-style-dataformatter";
-	const locale: DataFormatter.LocalesOptions;
-	export = locale;
-}
+export = DataFormatter;
diff --git a/types/excel-style-dataformatter/lib/locales/en-US.d.ts b/types/excel-style-dataformatter/lib/locales/en-US.d.ts
new file mode 100644
index 0000000000..591678aea8
--- /dev/null
+++ b/types/excel-style-dataformatter/lib/locales/en-US.d.ts
@@ -0,0 +1,4 @@
+import * as DataFormatter from "../../index";
+
+declare const locale: DataFormatter.LocalesOptions;
+export = locale;
diff --git a/types/excel-style-dataformatter/lib/locales/ru.d.ts b/types/excel-style-dataformatter/lib/locales/ru.d.ts
new file mode 100644
index 0000000000..591678aea8
--- /dev/null
+++ b/types/excel-style-dataformatter/lib/locales/ru.d.ts
@@ -0,0 +1,4 @@
+import * as DataFormatter from "../../index";
+
+declare const locale: DataFormatter.LocalesOptions;
+export = locale;
diff --git a/types/excel-style-dataformatter/tsconfig.json b/types/excel-style-dataformatter/tsconfig.json
index ddb0837830..563681d3ac 100644
--- a/types/excel-style-dataformatter/tsconfig.json
+++ b/types/excel-style-dataformatter/tsconfig.json
@@ -7,6 +7,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
+		"strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -17,6 +18,8 @@
     },
     "files": [
         "index.d.ts",
+		"lib/locales/en-US.d.ts",
+		"lib/locales/ru.d.ts",
         "excel-style-dataformatter-tests.ts"
     ]
 }

From a7bc5c1f8ebd2b898592e76c0e076362cb1f6e01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eloy=20Dur=C3=A1n?= <eloy.de.enige@gmail.com>
Date: Tue, 13 Mar 2018 14:02:51 +0100
Subject: [PATCH 0475/1382] [relay-runtime] Export function types, not values.

---
 types/relay-runtime/index.d.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/types/relay-runtime/index.d.ts b/types/relay-runtime/index.d.ts
index 2348a4d06b..85a6c9c3ea 100644
--- a/types/relay-runtime/index.d.ts
+++ b/types/relay-runtime/index.d.ts
@@ -99,12 +99,12 @@ export interface PayloadError {
  *
  * May return an Observable or Promise of a raw server response.
  */
-export function FetchFunction(
+export type FetchFunction = (
     operation: RequestNode,
     variables: Variables,
     cacheConfig: CacheConfig,
     uploadables?: UploadableMap
-): ObservableFromValue<QueryPayload>;
+) => ObservableFromValue<QueryPayload>;
 
 /**
  * A function that executes a GraphQL subscription operation, returning one or
@@ -671,14 +671,14 @@ export interface RelayNetwork {
 // ~~~~~~~~~~~~~~~~~~~~~
 // RelayDefaultHandlerProvider
 // ~~~~~~~~~~~~~~~~~~~~~
-export function HandlerProvider(name: string): HandlerInterface | null;
+export type HandlerProvider = (name: string) => HandlerInterface | null;
 
 // ~~~~~~~~~~~~~~~~~~~~~
 // RelayModernEnvironment
 // ~~~~~~~~~~~~~~~~~~~~~
 export interface EnvironmentConfig {
     configName?: string;
-    handlerProvider?: typeof HandlerProvider;
+    handlerProvider?: HandlerProvider;
     network: Network;
     store: Store;
 }
@@ -732,7 +732,7 @@ export class Network {
      * Creates an implementation of the `Network` interface defined in
      * `RelayNetworkTypes` given `fetch` and `subscribe` functions.
      */
-    static create(fetchFn: typeof FetchFunction, subscribeFn?: SubscribeFunction): RelayNetwork;
+    static create(fetchFn: FetchFunction, subscribeFn?: SubscribeFunction): RelayNetwork;
 }
 
 // ~~~~~~~~~~~~~~~~~~~~~

From 5a699e4e04a925e0d9c4eedcad1b38c887249314 Mon Sep 17 00:00:00 2001
From: coyotte508 <coyotte508@gmail.com>
Date: Tue, 13 Mar 2018 14:27:50 +0100
Subject: [PATCH 0476/1382] iban - Fix incorrect function signatures

Here is the code for the two functions of iban@1.3.0:

https://github.com/arhs/iban.js/blob/master/iban.js#L359

    /**
     * Convert an IBAN to a BBAN.
     *
     * @param iban
     * @param {String} [separator] the separator to use between the blocks of the BBAN, defaults to ' '
     * @returns {string|*}
     */
    exports.toBBAN = function(iban, separator){
        if (typeof separator == 'undefined'){
            separator = ' ';
        }
        iban = electronicFormat(iban);
        var countryStructure = countries[iban.slice(0,2)];
        if (!countryStructure) {
            throw new Error('No country with code ' + iban.slice(0,2));
        }
        return countryStructure.toBBAN(iban, separator);
    };

    exports.printFormat = function(iban, separator){
        if (typeof separator == 'undefined'){
            separator = ' ';
        }
        return electronicFormat(iban).replace(EVERY_FOUR_CHARS, "$1" + separator);
    };
---
 types/iban/index.d.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/types/iban/index.d.ts b/types/iban/index.d.ts
index a47cfa618f..2b14d73954 100644
--- a/types/iban/index.d.ts
+++ b/types/iban/index.d.ts
@@ -42,17 +42,17 @@ interface IBANStatic {
     /** 
      * @summary Returns the IBAN in a print format.
      * @param {string} iban The IBAN to convert.
-     * @param {string} The IBAN in print format.
+     * @param {string} separator The separator to use between IBAN blocks, defaults to ' '.
      */
-    printFormat(iban: string, separator: string[]): string;
+    printFormat(iban: string, separator?: string): string;
 
     /**
      * @summary Convert the passed IBAN to a country-specific BBAN.
      * @param {string} iban The IBAN to convert.
-     * @param {string[]} Separator the separator to use between BBAN blocks.
+     * @param {string} separator The separator to use between BBAN blocks, defaults to ' '.
      * @returns {string} The BBAN
      */
-    toBBAN(iban: string, separator: string[]): string;
+    toBBAN(iban: string, separator?: string): string;
 }
 
 declare var IBAN: IBANStatic;

From 9227a6119507ed04b7fa678619f80b1e48f17557 Mon Sep 17 00:00:00 2001
From: Gabriel Prates <gabsprates@gmail.com>
Date: Mon, 12 Mar 2018 15:35:07 -0300
Subject: [PATCH 0477/1382] fix react-avatar-editor methods

---
 types/react-avatar-editor/index.d.ts           |  7 ++++---
 .../react-avatar-editor-tests.tsx              | 18 ++++++++++++++----
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/types/react-avatar-editor/index.d.ts b/types/react-avatar-editor/index.d.ts
index a3bbf49f3b..9f9ede1ea3 100644
--- a/types/react-avatar-editor/index.d.ts
+++ b/types/react-avatar-editor/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for react-avatar-editor 10.3
 // Project: https://github.com/mosch/react-avatar-editor
 // Definitions by: Diogo Corrêa <https://github.com/diogocorrea>
+//                 Gabriel Prates <https://github.com/gabsprates>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -45,7 +46,7 @@ export interface AvatarEditorProps {
 }
 
 export default class AvatarEditor extends React.Component<AvatarEditorProps, any> {
-    static getImage(): HTMLCanvasElement;
-    static getImageScaledToCanvas(): HTMLCanvasElement;
-    static getCroppingRect(): CroppedRect;
+    getImage(): HTMLCanvasElement;
+    getImageScaledToCanvas(): HTMLCanvasElement;
+    getCroppingRect(): CroppedRect;
 }
diff --git a/types/react-avatar-editor/react-avatar-editor-tests.tsx b/types/react-avatar-editor/react-avatar-editor-tests.tsx
index 063d083f3f..3abf24aae3 100644
--- a/types/react-avatar-editor/react-avatar-editor-tests.tsx
+++ b/types/react-avatar-editor/react-avatar-editor-tests.tsx
@@ -12,6 +12,14 @@ const imageState: ImageState = {
 };
 
 class AvatarEditorTest extends React.Component {
+    avatar: AvatarEditor;
+
+    test() {
+        const getImage: HTMLCanvasElement = this.avatar.getImage();
+        const getImageScaledToCanvas: HTMLCanvasElement = this.avatar.getImageScaledToCanvas();
+        const getCroppingRect: CroppedRect = this.avatar.getCroppingRect();
+    }
+
     render() {
         return (
             <div>
@@ -37,11 +45,13 @@ class AvatarEditorTest extends React.Component {
                 <AvatarEditor image="" onMouseMove={event => {}} />
                 <AvatarEditor image="" onImageChange={() => {}} />
                 <AvatarEditor image="" onPositionChange={() => {}} />
+                <AvatarEditor
+                    image=""
+                    ref={ref => {
+                        this.avatar = ref!;
+                    }}
+                />
             </div>
         );
     }
 }
-
-const getImage: HTMLCanvasElement = AvatarEditor.getImage();
-const getImageScaledToCanvas: HTMLCanvasElement = AvatarEditor.getImageScaledToCanvas();
-const getCroppingRect: CroppedRect = AvatarEditor.getCroppingRect();

From c4aedcde9dc76f23216c5cb135ba9eb2dcb263a2 Mon Sep 17 00:00:00 2001
From: Dominik Notzon <dominik@dn-arts.de>
Date: Tue, 13 Mar 2018 16:16:27 +0100
Subject: [PATCH 0478/1382] # FancyTreeNode: tr is HTMLTableRowElement

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

diff --git a/types/jquery.fancytree/index.d.ts b/types/jquery.fancytree/index.d.ts
index 9c793a2c19..c13cd7f26f 100644
--- a/types/jquery.fancytree/index.d.ts
+++ b/types/jquery.fancytree/index.d.ts
@@ -236,7 +236,7 @@ declare namespace Fancytree {
         /** Outer element of single nodes */
         span: HTMLElement;
         /** Outer element of single nodes for table extension */
-        tr: HTMLElement;
+        tr: HTMLTableRowElement;
         //#endregion
 
         //#region Methods

From 036ff0ee41ffaafd546cf6ba5f0876c1e6a96e9b Mon Sep 17 00:00:00 2001
From: Julien Berube <julien.berube@gmail.com>
Date: Tue, 13 Mar 2018 11:41:19 -0400
Subject: [PATCH 0479/1382] types/w3c-permissions added missing version number
 in header

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

diff --git a/types/w3c-permissions/index.d.ts b/types/w3c-permissions/index.d.ts
index 1cb1aaea0d..b7658c2e6c 100644
--- a/types/w3c-permissions/index.d.ts
+++ b/types/w3c-permissions/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for W3C Permissions API
+// Type definitions for W3C Permissions API 1.0
 // Project: https://www.w3.org/TR/permissions/
 // Definitions by: Julien Bérubé <https://github.com/jberube>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From ff7921476c35d1d02b60fa168facb7b3e8ec54e5 Mon Sep 17 00:00:00 2001
From: Dmitri Moore <demisxbar@gmail.com>
Date: Tue, 13 Mar 2018 09:01:54 -0700
Subject: [PATCH 0480/1382] Update origin argument type

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

diff --git a/types/kcors/index.d.ts b/types/kcors/index.d.ts
index 04c45d365a..c4c33bbb4f 100644
--- a/types/kcors/index.d.ts
+++ b/types/kcors/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/koajs/cors
 // Definitions by: Xavier Stouder <https://github.com/Xstoudi>, Izayoi Ko <https://github.com/izayoiko>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
 import * as Koa from "koa";
 
@@ -11,7 +11,7 @@ export = cors;
 
 declare namespace cors {
     interface Options {
-        origin?: ((req: Koa.Request) => string) | string;
+        origin?: ((ctx: Koa.Context) => string) | string;
         allowMethods?: string[] | string;
         exposeHeaders?: string[] | string;
         allowHeaders?: string[] | string;

From f49b476c72e78194e707c0be0990d855ddea9acf Mon Sep 17 00:00:00 2001
From: Mark van Beek <flipvb@gmail.com>
Date: Tue, 13 Mar 2018 17:13:57 +0100
Subject: [PATCH 0481/1382] [FIX] googlemaps - Update
 google.maps.Data.DataOptions.controls to use DrawingMode instead of string -
 Update google.maps.Data.DataOptions.drawingMode to use DrawingMode instead of
 string - Fix typo in KmlLayer (setZIndez -> setZIndex) - Add setOptions to
 KmlLayer

---
 types/googlemaps/index.d.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/types/googlemaps/index.d.ts b/types/googlemaps/index.d.ts
index 526f5b7e06..7166da95b2 100644
--- a/types/googlemaps/index.d.ts
+++ b/types/googlemaps/index.d.ts
@@ -392,8 +392,8 @@ declare namespace google.maps {
     export module Data {
         export interface DataOptions {
             controlPosition?: ControlPosition;
-            controls?: string[];
-            drawingMode?: string;
+            controls?: DrawingMode[];
+            drawingMode?: DrawingMode;
             featureFactory?: (geometry: Data.Geometry) => Data.Feature;
             map?: Map;
             style?: Data.StylingFunction|Data.StyleOptions;
@@ -1863,7 +1863,8 @@ declare namespace google.maps {
         getZIndex(): number;
         setMap(map: Map | null): void;
         setUrl(url: string): void;
-        setZIndez(zIndex: number): void;
+        setZIndex(zIndex: number): void;
+        setOptions(options: KmlLayerOptions): void;
     }
 
     export interface KmlLayerOptions {

From f8240c330858c402f928b6783308fc7fe3dc41ed Mon Sep 17 00:00:00 2001
From: Atanas Atanasov <atanas.nk.atanasov@gmail.com>
Date: Tue, 13 Mar 2018 18:20:08 +0200
Subject: [PATCH 0482/1382] Improved and Prepare gijgo definitions for
 inclusion in Angular 2+ projects

---
 types/gijgo/index.d.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/types/gijgo/index.d.ts b/types/gijgo/index.d.ts
index 19d17deb22..a382b5ea80 100644
--- a/types/gijgo/index.d.ts
+++ b/types/gijgo/index.d.ts
@@ -4,7 +4,9 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-declare module Gijgo {
+/// <reference types="jquery" />
+
+export declare module Gijgo {
 
     //Grid
     interface GridPager {
@@ -263,7 +265,7 @@ declare module Gijgo {
         close(): DatePicker;
         destroy(): void;
         open(): DatePicker;
-        value(value: string):  string | DatePicker;
+        value(value?: string):  string | DatePicker;
     }
 
     // DropDown
@@ -423,7 +425,7 @@ declare module Gijgo {
 }
 
 
-interface JQuery {
+export interface jQuery {
     grid(settings: Gijgo.GridSettings<any>): Gijgo.Grid<any, any>;
     grid<Entity>(settings: Gijgo.GridSettings<Entity>): Gijgo.Grid<Entity, any>;
     grid<Entity, Params>(settings: Gijgo.GridSettings<Entity>): Gijgo.Grid<Entity, Params>;

From c263435ce1a3709671aec29659778327688b443e Mon Sep 17 00:00:00 2001
From: Atanas Atanasov <atanas.nk.atanasov@gmail.com>
Date: Tue, 13 Mar 2018 19:07:18 +0200
Subject: [PATCH 0483/1382] Prepared gijgo for inclusion in angular 2+ projects

---
 types/gijgo/index.d.ts | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/types/gijgo/index.d.ts b/types/gijgo/index.d.ts
index a382b5ea80..c91ea22689 100644
--- a/types/gijgo/index.d.ts
+++ b/types/gijgo/index.d.ts
@@ -4,9 +4,13 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-/// <reference types="jquery" />
+declare module 'gijgo' {
+    export = Types;
+}
 
-export declare module Gijgo {
+declare const dp: Types.DatePicker;
+
+declare module Types {
 
     //Grid
     interface GridPager {
@@ -425,22 +429,22 @@ export declare module Gijgo {
 }
 
 
-export interface jQuery {
-    grid(settings: Gijgo.GridSettings<any>): Gijgo.Grid<any, any>;
-    grid<Entity>(settings: Gijgo.GridSettings<Entity>): Gijgo.Grid<Entity, any>;
-    grid<Entity, Params>(settings: Gijgo.GridSettings<Entity>): Gijgo.Grid<Entity, Params>;
+interface JQuery {
+    grid(settings: Types.GridSettings<any>): Types.Grid<any, any>;
+    grid<Entity>(settings: Types.GridSettings<Entity>): Types.Grid<Entity, any>;
+    grid<Entity, Params>(settings: Types.GridSettings<Entity>): Types.Grid<Entity, Params>;
 
-    dialog(settings: Gijgo.DialogSettings): Gijgo.Dialog;
+    dialog(settings: Types.DialogSettings): Types.Dialog;
 
-    checkbox(settings: Gijgo.CheckboxSettings): Gijgo.Checkbox;
+    checkbox(settings: Types.CheckboxSettings): Types.Checkbox;
 
-    datepicker(settings: Gijgo.DatePickerSettings): Gijgo.DatePicker;
+    datepicker(settings: Types.DatePickerSettings): Types.DatePicker;
 
-    dropdown(settings: Gijgo.DropDownSettings): Gijgo.DropDown;
+    dropdown(settings: Types.DropDownSettings): Types.DropDown;
 
-    editor(settings: Gijgo.EditorSettings): Gijgo.Editor;
+    editor(settings: Types.EditorSettings): Types.Editor;
 
-    timepicker(settings: Gijgo.TimePickerSettings): Gijgo.TimePicker;
+    timepicker(settings: Types.TimePickerSettings): Types.TimePicker;
 
-    tree(settings: Gijgo.TreeSettings): Gijgo.Tree;
+    tree(settings: Types.TreeSettings): Types.Tree;
 }

From d380fbba0a66a6ae1e67bf3a32cf6cc96180e82a Mon Sep 17 00:00:00 2001
From: denis <denisname@users.noreply.github.com>
Date: Tue, 13 Mar 2018 18:18:04 +0100
Subject: [PATCH 0484/1382] Add types to ScrollspyOption

Add method and target to ScrollspyOption
---
 types/bootstrap/bootstrap-tests.ts | 10 ++++++++++
 types/bootstrap/index.d.ts         | 19 +++++++++++++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/types/bootstrap/bootstrap-tests.ts b/types/bootstrap/bootstrap-tests.ts
index f6b6246724..21286ad5f4 100755
--- a/types/bootstrap/bootstrap-tests.ts
+++ b/types/bootstrap/bootstrap-tests.ts
@@ -189,6 +189,16 @@ $("#scrollspy").on("activate.bs.scrollspy", () => {});
 
 $("#scrollspy").scrollspy({
     offset: 100,
+    target: "#navbar-example2",
+    method: "offset",
+});
+
+$("#scrollspy").scrollspy({
+    target: document.getElementById("navbar-example2") as HTMLElement
+});
+
+$("#scrollspy").scrollspy({
+    method: "position"
 });
 
 // --------------------------------------------------------------------------------------
diff --git a/types/bootstrap/index.d.ts b/types/bootstrap/index.d.ts
index 15ef7a5f12..fbd804e3d0 100755
--- a/types/bootstrap/index.d.ts
+++ b/types/bootstrap/index.d.ts
@@ -158,12 +158,27 @@ export interface PopoverOption extends TooltipOption {
 }
 
 export interface ScrollspyOption {
+    /**
+     * TODO: https://github.com/twbs/bootstrap/issues/25799
+     *
+     * @default "auto"
+     */
+    method?: "auto" | "offset" | "position";
+
     /**
      * Pixels to offset from top when calculating position of scroll.
      *
      * @default 10
      */
     offset?: number;
+
+    /**
+     * A selector of the parent element or the parent element itself
+     * of any Bootstrap `.nav` or `.list-group` component.
+     *
+     * @default ""
+     */
+    target?: string | Element;
 }
 
 export interface TooltipOption {
@@ -302,11 +317,11 @@ export type AlertEvent = "close.bs.alert" | "closed.bs.alert";
 export type CarouselEvent = "slide.bs.carousel" | "slid.bs.carousel";
 export type CollapseEvent = "show.bs.collapse" | "shown.bs.collapse" | "hide.bs.collapse" | "hidden.bs.collapse";
 export type DropdownEvent = "show.bs.dropdown" | "shown.bs.dropdown" | "hide.bs.dropdown" | "hidden.bs.dropdown";
-export type ModalEvent = "show.bs.modal" | "shown.bs.modal" | "hide.bs.modal" |  "hidden.bs.modal";
+export type ModalEvent = "show.bs.modal" | "shown.bs.modal" | "hide.bs.modal" | "hidden.bs.modal";
 export type PopoverEvent = "show.bs.popover" | "shown.bs.popover" | "hide.bs.popover" | "hidden.bs.popover" | "inserted.bs.popover";
 export type ScrollspyEvent = "activate.bs.scrollspy";
 export type TapEvent = "show.bs.tab" | "shown.bs.tab" | "hide.bs.tab" | "hidden.bs.tab";
-export type TooltipEvent = "show.bs.tooltip" | "shown.bs.tooltip" | "hide.bs.tooltip" |  "hidden.bs.tooltip" | "inserted.bs.tooltip";
+export type TooltipEvent = "show.bs.tooltip" | "shown.bs.tooltip" | "hide.bs.tooltip" | "hidden.bs.tooltip" | "inserted.bs.tooltip";
 
 // --------------------------------------------------------------------------------------
 // jQuery

From 3a7f961a8947f835532aa4abc63ebd37f5b6c49e Mon Sep 17 00:00:00 2001
From: Tom Wanzek <tomwanzek@gmail.com>
Date: Tue, 13 Mar 2018 13:30:43 -0400
Subject: [PATCH 0485/1382] refactor(d3-contour):  use generic defaults

Removes unnecessary function overload in favour of using generic
parameter defaults for `ContourDensity<...>` and `contourDensity<...>()`
---
 types/d3-contour/d3-contour-tests.ts |  5 ++++-
 types/d3-contour/index.d.ts          | 21 ++++++++++-----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/types/d3-contour/d3-contour-tests.ts b/types/d3-contour/d3-contour-tests.ts
index ce9d50717f..48f8508d01 100644
--- a/types/d3-contour/d3-contour-tests.ts
+++ b/types/d3-contour/d3-contour-tests.ts
@@ -113,7 +113,10 @@ interface CustomDatum {
 
 // Get contour generator -------------------------------------------------------
 
-const contDensDefault: d3Contour.ContourDensity<[number, number]> = d3Contour.contourDensity();
+// test generic parameter defaults for ContourDensity and contourDensity
+const contDensDefault: d3Contour.ContourDensity = d3Contour.contourDensity();
+const contDensDefaultCopy: d3Contour.ContourDensity<[number, number]> = contDensDefault;
+// test with explicit generic parameter
 let contDensCustom: d3Contour.ContourDensity<CustomDatum> = d3Contour.contourDensity<CustomDatum>();
 
 // Configure contour generator =================================================
diff --git a/types/d3-contour/index.d.ts b/types/d3-contour/index.d.ts
index ba9c8e075d..c0b3d70b5e 100644
--- a/types/d3-contour/index.d.ts
+++ b/types/d3-contour/index.d.ts
@@ -120,8 +120,13 @@ export function contours(): Contours;
 
 /**
  * A contour generator for density estimates.
+ *
+ * The generic refers to the data type of an element in the data array
+ * used with the density contour generator. If omitted, the default setting assumes that,
+ * the elements of the data array used with the density contour generator are two-element arrays.
+ * The first element corresponds to the x-dimension, the second to the y-dimension.
  */
-export interface ContourDensity<Datum> {
+export interface ContourDensity<Datum = [number, number]> {
     /**
      * Estimates the density contours for the given array of data, returning an array of GeoJSON MultiPolygon geometry objects.
      * Each geometry object represents the area where the estimated number of points per square pixel is greater than or equal to
@@ -238,21 +243,15 @@ export interface ContourDensity<Datum> {
     bandwidth(bandwidth: number): this;
 }
 
-/**
- * Construct a new contour generator for density estimates with the default settings.
- *
- * The default settings assume that, the elements of the data array used
- * with the density contour generator are two-element arrays. The first element
- * corresponds to the x-dimension, the second to the y-dimension.
- */
-export function contourDensity(): ContourDensity<[number, number]>;
 /**
  * Construct a new contour generator for density estimates.
  *
  * The generic refers to the data type of an element in the data array
- * used with the density contour generator.
+ * used with the density contour generator. If omitted, the default setting assumes that,
+ * the elements of the data array used with the density contour generator are two-element arrays.
+ * The first element corresponds to the x-dimension, the second to the y-dimension.
  *
  * Important: ensure that the x- and y-accessor functions are configured to
  * match the data type used for the generic Datum.
  */
-export function contourDensity<Datum>(): ContourDensity<Datum>;
+export function contourDensity<Datum = [number, number]>(): ContourDensity<Datum>;

From 8c569954f49bd93126a3574ce43956f30f87dfea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Padilla?= <jpadilla@webapplicate.com>
Date: Tue, 13 Mar 2018 13:37:16 -0400
Subject: [PATCH 0486/1382] Update according to NODE-1258

https://github.com/mongodb/node-mongodb-native/pull/1670 was released as part of v3.0.4
---
 types/mongodb/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/mongodb/index.d.ts b/types/mongodb/index.d.ts
index b7c5e52792..ba27943739 100644
--- a/types/mongodb/index.d.ts
+++ b/types/mongodb/index.d.ts
@@ -43,7 +43,7 @@ export class MongoClient extends EventEmitter {
     close(force?: boolean): Promise<void>;
     close(force: boolean, callback: MongoCallback<void>): void;
     /** http://mongodb.github.io/node-mongodb-native/3.0/api/MongoClient.html#db */
-    db(name: string, options?: MongoClientCommonOption): Db
+    db(dbName?: string, options?: MongoClientCommonOption): Db
     /** http://mongodb.github.io/node-mongodb-native/3.0/api/MongoClient.html#isConnected */
     isConnected(name: string, options?: MongoClientCommonOption): boolean;
     /** http://mongodb.github.io/node-mongodb-native/3.0/api/MongoClient.html#logout */

From 8ee64890c6d2d70a1e7c4fb48840885d546a6b05 Mon Sep 17 00:00:00 2001
From: Tom Wanzek <tomwanzek@gmail.com>
Date: Tue, 13 Mar 2018 13:41:57 -0400
Subject: [PATCH 0487/1382] fix(d3-contour): disable lint-rule for test line

Disable use-default-type-parameter lint rule for one test line to
validate that parameter default is indeed `[number, number]`
---
 types/d3-contour/d3-contour-tests.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/d3-contour/d3-contour-tests.ts b/types/d3-contour/d3-contour-tests.ts
index 48f8508d01..4563521751 100644
--- a/types/d3-contour/d3-contour-tests.ts
+++ b/types/d3-contour/d3-contour-tests.ts
@@ -115,6 +115,7 @@ interface CustomDatum {
 
 // test generic parameter defaults for ContourDensity and contourDensity
 const contDensDefault: d3Contour.ContourDensity = d3Contour.contourDensity();
+// tslint:disable-next-line: use-default-type-parameter
 const contDensDefaultCopy: d3Contour.ContourDensity<[number, number]> = contDensDefault;
 // test with explicit generic parameter
 let contDensCustom: d3Contour.ContourDensity<CustomDatum> = d3Contour.contourDensity<CustomDatum>();

From 662808d125f372fc3da6fdec7c0aafcee11bf958 Mon Sep 17 00:00:00 2001
From: denis <denisname@users.noreply.github.com>
Date: Tue, 13 Mar 2018 18:45:09 +0100
Subject: [PATCH 0488/1382] Update popper.js version to ^1.14.1 in package.json

See also: popper.js/pull/539 and popper.js/pull/584
---
 types/bootstrap/index.d.ts   | 5 +++--
 types/bootstrap/package.json | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/types/bootstrap/index.d.ts b/types/bootstrap/index.d.ts
index fbd804e3d0..88bcc66af8 100755
--- a/types/bootstrap/index.d.ts
+++ b/types/bootstrap/index.d.ts
@@ -4,9 +4,10 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-/// <reference types="popper.js" />
 /// <reference types="jquery"/>
 
+import * as Popper from "popper.js";
+
 export as namespace Bootstrap;
 
 // --------------------------------------------------------------------------
@@ -163,7 +164,7 @@ export interface ScrollspyOption {
      *
      * @default "auto"
      */
-    method?: "auto" | "offset" | "position";
+    method?: "auto" | "offset" | "position";
 
     /**
      * Pixels to offset from top when calculating position of scroll.
diff --git a/types/bootstrap/package.json b/types/bootstrap/package.json
index 7f11c30706..af84860ef1 100644
--- a/types/bootstrap/package.json
+++ b/types/bootstrap/package.json
@@ -1,6 +1,6 @@
 {
     "private": true,
     "dependencies": {
-        "popper.js": "^1.12.9"
+        "popper.js": "^1.14.1"
     }
 }
\ No newline at end of file

From 755a99149777e7b2134757dbfc3c9916c39c47da Mon Sep 17 00:00:00 2001
From: Alexander Shutov <shutovby@gmail.com>
Date: Tue, 13 Mar 2018 21:02:17 +0300
Subject: [PATCH 0489/1382] Port message can be anything

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

diff --git a/types/chrome/index.d.ts b/types/chrome/index.d.ts
index cde1de9092..d12bf94302 100644
--- a/types/chrome/index.d.ts
+++ b/types/chrome/index.d.ts
@@ -5041,7 +5041,7 @@ declare namespace chrome.runtime {
 
     export interface PortDisconnectEvent extends chrome.events.Event<(port: Port) => void> {}
 
-    export interface PortMessageEvent extends chrome.events.Event<(message: Object, port: Port) => void> {}
+    export interface PortMessageEvent extends chrome.events.Event<(message: any, port: Port) => void> {}
 
     export interface ExtensionMessageEvent extends chrome.events.Event<(message: any, sender: MessageSender, sendResponse: (response: any) => void) => void> {}
 

From 97a1b6313ddd69577db29636cf064a0ecc8d3d5a Mon Sep 17 00:00:00 2001
From: David Richey <davidrichey@google.com>
Date: Tue, 13 Mar 2018 15:40:22 -0400
Subject: [PATCH 0490/1382] Fixed errors in the interface definition of
 MediaSession. The "metadata" property is supposed to be nullable, but not
 optional. The second parameter of the "setActionHandler" method is also
 supposed to be nullable, but not optional.

https://wicg.github.io/mediasession/#the-mediasession-interface
https://heycam.github.io/webidl/#dfn-nullable-type
---
 types/wicg-mediasession/index.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/wicg-mediasession/index.d.ts b/types/wicg-mediasession/index.d.ts
index ac08c8ef4f..05a769b2a2 100644
--- a/types/wicg-mediasession/index.d.ts
+++ b/types/wicg-mediasession/index.d.ts
@@ -19,10 +19,10 @@ interface MediaSession {
   // Current media session playback state.
   playbackState: MediaSessionPlaybackState;
   // Current media session meta data.
-  metadata?: MediaMetadata|null;
+  metadata: MediaMetadata|null;
 
   // Set/Unset actions handlers.
-  setActionHandler(action: MediaSessionAction, listener?: () => void): void;
+  setActionHandler(action: MediaSessionAction, listener: (() => void)|null): void;
 }
 
 interface MediaImage {

From 7ed85e1751b04f4b2ca0466144b32818690ffa4b Mon Sep 17 00:00:00 2001
From: Kyle Buzby <kyle.buzby@gmail.com>
Date: Tue, 13 Mar 2018 16:26:03 -0500
Subject: [PATCH 0491/1382] Revert README

This commit should not have been included.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d4a489ed0a..c50d026338 100644
--- a/README.md
+++ b/README.md
@@ -120,7 +120,7 @@ Your package should have this structure:
 | tsconfig.json | This allows you to run `tsc` within the package. |
 | tslint.json | Enables linting. |
 
-Generate these by running `npm install -g dts-gen` and `dts-gen --dt --name my-package-name --module module`.
+Generate these by running `npm install -g dts-gen` and `dts-gen --dt --name my-package-name --template module`.
 See all options at [dts-gen](https://github.com/Microsoft/dts-gen).
 
 You may edit the `tsconfig.json` to add new files, to add `"target": "es6"` (needed for async functions), to add to `"lib"`, or to add the `"jsx"` compiler option.

From 9768aa9695b70722b21fbb7098bd4aec205b103b Mon Sep 17 00:00:00 2001
From: Joemar Taganna <joemar.ct@gmail.com>
Date: Wed, 14 Mar 2018 09:26:47 +0800
Subject: [PATCH 0492/1382] Make network argument in ECPair.fromWIF method
 optional

I corrected the typing for ECPair.fromWIF method so that the network argument is optional as it really should
---
 types/bitcoinjs-lib/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/bitcoinjs-lib/index.d.ts b/types/bitcoinjs-lib/index.d.ts
index c7d1acc899..11d311a276 100644
--- a/types/bitcoinjs-lib/index.d.ts
+++ b/types/bitcoinjs-lib/index.d.ts
@@ -85,7 +85,7 @@ export class ECPair {
 
     static fromPublicKeyBuffer(buffer: Buffer, network: Network): ECPair;
 
-    static fromWIF(string: string, network: Network): ECPair;
+    static fromWIF(string: string, network?: Network): ECPair;
 
     static makeRandom(options?: { compressed?: boolean, network?: Network, rng?: Rng }): ECPair;
 }

From 8e98757a32779cbc0c4a4fb260d490c9ad70f9ec Mon Sep 17 00:00:00 2001
From: Andyma <66229754@qq.com>
Date: Wed, 14 Mar 2018 14:05:27 +0800
Subject: [PATCH 0493/1382] Update index.d.ts

Change accordingly to datatable.
---
 types/datatables.net/index.d.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/datatables.net/index.d.ts b/types/datatables.net/index.d.ts
index cdddc98789..7941d0586f 100644
--- a/types/datatables.net/index.d.ts
+++ b/types/datatables.net/index.d.ts
@@ -1297,7 +1297,7 @@ declare namespace DataTables {
         /**
          * Data to use as the display data for the table. Since: 1.10
          */
-        data?: object;
+        data?: Object[];
 
         //#endregion "Data"
 
@@ -1931,6 +1931,7 @@ declare namespace DataTables {
     }
 
     interface ColumnLegacy {
+        idx: number;
         aDataSort: any;
         asSorting: string[];
         bSearchable: boolean;

From 73724d43b167131997fd10275ddc4ac2aa4e61e0 Mon Sep 17 00:00:00 2001
From: kenji_imamura <kenji.imamura@kabuku.co.jp>
Date: Wed, 14 Mar 2018 15:20:37 +0900
Subject: [PATCH 0494/1382] feat: add declarations of store.js plugins

---
 types/storejs/index.d.ts       | 31 +++++++++++++++++++++++++++++--
 types/storejs/storejs-tests.ts | 24 +++++++++++++++++++++---
 2 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/types/storejs/index.d.ts b/types/storejs/index.d.ts
index 0a677c0ecf..f720d33617 100644
--- a/types/storejs/index.d.ts
+++ b/types/storejs/index.d.ts
@@ -15,8 +15,8 @@ interface StoreJsAPI {
     each(callback: (val: any, namespacedKey: string) => void): void;
     clearAll(): void;
     hasNamespace(namespace: string): boolean;
-    createStore(plugins?: any[], namespace?: string): StoreJsAPI;
-    addPlugin(plugin: any): void;
+    createStore(plugins?: Function[], namespace?: string): StoreJsAPI;
+    addPlugin(plugin: Function): void;
     namespace(namespace: string): StoreJsAPI;
 }
 
@@ -33,3 +33,30 @@ declare const engine: StoreJsEngine;
 declare module 'store/src/store-engine' {
     export = engine;
 }
+declare module 'store/plugins/all' {
+    export = Function;
+}
+declare module 'store/plugins/default' {
+    export = Function;
+}
+declare module 'store/plugins/dump' {
+    export = Function;
+}
+declare module 'store/plugins/events' {
+    export = Function;
+}
+declare module 'store/plugins/expire' {
+    export = Function;
+}
+declare module 'store/plugins/observe' {
+    export = Function;
+}
+declare module 'store/plugins/operations' {
+    export = Function;
+}
+declare module 'store/plugins/update' {
+    export = Function;
+}
+declare module 'store/plugins/v1-backcompat' {
+    export = Function;
+}
diff --git a/types/storejs/storejs-tests.ts b/types/storejs/storejs-tests.ts
index 802f3dd40e..9e631385f5 100644
--- a/types/storejs/storejs-tests.ts
+++ b/types/storejs/storejs-tests.ts
@@ -1,6 +1,15 @@
 // Tests for storagejs.d.ts
 import * as store from 'store';
 import * as engine from 'store/src/store-engine';
+import * as allPlugin from 'store/plugins/all';
+import * as defaultPlugin from 'store/plugins/default';
+import * as dumpPlugin from 'store/plugins/dump';
+import * as eventsPlugin from 'store/plugins/events';
+import * as expirePlugin from 'store/plugins/expire';
+import * as observePlugin from 'store/plugins/observe';
+import * as operationsPlugin from 'store/plugins/operations';
+import * as updatePlugin from 'store/plugins/update';
+import * as v1BackcompatPlugin from 'store/plugins/v1-backcompat';
 
 // https://github.com/marcuswestin/store.js/blob/master/README-More.md#storeenabled-flag
 console.log('storage is supported: ', store.enabled === true);
@@ -52,6 +61,8 @@ store.set('foo', 'bar 1');
 store.set('foo', 'bar 2');
 store.getHistory('foo');
 
+store.addPlugin(expirePlugin);
+
 // https://github.com/marcuswestin/store.js/#make-your-own-build
 
 // Example custom build usage:
@@ -66,9 +77,16 @@ var storages: any[] = [
     //require('store/storages/localStorage'),
     //require('store/storages/cookieStorage')
 ];
-var plugins: any[] = [
-    //require('store/plugins/defaults'),
-    //require('store/plugins/expire')
+var plugins = [
+    allPlugin,
+    defaultPlugin,
+    dumpPlugin,
+    eventsPlugin,
+    expirePlugin,
+    observePlugin,
+    operationsPlugin,
+    updatePlugin,
+    v1BackcompatPlugin,
 ];
 var myStore = engine.createStore(storages, plugins);
 myStore.set('foo', 'bar', new Date().getTime() + 3000); // Using expire plugin to expire in 3 seconds

From 68e71f096b02e611a134fb7b571fb0a6075dfefb Mon Sep 17 00:00:00 2001
From: Andyma <66229754@qq.com>
Date: Wed, 14 Mar 2018 14:46:17 +0800
Subject: [PATCH 0495/1382] Update index.d.ts

Add style api
---
 types/datatables.net-select/index.d.ts | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/types/datatables.net-select/index.d.ts b/types/datatables.net-select/index.d.ts
index e24f6b8ab6..5ceac21eaf 100644
--- a/types/datatables.net-select/index.d.ts
+++ b/types/datatables.net-select/index.d.ts
@@ -46,4 +46,17 @@ declare namespace DataTables {
          */
         style?: string;
     }
+    
+    interface Api {
+        select: {
+          /*
+          * Get the current selection style applied to the table
+          */
+          style(): string;
+          /*
+          * Set the table's selection style
+          */
+          style(s: "api" | "single" | "multi" | "os"): Api;
+        }
+    }
 }

From 50f05dff6452f785ad9f4e2cba9cea52cc0f7a27 Mon Sep 17 00:00:00 2001
From: Andyma <66229754@qq.com>
Date: Wed, 14 Mar 2018 14:51:26 +0800
Subject: [PATCH 0496/1382] Update index.d.ts

---
 types/datatables.net-select/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/datatables.net-select/index.d.ts b/types/datatables.net-select/index.d.ts
index 5ceac21eaf..aa68f64969 100644
--- a/types/datatables.net-select/index.d.ts
+++ b/types/datatables.net-select/index.d.ts
@@ -44,7 +44,7 @@ declare namespace DataTables {
         /*
          * Set the selection style for end user interaction with the table
          */
-        style?: string;
+        style?: "api" | "single" | "multi" | "os" | "multi+shift";
     }
     
     interface Api {

From 6bfae967c220a1761d18dfbe78cc28e31da81357 Mon Sep 17 00:00:00 2001
From: Umidbek Karimov <uma.karimov@gmail.com>
Date: Wed, 14 Mar 2018 12:14:07 +0500
Subject: [PATCH 0497/1382] fix(expo): Allow to render `<AppLoading />` without
 props.

---
 types/expo/expo-tests.tsx |  5 +----
 types/expo/index.d.ts     | 12 ++++--------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/types/expo/expo-tests.tsx b/types/expo/expo-tests.tsx
index 187d62b2ee..aead720f5b 100644
--- a/types/expo/expo-tests.tsx
+++ b/types/expo/expo-tests.tsx
@@ -199,10 +199,7 @@ async () => {
         onError={(error) => console.log(error)} />
 );
 () => (
-    <AppLoading
-        startAsync={null}
-        onFinish={null}
-        onError={null} />
+    <AppLoading />
 );
 
 const barcodeReadCallback = () => {};
diff --git a/types/expo/index.d.ts b/types/expo/index.d.ts
index a747a881e6..79a84bfafb 100644
--- a/types/expo/index.d.ts
+++ b/types/expo/index.d.ts
@@ -99,20 +99,16 @@ export namespace Amplitude {
 
 // #region AppLoading
 /** The following props are recommended, but optional for the sake of backwards compatibility (they were introduced in SDK21). If you do not provide any props, you are responsible for coordinating loading assets, handling errors, and updating state to unmount the `AppLoading` component. */
-export type AppLoadingProps = {
+export interface AppLoadingProps {
     /** A `function` that returns a `Promise`. The `Promise` should resolve when the app is done loading data and assets. */
-    startAsync: () => Promise<void>;
+    startAsync?: () => Promise<void>;
 
     /** Required if you provide `startAsync`. Called when `startAsync` resolves or rejects. This should be used to set state and unmount the `AppLoading` component. */
-    onFinish: () => void;
+    onFinish?: () => void;
 
     /** If `startAsync` throws an error, it is caught and passed into the function provided to `onError`. */
     onError?: (error: Error) => void;
-} | {
-    startAsync: null;
-    onFinish: null;
-    onError?: null;
-};
+}
 
 /**
  * A React component that tells Expo to keep the app loading screen open if it is the first and only component rendered in your app. When it is removed, the loading screen will disappear and your app will be visible.

From 7f7b5dc29e13dd22006c3a3e8e4099b4d2eb7a9b Mon Sep 17 00:00:00 2001
From: Umidbek Karimov <uma.karimov@gmail.com>
Date: Wed, 14 Mar 2018 12:15:48 +0500
Subject: [PATCH 0498/1382] fix(expo/tsconfig): Add `dom` lib to add
 `window.fetch` types.

---
 types/expo/tsconfig.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/expo/tsconfig.json b/types/expo/tsconfig.json
index 03b9c139b1..7711f49776 100644
--- a/types/expo/tsconfig.json
+++ b/types/expo/tsconfig.json
@@ -2,6 +2,7 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
+            "dom",
             "es6"
         ],
         "jsx": "react",
@@ -21,4 +22,4 @@
         "index.d.ts",
         "expo-tests.tsx"
     ]
-}
\ No newline at end of file
+}

From 197971b6bf39ac49502e60e105941190af4659a1 Mon Sep 17 00:00:00 2001
From: Umidbek Karimov <uma.karimov@gmail.com>
Date: Wed, 14 Mar 2018 12:30:15 +0500
Subject: [PATCH 0499/1382] docs(expo/tsconfig): Update contributors.

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

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index f4be32ade0..b026c4e152 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -6,6 +6,7 @@
 //                 Tim Wang <https://github.com/timwangdev>
 //                 Kamal Mahyuddin <https://github.com/kamal>
 //                 Naoufal El Yousfi <https://github.com/nelyousfi>
+//                 Umidbek Karimov <https://github.com/umidbekkarimov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 

From d06ca98a8d9bd46dfa1a7776096e0de07fa3a64c Mon Sep 17 00:00:00 2001
From: coyotte508 <coyotte508@gmail.com>
Date: Wed, 14 Mar 2018 09:31:28 +0100
Subject: [PATCH 0500/1382] Update iban-tests.ts

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

diff --git a/types/iban/iban-tests.ts b/types/iban/iban-tests.ts
index ac79e97a99..574769c461 100644
--- a/types/iban/iban-tests.ts
+++ b/types/iban/iban-tests.ts
@@ -39,7 +39,7 @@ function testIsValidBBAN() {
  */
 function testPrintFormat() {
     var iban: string = 'BE68539007547034';
-    var separator: string[] = ['fr'];
+    var separator: string = ' ';
     var format: string = IBAN.printFormat(iban, separator);
 }
 
@@ -48,6 +48,6 @@ function testPrintFormat() {
  */
 function testToBBAN() {
     var iban: string = 'BE68539007547034';
-    var separator: string[] = ['-'];
+    var separator: string = '-';
     var bban: string = IBAN.toBBAN(iban, separator);
-}
\ No newline at end of file
+}

From 2b79d89122b30b01ad4b09a7955567ea0ec3563a Mon Sep 17 00:00:00 2001
From: George <eakarpov@yandex.ru>
Date: Wed, 14 Mar 2018 11:40:49 +0300
Subject: [PATCH 0501/1382] Removed dubplicated

TSError: Duplicate identifier 'original'.
---
 types/react-table/index.d.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/types/react-table/index.d.ts b/types/react-table/index.d.ts
index 20a1c5a1fb..cc7e2f48e1 100644
--- a/types/react-table/index.d.ts
+++ b/types/react-table/index.d.ts
@@ -645,9 +645,6 @@ export interface RowInfo {
 
     /** An array of any expandable sub-rows contained in this row */
     subRows: any[];
-
-    /** Original object passed to row */
-    original: any;
 }
 
 export interface FinalState extends TableProps {

From 5f8c758b5d15d221435c7ada54f861731becd1b4 Mon Sep 17 00:00:00 2001
From: Mark van Beek <flipvb@gmail.com>
Date: Wed, 14 Mar 2018 11:28:29 +0100
Subject: [PATCH 0502/1382] Add explicit "null" to controls and drawingMode
 inside DataOptions

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

diff --git a/types/googlemaps/index.d.ts b/types/googlemaps/index.d.ts
index 7166da95b2..5c4cca2eb3 100644
--- a/types/googlemaps/index.d.ts
+++ b/types/googlemaps/index.d.ts
@@ -392,8 +392,8 @@ declare namespace google.maps {
     export module Data {
         export interface DataOptions {
             controlPosition?: ControlPosition;
-            controls?: DrawingMode[];
-            drawingMode?: DrawingMode;
+            controls?: DrawingMode[] | null;
+            drawingMode?: DrawingMode | null;
             featureFactory?: (geometry: Data.Geometry) => Data.Feature;
             map?: Map;
             style?: Data.StylingFunction|Data.StyleOptions;

From d3435719774e275e1a9467de9c66c38be05df9bb Mon Sep 17 00:00:00 2001
From: Umidbek Karimov <uma.karimov@gmail.com>
Date: Wed, 14 Mar 2018 15:44:50 +0500
Subject: [PATCH 0503/1382] fix: Move contribution docs from `react-native` to
 `expo`.

---
 types/expo/index.d.ts         | 1 +
 types/react-native/index.d.ts | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/expo/index.d.ts b/types/expo/index.d.ts
index 79a84bfafb..8f0463bf0d 100644
--- a/types/expo/index.d.ts
+++ b/types/expo/index.d.ts
@@ -5,6 +5,7 @@
 //                 Jan Aagaard <https://github.com/janaagaard75>
 //                 Sergio Sánchez <https://github.com/ssanchezmarc>
 //                 Fernando Helwanger <https://github.com/fhelwanger>
+//                 Umidbek Karimov <https://github.com/umidbekkarimov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index b026c4e152..f4be32ade0 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -6,7 +6,6 @@
 //                 Tim Wang <https://github.com/timwangdev>
 //                 Kamal Mahyuddin <https://github.com/kamal>
 //                 Naoufal El Yousfi <https://github.com/nelyousfi>
-//                 Umidbek Karimov <https://github.com/umidbekkarimov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 

From 964d46ab8cd6e58f5c88078639f0f00eab56c315 Mon Sep 17 00:00:00 2001
From: Umidbek Karimov <uma.karimov@gmail.com>
Date: Wed, 14 Mar 2018 16:04:53 +0500
Subject: [PATCH 0504/1382] feat(expo): Allow to render <AppLoading /> without
 props for v23 and v24.

---
 types/expo/v23/expo-tests.tsx |  5 +----
 types/expo/v23/index.d.ts     | 13 +++++--------
 types/expo/v23/tsconfig.json  |  5 +++--
 types/expo/v24/expo-tests.tsx |  5 +----
 types/expo/v24/index.d.ts     | 12 ++++--------
 types/expo/v24/tsconfig.json  |  5 +++--
 6 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/types/expo/v23/expo-tests.tsx b/types/expo/v23/expo-tests.tsx
index 0764a4d53e..51b3f30d39 100644
--- a/types/expo/v23/expo-tests.tsx
+++ b/types/expo/v23/expo-tests.tsx
@@ -106,10 +106,7 @@ async () => {
         onError={(error) => console.log(error)} />
 );
 () => (
-    <AppLoading
-        startAsync={null}
-        onFinish={null}
-        onError={null} />
+    <AppLoading />
 );
 
 const barcodeReadCallback = () => {};
diff --git a/types/expo/v23/index.d.ts b/types/expo/v23/index.d.ts
index 54154d8d6b..78de7bf415 100644
--- a/types/expo/v23/index.d.ts
+++ b/types/expo/v23/index.d.ts
@@ -330,15 +330,12 @@ export class Video extends Component<VideoProps, VideoState> {
 /**
  * AppLoading
  */
-export type AppLoadingProperties = {
-    startAsync: () => Promise<void>;
-    onFinish: () => void;
+export interface AppLoadingProperties {
+    startAsync?: () => Promise<void>;
+    onFinish?: () => void;
     onError?: (error: Error) => void;
-} | {
-    startAsync: null;
-    onFinish: null;
-    onError?: null;
-};
+}
+
 export class AppLoading extends Component<AppLoadingProperties> { }
 
 /**
diff --git a/types/expo/v23/tsconfig.json b/types/expo/v23/tsconfig.json
index 3d85e281ed..295d9da342 100644
--- a/types/expo/v23/tsconfig.json
+++ b/types/expo/v23/tsconfig.json
@@ -2,7 +2,8 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es6"
+            "es6",
+            "dom"
         ],
         "jsx": "react",
         "noImplicitAny": true,
@@ -29,4 +30,4 @@
         "index.d.ts",
         "expo-tests.tsx"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/expo/v24/expo-tests.tsx b/types/expo/v24/expo-tests.tsx
index 77f9bbba87..8749a5993c 100644
--- a/types/expo/v24/expo-tests.tsx
+++ b/types/expo/v24/expo-tests.tsx
@@ -196,10 +196,7 @@ async () => {
         onError={(error) => console.log(error)} />
 );
 () => (
-    <AppLoading
-        startAsync={null}
-        onFinish={null}
-        onError={null} />
+    <AppLoading />
 );
 
 const barcodeReadCallback = () => {};
diff --git a/types/expo/v24/index.d.ts b/types/expo/v24/index.d.ts
index 4bf5e48dc9..829e9730a7 100644
--- a/types/expo/v24/index.d.ts
+++ b/types/expo/v24/index.d.ts
@@ -99,20 +99,16 @@ export namespace Amplitude {
 
 // #region AppLoading
 /** The following props are recommended, but optional for the sake of backwards compatibility (they were introduced in SDK21). If you do not provide any props, you are responsible for coordinating loading assets, handling errors, and updating state to unmount the `AppLoading` component. */
-export type AppLoadingProps = {
+export interface AppLoadingProps {
     /** A `function` that returns a `Promise`. The `Promise` should resolve when the app is done loading data and assets. */
-    startAsync: () => Promise<void>;
+    startAsync?: () => Promise<void>;
 
     /** Required if you provide `startAsync`. Called when `startAsync` resolves or rejects. This should be used to set state and unmount the `AppLoading` component. */
-    onFinish: () => void;
+    onFinish?: () => void;
 
     /** If `startAsync` throws an error, it is caught and passed into the function provided to `onError`. */
     onError?: (error: Error) => void;
-} | {
-    startAsync: null;
-    onFinish: null;
-    onError?: null;
-};
+}
 
 /**
  * A React component that tells Expo to keep the app loading screen open if it is the first and only component rendered in your app. When it is removed, the loading screen will disappear and your app will be visible.
diff --git a/types/expo/v24/tsconfig.json b/types/expo/v24/tsconfig.json
index 87b7b33224..dffdd0aa8c 100644
--- a/types/expo/v24/tsconfig.json
+++ b/types/expo/v24/tsconfig.json
@@ -2,7 +2,8 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es6"
+            "es6",
+            "dom"
         ],
         "jsx": "react",
         "noImplicitAny": true,
@@ -29,4 +30,4 @@
         "index.d.ts",
         "expo-tests.tsx"
     ]
-}
\ No newline at end of file
+}

From 23d02a78fb32eddf45cd5e0acd7e07fa6bf29836 Mon Sep 17 00:00:00 2001
From: Jack Leigh <jack.leigh@candide.eu>
Date: Wed, 14 Mar 2018 12:05:47 +0000
Subject: [PATCH 0505/1382] react-native: Correct onKeyPress type

See https://facebook.github.io/react-native/docs/0.53/textinput.html#onkeypress
This has been the case since 0.41 at least.
---
 types/react-native/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index f4be32ade0..5abf96e04c 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -972,7 +972,7 @@ export interface TextInputIOSProperties {
      * Pressed key value is passed as an argument to the callback handler.
      * Fires before onChange callbacks.
      */
-    onKeyPress?: (key: string) => void;
+    onKeyPress?: (event: {nativeEvent: {key: string}}) => void;
 
     /**
      * See DocumentSelectionState.js, some state that is responsible for maintaining selection information for a document

From 09b206f5f7a67630d457c569927010a162bb5d5f Mon Sep 17 00:00:00 2001
From: Chris Filipowski <kfilipowski+git@gmail.com>
Date: Wed, 14 Mar 2018 20:30:59 +0800
Subject: [PATCH 0506/1382] graphql-list-fields: remove empty namespace
 (discouraged practice)

---
 types/graphql-list-fields/index.d.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/types/graphql-list-fields/index.d.ts b/types/graphql-list-fields/index.d.ts
index 1cd4a1c005..362658deb9 100644
--- a/types/graphql-list-fields/index.d.ts
+++ b/types/graphql-list-fields/index.d.ts
@@ -6,7 +6,6 @@
 
 import { GraphQLResolveInfo } from "graphql";
 
-declare namespace getFieldList {}
 declare function getFieldList(info: GraphQLResolveInfo): string[];
 
 export = getFieldList;

From 8c71e13cc7130beec3b3e684d5905fff8a0c9e99 Mon Sep 17 00:00:00 2001
From: Nick Schultz <nrschultz@gmail.com>
Date: Wed, 14 Mar 2018 09:05:42 -0400
Subject: [PATCH 0507/1382] the order of returned values was flipped

---
 types/sequelize/index.d.ts         | 4 ++--
 types/sequelize/sequelize-tests.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/types/sequelize/index.d.ts b/types/sequelize/index.d.ts
index 7d72a0b096..370e96d7a1 100644
--- a/types/sequelize/index.d.ts
+++ b/types/sequelize/index.d.ts
@@ -4006,9 +4006,9 @@ declare namespace sequelize {
          * whether the row was inserted or not.
          */
         upsert(values: TAttributes, options?: UpsertOptions & { returning: false | undefined }): Promise<boolean>;
-        upsert(values: TAttributes, options?: UpsertOptions & { returning: true }): Promise<[boolean, TInstance]>;
+        upsert(values: TAttributes, options?: UpsertOptions & { returning: true }): Promise<[TInstance, boolean]>;
         insertOrUpdate(values: TAttributes, options?: UpsertOptions & { returning: false | undefined }): Promise<boolean>;
-        insertOrUpdate(values: TAttributes, options?: UpsertOptions & { returning: true }): Promise<[boolean, TInstance]>;
+        insertOrUpdate(values: TAttributes, options?: UpsertOptions & { returning: true }): Promise<[TInstance, boolean]>;
 
         /**
          * Create and insert multiple instances in bulk.
diff --git a/types/sequelize/sequelize-tests.ts b/types/sequelize/sequelize-tests.ts
index 5d1f6eed34..f99988b29f 100644
--- a/types/sequelize/sequelize-tests.ts
+++ b/types/sequelize/sequelize-tests.ts
@@ -1044,7 +1044,7 @@ findOrRetVal = User.findOrCreate( { where : { email : 'unique.email.@d.com', com
 findOrRetVal = User.findOrCreate( { where : { objectId : 1 }, defaults : { bool : false } } );
 
 let upsertPromiseNoOptions: Bluebird<boolean> = User.upsert( { id : 42, username : 'doe', foo : s.fn( 'upper', 'mixedCase2' ) } );
-let upsertPromiseReturning: Bluebird<[boolean, AnyInstance]> = User.upsert( { id : 42, username : 'doe', foo : s.fn( 'upper', 'mixedCase2' ) }, { returning: true } );
+let upsertPromiseReturning: Bluebird<[AnyInstance, boolean]> = User.upsert( { id : 42, username : 'doe', foo : s.fn( 'upper', 'mixedCase2' ) }, { returning: true } );
 let upsertPromiseNotReturning: Bluebird<boolean> = User.upsert( { id : 42, username : 'doe', foo : s.fn( 'upper', 'mixedCase2' ) }, { returning: false } );
 
 User.bulkCreate( [{ aNumber : 10 }, { aNumber : 12 }] ).then( ( i ) => i[0].isNewRecord );

From 2e7f1f9da395294eee9b36406a82d300559baa22 Mon Sep 17 00:00:00 2001
From: Nick Schultz <nrschultz@gmail.com>
Date: Wed, 14 Mar 2018 09:14:43 -0400
Subject: [PATCH 0508/1382] update version and add myself to maintainers

---
 types/sequelize/index.d.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/sequelize/index.d.ts b/types/sequelize/index.d.ts
index 370e96d7a1..a9b59a0766 100644
--- a/types/sequelize/index.d.ts
+++ b/types/sequelize/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Sequelize 4.27.8
+// Type definitions for Sequelize 4.27.9
 // Project: http://sequelizejs.com
 // Definitions by: samuelneff <https://github.com/samuelneff>
 //                 Peter Harris <https://github.com/codeanimal>
@@ -12,6 +12,7 @@
 //                 Nikola Vidic <https://github.com/nidzov>
 //                 Florian Oellerich <https://github.com/Raigen>
 //                 Todd Bealmear <https://github.com/todd>
+//                 Nick Schultz <https://github.com/nrschultz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 

From 5bf8062713d6dc419fa8c5fd3225c01e29907195 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Je=CC=81ro=CC=82me=20Macias?= <jerome.macias@gmail.com>
Date: Wed, 14 Mar 2018 14:30:11 +0100
Subject: [PATCH 0509/1382] [knex] Add missing SchemaBuilder::alterTable
 definition

---
 types/knex/index.d.ts    | 1 +
 types/knex/knex-tests.ts | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/types/knex/index.d.ts b/types/knex/index.d.ts
index eecfde8774..c34c4a7000 100644
--- a/types/knex/index.d.ts
+++ b/types/knex/index.d.ts
@@ -403,6 +403,7 @@ declare namespace Knex {
     interface SchemaBuilder extends Bluebird<any> {
         createTable(tableName: string, callback: (tableBuilder: CreateTableBuilder) => any): SchemaBuilder;
         createTableIfNotExists(tableName: string, callback: (tableBuilder: CreateTableBuilder) => any): SchemaBuilder;
+        alterTable(tableName: string, callback: (tableBuilder: CreateTableBuilder) => any): SchemaBuilder;
         renameTable(oldTableName: string, newTableName: string): Bluebird<void>;
         dropTable(tableName: string): SchemaBuilder;
         hasTable(tableName: string): Bluebird<boolean>;
diff --git a/types/knex/knex-tests.ts b/types/knex/knex-tests.ts
index 3e8e798212..c5f42ec9ae 100644
--- a/types/knex/knex-tests.ts
+++ b/types/knex/knex-tests.ts
@@ -763,6 +763,10 @@ knex.schema.createTable('users', function (table) {
   table.timestamps(true, true);
 });
 
+knex.schema.alterTable('users', function (table) {
+  table.string('role').nullable();
+});
+
 knex.schema.renameTable('users', 'old_users');
 
 knex.schema.dropTable('users');

From b58703728af79d2c3b19113597f601e934278a22 Mon Sep 17 00:00:00 2001
From: cliedeman <ciaranliedeman@gmail.com>
Date: Wed, 14 Mar 2018 15:42:43 +0200
Subject: [PATCH 0510/1382] Added types for switch navigator

---
 types/react-navigation/index.d.ts             | 14 ++++++++++
 .../react-navigation-tests.tsx                | 26 +++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index c4e396783f..a2dcdc937b 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -14,6 +14,7 @@
 //                 Veit Lehmann: <https://github.com/levito>
 //                 Roberto Huertas: <https://github.com/robertohuertasm>
 //                 Steven Miller <https://github.com/YourGamesBeOver>
+//                 Ciaran Liedeman <https://github.com/cliedeman>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -575,6 +576,19 @@ export function StackNavigator(
   stackConfig?: StackNavigatorConfig,
 ): NavigationContainer;
 
+export interface SwitchNavigatorConfig {
+  initialRouteName: string;
+  resetOnBlur?: boolean;
+  paths?: NavigationPathsConfig;
+  backBehavior?: 'none' | 'intialRoute';
+}
+
+// Return createNavigationContainer
+export function SwitchNavigator(
+  routeConfigMap: NavigationRouteConfigMap,
+  switchConfig?: SwitchNavigatorConfig
+): NavigationContainer;
+
 // DrawerItems
 export const DrawerItems: React.ReactType;
 
diff --git a/types/react-navigation/react-navigation-tests.tsx b/types/react-navigation/react-navigation-tests.tsx
index 017a9b9153..79ca619c00 100644
--- a/types/react-navigation/react-navigation-tests.tsx
+++ b/types/react-navigation/react-navigation-tests.tsx
@@ -24,6 +24,8 @@ import {
     NavigationTransitionProps,
     StackNavigator,
     StackNavigatorConfig,
+    SwitchNavigator,
+    SwitchNavigatorConfig,
     TabBarTop,
     TabNavigator,
     TabNavigatorConfig,
@@ -219,6 +221,30 @@ function renderAdvancedStackNavigator(): JSX.Element {
     );
 }
 
+/**
+ * Switch navigator.
+ */
+
+const switchNavigatorConfig: SwitchNavigatorConfig = {
+    initialRouteName: 'screen',
+    resetOnBlur: false,
+    backBehavior: 'none'
+};
+
+const BasicSwitchNavigator = SwitchNavigator(
+    routeConfigMap,
+    switchNavigatorConfig,
+);
+
+function renderBasicSwitchNavigator(): JSX.Element {
+    return (
+        <BasicSwitchNavigator
+            ref={(ref: any) => { }}
+            style={viewStyle}
+        />
+    );
+}
+
 /**
  * Drawer navigator.
  */

From bc2147e2b91880f8bfc1d6ba27bd72d6d8bcacb6 Mon Sep 17 00:00:00 2001
From: Alban Gicquel <alban.gicquel@thomsonreuters.com>
Date: Mon, 26 Feb 2018 16:44:43 -0500
Subject: [PATCH 0511/1382] Added support for async return types being promises
 as stipulated by inquirer doc

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

diff --git a/types/inquirer/index.d.ts b/types/inquirer/index.d.ts
index 67d8fd29ac..37141876a7 100644
--- a/types/inquirer/index.d.ts
+++ b/types/inquirer/index.d.ts
@@ -4,6 +4,7 @@
 //                 Parvez <https://github.com/ppathan>
 //                 Jouderian <https://github.com/jouderianjr>
 //                 Qibang <https://github.com/bang88>
+//                 Synarque <https://github.com/synarque>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 // TypeScript Version: 2.3
@@ -89,29 +90,29 @@ declare namespace inquirer {
          * Default value(s) to use if nothing is entered, or a function that returns the default value(s).
          * If defined as a function, the first parameter will be the current inquirer session answers.
          */
-        default?: any | ((answers: T) => any);
+        default?: any | ((answers: T) => any) | ((answers: T) => Promise<any>);
         /**
          * Choices array or a function returning a choices array. If defined as a function,
          * the first parameter will be the current inquirer session answers.
          * Array values can be simple strings, or objects containing a name (to display) and a value properties
          * (to save in the answers hash). Values can also be a Separator.
          */
-        choices?: ChoiceType[] | ((answers: T) => ChoiceType[]);
+        choices?: ChoiceType[] | ((answers: T) => ChoiceType[]) | ((answers: T) => Promise<ChoiceType[]>);
         /**
          * Receive the user input and should return true if the value is valid, and an error message (String)
          * otherwise. If false is returned, a default error message is provided.
          */
-        validate?(input: string, answers?: T): boolean | string;
+        validate?(input: string, answers?: T): boolean | string | Promise<boolean | string>;
         /**
          * Receive the user input and return the filtered value to be used inside the program.
          * The value returned will be added to the Answers hash.
          */
-        filter?(input: string): string;
+        filter?(input: string): string | Promise<string>;
         /**
          * Receive the current user answers hash and should return true or false depending on whether or
          * not this question should be asked. The value can also be a simple boolean.
          */
-        when?: boolean | ((answers: T) => boolean);
+        when?: boolean | ((answers: T) => boolean) | ((answers: T) => Promise<boolean>);
         paginated?: boolean;
         /**
          * Change the number of lines that will be rendered when using list, rawList, expand or checkbox.

From 05c5c440fa354bcdb838c00418cc9fb0b6793612 Mon Sep 17 00:00:00 2001
From: Christian Rackerseder <git@echooff.de>
Date: Wed, 14 Mar 2018 15:17:15 +0100
Subject: [PATCH 0512/1382] [tiny-slider-react] Add types

---
 types/tiny-slider-react/index.d.ts            | 264 ++++++++++++++++++
 .../tiny-slider-react-tests.tsx               |  28 ++
 types/tiny-slider-react/tsconfig.json         |  25 ++
 types/tiny-slider-react/tslint.json           |   1 +
 4 files changed, 318 insertions(+)
 create mode 100644 types/tiny-slider-react/index.d.ts
 create mode 100644 types/tiny-slider-react/tiny-slider-react-tests.tsx
 create mode 100644 types/tiny-slider-react/tsconfig.json
 create mode 100644 types/tiny-slider-react/tslint.json

diff --git a/types/tiny-slider-react/index.d.ts b/types/tiny-slider-react/index.d.ts
new file mode 100644
index 0000000000..a8cd14760c
--- /dev/null
+++ b/types/tiny-slider-react/index.d.ts
@@ -0,0 +1,264 @@
+// Type definitions for tiny-slider-react 0.3
+// Project: https://github.com/jechav/tiny-slider-react#readme
+// Definitions by: Christian Rackerseder <https://github.com/screendriver>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+import * as React from "react";
+
+interface CommonOptions {
+    /**
+     * Default: 0.
+     * The initial index of the slider.
+     */
+    startIndex?: number;
+    /**
+     * Default: 1.
+     * Number of slides being displayed in the viewport.
+     */
+    items?: number;
+    /**
+     * Default: 0.
+     * Space between slides (in "px").
+     */
+    gutter?: number;
+    /**
+     * 	Default: 1.
+     * Number of slides going on one "click".
+     */
+    slideBy?: number | "page";
+    /**
+     * Default: 300.
+     * Speed of the slide animation (in "ms").
+     */
+    speed?: number;
+    /**
+     * 	Default: false.
+     * Height of slider container changes according to each slide"s height.
+     */
+    autoHeight?: boolean;
+    /**
+     * Default: false.
+     * Controls width attribute of the slides.
+     */
+    fixedWidth?: number | false;
+    /**
+     * Default: 0.
+     * Space on the outside (in "px").
+     */
+    edgePadding?: number;
+    /**
+     * Default: true.
+     * Controls the display and functionalities of controls components (prev/next buttons). If true, display the controls and add all functionalities.
+     */
+    controls?: boolean;
+    /**
+     * Default: ["prev", "next"].
+     * Text or markup in the prev/next buttons
+     */
+    controlsText?: string[];
+    /**
+     * Default: true.
+     * Controls the display and functionalities of nav components (dots). If true, display the nav and add all functionalities.
+     */
+    nav?: boolean;
+    /**
+     * Default: false.
+     * Toggles the automatic change of slides
+     */
+    autoplay?: boolean;
+    /**
+     * Default: false.
+     * Stops sliding on mouseover.
+     */
+    autoplayHoverPause?: boolean;
+    /**
+     * Default: true.
+     * Pauses the sliding when the page is invisiable and resumes it when the page become visiable again
+     */
+    autoplayResetOnVisibility?: boolean;
+    /**
+     * Default: ["start", "stop"].
+     * Text or markup in the autoplay start/stop button.
+     */
+    autoplayText?: string[];
+    /**
+     * Default: 5000.
+     * Time between 2 autoplay slides change (in "ms").
+     */
+    autoplayTimeout?: number;
+    /**
+     * 	Default: true.
+     * Activates input detection for touch devices.
+     */
+    touch?: boolean;
+    /**
+     * Default: false.
+     * Changing slides by dragging them.
+     */
+    mouseDrag?: boolean;
+    /**
+     * Default: false.
+     * Allows using arrow keys to switch slides.
+     */
+    arrowKeys?: boolean;
+    /**
+     * Default: false.
+     * Disable slider.
+     */
+    disable?: boolean;
+}
+
+export interface ResponsiveOptions {
+    [breakpoint: number]: CommonOptions;
+}
+
+export interface TinySliderSettings extends CommonOptions {
+    /**
+     * Default: document.querySelector(".slider").
+     * The slider container element or selector.
+     */
+    container?: HTMLElement | string;
+    /**
+     * Default: "carousel".
+     * Controls animation behaviour.
+     * With carousel everything slides to the side, while gallery uses fade animations and changes all slides at once.
+     */
+    mode?: "carousel" | "gallery";
+    /**
+     * Default: "horizontal".
+     * The axis of the slider.
+     */
+    axis?: "horizontal" | "vertical";
+    /**
+     * Default: false.
+     * The container element/selector around the prev/next buttons.
+     * controlsContainer must have at least 2 child elements.
+     */
+    controlsContainer?: HTMLElement | string | false;
+    /**
+     * Default: false.
+     * The container element/selector around the dots.
+     * navContainer must have at least same number of children as the slides.
+     */
+    navContainer?: HTMLElement | string | false;
+    /**
+     * Default: false.
+     * Indecate if the dots are thurbnails. If true, they will always be visible even when more than 1 slides displayed in the viewport.
+     */
+    navAsThumbnails?: boolean;
+    /**
+     * Default: "forward".
+     * Direction of slide movement (ascending/descending the slide index).
+     */
+    autoplayDirection?: "forward" | "backward";
+    /**
+     * Default: false.
+     * The customized autoplay start/stop button or selector.
+     */
+    autoplayButton?: HTMLElement | string | false;
+    /**
+     * Default: true.
+     * Output autoplayButton markup when autoplay is true but a customized autoplayButton is not provided.
+     */
+    autoplayButtonOutput?: boolean;
+    /**
+     * Default: "tns-fadeIn".
+     * Name of intro animation class.
+     */
+    animateIn?: string;
+    /**
+     * Default: "tns-fadeOut".
+     * Name of outro animation class.
+     */
+    animateOut?: string;
+    /**
+     * Default: "tns-normal".
+     * Name of default animation class.
+     */
+    animateNormal?: string;
+    /**
+     * Default: false.
+     * Time between each gallery animation (in "ms").
+     */
+    animateDelay?: number | false;
+    /**
+     * Default: true.
+     * Moves throughout all the slides seamlessly.
+     */
+    loop?: boolean;
+    /**
+     * Default: false.
+     * Moves to the opposite edge when reaching the first or last slide.
+     */
+    rewind?: boolean;
+    /**
+     * Default: false.
+     * Breakpoint: Integer.
+     * Defines options for different viewport widths
+     */
+    responsive?: ResponsiveOptions | false;
+    /**
+     * Default: false.
+     * Enables lazyloading images that are currently not viewed, thus saving bandwidth
+     */
+    lazyload?: boolean;
+    /**
+     * Default: 15.
+     * Swipe or drag will not be triggered if the angle is not inside the range when set.
+     */
+    swipeAngle?: number | boolean;
+    /**
+     * Default: false.
+     * Difine the relationship between nested sliders.
+     * Make sure you run the inner slider first, otherwise the height of the inner slider container will be wrong.
+     */
+    nested?: "inner" | "outer" | false;
+    /**
+     * Default: true.
+     * Indicate whether the slider will be frozen (controls, nav, autoplay and other functions will stop work) when all slides can be displayed in one page.
+     */
+    freezable?: boolean;
+    /**
+     * Default: false.
+     * Callback to be run on initialization.
+     */
+    onInit?: () => void | false;
+}
+
+export interface TinySliderInfo {
+    cloneCount: number;
+    container: HTMLElement;
+    controlsContainer?: boolean;
+    hasControls: boolean;
+    index: number;
+    indexCached: number;
+    items: number;
+    navContainer?: HTMLElement;
+    navCurrentIndex?: number;
+    navCurrentIndexCached?: number;
+    navItems?: HTMLCollection;
+    nextButton?: HTMLElement;
+    prevButton?: HTMLElement;
+    slideBy: number;
+    slideCount: number;
+    slideCountNew: number;
+    slideItems: HTMLCollection;
+    visibleNavIndexes?: number;
+    visibleNavIndexesCached?: number;
+}
+
+export interface TinySliderProps {
+    settings?: TinySliderSettings;
+    onClick?: (slideClicked: number, info: string, event: Event) => void;
+    startIndex?: number;
+    onIndexChanged?: (info: TinySliderInfo) => void;
+    onTransitionStart?: (info: TinySliderInfo) => void;
+    onTransitionEnd?: (info: TinySliderInfo) => void;
+    onTouchStart?: (info: TinySliderInfo) => void;
+    onTouchMove?: (info: TinySliderInfo) => void;
+    onTouchEnd?: (info: TinySliderInfo) => void;
+}
+
+declare class TinySlider extends React.Component<TinySliderProps> {}
+
+export default TinySlider;
diff --git a/types/tiny-slider-react/tiny-slider-react-tests.tsx b/types/tiny-slider-react/tiny-slider-react-tests.tsx
new file mode 100644
index 0000000000..29c7eb97c7
--- /dev/null
+++ b/types/tiny-slider-react/tiny-slider-react-tests.tsx
@@ -0,0 +1,28 @@
+import * as React from "react";
+import TinySlider, { TinySliderSettings, TinySliderInfo } from "tiny-slider-react";
+
+const settings: TinySliderSettings = {
+    startIndex: 1,
+    slideBy: "page",
+    speed: 60,
+    controlsText: ["yes", "no"],
+    nav: false,
+    autoplayText: ["start", "stop"],
+    arrowKeys: false,
+    disable: true,
+    mode: "gallery",
+    axis: "vertical",
+    responsive: {
+        600: {
+          startIndex: 3,
+          gutter: 5,
+          fixedWidth: false
+        }
+    }
+};
+
+function handleIndexChanged(info: TinySliderInfo) {
+  console.log(info.hasControls, info.slideCount);
+}
+
+const MyComponent = <TinySlider settings={settings} onIndexChanged={handleIndexChanged} />;
diff --git a/types/tiny-slider-react/tsconfig.json b/types/tiny-slider-react/tsconfig.json
new file mode 100644
index 0000000000..87076a05e3
--- /dev/null
+++ b/types/tiny-slider-react/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react"
+    },
+    "files": [
+        "index.d.ts",
+        "tiny-slider-react-tests.tsx"
+    ]
+}
diff --git a/types/tiny-slider-react/tslint.json b/types/tiny-slider-react/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/tiny-slider-react/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 3808fe6627efb5773f48097d6eb01fb5067c5fc2 Mon Sep 17 00:00:00 2001
From: Dominique <domi.rau@gmail.com>
Date: Wed, 14 Mar 2018 15:32:12 +0100
Subject: [PATCH 0513/1382] feat(got): add got timoutoptions

workaround for timeout

fix test
---
 types/got/got-tests.ts | 14 ++++++++++++++
 types/got/index.d.ts   |  8 ++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/types/got/got-tests.ts b/types/got/got-tests.ts
index 7857bddbab..7048533295 100644
--- a/types/got/got-tests.ts
+++ b/types/got/got-tests.ts
@@ -52,6 +52,20 @@ got('todomvc.com', {
     encoding: 'utf8',
     hostname: 'todomvc'
 }).then(response => str = response.body);
+got('todomvc.com', {
+    form: true,
+    body: [{}],
+    encoding: 'utf8',
+    hostname: 'todomvc',
+    timeout: 2000
+}).then(response => str = response.body);
+got('todomvc.com', {
+    form: true,
+    body: [{}],
+    encoding: 'utf8',
+    hostname: 'todomvc',
+    timeout: {connect: 20, request: 20, socket: 20}
+}).then(response => str = response.body);
 // following must lead to type checking error: got('todomvc.com', {form: true, body: ''}).then(response => str = response.body);
 
 got('todomvc.com', {encoding: null, hostname: 'todomvc'}).then(response => buf = response.body);
diff --git a/types/got/index.d.ts b/types/got/index.d.ts
index 30a5b2c0be..5872b4f993 100644
--- a/types/got/index.d.ts
+++ b/types/got/index.d.ts
@@ -98,7 +98,11 @@ declare namespace got {
         json?: boolean;
     }
 
-    type GotOptions<E extends string | null> = http.RequestOptions & {
+    interface TimoutRequestOptions extends http.RequestOptions {
+        timeout?: any;
+    }
+
+    interface GotOptions<E extends string | null> extends TimoutRequestOptions {
         encoding?: E;
         query?: string | object;
         timeout?: number | TimeoutOptions;
@@ -106,7 +110,7 @@ declare namespace got {
         followRedirect?: boolean;
         decompress?: boolean;
         useElectronNet?: boolean;
-    };
+    }
 
     interface TimeoutOptions {
         connect?: number;

From 16f23e36a534043353fa47b7f8c3815a32826512 Mon Sep 17 00:00:00 2001
From: Andrew Pinkham <code@andrewsforge.com>
Date: Wed, 14 Mar 2018 11:25:28 -0400
Subject: [PATCH 0514/1382] webpack: Add hash options to config

---
 types/webpack/index.d.ts       | 8 +++++++-
 types/webpack/webpack-tests.ts | 4 +++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/types/webpack/index.d.ts b/types/webpack/index.d.ts
index 9c9239e5ea..2277ec2867 100644
--- a/types/webpack/index.d.ts
+++ b/types/webpack/index.d.ts
@@ -134,7 +134,7 @@ declare namespace webpack {
     }
 
     interface Output {
-        /** The output directory as absolute path (required). */
+        /** The output directory as absolute path. */
         path?: string;
         /** The filename of the entry chunk as relative path inside the output.path directory. */
         filename?: string;
@@ -190,8 +190,14 @@ declare namespace webpack {
         sourcePrefix?: string;
         /** This option enables cross-origin loading of chunks. */
         crossOriginLoading?: string | boolean;
+        /** The encoding to use when generating the hash, defaults to 'hex' */
+        hashDigest?: 'hex' | 'latin1' | 'base64';
+        /** The prefix length of the hash digest to use, defaults to 20. */
+        hashDigestLength?: number;
         /** Algorithm used for generation the hash (see node.js crypto package) */
         hashFunction?: string | ((algorithm: string, options?: any) => any);
+        /** An optional salt to update the hash via Node.JS' hash.update. */
+        hashSalt?: string;
         /** An expression which is used to address the global object/scope in runtime code. */
         globalObject?: string;
     }
diff --git a/types/webpack/webpack-tests.ts b/types/webpack/webpack-tests.ts
index d6bd908357..8fe0ab1e4d 100644
--- a/types/webpack/webpack-tests.ts
+++ b/types/webpack/webpack-tests.ts
@@ -100,7 +100,9 @@ configuration = {
         path: path.join(__dirname, "assets", "[hash]"),
         publicPath: "assets/[hash]/",
         filename: "output.[hash].bundle.js",
-        chunkFilename: "[id].[hash].bundle.js"
+        chunkFilename: "[id].[hash].bundle.js",
+        hashFunction: 'sha256',
+        hashDigestLength: 64,
     }
 };
 

From c6e173553e1809f661e30d276a1c47e2623c328a Mon Sep 17 00:00:00 2001
From: Rob van der Burgt <rob@mistergreen.nl>
Date: Wed, 14 Mar 2018 16:46:19 +0100
Subject: [PATCH 0515/1382] @types/compression added default filter method
 interface

---
 types/compression/compression-tests.ts | 13 ++++++++++++-
 types/compression/index.d.ts           | 22 +++++++++++++++++-----
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/types/compression/compression-tests.ts b/types/compression/compression-tests.ts
index dc284ce2df..192ec309e8 100644
--- a/types/compression/compression-tests.ts
+++ b/types/compression/compression-tests.ts
@@ -1,4 +1,3 @@
-
 import express = require('express');
 import compress = require('compression');
 
@@ -7,3 +6,15 @@ app.use(compress());
 app.use(compress({
     threshold: 512
 }));
+app.use(compress({
+    threshold: 512,
+    filter: (req, res) => {
+        if (req.headers['x-no-compression']) {
+            // don't compress responses with this request header
+            return false;
+        }
+
+        // fallback to standard filter function
+        return compress.filter(req, res);
+    }
+}));
\ No newline at end of file
diff --git a/types/compression/index.d.ts b/types/compression/index.d.ts
index 68d687a9c4..813a823a96 100644
--- a/types/compression/index.d.ts
+++ b/types/compression/index.d.ts
@@ -1,13 +1,26 @@
 // Type definitions for compression
 // Project: https://github.com/expressjs/compression
 // Definitions by: Santi Albo <https://github.com/santialbo>
+//                 Rob van der Burgt <https://github.com/rburgt>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
 import * as express from 'express';
 
+declare function e(options?: e.CompressionOptions): express.RequestHandler;
+
 declare namespace e {
-    interface CompressionOptions  {
+    /**
+     * Default filter, used for extending filter given in CompressionOptions
+     * See https://github.com/expressjs/compression#filter-1 regarding the usage
+     */
+    export function filter(req: express.Request, res: express.Response): boolean;
+
+    interface CompressionFilter {
+        (req: express.Request, res: express.Response): boolean;
+    }
+
+    interface CompressionOptions {
         /**
          * See https://github.com/expressjs/compression#chunksize regarding the usage.
          */
@@ -31,7 +44,7 @@ declare namespace e {
         /**
          * See https://github.com/expressjs/compression#threshold regarding the usage.
          */
-        threshold?: number|string;
+        threshold?: number | string;
 
         /**
          * See https://github.com/expressjs/compression#windowbits regarding the usage.
@@ -41,8 +54,8 @@ declare namespace e {
         /**
          * See https://github.com/expressjs/compression#filter regarding the usage.
          */
-        filter?: Function;
-        
+        filter?: CompressionFilter;
+
         /**
          * See https://nodejs.org/api/zlib.html#zlib_class_options regarding the usage.
          */
@@ -55,5 +68,4 @@ declare namespace e {
     }
 }
 
-declare function e(options?: e.CompressionOptions): express.RequestHandler;
 export = e;

From f7bc7b458405b1683029768d1ef4555144aa7be5 Mon Sep 17 00:00:00 2001
From: Peter B <pbojanczyk@gmail.com>
Date: Wed, 14 Mar 2018 12:21:38 -0400
Subject: [PATCH 0516/1382] added defaultSort property to columnDef

supporting ui-grid documentation: http://ui-grid.info/docs/#!/tutorial/324_default_sorting
---
 types/ui-grid/index.d.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/types/ui-grid/index.d.ts b/types/ui-grid/index.d.ts
index 7bf551c59f..274f304dba 100644
--- a/types/ui-grid/index.d.ts
+++ b/types/ui-grid/index.d.ts
@@ -3545,6 +3545,8 @@ declare namespace uiGrid {
     export interface IGridColumnOf<TEntity> {
         /** Column definition */
         colDef: uiGrid.IColumnDefOf<TEntity>;
+        /** Default sort on this column */
+        defaultSort?: ISortInfo;
         /**
          * Column name that will be shown in the header.
          * If displayName is not provided then one is generated using the name.
@@ -3683,6 +3685,8 @@ declare namespace uiGrid {
          * @default false
          */
         cellTooltip?: boolean | string | ICellTooltipGetter<TEntity>;
+        /** Default object of sort information */
+        defaultSort?: ISortInfo;
         /**
          * Column name that will be shown in the header.
          * If displayName is not provided then one is generated using the name.

From 71aafe57714336c6c5b1b41466baff92e81b2799 Mon Sep 17 00:00:00 2001
From: Peter B <pbojanczyk@gmail.com>
Date: Wed, 14 Mar 2018 12:41:21 -0400
Subject: [PATCH 0517/1382] updated comment to comply with readme.md

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

diff --git a/types/ui-grid/index.d.ts b/types/ui-grid/index.d.ts
index 274f304dba..748dda3bf9 100644
--- a/types/ui-grid/index.d.ts
+++ b/types/ui-grid/index.d.ts
@@ -1,6 +1,8 @@
 // Type definitions for ui-grid
 // Project: http://www.ui-grid.info/
-// Definitions by: Ben Tesser <https://github.com/btesser>, Joe Skeen <https://github.com/joeskeen>
+// Definitions by: Ben Tesser <https://github.com/btesser>
+//                 Joe Skeen <https://github.com/joeskeen>
+//                 Peter Bojanczyk <https://github.com/pbojanczyk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 

From 042216be691c7a71e0856c73a9182e412bfcba03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guilherme=20H=C3=BCbner=20Franco?=
 <guilherme_hubner@msn.com>
Date: Tue, 13 Mar 2018 13:44:17 -0300
Subject: [PATCH 0518/1382] [react-text-mask] Fix definition

---
 types/react-text-mask/index.d.ts | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/types/react-text-mask/index.d.ts b/types/react-text-mask/index.d.ts
index f4c46bea58..7ed81429e0 100644
--- a/types/react-text-mask/index.d.ts
+++ b/types/react-text-mask/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-text-mask 16.0
+// Type definitions for react-text-mask 5.1
 // Project: https://github.com/text-mask/text-mask
 // Definitions by: Guilherme Hübner <https://github.com/guilhermehubner>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -9,7 +9,7 @@ import * as React from "react";
 export type maskArray = Array<string | RegExp>;
 
 export interface MaskedInputProps extends React.InputHTMLAttributes<HTMLInputElement> {
-    mask?: maskArray | ((input: HTMLInputElement) => maskArray);
+    mask?: maskArray | ((value: string) => maskArray);
 
     guide?: boolean;
 
@@ -19,9 +19,7 @@ export interface MaskedInputProps extends React.InputHTMLAttributes<HTMLInputEle
 
     pipe?: (conformedValue: string, config: any) => false | string | { value: string, indexesOfPipedChars: number[] };
 
-    onReject?: (infos: { conformedValue: string, maskRejection: boolean, pipeRejection: boolean }) => void;
-
-    onAccept?: () => void;
+    showMask?: boolean;
 }
 
 export interface conformToMaskResult {

From 52bde4982f4f477f815fb2a484c584c9cf9109c0 Mon Sep 17 00:00:00 2001
From: Andy <anhans@microsoft.com>
Date: Wed, 14 Mar 2018 10:10:41 -0700
Subject: [PATCH 0519/1382] socket.io: Merge namespace with exported value
 (#24261)

---
 types/feathersjs__socketio/index.d.ts |  2 +-
 types/socket.io-redis/index.d.ts      | 10 +++-------
 types/socket.io.users/index.d.ts      |  7 +------
 types/socket.io/index.d.ts            |  8 ++------
 types/socket.io/socket.io-tests.ts    |  2 +-
 types/socketio-wildcard/index.d.ts    |  2 +-
 6 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/types/feathersjs__socketio/index.d.ts b/types/feathersjs__socketio/index.d.ts
index 7ba889dfbe..f0e082bf45 100644
--- a/types/feathersjs__socketio/index.d.ts
+++ b/types/feathersjs__socketio/index.d.ts
@@ -4,8 +4,8 @@
 // Definitions: https://github.com/feathersjs-ecosystem/feathers-typescript
 // TypeScript Version: 2.3
 
-/// <reference types="socket.io" />
 /// <reference types="feathersjs__socket-commons"/>
+import SocketIO = require("socket.io");
 
 export default function feathersSocketIO(callback?: (io: SocketIO.Server) => void): () => void;
 export default function feathersSocketIO(options: number | SocketIO.ServerOptions, callback?: (io: SocketIO.Server) => void): () => void;
diff --git a/types/socket.io-redis/index.d.ts b/types/socket.io-redis/index.d.ts
index 3de732084b..0335dcb300 100644
--- a/types/socket.io-redis/index.d.ts
+++ b/types/socket.io-redis/index.d.ts
@@ -4,14 +4,10 @@
 //                 seeLuck <https://github.com/seeLuck>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+import SocketIO = require("socket.io");
 
-/// <reference types="socket.io" />
-
-declare module 'socket.io-redis' {
-	let redis: SocketIORedisStatic;
-
-	export = redis;
-}
+declare const SocketIORedis: SocketIORedisStatic;
+export = SocketIORedis;
 
 interface SocketIORedisStatic {
 	/**
diff --git a/types/socket.io.users/index.d.ts b/types/socket.io.users/index.d.ts
index 053d80450c..bfc16cd5a4 100644
--- a/types/socket.io.users/index.d.ts
+++ b/types/socket.io.users/index.d.ts
@@ -4,15 +4,10 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
-/// <reference types="node" />
-
-/// <reference types="express-session" />
-/// <reference types="socket.io" />
-
-
 import { EventEmitter } from 'events';
 import { Application } from "express";
 import { SessionOptions } from "express-session";
+import SocketIO = require("socket.io");
 
 declare var CONNECTION_EVENTS: string[];
 declare var Middleware: () => (socket: SocketIO.Socket, next: () => any) => void;
diff --git a/types/socket.io/index.d.ts b/types/socket.io/index.d.ts
index 0d77110716..1583eac66b 100644
--- a/types/socket.io/index.d.ts
+++ b/types/socket.io/index.d.ts
@@ -5,11 +5,8 @@
 
 ///<reference types="node" />
 
-declare module 'socket.io' {
-	var server: SocketIOStatic;
-
-	export = server;
-}
+declare const SocketIO: SocketIOStatic;
+export = SocketIO;
 
 interface SocketIOStatic {
 	/**
@@ -45,7 +42,6 @@ interface SocketIOStatic {
 }
 
 declare namespace SocketIO {
-
 	interface Server {
 		engine: { ws: any };
 
diff --git a/types/socket.io/socket.io-tests.ts b/types/socket.io/socket.io-tests.ts
index cd0cecf6cf..7bfddb1271 100644
--- a/types/socket.io/socket.io-tests.ts
+++ b/types/socket.io/socket.io-tests.ts
@@ -2,7 +2,7 @@ import socketIO = require('socket.io');
 
 function testUsingWithNodeHTTPServer() {
     var app = require('http').createServer(handler);
-    var io = socketIO(app);
+    var io: socketIO.Server = socketIO(app);
     var fs = require('fs');
 
     app.listen(80);
diff --git a/types/socketio-wildcard/index.d.ts b/types/socketio-wildcard/index.d.ts
index 3170a27ca5..76598d59ae 100644
--- a/types/socketio-wildcard/index.d.ts
+++ b/types/socketio-wildcard/index.d.ts
@@ -3,8 +3,8 @@
 // Definitions by: BendingBender <https://github.com/BendingBender>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference types="socket.io" />
 /// <reference types="socket.io-client" />
+import SocketIO = require("socket.io");
 
 import EventEmitter = NodeJS.EventEmitter;
 import Socket = SocketIO.Socket;

From b822a843fb7c124d89ad3b4ae1a1ebc4c9186272 Mon Sep 17 00:00:00 2001
From: Andrew Pinkham <code@andrewsforge.com>
Date: Wed, 14 Mar 2018 14:33:37 -0400
Subject: [PATCH 0520/1382] webpack v3: require output filename; add hash opts

---
 types/webpack/v3/index.d.ts | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/types/webpack/v3/index.d.ts b/types/webpack/v3/index.d.ts
index d6102808b6..e8a3c36c65 100644
--- a/types/webpack/v3/index.d.ts
+++ b/types/webpack/v3/index.d.ts
@@ -126,10 +126,10 @@ declare namespace webpack {
     }
 
     interface Output {
-        /** The output directory as absolute path (required). */
+        /** The output directory as absolute path */
         path?: string;
-        /** The filename of the entry chunk as relative path inside the output.path directory. */
-        filename?: string;
+        /** (Required) The filename of the entry chunk as relative path inside the output.path directory. */
+        filename: string;
         /** The filename of non-entry chunks as relative path inside the output.path directory. */
         chunkFilename?: string;
         /** The filename of the SourceMaps for the JavaScript files. They are inside the output.path directory. */
@@ -182,6 +182,14 @@ declare namespace webpack {
         sourcePrefix?: string;
         /** This option enables cross-origin loading of chunks. */
         crossOriginLoading?: string | boolean;
+        /** The encoding to use when generating the hash, defaults to 'hex' */
+        hashDigest?: 'hex' | 'latin1' | 'base64';
+        /** The prefix length of the hash digest to use, defaults to 20. */
+        hashDigestLength?: number;
+        /** Algorithm used for generation the hash (see node.js crypto package) */
+        hashFunction?: string | ((algorithm: string, options?: any) => any);
+        /** An optional salt to update the hash via Node.JS' hash.update. */
+        hashSalt?: string;
     }
 
     interface BaseModule {

From c0cfefc595781437b3ad6c17af6879ec498a0dbc Mon Sep 17 00:00:00 2001
From: Andrew Pinkham <code@andrewsforge.com>
Date: Wed, 14 Mar 2018 14:39:17 -0400
Subject: [PATCH 0521/1382] webpack v3: revert filename requirement

Necessary for partial configurations.
---
 types/webpack/v3/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/webpack/v3/index.d.ts b/types/webpack/v3/index.d.ts
index e8a3c36c65..7f943d4151 100644
--- a/types/webpack/v3/index.d.ts
+++ b/types/webpack/v3/index.d.ts
@@ -129,7 +129,7 @@ declare namespace webpack {
         /** The output directory as absolute path */
         path?: string;
         /** (Required) The filename of the entry chunk as relative path inside the output.path directory. */
-        filename: string;
+        filename?: string;
         /** The filename of non-entry chunks as relative path inside the output.path directory. */
         chunkFilename?: string;
         /** The filename of the SourceMaps for the JavaScript files. They are inside the output.path directory. */

From f24c811e08cb2ab48804f8220663b6adce0aa991 Mon Sep 17 00:00:00 2001
From: Jared Szechy <jared.szechy@gmail.com>
Date: Wed, 14 Mar 2018 15:15:22 -0400
Subject: [PATCH 0522/1382] [plotly.js] add more missing config items

---
 types/plotly.js/index.d.ts | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/types/plotly.js/index.d.ts b/types/plotly.js/index.d.ts
index 225afd8c38..48d0eb0055 100644
--- a/types/plotly.js/index.d.ts
+++ b/types/plotly.js/index.d.ts
@@ -430,12 +430,26 @@ export interface Font {
 	color: string;
 }
 
+export interface Edits {
+	annotationPosition: boolean;
+	annotationTail: boolean;
+	annotationText: boolean;
+	axisTitleText: boolean;
+	colorbarPosition: boolean;
+	colorbarTitleText: boolean;
+	legendPosition: boolean;
+	legendText: boolean;
+	shapePosition: boolean;
+	titleText: boolean;
+}
+
 export interface Config {
 	/** no interactivity, for export or image generation */
 	staticPlot: boolean;
 
 	/** we can edit titles, move annotations, etc */
 	editable: boolean;
+	edits: Partial<Edits>;
 
 	/** DO autosize once regardless of layout.autosize (use default width or height values otherwise) */
 	autosizable: boolean;
@@ -458,6 +472,12 @@ export interface Config {
 	/** new users see some hints about interactivity */
 	showTips: boolean;
 
+	/** enable axis pan/zoom drag handles */
+	showAxisDragHandles: boolean;
+
+	/** enable direct range entry at the pan/zoom drag points (drag handles must be enabled above) */
+	showAxisRangeEntryBoxes: boolean;
+
 	/** link to open this plot in plotly */
 	showLink: boolean;
 
@@ -485,7 +505,7 @@ export interface Config {
 	 * buttons config objects or names of default buttons
 	 * (see ./components/modebar/buttons.js for more info)
 	 */
-	modeBarButtons: ModeBarDefaultButtons[][] | ModeBarButton[][];
+	modeBarButtons: ModeBarDefaultButtons[][] | ModeBarButton[][] | false;
 
 	/** add the plotly logo on the end of the mode bar */
 	displaylogo: boolean;
@@ -497,7 +517,7 @@ export interface Config {
 	 * function to add the background color to a different container
 	 * or 'opaque' to ensure there's white behind it
 	 */
-	setBackground: string | 'opaque';
+	setBackground: string | 'opaque' | 'transparent';
 
 	/** URL to topojson files used in geo charts */
 	topojsonURL: string;
@@ -513,10 +533,13 @@ export interface Config {
 	 * Turn all console logging on or off (errors will be thrown)
 	 * This should ONLY be set via Plotly.setPlotConfig
 	 */
-	logging: boolean;
+	logging: boolean | 0 | 1 | 2;
 
 	/** Set global transform to be applied to all traces with no specification needed */
 	globalTransforms: any[];
+
+	/** Which localization should we use? Should be a string like 'en' or 'en-US' */
+	locale: string;
 }
 
 // Components

From 6bc84e8ec7ff7c3929546f92345d187a33c88223 Mon Sep 17 00:00:00 2001
From: s0m3on3 <amedvedev@ciferox.com>
Date: Wed, 14 Mar 2018 21:58:51 +0200
Subject: [PATCH 0523/1382] [adone] add lodash, benchmark

---
 types/adone/adone.d.ts     |  6 ++++++
 types/adone/benchmark.d.ts |  5 +++++
 types/adone/test/index.ts  | 11 +++++++++++
 types/adone/tsconfig.json  |  1 +
 4 files changed, 23 insertions(+)
 create mode 100644 types/adone/benchmark.d.ts

diff --git a/types/adone/adone.d.ts b/types/adone/adone.d.ts
index 91ebc4db7c..d4e8b67b7b 100644
--- a/types/adone/adone.d.ts
+++ b/types/adone/adone.d.ts
@@ -1,4 +1,6 @@
 /// <reference types="node" />
+/// <reference types="lodash" />
+/// <reference types="benchmark" />
 
 declare namespace adone {
     const _null: symbol;
@@ -104,4 +106,8 @@ declare namespace adone {
     export const expect: assertion.I.ExpectFunction;
 
     export const std: typeof nodestd;
+
+    export const lodash: _.LoDashStatic;
+
+    export const benchmark: typeof tbenchmark;
 }
diff --git a/types/adone/benchmark.d.ts b/types/adone/benchmark.d.ts
new file mode 100644
index 0000000000..042e1ae62c
--- /dev/null
+++ b/types/adone/benchmark.d.ts
@@ -0,0 +1,5 @@
+import Benchmark = require("benchmark");
+
+export { Benchmark };
+
+export as namespace tbenchmark;
diff --git a/types/adone/test/index.ts b/types/adone/test/index.ts
index ac012b9535..aec454539b 100644
--- a/types/adone/test/index.ts
+++ b/types/adone/test/index.ts
@@ -54,4 +54,15 @@ namespace AdoneRootTests {
     obj = adone.package;
     { const a: typeof adone.assertion.assert = adone.assert; }
     { const a: typeof adone.assertion.expect = adone.expect; }
+
+    namespace lodashTests {
+        adone.lodash.get({}, "a");
+        adone.lodash.defaults({}, {});
+        adone.lodash.zip([]);
+    }
+
+    namespace benchmarkTests {
+        const b = new adone.benchmark.Benchmark.Suite();
+        b.add(() => {}).add("", () => {}).run();
+    }
 }
diff --git a/types/adone/tsconfig.json b/types/adone/tsconfig.json
index 6e6b3fe1c3..6a1af264a3 100644
--- a/types/adone/tsconfig.json
+++ b/types/adone/tsconfig.json
@@ -22,6 +22,7 @@
     "files": [
         "adone-tests.ts",
         "adone.d.ts",
+        "benchmark.d.ts",
         "glosses/archives.d.ts",
         "glosses/assertion.d.ts",
         "glosses/collections/array_set.d.ts",

From b31ffd962e2563b73599a721b2cd9ab0f35ceb41 Mon Sep 17 00:00:00 2001
From: stephentuso <tusodev@gmail.com>
Date: Wed, 14 Mar 2018 16:17:27 -0400
Subject: [PATCH 0524/1382] [dynogels] Fix return type for Item#get

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

diff --git a/types/dynogels/dynogels-tests.ts b/types/dynogels/dynogels-tests.ts
index ca16707256..a7634548e7 100644
--- a/types/dynogels/dynogels-tests.ts
+++ b/types/dynogels/dynogels-tests.ts
@@ -148,12 +148,14 @@ dynogels.dynamoDriver(dynamodb);
 
 // Saving Models To DynamoDB
 Account.create({ email: 'foo@example.com', name: 'Foo Bar', age: 21 }, (err, acc) => {
-    acc.get('email');
+    const email = acc.get('email') as string;
+    console.log(`Created account ${email}`);
 });
 
 const acc = new Account({ email: 'test@example.com', name: 'Test Example' });
 acc.save((err) => {
-    acc.get('email');
+    const email = acc.get('email') as string;
+    console.log(`Created account ${email}`);
 });
 
 BlogPost.create({
diff --git a/types/dynogels/index.d.ts b/types/dynogels/index.d.ts
index 2e4c5acbf4..ea82c74609 100644
--- a/types/dynogels/index.d.ts
+++ b/types/dynogels/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for dynogels 8.0
+// Type definitions for dynogels 9.0
 // Project: https://github.com/clarkie/dynogels#readme
 // Definitions by: Spartan Labs <https://github.com/SpartanLabs>
+//                 Stephen Tuso <https://github.com/stephentuso>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
@@ -152,7 +153,8 @@ export interface ModelConfig {
 
 // Dynogels Item
 export interface Item {
-    get(key?: string): { [key: string]: any };
+    get(): { [key: string]: any };
+    get(key: string): any;
     set(params: {}): Item;
     save(callback?: DynogelsItemCallback): void;
     update(options: UpdateItemOptions, callback?: DynogelsItemCallback): void;

From da7f2ddd59b8999601df8450c5eca19a2d690bce Mon Sep 17 00:00:00 2001
From: s0m3on3 <amedvedev@ciferox.com>
Date: Thu, 15 Mar 2018 02:11:34 +0200
Subject: [PATCH 0525/1382] [adone] fs * add writeFileAtomic * move is.* to fs

---
 types/adone/glosses/fs.d.ts    | 64 ++++++++++++++++++++--------------
 types/adone/test/glosses/fs.ts | 26 ++++++++++----
 2 files changed, 57 insertions(+), 33 deletions(-)

diff --git a/types/adone/glosses/fs.d.ts b/types/adone/glosses/fs.d.ts
index 7517764faf..2afc6ec8f7 100644
--- a/types/adone/glosses/fs.d.ts
+++ b/types/adone/glosses/fs.d.ts
@@ -1158,37 +1158,35 @@ declare namespace adone {
          */
         function watch(paths: string | string[], options?: I.Watcher.ConstructorOptions): Watcher;
 
-        namespace is {
-            /**
-             * Returns true if the given path refers to a file
-             */
-            function file(path: string): Promise<boolean>;
+        /**
+         * Returns true if the given path refers to a file
+         */
+        function isFile(path: string): Promise<boolean>;
 
-            /**
-             * Returns true if the given path refers to a file
-             */
-            function fileSync(path: string): boolean;
+        /**
+         * Returns true if the given path refers to a file
+         */
+        function isFileSync(path: string): boolean;
 
-            /**
-             * Returns true if the given path refers to a direcotry
-             */
-            function directory(path: string): Promise<boolean>;
+        /**
+         * Returns true if the given path refers to a direcotry
+         */
+        function isDirectory(path: string): Promise<boolean>;
 
-            /**
-             * Returns true if the given path refers to a direcotry
-             */
-            function directorySync(path: string): boolean;
+        /**
+         * Returns true if the given path refers to a direcotry
+         */
+        function isDirectorySync(path: string): boolean;
 
-            /**
-             * Returns true if the given path refers to an executable file
-             */
-            function executable(path: string): Promise<boolean>;
+        /**
+         * Returns true if the given path refers to an executable file
+         */
+        function isExecutable(path: string): Promise<boolean>;
 
-            /**
-             * Returns true if the given path refers to an executable file
-             */
-            function executableSync(path: string): boolean;
-        }
+        /**
+         * Returns true if the given path refers to an executable file
+         */
+        function isExecutableSync(path: string): boolean;
 
         namespace I.Which {
             interface Options {
@@ -1920,5 +1918,19 @@ declare namespace adone {
          * Creates a new TailWatcher instance with the given arguments
          */
         function watchTail(filename: string, options?: I.TailWatcher.ConstructorOptions): TailWatcher;
+
+        namespace I {
+            interface WriteFileAtomicOptions {
+                chown?: {
+                    gid?: number;
+                    uid?: number;
+                };
+                encoding?: string | null;
+                fsync?: boolean;
+                mode?: number;
+            }
+        }
+
+        function writeFileAtomic(filename: string, data: Buffer | string | Uint8Array, options?: I.WriteFileAtomicOptions): Promise<void>;
     }
 }
diff --git a/types/adone/test/glosses/fs.ts b/types/adone/test/glosses/fs.ts
index e7c5333624..86236038a0 100644
--- a/types/adone/test/glosses/fs.ts
+++ b/types/adone/test/glosses/fs.ts
@@ -602,13 +602,12 @@ namespace fsTests {
     }
 
     namespace isTests {
-        const { is } = fs;
-        is.file("hello").then((x: boolean) => {});
-        { const a: boolean = is.fileSync("hello"); }
-        is.directory("hello").then((x: boolean) => {});
-        { const a: boolean = is.directorySync("hello"); }
-        is.executable("hello").then((x: boolean) => {});
-        { const a: boolean = is.executableSync("hello"); }
+        fs.isFile("hello").then((x: boolean) => {});
+        { const a: boolean = fs.isFileSync("hello"); }
+        fs.isDirectory("hello").then((x: boolean) => {});
+        { const a: boolean = fs.isDirectorySync("hello"); }
+        fs.isExecutable("hello").then((x: boolean) => {});
+        { const a: boolean = fs.isExecutableSync("hello"); }
     }
 
     namespace whichTests {
@@ -944,4 +943,17 @@ namespace fsTests {
         fs.watchTail("file", { separator: /\n/ });
         fs.watchTail("file", { useWatchFile: true });
     }
+
+    namespace writeFileAtomicTests {
+        fs.writeFileAtomic("a", "b").then(() => {});
+        fs.writeFileAtomic("a", Buffer.from("b")).then(() => {});
+        fs.writeFileAtomic("a", new Uint8Array(10)).then(() => {});
+        fs.writeFileAtomic("a", "a", {}).then(() => {});
+        fs.writeFileAtomic("a", "a", { chown: {} }).then(() => {});
+        fs.writeFileAtomic("a", "a", { chown: { gid: 0 } }).then(() => {});
+        fs.writeFileAtomic("a", "a", { chown: { uid: 0 } }).then(() => {});
+        fs.writeFileAtomic("a", "a", { encoding: "utf8" }).then(() => {});
+        fs.writeFileAtomic("a", "a", { fsync: false }).then(() => {});
+        fs.writeFileAtomic("a", "a", { mode: 0o666 }).then(() => {});
+    }
 }

From 5b3a66ce60515a5ac0589b30a15d9c8a8869052e Mon Sep 17 00:00:00 2001
From: s0m3on3 <amedvedev@ciferox.com>
Date: Thu, 15 Mar 2018 02:20:25 +0200
Subject: [PATCH 0526/1382] [adone] is * openbsd, aix

---
 types/adone/glosses/is.d.ts    | 4 ++++
 types/adone/test/glosses/is.ts | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/types/adone/glosses/is.d.ts b/types/adone/glosses/is.d.ts
index 20d898ca7b..d112d3f109 100644
--- a/types/adone/glosses/is.d.ts
+++ b/types/adone/glosses/is.d.ts
@@ -676,5 +676,9 @@ declare namespace adone {
         export function emitter(obj: any): obj is event.Emitter;
 
         export function asyncEmitter(obj: any): obj is event.AsyncEmitter;
+
+        export const openbsd: boolean;
+
+        export const aix: boolean;
     }
 }
diff --git a/types/adone/test/glosses/is.ts b/types/adone/test/glosses/is.ts
index 045818f0ec..455dd745da 100644
--- a/types/adone/test/glosses/is.ts
+++ b/types/adone/test/glosses/is.ts
@@ -336,6 +336,8 @@ namespace isTests {
     { const a: boolean = is.freebsd; }
     { const a: boolean = is.darwin; }
     { const a: boolean = is.sunos; }
+    { const a: boolean = is.openbsd; }
+    { const a: boolean = is.aix; }
     { const a: boolean = is.uppercase("abc"); }
     { const a: boolean = is.lowercase("abc"); }
     { const a: boolean = is.digits("012"); }

From 9ea8da2d0e95ec73360e2d58e9feb730d003b266 Mon Sep 17 00:00:00 2001
From: Andrew Bradley <cspotcode@gmail.com>
Date: Sun, 11 Mar 2018 19:27:28 -0400
Subject: [PATCH 0527/1382] Remove or fix dependencies on mocha by other
 declarations

If dependency is unnecessary, replaces with stub declarations
If dependency is necessary, declares a requirement on at least TS2.1 to match mocha's
---
 types/bintrees/bintrees-tests.ts               | 5 ++++-
 types/chai-jest-snapshot/index.d.ts            | 1 +
 types/chai-spies/chai-spies-tests.ts           | 1 -
 types/chai-string/chai-string-tests.ts         | 7 +++++--
 types/create-error/create-error-tests.ts       | 6 +++++-
 types/d3kit/v1/d3kit-tests.ts                  | 6 +++++-
 types/expect/expect-tests.ts                   | 7 +++++--
 types/expectations/expectations-tests.ts       | 7 +++++--
 types/fbemitter/fbemitter-tests.ts             | 6 +++++-
 types/gulp-mocha/index.d.ts                    | 1 +
 types/gulp-util/gulp-util-tests.ts             | 7 +++++--
 types/hexo-fs/hexo-fs-tests.ts                 | 9 +++++++--
 types/incremental-dom/incremental-dom-tests.ts | 6 +++++-
 types/libpq/libpq-tests.ts                     | 7 +++++--
 types/mocha-steps/index.d.ts                   | 1 +
 types/mz/mz-tests.ts                           | 7 +++++--
 types/project-oxford/project-oxford-tests.ts   | 7 +++++--
 types/quixote/quixote-tests.ts                 | 6 ++++--
 types/vinyl-fs/vinyl-fs-tests.ts               | 5 ++++-
 types/vinyl/v0/vinyl-tests.ts                  | 7 +++++--
 types/vinyl/vinyl-tests.ts                     | 7 +++++--
 types/webdriverio/webdriverio-tests.ts         | 7 +++++--
 22 files changed, 92 insertions(+), 31 deletions(-)

diff --git a/types/bintrees/bintrees-tests.ts b/types/bintrees/bintrees-tests.ts
index fb4a22a3d8..84b75c98be 100644
--- a/types/bintrees/bintrees-tests.ts
+++ b/types/bintrees/bintrees-tests.ts
@@ -1,8 +1,11 @@
-/// <reference types="mocha" />
 /// <reference types="node" />
 import assert = require('assert');
 import { BinTree, RBTree } from 'bintrees';
 
+// Declaring shims removes mocha dependency.  These tests are never executed, only typechecked, so this is fine.
+declare function describe(description: string, callback: () => void): void;
+declare function it(description: string, callback: () => void): void;
+
 describe('bintrees', () => {
     it('builds a simple tree', () => {
         let treeA = new RBTree((a: number, b: number) => a - b);
diff --git a/types/chai-jest-snapshot/index.d.ts b/types/chai-jest-snapshot/index.d.ts
index 862da8cd16..470e4fa423 100644
--- a/types/chai-jest-snapshot/index.d.ts
+++ b/types/chai-jest-snapshot/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/suchipi/chai-jest-snapshot#readme
 // Definitions by: Matt Perry <https://github.com/mattvperry>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
 
 /// <reference types="chai" />
 /// <reference types="mocha" />
diff --git a/types/chai-spies/chai-spies-tests.ts b/types/chai-spies/chai-spies-tests.ts
index 326b1e0137..1d99f0add2 100644
--- a/types/chai-spies/chai-spies-tests.ts
+++ b/types/chai-spies/chai-spies-tests.ts
@@ -1,6 +1,5 @@
 import * as chai from 'chai';
 import * as spies from 'chai-spies';
-import * as Mocha from 'mocha';
 
 function original(): void {
   // do something cool
diff --git a/types/chai-string/chai-string-tests.ts b/types/chai-string/chai-string-tests.ts
index dc798c102a..9cd9a2e024 100644
--- a/types/chai-string/chai-string-tests.ts
+++ b/types/chai-string/chai-string-tests.ts
@@ -1,6 +1,4 @@
 
-/// <reference types="mocha" />
-
 var should = chai.should();
 var assert = chai.assert;
 var expect = chai.expect;
@@ -8,6 +6,11 @@ var expect = chai.expect;
 import chai_string = require("chai-string");
 chai.use(chai_string);
 
+// Stub mocha functions
+const {describe, it, before, after, beforeEach, afterEach} = null as any as {
+    [s: string]: ((s: string, cb: (done: any) => void) => void) & ((cb: (done: any) => void) => void) & {only: any, skip: any};
+};
+
 describe('chai-string', function() {
 
   describe('#startsWith', function() {
diff --git a/types/create-error/create-error-tests.ts b/types/create-error/create-error-tests.ts
index 7a635b8dc6..ed2d9533e3 100644
--- a/types/create-error/create-error-tests.ts
+++ b/types/create-error/create-error-tests.ts
@@ -1,8 +1,12 @@
-/// <reference types="mocha" />
 
 declare function equal<T>(a: T, b: T): void;
 declare function deepEqual<T>(a: T, b: T): void;
 
+// Stub mocha functions
+const {describe, it, before, after, beforeEach, afterEach} = null as any as {
+  [s: string]: ((s: string, cb: (done: any) => void) => void) & ((cb: (done: any) => void) => void) & {only: any, skip: any};
+};
+
 import * as createError from 'create-error';
 
 // Example taken from https://github.com/tgriesser/create-error/blob/0.3.1/README.md#use
diff --git a/types/d3kit/v1/d3kit-tests.ts b/types/d3kit/v1/d3kit-tests.ts
index 9ffb7ca2ba..18f1f144f9 100644
--- a/types/d3kit/v1/d3kit-tests.ts
+++ b/types/d3kit/v1/d3kit-tests.ts
@@ -1,6 +1,10 @@
-/// <reference types="mocha" />
 /// <reference types="chai" />
 
+// Stub mocha functions
+const {describe, it, before, after, beforeEach, afterEach} = null as any as {
+    [s: string]: ((s: string, cb: (done: any) => void) => void) & ((cb: (done: any) => void) => void) & {only: any, skip: any};
+};
+
 var expect = chai.expect;
 describe('Skeleton', function(){
     var element: Element, $element: d3.Selection<any>, $svg: d3.Selection<any>, skeleton: d3kit.Skeleton;
diff --git a/types/expect/expect-tests.ts b/types/expect/expect-tests.ts
index fea4a3d4d9..5df83340cb 100644
--- a/types/expect/expect-tests.ts
+++ b/types/expect/expect-tests.ts
@@ -1,8 +1,11 @@
-/// <reference types="mocha"" />
-
 import { Expectation, Extension, Spy, createSpy, isSpy, assert, spyOn, extend, restoreSpies } from 'expect';
 import * as expect from 'expect';
 
+// Stub mocha functions
+const {describe, it, before, after, beforeEach, afterEach} = null as any as {
+  [s: string]: ((s: string, cb: (done: any) => void) => void) & ((cb: (done: any) => void) => void) & {only: any, skip: any};
+};
+
 describe('chaining assertions', () => {
   it('should allow chaining for array-like applications', () => {
     expect([ 1, 2, 'foo', 3 ])
diff --git a/types/expectations/expectations-tests.ts b/types/expectations/expectations-tests.ts
index b0cef0aa0f..4e994e7546 100644
--- a/types/expectations/expectations-tests.ts
+++ b/types/expectations/expectations-tests.ts
@@ -1,9 +1,12 @@
-/// <reference types="mocha" />
-
 // transplant from https://github.com/spmason/expectations/blob/695c25bd35bb1751533a8082a5aa378e3e1b381f/test/expect.tests.js
 
 var root = this;
 
+// Stub mocha functions
+const {describe, it, before, after, beforeEach, afterEach} = null as any as {
+    [s: string]: ((s: string, cb: (done: any) => void) => void) & ((cb: (done: any) => void) => void) & {only: any, skip: any};
+};
+
 describe('expect', ()=> {
     describe('toEqual', ()=> {
         it('can expect true to be true', ()=> {
diff --git a/types/fbemitter/fbemitter-tests.ts b/types/fbemitter/fbemitter-tests.ts
index 1a4983242f..22424fc442 100644
--- a/types/fbemitter/fbemitter-tests.ts
+++ b/types/fbemitter/fbemitter-tests.ts
@@ -1,5 +1,4 @@
 ///<reference types="node" />
-///<reference types="mocha" />
 
 'use strict';
 
@@ -11,6 +10,11 @@ import { EventEmitter, EventSubscription } from 'fbemitter';
 import * as util from 'util';
 import * as assert from 'assert';
 
+// Stub mocha functions
+const {describe, it, before, after, beforeEach, afterEach} = null as any as {
+    [s: string]: ((s: string, cb: (done: any) => void) => void) & ((cb: (done: any) => void) => void) & {only: any, skip: any};
+};
+
 describe('EventEmitter', function tests() {
     'use strict';
 
diff --git a/types/gulp-mocha/index.d.ts b/types/gulp-mocha/index.d.ts
index ae56e9a9ac..ba1a6d4fca 100644
--- a/types/gulp-mocha/index.d.ts
+++ b/types/gulp-mocha/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/sindresorhus/gulp-mocha
 // Definitions by: Asana <https://asana.com>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
 
 /// <reference types="mocha"/>
 /// <reference types="node"/>
diff --git a/types/gulp-util/gulp-util-tests.ts b/types/gulp-util/gulp-util-tests.ts
index 47e705bf00..1781ce7664 100644
--- a/types/gulp-util/gulp-util-tests.ts
+++ b/types/gulp-util/gulp-util-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="mocha" />
-
 import gulp = require('gulp');
 import util = require('gulp-util');
 import path = require('path');
@@ -7,6 +5,11 @@ import Stream = require('stream');
 import through = require('through2');
 const es = require('event-stream');
 
+// Stub mocha functions
+const {describe, it, before, after, beforeEach, afterEach} = null as any as {
+    [s: string]: ((s: string, cb: (done: any) => void) => void) & ((cb: (done: any) => void) => void) & {only: any, skip: any};
+};
+
 // TODO: These aren't useful as types tests since they take `any`.
 declare const should: ShouldStatic;
 interface ShouldStatic {
diff --git a/types/hexo-fs/hexo-fs-tests.ts b/types/hexo-fs/hexo-fs-tests.ts
index 5f73cd91fc..7bd5dc13b8 100644
--- a/types/hexo-fs/hexo-fs-tests.ts
+++ b/types/hexo-fs/hexo-fs-tests.ts
@@ -1,9 +1,13 @@
 import fs = require('hexo-fs');
 import { join, dirname } from 'path';
-import 'mocha';
 import chai = require('chai');
 import Promise = require('bluebird');
 
+// Stub mocha functions
+const {describe, it, before, after, beforeEach, afterEach} = null as any as {
+    [s: string]: ((s: string, cb: (done: any) => void) => void) & ((cb: (done: any) => void) => void) & {only: any, skip: any};
+};
+
 const should = chai.should();
 
 function createDummyFolder(path: string) {
@@ -198,7 +202,8 @@ it('copyFile() - callback', callback => {
             if (err) return callback(err);
 
             fs.readFile(dest, (err, content) => {
-                if (err) return callback(err);
+                if (err)
+                    return callback(err);
                 content!.should.eql(body);
 
                 Promise.all([
diff --git a/types/incremental-dom/incremental-dom-tests.ts b/types/incremental-dom/incremental-dom-tests.ts
index 2e30297e57..f593299575 100644
--- a/types/incremental-dom/incremental-dom-tests.ts
+++ b/types/incremental-dom/incremental-dom-tests.ts
@@ -1,6 +1,10 @@
-/// <reference types="mocha" />
 declare var expect: any;
 
+// Stub mocha functions
+const {describe, it, before, after, beforeEach, afterEach} = null as any as {
+  [s: string]: ((s: string, cb: (done: any) => void) => void) & ((cb: (done: any) => void) => void) & {only: any, skip: any};
+};
+
 import id = require('incremental-dom');
 var patch = id.patch;
 var elementVoid = id.elementVoid;
diff --git a/types/libpq/libpq-tests.ts b/types/libpq/libpq-tests.ts
index f1ae6cc1e3..7d19e910cd 100644
--- a/types/libpq/libpq-tests.ts
+++ b/types/libpq/libpq-tests.ts
@@ -1,10 +1,13 @@
-/// <reference types="mocha" />
-
 import { Buffer } from 'buffer';
 import assert = require('assert');
 import * as async from 'async';
 import PQ = require('libpq');
 
+// Stub mocha functions
+const {describe, it, before, after, beforeEach, afterEach} = null as any as {
+    [s: string]: ((s: string, cb: (done: any) => void) => void) & ((cb: (done: any) => void) => void) & {only: any, skip: any};
+};
+
 declare const _: { times<T>(n: number, f: () => T): T[] };
 
 declare const ok: Function;
diff --git a/types/mocha-steps/index.d.ts b/types/mocha-steps/index.d.ts
index 0234f02529..8bd32496aa 100644
--- a/types/mocha-steps/index.d.ts
+++ b/types/mocha-steps/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/rprieto/mocha-steps
 // Definitions by: AryloYeung <https://github.com/Arylo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
 
 /// <reference types="mocha" />
 
diff --git a/types/mz/mz-tests.ts b/types/mz/mz-tests.ts
index 7eda9f28bf..b873c98bbe 100644
--- a/types/mz/mz-tests.ts
+++ b/types/mz/mz-tests.ts
@@ -1,8 +1,11 @@
-/// <reference types="mocha" />
-
 import assert = require('assert')
 import fs = require('mz/fs')
 
+// Stub mocha functions
+const {describe, it, before, after, beforeEach, afterEach} = null as any as {
+  [s: string]: ((s: string, cb: (done: any) => void) => void) & ((cb: (done: any) => void) => void) & {only: any, skip: any};
+};
+
 describe('fs', function () {
 
   it('.stat()', function (done) {
diff --git a/types/project-oxford/project-oxford-tests.ts b/types/project-oxford/project-oxford-tests.ts
index ea2849d986..b4a76a78c4 100644
--- a/types/project-oxford/project-oxford-tests.ts
+++ b/types/project-oxford/project-oxford-tests.ts
@@ -1,11 +1,14 @@
-/// <reference types="mocha" />
-
 import oxford = require("project-oxford");
 
 import assert = require('assert');
 import _Promise = require('bluebird');
 import fs = require('fs');
 
+// Stub mocha functions
+const {describe, it, before, after, beforeEach, afterEach} = null as any as {
+    [s: string]: ((s: string, cb: (done: any) => void) => void) & ((cb: (done: any) => void) => void) & {only: any, skip: any};
+};
+
 var client = new oxford.Client(process.env.OXFORD_KEY);
 
 // Store variables, no point in calling the api too often
diff --git a/types/quixote/quixote-tests.ts b/types/quixote/quixote-tests.ts
index 5ee9905ac0..381ee5f5fd 100644
--- a/types/quixote/quixote-tests.ts
+++ b/types/quixote/quixote-tests.ts
@@ -1,5 +1,7 @@
-/// <reference types="mocha" />
-
+// Stub mocha functions
+const {describe, it, before, after, beforeEach, afterEach} = null as any as {
+    [s: string]: ((s: string, cb: (done: any) => void) => void) & ((cb: (done: any) => void) => void) & {only: any, skip: any};
+};
 
 function test_createFrame() {
     var frame: QFrame;
diff --git a/types/vinyl-fs/vinyl-fs-tests.ts b/types/vinyl-fs/vinyl-fs-tests.ts
index 9aa9a02513..6cecf42f47 100644
--- a/types/vinyl-fs/vinyl-fs-tests.ts
+++ b/types/vinyl-fs/vinyl-fs-tests.ts
@@ -13,7 +13,10 @@ import File = require('vinyl');
 // const spies = require('./spy');
 declare const spies: any;
 
-import 'mocha';
+// Stub mocha functions
+const {describe, it, before, after, beforeEach, afterEach} = null as any as {
+    [s: string]: ((s: string, cb: (done: any) => void) => void) & ((cb: (done: any) => void) => void) & {only: any, skip: any};
+};
 
 // TODO: These aren't useful as types tests since they take `any`.
 declare const should: ShouldStatic;
diff --git a/types/vinyl/v0/vinyl-tests.ts b/types/vinyl/v0/vinyl-tests.ts
index 27ea92a283..8c7de1ea52 100644
--- a/types/vinyl/v0/vinyl-tests.ts
+++ b/types/vinyl/v0/vinyl-tests.ts
@@ -1,9 +1,12 @@
-/// <reference types="mocha" />
-
 import File = require('vinyl');
 import Stream = require('stream');
 import fs = require('fs');
 
+// Stub mocha functions
+const {describe, it, before, after, beforeEach, afterEach} = null as any as {
+    [s: string]: ((s: string, cb: (done: any) => void) => void) & ((cb: (done: any) => void) => void) & {only: any, skip: any};
+};
+
 declare var fakeStream: NodeJS.ReadWriteStream;
 
 // TODO: These aren't useful as types tests since they take `any`.
diff --git a/types/vinyl/vinyl-tests.ts b/types/vinyl/vinyl-tests.ts
index 77ef5d6d1b..bd059b0427 100644
--- a/types/vinyl/vinyl-tests.ts
+++ b/types/vinyl/vinyl-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="mocha" />
-
 import * as fs from 'fs';
 import * as path from 'path';
 import expect = require('expect');
@@ -8,6 +6,11 @@ const cloneable = require('cloneable-readable');
 
 import File = require('vinyl');
 
+// Stub mocha functions
+const {describe, it, before, after, beforeEach, afterEach} = null as any as {
+    [s: string]: ((s: string, cb: (done: any) => void) => void) & ((cb: (done: any) => void) => void) & {only: any, skip: any};
+};
+
 /**
  * Custom and private properties needed for tests.
  *
diff --git a/types/webdriverio/webdriverio-tests.ts b/types/webdriverio/webdriverio-tests.ts
index 4a078ef6e9..56dc3ddfda 100644
--- a/types/webdriverio/webdriverio-tests.ts
+++ b/types/webdriverio/webdriverio-tests.ts
@@ -1,8 +1,11 @@
-/// <reference types="mocha" />
-
 import * as webdriverio from "webdriverio";
 import { assert } from "chai";
 
+// Stub mocha functions
+const {describe, it, before, after, beforeEach, afterEach} = null as any as {
+    [s: string]: ((s: string, cb: (done: any) => void) => void) & ((cb: (done: any) => void) => void) & {only: any, skip: any};
+};
+
 describe("webdriver.io page", () => {
     it("should have the right title - the good old callback way", () => {
         assert.equal(

From 0bd1584c8f12d89c2dc32908d634e05e14de2875 Mon Sep 17 00:00:00 2001
From: Andrew Bradley <cspotcode@gmail.com>
Date: Sun, 11 Mar 2018 19:28:47 -0400
Subject: [PATCH 0528/1382] Remove redundant ambient declaration of mocha
 globals via ember-mocha

the mocha declarations do this themselves; duplicates are causing type errors
---
 types/ember-mocha/index.d.ts | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/types/ember-mocha/index.d.ts b/types/ember-mocha/index.d.ts
index f43982fda8..1d24564e31 100644
--- a/types/ember-mocha/index.d.ts
+++ b/types/ember-mocha/index.d.ts
@@ -62,17 +62,4 @@ declare module 'mocha' {
     // augment test callback context
     interface ITestCallbackContext extends TestContext {}
     interface IHookCallbackContext extends TestContext {}
-
-    // re-export mocha globals as named exports
-    export const describe: Mocha.IContextDefinition;
-    export const context: Mocha.IContextDefinition;
-    export const it: Mocha.ITestDefinition;
-    export const setup: mochaSetup;
-    export const teardown: mochaTeardown;
-    export const suiteSetup: mochaSuiteSetup;
-    export const suiteTeardown: mochaSuiteTeardown;
-    export const before: mochaBefore;
-    export const after: mochaAfter;
-    export const beforeEach: mochaBeforeEach;
-    export const afterEach: mochaAfterEach;
 }

From bbe066cb55940c6047d3b43e9e9a02e576afd957 Mon Sep 17 00:00:00 2001
From: Andrew Bradley <cspotcode@gmail.com>
Date: Sun, 11 Mar 2018 19:48:00 -0400
Subject: [PATCH 0529/1382] Update Mocha declarations to v5

Use string union for Mocha interface name
Allow module augmentation to contribute new interface names
Allow `mocha.setup(interfaceName)`
Ambient variables are declared `const`, not `var`
`done` callbacks return `void` not `any`
factory functions (after, describe, it, etc) can return Promises, but not anything else.
- Promise support is explained here: https://mochajs.org/#require
- Allowing callbacks to return `any` could cause confusion.  Returning anything other than a Promise is probably a mistake
- I was unable to forbid accepting a `done` callback while simultaneously returning a Promise, even though doing so triggers a runtime error
`keyof` requires at least TypeScript 2.1
---
 types/mocha/index.d.ts     | 131 +++++++++++++++++++++++++++++--------
 types/mocha/mocha-tests.ts | 130 ++++++++++++++++++++++++++++++++++++
 types/mocha/tslint.json    |  78 +---------------------
 3 files changed, 234 insertions(+), 105 deletions(-)

diff --git a/types/mocha/index.d.ts b/types/mocha/index.d.ts
index 06ef96c618..4c82633404 100644
--- a/types/mocha/index.d.ts
+++ b/types/mocha/index.d.ts
@@ -1,7 +1,12 @@
-// Type definitions for mocha 2.2.5
+// Type definitions for mocha 5.0
 // Project: http://mochajs.org/
-// Definitions by: Kazi Manzur Rashid <https://github.com/kazimanzurrashid>, otiai10 <https://github.com/otiai10>, jt000 <https://github.com/jt000>, Vadim Macagon <https://github.com/enlight>
+// Definitions by: Kazi Manzur Rashid <https://github.com/kazimanzurrashid>
+//                 otiai10 <https://github.com/otiai10>
+//                 jt000 <https://github.com/jt000>
+//                 Vadim Macagon <https://github.com/enlight>
+//                 Andrew Bradley <https://github.com/cspotcode>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
 
 interface MochaSetupOptions {
     //milliseconds to wait before considering a test slow
@@ -11,7 +16,7 @@ interface MochaSetupOptions {
     timeout?: number;
 
     // ui name "bdd", "tdd", "exports" etc
-    ui?: string;
+    ui?: Mocha.Interface;
 
     //array of accepted globals
     globals?: any[];
@@ -32,38 +37,38 @@ interface MochaSetupOptions {
     require?: string[];
 }
 
-declare var mocha: Mocha;
-declare var describe: Mocha.IContextDefinition;
-declare var xdescribe: Mocha.IContextDefinition;
+declare const mocha: Mocha;
+declare const describe: Mocha.IContextDefinition;
+declare const xdescribe: Mocha.IContextDefinition;
 // alias for `describe`
-declare var context: Mocha.IContextDefinition;
+declare const context: Mocha.IContextDefinition;
 // alias for `describe`
-declare var suite: Mocha.IContextDefinition;
-declare var it: Mocha.ITestDefinition;
-declare var xit: Mocha.ITestDefinition;
+declare const suite: Mocha.IContextDefinition;
+declare const it: Mocha.ITestDefinition;
+declare const xit: Mocha.ITestDefinition;
 // alias for `it`
-declare var test: Mocha.ITestDefinition;
-declare var specify: Mocha.ITestDefinition;
+declare const test: Mocha.ITestDefinition;
+declare const specify: Mocha.ITestDefinition;
 
 // Used with the --delay flag; see https://mochajs.org/#hooks
 declare function run(): void;
 
 interface MochaDone {
-    (error?: any): any;
+    (error?: any): void;
 }
 
-declare function setup(callback: (this: Mocha.IBeforeAndAfterContext, done: MochaDone) => any): void;
-declare function teardown(callback: (this: Mocha.IBeforeAndAfterContext, done: MochaDone) => any): void;
-declare function suiteSetup(callback: (this: Mocha.IHookCallbackContext, done: MochaDone) => any): void;
-declare function suiteTeardown(callback: (this: Mocha.IHookCallbackContext, done: MochaDone) => any): void;
-declare function before(callback: (this: Mocha.IHookCallbackContext, done: MochaDone) => any): void;
-declare function before(description: string, callback: (this: Mocha.IHookCallbackContext, done: MochaDone) => any): void;
-declare function after(callback: (this: Mocha.IHookCallbackContext, done: MochaDone) => any): void;
-declare function after(description: string, callback: (this: Mocha.IHookCallbackContext, done: MochaDone) => any): void;
-declare function beforeEach(callback: (this: Mocha.IBeforeAndAfterContext, done: MochaDone) => any): void;
-declare function beforeEach(description: string, callback: (this: Mocha.IBeforeAndAfterContext, done: MochaDone) => any): void;
-declare function afterEach(callback: (this: Mocha.IBeforeAndAfterContext, done: MochaDone) => any): void;
-declare function afterEach(description: string, callback: (this: Mocha.IBeforeAndAfterContext, done: MochaDone) => any): void;
+declare function setup(callback: (this: Mocha.IBeforeAndAfterContext, done: MochaDone) => PromiseLike<any> | void): void;
+declare function teardown(callback: (this: Mocha.IBeforeAndAfterContext, done: MochaDone) => PromiseLike<any> | void): void;
+declare function suiteSetup(callback: (this: Mocha.IHookCallbackContext, done: MochaDone) => PromiseLike<any> | void): void;
+declare function suiteTeardown(callback: (this: Mocha.IHookCallbackContext, done: MochaDone) => PromiseLike<any> | void): void;
+declare function before(callback: (this: Mocha.IHookCallbackContext, done: MochaDone) => PromiseLike<any> | void): void;
+declare function before(description: string, callback: (this: Mocha.IHookCallbackContext, done: MochaDone) => PromiseLike<any> | void): void;
+declare function after(callback: (this: Mocha.IHookCallbackContext, done: MochaDone) => PromiseLike<any> | void): void;
+declare function after(description: string, callback: (this: Mocha.IHookCallbackContext, done: MochaDone) => PromiseLike<any> | void): void;
+declare function beforeEach(callback: (this: Mocha.IBeforeAndAfterContext, done: MochaDone) => PromiseLike<any> | void): void;
+declare function beforeEach(description: string, callback: (this: Mocha.IBeforeAndAfterContext, done: MochaDone) => PromiseLike<any> | void): void;
+declare function afterEach(callback: (this: Mocha.IBeforeAndAfterContext, done: MochaDone) => PromiseLike<any> | void): void;
+declare function afterEach(description: string, callback: (this: Mocha.IBeforeAndAfterContext, done: MochaDone) => PromiseLike<any> | void): void;
 
 interface ReporterConstructor {
     new(runner: Mocha.IRunner, options: any): any;
@@ -81,6 +86,8 @@ declare class Mocha {
         bail?: boolean;
     });
 
+    /** Setup mocha with the given interface. */
+    setup(interface: Mocha.Interface): Mocha;
     /** Setup mocha with the given options. */
     setup(options: MochaSetupOptions): Mocha;
     bail(value?: boolean): Mocha;
@@ -118,6 +125,16 @@ declare class Mocha {
 
 // merge the Mocha class declaration with a module
 declare namespace Mocha {
+    /** Third-party declarations that want to add new interfaces can contribute names here */
+    interface InterfaceContributions {
+        bdd: any;
+        tdd: any;
+        qunit: any;
+        exports: any;
+    }
+
+    type Interface = keyof InterfaceContributions;
+
     interface ISuiteCallbackContext {
         timeout(ms: number | string): this;
         retries(n: number): this;
@@ -204,9 +221,9 @@ declare namespace Mocha {
     }
 
     interface ITestDefinition {
-        (expectation: string, callback?: (this: ITestCallbackContext, done: MochaDone) => any): ITest;
-        only(expectation: string, callback?: (this: ITestCallbackContext, done: MochaDone) => any): ITest;
-        skip(expectation: string, callback?: (this: ITestCallbackContext, done: MochaDone) => any): void;
+        (expectation: string, callback?: (this: ITestCallbackContext, done: MochaDone) => PromiseLike<any> | void): ITest;
+        only(expectation: string, callback?: (this: ITestCallbackContext, done: MochaDone) => PromiseLike<any> | void): ITest;
+        skip(expectation: string, callback?: (this: ITestCallbackContext, done: MochaDone) => PromiseLike<any> | void): void;
         timeout(ms: number | string): void;
         state: "failed" | "passed";
     }
@@ -250,6 +267,64 @@ declare namespace Mocha {
             constructor(runner: IRunner, options?: any);
         }
     }
+
+    /*
+     * All ambient functions are also available via require('mocha') when invoked via the mocha CLI
+     * See for details: https://mochajs.org/#require
+     */
+
+    /** Only available when invoked via the mocha CLI */
+    export const describe: Mocha.IContextDefinition;
+    /** Only available when invoked via the mocha CLI */
+    export const xdescribe: Mocha.IContextDefinition;
+    /**
+     * alias for `describe`
+     * Only available when invoked via the mocha CLI
+     */
+    export const context: Mocha.IContextDefinition;
+    /**
+     * alias for `describe`
+     * Only available when invoked via the mocha CLI
+     */
+    export const suite: Mocha.IContextDefinition;
+    /** Only available when invoked via the mocha CLI */
+    export const it: Mocha.ITestDefinition;
+    /** Only available when invoked via the mocha CLI */
+    export const xit: Mocha.ITestDefinition;
+    /**
+     * alias for `it`
+     * Only available when invoked via the mocha CLI
+     */
+    export const test: Mocha.ITestDefinition;
+    /**
+     * Alias for `it`
+     * Only available when invoked via the mocha CLI
+     */
+    export const specify: Mocha.ITestDefinition;
+    /** Only available when invoked via the mocha CLI */
+    export function setup(callback: (this: Mocha.IBeforeAndAfterContext, done: MochaDone) => PromiseLike<any> | void): void;
+    /** Only available when invoked via the mocha CLI */
+    export function teardown(callback: (this: Mocha.IBeforeAndAfterContext, done: MochaDone) => PromiseLike<any> | void): void;
+    /** Only available when invoked via the mocha CLI */
+    export function suiteSetup(callback: (this: Mocha.IHookCallbackContext, done: MochaDone) => PromiseLike<any> | void): void;
+    /** Only available when invoked via the mocha CLI */
+    export function suiteTeardown(callback: (this: Mocha.IHookCallbackContext, done: MochaDone) => PromiseLike<any> | void): void;
+    /** Only available when invoked via the mocha CLI */
+    export function before(callback: (this: Mocha.IHookCallbackContext, done: MochaDone) => PromiseLike<any> | void): void;
+    /** Only available when invoked via the mocha CLI */
+    export function before(description: string, callback: (this: Mocha.IHookCallbackContext, done: MochaDone) => PromiseLike<any> | void): void;
+    /** Only available when invoked via the mocha CLI */
+    export function after(callback: (this: Mocha.IHookCallbackContext, done: MochaDone) => PromiseLike<any> | void): void;
+    /** Only available when invoked via the mocha CLI */
+    export function after(description: string, callback: (this: Mocha.IHookCallbackContext, done: MochaDone) => PromiseLike<any> | void): void;
+    /** Only available when invoked via the mocha CLI */
+    export function beforeEach(callback: (this: Mocha.IBeforeAndAfterContext, done: MochaDone) => PromiseLike<any> | void): void;
+    /** Only available when invoked via the mocha CLI */
+    export function beforeEach(description: string, callback: (this: Mocha.IBeforeAndAfterContext, done: MochaDone) => PromiseLike<any> | void): void;
+    /** Only available when invoked via the mocha CLI */
+    export function afterEach(callback: (this: Mocha.IBeforeAndAfterContext, done: MochaDone) => PromiseLike<any> | void): void;
+    /** Only available when invoked via the mocha CLI */
+    export function afterEach(description: string, callback: (this: Mocha.IBeforeAndAfterContext, done: MochaDone) => PromiseLike<any> | void): void;
 }
 
 declare module "mocha" {
diff --git a/types/mocha/mocha-tests.ts b/types/mocha/mocha-tests.ts
index 0146c04b13..83dc76728c 100644
--- a/types/mocha/mocha-tests.ts
+++ b/types/mocha/mocha-tests.ts
@@ -1,8 +1,50 @@
+import {
+    after as importedAfter,
+    before as importedBefore,
+    afterEach as importedAfterEach,
+    beforeEach as importedBeforeEach,
+    context as importedContext,
+    describe as importedDescribe,
+    it as importedIt,
+    xdescribe as importedXdescribe,
+    xit as importedXit
+} from 'mocha';
+
 let boolean: boolean;
 let string: string;
 let number: number;
 let stringOrUndefined: string | undefined;
 let dateOrUndefined: Date | undefined;
+let resolved = Promise.resolve();
+let rejected = Promise.reject('some error');
+
+// Use module augmentation to add a third-party interface
+declare module 'mocha' {
+    interface InterfaceContributions {
+        'third-party-interface': any;
+    }
+}
+const i: Mocha.Interface = 'third-party-interface';
+
+// Lazy tests of compatibility between imported and global functions; should be identical
+const _after: typeof after = importedAfter;
+const _after2: typeof importedAfter = after;
+const _before: typeof before = importedBefore;
+const _before2: typeof importedBefore = before;
+const _afterEach: typeof afterEach = importedAfterEach;
+const _afterEach2: typeof importedAfterEach = afterEach;
+const _beforeEach: typeof beforeEach = importedBeforeEach;
+const _beforeEach2: typeof importedBeforeEach = beforeEach;
+const _context: typeof context = importedContext;
+const _context2: typeof importedContext = context;
+const _describe: typeof describe = importedDescribe;
+const _describe2: typeof importedDescribe = describe;
+const _it: typeof it = importedIt;
+const _it2: typeof importedIt = it;
+const _xdescribe: typeof xdescribe = importedXdescribe;
+const _xdescribe2: typeof importedXdescribe = xdescribe;
+const _xit: typeof xit = importedXit;
+const _xit2: typeof importedXit = xit;
 
 function test_describe() {
     describe('something', () => { });
@@ -48,6 +90,9 @@ function test_it() {
 
     it('does something', (done) => { done(); });
 
+    it('does something', () => { return resolved; });
+    it('does something', () => { return rejected; });
+
     it.only('does something', () => { });
 
     it.skip('does something', () => { });
@@ -65,6 +110,9 @@ function test_test() {
 
     test('does something', (done) => { done(); });
 
+    test('does something', () => { return resolved; });
+    test('does something', () => { return rejected; });
+
     test.only('does something', () => { });
 
     test.skip('does something', () => { });
@@ -82,6 +130,9 @@ function test_specify() {
 
     specify('does something', (done) => { done(); });
 
+    specify('does something', () => { return resolved; });
+    specify('does something', () => { return rejected; });
+
     specify.only('does something', () => { });
 
     specify.skip('does something', () => { });
@@ -98,10 +149,15 @@ function test_before() {
 
     before((done) => { done(); });
 
+    before(() => { return resolved; });
+    before(() => { return rejected; });
+
     before("my description", () => { });
 
     before("my description", done => { });
 
+    before("my description", () => { return resolved; });
+
     before("my description", function () {
         this.skip().timeout(2000).skip();
     });
@@ -139,6 +195,17 @@ function test_setup() {
         string = this.currentTest.fullTitle();
         stringOrUndefined = this.currentTest.state;
     });
+
+    setup(function () {
+        boolean = this.currentTest.async;
+        boolean = this.currentTest.pending;
+        boolean = this.currentTest.sync;
+        boolean = this.currentTest.timedOut;
+        string = this.currentTest.title;
+        string = this.currentTest.fullTitle();
+        stringOrUndefined = this.currentTest.state;
+        return resolved;
+    });
 }
 
 function test_after() {
@@ -148,9 +215,13 @@ function test_after() {
 
     after((done) => { done(); });
 
+    after(() => { return resolved; });
+
     after("my description", () => { });
 
     after("my description", done => { });
+
+    after("my description", () => { return resolved; });
 }
 
 function test_teardown() {
@@ -185,6 +256,17 @@ function test_teardown() {
         string = this.currentTest.fullTitle();
         stringOrUndefined = this.currentTest.state;
     });
+
+    teardown(function () {
+        boolean = this.currentTest.async;
+        boolean = this.currentTest.pending;
+        boolean = this.currentTest.sync;
+        boolean = this.currentTest.timedOut;
+        string = this.currentTest.title;
+        string = this.currentTest.fullTitle();
+        stringOrUndefined = this.currentTest.state;
+        return resolved;
+    });
 }
 
 function test_beforeEach() {
@@ -220,6 +302,17 @@ function test_beforeEach() {
         stringOrUndefined = this.currentTest.state;
     });
 
+    beforeEach(function () {
+        boolean = this.currentTest.async;
+        boolean = this.currentTest.pending;
+        boolean = this.currentTest.sync;
+        boolean = this.currentTest.timedOut;
+        string = this.currentTest.title;
+        string = this.currentTest.fullTitle();
+        stringOrUndefined = this.currentTest.state;
+        return resolved;
+    });
+
     beforeEach("my description", function () {
         boolean = this.currentTest.async;
         boolean = this.currentTest.pending;
@@ -240,6 +333,17 @@ function test_beforeEach() {
         string = this.currentTest.fullTitle();
         stringOrUndefined = this.currentTest.state;
     });
+
+    beforeEach("my description", function () {
+        boolean = this.currentTest.async;
+        boolean = this.currentTest.pending;
+        boolean = this.currentTest.sync;
+        boolean = this.currentTest.timedOut;
+        string = this.currentTest.title;
+        string = this.currentTest.fullTitle();
+        stringOrUndefined = this.currentTest.state;
+        return resolved;
+    });
 }
 
 function test_suiteSetup() {
@@ -248,6 +352,8 @@ function test_suiteSetup() {
     suiteSetup(function () { this['sharedState'] = true; });
 
     suiteSetup((done) => { done(); });
+
+    suiteSetup(() => { return resolved; });
 }
 
 function test_afterEach() {
@@ -283,6 +389,17 @@ function test_afterEach() {
         stringOrUndefined = this.currentTest.state;
     });
 
+    afterEach(function () {
+        boolean = this.currentTest.async;
+        boolean = this.currentTest.pending;
+        boolean = this.currentTest.sync;
+        boolean = this.currentTest.timedOut;
+        string = this.currentTest.title;
+        string = this.currentTest.fullTitle();
+        stringOrUndefined = this.currentTest.state;
+        return resolved;
+    });
+
     afterEach("my description", function () {
         boolean = this.currentTest.async;
         boolean = this.currentTest.pending;
@@ -304,6 +421,17 @@ function test_afterEach() {
         stringOrUndefined = this.currentTest.state;
     });
 
+    afterEach("my description", function () {
+        boolean = this.currentTest.async;
+        boolean = this.currentTest.pending;
+        boolean = this.currentTest.sync;
+        boolean = this.currentTest.timedOut;
+        string = this.currentTest.title;
+        string = this.currentTest.fullTitle();
+        stringOrUndefined = this.currentTest.state;
+        return resolved;
+    });
+
 }
 
 function test_suiteTeardown() {
@@ -312,6 +440,8 @@ function test_suiteTeardown() {
     suiteTeardown(function () { this['sharedState'] = true; });
 
     suiteTeardown((done) => { done(); });
+
+    suiteTeardown(() => { return resolved; });
 }
 
 function test_reporter_string() {
diff --git a/types/mocha/tslint.json b/types/mocha/tslint.json
index a41bf5d19a..f93cf8562a 100644
--- a/types/mocha/tslint.json
+++ b/types/mocha/tslint.json
@@ -1,79 +1,3 @@
 {
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
-        "ban-types": false,
-        "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
-        "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
-        "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
-        "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
-        "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
-        "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
-        "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
-    }
+    "extends": "dtslint/dt.json"
 }

From 57d7f0448e0e7117e13da63f2a6e10a21645424c Mon Sep 17 00:00:00 2001
From: Hoishin <hoishinxii@gmail.com>
Date: Thu, 15 Mar 2018 12:08:10 +0900
Subject: [PATCH 0530/1382] export = instead of export default for
 module.exports

---
 types/trash/index.d.ts     | 2 +-
 types/trash/trash-tests.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/trash/index.d.ts b/types/trash/index.d.ts
index 772b86c434..1290a0f2a8 100644
--- a/types/trash/index.d.ts
+++ b/types/trash/index.d.ts
@@ -9,4 +9,4 @@ interface TrashOptions {
 
 declare function trash(iterable: Iterable<string>, opts?: TrashOptions): Promise<void>;
 
-export default trash;
+export = trash;
diff --git a/types/trash/trash-tests.ts b/types/trash/trash-tests.ts
index 88a29c80f4..d3722539ce 100644
--- a/types/trash/trash-tests.ts
+++ b/types/trash/trash-tests.ts
@@ -1,4 +1,4 @@
-import trash from "trash";
+import trash = require("trash");
 
 async function testTrashNoArgs() {
     await trash(["/path/to/item1", "/path/to/item2"]);

From fdd4f121420c940837f2bffa09ab96f9ff9d70d3 Mon Sep 17 00:00:00 2001
From: Hoishin <hoishinxii@gmail.com>
Date: Thu, 15 Mar 2018 12:13:11 +0900
Subject: [PATCH 0531/1382] Update "definition by"

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

diff --git a/types/trash/index.d.ts b/types/trash/index.d.ts
index 1290a0f2a8..1ad9311eae 100644
--- a/types/trash/index.d.ts
+++ b/types/trash/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for trash 4.2
 // Project: https://github.com/sindresorhus/trash#readme
 // Definitions by: Matthew James <https://github.com/matthew-matvei>
+//                 Keiichiro Amemiya <https://github.com/hoishin>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 interface TrashOptions {

From 83e6f167dafe6ab6be2946c88dab462870d6b5a3 Mon Sep 17 00:00:00 2001
From: Hoishin <hoishinxii@gmail.com>
Date: Thu, 15 Mar 2018 12:22:02 +0900
Subject: [PATCH 0532/1382] bump version of the module

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

diff --git a/types/trash/index.d.ts b/types/trash/index.d.ts
index 1ad9311eae..2da4838695 100644
--- a/types/trash/index.d.ts
+++ b/types/trash/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for trash 4.2
+// Type definitions for trash 4.3
 // Project: https://github.com/sindresorhus/trash#readme
 // Definitions by: Matthew James <https://github.com/matthew-matvei>
 //                 Keiichiro Amemiya <https://github.com/hoishin>

From 48004042ddf801b3e6c0ff22388af70bf6e6a352 Mon Sep 17 00:00:00 2001
From: Andrew Bradley <cspotcode@gmail.com>
Date: Thu, 15 Mar 2018 01:29:00 -0400
Subject: [PATCH 0533/1382] Fix linter failures in mocha types

---
 types/mocha/index.d.ts     |  85 +++++++++++++--------------
 types/mocha/mocha-tests.ts | 117 ++++++++++++++++++-------------------
 types/mocha/tslint.json    |   9 ++-
 3 files changed, 105 insertions(+), 106 deletions(-)

diff --git a/types/mocha/index.d.ts b/types/mocha/index.d.ts
index 4c82633404..98443f5569 100644
--- a/types/mocha/index.d.ts
+++ b/types/mocha/index.d.ts
@@ -9,7 +9,7 @@
 // TypeScript Version: 2.1
 
 interface MochaSetupOptions {
-    //milliseconds to wait before considering a test slow
+    // milliseconds to wait before considering a test slow
     slow?: number;
 
     // timeout in milliseconds
@@ -18,7 +18,7 @@ interface MochaSetupOptions {
     // ui name "bdd", "tdd", "exports" etc
     ui?: Mocha.Interface;
 
-    //array of accepted globals
+    // array of accepted globals
     globals?: any[];
 
     // reporter instance (function or string), defaults to `mocha.reporters.Spec`
@@ -53,9 +53,7 @@ declare const specify: Mocha.ITestDefinition;
 // Used with the --delay flag; see https://mochajs.org/#hooks
 declare function run(): void;
 
-interface MochaDone {
-    (error?: any): void;
-}
+type MochaDone = (error?: any) => void;
 
 declare function setup(callback: (this: Mocha.IBeforeAndAfterContext, done: MochaDone) => PromiseLike<any> | void): void;
 declare function teardown(callback: (this: Mocha.IBeforeAndAfterContext, done: MochaDone) => PromiseLike<any> | void): void;
@@ -147,7 +145,6 @@ declare namespace Mocha {
         [index: string]: any;
     }
 
-
     interface ITestCallbackContext {
         skip(): this;
         timeout(ms: number | string): this;
@@ -228,26 +225,26 @@ declare namespace Mocha {
         state: "failed" | "passed";
     }
 
-    export module reporters {
-        export class Base {
+    namespace reporters {
+        class Base {
             stats: IStats;
 
             constructor(runner: IRunner);
         }
 
-        export class Doc extends Base { }
-        export class Dot extends Base { }
-        export class HTML extends Base { }
-        export class HTMLCov extends Base { }
-        export class JSON extends Base { }
-        export class JSONCov extends Base { }
-        export class JSONStream extends Base { }
-        export class Landing extends Base { }
-        export class List extends Base { }
-        export class Markdown extends Base { }
-        export class Min extends Base { }
-        export class Nyan extends Base { }
-        export class Progress extends Base {
+        class Doc extends Base { }
+        class Dot extends Base { }
+        class HTML extends Base { }
+        class HTMLCov extends Base { }
+        class JSON extends Base { }
+        class JSONCov extends Base { }
+        class JSONStream extends Base { }
+        class Landing extends Base { }
+        class List extends Base { }
+        class Markdown extends Base { }
+        class Min extends Base { }
+        class Nyan extends Base { }
+        class Progress extends Base {
             /**
              * @param options.open String used to indicate the start of the progress bar.
              * @param options.complete String used to indicate a complete test on the progress bar.
@@ -261,9 +258,9 @@ declare namespace Mocha {
                 close?: string;
             });
         }
-        export class Spec extends Base { }
-        export class TAP extends Base { }
-        export class XUnit extends Base {
+        class Spec extends Base { }
+        class TAP extends Base { }
+        class XUnit extends Base {
             constructor(runner: IRunner, options?: any);
         }
     }
@@ -274,57 +271,57 @@ declare namespace Mocha {
      */
 
     /** Only available when invoked via the mocha CLI */
-    export const describe: Mocha.IContextDefinition;
+    const describe: IContextDefinition;
     /** Only available when invoked via the mocha CLI */
-    export const xdescribe: Mocha.IContextDefinition;
+    const xdescribe: IContextDefinition;
     /**
      * alias for `describe`
      * Only available when invoked via the mocha CLI
      */
-    export const context: Mocha.IContextDefinition;
+    const context: IContextDefinition;
     /**
      * alias for `describe`
      * Only available when invoked via the mocha CLI
      */
-    export const suite: Mocha.IContextDefinition;
+    const suite: IContextDefinition;
     /** Only available when invoked via the mocha CLI */
-    export const it: Mocha.ITestDefinition;
+    const it: ITestDefinition;
     /** Only available when invoked via the mocha CLI */
-    export const xit: Mocha.ITestDefinition;
+    const xit: ITestDefinition;
     /**
      * alias for `it`
      * Only available when invoked via the mocha CLI
      */
-    export const test: Mocha.ITestDefinition;
+    const test: ITestDefinition;
     /**
      * Alias for `it`
      * Only available when invoked via the mocha CLI
      */
-    export const specify: Mocha.ITestDefinition;
+    const specify: ITestDefinition;
     /** Only available when invoked via the mocha CLI */
-    export function setup(callback: (this: Mocha.IBeforeAndAfterContext, done: MochaDone) => PromiseLike<any> | void): void;
+    function setup(callback: (this: IBeforeAndAfterContext, done: MochaDone) => PromiseLike<any> | void): void;
     /** Only available when invoked via the mocha CLI */
-    export function teardown(callback: (this: Mocha.IBeforeAndAfterContext, done: MochaDone) => PromiseLike<any> | void): void;
+    function teardown(callback: (this: IBeforeAndAfterContext, done: MochaDone) => PromiseLike<any> | void): void;
     /** Only available when invoked via the mocha CLI */
-    export function suiteSetup(callback: (this: Mocha.IHookCallbackContext, done: MochaDone) => PromiseLike<any> | void): void;
+    function suiteSetup(callback: (this: IHookCallbackContext, done: MochaDone) => PromiseLike<any> | void): void;
     /** Only available when invoked via the mocha CLI */
-    export function suiteTeardown(callback: (this: Mocha.IHookCallbackContext, done: MochaDone) => PromiseLike<any> | void): void;
+    function suiteTeardown(callback: (this: IHookCallbackContext, done: MochaDone) => PromiseLike<any> | void): void;
     /** Only available when invoked via the mocha CLI */
-    export function before(callback: (this: Mocha.IHookCallbackContext, done: MochaDone) => PromiseLike<any> | void): void;
+    function before(callback: (this: IHookCallbackContext, done: MochaDone) => PromiseLike<any> | void): void;
     /** Only available when invoked via the mocha CLI */
-    export function before(description: string, callback: (this: Mocha.IHookCallbackContext, done: MochaDone) => PromiseLike<any> | void): void;
+    function before(description: string, callback: (this: IHookCallbackContext, done: MochaDone) => PromiseLike<any> | void): void;
     /** Only available when invoked via the mocha CLI */
-    export function after(callback: (this: Mocha.IHookCallbackContext, done: MochaDone) => PromiseLike<any> | void): void;
+    function after(callback: (this: IHookCallbackContext, done: MochaDone) => PromiseLike<any> | void): void;
     /** Only available when invoked via the mocha CLI */
-    export function after(description: string, callback: (this: Mocha.IHookCallbackContext, done: MochaDone) => PromiseLike<any> | void): void;
+    function after(description: string, callback: (this: IHookCallbackContext, done: MochaDone) => PromiseLike<any> | void): void;
     /** Only available when invoked via the mocha CLI */
-    export function beforeEach(callback: (this: Mocha.IBeforeAndAfterContext, done: MochaDone) => PromiseLike<any> | void): void;
+    function beforeEach(callback: (this: IBeforeAndAfterContext, done: MochaDone) => PromiseLike<any> | void): void;
     /** Only available when invoked via the mocha CLI */
-    export function beforeEach(description: string, callback: (this: Mocha.IBeforeAndAfterContext, done: MochaDone) => PromiseLike<any> | void): void;
+    function beforeEach(description: string, callback: (this: IBeforeAndAfterContext, done: MochaDone) => PromiseLike<any> | void): void;
     /** Only available when invoked via the mocha CLI */
-    export function afterEach(callback: (this: Mocha.IBeforeAndAfterContext, done: MochaDone) => PromiseLike<any> | void): void;
+    function afterEach(callback: (this: IBeforeAndAfterContext, done: MochaDone) => PromiseLike<any> | void): void;
     /** Only available when invoked via the mocha CLI */
-    export function afterEach(description: string, callback: (this: Mocha.IBeforeAndAfterContext, done: MochaDone) => PromiseLike<any> | void): void;
+    function afterEach(description: string, callback: (this: IBeforeAndAfterContext, done: MochaDone) => PromiseLike<any> | void): void;
 }
 
 declare module "mocha" {
diff --git a/types/mocha/mocha-tests.ts b/types/mocha/mocha-tests.ts
index 83dc76728c..4694c66fe7 100644
--- a/types/mocha/mocha-tests.ts
+++ b/types/mocha/mocha-tests.ts
@@ -15,8 +15,8 @@ let string: string;
 let number: number;
 let stringOrUndefined: string | undefined;
 let dateOrUndefined: Date | undefined;
-let resolved = Promise.resolve();
-let rejected = Promise.reject('some error');
+const resolved = Promise.resolve();
+const rejected = Promise.reject('some error');
 
 // Use module augmentation to add a third-party interface
 declare module 'mocha' {
@@ -53,7 +53,7 @@ function test_describe() {
 
     describe.skip('something', () => { });
 
-    describe('something', function () {
+    describe('something', function() {
         this.retries(3).slow(1000).timeout(2000).retries(3);
     });
 }
@@ -65,7 +65,7 @@ function test_context() {
 
     context.skip('some context', () => { });
 
-    context('some context', function () {
+    context('some context', function() {
         this.retries(3).slow(1000).timeout(2000).retries(3);
     });
 }
@@ -77,67 +77,64 @@ function test_suite() {
 
     suite.skip('some context', () => { });
 
-    suite('some context', function () {
+    suite('some context', function() {
         this.retries(3).slow(1000).timeout(2000).retries(3);
     });
 }
 
 function test_it() {
-
     it('does something', () => { }).timeout('2s');
 
-    it('does something', function () { this['sharedState'] = true; });
+    it('does something', function() { this['sharedState'] = true; });
 
     it('does something', (done) => { done(); });
 
-    it('does something', () => { return resolved; });
-    it('does something', () => { return rejected; });
+    it('does something', () => resolved);
+    it('does something', () => rejected);
 
     it.only('does something', () => { });
 
     it.skip('does something', () => { });
 
-    it('does something', function () {
+    it('does something', function() {
         this.skip().retries(3).slow(1000).timeout(2000).skip();
     });
 }
 
 function test_test() {
-
     test('does something', () => { });
 
-    test('does something', function () { this['sharedState'] = true; });
+    test('does something', function() { this['sharedState'] = true; });
 
     test('does something', (done) => { done(); });
 
-    test('does something', () => { return resolved; });
-    test('does something', () => { return rejected; });
+    test('does something', () => resolved);
+    test('does something', () => rejected);
 
     test.only('does something', () => { });
 
     test.skip('does something', () => { });
 
-    test('does something', function () {
+    test('does something', function() {
         this.skip().retries(3).slow(1000).timeout(2000).skip();
     });
 }
 
 function test_specify() {
-
     specify('does something', () => { });
 
-    specify('does something', function () { this['sharedState'] = true; });
+    specify('does something', function() { this['sharedState'] = true; });
 
     specify('does something', (done) => { done(); });
 
-    specify('does something', () => { return resolved; });
-    specify('does something', () => { return rejected; });
+    specify('does something', () => resolved);
+    specify('does something', () => rejected);
 
     specify.only('does something', () => { });
 
     specify.skip('does something', () => { });
 
-    specify('does something', function () {
+    specify('does something', function() {
         this.skip().retries(3).slow(1000).timeout(2000).skip();
     });
 }
@@ -145,26 +142,26 @@ function test_specify() {
 function test_before() {
     before(() => { });
 
-    before(function () { this['sharedState'] = true; });
+    before(function() { this['sharedState'] = true; });
 
     before((done) => { done(); });
 
-    before(() => { return resolved; });
-    before(() => { return rejected; });
+    before(() => resolved);
+    before(() => rejected);
 
     before("my description", () => { });
 
     before("my description", done => { });
 
-    before("my description", () => { return resolved; });
+    before("my description", () => resolved);
 
-    before("my description", function () {
+    before("my description", function() {
         this.skip().timeout(2000).skip();
     });
 }
 
 function test_setup() {
-    setup(function () {
+    setup(function() {
         boolean = this.currentTest.async;
         boolean = this.currentTest.pending;
         boolean = this.currentTest.sync;
@@ -174,7 +171,7 @@ function test_setup() {
         stringOrUndefined = this.currentTest.state;
     });
 
-    setup(function () {
+    setup(function() {
         this['sharedState'] = true;
         boolean = this.currentTest.async;
         boolean = this.currentTest.pending;
@@ -185,7 +182,7 @@ function test_setup() {
         stringOrUndefined = this.currentTest.state;
     });
 
-    setup(function (done) {
+    setup(function(done) {
         done();
         boolean = this.currentTest.async;
         boolean = this.currentTest.pending;
@@ -196,7 +193,7 @@ function test_setup() {
         stringOrUndefined = this.currentTest.state;
     });
 
-    setup(function () {
+    setup(function() {
         boolean = this.currentTest.async;
         boolean = this.currentTest.pending;
         boolean = this.currentTest.sync;
@@ -211,21 +208,21 @@ function test_setup() {
 function test_after() {
     after(() => { });
 
-    after(function () { this['sharedState'] = true; });
+    after(function() { this['sharedState'] = true; });
 
     after((done) => { done(); });
 
-    after(() => { return resolved; });
+    after(() => resolved);
 
     after("my description", () => { });
 
     after("my description", done => { });
 
-    after("my description", () => { return resolved; });
+    after("my description", () => resolved);
 }
 
 function test_teardown() {
-    teardown(function () {
+    teardown(function() {
         boolean = this.currentTest.async;
         boolean = this.currentTest.pending;
         boolean = this.currentTest.sync;
@@ -235,7 +232,7 @@ function test_teardown() {
         stringOrUndefined = this.currentTest.state;
     });
 
-    teardown(function () {
+    teardown(function() {
         this['sharedState'] = true;
         boolean = this.currentTest.async;
         boolean = this.currentTest.pending;
@@ -246,7 +243,7 @@ function test_teardown() {
         stringOrUndefined = this.currentTest.state;
     });
 
-    teardown(function (done) {
+    teardown(function(done) {
         done();
         boolean = this.currentTest.async;
         boolean = this.currentTest.pending;
@@ -257,7 +254,7 @@ function test_teardown() {
         stringOrUndefined = this.currentTest.state;
     });
 
-    teardown(function () {
+    teardown(function() {
         boolean = this.currentTest.async;
         boolean = this.currentTest.pending;
         boolean = this.currentTest.sync;
@@ -270,7 +267,7 @@ function test_teardown() {
 }
 
 function test_beforeEach() {
-    beforeEach(function () {
+    beforeEach(function() {
         boolean = this.currentTest.async;
         boolean = this.currentTest.pending;
         boolean = this.currentTest.sync;
@@ -280,7 +277,7 @@ function test_beforeEach() {
         stringOrUndefined = this.currentTest.state;
     });
 
-    beforeEach(function () {
+    beforeEach(function() {
         this['sharedState'] = true;
         boolean = this.currentTest.async;
         boolean = this.currentTest.pending;
@@ -291,7 +288,7 @@ function test_beforeEach() {
         stringOrUndefined = this.currentTest.state;
     });
 
-    beforeEach(function (done) {
+    beforeEach(function(done) {
         done();
         boolean = this.currentTest.async;
         boolean = this.currentTest.pending;
@@ -302,7 +299,7 @@ function test_beforeEach() {
         stringOrUndefined = this.currentTest.state;
     });
 
-    beforeEach(function () {
+    beforeEach(function() {
         boolean = this.currentTest.async;
         boolean = this.currentTest.pending;
         boolean = this.currentTest.sync;
@@ -313,7 +310,7 @@ function test_beforeEach() {
         return resolved;
     });
 
-    beforeEach("my description", function () {
+    beforeEach("my description", function() {
         boolean = this.currentTest.async;
         boolean = this.currentTest.pending;
         boolean = this.currentTest.sync;
@@ -323,7 +320,7 @@ function test_beforeEach() {
         stringOrUndefined = this.currentTest.state;
     });
 
-    beforeEach("my description", function (done) {
+    beforeEach("my description", function(done) {
         done();
         boolean = this.currentTest.async;
         boolean = this.currentTest.pending;
@@ -334,7 +331,7 @@ function test_beforeEach() {
         stringOrUndefined = this.currentTest.state;
     });
 
-    beforeEach("my description", function () {
+    beforeEach("my description", function() {
         boolean = this.currentTest.async;
         boolean = this.currentTest.pending;
         boolean = this.currentTest.sync;
@@ -349,15 +346,15 @@ function test_beforeEach() {
 function test_suiteSetup() {
     suiteSetup(() => { });
 
-    suiteSetup(function () { this['sharedState'] = true; });
+    suiteSetup(function() { this['sharedState'] = true; });
 
     suiteSetup((done) => { done(); });
 
-    suiteSetup(() => { return resolved; });
+    suiteSetup(() => resolved);
 }
 
 function test_afterEach() {
-    afterEach(function () {
+    afterEach(function() {
         boolean = this.currentTest.async;
         boolean = this.currentTest.pending;
         boolean = this.currentTest.sync;
@@ -367,7 +364,7 @@ function test_afterEach() {
         stringOrUndefined = this.currentTest.state;
     });
 
-    afterEach(function () {
+    afterEach(function() {
         this['sharedState'] = true;
         boolean = this.currentTest.async;
         boolean = this.currentTest.pending;
@@ -378,7 +375,7 @@ function test_afterEach() {
         stringOrUndefined = this.currentTest.state;
     });
 
-    afterEach(function (done) {
+    afterEach(function(done) {
         done();
         boolean = this.currentTest.async;
         boolean = this.currentTest.pending;
@@ -389,7 +386,7 @@ function test_afterEach() {
         stringOrUndefined = this.currentTest.state;
     });
 
-    afterEach(function () {
+    afterEach(function() {
         boolean = this.currentTest.async;
         boolean = this.currentTest.pending;
         boolean = this.currentTest.sync;
@@ -400,7 +397,7 @@ function test_afterEach() {
         return resolved;
     });
 
-    afterEach("my description", function () {
+    afterEach("my description", function() {
         boolean = this.currentTest.async;
         boolean = this.currentTest.pending;
         boolean = this.currentTest.sync;
@@ -410,7 +407,7 @@ function test_afterEach() {
         stringOrUndefined = this.currentTest.state;
     });
 
-    afterEach("my description", function (done) {
+    afterEach("my description", function(done) {
         done();
         boolean = this.currentTest.async;
         boolean = this.currentTest.pending;
@@ -421,7 +418,7 @@ function test_afterEach() {
         stringOrUndefined = this.currentTest.state;
     });
 
-    afterEach("my description", function () {
+    afterEach("my description", function() {
         boolean = this.currentTest.async;
         boolean = this.currentTest.pending;
         boolean = this.currentTest.sync;
@@ -431,17 +428,16 @@ function test_afterEach() {
         stringOrUndefined = this.currentTest.state;
         return resolved;
     });
-
 }
 
 function test_suiteTeardown() {
     suiteTeardown(() => { });
 
-    suiteTeardown(function () { this['sharedState'] = true; });
+    suiteTeardown(function() { this['sharedState'] = true; });
 
     suiteTeardown((done) => { done(); });
 
-    suiteTeardown(() => { return resolved; });
+    suiteTeardown(() => resolved);
 }
 
 function test_reporter_string() {
@@ -515,7 +511,7 @@ function test_setup_all_options() {
 }
 
 function test_run() {
-    mocha.run(function () { })
+    mocha.run(() => {});
 }
 
 function test_growl() {
@@ -550,7 +546,6 @@ function test_require_constructor_allOptions() {
     });
 }
 
-
 function test_require_fluentParams() {
     const instance = new MochaDef();
 
@@ -591,7 +586,7 @@ function test_throwError() {
 
 function test_mochaRunner_properties(runner: MochaDef.IRunner, suite: MochaDef.ISuite) {
     runner = runner.abort();
-    
+
     if (runner.stats !== undefined) {
         number = runner.stats.failures;
         number = runner.stats.passes;
@@ -604,7 +599,7 @@ function test_mochaRunner_properties(runner: MochaDef.IRunner, suite: MochaDef.I
         dateOrUndefined = runner.stats.duration;
     }
 
-    let s: MochaDef.ISuite = runner.suite;
+    const s: MochaDef.ISuite = runner.suite;
     boolean = runner.started;
     number = runner.total;
     number = runner.failures;
@@ -612,7 +607,7 @@ function test_mochaRunner_properties(runner: MochaDef.IRunner, suite: MochaDef.I
     runner = runner.grep("regex", false);
     number = runner.grepTotal(suite);
 
-    let globals: string[] | MochaDef.IRunner= runner.globals(["hello", "world"]);
+    const globals: string[] | MochaDef.IRunner = runner.globals(["hello", "world"]);
 
     runner = runner.run();
     runner = runner.run((f: number) => {});
@@ -628,4 +623,4 @@ function test_base_reporter_properties(reporter: MochaDef.reporters.Base) {
     dateOrUndefined = reporter.stats.start;
     dateOrUndefined = reporter.stats.end;
     dateOrUndefined = reporter.stats.duration;
-}
\ No newline at end of file
+}
diff --git a/types/mocha/tslint.json b/types/mocha/tslint.json
index f93cf8562a..1e7d1ca65a 100644
--- a/types/mocha/tslint.json
+++ b/types/mocha/tslint.json
@@ -1,3 +1,10 @@
 {
-    "extends": "dtslint/dt.json"
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "unified-signatures": false,
+        "interface-name": false,
+        "ban-types": false,
+        "no-single-declare-module": false,
+        "no-declare-current-package": false
+    }
 }

From c32fcc6b40ab8df965a7ffb96199f9cb9a4ffd57 Mon Sep 17 00:00:00 2001
From: pcassis <piotr@cassis.pl>
Date: Thu, 15 Mar 2018 06:53:51 +0100
Subject: [PATCH 0534/1382] tracking - methods declarations

---
 types/tracking/index.d.ts | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/types/tracking/index.d.ts b/types/tracking/index.d.ts
index 5625a374b0..c8465ba0be 100644
--- a/types/tracking/index.d.ts
+++ b/types/tracking/index.d.ts
@@ -8,10 +8,31 @@ declare namespace tracking {
     constructor(colours: string[]);
 
     static registerColor(name: string, predicate: (r: number, g: number, b: number) => boolean): void;
+
+    getColors(): string[];
+    getMinDimension(): number;
+    getMaxDimension(): number;
+    getMinGroupSize(): number;
+    setColors(colors: string[]): void;
+    setMinDimension(minDimension: number): void;
+    setMaxDimension(maxDimension: number): void;
+    setMinGroupSize(maxDimension: number): void;
   }
 
   export class ObjectTracker extends Tracker {
     constructor(objects: string[]);
+
+    getClassifiers(): number[];
+    getEdgesDensity(): number;
+    getInitialScale(): number;
+    getScaleFactor(): number;
+    getStepSize(): number;
+    setClassifiers(classifiers: number[]): void;
+    setEdgesDensity(edgesDensity: number): void;
+    setInitialScale(initialScale: number): void;
+    setInitialScale(initialScale: number): void;
+    setScaleFactor(scaleFactor: number): void;
+    setStepSize(stepSize: number): void;
   }
 
   class Tracker {

From 821905199ee36b1296938d74dd27b2a772ec8773 Mon Sep 17 00:00:00 2001
From: ckboyjiy <ckboyjiy@nate.com>
Date: Thu, 15 Mar 2018 15:32:57 +0900
Subject: [PATCH 0535/1382] Added type definitions for Naver maps

---
 navermaps/index.d.ts         | 1354 ++++++++++++++++++++++++++++++++++
 navermaps/navermaps-tests.ts |  148 ++++
 navermaps/tsconfig.json      |   24 +
 navermaps/tslint.json        |   79 ++
 4 files changed, 1605 insertions(+)
 create mode 100644 navermaps/index.d.ts
 create mode 100644 navermaps/navermaps-tests.ts
 create mode 100644 navermaps/tsconfig.json
 create mode 100644 navermaps/tslint.json

diff --git a/navermaps/index.d.ts b/navermaps/index.d.ts
new file mode 100644
index 0000000000..a367238bf1
--- /dev/null
+++ b/navermaps/index.d.ts
@@ -0,0 +1,1354 @@
+// Definitions by: Ckboyjiy <https://github.com/ckboyjiy>
+// Type definitions for Naver Maps JavaScript API 3.0
+// Project: https://navermaps.github.io
+// Definitions by: Ckboyjiy <https://github.com/ckboyjiy>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+declare namespace naver.maps {
+  /**
+   * Types
+   */
+  type PointArrayLiteral = [number, number];
+  type PointLiteral = naver.maps.PointArrayLiteral | naver.maps.PointObjectLiteral;
+  type SizeArrayLiteral = [number, number];
+  type SizeLiteral = naver.maps.SizeArrayLiteral | naver.maps.SizeObjectLiteral;
+  type LatLngLiteral = naver.maps.PointLiteral | naver.maps.LatLngObjectLiteral;
+  type PointBoundsArrayLiteral = [number, number, number, number];
+  type PointBoundsLiteral = naver.maps.PointBoundsArrayLiteral | naver.maps.PointBoundsObjectLiteral;
+  type LatLngBoundsLiteral = naver.maps.PointBoundsLiteral | naver.maps.LatLngBoundsObjectLiteral;
+  type BoundsLiteral = naver.maps.PointBoundsLiteral | naver.maps.LatLngBoundsLiteral;
+  type CoordLiteral = naver.maps.PointLiteral | naver.maps.LatLngLiteral;
+  type Coord = naver.maps.Point | naver.maps.LatLng;
+  type Bounds = naver.maps.PointBounds | naver.maps.LatLngBounds;
+  type DOMEvent = Event;
+  type StylingFunction = (feature: naver.maps.Feature) => naver.maps.StyleOptions;
+  type ArrayOfCoords = naver.maps.Point[] | naver.maps.LatLng[];
+  type ArrayOfBounds = naver.maps.PointBounds[] | naver.maps.LatLngBounds[];
+  type ArrayOfBoundsLiteral = naver.maps.PointBoundsLiteral[] | naver.maps.LatLngBoundsLiteral[];
+  type forEachOverlayCallback = (overlay: naver.maps.Marker | naver.maps.Polyline | naver.maps.Polygon, index: number) => void;
+  type GeoJSON = object;
+  type GPX = object;
+  type KML = object;
+  type KVOArrayOfCoords = any;
+  type ArrayOfCoordsLiteral = naver.maps.PointLiteral[] | naver.maps.LatLngLiteral[];
+  type strokeStyleType = 'solid' | 'shortdash' | 'shortdot' | 'shortdashdot' | 'shortdashdotdot' | 'dot' | 'dash' |
+    'longdash' | 'dashdot' | 'longdashdot' | 'longdashdotdot';
+  type strokeLineCapType = 'butt' | 'round' | 'square';
+  type strokeLineJoinType = 'miter' | 'round ' | 'bevel';
+
+  /**
+   * Interfaces
+   */
+  export interface PointObjectLiteral {
+    x: number;
+    y: number;
+  }
+  export interface SizeObjectLiteral {
+    width: number;
+    height: number;
+  }
+  export interface LatLngObjectLiteral {
+    lat: number;
+    lng: number;
+  }
+  export interface PointBoundsObjectLiteral {
+    minX: number;
+    minY: number;
+    maxX: number;
+    maxY: number;
+  }
+  export interface LatLngBoundsObjectLiteral {
+    north: number;
+    east: number;
+    south: number;
+    west: number;
+  }
+  export interface MapSystemProjection extends KVO {
+    factor(zoom: number): number;
+    fromCoordToOffset(coord: naver.maps.Coord): naver.maps.Point;
+    fromCoordToPoint(coord: naver.maps.Coord): naver.maps.Point;
+    fromOffsetToCoord(offset: naver.maps.Point): naver.maps.Coord;
+    fromOffsetToPoint(offset: naver.maps.Point): naver.maps.Point;
+    fromPointToCoord(point: naver.maps.Point): naver.maps.Coord;
+    fromPointToOffset(point: naver.maps.Point): naver.maps.Point;
+    getDestinationCoord(fromCoord: naver.maps.Coord, angle: number, meter: number): naver.maps.Coord;
+    getDistance(coord1: naver.maps.Coord, coord2: naver.maps.Coord): number;
+    getProjectionName(): number;
+    scaleDown(operand: number | naver.maps.Point | naver.maps.Size, zoom: number): number | naver.maps.Point | naver.maps.Size;
+    scaleUp(operand: number | naver.maps.Point | naver.maps.Size, zoom: number): number | naver.maps.Point | naver.maps.Size;
+
+  }
+  export interface MapOptions {
+    background?: string;
+    baseTileOpacity?: number;
+    bounds?: any;
+    center?: any;
+    disableDoubleClickZoom?: boolean;
+    disableDoubleTapZoom?: boolean;
+    disableKineticPan?: boolean;
+    disableTwoFingerTapZoom?: boolean;
+    draggable?: boolean;
+    keyboardShortcuts?: boolean;
+    logoControl?: boolean;
+    logoControlOptions?: any;
+    mapDataControl?: boolean;
+    mapDataControlOptions?: any;
+    mapTypeControl?: boolean;
+    mapTypeControlOptions?: any;
+    mapTypeId?: string;
+    mapTypes?: any;
+    maxBounds?: any;
+    maxZoom?: number;
+    minZoom?: number;
+    padding?: any;
+    pinchZoom?: boolean;
+    resizeOrigin?: any;
+    scaleControl?: boolean;
+    scaleControlOptions?: any;
+    scrollWheel?: boolean;
+    size?: any;
+    overlayZoomEffect?: null | string;
+    tileSpare?: number;
+    tileTransition?: boolean;
+    zoom?: number;
+    zoomControl?: boolean;
+    zoomControlOptions?: any;
+    zoomOrigin?: any;
+  }
+  export interface MarkerOptions {
+    animation?: any;
+    map?: Map;
+    position?: any;
+    icon?: any;
+    shape?: any;
+    title?: string;
+    cursor?: string;
+    clickable?: boolean;
+    draggable?: boolean;
+    visible?: boolean;
+    zIndex?: number;
+  }
+  export interface MapPanes {
+    overlayLayer: HTMLElement;
+    overlayImage: HTMLElement;
+    floatPane: HTMLElement;
+  }
+  export interface MapEventListener {
+    eventName: string;
+    listener: Function;
+    listenerId: string;
+    target: object;
+  }
+  export interface InfoWindowOptions {
+    position: naver.maps.Coord | naver.maps.CoordLiteral;
+    content: string | HTMLElement;
+    zIndex?: number;
+    maxWidth?: number;
+    pixelOffset?: naver.maps.Point | naver.maps.PointLiteral;
+    backgroundColor?: string;
+    borderColor?: string;
+    borderWidth?: number;
+    disableAutoPan?: boolean;
+    disableAnchor?: boolean;
+    anchorSkew?: boolean;
+    anchorSize?: naver.maps.Size | naver.maps.SizeLiteral;
+    anchorColor?: string;
+  }
+  export interface ImageTileOptions {
+    urls: string[];
+    imgonload?: Function;
+    imgonerror?: Function;
+    opacity?: number;
+    transition?: boolean;
+    offset?: naver.maps.Point;
+    zIndex?: number;
+    size?: naver.maps.Size;
+    pane?: HTMLElement;
+  }
+  export interface ImageMapTypeOptions {
+    name: string;
+    maxZoom: number;
+    minZoom: number;
+    projection: naver.maps.Projection;
+    tileSize?: naver.maps.Size | naver.maps.SizeLiteral;
+    repeatX?: boolean;
+    vendor?: string;
+    provider?: naver.maps.MapDataProvider;
+    uid?: string;
+    darktheme?: boolean;
+    getTileUrl?: Function;
+    tileSet?: string | string[];
+  }
+  export interface GroundOverlayOptions {
+    clickable?: boolean;
+    map?: 	naver.maps.Map | null;
+    opacity?: number;
+  }
+  export interface EllipseOptions {
+    map?: naver.maps.Map;
+    bounds: naver.maps.Bounds | naver.maps.BoundsLiteral;
+    strokeWeight?: number;
+    strokeOpacity?: number;
+    strokeColor?: string;
+    strokeStyle?: naver.maps.strokeStyleType;
+    strokeLineCap?: naver.maps.strokeLineCapType;
+    strokeLineJoin?: naver.maps.strokeLineJoinType;
+    fillColor?: string;
+    fillOpacity?: number;
+    clickable?: boolean;
+    visible?: boolean;
+    zIndex?: number;
+  }
+  export interface FeatureEvent {
+    feature: naver.maps.Feature;
+  }
+  export interface PointerEvent {
+    coord: naver.maps.Coord;
+    point: naver.maps.Point;
+    offset: naver.maps.Point;
+    pointerEvent: naver.maps.DOMEvent;
+    feature: naver.maps.Feature;
+  }
+  export interface PropertyEvent {
+    feature: naver.maps.Feature;
+    name: string;
+    oldValue: any;
+    newValue: any;
+  }
+  export interface StyleOptions {
+    strokeColor?: string;
+    strokeOpacity?: number;
+    strokeWeight?: number;
+    fillColor?: string;
+    fillOpacity?: number;
+    clickable?: boolean;
+    icon?: string | naver.maps.ImageIcon | naver.maps.SymbolIcon | naver.maps.HtmlIcon;
+    shape?: naver.maps.MarkerShape;
+    title?: string;
+    visible?: boolean;
+    zIndex?: number;
+  }
+  export interface ControlOptions {
+    position: naver.maps.Position;
+  }
+  export interface CircleOptions {
+    map?: naver.maps.Map;
+    center: naver.maps.Coord | naver.maps.CoordLiteral;
+    radius?: number;
+    strokeWeight?: number;
+    strokeOpacity?: number;
+    strokeColor?: string;
+    strokeStyle?: naver.maps.strokeStyleType;
+    strokeLineCap?: naver.maps.strokeLineCapType;
+    strokeLineJoin?: naver.maps.strokeLineJoinType;
+    fillColor?: string;
+    fillOpacity?: number;
+    clickable?: boolean;
+    visible?: boolean;
+    zIndex?: number;
+  }
+  export interface TileOptions {
+    opacity?: number;
+    transition?: boolean;
+    offset?: naver.maps.Point;
+    zIndex?: number;
+    size?: naver.maps.Size;
+    pane?: HTMLElement;
+  }
+  export interface TileIndex {
+    xIndex: number;
+    yIndex: number;
+  }
+  export interface CanvasTileOptions {
+    imageData?: ImageData;
+    opacity?: number;
+    transition?: boolean;
+    offset?: naver.maps.Point;
+    zIndex?: number;
+    size?: naver.maps.Size;
+    pane?: HTMLElement;
+  }
+  export interface CanvasMapTypeOptions {
+    name: string;
+    maxZoom: number;
+    minZoom: number;
+    projection: naver.maps.Projection;
+    tileSize?: naver.maps.Size | naver.maps.SizeLiteral;
+    repeatX?: boolean;
+    vendor?: string;
+    provider?: naver.maps.MapDataProvider;
+    uid?: string;
+    darktheme?: boolean;
+    getTileData?: Function;
+  }
+  export interface MapDataProvider {
+    title: string;
+    link: string;
+    bounds: naver.maps.Bounds | naver.maps.BoundsLiteral | naver.maps.ArrayOfBounds | naver.maps.ArrayOfBoundsLiteral;
+  }
+  export interface MapType {
+    maxZoom: number;
+    minZoom: number;
+    name: string;
+    projection: naver.maps.Projection;
+    tileSize: naver.maps.Size;
+    getTile(x: number, y: number, z: number): HTMLElement | naver.maps.Tile;
+  }
+  export interface Projection {
+    fromCoordToPoint(coord: naver.maps.Coord): naver.maps.Point;
+    fromPointToCoord(point: naver.maps.Point): Coord;
+  }
+  export interface CadastralLayerOptions {
+    overlayMap?: boolean;
+    zIndex?: number;
+  }
+  export interface AroundControlOptions {
+    position: naver.maps.Position;
+  }
+  export interface NaverImageMapTypeOptions {
+    maxZoom?: number;
+    minZoom?: number;
+    projection?: naver.maps.Projection;
+    tileSize?: naver.maps.Size;
+    hd?: string;
+  }
+  export interface LogoControlOptions {
+    position: naver.maps.Position;
+  }
+  export interface MapDataControlOptions {
+    position: naver.maps.Position;
+  }
+  export interface MapTypeControlOptions {
+    mapTypeIds: naver.maps.MapTypeId[] | null;
+    position: naver.maps.Position;
+    style: naver.maps.MapTypeControlStyle;
+  }
+  export interface ScaleControlOptions {
+    position: naver.maps.Position;
+  }
+  export interface ZoomControlOptions {
+    position: naver.maps.Position;
+    style: naver.maps.ZoomControlStyle;
+    legendDisabled: boolean;
+  }
+  export interface LayerOptions {
+    hd: boolean;
+    overlayMap: boolean;
+    zIndex: number;
+  }
+  export interface CadastralLayerOptions {
+    overlayMap: boolean;
+    zIndex: number;
+  }
+  export interface StreetLayerOptions {
+    overlayMap: boolean;
+    zIndex: number;
+  }
+  export interface TrafficLayerOptions {
+    interval: number;
+    overlayMap: boolean;
+    zIndex: number;
+  }
+  export interface HtmlIcon {
+    content: string | HTMLElement;
+    size?: naver.maps.Size | naver.maps.SizeLiteral;
+    anchor?: naver.maps.Point | naver.maps.PointLiteral | naver.maps.Position;
+  }
+  export interface ImageIcon {
+    url: string;
+    size?: naver.maps.Size | naver.maps.SizeLiteral;
+    scaledSize?: naver.maps.Size |naver.maps. SizeLiteral;
+    origin?: naver.maps.Point | naver.maps.PointLiteral;
+    anchor?: naver.maps.Point | naver.maps.PointLiteral | naver.maps.Position;
+  }
+  export interface MarkerShape {
+    coords: any[];
+    type: string;
+  }
+  export interface SymbolIcon {
+    path: naver.maps.SymbolPath | naver.maps.Point[] | naver.maps.PointLiteral[];
+    style?: naver.maps.SymbolStyle;
+    radius?: number;
+    fillColor?: string;
+    fillOpacity?: number;
+    strokeColor?: string;
+    strokeWeight?: number;
+    strokeOpacity?: number;
+    anchor?: naver.maps.Point | naver.maps.PointLiteral | naver.maps.Position;
+  }
+  export interface PolygonOptions {
+    map?: naver.maps.Map;
+    paths: naver.maps.ArrayOfCoords[] | naver.maps.KVOArrayOfCoords[] | naver.maps.ArrayOfCoordsLiteral[];
+    strokeWeight?: number;
+    strokeOpacity?: number;
+    strokeColor?: string;
+    strokeStyle?: naver.maps.strokeStyleType;
+    strokeLineCap?: naver.maps.strokeLineCapType;
+    strokeLineJoin?: naver.maps.strokeLineJoinType;
+    fillColor?: string;
+    fillOpacity?: number;
+    clickable?: boolean;
+    visible?: boolean;
+    zIndex?: number;
+  }
+  export interface PolylineOptions {
+    map?: naver.maps.Map;
+    path: naver.maps.ArrayOfCoords | naver.maps.KVOArrayOfCoords | naver.maps.ArrayOfCoordsLiteral;
+    strokeWeight?: number;
+    strokeOpacity?: number;
+    strokeColor?: string;
+    strokeStyle?: naver.maps.strokeStyleType;
+    strokeLineCap?: naver.maps.strokeLineCapType;
+    strokeLineJoin?: naver.maps.strokeLineJoinType;
+    clickable?: boolean;
+    visible?: boolean;
+    zIndex?: number;
+    startIcon?: naver.maps.PointingIcon;
+    startIconSize?: number;
+    endIcon?: naver.maps.PointingIcon;
+    endIconSize?: number;
+  }
+  export interface RectangleOptions {
+    map?: naver.maps.Map;
+    bounds: naver.maps.Bounds | naver.maps.BoundsLiteral;
+    strokeWeight?: number;
+    strokeOpacity?: number;
+    strokeColor?: string;
+    strokeStyle?: naver.maps.strokeStyleType;
+    strokeLineCap?: naver.maps.strokeLineCapType;
+    strokeLineJoin?: naver.maps.strokeLineJoinType;
+    fillColor?: string;
+    fillOpacity?: number;
+    clickable?: boolean;
+    visible?: boolean;
+    zIndex?: number;
+  }
+  export interface PanoramaOptions {
+    size: naver.maps.Size | naver.maps.SizeLiteral;
+    panoId: string;
+    position: naver.maps.LatLng | naver.maps.LatLngLiteral;
+    pov: naver.maps.PanoramaPov;
+    visible: boolean;
+    minScale: number;
+    maxScale: number;
+    minZoom: number;
+    maxZoom: number;
+    logoControl: boolean;
+    logoControlOptions: naver.maps.LogoControlOptions;
+    zoomControl: boolean;
+    zoomControlOptions: naver.maps.ZoomControlOptions;
+    aroundControl: boolean;
+    aroundControlOptions: naver.maps.AroundControlOptions;
+  }
+  export interface PanoramaPov {
+    pan: number;
+    tilt: number;
+    fov: number;
+  }
+  export interface PanoramaLocation {
+    panoId: string;
+    title: string;
+    address: string;
+    coord: naver.maps.LatLng;
+    photodate: string;
+  }
+  export interface DOMEventListener {
+    eventName: string;
+    listener: Function;
+    target: HTMLElement;
+  }
+
+  /**
+   * Enums
+   */
+  export enum MapTypeControlStyle {
+    BUTTON,
+    DROPDOWN
+  }
+  export enum ZoomControlStyle {
+    LARGE,
+    SMALL
+  }
+
+  /**
+   * Members
+   */
+  export enum Animation {
+    BOUNCE = 1,
+    DROP
+  }
+  let jsContentLoaded: boolean;
+  export enum MapTypeId { // TODO. 확실하지 않음
+    NORMAL,
+    TERRAIN,
+    SATELLITE,
+    HYBRID
+  }
+  export function onJSContentLoaded(...args: any[]): any;
+  export enum PointingIcon {
+    OPEN_ARROW = 1,
+    BLOCK_ARROW,
+    CIRCLE,
+    DIAMOND
+  }
+  export enum Position {
+    CENTER = 0,
+    TOP_LEFT,
+    TOP_CENTER,
+    TOP_RIGHT,
+    LEFT_CENTER,
+    LEFT_TOP,
+    LEFT_BOTTOM,
+    RIGHT_TOP,
+    RIGHT_CENTER,
+    RIGHT_BOTTOM,
+    BOTTOM_LEFT,
+    BOTTOM_CENTER,
+    BOTTOM_RIGHT
+  }
+  export enum SymbolPath {
+    BACKWARD_CLOSED_ARROW = 1,
+    BACKWARD_OPEN_ARROW,
+    CIRCLE,
+    FORWARD_CLOSED_ARROW,
+    FORWARD_OPEN_ARROW
+  }
+  export enum SymbolStyle {
+    CIRCLE = 'circle',
+    PATH = 'path',
+    CLOSED_PATH = 'closedPath'
+  }
+
+  /**
+   * Classes
+   */
+    // KVO
+  export class KVO {
+    constructor();
+    addListener(eventName: any, listener: Function): naver.maps.MapEventListener;
+    addListenerOnce(eventName: string | any, listener: Function): naver.maps.MapEventListener;
+    bindTo(key: string, target: naver.maps.KVO, targetKey?: string): void;
+    clearListeners(eventName: string): void;
+    get(key: string): any;
+    hasListener(eventName: string): boolean;
+    removeListener(listeners: naver.maps.MapEventListener | MapEventListener[]): void;
+    set(key: string, value: any, silently?: boolean): void;
+    setValues(properties: object): void;
+    trigger(eventName: string, eventObject?: any): void;
+    unbind(key: string): void;
+    unbindAll(): void;
+  }
+  export class KVOArray extends naver.maps.KVO {
+    constructor(array: any[]);
+    clear(): void;
+    forEach(callback: (element: any, index: number) => void): void;
+    getArray(): any[];
+    getAt(index: number): any;
+    getIndexOfElement(element: any): number;
+    getLength(): number;
+    insertAt(index: number, element: any): void;
+    pop(): any;
+    push(element: any): number;
+    removeAt(index: number): any;
+    removeElement(element: any): void;
+    setAt(index: number, element: any): void;
+    splice(startIndex: number, deleteCount: number, element?: any): any[];
+  }
+  // Base
+  export class Point {
+    constructor(x: number, y: number);
+    add(point: naver.maps.Coord | naver.maps.PointLiteral): naver.maps.Point;
+    add(x: number, y: number): naver.maps.Point;
+    ceil(): naver.maps.Point;
+    clone(): naver.maps.Point;
+    div(point: naver.maps.Coord | naver.maps.PointLiteral);
+    div(x: number, y: number): naver.maps.Point;
+    equals(point: naver.maps.Point): boolean;
+    floor(): naver.maps.Point;
+    mul(point: naver.maps.Coord | naver.maps.PointLiteral): naver.maps.Point;
+    mul(x: number, y: number): naver.maps.Point;
+    round(): naver.maps.Point;
+    sub(point: naver.maps.Coord | naver.maps.PointLiteral): naver.maps.Point;
+    sub(x: number, y: number): naver.maps.Point;
+    toString(): string;
+  }
+  export class Size {
+    constructor(width: number, height: number);
+    add(size: naver.maps.Size | naver.maps.SizeLiteral): naver.maps.Size;
+    add(width: number, height: number): naver.maps.Size;
+    ceil(): naver.maps.Size;
+    clone(): naver.maps.Size;
+    div(width: number, height: number): naver.maps.Size;
+    div(size: naver.maps.Size | naver.maps.SizeLiteral): naver.maps.Size;
+    equals(size: naver.maps.Size | naver.maps.SizeLiteral): boolean;
+    floor(): naver.maps.Size;
+    mul(size: naver.maps.Size | naver.maps.SizeLiteral): naver.maps.Size;
+    mul(width: number, height: number): naver.maps.Size;
+    round(): naver.maps.Size;
+    sub(size: naver.maps.Size | naver.maps.SizeLiteral): naver.maps.Size;
+    sub(width: number, height: number): naver.maps.Size;
+    toString(): string;
+  }
+  export class PointBounds {
+    constructor(minPoint: naver.maps.Point, maxPoint: naver.maps.Point);
+    static bounds(point: naver.maps.Coord | naver.maps.PointLiteral,
+                  pointN: naver.maps.Coord | naver.maps.PointLiteral): naver.maps.PointBounds;
+    clone(): naver.maps.PointBounds;
+    equals(bounds: naver.maps.Bounds | naver.maps.PointBoundsLiteral): boolean;
+    extend(point: naver.maps.Coord | naver.maps.PointLiteral): naver.maps.PointBounds;
+    getCenter(): naver.maps.Point;
+    getMax(): naver.maps.Point;
+    getMin(): naver.maps.Point;
+    hasBounds(bounds: naver.maps.Bounds | naver.maps.PointBoundsLiteral): boolean;
+    hasPoint(point: naver.maps.Coord | naver.maps.PointLiteral): boolean;
+    intersects(bounds: naver.maps.Bounds | naver.maps.PointBoundsLiteral): boolean;
+    maxX(): number;
+    maxY(): number;
+    minX(): number;
+    minY(): number;
+    toString(): string;
+    union(bounds: naver.maps.Bounds | naver.maps.PointBoundsLiteral): naver.maps.PointBounds;
+  }
+  export class LatLng extends Point {
+    constructor(lat: number, lng: number);
+    clone(): naver.maps.LatLng;
+    destinationPoint(angle: number, meter: number): naver.maps.LatLng;
+    equals(point: naver.maps.Coord | naver.maps.LatLngLiteral): boolean;
+    lat(): number;
+    lng(): number;
+    toPoint(): naver.maps.Point;
+    toString(): string;
+  }
+  export class LatLngBounds extends PointBounds {
+    constructor(sw: naver.maps.LatLng, ne: naver.maps.LatLng);
+    static bounds(latlng: naver.maps.Coord | naver.maps.LatLngLiteral,
+                  latlngN: naver.maps.Coord | naver.maps.LatLngLiteral): naver.maps.LatLngBounds;
+    clone(): naver.maps.LatLngBounds;
+    east(): number;
+    equals(bounds: naver.maps.Bounds | naver.maps.LatLngBoundsLiteral): boolean;
+    extend(latlng: naver.maps.Coord | naver.maps.LatLngLiteral): naver.maps.LatLngBounds;
+    getCenter(): naver.maps.LatLng;
+    getNE(): naver.maps.LatLng;
+    getSW(): naver.maps.LatLng;
+    hasLatLng(latlng: naver.maps.Coord | naver.maps.LatLngLiteral): boolean;
+    intersects(bounds: naver.maps.Bounds | naver.maps.LatLngBoundsLiteral): boolean;
+    north(): number;
+    south(): number;
+    toPointBounds(): naver.maps.PointBounds;
+    union(bounds: naver.maps.Bounds | naver.maps.LatLngBoundsLiteral): naver.maps.LatLngBounds;
+    west(): number;
+  }
+  // Map
+  export class Map {
+    controls: any;
+    data: any;
+    layers: any;
+    mapTypes: any;
+    mapSystemProjection: any;
+    constructor(mapDiv: string, mapOptions: MapOptions);
+    addPane(name: string, elementOrIndex: HTMLElement | number): void;
+    destory(): void;
+    fitBounds(bounds: any, margin: any): void;
+    getBounds(): any;
+    getSize(): any;
+  }
+  // Map.Tile
+  export class Tile extends naver.maps.KVO {
+    constructor(element: HTMLElement, tileOptions?: naver.maps.TileOptions);
+    appendTo(parentNode: HTMLElement): void;
+    cancelFadeIn(): void;
+    destroy(): void;
+    fadeIn(callback: Function, startOpacity?: number): void;
+    getElement(): HTMLElement;
+    getOffset(): naver.maps.Point;
+    getOpacity(): number;
+    getSize(): naver.maps.Size;
+    getTileIndex(): naver.maps.TileIndex;
+    getZIndex(): number;
+    hide(): void;
+    load(tileOptions?: naver.maps.TileOptions): void;
+    remove(): void;
+    reset(mapType: naver.maps.MapType, zoom: number, tileOptions?: naver.maps.TileOptions): void;
+    setBlank(): void;
+    setOffset(offset: naver.maps.Point): void;
+    setOffset(x: number, y: number): void;
+    setOpacity(opacity: number): void;
+    setSize(size: naver.maps.Size): void;
+    setTileIndex(tileIndex: naver.maps.TileIndex): void;
+    setZIndex(zIndex: number): void;
+    show(): void;
+
+  }
+  export class CanvasTile extends naver.maps.Tile {
+    constructor(canvasTileOptions: naver.maps.CanvasTileOptions);
+  }
+  export class ImageTile extends naver.maps.Tile {
+    constructor(imageTileOptions: naver.maps.ImageTileOptions);
+    getImageElements(): HTMLElement[];
+    getUrls(): string[];
+    setUrls(urls: string[]): void;
+  }
+  // Map.MapType
+  export class CanvasMapType implements naver.maps.MapType {
+    maxZoom: number;
+    minZoom: number;
+    name: string;
+    projection: naver.maps.Projection;
+    tileSize: naver.maps.Size;
+    constructor(canvasMapTypeOptions: naver.maps.CanvasMapTypeOptions);
+    getMapTypeOptions(): naver.maps.CanvasMapTypeOptions;
+    getMaxZoom(): number;
+    getMinZoom(): number;
+    getName(): string;
+    getTile(x: number, y: number, z: number): naver.maps.CanvasTile;
+    getTileData(x: number, y: number, z: number): ImageData;
+    setMapTypeOptions(canvasMapTypeOptions: naver.maps.CanvasMapTypeOptions): void;
+  }
+  export class ImageMapType implements naver.maps.MapType {
+    maxZoom: number;
+    minZoom: number;
+    name: string;
+    projection: naver.maps.Projection;
+    tileSize: naver.maps.Size;
+    constructor(imageMapTypeOptions);
+    getMapTypeOptions(): naver.maps.ImageMapTypeOptions;
+    getMaxZoom(): number;
+    getMinZoom(): number;
+    getName(): string;
+    getTile(x: number, y: number, z: number): naver.maps.ImageTile;
+    getTileUrls(x: number, y: number, z: number): string[];
+    setMapTypeOptions(imageMapTypeOptions: naver.maps.ImageMapTypeOptions): void;
+  }
+  export class MapTypeRegistry extends naver.maps.KVO {
+    constructor(mapTypeInfo: object, defaultMapTypeId?: string);
+    getPreviousTypeId(): string;
+    getSelectedType(): naver.maps.MapType;
+    getSelectedTypeId(): string;
+    getTypeIds(): string[];
+    set(mapTypeId: string, mapType: naver.maps.MapType): void;
+    setSelectedTypeId(mapTypeId: string): void;
+  }
+  // Map.MapType.Preset
+  export class NaverMapTypeOption {
+    constructor(options: naver.maps.NaverImageMapTypeOptions);
+    static getBicycleLayer(opts: naver.maps.NaverImageMapTypeOptions): naver.maps.ImageMapType;
+    static getBlankMap(opts: naver.maps.NaverImageMapTypeOptions): naver.maps.ImageMapType;
+    static getCadastralLayer(opts?: naver.maps.NaverImageMapTypeOptions): naver.maps.ImageMapType;
+    static getHybridMap(opts?: naver.maps.NaverImageMapTypeOptions): naver.maps.ImageMapType;
+    static getMapTypes(opts?: naver.maps.NaverImageMapTypeOptions): naver.maps.MapTypeRegistry;
+    static getNormalLabelLayer(opts?: naver.maps.NaverImageMapTypeOptions): naver.maps.ImageMapType;
+    static getNormalMap(opts?: naver.maps.NaverImageMapTypeOptions): naver.maps.ImageMapType;
+    static getSatelliteLabelLayer(opts?: naver.maps.NaverImageMapTypeOptions): naver.maps.ImageMapType;
+    static getSatelliteMap(opts?: naver.maps.NaverImageMapTypeOptions): naver.maps.ImageMapType;
+    static getStreetLayer(opts?: naver.maps.NaverImageMapTypeOptions): naver.maps.ImageMapType;
+    static getTerrainMap(opts?: naver.maps.NaverImageMapTypeOptions): naver.maps.ImageMapType;
+    static getTrafficLayer(opts?: naver.maps.NaverImageMapTypeOptions): naver.maps.ImageMapType;
+    static getVectorMap(opts?: naver.maps.NaverImageMapTypeOptions): naver.maps.ImageMapType;
+    static getWorldMap(opts?: naver.maps.NaverImageMapTypeOptions): naver.maps.ImageMapType;
+  }
+  // Control
+  export class CustomControl extends naver.maps.KVO {
+    constructor(html: string, ControlOptions: naver.maps.ControlOptions);
+    getElement(): HTMLElement;
+    getMap(): naver.maps.Map | null;
+    getOptions(key?: string): any;
+    html(html?: string): string | undefined;
+    setMap(map?: naver.maps.Map | null): void;
+    setOptions(newOptions: naver.maps.ControlOptions): void;
+    setPosition(position: naver.maps.Position): void;
+  }
+  // Naver Controls
+  export class LogoControl extends naver.maps.CustomControl {
+    constructor(LogoControlOptions: naver.maps.LogoControlOptions);
+  }
+  export class MapDataControl extends naver.maps.CustomControl {
+    constructor(MapDataControlOptions);
+  }
+  export class MapTypeControl extends naver.maps.CustomControl {
+    constructor(MapTypeControlOptions: naver.maps.MapTypeControlOptions);
+  }
+  export class ScaleControl extends naver.maps.CustomControl {
+    constructor(ScaleControlOptions: naver.maps.ScaleControlOptions);
+  }
+  export class ZoomControl extends naver.maps.CustomControl {
+    constructor(ZoomControlOptions);
+  }
+  // Layer
+  export class Layer extends naver.maps.KVO {
+    constructor(name: string, MapTypeRegistry: naver.maps.MapTypeRegistry, options: naver.maps.LayerOptions);
+    getLayerType(): naver.maps.MapType;
+    getLayerTypeId(): string;
+    getMap(): naver.maps.Map | null;
+    getOpacity(): number;
+    getPaneElement(): HTMLElement;
+    refresh(noEffect?: boolean): void;
+    setLayerTypeId(typeId: string): void;
+    setMap(map: naver.maps.Map | null): void;
+    setOpacity(opacity: number): void;
+  }
+  // Naver Layers
+  export class LabelLayer extends naver.maps.Layer {
+    constructor(name: string, registry: naver.maps.ImageMapType, option: object);
+  }
+  export class CadastralLayer extends naver.maps.LabelLayer {
+    name: string;
+    constructor(option?: naver.maps.CadastralLayerOptions);
+  }
+  export class StreetLayer extends naver.maps.LabelLayer {
+    name: string;
+    constructor(option?: naver.maps.StreetLayerOptions);
+  }
+  export class TrafficLayer extends naver.maps.LabelLayer {
+    name: string;
+    constructor(option?: naver.maps.TrafficLayerOptions);
+    endAutoRefresh(): void;
+    startAutoRefresh(): void;
+  }
+  // Data Layer
+  export class Data extends naver.maps.KVO {
+    constructor();
+    addFeature(feature: naver.maps.Feature, autoStyle: boolean): void;
+    addGeoJson(geojson: naver.maps.GeoJSON, autoStyle: boolean): void;
+    addGpx(xmlDoc: naver.maps.GPX, autoStyle: boolean): void;
+    addKml(xmlDoc: naver.maps.KML, autoStyle: boolean): void;
+    forEach(callback: (feature: naver.maps.Feature, index: number) => void): void;
+    getAllFeature(): naver.maps.Feature[];
+    getFeatureById(id: string | number): naver.maps.Feature;
+    getMap(): naver.maps.Map | null;
+    getStyle(): naver.maps.StyleOptions | naver.maps.StylingFunction;
+    overrideStyle(feature: naver.maps.Feature, style: naver.maps.StyleOptions): void;
+    removeFeature(feature: naver.maps.Feature): void;
+    removeGeoJson(geojson: naver.maps.GeoJSON): void;
+    revertStyle(feature: naver.maps.Feature): void;
+    setMap(map: naver.maps.Map | null): void;
+    setStyle(style: naver.maps.StyleOptions | naver.maps.StylingFunction): void;
+    toGeoJson(): naver.maps.GeoJSON;
+  }
+  export class Feature extends naver.maps.KVO {
+    constructor(rawFeature: object);
+    forEachOverlay(callback: naver.maps.forEachOverlayCallback): void;
+    getBounds(): naver.maps.Bounds;
+    getGeometries(): naver.maps.Geometry[];
+    getId(): string;
+    getOverlays(): naver.maps.Marker[] | naver.maps.Polyline[] | naver.maps.Polygon[];
+    getProperty(name: string): any;
+    getRaw(): naver.maps.GeoJSON;
+    setProperty(name: string, value: any): void;
+    setStyle(styleOptions: naver.maps.StyleOptions); // naver.maps.Data.StyleOptions
+  }
+  export class Geometry extends naver.maps.KVO {
+    constructor(rawGeometry: object);
+    getCoords(): naver.maps.ArrayOfCoords;
+    getType(): string;
+  }
+  // Overlay
+  export abstract class OverlayView extends naver.maps.KVO {
+    draw(): void;
+    getContainerTopLeft(): naver.maps.Point;
+    getMap(): naver.maps.Map | null;
+    getPanes(): naver.maps.MapPanes;
+    getProjection(): naver.maps.MapSystemProjection;
+    abstract onAdd(): any;
+    abstract onRemove(): any;
+    setMap(map: naver.maps.Map | null): void;
+  }
+  // Naver Overlays
+  export abstract class Circle extends naver.maps.OverlayView {
+    constructor(options?: naver.maps.CircleOptions);
+    getAreaSize(): number;
+    getBounds(): naver.maps.Bounds;
+    getCenter(): naver.maps.Coord;
+    getClickable(): boolean;
+    getDrawingRect(): naver.maps.Bounds;
+    getOptions(key?: string): naver.maps.CircleOptions | any;
+    getRadius(): number;
+    getStyles(key: string): naver.maps.CircleOptions | any;
+    getVisible(): boolean;
+    getZIndex(): number;
+    setCenter(center): naver.maps.Coord | naver.maps.CoordLiteral;
+    setClickable(clickable: boolean): void;
+    setOptions(key: string, value: any): void;
+    setOptions(options: naver.maps.CircleOptions): void;
+    setRadius(radius: number): void;
+    setStyles(key: string, value: string): void;
+    setStyles(options: naver.maps.CircleOptions): void;
+    setVisible(visible: boolean): void;
+    setZIndex(zIndex: number): void;
+  }
+  export abstract class Ellipse extends naver.maps.OverlayView {
+    constructor();
+    getAreaSize(): number;
+    getBounds(): naver.maps.Bounds;
+    getClickable(): boolean;
+    getDrawingRect(): naver.maps.Bounds;
+    getOptions(key?: string): naver.maps.EllipseOptions | any;
+    getStyles(key?: string): naver.maps.EllipseOptions | any;
+    getVisible(): boolean;
+    getZIndex(): number;
+    setBounds(bounds: naver.maps.Bounds | naver.maps.BoundsLiteral): void;
+    setOptions(options: naver.maps.EllipseOptions): void;
+    setOptions(key: string, value: any): void;
+    setStyles(options: naver.maps.EllipseOptions): void;
+    setStyles(key: string, value: any): void;
+    setVisible(visible: boolean): void;
+    setZIndex(zIndex: number): void;
+  }
+  export abstract class GroundOverlay extends naver.maps.OverlayView {
+    constructor(url: string, bounds: naver.maps.Bounds | naver.maps.BoundsLiteral, options?: naver.maps.GroundOverlayOptions);
+    getBounds(): naver.maps.Bounds;
+    getOpacity(): number;
+    getUrl(): string;
+    setOpacity(opacity: number): void;
+  }
+  export abstract class InfoWindow extends naver.maps.OverlayView {
+    constructor(options: naver.maps.InfoWindowOptions);
+    close(): void;
+    getContent(): HTMLElement;
+    getOptions(key?: string): naver.maps.InfoWindowOptions;
+    getPosition(): naver.maps.Coord;
+    getZIndex(): number;
+    open(map: naver.maps.Map, anchor: naver.maps.Coord | naver.maps.CoordLiteral | naver.maps.Marker	): void;
+    setContent(content: string | HTMLElement): void;
+    setOptions(options: naver.maps.InfoWindowOptions): void;
+    setPosition(position: naver.maps.Coord | naver.maps.CoordLiteral): void;
+    setZIndex(zIndex: number): void;
+  }
+  export abstract class Marker extends naver.maps.OverlayView {
+    constructor(options: MarkerOptions);
+    abstract draw(): void;
+    getAnimation(): naver.maps.Animation;
+    getClickable(): boolean;
+    getCursor(): string;
+    getDraggable(): boolean;
+    getDrawingRect(): naver.maps.Bounds;
+    getIcon(): naver.maps.ImageIcon | naver.maps.SymbolIcon | naver.maps.HtmlIcon;
+    getOptions(key?: string): naver.maps.MarkerOptions;
+    getPosition(): naver.maps.Coord;
+    getShape(): naver.maps.MarkerShape;
+    getTitle(): string;
+    getVisible(): boolean;
+    getZIndex(): number;
+    abstract onAdd(): void;
+    abstract onRemove(): void;
+    setAnimation(animation: naver.maps.Animation): void;
+    setClickable(clickable: boolean): void;
+    setCursor(cursor: string): void;
+    setDraggable(draggable: boolean): void;
+    setIcon(icon: string | naver.maps.ImageIcon | naver.maps.SymbolIcon | naver.maps.HtmlIcon): void;
+    setOptions(options: naver.maps.MarkerOptions): void;
+    setPosition(position: naver.maps.Coord | naver.maps.CoordLiteral): void;
+    setShape(shape: naver.maps.MarkerShape): void;
+    setTitle(title: string): void;
+    setVisible(visible: boolean): void;
+    setZIndex(zIndex: number): void;
+  }
+  export abstract class Polygon extends naver.maps.OverlayView {
+    constructor(options?: naver.maps.PolygonOptions);
+    getAreaSize(): number;
+    getBounds(): naver.maps.Bounds;
+    getClickable(): boolean;
+    getDrawingRect(): naver.maps.Bounds;
+    getOptions(key?: string): naver.maps.PolygonOptions | any;
+    getPath(): naver.maps.ArrayOfCoords | naver.maps.KVOArrayOfCoords;
+    getPaths(): ArrayOfCoords[] | KVOArrayOfCoords[];
+    getStyles(key?: string): naver.maps.PolygonOptions | any;
+    getVisible(): boolean;
+    getZIndex(): number;
+    setClickable(clickable: boolean): void;
+    setOptions(key: string, value: any): void;
+    setOptions(options: naver.maps.PolygonOptions): void;
+    setPath(path: naver.maps.ArrayOfCoords | naver.maps.KVOArrayOfCoords | naver.maps.ArrayOfCoordsLiteral): void;
+    setPaths(paths: naver.maps.ArrayOfCoords[] | naver.maps.ArrayOfCoordsLiteral | any): void; // TODO. KVOArray.<KVOArrayOfCoords>
+    setStyles(key: string, value: any): void;
+    setStyles(options: naver.maps.PolygonOptions): void;
+    setVisible(visible: boolean): void;
+    setZIndex(zIndex: number): void;
+  }
+  export abstract class Polyline extends naver.maps.OverlayView {
+    constructor(options?: naver.maps.PolylineOptions);
+    getBounds(): naver.maps.Bounds;
+    getClickable(): boolean;
+    getDistance(): number;
+    getDrawingRect(): naver.maps.Bounds;
+    getOptions(key?: string): naver.maps.PolylineOptions | any;
+    getPath(): naver.maps.ArrayOfCoords | naver.maps.KVOArrayOfCoords;
+    getStyles(key?: string): naver.maps.PolylineOptions | any;
+    getVisible(): boolean;
+    getZIndex(): number;
+    setClickable(clickable: boolean): void;
+    setOptions(key: string, value: any): void;
+    setOptions(options: naver.maps.PolylineOptions): void;
+    setPath(path: naver.maps.ArrayOfCoords | naver.maps.KVOArrayOfCoords | naver.maps.ArrayOfCoordsLiteral): void;
+    setStyles(key: string, value: any): void;
+    setStyles(options: naver.maps.PolylineOptions): void;
+    setVisible(visible: boolean): void;
+    setZIndex(zIndex: number): void;
+  }
+  export abstract class Rectangle extends naver.maps.OverlayView {
+    constructor(options?: naver.maps.RectangleOptions);
+    getAreaSize(): number;
+    getBounds(): naver.maps.Bounds;
+    getClickable(): boolean;
+    getDrawingRect(): naver.maps.Bounds;
+    getOptions(key?: string): naver.maps.RectangleOptions | any;
+    getStyles(key?: string): naver.maps.RectangleOptions | any;
+    getVisible(): boolean;
+    getZIndex(): number;
+    setBounds(bounds: naver.maps.Bounds | naver.maps.BoundsLiteral): void;
+    setClickable(clickable: boolean): void;
+    setOptions(options: naver.maps.RectangleOptions): void;
+    setOptions(key: string, value: any): void;
+    setStyles(key: string, value: any): void;
+    setStyles(options: naver.maps.RectangleOptions): void;
+    setVisible(visible: boolean): void;
+    setZIndex(zIndex: number): void;
+  }
+
+  // Sub module: panorama
+  export class PanoramaProjection extends naver.maps.KVO {
+    fromCoordToPov(coord: naver.maps.LatLng): naver.maps.PanoramaPov;
+  }
+  export class Panorama extends naver.maps.KVO {
+    constructor(panoramaDiv: string | HTMLElement, panoramaOptions: naver.maps.PanoramaOptions);
+    getLocation(): naver.maps.PanoramaLocation;
+    getMaxScale(): number;
+    getMaxZoom(): number;
+    getMinScale(): number;
+    getMinZoom(): number;
+    getPanoId(): string;
+    getPosition(): naver.maps.LatLng;
+    getPov(): naver.maps.PanoramaPov;
+    getProjection(): naver.maps.PanoramaProjection;
+    getScale(): number;
+    getSize(): naver.maps.Size;
+    getVisible(): boolean;
+    getZoom(): number;
+    setOptions(key: string, value: any);
+    setOptions(newOptions: naver.maps.PanoramaOptions | object);
+    setPanoId(panoId: string): void;
+    setPanoIdWithPov(panoId: string, pov: naver.maps.PanoramaPov): void;
+    setPosition(position: naver.maps.LatLng | naver.maps.LatLngLiteral): void;
+    setPov(pov: naver.maps.PanoramaPov): void;
+    setScale(scale: number): void;
+    setSize(size: naver.maps.Size | naver.maps.SizeLiteral): void;
+    setVisible(visible: boolean): void;
+    setZoom(zoom: number): void;
+    zoomIn(): void;
+    zoomOut(): void;
+  }
+  export class FlightSpot extends naver.maps.KVO {
+    constructor();
+    getMap(): naver.maps.Map | null;
+    setMap(map: naver.maps.Map | null): void;
+  }
+  export class AroundControl extends naver.maps.CustomControl {
+    constructor(aroundControlOptions: AroundControlOptions);
+  }
+
+  // Sub module: drawing
+  export module drawing {
+    export interface DrawingOptions {
+      map?: naver.maps.Map;
+      drawingControl?: naver.maps.drawing.DrawingMode[];
+      drawingControlOptions?: naver.maps.drawing.drawingControlOptions;
+      drawingMode?: naver.maps.drawing.DrawingMode;
+      controlPointOptions?: naver.maps.drawing.controlPointOptions;
+      rectangleOptions?: naver.maps.RectangleOptions;
+      ellipseOptions?: naver.maps.EllipseOptions;
+      polylineOptions?: naver.maps.PolylineOptions;
+      arrowlineOptions?: naver.maps.PolylineOptions;
+      polygonOptions?: naver.maps.PolygonOptions;
+      markerOptions?: naver.maps.MarkerOptions;
+    }
+    type drawingControlOptions = DrawingControlOptions;
+    export interface DrawingControlOptions {
+      position?: naver.maps.Position;
+      style?: naver.maps.drawing.DrawingStyle;
+    }
+    type controlPointOptions = ControlPointOptions;
+    export interface ControlPointOptions {
+      anchorPointOptions: naver.maps.CircleOptions;
+      midPointOptions: naver.maps.CircleOptions;
+    }
+    export interface DrawingOverlay {
+      id: string;
+      name: string;
+      setEditable: (editable: boolean, controlPointOptions?: naver.maps.drawing.controlPointOptions) => void;
+    }
+    export enum DrawingStyle {
+      HORIZONTAL = 0,
+      VERTICAL,
+      HORIZONTAL_2,
+      VERTICAL_2
+    }
+    export enum DrawingMode {
+      HAND = 0,
+      RECTANGLE,
+      ELLIPSE,
+      POLYLINE,
+      ARROWLINE,
+      POLYGON,
+      MARKER
+    }
+    export enum DrawingEvent {
+      ADD,
+      REMOVE,
+      SELECT,
+      Added,
+      Removed,
+      Selected
+    }
+    export class DrawingManager extends naver.maps.KVO {
+      constructor(options?: naver.maps.drawing.DrawingOptions);
+      addDrawing(overlay: naver.maps.drawing.DrawingOverlay, drawingMode: naver.maps.drawing.DrawingMode, id?: string): void;
+      addListener(eventName: naver.maps.drawing.DrawingEvent,
+                  listener: (overlay: naver.maps.drawing.DrawingOverlay) => void): naver.maps.MapEventListener;
+      destroy(): void;
+      getDrawing(id: string): naver.maps.drawing.DrawingOverlay;
+      getDrawings(): object;
+      getMap(): naver.maps.Map | null;
+      setMap(map: naver.maps.Map | null): void;
+      toGeoJson(): object;
+    }
+  }
+
+  // Sub module: visualization
+  export module visualization {
+    export interface DotMapOptions {
+      map: naver.maps.Map;
+      data: naver.maps.LatLng[] | naver.maps.PointArrayLiteral[] | naver.maps.visualization.WeightedLocation[];
+      opacity?: number;
+      radius?: number;
+      strokeWeight?: number;
+      strokeColor?: string;
+      strokeLineCap?: naver.maps.strokeLineCapType;
+      strokeLineJoin?: naver.maps.strokeLineJoinType;
+      fillColor?: string;
+    }
+    export interface HeatMapOptions {
+      map: naver.maps.Map;
+      data: naver.maps.LatLng[] | naver.maps.PointArrayLiteral[] | naver.maps.visualization.WeightedLocation[];
+      opacity?: number;
+      radius?: number;
+      colorMap?: naver.maps.visualization.SpectrumStyle;
+    }
+    export enum SpectrumStyle {
+      JET,
+      HSV,
+      HOT,
+      COOL,
+      GREYS,
+      YIGnBu,
+      YIOrRd,
+      RdBu,
+      RAINBOW,
+      PORTLAND,
+      OXYGEN
+    }
+    export class DotMap extends naver.maps.KVO {
+      constructor(dotMapOptions?: naver.maps.visualization.DotMapOptions);
+      addDrawing(overlay: naver.maps.drawing.DrawingOverlay, drawingMode: naver.maps.drawing.DrawingMode, id?: string): void;
+      addListener(eventName: naver.maps.drawing.DrawingEvent,
+                  listener: (overlay: naver.maps.drawing.DrawingOverlay) => void): naver.maps.MapEventListener;
+      destroy(): void;
+      getDrawing(id: string): naver.maps.drawing.DrawingOverlay;
+      getDrawings(): object;
+      getMap(): naver.maps.Map | null;
+      setMap(map: naver.maps.Map | null): void;
+      toGeoJson(): object;
+    }
+    export class HeatMap {
+      constructor(heatMapOptions?: naver.maps.visualization.HeatMapOptions);
+      getColorMap(): naver.maps.visualization.SpectrumStyle;
+      getData(): naver.maps.LatLng[] | naver.maps.PointArrayLiteral[];
+      getMap(): naver.maps.Map | null;
+      getOptions(key?: string): naver.maps.visualization.HeatMapOptions | any;
+      redraw(): void;
+      setColorMap(colormap: naver.maps.visualization.SpectrumStyle, inReverse: boolean): void;
+      setData(data: naver.maps.LatLng[] | naver.maps.PointArrayLiteral[]): void;
+      setMap(map: naver.maps.Map | null): void;
+      setOptions(key: string, value: any): void;
+      setOptions(options: naver.maps.visualization.HeatMapOptions): void;
+    }
+    export class WeightedLocation {
+      constructor(lat: number, lng: number, weight?: number);
+      clone(): naver.maps.visualization.WeightedLocation;
+      getLocation(): naver.maps.LatLng;
+      getWeight(): number;
+      lat(): number;
+      lng(): number;
+      toString(): string;
+    }
+  }
+
+  // Sub module: geocoder
+  export module Service {
+    export interface ServiceOptions {
+      encoding?: any;
+      coordType?: any;
+    }
+    export interface GeocodeServiceOptions extends ServiceOptions {
+      address?: string;
+    }
+    export interface ReverseServiceOptions extends ServiceOptions {
+      location?: Coord | CoordLiteral;
+    }
+    export interface AddressItem {
+      address: string;
+      addrdetail: {
+        country: string;
+        sido: string;
+        sigugun: string;
+        dongmyun: string;
+        rest: string;
+      };
+    }
+    export interface GeocodeResponse {
+      result: {
+        userquery: object;
+        total: number;
+        items: naver.maps.Service.AddressItem[];
+      };
+    }
+    export interface ReverseGeocodeResponse {
+      result: {
+        userquery: string;
+        total: number;
+        items: naver.maps.Service.AddressItem[];
+      };
+    }
+    export enum CoordType {
+      LATLNG = 'latlng',
+      TM128 = 'tm128'
+    }
+    export enum Encoding {
+      UTF_8 = 'utf-8',
+      EUC_KR = 'euc-kr'
+    }
+    export enum Status {
+      OK = 200,
+      ERROR = 500
+    }
+
+    function fromAddrToCoord();
+    function fromCoordToAddr();
+    function geocode(options: naver.maps.Service.GeocodeServiceOptions,
+                     callback?: (status: naver.maps.Service.Status, response: naver.maps.Service.GeocodeResponse) => void);
+    function reverseGeocode(options: naver.maps.Service.ReverseServiceOptions,
+                            callback?: (status: naver.maps.Service.Status, response: naver.maps.Service.ReverseGeocodeResponse) => void);
+  }
+
+  export module TransCoord {
+    function fromEPSG3857ToLatLng(coord: naver.maps.Point): naver.maps.LatLng;
+    function fromEPSG3857ToNaver(coord: naver.maps.Point): naver.maps.Point;
+    function fromEPSG3857ToTM128(coord: naver.maps.Point): naver.maps.Point;
+    function fromEPSG3857ToUTMK(coord: naver.maps.Point): naver.maps.Point;
+    function fromLatLngToEPSG3857(latlng: naver.maps.Coord): naver.maps.Point;
+    function fromLatLngToNaver(latlng: naver.maps.Coord): naver.maps.Point;
+    function fromLatLngToTM128(latlng: naver.maps.Coord): naver.maps.Point;
+    function fromLatLngToUTMK(latlng: naver.maps.Coord): naver.maps.Point;
+    function fromNaverToEPSG3857(n: naver.maps.Point): naver.maps.Point;
+    function fromNaverToLatLng(n: naver.maps.Point): naver.maps.LatLng;
+    function fromNaverToTM128(n: naver.maps.Point): naver.maps.Point;
+    function fromNaverToUTMK(n: naver.maps.Point): naver.maps.Point;
+    function fromTM128ToEPSG3857(tm128: naver.maps.Point): naver.maps.Point;
+    function fromTM128ToLatLng(tm128: naver.maps.Point): naver.maps.LatLng;
+    function fromTM128ToNaver(tm128: naver.maps.Point): naver.maps.Point;
+    function fromTM128ToUTMK(tm128: naver.maps.Point): naver.maps.Point;
+    function fromUTMKToEPSG3857(utmk: naver.maps.Point): naver.maps.Point;
+    function fromUTMKToLatLng(utmk: naver.maps.Point): naver.maps.LatLng;
+    function fromUTMKToNaver(utmk: naver.maps.Point): naver.maps.Point;
+    function fromUTMKToTM128(utmk: naver.maps.Point): naver.maps.Point;
+  }
+
+  export module Event {
+    function addDOMListener(element: HTMLElement, eventName: string, listener: Function): void;
+    function addListener(target: object, eventName: string, listener: Function): naver.maps.MapEventListener;
+    function clearInstanceListeners(target: object): void;
+    function clearListeners(target: object, fromEventName: string): void;
+    function forward(source: object, fromEventName: string, target: object, toEventName: string): naver.maps.MapEventListener;
+    function hasListener(target: object, eventName: string): boolean;
+    function once(target: object, eventName: string, listener: Function): naver.maps.MapEventListener;
+    function removeDOMListener(element: HTMLElement, eventName: string, listener: Function): void;
+    function removeDOMListener(listeners: naver.maps.DOMEventListener | naver.maps.DOMEventListener[]): void;
+    function removeListener(listeners: naver.maps.MapEventListener | naver.maps.MapEventListener[]): void;
+    function resumeDispatch(target: object, eventName: string): void;
+    function stopDispatch(target: object, eventName: string): void;
+    function trigger(target: object, eventName: string, eventObject?: any): void;
+  }
+
+  // Projection
+  export module EPSG3857 { // implements naver.maps.Projection
+    function fromCoordToPoint(coord: naver.maps.Coord): naver.maps.Point;
+    function fromLatLngToPoint(latlng: naver.maps.LatLng): naver.maps.Point;
+    function fromPointToCoord(point: naver.maps.Point): naver.maps.LatLng;
+    function fromPointToLatLng(point: naver.maps.Point): naver.maps.LatLng;
+    function getDestinationCoord(fromLatLng: naver.maps.LatLng, angle: number, meter: number): naver.maps.LatLng;
+    function getDistance(latlng1: naver.maps.LatLng, latlng2: naver.maps.LatLng): number;
+  }
+  export class UTMK {
+    name: string;
+    pointPerMeter: number;
+    static fromCoordToPoint(latlng: naver.maps.LatLng): naver.maps.Point;
+    static fromCoordToUTMK(latlng: naver.maps.LatLng): naver.maps.Point;
+    static fromLatLngToPoint(latlng: naver.maps.LatLng): naver.maps.Point;
+    static fromLatLngToUTMK(latlng: naver.maps.LatLng): naver.maps.Point;
+    static fromPointToCoord(point: naver.maps.Point): naver.maps.LatLng;
+    static fromPointToLatLng(point: naver.maps.Point): naver.maps.LatLng;
+    static fromPointToUTMK(point: naver.maps.Point): naver.maps.Point;
+    static fromUTMKToCoord(utmk: naver.maps.Point): naver.maps.LatLng;
+    static fromUTMKToLatLng(utmk: naver.maps.Point): naver.maps.LatLng;
+    static fromUTMKToPoint(utmk: naver.maps.Point): naver.maps.Point;
+    static getDestinationCoord(fromLatLng: naver.maps.LatLng, angle: number, meter: number): naver.maps.LatLng;
+    static getDistance(latlng1: naver.maps.LatLng, latlng2: naver.maps.LatLng): number;
+  }
+  export class UTMK_NAVER { // extends naver.maps.UTMK
+    name: string;
+    pointPerMeter: number;
+    static fromCoordToNaver(latlng: naver.maps.LatLng): naver.maps.Point;
+    static fromLatLngToNaver(latlng: naver.maps.LatLng): naver.maps.Point;
+    static fromNaverToCoord(naverPoint: naver.maps.Point): naver.maps.LatLng;
+    static fromNaverToLatLng(naverPoint: naver.maps.Point): naver.maps.LatLng;
+    static fromNaverToPoint(naverPoint: naver.maps.Point): naver.maps.Point;
+    static fromNaverToUTMK(naverPoint: naver.maps.Point): naver.maps.Point;
+    static fromPointToNaver(point: naver.maps.Point): naver.maps.Point;
+    static fromUTMKToNaver(utmk: naver.maps.Point): naver.maps.Point;
+  }
+  export class EPSG3857Coord {
+    static fromCoordToLatLng(coord: naver.maps.Point): naver.maps.LatLng;
+    static fromCoordToPoint(coord: naver.maps.Point): naver.maps.Point;
+    static fromEPSG3857ToLatLng(coord: naver.maps.Point): naver.maps.LatLng;
+    static fromEPSG3857ToPoint(coord: naver.maps.Point): naver.maps.Point;
+    static fromLatLngToCoord(coord: naver.maps.Coord): naver.maps.Point;
+    static fromLatLngToEPSG3857(coord: naver.maps.Coord): naver.maps.Point;
+    static fromPointToCoord(point: naver.maps.Point): naver.maps.Point;
+    static fromPointToEPSG3857(point: naver.maps.Point): naver.maps.Point;
+  }
+  export class TM128 { // extends naver.maps.TM128Coord
+    static fromCoordToPoint(latlng: naver.maps.Coord): naver.maps.Point;
+    static fromPointToCoord(point: naver.maps.Point): naver.maps.LatLng;
+  }
+  export class TM128Coord { // extends naver.maps.UTMK
+    static fromCoordToLatLng(tm128: naver.maps.Point): naver.maps.LatLng;
+    static fromCoordToPoint(tm128: naver.maps.Point): naver.maps.Point;
+    static fromLatLngToCoord(latlng: naver.maps.Coord): naver.maps.Point;
+    static fromLatLngToTM128(latlng: naver.maps.Coord): naver.maps.Point;
+    static fromPointToCoord(point: naver.maps.Point): naver.maps.Point;
+    static fromPointToTM128(point: naver.maps.Point): naver.maps.Point;
+    static fromTM128ToLatLng(tm128: naver.maps.Point): naver.maps.LatLng;
+    static fromTM128ToPoint(tm128: naver.maps.Point): naver.maps.Point;
+    static fromTM128ToUTMK(tm128: naver.maps.Point): naver.maps.Point;
+    static fromUTMKToTM128(utmk: naver.maps.Point): naver.maps.Point;
+  }
+  export class UTMK_NAVERCoord { // extends naver.maps.UTMK_NAVER
+    static fromCoordToLatLng(n: naver.maps.Point): naver.maps.LatLng;
+    static fromCoordToPoint(n: naver.maps.Point): naver.maps.Point;
+    static fromLatLngToCoord(latlng: naver.maps.Coord): naver.maps.Point;
+    static fromPointToCoord(point: naver.maps.Point): naver.maps.Point;
+  }
+  export class UTMKCoord { // extends naver.maps.UTMK
+    static fromCoordToLatLng(utmk: naver.maps.Point): naver.maps.LatLng;
+    static fromCoordToPoint(utmk: naver.maps.Point): naver.maps.Point;
+    static fromLatLngToCoord(latlng: naver.maps.Coord): naver.maps.Point;
+    static fromPointToCoord(point: naver.maps.Point): naver.maps.Point;
+  }
+}
diff --git a/navermaps/navermaps-tests.ts b/navermaps/navermaps-tests.ts
new file mode 100644
index 0000000000..a3e84e94a2
--- /dev/null
+++ b/navermaps/navermaps-tests.ts
@@ -0,0 +1,148 @@
+var map = new naver.maps.Map('map');
+map.setMapTypeId(naver.maps.MapTypeId.HYBRID);
+
+
+var jeju = new naver.maps.LatLng(33.3590628, 126.534361);
+
+map.setCenter(jeju); // 중심 좌표 이동
+map.setZoom(13);     // 줌 레벨 변경
+
+var seoul = new naver.maps.LatLngBounds(
+    new naver.maps.LatLng(37.42829747263545, 126.76620435615891),
+    new naver.maps.LatLng(37.7010174173061, 127.18379493229875));
+
+map.fitBounds(seoul); // 좌표 경계 이동
+
+map.panBy(new naver.maps.Point(10, 10)); // 우측 하단으로 10 픽셀 이동
+
+var map = new naver.maps.Map('map', {
+    mapTypeId: naver.maps.MapTypeId.HYBRID
+});
+
+var registry = new naver.maps.MapTypeRegistry();
+
+var map = new naver.maps.Map('map', {
+    mapTypes: registry,
+    mapTypeId: naver.maps.MapTypeId.SATELLITE
+});
+
+map.mapTypes.set(naver.maps.MapTypeId.SATELLITE, naver.maps.NaverMapTypeOption.getSatelliteMap());
+map.mapTypes.set(naver.maps.MapTypeId.HYBRID, naver.maps.NaverMapTypeOption.getHybridMap());
+
+map.setMapTypeId(naver.maps.MapTypeId.NORMAL); // error thrown
+
+var MyMapType = {
+    name: "Alphabet",
+    minZoom: 0,
+    maxZoom: 22,
+    projection: naver.maps.EPSG3857,
+    tileSize: new naver.maps.Size(50, 50),
+    getTile: function(x, y, z) {
+        var w = this.tileSize.width,
+            h = this.tileSize.height;
+
+        var ascii = parseInt(Math.abs(x + y) % 26, 10) + 65;
+        alphabet = String.fromCharCode(ascii);
+        var tile = document.createElement('div');
+
+        tile.style.width = w +'px';
+        tile.style.height = w +'px';
+
+        return tile;
+    }
+};
+
+var map = new naver.maps.Map('map', {
+    center: new naver.maps.LatLng(37.3595704, 127.105399),
+    zoom: 10,
+    mapTypeId: 'mine',
+    mapTypes: new naver.maps.MapTypeRegistry({
+        'mine': MyMapType
+    }),
+    mapTypeControl: true,
+    mapTypeControlOptions: {
+        style: naver.maps.MapTypeControlStyle.DROPDOWN
+    }
+});
+
+var GTA5MapTypeOption = function(name, type) {
+    this.name = name;
+    this.type = type;
+};
+GTA5MapTypeOption.prototype = {
+    constructor: GTA5MapTypeOption,
+
+    name: '',
+    type: '',
+    projection: naver.maps.EPSG3857,
+    minZoom: 1,
+    maxZoom: 6,
+    tileSize: new naver.maps.Size(256, 256),
+    TRANSPARENT_URL: 'http://static.naver.net/maps/dot.gif',
+    tileRanges: [1, 2, 4, 8, 16, 32],
+
+    getName: function() {
+        return this.name;
+    },
+
+    getTileUrl: function(x, y, z) {
+        var tileRange = this.tileRanges[z - 1];
+
+        if ((x >=0 && x < tileRange) && (y >=0 && y < tileRange)) {
+            return "http://gta-5-map.com/" +this.type+'/'+z+'-'+x+'_'+y+".png";
+        } else {
+            return this.TRANSPARENT_URL;
+        }
+    },
+
+    onerror: function(tileImg) {
+        tileImg.src = this.TRANSPARENT_URL;
+    }
+};
+
+var map = new naver.maps.Map('map', {
+    center: new naver.maps.LatLng(74.92514151088395, -127.880859375),
+    zoom: 2,
+    mapTypes: new naver.maps.MapTypeRegistry({
+        "Atlas": new naver.maps.ImageMapType(new GTA5MapTypeOption("Atlas", "Tiles_ATLAS")),
+        "Satellite": new naver.maps.ImageMapType(new GTA5MapTypeOption("Satellite", "Tiles_SAT")),
+    })
+});
+
+map.setMapTypeId("Atlas");
+
+var MyMapType = {
+    name: "Alphabet",
+    minZoom: 0,
+    maxZoom: 22,
+    tileSize: new naver.maps.Size(50, 50),
+    getTileData: function(x, y, z) {
+        var w = this.tileSize.width,
+            h = this.tileSize.height,
+            canvas = document.createElement("canvas"),
+            ctx = canvas.getContext("2d");
+
+        var ascii = parseInt(Math.abs(x + y) % 26, 10) + 65;
+        alphabet = String.fromCharCode(ascii);
+
+        canvas.width = w;
+        canvas.height = h;
+
+        ctx.globalAlpha = 1 - ((ascii - 65) * 0.04);
+
+        ctx.rect(0, 0, w, h);
+        ctx.fillStyle = "#000";
+        ctx.fill();
+        ctx.lineWidth = 1;
+        ctx.strokeStyle = "#aaa";
+        ctx.stroke();
+
+        ctx.font = "bold " + (Math.min(w, h) - 10) + "px Arial";
+        ctx.textBaseline = "middle";
+        ctx.textAlign = "center";
+        ctx.fillStyle = "#fff";
+        ctx.fillText(alphabet, w / 2, h / 2);
+
+        return ctx.getImageData(0, 0, w, h);
+    }
+};
diff --git a/navermaps/tsconfig.json b/navermaps/tsconfig.json
new file mode 100644
index 0000000000..5e1beca4fb
--- /dev/null
+++ b/navermaps/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "navermaps-tests.ts"
+    ]
+}
diff --git a/navermaps/tslint.json b/navermaps/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/navermaps/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}

From da3a84f6822a20f21b3e017a81b07e86d99df1ec Mon Sep 17 00:00:00 2001
From: Christian Rackerseder <git@echooff.de>
Date: Thu, 15 Mar 2018 08:32:15 +0100
Subject: [PATCH 0536/1382] Fixed documentation

---
 types/tiny-slider-react/index.d.ts | 85 ++++++++++++++----------------
 1 file changed, 40 insertions(+), 45 deletions(-)

diff --git a/types/tiny-slider-react/index.d.ts b/types/tiny-slider-react/index.d.ts
index a8cd14760c..b509595f81 100644
--- a/types/tiny-slider-react/index.d.ts
+++ b/types/tiny-slider-react/index.d.ts
@@ -7,103 +7,103 @@ import * as React from "react";
 
 interface CommonOptions {
     /**
-     * Default: 0.
      * The initial index of the slider.
+     * @defaultValue 0
      */
     startIndex?: number;
     /**
-     * Default: 1.
      * Number of slides being displayed in the viewport.
+     * @defaultValue 1
      */
     items?: number;
     /**
-     * Default: 0.
      * Space between slides (in "px").
+     * @defaultValue 0
      */
     gutter?: number;
     /**
-     * 	Default: 1.
      * Number of slides going on one "click".
+     * @defaultValue 1
      */
     slideBy?: number | "page";
     /**
-     * Default: 300.
      * Speed of the slide animation (in "ms").
+     * @defaultValue 300
      */
     speed?: number;
     /**
-     * 	Default: false.
      * Height of slider container changes according to each slide"s height.
+     * @defaultValue false
      */
     autoHeight?: boolean;
     /**
-     * Default: false.
      * Controls width attribute of the slides.
+     * @defaultValue false
      */
     fixedWidth?: number | false;
     /**
-     * Default: 0.
      * Space on the outside (in "px").
+     * @defaultValue 0
      */
     edgePadding?: number;
     /**
-     * Default: true.
      * Controls the display and functionalities of controls components (prev/next buttons). If true, display the controls and add all functionalities.
+     * @defaultValue true
      */
     controls?: boolean;
     /**
-     * Default: ["prev", "next"].
      * Text or markup in the prev/next buttons
+     * @defaultValue ["prev", "next"]
      */
     controlsText?: string[];
     /**
-     * Default: true.
      * Controls the display and functionalities of nav components (dots). If true, display the nav and add all functionalities.
+     * @defaultValue true
      */
     nav?: boolean;
     /**
-     * Default: false.
      * Toggles the automatic change of slides
+     * @defaultValue false
      */
     autoplay?: boolean;
     /**
-     * Default: false.
      * Stops sliding on mouseover.
+     * @defaultValue false
      */
     autoplayHoverPause?: boolean;
     /**
-     * Default: true.
      * Pauses the sliding when the page is invisiable and resumes it when the page become visiable again
+     * @defaultValue true
      */
     autoplayResetOnVisibility?: boolean;
     /**
-     * Default: ["start", "stop"].
      * Text or markup in the autoplay start/stop button.
+     * @defaultValue ["start", "stop"]
      */
     autoplayText?: string[];
     /**
-     * Default: 5000.
      * Time between 2 autoplay slides change (in "ms").
+     * @defaultValue 5000
      */
     autoplayTimeout?: number;
     /**
-     * 	Default: true.
      * Activates input detection for touch devices.
+     * @defaultValue true
      */
     touch?: boolean;
     /**
-     * Default: false.
      * Changing slides by dragging them.
+     * @defaultValue false
      */
     mouseDrag?: boolean;
     /**
-     * Default: false.
      * Allows using arrow keys to switch slides.
+     * @defaultValue false
      */
     arrowKeys?: boolean;
     /**
-     * Default: false.
      * Disable slider.
+     * @defaultValue false
      */
     disable?: boolean;
 }
@@ -114,113 +114,108 @@ export interface ResponsiveOptions {
 
 export interface TinySliderSettings extends CommonOptions {
     /**
-     * Default: document.querySelector(".slider").
-     * The slider container element or selector.
-     */
-    container?: HTMLElement | string;
-    /**
-     * Default: "carousel".
      * Controls animation behaviour.
      * With carousel everything slides to the side, while gallery uses fade animations and changes all slides at once.
+     * @defaultValue "carousel"
      */
     mode?: "carousel" | "gallery";
     /**
-     * Default: "horizontal".
      * The axis of the slider.
+     * @defaultValue "horizontal"
      */
     axis?: "horizontal" | "vertical";
     /**
-     * Default: false.
      * The container element/selector around the prev/next buttons.
      * controlsContainer must have at least 2 child elements.
+     * @defaultValue false
      */
     controlsContainer?: HTMLElement | string | false;
     /**
-     * Default: false.
      * The container element/selector around the dots.
      * navContainer must have at least same number of children as the slides.
+     * @defaultValue false
      */
     navContainer?: HTMLElement | string | false;
     /**
-     * Default: false.
      * Indecate if the dots are thurbnails. If true, they will always be visible even when more than 1 slides displayed in the viewport.
+     * @defaultValue false
      */
     navAsThumbnails?: boolean;
     /**
-     * Default: "forward".
      * Direction of slide movement (ascending/descending the slide index).
+     * @defaultValue "forward"
      */
     autoplayDirection?: "forward" | "backward";
     /**
-     * Default: false.
      * The customized autoplay start/stop button or selector.
+     * @defaultValue false
      */
     autoplayButton?: HTMLElement | string | false;
     /**
-     * Default: true.
      * Output autoplayButton markup when autoplay is true but a customized autoplayButton is not provided.
+     * @defaultValue true
      */
     autoplayButtonOutput?: boolean;
     /**
-     * Default: "tns-fadeIn".
      * Name of intro animation class.
+     * @defaultValue "tns-fadeIn"
      */
     animateIn?: string;
     /**
-     * Default: "tns-fadeOut".
      * Name of outro animation class.
+     * @defaultValue "tns-fadeOut"
      */
     animateOut?: string;
     /**
-     * Default: "tns-normal".
      * Name of default animation class.
+     * @defaultValue "tns-normal"
      */
     animateNormal?: string;
     /**
-     * Default: false.
      * Time between each gallery animation (in "ms").
+     * @defaultValue false
      */
     animateDelay?: number | false;
     /**
-     * Default: true.
      * Moves throughout all the slides seamlessly.
+     * @defaultValue true
      */
     loop?: boolean;
     /**
-     * Default: false.
      * Moves to the opposite edge when reaching the first or last slide.
+     * @defaultValue false
      */
     rewind?: boolean;
     /**
-     * Default: false.
      * Breakpoint: Integer.
      * Defines options for different viewport widths
+     * @defaultValue false
      */
     responsive?: ResponsiveOptions | false;
     /**
-     * Default: false.
      * Enables lazyloading images that are currently not viewed, thus saving bandwidth
+     * @defaultValue false
      */
     lazyload?: boolean;
     /**
-     * Default: 15.
      * Swipe or drag will not be triggered if the angle is not inside the range when set.
+     * @defaultValue 15
      */
     swipeAngle?: number | boolean;
     /**
-     * Default: false.
      * Difine the relationship between nested sliders.
      * Make sure you run the inner slider first, otherwise the height of the inner slider container will be wrong.
+     * @defaultValue false
      */
     nested?: "inner" | "outer" | false;
     /**
-     * Default: true.
      * Indicate whether the slider will be frozen (controls, nav, autoplay and other functions will stop work) when all slides can be displayed in one page.
+     * @defaultValue true
      */
     freezable?: boolean;
     /**
-     * Default: false.
      * Callback to be run on initialization.
+     * @defaultValue false
      */
     onInit?: () => void | false;
 }

From 26eb5d587883e0eef275fe459f10d6f300a71b38 Mon Sep 17 00:00:00 2001
From: Jesper Madsen <jhalborg89@gmail.com>
Date: Thu, 15 Mar 2018 11:49:19 +0100
Subject: [PATCH 0537/1382] Included result.type, base64, exif in ImageLibrary
 API as per docs

---
 types/expo/expo-tests.tsx | 25 ++++++++++++++++++++++++-
 types/expo/index.d.ts     |  6 ++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/types/expo/expo-tests.tsx b/types/expo/expo-tests.tsx
index aead720f5b..d1b543c591 100644
--- a/types/expo/expo-tests.tsx
+++ b/types/expo/expo-tests.tsx
@@ -289,14 +289,37 @@ async () => {
 };
 
 async () => {
+    // Video test
     const result = await ImagePicker.launchImageLibraryAsync({
-        mediaTypes: ImagePicker.MediaTypeOptions.Videos
+        mediaTypes: ImagePicker.MediaTypeOptions.Videos,
     });
 
     if (!result.cancelled) {
         result.uri;
         result.width;
         result.height;
+        result.duration;
+        result.type;
+    }
+};
+
+async () => {
+    // Image test
+    const result = await ImagePicker.launchImageLibraryAsync({
+        mediaTypes: ImagePicker.MediaTypeOptions.Images,
+        base64: true,
+        aspect: [4, 3],
+        quality: 1,
+        exif: true,
+    });
+
+    if (!result.cancelled) {
+        result.uri;
+        result.width;
+        result.height;
+        result.exif;
+        result.base64;
+        result.type;
     }
 };
 
diff --git a/types/expo/index.d.ts b/types/expo/index.d.ts
index 8f0463bf0d..8661cac727 100644
--- a/types/expo/index.d.ts
+++ b/types/expo/index.d.ts
@@ -1418,6 +1418,10 @@ export namespace ImagePicker {
         uri: string;
         width: number;
         height: number;
+        type: 'video' | 'image';
+        base64?: string;
+        exif?: object;
+        duration?: number;
     }
 
     type ImageResult = { cancelled: true } | ({ cancelled: false } & ImageInfo);
@@ -1434,6 +1438,8 @@ export namespace ImagePicker {
         allowsEditing?: boolean;
         aspect?: [number, number];
         quality?: number;
+        base64?: boolean;
+        exif?: boolean;
         mediaTypes?: keyof _MediaTypeOptions;
     }
 

From 6d561c5812c47beba65ecfb686f22626de014816 Mon Sep 17 00:00:00 2001
From: Florian Keller <github@floriankeller.de>
Date: Thu, 15 Mar 2018 12:08:21 +0100
Subject: [PATCH 0538/1382] Add generate-changelog

---
 .../generate-changelog-tests.ts               |  8 +++++++
 types/generate-changelog/index.d.ts           | 21 +++++++++++++++++
 types/generate-changelog/tsconfig.json        | 23 +++++++++++++++++++
 types/generate-changelog/tslint.json          |  1 +
 4 files changed, 53 insertions(+)
 create mode 100644 types/generate-changelog/generate-changelog-tests.ts
 create mode 100644 types/generate-changelog/index.d.ts
 create mode 100644 types/generate-changelog/tsconfig.json
 create mode 100644 types/generate-changelog/tslint.json

diff --git a/types/generate-changelog/generate-changelog-tests.ts b/types/generate-changelog/generate-changelog-tests.ts
new file mode 100644
index 0000000000..0b99857715
--- /dev/null
+++ b/types/generate-changelog/generate-changelog-tests.ts
@@ -0,0 +1,8 @@
+import * as changelog from 'generate-changelog';
+
+changelog.generate({
+    exclude: ['chore'],
+    minor: true,
+    repoUrl: 'https://github.com/lob/generate-changelog',
+    tag: 'v1.6.0...v1.7.0'
+}).then(changelog => changelog.trim());
diff --git a/types/generate-changelog/index.d.ts b/types/generate-changelog/index.d.ts
new file mode 100644
index 0000000000..2a6ba0ed56
--- /dev/null
+++ b/types/generate-changelog/index.d.ts
@@ -0,0 +1,21 @@
+// Type definitions for generate-changelog 1.7
+// Project: https://github.com/lob/generate-changelog#readme
+// Definitions by: Florian Keller <https://github.com/ffflorian>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export interface Options {
+    /** exclude listed commit types (e.g. `['chore', 'style', 'refactor']`) */
+    exclude?: string[];
+    /** whether it should be a patch changelog */
+    patch?: boolean;
+    /** whether it should be a minor changelog */
+    minor?: boolean;
+    /** whether it should be a major changelog */
+    major?: boolean;
+    /** repo URL that will be used when linking commits */
+    repoUrl?: string;
+    /** generate from specific tag or range (e.g. `v1.2.3` or `v1.2.3..v1.2.4`)' */
+    tag?: string;
+}
+
+export function generate(options: Options): Promise<string>;
diff --git a/types/generate-changelog/tsconfig.json b/types/generate-changelog/tsconfig.json
new file mode 100644
index 0000000000..458186fe12
--- /dev/null
+++ b/types/generate-changelog/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "generate-changelog-tests.ts"
+    ]
+}
diff --git a/types/generate-changelog/tslint.json b/types/generate-changelog/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/generate-changelog/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 190c8aab89a85575da49bce0ba08094f980c00c5 Mon Sep 17 00:00:00 2001
From: teppeis <teppeis@gmail.com>
Date: Thu, 15 Mar 2018 20:23:59 +0900
Subject: [PATCH 0539/1382] fix(node-rsa): improve node-rsa typing

---
 types/node-rsa/index.d.ts | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/types/node-rsa/index.d.ts b/types/node-rsa/index.d.ts
index 63d569378d..84f583b1c8 100644
--- a/types/node-rsa/index.d.ts
+++ b/types/node-rsa/index.d.ts
@@ -31,7 +31,10 @@ declare class NodeRSA {
     /**
      * Export key to PEM string, PEM/DER Buffer or components.
      */
-    exportKey(format?: NodeRSA.Format): NodeRSA.Key;
+    exportKey(): string;
+    exportKey(format: NodeRSA.FormatPem): string;
+    exportKey(format: NodeRSA.FormatDer): Buffer;
+    exportKey(format: NodeRSA.FormatComponents): NodeRSA.KeyComponents;
 
     isPrivate(): boolean;
 
@@ -88,17 +91,22 @@ declare namespace NodeRSA {
     type Key = string | Buffer | KeyComponents;
     type Data = string | object | any[];
 
-    type Format =
+    type FormatPem =
         | 'private' | 'public'
-        | 'pkcs1' | 'pkcs1-pem' | 'pkcs1-der'
-        | 'pkcs1-private' | 'pkcs1-private-pem' | 'pkcs1-private-der'
-        | 'pkcs1-public' | 'pkcs1-public-pem' | 'pkcs1-public-der'
-        | 'pkcs8' | 'pkcs8-pem' | 'pkcs8-der'
-        | 'pkcs8-private' | 'pkcs8-private-pem' | 'pkcs8-private-der'
-        | 'pkcs8-public' | 'pkcs8-public-pem' | 'pkcs8-public-der'
+        | 'pkcs1' | 'pkcs1-pem'
+        | 'pkcs1-private' | 'pkcs1-private-pem'
+        | 'pkcs1-public' | 'pkcs1-public-pem'
+        | 'pkcs8' | 'pkcs8-pem'
+        | 'pkcs8-private' | 'pkcs8-private-pem'
+        | 'pkcs8-public' | 'pkcs8-public-pem';
+    type FormatDer =
+        | 'pkcs1-der' | 'pkcs1-private-der' | 'pkcs1-public-der'
+        | 'pkcs8-der' | 'pkcs8-private-der' | 'pkcs8-public-der';
+    type FormatComponents =
         | 'components' | 'components-pem' | 'components-der'
         | 'components-private' | 'components-private-pem' | 'components-private-der'
         | 'components-public' | 'components-public-pem' | 'components-public-der';
+    type Format = FormatPem | FormatDer | FormatComponents;
 
     type EncryptionScheme = 'pkcs1_oaep' | 'pkcs1';
 

From c3545db618098defce0d82cb5ebe742c23b1bfe2 Mon Sep 17 00:00:00 2001
From: Mykolas Kairys <m.kairys@adform.com>
Date: Thu, 15 Mar 2018 14:21:40 +0200
Subject: [PATCH 0540/1382] react-router-redux typings update for
 createMatchSelector function

---
 types/react-router-redux/index.d.ts                   | 4 ++++
 types/react-router-redux/react-router-redux-tests.tsx | 6 +++++-
 types/react-router-redux/tslint.json                  | 5 ++++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/types/react-router-redux/index.d.ts b/types/react-router-redux/index.d.ts
index 0ce965b397..89ef136014 100644
--- a/types/react-router-redux/index.d.ts
+++ b/types/react-router-redux/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/ReactTraining/react-router/tree/master/packages/react-router-redux
 // Definitions by: Huy Nguyen <https://github.com/huy-nguyen>
 //                 Shoya Tanaka <https://github.com/8398a7>
+//                 Mykolas <https://github.com/mykolas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -19,6 +20,7 @@ import {
     LocationDescriptor
 } from 'history';
 import * as React from 'react';
+import { match } from 'react-router';
 
 export interface ConnectedRouterProps<State> {
     store?: Store<State>;
@@ -77,3 +79,5 @@ export interface LocationChangeAction {
 }
 
 export function routerMiddleware(history: History): Middleware;
+
+export function createMatchSelector<State extends { router: RouterState }, Params>(path: string): (state: State) => match<Params> | null;
diff --git a/types/react-router-redux/react-router-redux-tests.tsx b/types/react-router-redux/react-router-redux-tests.tsx
index b6927fb7bf..bf2575ae26 100644
--- a/types/react-router-redux/react-router-redux-tests.tsx
+++ b/types/react-router-redux/react-router-redux-tests.tsx
@@ -7,7 +7,7 @@ import { Provider } from 'react-redux';
 import createHistory from 'history/createBrowserHistory';
 import { Route } from 'react-router';
 
-import { ConnectedRouter, routerReducer, routerMiddleware, push, RouterState } from 'react-router-redux';
+import { ConnectedRouter, routerReducer, routerMiddleware, push, RouterState, createMatchSelector } from 'react-router-redux';
 
 // Create a history of your choosing (we're using a browser history in this case)
 const history = createHistory();
@@ -44,3 +44,7 @@ ReactDOM.render(
 
 // Now you can dispatch navigation actions from anywhere!
 store.dispatch(push('/foo'));
+
+// And match location path using createMatchSelector
+const matchSelector = createMatchSelector('/:foo');
+const match = matchSelector(store.getState());
diff --git a/types/react-router-redux/tslint.json b/types/react-router-redux/tslint.json
index f93cf8562a..71ee04c4e1 100644
--- a/types/react-router-redux/tslint.json
+++ b/types/react-router-redux/tslint.json
@@ -1,3 +1,6 @@
 {
-    "extends": "dtslint/dt.json"
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-unnecessary-generics": false
+    }
 }

From b13cd56680d5ff64393bd8d6098337f8e239e9f4 Mon Sep 17 00:00:00 2001
From: nevace <liam.neville89@gmail.com>
Date: Thu, 15 Mar 2018 12:54:04 +0000
Subject: [PATCH 0541/1382] change Response type to 'any'

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

diff --git a/types/twit/index.d.ts b/types/twit/index.d.ts
index 3fbd57283a..79106ce66e 100644
--- a/types/twit/index.d.ts
+++ b/types/twit/index.d.ts
@@ -224,7 +224,7 @@ declare module 'twit' {
       }
     }
 
-    export type Response = object
+    export type Response = any
 
     interface MediaParam {
       file_path: string

From 55411a0b819917c1cb9a88450cd2a7fdf81df0f0 Mon Sep 17 00:00:00 2001
From: pcassis <piotr@cassis.pl>
Date: Thu, 15 Mar 2018 13:56:40 +0100
Subject: [PATCH 0542/1382] tracking - removed duplicated declaration

---
 types/tracking/index.d.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/types/tracking/index.d.ts b/types/tracking/index.d.ts
index c8465ba0be..e1fc5691cb 100644
--- a/types/tracking/index.d.ts
+++ b/types/tracking/index.d.ts
@@ -30,7 +30,6 @@ declare namespace tracking {
     setClassifiers(classifiers: number[]): void;
     setEdgesDensity(edgesDensity: number): void;
     setInitialScale(initialScale: number): void;
-    setInitialScale(initialScale: number): void;
     setScaleFactor(scaleFactor: number): void;
     setStepSize(stepSize: number): void;
   }

From 7d4697c40bfe7926725373985d2ead98be10e4a3 Mon Sep 17 00:00:00 2001
From: teppeis <teppeis@gmail.com>
Date: Thu, 15 Mar 2018 21:51:26 +0900
Subject: [PATCH 0543/1382] fix(node-rsa): improve node-rsa and the tests

---
 types/node-rsa/index.d.ts        | 22 ++++++++++++++--------
 types/node-rsa/node-rsa-tests.ts | 17 +++++++++++++++--
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/types/node-rsa/index.d.ts b/types/node-rsa/index.d.ts
index 84f583b1c8..f7e92c071b 100644
--- a/types/node-rsa/index.d.ts
+++ b/types/node-rsa/index.d.ts
@@ -31,10 +31,10 @@ declare class NodeRSA {
     /**
      * Export key to PEM string, PEM/DER Buffer or components.
      */
-    exportKey(): string;
-    exportKey(format: NodeRSA.FormatPem): string;
+    exportKey(format?: NodeRSA.FormatPem): string;
     exportKey(format: NodeRSA.FormatDer): Buffer;
-    exportKey(format: NodeRSA.FormatComponents): NodeRSA.KeyComponents;
+    exportKey(format: NodeRSA.FormatComponentsPrivate): NodeRSA.KeyComponentsPrivate;
+    exportKey(format: NodeRSA.FormatComponentsPublic): NodeRSA.KeyComponentsPublic;
 
     isPrivate(): boolean;
 
@@ -88,7 +88,7 @@ declare class NodeRSA {
 }
 
 declare namespace NodeRSA {
-    type Key = string | Buffer | KeyComponents;
+    type Key = string | Buffer | KeyComponentsPrivate | KeyComponentsPublic;
     type Data = string | object | any[];
 
     type FormatPem =
@@ -102,11 +102,12 @@ declare namespace NodeRSA {
     type FormatDer =
         | 'pkcs1-der' | 'pkcs1-private-der' | 'pkcs1-public-der'
         | 'pkcs8-der' | 'pkcs8-private-der' | 'pkcs8-public-der';
-    type FormatComponents =
+    type FormatComponentsPrivate =
         | 'components' | 'components-pem' | 'components-der'
-        | 'components-private' | 'components-private-pem' | 'components-private-der'
+        | 'components-private' | 'components-private-pem' | 'components-private-der';
+    type FormatComponentsPublic =
         | 'components-public' | 'components-public-pem' | 'components-public-der';
-    type Format = FormatPem | FormatDer | FormatComponents;
+    type Format = FormatPem | FormatDer | FormatComponentsPrivate | FormatComponentsPublic;
 
     type EncryptionScheme = 'pkcs1_oaep' | 'pkcs1';
 
@@ -132,7 +133,7 @@ declare namespace NodeRSA {
         | 'ascii' | 'utf8' | 'utf16le' | 'ucs2' | 'latin1'
         | 'base64' | 'hex' | 'binary' | 'buffer';
 
-    interface KeyComponents {
+    interface KeyComponentsPrivate {
         n: Buffer;
         e: Buffer | number;
         d: Buffer;
@@ -143,6 +144,11 @@ declare namespace NodeRSA {
         coeff: Buffer;
     }
 
+    interface KeyComponentsPublic {
+        n: Buffer;
+        e: Buffer | number;
+    }
+
     interface KeyBits {
         /**
          * The length of the key in bits.
diff --git a/types/node-rsa/node-rsa-tests.ts b/types/node-rsa/node-rsa-tests.ts
index 0f8defacbd..eac9a0397b 100644
--- a/types/node-rsa/node-rsa-tests.ts
+++ b/types/node-rsa/node-rsa-tests.ts
@@ -26,8 +26,10 @@ Es+KCn25OKXR/FJ5fu6A6A+MptABL3r8SEjlpLc=
 
 const keyData = '-----BEGIN PUBLIC KEY----- ... -----END PUBLIC KEY-----';
 key.importKey(keyData, 'pkcs8');
-const publicDer = key.exportKey('pkcs8-public-der');
-const privateDer = key.exportKey('pkcs1-der');
+const defaultPem: string = key.exportKey();
+const publicPem: string = key.exportKey('pkcs8-public-pem');
+const publicDer: Buffer = key.exportKey('pkcs8-public-der');
+const privateDer: Buffer = key.exportKey('pkcs1-der');
 key.importKey({
 	n: new Buffer('0086fa9ba066685845fc03833a9699c8baefb53cfbf19052a7f10f1eaa30488cec1ceb752bdff2df9fad6c64b3498956e7dbab4035b4823c99a44cc57088a23783', 'hex'),
 	e: 65537,
@@ -39,6 +41,17 @@ key.importKey({
 	coeff: new Buffer('00b399675e5e81506b729a777cc03026f0b2119853dfc5eb124610c0ab82999e45', 'hex')
 }, 'components');
 const publicComponents = key.exportKey('components-public');
+let b: Buffer = publicComponents.n;
+let bn: Buffer|number = publicComponents.e;
+const privateComponents = key.exportKey('components-private');
+b = privateComponents.n;
+bn = privateComponents.e;
+b = privateComponents.d;
+b = privateComponents.p;
+b = privateComponents.q;
+b = privateComponents.dmp1;
+b = privateComponents.dmq1;
+b = privateComponents.coeff;
 
 key.isPrivate();
 key.isPublic(true);

From 054f6ba4bd00ebaa1c3e2c55e017a88325fd46f8 Mon Sep 17 00:00:00 2001
From: lmajadas <37408704+lmajadas@users.noreply.github.com>
Date: Thu, 15 Mar 2018 15:19:07 +0100
Subject: [PATCH 0544/1382] Add details param to ErrorHandler constructor

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

diff --git a/types/webdriverio/index.d.ts b/types/webdriverio/index.d.ts
index 8020be7957..c81d41a67a 100644
--- a/types/webdriverio/index.d.ts
+++ b/types/webdriverio/index.d.ts
@@ -465,7 +465,7 @@ declare namespace WebdriverIO {
     }
 
     class ErrorHandler {
-        constructor(type: string, msg: string | number);
+        constructor(type: string, msg: string | number, details: string | undefined);
     }
 
     function multiremote(options: MultiRemoteOptions): Client<void>;

From 08928fb325a5c19b139cf811c6df7d002660833a Mon Sep 17 00:00:00 2001
From: Mathieu Masy <mathieu@potloc.com>
Date: Thu, 15 Mar 2018 10:23:12 -0400
Subject: [PATCH 0545/1382] [react-form] SelectProps' placeholder is not
 required

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

diff --git a/types/react-form/index.d.ts b/types/react-form/index.d.ts
index 4dc7e4b1b2..4114f3b7ee 100644
--- a/types/react-form/index.d.ts
+++ b/types/react-form/index.d.ts
@@ -142,7 +142,7 @@ export type SelectOptions = Array<{
 
 export interface SelectProps extends FieldProps, React.SelectHTMLAttributes<HTMLSelectElement> {
     options: SelectOptions;
-    placeholder: string;
+    placeholder?: string;
 }
 
 export const Select: React.StatelessComponent<SelectProps>;

From a7c606fea92885f8c23eea56761db388c165da40 Mon Sep 17 00:00:00 2001
From: nevace <liam.neville89@gmail.com>
Date: Thu, 15 Mar 2018 14:23:54 +0000
Subject: [PATCH 0546/1382] added cursor param

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

diff --git a/types/twit/index.d.ts b/types/twit/index.d.ts
index 79106ce66e..4100f95349 100644
--- a/types/twit/index.d.ts
+++ b/types/twit/index.d.ts
@@ -260,6 +260,7 @@ declare module 'twit' {
       long?: number,
       follow?: boolean,
       include_email?: boolean,
+      cursor?: number
     }
     export interface PromiseResponse {
       data: Response,

From 89a712404fcb22541cbee4d661445a6734d89b48 Mon Sep 17 00:00:00 2001
From: nevace <liam.neville89@gmail.com>
Date: Thu, 15 Mar 2018 14:25:59 +0000
Subject: [PATCH 0547/1382] remove previous change

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

diff --git a/types/twit/index.d.ts b/types/twit/index.d.ts
index 4100f95349..27f33ad97d 100644
--- a/types/twit/index.d.ts
+++ b/types/twit/index.d.ts
@@ -224,7 +224,7 @@ declare module 'twit' {
       }
     }
 
-    export type Response = any
+    export type Response = object
 
     interface MediaParam {
       file_path: string

From 2fe747bc0fadb216d1ef359eef870c8a4fa848d3 Mon Sep 17 00:00:00 2001
From: nevace <liam.neville89@gmail.com>
Date: Thu, 15 Mar 2018 14:28:56 +0000
Subject: [PATCH 0548/1382] remove right change

---
 types/twit/index.d.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/types/twit/index.d.ts b/types/twit/index.d.ts
index 27f33ad97d..30baf8c5d8 100644
--- a/types/twit/index.d.ts
+++ b/types/twit/index.d.ts
@@ -224,7 +224,7 @@ declare module 'twit' {
       }
     }
 
-    export type Response = object
+    export type Response = any
 
     interface MediaParam {
       file_path: string
@@ -259,8 +259,7 @@ declare module 'twit' {
       lat?: number,
       long?: number,
       follow?: boolean,
-      include_email?: boolean,
-      cursor?: number
+      include_email?: boolean
     }
     export interface PromiseResponse {
       data: Response,

From 4026a2cc259d6d2e9a7b9e5050bb190b0d4d177a Mon Sep 17 00:00:00 2001
From: nevace <liam.neville89@gmail.com>
Date: Thu, 15 Mar 2018 14:29:45 +0000
Subject: [PATCH 0549/1382] comma

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

diff --git a/types/twit/index.d.ts b/types/twit/index.d.ts
index 30baf8c5d8..79106ce66e 100644
--- a/types/twit/index.d.ts
+++ b/types/twit/index.d.ts
@@ -259,7 +259,7 @@ declare module 'twit' {
       lat?: number,
       long?: number,
       follow?: boolean,
-      include_email?: boolean
+      include_email?: boolean,
     }
     export interface PromiseResponse {
       data: Response,

From 8b910ced688d7a90c338c2bb833185e0353deed7 Mon Sep 17 00:00:00 2001
From: nevace <liam.neville89@gmail.com>
Date: Thu, 15 Mar 2018 14:31:33 +0000
Subject: [PATCH 0550/1382] add cursor param

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

diff --git a/types/twit/index.d.ts b/types/twit/index.d.ts
index 79106ce66e..ce6a1327f1 100644
--- a/types/twit/index.d.ts
+++ b/types/twit/index.d.ts
@@ -260,6 +260,7 @@ declare module 'twit' {
       long?: number,
       follow?: boolean,
       include_email?: boolean,
+      cursor?: number,
     }
     export interface PromiseResponse {
       data: Response,

From f61789e131db99d372f98fb64d45ae402d7be404 Mon Sep 17 00:00:00 2001
From: nevace <liam.neville89@gmail.com>
Date: Thu, 15 Mar 2018 14:37:47 +0000
Subject: [PATCH 0551/1382] remove previous change

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

diff --git a/types/twit/index.d.ts b/types/twit/index.d.ts
index ce6a1327f1..6b82dd6b65 100644
--- a/types/twit/index.d.ts
+++ b/types/twit/index.d.ts
@@ -224,7 +224,7 @@ declare module 'twit' {
       }
     }
 
-    export type Response = any
+    export type Response = object
 
     interface MediaParam {
       file_path: string

From f44d70afaefd6f548b17da941452c9e5d6871ebc Mon Sep 17 00:00:00 2001
From: b-galazka <bartlomiejgalazka@zoho.eu>
Date: Thu, 15 Mar 2018 15:52:04 +0100
Subject: [PATCH 0552/1382] add an alternative type of a param in Joi's method

---
 types/joi/index.d.ts   | 13 +++++++++++--
 types/joi/joi-tests.ts |  8 ++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/types/joi/index.d.ts b/types/joi/index.d.ts
index 94ffd188cf..7838323e6b 100644
--- a/types/joi/index.d.ts
+++ b/types/joi/index.d.ts
@@ -164,6 +164,11 @@ export interface IPOptions {
     cidr?: string
 }
 
+export interface StringRegexOptions {
+    name?: string;
+    invert?: boolean;
+}
+
 export interface JoiObject {
     isJoi: boolean;
 }
@@ -551,9 +556,13 @@ export interface StringSchema extends AnySchema {
     /**
      * Defines a regular expression rule.
      * @param pattern - a regular expression object the string value must match against.
-     * @param name - optional name for patterns (useful with multiple patterns). Defaults to 'required'.
+     * @param options - optional, can be:
+     *   Name for patterns (useful with multiple patterns). Defaults to 'required'.
+     *   An optional configuration object with the following supported properties:
+     *     name - optional pattern name.
+     *     invert - optional boolean flag. Defaults to false behavior. If specified as true, the provided pattern will be disallowed instead of required.
      */
-    regex(pattern: RegExp, name?: string): this;
+    regex(pattern: RegExp, options?: string | StringRegexOptions): this;
 
     /**
      * Replace characters matching the given pattern with the specified replacement string where:
diff --git a/types/joi/joi-tests.ts b/types/joi/joi-tests.ts
index 3ee7c45b66..1ab3316eb8 100644
--- a/types/joi/joi-tests.ts
+++ b/types/joi/joi-tests.ts
@@ -135,6 +135,13 @@ refOpts = { contextPrefix: str };
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
+let stringRegexOpts: Joi.StringRegexOptions = null;
+
+stringRegexOpts = { name: str };
+stringRegexOpts = { invert: bool };
+
+// --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
+
 let validErr: Joi.ValidationError = null;
 let validErrItem: Joi.ValidationErrorItem;
 let validErrFunc: Joi.ValidationErrorFunction;
@@ -764,6 +771,7 @@ strSchema = strSchema.length(ref);
 strSchema = strSchema.length(ref, str);
 strSchema = strSchema.regex(exp);
 strSchema = strSchema.regex(exp, str);
+strSchema = strSchema.regex(exp, stringRegexOpts);
 strSchema = strSchema.replace(exp, str);
 strSchema = strSchema.replace(str, str);
 strSchema = strSchema.alphanum();

From a69c902e935f153dfa3ac79a799e6c3bac7b8487 Mon Sep 17 00:00:00 2001
From: CSLTech <m.stgeorges@csl-technologies.com>
Date: Thu, 15 Mar 2018 10:13:56 -0400
Subject: [PATCH 0553/1382] Added typings for array-unique

---
 types/array-unique/array-unique-tests.ts |  9 +++++++++
 types/array-unique/index.d.ts            | 12 ++++++++++++
 types/array-unique/tsconfig.json         | 23 +++++++++++++++++++++++
 types/array-unique/tslint.json           |  1 +
 4 files changed, 45 insertions(+)
 create mode 100644 types/array-unique/array-unique-tests.ts
 create mode 100644 types/array-unique/index.d.ts
 create mode 100644 types/array-unique/tsconfig.json
 create mode 100644 types/array-unique/tslint.json

diff --git a/types/array-unique/array-unique-tests.ts b/types/array-unique/array-unique-tests.ts
new file mode 100644
index 0000000000..a854cab3bf
--- /dev/null
+++ b/types/array-unique/array-unique-tests.ts
@@ -0,0 +1,9 @@
+import arrayUnique = require("array-unique");
+
+arrayUnique([1, 1, 2, 3, 3]);
+
+arrayUnique(["foo", "foo", "bar", "foo"]);
+
+arrayUnique.immutable([1, 1, 2, 3, 3]);
+
+arrayUnique.immutable(["foo", "foo", "bar", "foo"]);
diff --git a/types/array-unique/index.d.ts b/types/array-unique/index.d.ts
new file mode 100644
index 0000000000..40d73a53de
--- /dev/null
+++ b/types/array-unique/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for array-unique 0.3
+// Project: https://github.com/jonschlinkert/array-unique
+// Definitions by: Michaël St-Georges <https://github.com/CSLTech>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function arrayUnique<T>(arr: T[]): T[];
+
+declare namespace arrayUnique {
+    function immutable<T>(arr: ReadonlyArray<T>): T[];
+}
+
+export = arrayUnique;
diff --git a/types/array-unique/tsconfig.json b/types/array-unique/tsconfig.json
new file mode 100644
index 0000000000..9829c01906
--- /dev/null
+++ b/types/array-unique/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "array-unique-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/array-unique/tslint.json b/types/array-unique/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/array-unique/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 7f196778d3d3c3b28d51547fa0ac14161ad5b4fd Mon Sep 17 00:00:00 2001
From: Jared Szechy <jared.szechy@gmail.com>
Date: Thu, 15 Mar 2018 11:56:44 -0400
Subject: [PATCH 0554/1382] [plotly.js] add icon interface

---
 types/plotly.js/index.d.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/types/plotly.js/index.d.ts b/types/plotly.js/index.d.ts
index 48d0eb0055..9fbbeaa92f 100644
--- a/types/plotly.js/index.d.ts
+++ b/types/plotly.js/index.d.ts
@@ -297,6 +297,13 @@ export type ModeBarDefaultButtons = 'lasso2d' | 'select2d' | 'sendDataToCloud' |
 
 export type ButtonClickEvent = (gd: PlotlyHTMLElement, ev: MouseEvent) => void;
 
+export interface Icon {
+	width: number;
+	path: string;
+	ascent: number;
+	descent: number;
+}
+
 export interface ModeBarButton {
 	/** name / id of the buttons (for tracking) */
     name: string;
@@ -311,7 +318,7 @@ export interface ModeBarButton {
 	 * svg icon object associated with the button
 	 * can be linked to Plotly.Icons to use the default plotly icons
 	 */
-    icon: string;
+    icon: string | Icon;
 
 	/** icon positioning */
     gravity?: string;

From 6394ee4590398b3439090c7599f4f7a44518418a Mon Sep 17 00:00:00 2001
From: JFGHT <jsfuentes@alu.ucam.edu>
Date: Thu, 15 Mar 2018 17:02:12 +0100
Subject: [PATCH 0555/1382] Fixed functions

There were some functions missing in OperationCallBuilder and PaymentCallBuilder.
---
 types/stellar-sdk/index.d.ts | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/types/stellar-sdk/index.d.ts b/types/stellar-sdk/index.d.ts
index e4a6e6a06f..d7e1b0293e 100644
--- a/types/stellar-sdk/index.d.ts
+++ b/types/stellar-sdk/index.d.ts
@@ -739,10 +739,18 @@ export namespace Operation {
     function fromXDRObject<T extends Operation>(xdrOperation: xdr.Operation<T>): T;
 }
 
-export class OperationCallBuilder extends CallBuilder<OperationRecord> { }
+export class OperationCallBuilder extends CallBuilder<OperationRecord> { 
+    forAccount(accountId: string): this;
+    forLedger(sequence: string): this;
+    forTransaction(transactionId: string): this;
+}
 export class OrderbookCallBuilder extends CallBuilder<OrderbookRecord> { }
 export class PathCallBuilder extends CallBuilder<PaymentPathRecord> { }
-export class PaymentCallBuilder extends CallBuilder<PaymentOperationRecord> { }
+export class PaymentCallBuilder extends CallBuilder<PaymentOperationRecord> { 
+    forAccount(accountId: string): this;
+    forLedger(sequence: string): this;
+    forTransaction(transactionId: string): this;
+}
 
 export class Server {
     constructor(serverURL: string, options?: { allowHttp: boolean })

From 574584314722a3257c7e8bfd43a42a2e0ca54f2b Mon Sep 17 00:00:00 2001
From: lmajadas <37408704+lmajadas@users.noreply.github.com>
Date: Thu, 15 Mar 2018 17:21:52 +0100
Subject: [PATCH 0556/1382] Add inheritance to class ErrorHandler

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

diff --git a/types/webdriverio/index.d.ts b/types/webdriverio/index.d.ts
index c81d41a67a..235760d47b 100644
--- a/types/webdriverio/index.d.ts
+++ b/types/webdriverio/index.d.ts
@@ -464,8 +464,8 @@ declare namespace WebdriverIO {
         run(): Promise<any>;
     }
 
-    class ErrorHandler {
-        constructor(type: string, msg: string | number, details: string | undefined);
+    class ErrorHandler extends Error {
+        constructor(type: string, msg: string | number, details?: string);
     }
 
     function multiremote(options: MultiRemoteOptions): Client<void>;

From 302450b880881d7519cfa2bcd0f5eed912a0dff8 Mon Sep 17 00:00:00 2001
From: Sarah <sarah-diana.sporck@gmx.de>
Date: Thu, 15 Mar 2018 17:35:02 +0100
Subject: [PATCH 0557/1382] added optional aruments

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

diff --git a/types/knex/index.d.ts b/types/knex/index.d.ts
index 4dcbab481b..64f813c5b7 100644
--- a/types/knex/index.d.ts
+++ b/types/knex/index.d.ts
@@ -153,7 +153,7 @@ declare namespace Knex {
         pluck(column: string): QueryBuilder;
 
         insert(data: any, returning?: string | string[]): QueryBuilder;
-        modify(callback: QueryCallback): QueryBuilder;
+        modify(callback: QueryCallback, ...args: any[]): QueryBuilder;
         update(data: any, returning?: string | string[]): QueryBuilder;
         update(columnName: string, value: Value, returning?: string | string[]): QueryBuilder;
         returning(column: string | string[]): QueryBuilder;

From 9fb4bc70898e0f4aefb24c3e877659716a375100 Mon Sep 17 00:00:00 2001
From: Jeff Lau <jlau@uselesspickles.com>
Date: Thu, 15 Mar 2018 12:36:44 -0400
Subject: [PATCH 0558/1382] Lodash: Improve support for NumericDictionary
 collections (#24052)

* Change NumericDictionaryIterator's "key" to type "string"

* Finish updating unit tests

* Improve support of NumericDictionary.
* Update signature overloads of many methods.
* Improve many unit tests.

* Fix some mapValues overloads

* Revert changes to V3 files

* Improve _.omit to fully support Dictionary and NumericDictionary

* Remove unused DictionaryIterator typedefs

* Improve signatures of mapValues and add tons of unit tests

* Remove _.sample overloads that did not potentially  return undefined.

* Simplify definition of "AnyKindOfDictionary"

* Fix one of the _.mapValues overloads

* Delete unnecessary/incorrect comments

* Improve _.forEach unit tests

* Clean up unit tests for mapValues

* Clean up unit tests for _.map

* Add more NumericDictionary test coverage

* Fix _.map to accept a PropertyPath param instead of just a string.

* Re-add DictionaryIterator and NumericDictionaryIterator definitions
for backward compatibility.

* Revert change to support PropertyPath in _.map

* Comment out parts of _.forEach tests that fail in TS 2.4

* Fix _.unionBy tests for TS 2.3

* Comment out _.mapKeys tests that break in TS 2.4

* Comment out parts of _.forEach tests that fail in TS 2.4 (again)

* Fix _.xor test that was broken in TS 2.3

* Comment out parts of _.map tests that fail in TS 2.4

* Remove invalid tests for _.some

* Remove "object" type from definition of ObjectIterateeCustom

* Comment out _.pick tests broken in TS 2.4
---
 types/lodash/common/collection.d.ts |  484 +-----
 types/lodash/common/common.d.ts     |   23 +-
 types/lodash/common/object.d.ts     |  263 +--
 types/lodash/lodash-tests.ts        | 2466 +++++++++++++++------------
 4 files changed, 1616 insertions(+), 1620 deletions(-)

diff --git a/types/lodash/common/collection.d.ts b/types/lodash/common/collection.d.ts
index 31e5b1c212..c8b2770610 100644
--- a/types/lodash/common/collection.d.ts
+++ b/types/lodash/common/collection.d.ts
@@ -36,14 +36,6 @@ declare module "../index" {
             iteratee?: ListIteratee<T>
         ): Dictionary<number>;
 
-        /**
-         * @see _.countBy
-         */
-        countBy<T>(
-            collection: NumericDictionary<T> | null | undefined,
-            iteratee?: NumericDictionaryIteratee<T>
-        ): Dictionary<number>;
-
         /**
          * @see _.countBy
          */
@@ -77,14 +69,6 @@ declare module "../index" {
             this: LoDashImplicitWrapper<T | null | undefined>,
             iteratee?: ObjectIteratee<T>
         ): LoDashImplicitWrapper<Dictionary<number>>;
-
-        /**
-         * @see _.countBy
-         */
-        countBy<T>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee?: NumericDictionaryIteratee<T>
-        ): LoDashImplicitWrapper<Dictionary<number>>;
     }
 
     interface LoDashExplicitWrapper<TValue> {
@@ -111,14 +95,6 @@ declare module "../index" {
             this: LoDashExplicitWrapper<T | null | undefined>,
             iteratee?: ObjectIteratee<T>
         ): LoDashExplicitWrapper<Dictionary<number>>;
-
-        /**
-         * @see _.countBy
-         */
-        countBy<T>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee?: NumericDictionaryIteratee<T>
-        ): LoDashExplicitWrapper<Dictionary<number>>;
     }
 
     // each
@@ -217,14 +193,6 @@ declare module "../index" {
             predicate?: ListIterateeCustom<T, boolean>
         ): boolean;
 
-        /**
-         * @see _.every
-         */
-        every<T>(
-            collection: NumericDictionary<T> | null | undefined,
-            predicate?: NumericDictionaryIterateeCustom<T, boolean>
-        ): boolean;
-
         /**
          * @see _.every
          */
@@ -250,14 +218,6 @@ declare module "../index" {
             this: LoDashImplicitWrapper<T | null | undefined>,
             predicate?: ObjectIterateeCustom<T, boolean>
         ): boolean;
-
-        /**
-         * @see _.every
-         */
-        every<T>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            predicate?: NumericDictionaryIterateeCustom<T, boolean>
-        ): boolean;
     }
 
     interface LoDashExplicitWrapper<TValue> {
@@ -276,14 +236,6 @@ declare module "../index" {
             this: LoDashExplicitWrapper<T | null | undefined>,
             predicate?: ObjectIterateeCustom<T, boolean>
         ): LoDashExplicitWrapper<boolean>;
-
-        /**
-         * @see _.every
-         */
-        every<T>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            predicate?: NumericDictionaryIterateeCustom<T, boolean>
-        ): LoDashExplicitWrapper<boolean>;
     }
 
     // filter
@@ -712,14 +664,6 @@ declare module "../index" {
             iteratee: ListIterator<T, Many<TResult>>
         ): TResult[];
 
-        /**
-         * @see _.flatMap
-         */
-        flatMap<T, TResult>(
-            collection: NumericDictionary<T> | null | undefined,
-            iteratee: NumericDictionaryIterator<T, Many<TResult>>
-        ): TResult[];
-
         /**
          * @see _.flatMap
          */
@@ -772,14 +716,6 @@ declare module "../index" {
             iteratee: ObjectIterator<T, Many<TResult>>
         ): LoDashImplicitWrapper<TResult[]>;
 
-        /**
-         * @see _.flatMap
-         */
-        flatMap<T, TResult>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee: NumericDictionaryIterator<T, Many<TResult>>
-        ): LoDashImplicitWrapper<TResult[]>;
-
         /**
          * @see _.flatMap
          */
@@ -814,14 +750,6 @@ declare module "../index" {
             iteratee: ListIterator<T, Many<TResult>>
         ): LoDashExplicitWrapper<TResult[]>;
 
-        /**
-         * @see _.flatMap
-         */
-        flatMap<T, TResult>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee: NumericDictionaryIterator<T, Many<TResult>>
-        ): LoDashExplicitWrapper<TResult[]>;
-
         /**
          * @see _.flatMap
          */
@@ -878,14 +806,6 @@ declare module "../index" {
             iteratee: ListIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>
         ): TResult[];
 
-        /**
-         * @see _.flatMapDeep
-         */
-        flatMapDeep<T, TResult>(
-            collection: NumericDictionary<T> | null | undefined,
-            iteratee: NumericDictionaryIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>
-        ): TResult[];
-
         /**
          * @see _.flatMapDeep
          */
@@ -927,14 +847,6 @@ declare module "../index" {
             iteratee: ListIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>
         ): LoDashImplicitWrapper<TResult[]>;
 
-        /**
-         * @see _.flatMapDeep
-         */
-        flatMapDeep<T, TResult>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee: NumericDictionaryIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>
-        ): LoDashImplicitWrapper<TResult[]>;
-
         /**
          * @see _.flatMapDeep
          */
@@ -976,14 +888,6 @@ declare module "../index" {
             iteratee: ListIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>
         ): LoDashExplicitWrapper<TResult[]>;
 
-        /**
-         * @see _.flatMapDeep
-         */
-        flatMapDeep<T, TResult>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee: NumericDictionaryIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>
-        ): LoDashExplicitWrapper<TResult[]>;
-
         /**
          * @see _.flatMapDeep
          */
@@ -1044,15 +948,6 @@ declare module "../index" {
             depth?: number
         ): TResult[];
 
-        /**
-         * @see _.flatMapDepth
-         */
-        flatMapDepth<T, TResult>(
-            collection: NumericDictionary<T> | null | undefined,
-            iteratee: NumericDictionaryIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>,
-            depth?: number
-        ): TResult[];
-
         /**
          * @see _.flatMapDepth
          */
@@ -1098,15 +993,6 @@ declare module "../index" {
             depth?: number
         ): LoDashImplicitWrapper<TResult[]>;
 
-        /**
-         * @see _.flatMapDepth
-         */
-        flatMapDepth<T, TResult>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee: NumericDictionaryIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>,
-            depth?: number
-        ): LoDashImplicitWrapper<TResult[]>;
-
         /**
          * @see _.flatMapDepth
          */
@@ -1152,15 +1038,6 @@ declare module "../index" {
             depth?: number
         ): LoDashExplicitWrapper<TResult[]>;
 
-        /**
-         * @see _.flatMapDepth
-         */
-        flatMapDepth<T, TResult>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee: NumericDictionaryIterator<T, ListOfRecursiveArraysOrValues<TResult> | TResult>,
-            depth?: number
-        ): LoDashExplicitWrapper<TResult[]>;
-
         /**
          * @see _.flatMapDepth
          */
@@ -1446,14 +1323,6 @@ declare module "../index" {
             iteratee?: ListIteratee<T>
         ): Dictionary<T[]>;
 
-        /**
-         * @see _.groupBy
-         */
-        groupBy<T>(
-            collection: NumericDictionary<T> | null | undefined,
-            iteratee?: NumericDictionaryIteratee<T>
-        ): Dictionary<T[]>;
-
         /**
          * @see _.groupBy
          */
@@ -1487,14 +1356,6 @@ declare module "../index" {
             this: LoDashImplicitWrapper<T | null | undefined>,
             iteratee?: ObjectIteratee<T>
         ): LoDashImplicitWrapper<Dictionary<Array<T[keyof T]>>>;
-
-        /**
-         * @see _.groupBy
-         */
-        groupBy<T>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee?: NumericDictionaryIteratee<T>
-        ): LoDashImplicitWrapper<Dictionary<T[]>>;
     }
 
     interface LoDashExplicitWrapper<TValue> {
@@ -1514,14 +1375,6 @@ declare module "../index" {
             iteratee?: ListIteratee<T>
         ): LoDashExplicitWrapper<Dictionary<T[]>>;
 
-        /**
-         * @see _.groupBy
-         */
-        groupBy<T>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee?: NumericDictionaryIteratee<T>
-        ): LoDashExplicitWrapper<Dictionary<T[]>>;
-
         /**
          * @see _.groupBy
          */
@@ -1544,7 +1397,7 @@ declare module "../index" {
          * @return True if the target element is found, else false.
          */
         includes<T>(
-            collection: List<T>|Dictionary<T> | null | undefined,
+            collection: List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined,
             target: T,
             fromIndex?: number
         ): boolean;
@@ -1555,7 +1408,7 @@ declare module "../index" {
          * @see _.includes
          */
         includes<T>(
-            this: LoDashImplicitWrapper<List<T> | Dictionary<T> | null | undefined>,
+            this: LoDashImplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>,
             target: T,
             fromIndex?: number
         ): boolean;
@@ -1566,7 +1419,7 @@ declare module "../index" {
          * @see _.includes
          */
         includes<T>(
-            this: LoDashExplicitWrapper<List<T> | Dictionary<T> | null | undefined>,
+            this: LoDashExplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>,
             target: T,
             fromIndex?: number
         ): LoDashExplicitWrapper<boolean>;
@@ -1673,14 +1526,6 @@ declare module "../index" {
             collection: T | null | undefined,
             iteratee?: ObjectIterateeCustom<T, PropertyName>
         ): Dictionary<T[keyof T]>;
-
-        /**
-         * @see _.keyBy
-         */
-        keyBy<T>(
-            collection: NumericDictionary<T> | null | undefined,
-            iteratee?: NumericDictionaryIterateeCustom<T, PropertyName>
-        ): Dictionary<T>;
     }
 
     interface LoDashImplicitWrapper<TValue> {
@@ -1707,14 +1552,6 @@ declare module "../index" {
             this: LoDashImplicitWrapper<T | null | undefined>,
             iteratee?: ObjectIterateeCustom<T, PropertyName>
         ): LoDashImplicitWrapper<Dictionary<T[keyof T]>>;
-
-        /**
-         * @see _.keyBy
-         */
-        keyBy<T>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee?: NumericDictionaryIterateeCustom<T, PropertyName>
-        ): LoDashImplicitWrapper<Dictionary<T>>;
     }
 
     interface LoDashExplicitWrapper<TValue> {
@@ -1741,14 +1578,6 @@ declare module "../index" {
             this: LoDashExplicitWrapper<T | null | undefined>,
             iteratee?: ObjectIterateeCustom<T, PropertyName>
         ): LoDashExplicitWrapper<Dictionary<T[keyof T]>>;
-
-        /**
-         * @see _.keyBy
-         */
-        keyBy<T>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee?: NumericDictionaryIterateeCustom<T, PropertyName>
-        ): LoDashExplicitWrapper<Dictionary<T>>;
     }
 
     // map
@@ -1780,6 +1609,14 @@ declare module "../index" {
          * @param thisArg The this binding of iteratee.
          * @return Returns the new mapped array.
          */
+        map<T, TResult>(
+            collection: T[] | null | undefined,
+            iteratee: ArrayIterator<T, TResult>
+        ): TResult[];
+
+        /**
+         * @see _.map
+         */
         map<T, TResult>(
             collection: List<T> | null | undefined,
             iteratee: ListIterator<T, TResult>
@@ -1788,46 +1625,48 @@ declare module "../index" {
         /**
          * @see _.map
          */
-        map<T>(collection: List<T> | Dictionary<T> | null | undefined): T[];
+        map<T>(collection: List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined): T[];
 
         /**
          * @see _.map
          */
-        map<T, TResult>(
-            collection: Dictionary<T> | null | undefined,
-            iteratee: DictionaryIterator<T, TResult>
+        map<T extends object, TResult>(
+            collection: T | null | undefined,
+            iteratee: ObjectIterator<T, TResult>
         ): TResult[];
 
         /** @see _.map */
         map<T, K extends keyof T>(
-            collection: List<T> | Dictionary<T> | null | undefined,
+            collection: List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined,
             iteratee: K
         ): Array<T[K]>;
 
-        /** @see _.map */
-        map<T, TResult>(
-            collection: NumericDictionary<T> | null | undefined,
-            iteratee?: NumericDictionaryIterator<T, TResult>
-        ): TResult[];
-
-        /**
-         * @see _.map
-         */
-        map<T, TResult>(
-            collection: List<T>|Dictionary<T>|NumericDictionary<T> | null | undefined,
-            iteratee?: string
-        ): TResult[];
-
         /**
          * @see _.map
          */
         map<T>(
-            collection: List<T>|Dictionary<T>|NumericDictionary<T> | null | undefined,
+            collection: List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined,
+            iteratee?: string
+        ): any[];
+
+        /**
+         * @see _.map
+         */
+        map<T>(
+            collection: List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined,
             iteratee?: object
         ): boolean[];
     }
 
     interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.map
+         */
+        map<T, TResult>(
+            this: LoDashImplicitWrapper<T[] | null | undefined>,
+            iteratee: ArrayIterator<T, TResult>
+        ): LoDashImplicitWrapper<TResult[]>;
+
         /**
          * @see _.map
          */
@@ -1839,35 +1678,29 @@ declare module "../index" {
         /**
          * @see _.map
          */
-        map<T>(this: LoDashImplicitWrapper<List<T> | Dictionary<T> | null | undefined>): LoDashImplicitWrapper<T[]>;
+        map<T>(this: LoDashImplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>): LoDashImplicitWrapper<T[]>;
 
         /**
          * @see _.map
          */
-        map<T, TResult>(
-            this: LoDashImplicitWrapper<Dictionary<T> | null | undefined>,
-            iteratee: DictionaryIterator<T, TResult>
+        map<T extends object, TResult>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            iteratee: ObjectIterator<T, TResult>
         ): LoDashImplicitWrapper<TResult[]>;
 
         /** @see _.map */
         map<T, K extends keyof T>(
-            this: LoDashImplicitWrapper<List<T> | Dictionary<T> | null | undefined>,
+            this: LoDashImplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>,
             iteratee: K
         ): LoDashImplicitWrapper<Array<T[K]>>;
 
-        /** @see _.map */
-        map<T, TResult>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee?: NumericDictionaryIterator<T, TResult>
-        ): LoDashImplicitWrapper<TResult[]>;
-
         /**
          * @see _.map
          */
-        map<T, TResult>(
+        map<T>(
             this: LoDashImplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>,
             iteratee?: string
-        ): LoDashImplicitWrapper<TResult[]>;
+        ): LoDashImplicitWrapper<any[]>;
 
         /**
          * @see _.map
@@ -1879,6 +1712,14 @@ declare module "../index" {
     }
 
     interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.map
+         */
+        map<T, TResult>(
+            this: LoDashExplicitWrapper<T[] | null | undefined>,
+            iteratee: ArrayIterator<T, TResult>
+        ): LoDashExplicitWrapper<TResult[]>;
+
         /**
          * @see _.map
          */
@@ -1890,37 +1731,29 @@ declare module "../index" {
         /**
          * @see _.map
          */
-        map<T>(this: LoDashExplicitWrapper<List<T> | Dictionary<T> | null | undefined>): LoDashExplicitWrapper<T[]>;
+        map<T>(this: LoDashExplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>): LoDashExplicitWrapper<T[]>;
 
         /**
          * @see _.map
          */
-        map<T, TResult>(
-            this: LoDashExplicitWrapper<Dictionary<T> | null | undefined>,
-            iteratee: DictionaryIterator<T, TResult>
+        map<T extends object, TResult>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            iteratee: ObjectIterator<T, TResult>
         ): LoDashExplicitWrapper<TResult[]>;
 
         /** @see _.map */
         map<T, K extends keyof T>(
-            this: LoDashExplicitWrapper<List<T> | Dictionary<T> | null | undefined>,
+            this: LoDashExplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>,
             iteratee: K
         ): LoDashExplicitWrapper<Array<T[K]>>;
 
         /**
          * @see _.map
          */
-        map<T, TResult>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratee?: NumericDictionaryIterator<T, TResult>
-        ): LoDashExplicitWrapper<TResult[]>;
-
-        /**
-         * @see _.map
-         */
-        map<T, TResult>(
+        map<T>(
             this: LoDashExplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>,
             iteratee?: string
-        ): LoDashExplicitWrapper<TResult[]>;
+        ): LoDashExplicitWrapper<any[]>;
 
         /**
          * @see _.map
@@ -1991,24 +1824,6 @@ declare module "../index" {
             iteratees?: Many<ObjectIteratee<T>>,
             orders?: Many<boolean|string>
         ): Array<T[keyof T]>;
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<T>(
-            collection: NumericDictionary<T> | null | undefined,
-            iteratees?: Many<NumericDictionaryIterator<T, NotVoid>>,
-            orders?: Many<boolean|string>
-        ): T[];
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<T>(
-            collection: NumericDictionary<T> | null | undefined,
-            iteratees?: Many<NumericDictionaryIteratee<T>>,
-            orders?: Many<boolean|string>
-        ): T[];
     }
 
     interface LoDashImplicitWrapper<TValue> {
@@ -2047,24 +1862,6 @@ declare module "../index" {
             iteratees?: Many<ObjectIteratee<T>>,
             orders?: Many<boolean|string>
         ): LoDashImplicitWrapper<Array<T[keyof T]>>;
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<T>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratees?: Many<NumericDictionaryIterator<T, NotVoid>>,
-            orders?: Many<boolean|string>
-        ): LoDashImplicitWrapper<T[]>;
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<T>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratees?: Many<NumericDictionaryIteratee<T>>,
-            orders?: Many<boolean|string>
-        ): LoDashImplicitWrapper<T[]>;
     }
 
     interface LoDashExplicitWrapper<TValue> {
@@ -2103,24 +1900,6 @@ declare module "../index" {
             iteratees?: Many<ObjectIteratee<T>>,
             orders?: Many<boolean|string>
         ): LoDashExplicitWrapper<Array<T[keyof T]>>;
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<T>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratees?: Many<NumericDictionaryIterator<T, NotVoid>>,
-            orders?: Many<boolean|string>
-        ): LoDashExplicitWrapper<T[]>;
-
-        /**
-         * @see _.orderBy
-         */
-        orderBy<T>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            iteratees?: Many<NumericDictionaryIteratee<T>>,
-            orders?: Many<boolean|string>
-        ): LoDashExplicitWrapper<T[]>;
     }
 
     // partition
@@ -2233,15 +2012,6 @@ declare module "../index" {
             accumulator: TResult
         ): TResult;
 
-        /**
-        * @see _.reduce
-        **/
-        reduce<T, TResult>(
-            collection: NumericDictionary<T> | null | undefined,
-            callback: MemoListIterator<T, TResult, NumericDictionary<T>>,
-            accumulator: TResult
-        ): TResult;
-
         /**
         * @see _.reduce
         **/
@@ -2265,14 +2035,6 @@ declare module "../index" {
             collection: T | null | undefined,
             callback: MemoObjectIterator<T[keyof T], TResult, T>
         ): TResult | undefined;
-
-        /**
-         * @see _.reduce
-         **/
-        reduce<T, TResult>(
-            collection: NumericDictionary<T> | null | undefined,
-            callback: MemoListIterator<T, TResult, NumericDictionary<T>>
-        ): TResult | undefined;
     }
 
     interface LoDashImplicitWrapper<TValue> {
@@ -2303,15 +2065,6 @@ declare module "../index" {
             accumulator: TResult
         ): TResult;
 
-        /**
-         * @see _.reduce
-         **/
-        reduce<T, TResult>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            callback: MemoListIterator<T, TResult, NumericDictionary<T>>,
-            accumulator: TResult
-        ): TResult;
-
         /**
         * @see _.reduce
         **/
@@ -2335,14 +2088,6 @@ declare module "../index" {
             this: LoDashImplicitWrapper<T | null | undefined>,
             callback: MemoObjectIterator<T[keyof T], TResult, T>
         ): TResult | undefined;
-
-        /**
-        * @see _.reduce
-        **/
-        reduce<T, TResult>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            callback: MemoListIterator<T, TResult, NumericDictionary<T>>
-        ): TResult | undefined;
     }
 
     interface LoDashExplicitWrapper<TValue> {
@@ -2373,15 +2118,6 @@ declare module "../index" {
             accumulator: TResult
         ): LoDashExplicitWrapper<TResult>;
 
-        /**
-        * @see _.reduce
-        **/
-        reduce<T, TResult>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            callback: MemoListIterator<T, TResult, NumericDictionary<T>>,
-            accumulator: TResult
-        ): LoDashExplicitWrapper<TResult>;
-
         /**
         * @see _.reduce
         **/
@@ -2405,14 +2141,6 @@ declare module "../index" {
             this: LoDashExplicitWrapper<T | null | undefined>,
             callback: MemoObjectIterator<T[keyof T], TResult, T>
         ): LoDashExplicitWrapper<TResult | undefined>;
-
-        /**
-         * @see _.reduce
-         **/
-        reduce<T, TResult>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            callback: MemoListIterator<T, TResult, NumericDictionary<T>>
-        ): LoDashExplicitWrapper<TResult | undefined>;
     }
 
     // reduceRight
@@ -2450,15 +2178,6 @@ declare module "../index" {
             accumulator: TResult
         ): TResult;
 
-        /**
-        * @see _.reduceRight
-        **/
-        reduceRight<T, TResult>(
-            collection: NumericDictionary<T> | null | undefined,
-            callback: MemoListIterator<T, TResult, NumericDictionary<T>>,
-            accumulator: TResult
-        ): TResult;
-
         /**
         * @see _.reduceRight
         **/
@@ -2482,14 +2201,6 @@ declare module "../index" {
             collection: T | null | undefined,
             callback: MemoObjectIterator<T[keyof T], TResult, T>
         ): TResult | undefined;
-
-        /**
-        * @see _.reduceRight
-        **/
-        reduceRight<T, TResult>(
-            collection: NumericDictionary<T> | null | undefined,
-            callback: MemoListIterator<T, TResult, NumericDictionary<T>>
-        ): TResult | undefined;
     }
 
     interface LoDashImplicitWrapper<TValue> {
@@ -2520,15 +2231,6 @@ declare module "../index" {
             accumulator: TResult
         ): TResult;
 
-        /**
-        * @see _.reduceRight
-        **/
-        reduceRight<T, TResult>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            callback: MemoListIterator<T, TResult, NumericDictionary<T>>,
-            accumulator: TResult
-        ): TResult;
-
         /**
         * @see _.reduceRight
         **/
@@ -2552,14 +2254,6 @@ declare module "../index" {
             this: LoDashImplicitWrapper<T | null | undefined>,
             callback: MemoObjectIterator<T[keyof T], TResult, T>
         ): TResult | undefined;
-
-        /**
-        * @see _.reduceRight
-        **/
-        reduceRight<T, TResult>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            callback: MemoListIterator<T, TResult, NumericDictionary<T>>
-        ): TResult | undefined;
     }
 
     interface LoDashExplicitWrapper<TValue> {
@@ -2590,15 +2284,6 @@ declare module "../index" {
             accumulator: TResult
         ): LoDashExplicitWrapper<TResult>;
 
-        /**
-        * @see _.reduceRight
-        **/
-        reduceRight<T, TResult>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            callback: MemoListIterator<T, TResult, NumericDictionary<T>>,
-            accumulator: TResult
-        ): LoDashExplicitWrapper<TResult>;
-
         /**
         * @see _.reduceRight
         **/
@@ -2622,14 +2307,6 @@ declare module "../index" {
             this: LoDashExplicitWrapper<T | null | undefined>,
             callback: MemoObjectIterator<T[keyof T], TResult, T>
         ): LoDashExplicitWrapper<TResult | undefined>;
-
-        /**
-         * @see _.reduceRight
-         **/
-        reduceRight<T, TResult>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            callback: MemoListIterator<T, TResult, NumericDictionary<T>>
-        ): LoDashExplicitWrapper<TResult | undefined>;
     }
 
     // reject
@@ -2731,13 +2408,6 @@ declare module "../index" {
             collection: List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined
         ): T | undefined;
 
-        /**
-         * @see _.sample
-         */
-        sample<T extends object>(
-            collection: T
-        ): T[keyof T];
-
         /**
          * @see _.sample
          */
@@ -2754,13 +2424,6 @@ declare module "../index" {
             this: LoDashImplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>
         ): T | undefined;
 
-        /**
-         * @see _.sample
-         */
-        sample<T extends object>(
-            this: LoDashImplicitWrapper<T>,
-        ): T[keyof T];
-
         /**
          * @see _.sample
          */
@@ -2777,13 +2440,6 @@ declare module "../index" {
             this: LoDashExplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>
         ): LoDashExplicitWrapper<T | undefined>;
 
-        /**
-         * @see _.sample
-         */
-        sample<T extends object>(
-            this: LoDashExplicitWrapper<T>,
-        ): LoDashExplicitWrapper<T[keyof T]>;
-
         /**
          * @see _.sample
          */
@@ -2803,7 +2459,7 @@ declare module "../index" {
          * @return Returns the random elements.
          */
         sampleSize<T>(
-            collection: List<T>|Dictionary<T>|NumericDictionary<T> | null | undefined,
+            collection: List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined,
             n?: number
         ): T[];
 
@@ -2821,7 +2477,7 @@ declare module "../index" {
          * @see _.sampleSize
          */
         sampleSize<T>(
-            this: LoDashImplicitWrapper<List<T>|Dictionary<T>|NumericDictionary<T> | null | undefined>,
+            this: LoDashImplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>,
             n?: number
         ): LoDashImplicitWrapper<T[]>;
 
@@ -2839,7 +2495,7 @@ declare module "../index" {
          * @see _.sampleSize
          */
         sampleSize<T>(
-            this: LoDashExplicitWrapper<List<T>|Dictionary<T>|NumericDictionary<T> | null | undefined>,
+            this: LoDashExplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>,
             n?: number
         ): LoDashExplicitWrapper<T[]>;
 
@@ -2943,14 +2599,6 @@ declare module "../index" {
             collection: T | null | undefined,
             predicate?: ObjectIterateeCustom<T, boolean>
         ): boolean;
-
-        /**
-         * @see _.some
-         */
-        some<T>(
-            collection: NumericDictionary<T> | null | undefined,
-            predicate?: NumericDictionaryIterateeCustom<T, boolean>
-        ): boolean;
     }
 
     interface LoDashImplicitWrapper<TValue> {
@@ -2969,14 +2617,6 @@ declare module "../index" {
             this: LoDashImplicitWrapper<T | null | undefined>,
             predicate?: ObjectIterateeCustom<T, boolean>
         ): boolean;
-
-        /**
-         * @see _.some
-         */
-        some<T>(
-            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
-            predicate?: NumericDictionaryIterateeCustom<T, boolean>
-        ): boolean;
     }
 
     interface LoDashExplicitWrapper<TValue> {
@@ -2995,14 +2635,6 @@ declare module "../index" {
             this: LoDashExplicitWrapper<T | null | undefined>,
             predicate?: ObjectIterateeCustom<T, boolean>
         ): LoDashExplicitWrapper<boolean>;
-
-        /**
-         * @see _.some
-         */
-        some<T>(
-            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
-            predicate?: NumericDictionaryIterateeCustom<T, boolean>
-        ): LoDashExplicitWrapper<boolean>;
     }
 
     // sortBy
diff --git a/types/lodash/common/common.d.ts b/types/lodash/common/common.d.ts
index ac3e137b12..468019ea53 100644
--- a/types/lodash/common/common.d.ts
+++ b/types/lodash/common/common.d.ts
@@ -188,17 +188,9 @@ declare module "../index" {
     // Note: key should be string, not keyof T, because the actual object may contain extra properties that were not specified in the type.
     type ObjectIterator<TObject, TResult> = (value: TObject[keyof TObject], key: string, collection: TObject) => TResult;
     type ObjectIteratee<TObject> = ObjectIterator<TObject, NotVoid> | string | [string, any] | PartialDeep<TObject[keyof TObject]>;
-    type ObjectIterateeCustom<TObject, TResult> = ObjectIterator<TObject, TResult> | string | object | [string, any] | PartialDeep<TObject[keyof TObject]>;
+    type ObjectIterateeCustom<TObject, TResult> = ObjectIterator<TObject, TResult> | string | [string, any] | PartialDeep<TObject[keyof TObject]>;
     type ObjectIteratorTypeGuard<TObject, S extends TObject[keyof TObject]> = (value: TObject[keyof TObject], key: string, collection: TObject) => value is S;
 
-    type DictionaryIterator<T, TResult> = ObjectIterator<Dictionary<T>, TResult>;
-    type DictionaryIteratee<T> = ObjectIteratee<Dictionary<T>>;
-    type DictionaryIteratorTypeGuard<T, S extends T> = ObjectIteratorTypeGuard<Dictionary<T>, S>;
-
-    type NumericDictionaryIterator<T, TResult> = (value: T, key: number, collection: NumericDictionary<T>) => TResult;
-    type NumericDictionaryIteratee<T> = NumericDictionaryIterator<T, NotVoid> | string | [string, any] | PartialDeep<T>;
-    type NumericDictionaryIterateeCustom<T, TResult> = NumericDictionaryIterator<T, TResult> | string | [string, any] | PartialDeep<T>;
-
     type StringIterator<TResult> = (char: string, index: number, string: string) => TResult;
 
     type MemoVoidIterator<T, TResult> = (prev: TResult, curr: T, indexOrKey: any, list: T[]) => void;
@@ -230,6 +222,11 @@ declare module "../index" {
         [index: number]: T;
     }
 
+    // Crazy typedef needed get _.omit to work properly with Dictionary and NumericDictionary
+    type AnyKindOfDictionary =
+        | Dictionary<{} | null | undefined>
+        | NumericDictionary<{} | null | undefined>;
+
     interface Cancelable {
         cancel(): void;
         flush(): void;
@@ -252,4 +249,12 @@ declare module "../index" {
     type LoDashExplicitNillableObjectWrapper<T> = LoDashExplicitWrapper<T | null | undefined>;
     type LoDashExplicitNumberArrayWrapper = LoDashExplicitWrapper<number[]>;
     type LoDashExplicitStringWrapper = LoDashExplicitWrapper<string>;
+
+    type DictionaryIterator<T, TResult> = ObjectIterator<Dictionary<T>, TResult>;
+    type DictionaryIteratee<T> = ObjectIteratee<Dictionary<T>>;
+    type DictionaryIteratorTypeGuard<T, S extends T> = ObjectIteratorTypeGuard<Dictionary<T>, S>;
+    // NOTE: keys of objects at run time are always strings, even when a NumericDictionary is being iterated.
+    type NumericDictionaryIterator<T, TResult> = (value: T, key: string, collection: NumericDictionary<T>) => TResult;
+    type NumericDictionaryIteratee<T> = NumericDictionaryIterator<T, NotVoid> | string | [string, any] | PartialDeep<T>;
+    type NumericDictionaryIterateeCustom<T, TResult> = NumericDictionaryIterator<T, TResult> | string | [string, any] | PartialDeep<T>;
 }
diff --git a/types/lodash/common/object.d.ts b/types/lodash/common/object.d.ts
index 6100e25c43..3063072b17 100644
--- a/types/lodash/common/object.d.ts
+++ b/types/lodash/common/object.d.ts
@@ -718,7 +718,7 @@ declare module "../index" {
          * @return Returns the new array of picked elements.
          */
         at<T>(
-            object: List<T> | Dictionary<T> | null | undefined,
+            object: List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined,
             ...props: PropertyPath[]
         ): T[];
 
@@ -736,7 +736,7 @@ declare module "../index" {
          * @see _.at
          */
         at<T>(
-            this: LoDashImplicitWrapper<List<T> | Dictionary<T> | null | undefined>,
+            this: LoDashImplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>,
             ...props: PropertyPath[]
         ): LoDashImplicitWrapper<T[]>;
 
@@ -754,7 +754,7 @@ declare module "../index" {
          * @see _.at
          */
         at<T>(
-            this: LoDashExplicitWrapper<List<T> | Dictionary<T> | null | undefined>,
+            this: LoDashExplicitWrapper<List<T> | Dictionary<T> | NumericDictionary<T> | null | undefined>,
             ...props: PropertyPath[]
         ): LoDashExplicitWrapper<T[]>;
 
@@ -987,7 +987,7 @@ declare module "../index" {
         /**
          * @see _.toPairs
          */
-        entries<T>(object?: Dictionary<T>): Array<[string, T]>;
+        entries<T>(object?: Dictionary<T> | NumericDictionary<T>): Array<[string, T]>;
 
         /**
          * @see _.toPairs
@@ -999,7 +999,7 @@ declare module "../index" {
         /**
          * @see _.toPairs
          */
-        entries<T>(this: LoDashImplicitWrapper<Dictionary<T>>): LoDashImplicitWrapper<Array<[string, T]>>;
+        entries<T>(this: LoDashImplicitWrapper<Dictionary<T> | NumericDictionary<T>>): LoDashImplicitWrapper<Array<[string, T]>>;
 
         /**
          * @see _.toPairs
@@ -1011,7 +1011,7 @@ declare module "../index" {
         /**
          * @see _.toPairs
          */
-        entries<T>(this: LoDashExplicitWrapper<Dictionary<T>>): LoDashExplicitWrapper<Array<[string, T]>>;
+        entries<T>(this: LoDashExplicitWrapper<Dictionary<T> | NumericDictionary<T>>): LoDashExplicitWrapper<Array<[string, T]>>;
 
         /**
          * @see _.toPairs
@@ -1025,7 +1025,7 @@ declare module "../index" {
         /**
          * @see _.entriesIn
          */
-        entriesIn<T>(object?: Dictionary<T>): Array<[string, T]>;
+        entriesIn<T>(object?: Dictionary<T> | NumericDictionary<T>): Array<[string, T]>;
 
         /**
          * @see _.entriesIn
@@ -1037,7 +1037,7 @@ declare module "../index" {
         /**
          * @see _.entriesIn
          */
-        entriesIn<T>(this: LoDashImplicitWrapper<Dictionary<T>>): LoDashImplicitWrapper<Array<[string, T]>>;
+        entriesIn<T>(this: LoDashImplicitWrapper<Dictionary<T> | NumericDictionary<T>>): LoDashImplicitWrapper<Array<[string, T]>>;
 
         /**
          * @see _.entriesIn
@@ -1049,7 +1049,7 @@ declare module "../index" {
         /**
          * @see _.entriesIn
          */
-        entriesIn<T>(this: LoDashExplicitWrapper<Dictionary<T>>): LoDashExplicitWrapper<Array<[string, T]>>;
+        entriesIn<T>(this: LoDashExplicitWrapper<Dictionary<T> | NumericDictionary<T>>): LoDashExplicitWrapper<Array<[string, T]>>;
 
         /**
          * @see _.entriesIn
@@ -2210,18 +2210,10 @@ declare module "../index" {
         /**
          * @see _.mapKeys
          */
-        mapKeys<T>(
-            object: Dictionary<T> | null | undefined,
-            iteratee?: DictionaryIteratee<T>
-        ): Dictionary<T>;
-
-        /**
-         * @see _.mapKeys
-         */
-        mapKeys(
-            object: object | null | undefined,
-            iteratee?: ObjectIteratee<any>
-        ): Dictionary<any>;
+        mapKeys<T extends object>(
+            object: T | null | undefined,
+            iteratee?: ObjectIteratee<T>
+        ): Dictionary<T[keyof T]>;
     }
 
     interface LoDashImplicitWrapper<TValue> {
@@ -2236,18 +2228,10 @@ declare module "../index" {
         /**
          * @see _.mapKeys
          */
-        mapKeys<T>(
-            this: LoDashImplicitWrapper<Dictionary<T> | null | undefined>,
-            iteratee?: DictionaryIteratee<T>
-        ): LoDashImplicitWrapper<Dictionary<T>>;
-
-        /**
-         * @see _.mapKeys
-         */
-        mapKeys(
-            this: LoDashImplicitWrapper<object | null | undefined>,
-            iteratee?: ObjectIteratee<any>
-        ): LoDashImplicitWrapper<Dictionary<any>>;
+        mapKeys<T extends object>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
+            iteratee?: ObjectIteratee<T>
+        ): LoDashImplicitWrapper<Dictionary<T[keyof T]>>;
     }
 
     interface LoDashExplicitWrapper<TValue> {
@@ -2262,18 +2246,10 @@ declare module "../index" {
         /**
          * @see _.mapKeys
          */
-        mapKeys<T>(
-            this: LoDashExplicitWrapper<Dictionary<T> | null | undefined>,
-            iteratee?: DictionaryIteratee<T>
-        ): LoDashExplicitWrapper<Dictionary<T>>;
-
-        /**
-         * @see _.mapKeys
-         */
-        mapKeys(
-            this: LoDashExplicitWrapper<object | null | undefined>,
-            iteratee?: ObjectIteratee<any>
-        ): LoDashExplicitWrapper<Dictionary<any>>;
+        mapKeys<T extends object>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
+            iteratee?: ObjectIteratee<T>
+        ): LoDashExplicitWrapper<Dictionary<T[keyof T]>>;
     }
 
     // mapValues
@@ -2298,8 +2274,27 @@ declare module "../index" {
         * @param [thisArg] The `this` binding of `iteratee`.
         * @return Returns the new mapped object.
         */
+        mapValues<TResult>(obj: string | null | undefined, callback: StringIterator<TResult>): NumericDictionary<TResult>;
+
+        /**
+         * @see _.mapValues
+         * TODO: This would be better if we had a separate overload for obj: NumericDictionary that returned a NumericDictionary,
+         *       but TypeScript cannot select overload signatures based on number vs string index key type.
+         */
+        mapValues<T, TResult>(obj: Dictionary<T> | NumericDictionary<T> | null | undefined, callback: ObjectIterator<Dictionary<T>, TResult>): Dictionary<TResult>;
+
+        /**
+         * @see _.mapValues
+         */
         mapValues<T extends object, TResult>(obj: T | null | undefined, callback: ObjectIterator<T, TResult>): { [P in keyof T]: TResult };
 
+        /**
+         * @see _.mapValues
+         * TODO: This would be better if we had a separate overload for obj: NumericDictionary that returned a NumericDictionary,
+         *       but TypeScript cannot select overload signatures based on number vs string index key type.
+         */
+        mapValues<T>(obj: Dictionary<T> | NumericDictionary<T> | null | undefined, iteratee: object): Dictionary<boolean>;
+
         /**
          * @see _.mapValues
          */
@@ -2307,23 +2302,34 @@ declare module "../index" {
 
         /**
          * @see _.mapValues
+         * TODO: This would be better if we had a separate overload for obj: NumericDictionary that returned a NumericDictionary,
+         *       but TypeScript cannot select overload signatures based on number vs string index key type.
          */
-        mapValues<T, TKey extends keyof T>(obj: Dictionary<T> | null | undefined, iteratee: TKey): Dictionary<T[TKey]>;
+        mapValues<T, TKey extends keyof T>(obj: Dictionary<T> | NumericDictionary<T> | null | undefined, iteratee: TKey): Dictionary<T[TKey]>;
+
+        /**
+         * @see _.mapValues
+         * TODO: This would be better if we had a separate overload for obj: NumericDictionary that returned a NumericDictionary,
+         *       but TypeScript cannot select overload signatures based on number vs string index key type.
+         */
+        mapValues<T>(obj: Dictionary<T> | NumericDictionary<T> | null | undefined, iteratee: string): Dictionary<any>;
 
         /**
          * @see _.mapValues
          */
-        mapValues<T extends object, TKey extends keyof T>(obj: T | null | undefined, iteratee: string): { [P in keyof T]: any };
+        mapValues<T extends object>(obj: T | null | undefined, iteratee: string): { [P in keyof T]: any };
 
         /**
          * @see _.mapValues
          */
-        mapValues<TResult>(obj: string | null | undefined, callback: StringIterator<TResult>): NumericDictionary<TResult>;
+        mapValues(obj: string | null | undefined): NumericDictionary<string>;
 
         /**
          * @see _.mapValues
+         * TODO: This would be better if we had a separate overload for obj: NumericDictionary that returned a NumericDictionary,
+         *       but TypeScript cannot select overload signatures based on number vs string index key type.
          */
-        mapValues<T>(obj: Dictionary<T> | null | undefined): Dictionary<T>;
+        mapValues<T>(obj: Dictionary<T> | NumericDictionary<T> | null | undefined): Dictionary<T>;
 
         /**
          * @see _.mapValues
@@ -2333,15 +2339,28 @@ declare module "../index" {
         /**
          * @see _.mapValues
          */
-        mapValues<T extends object>(obj: T | null | undefined): T | {};
-
-        /**
-         * @see _.mapValues
-         */
-        mapValues(obj: string | null | undefined): NumericDictionary<string>;
+        mapValues<T extends object>(obj: T | null | undefined): PartialObject<T>;
     }
 
     interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.mapValues
+         */
+        mapValues<TResult>(
+            this: LoDashImplicitWrapper<string | null | undefined>,
+            callback: StringIterator<TResult>
+        ): LoDashImplicitWrapper<NumericDictionary<TResult>>;
+
+        /**
+         * @see _.mapValues
+         * TODO: This would be better if we had a separate overload for obj: NumericDictionary that returned a NumericDictionary,
+         *       but TypeScript cannot select overload signatures based on number vs string index key type.
+         */
+        mapValues<T, TResult>(
+            this: LoDashImplicitWrapper<Dictionary<T> | NumericDictionary<T> | null | undefined>,
+            callback: ObjectIterator<Dictionary<T>, TResult>
+        ): LoDashImplicitWrapper<Dictionary<TResult>>;
+
         /**
          * @see _.mapValues
          */
@@ -2350,6 +2369,16 @@ declare module "../index" {
             callback: ObjectIterator<T, TResult>
         ): LoDashImplicitWrapper<{ [P in keyof T]: TResult }>;
 
+        /**
+         * @see _.mapValues
+         * TODO: This would be better if we had a separate overload for obj: NumericDictionary that returned a NumericDictionary,
+         *       but TypeScript cannot select overload signatures based on number vs string index key type.
+         */
+        mapValues<T>(
+            this: LoDashImplicitWrapper<Dictionary<T> | NumericDictionary<T> | null | undefined>,
+            iteratee: object
+        ): LoDashImplicitWrapper<Dictionary<boolean>>;
+
         /**
          * @see _.mapValues
          */
@@ -2360,16 +2389,28 @@ declare module "../index" {
 
         /**
          * @see _.mapValues
+         * TODO: This would be better if we had a separate overload for obj: NumericDictionary that returned a NumericDictionary,
+         *       but TypeScript cannot select overload signatures based on number vs string index key type.
          */
         mapValues<T, TKey extends keyof T>(
-            this: LoDashImplicitWrapper<Dictionary<T> | null | undefined>,
+            this: LoDashImplicitWrapper<Dictionary<T> | NumericDictionary<T> | null | undefined>,
             iteratee: TKey
         ): LoDashImplicitWrapper<Dictionary<T[TKey]>>;
 
         /**
          * @see _.mapValues
+         * TODO: This would be better if we had a separate overload for obj: NumericDictionary that returned a NumericDictionary,
+         *       but TypeScript cannot select overload signatures based on number vs string index key type.
          */
-        mapValues<T extends object, TKey extends keyof T>(
+        mapValues<T>(
+            this: LoDashImplicitWrapper<Dictionary<T> | NumericDictionary<T> | null | undefined>,
+            iteratee: string
+        ): LoDashImplicitWrapper<Dictionary<any>>;
+
+        /**
+         * @see _.mapValues
+         */
+        mapValues<T extends object>(
             this: LoDashImplicitWrapper<T | null | undefined>,
             iteratee: string
         ): LoDashImplicitWrapper<{ [P in keyof T]: any }>;
@@ -2377,15 +2418,14 @@ declare module "../index" {
         /**
          * @see _.mapValues
          */
-        mapValues<TResult>(
-            this: LoDashImplicitWrapper<string | null | undefined>,
-            callback: StringIterator<TResult>
-        ): LoDashImplicitWrapper<NumericDictionary<TResult>>;
+        mapValues(this: LoDashImplicitWrapper<string | null | undefined>): LoDashImplicitWrapper<NumericDictionary<string>>;
 
         /**
          * @see _.mapValues
+         * TODO: This would be better if we had a separate overload for obj: NumericDictionary that returned a NumericDictionary,
+         *       but TypeScript cannot select overload signatures based on number vs string index key type.
          */
-        mapValues<T>(this: LoDashImplicitWrapper<Dictionary<T> | null | undefined>): LoDashImplicitWrapper<Dictionary<T>>;
+        mapValues<T>(this: LoDashImplicitWrapper<Dictionary<T> | NumericDictionary<T> | null | undefined>): LoDashImplicitWrapper<Dictionary<T>>;
 
         /**
          * @see _.mapValues
@@ -2395,15 +2435,28 @@ declare module "../index" {
         /**
          * @see _.mapValues
          */
-        mapValues<T extends object>(this: LoDashImplicitWrapper<T | null | undefined>): LoDashImplicitWrapper<T | {}>;
-
-        /**
-         * @see _.mapValues
-         */
-        mapValues(this: LoDashImplicitWrapper<string | null | undefined>): LoDashImplicitWrapper<NumericDictionary<string>>;
+        mapValues<T extends object>(this: LoDashImplicitWrapper<T | null | undefined>): LoDashImplicitWrapper<PartialObject<T>>;
     }
 
     interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.mapValues
+         */
+        mapValues<TResult>(
+            this: LoDashExplicitWrapper<string | null | undefined>,
+            callback: StringIterator<TResult>
+        ): LoDashExplicitWrapper<NumericDictionary<TResult>>;
+
+        /**
+         * @see _.mapValues
+         * TODO: This would be better if we had a separate overload for obj: NumericDictionary that returned a NumericDictionary,
+         *       but TypeScript cannot select overload signatures based on number vs string index key type.
+         */
+        mapValues<T, TResult>(
+            this: LoDashExplicitWrapper<Dictionary<T> | NumericDictionary<T> | null | undefined>,
+            callback: ObjectIterator<Dictionary<T>, TResult>
+        ): LoDashExplicitWrapper<Dictionary<TResult>>;
+
         /**
          * @see _.mapValues
          */
@@ -2412,6 +2465,16 @@ declare module "../index" {
             callback: ObjectIterator<T, TResult>
         ): LoDashExplicitWrapper<{ [P in keyof T]: TResult }>;
 
+        /**
+         * @see _.mapValues
+         * TODO: This would be better if we had a separate overload for obj: NumericDictionary that returned a NumericDictionary,
+         *       but TypeScript cannot select overload signatures based on number vs string index key type.
+         */
+        mapValues<T>(
+            this: LoDashExplicitWrapper<Dictionary<T> | NumericDictionary<T> | null | undefined>,
+            iteratee: object
+        ): LoDashExplicitWrapper<Dictionary<boolean>>;
+
         /**
          * @see _.mapValues
          */
@@ -2422,16 +2485,28 @@ declare module "../index" {
 
         /**
          * @see _.mapValues
+         * TODO: This would be better if we had a separate overload for obj: NumericDictionary that returned a NumericDictionary,
+         *       but TypeScript cannot select overload signatures based on number vs string index key type.
          */
         mapValues<T, TKey extends keyof T>(
-            this: LoDashExplicitWrapper<Dictionary<T> | null | undefined>,
+            this: LoDashExplicitWrapper<Dictionary<T> | NumericDictionary<T> | null | undefined>,
             iteratee: TKey
         ): LoDashExplicitWrapper<Dictionary<T[TKey]>>;
 
         /**
          * @see _.mapValues
+         * TODO: This would be better if we had a separate overload for obj: NumericDictionary that returned a NumericDictionary,
+         *       but TypeScript cannot select overload signatures based on number vs string index key type.
          */
-        mapValues<T extends object, TKey extends keyof T>(
+        mapValues<T>(
+            this: LoDashExplicitWrapper<Dictionary<T> | NumericDictionary<T> | null | undefined>,
+            iteratee: string
+        ): LoDashExplicitWrapper<Dictionary<any>>;
+
+        /**
+         * @see _.mapValues
+         */
+        mapValues<T extends object>(
             this: LoDashExplicitWrapper<T | null | undefined>,
             iteratee: string
         ): LoDashExplicitWrapper<{ [P in keyof T]: any }>;
@@ -2439,15 +2514,14 @@ declare module "../index" {
         /**
          * @see _.mapValues
          */
-        mapValues<TResult>(
-            this: LoDashExplicitWrapper<string | null | undefined>,
-            callback: StringIterator<TResult>
-        ): LoDashExplicitWrapper<NumericDictionary<TResult>>;
+        mapValues(this: LoDashExplicitWrapper<string | null | undefined>): LoDashExplicitWrapper<NumericDictionary<string>>;
 
         /**
          * @see _.mapValues
+         * TODO: This would be better if we had a separate overload for obj: NumericDictionary that returned a NumericDictionary,
+         *       but TypeScript cannot select overload signatures based on number vs string index key type.
          */
-        mapValues<T>(this: LoDashExplicitWrapper<Dictionary<T> | null | undefined>): LoDashExplicitWrapper<Dictionary<T>>;
+        mapValues<T>(this: LoDashExplicitWrapper<Dictionary<T> | NumericDictionary<T> | null | undefined>): LoDashExplicitWrapper<Dictionary<T>>;
 
         /**
          * @see _.mapValues
@@ -2457,12 +2531,7 @@ declare module "../index" {
         /**
          * @see _.mapValues
          */
-        mapValues<T extends object>(this: LoDashExplicitWrapper<T | null | undefined>): LoDashExplicitWrapper<T | {}>;
-
-        /**
-         * @see _.mapValues
-         */
-        mapValues(this: LoDashExplicitWrapper<string | null | undefined>): LoDashExplicitWrapper<NumericDictionary<string>>;
+        mapValues<T extends object>(this: LoDashExplicitWrapper<T | null | undefined>): LoDashExplicitWrapper<PartialObject<T>>;
     }
 
     // merge
@@ -2773,10 +2842,10 @@ declare module "../index" {
          * _.omit(object, ['a', 'c']);
          * // => { 'b': '2' }
          */
-        omit<T>(
-            object: Dictionary<T>,
+        omit<T extends AnyKindOfDictionary>(
+            object: T | null | undefined,
             ...paths: PropertyPath[]
-        ): Dictionary<T>;
+        ): T;
 
         /**
          * @see _.omit
@@ -2791,10 +2860,10 @@ declare module "../index" {
         /**
          * @see _.omit
          */
-        omit<T>(
-            this: LoDashImplicitWrapper<Dictionary<T>>,
+        omit<T extends AnyKindOfDictionary>(
+            this: LoDashImplicitWrapper<T | null | undefined>,
             ...paths: PropertyPath[]
-        ): LoDashImplicitWrapper<Dictionary<T>>;
+        ): LoDashImplicitWrapper<T>;
 
         /**
          * @see _.omit
@@ -2809,10 +2878,10 @@ declare module "../index" {
         /**
          * @see _.omit
          */
-        omit<T>(
-            this: LoDashExplicitWrapper<Dictionary<T>>,
+        omit<T extends AnyKindOfDictionary>(
+            this: LoDashExplicitWrapper<T | null | undefined>,
             ...paths: PropertyPath[]
-        ): LoDashExplicitWrapper<Dictionary<T>>;
+        ): LoDashExplicitWrapper<T>;
 
         /**
          * @see _.omit
@@ -3164,7 +3233,7 @@ declare module "../index" {
          * @param object The object to query.
          * @return Returns the new array of key-value pairs.
          */
-        toPairs<T>(object?: Dictionary<T>): Array<[string, T]>;
+        toPairs<T>(object?: Dictionary<T> | NumericDictionary<T>): Array<[string, T]>;
 
         /**
          * @see _.toPairs
@@ -3176,7 +3245,7 @@ declare module "../index" {
         /**
          * @see _.toPairs
          */
-        toPairs<T>(this: LoDashImplicitWrapper<Dictionary<T>>): LoDashImplicitWrapper<Array<[string, T]>>;
+        toPairs<T>(this: LoDashImplicitWrapper<Dictionary<T> | NumericDictionary<T>>): LoDashImplicitWrapper<Array<[string, T]>>;
 
         /**
          * @see _.toPairs
@@ -3188,7 +3257,7 @@ declare module "../index" {
         /**
          * @see _.toPairs
          */
-        toPairs<T>(this: LoDashExplicitWrapper<Dictionary<T>>): LoDashExplicitWrapper<Array<[string, T]>>;
+        toPairs<T>(this: LoDashExplicitWrapper<Dictionary<T> | NumericDictionary<T>>): LoDashExplicitWrapper<Array<[string, T]>>;
 
         /**
          * @see _.toPairs
@@ -3205,7 +3274,7 @@ declare module "../index" {
          * @param object The object to query.
          * @return Returns the new array of key-value pairs.
          */
-        toPairsIn<T>(object?: Dictionary<T>): Array<[string, T]>;
+        toPairsIn<T>(object?: Dictionary<T> | NumericDictionary<T>): Array<[string, T]>;
 
         /**
          * @see _.toPairsIn
@@ -3217,7 +3286,7 @@ declare module "../index" {
         /**
          * @see _.toPairsIn
          */
-        toPairsIn<T>(this: LoDashImplicitWrapper<Dictionary<T>>): LoDashImplicitWrapper<Array<[string, T]>>;
+        toPairsIn<T>(this: LoDashImplicitWrapper<Dictionary<T> | NumericDictionary<T>>): LoDashImplicitWrapper<Array<[string, T]>>;
 
         /**
          * @see _.toPairsIn
@@ -3229,7 +3298,7 @@ declare module "../index" {
         /**
          * @see _.toPairsIn
          */
-        toPairsIn<T>(this: LoDashExplicitWrapper<Dictionary<T>>): LoDashExplicitWrapper<Array<[string, T]>>;
+        toPairsIn<T>(this: LoDashExplicitWrapper<Dictionary<T> | NumericDictionary<T>>): LoDashExplicitWrapper<Array<[string, T]>>;
 
         /**
          * @see _.toPairsIn
@@ -3563,7 +3632,7 @@ declare module "../index" {
          * @param object The object to query.
          * @return Returns an array of property values.
          */
-        values<T>(object: Dictionary<T>|NumericDictionary<T>|List<T> | null | undefined): T[];
+        values<T>(object: Dictionary<T> | NumericDictionary<T> | List<T> | null | undefined): T[];
 
         /**
          * @see _.values
diff --git a/types/lodash/lodash-tests.ts b/types/lodash/lodash-tests.ts
index 7646cd02a6..20bde973aa 100644
--- a/types/lodash/lodash-tests.ts
+++ b/types/lodash/lodash-tests.ts
@@ -109,11 +109,11 @@ namespace TestChunk {
     {
         let result: AbcObject[][];
 
-        result = _.chunk<AbcObject>(array);
-        result = _.chunk<AbcObject>(array, 42);
+        result = _.chunk(array);
+        result = _.chunk(array, 42);
 
-        result = _.chunk<AbcObject>(list);
-        result = _.chunk<AbcObject>(list, 42);
+        result = _.chunk(list);
+        result = _.chunk(list, 42);
     }
 
     {
@@ -122,8 +122,8 @@ namespace TestChunk {
         result = _(array).chunk();
         result = _(array).chunk(42);
 
-        result = _(list).chunk<AbcObject>();
-        result = _(list).chunk<AbcObject>(42);
+        result = _(list).chunk();
+        result = _(list).chunk(42);
     }
 
     {
@@ -133,8 +133,8 @@ namespace TestChunk {
         result = _(array).chain().chunk();
         result = _(array).chain().chunk(42);
 
-        result = _(list).chain().chunk<AbcObject>();
-        result = _(list).chain().chunk<AbcObject>(42);
+        result = _(list).chain().chunk();
+        result = _(list).chain().chunk(42);
     }
 }
 
@@ -148,8 +148,8 @@ namespace TestCompact {
     {
         let result: AbcObject[];
 
-        result = _.compact<AbcObject>(array);
-        result = _.compact<AbcObject>(list);
+        result = _.compact(array);
+        result = _.compact(list);
         result = _.compact(array2);
         result = _.compact(list2);
     }
@@ -158,14 +158,14 @@ namespace TestCompact {
         let result: _.LoDashImplicitArrayWrapper<AbcObject>;
 
         result = _(array).compact();
-        result = _(list).compact<AbcObject>();
+        result = _(list).compact();
     }
 
     {
         let result: _.LoDashExplicitArrayWrapper<AbcObject>;
 
         result = _(array).chain().compact();
-        result = _(list).chain().compact<AbcObject>();
+        result = _(list).chain().compact();
     }
 }
 
@@ -198,10 +198,10 @@ namespace TestDifference {
         result = _(array).difference(listParam, arrayParam);
         result = _(array).difference(arrayParam, listParam, arrayParam);
 
-        result = _(list).difference<AbcObject>();
-        result = _(list).difference<AbcObject>(listParam);
-        result = _(list).difference<AbcObject>(arrayParam, listParam);
-        result = _(list).difference<AbcObject>(listParam, arrayParam, listParam);
+        result = _(list).difference();
+        result = _(list).difference(listParam);
+        result = _(list).difference(arrayParam, listParam);
+        result = _(list).difference(listParam, arrayParam, listParam);
     }
 
     {
@@ -212,10 +212,10 @@ namespace TestDifference {
         result = _(array).chain().difference(listParam, arrayParam);
         result = _(array).chain().difference(arrayParam, listParam, arrayParam);
 
-        result = _(list).chain().difference<AbcObject>();
-        result = _(list).chain().difference<AbcObject>(listParam);
-        result = _(list).chain().difference<AbcObject>(arrayParam, listParam);
-        result = _(list).chain().difference<AbcObject>(listParam, arrayParam, listParam);
+        result = _(list).chain().difference();
+        result = _(list).chain().difference(listParam);
+        result = _(list).chain().difference(arrayParam, listParam);
+        result = _(list).chain().difference(listParam, arrayParam, listParam);
     }
 }
 
@@ -231,12 +231,12 @@ namespace TestDifferenceBy {
         let result: AbcObject[];
 
         result = _.differenceBy(array);
-        result = _.differenceBy<AbcObject>(array, arrayParam);
-        result = _.differenceBy<AbcObject>(array, listParam, arrayParam);
-        result = _.differenceBy<AbcObject>(array, arrayParam, listParam, arrayParam);
-        result = _.differenceBy<AbcObject>(array, listParam, arrayParam, listParam, arrayParam);
-        result = _.differenceBy<AbcObject>(array, arrayParam, listParam, arrayParam, listParam, arrayParam);
-        result = _.differenceBy<AbcObject>(array, listParam, arrayParam, listParam, arrayParam, listParam, arrayParam);
+        result = _.differenceBy(array, arrayParam);
+        result = _.differenceBy(array, listParam, arrayParam);
+        result = _.differenceBy(array, arrayParam, listParam, arrayParam);
+        result = _.differenceBy(array, listParam, arrayParam, listParam, arrayParam);
+        result = _.differenceBy(array, arrayParam, listParam, arrayParam, listParam, arrayParam);
+        result = _.differenceBy(array, listParam, arrayParam, listParam, arrayParam, listParam, arrayParam);
 
         result = _.differenceBy(array, arrayParam, iteratee);
         result = _.differenceBy(array, listParam, arrayParam, iteratee);
@@ -260,12 +260,12 @@ namespace TestDifferenceBy {
         result = _.differenceBy<AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject>(array, listParam, arrayParam, listParam, arrayParam, listParam, arrayParam, {a: 1});
 
         result = _.differenceBy(list);
-        result = _.differenceBy<AbcObject>(list, listParam);
-        result = _.differenceBy<AbcObject>(list, arrayParam, listParam);
-        result = _.differenceBy<AbcObject>(list, listParam, arrayParam, listParam);
-        result = _.differenceBy<AbcObject>(list, arrayParam, listParam, arrayParam, listParam);
-        result = _.differenceBy<AbcObject>(list, listParam, arrayParam, listParam, arrayParam, listParam);
-        result = _.differenceBy<AbcObject>(list, arrayParam, listParam, arrayParam, listParam, arrayParam, listParam);
+        result = _.differenceBy(list, listParam);
+        result = _.differenceBy(list, arrayParam, listParam);
+        result = _.differenceBy(list, listParam, arrayParam, listParam);
+        result = _.differenceBy(list, arrayParam, listParam, arrayParam, listParam);
+        result = _.differenceBy(list, listParam, arrayParam, listParam, arrayParam, listParam);
+        result = _.differenceBy(list, arrayParam, listParam, arrayParam, listParam, arrayParam, listParam);
 
         result = _.differenceBy(list, listParam, iteratee);
         result = _.differenceBy(list, arrayParam, listParam, iteratee);
@@ -292,12 +292,12 @@ namespace TestDifferenceBy {
     {
         let result: _.LoDashImplicitWrapper<AbcObject[]>;
 
-        result = _(array).differenceBy<AbcObject>(arrayParam);
-        result = _(array).differenceBy<AbcObject>(listParam, arrayParam);
-        result = _(array).differenceBy<AbcObject>(arrayParam, listParam, arrayParam);
-        result = _(array).differenceBy<AbcObject>(listParam, arrayParam, listParam, arrayParam);
-        result = _(array).differenceBy<AbcObject>(arrayParam, listParam, arrayParam, listParam, arrayParam);
-        result = _(array).differenceBy<AbcObject>(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam);
+        result = _(array).differenceBy(arrayParam);
+        result = _(array).differenceBy(listParam, arrayParam);
+        result = _(array).differenceBy(arrayParam, listParam, arrayParam);
+        result = _(array).differenceBy(listParam, arrayParam, listParam, arrayParam);
+        result = _(array).differenceBy(arrayParam, listParam, arrayParam, listParam, arrayParam);
+        result = _(array).differenceBy(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam);
 
         result = _(array).differenceBy(arrayParam, iteratee);
         result = _(array).differenceBy(listParam, arrayParam, iteratee);
@@ -320,12 +320,12 @@ namespace TestDifferenceBy {
         result = _(array).differenceBy(arrayParam, listParam, arrayParam, listParam, arrayParam, {a: 1});
         result = _(array).differenceBy<AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject>(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam, {a: 1});
 
-        result = _(list).differenceBy<AbcObject>(listParam);
-        result = _(list).differenceBy<AbcObject>(arrayParam, listParam);
-        result = _(list).differenceBy<AbcObject>(listParam, arrayParam, listParam);
-        result = _(list).differenceBy<AbcObject>(arrayParam, listParam, arrayParam, listParam);
-        result = _(list).differenceBy<AbcObject>(listParam, arrayParam, listParam, arrayParam, listParam);
-        result = _(list).differenceBy<AbcObject>(arrayParam, listParam, arrayParam, listParam, arrayParam, listParam);
+        result = _(list).differenceBy(listParam);
+        result = _(list).differenceBy(arrayParam, listParam);
+        result = _(list).differenceBy(listParam, arrayParam, listParam);
+        result = _(list).differenceBy(arrayParam, listParam, arrayParam, listParam);
+        result = _(list).differenceBy(listParam, arrayParam, listParam, arrayParam, listParam);
+        result = _(list).differenceBy(arrayParam, listParam, arrayParam, listParam, arrayParam, listParam);
 
         result = _(list).differenceBy(listParam, iteratee);
         result = _(list).differenceBy(arrayParam, listParam, iteratee);
@@ -352,12 +352,12 @@ namespace TestDifferenceBy {
     {
         let result: _.LoDashExplicitWrapper<AbcObject[]>;
 
-        result = _(array).chain().differenceBy<AbcObject>(arrayParam);
-        result = _(array).chain().differenceBy<AbcObject>(listParam, arrayParam);
-        result = _(array).chain().differenceBy<AbcObject>(arrayParam, listParam, arrayParam);
-        result = _(array).chain().differenceBy<AbcObject>(listParam, arrayParam, listParam, arrayParam);
-        result = _(array).chain().differenceBy<AbcObject>(arrayParam, listParam, arrayParam, listParam, arrayParam);
-        result = _(array).chain().differenceBy<AbcObject>(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam);
+        result = _(array).chain().differenceBy(arrayParam);
+        result = _(array).chain().differenceBy(listParam, arrayParam);
+        result = _(array).chain().differenceBy(arrayParam, listParam, arrayParam);
+        result = _(array).chain().differenceBy(listParam, arrayParam, listParam, arrayParam);
+        result = _(array).chain().differenceBy(arrayParam, listParam, arrayParam, listParam, arrayParam);
+        result = _(array).chain().differenceBy(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam);
 
         result = _(array).chain().differenceBy(arrayParam, iteratee);
         result = _(array).chain().differenceBy(listParam, arrayParam, iteratee);
@@ -380,12 +380,12 @@ namespace TestDifferenceBy {
         result = _(array).chain().differenceBy(arrayParam, listParam, arrayParam, listParam, arrayParam, {a: 1});
         result = _(array).chain().differenceBy<AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject>(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam, {a: 1});
 
-        result = _(list).chain().differenceBy<AbcObject>(listParam);
-        result = _(list).chain().differenceBy<AbcObject>(arrayParam, listParam);
-        result = _(list).chain().differenceBy<AbcObject>(listParam, arrayParam, listParam);
-        result = _(list).chain().differenceBy<AbcObject>(arrayParam, listParam, arrayParam, listParam);
-        result = _(list).chain().differenceBy<AbcObject>(listParam, arrayParam, listParam, arrayParam, listParam);
-        result = _(list).chain().differenceBy<AbcObject>(arrayParam, listParam, arrayParam, listParam, arrayParam, listParam);
+        result = _(list).chain().differenceBy(listParam);
+        result = _(list).chain().differenceBy(arrayParam, listParam);
+        result = _(list).chain().differenceBy(listParam, arrayParam, listParam);
+        result = _(list).chain().differenceBy(arrayParam, listParam, arrayParam, listParam);
+        result = _(list).chain().differenceBy(listParam, arrayParam, listParam, arrayParam, listParam);
+        result = _(list).chain().differenceBy(arrayParam, listParam, arrayParam, listParam, arrayParam, listParam);
 
         result = _(list).chain().differenceBy(listParam, iteratee);
         result = _(list).chain().differenceBy(arrayParam, listParam, iteratee);
@@ -653,11 +653,11 @@ namespace TestDifferenceBy {
 
     {
         let result: AbcObject[];
-        result = _.drop<AbcObject>(array);
-        result = _.drop<AbcObject>(array, 42);
+        result = _.drop(array);
+        result = _.drop(array, 42);
 
-        result = _.drop<AbcObject>(list);
-        result = _.drop<AbcObject>(list, 42);
+        result = _.drop(list);
+        result = _.drop(list, 42);
     }
 
     {
@@ -666,8 +666,8 @@ namespace TestDifferenceBy {
         result = _(array).drop();
         result = _(array).drop(42);
 
-        result = _(list).drop<AbcObject>();
-        result = _(list).drop<AbcObject>(42);
+        result = _(list).drop();
+        result = _(list).drop(42);
     }
 
     {
@@ -676,8 +676,8 @@ namespace TestDifferenceBy {
         result = _(array).chain().drop();
         result = _(array).chain().drop(42);
 
-        result = _(list).chain().drop<AbcObject>();
-        result = _(list).chain().drop<AbcObject>(42);
+        result = _(list).chain().drop();
+        result = _(list).chain().drop(42);
     }
 }
 
@@ -689,11 +689,11 @@ namespace TestDropRight {
     {
         let result: AbcObject[];
 
-        result = _.dropRight<AbcObject>(array);
-        result = _.dropRight<AbcObject>(array, 42);
+        result = _.dropRight(array);
+        result = _.dropRight(array, 42);
 
-        result = _.dropRight<AbcObject>(list);
-        result = _.dropRight<AbcObject>(list, 42);
+        result = _.dropRight(list);
+        result = _.dropRight(list, 42);
     }
 
     {
@@ -702,8 +702,8 @@ namespace TestDropRight {
         result = _(array).dropRight();
         result = _(array).dropRight(42);
 
-        result = _(list).dropRight<AbcObject>();
-        result = _(list).dropRight<AbcObject>(42);
+        result = _(list).dropRight();
+        result = _(list).dropRight(42);
     }
 
     {
@@ -712,8 +712,8 @@ namespace TestDropRight {
         result = _(array).chain().dropRight();
         result = _(array).chain().dropRight(42);
 
-        result = _(list).chain().dropRight<AbcObject>();
-        result = _(list).chain().dropRight<AbcObject>(42);
+        result = _(list).chain().dropRight();
+        result = _(list).chain().dropRight(42);
     }
 }
 
@@ -726,14 +726,14 @@ namespace TestDropRightWhile {
     {
         let result: AbcObject[];
 
-        result = _.dropRightWhile<AbcObject>(array);
-        result = _.dropRightWhile<AbcObject>(array, predicateFn);
-        result = _.dropRightWhile<AbcObject>(array, '');
+        result = _.dropRightWhile(array);
+        result = _.dropRightWhile(array, predicateFn);
+        result = _.dropRightWhile(array, '');
         result = _.dropRightWhile(array, {a: 42});
 
-        result = _.dropRightWhile<AbcObject>(list);
-        result = _.dropRightWhile<AbcObject>(list, predicateFn);
-        result = _.dropRightWhile<AbcObject>(list, '');
+        result = _.dropRightWhile(list);
+        result = _.dropRightWhile(list, predicateFn);
+        result = _.dropRightWhile(list, '');
         result = _.dropRightWhile(list, {a: 42});
     }
 
@@ -745,9 +745,9 @@ namespace TestDropRightWhile {
         result = _(array).dropRightWhile('');
         result = _(array).dropRightWhile({a: 42});
 
-        result = _(list).dropRightWhile<AbcObject>();
-        result = _(list).dropRightWhile<AbcObject>(predicateFn);
-        result = _(list).dropRightWhile<AbcObject>('');
+        result = _(list).dropRightWhile();
+        result = _(list).dropRightWhile(predicateFn);
+        result = _(list).dropRightWhile('');
         result = _(list).dropRightWhile({a: 42});
     }
 
@@ -759,9 +759,9 @@ namespace TestDropRightWhile {
         result = _(array).chain().dropRightWhile('');
         result = _(array).chain().dropRightWhile({a: 42});
 
-        result = _(list).chain().dropRightWhile<AbcObject>();
-        result = _(list).chain().dropRightWhile<AbcObject>(predicateFn);
-        result = _(list).chain().dropRightWhile<AbcObject>('');
+        result = _(list).chain().dropRightWhile();
+        result = _(list).chain().dropRightWhile(predicateFn);
+        result = _(list).chain().dropRightWhile('');
         result = _(list).chain().dropRightWhile({a: 42});
     }
 }
@@ -775,14 +775,14 @@ namespace TestDropWhile {
     {
         let result: AbcObject[];
 
-        result = _.dropWhile<AbcObject>(array);
-        result = _.dropWhile<AbcObject>(array, predicateFn);
-        result = _.dropWhile<AbcObject>(array, '');
+        result = _.dropWhile(array);
+        result = _.dropWhile(array, predicateFn);
+        result = _.dropWhile(array, '');
         result = _.dropWhile(array, {a: 42});
 
-        result = _.dropWhile<AbcObject>(list);
-        result = _.dropWhile<AbcObject>(list, predicateFn);
-        result = _.dropWhile<AbcObject>(list, '');
+        result = _.dropWhile(list);
+        result = _.dropWhile(list, predicateFn);
+        result = _.dropWhile(list, '');
         result = _.dropWhile(list, {a: 42});
     }
 
@@ -794,9 +794,9 @@ namespace TestDropWhile {
         result = _(array).dropWhile('');
         result = _(array).dropWhile({a: 42});
 
-        result = _(list).dropWhile<AbcObject>();
-        result = _(list).dropWhile<AbcObject>(predicateFn);
-        result = _(list).dropWhile<AbcObject>('');
+        result = _(list).dropWhile();
+        result = _(list).dropWhile(predicateFn);
+        result = _(list).dropWhile('');
         result = _(list).dropWhile({a: 42});
     }
 
@@ -808,9 +808,9 @@ namespace TestDropWhile {
         result = _(array).chain().dropWhile('');
         result = _(array).chain().dropWhile({a: 42});
 
-        result = _(list).chain().dropWhile<AbcObject>();
-        result = _(list).chain().dropWhile<AbcObject>(predicateFn);
-        result = _(list).chain().dropWhile<AbcObject>('');
+        result = _(list).chain().dropWhile();
+        result = _(list).chain().dropWhile(predicateFn);
+        result = _(list).chain().dropWhile('');
         result = _(list).chain().dropWhile({a: 42});
     }
 }
@@ -879,17 +879,17 @@ namespace TestFindIndex {
     {
         let result: number;
 
-        result = _.findIndex<AbcObject>(array);
-        result = _.findIndex<AbcObject>(array, predicateFn);
-        result = _.findIndex<AbcObject>(array, '');
+        result = _.findIndex(array);
+        result = _.findIndex(array, predicateFn);
+        result = _.findIndex(array, '');
         result = _.findIndex(array, {a: 42});
-        result = _.findIndex<AbcObject>(array, predicateFn, fromIndex);
+        result = _.findIndex(array, predicateFn, fromIndex);
 
-        result = _.findIndex<AbcObject>(list);
-        result = _.findIndex<AbcObject>(list, predicateFn);
-        result = _.findIndex<AbcObject>(list, '');
+        result = _.findIndex(list);
+        result = _.findIndex(list, predicateFn);
+        result = _.findIndex(list, '');
         result = _.findIndex(list, {a: 42});
-        result = _.findIndex<AbcObject>(list, predicateFn, fromIndex);
+        result = _.findIndex(list, predicateFn, fromIndex);
         result = _.findIndex([{ b: 5 }], ['b', 5]);
 
         result = _(array).findIndex();
@@ -899,10 +899,10 @@ namespace TestFindIndex {
         result = _(array).findIndex(predicateFn, fromIndex);
 
         result = _(list).findIndex();
-        result = _(list).findIndex<AbcObject>(predicateFn);
+        result = _(list).findIndex(predicateFn);
         result = _(list).findIndex('');
         result = _(list).findIndex<{a: number}>({a: 42});
-        result = _(list).findIndex<AbcObject>(predicateFn, fromIndex);
+        result = _(list).findIndex(predicateFn, fromIndex);
     }
 
     {
@@ -915,10 +915,10 @@ namespace TestFindIndex {
         result = _(array).chain().findIndex(predicateFn, fromIndex);
 
         result = _(list).chain().findIndex();
-        result = _(list).chain().findIndex<AbcObject>(predicateFn);
+        result = _(list).chain().findIndex(predicateFn);
         result = _(list).chain().findIndex('');
         result = _(list).chain().findIndex<{a: number}>({a: 42});
-        result = _(list).chain().findIndex<AbcObject>(predicateFn, fromIndex);
+        result = _(list).chain().findIndex(predicateFn, fromIndex);
     }
 }
 
@@ -933,17 +933,17 @@ namespace TestFindLastIndex {
     {
         let result: number;
 
-        result = _.findLastIndex<AbcObject>(array);
-        result = _.findLastIndex<AbcObject>(array, predicateFn);
-        result = _.findLastIndex<AbcObject>(array, '');
+        result = _.findLastIndex(array);
+        result = _.findLastIndex(array, predicateFn);
+        result = _.findLastIndex(array, '');
         result = _.findLastIndex(array, {a: 42});
-        result = _.findLastIndex<AbcObject>(array, predicateFn, fromIndex);
+        result = _.findLastIndex(array, predicateFn, fromIndex);
 
-        result = _.findLastIndex<AbcObject>(list);
-        result = _.findLastIndex<AbcObject>(list, predicateFn);
-        result = _.findLastIndex<AbcObject>(list, '');
+        result = _.findLastIndex(list);
+        result = _.findLastIndex(list, predicateFn);
+        result = _.findLastIndex(list, '');
         result = _.findLastIndex(list, {a: 42});
-        result = _.findLastIndex<AbcObject>(list, predicateFn, fromIndex);
+        result = _.findLastIndex(list, predicateFn, fromIndex);
         result = _.findLastIndex([{ b: 5 }], ['b', 5]);
 
         result = _(array).findLastIndex();
@@ -953,10 +953,10 @@ namespace TestFindLastIndex {
         result = _(array).findLastIndex(predicateFn, fromIndex);
 
         result = _(list).findLastIndex();
-        result = _(list).findLastIndex<AbcObject>(predicateFn);
+        result = _(list).findLastIndex(predicateFn);
         result = _(list).findLastIndex('');
         result = _(list).findLastIndex<{a: number}>({a: 42});
-        result = _(list).findLastIndex<AbcObject>(predicateFn, fromIndex);
+        result = _(list).findLastIndex(predicateFn, fromIndex);
     }
 
     {
@@ -969,10 +969,10 @@ namespace TestFindLastIndex {
         result = _(array).chain().findLastIndex(predicateFn, fromIndex);
 
         result = _(list).chain().findLastIndex();
-        result = _(list).chain().findLastIndex<AbcObject>(predicateFn);
+        result = _(list).chain().findLastIndex(predicateFn);
         result = _(list).chain().findLastIndex('');
         result = _(list).chain().findLastIndex<{a: number}>({a: 42});
-        result = _(list).chain().findLastIndex<AbcObject>(predicateFn, fromIndex);
+        result = _(list).chain().findLastIndex(predicateFn, fromIndex);
     }
 }
 
@@ -991,11 +991,11 @@ namespace TestFirst {
     {
         let result: AbcObject | undefined;
 
-        result = _.first<AbcObject>(array);
-        result = _.first<AbcObject>(list);
+        result = _.first(array);
+        result = _.first(list);
 
         result = _(array).first();
-        result = _(list).first<AbcObject>();
+        result = _(list).first();
     }
 
     {
@@ -1240,11 +1240,11 @@ namespace TestHead {
     {
         let result: AbcObject | undefined;
 
-        result = _.head<AbcObject>(array);
-        result = _.head<AbcObject>(list);
+        result = _.head(array);
+        result = _.head(list);
 
         result = _(array).head();
-        result = _(list).head<AbcObject>();
+        result = _(list).head();
     }
 
     {
@@ -1270,21 +1270,21 @@ namespace TestIndexOf {
     {
         let result: number;
 
-        result = _.indexOf<AbcObject>(array, value);
-        result = _.indexOf<AbcObject>(array, value, true);
-        result = _.indexOf<AbcObject>(array, value, 42);
+        result = _.indexOf(array, value);
+        result = _.indexOf(array, value, true);
+        result = _.indexOf(array, value, 42);
 
-        result = _.indexOf<AbcObject>(list, value);
-        result = _.indexOf<AbcObject>(list, value, true);
-        result = _.indexOf<AbcObject>(list, value, 42);
+        result = _.indexOf(list, value);
+        result = _.indexOf(list, value, true);
+        result = _.indexOf(list, value, 42);
 
         result = _(array).indexOf(value);
         result = _(array).indexOf(value, true);
         result = _(array).indexOf(value, 42);
 
-        result = _(list).indexOf<AbcObject>(value);
-        result = _(list).indexOf<AbcObject>(value, true);
-        result = _(list).indexOf<AbcObject>(value, 42);
+        result = _(list).indexOf(value);
+        result = _(list).indexOf(value, true);
+        result = _(list).indexOf(value, 42);
     }
 
     {
@@ -1294,9 +1294,9 @@ namespace TestIndexOf {
         result = _(array).chain().indexOf(value, true);
         result = _(array).chain().indexOf(value, 42);
 
-        result = _(list).chain().indexOf<AbcObject>(value);
-        result = _(list).chain().indexOf<AbcObject>(value, true);
-        result = _(list).chain().indexOf<AbcObject>(value, 42);
+        result = _(list).chain().indexOf(value);
+        result = _(list).chain().indexOf(value, true);
+        result = _(list).chain().indexOf(value, 42);
     }
 }
 
@@ -1309,17 +1309,17 @@ namespace TestIndexOf {
     {
         let result: number;
 
-        result = _.sortedIndexOf<AbcObject>(array, value);
-        result = _.sortedIndexOf<AbcObject>(list, value);
+        result = _.sortedIndexOf(array, value);
+        result = _.sortedIndexOf(list, value);
         result = _(array).sortedIndexOf(value);
-        result = _(list).sortedIndexOf<AbcObject>(value);
+        result = _(list).sortedIndexOf(value);
     }
 
     {
         let result: _.LoDashExplicitWrapper<number>;
 
         result = _(array).chain().sortedIndexOf(value);
-        result = _(list).chain().sortedIndexOf<AbcObject>(value);
+        result = _(list).chain().sortedIndexOf(value);
     }
 }
 
@@ -1331,22 +1331,22 @@ namespace TestInitial {
     {
         let result: AbcObject[];
 
-        result = _.initial<AbcObject>(array);
-        result = _.initial<AbcObject>(list);
+        result = _.initial(array);
+        result = _.initial(list);
     }
 
     {
         let result: _.LoDashImplicitArrayWrapper<AbcObject>;
 
         result = _(array).initial();
-        result = _(list).initial<AbcObject>();
+        result = _(list).initial();
     }
 
     {
         let result: _.LoDashExplicitArrayWrapper<AbcObject>;
 
         result = _(array).chain().initial();
-        result = _(list).chain().initial<AbcObject>();
+        result = _(list).chain().initial();
     }
 }
 
@@ -1360,28 +1360,28 @@ namespace TestIntersection {
     {
         let result: AbcObject[];
 
-        result = _.intersection<AbcObject>(array, list);
-        result = _.intersection<AbcObject>(list, array, list);
+        result = _.intersection(array, list);
+        result = _.intersection(list, array, list);
     }
 
     {
         let result: _.LoDashImplicitArrayWrapper<AbcObject>;
 
-        result = _(array).intersection<AbcObject>(arrayParam);
-        result = _(array).intersection<AbcObject>(listParam, arrayParam);
+        result = _(array).intersection(arrayParam);
+        result = _(array).intersection(listParam, arrayParam);
 
-        result = _(list).intersection<AbcObject>(arrayParam);
-        result = _(list).intersection<AbcObject>(listParam, arrayParam);
+        result = _(list).intersection(arrayParam);
+        result = _(list).intersection(listParam, arrayParam);
     }
 
     {
         let result: _.LoDashExplicitArrayWrapper<AbcObject>;
 
-        result = _(array).chain().intersection<AbcObject>(arrayParam);
-        result = _(array).chain().intersection<AbcObject>(listParam, arrayParam);
+        result = _(array).chain().intersection(arrayParam);
+        result = _(array).chain().intersection(listParam, arrayParam);
 
-        result = _(list).chain().intersection<AbcObject>(arrayParam);
-        result = _(list).chain().intersection<AbcObject>(listParam, arrayParam);
+        result = _(list).chain().intersection(arrayParam);
+        result = _(list).chain().intersection(listParam, arrayParam);
     }
 }
 
@@ -1632,11 +1632,11 @@ namespace TestLast {
     {
         let result: AbcObject | undefined;
 
-        result = _.last<AbcObject>(array);
-        result = _.last<AbcObject>(list);
+        result = _.last(array);
+        result = _.last(list);
 
         result = _(array).last();
-        result = _(list).last<AbcObject>();
+        result = _(list).last();
     }
 
     {
@@ -1667,21 +1667,21 @@ namespace TestLastIndexOf {
     {
         let result: number;
 
-        result = _.lastIndexOf<AbcObject>(array, value);
-        result = _.lastIndexOf<AbcObject>(array, value, true);
-        result = _.lastIndexOf<AbcObject>(array, value, 42);
+        result = _.lastIndexOf(array, value);
+        result = _.lastIndexOf(array, value, true);
+        result = _.lastIndexOf(array, value, 42);
 
-        result = _.lastIndexOf<AbcObject>(list, value);
-        result = _.lastIndexOf<AbcObject>(list, value, true);
-        result = _.lastIndexOf<AbcObject>(list, value, 42);
+        result = _.lastIndexOf(list, value);
+        result = _.lastIndexOf(list, value, true);
+        result = _.lastIndexOf(list, value, 42);
 
         result = _(array).lastIndexOf(value);
         result = _(array).lastIndexOf(value, true);
         result = _(array).lastIndexOf(value, 42);
 
-        result = _(list).lastIndexOf<AbcObject>(value);
-        result = _(list).lastIndexOf<AbcObject>(value, true);
-        result = _(list).lastIndexOf<AbcObject>(value, 42);
+        result = _(list).lastIndexOf(value);
+        result = _(list).lastIndexOf(value, true);
+        result = _(list).lastIndexOf(value, 42);
     }
 
     {
@@ -1691,9 +1691,9 @@ namespace TestLastIndexOf {
         result = _(array).chain().lastIndexOf(value, true);
         result = _(array).chain().lastIndexOf(value, 42);
 
-        result = _(list).chain().lastIndexOf<AbcObject>(value);
-        result = _(list).chain().lastIndexOf<AbcObject>(value, true);
-        result = _(list).chain().lastIndexOf<AbcObject>(value, 42);
+        result = _(list).chain().lastIndexOf(value);
+        result = _(list).chain().lastIndexOf(value, true);
+        result = _(list).chain().lastIndexOf(value, 42);
     }
 }
 
@@ -1706,15 +1706,15 @@ namespace TestNth {
     {
         let result: AbcObject | undefined;
 
-        result = _.nth<AbcObject>(array);
+        result = _.nth(array);
 
-        result = _.nth<AbcObject>(array, 42);
+        result = _.nth(array, 42);
 
         result = _(array).nth();
         result = _(array).nth(42);
 
-        result = _(list).nth<AbcObject>();
-        result = _(list).nth<AbcObject>(42);
+        result = _(list).nth();
+        result = _(list).nth(42);
     }
 
     {
@@ -1723,8 +1723,8 @@ namespace TestNth {
         result = _(array).chain().nth();
         result = _(array).chain().nth(42);
 
-        result = _(list).chain().nth<AbcObject>();
-        result = _(list).chain().nth<AbcObject>(42);
+        result = _(list).chain().nth();
+        result = _(list).chain().nth(42);
     }
 }
 
@@ -1737,19 +1737,19 @@ namespace TestPull {
     {
         let result: AbcObject[];
 
-        result = _.pull<AbcObject>(array);
-        result = _.pull<AbcObject>(array, value);
-        result = _.pull<AbcObject>(array, value, value);
-        result = _.pull<AbcObject>(array, value, value, value);
+        result = _.pull(array);
+        result = _.pull(array, value);
+        result = _.pull(array, value, value);
+        result = _.pull(array, value, value, value);
     }
 
     {
         let result: _.List<AbcObject>;
 
-        result = _.pull<AbcObject>(list);
-        result = _.pull<AbcObject>(list, value);
-        result = _.pull<AbcObject>(list, value, value);
-        result = _.pull<AbcObject>(list, value, value, value);
+        result = _.pull(list);
+        result = _.pull(list, value);
+        result = _.pull(list, value, value);
+        result = _.pull(list, value, value, value);
     }
 
     {
@@ -1764,10 +1764,10 @@ namespace TestPull {
     {
         let result: _.LoDashImplicitObjectWrapper<_.List<AbcObject>>;
 
-        result = _(list).pull<AbcObject>();
-        result = _(list).pull<AbcObject>(value);
-        result = _(list).pull<AbcObject>(value, value);
-        result = _(list).pull<AbcObject>(value, value, value);
+        result = _(list).pull();
+        result = _(list).pull(value);
+        result = _(list).pull(value, value);
+        result = _(list).pull(value, value, value);
     }
 
     {
@@ -1782,10 +1782,10 @@ namespace TestPull {
     {
         let result: _.LoDashExplicitObjectWrapper<_.List<AbcObject>>;
 
-        result = _(list).chain().pull<AbcObject>();
-        result = _(list).chain().pull<AbcObject>(value);
-        result = _(list).chain().pull<AbcObject>(value, value);
-        result = _(list).chain().pull<AbcObject>(value, value, value);
+        result = _(list).chain().pull();
+        result = _(list).chain().pull(value);
+        result = _(list).chain().pull(value, value);
+        result = _(list).chain().pull(value, value, value);
     }
 }
 
@@ -1797,19 +1797,19 @@ namespace TestPullAt {
     {
         let result: AbcObject[];
 
-        result = _.pullAt<AbcObject>(array);
-        result = _.pullAt<AbcObject>(array, 1);
-        result = _.pullAt<AbcObject>(array, [2, 3], 1);
-        result = _.pullAt<AbcObject>(array, 4, [2, 3], 1);
+        result = _.pullAt(array);
+        result = _.pullAt(array, 1);
+        result = _.pullAt(array, [2, 3], 1);
+        result = _.pullAt(array, 4, [2, 3], 1);
     }
 
     {
         let result: ArrayLike<AbcObject>;
 
-        result = _.pullAt<AbcObject>(list);
-        result = _.pullAt<AbcObject>(list, 1);
-        result = _.pullAt<AbcObject>(list, [2, 3], 1);
-        result = _.pullAt<AbcObject>(list, 4, [2, 3], 1);
+        result = _.pullAt(list);
+        result = _.pullAt(list, 1);
+        result = _.pullAt(list, [2, 3], 1);
+        result = _.pullAt(list, 4, [2, 3], 1);
     }
 
     {
@@ -2117,14 +2117,14 @@ namespace TestRemove {
     {
         let result: AbcObject[];
 
-        result = _.remove<AbcObject>(array);
-        result = _.remove<AbcObject>(array, predicateFn);
-        result = _.remove<AbcObject>(array, '');
+        result = _.remove(array);
+        result = _.remove(array, predicateFn);
+        result = _.remove(array, '');
         result = _.remove(array, {a: 42});
 
-        result = _.remove<AbcObject>(list);
-        result = _.remove<AbcObject>(list, predicateFn);
-        result = _.remove<AbcObject>(list, '');
+        result = _.remove(list);
+        result = _.remove(list, predicateFn);
+        result = _.remove(list, '');
         result = _.remove(list, {a: 42});
     }
 
@@ -2136,9 +2136,9 @@ namespace TestRemove {
         result = _(array).remove('');
         result = _(array).remove({a: 42});
 
-        result = _(list).remove<AbcObject>();
-        result = _(list).remove<AbcObject>(predicateFn);
-        result = _(list).remove<AbcObject>('');
+        result = _(list).remove();
+        result = _(list).remove(predicateFn);
+        result = _(list).remove('');
         result = _(list).remove({a: 42});
     }
 
@@ -2150,9 +2150,9 @@ namespace TestRemove {
         result = _(array).chain().remove('');
         result = _(array).chain().remove({a: 42});
 
-        result = _(list).chain().remove<AbcObject>();
-        result = _(list).chain().remove<AbcObject>(predicateFn);
-        result = _(list).chain().remove<AbcObject>('');
+        result = _(list).chain().remove();
+        result = _(list).chain().remove(predicateFn);
+        result = _(list).chain().remove('');
         result = _(list).chain().remove({a: 42});
     }
 }
@@ -2165,22 +2165,22 @@ namespace TestTail {
     {
         let result: AbcObject[];
 
-        result = _.tail<AbcObject>(array);
-        result = _.tail<AbcObject>(list);
+        result = _.tail(array);
+        result = _.tail(list);
     }
 
     {
         let result: _.LoDashImplicitArrayWrapper<AbcObject>;
 
         result = _(array).tail();
-        result = _(list).tail<AbcObject>();
+        result = _(list).tail();
     }
 
     {
         let result: _.LoDashExplicitArrayWrapper<AbcObject>;
 
         result = _(array).chain().tail();
-        result = _(list).chain().tail<AbcObject>();
+        result = _(list).chain().tail();
     }
 }
 
@@ -2191,7 +2191,7 @@ namespace TestSlice {
     {
         let result: AbcObject[];
 
-        result = _.slice<AbcObject>(array);
+        result = _.slice(array);
         result = _.slice(array, 42);
         result = _.slice(array, 42, 42);
     }
@@ -2405,11 +2405,11 @@ namespace TestTake {
     {
         let result: AbcObject[];
 
-        result = _.take<AbcObject>(array);
-        result = _.take<AbcObject>(array, 42);
+        result = _.take(array);
+        result = _.take(array, 42);
 
-        result = _.take<AbcObject>(list);
-        result = _.take<AbcObject>(list, 42);
+        result = _.take(list);
+        result = _.take(list, 42);
     }
 
     {
@@ -2418,8 +2418,8 @@ namespace TestTake {
         result = _(array).take();
         result = _(array).take(42);
 
-        result = _(list).take<AbcObject>();
-        result = _(list).take<AbcObject>(42);
+        result = _(list).take();
+        result = _(list).take(42);
     }
 
     {
@@ -2428,8 +2428,8 @@ namespace TestTake {
         result = _(array).chain().take();
         result = _(array).chain().take(42);
 
-        result = _(list).chain().take<AbcObject>();
-        result = _(list).chain().take<AbcObject>(42);
+        result = _(list).chain().take();
+        result = _(list).chain().take(42);
     }
 }
 
@@ -2441,11 +2441,11 @@ namespace TestTakeRight {
     {
         let result: AbcObject[];
 
-        result = _.takeRight<AbcObject>(array);
-        result = _.takeRight<AbcObject>(array, 42);
+        result = _.takeRight(array);
+        result = _.takeRight(array, 42);
 
-        result = _.takeRight<AbcObject>(list);
-        result = _.takeRight<AbcObject>(list, 42);
+        result = _.takeRight(list);
+        result = _.takeRight(list, 42);
     }
 
     {
@@ -2454,8 +2454,8 @@ namespace TestTakeRight {
         result = _(array).takeRight();
         result = _(array).takeRight(42);
 
-        result = _(list).takeRight<AbcObject>();
-        result = _(list).takeRight<AbcObject>(42);
+        result = _(list).takeRight();
+        result = _(list).takeRight(42);
     }
 
     {
@@ -2464,8 +2464,8 @@ namespace TestTakeRight {
         result = _(array).chain().takeRight();
         result = _(array).chain().takeRight(42);
 
-        result = _(list).chain().takeRight<AbcObject>();
-        result = _(list).chain().takeRight<AbcObject>(42);
+        result = _(list).chain().takeRight();
+        result = _(list).chain().takeRight(42);
     }
 }
 
@@ -2478,14 +2478,14 @@ namespace TestTakeRightWhile {
     {
         let result: AbcObject[];
 
-        result = _.takeRightWhile<AbcObject>(array);
-        result = _.takeRightWhile<AbcObject>(array, predicateFn);
-        result = _.takeRightWhile<AbcObject>(array, '');
+        result = _.takeRightWhile(array);
+        result = _.takeRightWhile(array, predicateFn);
+        result = _.takeRightWhile(array, '');
         result = _.takeRightWhile(array, {a: 42});
 
-        result = _.takeRightWhile<AbcObject>(list);
-        result = _.takeRightWhile<AbcObject>(list, predicateFn);
-        result = _.takeRightWhile<AbcObject>(list, '');
+        result = _.takeRightWhile(list);
+        result = _.takeRightWhile(list, predicateFn);
+        result = _.takeRightWhile(list, '');
         result = _.takeRightWhile(list, {a: 42});
     }
 
@@ -2497,9 +2497,9 @@ namespace TestTakeRightWhile {
         result = _(array).takeRightWhile('');
         result = _(array).takeRightWhile({a: 42});
 
-        result = _(list).takeRightWhile<AbcObject>();
-        result = _(list).takeRightWhile<AbcObject>(predicateFn);
-        result = _(list).takeRightWhile<AbcObject>('');
+        result = _(list).takeRightWhile();
+        result = _(list).takeRightWhile(predicateFn);
+        result = _(list).takeRightWhile('');
         result = _(list).takeRightWhile({a: 42});
     }
 
@@ -2511,9 +2511,9 @@ namespace TestTakeRightWhile {
         result = _(array).chain().takeRightWhile('');
         result = _(array).chain().takeRightWhile({a: 42});
 
-        result = _(list).chain().takeRightWhile<AbcObject>();
-        result = _(list).chain().takeRightWhile<AbcObject>(predicateFn);
-        result = _(list).chain().takeRightWhile<AbcObject>('');
+        result = _(list).chain().takeRightWhile();
+        result = _(list).chain().takeRightWhile(predicateFn);
+        result = _(list).chain().takeRightWhile('');
         result = _(list).chain().takeRightWhile({a: 42});
     }
 }
@@ -2527,14 +2527,14 @@ namespace TestTakeWhile {
     {
         let result: AbcObject[];
 
-        result = _.takeWhile<AbcObject>(array);
-        result = _.takeWhile<AbcObject>(array, predicateFn);
-        result = _.takeWhile<AbcObject>(array, '');
+        result = _.takeWhile(array);
+        result = _.takeWhile(array, predicateFn);
+        result = _.takeWhile(array, '');
         result = _.takeWhile(array, {a: 42});
 
-        result = _.takeWhile<AbcObject>(list);
-        result = _.takeWhile<AbcObject>(list, predicateFn);
-        result = _.takeWhile<AbcObject>(list, '');
+        result = _.takeWhile(list);
+        result = _.takeWhile(list, predicateFn);
+        result = _.takeWhile(list, '');
         result = _.takeWhile(list, {a: 42});
     }
 
@@ -2546,9 +2546,9 @@ namespace TestTakeWhile {
         result = _(array).takeWhile('');
         result = _(array).takeWhile({a: 42});
 
-        result = _(list).takeWhile<AbcObject>();
-        result = _(list).takeWhile<AbcObject>(predicateFn);
-        result = _(list).takeWhile<AbcObject>('');
+        result = _(list).takeWhile();
+        result = _(list).takeWhile(predicateFn);
+        result = _(list).takeWhile('');
         result = _(list).takeWhile({a: 42});
     }
 
@@ -2560,9 +2560,9 @@ namespace TestTakeWhile {
         result = _(array).chain().takeWhile('');
         result = _(array).chain().takeWhile({a: 42});
 
-        result = _(list).chain().takeWhile<AbcObject>();
-        result = _(list).chain().takeWhile<AbcObject>(predicateFn);
-        result = _(list).chain().takeWhile<AbcObject>('');
+        result = _(list).chain().takeWhile();
+        result = _(list).chain().takeWhile(predicateFn);
+        result = _(list).chain().takeWhile('');
         result = _(list).chain().takeWhile({a: 42});
     }
 }
@@ -2575,15 +2575,16 @@ namespace TestUnion {
     {
         let result: AbcObject[];
 
-        result = _.union<AbcObject>();
+        // $ExpectType {}[]
+        _.union();
 
-        result = _.union<AbcObject>(array);
-        result = _.union<AbcObject>(array, list);
-        result = _.union<AbcObject>(array, list, array);
+        result = _.union(array);
+        result = _.union(array, list);
+        result = _.union(array, list, array);
 
-        result = _.union<AbcObject>(list);
-        result = _.union<AbcObject>(list, array);
-        result = _.union<AbcObject>(list, array, list);
+        result = _.union(list);
+        result = _.union(list, array);
+        result = _.union(list, array, list);
     }
 
     {
@@ -2593,13 +2594,13 @@ namespace TestUnion {
         result = _(array).union(list);
         result = _(array).union(list, array);
 
-        result = _(array).union<AbcObject>();
-        result = _(array).union<AbcObject>(list);
-        result = _(array).union<AbcObject>(list, array);
+        result = _(array).union();
+        result = _(array).union(list);
+        result = _(array).union(list, array);
 
-        result = _(list).union<AbcObject>();
-        result = _(list).union<AbcObject>(array);
-        result = _(list).union<AbcObject>(array, list);
+        result = _(list).union();
+        result = _(list).union(array);
+        result = _(list).union(array, list);
     }
 
     {
@@ -2609,13 +2610,13 @@ namespace TestUnion {
         result = _(array).chain().union(list);
         result = _(array).chain().union(list, array);
 
-        result = _(array).chain().union<AbcObject>();
-        result = _(array).chain().union<AbcObject>(list);
-        result = _(array).chain().union<AbcObject>(list, array);
+        result = _(array).chain().union();
+        result = _(array).chain().union(list);
+        result = _(array).chain().union(list, array);
 
-        result = _(list).chain().union<AbcObject>();
-        result = _(list).chain().union<AbcObject>(array);
-        result = _(list).chain().union<AbcObject>(array, list);
+        result = _(list).chain().union();
+        result = _(list).chain().union(array);
+        result = _(list).chain().union(array, list);
     }
 }
 
@@ -2628,20 +2629,21 @@ namespace TestUnionBy {
     {
         let result: AbcObject[];
 
-        result = _.unionBy<AbcObject>(array, array);
-        result = _.unionBy<AbcObject>(array, list, array);
-        result = _.unionBy<AbcObject>(array, array, list, array);
-        result = _.unionBy<AbcObject>(array, list, array, list, array);
-        result = _.unionBy<AbcObject>(array, array, list, array, list, array);
+        result = _.unionBy(array, array);
+        result = _.unionBy(array, list, array);
+        result = _.unionBy(array, array, list, array);
+        result = _.unionBy(array, list, array, list, array);
+        result = _.unionBy(array, array, list, array, list, array);
 
-        result = _.unionBy<AbcObject>(array, array, iteratee);
-        result = _.unionBy<AbcObject>(array, list, array, iteratee);
-        result = _.unionBy<AbcObject>(array, array, list, array, iteratee);
-        result = _.unionBy<AbcObject>(array, list, array, list, array, iteratee);
-        result = _.unionBy<AbcObject>(array, array, list, array, list, array, iteratee);
+        result = _.unionBy(array, array, iteratee);
+        result = _.unionBy(array, list, array, iteratee);
+        result = _.unionBy(array, array, list, array, iteratee);
+        result = _.unionBy(array, list, array, list, array, iteratee);
+        result = _.unionBy(array, array, list, array, list, array, iteratee);
 
-        result = _.unionBy<AbcObject>(array, array, 'a');
-        result = _.unionBy<AbcObject>(array, list, array, 'a');
+        result = _.unionBy(array, array, 'a');
+        result = _.unionBy(array, list, array, 'a');
+        // <AbcObject> param needed for TS 2.3
         result = _.unionBy<AbcObject>(array, array, list, array, 'a');
         result = _.unionBy<AbcObject>(array, list, array, list, array, 'a');
         result = _.unionBy<AbcObject>(array, array, list, array, list, array, 'a');
@@ -2650,22 +2652,23 @@ namespace TestUnionBy {
         result = _.unionBy(array, list, array, {a: 1});
         result = _.unionBy(array, array, list, array, {a: 1});
         result = _.unionBy(array, list, array, list, array, {a: 1});
-        result = _.unionBy<AbcObject>(array, list, array, list, array, list, {a: 1});
+        result = _.unionBy(array, list, array, list, array, list, {a: 1});
 
-        result = _.unionBy<AbcObject>(list, list);
-        result = _.unionBy<AbcObject>(list, array, list);
-        result = _.unionBy<AbcObject>(list, list, array, list);
-        result = _.unionBy<AbcObject>(list, array, list, array, list);
-        result = _.unionBy<AbcObject>(list, list, array, list, array, list);
+        result = _.unionBy(list, list);
+        result = _.unionBy(list, array, list);
+        result = _.unionBy(list, list, array, list);
+        result = _.unionBy(list, array, list, array, list);
+        result = _.unionBy(list, list, array, list, array, list);
 
-        result = _.unionBy<AbcObject>(list, list, iteratee);
-        result = _.unionBy<AbcObject>(list, array, list, iteratee);
-        result = _.unionBy<AbcObject>(list, list, array, list, iteratee);
-        result = _.unionBy<AbcObject>(list, array, list, array, list, iteratee);
-        result = _.unionBy<AbcObject>(list, list, array, list, array, list, iteratee);
+        result = _.unionBy(list, list, iteratee);
+        result = _.unionBy(list, array, list, iteratee);
+        result = _.unionBy(list, list, array, list, iteratee);
+        result = _.unionBy(list, array, list, array, list, iteratee);
+        result = _.unionBy(list, list, array, list, array, list, iteratee);
 
-        result = _.unionBy<AbcObject>(list, list, 'a');
-        result = _.unionBy<AbcObject>(list, array, list, 'a');
+        result = _.unionBy(list, list, 'a');
+        result = _.unionBy(list, array, list, 'a');
+        // <AbcObject> param needed for TS 2.3
         result = _.unionBy<AbcObject>(list, list, array, list, 'a');
         result = _.unionBy<AbcObject>(list, array, list, array, list, 'a');
         result = _.unionBy<AbcObject>(list, list, array, list, array, list, 'a');
@@ -2674,26 +2677,27 @@ namespace TestUnionBy {
         result = _.unionBy(list, array, list, {a: 1});
         result = _.unionBy(list, list, array, list, {a: 1});
         result = _.unionBy(list, array, list, array, list, {a: 1});
-        result = _.unionBy<AbcObject>(list, array, list, array, list, array, {a: 1});
+        result = _.unionBy(list, array, list, array, list, array, {a: 1});
     }
 
     {
         let result: _.LoDashImplicitArrayWrapper<AbcObject>;
 
-        result = _(array).unionBy<AbcObject>(array);
-        result = _(array).unionBy<AbcObject>(list, array);
-        result = _(array).unionBy<AbcObject>(array, list, array);
-        result = _(array).unionBy<AbcObject>(list, array, list, array);
-        result = _(array).unionBy<AbcObject>(array, list, array, list, array);
+        result = _(array).unionBy(array);
+        result = _(array).unionBy(list, array);
+        result = _(array).unionBy(array, list, array);
+        result = _(array).unionBy(list, array, list, array);
+        result = _(array).unionBy(array, list, array, list, array);
 
-        result = _(array).unionBy<AbcObject>(array, iteratee);
-        result = _(array).unionBy<AbcObject>(list, array, iteratee);
-        result = _(array).unionBy<AbcObject>(array, list, array, iteratee);
-        result = _(array).unionBy<AbcObject>(list, array, list, array, iteratee);
-        result = _(array).unionBy<AbcObject>(array, list, array, list, array, iteratee);
+        result = _(array).unionBy(array, iteratee);
+        result = _(array).unionBy(list, array, iteratee);
+        result = _(array).unionBy(array, list, array, iteratee);
+        result = _(array).unionBy(list, array, list, array, iteratee);
+        result = _(array).unionBy(array, list, array, list, array, iteratee);
 
-        result = _(array).unionBy<AbcObject>(array, 'a');
-        result = _(array).unionBy<AbcObject>(list, array, 'a');
+        result = _(array).unionBy(array, 'a');
+        result = _(array).unionBy(list, array, 'a');
+        // <AbcObject> param needed for TS 2.3
         result = _(array).unionBy<AbcObject>(array, list, array, 'a');
         result = _(array).unionBy<AbcObject>(list, array, list, array, 'a');
         result = _(array).unionBy<AbcObject>(array, list, array, list, array, 'a');
@@ -2702,22 +2706,23 @@ namespace TestUnionBy {
         result = _(array).unionBy(list, array, {a: 1});
         result = _(array).unionBy(array, list, array, {a: 1});
         result = _(array).unionBy(list, array, list, array, {a: 1});
-        result = _(array).unionBy<AbcObject>(list, array, list, array, list, {a: 1});
+        result = _(array).unionBy(list, array, list, array, list, {a: 1});
 
-        result = _(list).unionBy<AbcObject>(list);
-        result = _(list).unionBy<AbcObject>(array, list);
-        result = _(list).unionBy<AbcObject>(list, array, list);
-        result = _(list).unionBy<AbcObject>(array, list, array, list);
-        result = _(list).unionBy<AbcObject>(list, array, list, array, list);
+        result = _(list).unionBy(list);
+        result = _(list).unionBy(array, list);
+        result = _(list).unionBy(list, array, list);
+        result = _(list).unionBy(array, list, array, list);
+        result = _(list).unionBy(list, array, list, array, list);
 
-        result = _(list).unionBy<AbcObject>(list, iteratee);
-        result = _(list).unionBy<AbcObject>(array, list, iteratee);
-        result = _(list).unionBy<AbcObject>(list, array, list, iteratee);
-        result = _(list).unionBy<AbcObject>(array, list, array, list, iteratee);
-        result = _(list).unionBy<AbcObject>(list, array, list, array, list, iteratee);
+        result = _(list).unionBy(list, iteratee);
+        result = _(list).unionBy(array, list, iteratee);
+        result = _(list).unionBy(list, array, list, iteratee);
+        result = _(list).unionBy(array, list, array, list, iteratee);
+        result = _(list).unionBy(list, array, list, array, list, iteratee);
 
-        result = _(list).unionBy<AbcObject>(list, 'a');
-        result = _(list).unionBy<AbcObject>(array, list, 'a');
+        result = _(list).unionBy(list, 'a');
+        result = _(list).unionBy(array, list, 'a');
+        // <AbcObject> param needed for TS 2.3
         result = _(list).unionBy<AbcObject>(list, array, list, 'a');
         result = _(list).unionBy<AbcObject>(array, list, array, list, 'a');
         result = _(list).unionBy<AbcObject>(list, array, list, array, list, 'a');
@@ -2726,27 +2731,28 @@ namespace TestUnionBy {
         result = _(list).unionBy(array, list, {a: 1});
         result = _(list).unionBy(list, array, list, {a: 1});
         result = _(list).unionBy(array, list, array, list, {a: 1});
-        result = _(list).unionBy<AbcObject>(array, list, array, list, array, {a: 1});
+        result = _(list).unionBy(array, list, array, list, array, {a: 1});
     }
 
     {
         let result: _.LoDashExplicitArrayWrapper<AbcObject>;
 
-        result = _(array).chain().unionBy<AbcObject>(array);
-        result = _(array).chain().unionBy<AbcObject>(list, array);
-        result = _(array).chain().unionBy<AbcObject>(array, list, array);
-        result = _(array).chain().unionBy<AbcObject>(list, array, list, array);
-        result = _(array).chain().unionBy<AbcObject>(array, list, array, list, array);
+        result = _(array).chain().unionBy(array);
+        result = _(array).chain().unionBy(list, array);
+        result = _(array).chain().unionBy(array, list, array);
+        result = _(array).chain().unionBy(list, array, list, array);
+        result = _(array).chain().unionBy(array, list, array, list, array);
 
-        result = _(array).chain().unionBy<AbcObject>(array, iteratee);
-        result = _(array).chain().unionBy<AbcObject>(list, array, iteratee);
-        result = _(array).chain().unionBy<AbcObject>(array, list, array, iteratee);
-        result = _(array).chain().unionBy<AbcObject>(list, array, list, array, iteratee);
-        result = _(array).chain().unionBy<AbcObject>(array, list, array, list, array, iteratee);
+        result = _(array).chain().unionBy(array, iteratee);
+        result = _(array).chain().unionBy(list, array, iteratee);
+        result = _(array).chain().unionBy(array, list, array, iteratee);
+        result = _(array).chain().unionBy(list, array, list, array, iteratee);
+        result = _(array).chain().unionBy(array, list, array, list, array, iteratee);
 
-        result = _(array).chain().unionBy<AbcObject>(array, 'a');
-        result = _(array).chain().unionBy<AbcObject>(list, array, 'a');
-        result = _(array).chain().unionBy<AbcObject>(array, list, array, 'a');
+        result = _(array).chain().unionBy(array, 'a');
+        result = _(array).chain().unionBy(list, array, 'a');
+        result = _(array).chain().unionBy(array, list, array, 'a');
+        // <AbcObject> param needed for TS 2.3
         result = _(array).chain().unionBy<AbcObject>(list, array, list, array, 'a');
         result = _(array).chain().unionBy<AbcObject>(array, list, array, list, array, 'a');
 
@@ -2754,23 +2760,24 @@ namespace TestUnionBy {
         result = _(array).chain().unionBy(list, array, {a: 1});
         result = _(array).chain().unionBy(array, list, array, {a: 1});
         result = _(array).chain().unionBy(list, array, list, array, {a: 1});
-        result = _(array).chain().unionBy<AbcObject>(list, array, list, array, list, {a: 1});
+        result = _(array).chain().unionBy(list, array, list, array, list, {a: 1});
 
-        result = _(list).chain().unionBy<AbcObject>(list);
-        result = _(list).chain().unionBy<AbcObject>(array, list);
-        result = _(list).chain().unionBy<AbcObject>(list, array, list);
-        result = _(list).chain().unionBy<AbcObject>(array, list, array, list);
-        result = _(list).chain().unionBy<AbcObject>(list, array, list, array, list);
+        result = _(list).chain().unionBy(list);
+        result = _(list).chain().unionBy(array, list);
+        result = _(list).chain().unionBy(list, array, list);
+        result = _(list).chain().unionBy(array, list, array, list);
+        result = _(list).chain().unionBy(list, array, list, array, list);
 
-        result = _(list).chain().unionBy<AbcObject>(list, iteratee);
-        result = _(list).chain().unionBy<AbcObject>(array, list, iteratee);
-        result = _(list).chain().unionBy<AbcObject>(list, array, list, iteratee);
-        result = _(list).chain().unionBy<AbcObject>(array, list, array, list, iteratee);
-        result = _(list).chain().unionBy<AbcObject>(list, array, list, array, list, iteratee);
+        result = _(list).chain().unionBy(list, iteratee);
+        result = _(list).chain().unionBy(array, list, iteratee);
+        result = _(list).chain().unionBy(list, array, list, iteratee);
+        result = _(list).chain().unionBy(array, list, array, list, iteratee);
+        result = _(list).chain().unionBy(list, array, list, array, list, iteratee);
 
-        result = _(list).chain().unionBy<AbcObject>(list, 'a');
-        result = _(list).chain().unionBy<AbcObject>(array, list, 'a');
-        result = _(list).chain().unionBy<AbcObject>(list, array, list, 'a');
+        result = _(list).chain().unionBy(list, 'a');
+        result = _(list).chain().unionBy(array, list, 'a');
+        result = _(list).chain().unionBy(list, array, list, 'a');
+        // <AbcObject> param needed for TS 2.3
         result = _(list).chain().unionBy<AbcObject>(array, list, array, list, 'a');
         result = _(list).chain().unionBy<AbcObject>(list, array, list, array, list, 'a');
 
@@ -2778,7 +2785,7 @@ namespace TestUnionBy {
         result = _(list).chain().unionBy(array, list, {a: 1});
         result = _(list).chain().unionBy(list, array, list, {a: 1});
         result = _(list).chain().unionBy(array, list, array, list, {a: 1});
-        result = _(list).chain().unionBy<AbcObject>(array, list, array, list, array, {a: 1});
+        result = _(list).chain().unionBy(array, list, array, list, array, {a: 1});
     }
 }
 
@@ -3155,15 +3162,16 @@ namespace TestXor {
     {
         let result: AbcObject[];
 
-        result = _.xor<AbcObject>();
+        // $ExpectType {}[]
+        _.xor();
 
-        result = _.xor<AbcObject>(array);
-        result = _.xor<AbcObject>(array, list);
-        result = _.xor<AbcObject>(array, list, array);
+        result = _.xor(array);
+        result = _.xor(array, list);
+        result = _.xor(array, list, array);
 
-        result = _.xor<AbcObject>(list);
-        result = _.xor<AbcObject>(list, array);
-        result = _.xor<AbcObject>(list, array, list);
+        result = _.xor(list);
+        result = _.xor(list, array);
+        result = _.xor(list, array, list);
     }
 
     {
@@ -3173,9 +3181,9 @@ namespace TestXor {
         result = _(array).xor(list);
         result = _(array).xor(list, array);
 
-        result = _(list).xor<AbcObject>();
-        result = _(list).xor<AbcObject>(array);
-        result = _(list).xor<AbcObject>(array, list);
+        result = _(list).xor();
+        result = _(list).xor(array);
+        result = _(list).xor(array, list);
     }
 
     {
@@ -3185,9 +3193,9 @@ namespace TestXor {
         result = _(array).chain().xor(list);
         result = _(array).chain().xor(list, array);
 
-        result = _(list).chain().xor<AbcObject>();
-        result = _(list).chain().xor<AbcObject>(array);
-        result = _(list).chain().xor<AbcObject>(array, list);
+        result = _(list).chain().xor();
+        result = _(list).chain().xor(array);
+        result = _(list).chain().xor(array, list);
     }
 }
 
@@ -3198,18 +3206,18 @@ namespace TestXor {
 
     {
         // $ExpectType (AbcObject | undefined)[][]
-        _.zip<AbcObject>(array);
+        _.zip(array);
         // $ExpectType (AbcObject | undefined)[][]
-        _.zip<AbcObject>(array, list);
+        _.zip(array, list);
         // $ExpectType (AbcObject | undefined)[][]
-        _.zip<AbcObject>(array, list, array);
+        _.zip(array, list, array);
 
         // $ExpectType (AbcObject | undefined)[][]
-        _.zip<AbcObject>(list);
+        _.zip(list);
         // $ExpectType (AbcObject | undefined)[][]
-        _.zip<AbcObject>(list, array);
+        _.zip(list, array);
         // $ExpectType (AbcObject | undefined)[][]
-        _.zip<AbcObject>(list, array, list);
+        _.zip(list, array, list);
 
         // $ExpectType (AbcObject | undefined)[][]
         _.zip(list, array, list, array, list, array);
@@ -3217,26 +3225,26 @@ namespace TestXor {
 
     {
         // $ExpectType LoDashImplicitWrapper<(AbcObject | undefined)[][]>
-        _(array).zip<AbcObject>(list);
+        _(array).zip(list);
         // $ExpectType LoDashImplicitWrapper<(AbcObject | undefined)[][]>
-        _(array).zip<AbcObject>(list, array);
+        _(array).zip(list, array);
 
         // $ExpectType LoDashImplicitWrapper<(AbcObject | undefined)[][]>
-        _(list).zip<AbcObject>(array);
+        _(list).zip(array);
         // $ExpectType LoDashImplicitWrapper<(AbcObject | undefined)[][]>
-        _(list).zip<AbcObject>(array, list);
+        _(list).zip(array, list);
     }
 
     {
         // $ExpectType LoDashExplicitWrapper<(AbcObject | undefined)[][]>
-        _(array).chain().zip<AbcObject>(list);
+        _(array).chain().zip(list);
         // $ExpectType LoDashExplicitWrapper<(AbcObject | undefined)[][]>
-        _(array).chain().zip<AbcObject>(list, array);
+        _(array).chain().zip(list, array);
 
         // $ExpectType LoDashExplicitWrapper<(AbcObject | undefined)[][]>
-        _(list).chain().zip<AbcObject>(array);
+        _(list).chain().zip(array);
         // $ExpectType LoDashExplicitWrapper<(AbcObject | undefined)[][]>
-        _(list).chain().zip<AbcObject>(array, list);
+        _(list).chain().zip(array, list);
     }
 
     {
@@ -4062,29 +4070,52 @@ namespace TestAt {
     let array: AbcObject[] | null | undefined = [] as any;
     let list: _.List<AbcObject> | null | undefined = [] as any;
     let dictionary: _.Dictionary<AbcObject> | null | undefined = anything;
+    let numericDictionary: _.NumericDictionary<AbcObject> | null | undefined = anything;
+    let abcObject: AbcObject | null | undefined = anything;
 
     {
         let result: AbcObject[];
 
-        result = _.at<AbcObject>(array, 0, '1', [2], ['3'], [4, '5']);
-        result = _.at<AbcObject>(list, 0, '1', [2], ['3'], [4, '5']);
-        result = _.at<AbcObject>(dictionary, 0, '1', [2], ['3'], [4, '5']);
+        result = _.at(array, 0, '1', [2], ['3'], [4, '5']);
+        result = _.at(list, 0, '1', [2], ['3'], [4, '5']);
+        result = _.at(dictionary, 0, '1', [2], ['3'], [4, '5']);
+        result = _.at(numericDictionary, 0, '1', [2], ['3'], [4, '5']);
+    }
+
+    {
+        let result: Array<AbcObject[keyof AbcObject]>;
+
+        result = _.at(abcObject, 'a', ['b'], ['a', 'b']);
     }
 
     {
         let result: _.LoDashImplicitArrayWrapper<AbcObject>;
 
         result = _(array).at(0, '1', [2], ['3'], [4, '5']);
-        result = _(list).at<AbcObject>(0, '1', [2], ['3'], [4, '5']);
-        result = _(dictionary).at<AbcObject>(0, '1', [2], ['3'], [4, '5']);
+        result = _(list).at(0, '1', [2], ['3'], [4, '5']);
+        result = _(dictionary).at(0, '1', [2], ['3'], [4, '5']);
+        result = _(numericDictionary).at(0, '1', [2], ['3'], [4, '5']);
+    }
+
+    {
+        let result: _.LoDashImplicitArrayWrapper<AbcObject[keyof AbcObject]>;
+
+        result = _(abcObject).at('a', ['b'], ['a', 'b']);
     }
 
     {
         let result: _.LoDashExplicitArrayWrapper<AbcObject>;
 
         result = _(array).chain().at(0, '1', [2], ['3'], [4, '5']);
-        result = _(list).chain().at<AbcObject>(0, '1', [2], ['3'], [4, '5']);
-        result = _(dictionary).chain().at<AbcObject>(0, '1', [2], ['3'], [4, '5']);
+        result = _(list).chain().at(0, '1', [2], ['3'], [4, '5']);
+        result = _(dictionary).chain().at(0, '1', [2], ['3'], [4, '5']);
+        result = _(numericDictionary).chain().at(0, '1', [2], ['3'], [4, '5']);
+    }
+
+    {
+        let result: _.LoDashExplicitArrayWrapper<AbcObject[keyof AbcObject]>;
+
+        result = _(abcObject).chain().at('a', ['b'], ['a', 'b']);
     }
 }
 
@@ -4099,37 +4130,34 @@ namespace TestCountBy {
     let stringIterator: (value: string, index: number, collection: string) => any = (value: string, index: number, collection: string) => 1;
     let listIterator: (value: AbcObject, index: number, collection: _.List<AbcObject>) => any = (value: AbcObject, index: number, collection: _.List<AbcObject>) => 1;
     let dictionaryIterator: (value: AbcObject, key: string, collection: _.Dictionary<AbcObject>) => any = (value: AbcObject, key: string, collection: _.Dictionary<AbcObject>) => 1;
-    let numericDictionaryIterator: (value: AbcObject, key: number, collection: _.NumericDictionary<AbcObject>) => any = (value: AbcObject, key: number, collection: _.NumericDictionary<AbcObject>) => 1;
+    let numericDictionaryIterator: (value: AbcObject, key: string, collection: _.NumericDictionary<AbcObject>) => any = (value: AbcObject, key: string, collection: _.NumericDictionary<AbcObject>) => 1;
 
     {
         let result: _.Dictionary<number>;
 
-        result = _.countBy<string>('');
-        result = _.countBy<string>('', stringIterator);
+        result = _.countBy('');
+        result = _.countBy('', stringIterator);
 
-        result = _.countBy<AbcObject>(array);
-        result = _.countBy<AbcObject>(array, listIterator);
-        result = _.countBy<AbcObject>(array, '');
+        result = _.countBy(array);
+        result = _.countBy(array, listIterator);
+        result = _.countBy(array, '');
+        result = _.countBy(array, {a: 42});
         result = _.countBy(array, {a: 42});
-        result = _.countBy<AbcObject>(array, {a: 42});
 
-        result = _.countBy<AbcObject>(list);
-        result = _.countBy<AbcObject>(list, listIterator);
-        result = _.countBy<AbcObject>(list, '');
+        result = _.countBy(list);
+        result = _.countBy(list, listIterator);
+        result = _.countBy(list, '');
         result = _.countBy(list, {a: 42});
-        result = _.countBy<AbcObject>(list, {a: 42});
 
-        result = _.countBy<AbcObject>(dictionary);
+        result = _.countBy(dictionary);
         result = _.countBy(dictionary, dictionaryIterator);
-        result = _.countBy<AbcObject>(dictionary, '');
+        result = _.countBy(dictionary, '');
         result = _.countBy(dictionary, {a: 42});
-        result = _.countBy<AbcObject>(dictionary, {a: 42});
 
-        result = _.countBy<AbcObject>(numericDictionary);
-        result = _.countBy<AbcObject>(numericDictionary, numericDictionaryIterator);
-        result = _.countBy<AbcObject>(numericDictionary, '');
+        result = _.countBy(numericDictionary);
+        result = _.countBy(numericDictionary, numericDictionaryIterator);
+        result = _.countBy(numericDictionary, '');
         result = _.countBy(numericDictionary, {a: 42});
-        result = _.countBy<AbcObject>(numericDictionary, {a: 42});
     }
 
     {
@@ -4145,7 +4173,7 @@ namespace TestCountBy {
         result = _(array).countBy({a: 42});
 
         result = _(list).countBy();
-        result = _(list).countBy<AbcObject>(listIterator);
+        result = _(list).countBy(listIterator);
         result = _(list).countBy('');
         result = _(list).countBy<{a: number}>({a: 42});
         result = _(list).countBy({a: 42});
@@ -4153,13 +4181,11 @@ namespace TestCountBy {
         result = _(dictionary).countBy();
         result = _(dictionary).countBy(dictionaryIterator);
         result = _(dictionary).countBy('');
-        result = _(dictionary).countBy<{a: number}>({a: 42});
         result = _(dictionary).countBy({a: 42});
 
         result = _(numericDictionary).countBy();
-        result = _(numericDictionary).countBy<AbcObject>(numericDictionaryIterator);
+        result = _(numericDictionary).countBy(numericDictionaryIterator);
         result = _(numericDictionary).countBy('');
-        result = _(numericDictionary).countBy<{a: number}>({a: 42});
         result = _(numericDictionary).countBy({a: 42});
     }
 
@@ -4172,25 +4198,21 @@ namespace TestCountBy {
         result = _(array).chain().countBy();
         result = _(array).chain().countBy(listIterator);
         result = _(array).chain().countBy('');
-        result = _(array).chain().countBy<{a: number}>({a: 42});
         result = _(array).chain().countBy({a: 42});
 
         result = _(list).chain().countBy();
-        result = _(list).chain().countBy<AbcObject>(listIterator);
+        result = _(list).chain().countBy(listIterator);
         result = _(list).chain().countBy('');
-        result = _(list).chain().countBy<{a: number}>({a: 42});
         result = _(list).chain().countBy({a: 42});
 
         result = _(dictionary).chain().countBy();
         result = _(dictionary).chain().countBy(dictionaryIterator);
         result = _(dictionary).chain().countBy('');
-        result = _(dictionary).chain().countBy<{a: number}>({a: 42});
         result = _(dictionary).chain().countBy({a: 42});
 
         result = _(numericDictionary).chain().countBy();
-        result = _(numericDictionary).chain().countBy<AbcObject>(numericDictionaryIterator);
+        result = _(numericDictionary).chain().countBy(numericDictionaryIterator);
         result = _(numericDictionary).chain().countBy('');
-        result = _(numericDictionary).chain().countBy<{a: number}>({a: 42});
         result = _(numericDictionary).chain().countBy({a: 42});
     }
 }
@@ -4271,7 +4293,7 @@ namespace TestEach {
     {
         let result: _.LoDashImplicitObjectWrapper<_.List<AbcObject>>;
 
-        result = _(list).each<AbcObject>(listIterator);
+        result = _(list).each(listIterator);
     }
 
     {
@@ -4295,7 +4317,7 @@ namespace TestEach {
     {
         let result: _.LoDashExplicitObjectWrapper<_.List<AbcObject>>;
 
-        result = _(list).chain().each<AbcObject>(listIterator);
+        result = _(list).chain().each(listIterator);
     }
 
     {
@@ -4381,7 +4403,7 @@ namespace TestEachRight {
     {
         let result: _.LoDashImplicitObjectWrapper<_.List<AbcObject>>;
 
-        result = _(list).eachRight<AbcObject>(listIterator);
+        result = _(list).eachRight(listIterator);
     }
 
     {
@@ -4405,7 +4427,7 @@ namespace TestEachRight {
     {
         let result: _.LoDashExplicitObjectWrapper<_.List<AbcObject>>;
 
-        result = _(list).chain().eachRight<AbcObject>(listIterator);
+        result = _(list).chain().eachRight(listIterator);
     }
 
     {
@@ -4427,34 +4449,34 @@ namespace TestEvery {
 
     let listIterator = (value: SampleObject, index: number, collection: _.List<SampleObject>) => true;
     let dictionaryIterator = (value: SampleObject, key: string, collection: _.Dictionary<SampleObject>) => true;
-    let numericDictionaryIterator = (value: SampleObject, key: number, collection: _.NumericDictionary<SampleObject>) => true;
+    let numericDictionaryIterator = (value: SampleObject, key: string, collection: _.NumericDictionary<SampleObject>) => true;
 
     {
         let result: boolean;
 
-        result = _.every<SampleObject>(array);
-        result = _.every<SampleObject>(array, listIterator);
-        result = _.every<SampleObject>(array, 'a');
-        result = _.every<SampleObject>(array, ['a', 42]);
-        result = _.every<SampleObject>(array, {a: 42});
+        result = _.every(array);
+        result = _.every(array, listIterator);
+        result = _.every(array, 'a');
+        result = _.every(array, ['a', 42]);
+        result = _.every(array, {a: 42});
 
-        result = _.every<SampleObject>(list);
-        result = _.every<SampleObject>(list, listIterator);
-        result = _.every<SampleObject>(list, 'a');
-        result = _.every<SampleObject>(list, ['a', 42]);
-        result = _.every<SampleObject>(list, {a: 42});
+        result = _.every(list);
+        result = _.every(list, listIterator);
+        result = _.every(list, 'a');
+        result = _.every(list, ['a', 42]);
+        result = _.every(list, {a: 42});
 
-        result = _.every<SampleObject>(dictionary);
+        result = _.every(dictionary);
         result = _.every(dictionary, dictionaryIterator);
-        result = _.every<SampleObject>(dictionary, 'a');
-        result = _.every<SampleObject>(dictionary, ['a', 42]);
-        result = _.every<SampleObject>(dictionary, {a: 42});
+        result = _.every(dictionary, 'a');
+        result = _.every(dictionary, ['a', 42]);
+        result = _.every(dictionary, {a: 42});
 
-        result = _.every<SampleObject>(numericDictionary);
-        result = _.every<SampleObject>(numericDictionary, numericDictionaryIterator);
-        result = _.every<SampleObject>(numericDictionary, 'a');
-        result = _.every<SampleObject>(numericDictionary, ['a', 42]);
-        result = _.every<SampleObject>(numericDictionary, {a: 42});
+        result = _.every(numericDictionary);
+        result = _.every(numericDictionary, numericDictionaryIterator);
+        result = _.every(numericDictionary, 'a');
+        result = _.every(numericDictionary, ['a', 42]);
+        result = _.every(numericDictionary, {a: 42});
 
         result = _(array).every();
         result = _(array).every(listIterator);
@@ -4462,20 +4484,20 @@ namespace TestEvery {
         result = _(array).every(['a', 42]);
         result = _(array).every({a: 42});
 
-        result = _(list).every<SampleObject>();
-        result = _(list).every<SampleObject>(listIterator);
+        result = _(list).every();
+        result = _(list).every(listIterator);
         result = _(list).every('a');
         result = _(list).every(['a', 42]);
         result = _(list).every({a: 42});
 
-        result = _(dictionary).every<SampleObject>();
+        result = _(dictionary).every();
         result = _(dictionary).every(dictionaryIterator);
         result = _(dictionary).every('a');
         result = _(dictionary).every(['a', 42]);
         result = _(dictionary).every({a: 42});
 
-        result = _(numericDictionary).every<SampleObject>();
-        result = _(numericDictionary).every<SampleObject>(numericDictionaryIterator);
+        result = _(numericDictionary).every();
+        result = _(numericDictionary).every(numericDictionaryIterator);
         result = _(numericDictionary).every('a');
         result = _(numericDictionary).every(['a', 42]);
         result = _(numericDictionary).every({a: 42});
@@ -4490,23 +4512,23 @@ namespace TestEvery {
         result = _(array).chain().every(['a', 42]);
         result = _(array).chain().every({a: 42});
 
-        result = _(list).chain().every<SampleObject>();
-        result = _(list).chain().every<SampleObject>(listIterator);
+        result = _(list).chain().every();
+        result = _(list).chain().every(listIterator);
         result = _(list).chain().every('a');
         result = _(list).chain().every(['a', 42]);
-        result = _(list).chain().every<SampleObject>({a: 42});
+        result = _(list).chain().every({a: 42});
 
-        result = _(dictionary).chain().every<SampleObject>();
+        result = _(dictionary).chain().every();
         result = _(dictionary).chain().every(dictionaryIterator);
         result = _(dictionary).chain().every('a');
         result = _(dictionary).chain().every(['a', 42]);
-        result = _(dictionary).chain().every<SampleObject>({a: 42});
+        result = _(dictionary).chain().every({a: 42});
 
-        result = _(numericDictionary).chain().every<SampleObject>();
-        result = _(numericDictionary).chain().every<SampleObject>(numericDictionaryIterator);
+        result = _(numericDictionary).chain().every();
+        result = _(numericDictionary).chain().every(numericDictionaryIterator);
         result = _(numericDictionary).chain().every('a');
         result = _(numericDictionary).chain().every(['a', 42]);
-        result = _(numericDictionary).chain().every<{a: number}>({a: 42});
+        result = _(numericDictionary).chain().every({a: 42});
     }
 }
 
@@ -4530,15 +4552,15 @@ namespace TestFilter {
     {
         let result: AbcObject[];
 
-        result = _.filter<AbcObject>(array, listIterator);
-        result = _.filter<AbcObject>(array, '');
-        result = _.filter<AbcObject>(array, {a: 42});
-        result = _.filter<AbcObject>(array, ["a", 42]);
+        result = _.filter(array, listIterator);
+        result = _.filter(array, '');
+        result = _.filter(array, {a: 42});
+        result = _.filter(array, ["a", 42]);
 
-        result = _.filter<AbcObject>(list, listIterator);
-        result = _.filter<AbcObject>(list, '');
-        result = _.filter<AbcObject>(list, {a: 42});
-        result = _.filter<AbcObject>(list, ["a", 42]);
+        result = _.filter(list, listIterator);
+        result = _.filter(list, '');
+        result = _.filter(list, {a: 42});
+        result = _.filter(list, ["a", 42]);
 
         result = _.filter(dictionary, dictionaryIterator);
         result = _.filter(dictionary, '');
@@ -4560,10 +4582,10 @@ namespace TestFilter {
         result = _(array).filter({a: 42});
         result = _(array).filter(["a", 42]);
 
-        result = _(list).filter<AbcObject>(listIterator);
-        result = _(list).filter<AbcObject>('');
-        result = _(list).filter<AbcObject>({a: 42});
-        result = _(list).filter<AbcObject>(["a", 42]);
+        result = _(list).filter(listIterator);
+        result = _(list).filter('');
+        result = _(list).filter({a: 42});
+        result = _(list).filter(["a", 42]);
 
         result = _(dictionary).filter(dictionaryIterator);
         result = _(dictionary).filter('');
@@ -4585,10 +4607,10 @@ namespace TestFilter {
         result = _(array).chain().filter({a: 42});
         result = _(array).chain().filter(["a", 42]);
 
-        result = _(list).chain().filter<AbcObject>(listIterator);
-        result = _(list).chain().filter<AbcObject>('');
-        result = _(list).chain().filter<AbcObject>({a: 42});
-        result = _(list).chain().filter<AbcObject>(["a", 42]);
+        result = _(list).chain().filter(listIterator);
+        result = _(list).chain().filter('');
+        result = _(list).chain().filter({a: 42});
+        result = _(list).chain().filter(["a", 42]);
 
         result = _(dictionary).chain().filter(dictionaryIterator);
         result = _(dictionary).chain().filter('');
@@ -4623,28 +4645,25 @@ namespace TestFind {
     let result: AbcObject | undefined;
 
     result = _.find(array);
-    result = _.find<AbcObject>(array);
-    result = _.find<AbcObject>(array, listIterator);
-    result = _.find<AbcObject>(array, listIterator, 1);
-    result = _.find<AbcObject>(array, '');
-    result = _.find<AbcObject>(array, '', 1);
-    result = _.find<AbcObject>(array, {a: 42});
-    result = _.find<AbcObject>(array, {a: 42}, 1);
+    result = _.find(array, listIterator);
+    result = _.find(array, listIterator, 1);
+    result = _.find(array, '');
+    result = _.find(array, '', 1);
+    result = _.find(array, {a: 42});
+    result = _.find(array, {a: 42}, 1);
     result = _.find(array, ['a', 5]);
     result = _.find(array, ['a', 5], 1);
 
     result = _.find(list);
-    result = _.find<AbcObject>(list);
-    result = _.find<AbcObject>(list, listIterator);
-    result = _.find<AbcObject>(list, listIterator, 1);
-    result = _.find<AbcObject>(list, '');
-    result = _.find<AbcObject>(list, '', 1);
-    result = _.find<AbcObject>(list, {a: 42});
-    result = _.find<AbcObject>(list, {a: 42}, 1);
+    result = _.find(list, listIterator);
+    result = _.find(list, listIterator, 1);
+    result = _.find(list, '');
+    result = _.find(list, '', 1);
+    result = _.find(list, {a: 42});
+    result = _.find(list, {a: 42}, 1);
     result = _.find(list, ['a', 5]);
     result = _.find(list, ['a', 5], 1);
 
-    result = _.find(dictionary);
     result = _.find(dictionary);
     result = _.find(dictionary, dictionaryIterator);
     result = _.find(dictionary, dictionaryIterator, 1);
@@ -4665,15 +4684,15 @@ namespace TestFind {
     result = _(array).find(['a', 5]);
     result = _(array).find(['a', 5], 1);
 
-    result = _(list).find<AbcObject>();
-    result = _(list).find<AbcObject>(listIterator);
-    result = _(list).find<AbcObject>(listIterator, 1);
-    result = _(list).find<AbcObject>('');
-    result = _(list).find<AbcObject>('', 1);
-    result = _(list).find<AbcObject>({a: 42});
-    result = _(list).find<AbcObject>({a: 42}, 1);
-    result = _(list).find<AbcObject>(['a', 5]);
-    result = _(list).find<AbcObject>(['a', 5], 1);
+    result = _(list).find();
+    result = _(list).find(listIterator);
+    result = _(list).find(listIterator, 1);
+    result = _(list).find('');
+    result = _(list).find('', 1);
+    result = _(list).find({a: 42});
+    result = _(list).find({a: 42}, 1);
+    result = _(list).find(['a', 5]);
+    result = _(list).find(['a', 5], 1);
 
     result = _(dictionary).find();
     result = _(dictionary).find(dictionaryIterator);
@@ -4702,24 +4721,23 @@ namespace TestFindLast {
     let result: AbcObject | undefined;
 
     result = _.findLast(array);
-    result = _.findLast<AbcObject>(array);
-    result = _.findLast<AbcObject>(array, listIterator);
-    result = _.findLast<AbcObject>(array, listIterator, 1);
-    result = _.findLast<AbcObject>(array, '');
-    result = _.findLast<AbcObject>(array, '', 1);
-    result = _.findLast<AbcObject>(array, {a: 42});
-    result = _.findLast<AbcObject>(array, {a: 42}, 1);
+    result = _.findLast(array, listIterator);
+    result = _.findLast(array, listIterator, 1);
+    result = _.findLast(array, '');
+    result = _.findLast(array, '', 1);
+    result = _.findLast(array, {a: 42});
+    result = _.findLast(array, {a: 42}, 1);
     result = _.findLast(array, ['a', 5]);
     result = _.findLast(array, ['a', 5], 1);
 
     result = _.findLast(list);
-    result = _.findLast<AbcObject>(list);
-    result = _.findLast<AbcObject>(list, listIterator);
-    result = _.findLast<AbcObject>(list, listIterator, 1);
-    result = _.findLast<AbcObject>(list, '');
-    result = _.findLast<AbcObject>(list, '', 1);
-    result = _.findLast<AbcObject>(list, {a: 42});
-    result = _.findLast<AbcObject>(list, {a: 42}, 1);
+    result = _.findLast(list);
+    result = _.findLast(list, listIterator);
+    result = _.findLast(list, listIterator, 1);
+    result = _.findLast(list, '');
+    result = _.findLast(list, '', 1);
+    result = _.findLast(list, {a: 42});
+    result = _.findLast(list, {a: 42}, 1);
     result = _.findLast(list, ['a', 5]);
     result = _.findLast(list, ['a', 5], 1);
 
@@ -4744,15 +4762,15 @@ namespace TestFindLast {
     result = _(array).findLast(['a', 5]);
     result = _(array).findLast(['a', 5], 1);
 
-    result = _(list).findLast<AbcObject>();
-    result = _(list).findLast<AbcObject>(listIterator);
-    result = _(list).findLast<AbcObject>(listIterator, 1);
-    result = _(list).findLast<AbcObject>('');
-    result = _(list).findLast<AbcObject>('', 1);
-    result = _(list).findLast<AbcObject>({a: 42});
-    result = _(list).findLast<AbcObject>({a: 42}, 1);
-    result = _(list).findLast<AbcObject>(['a', 5]);
-    result = _(list).findLast<AbcObject>(['a', 5], 1);
+    result = _(list).findLast();
+    result = _(list).findLast(listIterator);
+    result = _(list).findLast(listIterator, 1);
+    result = _(list).findLast('');
+    result = _(list).findLast('', 1);
+    result = _(list).findLast({a: 42});
+    result = _(list).findLast({a: 42}, 1);
+    result = _(list).findLast(['a', 5]);
+    result = _(list).findLast(['a', 5], 1);
 
     result = _(dictionary).findLast();
     result = _(dictionary).findLast(dictionaryIterator);
@@ -4789,7 +4807,7 @@ namespace TestFlatMap {
 
     let dictionaryIterator: (value: number|number[], key: string, collection: _.Dictionary<number|number[]>) => number|number[] = (a, b, c) => 1;
 
-    let numericDictionaryIterator: (value: number|number[], key: number, collection: _.NumericDictionary<number|number[]>) => number|number[] = (a, b, c) => 1;
+    let numericDictionaryIterator: (value: number|number[], key: string, collection: _.NumericDictionary<number|number[]>) => number|number[] = (a, b, c) => 1;
 
     {
         let result: string[];
@@ -4831,7 +4849,6 @@ namespace TestFlatMap {
         result = _.flatMap<number>(numNumericDictionary);
 
         result = _.flatMap(numNumericDictionary, numericDictionaryIterator);
-        result = _.flatMap<number|number[], number>(numNumericDictionary, numericDictionaryIterator);
 
         result = _.flatMap(objNumericDictionary, 'a');
     }
@@ -4861,20 +4878,20 @@ namespace TestFlatMap {
     {
         let result: _.LoDashImplicitArrayWrapper<number>;
 
-        result = _(numArray).flatMap<number>();
+        result = _(numArray).flatMap();
         result = _(numArray).flatMap(listIterator);
         result = _(objArray).flatMap('a');
 
-        result = _(numList).flatMap<number>();
-        result = _(numList).flatMap<number|number[], number>(listIterator);
+        result = _(numList).flatMap();
+        result = _(numList).flatMap(listIterator);
         result = _(objList).flatMap('a');
 
-        result = _(numDictionary).flatMap<number>();
+        result = _(numDictionary).flatMap();
         result = _(numDictionary).flatMap(dictionaryIterator);
         result = _(objDictionary).flatMap('a');
 
-        result = _(numNumericDictionary).flatMap<number>();
-        result = _(numNumericDictionary).flatMap<number|number[], number>(numericDictionaryIterator);
+        result = _(numNumericDictionary).flatMap();
+        result = _(numNumericDictionary).flatMap(numericDictionaryIterator);
         result = _(objNumericDictionary).flatMap('a');
     }
 
@@ -4903,20 +4920,20 @@ namespace TestFlatMap {
     {
         let result: _.LoDashExplicitArrayWrapper<number>;
 
-        result = _(numArray).chain().flatMap<number>();
+        result = _(numArray).chain().flatMap();
         result = _(numArray).chain().flatMap(listIterator);
         result = _(objArray).chain().flatMap('a');
 
-        result = _(numList).chain().flatMap<number>();
-        result = _(numList).chain().flatMap<number|number[], number>(listIterator);
+        result = _(numList).chain().flatMap();
+        result = _(numList).chain().flatMap(listIterator);
         result = _(objList).chain().flatMap('a');
 
-        result = _(numDictionary).chain().flatMap<number>();
+        result = _(numDictionary).chain().flatMap();
         result = _(numDictionary).chain().flatMap(dictionaryIterator);
         result = _(objDictionary).chain().flatMap('a');
 
-        result = _(numNumericDictionary).chain().flatMap<number>();
-        result = _(numNumericDictionary).chain().flatMap<number|number[], number>(numericDictionaryIterator);
+        result = _(numNumericDictionary).chain().flatMap();
+        result = _(numNumericDictionary).chain().flatMap(numericDictionaryIterator);
         result = _(objNumericDictionary).chain().flatMap('a');
     }
 
@@ -4972,7 +4989,7 @@ namespace TestFlatMapDeep {
 
     let dictionaryIterator: (value: number|number[], key: string, collection: _.Dictionary<number|number[]>) =>_.ListOfRecursiveArraysOrValues<number> = (a, b, c) => [1];
 
-    let numericDictionaryIterator: (value: number|number[], key: number, collection: _.NumericDictionary<number|number[]>) => _.ListOfRecursiveArraysOrValues<number> = (a, b, c) => [1];
+    let numericDictionaryIterator: (value: number|number[], key: string, collection: _.NumericDictionary<number|number[]>) => _.ListOfRecursiveArraysOrValues<number> = (a, b, c) => [1];
 
     {
         let result: string[];
@@ -5133,7 +5150,7 @@ namespace TestFlatMapDepth {
 
     let dictionaryIterator: (value: number|number[], key: string, collection: _.Dictionary<number|number[]>) => _.ListOfRecursiveArraysOrValues<number> = (a, b, c) => [1];
 
-    let numericDictionaryIterator: (value: number|number[], key: number, collection: _.NumericDictionary<number|number[]>) => _.ListOfRecursiveArraysOrValues<number> = (a, b, c) => [1];
+    let numericDictionaryIterator: (value: number|number[], key: string, collection: _.NumericDictionary<number|number[]>) => _.ListOfRecursiveArraysOrValues<number> = (a, b, c) => [1];
 
     {
         let result: string[];
@@ -5276,219 +5293,242 @@ namespace TestFlatMapDepth {
 
 // _.forEach
 namespace TestForEach {
-    let array: AbcObject[] = [];
-    let list: _.List<AbcObject> = [];
-    let dictionary: _.Dictionary<AbcObject> = {};
-    let nilArray: AbcObject[] | null | undefined = [] as any;
-    let nilList: _.List<AbcObject> | null | undefined = [] as any;
-    let nilDictionary: _.Dictionary<AbcObject> | null | undefined = anything;
+    const str: string = anything;
+    const nilStr: string | null | undefined = anything;
+    const array: AbcObject[] = anything;
+    const list: _.List<AbcObject> = anything;
+    const dictionary: _.Dictionary<AbcObject> = anything;
+    const numericDictionary: _.NumericDictionary<AbcObject> = anything;
+    const nilArray: AbcObject[] | null | undefined = anything;
+    const nilList: _.List<AbcObject> | null | undefined = anything;
+    const nilDictionary: _.Dictionary<AbcObject> | null | undefined = anything;
+    const nilNumericDictionary: _.NumericDictionary<AbcObject> | null | undefined = anything;
+    const abcObject: AbcObject = anything;
+    const nilAbcObject: AbcObject | null | undefined = anything;
 
-    let listIterator: (value: AbcObject, index: number, collection: _.List<AbcObject>) => any = (value, index, collection) => 1;
-    let dictionaryIterator: (value: AbcObject, key: string, collection: _.Dictionary<AbcObject>) => any = (value, key, collection) => 1;
-    let objectIterator: (value: number | string | boolean, key: string, collection: AbcObject) => any = (value, key, collection) => 1;
+    // $ExpectType string
+    _.forEach(str, (value, index, collection) => {
+        value; // $ExpectType string
+        index; // $ExpectType number
+        collection; // $ExpectType string
+    });
 
-    {
-        let result: string;
+    // $ExpectType string | null | undefined
+    _.forEach(nilStr, (value, index, collection) => {
+        value; // $ExpectType string
+        index; // $ExpectType number
+        collection; // $ExpectType string
+    });
 
-        result = _.forEach('', (value, index, collection) => {
-            value; // $ExpectType string
-            index; // $ExpectType number
-            collection; // $ExpectType string
-        });
-    }
+    // $ExpectType AbcObject[]
+    _.forEach(array, (value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType AbcObject[]
+    });
 
-    {
-        let result: string | null | undefined;
+    // $ExpectType AbcObject[] | null | undefined
+    _.forEach(nilArray, (value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType AbcObject[]
+    });
 
-        result = _.forEach('' as (string | null | undefined), (value, index, collection) => {
-            value; // $ExpectType string
-            index; // $ExpectType number
-            collection; // $ExpectType string
-        });
-    }
+    // $ExpectType ArrayLike<AbcObject>
+    _.forEach(list, (value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType ArrayLike<AbcObject>
+    });
 
-    {
-        let result: AbcObject[];
-        result = _.forEach(array, (value, index, collection: ArrayLike<AbcObject>) => {
-            value; // $ExpectType AbcObject
-            index; // $ExpectType number
-        });
-        result = _.forEach(array, (value, index, collection) => {
-            value; // $ExpectType AbcObject
-            index; // $ExpectType number
-            collection; // $ExpectType AbcObject[]
-        });
-    }
+    // $ExpectType ArrayLike<AbcObject> | null | undefined
+    _.forEach(nilList, (value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType ArrayLike<AbcObject>
+    });
 
-    {
-        let result: AbcObject[] | null | undefined;
+    // $ExpectType Dictionary<AbcObject>
+    _.forEach(dictionary, (value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType string
+        collection; // $ExpectType Dictionary<AbcObject>
+    });
 
-        result = _.forEach(array, (value, index, collection: ArrayLike<AbcObject>) => {
-            value; // $ExpectType AbcObject
-            index; // $ExpectType number
-        });
-        result = _.forEach(nilArray, (value, index, collection) => {
-            value; // $ExpectType AbcObject
-            index; // $ExpectType number
-            collection; // $ExpectType AbcObject[]
-        });
-    }
+    // $ExpectType Dictionary<AbcObject> | null | undefined
+    _.forEach(nilDictionary, (value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType string
+        collection; // $ExpectType Dictionary<AbcObject>
+    });
 
-    {
-        let result: _.List<AbcObject>;
+    // $ExpectType NumericDictionary<AbcObject>
+    _.forEach(numericDictionary, (value, index, collection) => {
+        /* Broken in TS 2.4: value; // AbcObject */
+        index; // $ExpectType string
+        collection; // $ExpectType NumericDictionary<AbcObject>
+    });
 
-        result = _.forEach(list, (value, index, collection) => {
-            value; // $ExpectType AbcObject
-            index; // $ExpectType number
-            collection; // $ExpectType ArrayLike<AbcObject>
-        });
-    }
+    // $ExpectType NumericDictionary<AbcObject> | null | undefined
+    _.forEach(nilNumericDictionary, (value, index, collection) => {
+        /* Broken in TS 2.4: value; // AbcObject */
+        index; // $ExpectType string
+        collection; // $ExpectType NumericDictionary<AbcObject>
+    });
 
-    {
-        let result: _.List<AbcObject> | null | undefined;
+    // $ExpectType AbcObject
+    _.forEach(abcObject, (value, index, collection) => {
+        value; // $ExpectType string | number | boolean
+        index; // $ExpectType string
+        collection; // $ExpectType AbcObject
+    });
 
-        result = _.forEach(nilList, (value, index, collection) => {
-            value; // $ExpectType AbcObject
-            index; // $ExpectType number
-            collection; // $ExpectType ArrayLike<AbcObject>
-        });
-    }
+    // $ExpectType AbcObject | null | undefined
+    _.forEach(nilAbcObject, (value, index, collection) => {
+        value; // $ExpectType string | number | boolean
+        index; // $ExpectType string
+        collection; // $ExpectType AbcObject
+    });
 
-    {
-        let result: _.Dictionary<AbcObject>;
+    // $ExpectType LoDashImplicitWrapper<string>
+    _(str).forEach((value, index, collection) => {
+        value; // $ExpectType string
+        index; // $ExpectType number
+        collection; // $ExpectType string
+    });
 
-        result = _.forEach(dictionary, (value, index, collection) => {
-            value; // $ExpectType AbcObject
-            index; // $ExpectType string
-            collection; // $ExpectType Dictionary<AbcObject>
-        });
-    }
+    // $ExpectType LoDashImplicitWrapper<string | null | undefined>
+    _(nilStr).forEach((value, index, collection) => {
+        value; // $ExpectType string
+        index; // $ExpectType number
+        collection; // $ExpectType string
+    });
 
-    {
-        let result: _.Dictionary<AbcObject> | null | undefined;
+    // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(array).forEach((value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType AbcObject[]
+    });
 
-        result = _.forEach(nilDictionary, (value, index, collection) => {
-            value; // $ExpectType AbcObject
-            index; // $ExpectType string
-            collection; // $ExpectType Dictionary<AbcObject>
-        });
-    }
+    // $ExpectType LoDashImplicitWrapper<AbcObject[] | null | undefined>
+    _(nilArray).forEach((value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType AbcObject[]
+    });
 
-    {
-        let sample1: AbcObject = anything;
-        sample1 = _.forEach(sample1, objectIterator);
+    // $ExpectType LoDashImplicitWrapper<ArrayLike<AbcObject>>
+    _(list).forEach((value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType ArrayLike<AbcObject>
+    });
 
-        let sample2: AbcObject | null | undefined = anything;
-        sample2 = _.forEach(sample2, objectIterator);
-    }
+    // $ExpectType LoDashImplicitWrapper<ArrayLike<AbcObject> | null | undefined>
+    _(nilList).forEach((value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType ArrayLike<AbcObject>
+    });
 
-    {
-        let result: _.LoDashImplicitWrapper<string>;
+    // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+    _(dictionary).forEach((value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType string
+        collection; // $ExpectType Dictionary<AbcObject>
+    });
 
-        result = _('').forEach((value, index, collection) => {
-            value; // $ExpectType string
-            index; // $ExpectType number
-            collection; // $ExpectType string
-        });
-    }
+    // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject> | null | undefined>
+    _(nilDictionary).forEach((value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType string
+        collection; // $ExpectType Dictionary<AbcObject>
+    });
 
-    {
-        let result: _.LoDashImplicitArrayWrapper<AbcObject>;
+    // $ExpectType LoDashImplicitWrapper<NumericDictionary<AbcObject>>
+    _(numericDictionary).forEach((value, index, collection) => {
+        /* Broken in TS 2.4: value; // AbcObject */
+        index; // $ExpectType string
+        collection; // $ExpectType NumericDictionary<AbcObject>
+    });
 
-        result = _(array).forEach((value, index, collection) => {
-            value; // $ExpectType AbcObject
-            index; // $ExpectType number
-            collection; // $ExpectType AbcObject[]
-        });
-    }
+    // $ExpectType LoDashImplicitWrapper<NumericDictionary<AbcObject> | null | undefined>
+    _(nilNumericDictionary).forEach((value, index, collection) => {
+        /* Broken in TS 2.4: value; // AbcObject */
+        index; // $ExpectType string
+        collection; // $ExpectType NumericDictionary<AbcObject>
+    });
 
-    {
-        let result: _.LoDashImplicitNillableArrayWrapper<AbcObject>;
+    // $ExpectType LoDashExplicitWrapper<string>
+    _(str).chain().forEach((value, index, collection) => {
+        value; // $ExpectType string
+        index; // $ExpectType number
+        collection; // $ExpectType string
+    });
 
-        result = _(nilArray).forEach((value, index, collection) => {
-            value; // $ExpectType AbcObject
-            index; // $ExpectType number
-            collection; // $ExpectType AbcObject[]
-        });
-    }
+    // $ExpectType LoDashExplicitWrapper<string | null | undefined>
+    _(nilStr).chain().forEach((value, index, collection) => {
+        value; // $ExpectType string
+        index; // $ExpectType number
+        collection; // $ExpectType string
+    });
 
-    {
-        let result: _.LoDashImplicitObjectWrapper<_.List<AbcObject>>;
+    // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _(array).chain().forEach((value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType AbcObject[]
+    });
 
-        result = _(list).forEach<AbcObject>(listIterator);
-    }
+    // $ExpectType LoDashExplicitWrapper<AbcObject[] | null | undefined>
+    _(nilArray).chain().forEach((value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType AbcObject[]
+    });
 
-    {
-        let result: _.LoDashImplicitNillableObjectWrapper<_.List<AbcObject>>;
+    // $ExpectType LoDashExplicitWrapper<ArrayLike<AbcObject>>
+    _(list).chain().forEach((value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType ArrayLike<AbcObject>
+    });
 
-        result = _(nilList).forEach<AbcObject>(listIterator);
-    }
+    // $ExpectType LoDashExplicitWrapper<ArrayLike<AbcObject> | null | undefined>
+    _(nilList).chain().forEach((value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType ArrayLike<AbcObject>
+    });
 
-    {
-        let result: _.LoDashImplicitObjectWrapper<_.Dictionary<AbcObject>>;
+    // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+    _(dictionary).chain().forEach((value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType string
+        collection; // $ExpectType Dictionary<AbcObject>
+    });
 
-        result = _(dictionary).forEach(dictionaryIterator);
-    }
+    // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject> | null | undefined>
+    _(nilDictionary).chain().forEach((value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType string
+        collection; // $ExpectType Dictionary<AbcObject>
+    });
 
-    {
-        let result: _.LoDashImplicitNillableObjectWrapper<_.Dictionary<AbcObject>>;
+    // $ExpectType LoDashExplicitWrapper<NumericDictionary<AbcObject>>
+    _(numericDictionary).chain().forEach((value, index, collection) => {
+        /* Broken in TS 2.4: value; // AbcObject */
+        index; // $ExpectType string
+        collection; // $ExpectType NumericDictionary<AbcObject>
+    });
 
-        result = _(nilDictionary).forEach(dictionaryIterator);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<string>;
-
-        result = _('').chain().forEach((value, index, collection) => {
-            value; // $ExpectType string
-            index; // $ExpectType number
-            collection; // $ExpectType string
-        });
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<AbcObject>;
-
-        result = _(array).chain().forEach((value, index, collection) => {
-            value; // $ExpectType AbcObject
-            index; // $ExpectType number
-            collection; // $ExpectType AbcObject[]
-        });
-    }
-
-    {
-        let result: _.LoDashExplicitNillableArrayWrapper<AbcObject>;
-
-        result = _(nilArray).chain().forEach((value, index, collection) => {
-            value; // $ExpectType AbcObject
-            index; // $ExpectType number
-            collection; // $ExpectType AbcObject[]
-        });
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<_.List<AbcObject>>;
-
-        result = _(list).chain().forEach<AbcObject>(listIterator);
-    }
-
-    {
-        let result: _.LoDashExplicitNillableObjectWrapper<_.List<AbcObject>>;
-
-        result = _(nilList).chain().forEach<AbcObject>(listIterator);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<_.Dictionary<AbcObject>>;
-
-        result = _(dictionary).chain().forEach(dictionaryIterator);
-    }
-
-    {
-        let result: _.LoDashExplicitNillableObjectWrapper<_.Dictionary<AbcObject>>;
-
-        result = _(nilDictionary).chain().forEach(dictionaryIterator);
-    }
+    // $ExpectType LoDashExplicitWrapper<NumericDictionary<AbcObject> | null | undefined>
+    _(nilNumericDictionary).chain().forEach((value, index, collection) => {
+        /* Broken in TS 2.4: value; // AbcObject */
+        index; // $ExpectType string
+        collection; // $ExpectType NumericDictionary<AbcObject>
+    });
 }
 
 // _.forEachRight
@@ -5608,13 +5648,13 @@ namespace TestForEachRight {
     {
         let result: _.LoDashImplicitObjectWrapper<_.List<AbcObject>>;
 
-        result = _(list).forEachRight<AbcObject>(listIterator);
+        result = _(list).forEachRight(listIterator);
     }
 
     {
         let result: _.LoDashImplicitNillableObjectWrapper<_.List<AbcObject>>;
 
-        result = _(nilList).forEachRight<AbcObject>(listIterator);
+        result = _(nilList).forEachRight(listIterator);
     }
 
     {
@@ -5668,7 +5708,7 @@ namespace TestForEachRight {
     {
         let result: _.LoDashExplicitNillableObjectWrapper<_.List<AbcObject>>;
 
-        result = _(nilList).chain().forEachRight<AbcObject>(listIterator);
+        result = _(nilList).chain().forEachRight(listIterator);
     }
 
     {
@@ -5690,8 +5730,7 @@ namespace TestGroupBy {
 
     let array: SampleType[] | null | undefined = [] as any;
     let list: _.List<SampleType> | null | undefined = [] as any;
-    let obj: any = {};
-    let dictionary: _.Dictionary<SampleType> | null | undefined = obj;
+    let dictionary: _.Dictionary<SampleType> | null | undefined = anything;
 
     let stringIterator = (char: string, index: number, string: string) => 0;
     let listIterator = (value: SampleType, index: number, collection: _.List<SampleType>) => 0;
@@ -5738,15 +5777,15 @@ namespace TestGroupBy {
         result = _(array).groupBy('');
         result = _(array).groupBy({a: 42});
 
-        result = _(list).groupBy<SampleType>();
-        result = _(list).groupBy<SampleType>(listIterator);
-        result = _(list).groupBy<SampleType>('');
-        result = _(list).groupBy<SampleType>({a: 42});
+        result = _(list).groupBy();
+        result = _(list).groupBy(listIterator);
+        result = _(list).groupBy('');
+        result = _(list).groupBy({a: 42});
 
-        result = _(dictionary).groupBy<SampleType>();
+        result = _(dictionary).groupBy();
         result = _(dictionary).groupBy(dictionaryIterator);
-        result = _(dictionary).groupBy<SampleType>('');
-        result = _(dictionary).groupBy<SampleType>({a: 42});
+        result = _(dictionary).groupBy('');
+        result = _(dictionary).groupBy({a: 42});
     }
 
     {
@@ -5764,15 +5803,15 @@ namespace TestGroupBy {
         result = _(array).chain().groupBy('');
         result = _(array).chain().groupBy({a: 42});
 
-        result = _(list).chain().groupBy<SampleType>();
-        result = _(list).chain().groupBy<SampleType>(listIterator);
-        result = _(list).chain().groupBy<SampleType>('');
-        result = _(list).chain().groupBy<SampleType>({a: 42});
+        result = _(list).chain().groupBy();
+        result = _(list).chain().groupBy(listIterator);
+        result = _(list).chain().groupBy('');
+        result = _(list).chain().groupBy({a: 42});
 
-        result = _(dictionary).chain().groupBy<SampleType>();
+        result = _(dictionary).chain().groupBy();
         result = _(dictionary).chain().groupBy(dictionaryIterator);
-        result = _(dictionary).chain().groupBy<SampleType>('');
-        result = _(dictionary).chain().groupBy<SampleType>({a: 42});
+        result = _(dictionary).chain().groupBy('');
+        result = _(dictionary).chain().groupBy({a: 42});
     }
 }
 
@@ -5836,7 +5875,7 @@ namespace TestKeyBy {
     let stringIterator = (value: string, index: number, collection: string) => "a";
     let listIterator = (value: SampleObject, index: number, collection: _.List<SampleObject>) => 1;
     let dictionaryIterator = (value: SampleObject, key: string, collection: _.Dictionary<SampleObject>) => Symbol.name;
-    let numericDictionaryIterator = (value: SampleObject, key: number, collection: _.NumericDictionary<SampleObject>) => "a";
+    let numericDictionaryIterator = (value: SampleObject, key: string, collection: _.NumericDictionary<SampleObject>) => "a";
 
     {
         let result: _.Dictionary<string>;
@@ -5848,20 +5887,20 @@ namespace TestKeyBy {
     {
         let result: _.Dictionary<SampleObject>;
 
-        result = _.keyBy<SampleObject>(array);
-        result = _.keyBy<SampleObject>(array, listIterator);
-        result = _.keyBy<SampleObject>(array, 'a');
-        result = _.keyBy<SampleObject>(array, {a: 42});
+        result = _.keyBy(array);
+        result = _.keyBy(array, listIterator);
+        result = _.keyBy(array, 'a');
+        result = _.keyBy(array, {a: 42});
 
-        result = _.keyBy<SampleObject>(list);
-        result = _.keyBy<SampleObject>(list, listIterator);
-        result = _.keyBy<SampleObject>(list, 'a');
-        result = _.keyBy<SampleObject>(list, {a: 42});
+        result = _.keyBy(list);
+        result = _.keyBy(list, listIterator);
+        result = _.keyBy(list, 'a');
+        result = _.keyBy(list, {a: 42});
 
-        result = _.keyBy<SampleObject>(numericDictionary);
-        result = _.keyBy<SampleObject>(numericDictionary, numericDictionaryIterator);
-        result = _.keyBy<SampleObject>(numericDictionary, 'a');
-        result = _.keyBy<SampleObject>(numericDictionary, {a: 42});
+        result = _.keyBy(numericDictionary);
+        result = _.keyBy(numericDictionary, numericDictionaryIterator);
+        result = _.keyBy(numericDictionary, 'a');
+        result = _.keyBy(numericDictionary, {a: 42});
 
         result = _.keyBy(dictionary);
         result = _.keyBy(dictionary, dictionaryIterator);
@@ -5884,15 +5923,15 @@ namespace TestKeyBy {
         result = _(array).keyBy('a');
         result = _(array).keyBy({a: 42});
 
-        result = _(list).keyBy<SampleObject>();
-        result = _(list).keyBy<SampleObject>(listIterator);
-        result = _(list).keyBy<SampleObject>('a');
-        result = _(list).keyBy<SampleObject>({a: 42});
+        result = _(list).keyBy();
+        result = _(list).keyBy(listIterator);
+        result = _(list).keyBy('a');
+        result = _(list).keyBy({a: 42});
 
-        result = _(numericDictionary).keyBy<SampleObject>();
-        result = _(numericDictionary).keyBy<SampleObject>(numericDictionaryIterator);
-        result = _(numericDictionary).keyBy<SampleObject>('a');
-        result = _(numericDictionary).keyBy<SampleObject>({a: 42});
+        result = _(numericDictionary).keyBy();
+        result = _(numericDictionary).keyBy(numericDictionaryIterator);
+        result = _(numericDictionary).keyBy('a');
+        result = _(numericDictionary).keyBy({a: 42});
 
         result = _(dictionary).keyBy();
         result = _(dictionary).keyBy(dictionaryIterator);
@@ -5915,15 +5954,15 @@ namespace TestKeyBy {
         result = _(array).chain().keyBy('a');
         result = _(array).chain().keyBy({a: 42});
 
-        result = _(list).chain().keyBy<SampleObject>();
-        result = _(list).chain().keyBy<SampleObject>(listIterator);
-        result = _(list).chain().keyBy<SampleObject>('a');
-        result = _(list).chain().keyBy<SampleObject>({a: 42});
+        result = _(list).chain().keyBy();
+        result = _(list).chain().keyBy(listIterator);
+        result = _(list).chain().keyBy('a');
+        result = _(list).chain().keyBy({a: 42});
 
-        result = _(numericDictionary).chain().keyBy<SampleObject>();
-        result = _(numericDictionary).chain().keyBy<SampleObject>(numericDictionaryIterator);
-        result = _(numericDictionary).chain().keyBy<SampleObject>('a');
-        result = _(numericDictionary).chain().keyBy<SampleObject>({a: 42});
+        result = _(numericDictionary).chain().keyBy();
+        result = _(numericDictionary).chain().keyBy(numericDictionaryIterator);
+        result = _(numericDictionary).chain().keyBy('a');
+        result = _(numericDictionary).chain().keyBy({a: 42});
 
         result = _(dictionary).chain().keyBy();
         result = _(dictionary).chain().keyBy(dictionaryIterator);
@@ -6065,66 +6104,170 @@ namespace TestInvokeMap {
 
 // _.map
 namespace TestMap {
-    let array: number[] | null | undefined = [] as any;
-    let list: _.List<number> | null | undefined = [] as any;
-    let obj: any = {};
-    let dictionary: _.Dictionary<number> | null | undefined = obj;
-
-    let listIterator: (value: number, index: number, collection: _.List<number>) => AbcObject = (value: number, index: number, collection: _.List<number>) => ({ a: 1, b: "", c: true });
-    let dictionaryIterator: (value: number, key: string, collection: _.Dictionary<number>) => AbcObject = (value: number, key: string, collection: _.Dictionary<number>) => ({ a: 1, b: "", c: true });
+    const array: AbcObject[] | null | undefined = anything;
+    const list: _.List<AbcObject> | null | undefined = anything;
+    const dictionary: _.Dictionary<AbcObject> | null | undefined = anything;
+    const numericDictionary: _.NumericDictionary<AbcObject> | null | undefined = anything;
+    const abcObject: AbcObject = anything;
 
     {
-        _.map(array);  // $ExpectType number[]
-        _.map(array, listIterator);  // $ExpectType AbcObject[]
+        _.map(array);  // $ExpectType AbcObject[]
+        // $ExpectType number[]
+        _.map(array, (value, index, collection) => {
+            value; // $ExpectType AbcObject
+            index; // $ExpectType number
+            collection; // $ExpectType AbcObject[]
+            return 0;
+        });
 
-        _.map(list);  // $ExpectType number[]
-        _.map(list, listIterator);  // $ExpectType AbcObject[]
+        _.map(list);  // $ExpectType AbcObject[]
+        // $ExpectType number[]
+        _.map(list, (value, index, collection) => {
+            value; // $ExpectType AbcObject
+            index; // $ExpectType number
+            collection; // $ExpectType ArrayLike<AbcObject>
+            return 0;
+        });
 
-        _.map(dictionary);  // $ExpectType number[]
-        _.map(dictionary, dictionaryIterator);  // $ExpectType AbcObject[]
-    }
+        _.map(dictionary);  // $ExpectType AbcObject[]
+        // $ExpectType number[]
+        _.map(dictionary, (value, key, collection) => {
+            value; // $ExpectType AbcObject
+            key; // $ExpectType string
+            collection; // $ExpectType Dictionary<AbcObject>
+            return 0;
+        });
+
+        _.map(numericDictionary);  // $ExpectType AbcObject[]
+        // $ExpectType number[]
+        _.map(numericDictionary, (value, key, collection) => {
+            /* Broken in TS 2.4: value; // AbcObject */
+            key; // $ExpectType string
+            collection; // $ExpectType NumericDictionary<AbcObject>
+            return 0;
+        });
+
+        _.map(array, 'a'); // $ExpectType number[]
+        _.map(list, 'a'); // $ExpectType number[]
+        _.map(dictionary, 'a'); // $ExpectType number[]
+        _.map(numericDictionary, 'a'); // $ExpectType number[]
+
+        _.map(array, 'd.0.b'); // $ExpectType any[]
+        _.map(list, 'd.0.b'); // $ExpectType any[]
+        _.map(dictionary, 'd.0.b'); // $ExpectType any[]
+        _.map(numericDictionary, 'd.0.b'); // $ExpectType any[]
 
-    {
         // _.matches iteratee shorthand.
         _.map(array, {});  // $ExpectType boolean[]
         _.map(list, {});  // $ExpectType boolean[]
         _.map(dictionary, {});  // $ExpectType boolean[]
+        _.map(numericDictionary, {});  // $ExpectType boolean[]
     }
 
     {
-        _(array).map().value();  // $ExpectType number[]
-        _(array).map(listIterator).value();  // $ExpectType AbcObject[]
+        _(array).map(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+        // $ExpectType LoDashImplicitWrapper<number[]>
+        _(array).map((value, index, collection) => {
+            value; // $ExpectType AbcObject
+            index; // $ExpectType number
+            collection; // $ExpectType AbcObject[]
+            return 0;
+        });
 
-        _(list).map().value();  // $ExpectType number[]
-        _(list).map(listIterator).value();  // $ExpectType AbcObject[]
+        _(list).map(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+        // $ExpectType LoDashImplicitWrapper<number[]>
+        _(list).map((value, index, collection) => {
+            value; // $ExpectType AbcObject
+            index; // $ExpectType number
+            collection; // $ExpectType ArrayLike<AbcObject>
+            return 0;
+        });
 
-        _(dictionary).map().value();  // $ExpectType number[]
-        _(dictionary).map(dictionaryIterator).value();  // $ExpectType AbcObject[]
+        _(dictionary).map();  // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+        // $ExpectType LoDashImplicitWrapper<number[]>
+        _(dictionary).map((value, key, collection) => {
+            value; // $ExpectType AbcObject
+            key; // $ExpectType string
+            collection; // $ExpectType Dictionary<AbcObject>
+            return 0;
+        });
+
+        _(numericDictionary).map();  // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+        // $ExpectType LoDashImplicitWrapper<number[]>
+        _(numericDictionary).map((value, key, collection) => {
+            /* Broken in TS 2.4: value; // AbcObject */
+            key; // $ExpectType string
+            collection; // $ExpectType NumericDictionary<AbcObject>
+            return 0;
+        });
+
+        _(array).map('a'); // $ExpectType LoDashImplicitWrapper<number[]>
+        _(list).map('a'); // $ExpectType LoDashImplicitWrapper<number[]>
+        _(dictionary).map('a'); // $ExpectType LoDashImplicitWrapper<number[]>
+        _(numericDictionary).map('a'); // $ExpectType LoDashImplicitWrapper<number[]>
+
+        _(array).map('d.0.b'); // $ExpectType LoDashImplicitWrapper<any[]>
+        _(list).map('d.0.b'); // $ExpectType LoDashImplicitWrapper<any[]>
+        _(dictionary).map('d.0.b'); // $ExpectType LoDashImplicitWrapper<any[]>
+        _(numericDictionary).map('d.0.b'); // $ExpectType LoDashImplicitWrapper<any[]>
+
+        _(array).map({});  // $ExpectType LoDashImplicitWrapper<boolean[]>
+        _(list).map({});  // $ExpectType LoDashImplicitWrapper<boolean[]>
+        _(dictionary).map({});  // $ExpectType LoDashImplicitWrapper<boolean[]>
+        _(numericDictionary).map({});  // $ExpectType LoDashImplicitWrapper<boolean[]>
     }
 
     {
-        _(array).map({}).value();  // $ExpectType boolean[]
-        _(list).map({}).value();  // $ExpectType boolean[]
-        _(dictionary).map({}).value();  // $ExpectType boolean[]
-    }
+        _(array).chain().map();  // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+        // $ExpectType LoDashExplicitWrapper<number[]>
+        _(array).chain().map((value, index, collection) => {
+            value; // $ExpectType AbcObject
+            index; // $ExpectType number
+            collection; // $ExpectType AbcObject[]
+            return 0;
+        });
 
-    {
-        _(array).chain().map().value();  // $ExpectType number[]
-        _(array).chain().map(listIterator).value();  // $ExpectType AbcObject[]
+        _(list).chain().map();  // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+        // $ExpectType LoDashExplicitWrapper<number[]>
+        _(list).chain().map((value, index, collection) => {
+            value; // $ExpectType AbcObject
+            index; // $ExpectType number
+            collection; // $ExpectType ArrayLike<AbcObject>
+            return 0;
+        });
 
-        _(list).chain().map().value();  // $ExpectType number[]
-        _(list).chain().map(listIterator).value();  // $ExpectType AbcObject[]
+        _(dictionary).chain().map();  // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+        // $ExpectType LoDashExplicitWrapper<number[]>
+        _(dictionary).chain().map((value, key, collection) => {
+            value; // $ExpectType AbcObject
+            key; // $ExpectType string
+            collection; // $ExpectType Dictionary<AbcObject>
+            return 0;
+        });
 
-        _(dictionary).chain().map().value();  // $ExpectType number[]
-        _(dictionary).chain().map(dictionaryIterator).value();  // $ExpectType AbcObject[]
-    }
+        _(numericDictionary).chain().map();  // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+        // $ExpectType LoDashExplicitWrapper<number[]>
+        _(numericDictionary).chain().map((value, key, collection) => {
+            /* Broken in TS 2.4: value; // AbcObject */
+            key; // $ExpectType string
+            collection; // $ExpectType NumericDictionary<AbcObject>
+            return 0;
+        });
 
-    {
-        let result: _.LoDashExplicitArrayWrapper<boolean>;
+        _(array).chain().map('a'); // $ExpectType LoDashExplicitWrapper<number[]>
+        _(list).chain().map('a'); // $ExpectType LoDashExplicitWrapper<number[]>
+        _(dictionary).chain().map('a'); // $ExpectType LoDashExplicitWrapper<number[]>
+        _(numericDictionary).chain().map('a'); // $ExpectType LoDashExplicitWrapper<number[]>
 
-        result = _(array).chain().map({});
-        result = _(list).chain().map({});
-        result = _(dictionary).chain().map({});
+        _(array).chain().map('d.0.b'); // $ExpectType LoDashExplicitWrapper<any[]>
+        _(list).chain().map('d.0.b'); // $ExpectType LoDashExplicitWrapper<any[]>
+        _(dictionary).chain().map('d.0.b'); // $ExpectType LoDashExplicitWrapper<any[]>
+        _(numericDictionary).chain().map('d.0.b'); // $ExpectType LoDashExplicitWrapper<any[]>
+
+        _(array).chain().map({}); // $ExpectType LoDashExplicitWrapper<boolean[]>
+        _(list).chain().map({}); // $ExpectType LoDashExplicitWrapper<boolean[]>
+        _(dictionary).chain().map({}); // $ExpectType LoDashExplicitWrapper<boolean[]>
+        _(numericDictionary).chain().map({}); // $ExpectType LoDashExplicitWrapper<boolean[]>
     }
 
     {
@@ -6290,69 +6433,6 @@ namespace TestPartition {
     }
 }
 
-// TODO
-// _.map with iteratee shorthand
-// module TestMapInsteadOfPluck {
-//     interface SampleObject {
-//         d: {b: AbcObject}[];
-//     }
-//
-//     let array: SampleObject[] = [];
-//     let list: _.List<SampleObject> = [];
-//     let dictionary: _.Dictionary<SampleObject> = {};
-//
-//     {
-//         let result: any[];
-//
-//         result = _.map<SampleObject>(array, 'd.0.b');
-//         result = _.map<SampleObject>(array, ['d', 0, 'b']);
-//
-//         result = _.map<SampleObject>(list, 'd.0.b');
-//         result = _.map<SampleObject>(list, ['d', 0, 'b']);
-//
-//         result = _.map<SampleObject>(dictionary, 'd.0.b');
-//         result = _.map<SampleObject>(dictionary, ['d', 0, 'b']);
-//     }
-//
-//     {
-//         let result: AbcObject[];
-//
-//         result = _.map<SampleObject, AbcObject>(array, 'd.0.b');
-//         result = _.map<SampleObject, AbcObject>(array, ['d', 0, 'b']);
-//
-//         result = _.map<SampleObject, AbcObject>(list, 'd.0.b');
-//         result = _.map<SampleObject, AbcObject>(list, ['d', 0, 'b']);
-//
-//         result = _.map<SampleObject, AbcObject>(dictionary, 'd.0.b');
-//         result = _.map<SampleObject, AbcObject>(dictionary, ['d', 0, 'b']);
-//     }
-//
-//     {
-//         let result: _.LoDashImplicitArrayWrapper<AbcObject>;
-//
-//         result = _(array).map<AbcObject>('d.0.b');
-//         result = _(array).map<AbcObject>(['d', 0, 'b']);
-//
-//         result = _(list).map<AbcObject>('d.0.b');
-//         result = _(list).map<AbcObject>(['d', 0, 'b']);
-//
-//         result = _(dictionary).map<AbcObject>('d.0.b');
-//         result = _(dictionary).map<AbcObject>(['d', 0, 'b']);
-//     }
-//
-//     {
-//         let result: _.LoDashExplicitArrayWrapper<AbcObject>;
-//
-//         result = _(array).chain().map<AbcObject>('d.0.b');
-//         result = _(array).chain().map<AbcObject>(['d', 0, 'b']);
-//
-//         result = _(list).chain().map<AbcObject>('d.0.b');
-//         result = _(list).chain().map<AbcObject>(['d', 0, 'b']);
-//
-//         result = _(dictionary).chain().map<AbcObject>('d.0.b');
-//         result = _(dictionary).chain().map<AbcObject>(['d', 0, 'b']);
-//     }
-// }
 namespace TestReduce {
     interface ABC {
         [key: string]: number;
@@ -6412,12 +6492,12 @@ namespace TestReject {
     {
         let result: AbcObject[];
 
-        result = _.reject<AbcObject>(array, listIterator);
-        result = _.reject<AbcObject>(array, '');
+        result = _.reject(array, listIterator);
+        result = _.reject(array, '');
         result = _.reject(array, {a: 42});
 
-        result = _.reject<AbcObject>(list, listIterator);
-        result = _.reject<AbcObject>(list, '');
+        result = _.reject(list, listIterator);
+        result = _.reject(list, '');
         result = _.reject(list, {a: 42});
 
         result = _.reject(dictionary, dictionaryIterator);
@@ -6438,8 +6518,8 @@ namespace TestReject {
         result = _(array).reject('');
         result = _(array).reject({a: 42});
 
-        result = _(list).reject<AbcObject>(listIterator);
-        result = _(list).reject<AbcObject>('');
+        result = _(list).reject(listIterator);
+        result = _(list).reject('');
         result = _(list).reject({a: 42});
 
         result = _(dictionary).reject(dictionaryIterator);
@@ -6460,8 +6540,8 @@ namespace TestReject {
         result = _(array).chain().reject('');
         result = _(array).chain().reject({a: 42});
 
-        result = _(list).chain().reject<AbcObject>(listIterator);
-        result = _(list).chain().reject<AbcObject>('');
+        result = _(list).chain().reject(listIterator);
+        result = _(list).chain().reject('');
         result = _(list).chain().reject({a: 42});
 
         result = _(dictionary).chain().reject(dictionaryIterator);
@@ -6587,8 +6667,8 @@ namespace TestShuffle {
     {
         let result: AbcObject[];
 
-        result = _.shuffle<AbcObject>(array);
-        result = _.shuffle<AbcObject>(list);
+        result = _.shuffle(array);
+        result = _.shuffle(list);
         result = _.shuffle(dictionary);
     }
 
@@ -6602,7 +6682,7 @@ namespace TestShuffle {
         let result: _.LoDashImplicitArrayWrapper<AbcObject>;
 
         result = _(array).shuffle();
-        result = _(list).shuffle<AbcObject>();
+        result = _(list).shuffle();
         result = _(dictionary).shuffle();
     }
 
@@ -6616,7 +6696,7 @@ namespace TestShuffle {
         let result: _.LoDashExplicitArrayWrapper<AbcObject>;
 
         result = _(array).chain().shuffle();
-        result = _(list).chain().shuffle<AbcObject>();
+        result = _(list).chain().shuffle();
         result = _(dictionary).chain().shuffle();
     }
 }
@@ -6667,47 +6747,46 @@ namespace TestSome {
 
     let listIterator = (value: SampleObject, index: number, collection: _.List<SampleObject>) => true;
     let dictionaryIterator = (value: SampleObject, key: string, collection: _.Dictionary<SampleObject>) => true;
-    let numericDictionaryIterator = (value: SampleObject, key: number, collection: _.NumericDictionary<SampleObject>) => true;
+    let numericDictionaryIterator = (value: SampleObject, key: string, collection: _.NumericDictionary<SampleObject>) => true;
     let objectIterator = (value: any, key: string, collection: any) => true;
 
     {
         let result: boolean;
 
-        result = _.some<SampleObject>(array);
-        result = _.some<SampleObject>(array, listIterator);
-        result = _.some<SampleObject>(array, 'a');
-        result = _.some<SampleObject>(array, ['a', 42]);
-        result = _.some<SampleObject>(array, {a: 42});
+        result = _.some(array);
+        result = _.some(array, listIterator);
+        result = _.some(array, 'a');
+        result = _.some(array, ['a', 42]);
+        result = _.some(array, {a: 42});
 
-        result = _.some<SampleObject>(list);
-        result = _.some<SampleObject>(list, listIterator);
-        result = _.some<SampleObject>(list, 'a');
-        result = _.some<SampleObject>(list, ['a', 42]);
-        result = _.some<SampleObject>(list, {a: 42});
+        result = _.some(list);
+        result = _.some(list, listIterator);
+        result = _.some(list, 'a');
+        result = _.some(list, ['a', 42]);
+        result = _.some(list, {a: 42});
 
-        result = _.some<SampleObject>(dictionary);
-        result = _.some<SampleObject>(numericDictionary, numericDictionaryIterator);
+        result = _.some(dictionary);
+        result = _.some(numericDictionary, numericDictionaryIterator);
         result = _.some(dictionary, (value, key, collection) => {
             value; // $ExpectType SampleObject
             key; // $ExpectType string
             collection; // $ExpectType Dictionary<SampleObject>
             return true;
         });
-        result = _.some<SampleObject>(dictionary, 'a');
-        result = _.some<SampleObject>(dictionary, ['a', 42]);
-        result = _.some<SampleObject>(dictionary, {a: 42});
+        result = _.some(dictionary, 'a');
+        result = _.some(dictionary, ['a', 42]);
+        result = _.some(dictionary, {a: 42});
 
-        result = _.some<SampleObject>(numericDictionary);
-        result = _.some<SampleObject>(numericDictionary, numericDictionaryIterator);
-        result = _.some<SampleObject>(numericDictionary, 'a');
-        result = _.some<SampleObject>(numericDictionary, ['a', 42]);
-        result = _.some<SampleObject>(numericDictionary, {a: 42});
+        result = _.some(numericDictionary);
+        result = _.some(numericDictionary, numericDictionaryIterator);
+        result = _.some(numericDictionary, 'a');
+        result = _.some(numericDictionary, ['a', 42]);
+        result = _.some(numericDictionary, {a: 42});
 
         result = _.some(sampleObject);
         result = _.some(sampleObject, objectIterator);
         result = _.some(sampleObject, 'a');
         result = _.some(sampleObject, ['a', 42]);
-        result = _.some<{a: number}>(sampleObject, {a: 42});
 
         result = _(array).some();
         result = _(array).some(listIterator);
@@ -6715,29 +6794,28 @@ namespace TestSome {
         result = _(array).some(['a', 42]);
         result = _(array).some({a: 42});
 
-        result = _(list).some<SampleObject>();
-        result = _(list).some<SampleObject>(listIterator);
+        result = _(list).some();
+        result = _(list).some(listIterator);
         result = _(list).some('a');
         result = _(list).some(['a', 42]);
-        result = _(list).some<SampleObject>({a: 42});
+        result = _(list).some({a: 42});
 
-        result = _(dictionary).some<SampleObject>();
+        result = _(dictionary).some();
         result = _(dictionary).some(dictionaryIterator);
         result = _(dictionary).some('a');
         result = _(dictionary).some(['a', 42]);
-        result = _(dictionary).some<SampleObject>({a: 42});
+        result = _(dictionary).some({a: 42});
 
-        result = _(numericDictionary).some<SampleObject>();
-        result = _(numericDictionary).some<SampleObject>(numericDictionaryIterator);
+        result = _(numericDictionary).some();
+        result = _(numericDictionary).some(numericDictionaryIterator);
         result = _(numericDictionary).some('a');
         result = _(numericDictionary).some(['a', 42]);
-        result = _(numericDictionary).some<SampleObject>({a: 42});
+        result = _(numericDictionary).some({a: 42});
 
         result = _(sampleObject).some();
         result = _(sampleObject).some(objectIterator);
         result = _(sampleObject).some('a');
         result = _(sampleObject).some(['a', 42]);
-        result = _(sampleObject).some<SampleObject>({a: 42});
     }
 
     {
@@ -6749,29 +6827,28 @@ namespace TestSome {
         result = _(array).chain().some(['a', 42]);
         result = _(array).chain().some({a: 42});
 
-        result = _(list).chain().some<SampleObject>();
-        result = _(list).chain().some<SampleObject>(listIterator);
+        result = _(list).chain().some();
+        result = _(list).chain().some(listIterator);
         result = _(list).chain().some('a');
         result = _(list).chain().some(['a', 42]);
-        result = _(list).chain().some<SampleObject>({a: 42});
+        result = _(list).chain().some({a: 42});
 
-        result = _(dictionary).chain().some<SampleObject>();
+        result = _(dictionary).chain().some();
         result = _(dictionary).chain().some(dictionaryIterator);
         result = _(dictionary).chain().some('a');
         result = _(dictionary).chain().some(['a', 42]);
-        result = _(dictionary).chain().some<SampleObject>({a: 42});
+        result = _(dictionary).chain().some({a: 42});
 
-        result = _(numericDictionary).chain().some<SampleObject>();
-        result = _(numericDictionary).chain().some<SampleObject>(numericDictionaryIterator);
+        result = _(numericDictionary).chain().some();
+        result = _(numericDictionary).chain().some(numericDictionaryIterator);
         result = _(numericDictionary).chain().some('a');
         result = _(numericDictionary).chain().some(['a', 42]);
-        result = _(numericDictionary).chain().some<SampleObject>({a: 42});
+        result = _(numericDictionary).chain().some({a: 42});
 
         result = _(sampleObject).chain().some();
         result = _(sampleObject).chain().some(objectIterator);
         result = _(sampleObject).chain().some('a');
         result = _(sampleObject).chain().some(['a', 42]);
-        result = _(sampleObject).chain().some<AbcObject>({a: 42});
     }
 }
 
@@ -6873,23 +6950,15 @@ namespace TestorderBy {
 
         result = _.orderBy(array, iteratees);
         result = _.orderBy(array, iteratees, orders);
-        result = _.orderBy<SampleObject>(array, iteratees);
-        result = _.orderBy<SampleObject>(array, iteratees, orders);
 
         result = _.orderBy(list, iteratees);
         result = _.orderBy(list, iteratees, orders);
-        result = _.orderBy<SampleObject>(list, iteratees);
-        result = _.orderBy<SampleObject>(list, iteratees, orders);
 
         result = _.orderBy(numericDictionary, iteratees);
         result = _.orderBy(numericDictionary, iteratees, orders);
-        result = _.orderBy<SampleObject>(numericDictionary, iteratees);
-        result = _.orderBy<SampleObject>(numericDictionary, iteratees, orders);
 
         result = _.orderBy(dictionary, iteratees);
         result = _.orderBy(dictionary, iteratees, orders);
-        result = _.orderBy<SampleObject>(dictionary, iteratees);
-        result = _.orderBy<SampleObject>(dictionary, iteratees, orders);
     }
 
     {
@@ -6901,18 +6970,12 @@ namespace TestorderBy {
 
         result = _(list).orderBy(iteratees);
         result = _(list).orderBy(iteratees, orders);
-        result = _(list).orderBy<SampleObject>(iteratees);
-        result = _(list).orderBy<SampleObject>(iteratees, orders);
 
         result = _(numericDictionary).orderBy(iteratees);
         result = _(numericDictionary).orderBy(iteratees, orders);
-        result = _(numericDictionary).orderBy<SampleObject>(iteratees);
-        result = _(numericDictionary).orderBy<SampleObject>(iteratees, orders);
 
         result = _(dictionary).orderBy(iteratees);
         result = _(dictionary).orderBy(iteratees, orders);
-        result = _(dictionary).orderBy<SampleObject>(iteratees);
-        result = _(dictionary).orderBy<SampleObject>(iteratees, orders);
     }
 
     {
@@ -6924,18 +6987,12 @@ namespace TestorderBy {
 
         result = _(list).chain().orderBy(iteratees);
         result = _(list).chain().orderBy(iteratees, orders);
-        result = _(list).chain().orderBy<SampleObject>(iteratees);
-        result = _(list).chain().orderBy<SampleObject>(iteratees, orders);
 
         result = _(numericDictionary).chain().orderBy(iteratees);
         result = _(numericDictionary).chain().orderBy(iteratees, orders);
-        result = _(numericDictionary).chain().orderBy<SampleObject>(iteratees);
-        result = _(numericDictionary).chain().orderBy<SampleObject>(iteratees, orders);
 
         result = _(dictionary).chain().orderBy(iteratees);
         result = _(dictionary).chain().orderBy(iteratees, orders);
-        result = _(dictionary).chain().orderBy<SampleObject>(iteratees);
-        result = _(dictionary).chain().orderBy<SampleObject>(iteratees, orders);
     }
 }
 
@@ -9261,10 +9318,10 @@ namespace TestToArray {
     {
         let result: AbcObject[];
 
-        result = _.toArray<AbcObject>(array);
-        result = _.toArray<AbcObject>(list);
-        result = _.toArray<AbcObject>(dictionary);
-        result = _.toArray<AbcObject>(numericDictionary);
+        result = _.toArray(array);
+        result = _.toArray(list);
+        result = _.toArray(dictionary);
+        result = _.toArray(numericDictionary);
 
         result = _.toArray(array);
         result = _.toArray(list);
@@ -9284,18 +9341,18 @@ namespace TestToArray {
         let result: _.LoDashImplicitArrayWrapper<AbcObject>;
 
         result = _(array).toArray();
-        result = _(list).toArray<AbcObject>();
-        result = _(dictionary).toArray<AbcObject>();
-        result = _(numericDictionary).toArray<AbcObject>();
+        result = _(list).toArray();
+        result = _(dictionary).toArray();
+        result = _(numericDictionary).toArray();
     }
 
     {
         let result: _.LoDashExplicitArrayWrapper<AbcObject>;
 
         result = _(array).chain().toArray();
-        result = _(list).chain().toArray<AbcObject>();
-        result = _(dictionary).chain().toArray<AbcObject>();
-        result = _(numericDictionary).chain().toArray<AbcObject>();
+        result = _(list).chain().toArray();
+        result = _(dictionary).chain().toArray();
+        result = _(numericDictionary).chain().toArray();
     }
 }
 
@@ -10488,53 +10545,51 @@ result = <DefaultsDeepResult>_(TestDefaultsDeepObject).defaultsDeep(TestDefaults
 
 // _.entries
 namespace TestEntries {
-    let object: _.Dictionary<string> = {};
+    const dictionary: _.Dictionary<number> = anything;
+    const numericDictionary: _.NumericDictionary<number> = anything;
+    const abcObject: AbcObject = anything;
 
     {
-        let result: Array<[string, string]>;
-
-        result = _.entries(object);
+        _.entries(dictionary); // $ExpectType [string, number][]
+        _.entries(numericDictionary); // $ExpectType [string, number][]
+        _.entries(abcObject); // $ExpectType [string, any][]
     }
 
     {
-        let result: _.LoDashImplicitArrayWrapper<[string, string]>;
-
-        result = _(object).entries();
+        _(dictionary).entries(); // $ExpectType LoDashImplicitWrapper<[string, number][]>
+        _(numericDictionary).entries(); // $ExpectType LoDashImplicitWrapper<[string, number][]>
+        _(abcObject).entries(); // $ExpectType LoDashImplicitWrapper<[string, any][]>
     }
 
     {
-        let result: _.LoDashExplicitArrayWrapper<[string, string]>;
-
-        result = _(object).chain().entries();
+        _(dictionary).chain().entries(); // $ExpectType LoDashExplicitWrapper<[string, number][]>
+        _(numericDictionary).chain().entries(); // $ExpectType LoDashExplicitWrapper<[string, number][]>
+        _(abcObject).chain().entries(); // $ExpectType LoDashExplicitWrapper<[string, any][]>
     }
 }
 
 // _.entriesIn
 namespace TestEntriesIn {
-    let object: _.Dictionary<string> = {};
+    const dictionary: _.Dictionary<number> = anything;
+    const numericDictionary: _.NumericDictionary<number> = anything;
+    const abcObject: AbcObject = anything;
 
     {
-        let result: Array<[string, string]>;
-
-        result = _.entriesIn(object);
+        _.entriesIn(dictionary); // $ExpectType [string, number][]
+        _.entriesIn(numericDictionary); // $ExpectType [string, number][]
+        _.entriesIn(abcObject); // $ExpectType [string, any][]
     }
 
     {
-        let result: _.LoDashImplicitArrayWrapper<[string, string]>;
-
-        result = _(object).entriesIn();
+        _(dictionary).entriesIn(); // $ExpectType LoDashImplicitWrapper<[string, number][]>
+        _(numericDictionary).entriesIn(); // $ExpectType LoDashImplicitWrapper<[string, number][]>
+        _(abcObject).entriesIn(); // $ExpectType LoDashImplicitWrapper<[string, any][]>
     }
 
     {
-        let result: _.LoDashExplicitArrayWrapper<[string, string]>;
-
-        result = _(object).chain().entriesIn<string>();
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<[string, any]>;
-
-        result = _(object).chain().entriesIn();
+        _(dictionary).chain().entriesIn(); // $ExpectType LoDashExplicitWrapper<[string, number][]>
+        _(numericDictionary).chain().entriesIn(); // $ExpectType LoDashExplicitWrapper<[string, number][]>
+        _(abcObject).chain().entriesIn(); // $ExpectType LoDashExplicitWrapper<[string, any][]>
     }
 }
 
@@ -11556,65 +11611,280 @@ namespace TestMapKeys {
     let array: AbcObject[] | null | undefined = [] as any;
     let list: _.List<AbcObject>| null | undefined = [] as any;
     let dictionary: _.Dictionary<AbcObject> | null | undefined = anything;
+    let numericDictionary: _.NumericDictionary<AbcObject> | null | undefined = anything;
+    let abcObject: AbcObject = anything;
 
     let listIterator = (value: AbcObject, index: number, collection: _.List<AbcObject>) => "";
     let dictionaryIterator = (value: AbcObject, key: string, collection: _.Dictionary<AbcObject>) => "";
+    let numericDictionaryIterator = (value: AbcObject, key: string, collection: _.NumericDictionary<AbcObject>) => "";
+    let abcObjectIterator = (value: AbcObject[keyof AbcObject], key: string, collection: AbcObject) => "";
 
     {
-        let result: _.Dictionary<AbcObject>;
+        _.mapKeys(array); // $ExpectType Dictionary<AbcObject>
+        _.mapKeys(array, listIterator); // $ExpectType Dictionary<AbcObject>
+        _.mapKeys(array, ''); // $ExpectType Dictionary<AbcObject>
+        _.mapKeys(array, {}); // $ExpectType Dictionary<AbcObject>
 
-        result = _.mapKeys(array);
-        result = _.mapKeys(array, listIterator);
-        result = _.mapKeys(array, '');
-        result = _.mapKeys(array, {});
+        _.mapKeys(list); // $ExpectType Dictionary<AbcObject>
+        _.mapKeys(list, listIterator); // $ExpectType Dictionary<AbcObject>
+        _.mapKeys(list, ''); // $ExpectType Dictionary<AbcObject>
+        _.mapKeys(list, {}); // $ExpectType Dictionary<AbcObject>
 
-        result = _.mapKeys(list);
-        result = _.mapKeys(list, listIterator);
-        result = _.mapKeys(list, '');
-        result = _.mapKeys(list, {});
+        _.mapKeys(dictionary); // $ExpectType Dictionary<AbcObject>
+        _.mapKeys(dictionary, dictionaryIterator); // $ExpectType Dictionary<AbcObject>
+        _.mapKeys(dictionary, ''); // $ExpectType Dictionary<AbcObject>
+        _.mapKeys(dictionary, {}); // $ExpectType Dictionary<AbcObject>
 
-        result = _.mapKeys(dictionary);
-        result = _.mapKeys(dictionary, dictionaryIterator);
-        result = _.mapKeys(dictionary, '');
-        result = _.mapKeys(dictionary, {});
+        /* Broken in TS 2.4
+        _.mapKeys(numericDictionary); // Dictionary<AbcObject>
+        _.mapKeys(numericDictionary, numericDictionaryIterator); // Dictionary<AbcObject>
+        _.mapKeys(numericDictionary, ''); // Dictionary<AbcObject>
+        _.mapKeys(numericDictionary, {}); // Dictionary<AbcObject>
+        */
     }
 
     {
-        let result: _.LoDashImplicitObjectWrapper<_.Dictionary<AbcObject>>;
-
-        result = _(array).mapKeys();
-        result = _(array).mapKeys(listIterator);
-        result = _(array).mapKeys('');
-        result = _(array).mapKeys({});
-
-        result = _(list).mapKeys();
-        result = _(list).mapKeys(listIterator);
-        result = _(list).mapKeys('');
-        result = _(list).mapKeys({});
-
-        result = _(dictionary).mapKeys();
-        result = _(dictionary).mapKeys(dictionaryIterator);
-        result = _(dictionary).mapKeys('');
-        result = _(dictionary).mapKeys({});
+        _.mapKeys(abcObject); // $ExpectType Dictionary<string | number | boolean>
+        _.mapKeys(abcObject, abcObjectIterator); // $ExpectType Dictionary<string | number | boolean>
+        _.mapKeys(abcObject, ''); // $ExpectType Dictionary<string | number | boolean>
     }
 
     {
-        let result: _.LoDashExplicitObjectWrapper<_.Dictionary<AbcObject>>;
+        _(array).mapKeys(); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+        _(array).mapKeys(listIterator); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+        _(array).mapKeys(''); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+        _(array).mapKeys({}); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
 
-        result = _(array).chain().mapKeys();
-        result = _(array).chain().mapKeys(listIterator);
-        result = _(array).chain().mapKeys('');
-        result = _(array).chain().mapKeys({});
+        _(list).mapKeys(); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+        _(list).mapKeys(listIterator); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+        _(list).mapKeys(''); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+        _(list).mapKeys({}); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
 
-        result = _(list).chain().mapKeys();
-        result = _(list).chain().mapKeys(listIterator);
-        result = _(list).chain().mapKeys('');
-        result = _(list).chain().mapKeys({});
+        _(dictionary).mapKeys(); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+        _(dictionary).mapKeys(dictionaryIterator); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+        _(dictionary).mapKeys(''); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+        _(dictionary).mapKeys({}); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
 
-        result = _(dictionary).chain().mapKeys();
-        result = _(dictionary).chain().mapKeys(dictionaryIterator);
-        result = _(dictionary).chain().mapKeys('');
-        result = _(dictionary).chain().mapKeys({});
+        /* Broken in TS 2.4
+        _(numericDictionary).mapKeys(); // LoDashImplicitWrapper<Dictionary<AbcObject>>
+        _(numericDictionary).mapKeys(numericDictionaryIterator); // LoDashImplicitWrapper<Dictionary<AbcObject>>
+        _(numericDictionary).mapKeys(''); // LoDashImplicitWrapper<Dictionary<AbcObject>>
+        _(numericDictionary).mapKeys({}); // LoDashImplicitWrapper<Dictionary<AbcObject>>
+        */
+    }
+
+    {
+        _(abcObject).mapKeys(); // $ExpectType LoDashImplicitWrapper<Dictionary<string | number | boolean>>
+        _(abcObject).mapKeys(abcObjectIterator); // $ExpectType LoDashImplicitWrapper<Dictionary<string | number | boolean>>
+        _(abcObject).mapKeys(''); // $ExpectType LoDashImplicitWrapper<Dictionary<string | number | boolean>>
+    }
+
+    {
+        _(array).chain().mapKeys(); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+        _(array).chain().mapKeys(listIterator); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+        _(array).chain().mapKeys(''); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+        _(array).chain().mapKeys({}); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+
+        _(list).chain().mapKeys(); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+        _(list).chain().mapKeys(listIterator); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+        _(list).chain().mapKeys(''); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+        _(list).chain().mapKeys({}); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+
+        _(dictionary).chain().mapKeys(); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+        _(dictionary).chain().mapKeys(dictionaryIterator); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+        _(dictionary).chain().mapKeys(''); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+        _(dictionary).chain().mapKeys({}); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+
+        /* Broken in TS 2.4
+        _(numericDictionary).chain().mapKeys(); // LoDashExplicitWrapper<Dictionary<AbcObject>>
+        _(numericDictionary).chain().mapKeys(numericDictionaryIterator); // LoDashExplicitWrapper<Dictionary<AbcObject>>
+        _(numericDictionary).chain().mapKeys(''); // LoDashExplicitWrapper<Dictionary<AbcObject>>
+        _(numericDictionary).chain().mapKeys({}); // LoDashExplicitWrapper<Dictionary<AbcObject>>
+        */
+    }
+
+    {
+        _(abcObject).chain().mapKeys(); // $ExpectType LoDashExplicitWrapper<Dictionary<string | number | boolean>>
+        _(abcObject).chain().mapKeys(abcObjectIterator); // $ExpectType LoDashExplicitWrapper<Dictionary<string | number | boolean>>
+        _(abcObject).chain().mapKeys(''); // $ExpectType LoDashExplicitWrapper<Dictionary<string | number | boolean>>
+    }
+}
+
+// _.mapValues
+{
+    const dictionary: _.Dictionary<AbcObject> | null | undefined = anything;
+    const numericDictionary: _.NumericDictionary<AbcObject> | null | undefined = anything;
+    const abcObject: AbcObject = anything;
+    const abcObjectOrNull: AbcObject | null = anything;
+    const key: string = anything;
+
+    {
+        // $ExpectType NumericDictionary<AbcObject>
+        _.mapValues("foo", (char, index, str) => {
+            char; // $ExpectType string
+            index; // $ExpectType number
+            str; // $ExpectType string
+            return abcObject;
+        });
+
+        // $ExpectType Dictionary<string>
+        _.mapValues(dictionary, (value, key, collection) => {
+            value;  // $ExpectType AbcObject
+            key; // $ExpectType string
+            collection; // $ExpectType Dictionary<AbcObject>
+            return "";
+        });
+
+        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
+        // $ExpectType Dictionary<string>
+        _.mapValues(numericDictionary, (value, key, collection) => {
+            value;  // $ExpectType AbcObject
+            key; // $ExpectType string
+            collection; // $ExpectType Dictionary<AbcObject>
+            return "";
+        });
+
+        // $ExpectType { a: string; b: string; c: string; }
+        _.mapValues(abcObject, (value, key, collection) => {
+            value;  // $ExpectType string | number | boolean
+            key; // $ExpectType string
+            collection; // $ExpectType AbcObject
+            return "";
+        });
+
+        _.mapValues(dictionary, {}); // $ExpectType Dictionary<boolean>
+        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
+        _.mapValues(numericDictionary, {}); // $ExpectType Dictionary<boolean>
+        _.mapValues(abcObject, {}); // $ExpectType { a: boolean; b: boolean; c: boolean; }
+
+        _.mapValues(dictionary, "a"); // $ExpectType Dictionary<number>
+        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
+        _.mapValues(numericDictionary, "a"); // $ExpectType Dictionary<number>
+
+        _.mapValues(abcObject, key); // $ExpectType { a: any; b: any; c: any; }
+        _.mapValues(dictionary, key); // $ExpectType Dictionary<any>
+        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
+        _.mapValues(numericDictionary, key); // $ExpectType Dictionary<any>
+
+        _.mapValues("a"); // $ExpectType NumericDictionary<string>
+        _.mapValues(dictionary); // $ExpectType Dictionary<AbcObject>
+        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
+        _.mapValues(numericDictionary); // $ExpectType Dictionary<AbcObject>
+        _.mapValues(abcObject); // $ExpectType AbcObject
+        _.mapValues(abcObjectOrNull); // $ExpectType Partial<AbcObject>
+    }
+
+    {
+        // $ExpectType LoDashImplicitWrapper<NumericDictionary<AbcObject>>
+        _("foo").mapValues((char, index, str) => {
+            char; // $ExpectType string
+            index; // $ExpectType number
+            str; // $ExpectType string
+            return abcObject;
+        });
+
+        // $ExpectType LoDashImplicitWrapper<Dictionary<string>>
+        _(dictionary).mapValues((value, key, collection) => {
+            value;  // $ExpectType AbcObject
+            key; // $ExpectType string
+            collection; // $ExpectType Dictionary<AbcObject>
+            return "";
+        });
+
+        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
+        // $ExpectType LoDashImplicitWrapper<Dictionary<string>>
+        _(numericDictionary).mapValues((value, key, collection) => {
+            value;  // $ExpectType AbcObject
+            key; // $ExpectType string
+            collection; // $ExpectType Dictionary<AbcObject>
+            return "";
+        });
+
+        // $ExpectType LoDashImplicitWrapper<{ a: string; b: string; c: string; }>
+        _(abcObject).mapValues((value, key, collection) => {
+            value;  // $ExpectType string | number | boolean
+            key; // $ExpectType string
+            collection; // $ExpectType AbcObject
+            return "";
+        });
+
+        _(dictionary).mapValues({}); // $ExpectType LoDashImplicitWrapper<Dictionary<boolean>>
+        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
+        _(numericDictionary).mapValues({}); // $ExpectType LoDashImplicitWrapper<Dictionary<boolean>>
+        _(abcObject).mapValues({}); // $ExpectType LoDashImplicitWrapper<{ a: boolean; b: boolean; c: boolean; }>
+
+        _(dictionary).mapValues("a"); // $ExpectType LoDashImplicitWrapper<Dictionary<number>>
+        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
+        _(numericDictionary).mapValues("a"); // $ExpectType LoDashImplicitWrapper<Dictionary<number>>
+
+        _(abcObject).mapValues(key); // $ExpectType LoDashImplicitWrapper<{ a: any; b: any; c: any; }>
+        _(dictionary).mapValues(key); // $ExpectType LoDashImplicitWrapper<Dictionary<any>>
+        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
+        _(numericDictionary).mapValues(key); // $ExpectType LoDashImplicitWrapper<Dictionary<any>>
+
+        _("a").mapValues(); // $ExpectType LoDashImplicitWrapper<NumericDictionary<string>>
+        _(dictionary).mapValues(); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
+        _(numericDictionary).mapValues(); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+        _(abcObject).mapValues(); // $ExpectType LoDashImplicitWrapper<AbcObject>
+        _(abcObjectOrNull).mapValues(); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
+    }
+
+    {
+        // $ExpectType LoDashExplicitWrapper<NumericDictionary<AbcObject>>
+        _("foo").chain().mapValues((char, index, str) => {
+            char; // $ExpectType string
+            index; // $ExpectType number
+            str; // $ExpectType string
+            return abcObject;
+        });
+
+        // $ExpectType LoDashExplicitWrapper<Dictionary<string>>
+        _(dictionary).chain().mapValues((value, key, collection) => {
+            value;  // $ExpectType AbcObject
+            key; // $ExpectType string
+            collection; // $ExpectType Dictionary<AbcObject>
+            return "";
+        });
+
+        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
+        // $ExpectType LoDashExplicitWrapper<Dictionary<string>>
+        _(numericDictionary).chain().mapValues((value, key, collection) => {
+            value;  // $ExpectType AbcObject
+            key; // $ExpectType string
+            collection; // $ExpectType Dictionary<AbcObject>
+            return "";
+        });
+
+        // $ExpectType LoDashExplicitWrapper<{ a: string; b: string; c: string; }>
+        _(abcObject).chain().mapValues((value, key, collection) => {
+            value;  // $ExpectType string | number | boolean
+            key; // $ExpectType string
+            collection; // $ExpectType AbcObject
+            return "";
+        });
+
+        _(dictionary).chain().mapValues({}); // $ExpectType LoDashExplicitWrapper<Dictionary<boolean>>
+        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
+        _(numericDictionary).chain().mapValues({}); // $ExpectType LoDashExplicitWrapper<Dictionary<boolean>>
+        _(abcObject).chain().mapValues({}); // $ExpectType LoDashExplicitWrapper<{ a: boolean; b: boolean; c: boolean; }>
+
+        _(dictionary).chain().mapValues("a"); // $ExpectType LoDashExplicitWrapper<Dictionary<number>>
+        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
+        _(numericDictionary).chain().mapValues("a"); // $ExpectType LoDashExplicitWrapper<Dictionary<number>>
+
+        _(abcObject).chain().mapValues(key); // $ExpectType LoDashExplicitWrapper<{ a: any; b: any; c: any; }>
+        _(dictionary).chain().mapValues(key); // $ExpectType LoDashExplicitWrapper<Dictionary<any>>
+        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
+        _(numericDictionary).chain().mapValues(key); // $ExpectType LoDashExplicitWrapper<Dictionary<any>>
+
+        _("a").chain().mapValues(); // $ExpectType LoDashExplicitWrapper<NumericDictionary<string>>
+        _(dictionary).chain().mapValues(); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
+        _(numericDictionary).chain().mapValues(); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+
+        _(abcObject).chain().mapValues(); // $ExpectType LoDashExplicitWrapper<AbcObject>
+        _(abcObjectOrNull).chain().mapValues(); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
     }
 }
 
@@ -11741,36 +12011,55 @@ namespace TestMergeWith {
 // _.omit
 namespace TestOmit {
     let obj: AbcObject | null | undefined = anything;
-    let dict: { [key: string]: AbcObject } = { };
+    let dictionary:_.Dictionary<AbcObject> = anything;
+    let numericDictionary:_.NumericDictionary<AbcObject> = anything;
+    let dictionaryWithNull:_.Dictionary<AbcObject | null> = anything;
+    let numericDictionaryWithNull:_.NumericDictionary<AbcObject | null> = anything;
+    let dictionaryWithUndefined:_.Dictionary<AbcObject | undefined> = anything;
+    let numericDictionaryWithUndefined:_.NumericDictionary<AbcObject | undefined> = anything;
+    let dictionaryWithNullAndUndefined:_.Dictionary<AbcObject | null | undefined> = anything;
+    let numericDictionaryWithNullAndUndefined:_.NumericDictionary<AbcObject | null | undefined> = anything;
 
     {
-        let result: Partial<AbcObject>;
-
-        result = _.omit(obj, 'a');
-        result = _.omit(obj, 0, 'a');
-        result = _.omit(obj, ['b', 1], 0, 'a');
-
-        dict = _.omit(dict, 'a');
+        _.omit(obj, 'a'); // $ExpectType Partial<AbcObject>
+        _.omit(obj, 0, 'a'); // $ExpectType Partial<AbcObject>
+        _.omit(obj, ['b', 1], 0, 'a'); // $ExpectType Partial<AbcObject>
+        _.omit(dictionary, 'a'); // $ExpectType Dictionary<AbcObject>
+        _.omit(numericDictionary, 'a');  // $ExpectType NumericDictionary<AbcObject>
+        _.omit(dictionaryWithNull, 'a'); // $ExpectType Dictionary<AbcObject | null>
+        _.omit(numericDictionaryWithNull, 'a');  // $ExpectType NumericDictionary<AbcObject | null>
+        _.omit(dictionaryWithUndefined, 'a'); // $ExpectType Dictionary<AbcObject | undefined>
+        _.omit(numericDictionaryWithUndefined, 'a');  // $ExpectType NumericDictionary<AbcObject | undefined>
+        _.omit(dictionaryWithNullAndUndefined, 'a'); // $ExpectType Dictionary<AbcObject | null | undefined>
+        _.omit(numericDictionaryWithNullAndUndefined, 'a');  // $ExpectType NumericDictionary<AbcObject | null | undefined>
     }
 
     {
-        let result: _.LoDashImplicitWrapper<Partial<AbcObject>>;
-
-        result = _(obj).omit('a');
-        result = _(obj).omit(0, 'a');
-        result = _(obj).omit(['b', 1], 0, 'a');
-
-        dict = _(dict).omit('a').value();
+        _(obj).omit('a'); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
+        _(obj).omit(0, 'a'); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
+        _(obj).omit(['b', 1], 0, 'a'); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
+        _(dictionary).omit('a'); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+        _(numericDictionary).omit('a'); // $ExpectType LoDashImplicitWrapper<NumericDictionary<AbcObject>>
+        _(dictionaryWithNull).omit('a'); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject | null>>
+        _(numericDictionaryWithNull).omit('a'); // $ExpectType LoDashImplicitWrapper<NumericDictionary<AbcObject | null>>
+        _(dictionaryWithUndefined).omit('a'); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject | undefined>>
+        _(numericDictionaryWithUndefined).omit('a'); // $ExpectType LoDashImplicitWrapper<NumericDictionary<AbcObject | undefined>>
+        _(dictionaryWithNullAndUndefined).omit('a'); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject | null | undefined>>
+        _(numericDictionaryWithNullAndUndefined).omit('a'); // $ExpectType LoDashImplicitWrapper<NumericDictionary<AbcObject | null | undefined>>
     }
 
     {
-        let result: _.LoDashExplicitWrapper<Partial<AbcObject>>;
-
-        result = _(obj).chain().omit('a');
-        result = _(obj).chain().omit(0, 'a');
-        result = _(obj).chain().omit(['b', 1], 0, 'a');
-
-        dict = _(dict).chain().omit('a').value();
+        _(obj).chain().omit('a'); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
+        _(obj).chain().omit(0, 'a'); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
+        _(obj).chain().omit(['b', 1], 0, 'a'); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
+        _(dictionary).chain().omit('a'); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+        _(numericDictionary).chain().omit('a'); // $ExpectType LoDashExplicitWrapper<NumericDictionary<AbcObject>>
+        _(dictionaryWithNull).chain().omit('a'); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject | null>>
+        _(numericDictionaryWithNull).chain().omit('a'); // $ExpectType LoDashExplicitWrapper<NumericDictionary<AbcObject | null>>
+        _(dictionaryWithUndefined).chain().omit('a'); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject | undefined>>
+        _(numericDictionaryWithUndefined).chain().omit('a'); // $ExpectType LoDashExplicitWrapper<NumericDictionary<AbcObject | undefined>>
+        _(dictionaryWithNullAndUndefined).chain().omit('a'); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject | null | undefined>>
+        _(numericDictionaryWithNullAndUndefined).chain().omit('a'); // $ExpectType LoDashExplicitWrapper<NumericDictionary<AbcObject | null | undefined>>
     }
 }
 
@@ -11788,13 +12077,13 @@ namespace TestOmitBy {
     {
         let result: _.LoDashImplicitWrapper<Partial<AbcObject>>;
 
-        result = _(obj).omitBy<AbcObject>(predicate);
+        result = _(obj).omitBy(predicate);
     }
 
     {
         let result: _.LoDashExplicitWrapper<Partial<AbcObject>>;
 
-        result = _(obj).chain().omitBy<AbcObject>(predicate);
+        result = _(obj).chain().omitBy(predicate);
     }
 }
 
@@ -11810,7 +12099,8 @@ namespace TestPick {
     _.pick(obj1, 0, 'a'); // $ExpectType PartialDeep<AbcObject>
     _.pick(obj1, ['b', 1], 0, 'a'); // $ExpectType PartialDeep<AbcObject>
     _.pick(obj1, readonlyArray); // $ExpectType PartialDeep<AbcObject>
-    _.pick(obj2, 'a', 'b'); // $ExpectType Pick<AbcObject, "a" | "b">
+    // Broken in TS 2.4
+    // _.pick(obj2, 'a', 'b'); // Pick<AbcObject, "a" | "b">
     _.pick(obj2, literalsArray); // $ExpectType Pick<AbcObject, "a" | "b">
     _.pick(obj2, roLiteralsArray); // $ExpectType Pick<AbcObject, "a" | "b">
 
@@ -11818,7 +12108,8 @@ namespace TestPick {
     _(obj1).pick(0, 'a'); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
     _(obj1).pick(['b', 1], 0, 'a'); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
     _(obj1).pick(readonlyArray); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
-    _(obj2).pick('a', 'b'); // $ExpectType LoDashImplicitWrapper<Pick<AbcObject, "a" | "b">>
+    // Broken in TS 2.4
+    // _(obj2).pick('a', 'b'); // LoDashImplicitWrapper<Pick<AbcObject, "a" | "b">>
     _(obj2).pick(literalsArray); // $ExpectType LoDashImplicitWrapper<Pick<AbcObject, "a" | "b">>
     _(obj2).pick(roLiteralsArray); // $ExpectType LoDashImplicitWrapper<Pick<AbcObject, "a" | "b">>
 
@@ -11826,7 +12117,8 @@ namespace TestPick {
     _.chain(obj1).pick(0, 'a'); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
     _.chain(obj1).pick(['b', 1], 0, 'a'); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
     _.chain(obj1).pick(readonlyArray); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
-    _.chain(obj2).pick('a', 'b'); // $ExpectType LoDashExplicitWrapper<Pick<AbcObject, "a" | "b">>
+    // Broken in TS 2.4
+    // _.chain(obj2).pick('a', 'b'); // LoDashExplicitWrapper<Pick<AbcObject, "a" | "b">>
     _.chain(obj2).pick(literalsArray); // $ExpectType LoDashExplicitWrapper<Pick<AbcObject, "a" | "b">>
     _.chain(obj2).pick(roLiteralsArray); // $ExpectType LoDashExplicitWrapper<Pick<AbcObject, "a" | "b">>
 }
@@ -11845,13 +12137,13 @@ namespace TestPickBy {
     {
         let result: _.LoDashImplicitWrapper<Partial<AbcObject>>;
 
-        result = _(obj).pickBy<AbcObject>(predicate);
+        result = _(obj).pickBy(predicate);
     }
 
     {
         let result: _.LoDashExplicitWrapper<Partial<AbcObject>>;
 
-        result = _(obj).chain().pickBy<AbcObject>(predicate);
+        result = _(obj).chain().pickBy(predicate);
     }
 }
 
@@ -12013,53 +12305,51 @@ namespace TestSetWith {
 
 // _.toPairs
 namespace TestToPairs {
-    let object: _.Dictionary<string> = {};
+    let dictionary: _.Dictionary<number> = {};
+    let numericDictionary: _.NumericDictionary<number> = {};
+    let abcObject: AbcObject = anything;
 
     {
-        let result: Array<[string, string]>;
-
-        result = _.toPairs(object);
+        _.toPairs(dictionary); // $ExpectType [string, number][]
+        _.toPairs(numericDictionary); // $ExpectType [string, number][]
+        _.toPairs(abcObject);  // $ExpectType [string, any][]
     }
 
     {
-        let result: _.LoDashImplicitArrayWrapper<[string, string]>;
-
-        result = _(object).toPairs();
+        _(dictionary).toPairs(); // $ExpectType LoDashImplicitWrapper<[string, number][]>
+        _(numericDictionary).toPairs(); // $ExpectType LoDashImplicitWrapper<[string, number][]>
+        _(abcObject).toPairs(); // $ExpectType LoDashImplicitWrapper<[string, any][]>
     }
 
     {
-        let result: _.LoDashExplicitArrayWrapper<[string, string]>;
-
-        result = _(object).chain().toPairs();
+        _(dictionary).chain().toPairs(); // $ExpectType LoDashExplicitWrapper<[string, number][]>
+        _(numericDictionary).chain().toPairs(); // $ExpectType LoDashExplicitWrapper<[string, number][]>
+        _(abcObject).chain().toPairs(); // $ExpectType LoDashExplicitWrapper<[string, any][]>
     }
 }
 
 // _.toPairsIn
 namespace TestToPairsIn {
-    let object: _.Dictionary<string> = {};
+    let dictionary: _.Dictionary<number> = {};
+    let numericDictionary: _.NumericDictionary<number> = {};
+    let abcObject: AbcObject = anything;
 
     {
-        let result: Array<[string, string]>;
-
-        result = _.toPairsIn(object);
+        _.toPairsIn(dictionary); // $ExpectType [string, number][]
+        _.toPairsIn(numericDictionary); // $ExpectType [string, number][]
+        _.toPairsIn(abcObject);  // $ExpectType [string, any][]
     }
 
     {
-        let result: _.LoDashImplicitArrayWrapper<[string, string]>;
-
-        result = _(object).toPairsIn();
+        _(dictionary).toPairsIn(); // $ExpectType LoDashImplicitWrapper<[string, number][]>
+        _(numericDictionary).toPairsIn(); // $ExpectType LoDashImplicitWrapper<[string, number][]>
+        _(abcObject).toPairsIn(); // $ExpectType LoDashImplicitWrapper<[string, any][]>
     }
 
     {
-        let result: _.LoDashExplicitArrayWrapper<[string, string]>;
-
-        result = _(object).chain().toPairsIn<string>();
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<[string, any]>;
-
-        result = _(object).chain().toPairsIn();
+        _(dictionary).chain().toPairsIn(); // $ExpectType LoDashExplicitWrapper<[string, number][]>
+        _(numericDictionary).chain().toPairsIn(); // $ExpectType LoDashExplicitWrapper<[string, number][]>
+        _(abcObject).chain().toPairsIn(); // $ExpectType LoDashExplicitWrapper<[string, any][]>
     }
 }
 
@@ -12256,7 +12546,7 @@ namespace TestValues {
         result = _.values(dict);
         result = _.values(numDict);
         result = _.values(list);
-        result = _.values<SampleObject>(object);
+        result = _.values(object);
     }
 
     // Implicit wrapper
@@ -12295,10 +12585,10 @@ namespace TestValues {
         let object: {a: SampleObject} = { a: { a: {} } };
         let result: _.LoDashImplicitArrayWrapper<SampleObject>;
 
-        result = _(dict).values<SampleObject>();
-        result = _(numDict).values<SampleObject>();
-        result = _(list).values<SampleObject>();
-        result = _(object).values<SampleObject>();
+        result = _(dict).values();
+        result = _(numDict).values();
+        result = _(list).values();
+        result = _(object).values();
     }
 
     // Explicit wrapper
@@ -12337,10 +12627,10 @@ namespace TestValues {
         let object: {a: SampleObject} = { a: { a: {} } };
         let result: _.LoDashExplicitArrayWrapper<SampleObject>;
 
-        result = _(dict).chain().values<SampleObject>();
-        result = _(numDict).chain().values<SampleObject>();
-        result = _(list).chain().values<SampleObject>();
-        result = _(object).chain().values<SampleObject>();
+        result = _(dict).chain().values();
+        result = _(numDict).chain().values();
+        result = _(list).chain().values();
+        result = _(object).chain().values();
     }
 }
 
@@ -12364,19 +12654,19 @@ namespace TestValuesIn {
     {
         let result: AbcObject[];
 
-        result = _.values(object);
+        result = _.valuesIn(object);
     }
 
     {
         let result: _.LoDashImplicitArrayWrapper<AbcObject>;
 
-        result = _(object).valuesIn<AbcObject>();
+        result = _(object).valuesIn();
     }
 
     {
         let result: _.LoDashExplicitArrayWrapper<AbcObject>;
 
-        result = _(object).chain().valuesIn<AbcObject>();
+        result = _(object).chain().valuesIn();
     }
 }
 
@@ -13340,7 +13630,7 @@ namespace TestMatches {
 
     {
         let result: (value: any) => boolean;
-        result = _.matches<AbcObject>(source);
+        result = _.matches(source);
     }
 
     {
@@ -13350,12 +13640,12 @@ namespace TestMatches {
 
     {
         let result: _.LoDashImplicitObjectWrapper<(value: AbcObject) => boolean>;
-        result = _(source).matches<AbcObject>();
+        result = _(source).matches();
     }
 
     {
         let result: _.LoDashExplicitObjectWrapper<(value: AbcObject) => boolean>;
-        result = _(source).chain().matches<AbcObject>();
+        result = _(source).chain().matches();
     }
 }
 
@@ -13367,7 +13657,7 @@ namespace TestMatches {
     {
         let result: (value: any) => boolean;
 
-        result = _.matchesProperty<AbcObject>(path, source);
+        result = _.matchesProperty(path, source);
     }
 
     {
@@ -13379,7 +13669,7 @@ namespace TestMatches {
     {
         let result: _.LoDashImplicitObjectWrapper<(value: any) => boolean>;
 
-        result = _(path).matchesProperty<AbcObject>(source);
+        result = _(path).matchesProperty(source);
     }
 
     {
@@ -13391,7 +13681,7 @@ namespace TestMatches {
     {
         let result: _.LoDashExplicitObjectWrapper<(value: any) => boolean>;
 
-        result = _(path).chain().matchesProperty<AbcObject>(source);
+        result = _(path).chain().matchesProperty(source);
     }
 
     {

From fde1a91e1fcc1a5f6abb90b57387801527a26f13 Mon Sep 17 00:00:00 2001
From: Lucian Buzzo <lucian.buzzo@gmail.com>
Date: Thu, 15 Mar 2018 17:13:58 +0000
Subject: [PATCH 0559/1382] Add 'format' attribute to json-schema types

---
 types/json-schema/index.d.ts           | 11 ++++++++++-
 types/json-schema/json-schema-tests.ts |  6 ++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/types/json-schema/index.d.ts b/types/json-schema/index.d.ts
index 7f02b671a0..4c483dd42d 100644
--- a/types/json-schema/index.d.ts
+++ b/types/json-schema/index.d.ts
@@ -1,6 +1,8 @@
 // Type definitions for json-schema 4.0 and 6.0
 // Project: https://www.npmjs.com/package/json-schema
-// Definitions by: Boris Cherny <https://github.com/bcherny>, Cyrille Tuzi <https://github.com/cyrilletuzi>
+// Definitions by: Boris Cherny <https://github.com/bcherny>
+//                 Cyrille Tuzi <https://github.com/cyrilletuzi>
+//                 Lucian Buzzo <https://github.com/lucianbuzzo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -197,6 +199,8 @@ export interface JSONSchema4 {
    * @see https://tools.ietf.org/html/draft-zyp-json-schema-04#section-5.6
    */
   [k: string]: any
+
+  format?: string
 }
 
 /* JSON Schema 6 */
@@ -470,4 +474,9 @@ export interface JSONSchema6 {
    * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-7.4
    */
   examples?: JSONSchema6Type[]
+
+  /**
+   * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-8
+   */
+  format?: string
 }
diff --git a/types/json-schema/json-schema-tests.ts b/types/json-schema/json-schema-tests.ts
index 0fd15f5de9..fdfe4d0435 100644
--- a/types/json-schema/json-schema-tests.ts
+++ b/types/json-schema/json-schema-tests.ts
@@ -64,7 +64,8 @@ import { JSONSchema4, JSONSchema4Type, JSONSchema4TypeName, JSONSchema6, JSONSch
     oneOf: [{}],
     not: {},
     extends: 'foo',
-    bar: 4
+    bar: 4,
+    format: 'date-time'
   }
 }
 
@@ -134,6 +135,7 @@ import { JSONSchema4, JSONSchema4Type, JSONSchema4TypeName, JSONSchema6, JSONSch
     const: 'foo',
     contains: {},
     examples: [{}],
-    propertyNames: {}
+    propertyNames: {},
+    format: 'date-time'
   }
 }

From dfd9c2d43095a6acc58384e4e65ca5b8cb0e505a Mon Sep 17 00:00:00 2001
From: guilhermehubner <guilherme_hubner@msn.com>
Date: Fri, 9 Mar 2018 18:02:02 -0300
Subject: [PATCH 0560/1382] Add react-places-autocomplete definition

---
 types/react-places-autocomplete/index.d.ts    | 60 +++++++++++++++++++
 types/react-places-autocomplete/tsconfig.json | 16 +++++
 types/react-places-autocomplete/tslint.json   |  3 +
 3 files changed, 79 insertions(+)
 create mode 100644 types/react-places-autocomplete/index.d.ts
 create mode 100644 types/react-places-autocomplete/tsconfig.json
 create mode 100644 types/react-places-autocomplete/tslint.json

diff --git a/types/react-places-autocomplete/index.d.ts b/types/react-places-autocomplete/index.d.ts
new file mode 100644
index 0000000000..73a8e7ae55
--- /dev/null
+++ b/types/react-places-autocomplete/index.d.ts
@@ -0,0 +1,60 @@
+// Type definitions for react-places-autocomplete 6.1
+// Project: https://github.com/kenny-hibino/react-places-autocomplete/
+// Definitions by: Guilherme Hübner <https://github.com/guilhermehubner>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+//
+/// <reference types="googlemaps" />
+
+import * as React from "react";
+
+export interface formattedSuggestionType {
+    mainText: string;
+    secundaryText: string;
+}
+
+export interface PropTypes {
+    inputProps: {
+        value: string;
+        onChange: (value: string) => void;
+        type?: string;
+        name?: string;
+        placeholder?: string;
+        onBlur?: (event: React.FocusEvent<HTMLInputElement>) => void;
+    };
+    onError?: (status: string, clearSuggestion: () => void) => void;
+    onSelect?: (address: string, placeID: string) => void;
+    renderSuggestion?: (suggestion: string, formattedSuggestion: formattedSuggestionType) => React.ReactNode;
+    classNames?: {
+        root?: string;
+        input?: string;
+        autocompleteContainer?: string;
+        autocompleteItem?: string;
+        autocompleteItemActive?: string;
+    };
+    styles?: {
+        root?: React.CSSProperties;
+        input?: React.CSSProperties;
+        autocompleteContainer?: React.CSSProperties;
+        autocompleteItem?: React.CSSProperties;
+        autocompleteItemActive?: React.CSSProperties;
+    };
+    options?: {
+        bounds?: google.maps.LatLngBounds | google.maps.LatLngBoundsLiteral;
+        componentRestrictions?: google.maps.GeocoderComponentRestrictions;
+        location?: google.maps.LatLng | google.maps.LatLngLiteral;
+        offset?: number | string;
+        radius?: number | string;
+        types?: string[];
+    };
+
+    debounce?: number;
+    highlightFirstSuggestion?: boolean;
+    renderFooter?: () => React.ReactNode;
+    shouldFetchSuggestions?: (value: string) => boolean;
+}
+
+export function geocodeByAddress(address: string, callback: (results: google.maps.GeocoderResult[], status: google.maps.GeocoderStatus) => void): void;
+export function geocodeByPlaceId(placeId: string, callback: (results: google.maps.GeocoderResult[], status: google.maps.GeocoderStatus) => void): void;
+
+export default class PlacesAutocomplete extends React.Component<PropTypes> {}
diff --git a/types/react-places-autocomplete/tsconfig.json b/types/react-places-autocomplete/tsconfig.json
new file mode 100644
index 0000000000..02dbd0279c
--- /dev/null
+++ b/types/react-places-autocomplete/tsconfig.json
@@ -0,0 +1,16 @@
+{
+  "files": ["index.d.ts"],
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": ["es6"],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": true,
+    "strictFunctionTypes": true,
+    "baseUrl": "../",
+    "typeRoots": ["../"],
+    "types": [],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true
+  }
+}
diff --git a/types/react-places-autocomplete/tslint.json b/types/react-places-autocomplete/tslint.json
new file mode 100644
index 0000000000..d88586e5bd
--- /dev/null
+++ b/types/react-places-autocomplete/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}

From 4ae235a416378c87087274d69d3c18d59855fea7 Mon Sep 17 00:00:00 2001
From: Craig Kovatch <cromas@gmail.com>
Date: Thu, 15 Mar 2018 12:12:39 -0700
Subject: [PATCH 0561/1382] Add missing 'aria-controls' attribute to React
 WAI-ARIA typings

---
 types/react/index.d.ts     | 5 +++++
 types/react/v15/index.d.ts | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index d56d9571e1..df7716f8a9 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -2533,6 +2533,11 @@ declare namespace React {
          * @see aria-colindex @see aria-rowspan.
          */
         'aria-colspan'?: number;
+        /**
+         * Identifies the element (or elements) whose contents or presence are controlled by the current element.
+         * @see aria-owns.
+         */
+        'aria-controls'?: string;
         /** Indicates the element that represents the current item within a container or set of related elements. */
         'aria-current'?: boolean | 'false' | 'true' | 'page' | 'step' | 'location' | 'date' | 'time';
         /**
diff --git a/types/react/v15/index.d.ts b/types/react/v15/index.d.ts
index 534d92de29..2111008d0d 100644
--- a/types/react/v15/index.d.ts
+++ b/types/react/v15/index.d.ts
@@ -2481,6 +2481,11 @@ declare namespace React {
          * @see aria-colindex @see aria-rowspan.
          */
         'aria-colspan'?: number;
+        /**
+         * Identifies the element (or elements) whose contents or presence are controlled by the current element.
+         * @see aria-owns.
+         */
+        'aria-controls'?: string;
         /** Indicates the element that represents the current item within a container or set of related elements. */
         'aria-current'?: boolean | 'false' | 'true' | 'page' | 'step' | 'location' | 'date' | 'time';
         /**

From 841bb34e042ec06ed916508a352ae2c8ed7f8eab Mon Sep 17 00:00:00 2001
From: JFGHT <jsfuentes@alu.ucam.edu>
Date: Thu, 15 Mar 2018 20:18:46 +0100
Subject: [PATCH 0562/1382] Fixed trailing whitespace

---
 types/stellar-sdk/index.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/stellar-sdk/index.d.ts b/types/stellar-sdk/index.d.ts
index d7e1b0293e..955360d3f0 100644
--- a/types/stellar-sdk/index.d.ts
+++ b/types/stellar-sdk/index.d.ts
@@ -739,14 +739,14 @@ export namespace Operation {
     function fromXDRObject<T extends Operation>(xdrOperation: xdr.Operation<T>): T;
 }
 
-export class OperationCallBuilder extends CallBuilder<OperationRecord> { 
+export class OperationCallBuilder extends CallBuilder<OperationRecord> {
     forAccount(accountId: string): this;
     forLedger(sequence: string): this;
     forTransaction(transactionId: string): this;
 }
 export class OrderbookCallBuilder extends CallBuilder<OrderbookRecord> { }
 export class PathCallBuilder extends CallBuilder<PaymentPathRecord> { }
-export class PaymentCallBuilder extends CallBuilder<PaymentOperationRecord> { 
+export class PaymentCallBuilder extends CallBuilder<PaymentOperationRecord> {
     forAccount(accountId: string): this;
     forLedger(sequence: string): this;
     forTransaction(transactionId: string): this;

From b9369a91f4d64121b1d36b70de37354a3e8b4e81 Mon Sep 17 00:00:00 2001
From: naughton <patrickjnaughton@gmail.com>
Date: Thu, 15 Mar 2018 13:14:44 -0700
Subject: [PATCH 0563/1382] fix signatures for listQueues and listTopics fix
 Subscription and Topic CountDetails property add ServiceBusClient between
 ServicebusServiceClient and EventEmitter ...to expose host, port and
 protocol.

---
 types/azure-sb/azure-sb-tests.ts              |  4 ++--
 types/azure-sb/index.d.ts                     | 24 ++++++++-----------
 types/azure-sb/lib/servicebusservice.d.ts     |  8 +++++--
 .../azure-sb/lib/servicebusserviceclient.d.ts |  7 +++---
 types/azure-sb/lib/serviceclient.d.ts         |  8 +++++++
 types/azure-sb/tsconfig.json                  |  3 ++-
 6 files changed, 31 insertions(+), 23 deletions(-)
 create mode 100644 types/azure-sb/lib/serviceclient.d.ts

diff --git a/types/azure-sb/azure-sb-tests.ts b/types/azure-sb/azure-sb-tests.ts
index 411862a3b2..14d2ba9054 100644
--- a/types/azure-sb/azure-sb-tests.ts
+++ b/types/azure-sb/azure-sb-tests.ts
@@ -14,14 +14,14 @@ function ResponseCallback(err: Error | null, response: Azure.ServiceBus.Response
 const ServiceBus = AzureSB.createServiceBusService('connectionstring');
 
 // Queues
-ServiceBus.listQueues('', createResultCallback<Models.Queue[]>());
+ServiceBus.listQueues(createResultCallback<Models.Queue[]>());
 ServiceBus.createQueue('test', createResultCallback<Models.Queue>());
 ServiceBus.createQueueIfNotExists('test', createResultCallback<boolean>());
 ServiceBus.getQueue('test', createResultCallback<Models.Queue>());
 ServiceBus.deleteQueue('test', ResponseCallback);
 
 // Topics
-ServiceBus.listTopics('', createResultCallback<Models.Topic[]>());
+ServiceBus.listTopics(createResultCallback<Models.Topic[]>());
 ServiceBus.createTopic('test', createResultCallback<Models.Topic>());
 ServiceBus.createTopicIfNotExists('test', createResultCallback<boolean>());
 ServiceBus.getTopic('test', createResultCallback<Models.Topic>());
diff --git a/types/azure-sb/index.d.ts b/types/azure-sb/index.d.ts
index ba92395c0f..9f9d07d3dc 100644
--- a/types/azure-sb/index.d.ts
+++ b/types/azure-sb/index.d.ts
@@ -214,15 +214,15 @@ export namespace Azure.ServiceBus {
         //   [x: string]: string | Dictionary<string | object>;
         // }
 
+        export const ActiveMessageCount = 'd2p1:ActiveMessageCount';
+        export const DeadLetterMessageCount = 'd2p1:DeadLetterMessageCount';
+        export const ScheduledMessageCount = 'd2p1:ScheduledMessageCount';
+        export const TransferMessageCount = 'd2p1:TransferMessageCount';
+        export const TransferDeadLetterMessageCount = 'd2p1:TransferDeadLetterMessageCount';
+
         export interface Topic extends ExtendedBase {
             AccessedAt: DateString;
-            CountDetails: {
-                'd2p1:ActiveMessageCount': string;
-                'd2p1:DeadLetterMessageCount': string;
-                'd2p1:ScheduledMessageCount': string;
-                'd2p1:TransferMessageCount': string;
-                'd2p1:TransferDeadLetterMessageCount': string;
-            };
+            CountDetails: { [key: string]: string };
             EnableSubscriptionPartitioning: string;
             FilteringMessagesBeforePublishing: string;
             IsExpress: string;
@@ -242,13 +242,7 @@ export namespace Azure.ServiceBus {
         }
 
         export interface Subscription extends ExtendedBase {
-            CountDetails: {
-                'd3p1:ActiveMessageCount': string;
-                'd3p1:DeadLetterMessageCount': string;
-                'd3p1:ScheduledMessageCount': string;
-                'd3p1:TransferMessageCount': string;
-                'd3p1:TransferDeadLetterMessageCount': string;
-            };
+            CountDetails: { [key: string]: string };
             DeadLetteringOnFilterEvaluationExceptions: string;
             DeadLetteringOnMessageExpiration: string;
             LockDuration: string;
@@ -315,6 +309,8 @@ export namespace Azure.ServiceBus {
     export type CreateSubscriptionOptions = Partial<ICreateSubscriptionOptions>;
     export type ListSubscriptionsOptions = Partial<PaginationOptions>;
     export type ListRulesOptions = Partial<PaginationOptions>;
+    export type ListTopicsOptions = Partial<PaginationOptions>;
+    export type ListQueuesOptions = Partial<PaginationOptions>;
     export type CreateRuleOptions = Partial<ICreateRuleOptions>;
     export type CreateNotificationHubOptions = Partial<ICreateNotificationHubOptions>;
     export type ListNotificationHubsOptions = Partial<PaginationOptions>;
diff --git a/types/azure-sb/lib/servicebusservice.d.ts b/types/azure-sb/lib/servicebusservice.d.ts
index 44f2b2c522..45600a1661 100644
--- a/types/azure-sb/lib/servicebusservice.d.ts
+++ b/types/azure-sb/lib/servicebusservice.d.ts
@@ -11,6 +11,8 @@ import CreateTopicOptions = Azure.ServiceBus.CreateTopicOptions;
 import ListNotificationHubsOptions = Azure.ServiceBus.ListNotificationHubsOptions;
 import ListRulesOptions = Azure.ServiceBus.ListRulesOptions;
 import ListSubscriptionsOptions = Azure.ServiceBus.ListSubscriptionsOptions;
+import ListTopicsOptions = Azure.ServiceBus.ListTopicsOptions;
+import ListQueuesOptions = Azure.ServiceBus.ListQueuesOptions;
 import MessageOrName = Azure.ServiceBus.MessageOrName;
 import Queue = Azure.ServiceBus.Results.Models.Queue;
 import ReceiveQueueMessageOptions = Azure.ServiceBus.ReceiveQueueMessageOptions;
@@ -88,7 +90,8 @@ declare class ServiceBusService extends ServiceBusServiceBase {
     public getQueue(queuePath: string,
                     callback: TypedResultAndResponseCallback<Queue>): void;
 
-    public listQueues(queuePath: string,
+    public listQueues(callback: TypedResultAndResponseCallback<Queue[]>): void;
+    public listQueues(options: ListQueuesOptions,
                       callback: TypedResultAndResponseCallback<Queue[]>): void;
 
     /*
@@ -115,7 +118,8 @@ declare class ServiceBusService extends ServiceBusServiceBase {
     public getTopic(topicPath: string,
                     callback: TypedResultAndResponseCallback<Topic>): void;
 
-    public listTopics(topicPath: string,
+    public listTopics(callback: TypedResultAndResponseCallback<Topic[]>): void;
+    public listTopics(options: ListTopicsOptions,
                       callback: TypedResultAndResponseCallback<Topic[]>): void;
 
     /*
diff --git a/types/azure-sb/lib/servicebusserviceclient.d.ts b/types/azure-sb/lib/servicebusserviceclient.d.ts
index c97b1e3107..1730b642c3 100644
--- a/types/azure-sb/lib/servicebusserviceclient.d.ts
+++ b/types/azure-sb/lib/servicebusserviceclient.d.ts
@@ -1,14 +1,13 @@
-/// <reference types="node" />
-import EventEmitter = NodeJS.EventEmitter;
+import ServiceClient = require('azure-sb/lib/serviceclient');
 
-declare class ServiceBusServiceClient extends EventEmitter {
+declare class ServiceBusServiceClient extends ServiceClient {
     constructor(accessKey?: string,
                 issuer?: string,
                 sharedAccessKeyName?: string,
                 sharedAccessKeyValue?: string,
                 host?: string,
                 acsHost?: string,
-                authenticationProvider?: object);
+        authenticationProvider?: object);
 }
 
 export = ServiceBusServiceClient;
diff --git a/types/azure-sb/lib/serviceclient.d.ts b/types/azure-sb/lib/serviceclient.d.ts
new file mode 100644
index 0000000000..3e39052235
--- /dev/null
+++ b/types/azure-sb/lib/serviceclient.d.ts
@@ -0,0 +1,8 @@
+/// <reference types="node" />
+import EventEmitter = NodeJS.EventEmitter;
+declare class ServiceClient extends EventEmitter {
+    public host: string;
+    public port: number;
+    public protocol: string;
+}
+export = ServiceClient;
diff --git a/types/azure-sb/tsconfig.json b/types/azure-sb/tsconfig.json
index 6e015480dc..61e37ac754 100644
--- a/types/azure-sb/tsconfig.json
+++ b/types/azure-sb/tsconfig.json
@@ -30,6 +30,7 @@
         "lib/models/subscriptionresult.d.ts",
         "lib/models/notificationhubresult.d.ts",
         "lib/models/resourceresult.d.ts",
+        "lib/serviceclient.d.ts",
         "lib/servicebusserviceclient.d.ts",
         "lib/gcmservice.d.ts",
         "lib/wnsservice.d.ts",
@@ -38,4 +39,4 @@
         "azure-sb-tests.ts",
         "index.d.ts"
     ]
-}
\ No newline at end of file
+}

From b470489bc1825274193db2734b59b95e7add857a Mon Sep 17 00:00:00 2001
From: Ethan Resnick <ethan.resnick@gmail.com>
Date: Thu, 15 Mar 2018 16:23:40 -0400
Subject: [PATCH 0564/1382] ramda: support providing partially-applied prop(s)
 return type upfront

---
 types/ramda/index.d.ts     | 2 ++
 types/ramda/ramda-tests.ts | 9 ++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/types/ramda/index.d.ts b/types/ramda/index.d.ts
index 9b4ebf5a24..eb4b4569c6 100644
--- a/types/ramda/index.d.ts
+++ b/types/ramda/index.d.ts
@@ -1481,6 +1481,7 @@ declare namespace R {
          */
         prop<P extends keyof T, T>(p: P, obj: T): T[P];
         prop<P extends string>(p: P): <T>(obj: Record<P, T>) => T;
+        prop<P extends string, T>(p: P): (obj: Record<P, T>) => T;
 
         /**
          * Determines whether the given property of an object has a specific
@@ -1519,6 +1520,7 @@ declare namespace R {
          */
         props<P extends string, T>(ps: ReadonlyArray<P>, obj: Record<P, T>): T[];
         props<P extends string>(ps: ReadonlyArray<P>): <T>(obj: Record<P, T>) => T[];
+        props<P extends string, T>(ps: ReadonlyArray<P>): (obj: Record<P, T>) => T[];
 
         /**
          * Returns true if the specified object property satisfies the given predicate; false otherwise.
diff --git a/types/ramda/ramda-tests.ts b/types/ramda/ramda-tests.ts
index 933b468f09..dbb697e658 100644
--- a/types/ramda/ramda-tests.ts
+++ b/types/ramda/ramda-tests.ts
@@ -724,7 +724,9 @@ interface Obj {
     const list: Book[] = [{id: "xyz", title: "A"}, {id: "abc", title: "B"}];
     const a1 = R.indexBy(R.prop("id"), list);
     const a2 = R.indexBy(R.prop("id"))(list);
-    const a3 = R.indexBy<{ id: string }>(R.prop<string>("id"))(list);
+    const a3 = R.indexBy<{ id: string }>(R.prop("id"))(list);
+    const a4 = R.indexBy(R.prop<"id", string>("id"))(list);
+    const a5 = R.indexBy<{ id: string }>(R.prop<"id", string>("id"))(list);
 
     const titlesIndexedByTitles: { [k: string]: string } = R.pipe(
         R.map((x: Book) => x.title),
@@ -1161,7 +1163,8 @@ type Pair = KeyValuePair<string, number>;
 
 () => {
     const x          = R.prop("x");
-    const a: boolean = R.tryCatch<boolean>(R.prop("x"), R.F)({x: true}); // => true
+    const a: boolean  = R.tryCatch<boolean>(R.prop("x"), R.F)({x: true}); // => true
+    const a1: boolean = R.tryCatch(R.prop<"x", true>("x"), R.F)({x: true}); // => true
     const b: boolean = R.tryCatch<boolean>(R.prop("x"), R.F)(null);      // => false
     const c: boolean = R.tryCatch<boolean>(R.and, R.F)(true, true);      // => true
 };
@@ -1754,7 +1757,7 @@ class Rectangle {
 
     const format = R.converge(
         R.call, [
-            R.pipe<{}, number, (s: string) => string>(R.prop("indent"), indentN),
+            R.pipe(R.prop<"indent", number>("indent"), indentN),
             R.prop("value")
         ]
     );

From e892a19afb887064f82982c13315a39dcb16e8a3 Mon Sep 17 00:00:00 2001
From: Olivier Sechet <osechet@gmail.com>
Date: Fri, 9 Mar 2018 17:37:24 +0100
Subject: [PATCH 0565/1382] Fix no-unnecessary-generic lint Limit the
 no-unnecessary-class

---
 types/openlayers/index.d.ts          | 20 ++++++++---------
 types/openlayers/openlayers-tests.ts | 33 ++++++++++++++++++++++++++++
 types/openlayers/tslint.json         |  3 +--
 3 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/types/openlayers/index.d.ts b/types/openlayers/index.d.ts
index 0dfd1fe464..88cacde1e3 100644
--- a/types/openlayers/index.d.ts
+++ b/types/openlayers/index.d.ts
@@ -144,7 +144,7 @@ export class Collection<T> extends Object {
      * @template S
      * @api stable
      */
-    forEach<S>(f: ((item: T, index: number, array: T[]) => any), opt_this?: S): void;
+    forEach(f: ((item: T, index: number, array: T[]) => any), opt_this?: any): void;
 
     /**
      * Get a reference to the underlying Array object. Warning: if the array
@@ -6711,11 +6711,11 @@ export class Map extends Object {
      * @template S,T,U
      * @api stable
      */
-    forEachLayerAtPixel<S, T, U>(pixel: ol.Pixel,
-                                    callback: ((layer: ol.layer.Layer, color: ol.Color) => T),
-                                    opt_this?: S,
-                                    opt_layerFilter?: ((layer: ol.layer.Layer) => boolean),
-                                    opt_this2?: U): (T);
+    forEachLayerAtPixel<T>(pixel: ol.Pixel,
+                           callback: (layer: ol.layer.Layer, color: ol.Color) => T,
+                           opt_this?: any,
+                           opt_layerFilter?: (layer: ol.layer.Layer) => boolean,
+                           opt_this2?: any): (T);
 
     /**
      * Detect if features intersect a pixel on the viewport. Layers included in the
@@ -8978,7 +8978,7 @@ export namespace source {
          * @template T
          * @api
          */
-        forDataAtCoordinateAndResolution<T>(coordinate: ol.Coordinate, resolution: number, callback: ((d: any) => any), opt_this?: T, opt_request?: boolean): void;
+        forDataAtCoordinateAndResolution(coordinate: ol.Coordinate, resolution: number, callback: ((d: any) => any), opt_this?: any, opt_request?: boolean): void;
     }
 
     /**
@@ -9158,7 +9158,7 @@ export namespace source {
          * @template T,S
          * @api stable
          */
-        forEachFeature<T, S>(callback: ((feature: ol.Feature) => S), opt_this?: T): (S);
+        forEachFeature<S>(callback: ((feature: ol.Feature) => S), opt_this?: any): (S);
 
         /**
          * Iterate through all features whose bounding box intersects the provided
@@ -9181,7 +9181,7 @@ export namespace source {
          * @template T,S
          * @api
          */
-        forEachFeatureInExtent<T, S>(extent: ol.Extent, callback: ((feature: ol.Feature) => S), opt_this?: T): (S);
+        forEachFeatureInExtent<S>(extent: ol.Extent, callback: ((feature: ol.Feature) => S), opt_this?: any): (S);
 
         /**
          * Iterate through all features whose geometry intersects the provided extent,
@@ -9200,7 +9200,7 @@ export namespace source {
          * @template T,S
          * @api
          */
-        forEachFeatureIntersectingExtent<T, S>(extent: ol.Extent, callback: ((feature: ol.Feature) => S), opt_this?: T): (S);
+        forEachFeatureIntersectingExtent<S>(extent: ol.Extent, callback: ((feature: ol.Feature) => S), opt_this?: any): (S);
 
         /**
          * Get the features collection associated with this source. Will be `null`
diff --git a/types/openlayers/openlayers-tests.ts b/types/openlayers/openlayers-tests.ts
index fa42579ba9..4e83737ac3 100644
--- a/types/openlayers/openlayers-tests.ts
+++ b/types/openlayers/openlayers-tests.ts
@@ -61,6 +61,7 @@ let map: ol.Map;
 let multiLineString: ol.geom.MultiLineString;
 let multiPoint: ol.geom.MultiPoint;
 let multiPolygon: ol.geom.MultiPolygon;
+let numberCollection: ol.Collection<number>;
 const olEvent = new ol.events.Event(stringValue);
 const pixel: ol.Pixel = [numberValue, numberValue];
 let point: ol.geom.Point;
@@ -90,6 +91,24 @@ attribution = new ol.Attribution({
     html: stringValue,
 });
 
+//
+// ol.Collection
+//
+let collection = new ol.Collection<number>();
+collection = new ol.Collection<number>([]);
+collection.clear();
+numberCollection = collection.extend(numberArray);
+collection.forEach((item, index, array) => {});
+numberArray = collection.getArray();
+numberValue = collection.item(numberValue);
+numberValue = collection.getLength();
+collection.insertAt(numberValue, numberValue);
+numberValue = collection.pop();
+numberValue = collection.push(numberValue);
+numberValue = collection.remove(numberValue);
+numberValue = collection.removeAt(numberValue);
+collection.setAt(numberValue, numberValue);
+
 //
 // ol.color
 //
@@ -626,6 +645,7 @@ map = new ol.Map({
     layers: [tileLayer],
     target: stringValue
 });
+numberValue = map.forEachLayerAtPixel(coordinate, (layer, color) => numberValue, anyValue, (layer) => booleanValue, anyValue);
 
 //
 // ol.source.ImageWMS
@@ -643,6 +663,19 @@ const imageWMS: ol.source.ImageWMS = new ol.source.ImageWMS({
 const source = imageWMS as ol.source.Source;
 projection = source.getProjection();
 
+//
+// ol.source.TileUTFGrid
+//
+let tileJSONValue = JSON;
+let tileUTFGrid = new ol.source.TileUTFGrid({});
+tileUTFGrid = new ol.source.TileUTFGrid({
+    jsonp: booleanValue,
+    preemptive: booleanValue,
+    tileJSON: tileJSONValue,
+    url: stringValue,
+});
+tileUTFGrid.forDataAtCoordinateAndResolution(coordinate, numberValue, (d) => anyValue, anyValue, booleanValue);
+
 //
 // ol.source.TileWMS
 //
diff --git a/types/openlayers/tslint.json b/types/openlayers/tslint.json
index 70877b4c6c..e73ae504e3 100644
--- a/types/openlayers/tslint.json
+++ b/types/openlayers/tslint.json
@@ -1,8 +1,7 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "no-unnecessary-class": false,
-        "no-unnecessary-generics": false,
+        "no-unnecessary-class": ["allow-constructor-only"],
         "no-unnecessary-qualifier": false,
         "strict-export-declare-modifiers": false
     }

From a94659c1307a0c51d30dc52e0318e29edac9c548 Mon Sep 17 00:00:00 2001
From: Olivier Sechet <osechet@gmail.com>
Date: Fri, 9 Mar 2018 17:43:46 +0100
Subject: [PATCH 0566/1382] Fix strict-export-declare-modifiers lint

---
 types/openlayers/index.d.ts          | 50 ++++++++++++++--------------
 types/openlayers/openlayers-tests.ts |  4 +--
 types/openlayers/tslint.json         |  3 +-
 3 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/types/openlayers/index.d.ts b/types/openlayers/index.d.ts
index 88cacde1e3..d2d8956cfc 100644
--- a/types/openlayers/index.d.ts
+++ b/types/openlayers/index.d.ts
@@ -13,7 +13,7 @@
 
 export as namespace ol;
 
-interface GlobalObject { [key: string]: any; }
+export interface GlobalObject { [key: string]: any; }
 
 /**
  * Error object thrown when an assertion failed. This is an ECMA-262 Error,
@@ -1387,7 +1387,7 @@ export namespace events {
 }
 
 /* From ol/typedefs.js */
-type EventsListenerFunctionType = ((evt: ol.events.Event) => void) | ((evt: ol.events.Event) => boolean);
+export type EventsListenerFunctionType = ((evt: ol.events.Event) => void) | ((evt: ol.events.Event) => boolean);
 
 export namespace extent {
     /**
@@ -11415,7 +11415,7 @@ export class View extends Object {
 }
 
 export namespace olx {
-    export namespace animation {
+    namespace animation {
         interface BounceOptions {
             resolution: number;
             start?: number;
@@ -11465,7 +11465,7 @@ export namespace olx {
         type AnimateCallback = (completed: boolean) => void;
     }
 
-    export namespace control {
+    namespace control {
         interface AttributionOptions {
             className?: string;
             target?: Element;
@@ -11570,7 +11570,7 @@ export namespace olx {
         }
     }
 
-    export namespace format {
+    namespace format {
         interface ReadOptions {
             dataProjection: ol.ProjectionLike;
             featureProjection: ol.ProjectionLike;
@@ -11681,7 +11681,7 @@ export namespace olx {
         }
     }
 
-    export namespace interaction {
+    namespace interaction {
         /**
          * Object literal with config options for interactions.
          */
@@ -11844,7 +11844,7 @@ export namespace olx {
         }
     }
 
-    export namespace layer {
+    namespace layer {
         interface BaseOptions {
             opacity?: number;
             visible?: boolean;
@@ -11961,15 +11961,15 @@ export namespace olx {
         }
     }
 
-    export namespace parser {
+    namespace parser {
     }
-    export namespace render {
+    namespace render {
         interface ToContextOptions {
             size?: ol.Size;
             pixelRatio?: number;
         }
     }
-    export namespace source {
+    namespace source {
         interface BingMapsOptions {
             cacheSize?: number;
             culture?: string;
@@ -12286,7 +12286,7 @@ export namespace olx {
             size: ol.Size;
         }
     }
-    export namespace style {
+    namespace style {
         interface CircleOptions {
             fill?: ol.style.Fill;
             radius: number;
@@ -12386,7 +12386,7 @@ export namespace olx {
             space?: number;
         }
     }
-    export namespace tilegrid {
+    namespace tilegrid {
         interface TileGridOptions {
             extent?: ol.Extent;
             minZoom?: number;
@@ -12417,15 +12417,15 @@ export namespace olx {
         }
     }
 
-    export interface AttributionOptions {
+    interface AttributionOptions {
         html: string;
     }
 
-    export interface DeviceOrientationOptions {
+    interface DeviceOrientationOptions {
         tracking?: boolean;
     }
 
-    export interface GeolocationOptions {
+    interface GeolocationOptions {
         tracking?: boolean;
         trackingOptions?: PositionOptions;
         projection: ol.ProjectionLike;
@@ -12434,12 +12434,12 @@ export namespace olx {
     /**
      * Object literal with config options for the map logo.
      */
-    export interface LogoOptions {
+    interface LogoOptions {
         href: string;
         src: string;
     }
 
-    export interface GraticuleOptions {
+    interface GraticuleOptions {
         map?: ol.Map;
         maxLines?: number;
         strokeStyle?: ol.style.Stroke;
@@ -12456,7 +12456,7 @@ export namespace olx {
     /**
      * Object literal with config options for the map.
      */
-    export interface MapOptions {
+    interface MapOptions {
         controls?: (ol.Collection<ol.control.Control> | ol.control.Control[]);
         pixelRatio?: number;
         interactions?: (ol.Collection<ol.interaction.Interaction> | ol.interaction.Interaction[]);
@@ -12474,7 +12474,7 @@ export namespace olx {
     /**
      * Object literal with config options for the overlay.
      */
-    export interface OverlayOptions {
+    interface OverlayOptions {
         id?: (number | string);
         element?: Element;
         offset?: number[];
@@ -12490,7 +12490,7 @@ export namespace olx {
     /**
      * Object literal with config options for the projection.
      */
-    export interface ProjectionOptions {
+    interface ProjectionOptions {
         code: string;
         units?: (ol.proj.Units | string);
         extent?: ol.Extent;
@@ -12501,7 +12501,7 @@ export namespace olx {
         getPointResolution?: ((resolution: number, coords: ol.Coordinate) => number);
     }
 
-    export namespace view {
+    namespace view {
         interface FitOptions {
             size?: ol.Size;
             padding?: number[];
@@ -12518,7 +12518,7 @@ export namespace olx {
     /**
      * Object literal with config options for the view.
      */
-    export interface ViewOptions {
+    interface ViewOptions {
         center?: ol.Coordinate;
         constrainRotation?: (boolean | number);
         enableRotation?: boolean;
@@ -12539,18 +12539,18 @@ export namespace olx {
      * Object literal with options for the {@link ol.Map#forEachFeatureAtPixel} and
      * {@link ol.Map#hasFeatureAtPixel} methods.
      */
-    export interface AtPixelOptions {
+    interface AtPixelOptions {
         layerFilter?: ((layer: ol.layer.Layer) => boolean);
         hitTolerance?: number;
     }
 
-    export interface FrameState {
+    interface FrameState {
         pixelRatio: number;
         time: number;
         viewState: olx.ViewState;
     }
 
-    export interface ViewState {
+    interface ViewState {
         center: ol.Coordinate;
         projection: ol.proj.Projection;
         resolution: number;
diff --git a/types/openlayers/openlayers-tests.ts b/types/openlayers/openlayers-tests.ts
index 4e83737ac3..e54c496e71 100644
--- a/types/openlayers/openlayers-tests.ts
+++ b/types/openlayers/openlayers-tests.ts
@@ -9,7 +9,7 @@ const fn: () => void = () => {};
 const image: HTMLImageElement = new HTMLImageElement();
 let jsonValue: JSON;
 const listener: ol.EventsListenerFunctionType = (evt) => {};
-const numberArray: number[] = [];
+let numberArray: number[] = [];
 let numberValue: number;
 let object: { [key: string]: any };
 let stringArray: string[];
@@ -666,7 +666,7 @@ projection = source.getProjection();
 //
 // ol.source.TileUTFGrid
 //
-let tileJSONValue = JSON;
+const tileJSONValue = JSON;
 let tileUTFGrid = new ol.source.TileUTFGrid({});
 tileUTFGrid = new ol.source.TileUTFGrid({
     jsonp: booleanValue,
diff --git a/types/openlayers/tslint.json b/types/openlayers/tslint.json
index e73ae504e3..e2e8ba2c67 100644
--- a/types/openlayers/tslint.json
+++ b/types/openlayers/tslint.json
@@ -2,7 +2,6 @@
     "extends": "dtslint/dt.json",
     "rules": {
         "no-unnecessary-class": ["allow-constructor-only"],
-        "no-unnecessary-qualifier": false,
-        "strict-export-declare-modifiers": false
+        "no-unnecessary-qualifier": false
     }
 }

From a1d51c8df1d6786f627737bdd8740a8a7bf3fd19 Mon Sep 17 00:00:00 2001
From: Olivier Sechet <osechet@gmail.com>
Date: Sat, 10 Mar 2018 23:47:34 +0100
Subject: [PATCH 0567/1382] Fix no-unnecessary-qualifier lint

---
 types/openlayers/index.d.ts  | 526 +++++++++++++++++------------------
 types/openlayers/tslint.json |   3 +-
 2 files changed, 264 insertions(+), 265 deletions(-)

diff --git a/types/openlayers/index.d.ts b/types/openlayers/index.d.ts
index d2d8956cfc..2326a2c3df 100644
--- a/types/openlayers/index.d.ts
+++ b/types/openlayers/index.d.ts
@@ -242,7 +242,7 @@ export namespace Collection {
          * @param type Type.
          * @param opt_element Element.
          */
-        constructor(type: ol.Collection.EventType, opt_element?: any);
+        constructor(type: EventType, opt_element?: any);
 
         /**
          * The element that is added to or removed from the collection.
@@ -302,7 +302,7 @@ export namespace control {
      * @param opt_options Attribution options.
      * @api stable
      */
-    class Attribution extends control.Control {
+    class Attribution extends Control {
         /**
          * @classdesc
          * Control to show all the attributions associated with the layer sources
@@ -452,7 +452,7 @@ export namespace control {
      * @param opt_options Options.
      * @api stable
      */
-    class FullScreen extends control.Control {
+    class FullScreen extends Control {
         /**
          * @classdesc
          * Provides a button that when clicked fills up the full screen with the map.
@@ -483,7 +483,7 @@ export namespace control {
      * @return Controls.
      * @api stable
      */
-    function defaults(opt_options?: olx.control.DefaultsOptions): ol.Collection<ol.control.Control>;
+    function defaults(opt_options?: olx.control.DefaultsOptions): ol.Collection<Control>;
 
     /**
      * @classdesc
@@ -496,7 +496,7 @@ export namespace control {
      *     options.
      * @api stable
      */
-    class MousePosition extends control.Control {
+    class MousePosition extends Control {
         /**
          * @classdesc
          * A control to show the 2D coordinates of the mouse cursor. By default, these
@@ -561,7 +561,7 @@ export namespace control {
      * @param opt_options OverviewMap options.
      * @api
      */
-    class OverviewMap extends control.Control {
+    class OverviewMap extends Control {
         /**
          * Create a new control with a map acting as an overview map for an other
          * defined map.
@@ -624,7 +624,7 @@ export namespace control {
      * @param opt_options Rotate options.
      * @api stable
      */
-    class Rotate extends control.Control {
+    class Rotate extends Control {
         /**
          * @classdesc
          * A button control to reset rotation to 0.
@@ -657,7 +657,7 @@ export namespace control {
      * @param opt_options Scale line options.
      * @api stable
      */
-    class ScaleLine extends control.Control {
+    class ScaleLine extends Control {
         /**
          * @classdesc
          * A control displaying rough y-axis distances, calculated for the center of the
@@ -680,7 +680,7 @@ export namespace control {
          * @observable
          * @api stable
          */
-        getUnits(): (ol.control.ScaleLine.Units);
+        getUnits(): (ScaleLine.Units);
 
         /**
          * Update the scale line element.
@@ -695,7 +695,7 @@ export namespace control {
          * @observable
          * @api stable
          */
-        setUnits(units: ol.control.ScaleLine.Units): void;
+        setUnits(units: ScaleLine.Units): void;
     }
 
     namespace ScaleLine {
@@ -720,7 +720,7 @@ export namespace control {
      * @param opt_options Zoom options.
      * @api stable
      */
-    class Zoom extends control.Control {
+    class Zoom extends Control {
         /**
          * @classdesc
          * A control with 2 buttons, one for zoom in and one for zoom out.
@@ -744,7 +744,7 @@ export namespace control {
      * @param opt_options Zoom slider options.
      * @api stable
      */
-    class ZoomSlider extends control.Control {
+    class ZoomSlider extends Control {
         /**
          * @classdesc
          * A slider type of control for zooming.
@@ -774,7 +774,7 @@ export namespace control {
      * @param opt_options Options.
      * @api stable
      */
-    class ZoomToExtent extends control.Control {
+    class ZoomToExtent extends Control {
         /**
          * @classdesc
          * A button control which, when pressed, changes the map view to a specific
@@ -1790,7 +1790,7 @@ export namespace format {
      * @param opt_options Options.
      * @api
      */
-    class EsriJSON extends format.JSONFeature {
+    class EsriJSON extends JSONFeature {
         /**
          * @classdesc
          * Feature format for reading and writing data in the EsriJSON format.
@@ -1942,7 +1942,7 @@ export namespace format {
      * @param opt_options Options.
      * @api stable
      */
-    class GeoJSON extends format.JSONFeature {
+    class GeoJSON extends JSONFeature {
         /**
          * @classdesc
          * Feature format for reading and writing data in the GeoJSON format.
@@ -2064,7 +2064,7 @@ export namespace format {
      *     Optional configuration object.
      * @api stable
      */
-    class GML extends format.GMLBase {
+    class GML extends GMLBase {
         /**
          * @classdesc
          * Feature format for reading and writing data in the GML format
@@ -2106,7 +2106,7 @@ export namespace format {
      * @param opt_options Optional configuration object.
      * @api
      */
-    class GML2 extends format.GMLBase {
+    class GML2 extends GMLBase {
         /**
          * @classdesc
          * Feature format for reading and writing data in the GML format,
@@ -2128,7 +2128,7 @@ export namespace format {
      *     Optional configuration object.
      * @api
      */
-    class GML3 extends format.GMLBase {
+    class GML3 extends GMLBase {
         /**
          * @classdesc
          * Feature format for reading and writing data in the GML format
@@ -2184,7 +2184,7 @@ export namespace format {
      * @param opt_options
      *     Optional configuration object.
      */
-    class GMLBase extends format.XMLFeature {
+    class GMLBase extends XMLFeature {
         /**
          * @classdesc
          * Abstract base class; normally only used for creating subclasses and not
@@ -2217,7 +2217,7 @@ export namespace format {
      * @param opt_options Options.
      * @api stable
      */
-    class GPX extends format.XMLFeature {
+    class GPX extends XMLFeature {
         /**
          * @classdesc
          * Feature format for reading and writing data in the GPX format.
@@ -2297,7 +2297,7 @@ export namespace format {
      * @param opt_options Options.
      * @api
      */
-    class IGC extends format.TextFeature {
+    class IGC extends TextFeature {
         /**
          * @classdesc
          * Feature format for `*.igc` flight recording files.
@@ -2345,7 +2345,7 @@ export namespace format {
      * Base class for JSON feature formats.
      *
      */
-    class JSONFeature extends format.Feature {
+    class JSONFeature extends Feature {
         /**
          * @classdesc
          * Abstract base class; normally only used for creating subclasses and not
@@ -2366,7 +2366,7 @@ export namespace format {
      * @param opt_options Options.
      * @api stable
      */
-    class KML extends format.XMLFeature {
+    class KML extends XMLFeature {
         /**
          * @classdesc
          * Feature format for reading and writing data in the KML format.
@@ -2460,7 +2460,7 @@ export namespace format {
      * @param opt_options Options.
      * @api
      */
-    class MVT extends format.Feature {
+    class MVT extends Feature {
         /**
          * @classdesc
          * Feature format for reading data in the Mapbox MVT format.
@@ -2502,7 +2502,7 @@ export namespace format {
          * @returns `<Intersects>` operator.
          * @api
          */
-        function intersects(geometryName: string, geometry: ol.geom.Geometry, opt_srsName?: string): ol.format.filter.Intersects;
+        function intersects(geometryName: string, geometry: ol.geom.Geometry, opt_srsName?: string): Intersects;
 
         /**
          * Create a logical `<Or>` operator between two or more filter conditions.
@@ -2511,7 +2511,7 @@ export namespace format {
          * @returns `<Or>` operator.
          * @api
          */
-        function or(...conditions: ol.format.filter.Filter[]): ol.format.filter.Or;
+        function or(...conditions: Filter[]): Or;
 
         /**
          * Create a logical `<And>` operator between two or more filter conditions.
@@ -2520,7 +2520,7 @@ export namespace format {
          * @returns `<And>` operator.
          * @api
          */
-        function and(...conditions: ol.format.filter.Filter[]): ol.format.filter.And;
+        function and(...conditions: Filter[]): And;
 
         /**
          * Represents a logical `<Not>` operator for a filter condition.
@@ -2529,7 +2529,7 @@ export namespace format {
          * @returns `<Not>` operator.
          * @api
          */
-        function not(condition: ol.format.filter.Filter): ol.format.filter.Not;
+        function not(condition: Filter): Not;
 
         /**
          * Create a `<BBOX>` operator to test whether a geometry-valued property
@@ -2542,7 +2542,7 @@ export namespace format {
          * @returns `<BBOX>` operator.
          * @api
          */
-        function bbox(geometryName: string, extent: ol.Extent, opt_srsName?: string): ol.format.filter.Bbox;
+        function bbox(geometryName: string, extent: ol.Extent, opt_srsName?: string): Bbox;
 
         /**
          * Create a `<Within>` operator to test whether a geometry-valued property
@@ -2555,7 +2555,7 @@ export namespace format {
          * @returns `<Within>` operator.
          * @api
          */
-        function within(geometryName: string, geometry: ol.geom.Geometry, opt_srsName?: string): ol.format.filter.Within;
+        function within(geometryName: string, geometry: ol.geom.Geometry, opt_srsName?: string): Within;
 
         /**
          * Creates a `<PropertyIsEqualTo>` comparison operator.
@@ -2566,7 +2566,7 @@ export namespace format {
          * @returns `<PropertyIsEqualTo>` operator.
          * @api
          */
-        function equalTo(propertyName: string, expression: string | number, opt_matchCase?: boolean): ol.format.filter.EqualTo;
+        function equalTo(propertyName: string, expression: string | number, opt_matchCase?: boolean): EqualTo;
 
         /**
          * Creates a `<PropertyIsNotEqualTo>` comparison operator.
@@ -2577,7 +2577,7 @@ export namespace format {
          * @returns `<PropertyIsNotEqualTo>` operator.
          * @api
          */
-        function notEqualTo(propertyName: string, expression: string | number, opt_matchCase?: boolean): ol.format.filter.NotEqualTo;
+        function notEqualTo(propertyName: string, expression: string | number, opt_matchCase?: boolean): NotEqualTo;
 
         /**
          * Creates a `<PropertyIsLessThan>` comparison operator.
@@ -2587,7 +2587,7 @@ export namespace format {
          * @returns `<PropertyIsLessThan>` operator.
          * @api
          */
-        function lessThan(propertyName: string, expression: number): ol.format.filter.LessThan;
+        function lessThan(propertyName: string, expression: number): LessThan;
 
         /**
          * Creates a `<PropertyIsLessThanOrEqualTo>` comparison operator.
@@ -2597,7 +2597,7 @@ export namespace format {
          * @returns `<PropertyIsLessThanOrEqualTo>` operator.
          * @api
          */
-        function lessThanOrEqualTo(propertyName: string, expression: number): ol.format.filter.LessThanOrEqualTo;
+        function lessThanOrEqualTo(propertyName: string, expression: number): LessThanOrEqualTo;
 
         /**
          * Creates a `<PropertyIsGreaterThan>` comparison operator.
@@ -2607,7 +2607,7 @@ export namespace format {
          * @returns `<PropertyIsGreaterThan>` operator.
          * @api
          */
-        function greaterThan(propertyName: string, expression: number): ol.format.filter.GreaterThan;
+        function greaterThan(propertyName: string, expression: number): GreaterThan;
 
         /**
          * Creates a `<PropertyIsGreaterThanOrEqualTo>` comparison operator.
@@ -2617,7 +2617,7 @@ export namespace format {
          * @returns `<PropertyIsGreaterThanOrEqualTo>` operator.
          * @api
          */
-        function greaterThanOrEqualTo(propertyName: string, expression: number): ol.format.filter.GreaterThanOrEqualTo;
+        function greaterThanOrEqualTo(propertyName: string, expression: number): GreaterThanOrEqualTo;
 
         /**
          * Creates a `<PropertyIsNull>` comparison operator to test whether a property value
@@ -2627,7 +2627,7 @@ export namespace format {
          * @returns `<PropertyIsNull>` operator.
          * @api
          */
-        function isNull(propertyName: string): ol.format.filter.IsNull;
+        function isNull(propertyName: string): IsNull;
 
         /**
          * Creates a `<PropertyIsBetween>` comparison operator to test whether an expression
@@ -2639,7 +2639,7 @@ export namespace format {
          * @returns `<PropertyIsBetween>` operator.
          * @api
          */
-        function between(propertyName: string, lowerBoundary: number, upperBoundary: number): ol.format.filter.IsBetween;
+        function between(propertyName: string, lowerBoundary: number, upperBoundary: number): IsBetween;
 
         /**
          * Represents a `<PropertyIsLike>` comparison operator that matches a string property
@@ -2657,7 +2657,7 @@ export namespace format {
          * @returns `<PropertyIsLike>` operator.
          * @api
          */
-        function like(propertyName: string, pattern: string, opt_wildCard?: string, opt_singleChar?: string, opt_escapeChar?: string, opt_matchCase?: boolean): ol.format.filter.IsLike;
+        function like(propertyName: string, pattern: string, opt_wildCard?: string, opt_singleChar?: string, opt_escapeChar?: string, opt_matchCase?: boolean): IsLike;
 
         /**
          * Create a `<During>` temporal operator.
@@ -2668,7 +2668,7 @@ export namespace format {
          * @returns `<During>` operator.
          * @api
          */
-        function during(propertyName: string, begin: string, end: string): ol.format.filter.During;
+        function during(propertyName: string, begin: string, end: string): During;
 
         /**
          * @classdesc
@@ -2710,7 +2710,7 @@ export namespace format {
          *    set on geometries when this is not provided.
          * @api
          */
-        class Spatial extends format.filter.Filter {
+        class Spatial extends Filter {
             /**
              * @classdesc
              * Represents a spatial operator to test whether a geometry-valued property
@@ -2737,7 +2737,7 @@ export namespace format {
          *    set on geometries when this is not provided.
          * @api
          */
-        class Intersects extends format.filter.Spatial {
+        class Intersects extends Spatial {
             /**
              * @classdesc
              * Represents a `<Intersects>` operator to test whether a geometry-valued property
@@ -2763,7 +2763,7 @@ export namespace format {
          *    set on geometries when this is not provided.
          * @api
          */
-        class Within extends format.filter.Spatial {
+        class Within extends Spatial {
             /**
              * @classdesc
              * Represents a `<Within>` operator to test whether a geometry-valued property
@@ -2783,7 +2783,7 @@ export namespace format {
          * Abstract class; normally only used for creating subclasses and not instantiated in apps.
          * Base class for WFS GetFeature n-ary logical filters.
          */
-        class LogicalNary extends format.filter.Filter { }
+        class LogicalNary extends Filter { }
 
         /**
          * @classdesc
@@ -2792,7 +2792,7 @@ export namespace format {
          * @param conditions Conditions
          * @api
          */
-        class And extends format.filter.LogicalNary {
+        class And extends LogicalNary {
             /**
              * @classdesc
              * Represents a logical <And> operator between two or more filter conditions.
@@ -2800,7 +2800,7 @@ export namespace format {
              * @param conditions Conditions
              * @api
              */
-            constructor(...conditions: ol.format.filter.Filter[]);
+            constructor(...conditions: Filter[]);
         }
 
         /**
@@ -2810,7 +2810,7 @@ export namespace format {
          * @param conditions Conditions
          * @api
          */
-        class Or extends format.filter.LogicalNary {
+        class Or extends LogicalNary {
             /**
              * @classdesc
              * Represents a logical <Or> operator between two or more filter conditions.
@@ -2818,7 +2818,7 @@ export namespace format {
              * @param conditions Conditions
              * @api
              */
-            constructor(...conditions: ol.format.filter.Filter[]);
+            constructor(...conditions: Filter[]);
         }
 
         /**
@@ -2832,7 +2832,7 @@ export namespace format {
          * @param propertyName Name of the context property to compare.
          * @api
          */
-        class Comparison extends format.filter.Filter {
+        class Comparison extends Filter {
             /**
              * @classdesc
              * Abstract class; normally only used for creating subclasses and not instantiated in apps.
@@ -2860,7 +2860,7 @@ export namespace format {
          * @param opt_matchCase Case-sensitive?
          * @api
          */
-        class ComparisonBinary extends format.filter.Comparison {
+        class ComparisonBinary extends Comparison {
             /**
              * @classdesc
              * Abstract class; normally only used for creating subclasses and not instantiated in apps.
@@ -2886,7 +2886,7 @@ export namespace format {
          * @param opt_matchCase Case-sensitive?
          * @api
          */
-        class EqualTo extends format.filter.ComparisonBinary {
+        class EqualTo extends ComparisonBinary {
             /**
              * @classdesc
              * Represents a `<PropertyIsEqualTo>` comparison operator.
@@ -2907,7 +2907,7 @@ export namespace format {
          * @param expression The value to compare.
          * @api
          */
-        class GreaterThan extends format.filter.ComparisonBinary {
+        class GreaterThan extends ComparisonBinary {
             /**
              * @classdesc
              * Represents a `<PropertyIsGreaterThan>` comparison operator.
@@ -2927,7 +2927,7 @@ export namespace format {
          * @param expression The value to compare.
          * @api
          */
-        class GreaterThanOrEqualTo extends format.filter.ComparisonBinary {
+        class GreaterThanOrEqualTo extends ComparisonBinary {
             /**
              * @classdesc
              * Represents a `<PropertyIsGreaterThanOrEqualTo>` comparison operator.
@@ -2947,7 +2947,7 @@ export namespace format {
          * @param expression The value to compare.
          * @api
          */
-        class LessThan extends format.filter.ComparisonBinary {
+        class LessThan extends ComparisonBinary {
             /**
              * @classdesc
              * Represents a `<PropertyIsLessThan>` comparison operator.
@@ -2967,7 +2967,7 @@ export namespace format {
          * @param expression The value to compare.
          * @api
          */
-        class LessThanOrEqualTo extends format.filter.ComparisonBinary {
+        class LessThanOrEqualTo extends ComparisonBinary {
             /**
              * @classdesc
              * Represents a `<PropertyIsLessThanOrEqualTo>` comparison operator.
@@ -2988,7 +2988,7 @@ export namespace format {
          * @param opt_matchCase Case-sensitive?
          * @api
          */
-        class NotEqualTo extends format.filter.ComparisonBinary {
+        class NotEqualTo extends ComparisonBinary {
             /**
              * @classdesc
              * Represents a `<PropertyIsNotEqualTo>` comparison operator.
@@ -3010,7 +3010,7 @@ export namespace format {
          * @param end The end date in ISO-8601 format.
          * @api
          */
-        class During extends format.filter.Comparison {
+        class During extends Comparison {
             /**
              * @classdesc
              * Represents a `<During>` comparison operator.
@@ -3032,7 +3032,7 @@ export namespace format {
          * @param upperBoundary The upper bound of the range.
          * @api
          */
-        class IsBetween extends format.filter.Comparison {
+        class IsBetween extends Comparison {
             /**
              * @classdesc
              * Represents a `<PropertyIsBetween>` comparison operator.
@@ -3060,7 +3060,7 @@ export namespace format {
          * @param opt_matchCase Case-sensitive?
          * @api
          */
-        class IsLike extends format.filter.Comparison {
+        class IsLike extends Comparison {
             /**
              * @classdesc
              * Represents a `<PropertyIsLike>` comparison operator.
@@ -3086,7 +3086,7 @@ export namespace format {
          * @param propertyName Name of the context property to compare.
          * @api
          */
-        class IsNull extends format.filter.Comparison {
+        class IsNull extends Comparison {
             /**
              * @classdesc
              * Represents a `<PropertyIsNull>` comparison operator.
@@ -3104,7 +3104,7 @@ export namespace format {
          * @param condition Filter condition.
          * @api
          */
-        class Not extends format.filter.Filter {
+        class Not extends Filter {
             /**
              * @classdesc
              * Represents a logical `<Not>` operator for a filter condition.
@@ -3112,7 +3112,7 @@ export namespace format {
              * @param condition Filter condition.
              * @api
              */
-            constructor(condition: ol.format.filter.Filter);
+            constructor(condition: Filter);
         }
 
         /**
@@ -3126,7 +3126,7 @@ export namespace format {
          *    set on geometries when this is not provided.
          * @api
          */
-        class Bbox extends format.filter.Filter {
+        class Bbox extends Filter {
             /**
              * @classdesc
              * Represents a `<BBOX>` operator to test whether a geometry-valued property
@@ -3149,7 +3149,7 @@ export namespace format {
      *
      * @api stable
      */
-    class OSMXML extends format.XMLFeature {
+    class OSMXML extends XMLFeature {
         /**
          * @classdesc
          * Feature format for reading data in the
@@ -3188,7 +3188,7 @@ export namespace format {
      *     Optional configuration object.
      * @api stable
      */
-    class Polyline extends format.TextFeature {
+    class Polyline extends TextFeature {
         /**
          * @classdesc
          * Feature format for reading and writing data in the Encoded
@@ -3312,7 +3312,7 @@ export namespace format {
      * Base class for text feature formats.
      *
      */
-    class TextFeature extends format.Feature {
+    class TextFeature extends Feature {
         /**
          * @classdesc
          * Abstract base class; normally only used for creating subclasses and not
@@ -3330,7 +3330,7 @@ export namespace format {
      * @param opt_options Options.
      * @api stable
      */
-    class TopoJSON extends format.JSONFeature {
+    class TopoJSON extends JSONFeature {
         /**
          * @classdesc
          * Feature format for reading data in the TopoJSON format.
@@ -3370,7 +3370,7 @@ export namespace format {
      *     Optional configuration object.
      * @api stable
      */
-    class WFS extends format.XMLFeature {
+    class WFS extends XMLFeature {
         /**
          * @classdesc
          * Feature format for reading and writing data in the WFS format.
@@ -3451,7 +3451,7 @@ export namespace format {
      * @param opt_options Options.
      * @api stable
      */
-    class WKT extends format.TextFeature {
+    class WKT extends TextFeature {
         /**
          * @classdesc
          * Geometry format for reading and writing data in the `WellKnownText` (WKT)
@@ -3528,7 +3528,7 @@ export namespace format {
      *
      * @api
      */
-    class WMSCapabilities extends format.XML {
+    class WMSCapabilities extends XML {
         /**
          * @classdesc
          * Format for reading WMS capabilities data
@@ -3555,7 +3555,7 @@ export namespace format {
      * @param opt_options Options.
      * @api
      */
-    class WMSGetFeatureInfo extends format.XMLFeature {
+    class WMSGetFeatureInfo extends XMLFeature {
         /**
          * @classdesc
          * Format for reading WMSGetFeatureInfo format. It uses
@@ -3583,7 +3583,7 @@ export namespace format {
      *
      * @api
      */
-    class WMTSCapabilities extends format.XML {
+    class WMTSCapabilities extends XML {
         /**
          * @classdesc
          * Format for reading WMTS capabilities data.
@@ -3625,7 +3625,7 @@ export namespace format {
      * Base class for XML feature formats.
      *
      */
-    class XMLFeature extends format.Feature {
+    class XMLFeature extends Feature {
         /**
          * @classdesc
          * Abstract base class; normally only used for creating subclasses and not
@@ -3816,7 +3816,7 @@ export namespace geom {
      * @param opt_layout Layout.
      * @api
      */
-    class Circle extends geom.SimpleGeometry {
+    class Circle extends SimpleGeometry {
         /**
          * @classdesc
          * Circle geometry.
@@ -3826,14 +3826,14 @@ export namespace geom {
          * @param opt_layout Layout.
          * @api
          */
-        constructor(center: ol.Coordinate, opt_radius?: number, opt_layout?: ol.geom.GeometryLayout);
+        constructor(center: ol.Coordinate, opt_radius?: number, opt_layout?: GeometryLayout);
 
         /**
          * Make a complete copy of the geometry.
          * @return Clone.
          * @api
          */
-        clone(): ol.geom.Circle;
+        clone(): Circle;
 
         /**
          * Return the center of the circle as {@link ol.Coordinate coordinate}.
@@ -3853,7 +3853,7 @@ export namespace geom {
          * @inheritDoc
          * @api
          */
-        getType(): ol.geom.GeometryType;
+        getType(): GeometryType;
 
         /**
          * @inheritDoc
@@ -3876,7 +3876,7 @@ export namespace geom {
          * @param opt_layout Layout.
          * @api
          */
-        setCenterAndRadius(center: ol.Coordinate, radius: number, opt_layout?: ol.geom.GeometryLayout): void;
+        setCenterAndRadius(center: ol.Coordinate, radius: number, opt_layout?: GeometryLayout): void;
 
         /**
          * Set the radius of the circle. The radius is in the units of the projection.
@@ -3984,7 +3984,7 @@ export namespace geom {
          *     geometry.
          * @api
          */
-        simplify(tolerance: number): ol.geom.Geometry;
+        simplify(tolerance: number): Geometry;
 
         /**
          * Transform each coordinate of the geometry from one coordinate reference
@@ -4001,13 +4001,13 @@ export namespace geom {
          *     modified in place.
          * @api stable
          */
-        transform(source: ol.ProjectionLike, destination: ol.ProjectionLike): ol.geom.Geometry;
+        transform(source: ol.ProjectionLike, destination: ol.ProjectionLike): Geometry;
 
         /**
          * Get the type of this geometry.
          * @return Geometry type.
          */
-        getType(): ol.geom.GeometryType;
+        getType(): GeometryType;
     }
 
     /**
@@ -4017,7 +4017,7 @@ export namespace geom {
      * @param opt_geometries Geometries.
      * @api stable
      */
-    class GeometryCollection extends geom.Geometry {
+    class GeometryCollection extends Geometry {
         /**
          * @classdesc
          * An array of {@link ol.geom.Geometry} objects.
@@ -4025,27 +4025,27 @@ export namespace geom {
          * @param opt_geometries Geometries.
          * @api stable
          */
-        constructor(opt_geometries?: ol.geom.Geometry[]);
+        constructor(opt_geometries?: Geometry[]);
 
         /**
          * Make a complete copy of the geometry.
          * @return Clone.
          * @api stable
          */
-        clone(): ol.geom.GeometryCollection;
+        clone(): GeometryCollection;
 
         /**
          * Return the geometries that make up this geometry collection.
          * @return Geometries.
          * @api stable
          */
-        getGeometries(): ol.geom.Geometry[];
+        getGeometries(): Geometry[];
 
         /**
          * @inheritDoc
          * @api stable
          */
-        getType(): ol.geom.GeometryType;
+        getType(): GeometryType;
 
         /**
          * @inheritDoc
@@ -4058,7 +4058,7 @@ export namespace geom {
          * @param geometries Geometries.
          * @api stable
          */
-        setGeometries(geometries: ol.geom.Geometry[]): void;
+        setGeometries(geometries: Geometry[]): void;
 
         /**
          * @inheritDoc
@@ -4084,7 +4084,7 @@ export namespace geom {
      * @param opt_layout Layout.
      * @api stable
      */
-    class LinearRing extends geom.SimpleGeometry {
+    class LinearRing extends SimpleGeometry {
         /**
          * @classdesc
          * Linear ring geometry. Only used as part of polygon; cannot be rendered
@@ -4094,14 +4094,14 @@ export namespace geom {
          * @param opt_layout Layout.
          * @api stable
          */
-        constructor(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout);
+        constructor(coordinates: ol.Coordinate[], opt_layout?: GeometryLayout);
 
         /**
          * Make a complete copy of the geometry.
          * @return Clone.
          * @api stable
          */
-        clone(): ol.geom.LinearRing;
+        clone(): LinearRing;
 
         /**
          * Return the area of the linear ring on projected plane.
@@ -4121,7 +4121,7 @@ export namespace geom {
          * @inheritDoc
          * @api stable
          */
-        getType(): ol.geom.GeometryType;
+        getType(): GeometryType;
 
         /**
          * Set the coordinates of the linear ring.
@@ -4129,7 +4129,7 @@ export namespace geom {
          * @param opt_layout Layout.
          * @api stable
          */
-        setCoordinates(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout): void;
+        setCoordinates(coordinates: ol.Coordinate[], opt_layout?: GeometryLayout): void;
     }
 
     /**
@@ -4140,7 +4140,7 @@ export namespace geom {
      * @param opt_layout Layout.
      * @api stable
      */
-    class LineString extends geom.SimpleGeometry {
+    class LineString extends SimpleGeometry {
         /**
          * @classdesc
          * Linestring geometry.
@@ -4149,7 +4149,7 @@ export namespace geom {
          * @param opt_layout Layout.
          * @api stable
          */
-        constructor(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout);
+        constructor(coordinates: ol.Coordinate[], opt_layout?: GeometryLayout);
 
         /**
          * Append the passed coordinate to the coordinates of the linestring.
@@ -4163,7 +4163,7 @@ export namespace geom {
          * @return Clone.
          * @api stable
          */
-        clone(): ol.geom.LineString;
+        clone(): LineString;
 
         /**
          * Iterate over each segment, calling the provided callback.
@@ -4226,7 +4226,7 @@ export namespace geom {
          * @inheritDoc
          * @api stable
          */
-        getType(): ol.geom.GeometryType;
+        getType(): GeometryType;
 
         /**
          * @inheritDoc
@@ -4240,7 +4240,7 @@ export namespace geom {
          * @param opt_layout Layout.
          * @api stable
          */
-        setCoordinates(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout): void;
+        setCoordinates(coordinates: ol.Coordinate[], opt_layout?: GeometryLayout): void;
     }
 
     /**
@@ -4251,7 +4251,7 @@ export namespace geom {
      * @param opt_layout Layout.
      * @api stable
      */
-    class MultiLineString extends geom.SimpleGeometry {
+    class MultiLineString extends SimpleGeometry {
         /**
          * @classdesc
          * Multi-linestring geometry.
@@ -4260,21 +4260,21 @@ export namespace geom {
          * @param opt_layout Layout.
          * @api stable
          */
-        constructor(coordinates: ol.Coordinate[][], opt_layout?: ol.geom.GeometryLayout);
+        constructor(coordinates: ol.Coordinate[][], opt_layout?: GeometryLayout);
 
         /**
          * Append the passed linestring to the multilinestring.
          * @param lineString LineString.
          * @api stable
          */
-        appendLineString(lineString: ol.geom.LineString): void;
+        appendLineString(lineString: LineString): void;
 
         /**
          * Make a complete copy of the geometry.
          * @return Clone.
          * @api stable
          */
-        clone(): ol.geom.MultiLineString;
+        clone(): MultiLineString;
 
         /**
          * Returns the coordinate at `m` using linear interpolation, or `null` if no
@@ -4313,20 +4313,20 @@ export namespace geom {
          * @return LineString.
          * @api stable
          */
-        getLineString(index: number): ol.geom.LineString;
+        getLineString(index: number): LineString;
 
         /**
          * Return the linestrings of this multilinestring.
          * @return LineStrings.
          * @api stable
          */
-        getLineStrings(): ol.geom.LineString[];
+        getLineStrings(): LineString[];
 
         /**
          * @inheritDoc
          * @api stable
          */
-        getType(): ol.geom.GeometryType;
+        getType(): GeometryType;
 
         /**
          * @inheritDoc
@@ -4340,7 +4340,7 @@ export namespace geom {
          * @param opt_layout Layout.
          * @api stable
          */
-        setCoordinates(coordinates: ol.Coordinate[][], opt_layout?: ol.geom.GeometryLayout): void;
+        setCoordinates(coordinates: ol.Coordinate[][], opt_layout?: GeometryLayout): void;
     }
 
     /**
@@ -4351,7 +4351,7 @@ export namespace geom {
      * @param opt_layout Layout.
      * @api stable
      */
-    class MultiPoint extends geom.SimpleGeometry {
+    class MultiPoint extends SimpleGeometry {
         /**
          * @classdesc
          * Multi-point geometry.
@@ -4360,21 +4360,21 @@ export namespace geom {
          * @param opt_layout Layout.
          * @api stable
          */
-        constructor(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout);
+        constructor(coordinates: ol.Coordinate[], opt_layout?: GeometryLayout);
 
         /**
          * Append the passed point to this multipoint.
          * @param point Point.
          * @api stable
          */
-        appendPoint(point: ol.geom.Point): void;
+        appendPoint(point: Point): void;
 
         /**
          * Make a complete copy of the geometry.
          * @return Clone.
          * @api stable
          */
-        clone(): ol.geom.MultiPoint;
+        clone(): MultiPoint;
 
         /**
          * Return the coordinates of the multipoint.
@@ -4389,20 +4389,20 @@ export namespace geom {
          * @return Point.
          * @api stable
          */
-        getPoint(index: number): ol.geom.Point;
+        getPoint(index: number): Point;
 
         /**
          * Return the points of this multipoint.
          * @return Points.
          * @api stable
          */
-        getPoints(): ol.geom.Point[];
+        getPoints(): Point[];
 
         /**
          * @inheritDoc
          * @api stable
          */
-        getType(): ol.geom.GeometryType;
+        getType(): GeometryType;
 
         /**
          * @inheritDoc
@@ -4416,7 +4416,7 @@ export namespace geom {
          * @param opt_layout Layout.
          * @api stable
          */
-        setCoordinates(coordinates: ol.Coordinate[], opt_layout?: ol.geom.GeometryLayout): void;
+        setCoordinates(coordinates: ol.Coordinate[], opt_layout?: GeometryLayout): void;
     }
 
     /**
@@ -4427,7 +4427,7 @@ export namespace geom {
      * @param opt_layout Layout.
      * @api stable
      */
-    class MultiPolygon extends geom.SimpleGeometry {
+    class MultiPolygon extends SimpleGeometry {
         /**
          * @classdesc
          * Multi-polygon geometry.
@@ -4436,21 +4436,21 @@ export namespace geom {
          * @param opt_layout Layout.
          * @api stable
          */
-        constructor(coordinates: ol.Coordinate[][][], opt_layout?: ol.geom.GeometryLayout);
+        constructor(coordinates: ol.Coordinate[][][], opt_layout?: GeometryLayout);
 
         /**
          * Append the passed polygon to this multipolygon.
          * @param polygon Polygon.
          * @api stable
          */
-        appendPolygon(polygon: ol.geom.Polygon): void;
+        appendPolygon(polygon: Polygon): void;
 
         /**
          * Make a complete copy of the geometry.
          * @return Clone.
          * @api stable
          */
-        clone(): ol.geom.MultiPolygon;
+        clone(): MultiPolygon;
 
         /**
          * Return the area of the multipolygon on projected plane.
@@ -4475,11 +4475,11 @@ export namespace geom {
         getCoordinates(opt_right?: boolean): ol.Coordinate[][][];
 
         /**
-         * Return the interior points as {@link ol.geom.MultiPoint multipoint}.
+         * Return the interior points as {@link MultiPoint multipoint}.
          * @return Interior points.
          * @api stable
          */
-        getInteriorPoints(): ol.geom.MultiPoint;
+        getInteriorPoints(): MultiPoint;
 
         /**
          * Return the polygon at the specified index.
@@ -4487,20 +4487,20 @@ export namespace geom {
          * @return Polygon.
          * @api stable
          */
-        getPolygon(index: number): ol.geom.Polygon;
+        getPolygon(index: number): Polygon;
 
         /**
          * Return the polygons of this multipolygon.
          * @return Polygons.
          * @api stable
          */
-        getPolygons(): ol.geom.Polygon[];
+        getPolygons(): Polygon[];
 
         /**
          * @inheritDoc
          * @api stable
          */
-        getType(): ol.geom.GeometryType;
+        getType(): GeometryType;
 
         /**
          * @inheritDoc
@@ -4514,7 +4514,7 @@ export namespace geom {
          * @param opt_layout Layout.
          * @api stable
          */
-        setCoordinates(coordinates: ol.Coordinate[][][], opt_layout?: ol.geom.GeometryLayout): void;
+        setCoordinates(coordinates: ol.Coordinate[][][], opt_layout?: GeometryLayout): void;
     }
 
     /**
@@ -4525,7 +4525,7 @@ export namespace geom {
      * @param opt_layout Layout.
      * @api stable
      */
-    class Point extends geom.SimpleGeometry {
+    class Point extends SimpleGeometry {
         /**
          * @classdesc
          * Point geometry.
@@ -4534,14 +4534,14 @@ export namespace geom {
          * @param opt_layout Layout.
          * @api stable
          */
-        constructor(coordinates: ol.Coordinate, opt_layout?: ol.geom.GeometryLayout);
+        constructor(coordinates: ol.Coordinate, opt_layout?: GeometryLayout);
 
         /**
          * Make a complete copy of the geometry.
          * @return Clone.
          * @api stable
          */
-        clone(): ol.geom.Point;
+        clone(): Point;
 
         /**
          * Return the coordinate of the point.
@@ -4554,7 +4554,7 @@ export namespace geom {
          * @inheritDoc
          * @api stable
          */
-        getType(): ol.geom.GeometryType;
+        getType(): GeometryType;
 
         /**
          * @inheritDoc
@@ -4568,7 +4568,7 @@ export namespace geom {
          * @param opt_layout Layout.
          * @api stable
          */
-        setCoordinates(coordinates: ol.Coordinate, opt_layout?: ol.geom.GeometryLayout): void;
+        setCoordinates(coordinates: ol.Coordinate, opt_layout?: GeometryLayout): void;
     }
 
     /**
@@ -4579,7 +4579,7 @@ export namespace geom {
      * @param opt_layout Layout.
      * @api stable
      */
-    class Polygon extends geom.SimpleGeometry {
+    class Polygon extends SimpleGeometry {
         /**
          * @classdesc
          * Polygon geometry.
@@ -4588,21 +4588,21 @@ export namespace geom {
          * @param opt_layout Layout.
          * @api stable
          */
-        constructor(coordinates: ol.Coordinate[][], opt_layout?: ol.geom.GeometryLayout);
+        constructor(coordinates: ol.Coordinate[][], opt_layout?: GeometryLayout);
 
         /**
          * Append the passed linear ring to this polygon.
          * @param linearRing Linear ring.
          * @api stable
          */
-        appendLinearRing(linearRing: ol.geom.LinearRing): void;
+        appendLinearRing(linearRing: LinearRing): void;
 
         /**
          * Make a complete copy of the geometry.
          * @return Clone.
          * @api stable
          */
-        clone(): ol.geom.Polygon;
+        clone(): Polygon;
 
         /**
          * Return the area of the polygon on projected plane.
@@ -4631,7 +4631,7 @@ export namespace geom {
          * @return Interior point.
          * @api stable
          */
-        getInteriorPoint(): ol.geom.Point;
+        getInteriorPoint(): Point;
 
         /**
          * Return the number of rings of the polygon,  this includes the exterior
@@ -4652,20 +4652,20 @@ export namespace geom {
          * @return Linear ring.
          * @api stable
          */
-        getLinearRing(index: number): ol.geom.LinearRing;
+        getLinearRing(index: number): LinearRing;
 
         /**
          * Return the linear rings of the polygon.
          * @return Linear rings.
          * @api stable
          */
-        getLinearRings(): ol.geom.LinearRing[];
+        getLinearRings(): LinearRing[];
 
         /**
          * @inheritDoc
          * @api stable
          */
-        getType(): ol.geom.GeometryType;
+        getType(): GeometryType;
 
         /**
          * @inheritDoc
@@ -4679,7 +4679,7 @@ export namespace geom {
          * @param opt_layout Layout.
          * @api stable
          */
-        setCoordinates(coordinates: ol.Coordinate[][], opt_layout?: ol.geom.GeometryLayout): void;
+        setCoordinates(coordinates: ol.Coordinate[][], opt_layout?: GeometryLayout): void;
 
         /**
          * Create an approximation of a circle on the surface of a sphere.
@@ -4692,7 +4692,7 @@ export namespace geom {
          * @return The "circular" polygon.
          * @api stable
          */
-        static circular(sphere: ol.Sphere, center: ol.Coordinate, radius: number, opt_n?: number): ol.geom.Polygon;
+        static circular(sphere: ol.Sphere, center: ol.Coordinate, radius: number, opt_n?: number): Polygon;
 
         /**
          * Create a polygon from an extent. The layout used is `XY`.
@@ -4700,7 +4700,7 @@ export namespace geom {
          * @return The polygon.
          * @api
          */
-        static fromExtent(extent: ol.Extent): ol.geom.Polygon;
+        static fromExtent(extent: ol.Extent): Polygon;
 
         /**
          * Create a regular polygon from a circle.
@@ -4711,7 +4711,7 @@ export namespace geom {
          * @return Polygon geometry.
          * @api
          */
-        static fromCircle(circle: ol.geom.Circle, opt_sides?: number, opt_angle?: number): ol.geom.Polygon;
+        static fromCircle(circle: Circle, opt_sides?: number, opt_angle?: number): Polygon;
     }
 
     /**
@@ -4721,7 +4721,7 @@ export namespace geom {
      *
      * @api stable
      */
-    class SimpleGeometry extends geom.Geometry {
+    class SimpleGeometry extends Geometry {
         /**
          * @classdesc
          * Abstract base class; only used for creating subclasses; do not instantiate
@@ -4746,11 +4746,11 @@ export namespace geom {
         getLastCoordinate(): ol.Coordinate;
 
         /**
-         * Return the {@link ol.geom.GeometryLayout layout} of the geometry.
+         * Return the {@link GeometryLayout layout} of the geometry.
          * @return Layout.
          * @api stable
          */
-        getLayout(): ol.geom.GeometryLayout;
+        getLayout(): GeometryLayout;
 
         /**
          * @inheritDoc
@@ -4970,7 +4970,7 @@ export namespace interaction {
      * @param opt_options Options.
      * @api stable
      */
-    class DoubleClickZoom extends interaction.Interaction {
+    class DoubleClickZoom extends Interaction {
         /**
          * @classdesc
          * Allows the user to zoom by double-clicking on the map.
@@ -4998,7 +4998,7 @@ export namespace interaction {
      * @param opt_options Options.
      * @api stable
      */
-    class DragAndDrop extends interaction.Interaction {
+    class DragAndDrop extends Interaction {
         /**
          * @classdesc
          * Handles input of vector data by drag and drop.
@@ -5041,7 +5041,7 @@ export namespace interaction {
              * @param opt_features Features.
              * @param opt_projection Projection.
              */
-            constructor(type: ol.interaction.DragAndDropEventType, file: File, opt_features?: ol.Feature[], opt_projection?: ol.proj.Projection);
+            constructor(type: DragAndDropEventType, file: File, opt_features?: ol.Feature[], opt_projection?: ol.proj.Projection);
 
             /**
              * The features parsed from dropped data.
@@ -5080,7 +5080,7 @@ export namespace interaction {
      * @param opt_options Options.
      * @api stable
      */
-    class DragBox extends interaction.Pointer {
+    class DragBox extends Pointer {
         /**
          * @classdesc
          * Allows the user to draw a vector box by clicking and dragging on the map,
@@ -5152,7 +5152,7 @@ export namespace interaction {
      * @param opt_options Options.
      * @api stable
      */
-    class DragPan extends interaction.Pointer {
+    class DragPan extends Pointer {
         /**
          * @classdesc
          * Allows the user to pan the map by dragging the map.
@@ -5174,7 +5174,7 @@ export namespace interaction {
      * @param opt_options Options.
      * @api stable
      */
-    class DragRotate extends interaction.Pointer {
+    class DragRotate extends Pointer {
         /**
          * @classdesc
          * Allows the user to rotate the map by clicking and dragging on the map,
@@ -5202,7 +5202,7 @@ export namespace interaction {
      * @param opt_options Options.
      * @api stable
      */
-    class DragRotateAndZoom extends interaction.Pointer {
+    class DragRotateAndZoom extends Pointer {
         /**
          * @classdesc
          * Allows the user to zoom and rotate the map by clicking and dragging
@@ -5231,7 +5231,7 @@ export namespace interaction {
      * @param opt_options Options.
      * @api stable
      */
-    class DragZoom extends interaction.DragBox {
+    class DragZoom extends DragBox {
         /**
          * @classdesc
          * Allows the user to zoom the map by clicking and dragging on the map,
@@ -5265,7 +5265,7 @@ export namespace interaction {
              * @param type Type.
              * @param feature The feature drawn.
              */
-            constructor(type: ol.interaction.DrawEventType, feature: ol.Feature);
+            constructor(type: DrawEventType, feature: ol.Feature);
 
             /**
              * The feature being drawn.
@@ -5285,7 +5285,7 @@ export namespace interaction {
      * @param options Options.
      * @api stable
      */
-    class Draw extends interaction.Pointer {
+    class Draw extends Pointer {
         /**
          * @classdesc
          * Interaction for drawing feature geometries.
@@ -5367,7 +5367,7 @@ export namespace interaction {
      * interactions to be used with the ol.Map constructor's interactions option.
      * @api stable
      */
-    function defaults(opt_options?: olx.interaction.DefaultsOptions): ol.Collection<ol.interaction.Interaction>;
+    function defaults(opt_options?: olx.interaction.DefaultsOptions): ol.Collection<Interaction>;
 
     /**
      * @classdesc
@@ -5441,7 +5441,7 @@ export namespace interaction {
      * @param opt_options Options.
      * @api stable
      */
-    class KeyboardPan extends interaction.Interaction {
+    class KeyboardPan extends Interaction {
         /**
          * @classdesc
          * Allows the user to pan the map using keyboard arrows.
@@ -5485,7 +5485,7 @@ export namespace interaction {
      * @param opt_options Options.
      * @api stable
      */
-    class KeyboardZoom extends interaction.Interaction {
+    class KeyboardZoom extends Interaction {
         /**
          * @classdesc
          * Allows the user to zoom the map using keyboard + and -.
@@ -5560,7 +5560,7 @@ export namespace interaction {
      * @fires ol.interaction.ModifyEvent
      * @api
      */
-    class Modify extends interaction.Pointer {
+    class Modify extends Pointer {
         /**
          * @classdesc
          * Interaction for modifying feature geometries.
@@ -5586,7 +5586,7 @@ export namespace interaction {
      * @param opt_options Options.
      * @api stable
      */
-    class MouseWheelZoom extends interaction.Interaction {
+    class MouseWheelZoom extends Interaction {
         /**
          * @classdesc
          * Allows the user to zoom the map by scrolling the mouse wheel.
@@ -5622,7 +5622,7 @@ export namespace interaction {
      * @param opt_options Options.
      * @api stable
      */
-    class PinchRotate extends interaction.Pointer {
+    class PinchRotate extends Pointer {
         /**
          * @classdesc
          * Allows the user to rotate the map by twisting with two fingers
@@ -5642,7 +5642,7 @@ export namespace interaction {
      * @param opt_options Options.
      * @api stable
      */
-    class PinchZoom extends interaction.Pointer {
+    class PinchZoom extends Pointer {
         /**
          * @classdesc
          * Allows the user to zoom the map by pinching with two fingers
@@ -5667,7 +5667,7 @@ export namespace interaction {
      * @param opt_options Options.
      * @api
      */
-    class Pointer extends interaction.Interaction {
+    class Pointer extends Interaction {
         /**
          * @classdesc
          * Base class that calls user-defined functions on `down`, `move` and `up`
@@ -5756,7 +5756,7 @@ export namespace interaction {
      * @fires ol.interaction.SelectEvent
      * @api stable
      */
-    class Select extends interaction.Interaction {
+    class Select extends Interaction {
         /**
          * @classdesc
          * Interaction for selecting vector features. By default, selected features are
@@ -5831,7 +5831,7 @@ export namespace interaction {
      * @param opt_options Options.
      * @api
      */
-    class Snap extends interaction.Pointer {
+    class Snap extends Pointer {
         /**
          * @classdesc
          * Handles snapping of vector features while modifying or drawing them.  The
@@ -5893,7 +5893,7 @@ export namespace interaction {
              * @param features The features translated.
              * @param coordinate The event coordinate.
              */
-            constructor(type: ol.interaction.TranslateEventType, features: ol.Collection<ol.Feature>, coordinate: ol.Coordinate);
+            constructor(type: TranslateEventType, features: ol.Collection<ol.Feature>, coordinate: ol.Coordinate);
 
             /**
              * The features being translated.
@@ -5920,7 +5920,7 @@ export namespace interaction {
      * @param options Options.
      * @api
      */
-    class Translate extends interaction.Pointer {
+    class Translate extends Pointer {
         /**
          * @classdesc
          * Interaction for translating (moving) features.
@@ -6095,7 +6095,7 @@ export namespace layer {
      * @param opt_options Layer options.
      * @api stable
      */
-    class Group extends layer.Base {
+    class Group extends Base {
         /**
          * @classdesc
          * A {@link ol.Collection} of layers that are handled together.
@@ -6115,7 +6115,7 @@ export namespace layer {
          * @observable
          * @api stable
          */
-        getLayers(): ol.Collection<ol.layer.Base>;
+        getLayers(): ol.Collection<Base>;
 
         /**
          * Set the {@link ol.Collection collection} of {@link ol.layer.Layer layers}
@@ -6125,7 +6125,7 @@ export namespace layer {
          * @observable
          * @api stable
          */
-        setLayers(layers: ol.Collection<ol.layer.Base>): void;
+        setLayers(layers: ol.Collection<Base>): void;
     }
 
     /**
@@ -6139,7 +6139,7 @@ export namespace layer {
      * @param opt_options Options.
      * @api
      */
-    class Heatmap extends layer.Vector {
+    class Heatmap extends Vector {
         /**
          * @classdesc
          * Layer for rendering vector data as a heatmap.
@@ -6214,7 +6214,7 @@ export namespace layer {
      * @param opt_options Layer options.
      * @api stable
      */
-    class Image extends layer.Layer {
+    class Image extends Layer {
         /**
          * @classdesc
          * Server-rendered images that are available for arbitrary extents and
@@ -6249,7 +6249,7 @@ export namespace layer {
      * @param options Layer options.
      * @api stable
      */
-    class Layer extends layer.Base {
+    class Layer extends Base {
         /**
          * @classdesc
          * Abstract base class; normally only used for creating subclasses and not
@@ -6314,7 +6314,7 @@ export namespace layer {
      * @param opt_options Tile layer options.
      * @api stable
      */
-    class Tile extends layer.Layer {
+    class Tile extends Layer {
         /**
          * @classdesc
          * For layer sources that provide pre-rendered, tiled images in grids that are
@@ -6373,7 +6373,7 @@ export namespace layer {
      * @param opt_options Options.
      * @api stable
      */
-    class Vector extends layer.Layer {
+    class Vector extends Layer {
         /**
          * @classdesc
          * Vector data that is rendered client-side.
@@ -6446,7 +6446,7 @@ export namespace layer {
      * @param opt_options Options.
      * @api
      */
-    class VectorTile extends layer.Vector {
+    class VectorTile extends Vector {
         /**
          * @classdesc
          * Layer for vector tile data that is rendered client-side.
@@ -7630,7 +7630,7 @@ export namespace proj {
          * @return Units.
          * @api stable
          */
-        getUnits(): ol.proj.Units;
+        getUnits(): Units;
 
         /**
          * Get the amount of meters per unit of this projection.  If the projection is
@@ -7723,7 +7723,7 @@ export namespace proj {
      * @param projections Projections.
      * @api
      */
-    function addEquivalentProjections(projections: ol.proj.Projection[]): void;
+    function addEquivalentProjections(projections: Projection[]): void;
 
     /**
      * Add a Projection object to the list of supported projections that can be
@@ -7732,7 +7732,7 @@ export namespace proj {
      * @param projection Projection instance.
      * @api stable
      */
-    function addProjection(projection: ol.proj.Projection): void;
+    function addProjection(projection: Projection): void;
 
     /**
      * Registers coordinate transform functions to convert coordinates between the
@@ -7789,7 +7789,7 @@ export namespace proj {
      * @return Projection object, or null if not in list.
      * @api stable
      */
-    function get(projectionLike: ol.ProjectionLike): ol.proj.Projection;
+    function get(projectionLike: ol.ProjectionLike): Projection;
 
     /**
      * Checks if two projections are the same, that is every coordinate in one
@@ -7801,7 +7801,7 @@ export namespace proj {
      * @return Equivalent.
      * @api
      */
-    function equivalent(projection1: ol.proj.Projection, projection2: ol.proj.Projection): boolean;
+    function equivalent(projection1: Projection, projection2: Projection): boolean;
 
     /**
      * Given the projection-like objects, searches for a transformation
@@ -7854,7 +7854,7 @@ export namespace proj {
      * @return Point to find adjusted resolution at.
      */
     function getPointResolution(
-        projection: ol.proj.Projection,
+        projection: Projection,
         resolution: number,
         point: ol.Coordinate
     ): number;
@@ -7878,7 +7878,7 @@ export namespace render {
          * @param viewRotation View rotation.
          * @struct
          */
-        class Immediate extends render.VectorContext {
+        class Immediate extends VectorContext {
             /**
              * @classdesc
              * A concrete subclass of {@link ol.render.VectorContext} that implements
@@ -7922,7 +7922,7 @@ export namespace render {
              * @param geometry The geometry to render.
              * @api
              */
-            drawGeometry(geometry: (ol.geom.Geometry | ol.render.Feature)): void;
+            drawGeometry(geometry: (ol.geom.Geometry | Feature)): void;
 
             /**
              * Render a feature into the canvas.  Note that any `zIndex` on the provided
@@ -7953,13 +7953,13 @@ export namespace render {
          * @param opt_context Context.
          * @param opt_glContext WebGL Context.
          */
-        constructor(type: ol.render.EventType, opt_vectorContext?: ol.render.VectorContext, opt_frameState?: olx.FrameState, opt_context?: CanvasRenderingContext2D, opt_glContext?: any);
+        constructor(type: EventType, opt_vectorContext?: VectorContext, opt_frameState?: olx.FrameState, opt_context?: CanvasRenderingContext2D, opt_glContext?: any);
 
         /**
          * For canvas, this is an instance of {@link ol.render.canvas.Immediate}.
          * @api
          */
-        vectorContext: ol.render.VectorContext;
+        vectorContext: VectorContext;
 
         /**
          * An object representing the current render frame state.
@@ -8029,7 +8029,7 @@ export namespace render {
          * @return Feature.
          * @api
          */
-        getGeometry(): ol.render.Feature;
+        getGeometry(): Feature;
 
         /**
          * Get the feature properties.
@@ -8082,7 +8082,7 @@ export namespace render {
      * @return Canvas Immediate.
      * @api
      */
-    function toContext(context: CanvasRenderingContext2D, opt_options?: olx.render.ToContextOptions): ol.render.canvas.Immediate;
+    function toContext(context: CanvasRenderingContext2D, opt_options?: olx.render.ToContextOptions): canvas.Immediate;
 }
 
 /**
@@ -8103,7 +8103,7 @@ export namespace source {
      * @param options Bing Maps options.
      * @api stable
      */
-    class BingMaps extends source.TileImage {
+    class BingMaps extends TileImage {
         /**
          * @classdesc
          * Layer source for Bing Maps tile data.
@@ -8129,7 +8129,7 @@ export namespace source {
      * @param options CartoDB options.
      * @api
      */
-    class CartoDB extends source.XYZ {
+    class CartoDB extends XYZ {
         /**
          * @classdesc
          * Layer source for the CartoDB tiles.
@@ -8173,7 +8173,7 @@ export namespace source {
      * @param options Constructor options.
      * @api
      */
-    class Cluster extends source.Vector {
+    class Cluster extends Vector {
         /**
          * @classdesc
          * Layer source to cluster vector data. Works out of the box with point
@@ -8190,7 +8190,7 @@ export namespace source {
          * @return Source.
          * @api
          */
-        getSource(): ol.source.Vector;
+        getSource(): Vector;
 
         /**
          * Get the distance in pixels between clusters.
@@ -8216,7 +8216,7 @@ export namespace source {
      * @param options Single image source options.
      * @api
      */
-    class Image extends source.Source {
+    class Image extends Source {
         /**
          * @classdesc
          * Abstract base class; normally only used for creating subclasses and not
@@ -8268,7 +8268,7 @@ export namespace source {
      * @param opt_options Image ArcGIS Rest Options.
      * @api
      */
-    class ImageArcGISRest extends source.Image {
+    class ImageArcGISRest extends Image {
         /**
          * @classdesc
          * Source for data from ArcGIS Rest services providing single, untiled images.
@@ -8335,7 +8335,7 @@ export namespace source {
      * @param options Constructor options.
      * @api
      */
-    class ImageCanvas extends source.Image {
+    class ImageCanvas extends Image {
         /**
          * @classdesc
          * Base class for image sources where a canvas element is the image.
@@ -8354,7 +8354,7 @@ export namespace source {
      * @param options Options.
      * @api stable
      */
-    class ImageMapGuide extends source.Image {
+    class ImageMapGuide extends Image {
         /**
          * @classdesc
          * Source for images from Mapguide servers
@@ -8402,7 +8402,7 @@ export namespace source {
      * @param options Options.
      * @api stable
      */
-    class ImageStatic extends source.Image {
+    class ImageStatic extends Image {
         /**
          * @classdesc
          * A layer source for displaying a single, static image.
@@ -8428,7 +8428,7 @@ export namespace source {
      * @param options Options.
      * @api
      */
-    class ImageVector extends source.ImageCanvas {
+    class ImageVector extends ImageCanvas {
         /**
          * @classdesc
          * An image source whose images are canvas elements into which vector features
@@ -8451,7 +8451,7 @@ export namespace source {
          * @return Source.
          * @api
          */
-        getSource(): ol.source.Vector;
+        getSource(): Vector;
 
         /**
          * Get the style for features.  This returns whatever was passed to the `style`
@@ -8489,7 +8489,7 @@ export namespace source {
      * @param opt_options Options.
      * @api stable
      */
-    class ImageWMS extends source.Image {
+    class ImageWMS extends Image {
         /**
          * @classdesc
          * Source for WMS servers providing single, untiled images.
@@ -8567,7 +8567,7 @@ export namespace source {
      * @param opt_options Open Street Map options.
      * @api stable
      */
-    class OSM extends source.XYZ {
+    class OSM extends XYZ {
         /**
          * @classdesc
          * Layer source for the OpenStreetMap tile server.
@@ -8596,7 +8596,7 @@ export namespace source {
      * @param options Options.
      * @api
      */
-    class Raster extends source.Image {
+    class Raster extends Image {
         /**
          * @classdesc
          * A source that transforms data from any number of input sources using an array
@@ -8716,7 +8716,7 @@ export namespace source {
          * @return State.
          * @api
          */
-        getState(): ol.source.State;
+        getState(): State;
 
         /**
          * Refreshes the source and finally dispatches a 'change' event.
@@ -8741,7 +8741,7 @@ export namespace source {
      * @param options Stamen options.
      * @api stable
      */
-    class Stamen extends source.XYZ {
+    class Stamen extends XYZ {
         /**
          * @classdesc
          * Layer source for the Stamen tile server.
@@ -8761,7 +8761,7 @@ export namespace source {
      * @param options Tile source options.
      * @api
      */
-    class Tile extends source.Source {
+    class Tile extends Source {
         /**
          * @classdesc
          * Abstract base class; normally only used for creating subclasses and not
@@ -8819,7 +8819,7 @@ export namespace source {
      *     options.
      * @api
      */
-    class TileArcGISRest extends source.TileImage {
+    class TileArcGISRest extends TileImage {
         /**
          * @classdesc
          * Layer source for tile data from ArcGIS Rest services. Map and Image
@@ -8861,7 +8861,7 @@ export namespace source {
      * @param options Debug tile options.
      * @api
      */
-    class TileDebug extends source.Tile {
+    class TileDebug extends Tile {
         /**
          * @classdesc
          * A pseudo tile source, which does not fetch tiles from a server, but renders
@@ -8884,7 +8884,7 @@ export namespace source {
      * @param options Image tile options.
      * @api
      */
-    class TileImage extends source.UrlTile {
+    class TileImage extends UrlTile {
         /**
          * @classdesc
          * Base class for sources providing images divided into a tile grid.
@@ -8924,7 +8924,7 @@ export namespace source {
      * @param options TileJSON options.
      * @api stable
      */
-    class TileJSON extends source.TileImage {
+    class TileJSON extends TileImage {
         /**
          * @classdesc
          * Layer source for tile data in TileJSON format.
@@ -8948,7 +8948,7 @@ export namespace source {
      * @param options Source options.
      * @api
      */
-    class TileUTFGrid extends source.Tile {
+    class TileUTFGrid extends Tile {
         /**
          * @classdesc
          * Layer source for UTFGrid interaction data loaded from TileJSON format.
@@ -8988,7 +8988,7 @@ export namespace source {
      * @param opt_options Tile WMS options.
      * @api stable
      */
-    class TileWMS extends source.TileImage {
+    class TileWMS extends TileImage {
         /**
          * @classdesc
          * Layer source for tile data from WMS servers.
@@ -9037,7 +9037,7 @@ export namespace source {
      * @fires ol.source.TileEvent
      * @param options Image tile options.
      */
-    class UrlTile extends source.Tile {
+    class UrlTile extends Tile {
         /**
          * @classdesc
          * Base class for sources providing tiles divided into a tile grid over http.
@@ -9110,7 +9110,7 @@ export namespace source {
      * @param opt_options Vector source options.
      * @api stable
      */
-    class Vector extends source.Source {
+    class Vector extends Source {
         /**
          * @classdesc
          * Provides a source of features for vector layers. Vector features provided
@@ -9340,7 +9340,7 @@ export namespace source {
      * @param options Vector tile options.
      * @api
      */
-    class VectorTile extends source.UrlTile {
+    class VectorTile extends UrlTile {
         /**
          * @classdesc
          * Class for layer sources providing vector data divided into a tile grid, to be
@@ -9379,7 +9379,7 @@ export namespace source {
      * @param options WMTS options.
      * @api stable
      */
-    class WMTS extends source.TileImage {
+    class WMTS extends TileImage {
         /**
          * @classdesc
          * Layer source for tile data from WMTS servers.
@@ -9424,7 +9424,7 @@ export namespace source {
          * @return Request encoding.
          * @api
          */
-        getRequestEncoding(): ol.source.WMTSRequestEncoding;
+        getRequestEncoding(): WMTSRequestEncoding;
 
         /**
          * Return the style of the WMTS source.
@@ -9493,7 +9493,7 @@ export namespace source {
      * @param opt_options XYZ options.
      * @api stable
      */
-    class XYZ extends source.TileImage {
+    class XYZ extends TileImage {
         /**
          * @classdesc
          * Layer source for tile data with URLs in a set XYZ format that are
@@ -9524,7 +9524,7 @@ export namespace source {
      * @param opt_options Options.
      * @api stable
      */
-    class Zoomify extends source.TileImage {
+    class Zoomify extends TileImage {
         /**
          * @classdesc
          * Layer source for tile data in Zoomify format.
@@ -9764,7 +9764,7 @@ export namespace style {
      * @param opt_options Options.
      * @api
      */
-    class Circle extends style.Image {
+    class Circle extends Image {
         /**
          * @classdesc
          * Set circle style for vector features.
@@ -9779,7 +9779,7 @@ export namespace style {
          * @return Fill style.
          * @api
          */
-        getFill(): ol.style.Fill;
+        getFill(): Fill;
 
         /**
          * Get the image used to render the circle.
@@ -9801,7 +9801,7 @@ export namespace style {
          * @return Stroke style.
          * @api
          */
-        getStroke(): ol.style.Stroke;
+        getStroke(): Stroke;
 
         /**
          * Set the circle radius.
@@ -9862,7 +9862,7 @@ export namespace style {
      * @param opt_options Options.
      * @api
      */
-    class Icon extends style.Image {
+    class Icon extends Image {
         /**
          * @classdesc
          * Set icon style for vector features.
@@ -10005,7 +10005,7 @@ export namespace style {
      * @param options Options.
      * @api
      */
-    class RegularShape extends style.Image {
+    class RegularShape extends Image {
         /**
          * @classdesc
          * Set regular shape style for vector features. The resulting shape will be
@@ -10035,7 +10035,7 @@ export namespace style {
          * @return Fill style.
          * @api
          */
-        getFill(): ol.style.Fill;
+        getFill(): Fill;
 
         /**
          * @inheritDoc
@@ -10081,7 +10081,7 @@ export namespace style {
          * @return Stroke style.
          * @api
          */
-        getStroke(): ol.style.Stroke;
+        getStroke(): Stroke;
     }
 
     /**
@@ -10232,7 +10232,7 @@ export namespace style {
          * @return The cloned style.
          * @api
          */
-        clone(): ol.style.Style;
+        clone(): Style;
 
         /**
          * Get the geometry to be rendered.
@@ -10255,28 +10255,28 @@ export namespace style {
          * @return Fill style.
          * @api
          */
-        getFill(): ol.style.Fill;
+        getFill(): Fill;
 
         /**
          * Get the image style.
          * @return Image style.
          * @api
          */
-        getImage(): ol.style.Image;
+        getImage(): Image;
 
         /**
          * Get the stroke style.
          * @return Stroke style.
          * @api
          */
-        getStroke(): ol.style.Stroke;
+        getStroke(): Stroke;
 
         /**
          * Get the text style.
          * @return Text style.
          * @api
          */
-        getText(): ol.style.Text;
+        getText(): Text;
 
         /**
          * Get the z-index for the style.
@@ -10290,7 +10290,7 @@ export namespace style {
          * @param fill Fill style.
          * @api
          */
-        setFill(fill: ol.style.Fill): void;
+        setFill(fill: Fill): void;
 
         /**
          * Set a geometry that is rendered instead of the feature's geometry.
@@ -10307,21 +10307,21 @@ export namespace style {
          * @param image Image style.
          * @api
          */
-        setImage(image: ol.style.Image): void;
+        setImage(image: Image): void;
 
         /**
          * Set the stroke style.
          * @param stroke Stroke style.
          * @api
          */
-        setStroke(stroke: ol.style.Stroke): void;
+        setStroke(stroke: Stroke): void;
 
         /**
          * Set the text style.
          * @param text Text style.
          * @api
          */
-        setText(text: ol.style.Text): void;
+        setText(text: Text): void;
 
         /**
          * Set the z-index.
@@ -10375,7 +10375,7 @@ export namespace style {
          * @return Fill style.
          * @api
          */
-        getFill(): ol.style.Fill;
+        getFill(): Fill;
 
         /**
          * Determine whether the text rotates with the map.
@@ -10403,7 +10403,7 @@ export namespace style {
          * @return Stroke style.
          * @api
          */
-        getStroke(): ol.style.Stroke;
+        getStroke(): Stroke;
 
         /**
          * Get the text to be rendered.
@@ -10456,7 +10456,7 @@ export namespace style {
          * @param fill Fill style.
          * @api
          */
-        setFill(fill: ol.style.Fill): void;
+        setFill(fill: Fill): void;
 
         /**
          * Set the rotation.
@@ -10480,7 +10480,7 @@ export namespace style {
          * @param stroke Stroke style.
          * @api
          */
-        setStroke(stroke: ol.style.Stroke): void;
+        setStroke(stroke: Stroke): void;
 
         /**
          * Set the text.
@@ -10552,7 +10552,7 @@ export namespace tilegrid {
      * @return Tile grid instance.
      * @api
      */
-    function createXYZ(opt_options?: olx.tilegrid.XYZOptions): ol.tilegrid.TileGrid;
+    function createXYZ(opt_options?: olx.tilegrid.XYZOptions): TileGrid;
 
     /**
      * @classdesc
@@ -10684,7 +10684,7 @@ export namespace tilegrid {
      * @struct
      * @api
      */
-    class WMTS extends tilegrid.TileGrid {
+    class WMTS extends TileGrid {
         /**
          * @classdesc
          * Set the grid pattern for sources accessing WMTS tiled-image servers.
@@ -10711,7 +10711,7 @@ export namespace tilegrid {
          * @return WMTS tileGrid instance.
          * @api
          */
-        static createFromCapabilitiesMatrixSet(matrixSet: GlobalObject, opt_extent?: ol.Extent): ol.tilegrid.WMTS;
+        static createFromCapabilitiesMatrixSet(matrixSet: GlobalObject, opt_extent?: ol.Extent): WMTS;
     }
 }
 
@@ -11485,11 +11485,11 @@ export namespace olx {
 
         interface DefaultsOptions {
             attribution?: boolean;
-            attributionOptions?: olx.control.AttributionOptions;
+            attributionOptions?: AttributionOptions;
             rotate?: boolean;
-            rotateOptions?: olx.control.RotateOptions;
+            rotateOptions?: RotateOptions;
             zoom?: boolean;
-            zoomOptions?: olx.control.ZoomOptions;
+            zoomOptions?: ZoomOptions;
         }
 
         interface FullScreenOptions {
@@ -11669,7 +11669,7 @@ export namespace olx {
             srsName?: string;
             handle?: string;
             nativeElements: GlobalObject[];
-            gmlOptions?: olx.format.GMLOptions;
+            gmlOptions?: GMLOptions;
         }
 
         interface WKTOptions {
@@ -11926,7 +11926,7 @@ export namespace olx {
         type VectorRenderType = "image" | "vector";
 
         interface VectorOptions {
-            renderMode?: (olx.layer.VectorRenderType | string);
+            renderMode?: (VectorRenderType | string);
             renderOrder?: (feature1: ol.Feature, feature2: ol.Feature) => number;
             map?: ol.Map;
             extent?: ol.Extent;
@@ -12006,7 +12006,7 @@ export namespace olx {
             attributions?: ol.AttributionLike;
             cacheSize?: number;
             crossOrigin?: (string);
-            logo?: (string | olx.LogoOptions);
+            logo?: (string | LogoOptions);
             opaque?: boolean;
             projection: ol.ProjectionLike;
             reprojectionErrorThreshold?: number;
@@ -12026,7 +12026,7 @@ export namespace olx {
             attributions?: ol.AttributionLike;
             cacheSize?: number;
             format?: ol.format.Feature;
-            logo?: (string | olx.LogoOptions);
+            logo?: (string | LogoOptions);
             overlaps?: boolean;
             projection: ol.ProjectionLike;
             state?: ol.source.State;
@@ -12081,7 +12081,7 @@ export namespace olx {
         interface ImageArcGISRestOptions {
             attributions?: ol.Attribution[];
             crossOrigin?: (string);
-            logo?: (string | olx.LogoOptions);
+            logo?: (string | LogoOptions);
             imageLoadFunction?: ol.ImageLoadFunctionType;
             params?: { [k: string]: any };
             projection: ol.ProjectionLike;
@@ -12093,7 +12093,7 @@ export namespace olx {
         interface ImageCanvasOptions {
             attributions?: ol.AttributionLike;
             canvasFunction: ol.CanvasFunctionType;
-            logo?: (string | olx.LogoOptions);
+            logo?: (string | LogoOptions);
             projection: ol.ProjectionLike;
             ratio?: number;
             resolutions?: number[];
@@ -12102,7 +12102,7 @@ export namespace olx {
 
         interface ImageVectorOptions {
             attributions?: ol.AttributionLike;
-            logo?: (string | olx.LogoOptions);
+            logo?: (string | LogoOptions);
             projection: ol.ProjectionLike;
             ratio?: number;
             renderBuffer?: number;
@@ -12128,7 +12128,7 @@ export namespace olx {
             hidpi?: boolean;
             serverType?: (ol.source.wms.ServerType | string);
             imageLoadFunction?: ol.ImageLoadFunctionType;
-            logo?: (string | olx.LogoOptions);
+            logo?: (string | LogoOptions);
             params: { [k: string]: any };
             projection: ol.ProjectionLike;
             ratio?: number;
@@ -12152,7 +12152,7 @@ export namespace olx {
             crossOrigin?: (string);
             imageExtent: ol.Extent;
             imageLoadFunction?: ol.ImageLoadFunctionType;
-            logo?: (string | olx.LogoOptions);
+            logo?: (string | LogoOptions);
             projection: ol.ProjectionLike;
             imageSize?: ol.Size;
             url: string;
@@ -12163,7 +12163,7 @@ export namespace olx {
             cacheSize?: number;
             crossOrigin?: (string);
             params?: { [k: string]: any };
-            logo?: (string | olx.LogoOptions);
+            logo?: (string | LogoOptions);
             tileGrid?: ol.tilegrid.TileGrid;
             projection?: ol.ProjectionLike;
             reprojectionErrorThreshold?: number;
@@ -12193,7 +12193,7 @@ export namespace olx {
             crossOrigin?: (string);
             gutter?: number;
             hidpi?: boolean;
-            logo?: (string | olx.LogoOptions);
+            logo?: (string | LogoOptions);
             tileGrid?: ol.tilegrid.TileGrid;
             projection?: ol.ProjectionLike;
             reprojectionErrorThreshold?: number;
@@ -12210,7 +12210,7 @@ export namespace olx {
             features?: (ol.Feature[] | ol.Collection<ol.Feature>);
             format?: ol.format.Feature;
             loader?: ol.FeatureLoader;
-            logo?: (string | olx.LogoOptions);
+            logo?: (string | LogoOptions);
             overlaps?: boolean;
             strategy?: ol.LoadingStrategy;
             url?: (string | ol.FeatureUrlFunction);
@@ -12222,7 +12222,7 @@ export namespace olx {
             attributions?: ol.AttributionLike;
             cacheSize?: number;
             crossOrigin?: (string);
-            logo?: (string | olx.LogoOptions);
+            logo?: (string | LogoOptions);
             tileGrid: ol.tilegrid.WMTS;
             projection: ol.ProjectionLike;
             reprojectionErrorThreshold?: number;
@@ -12245,7 +12245,7 @@ export namespace olx {
             attributions?: ol.AttributionLike;
             cacheSize?: number;
             crossOrigin?: (string);
-            logo?: (string | olx.LogoOptions);
+            logo?: (string | LogoOptions);
             opaque?: boolean;
             projection?: ol.ProjectionLike;
             reprojectionErrorThreshold?: number;
@@ -12265,7 +12265,7 @@ export namespace olx {
             attributions?: ol.AttributionLike;
             cacheSize?: number;
             crossOrigin?: (string);
-            logo?: (string | olx.LogoOptions);
+            logo?: (string | LogoOptions);
             projection: ol.ProjectionLike;
             maxZoom?: number;
             minZoom?: number;
@@ -12279,7 +12279,7 @@ export namespace olx {
             attributions?: ol.AttributionLike;
             cacheSize?: number;
             crossOrigin?: (string);
-            logo?: (string | olx.LogoOptions);
+            logo?: (string | LogoOptions);
             reprojectionErrorThreshold?: number;
             url: string;
             tierSizeCalculation?: string;
@@ -12357,7 +12357,7 @@ export namespace olx {
             offsetX?: number;
             offsetY?: number;
             overflow?: boolean;
-            placement?: olx.style.TextPlacement;
+            placement?: TextPlacement;
             scale?: number;
             rotateWithView?: boolean;
             rotation?: number;
@@ -12464,7 +12464,7 @@ export namespace olx {
         layers?: (ol.layer.Base[] | ol.Collection<ol.layer.Base>);
         loadTilesWhileAnimating?: boolean;
         loadTilesWhileInteracting?: boolean;
-        logo?: (boolean | string | olx.LogoOptions | Element);
+        logo?: (boolean | string | LogoOptions | Element);
         overlays?: (ol.Collection<ol.Overlay> | ol.Overlay[]);
         renderer?: (ol.RendererType | Array<(ol.RendererType | string)> | string);
         target?: (Element | string);
@@ -12483,7 +12483,7 @@ export namespace olx {
         stopEvent?: boolean;
         insertFirst?: boolean;
         autoPan?: boolean;
-        autoPanAnimation?: olx.animation.PanOptions;
+        autoPanAnimation?: animation.PanOptions;
         autoPanMargin?: number;
     }
 
@@ -12511,7 +12511,7 @@ export namespace olx {
             maxZoom?: number;
             duration?: number;
             easing?: ((t: number) => number);
-            callback?: olx.animation.AnimateCallback;
+            callback?: animation.AnimateCallback;
         }
     }
 
@@ -12547,7 +12547,7 @@ export namespace olx {
     interface FrameState {
         pixelRatio: number;
         time: number;
-        viewState: olx.ViewState;
+        viewState: ViewState;
     }
 
     interface ViewState {
diff --git a/types/openlayers/tslint.json b/types/openlayers/tslint.json
index e2e8ba2c67..9dff676e08 100644
--- a/types/openlayers/tslint.json
+++ b/types/openlayers/tslint.json
@@ -1,7 +1,6 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "no-unnecessary-class": ["allow-constructor-only"],
-        "no-unnecessary-qualifier": false
+        "no-unnecessary-class": ["allow-constructor-only"]
     }
 }

From 9bac91e2c8c4d8adbc433064fc726472515fc1d2 Mon Sep 17 00:00:00 2001
From: Olivier Sechet <osechet@gmail.com>
Date: Sun, 11 Mar 2018 00:08:42 +0100
Subject: [PATCH 0568/1382] Ignore no-unnecessary-class lint

---
 types/openlayers/index.d.ts  | 6 ++++++
 types/openlayers/tslint.json | 5 +----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/types/openlayers/index.d.ts b/types/openlayers/index.d.ts
index 2326a2c3df..9c1ebe262f 100644
--- a/types/openlayers/index.d.ts
+++ b/types/openlayers/index.d.ts
@@ -1091,6 +1091,7 @@ export class DeviceOrientation extends Object {
 /**
  * Objects that need to clean up after themselves.
  */
+/* tslint:disable-next-line:no-unnecessary-class */
 export class Disposable {
     /**
      * Objects that need to clean up after themselves.
@@ -1915,6 +1916,7 @@ export namespace format {
      *
      * @api stable
      */
+    /* tslint:disable-next-line:no-unnecessary-class */
     class Feature {
         /**
          * @classdesc
@@ -3608,6 +3610,7 @@ export namespace format {
      *
      * @struct
      */
+    /* tslint:disable-next-line:no-unnecessary-class */
     class XML {
         /**
          * @classdesc
@@ -5944,6 +5947,7 @@ export namespace interaction {
  * @struct
  * @api
  */
+/* tslint:disable-next-line:no-unnecessary-class */
 export class Kinetic {
     /**
      * @classdesc
@@ -8052,6 +8056,7 @@ export namespace render {
      * @struct
      * @api
      */
+    /* tslint:disable-next-line:no-unnecessary-class */
     class VectorContext {
         /**
          * Context for drawing geometries.  A vector context is available on render
@@ -9737,6 +9742,7 @@ export namespace style {
      * @api
      * @param opt_options Options.
      */
+    /* tslint:disable-next-line:no-unnecessary-class */
     class AtlasManager {
         /**
          * Manages the creation of image atlases.
diff --git a/types/openlayers/tslint.json b/types/openlayers/tslint.json
index 9dff676e08..f93cf8562a 100644
--- a/types/openlayers/tslint.json
+++ b/types/openlayers/tslint.json
@@ -1,6 +1,3 @@
 {
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "no-unnecessary-class": ["allow-constructor-only"]
-    }
+    "extends": "dtslint/dt.json"
 }

From aebc0a180a7f34da6a82bfa544b46d42adacbabd Mon Sep 17 00:00:00 2001
From: Levi Thornton <lsthornt@gmail.com>
Date: Thu, 15 Mar 2018 17:06:32 -0700
Subject: [PATCH 0569/1382] Updates dataKey type to allow functions in Lines
 and Tooltips

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

diff --git a/types/recharts/index.d.ts b/types/recharts/index.d.ts
index 86673e2aaa..d1de1c2c46 100644
--- a/types/recharts/index.d.ts
+++ b/types/recharts/index.d.ts
@@ -401,7 +401,7 @@ export interface LineProps extends EventAttributes, Partial<PresentationAttribut
     left?: number;
     width?: number;
     height?: number;
-    dataKey: string | number; // As the source code states, dataKey will replace valueKey in 1.1.0 and it'll be required (it's already required in current implementation).
+    dataKey: DataKey; // As the source code states, dataKey will replace valueKey in 1.1.0 and it'll be required (it's already required in current implementation).
     label?: boolean | object | React.ReactElement<any> | LabelProps['content'];
     points?: Point[];
 }
@@ -782,7 +782,7 @@ export interface TooltipPayload {
     unit?: string;
     color?: string;
     fill?: string;
-    dataKey?: string;
+    dataKey?: DataKey;
     formatter?: TooltipFormatter;
 }
 

From a82c070b7e48d432588658b5e8821e54f139fcd3 Mon Sep 17 00:00:00 2001
From: ckboyjiy <ckboyjiy@nate.com>
Date: Fri, 16 Mar 2018 10:47:17 +0900
Subject: [PATCH 0570/1382] Added type definitions for Naver maps #
 Modification by reviewer's request

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

diff --git a/navermaps/index.d.ts b/navermaps/index.d.ts
index a367238bf1..994c7218ff 100644
--- a/navermaps/index.d.ts
+++ b/navermaps/index.d.ts
@@ -1,6 +1,5 @@
-// Definitions by: Ckboyjiy <https://github.com/ckboyjiy>
 // Type definitions for Naver Maps JavaScript API 3.0
-// Project: https://navermaps.github.io
+// Project: https://navermaps.github.io/maps.js
 // Definitions by: Ckboyjiy <https://github.com/ckboyjiy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 declare namespace naver.maps {

From a64a94ef7839ce253b4e46db414a58d8e112580e Mon Sep 17 00:00:00 2001
From: karak <karak97@gmail.com>
Date: Fri, 16 Mar 2018 14:24:48 +0900
Subject: [PATCH 0571/1382] [riot-route] Created type definitions of
 "riot-route".

---
 types/riot-route/index.d.ts          | 93 ++++++++++++++++++++++++++++
 types/riot-route/riot-route-tests.ts | 73 ++++++++++++++++++++++
 types/riot-route/tsconfig.json       | 24 +++++++
 types/riot-route/tslint.json         |  3 +
 4 files changed, 193 insertions(+)
 create mode 100644 types/riot-route/index.d.ts
 create mode 100644 types/riot-route/riot-route-tests.ts
 create mode 100644 types/riot-route/tsconfig.json
 create mode 100644 types/riot-route/tslint.json

diff --git a/types/riot-route/index.d.ts b/types/riot-route/index.d.ts
new file mode 100644
index 0000000000..fa1127e600
--- /dev/null
+++ b/types/riot-route/index.d.ts
@@ -0,0 +1,93 @@
+// Type definitions for riot-route
+// Project: https://github.com/riot/route
+// Definitions by: karak <https://github.com/karak>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+declare module 'riot-route' {
+    interface RiotRoute {
+        /**
+         * Execute the given callback when the URL changes.
+         */
+        (callback: (...params: string[]) => void): void;
+
+        /**
+         * Execute the given callback when the URL changes and it match the filter.
+         * @since v2.3
+         */
+        (filter: string, callback: (...params: string[]) => void): void;
+
+        /**
+         * Returns a new routing context.
+         * @since v2.3
+         */
+        create(): RiotSubRoute;
+
+        /**
+         * Changes the browser URL and notifies all the listeners assigned with `route(callback)`.
+         */
+        (to: string, title?: string, shouldReplace?: boolean): void;
+
+        /**
+         * Start listening the url changes.
+         */
+        start(): void;
+
+        /**
+         * Start listening the url changes and also exec routing on the current url.
+         */
+        start(autoStart: boolean): void;
+
+        /**
+         * Stop all the routings. It'll removes the listeners and clear also the callbacks.
+         */
+        stop(): void;
+
+        /**
+         * Study the current browser path "in place" and emit routing without waiting for it to change.
+         */
+        exec(): void;
+
+        /**
+         * This is an utility function to extract the query from the url.
+         * @since v2.3
+         */
+        query(): { [name: string]: string; };
+
+        /**
+        * Change the base path.
+        *
+        * @param arg - a new base or '#' or '#!'
+        */
+        base(arg?: string|RegExp): void;
+
+        /**
+         * Changes the default parser to a custom one.
+         * @param parser
+         * @param secondParser
+         */
+        parser<T>(
+          parser: (path: string) => T[],
+          secondParser?: (path: string, filter: string) => string[] | undefined
+        ): void;
+    }
+
+    interface RiotSubRoute extends RiotRoute {
+        /**
+         * Stop only subRoute's routings. It'll removes the listeners and clear also the callbacks.
+         *
+         * @since v2.3
+         */
+        stop(): void;
+    }
+
+    const route: RiotRoute;
+
+    export default route;
+}
+
+declare module 'riot-route/lib/tag' {
+    import route from 'riot-route';
+
+    export default route;
+}
diff --git a/types/riot-route/riot-route-tests.ts b/types/riot-route/riot-route-tests.ts
new file mode 100644
index 0000000000..19d9f59386
--- /dev/null
+++ b/types/riot-route/riot-route-tests.ts
@@ -0,0 +1,73 @@
+import { default as route } from 'riot-route';
+import routeFromTag from 'riot-route/lib/tag';
+
+/* () */
+route(function(collection, id, action) {
+
+});
+
+route('/fruit', function(name) {
+    console.log('The list of fruits')
+});
+
+/* create() */
+var subRoute = route.create();
+subRoute('/fruit/apple', function() { /* */ });
+
+/* () */
+route('customers/267393/edit');
+route('customers/267393/edit', 'Editing customer page');
+route('not-found', 'Not found', true);
+
+/* start() */
+route.start();
+route.start(true);
+
+/* stop() */
+route.stop();
+
+/* exec() */
+route.exec();
+
+/* query() */
+route('/search..', function() {
+    var q = route.query()
+    console.log('Search keyword: ' + q.keyword)
+    console.log('Search limit: ' + q.limit)
+});
+
+/* base() */
+route.base('/app');
+route.base('#!');
+route.base(); //reset
+
+/* parser() */
+route.parser(function(path) {
+    var raw = path.slice(2).split('?'),
+        uri = raw[0].split('/') as (string | { [name: string]: string })[],
+        qs = raw[1],
+        params = {} as { [name: string]: string };
+
+    if (qs) {
+        qs.split('&').forEach(function(v) {
+            var c = v.split('=');
+            params[c[0]] = c[1];
+        })
+    }
+    uri.push(params);
+    return uri
+});
+
+(function () {
+    function first(path: string) {
+        return[];
+    }
+
+    function second(path: string, filter: string) {
+        let args: RegExpMatchArray | null;
+        var re = new RegExp('^' + filter.replace(/\*/g, '([^/?#]+?)').replace(/\.\./, '.*') + '$')
+        if (args = path.match(re)) return args.slice(1)
+    }
+
+    route.parser(first, second)
+})();
diff --git a/types/riot-route/tsconfig.json b/types/riot-route/tsconfig.json
new file mode 100644
index 0000000000..b9307bfcbb
--- /dev/null
+++ b/types/riot-route/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "es6",
+        "allowSyntheticDefaultImports": true,
+        "esModuleInterop": true,
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strict": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "riot-route-tests.ts"
+    ]
+}
diff --git a/types/riot-route/tslint.json b/types/riot-route/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/riot-route/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}

From d17063ea8dd3766d6788062530ad2bcfced67eb4 Mon Sep 17 00:00:00 2001
From: karak <karak97@gmail.com>
Date: Fri, 16 Mar 2018 14:41:46 +0900
Subject: [PATCH 0572/1382] [riot-route] Modified tsconfig.json subsequent to
 dtslint.

---
 types/riot-route/tsconfig.json | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/types/riot-route/tsconfig.json b/types/riot-route/tsconfig.json
index b9307bfcbb..919f11b1a6 100644
--- a/types/riot-route/tsconfig.json
+++ b/types/riot-route/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "compilerOptions": {
-        "module": "es6",
+        "module": "commonjs",
         "allowSyntheticDefaultImports": true,
         "esModuleInterop": true,
         "lib": [
@@ -9,7 +9,9 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strict": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "forceConsistentCasingInFileNames": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"

From 1e7aa1d80ba62781fb53f963d4f60fbdb97c81d4 Mon Sep 17 00:00:00 2001
From: karak <karak97@gmail.com>
Date: Fri, 16 Mar 2018 14:57:02 +0900
Subject: [PATCH 0573/1382] [riot-route] Fixed errors by dtslint.

---
 types/riot-route/index.d.ts          | 90 +---------------------------
 types/riot-route/lib/index.d.ts      | 79 ++++++++++++++++++++++++
 types/riot-route/lib/tag.d.ts        |  3 +
 types/riot-route/riot-route-tests.ts | 55 ++++++++---------
 4 files changed, 113 insertions(+), 114 deletions(-)
 create mode 100644 types/riot-route/lib/index.d.ts
 create mode 100644 types/riot-route/lib/tag.d.ts

diff --git a/types/riot-route/index.d.ts b/types/riot-route/index.d.ts
index fa1127e600..453bb185fa 100644
--- a/types/riot-route/index.d.ts
+++ b/types/riot-route/index.d.ts
@@ -1,93 +1,9 @@
-// Type definitions for riot-route
+// Type definitions for riot-route 3.1
 // Project: https://github.com/riot/route
 // Definitions by: karak <https://github.com/karak>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-declare module 'riot-route' {
-    interface RiotRoute {
-        /**
-         * Execute the given callback when the URL changes.
-         */
-        (callback: (...params: string[]) => void): void;
+import route from './lib/index';
 
-        /**
-         * Execute the given callback when the URL changes and it match the filter.
-         * @since v2.3
-         */
-        (filter: string, callback: (...params: string[]) => void): void;
-
-        /**
-         * Returns a new routing context.
-         * @since v2.3
-         */
-        create(): RiotSubRoute;
-
-        /**
-         * Changes the browser URL and notifies all the listeners assigned with `route(callback)`.
-         */
-        (to: string, title?: string, shouldReplace?: boolean): void;
-
-        /**
-         * Start listening the url changes.
-         */
-        start(): void;
-
-        /**
-         * Start listening the url changes and also exec routing on the current url.
-         */
-        start(autoStart: boolean): void;
-
-        /**
-         * Stop all the routings. It'll removes the listeners and clear also the callbacks.
-         */
-        stop(): void;
-
-        /**
-         * Study the current browser path "in place" and emit routing without waiting for it to change.
-         */
-        exec(): void;
-
-        /**
-         * This is an utility function to extract the query from the url.
-         * @since v2.3
-         */
-        query(): { [name: string]: string; };
-
-        /**
-        * Change the base path.
-        *
-        * @param arg - a new base or '#' or '#!'
-        */
-        base(arg?: string|RegExp): void;
-
-        /**
-         * Changes the default parser to a custom one.
-         * @param parser
-         * @param secondParser
-         */
-        parser<T>(
-          parser: (path: string) => T[],
-          secondParser?: (path: string, filter: string) => string[] | undefined
-        ): void;
-    }
-
-    interface RiotSubRoute extends RiotRoute {
-        /**
-         * Stop only subRoute's routings. It'll removes the listeners and clear also the callbacks.
-         *
-         * @since v2.3
-         */
-        stop(): void;
-    }
-
-    const route: RiotRoute;
-
-    export default route;
-}
-
-declare module 'riot-route/lib/tag' {
-    import route from 'riot-route';
-
-    export default route;
-}
+export default route;
diff --git a/types/riot-route/lib/index.d.ts b/types/riot-route/lib/index.d.ts
new file mode 100644
index 0000000000..cf3bea4c40
--- /dev/null
+++ b/types/riot-route/lib/index.d.ts
@@ -0,0 +1,79 @@
+interface RiotRoute {
+    /**
+     * Execute the given callback when the URL changes.
+     */
+    (callback: (...params: string[]) => void): void;
+
+    /**
+     * Execute the given callback when the URL changes and it match the filter.
+     * @since v2.3
+     */
+    (filter: string, callback: (...params: string[]) => void): void;
+
+    /**
+     * Changes the browser URL and notifies all the listeners assigned with `route(callback)`.
+     */
+    (to: string, title?: string, shouldReplace?: boolean): void;
+
+    /**
+     * Returns a new routing context.
+     * @since v2.3
+     */
+    create(): RiotSubRoute;
+
+    /**
+     * Start listening the url changes.
+     */
+    start(): void;
+
+    /**
+     * Start listening the url changes and also exec routing on the current url.
+     */
+    start(autoStart: boolean): void;
+
+    /**
+     * Stop all the routings. It'll removes the listeners and clear also the callbacks.
+     */
+    stop(): void;
+
+    /**
+     * Study the current browser path "in place" and emit routing without waiting for it to change.
+     */
+    exec(): void;
+
+    /**
+     * This is an utility function to extract the query from the url.
+     * @since v2.3
+     */
+    query(): { [name: string]: string; };
+
+    /**
+     * Change the base path.
+     *
+     * @param arg - a new base or '#' or '#!'
+     */
+    base(arg?: string|RegExp): void;
+
+    /**
+     * Changes the default parser to a custom one.
+     * @param parser
+     * @param secondParser
+     */
+    parser<T>(
+        parser: (path: string) => T[],
+        secondParser?: (path: string, filter: string) => string[] | undefined
+    ): void;
+}
+
+interface RiotSubRoute extends RiotRoute {
+    /**
+     * Stop only subRoute's routings. It'll removes the listeners and clear also the callbacks.
+     *
+     * @since v2.3
+     */
+    stop(): void;
+}
+
+declare const route: RiotRoute;
+
+export default route;
diff --git a/types/riot-route/lib/tag.d.ts b/types/riot-route/lib/tag.d.ts
new file mode 100644
index 0000000000..15c5d884fa
--- /dev/null
+++ b/types/riot-route/lib/tag.d.ts
@@ -0,0 +1,3 @@
+import route from './index';
+
+export default route;
diff --git a/types/riot-route/riot-route-tests.ts b/types/riot-route/riot-route-tests.ts
index 19d9f59386..fab6a2b0df 100644
--- a/types/riot-route/riot-route-tests.ts
+++ b/types/riot-route/riot-route-tests.ts
@@ -2,17 +2,16 @@ import { default as route } from 'riot-route';
 import routeFromTag from 'riot-route/lib/tag';
 
 /* () */
-route(function(collection, id, action) {
-
+route((collection, id, action) => {
 });
 
-route('/fruit', function(name) {
-    console.log('The list of fruits')
+route('/fruit', (name) => {
+    console.log('The list of fruits');
 });
 
 /* create() */
-var subRoute = route.create();
-subRoute('/fruit/apple', function() { /* */ });
+const subRoute = route.create();
+subRoute('/fruit/apple', () => { /* */ });
 
 /* () */
 route('customers/267393/edit');
@@ -30,44 +29,46 @@ route.stop();
 route.exec();
 
 /* query() */
-route('/search..', function() {
-    var q = route.query()
-    console.log('Search keyword: ' + q.keyword)
-    console.log('Search limit: ' + q.limit)
+route('/search..', () => {
+    const q = route.query();
+    console.log('Search keyword: ' + q.keyword);
+    console.log('Search limit: ' + q.limit);
 });
 
 /* base() */
 route.base('/app');
 route.base('#!');
-route.base(); //reset
+route.base(); // reset
 
 /* parser() */
-route.parser(function(path) {
-    var raw = path.slice(2).split('?'),
-        uri = raw[0].split('/') as (string | { [name: string]: string })[],
-        qs = raw[1],
-        params = {} as { [name: string]: string };
+route.parser((path) => {
+    const raw = path.slice(2).split('?');
+    const uri = raw[0].split('/') as Array<string | { [name: string]: string }>;
+    const qs = raw[1];
+    const params: { [name: string]: string } = {};
 
     if (qs) {
-        qs.split('&').forEach(function(v) {
-            var c = v.split('=');
+        qs.split('&').forEach((v) => {
+            const c = v.split('=');
             params[c[0]] = c[1];
-        })
+        });
     }
     uri.push(params);
-    return uri
+    return uri;
 });
 
-(function () {
-    function first(path: string) {
-        return[];
+(() => {
+    function first(path: string): any[] {
+        return [];
     }
 
     function second(path: string, filter: string) {
-        let args: RegExpMatchArray | null;
-        var re = new RegExp('^' + filter.replace(/\*/g, '([^/?#]+?)').replace(/\.\./, '.*') + '$')
-        if (args = path.match(re)) return args.slice(1)
+        const re = new RegExp(`^${filter.replace(/\*/g, '([^/?#]+?)').replace(/\.\./, '.*')}$`);
+        const args = path.match(re);
+        if (args) {
+            return args.slice(1);
+        }
     }
 
-    route.parser(first, second)
+    route.parser(first, second);
 })();

From 724d30528d05e08fb39cc8124c61ac388cb5a507 Mon Sep 17 00:00:00 2001
From: "yu.zhang" <yu.zhang@chaitin.com>
Date: Fri, 16 Mar 2018 13:57:52 +0800
Subject: [PATCH 0574/1382] update parent type for GridCellRangeProps

---
 types/react-virtualized/dist/es/Grid.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/react-virtualized/dist/es/Grid.d.ts b/types/react-virtualized/dist/es/Grid.d.ts
index 630e64df69..1cc1623a04 100644
--- a/types/react-virtualized/dist/es/Grid.d.ts
+++ b/types/react-virtualized/dist/es/Grid.d.ts
@@ -129,7 +129,7 @@ export type GridCellRangeProps = {
     scrollTop: number,
     deferredMeasurementCache: CellMeasurerCache,
     horizontalOffsetAdjustment: number,
-    parent: Grid | List | Table,
+    parent: typeof Grid | typeof List | typeof Table,
     styleCache: Map<React.CSSProperties>,
     verticalOffsetAdjustment: number,
     visibleColumnIndices: VisibleCellRange,

From 3dd0180b621e31969d3ecf46f4f184663b3875a3 Mon Sep 17 00:00:00 2001
From: karak <karak97@gmail.com>
Date: Fri, 16 Mar 2018 15:07:27 +0900
Subject: [PATCH 0575/1382] [riot-route] Added new files separated.

---
 types/riot-route/tsconfig.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/types/riot-route/tsconfig.json b/types/riot-route/tsconfig.json
index 919f11b1a6..161e5b28d7 100644
--- a/types/riot-route/tsconfig.json
+++ b/types/riot-route/tsconfig.json
@@ -21,6 +21,8 @@
     },
     "files": [
         "index.d.ts",
+        "lib/index.d.ts",
+        "lib/tag.d.ts",
         "riot-route-tests.ts"
     ]
 }

From f9b690e45ab61f2bb72444ef9094652783a4d2c5 Mon Sep 17 00:00:00 2001
From: karak <karak97@gmail.com>
Date: Fri, 16 Mar 2018 15:21:25 +0900
Subject: [PATCH 0576/1382] [riot-route] Fixed errors again.

---
 types/riot-route/lib/index.d.ts | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/types/riot-route/lib/index.d.ts b/types/riot-route/lib/index.d.ts
index cf3bea4c40..d824e0a643 100644
--- a/types/riot-route/lib/index.d.ts
+++ b/types/riot-route/lib/index.d.ts
@@ -22,14 +22,10 @@ interface RiotRoute {
     create(): RiotSubRoute;
 
     /**
-     * Start listening the url changes.
+     * Start listening the url changes
+     * and also exec routing on the current url.
      */
-    start(): void;
-
-    /**
-     * Start listening the url changes and also exec routing on the current url.
-     */
-    start(autoStart: boolean): void;
+    start(autoStart?: boolean): void;
 
     /**
      * Stop all the routings. It'll removes the listeners and clear also the callbacks.
@@ -59,8 +55,8 @@ interface RiotRoute {
      * @param parser
      * @param secondParser
      */
-    parser<T>(
-        parser: (path: string) => T[],
+    parser(
+        parser: (path: string) => any[],
         secondParser?: (path: string, filter: string) => string[] | undefined
     ): void;
 }

From 07098e8640e36f41b2fcda505423f5806c6000f6 Mon Sep 17 00:00:00 2001
From: Peter Tribe <ptribe@pnimedia.com>
Date: Thu, 15 Mar 2018 23:23:30 -0700
Subject: [PATCH 0577/1382] Fixed: added VRFrameData declare so you can now do
 the required 'new VRFrameData()'

---
 types/webvr-api/index.d.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/types/webvr-api/index.d.ts b/types/webvr-api/index.d.ts
index afebeda0a9..72fea2097b 100644
--- a/types/webvr-api/index.d.ts
+++ b/types/webvr-api/index.d.ts
@@ -162,6 +162,11 @@ interface VRFrameData {
     readonly timestamp: number;
 }
 
+declare var VRFrameData: {
+    prototype: VRFrameData
+    new(): VRFrameData
+}
+
 interface VRPose {
     readonly angularAcceleration: Float32Array | null;
     readonly angularVelocity: Float32Array | null;

From 9b3504c9033c7fdf963d6fa9f44e05e28677f864 Mon Sep 17 00:00:00 2001
From: Atanas Atanasov <atanas.nk.atanasov@gmail.com>
Date: Fri, 16 Mar 2018 09:11:35 +0200
Subject: [PATCH 0578/1382] improved the type definitions for 1.8.2 by chaging
 some params to optional

---
 types/gijgo/index.d.ts | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/types/gijgo/index.d.ts b/types/gijgo/index.d.ts
index c91ea22689..188d8753b1 100644
--- a/types/gijgo/index.d.ts
+++ b/types/gijgo/index.d.ts
@@ -8,8 +8,6 @@ declare module 'gijgo' {
     export = Types;
 }
 
-declare const dp: Types.DatePicker;
-
 declare module Types {
 
     //Grid
@@ -157,8 +155,8 @@ declare module Types {
         count(): number;
         destroy(keepTableTag?: boolean, keepWrapperTag?: boolean): void;
         downloadCSV(filename?: string, includeAllRecords?: boolean): Grid<Entity, Params>;
-        edit(id: string): Grid<Entity, Params>; 
-        expandAll(): Grid<Entity, Params>; 
+        edit(id: string): Grid<Entity, Params>;
+        expandAll(): Grid<Entity, Params>;
         //get(position: number): Entity; //TODO: rename to getByPosition to avoid conflicts with jquery.get
         getAll(): Array<Entity>;
         getById(id: string): Entity;
@@ -312,7 +310,7 @@ declare module Types {
     }
 
     interface Editor extends JQuery {
-        content(html: string):  string | Editor;
+        content(html?: string):  string | Editor;
         destroy(): void;
     }
 
@@ -338,7 +336,7 @@ declare module Types {
         close(): TimePicker;
         destroy(): void;
         open(): TimePicker;
-        value(value: string):  string | TimePicker;
+        value(value?: string):  string | TimePicker;
     }
 
     // Tree
@@ -374,7 +372,7 @@ declare module Types {
         checkedField?: string;
         cascadeCheck?: boolean;
         dragAndDrop?: boolean;
-        paramNames: TreeParamNames;
+        paramNames?: TreeParamNames;
         lazyLoading?: boolean;
 
 
@@ -414,9 +412,9 @@ declare module Types {
         selectAll() : Tree;
         unselectAll() : Tree;
         getSelections() : Array<string>;
-        getChildren(node: any, cascade: boolean) : Array<any>;
-        enable(node: any, cascade: boolean) : Tree;
-        disable(node: any, cascade: boolean) : Tree;
+        getChildren(node: any, cascade?: boolean) : Array<any>;
+        enable(node: any, cascade?: boolean) : Tree;
+        disable(node: any, cascade?: boolean) : Tree;
         enableAll() : Tree;
         disableAll() : Tree;
 

From a807455d599b471a20adbadec4b806f8508a39ab Mon Sep 17 00:00:00 2001
From: karak <karak97@gmail.com>
Date: Fri, 16 Mar 2018 16:55:20 +0900
Subject: [PATCH 0579/1382] [riot-route] Regenereate configs.

---
 types/riot-route/tsconfig.json | 7 +++----
 types/riot-route/tslint.json   | 4 +---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/types/riot-route/tsconfig.json b/types/riot-route/tsconfig.json
index 161e5b28d7..cc6b807db4 100644
--- a/types/riot-route/tsconfig.json
+++ b/types/riot-route/tsconfig.json
@@ -1,7 +1,6 @@
 {
     "compilerOptions": {
         "module": "commonjs",
-        "allowSyntheticDefaultImports": true,
         "esModuleInterop": true,
         "lib": [
             "es6",
@@ -9,15 +8,15 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
-        "forceConsistentCasingInFileNames": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
         ],
         "types": [],
-        "noEmit": true
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
     },
     "files": [
         "index.d.ts",
diff --git a/types/riot-route/tslint.json b/types/riot-route/tslint.json
index f93cf8562a..3db14f85ea 100644
--- a/types/riot-route/tslint.json
+++ b/types/riot-route/tslint.json
@@ -1,3 +1 @@
-{
-    "extends": "dtslint/dt.json"
-}
+{ "extends": "dtslint/dt.json" }

From 2e06710aab17d7d134749fbb94289d858d6705bb Mon Sep 17 00:00:00 2001
From: GlenCFL <glencfl@gmail.com>
Date: Thu, 15 Mar 2018 21:32:06 -0400
Subject: [PATCH 0580/1382] atom: add support for v1.25.

---
 types/atom/atom-tests.ts |  33 ++++--
 types/atom/index.d.ts    | 212 +++++++++++++++++++++++++++++++--------
 2 files changed, 196 insertions(+), 49 deletions(-)

diff --git a/types/atom/atom-tests.ts b/types/atom/atom-tests.ts
index cefa92ef5c..f21fab1114 100644
--- a/types/atom/atom-tests.ts
+++ b/types/atom/atom-tests.ts
@@ -43,7 +43,7 @@ declare let marker: Atom.Marker;
 declare let markers: Atom.Marker[];
 declare let markerLayer: Atom.MarkerLayer;
 declare let notification: Atom.Notification;
-declare let notifications: Atom.Notification[];
+declare let notifications: ReadonlyArray<Atom.Notification>;
 declare let pack: Atom.Package;
 declare let packs: Atom.Package[];
 declare let pane: Atom.Pane;
@@ -56,10 +56,12 @@ declare let posArr: Atom.Point[];
 declare let project: Atom.Project;
 declare let range: Atom.Range;
 declare let ranges: Atom.Range[];
+declare let readonlyStrs: ReadonlyArray<string>;
 declare let registry: Atom.GrammarRegistry;
 declare let repository: Atom.GitRepository;
 declare let repositories: Atom.GitRepository[];
 declare let scopeDescriptor: Atom.ScopeDescriptor;
+declare let scopes: ReadonlyArray<string>;
 declare let selection: Atom.Selection;
 declare let selections: Atom.Selection[];
 declare let styleManager: Atom.StyleManager;
@@ -188,6 +190,10 @@ function testAtomEnvironment() {
     // Messaging the User
     atom.beep();
 
+    atom.confirm({ defaultId: 42 }, (response, checked) => {
+        num = response;
+        bool = checked;
+    });
     atom.confirm({ message: "Test" });
     atom.confirm({ message: "Test", buttons: [ "a", "b" ], detailedMessage: "Test" });
     num = atom.confirm({ message: "Test", detailedMessage: "Test", buttons: {
@@ -270,13 +276,19 @@ function testCommandRegistry() {
         "test-function2": (event) => {},
     });
     atom.commands.add("test", "test:function", {
-        didDispatch: (event) => event.stopImmediatePropagation(),
+        didDispatch: (event) => {
+            event.stopImmediatePropagation();
+        },
         description: "A Command Test",
         displayName: "Command: Test",
     });
     atom.commands.add("atom-text-editor", {
-        "test-function": (event) => event.currentTarget.getModel(),
-        "test-function2": (event) => event.currentTarget.getComponent(),
+        "test-function": (event) => {
+            event.currentTarget.getModel();
+        },
+        "test-function2": (event) => {
+            event.currentTarget.getComponent();
+        }
     });
     atom.commands.add("atom-workspace", {
         "test-command": {
@@ -345,7 +357,7 @@ function testConfig() {
 
     const allConfigValues = atom.config.getAll("test");
     for (const { scopeDescriptor, value } of allConfigValues) {
-        scopeDescriptor.scopes;
+        scopes = scopeDescriptor.getScopesArray();
     }
     atom.config.getAll("test", { scope: scopeDescriptor });
     atom.config.getAll("test", { excludeSources: ["test"] });
@@ -853,6 +865,7 @@ function testDock() {
     subscription = dock.onDidDestroyPaneItem(event => {
         event.index && event.item && event.pane;
     });
+    subscription = dock.onDidChangeHovered(hovered => bool = hovered);
 
     // Pane Items
     objs = dock.getPaneItems();
@@ -1375,6 +1388,7 @@ function testNotification() {
 function testNotificationManager() {
     // Events
     atom.notifications.onDidAddNotification(notification => notification.dismiss());
+    atom.notifications.onDidClearNotifications(() => undefined);
 
     // Adding Notifications
     atom.notifications.addSuccess("Test");
@@ -1409,6 +1423,9 @@ function testNotificationManager() {
 
     // Getting Notifications
     notifications = atom.notifications.getNotifications();
+
+    // Managing Notifications
+    atom.notifications.clear();
 }
 
 // Package ====================================================================
@@ -1833,7 +1850,7 @@ function testRange() {
 }
 
 // ScopeDescriptor ============================================================
-strs = scopeDescriptor.getScopesArray();
+readonlyStrs = scopeDescriptor.getScopesArray();
 
 // Selection ==================================================================
 function testSelection() {
@@ -2219,6 +2236,7 @@ function testTextBuffer() {
     num = buffer.createCheckpoint();
     bool = buffer.revertToCheckpoint(42);
     bool = buffer.groupChangesSinceCheckpoint(42);
+    bool = buffer.groupLastChanges();
     buffer.getChangesSinceCheckpoint(42);
 
     // Search And Replace
@@ -2306,6 +2324,7 @@ function testTextBuffer() {
     num = buffer.getLastRow();
     pos = buffer.getFirstPosition();
     pos = buffer.getEndPosition();
+    num = buffer.getLength();
     num = buffer.getMaxCharacterIndex();
     range = buffer.rangeForRow(42, true);
     num = buffer.characterIndexForPosition(pos);
@@ -2700,6 +2719,8 @@ function testTextEditor() {
     editor.moveToNextSubwordBoundary();
     editor.moveToBeginningOfNextParagraph();
     editor.moveToBeginningOfPreviousParagraph();
+    editor.selectLargerSyntaxNode();
+    editor.selectSmallerSyntaxNode();
     cursor = editor.getLastCursor();
 
     str = editor.getWordUnderCursor();
diff --git a/types/atom/index.d.ts b/types/atom/index.d.ts
index 5db8f55ce5..e673ada530 100644
--- a/types/atom/index.d.ts
+++ b/types/atom/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Atom 1.24
+// Type definitions for Atom 1.25
 // Project: https://github.com/atom/atom
 // Definitions by: GlenCFL <https://github.com/GlenCFL>
 //                 smhxx <https://github.com/smhxx>
@@ -7,7 +7,7 @@
 // TypeScript Version: 2.3
 
 // NOTE: only those classes exported within this file should be retain that status below.
-// https://github.com/atom/atom/blob/v1.24.0/exports/atom.js
+// https://github.com/atom/atom/blob/v1.25.0/exports/atom.js
 
 /// <reference types="node" />
 
@@ -204,7 +204,27 @@ export interface AtomEnvironment {
     beep(): void;
 
     /**
-     *  A flexible way to open a dialog akin to an alert dialog.
+     *  A flexible way to open a dialog akin to an alert dialog. If a callback
+     *  is provided, then the confirmation will work asynchronously, which is
+     *  recommended.
+     *
+     *  If the dialog is closed (via `Esc` key or `X` in the top corner) without
+     *  selecting a button the first button will be clicked unless a "Cancel" or "No"
+     *  button is provided.
+     *
+     *  Returns the chosen button index number if the buttons option was an array.
+     *  @param response The index of the button that was clicked.
+     *  @param checkboxChecked The checked state of the checkbox if `checkboxLabel` was set.
+     *  Otherwise false.
+     */
+    confirm(options: ConfirmationOptions, callback: (response: number,
+        checkboxChecked: boolean) => void): void;
+
+    /**
+     *  A flexible way to open a dialog akin to an alert dialog. If a callback
+     *  is provided, then the confirmation will work asynchronously, which is
+     *  recommended.
+     *
      *  If the dialog is closed (via `Esc` key or `X` in the top corner) without
      *  selecting a button the first button will be clicked unless a "Cancel" or "No"
      *  button is provided.
@@ -218,7 +238,10 @@ export interface AtomEnvironment {
     }): void;
 
     /**
-     *  A flexible way to open a dialog akin to an alert dialog.
+     *  A flexible way to open a dialog akin to an alert dialog. If a callback
+     *  is provided, then the confirmation will work asynchronously, which is
+     *  recommended.
+     *
      *  If the dialog is closed (via `Esc` key or `X` in the top corner) without
      *  selecting a button the first button will be clicked unless a "Cancel" or "No"
      *  button is provided.
@@ -264,11 +287,11 @@ export interface CommandRegistryTargetMap extends HTMLElementTagNameMap {
 }
 
 export type CommandRegistryListener<TargetType extends EventTarget> = {
-  didDispatch(event: CommandEvent<TargetType>): void,
-  displayName?: string,
-  description?: string,
-  hiddenInCommandPalette?: boolean,
-} | ((event: CommandEvent<TargetType>) => void);
+    didDispatch(event: CommandEvent<TargetType>): void | Promise<void>,
+    displayName?: string,
+    description?: string,
+    hiddenInCommandPalette?: boolean,
+} | ((event: CommandEvent<TargetType>) => void | Promise<void>);
 
 /**
  *  Associates listener functions with commands in a context-sensitive way
@@ -305,9 +328,10 @@ export interface CommandRegistry {
 
     /**
      *  Simulate the dispatch of a command on a DOM node.
-     *  @return Whether or not there was a matching command for the target.
+     *  @return Either a Promise that resolves after all handlers complete or null if
+     *  no handlers were matched.
      */
-    dispatch(target: Node, commandName: string): boolean;
+    dispatch(target: Node, commandName: string): Promise<void> | null;
 
     /** Invoke the given callback before dispatching a command event. */
     onWillDispatch(callback: (event: CommandEvent) => void): Disposable;
@@ -1035,13 +1059,13 @@ export class Notification {
 
 /** A notification manager used to create Notifications to be shown to the user. */
 export interface NotificationManager {
-    // Properties
-    readonly notifications: Notification[];
-
     // Events
     /** Invoke the given callback after a notification has been added. */
     onDidAddNotification(callback: (notification: Notification) => void): Disposable;
 
+    /** Invoke the given callback after the notifications have been cleared. */
+    onDidClearNotifications(callback: () => void): Disposable;
+
     // Adding Notifications
     /** Add a success notification. */
     addSuccess(message: string, options?: NotificationOptions): Notification;
@@ -1060,7 +1084,11 @@ export interface NotificationManager {
 
     // Getting Notifications
     /** Get all the notifications. */
-    getNotifications(): Notification[];
+    getNotifications(): ReadonlyArray<Notification>;
+
+    // Managing Notifications
+    /** Clear all the notifications. */
+    clear(): void;
 }
 
 /** Represents a point in a buffer in row/column coordinates. */
@@ -1273,7 +1301,6 @@ export class Range {
  */
 export class TextEditor {
     readonly id: number;
-    readonly buffer: TextBuffer;
 
     // NOTE: undocumented within the public API. Don't go down the rabbit hole.
     constructor(options?: object);
@@ -2137,6 +2164,12 @@ export class TextEditor {
      */
     selectToBeginningOfPreviousParagraph(): void;
 
+    /** For each selection, select the syntax node that contains that selection. */
+    selectLargerSyntaxNode(): void;
+
+    /** Undo the effect a preceding call to `::selectLargerSyntaxNode`. */
+    selectSmallerSyntaxNode(): void;
+
     /** Select the range of the given marker if it is valid. */
     selectMarker(marker: DisplayMarker): Range|undefined;
 
@@ -2347,7 +2380,10 @@ export class TextEditor {
     /** Unfold all existing folds. */
     unfoldAll(): void;
 
-    /** Fold all foldable lines at the given indent level. */
+    /**
+     * Fold all foldable lines at the given indent level.
+     * @param level A zero-indexed number.
+     */
     foldAllAtIndentLevel(level: number): void;
 
     /**
@@ -2524,10 +2560,6 @@ export interface TextEditorRegistry {
     observe(callback: (editor: TextEditor) => void): Disposable;
 }
 
-export interface JQueryCompatible<Element extends Node = HTMLElement> extends Iterable<Element> {
-    jquery: string;
-}
-
 export type TooltipPlacement =
     |"top"|"bottom"|"left"|"right"
     |"auto"|"auto top"|"auto bottom"|"auto left"|"auto right";
@@ -3452,6 +3484,12 @@ export interface Dock {
     /** Invoke the given callback when a pane item is destroyed. */
     onDidDestroyPaneItem(callback: (event: PaneItemObservedEvent) => void): Disposable;
 
+    /**
+     *  Invoke the given callback when the hovered state of the dock changes.
+     *  @param hovered Is the dock now hovered?
+     */
+    onDidChangeHovered(callback: (hovered: boolean) => void): Disposable;
+
     // Pane Items
     /** Get all pane items in the dock. */
     getPaneItems(): object[];
@@ -4498,10 +4536,8 @@ export interface Project {
  *  syntax tree to a token including all scope names for the entire path.
  */
 export interface ScopeDescriptor {
-    readonly scopes: string[];
-
     /** Returns all scopes for this descriptor. */
-    getScopesArray(): string[];
+    getScopesArray(): ReadonlyArray<string>;
 }
 
 /** Represents a selection in the TextEditor. */
@@ -5068,7 +5104,10 @@ export class TextBuffer {
     /** Get the text of the last line of the buffer, without its line ending. */
     getLastLine(): string;
 
-    /** Get the text of the line at the given row, without its line ending. */
+    /**
+     *  Get the text of the line at the given 0-indexed row, without its line ending.
+     *  @param row A number representing the row.
+     */
     lineForRow(row: number): string|undefined;
 
     /** Get the line ending for the given 0-indexed row. */
@@ -5120,10 +5159,18 @@ export class TextBuffer {
     /** Delete the text in the given range. */
     delete(range: RangeCompatible): Range;
 
-    /** Delete the line associated with a specified row. */
+    /**
+     *  Delete the line associated with a specified 0-indexed row.
+     *  @param row A number representing the row to delete.
+     */
     deleteRow(row: number): Range;
 
-    /** Delete the lines associated with the specified row range. */
+    /**
+     *  Delete the lines associated with the specified 0-indexed row range.
+     *
+     *  If the row range is out of bounds, it will be clipped. If the `startRow`
+     *  is greater than the `endRow`, they will be reordered.
+     */
     deleteRows(startRow: number, endRow: number): Range;
 
     // Markers
@@ -5162,10 +5209,16 @@ export class TextBuffer {
     getMarkerCount(): number;
 
     // History
-    /** Undo the last operation. If a transaction is in progress, aborts it. */
+    /**
+     *  Undo the last operation. If a transaction is in progress, aborts it.
+     *  @return A boolean of whether or not a change was made.
+     */
     undo(): boolean;
 
-    /** Redo the last operation. */
+    /**
+     *  Redo the last operation.
+     *  @return A boolean of whether or not a change was made.
+     */
     redo(): boolean;
 
     /** Batch multiple operations as a single undo/redo step. */
@@ -5173,37 +5226,44 @@ export class TextBuffer {
     transact<T>(fn: () => T): T;
 
     /**
-     *  Call within a transaction to terminate the function's execution and
-     *  revert any changes performed up to the abortion.
+     *  Abort the currently running transaction.
+     *
+     *  Only intended to be called within the `fn` option to `::transact`.
      */
     abortTransaction(): void;
 
-    /**
-     *  Clear the undo stack. When calling this method within a transaction,
-     *  the ::onDidChangeText event will not be triggered because the information
-     *  describing the changes is lost.
-     */
+    /** Clear the undo stack. */
     clearUndoStack(): void;
 
     /**
      *  Create a pointer to the current state of the buffer for use with
-     *  ::revertToCheckpoint and ::groupChangesSinceCheckpoint.
+     *  `::revertToCheckpoint` and `::groupChangesSinceCheckpoint`.
+     *  @return A checkpoint ID value.
      */
     createCheckpoint(): number;
 
     /**
      *  Revert the buffer to the state it was in when the given checkpoint was created.
-     *  Returns a boolean indicating whether the operation succeeded.
+     *  @return A boolean indicating whether the operation succeeded.
      */
     revertToCheckpoint(checkpoint: number): boolean;
 
     /**
      *  Group all changes since the given checkpoint into a single transaction for
      *  purposes of undo/redo.
-     *  Returns a boolean indicating whether the operation succeeded.
+     *  @return A boolean indicating whether the operation succeeded.
      */
     groupChangesSinceCheckpoint(checkpoint: number): boolean;
 
+    /**
+     *  Group the last two text changes for purposes of undo/redo.
+     *
+     *  This operation will only succeed if there are two changes on the undo stack.
+     *  It will not group past the beginning of an open transaction.
+     *  @return A boolean indicating whether the operation succeeded.
+     */
+    groupLastChanges(): boolean;
+
     /**
      *  Returns a list of changes since the given checkpoint.
      *  If the given checkpoint is no longer present in the undo history, this method
@@ -5293,17 +5353,26 @@ export class TextBuffer {
     /** Get the maximal position in the buffer, where new text would be appended. */
     getEndPosition(): Point;
 
+    /** Get the length of the buffer's text. */
+    getLength(): number;
+
     /** Get the length of the buffer in characters. */
     getMaxCharacterIndex(): number;
 
-    /** Get the range for the given row. */
-    rangeForRow(row: number, includeNewline: boolean): Range;
+    /**
+     *  Get the range for the given row.
+     *  @param row A number representing a 0-indexed row.
+     *  @param includeNewline A boolean indicating whether or not to include the
+     *  newline, which results in a range that extends to the start of the next line.
+     *  (default: false)
+     */
+    rangeForRow(row: number, includeNewline?: boolean): Range;
 
     /**
      *  Convert a position in the buffer in row/column coordinates to an absolute
      *  character offset, inclusive of line ending characters.
      */
-    characterIndexForPosition(position: Point|[number, number]): number;
+    characterIndexForPosition(position: PointCompatible): number;
 
     /**
      *  Convert an absolute character offset, inclusive of newlines, to a position
@@ -5753,7 +5822,7 @@ export interface TextEditorObservedEvent {
 // information under certain contexts.
 
 // NOTE: the config schema with these defaults can be found here:
-//   https://github.com/atom/atom/blob/v1.24.0/src/config-schema.js
+//   https://github.com/atom/atom/blob/v1.25.0/src/config-schema.js
 /**
  *  Allows you to strongly type Atom configuration variables. Additional key:value
  *  pairings merged into this interface will result in configuration values under
@@ -6039,6 +6108,59 @@ export interface BuildEnvironmentOptions {
     enablePersistence?: boolean;
 }
 
+export interface ConfirmationOptions {
+    /** The type of the confirmation prompt. */
+    type?: "none"|"info"|"error"|"question"|"warning";
+
+    /** The text for the buttons. */
+    buttons?: ReadonlyArray<string>;
+
+    /** The index for the button to be selected by default in the prompt. */
+    defaultId?: number;
+
+    /** The title for the prompt. */
+    title?: string;
+
+    /** The content of the message box. */
+    message?: string;
+
+    /** Additional information regarding the message. */
+    detail?: string;
+
+    /** If provided, the message box will include a checkbox with the given label. */
+    checkboxLabel?: string;
+
+    /** Initial checked state of the checkbox. false by default. */
+    checkboxChecked?: boolean;
+
+    /** An Electron NativeImage to use as the prompt's icon. */
+    icon?: object;
+
+    /**
+     *  The index of the button to be used to cancel the dialog, via the `Esc` key.
+     *  By default this is assigned to the first button with "cancel" or "no" as the
+     *  label. If no such labeled buttons exist and this option is not set, 0 will be
+     *  used as the return value or callback response.
+     *
+     *  This option is ignored on Windows.
+     */
+    cancelId?: number;
+
+    /**
+     *  On Windows, Electron will try to figure out which one of the buttons are
+     *  common buttons (like `Cancel` or `Yes`), and show the others as command links
+     *  in the dialog. This can make the dialog appear in the style of modern Windows
+     *  apps. If you don't like this behavior, you can set noLink to true.
+     */
+    noLink?: boolean;
+
+    /**
+     * Normalize the keyboard access keys across platforms.
+     * Atom defaults this to true.
+     */
+    normalizeAccessKeys?: boolean;
+}
+
 export interface ContextMenuOptions {
     /** The menu item's label. */
     label?: string;
@@ -6506,6 +6628,10 @@ export interface DisposableLike {
     dispose(): void;
 }
 
+export interface JQueryCompatible<Element extends Node = HTMLElement> extends Iterable<Element> {
+    jquery: string;
+}
+
 /** The types usable when constructing a point via the Point::fromObject method. */
 export type PointCompatible = PointLike|[number, number];
 

From ebc94c03b13ee49815fdaa8b96a0dbc9a3edf926 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Fri, 16 Mar 2018 17:38:34 +0800
Subject: [PATCH 0581/1382] Update "puppeteer" for v1.2.0

---
 types/puppeteer/index.d.ts | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/types/puppeteer/index.d.ts b/types/puppeteer/index.d.ts
index a549871070..2afb026648 100644
--- a/types/puppeteer/index.d.ts
+++ b/types/puppeteer/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for puppeteer 1.1
+// Type definitions for puppeteer 1.2
 // Project: https://github.com/GoogleChrome/puppeteer#readme
 // Definitions by: Marvin Hagemeister <https://github.com/marvinhagemeister>
 //                 Christopher Deutsch <https://github.com/cdeutsch>
@@ -410,6 +410,8 @@ export interface ScriptTagOptions {
   path?: string;
   /** Raw JavaScript content to be injected into frame. */
   content?: string;
+  /** Script type. Use 'module' in order to load a Javascript ES6 module. */
+  type?: string;
 }
 
 export interface PageFnOptions {
@@ -459,6 +461,11 @@ export interface ElementHandle extends JSHandle {
    * @since 0.9.0
    */
   click(options?: ClickOptions): Promise<void>;
+  /**
+   * @returns Resolves to the content frame for element handles referencing iframe nodes, or null otherwise.
+   * @since 1.2.0
+   */
+  contentFrame(): Promise<Frame | null>;
   /**
    * Calls focus on the element.
    */
@@ -637,6 +644,18 @@ export interface Request {
   /** Contains the request's post body, if any. */
   postData(): string | undefined;
 
+  /**
+   * A `redirectChain` is a chain of requests initiated to fetch a resource.
+   *
+   * - If there are no redirects and the request was successful, the chain will be empty.
+   * - If a server responds with at least a single redirect, then the chain will contain all the requests that were redirected.
+   *
+   * `redirectChain` is shared between all the requests of the same chain.
+   *
+   * @since 1.2.0
+   */
+  redirectChain(): Request[];
+
   /** Contains the request's resource type as it was perceived by the rendering engine.  */
   resourceType(): ResourceType;
 

From 8bd7283dc8db09e953dc2524310c08f469bf95d7 Mon Sep 17 00:00:00 2001
From: Umidbek Karimov <uma.karimov@gmail.com>
Date: Fri, 16 Mar 2018 15:42:35 +0500
Subject: [PATCH 0582/1382] fix(react-native-collapsible/Accordion): Use
 `any[]` type for `sections`.

---
 types/react-native-collapsible/Accordion.d.ts |  2 +-
 .../react-native-collapsible-tests.tsx        | 24 +++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/types/react-native-collapsible/Accordion.d.ts b/types/react-native-collapsible/Accordion.d.ts
index 2a2fc04a9f..d4f3ae0dab 100644
--- a/types/react-native-collapsible/Accordion.d.ts
+++ b/types/react-native-collapsible/Accordion.d.ts
@@ -5,7 +5,7 @@ export interface AccordionProps {
   /**
    * An array of sections passed to the render methods
    */
-  sections: string[];
+  sections: any[];
 
   /**
    * A function that should return a renderable representing the header
diff --git a/types/react-native-collapsible/react-native-collapsible-tests.tsx b/types/react-native-collapsible/react-native-collapsible-tests.tsx
index 1107084f3d..65dd0015b8 100644
--- a/types/react-native-collapsible/react-native-collapsible-tests.tsx
+++ b/types/react-native-collapsible/react-native-collapsible-tests.tsx
@@ -36,3 +36,27 @@ class AccordianTest extends React.Component<any, any> {
     );
   }
 }
+
+class AccordionComplexTest extends React.Component<any, any> {
+    _renderHeader() {
+        return (
+            <View />
+        );
+    }
+
+    _renderContent() {
+        return (
+            <View />
+        );
+    }
+
+    render() {
+        return (
+            <Accordion
+                sections={[{icon: 'foo', title: 'Section 1'}, {icon: 'bar', title: 'Section 2'}, {icon: 'baz', title: 'Section 3'}]}
+                renderHeader={this._renderHeader}
+                renderContent={this._renderContent}
+            />
+        );
+    }
+}

From 5c2c9bd68589391bb8f77c007edd851eb9a81b85 Mon Sep 17 00:00:00 2001
From: Umidbek Karimov <uma.karimov@gmail.com>
Date: Fri, 16 Mar 2018 15:43:47 +0500
Subject: [PATCH 0583/1382] fix(react-native-collapsible/tsconfig): Add `dom`
 lib `react-native`.

---
 types/react-native-collapsible/tsconfig.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/react-native-collapsible/tsconfig.json b/types/react-native-collapsible/tsconfig.json
index c9cb0c9278..7b0c98aa63 100644
--- a/types/react-native-collapsible/tsconfig.json
+++ b/types/react-native-collapsible/tsconfig.json
@@ -2,6 +2,7 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
+            "dom",
             "es6"
         ],
         "noImplicitAny": true,
@@ -22,4 +23,4 @@
         "Accordion.d.ts",
         "react-native-collapsible-tests.tsx"
     ]
-}
\ No newline at end of file
+}

From a1fffb01ebf7b80f2fc8dafbdaaef83ba66f176e Mon Sep 17 00:00:00 2001
From: Umidbek Karimov <uma.karimov@gmail.com>
Date: Fri, 16 Mar 2018 15:51:11 +0500
Subject: [PATCH 0584/1382] feat(react-native-collapsible): Update contributors
 info.

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

diff --git a/types/react-native-collapsible/index.d.ts b/types/react-native-collapsible/index.d.ts
index bdfc7cde09..bc107f140a 100644
--- a/types/react-native-collapsible/index.d.ts
+++ b/types/react-native-collapsible/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for react-native-collapsible 0.8
 // Project: https://github.com/oblador/react-native-collapsible
 // Definitions by: Kyle Roach <https://github.com/iRoachie>
+//                 Umidbek Karimov <https://github.com/umidbekkarimov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 

From 335a8976a9d6738960c1508dd4b63d62042abf43 Mon Sep 17 00:00:00 2001
From: GlenCFL <glencfl@gmail.com>
Date: Fri, 16 Mar 2018 10:14:58 -0400
Subject: [PATCH 0585/1382] event-kit: update to use techniques from Atom.

---
 types/event-kit/index.d.ts | 48 ++++++++++++++++++++++++++++++--------
 1 file changed, 38 insertions(+), 10 deletions(-)

diff --git a/types/event-kit/index.d.ts b/types/event-kit/index.d.ts
index 2208ffaae3..aa0275d8a8 100644
--- a/types/event-kit/index.d.ts
+++ b/types/event-kit/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for event-kit 2.x
+// Type definitions for event-kit 2.4
 // Project: https://github.com/atom/event-kit
 // Definitions by: GlenCFL <https://github.com/GlenCFL>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -69,7 +69,8 @@ export class CompositeDisposable implements DisposableLike {
  *  for handlers registered via ::on to be invoked with calls to ::emit.
  */
 // tslint:disable-next-line:no-any
-export class Emitter<Emissions = { [key: string]: any }> implements DisposableLike {
+export class Emitter<OptionalEmissions = { [key: string]: any }, RequiredEmissions = {}>
+        implements DisposableLike {
     disposed: boolean;
 
     /** Construct an emitter. */
@@ -83,31 +84,58 @@ export class Emitter<Emissions = { [key: string]: any }> implements DisposableLi
 
     // Event Subscription
     /** Registers a handler to be invoked whenever the given event is emitted. */
-    on<T extends keyof Emissions>(eventName: T, handler: (value?: Emissions[T]) => void):
-        Disposable;
+    on<T extends keyof OptionalEmissions>(eventName: T, handler: (value?:
+        OptionalEmissions[T]) => void): Disposable;
+    /** Registers a handler to be invoked whenever the given event is emitted. */
+    on<T extends keyof RequiredEmissions>(eventName: T, handler: (value:
+        RequiredEmissions[T]) => void): Disposable;
 
     /**
      *  Register the given handler function to be invoked the next time an event
      *  with the given name is emitted via ::emit.
      */
-    once<T extends keyof Emissions>(eventName: T, handler: (value?: Emissions[T]) => void):
-        Disposable;
+    once<T extends keyof OptionalEmissions>(eventName: T, handler: (value?:
+        OptionalEmissions[T]) => void): Disposable;
+    /**
+     *  Register the given handler function to be invoked the next time an event
+     *  with the given name is emitted via ::emit.
+     */
+    once<T extends keyof RequiredEmissions>(eventName: T, handler: (value:
+        RequiredEmissions[T]) => void): Disposable;
 
     /**
      *  Register the given handler function to be invoked before all other
      *  handlers existing at the time of subscription whenever events by the
      *  given name are emitted via ::emit.
      */
-    preempt<T extends keyof Emissions>(eventName: T, handler: (value?: Emissions[T]) => void):
-        Disposable;
+    preempt<T extends keyof OptionalEmissions>(eventName: T, handler: (value?:
+        OptionalEmissions[T]) => void): Disposable;
+    /**
+     *  Register the given handler function to be invoked before all other
+     *  handlers existing at the time of subscription whenever events by the
+     *  given name are emitted via ::emit.
+     */
+    preempt<T extends keyof RequiredEmissions>(eventName: T, handler: (value:
+        RequiredEmissions[T]) => void): Disposable;
 
     // Event Emission
     /** Invoke the handlers registered via ::on for the given event name. */
-    emit<T extends keyof Emissions>(eventName: T, value?: Emissions[T]): void;
+    emit<T extends keyof OptionalEmissions>(eventName: T, value?:
+        OptionalEmissions[T]): void;
+    /** Invoke the handlers registered via ::on for the given event name. */
+    emit<T extends keyof RequiredEmissions>(eventName: T, value:
+        RequiredEmissions[T]): void;
 
     /**
      *  Asynchronously invoke the handlers registered via ::on for the given event name.
      *  @return A promise that will be fulfilled once all handlers have been invoked.
      */
-    emitAsync<T extends keyof Emissions>(eventName: T, value?: Emissions[T]): Promise<void>;
+    emitAsync<T extends keyof OptionalEmissions>(eventName: T, value?:
+        OptionalEmissions[T]): Promise<void>;
+    /**
+     *  Asynchronously invoke the handlers registered via ::on for the given event name.
+     *  @return A promise that will be fulfilled once all handlers have been invoked.
+     */
+    emitAsync<T extends keyof RequiredEmissions>(eventName: T, value:
+        RequiredEmissions[T]): Promise<void>;
 }

From fcc923a224046822469a1648694922b2e7107a45 Mon Sep 17 00:00:00 2001
From: Stevearzh <zy911004@gmail.com>
Date: Fri, 16 Mar 2018 22:22:11 +0800
Subject: [PATCH 0586/1382] add type constraints for List rowRenderer test case

---
 types/react-virtualized/react-virtualized-tests.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/react-virtualized/react-virtualized-tests.tsx b/types/react-virtualized/react-virtualized-tests.tsx
index d912c1f28f..c71c2bc6d7 100644
--- a/types/react-virtualized/react-virtualized-tests.tsx
+++ b/types/react-virtualized/react-virtualized-tests.tsx
@@ -114,7 +114,7 @@ export class AutoSizerExample extends PureComponent<any, any> {
     }
 }
 import { } from 'react'
-import { CellMeasurer, CellMeasurerCache } from 'react-virtualized'
+import { CellMeasurer, CellMeasurerCache, ListRowProps } from 'react-virtualized'
 
 export class DynamicHeightList extends PureComponent<any> {
 
@@ -148,7 +148,7 @@ export class DynamicHeightList extends PureComponent<any> {
         )
     }
 
-    _rowRenderer({ index, isScrolling, key, parent, style }) {
+    _rowRenderer({ index, isScrolling, key, parent, style }: ListRowProps) {
         const { getClassName, list } = this.props
 
         const datum = list.get(index % list.size)

From e6406805ec9569e9820b4624df5c386ce99a526b Mon Sep 17 00:00:00 2001
From: Oblosys <martijn@oblomov.com>
Date: Thu, 15 Mar 2018 11:50:12 +0100
Subject: [PATCH 0587/1382] [react] Add supressHydrationWarning to
 React.HTMLAttributes interface

Added in 16.1.0 (https://github.com/facebook/react/releases/tag/v16.1.0)
Docs: https://reactjs.org/docs/dom-elements.html#suppresshydrationwarning
---
 types/react/index.d.ts   | 1 +
 types/react/test/tsx.tsx | 1 +
 2 files changed, 2 insertions(+)

diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index d56d9571e1..e685f78d07 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -2450,6 +2450,7 @@ declare namespace React {
         defaultChecked?: boolean;
         defaultValue?: string | string[];
         suppressContentEditableWarning?: boolean;
+        suppressHydrationWarning?: boolean;
 
         // Standard HTML Attributes
         accessKey?: string;
diff --git a/types/react/test/tsx.tsx b/types/react/test/tsx.tsx
index 4ad5a3e2c8..7fa151fd29 100644
--- a/types/react/test/tsx.tsx
+++ b/types/react/test/tsx.tsx
@@ -37,6 +37,7 @@ StatelessComponent2.defaultProps = {
     defaultValue="some value"
     contentEditable
     suppressContentEditableWarning
+    suppressHydrationWarning
 >
     <b>foo</b>
 </div>;

From a8dfe1e8c0650aa5b8658e93a2e90fcfa29941c2 Mon Sep 17 00:00:00 2001
From: Oblosys <martijn@oblomov.com>
Date: Thu, 15 Mar 2018 12:19:10 +0100
Subject: [PATCH 0588/1382] [react] Bump minor version: 16.0 ~> 16.1

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

diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index e685f78d07..513a5cd2ce 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for React 16.0
+// Type definitions for React 16.1
 // Project: http://facebook.github.io/react/
 // Definitions by: Asana <https://asana.com>
 //                 AssureSign <http://www.assuresign.com>

From dd181a9856463bd7eba25f02e0f2d4f1e87453cc Mon Sep 17 00:00:00 2001
From: Volker Nauruhn <nauruhn@cynatix.com>
Date: Fri, 16 Mar 2018 17:11:04 +0100
Subject: [PATCH 0589/1382] corrected signature for generic named methods
 executed by triggerMethod in collectionView

---
 types/backbone.marionette/index.d.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/types/backbone.marionette/index.d.ts b/types/backbone.marionette/index.d.ts
index cd8ccd3821..52f316ace1 100644
--- a/types/backbone.marionette/index.d.ts
+++ b/types/backbone.marionette/index.d.ts
@@ -1394,27 +1394,27 @@ export class CollectionView<TModel extends Backbone.Model, TView extends View<TM
      * instance is about to be added to the collection view. It provides
      * access to the view instance for the child that was added.
      */
-    onBeforeAddChild(childView: TView): void;
+    onBeforeAddChild(collectionView: CollectionView<TModel, TView, TCollection>, childView: TView): void;
 
     /**
      * This callback function allows you to know when a child / child view
      * instance has been added to the collection view. It provides access to
      * the view instance for the child that was added.
      */
-    onAddChild(childView: TView): void;
+    onAddChild(collectionView: CollectionView<TModel, TView, TCollection>, childView: TView): void;
 
     /**
      * This callback function allows you to know when a childView instance is
      * about to be removed from the collectionView. It provides access to the
      * view instance for the child that was removed.
      */
-    onBeforeRemoveChild(childView: TView): void;
+    onBeforeRemoveChild(collectionView: CollectionView<TModel, TView, TCollection>, childView: TView): void;
 
     /**
      * This callback function allows you to know when a child / childView
      * instance has been deleted or removed from the collection.
      */
-    onRemoveChild(childView: TView): void;
+    onRemoveChild(collectionView: CollectionView<TModel, TView, TCollection>, childView: TView): void;
 
     /**
      * Automatically destroys this Collection's children and cleans up

From 7cb6ae781bb90191fe1332c728a11a7e15f2d639 Mon Sep 17 00:00:00 2001
From: Olivier Sechet <osechet@gmail.com>
Date: Fri, 16 Mar 2018 17:12:50 +0100
Subject: [PATCH 0590/1382] Fix typo for ol.proj.Units type

---
 types/openlayers/index.d.ts          | 2 +-
 types/openlayers/openlayers-tests.ts | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/types/openlayers/index.d.ts b/types/openlayers/index.d.ts
index 0dfd1fe464..7a1d35edaa 100644
--- a/types/openlayers/index.d.ts
+++ b/types/openlayers/index.d.ts
@@ -7541,7 +7541,7 @@ export namespace proj {
      * Projection units: `'degrees'`, `'ft'`, `'m'`, `'pixels'`, `'tile-pixels'` or
      * `'us-ft'`.
      */
-    type Units = "degress" | "ft" | "m" | "pixels" | "tile-pixels" | "us-ft";
+    type Units = "degrees" | "ft" | "m" | "pixels" | "tile-pixels" | "us-ft";
 
     /**
      * Meters per unit lookup table.
diff --git a/types/openlayers/openlayers-tests.ts b/types/openlayers/openlayers-tests.ts
index fa42579ba9..b66aa08f67 100644
--- a/types/openlayers/openlayers-tests.ts
+++ b/types/openlayers/openlayers-tests.ts
@@ -617,6 +617,13 @@ projection.setGetPointResolution(getPointResolutionFn);
 projection.setGlobal(booleanValue);
 projection.setWorldExtent(extent);
 
+units = 'degrees';
+units = 'ft';
+units = 'm';
+units = 'pixels';
+units = 'tile-pixels';
+units = 'us-ft';
+
 //
 // ol.Map
 //

From 11421a98b0b55b6cd28cc3561960f4aa02653b05 Mon Sep 17 00:00:00 2001
From: Volker Nauruhn <nauruhn@cynatix.com>
Date: Fri, 16 Mar 2018 17:14:57 +0100
Subject: [PATCH 0591/1382] added me to contributor list

---
 types/backbone.marionette/index.d.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/types/backbone.marionette/index.d.ts b/types/backbone.marionette/index.d.ts
index 52f316ace1..7626d60d56 100644
--- a/types/backbone.marionette/index.d.ts
+++ b/types/backbone.marionette/index.d.ts
@@ -1,6 +1,9 @@
 // Type definitions for Marionette 3.3
 // Project: https://github.com/marionettejs/
-// Definitions by: Zeeshan Hamid <https://github.com/zhamid>, Natan Vivo <https://github.com/nvivo>, Sven Tschui <https://github.com/sventschui>
+// Definitions by: Zeeshan Hamid <https://github.com/zhamid>,
+//                 Natan Vivo <https://github.com/nvivo>,
+//                 Sven Tschui <https://github.com/sventschui>,
+//                 Volker Nauruhn <https://github.com/razorness>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 

From 669da2ca54100d794eb511816e03dc5ac2084e1d Mon Sep 17 00:00:00 2001
From: Dominique <domi.rau@gmail.com>
Date: Fri, 16 Mar 2018 17:26:58 +0100
Subject: [PATCH 0592/1382] got-typings: use proper options for got download

---
 types/decompress/index.d.ts | 56 +++++++++++++++++++------------------
 types/download/index.d.ts   | 48 +++++++++++++------------------
 2 files changed, 48 insertions(+), 56 deletions(-)

diff --git a/types/decompress/index.d.ts b/types/decompress/index.d.ts
index c2211b3434..a493f81a0d 100644
--- a/types/decompress/index.d.ts
+++ b/types/decompress/index.d.ts
@@ -7,33 +7,35 @@
 
 export = decompress;
 
-declare function decompress(input: string | Buffer, output: string, opts?: Options): Promise<File>;
+declare function decompress(input: string | Buffer, output: string, opts?: decompress.DecompressOptions): Promise<decompress.File>;
 
-interface File {
-    data: Buffer;
-    mode: number;
-    mtime: string;
-    path: string;
-    type: string;
-}
+declare namespace decompress {
+    interface File {
+        data: Buffer;
+        mode: number;
+        mtime: string;
+        path: string;
+        type: string;
+    }
 
-interface Options {
-    /**
-     * Filter out files before extracting
-     */
-    filter?(file: File): boolean;
-    /**
-     * Map files before extracting
-     */
-    map?(file: File): File;
-    /**
-     * Array of plugins to use.
-     * Default: [decompressTar(), decompressTarbz2(), decompressTargz(), decompressUnzip()]
-     */
-    plugins?: any[];
-    /**
-     * Remove leading directory components from extracted files.
-     * Default: 0
-     */
-    strip?: number;
+    interface DecompressOptions {
+        /**
+         * Filter out files before extracting
+         */
+        filter?(file: File): boolean;
+        /**
+         * Map files before extracting
+         */
+        map?(file: File): File;
+        /**
+         * Array of plugins to use.
+         * Default: [decompressTar(), decompressTarbz2(), decompressTargz(), decompressUnzip()]
+         */
+        plugins?: any[];
+        /**
+         * Remove leading directory components from extracted files.
+         * Default: 0
+         */
+        strip?: number;
+    }
 }
diff --git a/types/download/index.d.ts b/types/download/index.d.ts
index cffc282832..56eb6cc16d 100644
--- a/types/download/index.d.ts
+++ b/types/download/index.d.ts
@@ -5,38 +5,28 @@
 // TypeScript Version: 2.2
 
 /// <reference types="node" />
+import { DecompressOptions } from 'decompress';
+import { GotBodyOptions, TimeoutOptions } from 'got';
 
-interface TimeoutOptions {
-    connect?: number;
-    socket?: number;
-    request?: number;
-}
-type RetryFunction = (retry: number, error: any) => number;
+declare namespace download {
+    type RetryFunction = (retry: number, error: any) => number;
 
-interface DownloadOptions {
-    body?: string | Buffer | NodeJS.ReadableStream;
-    encoding?: string | null;
-    query?: string | object;
-    timeout?: number | TimeoutOptions;
-    retries?: number | RetryFunction;
-    followRedirect?: boolean;
-    decompress?: boolean;
-    useElectronNet?: boolean;
-    /**
-     * If set to true, try extracting the file using decompress.
-     */
-    extract?: boolean;
-    /**
-     * Name of the saved file.
-     */
-    filename?: string;
-    /**
-     * Proxy endpoint
-     */
-    proxy?: string;
+    interface DownloadOptions extends DecompressOptions, GotBodyOptions<string> {
+        /**
+         * If set to true, try extracting the file using decompress.
+         */
+        extract?: boolean;
+        /**
+         * Name of the saved file.
+         */
+        filename?: string;
+        /**
+         * Proxy endpoint
+         */
+        proxy?: string;
+    }
 }
 
-declare namespace download {}
-declare function download(url: string, destination?: string, options?: DownloadOptions): Promise<Buffer> & NodeJS.WritableStream & NodeJS.ReadableStream;
+declare function download(url: string, destination?: string, options?: download.DownloadOptions): Promise<Buffer> & NodeJS.WritableStream & NodeJS.ReadableStream;
 
 export = download;

From 791f043bdbb668bb3f7af61b377384179107d217 Mon Sep 17 00:00:00 2001
From: ozum <ozum@ozum.net>
Date: Fri, 16 Mar 2018 19:27:49 +0300
Subject: [PATCH 0593/1382] [hapi] Fix: Make server.app non-optional

---
 types/hapi/index.d.ts                  |  4 ++--
 types/hapi/test/server/server-app.ts   | 12 ++++++------
 types/hapi/test/server/server-table.ts |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/types/hapi/index.d.ts b/types/hapi/index.d.ts
index 220a96868f..fc66eaf1d1 100644
--- a/types/hapi/index.d.ts
+++ b/types/hapi/index.d.ts
@@ -2586,7 +2586,7 @@ export interface ServerInjectOptions extends Shot.RequestOptions {
     /**
      * sets the initial value of request.app, defaults to {}.
      */
-    app?: ApplicationState;
+    app: ApplicationState;
     /**
      * sets the initial value of request.plugins, defaults to {}.
      */
@@ -3257,7 +3257,7 @@ export class Server extends Podium {
      * Initialized with an empty object.
      * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverapp)
      */
-    app?: ApplicationState;
+    app: ApplicationState;
 
     /**
      * Server Auth: properties and methods
diff --git a/types/hapi/test/server/server-app.ts b/types/hapi/test/server/server-app.ts
index 8e9cff88b0..69bac86e2f 100644
--- a/types/hapi/test/server/server-app.ts
+++ b/types/hapi/test/server/server-app.ts
@@ -6,20 +6,20 @@ const options: ServerOptions = {
 };
 
 declare module "hapi" {
-	// Demonstrate augmenting the application state.
-	interface ApplicationState {
-		key?: string;
-	}
+    // Demonstrate augmenting the application state.
+    interface ApplicationState {
+        key?: string;
+    }
 }
 
 const server = new Server(options);
-server.app!.key = 'value2';
+server.app.key = 'value2';
 
 const serverRoute: ServerRoute = {
     path: '/',
     method: 'GET',
     handler(request, h) {
-        return 'key: ' + request.server.app!.key;
+        return 'key: ' + request.server.app.key;
     }
 };
 
diff --git a/types/hapi/test/server/server-table.ts b/types/hapi/test/server/server-table.ts
index 9237a2be28..ab14938be4 100644
--- a/types/hapi/test/server/server-table.ts
+++ b/types/hapi/test/server/server-table.ts
@@ -6,7 +6,7 @@ const options: ServerOptions = {
 };
 
 const server = new Server(options);
-server.app!.key = 'value2';
+server.app.key = 'value2';
 
 server.route({
     path: '/',

From 93c465339846bed8f4e94465d243f8de5be24c0c Mon Sep 17 00:00:00 2001
From: James Munro <me@jdmunro.net>
Date: Fri, 16 Mar 2018 17:21:45 +0000
Subject: [PATCH 0594/1382] Added values to the QueryOptions.

---
 types/mysql/index.d.ts     | 5 +++++
 types/mysql/mysql-tests.ts | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/types/mysql/index.d.ts b/types/mysql/index.d.ts
index 1e827a7d37..d888add7c5 100644
--- a/types/mysql/index.d.ts
+++ b/types/mysql/index.d.ts
@@ -240,6 +240,11 @@ export interface QueryOptions {
      */
     sql: string;
 
+    /**
+     * Values for template query
+     */
+    values: any;
+
     /**
      * Every operation takes an optional inactivity timeout option. This allows you to specify appropriate timeouts for
      * operations. It is important to note that these timeouts are not part of the MySQL protocol, and rather timeout
diff --git a/types/mysql/mysql-tests.ts b/types/mysql/mysql-tests.ts
index a3ddb27248..480e7e0275 100644
--- a/types/mysql/mysql-tests.ts
+++ b/types/mysql/mysql-tests.ts
@@ -423,6 +423,9 @@ connection.query({
     }
 });
 
+connection.query({sql: '...', values: ['test']}, (err: Error, results: any) => {
+});
+
 connection = mysql.createConnection("mysql://localhost/test?flags=-FOUND_ROWS");
 connection = mysql.createConnection({debug: true});
 connection = mysql.createConnection({debug: ['ComQueryPacket', 'RowDataPacket']});

From fb9fd388133623b71838009be863406cbff1e7a1 Mon Sep 17 00:00:00 2001
From: James Munro <me@jdmunro.net>
Date: Fri, 16 Mar 2018 17:22:36 +0000
Subject: [PATCH 0595/1382] Updated authors.

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

diff --git a/types/mysql/index.d.ts b/types/mysql/index.d.ts
index d888add7c5..c12ebdfbc7 100644
--- a/types/mysql/index.d.ts
+++ b/types/mysql/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by:  William Johnston <https://github.com/wjohnsto>
 // 	                Kacper Polak <https://github.com/kacepe>
 // 	                Krittanan Pingclasai <https://github.com/kpping>
+// 	                James Munro <https://github.com/jdmunro>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 

From 37d9f2229970c130880c16f739d4ebb3719c536a Mon Sep 17 00:00:00 2001
From: James Munro <me@jdmunro.net>
Date: Fri, 16 Mar 2018 17:27:36 +0000
Subject: [PATCH 0596/1382] Values is optional.

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

diff --git a/types/mysql/index.d.ts b/types/mysql/index.d.ts
index c12ebdfbc7..555fc703bf 100644
--- a/types/mysql/index.d.ts
+++ b/types/mysql/index.d.ts
@@ -244,7 +244,7 @@ export interface QueryOptions {
     /**
      * Values for template query
      */
-    values: any;
+    values?: any;
 
     /**
      * Every operation takes an optional inactivity timeout option. This allows you to specify appropriate timeouts for

From 7eca634065b9894f2fb5a3ecf7ad32c06b8fb117 Mon Sep 17 00:00:00 2001
From: Dominique <domi.rau@gmail.com>
Date: Fri, 16 Mar 2018 17:50:26 +0100
Subject: [PATCH 0597/1382] chore(ts): change typescript version dependancy

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

diff --git a/types/download/index.d.ts b/types/download/index.d.ts
index 56eb6cc16d..5d19321fb0 100644
--- a/types/download/index.d.ts
+++ b/types/download/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/kevva/download
 // Definitions by: Nico Jansen <https://github.com/nicojs>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 /// <reference types="node" />
 import { DecompressOptions } from 'decompress';

From eb690e38f060e3b8c19d09b432beb151f1977d2a Mon Sep 17 00:00:00 2001
From: EpixZhang <git@exz.me>
Date: Fri, 16 Mar 2018 18:04:23 +0800
Subject: [PATCH 0598/1382] Additional font options for NodeOptions and
 EdgeOptions according to http://visjs.org/docs/network/nodes.html and
 http://visjs.org/docs/network/edges.html

---
 types/vis/index.d.ts | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/types/vis/index.d.ts b/types/vis/index.d.ts
index e7ca718dab..c0b33b27aa 100644
--- a/types/vis/index.d.ts
+++ b/types/vis/index.d.ts
@@ -1793,6 +1793,12 @@ export interface NodeOptions {
     strokeWidth?: number, // px
     strokeColor?: string,
     align?: string,
+    vadjust?: string,
+    multi?: string,
+    bold?: string | FontOptions,
+    ital?: string | FontOptions,
+    boldital?: string | FontOptions,
+    mono?: string | FontOptions,
   };
 
   group?: string;
@@ -1881,6 +1887,12 @@ export interface EdgeOptions {
     strokeWidth?: number, // px
     strokeColor?: string,
     align?: string,
+    vadjust?: string,
+    multi?: string,
+    bold?: string | FontOptions,
+    ital?: string | FontOptions,
+    boldital?: string | FontOptions,
+    mono?: string | FontOptions,
   };
 
   from?: number | string;
@@ -1923,6 +1935,14 @@ export interface EdgeOptions {
   width?: number;
 }
 
+export interface FontOptions {
+  color?: string;
+  size?: number;
+  face?: string;
+  mod?: string;
+  vadjust?: string;
+}
+
 export interface OptionsScaling {
   min?: number;
   max?: number;

From d6aa691771eece90237c9b724bf76ffbb79330d1 Mon Sep 17 00:00:00 2001
From: Ray Vanderborght <voidstar@gmail.com>
Date: Fri, 16 Mar 2018 16:13:22 -0700
Subject: [PATCH 0599/1382] Give elementRef an argument

In order to support doing things like clearing card input fields.

See: https://github.com/stripe/react-stripe-elements/issues/26
---
 types/react-stripe-elements/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/react-stripe-elements/index.d.ts b/types/react-stripe-elements/index.d.ts
index 56f0f3c33a..0ef90dc839 100644
--- a/types/react-stripe-elements/index.d.ts
+++ b/types/react-stripe-elements/index.d.ts
@@ -47,7 +47,7 @@ export namespace ReactStripeElements {
 
 		className?: string;
 
-		elementRef?(): void;
+		elementRef?(ref: any): void;
 
 		onChange?(event: ElementChangeResponse): void;
 

From 0284a8f28960e7abc252365e8426051871d9c089 Mon Sep 17 00:00:00 2001
From: Christian Rackerseder <git@echooff.de>
Date: Sat, 17 Mar 2018 00:37:23 +0100
Subject: [PATCH 0600/1382] Exports missing interface

---
 types/tiny-slider-react/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/tiny-slider-react/index.d.ts b/types/tiny-slider-react/index.d.ts
index b509595f81..9cf22beab7 100644
--- a/types/tiny-slider-react/index.d.ts
+++ b/types/tiny-slider-react/index.d.ts
@@ -5,7 +5,7 @@
 // TypeScript Version: 2.6
 import * as React from "react";
 
-interface CommonOptions {
+export interface CommonOptions {
     /**
      * The initial index of the slider.
      * @defaultValue 0

From 22f37365352076f9cc1804f086606822729d48e9 Mon Sep 17 00:00:00 2001
From: Stevearzh <zy911004@gmail.com>
Date: Sat, 17 Mar 2018 12:43:33 +0800
Subject: [PATCH 0601/1382] add test case for GridCellRangeRenderer

---
 .../react-virtualized-tests.tsx               | 111 ++++++++++++++++++
 1 file changed, 111 insertions(+)

diff --git a/types/react-virtualized/react-virtualized-tests.tsx b/types/react-virtualized/react-virtualized-tests.tsx
index c71c2bc6d7..0c73f368d0 100644
--- a/types/react-virtualized/react-virtualized-tests.tsx
+++ b/types/react-virtualized/react-virtualized-tests.tsx
@@ -1835,3 +1835,114 @@ export class WindowScrollerExample extends PureComponent<{}, any> {
         this.context.setScrollingCustomElement(event.target.checked)
     }
 }
+
+import { GridCellProps, GridCellRangeProps, GridProps } from 'react-virtualized'
+
+export class GridCellRangeRendererExample extends PureComponent<{}, any> {
+
+    constructor(props) {
+        super(props)
+
+        this.state = {
+            columnWidth: 75,
+            columnCount: 50,
+            height: 300,
+            rowHeight: 40,
+            rowCount: 100
+        }
+
+        this._cellRangeRenderer = this._cellRangeRenderer.bind(this)
+    }
+
+    render() {
+        const {
+            columnCount,
+            columnWidth,
+            height,
+            rowHeight,
+            rowCount
+        } = this.state
+
+        return (
+            <Grid
+                cellRangeRenderer={this._cellRangeRenderer}
+                cellRenderer={(props: GridCellProps): React.ReactNode => (
+                    <div key={props.key} style={props.style}>
+                        I'm a table cell
+                    </div>
+                )}
+                columnCount={columnCount}
+                columnWidth={columnWidth}
+                height={height}
+                rowCount={rowCount}
+                rowHeight={rowHeight}
+                width={columnWidth}
+            />
+        )
+    }
+
+    _cellRangeRenderer({
+        cellCache,                    // Temporary cell cache used while scrolling
+        cellRenderer,                 // Cell renderer prop supplied to Grid
+        columnSizeAndPositionManager, // @see CellSizeAndPositionManager,
+        columnStartIndex,             // Index of first column (inclusive) to render
+        columnStopIndex,              // Index of last column (inclusive) to render
+        horizontalOffsetAdjustment,   // Horizontal pixel offset (required for scaling)
+        isScrolling,                  // The Grid is currently being scrolled
+        rowSizeAndPositionManager,    // @see CellSizeAndPositionManager,
+        rowStartIndex,                // Index of first column (inclusive) to render
+        rowStopIndex,                 // Index of last column (inclusive) to render
+        scrollLeft,                   // Current horizontal scroll offset of Grid
+        scrollTop,                    // Current vertical scroll offset of Grid
+        styleCache,                   // Temporary style (size & position) cache used while scrolling
+        verticalOffsetAdjustment,     // Vertical pixel offset (required for scaling)
+        parent,
+        visibleColumnIndices,
+        visibleRowIndices,
+      }: GridCellRangeProps): React.ReactNode[] {
+        const renderedCells: React.ReactNode[] = []
+        const style: React.CSSProperties = {}
+
+        for (let rowIndex = rowStartIndex; rowIndex <= rowStopIndex; rowIndex++) {
+            // This contains :offset (top) and :size (height) information for the cell
+            const rowDatum = rowSizeAndPositionManager.getSizeAndPositionOfCell(rowIndex)
+
+            for (let columnIndex = columnStartIndex; columnIndex <= columnStopIndex; columnIndex++) {
+                // This contains :offset (left) and :size (width) information for the cell
+                const columnDatum = columnSizeAndPositionManager.getSizeAndPositionOfCell(columnIndex)
+
+                // Be sure to adjust cell position in case the total set of cells is too large to be supported by the browser natively.
+                // In this case, Grid will shift cells as a user scrolls to increase cell density.
+                const left = columnDatum.offset + horizontalOffsetAdjustment
+                const top = rowDatum.offset + verticalOffsetAdjustment
+
+                // The rest of the information you need to render the cell are contained in the data.
+                // Be sure to provide unique :key attributes.
+                const key = `${rowIndex}-${columnIndex}`
+                const height = rowDatum.size
+                const width = columnDatum.size
+                const isVisible =
+                    columnIndex >= visibleColumnIndices.start &&
+                    columnIndex <= visibleColumnIndices.stop &&
+                    rowIndex >= visibleRowIndices.start &&
+                    rowIndex <= visibleRowIndices.stop
+
+                // Now render your cell and additional UI as you see fit.
+                // Add all rendered children to the :renderedCells Array.
+                const gridCellProps: GridCellProps = {
+                    columnIndex,
+                    isScrolling,
+                    isVisible,
+                    key,
+                    parent,
+                    rowIndex,
+                    style,
+                }
+
+                renderedCells.push(cellRenderer(gridCellProps))
+            }
+        }
+
+        return renderedCells
+      }
+}

From d8bb99f2fdd0e264cfb2e5d81646ca10a05c0ceb Mon Sep 17 00:00:00 2001
From: Stevearzh <zy911004@gmail.com>
Date: Sat, 17 Mar 2018 12:59:02 +0800
Subject: [PATCH 0602/1382] remove unused props type

---
 types/react-virtualized/react-virtualized-tests.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/react-virtualized/react-virtualized-tests.tsx b/types/react-virtualized/react-virtualized-tests.tsx
index 0c73f368d0..f11fa644f5 100644
--- a/types/react-virtualized/react-virtualized-tests.tsx
+++ b/types/react-virtualized/react-virtualized-tests.tsx
@@ -1836,7 +1836,7 @@ export class WindowScrollerExample extends PureComponent<{}, any> {
     }
 }
 
-import { GridCellProps, GridCellRangeProps, GridProps } from 'react-virtualized'
+import { GridCellProps, GridCellRangeProps } from 'react-virtualized'
 
 export class GridCellRangeRendererExample extends PureComponent<{}, any> {
 

From 8c3f0b43ec67bf18fed4a9d1a65ff9fa2dda39d0 Mon Sep 17 00:00:00 2001
From: kobanyan <kobanyan@users.noreply.github.com>
Date: Sat, 17 Mar 2018 16:00:24 +0900
Subject: [PATCH 0603/1382] [sinon-chrome] Remove Plugin interface

---
 types/sinon-chrome/index.d.ts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/types/sinon-chrome/index.d.ts b/types/sinon-chrome/index.d.ts
index d7fd948c63..bf9cd535fd 100644
--- a/types/sinon-chrome/index.d.ts
+++ b/types/sinon-chrome/index.d.ts
@@ -38,7 +38,7 @@ declare namespace SinonChrome {
      */
     export function reset(): void;
 
-    export function registerPlugin(plugin: SinonChrome.plugins.Plugin): void;
+    export function registerPlugin(plugin: {}): void;
 
     export var csi: Sinon.SinonSpy;
     export var loadTimes: Sinon.SinonSpy;
@@ -357,7 +357,6 @@ declare namespace SinonChrome.permissions {
 }
 
 declare namespace SinonChrome.plugins {
-    export interface Plugin {}
     export interface Translation {
         message: string;
         placeholders?: object;
@@ -365,10 +364,10 @@ declare namespace SinonChrome.plugins {
     export interface Translations {
         [key: string]: Translation;
     }
-    export class I18nPlugin implements Plugin {
+    export class I18nPlugin {
         constructor(translations: Translations);
     }
-    export class CookiePlugin implements Plugin {
+    export class CookiePlugin {
         constructor(state?: Array<chrome.cookies.Cookie>);
     }
 }

From cc57bb88506840a2ff0d15f617f3e81346ff6c19 Mon Sep 17 00:00:00 2001
From: kobanyan <kobanyan@users.noreply.github.com>
Date: Sat, 17 Mar 2018 16:01:14 +0900
Subject: [PATCH 0604/1382] [sinon-chrome] Make translations parameter optional

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

diff --git a/types/sinon-chrome/index.d.ts b/types/sinon-chrome/index.d.ts
index bf9cd535fd..bda8449fb1 100644
--- a/types/sinon-chrome/index.d.ts
+++ b/types/sinon-chrome/index.d.ts
@@ -365,7 +365,7 @@ declare namespace SinonChrome.plugins {
         [key: string]: Translation;
     }
     export class I18nPlugin {
-        constructor(translations: Translations);
+        constructor(translations?: Translations);
     }
     export class CookiePlugin {
         constructor(state?: Array<chrome.cookies.Cookie>);

From 661e06710bb70e01eb3c0109d04712219de26cac Mon Sep 17 00:00:00 2001
From: kobanyan <kobanyan@users.noreply.github.com>
Date: Sat, 17 Mar 2018 16:02:38 +0900
Subject: [PATCH 0605/1382] [sinon-chrome] Follow the browser spec

---
 types/sinon-chrome/index.d.ts | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/types/sinon-chrome/index.d.ts b/types/sinon-chrome/index.d.ts
index bda8449fb1..263135e060 100644
--- a/types/sinon-chrome/index.d.ts
+++ b/types/sinon-chrome/index.d.ts
@@ -357,12 +357,17 @@ declare namespace SinonChrome.permissions {
 }
 
 declare namespace SinonChrome.plugins {
-    export interface Translation {
-        message: string;
-        placeholders?: object;
-    }
     export interface Translations {
-        [key: string]: Translation;
+        [key: string]: {
+            message: string;
+            description?: string;
+            placeholders?: {
+              [key: string]: {
+                content: string;
+                example?: string;
+              };
+            };
+        };
     }
     export class I18nPlugin {
         constructor(translations?: Translations);

From f3e8b658b7353545455099e49b5b7ca69230d59d Mon Sep 17 00:00:00 2001
From: denis <denisname@users.noreply.github.com>
Date: Sat, 17 Mar 2018 13:06:42 +0100
Subject: [PATCH 0606/1382] Remove useless events functions

---
 types/select2/index.d.ts | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/types/select2/index.d.ts b/types/select2/index.d.ts
index 51e297a9a8..4ded9f2c23 100644
--- a/types/select2/index.d.ts
+++ b/types/select2/index.d.ts
@@ -199,16 +199,6 @@ interface JQuery {
     on(events: "select2-loaded", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
     on(events: "select2-focus", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
     on(events: "select2-blur", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
-    on(events: "select2-opening", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
-    on(events: "select2-open", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
-    on(events: "select2-close", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
-    on(events: "select2-highlight", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
-    on(events: "select2-selecting", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
-    on(events: "select2-removing", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
-    on(events: "select2-removed", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
-    on(events: "select2-loaded", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
-    on(events: "select2-focus", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
-    on(events: "select2-blur", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
 }
 
 declare class Select2 {

From 68bd62d8e499526b4fe00f57fe3b9efbfb980d8a Mon Sep 17 00:00:00 2001
From: denis <denisname@users.noreply.github.com>
Date: Sat, 17 Mar 2018 13:07:46 +0100
Subject: [PATCH 0607/1382] Copy content of select2 dir to select2/v3

---
 types/select2/v3/index.d.ts       | 217 ++++++++++++++++++++++++++++
 types/select2/v3/select2-tests.ts | 230 ++++++++++++++++++++++++++++++
 types/select2/v3/tsconfig.json    |  24 ++++
 types/select2/v3/tslint.json      |  79 ++++++++++
 4 files changed, 550 insertions(+)
 create mode 100644 types/select2/v3/index.d.ts
 create mode 100644 types/select2/v3/select2-tests.ts
 create mode 100644 types/select2/v3/tsconfig.json
 create mode 100644 types/select2/v3/tslint.json

diff --git a/types/select2/v3/index.d.ts b/types/select2/v3/index.d.ts
new file mode 100644
index 0000000000..4ded9f2c23
--- /dev/null
+++ b/types/select2/v3/index.d.ts
@@ -0,0 +1,217 @@
+// Type definitions for Select2 4.0.1
+// Project: http://ivaynberg.github.com/select2/
+// Definitions by: Boris Yankov <https://github.com/borisyankov>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+
+/// <reference types="jquery"/>
+
+interface Select2QueryOptions {
+    term?: string;
+    page?: number;
+    context?: any;
+    callback?: (result: { results: any; more?: boolean; context?: any; }) => void;
+}
+
+interface AjaxFunction {
+    (settings: JQueryAjaxSettings, success?: (data: any) => null, failure?: () => null): JQueryXHR;
+}
+
+interface Select2AjaxOptions extends JQueryAjaxSettings {
+    transport?: AjaxFunction;
+    /**
+    * Url to make request to, Can be string or a function returning a string.
+    */
+    url?: any;
+    dataType?: string;
+    delay?: number;
+    headers?: any;
+    cache?: boolean;
+    data?: (params: Select2QueryOptions, page: number, context: any) => any;
+    results?: (term: any, page: number, context: any) => any;
+    processResults?: (data: any, params: any) => any;
+    templateResult?: (data: any) => any;
+    templateSelection?: (data: any) => any;
+}
+
+interface IdTextPair {
+    id: any;
+    text: string;
+}
+
+interface Select2Options {
+    amdBase?: string;
+    amdLanguageBase?: string;
+    width?: string;
+    dropdownAutoWidth?: boolean;
+    minimumInputLength?: number;
+    maximumInputLength?: number;
+    minimumResultsForSearch?: number;
+    maximumSelectionLength?: number;
+    placeholder?: string | IdTextPair;
+    separator?: string;
+    allowClear?: boolean;
+    multiple?: boolean;
+    disabled?: boolean;
+    closeOnSelect?: boolean;
+    openOnEnter?: boolean;
+    id?: (object: any) => string;
+    matcher?: (term: string, text: string, option: any) => boolean;
+    formatSelection?: (object: any, container: JQuery, escapeMarkup: (markup: string) => string) => string;
+    formatResult?: (object: any, container: JQuery, query: any, escapeMarkup: (markup: string) => string) => string;
+    formatResultCssClass?: (object: any) => string;
+    formatNoMatches?: (term: string) => string;
+    formatSearching?: () => string;
+    formatInputTooShort?: (term: string, minLength: number) => string;
+    formatSelectionTooBig?: (maxSize: number) => string;
+    formatLoadMore?: (pageNumber: number) => string;
+    createSearchChoice?: (term: string, data: any) => any;
+    initSelection?: (element: JQuery, callback: (data: any) => void) => void;
+    tokenizer?: (input: string, selection: any[], selectCallback: () => void, options: Select2Options) => string;
+    tokenSeparators?: string[];
+    query?: (options: Select2QueryOptions) => void;
+    ajax?: Select2AjaxOptions;
+    data?: any;
+    tags?: any;
+    createTag?: any;
+    containerCss?: any;
+    containerCssClass?: any;
+    dropdownCss?: any;
+    dropdownCssClass?: any;
+    escapeMarkup?: (markup: string) => string;
+    theme?: string;
+    /**
+    * Template can return both plain string that will be HTML escaped and a jquery object that can render HTML
+    */
+    templateSelection?: (object: Select2SelectionObject, container: JQuery) => any;
+    templateResult?: (object: Select2SelectionObject) => any;
+    language?: string | string[] | {};
+    selectOnClose?: boolean;
+    sorter?: (data: any[]) => any[];
+    dropdownParent?: JQuery;
+    debug?: boolean;
+    dropdownAdapter?: any;
+    selectionAdapter?: any;
+    resultsAdapter?: any;
+}
+
+interface Select2JQueryEventObject extends JQueryEventObject {
+    val: any;
+    added: any;
+    removed: any;
+    choice: {
+        id: any;
+        text: string;
+    };
+}
+
+interface Select2SelectionObject {
+    loading: boolean;
+    disabled: boolean;
+    element: HTMLOptionElement;
+    id: string;
+    selected: boolean;
+    text: string;
+    title: string;
+}
+
+interface Select2Plugin {
+    amd: any;
+
+    (): JQuery;
+    (it: IdTextPair): JQuery;
+
+	/**
+	 * Get the id value of the current selection
+	 */
+    (method: 'val'): any;
+	/**
+	 * Set the id value of the current selection
+	 * @params value Value to set the id to
+	 * @params triggerChange Should a change event be triggered
+	 */
+    (method: 'val', value: any, triggerChange?: boolean): any;
+	/**
+	 * Get the data object of the current selection
+	 */
+    (method: 'data'): any;
+	/**
+	 * Set the data of the current selection
+	 * @params value Object to set the data to
+	 * @params triggerChange Should a change event be triggered
+	 */
+    (method: 'data', value: any, triggerChange?: boolean): any;
+	/**
+	 * Reverts changes to DOM done by Select2. Any selection done via Select2 will be preserved.
+	 */
+    (method: 'destroy'): JQuery;
+	/**
+	 * Opens the dropdown
+	 */
+    (method: 'open'): JQuery;
+	/**
+	 * Closes the dropdown
+	 */
+    (method: 'close'): JQuery;
+	/**
+	 * Enables or disables Select2 and its underlying form component
+	 * @param value True if it should be enabled false if it should be disabled
+	 */
+    (method: 'enable', value: boolean): JQuery;
+	/**
+	 * Toggles readonly mode on Select2 and its underlying form component
+	 * @param value True if it should be readonly false if it should be read write
+	 */
+    (method: 'readonly', value: boolean): JQuery;
+	/**
+	 * Retrieves the main container element that wraps all of DOM added by Select2
+	 */
+    (method: 'container'): JQuery;
+	/**
+	 * Notifies Select2 that a drag and drop sorting operation has started
+	 */
+    (method: 'onSortStart'): JQuery;
+	/**
+	 * Notifies Select2 that a drag and drop sorting operation has finished
+	 */
+    (method: 'onSortEnd'): JQuery;
+
+    (method: string): any;
+    (method: string, value: any, trigger?: boolean): any;
+    (options: Select2Options): JQuery;
+}
+
+interface JQuery {
+    select2: Select2Plugin;
+    off(events?: "change", selector?: any, handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
+
+    on(events: "change", selector?: string, data?: any, handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
+    on(events: "change", selector?: string, handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
+    on(events: "change", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
+    on(events: "select2-opening", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
+    on(events: "select2-open", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
+    on(events: "select2-close", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
+    on(events: "select2-highlight", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
+    on(events: "select2-selecting", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
+    on(events: "select2-removing", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
+    on(events: "select2-removed", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
+    on(events: "select2-loaded", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
+    on(events: "select2-focus", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
+    on(events: "select2-blur", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
+}
+
+declare class Select2 {
+    constructor(element: JQuery, options: Select2Options);
+    focus(): void;
+    destroy(): void;
+    on(event: string, callback: Function): void;
+    selection: any;
+    dropdown: any;
+    results: any;
+    $container: JQuery;
+    $dropdown: JQuery;
+    $selection: JQuery;
+    $results: JQuery;
+    options: { options: Select2Options };
+}
diff --git a/types/select2/v3/select2-tests.ts b/types/select2/v3/select2-tests.ts
new file mode 100644
index 0000000000..29da3b6f81
--- /dev/null
+++ b/types/select2/v3/select2-tests.ts
@@ -0,0 +1,230 @@
+$("#e9").select2();
+$("#e2").select2({
+    placeholder: "Select a State",
+    allowClear: true
+});
+$("#e2_2").select2({
+    placeholder: "Select a State"
+});
+$("#e2_3").select2({
+    placeholder: { id: "1", text: "Select options" }
+});
+$("#e3").select2({
+    minimumInputLength: 2
+});
+function format(state) {
+    if (!state.id) return state.text;
+    return "<img class='flag' src='images/flags/" + state.id.toLowerCase() + ".png'/>" + state.text;
+}
+$("#e4").select2({
+    formatResult: format,
+    formatSelection: format
+});
+$("#e5").select2({
+    minimumInputLength: 1,
+    query: function (query) {
+        var data = { results: [] }, i, j, s;
+        for (i = 1; i < 5; i++) {
+            s = "";
+            for (j = 0; j < i; j++) { s = s + query.term; }
+            data.results.push({ id: query.term + i, text: s });
+        }
+    }
+});
+
+$("#e19").select2({ maximumSelectionLength: 3 });
+$("#e10").select2({
+    data: [{ id: 0, text: 'enhancement' }, { id: 1, text: 'bug' }, { id: 2, text: 'duplicate' }, { id: 3, text: 'invalid' }, { id: 4, text: 'wontfix' }]
+});
+
+var data = [{ id: 0, tag: 'enhancement' }, { id: 1, tag: 'bug' }, { id: 2, tag: 'duplicate' }, { id: 3, tag: 'invalid' }, { id: 4, tag: 'wontfix' }];
+
+$("#e10_2").select2({
+    data: { results: data, text: 'tag' },
+    formatSelection: format,
+    formatResult: format
+});
+
+$("#e10_3").select2({
+    data: { results: data, text: function (item) { console.log('called with', item); return item.tag; } },
+    formatSelection: format,
+    formatResult: format
+});
+var movieFormatResult, movieFormatSelection;
+$("#e6").select2({
+    placeholder: "Search for a movie",
+    minimumInputLength: 1,
+    ajax: {
+        url: "http://api.rottentomatoes.com/api/public/v1.0/movies.json",
+        dataType: 'jsonp',
+        cache: false,
+        data: function (params, page) {
+            return {
+                q: params.term,
+                page_limit: 10,
+                apikey: "ju6z9mjyajq2djue3gbvv26t"
+            };
+        },
+        results: function (data, page) {
+            return { results: data.movies };
+        }
+    },
+    formatResult: movieFormatResult,
+    formatSelection: movieFormatSelection,
+    dropdownCssClass: "bigdrop"
+});
+$("#e6").select2({
+    placeholder: "Search for a movie",
+    minimumInputLength: 1,
+    ajax: {
+        url: () => { return "http://api.rottentomatoes.com/api/public/v1.0/movies.json"; },
+        dataType: 'jsonp',
+        data: function (params, page) {
+            return {
+                q: params.term,
+                page_limit: 10,
+                apikey: "ju6z9mjyajq2djue3gbvv26t"
+            };
+        },
+        results: function (data, page) {
+            return { results: data.movies };
+        }
+    },
+    formatResult: movieFormatResult,
+    formatSelection: movieFormatSelection,
+    dropdownCssClass: "bigdrop"
+});
+$("#e6").select2({
+    placeholder: "Search for a movie",
+    minimumInputLength: 1,
+    ajax: {
+        url: "http://api.rottentomatoes.com/api/public/v1.0/movies.json",
+        type: 'GET',
+        dataType: 'jsonp',
+        cache: false,
+        data: function (params, page) {
+            return {
+                q: params.term,
+                page_limit: 10,
+                apikey: "ju6z9mjyajq2djue3gbvv26t"
+            };
+        },
+        results: function (data, page) {
+            return { results: data.movies };
+        }
+    },
+    formatResult: movieFormatResult,
+    formatSelection: movieFormatSelection,
+    dropdownCssClass: "bigdrop"
+});
+$("#e7").select2({
+    placeholder: "Search for a movie",
+    minimumInputLength: 3,
+    ajax: {
+        url: "http://api.rottentomatoes.com/api/public/v1.0/movies.json",
+        dataType: 'jsonp',
+        delay: 100,
+        data: function (params, page) {
+            return {
+                q: params.term,
+                page_limit: 10,
+                page: page,
+                apikey: "ju6z9mjyajq2djue3gbvv26t"
+            };
+        },
+        results: function (data, page) {
+            var more = (page * 10) < data.total;
+            return { results: data.movies, more: more };
+        }
+    },
+    formatResult: movieFormatResult,
+    formatSelection: movieFormatSelection,
+    dropdownCssClass: "bigdrop"
+});
+
+function sort(elements) {
+    return elements.sort();
+}
+$("#e20").select2({
+    sorter: sort
+});
+
+$("#e8").select2();
+$("#e8_get").click(function () { alert("Selected value is: " + $("#e8").select2("val")); });
+$("#e8_set").click(function () { $("#e8").select2("val", "CA"); });
+$("#e8_cl").click(function () { $("#e8").select2("val", ""); });
+$("#e8_get2").click(function () { alert("Selected data is: " + JSON.stringify($("#e8").select2("data"))); });
+$("#e8_set2").click(function () { $("#e8").select2("data", { id: "CA", text: "California" }); });
+$("#e8_open").click(function () { $("#e8").select2("open"); });
+$("#e8_close").click(function () { $("#e8").select2("close"); });
+$("#e8_2").select2();
+$("#e8_2_get").click(function () { alert("Selected value is: " + $("#e8_2").select2("val")); });
+$("#e8_2_set").click(function () { $("#e8_2").select2("val", ["CA", "MA"]); });
+$("#e8_2_get2").click(function () { alert("Selected value is: " + JSON.stringify($("#e8_2").select2("data"))); });
+$("#e8_2_set2").click(function () { $("#e8_2").select2("data", [{ id: "CA", text: "California" }, { id: "MA", text: "Massachusetts" }]); });
+$("#e8_2_cl").click(function () { $("#e8_2").select2("val", ""); });
+$("#e8_2_open").click(function () { $("#e8_2").select2("open"); });
+$("#e8_2_close").click(function () { $("#e8_2").select2("close"); });
+$("#e11").select2({
+    placeholder: "Select report type",
+    allowClear: true,
+    data: [{ id: 0, text: 'story' }, { id: 1, text: 'bug' }, { id: 2, text: 'task' }]
+});
+$("#e11_2").select2({
+    createSearchChoice: function (term, data) { if ($(data).filter(function () { return this.textContent.localeCompare(term) === 0; }).length === 0) { return { id: term, text: term }; } },
+    multiple: true,
+    data: [{ id: 0, text: 'story' }, { id: 1, text: 'bug' }, { id: 2, text: 'task' }]
+});
+function log(e) {
+    var item = $("<li>" + e + "</li>");
+    $("#events_11").append(item);
+    item.animate({ opacity: 1 }, 10000, 'linear', function () { item.animate({ opacity: 0 }, 2000, 'linear', function () { item.remove(); }); });
+}
+$("#e11")
+    // TS 0.9.5: correct overload not resolved https://typescript.codeplex.com/discussions/472172
+    .on("change", function (e: Select2JQueryEventObject) { log(JSON.stringify({ val: e.val, added: e.added, removed: e.removed })); })
+    .on("open", function () { log("open"); });
+$("#e11_2")
+    .on("change", function (e: Select2JQueryEventObject) { log(JSON.stringify({ val: e.val, added: e.added, removed: e.removed })); })
+    .on("open", function () { log("open"); });
+$("#e12").select2({ tags: ["red", "green", "blue"] });
+$("#e20").select2({
+    tags: ["red", "green", "blue"],
+    tokenSeparators: [",", " "]
+});
+$("#e13").select2();
+$("#e13_ca").click(function () { $("#e13").val("CA").trigger("change"); });
+$("#e13_ak_co").click(function () { $("#e13").val(["AK", "CO"]).trigger("change"); });
+$("#e14").val(["AL", "AZ"]).select2();
+$("#e14_init").click(function () { $("#e14").select2(); });
+$("#e14_destroy").click(function () { $("#e14").select2("destroy"); });
+$("#e15").select2({ tags: ["red", "green", "blue", "orange", "white", "black", "purple", "cyan", "teal"] });
+$("#e15").on("change", function () { $("#e15_val").html($("#e15").val() as string); });
+
+$("#e16").select2();
+$("#e16_2").select2();
+$("#e16_enable").click(function () { $("#e16,#e16_2").select2("enable"); });
+$("#e16_disable").click(function () { $("#e16,#e16_2").select2("disable"); });
+$("#e17").select2({
+    matcher: function (term, text) { return text.toUpperCase().indexOf(term.toUpperCase()) == 0; }
+});
+$("#e17_2").select2({
+    matcher: function (term, text, opt) {
+        return text.toUpperCase().indexOf(term.toUpperCase()) >= 0
+            || opt.attr("alt").toUpperCase().indexOf(term.toUpperCase()) >= 0;
+    }
+});
+$("#e18,#e18_2").select2();
+alert("Selected value is: " + $("#e8").select2("val")); $("#e8").select2("val", { id: "CA", text: "Califoria" });
+
+$("#e8").select2("val");
+$("#e8").select2("val", "CA");
+$("#e8").select2("data");
+$("#e8").select2("data", { id: "CA", text: "Califoria" });
+$("#e8").select2("destroy");
+$("#e8").select2("open");
+$("#e8").select2("enable", false);
+$("#e8").select2("readonly", false);
+$("#e8").select2('container');
+$("#e8").select2('onSortStart');
+$("#e8").select2('onSortEnd');
diff --git a/types/select2/v3/tsconfig.json b/types/select2/v3/tsconfig.json
new file mode 100644
index 0000000000..292cf878b4
--- /dev/null
+++ b/types/select2/v3/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": false,
+        "noImplicitThis": false,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "select2-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/select2/v3/tslint.json b/types/select2/v3/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/select2/v3/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}

From 21d69f189b359c49fde94f3c7a7fe4028e102de9 Mon Sep 17 00:00:00 2001
From: denis <denisname@users.noreply.github.com>
Date: Sat, 17 Mar 2018 13:24:00 +0100
Subject: [PATCH 0608/1382] Remove v4 types in v3

---
 types/select2/v3/index.d.ts       | 73 +++++++------------------------
 types/select2/v3/select2-tests.ts | 28 +++++-------
 types/select2/v3/tsconfig.json    |  9 +++-
 3 files changed, 33 insertions(+), 77 deletions(-)

diff --git a/types/select2/v3/index.d.ts b/types/select2/v3/index.d.ts
index 4ded9f2c23..21bb2611c7 100644
--- a/types/select2/v3/index.d.ts
+++ b/types/select2/v3/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Select2 4.0.1
+// Type definitions for Select2 3.5
 // Project: http://ivaynberg.github.com/select2/
 // Definitions by: Boris Yankov <https://github.com/borisyankov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -15,7 +15,8 @@ interface Select2QueryOptions {
 }
 
 interface AjaxFunction {
-    (settings: JQueryAjaxSettings, success?: (data: any) => null, failure?: () => null): JQueryXHR;
+    (settings: JQueryAjaxSettings): JQueryXHR;
+    (url: string, settings?: JQueryAjaxSettings): JQueryXHR;
 }
 
 interface Select2AjaxOptions extends JQueryAjaxSettings {
@@ -25,14 +26,12 @@ interface Select2AjaxOptions extends JQueryAjaxSettings {
     */
     url?: any;
     dataType?: string;
-    delay?: number;
-    headers?: any;
+    quietMillis?: number;
     cache?: boolean;
-    data?: (params: Select2QueryOptions, page: number, context: any) => any;
+    jsonpCallback?: any;
+    data?: (term: string, page: number, context: any) => any;
     results?: (term: any, page: number, context: any) => any;
-    processResults?: (data: any, params: any) => any;
-    templateResult?: (data: any) => any;
-    templateSelection?: (data: any) => any;
+    params?: any;
 }
 
 interface IdTextPair {
@@ -41,19 +40,16 @@ interface IdTextPair {
 }
 
 interface Select2Options {
-    amdBase?: string;
-    amdLanguageBase?: string;
     width?: string;
     dropdownAutoWidth?: boolean;
     minimumInputLength?: number;
     maximumInputLength?: number;
     minimumResultsForSearch?: number;
-    maximumSelectionLength?: number;
-    placeholder?: string | IdTextPair;
+    maximumSelectionSize?: number;
+    placeholder?: string;
     separator?: string;
     allowClear?: boolean;
     multiple?: boolean;
-    disabled?: boolean;
     closeOnSelect?: boolean;
     openOnEnter?: boolean;
     id?: (object: any) => string;
@@ -74,26 +70,11 @@ interface Select2Options {
     ajax?: Select2AjaxOptions;
     data?: any;
     tags?: any;
-    createTag?: any;
     containerCss?: any;
     containerCssClass?: any;
     dropdownCss?: any;
     dropdownCssClass?: any;
     escapeMarkup?: (markup: string) => string;
-    theme?: string;
-    /**
-    * Template can return both plain string that will be HTML escaped and a jquery object that can render HTML
-    */
-    templateSelection?: (object: Select2SelectionObject, container: JQuery) => any;
-    templateResult?: (object: Select2SelectionObject) => any;
-    language?: string | string[] | {};
-    selectOnClose?: boolean;
-    sorter?: (data: any[]) => any[];
-    dropdownParent?: JQuery;
-    debug?: boolean;
-    dropdownAdapter?: any;
-    selectionAdapter?: any;
-    resultsAdapter?: any;
 }
 
 interface Select2JQueryEventObject extends JQueryEventObject {
@@ -106,19 +87,7 @@ interface Select2JQueryEventObject extends JQueryEventObject {
     };
 }
 
-interface Select2SelectionObject {
-    loading: boolean;
-    disabled: boolean;
-    element: HTMLOptionElement;
-    id: string;
-    selected: boolean;
-    text: string;
-    title: string;
-}
-
 interface Select2Plugin {
-    amd: any;
-
     (): JQuery;
     (it: IdTextPair): JQuery;
 
@@ -158,7 +127,7 @@ interface Select2Plugin {
 	 * Enables or disables Select2 and its underlying form component
 	 * @param value True if it should be enabled false if it should be disabled
 	 */
-    (method: 'enable', value: boolean): JQuery;
+    (method: 'enable', value?: boolean): JQuery;
 	/**
 	 * Toggles readonly mode on Select2 and its underlying form component
 	 * @param value True if it should be readonly false if it should be read write
@@ -176,9 +145,11 @@ interface Select2Plugin {
 	 * Notifies Select2 that a drag and drop sorting operation has finished
 	 */
     (method: 'onSortEnd'): JQuery;
+     /**
+     * Executes a new search using the provided value. Example: $("#tags").select2("search", "California")
+     */
+    (method: 'search'): JQuery;
 
-    (method: string): any;
-    (method: string, value: any, trigger?: boolean): any;
     (options: Select2Options): JQuery;
 }
 
@@ -194,24 +165,10 @@ interface JQuery {
     on(events: "select2-close", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
     on(events: "select2-highlight", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
     on(events: "select2-selecting", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
+    on(events: "select2-clearing", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
     on(events: "select2-removing", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
     on(events: "select2-removed", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
     on(events: "select2-loaded", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
     on(events: "select2-focus", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
     on(events: "select2-blur", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
 }
-
-declare class Select2 {
-    constructor(element: JQuery, options: Select2Options);
-    focus(): void;
-    destroy(): void;
-    on(event: string, callback: Function): void;
-    selection: any;
-    dropdown: any;
-    results: any;
-    $container: JQuery;
-    $dropdown: JQuery;
-    $selection: JQuery;
-    $results: JQuery;
-    options: { options: Select2Options };
-}
diff --git a/types/select2/v3/select2-tests.ts b/types/select2/v3/select2-tests.ts
index 29da3b6f81..3b331cec3b 100644
--- a/types/select2/v3/select2-tests.ts
+++ b/types/select2/v3/select2-tests.ts
@@ -6,9 +6,6 @@ $("#e2").select2({
 $("#e2_2").select2({
     placeholder: "Select a State"
 });
-$("#e2_3").select2({
-    placeholder: { id: "1", text: "Select options" }
-});
 $("#e3").select2({
     minimumInputLength: 2
 });
@@ -32,7 +29,7 @@ $("#e5").select2({
     }
 });
 
-$("#e19").select2({ maximumSelectionLength: 3 });
+$("#e19").select2({ maximumSelectionSize: 3 });
 $("#e10").select2({
     data: [{ id: 0, text: 'enhancement' }, { id: 1, text: 'bug' }, { id: 2, text: 'duplicate' }, { id: 3, text: 'invalid' }, { id: 4, text: 'wontfix' }]
 });
@@ -58,9 +55,9 @@ $("#e6").select2({
         url: "http://api.rottentomatoes.com/api/public/v1.0/movies.json",
         dataType: 'jsonp',
         cache: false,
-        data: function (params, page) {
+        data: function (term, page) {
             return {
-                q: params.term,
+                q: term,
                 page_limit: 10,
                 apikey: "ju6z9mjyajq2djue3gbvv26t"
             };
@@ -79,9 +76,9 @@ $("#e6").select2({
     ajax: {
         url: () => { return "http://api.rottentomatoes.com/api/public/v1.0/movies.json"; },
         dataType: 'jsonp',
-        data: function (params, page) {
+        data: function (term, page) {
             return {
-                q: params.term,
+                q: term,
                 page_limit: 10,
                 apikey: "ju6z9mjyajq2djue3gbvv26t"
             };
@@ -102,9 +99,9 @@ $("#e6").select2({
         type: 'GET',
         dataType: 'jsonp',
         cache: false,
-        data: function (params, page) {
+        data: function (term, page) {
             return {
-                q: params.term,
+                q: term,
                 page_limit: 10,
                 apikey: "ju6z9mjyajq2djue3gbvv26t"
             };
@@ -123,10 +120,10 @@ $("#e7").select2({
     ajax: {
         url: "http://api.rottentomatoes.com/api/public/v1.0/movies.json",
         dataType: 'jsonp',
-        delay: 100,
-        data: function (params, page) {
+        quietMillis: 100,
+        data: function (term, page) {
             return {
-                q: params.term,
+                q: term,
                 page_limit: 10,
                 page: page,
                 apikey: "ju6z9mjyajq2djue3gbvv26t"
@@ -145,9 +142,6 @@ $("#e7").select2({
 function sort(elements) {
     return elements.sort();
 }
-$("#e20").select2({
-    sorter: sort
-});
 
 $("#e8").select2();
 $("#e8_get").click(function () { alert("Selected value is: " + $("#e8").select2("val")); });
@@ -204,7 +198,7 @@ $("#e15").on("change", function () { $("#e15_val").html($("#e15").val() as strin
 $("#e16").select2();
 $("#e16_2").select2();
 $("#e16_enable").click(function () { $("#e16,#e16_2").select2("enable"); });
-$("#e16_disable").click(function () { $("#e16,#e16_2").select2("disable"); });
+$("#e16_disable").click(function () { $("#e16,#e16_2").select2("enable", false); });
 $("#e17").select2({
     matcher: function (term, text) { return text.toUpperCase().indexOf(term.toUpperCase()) == 0; }
 });
diff --git a/types/select2/v3/tsconfig.json b/types/select2/v3/tsconfig.json
index 292cf878b4..8b8f30ed05 100644
--- a/types/select2/v3/tsconfig.json
+++ b/types/select2/v3/tsconfig.json
@@ -9,11 +9,16 @@
         "noImplicitThis": false,
         "strictNullChecks": false,
         "strictFunctionTypes": true,
-        "baseUrl": "../",
+        "baseUrl": "../../",
         "typeRoots": [
-            "../"
+            "../../"
         ],
         "types": [],
+        "paths": {
+            "select2": [
+                "select2/v3"
+            ]
+        },        
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },

From 2b9ce28409b9a8b26b20b4f7bd8e8aabf73658f6 Mon Sep 17 00:00:00 2001
From: denis <denisname@users.noreply.github.com>
Date: Sat, 17 Mar 2018 13:30:32 +0100
Subject: [PATCH 0609/1382] Remove v3 types in v4

---
 types/select2/index.d.ts | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/types/select2/index.d.ts b/types/select2/index.d.ts
index 4ded9f2c23..0d7da1fe0f 100644
--- a/types/select2/index.d.ts
+++ b/types/select2/index.d.ts
@@ -1,10 +1,9 @@
-// Type definitions for Select2 4.0.1
+// Type definitions for Select2 4.0
 // Project: http://ivaynberg.github.com/select2/
 // Definitions by: Boris Yankov <https://github.com/borisyankov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-
 /// <reference types="jquery"/>
 
 interface Select2QueryOptions {
@@ -66,7 +65,6 @@ interface Select2Options {
     formatInputTooShort?: (term: string, minLength: number) => string;
     formatSelectionTooBig?: (maxSize: number) => string;
     formatLoadMore?: (pageNumber: number) => string;
-    createSearchChoice?: (term: string, data: any) => any;
     initSelection?: (element: JQuery, callback: (data: any) => void) => void;
     tokenizer?: (input: string, selection: any[], selectCallback: () => void, options: Select2Options) => string;
     tokenSeparators?: string[];
@@ -92,8 +90,6 @@ interface Select2Options {
     dropdownParent?: JQuery;
     debug?: boolean;
     dropdownAdapter?: any;
-    selectionAdapter?: any;
-    resultsAdapter?: any;
 }
 
 interface Select2JQueryEventObject extends JQueryEventObject {
@@ -189,22 +185,22 @@ interface JQuery {
     on(events: "change", selector?: string, data?: any, handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
     on(events: "change", selector?: string, handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
     on(events: "change", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
-    on(events: "select2-opening", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
-    on(events: "select2-open", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
-    on(events: "select2-close", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
-    on(events: "select2-highlight", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
-    on(events: "select2-selecting", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
-    on(events: "select2-removing", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
-    on(events: "select2-removed", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
-    on(events: "select2-loaded", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
-    on(events: "select2-focus", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
-    on(events: "select2-blur", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
+    on(events: "select2:closing", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
+    on(events: "select2:close", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
+    on(events: "select2:opening", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
+    on(events: "select2:open", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
+    on(events: "select2:selecting", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
+    on(events: "select2:select", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
+    on(events: "select2:unselecting", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
+    on(events: "select2:unselect", handler?: (eventObject: Select2JQueryEventObject) => any): JQuery;
 }
 
 declare class Select2 {
     constructor(element: JQuery, options: Select2Options);
     focus(): void;
     destroy(): void;
+    // TODO: Don't use 'Function' as a type.
+    // tslint:disable-next-line:ban-types
     on(event: string, callback: Function): void;
     selection: any;
     dropdown: any;

From cee3ed319799b5acb1670b22576bdec220481fd6 Mon Sep 17 00:00:00 2001
From: denis <denisname@users.noreply.github.com>
Date: Sat, 17 Mar 2018 13:57:01 +0100
Subject: [PATCH 0610/1382] Linting v4

Remove all but unified-signatures rules in tslint.
Activate noImplicitAny and noImplicitThis.
Change code in select2-test and index according to the new styling
rules.
---
 types/select2/index.d.ts       |  13 ++--
 types/select2/select2-tests.ts | 116 ++++++++++++++++++---------------
 types/select2/tsconfig.json    |   4 +-
 types/select2/tslint.json      |  75 +--------------------
 4 files changed, 71 insertions(+), 137 deletions(-)

diff --git a/types/select2/index.d.ts b/types/select2/index.d.ts
index 0d7da1fe0f..3f04a52414 100644
--- a/types/select2/index.d.ts
+++ b/types/select2/index.d.ts
@@ -13,15 +13,14 @@ interface Select2QueryOptions {
     callback?: (result: { results: any; more?: boolean; context?: any; }) => void;
 }
 
-interface AjaxFunction {
-    (settings: JQueryAjaxSettings, success?: (data: any) => null, failure?: () => null): JQueryXHR;
-}
+type AjaxFunction =
+    (settings: JQueryAjaxSettings, success?: (data: any) => null, failure?: () => null) => JQueryXHR;
 
 interface Select2AjaxOptions extends JQueryAjaxSettings {
     transport?: AjaxFunction;
     /**
-    * Url to make request to, Can be string or a function returning a string.
-    */
+     * Url to make request to, can be string or a function returning a string.
+     */
     url?: any;
     dataType?: string;
     delay?: number;
@@ -80,8 +79,8 @@ interface Select2Options {
     escapeMarkup?: (markup: string) => string;
     theme?: string;
     /**
-    * Template can return both plain string that will be HTML escaped and a jquery object that can render HTML
-    */
+     * Template can return both plain string that will be HTML escaped and a jquery object that can render HTML
+     */
     templateSelection?: (object: Select2SelectionObject, container: JQuery) => any;
     templateResult?: (object: Select2SelectionObject) => any;
     language?: string | string[] | {};
diff --git a/types/select2/select2-tests.ts b/types/select2/select2-tests.ts
index 29da3b6f81..0a5458063a 100644
--- a/types/select2/select2-tests.ts
+++ b/types/select2/select2-tests.ts
@@ -12,9 +12,9 @@ $("#e2_3").select2({
 $("#e3").select2({
     minimumInputLength: 2
 });
-function format(state) {
+function format(state: any) {
     if (!state.id) return state.text;
-    return "<img class='flag' src='images/flags/" + state.id.toLowerCase() + ".png'/>" + state.text;
+    return `<img class="flag" src="images/flags/${state.id.toLowerCase()}.png"/>` + state.text;
 }
 $("#e4").select2({
     formatResult: format,
@@ -22,11 +22,11 @@ $("#e4").select2({
 });
 $("#e5").select2({
     minimumInputLength: 1,
-    query: function (query) {
-        var data = { results: [] }, i, j, s;
-        for (i = 1; i < 5; i++) {
-            s = "";
-            for (j = 0; j < i; j++) { s = s + query.term; }
+    query(query) {
+        const data = { results: [] as IdTextPair[] };
+        for (let i = 1; i < 5; i++) {
+            let s = "";
+            for (let j = 0; j < i; j++) { s = s + query.term; }
             data.results.push({ id: query.term + i, text: s });
         }
     }
@@ -37,7 +37,7 @@ $("#e10").select2({
     data: [{ id: 0, text: 'enhancement' }, { id: 1, text: 'bug' }, { id: 2, text: 'duplicate' }, { id: 3, text: 'invalid' }, { id: 4, text: 'wontfix' }]
 });
 
-var data = [{ id: 0, tag: 'enhancement' }, { id: 1, tag: 'bug' }, { id: 2, tag: 'duplicate' }, { id: 3, tag: 'invalid' }, { id: 4, tag: 'wontfix' }];
+const data = [{ id: 0, tag: 'enhancement' }, { id: 1, tag: 'bug' }, { id: 2, tag: 'duplicate' }, { id: 3, tag: 'invalid' }, { id: 4, tag: 'wontfix' }];
 
 $("#e10_2").select2({
     data: { results: data, text: 'tag' },
@@ -46,11 +46,18 @@ $("#e10_2").select2({
 });
 
 $("#e10_3").select2({
-    data: { results: data, text: function (item) { console.log('called with', item); return item.tag; } },
+    data: {
+        results: data,
+        text: (item: {tag: string}) => {
+            console.log('called with', item);
+            return item.tag;
+    }},
     formatSelection: format,
     formatResult: format
 });
-var movieFormatResult, movieFormatSelection;
+
+let movieFormatResult;
+let movieFormatSelection;
 $("#e6").select2({
     placeholder: "Search for a movie",
     minimumInputLength: 1,
@@ -58,14 +65,14 @@ $("#e6").select2({
         url: "http://api.rottentomatoes.com/api/public/v1.0/movies.json",
         dataType: 'jsonp',
         cache: false,
-        data: function (params, page) {
+        data(params, page) {
             return {
                 q: params.term,
                 page_limit: 10,
                 apikey: "ju6z9mjyajq2djue3gbvv26t"
             };
         },
-        results: function (data, page) {
+        results(data, page) {
             return { results: data.movies };
         }
     },
@@ -73,20 +80,22 @@ $("#e6").select2({
     formatSelection: movieFormatSelection,
     dropdownCssClass: "bigdrop"
 });
+
+let t: ArrayLike<string>;
 $("#e6").select2({
     placeholder: "Search for a movie",
     minimumInputLength: 1,
     ajax: {
-        url: () => { return "http://api.rottentomatoes.com/api/public/v1.0/movies.json"; },
+        url: () => "http://api.rottentomatoes.com/api/public/v1.0/movies.json",
         dataType: 'jsonp',
-        data: function (params, page) {
+        data(params, page) {
             return {
                 q: params.term,
                 page_limit: 10,
                 apikey: "ju6z9mjyajq2djue3gbvv26t"
             };
         },
-        results: function (data, page) {
+        results(data, page) {
             return { results: data.movies };
         }
     },
@@ -102,14 +111,14 @@ $("#e6").select2({
         type: 'GET',
         dataType: 'jsonp',
         cache: false,
-        data: function (params, page) {
+        data(params, page) {
             return {
                 q: params.term,
                 page_limit: 10,
                 apikey: "ju6z9mjyajq2djue3gbvv26t"
             };
         },
-        results: function (data, page) {
+        results(data, page) {
             return { results: data.movies };
         }
     },
@@ -124,17 +133,17 @@ $("#e7").select2({
         url: "http://api.rottentomatoes.com/api/public/v1.0/movies.json",
         dataType: 'jsonp',
         delay: 100,
-        data: function (params, page) {
+        data(params, aPage) {
             return {
                 q: params.term,
                 page_limit: 10,
-                page: page,
+                page: aPage,
                 apikey: "ju6z9mjyajq2djue3gbvv26t"
             };
         },
-        results: function (data, page) {
-            var more = (page * 10) < data.total;
-            return { results: data.movies, more: more };
+        results(data, page) {
+            const moreValue = (page * 10) < data.total;
+            return { results: data.movies, more: moreValue };
         }
     },
     formatResult: movieFormatResult,
@@ -142,7 +151,7 @@ $("#e7").select2({
     dropdownCssClass: "bigdrop"
 });
 
-function sort(elements) {
+function sort(elements: any) {
     return elements.sort();
 }
 $("#e20").select2({
@@ -150,66 +159,65 @@ $("#e20").select2({
 });
 
 $("#e8").select2();
-$("#e8_get").click(function () { alert("Selected value is: " + $("#e8").select2("val")); });
-$("#e8_set").click(function () { $("#e8").select2("val", "CA"); });
-$("#e8_cl").click(function () { $("#e8").select2("val", ""); });
-$("#e8_get2").click(function () { alert("Selected data is: " + JSON.stringify($("#e8").select2("data"))); });
-$("#e8_set2").click(function () { $("#e8").select2("data", { id: "CA", text: "California" }); });
-$("#e8_open").click(function () { $("#e8").select2("open"); });
-$("#e8_close").click(function () { $("#e8").select2("close"); });
+$("#e8_get").click(() => alert("Selected value is: " + $("#e8").select2("val")));
+$("#e8_set").click(() => $("#e8").select2("val", "CA"));
+$("#e8_cl").click(() => $("#e8").select2("val", ""));
+$("#e8_get2").click(() => alert("Selected data is: " + JSON.stringify($("#e8").select2("data"))));
+$("#e8_set2").click(() => $("#e8").select2("data", { id: "CA", text: "California" }));
+$("#e8_open").click(() => $("#e8").select2("open"));
+$("#e8_close").click(() => $("#e8").select2("close"));
 $("#e8_2").select2();
-$("#e8_2_get").click(function () { alert("Selected value is: " + $("#e8_2").select2("val")); });
-$("#e8_2_set").click(function () { $("#e8_2").select2("val", ["CA", "MA"]); });
-$("#e8_2_get2").click(function () { alert("Selected value is: " + JSON.stringify($("#e8_2").select2("data"))); });
-$("#e8_2_set2").click(function () { $("#e8_2").select2("data", [{ id: "CA", text: "California" }, { id: "MA", text: "Massachusetts" }]); });
-$("#e8_2_cl").click(function () { $("#e8_2").select2("val", ""); });
-$("#e8_2_open").click(function () { $("#e8_2").select2("open"); });
-$("#e8_2_close").click(function () { $("#e8_2").select2("close"); });
+$("#e8_2_get").click(() => alert("Selected value is: " + $("#e8_2").select2("val")));
+$("#e8_2_set").click(() => $("#e8_2").select2("val", ["CA", "MA"]));
+$("#e8_2_get2").click(() => alert("Selected value is: " + JSON.stringify($("#e8_2").select2("data"))));
+$("#e8_2_set2").click(() => $("#e8_2").select2("data", [{ id: "CA", text: "California" }, { id: "MA", text: "Massachusetts" }]));
+$("#e8_2_cl").click(() => $("#e8_2").select2("val", ""));
+$("#e8_2_open").click(() => $("#e8_2").select2("open"));
+$("#e8_2_close").click(() => $("#e8_2").select2("close"));
 $("#e11").select2({
     placeholder: "Select report type",
     allowClear: true,
     data: [{ id: 0, text: 'story' }, { id: 1, text: 'bug' }, { id: 2, text: 'task' }]
 });
 $("#e11_2").select2({
-    createSearchChoice: function (term, data) { if ($(data).filter(function () { return this.textContent.localeCompare(term) === 0; }).length === 0) { return { id: term, text: term }; } },
     multiple: true,
     data: [{ id: 0, text: 'story' }, { id: 1, text: 'bug' }, { id: 2, text: 'task' }]
 });
-function log(e) {
-    var item = $("<li>" + e + "</li>");
+function log(e: string) {
+    const item = $(`<li>${e}</li>`);
     $("#events_11").append(item);
-    item.animate({ opacity: 1 }, 10000, 'linear', function () { item.animate({ opacity: 0 }, 2000, 'linear', function () { item.remove(); }); });
+    item.animate({ opacity: 1 }, 10000, 'linear', () => item.animate({ opacity: 0 }, 2000, 'linear', () => item.remove()));
 }
 $("#e11")
     // TS 0.9.5: correct overload not resolved https://typescript.codeplex.com/discussions/472172
-    .on("change", function (e: Select2JQueryEventObject) { log(JSON.stringify({ val: e.val, added: e.added, removed: e.removed })); })
-    .on("open", function () { log("open"); });
+    .on("change", (e: Select2JQueryEventObject) => log(JSON.stringify({ val: e.val, added: e.added, removed: e.removed })))
+    .on("open", () => log("open"));
 $("#e11_2")
-    .on("change", function (e: Select2JQueryEventObject) { log(JSON.stringify({ val: e.val, added: e.added, removed: e.removed })); })
-    .on("open", function () { log("open"); });
+    .on("change", (e: Select2JQueryEventObject) => log(JSON.stringify({ val: e.val, added: e.added, removed: e.removed })))
+    .on("open", () => log("open"));
 $("#e12").select2({ tags: ["red", "green", "blue"] });
 $("#e20").select2({
     tags: ["red", "green", "blue"],
     tokenSeparators: [",", " "]
 });
 $("#e13").select2();
-$("#e13_ca").click(function () { $("#e13").val("CA").trigger("change"); });
-$("#e13_ak_co").click(function () { $("#e13").val(["AK", "CO"]).trigger("change"); });
+$("#e13_ca").click(() => $("#e13").val("CA").trigger("change"));
+$("#e13_ak_co").click(() => $("#e13").val(["AK", "CO"]).trigger("change"));
 $("#e14").val(["AL", "AZ"]).select2();
-$("#e14_init").click(function () { $("#e14").select2(); });
-$("#e14_destroy").click(function () { $("#e14").select2("destroy"); });
+$("#e14_init").click(() => $("#e14").select2());
+$("#e14_destroy").click(() => $("#e14").select2("destroy"));
 $("#e15").select2({ tags: ["red", "green", "blue", "orange", "white", "black", "purple", "cyan", "teal"] });
-$("#e15").on("change", function () { $("#e15_val").html($("#e15").val() as string); });
+$("#e15").on("change", () => $("#e15_val").html($("#e15").val() as string));
 
 $("#e16").select2();
 $("#e16_2").select2();
-$("#e16_enable").click(function () { $("#e16,#e16_2").select2("enable"); });
-$("#e16_disable").click(function () { $("#e16,#e16_2").select2("disable"); });
+$("#e16_enable").click(() => $("#e16,#e16_2").select2("enable"));
+$("#e16_disable").click(() => $("#e16,#e16_2").select2("disable"));
 $("#e17").select2({
-    matcher: function (term, text) { return text.toUpperCase().indexOf(term.toUpperCase()) == 0; }
+    matcher: (term, text) => text.toUpperCase().indexOf(term.toUpperCase()) === 0
 });
 $("#e17_2").select2({
-    matcher: function (term, text, opt) {
+    matcher: (term, text, opt) => {
         return text.toUpperCase().indexOf(term.toUpperCase()) >= 0
             || opt.attr("alt").toUpperCase().indexOf(term.toUpperCase()) >= 0;
     }
diff --git a/types/select2/tsconfig.json b/types/select2/tsconfig.json
index 292cf878b4..257d07ea49 100644
--- a/types/select2/tsconfig.json
+++ b/types/select2/tsconfig.json
@@ -5,8 +5,8 @@
             "es6",
             "dom"
         ],
-        "noImplicitAny": false,
-        "noImplicitThis": false,
+        "noImplicitAny": true,
+        "noImplicitThis": true,
         "strictNullChecks": false,
         "strictFunctionTypes": true,
         "baseUrl": "../",
diff --git a/types/select2/tslint.json b/types/select2/tslint.json
index a41bf5d19a..08b1465cd6 100644
--- a/types/select2/tslint.json
+++ b/types/select2/tslint.json
@@ -1,79 +1,6 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
-        "ban-types": false,
-        "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
-        "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
-        "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
-        "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
-        "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
-        "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
-        "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
+        "unified-signatures": false
     }
 }

From 8ca6f5823266871d7f49395396044e04812e8a2e Mon Sep 17 00:00:00 2001
From: Josh Goldberg <joshuakgoldberg@outlook.com>
Date: Sat, 17 Mar 2018 08:12:36 -0700
Subject: [PATCH 0611/1382] Re-add TS comment and beforeAll

---
 types/jest/index.d.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/types/jest/index.d.ts b/types/jest/index.d.ts
index 43768c629b..795ccb4739 100644
--- a/types/jest/index.d.ts
+++ b/types/jest/index.d.ts
@@ -13,7 +13,9 @@
 //                 Ahn <https://github.com/AhnpGit>
 //                 Josh Goldberg <https://github.com/joshuakgoldberg>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+-// TypeScript Version: 2.3
 
+declare var beforeAll: jest.Lifecycle;
 declare var beforeEach: jest.Lifecycle;
 declare var afterAll: jest.Lifecycle;
 declare var afterEach: jest.Lifecycle;

From c631d2f60d1a093da6140d034d6e862e8309067d Mon Sep 17 00:00:00 2001
From: Josh Goldberg <joshuakgoldberg@outlook.com>
Date: Sat, 17 Mar 2018 08:12:58 -0700
Subject: [PATCH 0612/1382] Update index.d.ts

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

diff --git a/types/jest/index.d.ts b/types/jest/index.d.ts
index 795ccb4739..70e9d6328b 100644
--- a/types/jest/index.d.ts
+++ b/types/jest/index.d.ts
@@ -13,7 +13,7 @@
 //                 Ahn <https://github.com/AhnpGit>
 //                 Josh Goldberg <https://github.com/joshuakgoldberg>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
--// TypeScript Version: 2.3
+// TypeScript Version: 2.3
 
 declare var beforeAll: jest.Lifecycle;
 declare var beforeEach: jest.Lifecycle;

From b158c345534c334c3209f3c02f8d7d94db806d51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Moroz?= <lukaszmoroz@gmail.com>
Date: Wed, 14 Mar 2018 13:30:38 +0100
Subject: [PATCH 0613/1382] three: Correct `Plane.coplanarPoint` argument type

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

diff --git a/types/three/three-core.d.ts b/types/three/three-core.d.ts
index 31c8cbebe0..4acd40fdff 100644
--- a/types/three/three-core.d.ts
+++ b/types/three/three-core.d.ts
@@ -3948,7 +3948,7 @@ export class Plane {
     intersectLine(line: Line3, optionalTarget?: Vector3): Vector3;
     intersectsLine(line: Line3): boolean;
     intersectsBox(box: Box3): boolean;
-    coplanarPoint(optionalTarget?: boolean): Vector3;
+    coplanarPoint(optionalTarget?: Vector3): Vector3;
     applyMatrix4(matrix: Matrix4, optionalNormalMatrix?: Matrix3): Plane;
     translate(offset: Vector3): Plane;
     equals(plane: Plane): boolean;

From e6fa76027fb04efbde589f8d19e7aa1496838118 Mon Sep 17 00:00:00 2001
From: Sebastiaan Dammann <sebastiaandammann@outlook.com>
Date: Sat, 17 Mar 2018 20:34:40 +0100
Subject: [PATCH 0614/1382] Typeof T is still valid for isObservable /
 isWriteableObservable

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

diff --git a/types/knockout/index.d.ts b/types/knockout/index.d.ts
index 0964d24284..d4031b2337 100644
--- a/types/knockout/index.d.ts
+++ b/types/knockout/index.d.ts
@@ -444,10 +444,10 @@ interface KnockoutStatic {
     toJS(viewModel: any): any;
 
     isObservable(instance: any): instance is KnockoutObservable<any>;
-    isObservable<T>(instance: KnockoutObservable<T>): instance is KnockoutObservable<T>;
+    isObservable<T>(instance: KnockoutObservable<T> | T): instance is KnockoutObservable<T>;
 
     isWriteableObservable(instance: any): instance is KnockoutObservable<any>;
-    isWriteableObservable<T>(instance: KnockoutObservable<T>): instance is KnockoutObservable<T>;
+    isWriteableObservable<T>(instance: KnockoutObservable<T> | T): instance is KnockoutObservable<T>;
 
     isComputed(instance: any): instance is KnockoutComputed<any>;
     isComputed<T>(instance: KnockoutObservable<T> | T): instance is KnockoutComputed<T>;

From 6b7b07a0ab0107001239df30da0587606855a1b2 Mon Sep 17 00:00:00 2001
From: Guo Yunhe <guoyunhebrave@gmail.com>
Date: Sat, 17 Mar 2018 22:37:14 +0200
Subject: [PATCH 0615/1382] wpapi: types for WPAPI and APRequest classes

---
 types/wpapi/index.d.ts     | 492 +++++++++++++++++++++++++++++++++++++
 types/wpapi/tsconfig.json  |  16 ++
 types/wpapi/tslint.json    |   1 +
 types/wpapi/wpapi-tests.ts |   0
 4 files changed, 509 insertions(+)
 create mode 100644 types/wpapi/index.d.ts
 create mode 100644 types/wpapi/tsconfig.json
 create mode 100644 types/wpapi/tslint.json
 create mode 100644 types/wpapi/wpapi-tests.ts

diff --git a/types/wpapi/index.d.ts b/types/wpapi/index.d.ts
new file mode 100644
index 0000000000..309b613599
--- /dev/null
+++ b/types/wpapi/index.d.ts
@@ -0,0 +1,492 @@
+// Type definitions for wpapi 1.1
+// Project: https://github.com/wp-api/node-wpapi
+// Definitions by: Guo Yunhe <https://github.com/guoyunhe>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = WPAPI;
+
+/**
+ * REST API Client for WordPress
+ *
+ * @see http://wp-api.org/node-wpapi/api-reference/wpapi/1.1.2/WPAPI.html
+ */
+declare class WPAPI {
+    /**
+     * Construct a REST API client instance object to create
+     *
+     * @param options An options hash to configure the instance
+     */
+    constructor(options?: WPAPI.WPAPIOptions);
+
+    /**
+     * Take an arbitrary WordPress site, deduce the WP REST API root endpoint,
+     * query that endpoint, and parse the response JSON. Use the returned JSON
+     * response to instantiate a WPAPI instance bound to the provided site.
+     *
+     * @param url A URL within a REST API-enabled WordPress website
+     */
+    discover(url: string): Promise<WPAPI>;
+
+    /** Start a request against /categories endpoint */
+    categories(): WPAPI.WPRequest;
+
+    /** Start a request against /comments endpoints */
+    comments(): WPAPI.WPRequest;
+
+    /** Start a request against /media endpoints */
+    media(): WPAPI.WPRequest;
+
+    /** Start a request against /pages endpoints */
+    pages(): WPAPI.WPRequest;
+
+    /** Start a request against /posts endpoints */
+    posts(): WPAPI.WPRequest;
+
+    /** Start a request against /settings endpoints */
+    settings(): WPAPI.WPRequest;
+
+    /** Start a request against /statuses endpoints */
+    statuses(): WPAPI.WPRequest;
+
+    /** Start a request against /tags endpoints */
+    tags(): WPAPI.WPRequest;
+
+    /** Start a request against /taxonomies endpoints */
+    taxonomies(): WPAPI.WPRequest;
+
+    /** Start a request against /types endpoints */
+    types(): WPAPI.WPRequest;
+
+    /** Start a request against /users endpoints */
+    users(): WPAPI.WPRequest;
+
+    /**
+     * Set the authentication to use for a WPAPI site handler instance. Accepts
+     * basic HTTP authentication credentials (string username & password) or a
+     * Nonce (for cookie authentication) by default; may be overloaded to accept
+     * OAuth credentials in the future.
+     *
+     * @param credentials An authentication credentials object
+     */
+    auth(credentials?: WPAPI.Credentials): WPAPI;
+
+    /**
+     * Deduce request methods from a provided API root JSON response object's
+     * routes dictionary, and assign those methods to the current instance. If
+     * no routes dictionary is provided then the instance will be bootstrapped
+     * with route handlers for the default API endpoints only.
+     *
+     * This method is called automatically during WPAPI instance creation.
+     *
+     * @param routes The "routes" object from the JSON object returned from the
+     * root API endpoint of a WP site, which should be a dictionary of route
+     * definition objects keyed by the route's regex pattern
+     */
+    bootstrap(routes: WPAPI.Routes): WPAPI;
+
+    /**
+     * Access API endpoint handlers from a particular API namespace object
+     *
+     * @param namespace A namespace string
+     */
+    namespace(namespace: string): WPAPI;
+
+    /**
+     * Create and return a handler for an arbitrary WP REST API endpoint.
+     * TODO: type for Endpoint Factory
+     *
+     * @param namespace A namespace string, e.g. 'myplugin/v1'
+     * @param restBase A REST route string, e.g. '/author/(?P\d+)'
+     * @param options An (optional) options object
+     */
+    registerRoute(
+        namespace: string,
+        restBase: string,
+        options?: WPAPI.RegisterRouteOptions
+    ): Function;
+
+    /**
+     * Set the default headers to use for all HTTP requests created from this
+     * WPAPI site instance. Accepts a header name and its associated value as
+     * two strings, or multiple headers as an object of name-value pairs.
+     *
+     * @param headers
+     */
+    setHeaders(headers: WPAPI.HTTPHeaders): WPAPI;
+
+    /**
+     * Convenience method for making a new WPAPI instance
+     *
+     * @param endpoint The URI for a WP-API endpoint
+     * @param routes The "routes" object from the JSON object returned from the
+     * root API endpoint of a WP site, which should be a dictionary of route
+     * definition objects keyed by the route's regex pattern
+     */
+    site(endpoint: string, routes: WPAPI.Routes): WPAPI;
+
+    /**
+     * Set custom transport methods to use when making HTTP requests against the
+     * API.
+     *
+     * Pass an object with a function for one or many of "get", "post", "put",
+     * "delete" and "head" and that function will be called when making that
+     * type of request. The provided transport functions should take a WPRequest
+     * handler instance (e.g. the result of a wp.posts()... chain or any other
+     * chaining request handler) as their first argument; a data object as their
+     * second argument (for POST, PUT and DELETE requests); and an optional
+     * callback as their final argument. Transport methods should invoke the
+     * callback with the response data (or error, as appropriate), and should
+     * also return a Promise.
+     *
+     * @param transport A dictionary of HTTP transport methods
+     */
+    transport(transport: WPAPI.Transport): WPAPI;
+
+    /**
+     * Generate a query against an arbitrary path on the current endpoint. This
+     * is useful for requesting resources at custom WP-API endpoints, such as
+     * WooCommerce's /products.
+     *
+     * @param relativePath An endpoint-relative path to which to bind the request
+     */
+    root(relativePath?: string): WPAPI.WPRequest;
+
+    /**
+     * Generate a request against a completely arbitrary endpoint, with no
+     * assumptions about or mutation of path, filtering, or query parameters.
+     * This request is not restricted to the endpoint specified during WPAPI
+     * object instantiation.
+     *
+     * @param url The URL to request
+     */
+    url(url: string): WPAPI.WPRequest;
+}
+
+/*~ If you want to expose types from your module as well, you can
+ *~ place them in this block.
+ */
+declare namespace WPAPI {
+    /**
+     * The base WordPress API request
+     *
+     * @see http://wp-api.org/node-wpapi/api-reference/wpapi/1.1.2/WPRequest.html
+     */
+    export class WPRequest {
+        /**
+         * WPRequest is the base API request object constructor
+         *
+         * @param options A hash of options for the WPRequest instance
+         */
+        constructor(options: WPAPIOptions);
+
+        /**
+         * Set a request to use authentication, and optionally provide auth
+         * credentials. If auth credentials were already specified when the WPAPI
+         * instance was created, calling .auth on the request chain will set
+         * that request to use the existing credentials.
+         *
+         * @param credentials An authentication credentials object
+         */
+        auth(credentials?: WPAPI.Credentials): WPRequest;
+
+        /**
+         * Set the context of the request. Used primarily to expose private
+         * values on a request object by setting the context to "edit".
+         *
+         * @param context The context to set on the request
+         */
+        context(context: string): WPRequest;
+
+        /**
+         * Create the specified resource with the provided data
+         *
+         * This is the public interface for creating POST requests
+         *
+         * TODO: callback type
+         *
+         * @param data The data for the POST request
+         * @param callback A callback to invoke with the results of the POST request
+         */
+        create(data: Object, callback?: Function): Promise<any>;
+
+        /**
+         * Delete the specified resource
+         *
+         * @param data Data to send along with the DELETE request
+         * @param callback A callback to invoke with the results of the DELETE request
+         */
+        delete(data?: Object, callback?: Function): Promise<any>;
+
+        /**
+         * Convenience wrapper for .context( 'edit' )
+         */
+        edit(): WPRequest;
+
+        /**
+         * Return embedded resources as part of the response payload.
+         */
+        embed(): WPRequest;
+
+        /**
+         * Exclude specific resource IDs in the response collection.
+         *
+         * @param ids An ID or array of IDs to exclude
+         */
+        exclude(ids: number | number[]): WPRequest;
+
+        /**
+         * Specify a file or a file buffer to attach to the request, for use
+         * when creating a new Media item
+         *
+         * @param fileA path to a file (in Node) or an file object (Node or
+         * Browser) to attach to the request
+         * @param name An (optional) filename to use for the file
+         */
+        file(file: Object | string, name?: string): WPRequest;
+
+        /**
+         * Get the headers for the specified resource
+         *
+         * @param callback A callback to invoke with the results of the HEAD request
+         */
+        get(callback?: Function): Promise<any>;
+
+        /**
+         * Include specific resource IDs in the response collection.
+         *
+         * @param ids An ID or array of IDs to include
+         */
+        include(ids: number | number[]): WPRequest;
+
+        /**
+         * Set the namespace of the request, e.g. to specify the API root for
+         * routes registered by wp core v2 ("wp/v2") or by any given plugin. Any
+         * previously- set namespace will be overwritten by subsequent calls to
+         * the method.
+         *
+         * @param namespace A namespace string, e.g. "wp/v2"
+         */
+        namespace(namespace: string): WPRequest;
+
+        /**
+         * Set an arbitrary offset to retrieve items from a specific point in a
+         * collection.
+         *
+         * @param offsetNumber The number of items by which to offset the response
+         */
+        offset(offsetNumber: number): WPRequest;
+
+        /**
+         * Change the sort direction of a returned collection
+         *
+         * @param direction The order to use when sorting the response
+         */
+        order(direction: "asc" | "desc"): WPRequest;
+
+        /**
+         * Order a collection by a specific field
+         *
+         * @param field The field by which to order the response
+         */
+        orderby(field: string): WPRequest;
+
+        /**
+         * Set the pagination of a request. Use in conjunction with .perPage()
+         * for explicit pagination handling. (The number of pages in a response
+         * can be retrieved from the response's _paging.totalPages property.)
+         *
+         * @param pageNumber The page number of results to retrieve
+         */
+        page(pageNumber: number): WPRequest;
+
+        /**
+         * Set a parameter to render into the final query URI.
+         *
+         * @param props The name of the parameter to set, or an object containing
+         * parameter keys and their corresponding values
+         * @param value The value of the parameter being set
+         */
+        param(
+            props: string | Object,
+            value?: string | number | any[]
+        ): WPRequest;
+
+        /**
+         * Set the number of items to be returned in a page of responses.
+         *
+         * @param itemsPerPage The number of items to return in one page of results
+         */
+        perPage(itemsPerPage: number): WPRequest;
+
+        /**
+         * Filter results to those matching the specified search terms.
+         *
+         * @param searchString A string to search for within post content
+         */
+        search(searchString: string): WPRequest;
+
+        /**
+         * Specify one or more headers to send with the dispatched HTTP request.
+         *
+         * @param headers The name of the header to set, or an object of header
+         * names and their associated string values
+         * @param value The value of the header being set
+         */
+        setHeaders(headers: string | Object, value?: string): WPRequest;
+
+        /**
+         * Set a component of the resource URL itself (as opposed to a query
+         * parameter)
+         *
+         * If a path component has already been set at this level, throw an
+         * error: requests are meant to be transient, so any re-writing of a
+         * previously-set path part value is likely to be a mistake.
+         *
+         * @param level A "level" of the path to set, e.g. "1" or "2"
+         * @param value The value to set at that path part level
+         */
+        setPathPart(level: number | string, value: number | string): WPRequest;
+
+        /**
+         * Query a collection for members with a specific slug.
+         *
+         * @param slug A post slug (slug), e.g. "hello-world"
+         */
+        slug(slug: string): WPRequest;
+
+        /**
+         * Calling .then on a query chain will invoke the query as a GET and
+         * return a promise
+         *
+         * @param successCallback A callback to handle the data returned from
+         * the GET request
+         * @param failureCallback A callback to handle any errors encountered
+         * by the request
+         */
+        then(
+            successCallback?: Function,
+            failureCallback?: Function
+        ): Promise<any>;
+
+        /**
+         * Parse the request into a WordPress API request URI string
+         */
+        toString(): string;
+
+        /**
+         * Validate whether the specified path parts are valid for this endpoint
+         *
+         * "Path parts" are non-query-string URL segments, like "some" "path" in
+         * the URL mydomain.com/some/path?and=a&query=string&too. Because a well
+         * -formed path is necessary to execute a successful API request, we
+         * throw an error if the user has omitted a value (such as /some/[missing
+         * component]/url) or has provided a path part value that does not match
+         * the regular expression the API uses to goven that segment.
+         */
+        validatePath(): WPRequest;
+    }
+
+    export interface WPAPIOptions extends Credentials {
+        /** The URI for a WP-API endpoint */
+        endpoint: string;
+        /**
+         * A dictionary of API routes with which to bootstrap the WPAPI instance:
+         * the instance will be initialized with default routes only if this
+         * property is omitted
+         */
+        routes?: Routes;
+        /**
+         * An optional dictionary of HTTP transport methods (.get, .post, .put,
+         * .delete, .head) to use instead of the defaults, e.g. to use a
+         * different HTTP library than superagent
+         */
+        transport?: Transport;
+    }
+
+    export interface WPRequestOptions extends Credentials {
+        /** The URI for a WP-API endpoint */
+        endpoint: string;
+        /**
+         * An dictionary of HTTP transport methods (.get, .post, .put,
+         * .delete, .head) to use instead of the defaults, e.g. to use a
+         * different HTTP library than superagent
+         */
+        transport?: Transport;
+    }
+
+    /** Authentication credentials */
+    export interface Credentials {
+        /** A WP-API Basic HTTP Authentication username */
+        username?: string;
+        /** A WP-API Basic HTTP Authentication password */
+        password?: string;
+        /** A WP nonce for use with cookie authentication */
+        nonce?: string;
+    }
+
+    export interface Transport {
+        get?: TransportFunction;
+        post?: TransportFunction;
+        put?: TransportFunction;
+        delete?: TransportFunction;
+        head?: TransportFunction;
+    }
+
+    export type TransportFunction = (
+        wpreq: WPRequest,
+        cb: Function
+    ) => Promise<any>;
+
+    export interface Routes {
+        [path: string]: Route;
+    }
+
+    export interface Route {
+        namespace: string;
+        methods: HTTPMethod[];
+        endpoints: HTTPEndpoint[];
+        _links?: {
+            self: string;
+        };
+    }
+
+    export type HTTPMethod = "GET" | "POST" | "PUT" | "PATCH" | "DELETE";
+
+    export interface HTTPEndpoint {
+        methods: HTTPMethod[];
+        args: {
+            [arg: string]: HTTPArgument;
+        };
+    }
+
+    export interface HTTPArgument {
+        required: boolean;
+        default?: string | number;
+        enum?: string[];
+        description?: string;
+        type?: HTTPArgumentType;
+        items?: {
+            type: HTTPArgumentType;
+        };
+    }
+
+    export type HTTPArgumentType =
+        | "string"
+        | "integer"
+        | "number"
+        | "boolean"
+        | "object"
+        | "array";
+
+    export interface HTTPHeaders {
+        [key: string]: string;
+    }
+
+    export interface RegisterRouteOptions {
+        params?: string[];
+        methods?: HTTPMethod[];
+        mixins?: {
+            [key: string]: (val: any) => any;
+        };
+    }
+}
diff --git a/types/wpapi/tsconfig.json b/types/wpapi/tsconfig.json
new file mode 100644
index 0000000000..c017072758
--- /dev/null
+++ b/types/wpapi/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "target": "ES6",
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": ["index.d.ts", "wpapi-tests.ts"]
+}
diff --git a/types/wpapi/tslint.json b/types/wpapi/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/wpapi/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/wpapi/wpapi-tests.ts b/types/wpapi/wpapi-tests.ts
new file mode 100644
index 0000000000..e69de29bb2

From d337cc5fc506e03e6cd2205709d3ad6b35eb03f2 Mon Sep 17 00:00:00 2001
From: Guo Yunhe <guoyunhebrave@gmail.com>
Date: Sat, 17 Mar 2018 22:51:05 +0200
Subject: [PATCH 0616/1382] wpapi: discover() should be static function

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

diff --git a/types/wpapi/index.d.ts b/types/wpapi/index.d.ts
index 309b613599..62d4583042 100644
--- a/types/wpapi/index.d.ts
+++ b/types/wpapi/index.d.ts
@@ -25,7 +25,7 @@ declare class WPAPI {
      *
      * @param url A URL within a REST API-enabled WordPress website
      */
-    discover(url: string): Promise<WPAPI>;
+    static discover(url: string): Promise<WPAPI>;
 
     /** Start a request against /categories endpoint */
     categories(): WPAPI.WPRequest;

From b3f5f3c9e567c0d84ed3f94d5e67896ce772e63b Mon Sep 17 00:00:00 2001
From: Guo Yunhe <guoyunhebrave@gmail.com>
Date: Sat, 17 Mar 2018 23:21:45 +0200
Subject: [PATCH 0617/1382] wpapi: some missing function

---
 types/wpapi/index.d.ts | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/types/wpapi/index.d.ts b/types/wpapi/index.d.ts
index 62d4583042..3f3c293119 100644
--- a/types/wpapi/index.d.ts
+++ b/types/wpapi/index.d.ts
@@ -27,6 +27,9 @@ declare class WPAPI {
      */
     static discover(url: string): Promise<WPAPI>;
 
+    /** Start a request of plugin authors endpoint */
+    authors(): WPAPI.WPRequest;
+
     /** Start a request against /categories endpoint */
     categories(): WPAPI.WPRequest;
 
@@ -251,6 +254,13 @@ declare namespace WPAPI {
          */
         get(callback?: Function): Promise<any>;
 
+        /**
+         * Set the id of resource.
+         *
+         * @param id An ID of item
+         */
+        id(id: number): WPRequest;
+
         /**
          * Include specific resource IDs in the response collection.
          *
@@ -373,6 +383,18 @@ declare namespace WPAPI {
          */
         toString(): string;
 
+        /**
+         * Update the specified resource with the provided data
+         *
+         * This is the public interface for creating PATCH requests
+         *
+         * TODO: callback type
+         *
+         * @param data The data for the PATCH request
+         * @param callback A callback to invoke with the results of the PATCH request
+         */
+        update(data: Object, callback?: Function): Promise<any>;
+
         /**
          * Validate whether the specified path parts are valid for this endpoint
          *

From 764517153396b3502849dc31344a0c521e5228fe Mon Sep 17 00:00:00 2001
From: Guo Yunhe <guoyunhebrave@gmail.com>
Date: Sat, 17 Mar 2018 23:21:53 +0200
Subject: [PATCH 0618/1382] wpapi: test file

---
 types/wpapi/wpapi-tests.ts | 94 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 94 insertions(+)

diff --git a/types/wpapi/wpapi-tests.ts b/types/wpapi/wpapi-tests.ts
index e69de29bb2..e88b8d6dcb 100644
--- a/types/wpapi/wpapi-tests.ts
+++ b/types/wpapi/wpapi-tests.ts
@@ -0,0 +1,94 @@
+// Initialize the client
+import * as WPAPI from "wpapi";
+import { WPRequest } from "wpapi";
+
+const wp = new WPAPI({ endpoint: "http://src.wordpress-develop.dev/wp-json" });
+
+// Callbacks
+wp.posts().get(function(err: Error, data: any) {
+    if (err) {
+        // handle err
+    }
+    // do something with the returned posts
+});
+
+// Promises
+wp
+    .posts()
+    .then(function(data: any) {
+        // do something with the returned posts
+    })
+    .catch(function(err: Error) {
+        // handle error
+    });
+
+// Auto-discover
+const apiPromise = WPAPI.discover("http://my-site.com");
+apiPromise.then(function(site) {
+    // If default routes were detected, they are now available
+    site.posts().then(function(posts: Object[]) {}); // etc
+
+    // If custom routes were detected, they can be accessed via .namespace()
+    site
+        .namespace("myplugin/v1")
+        .authors()
+        .then(function(authors: Object[]) {
+            /* ... */
+        });
+
+    // Namespaces can be saved out to variables:
+    const myplugin = site.namespace("myplugin/v1");
+    myplugin
+        .authors()
+        .id(7)
+        .then(function(author: Object[]) {
+            /* ... */
+        });
+});
+
+// Authenticating with Auto-Discovery
+const apiPromise2 = WPAPI.discover("http://my-site.com").then(function(site) {
+    return site.auth({
+        username: "admin",
+        password: "always use secure passwords"
+    });
+});
+
+apiPromise2.then(function(site) {
+    // site is now configured to use authentication
+});
+
+// You must authenticate to be able to POST (create) a post
+const wp2 = new WPAPI({
+    endpoint: "http://your-site.com/wp-json",
+    // This assumes you are using basic auth, as described further below
+    username: "someusername",
+    password: "password"
+});
+wp2
+    .posts()
+    .create({
+        // "title" and "content" are the only required properties
+        title: "Your Post Title",
+        content: "Your post content",
+        // Post will be created as a draft by default if a specific "status"
+        // is not specified
+        status: "publish"
+    })
+    .then(function(response) {
+        // "response" will hold all properties of your newly-created post,
+        // including the unique `id` the post was assigned on creation
+    });
+
+// You must authenticate to be able to PUT (update) a post
+// .id() must be used to specify the post we are updating
+wp2
+    .posts()
+    .id(2501)
+    .update({
+        // Update the title
+        title: "A Better Title",
+        // Set the post live (assuming it was "draft" before)
+        status: "publish"
+    })
+    .then(function(response: Object) {});

From b4ad1412f1cc4f7d6e71cb8fc9dae1ae159cacfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Boun=C3=A9?= <dboune@gmail.com>
Date: Sat, 17 Mar 2018 18:04:31 -0700
Subject: [PATCH 0619/1382] stylus: fix incorrect method signature

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

diff --git a/types/stylus/index.d.ts b/types/stylus/index.d.ts
index 58a41872b1..5db1979770 100644
--- a/types/stylus/index.d.ts
+++ b/types/stylus/index.d.ts
@@ -1190,7 +1190,7 @@ declare namespace Stylus {
             /**
              * Merges this query list with the `other`.
              */
-            merge(other: MediaQueryList): MediaQueryList;
+            merge(other: QueryList): QueryList;
 
             /**
              * Return a JSON representation of this node.

From b9596736b01e6d583fee5fff16bac43d8342c998 Mon Sep 17 00:00:00 2001
From: Behind The Math <info@behindthemath.io>
Date: Sat, 17 Mar 2018 21:53:04 -0400
Subject: [PATCH 0620/1382] Fix indentation

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

diff --git a/types/sqlite3/index.d.ts b/types/sqlite3/index.d.ts
index 7461cf82b7..d4fb7c9599 100644
--- a/types/sqlite3/index.d.ts
+++ b/types/sqlite3/index.d.ts
@@ -90,12 +90,12 @@ export function verbose(): sqlite3;
 
 // tslint:disable-next-line:strict-export-declare-modifiers
 interface sqlite3 {
-	OPEN_READONLY: number;
-	OPEN_READWRITE: number;
-	OPEN_CREATE: number;
+    OPEN_READONLY: number;
+    OPEN_READWRITE: number;
+    OPEN_CREATE: number;
     cached: typeof cached;
     RunResult: RunResult;
     Statement: typeof Statement;
     Database: typeof Database;
-	verbose(): this;
+    verbose(): this;
 }

From ec1e7b9585552bd96a7e267f1198ac5538f8ce0c Mon Sep 17 00:00:00 2001
From: Jackson Delahunt <jackson@jacksondelahunt.com>
Date: Sun, 18 Mar 2018 15:00:54 +1000
Subject: [PATCH 0621/1382] Add path to ParseOptions

As seen in this example: https://github.com/EvanOxfeld/node-unzip#extract-to-a-directory
---
 types/unzipper/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/unzipper/index.d.ts b/types/unzipper/index.d.ts
index 99ece81913..0c99f912ad 100644
--- a/types/unzipper/index.d.ts
+++ b/types/unzipper/index.d.ts
@@ -98,6 +98,7 @@ export interface CentralDirectory {
 
 export class ParseOptions {
 	verbose: boolean;
+    path: string;
 	// more options?
 }
 

From 371ed5a11ceb61c401d225b071eee1ca99743958 Mon Sep 17 00:00:00 2001
From: Jackson Delahunt <jackson@jacksondelahunt.com>
Date: Sun, 18 Mar 2018 15:06:17 +1000
Subject: [PATCH 0622/1382] Make optional params optional

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

diff --git a/types/unzipper/index.d.ts b/types/unzipper/index.d.ts
index 0c99f912ad..313a23d75f 100644
--- a/types/unzipper/index.d.ts
+++ b/types/unzipper/index.d.ts
@@ -97,8 +97,8 @@ export interface CentralDirectory {
 }
 
 export class ParseOptions {
-	verbose: boolean;
-    path: string;
+	verbose?: boolean;
+    path?: string;
 	// more options?
 }
 

From f0f9810ef6d89ae390d67213f00d16b3196d02c8 Mon Sep 17 00:00:00 2001
From: Jackson Delahunt <jackson@jacksondelahunt.com>
Date: Sun, 18 Mar 2018 15:07:42 +1000
Subject: [PATCH 0623/1382] Spacing

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

diff --git a/types/unzipper/index.d.ts b/types/unzipper/index.d.ts
index 313a23d75f..5af7bbddf7 100644
--- a/types/unzipper/index.d.ts
+++ b/types/unzipper/index.d.ts
@@ -98,7 +98,7 @@ export interface CentralDirectory {
 
 export class ParseOptions {
 	verbose?: boolean;
-    path?: string;
+	path?: string;
 	// more options?
 }
 

From fd309d4e391c8748b2f4802b0fb6a133cd854c6c Mon Sep 17 00:00:00 2001
From: Jackson Delahunt <jackson@jacksondelahunt.com>
Date: Sun, 18 Mar 2018 16:37:16 +1000
Subject: [PATCH 0624/1382] finalize is not a promise - fixed

Docs state @return void: https://github.com/archiverjs/node-archiver/blob/0bc4872daf94055ba3fafd958d6769711fa39652/lib/core.js#L131
---
 types/archiver/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/archiver/index.d.ts b/types/archiver/index.d.ts
index df15f9ff65..d33e8ec6dd 100644
--- a/types/archiver/index.d.ts
+++ b/types/archiver/index.d.ts
@@ -35,7 +35,7 @@ declare namespace archiver {
         directory(dirpath: string, destpath: false | string, data?: EntryData | EntryDataFunction): this;
         file(filename: string, data: EntryData): this;
         glob(pattern: string, options?: glob.IOptions, data?: EntryData): this;
-        finalize(): Promise<void>;
+        finalize(): void;
 
         setFormat(format: string): this;
         setModule(module: Function): this;

From 5b64d8fb14247e3f717147ddbfb58b57d45caaf4 Mon Sep 17 00:00:00 2001
From: eivindh <eivind_h@outlook.com>
Date: Sun, 18 Mar 2018 12:56:34 +0100
Subject: [PATCH 0625/1382] Fixed SplitChunksOptions.cacheGroups not accepting
 dictionary

---
 types/webpack/index.d.ts       |  2 +-
 types/webpack/webpack-tests.ts | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/types/webpack/index.d.ts b/types/webpack/index.d.ts
index 2277ec2867..c6f4ae6c12 100644
--- a/types/webpack/index.d.ts
+++ b/types/webpack/index.d.ts
@@ -551,7 +551,7 @@ declare namespace webpack {
             /** Give chunks created a name (chunks with equal name are merged) */
             name?: boolean | string | ((...args: any[]) => any);
             /** Assign modules to a cache group (modules from different cache groups are tried to keep in separate chunks) */
-            cacheGroups?: false | string | ((...args: any[]) => any) | RegExp | CacheGroupsOptions;
+            cacheGroups?: false | string | ((...args: any[]) => any) | RegExp | { [key: string]: CacheGroupsOptions };
         }
         interface RuntimeChunkOptions {
             /** The name or name factory for the runtime chunks. */
diff --git a/types/webpack/webpack-tests.ts b/types/webpack/webpack-tests.ts
index 8fe0ab1e4d..f6295d99da 100644
--- a/types/webpack/webpack-tests.ts
+++ b/types/webpack/webpack-tests.ts
@@ -582,6 +582,22 @@ configuration = {
     }
 };
 
+configuration = {
+    mode: "production",
+    optimization: {
+        splitChunks: {
+            cacheGroups: {
+                vendor: {
+                    chunks: "initial",
+                    test: "node_modules",
+                    name: "vendor",
+                    enforce: true
+                }
+            }
+        }
+    },
+};
+
 plugin = new webpack.SplitChunksPlugin({ chunks: "async", minChunks: 2 });
 
 class SingleEntryDependency extends webpack.compilation.Dependency {}

From 91110e458cb1d8d6b01181753cac7213e04436e1 Mon Sep 17 00:00:00 2001
From: Guo Yunhe <guoyunhebrave@gmail.com>
Date: Sun, 18 Mar 2018 15:09:02 +0200
Subject: [PATCH 0626/1382] wpapi: add strictFunctionTypes option for
 tsconfig.json

---
 types/wpapi/tsconfig.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/wpapi/tsconfig.json b/types/wpapi/tsconfig.json
index c017072758..af7f0df782 100644
--- a/types/wpapi/tsconfig.json
+++ b/types/wpapi/tsconfig.json
@@ -6,6 +6,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": ["../"],
         "types": [],

From 5a3ea0a7e54e6a2a1c79cbf5b8c22d547c136334 Mon Sep 17 00:00:00 2001
From: Guo Yunhe <guoyunhebrave@gmail.com>
Date: Sun, 18 Mar 2018 15:18:58 +0200
Subject: [PATCH 0627/1382] Use arrow function

---
 types/wpapi/wpapi-tests.ts | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/types/wpapi/wpapi-tests.ts b/types/wpapi/wpapi-tests.ts
index e88b8d6dcb..7e414daecc 100644
--- a/types/wpapi/wpapi-tests.ts
+++ b/types/wpapi/wpapi-tests.ts
@@ -1,11 +1,10 @@
 // Initialize the client
 import * as WPAPI from "wpapi";
-import { WPRequest } from "wpapi";
 
 const wp = new WPAPI({ endpoint: "http://src.wordpress-develop.dev/wp-json" });
 
 // Callbacks
-wp.posts().get(function(err: Error, data: any) {
+wp.posts().get((err: Error, data: any) => {
     if (err) {
         // handle err
     }
@@ -15,24 +14,24 @@ wp.posts().get(function(err: Error, data: any) {
 // Promises
 wp
     .posts()
-    .then(function(data: any) {
+    .then((data: any) => {
         // do something with the returned posts
     })
-    .catch(function(err: Error) {
+    .catch((err: Error) => {
         // handle error
     });
 
 // Auto-discover
 const apiPromise = WPAPI.discover("http://my-site.com");
-apiPromise.then(function(site) {
+apiPromise.then(site => {
     // If default routes were detected, they are now available
-    site.posts().then(function(posts: Object[]) {}); // etc
+    site.posts().then((posts: Object[]) => {}); // etc
 
     // If custom routes were detected, they can be accessed via .namespace()
     site
         .namespace("myplugin/v1")
         .authors()
-        .then(function(authors: Object[]) {
+        .then((authors: Object[]) => {
             /* ... */
         });
 
@@ -41,20 +40,20 @@ apiPromise.then(function(site) {
     myplugin
         .authors()
         .id(7)
-        .then(function(author: Object[]) {
+        .then((author: Object[]) => {
             /* ... */
         });
 });
 
 // Authenticating with Auto-Discovery
-const apiPromise2 = WPAPI.discover("http://my-site.com").then(function(site) {
+const apiPromise2 = WPAPI.discover("http://my-site.com").then(site => {
     return site.auth({
         username: "admin",
         password: "always use secure passwords"
     });
 });
 
-apiPromise2.then(function(site) {
+apiPromise2.then(site => {
     // site is now configured to use authentication
 });
 
@@ -75,7 +74,7 @@ wp2
         // is not specified
         status: "publish"
     })
-    .then(function(response) {
+    .then((response: Object) => {
         // "response" will hold all properties of your newly-created post,
         // including the unique `id` the post was assigned on creation
     });
@@ -91,4 +90,4 @@ wp2
         // Set the post live (assuming it was "draft" before)
         status: "publish"
     })
-    .then(function(response: Object) {});
+    .then((response: Object) => {});

From c59f06c21f4a00775c947c34e4c1cf950ce3ca06 Mon Sep 17 00:00:00 2001
From: Guo Yunhe <guoyunhebrave@gmail.com>
Date: Sun, 18 Mar 2018 15:32:20 +0200
Subject: [PATCH 0628/1382] Format comments

---
 types/wpapi/index.d.ts | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/types/wpapi/index.d.ts b/types/wpapi/index.d.ts
index 3f3c293119..ae079b0edc 100644
--- a/types/wpapi/index.d.ts
+++ b/types/wpapi/index.d.ts
@@ -208,7 +208,8 @@ declare namespace WPAPI {
          * TODO: callback type
          *
          * @param data The data for the POST request
-         * @param callback A callback to invoke with the results of the POST request
+         * @param callback A callback to invoke with the results of the POST
+         * request
          */
         create(data: Object, callback?: Function): Promise<any>;
 
@@ -216,7 +217,8 @@ declare namespace WPAPI {
          * Delete the specified resource
          *
          * @param data Data to send along with the DELETE request
-         * @param callback A callback to invoke with the results of the DELETE request
+         * @param callback A callback to invoke with the results of the DELETE
+         * request
          */
         delete(data?: Object, callback?: Function): Promise<any>;
 
@@ -250,7 +252,8 @@ declare namespace WPAPI {
         /**
          * Get the headers for the specified resource
          *
-         * @param callback A callback to invoke with the results of the HEAD request
+         * @param callback A callback to invoke with the results of the HEAD
+         * request
          */
         get(callback?: Function): Promise<any>;
 
@@ -324,7 +327,8 @@ declare namespace WPAPI {
         /**
          * Set the number of items to be returned in a page of responses.
          *
-         * @param itemsPerPage The number of items to return in one page of results
+         * @param itemsPerPage The number of items to return in one page of
+         * results
          */
         perPage(itemsPerPage: number): WPRequest;
 
@@ -391,7 +395,8 @@ declare namespace WPAPI {
          * TODO: callback type
          *
          * @param data The data for the PATCH request
-         * @param callback A callback to invoke with the results of the PATCH request
+         * @param callback A callback to invoke with the results of the PATCH
+         * request
          */
         update(data: Object, callback?: Function): Promise<any>;
 

From dd915d157ffc82cd399133ede9560ac2c66d09a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vajkay=20Ren=C3=A9?= <vajkay.rene@gmail.com>
Date: Sun, 18 Mar 2018 15:07:09 +0100
Subject: [PATCH 0629/1382] Adds type support for webpack's
 'uglifyjs-webpack-plugin'

---
 types/uglifyjs-webpack-plugin/index.d.ts      | 42 +++++++++++++++++++
 types/uglifyjs-webpack-plugin/tsconfig.json   | 22 ++++++++++
 types/uglifyjs-webpack-plugin/tslint.json     |  1 +
 .../uglifyjs-webpack-plugin-tests.ts          | 18 ++++++++
 4 files changed, 83 insertions(+)
 create mode 100644 types/uglifyjs-webpack-plugin/index.d.ts
 create mode 100644 types/uglifyjs-webpack-plugin/tsconfig.json
 create mode 100644 types/uglifyjs-webpack-plugin/tslint.json
 create mode 100644 types/uglifyjs-webpack-plugin/uglifyjs-webpack-plugin-tests.ts

diff --git a/types/uglifyjs-webpack-plugin/index.d.ts b/types/uglifyjs-webpack-plugin/index.d.ts
new file mode 100644
index 0000000000..8034377322
--- /dev/null
+++ b/types/uglifyjs-webpack-plugin/index.d.ts
@@ -0,0 +1,42 @@
+// Type definitions for uglifyjs-webpack-plugin 1.1
+// Project: https://github.com/webpack-contrib/uglifyjs-webpack-plugin
+// Definitions by: Rene Vajkay <https://github.com/vajkayrene>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import { Plugin } from 'webpack';
+
+export = UglifyJsPlugin;
+
+declare class UglifyJsPlugin extends Plugin {
+    constructor(options?: UglifyJsPlugin.UglifyJsPluginOptions);
+}
+
+declare namespace UglifyJsPlugin {
+    export interface UglifyJsPluginOptions {
+        test?: RegExp | RegExp[],
+        include?: RegExp | RegExp[],
+        exclude?: RegExp | RegExp[],
+        cache?: boolean | string,
+        parallel?: boolean | number,
+        sourceMap?: boolean,
+        uglifyOptions?: UglifyJsOptions,
+        extractComments?: boolean | RegExp | ((node: object, comment: string) => boolean) | ExtractCommentsOptions,
+        warningsFilter?: (source: string) => boolean
+    }
+
+    export interface UglifyJsOptions {
+        ie8?: boolean,
+        ecma?: number,
+        parse?: object,
+        mangle?: boolean | object,
+        output?: object,
+        compress?: boolean | object,
+        warnings?: boolean
+    }
+
+    export interface ExtractCommentsOptions {
+        condition?: RegExp | ((node: object, comment: string) => boolean),
+        filename?: string | ((originalFileName: string) => string),
+        banner?: boolean | string | ((fileName: string) => string)
+    }
+}
\ No newline at end of file
diff --git a/types/uglifyjs-webpack-plugin/tsconfig.json b/types/uglifyjs-webpack-plugin/tsconfig.json
new file mode 100644
index 0000000000..c53f446594
--- /dev/null
+++ b/types/uglifyjs-webpack-plugin/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "uglifyjs-webpack-plugin-tests.ts"
+    ]
+}
diff --git a/types/uglifyjs-webpack-plugin/tslint.json b/types/uglifyjs-webpack-plugin/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/uglifyjs-webpack-plugin/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/uglifyjs-webpack-plugin/uglifyjs-webpack-plugin-tests.ts b/types/uglifyjs-webpack-plugin/uglifyjs-webpack-plugin-tests.ts
new file mode 100644
index 0000000000..5b6ace2156
--- /dev/null
+++ b/types/uglifyjs-webpack-plugin/uglifyjs-webpack-plugin-tests.ts
@@ -0,0 +1,18 @@
+import * as webpack from "webpack";
+import * as UglifyjsWebpackPlugin from "uglifyjs-webpack-plugin";
+
+const compiler = webpack({
+    plugins: [
+        new UglifyjsWebpackPlugin(),
+    ],
+});
+
+const compilerOptions = webpack({
+    plugins: [
+        new UglifyjsWebpackPlugin({
+			cache: false,
+			parallel: true,
+			sourceMap: true,
+		}),
+    ],
+});
\ No newline at end of file

From 50646028ca0f2ef87e1262741eb074da90c50000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vajkay=20Ren=C3=A9?= <vajkay.rene@gmail.com>
Date: Sun, 18 Mar 2018 15:46:23 +0100
Subject: [PATCH 0630/1382] Adds missing TSC option 'strictFunctionTypes'

---
 types/uglifyjs-webpack-plugin/tsconfig.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/uglifyjs-webpack-plugin/tsconfig.json b/types/uglifyjs-webpack-plugin/tsconfig.json
index c53f446594..793c9d3ca0 100644
--- a/types/uglifyjs-webpack-plugin/tsconfig.json
+++ b/types/uglifyjs-webpack-plugin/tsconfig.json
@@ -7,7 +7,8 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
-        "baseUrl": "../",
+		"strictFunctionTypes": true,
+		"baseUrl": "../",
         "typeRoots": [
             "../"
         ],

From 4a0594d983cabc194f072baa54c3c91bb75cabb2 Mon Sep 17 00:00:00 2001
From: AndersonFriaca <afriacaxd@gmail.com>
Date: Sun, 18 Mar 2018 11:41:46 -0400
Subject: [PATCH 0631/1382] Types for Nivo-Slider

---
 types/nivo-slider/index.d.ts           | 39 ++++++++++++++++++++++++++
 types/nivo-slider/nivo-slider-tests.ts | 23 +++++++++++++++
 types/nivo-slider/tsconfig.json        | 25 +++++++++++++++++
 types/nivo-slider/tslint.json          |  1 +
 4 files changed, 88 insertions(+)
 create mode 100644 types/nivo-slider/index.d.ts
 create mode 100644 types/nivo-slider/nivo-slider-tests.ts
 create mode 100644 types/nivo-slider/tsconfig.json
 create mode 100644 types/nivo-slider/tslint.json

diff --git a/types/nivo-slider/index.d.ts b/types/nivo-slider/index.d.ts
new file mode 100644
index 0000000000..f30f6d445b
--- /dev/null
+++ b/types/nivo-slider/index.d.ts
@@ -0,0 +1,39 @@
+// Type definitions for Nivo Slider 3.2
+// Project: https://github.com/Codeinwp/Nivo-Slider-jQuery
+// Definitions by: Anderson Friaça <https://github.com/AndersonFriaca>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="jquery" />
+
+export type EffectType = 'sliceDown' | 'sliceDownLeft' | 'sliceUp' | 'sliceUpLeft' | 'sliceUpDown' | 'sliceUpDownLeft' |
+    'fold' | 'fade' | 'random' | 'slideInRight' | 'slideInLeft' | 'boxRandom' | 'boxRain' | 'boxRainReverse' |
+    'boxRainGrow' | 'boxRainGrowReverse';
+
+export interface Options {
+    effect?: EffectType;
+    slices?: number;
+    boxCols?: number;
+    boxRows?: number;
+    animSpeed?: number;
+    pauseTime?: number;
+    startSlide?: number;
+    directionNav?: boolean;
+    controlNav?: boolean;
+    controlNavThumbs?: boolean;
+    pauseOnHover?: boolean;
+    manualAdvance?: boolean;
+    prevText?: string;
+    nextText?: string;
+    randomStart?: boolean;
+    beforeChange?: () => void;
+    afterChange?: () => void;
+    slideshowEnd?: () => void;
+    lastSlide?: () => void;
+    afterLoad?: () => void;
+}
+declare global {
+    interface JQuery {
+        nivoSlider(options?: Options): JQuery;
+    }
+}
diff --git a/types/nivo-slider/nivo-slider-tests.ts b/types/nivo-slider/nivo-slider-tests.ts
new file mode 100644
index 0000000000..a82ec64106
--- /dev/null
+++ b/types/nivo-slider/nivo-slider-tests.ts
@@ -0,0 +1,23 @@
+import { Options } from "nivo-slider";
+
+// basic usage
+$('#slider').nivoSlider();
+
+// with options
+const options: Options = {
+    effect: 'random',
+    slices: 15,
+    boxCols: 8,
+    boxRows: 4,
+    animSpeed: 500,
+    pauseTime: 3000,
+    startSlide: 0,
+    directionNav: true,
+    controlNav: true,
+    controlNavThumbs: false,
+    pauseOnHover: true,
+    manualAdvance: false,
+    prevText: 'Prev',
+    nextText: 'Next'
+};
+$('#slider').nivoSlider(options);
diff --git a/types/nivo-slider/tsconfig.json b/types/nivo-slider/tsconfig.json
new file mode 100644
index 0000000000..4275013350
--- /dev/null
+++ b/types/nivo-slider/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "esModuleInterop": true
+    },
+    "files": [
+        "index.d.ts",
+        "nivo-slider-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/nivo-slider/tslint.json b/types/nivo-slider/tslint.json
new file mode 100644
index 0000000000..d04fe2e1fa
--- /dev/null
+++ b/types/nivo-slider/tslint.json
@@ -0,0 +1 @@
+{"extends": "dtslint/dt.json"}
\ No newline at end of file

From 2aa5b9547d0ca56ec396d90e07b3d2e51efe9746 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vajkay=20Ren=C3=A9?= <vajkay.rene@gmail.com>
Date: Sun, 18 Mar 2018 17:16:16 +0100
Subject: [PATCH 0632/1382] Sets TS version of the dependency and fixes lint
 issues

---
 types/uglifyjs-webpack-plugin/index.d.ts      | 47 ++++++++++---------
 .../uglifyjs-webpack-plugin-tests.ts          |  2 +-
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/types/uglifyjs-webpack-plugin/index.d.ts b/types/uglifyjs-webpack-plugin/index.d.ts
index 8034377322..88ce8296ae 100644
--- a/types/uglifyjs-webpack-plugin/index.d.ts
+++ b/types/uglifyjs-webpack-plugin/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/webpack-contrib/uglifyjs-webpack-plugin
 // Definitions by: Rene Vajkay <https://github.com/vajkayrene>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import { Plugin } from 'webpack';
 
@@ -12,31 +13,31 @@ declare class UglifyJsPlugin extends Plugin {
 }
 
 declare namespace UglifyJsPlugin {
-    export interface UglifyJsPluginOptions {
-        test?: RegExp | RegExp[],
-        include?: RegExp | RegExp[],
-        exclude?: RegExp | RegExp[],
-        cache?: boolean | string,
-        parallel?: boolean | number,
-        sourceMap?: boolean,
-        uglifyOptions?: UglifyJsOptions,
-        extractComments?: boolean | RegExp | ((node: object, comment: string) => boolean) | ExtractCommentsOptions,
-        warningsFilter?: (source: string) => boolean
+    interface UglifyJsPluginOptions {
+        test?: RegExp | RegExp[];
+        include?: RegExp | RegExp[];
+        exclude?: RegExp | RegExp[];
+        cache?: boolean | string;
+        parallel?: boolean | number;
+        sourceMap?: boolean;
+        uglifyOptions?: UglifyJsOptions;
+        extractComments?: boolean | RegExp | ((node: object, comment: string) => boolean) | ExtractCommentsOptions;
+        warningsFilter?: (source: string) => boolean;
     }
 
-    export interface UglifyJsOptions {
-        ie8?: boolean,
-        ecma?: number,
-        parse?: object,
-        mangle?: boolean | object,
-        output?: object,
-        compress?: boolean | object,
-        warnings?: boolean
+    interface UglifyJsOptions {
+        ie8?: boolean;
+        ecma?: number;
+        parse?: object;
+        mangle?: boolean | object;
+        output?: object;
+        compress?: boolean | object;
+        warnings?: boolean;
     }
 
-    export interface ExtractCommentsOptions {
-        condition?: RegExp | ((node: object, comment: string) => boolean),
-        filename?: string | ((originalFileName: string) => string),
-        banner?: boolean | string | ((fileName: string) => string)
+    interface ExtractCommentsOptions {
+        condition?: RegExp | ((node: object, comment: string) => boolean);
+        filename?: string | ((originalFileName: string) => string);
+        banner?: boolean | string | ((fileName: string) => string);
     }
-}
\ No newline at end of file
+}
diff --git a/types/uglifyjs-webpack-plugin/uglifyjs-webpack-plugin-tests.ts b/types/uglifyjs-webpack-plugin/uglifyjs-webpack-plugin-tests.ts
index 5b6ace2156..593d31a345 100644
--- a/types/uglifyjs-webpack-plugin/uglifyjs-webpack-plugin-tests.ts
+++ b/types/uglifyjs-webpack-plugin/uglifyjs-webpack-plugin-tests.ts
@@ -15,4 +15,4 @@ const compilerOptions = webpack({
 			sourceMap: true,
 		}),
     ],
-});
\ No newline at end of file
+});

From a6d6391ceaa3312026ce12a2a8372ec7bc02d439 Mon Sep 17 00:00:00 2001
From: Stanislav Termosa <termosa.stanislav@gmail.com>
Date: Sun, 18 Mar 2018 18:09:23 +0200
Subject: [PATCH 0633/1382] [is-empty] add types

---
 types/is-empty/index.d.ts        | 11 +++++++++++
 types/is-empty/is-empty-tests.ts | 10 ++++++++++
 types/is-empty/tsconfig.json     | 23 +++++++++++++++++++++++
 types/is-empty/tslint.json       |  1 +
 4 files changed, 45 insertions(+)
 create mode 100644 types/is-empty/index.d.ts
 create mode 100644 types/is-empty/is-empty-tests.ts
 create mode 100644 types/is-empty/tsconfig.json
 create mode 100644 types/is-empty/tslint.json

diff --git a/types/is-empty/index.d.ts b/types/is-empty/index.d.ts
new file mode 100644
index 0000000000..5ac0a155c2
--- /dev/null
+++ b/types/is-empty/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for is-empty 1.2
+// Project: https://github.com/ianstormtaylor/is-empty
+// Definitions by: Stanislav Termosa <https://github.com/termosa>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * Test if a value is empty
+ */
+declare function isEmpty(value: any): boolean;
+
+export default isEmpty;
diff --git a/types/is-empty/is-empty-tests.ts b/types/is-empty/is-empty-tests.ts
new file mode 100644
index 0000000000..538ae6cc71
--- /dev/null
+++ b/types/is-empty/is-empty-tests.ts
@@ -0,0 +1,10 @@
+import isEmpty from 'is-empty';
+
+isEmpty({});
+isEmpty(null);
+isEmpty(undefined);
+isEmpty(9);
+isEmpty(new Object());
+isEmpty(Array);
+isEmpty('');
+isEmpty(() => {});
diff --git a/types/is-empty/tsconfig.json b/types/is-empty/tsconfig.json
new file mode 100644
index 0000000000..c9e999956e
--- /dev/null
+++ b/types/is-empty/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "is-empty-tests.ts"
+    ]
+}
diff --git a/types/is-empty/tslint.json b/types/is-empty/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/is-empty/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From e927158b93feaa90b6d0150db7b8c6dfa9c953ae Mon Sep 17 00:00:00 2001
From: Shane Liesegang <sjml@users.noreply.github.com>
Date: Sun, 18 Mar 2018 13:08:16 -0400
Subject: [PATCH 0634/1382] Fixing return values from TextMarker.Find

Find doesn't return a standard Range object; the `from` and `to` values are just positions and not callable.
---
 types/codemirror/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/codemirror/index.d.ts b/types/codemirror/index.d.ts
index ef075b9d45..06c3b39f96 100644
--- a/types/codemirror/index.d.ts
+++ b/types/codemirror/index.d.ts
@@ -669,7 +669,7 @@ declare namespace CodeMirror {
 
         /** Returns a {from, to} object (both holding document positions), indicating the current position of the marked range,
         or undefined if the marker is no longer in the document. */
-        find(): CodeMirror.Range;
+        find(): {from: CodeMirror.Position, to: CodeMirror.Position};
 
         /**  Returns an object representing the options for the marker. If copyWidget is given true, it will clone the value of the replacedWith option, if any. */
         getOptions(copyWidget: boolean): CodeMirror.TextMarkerOptions;

From 21be2857d9842e2df771bfd35fc0e36487ef3e91 Mon Sep 17 00:00:00 2001
From: Guo Yunhe <guoyunhebrave@gmail.com>
Date: Sun, 18 Mar 2018 19:33:21 +0200
Subject: [PATCH 0635/1382] wpapi: class support custom methods though without
 return type

---
 types/wpapi/index.d.ts     | 17 ++++++++++++++---
 types/wpapi/wpapi-tests.ts | 14 ++++++++------
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/types/wpapi/index.d.ts b/types/wpapi/index.d.ts
index ae079b0edc..cbaee37286 100644
--- a/types/wpapi/index.d.ts
+++ b/types/wpapi/index.d.ts
@@ -27,9 +27,6 @@ declare class WPAPI {
      */
     static discover(url: string): Promise<WPAPI>;
 
-    /** Start a request of plugin authors endpoint */
-    authors(): WPAPI.WPRequest;
-
     /** Start a request against /categories endpoint */
     categories(): WPAPI.WPRequest;
 
@@ -163,6 +160,13 @@ declare class WPAPI {
      * @param url The URL to request
      */
     url(url: string): WPAPI.WPRequest;
+
+    /**
+     * An API client can define its parameter methods, like .authors(), .cart(),
+     * .products(). They are usually decided by WPAPI namespaces configuration
+     * object. They have WPRequest return type.
+     */
+    [customRoutesMethod: string]: any;
 }
 
 /*~ If you want to expose types from your module as well, you can
@@ -411,6 +415,13 @@ declare namespace WPAPI {
          * the regular expression the API uses to goven that segment.
          */
         validatePath(): WPRequest;
+
+        /**
+         * A request can define its parameter methods, like .id(), .date(),
+         * .author(). They are usually decided by WPAPI routes configuration
+         * object.
+         */
+        [customParamsMethod: string]: any;
     }
 
     export interface WPAPIOptions extends Credentials {
diff --git a/types/wpapi/wpapi-tests.ts b/types/wpapi/wpapi-tests.ts
index 7e414daecc..f990ba09cb 100644
--- a/types/wpapi/wpapi-tests.ts
+++ b/types/wpapi/wpapi-tests.ts
@@ -28,19 +28,21 @@ apiPromise.then(site => {
     site.posts().then((posts: Object[]) => {}); // etc
 
     // If custom routes were detected, they can be accessed via .namespace()
-    site
-        .namespace("myplugin/v1")
-        .authors()
-        .then((authors: Object[]) => {
+    // Custom routes have different methods to generate requests, so .authors()
+    // does not necessarily exist. You have use force type <WPRequest> or 'as
+    // Request'
+    (site.namespace("myplugin/v1").authors() as WPAPI.WPRequest).then(
+        (authors: any[]) => {
             /* ... */
-        });
+        }
+    );
 
     // Namespaces can be saved out to variables:
     const myplugin = site.namespace("myplugin/v1");
     myplugin
         .authors()
         .id(7)
-        .then((author: Object[]) => {
+        .then((author: any) => {
             /* ... */
         });
 });

From a60368955c89ed089ab0ab8fe98270b6eaebd0ca Mon Sep 17 00:00:00 2001
From: Guo Yunhe <guoyunhebrave@gmail.com>
Date: Sun, 18 Mar 2018 19:38:44 +0200
Subject: [PATCH 0636/1382] wpapi: do not use Object

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

diff --git a/types/wpapi/wpapi-tests.ts b/types/wpapi/wpapi-tests.ts
index f990ba09cb..dbbfa1deb0 100644
--- a/types/wpapi/wpapi-tests.ts
+++ b/types/wpapi/wpapi-tests.ts
@@ -25,7 +25,7 @@ wp
 const apiPromise = WPAPI.discover("http://my-site.com");
 apiPromise.then(site => {
     // If default routes were detected, they are now available
-    site.posts().then((posts: Object[]) => {}); // etc
+    site.posts().then((posts: any[]) => {}); // etc
 
     // If custom routes were detected, they can be accessed via .namespace()
     // Custom routes have different methods to generate requests, so .authors()
@@ -76,7 +76,7 @@ wp2
         // is not specified
         status: "publish"
     })
-    .then((response: Object) => {
+    .then((response: any) => {
         // "response" will hold all properties of your newly-created post,
         // including the unique `id` the post was assigned on creation
     });
@@ -92,4 +92,4 @@ wp2
         // Set the post live (assuming it was "draft" before)
         status: "publish"
     })
-    .then((response: Object) => {});
+    .then((response: any) => {});

From cd32df9e19e8ac08eaf3ba28b4de072237653d99 Mon Sep 17 00:00:00 2001
From: Guo Yunhe <guoyunhebrave@gmail.com>
Date: Sun, 18 Mar 2018 19:39:04 +0200
Subject: [PATCH 0637/1382] wpapi: restrict typescript 2.2

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

diff --git a/types/wpapi/index.d.ts b/types/wpapi/index.d.ts
index cbaee37286..9c0d635e5d 100644
--- a/types/wpapi/index.d.ts
+++ b/types/wpapi/index.d.ts
@@ -1,4 +1,5 @@
 // Type definitions for wpapi 1.1
+// TypeScript Version: 2.2
 // Project: https://github.com/wp-api/node-wpapi
 // Definitions by: Guo Yunhe <https://github.com/guoyunhe>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From ad4e2fd444a26b0b96c667547b87d717cb16d585 Mon Sep 17 00:00:00 2001
From: Kyle Roach <kroach.work@gmail.com>
Date: Sun, 18 Mar 2018 14:02:09 -0400
Subject: [PATCH 0638/1382] Add types for react-native-star-rating

---
 types/react-native-star-rating/index.d.ts     | 130 ++++++++++++++++++
 .../react-native-star-rating-tests.tsx        |  35 +++++
 types/react-native-star-rating/tsconfig.json  |  17 +++
 types/react-native-star-rating/tslint.json    |   1 +
 4 files changed, 183 insertions(+)
 create mode 100644 types/react-native-star-rating/index.d.ts
 create mode 100644 types/react-native-star-rating/react-native-star-rating-tests.tsx
 create mode 100644 types/react-native-star-rating/tsconfig.json
 create mode 100644 types/react-native-star-rating/tslint.json

diff --git a/types/react-native-star-rating/index.d.ts b/types/react-native-star-rating/index.d.ts
new file mode 100644
index 0000000000..2285134c8f
--- /dev/null
+++ b/types/react-native-star-rating/index.d.ts
@@ -0,0 +1,130 @@
+// Type definitions for react-native-star-rating 1.0
+// Project: https://github.com/djchie/react-native-star-rating
+// Definitions by: iRoachie <https://github.com/iRoachie>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+import * as React from 'react';
+import { ImageURISource, StyleProp, ViewStyle } from 'react-native';
+
+export interface StarRatingProps {
+    /**
+     * Style of the button containing the star.
+     */
+    buttonStyle?: StyleProp<ViewStyle>;
+
+    /**
+     * Style of the element containing the star rating component.
+     */
+    containerStyle?: StyleProp<ViewStyle>;
+
+    /**
+     * Sets the interactivity of the star buttons.
+     *
+     * Default is false
+     */
+    disabled?: boolean;
+
+    /**
+     * The name of the icon to represent an empty star.
+     * Refer to react-native-vector-icons.
+     * Also can be a image object, both {uri:xxx.xxx} and require('xx/xx/xx.xxx').
+     *
+     * Default is "star-o"
+     */
+    emptyStar?: string | ImageURISource;
+
+    /**
+     * Color of an empty star.
+     *
+     * Default is gray
+     */
+    emptyStarColor?: string;
+
+    /**
+     * The name of the icon to represent a full star.
+     * Refer to react-native-vector-icons.
+     * Also can be a image object, both {uri:xxx.xxx} and require('xx/xx/xx.xxx')
+     *
+     * Default is "star"
+     */
+    fullStar?: string | ImageURISource;
+
+    /**
+     * Color of a filled star.
+     *
+     * Default is black
+     */
+    fullStarColor?: string;
+
+    /**
+     * The name of the icon to represent an half star.
+     * Refer to react-native-vector-icons.
+     * Also can be a image object, both {uri:xxx.xxx} and require('xx/xx/xx.xxx').
+     *
+     * Default is "star-half-o"
+     */
+    halfStar?: string | ImageURISource;
+
+    /**
+     * Color of a half-filled star.
+     *
+     * Defaults to fullStarColor.
+     */
+    halfStarColor?: string;
+
+    /**
+     * Sets ability to select half stars
+     *
+     * Default is false
+     */
+    halfStarEnabled?: boolean;
+
+    /**
+     * The name of the icon set the star image belongs to.
+     * Refer to react-native-vector-icons.
+     *
+     * Default is "FontAwesome"
+     */
+    iconSet?: string;
+
+    /**
+     * The maximum number of stars possible.
+     *
+     * Default is 5
+     */
+    maxStars?: number;
+
+    /**
+     * The current rating to show.
+     *
+     * Default is 0
+     */
+    rating?: number;
+
+    /**
+     * Renders stars from right to left
+     *
+     * Default is false
+     */
+    reversed?: boolean;
+
+    /**
+     * Size of the star.
+     *
+     * Default is 40
+     */
+    starSize?: number;
+
+    /**
+     * Style to apply to the star.
+     */
+    starStyle?: StyleProp<ViewStyle>;
+
+    /**
+     * A function to handle star button presses.
+     */
+    selectedStar?(rating: number): void;
+}
+
+export default class StarRating extends React.Component<StarRatingProps> {}
diff --git a/types/react-native-star-rating/react-native-star-rating-tests.tsx b/types/react-native-star-rating/react-native-star-rating-tests.tsx
new file mode 100644
index 0000000000..377e802a1d
--- /dev/null
+++ b/types/react-native-star-rating/react-native-star-rating-tests.tsx
@@ -0,0 +1,35 @@
+import * as React from 'react';
+import StarRating from 'react-native-star-rating';
+
+interface State {
+    starCount: number;
+}
+
+class GeneralStarExample extends React.Component<{}, State> {
+    constructor(props: {}) {
+        super(props);
+
+        this.state = {
+            starCount: 3.5
+        };
+    }
+
+    onStarRatingPress = (rating: number) => {
+        this.setState({
+            starCount: rating
+        });
+    }
+
+    render() {
+        return (
+            <StarRating
+                disabled={false}
+                maxStars={5}
+                rating={this.state.starCount}
+                selectedStar={this.onStarRatingPress}
+            />
+        );
+    }
+}
+
+export default GeneralStarExample;
diff --git a/types/react-native-star-rating/tsconfig.json b/types/react-native-star-rating/tsconfig.json
new file mode 100644
index 0000000000..74fff84c8a
--- /dev/null
+++ b/types/react-native-star-rating/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "jsx": "react-native",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": ["index.d.ts", "react-native-star-rating-tests.tsx"]
+}
diff --git a/types/react-native-star-rating/tslint.json b/types/react-native-star-rating/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-native-star-rating/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From d2299c54c2837660ab39bfa9a505bba62734015f Mon Sep 17 00:00:00 2001
From: FlashSystems <developer@flashsystems.de>
Date: Mon, 12 Mar 2018 21:25:55 +0100
Subject: [PATCH 0639/1382] The attr method returns a BBox based on the viewBox
 of the element if "viewBox" is passed as a param value. This update adds a
 string literal type to handle this use case.

---
 types/snapsvg/index.d.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/types/snapsvg/index.d.ts b/types/snapsvg/index.d.ts
index a3397cedaa..f9719af863 100644
--- a/types/snapsvg/index.d.ts
+++ b/types/snapsvg/index.d.ts
@@ -144,8 +144,9 @@ declare namespace Snap {
         append(el:Snap.Element):Snap.Element;
         appendTo(el:Snap.Element):Snap.Element;
         asPX(attr:string,value?:string):number;            //TODO: check what is really returned
-        attr(param:string):string;
-        attr(params:{[attr:string]:string|number|boolean|any}):Snap.Element;
+        attr(param: "viewBox"): BBox;
+        attr(param: string): string;
+        attr(params:{[attr:string]:string|number|boolean|BBox|any}):Snap.Element;
         before(el:Snap.Element):Snap.Element;
         children(): Snap.Element[];
         clone():Snap.Element;
@@ -289,7 +290,8 @@ declare namespace Snap {
     export interface Set {
         animate(attrs:{[attr:string]:string|number|boolean|any},duration:number,easing?:(num:number)=>number,callback?:()=>void):Snap.Element;
         animate(...params:Array<{attrs:any,duration:number,easing:(num:number)=>number,callback?:()=>void}>):Snap.Element;
-        attr(params: {[attr:string]:string|number|boolean|any}): Snap.Element;
+        attr(params: {[attr:string]:string|number|boolean|BBox|any}): Snap.Element;
+        attr(param: "viewBox"): BBox;
         attr(param: string): string;
         bind(attr: string, callback: Function): Snap.Set;
         bind(attr:string,element:Snap.Element):Snap.Set;

From 059f0bc252923b8d547cd907b8ffd9bb0628f210 Mon Sep 17 00:00:00 2001
From: FlashSystems <developer@flashsystems.de>
Date: Mon, 12 Mar 2018 21:27:23 +0100
Subject: [PATCH 0640/1382] The add and append method accept a set as an input
 type.

---
 types/snapsvg/index.d.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/types/snapsvg/index.d.ts b/types/snapsvg/index.d.ts
index f9719af863..d937f1dff3 100644
--- a/types/snapsvg/index.d.ts
+++ b/types/snapsvg/index.d.ts
@@ -136,12 +136,14 @@ declare namespace Snap {
 
     export interface Element {
         add(el:Snap.Element):Snap.Element;
+        add(el:Snap.Set):Snap.Element;
         addClass(value:string):Snap.Element;
         after(el:Snap.Element):Snap.Element;
         align(el: Snap.Element, way: string):Snap.Element;
         animate(animation:any):Snap.Element;
         animate(attrs:{[attr:string]:string|number|boolean|any},duration:number,easing?:(num: number)=> number,callback?:()=>void):Snap.Element;
         append(el:Snap.Element):Snap.Element;
+        append(el:Snap.Set):Snap.Element;
         appendTo(el:Snap.Element):Snap.Element;
         asPX(attr:string,value?:string):number;            //TODO: check what is really returned
         attr(param: "viewBox"): BBox;

From 2c70be4600960b5c3fac15271b5d92068c6036d9 Mon Sep 17 00:00:00 2001
From: FlashSystems <developer@flashsystems.de>
Date: Mon, 12 Mar 2018 21:27:55 +0100
Subject: [PATCH 0641/1382] Added the symbol element to the Paper class.

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

diff --git a/types/snapsvg/index.d.ts b/types/snapsvg/index.d.ts
index d937f1dff3..489b771752 100644
--- a/types/snapsvg/index.d.ts
+++ b/types/snapsvg/index.d.ts
@@ -287,6 +287,7 @@ declare namespace Snap {
         rect(x:number,y:number,width:number,height:number,rx?:number,ry?:number):Snap.Element;
         text(x:number,y:number,text:string|number):Snap.Element;
         text(x:number,y:number,text:Array<string|number>):Snap.Element;
+        symbol(vbx:number,vby:number,vbw:number,vbh:number):Snap.Element;
     }
 
     export interface Set {

From 2d5f11b72c6b0be3b9c3c20aa85d899db2455cc4 Mon Sep 17 00:00:00 2001
From: FlashSystems <developer@flashsystems.de>
Date: Wed, 14 Mar 2018 20:03:28 +0100
Subject: [PATCH 0642/1382] Added test for commit d2299c54, 059f0bc2, 2c70be46.

---
 types/snapsvg/test/2.ts | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/types/snapsvg/test/2.ts b/types/snapsvg/test/2.ts
index 0ab83291bd..5afcf36460 100644
--- a/types/snapsvg/test/2.ts
+++ b/types/snapsvg/test/2.ts
@@ -125,6 +125,19 @@ function tester6() {
     console.log(!path.isPointInsideBBox(b3, 50, 50));
 }
 
+function tester7() {
+    var paper = Snap(600, 800);
+
+    Snap.load("http://snapsvg.io/assets/images/logo.svg", (fragment: Snap.Fragment) => {
+        // viewBox retrieveal
+        let fragmentViewBox = fragment.select("svg").attr("viewBox");
+        let symbol = paper.symbol(fragmentViewBox.x, fragmentViewBox.y, fragmentViewBox.width, fragmentViewBox.height);
+
+        symbol.add(fragment.selectAll("svg *"));
+        symbol.toDefs();
+   });
+}
+
 //$(function () {
 //    tester1();
 //});
@@ -134,3 +147,4 @@ function tester6() {
 //tester4();
 //tester5();
 //tester6();
+//tester7();

From cd9e2541db660bb37ae5fc53f412edbffd7248c5 Mon Sep 17 00:00:00 2001
From: Noah Santschi-Cooney <noah@santschi-cooney.ch>
Date: Sun, 18 Mar 2018 21:50:20 +0000
Subject: [PATCH 0643/1382] Removed undefined method for NightmareJS

`userAgent()` isnt defined on type Nightmare in the JS version according to the error below. `useragent()` is defined and is probably what people want to use.
```
TypeError: nightmare.userAgent is not a function
    at login (/home/noah/Go/src/github.com/Strum355/UserBenchmark-Scraper/typescript/js/main.js:31:14)
    at Object.<anonymous> (/home/noah/Go/src/github.com/Strum355/UserBenchmark-Scraper/typescript/js/main.js:12:5)
    at Module._compile (module.js:649:30)
    at Object.Module._extensions..js (module.js:660:10)
    at Module.load (module.js:561:32)
    at tryModuleLoad (module.js:501:12)
    at Function.Module._load (module.js:493:3)
    at Function.Module.runMain (module.js:690:10)
    at startup (bootstrap_node.js:194:16)
    at bootstrap_node.js:666:3```
---
 types/nightmare/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/nightmare/index.d.ts b/types/nightmare/index.d.ts
index 061f22bd10..e848ce3fdd 100644
--- a/types/nightmare/index.d.ts
+++ b/types/nightmare/index.d.ts
@@ -12,7 +12,7 @@ declare class Nightmare {
     constructor(options?: Nightmare.IConstructorOptions);
 
     // Interact
-    userAgent(agent: string): Nightmare;
+    // userAgent(agent: string): Nightmare;
     end(): Nightmare;
     then<T, R>(fn: (value: T) => R): Promise<R>;
     halt(error: string, cb: () => void): Nightmare;

From 49f613d038c5da5fa6b52087fa2c398e17ef2754 Mon Sep 17 00:00:00 2001
From: taoqf <tao_qiufeng@126.com>
Date: Mon, 19 Mar 2018 14:40:00 +0800
Subject: [PATCH 0644/1382] add type yazl

---
 types/yazl/index.d.ts    | 46 ++++++++++++++++++++++++++++++++++++++++
 types/yazl/tsconfig.json | 23 ++++++++++++++++++++
 types/yazl/tslint.json   |  1 +
 types/yazl/yazl-tests.ts | 22 +++++++++++++++++++
 4 files changed, 92 insertions(+)
 create mode 100644 types/yazl/index.d.ts
 create mode 100644 types/yazl/tsconfig.json
 create mode 100644 types/yazl/tslint.json
 create mode 100644 types/yazl/yazl-tests.ts

diff --git a/types/yazl/index.d.ts b/types/yazl/index.d.ts
new file mode 100644
index 0000000000..45288eaad5
--- /dev/null
+++ b/types/yazl/index.d.ts
@@ -0,0 +1,46 @@
+// Type definitions for yazl 2.4
+// Project: https://github.com/thejoshwolfe/yazl
+// Definitions by: taoqf <https://github.com/taoqf>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+/// <reference types="node" />
+
+import { Readable, Writable } from 'stream';
+import { Buffer } from 'buffer';
+
+export interface Options {
+    mtime: Date;
+    mode: number;
+    compress: boolean;
+    forceZip64Format: boolean;
+}
+
+export interface ReadStreamOptions extends Options {
+    size: number;
+}
+
+export interface DirectoryOptions {
+    mtime: Date;
+    mode: number;
+}
+
+export interface EndOptions {
+    forceZip64Format: boolean;
+}
+
+export interface DosDateTime {
+    date: number;
+    time: number;
+}
+
+export class ZipFile {
+    addFile(realPath: string, metadataPath: string, options?: Partial<Options>): void;
+    outputStream: Writable;
+    addReadStream(input: Readable, metadataPath: string, options?: Partial<ReadStreamOptions>): void;
+    addBuffer(buffer: Buffer, metadataPath: string, options?: Partial<Options>): void;
+    end(optoins?: EndOptions, finalSizeCallback?: () => void): void;
+
+    addEmptyDirectory(metadataPath: string, options?: Partial<DirectoryOptions>): void;
+    dateToDosDateTime(jsDate: Date): DosDateTime;
+}
diff --git a/types/yazl/tsconfig.json b/types/yazl/tsconfig.json
new file mode 100644
index 0000000000..124a83ec4d
--- /dev/null
+++ b/types/yazl/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "yazl-tests.ts"
+    ]
+}
diff --git a/types/yazl/tslint.json b/types/yazl/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/yazl/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/yazl/yazl-tests.ts b/types/yazl/yazl-tests.ts
new file mode 100644
index 0000000000..dfc5cd3c27
--- /dev/null
+++ b/types/yazl/yazl-tests.ts
@@ -0,0 +1,22 @@
+import { ZipFile } from "yazl";
+import fs = require('fs');
+
+const zipfile = new ZipFile();
+zipfile.addFile("file1.txt", "file1.txt");
+// (add only files, not directories)
+zipfile.addFile("path/to/file.txt", "path/in/zipfile.txt");
+// pipe() can be called any time after the constructor
+zipfile.outputStream.pipe(fs.createWriteStream("output.zip")).on("close", () => {
+	console.log("done");
+});
+// alternate apis for adding files:
+zipfile.addReadStream(process.stdin, "stdin.txt", {
+	mtime: new Date(),
+	mode: parseInt("0100664", 8), // -rw-rw-r--
+});
+zipfile.addBuffer(new Buffer("hello"), "hello.txt", {
+	mtime: new Date(),
+	mode: parseInt("0100664", 8), // -rw-rw-r--
+});
+// call end() after all the files have been added
+zipfile.end();

From 011941d5c8518d51043ba370857dfb210e49b05c Mon Sep 17 00:00:00 2001
From: Arylo <arylo.open@gmail.com>
Date: Mon, 19 Mar 2018 15:01:04 +0800
Subject: [PATCH 0645/1382] Add type definition for keyv

---
 types/keyv/index.d.ts    | 30 ++++++++++++++++++++++++++++++
 types/keyv/keyv-tests.ts | 20 ++++++++++++++++++++
 types/keyv/tsconfig.json | 23 +++++++++++++++++++++++
 types/keyv/tslint.json   |  1 +
 4 files changed, 74 insertions(+)
 create mode 100644 types/keyv/index.d.ts
 create mode 100644 types/keyv/keyv-tests.ts
 create mode 100644 types/keyv/tsconfig.json
 create mode 100644 types/keyv/tslint.json

diff --git a/types/keyv/index.d.ts b/types/keyv/index.d.ts
new file mode 100644
index 0000000000..4de9e75fff
--- /dev/null
+++ b/types/keyv/index.d.ts
@@ -0,0 +1,30 @@
+// Type definitions for keyv 3.0
+// Project: https://github.com/lukechilds/keyv
+// Definitions by: AryloYeung <https://github.com/Arylo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+/// <reference types="node" />
+
+// import * as events from 'events';
+
+interface KeyvOptions {
+    namespace?: string;
+    serialize: (data: any) => string;
+    deserialize: (data: string) => any;
+    uri?: string;
+    store?: any;
+    ttl?: number;
+    adapter?: string;
+}
+
+declare class Keyv extends NodeJS.EventEmitter {
+    constructor(uri?: string, opts?: KeyvOptions);
+    constructor(opts?: KeyvOptions);
+    get(key: string): Promise<any>;
+    set(key: string, value: any, ttl?: number): Promise<boolean>;
+    delete(key: string): Promise<boolean>;
+    clear(): Promise<void>;
+}
+
+export = Keyv;
diff --git a/types/keyv/keyv-tests.ts b/types/keyv/keyv-tests.ts
new file mode 100644
index 0000000000..fc0c2f3ff1
--- /dev/null
+++ b/types/keyv/keyv-tests.ts
@@ -0,0 +1,20 @@
+import Keyv = require("keyv");
+
+new Keyv('mongodb://user:pass@localhost:27017/dbname');
+new Keyv('redis://user:pass@localhost:6379');
+new Keyv('sqlite://path/to/database.sqlite');
+new Keyv('postgresql://user:pass@localhost:5432/dbname');
+new Keyv('mysql://user:pass@localhost:3306/dbname');
+new Keyv();
+
+(async () => {
+    const keyv = new Keyv();
+
+    keyv.on('error', err => console.log('Connection Error', err));
+
+    await keyv.set('foo', 'expires in 1 second', 1000); // true
+    await keyv.set('foo', 'never expires'); // true
+    await keyv.get('foo'); // 'never expires'
+    await keyv.delete('foo'); // true
+    await keyv.clear(); // undefined
+})();
diff --git a/types/keyv/tsconfig.json b/types/keyv/tsconfig.json
new file mode 100644
index 0000000000..21b4bcb7f1
--- /dev/null
+++ b/types/keyv/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": false,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "keyv-tests.ts"
+    ]
+}
diff --git a/types/keyv/tslint.json b/types/keyv/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/keyv/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From d98e689d3fe0264aacc90f1ba1e347df21209309 Mon Sep 17 00:00:00 2001
From: Arylo <arylo.open@gmail.com>
Date: Mon, 19 Mar 2018 15:13:43 +0800
Subject: [PATCH 0646/1382] Add Annotations

---
 types/keyv/index.d.ts | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/types/keyv/index.d.ts b/types/keyv/index.d.ts
index 4de9e75fff..11e1895c9a 100644
--- a/types/keyv/index.d.ts
+++ b/types/keyv/index.d.ts
@@ -6,24 +6,50 @@
 
 /// <reference types="node" />
 
-// import * as events from 'events';
-
 interface KeyvOptions {
+    /** Namespace for the current instance. */
     namespace?: string;
+    /** A custom serialization function. */
     serialize: (data: any) => string;
+    /** A custom deserialization function. */
     deserialize: (data: string) => any;
+    /** The connection string URI. */
     uri?: string;
+    /** The storage adapter instance to be used by Keyv. */
     store?: any;
+    /** Default TTL. Can be overridden by specififying a TTL on `.set()`. */
     ttl?: number;
+    /** Specify an adapter to use. e.g `'redis'` or `'mongodb'`. */
     adapter?: string;
 }
 
 declare class Keyv extends NodeJS.EventEmitter {
+    /**
+     * @param uri The connection string URI.
+     *
+     * Merged into the options object as options.uri.
+     * @param opts The options object is also passed through to the storage adapter. Check your storage adapter docs for any extra options.
+     */
     constructor(uri?: string, opts?: KeyvOptions);
+    /**
+     * @param opts The options object is also passed through to the storage adapter. Check your storage adapter docs for any extra options.
+     */
     constructor(opts?: KeyvOptions);
+    /** Returns the value. */
     get(key: string): Promise<any>;
+    /**
+     * Set a value.
+     *
+     * By default keys are persistent. You can set an expiry TTL in milliseconds.
+     */
     set(key: string, value: any, ttl?: number): Promise<boolean>;
+    /**
+     * Deletes an entry.
+     *
+     * Returns `true` if the key existed, `false` if not.
+     */
     delete(key: string): Promise<boolean>;
+    /** Delete all entries in the current namespace. */
     clear(): Promise<void>;
 }
 

From f32382e9fd85e3cb351f1a5bccb1909c9c6ce293 Mon Sep 17 00:00:00 2001
From: Arylo <arylo.open@gmail.com>
Date: Mon, 19 Mar 2018 15:17:36 +0800
Subject: [PATCH 0647/1382] Modify `strictFunctionTypes` to `true`

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

diff --git a/types/keyv/tsconfig.json b/types/keyv/tsconfig.json
index 21b4bcb7f1..47eab45180 100644
--- a/types/keyv/tsconfig.json
+++ b/types/keyv/tsconfig.json
@@ -6,7 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictFunctionTypes": false,
+        "strictFunctionTypes": true,
         "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [

From 47742853c94a95edc5ce70596adcaadf2fe3d849 Mon Sep 17 00:00:00 2001
From: Arylo <arylo.open@gmail.com>
Date: Mon, 19 Mar 2018 15:29:01 +0800
Subject: [PATCH 0648/1382] Fix KeyvOptions

---
 types/keyv/index.d.ts    | 12 ++++++------
 types/keyv/keyv-tests.ts |  5 +++++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/types/keyv/index.d.ts b/types/keyv/index.d.ts
index 11e1895c9a..9d0e2c6404 100644
--- a/types/keyv/index.d.ts
+++ b/types/keyv/index.d.ts
@@ -10,9 +10,9 @@ interface KeyvOptions {
     /** Namespace for the current instance. */
     namespace?: string;
     /** A custom serialization function. */
-    serialize: (data: any) => string;
+    serialize?: (data: any) => string;
     /** A custom deserialization function. */
-    deserialize: (data: string) => any;
+    deserialize?: (data: string) => any;
     /** The connection string URI. */
     uri?: string;
     /** The storage adapter instance to be used by Keyv. */
@@ -24,6 +24,10 @@ interface KeyvOptions {
 }
 
 declare class Keyv extends NodeJS.EventEmitter {
+    /**
+     * @param opts The options object is also passed through to the storage adapter. Check your storage adapter docs for any extra options.
+     */
+    constructor(opts?: KeyvOptions);
     /**
      * @param uri The connection string URI.
      *
@@ -31,10 +35,6 @@ declare class Keyv extends NodeJS.EventEmitter {
      * @param opts The options object is also passed through to the storage adapter. Check your storage adapter docs for any extra options.
      */
     constructor(uri?: string, opts?: KeyvOptions);
-    /**
-     * @param opts The options object is also passed through to the storage adapter. Check your storage adapter docs for any extra options.
-     */
-    constructor(opts?: KeyvOptions);
     /** Returns the value. */
     get(key: string): Promise<any>;
     /**
diff --git a/types/keyv/keyv-tests.ts b/types/keyv/keyv-tests.ts
index fc0c2f3ff1..7ee4cac90e 100644
--- a/types/keyv/keyv-tests.ts
+++ b/types/keyv/keyv-tests.ts
@@ -1,5 +1,10 @@
 import Keyv = require("keyv");
 
+new Keyv({
+    uri: 'redis://user:pass@localhost:6379',
+    namespace: "redis"
+});
+
 new Keyv('mongodb://user:pass@localhost:27017/dbname');
 new Keyv('redis://user:pass@localhost:6379');
 new Keyv('sqlite://path/to/database.sqlite');

From e107cb09c5c71a5e87262373c70d2bcb0e7a4d8a Mon Sep 17 00:00:00 2001
From: Fredrik Nicol <fredrik.nicol@gmail.com>
Date: Mon, 19 Mar 2018 09:00:29 +0100
Subject: [PATCH 0649/1382] Change to a test value that will certainly ever
 happen

String literals are not reliable to expect errors on since
the spec may change and accept `string`
---
 types/jss/jss-tests.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/jss/jss-tests.ts b/types/jss/jss-tests.ts
index 8e53780988..063c265c4e 100644
--- a/types/jss/jss-tests.ts
+++ b/types/jss/jss-tests.ts
@@ -70,7 +70,7 @@ styleSheet.addRule('badProperty', {
 });
 
 styleSheet.addRule('badValue', { // $ExpectError
-	'align-items': 'thisIsNotAValidValue',
+	'align-items': Symbol(),
 });
 
 styleSheet.detach();

From 8ae1dd4c851ff6bf21eda475db52db8f0bd08396 Mon Sep 17 00:00:00 2001
From: Fredrik Nicol <fredrik.nicol@gmail.com>
Date: Mon, 19 Mar 2018 09:15:13 +0100
Subject: [PATCH 0650/1382] Make tests happy

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

diff --git a/types/jss/index.d.ts b/types/jss/index.d.ts
index 3661ba099a..b22ed4a240 100644
--- a/types/jss/index.d.ts
+++ b/types/jss/index.d.ts
@@ -105,11 +105,11 @@ export interface RuleOptions {
 }
 export declare class SheetsRegistry {
     constructor();
-    registry: ReadonlyArray<StyleSheet<any>>;
+    registry: ReadonlyArray<StyleSheet>;
     readonly index: number;
-    add(sheet: StyleSheet<any>): void;
+    add(sheet: StyleSheet): void;
     reset(): void;
-    remove(sheet: StyleSheet<any>): void;
+    remove(sheet: StyleSheet): void;
     toString(options?: ToCssOptions): string;
 }
 declare class JSS {
diff --git a/types/jss/jss-tests.ts b/types/jss/jss-tests.ts
index f71f643595..b0400c2ae3 100644
--- a/types/jss/jss-tests.ts
+++ b/types/jss/jss-tests.ts
@@ -92,7 +92,11 @@ sheetsRegistry.add(styleSheet);
 const secondStyleSheet = jss.createStyleSheet(
 	{
 		ruleWithMockObservable: {
-			subscribe() {}
+			subscribe() {
+				return {
+					unsubscribe() {}
+				};
+			}
 		},
 		container2: {
 			display: 'flex',

From 9ef7415615c0feb97a6ec5fbe85e4544273fd352 Mon Sep 17 00:00:00 2001
From: Mike Cook <mike@travelnest.com>
Date: Mon, 19 Mar 2018 09:52:05 +0000
Subject: [PATCH 0651/1382] Add typings for nodecredstash

---
 types/nodecredstash/index.d.ts             | 45 +++++++++++++++++
 types/nodecredstash/nodecredstash-tests.ts | 59 ++++++++++++++++++++++
 types/nodecredstash/tsconfig.json          | 22 ++++++++
 types/nodecredstash/tslint.json            |  1 +
 4 files changed, 127 insertions(+)
 create mode 100644 types/nodecredstash/index.d.ts
 create mode 100644 types/nodecredstash/nodecredstash-tests.ts
 create mode 100644 types/nodecredstash/tsconfig.json
 create mode 100644 types/nodecredstash/tslint.json

diff --git a/types/nodecredstash/index.d.ts b/types/nodecredstash/index.d.ts
new file mode 100644
index 0000000000..d2489178a4
--- /dev/null
+++ b/types/nodecredstash/index.d.ts
@@ -0,0 +1,45 @@
+// Type definitions for nodecredstash 2.0
+// Project: https://github.com/DavidTanner/nodecredstash#readme
+// Definitions by: Mike Cook <https://github.com/migstopheles>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+import * as AWS from 'aws-sdk';
+
+interface ICredstashConfig {
+	table?: string;
+	awsOpts?: AWS.KMS.ClientConfiguration;
+	dynamoOpts?: AWS.DynamoDB.ClientConfiguration;
+	kmsKey?: string;
+	kmsOpts?: AWS.KMS.ClientConfiguration;
+}
+
+interface ICredstashContext {
+	[key: string]: string;
+}
+
+interface IPutSecretOptions {
+	name: string;
+	secret: string;
+	context: ICredstashContext;
+	digest?: string;
+	version?: number;
+}
+
+interface ICredstash {
+	getHighestVersion: (options: { name: string }) => Promise<AWS.DynamoDB.AttributeMap>;
+	incrementVersion: (options: { name: string }) => Promise<string>;
+	putSecret: (options: IPutSecretOptions) => Promise<AWS.DynamoDB.DocumentClient.PutItemOutput>;
+	decryptStash: (stash: { key: string; }, context?: ICredstashContext) => Promise<AWS.KMS.DecryptResponse>;
+	getAllVersions: (options: { name: string, context?: ICredstashContext, limit?: number }) => Promise<Array<{ version: string; secret: string }>>;
+	getSecret: (options: { name: string, context?: ICredstashContext, version?: number }) => Promise<string>;
+	deleteSecrets: (options: { name: string }) => Promise<Array<AWS.DynamoDB.DocumentClient.DeleteItemOutput>>;
+	deleteSecret: (options: { name: string, version: number }) => Promise<AWS.DynamoDB.DocumentClient.DeleteItemOutput>;
+	listSecrets: () => Promise<string[]>;
+	getAllSecrets: (options: { version?: number, context?: ICredstashContext, startsWith?: string }) => Promise<{ [key: string]: string }>;
+	createDdbTable: () => Promise<void>;
+}
+
+declare function Credstash(config: ICredstashConfig): ICredstash;
+
+export = Credstash;
diff --git a/types/nodecredstash/nodecredstash-tests.ts b/types/nodecredstash/nodecredstash-tests.ts
new file mode 100644
index 0000000000..f3788adc55
--- /dev/null
+++ b/types/nodecredstash/nodecredstash-tests.ts
@@ -0,0 +1,59 @@
+import Credstash = require('nodecredstash');
+
+const credstash = Credstash({
+	awsOpts: { region: 'us-east-1' },
+	dynamoOpts: { accessKeyId: 'foo' },
+	kmsKey: 'bar',
+	kmsOpts: { accessKeyId: 'baz' },
+	table: 'something'
+});
+
+credstash.decryptStash({ key: 'foo' }).then((result) => {
+	return {
+		id: result.KeyId,
+		text: result.Plaintext
+	};
+});
+
+credstash.deleteSecret({ name: 'foo', version: 1 }).then((result) => {
+	if (result.Attributes) return result.Attributes['blah'];
+	if (result.ConsumedCapacity) return result.ConsumedCapacity.TableName;
+	if (result.ItemCollectionMetrics) return result.ItemCollectionMetrics.ItemCollectionKey;
+});
+
+credstash.deleteSecrets({ name: 'foo' }).then((results) => {
+	const result = results[0];
+	if (result.Attributes) return result.Attributes['blah'].toUpperCase();
+	if (result.ConsumedCapacity) return result.ConsumedCapacity.TableName;
+	if (result.ItemCollectionMetrics) return result.ItemCollectionMetrics.ItemCollectionKey;
+});
+
+credstash.getAllSecrets({ version: 1 }).then((result) => {
+	return result['foo'].toUpperCase();
+});
+
+credstash.getAllVersions({ name: 'foo', context: { bar: 'baz' }, limit: 1 }).then((result) => {
+	return result[0].secret.toUpperCase() + result[0].version.toUpperCase();
+});
+
+credstash.getHighestVersion({ name: 'foo' }).then((result) => {
+	return result['foo'].S;
+});
+
+credstash.getSecret({ name: 'foo', version: 1, context: { bar: 'baz' } }).then((result) => {
+	return result.toUpperCase();
+});
+
+credstash.incrementVersion({ name: 'foo' }).then((result) => {
+	return result.toUpperCase();
+});
+
+credstash.listSecrets().then((result) => {
+	return result.map((str) => str.toUpperCase());
+});
+
+credstash.putSecret({ name: 'foo', secret: 'bar', context: { baz: 'qux' }, digest: 'quux', version: 1 }).then((result) => {
+	if (result.Attributes) return result.Attributes['foo'];
+	if (result.ConsumedCapacity) return result.ConsumedCapacity.TableName;
+	if (result.ItemCollectionMetrics) return result.ItemCollectionMetrics.ItemCollectionKey;
+});
diff --git a/types/nodecredstash/tsconfig.json b/types/nodecredstash/tsconfig.json
new file mode 100644
index 0000000000..da430c0182
--- /dev/null
+++ b/types/nodecredstash/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "nodecredstash-tests.ts"
+    ]
+}
diff --git a/types/nodecredstash/tslint.json b/types/nodecredstash/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/nodecredstash/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 81ca7edca2c370eb984a91ce97fd42ab5a4a18ee Mon Sep 17 00:00:00 2001
From: Yousef <yousefdardiry@gmail.com>
Date: Mon, 19 Mar 2018 10:54:47 +0100
Subject: [PATCH 0652/1382] BackHandlerStatic returns NativeEventSubscription

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

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index 5abf96e04c..bbceb07226 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -6550,7 +6550,7 @@ export interface BackAndroidStatic {
  */
 export interface BackHandlerStatic {
     exitApp(): void;
-    addEventListener(eventName: BackPressEventName, handler: () => void): void;
+    addEventListener(eventName: BackPressEventName, handler: () => void): NativeEventSubscription;
     removeEventListener(eventName: BackPressEventName, handler: () => void): void;
 }
 

From a626af102fb70b84e03389a55edb3db026700e4b Mon Sep 17 00:00:00 2001
From: Mike Cook <mike@travelnest.com>
Date: Mon, 19 Mar 2018 10:02:26 +0000
Subject: [PATCH 0653/1382] Dependencies and linting updates

---
 types/nodecredstash/index.d.ts    | 24 ++++++++++++------------
 types/nodecredstash/package.json  |  6 ++++++
 types/nodecredstash/tsconfig.json |  1 +
 3 files changed, 19 insertions(+), 12 deletions(-)
 create mode 100644 types/nodecredstash/package.json

diff --git a/types/nodecredstash/index.d.ts b/types/nodecredstash/index.d.ts
index d2489178a4..76375aac21 100644
--- a/types/nodecredstash/index.d.ts
+++ b/types/nodecredstash/index.d.ts
@@ -6,7 +6,7 @@
 /// <reference types="node"/>
 import * as AWS from 'aws-sdk';
 
-interface ICredstashConfig {
+interface CredstashConfig {
 	table?: string;
 	awsOpts?: AWS.KMS.ClientConfiguration;
 	dynamoOpts?: AWS.DynamoDB.ClientConfiguration;
@@ -14,32 +14,32 @@ interface ICredstashConfig {
 	kmsOpts?: AWS.KMS.ClientConfiguration;
 }
 
-interface ICredstashContext {
+interface CredstashContext {
 	[key: string]: string;
 }
 
-interface IPutSecretOptions {
+interface PutSecretOptions {
 	name: string;
 	secret: string;
-	context: ICredstashContext;
+	context: CredstashContext;
 	digest?: string;
 	version?: number;
 }
 
-interface ICredstash {
+interface Credstash {
 	getHighestVersion: (options: { name: string }) => Promise<AWS.DynamoDB.AttributeMap>;
 	incrementVersion: (options: { name: string }) => Promise<string>;
-	putSecret: (options: IPutSecretOptions) => Promise<AWS.DynamoDB.DocumentClient.PutItemOutput>;
-	decryptStash: (stash: { key: string; }, context?: ICredstashContext) => Promise<AWS.KMS.DecryptResponse>;
-	getAllVersions: (options: { name: string, context?: ICredstashContext, limit?: number }) => Promise<Array<{ version: string; secret: string }>>;
-	getSecret: (options: { name: string, context?: ICredstashContext, version?: number }) => Promise<string>;
-	deleteSecrets: (options: { name: string }) => Promise<Array<AWS.DynamoDB.DocumentClient.DeleteItemOutput>>;
+	putSecret: (options: PutSecretOptions) => Promise<AWS.DynamoDB.DocumentClient.PutItemOutput>;
+	decryptStash: (stash: { key: string; }, context?: CredstashContext) => Promise<AWS.KMS.DecryptResponse>;
+	getAllVersions: (options: { name: string, context?: CredstashContext, limit?: number }) => Promise<Array<{ version: string; secret: string }>>;
+	getSecret: (options: { name: string, context?: CredstashContext, version?: number }) => Promise<string>;
+	deleteSecrets: (options: { name: string }) => Promise<AWS.DynamoDB.DocumentClient.DeleteItemOutput[]>;
 	deleteSecret: (options: { name: string, version: number }) => Promise<AWS.DynamoDB.DocumentClient.DeleteItemOutput>;
 	listSecrets: () => Promise<string[]>;
-	getAllSecrets: (options: { version?: number, context?: ICredstashContext, startsWith?: string }) => Promise<{ [key: string]: string }>;
+	getAllSecrets: (options: { version?: number, context?: CredstashContext, startsWith?: string }) => Promise<{ [key: string]: string }>;
 	createDdbTable: () => Promise<void>;
 }
 
-declare function Credstash(config: ICredstashConfig): ICredstash;
+declare function Credstash(config: CredstashConfig): Credstash;
 
 export = Credstash;
diff --git a/types/nodecredstash/package.json b/types/nodecredstash/package.json
new file mode 100644
index 0000000000..0347abc684
--- /dev/null
+++ b/types/nodecredstash/package.json
@@ -0,0 +1,6 @@
+{
+    "dependencies": {
+        "aws-sdk": "^2.211.0"
+    },
+    "private": true
+}
diff --git a/types/nodecredstash/tsconfig.json b/types/nodecredstash/tsconfig.json
index da430c0182..ec4305243c 100644
--- a/types/nodecredstash/tsconfig.json
+++ b/types/nodecredstash/tsconfig.json
@@ -7,6 +7,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"

From a9c63ecf753bfd99d4bf9d7f0ca9a83d6c9c74bb Mon Sep 17 00:00:00 2001
From: Adam Laycock <adam@arcath.net>
Date: Mon, 19 Mar 2018 10:48:29 +0000
Subject: [PATCH 0654/1382] update screeps to 2.2.2

---
 types/screeps/index.d.ts       | 113 ++++++++++++++++++++++++++++++---
 types/screeps/screeps-tests.ts |  74 +++++++++++++++------
 2 files changed, 157 insertions(+), 30 deletions(-)

diff --git a/types/screeps/index.d.ts b/types/screeps/index.d.ts
index 17155770d5..77d472f447 100644
--- a/types/screeps/index.d.ts
+++ b/types/screeps/index.d.ts
@@ -53,6 +53,7 @@ declare const FIND_MY_CONSTRUCTION_SITES: 114;
 declare const FIND_HOSTILE_CONSTRUCTION_SITES: 115;
 declare const FIND_MINERALS: 116;
 declare const FIND_NUKES: 117;
+declare const FIND_TOMBSTONES: 118;
 
 declare const TOP: 1;
 declare const TOP_RIGHT: 2;
@@ -246,7 +247,7 @@ declare const RESOURCE_CATALYZED_KEANIUM_ALKALIDE: "XKHO2";
 declare const RESOURCE_CATALYZED_LEMERGIUM_ACID: "XLH2O";
 declare const RESOURCE_CATALYZED_LEMERGIUM_ALKALIDE: "XLHO2";
 declare const RESOURCE_CATALYZED_ZYNTHIUM_ACID: "XZH2O";
-declare const RESOURCE_CATALYZED_ZYNTHIUM_ALKALIDE: "ZXHO2";
+declare const RESOURCE_CATALYZED_ZYNTHIUM_ALKALIDE: "XZHO2";
 declare const RESOURCE_CATALYZED_GHODIUM_ACID: "XGH2O";
 declare const RESOURCE_CATALYZED_GHODIUM_ALKALIDE: "XGHO2";
 declare const RESOURCES_ALL: ResourceConstant[];
@@ -627,11 +628,14 @@ declare const LOOK_FLAGS: "flag";
 declare const LOOK_CONSTRUCTION_SITES: "constructionSite";
 declare const LOOK_NUKES: "nuke";
 declare const LOOK_TERRAIN: "terrain";
+declare const LOOK_TOMBSTONES: 'tombstone';
 
 declare const ORDER_SELL: "sell";
 declare const ORDER_BUY: "buy";
 
 declare const SYSTEM_USERNAME: string;
+
+declare const TOMBSTONE_DECAY_PER_PART: 5;
 /**
  * A site of a structure which is currently under construction.
  */
@@ -1190,6 +1194,31 @@ interface CPU {
      * @memberof CPU
      */
     setShardLimits(limits: CPUShardLimits): OK | ERR_BUSY | ERR_INVALID_ARGS;
+
+    /**
+     * Use this method to get heap statistics for your virtual machine.
+     *
+     * This method will be undefined if you are not using IVM.
+     *
+     * The return value is almost identical to the Node.js function v8.getHeapStatistics().
+     * This function returns one additional property: externally_allocated_size which is the total amount of currently
+     * allocated memory which is not included in the v8 heap but counts against this isolate's memory limit.
+     * ArrayBuffer instances over a certain size are externally allocated and will be counted here.
+     */
+    getHeapStatistics?(): HeapStatistics;
+}
+
+interface HeapStatistics {
+  total_heap_size: number;
+  total_heap_size_executable: number;
+  total_physical_size: number;
+  total_available_size: number;
+  used_heap_size: number;
+  heap_size_limit: number;
+  malloced_memory: number;
+  peak_malloced_memory: number;
+  does_zap_garbage: 0 | 1;
+  externally_allocated_size: number;
 }
 
 /**
@@ -1250,6 +1279,7 @@ interface AllLookAtTypes {
     source: Source;
     structure: Structure;
     terrain: Terrain;
+    tombstone: Tombstone;
 }
 
 type LookAtTypes = Partial<AllLookAtTypes>;
@@ -1280,7 +1310,7 @@ type LookForAtAreaResultWithPos<T, K extends keyof LookAtTypes = keyof LookAtTyp
 type LookForAtAreaResultArray<T, K extends keyof LookAtTypes = keyof LookAtTypes> = Array<LookForAtAreaResultWithPos<T, K>>;
 
 interface FindTypes {
-  [key: number]: RoomPosition | Creep | Source | Resource | Structure | Flag | ConstructionSite | Mineral | Nuke;
+  [key: number]: RoomPosition | Creep | Source | Resource | Structure | Flag | ConstructionSite | Mineral | Nuke | Tombstone;
   1: RoomPosition; // FIND_EXIT_TOP
   3: RoomPosition; // FIND_EXIT_RIGHT
   5: RoomPosition; // FIND_EXIT_BOTTOM
@@ -1303,6 +1333,7 @@ interface FindTypes {
   115: ConstructionSite; // FIND_HOSTILE_CONSTRUCTION_SITES
   116: Mineral; // FIND_MINERALS
   117: Nuke; // FIND_NUKES
+  118: Tombstone; // FIND_TOMBSTONES
 }
 
 interface FindPathOpts {
@@ -1531,7 +1562,8 @@ type FindConstant =
   FIND_MY_CONSTRUCTION_SITES |
   FIND_HOSTILE_CONSTRUCTION_SITES |
   FIND_MINERALS |
-  FIND_NUKES;
+  FIND_NUKES |
+  FIND_TOMBSTONES;
 
 type FIND_EXIT_TOP = 1;
 type FIND_EXIT_RIGHT = 3;
@@ -1556,6 +1588,7 @@ type FIND_MY_CONSTRUCTION_SITES = 114;
 type FIND_HOSTILE_CONSTRUCTION_SITES = 115;
 type FIND_MINERALS = 116;
 type FIND_NUKES = 117;
+type FIND_TOMBSTONES = 118;
 
 type FilterOptions<T extends FindConstant> = string | FilterFunction<T> | { filter: FilterFunction<T> };
 
@@ -1594,7 +1627,8 @@ type LookConstant =
   LOOK_FLAGS |
   LOOK_CONSTRUCTION_SITES |
   LOOK_NUKES |
-  LOOK_TERRAIN;
+  LOOK_TERRAIN |
+  LOOK_TOMBSTONES;
 
 type LOOK_CONSTRUCTION_SITES = "constructionSite";
 type LOOK_CREEPS = "creep";
@@ -1606,6 +1640,7 @@ type LOOK_RESOURCES = "resource";
 type LOOK_SOURCES = "source";
 type LOOK_STRUCTURES = "structure";
 type LOOK_TERRAIN = "terrain";
+type LOOK_TOMBSTONES = "tombstone";
 
 // Direction Constants
 
@@ -1844,9 +1879,11 @@ type RESOURCE_CATALYZED_KEANIUM_ALKALIDE = "XKHO2";
 type RESOURCE_CATALYZED_LEMERGIUM_ACID = "XLH2O";
 type RESOURCE_CATALYZED_LEMERGIUM_ALKALIDE = "XLHO2";
 type RESOURCE_CATALYZED_ZYNTHIUM_ACID = "XZH2O";
-type RESOURCE_CATALYZED_ZYNTHIUM_ALKALIDE = "ZXHO2";
+type RESOURCE_CATALYZED_ZYNTHIUM_ALKALIDE = "XZHO2";
 type RESOURCE_CATALYZED_GHODIUM_ACID = "XGH2O";
 type RESOURCE_CATALYZED_GHODIUM_ALKALIDE = "XGHO2";
+
+type TOMBSTONE_DECAY_PER_PART = 5;
 /**
  * The options that can be accepted by `findRoute()` and friends.
  */
@@ -3078,11 +3115,8 @@ interface StructureSpawn extends OwnedStructure<STRUCTURE_SPAWN> {
     name: string;
     /**
      * If the spawn is in process of spawning a new creep, this object will contain the new creep’s information, or null otherwise.
-     * @param name The name of a new creep.
-     * @param needTime Time needed in total to complete the spawning.
-     * @param remainingTime Remaining time to go.
      */
-    spawning: { name: string, needTime: number, remainingTime: number };
+    spawning: Spawning | null;
 
     /**
      * Check if a creep can be created.
@@ -3180,11 +3214,56 @@ interface StructureSpawn extends OwnedStructure<STRUCTURE_SPAWN> {
 }
 
 interface StructureSpawnConstructor extends _Constructor<StructureSpawn>, _ConstructorById<StructureSpawn> {
+    Spawning: SpawningConstructor;
 }
 
 declare const StructureSpawn: StructureSpawnConstructor;
 declare const Spawn: StructureSpawnConstructor; // legacy alias
 // declare type Spawn = StructureSpawn;
+
+interface Spawning {
+    readonly prototype: Spawning;
+
+    /**
+     * An array with the spawn directions
+     * @see http://docs.screeps.com/api/#StructureSpawn.Spawning.setDirections
+     */
+    directions: DirectionConstant[];
+
+    /**
+     * The name of the creep
+     */
+    name: string;
+
+    /**
+     * Time needed in total to complete the spawning.
+     */
+    needTime: number;
+
+    /**
+     * Remaining time to go.
+     */
+    remainingTime: number;
+
+    /**
+     * A link to the spawn
+     */
+    spawn: StructureSpawn;
+
+    /**
+     * Cancel spawning immediately. Energy spent on spawning is not returned.
+     */
+    cancel(): ScreepsReturnCode & (OK | ERR_NOT_OWNER);
+
+    /**
+     * Set desired directions where the creep should move when spawned.
+     * @param directions An array with the spawn directions
+     */
+    setDirections(directions: DirectionConstant[]): ScreepsReturnCode & (OK | ERR_NOT_OWNER | ERR_INVALID_ARGS);
+}
+
+interface SpawningConstructor extends _Constructor<Spawning>, _ConstructorById<Spawning> {
+}
 /**
  * Parent object for structure classes
  */
@@ -3642,7 +3721,7 @@ interface StructureLab extends OwnedStructure<STRUCTURE_LAB> {
     /**
      * The type of minerals containing in the lab. Labs can contain only one mineral type at the same time.
      */
-    mineralType: MineralConstant;
+    mineralType: _ResourceConstantSansEnergy | undefined;
     /**
      * The total amount of minerals the lab can contain.
      */
@@ -3819,3 +3898,17 @@ type AnyStructure =
     StructurePortal |
     StructureRoad |
     StructureWall;
+interface Tombstone extends RoomObject {
+    /** The tick that the creep died. */
+    deathTime: number;
+    store: StoreDefinition;
+    /** How many ticks until this tombstone decays */
+    ticksToDecay: number;
+    /** The creep that died to create this tombstone */
+    creep: Creep;
+}
+
+interface TombstoneConstructor extends _Constructor<Tombstone>, _ConstructorById<Tombstone> {
+}
+
+declare const Tombstone: TombstoneConstructor;
diff --git a/types/screeps/screeps-tests.ts b/types/screeps/screeps-tests.ts
index bbe542b568..17a78de496 100644
--- a/types/screeps/screeps-tests.ts
+++ b/types/screeps/screeps-tests.ts
@@ -43,6 +43,21 @@ interface CreepMemory {
 {
     for (const i in Game.spawns) {
         Game.spawns[i].createCreep(body);
+
+        // Test StructureSpawn.Spawning
+        let creep: Spawning | null = Game.spawns[i].spawning;
+        if (creep) {
+            const name: string = creep.name;
+            const needTime: number = creep.needTime;
+            const remainingTime: number = creep.remainingTime;
+            const creepSpawn: StructureSpawn = creep.spawn;
+
+            const cancelStatus: OK | ERR_NOT_OWNER = creep.cancel();
+            const setDirectionStatus: OK | ERR_NOT_OWNER | ERR_INVALID_ARGS = creep.setDirections([TOP, BOTTOM, LEFT, RIGHT]);
+        }
+
+        creep = new StructureSpawn.Spawning("");
+        creep = StructureSpawn.Spawning("");
     }
 }
 
@@ -275,11 +290,12 @@ interface CreepMemory {
 {
     const pfCreep = Game.creeps.John;
 
-    const goals = pfCreep.room.find(FIND_SOURCES).map((source) => {
-        // We can't actually walk on sources-- set `range` to 1
-        // so we path next to it.
-        return { pos: source.pos, range: 1 };
-    });
+    const goals = pfCreep.room.find(FIND_SOURCES)
+        .map((source) => {
+            // We can't actually walk on sources-- set `range` to 1
+            // so we path next to it.
+            return { pos: source.pos, range: 1 };
+        });
 
     const ret = PathFinder.search(
         pfCreep.pos, goals,
@@ -299,22 +315,24 @@ interface CreepMemory {
                 }
                 const costs = new PathFinder.CostMatrix();
 
-                curRoom.find(FIND_STRUCTURES).forEach((struct) => {
-                    if (struct.structureType === STRUCTURE_ROAD) {
-                        // Favor roads over plain tiles
-                        costs.set(struct.pos.x, struct.pos.y, 1);
-                    } else if (struct.structureType !== STRUCTURE_CONTAINER &&
-                        (struct.structureType !== STRUCTURE_RAMPART ||
-                            !(struct as OwnedStructure).my)) {
-                        // Can't walk through non-walkable buildings
-                        costs.set(struct.pos.x, struct.pos.y, 0xff);
-                    }
-                });
+                curRoom.find(FIND_STRUCTURES)
+                    .forEach((struct) => {
+                        if (struct.structureType === STRUCTURE_ROAD) {
+                            // Favor roads over plain tiles
+                            costs.set(struct.pos.x, struct.pos.y, 1);
+                        } else if (struct.structureType !== STRUCTURE_CONTAINER &&
+                            (struct.structureType !== STRUCTURE_RAMPART ||
+                                !(struct as OwnedStructure).my)) {
+                            // Can't walk through non-walkable buildings
+                            costs.set(struct.pos.x, struct.pos.y, 0xff);
+                        }
+                    });
 
                 // Avoid creeps in the room
-                curRoom.find(FIND_CREEPS).forEach((thisCreep) => {
-                    costs.set(thisCreep.pos.x, thisCreep.pos.y, 0xff);
-                });
+                curRoom.find(FIND_CREEPS)
+                    .forEach((thisCreep) => {
+                        costs.set(thisCreep.pos.x, thisCreep.pos.y, 0xff);
+                    });
 
                 return costs;
             },
@@ -504,7 +522,8 @@ interface CreepMemory {
     const from = Game.rooms.myRoom.find(FIND_STRUCTURES, (s) => (s.structureType === STRUCTURE_CONTAINER || s.structureType === STRUCTURE_STORAGE) && s.store.energy > 0)[0];
     const to = from.pos.findClosestByPath(FIND_MY_STRUCTURES, {filter: (s) => (s.structureType === STRUCTURE_SPAWN || s.structureType === STRUCTURE_EXTENSION) && s.energy < s.energyCapacity});
 
-    Game.rooms.myRoom.find(FIND_MY_STRUCTURES, (s) => s.structureType === STRUCTURE_RAMPART).forEach((r) => r.notifyWhenAttacked(false));
+    Game.rooms.myRoom.find(FIND_MY_STRUCTURES, (s) => s.structureType === STRUCTURE_RAMPART)
+        .forEach((r) => r.notifyWhenAttacked(false));
 }
 
 {
@@ -515,3 +534,18 @@ interface CreepMemory {
 
     BOOSTS[creep.body[0].type];
 }
+
+{
+    const tombstone = room.find(FIND_TOMBSTONES)[0];
+
+    tombstone.creep.my;
+
+    tombstone.store.energy;
+}
+
+{
+    if (Game.cpu.hasOwnProperty('getHeapStatistics')) {
+        const heap = Game.cpu.getHeapStatistics!();
+        heap.total_heap_size;
+    }
+}

From 26f073522709f23c6483030538291c6726260cc4 Mon Sep 17 00:00:00 2001
From: Guo Yunhe <guoyunhebrave@gmail.com>
Date: Mon, 19 Mar 2018 14:03:10 +0200
Subject: [PATCH 0655/1382] wpapi: avoid using Function and Object

---
 types/wpapi/index.d.ts     | 68 ++++++++++++++++++++------------------
 types/wpapi/tsconfig.json  |  2 +-
 types/wpapi/wpapi-tests.ts |  8 +++++
 3 files changed, 44 insertions(+), 34 deletions(-)

diff --git a/types/wpapi/index.d.ts b/types/wpapi/index.d.ts
index 9c0d635e5d..9f1d81e531 100644
--- a/types/wpapi/index.d.ts
+++ b/types/wpapi/index.d.ts
@@ -1,8 +1,8 @@
 // Type definitions for wpapi 1.1
-// TypeScript Version: 2.2
 // Project: https://github.com/wp-api/node-wpapi
 // Definitions by: Guo Yunhe <https://github.com/guoyunhe>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 export = WPAPI;
 
@@ -94,7 +94,6 @@ declare class WPAPI {
 
     /**
      * Create and return a handler for an arbitrary WP REST API endpoint.
-     * TODO: type for Endpoint Factory
      *
      * @param namespace A namespace string, e.g. 'myplugin/v1'
      * @param restBase A REST route string, e.g. '/author/(?P\d+)'
@@ -104,7 +103,7 @@ declare class WPAPI {
         namespace: string,
         restBase: string,
         options?: WPAPI.RegisterRouteOptions
-    ): Function;
+    ): WPAPI.WPRequestFactory;
 
     /**
      * Set the default headers to use for all HTTP requests created from this
@@ -179,7 +178,7 @@ declare namespace WPAPI {
      *
      * @see http://wp-api.org/node-wpapi/api-reference/wpapi/1.1.2/WPRequest.html
      */
-    export class WPRequest {
+    class WPRequest {
         /**
          * WPRequest is the base API request object constructor
          *
@@ -195,7 +194,7 @@ declare namespace WPAPI {
          *
          * @param credentials An authentication credentials object
          */
-        auth(credentials?: WPAPI.Credentials): WPRequest;
+        auth(credentials?: Credentials): WPRequest;
 
         /**
          * Set the context of the request. Used primarily to expose private
@@ -210,13 +209,11 @@ declare namespace WPAPI {
          *
          * This is the public interface for creating POST requests
          *
-         * TODO: callback type
-         *
          * @param data The data for the POST request
          * @param callback A callback to invoke with the results of the POST
          * request
          */
-        create(data: Object, callback?: Function): Promise<any>;
+        create(data: any, callback?: WPRequestCallback): Promise<any>;
 
         /**
          * Delete the specified resource
@@ -225,7 +222,7 @@ declare namespace WPAPI {
          * @param callback A callback to invoke with the results of the DELETE
          * request
          */
-        delete(data?: Object, callback?: Function): Promise<any>;
+        delete(data?: any, callback?: WPRequestCallback): Promise<any>;
 
         /**
          * Convenience wrapper for .context( 'edit' )
@@ -248,11 +245,11 @@ declare namespace WPAPI {
          * Specify a file or a file buffer to attach to the request, for use
          * when creating a new Media item
          *
-         * @param fileA path to a file (in Node) or an file object (Node or
+         * @param file A path to a file (in Node) or an file object (Node or
          * Browser) to attach to the request
          * @param name An (optional) filename to use for the file
          */
-        file(file: Object | string, name?: string): WPRequest;
+        file(file: string | File, name?: string): WPRequest;
 
         /**
          * Get the headers for the specified resource
@@ -260,7 +257,7 @@ declare namespace WPAPI {
          * @param callback A callback to invoke with the results of the HEAD
          * request
          */
-        get(callback?: Function): Promise<any>;
+        get(callback?: WPRequestCallback): Promise<any>;
 
         /**
          * Set the id of resource.
@@ -325,7 +322,7 @@ declare namespace WPAPI {
          * @param value The value of the parameter being set
          */
         param(
-            props: string | Object,
+            props: string | { [name: string]: string | number | any[] },
             value?: string | number | any[]
         ): WPRequest;
 
@@ -351,7 +348,10 @@ declare namespace WPAPI {
          * names and their associated string values
          * @param value The value of the header being set
          */
-        setHeaders(headers: string | Object, value?: string): WPRequest;
+        setHeaders(
+            headers: string | { [name: string]: string },
+            value?: string
+        ): WPRequest;
 
         /**
          * Set a component of the resource URL itself (as opposed to a query
@@ -383,8 +383,8 @@ declare namespace WPAPI {
          * by the request
          */
         then(
-            successCallback?: Function,
-            failureCallback?: Function
+            successCallback?: (data: any) => void,
+            failureCallback?: (error: Error) => void
         ): Promise<any>;
 
         /**
@@ -397,13 +397,11 @@ declare namespace WPAPI {
          *
          * This is the public interface for creating PATCH requests
          *
-         * TODO: callback type
-         *
          * @param data The data for the PATCH request
          * @param callback A callback to invoke with the results of the PATCH
          * request
          */
-        update(data: Object, callback?: Function): Promise<any>;
+        update(data: any, callback?: WPRequestCallback): Promise<any>;
 
         /**
          * Validate whether the specified path parts are valid for this endpoint
@@ -425,7 +423,7 @@ declare namespace WPAPI {
         [customParamsMethod: string]: any;
     }
 
-    export interface WPAPIOptions extends Credentials {
+    interface WPAPIOptions extends Credentials {
         /** The URI for a WP-API endpoint */
         endpoint: string;
         /**
@@ -442,7 +440,7 @@ declare namespace WPAPI {
         transport?: Transport;
     }
 
-    export interface WPRequestOptions extends Credentials {
+    interface WPRequestOptions extends Credentials {
         /** The URI for a WP-API endpoint */
         endpoint: string;
         /**
@@ -453,8 +451,12 @@ declare namespace WPAPI {
         transport?: Transport;
     }
 
+    type WPRequestFactory = () => WPRequest;
+
+    type WPRequestCallback = (error: Error, data: any) => void;
+
     /** Authentication credentials */
-    export interface Credentials {
+    interface Credentials {
         /** A WP-API Basic HTTP Authentication username */
         username?: string;
         /** A WP-API Basic HTTP Authentication password */
@@ -463,7 +465,7 @@ declare namespace WPAPI {
         nonce?: string;
     }
 
-    export interface Transport {
+    interface Transport {
         get?: TransportFunction;
         post?: TransportFunction;
         put?: TransportFunction;
@@ -471,16 +473,16 @@ declare namespace WPAPI {
         head?: TransportFunction;
     }
 
-    export type TransportFunction = (
+    type TransportFunction = (
         wpreq: WPRequest,
-        cb: Function
+        cb?: WPRequestCallback
     ) => Promise<any>;
 
-    export interface Routes {
+    interface Routes {
         [path: string]: Route;
     }
 
-    export interface Route {
+    interface Route {
         namespace: string;
         methods: HTTPMethod[];
         endpoints: HTTPEndpoint[];
@@ -489,16 +491,16 @@ declare namespace WPAPI {
         };
     }
 
-    export type HTTPMethod = "GET" | "POST" | "PUT" | "PATCH" | "DELETE";
+    type HTTPMethod = "GET" | "POST" | "PUT" | "PATCH" | "DELETE";
 
-    export interface HTTPEndpoint {
+    interface HTTPEndpoint {
         methods: HTTPMethod[];
         args: {
             [arg: string]: HTTPArgument;
         };
     }
 
-    export interface HTTPArgument {
+    interface HTTPArgument {
         required: boolean;
         default?: string | number;
         enum?: string[];
@@ -509,7 +511,7 @@ declare namespace WPAPI {
         };
     }
 
-    export type HTTPArgumentType =
+    type HTTPArgumentType =
         | "string"
         | "integer"
         | "number"
@@ -517,11 +519,11 @@ declare namespace WPAPI {
         | "object"
         | "array";
 
-    export interface HTTPHeaders {
+    interface HTTPHeaders {
         [key: string]: string;
     }
 
-    export interface RegisterRouteOptions {
+    interface RegisterRouteOptions {
         params?: string[];
         methods?: HTTPMethod[];
         mixins?: {
diff --git a/types/wpapi/tsconfig.json b/types/wpapi/tsconfig.json
index af7f0df782..789edd9ee4 100644
--- a/types/wpapi/tsconfig.json
+++ b/types/wpapi/tsconfig.json
@@ -2,7 +2,7 @@
     "compilerOptions": {
         "target": "ES6",
         "module": "commonjs",
-        "lib": ["es6"],
+        "lib": ["es6", "dom"],
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
diff --git a/types/wpapi/wpapi-tests.ts b/types/wpapi/wpapi-tests.ts
index dbbfa1deb0..a06908d94e 100644
--- a/types/wpapi/wpapi-tests.ts
+++ b/types/wpapi/wpapi-tests.ts
@@ -93,3 +93,11 @@ wp2
         status: "publish"
     })
     .then((response: any) => {});
+
+// Custom routes
+
+const site = new WPAPI({ endpoint: "http://www.yoursite.com/wp-json" });
+const myCustomResource = site.registerRoute("myplugin/v1", "/author/(?P<id>)");
+myCustomResource()
+    .id(17)
+    .then((response: any) => {}); // => myplugin/v1/author/17

From 7b51234919c155c484496e44e03699d2d454f968 Mon Sep 17 00:00:00 2001
From: Igor Polishchuk <igor.polishchuk@swaypay.io>
Date: Mon, 19 Mar 2018 14:17:10 +0200
Subject: [PATCH 0656/1382] Fixed CreditCardTypeChangeHandler typings

---
 types/cleave.js/options/creditCard.d.ts       | 19 +++++++++++++++++++
 .../{options.d.ts => options/index.d.ts}      | 17 +----------------
 types/cleave.js/tsconfig.json                 |  3 ++-
 3 files changed, 22 insertions(+), 17 deletions(-)
 create mode 100644 types/cleave.js/options/creditCard.d.ts
 rename types/cleave.js/{options.d.ts => options/index.d.ts} (76%)

diff --git a/types/cleave.js/options/creditCard.d.ts b/types/cleave.js/options/creditCard.d.ts
new file mode 100644
index 0000000000..c052a2f2c2
--- /dev/null
+++ b/types/cleave.js/options/creditCard.d.ts
@@ -0,0 +1,19 @@
+import Cleave = require("../");
+
+// Credit Card Options
+export type CreditCardType =
+    | "amex"
+    | "dankort"
+    | "diners"
+    | "discover"
+    | "instapayment"
+    | "jcb"
+    | "maestro"
+    | "mastercard"
+    | "uatp"
+    | "unknown"
+    | "unionPay"
+    | "mir"
+    | "visa";
+
+export type CreditCardTypeChangeHandler = (this: Cleave, type: CreditCardType) => void;
\ No newline at end of file
diff --git a/types/cleave.js/options.d.ts b/types/cleave.js/options/index.d.ts
similarity index 76%
rename from types/cleave.js/options.d.ts
rename to types/cleave.js/options/index.d.ts
index 81757fe097..60e2e99e40 100644
--- a/types/cleave.js/options.d.ts
+++ b/types/cleave.js/options/index.d.ts
@@ -1,19 +1,4 @@
-// Credit Card Options
-export type CreditCardType =
-    | "amex"
-    | "dankort"
-    | "diners"
-    | "discover"
-    | "instapayment"
-    | "jcb"
-    | "maestro"
-    | "mastercard"
-    | "uatp"
-    | "unknown"
-    | "unionPay"
-    | "mir"
-    | "visa";
-export type CreditCardTypeChangeHandler = (owner: HTMLInputElement, type: CreditCardType) => void;
+import { CreditCardTypeChangeHandler } from "./creditCard";
 
 export interface CleaveOptions {
     creditCard?: boolean;
diff --git a/types/cleave.js/tsconfig.json b/types/cleave.js/tsconfig.json
index c2d5447360..9ad0f08e29 100644
--- a/types/cleave.js/tsconfig.json
+++ b/types/cleave.js/tsconfig.json
@@ -21,7 +21,8 @@
     "files": [
         "cleave.js-tests.tsx",
         "index.d.ts",
-        "options.d.ts",
+        "options/crediCard.d.ts",
+        "options/index.d.ts",
         "react/index.d.ts"
     ]
 }
\ No newline at end of file

From c1e6b7b10721ea8886c035def893f596e53bd750 Mon Sep 17 00:00:00 2001
From: Igor Polishchuk <igor.polishchuk@swaypay.io>
Date: Mon, 19 Mar 2018 14:26:35 +0200
Subject: [PATCH 0657/1382] fixed compilerOptions.files typo

---
 types/cleave.js/tsconfig.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/cleave.js/tsconfig.json b/types/cleave.js/tsconfig.json
index 9ad0f08e29..ec4da5d047 100644
--- a/types/cleave.js/tsconfig.json
+++ b/types/cleave.js/tsconfig.json
@@ -21,7 +21,7 @@
     "files": [
         "cleave.js-tests.tsx",
         "index.d.ts",
-        "options/crediCard.d.ts",
+        "options/creditCard.d.ts",
         "options/index.d.ts",
         "react/index.d.ts"
     ]

From a82f022dcf96d54ba4f484599158a3af617a8359 Mon Sep 17 00:00:00 2001
From: Igor Polishchuk <igor.polishchuk@swaypay.io>
Date: Mon, 19 Mar 2018 14:34:23 +0200
Subject: [PATCH 0658/1382] added newline

---
 types/cleave.js/options/creditCard.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/cleave.js/options/creditCard.d.ts b/types/cleave.js/options/creditCard.d.ts
index c052a2f2c2..b7f55ff5b0 100644
--- a/types/cleave.js/options/creditCard.d.ts
+++ b/types/cleave.js/options/creditCard.d.ts
@@ -16,4 +16,4 @@ export type CreditCardType =
     | "mir"
     | "visa";
 
-export type CreditCardTypeChangeHandler = (this: Cleave, type: CreditCardType) => void;
\ No newline at end of file
+export type CreditCardTypeChangeHandler = (this: Cleave, type: CreditCardType) => void;

From 41f7055984e34aa947bb24e8528ce26f783002eb Mon Sep 17 00:00:00 2001
From: Ylies Chahi <ylies@swapcard.com>
Date: Mon, 19 Mar 2018 14:37:03 +0100
Subject: [PATCH 0659/1382] add finally implement to comply promise
 implementation

---
 types/jsforce/query.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/jsforce/query.d.ts b/types/jsforce/query.d.ts
index 242d89b358..0e7d413cf8 100644
--- a/types/jsforce/query.d.ts
+++ b/types/jsforce/query.d.ts
@@ -49,6 +49,7 @@ export class Query<T> extends Readable implements Promise<T> {
     // Implementing promise methods
     then<T, never>(onfulfilled?: any): Promise<T | never>;
     catch<never>(onrejected?: any): Promise<T>;
+    finally<never>(): Promise<T>;
     [Symbol.toStringTag]: "Promise";
 }
 

From fc89e65611bedf181bc934995b57715575f958d9 Mon Sep 17 00:00:00 2001
From: Johan Isaksson <johan@izaxon.com>
Date: Mon, 19 Mar 2018 14:51:13 +0100
Subject: [PATCH 0660/1382] Missing function editNotification(...) added.

See editNotification() description at https://github.com/igorprado/react-notification-system.
---
 types/react-notification-system/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/react-notification-system/index.d.ts b/types/react-notification-system/index.d.ts
index 8176ad097c..a993f6cc4d 100644
--- a/types/react-notification-system/index.d.ts
+++ b/types/react-notification-system/index.d.ts
@@ -12,6 +12,7 @@ declare namespace NotificationSystem {
         addNotification(notification: Notification): Notification;
         removeNotification(uidOrNotification: number | string | Notification): void;
         clearNotifications(): void;
+        editNotification(uidOrNotification: number | string | Notification, newNotification: Notification): void;
     }
 
     export type CallBackFunction = (notification: Notification) => void;

From 5ebbb231c8ca23e47ed4c240b8bb67fb7a73df96 Mon Sep 17 00:00:00 2001
From: Alban Gicquel <alban.gicquel@thomsonreuters.com>
Date: Mon, 19 Mar 2018 10:16:43 -0400
Subject: [PATCH 0661/1382] typo in merge

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

diff --git a/types/inquirer/index.d.ts b/types/inquirer/index.d.ts
index 7c4e9a1f2e..e2e897741d 100644
--- a/types/inquirer/index.d.ts
+++ b/types/inquirer/index.d.ts
@@ -100,7 +100,7 @@ declare namespace inquirer {
          */
         choices?:
             | ReadonlyArray<ChoiceType>
-            | ((answers: T) => ReadonlyArray<ChoiceType>);
+            | ((answers: T) => ReadonlyArray<ChoiceType>)
             | ((answers: T) => Promise<ReadonlyArray<ChoiceType>>);
         /**
          * Receive the user input and should return true if the value is valid, and an error message (String)

From 1788ad608a162205ec29b2b49280aeb2fba1040b Mon Sep 17 00:00:00 2001
From: Lee Benson <lee@leebenson.com>
Date: Mon, 19 Mar 2018 15:19:44 +0000
Subject: [PATCH 0662/1382] adds `boolean` type to `hot`

Per the readme:

> As of v3.0.1 setting this to false will completely disable webpack-hot-client and all automatic Hot Module Replacement functionality
---
 types/koa-webpack/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/koa-webpack/index.d.ts b/types/koa-webpack/index.d.ts
index b425956f03..4f86fcd11f 100644
--- a/types/koa-webpack/index.d.ts
+++ b/types/koa-webpack/index.d.ts
@@ -19,7 +19,7 @@ declare namespace koaWebpack {
         compiler?: webpack.Compiler;
         config?: webpack.Configuration;
         dev?: webpackDevMiddleware.Options;
-        hot?: webpackHotMiddleware.Options;
+        hot?: webpackHotMiddleware.Options | boolean;
     }
 
     interface CombinedWebpackMiddleware {

From 4b26c77b3ccd58041802c624b1b6f10c9ecacb1e Mon Sep 17 00:00:00 2001
From: Matthew Zartman <matt@mirrorme3d.com>
Date: Mon, 19 Mar 2018 11:55:53 -0400
Subject: [PATCH 0663/1382] Adds new module to fit Meteor suggested styling

---
 types/meteor-roles/index.d.ts | 254 ++++++++++++++++++++++++++++++++++
 1 file changed, 254 insertions(+)

diff --git a/types/meteor-roles/index.d.ts b/types/meteor-roles/index.d.ts
index 80a4b02c90..ed91f96ab5 100644
--- a/types/meteor-roles/index.d.ts
+++ b/types/meteor-roles/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for Meteor Roles 1.2.14
 // Project: https://github.com/alanning/meteor-roles/
 // Definitions by: Robbie Van Gorkom <https://github.com/vangorra>
+//                 Matthew Zartman <https://github.com/mattmm3d>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="meteor" />
@@ -262,3 +263,256 @@ declare namespace Roles {
 declare namespace Meteor {
     var roles : Mongo.Collection<Roles.Role>;
 }
+
+
+/* Declaring in the format prescribed by Meteor */
+declare module "meteor/alanning:roles" {
+    namespace Roles {
+        /**
+         * Constant used to reference the special 'global' group that
+         * can be used to apply blanket permissions across all groups.
+         *
+         * @example
+         *     Roles.addUsersToRoles(user, 'admin', Roles.GLOBAL_GROUP)
+         *     Roles.userIsInRole(user, 'admin') // => true
+         *
+         *     Roles.setUserRoles(user, 'support-staff', Roles.GLOBAL_GROUP)
+         *     Roles.userIsInRole(user, 'support-staff') // => true
+         *     Roles.userIsInRole(user, 'admin') // => false
+         *
+         * @property GLOBAL_GROUP
+         * @type String
+         * @static
+         * @final
+         */
+        var GLOBAL_GROUP : string;
+
+        /**
+         * Subscription handle for the currently logged in user's permissions.
+         *
+         * NOTE: The corresponding publish function, `_roles`, depends on
+         * `this.userId` so it will automatically re-run when the currently
+         * logged-in user changes.
+         *
+         * @example
+         *
+         *     `Roles.subscription.ready()` // => `true` if user roles have been loaded
+         *
+         * @property subscription
+         * @type Object
+         * @for Roles
+         */
+        var subscription : Subscription;
+
+        /**
+         * Add users to roles. Will create roles as needed.
+         *
+         * NOTE: Mixing grouped and non-grouped roles for the same user
+         *       is not supported and will throw an error.
+         *
+         * Makes 2 calls to database:
+         *  1. retrieve list of all existing roles
+         *  2. update users' roles
+         *
+         * @example
+         *     Roles.addUsersToRoles(userId, 'admin')
+         *     Roles.addUsersToRoles(userId, ['view-secrets'], 'example.com')
+         *     Roles.addUsersToRoles([user1, user2], ['user','editor'])
+         *     Roles.addUsersToRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')
+         *     Roles.addUsersToRoles(userId, 'admin', Roles.GLOBAL_GROUP)
+         *
+         * @method addUsersToRoles
+         * @param {Array|String} users User id(s) or object(s) with an _id field
+         * @param {Array|String} roles Name(s) of roles/permissions to add users to
+         * @param {String} [group] Optional group name. If supplied, roles will be
+         *                         specific to that group.
+         *                         Group names can not start with '$' or numbers.
+         *                         Periods in names '.' are automatically converted
+         *                         to underscores.
+         *                         The special group Roles.GLOBAL_GROUP provides
+         *                         a convenient way to assign blanket roles/permissions
+         *                         across all groups.  The roles/permissions in the
+         *                         Roles.GLOBAL_GROUP group will be automatically
+         *                         included in checks for any group.
+         */
+        function addUsersToRoles(
+            user : string|string[]|Object|Object[],
+            roles : string|string[],
+            group? : string
+        ) : void;
+
+        /**
+         * Create a new role. Whitespace will be trimmed.
+         *
+         * @method createRole
+         * @param {String} role Name of role
+         * @return {String} id of new role
+         */
+        function createRole(role : string) : string;
+
+        /**
+         * Delete an existing role.  Will throw "Role in use" error if any users
+         * are currently assigned to the target role.
+         *
+         * @method deleteRole
+         * @param {String} role Name of role
+         */
+        function deleteRole (role : string) : void;
+
+        /**
+         * Retrieve set of all existing roles
+         *
+         * @method getAllRoles
+         * @return {Cursor} cursor of existing roles
+         */
+        function getAllRoles() : Mongo.Cursor<Role>;
+
+        /**
+         * Retrieve users groups, if any
+         *
+         * @method getGroupsForUser
+         * @param {String|Object} user User Id or actual user object
+         * @param {String} [role] Optional name of roles to restrict groups to.
+         *
+         * @return {Array} Array of user's groups, unsorted. Roles.GLOBAL_GROUP will be omitted
+         */
+        function getGroupsForUser(
+            user : string|Object,
+            role? : string
+        ) : string[];
+
+        /**
+         * Retrieve users roles
+         *
+         * @method getRolesForUser
+         * @param {String|Object} user User Id or actual user object
+         * @param {String} [group] Optional name of group to restrict roles to.
+         *                         User's Roles.GLOBAL_GROUP will also be included.
+         * @return {Array} Array of user's roles, unsorted.
+         */
+        function getRolesForUser(
+            user : string|Object,
+            group? : string
+        ) : string[];
+
+        /**
+         * Retrieve all users who are in target role.
+         *
+         * NOTE: This is an expensive query; it performs a full collection scan
+         * on the users collection since there is no index set on the 'roles' field.
+         * This is by design as most queries will specify an _id so the _id index is
+         * used automatically.
+         *
+         * @method getUsersInRole
+         * @param {Array|String} role Name of role/permission.  If array, users
+         *                            returned will have at least one of the roles
+         *                            specified but need not have _all_ roles.
+         * @param {String} [group] Optional name of group to restrict roles to.
+         *                         User's Roles.GLOBAL_GROUP will also be checked.
+         * @param {Object} [options] Optional options which are passed directly
+         *                           through to `Meteor.users.find(query, options)`
+         * @return {Cursor} cursor of users in role
+         */
+        function getUsersInRole(
+            role : string|string[],
+            group? : string,
+            options? : {
+                sort?: Mongo.SortSpecifier;
+            skip?: number;
+            limit?: number;
+            fields?: Mongo.FieldSpecifier;
+            reactive?: boolean;
+            transform?: Function;
+        }) : Mongo.Cursor<Meteor.User>;
+
+        /**
+         * Remove users from roles
+         *
+         * @example
+         *     Roles.removeUsersFromRoles(users.bob, 'admin')
+         *     Roles.removeUsersFromRoles([users.bob, users.joe], ['editor'])
+         *     Roles.removeUsersFromRoles([users.bob, users.joe], ['editor', 'user'])
+         *     Roles.removeUsersFromRoles(users.eve, ['user'], 'group1')
+         *
+         * @method removeUsersFromRoles
+         * @param {Array|String} users User id(s) or object(s) with an _id field
+         * @param {Array|String} roles Name(s) of roles to add users to
+         * @param {String} [group] Optional. Group name. If supplied, only that
+         *                         group will have roles removed.
+         */
+        function removeUsersFromRoles(
+            user : string|string[]|Object|Object[],
+            roles? : string[],
+            group? : string
+        ) : void;
+
+        /**
+         * Set a users roles/permissions.
+         *
+         * @example
+         *     Roles.setUserRoles(userId, 'admin')
+         *     Roles.setUserRoles(userId, ['view-secrets'], 'example.com')
+         *     Roles.setUserRoles([user1, user2], ['user','editor'])
+         *     Roles.setUserRoles([user1, user2], ['glorious-admin', 'perform-action'], 'example.org')
+         *     Roles.setUserRoles(userId, 'admin', Roles.GLOBAL_GROUP)
+         *
+         * @method setUserRoles
+         * @param {Array|String} users User id(s) or object(s) with an _id field
+         * @param {Array|String} roles Name(s) of roles/permissions to add users to
+         * @param {String} [group] Optional group name. If supplied, roles will be
+         *                         specific to that group.
+         *                         Group names can not start with '$'.
+         *                         Periods in names '.' are automatically converted
+         *                         to underscores.
+         *                         The special group Roles.GLOBAL_GROUP provides
+         *                         a convenient way to assign blanket roles/permissions
+         *                         across all groups.  The roles/permissions in the
+         *                         Roles.GLOBAL_GROUP group will be automatically
+         *                         included in checks for any group.
+         */
+        function setUserRoles (
+            user : string|string[]|Object|Object[],
+            roles : string|string[],
+            group? : string
+        ) : void;
+
+        /**
+         * Check if user has specified permissions/roles
+         *
+         * @example
+         *     // non-group usage
+         *     Roles.userIsInRole(user, 'admin')
+         *     Roles.userIsInRole(user, ['admin','editor'])
+         *     Roles.userIsInRole(userId, 'admin')
+         *     Roles.userIsInRole(userId, ['admin','editor'])
+         *
+         *     // per-group usage
+         *     Roles.userIsInRole(user,   ['admin','editor'], 'group1')
+         *     Roles.userIsInRole(userId, ['admin','editor'], 'group1')
+         *     Roles.userIsInRole(userId, ['admin','editor'], Roles.GLOBAL_GROUP)
+         *
+         *     // this format can also be used as short-hand for Roles.GLOBAL_GROUP
+         *     Roles.userIsInRole(user, 'admin')
+         *
+         * @method userIsInRole
+         * @param {String|Object} user User Id or actual user object
+         * @param {String|Array} roles Name of role/permission or Array of
+         *                            roles/permissions to check against.  If array,
+         *                            will return true if user is in _any_ role.
+         * @param {String} [group] Optional. Name of group.  If supplied, limits check
+         *                         to just that group.
+         *                         The user's Roles.GLOBAL_GROUP will always be checked
+         *                         whether group is specified or not.
+         * @return {Boolean} true if user is in _any_ of the target roles
+         */
+        function userIsInRole(
+            user : string|string[]|Object|Object[],
+            roles : string|string[],
+            group? : string
+        ) : boolean;
+
+        interface Role {
+            name : string;
+        }
+    }
+}

From 8e89cb103e290565d514ece49a969ddbe5f6f6d3 Mon Sep 17 00:00:00 2001
From: pvavrik <pavelv@salsitasoft.com>
Date: Mon, 19 Mar 2018 16:56:56 +0100
Subject: [PATCH 0664/1382] Three: add TextBufferGeometry

---
 types/three/three-core.d.ts | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/types/three/three-core.d.ts b/types/three/three-core.d.ts
index 31c8cbebe0..d16bc73140 100644
--- a/types/three/three-core.d.ts
+++ b/types/three/three-core.d.ts
@@ -7103,6 +7103,7 @@ export interface TextGeometryParameters {
     bevelEnabled?: boolean;
     bevelThickness?: number;
     bevelSize?: number;
+    bevelSegments?: number;
 }
 
 export class TextGeometry extends ExtrudeGeometry {
@@ -7116,6 +7117,33 @@ export class TextGeometry extends ExtrudeGeometry {
         bevelEnabled: boolean;
         bevelThickness: number;
         bevelSize: number;
+        bevelSegments: number;
+    };
+}
+
+export interface TextBufferGeometryParameters {
+    font?: Font;
+    size?: number;
+    height?: number;
+    curveSegments?: number;
+    bevelEnabled?: boolean;
+    bevelThickness?: number;
+    bevelSize?: number;
+    bevelSegments?: number;
+}
+
+export class TextBufferGeometry extends ExtrudeBufferGeometry {
+    constructor(text: string, parameters?: TextBufferGeometryParameters);
+
+    parameters: {
+        font: Font;
+        size: number;
+        height: number;
+        curveSegments: number;
+        bevelEnabled: boolean;
+        bevelThickness: number;
+        bevelSize: number;
+        bevelSegments: number;
     };
 }
 

From ae9aff4a0c0ccdc224583f0f7f84d3a5b7bc3483 Mon Sep 17 00:00:00 2001
From: "Fred K. Schott" <fkschott@gmail.com>
Date: Mon, 19 Mar 2018 10:46:03 -0700
Subject: [PATCH 0665/1382] js-yaml: more strict loader return types

---
 types/js-yaml/index.d.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/types/js-yaml/index.d.ts b/types/js-yaml/index.d.ts
index 2fa264cbd9..0adda9646a 100644
--- a/types/js-yaml/index.d.ts
+++ b/types/js-yaml/index.d.ts
@@ -4,8 +4,10 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
-export function safeLoad(str: string, opts?: LoadOptions): any;
-export function load(str: string, opts?: LoadOptions): any;
+export type DocumentLoadResult = object | undefined;
+
+export function safeLoad(str: string, opts?: LoadOptions): DocumentLoadResult;
+export function load(str: string, opts?: LoadOptions): DocumentLoadResult;
 
 export class Type {
 	constructor(tag: string, opts?: TypeConstructorOptions);
@@ -26,8 +28,8 @@ export class Schema implements SchemaDefinition {
 	static create(schemas: Schema[] | Schema, types: Type[] | Type): Schema;
 }
 
-export function safeLoadAll(str: string, iterator?: (doc: any) => void, opts?: LoadOptions): any;
-export function loadAll(str: string, iterator?: (doc: any) => void, opts?: LoadOptions): any;
+export function safeLoadAll(str: string, iterator?: (doc: any) => void, opts?: LoadOptions): DocumentLoadResult[] | undefined;
+export function loadAll(str: string, iterator?: (doc: any) => void, opts?: LoadOptions): DocumentLoadResult[] | undefined;
 
 export function safeDump(obj: any, opts?: DumpOptions): string;
 export function dump(obj: any, opts?: DumpOptions): string;

From dbe58aecc853b54c709a7dd98df7f0bc94e152a9 Mon Sep 17 00:00:00 2001
From: "Fred K. Schott" <fschott@google.com>
Date: Mon, 19 Mar 2018 10:53:22 -0700
Subject: [PATCH 0666/1382] update version

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

diff --git a/types/js-yaml/index.d.ts b/types/js-yaml/index.d.ts
index 0adda9646a..da745e5d26 100644
--- a/types/js-yaml/index.d.ts
+++ b/types/js-yaml/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for js-yaml 3.10
+// Type definitions for js-yaml 3.11
 // Project: https://github.com/nodeca/js-yaml
 // Definitions by: Bart van der Schoor <https://github.com/Bartvds>, Sebastian Clausen <https://github.com/sclausen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From 97ca4f14ed97ce40d5954796bc0bd645b68d2e1e Mon Sep 17 00:00:00 2001
From: "Fred K. Schott" <fschott@google.com>
Date: Mon, 19 Mar 2018 10:59:34 -0700
Subject: [PATCH 0667/1382] got tests running, fix up types

---
 types/js-yaml/index.d.ts       |  8 ++++++--
 types/js-yaml/js-yaml-tests.ts | 24 ++++++++++++++----------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/types/js-yaml/index.d.ts b/types/js-yaml/index.d.ts
index da745e5d26..5cd852ab3f 100644
--- a/types/js-yaml/index.d.ts
+++ b/types/js-yaml/index.d.ts
@@ -28,8 +28,12 @@ export class Schema implements SchemaDefinition {
 	static create(schemas: Schema[] | Schema, types: Type[] | Type): Schema;
 }
 
-export function safeLoadAll(str: string, iterator?: (doc: any) => void, opts?: LoadOptions): DocumentLoadResult[] | undefined;
-export function loadAll(str: string, iterator?: (doc: any) => void, opts?: LoadOptions): DocumentLoadResult[] | undefined;
+export function safeLoadAll(str: string, iterator?: undefined, opts?: LoadOptions): DocumentLoadResult[];
+export function safeLoadAll(str: string, iterator: (doc: any) => void, opts?: LoadOptions): undefined;
+
+export function loadAll(str: string, iterator?: undefined, opts?: LoadOptions): DocumentLoadResult[];
+
+export function loadAll(str: string, iterator: (doc: any) => void, opts?: LoadOptions): undefined;
 
 export function safeDump(obj: any, opts?: DumpOptions): string;
 export function dump(obj: any, opts?: DumpOptions): string;
diff --git a/types/js-yaml/js-yaml-tests.ts b/types/js-yaml/js-yaml-tests.ts
index 3d5ecc17bf..9a61da204f 100644
--- a/types/js-yaml/js-yaml-tests.ts
+++ b/types/js-yaml/js-yaml-tests.ts
@@ -109,40 +109,44 @@ type.styleAliases;
 
 // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
 
-// $ExpectType any
+// $ExpectType DocumentLoadResult
 yaml.safeLoad(str);
-// $ExpectType any
+// $ExpectType DocumentLoadResult
 yaml.safeLoad(str, loadOpts);
 
-// $ExpectType any
+// $ExpectType DocumentLoadResult
 yaml.load(str);
-// $ExpectType any
+// $ExpectType DocumentLoadResult
 yaml.load(str, loadOpts);
 
 // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
 
-// $ExpectType any
+// $ExpectType DocumentLoadResult[]
 yaml.safeLoadAll(str);
-// $ExpectType any
+
+// $ExpectType undefined
 yaml.safeLoadAll(str, (doc) => {
 	value = doc;
 });
-// $ExpectType any
+// $ExpectType undefined
 yaml.safeLoadAll(str, (doc) => {
 	value = doc;
 }, loadOpts);
+// $ExpectType DocumentLoadResult[]
 value = yaml.safeLoadAll(str, undefined, loadOpts);
 
-// $ExpectType any
+// $ExpectType DocumentLoadResult[]
 value = yaml.loadAll(str);
-// $ExpectType any
+
+// $ExpectType undefined
 yaml.loadAll(str, (doc) => {
 	value = doc;
 });
-// $ExpectType any
+// $ExpectType undefined
 yaml.loadAll(str, (doc) => {
 	value = doc;
 }, loadOpts);
+// $ExpectType DocumentLoadResult[]
 value = yaml.loadAll(str, undefined, loadOpts);
 
 // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --

From 7c1a34a760219c271b8e6300825965465920934f Mon Sep 17 00:00:00 2001
From: Sergei Butko <svbutko@hotmail.com>
Date: Mon, 19 Mar 2018 20:08:37 +0200
Subject: [PATCH 0668/1382] Added tintColor into ActionSheetIOSOptions

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

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index 5abf96e04c..8b2dd2f706 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -6125,6 +6125,7 @@ export interface ActionSheetIOSOptions {
     cancelButtonIndex?: number;
     destructiveButtonIndex?: number;
     message?: string;
+    tintColor?: string;
 }
 
 export interface ShareActionSheetIOSOptions {

From c4c12dc174a50f7349b99caebdf8343cb8ce8fe9 Mon Sep 17 00:00:00 2001
From: Peter B <pbojanczyk@gmail.com>
Date: Mon, 19 Mar 2018 14:18:14 -0400
Subject: [PATCH 0669/1382] updated test

---
 types/ui-grid/ui-grid-tests.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/types/ui-grid/ui-grid-tests.ts b/types/ui-grid/ui-grid-tests.ts
index 06f18384a5..e1d49a481d 100644
--- a/types/ui-grid/ui-grid-tests.ts
+++ b/types/ui-grid/ui-grid-tests.ts
@@ -22,6 +22,11 @@ columnDef.cellTooltip = 'blah';
 columnDef.cellTooltip = function (gridRow: uiGrid.IGridRow, gridCol: uiGrid.IGridColumn) {
     return `${gridRow.entity.unknownProperty}-${gridCol.displayName}`;
 };
+columnDef.defaultSort = {
+    direction: 'ASC',
+    ignoreSort: false,
+    priority: 1
+};
 columnDef.displayName = 'Jumper';
 columnDef.enableColumnMenu = false;
 columnDef.enableColumnMenus = false;

From 79c3fcfe44a3d2a3adac9bb0bef068fd586603f8 Mon Sep 17 00:00:00 2001
From: Yousef El-Dardiry <yousefdardiry@gmail.com>
Date: Mon, 19 Mar 2018 19:35:02 +0100
Subject: [PATCH 0670/1382] add test for backhandler

---
 types/react-native/test/index.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/types/react-native/test/index.tsx b/types/react-native/test/index.tsx
index 879a0c522d..65db445695 100644
--- a/types/react-native/test/index.tsx
+++ b/types/react-native/test/index.tsx
@@ -17,6 +17,7 @@ import {
     AppState,
     AppStateIOS,
     BackAndroid,
+    BackHandler,
     Button,
     DataSourceAssetCallback,
     DeviceEventEmitterStatic,
@@ -73,6 +74,8 @@ function testDimensions() {
     Dimensions.removeEventListener('change', dimensionsListener);
 }
 
+BackHandler.addEventListener("hardwareBackPress", () => {}).remove();
+
 BackAndroid.addEventListener("hardwareBackPress", () => {});
 
 interface LocalStyles {

From f8dcd2e08586f8bbbe2a0fd6c2974bdfda1dccbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vajkay=20Ren=C3=A9?= <vajkay.rene@gmail.com>
Date: Mon, 19 Mar 2018 22:24:04 +0100
Subject: [PATCH 0671/1382] Adds recent fields from UglifyJSPlugin

---
 types/uglifyjs-webpack-plugin/index.d.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/types/uglifyjs-webpack-plugin/index.d.ts b/types/uglifyjs-webpack-plugin/index.d.ts
index 88ce8296ae..fbbb42f3a8 100644
--- a/types/uglifyjs-webpack-plugin/index.d.ts
+++ b/types/uglifyjs-webpack-plugin/index.d.ts
@@ -33,6 +33,11 @@ declare namespace UglifyJsPlugin {
         output?: object;
         compress?: boolean | object;
         warnings?: boolean;
+        toplevel?: boolean;
+        nameCache?: object;
+        keep_classnames?: boolean;
+        keep_fnames?: boolean;
+        safari10?: boolean;
     }
 
     interface ExtractCommentsOptions {

From dfae24a71eeab7399ef34525b6f19b41b80e4b07 Mon Sep 17 00:00:00 2001
From: Michael Zlatkovsky <michael.zlatkovsky@microsoft.com>
Date: Mon, 19 Mar 2018 15:58:41 -0700
Subject: [PATCH 0672/1382] Remove "Office.cast.item", since not useful in
 TypeScript

---
 types/office-js/index.d.ts | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 159293057e..3b1173505d 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -1666,18 +1666,6 @@ declare namespace Office {
             Beta
         }
     }
-    export module cast {
-        export module item {
-            function toAppointmentCompose(item: Office.Item): Office.AppointmentCompose;
-            function toAppointmentRead(item: Office.Item): Office.AppointmentRead;
-            function toAppointment(item: Office.Item): Office.Appointment;
-            function toMessageCompose(item: Office.Item): Office.MessageCompose;
-            function toMessageRead(item: Office.Item): Office.MessageRead;
-            function toMessage(item: Office.Item): Office.Message;
-            function toItemCompose(item: Office.Item): Office.ItemCompose;
-            function toItemRead(item: Office.Item): Office.ItemRead;
-        }
-    }
     export interface AsyncContextOptions {
         asyncContext?: any;
     }

From 5104d46ff772bdb80ef7666028eadbb5c7d0f098 Mon Sep 17 00:00:00 2001
From: Christian Moniz <xianmoniz@gmail.com>
Date: Mon, 19 Mar 2018 15:59:55 -0700
Subject: [PATCH 0673/1382] Add `setOptions` to `node-rsa` class definition

---
 types/node-rsa/index.d.ts        | 6 ++++++
 types/node-rsa/node-rsa-tests.ts | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/types/node-rsa/index.d.ts b/types/node-rsa/index.d.ts
index 63d569378d..c697ee0db4 100644
--- a/types/node-rsa/index.d.ts
+++ b/types/node-rsa/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for node-rsa 0.4
 // Project: https://github.com/rzcoder/node-rsa
 // Definitions by: Ali Taheri <https://github.com/alitaheri>
+//                 Christian Moniz <https://github.com/xm>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -17,6 +18,11 @@ declare class NodeRSA {
      */
     constructor(key: NodeRSA.Key, format?: NodeRSA.Format, options?: NodeRSA.Options);
 
+    /**
+     * Set and validate options for key instance.
+     */
+    setOptions(options: NodeRSA.Options): void;
+
     /**
      * @param bits Key size in bits. 2048 by default.
      * @param exponent public exponent. 65537 by default.
diff --git a/types/node-rsa/node-rsa-tests.ts b/types/node-rsa/node-rsa-tests.ts
index 0f8defacbd..4a2360ce14 100644
--- a/types/node-rsa/node-rsa-tests.ts
+++ b/types/node-rsa/node-rsa-tests.ts
@@ -2,6 +2,11 @@ import NodeRSA = require('node-rsa');
 
 const key = new NodeRSA({ b: 512 });
 
+key.setOptions({
+	encryptionScheme: 'pkcs1_oaep',
+	signingScheme: 'pkcs1'
+});
+
 const text = 'Hello RSA!';
 const encrypted = key.encrypt(text, 'base64');
 const decrypted = key.decrypt(encrypted, 'utf8');

From 7ad3c1e81cf65d5b355d20a636b1e194943c3ff2 Mon Sep 17 00:00:00 2001
From: Christian Moniz <xianmoniz@gmail.com>
Date: Mon, 19 Mar 2018 16:06:04 -0700
Subject: [PATCH 0674/1382] Bump version in `index.d.ts` to 0.4.2

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

diff --git a/types/node-rsa/index.d.ts b/types/node-rsa/index.d.ts
index c697ee0db4..05ebb24547 100644
--- a/types/node-rsa/index.d.ts
+++ b/types/node-rsa/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for node-rsa 0.4
+// Type definitions for node-rsa 0.4.2
 // Project: https://github.com/rzcoder/node-rsa
 // Definitions by: Ali Taheri <https://github.com/alitaheri>
 //                 Christian Moniz <https://github.com/xm>

From 94ae11d0d90af7f7cd877d2dae5b77b3d85a6c4b Mon Sep 17 00:00:00 2001
From: Christian Moniz <xianmoniz@gmail.com>
Date: Mon, 19 Mar 2018 16:11:22 -0700
Subject: [PATCH 0675/1382] Remove patch version from header

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

diff --git a/types/node-rsa/index.d.ts b/types/node-rsa/index.d.ts
index 05ebb24547..c697ee0db4 100644
--- a/types/node-rsa/index.d.ts
+++ b/types/node-rsa/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for node-rsa 0.4.2
+// Type definitions for node-rsa 0.4
 // Project: https://github.com/rzcoder/node-rsa
 // Definitions by: Ali Taheri <https://github.com/alitaheri>
 //                 Christian Moniz <https://github.com/xm>

From 984170a6915ba81296258d947593afc24607968a Mon Sep 17 00:00:00 2001
From: Justin Rockwood <justinrockwood@hotmail.com>
Date: Mon, 19 Mar 2018 17:57:09 -0700
Subject: [PATCH 0676/1382] fix(inquirer): allow promises in some Question
 options #18105

According to the docs at at https://github.com/SBoudrias/Inquirer.js/#objects, the following should allow functions that return promises: default, choices, validate, filter, and when.
---
 types/inquirer/index.d.ts | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/types/inquirer/index.d.ts b/types/inquirer/index.d.ts
index 4fc2ca4ce0..17ae8092df 100644
--- a/types/inquirer/index.d.ts
+++ b/types/inquirer/index.d.ts
@@ -5,6 +5,7 @@
 //                 Jouderian <https://github.com/jouderianjr>
 //                 Qibang <https://github.com/bang88>
 //                 Jason Dreyzehner <https://github.com/bitjson>
+//                 Justin Rockwood <https://github.com/jrockwood>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 // TypeScript Version: 2.3
@@ -90,7 +91,7 @@ declare namespace inquirer {
          * Default value(s) to use if nothing is entered, or a function that returns the default value(s).
          * If defined as a function, the first parameter will be the current inquirer session answers.
          */
-        default?: any | ((answers: T) => any);
+        default?: any | ((answers: T) => any) | ((answers: T) => Promise<any>);
         /**
          * Choices array or a function returning a choices array. If defined as a function,
          * the first parameter will be the current inquirer session answers.
@@ -99,22 +100,23 @@ declare namespace inquirer {
          */
         choices?:
             | ReadonlyArray<ChoiceType>
-            | ((answers: T) => ReadonlyArray<ChoiceType>);
+            | ((answers: T) => ReadonlyArray<ChoiceType>)
+            | ((answers: T) => Promise<ReadonlyArray<ChoiceType>>);
         /**
          * Receive the user input and should return true if the value is valid, and an error message (String)
          * otherwise. If false is returned, a default error message is provided.
          */
-        validate?(input: string, answers?: T): boolean | string;
+        validate?(input: string, answers?: T): boolean | string | Promise<boolean | string>;
         /**
          * Receive the user input and return the filtered value to be used inside the program.
          * The value returned will be added to the Answers hash.
          */
-        filter?(input: string): string;
+        filter?(input: string): string | Promise<string>;
         /**
          * Receive the current user answers hash and should return true or false depending on whether or
          * not this question should be asked. The value can also be a simple boolean.
          */
-        when?: boolean | ((answers: T) => boolean);
+        when?: boolean | ((answers: T) => boolean) | ((answers: T) => Promise<boolean>);
         paginated?: boolean;
         /**
          * Change the number of lines that will be rendered when using list, rawList, expand or checkbox.

From b3888abd05465d4f8464490b5852e71d6a276886 Mon Sep 17 00:00:00 2001
From: Justin Rockwood <justinrockwood@hotmail.com>
Date: Mon, 19 Mar 2018 18:00:02 -0700
Subject: [PATCH 0677/1382] fix(inquirer): allow 'any' for ChoiceOption
 according to docs #17368

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

diff --git a/types/inquirer/index.d.ts b/types/inquirer/index.d.ts
index 17ae8092df..c0aba80f23 100644
--- a/types/inquirer/index.d.ts
+++ b/types/inquirer/index.d.ts
@@ -242,7 +242,7 @@ declare namespace inquirer {
 
         interface ChoiceOption {
             name?: string;
-            value?: string;
+            value?: any;
             type?: string;
             extra?: any;
             key?: string;

From 357b17617d2798c5b9ff1ce24ff512e45710899e Mon Sep 17 00:00:00 2001
From: Josh Goldberg <josh@fullscreenmario.com>
Date: Mon, 19 Mar 2018 18:13:53 -0700
Subject: [PATCH 0678/1382] Marked lolex clock methods as bound

---
 types/lolex/index.d.ts     | 26 +++++++++++++-------------
 types/lolex/lolex-tests.ts |  4 ++++
 types/lolex/tslint.json    |  1 +
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/types/lolex/index.d.ts b/types/lolex/index.d.ts
index 68f87793d9..fc6dcc3b4b 100644
--- a/types/lolex/index.d.ts
+++ b/types/lolex/index.d.ts
@@ -75,14 +75,14 @@ export interface LolexClock<TTimerId extends TimerId> {
      * @param args   Any extra arguments to pass to the callback.
      * @returns Time identifier for cancellation.
      */
-    setTimeout(callback: () => any, timeout: number, ...args: any[]): TTimerId;
+    setTimeout: (callback: () => any, timeout: number, ...args: any[]) => TTimerId;
 
     /**
      * Clears a timer, as long as it was created using setTimeout.
      *
      * @param id   Timer ID or object.
      */
-    clearTimeout(id: TTimerId): void;
+    clearTimeout: (id: TTimerId) => void;
 
     /**
      * Schedules a callback to be fired every time timeout milliseconds have ticked by.
@@ -92,14 +92,14 @@ export interface LolexClock<TTimerId extends TimerId> {
      * @param args   Any extra arguments to pass to the callback.
      * @returns Time identifier for cancellation.
      */
-    setInterval(callback: () => any, timeout: number, ...args: any[]): TTimerId;
+    setInterval: (callback: () => any, timeout: number, ...args: any[]) => TTimerId;
 
     /**
      * Clears a timer, as long as it was created using setInterval.
      *
      * @param id   Timer ID or object.
      */
-    clearInterval(id: TTimerId): void;
+    clearInterval: (id: TTimerId) => void;
 
     /**
      * Schedules the callback to be fired once 0 milliseconds have ticked by.
@@ -108,44 +108,44 @@ export interface LolexClock<TTimerId extends TimerId> {
      * @remarks You'll still have to call clock.tick() for the callback to fire.
      * @remarks If called during a tick the callback won't fire until 1 millisecond has ticked by.
      */
-    setImmediate(callback: () => any): TTimerId;
+    setImmediate: (callback: () => any) => TTimerId;
 
     /**
      * Clears a timer, as long as it was created using setImmediate.
      *
      * @param id   Timer ID or object.
      */
-    clearImmediate(id: TTimerId): void;
+    clearImmediate: (id: TTimerId) => void;
 
     /**
      * Simulates process.nextTick();
      */
-    nextTick(callback: () => void): void;
+    nextTick: (callback: () => void) => void;
 
     /**
      * Advances the clock to the the moment of the first scheduled timer, firing it.
      */
-    next(): void;
+    next: () => void;
 
     /**
      * Advance the clock, firing callbacks if necessary.
      *
      * @param time   How many ticks to advance by.
      */
-    tick(time: number | string): void;
+    tick: (time: number | string) => void;
 
     /**
      * Runs all pending timers until there are none remaining.
      *
      * @remarks  If new timers are added while it is executing they will be run as well.
      */
-    runAll(): void;
+    runAll: () => void;
 
     /**
      * Takes note of the last scheduled timer when it is run, and advances the clock to
      * that time firing callbacks as necessary.
      */
-    runToLast(): void;
+    runToLast: () => void;
 
     /**
      * Simulates a user changing the system clock.
@@ -153,13 +153,13 @@ export interface LolexClock<TTimerId extends TimerId> {
      * @param now   New system time.
      * @remarks This affects the current time but it does not in itself cause timers to fire.
      */
-    setSystemTime(now?: number | Date): void;
+    setSystemTime: (now?: number | Date) => void;
 
     /**
      * Restores the original methods on the context that was passed to lolex.install,
      * or the native timers if no context was given.
      */
-    uninstall(): void;
+    uninstall: () => void;
 }
 
 /**
diff --git a/types/lolex/lolex-tests.ts b/types/lolex/lolex-tests.ts
index 95b6a2be78..4de6ecc7a6 100644
--- a/types/lolex/lolex-tests.ts
+++ b/types/lolex/lolex-tests.ts
@@ -73,3 +73,7 @@ nodeClock.nextTick(() => undefined);
 
 browserClock.uninstall();
 nodeClock.uninstall();
+
+// Clocks should be typed to have unbound method signatures that can be passed around
+const { clearTimeout } = browserClock;
+clearTimeout(0);
diff --git a/types/lolex/tslint.json b/types/lolex/tslint.json
index a41bf5d19a..2fd2e55629 100644
--- a/types/lolex/tslint.json
+++ b/types/lolex/tslint.json
@@ -43,6 +43,7 @@
         "no-self-import": false,
         "no-single-declare-module": false,
         "no-string-throw": false,
+        "no-unbound-method": true,
         "no-unnecessary-callback-wrapper": false,
         "no-unnecessary-class": false,
         "no-unnecessary-generics": false,

From c5dddbcb9775f9a8363c385a90b56e06b0343a00 Mon Sep 17 00:00:00 2001
From: Phil Nova <pnova8@gmail.com>
Date: Mon, 19 Mar 2018 18:37:54 -0700
Subject: [PATCH 0679/1382] Add typings for onDragUpdate

While mentioned in the docs, attempting to use onDragUpdate will cause a type error. This PR introduces typings for onDragUpdate that are consistent with the docs:

`type DragUpdate = {|
  ...DragStart,
  // may not have any destination (drag to nowhere)
  destination: ?DraggableLocation,
|}`
---
 types/react-beautiful-dnd/index.d.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/types/react-beautiful-dnd/index.d.ts b/types/react-beautiful-dnd/index.d.ts
index 085ad4e8b7..063fc43a0c 100644
--- a/types/react-beautiful-dnd/index.d.ts
+++ b/types/react-beautiful-dnd/index.d.ts
@@ -28,6 +28,10 @@ export interface DragStart {
     source: DraggableLocation;
 }
 
+export interface DragUpdate extends DragStart {
+    destination?: DraggableLocation;
+}
+
 export interface DropResult {
     draggableId: DraggableId;
     type: TypeId;
@@ -37,6 +41,7 @@ export interface DropResult {
 
 export interface DragDropContextProps {
     onDragStart?(initial: DragStart): void;
+    onDragUpdate?(initial: DragUpdate): void;
     onDragEnd(result: DropResult): void;
 }
 

From d88053b9f98c289f0797850a14c9ee159c7d80ab Mon Sep 17 00:00:00 2001
From: Ricardo De Pena <ricardo@isnull.co>
Date: Mon, 19 Mar 2018 22:23:46 -0400
Subject: [PATCH 0680/1382] Changes added for OpenFin version .29

---
 types/openfin/v29/index.d.ts             | 1891 ++++++++++++++++++++++
 types/openfin/v29/openfin-tests.ts       |  797 +++++++++
 types/openfin/{v30 => v29}/tsconfig.json |    7 +-
 types/openfin/{v30 => v29}/tslint.json   |    0
 types/openfin/v30/index.d.ts             | 1756 --------------------
 types/openfin/v30/openfin-tests.ts       |  728 ---------
 types/openfin/v30/v30                    | 1736 --------------------
 7 files changed, 2694 insertions(+), 4221 deletions(-)
 create mode 100644 types/openfin/v29/index.d.ts
 create mode 100644 types/openfin/v29/openfin-tests.ts
 rename types/openfin/{v30 => v29}/tsconfig.json (83%)
 rename types/openfin/{v30 => v29}/tslint.json (100%)
 delete mode 100644 types/openfin/v30/index.d.ts
 delete mode 100644 types/openfin/v30/openfin-tests.ts
 delete mode 100644 types/openfin/v30/v30

diff --git a/types/openfin/v29/index.d.ts b/types/openfin/v29/index.d.ts
new file mode 100644
index 0000000000..3ddbdf2edd
--- /dev/null
+++ b/types/openfin/v29/index.d.ts
@@ -0,0 +1,1891 @@
+// Type definitions for OpenFin API 29.0
+// Project: https://openfin.co/
+// Definitions by: Chris Barker <https://github.com/chrisbarker>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// based on v8.56.29.51
+// see https://openfin.co/support/technical-faq/#what-do-the-numbers-in-the-runtime-version-mean
+
+/**
+ * JavaScript API
+ * The JavaScript API allows you to create an HTML/JavaScript application that has access to the native windowing environment,
+ * can communicate with other applications and has access to sandboxed system-level features.
+ *
+ * API Ready
+ * When using the OpenFin API, it is important to ensure that it has been fully loaded before making any API calls. To verify
+ * that the API is in fact ready, be sure to make any API calls either from within the fin.desktop.main() method or explicitly
+ * after it has returned. This avoids the situation of trying to access methods that are not yet fully injected.
+ *
+ * Overview
+ * When running within the OpenFin Runtime your web applications have access to the "fin" namespace and all the modules within the API
+ * without the need to include additional source files. You can treat the "fin" namespace as you would the "window", "navigator" or "documennt" objects.
+ */
+declare namespace fin {
+    const desktop: OpenFinDesktop;
+
+    interface OpenFinDesktop {
+        main(f: () => any): void;
+        Application: OpenFinApplicationStatic;
+        ExternalApp: OpenFinExternalApplicationStatic;
+        InterApplicationBus: OpenFinInterApplicationBus;
+        Notification: OpenFinNotificationStatic;
+        System: OpenFinSystem;
+        Window: OpenFinWindowStatic;
+        Frame: OpenFinFrameStatic;
+    }
+
+    interface OpenFinApplicationStatic {
+        /**
+         * Creates a new Application.
+         * An object representing an application. Allows the developer to create, execute, show/close an application as well as listen to application events.
+         */
+        new (
+            options: ApplicationOptions,
+            callback?: (successObj: { httpResponseCode: number }) => void,
+            errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): OpenFinApplication;
+        /**
+         * Launches the given Application manifest.
+         */
+        createFromManifest(manifestUrl: string, callback?: (app: OpenFinApplication) => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+        /**
+         * Returns an Application object that represents an existing application.
+         */
+        getCurrent(): OpenFinApplication;
+        /**
+         * Returns an Application object that represents an existing application.
+         */
+        wrap(uuid: string): OpenFinApplication;
+    }
+
+    /**
+     * Application
+     * An object representing an application.Allows the developer to create, execute, show / close an application as well as listen to application events.
+     */
+    interface OpenFinApplication {
+        /**
+         * Returns an instance of the main Window of the application
+         */
+        getWindow(): OpenFinWindow;
+        /**
+         * Registers an event listener on the specified event.
+         */
+        addEventListener(
+            type: OpenFinApplicationEventType,
+            listener: (event: ApplicationBaseEvent
+                | TrayIconClickedEvent
+                | WindowEvent
+                | WindowAlertRequestedEvent
+                | WindowAuthRequested
+                | WindowNavigationRejectedEvent
+                | WindowEndLoadEvent) => void,
+            callback?: () => void,
+            errorCallback?: (reason: string) => void): void;
+        /**
+         * Closes the application and any child windows created by the application.
+         */
+        close(force?: boolean, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves an array of wrapped fin.desktop.Windows for each of the application's child windows.
+         */
+        getChildWindows(callback?: (children: OpenFinWindow[]) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves an array of active window groups for all of the application's windows. Each group is represented as an array of wrapped fin.desktop.Windows.
+         */
+        getGroups(callback?: (groups: OpenFinWindow[][]) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves the JSON manifest that was used to create the application. Invokes the error callback if the application was not created from a manifest.
+         */
+        getManifest(callback?: (manifest: any) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves UUID of the application that launches this application. Invokes the error callback if the application was created from a manifest.
+         */
+        getParentUuid(callback?: (uuid: string) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves current configuration of application's shortcuts.
+         */
+        getShortcuts(callback?: (config: ShortCutConfig) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves information about the application.
+         */
+        getInfo(callback?: (info: LaunchInfo) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves information about the system tray.
+         */
+        getTrayIconInfo(callback?: (trayInfo: TrayIconInfo) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Determines if the application is currently running.
+         */
+        isRunning(callback?: (running: boolean) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Registers a username and an app name for licensing purposes.
+         */
+        registerUser(userName: string, appName: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Removes a previously registered event listener from the specified event.
+         */
+        removeEventListener(
+            type: OpenFinApplicationEventType,
+            previouslyRegisteredListener: (event: ApplicationBaseEvent
+                | TrayIconClickedEvent
+                | WindowEvent
+                | WindowAlertRequestedEvent
+                | WindowAuthRequested
+                | WindowNavigationRejectedEvent
+                | WindowEndLoadEvent) => any,
+            callback?: () => void,
+            errorCallback?: (reason: string) => void): void;
+        /**
+         * Removes the application's icon from the tray.
+         */
+        removeTrayIcon(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Restarts the application.
+         */
+        restart(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Runs the application. When the application is created, run must be called.
+         */
+        run(callback?: (successObj: SuccessObj) => void, errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): void;
+        /**
+         * Tells the rvm to relaunch the main application once upon a complete shutdown
+         */
+        scheduleRestart(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Sets new shortcut configuration for current application.
+         * Application has to be launched with a manifest and has to have shortcut configuration (icon url, name, etc.) in its manifest to
+         * be able to change shortcut states.
+         */
+        setShortcuts(config: ShortCutConfig, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Adds a customizable icon in the system tray and notifies the application when clicked.
+         */
+        setTrayIcon(iconUrl: string, listener: (clickInfo: TrayIconClickedEvent) => void, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Closes the application by terminating its process.
+         */
+        terminate(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Waits for a hanging application. This method can be called in response to an application "not-responding" to allow the application
+         * to continue and to generate another "not-responding" message after a certain period of time.
+         */
+        wait(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * The Application's uuid
+         */
+        uuid: string;
+    }
+
+    interface ShortCutConfig {
+        /**
+         * application has a shortcut on the desktop
+         */
+        desktop?: boolean;
+        /**
+         * application has no shortcut in the start menu
+         */
+        startMenu?: boolean;
+        /**
+         * application will be launched on system startup
+         */
+        systemStartup?: boolean;
+    }
+
+    interface SuccessObj {
+        httpResponseCode: number;
+    }
+
+    interface NetworkErrorInfo extends ErrorInfo {
+        networkErrorCode: number;
+    }
+
+    interface ErrorInfo {
+        stack: string;
+        message: string;
+    }
+
+    interface ApplicationOptions {
+        /**
+         * The name of the application.
+         */
+        name?: string;
+        /**
+         * The url to the application.
+         */
+        url?: string;
+        /**
+         * The UUID of the application, unique within the set of all other applications running in the OpenFin Runtime. name and uuid must match.
+         */
+        uuid?: string;
+        /**
+         * Enable Flash at the application level. Default: false.
+         */
+        plugins?: boolean;
+        /**
+         * The options of the main window of the application.
+         */
+        mainWindowOptions?: WindowOptions;
+    }
+
+    interface WindowOptions {
+        /**
+         * Enable keyboard shortcuts for devtools and zoom. Default: false for both.
+         */
+        accelerator?: {
+            devtools?: boolean,
+            zoom?: boolean,
+            reload?: boolean,
+            reloadIgnoreCache?: boolean,
+        };
+        /**
+         * A flag to always position the window at the top of the window stack. Default: false.
+         * Updatable
+         */
+        alwaysOnTop?: boolean;
+        /**
+         * A flag to automatically show the Window when it is created. Default: false.
+         */
+        autoShow?: boolean;
+        /**
+         * A flag to show the context menu when right-clicking on a window. Gives access to the Developer Console for the Window. Default: true
+         * Updatable
+         */
+        contextMenu?: boolean;
+        /**
+         * This defines and applies rounded corners for a frameless window. Default for both width and height: 0.
+         * Updatable
+         */
+        cornerRounding?: {
+            width?: number;
+            height?: number;
+        };
+        /**
+         * A field that the user can attach serializable data to to be ferried around with the window options. Default: ''.
+         */
+        customData?: any;
+        /**
+         * Specifies that the window will be positioned in the center of the primary monitor when loaded for the first time on a machine.
+         * When the window corresponding to that id is loaded again, the position from before the window was closed is used.
+         * This option overrides defaultLeft and defaultTop. Default: false.
+         */
+        defaultCentered?: boolean;
+        /**
+         * The default height of the window. Specifies the height of the window when loaded for the first time on a machine.
+         *  When the window corresponding to that id is loaded again, the height is taken to be the last height of the window before it was closed. Default: 500.
+         */
+        defaultHeight?: number;
+        /**
+         * The default left position of the window. Specifies the position of the left of the window when loaded for the first time on a machine.
+         *  When the window corresponding to that id is loaded again, the value of left is taken to be the last value before the window was closed. Default: 100.
+         */
+        defaultWidth?: number;
+        /**
+         * The default top position of the window. Specifies the position of the top of the window when loaded for the first time on a machine.
+         * When the window corresponding to that id is loaded again, the value of top is taken to be the last value before the window was closed. Default: 100.
+         */
+        defaultTop?: number;
+        /**
+         * The default width of the window. Specifies the width of the window when loaded for the first time on a machine.
+         * When the window corresponding to that id is loaded again, the width is taken to be the last width of the window before it was closed. Default: 800.
+         */
+        defaultLeft?: number;
+        /**
+         * A flag to show the frame. Default: true.
+         * Updatable
+         */
+        frame?: boolean;
+        /**
+         * A flag to allow a window to be hidden when the close button is clicked.Default: false.
+         * Updatable
+         */
+        hideOnClose?: boolean;
+        /**
+         * A URL for the icon to be shown in the window title bar and the taskbar.Default: The parent application's applicationIcon.
+         * Updatable
+         */
+        icon?: string;
+        /**
+         * The maximum height of a window.Will default to the OS defined value if set to - 1. Default: -1.
+         * Updatable
+         */
+        maxHeight?: number;
+        /**
+         * A flag that lets the window be maximized.Default: true.
+         * Updatable
+         */
+        maximizable?: boolean;
+        /**
+         * The maximum width of a window.Will default to the OS defined value if set to - 1. Default: -1.
+         * Updatable
+         */
+        maxWidth?: number;
+        /**
+         * The minimum height of a window.Default: 0.
+         * Updatable
+         */
+        minHeight?: number;
+        /**
+         * A flag that lets the window be minimized.Default: true.
+         */
+        minimizable?: boolean;
+        /**
+         * The minimum width of a window.Default: 0.
+         */
+        minWidth?: number;
+        /**
+         * The name for the window which must be unique within the context of the invoking Application.
+         */
+        name?: string;
+        /**
+         * A flag that specifies how transparent the window will be.This value is clamped between 0.0 and 1.0.Default: 1.0.
+         * Updatable
+         */
+        opacity?: number;
+        /**
+         * A flag to drop to allow the user to resize the window.Default: true.
+         * Updatable
+         */
+        resizable?: boolean;
+        /**
+         * Defines a region in pixels that will respond to user mouse interaction for resizing a frameless window.
+         * Updatable
+         */
+        resizeRegion?: {
+            /**
+             * The size in pixels (Default: 2),
+             */
+            size?: number;
+            /**
+             * The size in pixels of an additional
+             * square resizable region located at the
+             * bottom right corner of a
+             * frameless window. (Default: 4)
+             */
+            bottomRightCorner?: number;
+        };
+        /**
+         * A flag to show the Window's icon in the taskbar. Default: true.
+         */
+        showTaskbarIcon?: boolean;
+        /**
+         * A flag to cache the location of the window or not. Default: true.
+         */
+        saveWindowState?: boolean;
+        /**
+         * Specify a taskbar group for the window. Default: app's uuid.
+         */
+        taskbarIconGroup?: string;
+        /**
+         * A string that sets the window to be "minimized", "maximized", or "normal" on creation. Default: "normal".
+         */
+        state?: string;
+        /**
+         * The URL of the window. Default: "about:blank".
+         */
+        url?: string;
+        /**
+         * When set to false, the window will render before the "load" event is fired on the content's window.
+         * Caution, when false you will see an initial empty white window. Default: true.
+         */
+        waitForPageLoad?: boolean;
+    }
+
+    /**
+     * Clipboard
+     * Clipboard API allows reading and writting to the clipboard in multiple formats.
+     */
+    interface OpenFinClipboard {
+        /**
+         * Reads available formats for the clipboard type
+         */
+        availableFormats(type: string | null, callback?: (formats: string[]) => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+        /**
+         * Reads available formats for the clipboard type
+         */
+        readHtml(type: string | null, callback?: (html: string) => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+        /**
+         * Read the content of the clipboard as Rtf
+         */
+        readRtf(type: string | null, callback?: (rtf: string) => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+        /**
+         * Read the content of the clipboard as plain text
+         */
+        readText(type: string | null, callback?: (text: string) => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+        /**
+         * Writes data into the clipboard
+         */
+        write(data: any, type: string | null, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+        /**
+         * Writes data into the clipboard as Html
+         */
+        writeHtml(data: string, type: string | null, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+        /**
+         * Writes data into the clipboard as Rtf
+         */
+        writeRtf(data: string, type: string | null, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+        /**
+         * Writes data into the clipboard as plain text
+         */
+        writeText(data: string, type: string | null, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+    }
+
+    interface OpenFinExternalApplicationStatic {
+        /**
+         * Returns an External Application object that represents an existing external application.
+         */
+        wrap(uuid: string): OpenFinExternalApplication;
+    }
+    /**
+     * ExternalApplication
+     * An object representing an application. Allows the developer to create, execute, show and close an application, as well as listen to application events.
+     */
+    interface OpenFinExternalApplication {
+        /**
+         * Retrieves information about the application.
+         */
+        getInfo(callback?: (info: ExternalApplicationInfo) => void,
+                errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+        /**
+         * Registers an event listener on the specified event.
+         */
+        addEventListener(
+            type: OpenFinExternalApplicationEventType,
+            listener: () => void,
+            callback?: () => void,
+            errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+        /**
+         * Removes a previously registered event listener from the specified event.
+         */
+        removeEventListener(
+            type: OpenFinExternalApplicationEventType,
+            listener: () => void,
+            callback?: () => void,
+            errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+    }
+
+    /**
+     * InterApplicationBus
+     * A messaging bus that allows for pub/sub messaging between different applications.
+     */
+    interface OpenFinInterApplicationBus {
+        /**
+         * Adds a listener that gets called when applications subscribe to the current application's messages.
+         */
+        addSubscribeListener(listener: (uuid: string, topic: string, name: string) => void): void;
+        /**
+         * Adds a listener that gets called when applications unsubscribe to the current application's messages.
+         */
+        addUnsubscribeListener(listener: (uuid: string, topic: string, name: string) => void): void;
+        /**
+         * Removes a previously registered subscribe listener.
+         */
+        removeSubscribeListener(listener: (uuid: string, topic: string, name: string) => void): void;
+        /**
+         * Removes a previously registered unsubscribe listener.
+         */
+        removeUnsubscribeListener(listener: (uuid: string, topic: string, name: string) => void): void;
+        /**
+         * Publishes a message to all applications running on OpenFin Runtime that are subscribed to the specified topic.
+         */
+        publish(topic: string, message: any, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Sends a message to a specific application on a specific topic.
+         */
+        send(destinationUuid: string, name: string, topic: string, message: any, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        send(destinationUuid: string, topic: string, message: any, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Subscribes to messages from the specified application on the specified topic. If the subscription is for a uuid, [name],
+         * topic combination that has already been published to upon subscription you will receive the last 20 missed messages in the order they were published.
+         */
+        subscribe(
+            senderUuid: string,
+            name: string,
+            topic: string,
+            listener: (message: any, uuid: string, name: string) => void,
+            callback?: () => void,
+            errorCallback?: (reason: string) => void): void;
+        subscribe(
+            senderUuid: string,
+            topic: string,
+            listener: (message: any, uuid: string, name: string) => void,
+            callback?: () => void,
+            errorCallback?: (reason: string) => void): void;
+        /**
+         * Unsubscribes to messages from the specified application on the specified topic.
+         */
+        unsubscribe(
+            senderUuid: string,
+            name: string,
+            topic: string,
+            listener: (message: any, uuid: string, name: string) => void,
+            callback?: () => void,
+            errorCallback?: (reason: string) => void): void;
+        unsubscribe(
+            senderUuid: string,
+            topic: string,
+            listener: (message: any, uuid: string, name: string) => void,
+            callback?: () => void,
+            errorCallback?: (reason: string) => void): void;
+    }
+
+    interface OpenFinNotificationStatic {
+        /**
+         * ctor
+         */
+        new (options: NotificationOptions, callback?: () => void, errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): OpenFinNotification;
+        /**
+         * Gets an instance of the current notification. For use within a notification window to close the window or send a message back to its parent application.
+         */
+        getCurrent(): OpenFinNotification;
+    }
+
+    /**
+     * Notification
+     * Notification represents a window on OpenFin Runtime which is shown briefly to the user on the bottom-right corner of the primary monitor.
+     * A notification is typically used to alert the user of some important event which requires his or her attention.
+     * Notifications are a child or your application that are controlled by the runtime.
+     */
+    interface OpenFinNotification {
+        /**
+         * Closes the notification.
+         */
+        close(callback?: () => void): void;
+        /**
+         * Sends a message to the notification.
+         */
+        sendMessage(message: any, callback?: () => void): void;
+        /**
+         * Sends a message from the notification to the application that created the notification. The message is handled by the notification's onMessage callback.
+         */
+        sendMessageToApplication(message: any, callback?: () => void): void;
+    }
+
+    interface NotificationOptions {
+        /**
+         * A boolean that will force dismissal even if the mouse is hovering over the notification
+         */
+        ignoreMouseOver?: boolean;
+        /**
+         * A message of any primitive or composite-primitive type to be passed to the notification upon creation.
+         */
+        message?: any;
+        /**
+         * The timeout for displaying a notification.Can be in milliseconds or "never".
+         */
+        duration?: number | "never";
+        /**
+         * The url of the notification
+         */
+        url?: string;
+        /**
+         * A function that is called when a notification is clicked.
+         */
+        onClick?(callback: () => void): void;
+        /**
+         * Invoked when the notification is closed via .close() method on the created notification instance
+         * or the by the notification itself via fin.desktop.Notification.getCurrent().close().
+         * NOTE: this is not invoked when the notification is dismissed via a swipe. For the swipe dismissal callback see onDismiss
+         */
+        onClose?(callback: () => void): void;
+        /**
+         * Invoked when a the notification is dismissed by swiping it off the screen to the right. NOTE: this is no fired on a programmatic close.
+         */
+        onDismiss?(callback: () => void): void;
+        /**
+         * A function that is called when an error occurs.The reason for the error is passed as an argument.
+         */
+        onError?(errorCallback: (reason: string, errorObj: NetworkErrorInfo) => void): void;
+        /**
+         * The onMessage function will respond to messages sent from notification.sendMessageToApplication.
+         * The function is passed the message, which can be of any primitive or composite-primitive type.
+         */
+        onMessage?(callback: (message: any) => void): void;
+        /**
+         * A function that is called when a notification is shown.
+         */
+        onShow?(callback: (successObj: SuccessObj) => void): void;
+    }
+
+    /**
+     * System
+     * An object representing the core of OpenFin Runtime.
+     * Allows the developer to perform system-level actions, such as accessing logs, viewing processes, clearing the cache and exiting the runtime.
+     */
+    interface OpenFinSystem {
+        Clipboard: OpenFinClipboard;
+        /**
+         * Registers an event listener on the specified event.
+         */
+        addEventListener(
+            type: OpenFinSystemEventType,
+            listener: (event: SystemBaseEvent | DesktopIconClickedEvent | IdleStateChangedEvent | MonitorInfoChangedEvent | SessionChangedEvent) => void,
+            callback?: () => void,
+            errorCallback?: (reason: string) => void): void;
+        /**
+         * Clears cached data containing window state/positions,
+         * application resource files (images, HTML, JavaScript files), cookies, and items stored in the Local Storage.
+         */
+        clearCache(options: CacheOptions, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Clears all cached data when OpenFin Runtime exits.
+         */
+        deleteCacheOnExit(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Downloads the given application asset
+         */
+        downloadAsset(
+            assetObj: AppAssetInfo,
+            progressListener?: (progress: { downloadedBytes: number, totalBytes: number }) => void,
+            callback?: (successObj: { path: string }) => void,
+            errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): void;
+
+        /**
+         * Download preload scripts from given URLs
+         */
+        downloadPreloadScripts(scripts: Array<DownloadPreloadOption>, callback?: (downloadInfo: Array<DownloadPreloadInfo>) => void,
+                               errorCallback?:   (reason: string) => void): void;
+        /**
+         * Downloads the given OpenFin Runtime.
+         */
+        downloadRuntime(options: RuntimeDownloadOptions, onProgress?: (progress: RuntimeDownloadProgress) => void, onComplete?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Exits the Runtime.
+         */
+        exit(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Writes any unwritten cookies data to disk.
+         */
+        flushCookieStore(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves an array of data for all applications.
+         */
+        getAllApplications(callback?: (applicationInfoList: ApplicationInfo[]) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves an array of data for all external applications.
+         */
+        getAllExternalApplications(callback?: (applicationInfoList: ApplicationInfo[]) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves an array of data (name, ids, bounds) for all application windows.
+         */
+        getAllWindows(callback?: (windowInfoList: WindowDetails[]) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Returns information about the app asset.
+         */
+        getAppAssetInfo(options: AppAssetOptions, callback?: (appAssetInfo: AppAssetInfo) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Get additional info of cookies.
+         */
+        getCookies(option: CookieOption, callback?: (info: Array<CookieInfo>) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves the command line argument string that started OpenFin Runtime.
+         */
+        getCommandLineArguments(callback?: (args: string) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves the configuration object that started the OpenFin Runtime.
+         */
+        getDeviceId(callback?: (uuid: string) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Returns a hex encoded hash of the mac address and the currently logged in user name
+         */
+        getDeviceUserId(callback?: (id: string) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Returns an Entity info object relating to the entity specified by the uuid and name passed in. The possible types are 'window', 'iframe', 'external connection' or 'unknown'.
+         */
+        getEntityInfo(uuid: string, name: string, callback?: (info: EntityInfo) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Gets the value of a given environment variable on the computer on which the runtime is installed.
+         */
+        getEnvironmentVariable(envVar: string, callback?: (variable: string) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves currently focused window identity.
+         */
+        getFocusedWindow(callback?: (focusedWindowIdentity: Identity) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves system information.
+         */
+        getHostSpecs(callback?: (info: HostSpecInfo) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves the contents of the log with the specified filename.
+         */
+        getLog(logFileName: string, callback?: (variable: string) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves an array containing information for each log file.
+         */
+        getLogList(callback?: (logInfoList: LogInfo[]) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves the minimum (inclusive) logging level that is currently being written to the logs.
+         */
+        getMinLogLevel(callback?: (logLevel: string) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves an object that contains data about the about the monitor setup of the computer that the runtime is running on.
+         */
+        getMonitorInfo(callback?: (monitorInfo: MonitorInfo) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Returns the mouse in virtual screen coordinates (left, top).
+         */
+        getMousePosition(callback?: (mousePosition: VirtualScreenCoordinates) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves an array of all of the runtime processes that are currently running.
+         * Each element in the array is an object containing the uuid and the name of the application to which the process belongs.
+         */
+        getProcessList(callback?: (processInfoList: ProcessInfo[]) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves the Proxy settings.
+         */
+        getProxySettings(callback?: (proxy: ProxyInfo) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Returns information about the running RVM in an object.
+         */
+        getRvmInfo(callback?: (rvmInfo: RvmInfo) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Returns the version of the runtime. The version contains the major, minor, build and revision numbers.
+         */
+        getVersion(callback?: (version: string) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Runs an executable or batch file.
+         */
+        launchExternalProcess(options: ExternalProcessLaunchInfo, callback?: (payload: { uuid: string }) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Writes the passed message into both the log file and the console.
+         */
+        log(level: "debug" | "info" | "warn" | "error", message: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Monitors a running process.
+         */
+        monitorExternalProcess(options: ExternalProcessInfo, callback?: (payload: { uuid: string }) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Opens the passed URL in the default web browser.
+         */
+        openUrlWithBrowser(url: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Opens the passed URL in the default web browser.
+         */
+        readRegistryValue(rootKey: string, subkey: string, value: string, callback?: (info: RegistryInfo) => void,
+                          errorCallback?: (reason: string) => void): void;
+        /**
+         * This function call will register a unique id and produce a token. The token can be used to broker an external connection.
+         */
+        registerExternalConnection(
+            uuid: string,
+            callback?: (detail: {
+                /**
+                 * this will be unique each time
+                 */
+                token: string;
+                /**
+                 * "remote-connection-uuid"
+                 */
+                uuid: string;
+            }) => void,
+            errorCallback?: (reason: string) => void): void;
+        /**
+         * Removes the process entry for the passed UUID obtained from a prior call of fin.desktop.System.launchExternalProcess().
+         */
+        releaseExternalProcess(processUuid: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Removes a previously registered event listener from the specified event.
+         */
+        removeEventListener(
+            type: OpenFinSystemEventType,
+            listener: (event: SystemBaseEvent | DesktopIconClickedEvent | IdleStateChangedEvent | MonitorInfoChangedEvent | SessionChangedEvent) => void,
+            callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Set the minimum log level above which logs will be written to the OpenFin log
+         */
+        setMinLogLevel(logLevel: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Shows the Chrome Developer Tools for the specified window.
+         */
+        showDeveloperTools(uuid: string, name: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Attempt to close an external process. The process will be terminated if it has not closed after the elapsed timeout in milliseconds.
+         */
+        terminateExternalProcess(
+            processUuid: string,
+            timeout: number,
+            killTree: boolean,
+            callback?: (info: { result: "clean" | "terminated" | "failed" }) => void,
+            errorCallback?: (reason: string) => void): void;
+        terminateExternalProcess(
+            processUuid: string,
+            timeout: number,
+            callback?: (info: { result: "clean" | "terminated" | "failed" }) => void,
+            errorCallback?: (reason: string) => void): void;
+        /**
+         * Update the OpenFin Runtime Proxy settings.
+         */
+        updateProxySettings(type: string, address: string, port: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
+    }
+
+    interface CacheOptions {
+        cache?: boolean;
+        cookies?: boolean;
+        localStorage?: boolean;
+        appcache?: boolean;
+        userData?: boolean;
+    }
+
+    interface AppAssetInfo {
+        src?: string;
+        alias?: string;
+        version?: string;
+        target?: string;
+        args?: string;
+        mandatory?: boolean;
+    }
+
+    interface AppAssetOptions {
+        alias: string;
+    }
+
+    interface ApplicationInfo {
+        /**
+         * true when the application is running.
+         */
+        isRunning?: boolean;
+        /**
+         * uuid of the application.
+         */
+        uuid?: string;
+        /**
+         * uuid of the application that launches this application.
+         */
+        parentUuid?: string;
+    }
+
+    interface Identity {
+        uuid: string;
+        name: string;
+    }
+
+    interface EntityInfo {
+        name: string;
+        uuid: string;
+        parent: Identity;
+        entityType: string;
+    }
+
+    interface DownloadPreloadOption {
+        url: string;
+    }
+
+    interface DownloadPreloadInfo {
+        success: boolean;
+            url?: string;
+            error: string;
+        }
+
+
+     interface CookieInfo {
+        name: string;
+        // expirationDate: Date;
+        domain: string;
+        path: string;
+    }
+
+     interface CookieOption {
+        name: string;
+    }
+
+    interface RegistryInfo {
+        data: any;
+        rootKey: string;
+        subkey: string;
+        type: string;
+        value: string;
+    }
+
+    interface RuntimeDownloadOptions {
+        version: string;
+    }
+
+    interface RuntimeDownloadProgress {
+        downloadedBytes: number;
+        totalBytes: number;
+    }
+
+    interface WindowDetails {
+        uuid?: string;
+        mainWindow?: WindowInfo;
+        childWindows?: WindowInfo[];
+    }
+
+    interface WindowInfo {
+        /**
+         * name of the child window
+         */
+        name?: string;
+        /**
+         * top-most coordinate of the child window
+         */
+        top?: number;
+        /**
+         * right-most coordinate of the child window
+         */
+        right?: number;
+        /**
+         * bottom-most coordinate of the child window
+         */
+        bottom?: number;
+        /**
+         * left-most coordinate of the child window
+         */
+        left?: number;
+    }
+
+    interface HostSpecInfo {
+        /**
+         * "x86" for 32-bit or "x86_64" for 64-bit
+         */
+        arch: string;
+        /**
+         * Same payload as Node's os.cpus()
+         */
+        cpus: NodeCpuInfo[];
+        gpu: {
+            /**
+             * Graphics card name
+             */
+            name: string;
+        };
+        /**
+         * Same payload as Node's os.totalmem()
+         */
+        memory: number;
+        /**
+         * OS name and version/edition
+         */
+        name: string;
+    }
+
+    interface NodeCpuInfo {
+        model: string;
+        /**
+         * in MHz
+         */
+        speed: number;
+        times: {
+            /**
+             * The number of milliseconds the CPU has spent in user mode.
+             */
+            user: number;
+            /**
+             * The number of milliseconds the CPU has spent in nice mode.
+             */
+            nice: number;
+            /**
+             * The number of milliseconds the CPU has spent in sys mode.
+             */
+            sys: number;
+            /**
+             * The number of milliseconds the CPU has spent in idle mode.
+             */
+            idle: number;
+            /**
+             * The number of milliseconds the CPU has spent in irq mode.
+             */
+            irq: number;
+        };
+    }
+
+    interface LogInfo {
+        /**
+         * the filename of the log
+         */
+        name?: string;
+        /**
+         * the size of the log in bytes
+         */
+        size?: number;
+        /**
+         * the unix time at which the log was created "Thu Jan 08 2015 14:40:30 GMT-0500 (Eastern Standard Time)"
+         */
+        date?: string;
+    }
+
+    interface ProcessInfo {
+        /**
+         * the percentage of total CPU usage
+         */
+        cpuUsage?: number;
+        /**
+         * the application name
+         */
+        name?: string;
+        /**
+         * the current nonpaged pool usage in bytes
+         */
+        nonPagedPoolUsage?: number;
+        /**
+         * the number of page faults
+         */
+        pageFaultCount?: number;
+        /**
+         * the current paged pool usage in bytes
+         */
+        pagedPoolUsage?: number;
+        /**
+         * the total amount of memory in bytes that the memory manager has committed
+         */
+        pagefileUsage?: number;
+        /**
+         * the peak nonpaged pool usage in bytes
+         */
+        peakNonPagedPoolUsage?: number;
+        /**
+         * the peak paged pool usage in bytes
+         */
+        peakPagedPoolUsage?: number;
+        /**
+         * the peak value in bytes of pagefileUsage during the lifetime of this process
+         */
+        peakPagefileUsage?: number;
+        /**
+         * the peak working set size in bytes
+         */
+        peakWorkingSetSize?: number;
+        /**
+         * the native process identifier
+         */
+        processId?: number;
+        /**
+         * the application UUID
+         */
+        uuid?: string;
+        /**
+         * the current working set size (both shared and private data) in bytes
+         */
+        workingSetSize?: number;
+    }
+
+    interface ProxyInfo {
+        /**
+         * the configured Proxy Address
+         */
+        proxyAddress?: string;
+        /**
+         * the configured Proxy port
+         */
+        proxyPort?: number;
+        /**
+         * Proxy Type
+         */
+        type?: string;
+    }
+
+    interface RvmInfo {
+        version?: string;
+        "start-time"?: string;
+    }
+
+    interface ExternalProcessLaunchInfo {
+        path?: string;
+        /**
+         * Additionally note that the executable found in the zip file specified in appAssets
+         * will default to the one mentioned by appAssets.target
+         * If the the path below refers to a specific path it will override this default
+         */
+        alias?: string;
+        /**
+         * When using alias; if no arguments are passed then the arguments (if any)
+         * are taken from the 'app.json' file, from the  'args' parameter
+         * of the 'appAssets' Object with the relevant 'alias'.
+         * If 'arguments' is passed as a parameter it takes precedence
+         * over any 'args' set in the 'app.json'.
+         */
+        arguments?: string;
+        listener?(result: {
+            /**
+             * "Exited" Or "released" on a call to releaseExternalProcess
+             */
+            topic?: string;
+            /**
+             * The mapped UUID which identifies the launched process
+             */
+            uuid?: string;
+            /*
+             * Process exit code
+             */
+            exitCode?: number;
+        }): void;
+        certificate?: CertificationInfo;
+    }
+
+    interface CertificationInfo {
+        /**
+         * A hex string with or without spaces
+         */
+        serial?: string;
+        /**
+         * An internally tokenized and comma delimited string allowing partial or full checks of the subject fields
+         */
+        subject?: string;
+        /**
+         * A hex string with or without spaces
+         */
+        publickey?: string;
+        /**
+         * A hex string with or without spaces
+         */
+        thumbprint?: string;
+        /**
+         * A boolean indicating that the certificate is trusted and not revoked
+         */
+        trusted?: boolean;
+    }
+
+    interface ExternalProcessInfo {
+        pid?: number;
+        listener?(result: {
+            /**
+             * "Exited" Or "released" on a call to releaseExternalProcess
+             */
+            topic?: string;
+            /**
+             * The mapped UUID which identifies the launched process
+             */
+            uuid?: string;
+            /*
+                * Process exit code
+                */
+            exitCode?: number;
+        }): void;
+    }
+
+    interface OpenFinWindowStatic {
+        /**
+         * Class: Window
+         *
+         * new Window(options, callbackopt, errorCallbackopt)
+         *
+         * Creates a new OpenFin Window
+         *
+         * A basic window that wraps a native HTML window. Provides more fine-grained control over the window state such as the ability to minimize,
+         * maximize, restore, etc. By default a window does not show upon instantiation; instead the window's show() method must be invoked manually.
+         * The new window appears in the same process as the parent window.
+         * @param options - The options of the window
+         * @param [callback] - Called if the window creation was successful
+         * @param [callback.successObj] - httpResponseCode
+         */
+        new (
+            options: WindowOptions,
+            callback?: (successObj: { httpResponseCode: number }) => void,
+            errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): OpenFinWindow;
+        /**
+         * Returns an instance of the current window.
+         * @returns Current window
+         */
+        getCurrent(): OpenFinWindow;
+        /**
+         * Returns a Window object that wraps an existing window.
+         */
+        wrap(appUuid: string, windowName: string): OpenFinWindow;
+    }
+
+    /**
+     * Window
+     * A basic window that wraps a native HTML window. Provides more fine-grained control over the window state such as the ability to minimize,
+     * maximize, restore, etc. By default a window does not show upon instantiation; instead the window's show() method must be invoked manually.
+     * The new window appears in the same process as the parent window.
+     */
+    interface OpenFinWindow {
+        /**
+         * Name of window
+         */
+        name: string;
+        /**
+         * Returns the native JavaScript "window" object for the window. This method can only be used by the parent application or the window itself,
+         * otherwise it will return undefined. The same Single-Origin-Policy (SOP) rules apply for child windows created by window.open(url) in that the
+         * contents of the window object are only accessible if the URL has the same origin as the invoking window. See example below.
+         * Also, will not work with fin.desktop.Window objects created with fin.desktop.Window.wrap().
+         * @returns Native window
+         */
+        getNativeWindow(): Window;
+        /**
+         * Gets the parent application.
+         * @returns Parent application
+         */
+        getParentApplication(): OpenFinApplication;
+        /**
+         * Gets the parent window.
+         */
+        getParentWindow(): OpenFinWindow;
+        /**
+         * Registers an event listener on the specified event.
+         */
+        addEventListener(
+            type: OpenFinWindowEventType,
+            listener: (event: WindowBaseEvent
+                | WindowAuthRequestedEvent
+                | WindowBoundsEvent
+                | WindowExternalProcessStartedEvent
+                | WindowExternalProcessExited
+                | WindowGroupChangedEvent
+                | WindowHiddenEvent
+                | Window_NavigationRejectedEvent) => void,
+            callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Performs the specified window transitions
+         */
+        animate(transitions: AnimationTransition, options: AnimationOptions, callback?: (event: any) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Provides credentials to authentication requests
+         */
+        authenticate(userName: string, password: string, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+        /**
+         * Removes focus from the window.
+         */
+        blur(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Brings the window to the front of the OpenFin window stack.
+         */
+        bringToFront(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Closes the window.
+         * @param Close will be prevented from closing when force is false and 'close-requested' has been subscribed to for application's main window.
+         */
+        close(force?: boolean, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Prevents a user from changing a window's size/position when using the window's frame.
+         * 'disabled-frame-bounds-changing' is generated at the start of and during a user move/size operation.
+         * 'disabled-frame-bounds-changed' is generated after a user move/size operation.
+         * The events provide the bounds that would have been applied if the frame was enabled.
+         * 'frame-disabled' is generated when an enabled frame becomes disabled.
+         */
+        disableFrame(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Re-enables user changes to a window's size/position when using the window's frame.
+         * 'disabled-frame-bounds-changing' is generated at the start of and during a user move/size operation.
+         * 'disabled-frame-bounds-changed' is generated after a user move/size operation.
+         * The events provide the bounds that would have been applied if the frame was enabled.
+         * 'frame-enabled' is generated when a disabled frame has becomes enabled.
+         */
+        enableFrame(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Flashes the window's frame and taskbar icon until the window is activated.
+         */
+        flash(options?: any, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Gives focus to the window.
+         */
+        focus(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Gets the current bounds (top, left, width, height) of the window.
+         */
+        getBounds(callback?: (bounds: WindowBounds) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves an array containing wrapped fin.desktop.Windows that are grouped with this window. If a window is not in a group an empty array is returned.
+         * Please note that calling window is included in the result array.
+         */
+        getGroup(callback?: (group: OpenFinWindow[]) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Gets the current settings of the window.
+         */
+        getOptions(callback?: (options: WindowOptions) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Gets a base64 encoded PNG snapshot of the window.
+         */
+        getSnapshot(callback?: (base64Snapshot: string) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Gets the current state ("minimized", "maximized", or "restored") of the window.
+         */
+        getState(callback?: (state: "minimized" | "maximized" | "restored") => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Returns the zoom level of the window.
+         */
+        getZoomLevel(callback?: (level: number) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Hides the window.
+         */
+        hide(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Determines if the window is currently showing.
+         */
+        isShowing(callback?: (showing: boolean) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Joins the same window group as the specified window.
+         */
+        joinGroup(target: OpenFinWindow, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Leaves the current window group so that the window can be move independently of those in the group.
+         */
+        leaveGroup(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Maximizes the window.
+         */
+        maximize(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Merges the instance's window group with the same window group as the specified window
+         */
+        mergeGroups(target: OpenFinWindow, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Minimizes the window.
+         */
+        minimize(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Moves the window by a specified amount.
+         */
+        moveBy(deltaLeft: number, deltaTop: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Moves the window to a specified location.
+         */
+        moveTo(left: number, top: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Removes a previously registered event listener from the specified event.
+         */
+        removeEventListener(
+            type: OpenFinWindowEventType,
+            listener: (event: WindowBaseEvent
+                | WindowAuthRequestedEvent
+                | WindowBoundsEvent
+                | WindowExternalProcessStartedEvent
+                | WindowExternalProcessExited
+                | WindowGroupChangedEvent
+                | WindowHiddenEvent
+                | Window_NavigationRejectedEvent) => void,
+            callback?: () => void,
+            errorCallback?: (reason: string) => void): void;
+        /**
+         * Resizes the window by a specified amount.
+         */
+        resizeBy(deltaWidth: number, deltaHeight: number, anchor: OpenFinAnchor, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Resizes the window by a specified amount.
+         */
+        resizeTo(width: number, height: number, anchor: OpenFinAnchor, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Restores the window to its normal state (i.e., unminimized, unmaximized).
+         */
+        restore(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Will bring the window to the front of the entire stack and give it focus.
+         */
+        setAsForeground(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Sets the window's size and position
+         */
+        setBounds(left: number, top: number, width: number, height: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Sets the zoom level of the window.
+         */
+        setZoomLevel(level: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Shows the window if it is hidden.
+         * @param Show will be prevented from closing when force is false and 'show-requested' has been subscribed to for application's main window.
+         */
+        show(force?: boolean, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Shows the window if it is hidden at the specified location. If the toggle parameter is set to true, the window will alternate between showing and hiding.
+         */
+        showAt(left: number, top: number, force?: boolean, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Stops the taskbar icon from flashing.
+         */
+        stopFlashing(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Updates the window using the passed options
+         */
+        updateOptions(options: WindowOptions, callback?: () => void, errorCallback?: (reason: string) => void): void;
+    }
+
+    interface OpenFinFrameStatic {
+        wrap(uuid: string, name: string): OpenFinFrame;
+
+        getCurrent(): OpenFinFrame;
+    }
+
+    interface OpenFinFrame {
+        name: string;
+        uuid: string;
+
+        addEventListener(type: string, listener: () => void, callback?: () => void, errorCallback?: (reason: string) => void): void;
+
+        getParentWindow(callback?: (entityInfo: EntityInfo) => void, errorCallback?: (reason: string) => void): void;
+
+        getInfo(callback?: (entityInfo: EntityInfo) => void, errorCallback?: (reason: string) => void): void;
+
+        removeEventListener(type: string, listener: () => void, callback?: () => void, errorCallback?: (reason: string) => void): void;
+    }
+
+    interface ApplicationBaseEvent {
+        topic: string;
+        type: OpenFinApplicationEventType;
+        uuid: string;
+    }
+
+    interface TrayIconClickedEvent extends ApplicationBaseEvent {
+        button: number; // 0 for left, 1 for middle, 2 for right
+        monitorInfo: MonitorInfo;
+        x: number; // the cursor x coordinate
+        y: number; // the cursor y coordinate
+    }
+
+    interface WindowEvent extends ApplicationBaseEvent {
+        name: string;
+    }
+
+    interface WindowAlertRequestedEvent extends WindowEvent {
+        message: string;
+        url: string;
+    }
+
+    interface WindowAuthRequested extends WindowEvent {
+        authInfo: {
+            host: string;
+            isProxy: boolean;
+            port: number;
+            realm: string;
+            scheme: string;
+        };
+    }
+
+    interface WindowNavigationRejectedEvent extends WindowEvent {
+        sourceName: string;
+        url: string;
+    }
+
+    interface WindowEndLoadEvent extends WindowEvent {
+        documentName: string;
+        isMain: boolean;
+    }
+
+    interface MonitorInfoChangedEvent extends MonitorInfo {
+        topic: "system";
+        type: "monitor-info-changed";
+    }
+
+    interface MonitorInfo {
+        nonPrimaryMonitors: MonitorInfoDetail[];
+        primaryMonitor: MonitorInfoDetail;
+        reason: string;
+        taskbar: {
+            edge: "left" | "right" | "top" | "bottom",
+            rect: MontiorCoordinates
+        };
+        topic: "system";
+        type: "monitor-info-changed";
+        virtualScreen: MontiorCoordinates;
+    }
+
+   interface TrayIconInfo {
+       x: number;
+       y: number;
+       bounds: {
+           x: number;
+           y: number;
+           width: number;
+           height: number;
+       }
+       monitorInfo: MonitorInfo
+   }
+
+    interface MonitorInfoDetail {
+        availableRect: MontiorCoordinates;
+        deviceId: string;
+        displayDeviceActive: boolean;
+        monitorRect: MontiorCoordinates;
+        name: string;
+    }
+
+    interface MontiorCoordinates {
+        bottom: number;
+        left: number;
+        right: number;
+        top: number;
+    }
+
+    interface VirtualScreenCoordinates {
+        left: number;
+        top: number;
+    }
+
+    interface SystemBaseEvent {
+        topic: string;
+        type: OpenFinSystemEventType;
+        uuid: string;
+    }
+
+    interface DesktopIconClickedEvent {
+        mouse: {
+            /**
+             * the left virtual screen coordinate of the mouse
+             */
+            left: number,
+            /**
+             * the top virtual screen coordinate of the mouse
+             */
+            top: number
+        };
+        /**
+         * the number of milliseconds that have elapsed since the system was started,
+         */
+        tickCount: number;
+        topic: "system";
+        type: "desktop-icon-clicked";
+    }
+
+    interface IdleStateChangedEvent {
+        /**
+         * How long in milliseconds since the user has been idle.
+         */
+        elapsedTime: number;
+        /**
+         * true when the user is idle,false when the user has returned;
+         */
+        isIdle: boolean;
+        topic: "system";
+        type: "idle-state-changed";
+    }
+
+    interface WindowBaseEvent {
+        /**
+         * the name of the window
+         */
+        name: string;
+        /**
+         * always window
+         */
+        topic: "window";
+        /**
+         * window event type
+         */
+        type: OpenFinWindowEventType;
+        /**
+         * the UUID of the application the window belongs to
+         */
+        uuid: string;
+    }
+
+    interface WindowAuthRequestedEvent extends WindowBaseEvent {
+        authInfo: {
+            host: string;
+            isProxy: boolean;
+            port: number;
+            realm: string;
+            scheme: string;
+        };
+    }
+
+    interface WindowBoundsEvent extends WindowBaseEvent {
+        /**
+         * describes what kind of change occurred.
+         * 0 means a change in position.
+         * 1 means a change in size.
+         * 2 means a change in position and size.
+         */
+        changeType: number;
+        /**
+         * true when pending changes have been applied to the window.
+         */
+        deferred: boolean;
+        /**
+         * the new height of the window.
+         */
+        height: number;
+        /**
+         * the left-most coordinate of the window.
+         */
+        left: number;
+        /**
+         * the top-most coordinate of the window.
+         */
+        top: number;
+
+        type: "bounds-changed" | "bounds-changing" | "disabled-frame-bounds-changed" | "disabled-frame-bounds-changing";
+        /**
+         * the new width of the window.
+         */
+        width: number;
+    }
+
+    interface WindowExternalProcessStartedEvent extends WindowBaseEvent {
+        /**
+         * the process handle uuid
+         */
+        processUuid: string;
+        type: "external-process-started";
+    }
+
+    interface WindowExternalProcessExited extends WindowBaseEvent {
+        /**
+         * the process exit code
+         */
+        exitCode: number;
+        /**
+         * the process handle uuid
+         */
+        processUuid: string;
+        type: "external-process-exited";
+    }
+
+    interface WindowGroupChangedEvent extends WindowBaseEvent {
+        /**
+         * Which group array the window that the event listener was registered on is included in:
+         * 'source' The window is included in sourceGroup.
+         * 'target' The window is included in targetGroup.
+         * 'nothing' The window is not included in sourceGroup nor targetGroup.
+         */
+        memberOf: "source" | "target" | "nothing";
+        /**
+         * The reason this event was triggered.
+         * 'leave' A window has left the group due to a leave or merge with group.
+         * 'join' A window has joined the group.
+         * 'merge' Two groups have been merged together.
+         * 'disband' There are no other windows in the group.
+         */
+        reason: "leave" | "join" | "merge" | "disband";
+        /**
+         * All the windows in the group the sourceWindow originated from.
+         */
+        sourceGroup: WindowOfGroupInfo[];
+        /**
+         * The UUID of the application the sourceWindow belongs to The source window is the window in which (merge/join/leave)group(s) was called.
+         */
+        sourceWindowAppUuid: string;
+        /**
+         * the name of the sourcewindow.The source window is the window in which(merge / join / leave) group(s) was called.
+         */
+        sourceWindowName: string;
+        /**
+         * All the windows in the group the targetWindow orginated from
+         */
+        targetGroup: WindowOfGroupInfo[];
+        /**
+         * The UUID of the application the targetWindow belongs to. The target window is the window that was passed into (merge/join) group(s).
+         */
+        targetWindowAppUuid: string;
+        /**
+         * The name of the targetWindow. The target window is the window that was passed into (merge/join) group(s).
+         */
+        targetWindowName: string;
+        type: "group-changed";
+    }
+
+    interface WindowOfGroupInfo {
+        /**
+         * The UUID of the application this window entry belongs to.
+         */
+        appUuid: string;
+        /**
+         * The name of this window entry.
+         */
+        windowName: string;
+    }
+
+    interface WindowHiddenEvent extends WindowBaseEvent {
+        /**
+         * What action prompted the close.
+         * The reasons are: "hide", "hide-on-close"
+         */
+        reason: "hide" | "hide-on-close";
+        type: "hidden";
+    }
+
+    interface Window_NavigationRejectedEvent {
+        name: string;
+        /**
+         * source of navigation window name
+         */
+        sourceName: string;
+        topic: "navigation-rejected";
+        /**
+         * Url that was not reached "http://blocked-content.url"
+         */
+        url: string;
+        /**
+         * the UUID of the application the window belongs to.
+         */
+        uuid: string;
+    }
+
+    interface AnimationTransition {
+        opacity?: {
+            /**
+             * This value is clamped from 0.0 to 1.0
+             */
+            opacity?: number;
+            /**
+             * The total time in milliseconds this transition should take.
+             */
+            duration?: number;
+            /**
+             * Treat 'opacity' as absolute or as a delta. Defaults to false.
+             */
+            relative?: boolean;
+        };
+        position?: {
+            /**
+             * Defaults to the window's current left position in virtual screen coordinates.
+             */
+            left?: number;
+            /**
+             * Defaults to the window's current top position in virtual screen coordinates.
+             */
+            top?: number;
+            /**
+             * The total time in milliseconds this transition should take.
+             */
+            duration?: number;
+            /**
+             * Treat 'left' and 'top' as absolute or as deltas. Defaults to false.
+             */
+            relative?: boolean;
+        };
+        size?: {
+            /**
+             * Optional if height is present. Defaults to the window's current width.
+             */
+            width?: number;
+            /**
+             * Optional if width is present. Defaults to the window's current height.
+             */
+            height?: number;
+            /**
+             * The total time in milliseconds this transition should take.
+             */
+            duration?: number;
+            /**
+             * Treat 'width' and 'height' as absolute or as deltas. Defaults to false.
+             */
+            relative?: boolean;
+        };
+    }
+
+    interface AnimationOptions {
+        /**
+         * This option interrupts the current animation. When false it pushes this animation onto the end of the animation queue.
+         */
+        interrupt?: boolean;
+        /**
+         * Transition effect. Defaults to 'ease-in-out'.
+         */
+        tween?: OpenFinTweenType;
+    }
+
+    interface WindowBounds {
+        /**
+         * the height of the window.
+         */
+        height?: number;
+        /**
+         * left-most coordinate of the window.
+         */
+        left?: number;
+        /**
+         * top-most coordinate of the window.
+         */
+        top?: number;
+        /**
+         * the width of the window.
+         */
+        width?: number;
+    }
+
+    interface ExternalApplicationInfo {
+        parent: {
+            uuid: string;
+            name: string;
+        }
+    }
+
+    interface SessionChangedEvent {
+        /**
+         * the action that triggered this event:
+         */
+        reason: "lock"
+            | "unlock"
+            | "remote-connect"
+            | "remote-disconnect"
+            | "unknown";
+        topic: "system";
+        type: "session-changed";
+    }
+
+    interface LaunchInfo {
+        launchMode: "fin-protocol"
+            | "fins-protocol"
+            | "shortcut"
+            | "command-line"
+            | "adapter"
+            | "other"
+            | string;
+    }
+
+    type OpenFinTweenType = "linear"
+        | "ease-in"
+        | "ease-out"
+        | "ease-in-out"
+        | "ease-in-quad"
+        | "ease-out-quad"
+        | "ease-in-out-quad"
+        | "ease-in-cubic"
+        | "ease-out-cubic"
+        | "ease-in-out-cubic"
+        | "ease-out-bounce"
+        | "ease-in-back"
+        | "ease-out-back"
+        | "ease-in-out-back"
+        | "ease-in-elastic"
+        | "ease-out-elastic"
+        | "ease-in-out-elastic";
+
+    type OpenFinApplicationEventType = "closed"
+        | "connected"
+        | "crashed"
+        | "initialized"
+        | "manifest-changed"
+        | "not-responding"
+        | "out-of-memory"
+        | "responding"
+        | "run-requested"
+        | "started"
+        | "tray-icon-clicked"
+        | "window-alert-requested"
+        | "window-auth-requested"
+        | "window-closed"
+        | "window-created"
+        | "window-end-load"
+        | "window-navigation-rejected"
+        | "window-show-requested"
+        | "window-start-load";
+
+    type OpenFinExternalApplicationEventType = "connected"
+        | "disconnected";
+
+    type OpenFinSystemEventType = "application-closed"
+        | "application-crashed"
+        | "application-created"
+        | "application-started"
+        | "desktop-icon-clicked"
+        | "idle-state-changed"
+        | "monitor-info-changed"
+        | "session-changed";
+
+    type OpenFinWindowEventType = "auth-requested"
+        | "blurred"
+        | "bounds-changed"
+        | "bounds-changing"
+        | "close-requested"
+        | "closed"
+        | "disabled-frame-bounds-changed"
+        | "disabled-frame-bounds-changing"
+        | "embedded"
+        | "external-process-exited"
+        | "external-process-started"
+        | "focused"
+        | "frame-disabled"
+        | "frame-enabled"
+        | "group-changed"
+        | "hidden"
+        | "initialized"
+        | "maximized"
+        | "minimized"
+        | "navigation-rejected"
+        | "restored"
+        | "show-requested"
+        | "shown";
+
+    type OpenFinAnchor = "top-left"
+        | "top-right"
+        | "bottom-left"
+        | "bottom-right";
+}
diff --git a/types/openfin/v29/openfin-tests.ts b/types/openfin/v29/openfin-tests.ts
new file mode 100644
index 0000000000..2b5237c1e8
--- /dev/null
+++ b/types/openfin/v29/openfin-tests.ts
@@ -0,0 +1,797 @@
+function test_application() {
+    let application: fin.OpenFinApplication;
+    // constructor
+    application = new fin.desktop.Application({
+        url: "application.html",
+        uuid: "74BED629-2D8E-4141-8582-73E364BDFA74",
+        name: "Application Name",
+        plugins: false,
+        mainWindowOptions: {
+            defaultHeight: 600,
+            defaultWidth: 800,
+            defaultTop: 300,
+            defaultLeft: 300,
+            autoShow: true
+        }
+    }, (successObj) => {
+        console.log("Application successfully created, HTTP response code:", successObj);
+        application.run();
+    }, (error) => {
+        console.log("Error creating application:", error);
+    });
+        //createFromManifest
+    fin.desktop.Application.createFromManifest("http://stuf.com/app.json", (app) => {
+        console.log(app.uuid);
+    }, err => console.log(err));
+    // getCurrent
+    application = fin.desktop.Application.getCurrent();
+    // wrap
+    application = fin.desktop.Application.wrap("454C7F31-A915-4EA2-83F2-CFA655453C52");
+    // getWindow
+    application.getWindow();
+    // addEventListener
+    application.addEventListener("closed", (event) => {
+        console.log("The application has closed");
+    }, () => {
+        console.log("The registration was successful");
+    }, reason => {
+        console.log("failure: " + reason);
+    });
+    // close
+    application.close();
+    // getChildWindows
+    application.getChildWindows(children => {
+        children.forEach(childWindow => {
+            console.log("Showing child: " + childWindow.name);
+            childWindow.show();
+        });
+    });
+    // getGroups
+    application.getGroups(allGroups => {
+        console.log(`There are a total of ${allGroups.length} groups.`);
+
+        let groupCounter = 1;
+        allGroups.forEach(windowGroup => {
+            console.log(`Group ${groupCounter} contains ${windowGroup.length} windows.`);
+            ++groupCounter;
+        });
+    });
+    // getManifest
+    application.getManifest(manifest => {
+        console.log("Application manifest:");
+        console.log(manifest);
+    });
+    // getParentUuid
+    application.getParentUuid(parentUuid => {
+        console.log("UUID of parent application:");
+        console.log(parentUuid);
+    });
+    // getShortcuts
+    application.getShortcuts(config => {
+        console.log("Desktop shortcut is enabled: ", config.desktop);
+        console.log("Start Menu shortcut is enabled: ", config.startMenu);
+        console.log("System Startup shortcut is enabled: ", config.systemStartup);
+    });
+    // getInfo
+    application.getInfo(info => {
+        console.log(`Launch mode: ${info.launchMode}`);
+    });
+    // getTrayIconInfo
+    application.getTrayIconInfo(info => {
+        console.log(info.x, info.y, info.bounds.x, info.bounds.y, info.bounds.height, info.bounds.width,
+                    info.monitorInfo.type, info.monitorInfo.reason);
+    });
+    // isRunning
+    application.isRunning(running => {
+        console.log("the application is", running ? "running" : "not running");
+    });
+    // registerCustomData
+    application.registerUser("a", "b", () => console.log("done"), err => console.log(err));
+    // removeEventListener
+    const previousCallback = (event: fin.WindowEvent) => { };
+    application.removeEventListener("closed", previousCallback, () => {
+        console.log("The unregistration was successful");
+    }, err => {
+        console.log("failure:", err);
+    });
+    // removeTrayIcon
+    application.removeTrayIcon(() => {
+        console.log("Removed the tray icon.");
+    }, err => {
+        console.log("failure:", err);
+    });
+    // restart
+    application.restart(() => {
+        console.log("You will not read this.");
+    }, err => {
+        console.log("failure:", err);
+    });
+    // schedule restart
+    application.scheduleRestart(() => {
+        console.log("You will not read this.");
+    }, err => {
+        console.log("failure:", err);
+    });
+    // setShortcuts
+    application.setShortcuts({
+        desktop: true,
+        startMenu: false,
+        systemStartup: true
+    }, () => {
+        console.log("Successfully set new shortcut states");
+    }, error => {
+        console.log("Failed to set new shortcut states. Error: ", error);
+    });
+    // setTrayIcon
+    application.setTrayIcon("https://developer.openf.in/download/openfin.png", clickInfo => {
+        console.log(`The mouse has clicked at (${clickInfo.x}, ${clickInfo.y})`);
+    });
+    // terminate
+    application.terminate();
+    // wait
+    application.addEventListener("not-responding", () => {
+        console.log("waiting for hung application");
+        application.wait();
+    });
+    //uuid
+    let hasUuid = application.uuid;
+}
+
+function test_external_application() {
+    let externalApp: fin.OpenFinExternalApplication;
+    // wrap
+    externalApp = fin.desktop.ExternalApp.wrap('my-uuid');
+    // addEventListener
+    externalApp.addEventListener('connected', () => {
+        console.log('external app connected');
+    }, () => {
+        console.log('The registration was successful');
+    }, (reason, err) => {
+        console.log(`Error Message: ${err.message} Error Stack: ${err.stack}`);
+    });
+    // removeEventListener
+    const previousCallback = () => { };
+    externalApp.removeEventListener('connected', previousCallback, () => {
+        console.log('The unregistration was successful');
+    }, (reason, err) => {
+        console.log(`Error Message: ${err.message} Error Stack: ${err.stack}`);
+    });
+
+    // getInfo
+    externalApp.getInfo(info => {
+        console.log(info.parent.uuid, info.parent.name);
+    }, err => console.log(err));
+}
+
+function test_inter_application_bus() {
+    // addSubscribeListener
+    fin.desktop.InterApplicationBus.addSubscribeListener((uuid, topic, name) => {
+        console.log(`The application ${uuid} has subscribed to ${topic}`);
+    });
+    // addUnsubscribeListener
+    fin.desktop.InterApplicationBus.addUnsubscribeListener((uuid, topic, name) => {
+        console.log(`The application ${uuid} has unsubscribed to ${topic}`);
+    });
+    // removeSubscribeListener
+    const aRegisteredListener = (uuid: string, topic: string, name: string) => { };
+    fin.desktop.InterApplicationBus.removeSubscribeListener(aRegisteredListener);
+    // removeUnsubscribeListener
+    fin.desktop.InterApplicationBus.removeUnsubscribeListener(aRegisteredListener);
+    // publish
+    fin.desktop.InterApplicationBus.publish("a topic", {
+        field1: "value1",
+        field2: "value2"
+    });
+    // send
+    fin.desktop.InterApplicationBus.send("an application's uuid", "a topic", {
+        field1: "value1",
+        field2: "value2"
+    });
+    // subscribe
+    fin.desktop.InterApplicationBus.subscribe("*", "a topic", (message, uuid, name) => {
+        console.log(`The application ${uuid} sent this message: ${message}`);
+    });
+    // unsubscribe
+    const aRegisteredMessageListener = (message: any, senderUuid: string) => {
+        console.log(message, senderUuid);
+    };
+    fin.desktop.InterApplicationBus.unsubscribe("*", "a topic", aRegisteredMessageListener);
+}
+
+function test_notification() {
+    let notification: fin.OpenFinNotification;
+    // getCurrent
+    notification = fin.desktop.Notification.getCurrent();
+    // close
+    notification.close();
+    // sendMessage
+    notification = new fin.desktop.Notification({
+        duration: 10,
+        url: "http://localhost:5000/Account/Register",
+        message: "Hello",
+        onShow: () => { },
+        // onClose: () => { },
+        onDismiss: () => { },
+        // onClick: () => { },
+        onMessage: () => { },
+        onError: () => { }
+    });
+    // sendMessageToApplication
+    notification.sendMessageToApplication("some message");
+}
+
+function test_system() {
+    // addEventListener
+    fin.desktop.System.addEventListener('monitor-info-changed', event => {
+        console.log("The monitor information has changed to: ", event);
+    }, () => {
+        console.log("The registration was successful");
+    }, err => {
+        console.log("failure: " + err);
+    });
+    // clearCache
+    fin.desktop.System.clearCache({
+        cache: true,
+        cookies: true,
+        localStorage: true,
+        appcache: true,
+        userData: true
+    });
+    // deleteCacheOnExit
+    fin.desktop.System.deleteCacheOnExit(() => {
+        console.log("successful");
+    }, err => {
+        console.log("failure: " + err);
+    });
+    // downloadAsset
+    const dirAppAsset = {
+        src: 'http://local:8000/dir.zip',
+        alias: 'dirApp',
+        version: '1.23.24',
+        target: 'dir.bat',
+        args: ''
+    };
+    fin.desktop.System.downloadAsset(dirAppAsset, progress => {
+        const downloadedPercent = Math.floor((progress.downloadedBytes / progress.totalBytes) * 100);
+        console.log(`Downloaded ${downloadedPercent}%`);
+    }, p => {
+        console.log(`Downlod complete, can be found on ${p.path}`);
+        // lets launch our application asset.
+        // launchDirApp();
+    }, (reason, err) => {
+        console.log(reason, err);
+    });
+    // downloadRuntime
+    fin.desktop.System.downloadRuntime({ version: '9.61.31.56' }, progress => {
+        console.log(progress.downloadedBytes, progress.downloadedBytes);
+    }, () => console.log('download complete'), err => console.error(err));
+    // downloadPreloadScript
+    const preloadScripts = [
+        { url: 'http://whatever.com/script.js' }
+    ];
+    fin.desktop.System.downloadPreloadScripts(preloadScripts, info => {
+        const downloadInfo = info[0];
+        console.log(downloadInfo.success, downloadInfo.url, downloadInfo.error);
+    }, err => {
+        console.log(err);
+    });
+    // exit
+    fin.desktop.System.exit(() => {
+        console.log("successful");
+    }, err => {
+        console.log("failure: " + err);
+    });
+    //flushCookieStore
+    fin.desktop.System.flushCookieStore(() => {
+        console.log('successful');
+    }, err => {
+        console.log('failure', err);
+    });
+    // getAllApplications
+    fin.desktop.System.getAllApplications(applicationInfoList => {
+        applicationInfoList.forEach(applicationInfo => {
+            console.log("Showing information for application with uuid: "
+                + applicationInfo.uuid);
+            console.log("isRunning: ", applicationInfo.isRunning);
+        });
+    });
+    // getAllExternalApplications
+    fin.desktop.System.getAllExternalApplications(externalAppsInfoList => {
+        externalAppsInfoList.forEach(appInfo => {
+            console.log(`External app connected to the runtime with UUID ${appInfo.uuid}`);
+        });
+    });
+    // getAllWindows
+    fin.desktop.System.getAllWindows(windowInfoList => {
+        windowInfoList.forEach(windowInfo => {
+            console.log("Showing information for application with uuid: ", windowInfo.uuid);
+            console.log("Main window: ", windowInfo.mainWindow);
+            console.log("Child windows: ", windowInfo.childWindows);
+        });
+    });
+    // getAppAssetInfo
+    fin.desktop.System.getAppAssetInfo({ alias: 'myAppAsset' }, info => {
+        console.log(info.alias, info.args, info.mandatory, info.src, info.target, info.version);
+    }, err => console.log(err));
+    // getCommandLineArguments
+    fin.desktop.System.getCommandLineArguments(args => {
+        console.log("The command line arguments are " + args);
+    });
+    //getCookieInfo
+    fin.desktop.System.getCookies({ name: 'myCookie1'}, cookies => {
+        const cookie1 = cookies[0];
+        console.log(cookie1.name, cookie1.domain, cookie1.path);
+    }, err => console.log(err));
+    // getDeviceId
+    fin.desktop.System.getDeviceId(id => {
+        console.log("The id of the device is: " + id);
+    });
+    // getDeviceUserId
+    fin.desktop.System.getDeviceUserId(id => console.log(id), err => console.error(err));
+    // getEntityInfo
+    fin.desktop.System.getEntityInfo('uuid', 'name', info => {
+        console.log(info.entityType, info.name, info.uuid, info.parent.name, info.parent.uuid);
+    }, err => console.log(err));
+    // getEnvironmentVariable
+    fin.desktop.System.getEnvironmentVariable("APPDATA", variable => {
+        console.log("this is the APPDATA value", variable);
+    });
+    // getFocusedWindow
+    fin.desktop.System.getFocusedWindow(win => {
+        console.log(win.uuid, win.name);
+    }, err => console.log(err));
+    // getHostSpecs
+    fin.desktop.System.getHostSpecs(info => {
+        console.log(info);
+    }, error => {
+        console.log('There was an error:', error);
+    });
+    // getLog
+    fin.desktop.System.getLog('debug-2015-01-08-22-27-53.log', log => {
+        console.log(log);
+    });
+    // getLogList
+    fin.desktop.System.getLogList(logList => {
+        logList.forEach(logInfo => {
+            console.log(`The filename of the log is ${logInfo.name}, the size is ${logInfo.size}, and the date of creation is ${logInfo.date}`);
+        });
+    });
+    //getMinLogLevel
+    fin.desktop.System.getMinLogLevel(level => console.log(level), err => console.log(err));
+    // getMonitorInfo
+    fin.desktop.System.getMonitorInfo(monitorInfo => {
+        console.log("This object contains information about all monitors: ", monitorInfo);
+    });
+    // getMousePosition
+    fin.desktop.System.getMousePosition(mousePosition => {
+        console.log(`The mouse is located at left: ${mousePosition.left}, top: ${mousePosition.top}`);
+    });
+    // getProcessList
+    fin.desktop.System.getProcessList(list => {
+        list.forEach(process => {
+            console.log(`UUID: ${process.uuid}, Application Name: ${process.name}`);
+        });
+    });
+    // getProxySettings
+    fin.desktop.System.getProxySettings(proxy => {
+        console.log(proxy);
+    });
+    // getRvmInfo
+    fin.desktop.System.getRvmInfo(rvmInfoObject => {
+        console.log("RVM version:", rvmInfoObject.version);
+        console.log("RVM has been running since:", rvmInfoObject["start-time"]);
+    }, err => {
+        console.log("Failed to get rvm info, error message:", err);
+    });
+    // getVersion
+    fin.desktop.System.getVersion(version => {
+        console.log("The version is " + version);
+    });
+    // launchExternalProcess
+    fin.desktop.System.launchExternalProcess({
+        path: "notepad",
+        arguments: "",
+        listener(result) {
+            console.log('the exit code', result.exitCode);
+        }
+    }, payload => {
+        console.log('Success:', payload.uuid);
+    }, error => {
+        console.log('Error:', error);
+    });
+    //
+    fin.desktop.System.launchExternalProcess({
+        // Additionally note that the executable found in the zip file specified in appAssets
+        // will default to the one mentioned by appAssets.target
+        // If the the path below refers to a specific path it will override this default
+        alias: "myApp",
+        listener(result) {
+            console.log('the exit code', result.exitCode);
+        }
+    }, payload => {
+        console.log('Success:', payload.uuid);
+    }, error => {
+        console.log('Error:', error);
+    });
+    //
+    fin.desktop.System.launchExternalProcess({
+        alias: "myApp",
+        arguments: "e f g",
+        listener(result) {
+            console.log('the exit code', result.exitCode);
+        }
+    }, payload => {
+        console.log('Success:', payload.uuid);
+    }, error => {
+        console.log('Error:', error);
+    });
+    //
+    fin.desktop.System.launchExternalProcess({
+        path: "C:\Users\ExampleUser\AppData\Local\OpenFin\OpenFinRVM.exe",
+        arguments: "--version",
+        certificate: {
+            trusted: true,
+            subject: 'O=OpenFin INC., L=New York, S=NY, C=US',
+            thumbprint: '3c a5 28 19 83 05 fe 69 88 e6 8f 4b 3a af c5 c5 1b 07 80 5b'
+        },
+        listener(result) {
+            console.log('the exit code', result.exitCode);
+        }
+    }, payload => {
+        console.log('Success:', payload.uuid);
+    }, error => {
+        console.log('Error:', error);
+    });
+    // log
+    fin.desktop.System.log("info", "An example log message", () => {
+        console.log("message successfully logged");
+    }, err => {
+        console.log(err);
+    });
+    // monitorExternalProcess
+    fin.desktop.System.monitorExternalProcess({
+        pid: 2508,
+        listener(result) {
+            console.log('the exit code', result.exitCode);
+        }
+    }, payload => {
+        console.log("The process is now being monitored: ", payload.uuid);
+    }, error => {
+        console.log("Error:", error);
+    });
+    // openUrlWithBrowser
+    fin.desktop.System.openUrlWithBrowser("https://developer.openf.in/", () => {
+        console.log("successful");
+    }, err => {
+        console.log("failure: " + err);
+    });
+    // readRegistryValue
+    fin.desktop.System.readRegistryValue('HKEY_SOMETHING', 'HARDWARE\\SOMETHING', 'BootSomething', info => {
+        console.log(info.data, info.rootKey, info.subkey, info.type, info.value);
+    }, err => console.log(err));
+    // registerExternalConnection
+    fin.desktop.System.registerExternalConnection("remote-connection-uuid", (...args: any[]) => {
+        console.log(args);
+    });
+    // releaseExternalProcess
+    fin.desktop.System.launchExternalProcess({
+        path: "notepad",
+        arguments: "",
+        listener(result) {
+            console.log("The exit code", result.exitCode);
+        }
+    }, result => {
+        console.log("Result UUID is " + result.uuid);
+
+        // release it.
+        fin.desktop.System.releaseExternalProcess(result.uuid, () => {
+            console.log("Process has been unmapped!");
+        }, reason => {
+            console.log("failure: " + reason);
+        });
+    });
+    // removeEventListener
+    const aRegisteredListener = (event: fin.SystemBaseEvent) => { };
+    fin.desktop.System.removeEventListener("monitor-info-changed", aRegisteredListener, () => {
+        console.log("successful");
+    }, err => {
+        console.log("failure: " + err);
+    });
+    //setMinLogLevel
+    fin.desktop.System.setMinLogLevel("log level", () => console.log('Success'), err => console.error(err));
+    // showDeveloperTools
+    fin.desktop.System.showDeveloperTools("uuid", "name", () => {
+        console.log("successful");
+    }, err => {
+        console.log("failure: " + err);
+    });
+    // terminateExternalProcess
+    fin.desktop.System.launchExternalProcess({
+        // notepad is in the system's PATH
+        path: "notepad",
+        arguments: "",
+        listener(result) {
+            console.log("The exit code", result.exitCode);
+        }
+    }, result => {
+        console.log("Result UUID is " + result.uuid);
+
+        // Attempt to close the process. Terminate after 4 seconds if it
+        // has not done so.
+        fin.desktop.System.terminateExternalProcess(result.uuid, 4000, info => {
+            console.log("Termination result " + info.result);
+        }, reason => {
+            console.log("failure: " + reason);
+        });
+    });
+    // updateProxySettings
+    fin.desktop.System.updateProxySettings("type", "proxyAddress", 8080, () => {
+        console.log('success');
+    }, err => {
+        console.log(err);
+    });
+}
+
+function test_system_clipboard() {
+    // availableFormats
+    fin.desktop.System.Clipboard.availableFormats(null, formats => {
+        formats.forEach(format => console.log(`The format ${format} is available to read`));
+    }, (reason, err) => {
+        console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
+    });
+    // readHtml
+    fin.desktop.System.Clipboard.readHtml(null, html => {
+        console.log(`This is the html from the clipboard: ${html}`);
+    }, (reason, err) => {
+        console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
+    });
+    // readRtf
+    fin.desktop.System.Clipboard.readRtf(null, rtf => {
+        console.log(`This is the rtf from the clipboard: ${rtf}`);
+    }, (reason, err) => {
+        console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
+    });
+    // readText
+    fin.desktop.System.Clipboard.readText(null, text => {
+        console.log(`This is the text from the clipboard: ${text}`);
+    }, (reason, err) => {
+        console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
+    });
+    // write
+    fin.desktop.System.Clipboard.write({
+        text: 'Hello Text!',
+        html: '<h1>Hello Html</h1>',
+        rtf: 'Hello Rtf'
+    }, null, () => {
+        console.log('Success!!');
+    }, (reason, err) => {
+        console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
+    });
+    // writeHtml
+    fin.desktop.System.Clipboard.writeHtml('<h1>Hello World</h1>', null, () => {
+        console.log('Success!!');
+    }, (reason, err) => {
+        console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
+    });
+    // writeRtf
+    fin.desktop.System.Clipboard.writeRtf('Hello World!', null, () => {
+        console.log('Success!!');
+    }, (reason, err) => {
+        console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
+    });
+    // writeText
+    fin.desktop.System.Clipboard.writeText('Hello World', null, () => {
+        console.log('Success!!');
+    }, (reason, err) => {
+        console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
+    });
+}
+
+function test_window() {
+    let finWindow: fin.OpenFinWindow;
+    // constructor
+    finWindow = new fin.desktop.Window({
+        name: "childWindow",
+        url: "child.html",
+        defaultWidth: 320,
+        defaultHeight: 320,
+        defaultTop: 10,
+        defaultLeft: 300,
+        frame: false,
+        resizable: false,
+        state: "normal"
+    }, () => {
+        const _win = finWindow.getNativeWindow();
+        _win.addEventListener("DOMContentLoaded", () => { finWindow.show(); });
+    }, error => {
+        console.log("Error creating window:", error);
+    });
+    // getCurrent
+    finWindow = fin.desktop.Window.getCurrent();
+    // getNativeWindow
+    let nativeWindow: Window;
+    nativeWindow = finWindow.getNativeWindow();
+    // getParentApplication
+    let parentApp: fin.OpenFinApplication;
+    parentApp = finWindow.getParentApplication();
+    // getParentWindow
+    let parentFinWindow: fin.OpenFinWindow;
+    parentFinWindow = finWindow.getParentWindow();
+    // wrap
+    finWindow = fin.desktop.Window.wrap("uuid", "name");
+    // addEventListener
+    finWindow.addEventListener("bounds-changed", event => {
+        console.log("The window has been moved or resized");
+    }, () => {
+        console.log("The registration was successful");
+    }, reason => {
+        console.log("failure:" + reason);
+    });
+    // animate
+    finWindow.animate({
+        opacity: {
+            opacity: 0.15,
+            duration: 1000
+        },
+        position: {
+            left: 10,
+            top: 10,
+            duration: 3000
+        }
+    }, {
+            interrupt: false
+        }, evt => {
+            // Callback will only fire after both "opacity" and "position" have finished animating.
+        });
+    // authenticate
+    finWindow.addEventListener('auth-requested', evt => {
+        finWindow.authenticate('userName', 'P@assw0rd', () => { }, (reason, err) => {
+            console.log("failure:", err);
+        });
+    });
+    // blur
+    finWindow.blur();
+    // bringToFront
+    finWindow.bringToFront();
+    // close
+    finWindow.close();
+    // disableFrame
+    finWindow.disableFrame();
+    // enableFrame
+    finWindow.enableFrame();
+    // flash
+    finWindow.flash();
+    // focus
+    finWindow.focus();
+    // getBounds
+    finWindow.getBounds(bounds => {
+        console.log(`top: ${bounds.top} left: ${bounds.left} height: ${bounds.height} width: ${bounds.width}`);
+    });
+    // getOptions
+    finWindow.getOptions(options => {
+        console.log(options);
+    });
+    // getSnapshot
+    finWindow.getSnapshot(base64Snapshot => {
+        console.log("data:image/png;base64," + base64Snapshot);
+    });
+    // getState
+    finWindow.getState(state => {
+        console.log("state: " + state);
+    });
+    // getZoomLevel
+    finWindow.getZoomLevel(level => {
+        console.log("zoom level: " + level);
+    }, error => {
+        console.log('error:', error);
+    });
+    // hide
+    finWindow.hide();
+    // isShowing
+    finWindow.isShowing(showing => {
+        console.log("the window is " + (showing ? "showing" : "hidden"));
+    });
+    // joinGroup
+    let secondWindow = new fin.desktop.Window({
+        url: "http://www.openfin.co",
+        name: "secondWindow",
+        autoShow: true
+    }, () => {
+        // When mainWindow moves or is moved, secondWindow moves by the same amount
+        secondWindow.joinGroup(finWindow);
+    });
+    // leaveGroup
+    secondWindow = new fin.desktop.Window({
+        url: "http://www.openfin.co",
+        name: "secondWindow",
+        autoShow: true
+    }, () => {
+        // When finWindow moves or is moved, secondWindow moves by the same amount
+        secondWindow.joinGroup(finWindow, () => {
+            // once we are in the group, lets leave it.
+            secondWindow.leaveGroup();
+        });
+    });
+    // maximize
+    finWindow.maximize();
+    // mergeGroups
+    {
+        const finWindowOne = new fin.desktop.Window({
+            url: "http://www.openfin.co",
+            name: "finWindowOne",
+            autoShow: true
+        });
+        const finWindowTwo = new fin.desktop.Window({
+            url: "http://www.openfin.co",
+            name: "finWindowTwo",
+            autoShow: true
+        });
+        const finWindowThree = new fin.desktop.Window({
+            url: "http://www.openfin.co",
+            name: "finWindowThree",
+            autoShow: true
+        });
+        const finWindowFour = new fin.desktop.Window({
+            url: "http://www.openfin.co",
+            name: "finWindowFour",
+            autoShow: true
+        });
+        // When finWindowOne moves or is moved, finWindowTwo moves by the same amount
+        finWindowOne.joinGroup(finWindowTwo);
+        // When finWindowThree moves or is moved, finWindowFour moves by the same amount
+        finWindowThree.joinGroup(finWindowFour);
+        // finWindowOne, finWindowTwo, finWindowThree, and finWindowFour now move together in the same group
+        finWindowOne.mergeGroups(finWindowThree);
+    }
+    // minimize
+    finWindow.minimize();
+    // moveBy
+    finWindow.moveBy(10, 10);
+    // moveTo
+    finWindow.moveTo(100, 200);
+    // removeEventListener
+    const aRegisteredListener = (event: fin.WindowBaseEvent) => { };
+    finWindow.removeEventListener("bounds-changed", aRegisteredListener);
+    // resizeBy
+    finWindow.resizeBy(10, 10, "top-right");
+    // resizeTo
+    finWindow.resizeTo(10, 10, "top-right");
+    // restore
+    finWindow.restore();
+    // setAsForeground
+    finWindow.setAsForeground();
+    // setBounds
+    finWindow.setBounds(100, 200, 400, 400);
+    // setZoomLevel
+    finWindow.setZoomLevel(10);
+    // show
+    finWindow.show();
+    // showAt
+    finWindow.showAt(10, 10, false);
+    // stopFlashing
+    finWindow.stopFlashing();
+    // updateOptions
+    finWindow.updateOptions({
+        frame: false,
+        maxWidth: 500
+    });
+}
+
+function test_frame() {
+    //wrap
+    const frame = fin.desktop.Frame.wrap('uuid', 'name');
+    //getCurrent
+    const currentFrame = fin.desktop.Frame.getCurrent();
+    // addEventlistener
+    frame.addEventListener('event', () => console.log('on event'), () => console.log('success'), err => console.error(err));
+    //removeEventListener
+    frame.removeEventListener('event', () => console.log('on event'), () => console.log('success'), err => console.error(err));
+    // getInfo
+    frame.getInfo(info => {
+        console.log(info.uuid, info.name, info.entityType, info.parent.uuid, info.parent.name);
+    }, err => console.error(err));
+    // getParentWindow
+    frame.getParentWindow(parent => {
+        console.log(parent.uuid, parent.name, parent.entityType, parent.parent.uuid, parent.parent.name);
+    }, err => console.error(err));
+}
diff --git a/types/openfin/v30/tsconfig.json b/types/openfin/v29/tsconfig.json
similarity index 83%
rename from types/openfin/v30/tsconfig.json
rename to types/openfin/v29/tsconfig.json
index fd3199ceb7..a590982714 100644
--- a/types/openfin/v30/tsconfig.json
+++ b/types/openfin/v29/tsconfig.json
@@ -14,6 +14,11 @@
             "../"
         ],
         "types": [],
+        "paths": {
+            "openfin": [
+                "openfin/v29"
+            ]
+        },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
@@ -21,4 +26,4 @@
         "index.d.ts",
         "openfin-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/openfin/v30/tslint.json b/types/openfin/v29/tslint.json
similarity index 100%
rename from types/openfin/v30/tslint.json
rename to types/openfin/v29/tslint.json
diff --git a/types/openfin/v30/index.d.ts b/types/openfin/v30/index.d.ts
deleted file mode 100644
index 1e69b3b713..0000000000
--- a/types/openfin/v30/index.d.ts
+++ /dev/null
@@ -1,1756 +0,0 @@
-// Type definitions for OpenFin API 17.0
-// Project: https://openfin.co/
-// Definitions by: Chris Barker <https://github.com/chrisbarker>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// based on v6.49.17.14
-// see https://openfin.co/support/technical-faq/#what-do-the-numbers-in-the-runtime-version-mean
-
-/**
- * JavaScript API
- * The JavaScript API allows you to create an HTML/JavaScript application that has access to the native windowing environment,
- * can communicate with other applications and has access to sandboxed system-level features.
- *
- * API Ready
- * When using the OpenFin API, it is important to ensure that it has been fully loaded before making any API calls. To verify
- * that the API is in fact ready, be sure to make any API calls either from within the fin.desktop.main() method or explicitly
- * after it has returned. This avoids the situation of trying to access methods that are not yet fully injected.
- *
- * Overview
- * When running within the OpenFin Runtime your web applications have access to the "fin" namespace and all the modules within the API
- * without the need to include additional source files. You can treat the "fin" namespace as you would the "window", "navigator" or "document" objects.
- */
-declare namespace fin {
-	const desktop: OpenFinDesktop;
-
-	interface OpenFinDesktop {
-		main(f: () => any): void;
-		Application: OpenFinApplicationStatic;
-		ExternalApp: OpenFinExternalApplicationStatic;
-		InterApplicationBus: OpenFinInterApplicationBus;
-		Notification: OpenFinNotificationStatic;
-		System: OpenFinSystem;
-		Window: OpenFinWindowStatic;
-	}
-
-	interface OpenFinApplicationStatic {
-		/**
-		 * Creates a new Application.
-		 * An object representing an application. Allows the developer to create, execute, show/close an application as well as listen to application events.
-		 */
-		new (
-			options: ApplicationOptions,
-			callback?: (successObj: { httpResponseCode: number }) => void,
-			errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): OpenFinApplication;
-		/**
-		 * Launches the given Application manifest.
-		 */
-		createFromManifest(manifestUrl: string, callback?: (app: OpenFinApplication) => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
-		/**
-		 * Returns an Application object that represents an existing application.
-		 */
-		getCurrent(): OpenFinApplication;
-		/**
-		 * Returns an Application object that represents an existing application.
-		 */
-		wrap(uuid: string): OpenFinApplication;
-	}
-
-	/**
-	 * Application
-	 * An object representing an application.Allows the developer to create, execute, show / close an application as well as listen to application events.
-	 */
-	interface OpenFinApplication {
-		/**
-		 * Returns an instance of the main Window of the application
-		 */
-		getWindow(): OpenFinWindow;
-		/**
-		 * Registers an event listener on the specified event.
-		 */
-		addEventListener(
-			type: OpenFinApplicationEventType,
-			listener: (event: ApplicationBaseEvent
-				| TrayIconClickedEvent
-				| WindowEvent
-				| WindowAlertRequestedEvent
-				| WindowAuthRequested
-				| WindowNavigationRejectedEvent
-				| WindowEndLoadEvent) => void,
-			callback?: () => void,
-			errorCallback?: (reason: string) => void): void;
-		/**
-		 * Closes the application and any child windows created by the application.
-		 */
-		close(force?: boolean, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves an array of wrapped fin.desktop.Windows for each of the application's child windows.
-		 */
-		getChildWindows(callback?: (children: OpenFinWindow[]) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves an array of active window groups for all of the application's windows. Each group is represented as an array of wrapped fin.desktop.Windows.
-		 */
-		getGroups(callback?: (groups: OpenFinWindow[][]) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves the JSON manifest that was used to create the application. Invokes the error callback if the application was not created from a manifest.
-		 */
-		getManifest(callback?: (manifest: any) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves UUID of the application that launches this application. Invokes the error callback if the application was created from a manifest.
-		 */
-		getParentUuid(callback?: (uuid: string) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves current configuration of application's shortcuts.
-		 */
-		getShortcuts(callback?: (config: ShortCutConfig) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves information about the application.
-		 */
-		getInfo(callback?: (info: LaunchInfo) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves information about the system tray.
-		 */
-		getTrayIconInfo(callback?: (trayInfo: TrayIconInfo) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Determines if the application is currently running.
-		 */
-		isRunning(callback?: (running: boolean) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Registers a username and an app name for licensing purposes.
-		 */
-		registerUser(userName: string, appName: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Removes a previously registered event listener from the specified event.
-		 */
-		removeEventListener(
-			type: OpenFinApplicationEventType,
-			previouslyRegisteredListener: (event: ApplicationBaseEvent
-				| TrayIconClickedEvent
-				| WindowEvent
-				| WindowAlertRequestedEvent
-				| WindowAuthRequested
-				| WindowNavigationRejectedEvent
-				| WindowEndLoadEvent) => any,
-			callback?: () => void,
-			errorCallback?: (reason: string) => void): void;
-		/**
-		 * Removes the application's icon from the tray.
-		 */
-		removeTrayIcon(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Restarts the application.
-		 */
-		restart(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Runs the application. When the application is created, run must be called.
-		 */
-		run(callback?: (successObj: SuccessObj) => void, errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): void;
-		/**
-		 * Tells the rvm to relaunch the main application once upon a complete shutdown
-		 */
-		scheduleRestart(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Sets new shortcut configuration for current application.
-		 * Application has to be launched with a manifest and has to have shortcut configuration (icon url, name, etc.) in its manifest to
-		 * be able to change shortcut states.
-		 */
-		setShortcuts(config: ShortCutConfig, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Adds a customizable icon in the system tray and notifies the application when clicked.
-		 */
-		setTrayIcon(iconUrl: string, listener: (clickInfo: TrayIconClickedEvent) => void, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Closes the application by terminating its process.
-		 */
-		terminate(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Waits for a hanging application. This method can be called in response to an application "not-responding" to allow the application
-		 * to continue and to generate another "not-responding" message after a certain period of time.
-		 */
-		wait(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * The Application's uuid
-		 */
-		uuid: string;
-	}
-
-	interface ShortCutConfig {
-		/**
-		 * application has a shortcut on the desktop
-		 */
-		desktop?: boolean;
-		/**
-		 * application has no shortcut in the start menu
-		 */
-		startMenu?: boolean;
-		/**
-		 * application will be launched on system startup
-		 */
-		systemStartup?: boolean;
-	}
-
-	interface SuccessObj {
-		httpResponseCode: number;
-	}
-
-	interface NetworkErrorInfo extends ErrorInfo {
-		networkErrorCode: number;
-	}
-
-	interface ErrorInfo {
-		stack: string;
-		message: string;
-	}
-
-	interface ApplicationOptions {
-		/**
-		 * The name of the application.
-		 */
-		name?: string;
-		/**
-		 * The url to the application.
-		 */
-		url?: string;
-		/**
-		 * The UUID of the application, unique within the set of all other applications running in the OpenFin Runtime. name and uuid must match.
-		 */
-		uuid?: string;
-		/**
-		 * Enable Flash at the application level. Default: false.
-		 */
-		plugins?: boolean;
-		/**
-		 * The options of the main window of the application.
-		 */
-		mainWindowOptions?: WindowOptions;
-	}
-
-	interface WindowOptions {
-		/**
-		 * Enable keyboard shortcuts for devtools and zoom. Default: false for both.
-		 */
-		accelerator?: {
-			devtools?: boolean,
-			zoom?: boolean,
-			reload?: boolean,
-			reloadIgnoreCache?: boolean,
-		};
-		/**
-		 * A flag to always position the window at the top of the window stack. Default: false.
-		 * Updatable
-		 */
-		alwaysOnTop?: boolean;
-		/**
-		 * A flag to automatically show the Window when it is created. Default: false.
-		 */
-		autoShow?: boolean;
-		/**
-		 * A flag to show the context menu when right-clicking on a window. Gives access to the Developer Console for the Window. Default: true
-		 * Updatable
-		 */
-		contextMenu?: boolean;
-		/**
-		 * This defines and applies rounded corners for a frameless window. Default for both width and height: 0.
-		 * Updatable
-		 */
-		cornerRounding?: {
-			width?: number;
-			height?: number;
-		};
-		/**
-		 * A field that the user can attach serializable data to to be ferried around with the window options. Default: ''.
-		 */
-		customData?: any;
-		/**
-		 * Specifies that the window will be positioned in the center of the primary monitor when loaded for the first time on a machine.
-		 * When the window corresponding to that id is loaded again, the position from before the window was closed is used.
-		 * This option overrides defaultLeft and defaultTop. Default: false.
-		 */
-		defaultCentered?: boolean;
-		/**
-		 * The default height of the window. Specifies the height of the window when loaded for the first time on a machine.
-		 *  When the window corresponding to that id is loaded again, the height is taken to be the last height of the window before it was closed. Default: 500.
-		 */
-		defaultHeight?: number;
-		/**
-		 * The default left position of the window. Specifies the position of the left of the window when loaded for the first time on a machine.
-		 *  When the window corresponding to that id is loaded again, the value of left is taken to be the last value before the window was closed. Default: 100.
-		 */
-		defaultWidth?: number;
-		/**
-		 * The default top position of the window. Specifies the position of the top of the window when loaded for the first time on a machine.
-		 * When the window corresponding to that id is loaded again, the value of top is taken to be the last value before the window was closed. Default: 100.
-		 */
-		defaultTop?: number;
-		/**
-		 * The default width of the window. Specifies the width of the window when loaded for the first time on a machine.
-		 * When the window corresponding to that id is loaded again, the width is taken to be the last width of the window before it was closed. Default: 800.
-		 */
-		defaultLeft?: number;
-		/**
-		 * A flag to show the frame. Default: true.
-		 * Updatable
-		 */
-		frame?: boolean;
-		/**
-		 * A flag to allow a window to be hidden when the close button is clicked.Default: false.
-		 * Updatable
-		 */
-		hideOnClose?: boolean;
-		/**
-		 * A URL for the icon to be shown in the window title bar and the taskbar.Default: The parent application's applicationIcon.
-		 * Updatable
-		 */
-		icon?: string;
-		/**
-		 * The maximum height of a window.Will default to the OS defined value if set to - 1. Default: -1.
-		 * Updatable
-		 */
-		maxHeight?: number;
-		/**
-		 * A flag that lets the window be maximized.Default: true.
-		 * Updatable
-		 */
-		maximizable?: boolean;
-		/**
-		 * The maximum width of a window.Will default to the OS defined value if set to - 1. Default: -1.
-		 * Updatable
-		 */
-		maxWidth?: number;
-		/**
-		 * The minimum height of a window.Default: 0.
-		 * Updatable
-		 */
-		minHeight?: number;
-		/**
-		 * A flag that lets the window be minimized.Default: true.
-		 */
-		minimizable?: boolean;
-		/**
-		 * The minimum width of a window.Default: 0.
-		 */
-		minWidth?: number;
-		/**
-		 * The name for the window which must be unique within the context of the invoking Application.
-		 */
-		name?: string;
-		/**
-		 * A flag that specifies how transparent the window will be.This value is clamped between 0.0 and 1.0.Default: 1.0.
-		 * Updatable
-		 */
-		opacity?: number;
-		/**
-		 * A flag to drop to allow the user to resize the window.Default: true.
-		 * Updatable
-		 */
-		resizable?: boolean;
-		/**
-		 * Defines a region in pixels that will respond to user mouse interaction for resizing a frameless window.
-		 * Updatable
-		 */
-		resizeRegion?: {
-			/**
-			 * The size in pixels (Default: 2),
-			 */
-			size?: number;
-			/**
-			 * The size in pixels of an additional
-			 * square resizable region located at the
-			 * bottom right corner of a
-			 * frameless window. (Default: 4)
-			 */
-			bottomRightCorner?: number;
-		};
-		/**
-		 * A flag to show the Window's icon in the taskbar. Default: true.
-		 */
-		showTaskbarIcon?: boolean;
-		/**
-		 * A flag to cache the location of the window or not. Default: true.
-		 */
-		saveWindowState?: boolean;
-		/**
-		 * Specify a taskbar group for the window. Default: app's uuid.
-		 */
-		taskbarIconGroup?: string;
-		/**
-		 * A string that sets the window to be "minimized", "maximized", or "normal" on creation. Default: "normal".
-		 */
-		state?: string;
-		/**
-		 * The URL of the window. Default: "about:blank".
-		 */
-		url?: string;
-		/**
-		 * When set to false, the window will render before the "load" event is fired on the content's window.
-		 * Caution, when false you will see an initial empty white window. Default: true.
-		 */
-		waitForPageLoad?: boolean;
-	}
-
-	/**
-	 * Clipboard
-	 * Clipboard API allows reading and writting to the clipboard in multiple formats.
-	 */
-	interface OpenFinClipboard {
-		/**
-		 * Reads available formats for the clipboard type
-		 */
-		availableFormats(type: string | null, callback?: (formats: string[]) => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
-		/**
-		 * Reads available formats for the clipboard type
-		 */
-		readHtml(type: string | null, callback?: (html: string) => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
-		/**
-		 * Read the content of the clipboard as Rtf
-		 */
-		readRtf(type: string | null, callback?: (rtf: string) => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
-		/**
-		 * Read the content of the clipboard as plain text
-		 */
-		readText(type: string | null, callback?: (text: string) => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
-		/**
-		 * Writes data into the clipboard
-		 */
-		write(data: any, type: string | null, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
-		/**
-		 * Writes data into the clipboard as Html
-		 */
-		writeHtml(data: string, type: string | null, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
-		/**
-		 * Writes data into the clipboard as Rtf
-		 */
-		writeRtf(data: string, type: string | null, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
-		/**
-		 * Writes data into the clipboard as plain text
-		 */
-		writeText(data: string, type: string | null, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
-	}
-
-	interface OpenFinExternalApplicationStatic {
-		/**
-		 * Returns an External Application object that represents an existing external application.
-		 */
-		wrap(uuid: string): OpenFinExternalApplication;
-	}
-	/**
-	 * ExternalApplication
-	 * An object representing an application. Allows the developer to create, execute, show and close an application, as well as listen to application events.
-	 */
-	interface OpenFinExternalApplication {
-		/**
-		 * Registers an event listener on the specified event.
-		 */
-		addEventListener(
-			type: OpenFinExternalApplicationEventType,
-			listener: () => void,
-			callback?: () => void,
-			errorCallback?: (reason: string, error: ErrorInfo) => void): void;
-		/**
-		 * Removes a previously registered event listener from the specified event.
-		 */
-		removeEventListener(
-			type: OpenFinExternalApplicationEventType,
-			listener: () => void,
-			callback?: () => void,
-			errorCallback?: (reason: string, error: ErrorInfo) => void): void;
-	}
-
-	/**
-	 * InterApplicationBus
-	 * A messaging bus that allows for pub/sub messaging between different applications.
-	 */
-	interface OpenFinInterApplicationBus {
-		/**
-		 * Adds a listener that gets called when applications subscribe to the current application's messages.
-		 */
-		addSubscribeListener(listener: (uuid: string, topic: string, name: string) => void): void;
-		/**
-		 * Adds a listener that gets called when applications unsubscribe to the current application's messages.
-		 */
-		addUnsubscribeListener(listener: (uuid: string, topic: string, name: string) => void): void;
-		/**
-		 * Removes a previously registered subscribe listener.
-		 */
-		removeSubscribeListener(listener: (uuid: string, topic: string, name: string) => void): void;
-		/**
-		 * Removes a previously registered unsubscribe listener.
-		 */
-		removeUnsubscribeListener(listener: (uuid: string, topic: string, name: string) => void): void;
-		/**
-		 * Publishes a message to all applications running on OpenFin Runtime that are subscribed to the specified topic.
-		 */
-		publish(topic: string, message: any, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Sends a message to a specific application on a specific topic.
-		 */
-		send(destinationUuid: string, name: string, topic: string, message: any, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		send(destinationUuid: string, topic: string, message: any, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Subscribes to messages from the specified application on the specified topic. If the subscription is for a uuid, [name],
-		 * topic combination that has already been published to upon subscription you will receive the last 20 missed messages in the order they were published.
-		 */
-		subscribe(
-			senderUuid: string,
-			name: string,
-			topic: string,
-			listener: (message: any, uuid: string, name: string) => void,
-			callback?: () => void,
-			errorCallback?: (reason: string) => void): void;
-		subscribe(
-			senderUuid: string,
-			topic: string,
-			listener: (message: any, uuid: string, name: string) => void,
-			callback?: () => void,
-			errorCallback?: (reason: string) => void): void;
-		/**
-		 * Unsubscribes to messages from the specified application on the specified topic.
-		 */
-		unsubscribe(
-			senderUuid: string,
-			name: string,
-			topic: string,
-			listener: (message: any, uuid: string, name: string) => void,
-			callback?: () => void,
-			errorCallback?: (reason: string) => void): void;
-		unsubscribe(
-			senderUuid: string,
-			topic: string,
-			listener: (message: any, uuid: string, name: string) => void,
-			callback?: () => void,
-			errorCallback?: (reason: string) => void): void;
-	}
-
-	interface OpenFinNotificationStatic {
-		/**
-		 * ctor
-		 */
-		new (options: NotificationOptions, callback?: () => void, errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): OpenFinNotification;
-		/**
-		 * Gets an instance of the current notification. For use within a notification window to close the window or send a message back to its parent application.
-		 */
-		getCurrent(): OpenFinNotification;
-	}
-
-	/**
-	 * Notification
-	 * Notification represents a window on OpenFin Runtime which is shown briefly to the user on the bottom-right corner of the primary monitor.
-	 * A notification is typically used to alert the user of some important event which requires his or her attention.
-	 * Notifications are a child or your application that are controlled by the runtime.
-	 */
-	interface OpenFinNotification {
-		/**
-		 * Closes the notification.
-		 */
-		close(callback?: () => void): void;
-		/**
-		 * Sends a message to the notification.
-		 */
-		sendMessage(message: any, callback?: () => void): void;
-		/**
-		 * Sends a message from the notification to the application that created the notification. The message is handled by the notification's onMessage callback.
-		 */
-		sendMessageToApplication(message: any, callback?: () => void): void;
-	}
-
-	interface NotificationOptions {
-		/**
-		 * A boolean that will force dismissal even if the mouse is hovering over the notification
-		 */
-		ignoreMouseOver?: boolean;
-		/**
-		 * A message of any primitive or composite-primitive type to be passed to the notification upon creation.
-		 */
-		message?: any;
-		/**
-		 * The timeout for displaying a notification.Can be in milliseconds or "never".
-		 */
-		duration?: number | "never";
-		/**
-		 * The url of the notification
-		 */
-		url?: string;
-		/**
-		 * A function that is called when a notification is clicked.
-		 */
-		onClick?(callback: () => void): void;
-		/**
-		 * Invoked when the notification is closed via .close() method on the created notification instance
-		 * or the by the notification itself via fin.desktop.Notification.getCurrent().close().
-		 * NOTE: this is not invoked when the notification is dismissed via a swipe. For the swipe dismissal callback see onDismiss
-		 */
-		onClose?(callback: () => void): void;
-		/**
-		 * Invoked when a the notification is dismissed by swiping it off the screen to the right. NOTE: this is no fired on a programmatic close.
-		 */
-		onDismiss?(callback: () => void): void;
-		/**
-		 * A function that is called when an error occurs.The reason for the error is passed as an argument.
-		 */
-		onError?(errorCallback: (reason: string, errorObj: NetworkErrorInfo) => void): void;
-		/**
-		 * The onMessage function will respond to messages sent from notification.sendMessageToApplication.
-		 * The function is passed the message, which can be of any primitive or composite-primitive type.
-		 */
-		onMessage?(callback: (message: any) => void): void;
-		/**
-		 * A function that is called when a notification is shown.
-		 */
-		onShow?(callback: (successObj: SuccessObj) => void): void;
-	}
-
-	/**
-	 * System
-	 * An object representing the core of OpenFin Runtime.
-	 * Allows the developer to perform system-level actions, such as accessing logs, viewing processes, clearing the cache and exiting the runtime.
-	 */
-	interface OpenFinSystem {
-		Clipboard: OpenFinClipboard;
-		/**
-		 * Registers an event listener on the specified event.
-		 */
-		addEventListener(
-			type: OpenFinSystemEventType,
-			listener: (event: SystemBaseEvent | DesktopIconClickedEvent | IdleStateChangedEvent | MonitorInfoChangedEvent | SessionChangedEvent) => void,
-			callback?: () => void,
-			errorCallback?: (reason: string) => void): void;
-		/**
-		 * Clears cached data containing window state/positions,
-		 * application resource files (images, HTML, JavaScript files), cookies, and items stored in the Local Storage.
-		 */
-		clearCache(options: CacheOptions, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Clears all cached data when OpenFin Runtime exits.
-		 */
-		deleteCacheOnExit(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Downloads the given application asset
-		 */
-		downloadAsset(
-			assetObj: AppAssetInfo,
-			progressListener?: (progress: { downloadedBytes: number, totalBytes: number }) => void,
-			callback?: (successObj: { path: string }) => void,
-			errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): void;
-		/**
-		 * Exits the Runtime.
-		 */
-		exit(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves an array of data for all applications.
-		 */
-		getAllApplications(callback?: (applicationInfoList: ApplicationInfo[]) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves an array of data for all external applications.
-		 */
-		getAllExternalApplications(callback?: (applicationInfoList: ApplicationInfo[]) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves an array of data (name, ids, bounds) for all application windows.
-		 */
-		getAllWindows(callback?: (windowInfoList: WindowDetails[]) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves the command line argument string that started OpenFin Runtime.
-		 */
-		getCommandLineArguments(callback?: (args: string) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves the configuration object that started the OpenFin Runtime.
-		 */
-		getDeviceId(callback?: (uuid: string) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Gets the value of a given environment variable on the computer on which the runtime is installed.
-		 */
-		getEnvironmentVariable(envVar: string, callback?: (variable: string) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves system information.
-		 */
-		getHostSpecs(callback?: (info: HostSpecInfo) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves the contents of the log with the specified filename.
-		 */
-		getLog(logFileName: string, callback?: (variable: string) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves an array containing information for each log file.
-		 */
-		getLogList(callback?: (logInfoList: LogInfo[]) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves an object that contains data about the about the monitor setup of the computer that the runtime is running on.
-		 */
-		getMonitorInfo(callback?: (monitorInfo: MonitorInfo) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Returns the mouse in virtual screen coordinates (left, top).
-		 */
-		getMousePosition(callback?: (mousePosition: VirtualScreenCoordinates) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves an array of all of the runtime processes that are currently running.
-		 * Each element in the array is an object containing the uuid and the name of the application to which the process belongs.
-		 */
-		getProcessList(callback?: (processInfoList: ProcessInfo[]) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves the Proxy settings.
-		 */
-		getProxySettings(callback?: (proxy: ProxyInfo) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Returns information about the running RVM in an object.
-		 */
-		getRvmInfo(callback?: (rvmInfo: RvmInfo) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Returns the version of the runtime. The version contains the major, minor, build and revision numbers.
-		 */
-		getVersion(callback?: (version: string) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Runs an executable or batch file.
-		 */
-		launchExternalProcess(options: ExternalProcessLaunchInfo, callback?: (payload: { uuid: string }) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Writes the passed message into both the log file and the console.
-		 */
-		log(level: "debug" | "info" | "warn" | "error", message: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Monitors a running process.
-		 */
-		monitorExternalProcess(options: ExternalProcessInfo, callback?: (payload: { uuid: string }) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Opens the passed URL in the default web browser.
-		 */
-		openUrlWithBrowser(url: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * This function call will register a unique id and produce a token. The token can be used to broker an external connection.
-		 */
-		registerExternalConnection(
-			uuid: string,
-			callback?: (detail: {
-				/**
-				 * this will be unique each time
-				 */
-				token: string;
-				/**
-				 * "remote-connection-uuid"
-				 */
-				uuid: string;
-			}) => void,
-			errorCallback?: (reason: string) => void): void;
-		/**
-		 * Removes the process entry for the passed UUID obtained from a prior call of fin.desktop.System.launchExternalProcess().
-		 */
-		releaseExternalProcess(processUuid: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Removes a previously registered event listener from the specified event.
-		 */
-		removeEventListener(
-			type: OpenFinSystemEventType,
-			listener: (event: SystemBaseEvent | DesktopIconClickedEvent | IdleStateChangedEvent | MonitorInfoChangedEvent | SessionChangedEvent) => void,
-			callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Shows the Chrome Developer Tools for the specified window.
-		 */
-		showDeveloperTools(uuid: string, name: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Attempt to close an external process. The process will be terminated if it has not closed after the elapsed timeout in milliseconds.
-		 */
-		terminateExternalProcess(
-			processUuid: string,
-			timeout: number,
-			killTree: boolean,
-			callback?: (info: { result: "clean" | "terminated" | "failed" }) => void,
-			errorCallback?: (reason: string) => void): void;
-		terminateExternalProcess(
-			processUuid: string,
-			timeout: number,
-			callback?: (info: { result: "clean" | "terminated" | "failed" }) => void,
-			errorCallback?: (reason: string) => void): void;
-		/**
-		 * Update the OpenFin Runtime Proxy settings.
-		 */
-		updateProxySettings(type: string, address: string, port: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
-	}
-
-	interface CacheOptions {
-		cache?: boolean;
-		cookies?: boolean;
-		localStorage?: boolean;
-		appcache?: boolean;
-		userData?: boolean;
-	}
-
-	interface AppAssetInfo {
-		src?: string;
-		alias?: string;
-		version?: string;
-		target?: string;
-		args?: string;
-	}
-
-	interface ApplicationInfo {
-		/**
-		 * true when the application is running.
-		 */
-		isRunning?: boolean;
-		/**
-		 * uuid of the application.
-		 */
-		uuid?: string;
-		/**
-		 * uuid of the application that launches this application.
-		 */
-		parentUuid?: string;
-	}
-
-	interface WindowDetails {
-		uuid?: string;
-		mainWindow?: WindowInfo;
-		childWindows?: WindowInfo[];
-	}
-
-	interface WindowInfo {
-		/**
-		 * name of the child window
-		 */
-		name?: string;
-		/**
-		 * top-most coordinate of the child window
-		 */
-		top?: number;
-		/**
-		 * right-most coordinate of the child window
-		 */
-		right?: number;
-		/**
-		 * bottom-most coordinate of the child window
-		 */
-		bottom?: number;
-		/**
-		 * left-most coordinate of the child window
-		 */
-		left?: number;
-	}
-
-	interface HostSpecInfo {
-		/**
-		 * "x86" for 32-bit or "x86_64" for 64-bit
-		 */
-		arch: string;
-		/**
-		 * Same payload as Node's os.cpus()
-		 */
-		cpus: NodeCpuInfo[];
-		gpu: {
-			/**
-			 * Graphics card name
-			 */
-			name: string;
-		};
-		/**
-		 * Same payload as Node's os.totalmem()
-		 */
-		memory: number;
-		/**
-		 * OS name and version/edition
-		 */
-		name: string;
-	}
-
-	interface NodeCpuInfo {
-		model: string;
-		/**
-		 * in MHz
-		 */
-		speed: number;
-		times: {
-			/**
-			 * The number of milliseconds the CPU has spent in user mode.
-			 */
-			user: number;
-			/**
-			 * The number of milliseconds the CPU has spent in nice mode.
-			 */
-			nice: number;
-			/**
-			 * The number of milliseconds the CPU has spent in sys mode.
-			 */
-			sys: number;
-			/**
-			 * The number of milliseconds the CPU has spent in idle mode.
-			 */
-			idle: number;
-			/**
-			 * The number of milliseconds the CPU has spent in irq mode.
-			 */
-			irq: number;
-		};
-	}
-
-	interface LogInfo {
-		/**
-		 * the filename of the log
-		 */
-		name?: string;
-		/**
-		 * the size of the log in bytes
-		 */
-		size?: number;
-		/**
-		 * the unix time at which the log was created "Thu Jan 08 2015 14:40:30 GMT-0500 (Eastern Standard Time)"
-		 */
-		date?: string;
-	}
-
-	interface ProcessInfo {
-		/**
-		 * the percentage of total CPU usage
-		 */
-		cpuUsage?: number;
-		/**
-		 * the application name
-		 */
-		name?: string;
-		/**
-		 * the current nonpaged pool usage in bytes
-		 */
-		nonPagedPoolUsage?: number;
-		/**
-		 * the number of page faults
-		 */
-		pageFaultCount?: number;
-		/**
-		 * the current paged pool usage in bytes
-		 */
-		pagedPoolUsage?: number;
-		/**
-		 * the total amount of memory in bytes that the memory manager has committed
-		 */
-		pagefileUsage?: number;
-		/**
-		 * the peak nonpaged pool usage in bytes
-		 */
-		peakNonPagedPoolUsage?: number;
-		/**
-		 * the peak paged pool usage in bytes
-		 */
-		peakPagedPoolUsage?: number;
-		/**
-		 * the peak value in bytes of pagefileUsage during the lifetime of this process
-		 */
-		peakPagefileUsage?: number;
-		/**
-		 * the peak working set size in bytes
-		 */
-		peakWorkingSetSize?: number;
-		/**
-		 * the native process identifier
-		 */
-		processId?: number;
-		/**
-		 * the application UUID
-		 */
-		uuid?: string;
-		/**
-		 * the current working set size (both shared and private data) in bytes
-		 */
-		workingSetSize?: number;
-	}
-
-	interface ProxyInfo {
-		/**
-		 * the configured Proxy Address
-		 */
-		proxyAddress?: string;
-		/**
-		 * the configured Proxy port
-		 */
-		proxyPort?: number;
-		/**
-		 * Proxy Type
-		 */
-		type?: string;
-	}
-
-	interface RvmInfo {
-		version?: string;
-		"start-time"?: string;
-	}
-
-	interface ExternalProcessLaunchInfo {
-		path?: string;
-		/**
-		 * Additionally note that the executable found in the zip file specified in appAssets
-		 * will default to the one mentioned by appAssets.target
-		 * If the the path below refers to a specific path it will override this default
-		 */
-		alias?: string;
-		/**
-		 * When using alias; if no arguments are passed then the arguments (if any)
-		 * are taken from the 'app.json' file, from the  'args' parameter
-		 * of the 'appAssets' Object with the relevant 'alias'.
-		 * If 'arguments' is passed as a parameter it takes precedence
-		 * over any 'args' set in the 'app.json'.
-		 */
-		arguments?: string;
-		listener?(result: {
-			/**
-			 * "Exited" Or "released" on a call to releaseExternalProcess
-			 */
-			topic?: string;
-			/**
-			 * The mapped UUID which identifies the launched process
-			 */
-			uuid?: string;
-			/*
-			 * Process exit code
-			 */
-			exitCode?: number;
-		}): void;
-		certificate?: CertificationInfo;
-	}
-
-	interface CertificationInfo {
-		/**
-		 * A hex string with or without spaces
-		 */
-		serial?: string;
-		/**
-		 * An internally tokenized and comma delimited string allowing partial or full checks of the subject fields
-		 */
-		subject?: string;
-		/**
-		 * A hex string with or without spaces
-		 */
-		publickey?: string;
-		/**
-		 * A hex string with or without spaces
-		 */
-		thumbprint?: string;
-		/**
-		 * A boolean indicating that the certificate is trusted and not revoked
-		 */
-		trusted?: boolean;
-	}
-
-	interface ExternalProcessInfo {
-		pid?: number;
-		listener?(result: {
-			/**
-			 * "Exited" Or "released" on a call to releaseExternalProcess
-			 */
-			topic?: string;
-			/**
-			 * The mapped UUID which identifies the launched process
-			 */
-			uuid?: string;
-			/*
-				* Process exit code
-				*/
-			exitCode?: number;
-		}): void;
-	}
-
-	interface OpenFinWindowStatic {
-		/**
-		 * Class: Window
-		 *
-		 * new Window(options, callbackopt, errorCallbackopt)
-		 *
-		 * Creates a new OpenFin Window
-		 *
-		 * A basic window that wraps a native HTML window. Provides more fine-grained control over the window state such as the ability to minimize,
-		 * maximize, restore, etc. By default a window does not show upon instantiation; instead the window's show() method must be invoked manually.
-		 * The new window appears in the same process as the parent window.
-		 * @param options - The options of the window
-		 * @param [callback] - Called if the window creation was successful
-		 * @param [callback.successObj] - httpResponseCode
-		 */
-		new (
-			options: WindowOptions,
-			callback?: (successObj: { httpResponseCode: number }) => void,
-			errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): OpenFinWindow;
-		/**
-		 * Returns an instance of the current window.
-		 * @returns Current window
-		 */
-		getCurrent(): OpenFinWindow;
-		/**
-		 * Returns a Window object that wraps an existing window.
-		 */
-		wrap(appUuid: string, windowName: string): OpenFinWindow;
-	}
-
-	/**
-	 * Window
-	 * A basic window that wraps a native HTML window. Provides more fine-grained control over the window state such as the ability to minimize,
-	 * maximize, restore, etc. By default a window does not show upon instantiation; instead the window's show() method must be invoked manually.
-	 * The new window appears in the same process as the parent window.
-	 */
-	interface OpenFinWindow {
-		/**
-		 * Name of window
-		 */
-		name: string;
-		/**
-		 * Returns the native JavaScript "window" object for the window. This method can only be used by the parent application or the window itself,
-		 * otherwise it will return undefined. The same Single-Origin-Policy (SOP) rules apply for child windows created by window.open(url) in that the
-		 * contents of the window object are only accessible if the URL has the same origin as the invoking window. See example below.
-		 * Also, will not work with fin.desktop.Window objects created with fin.desktop.Window.wrap().
-		 * @returns Native window
-		 */
-		getNativeWindow(): Window;
-		/**
-		 * Gets the parent application.
-		 * @returns Parent application
-		 */
-		getParentApplication(): OpenFinApplication;
-		/**
-		 * Gets the parent window.
-		 */
-		getParentWindow(): OpenFinWindow;
-		/**
-		 * Registers an event listener on the specified event.
-		 */
-		addEventListener(
-			type: OpenFinWindowEventType,
-			listener: (event: WindowBaseEvent
-				| WindowAuthRequestedEvent
-				| WindowBoundsEvent
-				| WindowExternalProcessStartedEvent
-				| WindowExternalProcessExited
-				| WindowGroupChangedEvent
-				| WindowHiddenEvent
-				| Window_NavigationRejectedEvent) => void,
-			callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Performs the specified window transitions
-		 */
-		animate(transitions: AnimationTransition, options: AnimationOptions, callback?: (event: any) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Provides credentials to authentication requests
-		 */
-		authenticate(userName: string, password: string, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
-		/**
-		 * Removes focus from the window.
-		 */
-		blur(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Brings the window to the front of the OpenFin window stack.
-		 */
-		bringToFront(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Closes the window.
-		 * @param Close will be prevented from closing when force is false and 'close-requested' has been subscribed to for application's main window.
-		 */
-		close(force?: boolean, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Prevents a user from changing a window's size/position when using the window's frame.
-		 * 'disabled-frame-bounds-changing' is generated at the start of and during a user move/size operation.
-		 * 'disabled-frame-bounds-changed' is generated after a user move/size operation.
-		 * The events provide the bounds that would have been applied if the frame was enabled.
-		 * 'frame-disabled' is generated when an enabled frame becomes disabled.
-		 */
-		disableFrame(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Re-enables user changes to a window's size/position when using the window's frame.
-		 * 'disabled-frame-bounds-changing' is generated at the start of and during a user move/size operation.
-		 * 'disabled-frame-bounds-changed' is generated after a user move/size operation.
-		 * The events provide the bounds that would have been applied if the frame was enabled.
-		 * 'frame-enabled' is generated when a disabled frame has becomes enabled.
-		 */
-		enableFrame(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Flashes the window's frame and taskbar icon until the window is activated.
-		 */
-		flash(options?: any, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Gives focus to the window.
-		 */
-		focus(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Gets the current bounds (top, left, width, height) of the window.
-		 */
-		getBounds(callback?: (bounds: WindowBounds) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves an array containing wrapped fin.desktop.Windows that are grouped with this window. If a window is not in a group an empty array is returned.
-		 * Please note that calling window is included in the result array.
-		 */
-		getGroup(callback?: (group: OpenFinWindow[]) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Gets the current settings of the window.
-		 */
-		getOptions(callback?: (options: WindowOptions) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Gets a base64 encoded PNG snapshot of the window.
-		 */
-		getSnapshot(callback?: (base64Snapshot: string) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Gets the current state ("minimized", "maximized", or "restored") of the window.
-		 */
-		getState(callback?: (state: "minimized" | "maximized" | "restored") => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Returns the zoom level of the window.
-		 */
-		getZoomLevel(callback?: (level: number) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Hides the window.
-		 */
-		hide(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Determines if the window is currently showing.
-		 */
-		isShowing(callback?: (showing: boolean) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Joins the same window group as the specified window.
-		 */
-		joinGroup(target: OpenFinWindow, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Leaves the current window group so that the window can be move independently of those in the group.
-		 */
-		leaveGroup(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Maximizes the window.
-		 */
-		maximize(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Merges the instance's window group with the same window group as the specified window
-		 */
-		mergeGroups(target: OpenFinWindow, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Minimizes the window.
-		 */
-		minimize(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Moves the window by a specified amount.
-		 */
-		moveBy(deltaLeft: number, deltaTop: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Moves the window to a specified location.
-		 */
-		moveTo(left: number, top: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Removes a previously registered event listener from the specified event.
-		 */
-		removeEventListener(
-			type: OpenFinWindowEventType,
-			listener: (event: WindowBaseEvent
-				| WindowAuthRequestedEvent
-				| WindowBoundsEvent
-				| WindowExternalProcessStartedEvent
-				| WindowExternalProcessExited
-				| WindowGroupChangedEvent
-				| WindowHiddenEvent
-				| Window_NavigationRejectedEvent) => void,
-			callback?: () => void,
-			errorCallback?: (reason: string) => void): void;
-		/**
-		 * Resizes the window by a specified amount.
-		 */
-		resizeBy(deltaWidth: number, deltaHeight: number, anchor: OpenFinAnchor, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Resizes the window by a specified amount.
-		 */
-		resizeTo(width: number, height: number, anchor: OpenFinAnchor, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Restores the window to its normal state (i.e., unminimized, unmaximized).
-		 */
-		restore(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Will bring the window to the front of the entire stack and give it focus.
-		 */
-		setAsForeground(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Sets the window's size and position
-		 */
-		setBounds(left: number, top: number, width: number, height: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Sets the zoom level of the window.
-		 */
-		setZoomLevel(level: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Shows the window if it is hidden.
-		 * @param Show will be prevented from closing when force is false and 'show-requested' has been subscribed to for application's main window.
-		 */
-		show(force?: boolean, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Shows the window if it is hidden at the specified location. If the toggle parameter is set to true, the window will alternate between showing and hiding.
-		 */
-		showAt(left: number, top: number, force?: boolean, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Stops the taskbar icon from flashing.
-		 */
-		stopFlashing(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Updates the window using the passed options
-		 */
-		updateOptions(options: WindowOptions, callback?: () => void, errorCallback?: (reason: string) => void): void;
-	}
-
-	interface ApplicationBaseEvent {
-		topic: string;
-		type: OpenFinApplicationEventType;
-		uuid: string;
-	}
-
-	interface TrayIconClickedEvent extends ApplicationBaseEvent {
-		button: number; // 0 for left, 1 for middle, 2 for right
-		monitorInfo: MonitorInfo;
-		x: number; // the cursor x coordinate
-		y: number; // the cursor y coordinate
-	}
-
-	interface WindowEvent extends ApplicationBaseEvent {
-		name: string;
-	}
-
-	interface WindowAlertRequestedEvent extends WindowEvent {
-		message: string;
-		url: string;
-	}
-
-	interface WindowAuthRequested extends WindowEvent {
-		authInfo: {
-			host: string;
-			isProxy: boolean;
-			port: number;
-			realm: string;
-			scheme: string;
-		};
-	}
-
-	interface WindowNavigationRejectedEvent extends WindowEvent {
-		sourceName: string;
-		url: string;
-	}
-
-	interface WindowEndLoadEvent extends WindowEvent {
-		documentName: string;
-		isMain: boolean;
-	}
-
-	interface MonitorInfoChangedEvent extends MonitorInfo {
-		topic: "system";
-		type: "monitor-info-changed";
-	}
-
-	interface MonitorInfo {
-		nonPrimaryMonitors: MonitorInfoDetail[];
-		primaryMonitor: MonitorInfoDetail;
-		reason: string;
-		taskbar: {
-			edge: "left" | "right" | "top" | "bottom",
-			rect: MontiorCoordinates
-		};
-		topic: "system";
-		type: "monitor-info-changed";
-		virtualScreen: MontiorCoordinates;
-	}
-
-		interface TrayIconInfo {
-			x: number;
-			y: number;
-			bounds: {
-				x: number;
-				y: number;
-				width: number;
-				height: number;
-			}
-			monitorInfo: MonitorInfo
-		}
-
-	interface MonitorInfoDetail {
-		availableRect: MontiorCoordinates;
-		deviceId: string;
-		displayDeviceActive: boolean;
-		monitorRect: MontiorCoordinates;
-		name: string;
-	}
-
-	interface MontiorCoordinates {
-		bottom: number;
-		left: number;
-		right: number;
-		top: number;
-	}
-
-	interface VirtualScreenCoordinates {
-		left: number;
-		top: number;
-	}
-
-	interface SystemBaseEvent {
-		topic: string;
-		type: OpenFinSystemEventType;
-		uuid: string;
-	}
-
-	interface DesktopIconClickedEvent {
-		mouse: {
-			/**
-			 * the left virtual screen coordinate of the mouse
-			 */
-			left: number,
-			/**
-			 * the top virtual screen coordinate of the mouse
-			 */
-			top: number
-		};
-		/**
-		 * the number of milliseconds that have elapsed since the system was started,
-		 */
-		tickCount: number;
-		topic: "system";
-		type: "desktop-icon-clicked";
-	}
-
-	interface IdleStateChangedEvent {
-		/**
-		 * How long in milliseconds since the user has been idle.
-		 */
-		elapsedTime: number;
-		/**
-		 * true when the user is idle,false when the user has returned;
-		 */
-		isIdle: boolean;
-		topic: "system";
-		type: "idle-state-changed";
-	}
-
-	interface WindowBaseEvent {
-		/**
-		 * the name of the window
-		 */
-		name: string;
-		/**
-		 * always window
-		 */
-		topic: "window";
-		/**
-		 * window event type
-		 */
-		type: OpenFinWindowEventType;
-		/**
-		 * the UUID of the application the window belongs to
-		 */
-		uuid: string;
-	}
-
-	interface WindowAuthRequestedEvent extends WindowBaseEvent {
-		authInfo: {
-			host: string;
-			isProxy: boolean;
-			port: number;
-			realm: string;
-			scheme: string;
-		};
-	}
-
-	interface WindowBoundsEvent extends WindowBaseEvent {
-		/**
-		 * describes what kind of change occurred.
-		 * 0 means a change in position.
-		 * 1 means a change in size.
-		 * 2 means a change in position and size.
-		 */
-		changeType: number;
-		/**
-		 * true when pending changes have been applied to the window.
-		 */
-		deferred: boolean;
-		/**
-		 * the new height of the window.
-		 */
-		height: number;
-		/**
-		 * the left-most coordinate of the window.
-		 */
-		left: number;
-		/**
-		 * the top-most coordinate of the window.
-		 */
-		top: number;
-
-		type: "bounds-changed" | "bounds-changing" | "disabled-frame-bounds-changed" | "disabled-frame-bounds-changing";
-		/**
-		 * the new width of the window.
-		 */
-		width: number;
-	}
-
-	interface WindowExternalProcessStartedEvent extends WindowBaseEvent {
-		/**
-		 * the process handle uuid
-		 */
-		processUuid: string;
-		type: "external-process-started";
-	}
-
-	interface WindowExternalProcessExited extends WindowBaseEvent {
-		/**
-		 * the process exit code
-		 */
-		exitCode: number;
-		/**
-		 * the process handle uuid
-		 */
-		processUuid: string;
-		type: "external-process-exited";
-	}
-
-	interface WindowGroupChangedEvent extends WindowBaseEvent {
-		/**
-		 * Which group array the window that the event listener was registered on is included in:
-		 * 'source' The window is included in sourceGroup.
-		 * 'target' The window is included in targetGroup.
-		 * 'nothing' The window is not included in sourceGroup nor targetGroup.
-		 */
-		memberOf: "source" | "target" | "nothing";
-		/**
-		 * The reason this event was triggered.
-		 * 'leave' A window has left the group due to a leave or merge with group.
-		 * 'join' A window has joined the group.
-		 * 'merge' Two groups have been merged together.
-		 * 'disband' There are no other windows in the group.
-		 */
-		reason: "leave" | "join" | "merge" | "disband";
-		/**
-		 * All the windows in the group the sourceWindow originated from.
-		 */
-		sourceGroup: WindowOfGroupInfo[];
-		/**
-		 * The UUID of the application the sourceWindow belongs to The source window is the window in which (merge/join/leave)group(s) was called.
-		 */
-		sourceWindowAppUuid: string;
-		/**
-		 * the name of the sourcewindow.The source window is the window in which(merge / join / leave) group(s) was called.
-		 */
-		sourceWindowName: string;
-		/**
-		 * All the windows in the group the targetWindow orginated from
-		 */
-		targetGroup: WindowOfGroupInfo[];
-		/**
-		 * The UUID of the application the targetWindow belongs to. The target window is the window that was passed into (merge/join) group(s).
-		 */
-		targetWindowAppUuid: string;
-		/**
-		 * The name of the targetWindow. The target window is the window that was passed into (merge/join) group(s).
-		 */
-		targetWindowName: string;
-		type: "group-changed";
-	}
-
-	interface WindowOfGroupInfo {
-		/**
-		 * The UUID of the application this window entry belongs to.
-		 */
-		appUuid: string;
-		/**
-		 * The name of this window entry.
-		 */
-		windowName: string;
-	}
-
-	interface WindowHiddenEvent extends WindowBaseEvent {
-		/**
-		 * What action prompted the close.
-		 * The reasons are: "hide", "hide-on-close"
-		 */
-		reason: "hide" | "hide-on-close";
-		type: "hidden";
-	}
-
-	interface Window_NavigationRejectedEvent {
-		name: string;
-		/**
-		 * source of navigation window name
-		 */
-		sourceName: string;
-		topic: "navigation-rejected";
-		/**
-		 * Url that was not reached "http://blocked-content.url"
-		 */
-		url: string;
-		/**
-		 * the UUID of the application the window belongs to.
-		 */
-		uuid: string;
-	}
-
-	interface AnimationTransition {
-		opacity?: {
-			/**
-			 * This value is clamped from 0.0 to 1.0
-			 */
-			opacity?: number;
-			/**
-			 * The total time in milliseconds this transition should take.
-			 */
-			duration?: number;
-			/**
-			 * Treat 'opacity' as absolute or as a delta. Defaults to false.
-			 */
-			relative?: boolean;
-		};
-		position?: {
-			/**
-			 * Defaults to the window's current left position in virtual screen coordinates.
-			 */
-			left?: number;
-			/**
-			 * Defaults to the window's current top position in virtual screen coordinates.
-			 */
-			top?: number;
-			/**
-			 * The total time in milliseconds this transition should take.
-			 */
-			duration?: number;
-			/**
-			 * Treat 'left' and 'top' as absolute or as deltas. Defaults to false.
-			 */
-			relative?: boolean;
-		};
-		size?: {
-			/**
-			 * Optional if height is present. Defaults to the window's current width.
-			 */
-			width?: number;
-			/**
-			 * Optional if width is present. Defaults to the window's current height.
-			 */
-			height?: number;
-			/**
-			 * The total time in milliseconds this transition should take.
-			 */
-			duration?: number;
-			/**
-			 * Treat 'width' and 'height' as absolute or as deltas. Defaults to false.
-			 */
-			relative?: boolean;
-		};
-	}
-
-	interface AnimationOptions {
-		/**
-		 * This option interrupts the current animation. When false it pushes this animation onto the end of the animation queue.
-		 */
-		interrupt?: boolean;
-		/**
-		 * Transition effect. Defaults to 'ease-in-out'.
-		 */
-		tween?: OpenFinTweenType;
-	}
-
-	interface WindowBounds {
-		/**
-		 * the height of the window.
-		 */
-		height?: number;
-		/**
-		 * left-most coordinate of the window.
-		 */
-		left?: number;
-		/**
-		 * top-most coordinate of the window.
-		 */
-		top?: number;
-		/**
-		 * the width of the window.
-		 */
-		width?: number;
-	}
-
-	interface SessionChangedEvent {
-		/**
-		 * the action that triggered this event:
-		 */
-		reason: "lock"
-		| "unlock"
-		| "remote-connect"
-		| "remote-disconnect"
-		| "unknown";
-		topic: "system";
-		type: "session-changed";
-	}
-
-	interface LaunchInfo {
-		launchMode: "fin-protocol"
-		| "fins-protocol"
-		| "shortcut"
-		| "command-line"
-		| "adapter"
-		| "other"
-		| string;
-	}
-
-	type OpenFinTweenType = "linear"
-		| "ease-in"
-		| "ease-out"
-		| "ease-in-out"
-		| "ease-in-quad"
-		| "ease-out-quad"
-		| "ease-in-out-quad"
-		| "ease-in-cubic"
-		| "ease-out-cubic"
-		| "ease-in-out-cubic"
-		| "ease-out-bounce"
-		| "ease-in-back"
-		| "ease-out-back"
-		| "ease-in-out-back"
-		| "ease-in-elastic"
-		| "ease-out-elastic"
-		| "ease-in-out-elastic";
-
-	type OpenFinApplicationEventType = "closed"
-		| "connected"
-		| "crashed"
-		| "initialized"
-		| "manifest-changed"
-		| "not-responding"
-		| "out-of-memory"
-		| "responding"
-		| "run-requested"
-		| "started"
-		| "tray-icon-clicked"
-		| "window-alert-requested"
-		| "window-auth-requested"
-		| "window-closed"
-		| "window-created"
-		| "window-end-load"
-		| "window-navigation-rejected"
-		| "window-show-requested"
-		| "window-start-load";
-
-	type OpenFinExternalApplicationEventType = "connected"
-		| "disconnected";
-
-	type OpenFinSystemEventType = "application-closed"
-		| "application-crashed"
-		| "application-created"
-		| "application-started"
-		| "desktop-icon-clicked"
-		| "idle-state-changed"
-		| "monitor-info-changed"
-		| "session-changed";
-
-	type OpenFinWindowEventType = "auth-requested"
-		| "blurred"
-		| "bounds-changed"
-		| "bounds-changing"
-		| "close-requested"
-		| "closed"
-		| "disabled-frame-bounds-changed"
-		| "disabled-frame-bounds-changing"
-		| "embedded"
-		| "external-process-exited"
-		| "external-process-started"
-		| "focused"
-		| "frame-disabled"
-		| "frame-enabled"
-		| "group-changed"
-		| "hidden"
-		| "initialized"
-		| "maximized"
-		| "minimized"
-		| "navigation-rejected"
-		| "restored"
-		| "show-requested"
-		| "shown";
-
-	type OpenFinAnchor = "top-left"
-		| "top-right"
-		| "bottom-left"
-		| "bottom-right";
-}
diff --git a/types/openfin/v30/openfin-tests.ts b/types/openfin/v30/openfin-tests.ts
deleted file mode 100644
index ce49b14f5c..0000000000
--- a/types/openfin/v30/openfin-tests.ts
+++ /dev/null
@@ -1,728 +0,0 @@
-/// <reference path="./index.d.ts" />
-
-function test_application() {
-	let application: fin.OpenFinApplication;
-	// constructor
-	application = new fin.desktop.Application({
-		url: "application.html",
-		uuid: "74BED629-2D8E-4141-8582-73E364BDFA74",
-		name: "Application Name",
-		plugins: false,
-		mainWindowOptions: {
-			defaultHeight: 600,
-			defaultWidth: 800,
-			defaultTop: 300,
-			defaultLeft: 300,
-			autoShow: true
-		}
-	}, (successObj) => {
-		console.log("Application successfully created, HTTP response code:", successObj);
-		application.run();
-	}, (error) => {
-		console.log("Error creating application:", error);
-	});
-		//createFromManifest
-	fin.desktop.Application.createFromManifest("http://stuf.com/app.json", (app) => {
-		console.log(app.uuid);
-	}, err => console.log(err));
-	// getCurrent
-	application = fin.desktop.Application.getCurrent();
-	// wrap
-	application = fin.desktop.Application.wrap("454C7F31-A915-4EA2-83F2-CFA655453C52");
-	// getWindow
-	application.getWindow();
-	// addEventListener
-	application.addEventListener("closed", (event) => {
-		console.log("The application has closed");
-	}, () => {
-		console.log("The registration was successful");
-	}, reason => {
-		console.log("failure: " + reason);
-	});
-	// close
-	application.close();
-	// getChildWindows
-	application.getChildWindows(children => {
-		children.forEach(childWindow => {
-			console.log("Showing child: " + childWindow.name);
-			childWindow.show();
-		});
-	});
-	// getGroups
-	application.getGroups(allGroups => {
-		console.log(`There are a total of ${allGroups.length} groups.`);
-
-		let groupCounter = 1;
-		allGroups.forEach(windowGroup => {
-			console.log(`Group ${groupCounter} contains ${windowGroup.length} windows.`);
-			++groupCounter;
-		});
-	});
-	// getManifest
-	application.getManifest(manifest => {
-		console.log("Application manifest:");
-		console.log(manifest);
-	});
-	// getParentUuid
-	application.getParentUuid(parentUuid => {
-		console.log("UUID of parent application:");
-		console.log(parentUuid);
-	});
-	// getShortcuts
-	application.getShortcuts(config => {
-		console.log("Desktop shortcut is enabled: ", config.desktop);
-		console.log("Start Menu shortcut is enabled: ", config.startMenu);
-		console.log("System Startup shortcut is enabled: ", config.systemStartup);
-	});
-	// getInfo
-	application.getInfo(info => {
-		console.log(`Launch mode: ${info.launchMode}`);
-	});
-	// getTrayIconInfo
-	application.getTrayIconInfo(info => {
-		console.log(info.x, info.y, info.bounds.x, info.bounds.y, info.bounds.height, info.bounds.width,
-					info.monitorInfo.type, info.monitorInfo.reason);
-	});
-	// isRunning
-	application.isRunning(running => {
-		console.log("the application is", running ? "running" : "not running");
-	});
-	// registerCustomData
-	application.registerUser("a", "b", () => console.log("done"), err => console.log(err));
-	// removeEventListener
-	const previousCallback = (event: fin.WindowEvent) => { };
-	application.removeEventListener("closed", previousCallback, () => {
-		console.log("The unregistration was successful");
-	}, err => {
-		console.log("failure:", err);
-	});
-	// removeTrayIcon
-	application.removeTrayIcon(() => {
-		console.log("Removed the tray icon.");
-	}, err => {
-		console.log("failure:", err);
-	});
-	// restart
-	application.restart(() => {
-		console.log("You will not read this.");
-	}, err => {
-		console.log("failure:", err);
-	});
-	// schedule restart
-	application.scheduleRestart(() => {
-		console.log("You will not read this.");
-	}, err => {
-		console.log("failure:", err);
-	});
-	// setShortcuts
-	application.setShortcuts({
-		desktop: true,
-		startMenu: false,
-		systemStartup: true
-	}, () => {
-		console.log("Successfully set new shortcut states");
-	}, error => {
-		console.log("Failed to set new shortcut states. Error: ", error);
-	});
-	// setTrayIcon
-	application.setTrayIcon("https://developer.openf.in/download/openfin.png", clickInfo => {
-		console.log(`The mouse has clicked at (${clickInfo.x}, ${clickInfo.y})`);
-	});
-	// terminate
-	application.terminate();
-	// wait
-	application.addEventListener("not-responding", () => {
-		console.log("waiting for hung application");
-		application.wait();
-	});
-	//uuid
-	let hasUuid = application.uuid;
-}
-
-function test_external_application() {
-	let externalApp: fin.OpenFinExternalApplication;
-	// wrap
-	externalApp = fin.desktop.ExternalApp.wrap('my-uuid');
-	// addEventListener
-	externalApp.addEventListener('connected', () => {
-		console.log('external app connected');
-	}, () => {
-		console.log('The registration was successful');
-	}, (reason, err) => {
-		console.log(`Error Message: ${err.message} Error Stack: ${err.stack}`);
-	});
-	// removeEventListener
-	const previousCallback = () => { };
-	externalApp.removeEventListener('connected', previousCallback, () => {
-		console.log('The unregistration was successful');
-	}, (reason, err) => {
-		console.log(`Error Message: ${err.message} Error Stack: ${err.stack}`);
-	});
-}
-
-function test_inter_application_bus() {
-	// addSubscribeListener
-	fin.desktop.InterApplicationBus.addSubscribeListener((uuid, topic, name) => {
-		console.log(`The application ${uuid} has subscribed to ${topic}`);
-	});
-	// addUnsubscribeListener
-	fin.desktop.InterApplicationBus.addUnsubscribeListener((uuid, topic, name) => {
-		console.log(`The application ${uuid} has unsubscribed to ${topic}`);
-	});
-	// removeSubscribeListener
-	const aRegisteredListener = (uuid: string, topic: string, name: string) => { };
-	fin.desktop.InterApplicationBus.removeSubscribeListener(aRegisteredListener);
-	// removeUnsubscribeListener
-	fin.desktop.InterApplicationBus.removeUnsubscribeListener(aRegisteredListener);
-	// publish
-	fin.desktop.InterApplicationBus.publish("a topic", {
-		field1: "value1",
-		field2: "value2"
-	});
-	// send
-	fin.desktop.InterApplicationBus.send("an application's uuid", "a topic", {
-		field1: "value1",
-		field2: "value2"
-	});
-	// subscribe
-	fin.desktop.InterApplicationBus.subscribe("*", "a topic", (message, uuid, name) => {
-		console.log(`The application ${uuid} sent this message: ${message}`);
-	});
-	// unsubscribe
-	const aRegisteredMessageListener = (message: any, senderUuid: string) => {
-		console.log(message, senderUuid);
-	};
-	fin.desktop.InterApplicationBus.unsubscribe("*", "a topic", aRegisteredMessageListener);
-}
-
-function test_notification() {
-	let notification: fin.OpenFinNotification;
-	// getCurrent
-	notification = fin.desktop.Notification.getCurrent();
-	// close
-	notification.close();
-	// sendMessage
-	notification = new fin.desktop.Notification({
-		duration: 10,
-		url: "http://localhost:5000/Account/Register",
-		message: "Hello",
-		onShow: () => { },
-		// onClose: () => { },
-		onDismiss: () => { },
-		// onClick: () => { },
-		onMessage: () => { },
-		onError: () => { }
-	});
-	// sendMessageToApplication
-	notification.sendMessageToApplication("some message");
-}
-
-function test_system() {
-	// addEventListener
-	fin.desktop.System.addEventListener('monitor-info-changed', event => {
-		console.log("The monitor information has changed to: ", event);
-	}, () => {
-		console.log("The registration was successful");
-	}, err => {
-		console.log("failure: " + err);
-	});
-	// clearCache
-	fin.desktop.System.clearCache({
-		cache: true,
-		cookies: true,
-		localStorage: true,
-		appcache: true,
-		userData: true
-	});
-	// deleteCacheOnExit
-	fin.desktop.System.deleteCacheOnExit(() => {
-		console.log("successful");
-	}, err => {
-		console.log("failure: " + err);
-	});
-	// downloadAsset
-	const dirAppAsset = {
-		src: 'http://local:8000/dir.zip',
-		alias: 'dirApp',
-		version: '1.23.24',
-		target: 'dir.bat',
-		args: ''
-	};
-	fin.desktop.System.downloadAsset(dirAppAsset, progress => {
-		const downloadedPercent = Math.floor((progress.downloadedBytes / progress.totalBytes) * 100);
-		console.log(`Downloaded ${downloadedPercent}%`);
-	}, p => {
-		console.log(`Downlod complete, can be found on ${p.path}`);
-		// lets launch our application asset.
-		// launchDirApp();
-	}, (reason, err) => {
-		console.log(reason, err);
-	});
-	// exit
-	fin.desktop.System.exit(() => {
-		console.log("successful");
-	}, err => {
-		console.log("failure: " + err);
-	});
-	// getAllApplications
-	fin.desktop.System.getAllApplications(applicationInfoList => {
-		applicationInfoList.forEach(applicationInfo => {
-			console.log("Showing information for application with uuid: "
-				+ applicationInfo.uuid);
-			console.log("isRunning: ", applicationInfo.isRunning);
-		});
-	});
-	// getAllExternalApplications
-	fin.desktop.System.getAllExternalApplications(externalAppsInfoList => {
-		externalAppsInfoList.forEach(appInfo => {
-			console.log(`External app connected to the runtime with UUID ${appInfo.uuid}`);
-		});
-	});
-	// getAllWindows
-	fin.desktop.System.getAllWindows(windowInfoList => {
-		windowInfoList.forEach(windowInfo => {
-			console.log("Showing information for application with uuid: ", windowInfo.uuid);
-			console.log("Main window: ", windowInfo.mainWindow);
-			console.log("Child windows: ", windowInfo.childWindows);
-		});
-	});
-	// getCommandLineArguments
-	fin.desktop.System.getCommandLineArguments(args => {
-		console.log("The command line arguments are " + args);
-	});
-	// getDeviceId
-	fin.desktop.System.getDeviceId(id => {
-		console.log("The id of the device is: " + id);
-	});
-	// getEnvironmentVariable
-	fin.desktop.System.getEnvironmentVariable("APPDATA", variable => {
-		console.log("this is the APPDATA value", variable);
-	});
-	// getHostSpecs
-	fin.desktop.System.getHostSpecs(info => {
-		console.log(info);
-	}, error => {
-		console.log('There was an error:', error);
-	});
-	// getLog
-	fin.desktop.System.getLog('debug-2015-01-08-22-27-53.log', log => {
-		console.log(log);
-	});
-	// getLogList
-	fin.desktop.System.getLogList(logList => {
-		logList.forEach(logInfo => {
-			console.log(`The filename of the log is ${logInfo.name}, the size is ${logInfo.size}, and the date of creation is ${logInfo.date}`);
-		});
-	});
-	// getMonitorInfo
-	fin.desktop.System.getMonitorInfo(monitorInfo => {
-		console.log("This object contains information about all monitors: ", monitorInfo);
-	});
-	// getMousePosition
-	fin.desktop.System.getMousePosition(mousePosition => {
-		console.log(`The mouse is located at left: ${mousePosition.left}, top: ${mousePosition.top}`);
-	});
-	// getProcessList
-	fin.desktop.System.getProcessList(list => {
-		list.forEach(process => {
-			console.log(`UUID: ${process.uuid}, Application Name: ${process.name}`);
-		});
-	});
-	// getProxySettings
-	fin.desktop.System.getProxySettings(proxy => {
-		console.log(proxy);
-	});
-	// getRvmInfo
-	fin.desktop.System.getRvmInfo(rvmInfoObject => {
-		console.log("RVM version:", rvmInfoObject.version);
-		console.log("RVM has been running since:", rvmInfoObject["start-time"]);
-	}, err => {
-		console.log("Failed to get rvm info, error message:", err);
-	});
-	// getVersion
-	fin.desktop.System.getVersion(version => {
-		console.log("The version is " + version);
-	});
-	// launchExternalProcess
-	fin.desktop.System.launchExternalProcess({
-		path: "notepad",
-		arguments: "",
-		listener(result) {
-			console.log('the exit code', result.exitCode);
-		}
-	}, payload => {
-		console.log('Success:', payload.uuid);
-	}, error => {
-		console.log('Error:', error);
-	});
-	//
-	fin.desktop.System.launchExternalProcess({
-		// Additionally note that the executable found in the zip file specified in appAssets
-		// will default to the one mentioned by appAssets.target
-		// If the the path below refers to a specific path it will override this default
-		alias: "myApp",
-		listener(result) {
-			console.log('the exit code', result.exitCode);
-		}
-	}, payload => {
-		console.log('Success:', payload.uuid);
-	}, error => {
-		console.log('Error:', error);
-	});
-	//
-	fin.desktop.System.launchExternalProcess({
-		alias: "myApp",
-		arguments: "e f g",
-		listener(result) {
-			console.log('the exit code', result.exitCode);
-		}
-	}, payload => {
-		console.log('Success:', payload.uuid);
-	}, error => {
-		console.log('Error:', error);
-	});
-	//
-	fin.desktop.System.launchExternalProcess({
-		path: "C:\Users\ExampleUser\AppData\Local\OpenFin\OpenFinRVM.exe",
-		arguments: "--version",
-		certificate: {
-			trusted: true,
-			subject: 'O=OpenFin INC., L=New York, S=NY, C=US',
-			thumbprint: '3c a5 28 19 83 05 fe 69 88 e6 8f 4b 3a af c5 c5 1b 07 80 5b'
-		},
-		listener(result) {
-			console.log('the exit code', result.exitCode);
-		}
-	}, payload => {
-		console.log('Success:', payload.uuid);
-	}, error => {
-		console.log('Error:', error);
-	});
-	// log
-	fin.desktop.System.log("info", "An example log message", () => {
-		console.log("message successfully logged");
-	}, err => {
-		console.log(err);
-	});
-	// monitorExternalProcess
-	fin.desktop.System.monitorExternalProcess({
-		pid: 2508,
-		listener(result) {
-			console.log('the exit code', result.exitCode);
-		}
-	}, payload => {
-		console.log("The process is now being monitored: ", payload.uuid);
-	}, error => {
-		console.log("Error:", error);
-	});
-	// openUrlWithBrowser
-	fin.desktop.System.openUrlWithBrowser("https://developer.openf.in/", () => {
-		console.log("successful");
-	}, err => {
-		console.log("failure: " + err);
-	});
-	// registerExternalConnection
-	fin.desktop.System.registerExternalConnection("remote-connection-uuid", (...args: any[]) => {
-		console.log(args);
-	});
-	// releaseExternalProcess
-	fin.desktop.System.launchExternalProcess({
-		path: "notepad",
-		arguments: "",
-		listener(result) {
-			console.log("The exit code", result.exitCode);
-		}
-	}, result => {
-		console.log("Result UUID is " + result.uuid);
-
-		// release it.
-		fin.desktop.System.releaseExternalProcess(result.uuid, () => {
-			console.log("Process has been unmapped!");
-		}, reason => {
-			console.log("failure: " + reason);
-		});
-	});
-	// removeEventListener
-	const aRegisteredListener = (event: fin.SystemBaseEvent) => { };
-	fin.desktop.System.removeEventListener("monitor-info-changed", aRegisteredListener, () => {
-		console.log("successful");
-	}, err => {
-		console.log("failure: " + err);
-	});
-	// showDeveloperTools
-	fin.desktop.System.showDeveloperTools("uuid", "name", () => {
-		console.log("successful");
-	}, err => {
-		console.log("failure: " + err);
-	});
-	// terminateExternalProcess
-	fin.desktop.System.launchExternalProcess({
-		// notepad is in the system's PATH
-		path: "notepad",
-		arguments: "",
-		listener(result) {
-			console.log("The exit code", result.exitCode);
-		}
-	}, result => {
-		console.log("Result UUID is " + result.uuid);
-
-		// Attempt to close the process. Terminate after 4 seconds if it
-		// has not done so.
-		fin.desktop.System.terminateExternalProcess(result.uuid, 4000, info => {
-			console.log("Termination result " + info.result);
-		}, reason => {
-			console.log("failure: " + reason);
-		});
-	});
-	// updateProxySettings
-	fin.desktop.System.updateProxySettings("type", "proxyAddress", 8080, () => {
-		console.log('success');
-	}, err => {
-		console.log(err);
-	});
-}
-
-function test_system_clipboard() {
-	// availableFormats
-	fin.desktop.System.Clipboard.availableFormats(null, formats => {
-		formats.forEach(format => console.log(`The format ${format} is available to read`));
-	}, (reason, err) => {
-		console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
-	});
-	// readHtml
-	fin.desktop.System.Clipboard.readHtml(null, html => {
-		console.log(`This is the html from the clipboard: ${html}`);
-	}, (reason, err) => {
-		console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
-	});
-	// readRtf
-	fin.desktop.System.Clipboard.readRtf(null, rtf => {
-		console.log(`This is the rtf from the clipboard: ${rtf}`);
-	}, (reason, err) => {
-		console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
-	});
-	// readText
-	fin.desktop.System.Clipboard.readText(null, text => {
-		console.log(`This is the text from the clipboard: ${text}`);
-	}, (reason, err) => {
-		console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
-	});
-	// write
-	fin.desktop.System.Clipboard.write({
-		text: 'Hello Text!',
-		html: '<h1>Hello Html</h1>',
-		rtf: 'Hello Rtf'
-	}, null, () => {
-		console.log('Success!!');
-	}, (reason, err) => {
-		console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
-	});
-	// writeHtml
-	fin.desktop.System.Clipboard.writeHtml('<h1>Hello World</h1>', null, () => {
-		console.log('Success!!');
-	}, (reason, err) => {
-		console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
-	});
-	// writeRtf
-	fin.desktop.System.Clipboard.writeRtf('Hello World!', null, () => {
-		console.log('Success!!');
-	}, (reason, err) => {
-		console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
-	});
-	// writeText
-	fin.desktop.System.Clipboard.writeText('Hello World', null, () => {
-		console.log('Success!!');
-	}, (reason, err) => {
-		console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
-	});
-}
-
-function test_window() {
-	let finWindow: fin.OpenFinWindow;
-	// constructor
-	finWindow = new fin.desktop.Window({
-		name: "childWindow",
-		url: "child.html",
-		defaultWidth: 320,
-		defaultHeight: 320,
-		defaultTop: 10,
-		defaultLeft: 300,
-		frame: false,
-		resizable: false,
-		state: "normal"
-	}, () => {
-		const _win = finWindow.getNativeWindow();
-		_win.addEventListener("DOMContentLoaded", () => { finWindow.show(); });
-	}, error => {
-		console.log("Error creating window:", error);
-	});
-	// getCurrent
-	finWindow = fin.desktop.Window.getCurrent();
-	// getNativeWindow
-	let nativeWindow: Window;
-	nativeWindow = finWindow.getNativeWindow();
-	// getParentApplication
-	let parentApp: fin.OpenFinApplication;
-	parentApp = finWindow.getParentApplication();
-	// getParentWindow
-	let parentFinWindow: fin.OpenFinWindow;
-	parentFinWindow = finWindow.getParentWindow();
-	// wrap
-	finWindow = fin.desktop.Window.wrap("uuid", "name");
-	// addEventListener
-	finWindow.addEventListener("bounds-changed", event => {
-		console.log("The window has been moved or resized");
-	}, () => {
-		console.log("The registration was successful");
-	}, reason => {
-		console.log("failure:" + reason);
-	});
-	// animate
-	finWindow.animate({
-		opacity: {
-			opacity: 0.15,
-			duration: 1000
-		},
-		position: {
-			left: 10,
-			top: 10,
-			duration: 3000
-		}
-	}, {
-			interrupt: false
-		}, evt => {
-			// Callback will only fire after both "opacity" and "position" have finished animating.
-		});
-	// authenticate
-	finWindow.addEventListener('auth-requested', evt => {
-		finWindow.authenticate('userName', 'P@assw0rd', () => { }, (reason, err) => {
-			console.log("failure:", err);
-		});
-	});
-	// blur
-	finWindow.blur();
-	// bringToFront
-	finWindow.bringToFront();
-	// close
-	finWindow.close();
-	// disableFrame
-	finWindow.disableFrame();
-	// enableFrame
-	finWindow.enableFrame();
-	// flash
-	finWindow.flash();
-	// focus
-	finWindow.focus();
-	// getBounds
-	finWindow.getBounds(bounds => {
-		console.log(`top: ${bounds.top} left: ${bounds.left} height: ${bounds.height} width: ${bounds.width}`);
-	});
-	// getOptions
-	finWindow.getOptions(options => {
-		console.log(options);
-	});
-	// getSnapshot
-	finWindow.getSnapshot(base64Snapshot => {
-		console.log("data:image/png;base64," + base64Snapshot);
-	});
-	// getState
-	finWindow.getState(state => {
-		console.log("state: " + state);
-	});
-	// getZoomLevel
-	finWindow.getZoomLevel(level => {
-		console.log("zoom level: " + level);
-	}, error => {
-		console.log('error:', error);
-	});
-	// hide
-	finWindow.hide();
-	// isShowing
-	finWindow.isShowing(showing => {
-		console.log("the window is " + (showing ? "showing" : "hidden"));
-	});
-	// joinGroup
-	let secondWindow = new fin.desktop.Window({
-		url: "http://www.openfin.co",
-		name: "secondWindow",
-		autoShow: true
-	}, () => {
-		// When mainWindow moves or is moved, secondWindow moves by the same amount
-		secondWindow.joinGroup(finWindow);
-	});
-	// leaveGroup
-	secondWindow = new fin.desktop.Window({
-		url: "http://www.openfin.co",
-		name: "secondWindow",
-		autoShow: true
-	}, () => {
-		// When finWindow moves or is moved, secondWindow moves by the same amount
-		secondWindow.joinGroup(finWindow, () => {
-			// once we are in the group, lets leave it.
-			secondWindow.leaveGroup();
-		});
-	});
-	// maximize
-	finWindow.maximize();
-	// mergeGroups
-	{
-		const finWindowOne = new fin.desktop.Window({
-			url: "http://www.openfin.co",
-			name: "finWindowOne",
-			autoShow: true
-		});
-		const finWindowTwo = new fin.desktop.Window({
-			url: "http://www.openfin.co",
-			name: "finWindowTwo",
-			autoShow: true
-		});
-		const finWindowThree = new fin.desktop.Window({
-			url: "http://www.openfin.co",
-			name: "finWindowThree",
-			autoShow: true
-		});
-		const finWindowFour = new fin.desktop.Window({
-			url: "http://www.openfin.co",
-			name: "finWindowFour",
-			autoShow: true
-		});
-		// When finWindowOne moves or is moved, finWindowTwo moves by the same amount
-		finWindowOne.joinGroup(finWindowTwo);
-		// When finWindowThree moves or is moved, finWindowFour moves by the same amount
-		finWindowThree.joinGroup(finWindowFour);
-		// finWindowOne, finWindowTwo, finWindowThree, and finWindowFour now move together in the same group
-		finWindowOne.mergeGroups(finWindowThree);
-	}
-	// minimize
-	finWindow.minimize();
-	// moveBy
-	finWindow.moveBy(10, 10);
-	// moveTo
-	finWindow.moveTo(100, 200);
-	// removeEventListener
-	const aRegisteredListener = (event: fin.WindowBaseEvent) => { };
-	finWindow.removeEventListener("bounds-changed", aRegisteredListener);
-	// resizeBy
-	finWindow.resizeBy(10, 10, "top-right");
-	// resizeTo
-	finWindow.resizeTo(10, 10, "top-right");
-	// restore
-	finWindow.restore();
-	// setAsForeground
-	finWindow.setAsForeground();
-	// setBounds
-	finWindow.setBounds(100, 200, 400, 400);
-	// setZoomLevel
-	finWindow.setZoomLevel(10);
-	// show
-	finWindow.show();
-	// showAt
-	finWindow.showAt(10, 10, false);
-	// stopFlashing
-	finWindow.stopFlashing();
-	// updateOptions
-	finWindow.updateOptions({
-		frame: false,
-		maxWidth: 500
-	});
-}
diff --git a/types/openfin/v30/v30 b/types/openfin/v30/v30
deleted file mode 100644
index 5c40c47ae0..0000000000
--- a/types/openfin/v30/v30
+++ /dev/null
@@ -1,1736 +0,0 @@
-// Type definitions for OpenFin API 17.0
-// Project: https://openfin.co/
-// Definitions by: Chris Barker <https://github.com/chrisbarker>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// based on v6.49.17.14
-// see https://openfin.co/support/technical-faq/#what-do-the-numbers-in-the-runtime-version-mean
-
-/**
- * JavaScript API
- * The JavaScript API allows you to create an HTML/JavaScript application that has access to the native windowing environment,
- * can communicate with other applications and has access to sandboxed system-level features.
- *
- * API Ready
- * When using the OpenFin API, it is important to ensure that it has been fully loaded before making any API calls. To verify
- * that the API is in fact ready, be sure to make any API calls either from within the fin.desktop.main() method or explicitly
- * after it has returned. This avoids the situation of trying to access methods that are not yet fully injected.
- *
- * Overview
- * When running within the OpenFin Runtime your web applications have access to the "fin" namespace and all the modules within the API
- * without the need to include additional source files. You can treat the "fin" namespace as you would the "window", "navigator" or "document" objects.
- */
-declare namespace fin {
-	const desktop: OpenFinDesktop;
-
-	interface OpenFinDesktop {
-		main(f: () => any): void;
-		Application: OpenFinApplicationStatic;
-		ExternalApp: OpenFinExternalApplicationStatic;
-		InterApplicationBus: OpenFinInterApplicationBus;
-		Notification: OpenFinNotificationStatic;
-		System: OpenFinSystem;
-		Window: OpenFinWindowStatic;
-	}
-
-	interface OpenFinApplicationStatic {
-		/**
-		 * Creates a new Application.
-		 * An object representing an application. Allows the developer to create, execute, show/close an application as well as listen to application events.
-		 */
-		new (
-			options: ApplicationOptions,
-			callback?: (successObj: { httpResponseCode: number }) => void,
-			errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): OpenFinApplication;
-		/**
-		 * Returns an Application object that represents an existing application.
-		 */
-		getCurrent(): OpenFinApplication;
-		/**
-		 * Returns an Application object that represents an existing application.
-		 */
-		wrap(uuid: string): OpenFinApplication;
-	}
-
-	/**
-	 * Application
-	 * An object representing an application.Allows the developer to create, execute, show / close an application as well as listen to application events.
-	 */
-	interface OpenFinApplication {
-		/**
-		 * Returns an instance of the main Window of the application
-		 */
-		getWindow(): OpenFinWindow;
-		/**
-		 * Registers an event listener on the specified event.
-		 */
-		addEventListener(
-			type: OpenFinApplicationEventType,
-			listener: (event: ApplicationBaseEvent
-				| TrayIconClickedEvent
-				| WindowEvent
-				| WindowAlertRequestedEvent
-				| WindowAuthRequested
-				| WindowNavigationRejectedEvent
-				| WindowEndLoadEvent) => void,
-			callback?: () => void,
-			errorCallback?: (reason: string) => void): void;
-		/**
-		 * Closes the application and any child windows created by the application.
-		 */
-		close(force?: boolean, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves an array of wrapped fin.desktop.Windows for each of the application's child windows.
-		 */
-		getChildWindows(callback?: (children: OpenFinWindow[]) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves an array of active window groups for all of the application's windows. Each group is represented as an array of wrapped fin.desktop.Windows.
-		 */
-		getGroups(callback?: (groups: OpenFinWindow[][]) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves the JSON manifest that was used to create the application. Invokes the error callback if the application was not created from a manifest.
-		 */
-		getManifest(callback?: (manifest: any) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves UUID of the application that launches this application. Invokes the error callback if the application was created from a manifest.
-		 */
-		getParentUuid(callback?: (uuid: string) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves current configuration of application's shortcuts.
-		 */
-		getShortcuts(callback?: (config: ShortCutConfig) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves information about the application.
-		 */
-		getInfo(callback?: (info: LaunchInfo) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Determines if the application is currently running.
-		 */
-		isRunning(callback?: (running: boolean) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Passes in custom data that will be relayed to the RVM
-		 */
-		registerCustomData(data: any, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Removes a previously registered event listener from the specified event.
-		 */
-		removeEventListener(
-			type: OpenFinApplicationEventType,
-			previouslyRegisteredListener: (event: ApplicationBaseEvent
-				| TrayIconClickedEvent
-				| WindowEvent
-				| WindowAlertRequestedEvent
-				| WindowAuthRequested
-				| WindowNavigationRejectedEvent
-				| WindowEndLoadEvent) => any,
-			callback?: () => void,
-			errorCallback?: (reason: string) => void): void;
-		/**
-		 * Removes the application's icon from the tray.
-		 */
-		removeTrayIcon(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Restarts the application.
-		 */
-		restart(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Runs the application. When the application is created, run must be called.
-		 */
-		run(callback?: (successObj: SuccessObj) => void, errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): void;
-		/**
-		 * Tells the rvm to relaunch the main application once upon a complete shutdown
-		 */
-		scheduleRestart(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Sets new shortcut configuration for current application.
-		 * Application has to be launched with a manifest and has to have shortcut configuration (icon url, name, etc.) in its manifest to
-		 * be able to change shortcut states.
-		 */
-		setShortcuts(config: ShortCutConfig, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Adds a customizable icon in the system tray and notifies the application when clicked.
-		 */
-		setTrayIcon(iconUrl: string, listener: (clickInfo: TrayIconClickedEvent) => void, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Closes the application by terminating its process.
-		 */
-		terminate(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Waits for a hanging application. This method can be called in response to an application "not-responding" to allow the application
-		 * to continue and to generate another "not-responding" message after a certain period of time.
-		 */
-		wait(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * The Application's uuid
-		 */
-		uuid: string;
-	}
-
-	interface ShortCutConfig {
-		/**
-		 * application has a shortcut on the desktop
-		 */
-		desktop?: boolean;
-		/**
-		 * application has no shortcut in the start menu
-		 */
-		startMenu?: boolean;
-		/**
-		 * application will be launched on system startup
-		 */
-		systemStartup?: boolean;
-	}
-
-	interface SuccessObj {
-		httpResponseCode: number;
-	}
-
-	interface NetworkErrorInfo extends ErrorInfo {
-		networkErrorCode: number;
-	}
-
-	interface ErrorInfo {
-		stack: string;
-		message: string;
-	}
-
-	interface ApplicationOptions {
-		/**
-		 * The name of the application.
-		 */
-		name?: string;
-		/**
-		 * The url to the application.
-		 */
-		url?: string;
-		/**
-		 * The UUID of the application, unique within the set of all other applications running in the OpenFin Runtime. name and uuid must match.
-		 */
-		uuid?: string;
-		/**
-		 * Enable Flash at the application level. Default: false.
-		 */
-		plugins?: boolean;
-		/**
-		 * The options of the main window of the application.
-		 */
-		mainWindowOptions?: WindowOptions;
-	}
-
-	interface WindowOptions {
-		/**
-		 * Enable keyboard shortcuts for devtools and zoom. Default: false for both.
-		 */
-		accelerator?: {
-			devtools?: boolean,
-			zoom?: boolean,
-			reload?: boolean,
-			reloadIgnoreCache?: boolean,
-		};
-		/**
-		 * A flag to always position the window at the top of the window stack. Default: false.
-		 * Updatable
-		 */
-		alwaysOnTop?: boolean;
-		/**
-		 * A flag to automatically show the Window when it is created. Default: false.
-		 */
-		autoShow?: boolean;
-		/**
-		 * A flag to show the context menu when right-clicking on a window. Gives access to the Developer Console for the Window. Default: true
-		 * Updatable
-		 */
-		contextMenu?: boolean;
-		/**
-		 * This defines and applies rounded corners for a frameless window. Default for both width and height: 0.
-		 * Updatable
-		 */
-		cornerRounding?: {
-			width?: number;
-			height?: number;
-		};
-		/**
-		 * A field that the user can attach serializable data to to be ferried around with the window options. Default: ''.
-		 */
-		customData?: any;
-		/**
-		 * Specifies that the window will be positioned in the center of the primary monitor when loaded for the first time on a machine.
-		 * When the window corresponding to that id is loaded again, the position from before the window was closed is used.
-		 * This option overrides defaultLeft and defaultTop. Default: false.
-		 */
-		defaultCentered?: boolean;
-		/**
-		 * The default height of the window. Specifies the height of the window when loaded for the first time on a machine.
-		 *  When the window corresponding to that id is loaded again, the height is taken to be the last height of the window before it was closed. Default: 500.
-		 */
-		defaultHeight?: number;
-		/**
-		 * The default left position of the window. Specifies the position of the left of the window when loaded for the first time on a machine.
-		 *  When the window corresponding to that id is loaded again, the value of left is taken to be the last value before the window was closed. Default: 100.
-		 */
-		defaultWidth?: number;
-		/**
-		 * The default top position of the window. Specifies the position of the top of the window when loaded for the first time on a machine.
-		 * When the window corresponding to that id is loaded again, the value of top is taken to be the last value before the window was closed. Default: 100.
-		 */
-		defaultTop?: number;
-		/**
-		 * The default width of the window. Specifies the width of the window when loaded for the first time on a machine.
-		 * When the window corresponding to that id is loaded again, the width is taken to be the last width of the window before it was closed. Default: 800.
-		 */
-		defaultLeft?: number;
-		/**
-		 * A flag to show the frame. Default: true.
-		 * Updatable
-		 */
-		frame?: boolean;
-		/**
-		 * A flag to allow a window to be hidden when the close button is clicked.Default: false.
-		 * Updatable
-		 */
-		hideOnClose?: boolean;
-		/**
-		 * A URL for the icon to be shown in the window title bar and the taskbar.Default: The parent application's applicationIcon.
-		 * Updatable
-		 */
-		icon?: string;
-		/**
-		 * The maximum height of a window.Will default to the OS defined value if set to - 1. Default: -1.
-		 * Updatable
-		 */
-		maxHeight?: number;
-		/**
-		 * A flag that lets the window be maximized.Default: true.
-		 * Updatable
-		 */
-		maximizable?: boolean;
-		/**
-		 * The maximum width of a window.Will default to the OS defined value if set to - 1. Default: -1.
-		 * Updatable
-		 */
-		maxWidth?: number;
-		/**
-		 * The minimum height of a window.Default: 0.
-		 * Updatable
-		 */
-		minHeight?: number;
-		/**
-		 * A flag that lets the window be minimized.Default: true.
-		 */
-		minimizable?: boolean;
-		/**
-		 * The minimum width of a window.Default: 0.
-		 */
-		minWidth?: number;
-		/**
-		 * The name for the window which must be unique within the context of the invoking Application.
-		 */
-		name?: string;
-		/**
-		 * A flag that specifies how transparent the window will be.This value is clamped between 0.0 and 1.0.Default: 1.0.
-		 * Updatable
-		 */
-		opacity?: number;
-		/**
-		 * A flag to drop to allow the user to resize the window.Default: true.
-		 * Updatable
-		 */
-		resizable?: boolean;
-		/**
-		 * Defines a region in pixels that will respond to user mouse interaction for resizing a frameless window.
-		 * Updatable
-		 */
-		resizeRegion?: {
-			/**
-			 * The size in pixels (Default: 2),
-			 */
-			size?: number;
-			/**
-			 * The size in pixels of an additional
-			 * square resizable region located at the
-			 * bottom right corner of a
-			 * frameless window. (Default: 4)
-			 */
-			bottomRightCorner?: number;
-		};
-		/**
-		 * A flag to show the Window's icon in the taskbar. Default: true.
-		 */
-		showTaskbarIcon?: boolean;
-		/**
-		 * A flag to cache the location of the window or not. Default: true.
-		 */
-		saveWindowState?: boolean;
-		/**
-		 * Specify a taskbar group for the window. Default: app's uuid.
-		 */
-		taskbarIconGroup?: string;
-		/**
-		 * A string that sets the window to be "minimized", "maximized", or "normal" on creation. Default: "normal".
-		 */
-		state?: string;
-		/**
-		 * The URL of the window. Default: "about:blank".
-		 */
-		url?: string;
-		/**
-		 * When set to false, the window will render before the "load" event is fired on the content's window.
-		 * Caution, when false you will see an initial empty white window. Default: true.
-		 */
-		waitForPageLoad?: boolean;
-	}
-
-	/**
-	 * Clipboard
-	 * Clipboard API allows reading and writting to the clipboard in multiple formats.
-	 */
-	interface OpenFinClipboard {
-		/**
-		 * Reads available formats for the clipboard type
-		 */
-		availableFormats(type: string | null, callback?: (formats: string[]) => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
-		/**
-		 * Reads available formats for the clipboard type
-		 */
-		readHtml(type: string | null, callback?: (html: string) => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
-		/**
-		 * Read the content of the clipboard as Rtf
-		 */
-		readRtf(type: string | null, callback?: (rtf: string) => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
-		/**
-		 * Read the content of the clipboard as plain text
-		 */
-		readText(type: string | null, callback?: (text: string) => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
-		/**
-		 * Writes data into the clipboard
-		 */
-		write(data: any, type: string | null, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
-		/**
-		 * Writes data into the clipboard as Html
-		 */
-		writeHtml(data: string, type: string | null, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
-		/**
-		 * Writes data into the clipboard as Rtf
-		 */
-		writeRtf(data: string, type: string | null, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
-		/**
-		 * Writes data into the clipboard as plain text
-		 */
-		writeText(data: string, type: string | null, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
-	}
-
-	interface OpenFinExternalApplicationStatic {
-		/**
-		 * Returns an External Application object that represents an existing external application.
-		 */
-		wrap(uuid: string): OpenFinExternalApplication;
-	}
-	/**
-	 * ExternalApplication
-	 * An object representing an application. Allows the developer to create, execute, show and close an application, as well as listen to application events.
-	 */
-	interface OpenFinExternalApplication {
-		/**
-		 * Registers an event listener on the specified event.
-		 */
-		addEventListener(
-			type: OpenFinExternalApplicationEventType,
-			listener: () => void,
-			callback?: () => void,
-			errorCallback?: (reason: string, error: ErrorInfo) => void): void;
-		/**
-		 * Removes a previously registered event listener from the specified event.
-		 */
-		removeEventListener(
-			type: OpenFinExternalApplicationEventType,
-			listener: () => void,
-			callback?: () => void,
-			errorCallback?: (reason: string, error: ErrorInfo) => void): void;
-	}
-
-	/**
-	 * InterApplicationBus
-	 * A messaging bus that allows for pub/sub messaging between different applications.
-	 */
-	interface OpenFinInterApplicationBus {
-		/**
-		 * Adds a listener that gets called when applications subscribe to the current application's messages.
-		 */
-		addSubscribeListener(listener: (uuid: string, topic: string, name: string) => void): void;
-		/**
-		 * Adds a listener that gets called when applications unsubscribe to the current application's messages.
-		 */
-		addUnsubscribeListener(listener: (uuid: string, topic: string, name: string) => void): void;
-		/**
-		 * Removes a previously registered subscribe listener.
-		 */
-		removeSubscribeListener(listener: (uuid: string, topic: string, name: string) => void): void;
-		/**
-		 * Removes a previously registered unsubscribe listener.
-		 */
-		removeUnsubscribeListener(listener: (uuid: string, topic: string, name: string) => void): void;
-		/**
-		 * Publishes a message to all applications running on OpenFin Runtime that are subscribed to the specified topic.
-		 */
-		publish(topic: string, message: any, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Sends a message to a specific application on a specific topic.
-		 */
-		send(destinationUuid: string, name: string, topic: string, message: any, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		send(destinationUuid: string, topic: string, message: any, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Subscribes to messages from the specified application on the specified topic. If the subscription is for a uuid, [name],
-		 * topic combination that has already been published to upon subscription you will receive the last 20 missed messages in the order they were published.
-		 */
-		subscribe(
-			senderUuid: string,
-			name: string,
-			topic: string,
-			listener: (message: any, uuid: string, name: string) => void,
-			callback?: () => void,
-			errorCallback?: (reason: string) => void): void;
-		subscribe(
-			senderUuid: string,
-			topic: string,
-			listener: (message: any, uuid: string, name: string) => void,
-			callback?: () => void,
-			errorCallback?: (reason: string) => void): void;
-		/**
-		 * Unsubscribes to messages from the specified application on the specified topic.
-		 */
-		unsubscribe(
-			senderUuid: string,
-			name: string,
-			topic: string,
-			listener: (message: any, uuid: string, name: string) => void,
-			callback?: () => void,
-			errorCallback?: (reason: string) => void): void;
-		unsubscribe(
-			senderUuid: string,
-			topic: string,
-			listener: (message: any, uuid: string, name: string) => void,
-			callback?: () => void,
-			errorCallback?: (reason: string) => void): void;
-	}
-
-	interface OpenFinNotificationStatic {
-		/**
-		 * ctor
-		 */
-		new (options: NotificationOptions, callback?: () => void, errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): OpenFinNotification;
-		/**
-		 * Gets an instance of the current notification. For use within a notification window to close the window or send a message back to its parent application.
-		 */
-		getCurrent(): OpenFinNotification;
-	}
-
-	/**
-	 * Notification
-	 * Notification represents a window on OpenFin Runtime which is shown briefly to the user on the bottom-right corner of the primary monitor.
-	 * A notification is typically used to alert the user of some important event which requires his or her attention.
-	 * Notifications are a child or your application that are controlled by the runtime.
-	 */
-	interface OpenFinNotification {
-		/**
-		 * Closes the notification.
-		 */
-		close(callback?: () => void): void;
-		/**
-		 * Sends a message to the notification.
-		 */
-		sendMessage(message: any, callback?: () => void): void;
-		/**
-		 * Sends a message from the notification to the application that created the notification. The message is handled by the notification's onMessage callback.
-		 */
-		sendMessageToApplication(message: any, callback?: () => void): void;
-	}
-
-	interface NotificationOptions {
-		/**
-		 * A boolean that will force dismissal even if the mouse is hovering over the notification
-		 */
-		ignoreMouseOver?: boolean;
-		/**
-		 * A message of any primitive or composite-primitive type to be passed to the notification upon creation.
-		 */
-		message?: any;
-		/**
-		 * The timeout for displaying a notification.Can be in milliseconds or "never".
-		 */
-		duration?: number | "never";
-		/**
-		 * The url of the notification
-		 */
-		url?: string;
-		/**
-		 * A function that is called when a notification is clicked.
-		 */
-		onClick?(callback: () => void): void;
-		/**
-		 * Invoked when the notification is closed via .close() method on the created notification instance
-		 * or the by the notification itself via fin.desktop.Notification.getCurrent().close().
-		 * NOTE: this is not invoked when the notification is dismissed via a swipe. For the swipe dismissal callback see onDismiss
-		 */
-		onClose?(callback: () => void): void;
-		/**
-		 * Invoked when a the notification is dismissed by swiping it off the screen to the right. NOTE: this is no fired on a programmatic close.
-		 */
-		onDismiss?(callback: () => void): void;
-		/**
-		 * A function that is called when an error occurs.The reason for the error is passed as an argument.
-		 */
-		onError?(errorCallback: (reason: string, errorObj: NetworkErrorInfo) => void): void;
-		/**
-		 * The onMessage function will respond to messages sent from notification.sendMessageToApplication.
-		 * The function is passed the message, which can be of any primitive or composite-primitive type.
-		 */
-		onMessage?(callback: (message: any) => void): void;
-		/**
-		 * A function that is called when a notification is shown.
-		 */
-		onShow?(callback: (successObj: SuccessObj) => void): void;
-	}
-
-	/**
-	 * System
-	 * An object representing the core of OpenFin Runtime.
-	 * Allows the developer to perform system-level actions, such as accessing logs, viewing processes, clearing the cache and exiting the runtime.
-	 */
-	interface OpenFinSystem {
-		Clipboard: OpenFinClipboard;
-		/**
-		 * Registers an event listener on the specified event.
-		 */
-		addEventListener(
-			type: OpenFinSystemEventType,
-			listener: (event: SystemBaseEvent | DesktopIconClickedEvent | IdleStateChangedEvent | MonitorInfoChangedEvent | SessionChangedEvent) => void,
-			callback?: () => void,
-			errorCallback?: (reason: string) => void): void;
-		/**
-		 * Clears cached data containing window state/positions,
-		 * application resource files (images, HTML, JavaScript files), cookies, and items stored in the Local Storage.
-		 */
-		clearCache(options: CacheOptions, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Clears all cached data when OpenFin Runtime exits.
-		 */
-		deleteCacheOnExit(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Downloads the given application asset
-		 */
-		downloadAsset(
-			assetObj: AppAssetInfo,
-			progressListener?: (progress: { downloadedBytes: number, totalBytes: number }) => void,
-			callback?: (successObj: { path: string }) => void,
-			errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): void;
-		/**
-		 * Exits the Runtime.
-		 */
-		exit(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves an array of data for all applications.
-		 */
-		getAllApplications(callback?: (applicationInfoList: ApplicationInfo[]) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves an array of data for all external applications.
-		 */
-		getAllExternalApplications(callback?: (applicationInfoList: ApplicationInfo[]) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves an array of data (name, ids, bounds) for all application windows.
-		 */
-		getAllWindows(callback?: (windowInfoList: WindowDetails[]) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves the command line argument string that started OpenFin Runtime.
-		 */
-		getCommandLineArguments(callback?: (args: string) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves the configuration object that started the OpenFin Runtime.
-		 */
-		getDeviceId(callback?: (uuid: string) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Gets the value of a given environment variable on the computer on which the runtime is installed.
-		 */
-		getEnvironmentVariable(envVar: string, callback?: (variable: string) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves system information.
-		 */
-		getHostSpecs(callback?: (info: HostSpecInfo) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves the contents of the log with the specified filename.
-		 */
-		getLog(logFileName: string, callback?: (variable: string) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves an array containing information for each log file.
-		 */
-		getLogList(callback?: (logInfoList: LogInfo[]) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves an object that contains data about the about the monitor setup of the computer that the runtime is running on.
-		 */
-		getMonitorInfo(callback?: (monitorInfo: MonitorInfo) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Returns the mouse in virtual screen coordinates (left, top).
-		 */
-		getMousePosition(callback?: (mousePosition: VirtualScreenCoordinates) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves an array of all of the runtime processes that are currently running.
-		 * Each element in the array is an object containing the uuid and the name of the application to which the process belongs.
-		 */
-		getProcessList(callback?: (processInfoList: ProcessInfo[]) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves the Proxy settings.
-		 */
-		getProxySettings(callback?: (proxy: ProxyInfo) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Returns information about the running RVM in an object.
-		 */
-		getRvmInfo(callback?: (rvmInfo: RvmInfo) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Returns the version of the runtime. The version contains the major, minor, build and revision numbers.
-		 */
-		getVersion(callback?: (version: string) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Runs an executable or batch file.
-		 */
-		launchExternalProcess(options: ExternalProcessLaunchInfo, callback?: (payload: { uuid: string }) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Writes the passed message into both the log file and the console.
-		 */
-		log(level: "debug" | "info" | "warn" | "error", message: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Monitors a running process.
-		 */
-		monitorExternalProcess(options: ExternalProcessInfo, callback?: (payload: { uuid: string }) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Opens the passed URL in the default web browser.
-		 */
-		openUrlWithBrowser(url: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * This function call will register a unique id and produce a token. The token can be used to broker an external connection.
-		 */
-		registerExternalConnection(
-			uuid: string,
-			callback?: (detail: {
-				/**
-				 * this will be unique each time
-				 */
-				token: string;
-				/**
-				 * "remote-connection-uuid"
-				 */
-				uuid: string;
-			}) => void,
-			errorCallback?: (reason: string) => void): void;
-		/**
-		 * Removes the process entry for the passed UUID obtained from a prior call of fin.desktop.System.launchExternalProcess().
-		 */
-		releaseExternalProcess(processUuid: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Removes a previously registered event listener from the specified event.
-		 */
-		removeEventListener(
-			type: OpenFinSystemEventType,
-			listener: (event: SystemBaseEvent | DesktopIconClickedEvent | IdleStateChangedEvent | MonitorInfoChangedEvent | SessionChangedEvent) => void,
-			callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Shows the Chrome Developer Tools for the specified window.
-		 */
-		showDeveloperTools(uuid: string, name: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Attempt to close an external process. The process will be terminated if it has not closed after the elapsed timeout in milliseconds.
-		 */
-		terminateExternalProcess(
-			processUuid: string,
-			timeout: number,
-			killTree: boolean,
-			callback?: (info: { result: "clean" | "terminated" | "failed" }) => void,
-			errorCallback?: (reason: string) => void): void;
-		terminateExternalProcess(
-			processUuid: string,
-			timeout: number,
-			callback?: (info: { result: "clean" | "terminated" | "failed" }) => void,
-			errorCallback?: (reason: string) => void): void;
-		/**
-		 * Update the OpenFin Runtime Proxy settings.
-		 */
-		updateProxySettings(type: string, address: string, port: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
-	}
-
-	interface CacheOptions {
-		cache?: boolean;
-		cookies?: boolean;
-		localStorage?: boolean;
-		appcache?: boolean;
-		userData?: boolean;
-	}
-
-	interface AppAssetInfo {
-		src?: string;
-		alias?: string;
-		version?: string;
-		target?: string;
-		args?: string;
-	}
-
-	interface ApplicationInfo {
-		/**
-		 * true when the application is running.
-		 */
-		isRunning?: boolean;
-		/**
-		 * uuid of the application.
-		 */
-		uuid?: string;
-		/**
-		 * uuid of the application that launches this application.
-		 */
-		parentUuid?: string;
-	}
-
-	interface WindowDetails {
-		uuid?: string;
-		mainWindow?: WindowInfo;
-		childWindows?: WindowInfo[];
-	}
-
-	interface WindowInfo {
-		/**
-		 * name of the child window
-		 */
-		name?: string;
-		/**
-		 * top-most coordinate of the child window
-		 */
-		top?: number;
-		/**
-		 * right-most coordinate of the child window
-		 */
-		right?: number;
-		/**
-		 * bottom-most coordinate of the child window
-		 */
-		bottom?: number;
-		/**
-		 * left-most coordinate of the child window
-		 */
-		left?: number;
-	}
-
-	interface HostSpecInfo {
-		/**
-		 * "x86" for 32-bit or "x86_64" for 64-bit
-		 */
-		arch: string;
-		/**
-		 * Same payload as Node's os.cpus()
-		 */
-		cpus: NodeCpuInfo[];
-		gpu: {
-			/**
-			 * Graphics card name
-			 */
-			name: string;
-		};
-		/**
-		 * Same payload as Node's os.totalmem()
-		 */
-		memory: number;
-		/**
-		 * OS name and version/edition
-		 */
-		name: string;
-	}
-
-	interface NodeCpuInfo {
-		model: string;
-		/**
-		 * in MHz
-		 */
-		speed: number;
-		times: {
-			/**
-			 * The number of milliseconds the CPU has spent in user mode.
-			 */
-			user: number;
-			/**
-			 * The number of milliseconds the CPU has spent in nice mode.
-			 */
-			nice: number;
-			/**
-			 * The number of milliseconds the CPU has spent in sys mode.
-			 */
-			sys: number;
-			/**
-			 * The number of milliseconds the CPU has spent in idle mode.
-			 */
-			idle: number;
-			/**
-			 * The number of milliseconds the CPU has spent in irq mode.
-			 */
-			irq: number;
-		};
-	}
-
-	interface LogInfo {
-		/**
-		 * the filename of the log
-		 */
-		name?: string;
-		/**
-		 * the size of the log in bytes
-		 */
-		size?: number;
-		/**
-		 * the unix time at which the log was created "Thu Jan 08 2015 14:40:30 GMT-0500 (Eastern Standard Time)"
-		 */
-		date?: string;
-	}
-
-	interface ProcessInfo {
-		/**
-		 * the percentage of total CPU usage
-		 */
-		cpuUsage?: number;
-		/**
-		 * the application name
-		 */
-		name?: string;
-		/**
-		 * the current nonpaged pool usage in bytes
-		 */
-		nonPagedPoolUsage?: number;
-		/**
-		 * the number of page faults
-		 */
-		pageFaultCount?: number;
-		/**
-		 * the current paged pool usage in bytes
-		 */
-		pagedPoolUsage?: number;
-		/**
-		 * the total amount of memory in bytes that the memory manager has committed
-		 */
-		pagefileUsage?: number;
-		/**
-		 * the peak nonpaged pool usage in bytes
-		 */
-		peakNonPagedPoolUsage?: number;
-		/**
-		 * the peak paged pool usage in bytes
-		 */
-		peakPagedPoolUsage?: number;
-		/**
-		 * the peak value in bytes of pagefileUsage during the lifetime of this process
-		 */
-		peakPagefileUsage?: number;
-		/**
-		 * the peak working set size in bytes
-		 */
-		peakWorkingSetSize?: number;
-		/**
-		 * the native process identifier
-		 */
-		processId?: number;
-		/**
-		 * the application UUID
-		 */
-		uuid?: string;
-		/**
-		 * the current working set size (both shared and private data) in bytes
-		 */
-		workingSetSize?: number;
-	}
-
-	interface ProxyInfo {
-		/**
-		 * the configured Proxy Address
-		 */
-		proxyAddress?: string;
-		/**
-		 * the configured Proxy port
-		 */
-		proxyPort?: number;
-		/**
-		 * Proxy Type
-		 */
-		type?: string;
-	}
-
-	interface RvmInfo {
-		version?: string;
-		"start-time"?: string;
-	}
-
-	interface ExternalProcessLaunchInfo {
-		path?: string;
-		/**
-		 * Additionally note that the executable found in the zip file specified in appAssets
-		 * will default to the one mentioned by appAssets.target
-		 * If the the path below refers to a specific path it will override this default
-		 */
-		alias?: string;
-		/**
-		 * When using alias; if no arguments are passed then the arguments (if any)
-		 * are taken from the 'app.json' file, from the  'args' parameter
-		 * of the 'appAssets' Object with the relevant 'alias'.
-		 * If 'arguments' is passed as a parameter it takes precedence
-		 * over any 'args' set in the 'app.json'.
-		 */
-		arguments?: string;
-		listener?(result: {
-			/**
-			 * "Exited" Or "released" on a call to releaseExternalProcess
-			 */
-			topic?: string;
-			/**
-			 * The mapped UUID which identifies the launched process
-			 */
-			uuid?: string;
-			/*
-			 * Process exit code
-			 */
-			exitCode?: number;
-		}): void;
-		certificate?: CertificationInfo;
-	}
-
-	interface CertificationInfo {
-		/**
-		 * A hex string with or without spaces
-		 */
-		serial?: string;
-		/**
-		 * An internally tokenized and comma delimited string allowing partial or full checks of the subject fields
-		 */
-		subject?: string;
-		/**
-		 * A hex string with or without spaces
-		 */
-		publickey?: string;
-		/**
-		 * A hex string with or without spaces
-		 */
-		thumbprint?: string;
-		/**
-		 * A boolean indicating that the certificate is trusted and not revoked
-		 */
-		trusted?: boolean;
-	}
-
-	interface ExternalProcessInfo {
-		pid?: number;
-		listener?(result: {
-			/**
-			 * "Exited" Or "released" on a call to releaseExternalProcess
-			 */
-			topic?: string;
-			/**
-			 * The mapped UUID which identifies the launched process
-			 */
-			uuid?: string;
-			/*
-				* Process exit code
-				*/
-			exitCode?: number;
-		}): void;
-	}
-
-	interface OpenFinWindowStatic {
-		/**
-		 * Class: Window
-		 *
-		 * new Window(options, callbackopt, errorCallbackopt)
-		 *
-		 * Creates a new OpenFin Window
-		 *
-		 * A basic window that wraps a native HTML window. Provides more fine-grained control over the window state such as the ability to minimize,
-		 * maximize, restore, etc. By default a window does not show upon instantiation; instead the window's show() method must be invoked manually.
-		 * The new window appears in the same process as the parent window.
-		 * @param options - The options of the window
-		 * @param [callback] - Called if the window creation was successful
-		 * @param [callback.successObj] - httpResponseCode
-		 */
-		new (
-			options: WindowOptions,
-			callback?: (successObj: { httpResponseCode: number }) => void,
-			errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): OpenFinWindow;
-		/**
-		 * Returns an instance of the current window.
-		 * @returns Current window
-		 */
-		getCurrent(): OpenFinWindow;
-		/**
-		 * Returns a Window object that wraps an existing window.
-		 */
-		wrap(appUuid: string, windowName: string): OpenFinWindow;
-	}
-
-	/**
-	 * Window
-	 * A basic window that wraps a native HTML window. Provides more fine-grained control over the window state such as the ability to minimize,
-	 * maximize, restore, etc. By default a window does not show upon instantiation; instead the window's show() method must be invoked manually.
-	 * The new window appears in the same process as the parent window.
-	 */
-	interface OpenFinWindow {
-		/**
-		 * Name of window
-		 */
-		name: string;
-		/**
-		 * Returns the native JavaScript "window" object for the window. This method can only be used by the parent application or the window itself,
-		 * otherwise it will return undefined. The same Single-Origin-Policy (SOP) rules apply for child windows created by window.open(url) in that the
-		 * contents of the window object are only accessible if the URL has the same origin as the invoking window. See example below.
-		 * Also, will not work with fin.desktop.Window objects created with fin.desktop.Window.wrap().
-		 * @returns Native window
-		 */
-		getNativeWindow(): Window;
-		/**
-		 * Gets the parent application.
-		 * @returns Parent application
-		 */
-		getParentApplication(): OpenFinApplication;
-		/**
-		 * Gets the parent window.
-		 */
-		getParentWindow(): OpenFinWindow;
-		/**
-		 * Registers an event listener on the specified event.
-		 */
-		addEventListener(
-			type: OpenFinWindowEventType,
-			listener: (event: WindowBaseEvent
-				| WindowAuthRequestedEvent
-				| WindowBoundsEvent
-				| WindowExternalProcessStartedEvent
-				| WindowExternalProcessExited
-				| WindowGroupChangedEvent
-				| WindowHiddenEvent
-				| Window_NavigationRejectedEvent) => void,
-			callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Performs the specified window transitions
-		 */
-		animate(transitions: AnimationTransition, options: AnimationOptions, callback?: (event: any) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Provides credentials to authentication requests
-		 */
-		authenticate(userName: string, password: string, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
-		/**
-		 * Removes focus from the window.
-		 */
-		blur(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Brings the window to the front of the OpenFin window stack.
-		 */
-		bringToFront(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Closes the window.
-		 * @param Close will be prevented from closing when force is false and 'close-requested' has been subscribed to for application's main window.
-		 */
-		close(force?: boolean, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Prevents a user from changing a window's size/position when using the window's frame.
-		 * 'disabled-frame-bounds-changing' is generated at the start of and during a user move/size operation.
-		 * 'disabled-frame-bounds-changed' is generated after a user move/size operation.
-		 * The events provide the bounds that would have been applied if the frame was enabled.
-		 * 'frame-disabled' is generated when an enabled frame becomes disabled.
-		 */
-		disableFrame(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Re-enables user changes to a window's size/position when using the window's frame.
-		 * 'disabled-frame-bounds-changing' is generated at the start of and during a user move/size operation.
-		 * 'disabled-frame-bounds-changed' is generated after a user move/size operation.
-		 * The events provide the bounds that would have been applied if the frame was enabled.
-		 * 'frame-enabled' is generated when a disabled frame has becomes enabled.
-		 */
-		enableFrame(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Flashes the window's frame and taskbar icon until the window is activated.
-		 */
-		flash(options?: any, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Gives focus to the window.
-		 */
-		focus(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Gets the current bounds (top, left, width, height) of the window.
-		 */
-		getBounds(callback?: (bounds: WindowBounds) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves an array containing wrapped fin.desktop.Windows that are grouped with this window. If a window is not in a group an empty array is returned.
-		 * Please note that calling window is included in the result array.
-		 */
-		getGroup(callback?: (group: OpenFinWindow[]) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Gets the current settings of the window.
-		 */
-		getOptions(callback?: (options: WindowOptions) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Gets a base64 encoded PNG snapshot of the window.
-		 */
-		getSnapshot(callback?: (base64Snapshot: string) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Gets the current state ("minimized", "maximized", or "restored") of the window.
-		 */
-		getState(callback?: (state: "minimized" | "maximized" | "restored") => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Returns the zoom level of the window.
-		 */
-		getZoomLevel(callback?: (level: number) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Hides the window.
-		 */
-		hide(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Determines if the window is currently showing.
-		 */
-		isShowing(callback?: (showing: boolean) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Joins the same window group as the specified window.
-		 */
-		joinGroup(target: OpenFinWindow, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Leaves the current window group so that the window can be move independently of those in the group.
-		 */
-		leaveGroup(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Maximizes the window.
-		 */
-		maximize(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Merges the instance's window group with the same window group as the specified window
-		 */
-		mergeGroups(target: OpenFinWindow, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Minimizes the window.
-		 */
-		minimize(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Moves the window by a specified amount.
-		 */
-		moveBy(deltaLeft: number, deltaTop: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Moves the window to a specified location.
-		 */
-		moveTo(left: number, top: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Removes a previously registered event listener from the specified event.
-		 */
-		removeEventListener(
-			type: OpenFinWindowEventType,
-			listener: (event: WindowBaseEvent
-				| WindowAuthRequestedEvent
-				| WindowBoundsEvent
-				| WindowExternalProcessStartedEvent
-				| WindowExternalProcessExited
-				| WindowGroupChangedEvent
-				| WindowHiddenEvent
-				| Window_NavigationRejectedEvent) => void,
-			callback?: () => void,
-			errorCallback?: (reason: string) => void): void;
-		/**
-		 * Resizes the window by a specified amount.
-		 */
-		resizeBy(deltaWidth: number, deltaHeight: number, anchor: OpenFinAnchor, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Resizes the window by a specified amount.
-		 */
-		resizeTo(width: number, height: number, anchor: OpenFinAnchor, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Restores the window to its normal state (i.e., unminimized, unmaximized).
-		 */
-		restore(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Will bring the window to the front of the entire stack and give it focus.
-		 */
-		setAsForeground(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Sets the window's size and position
-		 */
-		setBounds(left: number, top: number, width: number, height: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Sets the zoom level of the window.
-		 */
-		setZoomLevel(level: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Shows the window if it is hidden.
-		 * @param Show will be prevented from closing when force is false and 'show-requested' has been subscribed to for application's main window.
-		 */
-		show(force?: boolean, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Shows the window if it is hidden at the specified location. If the toggle parameter is set to true, the window will alternate between showing and hiding.
-		 */
-		showAt(left: number, top: number, force?: boolean, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Stops the taskbar icon from flashing.
-		 */
-		stopFlashing(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Updates the window using the passed options
-		 */
-		updateOptions(options: WindowOptions, callback?: () => void, errorCallback?: (reason: string) => void): void;
-	}
-
-	interface ApplicationBaseEvent {
-		topic: string;
-		type: OpenFinApplicationEventType;
-		uuid: string;
-	}
-
-	interface TrayIconClickedEvent extends ApplicationBaseEvent {
-		button: number; // 0 for left, 1 for middle, 2 for right
-		monitorInfo: MonitorInfo;
-		x: number; // the cursor x coordinate
-		y: number; // the cursor y coordinate
-	}
-
-	interface WindowEvent extends ApplicationBaseEvent {
-		name: string;
-	}
-
-	interface WindowAlertRequestedEvent extends WindowEvent {
-		message: string;
-		url: string;
-	}
-
-	interface WindowAuthRequested extends WindowEvent {
-		authInfo: {
-			host: string;
-			isProxy: boolean;
-			port: number;
-			realm: string;
-			scheme: string;
-		};
-	}
-
-	interface WindowNavigationRejectedEvent extends WindowEvent {
-		sourceName: string;
-		url: string;
-	}
-
-	interface WindowEndLoadEvent extends WindowEvent {
-		documentName: string;
-		isMain: boolean;
-	}
-
-	interface MonitorInfoChangedEvent extends MonitorInfo {
-		topic: "system";
-		type: "monitor-info-changed";
-	}
-
-	interface MonitorInfo {
-		nonPrimaryMonitors: MonitorInfoDetail[];
-		primaryMonitor: MonitorInfoDetail;
-		reason: string;
-		taskbar: {
-			edge: "left" | "right" | "top" | "bottom",
-			rect: MontiorCoordinates
-		};
-		topic: "system";
-		type: "monitor-info-changed";
-		virtualScreen: MontiorCoordinates;
-	}
-
-	interface MonitorInfoDetail {
-		availableRect: MontiorCoordinates;
-		deviceId: string;
-		displayDeviceActive: boolean;
-		monitorRect: MontiorCoordinates;
-		name: string;
-	}
-
-	interface MontiorCoordinates {
-		bottom: number;
-		left: number;
-		right: number;
-		top: number;
-	}
-
-	interface VirtualScreenCoordinates {
-		left: number;
-		top: number;
-	}
-
-	interface SystemBaseEvent {
-		topic: string;
-		type: OpenFinSystemEventType;
-		uuid: string;
-	}
-
-	interface DesktopIconClickedEvent {
-		mouse: {
-			/**
-			 * the left virtual screen coordinate of the mouse
-			 */
-			left: number,
-			/**
-			 * the top virtual screen coordinate of the mouse
-			 */
-			top: number
-		};
-		/**
-		 * the number of milliseconds that have elapsed since the system was started,
-		 */
-		tickCount: number;
-		topic: "system";
-		type: "desktop-icon-clicked";
-	}
-
-	interface IdleStateChangedEvent {
-		/**
-		 * How long in milliseconds since the user has been idle.
-		 */
-		elapsedTime: number;
-		/**
-		 * true when the user is idle,false when the user has returned;
-		 */
-		isIdle: boolean;
-		topic: "system";
-		type: "idle-state-changed";
-	}
-
-	interface WindowBaseEvent {
-		/**
-		 * the name of the window
-		 */
-		name: string;
-		/**
-		 * always window
-		 */
-		topic: "window";
-		/**
-		 * window event type
-		 */
-		type: OpenFinWindowEventType;
-		/**
-		 * the UUID of the application the window belongs to
-		 */
-		uuid: string;
-	}
-
-	interface WindowAuthRequestedEvent extends WindowBaseEvent {
-		authInfo: {
-			host: string;
-			isProxy: boolean;
-			port: number;
-			realm: string;
-			scheme: string;
-		};
-	}
-
-	interface WindowBoundsEvent extends WindowBaseEvent {
-		/**
-		 * describes what kind of change occurred.
-		 * 0 means a change in position.
-		 * 1 means a change in size.
-		 * 2 means a change in position and size.
-		 */
-		changeType: number;
-		/**
-		 * true when pending changes have been applied to the window.
-		 */
-		deferred: boolean;
-		/**
-		 * the new height of the window.
-		 */
-		height: number;
-		/**
-		 * the left-most coordinate of the window.
-		 */
-		left: number;
-		/**
-		 * the top-most coordinate of the window.
-		 */
-		top: number;
-
-		type: "bounds-changed" | "bounds-changing" | "disabled-frame-bounds-changed" | "disabled-frame-bounds-changing";
-		/**
-		 * the new width of the window.
-		 */
-		width: number;
-	}
-
-	interface WindowExternalProcessStartedEvent extends WindowBaseEvent {
-		/**
-		 * the process handle uuid
-		 */
-		processUuid: string;
-		type: "external-process-started";
-	}
-
-	interface WindowExternalProcessExited extends WindowBaseEvent {
-		/**
-		 * the process exit code
-		 */
-		exitCode: number;
-		/**
-		 * the process handle uuid
-		 */
-		processUuid: string;
-		type: "external-process-exited";
-	}
-
-	interface WindowGroupChangedEvent extends WindowBaseEvent {
-		/**
-		 * Which group array the window that the event listener was registered on is included in:
-		 * 'source' The window is included in sourceGroup.
-		 * 'target' The window is included in targetGroup.
-		 * 'nothing' The window is not included in sourceGroup nor targetGroup.
-		 */
-		memberOf: "source" | "target" | "nothing";
-		/**
-		 * The reason this event was triggered.
-		 * 'leave' A window has left the group due to a leave or merge with group.
-		 * 'join' A window has joined the group.
-		 * 'merge' Two groups have been merged together.
-		 * 'disband' There are no other windows in the group.
-		 */
-		reason: "leave" | "join" | "merge" | "disband";
-		/**
-		 * All the windows in the group the sourceWindow originated from.
-		 */
-		sourceGroup: WindowOfGroupInfo[];
-		/**
-		 * The UUID of the application the sourceWindow belongs to The source window is the window in which (merge/join/leave)group(s) was called.
-		 */
-		sourceWindowAppUuid: string;
-		/**
-		 * the name of the sourcewindow.The source window is the window in which(merge / join / leave) group(s) was called.
-		 */
-		sourceWindowName: string;
-		/**
-		 * All the windows in the group the targetWindow orginated from
-		 */
-		targetGroup: WindowOfGroupInfo[];
-		/**
-		 * The UUID of the application the targetWindow belongs to. The target window is the window that was passed into (merge/join) group(s).
-		 */
-		targetWindowAppUuid: string;
-		/**
-		 * The name of the targetWindow. The target window is the window that was passed into (merge/join) group(s).
-		 */
-		targetWindowName: string;
-		type: "group-changed";
-	}
-
-	interface WindowOfGroupInfo {
-		/**
-		 * The UUID of the application this window entry belongs to.
-		 */
-		appUuid: string;
-		/**
-		 * The name of this window entry.
-		 */
-		windowName: string;
-	}
-
-	interface WindowHiddenEvent extends WindowBaseEvent {
-		/**
-		 * What action prompted the close.
-		 * The reasons are: "hide", "hide-on-close"
-		 */
-		reason: "hide" | "hide-on-close";
-		type: "hidden";
-	}
-
-	interface Window_NavigationRejectedEvent {
-		name: string;
-		/**
-		 * source of navigation window name
-		 */
-		sourceName: string;
-		topic: "navigation-rejected";
-		/**
-		 * Url that was not reached "http://blocked-content.url"
-		 */
-		url: string;
-		/**
-		 * the UUID of the application the window belongs to.
-		 */
-		uuid: string;
-	}
-
-	interface AnimationTransition {
-		opacity?: {
-			/**
-			 * This value is clamped from 0.0 to 1.0
-			 */
-			opacity?: number;
-			/**
-			 * The total time in milliseconds this transition should take.
-			 */
-			duration?: number;
-			/**
-			 * Treat 'opacity' as absolute or as a delta. Defaults to false.
-			 */
-			relative?: boolean;
-		};
-		position?: {
-			/**
-			 * Defaults to the window's current left position in virtual screen coordinates.
-			 */
-			left?: number;
-			/**
-			 * Defaults to the window's current top position in virtual screen coordinates.
-			 */
-			top?: number;
-			/**
-			 * The total time in milliseconds this transition should take.
-			 */
-			duration?: number;
-			/**
-			 * Treat 'left' and 'top' as absolute or as deltas. Defaults to false.
-			 */
-			relative?: boolean;
-		};
-		size?: {
-			/**
-			 * Optional if height is present. Defaults to the window's current width.
-			 */
-			width?: number;
-			/**
-			 * Optional if width is present. Defaults to the window's current height.
-			 */
-			height?: number;
-			/**
-			 * The total time in milliseconds this transition should take.
-			 */
-			duration?: number;
-			/**
-			 * Treat 'width' and 'height' as absolute or as deltas. Defaults to false.
-			 */
-			relative?: boolean;
-		};
-	}
-
-	interface AnimationOptions {
-		/**
-		 * This option interrupts the current animation. When false it pushes this animation onto the end of the animation queue.
-		 */
-		interrupt?: boolean;
-		/**
-		 * Transition effect. Defaults to 'ease-in-out'.
-		 */
-		tween?: OpenFinTweenType;
-	}
-
-	interface WindowBounds {
-		/**
-		 * the height of the window.
-		 */
-		height?: number;
-		/**
-		 * left-most coordinate of the window.
-		 */
-		left?: number;
-		/**
-		 * top-most coordinate of the window.
-		 */
-		top?: number;
-		/**
-		 * the width of the window.
-		 */
-		width?: number;
-	}
-
-	interface SessionChangedEvent {
-		/**
-		 * the action that triggered this event:
-		 */
-		reason: "lock"
-		| "unlock"
-		| "remote-connect"
-		| "remote-disconnect"
-		| "unknown";
-		topic: "system";
-		type: "session-changed";
-	}
-
-	interface LaunchInfo {
-		launchMode: "fin-protocol"
-		| "fins-protocol"
-		| "shortcut"
-		| "command-line"
-		| "adapter"
-		| "other"
-		| string;
-	}
-
-	type OpenFinTweenType = "linear"
-		| "ease-in"
-		| "ease-out"
-		| "ease-in-out"
-		| "ease-in-quad"
-		| "ease-out-quad"
-		| "ease-in-out-quad"
-		| "ease-in-cubic"
-		| "ease-out-cubic"
-		| "ease-in-out-cubic"
-		| "ease-out-bounce"
-		| "ease-in-back"
-		| "ease-out-back"
-		| "ease-in-out-back"
-		| "ease-in-elastic"
-		| "ease-out-elastic"
-		| "ease-in-out-elastic";
-
-	type OpenFinApplicationEventType = "closed"
-		| "connected"
-		| "crashed"
-		| "initialized"
-		| "manifest-changed"
-		| "not-responding"
-		| "out-of-memory"
-		| "responding"
-		| "run-requested"
-		| "started"
-		| "tray-icon-clicked"
-		| "window-alert-requested"
-		| "window-auth-requested"
-		| "window-closed"
-		| "window-created"
-		| "window-end-load"
-		| "window-navigation-rejected"
-		| "window-show-requested"
-		| "window-start-load";
-
-	type OpenFinExternalApplicationEventType = "connected"
-		| "disconnected";
-
-	type OpenFinSystemEventType = "application-closed"
-		| "application-crashed"
-		| "application-created"
-		| "application-started"
-		| "desktop-icon-clicked"
-		| "idle-state-changed"
-		| "monitor-info-changed"
-		| "session-changed";
-
-	type OpenFinWindowEventType = "auth-requested"
-		| "blurred"
-		| "bounds-changed"
-		| "bounds-changing"
-		| "close-requested"
-		| "closed"
-		| "disabled-frame-bounds-changed"
-		| "disabled-frame-bounds-changing"
-		| "embedded"
-		| "external-process-exited"
-		| "external-process-started"
-		| "focused"
-		| "frame-disabled"
-		| "frame-enabled"
-		| "group-changed"
-		| "hidden"
-		| "initialized"
-		| "maximized"
-		| "minimized"
-		| "navigation-rejected"
-		| "restored"
-		| "show-requested"
-		| "shown";
-
-	type OpenFinAnchor = "top-left"
-		| "top-right"
-		| "bottom-left"
-		| "bottom-right";
-}

From 9e65084d50afd0d102407a8f96a5d6656dd59f9e Mon Sep 17 00:00:00 2001
From: Alex Sherwin <alex.sherwin@gmail.com>
Date: Mon, 19 Mar 2018 22:52:49 -0400
Subject: [PATCH 0681/1382] Updated DbCreateOptions.promoteBuffers to be
 boolean, updated docs

Existing value was a number and the comment associated was not the
correct information.  Updated to be a boolean and updated comment
to be from https://mongodb.github.io/node-mongodb-native/3.0/api/MongoClient.html#.connect
---
 types/mongodb/index.d.ts       | 8 ++++----
 types/mongodb/mongodb-tests.ts | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/types/mongodb/index.d.ts b/types/mongodb/index.d.ts
index ba27943739..389f1390a3 100644
--- a/types/mongodb/index.d.ts
+++ b/types/mongodb/index.d.ts
@@ -93,7 +93,7 @@ export interface MongoClientOptions extends
     logger?: Object;
     // Default: false;
     validateOptions?: Object;
-    // The name of the application that created this MongoClient instance. 
+    // The name of the application that created this MongoClient instance.
     appname?: string;
 }
 
@@ -160,8 +160,8 @@ export interface DbCreateOptions extends CommonOptions {
     raw?: boolean;
     // Default: true; Promotes Long values to number if they fit inside the 53 bits resolution.
     promoteLongs?: boolean;
-    // Default: -1 (unlimited); Amount of operations the driver buffers up untill discard any new ones
-    promoteBuffers?: number;
+    // Default: false; Promotes Binary BSON values to native Node Buffers
+    promoteBuffers?: boolean;
     // the prefered read preference. use 'ReadPreference' class.
     readPreference?: ReadPreference | string;
     // Default: true; Promotes BSON values to native types where possible, set to false to only receive wrapper types.
@@ -1495,7 +1495,7 @@ export interface ChangeStreamOptions {
 }
 
 type GridFSBucketWriteStreamId = string | number | Object | ObjectID;
-               
+
 export interface LoggerOptions {
     loggerLevel?: string // Custom logger function
     logger?: log // Override default global log level.
diff --git a/types/mongodb/mongodb-tests.ts b/types/mongodb/mongodb-tests.ts
index 852522aadc..af307ce6d8 100644
--- a/types/mongodb/mongodb-tests.ts
+++ b/types/mongodb/mongodb-tests.ts
@@ -25,7 +25,8 @@ let options: mongodb.MongoClientOptions = {
     sslCA: ['str'],
     sslCert: new Buffer(999),
     sslKey: new Buffer(999),
-    sslPass: new Buffer(999)
+    sslPass: new Buffer(999),
+    promoteBuffers: false
 }
 MongoClient.connect('mongodb://127.0.0.1:27017/test', options, function (err: mongodb.MongoError, client: mongodb.MongoClient) {
     if (err) throw err;

From bacb3f54af840f2585caf4b2fa457157a7699d5a Mon Sep 17 00:00:00 2001
From: Justin Rockwood <justinrockwood@hotmail.com>
Date: Mon, 19 Mar 2018 20:00:59 -0700
Subject: [PATCH 0682/1382] fix(inquirer): add missing transformer function

---
 types/inquirer/index.d.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/types/inquirer/index.d.ts b/types/inquirer/index.d.ts
index c0aba80f23..804f96411f 100644
--- a/types/inquirer/index.d.ts
+++ b/types/inquirer/index.d.ts
@@ -112,6 +112,12 @@ declare namespace inquirer {
          * The value returned will be added to the Answers hash.
          */
         filter?(input: string): string | Promise<string>;
+        /**
+         * Receive the user input and return the transformed value to be displayed to the user. The
+         * transformation only impacts what is shown while editing. It does not impact the answers
+         * hash.
+         */
+        transformer?(input: string): string;
         /**
          * Receive the current user answers hash and should return true or false depending on whether or
          * not this question should be asked. The value can also be a simple boolean.

From 054f23c54d01e69681daa8e18cb138fd051f3e1b Mon Sep 17 00:00:00 2001
From: Justin Rockwood <justinrockwood@hotmail.com>
Date: Mon, 19 Mar 2018 20:01:27 -0700
Subject: [PATCH 0683/1382] test(inquirer): add tests for added functionality

---
 types/inquirer/inquirer-tests.ts | 42 ++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/types/inquirer/inquirer-tests.ts b/types/inquirer/inquirer-tests.ts
index 7cc0fddd2a..aa545adae0 100644
--- a/types/inquirer/inquirer-tests.ts
+++ b/types/inquirer/inquirer-tests.ts
@@ -584,3 +584,45 @@ inquirer.prompt(
         console.log(JSON.stringify(answers, null, '  '));
     }
 );
+
+//
+// Other tests not covered in the examples provided with inquirer
+//
+
+// Tests promises from default, choices, validate, filter, and when
+
+interface AsyncAnswers {
+    choice: 'ONE' | 'TWO' | 'THREE';
+    choseTwo: boolean;
+    confirmation: string;
+}
+
+async function testAsyncPrompt(): Promise<void> {
+    const answers: AsyncAnswers = await inquirer.prompt<AsyncAnswers>([
+        {
+            type: 'list',
+            name: 'choice',
+            message: 'How many do you want?',
+            default: () => Promise.resolve('two'),
+            choices: () => Promise.resolve(['one', 'two', 'three']),
+            filter: (input: string) => Promise.resolve(input.toUpperCase()),
+        },
+        {
+            type: 'confirm',
+            name: 'choseTwo',
+            message: 'Are you sure you want two?',
+            when: (choices: AsyncAnswers) => Promise.resolve(choices.choice === 'TWO'),
+        },
+        {
+            type: 'input',
+            name: 'confirmation',
+            message: 'Type YES if you really, really want it',
+            validate: (input: string) => Promise.resolve(input.toUpperCase() === 'YES' ? true : 'Enter YES'),
+            transformer: (input: string) => input.toUpperCase(),
+        },
+    ]);
+
+    console.log(JSON.stringify(answers, null, '  '));
+}
+
+testAsyncPrompt();

From f6b30970cb0fbbfc2d6bf06c49edbfbf77b18b39 Mon Sep 17 00:00:00 2001
From: Todd Bealmear <todd@saildrone.com>
Date: Mon, 19 Mar 2018 21:09:25 -0700
Subject: [PATCH 0684/1382] :bug: Fix regression in Model.scope

---
 types/sequelize/index.d.ts         | 2 +-
 types/sequelize/sequelize-tests.ts | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/types/sequelize/index.d.ts b/types/sequelize/index.d.ts
index 7d72a0b096..7f0a5d6da4 100644
--- a/types/sequelize/index.d.ts
+++ b/types/sequelize/index.d.ts
@@ -3793,7 +3793,7 @@ declare namespace sequelize {
          * @return Model A reference to the model, with the scope(s) applied. Calling scope again on the returned
          *     model will clear the previous scope.
          */
-        scope(options?: string | ScopeOptions | AnyWhereOptions | Array<string | ScopeOptions | AnyWhereOptions>): Model<TInstance, TAttributes>;
+        scope(options?: string | ScopeOptions | AnyWhereOptions | Array<string | ScopeOptions | AnyWhereOptions>): this;
 
         /**
          * Search for multiple instances.
diff --git a/types/sequelize/sequelize-tests.ts b/types/sequelize/sequelize-tests.ts
index 5d1f6eed34..9436ea0306 100644
--- a/types/sequelize/sequelize-tests.ts
+++ b/types/sequelize/sequelize-tests.ts
@@ -10,10 +10,14 @@ import Bluebird = require('bluebird');
 interface AnyAttributes { [name: string]: boolean | number | string | object; };
 interface AnyInstance extends Sequelize.Instance<AnyAttributes> { };
 
+interface UserModel extends Sequelize.Model<AnyInstance, AnyAttributes> {
+    findUser?(arbitraryThing: any): Promise<AnyInstance>;
+}
+
 var s         = new Sequelize( '' );
 var sequelize = s;
 var DataTypes = Sequelize;
-var User      = s.define<AnyInstance, AnyAttributes>( 'user', {} );
+var User: UserModel = s.define<AnyInstance, AnyAttributes>( 'user', {} );
 var user      = User.build();
 var Task      = s.define<AnyInstance, AnyAttributes>( 'task', {} );
 var Group     = s.define<AnyInstance, AnyAttributes>( 'group', {} );
@@ -893,6 +897,7 @@ User.addScope('lowAccessWithParam', function(id: number) {
 } );
 
 User.scope( 'lowAccess' ).count();
+User.scope( 'lowAccess' ).findUser( 'foo' );
 User.scope( { where : { parent_id : 2 } } );
 User.scope( [ 'lowAccess', { method: ['lowAccessWithParam', 2] }, { where : { parent_id : 2 } } ] )
 

From 387b17a0846d1d7e902af138870bed2505450f2c Mon Sep 17 00:00:00 2001
From: karak <karak97@gmail.com>
Date: Tue, 20 Mar 2018 13:36:12 +0900
Subject: [PATCH 0685/1382] [karma-viewport] Added boilerplate.

---
 types/karma-viewport/index.d.ts              | 13 ++++++++++++
 types/karma-viewport/karma-viewport-tests.ts |  0
 types/karma-viewport/tsconfig.json           | 22 ++++++++++++++++++++
 types/karma-viewport/tslint.json             |  1 +
 4 files changed, 36 insertions(+)
 create mode 100644 types/karma-viewport/index.d.ts
 create mode 100644 types/karma-viewport/karma-viewport-tests.ts
 create mode 100644 types/karma-viewport/tsconfig.json
 create mode 100644 types/karma-viewport/tslint.json

diff --git a/types/karma-viewport/index.d.ts b/types/karma-viewport/index.d.ts
new file mode 100644
index 0000000000..e03d76bb1a
--- /dev/null
+++ b/types/karma-viewport/index.d.ts
@@ -0,0 +1,13 @@
+// Type definitions for karma-viewport 0.4
+// Project: https://github.com/squidfunk/karma-viewport
+// Definitions by: My Self <https://github.com/me>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = karma_viewport;
+
+declare const karma_viewport: {
+    "framework:viewport": string[];
+    "middleware:viewport": string[];
+    "preprocessor:viewport": string[];
+};
+
diff --git a/types/karma-viewport/karma-viewport-tests.ts b/types/karma-viewport/karma-viewport-tests.ts
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/types/karma-viewport/tsconfig.json b/types/karma-viewport/tsconfig.json
new file mode 100644
index 0000000000..e0574b5659
--- /dev/null
+++ b/types/karma-viewport/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "karma-viewport-tests.ts"
+    ]
+}
diff --git a/types/karma-viewport/tslint.json b/types/karma-viewport/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/karma-viewport/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 20319d09096758ace31ea6b406ac8ba2780a8bc9 Mon Sep 17 00:00:00 2001
From: Phil Nova <pnova8@gmail.com>
Date: Mon, 19 Mar 2018 21:41:09 -0700
Subject: [PATCH 0686/1382] Make destination nullable

---
 types/react-beautiful-dnd/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/react-beautiful-dnd/index.d.ts b/types/react-beautiful-dnd/index.d.ts
index 063fc43a0c..02bc9eaab1 100644
--- a/types/react-beautiful-dnd/index.d.ts
+++ b/types/react-beautiful-dnd/index.d.ts
@@ -29,7 +29,7 @@ export interface DragStart {
 }
 
 export interface DragUpdate extends DragStart {
-    destination?: DraggableLocation;
+    destination?: DraggableLocation | null;
 }
 
 export interface DropResult {

From 31246bf64c16091ac638ccb74a3ffa85243ddd06 Mon Sep 17 00:00:00 2001
From: karak <karak97@gmail.com>
Date: Tue, 20 Mar 2018 14:00:01 +0900
Subject: [PATCH 0687/1382] [karma-viewport] Added a type definition and tests
 of it.

---
 types/karma-viewport/index.d.ts              | 125 ++++++++++++++++++-
 types/karma-viewport/karma-viewport-tests.ts |  48 +++++++
 types/karma-viewport/tsconfig.json           |   4 +-
 3 files changed, 170 insertions(+), 7 deletions(-)

diff --git a/types/karma-viewport/index.d.ts b/types/karma-viewport/index.d.ts
index e03d76bb1a..451f48d8cf 100644
--- a/types/karma-viewport/index.d.ts
+++ b/types/karma-viewport/index.d.ts
@@ -2,12 +2,125 @@
 // Project: https://github.com/squidfunk/karma-viewport
 // Definitions by: My Self <https://github.com/me>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// Type definition file for 'karma-viewport'
+// https://www.npmjs.com/package/karma-viewport
 
-export = karma_viewport;
+declare namespace KarmaViewport {
+    interface Breakpoint {
+        name: string;
+        size: {
+            width: number,
+            height: number,
+        };
+    }
 
-declare const karma_viewport: {
-    "framework:viewport": string[];
-    "middleware:viewport": string[];
-    "preprocessor:viewport": string[];
-};
+    interface Config {
+        /** Context selector */
+        context: string;
+        /** Breakpoints */
+        breakpoints: Breakpoint[];
+    }
 
+    class Viewport {
+        /**
+         * Create viewport resizer
+         *
+         * @param config - Configuration
+         * @param context - Initialization context
+         */
+        constructor(config: Config, context: Window);
+
+        /**
+         * Load and embed document into viewport
+         *
+         * @param url - URL of document to load
+         * @param cb - Callback to execute after document was loaded
+         */
+        load(url: string, cb: () => void): void;
+
+        /**
+         * Set viewport to number or array
+         */
+        set(width: number, height?: number): void;
+
+        /**
+         * Set viewport to breakpoint identifier
+         */
+        set(name: string): void;
+
+        /**
+         * Reset viewport
+         */
+        reset(): void;
+
+        /**
+         * Execute a callback for all breakpoints between the first and last given
+         *
+         * @example
+         *   viewport.between("mobile", "tablet", name => {
+         *     ...
+         *   })
+         *
+         * @param first - First breakpoint name
+         * @param last - Last breakpoint name
+         * @param cb - Callback to execute after resizing
+         */
+        between(first: string, last: string, cb: (name: string) => void): void;
+
+        /**
+         * Execute a callback for all breakpoints
+         *
+         * @example
+         *   viewport.each(name => {
+         *     ...
+         *   })
+         *
+         * @param cb - Callback to execute after resizing
+         */
+        each(cb: (name: string) => void): void;
+
+        /**
+         * Execute a callback starting at the given breakpoint
+         *
+         * @example
+         *   viewport.from("tablet", name => {
+         *     ...
+         *   })
+         *
+         * @param first - First breakpoint name
+         * @param cb - Callback to execute after resizing
+         */
+        from(first: string, cb: (name: string) => void): void;
+
+        /**
+         * Execute a callback ending at the given breakpoint
+         *
+         * @example
+         *   viewport.to("tablet", name => {
+         *     ...
+         *   })
+         *
+         * @param last - Last breakpoint name
+         * @param cb - Callback to execute after resizing
+         */
+        to(last: string, cb: (name: string) => void): void;
+
+        /**
+         * Retrieve configuration
+         *
+         * @return Configuration
+         */
+        readonly config: Config; // get config()
+
+        /**
+         * Retrieve context element
+         *
+         * @return context element
+         */
+        readonly element: HTMLIFrameElement; // get element()
+    }
+}
+
+declare const viewport: KarmaViewport.Viewport;
+
+export = viewport;
diff --git a/types/karma-viewport/karma-viewport-tests.ts b/types/karma-viewport/karma-viewport-tests.ts
index e69de29bb2..d76ea9d6fd 100644
--- a/types/karma-viewport/karma-viewport-tests.ts
+++ b/types/karma-viewport/karma-viewport-tests.ts
@@ -0,0 +1,48 @@
+import * as viewport from 'karma-viewport';
+
+// Set to 320px x 100%
+viewport.set(320);
+
+// Set to 320px x 480px
+viewport.set(320, 480);
+
+// Set to 320px x 480px by breakpoints
+viewport.set("mobile");
+
+// Reset to 100% x 100%
+viewport.reset();
+
+// Load entire webpages for testing:
+viewport.load("/path/to/fixture.html", () => console.log('done'));
+
+// Run tests for mobile, tablet and screen
+viewport.each(name => {
+    // ...
+});
+
+// Run tests for tablet and screen
+viewport.from("tablet", name => {
+    // ...
+});
+
+// Run tests for mobile and tablet
+viewport.to("tablet", name => {
+    // ...
+});
+
+// Run tests for tablet and screen
+viewport.between("tablet", "screen", name => {
+    // ...
+});
+
+// get config
+viewport.config.breakpoints.forEach(breakpoint => {
+    const name: string = breakpoint.name;
+    const width: number = breakpoint.size.width;
+    const height: number = breakpoint.size.height;
+});
+
+const contextSelector: string = viewport.config.context;
+
+// get element
+const iframe: HTMLIFrameElement = viewport.element;
diff --git a/types/karma-viewport/tsconfig.json b/types/karma-viewport/tsconfig.json
index e0574b5659..def40ab217 100644
--- a/types/karma-viewport/tsconfig.json
+++ b/types/karma-viewport/tsconfig.json
@@ -2,11 +2,13 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es6"
+            "es6",
+            "dom"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"

From c87f850b4943f3fb92889945ad5796e9f96d0d70 Mon Sep 17 00:00:00 2001
From: karak <karak97@gmail.com>
Date: Tue, 20 Mar 2018 14:09:39 +0900
Subject: [PATCH 0688/1382] [karma-viewport] Migrated to global form.

---
 types/karma-viewport/index.d.ts              | 2 --
 types/karma-viewport/karma-viewport-tests.ts | 2 --
 2 files changed, 4 deletions(-)

diff --git a/types/karma-viewport/index.d.ts b/types/karma-viewport/index.d.ts
index 451f48d8cf..cb220bfc5b 100644
--- a/types/karma-viewport/index.d.ts
+++ b/types/karma-viewport/index.d.ts
@@ -122,5 +122,3 @@ declare namespace KarmaViewport {
 }
 
 declare const viewport: KarmaViewport.Viewport;
-
-export = viewport;
diff --git a/types/karma-viewport/karma-viewport-tests.ts b/types/karma-viewport/karma-viewport-tests.ts
index d76ea9d6fd..f220f35d98 100644
--- a/types/karma-viewport/karma-viewport-tests.ts
+++ b/types/karma-viewport/karma-viewport-tests.ts
@@ -1,5 +1,3 @@
-import * as viewport from 'karma-viewport';
-
 // Set to 320px x 100%
 viewport.set(320);
 

From e1f320d2d696601fc1a6008baf6e40954e0c1dbc Mon Sep 17 00:00:00 2001
From: pvavrik <pavelv@salsitasoft.com>
Date: Tue, 20 Mar 2018 09:16:47 +0100
Subject: [PATCH 0689/1382] Three: add ExtrudeBufferGeometry needed by
 TextBufferGeometry

---
 types/three/three-core.d.ts | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/types/three/three-core.d.ts b/types/three/three-core.d.ts
index d16bc73140..0886cb63d5 100644
--- a/types/three/three-core.d.ts
+++ b/types/three/three-core.d.ts
@@ -6913,6 +6913,18 @@ export class ExtrudeGeometry extends Geometry {
     addShape(shape: Shape, options?: any): void;
 }
 
+export class ExtrudeBufferGeometry extends BufferGeometry {
+    constructor(shapes?: Shape[], options?: any);
+
+    static WorldUVGenerator: {
+        generateTopUV(geometry: Geometry, vertices: number[], indexA: number, indexB: number, indexC: number): Vector2[];
+        generateSideWallUV(geometry: Geometry, vertices: number[], indexA: number, indexB: number, indexC: number, indexD: number): Vector2[];
+    };
+
+    addShapeList(shapes: Shape[], options?: any): void;
+    addShape(shape: Shape, options?: any): void;
+}
+
 export class IcosahedronBufferGeometry extends PolyhedronBufferGeometry {
     constructor(radius?: number, detail?: number);
 }

From 08a1b7e42eb4e5489828300cf851c0ddcf1d50f6 Mon Sep 17 00:00:00 2001
From: lincoln <lincoln@dynamsoft.com>
Date: Tue, 20 Mar 2018 16:50:33 +0800
Subject: [PATCH 0690/1382] add interfaces

---
 types/dwt/addon.pdf.d.ts |   10 +-
 types/dwt/index.d.ts     | 3068 ++++++++++++++++++++------------------
 2 files changed, 1656 insertions(+), 1422 deletions(-)

diff --git a/types/dwt/addon.pdf.d.ts b/types/dwt/addon.pdf.d.ts
index ef0980abfd..65fcaa82a0 100644
--- a/types/dwt/addon.pdf.d.ts
+++ b/types/dwt/addon.pdf.d.ts
@@ -1,5 +1,13 @@
+// Type definitions for Dynamsoft WebTwain PDF Addon
+// Project: http://www.dynamsoft.com/Products/WebTWAIN_Overview.aspx
+// Definitions by: Xiao Ling <https://github.com/yushulx>
+//                 Lincoln Hu <https://github.com/lincoln2018>
+//                 Tom Kent <https://github.com/Tom-Dynamsoft>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
 /*!
-* Dynamsoft WebTwain PDF Addon
+* Based on Dynamsoft WebTwain JavaScript Intellisense
 * Product: Dynamsoft Web Twain
 * Web Site: http://www.dynamsoft.com
 *
diff --git a/types/dwt/index.d.ts b/types/dwt/index.d.ts
index b940c6ae4e..e0682921ee 100644
--- a/types/dwt/index.d.ts
+++ b/types/dwt/index.d.ts
@@ -3,11 +3,12 @@
 // Definitions by: Xiao Ling <https://github.com/yushulx>
 //                 Josh Hall <https://github.com/jbh>
 //                 Lincoln Hu <https://github.com/lincoln2018>
+//                 Tom Kent <https://github.com/Tom-Dynamsoft>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
 /*!
-* Dynamsoft WebTwain JavaScript Intellisense
+* Based on Dynamsoft WebTwain JavaScript Intellisense
 * Product: Dynamsoft Web Twain
 * Web Site: http://www.dynamsoft.com
 *
@@ -20,51 +21,90 @@
  * @namespace Dynamsoft
  */
 declare namespace Dynamsoft {
+    namespace Lib {
+        /*ignored
+        Addon_Events  Addon_Sendback_Events  AttachAndShowImage  BIO  DOM  DynamicLoadAddonFuns  DynamicWebTwain  EnumMouseButton
+        Errors  Events  IntToColorStr  LS  OnGetImageByURL  OnGetImageFromServer  Path  ProgressBar  UI  Uri
+        addEventListener  ajax  all  appendMessage  appendRichMessage  aryControlLoadImage  attachAddon  attachProperty
+        base64  bio  cancelFrome  clearMessage  closeAll  closeProgress  colorStrToInt  config  css  currentStyle
+        debug  detect  detectButton  dialog  dialogShowStatus  dlgProgress  dlgRef  drawBoxBorder  drawImageWithHermite
+        each  empty  endsWith
+        */
+
+        let env:{
+            WSSession: number, WSVersion: string,
+            bChrome: boolean, bEdge: boolean, bFileSystem: boolean, bFirefox: boolean, 
+            bIE: boolean, bLinux: boolean, bMac: boolean, bSafari: boolean, bWin: boolean, bWin64: boolean,
+            basePath: string, iPluginLength: number, isX64: boolean, pathType: number,
+            strChromeVersion: number, strFirefoxVersion: string, strIEVersion: string
+        }
+
+        /*ignored
+        error  escapeHtml  escapeRegExp  extend  filter  fireEvent  fromUnicode  get  getColor  getCss
+        getElDimensions  getHex  getHexColor  getHttpUrl  getLogger  getOffset  getRandom  getRealPath  getScript
+        getWS  getWSUrl  getWheelDelta  globalEval  guid  hide  html5  imageControlCount  indexOf  install
+        io  isArray  isBoolean  isDef  isFunction  isLocalIP  isNaN  isNull  isNumber  isObject
+        isPlainObject  isString  isUndef  isUndefined  isWindow  keys  log  main  makeArray  mix
+        needShowTwiceShowDialog  nil  noop  now  obj  one  page  param  parse  parseHTML  parser
+        product  progressMessage  ready  removeEventListener  replaceAll  replaceControl  show  showProgress  startWS
+        startWSByIP  startsWith  stopPropagation  stringify  style  support  switchEvent  tmp  toggle  trim
+        type  unEscapeHtml  unparam  upperCaseFirst  urlDecode  urlEncode  utf8  win
+        ...other internal ones
+        */
+    }
     namespace WebTwainEnv {
-        function GetWebTwain (cid: string): WebTwain;
-        function RegisterEvent(event: string, fn: (...args: any[]) => void): void;
-        function Load(): void;
-        function Unload(): void;
+        let ActiveXInstallWithCAB: boolean;
+        let ActiveXVersion: string;
         let AutoLoad: boolean;
+        function CloseDialog():void;
+        let ContainerMap: {};
         let Containers: Container[];
+        function CreateDWTObject (newObjID: string, successFn: (dwtObject: WebTwain) => void, failurefn: (...args: any[]) => void): void;
+        let Debug: boolean;
+        function DeleteDWTObject (objID: string):void;
+        let DynamicContainers: string[];
+        let DynamicDWTMap: {};
+        function GetWebTwain (cid: string): WebTwain;
+        let IfUpdateService: boolean;
+        let IfUseActiveXForIE10Plus: boolean;
+        let JSVersion: string;
+        function Load(): void;
+        function RegisterEvent(event: string, fn: (...args: any[]) => void): void;
+        
+        /*ignored
+        OnWebTwainInitMessage  OnWebTwainNeedUpgrade  OnWebTwainNeedUpgradeWebJavascript  OnWebTwainNotFound  OnWebTwainOldPluginNotAllowed
+        */
+        
+        function OnWebTwainPostExecute(): void;
+        function OnWebTwainPreExecute(): void;
+        
+        /*ignored
+        OnWebTwainReady
+        */
+
+        let PluginVersion:string;
+        let ProductKey: string;
+        function RegisterEvent(event: string, fn: (...args: any[]) => void): void;
+        function RemoveAllAuthorizations(): void;
+        let ResourcesPath:string;
+        let ServerVersionInfo: string;
+        function ShowDialog(_dialogWidth: number, _dialogHeight: number, _strDialogMessageWithHtmlFormat: string, _bChangeImage: boolean, bHideCloseButton: boolean):void;
+        let Trial: boolean;
+        function Unload(): void;
+        let UseDefaultInstallUI: string;
+        let initQueue: number[];
+        let inited: boolean;
     }
 }
 
-/** ICAP_PIXELTYPE values (PT_ means Pixel Type) */
-declare enum EnumDWT_PixelType {
-    TWPT_BW = 0,
-    TWPT_GRAY = 1,
-    TWPT_RGB = 2,
-    TWPT_PALLETE = 3,
-    TWPT_CMY = 4,
-    TWPT_CMYK = 5,
-    TWPT_YUV = 6,
-    TWPT_YUVK = 7,
-    TWPT_CIEXYZ = 8,
-    TWPT_LAB = 9,
-    TWPT_SRGB = 10,
-    TWPT_SCRGB = 11,
-    TWPT_INFRARED = 16
-}
-
+/** Border Styles */
 declare enum EnumDWT_BorderStyle {
-  /** No border. */
-  TWBS_NONE = 0,
-  /** Flat border. */
-  TWBS_SINGLEFLAT = 1,
-  /** 3D border.   */
-  TWBS_SINGLE3D = 2
-}
-
-/** For query the operation that are supported by the data source on a capability .
- *  Application gets these through DG_CONTROL/DAT_CAPABILITY/MSG_QUERYSUPPORT
- */
-declare enum EnumDWT_MessageType {
-    TWQC_GET = 1,
-    TWQC_SET = 2,
-    TWQC_GETDEFAULT = 4,
-    TWQC_GETCURRENT = 8,
-    TWQC_RESET = 16
+    /** No border. */
+    TWBS_NONE = 0,
+    /** Flat border. */
+    TWBS_SINGLEFLAT = 1,
+    /** 3D border.   */
+    TWBS_SINGLE3D = 2
 }
 
 /** Capabilities */
@@ -567,204 +607,85 @@ declare enum EnumDWT_Cap {
     ICAP_SUPPORTEDEXTIMAGEINFO = 4446
 }
 
-/** Capabilities exist in many varieties but all have a Default Value, Current Value, and may have other values available that can be supported if selected.
- *  To help categorize the supported values into clear structures, TWAIN defines four types of containers for capabilities =
- *  TW_ONEVALUE, TW_ARRAY, TW_RANGE and TW_ENUMERATION.
- */
-declare enum EnumDWT_CapType {
-    /** Nothing. */
-    TWON_NONE = 0,
-    /** A rectangular array of values that describe a logical item. It is similar to the TW_ONEVALUE because the current and default values are the same and
-     *  there are no other values to select from. For example, a list of the names, such as the supported capabilities list returned by the CAP_SUPPORTEDCAPS
-     *  capability, would use this type of container.
+/** ICAP_BITORDER values. */
+declare enum EnumDWT_CapBitOrder {
+    TWBO_LSBFIRST = 0,
+    /** Indicates that the leftmost bit in the byte (usually bit 7) is the byte's Most Significant Bit. */
+    TWBO_MSBFIRST = 1
+}
+
+/** ICAP_BITDEPTHREDUCTION values. */
+declare enum EnumDWT_CapBitdepthReduction {
+    TWBR_THRESHOLD = 0,
+    TWBR_HALFTONE = 1,
+    TWBR_CUSTHALFTONE = 2,
+    TWBR_DIFFUSION = 3
+}
+
+/** CAP_FEEDERALIGNMENT values. */
+declare enum EnumDWT_CapFeederAlignment {
+    /** The alignment is free-floating. Applications should assume that the origin for frames is on the left. */
+    TWFA_NONE = 0,
+    /** The alignment is to the left. */
+    TWFA_LEFT = 1,
+    /** The alignment is centered. This means that the paper will be fed in the middle of the ICAP_PHYSICALWIDTH of the
+     *  device. If this is set, then the Application should calculate any frames with a left offset of zero.
      */
-    TWON_ARRAY = 3,
-    /** This is the most general type because it defines a list of values from which the Current Value can be chosen.
-     *  The values do not progress uniformly through a range and there is not a consistent step size between the values.
-     *  For example, if a Source's resolution options do not occur in even step sizes then an enumeration would be used (for example, 150, 400, and 600).
-     */
-    TWON_ENUMERATION = 4,
-    /** A single value whose current and default values are coincident. The range of available values for this type of capability is simply this single value.
-     *  For example, a capability that indicates the presence of a document feeder could be of this type.
-     */
-    TWON_ONEVALUE = 5,
-    /** Many capabilities allow users to select their current value from a range of regularly spaced values.
-     *  The capability can specify the minimum and maximum acceptable values and the incremental step size between the values.
-     *  For example, resolution might be supported from 100 to 600 in steps of 50 (100, 150, 200, ..., 550, 600).
-     */
-    TWON_RANGE = 6
+    TWFA_CENTER = 2,
+    /** The alignment is to the right. */
+    TWFA_RIGHT = 3
 }
 
-/** ICAP_XFERMECH values. */
-declare enum EnumDWT_TransferMode {
-    /** Native transfers require the data to be transferred to a single large block of RAM. Therefore,
-     *  they always face the risk of having an inadequate amount of RAM available to perform the transfer successfully.
-     */
-    TWSX_NATIVE = 0,
-    /** Disk File Mode Transfers. */
-    TWSX_FILE = 1,
-    /** Buffered Memory Mode Transfers. */
-    TWSX_MEMORY = 2,
-    /** added 1.91 */
-    TWSX_MEMFILE  = 4
+/** CAP_FEEDERORDER values. */
+declare enum EnumDWT_CapFeederOrder {
+    /** The feeder starts with the top of the first page. */
+    TWFO_FIRSTPAGEFIRST = 0,
+    /** The feeder starts with the top of the last page. */
+    TWFO_LASTPAGEFIRST = 1
 }
 
-/** ICAP_IMAGEFILEFORMAT values. */
-declare enum EnumDWT_FileFormat {
-    /** Used for document imaging. Tagged Image File Format */
-    TWFF_TIFF = 0,
-    /** Native Macintosh format. Macintosh PICT    */
-    TWFF_PICT = 1,
-    /** Native Microsoft format. Windows Bitmap */
-    TWFF_BMP = 2,
-    /** Used for document imaging. X-Windows Bitmap */
-    TWFF_XBM = 3,
-    /** Wrapper for JPEG images. JPEG File Interchange Format */
-    TWFF_JFIF = 4,
-    /** FlashPix, used with digital cameras. Flash Pix */
-    TWFF_FPX = 5,
-    /** Multi-page TIFF files. Multi-page tiff file */
-    TWFF_TIFFMULTI = 6,
-    /** An image format standard intended for use on the web, replaces GIF. */
-    TWFF_PNG = 7,
-    /** A standard from JPEG, intended to replace JFIF, also supports JBIG. */
-    TWFF_SPIFF = 8,
-    /** File format for use with digital cameras. */
-    TWFF_EXIF = 9,
-    /** A file format from Adobe. 1.91 NB: this is not PDF/A  */
-    TWFF_PDF = 10,
-    /** A file format from the Joint Photographic Experts Group. 1.91 */
-    TWFF_JP2 = 11,
-    /** 1.91 */
-    TWFF_JPN = 12,
-    /** 1.91 */
-    TWFF_JPX = 13,
-    /** A file format from LizardTech. 1.91 */
-    TWFF_DEJAVU = 14,
-    /** A file format from Adobe. 2.0 */
-    TWFF_PDFA = 15,
-    /** 2.1 Adobe PDF/A, Version 2 */
-    TWFF_PDFA2 = 16
+/** ICAP_FILTER values. */
+declare enum EnumDWT_CapFilterType {
+    TWFT_RED = 0,
+    TWFT_GREEN = 1,
+    TWFT_BLUE = 2,
+    TWFT_NONE = 3,
+    TWFT_WHITE = 4,
+    TWFT_CYAN = 5,
+    TWFT_MAGENTA = 6,
+    TWFT_YELLOW = 7,
+    TWFT_BLACK = 8
 }
 
-/** TIFF file compression type. */
-declare enum EnumDWT_TIFFCompressionType {
-    /** Auto mode. */
-    TIFF_AUTO = 0,
-    /** Dump mode. */
-    TIFF_NONE = 1,
-    /** CCITT modified Huffman RLE. */
-    TIFF_RLE = 2,
-    /** CCITT Group 3 fax encoding. */
-    TIFF_FAX3 = 3,
-    /** CCITT T.4 (TIFF 6 name). */
-    TIFF_T4 = 3,
-    /** CCITT Group 4 fax encoding */
-    TIFF_FAX4 = 4,
-    /** CCITT T.6 (TIFF 6 name). */
-    TIFF_T6 = 4,
-    /** Lempel Ziv and Welch */
-    TIFF_LZW = 5,
-    TIFF_JPEG = 7,
-    TIFF_PACKBITS = 32773
+/** ICAP_FLASHUSED2 values. */
+declare enum EnumDWT_CapFlash {
+    TWFL_NONE = 0,
+    TWFL_OFF = 1,
+    TWFL_ON = 2,
+    TWFL_AUTO = 3,
+    TWFL_REDEYE = 4
 }
 
-/** The method to do interpolation. */
-declare enum EnumDWT_InterpolationMethod {
-    IM_NEARESTNEIGHBOUR = 1,
-    IM_BILINEAR = 2,
-    IM_BICUBIC = 3,
-	IM_BESTQUALITY = 5
+/** ICAP_FLIPROTATION values. */
+declare enum EnumDWT_CapFlipRotation {
+    /** The images to be scanned are viewed in book form, flipping each page from left to right or right to left. */
+    TWFR_BOOK = 0,
+    /** The images to be scanned are viewed in fanfold paper style, flipping each page up or down. */
+    TWFR_FANFOLD = 1
 }
 
-/** Image type */
-declare enum EnumDWT_ImageType {
-    /** Native Microsoft format. */
-    IT_BMP = 0,
-    /** JPEG format. */
-    IT_JPG = 1,
-    /** Tagged Image File Format. */
-    IT_TIF = 2,
-    /** An image format standard intended for use on the web, replaces GIF. */
-    IT_PNG = 3,
-    /** A file format from Adobe. */
-    IT_PDF = 4,
-  IT_ALL = 5
-}
-
-/** PDF file compression type. */
-declare enum EnumDWT_PDFCompressionType {
-    /** Auto mode. */
-    PDF_AUTO = 0,
-    /** CCITT Group 3 fax encoding. */
-    PDF_FAX3 = 1,
-    /** CCITT Group 4 fax encoding */
-    PDF_FAX4 = 2,
-    /** Lempel Ziv and Welch */
-    PDF_LZW = 3,
-    /** CCITT modified Huffman RLE. */
-    PDF_RLE = 4,
-    PDF_JPEG = 5
-}
-
-declare enum EnumDWT_ShowMode {
-    /** Activates the window and displays it in its current size and position. */
-    SW_ACTIVE = 0,
-    /** Maximizes the window */
-    SW_MAX = 1,
-    /** Minimize the window */
-    SW_MIN = 2,
-    /** Close the latest opened editor window */
-    SW_CLOSE = 3,
-    /** Check whether a window exists */
-    SW_IFLIVE = 4
-}
-
-/** The kind of data stored in the container. */
-declare enum EnumDWT_CapValueType {
-    TWTY_INT8 = 0,
-    /** Means Item is a TW_INT16   */
-    TWTY_INT16 = 1,
-    /** Means Item is a TW_INT32   */
-    TWTY_INT32 = 2,
-    /** Means Item is a TW_UINT8   */
-    TWTY_UINT8 = 3,
-    /** Means Item is a TW_UINT16  */
-    TWTY_UINT16 = 4,
-    /** Means Item is a TW_int  */
-    TWTY_int = 5,
-    /** Means Item is a TW_BOOL    */
-    TWTY_BOOL = 6,
-    /** Means Item is a TW_FIX32   */
-    TWTY_FIX32 = 7,
-    /** Means Item is a TW_FRAME   */
-    TWTY_FRAME = 8,
-    /** Means Item is a TW_STR32   */
-    TWTY_STR32 = 9,
-    /** Means Item is a TW_STR64   */
-    TWTY_STR64 = 10,
-    /** Means Item is a TW_STR128  */
-    TWTY_STR128 = 11,
-    /** Means Item is a TW_STR255  */
-    TWTY_STR255 = 12
-}
-
-/** ICAP_UNITS values. */
-declare enum EnumDWT_UnitType {
-    TWUN_INCHES = 0,
-    TWUN_CENTIMETERS = 1,
-    TWUN_PICAS = 2,
-    TWUN_POINTS = 3,
-    TWUN_TWIPS = 4,
-    TWUN_PIXELS = 5,
-    TWUN_MILLIMETERS = 6
-}
-
-/** ICAP_DUPLEX values. */
-declare enum EnumDWT_DUPLEX {
-    TWDX_NONE = 0,
-    TWDX_1PASSDUPLEX = 1,
-    TWDX_2PASSDUPLEX = 2
+/** ICAP_IMAGEFILTER values. */
+declare enum EnumDWT_CapImageFilter {
+    TWIF_NONE = 0,
+    TWIF_AUTO = 1,
+    /** Good for halftone images. */
+    TWIF_LOWPASS = 2,
+    /** Good for improving text. */
+    TWIF_BANDPASS = 3,
+    /** Good for improving fine lines. */
+    TWIF_HIGHPASS = 4,
+    TWIF_TEXT = 3,
+    TWIF_FINELINE = 4
 }
 
 /** CAP_LANGUAGE values. */
@@ -918,6 +839,92 @@ declare enum EnumDWT_CapLanguage {
     TWLG_VIETNAMESE = 113
 }
 
+/** ICAP_LIGHTPATH values. */
+declare enum EnumDWT_CapLightPath {
+    TWLP_REFLECTIVE = 0,
+    TWLP_TRANSMISSIVE = 1
+}
+
+/** ICAP_LIGHTSOURCE values. */
+declare enum EnumDWT_CapLightSource {
+    TWLS_RED = 0,
+    TWLS_GREEN = 1,
+    TWLS_BLUE = 2,
+    TWLS_NONE = 3,
+    TWLS_WHITE = 4,
+    TWLS_UV = 5,
+    TWLS_IR = 6
+}
+
+/** ICAP_NOISEFILTER values. */
+declare enum EnumDWT_CapNoiseFilter {
+    TWNF_NONE = 0,
+    TWNF_AUTO = 1,
+    TWNF_LONEPIXEL = 2,
+    TWNF_MAJORITYRULE = 3
+}
+
+/** ICAP_ORIENTATION values. */
+declare enum EnumDWT_CapORientation {
+    TWOR_ROT0 = 0,
+    TWOR_ROT90 = 1,
+    TWOR_ROT180 = 2,
+    TWOR_ROT270 = 3,
+    TWOR_PORTRAIT = 0,
+    TWOR_LANDSCAPE = 3,
+    /** 2.0  */
+    TWOR_AUTO = 4,
+    /** 2.0  */
+    TWOR_AUTOTEXT = 5,
+    /** 2.0  */
+    TWOR_AUTOPICTURE = 6
+}
+
+/** ICAP_OVERSCAN values. */
+declare enum EnumDWT_CapOverscan {
+    TWOV_NONE = 0,
+    TWOV_AUTO = 1,
+    TWOV_TOPBOTTOM = 2,
+    TWOV_LEFTRIGHT = 3,
+    TWOV_ALL = 4
+}
+
+/** ICAP_PIXELFLAVOR values. */
+declare enum EnumDWT_CapPixelFlavor {
+    /** Zero pixel represents darkest shade. zero pixel represents darkest shade   */
+    TWPF_CHOCOLATE = 0,
+    /** Zero pixel represents lightest shade. zero pixel represents lightest shade  */
+    TWPF_VANILLA = 1
+}
+
+/** ICAP_PLANARCHUNKY values. */
+declare enum EnumDWT_CapPlanarChunky {
+    TWPC_CHUNKY = 0,
+    TWPC_PLANAR = 1
+}
+
+/** CAP_PRINTER values. */
+declare enum EnumDWT_CapPrinter {
+    TWPR_IMPRINTERTOPBEFORE = 0,
+    TWPR_IMPRINTERTOPAFTER = 1,
+    TWPR_IMPRINTERBOTTOMBEFORE = 2,
+    TWPR_IMPRINTERBOTTOMAFTER = 3,
+    TWPR_ENDORSERTOPBEFORE = 4,
+    TWPR_ENDORSERTOPAFTER = 5,
+    TWPR_ENDORSERBOTTOMBEFORE = 6,
+    TWPR_ENDORSERBOTTOMAFTER = 7
+}
+
+/** CAP_PRINTERMODE values. */
+declare enum EnumDWT_CapPrinterMode {
+    /** Specifies that the printed text will consist of a single string. */
+    TWPM_SINGLESTRING = 0,
+    /** Specifies that the printed text will consist of an enumerated list of strings to be printed in order. */
+    TWPM_MULTISTRING = 1,
+    /** Specifies that the printed string will consist of a compound of a String followed by a value followed by a suffix string. */
+    TWPM_COMPOUNDSTRING = 2
+}
+
 /** TWAIN Supported sizes. */
 declare enum EnumDWT_CapSupportedSizes {
     /** 0 */
@@ -1046,180 +1053,68 @@ declare enum EnumDWT_CapSupportedSizes {
     TWSS_MAXSIZE = 54
 }
 
-/** CAP_FEEDERALIGNMENT values. */
-declare enum EnumDWT_CapFeederAlignment {
-    /** The alignment is free-floating. Applications should assume that the origin for frames is on the left. */
-    TWFA_NONE = 0,
-    /** The alignment is to the left. */
-    TWFA_LEFT = 1,
-    /** The alignment is centered. This means that the paper will be fed in the middle of the ICAP_PHYSICALWIDTH of the
-     *  device. If this is set, then the Application should calculate any frames with a left offset of zero.
+/** Capabilities exist in many varieties but all have a Default Value, Current Value, and may have other values available that can be supported if selected.
+ *  To help categorize the supported values into clear structures, TWAIN defines four types of containers for capabilities =
+ *  TW_ONEVALUE, TW_ARRAY, TW_RANGE and TW_ENUMERATION.
+ */
+declare enum EnumDWT_CapType {
+    /** Nothing. */
+    TWON_NONE = 0,
+    /** A rectangular array of values that describe a logical item. It is similar to the TW_ONEVALUE because the current and default values are the same and
+     *  there are no other values to select from. For example, a list of the names, such as the supported capabilities list returned by the CAP_SUPPORTEDCAPS
+     *  capability, would use this type of container.
      */
-    TWFA_CENTER = 2,
-    /** The alignment is to the right. */
-    TWFA_RIGHT = 3
-}
-/** CAP_FEEDERORDER values. */
-declare enum EnumDWT_CapFeederOrder {
-    /** The feeder starts with the top of the first page. */
-    TWFO_FIRSTPAGEFIRST = 0,
-    /** The feeder starts with the top of the last page. */
-    TWFO_LASTPAGEFIRST = 1
+    TWON_ARRAY = 3,
+    /** This is the most general type because it defines a list of values from which the Current Value can be chosen.
+     *  The values do not progress uniformly through a range and there is not a consistent step size between the values.
+     *  For example, if a Source's resolution options do not occur in even step sizes then an enumeration would be used (for example, 150, 400, and 600).
+     */
+    TWON_ENUMERATION = 4,
+    /** A single value whose current and default values are coincident. The range of available values for this type of capability is simply this single value.
+     *  For example, a capability that indicates the presence of a document feeder could be of this type.
+     */
+    TWON_ONEVALUE = 5,
+    /** Many capabilities allow users to select their current value from a range of regularly spaced values.
+     *  The capability can specify the minimum and maximum acceptable values and the incremental step size between the values.
+     *  For example, resolution might be supported from 100 to 600 in steps of 50 (100, 150, 200, ..., 550, 600).
+     */
+    TWON_RANGE = 6
 }
 
-/** CAP_PRINTER values. */
-declare enum EnumDWT_CapPrinter {
-    TWPR_IMPRINTERTOPBEFORE = 0,
-    TWPR_IMPRINTERTOPAFTER = 1,
-    TWPR_IMPRINTERBOTTOMBEFORE = 2,
-    TWPR_IMPRINTERBOTTOMAFTER = 3,
-    TWPR_ENDORSERTOPBEFORE = 4,
-    TWPR_ENDORSERTOPAFTER = 5,
-    TWPR_ENDORSERBOTTOMBEFORE = 6,
-    TWPR_ENDORSERBOTTOMAFTER = 7
+/** The kind of data stored in the container. */
+declare enum EnumDWT_CapValueType {
+    TWTY_INT8 = 0,
+    /** Means Item is a TW_INT16   */
+    TWTY_INT16 = 1,
+    /** Means Item is a TW_INT32   */
+    TWTY_INT32 = 2,
+    /** Means Item is a TW_UINT8   */
+    TWTY_UINT8 = 3,
+    /** Means Item is a TW_UINT16  */
+    TWTY_UINT16 = 4,
+    /** Means Item is a TW_int  */
+    TWTY_int = 5,
+    /** Means Item is a TW_BOOL    */
+    TWTY_BOOL = 6,
+    /** Means Item is a TW_FIX32   */
+    TWTY_FIX32 = 7,
+    /** Means Item is a TW_FRAME   */
+    TWTY_FRAME = 8,
+    /** Means Item is a TW_STR32   */
+    TWTY_STR32 = 9,
+    /** Means Item is a TW_STR64   */
+    TWTY_STR64 = 10,
+    /** Means Item is a TW_STR128  */
+    TWTY_STR128 = 11,
+    /** Means Item is a TW_STR255  */
+    TWTY_STR255 = 12
 }
 
-/** CAP_PRINTERMODE values. */
-declare enum EnumDWT_CapPrinterMode {
-    /** Specifies that the printed text will consist of a single string. */
-    TWPM_SINGLESTRING = 0,
-    /** Specifies that the printed text will consist of an enumerated list of strings to be printed in order. */
-    TWPM_MULTISTRING = 1,
-    /** Specifies that the printed string will consist of a compound of a String followed by a value followed by a suffix string. */
-    TWPM_COMPOUNDSTRING = 2
-}
-
-/** ICAP_BITDEPTHREDUCTION values. */
-declare enum EnumDWT_CapBitdepthReduction {
-    TWBR_THRESHOLD = 0,
-    TWBR_HALFTONE = 1,
-    TWBR_CUSTHALFTONE = 2,
-    TWBR_DIFFUSION = 3
-}
-
-/** ICAP_BITORDER values. */
-declare enum EnumDWT_CapBitOrder {
-    TWBO_LSBFIRST = 0,
-    /** Indicates that the leftmost bit in the byte (usually bit 7) is the byte's Most Significant Bit. */
-    TWBO_MSBFIRST = 1
-}
-
-/** ICAP_FILTER values. */
-declare enum EnumDWT_CapFilterType {
-    TWFT_RED = 0,
-    TWFT_GREEN = 1,
-    TWFT_BLUE = 2,
-    TWFT_NONE = 3,
-    TWFT_WHITE = 4,
-    TWFT_CYAN = 5,
-    TWFT_MAGENTA = 6,
-    TWFT_YELLOW = 7,
-    TWFT_BLACK = 8
-}
-
-/** ICAP_FLASHUSED2 values. */
-declare enum EnumDWT_CapFlash {
-    TWFL_NONE = 0,
-    TWFL_OFF = 1,
-    TWFL_ON = 2,
-    TWFL_AUTO = 3,
-    TWFL_REDEYE = 4
-}
-
-/** ICAP_FLIPROTATION values. */
-declare enum EnumDWT_CapFlipRotation {
-    /** The images to be scanned are viewed in book form, flipping each page from left to right or right to left. */
-    TWFR_BOOK = 0,
-    /** The images to be scanned are viewed in fanfold paper style, flipping each page up or down. */
-    TWFR_FANFOLD = 1
-}
-
-/** ICAP_IMAGEFILTER values. */
-declare enum EnumDWT_CapImageFilter {
-    TWIF_NONE = 0,
-    TWIF_AUTO = 1,
-    /** Good for halftone images. */
-    TWIF_LOWPASS = 2,
-    /** Good for improving text. */
-    TWIF_BANDPASS = 3,
-    /** Good for improving fine lines. */
-    TWIF_HIGHPASS = 4,
-    TWIF_TEXT = 3,
-    TWIF_FINELINE = 4
-}
-
-/** ICAP_LIGHTPATH values. */
-declare enum EnumDWT_CapLightPath {
-    TWLP_REFLECTIVE = 0,
-    TWLP_TRANSMISSIVE = 1
-}
-
-/** ICAP_LIGHTSOURCE values. */
-declare enum EnumDWT_CapLightSource {
-    TWLS_RED = 0,
-    TWLS_GREEN = 1,
-    TWLS_BLUE = 2,
-    TWLS_NONE = 3,
-    TWLS_WHITE = 4,
-    TWLS_UV = 5,
-    TWLS_IR = 6
-}
-
-/** TWEI_MAGTYPE values. (MD_ means Mag Type) Added 2.0  */
-declare enum EnumDWT_MagType {
-    /** Added 2.0  */
-    TWMD_MICR = 0,
-    /** added 2.1   */
-    TWMD_RAW = 1,
-    /** added 2.1  */
-    TWMD_INVALID = 2
-}
-
-/** ICAP_NOISEFILTER values. */
-declare enum EnumDWT_CapNoiseFilter {
-    TWNF_NONE = 0,
-    TWNF_AUTO = 1,
-    TWNF_LONEPIXEL = 2,
-    TWNF_MAJORITYRULE = 3
-}
-
-/** ICAP_ORIENTATION values. */
-declare enum EnumDWT_CapORientation {
-    TWOR_ROT0 = 0,
-    TWOR_ROT90 = 1,
-    TWOR_ROT180 = 2,
-    TWOR_ROT270 = 3,
-    TWOR_PORTRAIT = 0,
-    TWOR_LANDSCAPE = 3,
-    /** 2.0  */
-    TWOR_AUTO = 4,
-    /** 2.0  */
-    TWOR_AUTOTEXT = 5,
-    /** 2.0  */
-    TWOR_AUTOPICTURE = 6
-}
-
-/** ICAP_OVERSCAN values. */
-declare enum EnumDWT_CapOverscan {
-    TWOV_NONE = 0,
-    TWOV_AUTO = 1,
-    TWOV_TOPBOTTOM = 2,
-    TWOV_LEFTRIGHT = 3,
-    TWOV_ALL = 4
-}
-
-/** ICAP_PIXELFLAVOR values. */
-declare enum EnumDWT_CapPixelFlavor {
-    /** Zero pixel represents darkest shade. zero pixel represents darkest shade   */
-    TWPF_CHOCOLATE = 0,
-    /** Zero pixel represents lightest shade. zero pixel represents lightest shade  */
-    TWPF_VANILLA = 1
-}
-
-/** ICAP_PLANARCHUNKY values. */
-declare enum EnumDWT_CapPlanarChunky {
-    TWPC_CHUNKY = 0,
-    TWPC_PLANAR = 1
+/** ICAP_DUPLEX values. */
+declare enum EnumDWT_DUPLEX {
+    TWDX_NONE = 0,
+    TWDX_1PASSDUPLEX = 1,
+    TWDX_2PASSDUPLEX = 2
 }
 
 /** Data source status. */
@@ -1234,6 +1129,48 @@ declare enum EnumDWT_DataSourceStatus {
     TWDSS_ACQUIRING = 3
 }
 
+declare enum EnumDWT_Error {
+	ModuleNotExists = -2371
+}
+
+/** ICAP_IMAGEFILEFORMAT values. */
+declare enum EnumDWT_FileFormat {
+    /** Used for document imaging. Tagged Image File Format */
+    TWFF_TIFF = 0,
+    /** Native Macintosh format. Macintosh PICT    */
+    TWFF_PICT = 1,
+    /** Native Microsoft format. Windows Bitmap */
+    TWFF_BMP = 2,
+    /** Used for document imaging. X-Windows Bitmap */
+    TWFF_XBM = 3,
+    /** Wrapper for JPEG images. JPEG File Interchange Format */
+    TWFF_JFIF = 4,
+    /** FlashPix, used with digital cameras. Flash Pix */
+    TWFF_FPX = 5,
+    /** Multi-page TIFF files. Multi-page tiff file */
+    TWFF_TIFFMULTI = 6,
+    /** An image format standard intended for use on the web, replaces GIF. */
+    TWFF_PNG = 7,
+    /** A standard from JPEG, intended to replace JFIF, also supports JBIG. */
+    TWFF_SPIFF = 8,
+    /** File format for use with digital cameras. */
+    TWFF_EXIF = 9,
+    /** A file format from Adobe. 1.91 NB: this is not PDF/A  */
+    TWFF_PDF = 10,
+    /** A file format from the Joint Photographic Experts Group. 1.91 */
+    TWFF_JP2 = 11,
+    /** 1.91 */
+    TWFF_JPN = 12,
+    /** 1.91 */
+    TWFF_JPX = 13,
+    /** A file format from LizardTech. 1.91 */
+    TWFF_DEJAVU = 14,
+    /** A file format from Adobe. 2.0 */
+    TWFF_PDFA = 15,
+    /** 2.1 Adobe PDF/A, Version 2 */
+    TWFF_PDFA2 = 16
+}
+
 /** Fit window type */
 declare enum EnumDWT_FitWindowType {
     /** Fit the image to the width and height of the window */
@@ -1244,9 +1181,69 @@ declare enum EnumDWT_FitWindowType {
     enumFitWindowWidth = 2
 }
 
-declare enum EnumDWT_UploadDataFormat {
-	Binary = 0,
-	Base64 = 1
+/** Image type */
+declare enum EnumDWT_ImageType {
+    /** Native Microsoft format. */
+    IT_BMP = 0,
+    /** JPEG format. */
+    IT_JPG = 1,
+    /** Tagged Image File Format. */
+    IT_TIF = 2,
+    /** An image format standard intended for use on the web, replaces GIF. */
+    IT_PNG = 3,
+    /** A file format from Adobe. */
+    IT_PDF = 4,
+    /** All supported formats which are bmp, jpg, tif, png and pdf */
+    IT_ALL = 5
+}
+
+declare enum EnumDWT_InitMsg {
+	Info = 1,
+	Error = 2,
+	NotInstalledError = 3,
+	DownloadError = 4,
+	DownloadNotRestartError = 5
+}
+
+/** The method to do interpolation. */
+declare enum EnumDWT_InterpolationMethod {
+    IM_NEARESTNEIGHBOUR = 1,
+    IM_BILINEAR = 2,
+    IM_BICUBIC = 3,
+	IM_BESTQUALITY = 5
+}
+
+declare enum EnumDWT_Language {
+	English = 0,
+	French = 1,
+	Arabic = 2,
+	Spanish = 3,
+	Portuguese = 4,
+	German = 5,
+	Italian= 6,
+	Russian= 7,
+	Chinese= 8
+}
+
+/** TWEI_MAGTYPE values. (MD_ means Mag Type) Added 2.0  */
+declare enum EnumDWT_MagType {
+    /** Added 2.0  */
+    TWMD_MICR = 0,
+    /** added 2.1   */
+    TWMD_RAW = 1,
+    /** added 2.1  */
+    TWMD_INVALID = 2
+}
+
+/** For query the operation that are supported by the data source on a capability .
+ *  Application gets these through DG_CONTROL/DAT_CAPABILITY/MSG_QUERYSUPPORT
+ */
+declare enum EnumDWT_MessageType {
+    TWQC_GET = 1,
+    TWQC_SET = 2,
+    TWQC_GETDEFAULT = 4,
+    TWQC_GETCURRENT = 8,
+    TWQC_RESET = 16
 }
 
 declare enum EnumDWT_MouseShape {
@@ -1256,6 +1253,114 @@ declare enum EnumDWT_MouseShape {
 	Zoom = 3
 }
 
+/** PDF file compression type. */
+declare enum EnumDWT_PDFCompressionType {
+    /** Auto mode. */
+    PDF_AUTO = 0,
+    /** CCITT Group 3 fax encoding. */
+    PDF_FAX3 = 1,
+    /** CCITT Group 4 fax encoding */
+    PDF_FAX4 = 2,
+    /** Lempel Ziv and Welch */
+    PDF_LZW = 3,
+    /** CCITT modified Huffman RLE. */
+    PDF_RLE = 4,
+    /** JPEG compression. */
+    PDF_JPEG = 5
+}
+
+/** ICAP_PIXELTYPE values (PT_ means Pixel Type) */
+declare enum EnumDWT_PixelType {
+    TWPT_BW = 0,
+    TWPT_GRAY = 1,
+    TWPT_RGB = 2,
+    TWPT_PALLETE = 3,
+    TWPT_CMY = 4,
+    TWPT_CMYK = 5,
+    TWPT_YUV = 6,
+    TWPT_YUVK = 7,
+    TWPT_CIEXYZ = 8,
+    TWPT_LAB = 9,
+    TWPT_SRGB = 10,
+    TWPT_SCRGB = 11,
+    TWPT_INFRARED = 16
+}
+
+declare enum EnumDWT_PlatformType {
+    /// Fit the image to the width and height of the window
+    enumWindow = 0,
+    /// Fit the image to the height of the window
+    enumMac = 1,
+    /// Fit the image to the width of the window
+    enumLinux = 2
+}
+
+declare enum EnumDWT_ShowMode {
+    /** Activates the window and displays it in its current size and position. */
+    SW_ACTIVE = 0,
+    /** Maximizes the window */
+    SW_MAX = 1,
+    /** Minimize the window */
+    SW_MIN = 2,
+    /** Close the latest opened editor window */
+    SW_CLOSE = 3,
+    /** Check whether a window exists */
+    SW_IFLIVE = 4
+}
+
+/** TIFF file compression type. */
+declare enum EnumDWT_TIFFCompressionType {
+    /** Auto mode. */
+    TIFF_AUTO = 0,
+    /** Dump mode. */
+    TIFF_NONE = 1,
+    /** CCITT modified Huffman RLE. */
+    TIFF_RLE = 2,
+    /** CCITT Group 3 fax encoding. */
+    TIFF_FAX3 = 3,
+    /** CCITT T.4 (TIFF 6 name). */
+    TIFF_T4 = 3,
+    /** CCITT Group 4 fax encoding */
+    TIFF_FAX4 = 4,
+    /** CCITT T.6 (TIFF 6 name). */
+    TIFF_T6 = 4,
+    /** Lempel Ziv and Welch */
+    TIFF_LZW = 5,
+    TIFF_JPEG = 7,
+    TIFF_PACKBITS = 32773
+}
+
+/** ICAP_XFERMECH values. */
+declare enum EnumDWT_TransferMode {
+    /** Native transfers require the data to be transferred to a single large block of RAM. Therefore,
+     *  they always face the risk of having an inadequate amount of RAM available to perform the transfer successfully.
+     */
+    TWSX_NATIVE = 0,
+    /** Disk File Mode Transfers. */
+    TWSX_FILE = 1,
+    /** Buffered Memory Mode Transfers. */
+    TWSX_MEMORY = 2/*,*/
+    /** added 1.91 , not supported in DWT yet*/
+    /** TWSX_MEMFILE  = 4*/
+}
+
+/** ICAP_UNITS values. */
+declare enum EnumDWT_UnitType {
+    TWUN_INCHES = 0,
+    TWUN_CENTIMETERS = 1,
+    TWUN_PICAS = 2,
+    TWUN_POINTS = 3,
+    TWUN_TWIPS = 4,
+    TWUN_PIXELS = 5,
+    TWUN_MILLIMETERS = 6
+}
+
+declare enum EnumDWT_UploadDataFormat {
+	Binary = 0,
+	Base64 = 1
+}
+
+/** interface for a DWT container which basically defines a DIV on the page */
 interface Container {
     ContainerId: string;
     Width: string | number;
@@ -1267,7 +1372,37 @@ interface Container {
  */
 // properties (get/set) / sync functions
 interface WebTwain {
+ 
     /**
+     * Returns whether the instance of a DWT is initialized
+     * @type {bool}
+     */
+    bReady: boolean;
+
+    /**
+     * Returns the runtime id of the dwt object
+     * @type {string}
+     */
+    readonly clientId: string;
+
+    /**
+     * Returns the runtime class for the dwt container DIV
+     * @type {string}
+     */
+    containerClass:string;
+    
+    /*ignored
+    httpUrl
+    objectName
+
+    ...other internal ones
+     */
+    
+    /*
+    * Properties
+    */
+
+     /**
      * Returns or sets whether multi-page selection is supported.
      * @type {bool}
      */
@@ -1287,43 +1422,37 @@ interface WebTwain {
 
     /**
      * Returns or sets the background color of the main control. It is a value specifying the 24-bit RGB value.
-     * @type {int}
+     * @type {number}
      */
     BackgroundColor: number;
 
     /**
      * Returns or sets the fill color of the selected area of an image when it is cut, erased or rotated. It is a value specifying the 24-bit RGB value.
-     * @type {int}
+     * @type {number}
      */
     BackgroundFillColor: number;
 
-    /**
-     * [Deprecated.] Returns the number of barcode detected in an image.
-     * @type {int}
-     */
-    BarcodeCount: number;
-
     /**
      * Returns or sets the pixel bit depths for the current value of PixelType property. This is a runtime property.
-     * @type {short}
+     * @type {number}
      */
     BitDepth: number;
 
     /**
      * Returns the current deviation of the pixels in the image.
-     * @type {float}
+     * @type {number}
      */
     BlankImageCurrentStdDev: number;
 
     /**
      * Returns or sets the standard deviation of the pixels in the image.
-     * @type {float}
+     * @type {number}
      */
     BlankImageMaxStdDev: number;
 
     /**
      * Returns or sets the dividing line between black and white. The default value is 128.
-     * @type {int}
+     * @type {number}
      */
     BlankImageThreshold: number;
 
@@ -1335,79 +1464,73 @@ interface WebTwain {
 
     /**
      * Returns or sets the brightness values available within the Source. This is a runtime property.
-     * @type {float}
+     * @type {number}
      */
     Brightness: number;
 
     /**
      * [Deprecated.] Sets or returns whether brokerprocess is enabled for scanning.
-     * @type {int}
+     * @type {number}
      */
     BrokerProcessType: number;
 
     /**
      * Sets or returns how much physical memory is allowed for storing images currently loaded in Dynamic Web TWAIN. Once the limit is reached, images will be cached on the hard disk.
-     * @type {int}
+     * @type {number}
      */
     BufferMemoryLimit: number;
 
-    /**
-     * Specifies the capabiltiy to be negotiated. This is a runtime property.
-     * @type {EnumDWT_Cap}
-     */
-    Capability: EnumDWT_Cap;
-
     /**
      * Sets or returns the index (0-based) of a list to indicate the Current Value when the value of the CapType property is TWON_ENUMERATION. If the data type of the capability is String, the list is in CapItemsString property. For other data types, the list is in CapItems property. This is a runtime property.
-     * @type {int}
+     * @type {number}
      */
     CapCurrentIndex: number;
 
     /**
      * Sets or returns the current value in a range when the value of the CapType property is TWON_RANGE. This is a runtime property.
-     * @type {double}
+     * @type {number}
      */
     CapCurrentValue: number;
 
     /**
      * Returns the index (0-based) of a list to indicate the Default Value when the value of the CapType property is TWON_ENUMERATION. If the data type of the capability is String, the list is in CapItemsString property. For other data types, the list is in CapItems property. This is a runtime, read-only property.
-     * @type {int}
+     * @type {number}
      */
     CapDefaultIndex: number;
 
     /**
      * Returns the default value in a range when the value of the CapType property is TWON_RANGE. This is a runtime, read-only property.
-     * @type {double}
+     * @type {number}
      */
     CapDefaultValue: number;
 
+    /**
+     * Retruns the description for a capability
+     * @type {string}
+     */
+    CapDescription: string;
+
     /**
      * Sets or returns the maximum value in a range when the value of the CapType property is TWON_RANGE. This is a runtime property.
-     * @type {double}
+     * @type {number}
      */
     CapMaxValue: number;
 
     /**
      * Sets or returns the minimum value in a range when the value of the CapType property is TWON_RANGE. This is a runtime property.
-     * @type {double}
+     * @type {number}
      */
     CapMinValue: number;
 
     /**
      * [Deprecated.] Sets or returns how many items are in the list when the value of the CapType property is TWON_ARRAY or TWON_ENUMERATION. For String data type, the list is in CapItemsString property. For other data types, the list is in CapItems property. This is a runtime property.
-     * @type {int}
+     * @type {number}
      */
     CapNumItems: number;
 
-    /**
-     * [Deprecated.] Replaced by GetCapItemsString method and SetCapItemsString method.
-     * @type {string}
-     */
-    CapItemsString: string;
-
     /**
      * Sets or returns the step size in a range when the value of the CapType property is TWON_RANGE. This is a runtime property.
-     * @type {double}
+     * @type {number}
      */
     CapStepSize: number;
 
@@ -1419,7 +1542,7 @@ interface WebTwain {
 
     /**
      * Returns or sets the value of the capability specified by Capability property when the value of the CapType property is TWON_ONEVALUE. This is a runtime property.
-     * @type {double}
+     * @type {number}
      */
     CapValue: number;
 
@@ -1431,25 +1554,25 @@ interface WebTwain {
 
     /**
      * Sets or returns the value type for reading the value of a capability. This is a runtime property.
-     * @type {short}
+     * @type {number}
      */
     CapValueType: number;
 
+    /**
+     * Specifies the capabiltiy to be negotiated. This is a runtime property.
+     * @type {EnumDWT_Cap}
+     */
+    Capability: EnumDWT_Cap;
+
     /**
      * Returns or sets the contrast values available within the Source. This is a runtime property.
-     * @type {float}
+     * @type {number}
      */
     Contrast: number;
 
-    /**
-     * Sets or returns the product name string for the application identity.
-     * @type {string}
-     */
-    ProductName: string;
-
     /**
      * Returns or sets current index of image in buffer. This is a runtime property.
-     * @type {short}
+     * @type {number}
      */
     CurrentImageIndexInBuffer: number;
 
@@ -1461,7 +1584,7 @@ interface WebTwain {
 
     /**
      * Returns the value indicating the data source status. This is a runtime, read-only property.
-     * @type {int}
+     * @type {number}
      */
     DataSourceStatus: number;
 
@@ -1473,7 +1596,7 @@ interface WebTwain {
 
     /**
      * Returns whether the source supports duplex. If so, it further returns the level of duplex the Source supports (one pass or two pass duplex). This is a runtime, read-only property.
-     * @type {int}
+     * @type {number}
      */
     Duplex: number;
 
@@ -1485,7 +1608,7 @@ interface WebTwain {
 
     /**
      * Returns the error code. This is a runtime, read-only property.
-     * @type {int}
+     * @type {number}
      */
     ErrorCode: number;
 
@@ -1495,12 +1618,6 @@ interface WebTwain {
      */
     ErrorString: string;
 
-    /**
-     * Returns or sets whether to resize the image to fit the image to the width or height of the window. To use the property, the view mode should be set to -1 by -1. You can use SetViewMode method to set the view mode.
-     * @type {EnumDWT_FitWindowType}
-     */
-    FitWindowType: EnumDWT_FitWindowType;
-
     /**
      * Returns or sets the password used to log into the FTP server.
      * @type {string}
@@ -1509,7 +1626,7 @@ interface WebTwain {
 
     /**
      * Returns or sets the port number of the FTP server.
-     * @type {int}
+     * @type {number}
      */
     FTPPort: number;
 
@@ -1519,12 +1636,42 @@ interface WebTwain {
      */
     FTPUserName: string;
 
+    /**
+     * Returns or sets whether to resize the image to fit the image to the width or height of the window. To use the property, the view mode should be set to -1 by -1. You can use SetViewMode method to set the view mode.
+     * @type {EnumDWT_FitWindowType}
+     */
+    FitWindowType: EnumDWT_FitWindowType;
+
+    /**
+     * Returns the response string from the HTTP server if an error occurs for HTTPUploadThroughPost() method. This is a runtime, read-only property.
+     * @type {string}
+     */
+    HTTPPostResponseString: string;
+
+    /**
+     * Returns whether a HTTP request has credentials
+     * @type {bool}
+     */
+    HTTPRequestswithCredentials: boolean;
+
+    /**
+     * Returns or sets the height of the dwt viewer object
+     * @type {string|number}
+     */
+    Height: string|number;
+
     /**
      * Returns how many images are in buffer. This is a runtime, read-only property.
-     * @type {short}
+     * @type {number}
      */
     HowManyImagesInBuffer: number;
 
+    /**
+     * Specifies the content type of a http upload.
+     * @type {string}
+     */
+    HttpContentTypeFieldValue: string;
+
     /**
      * Specifies the field name of uploaded image through POST.
      * @type {string}
@@ -1539,15 +1686,9 @@ interface WebTwain {
 
     /**
      * Returns or sets the port number of the HTTP server.
-     * @type {int}
+     * @type {number|string}
      */
-    HTTPPort: number;
-
-    /**
-     * Returns the response string from the HTTP server if an error occurs for HTTPUploadThroughPost() method. This is a runtime, read-only property.
-     * @type {string}
-     */
-    HTTPPostResponseString: string;
+    HTTPPort: number|string;
 
     /**
      * [Deprecated.] Returns or sets the user name used to log into the HTTP server.
@@ -1585,6 +1726,18 @@ interface WebTwain {
      */
     IfAutoFeed: boolean;
 
+    /**
+     * Returns or sets whether the Source enables the automatic document scanning process. This is a runtime property.
+     * @type {bool}
+     */
+    IfAutoScan: boolean;
+
+    /**
+     * Specifies whether or not to automatically scroll to the last image or stay on the current image when loading or acquiring images
+     * @type {bool}
+     */
+    IfAutoScroll: boolean;
+
     /**
      * Turns automatic border detection on and off. The property works only if the device and its driver support detecting the border automatically. You can find whether your device supports this capbility from its user manual.
      * @type {bool}
@@ -1597,12 +1750,6 @@ interface WebTwain {
      */
     IfAutomaticDeskew: boolean;
 
-    /**
-     * Returns or sets whether the Source enables the automatic document scanning process. This is a runtime property.
-     * @type {bool}
-     */
-    IfAutoScan: boolean;
-
     /**
      * Returns or sets whether close the Data Source User Interface after acquire all images. Default value of this property is FALSE.
      * @type {bool}
@@ -1644,6 +1791,12 @@ interface WebTwain {
      * @type {bool}
      */
     IfOpenImageWithGDIPlus: boolean;
+    
+    /**
+     * Returns or sets whether FTP passive mode is enabled.
+     * @type {bool}
+     */
+    IfPASVMode: boolean;
 
     /**
      * Returns the value whether the Source has a paper sensor that can detect documents on the ADF or Flatbed. This is a runtime, read-only property.
@@ -1652,10 +1805,10 @@ interface WebTwain {
     IfPaperDetectable: boolean;
 
     /**
-     * Returns or sets whether FTP passive mode is enabled.
+     * Returns or sets whether SSL is used when uploading or downloading images.
      * @type {bool}
      */
-    IfPASVMode: boolean;
+    IfSSL: boolean;
 
     /**
      * [Deprecated.] Returns or sets whether communicate with device in a separate thread. Default value of this property is FALSE.
@@ -1700,10 +1853,10 @@ interface WebTwain {
     IfShowUI: boolean;
 
     /**
-     * Returns or sets whether SSL is used when uploading or downloading images.
+     * Returns or sets whether to throw exceptions
      * @type {bool}
      */
-    IfSSL: boolean;
+    IfThrowException:boolean;
 
     /**
      * Return or sets whether the Source allows to save many images in one TIFF file. The default value is FALSE.
@@ -1723,21 +1876,15 @@ interface WebTwain {
      */
     IfUseTwainDSM: boolean;
 
-    /**
-     * Specifies whether or not to automatically scroll to the last image or stay on the current image when loading or acquiring images
-     * @type {bool}
-     */
-    IfAutoScroll: boolean;
-
     /**
      * [Deprecated.] The number of bits in each image pixel (or bit depth). This is a runtime, read-only property.
-     * @type {short}
+     * @type {number}
      */
     ImageBitsPerPixel: number;
 
     /**
      * Returns or sets whether a TWAIN driver or Native Scan of Mac OS X is used for document scanning. This property works for Mac edition only.
-     * @type {int}
+     * @type {number}
      */
     ImageCaptureDriverType: number;
 
@@ -1767,37 +1914,37 @@ interface WebTwain {
 
     /**
      * Returns the document number of the current image. This is a runtime, read-only property.
-     * @type {int}
+     * @type {number}
      */
     ImageLayoutDocumentNumber: number;
 
     /**
      * Returns the value of the bottom-most edge of the current image frame (in Unit). This is a read-only runtime property.
-     * @type {float}
+     * @type {number}
      */
     ImageLayoutFrameBottom: number;
 
     /**
      * Returns the value of the left-most edge of the current image frame (in Unit). This is a runtime, read-only property.
-     * @type {float}
+     * @type {number}
      */
     ImageLayoutFrameLeft: number;
 
     /**
      * Returns the frame number of the current image. This is a runtime, read-only property.
-     * @type {int}
+     * @type {number}
      */
     ImageLayoutFrameNumber: number;
 
     /**
      * Returns the value of the right-most edge of the current image frame (in Unit). This is a runtime, read-only property.
-     * @type {float}
+     * @type {number}
      */
     ImageLayoutFrameRight: number;
 
     /**
      * Returns the value of the top-most edge of the current image frame (in Unit). This is a runtime, read-only property.
-     * @type {float}
+     * @type {number}
      */
     ImageLayoutFrameTop: number;
 
@@ -1809,13 +1956,13 @@ interface WebTwain {
 
     /**
      * [Deprecated.] Returns how tall/long, in pixels, the image is. This is a runtime, read-only property.
-     * @type {int}
+     * @type {number}
      */
     ImageLength: number;
 
     /**
      * Returns or sets the margin between images when multiple images are displayed in Dynamic Web TWAIN.
-     * @type {short}
+     * @type {number}
      */
     ImageMargin: number;
 
@@ -1827,31 +1974,31 @@ interface WebTwain {
 
     /**
      * [Deprecated.] Returns how width, in pixels, the image is. This is a runtime, read-only property.
-     * @type {int}
+     * @type {number}
      */
     ImageWidth: number;
 
     /**
      * [Deprecated.] Returns the X resolution of the current image. X resolution is the number of pixels per Unit in the horizontal direction. This is a runtime, read-only property.
-     * @type {float}
+     * @type {number}
      */
     ImageXResolution: number;
 
     /**
      * [Deprecated.] Returns the Y resolution of the current image. Y resolution is the number of pixels per Unit in the vertical direction. This is a runtime, read-only property.
-     * @type {float}
+     * @type {number}
      */
     ImageYResolution: number;
 
     /**
      * Returns or sets the quality of JPEG files and PDF files using JPEG compression.
-     * @type {short}
+     * @type {number}
      */
     JPEGQuality: number;
 
     /**
      * Returns or sets the log level for debugging.
-     * @type {short}
+     * @type {number}
      */
     LogLevel: number;
 
@@ -1863,7 +2010,7 @@ interface WebTwain {
 
     /**
      * Return the magnetic type if the scanner support magnetic data recognition.
-     * @type {short}
+     * @type {number}
      */
     MagType: number;
 
@@ -1875,19 +2022,19 @@ interface WebTwain {
 
     /**
      * Returns or sets the maximum number of images can be held in buffer.
-     * @type {short}
+     * @type {number}
      */
     MaxImagesInBuffer: number;
 
     /**
      * [Deprecated.] Returns or sets how many threads can be used when you upload files through POST.
-     * @type {int}
+     * @type {number}
      */
     MaxInternetTransferThreads: number;
 
     /**
      * Sets or returns the maximum allowed size when Dynamic Web TWAIN uploads a document.
-     * @type {int}
+     * @type {number}
      */
     MaxUploadImageSize: number;
 
@@ -1899,22 +2046,16 @@ interface WebTwain {
 
     /**
      * Returns the X co-ordinate of the mouse. This is a runtime property.
-     * @type {int}
+     * @type {number}
      */
     MouseX: number;
 
     /**
      * Returns the Y co-ordinate of the mouse. This is a runtime property.
-     * @type {int}
+     * @type {number}
      */
     MouseY: number;
 
-    /**
-     * Returns or sets the page size(s) the Source can/should use to acquire image data. This is a runtime property.
-     * @type {short}
-     */
-    PageSize: number;
-
     /**
      * Returns or sets the name of the person who creates the PDF document.
      * @type {string}
@@ -1975,15 +2116,21 @@ interface WebTwain {
      */
     PDFVersion: string;
 
+    /**
+     * Returns or sets the page size(s) the Source can/should use to acquire image data. This is a runtime property.
+     * @type {number}
+     */
+    PageSize: number;
+
     /**
      * Returns the number of transfers the Source is ready to supply, upon demand. This is a runtime, read-only property.
-     * @type {short}
+     * @type {number}
      */
     PendingXfers: number;
 
     /**
      * Returns or sets the pixel flavor for acquired images. This is a runtime property.
-     * @type {short}
+     * @type {number}
      */
     PixelFlavor: number;
 
@@ -2005,6 +2152,12 @@ interface WebTwain {
      */
     ProductKey: string;
 
+    /**
+     * Sets or returns the product name string for the application identity.
+     * @type {string}
+     */
+    ProductName: string;
+
     /**
      * [Deprecated.] Returns or sets the name of the proxy server.
      * @type {string}
@@ -2013,46 +2166,40 @@ interface WebTwain {
 
     /**
      * Returns or sets the current resolution for acquired images. This is a runtime property.
-     * @type {float}
+     * @type {number}
      */
     Resolution: number;
 
     /**
      * Returns or sets how many scanned images are selected.
-     * @type {short}
+     * @type {number}
      */
     SelectedImagesCount: number;
 
     /**
      * Returns or sets the border color of the selected image. It is a value specifying the 24-bit RGB value.
-     * @type {int}
+     * @type {number}
      */
     SelectionImageBorderColor: number;
 
     /**
      * Specifies a fixed aspect ratio to be used for selecting an area.
-     * @type {float}
+     * @type {number}
      */
     SelectionRectAspectRatio: number;
 
+    /**
+     * Specifies whether to show the page number
+     * @type {bool}
+     */
+    ShowPageNumber: boolean;
+
     /**
      * Returns how many sources are installed in the system. This is a runtime, read-only property.
-     * @type {int}
+     * @type {number}
      */
     SourceCount: number;
 
-    /**
-     * [Deprecated.] Replaced by GetSourceNameItems method.
-     * @type {string}
-     */
-    SourceNameItems: string;
-
-    /**
-     * [Deprecated.]
-     * @type {string}
-     */
-    GetSourceNames: string;
-
     /**
      * Returns or sets the compression type of TIFF files. This is a runtime property.
      * @type {EnumDWT_TIFFCompressionType}
@@ -2067,38 +2214,74 @@ interface WebTwain {
 
     /**
      * Returns or sets the unit of measure. This is a runtime property.
-     * @type {short}
+     * @type {number}
      */
     Unit: number;
 
+    /**
+     * Specifies whether to show the vertical scroll bar
+     * @type {bool}
+     */
+    VScrollBar: boolean;
+
     /**
      * Sets or returns the version info string for the application identity.
      * @type {string}
      */
     VersionInfo: string;
 
+    /**
+     * Returns or sets the width of the dwt object viewer
+     * @type {string|number}
+     */
+    Width: string|number;
+
     /**
      * Returns and sets the number of images you are willing to transfer per session. This is a runtime property.
-     * @type {short}
+     * @type {number}
      */
     XferCount: number;
 
     /**
      * Returns or sets zoom factor for the image, only valid When the view mode is set to -1 by -1.
-     * @type {float}
+     * @type {number}
      */
     Zoom: number;
 
+    /* ignored 
+    style
+    _AutoCropMethod
+    */
+
+    /*
+    *Methods
+    */
+
+
     /**
-     * Binds a specified function to an event, so that the function gets called whenever the event fires.
-     * @method WebTwain#RegisterEvent
-     * @param {string} name the name of the event that the function is bound to.
-     * @param {object} evt specifies the function to call when event fires.
+     * Displays the source's built-in interface to acquire image.
+     * @method WebTwain#AcquireImage
+     * @param {object} optionalDeviceConfig  a JS object used to set up the device for image acquisition.
+     * @param {function} asyncSuccessFunc the function to call when the upload succeeds. Please refer to the function prototype OnSuccess.
+     * @param {function} asyncFailureFunc the function to call when the upload fails. Please refer to the function prototype OnFailure.
      * @return {bool}
      */
-    RegisterEvent(name: string, evt: object): boolean;
+    AcquireImage(optionalDeviceConfig?: object, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
-    // --- SCAN start --
+    /**
+     * Add text on an image.
+     * @method WebTwain#AddText
+     * @param {number} sImageIndex  the index of the image that you want to add text to.
+     * @param {number} x the x coordinate for the text.
+     * @param {number} y the y coordinate for the text.
+     * @param {string} text the content of the text that you want to add.
+     * @param {number} txtColor  the color for the text.
+     * @param {number} backgroundColor  the background color.
+     * @param {number} backgroundRoundRadius ranging from 0 to 0.5. Please NOTE that MAC version does not support this parameter.
+     * @param {number} backgroundOpacity specifies the opacity of the background of the added text, it ranges from 0 to 1.0. Please NOTE that Mac version only supports value 0 and 1
+     * @return {bool}
+     */
+    AddText(sImageIndex: number, x: number, y: number, text: string, txtColor: number, backgroundColor: number, backgroundRoundRadius: number, backgroundOpacity: number): boolean;
 
     /**
      * Cancels all pending transfers.
@@ -2108,114 +2291,118 @@ interface WebTwain {
     CancelAllPendingTransfers(): boolean;
 
     /**
-     * Closes Data Source.
-     * @method WebTwain#CloseSource
+     * Gets information of the capability specified by the Capability property.
+     * @method WebTwain#CapGet
      * @return {bool}
      */
-    CloseSource(): boolean;
+    CapGet(): boolean;
 
     /**
-     * Closes and unloads Data Source Manager.
-     * @method WebTwain#CloseSourceManager
+     * Returns the Source's current Value for the specified capability.
+     * @method WebTwain#CapGetCurrent
      * @return {bool}
      */
-    CloseSourceManager(): boolean;
+    CapGetCurrent(): boolean;
 
     /**
-     * Disable the source. If the source's user interface is displayed when the source is enabled, it will be closed.
-     * @method WebTwain#DisableSource
+     * Returns the Source's Default Value for the specified capability. This is the Source's preferred default value.
+     * @method WebTwain#CapGetDefault
      * @return {bool}
      */
-    DisableSource(): boolean;
+    CapGetDefault(): boolean;
 
     /**
-     * Sets the Source to eject the current page and advance the next page in the document feeder into the feeder acquire area when IfFeederEnabled is TRUE.
-     * @method WebTwain#FeedPage
+     * Returns the value of the bottom-most edge of the specified frame.
+     * @method WebTwain#CapGetFrameBottom
+     * @param {number} index specifies the value of which frame to get. The index is 0-based.
+     * @return {number}
+     */
+    CapGetFrameBottom(index: number): number;
+
+    /**
+     * Returns the value (in Unit) of the left-most edge of the specified frame.
+     * @method WebTwain#CapGetFrameLeft
+     * @param {number} index specifies the value of which frame to get. The index is 0-based.
+     * @return {number}
+     */
+    CapGetFrameLeft(index: number): number;
+
+    /**
+     * Returns the value (in Unit) of the left-most edge of the specified frame.
+     * @method WebTwain#CapGetFrameRight
+     * @param {number} index specifies the value of which frame to get. The index is 0-based.
+     * @return {number}
+     */
+    CapGetFrameRight(index: number): number;
+
+    /**
+     * Returns the value (in Unit) of the top-most edge of the specified frame.
+     * @method WebTwain#CapGetFrameTop
+     * @param {number} index specifies the value of which frame to get. The index is 0-based.
+     * @return {number}
+     */
+    CapGetFrameTop(index: number): number;
+
+    /* ignored
+    * CapGetHelp
+    * CapGetLabel
+    * CapGetLabels
+    */
+
+    /**
+     * Queries whether the Source supports a particular operation on the capability.
+     * @method WebTwain#CapIfSupported
+     * @param {EnumDWT_MessageType} messageType specifies the type of capability operation.
      * @return {bool}
      */
-    FeedPage(): boolean;
+    CapIfSupported(messageType: EnumDWT_MessageType): boolean;
 
     /**
-     * Retrieve the device type of the currently selected data source, it might be a scanner, a web camera, etc.
-     * @method WebTwain#GetDeviceType
-     * @return {int}
-     */
-    GetDeviceType(): number;
-
-    /**
-     * Get the source name according to the source index.
-     * @method WebTwain#GetSourceNameItems
-     * @param {short} index int index. Index is 0-based and can not be greater than SourceCount property.
-     * @return {string}
-     */
-    GetSourceNameItems(index: number): string;
-
-    /**
-     * Loads the specified Source into main memory and causes its initialization,
-     * placing Dynamic Web TWAIN into Capability Negotiation state. If no source is
-     * specified (no SelectSource() or SelectSourceByIndex() is called), opens the default source.
-     * @method WebTwain#OpenSource
+     * Changes the Current Value of the capability specified by Capability property back to its power-on value.
+     * @method WebTwain#CapReset
      * @return {bool}
      */
-    OpenSource(): boolean;
+    CapReset(): boolean;
 
     /**
-     * Loads and opens Data Source Manager.
-     * @method WebTwain#OpenSourceManager
+     * Sets the current capability using the container type specified by CapType property. The current capability is specified by Capability property.
+     * @method WebTwain#CapSet
      * @return {bool}
      */
-    OpenSourceManager(): boolean;
+    CapSet(): boolean;
 
     /**
-     * Reverts the current image layout to the Data Source's default.
-     * @method WebTwain#ResetImageLayout
+     * Sets the values of the specified frame.
+     * @method WebTwain#CapSetFrame
+     * @param {number} index  specifies the values of which frame to set. The index is 0-based.
+     * @param {number} left the value (in Unit) of the left-most edge of the specified frame.
+     * @param {number} top the value (in Unit) of the top-most edge of the specified frame.
+     * @param {number} right  the value (in Unit) of the right-most edge of the specified frame.
+     * @param {number} bottom  the value (in Unit) of the bottom-most edge of the specified frame.
      * @return {bool}
      */
-    ResetImageLayout(): boolean;
+    CapSetFrame(index: number, left: number, top: number, right: number, bottom: number): boolean;
 
     /**
-     * Sets the Source to return the current page to the input side of the document feeder and
-     * feed the last page from the outside of the feeder back into the acquisition area if IfFeederEnabled is TRUE.
-     * @method WebTwain#RewindPage
+     * Changes the bitdepth of a specified image.
+     * @method WebTwain#ChangeBitDepth
+     * @param {number} sImageIndex specifies the index of image in buffer. The index is 0-based.
+     * @param {number} sBitDepth specifies the target bit depth.
+     * @param {bool} bHighQuality specifies whether or not to keep high quality while changing the bit depth. When it's true, it takes more time.
      * @return {bool}
      */
-    RewindPage(): boolean;
+    ChangeBitDepth(sImageIndex: number, sBitDepth: number, bHighQuality: boolean): boolean;
 
     /**
-     * Brings up the TWAIN Data Source Manager's Source Selection User Interface (UI)
-     * so that user can choose which Data Source to be the current Source.
-     * @method WebTwain#SelectSource
+     * Changes width and height of the image of a specified index in the buffer. Please note the file size of the image will be changed proportionately.
+     * @method WebTwain#ChangeImageSize
+     * @param {number} sImageIndex specifies the index of image in buffer. The index is 0-based.
+     * @param {number} iNewWidth  specifies the pixel width of the new image.
+     * @param {number} iNewHeight specifies the pixel height of the new image.
+     * @param {EnumDWT_InterpolationMethod} newVal specifies the method to do interpolation.
      * @return {bool}
      */
-    SelectSource(): boolean;
-
-    /**
-     * Selects the index-the source in SourceNameItems property as the current source.
-     * @method WebTwain#SelectSourceByIndex
-     * @param {short} index It is the index of SourceNameItems property.
-     * @return {bool}
-     */
-    SelectSourceByIndex(index: number): boolean;
-
-    /**
-     * Sets file name and file format information used in File Transfer Mode.
-     * @method WebTwain#SetFileXferInfo
-     * @param {string} fileName the name of the file to be used in transfer.
-     * @param {EnumDWT_FileFormat} fileFormat an enumerated value indicates the format of the image.
-     * @return {bool}
-     */
-    SetFileXferInfo(fileName: string, fileFormat: EnumDWT_FileFormat): boolean;
-
-    /**
-     * Sets the left, top, right, and bottom sides of the image layout rectangle for the current Data Source.
-     * @method WebTwain#SetImageLayout
-     * @param {float} left specifies the floating point number for the left side of the image layout rectangle.
-     * @param {float} top specifies the floating point number for the top side of the image layout rectangle.
-     * @param {float} right specifies the floating point number for the right side of the image layout rectangle.
-     * @param {float} bottom specifies the floating point number for the bottom side of the image layout rectangle.
-     * @return {bool}
-     */
-    SetImageLayout(left: number, top: number, right: number, bottom: number): boolean;
+    ChangeImageSize(sImageIndex: number, iNewWidth: number, iNewHeight: number, newVal: EnumDWT_InterpolationMethod): boolean;
 
     /**
      * Clears all the web forms which are used for image uploading.
@@ -2232,12 +2419,154 @@ interface WebTwain {
     ClearTiffCustomTag(): void;
 
     /**
-     * Check whether a certain file exists on the local disk.
-     * @method WebTwain#FileExists
-     * @param {string} localFile specifies the absolute path of the local file.
+     * Closes Data Source.
+     * @method WebTwain#CloseSource
      * @return {bool}
      */
-    FileExists(localFile: string): boolean;
+    CloseSource(): boolean;
+
+    /**
+     * Closes and unloads Data Source Manager.
+     * @method WebTwain#CloseSourceManager
+     * @return {bool}
+     */
+    CloseSourceManager(): boolean;
+
+    /**
+     * Closes the current process used to scan
+     * @method WebTwain#CloseWorkingProcess
+     * @return {bool}
+     */
+    CloseWorkingProcess(): boolean;
+
+    /**
+     * Converts the images specified by the indices to base64.
+     * @method WebTwain#ConvertToBase64
+     * @param {Array} indices indices specifies which images are to be converted to base64.
+     * @param {EnumDWT_ImageType} enumImageType the image format in which the images are to be converted to base64.
+     * @param {function} asyncSuccessFunc the function to call when the upload succeeds. Please refer to the function prototype OnSuccess.
+     * @param {function} asyncFailureFunc the function to call when the upload fails. Please refer to the function prototype OnFailure.
+     * @return {bool}
+     */
+    ConvertToBase64(indices: number[], enumImageType: EnumDWT_ImageType, optionalAsyncSuccessFunc?: (result:any) => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
+
+    /**
+     * Converts the images specified by the indices to base64.
+     * @method WebTwain#ConvertToBase64
+     * @param {Array} indices indices specifies which images are to be converted to base64.
+     * @param {EnumDWT_ImageType} enumImageType the image format in which the images are to be converted to base64.
+     * @param {function} asyncSuccessFunc the function to call when the upload succeeds. Please refer to the function prototype OnSuccess.
+     * @param {function} asyncFailureFunc the function to call when the upload fails. Please refer to the function prototype OnFailure.
+     * @return {bool}
+     */
+    ConvertToBlob(indices: number[], enumImageType: EnumDWT_ImageType, optionalAsyncSuccessFunc?: (result:any) => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
+
+    /**
+     * Changes a specified image to gray scale.
+     * @method WebTwain#ConvertToGrayScale
+     * @param {number} sIndex specifies the index of image in buffer. The index is 0-based.
+     * @return {bool}
+     */
+    ConvertToGrayScale(sIndex: number): boolean;
+
+    /**
+     * Copies the image of a specified index in buffer to clipboard in DIB format.
+     * @method WebTwain#CopyToClipboard
+     * @param {number} sImageIndex specifies the index of image in buffer. The index is 0-based.
+     * @return {bool}
+     */
+    CopyToClipboard(sImageIndex: number): boolean;
+
+    /**
+     * Create the font for adding text using the method AddText.
+     * @method WebTwain#CreateTextFont
+     * @param {number} height Specifies the desired height (in logical units) of the font.The absolute value of nHeight must not exceed 16,384 device units after it is converted.For all height comparisons, the font mapper looks for the largest font that does not exceed the requested size or the smallest font if all the fonts exceed the requested size.
+     * @param {number} width Specifies the average width (in logical units) of characters in the font. If Width is 0, the aspect ratio of the device will be matched against the digitization aspect ratio of the available fonts to find the closest match, which is determined by the absolute value of the difference.
+     * @param {number} escapement Specifies the angle (in 0.1-degree units) between the escapement vector and the x-axis of the display surface. The escapement vector is the line through the origins of the first and last characters on a line. The angle is measured counterclockwise from the x-axis.
+     * @param {number} orientation Specifies the angle (in 0.1-degree units) between the baseline of a character and the x-axis.The angle is measured counterclockwise from the x-axis for coordinate systems in which the y-direction is down and clockwise from the x-axis for coordinate systems in which the y-direction is up.
+     * @param {number} weight Specifies the font weight (in inked pixels per 1000). The described valuesare approximate; the actual appearance depends on the typeface. Some fonts haveonly FW_NORMAL, FW_REGULAR, and FW_BOLD weights. If FW_DONTCARE is specified, a default weight is used.
+     * @param {number} italic  Specifies an italic font if set to TRUE.
+     * @param {number} underline Specifies an underlined font if set to TRUE.
+     * @param {number} strikeOut A strikeout font if set to TRUE.
+     * @param {number} charSet Specifies the font's character set. The OEM character set is system-dependent. Fonts with other character sets may exist in the system. An application that uses a font with an unknown character set must not attempt to translate or interpret strings that are to be rendered with that font.
+     * @param {number} outputPrecision Specifies the desired output precision. The output precision defines how closely the output must match the requested font's height, width, character orientation, escapement, and pitch.
+     * @param {number} clipPrecision Specifies the desired clipping precision. The clipping precision defines how to clip characters that are partially outside the clipping region.
+     * @param {number} quality Specifies the font's output quality, which defines how carefully the GDI must attempt to match the logical-font attributes to those of an actual physical font.
+     * @param {number} pitchAndFamily  The pitch and family of the font.
+     * @param {string} faceName   the typeface name, the length of this string must not exceed 32 characters, including the terminating null character.
+     * @return {bool}
+     */
+    CreateTextFont(height: number, width: number, escapement: number, orientation: number, weight: number, italic: number, underline: number, strikeOut: number, charSet: number, outputPrecision: number, clipPrecision: number, quality: number, pitchAndFamily: number, faceName: string): boolean;
+
+    /**
+     * Crops the image of a specified index in buffer.
+     * @method WebTwain#Crop
+     * @param {number} sImageIndex specifies the index of image in buffer. The index is 0-based.
+     * @param {number} left specifies the x-coordinate of the upper-left corner of the rectangle.
+     * @param {number} top specifies the y-coordinate of the upper-left corner of the rectangle.
+     * @param {number} right specifies the x-coordinate of the lower-right corner of the rectangle.
+     * @param {number} bottom specifies the y-coordinate of the lower-right corner of the rectangle.
+     * @return {bool}
+     */
+    Crop(sImageIndex: number, left: number, top: number, right: number, bottom: number): boolean;
+
+    /**
+     * Crops the image of a specified index in buffer to clipboard in DIB format.
+     * @method WebTwain#CropToClipboard
+     * @param {number} sImageIndex specifies the index of image in buffer. The index is 0-based.
+     * @param {number} left specifies the x-coordinate of the upper-left corner of the rectangle.
+     * @param {number} top specifies the y-coordinate of the upper-left corner of the rectangle.
+     * @param {number} right specifies the x-coordinate of the lower-right corner of the rectangle.
+     * @param {number} bottom specifies the y-coordinate of the lower-right corner of the rectangle.
+     * @return {bool}
+     */
+    CropToClipboard(sImageIndex: number, left: number, top: number, right: number, bottom: number): boolean;
+
+    /**
+     * Cuts the image data in the specified area to the system clipboard in DIB format.
+     * @method WebTwain#CutFrameToClipboard
+     * @param {number} sImageIndex specifies the index of image in buffer. The index is 0-based.
+     * @param {number} left specifies the x-coordinate of the upper-left corner of the rectangle.
+     * @param {number} top specifies the y-coordinate of the upper-left corner of the rectangle.
+     * @param {number} right specifies the x-coordinate of the lower-right corner of the rectangle.
+     * @param {number} bottom specifies the y-coordinate of the lower-right corner of the rectangle.
+     * @return {bool}
+     */
+    CutFrameToClipboard(sImageIndex: number, left: number, top: number, right: number, bottom: number): boolean;
+
+    /**
+     * Cuts the image of a specified index in buffer to clipboard in DIB format.
+     * @method WebTwain#CutToClipboard
+     * @param {number} sImageIndex specifies the index of image in buffer. The index is 0-based.
+     * @return {bool}
+     */
+    CutToClipboard(sImageIndex: number): boolean;
+
+    /**
+     * Disable the source. If the source's user interface is displayed when the source is enabled, it will be closed.
+     * @method WebTwain#DisableSource
+     * @return {bool}
+     */
+    DisableSource(): boolean;
+
+    /**
+     * Enables the source to accept image.
+     * @method WebTwain#EnableSource
+     * @return {bool}
+     */
+    EnableSource(): boolean;
+    
+    /**
+     * Clears the specified area of a specified image, and fill the area with the fill color.
+     * @method WebTwain#Erase
+     * @param {number} sImageIndex specifies the index of image in buffer. The index is 0-based.
+     * @param {number} left specifies the x-coordinate of the upper-left corner of the rectangle.
+     * @param {number} top specifies the y-coordinate of the upper-left corner of the rectangle.
+     * @param {number} right specifies the x-coordinate of the lower-right corner of the rectangle.
+     * @param {number} bottom specifies the y-coordinate of the lower-right corner of the rectangle.
+     * @return {bool}
+     */
+    Erase(sImageIndex: number, left: number, top: number, right: number, bottom: number): boolean;
 
     /**
      * Downloads an image from the FTP server.
@@ -2278,7 +2607,7 @@ interface WebTwain {
      * Uploads the image of a specified index in the buffer to the FTP server.
      * @method WebTwain#FTPUpload
      * @param {string} FTPServer the name of the FTP server.
-     * @param {short} sImageIndex specifies the index of the image in the buffer. The index is 0-based.
+     * @param {number} sImageIndex specifies the index of the image in the buffer. The index is 0-based.
      * @param {string} FTPRemoteFile the name of the file to be created on the FTP server. It should be a relative path on the FTP server.
      * @param {function} optionalAsyncSuccessFunc optional. The function to call when the upload succeeds. Please refer to the function prototype OnSuccess.
      * @param {function} optionalAsyncFailureFunc optional. The function to call when the upload fails. Please refer to the function prototype OnFailure.
@@ -2302,7 +2631,7 @@ interface WebTwain {
      * Uploads the image of a specified index in the buffer to the FTP server as a specified image format.
      * @method WebTwain#FTPUploadEx
      * @param {string} FTPServer the name of the FTP server.
-     * @param {short} sImageIndex specifies the index of image in buffer. The index is 0-based.
+     * @param {number} sImageIndex specifies the index of image in buffer. The index is 0-based.
      * @param {string} FTPRemoteFile the name of the file to be created on the FTP server. It should be a relative path on the FTP server.
      * @param {EnumDWT_ImageType} lImageType the image format of the file to be created on the FTP server.
      * @param {function} optionalAsyncSuccessFunc optional. The function to call when the upload succeeds. Please refer to the function prototype OnSuccess.
@@ -2355,6 +2684,198 @@ interface WebTwain {
      */
     FTPUploadAsMultiPageTIFF(FTPServer: string, FTPRemoteFile: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
+    /**
+     * Sets the Source to eject the current page and advance the next page in the document feeder into the feeder acquire area when IfFeederEnabled is TRUE.
+     * @method WebTwain#FeedPage
+     * @return {bool}
+     */
+    FeedPage(): boolean;
+
+    /**
+     * Check whether a certain file exists on the local disk.
+     * @method WebTwain#FileExists
+     * @param {string} localFile specifies the absolute path of the local file.
+     * @return {bool}
+     */
+    FileExists(localFile: string): boolean;
+
+    /**
+     * Flips the image of a specified index in buffer.
+     * @method WebTwain#Flip
+     * @param {number} sImageIndex specifies the index of image in buffer. The index is 0-based.
+     * @return {bool}
+     */
+    Flip(sImageIndex: number): boolean;
+
+    /**
+     * Get the cap item value of the capability specified by Capability property, when the value of the CapType property is TWON_ARRAY or TWON_ENUMERATION.
+     * @method WebTwain#GetCapItems
+     * @param {number} index Index is 0-based. It is the index of the cap item.
+     * @return {number}
+     */
+    GetCapItems(index: number): number;
+
+    /**
+     * Returns the cap item value of the capability specified by Capability property, when the value of the CapType property is TWON_ARRAY or TWON_ENUMERATION.
+     * @method WebTwain#GetCapItemsString
+     * @param {number} index Index is 0-based. It is the index of the cap item.
+     * @return {string}
+     */
+    GetCapItemsString(index: number): string;
+
+    // Get custom DS data, and returned string  is encoded with base64
+    /**
+     * Gets custom DS data, the returned string is base64 encoded.
+     * @method WebTwain#GetCustomDSDataEx
+     * @return {string}
+     */
+    GetCustomDSDataEx(): string;
+
+    // Get custom DS data, and save the data to the specified file
+    /**
+     * Gets custom DS data and save the data in a specified file.
+     * @method WebTwain#GetCustomDSData
+     * @param {string} fileName  the path of the file used for storing custom DS data.
+     * @return {bool}
+     */
+    GetCustomDSData(fileName: string): boolean;
+
+    /**
+     * Retrieve the device type of the currently selected data source, it might be a scanner, a web camera, etc.
+     * @method WebTwain#GetDeviceType
+     * @return {number}
+     */
+    GetDeviceType(): number;
+
+    /**
+     * Returns the pixel bit depth of the selected image.
+     * @method WebTwain#GetImageBitDepth
+     * @param {number} sImageIndex specifies the index of image. The index is 0-based.
+     * @return {number}
+     */
+    GetImageBitDepth(sImageIndex: number): number;
+
+    /**
+     * Returns the height (pixels) of the selected image. This is a read-only property.
+     * @method WebTwain#GetImageHeight
+     * @param {number} sImageIndex specifies the index of image. The index is 0-based.
+     * @return {number}
+     */
+    GetImageHeight(sImageIndex: number): number;
+
+    /*work on
+    GetImagePartURL
+    */
+
+    /**
+     * Returns the file size of the new image resized from the image of a specified index in buffer.
+     * @method WebTwain#GetImageSize
+     * @param {number} sImageIndex specifies the index of image in buffer. The index is 0-based.
+     * @param {number} iWidth specifies the pixel width of the new image.
+     * @param {number} iHeight specifies the pixel height of the new image.
+     * @return {number}
+     */
+    GetImageSize(sImageIndex: number, iWidth: number, iHeight: number): number;
+
+    /**
+     * Pre-calculate the file size of the local image file that is saved from an image of a specified index in buffer.
+     * @method WebTwain#GetImageSizeWithSpecifiedType
+     * @param {number} sImageIndex specifies the index of image in buffer. The index is 0-based.
+     * @param {number} sImageType specifies the type of an image file..
+     * @return {number}
+     */
+    GetImageSizeWithSpecifiedType(sImageIndex: number, sImageType: number): number;
+
+    /**
+     * Returns the direct URL of an image specified by index, if iWidth or iHeight is set to -1, you get the original image, otherwise you get the image with specified iWidth or iHeight while keeping the same aspect ratio.
+     * @method WebTwain#GetImageURL
+     * @param {number} index the index of the image.
+     * @param {number} iWidth the width of the image.
+     * @param {number} iHeight the height of the image.
+     * @return {string}
+     */
+    GetImageURL(index: number, iWidth: number, iHeight: number): string;
+
+    /**
+     * Returns the width (pixels) of the selected image. This is a read-only property.
+     * @method WebTwain#GetImageWidth
+     * @param {number} sImageIndex specifies the index of image. The index is 0-based.
+     * @return {number}
+     */
+    GetImageWidth(sImageIndex: number): number;
+
+    /**
+     * Return the horizontal resolution of the specified image.
+     * @method WebTwain#GetImageXResolution
+     * @param {number} sImageIndex specifies the index of image in buffer. The index is 0-based.
+     * @return {number}
+     */
+    GetImageXResolution(sImageIndex: number): number;
+
+    /**
+     * Return the vertical resolution of the specified image.
+     * @method WebTwain#GetImageYResolution
+     * @param {number} sImageIndex specifies the index of image in buffer. The index is 0-based.
+     * @return {number}
+     */
+    GetImageYResolution(sImageIndex: number): number;
+
+    /**
+     * Return the runtime license info.
+     * @method WebTwain#GetLicenseInfo
+     */
+    GetLicenseInfo(): {Domain:string, Detail: Array<any>};
+
+    /**
+     * Returns the index of the selected image.
+     * @method WebTwain#GetSelectedImageIndex
+     * @param {number} sSelectedIndex specifies the index of the selected image.
+     * @return {number}
+     */
+    GetSelectedImageIndex(sSelectedIndex: number): number;
+
+    /**
+     * Pre-calculate the file size of the local image file that is saved from the selected images in buffer.
+     * @method WebTwain#GetSelectedImagesSize
+     * @param {number} iImageType specifies the type of an image file.
+     * @return {number}
+     */
+    GetSelectedImagesSize(iImageType: number): number;
+
+    /**
+     * Check the skew angle of an image by its index in buffer.
+     * @method WebTwain#GetSkewAngle
+     * @param {number} sImageIndex the index of the image in the buffer.
+     * @return {number}
+     */
+    GetSkewAngle(sImageIndex: number): number;
+
+    /**
+     * Check the skew angle of a rectangular part of an image by its index in buffer.
+     * @method WebTwain#GetSkewAngleEx
+     * @param {number} sImageIndex the index of the image in the buffer.
+     * @param {number} left specifies the x-coordinate of the upper-left corner of the rectangle.
+     * @param {number} top specifies the y-coordinate of the upper-left corner of the rectangle.
+     * @param {number} right specifies the x-coordinate of the lower-right corner of the rectangle.
+     * @param {number} bottom specifies the y-coordinate of the lower-right corner of the rectangle.
+     * @return {number}
+     */
+    GetSkewAngleEx(sImageIndex: number, left: number, top: number, right: number, bottom: number): number;
+
+    /**
+     * Get the source name according to the source index.
+     * @method WebTwain#GetSourceNameItems
+     * @param {number} index number index. Index is 0-based and can not be greater than SourceCount property.
+     * @return {string}
+     */
+    GetSourceNameItems(index: number): string;
+
+    /*ignored
+    GetSourceNames
+    GetSourceType
+    GetVersionInfoAsync
+    */
+  
     /**
      * Downloads an image from the HTTP server.
      * @method WebTwain#HTTPDownload
@@ -2390,6 +2911,11 @@ interface WebTwain {
      */
     HTTPDownloadEx(HTTPServer: string, HTTPRemoteFile: string, lImageType: EnumDWT_ImageType, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
+    /*ignored
+    HTTPDownloadStreamThroughPost
+    HTTPDownloadThroughGet
+    */
+
     /**
      *  Download an image from the server using a HTTP Post call.
      * @method WebTwain#HTTPDownloadThroughPost
@@ -2401,12 +2927,75 @@ interface WebTwain {
      * @return {bool}
      */
     HTTPDownloadThroughPost(HTTPServer: string, HTTPRemoteFile: string, lImageType: EnumDWT_ImageType, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
+    
+    /**
+     * Uploads the images specified by the indices to the HTTP server.
+     * @method WebTwain#HTTPUpload
+     * @param {string} url the url where the images are sent in a POST request.
+     * @param {Array} indices indices specifies which images are to be uploaded.
+     * @param {EnumDWT_ImageType} enumImageType the image format in which the images are to be uploaded.
+     * @param {EnumDWT_UploadDataFormat} dataFormat whether to upload the images as binary or a base64-based string.
+     * @param {function} asyncSuccessFunc the function to call when the upload succeeds. Please refer to the function prototype OnSuccess.
+     * @param {function} asyncFailureFunc the function to call when the upload fails. Please refer to the function prototype OnFailure.
+     * @return {bool}
+     */
+    HTTPUpload (url: string, indices: number[], enumImageType: EnumDWT_ImageType, dataFormat: EnumDWT_UploadDataFormat, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
+    
+    /**
+     * Uploads all images in the buffer to the HTTP server through the HTTP Post method as a Multi-Page TIFF.
+     * @method WebTwain#HTTPUploadAllThroughPostAsMultiPageTIFF
+     * @param {string} HTTPServer  the name of the HTTP server.
+     * @param {string} ActionPage the specified page for posting image files. This is the relative path of the page, not the absolute path. For example: "upload.asp", not "http://www.webserver.com/upload.asp".
+     * @param {string} fileName the name of the image to be uploaded.
+     * @param {function} optionalAsyncSuccessFunc optional. The function to call when the upload succeeds. Please refer to the function prototype OnHttpUploadSuccess.
+     * @param {function} optionalAsyncFailureFunc optional. The function to call when the upload fails. Please refer to the function prototype OnHttpUploadFailure.
+     * @return {bool}
+     */
+    HTTPUploadAllThroughPostAsMultiPageTIFF(HTTPServer: string, ActionPage: string, fileName: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
+
+    /**
+     * Uploads all images in the buffer to the HTTP server through HTTP Post method as a Multi-Page PDF.
+     * @method WebTwain#HTTPUploadAllThroughPostAsPDF
+     * @param {string} HTTPServer  the name of the HTTP server.
+     * @param {string} ActionPage the specified page for posting image files. This is the relative path of the page, not the absolute path. For example: "upload.asp", not "http://www.webserver.com/upload.asp".
+     * @param {string} fileName the name of the image to be uploaded.
+     * @param {function} optionalAsyncSuccessFunc optional. The function to call when the upload succeeds. Please refer to the function prototype OnHttpUploadSuccess.
+     * @param {function} optionalAsyncFailureFunc optional. The function to call when the upload fails. Please refer to the function prototype OnHttpUploadFailure.
+     * @return {bool}
+     */
+    HTTPUploadAllThroughPostAsPDF(HTTPServer: string, ActionPage: string, fileName: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
+   
+    /**
+     * [Deprecated.] Uploads all images in the buffer to the HTTP server through the HTTP Put method as a Multi-Page TIFF.
+     * @method WebTwain#HTTPUploadAllThroughPutAsMultiPageTIFF
+     * @param {string} HTTPServer the name of the HTTP server.
+     * @param {string} RemoteFileName the name of the image to be uploaded.
+     * @param {function} optionalAsyncSuccessFunc optional. The function to call when the upload succeeds. Please refer to the function prototype OnSuccess.
+     * @param {function} optionalAsyncFailureFunc optional. The function to call when the upload fails. Please refer to the function prototype OnFailure.
+     * @return {bool}
+     */
+    HTTPUploadAllThroughPutAsMultiPageTIFF(HTTPServer: string, RemoteFileName: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
+
+    /**
+     * [Deprecated.] Uploads all images in the buffer to the HTTP server through the HTTP Put method as a Multi-Page PDF.
+     * @method WebTwain#HTTPUploadAllThroughPutAsPDF
+     * @param {string} HTTPServer the name of the HTTP server.
+     * @param {string} RemoteFileName the name of the image to be uploaded.
+     * @param {function} optionalAsyncSuccessFunc optional. The function to call when the upload succeeds. Please refer to the function prototype OnSuccess.
+     * @param {function} optionalAsyncFailureFunc optional. The function to call when the upload fails. Please refer to the function prototype OnFailure.
+     * @return {bool}
+     */
+    HTTPUploadAllThroughPutAsPDF(HTTPServer: string, RemoteFileName: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
+
+    /*ignored
+    HTTPUploadStreamThroughPost
+    */
 
     /**
      * Uploads the image of a specified index in the buffer to the HTTP server through the HTTP POST method.
      * @method WebTwain#HTTPUploadThroughPost
      * @param {string} HTTPServer the name of the HTTP server.
-     * @param {short} sImageIndex specifies the index of image in buffer. The index is 0-based.
+     * @param {number} sImageIndex specifies the index of image in buffer. The index is 0-based.
      * @param {string} ActionPage the specified page for posting image files. This is the relative path of the page, not the absolute path. For example: "upload.asp", not "http://www.webserver.com/upload.asp".
      * @param {string} fileName the name of the image to be uploaded.
      * @param {function} optionalAsyncSuccessFunc optional. The function to call when the upload succeeds. Please refer to the function prototype OnHttpUploadSuccess.
@@ -2415,6 +3004,30 @@ interface WebTwain {
      */
     HTTPUploadThroughPost(HTTPServer: string, sImageIndex: number, ActionPage: string, fileName: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
+    /**
+     * Uploads the selected images in the buffer to the HTTP server through the HTTP Post method as a Multi-Page TIFF.
+     * @method WebTwain#HTTPUploadThroughPostAsMultiPageTIFF
+     * @param {string} HTTPServer  the name of the HTTP server.
+     * @param {string} ActionPage the specified page for posting image files. This is the relative path of the page, not the absolute path. For example: "upload.asp", not "http://www.webserver.com/upload.asp".
+     * @param {string} fileName the name of the image to be uploaded.
+     * @param {function} optionalAsyncSuccessFunc optional. The function to call when the upload succeeds. Please refer to the function prototype OnHttpUploadSuccess.
+     * @param {function} optionalAsyncFailureFunc optional. The function to call when the upload fails. Please refer to the function prototype OnHttpUploadFailure.
+     * @return {bool}
+     */
+    HTTPUploadThroughPostAsMultiPageTIFF(HTTPServer: string, ActionPage: string, fileName: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
+
+    /**
+     * Uploads the selected images in the buffer to the HTTP server through the HTTP Post method as a Multi-Page PDF.
+     * @method WebTwain#HTTPUploadThroughPostAsMultiPagePDF
+     * @param {string} HTTPServer  the name of the HTTP server.
+     * @param {string} ActionPage the specified page for posting image files. This is the relative path of the page, not the absolute path. For example: "upload.asp", not "http://www.webserver.com/upload.asp".
+     * @param {string} fileName the name of the image to be uploaded.
+     * @param {function} optionalAsyncSuccessFunc optional. The function to call when the upload succeeds. Please refer to the function prototype OnHttpUploadSuccess.
+     * @param {function} optionalAsyncFailureFunc optional. The function to call when the upload fails. Please refer to the function prototype OnHttpUploadFailure.
+     * @return {bool}
+     */
+    HTTPUploadThroughPostAsMultiPagePDF(HTTPServer: string, ActionPage: string, fileName: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
+
     /**
      * Directly upload a specific local file to the HTTP server through the HTTP POST method without loading it into Dynamic Web TWAIN.
      * @method WebTwain#HTTPUploadThroughPostDirectly
@@ -2432,7 +3045,7 @@ interface WebTwain {
      * Uploads the image of a specified index in the buffer to the HTTP server as a specified image format through the HTTP POST method.
      * @method WebTwain#HTTPUploadThroughPostEx
      * @param {string} HTTPServer  the name of the HTTP server.
-     * @param {short} sImageIndex specifies the index of image in buffer. The index is 0-based.
+     * @param {number} sImageIndex specifies the index of image in buffer. The index is 0-based.
      * @param {string} ActionPage the specified page for posting image files. This is the relative path of the page, not the absolute path. For example: "upload.asp", not "http://www.webserver.com/upload.asp".
      * @param {string} fileName the name of the image to be uploaded.
      * @param {EnumDWT_ImageType} lImageType the image format of the file to be created on the HTTP server.s
@@ -2443,53 +3056,39 @@ interface WebTwain {
     HTTPUploadThroughPostEx(HTTPServer: string, sImageIndex: number, ActionPage: string, fileName: string, lImageType: EnumDWT_ImageType, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
     /**
-     * Uploads all images in the buffer to the HTTP server through the HTTP Post method as a Multi-Page TIFF.
-     * @method WebTwain#HTTPUploadAllThroughPostAsMultiPageTIFF
-     * @param {string} HTTPServer  the name of the HTTP server.
-     * @param {string} ActionPage the specified page for posting image files. This is the relative path of the page, not the absolute path. For example: "upload.asp", not "http://www.webserver.com/upload.asp".
-     * @param {string} fileName the name of the image to be uploaded.
-     * @param {function} optionalAsyncSuccessFunc optional. The function to call when the upload succeeds. Please refer to the function prototype OnHttpUploadSuccess.
-     * @param {function} optionalAsyncFailureFunc optional. The function to call when the upload fails. Please refer to the function prototype OnHttpUploadFailure.
+     * [Deprecated.] Uploads the image of a specified index in the buffer to the HTTP server through the HTTP PUT method.
+     * @method WebTwain#HTTPUploadThroughPut
+     * @param {string} HTTPServer the name of the HTTP server.
+     * @param {number} sImageIndex specifies the index of image in buffer. The index is 0-based.
+     * @param {string} RemoteFileName the name of the image to be created on the HTTP server. It should a relative path on the web server.
+     * @param {function} optionalAsyncSuccessFunc optional. The function to call when the upload succeeds. Please refer to the function prototype OnSuccess.
+     * @param {function} optionalAsyncFailureFunc optional. The function to call when the upload fails. Please refer to the function prototype OnFailure.
      * @return {bool}
      */
-    HTTPUploadAllThroughPostAsMultiPageTIFF(HTTPServer: string, ActionPage: string, fileName: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
+    HTTPUploadThroughPut(HTTPServer: string, sImageIndex: number, RemoteFileName: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
+ 
+    /**
+     * [Deprecated.] Uploads the selected images in the buffer to the HTTP server through the HTTP Put method as a Multi-Page TIFF.
+     * @method WebTwain#HTTPUploadThroughPutAsMultiPageTIFF
+     * @param {string} HTTPServer the name of the HTTP server.
+     * @param {string} RemoteFileName the name of the image to be uploaded.
+     * @param {function} optionalAsyncSuccessFunc optional. The function to call when the upload succeeds. Please refer to the function prototype OnSuccess.
+     * @param {function} optionalAsyncFailureFunc optional. The function to call when the upload fails. Please refer to the function prototype OnFailure.
+     * @return {bool}
+     */
+    HTTPUploadThroughPutAsMultiPageTIFF(HTTPServer: string, RemoteFileName: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
     /**
-     * Uploads the selected images in the buffer to the HTTP server through the HTTP Post method as a Multi-Page TIFF.
-     * @method WebTwain#HTTPUploadThroughPostAsMultiPageTIFF
-     * @param {string} HTTPServer  the name of the HTTP server.
-     * @param {string} ActionPage the specified page for posting image files. This is the relative path of the page, not the absolute path. For example: "upload.asp", not "http://www.webserver.com/upload.asp".
-     * @param {string} fileName the name of the image to be uploaded.
-     * @param {function} optionalAsyncSuccessFunc optional. The function to call when the upload succeeds. Please refer to the function prototype OnHttpUploadSuccess.
-     * @param {function} optionalAsyncFailureFunc optional. The function to call when the upload fails. Please refer to the function prototype OnHttpUploadFailure.
+     * [Deprecated.] Uploads the selected images in the buffer to the HTTP server through the HTTP Put method as a Multi-Page PDF.
+     * @method WebTwain#HTTPUploadThroughPutAsMultiPagePDF
+     * @param {string} HTTPServer the name of the HTTP server.
+     * @param {string} RemoteFileName the name of the image to be uploaded.
+     * @param {function} optionalAsyncSuccessFunc optional. The function to call when the upload succeeds. Please refer to the function prototype OnSuccess.
+     * @param {function} optionalAsyncFailureFunc optional. The function to call when the upload fails. Please refer to the function prototype OnFailure.
      * @return {bool}
      */
-    HTTPUploadThroughPostAsMultiPageTIFF(HTTPServer: string, ActionPage: string, fileName: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
-
-    /**
-     * Uploads all images in the buffer to the HTTP server through HTTP Post method as a Multi-Page PDF.
-     * @method WebTwain#HTTPUploadAllThroughPostAsPDF
-     * @param {string} HTTPServer  the name of the HTTP server.
-     * @param {string} ActionPage the specified page for posting image files. This is the relative path of the page, not the absolute path. For example: "upload.asp", not "http://www.webserver.com/upload.asp".
-     * @param {string} fileName the name of the image to be uploaded.
-     * @param {function} optionalAsyncSuccessFunc optional. The function to call when the upload succeeds. Please refer to the function prototype OnHttpUploadSuccess.
-     * @param {function} optionalAsyncFailureFunc optional. The function to call when the upload fails. Please refer to the function prototype OnHttpUploadFailure.
-     * @return {bool}
-     */
-    HTTPUploadAllThroughPostAsPDF(HTTPServer: string, ActionPage: string, fileName: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
-
-    /**
-     * Uploads the selected images in the buffer to the HTTP server through the HTTP Post method as a Multi-Page PDF.
-     * @method WebTwain#HTTPUploadThroughPostAsMultiPagePDF
-     * @param {string} HTTPServer  the name of the HTTP server.
-     * @param {string} ActionPage the specified page for posting image files. This is the relative path of the page, not the absolute path. For example: "upload.asp", not "http://www.webserver.com/upload.asp".
-     * @param {string} fileName the name of the image to be uploaded.
-     * @param {function} optionalAsyncSuccessFunc optional. The function to call when the upload succeeds. Please refer to the function prototype OnHttpUploadSuccess.
-     * @param {function} optionalAsyncFailureFunc optional. The function to call when the upload fails. Please refer to the function prototype OnHttpUploadFailure.
-     * @return {bool}
-     */
-    HTTPUploadThroughPostAsMultiPagePDF(HTTPServer: string, ActionPage: string, fileName: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
-
+    HTTPUploadThroughPutAsMultiPagePDF(HTTPServer: string, RemoteFileName: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
+    
     /**
      * [Deprecated.] Directly uploads a specific local file to the HTTP server through the HTTP PUT method without loading it into Dynamic Web TWAIN.
      * @method WebTwain#HTTPUploadThroughPutDirectly
@@ -2502,23 +3101,11 @@ interface WebTwain {
      */
     HTTPUploadThroughPutDirectly(HTTPServer: string, localFile: string, RemoteFileName: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
-    /**
-     * [Deprecated.] Uploads the image of a specified index in the buffer to the HTTP server through the HTTP PUT method.
-     * @method WebTwain#HTTPUploadThroughPut
-     * @param {string} HTTPServer the name of the HTTP server.
-     * @param {short} sImageIndex specifies the index of image in buffer. The index is 0-based.
-     * @param {string} RemoteFileName the name of the image to be created on the HTTP server. It should a relative path on the web server.
-     * @param {function} optionalAsyncSuccessFunc optional. The function to call when the upload succeeds. Please refer to the function prototype OnSuccess.
-     * @param {function} optionalAsyncFailureFunc optional. The function to call when the upload fails. Please refer to the function prototype OnFailure.
-     * @return {bool}
-     */
-    HTTPUploadThroughPut(HTTPServer: string, sImageIndex: number, RemoteFileName: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
-
     /**
      * [Deprecated.] Uploads the image of a specified index in the buffer to the HTTP server as a specified image format through the HTTP PUT method.
      * @method WebTwain#HTTPUploadThroughPutEx
      * @param {string} HTTPServer the name of the HTTP server.
-     * @param {short} sImageIndex specifies the index of image in buffer. The index is 0-based.
+     * @param {number} sImageIndex specifies the index of image in buffer. The index is 0-based.
      * @param {string} RemoteFileName the name of the file to be created on the HTTP server. It should a relative path on the web server.
      * @param {EnumDWT_ImageType} lImageType the image format of the file to be created on the HTTP server.
      * @param {function} optionalAsyncSuccessFunc optional. The function to call when the upload succeeds. Please refer to the function prototype OnSuccess.
@@ -2526,72 +3113,35 @@ interface WebTwain {
      * @return {bool}
      */
     HTTPUploadThroughPutEx(HTTPServer: string, sImageIndex: number, RemoteFileName: string, lImageType: EnumDWT_ImageType, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
-
+ 
     /**
-     * [Deprecated.] Uploads all images in the buffer to the HTTP server through the HTTP Put method as a Multi-Page TIFF.
-     * @method WebTwain#HTTPUploadAllThroughPutAsMultiPageTIFF
-     * @param {string} HTTPServer the name of the HTTP server.
-     * @param {string} RemoteFileName the name of the image to be uploaded.
-     * @param {function} optionalAsyncSuccessFunc optional. The function to call when the upload succeeds. Please refer to the function prototype OnSuccess.
-     * @param {function} optionalAsyncFailureFunc optional. The function to call when the upload fails. Please refer to the function prototype OnFailure.
+     * [Deprecated.] Detects whether an image is blank.
+     * @method WebTwain#IsBlankImage
+     * @param {number} sImageIndex specifies the index of image in buffer. The index is 0-based.
      * @return {bool}
      */
-    HTTPUploadAllThroughPutAsMultiPageTIFF(HTTPServer: string, RemoteFileName: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
+    IsBlankImage(sImageIndex: number): boolean;
 
     /**
-     * [Deprecated.] Uploads the selected images in the buffer to the HTTP server through the HTTP Put method as a Multi-Page TIFF.
-     * @method WebTwain#HTTPUploadThroughPutAsMultiPageTIFF
-     * @param {string} HTTPServer the name of the HTTP server.
-     * @param {string} RemoteFileName the name of the image to be uploaded.
-     * @param {function} optionalAsyncSuccessFunc optional. The function to call when the upload succeeds. Please refer to the function prototype OnSuccess.
-     * @param {function} optionalAsyncFailureFunc optional. The function to call when the upload fails. Please refer to the function prototype OnFailure.
+     * [Deprecated.] Detects whether a certain area on an image is blank.
+     * @method WebTwain#IsBlankImageEx
+     * @param {number} sImageIndex specifies the index of image in buffer. The index is 0-based.
+     * @param {number} left specifies the x-coordinate of the upper-left corner of the rectangle.
+     * @param {number} top specifies the y-coordinate of the upper-left corner of the rectangle.
+     * @param {number} right specifies the x-coordinate of the lower-right corner of the rectangle.
+     * @param {number} bottom specifies the y-coordinate of the lower-right corner of the rectangle.
+     * @param {bool} bFuzzyMatch specifies whether use fuzzy matching when detecting.
      * @return {bool}
      */
-    HTTPUploadThroughPutAsMultiPageTIFF(HTTPServer: string, RemoteFileName: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
+    IsBlankImageEx(sImageIndex: number, left: number, top: number, right: number, bottom: number, bFuzzyMatch: boolean): boolean;
 
     /**
-     * [Deprecated.] Uploads all images in the buffer to the HTTP server through the HTTP Put method as a Multi-Page PDF.
-     * @method WebTwain#HTTPUploadAllThroughPutAsPDF
-     * @param {string} HTTPServer the name of the HTTP server.
-     * @param {string} RemoteFileName the name of the image to be uploaded.
-     * @param {function} optionalAsyncSuccessFunc optional. The function to call when the upload succeeds. Please refer to the function prototype OnSuccess.
-     * @param {function} optionalAsyncFailureFunc optional. The function to call when the upload fails. Please refer to the function prototype OnFailure.
+     * Detects whether a specific image is blank.
+     * @method WebTwain#IsBlankImageExpress
+     * @param {number} sImageIndex specifies the index of image in buffer. The index is 0-based.
      * @return {bool}
      */
-    HTTPUploadAllThroughPutAsPDF(HTTPServer: string, RemoteFileName: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
-
-    /**
-     * [Deprecated.] Uploads the selected images in the buffer to the HTTP server through the HTTP Put method as a Multi-Page PDF.
-     * @method WebTwain#HTTPUploadThroughPutAsMultiPagePDF
-     * @param {string} HTTPServer the name of the HTTP server.
-     * @param {string} RemoteFileName the name of the image to be uploaded.
-     * @param {function} optionalAsyncSuccessFunc optional. The function to call when the upload succeeds. Please refer to the function prototype OnSuccess.
-     * @param {function} optionalAsyncFailureFunc optional. The function to call when the upload fails. Please refer to the function prototype OnFailure.
-     * @return {bool}
-     */
-    HTTPUploadThroughPutAsMultiPagePDF(HTTPServer: string, RemoteFileName: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
-
-    /**
-     * Configures how segmented upload is done.
-     * @method WebTwain#SetUploadSegment
-     * @param {int} segmentUploadThreshold specifies the threshold (in MB) over which segmented upload will be invoked.
-     * @param {int} moduleSize specifies the size of each segment (in KB).
-     * @return {bool}
-     */
-    SetUploadSegment (segmentUploadThreshold: number, moduleSize: number): boolean;
-
-    /**
-     * Uploads the images specified by the indices to the HTTP server.
-     * @method WebTwain#HTTPUpload
-     * @param {string} url the url where the images are sent in a POST request.
-     * @param {Array} indices indices specifies which images are to be uploaded.
-     * @param {EnumDWT_ImageType} enumImageType the image format in which the images are to be uploaded.
-     * @param {EnumDWT_UploadDataFormat} dataFormat whether to upload the images as binary or a base64-based string.
-     * @param {function} asyncSuccessFunc the function to call when the upload succeeds. Please refer to the function prototype OnSuccess.
-     * @param {function} asyncFailureFunc the function to call when the upload fails. Please refer to the function prototype OnFailure.
-     * @return {bool}
-     */
-    HTTPUpload (url: string, indices: number[], enumImageType: EnumDWT_ImageType, dataFormat: EnumDWT_UploadDataFormat, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
+    IsBlankImageExpress(sImageIndex: number): boolean;
 
     /**
      * Loads a DIB format image from Clipboard into the Dynamic Web TWAIN.
@@ -2630,18 +3180,159 @@ interface WebTwain {
      * @param {EnumDWT_ImageType} lImageType specifies the file format.
      * @return {bool}
      */
-    LoadImageFromBase64Binary(bry: string, lImageType: EnumDWT_ImageType): boolean;
+    LoadImageFromBase64Binary(bry: string, lImageType: EnumDWT_ImageType, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
     /**
      * [Deprecated.] Loads image from a byte array with the specified file format.
      * @method WebTwain#LoadImageFromBytes
-     * @param {int} lBufferSize Specifies the buffer size.
+     * @param {number} lBufferSize Specifies the buffer size.
      * @param {Array} buffer A byte array of the image data.
      * @param {EnumDWT_ImageType} lImageType Specifies the file format.
      * @return {bool}
      */
     LoadImageFromBytes(lBufferSize: number, buffer: number[], lImageType: EnumDWT_ImageType): boolean;
 
+    /**
+     * Mirrors the image of a specified index in buffer.
+     * @method WebTwain#Mirror
+     * @param {number} sImageIndex specifies the index of image in buffer. The index is 0-based.
+     * @return {bool}
+     */
+    Mirror(sImageIndex: number): boolean;
+
+    /**
+     * Moves a specified image.
+     * @method WebTwain#MoveImage
+     * @param {number} sSourceImageIndex Specifies the source index of image in buffer. The index is 0-based.
+     * @param {number} sTargetImageIndex Specifies the target index of image in buffer. The index is 0-based.
+     * @return {bool}
+     */
+    MoveImage(sSourceImageIndex: number, sTargetImageIndex: number): boolean;
+
+    /*ignored 
+    OnRefreshUI
+    */
+
+    /**
+     * Loads the specified Source into main memory and causes its initialization,
+     * placing Dynamic Web TWAIN into Capability Negotiation state. If no source is
+     * specified (no SelectSource() or SelectSourceByIndex() is called), opens the default source.
+     * @method WebTwain#OpenSource
+     * @return {bool}
+     */
+    OpenSource(): boolean;
+
+    /**
+     * Loads and opens Data Source Manager.
+     * @method WebTwain#OpenSourceManager
+     * @return {bool}
+     */
+    OpenSourceManager(): boolean;
+
+    /**
+     * Decorates image of a specified index in buffer with rectangles of transparent color.
+     * @method WebTwain#OverlayRectangle
+     * @param {number} sImageIndex specifies the index of image in buffer. The index is 0-based.
+     * @param {number} left specifies the x-coordinate of the upper-left corner of the rectangle.
+     * @param {number} top specifies the y-coordinate of the upper-left corner of the rectangle.
+     * @param {number} right specifies the x-coordinate of the lower-right corner of the rectangle.
+     * @param {number} bottom specifies the y-coordinate of the lower-right corner of the rectangle.
+     * @param {number} color Specifies the fill color of the rectangle. The byte-ordering of the RGB value is 0xBBGGRR. BB represents blue, GG represents green, RR represents red.
+     * @param {number} fOpacity Specifies the opacity of the rectangle. The value represents opacity. 1.0 is 100% opaque and 0.0 is totally transparent.
+     * @return {bool}
+     */
+    OverlayRectangle(sImageIndex: number, left: number, top: number, right: number, bottom: number, color: number, fOpacity: number): boolean;
+
+    /**
+     * Shows the GUI of Image Printer.
+     * @method WebTwain#Print
+     * @return {bool}
+     */
+    Print(): boolean;
+
+    /**
+     * Binds a specified function to an event, so that the function gets called whenever the event fires.
+     * @method WebTwain#RegisterEvent
+     * @param {string} name the name of the event that the function is bound to.
+     * @param {object} evt specifies the function to call when event fires.
+     * @return {bool}
+     */
+    RegisterEvent(name: string, evt: object): boolean;
+    
+    /**
+     * Removes all images in buffer.
+     * @method WebTwain#RemoveAllImages
+     * @return {void}
+     */
+    RemoveAllImages(): void;
+
+    /**
+     * Removes selected images in buffer.
+     * @method WebTwain#RemoveAllSelectedImages
+     * @return {bool}
+     */
+    RemoveAllSelectedImages(): boolean;
+
+    /**
+     * Removes the image of a specified index in buffer.
+     * @method WebTwain#RemoveImage
+     * @param {number} sImageIndexToBeDeleted  specifies the index of the image to be deleted  in buffer. The index is 0-based.
+     * @return {bool}
+     */
+    RemoveImage(sImageIndexToBeDeleted: number): boolean;
+  
+    /**
+     * Reverts the current image layout to the Data Source's default.
+     * @method WebTwain#ResetImageLayout
+     * @return {bool}
+     */
+    ResetImageLayout(): boolean;
+
+    /**
+     * Sets the Source to return the current page to the input side of the document feeder and
+     * feed the last page from the outside of the feeder back into the acquisition area if IfFeederEnabled is TRUE.
+     * @method WebTwain#RewindPage
+     * @return {bool}
+     */
+    RewindPage(): boolean;
+   
+    /**
+     * Rotates the image of a specified index in buffer by specified angle.
+     * @method WebTwain#Rotate
+     * @param {number} sImageIndex  specifies the index of image in buffer. The index is 0-based.
+     * @param {number} fAngle  Specifies the rotation angle.
+     * @param {bool} bKeepSize Keep size or not.
+     * @return {bool}
+     */
+    Rotate(sImageIndex: number, fAngle: number, bKeepSize: boolean): boolean;
+
+    /**
+     * Rotates the image of a specified index in buffer by specified angle.
+     * @method WebTwain#RotateEx
+     * @param {number} sImageIndex  specifies the index of image in buffer. The index is 0-based.
+     * @param {number} fAngle  Specifies the rotation angle.
+     * @param {bool} bKeepSize Keep size or not.
+     * @param {EnumDWT_InterpolationMethod} newVal specifies the method to do interpolation.
+     * @return {bool}
+     */
+    RotateEx(sImageIndex: number, fAngle: number, bKeepSize: boolean, newVal: EnumDWT_InterpolationMethod): boolean;
+
+    /**
+     * Rotates the image of a specified index in buffer by 90 degrees counter-clockwise.
+     * @method WebTwain#RotateLeft
+     * @param {number} sImageIndex  specifies the index of image in buffer. The index is 0-based.
+     * @return {bool}
+     */
+    RotateLeft(sImageIndex: number): boolean;
+
+    /**
+     * Rotates the image of a specified index in buffer by 90 degrees clockwise.
+     * @method WebTwain#RotateRight
+     * @param {number} sImageIndex  specifies the index of image in buffer. The index is 0-based.
+     * @return {bool}
+     */
+    RotateRight(sImageIndex: number): boolean;
+
     /**
      * Saves all images in buffer as a MultiPage TIFF file.
      * @method WebTwain#SaveAllAsMultiPageTIFF
@@ -2666,46 +3357,50 @@ interface WebTwain {
      * Saves the image of a specified index in buffer as a BMP file.
      * @method WebTwain#SaveAsBMP
      * @param {string} localFile the name of the BMP file to be saved. It should be an absolute path on the local disk.
-     * @param {short} sImageIndex specifies the index of image in buffer. The index is 0-based.
+     * @param {number} sImageIndex specifies the index of image in buffer. The index is 0-based.
      * @return {bool}
      */
-    SaveAsBMP(localFile: string, sImageIndex: number): boolean;
+    SaveAsBMP(localFile: string, sImageIndex: number, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
+
+    /*ignored
+    SaveAsGIF
+    */
 
     /**
      * Saves the image of a specified index in buffer as a JPEG file.
      * @method WebTwain#SaveAsJPEG
      * @param {string} localFile the name of the JPEG file to be saved. It should be an absolute path on the local disk.
-     * @param {short} sImageIndex specifies the index of image in buffer. The index is 0-based.
+     * @param {number} sImageIndex specifies the index of image in buffer. The index is 0-based.
      * @return {bool}
      */
-    SaveAsJPEG(localFile: string, sImageIndex: number): boolean;
+    SaveAsJPEG(localFile: string, sImageIndex: number, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
     /**
      * Saves the image of a specified index in buffer as a PDF file.
      * @method WebTwain#SaveAsPDF
      * @param {string} localFile the name of the JPEG file to be saved. It should be an absolute path on the local disk.
-     * @param {short} sImageIndex specifies the index of image in buffer. The index is 0-based.
+     * @param {number} sImageIndex specifies the index of image in buffer. The index is 0-based.
      * @return {bool}
      */
-    SaveAsPDF(localFile: string, sImageIndex: number): boolean;
+    SaveAsPDF(localFile: string, sImageIndex: number, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
     /**
      * Saves the image of a specified index in buffer as a PNG file.
      * @method WebTwain#SaveAsPNG
      * @param {string} localFile the name of the JPEG file to be saved. It should be an absolute path on the local disk.
-     * @param {short} sImageIndex specifies the index of image in buffer. The index is 0-based.
+     * @param {number} sImageIndex specifies the index of image in buffer. The index is 0-based.
      * @return {bool}
      */
-    SaveAsPNG(localFile: string, sImageIndex: number): boolean;
+    SaveAsPNG(localFile: string, sImageIndex: number, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
     /**
      * Saves the image of a specified index in buffer as a TIFF file.
      * @method WebTwain#SaveAsTIFF
      * @param {string} localFile the name of the JPEG file to be saved. It should be an absolute path on the local disk.
-     * @param {short} sImageIndex specifies the index of image in buffer. The index is 0-based.
+     * @param {number} sImageIndex specifies the index of image in buffer. The index is 0-based.
      * @return {bool}
      */
-    SaveAsTIFF(localFile: string, sImageIndex: number): boolean;
+    SaveAsTIFF(localFile: string, sImageIndex: number, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
     /**
      * Saves the selected images in buffer as a Multipage PDF file.
@@ -2730,19 +3425,57 @@ interface WebTwain {
     /**
      * Saves the selected images in buffer to base64 string.
      * @method WebTwain#SaveSelectedImagesToBase64Binary
-     * @return {string}
+     * @return {string|bool}
      */
-    SaveSelectedImagesToBase64Binary(): string;
+    SaveSelectedImagesToBase64Binary(optionalAsyncSuccessFunc?: (result:string[]) => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): string|boolean;
 
     /**
      * [Deprecated.] Saves the selected images in buffer to a byte array in the specified file format.
      * @method WebTwain#SaveSelectedImagesToBytes
-     * @param {int} bufferSize specified the buffer size.
+     * @param {number} bufferSize specified the buffer size.
      * @param {Array} buffer A byte array of the image data.
-     * @return {int}
+     * @return {number}
      */
     SaveSelectedImagesToBytes(bufferSize: number, buffer: number[]): number;
 
+    /**
+     * Brings up the TWAIN Data Source Manager's Source Selection User Interface (UI)
+     * so that user can choose which Data Source to be the current Source.
+     * @method WebTwain#SelectSource
+     * @return {bool}
+     */
+    SelectSource(): boolean;
+
+    /**
+     * Selects the index-the source in SourceNameItems property as the current source.
+     * @method WebTwain#SelectSourceByIndex
+     * @param {number} index It is the index of SourceNameItems property.
+     * @return {bool}
+     */
+    SelectSourceByIndex(index: number): boolean;
+
+    /*ignored
+    SetCancel
+    */
+
+    /**
+     * Set the value of the specified cap item.
+     * @method WebTwain#SetCapItems
+     * @param {number} index Index is 0-based. It is the index of the cap item.
+     * @param {number} newVal For string type, please use CapItemsstring property.
+     * @return {void}
+     */
+    SetCapItems(index: number, newVal: number): void;
+
+    /**
+     * Set the cap item value of the capability specified by Capability property, when the value of the CapType property is TWON_ARRAY or TWON_ENUMERATION.
+     * @method WebTwain#SetCapItemsString
+     * @param {number} index Index is 0-based. It is the index of the cap item.
+     * @param {string} newVal The new value to be set.
+     * @return {void}
+     */
+    SetCapItemsString(index: number, newVal: string): void;
+
     /**
      * [Deprecated.] Sets current cookie into the Http Header to be used when uploading scanned images through POST.
      * @method WebTwain#SetCookie
@@ -2751,576 +3484,6 @@ interface WebTwain {
      */
     SetCookie(cookie: string): void;
 
-    /**
-     * Sets a text parameter as a filed in a web form. This form is maintained by the component itself (meaning it's not on the page). All fields in this form will be passed to the server when uploading images.
-     * @method WebTwain#SetHTTPFormField
-     * @param {string} FieldName specifies the name of a text field in web form.
-     * @param {string} FieldValue specifies the value of a text field in web form.
-     * @return {bool}
-     */
-    SetHTTPFormField(FieldName: string, FieldValue: string): boolean;
-
-    /**
-     * Sets a custom tiff tag. Currently you can set up to 32 tags. The string to be set in a tag can be encoded with base64.
-     * @method WebTwain#SetTiffCustomTag
-     * @param {int} tag specifies the tag identifier. The value should be between 600 and 700.
-     * @param {string} content the string to be set for this tag. The string will be written to the .tiff file when you save/upload it. If the string is base64 encoded, we'll decode it before writing it.
-     * @param {bool} base64Str if you'd like to encode the string with base64, set this to true. Otherwise, the string will be plin text.
-     * @return {bool}
-     */
-    SetTiffCustomTag(tag: number, content: string, base64Str: boolean): boolean;
-
-    /**
-     * Show save file dialog or show open file dialog.
-     * @method WebTwain#ShowFileDialog
-     * @param {bool} SaveDialog True -- show save file dialog, False -- show open file dialog.
-     * @param {string} Filter The filter name specifies the filter pattern (for example, "*.TXT"). To specify multiple filter patterns for a single display string, use a semicolon to separate the patterns (for example, "*.TXT;*.DOC;*.BAK"). A pattern string can be a combination of valid file name characters and the asterisk (*) wildcard character. Do not include spaces in the pattern string. To retrieve a shortcut's target without filtering, use the string "All Files\0*.*\0\0", but the program will replace  "\0" with "|" automatically.
-     * @param {int} FilterIndex The index of the currently selected filter in the File Types control. The buffer pointed to by Filter contains pairs of strings that define the filters. The index is 0-based.
-     * @param {string} DefExtension Define the default extension. GetOpenFileName and GetSaveFileName append this extension to the file name only if the user fails to type an extension. If this member is NULL and the user fails to type an extension, no extension is appended.
-     * @param {string} InitialDir The initial directory. The algorithm for selecting the initial directory varies on different platforms.
-     * @param {bool} AllowMultiSelect True -- allows users to select more than one file, False -- only allows to select one file.
-     * @param {bool} OverwritePrompt True -- If a file already exists with the same name, the old file will be simply overwritten, False -- not allows to save and overwrite a same name file.
-     * @param {int} Flags If this parameter equals 0, the program will be initiated with the default flags, otherwise initiated with the cumstom value and paramters "AllowMultiSelect" and "OverwritePrompt" will be useless.
-     * @return {bool}
-     */
-    ShowFileDialog(SaveDialog: boolean, Filter: string, FilterIndex: number, DefExtension: string, InitialDir: string, AllowMultiSelect: boolean, OverwritePrompt: boolean, Flags: number): boolean;
-
-    /**
-     * Gets information of the capability specified by the Capability property.
-     * @method WebTwain#CapGet
-     * @return {bool}
-     */
-    CapGet(): boolean;
-
-    /**
-     * Returns the Source's current Value for the specified capability.
-     * @method WebTwain#CapGetCurrent
-     * @return {bool}
-     */
-    CapGetCurrent(): boolean;
-
-    /**
-     * Returns the Source's Default Value for the specified capability. This is the Source's preferred default value.
-     * @method WebTwain#CapGetDefault
-     * @return {bool}
-     */
-    CapGetDefault(): boolean;
-
-    /**
-     * Returns the value of the bottom-most edge of the specified frame.
-     * @method WebTwain#CapGetFrameBottom
-     * @param {short} index specifies the value of which frame to get. The index is 0-based.
-     * @return {float}
-     */
-    CapGetFrameBottom(index: number): number;
-
-    /**
-     * Returns the value (in Unit) of the left-most edge of the specified frame.
-     * @method WebTwain#CapGetFrameLeft
-     * @param {short} index specifies the value of which frame to get. The index is 0-based.
-     * @return {float}
-     */
-    CapGetFrameLeft(index: number): number;
-
-    /**
-     * Returns the value (in Unit) of the left-most edge of the specified frame.
-     * @method WebTwain#CapGetFrameRight
-     * @param {short} index specifies the value of which frame to get. The index is 0-based.
-     * @return {float}
-     */
-    CapGetFrameRight(index: number): number;
-
-    /**
-     * Returns the value (in Unit) of the top-most edge of the specified frame.
-     * @method WebTwain#CapGetFrameTop
-     * @param {short} index specifies the value of which frame to get. The index is 0-based.
-     * @return {float}
-     */
-    CapGetFrameTop(index: number): number;
-
-    /**
-     * Queries whether the Source supports a particular operation on the capability.
-     * @method WebTwain#CapIfSupported
-     * @param {EnumDWT_MessageType} messageType specifies the type of capability operation.
-     * @return {bool}
-     */
-    CapIfSupported(messageType: EnumDWT_MessageType): boolean;
-
-    /**
-     * Changes the Current Value of the capability specified by Capability property back to its power-on value.
-     * @method WebTwain#CapReset
-     * @return {bool}
-     */
-    CapReset(): boolean;
-
-    /**
-     * Sets the current capability using the container type specified by CapType property. The current capability is specified by Capability property.
-     * @method WebTwain#CapSet
-     * @return {bool}
-     */
-    CapSet(): boolean;
-
-    /**
-     * Sets the values of the specified frame.
-     * @method WebTwain#CapSetFrame
-     * @param {short} index  specifies the values of which frame to set. The index is 0-based.
-     * @param {float} left the value (in Unit) of the left-most edge of the specified frame.
-     * @param {float} top the value (in Unit) of the top-most edge of the specified frame.
-     * @param {float} right  the value (in Unit) of the right-most edge of the specified frame.
-     * @param {float} bottom  the value (in Unit) of the bottom-most edge of the specified frame.
-     * @return {bool}
-     */
-    CapSetFrame(index: number, left: number, top: number, right: number, bottom: number): boolean;
-
-    /**
-     * Get the cap item value of the capability specified by Capability property, when the value of the CapType property is TWON_ARRAY or TWON_ENUMERATION.
-     * @method WebTwain#GetCapItems
-     * @param {int} index Index is 0-based. It is the index of the cap item.
-     * @return {double}
-     */
-    GetCapItems(index: number): number;
-
-    /**
-     * Returns the cap item value of the capability specified by Capability property, when the value of the CapType property is TWON_ARRAY or TWON_ENUMERATION.
-     * @method WebTwain#GetCapItemsString
-     * @param {int} index Index is 0-based. It is the index of the cap item.
-     * @return {string}
-     */
-    GetCapItemsString(index: number): string;
-
-    /**
-     * Set the value of the specified cap item.
-     * @method WebTwain#SetCapItems
-     * @param {int} index Index is 0-based. It is the index of the cap item.
-     * @param {double} newVal The Double type of CapItems property is used to present Double, Single(float), Long, int and even boolean types. For string type, please use CapItemsstring property.
-     * @return {void}
-     */
-    SetCapItems(index: number, newVal: number): void;
-
-    /**
-     * Set the cap item value of the capability specified by Capability property, when the value of the CapType property is TWON_ARRAY or TWON_ENUMERATION.
-     * @method WebTwain#SetCapItemsString
-     * @param {int} index Index is 0-based. It is the index of the cap item.
-     * @param {string} newVal The new value to be set.
-     * @return {void}
-     */
-    SetCapItemsString(index: number, newVal: string): void;
-    // --- SCAN end --
-
-    // --- View & Edit start --
-
-    /**
-     * Add text on an image.
-     * @method WebTwain#AddText
-     * @param {short} sImageIndex  the index of the image that you want to add text to.
-     * @param {int} x the x coordinate for the text.
-     * @param {int} y the y coordinate for the text.
-     * @param {string} text the content of the text that you want to add.
-     * @param {int} txtColor  the color for the text.
-     * @param {int} backgroundColor  the background color.
-     * @param {float} backgroundRoundRadius ranging from 0 to 0.5. Please NOTE that MAC version does not support this parameter.
-     * @param {float} backgroundOpacity specifies the opacity of the background of the added text, it ranges from 0 to 1.0. Please NOTE that Mac version only supports value 0 and 1
-     * @return {bool}
-     */
-    AddText(sImageIndex: number, x: number, y: number, text: string, txtColor: number, backgroundColor: number, backgroundRoundRadius: number, backgroundOpacity: number): boolean;
-
-    /**
-     * Create the font for adding text using the method AddText.
-     * @method WebTwain#CreateTextFont
-     * @param {int} height Specifies the desired height (in logical units) of the font.The absolute value of nHeight must not exceed 16,384 device units after it is converted.For all height comparisons, the font mapper looks for the largest font that does not exceed the requested size or the smallest font if all the fonts exceed the requested size.
-     * @param {int} width Specifies the average width (in logical units) of characters in the font. If Width is 0, the aspect ratio of the device will be matched against the digitization aspect ratio of the available fonts to find the closest match, which is determined by the absolute value of the difference.
-     * @param {int} escapement Specifies the angle (in 0.1-degree units) between the escapement vector and the x-axis of the display surface. The escapement vector is the line through the origins of the first and last characters on a line. The angle is measured counterclockwise from the x-axis.
-     * @param {int} orientation Specifies the angle (in 0.1-degree units) between the baseline of a character and the x-axis.The angle is measured counterclockwise from the x-axis for coordinate systems in which the y-direction is down and clockwise from the x-axis for coordinate systems in which the y-direction is up.
-     * @param {int} weight Specifies the font weight (in inked pixels per 1000). The described valuesare approximate; the actual appearance depends on the typeface. Some fonts haveonly FW_NORMAL, FW_REGULAR, and FW_BOLD weights. If FW_DONTCARE is specified, a default weight is used.
-     * @param {short} italic  Specifies an italic font if set to TRUE.
-     * @param {short} underline Specifies an underlined font if set to TRUE.
-     * @param {short} strikeOut A strikeout font if set to TRUE.
-     * @param {short} charSet Specifies the font's character set. The OEM character set is system-dependent. Fonts with other character sets may exist in the system. An application that uses a font with an unknown character set must not attempt to translate or interpret strings that are to be rendered with that font.
-     * @param {short} outputPrecision Specifies the desired output precision. The output precision defines how closely the output must match the requested font's height, width, character orientation, escapement, and pitch.
-     * @param {short} clipPrecision Specifies the desired clipping precision. The clipping precision defines how to clip characters that are partially outside the clipping region.
-     * @param {short} quality Specifies the font's output quality, which defines how carefully the GDI must attempt to match the logical-font attributes to those of an actual physical font.
-     * @param {short} pitchAndFamily  The pitch and family of the font.
-     * @param {string} faceName   the typeface name, the length of this string must not exceed 32 characters, including the terminating null character.
-     * @return {bool}
-     */
-    CreateTextFont(height: number, width: number, escapement: number, orientation: number, weight: number, italic: number, underline: number, strikeOut: number, charSet: number, outputPrecision: number, clipPrecision: number, quality: number, pitchAndFamily: number, faceName: string): boolean;
-
-    /**
-     * Copies the image of a specified index in buffer to clipboard in DIB format.
-     * @method WebTwain#CopyToClipboard
-     * @param {short} sImageIndex specifies the index of image in buffer. The index is 0-based.
-     * @return {bool}
-     */
-    CopyToClipboard(sImageIndex: number): boolean;
-
-    /**
-     * Clears the specified area of a specified image, and fill the area with the fill color.
-     * @method WebTwain#Erase
-     * @param {short} sImageIndex specifies the index of image in buffer. The index is 0-based.
-     * @param {int} left specifies the x-coordinate of the upper-left corner of the rectangle.
-     * @param {int} top specifies the y-coordinate of the upper-left corner of the rectangle.
-     * @param {int} right specifies the x-coordinate of the lower-right corner of the rectangle.
-     * @param {int} bottom specifies the y-coordinate of the lower-right corner of the rectangle.
-     * @return {bool}
-     */
-    Erase(sImageIndex: number, left: number, top: number, right: number, bottom: number): boolean;
-
-    /**
-     * Returns the pixel bit depth of the selected image.
-     * @method WebTwain#GetImageBitDepth
-     * @param {short} sImageIndex specifies the index of image. The index is 0-based.
-     * @return {short}
-     */
-    GetImageBitDepth(sImageIndex: number): number;
-
-    /**
-     * Returns the width (pixels) of the selected image. This is a read-only property.
-     * @method WebTwain#GetImageWidth
-     * @param {short} sImageIndex specifies the index of image. The index is 0-based.
-     * @return {int}
-     */
-    GetImageWidth(sImageIndex: number): number;
-
-    /**
-     * Returns the height (pixels) of the selected image. This is a read-only property.
-     * @method WebTwain#GetImageHeight
-     * @param {short} sImageIndex specifies the index of image. The index is 0-based.
-     * @return {int}
-     */
-    GetImageHeight(sImageIndex: number): number;
-
-    /**
-     * Returns the file size of the new image resized from the image of a specified index in buffer.
-     * @method WebTwain#GetImageSize
-     * @param {short} sImageIndex specifies the index of image in buffer. The index is 0-based.
-     * @param {int} iWidth specifies the pixel width of the new image.
-     * @param {int} iHeight specifies the pixel height of the new image.
-     * @return {double}
-     */
-    GetImageSize(sImageIndex: number, iWidth: number, iHeight: number): number;
-
-    /**
-     * Pre-calculate the file size of the local image file that is saved from an image of a specified index in buffer.
-     * @method WebTwain#GetImageSizeWithSpecifiedType
-     * @param {short} sImageIndex specifies the index of image in buffer. The index is 0-based.
-     * @param {short} sImageType specifies the type of an image file..
-     * @return {int}
-     */
-    GetImageSizeWithSpecifiedType(sImageIndex: number, sImageType: number): number;
-
-    /**
-     * Return the horizontal resolution of the specified image.
-     * @method WebTwain#GetImageXResolution
-     * @param {short} sImageIndex specifies the index of image in buffer. The index is 0-based.
-     * @return {int}
-     */
-    GetImageXResolution(sImageIndex: number): number;
-
-    /**
-     * Return the vertical resolution of the specified image.
-     * @method WebTwain#GetImageYResolution
-     * @param {short} sImageIndex specifies the index of image in buffer. The index is 0-based.
-     * @return {int}
-     */
-    GetImageYResolution(sImageIndex: number): number;
-
-    /**
-     * Returns the index of the selected image.
-     * @method WebTwain#GetSelectedImageIndex
-     * @param {short} sSelectedIndex specifies the index of the selected image.
-     * @return {short}
-     */
-    GetSelectedImageIndex(sSelectedIndex: number): number;
-
-    /**
-     * You can use the method to select images programatically which is ususally done by mouse clicking.
-     * @method WebTwain#SetSelectedImageIndex
-     * @param {short} sSelectedIndex this is the index of an array that holds the indices of selected images.
-     * @param {short} newVal specifies the index of an image that you want to select.
-     * @return {void}
-     */
-    SetSelectedImageIndex(selectedIndex: number, newVal: number): void;
-
-    /**
-     * Pre-calculate the file size of the local image file that is saved from the selected images in buffer.
-     * @method WebTwain#GetSelectedImagesSize
-     * @param {int} iImageType specifies the type of an image file.
-     * @return {int}
-     */
-    GetSelectedImagesSize(iImageType: number): number;
-
-    /**
-     * Check the skew angle of an image by its index in buffer.
-     * @method WebTwain#GetSkewAngle
-     * @param {short} sImageIndex the index of the image in the buffer.
-     * @return {double}
-     */
-    GetSkewAngle(sImageIndex: number): number;
-
-    /**
-     * Check the skew angle of a rectangular part of an image by its index in buffer.
-     * @method WebTwain#GetSkewAngleEx
-     * @param {short} sImageIndex the index of the image in the buffer.
-     * @param {int} left specifies the x-coordinate of the upper-left corner of the rectangle.
-     * @param {int} top specifies the y-coordinate of the upper-left corner of the rectangle.
-     * @param {int} right specifies the x-coordinate of the lower-right corner of the rectangle.
-     * @param {int} bottom specifies the y-coordinate of the lower-right corner of the rectangle.
-     * @return {double}
-     */
-    GetSkewAngleEx(sImageIndex: number, left: number, top: number, right: number, bottom: number): number;
-
-    /**
-     * [Deprecated.] Detects whether a certain area on an image is blank.
-     * @method WebTwain#IsBlankImageEx
-     * @param {short} sImageIndex specifies the index of image in buffer. The index is 0-based.
-     * @param {int} left specifies the x-coordinate of the upper-left corner of the rectangle.
-     * @param {int} top specifies the y-coordinate of the upper-left corner of the rectangle.
-     * @param {int} right specifies the x-coordinate of the lower-right corner of the rectangle.
-     * @param {int} bottom specifies the y-coordinate of the lower-right corner of the rectangle.
-     * @param {bool} bFuzzyMatch specifies whether use fuzzy matching when detecting.
-     * @return {bool}
-     */
-    IsBlankImageEx(sImageIndex: number, left: number, top: number, right: number, bottom: number, bFuzzyMatch: boolean): boolean;
-
-    /**
-     * Mirrors the image of a specified index in buffer.
-     * @method WebTwain#Mirror
-     * @param {short} sImageIndex specifies the index of image in buffer. The index is 0-based.
-     * @return {bool}
-     */
-    Mirror(sImageIndex: number): boolean;
-
-    /**
-     * Decorates image of a specified index in buffer with rectangles of transparent color.
-     * @method WebTwain#OverlayRectangle
-     * @param {short} sImageIndex specifies the index of image in buffer. The index is 0-based.
-     * @param {int} left specifies the x-coordinate of the upper-left corner of the rectangle.
-     * @param {int} top specifies the y-coordinate of the upper-left corner of the rectangle.
-     * @param {int} right specifies the x-coordinate of the lower-right corner of the rectangle.
-     * @param {int} bottom specifies the y-coordinate of the lower-right corner of the rectangle.
-     * @param {int} color Specifies the fill color of the rectangle. The byte-ordering of the RGB value is 0xBBGGRR. BB represents blue, GG represents green, RR represents red.
-     * @param {float} fOpacity Specifies the opacity of the rectangle. The value represents opacity. 1.0 is 100% opaque and 0.0 is totally transparent.
-     * @return {bool}
-     */
-    OverlayRectangle(sImageIndex: number, left: number, top: number, right: number, bottom: number, color: number, fOpacity: number): boolean;
-
-    /**
-     * Removes all images in buffer.
-     * @method WebTwain#RemoveAllImages
-     * @return {void}
-     */
-    RemoveAllImages(): void;
-
-    /**
-     * Removes selected images in buffer.
-     * @method WebTwain#RemoveAllSelectedImages
-     * @return {bool}
-     */
-    RemoveAllSelectedImages(): boolean;
-
-    /**
-     * Removes the image of a specified index in buffer.
-     * @method WebTwain#RemoveImage
-     * @param {short} sImageIndexToBeDeleted  specifies the index of the image to be deleted  in buffer. The index is 0-based.
-     * @return {bool}
-     */
-    RemoveImage(sImageIndexToBeDeleted: number): boolean;
-
-    // Image Operate
-    /**
-     * Rotates the image of a specified index in buffer by specified angle.
-     * @method WebTwain#Rotate
-     * @param {short} sImageIndex  specifies the index of image in buffer. The index is 0-based.
-     * @param {float} fAngle  Specifies the rotation angle.
-     * @param {bool} bKeepSize Keep size or not.
-     * @return {bool}
-     */
-    Rotate(sImageIndex: number, fAngle: number, bKeepSize: boolean): boolean;
-
-    /**
-     * Rotates the image of a specified index in buffer by specified angle.
-     * @method WebTwain#RotateEx
-     * @param {short} sImageIndex  specifies the index of image in buffer. The index is 0-based.
-     * @param {float} fAngle  Specifies the rotation angle.
-     * @param {bool} bKeepSize Keep size or not.
-     * @param {EnumDWT_InterpolationMethod} newVal specifies the method to do interpolation.
-     * @return {bool}
-     */
-    RotateEx(sImageIndex: number, fAngle: number, bKeepSize: boolean, newVal: EnumDWT_InterpolationMethod): boolean;
-
-    /**
-     * Rotates the image of a specified index in buffer by 90 degrees counter-clockwise.
-     * @method WebTwain#RotateLeft
-     * @param {short} sImageIndex  specifies the index of image in buffer. The index is 0-based.
-     * @return {bool}
-     */
-    RotateLeft(sImageIndex: number): boolean;
-
-    /**
-     * Rotates the image of a specified index in buffer by 90 degrees clockwise.
-     * @method WebTwain#RotateRight
-     * @param {short} sImageIndex  specifies the index of image in buffer. The index is 0-based.
-     * @return {bool}
-     */
-    RotateRight(sImageIndex: number): boolean;
-
-    /**
-     * Changes width and height of the image of a specified index in the buffer. Please note the file size of the image will be changed proportionately.
-     * @method WebTwain#ChangeImageSize
-     * @param {short} sImageIndex specifies the index of image in buffer. The index is 0-based.
-     * @param {int} iNewWidth  specifies the pixel width of the new image.
-     * @param {int} iNewHeight specifies the pixel height of the new image.
-     * @param {EnumDWT_InterpolationMethod} newVal specifies the method to do interpolation.
-     * @return {bool}
-     */
-    ChangeImageSize(sImageIndex: number, iNewWidth: number, iNewHeight: number, newVal: EnumDWT_InterpolationMethod): boolean;
-
-    /**
-     * Flips the image of a specified index in buffer.
-     * @method WebTwain#Flip
-     * @param {short} sImageIndex specifies the index of image in buffer. The index is 0-based.
-     * @return {bool}
-     */
-    Flip(sImageIndex: number): boolean;
-
-    /**
-     * Crops the image of a specified index in buffer.
-     * @method WebTwain#Crop
-     * @param {short} sImageIndex specifies the index of image in buffer. The index is 0-based.
-     * @param {int} left specifies the x-coordinate of the upper-left corner of the rectangle.
-     * @param {int} top specifies the y-coordinate of the upper-left corner of the rectangle.
-     * @param {int} right specifies the x-coordinate of the lower-right corner of the rectangle.
-     * @param {int} bottom specifies the y-coordinate of the lower-right corner of the rectangle.
-     * @return {bool}
-     */
-    Crop(sImageIndex: number, left: number, top: number, right: number, bottom: number): boolean;
-
-    /**
-     * Crops the image of a specified index in buffer to clipboard in DIB format.
-     * @method WebTwain#CropToClipboard
-     * @param {short} sImageIndex specifies the index of image in buffer. The index is 0-based.
-     * @param {int} left specifies the x-coordinate of the upper-left corner of the rectangle.
-     * @param {int} top specifies the y-coordinate of the upper-left corner of the rectangle.
-     * @param {int} right specifies the x-coordinate of the lower-right corner of the rectangle.
-     * @param {int} bottom specifies the y-coordinate of the lower-right corner of the rectangle.
-     * @return {bool}
-     */
-    CropToClipboard(sImageIndex: number, left: number, top: number, right: number, bottom: number): boolean;
-
-    /**
-     * Cuts the image data in the specified area to the system clipboard in DIB format.
-     * @method WebTwain#CutFrameToClipboard
-     * @param {short} sImageIndex specifies the index of image in buffer. The index is 0-based.
-     * @param {int} left specifies the x-coordinate of the upper-left corner of the rectangle.
-     * @param {int} top specifies the y-coordinate of the upper-left corner of the rectangle.
-     * @param {int} right specifies the x-coordinate of the lower-right corner of the rectangle.
-     * @param {int} bottom specifies the y-coordinate of the lower-right corner of the rectangle.
-     * @return {bool}
-     */
-    CutFrameToClipboard(sImageIndex: number, left: number, top: number, right: number, bottom: number): boolean;
-
-    /**
-     * Cuts the image of a specified index in buffer to clipboard in DIB format.
-     * @method WebTwain#CutToClipboard
-     * @param {short} sImageIndex specifies the index of image in buffer. The index is 0-based.
-     * @return {bool}
-     */
-    CutToClipboard(sImageIndex: number): boolean;
-
-    /**
-     * Change the DPI (dots per inch) for the specified image.
-     * @method WebTwain#SetDPI
-     * @param {short} sImageIndex specifies the index of image in buffer. The index is 0-based.
-     * @param {int} xResolution The horizontal resolution.
-     * @param {int} yResolution The vertical resolution.
-     * @param {bool} bResampleImage Whether to resample the image. (The image size will be changed if this is set to true).
-     * @param {EnumDWT_InterpolationMethod} newVal specifies the method to do interpolation.
-     * @return {bool}
-     */
-    SetDPI(sImageIndex: number, xResolution: number, yResolution: number, bResampleImage: boolean, newVal: EnumDWT_InterpolationMethod): boolean;
-
-    /**
-     * Sets the view mode that images are displayed in Dynamic Web TWAIN. You can use this method to display multiple images in Dynamic Web TWAIN.
-     * @method WebTwain#SetViewMode
-     * @param {short} sHorizontalImageCount  specifies how many columns can be displayed in Dynamic Web TWAIN.
-     * @param {short} sVerticalImageCount specifies how many rows can be displayed in Dynamic Web TWAIN..
-     * @return {void}
-     */
-    SetViewMode(sHorizontalImageCount: number, sVerticalImageCount: number): void;
-
-    /**
-     * Moves a specified image.
-     * @method WebTwain#MoveImage
-     * @param {short} sSourceImageIndex Specifies the source index of image in buffer. The index is 0-based.
-     * @param {short} sTargetImageIndex Specifies the target index of image in buffer. The index is 0-based.
-     * @return {bool}
-     */
-    MoveImage(sSourceImageIndex: number, sTargetImageIndex: number): boolean;
-
-    /**
-     * Switchs two images of specified indices in buffer.
-     * @method WebTwain#SwitchImage
-     * @param {short} sImageIndex1 specifies the index of image in buffer. The index is 0-based.
-     * @param {short} sImageIndex2 specifies the index of image in buffer. The index is 0-based.
-     * @return {bool}
-     */
-    SwitchImage(sImageIndex1: number, sImageIndex2: number): boolean;
-
-    /**
-     * Shows the GUI of Image Printer.
-     * @method WebTwain#Print
-     * @return {bool}
-     */
-    Print(): boolean;
-    // --- View & Edit end --
-
-    // --- Upload & Save  end --
-
-    // --- Others ---
-    /**
-     * Shows the GUI of Image Editor.
-     * @method WebTwain#ShowImageEditor
-     * @return {bool}
-     */
-    ShowImageEditor(): boolean;
-
-    /**
-     * Unbinds an event from the specified function, so that the function stops receiving notifications when the event fires.
-     * @method WebTwain#UnregisterEvent
-     * @param {string} name the name of the event.
-     * @param {object} evt specified the function to be unbound.
-     * @return {bool}
-     */
-    UnregisterEvent(name: string, evt: object): boolean;
-    // --- Others end ---
-
-    /**
-     * Enables the source to accept image.
-     * @method WebTwain#EnableSource
-     * @return {bool}
-     */
-    EnableSource(): boolean;
-
-    /**
-     * Displays the source's built-in interface to acquire image.
-     * @method WebTwain#AcquireImage
-     * @param {object} optionalDeviceConfig  a JS object used to set up the device for image acquisition.
-     * @param {function} asyncSuccessFunc the function to call when the upload succeeds. Please refer to the function prototype OnSuccess.
-     * @param {function} asyncFailureFunc the function to call when the upload fails. Please refer to the function prototype OnFailure.
-     * @return {bool}
-     */
-    AcquireImage(optionalDeviceConfig?: object, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
-
-    // start from 10.0
-    /**
-     * Change the width of an image in buffer.
-     * @method WebTwain#SetImageWidth
-     * @param {short} sImageIndex  specifies which image you'd like to change.
-     * @param {int} iNewWidth specifies how wide you'd like to change the image.
-     * @return {bool}
-     */
-    SetImageWidth(sImageIndex: number, iNewWidth: number): boolean;
-
     //  Set custom DS data (DAT_CUSTOMDSDATA), the input string is encoded with base64
     /**
      * Sets custom DS data to be used for scanning, the input string is encoded with base64. Custom DS data means a specific scanning profile.
@@ -3338,127 +3501,36 @@ interface WebTwain {
      * @return {bool}
      */
     SetCustomDSData(fileName: string): boolean;
-
-    // Get custom DS data, and returned string  is encoded with base64
+ 
     /**
-     * Gets custom DS data, the returned string is base64 encoded.
-     * @method WebTwain#GetCustomDSDataEx
-     * @return {string}
-     */
-    GetCustomDSDataEx(): string;
-
-    // Get custom DS data, and save the data to the specified file
-    /**
-     * Gets custom DS data and save the data in a specified file.
-     * @method WebTwain#GetCustomDSData
-     * @param {string} fileName  the path of the file used for storing custom DS data.
+     * Change the DPI (dots per inch) for the specified image.
+     * @method WebTwain#SetDPI
+     * @param {number} sImageIndex specifies the index of image in buffer. The index is 0-based.
+     * @param {number} xResolution The horizontal resolution.
+     * @param {number} yResolution The vertical resolution.
+     * @param {bool} bResampleImage Whether to resample the image. (The image size will be changed if this is set to true).
+     * @param {EnumDWT_InterpolationMethod} newVal specifies the method to do interpolation.
      * @return {bool}
      */
-    GetCustomDSData(fileName: string): boolean;
+    SetDPI(sImageIndex: number, xResolution: number, yResolution: number, bResampleImage: boolean, newVal: EnumDWT_InterpolationMethod): boolean;
 
     /**
-     * Changes the bitdepth of a specified image.
-     * @method WebTwain#ChangeBitDepth
-     * @param {short} sImageIndex specifies the index of image in buffer. The index is 0-based.
-     * @param {short} sBitDepth specifies the target bit depth.
-     * @param {bool} bHighQuality specifies whether or not to keep high quality while changing the bit depth. When it's true, it takes more time.
+     * Sets file name and file format information used in File Transfer Mode.
+     * @method WebTwain#SetFileXferInfo
+     * @param {string} fileName the name of the file to be used in transfer.
+     * @param {EnumDWT_FileFormat} fileFormat an enumerated value indicates the format of the image.
      * @return {bool}
      */
-    ChangeBitDepth(sImageIndex: number, sBitDepth: number, bHighQuality: boolean): boolean;
+    SetFileXferInfo(fileName: string, fileFormat: EnumDWT_FileFormat): boolean;
 
     /**
-     * Changes a specified image to gray scale.
-     * @method WebTwain#ConvertToGrayScale
-     * @param {short} sIndex specifies the index of image in buffer. The index is 0-based.
+     * Sets a text parameter as a filed in a web form. This form is maintained by the component itself (meaning it's not on the page). All fields in this form will be passed to the server when uploading images.
+     * @method WebTwain#SetHTTPFormField
+     * @param {string} FieldName specifies the name of a text field in web form.
+     * @param {string} FieldValue specifies the value of a text field in web form.
      * @return {bool}
      */
-    ConvertToGrayScale(sIndex: number): boolean;
-
-    /**
-     * [Deprecated.] Shows the GUI of Image Editor with custom settings.
-     * @method WebTwain#ShowImageEditorEx
-     * @param {int} x specifies the new position of the left top corner of the window.
-     * @param {int} y specifies the new position of the left top corner of the window.
-     * @param {int} cx specifies the width of the window.
-     * @param {int} cy specifies the height of the window.
-     * @param {int} nCmdShow specifices how the window should be shown.
-     * @return {bool}
-     */
-    ShowImageEditorEx(x: number, y: number, cx: number, cy: number, nCmdShow: number): boolean;
-
-    /**
-     * [Deprecated.] Detects whether an image is blank.
-     * @method WebTwain#IsBlankImage
-     * @param {short} sImageIndex specifies the index of image in buffer. The index is 0-based.
-     * @return {bool}
-     */
-    IsBlankImage(sImageIndex: number): boolean;
-
-    /**
-     * Detects whether a specific image is blank.
-     * @method WebTwain#IsBlankImageExpress
-     * @param {short} sImageIndex specifies the index of image in buffer. The index is 0-based.
-     * @return {bool}
-     */
-    IsBlankImageExpress(sImageIndex: number): boolean;
-
-    /**
-     * [Deprecated.] Detects whether a specific image is blank.
-     * @method WebTwain#GetBarcodeInfo
-     * @param {int} barcodeInfoType Defined in TWAIN Specification.
-     * @param {int} barcodeIndex Specifies which barcode to check. The index is 0-based.
-     * @return {object}
-     */
-    GetBarcodeInfo(barcodeInfoType: number, barcodeIndex: number): object;
-
-    /**
-     * [Deprecated.] Gets the content from a specified barcode.
-     * @method WebTwain#GetBarcodeText
-     * @param {int} barcodeIndex Specifies which barcode to check. The index is 0-based.
-     * @return {bool}
-     */
-    GetBarcodeText(barcodeIndex: number): boolean;
-
-    /**
-     * Sets the default source to use. It's only valid when IfUseTWAINDSM is set to true.
-     * @method WebTwain#SetDefaultSource
-     * @param {short} sImageIndex specifies the index of the default source. The index is 0-based.
-     * @return {bool}
-     */
-    SetDefaultSource(sImageIndex: number): boolean;
-
-    /**
-     * Draws a rectangle on the viewer which represents the selected area.
-     * @method WebTwain#SetSelectedImageArea
-     * @param {short} sImageIndex specifies the index of image in buffer. The index is 0-based.
-     * @param {int} left The X axis of the left border.
-     * @param {int} top The Y axis of the top border.
-     * @param {int} right The X axis of the right border.
-     * @param {int} bottom The Y axis of the bottom border.
-     * @return {bool}
-     */
-    SetSelectedImageArea(sImageIndex: number, left: number, top: number, right: number, bottom: number): boolean;
-
-    /**
-     * Converts the images specified by the indices to base64.
-     * @method WebTwain#ConvertToBase64
-     * @param {Array} indices indices specifies which images are to be converted to base64.
-     * @param {EnumDWT_ImageType} enumImageType the image format in which the images are to be converted to base64.
-     * @param {function} asyncSuccessFunc the function to call when the upload succeeds. Please refer to the function prototype OnSuccess.
-     * @param {function} asyncFailureFunc the function to call when the upload fails. Please refer to the function prototype OnFailure.
-     * @return {bool}
-     */
-    ConvertToBase64(indices: number[], enumImageType: EnumDWT_ImageType, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
-
-    /**
-     * Returns the direct URL of an image specified by index, if iWidth or iHeight is set to -1, you get the original image, otherwise you get the image with specified iWidth or iHeight while keeping the same aspect ratio.
-     * @method WebTwain#GetImageURL
-     * @param {short} index the index of the image.
-     * @param {int} iWidth the width of the image.
-     * @param {int} iHeight the height of the image.
-     * @return {string}
-     */
-    GetImageURL(index: number, iWidth: number, iHeight: number): string;
+    SetHTTPFormField(FieldName: string, FieldValue: string): boolean;
 
     /**
      * Sets a header for the current HTTP Post request.
@@ -3468,4 +3540,158 @@ interface WebTwain {
      * @return {bool}
      */
     SetHTTPHeader(key: string, value: string): boolean;
-}
+
+    /**
+     * Sets the left, top, right, and bottom sides of the image layout rectangle for the current Data Source.
+     * @method WebTwain#SetImageLayout
+     * @param {number} left specifies the floating point number for the left side of the image layout rectangle.
+     * @param {number} top specifies the floating point number for the top side of the image layout rectangle.
+     * @param {number} right specifies the floating point number for the right side of the image layout rectangle.
+     * @param {number} bottom specifies the floating point number for the bottom side of the image layout rectangle.
+     * @return {bool}
+     */
+    SetImageLayout(left: number, top: number, right: number, bottom: number): boolean;
+
+    /**
+     * Change the width of an image in buffer.
+     * @method WebTwain#SetImageWidth
+     * @param {number} sImageIndex  specifies which image you'd like to change.
+     * @param {number} iNewWidth specifies how wide you'd like to change the image.
+     * @return {bool}
+     */
+    SetImageWidth(sImageIndex: number, iNewWidth: number): boolean;
+
+    /**
+     * Set the language for the authorization dialogs.
+     * @method WebTwain#SetLanguage
+     * @param {EnumDWT_Language} language  specify the language
+     * @return {bool}
+     */
+    SetLanguage(language: EnumDWT_Language): boolean;
+
+    /**
+     * Sets the time-out used to open a specified Data Source.
+     * @method WebTwain#SetOpenSourceTimeout
+     * @param {number} iMilliseconds specifies the number of milliseconds.
+     * @return {bool}
+     */
+    SetOpenSourceTimeout(iMilliseconds: number): boolean;
+
+    /**
+     * Draws a rectangle on the viewer which represents the selected area.
+     * @method WebTwain#SetSelectedImageArea
+     * @param {number} sImageIndex specifies the index of image in buffer. The index is 0-based.
+     * @param {number} left The X axis of the left border.
+     * @param {number} top The Y axis of the top border.
+     * @param {number} right The X axis of the right border.
+     * @param {number} bottom The Y axis of the bottom border.
+     * @return {bool}
+     */
+    SetSelectedImageArea(sImageIndex: number, left: number, top: number, right: number, bottom: number): boolean;
+
+    /**
+     * You can use the method to select images programatically which is ususally done by mouse clicking.
+     * @method WebTwain#SetSelectedImageIndex
+     * @param {number} sSelectedIndex this is the index of an array that holds the indices of selected images.
+     * @param {number} newVal specifies the index of an image that you want to select.
+     * @return {void}
+     */
+    SetSelectedImageIndex(selectedIndex: number, newVal: number): void;
+    
+    /**
+     * Sets a custom tiff tag. Currently you can set up to 32 tags. The string to be set in a tag can be encoded with base64.
+     * @method WebTwain#SetTiffCustomTag
+     * @param {number} tag specifies the tag identifier. The value should be between 600 and 700.
+     * @param {string} content the string to be set for this tag. The string will be written to the .tiff file when you save/upload it. If the string is base64 encoded, we'll decode it before writing it.
+     * @param {bool} base64Str if you'd like to encode the string with base64, set this to true. Otherwise, the string will be plin text.
+     * @return {bool}
+     */
+    SetTiffCustomTag(tag: number, content: string, base64Str: boolean): boolean;
+
+    /**
+     * Configures how segmented upload is done.
+     * @method WebTwain#SetUploadSegment
+     * @param {number} segmentUploadThreshold specifies the threshold (in MB) over which segmented upload will be invoked.
+     * @param {number} moduleSize specifies the size of each segment (in KB).
+     * @return {bool}
+     */
+    SetUploadSegment (segmentUploadThreshold: number, moduleSize: number): boolean;
+
+    /**
+     * Sets the view mode that images are displayed in Dynamic Web TWAIN. You can use this method to display multiple images in Dynamic Web TWAIN.
+     * @method WebTwain#SetViewMode
+     * @param {number} sHorizontalImageCount  specifies how many columns can be displayed in Dynamic Web TWAIN.
+     * @param {number} sVerticalImageCount specifies how many rows can be displayed in Dynamic Web TWAIN..
+     * @return {void}
+     */
+    SetViewMode(sHorizontalImageCount: number, sVerticalImageCount: number): void;
+    
+    /**
+     * Show save file dialog or show open file dialog.
+     * @method WebTwain#ShowFileDialog
+     * @param {bool} SaveDialog True -- show save file dialog, False -- show open file dialog.
+     * @param {string} Filter The filter name specifies the filter pattern (for example, "*.TXT"). To specify multiple filter patterns for a single display string, use a semicolon to separate the patterns (for example, "*.TXT;*.DOC;*.BAK"). A pattern string can be a combination of valid file name characters and the asterisk (*) wildcard character. Do not include spaces in the pattern string. To retrieve a shortcut's target without filtering, use the string "All Files\0*.*\0\0", but the program will replace  "\0" with "|" automatically.
+     * @param {number} FilterIndex The index of the currently selected filter in the File Types control. The buffer pointed to by Filter contains pairs of strings that define the filters. The index is 0-based.
+     * @param {string} DefExtension Define the default extension. GetOpenFileName and GetSaveFileName append this extension to the file name only if the user fails to type an extension. If this member is NULL and the user fails to type an extension, no extension is appended.
+     * @param {string} InitialDir The initial directory. The algorithm for selecting the initial directory varies on different platforms.
+     * @param {bool} AllowMultiSelect True -- allows users to select more than one file, False -- only allows to select one file.
+     * @param {bool} OverwritePrompt True -- If a file already exists with the same name, the old file will be simply overwritten, False -- not allows to save and overwrite a same name file.
+     * @param {number} Flags If this parameter equals 0, the program will be initiated with the default flags, otherwise initiated with the cumstom value and paramters "AllowMultiSelect" and "OverwritePrompt" will be useless.
+     * @return {bool}
+     */
+    ShowFileDialog(SaveDialog: boolean, Filter: string, FilterIndex: number, DefExtension: string, InitialDir: string, AllowMultiSelect: boolean, OverwritePrompt: boolean, Flags: number): boolean;
+
+    /**
+     * Shows the GUI of Image Editor.
+     * @method WebTwain#ShowImageEditor
+     * @return {bool}
+     */
+    ShowImageEditor(): boolean;
+
+    /**
+     * [Deprecated.] Shows the GUI of Image Editor with custom settings.
+     * @method WebTwain#ShowImageEditorEx
+     * @param {number} x specifies the new position of the left top corner of the window.
+     * @param {number} y specifies the new position of the left top corner of the window.
+     * @param {number} cx specifies the width of the window.
+     * @param {number} cy specifies the height of the window.
+     * @param {number} nCmdShow specifices how the window should be shown.
+     * @return {bool}
+     */
+    ShowImageEditorEx(x: number, y: number, cx: number, cy: number, nCmdShow: number): boolean;
+
+    /*ingored    
+    SourceNameItems
+    */
+    
+    /**
+     * Switchs two images of specified indices in buffer.
+     * @method WebTwain#SwitchImage
+     * @param {number} sImageIndex1 specifies the index of image in buffer. The index is 0-based.
+     * @param {number} sImageIndex2 specifies the index of image in buffer. The index is 0-based.
+     * @return {bool}
+     */
+    SwitchImage(sImageIndex1: number, sImageIndex2: number): boolean;
+
+    /**
+     * Unbinds an event from the specified function, so that the function stops receiving notifications when the event fires.
+     * @method WebTwain#UnregisterEvent
+     * @param {string} name the name of the event.
+     * @param {object} evt specified the function to be unbound.
+     * @return {bool}
+     */
+    UnregisterEvent(name: string, evt: object): boolean;
+
+    /*ignored
+    checkErrorString
+    first
+    getInstance
+    last
+    next
+    on
+    onEvent
+    previous
+
+    ...other internal ones
+    */
+   }

From 3eda94c22b723af34acfb0d978b1cc8c83d7ff34 Mon Sep 17 00:00:00 2001
From: lincoln <lincoln@dynamsoft.com>
Date: Tue, 20 Mar 2018 17:32:07 +0800
Subject: [PATCH 0691/1382] change format & test passed

---
 types/dwt/addon.pdf.d.ts |  20 +-
 types/dwt/index.d.ts     | 544 +++++++++++++++++++--------------------
 2 files changed, 273 insertions(+), 291 deletions(-)

diff --git a/types/dwt/addon.pdf.d.ts b/types/dwt/addon.pdf.d.ts
index 65fcaa82a0..856291a647 100644
--- a/types/dwt/addon.pdf.d.ts
+++ b/types/dwt/addon.pdf.d.ts
@@ -1,11 +1,3 @@
-// Type definitions for Dynamsoft WebTwain PDF Addon
-// Project: http://www.dynamsoft.com/Products/WebTWAIN_Overview.aspx
-// Definitions by: Xiao Ling <https://github.com/yushulx>
-//                 Lincoln Hu <https://github.com/lincoln2018>
-//                 Tom Kent <https://github.com/Tom-Dynamsoft>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
-
 /*!
 * Based on Dynamsoft WebTwain JavaScript Intellisense
 * Product: Dynamsoft Web Twain
@@ -33,7 +25,7 @@ interface PDF {
      * The function to call when the download succeeds. Please refer to the function prototype OnSuccess.
      * @param {function} optionalAsyncFailureFunc optional.
      * The function to call when the download fails. Please refer to the function prototype OnFailure.
-     * @return {bool}
+     * @return {boolean}
      */
     Download(remoteFile: string,
         optionalAsyncSuccessFunc?: () => void,
@@ -43,7 +35,7 @@ interface PDF {
      *  Input the password to decrypt PDF files using PDF Rasterizer add-on.
      * @method Dynamsoft.WebTwain#SetPassword
      * @param {string} password Specifies the PDF password.
-     * @return {bool}
+     * @return {boolean}
      */
     SetPassword(password: string): boolean;
 
@@ -51,7 +43,7 @@ interface PDF {
      *  Set the image convert mode for PDF Rasterizer in Dynamic Web TWAIN.
      * @method Dynamsoft.WebTwain#SetConvertMode
      * @param {EnumDWT_ConverMode} convertMode Specifies the image convert mode.
-     * @return {bool}
+     * @return {boolean}
      */
     SetConvertMode(convertMode: EnumDWT_ConverMode): boolean;
 
@@ -59,7 +51,7 @@ interface PDF {
      *  Set the output resolution for the PDF Rasterizer in Dynamic Web TWAIN.
      * @method Dynamsoft.WebTwain#ReadRect
      * @param {float} fResolution Specifies the resolution for convert image from PDF file.
-     * @return {bool}
+     * @return {boolean}
      */
     SetResolution(fResolution: number): boolean;
 
@@ -67,7 +59,7 @@ interface PDF {
      * Judges whether the local PDF is text-based or not.
      * @method Dynamsoft.WebTwain#ReadRect
      * @param {string} localFile specifies the local path of the target PDF.
-     * @return {bool}
+     * @return {boolean}
      */
     IsTextBasedPDF(localFile: string): boolean;
 }
@@ -77,5 +69,5 @@ interface WebTwainAddon {
 }
 
 interface WebTwain {
-	Addon: WebTwainAddon;
+    Addon: WebTwainAddon;
 }
diff --git a/types/dwt/index.d.ts b/types/dwt/index.d.ts
index e0682921ee..69bd65bb9f 100644
--- a/types/dwt/index.d.ts
+++ b/types/dwt/index.d.ts
@@ -31,13 +31,13 @@ declare namespace Dynamsoft {
         each  empty  endsWith
         */
 
-        let env:{
+        let env: {
             WSSession: number, WSVersion: string,
-            bChrome: boolean, bEdge: boolean, bFileSystem: boolean, bFirefox: boolean, 
+            bChrome: boolean, bEdge: boolean, bFileSystem: boolean, bFirefox: boolean,
             bIE: boolean, bLinux: boolean, bMac: boolean, bSafari: boolean, bWin: boolean, bWin64: boolean,
             basePath: string, iPluginLength: number, isX64: boolean, pathType: number,
             strChromeVersion: number, strFirefoxVersion: string, strIEVersion: string
-        }
+        };
 
         /*ignored
         error  escapeHtml  escapeRegExp  extend  filter  fireEvent  fromUnicode  get  getColor  getCss
@@ -53,47 +53,44 @@ declare namespace Dynamsoft {
         */
     }
     namespace WebTwainEnv {
-        let ActiveXInstallWithCAB: boolean;
+        let JSVersion: string;
+        let PluginVersion: string;
         let ActiveXVersion: string;
+        let ServerVersionInfo: string;
+
+        let Trial: boolean;
         let AutoLoad: boolean;
-        function CloseDialog():void;
-        let ContainerMap: {};
-        let Containers: Container[];
-        function CreateDWTObject (newObjID: string, successFn: (dwtObject: WebTwain) => void, failurefn: (...args: any[]) => void): void;
-        let Debug: boolean;
-        function DeleteDWTObject (objID: string):void;
-        let DynamicContainers: string[];
-        let DynamicDWTMap: {};
-        function GetWebTwain (cid: string): WebTwain;
+        let ProductKey: string;
+        let ResourcesPath: string;
+
         let IfUpdateService: boolean;
         let IfUseActiveXForIE10Plus: boolean;
-        let JSVersion: string;
+        let UseDefaultInstallUI: string;
+        let ActiveXInstallWithCAB: boolean;
+        let Debug: boolean;
+
+        let ContainerMap: {};
+        let Containers: Container[];
+        let DynamicContainers: string[];
+        let DynamicDWTMap: {};
+        
+        function CreateDWTObject(newObjID: string, successFn: (dwtObject: WebTwain) => void, failurefn: (...args: any[]) => void): void;
+        function GetWebTwain(cid: string): WebTwain;
+        function DeleteDWTObject(objID: string): void;
         function Load(): void;
+        function Unload(): void;
         function RegisterEvent(event: string, fn: (...args: any[]) => void): void;
-        
+
         /*ignored
-        OnWebTwainInitMessage  OnWebTwainNeedUpgrade  OnWebTwainNeedUpgradeWebJavascript  OnWebTwainNotFound  OnWebTwainOldPluginNotAllowed
+        initQueue inited UseDefaultInstallUI
+        OnWebTwainInitMessage  OnWebTwainNeedUpgrade  OnWebTwainNeedUpgradeWebJavascript  OnWebTwainNotFound  OnWebTwainOldPluginNotAllowed OnWebTwainReady
         */
-        
         function OnWebTwainPostExecute(): void;
         function OnWebTwainPreExecute(): void;
-        
-        /*ignored
-        OnWebTwainReady
-        */
 
-        let PluginVersion:string;
-        let ProductKey: string;
-        function RegisterEvent(event: string, fn: (...args: any[]) => void): void;
         function RemoveAllAuthorizations(): void;
-        let ResourcesPath:string;
-        let ServerVersionInfo: string;
-        function ShowDialog(_dialogWidth: number, _dialogHeight: number, _strDialogMessageWithHtmlFormat: string, _bChangeImage: boolean, bHideCloseButton: boolean):void;
-        let Trial: boolean;
-        function Unload(): void;
-        let UseDefaultInstallUI: string;
-        let initQueue: number[];
-        let inited: boolean;
+        function ShowDialog(_dialogWidth: number, _dialogHeight: number, _strDialogMessageWithHtmlFormat: string, _bChangeImage: boolean, bHideCloseButton: boolean): void;
+        function CloseDialog(): void;
     }
 }
 
@@ -312,45 +309,45 @@ declare enum EnumDWT_Cap {
      *  any frames with a left offset of zero.
      *  TWFA_RIGHT: The alignment is to the right.
      */
-    CAP_FEEDERALIGNMENT =  4141,
+    CAP_FEEDERALIGNMENT = 4141,
     /** TWFO_FIRSTPAGEFIRST if the feeder starts with the top of the first page.
      *  TWFO_LASTPAGEFIRST is the feeder starts with the top of the last page.
      */
-    CAP_FEEDERORDER =  4142,
+    CAP_FEEDERORDER = 4142,
     /** Indicates whether the physical hardware (e.g. scanner, digital camera) is capable of acquiring
      *  multiple images of the same page without changes to the physical registration of that page.
      */
-    CAP_REACQUIREALLOWED =  4144,
+    CAP_REACQUIREALLOWED = 4144,
     /** The minutes of battery power remaining to the device. */
-    CAP_BATTERYMINUTES =  4146,
+    CAP_BATTERYMINUTES = 4146,
     /** When used with CapGet(), return the percentage of battery power level on camera. If -1 is returned, it indicates that the battery is not present.  */
-    CAP_BATTERYPERCENTAGE =  4147,
+    CAP_BATTERYPERCENTAGE = 4147,
     /** Added 1.91  */
-    CAP_CAMERASIDE =  4148,
+    CAP_CAMERASIDE = 4148,
     /** Added 1.91   */
-    CAP_SEGMENTED =  4149,
+    CAP_SEGMENTED = 4149,
     /** Added 2.0  */
-    CAP_CAMERAENABLED =  4150,
+    CAP_CAMERAENABLED = 4150,
     /** Added 2.0    */
-    CAP_CAMERAORDER =  4151,
+    CAP_CAMERAORDER = 4151,
     /** Added 2.0  */
-    CAP_MICRENABLED =  4152,
+    CAP_MICRENABLED = 4152,
     /** Added 2.0   */
-    CAP_FEEDERPREP =  4153,
+    CAP_FEEDERPREP = 4153,
     /** Added 2.0  */
-    CAP_FEEDERPOCKET =  4154,
+    CAP_FEEDERPOCKET = 4154,
     /** Added 2.1  */
-    CAP_AUTOMATICSENSEMEDIUM =  4155,
+    CAP_AUTOMATICSENSEMEDIUM = 4155,
     /** Added 2.1  */
-    CAP_CUSTOMINTERFACEGUID =  4156,
+    CAP_CUSTOMINTERFACEGUID = 4156,
     /** TRUE enables and FALSE disables the Source's Auto-brightness function (if any). */
-    ICAP_AUTOBRIGHT =  4352,
+    ICAP_AUTOBRIGHT = 4352,
     /** The brightness values available within the Source. */
-    ICAP_BRIGHTNESS =  4353,
+    ICAP_BRIGHTNESS = 4353,
     /** The contrast values available within the Source. */
-    ICAP_CONTRAST =  4355,
+    ICAP_CONTRAST = 4355,
     /** Specifies the square-cell halftone (dithering) matrix the Source should use to halftone the image. */
-    ICAP_CUSTHALFTONE =  4356,
+    ICAP_CUSTHALFTONE = 4356,
     /** Specifies the exposure time used to capture the image, in seconds. */
     ICAP_EXPOSURETIME = 4357,
     /** Describes the color characteristic of the subtractive filter applied to the image data. Multiple
@@ -1130,7 +1127,7 @@ declare enum EnumDWT_DataSourceStatus {
 }
 
 declare enum EnumDWT_Error {
-	ModuleNotExists = -2371
+    ModuleNotExists = -2371
 }
 
 /** ICAP_IMAGEFILEFORMAT values. */
@@ -1198,11 +1195,11 @@ declare enum EnumDWT_ImageType {
 }
 
 declare enum EnumDWT_InitMsg {
-	Info = 1,
-	Error = 2,
-	NotInstalledError = 3,
-	DownloadError = 4,
-	DownloadNotRestartError = 5
+    Info = 1,
+    Error = 2,
+    NotInstalledError = 3,
+    DownloadError = 4,
+    DownloadNotRestartError = 5
 }
 
 /** The method to do interpolation. */
@@ -1210,19 +1207,19 @@ declare enum EnumDWT_InterpolationMethod {
     IM_NEARESTNEIGHBOUR = 1,
     IM_BILINEAR = 2,
     IM_BICUBIC = 3,
-	IM_BESTQUALITY = 5
+    IM_BESTQUALITY = 5
 }
 
 declare enum EnumDWT_Language {
-	English = 0,
-	French = 1,
-	Arabic = 2,
-	Spanish = 3,
-	Portuguese = 4,
-	German = 5,
-	Italian= 6,
-	Russian= 7,
-	Chinese= 8
+    English = 0,
+    French = 1,
+    Arabic = 2,
+    Spanish = 3,
+    Portuguese = 4,
+    German = 5,
+    Italian = 6,
+    Russian = 7,
+    Chinese = 8
 }
 
 /** TWEI_MAGTYPE values. (MD_ means Mag Type) Added 2.0  */
@@ -1247,10 +1244,10 @@ declare enum EnumDWT_MessageType {
 }
 
 declare enum EnumDWT_MouseShape {
-	Default = 0,
-	Hand = 1,
-	Crosshair = 2,
-	Zoom = 3
+    Default = 0,
+    Hand = 1,
+    Crosshair = 2,
+    Zoom = 3
 }
 
 /** PDF file compression type. */
@@ -1356,8 +1353,8 @@ declare enum EnumDWT_UnitType {
 }
 
 declare enum EnumDWT_UploadDataFormat {
-	Binary = 0,
-	Base64 = 1
+    Binary = 0,
+    Base64 = 1
 }
 
 /** interface for a DWT container which basically defines a DIV on the page */
@@ -1372,10 +1369,9 @@ interface Container {
  */
 // properties (get/set) / sync functions
 interface WebTwain {
- 
     /**
      * Returns whether the instance of a DWT is initialized
-     * @type {bool}
+     * @type {boolean}
      */
     bReady: boolean;
 
@@ -1389,34 +1385,34 @@ interface WebTwain {
      * Returns the runtime class for the dwt container DIV
      * @type {string}
      */
-    containerClass:string;
-    
+    containerClass: string;
+
     /*ignored
     httpUrl
     objectName
 
     ...other internal ones
      */
-    
+
     /*
     * Properties
     */
 
-     /**
-     * Returns or sets whether multi-page selection is supported.
-     * @type {bool}
-     */
+    /**
+    * Returns or sets whether multi-page selection is supported.
+    * @type {boolean}
+    */
     AllowMultiSelect: boolean;
 
     /**
      * [Deprecated.] Returns or sets whether allowing the plugin to send authentication request. The default value of this property is TRUE.
-     * @type {bool}
+     * @type {boolean}
      */
     AllowPluginAuthentication: boolean;
 
     /**
      * [Deprecated.] Returns or sets whether the async mode is activated. With this mode, Dynamic Web TWAIN is able to upload/download files via HTTP/FTP asynchronously. The default value is false.
-     * @type {bool}
+     * @type {boolean}
      */
     AsyncMode: boolean;
 
@@ -1602,7 +1598,7 @@ interface WebTwain {
 
     /**
      * [Deprecated.] Returns or sets whether the user can zoom image using hot key.
-     * @type {bool}
+     * @type {boolean}
      */
     EnableInteractiveZoom: boolean;
 
@@ -1650,7 +1646,7 @@ interface WebTwain {
 
     /**
      * Returns whether a HTTP request has credentials
-     * @type {bool}
+     * @type {boolean}
      */
     HTTPRequestswithCredentials: boolean;
 
@@ -1658,7 +1654,7 @@ interface WebTwain {
      * Returns or sets the height of the dwt viewer object
      * @type {string|number}
      */
-    Height: string|number;
+    Height: string | number;
 
     /**
      * Returns how many images are in buffer. This is a runtime, read-only property.
@@ -1688,7 +1684,7 @@ interface WebTwain {
      * Returns or sets the port number of the HTTP server.
      * @type {number|string}
      */
-    HTTPPort: number|string;
+    HTTPPort: number | string;
 
     /**
      * [Deprecated.] Returns or sets the user name used to log into the HTTP server.
@@ -1698,181 +1694,181 @@ interface WebTwain {
 
     /**
      * Returns or sets whether the feature of disk caching is enabled.
-     * @type {bool}
+     * @type {boolean}
      */
     IfAllowLocalCache: boolean;
 
     /**
      * Returns or sets whether insert or append new scanned images.
-     * @type {bool}
+     * @type {boolean}
      */
     IfAppendImage: boolean;
 
     /**
      * Returns or sets whether the Source's Auto-brightness function is enabled. This is a runtime property.
-     * @type {bool}
+     * @type {boolean}
      */
     IfAutoBright: boolean;
 
     /**
      * Returns or sets whether the data source (scanner) will discard blank images during scanning. The property works only if the device and its driver support discarding blank pages. You can find whether your device supports this capbility from its user manual. Or, you can use the built-in methods of Dynamic Web TWAIN to detect blank images: IsBlankImage, IsBlankImageEx.
-     * @type {bool}
+     * @type {boolean}
      */
     IfAutoDiscardBlankpages: boolean;
 
     /**
      * Returns or sets whether the Source enable automatic document feeding process. This is a runtime property.
-     * @type {bool}
+     * @type {boolean}
      */
     IfAutoFeed: boolean;
 
     /**
      * Returns or sets whether the Source enables the automatic document scanning process. This is a runtime property.
-     * @type {bool}
+     * @type {boolean}
      */
     IfAutoScan: boolean;
 
     /**
      * Specifies whether or not to automatically scroll to the last image or stay on the current image when loading or acquiring images
-     * @type {bool}
+     * @type {boolean}
      */
     IfAutoScroll: boolean;
 
     /**
      * Turns automatic border detection on and off. The property works only if the device and its driver support detecting the border automatically. You can find whether your device supports this capbility from its user manual.
-     * @type {bool}
+     * @type {boolean}
      */
     IfAutomaticBorderDetection: boolean;
 
     /**
      * Turns automatic skew correction on and off.
-     * @type {bool}
+     * @type {boolean}
      */
     IfAutomaticDeskew: boolean;
 
     /**
      * Returns or sets whether close the Data Source User Interface after acquire all images. Default value of this property is FALSE.
-     * @type {bool}
+     * @type {boolean}
      */
     IfDisableSourceAfterAcquire: boolean;
 
     /**
      * Returns or sets whether the Source supports duplex. If TRUE, the scanner scans both sides of a paper; otherwise, the scanner will scan only one side of the image. This is a runtime property.
-     * @type {bool}
+     * @type {boolean}
      */
     IfDuplexEnabled: boolean;
 
     /**
      * Returns or sets whether the Automatic Document Feeder (ADF) is enabled. This is a runtime property.
-     * @type {bool}
+     * @type {boolean}
      */
     IfFeederEnabled: boolean;
 
     /**
      * Returns whether or not there are documents loaded in the Source's feeder when IfFeederEnabled and IfPaperDetectable are TRUE. This is a runtime, read-only property.
-     * @type {bool}
+     * @type {boolean}
      */
     IfFeederLoaded: boolean;
 
     /**
      * Returns or sets whether to resize the image to fit the size of window when the view mode is set to -1 by -1. You can use SetViewMode method to set the view mode.
-     * @type {bool}
+     * @type {boolean}
      */
     IfFitWindow: boolean;
 
     /**
      * [Deprecated.] Returns or sets whether the UI (User Interface) of Source runs in modal state. Default value of this property is TRUE.
-     * @type {bool}
+     * @type {boolean}
      */
     IfModalUI: boolean;
 
     /**
      * Sets or returns whether Dynamic Web TWAIN uses  Graphics Device Interface (GDI) when decoding images.
-     * @type {bool}
+     * @type {boolean}
      */
     IfOpenImageWithGDIPlus: boolean;
-    
+
     /**
      * Returns or sets whether FTP passive mode is enabled.
-     * @type {bool}
+     * @type {boolean}
      */
     IfPASVMode: boolean;
 
     /**
      * Returns the value whether the Source has a paper sensor that can detect documents on the ADF or Flatbed. This is a runtime, read-only property.
-     * @type {bool}
+     * @type {boolean}
      */
     IfPaperDetectable: boolean;
 
     /**
      * Returns or sets whether SSL is used when uploading or downloading images.
-     * @type {bool}
+     * @type {boolean}
      */
     IfSSL: boolean;
 
     /**
      * [Deprecated.] Returns or sets whether communicate with device in a separate thread. Default value of this property is FALSE.
-     * @type {bool}
+     * @type {boolean}
      */
     IfScanInNewThread: boolean;
 
     /**
      * Sets or returns whether to show the cancel dialog when uploading images to server.
-     * @type {bool}
+     * @type {boolean}
      */
     IfShowCancelDialogWhenImageTransfer: boolean;
 
     /**
      * Returns or sets whether to show the file dialog box when saving scanned images or loading images from local folder.
-     * @type {bool}
+     * @type {boolean}
      */
     IfShowFileDialog: boolean;
 
     /**
      * Returns or sets whether the Source displays a progress indicator during acquisition and transfer, regardless of whether the Source's user interface is active. This is a runtime property.
-     * @type {bool}
+     * @type {boolean}
      */
     IfShowIndicator: boolean;
 
     /**
      * [Deprecated.] Returns or sets whether the driver of the printer displays the User Interface.
-     * @type {bool}
+     * @type {boolean}
      */
     IfShowPrintUI: boolean;
 
     /**
      * Returns or sets whether the progress bar will be displayed during the transaction. This is a runtime property.
-     * @type {bool}
+     * @type {boolean}
      */
     IfShowProgressBar: boolean;
 
     /**
      * Returns or sets whether the Source displays the User Interface.
-     * @type {bool}
+     * @type {boolean}
      */
     IfShowUI: boolean;
 
     /**
      * Returns or sets whether to throw exceptions
-     * @type {bool}
+     * @type {boolean}
      */
-    IfThrowException:boolean;
+    IfThrowException: boolean;
 
     /**
      * Return or sets whether the Source allows to save many images in one TIFF file. The default value is FALSE.
-     * @type {bool}
+     * @type {boolean}
      */
     IfTiffMultiPage: boolean;
 
     /**
      * Returns whether the Source supports acquisition with the UI (User Interface) disabled. If FALSE, indicates that this Source can only support acquisition with the UI enabled. This is a runtime, read-only property.
-     * @type {bool}
+     * @type {boolean}
      */
     IfUIControllable: boolean;
 
     /**
      * Sets or returns whether Dynamic Web TWAIN uses the new TWAIN Data Source Manager (TWAINDSM.dll) when acquiring images from TWAIN devices.
-     * @type {bool}
+     * @type {boolean}
      */
     IfUseTwainDSM: boolean;
 
@@ -1890,19 +1886,19 @@ interface WebTwain {
 
     /**
      * [Deprecated.] Returns or sets whether the image enumerator is enabled in Image Editor.
-     * @type {bool}
+     * @type {boolean}
      */
     ImageEditorIfEnableEnumerator: boolean;
 
     /**
      * [Deprecated.] Returns or sets whether the Image Editor is a modal window.
-     * @type {bool}
+     * @type {boolean}
      */
     ImageEditorIfModal: boolean;
 
     /**
      * [Deprecated.] Returns or sets whether the Image Editor is read-only.
-     * @type {bool}
+     * @type {boolean}
      */
     ImageEditorIfReadonly: boolean;
 
@@ -2040,7 +2036,7 @@ interface WebTwain {
 
     /**
      * Returns or sets the shape of the mouse.
-     * @type {bool}
+     * @type {boolean}
      */
     MouseShape: boolean;
 
@@ -2190,7 +2186,7 @@ interface WebTwain {
 
     /**
      * Specifies whether to show the page number
-     * @type {bool}
+     * @type {boolean}
      */
     ShowPageNumber: boolean;
 
@@ -2220,7 +2216,7 @@ interface WebTwain {
 
     /**
      * Specifies whether to show the vertical scroll bar
-     * @type {bool}
+     * @type {boolean}
      */
     VScrollBar: boolean;
 
@@ -2234,7 +2230,7 @@ interface WebTwain {
      * Returns or sets the width of the dwt object viewer
      * @type {string|number}
      */
-    Width: string|number;
+    Width: string | number;
 
     /**
      * Returns and sets the number of images you are willing to transfer per session. This is a runtime property.
@@ -2248,23 +2244,17 @@ interface WebTwain {
      */
     Zoom: number;
 
-    /* ignored 
+    /** ignored 
     style
     _AutoCropMethod
     */
-
-    /*
-    *Methods
-    */
-
-
     /**
      * Displays the source's built-in interface to acquire image.
      * @method WebTwain#AcquireImage
      * @param {object} optionalDeviceConfig  a JS object used to set up the device for image acquisition.
      * @param {function} asyncSuccessFunc the function to call when the upload succeeds. Please refer to the function prototype OnSuccess.
      * @param {function} asyncFailureFunc the function to call when the upload fails. Please refer to the function prototype OnFailure.
-     * @return {bool}
+     * @return {boolean}
      */
     AcquireImage(optionalDeviceConfig?: object, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
@@ -2279,35 +2269,35 @@ interface WebTwain {
      * @param {number} backgroundColor  the background color.
      * @param {number} backgroundRoundRadius ranging from 0 to 0.5. Please NOTE that MAC version does not support this parameter.
      * @param {number} backgroundOpacity specifies the opacity of the background of the added text, it ranges from 0 to 1.0. Please NOTE that Mac version only supports value 0 and 1
-     * @return {bool}
+     * @return {boolean}
      */
     AddText(sImageIndex: number, x: number, y: number, text: string, txtColor: number, backgroundColor: number, backgroundRoundRadius: number, backgroundOpacity: number): boolean;
 
     /**
      * Cancels all pending transfers.
      * @method WebTwain#CancelAllPendingTransfers
-     * @return {bool}
+     * @return {boolean}
      */
     CancelAllPendingTransfers(): boolean;
 
     /**
      * Gets information of the capability specified by the Capability property.
      * @method WebTwain#CapGet
-     * @return {bool}
+     * @return {boolean}
      */
     CapGet(): boolean;
 
     /**
      * Returns the Source's current Value for the specified capability.
      * @method WebTwain#CapGetCurrent
-     * @return {bool}
+     * @return {boolean}
      */
     CapGetCurrent(): boolean;
 
     /**
      * Returns the Source's Default Value for the specified capability. This is the Source's preferred default value.
      * @method WebTwain#CapGetDefault
-     * @return {bool}
+     * @return {boolean}
      */
     CapGetDefault(): boolean;
 
@@ -2353,21 +2343,21 @@ interface WebTwain {
      * Queries whether the Source supports a particular operation on the capability.
      * @method WebTwain#CapIfSupported
      * @param {EnumDWT_MessageType} messageType specifies the type of capability operation.
-     * @return {bool}
+     * @return {boolean}
      */
     CapIfSupported(messageType: EnumDWT_MessageType): boolean;
 
     /**
      * Changes the Current Value of the capability specified by Capability property back to its power-on value.
      * @method WebTwain#CapReset
-     * @return {bool}
+     * @return {boolean}
      */
     CapReset(): boolean;
 
     /**
      * Sets the current capability using the container type specified by CapType property. The current capability is specified by Capability property.
      * @method WebTwain#CapSet
-     * @return {bool}
+     * @return {boolean}
      */
     CapSet(): boolean;
 
@@ -2379,7 +2369,7 @@ interface WebTwain {
      * @param {number} top the value (in Unit) of the top-most edge of the specified frame.
      * @param {number} right  the value (in Unit) of the right-most edge of the specified frame.
      * @param {number} bottom  the value (in Unit) of the bottom-most edge of the specified frame.
-     * @return {bool}
+     * @return {boolean}
      */
     CapSetFrame(index: number, left: number, top: number, right: number, bottom: number): boolean;
 
@@ -2388,8 +2378,8 @@ interface WebTwain {
      * @method WebTwain#ChangeBitDepth
      * @param {number} sImageIndex specifies the index of image in buffer. The index is 0-based.
      * @param {number} sBitDepth specifies the target bit depth.
-     * @param {bool} bHighQuality specifies whether or not to keep high quality while changing the bit depth. When it's true, it takes more time.
-     * @return {bool}
+     * @param {boolean} bHighQuality specifies whether or not to keep high quality while changing the bit depth. When it's true, it takes more time.
+     * @return {boolean}
      */
     ChangeBitDepth(sImageIndex: number, sBitDepth: number, bHighQuality: boolean): boolean;
 
@@ -2400,14 +2390,14 @@ interface WebTwain {
      * @param {number} iNewWidth  specifies the pixel width of the new image.
      * @param {number} iNewHeight specifies the pixel height of the new image.
      * @param {EnumDWT_InterpolationMethod} newVal specifies the method to do interpolation.
-     * @return {bool}
+     * @return {boolean}
      */
     ChangeImageSize(sImageIndex: number, iNewWidth: number, iNewHeight: number, newVal: EnumDWT_InterpolationMethod): boolean;
 
     /**
      * Clears all the web forms which are used for image uploading.
      * @method WebTwain#ClearAllHTTPFormField
-     * @return {bool}
+     * @return {boolean}
      */
     ClearAllHTTPFormField(): boolean;
 
@@ -2421,21 +2411,21 @@ interface WebTwain {
     /**
      * Closes Data Source.
      * @method WebTwain#CloseSource
-     * @return {bool}
+     * @return {boolean}
      */
     CloseSource(): boolean;
 
     /**
      * Closes and unloads Data Source Manager.
      * @method WebTwain#CloseSourceManager
-     * @return {bool}
+     * @return {boolean}
      */
     CloseSourceManager(): boolean;
 
     /**
      * Closes the current process used to scan
      * @method WebTwain#CloseWorkingProcess
-     * @return {bool}
+     * @return {boolean}
      */
     CloseWorkingProcess(): boolean;
 
@@ -2446,9 +2436,9 @@ interface WebTwain {
      * @param {EnumDWT_ImageType} enumImageType the image format in which the images are to be converted to base64.
      * @param {function} asyncSuccessFunc the function to call when the upload succeeds. Please refer to the function prototype OnSuccess.
      * @param {function} asyncFailureFunc the function to call when the upload fails. Please refer to the function prototype OnFailure.
-     * @return {bool}
+     * @return {boolean}
      */
-    ConvertToBase64(indices: number[], enumImageType: EnumDWT_ImageType, optionalAsyncSuccessFunc?: (result:any) => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
+    ConvertToBase64(indices: number[], enumImageType: EnumDWT_ImageType, optionalAsyncSuccessFunc?: (result: any) => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
     /**
      * Converts the images specified by the indices to base64.
@@ -2457,15 +2447,15 @@ interface WebTwain {
      * @param {EnumDWT_ImageType} enumImageType the image format in which the images are to be converted to base64.
      * @param {function} asyncSuccessFunc the function to call when the upload succeeds. Please refer to the function prototype OnSuccess.
      * @param {function} asyncFailureFunc the function to call when the upload fails. Please refer to the function prototype OnFailure.
-     * @return {bool}
+     * @return {boolean}
      */
-    ConvertToBlob(indices: number[], enumImageType: EnumDWT_ImageType, optionalAsyncSuccessFunc?: (result:any) => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
+    ConvertToBlob(indices: number[], enumImageType: EnumDWT_ImageType, optionalAsyncSuccessFunc?: (result: any) => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
     /**
      * Changes a specified image to gray scale.
      * @method WebTwain#ConvertToGrayScale
      * @param {number} sIndex specifies the index of image in buffer. The index is 0-based.
-     * @return {bool}
+     * @return {boolean}
      */
     ConvertToGrayScale(sIndex: number): boolean;
 
@@ -2473,7 +2463,7 @@ interface WebTwain {
      * Copies the image of a specified index in buffer to clipboard in DIB format.
      * @method WebTwain#CopyToClipboard
      * @param {number} sImageIndex specifies the index of image in buffer. The index is 0-based.
-     * @return {bool}
+     * @return {boolean}
      */
     CopyToClipboard(sImageIndex: number): boolean;
 
@@ -2494,7 +2484,7 @@ interface WebTwain {
      * @param {number} quality Specifies the font's output quality, which defines how carefully the GDI must attempt to match the logical-font attributes to those of an actual physical font.
      * @param {number} pitchAndFamily  The pitch and family of the font.
      * @param {string} faceName   the typeface name, the length of this string must not exceed 32 characters, including the terminating null character.
-     * @return {bool}
+     * @return {boolean}
      */
     CreateTextFont(height: number, width: number, escapement: number, orientation: number, weight: number, italic: number, underline: number, strikeOut: number, charSet: number, outputPrecision: number, clipPrecision: number, quality: number, pitchAndFamily: number, faceName: string): boolean;
 
@@ -2506,7 +2496,7 @@ interface WebTwain {
      * @param {number} top specifies the y-coordinate of the upper-left corner of the rectangle.
      * @param {number} right specifies the x-coordinate of the lower-right corner of the rectangle.
      * @param {number} bottom specifies the y-coordinate of the lower-right corner of the rectangle.
-     * @return {bool}
+     * @return {boolean}
      */
     Crop(sImageIndex: number, left: number, top: number, right: number, bottom: number): boolean;
 
@@ -2518,7 +2508,7 @@ interface WebTwain {
      * @param {number} top specifies the y-coordinate of the upper-left corner of the rectangle.
      * @param {number} right specifies the x-coordinate of the lower-right corner of the rectangle.
      * @param {number} bottom specifies the y-coordinate of the lower-right corner of the rectangle.
-     * @return {bool}
+     * @return {boolean}
      */
     CropToClipboard(sImageIndex: number, left: number, top: number, right: number, bottom: number): boolean;
 
@@ -2530,7 +2520,7 @@ interface WebTwain {
      * @param {number} top specifies the y-coordinate of the upper-left corner of the rectangle.
      * @param {number} right specifies the x-coordinate of the lower-right corner of the rectangle.
      * @param {number} bottom specifies the y-coordinate of the lower-right corner of the rectangle.
-     * @return {bool}
+     * @return {boolean}
      */
     CutFrameToClipboard(sImageIndex: number, left: number, top: number, right: number, bottom: number): boolean;
 
@@ -2538,24 +2528,24 @@ interface WebTwain {
      * Cuts the image of a specified index in buffer to clipboard in DIB format.
      * @method WebTwain#CutToClipboard
      * @param {number} sImageIndex specifies the index of image in buffer. The index is 0-based.
-     * @return {bool}
+     * @return {boolean}
      */
     CutToClipboard(sImageIndex: number): boolean;
 
     /**
      * Disable the source. If the source's user interface is displayed when the source is enabled, it will be closed.
      * @method WebTwain#DisableSource
-     * @return {bool}
+     * @return {boolean}
      */
     DisableSource(): boolean;
 
     /**
      * Enables the source to accept image.
      * @method WebTwain#EnableSource
-     * @return {bool}
+     * @return {boolean}
      */
     EnableSource(): boolean;
-    
+
     /**
      * Clears the specified area of a specified image, and fill the area with the fill color.
      * @method WebTwain#Erase
@@ -2564,7 +2554,7 @@ interface WebTwain {
      * @param {number} top specifies the y-coordinate of the upper-left corner of the rectangle.
      * @param {number} right specifies the x-coordinate of the lower-right corner of the rectangle.
      * @param {number} bottom specifies the y-coordinate of the lower-right corner of the rectangle.
-     * @return {bool}
+     * @return {boolean}
      */
     Erase(sImageIndex: number, left: number, top: number, right: number, bottom: number): boolean;
 
@@ -2575,7 +2565,7 @@ interface WebTwain {
      * @param {string} FTPRemoteFile the name of the file to be downloaded. It should be the relative path of the file on the FTP server.
      * @param {function} optionalAsyncSuccessFunc optional. The function to call when the download succeeds. Please refer to the function prototype OnSuccess.
      * @param {function} optionalAsyncFailureFunc optional. The function to call when the download fails. Please refer to the function prototype OnFailure.
-     * @return {bool}
+     * @return {boolean}
      */
     FTPDownload(FTPServer: string, FTPRemoteFile: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
@@ -2587,7 +2577,7 @@ interface WebTwain {
      * @param {string} localFile specify a full path to store the file.
      * @param {function} optionalAsyncSuccessFunc optional. The function to call when the download succeeds. Please refer to the function prototype OnSuccess.
      * @param {function} optionalAsyncFailureFunc optional. The function to call when the download fails. Please refer to the function prototype OnFailure.
-     * @return {bool}
+     * @return {boolean}
      */
     FTPDownloadDirectly(FTPServer: string, FTPRemoteFile: string, localFile: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
@@ -2599,7 +2589,7 @@ interface WebTwain {
      * @param {EnumDWT_ImageType} lImageType simage format of the file to be downloaded.
      * @param {function} optionalAsyncSuccessFunc optional. The function to call when the download succeeds. Please refer to the function prototype OnSuccess.
      * @param {function} optionalAsyncFailureFunc optional. The function to call when the download fails. Please refer to the function prototype OnFailure.
-     * @return {bool}
+     * @return {boolean}
      */
     FTPDownloadEx(FTPServer: string, FTPRemoteFile: string, lImageType: EnumDWT_ImageType, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
@@ -2611,7 +2601,7 @@ interface WebTwain {
      * @param {string} FTPRemoteFile the name of the file to be created on the FTP server. It should be a relative path on the FTP server.
      * @param {function} optionalAsyncSuccessFunc optional. The function to call when the upload succeeds. Please refer to the function prototype OnSuccess.
      * @param {function} optionalAsyncFailureFunc optional. The function to call when the upload fails. Please refer to the function prototype OnFailure.
-     * @return {bool}
+     * @return {boolean}
      */
     FTPUpload(FTPServer: string, sImageIndex: number, FTPRemoteFile: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
@@ -2623,7 +2613,7 @@ interface WebTwain {
      * @param {string} FTPRemoteFile the name of the file to be created on the FTP server. It should be a relative path on the FTP server.
      * @param {function} optionalAsyncSuccessFunc optional. The function to call when the upload succeeds. Please refer to the function prototype OnSuccess.
      * @param {function} optionalAsyncFailureFunc optional. The function to call when the upload fails. Please refer to the function prototype OnFailure.
-     * @return {bool}
+     * @return {boolean}
      */
     FTPUploadDirectly(FTPServer: string, localFile: string, FTPRemoteFile: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
@@ -2636,7 +2626,7 @@ interface WebTwain {
      * @param {EnumDWT_ImageType} lImageType the image format of the file to be created on the FTP server.
      * @param {function} optionalAsyncSuccessFunc optional. The function to call when the upload succeeds. Please refer to the function prototype OnSuccess.
      * @param {function} optionalAsyncFailureFunc optional. The function to call when the upload fails. Please refer to the function prototype OnFailure.
-     * @return {bool}
+     * @return {boolean}
      */
     FTPUploadEx(FTPServer: string, sImageIndex: number, FTPRemoteFile: string, lImageType: EnumDWT_ImageType, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
@@ -2647,7 +2637,7 @@ interface WebTwain {
      * @param {string} FTPRemoteFile the name of the image to be uploaded. It should be a relative path on the FTP server.
      * @param {function} optionalAsyncSuccessFunc optional. The function to call when the upload succeeds. Please refer to the function prototype OnSuccess.
      * @param {function} optionalAsyncFailureFunc optional. The function to call when the upload fails. Please refer to the function prototype OnFailure.
-     * @return {bool}
+     * @return {boolean}
      */
     FTPUploadAllAsMultiPageTIFF(FTPServer: string, FTPRemoteFile: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
@@ -2658,7 +2648,7 @@ interface WebTwain {
      * @param {string} FTPRemoteFile the name of the image to be uploaded. It should be a relative path on the FTP server.
      * @param {function} optionalAsyncSuccessFunc optional. The function to call when the upload succeeds. Please refer to the function prototype OnSuccess.
      * @param {function} optionalAsyncFailureFunc optional. The function to call when the upload fails. Please refer to the function prototype OnFailure.
-     * @return {bool}
+     * @return {boolean}
      */
     FTPUploadAllAsPDF(FTPServer: string, FTPRemoteFile: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
@@ -2669,7 +2659,7 @@ interface WebTwain {
      * @param {string} FTPRemoteFile the name of the image to be uploaded. It should be a relative path on the FTP server.
      * @param {function} optionalAsyncSuccessFunc optional. The function to call when the upload succeeds. Please refer to the function prototype OnSuccess.
      * @param {function} optionalAsyncFailureFunc optional. The function to call when the upload fails. Please refer to the function prototype OnFailure.
-     * @return {bool}
+     * @return {boolean}
      */
     FTPUploadAsMultiPagePDF(FTPServer: string, FTPRemoteFile: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
@@ -2680,14 +2670,14 @@ interface WebTwain {
      * @param {string} FTPRemoteFile the name of the image to be uploaded. It should be a relative path on the FTP server.
      * @param {function} optionalAsyncSuccessFunc optional. The function to call when the upload succeeds. Please refer to the function prototype OnSuccess.
      * @param {function} optionalAsyncFailureFunc optional. The function to call when the upload fails. Please refer to the function prototype OnFailure.
-     * @return {bool}
+     * @return {boolean}
      */
     FTPUploadAsMultiPageTIFF(FTPServer: string, FTPRemoteFile: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
     /**
      * Sets the Source to eject the current page and advance the next page in the document feeder into the feeder acquire area when IfFeederEnabled is TRUE.
      * @method WebTwain#FeedPage
-     * @return {bool}
+     * @return {boolean}
      */
     FeedPage(): boolean;
 
@@ -2695,7 +2685,7 @@ interface WebTwain {
      * Check whether a certain file exists on the local disk.
      * @method WebTwain#FileExists
      * @param {string} localFile specifies the absolute path of the local file.
-     * @return {bool}
+     * @return {boolean}
      */
     FileExists(localFile: string): boolean;
 
@@ -2703,7 +2693,7 @@ interface WebTwain {
      * Flips the image of a specified index in buffer.
      * @method WebTwain#Flip
      * @param {number} sImageIndex specifies the index of image in buffer. The index is 0-based.
-     * @return {bool}
+     * @return {boolean}
      */
     Flip(sImageIndex: number): boolean;
 
@@ -2736,7 +2726,7 @@ interface WebTwain {
      * Gets custom DS data and save the data in a specified file.
      * @method WebTwain#GetCustomDSData
      * @param {string} fileName  the path of the file used for storing custom DS data.
-     * @return {bool}
+     * @return {boolean}
      */
     GetCustomDSData(fileName: string): boolean;
 
@@ -2824,7 +2814,7 @@ interface WebTwain {
      * Return the runtime license info.
      * @method WebTwain#GetLicenseInfo
      */
-    GetLicenseInfo(): {Domain:string, Detail: Array<any>};
+    GetLicenseInfo(): { Domain: string, Detail: any[] };
 
     /**
      * Returns the index of the selected image.
@@ -2875,7 +2865,7 @@ interface WebTwain {
     GetSourceType
     GetVersionInfoAsync
     */
-  
+
     /**
      * Downloads an image from the HTTP server.
      * @method WebTwain#HTTPDownload
@@ -2883,7 +2873,7 @@ interface WebTwain {
      * @param {string} HTTPRemoteFile the name of the image to be downloaded. It should be the relative path of the file on the HTTP server.
      * @param {function} optionalAsyncSuccessFunc optional. The function to call when the download succeeds. Please refer to the function prototype OnSuccess.
      * @param {function} optionalAsyncFailureFunc optional. The function to call when the download fails. Please refer to the function prototype OnFailure.
-     * @return {bool}
+     * @return {boolean}
      */
     HTTPDownload(HTTPServer: string, HTTPRemoteFile: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
@@ -2895,7 +2885,7 @@ interface WebTwain {
      * @param {string} localFile specify the location to store the downloaded file.
      * @param {function} optionalAsyncSuccessFunc optional. The function to call when the download succeeds. Please refer to the function prototype OnSuccess.
      * @param {function} optionalAsyncFailureFunc optional. The function to call when the download fails. Please refer to the function prototype OnFailure.
-     * @return {bool}
+     * @return {boolean}
      */
     HTTPDownloadDirectly(HTTPServer: string, HTTPRemoteFile: string, localFile: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
@@ -2907,7 +2897,7 @@ interface WebTwain {
      * @param {EnumDWT_ImageType} lImageType the image format of the file to be downloaded.
      * @param {function} optionalAsyncSuccessFunc optional. The function to call when the download succeeds. Please refer to the function prototype OnSuccess.
      * @param {function} optionalAsyncFailureFunc optional. The function to call when the download fails. Please refer to the function prototype OnFailure.
-     * @return {bool}
+     * @return {boolean}
      */
     HTTPDownloadEx(HTTPServer: string, HTTPRemoteFile: string, lImageType: EnumDWT_ImageType, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
@@ -2924,10 +2914,10 @@ interface WebTwain {
      * @param {EnumDWT_ImageType} lImageType the image format of the file to be downloaded.
      * @param {function} optionalAsyncSuccessFunc optional. The function to call when the download succeeds. Please refer to the function prototype OnSuccess.
      * @param {function} optionalAsyncFailureFunc optional. The function to call when the download fails. Please refer to the function prototype OnFailure.
-     * @return {bool}
+     * @return {boolean}
      */
     HTTPDownloadThroughPost(HTTPServer: string, HTTPRemoteFile: string, lImageType: EnumDWT_ImageType, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
-    
+
     /**
      * Uploads the images specified by the indices to the HTTP server.
      * @method WebTwain#HTTPUpload
@@ -2937,10 +2927,10 @@ interface WebTwain {
      * @param {EnumDWT_UploadDataFormat} dataFormat whether to upload the images as binary or a base64-based string.
      * @param {function} asyncSuccessFunc the function to call when the upload succeeds. Please refer to the function prototype OnSuccess.
      * @param {function} asyncFailureFunc the function to call when the upload fails. Please refer to the function prototype OnFailure.
-     * @return {bool}
+     * @return {boolean}
      */
-    HTTPUpload (url: string, indices: number[], enumImageType: EnumDWT_ImageType, dataFormat: EnumDWT_UploadDataFormat, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
-    
+    HTTPUpload(url: string, indices: number[], enumImageType: EnumDWT_ImageType, dataFormat: EnumDWT_UploadDataFormat, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
+
     /**
      * Uploads all images in the buffer to the HTTP server through the HTTP Post method as a Multi-Page TIFF.
      * @method WebTwain#HTTPUploadAllThroughPostAsMultiPageTIFF
@@ -2949,7 +2939,7 @@ interface WebTwain {
      * @param {string} fileName the name of the image to be uploaded.
      * @param {function} optionalAsyncSuccessFunc optional. The function to call when the upload succeeds. Please refer to the function prototype OnHttpUploadSuccess.
      * @param {function} optionalAsyncFailureFunc optional. The function to call when the upload fails. Please refer to the function prototype OnHttpUploadFailure.
-     * @return {bool}
+     * @return {boolean}
      */
     HTTPUploadAllThroughPostAsMultiPageTIFF(HTTPServer: string, ActionPage: string, fileName: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
@@ -2961,10 +2951,10 @@ interface WebTwain {
      * @param {string} fileName the name of the image to be uploaded.
      * @param {function} optionalAsyncSuccessFunc optional. The function to call when the upload succeeds. Please refer to the function prototype OnHttpUploadSuccess.
      * @param {function} optionalAsyncFailureFunc optional. The function to call when the upload fails. Please refer to the function prototype OnHttpUploadFailure.
-     * @return {bool}
+     * @return {boolean}
      */
     HTTPUploadAllThroughPostAsPDF(HTTPServer: string, ActionPage: string, fileName: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
-   
+
     /**
      * [Deprecated.] Uploads all images in the buffer to the HTTP server through the HTTP Put method as a Multi-Page TIFF.
      * @method WebTwain#HTTPUploadAllThroughPutAsMultiPageTIFF
@@ -2972,7 +2962,7 @@ interface WebTwain {
      * @param {string} RemoteFileName the name of the image to be uploaded.
      * @param {function} optionalAsyncSuccessFunc optional. The function to call when the upload succeeds. Please refer to the function prototype OnSuccess.
      * @param {function} optionalAsyncFailureFunc optional. The function to call when the upload fails. Please refer to the function prototype OnFailure.
-     * @return {bool}
+     * @return {boolean}
      */
     HTTPUploadAllThroughPutAsMultiPageTIFF(HTTPServer: string, RemoteFileName: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
@@ -2983,7 +2973,7 @@ interface WebTwain {
      * @param {string} RemoteFileName the name of the image to be uploaded.
      * @param {function} optionalAsyncSuccessFunc optional. The function to call when the upload succeeds. Please refer to the function prototype OnSuccess.
      * @param {function} optionalAsyncFailureFunc optional. The function to call when the upload fails. Please refer to the function prototype OnFailure.
-     * @return {bool}
+     * @return {boolean}
      */
     HTTPUploadAllThroughPutAsPDF(HTTPServer: string, RemoteFileName: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
@@ -3000,7 +2990,7 @@ interface WebTwain {
      * @param {string} fileName the name of the image to be uploaded.
      * @param {function} optionalAsyncSuccessFunc optional. The function to call when the upload succeeds. Please refer to the function prototype OnHttpUploadSuccess.
      * @param {function} optionalAsyncFailureFunc optional. The function to call when the upload fails. Please refer to the function prototype OnHttpUploadFailure.
-     * @return {bool}
+     * @return {boolean}
      */
     HTTPUploadThroughPost(HTTPServer: string, sImageIndex: number, ActionPage: string, fileName: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
@@ -3012,7 +3002,7 @@ interface WebTwain {
      * @param {string} fileName the name of the image to be uploaded.
      * @param {function} optionalAsyncSuccessFunc optional. The function to call when the upload succeeds. Please refer to the function prototype OnHttpUploadSuccess.
      * @param {function} optionalAsyncFailureFunc optional. The function to call when the upload fails. Please refer to the function prototype OnHttpUploadFailure.
-     * @return {bool}
+     * @return {boolean}
      */
     HTTPUploadThroughPostAsMultiPageTIFF(HTTPServer: string, ActionPage: string, fileName: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
@@ -3024,7 +3014,7 @@ interface WebTwain {
      * @param {string} fileName the name of the image to be uploaded.
      * @param {function} optionalAsyncSuccessFunc optional. The function to call when the upload succeeds. Please refer to the function prototype OnHttpUploadSuccess.
      * @param {function} optionalAsyncFailureFunc optional. The function to call when the upload fails. Please refer to the function prototype OnHttpUploadFailure.
-     * @return {bool}
+     * @return {boolean}
      */
     HTTPUploadThroughPostAsMultiPagePDF(HTTPServer: string, ActionPage: string, fileName: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
@@ -3037,7 +3027,7 @@ interface WebTwain {
      * @param {string} fileName the name of the file to be uploaded.
      * @param {function} optionalAsyncSuccessFunc optional. The function to call when the upload succeeds. Please refer to the function prototype OnHttpUploadSuccess.
      * @param {function} optionalAsyncFailureFunc optional. The function to call when the upload fails. Please refer to the function prototype OnHttpUploadFailure.
-     * @return {bool}
+     * @return {boolean}
      */
     HTTPUploadThroughPostDirectly(HTTPServer: string, localFile: string, ActionPage: string, fileName: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
@@ -3051,7 +3041,7 @@ interface WebTwain {
      * @param {EnumDWT_ImageType} lImageType the image format of the file to be created on the HTTP server.s
      * @param {function} optionalAsyncSuccessFunc optional. The function to call when the upload succeeds. Please refer to the function prototype OnHttpUploadSuccess.
      * @param {function} optionalAsyncFailureFunc optional. The function to call when the upload succeeds. Please refer to the function prototype OnHttpUploadFailure.
-     * @return {bool}
+     * @return {boolean}
      */
     HTTPUploadThroughPostEx(HTTPServer: string, sImageIndex: number, ActionPage: string, fileName: string, lImageType: EnumDWT_ImageType, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
@@ -3063,10 +3053,10 @@ interface WebTwain {
      * @param {string} RemoteFileName the name of the image to be created on the HTTP server. It should a relative path on the web server.
      * @param {function} optionalAsyncSuccessFunc optional. The function to call when the upload succeeds. Please refer to the function prototype OnSuccess.
      * @param {function} optionalAsyncFailureFunc optional. The function to call when the upload fails. Please refer to the function prototype OnFailure.
-     * @return {bool}
+     * @return {boolean}
      */
     HTTPUploadThroughPut(HTTPServer: string, sImageIndex: number, RemoteFileName: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
- 
+
     /**
      * [Deprecated.] Uploads the selected images in the buffer to the HTTP server through the HTTP Put method as a Multi-Page TIFF.
      * @method WebTwain#HTTPUploadThroughPutAsMultiPageTIFF
@@ -3074,7 +3064,7 @@ interface WebTwain {
      * @param {string} RemoteFileName the name of the image to be uploaded.
      * @param {function} optionalAsyncSuccessFunc optional. The function to call when the upload succeeds. Please refer to the function prototype OnSuccess.
      * @param {function} optionalAsyncFailureFunc optional. The function to call when the upload fails. Please refer to the function prototype OnFailure.
-     * @return {bool}
+     * @return {boolean}
      */
     HTTPUploadThroughPutAsMultiPageTIFF(HTTPServer: string, RemoteFileName: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
@@ -3085,10 +3075,10 @@ interface WebTwain {
      * @param {string} RemoteFileName the name of the image to be uploaded.
      * @param {function} optionalAsyncSuccessFunc optional. The function to call when the upload succeeds. Please refer to the function prototype OnSuccess.
      * @param {function} optionalAsyncFailureFunc optional. The function to call when the upload fails. Please refer to the function prototype OnFailure.
-     * @return {bool}
+     * @return {boolean}
      */
     HTTPUploadThroughPutAsMultiPagePDF(HTTPServer: string, RemoteFileName: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
-    
+
     /**
      * [Deprecated.] Directly uploads a specific local file to the HTTP server through the HTTP PUT method without loading it into Dynamic Web TWAIN.
      * @method WebTwain#HTTPUploadThroughPutDirectly
@@ -3097,7 +3087,7 @@ interface WebTwain {
      * @param {string} RemoteFileName the name of the file to be created on the HTTP server. It should a relative path on the web server.
      * @param {function} optionalAsyncSuccessFunc optional. The function to call when the upload succeeds. Please refer to the function prototype OnSuccess.
      * @param {function} optionalAsyncFailureFunc optional. The function to call when the upload fails. Please refer to the function prototype OnFailure.
-     * @return {bool}
+     * @return {boolean}
      */
     HTTPUploadThroughPutDirectly(HTTPServer: string, localFile: string, RemoteFileName: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
@@ -3110,15 +3100,15 @@ interface WebTwain {
      * @param {EnumDWT_ImageType} lImageType the image format of the file to be created on the HTTP server.
      * @param {function} optionalAsyncSuccessFunc optional. The function to call when the upload succeeds. Please refer to the function prototype OnSuccess.
      * @param {function} optionalAsyncFailureFunc optional. The function to call when the upload fails. Please refer to the function prototype OnFailure.
-     * @return {bool}
+     * @return {boolean}
      */
     HTTPUploadThroughPutEx(HTTPServer: string, sImageIndex: number, RemoteFileName: string, lImageType: EnumDWT_ImageType, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
- 
+
     /**
      * [Deprecated.] Detects whether an image is blank.
      * @method WebTwain#IsBlankImage
      * @param {number} sImageIndex specifies the index of image in buffer. The index is 0-based.
-     * @return {bool}
+     * @return {boolean}
      */
     IsBlankImage(sImageIndex: number): boolean;
 
@@ -3130,8 +3120,8 @@ interface WebTwain {
      * @param {number} top specifies the y-coordinate of the upper-left corner of the rectangle.
      * @param {number} right specifies the x-coordinate of the lower-right corner of the rectangle.
      * @param {number} bottom specifies the y-coordinate of the lower-right corner of the rectangle.
-     * @param {bool} bFuzzyMatch specifies whether use fuzzy matching when detecting.
-     * @return {bool}
+     * @param {boolean} bFuzzyMatch specifies whether use fuzzy matching when detecting.
+     * @return {boolean}
      */
     IsBlankImageEx(sImageIndex: number, left: number, top: number, right: number, bottom: number, bFuzzyMatch: boolean): boolean;
 
@@ -3139,7 +3129,7 @@ interface WebTwain {
      * Detects whether a specific image is blank.
      * @method WebTwain#IsBlankImageExpress
      * @param {number} sImageIndex specifies the index of image in buffer. The index is 0-based.
-     * @return {bool}
+     * @return {boolean}
      */
     IsBlankImageExpress(sImageIndex: number): boolean;
 
@@ -3148,7 +3138,7 @@ interface WebTwain {
      * @method WebTwain#LoadDibFromClipboard
      * @param {function} optionalAsyncSuccessFunc optional. The function to call when the loading succeeds. Please refer to the function prototype OnSuccess.
      * @param {function} optionalAsyncFailureFunc optional. The function to call when the loading fails. Please refer to the function prototype OnFailure.
-     * @return {bool}
+     * @return {boolean}
      */
     LoadDibFromClipboard(optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
@@ -3158,7 +3148,7 @@ interface WebTwain {
      * @param {string} localFile the name of the image to be loaded. It should be the absolute path of the image file on the local disk.
      * @param {function} optionalAsyncSuccessFunc optional. The function to call when the loading succeeds. Please refer to the function prototype OnSuccess.
      * @param {function} optionalAsyncFailureFunc optional. The function to call when the loading fails. Please refer to the function prototype OnFailure.
-     * @return {bool}
+     * @return {boolean}
      */
     LoadImage(localFile: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
@@ -3169,7 +3159,7 @@ interface WebTwain {
      * @param {EnumDWT_ImageType} lImageType the image format of the file to be loaded.
      * @param {function} optionalAsyncSuccessFunc optional. The function to call when the loading succeeds. Please refer to the function prototype OnSuccess.
      * @param {function} optionalAsyncFailureFunc optional. The function to call when the loading fails. Please refer to the function prototype OnFailure.
-     * @return {bool}
+     * @return {boolean}
      */
     LoadImageEx(localFile: string, lImageType: EnumDWT_ImageType, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
@@ -3178,7 +3168,7 @@ interface WebTwain {
      * @method WebTwain#LoadImageFromBase64Binary
      * @param {string} bry specifies the base64 string data.
      * @param {EnumDWT_ImageType} lImageType specifies the file format.
-     * @return {bool}
+     * @return {boolean}
      */
     LoadImageFromBase64Binary(bry: string, lImageType: EnumDWT_ImageType, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
@@ -3188,7 +3178,7 @@ interface WebTwain {
      * @param {number} lBufferSize Specifies the buffer size.
      * @param {Array} buffer A byte array of the image data.
      * @param {EnumDWT_ImageType} lImageType Specifies the file format.
-     * @return {bool}
+     * @return {boolean}
      */
     LoadImageFromBytes(lBufferSize: number, buffer: number[], lImageType: EnumDWT_ImageType): boolean;
 
@@ -3196,7 +3186,7 @@ interface WebTwain {
      * Mirrors the image of a specified index in buffer.
      * @method WebTwain#Mirror
      * @param {number} sImageIndex specifies the index of image in buffer. The index is 0-based.
-     * @return {bool}
+     * @return {boolean}
      */
     Mirror(sImageIndex: number): boolean;
 
@@ -3205,7 +3195,7 @@ interface WebTwain {
      * @method WebTwain#MoveImage
      * @param {number} sSourceImageIndex Specifies the source index of image in buffer. The index is 0-based.
      * @param {number} sTargetImageIndex Specifies the target index of image in buffer. The index is 0-based.
-     * @return {bool}
+     * @return {boolean}
      */
     MoveImage(sSourceImageIndex: number, sTargetImageIndex: number): boolean;
 
@@ -3218,14 +3208,14 @@ interface WebTwain {
      * placing Dynamic Web TWAIN into Capability Negotiation state. If no source is
      * specified (no SelectSource() or SelectSourceByIndex() is called), opens the default source.
      * @method WebTwain#OpenSource
-     * @return {bool}
+     * @return {boolean}
      */
     OpenSource(): boolean;
 
     /**
      * Loads and opens Data Source Manager.
      * @method WebTwain#OpenSourceManager
-     * @return {bool}
+     * @return {boolean}
      */
     OpenSourceManager(): boolean;
 
@@ -3239,14 +3229,14 @@ interface WebTwain {
      * @param {number} bottom specifies the y-coordinate of the lower-right corner of the rectangle.
      * @param {number} color Specifies the fill color of the rectangle. The byte-ordering of the RGB value is 0xBBGGRR. BB represents blue, GG represents green, RR represents red.
      * @param {number} fOpacity Specifies the opacity of the rectangle. The value represents opacity. 1.0 is 100% opaque and 0.0 is totally transparent.
-     * @return {bool}
+     * @return {boolean}
      */
     OverlayRectangle(sImageIndex: number, left: number, top: number, right: number, bottom: number, color: number, fOpacity: number): boolean;
 
     /**
      * Shows the GUI of Image Printer.
      * @method WebTwain#Print
-     * @return {bool}
+     * @return {boolean}
      */
     Print(): boolean;
 
@@ -3255,10 +3245,10 @@ interface WebTwain {
      * @method WebTwain#RegisterEvent
      * @param {string} name the name of the event that the function is bound to.
      * @param {object} evt specifies the function to call when event fires.
-     * @return {bool}
+     * @return {boolean}
      */
     RegisterEvent(name: string, evt: object): boolean;
-    
+
     /**
      * Removes all images in buffer.
      * @method WebTwain#RemoveAllImages
@@ -3269,7 +3259,7 @@ interface WebTwain {
     /**
      * Removes selected images in buffer.
      * @method WebTwain#RemoveAllSelectedImages
-     * @return {bool}
+     * @return {boolean}
      */
     RemoveAllSelectedImages(): boolean;
 
@@ -3277,14 +3267,14 @@ interface WebTwain {
      * Removes the image of a specified index in buffer.
      * @method WebTwain#RemoveImage
      * @param {number} sImageIndexToBeDeleted  specifies the index of the image to be deleted  in buffer. The index is 0-based.
-     * @return {bool}
+     * @return {boolean}
      */
     RemoveImage(sImageIndexToBeDeleted: number): boolean;
-  
+
     /**
      * Reverts the current image layout to the Data Source's default.
      * @method WebTwain#ResetImageLayout
-     * @return {bool}
+     * @return {boolean}
      */
     ResetImageLayout(): boolean;
 
@@ -3292,17 +3282,17 @@ interface WebTwain {
      * Sets the Source to return the current page to the input side of the document feeder and
      * feed the last page from the outside of the feeder back into the acquisition area if IfFeederEnabled is TRUE.
      * @method WebTwain#RewindPage
-     * @return {bool}
+     * @return {boolean}
      */
     RewindPage(): boolean;
-   
+
     /**
      * Rotates the image of a specified index in buffer by specified angle.
      * @method WebTwain#Rotate
      * @param {number} sImageIndex  specifies the index of image in buffer. The index is 0-based.
      * @param {number} fAngle  Specifies the rotation angle.
-     * @param {bool} bKeepSize Keep size or not.
-     * @return {bool}
+     * @param {boolean} bKeepSize Keep size or not.
+     * @return {boolean}
      */
     Rotate(sImageIndex: number, fAngle: number, bKeepSize: boolean): boolean;
 
@@ -3311,9 +3301,9 @@ interface WebTwain {
      * @method WebTwain#RotateEx
      * @param {number} sImageIndex  specifies the index of image in buffer. The index is 0-based.
      * @param {number} fAngle  Specifies the rotation angle.
-     * @param {bool} bKeepSize Keep size or not.
+     * @param {boolean} bKeepSize Keep size or not.
      * @param {EnumDWT_InterpolationMethod} newVal specifies the method to do interpolation.
-     * @return {bool}
+     * @return {boolean}
      */
     RotateEx(sImageIndex: number, fAngle: number, bKeepSize: boolean, newVal: EnumDWT_InterpolationMethod): boolean;
 
@@ -3321,7 +3311,7 @@ interface WebTwain {
      * Rotates the image of a specified index in buffer by 90 degrees counter-clockwise.
      * @method WebTwain#RotateLeft
      * @param {number} sImageIndex  specifies the index of image in buffer. The index is 0-based.
-     * @return {bool}
+     * @return {boolean}
      */
     RotateLeft(sImageIndex: number): boolean;
 
@@ -3329,7 +3319,7 @@ interface WebTwain {
      * Rotates the image of a specified index in buffer by 90 degrees clockwise.
      * @method WebTwain#RotateRight
      * @param {number} sImageIndex  specifies the index of image in buffer. The index is 0-based.
-     * @return {bool}
+     * @return {boolean}
      */
     RotateRight(sImageIndex: number): boolean;
 
@@ -3339,7 +3329,7 @@ interface WebTwain {
      * @param {string} localFile the name of the MultiPage TIFF file to be saved. It should be an absolute path on the local disk.
      * @param {function} optionalAsyncSuccessFunc optional. The function to call when the saving succeeds. Please refer to the function prototype OnSuccess.
      * @param {function} optionalAsyncFailureFunc optional. The function to call when the saving fails. Please refer to the function prototype OnFailure.
-     * @return {bool}
+     * @return {boolean}
      */
     SaveAllAsMultiPageTIFF(localFile: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
@@ -3349,7 +3339,7 @@ interface WebTwain {
      * @param {string} localFile the name of the Multi-Page PDF file to be saved. It should be an absolute path on the local disk.
      * @param {function} optionalAsyncSuccessFunc optional. The function to call when the saving succeeds. Please refer to the function prototype OnSuccess.
      * @param {function} optionalAsyncFailureFunc optional. The function to call when the saving fails. Please refer to the function prototype OnFailure.
-     * @return {bool}
+     * @return {boolean}
      */
     SaveAllAsPDF(localFile: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
@@ -3358,7 +3348,7 @@ interface WebTwain {
      * @method WebTwain#SaveAsBMP
      * @param {string} localFile the name of the BMP file to be saved. It should be an absolute path on the local disk.
      * @param {number} sImageIndex specifies the index of image in buffer. The index is 0-based.
-     * @return {bool}
+     * @return {boolean}
      */
     SaveAsBMP(localFile: string, sImageIndex: number, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
@@ -3371,7 +3361,7 @@ interface WebTwain {
      * @method WebTwain#SaveAsJPEG
      * @param {string} localFile the name of the JPEG file to be saved. It should be an absolute path on the local disk.
      * @param {number} sImageIndex specifies the index of image in buffer. The index is 0-based.
-     * @return {bool}
+     * @return {boolean}
      */
     SaveAsJPEG(localFile: string, sImageIndex: number, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
@@ -3380,7 +3370,7 @@ interface WebTwain {
      * @method WebTwain#SaveAsPDF
      * @param {string} localFile the name of the JPEG file to be saved. It should be an absolute path on the local disk.
      * @param {number} sImageIndex specifies the index of image in buffer. The index is 0-based.
-     * @return {bool}
+     * @return {boolean}
      */
     SaveAsPDF(localFile: string, sImageIndex: number, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
@@ -3389,7 +3379,7 @@ interface WebTwain {
      * @method WebTwain#SaveAsPNG
      * @param {string} localFile the name of the JPEG file to be saved. It should be an absolute path on the local disk.
      * @param {number} sImageIndex specifies the index of image in buffer. The index is 0-based.
-     * @return {bool}
+     * @return {boolean}
      */
     SaveAsPNG(localFile: string, sImageIndex: number, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
@@ -3398,7 +3388,7 @@ interface WebTwain {
      * @method WebTwain#SaveAsTIFF
      * @param {string} localFile the name of the JPEG file to be saved. It should be an absolute path on the local disk.
      * @param {number} sImageIndex specifies the index of image in buffer. The index is 0-based.
-     * @return {bool}
+     * @return {boolean}
      */
     SaveAsTIFF(localFile: string, sImageIndex: number, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
@@ -3408,7 +3398,7 @@ interface WebTwain {
      * @param {string} localFile  the name of the MultiPage PDF file to be saved. It should be an absolute path on the local disk.
      * @param {function} optionalAsyncSuccessFunc optional. The function to call when the saving succeeds. Please refer to the function prototype OnSuccess.
      * @param {function} optionalAsyncFailureFunc optional. The function to call when the saving fails. Please refer to the function prototype OnFailure.
-     * @return {bool}
+     * @return {boolean}
      */
     SaveSelectedImagesAsMultiPagePDF(localFile: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
@@ -3418,7 +3408,7 @@ interface WebTwain {
      * @param {string} localFile  the name of the MultiPage TIFF file to be saved. It should be an absolute path on the local disk.
      * @param {function} optionalAsyncSuccessFunc optional. The function to call when the saving succeeds. Please refer to the function prototype OnSuccess.
      * @param {function} optionalAsyncFailureFunc optional. The function to call when the saving fails. Please refer to the function prototype OnFailure.
-     * @return {bool}
+     * @return {boolean}
      */
     SaveSelectedImagesAsMultiPageTIFF(localFile: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
 
@@ -3427,7 +3417,7 @@ interface WebTwain {
      * @method WebTwain#SaveSelectedImagesToBase64Binary
      * @return {string|bool}
      */
-    SaveSelectedImagesToBase64Binary(optionalAsyncSuccessFunc?: (result:string[]) => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): string|boolean;
+    SaveSelectedImagesToBase64Binary(optionalAsyncSuccessFunc?: (result: string[]) => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): string | boolean;
 
     /**
      * [Deprecated.] Saves the selected images in buffer to a byte array in the specified file format.
@@ -3442,7 +3432,7 @@ interface WebTwain {
      * Brings up the TWAIN Data Source Manager's Source Selection User Interface (UI)
      * so that user can choose which Data Source to be the current Source.
      * @method WebTwain#SelectSource
-     * @return {bool}
+     * @return {boolean}
      */
     SelectSource(): boolean;
 
@@ -3450,7 +3440,7 @@ interface WebTwain {
      * Selects the index-the source in SourceNameItems property as the current source.
      * @method WebTwain#SelectSourceByIndex
      * @param {number} index It is the index of SourceNameItems property.
-     * @return {bool}
+     * @return {boolean}
      */
     SelectSourceByIndex(index: number): boolean;
 
@@ -3489,7 +3479,7 @@ interface WebTwain {
      * Sets custom DS data to be used for scanning, the input string is encoded with base64. Custom DS data means a specific scanning profile.
      * @method WebTwain#SetCustomDSDataEx
      * @param {string} value the input string which is encoded with base64.
-     * @return {bool}
+     * @return {boolean}
      */
     SetCustomDSDataEx(value: string): boolean;
 
@@ -3498,19 +3488,19 @@ interface WebTwain {
      * Sets custom DS data to be used for scanning, the data is stored in a file. Custom DS data means a specific scanning profile.
      * @method WebTwain#SetCustomDSData
      * @param {string} fileName the absolute path of the file where the custom data source data is stored.
-     * @return {bool}
+     * @return {boolean}
      */
     SetCustomDSData(fileName: string): boolean;
- 
+
     /**
      * Change the DPI (dots per inch) for the specified image.
      * @method WebTwain#SetDPI
      * @param {number} sImageIndex specifies the index of image in buffer. The index is 0-based.
      * @param {number} xResolution The horizontal resolution.
      * @param {number} yResolution The vertical resolution.
-     * @param {bool} bResampleImage Whether to resample the image. (The image size will be changed if this is set to true).
+     * @param {boolean} bResampleImage Whether to resample the image. (The image size will be changed if this is set to true).
      * @param {EnumDWT_InterpolationMethod} newVal specifies the method to do interpolation.
-     * @return {bool}
+     * @return {boolean}
      */
     SetDPI(sImageIndex: number, xResolution: number, yResolution: number, bResampleImage: boolean, newVal: EnumDWT_InterpolationMethod): boolean;
 
@@ -3519,7 +3509,7 @@ interface WebTwain {
      * @method WebTwain#SetFileXferInfo
      * @param {string} fileName the name of the file to be used in transfer.
      * @param {EnumDWT_FileFormat} fileFormat an enumerated value indicates the format of the image.
-     * @return {bool}
+     * @return {boolean}
      */
     SetFileXferInfo(fileName: string, fileFormat: EnumDWT_FileFormat): boolean;
 
@@ -3528,7 +3518,7 @@ interface WebTwain {
      * @method WebTwain#SetHTTPFormField
      * @param {string} FieldName specifies the name of a text field in web form.
      * @param {string} FieldValue specifies the value of a text field in web form.
-     * @return {bool}
+     * @return {boolean}
      */
     SetHTTPFormField(FieldName: string, FieldValue: string): boolean;
 
@@ -3537,7 +3527,7 @@ interface WebTwain {
      * @method WebTwain#SetHTTPHeader
      * @param {string} key the key of the header.
      * @param {string} value the value of the header.
-     * @return {bool}
+     * @return {boolean}
      */
     SetHTTPHeader(key: string, value: string): boolean;
 
@@ -3548,7 +3538,7 @@ interface WebTwain {
      * @param {number} top specifies the floating point number for the top side of the image layout rectangle.
      * @param {number} right specifies the floating point number for the right side of the image layout rectangle.
      * @param {number} bottom specifies the floating point number for the bottom side of the image layout rectangle.
-     * @return {bool}
+     * @return {boolean}
      */
     SetImageLayout(left: number, top: number, right: number, bottom: number): boolean;
 
@@ -3557,7 +3547,7 @@ interface WebTwain {
      * @method WebTwain#SetImageWidth
      * @param {number} sImageIndex  specifies which image you'd like to change.
      * @param {number} iNewWidth specifies how wide you'd like to change the image.
-     * @return {bool}
+     * @return {boolean}
      */
     SetImageWidth(sImageIndex: number, iNewWidth: number): boolean;
 
@@ -3565,7 +3555,7 @@ interface WebTwain {
      * Set the language for the authorization dialogs.
      * @method WebTwain#SetLanguage
      * @param {EnumDWT_Language} language  specify the language
-     * @return {bool}
+     * @return {boolean}
      */
     SetLanguage(language: EnumDWT_Language): boolean;
 
@@ -3573,7 +3563,7 @@ interface WebTwain {
      * Sets the time-out used to open a specified Data Source.
      * @method WebTwain#SetOpenSourceTimeout
      * @param {number} iMilliseconds specifies the number of milliseconds.
-     * @return {bool}
+     * @return {boolean}
      */
     SetOpenSourceTimeout(iMilliseconds: number): boolean;
 
@@ -3585,7 +3575,7 @@ interface WebTwain {
      * @param {number} top The Y axis of the top border.
      * @param {number} right The X axis of the right border.
      * @param {number} bottom The Y axis of the bottom border.
-     * @return {bool}
+     * @return {boolean}
      */
     SetSelectedImageArea(sImageIndex: number, left: number, top: number, right: number, bottom: number): boolean;
 
@@ -3597,14 +3587,14 @@ interface WebTwain {
      * @return {void}
      */
     SetSelectedImageIndex(selectedIndex: number, newVal: number): void;
-    
+
     /**
      * Sets a custom tiff tag. Currently you can set up to 32 tags. The string to be set in a tag can be encoded with base64.
      * @method WebTwain#SetTiffCustomTag
      * @param {number} tag specifies the tag identifier. The value should be between 600 and 700.
      * @param {string} content the string to be set for this tag. The string will be written to the .tiff file when you save/upload it. If the string is base64 encoded, we'll decode it before writing it.
-     * @param {bool} base64Str if you'd like to encode the string with base64, set this to true. Otherwise, the string will be plin text.
-     * @return {bool}
+     * @param {boolean} base64Str if you'd like to encode the string with base64, set this to true. Otherwise, the string will be plin text.
+     * @return {boolean}
      */
     SetTiffCustomTag(tag: number, content: string, base64Str: boolean): boolean;
 
@@ -3613,9 +3603,9 @@ interface WebTwain {
      * @method WebTwain#SetUploadSegment
      * @param {number} segmentUploadThreshold specifies the threshold (in MB) over which segmented upload will be invoked.
      * @param {number} moduleSize specifies the size of each segment (in KB).
-     * @return {bool}
+     * @return {boolean}
      */
-    SetUploadSegment (segmentUploadThreshold: number, moduleSize: number): boolean;
+    SetUploadSegment(segmentUploadThreshold: number, moduleSize: number): boolean;
 
     /**
      * Sets the view mode that images are displayed in Dynamic Web TWAIN. You can use this method to display multiple images in Dynamic Web TWAIN.
@@ -3625,26 +3615,26 @@ interface WebTwain {
      * @return {void}
      */
     SetViewMode(sHorizontalImageCount: number, sVerticalImageCount: number): void;
-    
+
     /**
      * Show save file dialog or show open file dialog.
      * @method WebTwain#ShowFileDialog
-     * @param {bool} SaveDialog True -- show save file dialog, False -- show open file dialog.
+     * @param {boolean} SaveDialog True -- show save file dialog, False -- show open file dialog.
      * @param {string} Filter The filter name specifies the filter pattern (for example, "*.TXT"). To specify multiple filter patterns for a single display string, use a semicolon to separate the patterns (for example, "*.TXT;*.DOC;*.BAK"). A pattern string can be a combination of valid file name characters and the asterisk (*) wildcard character. Do not include spaces in the pattern string. To retrieve a shortcut's target without filtering, use the string "All Files\0*.*\0\0", but the program will replace  "\0" with "|" automatically.
      * @param {number} FilterIndex The index of the currently selected filter in the File Types control. The buffer pointed to by Filter contains pairs of strings that define the filters. The index is 0-based.
      * @param {string} DefExtension Define the default extension. GetOpenFileName and GetSaveFileName append this extension to the file name only if the user fails to type an extension. If this member is NULL and the user fails to type an extension, no extension is appended.
      * @param {string} InitialDir The initial directory. The algorithm for selecting the initial directory varies on different platforms.
-     * @param {bool} AllowMultiSelect True -- allows users to select more than one file, False -- only allows to select one file.
-     * @param {bool} OverwritePrompt True -- If a file already exists with the same name, the old file will be simply overwritten, False -- not allows to save and overwrite a same name file.
+     * @param {boolean} AllowMultiSelect True -- allows users to select more than one file, False -- only allows to select one file.
+     * @param {boolean} OverwritePrompt True -- If a file already exists with the same name, the old file will be simply overwritten, False -- not allows to save and overwrite a same name file.
      * @param {number} Flags If this parameter equals 0, the program will be initiated with the default flags, otherwise initiated with the cumstom value and paramters "AllowMultiSelect" and "OverwritePrompt" will be useless.
-     * @return {bool}
+     * @return {boolean}
      */
     ShowFileDialog(SaveDialog: boolean, Filter: string, FilterIndex: number, DefExtension: string, InitialDir: string, AllowMultiSelect: boolean, OverwritePrompt: boolean, Flags: number): boolean;
 
     /**
      * Shows the GUI of Image Editor.
      * @method WebTwain#ShowImageEditor
-     * @return {bool}
+     * @return {boolean}
      */
     ShowImageEditor(): boolean;
 
@@ -3656,20 +3646,20 @@ interface WebTwain {
      * @param {number} cx specifies the width of the window.
      * @param {number} cy specifies the height of the window.
      * @param {number} nCmdShow specifices how the window should be shown.
-     * @return {bool}
+     * @return {boolean}
      */
     ShowImageEditorEx(x: number, y: number, cx: number, cy: number, nCmdShow: number): boolean;
 
     /*ingored    
     SourceNameItems
     */
-    
+
     /**
      * Switchs two images of specified indices in buffer.
      * @method WebTwain#SwitchImage
      * @param {number} sImageIndex1 specifies the index of image in buffer. The index is 0-based.
      * @param {number} sImageIndex2 specifies the index of image in buffer. The index is 0-based.
-     * @return {bool}
+     * @return {boolean}
      */
     SwitchImage(sImageIndex1: number, sImageIndex2: number): boolean;
 
@@ -3678,7 +3668,7 @@ interface WebTwain {
      * @method WebTwain#UnregisterEvent
      * @param {string} name the name of the event.
      * @param {object} evt specified the function to be unbound.
-     * @return {bool}
+     * @return {boolean}
      */
     UnregisterEvent(name: string, evt: object): boolean;
 
@@ -3694,4 +3684,4 @@ interface WebTwain {
 
     ...other internal ones
     */
-   }
+}

From 5e48bc7dcd71a91a94be913280efe4b00828e673 Mon Sep 17 00:00:00 2001
From: Bleser <bleser92@gmail.com>
Date: Tue, 20 Mar 2018 16:04:55 +0500
Subject: [PATCH 0692/1382] Added type definition for function "pdf()" with
 buffer in callback.

---
 types/nightmare/index.d.ts         | 1 +
 types/nightmare/nightmare-tests.ts | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/types/nightmare/index.d.ts b/types/nightmare/index.d.ts
index 7be47c2d30..f3895b90c0 100644
--- a/types/nightmare/index.d.ts
+++ b/types/nightmare/index.d.ts
@@ -107,6 +107,7 @@ declare class Nightmare {
     html(path: string, saveType: 'MHTML'): Nightmare;
     pdf(path: string): Nightmare;
     pdf(path: string, options: Object): Nightmare;
+    pdf(cd:(err:Error, data:Buffer)=>void): Nightmare;
     title(): string;
     title(cb: (title: string) => void): Nightmare;
     url(cb: (url: string) => void): Nightmare;
diff --git a/types/nightmare/nightmare-tests.ts b/types/nightmare/nightmare-tests.ts
index 1dfe655c94..65391e8ef9 100644
--- a/types/nightmare/nightmare-tests.ts
+++ b/types/nightmare/nightmare-tests.ts
@@ -189,6 +189,14 @@ new Nightmare()
   .pdf('test/test.pdf')
   .run(done);
 
+new Nightmare()
+  .goto("http://yahoo.com")
+  .pdf((err,data)=>{
+    console.log(Buffer.isBuffer(data))
+  })
+  .run(done)
+
+
 new Nightmare()
   .goto('http://www.google.com/')
   .wait('input')

From 96b71e75cdba7b4aeb17daf4a3500d20223ef1b2 Mon Sep 17 00:00:00 2001
From: Bleser <bleser92@gmail.com>
Date: Tue, 20 Mar 2018 16:09:10 +0500
Subject: [PATCH 0693/1382] Correction

---
 types/nightmare/index.d.ts         | 2 +-
 types/nightmare/nightmare-tests.ts | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/types/nightmare/index.d.ts b/types/nightmare/index.d.ts
index f3895b90c0..bb21444d88 100644
--- a/types/nightmare/index.d.ts
+++ b/types/nightmare/index.d.ts
@@ -107,7 +107,7 @@ declare class Nightmare {
     html(path: string, saveType: 'MHTML'): Nightmare;
     pdf(path: string): Nightmare;
     pdf(path: string, options: Object): Nightmare;
-    pdf(cd:(err:Error, data:Buffer)=>void): Nightmare;
+    pdf(cb: (err: Error, data: Buffer) => void): Nightmare;
     title(): string;
     title(cb: (title: string) => void): Nightmare;
     url(cb: (url: string) => void): Nightmare;
diff --git a/types/nightmare/nightmare-tests.ts b/types/nightmare/nightmare-tests.ts
index 65391e8ef9..81790dda5f 100644
--- a/types/nightmare/nightmare-tests.ts
+++ b/types/nightmare/nightmare-tests.ts
@@ -196,7 +196,6 @@ new Nightmare()
   })
   .run(done)
 
-
 new Nightmare()
   .goto('http://www.google.com/')
   .wait('input')

From 857aabbfae57337c55cf7efef3df3627522bd098 Mon Sep 17 00:00:00 2001
From: Jan Lohage <git@j2L4e.de>
Date: Sat, 27 Jan 2018 20:34:11 +0100
Subject: [PATCH 0694/1382] [@feathersjs] add @feathersjs/socket-commons import
 to @feathersjs/socketio and @feathersjs/primus packages

---
 types/feathersjs__primus/index.d.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/types/feathersjs__primus/index.d.ts b/types/feathersjs__primus/index.d.ts
index 5d93843822..1012be54e4 100644
--- a/types/feathersjs__primus/index.d.ts
+++ b/types/feathersjs__primus/index.d.ts
@@ -6,5 +6,7 @@
 
 /// <reference types="feathersjs__socket-commons"/>
 
+/// <reference types="feathersjs__socket-commons"/>
+
 // primus removed its typings from the repo https://github.com/primus/primus/pull/623, as of 01/2018 there are none on DT
 export default function feathersPrimus(options: any, callback?: (primus: any) => void): () => void;

From eedbe4b77476b6cf33771f1ec6e3648a13cbf9b6 Mon Sep 17 00:00:00 2001
From: Jan Lohage <git@j2L4e.de>
Date: Sat, 27 Jan 2018 20:38:08 +0100
Subject: [PATCH 0695/1382] [@feathersjs] really fix ts version in
 @feathersjs/socketio and @feathersjs/primus packages

---
 types/feathersjs__primus/index.d.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/types/feathersjs__primus/index.d.ts b/types/feathersjs__primus/index.d.ts
index 1012be54e4..5d93843822 100644
--- a/types/feathersjs__primus/index.d.ts
+++ b/types/feathersjs__primus/index.d.ts
@@ -6,7 +6,5 @@
 
 /// <reference types="feathersjs__socket-commons"/>
 
-/// <reference types="feathersjs__socket-commons"/>
-
 // primus removed its typings from the repo https://github.com/primus/primus/pull/623, as of 01/2018 there are none on DT
 export default function feathersPrimus(options: any, callback?: (primus: any) => void): () => void;

From 39f4c4ccee47af000fefbe166bb409ae308cb034 Mon Sep 17 00:00:00 2001
From: Jan Lohage <git@j2L4e.de>
Date: Tue, 20 Mar 2018 13:05:44 +0100
Subject: [PATCH 0696/1382] @feathersjs/multiple

correctly type behavior of combined commonJS and ES module default exports `module.exports.default = module.exports`
---
 types/feathersjs__authentication-client/index.d.ts | 4 +++-
 types/feathersjs__authentication-jwt/index.d.ts    | 4 +++-
 types/feathersjs__authentication-local/index.d.ts  | 4 +++-
 types/feathersjs__authentication-oauth1/index.d.ts | 4 +++-
 types/feathersjs__authentication-oauth2/index.d.ts | 4 +++-
 types/feathersjs__authentication/index.d.ts        | 4 +++-
 types/feathersjs__express/index.d.ts               | 4 +++-
 types/feathersjs__feathers/index.d.ts              | 4 +++-
 8 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/types/feathersjs__authentication-client/index.d.ts b/types/feathersjs__authentication-client/index.d.ts
index 04275eb93c..9d1972bebc 100644
--- a/types/feathersjs__authentication-client/index.d.ts
+++ b/types/feathersjs__authentication-client/index.d.ts
@@ -3,8 +3,10 @@
 // Definitions by: Abraao Alves <https://github.com/AbraaoAlves>, Jan Lohage <https://github.com/j2L4e>
 // Definitions: https://github.com/feathersjs-ecosystem/feathers-typescript
 // TypeScript Version: 2.3
+import * as self from '@feathersjs/authentication-client';
 
-export default function feathersAuthClient(config?: FeathersAuthClientConfig): () => void;
+declare const feathersAuthClient: ((config?: FeathersAuthClientConfig) => () => void) & typeof self;
+export default feathersAuthClient;
 
 export interface FeathersAuthClientConfig {
     storage?: Storage;
diff --git a/types/feathersjs__authentication-jwt/index.d.ts b/types/feathersjs__authentication-jwt/index.d.ts
index b55adeed46..ab6a7f6dbe 100644
--- a/types/feathersjs__authentication-jwt/index.d.ts
+++ b/types/feathersjs__authentication-jwt/index.d.ts
@@ -6,8 +6,10 @@
 
 import { Application } from '@feathersjs/feathers';
 import { Request } from 'express';
+import * as self from '@feathersjs/authentication-jwt';
 
-export default function feathersAuthenticationJwt(options?: FeathersAuthenticationJWTOptions): () => void;
+declare const feathersAuthenticationJwt: ((options?: FeathersAuthenticationJWTOptions) => () => void) & typeof self;
+export default feathersAuthenticationJwt;
 
 export interface FeathersAuthenticationJWTOptions {
     /**
diff --git a/types/feathersjs__authentication-local/index.d.ts b/types/feathersjs__authentication-local/index.d.ts
index e935419263..e15b101258 100644
--- a/types/feathersjs__authentication-local/index.d.ts
+++ b/types/feathersjs__authentication-local/index.d.ts
@@ -10,8 +10,10 @@ import {
     Paginated
 } from '@feathersjs/feathers';
 import { Request } from 'express';
+import * as self from '@feathersjs/authentication-local';
 
-export default function feathersAuthenticationLocal(options?: FeathersAuthenticationLocalOptions): () => void;
+declare const feathersAuthenticationLocal: ((options?: FeathersAuthenticationLocalOptions) => () => void) & typeof self;
+export default feathersAuthenticationLocal;
 
 export interface FeathersAuthenticationLocalOptions {
     /**
diff --git a/types/feathersjs__authentication-oauth1/index.d.ts b/types/feathersjs__authentication-oauth1/index.d.ts
index eee59fd64a..fa993c1cd0 100644
--- a/types/feathersjs__authentication-oauth1/index.d.ts
+++ b/types/feathersjs__authentication-oauth1/index.d.ts
@@ -9,8 +9,10 @@ import {
     Paginated
 } from '@feathersjs/feathers';
 import { Request } from 'express';
+import * as self from '@feathersjs/authentication-oauth1';
 
-export default function feathersAuthenticationOAuth1(options?: FeathersAuthenticationOAuth1Options): () => void;
+declare const feathersAuthenticationOAuth1: ((options?: FeathersAuthenticationOAuth1Options) => () => void) & typeof self;
+export default feathersAuthenticationOAuth1;
 
 export interface FeathersAuthenticationOAuth1Options {
     /**
diff --git a/types/feathersjs__authentication-oauth2/index.d.ts b/types/feathersjs__authentication-oauth2/index.d.ts
index fbce7514cd..3037c1c47a 100644
--- a/types/feathersjs__authentication-oauth2/index.d.ts
+++ b/types/feathersjs__authentication-oauth2/index.d.ts
@@ -9,8 +9,10 @@ import {
     Paginated
 } from '@feathersjs/feathers';
 import { Request } from 'express';
+import * as self from '@feathersjs/authentication-oauth2';
 
-export default function feathersAuthenticationOAuth2(options?: FeathersAuthenticationOAuth2Options): () => void;
+declare const feathersAuthenticationOAuth2: ((options?: FeathersAuthenticationOAuth2Options) => () => void) & typeof self;
+export default feathersAuthenticationOAuth2;
 
 export interface FeathersAuthenticationOAuth2Options {
     /**
diff --git a/types/feathersjs__authentication/index.d.ts b/types/feathersjs__authentication/index.d.ts
index 3a4722f12e..f451b0deda 100644
--- a/types/feathersjs__authentication/index.d.ts
+++ b/types/feathersjs__authentication/index.d.ts
@@ -4,8 +4,10 @@
 // Definitions: https://github.com/feathersjs-ecosystem/feathers-typescript
 
 import { Hook } from '@feathersjs/feathers';
+import * as self from '@feathersjs/authentication';
 
-export default function feathersAuthentication(config?: FeathersAuthenticationOptions): () => void;
+declare const feathersAuthentication: ((config?: FeathersAuthenticationOptions) => () => void) & typeof self;
+export default feathersAuthentication;
 
 export const hooks: AuthHooks.Hooks;
 
diff --git a/types/feathersjs__express/index.d.ts b/types/feathersjs__express/index.d.ts
index f50203432f..693e863989 100644
--- a/types/feathersjs__express/index.d.ts
+++ b/types/feathersjs__express/index.d.ts
@@ -6,8 +6,10 @@
 
 import { Application as FeathersApplication } from '@feathersjs/feathers';
 import * as express from 'express';
+import * as self from '@feathersjs/express';
 
-export default function feathersExpress<T>(app: FeathersApplication<T>): Application<T>;
+declare const feathersExpress: (<T>(app: FeathersApplication<T>) => Application<T>) & typeof self;
+export default feathersExpress;
 export type Application<T> = express.Application & FeathersApplication<T>;
 
 export function errorHandler(options?: any): express.ErrorRequestHandler;
diff --git a/types/feathersjs__feathers/index.d.ts b/types/feathersjs__feathers/index.d.ts
index 6ae7b22238..c0fa3d9946 100644
--- a/types/feathersjs__feathers/index.d.ts
+++ b/types/feathersjs__feathers/index.d.ts
@@ -8,8 +8,10 @@
 /// <reference types="node" />
 
 import { EventEmitter } from 'events';
+import * as self from '@feathersjs/feathers';
 
-export default function feathers(): Application<object>;
+declare const feathers: (() => Application<object>) & typeof self;
+export default feathers;
 
 export const version: string;
 

From 9fb3b602b102351d49fb442a4ad6e799118c88ed Mon Sep 17 00:00:00 2001
From: Menushka Weeratunga <menushka@taplane.com>
Date: Tue, 20 Mar 2018 08:32:07 -0400
Subject: [PATCH 0697/1382] Added types for node-pushnotifications

---
 types/node-pushnotifications/index.d.ts       | 170 ++++++++++++++++++
 .../node-pushnotifications-tests.ts           |  51 ++++++
 types/node-pushnotifications/tsconfig.json    |  22 +++
 types/node-pushnotifications/tslint.json      |   1 +
 4 files changed, 244 insertions(+)
 create mode 100644 types/node-pushnotifications/index.d.ts
 create mode 100644 types/node-pushnotifications/node-pushnotifications-tests.ts
 create mode 100644 types/node-pushnotifications/tsconfig.json
 create mode 100644 types/node-pushnotifications/tslint.json

diff --git a/types/node-pushnotifications/index.d.ts b/types/node-pushnotifications/index.d.ts
new file mode 100644
index 0000000000..fbb11eac3b
--- /dev/null
+++ b/types/node-pushnotifications/index.d.ts
@@ -0,0 +1,170 @@
+// Type definitions for node-pushnotifications 1.0
+// Project: https://github.com/appfeel/node-pushnotifications
+// Definitions by: Menushka Weeratunga <https://github.com/menushka>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare class PushNotifications {
+    constructor(settings: PushNotifications.ISettings);
+
+    setOptions(opts: PushNotifications.ISettings): void;
+    sendWith(method: PushNotifications.IPushMethod, regIds: string[], data: PushNotifications.IData, cb: PushNotifications.ICallback): void;
+    send(registrationIds: string[], data: PushNotifications.IData, cb: PushNotifications.ICallback): void;
+    send(registrationIds: string[], data: PushNotifications.IData): Promise<any>;
+}
+
+declare module PushNotifications {
+    interface ISettings {
+        /** Google Cloud Messaging  */
+        gcm?: {
+            /** GCM or FCM token */
+            id?: string
+        },
+        /** Apple Push Notifications */
+        apn?: {
+            /** APN Token */
+            token?: {
+                /** The filename of the provider token key (as supplied by Apple) to load from disk, or a Buffer/String containing the key data. */
+                key?: Buffer | string,
+                /** The ID of the key issued by Apple */
+                keyId?: string,
+                /** ID of the team associated with the provider token key */
+                teamId?: string
+            }
+            /** The filename of the connection certificate to load from disk, or a Buffer/String containing the certificate data. */
+            cert?: string,
+            /** The filename of the connection key to load from disk, or a Buffer/String containing the key data.  */
+            key?: string,
+            /**  An array of trusted certificates. Each element should contain either a filename to load, or a Buffer/String (in PEM format) to be used directly. If this is omitted several well known "root" CAs will be used. - You may need to use this as some environments don't include the CA used by Apple (entrust_2048). */
+            ca?: (Buffer | string)[],
+            /** File path for private key, certificate and CA certs in PFX or PKCS12 format, or a Buffer containing the PFX data. If supplied will always be used instead of certificate and key above. */
+            pfx?: Buffer | string,
+            /** The passphrase for the connection key, if required */
+            passphrase?: string,
+            productionv?: boolean,
+            voip?: boolean,
+            address?: string,
+            port?: number,
+            rejectUnauthorized?: boolean,
+            connectionRetryLimit?: number,
+    
+            cacheLength?: number,
+            connectionTimeout?: number,
+            autoAdjustCache?: boolean,
+            maxConnections?: number,
+            minConnections?: number,
+            connectTimeout?: number,
+            buffersNotifications?: boolean,
+            fastMode?: boolean,
+            disableNagle?: boolean,
+            disableEPIPEFix?: boolean
+        },
+        /** Amazon Device Messaging */
+        adm?: {
+            client_id?: string,
+            client_secret?: string
+        },
+        /** Windows Push Notifications */
+        wns?: {
+            client_id?: string,
+            client_secret?: string,
+            accessToken?: string,
+            headers?: string,
+            notificationMethod?: string
+        },
+        /** Microsoft Push Notification Service */
+        mpns?: {
+            options?: {
+                client_id?: string,
+                client_secret?: string
+            }
+        }
+    }
+    
+    interface IData {
+        /** REQUIRED */
+        title: string,
+        /** REQUIRED */
+        body: string,
+        custom?: {
+            sender?: string,
+        },
+        /** gcm, apn. Supported values are 'high' or 'normal' (gcm). Will be translated to 10 and 5 for apn. Defaults to 'high' */
+        priority?: string,
+        /** gcm for android, used as collapseId in apn */
+        collapseKey?: string,
+        /** gcm for android */
+        contentAvailable?: boolean | string,
+        /** gcm for android */
+        delayWhileIdle?: boolean,
+        /** gcm for android */
+        restrictedPackageName?: string,
+        /** gcm for android */
+        dryRun?: boolean,
+        /** gcm for android */
+        icon?: string,
+        /** gcm for android */
+        tag?: string,
+        /** gcm for android */
+        color?: string,
+        /** gcm for android. In ios, category will be used if not supplied */
+        clickAction?: string,
+        /** gcm, apn */
+        locKey?: string,
+        /** gcm, apn */
+        bodyLocArgs?: string,
+        /** gcm, apn */
+        titleLocKey?: string,
+        /** gcm, apn */
+        titleLocArgs?: string,
+        /** gcm, apn */
+        retries?: number,
+        /** apn */
+        encoding?: string,
+        /** gcm for ios, apn */
+        badge?: number,
+        /** gcm, apn */
+        sound?: string,
+        /** apn, will take precedence over title and body. It is also accepted a text message in alert */
+        alert?: {} | string,
+        /** apn and gcm for ios */
+        launchImage?: string,
+        /** apn and gcm for ios */
+        action?: string,
+        /** apn and gcm for ios */
+        topic?: string,
+        /** apn and gcm for ios */
+        category?: string,
+        /** apn and gcm for ios */
+        mdm?: string,
+        /** apn and gcm for ios */
+        urlArgs?: string,
+        /** apn and gcm for ios */
+        truncateAtWordEnd?: boolean,
+        /** apn */
+        mutableContent?: number,
+        /** seconds */
+        expiry?: number,
+        /** if both expiry and timeToLive are given, expiry will take precedency */
+        timeToLive?: number,
+        /** wns */
+        headers?: string[],
+        /** wns */
+        launch?: string,
+        /** wns */
+        duration?: string,
+        /** ADM */
+        consolidationKey?: string
+    }
+    
+    interface IPushMethod {
+        (regIds: string[], data: IData, settings: ISettings): void
+    }
+    
+    interface ICallback {
+        (err: any, result: any): void
+    }
+}
+
+declare module 'node-pushnotifications' {
+    export = PushNotifications;
+}
\ No newline at end of file
diff --git a/types/node-pushnotifications/node-pushnotifications-tests.ts b/types/node-pushnotifications/node-pushnotifications-tests.ts
new file mode 100644
index 0000000000..2d815a21dc
--- /dev/null
+++ b/types/node-pushnotifications/node-pushnotifications-tests.ts
@@ -0,0 +1,51 @@
+import * as PushNotifications from "node-pushnotifications";
+
+const settings = {
+    gcm: {
+        id: "null"
+    },
+    apn: {
+        token: {
+            key: './certs/key.p8',
+            keyId: 'ABCD',
+            teamId: 'EFGH',
+        }
+    },
+    adm: {
+        client_id: "null",
+        client_secret: "null"
+    },
+    wns: {
+        client_id: "null",
+        client_secret: "null",
+        notificationMethod: 'sendTileSquareBlock',
+    }
+};
+const push = new PushNotifications(settings);
+
+const registrationIds = [];
+registrationIds.push('INSERT_YOUR_DEVICE_ID');
+registrationIds.push('INSERT_OTHER_DEVICE_ID');
+
+const data = {
+    title: 'New push notification',
+    body: 'Powered by AppFeel'
+};
+
+// You can use it in node callback style
+push.send(registrationIds, data, (err, result) => {
+    if (err) {
+        console.log(err);
+    } else {
+        console.log(result);
+    }
+});
+
+// Or you could use it as a promise:
+push.send(registrationIds, data)
+    .then((results) => {
+        console.log(results);
+    })
+    .catch((err) => {
+        console.log(err);
+    });
diff --git a/types/node-pushnotifications/tsconfig.json b/types/node-pushnotifications/tsconfig.json
new file mode 100644
index 0000000000..bbd908bcdb
--- /dev/null
+++ b/types/node-pushnotifications/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": ["node"],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "node-pushnotifications-tests.ts"
+    ]
+}
diff --git a/types/node-pushnotifications/tslint.json b/types/node-pushnotifications/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/node-pushnotifications/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From f5ea088bc38031ce40b3258a91fd54a0e377db87 Mon Sep 17 00:00:00 2001
From: RodrigoAWeber <rodrigoantonioweber@hotmail.com>
Date: Tue, 20 Mar 2018 09:48:34 -0300
Subject: [PATCH 0698/1382] Add typings for react-native-text-input-mask

---
 types/react-native-text-input-mask/index.d.ts | 20 +++++++++++++++
 .../react-native-text-input-mask-tests.tsx    | 16 ++++++++++++
 .../tsconfig.json                             | 25 +++++++++++++++++++
 .../react-native-text-input-mask/tslint.json  |  1 +
 4 files changed, 62 insertions(+)
 create mode 100644 types/react-native-text-input-mask/index.d.ts
 create mode 100644 types/react-native-text-input-mask/react-native-text-input-mask-tests.tsx
 create mode 100644 types/react-native-text-input-mask/tsconfig.json
 create mode 100644 types/react-native-text-input-mask/tslint.json

diff --git a/types/react-native-text-input-mask/index.d.ts b/types/react-native-text-input-mask/index.d.ts
new file mode 100644
index 0000000000..e95e68d7f7
--- /dev/null
+++ b/types/react-native-text-input-mask/index.d.ts
@@ -0,0 +1,20 @@
+// Type definitions for react-native-text-input-mask 0.7
+// Project: https://github.com/react-native-community/react-native-text-input-mask
+// Definitions by: Rodrigo Weber <https://github.com/RodrigoAWeber>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+import * as React from "react";
+import * as ReactNative from "react-native";
+
+export type onChangeTextCallback = (formatted: string, extracted: string) => void;
+
+export interface TextInputMaskProps {
+    maskDefaultValue?: boolean;
+    mask: string;
+    value?: string;
+    onChangeText: onChangeTextCallback;
+    keyboardType?: 'default' | 'numeric' | 'email-address' | 'phone-pad';
+}
+
+export default class TextInputMask extends React.Component<TextInputMaskProps> { }
diff --git a/types/react-native-text-input-mask/react-native-text-input-mask-tests.tsx b/types/react-native-text-input-mask/react-native-text-input-mask-tests.tsx
new file mode 100644
index 0000000000..918a994e35
--- /dev/null
+++ b/types/react-native-text-input-mask/react-native-text-input-mask-tests.tsx
@@ -0,0 +1,16 @@
+import * as React from 'react';
+import TextInputMask from 'react-native-text-input-mask';
+
+class Example extends React.Component {
+	render() {
+		return (
+			<TextInputMask
+				onChangeText={(formatted, extracted) => {
+					console.log(formatted); // +1 (123) 456-78-90
+					console.log(extracted); // 1234567890
+				}}
+				mask={"+1 ([000]) [000] [00] [00]"}
+			/>
+		);
+	}
+}
diff --git a/types/react-native-text-input-mask/tsconfig.json b/types/react-native-text-input-mask/tsconfig.json
new file mode 100644
index 0000000000..c9b3f10fc3
--- /dev/null
+++ b/types/react-native-text-input-mask/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react"
+    },
+    "files": [
+        "index.d.ts",
+        "react-native-text-input-mask-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/types/react-native-text-input-mask/tslint.json b/types/react-native-text-input-mask/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-native-text-input-mask/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From fb2ce6d0737103ad6a09838bd6e26eaa20312c74 Mon Sep 17 00:00:00 2001
From: Alexander Christie <alexander@fundstack.com>
Date: Tue, 20 Mar 2018 15:26:46 +0000
Subject: [PATCH 0699/1382] Export the FilterQuery type

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

diff --git a/types/mongodb/index.d.ts b/types/mongodb/index.d.ts
index ba27943739..3d0ebf566d 100644
--- a/types/mongodb/index.d.ts
+++ b/types/mongodb/index.d.ts
@@ -7,6 +7,7 @@
 //                 Gaurav Lahoti <https://github.com/dante-101>
 //                 Mariano Cortesi <https://github.com/mcortesi>
 //                 Enrico Picci <https://github.com/EnricoPicci>
+//                 Alexander Christie <https://github.com/AJCStriker>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -636,7 +637,7 @@ export interface Collection<TSchema = Default> {
     watch(pipeline?: Object[], options?: ChangeStreamOptions & { session?: ClientSession }): ChangeStream;
 }
 
-type FilterQuery<T> = {
+export type FilterQuery<T> = {
     [P in keyof T]?: T[P] | {
         $eq?: T[P];
         $gt?: T[P];

From b017d84e6ac8fa41353e3a2dc0258f0e019a2c21 Mon Sep 17 00:00:00 2001
From: Gareth Parker <gareth.parker@century.tech>
Date: Tue, 20 Mar 2018 16:56:31 +0000
Subject: [PATCH 0700/1382] Created Glue project

---
 glue/hapi-glue-test.ts | 20 ++++++++++++++++++++
 glue/index.d.ts        | 35 +++++++++++++++++++++++++++++++++++
 glue/tsconfig.json     | 26 ++++++++++++++++++++++++++
 glue/tslint.json       |  7 +++++++
 4 files changed, 88 insertions(+)
 create mode 100644 glue/hapi-glue-test.ts
 create mode 100644 glue/index.d.ts
 create mode 100644 glue/tsconfig.json
 create mode 100644 glue/tslint.json

diff --git a/glue/hapi-glue-test.ts b/glue/hapi-glue-test.ts
new file mode 100644
index 0000000000..2d34fdb489
--- /dev/null
+++ b/glue/hapi-glue-test.ts
@@ -0,0 +1,20 @@
+import * as Glue from "glue";
+import * as Hapi from "hapi";
+
+const manifest: Glue.Manifest = {
+  server: {
+    port: 3000
+  },
+  register: {
+    plugins: [
+      {
+        plugin: "./test",
+        routes: {
+          prefix: "test"
+        }
+      }
+    ]
+  }
+}
+
+Glue.compose(manifest);
\ No newline at end of file
diff --git a/glue/index.d.ts b/glue/index.d.ts
new file mode 100644
index 0000000000..5f40ba924b
--- /dev/null
+++ b/glue/index.d.ts
@@ -0,0 +1,35 @@
+// Type definitions for glue
+// Project: https://github.com/hapijs/glue
+// Definitions by: Gareth Parker
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.7
+
+declare module "glue" {
+  
+  import { Server, ServerOptions } from "hapi";
+
+  export interface Options {
+    relativeTo: string;
+    preConnections?: (Server:Server, next:(err:any)=>void ) => void;
+    preRegister?: (Server:Server, next:(err:any)=>void ) => void;
+  }
+  
+  interface Plugin {
+    plugin: string | {
+        register:string;
+        options?:any;
+    };
+    options?: any;
+    routes?: any
+  }
+  
+  interface Manifest {
+    server: ServerOptions;
+    register?: {
+      plugins: Array<Plugin>
+    }
+  }
+  
+  export function compose(manifest: Manifest, options?: Options): Server;
+
+}
diff --git a/glue/tsconfig.json b/glue/tsconfig.json
new file mode 100644
index 0000000000..0aa40c6c06
--- /dev/null
+++ b/glue/tsconfig.json
@@ -0,0 +1,26 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "target": "es2017",
+    "lib": [
+        "es6"
+    ],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": true,
+    "strictFunctionTypes": false,
+    "baseUrl": "../",
+    "typeRoots": [
+        "../"
+    ],
+    "types": [],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true,
+    "experimentalDecorators": true,
+    "esModuleInterop": true
+  },
+  "files": [
+    "index.d.ts",
+    "hapi-glue-test.ts"
+  ]
+}
\ No newline at end of file
diff --git a/glue/tslint.json b/glue/tslint.json
new file mode 100644
index 0000000000..f84eea1584
--- /dev/null
+++ b/glue/tslint.json
@@ -0,0 +1,7 @@
+{
+  "extends": "dtslint/dt.json",
+  "rules": {
+      // This package uses the Function type, and it will take effort to fix.
+      "ban-types": false
+  }
+}
\ No newline at end of file

From 85764dcd2b63e8548b4e3beb429d4617d9e914b7 Mon Sep 17 00:00:00 2001
From: Nicolas Graziano <nicolas.graziano@engie.com>
Date: Tue, 20 Mar 2018 18:17:28 +0100
Subject: [PATCH 0701/1382] [express-jwt] Correct error in callback for secret.

Correct error for secret type in long callback.
Split the callbacks in two interfaces.

Add some test case.
---
 types/express-jwt/express-jwt-tests.ts | 21 ++++++++++++++++++++-
 types/express-jwt/index.d.ts           |  6 ++++--
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/types/express-jwt/express-jwt-tests.ts b/types/express-jwt/express-jwt-tests.ts
index 798818b728..9de759adb2 100644
--- a/types/express-jwt/express-jwt-tests.ts
+++ b/types/express-jwt/express-jwt-tests.ts
@@ -13,6 +13,25 @@ app.use(jwt({
     userProperty: 'auth'
 }));
 
+app.use(jwt({
+    secret: (req: express.Request,
+        payload: any,
+        done: (err: any, secret: string) => void) => {
+        done(null, 'shhhhhhared-secret');
+    },
+    userProperty: 'auth'
+}));
+
+app.use(jwt({
+    secret: (req: express.Request,
+        header: any,
+        payload: any,
+        done: (err: any, secret: string) => void) => {
+        done(null, 'shhhhhhared-secret');
+    },
+    userProperty: 'auth'
+}));
+
 var jwtCheck = jwt({
     secret: 'shhhhhhared-secret'
 });
@@ -28,4 +47,4 @@ app.use(function (err: any, req: express.Request, res: express.Response, next: e
     } else {
         next(err);
     }
-});
\ No newline at end of file
+});
diff --git a/types/express-jwt/index.d.ts b/types/express-jwt/index.d.ts
index de0a2dd337..33c1206254 100644
--- a/types/express-jwt/index.d.ts
+++ b/types/express-jwt/index.d.ts
@@ -12,8 +12,10 @@ export = jwt;
 declare function jwt(options: jwt.Options): jwt.RequestHandler;
 declare namespace jwt {
     export type secretType = string | Buffer
+    export interface SecretCallbackLong {
+        (req: express.Request, header: any, payload: any, done: (err: any, secret?: secretType) => void): void;
+    }
     export interface SecretCallback {
-        (req: express.Request, header: any, payload: any, done: (err: any, secret?: boolean) => void): void;
         (req: express.Request, payload: any, done: (err: any, secret?: secretType) => void): void;
     }
 
@@ -25,7 +27,7 @@ declare namespace jwt {
         (req: express.Request): any;
     }
     export interface Options {
-        secret: secretType | SecretCallback;
+        secret: secretType | SecretCallback | SecretCallbackLong;
         userProperty?: string;
         skip?: string[];
         credentialsRequired?: boolean;

From a08dc13b212d796cc3747ae30d0915cb858ef566 Mon Sep 17 00:00:00 2001
From: TristonJ <contact@tristonjones.com>
Date: Tue, 20 Mar 2018 10:33:26 -0700
Subject: [PATCH 0702/1382] [stellar-sdk] changeTrust limit should be optional

---
 types/stellar-sdk/index.d.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/stellar-sdk/index.d.ts b/types/stellar-sdk/index.d.ts
index 955360d3f0..b098ea0896 100644
--- a/types/stellar-sdk/index.d.ts
+++ b/types/stellar-sdk/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for stellar-sdk 0.8
 // Project: https://github.com/stellar/js-stellar-sdk
 // Definitions by: Carl Foster <https://github.com/carl-foster>
+//                 Triston Jones <https://github.com/tristonj>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
@@ -596,7 +597,7 @@ export namespace Operation {
     }
     interface ChangeTrustOptions {
         asset: Asset;
-        limit: string;
+        limit?: string;
         source?: string;
     }
     function changeTrust(options: ChangeTrustOptions): xdr.Operation<ChangeTrust>;

From 3460aa5ee6e087b573d97265590768dfb703d451 Mon Sep 17 00:00:00 2001
From: Sergei Dryganets <sergeyd@microsoft.com>
Date: Mon, 19 Mar 2018 23:55:16 -0700
Subject: [PATCH 0703/1382] react-native-sqlite-storage typings added. See:
 https://github.com/andpor/react-native-sqlite-storage

---
 types/react-native-sqlite-storage/index.d.ts  | 71 +++++++++++++++++++
 .../react-native-sqlite-storage-tests.ts      | 16 +++++
 .../react-native-sqlite-storage/tsconfig.json | 23 ++++++
 types/react-native-sqlite-storage/tslint.json |  1 +
 4 files changed, 111 insertions(+)
 create mode 100644 types/react-native-sqlite-storage/index.d.ts
 create mode 100644 types/react-native-sqlite-storage/react-native-sqlite-storage-tests.ts
 create mode 100644 types/react-native-sqlite-storage/tsconfig.json
 create mode 100644 types/react-native-sqlite-storage/tslint.json

diff --git a/types/react-native-sqlite-storage/index.d.ts b/types/react-native-sqlite-storage/index.d.ts
new file mode 100644
index 0000000000..d0691edb86
--- /dev/null
+++ b/types/react-native-sqlite-storage/index.d.ts
@@ -0,0 +1,71 @@
+// Type definitions for react-native-sqlite-storage 3.3
+// Project: https://github.com/andpor/react-native-sqlite-storage
+// Definitions by: Sergei Dryganets <https://github.com/dryganets>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+export function openDatabase(params: DatabaseParams, success?: () => void, error?: (e: SQLError) => void): SQLiteDatabase;
+export function deleteDatabase(params: DatabaseParams, success?: () => void, error?: (err: SQLError) => void): void;
+export type Location = 'default' | 'Library' | 'Documents';
+export interface DatabaseOptionalParams {
+    createFromLocation?: number | string;
+    // Database encryption pass phrase
+    key?: string;
+    readOnly?: boolean;
+}
+
+export interface DatabaseParams extends DatabaseOptionalParams {
+    name: string;
+    /**
+     * Affects iOS database file location
+     * 'default': Library/LocalDatabase subdirectory - NOT visible to iTunes and NOT backed up by iCloud
+     * 'Library': Library subdirectory - backed up by iCloud, NOT visible to iTunes
+     * 'Documents': Documents subdirectory - visible to iTunes and backed up by iCloud
+     */
+    location: Location;
+}
+
+export interface ResultSet {
+    insertId: number;
+    rowsAffected: number;
+    rows: ResultSetRowList;
+}
+
+export interface ResultSetRowList {
+    length: number;
+    item(index: number): any;
+}
+
+export enum SQLErrors {
+    UNKNOWN_ERR = 0,
+    DATABASE_ERR = 1,
+    VERSION_ERR = 2,
+    TOO_LARGE_ERR = 3,
+    QUOTA_ERR = 4,
+    SYNTAX_ERR = 5,
+    CONSTRAINT_ERR = 6,
+    TIMEOUT_ERR = 7
+}
+
+export interface SQLError {
+    code: number;
+    message: string;
+}
+
+export type StatementCallback = (transaction: Transaction, resultSet: ResultSet) => void;
+export type StatementErrorCallback = (transaction: Transaction, error: SQLError) => void;
+export interface Transaction {
+    executeSql(sqlStatement: string, arguments?: any[], callback?: StatementCallback, errorCallback?: StatementErrorCallback): void;
+}
+
+export type TransactionCallback = (transaction: Transaction) => void;
+export type TransactionErrorCallback = (error: SQLError) => void;
+
+export interface SQLiteDatabase {
+    transaction(scope: (tx: Transaction) => void, error?: TransactionErrorCallback, success?: TransactionCallback): void;
+    readTransaction(scope: (tx: Transaction) => void, error?: TransactionErrorCallback, success?: TransactionCallback): void;
+    close(success: () => void, error: (err: SQLError) => void): void;
+    executeSql(statement: string, params?: any[], success?: StatementCallback, error?: StatementErrorCallback): void;
+    attach(nameToAttach: string, alias: string, success?: () => void, error?: (err: SQLError) => void): void;
+    dettach(alias: string, success?: () => void, error?: (err: SQLError) => void): void;
+}
diff --git a/types/react-native-sqlite-storage/react-native-sqlite-storage-tests.ts b/types/react-native-sqlite-storage/react-native-sqlite-storage-tests.ts
new file mode 100644
index 0000000000..76451cfe32
--- /dev/null
+++ b/types/react-native-sqlite-storage/react-native-sqlite-storage-tests.ts
@@ -0,0 +1,16 @@
+import * as sqlite from 'react-native-sqlite-storage';
+
+const db = sqlite.openDatabase({name: 'test.db', location: 'default'}, () => {
+    db.transaction((tx) => {
+        tx.executeSql('SELECT * FROM Employees a, Departments b WHERE a.department = b.department_id', [], (tx, results) => {
+            // Get rows with Web SQL Database spec compliance.
+            const len = results.rows.length;
+            for (let i = 0; i < len; i++) {
+              const row = results.rows.item(i);
+              const log = `Employee name: ${row.name}, Dept Name: ${row.deptName}`;
+            }
+          });
+      });
+}, (err) => {
+    // log error
+});
diff --git a/types/react-native-sqlite-storage/tsconfig.json b/types/react-native-sqlite-storage/tsconfig.json
new file mode 100644
index 0000000000..9039a8e62b
--- /dev/null
+++ b/types/react-native-sqlite-storage/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-native-sqlite-storage-tests.ts"
+    ]
+}
diff --git a/types/react-native-sqlite-storage/tslint.json b/types/react-native-sqlite-storage/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-native-sqlite-storage/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 117e46672d1053a9c4fbbe8fdc21cb83f9d0c1d4 Mon Sep 17 00:00:00 2001
From: Weeco <weeco91@gmail.com>
Date: Tue, 20 Mar 2018 19:31:37 +0100
Subject: [PATCH 0704/1382] Fixed a couple methods and types

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

diff --git a/types/bytebuffer/index.d.ts b/types/bytebuffer/index.d.ts
index 8456f28182..2f13957c3f 100644
--- a/types/bytebuffer/index.d.ts
+++ b/types/bytebuffer/index.d.ts
@@ -4,6 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // Definitions by: SINTEF-9012 <https://github.com/SINTEF-9012>
 
+/// <reference types="node" />
 import Long = require("long");
 
 declare namespace ByteBuffer {}
@@ -70,7 +71,7 @@ declare class ByteBuffer
     /**
      * Backing buffer.
      */
-    buffer: ArrayBuffer;
+    buffer: Buffer;
 
     /**
      * Absolute limit of the contained data. Set to the backing buffer's capacity upon allocation.
@@ -130,12 +131,12 @@ declare class ByteBuffer
     /**
      * Calculates the actual number of bytes required to store a 32bit base 128 variable-length integer.
      */
-    static calculateVariant32( value: number ): number;
+    static calculateVarint32( value: number ): number;
 
     /**
      * Calculates the actual number of bytes required to store a 64bit base 128 variable-length integer.
      */
-    static calculateVariant64( value: number | Long ): number;
+    static calculateVarint64( value: number | Long ): number;
 
     /**
      * Concatenates multiple ByteBuffers into one.
@@ -330,7 +331,7 @@ declare class ByteBuffer
     /**
      * Reads a length as uint32 prefixed UTF8 encoded string.
      */
-    readIString( offset?: number ): string;
+    readIString( offset?: number ): string | { string: string; length: number };
 
     /**
      * Reads a 32bit signed integer.This is an alias of ByteBuffer#readInt32.
@@ -375,7 +376,7 @@ declare class ByteBuffer
     /**
      * Reads an UTF8 encoded string.
      */
-    readUTF8String( chars: number, offset?: number ): string;
+    readUTF8String( chars: number, metrics?: number, offset?: number ): string | { string: string; length: number };
 
     /**
      * Reads a 16bit unsigned integer.

From 714de22bbac869a4e955c6b3487c21878a14b1bd Mon Sep 17 00:00:00 2001
From: Hoishin <hoishinxii@gmail.com>
Date: Wed, 21 Mar 2018 04:14:46 +0900
Subject: [PATCH 0705/1382] add types for strict-uri-encode

---
 types/strict-uri-encode/index.d.ts            |  8 +++++++
 .../strict-uri-encode-tests.ts                |  7 ++++++
 types/strict-uri-encode/tsconfig.json         | 23 +++++++++++++++++++
 types/strict-uri-encode/tslint.json           |  1 +
 4 files changed, 39 insertions(+)
 create mode 100644 types/strict-uri-encode/index.d.ts
 create mode 100644 types/strict-uri-encode/strict-uri-encode-tests.ts
 create mode 100644 types/strict-uri-encode/tsconfig.json
 create mode 100644 types/strict-uri-encode/tslint.json

diff --git a/types/strict-uri-encode/index.d.ts b/types/strict-uri-encode/index.d.ts
new file mode 100644
index 0000000000..3c1fbb81af
--- /dev/null
+++ b/types/strict-uri-encode/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for strict-uri-encode 2.0
+// Project: https://github.com/kevva/strict-uri-encode#readme
+// Definitions by: Keiichiro Amemiya <https://github.com/hoishin>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = strict_uri_encode;
+
+declare function strict_uri_encode(str: string): string;
diff --git a/types/strict-uri-encode/strict-uri-encode-tests.ts b/types/strict-uri-encode/strict-uri-encode-tests.ts
new file mode 100644
index 0000000000..7ce3939765
--- /dev/null
+++ b/types/strict-uri-encode/strict-uri-encode-tests.ts
@@ -0,0 +1,7 @@
+import strictUriEncode = require('strict-uri-encode');
+
+// $ExpectType string
+strictUriEncode('!#$@*()jsjs');
+
+// $ExpectError
+strictUriEncode([12, 23]);
diff --git a/types/strict-uri-encode/tsconfig.json b/types/strict-uri-encode/tsconfig.json
new file mode 100644
index 0000000000..72b2cde06b
--- /dev/null
+++ b/types/strict-uri-encode/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": true
+    },
+    "files": [
+        "index.d.ts",
+        "strict-uri-encode-tests.ts"
+    ]
+}
diff --git a/types/strict-uri-encode/tslint.json b/types/strict-uri-encode/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/strict-uri-encode/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 2fe16d8d8186e72761ca0f4d06adf31d36391837 Mon Sep 17 00:00:00 2001
From: Menushka Weeratunga <menushka@taplane.com>
Date: Tue, 20 Mar 2018 15:38:15 -0400
Subject: [PATCH 0706/1382] Changes to pass `npm test`

---
 types/node-pushnotifications/index.d.ts       | 224 +++++++++---------
 .../node-pushnotifications-tests.ts           |   2 +-
 types/node-pushnotifications/tsconfig.json    |   3 +-
 3 files changed, 120 insertions(+), 109 deletions(-)

diff --git a/types/node-pushnotifications/index.d.ts b/types/node-pushnotifications/index.d.ts
index fbb11eac3b..2134069936 100644
--- a/types/node-pushnotifications/index.d.ts
+++ b/types/node-pushnotifications/index.d.ts
@@ -3,168 +3,178 @@
 // Definitions by: Menushka Weeratunga <https://github.com/menushka>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare class PushNotifications {
-    constructor(settings: PushNotifications.ISettings);
+// TypeScript Version: 2.1
+/// <reference types="node" />
 
-    setOptions(opts: PushNotifications.ISettings): void;
-    sendWith(method: PushNotifications.IPushMethod, regIds: string[], data: PushNotifications.IData, cb: PushNotifications.ICallback): void;
-    send(registrationIds: string[], data: PushNotifications.IData, cb: PushNotifications.ICallback): void;
-    send(registrationIds: string[], data: PushNotifications.IData): Promise<any>;
+export = PushNotifications;
+
+declare class PushNotifications {
+    constructor(settings: PushNotifications.Settings);
+
+    setOptions(opts: PushNotifications.Settings): void;
+    sendWith(method: PushNotifications.PushMethod, regIds: string[], data: PushNotifications.Data, cb: PushNotifications.Callback): void;
+    send(registrationIds: string[], data: PushNotifications.Data, cb: PushNotifications.Callback): void;
+    send(registrationIds: string[], data: PushNotifications.Data): Promise<any>;
 }
 
-declare module PushNotifications {
-    interface ISettings {
+declare namespace PushNotifications {
+    interface Settings {
         /** Google Cloud Messaging  */
         gcm?: {
             /** GCM or FCM token */
-            id?: string
-        },
+            id?: string;
+        };
         /** Apple Push Notifications */
         apn?: {
             /** APN Token */
             token?: {
-                /** The filename of the provider token key (as supplied by Apple) to load from disk, or a Buffer/String containing the key data. */
-                key?: Buffer | string,
+                /**
+                 * The filename of the provider token key (as supplied by Apple) to load from disk, or a
+                 * Buffer/String containing the key data.
+                 */
+                key?: Buffer | string;
                 /** The ID of the key issued by Apple */
-                keyId?: string,
+                keyId?: string;
                 /** ID of the team associated with the provider token key */
-                teamId?: string
-            }
-            /** The filename of the connection certificate to load from disk, or a Buffer/String containing the certificate data. */
-            cert?: string,
-            /** The filename of the connection key to load from disk, or a Buffer/String containing the key data.  */
-            key?: string,
-            /**  An array of trusted certificates. Each element should contain either a filename to load, or a Buffer/String (in PEM format) to be used directly. If this is omitted several well known "root" CAs will be used. - You may need to use this as some environments don't include the CA used by Apple (entrust_2048). */
-            ca?: (Buffer | string)[],
-            /** File path for private key, certificate and CA certs in PFX or PKCS12 format, or a Buffer containing the PFX data. If supplied will always be used instead of certificate and key above. */
-            pfx?: Buffer | string,
+                teamId?: string;
+            };
+            /**
+             * The filename of the connection certificate to load from disk, or a Buffer/String containing the
+             * certificate data.
+             */
+            cert?: string;
+            /** The filename of the connection key to load from disk, or a Buffer or String containing the key data. */
+            key?: string;
+            /**
+             * An array of trusted certificates. Each element should contain either a filename to load, or a
+             * Buffer/String (in PEM format) to be used directly. If this is omitted several well known "root" CAs
+             * will be used. - You may need to use this as some environments don't include the CA used by
+             * Apple (entrust_2048).
+             */
+            ca?: Array<Buffer | string>;
+            /**
+             * File path for private key, certificate and CA certs in PFX or PKCS12 format, or a Buffer containing
+             * the PFX data. If supplied will always be used instead of certificate and key above.
+             */
+            pfx?: Buffer | string;
             /** The passphrase for the connection key, if required */
-            passphrase?: string,
-            productionv?: boolean,
-            voip?: boolean,
-            address?: string,
-            port?: number,
-            rejectUnauthorized?: boolean,
-            connectionRetryLimit?: number,
-    
-            cacheLength?: number,
-            connectionTimeout?: number,
-            autoAdjustCache?: boolean,
-            maxConnections?: number,
-            minConnections?: number,
-            connectTimeout?: number,
-            buffersNotifications?: boolean,
-            fastMode?: boolean,
-            disableNagle?: boolean,
-            disableEPIPEFix?: boolean
-        },
+            passphrase?: string;
+            productionv?: boolean;
+            voip?: boolean;
+            address?: string;
+            port?: number;
+            rejectUnauthorized?: boolean;
+            connectionRetryLimit?: number;
+            cacheLength?: number;
+            connectionTimeout?: number;
+            autoAdjustCache?: boolean;
+            maxConnections?: number;
+            minConnections?: number;
+            connectTimeout?: number;
+            buffersNotifications?: boolean;
+            fastMode?: boolean;
+            disableNagle?: boolean;
+            disableEPIPEFix?: boolean;
+        };
         /** Amazon Device Messaging */
         adm?: {
-            client_id?: string,
-            client_secret?: string
-        },
+            client_id?: string;
+            client_secret?: string;
+        };
         /** Windows Push Notifications */
         wns?: {
-            client_id?: string,
-            client_secret?: string,
-            accessToken?: string,
-            headers?: string,
-            notificationMethod?: string
-        },
+            client_id?: string;
+            client_secret?: string;
+            accessToken?: string;
+            headers?: string;
+            notificationMethod?: string;
+        };
         /** Microsoft Push Notification Service */
         mpns?: {
             options?: {
-                client_id?: string,
-                client_secret?: string
-            }
-        }
+                client_id?: string;
+                client_secret?: string;
+            };
+        };
     }
-    
-    interface IData {
+    interface Data {
         /** REQUIRED */
-        title: string,
+        title: string;
         /** REQUIRED */
-        body: string,
+        body: string;
         custom?: {
-            sender?: string,
-        },
-        /** gcm, apn. Supported values are 'high' or 'normal' (gcm). Will be translated to 10 and 5 for apn. Defaults to 'high' */
-        priority?: string,
+            sender?: string;
+        };
+        /**
+         * gcm, apn. Supported values are 'high' or 'normal' (gcm). Will be translated to 10 and 5 for apn. Defaults
+         * to 'high'
+         */
+        priority?: string;
         /** gcm for android, used as collapseId in apn */
-        collapseKey?: string,
+        collapseKey?: string;
         /** gcm for android */
-        contentAvailable?: boolean | string,
+        contentAvailable?: boolean | string;
         /** gcm for android */
-        delayWhileIdle?: boolean,
+        delayWhileIdle?: boolean;
         /** gcm for android */
-        restrictedPackageName?: string,
+        restrictedPackageName?: string;
         /** gcm for android */
-        dryRun?: boolean,
+        dryRun?: boolean;
         /** gcm for android */
-        icon?: string,
+        icon?: string;
         /** gcm for android */
-        tag?: string,
+        tag?: string;
         /** gcm for android */
-        color?: string,
+        color?: string;
         /** gcm for android. In ios, category will be used if not supplied */
-        clickAction?: string,
+        clickAction?: string;
         /** gcm, apn */
-        locKey?: string,
+        locKey?: string;
         /** gcm, apn */
-        bodyLocArgs?: string,
+        bodyLocArgs?: string;
         /** gcm, apn */
-        titleLocKey?: string,
+        titleLocKey?: string;
         /** gcm, apn */
-        titleLocArgs?: string,
+        titleLocArgs?: string;
         /** gcm, apn */
-        retries?: number,
+        retries?: number;
         /** apn */
-        encoding?: string,
+        encoding?: string;
         /** gcm for ios, apn */
-        badge?: number,
+        badge?: number;
         /** gcm, apn */
-        sound?: string,
+        sound?: string;
         /** apn, will take precedence over title and body. It is also accepted a text message in alert */
-        alert?: {} | string,
+        alert?: {} | string;
         /** apn and gcm for ios */
-        launchImage?: string,
+        launchImage?: string;
         /** apn and gcm for ios */
-        action?: string,
+        action?: string;
         /** apn and gcm for ios */
-        topic?: string,
+        topic?: string;
         /** apn and gcm for ios */
-        category?: string,
+        category?: string;
         /** apn and gcm for ios */
-        mdm?: string,
+        mdm?: string;
         /** apn and gcm for ios */
-        urlArgs?: string,
+        urlArgs?: string;
         /** apn and gcm for ios */
-        truncateAtWordEnd?: boolean,
+        truncateAtWordEnd?: boolean;
         /** apn */
-        mutableContent?: number,
+        mutableContent?: number;
         /** seconds */
-        expiry?: number,
+        expiry?: number;
         /** if both expiry and timeToLive are given, expiry will take precedency */
-        timeToLive?: number,
+        timeToLive?: number;
         /** wns */
-        headers?: string[],
+        headers?: string[];
         /** wns */
-        launch?: string,
+        launch?: string;
         /** wns */
-        duration?: string,
+        duration?: string;
         /** ADM */
-        consolidationKey?: string
-    }
-    
-    interface IPushMethod {
-        (regIds: string[], data: IData, settings: ISettings): void
-    }
-    
-    interface ICallback {
-        (err: any, result: any): void
+        consolidationKey?: string;
     }
+    type PushMethod = (regIds: string[], data: Data, settings: Settings) => void;
+    type Callback = (err: any, result: any) => void;
 }
-
-declare module 'node-pushnotifications' {
-    export = PushNotifications;
-}
\ No newline at end of file
diff --git a/types/node-pushnotifications/node-pushnotifications-tests.ts b/types/node-pushnotifications/node-pushnotifications-tests.ts
index 2d815a21dc..6a4d9d3335 100644
--- a/types/node-pushnotifications/node-pushnotifications-tests.ts
+++ b/types/node-pushnotifications/node-pushnotifications-tests.ts
@@ -1,4 +1,4 @@
-import * as PushNotifications from "node-pushnotifications";
+import PushNotifications = require('node-pushnotifications');
 
 const settings = {
     gcm: {
diff --git a/types/node-pushnotifications/tsconfig.json b/types/node-pushnotifications/tsconfig.json
index bbd908bcdb..54ace6c986 100644
--- a/types/node-pushnotifications/tsconfig.json
+++ b/types/node-pushnotifications/tsconfig.json
@@ -7,11 +7,12 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
         ],
-        "types": ["node"],
+        "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },

From 0cdf91a543126d20f7bbd61c8b24cf49ccf9dff8 Mon Sep 17 00:00:00 2001
From: Ben Gazzard <ben@dartoxia.com>
Date: Tue, 20 Mar 2018 16:04:05 -0400
Subject: [PATCH 0707/1382] Expose the BlockMap type

BlockMap is the return/parameter type of several draft functions.
---
 types/draft-js/index.d.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/types/draft-js/index.d.ts b/types/draft-js/index.d.ts
index e545fa347d..aeb497cbe9 100644
--- a/types/draft-js/index.d.ts
+++ b/types/draft-js/index.d.ts
@@ -957,6 +957,7 @@ import ContentBlock = Draft.Model.ImmutableData.ContentBlock;
 import ContentState = Draft.Model.ImmutableData.ContentState;
 import SelectionState = Draft.Model.ImmutableData.SelectionState;
 import DraftInlineStyle = Draft.Model.ImmutableData.DraftInlineStyle;
+import BlockMap = Draft.Model.ImmutableData.BlockMap;
 
 import AtomicBlockUtils = Draft.Model.Modifier.AtomicBlockUtils;
 import KeyBindingUtil = Draft.Component.Utils.KeyBindingUtil;
@@ -1005,6 +1006,7 @@ export {
     ContentState,
     SelectionState,
     DraftInlineStyle,
+    BlockMap,
 
     AtomicBlockUtils,
     KeyBindingUtil,

From dca48ce9743abc02d4349500e56cb074ad553ffc Mon Sep 17 00:00:00 2001
From: Josh Goldberg <josh@fullscreenmario.com>
Date: Tue, 20 Mar 2018 14:51:47 -0700
Subject: [PATCH 0708/1382] Added jsoneditor-for-react types

---
 types/jsoneditor-for-react/index.d.ts         | 16 +++++++++++++
 .../jsoneditor-for-react-tests.tsx            |  4 ++++
 types/jsoneditor-for-react/tsconfig.json      | 23 +++++++++++++++++++
 types/jsoneditor-for-react/tslint.json        |  1 +
 4 files changed, 44 insertions(+)
 create mode 100644 types/jsoneditor-for-react/index.d.ts
 create mode 100644 types/jsoneditor-for-react/jsoneditor-for-react-tests.tsx
 create mode 100644 types/jsoneditor-for-react/tsconfig.json
 create mode 100644 types/jsoneditor-for-react/tslint.json

diff --git a/types/jsoneditor-for-react/index.d.ts b/types/jsoneditor-for-react/index.d.ts
new file mode 100644
index 0000000000..cb5af6e2bb
--- /dev/null
+++ b/types/jsoneditor-for-react/index.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for jsoneditor-for-react 0.0.1
+// Project: https://github.com/mixj93/jsoneditor-for-react#readme
+// Definitions by: JoshGoldberg <https://github.com/joshuakgoldberg>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as React from "react"
+import JSONEditor, { JSONEditorOptions } from "jsoneditor"
+
+export interface IReactJsoneditorProps {
+    values: Object
+}
+
+export default class ReactJsoneditor extends React.Component<IReactJsoneditorProps> {
+    private editor?: JSONEditor
+    private options?: JSONEditorOptions
+}
diff --git a/types/jsoneditor-for-react/jsoneditor-for-react-tests.tsx b/types/jsoneditor-for-react/jsoneditor-for-react-tests.tsx
new file mode 100644
index 0000000000..fc8211e628
--- /dev/null
+++ b/types/jsoneditor-for-react/jsoneditor-for-react-tests.tsx
@@ -0,0 +1,4 @@
+import * as React from "react";
+import ReactJsonEditor from "jsoneditor-for-react";
+
+const component = <ReactJsonEditor values={{}} />;
diff --git a/types/jsoneditor-for-react/tsconfig.json b/types/jsoneditor-for-react/tsconfig.json
new file mode 100644
index 0000000000..bc56d95c74
--- /dev/null
+++ b/types/jsoneditor-for-react/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "jsoneditor-for-react-tests.tsx"
+    ]
+}
diff --git a/types/jsoneditor-for-react/tslint.json b/types/jsoneditor-for-react/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/jsoneditor-for-react/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From b87aa359830da2e05f7d60d8a3b8c282e3444c6a Mon Sep 17 00:00:00 2001
From: Josh Goldberg <josh@fullscreenmario.com>
Date: Tue, 20 Mar 2018 15:27:38 -0700
Subject: [PATCH 0709/1382] Bumped TS to version 2.6

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

diff --git a/types/jsoneditor-for-react/index.d.ts b/types/jsoneditor-for-react/index.d.ts
index cb5af6e2bb..731820af30 100644
--- a/types/jsoneditor-for-react/index.d.ts
+++ b/types/jsoneditor-for-react/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/mixj93/jsoneditor-for-react#readme
 // Definitions by: JoshGoldberg <https://github.com/joshuakgoldberg>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
 
 import * as React from "react"
 import JSONEditor, { JSONEditorOptions } from "jsoneditor"

From 7a98540cd08a2be909c0104964768a31dd8cee6f Mon Sep 17 00:00:00 2001
From: Josh Goldberg <josh@fullscreenmario.com>
Date: Tue, 20 Mar 2018 15:44:58 -0700
Subject: [PATCH 0710/1382] Added strictFunctionTypes

---
 types/jsoneditor-for-react/tsconfig.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/jsoneditor-for-react/tsconfig.json b/types/jsoneditor-for-react/tsconfig.json
index bc56d95c74..7a855a2dc9 100644
--- a/types/jsoneditor-for-react/tsconfig.json
+++ b/types/jsoneditor-for-react/tsconfig.json
@@ -7,6 +7,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "jsx": "react",
         "typeRoots": [

From 55421afb90b7eacef9e8fc79f54a1d279cc54d27 Mon Sep 17 00:00:00 2001
From: Christian Chown <christianchown@gmail.com>
Date: Tue, 20 Mar 2018 23:18:23 +0000
Subject: [PATCH 0711/1382] Initial typings for react-infinite-calendar

---
 types/react-infinite-calendar/index.d.ts      | 66 +++++++++++++++++++
 .../react-infinite-calendar-tests.tsx         | 61 +++++++++++++++++
 types/react-infinite-calendar/tsconfig.json   | 25 +++++++
 types/react-infinite-calendar/tslint.json     |  1 +
 4 files changed, 153 insertions(+)
 create mode 100644 types/react-infinite-calendar/index.d.ts
 create mode 100644 types/react-infinite-calendar/react-infinite-calendar-tests.tsx
 create mode 100644 types/react-infinite-calendar/tsconfig.json
 create mode 100644 types/react-infinite-calendar/tslint.json

diff --git a/types/react-infinite-calendar/index.d.ts b/types/react-infinite-calendar/index.d.ts
new file mode 100644
index 0000000000..8a1adbff14
--- /dev/null
+++ b/types/react-infinite-calendar/index.d.ts
@@ -0,0 +1,66 @@
+// Type definitions for react-infinite-calendar 2.3
+// Project: https://github.com/clauderic/react-infinite-calendar
+// Definitions by: Christian Chown <https://github.com/christianchown>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+import * as React from 'react';
+
+export interface ReactInfiniteCalendarProps {
+    selected?: Date | boolean;
+    width?: number;
+    height?: number;
+    min?: Date;
+    max?: Date;
+    minDate?: Date;
+    maxDate?: Date;
+    disabledDays?: Array<0 | 1 | 2 | 3 | 4 | 5 | 6>;
+    disabledDates?: Date[];
+    display?: 'days' | 'years';
+    displayOptions?: {
+        hideYearsOnSelect?: boolean;
+        layout?: 'portrait' | 'landscape';
+        overscanMonthCount?: number;
+        shouldHeaderAnimate?: boolean;
+        showHeader?: boolean;
+        showMonthsForYears?: boolean;
+        showOverlay?: boolean;
+        showTodayHelper?: boolean;
+        showWeekdays?: boolean;
+        todayHelperRowOffset?: number;
+    };
+    locale?: {
+        blank?: string;
+        headerFormat?: string;
+        todayLabel?: {
+            long: string;
+        };
+        weekdays?: string[];
+        weekStartsOn?: 0 | 1 | 2 | 3 | 4 | 5 | 6;
+    };
+    theme?: {
+        accentColor?: string;
+        floatingNav: {
+            background?: string;
+            chevron?: string;
+            color?: string;
+        };
+        headerColor?: string;
+        selectionColor?: string;
+        textColor?: {
+            active?: string;
+            default?: string;
+        };
+        todayColor?: string;
+        weekdayColor?: string;
+    };
+    className?: string;
+    onSelect?: () => void;
+    onScroll?: (scrollTop: number) => void;
+    onScrollEnd?: (scrollTop: number) => void;
+    rowHeight?: number;
+    autoFocus?: boolean;
+    tabIndex?: number;
+}
+
+export default class ReactInfiniteCalendar extends React.Component<ReactInfiniteCalendarProps> {}
diff --git a/types/react-infinite-calendar/react-infinite-calendar-tests.tsx b/types/react-infinite-calendar/react-infinite-calendar-tests.tsx
new file mode 100644
index 0000000000..ff1918d539
--- /dev/null
+++ b/types/react-infinite-calendar/react-infinite-calendar-tests.tsx
@@ -0,0 +1,61 @@
+import * as React from 'react';
+import ReactInfiniteCalendar from 'react-infinite-calendar';
+
+const test: React.SFC = () => (
+    <ReactInfiniteCalendar
+        selected={new Date()}
+        width={500}
+        height={500}
+        min={new Date()}
+        max={new Date()}
+        minDate={new Date()}
+        maxDate={new Date()}
+        disabledDays={[0, 6]}
+        disabledDates={[new Date()]}
+        display="years"
+        displayOptions={{
+          hideYearsOnSelect: true,
+          layout: 'portrait',
+          overscanMonthCount: 2,
+          shouldHeaderAnimate: true,
+          showHeader: true,
+          showMonthsForYears: true,
+          showOverlay: true,
+          showTodayHelper: true,
+          showWeekdays: true,
+          todayHelperRowOffset: 4,
+        }}
+        locale={{
+          blank: 'Select a date...',
+          headerFormat: 'ddd, MMM Do',
+          todayLabel: {
+            long: 'Today',
+          },
+          weekdays: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
+          weekStartsOn: 0,
+        }}
+        theme={{
+          accentColor: '#448AFF',
+          floatingNav: {
+            background: 'rgba(56, 87, 138, 0.94)',
+            chevron: '#FFA726',
+            color: '#FFF',
+          },
+          headerColor: '#448AFF',
+          selectionColor: '#559FFF',
+          textColor: {
+            active: '#FFF',
+            default: '#333',
+          },
+          todayColor: '#FFA726',
+          weekdayColor: '#559FFF',
+        }}
+        className="className"
+        onSelect={() => {}}
+        onScroll={(scrollTop: number) => { console.log(scrollTop); }}
+        onScrollEnd={(scrollTop: number) => { console.log(scrollTop); }}
+        rowHeight={40}
+        autoFocus={false}
+        tabIndex={1}
+    />
+);
diff --git a/types/react-infinite-calendar/tsconfig.json b/types/react-infinite-calendar/tsconfig.json
new file mode 100644
index 0000000000..bf57e148ca
--- /dev/null
+++ b/types/react-infinite-calendar/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-infinite-calendar-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/types/react-infinite-calendar/tslint.json b/types/react-infinite-calendar/tslint.json
new file mode 100644
index 0000000000..2750cc0197
--- /dev/null
+++ b/types/react-infinite-calendar/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file

From b745db2194e27703c8dde8b7af4e2fd20ac5da8e Mon Sep 17 00:00:00 2001
From: karak <karak97@gmail.com>
Date: Wed, 21 Mar 2018 08:41:20 +0900
Subject: [PATCH 0712/1382] Fix author.

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

diff --git a/types/karma-viewport/index.d.ts b/types/karma-viewport/index.d.ts
index cb220bfc5b..10196485ca 100644
--- a/types/karma-viewport/index.d.ts
+++ b/types/karma-viewport/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for karma-viewport 0.4
 // Project: https://github.com/squidfunk/karma-viewport
-// Definitions by: My Self <https://github.com/me>
+// Definitions by: Karak <https://github.com/karak>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // Type definition file for 'karma-viewport'
 // https://www.npmjs.com/package/karma-viewport

From 7fab72af1ed86dbf1db1cf1c2049e6d4c27a526c Mon Sep 17 00:00:00 2001
From: Christian Chown <christianchown@gmail.com>
Date: Wed, 21 Mar 2018 00:02:59 +0000
Subject: [PATCH 0713/1382] Initial typings for exenv

---
 types/exenv/exenv-tests.ts |  6 ++++++
 types/exenv/index.d.ts     | 10 ++++++++++
 types/exenv/tsconfig.json  | 23 +++++++++++++++++++++++
 types/exenv/tslint.json    |  1 +
 4 files changed, 40 insertions(+)
 create mode 100644 types/exenv/exenv-tests.ts
 create mode 100644 types/exenv/index.d.ts
 create mode 100644 types/exenv/tsconfig.json
 create mode 100644 types/exenv/tslint.json

diff --git a/types/exenv/exenv-tests.ts b/types/exenv/exenv-tests.ts
new file mode 100644
index 0000000000..d13633b4a6
--- /dev/null
+++ b/types/exenv/exenv-tests.ts
@@ -0,0 +1,6 @@
+import * as ExecutionEnvironment from 'exenv';
+
+JSON.stringify(ExecutionEnvironment.canUseDOM);
+JSON.stringify(ExecutionEnvironment.canUseEventListeners);
+JSON.stringify(ExecutionEnvironment.canUseViewport);
+JSON.stringify(ExecutionEnvironment.canUseWorkers);
diff --git a/types/exenv/index.d.ts b/types/exenv/index.d.ts
new file mode 100644
index 0000000000..701494f6d8
--- /dev/null
+++ b/types/exenv/index.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for exenv 1.2
+// Project: https://github.com/JedWatson/exenv
+// Definitions by: Christian Chown <https://github.com/christianchown>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+export const canUseDOM: boolean;
+export const canUseEventListeners: boolean;
+export const canUseViewport: boolean;
+export const canUseWorkers: boolean;
diff --git a/types/exenv/tsconfig.json b/types/exenv/tsconfig.json
new file mode 100644
index 0000000000..d8825637a1
--- /dev/null
+++ b/types/exenv/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "exenv-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/exenv/tslint.json b/types/exenv/tslint.json
new file mode 100644
index 0000000000..2750cc0197
--- /dev/null
+++ b/types/exenv/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file

From ef646be4a4e7c5f4248a5768b337bc9172579fd6 Mon Sep 17 00:00:00 2001
From: Kelvin Jin <kelvinjin@google.com>
Date: Tue, 20 Mar 2018 15:13:14 -0700
Subject: [PATCH 0714/1382] [node] Bump async_hooks definitions to v8.10/v9.6

---
 types/node/index.d.ts       | 44 ++++++++++++++++++++++++++++++++-----
 types/node/node-tests.ts    | 14 ++++++++++--
 types/node/v8/index.d.ts    | 27 +++++++++++++++++++----
 types/node/v8/node-tests.ts | 10 +++++++++
 4 files changed, 84 insertions(+), 11 deletions(-)

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index b2e310cffa..fe2086cf82 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Node.js 9.4.x
+// Type definitions for Node.js 9.6.x
 // Project: http://nodejs.org/
 // Definitions by: Microsoft TypeScript <http://typescriptlang.org>
 //                 DefinitelyTyped <https://github.com/DefinitelyTyped/DefinitelyTyped>
@@ -6080,6 +6080,23 @@ declare module "async_hooks" {
      */
     export function createHook(options: HookCallbacks): AsyncHook;
 
+    export interface AsyncResourceOptions {
+      /**
+       * The ID of the execution context that created this async event.
+       * Default: `executionAsyncId()`
+       */
+      triggerAsyncId?: number;
+
+      /**
+       * Disables automatic `emitDestroy` when the object is garbage collected.
+       * This usually does not need to be set (even if `emitDestroy` is called
+       * manually), unless the resource's `asyncId` is retrieved and the
+       * sensitive API's `emitDestroy` is called with it.
+       * Default: `false`
+       */
+      requireManualDestroy?: boolean;
+    }
+
     /**
      * The class AsyncResource was designed to be extended by the embedder's async resources.
      * Using this users can easily trigger the lifetime events of their own resources.
@@ -6089,21 +6106,38 @@ declare module "async_hooks" {
          * AsyncResource() is meant to be extended. Instantiating a
          * new AsyncResource() also triggers init. If triggerAsyncId is omitted then
          * async_hook.executionAsyncId() is used.
-         * @param type the name of this async resource type
-         * @param triggerAsyncId the unique ID of the async resource in whose execution context this async resource was created
+         * @param type The type of async event.
+         * @param triggerAsyncId The ID of the execution context that created
+         *   this async event (default: `executionAsyncId()`), or an
+         *   AsyncResourceOptions object (since 9.3)
          */
-        constructor(type: string, triggerAsyncId?: number)
+        constructor(type: string, triggerAsyncId?: number|AsyncResourceOptions);
 
         /**
          * Call AsyncHooks before callbacks.
+         * @deprecated since 9.6 - Use asyncResource.runInAsyncScope() instead.
          */
         emitBefore(): void;
 
         /**
-         * Call AsyncHooks after callbacks
+         * Call AsyncHooks after callbacks.
+         * @deprecated since 9.6 - Use asyncResource.runInAsyncScope() instead.
          */
         emitAfter(): void;
 
+        /**
+         * Call the provided function with the provided arguments in the
+         * execution context of the async resource. This will establish the
+         * context, trigger the AsyncHooks before callbacks, call the function,
+         * trigger the AsyncHooks after callbacks, and then restore the original
+         * execution context.
+         * @param fn The function to call in the execution context of this
+         *   async resource.
+         * @param thisArg The receiver to be used for the function call.
+         * @param args Optional arguments to pass to the function.
+         */
+        runInAsyncScope<This, Result>(fn: (this: This, ...args: any[]) => Result, thisArg?: This, ...args: any[]): Result;
+
         /**
          * Call AsyncHooks destroy callbacks.
          */
diff --git a/types/node/node-tests.ts b/types/node/node-tests.ts
index 1eb6539b09..08678990a8 100644
--- a/types/node/node-tests.ts
+++ b/types/node/node-tests.ts
@@ -3333,13 +3333,23 @@ namespace async_hooks_tests {
             const tId: number = this.triggerAsyncId();
         }
         run() {
-            this.emitBefore();
-            this.emitAfter();
+            this.runInAsyncScope(() => {});
+            this.runInAsyncScope(Array.prototype.find, [], () => true);
         }
         destroy() {
             this.emitDestroy();
         }
     }
+
+    // check AsyncResource constructor options.
+    new async_hooks.AsyncResource('');
+    new async_hooks.AsyncResource('', 0);
+    new async_hooks.AsyncResource('', {});
+    new async_hooks.AsyncResource('', { triggerAsyncId: 0 });
+    new async_hooks.AsyncResource('', {
+      triggerAsyncId: 0,
+      requireManualDestroy: true
+    });
 }
 
 ////////////////////////////////////////////////////
diff --git a/types/node/v8/index.d.ts b/types/node/v8/index.d.ts
index f28c0959a4..7d8455b828 100644
--- a/types/node/v8/index.d.ts
+++ b/types/node/v8/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Node.js 8.9.x
+// Type definitions for Node.js 8.10.x
 // Project: http://nodejs.org/
 // Definitions by: Microsoft TypeScript <http://typescriptlang.org>
 //                 DefinitelyTyped <https://github.com/DefinitelyTyped/DefinitelyTyped>
@@ -6052,6 +6052,23 @@ declare module "async_hooks" {
      */
     export function createHook(options: HookCallbacks): AsyncHook;
 
+    export interface AsyncResourceOptions {
+      /**
+       * The ID of the execution context that created this async event.
+       * Default: `executionAsyncId()`
+       */
+      triggerAsyncId?: number;
+
+      /**
+       * Disables automatic `emitDestroy` when the object is garbage collected.
+       * This usually does not need to be set (even if `emitDestroy` is called
+       * manually), unless the resource's `asyncId` is retrieved and the
+       * sensitive API's `emitDestroy` is called with it.
+       * Default: `false`
+       */
+      requireManualDestroy?: boolean;
+    }
+
     /**
      * The class AsyncResource was designed to be extended by the embedder's async resources.
      * Using this users can easily trigger the lifetime events of their own resources.
@@ -6061,10 +6078,12 @@ declare module "async_hooks" {
          * AsyncResource() is meant to be extended. Instantiating a
          * new AsyncResource() also triggers init. If triggerAsyncId is omitted then
          * async_hook.executionAsyncId() is used.
-         * @param type the name of this async resource type
-         * @param triggerAsyncId the unique ID of the async resource in whose execution context this async resource was created
+         * @param type The type of async event.
+         * @param triggerAsyncId The ID of the execution context that created
+         *   this async event (default: `executionAsyncId()`), or an
+         *   AsyncResourceOptions object (since 8.10)
          */
-        constructor(type: string, triggerAsyncId?: number)
+        constructor(type: string, triggerAsyncId?: number|AsyncResourceOptions);
 
         /**
          * Call AsyncHooks before callbacks.
diff --git a/types/node/v8/node-tests.ts b/types/node/v8/node-tests.ts
index 74d4c5c222..6292629915 100644
--- a/types/node/v8/node-tests.ts
+++ b/types/node/v8/node-tests.ts
@@ -3304,6 +3304,16 @@ namespace async_hooks_tests {
             this.emitDestroy();
         }
     }
+
+    // check AsyncResource constructor options.
+    new async_hooks.AsyncResource('');
+    new async_hooks.AsyncResource('', 0);
+    new async_hooks.AsyncResource('', {});
+    new async_hooks.AsyncResource('', { triggerAsyncId: 0 });
+    new async_hooks.AsyncResource('', {
+      triggerAsyncId: 0,
+      requireManualDestroy: true
+    });
 }
 
 ////////////////////////////////////////////////////

From 1ad2b822af67c1d88a80f35e895260dcbe738eb9 Mon Sep 17 00:00:00 2001
From: Christian Chown <christianchown@gmail.com>
Date: Wed, 21 Mar 2018 00:19:09 +0000
Subject: [PATCH 0715/1382] Allow auto width/height, floatingNav is optional,
 onSelect takes a string

---
 types/react-infinite-calendar/index.d.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/types/react-infinite-calendar/index.d.ts b/types/react-infinite-calendar/index.d.ts
index 8a1adbff14..0264c70d91 100644
--- a/types/react-infinite-calendar/index.d.ts
+++ b/types/react-infinite-calendar/index.d.ts
@@ -8,8 +8,8 @@ import * as React from 'react';
 
 export interface ReactInfiniteCalendarProps {
     selected?: Date | boolean;
-    width?: number;
-    height?: number;
+    width?: number | 'auto';
+    height?: number | 'auto';
     min?: Date;
     max?: Date;
     minDate?: Date;
@@ -40,7 +40,7 @@ export interface ReactInfiniteCalendarProps {
     };
     theme?: {
         accentColor?: string;
-        floatingNav: {
+        floatingNav?: {
             background?: string;
             chevron?: string;
             color?: string;
@@ -55,7 +55,7 @@ export interface ReactInfiniteCalendarProps {
         weekdayColor?: string;
     };
     className?: string;
-    onSelect?: () => void;
+    onSelect?: (date: string) => void;
     onScroll?: (scrollTop: number) => void;
     onScrollEnd?: (scrollTop: number) => void;
     rowHeight?: number;

From 23516af7bc0b3e84675e21d2afb3d680da80eb72 Mon Sep 17 00:00:00 2001
From: Bradley Ayers <bradley.ayers@gmail.com>
Date: Wed, 21 Mar 2018 12:01:32 +1100
Subject: [PATCH 0716/1382] Update Jest types

Fix `MatcherUtils.utils.EXPECTED_COLOR` and `MatcherUtils.utils.RECEIVED_COLOR` to be functions.
---
 types/jest/index.d.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/types/jest/index.d.ts b/types/jest/index.d.ts
index 80957f32ad..c0ab376ae5 100644
--- a/types/jest/index.d.ts
+++ b/types/jest/index.d.ts
@@ -11,6 +11,7 @@
 //                 Jamie Mason <https://github.com/JamieMason>
 //                 Douglas Duteil <https://github.com/douglasduteil>
 //                 Ahn <https://github.com/AhnpGit>
+//                 Bradley Ayers <https://github.com/bradleyayers>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -230,8 +231,8 @@ declare namespace jest {
     interface MatcherUtils {
         readonly isNot: boolean;
         utils: {
-            readonly EXPECTED_COLOR: string;
-            readonly RECEIVED_COLOR: string;
+            readonly EXPECTED_COLOR: (text: string) => string;
+            readonly RECEIVED_COLOR: (text: string) => string;
             ensureActualIsNumber(actual: any, matcherName?: string): void;
             ensureExpectedIsNumber(actual: any, matcherName?: string): void;
             ensureNoExpected(actual: any, matcherName?: string): void;

From 0f31d5304e0e18997c0e52c3d182428e40c56bd0 Mon Sep 17 00:00:00 2001
From: Luke Andrews <luke@attaboy.ca>
Date: Tue, 20 Mar 2018 21:15:42 -0400
Subject: [PATCH 0717/1382] Added alternate method signature for addQuery that
 accepts a key and value

---
 types/urijs/index.d.ts     | 1 +
 types/urijs/urijs-tests.ts | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/types/urijs/index.d.ts b/types/urijs/index.d.ts
index 61f1887948..4e046ec27f 100644
--- a/types/urijs/index.d.ts
+++ b/types/urijs/index.d.ts
@@ -13,6 +13,7 @@ declare namespace uri {
         absoluteTo(path: URI): URI;
         addFragment(fragment: string): URI;
         addQuery(qry: string): URI;
+        addQuery(qry: string, value:any): URI;
         addQuery(qry: Object): URI;
         addSearch(qry: string): URI;
         addSearch(key: string, value:any): URI;
diff --git a/types/urijs/urijs-tests.ts b/types/urijs/urijs-tests.ts
index 231879b94d..f14ba140d3 100644
--- a/types/urijs/urijs-tests.ts
+++ b/types/urijs/urijs-tests.ts
@@ -32,6 +32,12 @@ URI('').setQuery('foo', 'bar');
 URI('').setQuery({ foo: 'bar' });
 URI('').setSearch('foo', 'bar');
 URI('').setSearch({ foo: 'bar' });
+URI('http://example.org/foo/hello.html').addQuery('foo');
+URI('http://example.org/foo/hello.html').addQuery('foo', 'bar');
+URI('http://example.org/foo/hello.html').addQuery({ foo: 'bar' });
+URI('http://example.org/foo/hello.html').addSearch('foo');
+URI('http://example.org/foo/hello.html').addSearch('foo', 'bar');
+URI('http://example.org/foo/hello.html').addSearch({ foo: 'bar' });
 
 var uri: uri.URI = $('a').uri();
 

From 2de73dedb7ade81167148adf6545130b1da42ee6 Mon Sep 17 00:00:00 2001
From: tonyholt <tony.m.holt@gmail.com>
Date: Tue, 20 Mar 2018 21:23:34 -0400
Subject: [PATCH 0718/1382] Select2 missing dataAdapter in Select2Options
 interface

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

diff --git a/types/select2/index.d.ts b/types/select2/index.d.ts
index 51e297a9a8..1fe95ee6e8 100644
--- a/types/select2/index.d.ts
+++ b/types/select2/index.d.ts
@@ -94,6 +94,7 @@ interface Select2Options {
     dropdownAdapter?: any;
     selectionAdapter?: any;
     resultsAdapter?: any;
+    dataAdapter?: any;
 }
 
 interface Select2JQueryEventObject extends JQueryEventObject {

From 5a36ea31c36bcd4d92b7ea0d7a07dba4524a8b72 Mon Sep 17 00:00:00 2001
From: Walter Rumsby <walter.rumsby@myfoodbag.co.nz>
Date: Wed, 21 Mar 2018 16:26:51 +1300
Subject: [PATCH 0719/1382] Add types for mem-fs

---
 types/mem-fs/index.d.ts    | 23 +++++++++++++++++++++++
 types/mem-fs/test/index.ts |  6 ++++++
 types/mem-fs/tsconfig.json | 23 +++++++++++++++++++++++
 types/mem-fs/tslint.json   |  7 +++++++
 4 files changed, 59 insertions(+)
 create mode 100644 types/mem-fs/index.d.ts
 create mode 100644 types/mem-fs/test/index.ts
 create mode 100644 types/mem-fs/tsconfig.json
 create mode 100644 types/mem-fs/tslint.json

diff --git a/types/mem-fs/index.d.ts b/types/mem-fs/index.d.ts
new file mode 100644
index 0000000000..dedc40f7fc
--- /dev/null
+++ b/types/mem-fs/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for mem-fs 1.1
+// Project: https://github.com/SBoudrias/mem-fs
+// Definitions by: My Food Bag <https://github.com/MyFoodBag>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import events = require('events');
+import stream = require('stream');
+import File = require('vinyl');
+
+declare namespace FileSystem {
+    interface Store extends events.EventEmitter {
+        add: (file: File, content: string) => void;
+        each: (callback: (file: File, index: number) => void) => void;
+        get: (filepath: string) => File;
+        stream: () => stream.Transform;
+    }
+
+    export function create(): Store;
+}
+
+export = FileSystem;
diff --git a/types/mem-fs/test/index.ts b/types/mem-fs/test/index.ts
new file mode 100644
index 0000000000..bb925837aa
--- /dev/null
+++ b/types/mem-fs/test/index.ts
@@ -0,0 +1,6 @@
+import * as fs from 'mem-fs';
+
+const store = fs.create();
+const file = store.get('hello');
+
+store.add(file, 'hahahahah');
diff --git a/types/mem-fs/tsconfig.json b/types/mem-fs/tsconfig.json
new file mode 100644
index 0000000000..f0d4f87dbb
--- /dev/null
+++ b/types/mem-fs/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "test/index.ts"
+    ]
+}
diff --git a/types/mem-fs/tslint.json b/types/mem-fs/tslint.json
new file mode 100644
index 0000000000..0189538855
--- /dev/null
+++ b/types/mem-fs/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "export-just-namespace": false,
+        "strict-export-declare-modifiers": false
+    }
+}

From f2d6f88dc636fe2f68b913a717a578418f354d38 Mon Sep 17 00:00:00 2001
From: Abdulsattar Mohammed <asattar.md@gmail.com>
Date: Wed, 21 Mar 2018 11:48:50 +0530
Subject: [PATCH 0720/1382] Make renderTarget in setRenderTarget optional

RenderTarget can be null in `WebGLRenderer` which can be used to unbind the frame buffer. It is actually used by `WebGLRenderer#render` which accepts a `null` `renderTarget` to and calls `setRenderTarget` with that null value.
---
 types/three/three-core.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/three/three-core.d.ts b/types/three/three-core.d.ts
index 31c8cbebe0..57b060c597 100644
--- a/types/three/three-core.d.ts
+++ b/types/three/three-core.d.ts
@@ -5417,7 +5417,7 @@ export class WebGLRenderer implements Renderer {
      * @deprecated Use {@link WebGLRenderer#getRenderTarget .getRenderTarget()} instead.
      */
     getCurrentRenderTarget(): RenderTarget;
-    setRenderTarget(renderTarget: RenderTarget): void;
+    setRenderTarget(renderTarget?: RenderTarget): void;
     readRenderTargetPixels( renderTarget: RenderTarget, x: number, y: number, width: number, height: number, buffer: any ): void;
 
     /**

From 4c2186d54c12b61c2554314e7c82053ff6399ecf Mon Sep 17 00:00:00 2001
From: Walter Rumsby <walter.rumsby@myfoodbag.co.nz>
Date: Wed, 21 Mar 2018 21:49:18 +1300
Subject: [PATCH 0721/1382] Generate with dts-gen

---
 types/mem-fs/index.d.ts                         | 13 ++++++-------
 types/mem-fs/{test/index.ts => mem-fs-tests.ts} |  0
 types/mem-fs/tsconfig.json                      |  4 ++--
 types/mem-fs/tslint.json                        |  3 +--
 4 files changed, 9 insertions(+), 11 deletions(-)
 rename types/mem-fs/{test/index.ts => mem-fs-tests.ts} (100%)

diff --git a/types/mem-fs/index.d.ts b/types/mem-fs/index.d.ts
index dedc40f7fc..08a3067637 100644
--- a/types/mem-fs/index.d.ts
+++ b/types/mem-fs/index.d.ts
@@ -1,15 +1,15 @@
 // Type definitions for mem-fs 1.1
-// Project: https://github.com/SBoudrias/mem-fs
+// Project: https://github.com/sboudrias/mem-fs#readme
 // Definitions by: My Food Bag <https://github.com/MyFoodBag>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference types="node" />
-
 import events = require('events');
 import stream = require('stream');
 import File = require('vinyl');
 
-declare namespace FileSystem {
+export function create(...args: any[]): create.Store;
+
+export namespace create {
     interface Store extends events.EventEmitter {
         add: (file: File, content: string) => void;
         each: (callback: (file: File, index: number) => void) => void;
@@ -17,7 +17,6 @@ declare namespace FileSystem {
         stream: () => stream.Transform;
     }
 
-    export function create(): Store;
+    const prototype: {
+    };
 }
-
-export = FileSystem;
diff --git a/types/mem-fs/test/index.ts b/types/mem-fs/mem-fs-tests.ts
similarity index 100%
rename from types/mem-fs/test/index.ts
rename to types/mem-fs/mem-fs-tests.ts
diff --git a/types/mem-fs/tsconfig.json b/types/mem-fs/tsconfig.json
index f0d4f87dbb..23cb94acb6 100644
--- a/types/mem-fs/tsconfig.json
+++ b/types/mem-fs/tsconfig.json
@@ -6,8 +6,8 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": true,
         "strictFunctionTypes": true,
+        "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -18,6 +18,6 @@
     },
     "files": [
         "index.d.ts",
-        "test/index.ts"
+        "mem-fs-tests.ts"
     ]
 }
diff --git a/types/mem-fs/tslint.json b/types/mem-fs/tslint.json
index 0189538855..2ff396e742 100644
--- a/types/mem-fs/tslint.json
+++ b/types/mem-fs/tslint.json
@@ -1,7 +1,6 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "export-just-namespace": false,
-        "strict-export-declare-modifiers": false
+
     }
 }

From 49e76eb838d9fdcc5a7a9975a11542eb14f660a2 Mon Sep 17 00:00:00 2001
From: pvavrik <pavelv@salsitasoft.com>
Date: Wed, 21 Mar 2018 10:09:37 +0100
Subject: [PATCH 0722/1382] Three: remove TextBufferGeometryParameters iface,
 reuse TextGeometryParameters instead

---
 types/three/three-core.d.ts | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/types/three/three-core.d.ts b/types/three/three-core.d.ts
index 0886cb63d5..fe50f41a39 100644
--- a/types/three/three-core.d.ts
+++ b/types/three/three-core.d.ts
@@ -7133,19 +7133,8 @@ export class TextGeometry extends ExtrudeGeometry {
     };
 }
 
-export interface TextBufferGeometryParameters {
-    font?: Font;
-    size?: number;
-    height?: number;
-    curveSegments?: number;
-    bevelEnabled?: boolean;
-    bevelThickness?: number;
-    bevelSize?: number;
-    bevelSegments?: number;
-}
-
 export class TextBufferGeometry extends ExtrudeBufferGeometry {
-    constructor(text: string, parameters?: TextBufferGeometryParameters);
+    constructor(text: string, parameters?: TextGeometryParameters);
 
     parameters: {
         font: Font;

From 3ea349d793c1c0223decdd623bfad8f40feade57 Mon Sep 17 00:00:00 2001
From: Gareth Parker <gareth.parker@century.tech>
Date: Wed, 21 Mar 2018 09:29:34 +0000
Subject: [PATCH 0723/1382] Fixed PR issues

---
 glue/tsconfig.json | 2 +-
 glue/tslint.json   | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/glue/tsconfig.json b/glue/tsconfig.json
index 0aa40c6c06..f2d4fcee28 100644
--- a/glue/tsconfig.json
+++ b/glue/tsconfig.json
@@ -8,7 +8,7 @@
     "noImplicitAny": true,
     "noImplicitThis": true,
     "strictNullChecks": true,
-    "strictFunctionTypes": false,
+    "strictFunctionTypes": true,
     "baseUrl": "../",
     "typeRoots": [
         "../"
diff --git a/glue/tslint.json b/glue/tslint.json
index f84eea1584..30a1bdde2e 100644
--- a/glue/tslint.json
+++ b/glue/tslint.json
@@ -1,7 +1,3 @@
 {
-  "extends": "dtslint/dt.json",
-  "rules": {
-      // This package uses the Function type, and it will take effort to fix.
-      "ban-types": false
-  }
+  "extends": "dtslint/dt.json"
 }
\ No newline at end of file

From 050405d280b519bc3c7fd53f1152b3f65c4052d9 Mon Sep 17 00:00:00 2001
From: Margus Lamp <margus.lamp@heathmont.net>
Date: Wed, 21 Mar 2018 11:59:46 +0200
Subject: [PATCH 0724/1382] Changed types reflecting flow types, added
 validationRules

---
 .../express-graphql/express-graphql-tests.ts  | 18 +++--
 types/express-graphql/index.d.ts              | 80 ++++++++++++++-----
 2 files changed, 71 insertions(+), 27 deletions(-)

diff --git a/types/express-graphql/express-graphql-tests.ts b/types/express-graphql/express-graphql-tests.ts
index 6fdfc0d945..4ac6b38224 100644
--- a/types/express-graphql/express-graphql-tests.ts
+++ b/types/express-graphql/express-graphql-tests.ts
@@ -1,31 +1,35 @@
 import express = require('express');
 import 'express-session';
 import graphqlHTTP = require('express-graphql');
+import { GraphQLSchema } from 'graphql/type/schema';
 
 const app = express();
-const schema = {};
+const schema = {} as GraphQLSchema;
 
-const graphqlOption: graphqlHTTP.OptionsObj = {
+const graphqlOption: graphqlHTTP.OptionsData = {
     graphiql: true,
     schema: schema,
     formatError: (error: Error) => ({
         message: error.message
     }),
-    extensions: (args) => { }
+    validationRules: [() => false, () => true],
+    extensions: ({ document, variables, operationName, result }) => ({ key: "value", key2: "value"}),
 };
 
-const graphqlOptionRequest = (request: express.Request, response: express.Response): graphqlHTTP.OptionsObj => ({
+const graphqlOptionRequest = (request: express.Request): graphqlHTTP.OptionsData => ({
     graphiql: true,
     schema: schema,
-    context: request.session
+    context: request.session,
+    validationRules: [() => false, () => true],
 });
 
-const graphqlOptionRequestAsync = async (request: express.Request, response: express.Response): Promise<graphqlHTTP.OptionsObj> => {
+const graphqlOptionRequestAsync = async (request: express.Request): Promise<graphqlHTTP.OptionsData> => {
     return {
         graphiql: true,
         schema: await Promise.resolve(schema),
         context: request.session,
-        extensions: async (args) => { }
+        extensions: async (args) => { },
+        validationRules: [() => false, () => true],
     };
 };
 
diff --git a/types/express-graphql/index.d.ts b/types/express-graphql/index.d.ts
index ade08f1729..cbb0409318 100644
--- a/types/express-graphql/index.d.ts
+++ b/types/express-graphql/index.d.ts
@@ -1,14 +1,15 @@
-// Type definitions for express-graphql
-// Project: https://www.npmjs.org/package/express-graphql
+// Type definitions for express-graphql 0.6.12
+// Project: https://github.com/graphql/express-graphql
 // Definitions by: Isman Usoh <https://github.com/isman-usoh>
 //                 Nitin Tutlani <https://github.com/nitintutlani>
 //                 Daniel Fader <https://github.com/hubel>
 //                 Ehsan Ziya <https://github.com/zya>
+//                 Margus Lamp <https://github.com/mlamp>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
 import { Request, Response } from "express";
-
+import { DocumentNode, GraphQLSchema, GraphQLError } from 'graphql';
 export = graphqlHTTP;
 
 declare namespace graphqlHTTP {
@@ -16,12 +17,15 @@ declare namespace graphqlHTTP {
      * Used to configure the graphQLHTTP middleware by providing a schema
      * and other configuration options.
      */
-    export type Options = ((req: Request, res: Response) => OptionsObj) | ((req: Request, res: Response) => Promise<OptionsObj>) | OptionsObj
-    export type OptionsObj = {
+    export type Options = ((request: Request,
+        response: Response,
+        params?: GraphQLParams) => OptionsResult) | OptionsResult;
+    export type OptionsResult = OptionsData | Promise<OptionsData>;
+    export type OptionsData = {
         /**
          * A GraphQL schema from graphql-js.
          */
-        schema: Object,
+        schema: GraphQLSchema,
 
         /**
          * A value to pass as the context to the graphql() function.
@@ -43,27 +47,63 @@ declare namespace graphqlHTTP {
          * fulfilling a GraphQL operation. If no function is provided, GraphQL's
          * default spec-compliant `formatError` function will be used.
          */
-        formatError?: Function,
+        formatError?: (error: GraphQLError) => any,
+
+        /**
+         * An optional array of validation rules that will be applied on the document
+         * in additional to those defined by the GraphQL spec.
+         */
+        validationRules?: any[],
+
+        /**
+         * An optional function for adding additional metadata to the GraphQL response
+         * as a key-value object. The result will be added to "extensions" field in
+         * the resulting JSON. This is often a useful place to add development time
+         * info such as the runtime of a query or the amount of resources consumed.
+         *
+         * Information about the request is provided to be used.
+         *
+         * This function may be async.
+         */
+        extensions?: (info: RequestInfo) => { [key: string]: any },
 
         /**
          * A boolean to optionally enable GraphiQL mode.
          */
         graphiql?: boolean,
-
-        /**
-         * An optional function for adding additional metadata to the GraphQL response as a key-value object.
-         * The result will be added to "extensions" field in the resulting JSON.
-         */
-        extensions?: ((args: ExtenstionsArgs) => any) | ((args: ExtenstionsArgs) => Promise<any>);
-
     };
 
-    interface ExtenstionsArgs {
-        document: object,
-        variables: object,
-        operationName: any,
-        result: object
-    }
+    /**
+     * All information about a GraphQL request.
+     */
+    export type RequestInfo = {
+        /**
+         * The parsed GraphQL document.
+         */
+        document?: DocumentNode,
+    
+        /**
+         * The variable values used at runtime.
+         */
+        variables?: { [name: string]: any },
+    
+        /**
+         * The (optional) operation name requested.
+         */
+        operationName?: string,
+    
+        /**
+         * The result of executing the operation.
+         */
+        result?: any,
+    };
+  
+    export type GraphQLParams = {
+        query?: string,
+        variables?: { [name: string]: any },
+        operationName?: string,
+        raw?: boolean,
+    };
 
     type Middleware = (request: Request, response: Response) => void;
 }

From eedb1097a84c3b54d63b9167e9c314caab246d1a Mon Sep 17 00:00:00 2001
From: Andrea Ratto <aratto@topcon.com>
Date: Wed, 21 Mar 2018 11:15:56 +0100
Subject: [PATCH 0725/1382] Fix creation time attribute in StreamRecord of
 aws-lambda

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

diff --git a/types/aws-lambda/index.d.ts b/types/aws-lambda/index.d.ts
index eccc96ba3e..5802913c37 100644
--- a/types/aws-lambda/index.d.ts
+++ b/types/aws-lambda/index.d.ts
@@ -90,7 +90,7 @@ export interface AttributeValue {
 // Context
 // http://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_streams_StreamRecord.html
 export interface StreamRecord {
-    ApproximateCreationTime?: number;
+    ApproximateCreationDateTime?: number;
     Keys?: { [key: string]: AttributeValue };
     NewImage?: { [key: string]: AttributeValue };
     OldImage?: { [key: string]: AttributeValue };

From e6b06f80d9ef0d5331f8fec9a7708c91c0c05262 Mon Sep 17 00:00:00 2001
From: Margus Lamp <margus.lamp@heathmont.net>
Date: Wed, 21 Mar 2018 13:25:29 +0200
Subject: [PATCH 0726/1382] Removing some of the tslint rules, for better code

---
 .../express-graphql/express-graphql-tests.ts  | 16 +++-
 types/express-graphql/index.d.ts              | 60 +++++++--------
 types/express-graphql/tslint.json             | 75 +------------------
 3 files changed, 44 insertions(+), 107 deletions(-)

diff --git a/types/express-graphql/express-graphql-tests.ts b/types/express-graphql/express-graphql-tests.ts
index 4ac6b38224..1557c4c0ac 100644
--- a/types/express-graphql/express-graphql-tests.ts
+++ b/types/express-graphql/express-graphql-tests.ts
@@ -4,11 +4,21 @@ import graphqlHTTP = require('express-graphql');
 import { GraphQLSchema } from 'graphql/type/schema';
 
 const app = express();
-const schema = {} as GraphQLSchema;
+const schema: GraphQLSchema = {
+    getQueryType: null,
+    getMutationType: null,
+    getSubscriptionType: null,
+    getTypeMap: null,
+    getType: null,
+    getPossibleTypes: null,
+    isPossibleType: null,
+    getDirective: null,
+    getDirectives: null,
+};
 
 const graphqlOption: graphqlHTTP.OptionsData = {
     graphiql: true,
-    schema: schema,
+    schema,
     formatError: (error: Error) => ({
         message: error.message
     }),
@@ -18,7 +28,7 @@ const graphqlOption: graphqlHTTP.OptionsData = {
 
 const graphqlOptionRequest = (request: express.Request): graphqlHTTP.OptionsData => ({
     graphiql: true,
-    schema: schema,
+    schema,
     context: request.session,
     validationRules: [() => false, () => true],
 });
diff --git a/types/express-graphql/index.d.ts b/types/express-graphql/index.d.ts
index cbb0409318..4b2d10c99b 100644
--- a/types/express-graphql/index.d.ts
+++ b/types/express-graphql/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for express-graphql 0.6.12
+// Type definitions for express-graphql 0.6
 // Project: https://github.com/graphql/express-graphql
 // Definitions by: Isman Usoh <https://github.com/isman-usoh>
 //                 Nitin Tutlani <https://github.com/nitintutlani>
@@ -21,39 +21,39 @@ declare namespace graphqlHTTP {
         response: Response,
         params?: GraphQLParams) => OptionsResult) | OptionsResult;
     export type OptionsResult = OptionsData | Promise<OptionsData>;
-    export type OptionsData = {
+    export interface OptionsData {
         /**
          * A GraphQL schema from graphql-js.
          */
-        schema: GraphQLSchema,
+        schema: GraphQLSchema;
 
         /**
          * A value to pass as the context to the graphql() function.
          */
-        context?: Object,
+        context?: any;
 
         /**
          * An object to pass as the rootValue to the graphql() function.
          */
-        rootValue?: Object,
+        rootValue?: any;
 
         /**
          * A boolean to configure whether the output should be pretty-printed.
          */
-        pretty?: boolean,
+        pretty?: boolean;
 
         /**
          * An optional function which will be used to format any errors produced by
          * fulfilling a GraphQL operation. If no function is provided, GraphQL's
          * default spec-compliant `formatError` function will be used.
          */
-        formatError?: (error: GraphQLError) => any,
+        formatError?: (error: GraphQLError) => any;
 
         /**
          * An optional array of validation rules that will be applied on the document
          * in additional to those defined by the GraphQL spec.
          */
-        validationRules?: any[],
+        validationRules?: any[];
 
         /**
          * An optional function for adding additional metadata to the GraphQL response
@@ -65,51 +65,51 @@ declare namespace graphqlHTTP {
          *
          * This function may be async.
          */
-        extensions?: (info: RequestInfo) => { [key: string]: any },
+        extensions?: (info: RequestInfo) => { [key: string]: any };
 
         /**
          * A boolean to optionally enable GraphiQL mode.
          */
-        graphiql?: boolean,
-    };
+        graphiql?: boolean;
+    }
 
     /**
      * All information about a GraphQL request.
      */
-    export type RequestInfo = {
+    export interface RequestInfo {
         /**
          * The parsed GraphQL document.
          */
-        document?: DocumentNode,
-    
+        document?: DocumentNode;
+
         /**
          * The variable values used at runtime.
          */
-        variables?: { [name: string]: any },
-    
+        variables?: { [name: string]: any };
+
         /**
          * The (optional) operation name requested.
          */
-        operationName?: string,
-    
+        operationName?: string;
+
         /**
          * The result of executing the operation.
          */
-        result?: any,
-    };
-  
-    export type GraphQLParams = {
-        query?: string,
-        variables?: { [name: string]: any },
-        operationName?: string,
-        raw?: boolean,
-    };
+        result?: any;
+    }
+
+    export interface GraphQLParams {
+        query?: string;
+        variables?: { [name: string]: any };
+        operationName?: string;
+        raw?: boolean;
+    }
 
     type Middleware = (request: Request, response: Response) => void;
 }
 
 /**
-* Middleware for express; takes an options object or function as input to
-* configure behavior, and returns an express middleware.
-*/
+ * Middleware for express; takes an options object or function as input to
+ * configure behavior, and returns an express middleware.
+ */
 declare function graphqlHTTP(options: graphqlHTTP.Options): graphqlHTTP.Middleware;
diff --git a/types/express-graphql/tslint.json b/types/express-graphql/tslint.json
index a41bf5d19a..4c4fc86ace 100644
--- a/types/express-graphql/tslint.json
+++ b/types/express-graphql/tslint.json
@@ -1,79 +1,6 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
-        "ban-types": false,
-        "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
-        "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
-        "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
-        "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
-        "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
-        "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
-        "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
+        "strict-export-declare-modifiers": false
     }
 }

From 2b5cfcfb05749df78def6c4fa75da0ec2f334f96 Mon Sep 17 00:00:00 2001
From: Frank Schulz <frank.schulz@sap.com>
Date: Wed, 21 Mar 2018 12:37:33 +0100
Subject: [PATCH 0727/1382] Fix https type

---
 types/node/index.d.ts    | 1 +
 types/node/v4/index.d.ts | 4 +++-
 types/node/v6/index.d.ts | 4 +++-
 types/node/v7/index.d.ts | 4 +++-
 types/node/v8/index.d.ts | 1 +
 5 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index b2e310cffa..edad483995 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -1768,6 +1768,7 @@ declare module "https" {
 
     export class Agent extends http.Agent {
         constructor(options?: AgentOptions);
+        options: AgentOptions;
     }
 
     export class Server extends tls.Server {
diff --git a/types/node/v4/index.d.ts b/types/node/v4/index.d.ts
index 09cbd8bb43..16e54d002d 100644
--- a/types/node/v4/index.d.ts
+++ b/types/node/v4/index.d.ts
@@ -1081,7 +1081,9 @@ declare module "https" {
         secureProtocol?: string;
     }
 
-    export interface Agent extends http.Agent { }
+    export interface Agent extends http.Agent {
+        options?: AgentOptions;
+    }
 
     export interface AgentOptions extends http.AgentOptions {
         pfx?: any;
diff --git a/types/node/v6/index.d.ts b/types/node/v6/index.d.ts
index 152507c3a8..3ca66a2df5 100644
--- a/types/node/v6/index.d.ts
+++ b/types/node/v6/index.d.ts
@@ -1468,7 +1468,9 @@ declare module "https" {
         secureProtocol?: string;
     }
 
-    export interface Agent extends http.Agent { }
+    export interface Agent extends http.Agent {
+        options?: AgentOptions;
+    }
 
     export interface AgentOptions extends http.AgentOptions {
         pfx?: any;
diff --git a/types/node/v7/index.d.ts b/types/node/v7/index.d.ts
index bdcb47d2e1..748f932d80 100644
--- a/types/node/v7/index.d.ts
+++ b/types/node/v7/index.d.ts
@@ -1528,7 +1528,9 @@ declare module "https" {
         secureProtocol?: string;
     }
 
-    export interface Agent extends http.Agent { }
+    export interface Agent extends http.Agent {
+        options?: AgentOptions;
+    }
 
     export interface AgentOptions extends http.AgentOptions {
         pfx?: any;
diff --git a/types/node/v8/index.d.ts b/types/node/v8/index.d.ts
index f28c0959a4..bbad9e0d66 100644
--- a/types/node/v8/index.d.ts
+++ b/types/node/v8/index.d.ts
@@ -1757,6 +1757,7 @@ declare module "https" {
 
     export class Agent extends http.Agent {
         constructor(options?: AgentOptions);
+        options: AgentOptions;
     }
 
     export class Server extends tls.Server {

From a36a10b2bfc04f368f88d815c7ee21ac3dc8d785 Mon Sep 17 00:00:00 2001
From: Frank Schulz <frank.schulz@sap.com>
Date: Wed, 21 Mar 2018 12:53:58 +0100
Subject: [PATCH 0728/1382] Add tests

---
 types/node/node-tests.ts    | 2 ++
 types/node/v4/node-tests.ts | 2 ++
 types/node/v6/node-tests.ts | 2 ++
 types/node/v7/node-tests.ts | 2 ++
 types/node/v8/node-tests.ts | 2 ++
 5 files changed, 10 insertions(+)

diff --git a/types/node/node-tests.ts b/types/node/node-tests.ts
index 1eb6539b09..c3fbb75953 100644
--- a/types/node/node-tests.ts
+++ b/types/node/node-tests.ts
@@ -1497,6 +1497,8 @@ namespace https_tests {
 
     https.request('http://www.example.com/xyz');
 
+    https.globalAgent.options.ca = [];
+
     {
         const server = new https.Server();
 
diff --git a/types/node/v4/node-tests.ts b/types/node/v4/node-tests.ts
index e60b578ccf..2b3be03f8d 100644
--- a/types/node/v4/node-tests.ts
+++ b/types/node/v4/node-tests.ts
@@ -561,6 +561,8 @@ namespace https_tests {
     });
 
     https.request('http://www.example.com/xyz');
+
+    https.globalAgent.options.ca = [];
 }
 
 ////////////////////////////////////////////////////
diff --git a/types/node/v6/node-tests.ts b/types/node/v6/node-tests.ts
index cd363c708c..6cfb45692b 100644
--- a/types/node/v6/node-tests.ts
+++ b/types/node/v6/node-tests.ts
@@ -1015,6 +1015,8 @@ namespace https_tests {
     });
 
     https.request('http://www.example.com/xyz');
+
+    https.globalAgent.options.ca = [];
 }
 
 ////////////////////////////////////////////////////
diff --git a/types/node/v7/node-tests.ts b/types/node/v7/node-tests.ts
index 0240dcc120..eb25e01f10 100644
--- a/types/node/v7/node-tests.ts
+++ b/types/node/v7/node-tests.ts
@@ -1093,6 +1093,8 @@ namespace https_tests {
     });
 
     https.request('http://www.example.com/xyz');
+
+    https.globalAgent.options.ca = [];
 }
 
 ////////////////////////////////////////////////////
diff --git a/types/node/v8/node-tests.ts b/types/node/v8/node-tests.ts
index 74d4c5c222..5cd7ad4586 100644
--- a/types/node/v8/node-tests.ts
+++ b/types/node/v8/node-tests.ts
@@ -1471,6 +1471,8 @@ namespace https_tests {
 
     https.request('http://www.example.com/xyz');
 
+    https.globalAgent.options.ca = [];
+
     {
         const server = new https.Server();
 

From ea9dfd9bddd1ed8102d9dfc86eeaef46cdad7d52 Mon Sep 17 00:00:00 2001
From: Christian Chown <christian@evosite.co.uk>
Date: Wed, 21 Mar 2018 12:27:59 +0000
Subject: [PATCH 0729/1382] strictNullChecks = true

---
 types/react-infinite-calendar/tsconfig.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/react-infinite-calendar/tsconfig.json b/types/react-infinite-calendar/tsconfig.json
index bf57e148ca..dab62fb64c 100644
--- a/types/react-infinite-calendar/tsconfig.json
+++ b/types/react-infinite-calendar/tsconfig.json
@@ -7,7 +7,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "jsx": "react",

From 6dc8b36c674cead34d80e747a7687097da0b15a1 Mon Sep 17 00:00:00 2001
From: Yaroslav <yaroslav.repeta@gmail.com>
Date: Wed, 21 Mar 2018 14:35:15 +0200
Subject: [PATCH 0730/1382] Type "Buffer" as primary key in "findById" and its
 alias "findByPrimary" functions.

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

diff --git a/types/sequelize/index.d.ts b/types/sequelize/index.d.ts
index a9b59a0766..74be4db7c3 100644
--- a/types/sequelize/index.d.ts
+++ b/types/sequelize/index.d.ts
@@ -3865,8 +3865,8 @@ declare namespace sequelize {
          * Search for a single instance by its primary key. This applies LIMIT 1, so the listener will
          * always be called with a single instance.
          */
-        findById<TCustomAttributes>(identifier?: number | string, options?: FindOptions<TAttributes & TCustomAttributes>): Promise<TInstance | null>;
-        findByPrimary<TCustomAttributes>(identifier?: number | string, options?: FindOptions<TAttributes & TCustomAttributes>): Promise<TInstance | null>;
+        findById<TCustomAttributes>(identifier?: number | string | Buffer, options?: FindOptions<TAttributes & TCustomAttributes>): Promise<TInstance | null>;
+        findByPrimary<TCustomAttributes>(identifier?: number | string | Buffer, options?: FindOptions<TAttributes & TCustomAttributes>): Promise<TInstance | null>;
 
         /**
          * Search for a single instance. This applies LIMIT 1, so the listener will always be called with a single

From 3a4346adbc05847d5724f69857be817ef0c74cdf Mon Sep 17 00:00:00 2001
From: Johannes Maximilian Toball <jmtoball@gedankenacker.de>
Date: Wed, 21 Mar 2018 13:39:21 +0100
Subject: [PATCH 0731/1382] visible and exists have optional callback

---
 types/nightmare/index.d.ts         |  6 +++---
 types/nightmare/nightmare-tests.ts | 14 ++++++++++----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/types/nightmare/index.d.ts b/types/nightmare/index.d.ts
index 061f22bd10..0ed68ef33b 100644
--- a/types/nightmare/index.d.ts
+++ b/types/nightmare/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Nightmare 2.10.0
+// Type definitions for Nightmare 2.10.1
 // Project: https://github.com/segmentio/nightmare
 // Definitions by: horiuchi <https://github.com/horiuchi>
 //                 Sam Yang <https://github.com/samyang-au>
@@ -57,8 +57,8 @@ declare class Nightmare {
     run(cb?: (err: any, nightmare: Nightmare) => void): Nightmare;
 
     // Extract
-    exists(selector: string, cb: (result: boolean) => void): Nightmare;
-    visible(selector: string, cb: (result: boolean) => void): Nightmare;
+    exists(selector: string, cb?: (result: boolean) => void): Nightmare;
+    visible(selector: string, cb?: (result: boolean) => void): Nightmare;
     on(event: string, cb: () => void): Nightmare;
     on(event: 'initialized', cb: () => void): Nightmare;
     on(event: 'loadStarted', cb: () => void): Nightmare;
diff --git a/types/nightmare/nightmare-tests.ts b/types/nightmare/nightmare-tests.ts
index 7eb376b996..ba7cc4998c 100644
--- a/types/nightmare/nightmare-tests.ts
+++ b/types/nightmare/nightmare-tests.ts
@@ -52,6 +52,16 @@ new Nightmare()
   })
   .run(done);
 
+new Nightmare()
+  .goto('http://www.wikipedia.org/')
+  .exists('a.link-box')
+  .then((exists: boolean) => { })
+
+new Nightmare()
+  .goto('http://www.wikipedia.org/')
+  .visible('a.link-box')
+  .then((isVisible: boolean) => { })
+
 new Nightmare()
   .goto('http://www.wikipedia.org/')
   .title(function (title) {
@@ -387,7 +397,3 @@ new Nightmare({ executionTimeout: 1000 })
       }, 2000)
     })
   })
-
-
-
-

From 8522b56feb0754737a165a543ee617c26c3da4df Mon Sep 17 00:00:00 2001
From: Yaroslav <yaroslav.repeta@gmail.com>
Date: Wed, 21 Mar 2018 15:02:20 +0200
Subject: [PATCH 0732/1382] Tests

---
 types/sequelize/sequelize-tests.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/types/sequelize/sequelize-tests.ts b/types/sequelize/sequelize-tests.ts
index f99988b29f..fb49abd88e 100644
--- a/types/sequelize/sequelize-tests.ts
+++ b/types/sequelize/sequelize-tests.ts
@@ -957,6 +957,12 @@ User.findAll( { where: { $or:[ { username: { $not: "user" } }, { theDate: new Da
 User.findAll( { where: { emails: { $overlap: ["me@mail.com", "you@mail.com"] } } } );
 
 User.findById( 'a string' );
+User.findById( 42 );
+User.findById( Buffer.from('a buffer') );
+
+User.findByPrimary( 'a string' );
+User.findByPrimary( 42 );
+User.findByPrimary( Buffer.from('a buffer') );
 
 User.findOne( { where : { username : 'foo' } } );
 User.findOne( { where : { id : 1 }, attributes : ['id', ['username', 'name']] } );

From a000a913af6b12acc27ba6d17011d14b72b54a73 Mon Sep 17 00:00:00 2001
From: Menushka Weeratunga <tmweeratunga@gmail.com>
Date: Wed, 21 Mar 2018 09:22:49 -0400
Subject: [PATCH 0733/1382] Fixed small typo for APN settings

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

diff --git a/types/node-pushnotifications/index.d.ts b/types/node-pushnotifications/index.d.ts
index 2134069936..5b9ed891f9 100644
--- a/types/node-pushnotifications/index.d.ts
+++ b/types/node-pushnotifications/index.d.ts
@@ -59,7 +59,7 @@ declare namespace PushNotifications {
             pfx?: Buffer | string;
             /** The passphrase for the connection key, if required */
             passphrase?: string;
-            productionv?: boolean;
+            production?: boolean;
             voip?: boolean;
             address?: string;
             port?: number;

From 428c74629144cf1973136c997761db802fcce61a Mon Sep 17 00:00:00 2001
From: Edward Sammut Alessi <edward.sammut.alessi@preeostudios.com>
Date: Wed, 21 Mar 2018 14:30:39 +0100
Subject: [PATCH 0734/1382] Typings for steam-client

---
 types/steam-client/index.d.ts            | 3390 ++++++++++++++++++++++
 types/steam-client/steam-client-tests.ts |   38 +
 types/steam-client/tsconfig.json         |   22 +
 types/steam-client/tslint.json           |    1 +
 4 files changed, 3451 insertions(+)
 create mode 100644 types/steam-client/index.d.ts
 create mode 100644 types/steam-client/steam-client-tests.ts
 create mode 100644 types/steam-client/tsconfig.json
 create mode 100644 types/steam-client/tslint.json

diff --git a/types/steam-client/index.d.ts b/types/steam-client/index.d.ts
new file mode 100644
index 0000000000..ec9f88565f
--- /dev/null
+++ b/types/steam-client/index.d.ts
@@ -0,0 +1,3390 @@
+// Type definitions for steam-client 2.5
+// Project: https://github.com/DoctorMcKay/node-steam-client
+// Definitions by: Edward Sammut Alessi <https://github.com/Slessi>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+/// <reference types="bytebuffer" />
+
+export class CMClient {
+    /**
+     * A boolean that indicates whether you are currently connected and the encryption handshake is complete.
+     * 'connected' is emitted when it changes to true, and 'error' is emitted when it changes to false unless you called disconnect.
+     * Sending any client messages is only allowed while this is true.
+     */
+    connected: boolean;
+
+    /**
+     * A boolean that indicates whether you are currently logged on.
+     * Calling any handler methods except for methods to log on is only allowed while logged on.
+     */
+    loggedOn: boolean;
+
+    /**
+     * Your own SteamID while logged on, otherwise unspecified.
+     * Must be set to a valid initial value before sending a logon message.
+     */
+    steamID: string;
+
+    /**
+     * If we've initiated a connection previously, a string containing "ipv4:port" for the server we're connecting/connected to.
+     * Also contains the address of the last host we were connected to if we're currently disconnected.
+     */
+    remoteAddress: string;
+
+    // Default is TCP. UDP support is experimental
+    constructor(protocol?: EConnectionProtocol);
+
+    /**
+     * Override the address and/or port that will be used for the outgoing connection.
+     * Takes effect the next time you connect.
+     *
+     * @param localAddress The local IP address you want to use for the outgoing connection
+     * @param localPort The local port you want to use for the outgoing connection
+     */
+    bind(localAddress?: string, localPort?: string | number): void;
+
+    /**
+     * Connects to Steam.It will keep trying to reconnect (provided autoRetry is not false) until encryption handshake is complete (see 'connected'), unless you cancel it with disconnect.
+     *
+     * You can call this method at any time. If you are already connected, disconnects you first. If there is an ongoing connection attempt, cancels it.
+     *
+     * @param server If you want to connect to a specific CM server, provide an object here containing host and port properties. Default is a random value from the servers property.
+     * @param autoRetry true if you want to automatically retry connection until successful, or false if you want an error event if connection fails. Default true
+     */
+    connect(server?: Server, autoRetry?: boolean): void;
+
+    /**
+     * Immediately terminates the connection and prevents any events (including 'error') from being emitted until you connect again.
+     * If you are already disconnected, does nothing.
+     * If there is an ongoing connection attempt, cancels it.
+     */
+    disconnect(): void;
+
+    /**
+     * Send a logon message to the CM.
+     * You must first be connected and set steamID to a valid initial value.
+     * You will receive the response in the logOnResponse event.
+     *
+     * @param details An object containing your logon parameters
+     */
+    logOn(details: CMsgClientLogonPassword | CMsgClientLogonLoginKey): void;
+
+    /**
+     *
+     * @param header
+     * @param body
+     * @param callback
+     */
+    send: SendMessage;
+
+    // Events
+
+    on<T extends keyof CMEventCallback>(eventType: T, callback: CMEventCallback[T]): void;
+}
+
+/**
+ * Steam.servers contains the list of CM servers that CMClient will attempt to connect to.
+ * The bootstrapped list is not always up-to-date and might contain dead servers.
+ * To avoid timeouts, replace it with your own list before logging in if you have one (see 'servers' event).
+ */
+export const servers: Server[];
+
+export type SendMessage = (
+    /**
+     * An object containing the message header. It has the following properties:
+     * The following fields are reserved for internal use and shall be ignored: steamid, client_sessionid, jobid_source, jobid_target.
+     * (Note: pass an empty object if you don't need to set any fields)
+     */
+    header: {
+        /**
+         * A value from EMsg
+         */
+        msg: EMsg,
+
+        /**
+         * A CMsgProtoBufHeader object if this message is protobuf-backed, otherwise header.proto is falsy.
+         */
+        proto?: CMsgProtoBufHeader | false
+    },
+
+    /**
+     * A Buffer or ByteBuffer containing the rest of the message
+     */
+    body: Buffer | ByteBuffer,
+
+    /**
+     * If not falsy, then this message is a request, and callback shall be called with any response to it instead of 'message'/send. callback has the same arguments as 'message'/send.
+     */
+    callback?: SendMessage | false
+) => void;
+
+export type CMEventCallback = {
+    /**
+     * Connection closed by the server.
+     * Only emitted if the encryption handshake is complete, otherwise it will reconnect automatically (unless you disabled autoRetry).
+     * loggedOn is now false.
+     *
+     * @param err An Error object. May contain an eresult property.
+     */
+    error: (err: Error) => void,
+
+    /**
+     * Encryption handshake complete.
+     * From now on, it's your responsibility to handle disconnections and reconnect (see error).
+     * You'll likely want to log on now.
+     *
+     * @param serverLoad The load value of the CM server you're connected to. Only available if you're connecting using UDP. It's unclear at this time what scale this value uses.
+     */
+    connected: (serverLoad: string) => void,
+
+    /**
+     * Logon response received. If eresult is EResult.OK, loggedOn is now true.
+     *
+     * @param response An object with the properties in CMsgClientLogonResponse
+     */
+    logOnResponse: (response: CMsgClientLogonResponse) => void,
+
+    /**
+     * CMClient will use this new list when reconnecting, but it will be lost when your application restarts.
+     * You might want to save it to a file or a database and assign it to Steam.servers before logging in next time.
+     *
+     * Note that Steam.servers will be automatically updated after this event is emitted.
+     * This will be useful if you want to compare the old list with the new one for some reason - otherwise it shouldn't matter.
+     *
+     * @param servers An array containing the up-to-date server list
+     */
+    servers: (servers: Server[]) => void,
+
+    /**
+     * You were logged off from Steam. loggedOn is now false.
+     *
+     * @param eresesult A value from EResult
+     */
+    loggedOff: (eresesult: EResult) => void,
+
+    message: SendMessage,
+};
+
+export type Server = {
+    host: string,
+    port: string | number,
+}
+
+// Protobufs
+
+export interface CMsgClientLogon {
+    /**
+     * Your steam login
+     */
+    account_name: string;
+
+    /**
+     * Steam Guard code. Must be valid if provided, otherwise the logon will fail. Note that Steam Guard codes expire after a short while
+     */
+    auth_code?: string;
+
+    /**
+     * Two-factor authentication code provided by the Steam mobile application. You will have to provide this code every time you log in if your account uses 2FA.
+     */
+    two_factor_code?: string;
+
+    /**
+     * SHA1 hash of your sentry file.
+     * If not provided, Steam will send you a sentry file through the ClientUpdateMachineAuth message (unless a limit for registered sentries is reached? see https://github.com/seishun/node-steam/issues/178).
+     * If no Steam Guard code is provided, the hash must be already registered with this account, otherwise it's ignored.
+     * This value will be ignored if you enable 2FA.
+     */
+    sha_sentryfile?: string;
+}
+
+export interface CMsgClientLogonPassword extends CMsgClientLogon {
+    /**
+     * Required unless login_key is used
+     */
+    password: string;
+}
+
+export interface CMsgClientLogonLoginKey extends CMsgClientLogon {
+    /**
+     * Alternative to password
+     */
+    login_key: string;
+}
+
+export interface CMsgClientLogonResponse {
+    /**
+     * The logon was successful if equal to EResult.OK
+     */
+    eresult: EResult;
+
+    /**
+     * "loginkey" to be used with WebAPI's AuthenticateUser."
+     */
+    webapi_authenticate_user_nonce: string;
+}
+
+export interface CMsgProtoBufHeader {
+	steamid?: string;
+	client_sessionid?: number;
+	routing_appid?: number;
+	jobid_source?: string;
+	jobid_target?: string;
+	target_job_name?: string;
+	seq_num?: number;
+	eresult?: number;
+	error_message?: string;
+	ip?: number;
+	auth_account_flags?: number;
+	token_source?: number;
+	admin_spoofing_user?: boolean;
+	transport_error?: number;
+	messageid?: string;
+	publisher_group_id?: number;
+	sysid?: number;
+	trace_tag?: string;
+	webapi_key_id?: number;
+	is_from_external_source?: boolean;
+	forward_to_sysid?: number[];
+}
+
+// Enums
+
+export enum EConnectionProtocol {
+    TCP = 1,
+    UDP = 2,
+    WebSocket = 3,
+}
+
+export enum EMsg {
+    Invalid = 0,
+    Multi = 1,
+    ProtobufWrapped = 2,
+
+    BaseGeneral = 100,
+    GenericReply = 100,
+    DestJobFailed = 113,
+    Alert = 115,
+    SCIDRequest = 120,
+    SCIDResponse = 121,
+    JobHeartbeat = 123,
+    HubConnect = 124,
+    Subscribe = 126,
+    RouteMessage = 127, // obsolete
+    RemoteSysID = 128, // obsolete
+    AMCreateAccountResponse = 129,
+    WGRequest = 130,
+    WGResponse = 131,
+    KeepAlive = 132,
+    WebAPIJobRequest = 133,
+    WebAPIJobResponse = 134,
+    ClientSessionStart = 135,
+    ClientSessionEnd = 136,
+    ClientSessionUpdateAuthTicket = 137, // obsolete "renamed to ClientSessionUpdate"
+    ClientSessionUpdate = 137,
+    StatsDeprecated = 138, // obsolete
+    Ping = 139,
+    PingResponse = 140,
+    Stats = 141,
+    RequestFullStatsBlock = 142,
+    LoadDBOCacheItem = 143,
+    LoadDBOCacheItemResponse = 144,
+    InvalidateDBOCacheItems = 145,
+    ServiceMethod = 146,
+    ServiceMethodResponse = 147,
+    ClientPackageVersions = 148,
+    TimestampRequest = 149,
+    TimestampResponse = 150,
+
+    BaseShell = 200,
+    AssignSysID = 200,
+    Exit = 201,
+    DirRequest = 202,
+    DirResponse = 203,
+    ZipRequest = 204,
+    ZipResponse = 205,
+    UpdateRecordResponse = 215,
+    UpdateCreditCardRequest = 221,
+    UpdateUserBanResponse = 225,
+    PrepareToExit = 226,
+    ContentDescriptionUpdate = 227,
+    TestResetServer = 228,
+    UniverseChanged = 229,
+    ShellConfigInfoUpdate = 230,
+    RequestWindowsEventLogEntries = 233,
+    ProvideWindowsEventLogEntries = 234,
+    ShellSearchLogs = 235,
+    ShellSearchLogsResponse = 236,
+    ShellCheckWindowsUpdates = 237,
+    ShellCheckWindowsUpdatesResponse = 238,
+    ShellFlushUserLicenseCache = 239, // obsolete
+
+    BaseGM = 300,
+    Heartbeat = 300,
+    ShellFailed = 301,
+    ExitShells = 307,
+    ExitShell = 308,
+    GracefulExitShell = 309,
+    NotifyWatchdog = 314,
+    LicenseProcessingComplete = 316,
+    SetTestFlag = 317,
+    QueuedEmailsComplete = 318,
+    GMReportPHPError = 319,
+    GMDRMSync = 320,
+    PhysicalBoxInventory = 321,
+    UpdateConfigFile = 322,
+    TestInitDB = 323,
+    GMWriteConfigToSQL = 324,
+    GMLoadActivationCodes = 325,
+    GMQueueForFBS = 326,
+    GMSchemaConversionResults = 327,
+    GMSchemaConversionResultsResponse = 328, // obsolete
+    GMWriteShellFailureToSQL = 329,
+    GMWriteStatsToSOS = 330,
+    GMGetServiceMethodRouting = 331,
+    GMGetServiceMethodRoutingResponse = 332,
+    GMConvertUserWallets = 333,
+
+    BaseAIS = 400,
+    AISRefreshContentDescription = 401, // obsolete
+    AISRequestContentDescription = 402,
+    AISUpdateAppInfo = 403,
+    AISUpdatePackageInfo = 404, // obsolete "renamed to AISUpdatePackageCosts"
+    AISUpdatePackageCosts = 404,
+    AISGetPackageChangeNumber = 405,
+    AISGetPackageChangeNumberResponse = 406,
+    AISAppInfoTableChanged = 407, // obsolete
+    AISUpdatePackageCostsResponse = 408,
+    AISCreateMarketingMessage = 409,
+    AISCreateMarketingMessageResponse = 410,
+    AISGetMarketingMessage = 411,
+    AISGetMarketingMessageResponse = 412,
+    AISUpdateMarketingMessage = 413,
+    AISUpdateMarketingMessageResponse = 414,
+    AISRequestMarketingMessageUpdate = 415,
+    AISDeleteMarketingMessage = 416,
+    AISGetMarketingTreatments = 419, // obsolete
+    AISGetMarketingTreatmentsResponse = 420, // obsolete
+    AISRequestMarketingTreatmentUpdate = 421, // obsolete
+    AISTestAddPackage = 422, // obsolete
+    AIGetAppGCFlags = 423,
+    AIGetAppGCFlagsResponse = 424,
+    AIGetAppList = 425,
+    AIGetAppListResponse = 426,
+    AIGetAppInfo = 427, // obsolete
+    AIGetAppInfoResponse = 428, // obsolete
+    AISGetCouponDefinition = 429,
+    AISGetCouponDefinitionResponse = 430,
+    AISUpdateSlaveContentDescription = 431,
+    AISUpdateSlaveContentDescriptionResponse = 432,
+    AISTestEnableGC = 433,
+
+    BaseAM = 500,
+    AMUpdateUserBanRequest = 504,
+    AMAddLicense = 505,
+    AMBeginProcessingLicenses = 507, // obsolete
+    AMSendSystemIMToUser = 508,
+    AMExtendLicense = 509,
+    AMAddMinutesToLicense = 510,
+    AMCancelLicense = 511,
+    AMInitPurchase = 512,
+    AMPurchaseResponse = 513,
+    AMGetFinalPrice = 514,
+    AMGetFinalPriceResponse = 515,
+    AMGetLegacyGameKey = 516,
+    AMGetLegacyGameKeyResponse = 517,
+    AMFindHungTransactions = 518,
+    AMSetAccountTrustedRequest = 519,
+    AMCompletePurchase = 521,
+    AMCancelPurchase = 522,
+    AMNewChallenge = 523,
+    AMLoadOEMTickets = 524,
+    AMFixPendingPurchase = 525,
+    AMFixPendingPurchaseResponse = 526,
+    AMIsUserBanned = 527,
+    AMRegisterKey = 528,
+    AMLoadActivationCodes = 529,
+    AMLoadActivationCodesResponse = 530,
+    AMLookupKeyResponse = 531,
+    AMLookupKey = 532,
+    AMChatCleanup = 533,
+    AMClanCleanup = 534,
+    AMFixPendingRefund = 535,
+    AMReverseChargeback = 536,
+    AMReverseChargebackResponse = 537,
+    AMClanCleanupList = 538,
+    AMGetLicenses = 539,
+    AMGetLicensesResponse = 540,
+    AllowUserToPlayQuery = 550,
+    AllowUserToPlayResponse = 551,
+    AMVerfiyUser = 552,
+    AMClientNotPlaying = 553,
+    ClientRequestFriendship = 554,
+    AMRelayPublishStatus = 555,
+    AMResetCommunityContent = 556, // obsolete
+    AMPrimePersonaStateCache = 557, // obsolete
+    AMAllowUserContentQuery = 558, // obsolete
+    AMAllowUserContentResponse = 559, // obsolete
+    AMInitPurchaseResponse = 560,
+    AMRevokePurchaseResponse = 561,
+    AMLockProfile = 562, // obsolete
+    AMRefreshGuestPasses = 563,
+    AMInviteUserToClan = 564,
+    AMAcknowledgeClanInvite = 565,
+    AMGrantGuestPasses = 566,
+    AMClanDataUpdated = 567,
+    AMReloadAccount = 568,
+    AMClientChatMsgRelay = 569,
+    AMChatMulti = 570,
+    AMClientChatInviteRelay = 571,
+    AMChatInvite = 572,
+    AMClientJoinChatRelay = 573,
+    AMClientChatMemberInfoRelay = 574,
+    AMPublishChatMemberInfo = 575,
+    AMClientAcceptFriendInvite = 576,
+    AMChatEnter = 577,
+    AMClientPublishRemovalFromSource = 578,
+    AMChatActionResult = 579,
+    AMFindAccounts = 580,
+    AMFindAccountsResponse = 581,
+    AMRequestAccountData = 582,
+    AMRequestAccountDataResponse = 583,
+    AMSetAccountFlags = 584,
+    AMCreateClan = 586,
+    AMCreateClanResponse = 587,
+    AMGetClanDetails = 588,
+    AMGetClanDetailsResponse = 589,
+    AMSetPersonaName = 590,
+    AMSetAvatar = 591,
+    AMAuthenticateUser = 592,
+    AMAuthenticateUserResponse = 593,
+    AMGetAccountFriendsCount = 594, // obsolete
+    AMGetAccountFriendsCountResponse = 595, // obsolete
+    AMP2PIntroducerMessage = 596,
+    ClientChatAction = 597,
+    AMClientChatActionRelay = 598,
+
+    BaseVS = 600,
+    ReqChallenge = 600,
+    VACResponse = 601,
+    ReqChallengeTest = 602,
+    VSMarkCheat = 604,
+    VSAddCheat = 605,
+    VSPurgeCodeModDB = 606,
+    VSGetChallengeResults = 607,
+    VSChallengeResultText = 608,
+    VSReportLingerer = 609,
+    VSRequestManagedChallenge = 610,
+    VSLoadDBFinished = 611,
+
+    BaseDRMS = 625,
+    DRMBuildBlobRequest = 628,
+    DRMBuildBlobResponse = 629,
+    DRMResolveGuidRequest = 630,
+    DRMResolveGuidResponse = 631,
+    DRMVariabilityReport = 633,
+    DRMVariabilityReportResponse = 634,
+    DRMStabilityReport = 635,
+    DRMStabilityReportResponse = 636,
+    DRMDetailsReportRequest = 637,
+    DRMDetailsReportResponse = 638,
+    DRMProcessFile = 639,
+    DRMAdminUpdate = 640,
+    DRMAdminUpdateResponse = 641,
+    DRMSync = 642,
+    DRMSyncResponse = 643,
+    DRMProcessFileResponse = 644,
+    DRMEmptyGuidCache = 645,
+    DRMEmptyGuidCacheResponse = 646,
+
+    BaseCS = 650,
+    CSUserContentRequest = 652, // obsolete
+
+    BaseClient = 700,
+    ClientLogOn_Deprecated = 701, // obsolete
+    ClientAnonLogOn_Deprecated = 702, // obsolete
+    ClientHeartBeat = 703,
+    ClientVACResponse = 704,
+    ClientGamesPlayed_obsolete = 705, // obsolete
+    ClientLogOff = 706,
+    ClientNoUDPConnectivity = 707,
+    ClientInformOfCreateAccount = 708,
+    ClientAckVACBan = 709, // obsolete
+    ClientConnectionStats = 710,
+    ClientInitPurchase = 711, // obsolete
+    ClientPingResponse = 712,
+    ClientRemoveFriend = 714,
+    ClientGamesPlayedNoDataBlob = 715,
+    ClientChangeStatus = 716,
+    ClientVacStatusResponse = 717,
+    ClientFriendMsg = 718,
+    ClientGameConnect_obsolete = 719, // obsolete
+    ClientGamesPlayed2_obsolete = 720, // obsolete
+    ClientGameEnded_obsolete = 721, // obsolete
+    ClientGetFinalPrice = 722, // obsolete
+    ClientSystemIM = 726,
+    ClientSystemIMAck = 727,
+    ClientGetLicenses = 728,
+    ClientCancelLicense = 729, // obsolete
+    ClientGetLegacyGameKey = 730,
+    ClientContentServerLogOn_Deprecated = 731, // obsolete
+    ClientAckVACBan2 = 732,
+    ClientAckMessageByGID = 735, // obsolete
+    ClientGetPurchaseReceipts = 736,
+    ClientAckPurchaseReceipt = 737, // obsolete
+    ClientGamesPlayed3_obsolete = 738, // obsolete
+    ClientSendGuestPass = 739, // obsolete
+    ClientAckGuestPass = 740,
+    ClientRedeemGuestPass = 741,
+    ClientGamesPlayed = 742,
+    ClientRegisterKey = 743,
+    ClientInviteUserToClan = 744,
+    ClientAcknowledgeClanInvite = 745,
+    ClientPurchaseWithMachineID = 746,
+    ClientAppUsageEvent = 747,
+    ClientGetGiftTargetList = 748, // obsolete
+    ClientGetGiftTargetListResponse = 749, // obsolete
+    ClientLogOnResponse = 751,
+    ClientVACChallenge = 753, // obsolete
+    ClientSetHeartbeatRate = 755,
+    ClientNotLoggedOnDeprecated = 756, // obsolete
+    ClientLoggedOff = 757,
+    GSApprove = 758,
+    GSDeny = 759,
+    GSKick = 760,
+    ClientCreateAcctResponse = 761,
+    ClientPurchaseResponse = 763,
+    ClientPing = 764,
+    ClientNOP = 765,
+    ClientPersonaState = 766,
+    ClientFriendsList = 767,
+    ClientAccountInfo = 768,
+    ClientVacStatusQuery = 770, // obsolete
+    ClientNewsUpdate = 771,
+    ClientGameConnectDeny = 773,
+    GSStatusReply = 774,
+    ClientGetFinalPriceResponse = 775, // obsolete
+    ClientGameConnectTokens = 779,
+    ClientLicenseList = 780,
+    ClientCancelLicenseResponse = 781, // obsolete
+    ClientVACBanStatus = 782,
+    ClientCMList = 783,
+    ClientEncryptPct = 784,
+    ClientGetLegacyGameKeyResponse = 785,
+    ClientFavoritesList = 786, // obsolete
+    CSUserContentApprove = 787, // obsolete
+    CSUserContentDeny = 788, // obsolete
+    ClientInitPurchaseResponse = 789, // obsolete
+    ClientAddFriend = 791,
+    ClientAddFriendResponse = 792,
+    ClientInviteFriend = 793, // obsolete
+    ClientInviteFriendResponse = 794, // obsolete
+    ClientSendGuestPassResponse = 795, // obsolete
+    ClientAckGuestPassResponse = 796,
+    ClientRedeemGuestPassResponse = 797,
+    ClientUpdateGuestPassesList = 798,
+    ClientChatMsg = 799,
+    ClientChatInvite = 800,
+    ClientJoinChat = 801,
+    ClientChatMemberInfo = 802,
+    ClientLogOnWithCredentials_Deprecated = 803, // obsolete
+    ClientPasswordChangeResponse = 805,
+    ClientChatEnter = 807,
+    ClientFriendRemovedFromSource = 808,
+    ClientCreateChat = 809,
+    ClientCreateChatResponse = 810,
+    ClientUpdateChatMetadata = 811, // obsolete
+    ClientP2PIntroducerMessage = 813,
+    ClientChatActionResult = 814,
+    ClientRequestFriendData = 815,
+    ClientGetUserStats = 818,
+    ClientGetUserStatsResponse = 819,
+    ClientStoreUserStats = 820,
+    ClientStoreUserStatsResponse = 821,
+    ClientClanState = 822,
+    ClientServiceModule = 830,
+    ClientServiceCall = 831,
+    ClientServiceCallResponse = 832,
+    ClientPackageInfoRequest = 833, // obsolete
+    ClientPackageInfoResponse = 834, // obsolete
+    ClientNatTraversalStatEvent = 839,
+    ClientAppInfoRequest = 840, // obsolete
+    ClientAppInfoResponse = 841, // obsolete
+    ClientSteamUsageEvent = 842,
+    ClientCheckPassword = 845,
+    ClientResetPassword = 846,
+    ClientCheckPasswordResponse = 848,
+    ClientResetPasswordResponse = 849,
+    ClientSessionToken = 850,
+    ClientDRMProblemReport = 851,
+    ClientSetIgnoreFriend = 855,
+    ClientSetIgnoreFriendResponse = 856,
+    ClientGetAppOwnershipTicket = 857,
+    ClientGetAppOwnershipTicketResponse = 858,
+    ClientGetLobbyListResponse = 860,
+    ClientGetLobbyMetadata = 861, // obsolete
+    ClientGetLobbyMetadataResponse = 862, // obsolete
+    ClientVTTCert = 863, // obsolete
+    ClientAppInfoUpdate = 866, // obsolete
+    ClientAppInfoChanges = 867, // obsolete
+    ClientServerList = 880,
+    ClientEmailChangeResponse = 891,
+    ClientSecretQAChangeResponse = 892,
+    ClientDRMBlobRequest = 896,
+    ClientDRMBlobResponse = 897,
+    ClientLookupKey = 898, // obsolete
+    ClientLookupKeyResponse = 899, // obsolete
+
+    BaseGameServer = 900,
+    GSDisconnectNotice = 901,
+    GSStatus = 903,
+    GSUserPlaying = 905,
+    GSStatus2 = 906,
+    GSStatusUpdate_Unused = 907,
+    GSServerType = 908,
+    GSPlayerList = 909,
+    GSGetUserAchievementStatus = 910,
+    GSGetUserAchievementStatusResponse = 911,
+    GSGetPlayStats = 918,
+    GSGetPlayStatsResponse = 919,
+    GSGetUserGroupStatus = 920,
+    AMGetUserGroupStatus = 921,
+    AMGetUserGroupStatusResponse = 922,
+    GSGetUserGroupStatusResponse = 923,
+    GSGetReputation = 936,
+    GSGetReputationResponse = 937,
+    GSAssociateWithClan = 938,
+    GSAssociateWithClanResponse = 939,
+    GSComputeNewPlayerCompatibility = 940,
+    GSComputeNewPlayerCompatibilityResponse = 941,
+
+    BaseAdmin = 1000,
+    AdminCmd = 1000,
+    AdminCmdResponse = 1004,
+    AdminLogListenRequest = 1005,
+    AdminLogEvent = 1006,
+    LogSearchRequest = 1007, // obsolete
+    LogSearchResponse = 1008, // obsolete
+    LogSearchCancel = 1009, // obsolete
+    UniverseData = 1010,
+    RequestStatHistory = 1014, // obsolete
+    StatHistory = 1015, // obsolete
+    AdminPwLogon = 1017, // obsolete
+    AdminPwLogonResponse = 1018, // obsolete
+    AdminSpew = 1019,
+    AdminConsoleTitle = 1020,
+    AdminGCSpew = 1023,
+    AdminGCCommand = 1024,
+    AdminGCGetCommandList = 1025,
+    AdminGCGetCommandListResponse = 1026,
+    FBSConnectionData = 1027,
+    AdminMsgSpew = 1028,
+
+    BaseFBS = 1100,
+    FBSReqVersion = 1100,
+    FBSVersionInfo = 1101,
+    FBSForceRefresh = 1102,
+    FBSForceBounce = 1103,
+    FBSDeployPackage = 1104,
+    FBSDeployResponse = 1105,
+    FBSUpdateBootstrapper = 1106,
+    FBSSetState = 1107,
+    FBSApplyOSUpdates = 1108,
+    FBSRunCMDScript = 1109,
+    FBSRebootBox = 1110,
+    FBSSetBigBrotherMode = 1111,
+    FBSMinidumpServer = 1112,
+    FBSSetShellCount_obsolete = 1113, // obsolete
+    FBSDeployHotFixPackage = 1114,
+    FBSDeployHotFixResponse = 1115,
+    FBSDownloadHotFix = 1116,
+    FBSDownloadHotFixResponse = 1117,
+    FBSUpdateTargetConfigFile = 1118,
+    FBSApplyAccountCred = 1119,
+    FBSApplyAccountCredResponse = 1120,
+    FBSSetShellCount = 1121,
+    FBSTerminateShell = 1122,
+    FBSQueryGMForRequest = 1123,
+    FBSQueryGMResponse = 1124,
+    FBSTerminateZombies = 1125,
+    FBSInfoFromBootstrapper = 1126,
+    FBSRebootBoxResponse = 1127,
+    FBSBootstrapperPackageRequest = 1128,
+    FBSBootstrapperPackageResponse = 1129,
+    FBSBootstrapperGetPackageChunk = 1130,
+    FBSBootstrapperGetPackageChunkResponse = 1131,
+    FBSBootstrapperPackageTransferProgress = 1132,
+    FBSRestartBootstrapper = 1133,
+
+    BaseFileXfer = 1200,
+    FileXferRequest = 1200,
+    FileXferResponse = 1201,
+    FileXferData = 1202,
+    FileXferEnd = 1203,
+    FileXferDataAck = 1204,
+
+    BaseChannelAuth = 1300,
+    ChannelAuthChallenge = 1300,
+    ChannelAuthResponse = 1301,
+    ChannelAuthResult = 1302,
+    ChannelEncryptRequest = 1303,
+    ChannelEncryptResponse = 1304,
+    ChannelEncryptResult = 1305,
+
+    BaseBS = 1400,
+    BSPurchaseStart = 1401,
+    BSPurchaseResponse = 1402, // obsolete
+    BSSettleNOVA = 1404, // obsolete
+    BSSettleComplete = 1406,
+    BSBannedRequest = 1407, // obsolete
+    BSInitPayPalTxn = 1408,
+    BSInitPayPalTxnResponse = 1409,
+    BSGetPayPalUserInfo = 1410,
+    BSGetPayPalUserInfoResponse = 1411,
+    BSRefundTxn = 1413, // obsolete
+    BSRefundTxnResponse = 1414, // obsolete
+    BSGetEvents = 1415, // obsolete
+    BSChaseRFRRequest = 1416, // obsolete
+    BSPaymentInstrBan = 1417,
+    BSPaymentInstrBanResponse = 1418,
+    BSProcessGCReports = 1419, // obsolete
+    BSProcessPPReports = 1420, // obsolete
+    BSInitGCBankXferTxn = 1421,
+    BSInitGCBankXferTxnResponse = 1422,
+    BSQueryGCBankXferTxn = 1423, // obsolete
+    BSQueryGCBankXferTxnResponse = 1424, // obsolete
+    BSCommitGCTxn = 1425,
+    BSQueryTransactionStatus = 1426,
+    BSQueryTransactionStatusResponse = 1427,
+    BSQueryCBOrderStatus = 1428, // obsolete
+    BSQueryCBOrderStatusResponse = 1429, // obsolete
+    BSRunRedFlagReport = 1430, // obsolete
+    BSQueryPaymentInstUsage = 1431,
+    BSQueryPaymentInstResponse = 1432,
+    BSQueryTxnExtendedInfo = 1433,
+    BSQueryTxnExtendedInfoResponse = 1434,
+    BSUpdateConversionRates = 1435,
+    BSProcessUSBankReports = 1436, // obsolete
+    BSPurchaseRunFraudChecks = 1437,
+    BSPurchaseRunFraudChecksResponse = 1438,
+    BSStartShippingJobs = 1439, // obsolete
+    BSQueryBankInformation = 1440,
+    BSQueryBankInformationResponse = 1441,
+    BSValidateXsollaSignature = 1445,
+    BSValidateXsollaSignatureResponse = 1446,
+    BSQiwiWalletInvoice = 1448,
+    BSQiwiWalletInvoiceResponse = 1449,
+    BSUpdateInventoryFromProPack = 1450,
+    BSUpdateInventoryFromProPackResponse = 1451,
+    BSSendShippingRequest = 1452,
+    BSSendShippingRequestResponse = 1453,
+    BSGetProPackOrderStatus = 1454,
+    BSGetProPackOrderStatusResponse = 1455,
+    BSCheckJobRunning = 1456,
+    BSCheckJobRunningResponse = 1457,
+    BSResetPackagePurchaseRateLimit = 1458,
+    BSResetPackagePurchaseRateLimitResponse = 1459,
+    BSUpdatePaymentData = 1460,
+    BSUpdatePaymentDataResponse = 1461,
+    BSGetBillingAddress = 1462,
+    BSGetBillingAddressResponse = 1463,
+    BSGetCreditCardInfo = 1464,
+    BSGetCreditCardInfoResponse = 1465,
+    BSRemoveExpiredPaymentData = 1468,
+    BSRemoveExpiredPaymentDataResponse = 1469,
+    BSConvertToCurrentKeys = 1470,
+    BSConvertToCurrentKeysResponse = 1471,
+    BSInitPurchase = 1472,
+    BSInitPurchaseResponse = 1473,
+    BSCompletePurchase = 1474,
+    BSCompletePurchaseResponse = 1475,
+    BSPruneCardUsageStats = 1476,
+    BSPruneCardUsageStatsResponse = 1477,
+    BSStoreBankInformation = 1478,
+    BSStoreBankInformationResponse = 1479,
+    BSVerifyPOSAKey = 1480,
+    BSVerifyPOSAKeyResponse = 1481,
+    BSReverseRedeemPOSAKey = 1482,
+    BSReverseRedeemPOSAKeyResponse = 1483,
+    BSQueryFindCreditCard = 1484,
+    BSQueryFindCreditCardResponse = 1485,
+    BSStatusInquiryPOSAKey = 1486,
+    BSStatusInquiryPOSAKeyResponse = 1487,
+    BSValidateMoPaySignature = 1488,
+    BSValidateMoPaySignatureResponse = 1489,
+    BSMoPayConfirmProductDelivery = 1490,
+    BSMoPayConfirmProductDeliveryResponse = 1491,
+    BSGenerateMoPayMD5 = 1492,
+    BSGenerateMoPayMD5Response = 1493,
+    BSBoaCompraConfirmProductDelivery = 1494,
+    BSBoaCompraConfirmProductDeliveryResponse = 1495,
+    BSGenerateBoaCompraMD5 = 1496,
+    BSGenerateBoaCompraMD5Response = 1497,
+    BSCommitWPTxn = 1498,
+
+    BaseATS = 1500,
+    ATSStartStressTest = 1501,
+    ATSStopStressTest = 1502,
+    ATSRunFailServerTest = 1503,
+    ATSUFSPerfTestTask = 1504,
+    ATSUFSPerfTestResponse = 1505,
+    ATSCycleTCM = 1506,
+    ATSInitDRMSStressTest = 1507,
+    ATSCallTest = 1508,
+    ATSCallTestReply = 1509,
+    ATSStartExternalStress = 1510,
+    ATSExternalStressJobStart = 1511,
+    ATSExternalStressJobQueued = 1512,
+    ATSExternalStressJobRunning = 1513,
+    ATSExternalStressJobStopped = 1514,
+    ATSExternalStressJobStopAll = 1515,
+    ATSExternalStressActionResult = 1516,
+    ATSStarted = 1517,
+    ATSCSPerfTestTask = 1518,
+    ATSCSPerfTestResponse = 1519,
+
+    BaseDP = 1600,
+    DPSetPublishingState = 1601,
+    DPGamePlayedStats = 1602, // obsolete
+    DPUniquePlayersStat = 1603,
+    DPStreamingUniquePlayersStat = 1604,
+    DPVacInfractionStats = 1605,
+    DPVacBanStats = 1606,
+    DPBlockingStats = 1607,
+    DPNatTraversalStats = 1608,
+    DPSteamUsageEvent = 1609, // obsolete
+    DPVacCertBanStats = 1610,
+    DPVacCafeBanStats = 1611,
+    DPCloudStats = 1612,
+    DPAchievementStats = 1613,
+    DPAccountCreationStats = 1614,
+    DPGetPlayerCount = 1615,
+    DPGetPlayerCountResponse = 1616,
+    DPGameServersPlayersStats = 1617,
+    DPDownloadRateStatistics = 1618, // obsolete
+    DPFacebookStatistics = 1619,
+    ClientDPCheckSpecialSurvey = 1620,
+    ClientDPCheckSpecialSurveyResponse = 1621,
+    ClientDPSendSpecialSurveyResponse = 1622,
+    ClientDPSendSpecialSurveyResponseReply = 1623,
+    DPStoreSaleStatistics = 1624,
+    ClientDPUpdateAppJobReport = 1625,
+    ClientDPSteam2AppStarted = 1627, // obsolete
+    DPUpdateContentEvent = 1626,
+    DPPartnerMicroTxns = 1628,
+    DPPartnerMicroTxnsResponse = 1629,
+    ClientDPContentStatsReport = 1630,
+    DPVRUniquePlayersStat = 1631,
+
+    BaseCM = 1700,
+    CMSetAllowState = 1701,
+    CMSpewAllowState = 1702,
+    CMAppInfoResponseDeprecated = 1703, // obsolete
+
+    BaseDSS = 1800, // obsolete
+    DSSNewFile = 1801, // obsolete
+    DSSCurrentFileList = 1802, // obsolete
+    DSSSynchList = 1803, // obsolete
+    DSSSynchListResponse = 1804, // obsolete
+    DSSSynchSubscribe = 1805, // obsolete
+    DSSSynchUnsubscribe = 1806, // obsolete
+
+    BaseEPM = 1900, // obsolete
+    EPMStartProcess = 1901, // obsolete
+    EPMStopProcess = 1902, // obsolete
+    EPMRestartProcess = 1903, // obsolete
+
+    BaseGC = 2200,
+    GCSendClient = 2200, // obsolete
+    AMRelayToGC = 2201, // obsolete
+    GCUpdatePlayedState = 2202, // obsolete
+    GCCmdRevive = 2203,
+    GCCmdBounce = 2204, // obsolete
+    GCCmdForceBounce = 2205, // obsolete
+    GCCmdDown = 2206,
+    GCCmdDeploy = 2207,
+    GCCmdDeployResponse = 2208,
+    GCCmdSwitch = 2209,
+    AMRefreshSessions = 2210,
+    GCUpdateGSState = 2211, // obsolete
+    GCAchievementAwarded = 2212,
+    GCSystemMessage = 2213,
+    GCValidateSession = 2214, // obsolete
+    GCValidateSessionResponse = 2215, // obsolete
+    GCCmdStatus = 2216,
+    GCRegisterWebInterfaces = 2217, // obsolete
+    GCRegisterWebInterfaces_Deprecated = 2217, // obsolete
+    GCGetAccountDetails = 2218, // obsolete
+    GCGetAccountDetails_DEPRECATED = 2218, // obsolete
+    GCInterAppMessage = 2219,
+    GCGetEmailTemplate = 2220,
+    GCGetEmailTemplateResponse = 2221,
+    ISRelayToGCH = 2222, // obsolete "renamed to GCHRelay"
+    GCHRelay = 2222,
+    GCHRelayClientToIS = 2223, // obsolete "renamed to GCHRelayToClient"
+    GCHRelayToClient = 2223,
+    GCHUpdateSession = 2224,
+    GCHRequestUpdateSession = 2225,
+    GCHRequestStatus = 2226,
+    GCHRequestStatusResponse = 2227,
+    GCHAccountVacStatusChange = 2228,
+    GCHSpawnGC = 2229,
+    GCHSpawnGCResponse = 2230,
+    GCHKillGC = 2231,
+    GCHKillGCResponse = 2232,
+    GCHAccountTradeBanStatusChange = 2233,
+    GCHAccountLockStatusChange = 2234,
+    GCHVacVerificationChange = 2235,
+    GCHAccountPhoneNumberChange = 2236,
+    GCHAccountTwoFactorChange = 2237,
+
+    BaseP2P = 2500,
+    P2PIntroducerMessage = 2502,
+
+    BaseSM = 2900,
+    SMExpensiveReport = 2902,
+    SMHourlyReport = 2903,
+    SMFishingReport = 2904,
+    SMPartitionRenames = 2905,
+    SMMonitorSpace = 2906,
+    SMGetSchemaConversionResults = 2907, // obsolete
+    SMGetSchemaConversionResultsResponse = 2908, // obsolete
+
+    BaseTest = 3000,
+    FailServer = 3000,
+    JobHeartbeatTest = 3001,
+    JobHeartbeatTestResponse = 3002,
+
+    BaseFTSRange = 3100,
+    FTSGetBrowseCounts = 3101, // obsolete
+    FTSGetBrowseCountsResponse = 3102, // obsolete
+    FTSBrowseClans = 3103, // obsolete
+    FTSBrowseClansResponse = 3104, // obsolete
+    FTSSearchClansByLocation = 3105, // obsolete
+    FTSSearchClansByLocationResponse = 3106, // obsolete
+    FTSSearchPlayersByLocation = 3107, // obsolete
+    FTSSearchPlayersByLocationResponse = 3108, // obsolete
+    FTSClanDeleted = 3109, // obsolete
+    FTSSearch = 3110, // obsolete
+    FTSSearchResponse = 3111, // obsolete
+    FTSSearchStatus = 3112, // obsolete
+    FTSSearchStatusResponse = 3113, // obsolete
+    FTSGetGSPlayStats = 3114, // obsolete
+    FTSGetGSPlayStatsResponse = 3115, // obsolete
+    FTSGetGSPlayStatsForServer = 3116, // obsolete
+    FTSGetGSPlayStatsForServerResponse = 3117, // obsolete
+    FTSReportIPUpdates = 3118, // obsolete
+
+    BaseCCSRange = 3150,
+    CCSGetComments = 3151, // obsolete
+    CCSGetCommentsResponse = 3152, // obsolete
+    CCSAddComment = 3153, // obsolete
+    CCSAddCommentResponse = 3154, // obsolete
+    CCSDeleteComment = 3155, // obsolete
+    CCSDeleteCommentResponse = 3156, // obsolete
+    CCSPreloadComments = 3157, // obsolete
+    CCSNotifyCommentCount = 3158, // obsolete
+    CCSGetCommentsForNews = 3159, // obsolete
+    CCSGetCommentsForNewsResponse = 3160, // obsolete
+    CCSDeleteAllCommentsByAuthor = 3161,
+    CCSDeleteAllCommentsByAuthorResponse = 3162,
+
+
+    BaseLBSRange = 3200,
+    LBSSetScore = 3201,
+    LBSSetScoreResponse = 3202,
+    LBSFindOrCreateLB = 3203,
+    LBSFindOrCreateLBResponse = 3204,
+    LBSGetLBEntries = 3205,
+    LBSGetLBEntriesResponse = 3206,
+    LBSGetLBList = 3207,
+    LBSGetLBListResponse = 3208,
+    LBSSetLBDetails = 3209,
+    LBSDeleteLB = 3210,
+    LBSDeleteLBEntry = 3211,
+    LBSResetLB = 3212,
+    LBSResetLBResponse = 3213,
+    LBSDeleteLBResponse = 3214,
+
+    BaseOGS = 3400,
+    OGSBeginSession = 3401,
+    OGSBeginSessionResponse = 3402,
+    OGSEndSession = 3403,
+    OGSEndSessionResponse = 3404,
+    OGSWriteAppSessionRow = 3406,
+
+    BaseBRP = 3600,
+    BRPStartShippingJobs = 3601,
+    BRPProcessUSBankReports = 3602,
+    BRPProcessGCReports = 3603,
+    BRPProcessPPReports = 3604,
+    BRPSettleNOVA = 3605, // obsolete
+    BRPSettleCB = 3606, // obsolete
+    BRPCommitGC = 3607,
+    BRPCommitGCResponse = 3608,
+    BRPFindHungTransactions = 3609,
+    BRPCheckFinanceCloseOutDate = 3610,
+    BRPProcessLicenses = 3611,
+    BRPProcessLicensesResponse = 3612,
+    BRPRemoveExpiredPaymentData = 3613,
+    BRPRemoveExpiredPaymentDataResponse = 3614,
+    BRPConvertToCurrentKeys = 3615,
+    BRPConvertToCurrentKeysResponse = 3616,
+    BRPPruneCardUsageStats = 3617,
+    BRPPruneCardUsageStatsResponse = 3618,
+    BRPCheckActivationCodes = 3619,
+    BRPCheckActivationCodesResponse = 3620,
+    BRPCommitWP = 3621,
+    BRPCommitWPResponse = 3622,
+    BRPProcessWPReports = 3623,
+    BRPProcessPaymentRules = 3624,
+    BRPProcessPartnerPayments = 3625,
+    BRPCheckSettlementReports = 3626,
+    BRPPostTaxToAvalara = 3628,
+    BRPPostTransactionTax = 3629,
+    BRPPostTransactionTaxResponse = 3630,
+    BRPProcessIMReports = 3631,
+
+    BaseAMRange2 = 4000,
+    AMCreateChat = 4001,
+    AMCreateChatResponse = 4002,
+    AMUpdateChatMetadata = 4003, // obsolete
+    AMPublishChatMetadata = 4004, // obsolete
+    AMSetProfileURL = 4005,
+    AMGetAccountEmailAddress = 4006,
+    AMGetAccountEmailAddressResponse = 4007,
+    AMRequestFriendData = 4008, // obsolete "renamed to AMRequestClanData"
+    AMRequestClanData = 4008,
+    AMRouteToClients = 4009,
+    AMLeaveClan = 4010,
+    AMClanPermissions = 4011,
+    AMClanPermissionsResponse = 4012,
+    AMCreateClanEvent = 4013,
+    AMCreateClanEventResponse = 4014,
+    AMUpdateClanEvent = 4015,
+    AMUpdateClanEventResponse = 4016,
+    AMGetClanEvents = 4017,
+    AMGetClanEventsResponse = 4018,
+    AMDeleteClanEvent = 4019,
+    AMDeleteClanEventResponse = 4020,
+    AMSetClanPermissionSettings = 4021,
+    AMSetClanPermissionSettingsResponse = 4022,
+    AMGetClanPermissionSettings = 4023,
+    AMGetClanPermissionSettingsResponse = 4024,
+    AMPublishChatRoomInfo = 4025,
+    ClientChatRoomInfo = 4026,
+    AMCreateClanAnnouncement = 4027, // obsolete
+    AMCreateClanAnnouncementResponse = 4028, // obsolete
+    AMUpdateClanAnnouncement = 4029, // obsolete
+    AMUpdateClanAnnouncementResponse = 4030, // obsolete
+    AMGetClanAnnouncementsCount = 4031, // obsolete
+    AMGetClanAnnouncementsCountResponse = 4032, // obsolete
+    AMGetClanAnnouncements = 4033, // obsolete
+    AMGetClanAnnouncementsResponse = 4034, // obsolete
+    AMDeleteClanAnnouncement = 4035, // obsolete
+    AMDeleteClanAnnouncementResponse = 4036, // obsolete
+    AMGetSingleClanAnnouncement = 4037, // obsolete
+    AMGetSingleClanAnnouncementResponse = 4038, // obsolete
+    AMGetClanHistory = 4039,
+    AMGetClanHistoryResponse = 4040,
+    AMGetClanPermissionBits = 4041,
+    AMGetClanPermissionBitsResponse = 4042,
+    AMSetClanPermissionBits = 4043,
+    AMSetClanPermissionBitsResponse = 4044,
+    AMSessionInfoRequest = 4045,
+    AMSessionInfoResponse = 4046,
+    AMValidateWGToken = 4047,
+    AMGetSingleClanEvent = 4048,
+    AMGetSingleClanEventResponse = 4049,
+    AMGetClanRank = 4050,
+    AMGetClanRankResponse = 4051,
+    AMSetClanRank = 4052,
+    AMSetClanRankResponse = 4053,
+    AMGetClanPOTW = 4054,
+    AMGetClanPOTWResponse = 4055,
+    AMSetClanPOTW = 4056,
+    AMSetClanPOTWResponse = 4057,
+    AMRequestChatMetadata = 4058, // obsolete
+    AMDumpUser = 4059,
+    AMKickUserFromClan = 4060,
+    AMAddFounderToClan = 4061,
+    AMValidateWGTokenResponse = 4062,
+    AMSetCommunityState = 4063,
+    AMSetAccountDetails = 4064,
+    AMGetChatBanList = 4065,
+    AMGetChatBanListResponse = 4066,
+    AMUnBanFromChat = 4067,
+    AMSetClanDetails = 4068,
+    AMGetAccountLinks = 4069,
+    AMGetAccountLinksResponse = 4070,
+    AMSetAccountLinks = 4071,
+    AMSetAccountLinksResponse = 4072,
+    AMGetUserGameStats = 4073,
+    AMGetUserGameStatsResponse = 4074,
+    AMCheckClanMembership = 4075,
+    AMGetClanMembers = 4076,
+    AMGetClanMembersResponse = 4077,
+    AMJoinPublicClan = 4078,
+    AMNotifyChatOfClanChange = 4079,
+    AMResubmitPurchase = 4080,
+    AMAddFriend = 4081,
+    AMAddFriendResponse = 4082,
+    AMRemoveFriend = 4083,
+    AMDumpClan = 4084,
+    AMChangeClanOwner = 4085,
+    AMCancelEasyCollect = 4086,
+    AMCancelEasyCollectResponse = 4087,
+    AMGetClanMembershipList = 4088, // obsolete
+    AMGetClanMembershipListResponse = 4089, // obsolete
+    AMClansInCommon = 4090,
+    AMClansInCommonResponse = 4091,
+    AMIsValidAccountID = 4092,
+    AMConvertClan = 4093,
+    AMGetGiftTargetListRelay = 4094, // obsolete
+    AMWipeFriendsList = 4095,
+    AMSetIgnored = 4096,
+    AMClansInCommonCountResponse = 4097,
+    AMFriendsList = 4098,
+    AMFriendsListResponse = 4099,
+    AMFriendsInCommon = 4100,
+    AMFriendsInCommonResponse = 4101,
+    AMFriendsInCommonCountResponse = 4102,
+    AMClansInCommonCount = 4103,
+    AMChallengeVerdict = 4104,
+    AMChallengeNotification = 4105,
+    AMFindGSByIP = 4106,
+    AMFoundGSByIP = 4107,
+    AMGiftRevoked = 4108,
+    AMCreateAccountRecord = 4109,
+    AMUserClanList = 4110,
+    AMUserClanListResponse = 4111,
+    AMGetAccountDetails2 = 4112,
+    AMGetAccountDetailsResponse2 = 4113,
+    AMSetCommunityProfileSettings = 4114,
+    AMSetCommunityProfileSettingsResponse = 4115,
+    AMGetCommunityPrivacyState = 4116,
+    AMGetCommunityPrivacyStateResponse = 4117,
+    AMCheckClanInviteRateLimiting = 4118,
+    AMGetUserAchievementStatus = 4119,
+    AMGetIgnored = 4120,
+    AMGetIgnoredResponse = 4121,
+    AMSetIgnoredResponse = 4122,
+    AMSetFriendRelationshipNone = 4123,
+    AMGetFriendRelationship = 4124,
+    AMGetFriendRelationshipResponse = 4125,
+    AMServiceModulesCache = 4126,
+    AMServiceModulesCall = 4127,
+    AMServiceModulesCallResponse = 4128,
+    AMGetCaptchaDataForIP = 4129,
+    AMGetCaptchaDataForIPResponse = 4130,
+    AMValidateCaptchaDataForIP = 4131,
+    AMValidateCaptchaDataForIPResponse = 4132,
+    AMTrackFailedAuthByIP = 4133,
+    AMGetCaptchaDataByGID = 4134,
+    AMGetCaptchaDataByGIDResponse = 4135,
+    AMGetLobbyList = 4136, // obsolete
+    AMGetLobbyListResponse = 4137, // obsolete
+    AMGetLobbyMetadata = 4138, // obsolete
+    AMGetLobbyMetadataResponse = 4139, // obsolete
+    CommunityAddFriendNews = 4140,
+    AMAddClanNews = 4141, // obsolete
+    AMWriteNews = 4142, // obsolete
+    AMFindClanUser = 4143,
+    AMFindClanUserResponse = 4144,
+    AMBanFromChat = 4145,
+    AMGetUserHistoryResponse = 4146, // obsolete
+    AMGetUserNewsSubscriptions = 4147,
+    AMGetUserNewsSubscriptionsResponse = 4148,
+    AMSetUserNewsSubscriptions = 4149,
+    AMGetUserNews = 4150, // obsolete
+    AMGetUserNewsResponse = 4151, // obsolete
+    AMSendQueuedEmails = 4152,
+    AMSetLicenseFlags = 4153,
+    AMGetUserHistory = 4154, // obsolete
+    CommunityDeleteUserNews = 4155,
+    AMAllowUserFilesRequest = 4156,
+    AMAllowUserFilesResponse = 4157,
+    AMGetAccountStatus = 4158,
+    AMGetAccountStatusResponse = 4159,
+    AMEditBanReason = 4160,
+    AMCheckClanMembershipResponse = 4161,
+    AMProbeClanMembershipList = 4162,
+    AMProbeClanMembershipListResponse = 4163,
+    AMGetFriendsLobbies = 4165,
+    AMGetFriendsLobbiesResponse = 4166,
+    AMGetUserFriendNewsResponse = 4172,
+    CommunityGetUserFriendNews = 4173,
+    AMGetUserClansNewsResponse = 4174,
+    AMGetUserClansNews = 4175,
+    AMStoreInitPurchase = 4176, // obsolete
+    AMStoreInitPurchaseResponse = 4177, // obsolete
+    AMStoreGetFinalPrice = 4178, // obsolete
+    AMStoreGetFinalPriceResponse = 4179, // obsolete
+    AMStoreCompletePurchase = 4180, // obsolete
+    AMStoreCancelPurchase = 4181, // obsolete
+    AMStorePurchaseResponse = 4182, // obsolete
+    AMCreateAccountRecordInSteam3 = 4183, // obsolete
+    AMGetPreviousCBAccount = 4184,
+    AMGetPreviousCBAccountResponse = 4185,
+    AMUpdateBillingAddress = 4186, // obsolete
+    AMUpdateBillingAddressResponse = 4187, // obsolete
+    AMGetBillingAddress = 4188, // obsolete
+    AMGetBillingAddressResponse = 4189, // obsolete
+    AMGetUserLicenseHistory = 4190,
+    AMGetUserLicenseHistoryResponse = 4191,
+    AMSupportChangePassword = 4194,
+    AMSupportChangeEmail = 4195,
+    AMSupportChangeSecretQA = 4196, // obsolete
+    AMResetUserVerificationGSByIP = 4197,
+    AMUpdateGSPlayStats = 4198,
+    AMSupportEnableOrDisable = 4199,
+    AMGetComments = 4200, // obsolete
+    AMGetCommentsResponse = 4201, // obsolete
+    AMAddComment = 4202, // obsolete
+    AMAddCommentResponse = 4203, // obsolete
+    AMDeleteComment = 4204, // obsolete
+    AMDeleteCommentResponse = 4205, // obsolete
+    AMGetPurchaseStatus = 4206,
+    AMSupportIsAccountEnabled = 4209,
+    AMSupportIsAccountEnabledResponse = 4210,
+    AMGetUserStats = 4211,
+    AMSupportKickSession = 4212,
+    AMGSSearch = 4213,
+    MarketingMessageUpdate = 4216,
+    AMRouteFriendMsg = 4219,
+    AMTicketAuthRequestOrResponse = 4220,
+    AMVerifyDepotManagementRights = 4222,
+    AMVerifyDepotManagementRightsResponse = 4223,
+    AMAddFreeLicense = 4224,
+    AMGetUserFriendsMinutesPlayed = 4225, // obsolete
+    AMGetUserFriendsMinutesPlayedResponse = 4226, // obsolete
+    AMGetUserMinutesPlayed = 4227, // obsolete
+    AMGetUserMinutesPlayedResponse = 4228, // obsolete
+    AMValidateEmailLink = 4231,
+    AMValidateEmailLinkResponse = 4232,
+    AMAddUsersToMarketingTreatment = 4234, // obsolete
+    AMStoreUserStats = 4236,
+    AMGetUserGameplayInfo = 4237, // obsolete
+    AMGetUserGameplayInfoResponse = 4238, // obsolete
+    AMGetCardList = 4239, // obsolete
+    AMGetCardListResponse = 4240, // obsolete
+    AMDeleteStoredCard = 4241,
+    AMRevokeLegacyGameKeys = 4242,
+    AMGetWalletDetails = 4244,
+    AMGetWalletDetailsResponse = 4245,
+    AMDeleteStoredPaymentInfo = 4246,
+    AMGetStoredPaymentSummary = 4247,
+    AMGetStoredPaymentSummaryResponse = 4248,
+    AMGetWalletConversionRate = 4249,
+    AMGetWalletConversionRateResponse = 4250,
+    AMConvertWallet = 4251,
+    AMConvertWalletResponse = 4252,
+    AMRelayGetFriendsWhoPlayGame = 4253, // obsolete
+    AMRelayGetFriendsWhoPlayGameResponse = 4254, // obsolete
+    AMSetPreApproval = 4255,
+    AMSetPreApprovalResponse = 4256,
+    AMMarketingTreatmentUpdate = 4257, // obsolete
+    AMCreateRefund = 4258,
+    AMCreateRefundResponse = 4259,
+    AMCreateChargeback = 4260,
+    AMCreateChargebackResponse = 4261,
+    AMCreateDispute = 4262,
+    AMCreateDisputeResponse = 4263,
+    AMClearDispute = 4264,
+    AMClearDisputeResponse = 4265,
+    AMPlayerNicknameList = 4266,
+    AMPlayerNicknameListResponse = 4267,
+    AMSetDRMTestConfig = 4268,
+    AMGetUserCurrentGameInfo = 4269,
+    AMGetUserCurrentGameInfoResponse = 4270,
+    AMGetGSPlayerList = 4271,
+    AMGetGSPlayerListResponse = 4272,
+    AMUpdatePersonaStateCache = 4275, // obsolete
+    AMGetGameMembers = 4276,
+    AMGetGameMembersResponse = 4277,
+    AMGetSteamIDForMicroTxn = 4278,
+    AMGetSteamIDForMicroTxnResponse = 4279,
+    AMAddPublisherUser = 4280,
+    AMRemovePublisherUser = 4281,
+    AMGetUserLicenseList = 4282,
+    AMGetUserLicenseListResponse = 4283,
+    AMReloadGameGroupPolicy = 4284,
+    AMAddFreeLicenseResponse = 4285,
+    AMVACStatusUpdate = 4286,
+    AMGetAccountDetails = 4287,
+    AMGetAccountDetailsResponse = 4288,
+    AMGetPlayerLinkDetails = 4289,
+    AMGetPlayerLinkDetailsResponse = 4290,
+    AMSubscribeToPersonaFeed = 4291, // obsolete
+    AMGetUserVacBanList = 4292, // obsolete
+    AMGetUserVacBanListResponse = 4293, // obsolete
+    AMGetAccountFlagsForWGSpoofing = 4294,
+    AMGetAccountFlagsForWGSpoofingResponse = 4295,
+    AMGetFriendsWishlistInfo = 4296, // obsolete
+    AMGetFriendsWishlistInfoResponse = 4297, // obsolete
+    AMGetClanOfficers = 4298,
+    AMGetClanOfficersResponse = 4299,
+    AMNameChange = 4300,
+    AMGetNameHistory = 4301,
+    AMGetNameHistoryResponse = 4302,
+    AMUpdateProviderStatus = 4305,
+    AMClearPersonaMetadataBlob = 4306, // obsolete
+    AMSupportRemoveAccountSecurity = 4307,
+    AMIsAccountInCaptchaGracePeriod = 4308,
+    AMIsAccountInCaptchaGracePeriodResponse = 4309,
+    AMAccountPS3Unlink = 4310,
+    AMAccountPS3UnlinkResponse = 4311,
+    AMStoreUserStatsResponse = 4312,
+    AMGetAccountPSNInfo = 4313,
+    AMGetAccountPSNInfoResponse = 4314,
+    AMAuthenticatedPlayerList = 4315,
+    AMGetUserGifts = 4316,
+    AMGetUserGiftsResponse = 4317,
+    AMTransferLockedGifts = 4320,
+    AMTransferLockedGiftsResponse = 4321,
+    AMPlayerHostedOnGameServer = 4322,
+    AMGetAccountBanInfo = 4323,
+    AMGetAccountBanInfoResponse = 4324,
+    AMRecordBanEnforcement = 4325,
+    AMRollbackGiftTransfer = 4326,
+    AMRollbackGiftTransferResponse = 4327,
+    AMHandlePendingTransaction = 4328,
+    AMRequestClanDetails = 4329,
+    AMDeleteStoredPaypalAgreement = 4330,
+    AMGameServerUpdate = 4331,
+    AMGameServerRemove = 4332,
+    AMGetPaypalAgreements = 4333,
+    AMGetPaypalAgreementsResponse = 4334,
+    AMGameServerPlayerCompatibilityCheck = 4335,
+    AMGameServerPlayerCompatibilityCheckResponse = 4336,
+    AMRenewLicense = 4337,
+    AMGetAccountCommunityBanInfo = 4338,
+    AMGetAccountCommunityBanInfoResponse = 4339,
+    AMGameServerAccountChangePassword = 4340,
+    AMGameServerAccountDeleteAccount = 4341,
+    AMRenewAgreement = 4342,
+    AMSendEmail = 4343, // obsolete
+    AMXsollaPayment = 4344,
+    AMXsollaPaymentResponse = 4345,
+    AMAcctAllowedToPurchase = 4346,
+    AMAcctAllowedToPurchaseResponse = 4347,
+    AMSwapKioskDeposit = 4348,
+    AMSwapKioskDepositResponse = 4349,
+    AMSetUserGiftUnowned = 4350,
+    AMSetUserGiftUnownedResponse = 4351,
+    AMClaimUnownedUserGift = 4352,
+    AMClaimUnownedUserGiftResponse = 4353,
+    AMSetClanName = 4354,
+    AMSetClanNameResponse = 4355,
+    AMGrantCoupon = 4356,
+    AMGrantCouponResponse = 4357,
+    AMIsPackageRestrictedInUserCountry = 4358,
+    AMIsPackageRestrictedInUserCountryResponse = 4359,
+    AMHandlePendingTransactionResponse = 4360,
+    AMGrantGuestPasses2 = 4361,
+    AMGrantGuestPasses2Response = 4362,
+    AMSessionQuery = 4363,
+    AMSessionQueryResponse = 4364,
+    AMGetPlayerBanDetails = 4365,
+    AMGetPlayerBanDetailsResponse = 4366,
+    AMFinalizePurchase = 4367,
+    AMFinalizePurchaseResponse = 4368,
+    AMPersonaChangeResponse = 4372,
+    AMGetClanDetailsForForumCreation = 4373,
+    AMGetClanDetailsForForumCreationResponse = 4374,
+    AMGetPendingNotificationCount = 4375,
+    AMGetPendingNotificationCountResponse = 4376,
+    AMPasswordHashUpgrade = 4377,
+    AMMoPayPayment = 4378,
+    AMMoPayPaymentResponse = 4379,
+    AMBoaCompraPayment = 4380,
+    AMBoaCompraPaymentResponse = 4381,
+    AMExpireCaptchaByGID = 4382,
+    AMCompleteExternalPurchase = 4383,
+    AMCompleteExternalPurchaseResponse = 4384,
+    AMResolveNegativeWalletCredits = 4385,
+    AMResolveNegativeWalletCreditsResponse = 4386,
+    AMPayelpPayment = 4387,
+    AMPayelpPaymentResponse = 4388,
+    AMPlayerGetClanBasicDetails = 4389,
+    AMPlayerGetClanBasicDetailsResponse = 4390,
+    AMMOLPayment = 4391,
+    AMMOLPaymentResponse = 4392,
+    GetUserIPCountry = 4393,
+    GetUserIPCountryResponse = 4394,
+    NotificationOfSuspiciousActivity = 4395,
+    AMDegicaPayment = 4396,
+    AMDegicaPaymentResponse = 4397,
+    AMEClubPayment = 4398,
+    AMEClubPaymentResponse = 4399,
+    AMPayPalPaymentsHubPayment = 4400,
+    AMPayPalPaymentsHubPaymentResponse = 4401,
+    AMTwoFactorRecoverAuthenticatorRequest = 4402,
+    AMTwoFactorRecoverAuthenticatorResponse = 4403,
+    AMSmart2PayPayment = 4404,
+    AMSmart2PayPaymentResponse = 4405,
+    AMValidatePasswordResetCodeAndSendSmsRequest = 4406,
+    AMValidatePasswordResetCodeAndSendSmsResponse = 4407,
+    AMGetAccountResetDetailsRequest = 4408,
+    AMGetAccountResetDetailsResponse = 4409,
+    AMBitPayPayment = 4410,
+    AMBitPayPaymentResponse = 4411,
+    AMSendAccountInfoUpdate = 4412,
+
+    BasePSRange = 5000,
+    PSCreateShoppingCart = 5001,
+    PSCreateShoppingCartResponse = 5002,
+    PSIsValidShoppingCart = 5003,
+    PSIsValidShoppingCartResponse = 5004,
+    PSAddPackageToShoppingCart = 5005,
+    PSAddPackageToShoppingCartResponse = 5006,
+    PSRemoveLineItemFromShoppingCart = 5007,
+    PSRemoveLineItemFromShoppingCartResponse = 5008,
+    PSGetShoppingCartContents = 5009,
+    PSGetShoppingCartContentsResponse = 5010,
+    PSAddWalletCreditToShoppingCart = 5011,
+    PSAddWalletCreditToShoppingCartResponse = 5012,
+
+    BaseUFSRange = 5200,
+    ClientUFSUploadFileRequest = 5202,
+    ClientUFSUploadFileResponse = 5203,
+    ClientUFSUploadFileChunk = 5204,
+    ClientUFSUploadFileFinished = 5205,
+    ClientUFSGetFileListForApp = 5206,
+    ClientUFSGetFileListForAppResponse = 5207,
+    ClientUFSDownloadRequest = 5210,
+    ClientUFSDownloadResponse = 5211,
+    ClientUFSDownloadChunk = 5212,
+    ClientUFSLoginRequest = 5213,
+    ClientUFSLoginResponse = 5214,
+    UFSReloadPartitionInfo = 5215,
+    ClientUFSTransferHeartbeat = 5216,
+    UFSSynchronizeFile = 5217,
+    UFSSynchronizeFileResponse = 5218,
+    ClientUFSDeleteFileRequest = 5219,
+    ClientUFSDeleteFileResponse = 5220,
+    UFSDownloadRequest = 5221, // obsolete
+    UFSDownloadResponse = 5222, // obsolete
+    UFSDownloadChunk = 5223, // obsolete
+    ClientUFSGetUGCDetails = 5226,
+    ClientUFSGetUGCDetailsResponse = 5227,
+    UFSUpdateFileFlags = 5228,
+    UFSUpdateFileFlagsResponse = 5229,
+    ClientUFSGetSingleFileInfo = 5230,
+    ClientUFSGetSingleFileInfoResponse = 5231,
+    ClientUFSShareFile = 5232,
+    ClientUFSShareFileResponse = 5233,
+    UFSReloadAccount = 5234,
+    UFSReloadAccountResponse = 5235,
+    UFSUpdateRecordBatched = 5236,
+    UFSUpdateRecordBatchedResponse = 5237,
+    UFSMigrateFile = 5238,
+    UFSMigrateFileResponse = 5239,
+    UFSGetUGCURLs = 5240,
+    UFSGetUGCURLsResponse = 5241,
+    UFSHttpUploadFileFinishRequest = 5242,
+    UFSHttpUploadFileFinishResponse = 5243,
+    UFSDownloadStartRequest = 5244,
+    UFSDownloadStartResponse = 5245,
+    UFSDownloadChunkRequest = 5246,
+    UFSDownloadChunkResponse = 5247,
+    UFSDownloadFinishRequest = 5248,
+    UFSDownloadFinishResponse = 5249,
+    UFSFlushURLCache = 5250,
+    UFSUploadCommit = 5251,
+    UFSUploadCommitResponse = 5252,
+    UFSMigrateFileAppID = 5253,
+    UFSMigrateFileAppIDResponse = 5254,
+
+    BaseClient2 = 5400,
+    ClientRequestForgottenPasswordEmail = 5401,
+    ClientRequestForgottenPasswordEmailResponse = 5402,
+    ClientCreateAccountResponse = 5403,
+    ClientResetForgottenPassword = 5404,
+    ClientResetForgottenPasswordResponse = 5405,
+    ClientCreateAccount2 = 5406,
+    ClientInformOfResetForgottenPassword = 5407,
+    ClientInformOfResetForgottenPasswordResponse = 5408,
+    ClientAnonUserLogOn_Deprecated = 5409, // obsolete
+    ClientGamesPlayedWithDataBlob = 5410,
+    ClientUpdateUserGameInfo = 5411,
+    ClientFileToDownload = 5412,
+    ClientFileToDownloadResponse = 5413,
+    ClientLBSSetScore = 5414,
+    ClientLBSSetScoreResponse = 5415,
+    ClientLBSFindOrCreateLB = 5416,
+    ClientLBSFindOrCreateLBResponse = 5417,
+    ClientLBSGetLBEntries = 5418,
+    ClientLBSGetLBEntriesResponse = 5419,
+    ClientMarketingMessageUpdate = 5420, // obsolete
+    ClientChatDeclined = 5426,
+    ClientFriendMsgIncoming = 5427,
+    ClientAuthList_Deprecated = 5428, // obsolete
+    ClientTicketAuthComplete = 5429,
+    ClientIsLimitedAccount = 5430,
+    ClientRequestAuthList = 5431,
+    ClientAuthList = 5432,
+    ClientStat = 5433,
+    ClientP2PConnectionInfo = 5434,
+    ClientP2PConnectionFailInfo = 5435,
+    ClientGetNumberOfCurrentPlayers = 5436, // obsolete
+    ClientGetNumberOfCurrentPlayersResponse = 5437, // obsolete
+    ClientGetDepotDecryptionKey = 5438,
+    ClientGetDepotDecryptionKeyResponse = 5439,
+    GSPerformHardwareSurvey = 5440,
+    ClientGetAppBetaPasswords = 5441, // obsolete
+    ClientGetAppBetaPasswordsResponse = 5442, // obsolete
+    ClientEnableTestLicense = 5443,
+    ClientEnableTestLicenseResponse = 5444,
+    ClientDisableTestLicense = 5445,
+    ClientDisableTestLicenseResponse = 5446,
+    ClientRequestValidationMail = 5448,
+    ClientRequestValidationMailResponse = 5449,
+    ClientCheckAppBetaPassword = 5450,
+    ClientCheckAppBetaPasswordResponse = 5451,
+    ClientToGC = 5452,
+    ClientFromGC = 5453,
+    ClientRequestChangeMail = 5454,
+    ClientRequestChangeMailResponse = 5455,
+    ClientEmailAddrInfo = 5456,
+    ClientPasswordChange3 = 5457,
+    ClientEmailChange3 = 5458,
+    ClientPersonalQAChange3 = 5459,
+    ClientResetForgottenPassword3 = 5460,
+    ClientRequestForgottenPasswordEmail3 = 5461,
+    ClientCreateAccount3 = 5462, // obsolete
+    ClientNewLoginKey = 5463,
+    ClientNewLoginKeyAccepted = 5464,
+    ClientLogOnWithHash_Deprecated = 5465, // obsolete
+    ClientStoreUserStats2 = 5466,
+    ClientStatsUpdated = 5467,
+    ClientActivateOEMLicense = 5468,
+    ClientRegisterOEMMachine = 5469,
+    ClientRegisterOEMMachineResponse = 5470,
+    ClientRequestedClientStats = 5480,
+    ClientStat2Int32 = 5481,
+    ClientStat2 = 5482,
+    ClientVerifyPassword = 5483,
+    ClientVerifyPasswordResponse = 5484,
+    ClientDRMDownloadRequest = 5485,
+    ClientDRMDownloadResponse = 5486,
+    ClientDRMFinalResult = 5487,
+    ClientGetFriendsWhoPlayGame = 5488,
+    ClientGetFriendsWhoPlayGameResponse = 5489,
+    ClientOGSBeginSession = 5490,
+    ClientOGSBeginSessionResponse = 5491,
+    ClientOGSEndSession = 5492,
+    ClientOGSEndSessionResponse = 5493,
+    ClientOGSWriteRow = 5494,
+    ClientDRMTest = 5495,
+    ClientDRMTestResult = 5496,
+    ClientServerUnavailable = 5500,
+    ClientServersAvailable = 5501,
+    ClientRegisterAuthTicketWithCM = 5502,
+    ClientGCMsgFailed = 5503,
+    ClientMicroTxnAuthRequest = 5504,
+    ClientMicroTxnAuthorize = 5505,
+    ClientMicroTxnAuthorizeResponse = 5506,
+    ClientAppMinutesPlayedData = 5507,
+    ClientGetMicroTxnInfo = 5508,
+    ClientGetMicroTxnInfoResponse = 5509,
+    ClientMarketingMessageUpdate2 = 5510,
+    ClientDeregisterWithServer = 5511,
+    ClientSubscribeToPersonaFeed = 5512,
+    ClientLogon = 5514,
+    ClientGetClientDetails = 5515,
+    ClientGetClientDetailsResponse = 5516,
+    ClientReportOverlayDetourFailure = 5517,
+    ClientGetClientAppList = 5518,
+    ClientGetClientAppListResponse = 5519,
+    ClientInstallClientApp = 5520,
+    ClientInstallClientAppResponse = 5521,
+    ClientUninstallClientApp = 5522,
+    ClientUninstallClientAppResponse = 5523,
+    ClientSetClientAppUpdateState = 5524,
+    ClientSetClientAppUpdateStateResponse = 5525,
+    ClientRequestEncryptedAppTicket = 5526,
+    ClientRequestEncryptedAppTicketResponse = 5527,
+    ClientWalletInfoUpdate = 5528,
+    ClientLBSSetUGC = 5529,
+    ClientLBSSetUGCResponse = 5530,
+    ClientAMGetClanOfficers = 5531,
+    ClientAMGetClanOfficersResponse = 5532,
+    ClientCheckFileSignature = 5533, // obsolete
+    ClientCheckFileSignatureResponse = 5534, // obsolete
+    ClientFriendProfileInfo = 5535,
+    ClientFriendProfileInfoResponse = 5536,
+    ClientUpdateMachineAuth = 5537,
+    ClientUpdateMachineAuthResponse = 5538,
+    ClientReadMachineAuth = 5539,
+    ClientReadMachineAuthResponse = 5540,
+    ClientRequestMachineAuth = 5541,
+    ClientRequestMachineAuthResponse = 5542,
+    ClientScreenshotsChanged = 5543,
+    ClientEmailChange4 = 5544,
+    ClientEmailChangeResponse4 = 5545,
+    ClientGetCDNAuthToken = 5546,
+    ClientGetCDNAuthTokenResponse = 5547,
+    ClientDownloadRateStatistics = 5548,
+    ClientRequestAccountData = 5549,
+    ClientRequestAccountDataResponse = 5550,
+    ClientResetForgottenPassword4 = 5551,
+    ClientHideFriend = 5552,
+    ClientFriendsGroupsList = 5553,
+    ClientGetClanActivityCounts = 5554,
+    ClientGetClanActivityCountsResponse = 5555,
+    ClientOGSReportString = 5556,
+    ClientOGSReportBug = 5557,
+    ClientSentLogs = 5558,
+    ClientLogonGameServer = 5559,
+    AMClientCreateFriendsGroup = 5560,
+    AMClientCreateFriendsGroupResponse = 5561,
+    AMClientDeleteFriendsGroup = 5562,
+    AMClientDeleteFriendsGroupResponse = 5563,
+    AMClientRenameFriendsGroup = 5564,
+    AMClientRenameFriendsGroupResponse = 5565,
+    AMClientAddFriendToGroup = 5566,
+    AMClientAddFriendToGroupResponse = 5567,
+    AMClientRemoveFriendFromGroup = 5568,
+    AMClientRemoveFriendFromGroupResponse = 5569,
+    ClientAMGetPersonaNameHistory = 5570,
+    ClientAMGetPersonaNameHistoryResponse = 5571,
+    ClientRequestFreeLicense = 5572,
+    ClientRequestFreeLicenseResponse = 5573,
+    ClientDRMDownloadRequestWithCrashData = 5574,
+    ClientAuthListAck = 5575,
+    ClientItemAnnouncements = 5576,
+    ClientRequestItemAnnouncements = 5577,
+    ClientFriendMsgEchoToSender = 5578,
+    ClientChangeSteamGuardOptions = 5579, // obsolete
+    ClientChangeSteamGuardOptionsResponse = 5580, // obsolete
+    ClientOGSGameServerPingSample = 5581,
+    ClientCommentNotifications = 5582,
+    ClientRequestCommentNotifications = 5583,
+    ClientPersonaChangeResponse = 5584,
+    ClientRequestWebAPIAuthenticateUserNonce = 5585,
+    ClientRequestWebAPIAuthenticateUserNonceResponse = 5586,
+    ClientPlayerNicknameList = 5587,
+    AMClientSetPlayerNickname = 5588,
+    AMClientSetPlayerNicknameResponse = 5589,
+    ClientRequestOAuthTokenForApp = 5590, // obsolete
+    ClientRequestOAuthTokenForAppResponse = 5591, // obsolete
+    ClientCreateAccountProto = 5590,
+    ClientCreateAccountProtoResponse = 5591,
+    ClientGetNumberOfCurrentPlayersDP = 5592,
+    ClientGetNumberOfCurrentPlayersDPResponse = 5593,
+    ClientServiceMethod = 5594,
+    ClientServiceMethodResponse = 5595,
+    ClientFriendUserStatusPublished = 5596,
+    ClientCurrentUIMode = 5597,
+    ClientVanityURLChangedNotification = 5598,
+    ClientUserNotifications = 5599,
+
+    BaseDFS = 5600,
+    DFSGetFile = 5601,
+    DFSInstallLocalFile = 5602,
+    DFSConnection = 5603,
+    DFSConnectionReply = 5604,
+    ClientDFSAuthenticateRequest = 5605,
+    ClientDFSAuthenticateResponse = 5606,
+    ClientDFSEndSession = 5607,
+    DFSPurgeFile = 5608,
+    DFSRouteFile = 5609,
+    DFSGetFileFromServer = 5610,
+    DFSAcceptedResponse = 5611,
+    DFSRequestPingback = 5612,
+    DFSRecvTransmitFile = 5613,
+    DFSSendTransmitFile = 5614,
+    DFSRequestPingback2 = 5615,
+    DFSResponsePingback2 = 5616,
+    ClientDFSDownloadStatus = 5617,
+    DFSStartTransfer = 5618,
+    DFSTransferComplete = 5619,
+    DFSRouteFileResponse = 5620,
+
+    BaseMDS = 5800,
+    ClientMDSLoginRequest = 5801, // obsolete
+    ClientMDSLoginResponse = 5802, // obsolete
+    ClientMDSUploadManifestRequest = 5803, // obsolete
+    ClientMDSUploadManifestResponse = 5804, // obsolete
+    ClientMDSTransmitManifestDataChunk = 5805, // obsolete
+    ClientMDSHeartbeat = 5806, // obsolete
+    ClientMDSUploadDepotChunks = 5807, // obsolete
+    ClientMDSUploadDepotChunksResponse = 5808, // obsolete
+    ClientMDSInitDepotBuildRequest = 5809, // obsolete
+    ClientMDSInitDepotBuildResponse = 5810, // obsolete
+    AMToMDSGetDepotDecryptionKey = 5812,
+    MDSToAMGetDepotDecryptionKeyResponse = 5813,
+    MDSGetVersionsForDepot = 5814, // obsolete
+    MDSGetVersionsForDepotResponse = 5815, // obsolete
+    MDSSetPublicVersionForDepot = 5816, // obsolete
+    MDSSetPublicVersionForDepotResponse = 5817, // obsolete
+    ClientMDSInitWorkshopBuildRequest = 5816, // obsolete
+    ClientMDSInitWorkshopBuildResponse = 5817, // obsolete
+    ClientMDSGetDepotManifest = 5818, // obsolete
+    ClientMDSGetDepotManifestResponse = 5819, // obsolete
+    ClientMDSGetDepotManifestChunk = 5820, // obsolete
+    ClientMDSUploadRateTest = 5823, // obsolete
+    ClientMDSUploadRateTestResponse = 5824, // obsolete
+    MDSDownloadDepotChunksAck = 5825, // obsolete
+    MDSContentServerStatsBroadcast = 5826, // obsolete
+    MDSContentServerConfigRequest = 5827,
+    MDSContentServerConfig = 5828,
+    MDSGetDepotManifest = 5829,
+    MDSGetDepotManifestResponse = 5830,
+    MDSGetDepotManifestChunk = 5831,
+    MDSGetDepotChunk = 5832,
+    MDSGetDepotChunkResponse = 5833,
+    MDSGetDepotChunkChunk = 5834,
+    MDSUpdateContentServerConfig = 5835, // obsolete
+    MDSGetServerListForUser = 5836,
+    MDSGetServerListForUserResponse = 5837,
+    ClientMDSRegisterAppBuild = 5838, // obsolete
+    ClientMDSRegisterAppBuildResponse = 5839, // obsolete
+    ClientMDSSetAppBuildLive = 5840, // obsolete
+    ClientMDSSetAppBuildLiveResponse = 5841, // obsolete
+    ClientMDSGetPrevDepotBuild = 5842, // obsolete
+    ClientMDSGetPrevDepotBuildResponse = 5843, // obsolete
+    MDSToCSFlushChunk = 5844,
+    ClientMDSSignInstallScript = 5845, // obsolete
+    ClientMDSSignInstallScriptResponse = 5846, // obsolete
+    MDSMigrateChunk = 5847,
+    MDSMigrateChunkResponse = 5848,
+
+    CSBase = 6200,
+    CSPing = 6201,
+    CSPingResponse = 6202,
+
+    GMSBase = 6400,
+    GMSGameServerReplicate = 6401,
+    ClientGMSServerQuery = 6403,
+    GMSClientServerQueryResponse = 6404,
+    AMGMSGameServerUpdate = 6405,
+    AMGMSGameServerRemove = 6406,
+    GameServerOutOfDate = 6407,
+
+    DeviceAuthorizationBase = 6500,
+    ClientAuthorizeLocalDeviceRequest = 6501,
+    ClientAuthorizeLocalDevice = 6502, // obsolete
+    ClientAuthorizeLocalDeviceResponse = 6502,
+    ClientDeauthorizeDeviceRequest = 6503,
+    ClientDeauthorizeDevice = 6504,
+    ClientUseLocalDeviceAuthorizations = 6505,
+    ClientGetAuthorizedDevices = 6506,
+    ClientGetAuthorizedDevicesResponse = 6507,
+    AMNotifySessionDeviceAuthorized = 6508,
+    ClientAuthorizeLocalDeviceNotification = 6509,
+
+    MMSBase = 6600,
+    ClientMMSCreateLobby = 6601,
+    ClientMMSCreateLobbyResponse = 6602,
+    ClientMMSJoinLobby = 6603,
+    ClientMMSJoinLobbyResponse = 6604,
+    ClientMMSLeaveLobby = 6605,
+    ClientMMSLeaveLobbyResponse = 6606,
+    ClientMMSGetLobbyList = 6607,
+    ClientMMSGetLobbyListResponse = 6608,
+    ClientMMSSetLobbyData = 6609,
+    ClientMMSSetLobbyDataResponse = 6610,
+    ClientMMSGetLobbyData = 6611,
+    ClientMMSLobbyData = 6612,
+    ClientMMSSendLobbyChatMsg = 6613,
+    ClientMMSLobbyChatMsg = 6614,
+    ClientMMSSetLobbyOwner = 6615,
+    ClientMMSSetLobbyOwnerResponse = 6616,
+    ClientMMSSetLobbyGameServer = 6617,
+    ClientMMSLobbyGameServerSet = 6618,
+    ClientMMSUserJoinedLobby = 6619,
+    ClientMMSUserLeftLobby = 6620,
+    ClientMMSInviteToLobby = 6621,
+    ClientMMSFlushFrenemyListCache = 6622,
+    ClientMMSFlushFrenemyListCacheResponse = 6623,
+    ClientMMSSetLobbyLinked = 6624,
+
+    NonStdMsgBase = 6800,
+    NonStdMsgMemcached = 6801,
+    NonStdMsgHTTPServer = 6802,
+    NonStdMsgHTTPClient = 6803,
+    NonStdMsgWGResponse = 6804,
+    NonStdMsgPHPSimulator = 6805,
+    NonStdMsgChase = 6806,
+    NonStdMsgDFSTransfer = 6807,
+    NonStdMsgTests = 6808,
+    NonStdMsgUMQpipeAAPL = 6809,
+    NonStdMsgSyslog = 6810, // obsolete
+    NonStdMsgLogsink = 6811,
+    NonStdMsgSteam2Emulator = 6812,
+    NonStdMsgRTMPServer = 6813,
+
+    UDSBase = 7000,
+    ClientUDSP2PSessionStarted = 7001,
+    ClientUDSP2PSessionEnded = 7002,
+    UDSRenderUserAuth = 7003,
+    UDSRenderUserAuthResponse = 7004,
+    ClientUDSInviteToGame = 7005,
+    UDSFindSession = 7006, // obsolete "renamed to UDSHasSession"
+    UDSHasSession = 7006,
+    UDSFindSessionResponse = 7007, // obsolete "renamed to UDSHasSessionResponse"
+    UDSHasSessionResponse = 7007,
+
+    MPASBase = 7100,
+    MPASVacBanReset = 7101,
+
+    KGSBase = 7200,
+    KGSAllocateKeyRange = 7201, // obsolete
+    KGSAllocateKeyRangeResponse = 7202, // obsolete
+    KGSGenerateKeys = 7203, // obsolete
+    KGSGenerateKeysResponse = 7204, // obsolete
+    KGSRemapKeys = 7205, // obsolete
+    KGSRemapKeysResponse = 7206, // obsolete
+    KGSGenerateGameStopWCKeys = 7207, // obsolete
+    KGSGenerateGameStopWCKeysResponse = 7208, // obsolete
+
+    UCMBase = 7300,
+    ClientUCMAddScreenshot = 7301,
+    ClientUCMAddScreenshotResponse = 7302,
+    UCMValidateObjectExists = 7303, // obsolete
+    UCMValidateObjectExistsResponse = 7304, // obsolete
+    UCMResetCommunityContent = 7307,
+    UCMResetCommunityContentResponse = 7308,
+    ClientUCMDeleteScreenshot = 7309,
+    ClientUCMDeleteScreenshotResponse = 7310,
+    ClientUCMPublishFile = 7311,
+    ClientUCMPublishFileResponse = 7312,
+    ClientUCMGetPublishedFileDetails = 7313, // obsolete
+    ClientUCMGetPublishedFileDetailsResponse = 7314, // obsolete
+    ClientUCMDeletePublishedFile = 7315,
+    ClientUCMDeletePublishedFileResponse = 7316,
+    ClientUCMEnumerateUserPublishedFiles = 7317,
+    ClientUCMEnumerateUserPublishedFilesResponse = 7318,
+    ClientUCMSubscribePublishedFile = 7319, // obsolete
+    ClientUCMSubscribePublishedFileResponse = 7320, // obsolete
+    ClientUCMEnumerateUserSubscribedFiles = 7321,
+    ClientUCMEnumerateUserSubscribedFilesResponse = 7322,
+    ClientUCMUnsubscribePublishedFile = 7323, // obsolete
+    ClientUCMUnsubscribePublishedFileResponse = 7324, // obsolete
+    ClientUCMUpdatePublishedFile = 7325,
+    ClientUCMUpdatePublishedFileResponse = 7326,
+    UCMUpdatePublishedFile = 7327,
+    UCMUpdatePublishedFileResponse = 7328,
+    UCMDeletePublishedFile = 7329,
+    UCMDeletePublishedFileResponse = 7330,
+    UCMUpdatePublishedFileStat = 7331,
+    UCMUpdatePublishedFileBan = 7332,
+    UCMUpdatePublishedFileBanResponse = 7333,
+    UCMUpdateTaggedScreenshot = 7334, // obsolete
+    UCMAddTaggedScreenshot = 7335, // obsolete
+    UCMRemoveTaggedScreenshot = 7336, // obsolete
+    UCMReloadPublishedFile = 7337,
+    UCMReloadUserFileListCaches = 7338,
+    UCMPublishedFileReported = 7339,
+    UCMUpdatePublishedFileIncompatibleStatus = 7340,
+    UCMPublishedFilePreviewAdd = 7341,
+    UCMPublishedFilePreviewAddResponse = 7342,
+    UCMPublishedFilePreviewRemove = 7343,
+    UCMPublishedFilePreviewRemoveResponse = 7344,
+    UCMPublishedFilePreviewChangeSortOrder = 7345, // obsolete
+    UCMPublishedFilePreviewChangeSortOrderResponse = 7346, // obsolete
+    ClientUCMPublishedFileSubscribed = 7347,
+    ClientUCMPublishedFileUnsubscribed = 7348,
+    UCMPublishedFileSubscribed = 7349,
+    UCMPublishedFileUnsubscribed = 7350,
+    UCMPublishFile = 7351,
+    UCMPublishFileResponse = 7352,
+    UCMPublishedFileChildAdd = 7353,
+    UCMPublishedFileChildAddResponse = 7354,
+    UCMPublishedFileChildRemove = 7355,
+    UCMPublishedFileChildRemoveResponse = 7356,
+    UCMPublishedFileChildChangeSortOrder = 7357, // obsolete
+    UCMPublishedFileChildChangeSortOrderResponse = 7358, // obsolete
+    UCMPublishedFileParentChanged = 7359,
+    ClientUCMGetPublishedFilesForUser = 7360,
+    ClientUCMGetPublishedFilesForUserResponse = 7361,
+    UCMGetPublishedFilesForUser = 7362, // obsolete
+    UCMGetPublishedFilesForUserResponse = 7363, // obsolete
+    ClientUCMSetUserPublishedFileAction = 7364,
+    ClientUCMSetUserPublishedFileActionResponse = 7365,
+    ClientUCMEnumeratePublishedFilesByUserAction = 7366,
+    ClientUCMEnumeratePublishedFilesByUserActionResponse = 7367,
+    ClientUCMPublishedFileDeleted = 7368,
+    UCMGetUserSubscribedFiles = 7369,
+    UCMGetUserSubscribedFilesResponse = 7370,
+    UCMFixStatsPublishedFile = 7371,
+    UCMDeleteOldScreenshot = 7372, // obsolete
+    UCMDeleteOldScreenshotResponse = 7373, // obsolete
+    UCMDeleteOldVideo = 7374, // obsolete
+    UCMDeleteOldVideoResponse = 7375, // obsolete
+    UCMUpdateOldScreenshotPrivacy = 7376, // obsolete
+    UCMUpdateOldScreenshotPrivacyResponse = 7377, // obsolete
+    ClientUCMEnumerateUserSubscribedFilesWithUpdates = 7378,
+    ClientUCMEnumerateUserSubscribedFilesWithUpdatesResponse = 7379,
+    UCMPublishedFileContentUpdated = 7380,
+    UCMPublishedFileUpdated = 7381,
+    ClientWorkshopItemChangesRequest = 7382,
+    ClientWorkshopItemChangesResponse = 7383,
+    ClientWorkshopItemInfoRequest = 7384,
+    ClientWorkshopItemInfoResponse = 7385,
+
+    FSBase = 7500,
+    ClientRichPresenceUpload = 7501,
+    ClientRichPresenceRequest = 7502,
+    ClientRichPresenceInfo = 7503,
+    FSRichPresenceRequest = 7504,
+    FSRichPresenceResponse = 7505,
+    FSComputeFrenematrix = 7506,
+    FSComputeFrenematrixResponse = 7507,
+    FSPlayStatusNotification = 7508,
+    FSPublishPersonaStatus = 7509,
+    FSAddOrRemoveFollower = 7510,
+    FSAddOrRemoveFollowerResponse = 7511,
+    FSUpdateFollowingList = 7512,
+    FSCommentNotification = 7513,
+    FSCommentNotificationViewed = 7514,
+    ClientFSGetFollowerCount = 7515,
+    ClientFSGetFollowerCountResponse = 7516,
+    ClientFSGetIsFollowing = 7517,
+    ClientFSGetIsFollowingResponse = 7518,
+    ClientFSEnumerateFollowingList = 7519,
+    ClientFSEnumerateFollowingListResponse = 7520,
+    FSGetPendingNotificationCount = 7521,
+    FSGetPendingNotificationCountResponse = 7522,
+    ClientFSOfflineMessageNotification = 7523,
+    ClientFSRequestOfflineMessageCount = 7524,
+    ClientFSGetFriendMessageHistory = 7525,
+    ClientFSGetFriendMessageHistoryResponse = 7526,
+    ClientFSGetFriendMessageHistoryForOfflineMessages = 7527,
+    ClientFSGetFriendsSteamLevels = 7528,
+    ClientFSGetFriendsSteamLevelsResponse = 7529,
+    FSRequestFriendData = 7530,
+
+    DRMRange2 = 7600,
+    CEGVersionSetEnableDisableRequest = 7600,
+    CEGVersionSetEnableDisableResponse = 7601,
+    CEGPropStatusDRMSRequest = 7602,
+    CEGPropStatusDRMSResponse = 7603,
+    CEGWhackFailureReportRequest = 7604,
+    CEGWhackFailureReportResponse = 7605,
+    DRMSFetchVersionSet = 7606,
+    DRMSFetchVersionSetResponse = 7607,
+
+    EconBase = 7700,
+    EconTrading_InitiateTradeRequest = 7701,
+    EconTrading_InitiateTradeProposed = 7702,
+    EconTrading_InitiateTradeResponse = 7703,
+    EconTrading_InitiateTradeResult = 7704,
+    EconTrading_StartSession = 7705,
+    EconTrading_CancelTradeRequest = 7706,
+    EconFlushInventoryCache = 7707,
+    EconFlushInventoryCacheResponse = 7708,
+    EconCDKeyProcessTransaction = 7711,
+    EconCDKeyProcessTransactionResponse = 7712,
+    EconGetErrorLogs = 7713,
+    EconGetErrorLogsResponse = 7714,
+
+    RMRange = 7800,
+    RMTestVerisignOTP = 7800,
+    RMTestVerisignOTPResponse = 7801,
+    RMDeleteMemcachedKeys = 7803,
+    RMRemoteInvoke = 7804,
+    BadLoginIPList = 7805,
+    RMMsgTraceAddTrigger = 7806,
+    RMMsgTraceRemoveTrigger = 7807,
+    RMMsgTraceEvent = 7808,
+
+    UGSBase = 7900,
+    UGSUpdateGlobalStats = 7900,
+    ClientUGSGetGlobalStats = 7901,
+    ClientUGSGetGlobalStatsResponse = 7902,
+
+    StoreBase = 8000,
+    StoreUpdateRecommendationCount = 8000, // obsolete
+
+    UMQBase = 8100,
+    UMQLogonRequest = 8100,
+    UMQLogonResponse = 8101,
+    UMQLogoffRequest = 8102,
+    UMQLogoffResponse = 8103,
+    UMQSendChatMessage = 8104,
+    UMQIncomingChatMessage = 8105,
+    UMQPoll = 8106,
+    UMQPollResults = 8107,
+    UMQ2AM_ClientMsgBatch = 8108,
+    UMQEnqueueMobileSalePromotions = 8109, // obsolete
+    UMQEnqueueMobileAnnouncements = 8110, // obsolete
+
+    WorkshopBase = 8200,
+    WorkshopAcceptTOSRequest = 8200, // obsolete
+    WorkshopAcceptTOSResponse = 8201, // obsolete
+
+    WebAPIBase = 8300,
+    WebAPIValidateOAuth2Token = 8300,
+    WebAPIValidateOAuth2TokenResponse = 8301,
+    WebAPIInvalidateTokensForAccount = 8302, // obsolete
+    WebAPIRegisterGCInterfaces = 8303,
+    WebAPIInvalidateOAuthClientCache = 8304,
+    WebAPIInvalidateOAuthTokenCache = 8305,
+    WebAPISetSecrets = 8306,
+
+    BackpackBase = 8400,
+    BackpackAddToCurrency = 8401,
+    BackpackAddToCurrencyResponse = 8402,
+
+    CREBase = 8500,
+    CRERankByTrend = 8501, // obsolete
+    CRERankByTrendResponse = 8502, // obsolete
+    CREItemVoteSummary = 8503,
+    CREItemVoteSummaryResponse = 8504,
+    CRERankByVote = 8505, // obsolete
+    CRERankByVoteResponse = 8506, // obsolete
+    CREUpdateUserPublishedItemVote = 8507,
+    CREUpdateUserPublishedItemVoteResponse = 8508,
+    CREGetUserPublishedItemVoteDetails = 8509,
+    CREGetUserPublishedItemVoteDetailsResponse = 8510,
+    CREEnumeratePublishedFiles = 8511,
+    CREEnumeratePublishedFilesResponse = 8512,
+    CREPublishedFileVoteAdded = 8513,
+
+    SecretsBase = 8600,
+    SecretsRequestCredentialPair = 8600,
+    SecretsCredentialPairResponse = 8601,
+    SecretsRequestServerIdentity = 8602, // obsolete
+    SecretsServerIdentityResponse = 8603, // obsolete
+    SecretsUpdateServerIdentities = 8604, // obsolete
+
+    BoxMonitorBase = 8700,
+    BoxMonitorReportRequest = 8700,
+    BoxMonitorReportResponse = 8701,
+
+    LogsinkBase = 8800,
+    LogsinkWriteReport = 8800,
+
+    PICSBase = 8900,
+    ClientPICSChangesSinceRequest = 8901,
+    ClientPICSChangesSinceResponse = 8902,
+    ClientPICSProductInfoRequest = 8903,
+    ClientPICSProductInfoResponse = 8904,
+    ClientPICSAccessTokenRequest = 8905,
+    ClientPICSAccessTokenResponse = 8906,
+
+    WorkerProcess = 9000,
+    WorkerProcessPingRequest = 9000,
+    WorkerProcessPingResponse = 9001,
+    WorkerProcessShutdown = 9002,
+
+    DRMWorkerProcess = 9100,
+    DRMWorkerProcessDRMAndSign = 9100,
+    DRMWorkerProcessDRMAndSignResponse = 9101,
+    DRMWorkerProcessSteamworksInfoRequest = 9102,
+    DRMWorkerProcessSteamworksInfoResponse = 9103,
+    DRMWorkerProcessInstallDRMDLLRequest = 9104,
+    DRMWorkerProcessInstallDRMDLLResponse = 9105,
+    DRMWorkerProcessSecretIdStringRequest = 9106,
+    DRMWorkerProcessSecretIdStringResponse = 9107,
+    DRMWorkerProcessGetDRMGuidsFromFileRequest = 9108, // obsolete
+    DRMWorkerProcessGetDRMGuidsFromFileResponse = 9109, // obsolete
+    DRMWorkerProcessInstallProcessedFilesRequest = 9110,
+    DRMWorkerProcessInstallProcessedFilesResponse = 9111,
+    DRMWorkerProcessExamineBlobRequest = 9112,
+    DRMWorkerProcessExamineBlobResponse = 9113,
+    DRMWorkerProcessDescribeSecretRequest = 9114,
+    DRMWorkerProcessDescribeSecretResponse = 9115,
+    DRMWorkerProcessBackfillOriginalRequest = 9116,
+    DRMWorkerProcessBackfillOriginalResponse = 9117,
+    DRMWorkerProcessValidateDRMDLLRequest = 9118,
+    DRMWorkerProcessValidateDRMDLLResponse = 9119,
+    DRMWorkerProcessValidateFileRequest = 9120,
+    DRMWorkerProcessValidateFileResponse = 9121,
+    DRMWorkerProcessSplitAndInstallRequest = 9122,
+    DRMWorkerProcessSplitAndInstallResponse = 9123,
+    DRMWorkerProcessGetBlobRequest = 9124,
+    DRMWorkerProcessGetBlobResponse = 9125,
+    DRMWorkerProcessEvaluateCrashRequest = 9126,
+    DRMWorkerProcessEvaluateCrashResponse = 9127,
+    DRMWorkerProcessAnalyzeFileRequest = 9128,
+    DRMWorkerProcessAnalyzeFileResponse = 9129,
+    DRMWorkerProcessUnpackBlobRequest = 9130,
+    DRMWorkerProcessUnpackBlobResponse = 9131,
+    DRMWorkerProcessInstallAllRequest = 9132,
+    DRMWorkerProcessInstallAllResponse = 9133,
+
+    TestWorkerProcess = 9200,
+    TestWorkerProcessLoadUnloadModuleRequest = 9200,
+    TestWorkerProcessLoadUnloadModuleResponse = 9201,
+    TestWorkerProcessServiceModuleCallRequest = 9202,
+    TestWorkerProcessServiceModuleCallResponse = 9203,
+
+    QuestServerBase = 9300,
+
+    ClientGetEmoticonList = 9330,
+    ClientEmoticonList = 9331,
+
+    ClientSharedLibraryBase = 9400, // obsolete "renamed to SLCBase"
+    SLCBase = 9400,
+    SLCUserSessionStatus = 9400,
+    SLCRequestUserSessionStatus = 9401,
+    SLCSharedLicensesLockStatus = 9402,
+    ClientSharedLicensesLockStatus = 9403, // obsolete
+    ClientSharedLicensesStopPlaying = 9404, // obsolete
+    ClientSharedLibraryLockStatus = 9405,
+    ClientSharedLibraryStopPlaying = 9406,
+    SLCOwnerLibraryChanged = 9407,
+    SLCSharedLibraryChanged = 9408,
+
+    RemoteClientBase = 9500,
+    RemoteClientAuth = 9500,
+    RemoteClientAuthResponse = 9501,
+    RemoteClientAppStatus = 9502,
+    RemoteClientStartStream = 9503,
+    RemoteClientStartStreamResponse = 9504,
+    RemoteClientPing = 9505,
+    RemoteClientPingResponse = 9506,
+    ClientUnlockStreaming = 9507,
+    ClientUnlockStreamingResponse = 9508,
+    RemoteClientAcceptEULA = 9509,
+    RemoteClientGetControllerConfig = 9510,
+    RemoteClientGetControllerConfigResposne = 9511,
+    RemoteClientStreamingEnabled = 9512,
+
+    ClientConcurrentSessionsBase = 9600,
+    ClientPlayingSessionState = 9600,
+    ClientKickPlayingSession = 9601,
+
+    ClientBroadcastBase = 9700,
+    ClientBroadcastInit = 9700,
+    ClientBroadcastFrames = 9701,
+    ClientBroadcastDisconnect = 9702,
+    ClientBroadcastScreenshot = 9703,
+    ClientBroadcastUploadConfig = 9704,
+
+    BaseClient3 = 9800,
+    ClientVoiceCallPreAuthorize = 9800,
+    ClientVoiceCallPreAuthorizeResponse = 9801,
+}
+
+export enum EUniverse {
+    Invalid = 0,
+
+    Public = 1,
+    Beta = 2,
+    Internal = 3,
+    Dev = 4,
+
+    Max = 5,
+}
+
+export enum EChatEntryType {
+    Invalid = 0,
+
+    ChatMsg = 1,
+    Typing = 2,
+    InviteGame = 3,
+    Emote = 4, // removed "No longer supported by clients"
+    LobbyGameStart = 5, // removed "Listen for LobbyGameCreated_t callback instead"
+    LeftConversation = 6,
+    Entered = 7,
+    WasKicked = 8,
+    WasBanned = 9,
+    Disconnected = 10,
+    HistoricalChat = 11,
+    Reserved1 = 12,
+    Reserved2 = 13,
+    LinkBlocked = 14,
+}
+
+export enum EPersonaState {
+    Offline = 0,
+
+    Online = 1,
+    Busy = 2,
+    Away = 3,
+    Snooze = 4,
+    LookingToTrade = 5,
+    LookingToPlay = 6,
+
+    Max = 7,
+}
+
+export enum EAccountType {
+    Invalid = 0,
+
+    Individual = 1,
+    Multiseat = 2,
+    GameServer = 3,
+    AnonGameServer = 4,
+    Pending = 5,
+    ContentServer = 6,
+    Clan = 7,
+    Chat = 8,
+    ConsoleUser = 9,
+    AnonUser = 10,
+
+    Max = 11,
+}
+
+export enum EFriendRelationship {
+    None = 0,
+
+    Blocked = 1,
+    RequestRecipient = 2,
+    Friend = 3,
+    RequestInitiator = 4,
+    Ignored = 5,
+    IgnoredFriend = 6,
+    SuggestedFriend = 7,
+
+    Max = 8,
+}
+
+export enum EAccountFlags {
+    NormalUser = 0,
+
+    PersonaNameSet = 1,
+    Unbannable = 2,
+    PasswordSet = 4,
+    Support = 8,
+    Admin = 16,
+    Supervisor = 32,
+    AppEditor = 64,
+    HWIDSet = 128,
+    PersonalQASet = 256,
+    VacBeta = 512,
+    Debug = 1024,
+    Disabled = 2048,
+    LimitedUser = 4096,
+    LimitedUserForce = 8192,
+    EmailValidated = 16384,
+    MarketingTreatment = 32768,
+    OGGInviteOptOut = 65536,
+    ForcePasswordChange = 131072,
+    ForceEmailVerification = 262144,
+    LogonExtraSecurity = 524288,
+    LogonExtraSecurityDisabled = 1048576,
+    Steam2MigrationComplete = 2097152,
+    NeedLogs = 4194304,
+    Lockdown = 8388608,
+    MasterAppEditor = 16777216,
+    BannedFromWebAPI = 33554432,
+    ClansOnlyFromFriends = 67108864,
+    GlobalModerator = 134217728,
+    ParentalSettings = 268435456,
+    ThirdPartySupport = 536870912,
+    NeedsSSANextSteamLogon = 1073741824,
+}
+
+export enum EClanPermission {
+    Nobody = 0,
+
+    Owner = 1,
+    Officer = 2,
+    OwnerAndOfficer = 3,
+    Member = 4,
+    Moderator = 8,
+
+    OwnerOfficerModerator = Owner | Officer | Moderator, // 11
+    AllMembers = Owner | Officer | Moderator | Member, // 15
+
+    OGGGameOwner = 16,
+
+    NonMember = 128,
+
+    MemberAllowed = NonMember | Member, // 132
+    ModeratorAllowed = NonMember | Member | Moderator, // 140
+    OfficerAllowed = NonMember | Member | Moderator | Officer, // 142
+    OwnerAllowed = NonMember | Member | Moderator | Officer | Owner, // 143
+    Anybody = NonMember | Member | Moderator | Officer | Owner, // 143
+}
+
+export enum EChatPermission {
+    Close = 1,
+    Invite = 2,
+    Talk = 8,
+    Kick = 16,
+    Mute = 32,
+    SetMetadata = 64,
+    ChangePermissions = 128,
+    Ban = 256,
+    ChangeAccess = 512,
+
+    EveryoneNotInClanDefault = Talk, // 8
+    EveryoneDefault = Talk | Invite, // 10
+
+    // todo: this doesn't seem correct...
+    MemberDefault = Ban | Kick | Talk | Invite, // 282
+
+    OfficerDefault = Ban | Kick | Talk | Invite, // 282
+    OwnerDefault = ChangeAccess | Ban | SetMetadata | Mute | Kick | Talk | Invite | Close, // 891
+
+    Mask = 1019,
+}
+
+export enum EFriendFlags {
+    None = 0,
+    Blocked = 1,
+    FriendshipRequested = 2,
+    Immediate = 4,
+    ClanMember = 8,
+    OnGameServer = 16,
+    RequestingFriendship = 128,
+    RequestingInfo = 256,
+    Ignored = 512,
+    IgnoredFriend = 1024,
+    Suggested = 2048,
+    ChatMember = 4096,
+
+    FlagAll = 65535,
+}
+
+export enum EPersonaStateFlag {
+    HasRichPresence = 1,
+    InJoinableGame = 2,
+    Golden = 4, // removed "no longer has any effect"
+
+    OnlineUsingWeb = 256, // removed "renamed to ClientTypeWeb"
+    ClientTypeWeb = 256,
+    OnlineUsingMobile = 512, // removed "renamed to ClientTypeMobile"
+    ClientTypeMobile = 512,
+    OnlineUsingBigPicture = 1024, // removed "renamed to ClientTypeTenfoot"
+    ClientTypeTenfoot = 1024,
+    OnlineUsingVR = 2048, // removed "renamed to ClientTypeVR"
+    ClientTypeVR = 2048,
+    LaunchTypeGamepad = 4096,
+}
+
+export enum EClientPersonaStateFlag {
+    Status = 1,
+    PlayerName = 2,
+    QueryPort = 4,
+    SourceID = 8,
+    Presence = 16,
+    Metadata = 32, // removed
+    LastSeen = 64,
+    ClanInfo = 128,
+    GameExtraInfo = 256,
+    GameDataBlob = 512,
+    ClanTag = 1024,
+    Facebook = 2048,
+}
+
+export enum EAppUsageEvent {
+    GameLaunch = 1,
+    GameLaunchTrial = 2,
+    Media = 3,
+    PreloadStart = 4,
+    PreloadFinish = 5,
+    MarketingMessageView = 6,
+    InGameAdViewed = 7,
+    GameLaunchFreeWeekend = 8,
+}
+
+export enum ELicenseFlags {
+    None = 0,
+    Renew = 0x01,
+    RenewalFailed = 0x02,
+    Pending = 0x04,
+    Expired = 0x08,
+    CancelledByUser = 0x10,
+    CancelledByAdmin = 0x20,
+    LowViolenceContent = 0x40,
+    ImportedFromSteam2 = 0x80,
+    ForceRunRestriction = 0x100,
+    RegionRestrictionExpired = 0x200,
+    CancelledByFriendlyFraudLock = 0x400,
+    NotActivated = 0x800,
+}
+
+export enum ELicenseType {
+    NoLicense = 0,
+    SinglePurchase = 1,
+    SinglePurchaseLimitedUse = 2,
+    RecurringCharge = 3,
+    RecurringChargeLimitedUse = 4,
+    RecurringChargeLimitedUseWithOverages = 5,
+    RecurringOption = 6,
+    LimitedUseDelayedActivation = 7,
+}
+
+export enum EPaymentMethod {
+    None = 0,
+    ActivationCode = 1,
+    CreditCard = 2,
+    Giropay = 3,
+    PayPal = 4,
+    Ideal = 5,
+    PaySafeCard = 6,
+    Sofort = 7,
+    GuestPass = 8,
+    WebMoney = 9,
+    MoneyBookers = 10,
+    AliPay = 11,
+    Yandex = 12,
+    Kiosk = 13,
+    Qiwi = 14,
+    GameStop = 15,
+    HardwarePromo = 16,
+    MoPay = 17,
+    BoletoBancario = 18,
+    BoaCompraGold = 19,
+    BancoDoBrasilOnline = 20,
+    ItauOnline = 21,
+    BradescoOnline = 22,
+    Pagseguro = 23,
+    VisaBrazil = 24,
+    AmexBrazil = 25,
+    Aura = 26,
+    Hipercard = 27,
+    MastercardBrazil = 28,
+    DinersCardBrazil = 29,
+    AuthorizedDevice = 30,
+    MOLPoints = 31,
+    ClickAndBuy = 32,
+    Beeline = 33,
+    Konbini = 34,
+    EClubPoints = 35,
+    CreditCardJapan = 36,
+    BankTransferJapan = 37,
+    PayEasyJapan = 38, // removed "renamed to PayEasy"
+    PayEasy = 38,
+    Zong = 39,
+    CultureVoucher = 40,
+    BookVoucher = 41,
+    HappymoneyVoucher = 42,
+    ConvenientStoreVoucher = 43,
+    GameVoucher = 44,
+    Multibanco = 45,
+    Payshop = 46,
+    Maestro = 47, // removed "renamed to MaestroBoaCompra"
+    MaestroBoaCompra = 47,
+    OXXO = 48,
+    ToditoCash = 49,
+    Carnet = 50,
+    SPEI = 51,
+    ThreePay = 52,
+    IsBank = 53,
+    Garanti = 54,
+    Akbank = 55,
+    YapiKredi = 56,
+    Halkbank = 57,
+    BankAsya = 58,
+    Finansbank = 59,
+    DenizBank = 60,
+    PTT = 61,
+    CashU = 62,
+    AutoGrant = 64,
+    WebMoneyJapan = 65,
+    OneCard = 66,
+    PSE = 67,
+    Exito = 68,
+    Efecty = 69,
+    Paloto = 70,
+    PinValidda = 71,
+    MangirKart = 72,
+    BancoCreditoDePeru = 73,
+    BBVAContinental = 74,
+    SafetyPay = 75,
+    PagoEfectivo = 76,
+    Trustly = 77,
+    UnionPay = 78,
+    BitCoin = 79,
+    Wallet = 128,
+    Valve = 129,
+    SteamPressMaster = 130, // removed "renamed to MasterComp"
+    MasterComp = 130,
+    StorePromotion = 131, // removed "renamed to Promotional"
+    Promotional = 131,
+    OEMTicket = 256,
+    Split = 512,
+    Complimentary = 1024,
+}
+
+export enum EPurchaseResultDetail {
+    NoDetail = 0,
+    AVSFailure = 1,
+    InsufficientFunds = 2,
+    ContactSupport = 3,
+    Timeout = 4,
+    InvalidPackage = 5,
+    InvalidPaymentMethod = 6,
+    InvalidData = 7,
+    OthersInProgress = 8,
+    AlreadyPurchased = 9,
+    WrongPrice = 10,
+    FraudCheckFailed = 11,
+    CancelledByUser = 12,
+    RestrictedCountry = 13,
+    BadActivationCode = 14,
+    DuplicateActivationCode = 15,
+    UseOtherPaymentMethod = 16,
+    UseOtherFunctionSource = 17,
+    InvalidShippingAddress = 18,
+    RegionNotSupported = 19,
+    AcctIsBlocked = 20,
+    AcctNotVerified = 21,
+    InvalidAccount = 22,
+    StoreBillingCountryMismatch = 23,
+    DoesNotOwnRequiredApp = 24,
+    CanceledByNewTransaction = 25,
+    ForceCanceledPending = 26,
+    FailCurrencyTransProvider = 27,
+    FailedCyberCafe = 28,
+    NeedsPreApproval = 29,
+    PreApprovalDenied = 30,
+    WalletCurrencyMismatch = 31,
+    EmailNotValidated = 32,
+    ExpiredCard = 33,
+    TransactionExpired = 34,
+    WouldExceedMaxWallet = 35,
+    MustLoginPS3AppForPurchase = 36,
+    CannotShipToPOBox = 37,
+    InsufficientInventory = 38,
+    CannotGiftShippedGoods = 39,
+    CannotShipInternationally = 40,
+    BillingAgreementCancelled = 41,
+    InvalidCoupon = 42,
+    ExpiredCoupon = 43,
+    AccountLocked = 44,
+    OtherAbortableInProgress = 45,
+    ExceededSteamLimit = 46,
+    OverlappingPackagesInCart = 47,
+    NoWallet = 48,
+    NoCachedPaymentMethod = 49,
+    CannotRedeemCodeFromClient = 50,
+    PurchaseAmountNoSupportedByProvider = 51,
+    OverlappingPackagesInPendingTransaction = 52,
+    RateLimited = 53,
+    OwnsExcludedApp = 54,
+    CreditCardBinMismatchesType = 55,
+    CartValueTooHigh = 56,
+    BillingAgreementAlreadyExists = 57,
+    POSACodeNotActivated = 58,
+    CannotShipToCountry = 59,
+    HungTransactionCancelled = 60,
+    PaypalInternalError = 61,
+    UnknownGlobalCollectError = 62,
+    InvalidTaxAddress = 63,
+    PhysicalProductLimitExceeded = 64,
+    PurchaseCannotBeReplayed = 65,
+    DelayedCompletion = 66,
+    BundleTypeCannotBeGifted = 67,
+}
+
+export enum EIntroducerRouting {
+    FileShare = 0, // removed
+    P2PVoiceChat = 1,
+    P2PNetworking = 2,
+}
+
+export enum EServerFlags {
+    None = 0,
+    Active = 1,
+    Secure = 2,
+    Dedicated = 4,
+    Linux = 8,
+    Passworded = 16,
+    Private = 32,
+}
+
+export enum EDenyReason {
+    InvalidVersion = 1,
+    Generic = 2,
+    NotLoggedOn = 3,
+    NoLicense = 4,
+    Cheater = 5,
+    LoggedInElseWhere = 6,
+    UnknownText = 7,
+    IncompatibleAnticheat = 8,
+    MemoryCorruption = 9,
+    IncompatibleSoftware = 10,
+    SteamConnectionLost = 11,
+    SteamConnectionError = 12,
+    SteamResponseTimedOut = 13,
+    SteamValidationStalled = 14,
+    SteamOwnerLeftGuestUser = 15,
+}
+
+export enum EClanRank {
+    None = 0,
+    Owner = 1,
+    Officer = 2,
+    Member = 3,
+    Moderator = 4,
+}
+
+export enum EClanRelationship {
+    None = 0,
+    Blocked = 1,
+    Invited = 2,
+    Member = 3,
+    Kicked = 4,
+    KickAcknowledged = 5,
+}
+
+export enum EAuthSessionResponse {
+    OK = 0,
+    UserNotConnectedToSteam = 1,
+    NoLicenseOrExpired = 2,
+    VACBanned = 3,
+    LoggedInElseWhere = 4,
+    VACCheckTimedOut = 5,
+    AuthTicketCanceled = 6,
+    AuthTicketInvalidAlreadyUsed = 7,
+    AuthTicketInvalid = 8,
+    PublisherIssuedBan = 9,
+}
+
+export enum EChatRoomEnterResponse {
+    Success = 1,
+    DoesntExist = 2,
+    NotAllowed = 3,
+    Full = 4,
+    Error = 5,
+    Banned = 6,
+    Limited = 7,
+    ClanDisabled = 8,
+    CommunityBan = 9,
+    MemberBlockedYou = 10,
+    YouBlockedMember = 11,
+
+    // these appear to have been removed
+    NoRankingDataLobby = 12, // removed
+    NoRankingDataUser = 13, // removed
+    RankOutOfRange = 14, //removed
+}
+
+export enum EChatRoomType {
+    Friend = 1,
+    MUC = 2,
+    Lobby = 3,
+}
+
+export enum EChatInfoType {
+    StateChange = 1,
+    InfoUpdate = 2,
+    MemberLimitChange = 3,
+}
+
+export enum EChatAction {
+    InviteChat = 1,
+    Kick = 2,
+    Ban = 3,
+    UnBan = 4,
+    StartVoiceSpeak = 5,
+    EndVoiceSpeak = 6,
+    LockChat = 7,
+    UnlockChat = 8,
+    CloseChat = 9,
+    SetJoinable = 10,
+    SetUnjoinable = 11,
+    SetOwner = 12,
+    SetInvisibleToFriends = 13,
+    SetVisibleToFriends = 14,
+    SetModerated = 15,
+    SetUnmoderated = 16,
+}
+
+export enum EChatActionResult {
+    Success = 1,
+    Error = 2,
+    NotPermitted = 3,
+    NotAllowedOnClanMember = 4,
+    NotAllowedOnBannedUser = 5,
+    NotAllowedOnChatOwner = 6,
+    NotAllowedOnSelf = 7,
+    ChatDoesntExist = 8,
+    ChatFull = 9,
+    VoiceSlotsFull = 10,
+}
+
+export enum EAppInfoSection {
+    Unknown = 0,
+    All = 1,
+
+    First = 2,
+    Common = 2,
+    Extended = 3,
+    Config = 4,
+    Stats = 5,
+    Install = 6,
+    Depots = 7,
+    VAC = 8, // removed
+    VAC_UNUSED = 8, // removed
+    DRM = 9, // removed
+    DRM_UNUSED = 9, // removed
+    UFS = 10,
+    OGG = 11,
+    Items = 12, // removed
+    ItemsUNUSED = 12, // removed
+    Policies = 13,
+    SysReqs = 14,
+    Community = 15,
+    Store = 16,
+
+    Max = 17,
+}
+
+export enum EContentDownloadSourceType {
+    Invalid = 0,
+
+    CS = 1,
+    CDN = 2,
+    LCS = 3,
+    ProxyCache = 4,
+    LANPeer = 5,
+
+    Max = 5,
+}
+
+export enum EPlatformType {
+    Unknown = 0,
+
+    Win32 = 1,
+    Win64 = 2,
+    Linux = 3, // removed "split to Linux64 and Linux32"
+    Linux64 = 3,
+    OSX = 4,
+    PS3 = 5,
+    Linux32 = 6,
+
+    Max = 6,
+}
+
+export enum EOSType {
+    Unknown = -1,
+
+    IOSUnknown = -600,
+
+    AndroidUnknown = -500,
+
+    UMQ = -400,
+
+    PS3 = -300,
+
+    MacOSUnknown = -102,
+    MacOS104 = -101,
+    MacOS105 = -100,
+    MacOS1058 = -99,
+    MacOS106 = -95,
+    MacOS1063 = -94,
+    MacOS1064_slgu = -93,
+    MacOS1067 = -92,
+    MacOS107 = -90,
+    MacOS108 = -89,
+    MacOS109 = -88,
+    MacOS1010 = -87,
+    MacOS1011 = -86,
+    MacOS1012 = -85,
+    MacOSMax = -1,
+
+    LinuxUnknown = -203,
+    Linux22 = -202,
+    Linux24 = -201,
+    Linux26 = -200,
+    Linux32 = -199,
+    Linux35 = -198,
+    Linux36 = -197,
+    Linux310 = -196,
+    LinuxMax = -103,
+
+    WinUnknown = 0,
+    Win311 = 1,
+    Win95 = 2,
+    Win98 = 3,
+    WinME = 4,
+    WinNT = 5,
+    Win200 = 6, // removed "renamed to Win2000"
+    Win2000 = 6,
+    WinXP = 7,
+    Win2003 = 8,
+    WinVista = 9,
+    Win7 = 10, // removed "renamed to Windows7"
+    Windows7 = 10,
+    Win2008 = 11,
+    Win2012 = 12,
+    Win8 = 13, // removed "renamed to Windows8"
+    Windows8 = 13,
+    Win81 = 14, // removed "renamed to Windows81"
+    Windows81 = 14,
+    Win2012R2 = 15,
+    Win10 = 16, // removed "renamed to Windows10"
+    Windows10 = 16,
+
+    WinMAX = 15,
+
+    Max = 26,
+}
+
+export enum EServerType {
+    Invalid = -1,
+    First = 0,
+
+    Shell = 0,
+    GM = 1,
+    BUM = 2, // removed
+    BUMOBOSOLETE = 2, // removed
+    AM = 3,
+    BS = 4,
+    VS = 5,
+    ATS = 6,
+    CM = 7,
+    FBS = 8,
+    FG = 9, // removed "renamed to BoxMonitor"
+    BoxMonitor = 9,
+    SS = 10,
+    DRMS = 11,
+    HubOBSOLETE = 12, // removed
+    Console = 13,
+    ASBOBSOLETE = 14, // removed
+    PICS = 14,
+    Client = 15,
+    BootstrapOBSOLETE = 16, // removed,
+    DP = 17,
+    WG = 18,
+    SM = 19,
+    SLC = 20,
+    UFS = 21,
+    Util = 23,
+    DSS = 24, // removed "renamed to Community"
+    Community = 24,
+    P2PRelayOBSOLETE = 25, // removed
+    AppInformation = 26,
+    Spare = 27,
+    FTS = 28,
+    EPM = 29, // removed
+    EPMOBSOLETE = 29, // removed
+    PS = 30,
+    IS = 31,
+    CCS = 32,
+    DFS = 33,
+    LBS = 34,
+    MDS = 35,
+    CS = 36,
+    GC = 37,
+    NS = 38,
+    OGS = 39,
+    WebAPI = 40,
+    UDS = 41,
+    MMS = 42,
+    GMS = 43,
+    KGS = 44,
+    UCM = 45,
+    RM = 46,
+    FS = 47,
+    Econ = 48,
+    Backpack = 49,
+    UGS = 50,
+    Store = 51, // removed "renamed to StoreFeature"
+    StoreFeature = 51,
+    MoneyStats = 52,
+    CRE = 53,
+    UMQ = 54,
+    Workshop = 55,
+    BRP = 56,
+    GCH = 57,
+    MPAS = 58,
+    Trade = 59,
+    Secrets = 60,
+    Logsink = 61,
+    Market = 62,
+    Quest = 63,
+    WDS = 64,
+    ACS = 65,
+    PNP = 66,
+    TaxForm = 67,
+    ExternalMonitor = 68,
+    Parental = 69,
+    PartnerUpload = 70,
+    Partner = 71,
+    ES = 72,
+    DepotWebContent = 73,
+    ExternalConfig = 74,
+    GameNotifications = 75,
+    MarketRepl = 76,
+    MarketSearch = 77,
+    Localization = 78,
+    Steam2Emulator = 79,
+    PublicTest = 80,
+    SolrMgr = 81,
+    BroadcastRelay = 82,
+    BroadcastDirectory = 83,
+    VideoManager = 84,
+    TradeOffer = 85,
+    BroadcastChat = 86,
+    Phone = 87,
+    AccountScore = 88,
+    Support = 89,
+    LogRequest = 90,
+    LogWorker = 91,
+    EmailDelivery = 92,
+    InventoryManagement = 93,
+    Auth = 94,
+    StoreCatalog = 95,
+    HLTVRelay = 96,
+
+    Max = 97,
+}
+
+export enum EBillingType {
+    NoCost = 0,
+    BillOnceOnly = 1,
+    BillMonthly = 2,
+    ProofOfPrepurchaseOnly = 3,
+    GuestPass = 4,
+    HardwarePromo = 5,
+    Gift = 6,
+    AutoGrant = 7,
+    OEMTicket = 8,
+    RecurringOption = 9,
+    BillOnceOrCDKey = 10,
+    Repurchaseable = 11,
+    FreeOnDemand = 12,
+    Rental = 13,
+    CommercialLicense = 14,
+    FreeCommercialLicense = 15,
+
+    NumBillingTypes = 16,
+}
+
+export enum EActivationCodeClass {
+    WonCDKey = 0,
+    ValveCDKey = 1,
+    Doom3CDKey = 2,
+    DBLookup = 3,
+    Steam2010Key = 4,
+    Max = 5,
+    Test = 2147483647,
+    Invalid = 4294967295,
+}
+
+
+export enum EChatMemberStateChange {
+    Entered = 0x01,
+    Left = 0x02,
+    Disconnected = 0x04,
+    Kicked = 0x08,
+    Banned = 0x10,
+
+    VoiceSpeaking = 0x1000,
+    VoiceDoneSpeaking = 0x2000,
+}
+
+export enum ERegionCode {
+    USEast = 0x00,
+    USWest = 0x01,
+    SouthAmerica = 0x02,
+    Europe = 0x03,
+    Asia = 0x04,
+    Australia = 0x05,
+    MiddleEast = 0x06,
+    Africa = 0x07,
+    World = 0xFF,
+}
+
+export enum ECurrencyCode {
+    Invalid = 0,
+
+    USD = 1,
+    GBP = 2,
+    EUR = 3,
+    CHF = 4,
+    RUB = 5,
+    PLN = 6,
+    BRL = 7,
+    JPY = 8,
+    NOK = 9,
+    IDR = 10,
+    MYR = 11,
+    PHP = 12,
+    SGD = 13,
+    THB = 14,
+    VND = 15,
+    KRW = 16,
+    TRY = 17,
+    UAH = 18,
+    MXN = 19,
+    CAD = 20,
+    AUD = 21,
+    NZD = 22,
+    CNY = 23,
+    INR = 24,
+    CLP = 25,
+    PEN = 26,
+    COP = 27,
+    ZAR = 28,
+    HKD = 29,
+    TWD = 30,
+    SAR = 31,
+    AED = 32,
+    ARS = 34,
+    ILS = 35,
+    BYN = 36,
+    KZT = 37,
+    KWD = 38,
+    QAR = 39,
+    CRC = 40,
+    UYU = 41,
+
+    Max = 42,
+}
+
+export enum EDepotFileFlag {
+    UserConfig = 1,
+    VersionedUserConfig = 2,
+    Encrypted = 4,
+    ReadOnly = 8,
+    Hidden = 16,
+    Executable = 32,
+    Directory = 64,
+    CustomExecutable = 128,
+    InstallScript = 256,
+    Symlink = 512,
+}
+
+export enum EWorkshopEnumerationType {
+    RankedByVote = 0,
+    Recent = 1,
+    Trending = 2,
+    FavoriteOfFriends = 3,
+    VotedByFriends = 4,
+    ContentByFriends = 5,
+    RecentFromFollowedUsers = 6,
+}
+
+export enum EPublishedFileVisibility {
+    Public = 0,
+    FriendsOnly = 1,
+    Private = 2,
+}
+
+export enum EWorkshopFileType {
+    First = 0,
+
+    Community = 0,
+    Microtransaction = 1,
+    Collection = 2,
+    Art = 3,
+    Video = 4,
+    Screenshot = 5,
+    Game = 6,
+    Software = 7,
+    Concept = 8,
+    WebGuide = 9,
+    IntegratedGuide = 10,
+    Merch = 11,
+    ControllerBinding = 12,
+    SteamworksAccessInvite = 13,
+    SteamVideo = 14,
+    GameManagedItem = 15,
+
+    Max = 16,
+}
+
+export enum EWorkshopFileAction {
+    Played = 0,
+    Completed = 1,
+}
+
+export enum EEconTradeResponse {
+    Accepted = 0,
+    Declined = 1,
+    TradeBannedInitiator = 2,
+    TradeBannedTarget = 3,
+    TargetAlreadyTrading = 4,
+    Disabled = 5,
+    NotLoggedIn = 6,
+    Cancel = 7,
+    TooSoon = 8,
+    TooSoonPenalty = 9,
+    ConnectionFailed = 10,
+    AlreadyTrading = 11,
+    AlreadyHasTradeRequest = 12,
+    NoResponse = 13,
+    CyberCafeInitiator = 14,
+    CyberCafeTarget = 15,
+    SchoolLabInitiator = 16,
+    SchoolLabTarget = 16,
+    InitiatorBlockedTarget = 18,
+    InitiatorNeedsVerifiedEmail = 20,
+    InitiatorNeedsSteamGuard = 21,
+    TargetAccountCannotTrade = 22,
+    InitiatorSteamGuardDuration = 23,
+    InitiatorPasswordResetProbation = 24,
+    InitiatorNewDeviceCooldown = 25,
+    InitiatorSentInvalidCookie = 26,
+    NeedsEmailConfirmation = 27,
+    InitiatorRecentEmailChange = 28,
+    NeedsMobileConfirmation = 29,
+    TradingHoldForClearedTradeOffersInitiator = 30,
+    WouldExceedMaxAssetCount = 31,
+    OKToDeliver = 50,
+}
+
+export enum EMarketingMessageFlags {
+    None = 0,
+
+    HighPriority = 1,
+    PlatformWindows = 2,
+    PlatformMac = 4,
+    PlatformLinux = 8,
+    PlatformRestrictions = PlatformWindows | PlatformMac | PlatformLinux,
+}
+
+export enum ENewsUpdateType {
+    AppNews = 0,
+    SteamAds = 1,
+    SteamNews = 2,
+    CDDBUpdate = 3,
+    ClientUpdate = 4,
+}
+
+export enum ESystemIMType {
+    RawText = 0,
+    InvalidCard = 1,
+    RecurringPurchaseFailed = 2,
+    CardWillExpire = 3,
+    SubscriptionExpired = 4,
+    GuestPassReceived = 5,
+    GuestPassGranted = 6,
+    GiftRevoked = 7,
+    SupportMessage = 8,
+    SupportMessageClearAlert = 9,
+
+    Max = 10,
+}
+
+export enum EChatFlags {
+    Locked = 1,
+    InvisibleToFriends = 2,
+    Moderated = 4,
+    Unjoinable = 8,
+}
+
+export enum ERemoteStoragePlatform {
+    None = 0,
+
+    Windows = 1,
+    OSX = 2,
+    PS3 = 4,
+    Linux = 8,
+    Reserved1 = 8, // removed
+    Reserved2 = 16,
+
+    All = -1,
+}
+
+export enum EDRMBlobDownloadType {
+    Error = 0,
+
+    File = 1,
+    Parts = 2,
+    Compressed = 4,
+    AllMask = 7,
+    IsJob = 8,
+    HighPriority = 16,
+    AddTimestamp = 32,
+    LowPriority = 64,
+}
+
+export enum EDRMBlobDownloadErrorDetail {
+    None = 0,
+
+    DownloadFailed = 1,
+    TargetLocked = 2,
+    OpenZip = 3,
+    ReadZipDirectory = 4,
+    UnexpectedZipEntry = 5,
+    UnzipFullFile = 6,
+    UnknownBlobType = 7,
+    UnzipStrips = 8,
+    UnzipMergeGuid = 9,
+    UnzipSignature = 10,
+    ApplyStrips = 11,
+    ApplyMergeGuid = 12,
+    ApplySignature = 13,
+    AppIdMismatch = 14,
+    AppIdUnexpected = 15,
+    AppliedSignatureCorrupt = 16,
+    ApplyValveSignatureHeader = 17,
+    UnzipValveSignatureHeader = 18,
+    PathManipulationError = 19,
+
+    TargetLocked_Base = 65536,
+    TargetLocked_Max = 131071,
+
+    NextBase = 131072,
+}
+
+export enum EClientStat {
+    P2PConnectionsUDP = 0,
+    P2PConnectionsRelay = 1,
+    P2PGameConnections = 2,
+    P2PVoiceConnections = 3,
+    BytesDownloaded = 4,
+
+    Max = 5,
+}
+
+export enum EClientStatAggregateMethod {
+    LatestOnly = 0,
+    Sum = 1,
+    Event = 2,
+    Scalar = 3,
+}
+
+export enum ELeaderboardDataRequest {
+    Global = 0,
+    GlobalAroundUser = 1,
+    Friends = 2,
+    Users = 3,
+}
+
+export enum ELeaderboardSortMethod {
+    None = 0,
+
+    Ascending = 1,
+    Descending = 2,
+}
+
+export enum ELeaderboardDisplayType {
+    None = 0,
+    Numeric = 1,
+    TimeSeconds = 2,
+    TimeMilliSeconds = 3,
+}
+
+export enum ELeaderboardUploadScoreMethod {
+    None = 0,
+
+    KeepBest = 1,
+    ForceUpdate = 2,
+}
+
+export enum EUCMFilePrivacyState {
+    Invalid = -1,
+    Private = 2,
+    FriendsOnly = 4,
+    Public = 8,
+
+    All = Public | FriendsOnly | Private, // 14
+}
+
+export enum EResult {
+    Invalid = 0,
+
+    OK = 1,
+    Fail = 2,
+    NoConnection = 3,
+    InvalidPassword = 5,
+    LoggedInElsewhere = 6,
+    InvalidProtocolVer = 7,
+    InvalidParam = 8,
+    FileNotFound = 9,
+    Busy = 10,
+    InvalidState = 11,
+    InvalidName = 12,
+    InvalidEmail = 13,
+    DuplicateName = 14,
+    AccessDenied = 15,
+    Timeout = 16,
+    Banned = 17,
+    AccountNotFound = 18,
+    InvalidSteamID = 19,
+    ServiceUnavailable = 20,
+    NotLoggedOn = 21,
+    Pending = 22,
+    EncryptionFailure = 23,
+    InsufficientPrivilege = 24,
+    LimitExceeded = 25,
+    Revoked = 26,
+    Expired = 27,
+    AlreadyRedeemed = 28,
+    DuplicateRequest = 29,
+    AlreadyOwned = 30,
+    IPNotFound = 31,
+    PersistFailed = 32,
+    LockingFailed = 33,
+    LogonSessionReplaced = 34,
+    ConnectFailed = 35,
+    HandshakeFailed = 36,
+    IOFailure = 37,
+    RemoteDisconnect = 38,
+    ShoppingCartNotFound = 39,
+    Blocked = 40,
+    Ignored = 41,
+    NoMatch = 42,
+    AccountDisabled = 43,
+    ServiceReadOnly = 44,
+    AccountNotFeatured = 45,
+    AdministratorOK = 46,
+    ContentVersion = 47,
+    TryAnotherCM = 48,
+    PasswordRequiredToKickSession = 49,
+    AlreadyLoggedInElsewhere = 50,
+    Suspended = 51,
+    Cancelled = 52,
+    DataCorruption = 53,
+    DiskFull = 54,
+    RemoteCallFailed = 55,
+    PasswordNotSet = 56, // removed "renamed to PasswordUnset"
+    PasswordUnset = 56,
+    ExternalAccountUnlinked = 57,
+    PSNTicketInvalid = 58,
+    ExternalAccountAlreadyLinked = 59,
+    RemoteFileConflict = 60,
+    IllegalPassword = 61,
+    SameAsPreviousValue = 62,
+    AccountLogonDenied = 63,
+    CannotUseOldPassword = 64,
+    InvalidLoginAuthCode = 65,
+    AccountLogonDeniedNoMailSent = 66, // removed "renamed to AccountLogonDeniedNoMail"
+    AccountLogonDeniedNoMail = 66,
+    HardwareNotCapableOfIPT = 67,
+    IPTInitError = 68,
+    ParentalControlRestricted = 69,
+    FacebookQueryError = 70,
+    ExpiredLoginAuthCode = 71,
+    IPLoginRestrictionFailed = 72,
+    AccountLocked = 73, // removed "renamed to AccountLockedDown"
+    AccountLockedDown = 73,
+    AccountLogonDeniedVerifiedEmailRequired = 74,
+    NoMatchingURL = 75,
+    BadResponse = 76,
+    RequirePasswordReEntry = 77,
+    ValueOutOfRange = 78,
+    UnexpectedError = 79,
+    Disabled = 80,
+    InvalidCEGSubmission = 81,
+    RestrictedDevice = 82,
+    RegionLocked = 83,
+    RateLimitExceeded = 84,
+    AccountLogonDeniedNeedTwoFactorCode = 85, // removed "renamed to AccountLoginDeniedNeedTwoFactor"
+    AccountLoginDeniedNeedTwoFactor = 85,
+    ItemOrEntryHasBeenDeleted = 86, // removed "renamed to ItemDeleted"
+    ItemDeleted = 86,
+    AccountLoginDeniedThrottle = 87,
+    TwoFactorCodeMismatch = 88,
+    TwoFactorActivationCodeMismatch = 89,
+    AccountAssociatedToMultiplePlayers = 90, // removed "renamed to AccountAssociatedToMultiplePartners"
+    AccountAssociatedToMultiplePartners = 90,
+    NotModified = 91,
+    NoMobileDeviceAvailable = 92, // removed "renamed to NoMobileDevice"
+    NoMobileDevice = 92,
+    TimeIsOutOfSync = 93, // removed "renamed to TimeNotSynced"
+    TimeNotSynced = 93,
+    SMSCodeFailed = 94,
+    TooManyAccountsAccessThisResource = 95, // removed "renamed to AccountLimitExceeded"
+    AccountLimitExceeded = 95,
+    AccountActivityLimitExceeded = 96,
+    PhoneActivityLimitExceeded = 97,
+    RefundToWallet = 98,
+    EmailSendFailure = 99,
+    NotSettled = 100,
+    NeedCaptcha = 101,
+    GSLTDenied = 102,
+    GSOwnerDenied = 103,
+    InvalidItemType = 104,
+    IPBanned = 105,
+    GSLTExpired = 106,
+    InsufficientFunds = 107,
+    TooManyPending = 108,
+    NoSiteLicensesFound = 109,
+    WGNetworkSendExceeded = 110,
+}
diff --git a/types/steam-client/steam-client-tests.ts b/types/steam-client/steam-client-tests.ts
new file mode 100644
index 0000000000..e330930c36
--- /dev/null
+++ b/types/steam-client/steam-client-tests.ts
@@ -0,0 +1,38 @@
+import Steam = require("steam-client");
+
+const steamClient = new Steam.CMClient(Steam.EConnectionProtocol.TCP);
+
+steamClient.connect();
+steamClient.connect(Steam.servers[0]);
+steamClient.connect(Steam.servers[0], true);
+
+steamClient.disconnect();
+
+steamClient.on<'connected'>('connected', (serverLoad) => {
+    steamClient.logOn({
+        account_name: serverLoad,
+        password: "password"
+    });
+});
+
+Steam.servers.forEach((server) => server.host);
+
+steamClient.on<'logOnResponse'>('logOnResponse', (details) => {
+    return details.eresult + details.webapi_authenticate_user_nonce;
+});
+
+steamClient.send({
+    msg: Steam.EMsg.ClientGetFinalPrice,
+    proto: {
+        eresult: Steam.EResult.AdministratorOK
+    }
+}, new Buffer("lol"), (header, body) => {
+    return header.msg + body.reverse().toString();
+});
+
+steamClient.bind("127.0.0.1", 80);
+
+if (steamClient.loggedOn) {
+    console.log(steamClient.steamID);
+    console.log(steamClient.remoteAddress);
+}
diff --git a/types/steam-client/tsconfig.json b/types/steam-client/tsconfig.json
new file mode 100644
index 0000000000..fee2ca9ea3
--- /dev/null
+++ b/types/steam-client/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "steam-client-tests.ts"
+    ]
+}
diff --git a/types/steam-client/tslint.json b/types/steam-client/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/steam-client/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From ad286caf2b792b55f4cee850b0ab999cf975213c Mon Sep 17 00:00:00 2001
From: Edward Sammut Alessi <edward.sammut.alessi@preeostudios.com>
Date: Wed, 21 Mar 2018 14:38:07 +0100
Subject: [PATCH 0735/1382] Lint changes

---
 types/steam-client/index.d.ts    | 30 +++++++++++++++---------------
 types/steam-client/tsconfig.json |  1 +
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/types/steam-client/index.d.ts b/types/steam-client/index.d.ts
index ec9f88565f..ff69e39f46 100644
--- a/types/steam-client/index.d.ts
+++ b/types/steam-client/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/DoctorMcKay/node-steam-client
 // Definitions by: Edward Sammut Alessi <https://github.com/Slessi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
 
 /// <reference types="node" />
 /// <reference types="bytebuffer" />
@@ -119,7 +120,7 @@ export type SendMessage = (
     callback?: SendMessage | false
 ) => void;
 
-export type CMEventCallback = {
+export interface CMEventCallback {
     /**
      * Connection closed by the server.
      * Only emitted if the encryption handshake is complete, otherwise it will reconnect automatically (unless you disabled autoRetry).
@@ -127,7 +128,7 @@ export type CMEventCallback = {
      *
      * @param err An Error object. May contain an eresult property.
      */
-    error: (err: Error) => void,
+    error: (err: Error) => void;
 
     /**
      * Encryption handshake complete.
@@ -136,14 +137,14 @@ export type CMEventCallback = {
      *
      * @param serverLoad The load value of the CM server you're connected to. Only available if you're connecting using UDP. It's unclear at this time what scale this value uses.
      */
-    connected: (serverLoad: string) => void,
+    connected: (serverLoad: string) => void;
 
     /**
      * Logon response received. If eresult is EResult.OK, loggedOn is now true.
      *
      * @param response An object with the properties in CMsgClientLogonResponse
      */
-    logOnResponse: (response: CMsgClientLogonResponse) => void,
+    logOnResponse: (response: CMsgClientLogonResponse) => void;
 
     /**
      * CMClient will use this new list when reconnecting, but it will be lost when your application restarts.
@@ -154,21 +155,21 @@ export type CMEventCallback = {
      *
      * @param servers An array containing the up-to-date server list
      */
-    servers: (servers: Server[]) => void,
+    servers: (servers: Server[]) => void;
 
     /**
      * You were logged off from Steam. loggedOn is now false.
      *
      * @param eresesult A value from EResult
      */
-    loggedOff: (eresesult: EResult) => void,
+    loggedOff: (eresesult: EResult) => void;
 
-    message: SendMessage,
-};
+    message: SendMessage;
+}
 
-export type Server = {
-    host: string,
-    port: string | number,
+export interface Server {
+    host: string;
+    port: string | number;
 }
 
 // Protobufs
@@ -191,7 +192,8 @@ export interface CMsgClientLogon {
 
     /**
      * SHA1 hash of your sentry file.
-     * If not provided, Steam will send you a sentry file through the ClientUpdateMachineAuth message (unless a limit for registered sentries is reached? see https://github.com/seishun/node-steam/issues/178).
+     * If not provided, Steam will send you a sentry file through the ClientUpdateMachineAuth message
+     * (unless a limit for registered sentries is reached? see https://github.com/seishun/node-steam/issues/178).
      * If no Steam Guard code is provided, the hash must be already registered with this account, otherwise it's ignored.
      * This value will be ignored if you enable 2FA.
      */
@@ -989,7 +991,6 @@ export enum EMsg {
     CCSDeleteAllCommentsByAuthor = 3161,
     CCSDeleteAllCommentsByAuthorResponse = 3162,
 
-
     BaseLBSRange = 3200,
     LBSSetScore = 3201,
     LBSSetScoreResponse = 3202,
@@ -2647,7 +2648,7 @@ export enum EChatRoomEnterResponse {
     // these appear to have been removed
     NoRankingDataLobby = 12, // removed
     NoRankingDataUser = 13, // removed
-    RankOutOfRange = 14, //removed
+    RankOutOfRange = 14, // removed
 }
 
 export enum EChatRoomType {
@@ -2954,7 +2955,6 @@ export enum EActivationCodeClass {
     Invalid = 4294967295,
 }
 
-
 export enum EChatMemberStateChange {
     Entered = 0x01,
     Left = 0x02,
diff --git a/types/steam-client/tsconfig.json b/types/steam-client/tsconfig.json
index fee2ca9ea3..a619b6452a 100644
--- a/types/steam-client/tsconfig.json
+++ b/types/steam-client/tsconfig.json
@@ -7,6 +7,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"

From 17805e6b66c507944861b965495cd7a2cb9c1bb9 Mon Sep 17 00:00:00 2001
From: Chris Moyer <kopertop@gmail.com>
Date: Wed, 21 Mar 2018 10:24:37 -0400
Subject: [PATCH 0736/1382] Adds _enableImpersonation config option for
 auth0-lock

This is available as of Lock 11.4.
---
 types/auth0-lock/index.d.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/auth0-lock/index.d.ts b/types/auth0-lock/index.d.ts
index 7dd99af9e6..dd3e6aa7ee 100644
--- a/types/auth0-lock/index.d.ts
+++ b/types/auth0-lock/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for auth0-lock 10.16
+// Type definitions for auth0-lock 11.4
 // Project: http://auth0.com
 // Definitions by: Brian Caruso <https://github.com/carusology>
 //                 Dan Caddigan <https://github.com/goldcaddy77>
@@ -143,6 +143,7 @@ interface Auth0LockConstructorOptions {
     socialButtonStyle?: "big" | "small";
     theme?: Auth0LockThemeOptions;
     usernameStyle?: string;
+    _enableImpersonation?: boolean;
 }
 
 interface Auth0LockFlashMessageOptions {

From 1f14091892deb50dd2faec1de87baad15ff80452 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Olivier=20B=C3=A9dard?= <pobed2@gmail.com>
Date: Wed, 21 Mar 2018 11:37:04 -0400
Subject: [PATCH 0737/1382] Add `extensions` to GraphQLError

https://github.com/graphql/graphql-js/blob/master/src/error/GraphQLError.js#L89
---
 types/graphql/error/GraphQLError.d.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/types/graphql/error/GraphQLError.d.ts b/types/graphql/error/GraphQLError.d.ts
index 116f17c3fa..abcc6be5b9 100644
--- a/types/graphql/error/GraphQLError.d.ts
+++ b/types/graphql/error/GraphQLError.d.ts
@@ -56,6 +56,11 @@ export class GraphQLError extends Error {
    * The original error thrown from a field resolver during execution.
    */
   originalError?: Error;
+    
+  /**
+   * Extension fields to add to the formatted error.
+   */
+  extensions?: { [key: string]: any } | undefined;
 
   constructor(
     message: string,
@@ -64,5 +69,6 @@ export class GraphQLError extends Error {
     positions?: number[],
     path?: Array<string | number>,
     originalError?: Error,
+    extensions?: { [key: string]: any },
   );
 }

From afc8d0533db07498e75fa13396f1acf461acbb8f Mon Sep 17 00:00:00 2001
From: Tiger Oakes <tiger.oakes@vitalmechanics.com>
Date: Tue, 20 Mar 2018 15:43:46 -0700
Subject: [PATCH 0738/1382] Added migration changes for 0.89 -> 0.91

---
 types/three/index.d.ts                  |   2 +-
 types/three/test/math/test_unit_math.ts | 309 +++++++++++++-----------
 types/three/three-core.d.ts             |  98 ++++----
 3 files changed, 214 insertions(+), 195 deletions(-)

diff --git a/types/three/index.d.ts b/types/three/index.d.ts
index e553853293..50450fd793 100644
--- a/types/three/index.d.ts
+++ b/types/three/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for three.js 0.89
+// Type definitions for three.js 0.91
 // Project: https://threejs.org
 // Definitions by: Kon <http://phyzkit.net/>, Satoru Kimura <https://github.com/gyohk>, Florent Poujol <https://github.com/florentpoujol>, SereznoKot <https://github.com/SereznoKot>, HouChunlei <https://github.com/omni360>, Ivo <https://github.com/ivoisbelongtous>, David Asmuth <https://github.com/piranha771>, Brandon Roberge, Qinsi ZHU <https://github.com/qszhusightp>, Toshiya Nakakura <https://github.com/nakakura>, Poul Kjeldager Sørensen <https://github.com/s093294>, Stefan Profanter <https://github.com/Pro>, Edmund Fokschaner <https://github.com/efokschaner>, Roelof Jooste <https://github.com/PsychoSTS>, Daniel Hritzkiv <https://github.com/dhritzkiv>, Apurva Ojas <https://github.com/apurvaojas>
 // Definitions: https://github.com//DefinitelyTyped
diff --git a/types/three/test/math/test_unit_math.ts b/types/three/test/math/test_unit_math.ts
index 4a8e0a8c14..d49a60632c 100644
--- a/types/three/test/math/test_unit_math.ts
+++ b/types/three/test/math/test_unit_math.ts
@@ -91,57 +91,62 @@ declare function equal<T>(a: T, b: T, desc?: string): void;
 
     test( "center", function() {
         var a = new THREE.Box2( zero2.clone(), zero2.clone() );
+        var center = new THREE.Vector2();
 
-        ok( a.getCenter().equals( zero2 ), "Passed!" );
+        ok( a.getCenter(center).equals( zero2 ), "Passed!" );
 
         a = new THREE.Box2( zero2, one2 );
         var midpoint = one2.clone().multiplyScalar( 0.5 );
-        ok( a.getCenter().equals( midpoint ), "Passed!" );
+        ok( a.getCenter(center).equals( midpoint ), "Passed!" );
     });
 
     test( "size", function() {
         var a = new THREE.Box2( zero2.clone(), zero2.clone() );
+        var size = new THREE.Vector2();
 
-        ok( a.getSize().equals( zero2 ), "Passed!" );
+        ok( a.getSize(size).equals( zero2 ), "Passed!" );
 
         a = new THREE.Box2( zero2.clone(), one2.clone() );
-        ok( a.getSize().equals( one2 ), "Passed!" );
+        ok( a.getSize(size).equals( one2 ), "Passed!" );
     });
 
     test( "expandByPoint", function() {
         var a = new THREE.Box2( zero2.clone(), zero2.clone() );
+        var size = new THREE.Vector2();
 
         a.expandByPoint( zero2 );
-        ok( a.getSize().equals( zero2 ), "Passed!" );
+        ok( a.getSize(size).equals( zero2 ), "Passed!" );
 
         a.expandByPoint( one2 );
-        ok( a.getSize().equals( one2 ), "Passed!" );
+        ok( a.getSize(size).equals( one2 ), "Passed!" );
 
         a.expandByPoint( one2.clone().negate() );
-        ok( a.getSize().equals( one2.clone().multiplyScalar( 2 ) ), "Passed!" );
-        ok( a.getCenter().equals( zero2 ), "Passed!" );
+        ok( a.getSize(size).equals( one2.clone().multiplyScalar( 2 ) ), "Passed!" );
+        ok( a.getCenter(new THREE.Vector2()).equals( zero2 ), "Passed!" );
     });
 
     test( "expandByVector", function() {
         var a = new THREE.Box2( zero2.clone(), zero2.clone() );
+        var size = new THREE.Vector2();
 
         a.expandByVector( zero2 );
-        ok( a.getSize().equals( zero2 ), "Passed!" );
+        ok( a.getSize(size).equals( zero2 ), "Passed!" );
 
         a.expandByVector( one2 );
-        ok( a.getSize().equals( one2.clone().multiplyScalar( 2 ) ), "Passed!" );
-        ok( a.getCenter().equals( zero2 ), "Passed!" );
+        ok( a.getSize(size).equals( one2.clone().multiplyScalar( 2 ) ), "Passed!" );
+        ok( a.getCenter(new THREE.Vector2()).equals( zero2 ), "Passed!" );
     });
 
     test( "expandByScalar", function() {
         var a = new THREE.Box2( zero2.clone(), zero2.clone() );
+        var size = new THREE.Vector2();
 
         a.expandByScalar( 0 );
-        ok( a.getSize().equals( zero2 ), "Passed!" );
+        ok( a.getSize(size).equals( zero2 ), "Passed!" );
 
         a.expandByScalar( 1 );
-        ok( a.getSize().equals( one2.clone().multiplyScalar( 2 ) ), "Passed!" );
-        ok( a.getCenter().equals( zero2 ), "Passed!" );
+        ok( a.getSize(size).equals( one2.clone().multiplyScalar( 2 ) ), "Passed!" );
+        ok( a.getCenter(new THREE.Vector2()).equals( zero2 ), "Passed!" );
     });
 
     test( "containsPoint", function() {
@@ -185,16 +190,17 @@ declare function equal<T>(a: T, b: T, desc?: string): void;
     test( "clampPoint", function() {
         var a = new THREE.Box2( zero2.clone(), zero2.clone() );
         var b = new THREE.Box2( one2.clone().negate(), one2.clone() );
+        var target = new THREE.Vector2();
 
-        ok( a.clampPoint( new THREE.Vector2( 0, 0 ) ).equals( new THREE.Vector2( 0, 0 ) ), "Passed!" );
-        ok( a.clampPoint( new THREE.Vector2( 1, 1 ) ).equals( new THREE.Vector2( 0, 0 ) ), "Passed!" );
-        ok( a.clampPoint( new THREE.Vector2( -1, -1 ) ).equals( new THREE.Vector2( 0, 0 ) ), "Passed!" );
+        ok( a.clampPoint( new THREE.Vector2( 0, 0 ), target ).equals( new THREE.Vector2( 0, 0 ) ), "Passed!" );
+        ok( a.clampPoint( new THREE.Vector2( 1, 1 ), target ).equals( new THREE.Vector2( 0, 0 ) ), "Passed!" );
+        ok( a.clampPoint( new THREE.Vector2( -1, -1 ), target ).equals( new THREE.Vector2( 0, 0 ) ), "Passed!" );
 
-        ok( b.clampPoint( new THREE.Vector2( 2, 2 ) ).equals( new THREE.Vector2( 1, 1 ) ), "Passed!" );
-        ok( b.clampPoint( new THREE.Vector2( 1, 1 ) ).equals( new THREE.Vector2( 1, 1 ) ), "Passed!" );
-        ok( b.clampPoint( new THREE.Vector2( 0, 0 ) ).equals( new THREE.Vector2( 0, 0 ) ), "Passed!" );
-        ok( b.clampPoint( new THREE.Vector2( -1, -1 ) ).equals( new THREE.Vector2( -1, -1 ) ), "Passed!" );
-        ok( b.clampPoint( new THREE.Vector2( -2, -2 ) ).equals( new THREE.Vector2( -1, -1 ) ), "Passed!" );
+        ok( b.clampPoint( new THREE.Vector2( 2, 2 ), target ).equals( new THREE.Vector2( 1, 1 ) ), "Passed!" );
+        ok( b.clampPoint( new THREE.Vector2( 1, 1 ), target ).equals( new THREE.Vector2( 1, 1 ) ), "Passed!" );
+        ok( b.clampPoint( new THREE.Vector2( 0, 0 ), target ).equals( new THREE.Vector2( 0, 0 ) ), "Passed!" );
+        ok( b.clampPoint( new THREE.Vector2( -1, -1 ), target ).equals( new THREE.Vector2( -1, -1 ) ), "Passed!" );
+        ok( b.clampPoint( new THREE.Vector2( -2, -2 ), target ).equals( new THREE.Vector2( -1, -1 ) ), "Passed!" );
     });
 
     test( "distanceToPoint", function() {
@@ -332,57 +338,62 @@ declare function equal<T>(a: T, b: T, desc?: string): void;
 
     test( "center", function() {
         var a = new THREE.Box3( zero3.clone(), zero3.clone() );
+        var center = new THREE.Vector3();
 
-        ok( a.getCenter().equals( zero3 ), "Passed!" );
+        ok( a.getCenter(center).equals( zero3 ), "Passed!" );
 
         a = new THREE.Box3( zero3.clone(), one3.clone() );
         var midpoint = one3.clone().multiplyScalar( 0.5 );
-        ok( a.getCenter().equals( midpoint ), "Passed!" );
+        ok( a.getCenter(center).equals( midpoint ), "Passed!" );
     });
 
     test( "size", function() {
         var a = new THREE.Box3( zero3.clone(), zero3.clone() );
+        var size = new THREE.Vector3();
 
-        ok( a.getSize().equals( zero3 ), "Passed!" );
+        ok( a.getSize(size).equals( zero3 ), "Passed!" );
 
         a = new THREE.Box3( zero3.clone(), one3.clone() );
-        ok( a.getSize().equals( one3 ), "Passed!" );
+        ok( a.getSize(size).equals( one3 ), "Passed!" );
     });
 
     test( "expandByPoint", function() {
         var a = new THREE.Box3( zero3.clone(), zero3.clone() );
+        var size = new THREE.Vector3();
 
         a.expandByPoint( zero3 );
-        ok( a.getSize().equals( zero3 ), "Passed!" );
+        ok( a.getSize(size).equals( zero3 ), "Passed!" );
 
         a.expandByPoint( one3 );
-        ok( a.getSize().equals( one3 ), "Passed!" );
+        ok( a.getSize(size).equals( one3 ), "Passed!" );
 
         a.expandByPoint( one3.clone().negate() );
-        ok( a.getSize().equals( one3.clone().multiplyScalar( 2 ) ), "Passed!" );
-        ok( a.getCenter().equals( zero3 ), "Passed!" );
+        ok( a.getSize(size).equals( one3.clone().multiplyScalar( 2 ) ), "Passed!" );
+        ok( a.getCenter(new THREE.Vector3()).equals( zero3 ), "Passed!" );
     });
 
     test( "expandByVector", function() {
         var a = new THREE.Box3( zero3.clone(), zero3.clone() );
+        var size = new THREE.Vector3();
 
         a.expandByVector( zero3 );
-        ok( a.getSize().equals( zero3 ), "Passed!" );
+        ok( a.getSize(size).equals( zero3 ), "Passed!" );
 
         a.expandByVector( one3 );
-        ok( a.getSize().equals( one3.clone().multiplyScalar( 2 ) ), "Passed!" );
-        ok( a.getCenter().equals( zero3 ), "Passed!" );
+        ok( a.getSize(size).equals( one3.clone().multiplyScalar( 2 ) ), "Passed!" );
+        ok( a.getCenter(new THREE.Vector3()).equals( zero3 ), "Passed!" );
     });
 
     test( "expandByScalar", function() {
         var a = new THREE.Box3( zero3.clone(), zero3.clone() );
+        var size = new THREE.Vector3();
 
         a.expandByScalar( 0 );
-        ok( a.getSize().equals( zero3 ), "Passed!" );
+        ok( a.getSize(size).equals( zero3 ), "Passed!" );
 
         a.expandByScalar( 1 );
-        ok( a.getSize().equals( one3.clone().multiplyScalar( 2 ) ), "Passed!" );
-        ok( a.getCenter().equals( zero3 ), "Passed!" );
+        ok( a.getSize(size).equals( one3.clone().multiplyScalar( 2 ) ), "Passed!" );
+        ok( a.getCenter(new THREE.Vector3()).equals( zero3 ), "Passed!" );
     });
 
     test( "containsPoint", function() {
@@ -426,16 +437,17 @@ declare function equal<T>(a: T, b: T, desc?: string): void;
     test( "clampPoint", function() {
         var a = new THREE.Box3( zero3.clone(), zero3.clone() );
         var b = new THREE.Box3( one3.clone().negate(), one3.clone() );
+        var target = new THREE.Vector3();
 
-        ok( a.clampPoint( new THREE.Vector3( 0, 0, 0 ) ).equals( new THREE.Vector3( 0, 0, 0 ) ), "Passed!" );
-        ok( a.clampPoint( new THREE.Vector3( 1, 1, 1 ) ).equals( new THREE.Vector3( 0, 0, 0 ) ), "Passed!" );
-        ok( a.clampPoint( new THREE.Vector3( -1, -1, -1 ) ).equals( new THREE.Vector3( 0, 0, 0 ) ), "Passed!" );
+        ok( a.clampPoint( new THREE.Vector3( 0, 0, 0 ), target ).equals( new THREE.Vector3( 0, 0, 0 ) ), "Passed!" );
+        ok( a.clampPoint( new THREE.Vector3( 1, 1, 1 ), target ).equals( new THREE.Vector3( 0, 0, 0 ) ), "Passed!" );
+        ok( a.clampPoint( new THREE.Vector3( -1, -1, -1 ), target ).equals( new THREE.Vector3( 0, 0, 0 ) ), "Passed!" );
 
-        ok( b.clampPoint( new THREE.Vector3( 2, 2, 2 ) ).equals( new THREE.Vector3( 1, 1, 1 ) ), "Passed!" );
-        ok( b.clampPoint( new THREE.Vector3( 1, 1, 1 ) ).equals( new THREE.Vector3( 1, 1, 1 ) ), "Passed!" );
-        ok( b.clampPoint( new THREE.Vector3( 0, 0, 0 ) ).equals( new THREE.Vector3( 0, 0, 0 ) ), "Passed!" );
-        ok( b.clampPoint( new THREE.Vector3( -1, -1, -1 ) ).equals( new THREE.Vector3( -1, -1, -1 ) ), "Passed!" );
-        ok( b.clampPoint( new THREE.Vector3( -2, -2, -2 ) ).equals( new THREE.Vector3( -1, -1, -1 ) ), "Passed!" );
+        ok( b.clampPoint( new THREE.Vector3( 2, 2, 2 ), target ).equals( new THREE.Vector3( 1, 1, 1 ) ), "Passed!" );
+        ok( b.clampPoint( new THREE.Vector3( 1, 1, 1 ), target ).equals( new THREE.Vector3( 1, 1, 1 ) ), "Passed!" );
+        ok( b.clampPoint( new THREE.Vector3( 0, 0, 0 ), target ).equals( new THREE.Vector3( 0, 0, 0 ) ), "Passed!" );
+        ok( b.clampPoint( new THREE.Vector3( -1, -1, -1 ), target ).equals( new THREE.Vector3( -1, -1, -1 ) ), "Passed!" );
+        ok( b.clampPoint( new THREE.Vector3( -2, -2, -2 ), target ).equals( new THREE.Vector3( -1, -1, -1 ) ), "Passed!" );
     });
 
     test( "distanceToPoint", function() {
@@ -491,10 +503,11 @@ declare function equal<T>(a: T, b: T, desc?: string): void;
         var a = new THREE.Box3( zero3.clone(), zero3.clone() );
         var b = new THREE.Box3( zero3.clone(), one3.clone() );
         var c = new THREE.Box3( one3.clone().negate(), one3.clone() );
+        var target = new THREE.Sphere();
 
-        ok( a.getBoundingSphere().equals( new THREE.Sphere( zero3, 0 ) ), "Passed!" );
-        ok( b.getBoundingSphere().equals( new THREE.Sphere( one3.clone().multiplyScalar( 0.5 ), Math.sqrt( 3 ) * 0.5 ) ), "Passed!" );
-        ok( c.getBoundingSphere().equals( new THREE.Sphere( zero3, Math.sqrt( 12 ) * 0.5 ) ), "Passed!" );
+        ok( a.getBoundingSphere( target ).equals( new THREE.Sphere( zero3, 0 ) ), "Passed!" );
+        ok( b.getBoundingSphere( target ).equals( new THREE.Sphere( one3.clone().multiplyScalar( 0.5 ), Math.sqrt( 3 ) * 0.5 ) ), "Passed!" );
+        ok( c.getBoundingSphere( target ).equals( new THREE.Sphere( zero3, Math.sqrt( 12 ) * 0.5 ) ), "Passed!" );
     });
 
     test( "intersect", function() {
@@ -1080,34 +1093,36 @@ declare function equal<T>(a: T, b: T, desc?: string): void;
 
     test( "at", function() {
         var a = new THREE.Line3( one3.clone(), new THREE.Vector3( 1, 1, 2 ) );
+        var target = new THREE.Vector3();
 
-        ok( a.at( -1 ).distanceTo( new THREE.Vector3( 1, 1, 0 ) ) < 0.0001, "Passed!" );
-        ok( a.at( 0 ).distanceTo( one3.clone() ) < 0.0001, "Passed!" );
-        ok( a.at( 1 ).distanceTo( new THREE.Vector3( 1, 1, 2 ) ) < 0.0001, "Passed!" );
-        ok( a.at( 2 ).distanceTo( new THREE.Vector3( 1, 1, 3 ) ) < 0.0001, "Passed!" );
+        ok( a.at( -1, target ).distanceTo( new THREE.Vector3( 1, 1, 0 ) ) < 0.0001, "Passed!" );
+        ok( a.at( 0, target ).distanceTo( one3.clone() ) < 0.0001, "Passed!" );
+        ok( a.at( 1, target ).distanceTo( new THREE.Vector3( 1, 1, 2 ) ) < 0.0001, "Passed!" );
+        ok( a.at( 2, target ).distanceTo( new THREE.Vector3( 1, 1, 3 ) ) < 0.0001, "Passed!" );
     });
 
     test( "closestPointToPoint/closestPointToPointParameter", function() {
         var a = new THREE.Line3( one3.clone(), new THREE.Vector3( 1, 1, 2 ) );
+        var target = new THREE.Vector3();
 
         // nearby the ray
         ok( a.closestPointToPointParameter( zero3.clone(), true ) == 0, "Passed!" );
-        var b1 = a.closestPointToPoint( zero3.clone(), true );
+        var b1 = a.closestPointToPoint( zero3.clone(), true, target );
         ok( b1.distanceTo( new THREE.Vector3( 1, 1, 1 ) ) < 0.0001, "Passed!" );
 
         // nearby the ray
         ok( a.closestPointToPointParameter( zero3.clone(), false ) == -1, "Passed!" );
-        var b2 = a.closestPointToPoint( zero3.clone(), false );
+        var b2 = a.closestPointToPoint( zero3.clone(), false, target );
         ok( b2.distanceTo( new THREE.Vector3( 1, 1, 0 ) ) < 0.0001, "Passed!" );
 
         // nearby the ray
         ok( a.closestPointToPointParameter( new THREE.Vector3( 1, 1, 5 ), true ) == 1, "Passed!" );
-        var b = a.closestPointToPoint( new THREE.Vector3( 1, 1, 5 ), true );
+        var b = a.closestPointToPoint( new THREE.Vector3( 1, 1, 5 ), true, target );
         ok( b.distanceTo( new THREE.Vector3( 1, 1, 2 ) ) < 0.0001, "Passed!" );
 
         // exactly on the ray
         ok( a.closestPointToPointParameter( one3.clone(), true ) == 0, "Passed!" );
-        var c = a.closestPointToPoint( one3.clone(), true );
+        var c = a.closestPointToPoint( one3.clone(), true, target );
         ok( c.distanceTo( one3.clone() ) < 0.0001, "Passed!" );
     });
 
@@ -1752,7 +1767,7 @@ declare function equal<T>(a: T, b: T, desc?: string): void;
         var a = new THREE.Plane( new THREE.Vector3( 2, 0, 0 ), -2 );
 
         a.normalize();
-        ok( a.distanceToPoint( a.projectPoint( zero3.clone() ) ) === 0, "Passed!" );
+        ok( a.distanceToPoint( a.projectPoint( zero3.clone(), new THREE.Vector3() ) ) === 0, "Passed!" );
         ok( a.distanceToPoint( new THREE.Vector3( 4, 0, 0 ) ) === 3, "Passed!" );
     });
 
@@ -1771,54 +1786,57 @@ declare function equal<T>(a: T, b: T, desc?: string): void;
 
     test( "isInterestionLine/intersectLine", function() {
         var a = new THREE.Plane( new THREE.Vector3( 1, 0, 0 ), 0 );
+        var target = new THREE.Vector3();
 
         var l1 = new THREE.Line3( new THREE.Vector3( -10, 0, 0 ), new THREE.Vector3( 10, 0, 0 ) );
         ok( a.intersectsLine( l1 ), "Passed!" );
-        ok( a.intersectLine( l1 ).equals( new THREE.Vector3( 0, 0, 0 ) ), "Passed!" );
+        ok( a.intersectLine( l1, target ).equals( new THREE.Vector3( 0, 0, 0 ) ), "Passed!" );
 
         a = new THREE.Plane( new THREE.Vector3( 1, 0, 0 ), -3 );
 
         ok( a.intersectsLine( l1 ), "Passed!" );
-        ok( a.intersectLine( l1 ).equals( new THREE.Vector3( 3, 0, 0 ) ), "Passed!" );
+        ok( a.intersectLine( l1, target ).equals( new THREE.Vector3( 3, 0, 0 ) ), "Passed!" );
 
 
         a = new THREE.Plane( new THREE.Vector3( 1, 0, 0 ), -11 );
 
         ok( ! a.intersectsLine( l1 ), "Passed!" );
-        ok( a.intersectLine( l1 ) === undefined, "Passed!" );
+        ok( a.intersectLine( l1, target ) === undefined, "Passed!" );
 
         a = new THREE.Plane( new THREE.Vector3( 1, 0, 0 ), 11 );
 
         ok( ! a.intersectsLine( l1 ), "Passed!" );
-        ok( a.intersectLine( l1 ) === undefined, "Passed!" );
+        ok( a.intersectLine( l1, target ) === undefined, "Passed!" );
 
     });
 
     test( "projectPoint", function() {
         var a = new THREE.Plane( new THREE.Vector3( 1, 0, 0 ), 0 );
+        var target = new THREE.Vector3();
 
-        ok( a.projectPoint( new THREE.Vector3( 10, 0, 0 ) ).equals( zero3 ), "Passed!" );
-        ok( a.projectPoint( new THREE.Vector3( -10, 0, 0 ) ).equals( zero3 ), "Passed!" );
+        ok( a.projectPoint( new THREE.Vector3( 10, 0, 0 ), target ).equals( zero3 ), "Passed!" );
+        ok( a.projectPoint( new THREE.Vector3( -10, 0, 0 ), target ).equals( zero3 ), "Passed!" );
 
         a = new THREE.Plane( new THREE.Vector3( 0, 1, 0 ), -1 );
-        ok( a.projectPoint( new THREE.Vector3( 0, 0, 0 ) ).equals( new THREE.Vector3( 0, 1, 0 ) ), "Passed!" );
-        ok( a.projectPoint( new THREE.Vector3( 0, 1, 0 ) ).equals( new THREE.Vector3( 0, 1, 0 ) ), "Passed!" );
+        ok( a.projectPoint( new THREE.Vector3( 0, 0, 0 ), target ).equals( new THREE.Vector3( 0, 1, 0 ) ), "Passed!" );
+        ok( a.projectPoint( new THREE.Vector3( 0, 1, 0 ), target ).equals( new THREE.Vector3( 0, 1, 0 ) ), "Passed!" );
 
     });
 
     test( "orthoPoint", function() {
         var a = new THREE.Plane( new THREE.Vector3( 1, 0, 0 ), 0 );
+        var target = new THREE.Vector3();
 
-        ok( a.orthoPoint( new THREE.Vector3( 10, 0, 0 ) ).equals( new THREE.Vector3( 10, 0, 0 ) ), "Passed!" );
-        ok( a.orthoPoint( new THREE.Vector3( -10, 0, 0 ) ).equals( new THREE.Vector3( -10, 0, 0 ) ), "Passed!" );
+        ok( a.orthoPoint( new THREE.Vector3( 10, 0, 0 ), target ).equals( new THREE.Vector3( 10, 0, 0 ) ), "Passed!" );
+        ok( a.orthoPoint( new THREE.Vector3( -10, 0, 0 ), target ).equals( new THREE.Vector3( -10, 0, 0 ) ), "Passed!" );
     });
 
     test( "coplanarPoint", function() {
         var a = new THREE.Plane( new THREE.Vector3( 1, 0, 0 ), 0 );
-        ok( a.distanceToPoint( a.coplanarPoint() ) === 0, "Passed!" );
+        ok( a.distanceToPoint( a.coplanarPoint( new THREE.Vector3() ) ) === 0, "Passed!" );
 
         a = new THREE.Plane( new THREE.Vector3( 0, 1, 0 ), -1 );
-        ok( a.distanceToPoint( a.coplanarPoint() ) === 0, "Passed!" );
+        ok( a.distanceToPoint( a.coplanarPoint( new THREE.Vector3() ) ) === 0, "Passed!" );
     });
 
     test( "applyMatrix4/translate", function() {
@@ -2080,10 +2098,11 @@ declare function equal<T>(a: T, b: T, desc?: string): void;
 
     test( "at", function() {
         var a = new THREE.Ray( one3.clone(), new THREE.Vector3( 0, 0, 1 ) );
+        var target = new THREE.Vector3();
 
-        ok( a.at( 0 ).equals( one3 ), "Passed!" );
-        ok( a.at( -1 ).equals( new THREE.Vector3( 1, 1, 0 ) ), "Passed!" );
-        ok( a.at( 1 ).equals( new THREE.Vector3( 1, 1, 2 ) ), "Passed!" );
+        ok( a.at( 0, target ).equals( one3 ), "Passed!" );
+        ok( a.at( -1, target ).equals( new THREE.Vector3( 1, 1, 0 ) ), "Passed!" );
+        ok( a.at( 1, target ).equals( new THREE.Vector3( 1, 1, 2 ) ), "Passed!" );
     });
 
     test( "recast/clone", function() {
@@ -2106,17 +2125,18 @@ declare function equal<T>(a: T, b: T, desc?: string): void;
 
     test( "closestPointToPoint", function() {
         var a = new THREE.Ray( one3.clone(), new THREE.Vector3( 0, 0, 1 ) );
+        var target = new THREE.Vector3();
 
         // behind the ray
-        var b = a.closestPointToPoint( zero3 );
+        var b = a.closestPointToPoint( zero3, target );
         ok( b.equals( one3 ), "Passed!" );
 
         // front of the ray
-        var c = a.closestPointToPoint( new THREE.Vector3( 0, 0, 50 ) );
+        var c = a.closestPointToPoint( new THREE.Vector3( 0, 0, 50 ), target );
         ok( c.equals( new THREE.Vector3( 1, 1, 50 ) ), "Passed!" );
 
         // exactly on the ray
-        var d = a.closestPointToPoint( one3 );
+        var d = a.closestPointToPoint( one3, target );
         ok( d.equals( one3 ), "Passed!" );
     });
 
@@ -2159,34 +2179,35 @@ declare function equal<T>(a: T, b: T, desc?: string): void;
         var a0 = new THREE.Ray( zero3.clone(), new THREE.Vector3( 0, 0, -1 ) );
         // ray a1 origin located at ( 1, 1, 1 ) and points left in negative-x direction
         var a1 = new THREE.Ray( one3.clone(), new THREE.Vector3( -1, 0, 0 ) );
+        var target = new THREE.Vector3();
 
         // sphere (radius of 2) located behind ray a0, should result in null
         var b = new THREE.Sphere( new THREE.Vector3( 0, 0, 3 ), 2 );
-        ok( a0.intersectSphere( b ) === null, "Passed!" );
+        ok( a0.intersectSphere( b, target ) === null, "Passed!" );
 
         // sphere (radius of 2) located in front of, but too far right of ray a0, should result in null
         var b = new THREE.Sphere( new THREE.Vector3( 3, 0, -1 ), 2 );
-        ok( a0.intersectSphere( b ) === null, "Passed!" );
+        ok( a0.intersectSphere( b, target ) === null, "Passed!" );
 
         // sphere (radius of 2) located below ray a1, should result in null
         var b = new THREE.Sphere( new THREE.Vector3( 1, -2, 1 ), 2 );
-        ok( a1.intersectSphere( b ) === null, "Passed!" );
+        ok( a1.intersectSphere( b, target ) === null, "Passed!" );
 
         // sphere (radius of 1) located to the left of ray a1, should result in intersection at 0, 1, 1
         var b = new THREE.Sphere( new THREE.Vector3( -1, 1, 1 ), 1 );
-        ok( a1.intersectSphere( b ).distanceTo( new THREE.Vector3( 0, 1, 1 ) ) < TOL, "Passed!" );
+        ok( a1.intersectSphere( b, target ).distanceTo( new THREE.Vector3( 0, 1, 1 ) ) < TOL, "Passed!" );
 
         // sphere (radius of 1) located in front of ray a0, should result in intersection at 0, 0, -1
         var b = new THREE.Sphere( new THREE.Vector3( 0, 0, -2 ), 1 );
-        ok( a0.intersectSphere( b ).distanceTo( new THREE.Vector3( 0, 0, -1 ) ) < TOL, "Passed!" );
+        ok( a0.intersectSphere( b, target ).distanceTo( new THREE.Vector3( 0, 0, -1 ) ) < TOL, "Passed!" );
 
         // sphere (radius of 2) located in front & right of ray a0, should result in intersection at 0, 0, -1, or left-most edge of sphere
         var b = new THREE.Sphere( new THREE.Vector3( 2, 0, -1 ), 2 );
-        ok( a0.intersectSphere( b ).distanceTo( new THREE.Vector3( 0, 0, -1 ) ) < TOL, "Passed!" );
+        ok( a0.intersectSphere( b, target ).distanceTo( new THREE.Vector3( 0, 0, -1 ) ) < TOL, "Passed!" );
 
         // same situation as above, but move the sphere a fraction more to the right, and ray a0 should now just miss
         var b = new THREE.Sphere( new THREE.Vector3( 2.01, 0, -1 ), 2 );
-        ok( a0.intersectSphere( b ) === null, "Passed!" );
+        ok( a0.intersectSphere( b, target ) === null, "Passed!" );
 
         // following tests are for situations where the ray origin is inside the sphere
 
@@ -2194,19 +2215,19 @@ declare function equal<T>(a: T, b: T, desc?: string): void;
         // is behind ray a0.  Therefore, second exit point on back of sphere will be returned: 0, 0, -1
         // thus keeping the intersection point always in front of the ray.
         var b = new THREE.Sphere( zero3.clone(), 1 );
-        ok( a0.intersectSphere( b ).distanceTo( new THREE.Vector3( 0, 0, -1 ) ) < TOL, "Passed!" );
+        ok( a0.intersectSphere( b, target ).distanceTo( new THREE.Vector3( 0, 0, -1 ) ) < TOL, "Passed!" );
 
         // sphere (radius of 4) center located behind ray a0 origin / sphere surrounds the ray origin, so the first intersect point 0, 0, 5,
         // is behind ray a0.  Therefore, second exit point on back of sphere will be returned: 0, 0, -3
         // thus keeping the intersection point always in front of the ray.
         var b = new THREE.Sphere( new THREE.Vector3( 0, 0, 1 ), 4 );
-        ok( a0.intersectSphere( b ).distanceTo( new THREE.Vector3( 0, 0, -3 ) ) < TOL, "Passed!" );
+        ok( a0.intersectSphere( b, target ).distanceTo( new THREE.Vector3( 0, 0, -3 ) ) < TOL, "Passed!" );
 
         // sphere (radius of 4) center located in front of ray a0 origin / sphere surrounds the ray origin, so the first intersect point 0, 0, 3,
         // is behind ray a0.  Therefore, second exit point on back of sphere will be returned: 0, 0, -5
         // thus keeping the intersection point always in front of the ray.
         var b = new THREE.Sphere( new THREE.Vector3( 0, 0, -1 ), 4 );
-        ok( a0.intersectSphere( b ).distanceTo( new THREE.Vector3( 0, 0, -5 ) ) < TOL, "Passed!" );
+        ok( a0.intersectSphere( b, target ).distanceTo( new THREE.Vector3( 0, 0, -5 ) ) < TOL, "Passed!" );
 
     });
 
@@ -2236,26 +2257,27 @@ declare function equal<T>(a: T, b: T, desc?: string): void;
 
     test( "intersectPlane", function() {
         var a = new THREE.Ray( one3.clone(), new THREE.Vector3( 0, 0, 1 ) );
+        var target = new THREE.Vector3();
 
         // parallel plane behind
         var b = new THREE.Plane().setFromNormalAndCoplanarPoint( new THREE.Vector3( 0, 0, 1 ), new THREE.Vector3( 1, 1, -1 ) );
-        ok( a.intersectPlane( b ) === null, "Passed!" );
+        ok( a.intersectPlane( b, target ) === null, "Passed!" );
 
         // parallel plane coincident with origin
         var c = new THREE.Plane().setFromNormalAndCoplanarPoint( new THREE.Vector3( 0, 0, 1 ), new THREE.Vector3( 1, 1, 0 ) );
-        ok( a.intersectPlane( c ) === null, "Passed!" );
+        ok( a.intersectPlane( c, target ) === null, "Passed!" );
 
         // parallel plane infront
         var d = new THREE.Plane().setFromNormalAndCoplanarPoint( new THREE.Vector3( 0, 0, 1 ), new THREE.Vector3( 1, 1, 1 ) );
-        ok( a.intersectPlane( d ).equals( a.origin ), "Passed!" );
+        ok( a.intersectPlane( d, target ).equals( a.origin ), "Passed!" );
 
         // perpendical ray that overlaps exactly
         var e = new THREE.Plane().setFromNormalAndCoplanarPoint( new THREE.Vector3( 1, 0, 0 ), one3 );
-        ok( a.intersectPlane( e ).equals( a.origin ), "Passed!" );
+        ok( a.intersectPlane( e, target ).equals( a.origin ), "Passed!" );
 
         // perpendical ray that doesn't overlap
         var f = new THREE.Plane().setFromNormalAndCoplanarPoint( new THREE.Vector3( 1, 0, 0 ), zero3 );
-        ok( a.intersectPlane( f ) === null, "Passed!" );
+        ok( a.intersectPlane( f, target ) === null, "Passed!" );
     });
 
 
@@ -2324,36 +2346,37 @@ declare function equal<T>(a: T, b: T, desc?: string): void;
         var TOL = 0.0001;
 
         var box = new THREE.Box3( new THREE.Vector3(  -1, -1, -1 ), new THREE.Vector3( 1, 1, 1 ) );
+        var target = new THREE.Vector3();
 
         var a = new THREE.Ray( new THREE.Vector3( -2, 0, 0 ), new THREE.Vector3( 1, 0, 0) );
         //ray should intersect box at -1,0,0
         ok( a.intersectsBox(box) === true, "Passed!" );
-        ok( a.intersectBox(box).distanceTo( new THREE.Vector3( -1, 0, 0 ) ) < TOL, "Passed!" );
+        ok( a.intersectBox(box, target).distanceTo( new THREE.Vector3( -1, 0, 0 ) ) < TOL, "Passed!" );
 
         var b = new THREE.Ray( new THREE.Vector3( -2, 0, 0 ), new THREE.Vector3( -1, 0, 0) );
         //ray is point away from box, it should not intersect
         ok( b.intersectsBox(box) === false, "Passed!" );
-        ok( b.intersectBox(box) === null, "Passed!" );
+        ok( b.intersectBox(box, target) === null, "Passed!" );
 
         var c = new THREE.Ray( new THREE.Vector3( 0, 0, 0 ), new THREE.Vector3( 1, 0, 0) );
         // ray is inside box, should return exit point
         ok( c.intersectsBox(box) === true, "Passed!" );
-        ok( c.intersectBox(box).distanceTo( new THREE.Vector3( 1, 0, 0 ) ) < TOL, "Passed!" );
+        ok( c.intersectBox(box, target).distanceTo( new THREE.Vector3( 1, 0, 0 ) ) < TOL, "Passed!" );
 
         var d = new THREE.Ray( new THREE.Vector3( 0, 2, 1 ), new THREE.Vector3( 0, -1, -1).normalize() );
         //tilted ray should intersect box at 0,1,0
         ok( d.intersectsBox(box) === true, "Passed!" );
-        ok( d.intersectBox(box).distanceTo( new THREE.Vector3( 0, 1, 0 ) ) < TOL, "Passed!" );
+        ok( d.intersectBox(box, target).distanceTo( new THREE.Vector3( 0, 1, 0 ) ) < TOL, "Passed!" );
 
         var e = new THREE.Ray( new THREE.Vector3( 1, -2, 1 ), new THREE.Vector3( 0, 1, 0).normalize() );
         //handle case where ray is coplanar with one of the boxes side - box in front of ray
         ok( e.intersectsBox(box) === true, "Passed!" );
-        ok( e.intersectBox(box).distanceTo( new THREE.Vector3( 1, -1, 1 ) ) < TOL, "Passed!" );
+        ok( e.intersectBox(box, target).distanceTo( new THREE.Vector3( 1, -1, 1 ) ) < TOL, "Passed!" );
 
         var f = new THREE.Ray( new THREE.Vector3( 1, -2, 0 ), new THREE.Vector3( 0, -1, 0).normalize() );
         //handle case where ray is coplanar with one of the boxes side - box behind ray
         ok( f.intersectsBox(box) === false, "Passed!" );
-        ok( f.intersectBox(box) == null, "Passed!" );
+        ok( f.intersectBox(box, target) == null, "Passed!" );
 
     });
 
@@ -2425,18 +2448,20 @@ declare function equal<T>(a: T, b: T, desc?: string): void;
 
     test( "clampPoint", function() {
         var a = new THREE.Sphere( one3.clone(), 1 );
+        var target = new THREE.Vector3();
 
-        ok( a.clampPoint( new THREE.Vector3( 1, 1, 3 ) ).equals( new THREE.Vector3( 1, 1, 2 ) ), "Passed!" );
-        ok( a.clampPoint( new THREE.Vector3( 1, 1, -3 ) ).equals( new THREE.Vector3( 1, 1, 0 ) ), "Passed!" );
+        ok( a.clampPoint( new THREE.Vector3( 1, 1, 3 ), target ).equals( new THREE.Vector3( 1, 1, 2 ) ), "Passed!" );
+        ok( a.clampPoint( new THREE.Vector3( 1, 1, -3 ), target ).equals( new THREE.Vector3( 1, 1, 0 ) ), "Passed!" );
     });
 
     test( "getBoundingBox", function() {
         var a = new THREE.Sphere( one3.clone(), 1 );
+        var target = new THREE.Box3();
 
-        ok( a.getBoundingBox().equals( new THREE.Box3( zero3, two3 ) ), "Passed!" );
+        ok( a.getBoundingBox( target ).equals( new THREE.Box3( zero3, two3 ) ), "Passed!" );
 
         a.set( zero3, 0 )
-        ok( a.getBoundingBox().equals( new THREE.Box3( zero3, zero3 ) ), "Passed!" );
+        ok( a.getBoundingBox( target ).equals( new THREE.Box3( zero3, zero3 ) ), "Passed!" );
     });
 
     test( "applyMatrix4", function() {
@@ -2444,7 +2469,7 @@ declare function equal<T>(a: T, b: T, desc?: string): void;
 
         var m = new THREE.Matrix4().makeTranslation( 1, -2, 1 );
 
-        ok( a.clone().applyMatrix4( m ).getBoundingBox().equals( a.getBoundingBox().applyMatrix4( m ) ), "Passed!" );
+        ok( a.clone().applyMatrix4( m ).getBoundingBox( new THREE.Box3() ).equals( a.getBoundingBox( new THREE.Box3() ).applyMatrix4( m ) ), "Passed!" );
     });
 
     test( "translate", function() {
@@ -2505,88 +2530,92 @@ declare function equal<T>(a: T, b: T, desc?: string): void;
 
     });
 
-    test( "area", function() {
+    test( "getArea", function() {
         var a = new THREE.Triangle();
 
-        ok( a.area() == 0, "Passed!" );
+        ok( a.getArea() == 0, "Passed!" );
 
         a = new THREE.Triangle( new THREE.Vector3( 0, 0, 0 ), new THREE.Vector3( 1, 0, 0 ), new THREE.Vector3( 0, 1, 0 ) );
-        ok( a.area() == 0.5, "Passed!" );
+        ok( a.getArea() == 0.5, "Passed!" );
 
         a = new THREE.Triangle( new THREE.Vector3( 2, 0, 0 ), new THREE.Vector3( 0, 0, 0 ), new THREE.Vector3( 0, 0, 2 ) );
-        ok( a.area() == 2, "Passed!" );
+        ok( a.getArea() == 2, "Passed!" );
 
         // colinear triangle.
         a = new THREE.Triangle( new THREE.Vector3( 2, 0, 0 ), new THREE.Vector3( 0, 0, 0 ), new THREE.Vector3( 3, 0, 0 ) );
-        ok( a.area() == 0, "Passed!" );
+        ok( a.getArea() == 0, "Passed!" );
     });
 
-    test( "midpoint", function() {
+    test( "getMidpoint", function() {
         var a = new THREE.Triangle();
+        var target = new THREE.Vector3();
 
-        ok( a.midpoint().equals( new THREE.Vector3( 0, 0, 0 ) ), "Passed!" );
+        ok( a.getMidpoint( target ).equals( new THREE.Vector3( 0, 0, 0 ) ), "Passed!" );
 
         a = new THREE.Triangle( new THREE.Vector3( 0, 0, 0 ), new THREE.Vector3( 1, 0, 0 ), new THREE.Vector3( 0, 1, 0 ) );
-        ok( a.midpoint().equals( new THREE.Vector3( 1/3, 1/3, 0 ) ), "Passed!" );
+        ok( a.getMidpoint( target ).equals( new THREE.Vector3( 1/3, 1/3, 0 ) ), "Passed!" );
 
         a = new THREE.Triangle( new THREE.Vector3( 2, 0, 0 ), new THREE.Vector3( 0, 0, 0 ), new THREE.Vector3( 0, 0, 2 ) );
-        ok( a.midpoint().equals( new THREE.Vector3( 2/3, 0, 2/3 ) ), "Passed!" );
+        ok( a.getMidpoint( target ).equals( new THREE.Vector3( 2/3, 0, 2/3 ) ), "Passed!" );
     });
 
-    test( "normal", function() {
+    test( "getNormal", function() {
         var a = new THREE.Triangle();
+        var target = new THREE.Vector3();
 
-        ok( a.normal().equals( new THREE.Vector3( 0, 0, 0 ) ), "Passed!" );
+        ok( a.getNormal( target ).equals( new THREE.Vector3( 0, 0, 0 ) ), "Passed!" );
 
         a = new THREE.Triangle( new THREE.Vector3( 0, 0, 0 ), new THREE.Vector3( 1, 0, 0 ), new THREE.Vector3( 0, 1, 0 ) );
-        ok( a.normal().equals( new THREE.Vector3( 0, 0, 1 ) ), "Passed!" );
+        ok( a.getNormal( target ).equals( new THREE.Vector3( 0, 0, 1 ) ), "Passed!" );
 
         a = new THREE.Triangle( new THREE.Vector3( 2, 0, 0 ), new THREE.Vector3( 0, 0, 0 ), new THREE.Vector3( 0, 0, 2 ) );
-        ok( a.normal().equals( new THREE.Vector3( 0, 1, 0 ) ), "Passed!" );
+        ok( a.getNormal( target ).equals( new THREE.Vector3( 0, 1, 0 ) ), "Passed!" );
     });
 
-    test( "plane", function() {
+    test( "getPlane", function() {
         var a = new THREE.Triangle();
+        var target = new THREE.Vector3();
 
         // artificial normal is created in this case.
-        ok( a.plane().distanceToPoint( a.a ) == 0, "Passed!" );
-        ok( a.plane().distanceToPoint( a.b ) == 0, "Passed!" );
-        ok( a.plane().distanceToPoint( a.c ) == 0, "Passed!" );
-        ok( a.plane().normal.equals( a.normal() ), "Passed!" );
+        ok( a.getPlane( target ).distanceToPoint( a.a ) == 0, "Passed!" );
+        ok( a.getPlane( target ).distanceToPoint( a.b ) == 0, "Passed!" );
+        ok( a.getPlane( target ).distanceToPoint( a.c ) == 0, "Passed!" );
+        ok( a.getPlane( target ).normal.equals( a.getNormal( new THREE.Vector3() ) ), "Passed!" );
 
         a = new THREE.Triangle( new THREE.Vector3( 0, 0, 0 ), new THREE.Vector3( 1, 0, 0 ), new THREE.Vector3( 0, 1, 0 ) );
-        ok( a.plane().distanceToPoint( a.a ) == 0, "Passed!" );
-        ok( a.plane().distanceToPoint( a.b ) == 0, "Passed!" );
-        ok( a.plane().distanceToPoint( a.c ) == 0, "Passed!" );
-        ok( a.plane().normal.equals( a.normal() ), "Passed!" );
+        ok( a.getPlane( target ).distanceToPoint( a.a ) == 0, "Passed!" );
+        ok( a.getPlane( target ).distanceToPoint( a.b ) == 0, "Passed!" );
+        ok( a.getPlane( target ).distanceToPoint( a.c ) == 0, "Passed!" );
+        ok( a.getPlane( target ).normal.equals( a.getNormal( new THREE.Vector3() ) ), "Passed!" );
 
         a = new THREE.Triangle( new THREE.Vector3( 2, 0, 0 ), new THREE.Vector3( 0, 0, 0 ), new THREE.Vector3( 0, 0, 2 ) );
-        ok( a.plane().distanceToPoint( a.a ) == 0, "Passed!" );
-        ok( a.plane().distanceToPoint( a.b ) == 0, "Passed!" );
-        ok( a.plane().distanceToPoint( a.c ) == 0, "Passed!" );
-        ok( a.plane().normal.clone().normalize().equals( a.normal() ), "Passed!" );
+        ok( a.getPlane( target ).distanceToPoint( a.a ) == 0, "Passed!" );
+        ok( a.getPlane( target ).distanceToPoint( a.b ) == 0, "Passed!" );
+        ok( a.getPlane( target ).distanceToPoint( a.c ) == 0, "Passed!" );
+        ok( a.getPlane( target ).normal.clone().normalize().equals( a.getNormal( new THREE.Vector3() ) ), "Passed!" );
     });
 
-    test( "barycoordFromPoint", function() {
+    test( "getBarycoord", function() {
         var a = new THREE.Triangle();
+        var target = new THREE.Vector3();
 
         var bad = new THREE.Vector3( -2, -1, -1 );
 
-        ok( a.barycoordFromPoint( a.a ).equals( bad ), "Passed!" );
-        ok( a.barycoordFromPoint( a.b ).equals( bad ), "Passed!" );
-        ok( a.barycoordFromPoint( a.c ).equals( bad ), "Passed!" );
+        ok( a.getBarycoord( a.a, target ).equals( bad ), "Passed!" );
+        ok( a.getBarycoord( a.b, target ).equals( bad ), "Passed!" );
+        ok( a.getBarycoord( a.c, target ).equals( bad ), "Passed!" );
 
         a = new THREE.Triangle( new THREE.Vector3( 0, 0, 0 ), new THREE.Vector3( 1, 0, 0 ), new THREE.Vector3( 0, 1, 0 ) );
-        ok( a.barycoordFromPoint( a.a ).equals( new THREE.Vector3( 1, 0, 0 ) ), "Passed!" );
-        ok( a.barycoordFromPoint( a.b ).equals( new THREE.Vector3( 0, 1, 0 ) ), "Passed!" );
-        ok( a.barycoordFromPoint( a.c ).equals( new THREE.Vector3( 0, 0, 1 ) ), "Passed!" );
-        ok( a.barycoordFromPoint( a.midpoint() ).distanceTo( new THREE.Vector3( 1/3, 1/3, 1/3 ) ) < 0.0001, "Passed!" );
+        ok( a.getBarycoord( a.a, target ).equals( new THREE.Vector3( 1, 0, 0 ) ), "Passed!" );
+        ok( a.getBarycoord( a.b, target ).equals( new THREE.Vector3( 0, 1, 0 ) ), "Passed!" );
+        ok( a.getBarycoord( a.c, target ).equals( new THREE.Vector3( 0, 0, 1 ) ), "Passed!" );
+        ok( a.getBarycoord( a.getMidpoint( new THREE.Vector3() ), target ).distanceTo( new THREE.Vector3( 1/3, 1/3, 1/3 ) ) < 0.0001, "Passed!" );
 
         a = new THREE.Triangle( new THREE.Vector3( 2, 0, 0 ), new THREE.Vector3( 0, 0, 0 ), new THREE.Vector3( 0, 0, 2 ) );
-        ok( a.barycoordFromPoint( a.a ).equals( new THREE.Vector3( 1, 0, 0 ) ), "Passed!" );
-        ok( a.barycoordFromPoint( a.b ).equals( new THREE.Vector3( 0, 1, 0 ) ), "Passed!" );
-        ok( a.barycoordFromPoint( a.c ).equals( new THREE.Vector3( 0, 0, 1 ) ), "Passed!" );
-        ok( a.barycoordFromPoint( a.midpoint() ).distanceTo( new THREE.Vector3( 1/3, 1/3, 1/3 ) ) < 0.0001, "Passed!" );
+        ok( a.getBarycoord( a.a, target ).equals( new THREE.Vector3( 1, 0, 0 ) ), "Passed!" );
+        ok( a.getBarycoord( a.b, target ).equals( new THREE.Vector3( 0, 1, 0 ) ), "Passed!" );
+        ok( a.getBarycoord( a.c, target ).equals( new THREE.Vector3( 0, 0, 1 ) ), "Passed!" );
+        ok( a.getBarycoord( a.getMidpoint( new THREE.Vector3() ), target ).distanceTo( new THREE.Vector3( 1/3, 1/3, 1/3 ) ) < 0.0001, "Passed!" );
     });
 
     test( "containsPoint", function() {
@@ -2600,14 +2629,14 @@ declare function equal<T>(a: T, b: T, desc?: string): void;
         ok( a.containsPoint( a.a ), "Passed!" );
         ok( a.containsPoint( a.b ), "Passed!" );
         ok( a.containsPoint( a.c ), "Passed!" );
-        ok( a.containsPoint( a.midpoint() ), "Passed!" );
+        ok( a.containsPoint( a.getMidpoint( new THREE.Vector3() ) ), "Passed!" );
         ok( ! a.containsPoint( new THREE.Vector3( -1, -1, -1 ) ), "Passed!" );
 
         a = new THREE.Triangle( new THREE.Vector3( 2, 0, 0 ), new THREE.Vector3( 0, 0, 0 ), new THREE.Vector3( 0, 0, 2 ) );
         ok( a.containsPoint( a.a ), "Passed!" );
         ok( a.containsPoint( a.b ), "Passed!" );
         ok( a.containsPoint( a.c ), "Passed!" );
-        ok( a.containsPoint( a.midpoint() ), "Passed!" );
+        ok( a.containsPoint( a.getMidpoint( new THREE.Vector3() ) ), "Passed!" );
         ok( ! a.containsPoint( new THREE.Vector3( -1, -1, -1 ) ), "Passed!" );
     });
 
diff --git a/types/three/three-core.d.ts b/types/three/three-core.d.ts
index 4acd40fdff..61f97daddd 100644
--- a/types/three/three-core.d.ts
+++ b/types/three/three-core.d.ts
@@ -448,7 +448,7 @@ export class Camera extends Object3D {
      */
     projectionMatrix: Matrix4;
 
-    getWorldDirection(optionalTarget?: Vector3): Vector3;
+    getWorldDirection(target: Vector3): Vector3;
 
 }
 
@@ -687,7 +687,6 @@ export class BufferAttribute {
     copyAt(index1: number, attribute: BufferAttribute, index2: number): BufferAttribute;
     copyArray(array: ArrayLike<number>): BufferAttribute;
     copyColorsArray(colors: {r: number, g: number, b: number}[]): BufferAttribute;
-    copyIndicesArray(indices: {a: number, b: number, c: number}[]): BufferAttribute;
     copyVector2sArray(vectors: {x: number, y: number}[]): BufferAttribute;
     copyVector3sArray(vectors: {x: number, y: number, z: number}[]): BufferAttribute;
     copyVector4sArray(vectors: {x: number, y: number, z: number, w: number}[]): BufferAttribute;
@@ -868,7 +867,7 @@ export class BufferGeometry extends EventDispatcher {
     scale(x: number, y: number, z: number): BufferGeometry;
     lookAt(v: Vector3): void;
 
-    center(): Vector3;
+    center(): BufferGeometry;
 
     setFromObject(object: Object3D): BufferGeometry;
     setFromPoints(points: Vector3[]): BufferGeometry;
@@ -1343,7 +1342,7 @@ export class Geometry extends EventDispatcher {
 
     fromBufferGeometry(geometry: BufferGeometry): Geometry;
 
-    center(): Vector3;
+    center(): Geometry;
 
     normalize(): Geometry;
 
@@ -1368,8 +1367,6 @@ export class Geometry extends EventDispatcher {
      */
     computeMorphNormals(): void;
 
-    computeLineDistances(): void;
-
     /**
      * Computes bounding box of the geometry, updating {@link Geometry.boundingBox} attribute.
      */
@@ -1782,11 +1779,10 @@ export class Object3D extends EventDispatcher {
 
     getObjectByProperty( name: string, value: string ): Object3D;
 
-    getWorldPosition(optionalTarget?: Vector3): Vector3;
-    getWorldQuaternion(optionalTarget?: Quaternion): Quaternion;
-    getWorldRotation(optionalTarget?: Euler): Euler;
-    getWorldScale(optionalTarget?: Vector3): Vector3;
-    getWorldDirection(optionalTarget?: Vector3): Vector3;
+    getWorldPosition(target: Vector3): Vector3;
+    getWorldQuaternion(target: Quaternion): Quaternion;
+    getWorldScale(target: Vector3): Vector3;
+    getWorldDirection(target: Vector3): Vector3;
 
     raycast(raycaster: Raycaster, intersects: any): void;
 
@@ -3088,8 +3084,8 @@ export class Box2 {
     copy(box: this): this;
     makeEmpty(): Box2;
     isEmpty(): boolean;
-    getCenter(optionalTarget?: Vector2): Vector2;
-    getSize(optionalTarget?: Vector2): Vector2;
+    getCenter(target: Vector2): Vector2;
+    getSize(target: Vector2): Vector2;
     expandByPoint(point: Vector2): Box2;
     expandByVector(vector: Vector2): Box2;
     expandByScalar(scalar: number): Box2;
@@ -3097,7 +3093,7 @@ export class Box2 {
     containsBox(box: Box2): boolean;
     getParameter(point: Vector2): Vector2;
     intersectsBox(box: Box2): boolean;
-    clampPoint(point: Vector2, optionalTarget?: Vector2): Vector2;
+    clampPoint(point: Vector2, target: Vector2): Vector2;
     distanceToPoint(point: Vector2): number;
     intersect(box: Box2): Box2;
     union(box: Box2): Box2;
@@ -3128,8 +3124,8 @@ export class Box3 {
     copy(box: this): this;
     makeEmpty(): Box3;
     isEmpty(): boolean;
-    getCenter(optionalTarget?: Vector3): Vector3;
-    getSize(optionalTarget?: Vector3): Vector3;
+    getCenter(target: Vector3): Vector3;
+    getSize(target: Vector3): Vector3;
     expandByPoint(point: Vector3): Box3;
     expandByVector(vector: Vector3): Box3;
     expandByScalar(scalar: number): Box3;
@@ -3140,9 +3136,9 @@ export class Box3 {
     intersectsBox(box: Box3): boolean;
     intersectsSphere(sphere: Sphere): boolean;
     intersectsPlane(plane: Plane): boolean;
-    clampPoint(point: Vector3, optionalTarget?: Vector3): Vector3;
+    clampPoint(point: Vector3, target: Vector3): Vector3;
     distanceToPoint(point: Vector3): number;
-    getBoundingSphere(optionalTarget?: Sphere): Sphere;
+    getBoundingSphere(target: Sphere): Sphere;
     intersect(box: Box3): Box3;
     union(box: Box3): Box3;
     applyMatrix4(matrix: Matrix4): Box3;
@@ -3499,13 +3495,13 @@ export class Line3 {
     set(start?: Vector3, end?: Vector3): Line3;
     clone(): this;
     copy(line: this): this;
-    getCenter(optionalTarget?: Vector3): Vector3;
-    delta(optionalTarget?: Vector3): Vector3;
+    getCenter(target: Vector3): Vector3;
+    delta(target: Vector3): Vector3;
     distanceSq(): number;
     distance(): number;
-    at(t: number, optionalTarget?: Vector3): Vector3;
+    at(t: number, target: Vector3): Vector3;
     closestPointToPointParameter(point: Vector3, clampToLine?: boolean): number;
-    closestPointToPoint(point: Vector3, clampToLine?: boolean, optionalTarget?: Vector3): Vector3;
+    closestPointToPoint(point: Vector3, clampToLine: boolean, target: Vector3): Vector3;
     applyMatrix4(matrix: Matrix4): Line3;
     equals(line: Line3): boolean;
 }
@@ -3943,12 +3939,12 @@ export class Plane {
     negate(): Plane;
     distanceToPoint(point: Vector3): number;
     distanceToSphere(sphere: Sphere): number;
-    projectPoint(point: Vector3, optionalTarget?: Vector3): Vector3;
-    orthoPoint(point: Vector3, optionalTarget?: Vector3): Vector3;
-    intersectLine(line: Line3, optionalTarget?: Vector3): Vector3;
+    projectPoint(point: Vector3, target: Vector3): Vector3;
+    orthoPoint(point: Vector3, target: Vector3): Vector3;
+    intersectLine(line: Line3, target: Vector3): Vector3;
     intersectsLine(line: Line3): boolean;
     intersectsBox(box: Box3): boolean;
-    coplanarPoint(optionalTarget?: Vector3): Vector3;
+    coplanarPoint(target: Vector3): Vector3;
     applyMatrix4(matrix: Matrix4, optionalNormalMatrix?: Matrix3): Plane;
     translate(offset: Vector3): Plane;
     equals(plane: Plane): boolean;
@@ -4106,21 +4102,21 @@ export class Ray {
     set(origin: Vector3, direction: Vector3): Ray;
     clone(): this;
     copy(ray: this): this;
-    at(t: number, optionalTarget?: Vector3): Vector3;
+    at(t: number, target: Vector3): Vector3;
     lookAt(v: Vector3): Vector3;
     recast(t: number): Ray;
-    closestPointToPoint(point: Vector3, optionalTarget?: Vector3): Vector3;
+    closestPointToPoint(point: Vector3, target: Vector3): Vector3;
     distanceToPoint(point: Vector3): number;
     distanceSqToPoint(point: Vector3): number;
     distanceSqToSegment(v0: Vector3, v1: Vector3, optionalPointOnRay?: Vector3, optionalPointOnSegment?: Vector3): number;
-    intersectSphere(sphere: Sphere, optionalTarget?: Vector3): Vector3;
+    intersectSphere(sphere: Sphere, target: Vector3): Vector3;
     intersectsSphere(sphere: Sphere): boolean;
     distanceToPlane(plane: Plane): number;
-    intersectPlane(plane: Plane, optionalTarget?: Vector3): Vector3;
+    intersectPlane(plane: Plane, target: Vector3): Vector3;
     intersectsPlane(plane: Plane): boolean;
-    intersectBox(box: Box3, optionalTarget?: Vector3): Vector3;
+    intersectBox(box: Box3, target: Vector3): Vector3;
     intersectsBox(box: Box3): boolean;
-    intersectTriangle(a: Vector3, b: Vector3, c: Vector3, backfaceCulling: boolean, optionalTarget?: Vector3): Vector3;
+    intersectTriangle(a: Vector3, b: Vector3, c: Vector3, backfaceCulling: boolean, target: Vector3): Vector3;
     applyMatrix4(matrix4: Matrix4): Ray;
     equals(ray: Ray): boolean;
 
@@ -4156,8 +4152,8 @@ export class Sphere {
     intersectsSphere(sphere: Sphere): boolean;
     intersectsBox(box: Box3): boolean;
     intersectsPlane(plane: Plane): boolean;
-    clampPoint(point: Vector3, optionalTarget?: Vector3): Vector3;
-    getBoundingBox(optionalTarget?: Box3): Box3;
+    clampPoint(point: Vector3, target: Vector3): Vector3;
+    getBoundingBox(target: Box3): Box3;
     applyMatrix4(matrix: Matrix4): Sphere;
     translate(offset: Vector3): Sphere;
     equals(sphere: Sphere): boolean;
@@ -4180,16 +4176,16 @@ export class Triangle {
     setFromPointsAndIndices(points: Vector3[], i0: number, i1: number, i2: number): Triangle;
     clone(): this;
     copy(triangle: this): this;
-    area(): number;
-    midpoint(optionalTarget?: Vector3): Vector3;
-    normal(optionalTarget?: Vector3): Vector3;
-    plane(optionalTarget?: Vector3): Plane;
-    barycoordFromPoint(point: Vector3, optionalTarget?: Vector3): Vector3;
+    getArea(): number;
+    getMidpoint(target: Vector3): Vector3;
+    getNormal(target: Vector3): Vector3;
+    getPlane(target: Vector3): Plane;
+    getBarycoord(point: Vector3, target: Vector3): Vector3;
     containsPoint(point: Vector3): boolean;
-    closestPointToPoint(point: Vector3, optionalTarget?: Vector3): Vector3;
+    closestPointToPoint(point: Vector3, target: Vector3): Vector3;
     equals(triangle: Triangle): boolean;
 
-    static normal(a: Vector3, b: Vector3, c: Vector3, optionalTarget?: Vector3): Vector3;
+    static normal(a: Vector3, b: Vector3, c: Vector3, target: Vector3): Vector3;
     static barycoordFromPoint(point: Vector3, a: Vector3, b: Vector3, c: Vector3, optionalTarget: Vector3): Vector3;
     static containsPoint(point: Vector3, a: Vector3, b: Vector3, c: Vector3): boolean;
 }
@@ -5285,7 +5281,6 @@ export class WebGLRenderer implements Renderer {
         };
         render: {
             calls: number;
-            vertices: number;
             faces: number;
             points: number;
         };
@@ -5399,13 +5394,6 @@ export class WebGLRenderer implements Renderer {
      */
     render(scene: Scene, camera: Camera, renderTarget?: RenderTarget, forceClear?: boolean): void;
 
-    /**
-     * Used for setting the gl frontFace, cullFace states in the GPU, thus enabling/disabling face culling when rendering.
-     * If cullFace is false, culling will be disabled.
-     * @param cullFace "back", "front", "front_and_back", or false.
-     * @param frontFace "ccw" or "cw
-     */
-    setFaceCulling(cullFace?: CullFace, frontFace?: FrontFaceDirection): void;
     /**
      * @deprecated
      */
@@ -5648,12 +5636,15 @@ export let ShaderChunk: {
     lightmap_fragment: string;
     lightmap_pars_fragment: string;
     lights_lambert_vertex: string;
-    lights_pars: string;
+    lights_pars_begin: string;
+    lights_pars_map: string;
     lights_phong_fragment: string;
     lights_phong_pars_fragment: string;
     lights_physical_fragment: string;
     lights_physical_pars_fragment: string;
-    lights_template: string;
+    lights_fragment_begin: string;
+    lights_fragment_maps: string;
+    lights_fragment_end: string;
     logdepthbuf_fragment: string;
     logdepthbuf_pars_fragment: string;
     logdepthbuf_pars_vertex: string;
@@ -5677,7 +5668,8 @@ export let ShaderChunk: {
     morphtarget_vertex: string;
     normal_flip: string;
     normal_frag: string;
-    normal_fragment: string;
+    normal_fragment_begin: string;
+    normal_fragment_maps: string;
     normal_vert: string;
     normalmap_pars_fragment: string;
     packing: string;
@@ -6034,8 +6026,6 @@ export class WebGLShadowMap {
     autoUpdate: boolean;
     needsUpdate: boolean;
     type: ShadowMapType;
-    renderReverseSided: boolean;
-    renderSingleSided: boolean;
 
     render(scene: Scene, camera: Camera): void;
 

From 6bafc9a4d62ded25f010afb06e2d9f8478dfe159 Mon Sep 17 00:00:00 2001
From: Tiger Oakes <tiger.oakes@vitalmechanics.com>
Date: Tue, 20 Mar 2018 15:52:49 -0700
Subject: [PATCH 0739/1382] Updated triangle static methods

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

diff --git a/types/three/three-core.d.ts b/types/three/three-core.d.ts
index 61f97daddd..e7e421b93d 100644
--- a/types/three/three-core.d.ts
+++ b/types/three/three-core.d.ts
@@ -4185,8 +4185,8 @@ export class Triangle {
     closestPointToPoint(point: Vector3, target: Vector3): Vector3;
     equals(triangle: Triangle): boolean;
 
-    static normal(a: Vector3, b: Vector3, c: Vector3, target: Vector3): Vector3;
-    static barycoordFromPoint(point: Vector3, a: Vector3, b: Vector3, c: Vector3, optionalTarget: Vector3): Vector3;
+    static getNormal(a: Vector3, b: Vector3, c: Vector3, target: Vector3): Vector3;
+    static getBarycoord(point: Vector3, a: Vector3, b: Vector3, c: Vector3, target: Vector3): Vector3;
     static containsPoint(point: Vector3, a: Vector3, b: Vector3, c: Vector3): boolean;
 }
 

From 07987287a5e20f1449a8373c596b9f500c4ea296 Mon Sep 17 00:00:00 2001
From: Pete Johanson <peter@peterjohanson.com>
Date: Wed, 21 Mar 2018 16:17:04 -0400
Subject: [PATCH 0740/1382] urijs: Add URITemplate `parse` and `parts`
 definitions.

---
 types/urijs/index.d.ts     | 22 ++++++++++++++++++++++
 types/urijs/urijs-tests.ts |  3 +++
 2 files changed, 25 insertions(+)

diff --git a/types/urijs/index.d.ts b/types/urijs/index.d.ts
index 4e046ec27f..08c0611414 100644
--- a/types/urijs/index.d.ts
+++ b/types/urijs/index.d.ts
@@ -239,8 +239,30 @@ declare namespace uri {
     type URITemplateCallback = (keyName: string) => URITemplateValue;
     type URITemplateInput = { [key: string]: URITemplateValue | URITemplateCallback } | URITemplateCallback;
 
+    type URITemplateLiteral = string;
+    interface URITemplateVariable {
+      name: string;
+      explode: boolean;
+      maxLength?: number;
+    }
+
+    interface URITemplateExpression {
+      expression: string;
+      operator: string;
+      variables: ReadonlyArray<URITemplateVariable>;
+    }
+
+    type URITemplatePart = URITemplateLiteral | URITemplateExpression;
+
     interface URITemplate {
       expand(data: URITemplateInput, opts?: Object) : URI;
+      parse(): this;
+
+      /**
+       * @description The parsed parts of the URI Template. Only present after calling
+       *              `parse()` first.
+       */
+      parts?: ReadonlyArray<URITemplatePart>;
     }
 
     interface URITemplateStatic {
diff --git a/types/urijs/urijs-tests.ts b/types/urijs/urijs-tests.ts
index f14ba140d3..fc9911d274 100644
--- a/types/urijs/urijs-tests.ts
+++ b/types/urijs/urijs-tests.ts
@@ -109,6 +109,9 @@ URI('http://user:pass@example.org:80/foo/bar.html').equals(
     })
 );
 
+const template = URITemplate('/items/{?page,count}');
+template.parse() === template;
+
 /*
 Tests for hasSearch(), hasQuery()
 From: http://medialize.github.io/URI.js/docs.html#search-has

From a08461c40539fb1b95492dbfea634b6cfc8e9363 Mon Sep 17 00:00:00 2001
From: Walter Rumsby <walter.rumsby@myfoodbag.co.nz>
Date: Thu, 22 Mar 2018 11:10:51 +1300
Subject: [PATCH 0741/1382] Tidy up

---
 types/mem-fs/index.d.ts      | 16 +++++++++-------
 types/mem-fs/mem-fs-tests.ts |  2 ++
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/types/mem-fs/index.d.ts b/types/mem-fs/index.d.ts
index 08a3067637..13d1c27105 100644
--- a/types/mem-fs/index.d.ts
+++ b/types/mem-fs/index.d.ts
@@ -3,18 +3,20 @@
 // Definitions by: My Food Bag <https://github.com/MyFoodBag>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-import events = require('events');
-import stream = require('stream');
-import File = require('vinyl');
+/// <reference types="node" />
 
-export function create(...args: any[]): create.Store;
+import { EventEmitter } from 'events';
+import { Transform } from 'stream';
+import * as File from 'vinyl';
 
-export namespace create {
-    interface Store extends events.EventEmitter {
+export function create(...args: any[]): memFs.Store;
+
+export namespace memFs {
+    interface Store extends EventEmitter {
         add: (file: File, content: string) => void;
         each: (callback: (file: File, index: number) => void) => void;
         get: (filepath: string) => File;
-        stream: () => stream.Transform;
+        stream: () => Transform;
     }
 
     const prototype: {
diff --git a/types/mem-fs/mem-fs-tests.ts b/types/mem-fs/mem-fs-tests.ts
index bb925837aa..13a2649f19 100644
--- a/types/mem-fs/mem-fs-tests.ts
+++ b/types/mem-fs/mem-fs-tests.ts
@@ -4,3 +4,5 @@ const store = fs.create();
 const file = store.get('hello');
 
 store.add(file, 'hahahahah');
+
+store.each((file, index) => console.log(index, file.path));

From f1c861567963f400d25f7c74d9db1e86c79427db Mon Sep 17 00:00:00 2001
From: Juan Jimenez-Anca <juan@j3a.solutions>
Date: Wed, 21 Mar 2018 22:19:14 +0000
Subject: [PATCH 0742/1382] tslint without extra rules

---
 types/ethereumjs-util/tslint.json | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/types/ethereumjs-util/tslint.json b/types/ethereumjs-util/tslint.json
index 4547f250b4..a0051c9352 100644
--- a/types/ethereumjs-util/tslint.json
+++ b/types/ethereumjs-util/tslint.json
@@ -1,6 +1,3 @@
 { 
-  "extends": "dtslint/dt.json",
-  "rules": {
-    "no-empty-interface": false
-  }
+  "extends": "dtslint/dt.json"
 }

From 268ae79d6eff287618131dbde3910aa663d69677 Mon Sep 17 00:00:00 2001
From: Mateusz Leo <leo.mateusz@gmail.com>
Date: Wed, 21 Mar 2018 16:13:50 -0700
Subject: [PATCH 0743/1382] Update index.d.ts

missing prop type in DraggableProps interface
---
 types/react-beautiful-dnd/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/react-beautiful-dnd/index.d.ts b/types/react-beautiful-dnd/index.d.ts
index 02bc9eaab1..e1dd58a179 100644
--- a/types/react-beautiful-dnd/index.d.ts
+++ b/types/react-beautiful-dnd/index.d.ts
@@ -130,6 +130,7 @@ export interface DraggableProps {
     isDragDisabled?: boolean;
     disableInteractiveElementBlocking?: boolean;
     children(provided: DraggableProvided, snapshot: DraggableStateSnapshot): React.ReactElement<any>;
+    type?: TypeId;
 }
 
 export class Draggable extends React.Component<DraggableProps> {}

From 596eb2ea46a491cc4f8e70340521ff24ce293e5f Mon Sep 17 00:00:00 2001
From: Marcin Dobosz <marcin@marcindobosz.com>
Date: Wed, 21 Mar 2018 23:36:47 -0700
Subject: [PATCH 0744/1382] Typings for fnv-lite

---
 types/fnv-lite/fnv-lite-tests.ts | 20 ++++++++++++++++++++
 types/fnv-lite/index.d.ts        | 19 +++++++++++++++++++
 types/fnv-lite/tsconfig.json     | 23 +++++++++++++++++++++++
 types/fnv-lite/tslint.json       |  1 +
 4 files changed, 63 insertions(+)
 create mode 100644 types/fnv-lite/fnv-lite-tests.ts
 create mode 100644 types/fnv-lite/index.d.ts
 create mode 100644 types/fnv-lite/tsconfig.json
 create mode 100644 types/fnv-lite/tslint.json

diff --git a/types/fnv-lite/fnv-lite-tests.ts b/types/fnv-lite/fnv-lite-tests.ts
new file mode 100644
index 0000000000..33d9133a27
--- /dev/null
+++ b/types/fnv-lite/fnv-lite-tests.ts
@@ -0,0 +1,20 @@
+import FNV = require('fnv-lite');
+
+let result: string;
+result = FNV.hex('');
+result = FNV.base64('');
+result = FNV.base64Url('');
+result = FNV.base36('');
+
+result = FNV.hex([1, 2, 3]);
+result = FNV.base64([1, 2, 3]);
+result = FNV.base64Url([1, 2, 3]);
+result = FNV.base36([1, 2, 3]);
+
+const fnv = new FNV();
+fnv.update([1, 2, 3]).update("abc");
+result = fnv.digest('hex');
+result = fnv.digest('base36');
+result = fnv.digest('base64');
+result = fnv.digest('base64Url');
+const resultArray: number[] = fnv.digest();
diff --git a/types/fnv-lite/index.d.ts b/types/fnv-lite/index.d.ts
new file mode 100644
index 0000000000..0cbd3553d6
--- /dev/null
+++ b/types/fnv-lite/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for fnv-lite 1.2
+// Project: https://github.com/casetext/fnv-lite
+// Definitions by: MarcinD <https://github.com/marcind>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+type Input = string | ArrayLike<number>;
+
+declare class FNV {
+  static hex(input: Input): string;
+  static base64(input: Input): string;
+  static base64Url(input: Input): string;
+  static base36(input: Input): string;
+
+  update(input: Input): this;
+  digest(): number[];
+  digest(type: "hex" | "base36" | "base64" | "base64Url"): string;
+}
+
+export = FNV;
diff --git a/types/fnv-lite/tsconfig.json b/types/fnv-lite/tsconfig.json
new file mode 100644
index 0000000000..d04f5527ef
--- /dev/null
+++ b/types/fnv-lite/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "fnv-lite-tests.ts"
+    ]
+}
diff --git a/types/fnv-lite/tslint.json b/types/fnv-lite/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/fnv-lite/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From b1c423f0f9e2b07671ba56c72d94cf5e6ef72800 Mon Sep 17 00:00:00 2001
From: marcofalsitta <marco.falsitta@gaitup.com>
Date: Thu, 22 Mar 2018 08:23:27 +0100
Subject: [PATCH 0745/1382] master: adding size option to
 LocalDatabaseConfiguration

---
 types/pouchdb-core/index.d.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/types/pouchdb-core/index.d.ts b/types/pouchdb-core/index.d.ts
index e636c3e7c1..4b1d56d860 100644
--- a/types/pouchdb-core/index.d.ts
+++ b/types/pouchdb-core/index.d.ts
@@ -514,6 +514,12 @@ declare namespace PouchDB {
              * How many old revisions we keep track (not a copy) of.
              */
             revs_limit?: number;
+            /**
+             * Size of the database (Most significant for Safari)
+             * option to set the max size in MB that Safari will grant to the local database. Valid options are: 10, 50, 100, 500 and 1000
+             * ex_ new PouchDB("dbName", {size:100});
+             */
+            size?: number;
         }
 
         interface RemoteRequesterConfiguration {

From 064ac3cc1eb782767e5576eff1ea015c1711db39 Mon Sep 17 00:00:00 2001
From: Dan Homola <dan.homola@vzp.cz>
Date: Thu, 22 Mar 2018 10:29:22 +0100
Subject: [PATCH 0746/1382] react-native-navigation: update setTabBadge typings

According to docs the `badge` parameter to `setTabBadge` is mandatory
and can be set to `null` to remove the badge.
---
 types/react-native-navigation/index.d.ts                        | 2 +-
 types/react-native-navigation/react-native-navigation-tests.tsx | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/react-native-navigation/index.d.ts b/types/react-native-navigation/index.d.ts
index 5b5344a4d5..6699f5bf9f 100644
--- a/types/react-native-navigation/index.d.ts
+++ b/types/react-native-navigation/index.d.ts
@@ -128,7 +128,7 @@ export class Navigator {
     toggleDrawer(params: { side: 'left' | 'right'; animated?: boolean; to?: 'open' | 'closed' }): void;
     setDrawerEnabled(params: { side: 'left' | 'right'; enabled: boolean }): void;
     toggleTabs(params: { to: 'hidden' | 'shown'; animated?: boolean }): void;
-    setTabBadge(params?: { tabIndex?: number; badge?: number; badgeColor?: string; }): void;
+    setTabBadge(params?: { tabIndex?: number; badge: number | null; badgeColor?: string; }): void;
     setTabButton(params?: { tabIndex?: number; icon?: any; selectedIcon?: any; label?: string; }): void;
     switchToTab(params?: { tabIndex?: number }): void;
     toggleNavBar(params: { to: 'hidden' | 'shown'; animated?: boolean }): void;
diff --git a/types/react-native-navigation/react-native-navigation-tests.tsx b/types/react-native-navigation/react-native-navigation-tests.tsx
index b67aa3cfed..6feb7bc397 100644
--- a/types/react-native-navigation/react-native-navigation-tests.tsx
+++ b/types/react-native-navigation/react-native-navigation-tests.tsx
@@ -11,6 +11,7 @@ class Screen1 extends React.Component<NavigationComponentProps & { height: numbe
 
     componentDidMount() {
         this.props.navigator.push({ screen: 'example.Screen2' });
+        this.props.navigator.setTabBadge({ badge: null });
     }
 
     render() {

From 94588ea50dc064f0de21cf79a33e2476ac71d8dd Mon Sep 17 00:00:00 2001
From: Edward Sammut Alessi <edward.sammut.alessi@preeostudios.com>
Date: Thu, 22 Mar 2018 12:08:08 +0100
Subject: [PATCH 0747/1382] Steamid typings

---
 types/steamid/index.d.ts       | 134 +++++++++++++++++++++++++++++++++
 types/steamid/steamid-tests.ts |  19 +++++
 types/steamid/tsconfig.json    |  23 ++++++
 types/steamid/tslint.json      |   1 +
 4 files changed, 177 insertions(+)
 create mode 100644 types/steamid/index.d.ts
 create mode 100644 types/steamid/steamid-tests.ts
 create mode 100644 types/steamid/tsconfig.json
 create mode 100644 types/steamid/tslint.json

diff --git a/types/steamid/index.d.ts b/types/steamid/index.d.ts
new file mode 100644
index 0000000000..37967db201
--- /dev/null
+++ b/types/steamid/index.d.ts
@@ -0,0 +1,134 @@
+// Type definitions for steamid 1.1
+// Project: https://github.com/DoctorMcKay/node-steamid
+// Definitions by: My Self <https://github.com/me>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+/**
+ * Render this SteamID into Steam2 textual format
+ * @param newerFormat [newerFormat=false] - true if you want to use 1 in place of the leading 0 for the public universe
+ */
+type getSteam2RenderedID = (newerFormat?: boolean) => string;
+
+/**
+ * Render this SteamID into Steam3 textual format
+ */
+type getSteam3RenderedID = () => string;
+
+/**
+ * Render this SteamID into 64-bit numeric format
+ */
+type getSteamID64 = () => string;
+
+declare class SteamID {
+    universe: SteamID.Universe;
+    type: SteamID.Type;
+    instance: SteamID.Instance;
+    accountid: number;
+
+    /**
+     * You can create a SteamID object from a Steam2 rendered ID, a Steam3 rendered ID, a SteamID64, or from the four parts that make up a SteamID.
+     * @param input SteamID string
+     */
+    constructor(input: string);
+
+    /**
+     * Check whether this SteamID is valid (according to Steam's rules)
+     */
+    isValid(): boolean;
+
+    /**
+     * Check whether this chat SteamID is tied to a Steam group.
+     */
+    isGroupChat(): boolean;
+
+    /**
+     * Check whether this chat SteamID is a Steam lobby.
+     */
+    isLobby(): boolean;
+
+    getSteam2RenderedID: getSteam2RenderedID;
+    steam2: getSteam2RenderedID;
+
+    getSteam3RenderedID: getSteam3RenderedID;
+    steam3: getSteam3RenderedID;
+
+    getSteamID64: getSteamID64;
+    toString: getSteamID64;
+}
+
+declare namespace SteamID {
+    // Universe constants
+    enum Universe {
+        INVALID = 0,
+        PUBLIC = 1,
+        BETA = 2,
+        INTERNAL = 3,
+        DEV = 4,
+    }
+
+    // Type constants
+    enum Type {
+        INVALID = 0,
+        INDIVIDUAL = 1,
+        MULTISEAT = 2,
+        GAMESERVER = 3,
+        ANON_GAMESERVER = 4,
+        PENDING = 5,
+        CONTENT_SERVER = 6,
+        CLAN = 7,
+        CHAT = 8,
+        P2P_SUPER_SEEDER = 9,
+        ANON_USER = 10,
+    }
+
+    // Instance constants
+    enum Instance {
+        ALL = 0,
+        DESKTOP = 1,
+        CONSOLE = 2,
+        WEB = 4,
+    }
+
+    // Type chars
+    enum TypeChars {
+        I = Type.INVALID,
+        U = Type.INDIVIDUAL,
+        M = Type.MULTISEAT,
+        G = Type.GAMESERVER,
+        A = Type.ANON_GAMESERVER,
+        P = Type.PENDING,
+        C = Type.CONTENT_SERVER,
+        g = Type.CLAN,
+        T = Type.CHAT,
+        a = Type.ANON_USER,
+    }
+
+    const AccountIDMask = 0xFFFFFFFF;
+    const AccountInstanceMask = 0x000FFFFF;
+
+    enum ChatInstanceFlags {
+        /**
+         * (AccountInstanceMask + 1) >> 1
+         */
+        Clan = (0x000FFFFF + 1) >> 1,
+
+        /**
+         * (AccountInstanceMask + 1) >> 2
+         */
+        Lobby = (0x000FFFFF + 1) >> 2,
+
+        /**
+         * (AccountInstanceMask + 1) >> 3
+         */
+        MMSLobby = (0x000FFFFF + 1) >> 3,
+    }
+
+    /**
+     * Create an individual SteamID in the public universe given an accountid
+     * @param accountid - The user's account ID
+     */
+    function fromIndividualAccountID(accountid: number | string): SteamID;
+}
+
+export = SteamID;
diff --git a/types/steamid/steamid-tests.ts b/types/steamid/steamid-tests.ts
new file mode 100644
index 0000000000..bbf556c100
--- /dev/null
+++ b/types/steamid/steamid-tests.ts
@@ -0,0 +1,19 @@
+import SteamID = require("steamid");
+
+let sid: SteamID;
+
+sid = new SteamID("76561198006409530");
+sid = SteamID.fromIndividualAccountID(46143802);
+
+sid.universe = SteamID.Universe.PUBLIC;
+sid.type = SteamID.Type.INDIVIDUAL;
+sid.instance = SteamID.Instance.DESKTOP;
+sid.accountid = 46143802;
+
+sid.isValid();
+sid.isGroupChat();
+sid.isLobby();
+sid.getSteam2RenderedID();
+sid.getSteam2RenderedID(true);
+sid.getSteam3RenderedID();
+sid.getSteamID64();
diff --git a/types/steamid/tsconfig.json b/types/steamid/tsconfig.json
new file mode 100644
index 0000000000..dca75b64b2
--- /dev/null
+++ b/types/steamid/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "steamid-tests.ts"
+    ]
+}
diff --git a/types/steamid/tslint.json b/types/steamid/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/steamid/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 2a9a61fe14e451446dfe29005eb4aa6875cdbadc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Janto=C5=A1ovi=C4=8D?=
 <jantosovic.martin@gmail.com>
Date: Thu, 22 Mar 2018 12:12:14 +0100
Subject: [PATCH 0748/1382] [react-image-gallery] getCurrentIndex() returns
 number

---
 types/react-image-gallery/index.d.ts                   |  2 +-
 .../react-image-gallery/react-image-gallery-tests.tsx  | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/types/react-image-gallery/index.d.ts b/types/react-image-gallery/index.d.ts
index 5b10b5925b..45de6e4d0a 100644
--- a/types/react-image-gallery/index.d.ts
+++ b/types/react-image-gallery/index.d.ts
@@ -79,7 +79,7 @@ declare class ReactImageGallery extends React.Component<ReactImageGalleryProps>
     fullScreen: () => void;
     exitFullScreen: () => void;
     slideToIndex: (index: number) => void;
-    getCurrentIndex: () => void;
+    getCurrentIndex: () => number;
 }
 
 export default ReactImageGallery;
diff --git a/types/react-image-gallery/react-image-gallery-tests.tsx b/types/react-image-gallery/react-image-gallery-tests.tsx
index 65fedd7828..04e7d6a6f9 100644
--- a/types/react-image-gallery/react-image-gallery-tests.tsx
+++ b/types/react-image-gallery/react-image-gallery-tests.tsx
@@ -2,6 +2,14 @@ import * as React from 'react';
 import ReactImageGallery, { ReactImageGalleryItem, ReactImageGalleryProps } from 'react-image-gallery';
 
 class ImageGallery extends React.Component {
+    private gallery: ReactImageGallery | null;
+
+    componentDidMount() {
+        if (this.gallery) {
+            const message = `Showing ${this.gallery.getCurrentIndex() + 1}. image the gallery.`;
+        }
+    }
+
     render() {
         const galleryItem: ReactImageGalleryItem = {
             original: 'http://localhost/logo.jpg',
@@ -14,6 +22,6 @@ class ImageGallery extends React.Component {
             showFullscreenButton: false
         };
 
-        return <ReactImageGallery {...props} />;
+        return <ReactImageGallery ref={(r) => this.gallery = r} {...props} />;
     }
 }

From 9456c18a19a0b6087e9369fa43feb7e63bf4ec56 Mon Sep 17 00:00:00 2001
From: Aaron Reisman <aaron@lifeiscontent.net>
Date: Thu, 22 Mar 2018 20:00:02 +0700
Subject: [PATCH 0749/1382] Update index.d.ts

---
 types/i18next-express-middleware/index.d.ts | 192 +++++++++++---------
 1 file changed, 109 insertions(+), 83 deletions(-)

diff --git a/types/i18next-express-middleware/index.d.ts b/types/i18next-express-middleware/index.d.ts
index f9877b2659..d28a334429 100644
--- a/types/i18next-express-middleware/index.d.ts
+++ b/types/i18next-express-middleware/index.d.ts
@@ -5,104 +5,130 @@
 // TypeScript Version: 2.3
 
 declare namespace I18next {
-    interface I18nextOptions extends i18nextExpressMiddleware.I18nextOptions { }
+  interface I18nextOptions extends i18nextExpressMiddleware.I18nextOptions {}
 }
 
 declare namespace i18nextExpressMiddleware {
-    /**
-     * @summary Interface for Language detector options.
-     * @interface
-     */
-    interface LanguageDetectorOptions {
-        caches?: Array<string>|boolean;
-        cookieDomain?: string;
-        cookieExpirationDate?: Date;
-        lookupCookie?: string;
-        lookupFromPathIndex?: number;
-        lookupQuerystring?: string;
-        lookupSession?: string;
-        order?: Array<string>;
-    }
+  /**
+   * @summary Interface for Language detector options.
+   * @interface
+   */
+  interface LanguageDetectorOptions {
+    caches?: Array<string> | boolean
+    cookieDomain?: string
+    cookieExpirationDate?: Date
+    lookupCookie?: string
+    lookupFromPathIndex?: number
+    lookupQuerystring?: string
+    lookupSession?: string
+    order?: Array<string>
+  }
 
-    /**
-     * @summary i18next options.
-     * @interface
-     */
-    interface I18nextOptions {
-        detection?: LanguageDetectorOptions;
-    }
+  /**
+   * @summary i18next options.
+   * @interface
+   */
+  interface I18nextOptions {
+    detection?: LanguageDetectorOptions
+  }
 }
 
-declare module "i18next-express-middleware" {
-    import express = require("express");
-    import i18next = require("i18next");
+declare module 'i18next-express-middleware' {
+  import express = require('express')
+  import i18next = require('i18next')
+
+  /**
+   * @summary Interface for middleware to use i18next in express.js.
+   * @interface
+   */
+  export interface i18nextExpressMiddleware {
+    LanguageDetector(): express.Handler
+    missingKeyHandler(): express.Handler
+  }
+
+  /**
+   * @summary Interface for own detection functionality.
+   */
+  export interface i18nextCustomDetection {
+    name: string
+    lookup: (
+      req: express.Request,
+      res: express.Response,
+      options?: Object
+    ) => void
+    cacheUserLanguage: (
+      req: express.Request,
+      res: express.Response,
+      lng?: any,
+      options?: Object
+    ) => void
+  }
+
+  /**
+   * @summary Detects user language from current request.
+   * @class
+   */
+  export class LanguageDetector {
+    /**
+     * @summary Constructor.
+     * @constructor
+     * @param {any}     services    The services.
+     * @param {Object}  options     The options.
+     * @param {Object}  allOptions  The all options.
+     */
+    constructor(services?: any, options?: Object, allOptions?: Object)
 
     /**
-     * @summary Interface for middleware to use i18next in express.js.
-     * @interface
+     * @summary Adds detector.
+     * @param {i18nextCustomDetection} detector The detector to add.
      */
-    export interface i18nextExpressMiddleware {
-        LanguageDetector(): express.Handler;
-        missingKeyHandler(): express.Handler;
-    }
+    addDetector(detector: i18nextCustomDetection): void
+
+    // NOTE: add documentation
+    cacheUserLanguage(
+      req: express.Request,
+      res: express.Response,
+      detectionOrder: any
+    ): void
 
     /**
-     * @summary Interface for own detection functionality.
+     * @summary Detects the language.
+     * @param {Request}         req             The HTTP request.
+     * @param {Response}        res             The HTTP response.
+     * @param {detectionOrder}  detectionOrder  The detection order.
      */
-    export interface i18nextCustomDetection {
-        name: string;
-        lookup: (req: express.Request, res: express.Response, options?: Object) => void;
-        cacheUserLanguage: (req: express.Request, res: express.Response, lng?: any, options?: Object) => void;
-    }
+    detect(
+      req: express.Request,
+      res: express.Response,
+      detectionOrder: any
+    ): void
 
     /**
-     * @summary Detects user language from current request.
-     * @class
+     * @summary Initializes class.
+     * @param {any}     services    The services.
+     * @param {Object}  options     The options.
+     * @param {Object}  allOptions  The all options.
      */
-    export class LanguageDetector {
-        /**
-         * @summary Constructor.
-         * @constructor
-         * @param {any}     services    The services.
-         * @param {Object}  options     The options.
-         * @param {Object}  allOptions  The all options.
-         */
-        constructor(services?: any, options?: Object, allOptions?: Object);
+    init(services: any, options?: Object, allOptions?: Object): void
+  }
 
-        /**
-         * @summary Adds detector.
-         * @param {i18nextCustomDetection} detector The detector to add.
-         */
-        addDetector(detector: i18nextCustomDetection): void;
+  export function getResourcesHandler(
+    i18next: i18next.i18n,
+    options: Object
+  ): express.Handler
+  export function handle(
+    i18next: i18next.i18n,
+    options?: Object
+  ): express.Handler
 
-        // NOTE: add documentation
-        cacheUserLanguage(req: express.Request, res: express.Response, detectionOrder: any): void;
-
-        /**
-         * @summary Detects the language.
-         * @param {Request}         req             The HTTP request.
-         * @param {Response}        res             The HTTP response.
-         * @param {detectionOrder}  detectionOrder  The detection order.
-         */
-        detect(req: express.Request, res: express.Response, detectionOrder: any): void;
-
-        /**
-         * @summary Initializes class.
-         * @param {any}     services    The services.
-         * @param {Object}  options     The options.
-         * @param {Object}  allOptions  The all options.
-         */
-        init(services: any, options?: Object, allOptions?: Object): void;
-    }
-
-    export function getResourcesHandler(i18next: i18next.i18n, options: Object): express.Handler;
-    export function handle(i18next: i18next.i18n, options?: Object): express.Handler;
-
-    /**
-     * @summary Gets handler for missing key.
-     * @param {I18nextStatic}   i18next The i18next.
-     * @param {Object}          options The options.
-     * @return {express.Handler} The express handler.
-     */
-    export function missingKeyHandler(i18next: i18next.i18n, options: Object): express.Handler;
+  /**
+   * @summary Gets handler for missing key.
+   * @param {I18nextStatic}   i18next The i18next.
+   * @param {Object}          options The options.
+   * @return {express.Handler} The express handler.
+   */
+  export function missingKeyHandler(
+    i18next: i18next.i18n,
+    options?: Object
+  ): express.Handler
 }

From afbf4513e41aaf6779116dd8cc56ea1a1d557706 Mon Sep 17 00:00:00 2001
From: jobeltran <jobeltran@theworkshop.com>
Date: Thu, 22 Mar 2018 15:44:51 +0100
Subject: [PATCH 0750/1382] Update atmosphere.js with optional parameter
 webSocketUrl    Based on atmoshpere.js code:   
 https://github.com/Atmosphere/atmosphere-javascript/blob/master/modules/javascript/src/main/webapp/javascript/atmosphere.js#L1212
    it is possible to add an optional parameter named webSocketUrl

---
 types/atmosphere.js/index.d.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/types/atmosphere.js/index.d.ts b/types/atmosphere.js/index.d.ts
index 0c0bfa3c3a..48314cfdea 100644
--- a/types/atmosphere.js/index.d.ts
+++ b/types/atmosphere.js/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/Atmosphere/atmosphere-javascript
 // Definitions by: Kai Toedter <https://github.com/toedter> 
 //                 Fedor Kirpichev <https://github.com/Mory1879>
+//                 Jorge Beltran <https://github.com/Scipion>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 // Use this typings in future instead of deprecated 'atmosphere'.
@@ -65,6 +66,7 @@ declare namespace Atmosphere {
         maxReconnectOnClose?: number;
         enableProtocol?: boolean;
         pollingInterval?: number;
+        webSocketUrl?: string;
 
         onError?: (response?:Response) => void;
         onClose?:  (response?:Response)  => void;

From 1e7e3727777e6e95cf289dc47038a0474a5ba989 Mon Sep 17 00:00:00 2001
From: Valentin Sundermann <me@vsund.de>
Date: Thu, 22 Mar 2018 15:56:40 +0100
Subject: [PATCH 0751/1382] Change return type of valueOf to bigi

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

diff --git a/types/bigi/index.d.ts b/types/bigi/index.d.ts
index c991b13fac..7b44ff75e4 100644
--- a/types/bigi/index.d.ts
+++ b/types/bigi/index.d.ts
@@ -87,7 +87,7 @@ declare class bigi {
     static fromDERInteger(byteArray?: any): number;
     static fromHex(hex: string): bigi;
     static isBigInteger(obj: any, check_ver: any): obj is bigi;
-    static valueOf(i: any): number;
+    static valueOf(i: any): bigi;
 }
 declare namespace bigi {
     interface Constants {

From 0eb9a227403ee4430624fbb7fe16b13941e4586e Mon Sep 17 00:00:00 2001
From: Valentin Sundermann <me@vsund.de>
Date: Thu, 22 Mar 2018 15:57:25 +0100
Subject: [PATCH 0752/1382] Expand tests to cover the previous change

---
 types/bigi/bigi-tests.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/types/bigi/bigi-tests.ts b/types/bigi/bigi-tests.ts
index ef9d7421d3..0e4822aeb6 100644
--- a/types/bigi/bigi-tests.ts
+++ b/types/bigi/bigi-tests.ts
@@ -7,3 +7,10 @@ const b3 = b1.multiply(b2);
 
 console.log(b3.toHex());
 // => ae499bfe762edfb416d0ce71447af67ff33d1760cbebd70874be1d7a5564b0439a59808cb1856a91974f7023f72132
+
+const b4 = BigInteger.valueOf(42);
+const b5 = BigInteger.valueOf(10);
+const b6 = b4.multiply(b5);
+
+console.log(b6);
+// => BigInteger { '0': 420, '1': 0, t: 1, s: 0 }

From 96e18376f4d702de206fa9907e14a63b956fc4b1 Mon Sep 17 00:00:00 2001
From: Matthew Zikherman <matt@bestvendor.com>
Date: Thu, 22 Mar 2018 10:22:04 -0400
Subject: [PATCH 0753/1382] Add options to buildClientSchema in graphql

---
 types/graphql/utilities/buildClientSchema.d.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/types/graphql/utilities/buildClientSchema.d.ts b/types/graphql/utilities/buildClientSchema.d.ts
index bdf898bc2b..26b0b3cdd5 100644
--- a/types/graphql/utilities/buildClientSchema.d.ts
+++ b/types/graphql/utilities/buildClientSchema.d.ts
@@ -1,5 +1,7 @@
 import { IntrospectionQuery } from './introspectionQuery';
-import { GraphQLSchema } from '../type/schema';
+import { GraphQLSchema, GraphQLSchemaValidationOptions } from '../type/schema';
+
+interface Options extends GraphQLSchemaValidationOptions {}
 
 /**
  * Build a GraphQLSchema for use by client tools.
@@ -12,4 +14,5 @@ import { GraphQLSchema } from '../type/schema';
  */
 export function buildClientSchema(
   introspection: IntrospectionQuery,
+  options?: Options,
 ): GraphQLSchema;

From ee4eaf0cff4413f05af3c9f5dabefb9d4a78df35 Mon Sep 17 00:00:00 2001
From: Edward Sammut Alessi <edward.sammut.alessi@preeostudios.com>
Date: Thu, 22 Mar 2018 18:31:50 +0100
Subject: [PATCH 0754/1382] Extend event emitter

---
 types/steam-client/index.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/steam-client/index.d.ts b/types/steam-client/index.d.ts
index ff69e39f46..97b386649c 100644
--- a/types/steam-client/index.d.ts
+++ b/types/steam-client/index.d.ts
@@ -7,7 +7,7 @@
 /// <reference types="node" />
 /// <reference types="bytebuffer" />
 
-export class CMClient {
+export class CMClient extends NodeJS.EventEmitter {
     /**
      * A boolean that indicates whether you are currently connected and the encryption handshake is complete.
      * 'connected' is emitted when it changes to true, and 'error' is emitted when it changes to false unless you called disconnect.
@@ -81,7 +81,7 @@ export class CMClient {
 
     // Events
 
-    on<T extends keyof CMEventCallback>(eventType: T, callback: CMEventCallback[T]): void;
+    on<T extends keyof CMEventCallback>(eventType: T, callback: CMEventCallback[T]): this;
 }
 
 /**

From 67ff0213632be98f732e9c95d3812d069affe174 Mon Sep 17 00:00:00 2001
From: AJ Richardson <aj.ric.ar+git@gmail.com>
Date: Thu, 22 Mar 2018 13:44:42 -0400
Subject: [PATCH 0755/1382] [lodash] Add types for lodash/fp (#23532)

* lodash: _.get should with numeric keys, too.
Also added some better tests.

* lodash: add one more NumericDictionary overload for _.get

* lodash: more reasonable index for _.get tests

* Working on script to generate FP types (for #7896)

* Generate generic args and multiple overloads correctly (ish)

* Cap callback arguments

* Fix ObjectIteratee issue, merge interfaces

* Merge similar overloads

* Read and write definiton files

* Generate definitions for all functions
(still needs some tweaking)

* Add JSDoc comments to the output, fix some bugs

* Fix more fp generation bugs

* Add alias functions and special fp functions

* Fix more fp generation bugs

* Fix more fp generation bugs

* Fix more fp generation bugs

* lodash fp: cap more callbacks, use ReadonlyArray, handle special cases

* Add some tests, fix some bugs

* Remove invalid argument from flatten. Don't curry single argument functions.
But do "convert" them so aliases work.
Also fixed some tests.

* lodash fp: implement more tests, fix more bugs, improve performance

* lodash fp: implement more tests, fix more bugs

* lodash fp: add more tests, fix more bugs

* lodash fp: tests finally pass!

* Remove namespace hack

* lodash: fix tests

* lodash fp: fix lint issues

* lodash: Fix lint issues

* lodash: fix more lint issues

* lodash: make travis happy

* lodash: make travis happy (again)

* Update generate-fp script to work with new folder structure

* Lodash: update fp types after merge

* Lodash: test optimizations

* lodash: simplify some tests to avoid GC error

* lodash: simplify tests even more (and fix bugs)
---
 types/lodash/common/array.d.ts               |    32 +-
 types/lodash/common/collection.d.ts          |    16 +-
 types/lodash/common/common.d.ts              |    10 +-
 types/lodash/common/date.d.ts                |     2 +-
 types/lodash/common/function.d.ts            |   100 +-
 types/lodash/common/lang.d.ts                |     7 +-
 types/lodash/common/math.d.ts                |     6 +-
 types/lodash/common/number.d.ts              |     6 +-
 types/lodash/common/object.d.ts              |    61 +-
 types/lodash/common/seq.d.ts                 |     2 +-
 types/lodash/common/string.d.ts              |     2 +-
 types/lodash/common/util.d.ts                |    12 +-
 types/lodash/fp.d.ts                         |   790 +
 types/lodash/fp/F.d.ts                       |    14 +
 types/lodash/fp/T.d.ts                       |    14 +
 types/lodash/fp/add.d.ts                     |    51 +
 types/lodash/fp/after.d.ts                   |    51 +
 types/lodash/fp/all.d.ts                     |    67 +
 types/lodash/fp/allPass.d.ts                 |    18 +
 types/lodash/fp/always.d.ts                  |    15 +
 types/lodash/fp/any.d.ts                     |    67 +
 types/lodash/fp/anyPass.d.ts                 |    18 +
 types/lodash/fp/apply.d.ts                   |    18 +
 types/lodash/fp/ary.d.ts                     |    51 +
 types/lodash/fp/assign.d.ts                  |   156 +
 types/lodash/fp/assignAll.d.ts               |    37 +
 types/lodash/fp/assignAllWith.d.ts           |   138 +
 types/lodash/fp/assignIn.d.ts                |   151 +
 types/lodash/fp/assignInAll.d.ts             |    36 +
 types/lodash/fp/assignInAllWith.d.ts         |   143 +
 types/lodash/fp/assignInWith.d.ts            |   249 +
 types/lodash/fp/assignWith.d.ts              |   240 +
 types/lodash/fp/assoc.d.ts                   |   147 +
 types/lodash/fp/assocPath.d.ts               |   147 +
 types/lodash/fp/at.d.ts                      |    96 +
 types/lodash/fp/attempt.d.ts                 |    16 +
 types/lodash/fp/before.d.ts                  |    61 +
 types/lodash/fp/bind.d.ts                    |    86 +
 types/lodash/fp/bindAll.d.ts                 |    78 +
 types/lodash/fp/bindKey.d.ts                 |    91 +
 types/lodash/fp/camelCase.d.ts               |    15 +
 types/lodash/fp/capitalize.d.ts              |    15 +
 types/lodash/fp/castArray.d.ts               |    17 +
 types/lodash/fp/ceil.d.ts                    |    16 +
 types/lodash/fp/chunk.d.ts                   |    58 +
 types/lodash/fp/clamp.d.ts                   |   166 +
 types/lodash/fp/clone.d.ts                   |    20 +
 types/lodash/fp/cloneDeep.d.ts               |    15 +
 types/lodash/fp/cloneDeepWith.d.ts           |    53 +
 types/lodash/fp/cloneWith.d.ts               |    96 +
 types/lodash/fp/compact.d.ts                 |    18 +
 types/lodash/fp/complement.d.ts              |    16 +
 types/lodash/fp/compose.d.ts                 |   315 +
 types/lodash/fp/concat.d.ts                  |   113 +
 types/lodash/fp/cond.d.ts                    |    38 +
 types/lodash/fp/conforms.d.ts                |    48 +
 types/lodash/fp/conformsTo.d.ts              |    48 +
 types/lodash/fp/constant.d.ts                |    15 +
 types/lodash/fp/contains.d.ts                |    63 +
 types/lodash/fp/convert.d.ts                 |    15 +
 types/lodash/fp/countBy.d.ts                 |   225 +
 types/lodash/fp/create.d.ts                  |    17 +
 types/lodash/fp/curry.d.ts                   |    65 +
 types/lodash/fp/curryN.d.ts                  |   148 +
 types/lodash/fp/curryRight.d.ts              |    59 +
 types/lodash/fp/curryRightN.d.ts             |   133 +
 types/lodash/fp/debounce.d.ts                |   118 +
 types/lodash/fp/deburr.d.ts                  |    16 +
 types/lodash/fp/defaultTo.d.ts               |   103 +
 types/lodash/fp/defaults.d.ts                |    71 +
 types/lodash/fp/defaultsAll.d.ts             |    20 +
 types/lodash/fp/defaultsDeep.d.ts            |    46 +
 types/lodash/fp/defaultsDeepAll.d.ts         |    15 +
 types/lodash/fp/defer.d.ts                   |    17 +
 types/lodash/fp/delay.d.ts                   |    56 +
 types/lodash/fp/difference.d.ts              |    58 +
 types/lodash/fp/differenceBy.d.ts            |   114 +
 types/lodash/fp/differenceWith.d.ts          |   168 +
 types/lodash/fp/dissoc.d.ts                  |    63 +
 types/lodash/fp/dissocPath.d.ts              |    63 +
 types/lodash/fp/divide.d.ts                  |    51 +
 types/lodash/fp/drop.d.ts                    |    53 +
 types/lodash/fp/dropLast.d.ts                |    53 +
 types/lodash/fp/dropLastWhile.d.ts           |   108 +
 types/lodash/fp/dropRight.d.ts               |    53 +
 types/lodash/fp/dropRightWhile.d.ts          |   108 +
 types/lodash/fp/dropWhile.d.ts               |   108 +
 types/lodash/fp/each.d.ts                    |   330 +
 types/lodash/fp/eachRight.d.ts               |   225 +
 types/lodash/fp/endsWith.d.ts                |    56 +
 types/lodash/fp/entries.d.ts                 |    25 +
 types/lodash/fp/entriesIn.d.ts               |    25 +
 types/lodash/fp/eq.d.ts                      |   156 +
 types/lodash/fp/equals.d.ts                  |   141 +
 types/lodash/fp/escape.d.ts                  |    26 +
 types/lodash/fp/escapeRegExp.d.ts            |    16 +
 types/lodash/fp/every.d.ts                   |    67 +
 types/lodash/fp/extend.d.ts                  |   151 +
 types/lodash/fp/extendAll.d.ts               |    36 +
 types/lodash/fp/extendAllWith.d.ts           |   143 +
 types/lodash/fp/extendWith.d.ts              |   249 +
 types/lodash/fp/fill.d.ts                    |   233 +
 types/lodash/fp/filter.d.ts                  |   361 +
 types/lodash/fp/find.d.ts                    |   283 +
 types/lodash/fp/findFrom.d.ts                |   517 +
 types/lodash/fp/findIndex.d.ts               |   108 +
 types/lodash/fp/findIndexFrom.d.ts           |   186 +
 types/lodash/fp/findKey.d.ts                 |   108 +
 types/lodash/fp/findLast.d.ts                |   143 +
 types/lodash/fp/findLastFrom.d.ts            |   257 +
 types/lodash/fp/findLastIndex.d.ts           |   103 +
 types/lodash/fp/findLastIndexFrom.d.ts       |   177 +
 types/lodash/fp/findLastKey.d.ts             |   103 +
 types/lodash/fp/first.d.ts                   |    19 +
 types/lodash/fp/flatMap.d.ts                 |   189 +
 types/lodash/fp/flatMapDeep.d.ts             |   342 +
 types/lodash/fp/flatMapDepth.d.ts            |   687 +
 types/lodash/fp/flatten.d.ts                 |    17 +
 types/lodash/fp/flattenDeep.d.ts             |    17 +
 types/lodash/fp/flattenDepth.d.ts            |    53 +
 types/lodash/fp/flip.d.ts                    |    24 +
 types/lodash/fp/floor.d.ts                   |    16 +
 types/lodash/fp/flow.d.ts                    |   355 +
 types/lodash/fp/flowRight.d.ts               |   315 +
 types/lodash/fp/forEach.d.ts                 |   330 +
 types/lodash/fp/forEachRight.d.ts            |   225 +
 types/lodash/fp/forIn.d.ts                   |    88 +
 types/lodash/fp/forInRight.d.ts              |    74 +
 types/lodash/fp/forOwn.d.ts                  |    88 +
 types/lodash/fp/forOwnRight.d.ts             |    74 +
 types/lodash/fp/fromPairs.d.ts               |    37 +
 types/lodash/fp/functions.d.ts               |    28 +
 types/lodash/fp/functionsIn.d.ts             |    28 +
 types/lodash/fp/get.d.ts                     |   207 +
 types/lodash/fp/getOr.d.ts                   |   313 +
 types/lodash/fp/groupBy.d.ts                 |   225 +
 types/lodash/fp/gt.d.ts                      |    51 +
 types/lodash/fp/gte.d.ts                     |    51 +
 types/lodash/fp/has.d.ts                     |   138 +
 types/lodash/fp/hasIn.d.ts                   |   133 +
 types/lodash/fp/head.d.ts                    |    19 +
 types/lodash/fp/identical.d.ts               |   156 +
 types/lodash/fp/identity.d.ts                |    23 +
 types/lodash/fp/inRange.d.ts                 |   103 +
 types/lodash/fp/includes.d.ts                |    63 +
 types/lodash/fp/includesFrom.d.ts            |   105 +
 types/lodash/fp/indexBy.d.ts                 |   225 +
 types/lodash/fp/indexOf.d.ts                 |   118 +
 types/lodash/fp/indexOfFrom.d.ts             |   204 +
 types/lodash/fp/init.d.ts                    |    17 +
 types/lodash/fp/initial.d.ts                 |    17 +
 types/lodash/fp/intersection.d.ts            |    53 +
 types/lodash/fp/intersectionBy.d.ts          |   186 +
 types/lodash/fp/intersectionWith.d.ts        |   177 +
 types/lodash/fp/invert.d.ts                  |    19 +
 types/lodash/fp/invertBy.d.ts                |    73 +
 types/lodash/fp/invertObj.d.ts               |    19 +
 types/lodash/fp/invoke.d.ts                  |    48 +
 types/lodash/fp/invokeArgs.d.ts              |    78 +
 types/lodash/fp/invokeArgsMap.d.ts           |   187 +
 types/lodash/fp/invokeMap.d.ts               |   103 +
 types/lodash/fp/isArguments.d.ts             |    15 +
 types/lodash/fp/isArray.d.ts                 |    15 +
 types/lodash/fp/isArrayBuffer.d.ts           |    15 +
 types/lodash/fp/isArrayLike.d.ts             |    78 +
 types/lodash/fp/isArrayLikeObject.d.ts       |    77 +
 types/lodash/fp/isBoolean.d.ts               |    15 +
 types/lodash/fp/isBuffer.d.ts                |    15 +
 types/lodash/fp/isDate.d.ts                  |    15 +
 types/lodash/fp/isElement.d.ts               |    15 +
 types/lodash/fp/isEmpty.d.ts                 |    16 +
 types/lodash/fp/isEqual.d.ts                 |   141 +
 types/lodash/fp/isEqualWith.d.ts             |   285 +
 types/lodash/fp/isError.d.ts                 |    16 +
 types/lodash/fp/isFinite.d.ts                |    17 +
 types/lodash/fp/isFunction.d.ts              |    15 +
 types/lodash/fp/isInteger.d.ts               |    31 +
 types/lodash/fp/isLength.d.ts                |    31 +
 types/lodash/fp/isMap.d.ts                   |    15 +
 types/lodash/fp/isMatch.d.ts                 |   116 +
 types/lodash/fp/isMatchWith.d.ts             |   285 +
 types/lodash/fp/isNaN.d.ts                   |    17 +
 types/lodash/fp/isNative.d.ts                |    15 +
 types/lodash/fp/isNil.d.ts                   |    26 +
 types/lodash/fp/isNull.d.ts                  |    15 +
 types/lodash/fp/isNumber.d.ts                |    17 +
 types/lodash/fp/isObject.d.ts                |    16 +
 types/lodash/fp/isObjectLike.d.ts            |    30 +
 types/lodash/fp/isPlainObject.d.ts           |    18 +
 types/lodash/fp/isRegExp.d.ts                |    15 +
 types/lodash/fp/isSafeInteger.d.ts           |    32 +
 types/lodash/fp/isSet.d.ts                   |    15 +
 types/lodash/fp/isString.d.ts                |    15 +
 types/lodash/fp/isSymbol.d.ts                |    23 +
 types/lodash/fp/isTypedArray.d.ts            |    15 +
 types/lodash/fp/isUndefined.d.ts             |    15 +
 types/lodash/fp/isWeakMap.d.ts               |    15 +
 types/lodash/fp/isWeakSet.d.ts               |    15 +
 types/lodash/fp/iteratee.d.ts                |    65 +
 types/lodash/fp/join.d.ts                    |    53 +
 types/lodash/fp/juxt.d.ts                    |    18 +
 types/lodash/fp/kebabCase.d.ts               |    15 +
 types/lodash/fp/keyBy.d.ts                   |   225 +
 types/lodash/fp/keys.d.ts                    |    17 +
 types/lodash/fp/keysIn.d.ts                  |    17 +
 types/lodash/fp/last.d.ts                    |    17 +
 types/lodash/fp/lastIndexOf.d.ts             |    58 +
 types/lodash/fp/lastIndexOfFrom.d.ts         |    96 +
 types/lodash/fp/lowerCase.d.ts               |    15 +
 types/lodash/fp/lowerFirst.d.ts              |    15 +
 types/lodash/fp/lt.d.ts                      |    51 +
 types/lodash/fp/lte.d.ts                     |    51 +
 types/lodash/fp/map.d.ts                     |   588 +
 types/lodash/fp/mapKeys.d.ts                 |   105 +
 types/lodash/fp/mapValues.d.ts               |   603 +
 types/lodash/fp/matches.d.ts                 |   116 +
 types/lodash/fp/matchesProperty.d.ts         |    90 +
 types/lodash/fp/max.d.ts                     |    19 +
 types/lodash/fp/maxBy.d.ts                   |   118 +
 types/lodash/fp/mean.d.ts                    |    22 +
 types/lodash/fp/meanBy.d.ts                  |    78 +
 types/lodash/fp/memoize.d.ts                 |    21 +
 types/lodash/fp/merge.d.ts                   |   151 +
 types/lodash/fp/mergeAll.d.ts                |    36 +
 types/lodash/fp/mergeAllWith.d.ts            |   183 +
 types/lodash/fp/mergeWith.d.ts               |   321 +
 types/lodash/fp/method.d.ts                  |    19 +
 types/lodash/fp/methodOf.d.ts                |    19 +
 types/lodash/fp/min.d.ts                     |    19 +
 types/lodash/fp/minBy.d.ts                   |   118 +
 types/lodash/fp/multiply.d.ts                |    46 +
 types/lodash/fp/nAry.d.ts                    |    51 +
 types/lodash/fp/negate.d.ts                  |    16 +
 types/lodash/fp/noConflict.d.ts              |    16 +
 types/lodash/fp/noop.d.ts                    |    14 +
 types/lodash/fp/now.d.ts                     |    14 +
 types/lodash/fp/nth.d.ts                     |    53 +
 types/lodash/fp/nthArg.d.ts                  |    15 +
 types/lodash/fp/omit.d.ts                    |   132 +
 types/lodash/fp/omitAll.d.ts                 |   132 +
 types/lodash/fp/omitBy.d.ts                  |    98 +
 types/lodash/fp/once.d.ts                    |    16 +
 types/lodash/fp/orderBy.d.ts                 |   461 +
 types/lodash/fp/over.d.ts                    |    18 +
 types/lodash/fp/overArgs.d.ts                |    58 +
 types/lodash/fp/overEvery.d.ts               |    18 +
 types/lodash/fp/overSome.d.ts                |    18 +
 types/lodash/fp/pad.d.ts                     |    61 +
 types/lodash/fp/padChars.d.ts                |   103 +
 types/lodash/fp/padCharsEnd.d.ts             |   103 +
 types/lodash/fp/padCharsStart.d.ts           |   103 +
 types/lodash/fp/padEnd.d.ts                  |    61 +
 types/lodash/fp/padStart.d.ts                |    61 +
 types/lodash/fp/parseInt.d.ts                |    66 +
 types/lodash/fp/partial.d.ts                 |    56 +
 types/lodash/fp/partialRight.d.ts            |    51 +
 types/lodash/fp/partition.d.ts               |   133 +
 types/lodash/fp/path.d.ts                    |   207 +
 types/lodash/fp/pathEq.d.ts                  |    90 +
 types/lodash/fp/pathOr.d.ts                  |   313 +
 types/lodash/fp/paths.d.ts                   |    96 +
 types/lodash/fp/pick.d.ts                    |   159 +
 types/lodash/fp/pickAll.d.ts                 |   159 +
 types/lodash/fp/pickBy.d.ts                  |    93 +
 types/lodash/fp/pipe.d.ts                    |   355 +
 types/lodash/fp/pluck.d.ts                   |   588 +
 types/lodash/fp/prop.d.ts                    |   207 +
 types/lodash/fp/propEq.d.ts                  |    90 +
 types/lodash/fp/propOr.d.ts                  |   313 +
 types/lodash/fp/property.d.ts                |   207 +
 types/lodash/fp/propertyOf.d.ts              |   207 +
 types/lodash/fp/props.d.ts                   |    96 +
 types/lodash/fp/pull.d.ts                    |    83 +
 types/lodash/fp/pullAll.d.ts                 |   139 +
 types/lodash/fp/pullAllBy.d.ts               |   502 +
 types/lodash/fp/pullAllWith.d.ts             |   502 +
 types/lodash/fp/pullAt.d.ts                  |    90 +
 types/lodash/fp/random.d.ts                  |    66 +
 types/lodash/fp/range.d.ts                   |    66 +
 types/lodash/fp/rangeRight.d.ts              |   176 +
 types/lodash/fp/rangeStep.d.ts               |   112 +
 types/lodash/fp/rangeStepRight.d.ts          |   310 +
 types/lodash/fp/rearg.d.ts                   |    58 +
 types/lodash/fp/reduce.d.ts                  |   223 +
 types/lodash/fp/reduceRight.d.ts             |   172 +
 types/lodash/fp/reject.d.ts                  |   115 +
 types/lodash/fp/remove.d.ts                  |   118 +
 types/lodash/fp/repeat.d.ts                  |    51 +
 types/lodash/fp/replace.d.ts                 |    87 +
 types/lodash/fp/rest.d.ts                    |    19 +
 types/lodash/fp/restFrom.d.ts                |    66 +
 types/lodash/fp/result.d.ts                  |    63 +
 types/lodash/fp/reverse.d.ts                 |    30 +
 types/lodash/fp/round.d.ts                   |    16 +
 types/lodash/fp/runInContext.d.ts            |    17 +
 types/lodash/fp/sample.d.ts                  |    25 +
 types/lodash/fp/sampleSize.d.ts              |    69 +
 types/lodash/fp/set.d.ts                     |   147 +
 types/lodash/fp/setWith.d.ts                 |   233 +
 types/lodash/fp/shuffle.d.ts                 |    25 +
 types/lodash/fp/size.d.ts                    |    16 +
 types/lodash/fp/slice.d.ts                   |    96 +
 types/lodash/fp/snakeCase.d.ts               |    15 +
 types/lodash/fp/some.d.ts                    |    67 +
 types/lodash/fp/sortBy.d.ts                  |   205 +
 types/lodash/fp/sortedIndex.d.ts             |    98 +
 types/lodash/fp/sortedIndexBy.d.ts           |   213 +
 types/lodash/fp/sortedIndexOf.d.ts           |    83 +
 types/lodash/fp/sortedLastIndex.d.ts         |    88 +
 types/lodash/fp/sortedLastIndexBy.d.ts       |   168 +
 types/lodash/fp/sortedLastIndexOf.d.ts       |    83 +
 types/lodash/fp/sortedUniq.d.ts              |    23 +
 types/lodash/fp/sortedUniqBy.d.ts            |   141 +
 types/lodash/fp/split.d.ts                   |    66 +
 types/lodash/fp/spread.d.ts                  |    18 +
 types/lodash/fp/spreadFrom.d.ts              |    61 +
 types/lodash/fp/startCase.d.ts               |    15 +
 types/lodash/fp/startsWith.d.ts              |    56 +
 types/lodash/fp/stubArray.d.ts               |    14 +
 types/lodash/fp/stubFalse.d.ts               |    14 +
 types/lodash/fp/stubObject.d.ts              |    14 +
 types/lodash/fp/stubString.d.ts              |    14 +
 types/lodash/fp/stubTrue.d.ts                |    14 +
 types/lodash/fp/subtract.d.ts                |    76 +
 types/lodash/fp/sum.d.ts                     |    22 +
 types/lodash/fp/sumBy.d.ts                   |   118 +
 types/lodash/fp/symmetricDifference.d.ts     |    48 +
 types/lodash/fp/symmetricDifferenceBy.d.ts   |   186 +
 types/lodash/fp/symmetricDifferenceWith.d.ts |   177 +
 types/lodash/fp/tail.d.ts                    |    17 +
 types/lodash/fp/take.d.ts                    |    53 +
 types/lodash/fp/takeLast.d.ts                |    53 +
 types/lodash/fp/takeLastWhile.d.ts           |   108 +
 types/lodash/fp/takeRight.d.ts               |    53 +
 types/lodash/fp/takeRightWhile.d.ts          |   108 +
 types/lodash/fp/takeWhile.d.ts               |   108 +
 types/lodash/fp/tap.d.ts                     |    66 +
 types/lodash/fp/template.d.ts                |    37 +
 types/lodash/fp/throttle.d.ts                |    98 +
 types/lodash/fp/thru.d.ts                    |    56 +
 types/lodash/fp/times.d.ts                   |    56 +
 types/lodash/fp/toArray.d.ts                 |    32 +
 types/lodash/fp/toFinite.d.ts                |    30 +
 types/lodash/fp/toInteger.d.ts               |    31 +
 types/lodash/fp/toLength.d.ts                |    32 +
 types/lodash/fp/toLower.d.ts                 |    15 +
 types/lodash/fp/toNumber.d.ts                |    29 +
 types/lodash/fp/toPairs.d.ts                 |    25 +
 types/lodash/fp/toPairsIn.d.ts               |    25 +
 types/lodash/fp/toPath.d.ts                  |    32 +
 types/lodash/fp/toPlainObject.d.ts           |    16 +
 types/lodash/fp/toSafeInteger.d.ts           |    30 +
 types/lodash/fp/toString.d.ts                |    27 +
 types/lodash/fp/toUpper.d.ts                 |    15 +
 types/lodash/fp/transform.d.ts               |   240 +
 types/lodash/fp/trim.d.ts                    |    16 +
 types/lodash/fp/trimChars.d.ts               |    51 +
 types/lodash/fp/trimCharsEnd.d.ts            |    51 +
 types/lodash/fp/trimCharsStart.d.ts          |    51 +
 types/lodash/fp/trimEnd.d.ts                 |    16 +
 types/lodash/fp/trimStart.d.ts               |    16 +
 types/lodash/fp/truncate.d.ts                |    58 +
 types/lodash/fp/unapply.d.ts                 |    19 +
 types/lodash/fp/unary.d.ts                   |    21 +
 types/lodash/fp/unescape.d.ts                |    19 +
 types/lodash/fp/union.d.ts                   |    53 +
 types/lodash/fp/unionBy.d.ts                 |   105 +
 types/lodash/fp/unionWith.d.ts               |   177 +
 types/lodash/fp/uniq.d.ts                    |    25 +
 types/lodash/fp/uniqBy.d.ts                  |   186 +
 types/lodash/fp/uniqWith.d.ts                |    98 +
 types/lodash/fp/uniqueId.d.ts                |    15 +
 types/lodash/fp/unnest.d.ts                  |    17 +
 types/lodash/fp/unset.d.ts                   |    63 +
 types/lodash/fp/unzip.d.ts                   |    18 +
 types/lodash/fp/unzipWith.d.ts               |    68 +
 types/lodash/fp/update.d.ts                  |   105 +
 types/lodash/fp/updateWith.d.ts              |   431 +
 types/lodash/fp/upperCase.d.ts               |    15 +
 types/lodash/fp/upperFirst.d.ts              |    15 +
 types/lodash/fp/useWith.d.ts                 |    58 +
 types/lodash/fp/values.d.ts                  |    32 +
 types/lodash/fp/valuesIn.d.ts                |    25 +
 types/lodash/fp/where.d.ts                   |    48 +
 types/lodash/fp/whereEq.d.ts                 |   116 +
 types/lodash/fp/without.d.ts                 |    53 +
 types/lodash/fp/words.d.ts                   |    16 +
 types/lodash/fp/wrap.d.ts                    |   103 +
 types/lodash/fp/xor.d.ts                     |    48 +
 types/lodash/fp/xorBy.d.ts                   |   186 +
 types/lodash/fp/xorWith.d.ts                 |   177 +
 types/lodash/fp/zip.d.ts                     |    53 +
 types/lodash/fp/zipAll.d.ts                  |    18 +
 types/lodash/fp/zipObj.d.ts                  |    58 +
 types/lodash/fp/zipObject.d.ts               |    58 +
 types/lodash/fp/zipObjectDeep.d.ts           |    53 +
 types/lodash/fp/zipWith.d.ts                 |   105 +
 types/lodash/lodash-tests.ts                 | 17341 +++++------------
 types/lodash/readme.md                       |    62 +
 types/lodash/scripts/generate-all.sh         |     1 +
 types/lodash/scripts/generate-fp.ts          |   841 +
 types/lodash/scripts/package.json            |    14 +
 types/lodash/scripts/tsconfig.json           |    14 +-
 types/lodash/tsconfig.json                   |   403 +-
 types/lodash/tslint.json                     |    12 +-
 405 files changed, 43339 insertions(+), 12394 deletions(-)
 create mode 100644 types/lodash/fp.d.ts
 create mode 100644 types/lodash/fp/F.d.ts
 create mode 100644 types/lodash/fp/T.d.ts
 create mode 100644 types/lodash/fp/add.d.ts
 create mode 100644 types/lodash/fp/after.d.ts
 create mode 100644 types/lodash/fp/all.d.ts
 create mode 100644 types/lodash/fp/allPass.d.ts
 create mode 100644 types/lodash/fp/always.d.ts
 create mode 100644 types/lodash/fp/any.d.ts
 create mode 100644 types/lodash/fp/anyPass.d.ts
 create mode 100644 types/lodash/fp/apply.d.ts
 create mode 100644 types/lodash/fp/ary.d.ts
 create mode 100644 types/lodash/fp/assign.d.ts
 create mode 100644 types/lodash/fp/assignAll.d.ts
 create mode 100644 types/lodash/fp/assignAllWith.d.ts
 create mode 100644 types/lodash/fp/assignIn.d.ts
 create mode 100644 types/lodash/fp/assignInAll.d.ts
 create mode 100644 types/lodash/fp/assignInAllWith.d.ts
 create mode 100644 types/lodash/fp/assignInWith.d.ts
 create mode 100644 types/lodash/fp/assignWith.d.ts
 create mode 100644 types/lodash/fp/assoc.d.ts
 create mode 100644 types/lodash/fp/assocPath.d.ts
 create mode 100644 types/lodash/fp/at.d.ts
 create mode 100644 types/lodash/fp/attempt.d.ts
 create mode 100644 types/lodash/fp/before.d.ts
 create mode 100644 types/lodash/fp/bind.d.ts
 create mode 100644 types/lodash/fp/bindAll.d.ts
 create mode 100644 types/lodash/fp/bindKey.d.ts
 create mode 100644 types/lodash/fp/camelCase.d.ts
 create mode 100644 types/lodash/fp/capitalize.d.ts
 create mode 100644 types/lodash/fp/castArray.d.ts
 create mode 100644 types/lodash/fp/ceil.d.ts
 create mode 100644 types/lodash/fp/chunk.d.ts
 create mode 100644 types/lodash/fp/clamp.d.ts
 create mode 100644 types/lodash/fp/clone.d.ts
 create mode 100644 types/lodash/fp/cloneDeep.d.ts
 create mode 100644 types/lodash/fp/cloneDeepWith.d.ts
 create mode 100644 types/lodash/fp/cloneWith.d.ts
 create mode 100644 types/lodash/fp/compact.d.ts
 create mode 100644 types/lodash/fp/complement.d.ts
 create mode 100644 types/lodash/fp/compose.d.ts
 create mode 100644 types/lodash/fp/concat.d.ts
 create mode 100644 types/lodash/fp/cond.d.ts
 create mode 100644 types/lodash/fp/conforms.d.ts
 create mode 100644 types/lodash/fp/conformsTo.d.ts
 create mode 100644 types/lodash/fp/constant.d.ts
 create mode 100644 types/lodash/fp/contains.d.ts
 create mode 100644 types/lodash/fp/convert.d.ts
 create mode 100644 types/lodash/fp/countBy.d.ts
 create mode 100644 types/lodash/fp/create.d.ts
 create mode 100644 types/lodash/fp/curry.d.ts
 create mode 100644 types/lodash/fp/curryN.d.ts
 create mode 100644 types/lodash/fp/curryRight.d.ts
 create mode 100644 types/lodash/fp/curryRightN.d.ts
 create mode 100644 types/lodash/fp/debounce.d.ts
 create mode 100644 types/lodash/fp/deburr.d.ts
 create mode 100644 types/lodash/fp/defaultTo.d.ts
 create mode 100644 types/lodash/fp/defaults.d.ts
 create mode 100644 types/lodash/fp/defaultsAll.d.ts
 create mode 100644 types/lodash/fp/defaultsDeep.d.ts
 create mode 100644 types/lodash/fp/defaultsDeepAll.d.ts
 create mode 100644 types/lodash/fp/defer.d.ts
 create mode 100644 types/lodash/fp/delay.d.ts
 create mode 100644 types/lodash/fp/difference.d.ts
 create mode 100644 types/lodash/fp/differenceBy.d.ts
 create mode 100644 types/lodash/fp/differenceWith.d.ts
 create mode 100644 types/lodash/fp/dissoc.d.ts
 create mode 100644 types/lodash/fp/dissocPath.d.ts
 create mode 100644 types/lodash/fp/divide.d.ts
 create mode 100644 types/lodash/fp/drop.d.ts
 create mode 100644 types/lodash/fp/dropLast.d.ts
 create mode 100644 types/lodash/fp/dropLastWhile.d.ts
 create mode 100644 types/lodash/fp/dropRight.d.ts
 create mode 100644 types/lodash/fp/dropRightWhile.d.ts
 create mode 100644 types/lodash/fp/dropWhile.d.ts
 create mode 100644 types/lodash/fp/each.d.ts
 create mode 100644 types/lodash/fp/eachRight.d.ts
 create mode 100644 types/lodash/fp/endsWith.d.ts
 create mode 100644 types/lodash/fp/entries.d.ts
 create mode 100644 types/lodash/fp/entriesIn.d.ts
 create mode 100644 types/lodash/fp/eq.d.ts
 create mode 100644 types/lodash/fp/equals.d.ts
 create mode 100644 types/lodash/fp/escape.d.ts
 create mode 100644 types/lodash/fp/escapeRegExp.d.ts
 create mode 100644 types/lodash/fp/every.d.ts
 create mode 100644 types/lodash/fp/extend.d.ts
 create mode 100644 types/lodash/fp/extendAll.d.ts
 create mode 100644 types/lodash/fp/extendAllWith.d.ts
 create mode 100644 types/lodash/fp/extendWith.d.ts
 create mode 100644 types/lodash/fp/fill.d.ts
 create mode 100644 types/lodash/fp/filter.d.ts
 create mode 100644 types/lodash/fp/find.d.ts
 create mode 100644 types/lodash/fp/findFrom.d.ts
 create mode 100644 types/lodash/fp/findIndex.d.ts
 create mode 100644 types/lodash/fp/findIndexFrom.d.ts
 create mode 100644 types/lodash/fp/findKey.d.ts
 create mode 100644 types/lodash/fp/findLast.d.ts
 create mode 100644 types/lodash/fp/findLastFrom.d.ts
 create mode 100644 types/lodash/fp/findLastIndex.d.ts
 create mode 100644 types/lodash/fp/findLastIndexFrom.d.ts
 create mode 100644 types/lodash/fp/findLastKey.d.ts
 create mode 100644 types/lodash/fp/first.d.ts
 create mode 100644 types/lodash/fp/flatMap.d.ts
 create mode 100644 types/lodash/fp/flatMapDeep.d.ts
 create mode 100644 types/lodash/fp/flatMapDepth.d.ts
 create mode 100644 types/lodash/fp/flatten.d.ts
 create mode 100644 types/lodash/fp/flattenDeep.d.ts
 create mode 100644 types/lodash/fp/flattenDepth.d.ts
 create mode 100644 types/lodash/fp/flip.d.ts
 create mode 100644 types/lodash/fp/floor.d.ts
 create mode 100644 types/lodash/fp/flow.d.ts
 create mode 100644 types/lodash/fp/flowRight.d.ts
 create mode 100644 types/lodash/fp/forEach.d.ts
 create mode 100644 types/lodash/fp/forEachRight.d.ts
 create mode 100644 types/lodash/fp/forIn.d.ts
 create mode 100644 types/lodash/fp/forInRight.d.ts
 create mode 100644 types/lodash/fp/forOwn.d.ts
 create mode 100644 types/lodash/fp/forOwnRight.d.ts
 create mode 100644 types/lodash/fp/fromPairs.d.ts
 create mode 100644 types/lodash/fp/functions.d.ts
 create mode 100644 types/lodash/fp/functionsIn.d.ts
 create mode 100644 types/lodash/fp/get.d.ts
 create mode 100644 types/lodash/fp/getOr.d.ts
 create mode 100644 types/lodash/fp/groupBy.d.ts
 create mode 100644 types/lodash/fp/gt.d.ts
 create mode 100644 types/lodash/fp/gte.d.ts
 create mode 100644 types/lodash/fp/has.d.ts
 create mode 100644 types/lodash/fp/hasIn.d.ts
 create mode 100644 types/lodash/fp/head.d.ts
 create mode 100644 types/lodash/fp/identical.d.ts
 create mode 100644 types/lodash/fp/identity.d.ts
 create mode 100644 types/lodash/fp/inRange.d.ts
 create mode 100644 types/lodash/fp/includes.d.ts
 create mode 100644 types/lodash/fp/includesFrom.d.ts
 create mode 100644 types/lodash/fp/indexBy.d.ts
 create mode 100644 types/lodash/fp/indexOf.d.ts
 create mode 100644 types/lodash/fp/indexOfFrom.d.ts
 create mode 100644 types/lodash/fp/init.d.ts
 create mode 100644 types/lodash/fp/initial.d.ts
 create mode 100644 types/lodash/fp/intersection.d.ts
 create mode 100644 types/lodash/fp/intersectionBy.d.ts
 create mode 100644 types/lodash/fp/intersectionWith.d.ts
 create mode 100644 types/lodash/fp/invert.d.ts
 create mode 100644 types/lodash/fp/invertBy.d.ts
 create mode 100644 types/lodash/fp/invertObj.d.ts
 create mode 100644 types/lodash/fp/invoke.d.ts
 create mode 100644 types/lodash/fp/invokeArgs.d.ts
 create mode 100644 types/lodash/fp/invokeArgsMap.d.ts
 create mode 100644 types/lodash/fp/invokeMap.d.ts
 create mode 100644 types/lodash/fp/isArguments.d.ts
 create mode 100644 types/lodash/fp/isArray.d.ts
 create mode 100644 types/lodash/fp/isArrayBuffer.d.ts
 create mode 100644 types/lodash/fp/isArrayLike.d.ts
 create mode 100644 types/lodash/fp/isArrayLikeObject.d.ts
 create mode 100644 types/lodash/fp/isBoolean.d.ts
 create mode 100644 types/lodash/fp/isBuffer.d.ts
 create mode 100644 types/lodash/fp/isDate.d.ts
 create mode 100644 types/lodash/fp/isElement.d.ts
 create mode 100644 types/lodash/fp/isEmpty.d.ts
 create mode 100644 types/lodash/fp/isEqual.d.ts
 create mode 100644 types/lodash/fp/isEqualWith.d.ts
 create mode 100644 types/lodash/fp/isError.d.ts
 create mode 100644 types/lodash/fp/isFinite.d.ts
 create mode 100644 types/lodash/fp/isFunction.d.ts
 create mode 100644 types/lodash/fp/isInteger.d.ts
 create mode 100644 types/lodash/fp/isLength.d.ts
 create mode 100644 types/lodash/fp/isMap.d.ts
 create mode 100644 types/lodash/fp/isMatch.d.ts
 create mode 100644 types/lodash/fp/isMatchWith.d.ts
 create mode 100644 types/lodash/fp/isNaN.d.ts
 create mode 100644 types/lodash/fp/isNative.d.ts
 create mode 100644 types/lodash/fp/isNil.d.ts
 create mode 100644 types/lodash/fp/isNull.d.ts
 create mode 100644 types/lodash/fp/isNumber.d.ts
 create mode 100644 types/lodash/fp/isObject.d.ts
 create mode 100644 types/lodash/fp/isObjectLike.d.ts
 create mode 100644 types/lodash/fp/isPlainObject.d.ts
 create mode 100644 types/lodash/fp/isRegExp.d.ts
 create mode 100644 types/lodash/fp/isSafeInteger.d.ts
 create mode 100644 types/lodash/fp/isSet.d.ts
 create mode 100644 types/lodash/fp/isString.d.ts
 create mode 100644 types/lodash/fp/isSymbol.d.ts
 create mode 100644 types/lodash/fp/isTypedArray.d.ts
 create mode 100644 types/lodash/fp/isUndefined.d.ts
 create mode 100644 types/lodash/fp/isWeakMap.d.ts
 create mode 100644 types/lodash/fp/isWeakSet.d.ts
 create mode 100644 types/lodash/fp/iteratee.d.ts
 create mode 100644 types/lodash/fp/join.d.ts
 create mode 100644 types/lodash/fp/juxt.d.ts
 create mode 100644 types/lodash/fp/kebabCase.d.ts
 create mode 100644 types/lodash/fp/keyBy.d.ts
 create mode 100644 types/lodash/fp/keys.d.ts
 create mode 100644 types/lodash/fp/keysIn.d.ts
 create mode 100644 types/lodash/fp/last.d.ts
 create mode 100644 types/lodash/fp/lastIndexOf.d.ts
 create mode 100644 types/lodash/fp/lastIndexOfFrom.d.ts
 create mode 100644 types/lodash/fp/lowerCase.d.ts
 create mode 100644 types/lodash/fp/lowerFirst.d.ts
 create mode 100644 types/lodash/fp/lt.d.ts
 create mode 100644 types/lodash/fp/lte.d.ts
 create mode 100644 types/lodash/fp/map.d.ts
 create mode 100644 types/lodash/fp/mapKeys.d.ts
 create mode 100644 types/lodash/fp/mapValues.d.ts
 create mode 100644 types/lodash/fp/matches.d.ts
 create mode 100644 types/lodash/fp/matchesProperty.d.ts
 create mode 100644 types/lodash/fp/max.d.ts
 create mode 100644 types/lodash/fp/maxBy.d.ts
 create mode 100644 types/lodash/fp/mean.d.ts
 create mode 100644 types/lodash/fp/meanBy.d.ts
 create mode 100644 types/lodash/fp/memoize.d.ts
 create mode 100644 types/lodash/fp/merge.d.ts
 create mode 100644 types/lodash/fp/mergeAll.d.ts
 create mode 100644 types/lodash/fp/mergeAllWith.d.ts
 create mode 100644 types/lodash/fp/mergeWith.d.ts
 create mode 100644 types/lodash/fp/method.d.ts
 create mode 100644 types/lodash/fp/methodOf.d.ts
 create mode 100644 types/lodash/fp/min.d.ts
 create mode 100644 types/lodash/fp/minBy.d.ts
 create mode 100644 types/lodash/fp/multiply.d.ts
 create mode 100644 types/lodash/fp/nAry.d.ts
 create mode 100644 types/lodash/fp/negate.d.ts
 create mode 100644 types/lodash/fp/noConflict.d.ts
 create mode 100644 types/lodash/fp/noop.d.ts
 create mode 100644 types/lodash/fp/now.d.ts
 create mode 100644 types/lodash/fp/nth.d.ts
 create mode 100644 types/lodash/fp/nthArg.d.ts
 create mode 100644 types/lodash/fp/omit.d.ts
 create mode 100644 types/lodash/fp/omitAll.d.ts
 create mode 100644 types/lodash/fp/omitBy.d.ts
 create mode 100644 types/lodash/fp/once.d.ts
 create mode 100644 types/lodash/fp/orderBy.d.ts
 create mode 100644 types/lodash/fp/over.d.ts
 create mode 100644 types/lodash/fp/overArgs.d.ts
 create mode 100644 types/lodash/fp/overEvery.d.ts
 create mode 100644 types/lodash/fp/overSome.d.ts
 create mode 100644 types/lodash/fp/pad.d.ts
 create mode 100644 types/lodash/fp/padChars.d.ts
 create mode 100644 types/lodash/fp/padCharsEnd.d.ts
 create mode 100644 types/lodash/fp/padCharsStart.d.ts
 create mode 100644 types/lodash/fp/padEnd.d.ts
 create mode 100644 types/lodash/fp/padStart.d.ts
 create mode 100644 types/lodash/fp/parseInt.d.ts
 create mode 100644 types/lodash/fp/partial.d.ts
 create mode 100644 types/lodash/fp/partialRight.d.ts
 create mode 100644 types/lodash/fp/partition.d.ts
 create mode 100644 types/lodash/fp/path.d.ts
 create mode 100644 types/lodash/fp/pathEq.d.ts
 create mode 100644 types/lodash/fp/pathOr.d.ts
 create mode 100644 types/lodash/fp/paths.d.ts
 create mode 100644 types/lodash/fp/pick.d.ts
 create mode 100644 types/lodash/fp/pickAll.d.ts
 create mode 100644 types/lodash/fp/pickBy.d.ts
 create mode 100644 types/lodash/fp/pipe.d.ts
 create mode 100644 types/lodash/fp/pluck.d.ts
 create mode 100644 types/lodash/fp/prop.d.ts
 create mode 100644 types/lodash/fp/propEq.d.ts
 create mode 100644 types/lodash/fp/propOr.d.ts
 create mode 100644 types/lodash/fp/property.d.ts
 create mode 100644 types/lodash/fp/propertyOf.d.ts
 create mode 100644 types/lodash/fp/props.d.ts
 create mode 100644 types/lodash/fp/pull.d.ts
 create mode 100644 types/lodash/fp/pullAll.d.ts
 create mode 100644 types/lodash/fp/pullAllBy.d.ts
 create mode 100644 types/lodash/fp/pullAllWith.d.ts
 create mode 100644 types/lodash/fp/pullAt.d.ts
 create mode 100644 types/lodash/fp/random.d.ts
 create mode 100644 types/lodash/fp/range.d.ts
 create mode 100644 types/lodash/fp/rangeRight.d.ts
 create mode 100644 types/lodash/fp/rangeStep.d.ts
 create mode 100644 types/lodash/fp/rangeStepRight.d.ts
 create mode 100644 types/lodash/fp/rearg.d.ts
 create mode 100644 types/lodash/fp/reduce.d.ts
 create mode 100644 types/lodash/fp/reduceRight.d.ts
 create mode 100644 types/lodash/fp/reject.d.ts
 create mode 100644 types/lodash/fp/remove.d.ts
 create mode 100644 types/lodash/fp/repeat.d.ts
 create mode 100644 types/lodash/fp/replace.d.ts
 create mode 100644 types/lodash/fp/rest.d.ts
 create mode 100644 types/lodash/fp/restFrom.d.ts
 create mode 100644 types/lodash/fp/result.d.ts
 create mode 100644 types/lodash/fp/reverse.d.ts
 create mode 100644 types/lodash/fp/round.d.ts
 create mode 100644 types/lodash/fp/runInContext.d.ts
 create mode 100644 types/lodash/fp/sample.d.ts
 create mode 100644 types/lodash/fp/sampleSize.d.ts
 create mode 100644 types/lodash/fp/set.d.ts
 create mode 100644 types/lodash/fp/setWith.d.ts
 create mode 100644 types/lodash/fp/shuffle.d.ts
 create mode 100644 types/lodash/fp/size.d.ts
 create mode 100644 types/lodash/fp/slice.d.ts
 create mode 100644 types/lodash/fp/snakeCase.d.ts
 create mode 100644 types/lodash/fp/some.d.ts
 create mode 100644 types/lodash/fp/sortBy.d.ts
 create mode 100644 types/lodash/fp/sortedIndex.d.ts
 create mode 100644 types/lodash/fp/sortedIndexBy.d.ts
 create mode 100644 types/lodash/fp/sortedIndexOf.d.ts
 create mode 100644 types/lodash/fp/sortedLastIndex.d.ts
 create mode 100644 types/lodash/fp/sortedLastIndexBy.d.ts
 create mode 100644 types/lodash/fp/sortedLastIndexOf.d.ts
 create mode 100644 types/lodash/fp/sortedUniq.d.ts
 create mode 100644 types/lodash/fp/sortedUniqBy.d.ts
 create mode 100644 types/lodash/fp/split.d.ts
 create mode 100644 types/lodash/fp/spread.d.ts
 create mode 100644 types/lodash/fp/spreadFrom.d.ts
 create mode 100644 types/lodash/fp/startCase.d.ts
 create mode 100644 types/lodash/fp/startsWith.d.ts
 create mode 100644 types/lodash/fp/stubArray.d.ts
 create mode 100644 types/lodash/fp/stubFalse.d.ts
 create mode 100644 types/lodash/fp/stubObject.d.ts
 create mode 100644 types/lodash/fp/stubString.d.ts
 create mode 100644 types/lodash/fp/stubTrue.d.ts
 create mode 100644 types/lodash/fp/subtract.d.ts
 create mode 100644 types/lodash/fp/sum.d.ts
 create mode 100644 types/lodash/fp/sumBy.d.ts
 create mode 100644 types/lodash/fp/symmetricDifference.d.ts
 create mode 100644 types/lodash/fp/symmetricDifferenceBy.d.ts
 create mode 100644 types/lodash/fp/symmetricDifferenceWith.d.ts
 create mode 100644 types/lodash/fp/tail.d.ts
 create mode 100644 types/lodash/fp/take.d.ts
 create mode 100644 types/lodash/fp/takeLast.d.ts
 create mode 100644 types/lodash/fp/takeLastWhile.d.ts
 create mode 100644 types/lodash/fp/takeRight.d.ts
 create mode 100644 types/lodash/fp/takeRightWhile.d.ts
 create mode 100644 types/lodash/fp/takeWhile.d.ts
 create mode 100644 types/lodash/fp/tap.d.ts
 create mode 100644 types/lodash/fp/template.d.ts
 create mode 100644 types/lodash/fp/throttle.d.ts
 create mode 100644 types/lodash/fp/thru.d.ts
 create mode 100644 types/lodash/fp/times.d.ts
 create mode 100644 types/lodash/fp/toArray.d.ts
 create mode 100644 types/lodash/fp/toFinite.d.ts
 create mode 100644 types/lodash/fp/toInteger.d.ts
 create mode 100644 types/lodash/fp/toLength.d.ts
 create mode 100644 types/lodash/fp/toLower.d.ts
 create mode 100644 types/lodash/fp/toNumber.d.ts
 create mode 100644 types/lodash/fp/toPairs.d.ts
 create mode 100644 types/lodash/fp/toPairsIn.d.ts
 create mode 100644 types/lodash/fp/toPath.d.ts
 create mode 100644 types/lodash/fp/toPlainObject.d.ts
 create mode 100644 types/lodash/fp/toSafeInteger.d.ts
 create mode 100644 types/lodash/fp/toString.d.ts
 create mode 100644 types/lodash/fp/toUpper.d.ts
 create mode 100644 types/lodash/fp/transform.d.ts
 create mode 100644 types/lodash/fp/trim.d.ts
 create mode 100644 types/lodash/fp/trimChars.d.ts
 create mode 100644 types/lodash/fp/trimCharsEnd.d.ts
 create mode 100644 types/lodash/fp/trimCharsStart.d.ts
 create mode 100644 types/lodash/fp/trimEnd.d.ts
 create mode 100644 types/lodash/fp/trimStart.d.ts
 create mode 100644 types/lodash/fp/truncate.d.ts
 create mode 100644 types/lodash/fp/unapply.d.ts
 create mode 100644 types/lodash/fp/unary.d.ts
 create mode 100644 types/lodash/fp/unescape.d.ts
 create mode 100644 types/lodash/fp/union.d.ts
 create mode 100644 types/lodash/fp/unionBy.d.ts
 create mode 100644 types/lodash/fp/unionWith.d.ts
 create mode 100644 types/lodash/fp/uniq.d.ts
 create mode 100644 types/lodash/fp/uniqBy.d.ts
 create mode 100644 types/lodash/fp/uniqWith.d.ts
 create mode 100644 types/lodash/fp/uniqueId.d.ts
 create mode 100644 types/lodash/fp/unnest.d.ts
 create mode 100644 types/lodash/fp/unset.d.ts
 create mode 100644 types/lodash/fp/unzip.d.ts
 create mode 100644 types/lodash/fp/unzipWith.d.ts
 create mode 100644 types/lodash/fp/update.d.ts
 create mode 100644 types/lodash/fp/updateWith.d.ts
 create mode 100644 types/lodash/fp/upperCase.d.ts
 create mode 100644 types/lodash/fp/upperFirst.d.ts
 create mode 100644 types/lodash/fp/useWith.d.ts
 create mode 100644 types/lodash/fp/values.d.ts
 create mode 100644 types/lodash/fp/valuesIn.d.ts
 create mode 100644 types/lodash/fp/where.d.ts
 create mode 100644 types/lodash/fp/whereEq.d.ts
 create mode 100644 types/lodash/fp/without.d.ts
 create mode 100644 types/lodash/fp/words.d.ts
 create mode 100644 types/lodash/fp/wrap.d.ts
 create mode 100644 types/lodash/fp/xor.d.ts
 create mode 100644 types/lodash/fp/xorBy.d.ts
 create mode 100644 types/lodash/fp/xorWith.d.ts
 create mode 100644 types/lodash/fp/zip.d.ts
 create mode 100644 types/lodash/fp/zipAll.d.ts
 create mode 100644 types/lodash/fp/zipObj.d.ts
 create mode 100644 types/lodash/fp/zipObject.d.ts
 create mode 100644 types/lodash/fp/zipObjectDeep.d.ts
 create mode 100644 types/lodash/fp/zipWith.d.ts
 create mode 100644 types/lodash/readme.md
 create mode 100644 types/lodash/scripts/generate-fp.ts
 create mode 100644 types/lodash/scripts/package.json

diff --git a/types/lodash/common/array.d.ts b/types/lodash/common/array.d.ts
index f70fbbf135..49f93aa313 100644
--- a/types/lodash/common/array.d.ts
+++ b/types/lodash/common/array.d.ts
@@ -916,27 +916,15 @@ declare module "../index" {
 
     interface LoDashStatic {
         /**
-         * Flattens a nested array. If isDeep is true the array is recursively flattened, otherwise it’s only
-         * flattened a single level.
+         * Flattens `array` a single level deep.
          *
          * @param array The array to flatten.
-         * @param isDeep Specify a deep flatten.
          * @return Returns the new flattened array.
          */
-        flatten<T>(array: ListOfRecursiveArraysOrValues<T> | null | undefined, isDeep: boolean): T[];
-
-        /**
-         * @see _.flatten
-         */
         flatten<T>(array: List<Many<T>> | null | undefined): T[];
     }
 
     interface LoDashImplicitWrapper<TValue> {
-        /**
-         * @see _.flatten
-         */
-        flatten<T>(this: LoDashImplicitWrapper<ListOfRecursiveArraysOrValues<T> | null | undefined>, isDeep: boolean): LoDashImplicitWrapper<T[]>;
-
         /**
          * @see _.flatten
          */
@@ -944,11 +932,6 @@ declare module "../index" {
     }
 
     interface LoDashExplicitWrapper<TValue> {
-        /**
-         * @see _.flatten
-         */
-        flatten<T>(this: LoDashExplicitWrapper<ListOfRecursiveArraysOrValues<T> | null | undefined>, isDeep: boolean): LoDashExplicitWrapper<T[]>;
-
         /**
          * @see _.flatten
          */
@@ -1102,8 +1085,7 @@ declare module "../index" {
          * Gets the index at which the first occurrence of `value` is found in `array`
          * using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
          * for equality comparisons. If `fromIndex` is negative, it's used as the offset
-         * from the end of `array`. If `array` is sorted providing `true` for `fromIndex`
-         * performs a faster binary search.
+         * from the end of `array`.
          *
          * @category Array
          * @param array The array to search.
@@ -1122,7 +1104,7 @@ declare module "../index" {
         indexOf<T>(
             array: List<T> | null | undefined,
             value: T,
-            fromIndex?: boolean|number
+            fromIndex?: number
         ): number;
     }
 
@@ -1133,7 +1115,7 @@ declare module "../index" {
         indexOf<T>(
             this: LoDashImplicitWrapper<List<T> | null | undefined>,
             value: T,
-            fromIndex?: boolean|number
+            fromIndex?: number
         ): number;
     }
 
@@ -1144,7 +1126,7 @@ declare module "../index" {
         indexOf<T>(
             this: LoDashExplicitWrapper<List<T> | null | undefined>,
             value: T,
-            fromIndex?: boolean|number
+            fromIndex?: number
         ): LoDashExplicitWrapper<number>;
     }
 
@@ -3463,7 +3445,7 @@ declare module "../index" {
         /**
          * @see _.zip
          */
-        zip<T>(...arrays: Array<List<T> | null | undefined>): (T | undefined)[][];
+        zip<T>(...arrays: Array<List<T> | null | undefined>): Array<Array<T | undefined>>;
     }
 
     interface LoDashImplicitWrapper<TValue> {
@@ -3842,4 +3824,4 @@ declare module "../index" {
             ...iteratee: Array<((...group: T[]) => TResult) | List<T> | null | undefined>
         ): LoDashExplicitWrapper<TResult[]>;
     }
-}
\ No newline at end of file
+}
diff --git a/types/lodash/common/collection.d.ts b/types/lodash/common/collection.d.ts
index c8b2770610..3c7e65d38f 100644
--- a/types/lodash/common/collection.d.ts
+++ b/types/lodash/common/collection.d.ts
@@ -516,13 +516,13 @@ declare module "../index" {
 
     interface LoDashStatic {
         /**
-        * This method is like _.find except that it iterates over elements of a collection from
-        * right to left.
-        * @param collection Searches for a value in this list.
-        * @param predicate The function called per iteration.
-        * @param fromIndex The index to search from.
-        * @return The found element, else undefined.
-        **/
+         * This method is like _.find except that it iterates over elements of a collection from
+         * right to left.
+         * @param collection Searches for a value in this list.
+         * @param predicate The function called per iteration.
+         * @param fromIndex The index to search from.
+         * @return The found element, else undefined.
+         */
         findLast<T, S extends T>(
             collection: List<T> | null | undefined,
             predicate: ListIteratorTypeGuard<T, S>,
@@ -2720,4 +2720,4 @@ declare module "../index" {
             ...iteratees: Array<Many<ObjectIteratee<T>>>
         ): LoDashExplicitWrapper<Array<T[keyof T]>>;
     }
-}
\ No newline at end of file
+}
diff --git a/types/lodash/common/common.d.ts b/types/lodash/common/common.d.ts
index 468019ea53..17d5e04b36 100644
--- a/types/lodash/common/common.d.ts
+++ b/types/lodash/common/common.d.ts
@@ -1,4 +1,5 @@
 import _ = require("../index");
+// tslint:disable-next-line:strict-export-declare-modifiers
 type GlobalPartial<T> = Partial<T>;
 declare module "../index" {
     type PartialObject<T> = GlobalPartial<T>;
@@ -86,7 +87,6 @@ declare module "../index" {
         templateSettings: TemplateSettings;
     }
 
-
     /**
     * By default, the template delimiters used by Lo-Dash are similar to those in embedded Ruby
     * (ERB). Change the following template settings to use alternative delimiters.
@@ -193,17 +193,23 @@ declare module "../index" {
 
     type StringIterator<TResult> = (char: string, index: number, string: string) => TResult;
 
+    /** @deprecated Use MemoVoidArrayIterator or MemoVoidDictionaryIterator instead. */
     type MemoVoidIterator<T, TResult> = (prev: TResult, curr: T, indexOrKey: any, list: T[]) => void;
 
-    /** @deprecated Use MemoListIterator or MemoObjectIterator instead.  */
+    /** @deprecated Use MemoListIterator or MemoObjectIterator instead. */
     type MemoIterator<T, TResult> = (prev: TResult, curr: T, indexOrKey: any, list: T[]) => TResult;
     type MemoListIterator<T, TResult, TList> = (prev: TResult, curr: T, index: number, list: TList) => TResult;
     type MemoObjectIterator<T, TResult, TList> = (prev: TResult, curr: T, key: string, list: TList) => TResult;
+    type MemoIteratorCapped<T, TResult> = (prev: TResult, curr: T) => TResult;
+    type MemoIteratorCappedRight<T, TResult> = (curr: T, prev: TResult) => TResult;
 
     type MemoVoidArrayIterator<T, TResult> = (acc: TResult, curr: T, index: number, arr: T[]) => void;
     type MemoVoidDictionaryIterator<T, TResult> = (acc: TResult, curr: T, key: string, dict: Dictionary<T>) => void;
+    type MemoVoidIteratorCapped<T, TResult> = (acc: TResult, curr: T) => void;
 
     type ValueIteratee<T> = ((value: T) => NotVoid) | string | [string, any] | PartialDeep<T>;
+    type ValueIterateeCustom<T, TResult> = ((value: T) => TResult) | string | [string, any] | PartialDeep<T>;
+    type ValueIteratorTypeGuard<T, S extends T> = (value: T) => value is S;
     type ValueKeyIteratee<T> = ((value: T, key: string) => NotVoid) | string | [string, any] | PartialDeep<T>;
     type Comparator<T> = (a: T, b: T) => boolean;
     type Comparator2<T1, T2> = (a: T1, b: T2) => boolean;
diff --git a/types/lodash/common/date.d.ts b/types/lodash/common/date.d.ts
index e460de4e1a..79131e4560 100644
--- a/types/lodash/common/date.d.ts
+++ b/types/lodash/common/date.d.ts
@@ -24,4 +24,4 @@ declare module "../index" {
          */
         now(): LoDashExplicitWrapper<number>;
     }
-}
\ No newline at end of file
+}
diff --git a/types/lodash/common/function.d.ts b/types/lodash/common/function.d.ts
index b51fa6c625..31055a2781 100644
--- a/types/lodash/common/function.d.ts
+++ b/types/lodash/common/function.d.ts
@@ -667,30 +667,30 @@ declare module "../index" {
     // flip
 
     interface LoDashStatic {
-       /**
-        * Creates a function that invokes `func` with arguments reversed.
-        *
-        * @category Function
-        * @param func The function to flip arguments for.
-        * @returns Returns the new function.
-        * @example
-        *
-        * var flipped = _.flip(function() {
-        *   return _.toArray(arguments);
-        * });
-        *
-        * flipped('a', 'b', 'c', 'd');
-        * // => ['d', 'c', 'b', 'a']
-        */
-       flip<T extends (...args: any[]) => any>(func: T): T;
-   }
+        /**
+         * Creates a function that invokes `func` with arguments reversed.
+         *
+         * @category Function
+         * @param func The function to flip arguments for.
+         * @returns Returns the new function.
+         * @example
+         *
+         * var flipped = _.flip(function() {
+         *   return _.toArray(arguments);
+         * });
+         *
+         * flipped('a', 'b', 'c', 'd');
+         * // => ['d', 'c', 'b', 'a']
+         */
+        flip<T extends (...args: any[]) => any>(func: T): T;
+    }
 
-   interface LoDashWrapper<TValue> {
-       /**
-        * @see _.flip
-        */
-       flip(): this;
-   }
+    interface LoDashWrapper<TValue> {
+        /**
+         * @see _.flip
+         */
+        flip(): this;
+    }
 
     // memoize
 
@@ -771,34 +771,34 @@ declare module "../index" {
 
     // overArgs
 
-   interface LoDashStatic {
-       /**
-        * Creates a function that runs each argument through a corresponding transform function.
-        *
-        * @param func The function to wrap.
-        * @param transforms The functions to transform arguments, specified as individual functions or arrays
-        * of functions.
-        * @return Returns the new function.
-        */
-       overArgs(
-           func: (...args: any[]) => any,
-           ...transforms: Array<Many<(...args: any[]) => any>>
-       ): (...args: any[]) => any;
-   }
+    interface LoDashStatic {
+        /**
+         * Creates a function that runs each argument through a corresponding transform function.
+         *
+         * @param func The function to wrap.
+         * @param transforms The functions to transform arguments, specified as individual functions or arrays
+         * of functions.
+         * @return Returns the new function.
+         */
+        overArgs(
+            func: (...args: any[]) => any,
+            ...transforms: Array<Many<(...args: any[]) => any>>
+        ): (...args: any[]) => any;
+    }
 
-   interface LoDashImplicitWrapper<TValue> {
-       /**
-        * @see _.overArgs
-        */
-       overArgs(...transforms: Array<Many<(...args: any[]) => any>>): LoDashImplicitWrapper<(...args: any[]) => any>;
-   }
+    interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.overArgs
+         */
+        overArgs(...transforms: Array<Many<(...args: any[]) => any>>): LoDashImplicitWrapper<(...args: any[]) => any>;
+    }
 
-   interface LoDashExplicitWrapper<TValue> {
-       /**
-        * @see _.overArgs
-        */
-       overArgs(...transforms: Array<Many<(...args: any[]) => any>>): LoDashExplicitWrapper<(...args: any[]) => any>;
-   }
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.overArgs
+         */
+        overArgs(...transforms: Array<Many<(...args: any[]) => any>>): LoDashExplicitWrapper<(...args: any[]) => any>;
+    }
 
     // partial
 
@@ -1364,4 +1364,4 @@ declare module "../index" {
             wrapper: (value: TValue, ...args: any[]) => TResult
         ): LoDashExplicitWrapper<(...args: any[]) => TResult>;
     }
-}
\ No newline at end of file
+}
diff --git a/types/lodash/common/lang.d.ts b/types/lodash/common/lang.d.ts
index 43393ab4b6..9afe554b28 100644
--- a/types/lodash/common/lang.d.ts
+++ b/types/lodash/common/lang.d.ts
@@ -210,7 +210,6 @@ declare module "../index" {
 
     // conformsTo
 
-
     interface LoDashStatic {
         /**
          * Checks if object conforms to source by invoking the predicate properties of source with the
@@ -233,11 +232,11 @@ declare module "../index" {
         /**
          * @see _.conformsTo
          */
-        conformsTo<T>(this: LoDashImplicitWrapper<T>, source: ConformsPredicateObject<T>): LoDashExplicitWrapper<boolean>;
+        conformsTo<T>(this: LoDashExplicitWrapper<T>, source: ConformsPredicateObject<T>): LoDashExplicitWrapper<boolean>;
         // Note: we can't use TValue here,  because it generates a typescript error when strictFunctionTypes is enabled.
     }
 
-    type CondPair<T, R> = [(val: T) => boolean, (val: T) => R]
+    type CondPair<T, R> = [(val: T) => boolean, (val: T) => R];
 
     // eq
 
@@ -1934,4 +1933,4 @@ declare module "../index" {
          */
         toString(value: any): string;
     }
-}
\ No newline at end of file
+}
diff --git a/types/lodash/common/math.d.ts b/types/lodash/common/math.d.ts
index a0af6114b5..b38a7df970 100644
--- a/types/lodash/common/math.d.ts
+++ b/types/lodash/common/math.d.ts
@@ -529,8 +529,4 @@ declare module "../index" {
             iteratee?: ((value: T) => number) | string
         ): LoDashExplicitWrapper<number>;
     }
-
-    /**********
-     * Number *
-     **********/
-}
\ No newline at end of file
+}
diff --git a/types/lodash/common/number.d.ts b/types/lodash/common/number.d.ts
index 3e6a945855..7da1cab03a 100644
--- a/types/lodash/common/number.d.ts
+++ b/types/lodash/common/number.d.ts
@@ -175,8 +175,4 @@ declare module "../index" {
             floating?: boolean
         ): LoDashExplicitWrapper<number>;
     }
-
-    /**********
-     * Object *
-     **********/
-}
\ No newline at end of file
+}
diff --git a/types/lodash/common/object.d.ts b/types/lodash/common/object.d.ts
index 3063072b17..4bedba42ae 100644
--- a/types/lodash/common/object.d.ts
+++ b/types/lodash/common/object.d.ts
@@ -2281,7 +2281,7 @@ declare module "../index" {
          * TODO: This would be better if we had a separate overload for obj: NumericDictionary that returned a NumericDictionary,
          *       but TypeScript cannot select overload signatures based on number vs string index key type.
          */
-        mapValues<T, TResult>(obj: Dictionary<T> | NumericDictionary<T> | null | undefined, callback: ObjectIterator<Dictionary<T>, TResult>): Dictionary<TResult>;
+        mapValues<T, TResult>(obj: Dictionary<T> | NumericDictionary<T> | null | undefined, callback: DictionaryIterator<T, TResult>): Dictionary<TResult>;
 
         /**
          * @see _.mapValues
@@ -2358,7 +2358,7 @@ declare module "../index" {
          */
         mapValues<T, TResult>(
             this: LoDashImplicitWrapper<Dictionary<T> | NumericDictionary<T> | null | undefined>,
-            callback: ObjectIterator<Dictionary<T>, TResult>
+            callback: DictionaryIterator<T, TResult>
         ): LoDashImplicitWrapper<Dictionary<TResult>>;
 
         /**
@@ -2454,7 +2454,7 @@ declare module "../index" {
          */
         mapValues<T, TResult>(
             this: LoDashExplicitWrapper<Dictionary<T> | NumericDictionary<T> | null | undefined>,
-            callback: ObjectIterator<Dictionary<T>, TResult>
+            callback: DictionaryIterator<T, TResult>
         ): LoDashExplicitWrapper<Dictionary<TResult>>;
 
         /**
@@ -2680,6 +2680,10 @@ declare module "../index" {
          * @see _.merge
          */
         merge<TSource1, TSource2, TSource3, TSource4>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            source4: TSource4
         ): LoDashExplicitWrapper<TValue & TSource1 & TSource2 & TSource3 & TSource4>;
 
         /**
@@ -2692,7 +2696,7 @@ declare module "../index" {
 
     // mergeWith
 
-    type MergeWithCustomizer = { bivariantHack(value: any, srcValue: any, key: string, object: any, source: any): any; }["bivariantHack"]
+    type MergeWithCustomizer = { bivariantHack(value: any, srcValue: any, key: string, object: any, source: any): any; }["bivariantHack"];
 
     interface LoDashStatic {
         /**
@@ -2823,6 +2827,53 @@ declare module "../index" {
         ): LoDashImplicitWrapper<any>;
     }
 
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.mergeWith
+         */
+        mergeWith<TSource>(
+            source: TSource,
+            customizer: MergeWithCustomizer
+        ): LoDashExplicitWrapper<TValue & TSource>;
+
+        /**
+         * @see _.mergeWith
+         */
+        mergeWith<TSource1, TSource2>(
+            source1: TSource1,
+            source2: TSource2,
+            customizer: MergeWithCustomizer
+        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2>;
+
+        /**
+         * @see _.mergeWith
+         */
+        mergeWith<TSource1, TSource2, TSource3>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            customizer: MergeWithCustomizer
+        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2 & TSource3>;
+
+        /**
+         * @see _.mergeWith
+         */
+        mergeWith<TSource1, TSource2, TSource3, TSource4>(
+            source1: TSource1,
+            source2: TSource2,
+            source3: TSource3,
+            source4: TSource4,
+            customizer: MergeWithCustomizer
+        ): LoDashExplicitWrapper<TValue & TSource1 & TSource2 & TSource3 & TSource4>;
+
+        /**
+         * @see _.mergeWith
+         */
+        mergeWith(
+            ...otherArgs: any[]
+        ): LoDashExplicitWrapper<any>;
+    }
+
     // omit
 
     interface LoDashStatic {
@@ -3719,4 +3770,4 @@ declare module "../index" {
          */
         valuesIn<T extends object>(this: LoDashExplicitWrapper<T | null | undefined>): LoDashExplicitWrapper<Array<T[keyof T]>>;
     }
-}
\ No newline at end of file
+}
diff --git a/types/lodash/common/seq.d.ts b/types/lodash/common/seq.d.ts
index f3139056cd..22a7a14746 100644
--- a/types/lodash/common/seq.d.ts
+++ b/types/lodash/common/seq.d.ts
@@ -195,4 +195,4 @@ declare module "../index" {
          */
         thru<TResult>(interceptor: (value: TValue) => TResult): LoDashExplicitWrapper<TResult>;
     }
-}
\ No newline at end of file
+}
diff --git a/types/lodash/common/string.d.ts b/types/lodash/common/string.d.ts
index 436a2bb9f1..d940406d0d 100644
--- a/types/lodash/common/string.d.ts
+++ b/types/lodash/common/string.d.ts
@@ -1056,4 +1056,4 @@ declare module "../index" {
          */
         words(pattern?: string|RegExp): LoDashExplicitWrapper<string[]>;
     }
-}
\ No newline at end of file
+}
diff --git a/types/lodash/common/util.d.ts b/types/lodash/common/util.d.ts
index e365750018..69fbc42cc0 100644
--- a/types/lodash/common/util.d.ts
+++ b/types/lodash/common/util.d.ts
@@ -584,9 +584,17 @@ declare module "../index" {
          * // => [{ 'user': 'fred', 'age': 40 }]
          */
         iteratee<TFunction extends (...args: any[]) => any>(
-            func: TFunction | string | object
+            func: TFunction
         ): TFunction;
 
+        /**
+         * @see _.iteratee
+         */
+        // tslint:disable-next-line:unified-signatures Tests fail in TS2.3 if the overloads are joined
+        iteratee(
+            func: string | object
+        ): (...args: any[]) => any;
+
         /**
          * @see _.iteratee
          */
@@ -1452,4 +1460,4 @@ declare module "../index" {
          */
         uniqueId(): LoDashExplicitWrapper<string>;
     }
-}
\ No newline at end of file
+}
diff --git a/types/lodash/fp.d.ts b/types/lodash/fp.d.ts
new file mode 100644
index 0000000000..783a56a98f
--- /dev/null
+++ b/types/lodash/fp.d.ts
@@ -0,0 +1,790 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import add = require("./fp/add");
+import after = require("./fp/after");
+import all = require("./fp/all");
+import allPass = require("./fp/allPass");
+import always = require("./fp/always");
+import any = require("./fp/any");
+import anyPass = require("./fp/anyPass");
+import apply = require("./fp/apply");
+import ary = require("./fp/ary");
+import assign = require("./fp/assign");
+import assignAll = require("./fp/assignAll");
+import assignAllWith = require("./fp/assignAllWith");
+import assignIn = require("./fp/assignIn");
+import assignInAll = require("./fp/assignInAll");
+import assignInAllWith = require("./fp/assignInAllWith");
+import assignInWith = require("./fp/assignInWith");
+import assignWith = require("./fp/assignWith");
+import assoc = require("./fp/assoc");
+import assocPath = require("./fp/assocPath");
+import at = require("./fp/at");
+import attempt = require("./fp/attempt");
+import before = require("./fp/before");
+import bind = require("./fp/bind");
+import bindAll = require("./fp/bindAll");
+import bindKey = require("./fp/bindKey");
+import camelCase = require("./fp/camelCase");
+import capitalize = require("./fp/capitalize");
+import castArray = require("./fp/castArray");
+import ceil = require("./fp/ceil");
+import chunk = require("./fp/chunk");
+import clamp = require("./fp/clamp");
+import clone = require("./fp/clone");
+import cloneDeep = require("./fp/cloneDeep");
+import cloneDeepWith = require("./fp/cloneDeepWith");
+import cloneWith = require("./fp/cloneWith");
+import compact = require("./fp/compact");
+import complement = require("./fp/complement");
+import compose = require("./fp/compose");
+import concat = require("./fp/concat");
+import cond = require("./fp/cond");
+import conforms = require("./fp/conforms");
+import conformsTo = require("./fp/conformsTo");
+import constant = require("./fp/constant");
+import contains = require("./fp/contains");
+import countBy = require("./fp/countBy");
+import create = require("./fp/create");
+import curry = require("./fp/curry");
+import curryN = require("./fp/curryN");
+import curryRight = require("./fp/curryRight");
+import curryRightN = require("./fp/curryRightN");
+import debounce = require("./fp/debounce");
+import deburr = require("./fp/deburr");
+import defaults = require("./fp/defaults");
+import defaultsAll = require("./fp/defaultsAll");
+import defaultsDeep = require("./fp/defaultsDeep");
+import defaultsDeepAll = require("./fp/defaultsDeepAll");
+import defaultTo = require("./fp/defaultTo");
+import defer = require("./fp/defer");
+import delay = require("./fp/delay");
+import difference = require("./fp/difference");
+import differenceBy = require("./fp/differenceBy");
+import differenceWith = require("./fp/differenceWith");
+import dissoc = require("./fp/dissoc");
+import dissocPath = require("./fp/dissocPath");
+import divide = require("./fp/divide");
+import drop = require("./fp/drop");
+import dropLast = require("./fp/dropLast");
+import dropLastWhile = require("./fp/dropLastWhile");
+import dropRight = require("./fp/dropRight");
+import dropRightWhile = require("./fp/dropRightWhile");
+import dropWhile = require("./fp/dropWhile");
+import each = require("./fp/each");
+import eachRight = require("./fp/eachRight");
+import endsWith = require("./fp/endsWith");
+import entries = require("./fp/entries");
+import entriesIn = require("./fp/entriesIn");
+import eq = require("./fp/eq");
+import equals = require("./fp/equals");
+import escape = require("./fp/escape");
+import escapeRegExp = require("./fp/escapeRegExp");
+import every = require("./fp/every");
+import extend = require("./fp/extend");
+import extendAll = require("./fp/extendAll");
+import extendAllWith = require("./fp/extendAllWith");
+import extendWith = require("./fp/extendWith");
+import F = require("./fp/F");
+import fill = require("./fp/fill");
+import filter = require("./fp/filter");
+import find = require("./fp/find");
+import findFrom = require("./fp/findFrom");
+import findIndex = require("./fp/findIndex");
+import findIndexFrom = require("./fp/findIndexFrom");
+import findKey = require("./fp/findKey");
+import findLast = require("./fp/findLast");
+import findLastFrom = require("./fp/findLastFrom");
+import findLastIndex = require("./fp/findLastIndex");
+import findLastIndexFrom = require("./fp/findLastIndexFrom");
+import findLastKey = require("./fp/findLastKey");
+import first = require("./fp/first");
+import flatMap = require("./fp/flatMap");
+import flatMapDeep = require("./fp/flatMapDeep");
+import flatMapDepth = require("./fp/flatMapDepth");
+import flatten = require("./fp/flatten");
+import flattenDeep = require("./fp/flattenDeep");
+import flattenDepth = require("./fp/flattenDepth");
+import flip = require("./fp/flip");
+import floor = require("./fp/floor");
+import flow = require("./fp/flow");
+import flowRight = require("./fp/flowRight");
+import forEach = require("./fp/forEach");
+import forEachRight = require("./fp/forEachRight");
+import forIn = require("./fp/forIn");
+import forInRight = require("./fp/forInRight");
+import forOwn = require("./fp/forOwn");
+import forOwnRight = require("./fp/forOwnRight");
+import fromPairs = require("./fp/fromPairs");
+import functions = require("./fp/functions");
+import functionsIn = require("./fp/functionsIn");
+import get = require("./fp/get");
+import getOr = require("./fp/getOr");
+import groupBy = require("./fp/groupBy");
+import gt = require("./fp/gt");
+import gte = require("./fp/gte");
+import has = require("./fp/has");
+import hasIn = require("./fp/hasIn");
+import head = require("./fp/head");
+import identical = require("./fp/identical");
+import identity = require("./fp/identity");
+import includes = require("./fp/includes");
+import includesFrom = require("./fp/includesFrom");
+import indexBy = require("./fp/indexBy");
+import indexOf = require("./fp/indexOf");
+import indexOfFrom = require("./fp/indexOfFrom");
+import init = require("./fp/init");
+import initial = require("./fp/initial");
+import inRange = require("./fp/inRange");
+import intersection = require("./fp/intersection");
+import intersectionBy = require("./fp/intersectionBy");
+import intersectionWith = require("./fp/intersectionWith");
+import invert = require("./fp/invert");
+import invertBy = require("./fp/invertBy");
+import invertObj = require("./fp/invertObj");
+import invoke = require("./fp/invoke");
+import invokeArgs = require("./fp/invokeArgs");
+import invokeArgsMap = require("./fp/invokeArgsMap");
+import invokeMap = require("./fp/invokeMap");
+import isArguments = require("./fp/isArguments");
+import isArray = require("./fp/isArray");
+import isArrayBuffer = require("./fp/isArrayBuffer");
+import isArrayLike = require("./fp/isArrayLike");
+import isArrayLikeObject = require("./fp/isArrayLikeObject");
+import isBoolean = require("./fp/isBoolean");
+import isBuffer = require("./fp/isBuffer");
+import isDate = require("./fp/isDate");
+import isElement = require("./fp/isElement");
+import isEmpty = require("./fp/isEmpty");
+import isEqual = require("./fp/isEqual");
+import isEqualWith = require("./fp/isEqualWith");
+import isError = require("./fp/isError");
+import isFinite = require("./fp/isFinite");
+import isFunction = require("./fp/isFunction");
+import isInteger = require("./fp/isInteger");
+import isLength = require("./fp/isLength");
+import isMap = require("./fp/isMap");
+import isMatch = require("./fp/isMatch");
+import isMatchWith = require("./fp/isMatchWith");
+import isNaN = require("./fp/isNaN");
+import isNative = require("./fp/isNative");
+import isNil = require("./fp/isNil");
+import isNull = require("./fp/isNull");
+import isNumber = require("./fp/isNumber");
+import isObject = require("./fp/isObject");
+import isObjectLike = require("./fp/isObjectLike");
+import isPlainObject = require("./fp/isPlainObject");
+import isRegExp = require("./fp/isRegExp");
+import isSafeInteger = require("./fp/isSafeInteger");
+import isSet = require("./fp/isSet");
+import isString = require("./fp/isString");
+import isSymbol = require("./fp/isSymbol");
+import isTypedArray = require("./fp/isTypedArray");
+import isUndefined = require("./fp/isUndefined");
+import isWeakMap = require("./fp/isWeakMap");
+import isWeakSet = require("./fp/isWeakSet");
+import iteratee = require("./fp/iteratee");
+import join = require("./fp/join");
+import juxt = require("./fp/juxt");
+import kebabCase = require("./fp/kebabCase");
+import keyBy = require("./fp/keyBy");
+import keys = require("./fp/keys");
+import keysIn = require("./fp/keysIn");
+import last = require("./fp/last");
+import lastIndexOf = require("./fp/lastIndexOf");
+import lastIndexOfFrom = require("./fp/lastIndexOfFrom");
+import lowerCase = require("./fp/lowerCase");
+import lowerFirst = require("./fp/lowerFirst");
+import lt = require("./fp/lt");
+import lte = require("./fp/lte");
+import map = require("./fp/map");
+import mapKeys = require("./fp/mapKeys");
+import mapValues = require("./fp/mapValues");
+import matches = require("./fp/matches");
+import matchesProperty = require("./fp/matchesProperty");
+import max = require("./fp/max");
+import maxBy = require("./fp/maxBy");
+import mean = require("./fp/mean");
+import meanBy = require("./fp/meanBy");
+import memoize = require("./fp/memoize");
+import merge = require("./fp/merge");
+import mergeAll = require("./fp/mergeAll");
+import mergeAllWith = require("./fp/mergeAllWith");
+import mergeWith = require("./fp/mergeWith");
+import method = require("./fp/method");
+import methodOf = require("./fp/methodOf");
+import min = require("./fp/min");
+import minBy = require("./fp/minBy");
+import multiply = require("./fp/multiply");
+import nAry = require("./fp/nAry");
+import negate = require("./fp/negate");
+import noConflict = require("./fp/noConflict");
+import noop = require("./fp/noop");
+import now = require("./fp/now");
+import nth = require("./fp/nth");
+import nthArg = require("./fp/nthArg");
+import omit = require("./fp/omit");
+import omitAll = require("./fp/omitAll");
+import omitBy = require("./fp/omitBy");
+import once = require("./fp/once");
+import orderBy = require("./fp/orderBy");
+import over = require("./fp/over");
+import overArgs = require("./fp/overArgs");
+import overEvery = require("./fp/overEvery");
+import overSome = require("./fp/overSome");
+import pad = require("./fp/pad");
+import padChars = require("./fp/padChars");
+import padCharsEnd = require("./fp/padCharsEnd");
+import padCharsStart = require("./fp/padCharsStart");
+import padEnd = require("./fp/padEnd");
+import padStart = require("./fp/padStart");
+import parseInt = require("./fp/parseInt");
+import partial = require("./fp/partial");
+import partialRight = require("./fp/partialRight");
+import partition = require("./fp/partition");
+import path = require("./fp/path");
+import pathEq = require("./fp/pathEq");
+import pathOr = require("./fp/pathOr");
+import paths = require("./fp/paths");
+import pick = require("./fp/pick");
+import pickAll = require("./fp/pickAll");
+import pickBy = require("./fp/pickBy");
+import pipe = require("./fp/pipe");
+import pluck = require("./fp/pluck");
+import prop = require("./fp/prop");
+import propEq = require("./fp/propEq");
+import property = require("./fp/property");
+import propertyOf = require("./fp/propertyOf");
+import propOr = require("./fp/propOr");
+import props = require("./fp/props");
+import pull = require("./fp/pull");
+import pullAll = require("./fp/pullAll");
+import pullAllBy = require("./fp/pullAllBy");
+import pullAllWith = require("./fp/pullAllWith");
+import pullAt = require("./fp/pullAt");
+import random = require("./fp/random");
+import range = require("./fp/range");
+import rangeRight = require("./fp/rangeRight");
+import rangeStep = require("./fp/rangeStep");
+import rangeStepRight = require("./fp/rangeStepRight");
+import rearg = require("./fp/rearg");
+import reduce = require("./fp/reduce");
+import reduceRight = require("./fp/reduceRight");
+import reject = require("./fp/reject");
+import remove = require("./fp/remove");
+import repeat = require("./fp/repeat");
+import replace = require("./fp/replace");
+import rest = require("./fp/rest");
+import restFrom = require("./fp/restFrom");
+import result = require("./fp/result");
+import reverse = require("./fp/reverse");
+import round = require("./fp/round");
+import runInContext = require("./fp/runInContext");
+import sample = require("./fp/sample");
+import sampleSize = require("./fp/sampleSize");
+import set = require("./fp/set");
+import setWith = require("./fp/setWith");
+import shuffle = require("./fp/shuffle");
+import size = require("./fp/size");
+import slice = require("./fp/slice");
+import snakeCase = require("./fp/snakeCase");
+import some = require("./fp/some");
+import sortBy = require("./fp/sortBy");
+import sortedIndex = require("./fp/sortedIndex");
+import sortedIndexBy = require("./fp/sortedIndexBy");
+import sortedIndexOf = require("./fp/sortedIndexOf");
+import sortedLastIndex = require("./fp/sortedLastIndex");
+import sortedLastIndexBy = require("./fp/sortedLastIndexBy");
+import sortedLastIndexOf = require("./fp/sortedLastIndexOf");
+import sortedUniq = require("./fp/sortedUniq");
+import sortedUniqBy = require("./fp/sortedUniqBy");
+import split = require("./fp/split");
+import spread = require("./fp/spread");
+import spreadFrom = require("./fp/spreadFrom");
+import startCase = require("./fp/startCase");
+import startsWith = require("./fp/startsWith");
+import stubArray = require("./fp/stubArray");
+import stubFalse = require("./fp/stubFalse");
+import stubObject = require("./fp/stubObject");
+import stubString = require("./fp/stubString");
+import stubTrue = require("./fp/stubTrue");
+import subtract = require("./fp/subtract");
+import sum = require("./fp/sum");
+import sumBy = require("./fp/sumBy");
+import symmetricDifference = require("./fp/symmetricDifference");
+import symmetricDifferenceBy = require("./fp/symmetricDifferenceBy");
+import symmetricDifferenceWith = require("./fp/symmetricDifferenceWith");
+import T = require("./fp/T");
+import tail = require("./fp/tail");
+import take = require("./fp/take");
+import takeLast = require("./fp/takeLast");
+import takeLastWhile = require("./fp/takeLastWhile");
+import takeRight = require("./fp/takeRight");
+import takeRightWhile = require("./fp/takeRightWhile");
+import takeWhile = require("./fp/takeWhile");
+import tap = require("./fp/tap");
+import template = require("./fp/template");
+import throttle = require("./fp/throttle");
+import thru = require("./fp/thru");
+import times = require("./fp/times");
+import toArray = require("./fp/toArray");
+import toFinite = require("./fp/toFinite");
+import toInteger = require("./fp/toInteger");
+import toLength = require("./fp/toLength");
+import toLower = require("./fp/toLower");
+import toNumber = require("./fp/toNumber");
+import toPairs = require("./fp/toPairs");
+import toPairsIn = require("./fp/toPairsIn");
+import toPath = require("./fp/toPath");
+import toPlainObject = require("./fp/toPlainObject");
+import toSafeInteger = require("./fp/toSafeInteger");
+import toString = require("./fp/toString");
+import toUpper = require("./fp/toUpper");
+import transform = require("./fp/transform");
+import trim = require("./fp/trim");
+import trimChars = require("./fp/trimChars");
+import trimCharsEnd = require("./fp/trimCharsEnd");
+import trimCharsStart = require("./fp/trimCharsStart");
+import trimEnd = require("./fp/trimEnd");
+import trimStart = require("./fp/trimStart");
+import truncate = require("./fp/truncate");
+import unapply = require("./fp/unapply");
+import unary = require("./fp/unary");
+import unescape = require("./fp/unescape");
+import union = require("./fp/union");
+import unionBy = require("./fp/unionBy");
+import unionWith = require("./fp/unionWith");
+import uniq = require("./fp/uniq");
+import uniqBy = require("./fp/uniqBy");
+import uniqueId = require("./fp/uniqueId");
+import uniqWith = require("./fp/uniqWith");
+import unnest = require("./fp/unnest");
+import unset = require("./fp/unset");
+import unzip = require("./fp/unzip");
+import unzipWith = require("./fp/unzipWith");
+import update = require("./fp/update");
+import updateWith = require("./fp/updateWith");
+import upperCase = require("./fp/upperCase");
+import upperFirst = require("./fp/upperFirst");
+import useWith = require("./fp/useWith");
+import values = require("./fp/values");
+import valuesIn = require("./fp/valuesIn");
+import where = require("./fp/where");
+import whereEq = require("./fp/whereEq");
+import without = require("./fp/without");
+import words = require("./fp/words");
+import wrap = require("./fp/wrap");
+import xor = require("./fp/xor");
+import xorBy = require("./fp/xorBy");
+import xorWith = require("./fp/xorWith");
+import zip = require("./fp/zip");
+import zipAll = require("./fp/zipAll");
+import zipObj = require("./fp/zipObj");
+import zipObject = require("./fp/zipObject");
+import zipObjectDeep = require("./fp/zipObjectDeep");
+import zipWith = require("./fp/zipWith");
+
+export = _;
+
+declare const _: _.LoDashFp;
+declare namespace _ {
+    interface LoDashFp {
+        add: typeof add;
+        after: typeof after;
+        all: typeof all;
+        allPass: typeof allPass;
+        always: typeof always;
+        any: typeof any;
+        anyPass: typeof anyPass;
+        apply: typeof apply;
+        ary: typeof ary;
+        assign: typeof assign;
+        assignAll: typeof assignAll;
+        assignAllWith: typeof assignAllWith;
+        assignIn: typeof assignIn;
+        assignInAll: typeof assignInAll;
+        assignInAllWith: typeof assignInAllWith;
+        assignInWith: typeof assignInWith;
+        assignWith: typeof assignWith;
+        assoc: typeof assoc;
+        assocPath: typeof assocPath;
+        at: typeof at;
+        attempt: typeof attempt;
+        before: typeof before;
+        bind: typeof bind;
+        bindAll: typeof bindAll;
+        bindKey: typeof bindKey;
+        camelCase: typeof camelCase;
+        capitalize: typeof capitalize;
+        castArray: typeof castArray;
+        ceil: typeof ceil;
+        chunk: typeof chunk;
+        clamp: typeof clamp;
+        clone: typeof clone;
+        cloneDeep: typeof cloneDeep;
+        cloneDeepWith: typeof cloneDeepWith;
+        cloneWith: typeof cloneWith;
+        compact: typeof compact;
+        complement: typeof complement;
+        compose: typeof compose;
+        concat: typeof concat;
+        cond: typeof cond;
+        conforms: typeof conforms;
+        conformsTo: typeof conformsTo;
+        constant: typeof constant;
+        contains: typeof contains;
+        countBy: typeof countBy;
+        create: typeof create;
+        curry: typeof curry;
+        curryN: typeof curryN;
+        curryRight: typeof curryRight;
+        curryRightN: typeof curryRightN;
+        debounce: typeof debounce;
+        deburr: typeof deburr;
+        defaults: typeof defaults;
+        defaultsAll: typeof defaultsAll;
+        defaultsDeep: typeof defaultsDeep;
+        defaultsDeepAll: typeof defaultsDeepAll;
+        defaultTo: typeof defaultTo;
+        defer: typeof defer;
+        delay: typeof delay;
+        difference: typeof difference;
+        differenceBy: typeof differenceBy;
+        differenceWith: typeof differenceWith;
+        dissoc: typeof dissoc;
+        dissocPath: typeof dissocPath;
+        divide: typeof divide;
+        drop: typeof drop;
+        dropLast: typeof dropLast;
+        dropLastWhile: typeof dropLastWhile;
+        dropRight: typeof dropRight;
+        dropRightWhile: typeof dropRightWhile;
+        dropWhile: typeof dropWhile;
+        each: typeof each;
+        eachRight: typeof eachRight;
+        endsWith: typeof endsWith;
+        entries: typeof entries;
+        entriesIn: typeof entriesIn;
+        eq: typeof eq;
+        equals: typeof equals;
+        escape: typeof escape;
+        escapeRegExp: typeof escapeRegExp;
+        every: typeof every;
+        extend: typeof extend;
+        extendAll: typeof extendAll;
+        extendAllWith: typeof extendAllWith;
+        extendWith: typeof extendWith;
+        F: typeof F;
+        fill: typeof fill;
+        filter: typeof filter;
+        find: typeof find;
+        findFrom: typeof findFrom;
+        findIndex: typeof findIndex;
+        findIndexFrom: typeof findIndexFrom;
+        findKey: typeof findKey;
+        findLast: typeof findLast;
+        findLastFrom: typeof findLastFrom;
+        findLastIndex: typeof findLastIndex;
+        findLastIndexFrom: typeof findLastIndexFrom;
+        findLastKey: typeof findLastKey;
+        first: typeof first;
+        flatMap: typeof flatMap;
+        flatMapDeep: typeof flatMapDeep;
+        flatMapDepth: typeof flatMapDepth;
+        flatten: typeof flatten;
+        flattenDeep: typeof flattenDeep;
+        flattenDepth: typeof flattenDepth;
+        flip: typeof flip;
+        floor: typeof floor;
+        flow: typeof flow;
+        flowRight: typeof flowRight;
+        forEach: typeof forEach;
+        forEachRight: typeof forEachRight;
+        forIn: typeof forIn;
+        forInRight: typeof forInRight;
+        forOwn: typeof forOwn;
+        forOwnRight: typeof forOwnRight;
+        fromPairs: typeof fromPairs;
+        functions: typeof functions;
+        functionsIn: typeof functionsIn;
+        get: typeof get;
+        getOr: typeof getOr;
+        groupBy: typeof groupBy;
+        gt: typeof gt;
+        gte: typeof gte;
+        has: typeof has;
+        hasIn: typeof hasIn;
+        head: typeof head;
+        identical: typeof identical;
+        identity: typeof identity;
+        includes: typeof includes;
+        includesFrom: typeof includesFrom;
+        indexBy: typeof indexBy;
+        indexOf: typeof indexOf;
+        indexOfFrom: typeof indexOfFrom;
+        init: typeof init;
+        initial: typeof initial;
+        inRange: typeof inRange;
+        intersection: typeof intersection;
+        intersectionBy: typeof intersectionBy;
+        intersectionWith: typeof intersectionWith;
+        invert: typeof invert;
+        invertBy: typeof invertBy;
+        invertObj: typeof invertObj;
+        invoke: typeof invoke;
+        invokeArgs: typeof invokeArgs;
+        invokeArgsMap: typeof invokeArgsMap;
+        invokeMap: typeof invokeMap;
+        isArguments: typeof isArguments;
+        isArray: typeof isArray;
+        isArrayBuffer: typeof isArrayBuffer;
+        isArrayLike: typeof isArrayLike;
+        isArrayLikeObject: typeof isArrayLikeObject;
+        isBoolean: typeof isBoolean;
+        isBuffer: typeof isBuffer;
+        isDate: typeof isDate;
+        isElement: typeof isElement;
+        isEmpty: typeof isEmpty;
+        isEqual: typeof isEqual;
+        isEqualWith: typeof isEqualWith;
+        isError: typeof isError;
+        isFinite: typeof isFinite;
+        isFunction: typeof isFunction;
+        isInteger: typeof isInteger;
+        isLength: typeof isLength;
+        isMap: typeof isMap;
+        isMatch: typeof isMatch;
+        isMatchWith: typeof isMatchWith;
+        isNaN: typeof isNaN;
+        isNative: typeof isNative;
+        isNil: typeof isNil;
+        isNull: typeof isNull;
+        isNumber: typeof isNumber;
+        isObject: typeof isObject;
+        isObjectLike: typeof isObjectLike;
+        isPlainObject: typeof isPlainObject;
+        isRegExp: typeof isRegExp;
+        isSafeInteger: typeof isSafeInteger;
+        isSet: typeof isSet;
+        isString: typeof isString;
+        isSymbol: typeof isSymbol;
+        isTypedArray: typeof isTypedArray;
+        isUndefined: typeof isUndefined;
+        isWeakMap: typeof isWeakMap;
+        isWeakSet: typeof isWeakSet;
+        iteratee: typeof iteratee;
+        join: typeof join;
+        juxt: typeof juxt;
+        kebabCase: typeof kebabCase;
+        keyBy: typeof keyBy;
+        keys: typeof keys;
+        keysIn: typeof keysIn;
+        last: typeof last;
+        lastIndexOf: typeof lastIndexOf;
+        lastIndexOfFrom: typeof lastIndexOfFrom;
+        lowerCase: typeof lowerCase;
+        lowerFirst: typeof lowerFirst;
+        lt: typeof lt;
+        lte: typeof lte;
+        map: typeof map;
+        mapKeys: typeof mapKeys;
+        mapValues: typeof mapValues;
+        matches: typeof matches;
+        matchesProperty: typeof matchesProperty;
+        max: typeof max;
+        maxBy: typeof maxBy;
+        mean: typeof mean;
+        meanBy: typeof meanBy;
+        memoize: typeof memoize;
+        merge: typeof merge;
+        mergeAll: typeof mergeAll;
+        mergeAllWith: typeof mergeAllWith;
+        mergeWith: typeof mergeWith;
+        method: typeof method;
+        methodOf: typeof methodOf;
+        min: typeof min;
+        minBy: typeof minBy;
+        multiply: typeof multiply;
+        nAry: typeof nAry;
+        negate: typeof negate;
+        noConflict: typeof noConflict;
+        noop: typeof noop;
+        now: typeof now;
+        nth: typeof nth;
+        nthArg: typeof nthArg;
+        omit: typeof omit;
+        omitAll: typeof omitAll;
+        omitBy: typeof omitBy;
+        once: typeof once;
+        orderBy: typeof orderBy;
+        over: typeof over;
+        overArgs: typeof overArgs;
+        overEvery: typeof overEvery;
+        overSome: typeof overSome;
+        pad: typeof pad;
+        padChars: typeof padChars;
+        padCharsEnd: typeof padCharsEnd;
+        padCharsStart: typeof padCharsStart;
+        padEnd: typeof padEnd;
+        padStart: typeof padStart;
+        parseInt: typeof parseInt;
+        partial: typeof partial;
+        partialRight: typeof partialRight;
+        partition: typeof partition;
+        path: typeof path;
+        pathEq: typeof pathEq;
+        pathOr: typeof pathOr;
+        paths: typeof paths;
+        pick: typeof pick;
+        pickAll: typeof pickAll;
+        pickBy: typeof pickBy;
+        pipe: typeof pipe;
+        pluck: typeof pluck;
+        prop: typeof prop;
+        propEq: typeof propEq;
+        property: typeof property;
+        propertyOf: typeof propertyOf;
+        propOr: typeof propOr;
+        props: typeof props;
+        pull: typeof pull;
+        pullAll: typeof pullAll;
+        pullAllBy: typeof pullAllBy;
+        pullAllWith: typeof pullAllWith;
+        pullAt: typeof pullAt;
+        random: typeof random;
+        range: typeof range;
+        rangeRight: typeof rangeRight;
+        rangeStep: typeof rangeStep;
+        rangeStepRight: typeof rangeStepRight;
+        rearg: typeof rearg;
+        reduce: typeof reduce;
+        reduceRight: typeof reduceRight;
+        reject: typeof reject;
+        remove: typeof remove;
+        repeat: typeof repeat;
+        replace: typeof replace;
+        rest: typeof rest;
+        restFrom: typeof restFrom;
+        result: typeof result;
+        reverse: typeof reverse;
+        round: typeof round;
+        runInContext: typeof runInContext;
+        sample: typeof sample;
+        sampleSize: typeof sampleSize;
+        set: typeof set;
+        setWith: typeof setWith;
+        shuffle: typeof shuffle;
+        size: typeof size;
+        slice: typeof slice;
+        snakeCase: typeof snakeCase;
+        some: typeof some;
+        sortBy: typeof sortBy;
+        sortedIndex: typeof sortedIndex;
+        sortedIndexBy: typeof sortedIndexBy;
+        sortedIndexOf: typeof sortedIndexOf;
+        sortedLastIndex: typeof sortedLastIndex;
+        sortedLastIndexBy: typeof sortedLastIndexBy;
+        sortedLastIndexOf: typeof sortedLastIndexOf;
+        sortedUniq: typeof sortedUniq;
+        sortedUniqBy: typeof sortedUniqBy;
+        split: typeof split;
+        spread: typeof spread;
+        spreadFrom: typeof spreadFrom;
+        startCase: typeof startCase;
+        startsWith: typeof startsWith;
+        stubArray: typeof stubArray;
+        stubFalse: typeof stubFalse;
+        stubObject: typeof stubObject;
+        stubString: typeof stubString;
+        stubTrue: typeof stubTrue;
+        subtract: typeof subtract;
+        sum: typeof sum;
+        sumBy: typeof sumBy;
+        symmetricDifference: typeof symmetricDifference;
+        symmetricDifferenceBy: typeof symmetricDifferenceBy;
+        symmetricDifferenceWith: typeof symmetricDifferenceWith;
+        T: typeof T;
+        tail: typeof tail;
+        take: typeof take;
+        takeLast: typeof takeLast;
+        takeLastWhile: typeof takeLastWhile;
+        takeRight: typeof takeRight;
+        takeRightWhile: typeof takeRightWhile;
+        takeWhile: typeof takeWhile;
+        tap: typeof tap;
+        template: typeof template;
+        throttle: typeof throttle;
+        thru: typeof thru;
+        times: typeof times;
+        toArray: typeof toArray;
+        toFinite: typeof toFinite;
+        toInteger: typeof toInteger;
+        toLength: typeof toLength;
+        toLower: typeof toLower;
+        toNumber: typeof toNumber;
+        toPairs: typeof toPairs;
+        toPairsIn: typeof toPairsIn;
+        toPath: typeof toPath;
+        toPlainObject: typeof toPlainObject;
+        toSafeInteger: typeof toSafeInteger;
+        toString: typeof toString;
+        toUpper: typeof toUpper;
+        transform: typeof transform;
+        trim: typeof trim;
+        trimChars: typeof trimChars;
+        trimCharsEnd: typeof trimCharsEnd;
+        trimCharsStart: typeof trimCharsStart;
+        trimEnd: typeof trimEnd;
+        trimStart: typeof trimStart;
+        truncate: typeof truncate;
+        unapply: typeof unapply;
+        unary: typeof unary;
+        unescape: typeof unescape;
+        union: typeof union;
+        unionBy: typeof unionBy;
+        unionWith: typeof unionWith;
+        uniq: typeof uniq;
+        uniqBy: typeof uniqBy;
+        uniqueId: typeof uniqueId;
+        uniqWith: typeof uniqWith;
+        unnest: typeof unnest;
+        unset: typeof unset;
+        unzip: typeof unzip;
+        unzipWith: typeof unzipWith;
+        update: typeof update;
+        updateWith: typeof updateWith;
+        upperCase: typeof upperCase;
+        upperFirst: typeof upperFirst;
+        useWith: typeof useWith;
+        values: typeof values;
+        valuesIn: typeof valuesIn;
+        where: typeof where;
+        whereEq: typeof whereEq;
+        without: typeof without;
+        words: typeof words;
+        wrap: typeof wrap;
+        xor: typeof xor;
+        xorBy: typeof xorBy;
+        xorWith: typeof xorWith;
+        zip: typeof zip;
+        zipAll: typeof zipAll;
+        zipObj: typeof zipObj;
+        zipObject: typeof zipObject;
+        zipObjectDeep: typeof zipObjectDeep;
+        zipWith: typeof zipWith;
+    }
+}
+
+// Backward compatibility with --target es5
+declare global {
+    // tslint:disable-next-line:no-empty-interface
+    interface Set<T> { }
+    // tslint:disable-next-line:no-empty-interface
+    interface Map<K, V> { }
+    // tslint:disable-next-line:no-empty-interface
+    interface WeakSet<T> { }
+    // tslint:disable-next-line:no-empty-interface
+    interface WeakMap<K extends object, V> { }
+}
diff --git a/types/lodash/fp/F.d.ts b/types/lodash/fp/F.d.ts
new file mode 100644
index 0000000000..8d7802efd8
--- /dev/null
+++ b/types/lodash/fp/F.d.ts
@@ -0,0 +1,14 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type StubFalse =
+    /**
+     * This method returns `false`.
+     *
+     * @returns Returns `false`.
+     */
+    () => boolean;
+
+declare const F: StubFalse;
+export = F;
diff --git a/types/lodash/fp/T.d.ts b/types/lodash/fp/T.d.ts
new file mode 100644
index 0000000000..ea1dc32ee8
--- /dev/null
+++ b/types/lodash/fp/T.d.ts
@@ -0,0 +1,14 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type StubTrue =
+    /**
+     * This method returns `true`.
+     *
+     * @returns Returns `true`.
+     */
+    () => boolean;
+
+declare const T: StubTrue;
+export = T;
diff --git a/types/lodash/fp/add.d.ts b/types/lodash/fp/add.d.ts
new file mode 100644
index 0000000000..2977814de9
--- /dev/null
+++ b/types/lodash/fp/add.d.ts
@@ -0,0 +1,51 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface Add {
+    /**
+     * Adds two numbers.
+     *
+     * @param augend The first number to add.
+     * @param addend The second number to add.
+     * @return Returns the sum.
+     */
+    (): Add;
+    /**
+     * Adds two numbers.
+     *
+     * @param augend The first number to add.
+     * @param addend The second number to add.
+     * @return Returns the sum.
+     */
+    (augend: number): Add1x1;
+    /**
+     * Adds two numbers.
+     *
+     * @param augend The first number to add.
+     * @param addend The second number to add.
+     * @return Returns the sum.
+     */
+    (augend: number, addend: number): number;
+}
+interface Add1x1 {
+    /**
+     * Adds two numbers.
+     *
+     * @param augend The first number to add.
+     * @param addend The second number to add.
+     * @return Returns the sum.
+     */
+    (): Add1x1;
+    /**
+     * Adds two numbers.
+     *
+     * @param augend The first number to add.
+     * @param addend The second number to add.
+     * @return Returns the sum.
+     */
+    (addend: number): number;
+}
+
+declare const add: Add;
+export = add;
diff --git a/types/lodash/fp/after.d.ts b/types/lodash/fp/after.d.ts
new file mode 100644
index 0000000000..c6b21973d0
--- /dev/null
+++ b/types/lodash/fp/after.d.ts
@@ -0,0 +1,51 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface After {
+    /**
+     * The opposite of _.before; this method creates a function that invokes func once it’s called n or more times.
+     *
+     * @param n The number of calls before func is invoked.
+     * @param func The function to restrict.
+     * @return Returns the new restricted function.
+     */
+    (): After;
+    /**
+     * The opposite of _.before; this method creates a function that invokes func once it’s called n or more times.
+     *
+     * @param n The number of calls before func is invoked.
+     * @param func The function to restrict.
+     * @return Returns the new restricted function.
+     */
+    <TFunc extends (...args: any[]) => any>(func: TFunc): After1x1<TFunc>;
+    /**
+     * The opposite of _.before; this method creates a function that invokes func once it’s called n or more times.
+     *
+     * @param n The number of calls before func is invoked.
+     * @param func The function to restrict.
+     * @return Returns the new restricted function.
+     */
+    <TFunc extends (...args: any[]) => any>(func: TFunc, n: number): TFunc;
+}
+interface After1x1<TFunc extends (...args: any[]) => any> {
+    /**
+     * The opposite of _.before; this method creates a function that invokes func once it’s called n or more times.
+     *
+     * @param n The number of calls before func is invoked.
+     * @param func The function to restrict.
+     * @return Returns the new restricted function.
+     */
+    (): After1x1<TFunc>;
+    /**
+     * The opposite of _.before; this method creates a function that invokes func once it’s called n or more times.
+     *
+     * @param n The number of calls before func is invoked.
+     * @param func The function to restrict.
+     * @return Returns the new restricted function.
+     */
+    (n: number): TFunc;
+}
+
+declare const after: After;
+export = after;
diff --git a/types/lodash/fp/all.d.ts b/types/lodash/fp/all.d.ts
new file mode 100644
index 0000000000..15f37bae09
--- /dev/null
+++ b/types/lodash/fp/all.d.ts
@@ -0,0 +1,67 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Every {
+    /**
+     * Checks if predicate returns truthy for all elements of collection. Iteration is stopped once predicate
+     * returns falsey. The predicate is invoked with three arguments: (value, index|key, collection).
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @return Returns true if all elements pass the predicate check, else false.
+     */
+    (): Every;
+    /**
+     * Checks if predicate returns truthy for all elements of collection. Iteration is stopped once predicate
+     * returns falsey. The predicate is invoked with three arguments: (value, index|key, collection).
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @return Returns true if all elements pass the predicate check, else false.
+     */
+    <T>(predicate: _.ValueIterateeCustom<T, boolean>): Every1x1<T>;
+    /**
+     * Checks if predicate returns truthy for all elements of collection. Iteration is stopped once predicate
+     * returns falsey. The predicate is invoked with three arguments: (value, index|key, collection).
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @return Returns true if all elements pass the predicate check, else false.
+     */
+    <T>(predicate: _.ValueIterateeCustom<T, boolean>, collection: _.List<T> | null | undefined): boolean;
+    /**
+     * Checks if predicate returns truthy for all elements of collection. Iteration is stopped once predicate
+     * returns falsey. The predicate is invoked with three arguments: (value, index|key, collection).
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @return Returns true if all elements pass the predicate check, else false.
+     */
+    <T extends object>(predicate: _.ValueIterateeCustom<T[keyof T], boolean>, collection: T | null | undefined): boolean;
+}
+interface Every1x1<T> {
+    /**
+     * Checks if predicate returns truthy for all elements of collection. Iteration is stopped once predicate
+     * returns falsey. The predicate is invoked with three arguments: (value, index|key, collection).
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @return Returns true if all elements pass the predicate check, else false.
+     */
+    (): Every1x1<T>;
+    /**
+     * Checks if predicate returns truthy for all elements of collection. Iteration is stopped once predicate
+     * returns falsey. The predicate is invoked with three arguments: (value, index|key, collection).
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @return Returns true if all elements pass the predicate check, else false.
+     */
+    (collection: _.List<T> | object | null | undefined): boolean;
+}
+
+declare const all: Every;
+export = all;
diff --git a/types/lodash/fp/allPass.d.ts b/types/lodash/fp/allPass.d.ts
new file mode 100644
index 0000000000..564484494e
--- /dev/null
+++ b/types/lodash/fp/allPass.d.ts
@@ -0,0 +1,18 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+type OverEvery =
+    /**
+     * Creates a function that checks if all of the predicates return truthy when invoked with the arguments
+     * provided to the created function.
+     *
+     * @param predicates The predicates to check.
+     * @return Returns the new function.
+     */
+    <T>(predicates: _.Many<(...args: T[]) => boolean>) => (...args: T[]) => boolean;
+
+declare const allPass: OverEvery;
+export = allPass;
diff --git a/types/lodash/fp/always.d.ts b/types/lodash/fp/always.d.ts
new file mode 100644
index 0000000000..bd22aed21f
--- /dev/null
+++ b/types/lodash/fp/always.d.ts
@@ -0,0 +1,15 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type Constant =
+    /**
+     * Creates a function that returns value.
+     *
+     * @param value The value to return from the new function.
+     * @return Returns the new function.
+     */
+    <T>(value: T) => () => T;
+
+declare const always: Constant;
+export = always;
diff --git a/types/lodash/fp/any.d.ts b/types/lodash/fp/any.d.ts
new file mode 100644
index 0000000000..32cf83d382
--- /dev/null
+++ b/types/lodash/fp/any.d.ts
@@ -0,0 +1,67 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Some {
+    /**
+     * Checks if predicate returns truthy for any element of collection. Iteration is stopped once predicate
+     * returns truthy. The predicate is invoked with three arguments: (value, index|key, collection).
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @return Returns true if any element passes the predicate check, else false.
+     */
+    (): Some;
+    /**
+     * Checks if predicate returns truthy for any element of collection. Iteration is stopped once predicate
+     * returns truthy. The predicate is invoked with three arguments: (value, index|key, collection).
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @return Returns true if any element passes the predicate check, else false.
+     */
+    <T>(predicate: _.ValueIterateeCustom<T, boolean>): Some1x1<T>;
+    /**
+     * Checks if predicate returns truthy for any element of collection. Iteration is stopped once predicate
+     * returns truthy. The predicate is invoked with three arguments: (value, index|key, collection).
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @return Returns true if any element passes the predicate check, else false.
+     */
+    <T>(predicate: _.ValueIterateeCustom<T, boolean>, collection: _.List<T> | null | undefined): boolean;
+    /**
+     * Checks if predicate returns truthy for any element of collection. Iteration is stopped once predicate
+     * returns truthy. The predicate is invoked with three arguments: (value, index|key, collection).
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @return Returns true if any element passes the predicate check, else false.
+     */
+    <T extends object>(predicate: _.ValueIterateeCustom<T[keyof T], boolean>, collection: T | null | undefined): boolean;
+}
+interface Some1x1<T> {
+    /**
+     * Checks if predicate returns truthy for any element of collection. Iteration is stopped once predicate
+     * returns truthy. The predicate is invoked with three arguments: (value, index|key, collection).
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @return Returns true if any element passes the predicate check, else false.
+     */
+    (): Some1x1<T>;
+    /**
+     * Checks if predicate returns truthy for any element of collection. Iteration is stopped once predicate
+     * returns truthy. The predicate is invoked with three arguments: (value, index|key, collection).
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @return Returns true if any element passes the predicate check, else false.
+     */
+    (collection: _.List<T> | object | null | undefined): boolean;
+}
+
+declare const any: Some;
+export = any;
diff --git a/types/lodash/fp/anyPass.d.ts b/types/lodash/fp/anyPass.d.ts
new file mode 100644
index 0000000000..0666de68ba
--- /dev/null
+++ b/types/lodash/fp/anyPass.d.ts
@@ -0,0 +1,18 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+type OverSome =
+    /**
+     * Creates a function that checks if any of the predicates return truthy when invoked with the arguments
+     * provided to the created function.
+     *
+     * @param predicates The predicates to check.
+     * @return Returns the new function.
+     */
+    <T>(predicates: _.Many<(...args: T[]) => boolean>) => (...args: T[]) => boolean;
+
+declare const anyPass: OverSome;
+export = anyPass;
diff --git a/types/lodash/fp/apply.d.ts b/types/lodash/fp/apply.d.ts
new file mode 100644
index 0000000000..6a052218aa
--- /dev/null
+++ b/types/lodash/fp/apply.d.ts
@@ -0,0 +1,18 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type Spread =
+    /**
+     * Creates a function that invokes func with the this binding of the created function and an array of arguments
+     * much like Function#apply.
+     *
+     * Note: This method is based on the spread operator.
+     *
+     * @param func The function to spread arguments over.
+     * @return Returns the new function.
+     */
+    <TResult>(func: (...args: any[]) => TResult) => (...args: any[]) => TResult;
+
+declare const apply: Spread;
+export = apply;
diff --git a/types/lodash/fp/ary.d.ts b/types/lodash/fp/ary.d.ts
new file mode 100644
index 0000000000..c241921795
--- /dev/null
+++ b/types/lodash/fp/ary.d.ts
@@ -0,0 +1,51 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface Ary {
+    /**
+     * Creates a function that accepts up to n arguments ignoring any additional arguments.
+     *
+     * @param func The function to cap arguments for.
+     * @param n The arity cap.
+     * @returns Returns the new function.
+     */
+    (): Ary;
+    /**
+     * Creates a function that accepts up to n arguments ignoring any additional arguments.
+     *
+     * @param func The function to cap arguments for.
+     * @param n The arity cap.
+     * @returns Returns the new function.
+     */
+    (n: number): Ary1x1;
+    /**
+     * Creates a function that accepts up to n arguments ignoring any additional arguments.
+     *
+     * @param func The function to cap arguments for.
+     * @param n The arity cap.
+     * @returns Returns the new function.
+     */
+    (n: number, func: (...args: any[]) => any): (...args: any[]) => any;
+}
+interface Ary1x1 {
+    /**
+     * Creates a function that accepts up to n arguments ignoring any additional arguments.
+     *
+     * @param func The function to cap arguments for.
+     * @param n The arity cap.
+     * @returns Returns the new function.
+     */
+    (): Ary1x1;
+    /**
+     * Creates a function that accepts up to n arguments ignoring any additional arguments.
+     *
+     * @param func The function to cap arguments for.
+     * @param n The arity cap.
+     * @returns Returns the new function.
+     */
+    (func: (...args: any[]) => any): (...args: any[]) => any;
+}
+
+declare const ary: Ary;
+export = ary;
diff --git a/types/lodash/fp/assign.d.ts b/types/lodash/fp/assign.d.ts
new file mode 100644
index 0000000000..df05fbe118
--- /dev/null
+++ b/types/lodash/fp/assign.d.ts
@@ -0,0 +1,156 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface Assign {
+    /**
+     * Assigns own enumerable properties of source objects to the destination
+     * object. Source objects are applied from left to right. Subsequent sources
+     * overwrite property assignments of previous sources.
+     *
+     * **Note:** This method mutates `object` and is loosely based on
+     * [`Object.assign`](https://mdn.io/Object/assign).
+     *
+     * @category Object
+     * @param object The destination object.
+     * @param [sources] The source objects.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function Foo() {
+     *   this.c = 3;
+     * }
+     *
+     * function Bar() {
+     *   this.e = 5;
+     * }
+     *
+     * Foo.prototype.d = 4;
+     * Bar.prototype.f = 6;
+     *
+     * _.assign({ 'a': 1 }, new Foo, new Bar);
+     * // => { 'a': 1, 'c': 3, 'e': 5 }
+     */
+    (): Assign;
+    /**
+     * Assigns own enumerable properties of source objects to the destination
+     * object. Source objects are applied from left to right. Subsequent sources
+     * overwrite property assignments of previous sources.
+     *
+     * **Note:** This method mutates `object` and is loosely based on
+     * [`Object.assign`](https://mdn.io/Object/assign).
+     *
+     * @category Object
+     * @param object The destination object.
+     * @param [sources] The source objects.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function Foo() {
+     *   this.c = 3;
+     * }
+     *
+     * function Bar() {
+     *   this.e = 5;
+     * }
+     *
+     * Foo.prototype.d = 4;
+     * Bar.prototype.f = 6;
+     *
+     * _.assign({ 'a': 1 }, new Foo, new Bar);
+     * // => { 'a': 1, 'c': 3, 'e': 5 }
+     */
+    <TObject>(object: TObject): Assign1x1<TObject>;
+    /**
+     * Assigns own enumerable properties of source objects to the destination
+     * object. Source objects are applied from left to right. Subsequent sources
+     * overwrite property assignments of previous sources.
+     *
+     * **Note:** This method mutates `object` and is loosely based on
+     * [`Object.assign`](https://mdn.io/Object/assign).
+     *
+     * @category Object
+     * @param object The destination object.
+     * @param [sources] The source objects.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function Foo() {
+     *   this.c = 3;
+     * }
+     *
+     * function Bar() {
+     *   this.e = 5;
+     * }
+     *
+     * Foo.prototype.d = 4;
+     * Bar.prototype.f = 6;
+     *
+     * _.assign({ 'a': 1 }, new Foo, new Bar);
+     * // => { 'a': 1, 'c': 3, 'e': 5 }
+     */
+    <TObject, TSource>(object: TObject, source: TSource): TObject & TSource;
+}
+interface Assign1x1<TObject> {
+    /**
+     * Assigns own enumerable properties of source objects to the destination
+     * object. Source objects are applied from left to right. Subsequent sources
+     * overwrite property assignments of previous sources.
+     *
+     * **Note:** This method mutates `object` and is loosely based on
+     * [`Object.assign`](https://mdn.io/Object/assign).
+     *
+     * @category Object
+     * @param object The destination object.
+     * @param [sources] The source objects.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function Foo() {
+     *   this.c = 3;
+     * }
+     *
+     * function Bar() {
+     *   this.e = 5;
+     * }
+     *
+     * Foo.prototype.d = 4;
+     * Bar.prototype.f = 6;
+     *
+     * _.assign({ 'a': 1 }, new Foo, new Bar);
+     * // => { 'a': 1, 'c': 3, 'e': 5 }
+     */
+    (): Assign1x1<TObject>;
+    /**
+     * Assigns own enumerable properties of source objects to the destination
+     * object. Source objects are applied from left to right. Subsequent sources
+     * overwrite property assignments of previous sources.
+     *
+     * **Note:** This method mutates `object` and is loosely based on
+     * [`Object.assign`](https://mdn.io/Object/assign).
+     *
+     * @category Object
+     * @param object The destination object.
+     * @param [sources] The source objects.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function Foo() {
+     *   this.c = 3;
+     * }
+     *
+     * function Bar() {
+     *   this.e = 5;
+     * }
+     *
+     * Foo.prototype.d = 4;
+     * Bar.prototype.f = 6;
+     *
+     * _.assign({ 'a': 1 }, new Foo, new Bar);
+     * // => { 'a': 1, 'c': 3, 'e': 5 }
+     */
+    <TSource>(source: TSource): TObject & TSource;
+}
+
+declare const assign: Assign;
+export = assign;
diff --git a/types/lodash/fp/assignAll.d.ts b/types/lodash/fp/assignAll.d.ts
new file mode 100644
index 0000000000..b6ba1dfba9
--- /dev/null
+++ b/types/lodash/fp/assignAll.d.ts
@@ -0,0 +1,37 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type Assign =
+    /**
+     * Assigns own enumerable properties of source objects to the destination
+     * object. Source objects are applied from left to right. Subsequent sources
+     * overwrite property assignments of previous sources.
+     *
+     * **Note:** This method mutates `object` and is loosely based on
+     * [`Object.assign`](https://mdn.io/Object/assign).
+     *
+     * @category Object
+     * @param object The destination object.
+     * @param [sources] The source objects.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function Foo() {
+     *   this.c = 3;
+     * }
+     *
+     * function Bar() {
+     *   this.e = 5;
+     * }
+     *
+     * Foo.prototype.d = 4;
+     * Bar.prototype.f = 6;
+     *
+     * _.assign({ 'a': 1 }, new Foo, new Bar);
+     * // => { 'a': 1, 'c': 3, 'e': 5 }
+     */
+    (object: ReadonlyArray<any>) => any;
+
+declare const assignAll: Assign;
+export = assignAll;
diff --git a/types/lodash/fp/assignAllWith.d.ts b/types/lodash/fp/assignAllWith.d.ts
new file mode 100644
index 0000000000..0f8d2d07ed
--- /dev/null
+++ b/types/lodash/fp/assignAllWith.d.ts
@@ -0,0 +1,138 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface AssignWith {
+    /**
+     * This method is like `_.assign` except that it accepts `customizer` which
+     * is invoked to produce the assigned values. If `customizer` returns `undefined`
+     * assignment is handled by the method instead. The `customizer` is invoked
+     * with five arguments: (objValue, srcValue, key, object, source).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   return _.isUndefined(objValue) ? srcValue : objValue;
+     * }
+     *
+     * var defaults = _.partialRight(_.assignWith, customizer);
+     *
+     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+     * // => { 'a': 1, 'b': 2 }
+     */
+    (): AssignWith;
+    /**
+     * This method is like `_.assign` except that it accepts `customizer` which
+     * is invoked to produce the assigned values. If `customizer` returns `undefined`
+     * assignment is handled by the method instead. The `customizer` is invoked
+     * with five arguments: (objValue, srcValue, key, object, source).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   return _.isUndefined(objValue) ? srcValue : objValue;
+     * }
+     *
+     * var defaults = _.partialRight(_.assignWith, customizer);
+     *
+     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+     * // => { 'a': 1, 'b': 2 }
+     */
+    (customizer: _.AssignCustomizer): AssignWith1x1;
+    /**
+     * This method is like `_.assign` except that it accepts `customizer` which
+     * is invoked to produce the assigned values. If `customizer` returns `undefined`
+     * assignment is handled by the method instead. The `customizer` is invoked
+     * with five arguments: (objValue, srcValue, key, object, source).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   return _.isUndefined(objValue) ? srcValue : objValue;
+     * }
+     *
+     * var defaults = _.partialRight(_.assignWith, customizer);
+     *
+     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+     * // => { 'a': 1, 'b': 2 }
+     */
+    (customizer: _.AssignCustomizer, args: ReadonlyArray<any>): any;
+}
+interface AssignWith1x1 {
+    /**
+     * This method is like `_.assign` except that it accepts `customizer` which
+     * is invoked to produce the assigned values. If `customizer` returns `undefined`
+     * assignment is handled by the method instead. The `customizer` is invoked
+     * with five arguments: (objValue, srcValue, key, object, source).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   return _.isUndefined(objValue) ? srcValue : objValue;
+     * }
+     *
+     * var defaults = _.partialRight(_.assignWith, customizer);
+     *
+     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+     * // => { 'a': 1, 'b': 2 }
+     */
+    (): AssignWith1x1;
+    /**
+     * This method is like `_.assign` except that it accepts `customizer` which
+     * is invoked to produce the assigned values. If `customizer` returns `undefined`
+     * assignment is handled by the method instead. The `customizer` is invoked
+     * with five arguments: (objValue, srcValue, key, object, source).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   return _.isUndefined(objValue) ? srcValue : objValue;
+     * }
+     *
+     * var defaults = _.partialRight(_.assignWith, customizer);
+     *
+     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+     * // => { 'a': 1, 'b': 2 }
+     */
+    (args: ReadonlyArray<any>): any;
+}
+
+declare const assignAllWith: AssignWith;
+export = assignAllWith;
diff --git a/types/lodash/fp/assignIn.d.ts b/types/lodash/fp/assignIn.d.ts
new file mode 100644
index 0000000000..fcd201f901
--- /dev/null
+++ b/types/lodash/fp/assignIn.d.ts
@@ -0,0 +1,151 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface AssignIn {
+    /**
+     * This method is like `_.assign` except that it iterates over own and
+     * inherited source properties.
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @alias extend
+     * @category Object
+     * @param object The destination object.
+     * @param [sources] The source objects.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function Foo() {
+     *   this.b = 2;
+     * }
+     *
+     * function Bar() {
+     *   this.d = 4;
+     * }
+     *
+     * Foo.prototype.c = 3;
+     * Bar.prototype.e = 5;
+     *
+     * _.assignIn({ 'a': 1 }, new Foo, new Bar);
+     * // => { 'a': 1, 'b': 2, 'c': 3, 'd': 4, 'e': 5 }
+     */
+    (): AssignIn;
+    /**
+     * This method is like `_.assign` except that it iterates over own and
+     * inherited source properties.
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @alias extend
+     * @category Object
+     * @param object The destination object.
+     * @param [sources] The source objects.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function Foo() {
+     *   this.b = 2;
+     * }
+     *
+     * function Bar() {
+     *   this.d = 4;
+     * }
+     *
+     * Foo.prototype.c = 3;
+     * Bar.prototype.e = 5;
+     *
+     * _.assignIn({ 'a': 1 }, new Foo, new Bar);
+     * // => { 'a': 1, 'b': 2, 'c': 3, 'd': 4, 'e': 5 }
+     */
+    <TObject>(object: TObject): AssignIn1x1<TObject>;
+    /**
+     * This method is like `_.assign` except that it iterates over own and
+     * inherited source properties.
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @alias extend
+     * @category Object
+     * @param object The destination object.
+     * @param [sources] The source objects.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function Foo() {
+     *   this.b = 2;
+     * }
+     *
+     * function Bar() {
+     *   this.d = 4;
+     * }
+     *
+     * Foo.prototype.c = 3;
+     * Bar.prototype.e = 5;
+     *
+     * _.assignIn({ 'a': 1 }, new Foo, new Bar);
+     * // => { 'a': 1, 'b': 2, 'c': 3, 'd': 4, 'e': 5 }
+     */
+    <TObject, TSource>(object: TObject, source: TSource): TObject & TSource;
+}
+interface AssignIn1x1<TObject> {
+    /**
+     * This method is like `_.assign` except that it iterates over own and
+     * inherited source properties.
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @alias extend
+     * @category Object
+     * @param object The destination object.
+     * @param [sources] The source objects.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function Foo() {
+     *   this.b = 2;
+     * }
+     *
+     * function Bar() {
+     *   this.d = 4;
+     * }
+     *
+     * Foo.prototype.c = 3;
+     * Bar.prototype.e = 5;
+     *
+     * _.assignIn({ 'a': 1 }, new Foo, new Bar);
+     * // => { 'a': 1, 'b': 2, 'c': 3, 'd': 4, 'e': 5 }
+     */
+    (): AssignIn1x1<TObject>;
+    /**
+     * This method is like `_.assign` except that it iterates over own and
+     * inherited source properties.
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @alias extend
+     * @category Object
+     * @param object The destination object.
+     * @param [sources] The source objects.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function Foo() {
+     *   this.b = 2;
+     * }
+     *
+     * function Bar() {
+     *   this.d = 4;
+     * }
+     *
+     * Foo.prototype.c = 3;
+     * Bar.prototype.e = 5;
+     *
+     * _.assignIn({ 'a': 1 }, new Foo, new Bar);
+     * // => { 'a': 1, 'b': 2, 'c': 3, 'd': 4, 'e': 5 }
+     */
+    <TSource>(source: TSource): TObject & TSource;
+}
+
+declare const assignIn: AssignIn;
+export = assignIn;
diff --git a/types/lodash/fp/assignInAll.d.ts b/types/lodash/fp/assignInAll.d.ts
new file mode 100644
index 0000000000..32290cc6cd
--- /dev/null
+++ b/types/lodash/fp/assignInAll.d.ts
@@ -0,0 +1,36 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type AssignIn =
+    /**
+     * This method is like `_.assign` except that it iterates over own and
+     * inherited source properties.
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @alias extend
+     * @category Object
+     * @param object The destination object.
+     * @param [sources] The source objects.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function Foo() {
+     *   this.b = 2;
+     * }
+     *
+     * function Bar() {
+     *   this.d = 4;
+     * }
+     *
+     * Foo.prototype.c = 3;
+     * Bar.prototype.e = 5;
+     *
+     * _.assignIn({ 'a': 1 }, new Foo, new Bar);
+     * // => { 'a': 1, 'b': 2, 'c': 3, 'd': 4, 'e': 5 }
+     */
+    <TResult>(object: ReadonlyArray<any>) => TResult;
+
+declare const assignInAll: AssignIn;
+export = assignInAll;
diff --git a/types/lodash/fp/assignInAllWith.d.ts b/types/lodash/fp/assignInAllWith.d.ts
new file mode 100644
index 0000000000..631b28218a
--- /dev/null
+++ b/types/lodash/fp/assignInAllWith.d.ts
@@ -0,0 +1,143 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface AssignInWith {
+    /**
+     * This method is like `_.assignIn` except that it accepts `customizer` which
+     * is invoked to produce the assigned values. If `customizer` returns `undefined`
+     * assignment is handled by the method instead. The `customizer` is invoked
+     * with five arguments: (objValue, srcValue, key, object, source).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @alias extendWith
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   return _.isUndefined(objValue) ? srcValue : objValue;
+     * }
+     *
+     * var defaults = _.partialRight(_.assignInWith, customizer);
+     *
+     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+     * // => { 'a': 1, 'b': 2 }
+     */
+    (): AssignInWith;
+    /**
+     * This method is like `_.assignIn` except that it accepts `customizer` which
+     * is invoked to produce the assigned values. If `customizer` returns `undefined`
+     * assignment is handled by the method instead. The `customizer` is invoked
+     * with five arguments: (objValue, srcValue, key, object, source).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @alias extendWith
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   return _.isUndefined(objValue) ? srcValue : objValue;
+     * }
+     *
+     * var defaults = _.partialRight(_.assignInWith, customizer);
+     *
+     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+     * // => { 'a': 1, 'b': 2 }
+     */
+    (customizer: _.AssignCustomizer): AssignInWith1x1;
+    /**
+     * This method is like `_.assignIn` except that it accepts `customizer` which
+     * is invoked to produce the assigned values. If `customizer` returns `undefined`
+     * assignment is handled by the method instead. The `customizer` is invoked
+     * with five arguments: (objValue, srcValue, key, object, source).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @alias extendWith
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   return _.isUndefined(objValue) ? srcValue : objValue;
+     * }
+     *
+     * var defaults = _.partialRight(_.assignInWith, customizer);
+     *
+     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+     * // => { 'a': 1, 'b': 2 }
+     */
+    (customizer: _.AssignCustomizer, args: ReadonlyArray<any>): any;
+}
+interface AssignInWith1x1 {
+    /**
+     * This method is like `_.assignIn` except that it accepts `customizer` which
+     * is invoked to produce the assigned values. If `customizer` returns `undefined`
+     * assignment is handled by the method instead. The `customizer` is invoked
+     * with five arguments: (objValue, srcValue, key, object, source).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @alias extendWith
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   return _.isUndefined(objValue) ? srcValue : objValue;
+     * }
+     *
+     * var defaults = _.partialRight(_.assignInWith, customizer);
+     *
+     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+     * // => { 'a': 1, 'b': 2 }
+     */
+    (): AssignInWith1x1;
+    /**
+     * This method is like `_.assignIn` except that it accepts `customizer` which
+     * is invoked to produce the assigned values. If `customizer` returns `undefined`
+     * assignment is handled by the method instead. The `customizer` is invoked
+     * with five arguments: (objValue, srcValue, key, object, source).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @alias extendWith
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   return _.isUndefined(objValue) ? srcValue : objValue;
+     * }
+     *
+     * var defaults = _.partialRight(_.assignInWith, customizer);
+     *
+     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+     * // => { 'a': 1, 'b': 2 }
+     */
+    (args: ReadonlyArray<any>): any;
+}
+
+declare const assignInAllWith: AssignInWith;
+export = assignInAllWith;
diff --git a/types/lodash/fp/assignInWith.d.ts b/types/lodash/fp/assignInWith.d.ts
new file mode 100644
index 0000000000..d2f9dbba6f
--- /dev/null
+++ b/types/lodash/fp/assignInWith.d.ts
@@ -0,0 +1,249 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface AssignInWith {
+    /**
+     * This method is like `_.assignIn` except that it accepts `customizer` which
+     * is invoked to produce the assigned values. If `customizer` returns `undefined`
+     * assignment is handled by the method instead. The `customizer` is invoked
+     * with five arguments: (objValue, srcValue, key, object, source).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @alias extendWith
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   return _.isUndefined(objValue) ? srcValue : objValue;
+     * }
+     *
+     * var defaults = _.partialRight(_.assignInWith, customizer);
+     *
+     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+     * // => { 'a': 1, 'b': 2 }
+     */
+    (): AssignInWith;
+    /**
+     * This method is like `_.assignIn` except that it accepts `customizer` which
+     * is invoked to produce the assigned values. If `customizer` returns `undefined`
+     * assignment is handled by the method instead. The `customizer` is invoked
+     * with five arguments: (objValue, srcValue, key, object, source).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @alias extendWith
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   return _.isUndefined(objValue) ? srcValue : objValue;
+     * }
+     *
+     * var defaults = _.partialRight(_.assignInWith, customizer);
+     *
+     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+     * // => { 'a': 1, 'b': 2 }
+     */
+    (customizer: _.AssignCustomizer): AssignInWith1x1;
+    /**
+     * This method is like `_.assignIn` except that it accepts `customizer` which
+     * is invoked to produce the assigned values. If `customizer` returns `undefined`
+     * assignment is handled by the method instead. The `customizer` is invoked
+     * with five arguments: (objValue, srcValue, key, object, source).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @alias extendWith
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   return _.isUndefined(objValue) ? srcValue : objValue;
+     * }
+     *
+     * var defaults = _.partialRight(_.assignInWith, customizer);
+     *
+     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+     * // => { 'a': 1, 'b': 2 }
+     */
+    <TObject>(customizer: _.AssignCustomizer, object: TObject): AssignInWith1x2<TObject>;
+    /**
+     * This method is like `_.assignIn` except that it accepts `customizer` which
+     * is invoked to produce the assigned values. If `customizer` returns `undefined`
+     * assignment is handled by the method instead. The `customizer` is invoked
+     * with five arguments: (objValue, srcValue, key, object, source).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @alias extendWith
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   return _.isUndefined(objValue) ? srcValue : objValue;
+     * }
+     *
+     * var defaults = _.partialRight(_.assignInWith, customizer);
+     *
+     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+     * // => { 'a': 1, 'b': 2 }
+     */
+    <TObject, TSource>(customizer: _.AssignCustomizer, object: TObject, source: TSource): TObject & TSource;
+}
+interface AssignInWith1x1 {
+    /**
+     * This method is like `_.assignIn` except that it accepts `customizer` which
+     * is invoked to produce the assigned values. If `customizer` returns `undefined`
+     * assignment is handled by the method instead. The `customizer` is invoked
+     * with five arguments: (objValue, srcValue, key, object, source).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @alias extendWith
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   return _.isUndefined(objValue) ? srcValue : objValue;
+     * }
+     *
+     * var defaults = _.partialRight(_.assignInWith, customizer);
+     *
+     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+     * // => { 'a': 1, 'b': 2 }
+     */
+    (): AssignInWith1x1;
+    /**
+     * This method is like `_.assignIn` except that it accepts `customizer` which
+     * is invoked to produce the assigned values. If `customizer` returns `undefined`
+     * assignment is handled by the method instead. The `customizer` is invoked
+     * with five arguments: (objValue, srcValue, key, object, source).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @alias extendWith
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   return _.isUndefined(objValue) ? srcValue : objValue;
+     * }
+     *
+     * var defaults = _.partialRight(_.assignInWith, customizer);
+     *
+     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+     * // => { 'a': 1, 'b': 2 }
+     */
+    <TObject>(object: TObject): AssignInWith1x2<TObject>;
+    /**
+     * This method is like `_.assignIn` except that it accepts `customizer` which
+     * is invoked to produce the assigned values. If `customizer` returns `undefined`
+     * assignment is handled by the method instead. The `customizer` is invoked
+     * with five arguments: (objValue, srcValue, key, object, source).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @alias extendWith
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   return _.isUndefined(objValue) ? srcValue : objValue;
+     * }
+     *
+     * var defaults = _.partialRight(_.assignInWith, customizer);
+     *
+     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+     * // => { 'a': 1, 'b': 2 }
+     */
+    <TObject, TSource>(object: TObject, source: TSource): TObject & TSource;
+}
+interface AssignInWith1x2<TObject> {
+    /**
+     * This method is like `_.assignIn` except that it accepts `customizer` which
+     * is invoked to produce the assigned values. If `customizer` returns `undefined`
+     * assignment is handled by the method instead. The `customizer` is invoked
+     * with five arguments: (objValue, srcValue, key, object, source).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @alias extendWith
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   return _.isUndefined(objValue) ? srcValue : objValue;
+     * }
+     *
+     * var defaults = _.partialRight(_.assignInWith, customizer);
+     *
+     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+     * // => { 'a': 1, 'b': 2 }
+     */
+    (): AssignInWith1x2<TObject>;
+    /**
+     * This method is like `_.assignIn` except that it accepts `customizer` which
+     * is invoked to produce the assigned values. If `customizer` returns `undefined`
+     * assignment is handled by the method instead. The `customizer` is invoked
+     * with five arguments: (objValue, srcValue, key, object, source).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @alias extendWith
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   return _.isUndefined(objValue) ? srcValue : objValue;
+     * }
+     *
+     * var defaults = _.partialRight(_.assignInWith, customizer);
+     *
+     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+     * // => { 'a': 1, 'b': 2 }
+     */
+    <TSource>(source: TSource): TObject & TSource;
+}
+
+declare const assignInWith: AssignInWith;
+export = assignInWith;
diff --git a/types/lodash/fp/assignWith.d.ts b/types/lodash/fp/assignWith.d.ts
new file mode 100644
index 0000000000..2313bd2614
--- /dev/null
+++ b/types/lodash/fp/assignWith.d.ts
@@ -0,0 +1,240 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface AssignWith {
+    /**
+     * This method is like `_.assign` except that it accepts `customizer` which
+     * is invoked to produce the assigned values. If `customizer` returns `undefined`
+     * assignment is handled by the method instead. The `customizer` is invoked
+     * with five arguments: (objValue, srcValue, key, object, source).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   return _.isUndefined(objValue) ? srcValue : objValue;
+     * }
+     *
+     * var defaults = _.partialRight(_.assignWith, customizer);
+     *
+     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+     * // => { 'a': 1, 'b': 2 }
+     */
+    (): AssignWith;
+    /**
+     * This method is like `_.assign` except that it accepts `customizer` which
+     * is invoked to produce the assigned values. If `customizer` returns `undefined`
+     * assignment is handled by the method instead. The `customizer` is invoked
+     * with five arguments: (objValue, srcValue, key, object, source).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   return _.isUndefined(objValue) ? srcValue : objValue;
+     * }
+     *
+     * var defaults = _.partialRight(_.assignWith, customizer);
+     *
+     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+     * // => { 'a': 1, 'b': 2 }
+     */
+    (customizer: _.AssignCustomizer): AssignWith1x1;
+    /**
+     * This method is like `_.assign` except that it accepts `customizer` which
+     * is invoked to produce the assigned values. If `customizer` returns `undefined`
+     * assignment is handled by the method instead. The `customizer` is invoked
+     * with five arguments: (objValue, srcValue, key, object, source).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   return _.isUndefined(objValue) ? srcValue : objValue;
+     * }
+     *
+     * var defaults = _.partialRight(_.assignWith, customizer);
+     *
+     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+     * // => { 'a': 1, 'b': 2 }
+     */
+    <TObject>(customizer: _.AssignCustomizer, object: TObject): AssignWith1x2<TObject>;
+    /**
+     * This method is like `_.assign` except that it accepts `customizer` which
+     * is invoked to produce the assigned values. If `customizer` returns `undefined`
+     * assignment is handled by the method instead. The `customizer` is invoked
+     * with five arguments: (objValue, srcValue, key, object, source).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   return _.isUndefined(objValue) ? srcValue : objValue;
+     * }
+     *
+     * var defaults = _.partialRight(_.assignWith, customizer);
+     *
+     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+     * // => { 'a': 1, 'b': 2 }
+     */
+    <TObject, TSource>(customizer: _.AssignCustomizer, object: TObject, source: TSource): TObject & TSource;
+}
+interface AssignWith1x1 {
+    /**
+     * This method is like `_.assign` except that it accepts `customizer` which
+     * is invoked to produce the assigned values. If `customizer` returns `undefined`
+     * assignment is handled by the method instead. The `customizer` is invoked
+     * with five arguments: (objValue, srcValue, key, object, source).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   return _.isUndefined(objValue) ? srcValue : objValue;
+     * }
+     *
+     * var defaults = _.partialRight(_.assignWith, customizer);
+     *
+     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+     * // => { 'a': 1, 'b': 2 }
+     */
+    (): AssignWith1x1;
+    /**
+     * This method is like `_.assign` except that it accepts `customizer` which
+     * is invoked to produce the assigned values. If `customizer` returns `undefined`
+     * assignment is handled by the method instead. The `customizer` is invoked
+     * with five arguments: (objValue, srcValue, key, object, source).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   return _.isUndefined(objValue) ? srcValue : objValue;
+     * }
+     *
+     * var defaults = _.partialRight(_.assignWith, customizer);
+     *
+     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+     * // => { 'a': 1, 'b': 2 }
+     */
+    <TObject>(object: TObject): AssignWith1x2<TObject>;
+    /**
+     * This method is like `_.assign` except that it accepts `customizer` which
+     * is invoked to produce the assigned values. If `customizer` returns `undefined`
+     * assignment is handled by the method instead. The `customizer` is invoked
+     * with five arguments: (objValue, srcValue, key, object, source).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   return _.isUndefined(objValue) ? srcValue : objValue;
+     * }
+     *
+     * var defaults = _.partialRight(_.assignWith, customizer);
+     *
+     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+     * // => { 'a': 1, 'b': 2 }
+     */
+    <TObject, TSource>(object: TObject, source: TSource): TObject & TSource;
+}
+interface AssignWith1x2<TObject> {
+    /**
+     * This method is like `_.assign` except that it accepts `customizer` which
+     * is invoked to produce the assigned values. If `customizer` returns `undefined`
+     * assignment is handled by the method instead. The `customizer` is invoked
+     * with five arguments: (objValue, srcValue, key, object, source).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   return _.isUndefined(objValue) ? srcValue : objValue;
+     * }
+     *
+     * var defaults = _.partialRight(_.assignWith, customizer);
+     *
+     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+     * // => { 'a': 1, 'b': 2 }
+     */
+    (): AssignWith1x2<TObject>;
+    /**
+     * This method is like `_.assign` except that it accepts `customizer` which
+     * is invoked to produce the assigned values. If `customizer` returns `undefined`
+     * assignment is handled by the method instead. The `customizer` is invoked
+     * with five arguments: (objValue, srcValue, key, object, source).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   return _.isUndefined(objValue) ? srcValue : objValue;
+     * }
+     *
+     * var defaults = _.partialRight(_.assignWith, customizer);
+     *
+     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+     * // => { 'a': 1, 'b': 2 }
+     */
+    <TSource>(source: TSource): TObject & TSource;
+}
+
+declare const assignWith: AssignWith;
+export = assignWith;
diff --git a/types/lodash/fp/assoc.d.ts b/types/lodash/fp/assoc.d.ts
new file mode 100644
index 0000000000..41f176aaa9
--- /dev/null
+++ b/types/lodash/fp/assoc.d.ts
@@ -0,0 +1,147 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Set {
+    /**
+     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
+     * missing index properties while objects are created for all other missing properties. Use _.setWith to
+     * customize path creation.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @return Returns object.
+     */
+    (): Set;
+    /**
+     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
+     * missing index properties while objects are created for all other missing properties. Use _.setWith to
+     * customize path creation.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @return Returns object.
+     */
+    (path: _.PropertyPath): Set1x1;
+    /**
+     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
+     * missing index properties while objects are created for all other missing properties. Use _.setWith to
+     * customize path creation.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @return Returns object.
+     */
+    (path: _.PropertyPath, value: any): Set1x2;
+    /**
+     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
+     * missing index properties while objects are created for all other missing properties. Use _.setWith to
+     * customize path creation.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @return Returns object.
+     */
+    <T extends object>(path: _.PropertyPath, value: any, object: T): T;
+    /**
+     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
+     * missing index properties while objects are created for all other missing properties. Use _.setWith to
+     * customize path creation.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @return Returns object.
+     */
+    <TResult>(path: _.PropertyPath, value: any, object: object): TResult;
+}
+interface Set1x1 {
+    /**
+     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
+     * missing index properties while objects are created for all other missing properties. Use _.setWith to
+     * customize path creation.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @return Returns object.
+     */
+    (): Set1x1;
+    /**
+     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
+     * missing index properties while objects are created for all other missing properties. Use _.setWith to
+     * customize path creation.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @return Returns object.
+     */
+    (value: any): Set1x2;
+    /**
+     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
+     * missing index properties while objects are created for all other missing properties. Use _.setWith to
+     * customize path creation.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @return Returns object.
+     */
+    <T extends object>(value: any, object: T): T;
+    /**
+     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
+     * missing index properties while objects are created for all other missing properties. Use _.setWith to
+     * customize path creation.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @return Returns object.
+     */
+    <TResult>(value: any, object: object): TResult;
+}
+interface Set1x2 {
+    /**
+     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
+     * missing index properties while objects are created for all other missing properties. Use _.setWith to
+     * customize path creation.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @return Returns object.
+     */
+    (): Set1x2;
+    /**
+     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
+     * missing index properties while objects are created for all other missing properties. Use _.setWith to
+     * customize path creation.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @return Returns object.
+     */
+    <T extends object>(object: T): T;
+    /**
+     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
+     * missing index properties while objects are created for all other missing properties. Use _.setWith to
+     * customize path creation.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @return Returns object.
+     */
+    <TResult>(object: object): TResult;
+}
+
+declare const assoc: Set;
+export = assoc;
diff --git a/types/lodash/fp/assocPath.d.ts b/types/lodash/fp/assocPath.d.ts
new file mode 100644
index 0000000000..ebd0a30a6e
--- /dev/null
+++ b/types/lodash/fp/assocPath.d.ts
@@ -0,0 +1,147 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Set {
+    /**
+     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
+     * missing index properties while objects are created for all other missing properties. Use _.setWith to
+     * customize path creation.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @return Returns object.
+     */
+    (): Set;
+    /**
+     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
+     * missing index properties while objects are created for all other missing properties. Use _.setWith to
+     * customize path creation.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @return Returns object.
+     */
+    (path: _.PropertyPath): Set1x1;
+    /**
+     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
+     * missing index properties while objects are created for all other missing properties. Use _.setWith to
+     * customize path creation.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @return Returns object.
+     */
+    (path: _.PropertyPath, value: any): Set1x2;
+    /**
+     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
+     * missing index properties while objects are created for all other missing properties. Use _.setWith to
+     * customize path creation.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @return Returns object.
+     */
+    <T extends object>(path: _.PropertyPath, value: any, object: T): T;
+    /**
+     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
+     * missing index properties while objects are created for all other missing properties. Use _.setWith to
+     * customize path creation.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @return Returns object.
+     */
+    <TResult>(path: _.PropertyPath, value: any, object: object): TResult;
+}
+interface Set1x1 {
+    /**
+     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
+     * missing index properties while objects are created for all other missing properties. Use _.setWith to
+     * customize path creation.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @return Returns object.
+     */
+    (): Set1x1;
+    /**
+     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
+     * missing index properties while objects are created for all other missing properties. Use _.setWith to
+     * customize path creation.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @return Returns object.
+     */
+    (value: any): Set1x2;
+    /**
+     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
+     * missing index properties while objects are created for all other missing properties. Use _.setWith to
+     * customize path creation.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @return Returns object.
+     */
+    <T extends object>(value: any, object: T): T;
+    /**
+     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
+     * missing index properties while objects are created for all other missing properties. Use _.setWith to
+     * customize path creation.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @return Returns object.
+     */
+    <TResult>(value: any, object: object): TResult;
+}
+interface Set1x2 {
+    /**
+     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
+     * missing index properties while objects are created for all other missing properties. Use _.setWith to
+     * customize path creation.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @return Returns object.
+     */
+    (): Set1x2;
+    /**
+     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
+     * missing index properties while objects are created for all other missing properties. Use _.setWith to
+     * customize path creation.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @return Returns object.
+     */
+    <T extends object>(object: T): T;
+    /**
+     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
+     * missing index properties while objects are created for all other missing properties. Use _.setWith to
+     * customize path creation.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @return Returns object.
+     */
+    <TResult>(object: object): TResult;
+}
+
+declare const assocPath: Set;
+export = assocPath;
diff --git a/types/lodash/fp/at.d.ts b/types/lodash/fp/at.d.ts
new file mode 100644
index 0000000000..c8777af286
--- /dev/null
+++ b/types/lodash/fp/at.d.ts
@@ -0,0 +1,96 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface At {
+    /**
+     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
+     * specified as individual arguments or as arrays of keys.
+     *
+     * @param object The object to iterate over.
+     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
+     * @return Returns the new array of picked elements.
+     */
+    (): At;
+    /**
+     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
+     * specified as individual arguments or as arrays of keys.
+     *
+     * @param object The object to iterate over.
+     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
+     * @return Returns the new array of picked elements.
+     */
+    (props: _.PropertyPath): At1x1;
+    /**
+     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
+     * specified as individual arguments or as arrays of keys.
+     *
+     * @param object The object to iterate over.
+     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
+     * @return Returns the new array of picked elements.
+     */
+    <T>(props: _.PropertyPath, object: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): T[];
+    /**
+     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
+     * specified as individual arguments or as arrays of keys.
+     *
+     * @param object The object to iterate over.
+     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
+     * @return Returns the new array of picked elements.
+     */
+    <T extends object>(props: _.Many<keyof T>): At2x1<T>;
+    /**
+     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
+     * specified as individual arguments or as arrays of keys.
+     *
+     * @param object The object to iterate over.
+     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
+     * @return Returns the new array of picked elements.
+     */
+    <T extends object>(props: _.Many<keyof T>, object: T | null | undefined): Array<T[keyof T]>;
+}
+interface At1x1 {
+    /**
+     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
+     * specified as individual arguments or as arrays of keys.
+     *
+     * @param object The object to iterate over.
+     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
+     * @return Returns the new array of picked elements.
+     */
+    (): At1x1;
+    /**
+     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
+     * specified as individual arguments or as arrays of keys.
+     *
+     * @param object The object to iterate over.
+     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
+     * @return Returns the new array of picked elements.
+     */
+    <T>(object: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): T[];
+}
+interface At2x1<T extends object> {
+    /**
+     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
+     * specified as individual arguments or as arrays of keys.
+     *
+     * @param object The object to iterate over.
+     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
+     * @return Returns the new array of picked elements.
+     */
+    (): At2x1<T>;
+    /**
+     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
+     * specified as individual arguments or as arrays of keys.
+     *
+     * @param object The object to iterate over.
+     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
+     * @return Returns the new array of picked elements.
+     */
+    (object: T | null | undefined): Array<T[keyof T]>;
+}
+
+declare const at: At;
+export = at;
diff --git a/types/lodash/fp/attempt.d.ts b/types/lodash/fp/attempt.d.ts
new file mode 100644
index 0000000000..b2626b6112
--- /dev/null
+++ b/types/lodash/fp/attempt.d.ts
@@ -0,0 +1,16 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type Attempt =
+    /**
+     * Attempts to invoke func, returning either the result or the caught error object. Any additional arguments
+     * are provided to func when it’s invoked.
+     *
+     * @param func The function to attempt.
+     * @return Returns the func result or error object.
+     */
+    <TResult>(func: (...args: any[]) => TResult) => TResult|Error;
+
+declare const attempt: Attempt;
+export = attempt;
diff --git a/types/lodash/fp/before.d.ts b/types/lodash/fp/before.d.ts
new file mode 100644
index 0000000000..f3e4591275
--- /dev/null
+++ b/types/lodash/fp/before.d.ts
@@ -0,0 +1,61 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface Before {
+    /**
+     * Creates a function that invokes func, with the this binding and arguments of the created function, while
+     * it’s called less than n times. Subsequent calls to the created function return the result of the last func
+     * invocation.
+     *
+     * @param n The number of calls at which func is no longer invoked.
+     * @param func The function to restrict.
+     * @return Returns the new restricted function.
+     */
+    (): Before;
+    /**
+     * Creates a function that invokes func, with the this binding and arguments of the created function, while
+     * it’s called less than n times. Subsequent calls to the created function return the result of the last func
+     * invocation.
+     *
+     * @param n The number of calls at which func is no longer invoked.
+     * @param func The function to restrict.
+     * @return Returns the new restricted function.
+     */
+    <TFunc extends (...args: any[]) => any>(func: TFunc): Before1x1<TFunc>;
+    /**
+     * Creates a function that invokes func, with the this binding and arguments of the created function, while
+     * it’s called less than n times. Subsequent calls to the created function return the result of the last func
+     * invocation.
+     *
+     * @param n The number of calls at which func is no longer invoked.
+     * @param func The function to restrict.
+     * @return Returns the new restricted function.
+     */
+    <TFunc extends (...args: any[]) => any>(func: TFunc, n: number): TFunc;
+}
+interface Before1x1<TFunc extends (...args: any[]) => any> {
+    /**
+     * Creates a function that invokes func, with the this binding and arguments of the created function, while
+     * it’s called less than n times. Subsequent calls to the created function return the result of the last func
+     * invocation.
+     *
+     * @param n The number of calls at which func is no longer invoked.
+     * @param func The function to restrict.
+     * @return Returns the new restricted function.
+     */
+    (): Before1x1<TFunc>;
+    /**
+     * Creates a function that invokes func, with the this binding and arguments of the created function, while
+     * it’s called less than n times. Subsequent calls to the created function return the result of the last func
+     * invocation.
+     *
+     * @param n The number of calls at which func is no longer invoked.
+     * @param func The function to restrict.
+     * @return Returns the new restricted function.
+     */
+    (n: number): TFunc;
+}
+
+declare const before: Before;
+export = before;
diff --git a/types/lodash/fp/bind.d.ts b/types/lodash/fp/bind.d.ts
new file mode 100644
index 0000000000..b62fb3de1f
--- /dev/null
+++ b/types/lodash/fp/bind.d.ts
@@ -0,0 +1,86 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface Bind {
+    /**
+     * Creates a function that invokes func with the this binding of thisArg and prepends any additional _.bind
+     * arguments to those provided to the bound function.
+     *
+     * The _.bind.placeholder value, which defaults to _ in monolithic builds, may be used as a placeholder for
+     * partially applied arguments.
+     *
+     * Note: Unlike native Function#bind this method does not set the "length" property of bound functions.
+     *
+     * @param func The function to bind.
+     * @param thisArg The this binding of func.
+     * @param partials The arguments to be partially applied.
+     * @return Returns the new bound function.
+     */
+    (): Bind;
+    /**
+     * Creates a function that invokes func with the this binding of thisArg and prepends any additional _.bind
+     * arguments to those provided to the bound function.
+     *
+     * The _.bind.placeholder value, which defaults to _ in monolithic builds, may be used as a placeholder for
+     * partially applied arguments.
+     *
+     * Note: Unlike native Function#bind this method does not set the "length" property of bound functions.
+     *
+     * @param func The function to bind.
+     * @param thisArg The this binding of func.
+     * @param partials The arguments to be partially applied.
+     * @return Returns the new bound function.
+     */
+    (func: (...args: any[]) => any): Bind1x1;
+    /**
+     * Creates a function that invokes func with the this binding of thisArg and prepends any additional _.bind
+     * arguments to those provided to the bound function.
+     *
+     * The _.bind.placeholder value, which defaults to _ in monolithic builds, may be used as a placeholder for
+     * partially applied arguments.
+     *
+     * Note: Unlike native Function#bind this method does not set the "length" property of bound functions.
+     *
+     * @param func The function to bind.
+     * @param thisArg The this binding of func.
+     * @param partials The arguments to be partially applied.
+     * @return Returns the new bound function.
+     */
+    (func: (...args: any[]) => any, thisArg: any): (...args: any[]) => any;
+}
+interface Bind1x1 {
+    /**
+     * Creates a function that invokes func with the this binding of thisArg and prepends any additional _.bind
+     * arguments to those provided to the bound function.
+     *
+     * The _.bind.placeholder value, which defaults to _ in monolithic builds, may be used as a placeholder for
+     * partially applied arguments.
+     *
+     * Note: Unlike native Function#bind this method does not set the "length" property of bound functions.
+     *
+     * @param func The function to bind.
+     * @param thisArg The this binding of func.
+     * @param partials The arguments to be partially applied.
+     * @return Returns the new bound function.
+     */
+    (): Bind1x1;
+    /**
+     * Creates a function that invokes func with the this binding of thisArg and prepends any additional _.bind
+     * arguments to those provided to the bound function.
+     *
+     * The _.bind.placeholder value, which defaults to _ in monolithic builds, may be used as a placeholder for
+     * partially applied arguments.
+     *
+     * Note: Unlike native Function#bind this method does not set the "length" property of bound functions.
+     *
+     * @param func The function to bind.
+     * @param thisArg The this binding of func.
+     * @param partials The arguments to be partially applied.
+     * @return Returns the new bound function.
+     */
+    (thisArg: any): (...args: any[]) => any;
+}
+
+declare const bind: Bind;
+export = bind;
diff --git a/types/lodash/fp/bindAll.d.ts b/types/lodash/fp/bindAll.d.ts
new file mode 100644
index 0000000000..98275d8d79
--- /dev/null
+++ b/types/lodash/fp/bindAll.d.ts
@@ -0,0 +1,78 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface BindAll {
+    /**
+     * Binds methods of an object to the object itself, overwriting the existing method. Method names may be
+     * specified as individual arguments or as arrays of method names. If no method names are provided all
+     * enumerable function properties, own and inherited, of object are bound.
+     *
+     * Note: This method does not set the "length" property of bound functions.
+     *
+     * @param object The object to bind and assign the bound methods to.
+     * @param methodNames The object method names to bind, specified as individual method names or arrays of
+     * method names.
+     * @return Returns object.
+     */
+    (): BindAll;
+    /**
+     * Binds methods of an object to the object itself, overwriting the existing method. Method names may be
+     * specified as individual arguments or as arrays of method names. If no method names are provided all
+     * enumerable function properties, own and inherited, of object are bound.
+     *
+     * Note: This method does not set the "length" property of bound functions.
+     *
+     * @param object The object to bind and assign the bound methods to.
+     * @param methodNames The object method names to bind, specified as individual method names or arrays of
+     * method names.
+     * @return Returns object.
+     */
+    (methodNames: _.Many<string>): BindAll1x1;
+    /**
+     * Binds methods of an object to the object itself, overwriting the existing method. Method names may be
+     * specified as individual arguments or as arrays of method names. If no method names are provided all
+     * enumerable function properties, own and inherited, of object are bound.
+     *
+     * Note: This method does not set the "length" property of bound functions.
+     *
+     * @param object The object to bind and assign the bound methods to.
+     * @param methodNames The object method names to bind, specified as individual method names or arrays of
+     * method names.
+     * @return Returns object.
+     */
+    <T>(methodNames: _.Many<string>, object: T): T;
+}
+interface BindAll1x1 {
+    /**
+     * Binds methods of an object to the object itself, overwriting the existing method. Method names may be
+     * specified as individual arguments or as arrays of method names. If no method names are provided all
+     * enumerable function properties, own and inherited, of object are bound.
+     *
+     * Note: This method does not set the "length" property of bound functions.
+     *
+     * @param object The object to bind and assign the bound methods to.
+     * @param methodNames The object method names to bind, specified as individual method names or arrays of
+     * method names.
+     * @return Returns object.
+     */
+    (): BindAll1x1;
+    /**
+     * Binds methods of an object to the object itself, overwriting the existing method. Method names may be
+     * specified as individual arguments or as arrays of method names. If no method names are provided all
+     * enumerable function properties, own and inherited, of object are bound.
+     *
+     * Note: This method does not set the "length" property of bound functions.
+     *
+     * @param object The object to bind and assign the bound methods to.
+     * @param methodNames The object method names to bind, specified as individual method names or arrays of
+     * method names.
+     * @return Returns object.
+     */
+    <T>(object: T): T;
+}
+
+declare const bindAll: BindAll;
+export = bindAll;
diff --git a/types/lodash/fp/bindKey.d.ts b/types/lodash/fp/bindKey.d.ts
new file mode 100644
index 0000000000..c20c5b1901
--- /dev/null
+++ b/types/lodash/fp/bindKey.d.ts
@@ -0,0 +1,91 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface BindKey {
+    /**
+     * Creates a function that invokes the method at object[key] and prepends any additional _.bindKey arguments
+     * to those provided to the bound function.
+     *
+     * This method differs from _.bind by allowing bound functions to reference methods that may be redefined
+     * or don’t yet exist. See Peter Michaux’s article for more details.
+     *
+     * The _.bindKey.placeholder value, which defaults to _ in monolithic builds, may be used as a placeholder
+     * for partially applied arguments.
+     *
+     * @param object The object the method belongs to.
+     * @param key The key of the method.
+     * @param partials The arguments to be partially applied.
+     * @return Returns the new bound function.
+     */
+    (): BindKey;
+    /**
+     * Creates a function that invokes the method at object[key] and prepends any additional _.bindKey arguments
+     * to those provided to the bound function.
+     *
+     * This method differs from _.bind by allowing bound functions to reference methods that may be redefined
+     * or don’t yet exist. See Peter Michaux’s article for more details.
+     *
+     * The _.bindKey.placeholder value, which defaults to _ in monolithic builds, may be used as a placeholder
+     * for partially applied arguments.
+     *
+     * @param object The object the method belongs to.
+     * @param key The key of the method.
+     * @param partials The arguments to be partially applied.
+     * @return Returns the new bound function.
+     */
+    (object: object): BindKey1x1;
+    /**
+     * Creates a function that invokes the method at object[key] and prepends any additional _.bindKey arguments
+     * to those provided to the bound function.
+     *
+     * This method differs from _.bind by allowing bound functions to reference methods that may be redefined
+     * or don’t yet exist. See Peter Michaux’s article for more details.
+     *
+     * The _.bindKey.placeholder value, which defaults to _ in monolithic builds, may be used as a placeholder
+     * for partially applied arguments.
+     *
+     * @param object The object the method belongs to.
+     * @param key The key of the method.
+     * @param partials The arguments to be partially applied.
+     * @return Returns the new bound function.
+     */
+    (object: object, key: string): (...args: any[]) => any;
+}
+interface BindKey1x1 {
+    /**
+     * Creates a function that invokes the method at object[key] and prepends any additional _.bindKey arguments
+     * to those provided to the bound function.
+     *
+     * This method differs from _.bind by allowing bound functions to reference methods that may be redefined
+     * or don’t yet exist. See Peter Michaux’s article for more details.
+     *
+     * The _.bindKey.placeholder value, which defaults to _ in monolithic builds, may be used as a placeholder
+     * for partially applied arguments.
+     *
+     * @param object The object the method belongs to.
+     * @param key The key of the method.
+     * @param partials The arguments to be partially applied.
+     * @return Returns the new bound function.
+     */
+    (): BindKey1x1;
+    /**
+     * Creates a function that invokes the method at object[key] and prepends any additional _.bindKey arguments
+     * to those provided to the bound function.
+     *
+     * This method differs from _.bind by allowing bound functions to reference methods that may be redefined
+     * or don’t yet exist. See Peter Michaux’s article for more details.
+     *
+     * The _.bindKey.placeholder value, which defaults to _ in monolithic builds, may be used as a placeholder
+     * for partially applied arguments.
+     *
+     * @param object The object the method belongs to.
+     * @param key The key of the method.
+     * @param partials The arguments to be partially applied.
+     * @return Returns the new bound function.
+     */
+    (key: string): (...args: any[]) => any;
+}
+
+declare const bindKey: BindKey;
+export = bindKey;
diff --git a/types/lodash/fp/camelCase.d.ts b/types/lodash/fp/camelCase.d.ts
new file mode 100644
index 0000000000..81d33d61c7
--- /dev/null
+++ b/types/lodash/fp/camelCase.d.ts
@@ -0,0 +1,15 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type CamelCase =
+    /**
+     * Converts string to camel case.
+     *
+     * @param string The string to convert.
+     * @return Returns the camel cased string.
+     */
+    (string: string) => string;
+
+declare const camelCase: CamelCase;
+export = camelCase;
diff --git a/types/lodash/fp/capitalize.d.ts b/types/lodash/fp/capitalize.d.ts
new file mode 100644
index 0000000000..988421b101
--- /dev/null
+++ b/types/lodash/fp/capitalize.d.ts
@@ -0,0 +1,15 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type Capitalize =
+    /**
+     * Converts the first character of string to upper case and the remaining to lower case.
+     *
+     * @param string The string to capitalize.
+     * @return Returns the capitalized string.
+     */
+    (string: string) => string;
+
+declare const capitalize: Capitalize;
+export = capitalize;
diff --git a/types/lodash/fp/castArray.d.ts b/types/lodash/fp/castArray.d.ts
new file mode 100644
index 0000000000..9d5b5fc11b
--- /dev/null
+++ b/types/lodash/fp/castArray.d.ts
@@ -0,0 +1,17 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+type CastArray =
+    /**
+     * Casts value as an array if it’s not one.
+     *
+     * @param value The value to inspect.
+     * @return Returns the cast array.
+     */
+    <T>(value: _.Many<T>) => T[];
+
+declare const castArray: CastArray;
+export = castArray;
diff --git a/types/lodash/fp/ceil.d.ts b/types/lodash/fp/ceil.d.ts
new file mode 100644
index 0000000000..e360c5bc08
--- /dev/null
+++ b/types/lodash/fp/ceil.d.ts
@@ -0,0 +1,16 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type Ceil =
+    /**
+     * Calculates n rounded up to precision.
+     *
+     * @param n The number to round up.
+     * @param precision The precision to round up to.
+     * @return Returns the rounded up number.
+     */
+    (n: number) => number;
+
+declare const ceil: Ceil;
+export = ceil;
diff --git a/types/lodash/fp/chunk.d.ts b/types/lodash/fp/chunk.d.ts
new file mode 100644
index 0000000000..8506a60c56
--- /dev/null
+++ b/types/lodash/fp/chunk.d.ts
@@ -0,0 +1,58 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Chunk {
+    /**
+     * Creates an array of elements split into groups the length of size. If collection can’t be split evenly, the
+     * final chunk will be the remaining elements.
+     *
+     * @param array The array to process.
+     * @param size The length of each chunk.
+     * @return Returns the new array containing chunks.
+     */
+    (): Chunk;
+    /**
+     * Creates an array of elements split into groups the length of size. If collection can’t be split evenly, the
+     * final chunk will be the remaining elements.
+     *
+     * @param array The array to process.
+     * @param size The length of each chunk.
+     * @return Returns the new array containing chunks.
+     */
+    (size: number): Chunk1x1;
+    /**
+     * Creates an array of elements split into groups the length of size. If collection can’t be split evenly, the
+     * final chunk will be the remaining elements.
+     *
+     * @param array The array to process.
+     * @param size The length of each chunk.
+     * @return Returns the new array containing chunks.
+     */
+    <T>(size: number, array: _.List<T> | null | undefined): T[][];
+}
+interface Chunk1x1 {
+    /**
+     * Creates an array of elements split into groups the length of size. If collection can’t be split evenly, the
+     * final chunk will be the remaining elements.
+     *
+     * @param array The array to process.
+     * @param size The length of each chunk.
+     * @return Returns the new array containing chunks.
+     */
+    (): Chunk1x1;
+    /**
+     * Creates an array of elements split into groups the length of size. If collection can’t be split evenly, the
+     * final chunk will be the remaining elements.
+     *
+     * @param array The array to process.
+     * @param size The length of each chunk.
+     * @return Returns the new array containing chunks.
+     */
+    <T>(array: _.List<T> | null | undefined): T[][];
+}
+
+declare const chunk: Chunk;
+export = chunk;
diff --git a/types/lodash/fp/clamp.d.ts b/types/lodash/fp/clamp.d.ts
new file mode 100644
index 0000000000..7683abc761
--- /dev/null
+++ b/types/lodash/fp/clamp.d.ts
@@ -0,0 +1,166 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface Clamp {
+    /**
+     * Clamps `number` within the inclusive `lower` and `upper` bounds.
+     *
+     * @category Number
+     * @param number The number to clamp.
+     * @param [lower] The lower bound.
+     * @param upper The upper bound.
+     * @returns Returns the clamped number.
+     * @example
+     *
+     * _.clamp(-10, -5, 5);
+     * // => -5
+     *
+     * _.clamp(10, -5, 5);
+     * // => 5
+     */
+    (): Clamp;
+    /**
+     * Clamps `number` within the inclusive `lower` and `upper` bounds.
+     *
+     * @category Number
+     * @param number The number to clamp.
+     * @param [lower] The lower bound.
+     * @param upper The upper bound.
+     * @returns Returns the clamped number.
+     * @example
+     *
+     * _.clamp(-10, -5, 5);
+     * // => -5
+     *
+     * _.clamp(10, -5, 5);
+     * // => 5
+     */
+    (lower: number): Clamp1x1;
+    /**
+     * Clamps `number` within the inclusive `lower` and `upper` bounds.
+     *
+     * @category Number
+     * @param number The number to clamp.
+     * @param [lower] The lower bound.
+     * @param upper The upper bound.
+     * @returns Returns the clamped number.
+     * @example
+     *
+     * _.clamp(-10, -5, 5);
+     * // => -5
+     *
+     * _.clamp(10, -5, 5);
+     * // => 5
+     */
+    (lower: number, upper: number): Clamp1x2;
+    /**
+     * Clamps `number` within the inclusive `lower` and `upper` bounds.
+     *
+     * @category Number
+     * @param number The number to clamp.
+     * @param [lower] The lower bound.
+     * @param upper The upper bound.
+     * @returns Returns the clamped number.
+     * @example
+     *
+     * _.clamp(-10, -5, 5);
+     * // => -5
+     *
+     * _.clamp(10, -5, 5);
+     * // => 5
+     */
+    (lower: number, upper: number, number: number): number;
+}
+interface Clamp1x1 {
+    /**
+     * Clamps `number` within the inclusive `lower` and `upper` bounds.
+     *
+     * @category Number
+     * @param number The number to clamp.
+     * @param [lower] The lower bound.
+     * @param upper The upper bound.
+     * @returns Returns the clamped number.
+     * @example
+     *
+     * _.clamp(-10, -5, 5);
+     * // => -5
+     *
+     * _.clamp(10, -5, 5);
+     * // => 5
+     */
+    (): Clamp1x1;
+    /**
+     * Clamps `number` within the inclusive `lower` and `upper` bounds.
+     *
+     * @category Number
+     * @param number The number to clamp.
+     * @param [lower] The lower bound.
+     * @param upper The upper bound.
+     * @returns Returns the clamped number.
+     * @example
+     *
+     * _.clamp(-10, -5, 5);
+     * // => -5
+     *
+     * _.clamp(10, -5, 5);
+     * // => 5
+     */
+    (upper: number): Clamp1x2;
+    /**
+     * Clamps `number` within the inclusive `lower` and `upper` bounds.
+     *
+     * @category Number
+     * @param number The number to clamp.
+     * @param [lower] The lower bound.
+     * @param upper The upper bound.
+     * @returns Returns the clamped number.
+     * @example
+     *
+     * _.clamp(-10, -5, 5);
+     * // => -5
+     *
+     * _.clamp(10, -5, 5);
+     * // => 5
+     */
+    (upper: number, number: number): number;
+}
+interface Clamp1x2 {
+    /**
+     * Clamps `number` within the inclusive `lower` and `upper` bounds.
+     *
+     * @category Number
+     * @param number The number to clamp.
+     * @param [lower] The lower bound.
+     * @param upper The upper bound.
+     * @returns Returns the clamped number.
+     * @example
+     *
+     * _.clamp(-10, -5, 5);
+     * // => -5
+     *
+     * _.clamp(10, -5, 5);
+     * // => 5
+     */
+    (): Clamp1x2;
+    /**
+     * Clamps `number` within the inclusive `lower` and `upper` bounds.
+     *
+     * @category Number
+     * @param number The number to clamp.
+     * @param [lower] The lower bound.
+     * @param upper The upper bound.
+     * @returns Returns the clamped number.
+     * @example
+     *
+     * _.clamp(-10, -5, 5);
+     * // => -5
+     *
+     * _.clamp(10, -5, 5);
+     * // => 5
+     */
+    (number: number): number;
+}
+
+declare const clamp: Clamp;
+export = clamp;
diff --git a/types/lodash/fp/clone.d.ts b/types/lodash/fp/clone.d.ts
new file mode 100644
index 0000000000..b6b00ae301
--- /dev/null
+++ b/types/lodash/fp/clone.d.ts
@@ -0,0 +1,20 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type Clone =
+    /**
+     * Creates a shallow clone of value.
+     *
+     * Note: This method is loosely based on the structured clone algorithm and supports cloning arrays,
+     * array buffers, booleans, date objects, maps, numbers, Object objects, regexes, sets, strings, symbols,
+     * and typed arrays. The own enumerable properties of arguments objects are cloned as plain objects. An empty
+     * object is returned for uncloneable values such as error objects, functions, DOM nodes, and WeakMaps.
+     *
+     * @param value The value to clone.
+     * @return Returns the cloned value.
+     */
+    <T>(value: T) => T;
+
+declare const clone: Clone;
+export = clone;
diff --git a/types/lodash/fp/cloneDeep.d.ts b/types/lodash/fp/cloneDeep.d.ts
new file mode 100644
index 0000000000..85d7137e57
--- /dev/null
+++ b/types/lodash/fp/cloneDeep.d.ts
@@ -0,0 +1,15 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type CloneDeep =
+    /**
+     * This method is like _.clone except that it recursively clones value.
+     *
+     * @param value The value to recursively clone.
+     * @return Returns the deep cloned value.
+     */
+    <T>(value: T) => T;
+
+declare const cloneDeep: CloneDeep;
+export = cloneDeep;
diff --git a/types/lodash/fp/cloneDeepWith.d.ts b/types/lodash/fp/cloneDeepWith.d.ts
new file mode 100644
index 0000000000..caaeb278a7
--- /dev/null
+++ b/types/lodash/fp/cloneDeepWith.d.ts
@@ -0,0 +1,53 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface CloneDeepWith {
+    /**
+     * This method is like _.cloneWith except that it recursively clones value.
+     *
+     * @param value The value to recursively clone.
+     * @param customizer The function to customize cloning.
+     * @return Returns the deep cloned value.
+     */
+    (): CloneDeepWith;
+    /**
+     * This method is like _.cloneWith except that it recursively clones value.
+     *
+     * @param value The value to recursively clone.
+     * @param customizer The function to customize cloning.
+     * @return Returns the deep cloned value.
+     */
+    <T>(customizer: _.CloneDeepWithCustomizer<T>): CloneDeepWith1x1<T>;
+    /**
+     * This method is like _.cloneWith except that it recursively clones value.
+     *
+     * @param value The value to recursively clone.
+     * @param customizer The function to customize cloning.
+     * @return Returns the deep cloned value.
+     */
+    <T>(customizer: _.CloneDeepWithCustomizer<T>, value: T): any;
+}
+interface CloneDeepWith1x1<T> {
+    /**
+     * This method is like _.cloneWith except that it recursively clones value.
+     *
+     * @param value The value to recursively clone.
+     * @param customizer The function to customize cloning.
+     * @return Returns the deep cloned value.
+     */
+    (): CloneDeepWith1x1<T>;
+    /**
+     * This method is like _.cloneWith except that it recursively clones value.
+     *
+     * @param value The value to recursively clone.
+     * @param customizer The function to customize cloning.
+     * @return Returns the deep cloned value.
+     */
+    (value: T): any;
+}
+
+declare const cloneDeepWith: CloneDeepWith;
+export = cloneDeepWith;
diff --git a/types/lodash/fp/cloneWith.d.ts b/types/lodash/fp/cloneWith.d.ts
new file mode 100644
index 0000000000..de29399631
--- /dev/null
+++ b/types/lodash/fp/cloneWith.d.ts
@@ -0,0 +1,96 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface CloneWith {
+    /**
+     * This method is like _.clone except that it accepts customizer which is invoked to produce the cloned value.
+     * If customizer returns undefined cloning is handled by the method instead.
+     *
+     * @param value The value to clone.
+     * @param customizer The function to customize cloning.
+     * @return Returns the cloned value.
+     */
+    (): CloneWith;
+    /**
+     * This method is like _.clone except that it accepts customizer which is invoked to produce the cloned value.
+     * If customizer returns undefined cloning is handled by the method instead.
+     *
+     * @param value The value to clone.
+     * @param customizer The function to customize cloning.
+     * @return Returns the cloned value.
+     */
+    <T, TResult extends object | string | number | boolean | null>(customizer: _.CloneWithCustomizer<T, TResult>): CloneWith1x1<T, TResult>;
+    /**
+     * This method is like _.clone except that it accepts customizer which is invoked to produce the cloned value.
+     * If customizer returns undefined cloning is handled by the method instead.
+     *
+     * @param value The value to clone.
+     * @param customizer The function to customize cloning.
+     * @return Returns the cloned value.
+     */
+    <T, TResult extends object | string | number | boolean | null>(customizer: _.CloneWithCustomizer<T, TResult>, value: T): TResult;
+    /**
+     * This method is like _.clone except that it accepts customizer which is invoked to produce the cloned value.
+     * If customizer returns undefined cloning is handled by the method instead.
+     *
+     * @param value The value to clone.
+     * @param customizer The function to customize cloning.
+     * @return Returns the cloned value.
+     */
+    <T, TResult>(customizer: _.CloneWithCustomizer<T, TResult | undefined>): CloneWith2x1<T, TResult>;
+    /**
+     * This method is like _.clone except that it accepts customizer which is invoked to produce the cloned value.
+     * If customizer returns undefined cloning is handled by the method instead.
+     *
+     * @param value The value to clone.
+     * @param customizer The function to customize cloning.
+     * @return Returns the cloned value.
+     */
+    <T, TResult>(customizer: _.CloneWithCustomizer<T, TResult | undefined>, value: T): TResult | T;
+}
+interface CloneWith1x1<T, TResult extends object | string | number | boolean | null> {
+    /**
+     * This method is like _.clone except that it accepts customizer which is invoked to produce the cloned value.
+     * If customizer returns undefined cloning is handled by the method instead.
+     *
+     * @param value The value to clone.
+     * @param customizer The function to customize cloning.
+     * @return Returns the cloned value.
+     */
+    (): CloneWith1x1<T, TResult>;
+    /**
+     * This method is like _.clone except that it accepts customizer which is invoked to produce the cloned value.
+     * If customizer returns undefined cloning is handled by the method instead.
+     *
+     * @param value The value to clone.
+     * @param customizer The function to customize cloning.
+     * @return Returns the cloned value.
+     */
+    (value: T): TResult;
+}
+interface CloneWith2x1<T, TResult> {
+    /**
+     * This method is like _.clone except that it accepts customizer which is invoked to produce the cloned value.
+     * If customizer returns undefined cloning is handled by the method instead.
+     *
+     * @param value The value to clone.
+     * @param customizer The function to customize cloning.
+     * @return Returns the cloned value.
+     */
+    (): CloneWith2x1<T, TResult>;
+    /**
+     * This method is like _.clone except that it accepts customizer which is invoked to produce the cloned value.
+     * If customizer returns undefined cloning is handled by the method instead.
+     *
+     * @param value The value to clone.
+     * @param customizer The function to customize cloning.
+     * @return Returns the cloned value.
+     */
+    (value: T): TResult | T;
+}
+
+declare const cloneWith: CloneWith;
+export = cloneWith;
diff --git a/types/lodash/fp/compact.d.ts b/types/lodash/fp/compact.d.ts
new file mode 100644
index 0000000000..4b1c509117
--- /dev/null
+++ b/types/lodash/fp/compact.d.ts
@@ -0,0 +1,18 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+type Compact =
+    /**
+     * Creates an array with all falsey values removed. The values false, null, 0, "", undefined, and NaN are
+     * falsey.
+     *
+     * @param array The array to compact.
+     * @return Returns the new array of filtered values.
+     */
+    <T>(array: _.List<T | null | undefined | false | "" | 0> | null | undefined) => T[];
+
+declare const compact: Compact;
+export = compact;
diff --git a/types/lodash/fp/complement.d.ts b/types/lodash/fp/complement.d.ts
new file mode 100644
index 0000000000..397bab4997
--- /dev/null
+++ b/types/lodash/fp/complement.d.ts
@@ -0,0 +1,16 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type Negate =
+    /**
+     * Creates a function that negates the result of the predicate func. The func predicate is invoked with
+     * the this binding and arguments of the created function.
+     *
+     * @param predicate The predicate to negate.
+     * @return Returns the new function.
+     */
+    <T extends (...args: any[]) => any>(predicate: T) => T;
+
+declare const complement: Negate;
+export = complement;
diff --git a/types/lodash/fp/compose.d.ts b/types/lodash/fp/compose.d.ts
new file mode 100644
index 0000000000..6d626496ae
--- /dev/null
+++ b/types/lodash/fp/compose.d.ts
@@ -0,0 +1,315 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface FlowRight {
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <R2, R1>(f2: (a: R1) => R2, f1: () => R1): () => R2;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <R3, R2, R1>(f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): () => R3;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <R4, R3, R2, R1>(f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): () => R4;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <R5, R4, R3, R2, R1>(f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): () => R5;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <R6, R5, R4, R3, R2, R1>(f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): () => R6;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <R7, R6, R5, R4, R3, R2, R1>(f7: (a: R6) => R7, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): () => R7;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, R2, R1>(f2: (a: R1) => R2, f1: (a1: A1) => R1): (a1: A1) => R2;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, R3, R2, R1>(f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): (a1: A1) => R3;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, R4, R3, R2, R1>(f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): (a1: A1) => R4;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, R5, R4, R3, R2, R1>(f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): (a1: A1) => R5;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, R6, R5, R4, R3, R2, R1>(f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): (a1: A1) => R6;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, R7, R6, R5, R4, R3, R2, R1>(f7: (a: R6) => R7, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): (a1: A1) => R7;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, R2, R1>(f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): (a1: A1, a2: A2) => R2;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, R3, R2, R1>(f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): (a1: A1, a2: A2) => R3;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, R4, R3, R2, R1>(f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): (a1: A1, a2: A2) => R4;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, R5, R4, R3, R2, R1>(f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): (a1: A1, a2: A2) => R5;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, R6, R5, R4, R3, R2, R1>(f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): (a1: A1, a2: A2) => R6;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, R7, R6, R5, R4, R3, R2, R1>(f7: (a: R6) => R7, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): (a1: A1, a2: A2) => R7;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, R2, R1>(f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): (a1: A1, a2: A2, a3: A3) => R2;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, R3, R2, R1>(f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): (a1: A1, a2: A2, a3: A3) => R3;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, R4, R3, R2, R1>(f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): (a1: A1, a2: A2, a3: A3) => R4;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, R5, R4, R3, R2, R1>(f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): (a1: A1, a2: A2, a3: A3) => R5;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, R6, R5, R4, R3, R2, R1>(f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): (a1: A1, a2: A2, a3: A3) => R6;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, R7, R6, R5, R4, R3, R2, R1>(f7: (a: R6) => R7, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): (a1: A1, a2: A2, a3: A3) => R7;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, A4, R2, R1>(f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): (a1: A1, a2: A2, a3: A3, a4: A4) => R2;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, A4, R3, R2, R1>(f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): (a1: A1, a2: A2, a3: A3, a4: A4) => R3;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, A4, R4, R3, R2, R1>(f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): (a1: A1, a2: A2, a3: A3, a4: A4) => R4;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, A4, R5, R4, R3, R2, R1>(f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): (a1: A1, a2: A2, a3: A3, a4: A4) => R5;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, A4, R6, R5, R4, R3, R2, R1>(f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): (a1: A1, a2: A2, a3: A3, a4: A4) => R6;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, A4, R7, R6, R5, R4, R3, R2, R1>(f7: (a: R6) => R7, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): (a1: A1, a2: A2, a3: A3, a4: A4) => R7;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <R2, R1>(f2: (a: R1) => R2, f1: (...args: any[]) => R1): (...args: any[]) => R2;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <R3, R2, R1>(f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): (...args: any[]) => R3;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <R4, R3, R2, R1>(f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): (...args: any[]) => R4;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <R5, R4, R3, R2, R1>(f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): (...args: any[]) => R5;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <R6, R5, R4, R3, R2, R1>(f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): (...args: any[]) => R6;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <R7, R6, R5, R4, R3, R2, R1>(f7: (a: R6) => R7, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): (...args: any[]) => R7;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    (f7: (a: any) => any, f6: (a: any) => any, f5: (a: any) => any, f4: (a: any) => any, f3: (a: any) => any, f2: (a: any) => any, f1: () => any, ...funcs: Array<_.Many<(...args: any[]) => any>>): (...args: any[]) => any;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    (funcs: Array<_.Many<(...args: any[]) => any>>): (...args: any[]) => any;
+}
+
+declare const compose: FlowRight;
+export = compose;
diff --git a/types/lodash/fp/concat.d.ts b/types/lodash/fp/concat.d.ts
new file mode 100644
index 0000000000..a68dce878a
--- /dev/null
+++ b/types/lodash/fp/concat.d.ts
@@ -0,0 +1,113 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Concat {
+    /**
+     * Creates a new array concatenating `array` with any additional arrays
+     * and/or values.
+     *
+     * @category Array
+     * @param array The array to concatenate.
+     * @param [values] The values to concatenate.
+     * @returns Returns the new concatenated array.
+     * @example
+     *
+     * var array = [1];
+     * var other = _.concat(array, 2, [3], [[4]]);
+     *
+     * console.log(other);
+     * // => [1, 2, 3, [4]]
+     *
+     * console.log(array);
+     * // => [1]
+     */
+    (): Concat;
+    /**
+     * Creates a new array concatenating `array` with any additional arrays
+     * and/or values.
+     *
+     * @category Array
+     * @param array The array to concatenate.
+     * @param [values] The values to concatenate.
+     * @returns Returns the new concatenated array.
+     * @example
+     *
+     * var array = [1];
+     * var other = _.concat(array, 2, [3], [[4]]);
+     *
+     * console.log(other);
+     * // => [1, 2, 3, [4]]
+     *
+     * console.log(array);
+     * // => [1]
+     */
+    <T>(array: _.Many<T>): Concat1x1<T>;
+    /**
+     * Creates a new array concatenating `array` with any additional arrays
+     * and/or values.
+     *
+     * @category Array
+     * @param array The array to concatenate.
+     * @param [values] The values to concatenate.
+     * @returns Returns the new concatenated array.
+     * @example
+     *
+     * var array = [1];
+     * var other = _.concat(array, 2, [3], [[4]]);
+     *
+     * console.log(other);
+     * // => [1, 2, 3, [4]]
+     *
+     * console.log(array);
+     * // => [1]
+     */
+    <T>(array: _.Many<T>, values: _.Many<T>): T[];
+}
+interface Concat1x1<T> {
+    /**
+     * Creates a new array concatenating `array` with any additional arrays
+     * and/or values.
+     *
+     * @category Array
+     * @param array The array to concatenate.
+     * @param [values] The values to concatenate.
+     * @returns Returns the new concatenated array.
+     * @example
+     *
+     * var array = [1];
+     * var other = _.concat(array, 2, [3], [[4]]);
+     *
+     * console.log(other);
+     * // => [1, 2, 3, [4]]
+     *
+     * console.log(array);
+     * // => [1]
+     */
+    (): Concat1x1<T>;
+    /**
+     * Creates a new array concatenating `array` with any additional arrays
+     * and/or values.
+     *
+     * @category Array
+     * @param array The array to concatenate.
+     * @param [values] The values to concatenate.
+     * @returns Returns the new concatenated array.
+     * @example
+     *
+     * var array = [1];
+     * var other = _.concat(array, 2, [3], [[4]]);
+     *
+     * console.log(other);
+     * // => [1, 2, 3, [4]]
+     *
+     * console.log(array);
+     * // => [1]
+     */
+    (values: _.Many<T>): T[];
+}
+
+declare const concat: Concat;
+export = concat;
diff --git a/types/lodash/fp/cond.d.ts b/types/lodash/fp/cond.d.ts
new file mode 100644
index 0000000000..c5a18575a6
--- /dev/null
+++ b/types/lodash/fp/cond.d.ts
@@ -0,0 +1,38 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+type Cond =
+    /**
+     * Creates a function that iterates over `pairs` and invokes the corresponding
+     * function of the first predicate to return truthy. The predicate-function
+     * pairs are invoked with the `this` binding and arguments of the created
+     * function.
+     *
+     * @since 4.0.0
+     * @category Util
+     * @param pairs The predicate-function pairs.
+     * @returns Returns the new composite function.
+     * @example
+     *
+     * var func = _.cond([
+     *   [_.matches({ 'a': 1 }),   _.constant('matches A')],
+     *   [_.conforms({ 'b': _.isNumber }), _.constant('matches B')],
+     *   [_.stubTrue,  _.constant('no match')]
+     * ]);
+     *
+     * func({ 'a': 1, 'b': 2 });
+     * // => 'matches A'
+     *
+     * func({ 'a': 0, 'b': 1 });
+     * // => 'matches B'
+     *
+     * func({ 'a': '1', 'b': '2' });
+     * // => 'no match'
+     */
+    <T, R>(pairs: Array<_.CondPair<T, R>>) => (Target: T) => R;
+
+declare const cond: Cond;
+export = cond;
diff --git a/types/lodash/fp/conforms.d.ts b/types/lodash/fp/conforms.d.ts
new file mode 100644
index 0000000000..6499cccf55
--- /dev/null
+++ b/types/lodash/fp/conforms.d.ts
@@ -0,0 +1,48 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface ConformsTo {
+    /**
+     * Checks if object conforms to source by invoking the predicate properties of source with the
+     * corresponding property values of object.
+     *
+     * Note: This method is equivalent to _.conforms when source is partially applied.
+     */
+    (): ConformsTo;
+    /**
+     * Checks if object conforms to source by invoking the predicate properties of source with the
+     * corresponding property values of object.
+     *
+     * Note: This method is equivalent to _.conforms when source is partially applied.
+     */
+    <T>(source: _.ConformsPredicateObject<T>): ConformsTo1x1<T>;
+    /**
+     * Checks if object conforms to source by invoking the predicate properties of source with the
+     * corresponding property values of object.
+     *
+     * Note: This method is equivalent to _.conforms when source is partially applied.
+     */
+    <T>(source: _.ConformsPredicateObject<T>, object: T): boolean;
+}
+interface ConformsTo1x1<T> {
+    /**
+     * Checks if object conforms to source by invoking the predicate properties of source with the
+     * corresponding property values of object.
+     *
+     * Note: This method is equivalent to _.conforms when source is partially applied.
+     */
+    (): ConformsTo1x1<T>;
+    /**
+     * Checks if object conforms to source by invoking the predicate properties of source with the
+     * corresponding property values of object.
+     *
+     * Note: This method is equivalent to _.conforms when source is partially applied.
+     */
+    (object: T): boolean;
+}
+
+declare const conforms: ConformsTo;
+export = conforms;
diff --git a/types/lodash/fp/conformsTo.d.ts b/types/lodash/fp/conformsTo.d.ts
new file mode 100644
index 0000000000..9512e4adf6
--- /dev/null
+++ b/types/lodash/fp/conformsTo.d.ts
@@ -0,0 +1,48 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface ConformsTo {
+    /**
+     * Checks if object conforms to source by invoking the predicate properties of source with the
+     * corresponding property values of object.
+     *
+     * Note: This method is equivalent to _.conforms when source is partially applied.
+     */
+    (): ConformsTo;
+    /**
+     * Checks if object conforms to source by invoking the predicate properties of source with the
+     * corresponding property values of object.
+     *
+     * Note: This method is equivalent to _.conforms when source is partially applied.
+     */
+    <T>(source: _.ConformsPredicateObject<T>): ConformsTo1x1<T>;
+    /**
+     * Checks if object conforms to source by invoking the predicate properties of source with the
+     * corresponding property values of object.
+     *
+     * Note: This method is equivalent to _.conforms when source is partially applied.
+     */
+    <T>(source: _.ConformsPredicateObject<T>, object: T): boolean;
+}
+interface ConformsTo1x1<T> {
+    /**
+     * Checks if object conforms to source by invoking the predicate properties of source with the
+     * corresponding property values of object.
+     *
+     * Note: This method is equivalent to _.conforms when source is partially applied.
+     */
+    (): ConformsTo1x1<T>;
+    /**
+     * Checks if object conforms to source by invoking the predicate properties of source with the
+     * corresponding property values of object.
+     *
+     * Note: This method is equivalent to _.conforms when source is partially applied.
+     */
+    (object: T): boolean;
+}
+
+declare const conformsTo: ConformsTo;
+export = conformsTo;
diff --git a/types/lodash/fp/constant.d.ts b/types/lodash/fp/constant.d.ts
new file mode 100644
index 0000000000..718805e17f
--- /dev/null
+++ b/types/lodash/fp/constant.d.ts
@@ -0,0 +1,15 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type Constant =
+    /**
+     * Creates a function that returns value.
+     *
+     * @param value The value to return from the new function.
+     * @return Returns the new function.
+     */
+    <T>(value: T) => () => T;
+
+declare const constant: Constant;
+export = constant;
diff --git a/types/lodash/fp/contains.d.ts b/types/lodash/fp/contains.d.ts
new file mode 100644
index 0000000000..b80ca7f1fa
--- /dev/null
+++ b/types/lodash/fp/contains.d.ts
@@ -0,0 +1,63 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Includes {
+    /**
+     * Checks if target is in collection using SameValueZero for equality comparisons. If fromIndex is negative,
+     * it’s used as the offset from the end of collection.
+     *
+     * @param collection The collection to search.
+     * @param target The value to search for.
+     * @param fromIndex The index to search from.
+     * @return True if the target element is found, else false.
+     */
+    (): Includes;
+    /**
+     * Checks if target is in collection using SameValueZero for equality comparisons. If fromIndex is negative,
+     * it’s used as the offset from the end of collection.
+     *
+     * @param collection The collection to search.
+     * @param target The value to search for.
+     * @param fromIndex The index to search from.
+     * @return True if the target element is found, else false.
+     */
+    <T>(target: T): Includes1x1<T>;
+    /**
+     * Checks if target is in collection using SameValueZero for equality comparisons. If fromIndex is negative,
+     * it’s used as the offset from the end of collection.
+     *
+     * @param collection The collection to search.
+     * @param target The value to search for.
+     * @param fromIndex The index to search from.
+     * @return True if the target element is found, else false.
+     */
+    <T>(target: T, collection: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): boolean;
+}
+interface Includes1x1<T> {
+    /**
+     * Checks if target is in collection using SameValueZero for equality comparisons. If fromIndex is negative,
+     * it’s used as the offset from the end of collection.
+     *
+     * @param collection The collection to search.
+     * @param target The value to search for.
+     * @param fromIndex The index to search from.
+     * @return True if the target element is found, else false.
+     */
+    (): Includes1x1<T>;
+    /**
+     * Checks if target is in collection using SameValueZero for equality comparisons. If fromIndex is negative,
+     * it’s used as the offset from the end of collection.
+     *
+     * @param collection The collection to search.
+     * @param target The value to search for.
+     * @param fromIndex The index to search from.
+     * @return True if the target element is found, else false.
+     */
+    (collection: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): boolean;
+}
+
+declare const contains: Includes;
+export = contains;
diff --git a/types/lodash/fp/convert.d.ts b/types/lodash/fp/convert.d.ts
new file mode 100644
index 0000000000..c06ecd9370
--- /dev/null
+++ b/types/lodash/fp/convert.d.ts
@@ -0,0 +1,15 @@
+interface ConvertOptions {
+    cap?: boolean;
+    curry?: boolean;
+    fixed?: boolean;
+    immutable?: boolean;
+    rearg?: boolean;
+}
+
+interface Convert {
+    (func: object, options?: ConvertOptions): any;
+    (name: string, func: (...args: any[]) => any, options?: ConvertOptions): any;
+}
+
+declare const convert: Convert;
+export = convert;
diff --git a/types/lodash/fp/countBy.d.ts b/types/lodash/fp/countBy.d.ts
new file mode 100644
index 0000000000..cca0ac3b02
--- /dev/null
+++ b/types/lodash/fp/countBy.d.ts
@@ -0,0 +1,225 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface CountBy {
+    /**
+     * Creates an object composed of keys generated from the results of running each element of collection through
+     * iteratee. The corresponding value of each key is the number of times the key was returned by iteratee. The
+     * iteratee is bound to thisArg and invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the composed aggregate object.
+     */
+    (): CountBy;
+    /**
+     * Creates an object composed of keys generated from the results of running each element of collection through
+     * iteratee. The corresponding value of each key is the number of times the key was returned by iteratee. The
+     * iteratee is bound to thisArg and invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the composed aggregate object.
+     */
+    <T>(iteratee: (value: string) => T): CountBy1x1;
+    /**
+     * Creates an object composed of keys generated from the results of running each element of collection through
+     * iteratee. The corresponding value of each key is the number of times the key was returned by iteratee. The
+     * iteratee is bound to thisArg and invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the composed aggregate object.
+     */
+    <T>(iteratee: (value: string) => T, collection: string | null | undefined): _.Dictionary<number>;
+    /**
+     * Creates an object composed of keys generated from the results of running each element of collection through
+     * iteratee. The corresponding value of each key is the number of times the key was returned by iteratee. The
+     * iteratee is bound to thisArg and invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the composed aggregate object.
+     */
+    <T>(iteratee: _.ValueIteratee<T>): CountBy2x1<T>;
+    /**
+     * Creates an object composed of keys generated from the results of running each element of collection through
+     * iteratee. The corresponding value of each key is the number of times the key was returned by iteratee. The
+     * iteratee is bound to thisArg and invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the composed aggregate object.
+     */
+    <T>(iteratee: _.ValueIteratee<T>, collection: _.List<T> | null | undefined): _.Dictionary<number>;
+    /**
+     * Creates an object composed of keys generated from the results of running each element of collection through
+     * iteratee. The corresponding value of each key is the number of times the key was returned by iteratee. The
+     * iteratee is bound to thisArg and invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the composed aggregate object.
+     */
+    <T extends object>(iteratee: _.ValueIteratee<T[keyof T]>, collection: T | null | undefined): _.Dictionary<number>;
+}
+interface CountBy1x1 {
+    /**
+     * Creates an object composed of keys generated from the results of running each element of collection through
+     * iteratee. The corresponding value of each key is the number of times the key was returned by iteratee. The
+     * iteratee is bound to thisArg and invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the composed aggregate object.
+     */
+    (): CountBy1x1;
+    /**
+     * Creates an object composed of keys generated from the results of running each element of collection through
+     * iteratee. The corresponding value of each key is the number of times the key was returned by iteratee. The
+     * iteratee is bound to thisArg and invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the composed aggregate object.
+     */
+    <T>(collection: string | null | undefined): _.Dictionary<number>;
+}
+interface CountBy2x1<T> {
+    /**
+     * Creates an object composed of keys generated from the results of running each element of collection through
+     * iteratee. The corresponding value of each key is the number of times the key was returned by iteratee. The
+     * iteratee is bound to thisArg and invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the composed aggregate object.
+     */
+    (): CountBy2x1<T>;
+    /**
+     * Creates an object composed of keys generated from the results of running each element of collection through
+     * iteratee. The corresponding value of each key is the number of times the key was returned by iteratee. The
+     * iteratee is bound to thisArg and invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the composed aggregate object.
+     */
+    (collection: _.List<T> | object | null | undefined): _.Dictionary<number>;
+}
+
+declare const countBy: CountBy;
+export = countBy;
diff --git a/types/lodash/fp/create.d.ts b/types/lodash/fp/create.d.ts
new file mode 100644
index 0000000000..6025931062
--- /dev/null
+++ b/types/lodash/fp/create.d.ts
@@ -0,0 +1,17 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type Create =
+    /**
+     * Creates an object that inherits from the given prototype object. If a properties object is provided its own
+     * enumerable properties are assigned to the created object.
+     *
+     * @param prototype The object to inherit from.
+     * @param properties The properties to assign to the object.
+     * @return Returns the new object.
+     */
+    <T extends object, U extends object>(prototype: T) => T & U;
+
+declare const create: Create;
+export = create;
diff --git a/types/lodash/fp/curry.d.ts b/types/lodash/fp/curry.d.ts
new file mode 100644
index 0000000000..6c946bbf67
--- /dev/null
+++ b/types/lodash/fp/curry.d.ts
@@ -0,0 +1,65 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Curry {
+    /**
+     * Creates a function that accepts one or more arguments of func that when called either invokes func returning
+     * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
+     * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
+     * @param func The function to curry.
+     * @param arity The arity of func.
+     * @return Returns the new curried function.
+     */
+    <T1, R>(func: (t1: T1) => R): _.CurriedFunction1<T1, R>;
+    /**
+     * Creates a function that accepts one or more arguments of func that when called either invokes func returning
+     * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
+     * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
+     * @param func The function to curry.
+     * @param arity The arity of func.
+     * @return Returns the new curried function.
+     */
+    <T1, T2, R>(func: (t1: T1, t2: T2) => R): _.CurriedFunction2<T1, T2, R>;
+    /**
+     * Creates a function that accepts one or more arguments of func that when called either invokes func returning
+     * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
+     * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
+     * @param func The function to curry.
+     * @param arity The arity of func.
+     * @return Returns the new curried function.
+     */
+    <T1, T2, T3, R>(func: (t1: T1, t2: T2, t3: T3) => R): _.CurriedFunction3<T1, T2, T3, R>;
+    /**
+     * Creates a function that accepts one or more arguments of func that when called either invokes func returning
+     * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
+     * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
+     * @param func The function to curry.
+     * @param arity The arity of func.
+     * @return Returns the new curried function.
+     */
+    <T1, T2, T3, T4, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4) => R): _.CurriedFunction4<T1, T2, T3, T4, R>;
+    /**
+     * Creates a function that accepts one or more arguments of func that when called either invokes func returning
+     * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
+     * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
+     * @param func The function to curry.
+     * @param arity The arity of func.
+     * @return Returns the new curried function.
+     */
+    <T1, T2, T3, T4, T5, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5) => R): _.CurriedFunction5<T1, T2, T3, T4, T5, R>;
+    /**
+     * Creates a function that accepts one or more arguments of func that when called either invokes func returning
+     * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
+     * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
+     * @param func The function to curry.
+     * @param arity The arity of func.
+     * @return Returns the new curried function.
+     */
+    (func: (...args: any[]) => any): (...args: any[]) => any;
+}
+
+declare const curry: Curry;
+export = curry;
diff --git a/types/lodash/fp/curryN.d.ts b/types/lodash/fp/curryN.d.ts
new file mode 100644
index 0000000000..4acbd81811
--- /dev/null
+++ b/types/lodash/fp/curryN.d.ts
@@ -0,0 +1,148 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Curry {
+    /**
+     * Creates a function that accepts one or more arguments of func that when called either invokes func returning
+     * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
+     * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
+     * @param func The function to curry.
+     * @param arity The arity of func.
+     * @return Returns the new curried function.
+     */
+    (): Curry;
+    /**
+     * Creates a function that accepts one or more arguments of func that when called either invokes func returning
+     * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
+     * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
+     * @param func The function to curry.
+     * @param arity The arity of func.
+     * @return Returns the new curried function.
+     */
+    (arity: number): Curry1x1;
+    /**
+     * Creates a function that accepts one or more arguments of func that when called either invokes func returning
+     * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
+     * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
+     * @param func The function to curry.
+     * @param arity The arity of func.
+     * @return Returns the new curried function.
+     */
+    <T1, R>(arity: number, func: (t1: T1) => R): _.CurriedFunction1<T1, R>;
+    /**
+     * Creates a function that accepts one or more arguments of func that when called either invokes func returning
+     * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
+     * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
+     * @param func The function to curry.
+     * @param arity The arity of func.
+     * @return Returns the new curried function.
+     */
+    <T1, T2, R>(arity: number, func: (t1: T1, t2: T2) => R): _.CurriedFunction2<T1, T2, R>;
+    /**
+     * Creates a function that accepts one or more arguments of func that when called either invokes func returning
+     * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
+     * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
+     * @param func The function to curry.
+     * @param arity The arity of func.
+     * @return Returns the new curried function.
+     */
+    <T1, T2, T3, R>(arity: number, func: (t1: T1, t2: T2, t3: T3) => R): _.CurriedFunction3<T1, T2, T3, R>;
+    /**
+     * Creates a function that accepts one or more arguments of func that when called either invokes func returning
+     * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
+     * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
+     * @param func The function to curry.
+     * @param arity The arity of func.
+     * @return Returns the new curried function.
+     */
+    <T1, T2, T3, T4, R>(arity: number, func: (t1: T1, t2: T2, t3: T3, t4: T4) => R): _.CurriedFunction4<T1, T2, T3, T4, R>;
+    /**
+     * Creates a function that accepts one or more arguments of func that when called either invokes func returning
+     * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
+     * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
+     * @param func The function to curry.
+     * @param arity The arity of func.
+     * @return Returns the new curried function.
+     */
+    <T1, T2, T3, T4, T5, R>(arity: number, func: (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5) => R): _.CurriedFunction5<T1, T2, T3, T4, T5, R>;
+    /**
+     * Creates a function that accepts one or more arguments of func that when called either invokes func returning
+     * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
+     * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
+     * @param func The function to curry.
+     * @param arity The arity of func.
+     * @return Returns the new curried function.
+     */
+    (arity: number, func: (...args: any[]) => any): (...args: any[]) => any;
+}
+interface Curry1x1 {
+    /**
+     * Creates a function that accepts one or more arguments of func that when called either invokes func returning
+     * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
+     * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
+     * @param func The function to curry.
+     * @param arity The arity of func.
+     * @return Returns the new curried function.
+     */
+    (): Curry1x1;
+    /**
+     * Creates a function that accepts one or more arguments of func that when called either invokes func returning
+     * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
+     * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
+     * @param func The function to curry.
+     * @param arity The arity of func.
+     * @return Returns the new curried function.
+     */
+    <T1, R>(func: (t1: T1) => R): _.CurriedFunction1<T1, R>;
+    /**
+     * Creates a function that accepts one or more arguments of func that when called either invokes func returning
+     * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
+     * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
+     * @param func The function to curry.
+     * @param arity The arity of func.
+     * @return Returns the new curried function.
+     */
+    <T1, T2, R>(func: (t1: T1, t2: T2) => R): _.CurriedFunction2<T1, T2, R>;
+    /**
+     * Creates a function that accepts one or more arguments of func that when called either invokes func returning
+     * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
+     * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
+     * @param func The function to curry.
+     * @param arity The arity of func.
+     * @return Returns the new curried function.
+     */
+    <T1, T2, T3, R>(func: (t1: T1, t2: T2, t3: T3) => R): _.CurriedFunction3<T1, T2, T3, R>;
+    /**
+     * Creates a function that accepts one or more arguments of func that when called either invokes func returning
+     * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
+     * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
+     * @param func The function to curry.
+     * @param arity The arity of func.
+     * @return Returns the new curried function.
+     */
+    <T1, T2, T3, T4, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4) => R): _.CurriedFunction4<T1, T2, T3, T4, R>;
+    /**
+     * Creates a function that accepts one or more arguments of func that when called either invokes func returning
+     * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
+     * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
+     * @param func The function to curry.
+     * @param arity The arity of func.
+     * @return Returns the new curried function.
+     */
+    <T1, T2, T3, T4, T5, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5) => R): _.CurriedFunction5<T1, T2, T3, T4, T5, R>;
+    /**
+     * Creates a function that accepts one or more arguments of func that when called either invokes func returning
+     * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
+     * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
+     * @param func The function to curry.
+     * @param arity The arity of func.
+     * @return Returns the new curried function.
+     */
+    (func: (...args: any[]) => any): (...args: any[]) => any;
+}
+
+declare const curryN: Curry;
+export = curryN;
diff --git a/types/lodash/fp/curryRight.d.ts b/types/lodash/fp/curryRight.d.ts
new file mode 100644
index 0000000000..5ff81e2004
--- /dev/null
+++ b/types/lodash/fp/curryRight.d.ts
@@ -0,0 +1,59 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface CurryRight {
+    /**
+     * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
+     * instead of _.partial.
+     * @param func The function to curry.
+     * @param arity The arity of func.
+     * @return Returns the new curried function.
+     */
+    <T1, R>(func: (t1: T1) => R): _.RightCurriedFunction1<T1, R>;
+    /**
+     * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
+     * instead of _.partial.
+     * @param func The function to curry.
+     * @param arity The arity of func.
+     * @return Returns the new curried function.
+     */
+    <T1, T2, R>(func: (t1: T1, t2: T2) => R): _.RightCurriedFunction2<T1, T2, R>;
+    /**
+     * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
+     * instead of _.partial.
+     * @param func The function to curry.
+     * @param arity The arity of func.
+     * @return Returns the new curried function.
+     */
+    <T1, T2, T3, R>(func: (t1: T1, t2: T2, t3: T3) => R): _.RightCurriedFunction3<T1, T2, T3, R>;
+    /**
+     * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
+     * instead of _.partial.
+     * @param func The function to curry.
+     * @param arity The arity of func.
+     * @return Returns the new curried function.
+     */
+    <T1, T2, T3, T4, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4) => R): _.RightCurriedFunction4<T1, T2, T3, T4, R>;
+    /**
+     * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
+     * instead of _.partial.
+     * @param func The function to curry.
+     * @param arity The arity of func.
+     * @return Returns the new curried function.
+     */
+    <T1, T2, T3, T4, T5, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5) => R): _.RightCurriedFunction5<T1, T2, T3, T4, T5, R>;
+    /**
+     * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
+     * instead of _.partial.
+     * @param func The function to curry.
+     * @param arity The arity of func.
+     * @return Returns the new curried function.
+     */
+    (func: (...args: any[]) => any): (...args: any[]) => any;
+}
+
+declare const curryRight: CurryRight;
+export = curryRight;
diff --git a/types/lodash/fp/curryRightN.d.ts b/types/lodash/fp/curryRightN.d.ts
new file mode 100644
index 0000000000..98694df731
--- /dev/null
+++ b/types/lodash/fp/curryRightN.d.ts
@@ -0,0 +1,133 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface CurryRight {
+    /**
+     * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
+     * instead of _.partial.
+     * @param func The function to curry.
+     * @param arity The arity of func.
+     * @return Returns the new curried function.
+     */
+    (): CurryRight;
+    /**
+     * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
+     * instead of _.partial.
+     * @param func The function to curry.
+     * @param arity The arity of func.
+     * @return Returns the new curried function.
+     */
+    (arity: number): CurryRight1x1;
+    /**
+     * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
+     * instead of _.partial.
+     * @param func The function to curry.
+     * @param arity The arity of func.
+     * @return Returns the new curried function.
+     */
+    <T1, R>(arity: number, func: (t1: T1) => R): _.RightCurriedFunction1<T1, R>;
+    /**
+     * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
+     * instead of _.partial.
+     * @param func The function to curry.
+     * @param arity The arity of func.
+     * @return Returns the new curried function.
+     */
+    <T1, T2, R>(arity: number, func: (t1: T1, t2: T2) => R): _.RightCurriedFunction2<T1, T2, R>;
+    /**
+     * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
+     * instead of _.partial.
+     * @param func The function to curry.
+     * @param arity The arity of func.
+     * @return Returns the new curried function.
+     */
+    <T1, T2, T3, R>(arity: number, func: (t1: T1, t2: T2, t3: T3) => R): _.RightCurriedFunction3<T1, T2, T3, R>;
+    /**
+     * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
+     * instead of _.partial.
+     * @param func The function to curry.
+     * @param arity The arity of func.
+     * @return Returns the new curried function.
+     */
+    <T1, T2, T3, T4, R>(arity: number, func: (t1: T1, t2: T2, t3: T3, t4: T4) => R): _.RightCurriedFunction4<T1, T2, T3, T4, R>;
+    /**
+     * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
+     * instead of _.partial.
+     * @param func The function to curry.
+     * @param arity The arity of func.
+     * @return Returns the new curried function.
+     */
+    <T1, T2, T3, T4, T5, R>(arity: number, func: (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5) => R): _.RightCurriedFunction5<T1, T2, T3, T4, T5, R>;
+    /**
+     * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
+     * instead of _.partial.
+     * @param func The function to curry.
+     * @param arity The arity of func.
+     * @return Returns the new curried function.
+     */
+    (arity: number, func: (...args: any[]) => any): (...args: any[]) => any;
+}
+interface CurryRight1x1 {
+    /**
+     * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
+     * instead of _.partial.
+     * @param func The function to curry.
+     * @param arity The arity of func.
+     * @return Returns the new curried function.
+     */
+    (): CurryRight1x1;
+    /**
+     * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
+     * instead of _.partial.
+     * @param func The function to curry.
+     * @param arity The arity of func.
+     * @return Returns the new curried function.
+     */
+    <T1, R>(func: (t1: T1) => R): _.RightCurriedFunction1<T1, R>;
+    /**
+     * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
+     * instead of _.partial.
+     * @param func The function to curry.
+     * @param arity The arity of func.
+     * @return Returns the new curried function.
+     */
+    <T1, T2, R>(func: (t1: T1, t2: T2) => R): _.RightCurriedFunction2<T1, T2, R>;
+    /**
+     * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
+     * instead of _.partial.
+     * @param func The function to curry.
+     * @param arity The arity of func.
+     * @return Returns the new curried function.
+     */
+    <T1, T2, T3, R>(func: (t1: T1, t2: T2, t3: T3) => R): _.RightCurriedFunction3<T1, T2, T3, R>;
+    /**
+     * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
+     * instead of _.partial.
+     * @param func The function to curry.
+     * @param arity The arity of func.
+     * @return Returns the new curried function.
+     */
+    <T1, T2, T3, T4, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4) => R): _.RightCurriedFunction4<T1, T2, T3, T4, R>;
+    /**
+     * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
+     * instead of _.partial.
+     * @param func The function to curry.
+     * @param arity The arity of func.
+     * @return Returns the new curried function.
+     */
+    <T1, T2, T3, T4, T5, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5) => R): _.RightCurriedFunction5<T1, T2, T3, T4, T5, R>;
+    /**
+     * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
+     * instead of _.partial.
+     * @param func The function to curry.
+     * @param arity The arity of func.
+     * @return Returns the new curried function.
+     */
+    (func: (...args: any[]) => any): (...args: any[]) => any;
+}
+
+declare const curryRightN: CurryRight;
+export = curryRightN;
diff --git a/types/lodash/fp/debounce.d.ts b/types/lodash/fp/debounce.d.ts
new file mode 100644
index 0000000000..6aa4ca891b
--- /dev/null
+++ b/types/lodash/fp/debounce.d.ts
@@ -0,0 +1,118 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Debounce {
+    /**
+     * Creates a debounced function that delays invoking func until after wait milliseconds have elapsed since
+     * the last time the debounced function was invoked. The debounced function comes with a cancel method to
+     * cancel delayed invocations and a flush method to immediately invoke them. Provide an options object to
+     * indicate that func should be invoked on the leading and/or trailing edge of the wait timeout. Subsequent
+     * calls to the debounced function return the result of the last func invocation.
+     *
+     * Note: If leading and trailing options are true, func is invoked on the trailing edge of the timeout only
+     * if the the debounced function is invoked more than once during the wait timeout.
+     *
+     * See David Corbacho’s article for details over the differences between _.debounce and _.throttle.
+     *
+     * @param func The function to debounce.
+     * @param wait The number of milliseconds to delay.
+     * @param options The options object.
+     * @param options.leading Specify invoking on the leading edge of the timeout.
+     * @param options.maxWait The maximum time func is allowed to be delayed before it’s invoked.
+     * @param options.trailing Specify invoking on the trailing edge of the timeout.
+     * @return Returns the new debounced function.
+     */
+    (): Debounce;
+    /**
+     * Creates a debounced function that delays invoking func until after wait milliseconds have elapsed since
+     * the last time the debounced function was invoked. The debounced function comes with a cancel method to
+     * cancel delayed invocations and a flush method to immediately invoke them. Provide an options object to
+     * indicate that func should be invoked on the leading and/or trailing edge of the wait timeout. Subsequent
+     * calls to the debounced function return the result of the last func invocation.
+     *
+     * Note: If leading and trailing options are true, func is invoked on the trailing edge of the timeout only
+     * if the the debounced function is invoked more than once during the wait timeout.
+     *
+     * See David Corbacho’s article for details over the differences between _.debounce and _.throttle.
+     *
+     * @param func The function to debounce.
+     * @param wait The number of milliseconds to delay.
+     * @param options The options object.
+     * @param options.leading Specify invoking on the leading edge of the timeout.
+     * @param options.maxWait The maximum time func is allowed to be delayed before it’s invoked.
+     * @param options.trailing Specify invoking on the trailing edge of the timeout.
+     * @return Returns the new debounced function.
+     */
+    (wait: number): Debounce1x1;
+    /**
+     * Creates a debounced function that delays invoking func until after wait milliseconds have elapsed since
+     * the last time the debounced function was invoked. The debounced function comes with a cancel method to
+     * cancel delayed invocations and a flush method to immediately invoke them. Provide an options object to
+     * indicate that func should be invoked on the leading and/or trailing edge of the wait timeout. Subsequent
+     * calls to the debounced function return the result of the last func invocation.
+     *
+     * Note: If leading and trailing options are true, func is invoked on the trailing edge of the timeout only
+     * if the the debounced function is invoked more than once during the wait timeout.
+     *
+     * See David Corbacho’s article for details over the differences between _.debounce and _.throttle.
+     *
+     * @param func The function to debounce.
+     * @param wait The number of milliseconds to delay.
+     * @param options The options object.
+     * @param options.leading Specify invoking on the leading edge of the timeout.
+     * @param options.maxWait The maximum time func is allowed to be delayed before it’s invoked.
+     * @param options.trailing Specify invoking on the trailing edge of the timeout.
+     * @return Returns the new debounced function.
+     */
+    <T extends (...args: any[]) => any>(wait: number, func: T): T & _.Cancelable;
+}
+interface Debounce1x1 {
+    /**
+     * Creates a debounced function that delays invoking func until after wait milliseconds have elapsed since
+     * the last time the debounced function was invoked. The debounced function comes with a cancel method to
+     * cancel delayed invocations and a flush method to immediately invoke them. Provide an options object to
+     * indicate that func should be invoked on the leading and/or trailing edge of the wait timeout. Subsequent
+     * calls to the debounced function return the result of the last func invocation.
+     *
+     * Note: If leading and trailing options are true, func is invoked on the trailing edge of the timeout only
+     * if the the debounced function is invoked more than once during the wait timeout.
+     *
+     * See David Corbacho’s article for details over the differences between _.debounce and _.throttle.
+     *
+     * @param func The function to debounce.
+     * @param wait The number of milliseconds to delay.
+     * @param options The options object.
+     * @param options.leading Specify invoking on the leading edge of the timeout.
+     * @param options.maxWait The maximum time func is allowed to be delayed before it’s invoked.
+     * @param options.trailing Specify invoking on the trailing edge of the timeout.
+     * @return Returns the new debounced function.
+     */
+    (): Debounce1x1;
+    /**
+     * Creates a debounced function that delays invoking func until after wait milliseconds have elapsed since
+     * the last time the debounced function was invoked. The debounced function comes with a cancel method to
+     * cancel delayed invocations and a flush method to immediately invoke them. Provide an options object to
+     * indicate that func should be invoked on the leading and/or trailing edge of the wait timeout. Subsequent
+     * calls to the debounced function return the result of the last func invocation.
+     *
+     * Note: If leading and trailing options are true, func is invoked on the trailing edge of the timeout only
+     * if the the debounced function is invoked more than once during the wait timeout.
+     *
+     * See David Corbacho’s article for details over the differences between _.debounce and _.throttle.
+     *
+     * @param func The function to debounce.
+     * @param wait The number of milliseconds to delay.
+     * @param options The options object.
+     * @param options.leading Specify invoking on the leading edge of the timeout.
+     * @param options.maxWait The maximum time func is allowed to be delayed before it’s invoked.
+     * @param options.trailing Specify invoking on the trailing edge of the timeout.
+     * @return Returns the new debounced function.
+     */
+    <T extends (...args: any[]) => any>(func: T): T & _.Cancelable;
+}
+
+declare const debounce: Debounce;
+export = debounce;
diff --git a/types/lodash/fp/deburr.d.ts b/types/lodash/fp/deburr.d.ts
new file mode 100644
index 0000000000..582ef58205
--- /dev/null
+++ b/types/lodash/fp/deburr.d.ts
@@ -0,0 +1,16 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type Deburr =
+    /**
+     * Deburrs string by converting latin-1 supplementary letters to basic latin letters and removing combining
+     * diacritical marks.
+     *
+     * @param string The string to deburr.
+     * @return Returns the deburred string.
+     */
+    (string: string) => string;
+
+declare const deburr: Deburr;
+export = deburr;
diff --git a/types/lodash/fp/defaultTo.d.ts b/types/lodash/fp/defaultTo.d.ts
new file mode 100644
index 0000000000..2137ee3307
--- /dev/null
+++ b/types/lodash/fp/defaultTo.d.ts
@@ -0,0 +1,103 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface DefaultTo {
+    /**
+     * 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;
+    /**
+     * 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.
+     */
+    <T>(defaultValue: T): DefaultTo1x1<T>;
+    /**
+     * 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.
+     */
+    <T>(defaultValue: T, value: T | null | undefined): T;
+    /**
+     * 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.
+     */
+    <TDefault>(defaultValue: TDefault): DefaultTo2x1<TDefault>;
+    /**
+     * 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.
+     */
+    <T, TDefault>(defaultValue: TDefault, value: T | null | undefined): T | TDefault;
+}
+interface DefaultTo1x1<T> {
+    /**
+     * 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.
+     */
+    (): DefaultTo1x1<T>;
+    /**
+     * 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.
+     */
+    (value: T | null | undefined): T;
+}
+interface DefaultTo2x1<TDefault> {
+    /**
+     * 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.
+     */
+    (): DefaultTo2x1<TDefault>;
+    /**
+     * 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.
+     */
+    <T>(value: T | null | undefined): T | TDefault;
+}
+
+declare const defaultTo: DefaultTo;
+export = defaultTo;
diff --git a/types/lodash/fp/defaults.d.ts b/types/lodash/fp/defaults.d.ts
new file mode 100644
index 0000000000..306534d374
--- /dev/null
+++ b/types/lodash/fp/defaults.d.ts
@@ -0,0 +1,71 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface Defaults {
+    /**
+     * Assigns own enumerable properties of source object(s) to the destination object for all destination
+     * properties that resolve to undefined. Once a property is set, additional values of the same property are
+     * ignored.
+     *
+     * Note: This method mutates object.
+     *
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @return The destination object.
+     */
+    (): Defaults;
+    /**
+     * Assigns own enumerable properties of source object(s) to the destination object for all destination
+     * properties that resolve to undefined. Once a property is set, additional values of the same property are
+     * ignored.
+     *
+     * Note: This method mutates object.
+     *
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @return The destination object.
+     */
+    <TSource>(source: TSource): Defaults1x1<TSource>;
+    /**
+     * Assigns own enumerable properties of source object(s) to the destination object for all destination
+     * properties that resolve to undefined. Once a property is set, additional values of the same property are
+     * ignored.
+     *
+     * Note: This method mutates object.
+     *
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @return The destination object.
+     */
+    <TObject, TSource>(source: TSource, object: TObject): TSource & TObject;
+}
+interface Defaults1x1<TSource> {
+    /**
+     * Assigns own enumerable properties of source object(s) to the destination object for all destination
+     * properties that resolve to undefined. Once a property is set, additional values of the same property are
+     * ignored.
+     *
+     * Note: This method mutates object.
+     *
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @return The destination object.
+     */
+    (): Defaults1x1<TSource>;
+    /**
+     * Assigns own enumerable properties of source object(s) to the destination object for all destination
+     * properties that resolve to undefined. Once a property is set, additional values of the same property are
+     * ignored.
+     *
+     * Note: This method mutates object.
+     *
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @return The destination object.
+     */
+    <TObject>(object: TObject): TSource & TObject;
+}
+
+declare const defaults: Defaults;
+export = defaults;
diff --git a/types/lodash/fp/defaultsAll.d.ts b/types/lodash/fp/defaultsAll.d.ts
new file mode 100644
index 0000000000..371f6db282
--- /dev/null
+++ b/types/lodash/fp/defaultsAll.d.ts
@@ -0,0 +1,20 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type Defaults =
+    /**
+     * Assigns own enumerable properties of source object(s) to the destination object for all destination
+     * properties that resolve to undefined. Once a property is set, additional values of the same property are
+     * ignored.
+     *
+     * Note: This method mutates object.
+     *
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @return The destination object.
+     */
+    (object: ReadonlyArray<any>) => any;
+
+declare const defaultsAll: Defaults;
+export = defaultsAll;
diff --git a/types/lodash/fp/defaultsDeep.d.ts b/types/lodash/fp/defaultsDeep.d.ts
new file mode 100644
index 0000000000..86eace1bb9
--- /dev/null
+++ b/types/lodash/fp/defaultsDeep.d.ts
@@ -0,0 +1,46 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface DefaultsDeep {
+    /**
+     * This method is like _.defaults except that it recursively assigns default properties.
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @return Returns object.
+     **/
+    (): DefaultsDeep;
+    /**
+     * This method is like _.defaults except that it recursively assigns default properties.
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @return Returns object.
+     **/
+    (sources: any): DefaultsDeep1x1;
+    /**
+     * This method is like _.defaults except that it recursively assigns default properties.
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @return Returns object.
+     **/
+    (sources: any, object: any): any;
+}
+interface DefaultsDeep1x1 {
+    /**
+     * This method is like _.defaults except that it recursively assigns default properties.
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @return Returns object.
+     **/
+    (): DefaultsDeep1x1;
+    /**
+     * This method is like _.defaults except that it recursively assigns default properties.
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @return Returns object.
+     **/
+    (object: any): any;
+}
+
+declare const defaultsDeep: DefaultsDeep;
+export = defaultsDeep;
diff --git a/types/lodash/fp/defaultsDeepAll.d.ts b/types/lodash/fp/defaultsDeepAll.d.ts
new file mode 100644
index 0000000000..cb6157662d
--- /dev/null
+++ b/types/lodash/fp/defaultsDeepAll.d.ts
@@ -0,0 +1,15 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type DefaultsDeep =
+    /**
+     * This method is like _.defaults except that it recursively assigns default properties.
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @return Returns object.
+     **/
+    (object: ReadonlyArray<any>) => any;
+
+declare const defaultsDeepAll: DefaultsDeep;
+export = defaultsDeepAll;
diff --git a/types/lodash/fp/defer.d.ts b/types/lodash/fp/defer.d.ts
new file mode 100644
index 0000000000..a9bab80092
--- /dev/null
+++ b/types/lodash/fp/defer.d.ts
@@ -0,0 +1,17 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type Defer =
+    /**
+     * Defers invoking the func until the current call stack has cleared. Any additional arguments are provided to
+     * func when it’s invoked.
+     *
+     * @param func The function to defer.
+     * @param args The arguments to invoke the function with.
+     * @return Returns the timer id.
+     */
+    (func: (...args: any[]) => any, ...args: any[]) => number;
+
+declare const defer: Defer;
+export = defer;
diff --git a/types/lodash/fp/delay.d.ts b/types/lodash/fp/delay.d.ts
new file mode 100644
index 0000000000..8709a9c0e2
--- /dev/null
+++ b/types/lodash/fp/delay.d.ts
@@ -0,0 +1,56 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface Delay {
+    /**
+     * Invokes func after wait milliseconds. Any additional arguments are provided to func when it’s invoked.
+     *
+     * @param func The function to delay.
+     * @param wait The number of milliseconds to delay invocation.
+     * @param args The arguments to invoke the function with.
+     * @return Returns the timer id.
+     */
+    (): Delay;
+    /**
+     * Invokes func after wait milliseconds. Any additional arguments are provided to func when it’s invoked.
+     *
+     * @param func The function to delay.
+     * @param wait The number of milliseconds to delay invocation.
+     * @param args The arguments to invoke the function with.
+     * @return Returns the timer id.
+     */
+    (wait: number): Delay1x1;
+    /**
+     * Invokes func after wait milliseconds. Any additional arguments are provided to func when it’s invoked.
+     *
+     * @param func The function to delay.
+     * @param wait The number of milliseconds to delay invocation.
+     * @param args The arguments to invoke the function with.
+     * @return Returns the timer id.
+     */
+    (wait: number, func: (...args: any[]) => any): number;
+}
+interface Delay1x1 {
+    /**
+     * Invokes func after wait milliseconds. Any additional arguments are provided to func when it’s invoked.
+     *
+     * @param func The function to delay.
+     * @param wait The number of milliseconds to delay invocation.
+     * @param args The arguments to invoke the function with.
+     * @return Returns the timer id.
+     */
+    (): Delay1x1;
+    /**
+     * Invokes func after wait milliseconds. Any additional arguments are provided to func when it’s invoked.
+     *
+     * @param func The function to delay.
+     * @param wait The number of milliseconds to delay invocation.
+     * @param args The arguments to invoke the function with.
+     * @return Returns the timer id.
+     */
+    (func: (...args: any[]) => any): number;
+}
+
+declare const delay: Delay;
+export = delay;
diff --git a/types/lodash/fp/difference.d.ts b/types/lodash/fp/difference.d.ts
new file mode 100644
index 0000000000..774539bba7
--- /dev/null
+++ b/types/lodash/fp/difference.d.ts
@@ -0,0 +1,58 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Difference {
+    /**
+     * Creates an array of unique array values not included in the other provided arrays using SameValueZero for
+     * equality comparisons.
+     *
+     * @param array The array to inspect.
+     * @param values The arrays of values to exclude.
+     * @return Returns the new array of filtered values.
+     */
+    (): Difference;
+    /**
+     * Creates an array of unique array values not included in the other provided arrays using SameValueZero for
+     * equality comparisons.
+     *
+     * @param array The array to inspect.
+     * @param values The arrays of values to exclude.
+     * @return Returns the new array of filtered values.
+     */
+    <T>(array: _.List<T> | null | undefined): Difference1x1<T>;
+    /**
+     * Creates an array of unique array values not included in the other provided arrays using SameValueZero for
+     * equality comparisons.
+     *
+     * @param array The array to inspect.
+     * @param values The arrays of values to exclude.
+     * @return Returns the new array of filtered values.
+     */
+    <T>(array: _.List<T> | null | undefined, values: _.List<T>): T[];
+}
+interface Difference1x1<T> {
+    /**
+     * Creates an array of unique array values not included in the other provided arrays using SameValueZero for
+     * equality comparisons.
+     *
+     * @param array The array to inspect.
+     * @param values The arrays of values to exclude.
+     * @return Returns the new array of filtered values.
+     */
+    (): Difference1x1<T>;
+    /**
+     * Creates an array of unique array values not included in the other provided arrays using SameValueZero for
+     * equality comparisons.
+     *
+     * @param array The array to inspect.
+     * @param values The arrays of values to exclude.
+     * @return Returns the new array of filtered values.
+     */
+    (values: _.List<T>): T[];
+}
+
+declare const difference: Difference;
+export = difference;
diff --git a/types/lodash/fp/differenceBy.d.ts b/types/lodash/fp/differenceBy.d.ts
new file mode 100644
index 0000000000..64975c1b17
--- /dev/null
+++ b/types/lodash/fp/differenceBy.d.ts
@@ -0,0 +1,114 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface DifferenceBy {
+    /**
+     * This method is like _.difference except that it accepts iteratee which is invoked for each element of array
+     * and values to generate the criterion by which uniqueness is computed. The iteratee is invoked with one
+     * argument: (value).
+     *
+     * @param array The array to inspect.
+     * @param values The values to exclude.
+     * @param iteratee The iteratee invoked per element.
+     * @returns Returns the new array of filtered values.
+     */
+    (): DifferenceBy;
+    /**
+     * This method is like _.difference except that it accepts iteratee which is invoked for each element of array
+     * and values to generate the criterion by which uniqueness is computed. The iteratee is invoked with one
+     * argument: (value).
+     *
+     * @param array The array to inspect.
+     * @param values The values to exclude.
+     * @param iteratee The iteratee invoked per element.
+     * @returns Returns the new array of filtered values.
+     */
+    <T1, T2>(iteratee: _.ValueIteratee<T1 | T2>): DifferenceBy1x1<T1, T2>;
+    /**
+     * This method is like _.difference except that it accepts iteratee which is invoked for each element of array
+     * and values to generate the criterion by which uniqueness is computed. The iteratee is invoked with one
+     * argument: (value).
+     *
+     * @param array The array to inspect.
+     * @param values The values to exclude.
+     * @param iteratee The iteratee invoked per element.
+     * @returns Returns the new array of filtered values.
+     */
+    <T1, T2>(iteratee: _.ValueIteratee<T1 | T2>, array: _.List<T1> | null | undefined): DifferenceBy1x2<T1, T2>;
+    /**
+     * This method is like _.difference except that it accepts iteratee which is invoked for each element of array
+     * and values to generate the criterion by which uniqueness is computed. The iteratee is invoked with one
+     * argument: (value).
+     *
+     * @param array The array to inspect.
+     * @param values The values to exclude.
+     * @param iteratee The iteratee invoked per element.
+     * @returns Returns the new array of filtered values.
+     */
+    <T1, T2>(iteratee: _.ValueIteratee<T1 | T2>, array: _.List<T1> | null | undefined, values: _.List<T2>): T1[];
+}
+interface DifferenceBy1x1<T1, T2> {
+    /**
+     * This method is like _.difference except that it accepts iteratee which is invoked for each element of array
+     * and values to generate the criterion by which uniqueness is computed. The iteratee is invoked with one
+     * argument: (value).
+     *
+     * @param array The array to inspect.
+     * @param values The values to exclude.
+     * @param iteratee The iteratee invoked per element.
+     * @returns Returns the new array of filtered values.
+     */
+    (): DifferenceBy1x1<T1, T2>;
+    /**
+     * This method is like _.difference except that it accepts iteratee which is invoked for each element of array
+     * and values to generate the criterion by which uniqueness is computed. The iteratee is invoked with one
+     * argument: (value).
+     *
+     * @param array The array to inspect.
+     * @param values The values to exclude.
+     * @param iteratee The iteratee invoked per element.
+     * @returns Returns the new array of filtered values.
+     */
+    (array: _.List<T1> | null | undefined): DifferenceBy1x2<T1, T2>;
+    /**
+     * This method is like _.difference except that it accepts iteratee which is invoked for each element of array
+     * and values to generate the criterion by which uniqueness is computed. The iteratee is invoked with one
+     * argument: (value).
+     *
+     * @param array The array to inspect.
+     * @param values The values to exclude.
+     * @param iteratee The iteratee invoked per element.
+     * @returns Returns the new array of filtered values.
+     */
+    (array: _.List<T1> | null | undefined, values: _.List<T2>): T1[];
+}
+interface DifferenceBy1x2<T1, T2> {
+    /**
+     * This method is like _.difference except that it accepts iteratee which is invoked for each element of array
+     * and values to generate the criterion by which uniqueness is computed. The iteratee is invoked with one
+     * argument: (value).
+     *
+     * @param array The array to inspect.
+     * @param values The values to exclude.
+     * @param iteratee The iteratee invoked per element.
+     * @returns Returns the new array of filtered values.
+     */
+    (): DifferenceBy1x2<T1, T2>;
+    /**
+     * This method is like _.difference except that it accepts iteratee which is invoked for each element of array
+     * and values to generate the criterion by which uniqueness is computed. The iteratee is invoked with one
+     * argument: (value).
+     *
+     * @param array The array to inspect.
+     * @param values The values to exclude.
+     * @param iteratee The iteratee invoked per element.
+     * @returns Returns the new array of filtered values.
+     */
+    (values: _.List<T2>): T1[];
+}
+
+declare const differenceBy: DifferenceBy;
+export = differenceBy;
diff --git a/types/lodash/fp/differenceWith.d.ts b/types/lodash/fp/differenceWith.d.ts
new file mode 100644
index 0000000000..2ef1961ff7
--- /dev/null
+++ b/types/lodash/fp/differenceWith.d.ts
@@ -0,0 +1,168 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface DifferenceWith {
+    /**
+     * Creates an array of unique `array` values not included in the other
+     * provided arrays using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+     * for equality comparisons.
+     *
+     * @category Array
+     * @param [values] The arrays to inspect.
+     * @param [comparator] The comparator invoked per element.
+     * @returns Returns the new array of filtered values.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+
+     * _.differenceWith(objects, [{ 'x': 1, 'y': 2 }], _.isEqual);
+     * // => [{ 'x': 2, 'y': 1 }]
+     */
+    (): DifferenceWith;
+    /**
+     * Creates an array of unique `array` values not included in the other
+     * provided arrays using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+     * for equality comparisons.
+     *
+     * @category Array
+     * @param [values] The arrays to inspect.
+     * @param [comparator] The comparator invoked per element.
+     * @returns Returns the new array of filtered values.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+
+     * _.differenceWith(objects, [{ 'x': 1, 'y': 2 }], _.isEqual);
+     * // => [{ 'x': 2, 'y': 1 }]
+     */
+    <T1, T2>(comparator: _.Comparator2<T1, T2>): DifferenceWith1x1<T1, T2>;
+    /**
+     * Creates an array of unique `array` values not included in the other
+     * provided arrays using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+     * for equality comparisons.
+     *
+     * @category Array
+     * @param [values] The arrays to inspect.
+     * @param [comparator] The comparator invoked per element.
+     * @returns Returns the new array of filtered values.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+
+     * _.differenceWith(objects, [{ 'x': 1, 'y': 2 }], _.isEqual);
+     * // => [{ 'x': 2, 'y': 1 }]
+     */
+    <T1, T2>(comparator: _.Comparator2<T1, T2>, array: _.List<T1> | null | undefined): DifferenceWith1x2<T1, T2>;
+    /**
+     * Creates an array of unique `array` values not included in the other
+     * provided arrays using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+     * for equality comparisons.
+     *
+     * @category Array
+     * @param [values] The arrays to inspect.
+     * @param [comparator] The comparator invoked per element.
+     * @returns Returns the new array of filtered values.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+
+     * _.differenceWith(objects, [{ 'x': 1, 'y': 2 }], _.isEqual);
+     * // => [{ 'x': 2, 'y': 1 }]
+     */
+    <T1, T2>(comparator: _.Comparator2<T1, T2>, array: _.List<T1> | null | undefined, values: _.List<T2>): T1[];
+}
+interface DifferenceWith1x1<T1, T2> {
+    /**
+     * Creates an array of unique `array` values not included in the other
+     * provided arrays using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+     * for equality comparisons.
+     *
+     * @category Array
+     * @param [values] The arrays to inspect.
+     * @param [comparator] The comparator invoked per element.
+     * @returns Returns the new array of filtered values.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+
+     * _.differenceWith(objects, [{ 'x': 1, 'y': 2 }], _.isEqual);
+     * // => [{ 'x': 2, 'y': 1 }]
+     */
+    (): DifferenceWith1x1<T1, T2>;
+    /**
+     * Creates an array of unique `array` values not included in the other
+     * provided arrays using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+     * for equality comparisons.
+     *
+     * @category Array
+     * @param [values] The arrays to inspect.
+     * @param [comparator] The comparator invoked per element.
+     * @returns Returns the new array of filtered values.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+
+     * _.differenceWith(objects, [{ 'x': 1, 'y': 2 }], _.isEqual);
+     * // => [{ 'x': 2, 'y': 1 }]
+     */
+    (array: _.List<T1> | null | undefined): DifferenceWith1x2<T1, T2>;
+    /**
+     * Creates an array of unique `array` values not included in the other
+     * provided arrays using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+     * for equality comparisons.
+     *
+     * @category Array
+     * @param [values] The arrays to inspect.
+     * @param [comparator] The comparator invoked per element.
+     * @returns Returns the new array of filtered values.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+
+     * _.differenceWith(objects, [{ 'x': 1, 'y': 2 }], _.isEqual);
+     * // => [{ 'x': 2, 'y': 1 }]
+     */
+    (array: _.List<T1> | null | undefined, values: _.List<T2>): T1[];
+}
+interface DifferenceWith1x2<T1, T2> {
+    /**
+     * Creates an array of unique `array` values not included in the other
+     * provided arrays using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+     * for equality comparisons.
+     *
+     * @category Array
+     * @param [values] The arrays to inspect.
+     * @param [comparator] The comparator invoked per element.
+     * @returns Returns the new array of filtered values.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+
+     * _.differenceWith(objects, [{ 'x': 1, 'y': 2 }], _.isEqual);
+     * // => [{ 'x': 2, 'y': 1 }]
+     */
+    (): DifferenceWith1x2<T1, T2>;
+    /**
+     * Creates an array of unique `array` values not included in the other
+     * provided arrays using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+     * for equality comparisons.
+     *
+     * @category Array
+     * @param [values] The arrays to inspect.
+     * @param [comparator] The comparator invoked per element.
+     * @returns Returns the new array of filtered values.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+
+     * _.differenceWith(objects, [{ 'x': 1, 'y': 2 }], _.isEqual);
+     * // => [{ 'x': 2, 'y': 1 }]
+     */
+    (values: _.List<T2>): T1[];
+}
+
+declare const differenceWith: DifferenceWith;
+export = differenceWith;
diff --git a/types/lodash/fp/dissoc.d.ts b/types/lodash/fp/dissoc.d.ts
new file mode 100644
index 0000000000..ad931b90da
--- /dev/null
+++ b/types/lodash/fp/dissoc.d.ts
@@ -0,0 +1,63 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Unset {
+    /**
+     * Removes the property at path of object.
+     *
+     * Note: This method mutates object.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to unset.
+     * @return Returns true if the property is deleted, else false.
+     */
+    (): Unset;
+    /**
+     * Removes the property at path of object.
+     *
+     * Note: This method mutates object.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to unset.
+     * @return Returns true if the property is deleted, else false.
+     */
+    (path: _.PropertyPath): Unset1x1;
+    /**
+     * Removes the property at path of object.
+     *
+     * Note: This method mutates object.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to unset.
+     * @return Returns true if the property is deleted, else false.
+     */
+    (path: _.PropertyPath, object: any): boolean;
+}
+interface Unset1x1 {
+    /**
+     * Removes the property at path of object.
+     *
+     * Note: This method mutates object.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to unset.
+     * @return Returns true if the property is deleted, else false.
+     */
+    (): Unset1x1;
+    /**
+     * Removes the property at path of object.
+     *
+     * Note: This method mutates object.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to unset.
+     * @return Returns true if the property is deleted, else false.
+     */
+    (object: any): boolean;
+}
+
+declare const dissoc: Unset;
+export = dissoc;
diff --git a/types/lodash/fp/dissocPath.d.ts b/types/lodash/fp/dissocPath.d.ts
new file mode 100644
index 0000000000..8d98858a6c
--- /dev/null
+++ b/types/lodash/fp/dissocPath.d.ts
@@ -0,0 +1,63 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Unset {
+    /**
+     * Removes the property at path of object.
+     *
+     * Note: This method mutates object.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to unset.
+     * @return Returns true if the property is deleted, else false.
+     */
+    (): Unset;
+    /**
+     * Removes the property at path of object.
+     *
+     * Note: This method mutates object.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to unset.
+     * @return Returns true if the property is deleted, else false.
+     */
+    (path: _.PropertyPath): Unset1x1;
+    /**
+     * Removes the property at path of object.
+     *
+     * Note: This method mutates object.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to unset.
+     * @return Returns true if the property is deleted, else false.
+     */
+    (path: _.PropertyPath, object: any): boolean;
+}
+interface Unset1x1 {
+    /**
+     * Removes the property at path of object.
+     *
+     * Note: This method mutates object.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to unset.
+     * @return Returns true if the property is deleted, else false.
+     */
+    (): Unset1x1;
+    /**
+     * Removes the property at path of object.
+     *
+     * Note: This method mutates object.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to unset.
+     * @return Returns true if the property is deleted, else false.
+     */
+    (object: any): boolean;
+}
+
+declare const dissocPath: Unset;
+export = dissocPath;
diff --git a/types/lodash/fp/divide.d.ts b/types/lodash/fp/divide.d.ts
new file mode 100644
index 0000000000..293acebb68
--- /dev/null
+++ b/types/lodash/fp/divide.d.ts
@@ -0,0 +1,51 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface Divide {
+    /**
+    * Divide two numbers.
+    *
+    * @param dividend The first number in a division.
+    * @param divisor The second number in a division.
+    * @returns Returns the quotient.
+    */
+    (): Divide;
+    /**
+    * Divide two numbers.
+    *
+    * @param dividend The first number in a division.
+    * @param divisor The second number in a division.
+    * @returns Returns the quotient.
+    */
+    (dividend: number): Divide1x1;
+    /**
+    * Divide two numbers.
+    *
+    * @param dividend The first number in a division.
+    * @param divisor The second number in a division.
+    * @returns Returns the quotient.
+    */
+    (dividend: number, divisor: number): number;
+}
+interface Divide1x1 {
+    /**
+    * Divide two numbers.
+    *
+    * @param dividend The first number in a division.
+    * @param divisor The second number in a division.
+    * @returns Returns the quotient.
+    */
+    (): Divide1x1;
+    /**
+    * Divide two numbers.
+    *
+    * @param dividend The first number in a division.
+    * @param divisor The second number in a division.
+    * @returns Returns the quotient.
+    */
+    (divisor: number): number;
+}
+
+declare const divide: Divide;
+export = divide;
diff --git a/types/lodash/fp/drop.d.ts b/types/lodash/fp/drop.d.ts
new file mode 100644
index 0000000000..3c524f1321
--- /dev/null
+++ b/types/lodash/fp/drop.d.ts
@@ -0,0 +1,53 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Drop {
+    /**
+     * Creates a slice of array with n elements dropped from the beginning.
+     *
+     * @param array The array to query.
+     * @param n The number of elements to drop.
+     * @return Returns the slice of array.
+     */
+    (): Drop;
+    /**
+     * Creates a slice of array with n elements dropped from the beginning.
+     *
+     * @param array The array to query.
+     * @param n The number of elements to drop.
+     * @return Returns the slice of array.
+     */
+    (n: number): Drop1x1;
+    /**
+     * Creates a slice of array with n elements dropped from the beginning.
+     *
+     * @param array The array to query.
+     * @param n The number of elements to drop.
+     * @return Returns the slice of array.
+     */
+    <T>(n: number, array: _.List<T> | null | undefined): T[];
+}
+interface Drop1x1 {
+    /**
+     * Creates a slice of array with n elements dropped from the beginning.
+     *
+     * @param array The array to query.
+     * @param n The number of elements to drop.
+     * @return Returns the slice of array.
+     */
+    (): Drop1x1;
+    /**
+     * Creates a slice of array with n elements dropped from the beginning.
+     *
+     * @param array The array to query.
+     * @param n The number of elements to drop.
+     * @return Returns the slice of array.
+     */
+    <T>(array: _.List<T> | null | undefined): T[];
+}
+
+declare const drop: Drop;
+export = drop;
diff --git a/types/lodash/fp/dropLast.d.ts b/types/lodash/fp/dropLast.d.ts
new file mode 100644
index 0000000000..e0fb5db69e
--- /dev/null
+++ b/types/lodash/fp/dropLast.d.ts
@@ -0,0 +1,53 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface DropRight {
+    /**
+     * Creates a slice of array with n elements dropped from the end.
+     *
+     * @param array The array to query.
+     * @param n The number of elements to drop.
+     * @return Returns the slice of array.
+     */
+    (): DropRight;
+    /**
+     * Creates a slice of array with n elements dropped from the end.
+     *
+     * @param array The array to query.
+     * @param n The number of elements to drop.
+     * @return Returns the slice of array.
+     */
+    (n: number): DropRight1x1;
+    /**
+     * Creates a slice of array with n elements dropped from the end.
+     *
+     * @param array The array to query.
+     * @param n The number of elements to drop.
+     * @return Returns the slice of array.
+     */
+    <T>(n: number, array: _.List<T> | null | undefined): T[];
+}
+interface DropRight1x1 {
+    /**
+     * Creates a slice of array with n elements dropped from the end.
+     *
+     * @param array The array to query.
+     * @param n The number of elements to drop.
+     * @return Returns the slice of array.
+     */
+    (): DropRight1x1;
+    /**
+     * Creates a slice of array with n elements dropped from the end.
+     *
+     * @param array The array to query.
+     * @param n The number of elements to drop.
+     * @return Returns the slice of array.
+     */
+    <T>(array: _.List<T> | null | undefined): T[];
+}
+
+declare const dropLast: DropRight;
+export = dropLast;
diff --git a/types/lodash/fp/dropLastWhile.d.ts b/types/lodash/fp/dropLastWhile.d.ts
new file mode 100644
index 0000000000..3d0d5634ef
--- /dev/null
+++ b/types/lodash/fp/dropLastWhile.d.ts
@@ -0,0 +1,108 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface DropRightWhile {
+    /**
+     * Creates a slice of array excluding elements dropped from the end. Elements are dropped until predicate
+     * returns falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * match the properties of the given object, else false.
+     *
+     * @param array The array to query.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the slice of array.
+     */
+    (): DropRightWhile;
+    /**
+     * Creates a slice of array excluding elements dropped from the end. Elements are dropped until predicate
+     * returns falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * match the properties of the given object, else false.
+     *
+     * @param array The array to query.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the slice of array.
+     */
+    <T>(predicate: _.ValueIteratee<T>): DropRightWhile1x1<T>;
+    /**
+     * Creates a slice of array excluding elements dropped from the end. Elements are dropped until predicate
+     * returns falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * match the properties of the given object, else false.
+     *
+     * @param array The array to query.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the slice of array.
+     */
+    <T>(predicate: _.ValueIteratee<T>, array: _.List<T> | null | undefined): T[];
+}
+interface DropRightWhile1x1<T> {
+    /**
+     * Creates a slice of array excluding elements dropped from the end. Elements are dropped until predicate
+     * returns falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * match the properties of the given object, else false.
+     *
+     * @param array The array to query.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the slice of array.
+     */
+    (): DropRightWhile1x1<T>;
+    /**
+     * Creates a slice of array excluding elements dropped from the end. Elements are dropped until predicate
+     * returns falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * match the properties of the given object, else false.
+     *
+     * @param array The array to query.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the slice of array.
+     */
+    (array: _.List<T> | null | undefined): T[];
+}
+
+declare const dropLastWhile: DropRightWhile;
+export = dropLastWhile;
diff --git a/types/lodash/fp/dropRight.d.ts b/types/lodash/fp/dropRight.d.ts
new file mode 100644
index 0000000000..4c07c3c8a5
--- /dev/null
+++ b/types/lodash/fp/dropRight.d.ts
@@ -0,0 +1,53 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface DropRight {
+    /**
+     * Creates a slice of array with n elements dropped from the end.
+     *
+     * @param array The array to query.
+     * @param n The number of elements to drop.
+     * @return Returns the slice of array.
+     */
+    (): DropRight;
+    /**
+     * Creates a slice of array with n elements dropped from the end.
+     *
+     * @param array The array to query.
+     * @param n The number of elements to drop.
+     * @return Returns the slice of array.
+     */
+    (n: number): DropRight1x1;
+    /**
+     * Creates a slice of array with n elements dropped from the end.
+     *
+     * @param array The array to query.
+     * @param n The number of elements to drop.
+     * @return Returns the slice of array.
+     */
+    <T>(n: number, array: _.List<T> | null | undefined): T[];
+}
+interface DropRight1x1 {
+    /**
+     * Creates a slice of array with n elements dropped from the end.
+     *
+     * @param array The array to query.
+     * @param n The number of elements to drop.
+     * @return Returns the slice of array.
+     */
+    (): DropRight1x1;
+    /**
+     * Creates a slice of array with n elements dropped from the end.
+     *
+     * @param array The array to query.
+     * @param n The number of elements to drop.
+     * @return Returns the slice of array.
+     */
+    <T>(array: _.List<T> | null | undefined): T[];
+}
+
+declare const dropRight: DropRight;
+export = dropRight;
diff --git a/types/lodash/fp/dropRightWhile.d.ts b/types/lodash/fp/dropRightWhile.d.ts
new file mode 100644
index 0000000000..e346a77e97
--- /dev/null
+++ b/types/lodash/fp/dropRightWhile.d.ts
@@ -0,0 +1,108 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface DropRightWhile {
+    /**
+     * Creates a slice of array excluding elements dropped from the end. Elements are dropped until predicate
+     * returns falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * match the properties of the given object, else false.
+     *
+     * @param array The array to query.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the slice of array.
+     */
+    (): DropRightWhile;
+    /**
+     * Creates a slice of array excluding elements dropped from the end. Elements are dropped until predicate
+     * returns falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * match the properties of the given object, else false.
+     *
+     * @param array The array to query.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the slice of array.
+     */
+    <T>(predicate: _.ValueIteratee<T>): DropRightWhile1x1<T>;
+    /**
+     * Creates a slice of array excluding elements dropped from the end. Elements are dropped until predicate
+     * returns falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * match the properties of the given object, else false.
+     *
+     * @param array The array to query.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the slice of array.
+     */
+    <T>(predicate: _.ValueIteratee<T>, array: _.List<T> | null | undefined): T[];
+}
+interface DropRightWhile1x1<T> {
+    /**
+     * Creates a slice of array excluding elements dropped from the end. Elements are dropped until predicate
+     * returns falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * match the properties of the given object, else false.
+     *
+     * @param array The array to query.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the slice of array.
+     */
+    (): DropRightWhile1x1<T>;
+    /**
+     * Creates a slice of array excluding elements dropped from the end. Elements are dropped until predicate
+     * returns falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * match the properties of the given object, else false.
+     *
+     * @param array The array to query.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the slice of array.
+     */
+    (array: _.List<T> | null | undefined): T[];
+}
+
+declare const dropRightWhile: DropRightWhile;
+export = dropRightWhile;
diff --git a/types/lodash/fp/dropWhile.d.ts b/types/lodash/fp/dropWhile.d.ts
new file mode 100644
index 0000000000..056a06bc3e
--- /dev/null
+++ b/types/lodash/fp/dropWhile.d.ts
@@ -0,0 +1,108 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface DropWhile {
+    /**
+     * Creates a slice of array excluding elements dropped from the beginning. Elements are dropped until predicate
+     * returns falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param array The array to query.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the slice of array.
+     */
+    (): DropWhile;
+    /**
+     * Creates a slice of array excluding elements dropped from the beginning. Elements are dropped until predicate
+     * returns falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param array The array to query.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the slice of array.
+     */
+    <T>(predicate: _.ValueIteratee<T>): DropWhile1x1<T>;
+    /**
+     * Creates a slice of array excluding elements dropped from the beginning. Elements are dropped until predicate
+     * returns falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param array The array to query.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the slice of array.
+     */
+    <T>(predicate: _.ValueIteratee<T>, array: _.List<T> | null | undefined): T[];
+}
+interface DropWhile1x1<T> {
+    /**
+     * Creates a slice of array excluding elements dropped from the beginning. Elements are dropped until predicate
+     * returns falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param array The array to query.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the slice of array.
+     */
+    (): DropWhile1x1<T>;
+    /**
+     * Creates a slice of array excluding elements dropped from the beginning. Elements are dropped until predicate
+     * returns falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param array The array to query.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the slice of array.
+     */
+    (array: _.List<T> | null | undefined): T[];
+}
+
+declare const dropWhile: DropWhile;
+export = dropWhile;
diff --git a/types/lodash/fp/each.d.ts b/types/lodash/fp/each.d.ts
new file mode 100644
index 0000000000..df0afae30f
--- /dev/null
+++ b/types/lodash/fp/each.d.ts
@@ -0,0 +1,330 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface ForEach {
+    /**
+     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
+     * and invoked with three arguments:
+     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
+     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
+     *
+     * @alias _.each
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     */
+    (): ForEach;
+    /**
+     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
+     * and invoked with three arguments:
+     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
+     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
+     *
+     * @alias _.each
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     */
+    <T>(iteratee: (value: T) => any): ForEach1x1<T>;
+    /**
+     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
+     * and invoked with three arguments:
+     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
+     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
+     *
+     * @alias _.each
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     */
+    <T>(iteratee: (value: T) => any, collection: ReadonlyArray<T>): T[];
+    /**
+     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
+     * and invoked with three arguments:
+     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
+     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
+     *
+     * @alias _.each
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     */
+    (iteratee: (value: string) => any): ForEach2x1;
+    /**
+     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
+     * and invoked with three arguments:
+     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
+     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
+     *
+     * @alias _.each
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     */
+    (iteratee: (value: string) => any, collection: string): string;
+    /**
+     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
+     * and invoked with three arguments:
+     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
+     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
+     *
+     * @alias _.each
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     */
+    <T>(iteratee: (value: T) => any, collection: _.List<T>): _.List<T>;
+    /**
+     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
+     * and invoked with three arguments:
+     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
+     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
+     *
+     * @alias _.each
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     */
+    <T extends object>(iteratee: (value: T[keyof T]) => any, collection: T): T;
+    /**
+     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
+     * and invoked with three arguments:
+     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
+     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
+     *
+     * @alias _.each
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     */
+    <T, TArray extends T[] | null | undefined>(iteratee: (value: T) => any, collection: TArray & (T[] | null | undefined)): TArray;
+    /**
+     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
+     * and invoked with three arguments:
+     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
+     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
+     *
+     * @alias _.each
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     */
+    <TString extends string | null | undefined>(iteratee: (value: string) => any, collection: TString): TString;
+    /**
+     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
+     * and invoked with three arguments:
+     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
+     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
+     *
+     * @alias _.each
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     */
+    <T, TList extends _.List<T> | null | undefined>(iteratee: (value: T) => any, collection: TList & (_.List<T> | null | undefined)): TList;
+    /**
+     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
+     * and invoked with three arguments:
+     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
+     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
+     *
+     * @alias _.each
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     */
+    <T extends object>(iteratee: (value: T[keyof T]) => any, collection: T | null | undefined): T | null | undefined;
+}
+interface ForEach1x1<T> {
+    /**
+     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
+     * and invoked with three arguments:
+     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
+     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
+     *
+     * @alias _.each
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     */
+    (): ForEach1x1<T>;
+    /**
+     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
+     * and invoked with three arguments:
+     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
+     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
+     *
+     * @alias _.each
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     */
+    (collection: ReadonlyArray<T>): T[];
+    /**
+     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
+     * and invoked with three arguments:
+     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
+     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
+     *
+     * @alias _.each
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     */
+    (collection: _.List<T>): _.List<T>;
+    /**
+     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
+     * and invoked with three arguments:
+     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
+     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
+     *
+     * @alias _.each
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     */
+    <T1 extends object>(collection: T1): T1;
+    /**
+     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
+     * and invoked with three arguments:
+     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
+     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
+     *
+     * @alias _.each
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     */
+    <TArray extends T[] | null | undefined>(collection: TArray & (T[] | null | undefined)): TArray;
+    /**
+     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
+     * and invoked with three arguments:
+     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
+     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
+     *
+     * @alias _.each
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     */
+    <TList extends _.List<T> | null | undefined>(collection: TList & (_.List<T> | null | undefined)): TList;
+    /**
+     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
+     * and invoked with three arguments:
+     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
+     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
+     *
+     * @alias _.each
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     */
+    <T1 extends object>(collection: T1 | null | undefined): T1 | null | undefined;
+}
+interface ForEach2x1 {
+    /**
+     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
+     * and invoked with three arguments:
+     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
+     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
+     *
+     * @alias _.each
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     */
+    (): ForEach2x1;
+    /**
+     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
+     * and invoked with three arguments:
+     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
+     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
+     *
+     * @alias _.each
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     */
+    (collection: string): string;
+    /**
+     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
+     * and invoked with three arguments:
+     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
+     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
+     *
+     * @alias _.each
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     */
+    <TString extends string | null | undefined>(collection: TString): TString;
+}
+
+declare const each: ForEach;
+export = each;
diff --git a/types/lodash/fp/eachRight.d.ts b/types/lodash/fp/eachRight.d.ts
new file mode 100644
index 0000000000..06af73ca68
--- /dev/null
+++ b/types/lodash/fp/eachRight.d.ts
@@ -0,0 +1,225 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface ForEachRight {
+    /**
+     * This method is like _.forEach except that it iterates over elements of collection from right to left.
+     *
+     * @alias _.eachRight
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function called per iteration.
+     * @param thisArg The this binding of callback.
+     */
+    (): ForEachRight;
+    /**
+     * This method is like _.forEach except that it iterates over elements of collection from right to left.
+     *
+     * @alias _.eachRight
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function called per iteration.
+     * @param thisArg The this binding of callback.
+     */
+    <T>(iteratee: (value: T) => any): ForEachRight1x1<T>;
+    /**
+     * This method is like _.forEach except that it iterates over elements of collection from right to left.
+     *
+     * @alias _.eachRight
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function called per iteration.
+     * @param thisArg The this binding of callback.
+     */
+    <T>(iteratee: (value: T) => any, collection: ReadonlyArray<T>): T[];
+    /**
+     * This method is like _.forEach except that it iterates over elements of collection from right to left.
+     *
+     * @alias _.eachRight
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function called per iteration.
+     * @param thisArg The this binding of callback.
+     */
+    (iteratee: (value: string) => any): ForEachRight2x1;
+    /**
+     * This method is like _.forEach except that it iterates over elements of collection from right to left.
+     *
+     * @alias _.eachRight
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function called per iteration.
+     * @param thisArg The this binding of callback.
+     */
+    (iteratee: (value: string) => any, collection: string): string;
+    /**
+     * This method is like _.forEach except that it iterates over elements of collection from right to left.
+     *
+     * @alias _.eachRight
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function called per iteration.
+     * @param thisArg The this binding of callback.
+     */
+    <T>(iteratee: (value: T) => any, collection: _.List<T>): _.List<T>;
+    /**
+     * This method is like _.forEach except that it iterates over elements of collection from right to left.
+     *
+     * @alias _.eachRight
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function called per iteration.
+     * @param thisArg The this binding of callback.
+     */
+    <T extends object>(iteratee: (value: T[keyof T]) => any, collection: T): T;
+    /**
+     * This method is like _.forEach except that it iterates over elements of collection from right to left.
+     *
+     * @alias _.eachRight
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function called per iteration.
+     * @param thisArg The this binding of callback.
+     */
+    <T, TArray extends T[] | null | undefined>(iteratee: (value: T) => any, collection: TArray & (T[] | null | undefined)): TArray;
+    /**
+     * This method is like _.forEach except that it iterates over elements of collection from right to left.
+     *
+     * @alias _.eachRight
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function called per iteration.
+     * @param thisArg The this binding of callback.
+     */
+    <TString extends string | null | undefined>(iteratee: (value: string) => any, collection: TString): TString;
+    /**
+     * This method is like _.forEach except that it iterates over elements of collection from right to left.
+     *
+     * @alias _.eachRight
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function called per iteration.
+     * @param thisArg The this binding of callback.
+     */
+    <T, TList extends _.List<T> | null | undefined>(iteratee: (value: T) => any, collection: TList & (_.List<T> | null | undefined)): TList;
+    /**
+     * This method is like _.forEach except that it iterates over elements of collection from right to left.
+     *
+     * @alias _.eachRight
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function called per iteration.
+     * @param thisArg The this binding of callback.
+     */
+    <T extends object>(iteratee: (value: T[keyof T]) => any, collection: T | null | undefined): T | null | undefined;
+}
+interface ForEachRight1x1<T> {
+    /**
+     * This method is like _.forEach except that it iterates over elements of collection from right to left.
+     *
+     * @alias _.eachRight
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function called per iteration.
+     * @param thisArg The this binding of callback.
+     */
+    (): ForEachRight1x1<T>;
+    /**
+     * This method is like _.forEach except that it iterates over elements of collection from right to left.
+     *
+     * @alias _.eachRight
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function called per iteration.
+     * @param thisArg The this binding of callback.
+     */
+    (collection: ReadonlyArray<T>): T[];
+    /**
+     * This method is like _.forEach except that it iterates over elements of collection from right to left.
+     *
+     * @alias _.eachRight
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function called per iteration.
+     * @param thisArg The this binding of callback.
+     */
+    (collection: _.List<T>): _.List<T>;
+    /**
+     * This method is like _.forEach except that it iterates over elements of collection from right to left.
+     *
+     * @alias _.eachRight
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function called per iteration.
+     * @param thisArg The this binding of callback.
+     */
+    <T1 extends object>(collection: T1): T1;
+    /**
+     * This method is like _.forEach except that it iterates over elements of collection from right to left.
+     *
+     * @alias _.eachRight
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function called per iteration.
+     * @param thisArg The this binding of callback.
+     */
+    <TArray extends T[] | null | undefined>(collection: TArray & (T[] | null | undefined)): TArray;
+    /**
+     * This method is like _.forEach except that it iterates over elements of collection from right to left.
+     *
+     * @alias _.eachRight
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function called per iteration.
+     * @param thisArg The this binding of callback.
+     */
+    <TList extends _.List<T> | null | undefined>(collection: TList & (_.List<T> | null | undefined)): TList;
+    /**
+     * This method is like _.forEach except that it iterates over elements of collection from right to left.
+     *
+     * @alias _.eachRight
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function called per iteration.
+     * @param thisArg The this binding of callback.
+     */
+    <T1 extends object>(collection: T1 | null | undefined): T1 | null | undefined;
+}
+interface ForEachRight2x1 {
+    /**
+     * This method is like _.forEach except that it iterates over elements of collection from right to left.
+     *
+     * @alias _.eachRight
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function called per iteration.
+     * @param thisArg The this binding of callback.
+     */
+    (): ForEachRight2x1;
+    /**
+     * This method is like _.forEach except that it iterates over elements of collection from right to left.
+     *
+     * @alias _.eachRight
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function called per iteration.
+     * @param thisArg The this binding of callback.
+     */
+    (collection: string): string;
+    /**
+     * This method is like _.forEach except that it iterates over elements of collection from right to left.
+     *
+     * @alias _.eachRight
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function called per iteration.
+     * @param thisArg The this binding of callback.
+     */
+    <TString extends string | null | undefined>(collection: TString): TString;
+}
+
+declare const eachRight: ForEachRight;
+export = eachRight;
diff --git a/types/lodash/fp/endsWith.d.ts b/types/lodash/fp/endsWith.d.ts
new file mode 100644
index 0000000000..5808870c50
--- /dev/null
+++ b/types/lodash/fp/endsWith.d.ts
@@ -0,0 +1,56 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface EndsWith {
+    /**
+     * Checks if string ends with the given target string.
+     *
+     * @param string The string to search.
+     * @param target The string to search for.
+     * @param position The position to search from.
+     * @return Returns true if string ends with target, else false.
+     */
+    (): EndsWith;
+    /**
+     * Checks if string ends with the given target string.
+     *
+     * @param string The string to search.
+     * @param target The string to search for.
+     * @param position The position to search from.
+     * @return Returns true if string ends with target, else false.
+     */
+    (target: string): EndsWith1x1;
+    /**
+     * Checks if string ends with the given target string.
+     *
+     * @param string The string to search.
+     * @param target The string to search for.
+     * @param position The position to search from.
+     * @return Returns true if string ends with target, else false.
+     */
+    (target: string, string: string): boolean;
+}
+interface EndsWith1x1 {
+    /**
+     * Checks if string ends with the given target string.
+     *
+     * @param string The string to search.
+     * @param target The string to search for.
+     * @param position The position to search from.
+     * @return Returns true if string ends with target, else false.
+     */
+    (): EndsWith1x1;
+    /**
+     * Checks if string ends with the given target string.
+     *
+     * @param string The string to search.
+     * @param target The string to search for.
+     * @param position The position to search from.
+     * @return Returns true if string ends with target, else false.
+     */
+    (string: string): boolean;
+}
+
+declare const endsWith: EndsWith;
+export = endsWith;
diff --git a/types/lodash/fp/entries.d.ts b/types/lodash/fp/entries.d.ts
new file mode 100644
index 0000000000..99b04076c7
--- /dev/null
+++ b/types/lodash/fp/entries.d.ts
@@ -0,0 +1,25 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface ToPairs {
+    /**
+     * Creates an array of own enumerable key-value pairs for object.
+     *
+     * @param object The object to query.
+     * @return Returns the new array of key-value pairs.
+     */
+    <T>(object: _.Dictionary<T> | _.NumericDictionary<T>): Array<[string, T]>;
+    /**
+     * Creates an array of own enumerable key-value pairs for object.
+     *
+     * @param object The object to query.
+     * @return Returns the new array of key-value pairs.
+     */
+    (object: object): Array<[string, any]>;
+}
+
+declare const entries: ToPairs;
+export = entries;
diff --git a/types/lodash/fp/entriesIn.d.ts b/types/lodash/fp/entriesIn.d.ts
new file mode 100644
index 0000000000..3579959f84
--- /dev/null
+++ b/types/lodash/fp/entriesIn.d.ts
@@ -0,0 +1,25 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface ToPairsIn {
+    /**
+     * Creates an array of own and inherited enumerable key-value pairs for object.
+     *
+     * @param object The object to query.
+     * @return Returns the new array of key-value pairs.
+     */
+    <T>(object: _.Dictionary<T> | _.NumericDictionary<T>): Array<[string, T]>;
+    /**
+     * Creates an array of own and inherited enumerable key-value pairs for object.
+     *
+     * @param object The object to query.
+     * @return Returns the new array of key-value pairs.
+     */
+    (object: object): Array<[string, any]>;
+}
+
+declare const entriesIn: ToPairsIn;
+export = entriesIn;
diff --git a/types/lodash/fp/eq.d.ts b/types/lodash/fp/eq.d.ts
new file mode 100644
index 0000000000..4c3278ae3d
--- /dev/null
+++ b/types/lodash/fp/eq.d.ts
@@ -0,0 +1,156 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface Eq {
+    /**
+     * Performs a [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+     * comparison between two values to determine if they are equivalent.
+     *
+     * @category Lang
+     * @param value The value to compare.
+     * @param other The other value to compare.
+     * @returns Returns `true` if the values are equivalent, else `false`.
+     * @example
+     *
+     * var object = { 'user': 'fred' };
+     * var other = { 'user': 'fred' };
+     *
+     * _.eq(object, object);
+     * // => true
+     *
+     * _.eq(object, other);
+     * // => false
+     *
+     * _.eq('a', 'a');
+     * // => true
+     *
+     * _.eq('a', Object('a'));
+     * // => false
+     *
+     * _.eq(NaN, NaN);
+     * // => true
+     */
+    (): Eq;
+    /**
+     * Performs a [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+     * comparison between two values to determine if they are equivalent.
+     *
+     * @category Lang
+     * @param value The value to compare.
+     * @param other The other value to compare.
+     * @returns Returns `true` if the values are equivalent, else `false`.
+     * @example
+     *
+     * var object = { 'user': 'fred' };
+     * var other = { 'user': 'fred' };
+     *
+     * _.eq(object, object);
+     * // => true
+     *
+     * _.eq(object, other);
+     * // => false
+     *
+     * _.eq('a', 'a');
+     * // => true
+     *
+     * _.eq('a', Object('a'));
+     * // => false
+     *
+     * _.eq(NaN, NaN);
+     * // => true
+     */
+    (value: any): Eq1x1;
+    /**
+     * Performs a [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+     * comparison between two values to determine if they are equivalent.
+     *
+     * @category Lang
+     * @param value The value to compare.
+     * @param other The other value to compare.
+     * @returns Returns `true` if the values are equivalent, else `false`.
+     * @example
+     *
+     * var object = { 'user': 'fred' };
+     * var other = { 'user': 'fred' };
+     *
+     * _.eq(object, object);
+     * // => true
+     *
+     * _.eq(object, other);
+     * // => false
+     *
+     * _.eq('a', 'a');
+     * // => true
+     *
+     * _.eq('a', Object('a'));
+     * // => false
+     *
+     * _.eq(NaN, NaN);
+     * // => true
+     */
+    (value: any, other: any): boolean;
+}
+interface Eq1x1 {
+    /**
+     * Performs a [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+     * comparison between two values to determine if they are equivalent.
+     *
+     * @category Lang
+     * @param value The value to compare.
+     * @param other The other value to compare.
+     * @returns Returns `true` if the values are equivalent, else `false`.
+     * @example
+     *
+     * var object = { 'user': 'fred' };
+     * var other = { 'user': 'fred' };
+     *
+     * _.eq(object, object);
+     * // => true
+     *
+     * _.eq(object, other);
+     * // => false
+     *
+     * _.eq('a', 'a');
+     * // => true
+     *
+     * _.eq('a', Object('a'));
+     * // => false
+     *
+     * _.eq(NaN, NaN);
+     * // => true
+     */
+    (): Eq1x1;
+    /**
+     * Performs a [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+     * comparison between two values to determine if they are equivalent.
+     *
+     * @category Lang
+     * @param value The value to compare.
+     * @param other The other value to compare.
+     * @returns Returns `true` if the values are equivalent, else `false`.
+     * @example
+     *
+     * var object = { 'user': 'fred' };
+     * var other = { 'user': 'fred' };
+     *
+     * _.eq(object, object);
+     * // => true
+     *
+     * _.eq(object, other);
+     * // => false
+     *
+     * _.eq('a', 'a');
+     * // => true
+     *
+     * _.eq('a', Object('a'));
+     * // => false
+     *
+     * _.eq(NaN, NaN);
+     * // => true
+     */
+    (other: any): boolean;
+}
+
+declare const eq: Eq;
+export = eq;
diff --git a/types/lodash/fp/equals.d.ts b/types/lodash/fp/equals.d.ts
new file mode 100644
index 0000000000..3e3f9b1853
--- /dev/null
+++ b/types/lodash/fp/equals.d.ts
@@ -0,0 +1,141 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface IsEqual {
+    /**
+     * Performs a deep comparison between two values to determine if they are
+     * equivalent.
+     *
+     * **Note:** This method supports comparing arrays, array buffers, booleans,
+     * date objects, error objects, maps, numbers, `Object` objects, regexes,
+     * sets, strings, symbols, and typed arrays. `Object` objects are compared
+     * by their own, not inherited, enumerable properties. Functions and DOM
+     * nodes are **not** supported.
+     *
+     * @category Lang
+     * @param value The value to compare.
+     * @param other The other value to compare.
+     * @returns Returns `true` if the values are equivalent, else `false`.
+     * @example
+     *
+     * var object = { 'user': 'fred' };
+     * var other = { 'user': 'fred' };
+     *
+     * _.isEqual(object, other);
+     * // => true
+     *
+     * object === other;
+     * // => false
+     */
+    (): IsEqual;
+    /**
+     * Performs a deep comparison between two values to determine if they are
+     * equivalent.
+     *
+     * **Note:** This method supports comparing arrays, array buffers, booleans,
+     * date objects, error objects, maps, numbers, `Object` objects, regexes,
+     * sets, strings, symbols, and typed arrays. `Object` objects are compared
+     * by their own, not inherited, enumerable properties. Functions and DOM
+     * nodes are **not** supported.
+     *
+     * @category Lang
+     * @param value The value to compare.
+     * @param other The other value to compare.
+     * @returns Returns `true` if the values are equivalent, else `false`.
+     * @example
+     *
+     * var object = { 'user': 'fred' };
+     * var other = { 'user': 'fred' };
+     *
+     * _.isEqual(object, other);
+     * // => true
+     *
+     * object === other;
+     * // => false
+     */
+    (value: any): IsEqual1x1;
+    /**
+     * Performs a deep comparison between two values to determine if they are
+     * equivalent.
+     *
+     * **Note:** This method supports comparing arrays, array buffers, booleans,
+     * date objects, error objects, maps, numbers, `Object` objects, regexes,
+     * sets, strings, symbols, and typed arrays. `Object` objects are compared
+     * by their own, not inherited, enumerable properties. Functions and DOM
+     * nodes are **not** supported.
+     *
+     * @category Lang
+     * @param value The value to compare.
+     * @param other The other value to compare.
+     * @returns Returns `true` if the values are equivalent, else `false`.
+     * @example
+     *
+     * var object = { 'user': 'fred' };
+     * var other = { 'user': 'fred' };
+     *
+     * _.isEqual(object, other);
+     * // => true
+     *
+     * object === other;
+     * // => false
+     */
+    (value: any, other: any): boolean;
+}
+interface IsEqual1x1 {
+    /**
+     * Performs a deep comparison between two values to determine if they are
+     * equivalent.
+     *
+     * **Note:** This method supports comparing arrays, array buffers, booleans,
+     * date objects, error objects, maps, numbers, `Object` objects, regexes,
+     * sets, strings, symbols, and typed arrays. `Object` objects are compared
+     * by their own, not inherited, enumerable properties. Functions and DOM
+     * nodes are **not** supported.
+     *
+     * @category Lang
+     * @param value The value to compare.
+     * @param other The other value to compare.
+     * @returns Returns `true` if the values are equivalent, else `false`.
+     * @example
+     *
+     * var object = { 'user': 'fred' };
+     * var other = { 'user': 'fred' };
+     *
+     * _.isEqual(object, other);
+     * // => true
+     *
+     * object === other;
+     * // => false
+     */
+    (): IsEqual1x1;
+    /**
+     * Performs a deep comparison between two values to determine if they are
+     * equivalent.
+     *
+     * **Note:** This method supports comparing arrays, array buffers, booleans,
+     * date objects, error objects, maps, numbers, `Object` objects, regexes,
+     * sets, strings, symbols, and typed arrays. `Object` objects are compared
+     * by their own, not inherited, enumerable properties. Functions and DOM
+     * nodes are **not** supported.
+     *
+     * @category Lang
+     * @param value The value to compare.
+     * @param other The other value to compare.
+     * @returns Returns `true` if the values are equivalent, else `false`.
+     * @example
+     *
+     * var object = { 'user': 'fred' };
+     * var other = { 'user': 'fred' };
+     *
+     * _.isEqual(object, other);
+     * // => true
+     *
+     * object === other;
+     * // => false
+     */
+    (other: any): boolean;
+}
+
+declare const equals: IsEqual;
+export = equals;
diff --git a/types/lodash/fp/escape.d.ts b/types/lodash/fp/escape.d.ts
new file mode 100644
index 0000000000..18f704928d
--- /dev/null
+++ b/types/lodash/fp/escape.d.ts
@@ -0,0 +1,26 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type Escape =
+    /**
+     * Converts the characters "&", "<", ">", '"', "'", and "`" in string to their corresponding HTML entities.
+     *
+     * Note: No other characters are escaped. To escape additional characters use a third-party library like he.
+     *
+     * hough the ">" character is escaped for symmetry, characters like ">" and "/" don’t need escaping in HTML
+     * and have no special meaning unless they're part of a tag or unquoted attribute value. See Mathias Bynens’s
+     * article (under "semi-related fun fact") for more details.
+     *
+     * Backticks are escaped because in IE < 9, they can break out of attribute values or HTML comments. See #59,
+     * #102, #108, and #133 of the HTML5 Security Cheatsheet for more details.
+     *
+     * When working with HTML you should always quote attribute values to reduce XSS vectors.
+     *
+     * @param string The string to escape.
+     * @return Returns the escaped string.
+     */
+    (string: string) => string;
+
+declare const escape: Escape;
+export = escape;
diff --git a/types/lodash/fp/escapeRegExp.d.ts b/types/lodash/fp/escapeRegExp.d.ts
new file mode 100644
index 0000000000..f66fa150c8
--- /dev/null
+++ b/types/lodash/fp/escapeRegExp.d.ts
@@ -0,0 +1,16 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type EscapeRegExp =
+    /**
+     * Escapes the RegExp special characters "^", "$", "\", ".", "*", "+", "?", "(", ")", "[", "]",
+     * "{", "}", and "|" in string.
+     *
+     * @param string The string to escape.
+     * @return Returns the escaped string.
+     */
+    (string: string) => string;
+
+declare const escapeRegExp: EscapeRegExp;
+export = escapeRegExp;
diff --git a/types/lodash/fp/every.d.ts b/types/lodash/fp/every.d.ts
new file mode 100644
index 0000000000..fc60615c96
--- /dev/null
+++ b/types/lodash/fp/every.d.ts
@@ -0,0 +1,67 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Every {
+    /**
+     * Checks if predicate returns truthy for all elements of collection. Iteration is stopped once predicate
+     * returns falsey. The predicate is invoked with three arguments: (value, index|key, collection).
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @return Returns true if all elements pass the predicate check, else false.
+     */
+    (): Every;
+    /**
+     * Checks if predicate returns truthy for all elements of collection. Iteration is stopped once predicate
+     * returns falsey. The predicate is invoked with three arguments: (value, index|key, collection).
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @return Returns true if all elements pass the predicate check, else false.
+     */
+    <T>(predicate: _.ValueIterateeCustom<T, boolean>): Every1x1<T>;
+    /**
+     * Checks if predicate returns truthy for all elements of collection. Iteration is stopped once predicate
+     * returns falsey. The predicate is invoked with three arguments: (value, index|key, collection).
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @return Returns true if all elements pass the predicate check, else false.
+     */
+    <T>(predicate: _.ValueIterateeCustom<T, boolean>, collection: _.List<T> | null | undefined): boolean;
+    /**
+     * Checks if predicate returns truthy for all elements of collection. Iteration is stopped once predicate
+     * returns falsey. The predicate is invoked with three arguments: (value, index|key, collection).
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @return Returns true if all elements pass the predicate check, else false.
+     */
+    <T extends object>(predicate: _.ValueIterateeCustom<T[keyof T], boolean>, collection: T | null | undefined): boolean;
+}
+interface Every1x1<T> {
+    /**
+     * Checks if predicate returns truthy for all elements of collection. Iteration is stopped once predicate
+     * returns falsey. The predicate is invoked with three arguments: (value, index|key, collection).
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @return Returns true if all elements pass the predicate check, else false.
+     */
+    (): Every1x1<T>;
+    /**
+     * Checks if predicate returns truthy for all elements of collection. Iteration is stopped once predicate
+     * returns falsey. The predicate is invoked with three arguments: (value, index|key, collection).
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @return Returns true if all elements pass the predicate check, else false.
+     */
+    (collection: _.List<T> | object | null | undefined): boolean;
+}
+
+declare const every: Every;
+export = every;
diff --git a/types/lodash/fp/extend.d.ts b/types/lodash/fp/extend.d.ts
new file mode 100644
index 0000000000..ee0889f8ae
--- /dev/null
+++ b/types/lodash/fp/extend.d.ts
@@ -0,0 +1,151 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface AssignIn {
+    /**
+     * This method is like `_.assign` except that it iterates over own and
+     * inherited source properties.
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @alias extend
+     * @category Object
+     * @param object The destination object.
+     * @param [sources] The source objects.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function Foo() {
+     *   this.b = 2;
+     * }
+     *
+     * function Bar() {
+     *   this.d = 4;
+     * }
+     *
+     * Foo.prototype.c = 3;
+     * Bar.prototype.e = 5;
+     *
+     * _.assignIn({ 'a': 1 }, new Foo, new Bar);
+     * // => { 'a': 1, 'b': 2, 'c': 3, 'd': 4, 'e': 5 }
+     */
+    (): AssignIn;
+    /**
+     * This method is like `_.assign` except that it iterates over own and
+     * inherited source properties.
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @alias extend
+     * @category Object
+     * @param object The destination object.
+     * @param [sources] The source objects.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function Foo() {
+     *   this.b = 2;
+     * }
+     *
+     * function Bar() {
+     *   this.d = 4;
+     * }
+     *
+     * Foo.prototype.c = 3;
+     * Bar.prototype.e = 5;
+     *
+     * _.assignIn({ 'a': 1 }, new Foo, new Bar);
+     * // => { 'a': 1, 'b': 2, 'c': 3, 'd': 4, 'e': 5 }
+     */
+    <TObject>(object: TObject): AssignIn1x1<TObject>;
+    /**
+     * This method is like `_.assign` except that it iterates over own and
+     * inherited source properties.
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @alias extend
+     * @category Object
+     * @param object The destination object.
+     * @param [sources] The source objects.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function Foo() {
+     *   this.b = 2;
+     * }
+     *
+     * function Bar() {
+     *   this.d = 4;
+     * }
+     *
+     * Foo.prototype.c = 3;
+     * Bar.prototype.e = 5;
+     *
+     * _.assignIn({ 'a': 1 }, new Foo, new Bar);
+     * // => { 'a': 1, 'b': 2, 'c': 3, 'd': 4, 'e': 5 }
+     */
+    <TObject, TSource>(object: TObject, source: TSource): TObject & TSource;
+}
+interface AssignIn1x1<TObject> {
+    /**
+     * This method is like `_.assign` except that it iterates over own and
+     * inherited source properties.
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @alias extend
+     * @category Object
+     * @param object The destination object.
+     * @param [sources] The source objects.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function Foo() {
+     *   this.b = 2;
+     * }
+     *
+     * function Bar() {
+     *   this.d = 4;
+     * }
+     *
+     * Foo.prototype.c = 3;
+     * Bar.prototype.e = 5;
+     *
+     * _.assignIn({ 'a': 1 }, new Foo, new Bar);
+     * // => { 'a': 1, 'b': 2, 'c': 3, 'd': 4, 'e': 5 }
+     */
+    (): AssignIn1x1<TObject>;
+    /**
+     * This method is like `_.assign` except that it iterates over own and
+     * inherited source properties.
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @alias extend
+     * @category Object
+     * @param object The destination object.
+     * @param [sources] The source objects.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function Foo() {
+     *   this.b = 2;
+     * }
+     *
+     * function Bar() {
+     *   this.d = 4;
+     * }
+     *
+     * Foo.prototype.c = 3;
+     * Bar.prototype.e = 5;
+     *
+     * _.assignIn({ 'a': 1 }, new Foo, new Bar);
+     * // => { 'a': 1, 'b': 2, 'c': 3, 'd': 4, 'e': 5 }
+     */
+    <TSource>(source: TSource): TObject & TSource;
+}
+
+declare const extend: AssignIn;
+export = extend;
diff --git a/types/lodash/fp/extendAll.d.ts b/types/lodash/fp/extendAll.d.ts
new file mode 100644
index 0000000000..a8168d774d
--- /dev/null
+++ b/types/lodash/fp/extendAll.d.ts
@@ -0,0 +1,36 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type AssignIn =
+    /**
+     * This method is like `_.assign` except that it iterates over own and
+     * inherited source properties.
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @alias extend
+     * @category Object
+     * @param object The destination object.
+     * @param [sources] The source objects.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function Foo() {
+     *   this.b = 2;
+     * }
+     *
+     * function Bar() {
+     *   this.d = 4;
+     * }
+     *
+     * Foo.prototype.c = 3;
+     * Bar.prototype.e = 5;
+     *
+     * _.assignIn({ 'a': 1 }, new Foo, new Bar);
+     * // => { 'a': 1, 'b': 2, 'c': 3, 'd': 4, 'e': 5 }
+     */
+    <TResult>(object: ReadonlyArray<any>) => TResult;
+
+declare const extendAll: AssignIn;
+export = extendAll;
diff --git a/types/lodash/fp/extendAllWith.d.ts b/types/lodash/fp/extendAllWith.d.ts
new file mode 100644
index 0000000000..6e2d7602d3
--- /dev/null
+++ b/types/lodash/fp/extendAllWith.d.ts
@@ -0,0 +1,143 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface AssignInWith {
+    /**
+     * This method is like `_.assignIn` except that it accepts `customizer` which
+     * is invoked to produce the assigned values. If `customizer` returns `undefined`
+     * assignment is handled by the method instead. The `customizer` is invoked
+     * with five arguments: (objValue, srcValue, key, object, source).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @alias extendWith
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   return _.isUndefined(objValue) ? srcValue : objValue;
+     * }
+     *
+     * var defaults = _.partialRight(_.assignInWith, customizer);
+     *
+     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+     * // => { 'a': 1, 'b': 2 }
+     */
+    (): AssignInWith;
+    /**
+     * This method is like `_.assignIn` except that it accepts `customizer` which
+     * is invoked to produce the assigned values. If `customizer` returns `undefined`
+     * assignment is handled by the method instead. The `customizer` is invoked
+     * with five arguments: (objValue, srcValue, key, object, source).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @alias extendWith
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   return _.isUndefined(objValue) ? srcValue : objValue;
+     * }
+     *
+     * var defaults = _.partialRight(_.assignInWith, customizer);
+     *
+     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+     * // => { 'a': 1, 'b': 2 }
+     */
+    (customizer: _.AssignCustomizer): AssignInWith1x1;
+    /**
+     * This method is like `_.assignIn` except that it accepts `customizer` which
+     * is invoked to produce the assigned values. If `customizer` returns `undefined`
+     * assignment is handled by the method instead. The `customizer` is invoked
+     * with five arguments: (objValue, srcValue, key, object, source).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @alias extendWith
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   return _.isUndefined(objValue) ? srcValue : objValue;
+     * }
+     *
+     * var defaults = _.partialRight(_.assignInWith, customizer);
+     *
+     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+     * // => { 'a': 1, 'b': 2 }
+     */
+    (customizer: _.AssignCustomizer, args: ReadonlyArray<any>): any;
+}
+interface AssignInWith1x1 {
+    /**
+     * This method is like `_.assignIn` except that it accepts `customizer` which
+     * is invoked to produce the assigned values. If `customizer` returns `undefined`
+     * assignment is handled by the method instead. The `customizer` is invoked
+     * with five arguments: (objValue, srcValue, key, object, source).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @alias extendWith
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   return _.isUndefined(objValue) ? srcValue : objValue;
+     * }
+     *
+     * var defaults = _.partialRight(_.assignInWith, customizer);
+     *
+     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+     * // => { 'a': 1, 'b': 2 }
+     */
+    (): AssignInWith1x1;
+    /**
+     * This method is like `_.assignIn` except that it accepts `customizer` which
+     * is invoked to produce the assigned values. If `customizer` returns `undefined`
+     * assignment is handled by the method instead. The `customizer` is invoked
+     * with five arguments: (objValue, srcValue, key, object, source).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @alias extendWith
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   return _.isUndefined(objValue) ? srcValue : objValue;
+     * }
+     *
+     * var defaults = _.partialRight(_.assignInWith, customizer);
+     *
+     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+     * // => { 'a': 1, 'b': 2 }
+     */
+    (args: ReadonlyArray<any>): any;
+}
+
+declare const extendAllWith: AssignInWith;
+export = extendAllWith;
diff --git a/types/lodash/fp/extendWith.d.ts b/types/lodash/fp/extendWith.d.ts
new file mode 100644
index 0000000000..39b50e9ebf
--- /dev/null
+++ b/types/lodash/fp/extendWith.d.ts
@@ -0,0 +1,249 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface AssignInWith {
+    /**
+     * This method is like `_.assignIn` except that it accepts `customizer` which
+     * is invoked to produce the assigned values. If `customizer` returns `undefined`
+     * assignment is handled by the method instead. The `customizer` is invoked
+     * with five arguments: (objValue, srcValue, key, object, source).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @alias extendWith
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   return _.isUndefined(objValue) ? srcValue : objValue;
+     * }
+     *
+     * var defaults = _.partialRight(_.assignInWith, customizer);
+     *
+     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+     * // => { 'a': 1, 'b': 2 }
+     */
+    (): AssignInWith;
+    /**
+     * This method is like `_.assignIn` except that it accepts `customizer` which
+     * is invoked to produce the assigned values. If `customizer` returns `undefined`
+     * assignment is handled by the method instead. The `customizer` is invoked
+     * with five arguments: (objValue, srcValue, key, object, source).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @alias extendWith
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   return _.isUndefined(objValue) ? srcValue : objValue;
+     * }
+     *
+     * var defaults = _.partialRight(_.assignInWith, customizer);
+     *
+     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+     * // => { 'a': 1, 'b': 2 }
+     */
+    (customizer: _.AssignCustomizer): AssignInWith1x1;
+    /**
+     * This method is like `_.assignIn` except that it accepts `customizer` which
+     * is invoked to produce the assigned values. If `customizer` returns `undefined`
+     * assignment is handled by the method instead. The `customizer` is invoked
+     * with five arguments: (objValue, srcValue, key, object, source).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @alias extendWith
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   return _.isUndefined(objValue) ? srcValue : objValue;
+     * }
+     *
+     * var defaults = _.partialRight(_.assignInWith, customizer);
+     *
+     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+     * // => { 'a': 1, 'b': 2 }
+     */
+    <TObject>(customizer: _.AssignCustomizer, object: TObject): AssignInWith1x2<TObject>;
+    /**
+     * This method is like `_.assignIn` except that it accepts `customizer` which
+     * is invoked to produce the assigned values. If `customizer` returns `undefined`
+     * assignment is handled by the method instead. The `customizer` is invoked
+     * with five arguments: (objValue, srcValue, key, object, source).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @alias extendWith
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   return _.isUndefined(objValue) ? srcValue : objValue;
+     * }
+     *
+     * var defaults = _.partialRight(_.assignInWith, customizer);
+     *
+     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+     * // => { 'a': 1, 'b': 2 }
+     */
+    <TObject, TSource>(customizer: _.AssignCustomizer, object: TObject, source: TSource): TObject & TSource;
+}
+interface AssignInWith1x1 {
+    /**
+     * This method is like `_.assignIn` except that it accepts `customizer` which
+     * is invoked to produce the assigned values. If `customizer` returns `undefined`
+     * assignment is handled by the method instead. The `customizer` is invoked
+     * with five arguments: (objValue, srcValue, key, object, source).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @alias extendWith
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   return _.isUndefined(objValue) ? srcValue : objValue;
+     * }
+     *
+     * var defaults = _.partialRight(_.assignInWith, customizer);
+     *
+     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+     * // => { 'a': 1, 'b': 2 }
+     */
+    (): AssignInWith1x1;
+    /**
+     * This method is like `_.assignIn` except that it accepts `customizer` which
+     * is invoked to produce the assigned values. If `customizer` returns `undefined`
+     * assignment is handled by the method instead. The `customizer` is invoked
+     * with five arguments: (objValue, srcValue, key, object, source).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @alias extendWith
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   return _.isUndefined(objValue) ? srcValue : objValue;
+     * }
+     *
+     * var defaults = _.partialRight(_.assignInWith, customizer);
+     *
+     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+     * // => { 'a': 1, 'b': 2 }
+     */
+    <TObject>(object: TObject): AssignInWith1x2<TObject>;
+    /**
+     * This method is like `_.assignIn` except that it accepts `customizer` which
+     * is invoked to produce the assigned values. If `customizer` returns `undefined`
+     * assignment is handled by the method instead. The `customizer` is invoked
+     * with five arguments: (objValue, srcValue, key, object, source).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @alias extendWith
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   return _.isUndefined(objValue) ? srcValue : objValue;
+     * }
+     *
+     * var defaults = _.partialRight(_.assignInWith, customizer);
+     *
+     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+     * // => { 'a': 1, 'b': 2 }
+     */
+    <TObject, TSource>(object: TObject, source: TSource): TObject & TSource;
+}
+interface AssignInWith1x2<TObject> {
+    /**
+     * This method is like `_.assignIn` except that it accepts `customizer` which
+     * is invoked to produce the assigned values. If `customizer` returns `undefined`
+     * assignment is handled by the method instead. The `customizer` is invoked
+     * with five arguments: (objValue, srcValue, key, object, source).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @alias extendWith
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   return _.isUndefined(objValue) ? srcValue : objValue;
+     * }
+     *
+     * var defaults = _.partialRight(_.assignInWith, customizer);
+     *
+     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+     * // => { 'a': 1, 'b': 2 }
+     */
+    (): AssignInWith1x2<TObject>;
+    /**
+     * This method is like `_.assignIn` except that it accepts `customizer` which
+     * is invoked to produce the assigned values. If `customizer` returns `undefined`
+     * assignment is handled by the method instead. The `customizer` is invoked
+     * with five arguments: (objValue, srcValue, key, object, source).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @alias extendWith
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   return _.isUndefined(objValue) ? srcValue : objValue;
+     * }
+     *
+     * var defaults = _.partialRight(_.assignInWith, customizer);
+     *
+     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
+     * // => { 'a': 1, 'b': 2 }
+     */
+    <TSource>(source: TSource): TObject & TSource;
+}
+
+declare const extendWith: AssignInWith;
+export = extendWith;
diff --git a/types/lodash/fp/fill.d.ts b/types/lodash/fp/fill.d.ts
new file mode 100644
index 0000000000..5349e8e067
--- /dev/null
+++ b/types/lodash/fp/fill.d.ts
@@ -0,0 +1,233 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Fill {
+    /**
+     * Fills elements of array with value from start up to, but not including, end.
+     *
+     * Note: This method mutates array.
+     *
+     * @param array The array to fill.
+     * @param value The value to fill array with.
+     * @param start The start position.
+     * @param end The end position.
+     * @return Returns array.
+     */
+    (): Fill;
+    /**
+     * Fills elements of array with value from start up to, but not including, end.
+     *
+     * Note: This method mutates array.
+     *
+     * @param array The array to fill.
+     * @param value The value to fill array with.
+     * @param start The start position.
+     * @param end The end position.
+     * @return Returns array.
+     */
+    (start: number): Fill1x1;
+    /**
+     * Fills elements of array with value from start up to, but not including, end.
+     *
+     * Note: This method mutates array.
+     *
+     * @param array The array to fill.
+     * @param value The value to fill array with.
+     * @param start The start position.
+     * @param end The end position.
+     * @return Returns array.
+     */
+    (start: number, end: number): Fill1x2;
+    /**
+     * Fills elements of array with value from start up to, but not including, end.
+     *
+     * Note: This method mutates array.
+     *
+     * @param array The array to fill.
+     * @param value The value to fill array with.
+     * @param start The start position.
+     * @param end The end position.
+     * @return Returns array.
+     */
+    <T>(start: number, end: number, value: T): Fill1x3<T>;
+    /**
+     * Fills elements of array with value from start up to, but not including, end.
+     *
+     * Note: This method mutates array.
+     *
+     * @param array The array to fill.
+     * @param value The value to fill array with.
+     * @param start The start position.
+     * @param end The end position.
+     * @return Returns array.
+     */
+    <T, U>(start: number, end: number, value: T, array: U[] | null | undefined): Array<T | U>;
+    /**
+     * Fills elements of array with value from start up to, but not including, end.
+     *
+     * Note: This method mutates array.
+     *
+     * @param array The array to fill.
+     * @param value The value to fill array with.
+     * @param start The start position.
+     * @param end The end position.
+     * @return Returns array.
+     */
+    <T, U>(start: number, end: number, value: T, array: _.List<U> | null | undefined): _.List<T | U>;
+}
+interface Fill1x1 {
+    /**
+     * Fills elements of array with value from start up to, but not including, end.
+     *
+     * Note: This method mutates array.
+     *
+     * @param array The array to fill.
+     * @param value The value to fill array with.
+     * @param start The start position.
+     * @param end The end position.
+     * @return Returns array.
+     */
+    (): Fill1x1;
+    /**
+     * Fills elements of array with value from start up to, but not including, end.
+     *
+     * Note: This method mutates array.
+     *
+     * @param array The array to fill.
+     * @param value The value to fill array with.
+     * @param start The start position.
+     * @param end The end position.
+     * @return Returns array.
+     */
+    (end: number): Fill1x2;
+    /**
+     * Fills elements of array with value from start up to, but not including, end.
+     *
+     * Note: This method mutates array.
+     *
+     * @param array The array to fill.
+     * @param value The value to fill array with.
+     * @param start The start position.
+     * @param end The end position.
+     * @return Returns array.
+     */
+    <T>(end: number, value: T): Fill1x3<T>;
+    /**
+     * Fills elements of array with value from start up to, but not including, end.
+     *
+     * Note: This method mutates array.
+     *
+     * @param array The array to fill.
+     * @param value The value to fill array with.
+     * @param start The start position.
+     * @param end The end position.
+     * @return Returns array.
+     */
+    <T, U>(end: number, value: T, array: U[] | null | undefined): Array<T | U>;
+    /**
+     * Fills elements of array with value from start up to, but not including, end.
+     *
+     * Note: This method mutates array.
+     *
+     * @param array The array to fill.
+     * @param value The value to fill array with.
+     * @param start The start position.
+     * @param end The end position.
+     * @return Returns array.
+     */
+    <T, U>(end: number, value: T, array: _.List<U> | null | undefined): _.List<T | U>;
+}
+interface Fill1x2 {
+    /**
+     * Fills elements of array with value from start up to, but not including, end.
+     *
+     * Note: This method mutates array.
+     *
+     * @param array The array to fill.
+     * @param value The value to fill array with.
+     * @param start The start position.
+     * @param end The end position.
+     * @return Returns array.
+     */
+    (): Fill1x2;
+    /**
+     * Fills elements of array with value from start up to, but not including, end.
+     *
+     * Note: This method mutates array.
+     *
+     * @param array The array to fill.
+     * @param value The value to fill array with.
+     * @param start The start position.
+     * @param end The end position.
+     * @return Returns array.
+     */
+    <T>(value: T): Fill1x3<T>;
+    /**
+     * Fills elements of array with value from start up to, but not including, end.
+     *
+     * Note: This method mutates array.
+     *
+     * @param array The array to fill.
+     * @param value The value to fill array with.
+     * @param start The start position.
+     * @param end The end position.
+     * @return Returns array.
+     */
+    <T, U>(value: T, array: U[] | null | undefined): Array<T | U>;
+    /**
+     * Fills elements of array with value from start up to, but not including, end.
+     *
+     * Note: This method mutates array.
+     *
+     * @param array The array to fill.
+     * @param value The value to fill array with.
+     * @param start The start position.
+     * @param end The end position.
+     * @return Returns array.
+     */
+    <T, U>(value: T, array: _.List<U> | null | undefined): _.List<T | U>;
+}
+interface Fill1x3<T> {
+    /**
+     * Fills elements of array with value from start up to, but not including, end.
+     *
+     * Note: This method mutates array.
+     *
+     * @param array The array to fill.
+     * @param value The value to fill array with.
+     * @param start The start position.
+     * @param end The end position.
+     * @return Returns array.
+     */
+    (): Fill1x3<T>;
+    /**
+     * Fills elements of array with value from start up to, but not including, end.
+     *
+     * Note: This method mutates array.
+     *
+     * @param array The array to fill.
+     * @param value The value to fill array with.
+     * @param start The start position.
+     * @param end The end position.
+     * @return Returns array.
+     */
+    <U>(array: U[] | null | undefined): Array<T | U>;
+    /**
+     * Fills elements of array with value from start up to, but not including, end.
+     *
+     * Note: This method mutates array.
+     *
+     * @param array The array to fill.
+     * @param value The value to fill array with.
+     * @param start The start position.
+     * @param end The end position.
+     * @return Returns array.
+     */
+    <U>(array: _.List<U> | null | undefined): _.List<T | U>;
+}
+
+declare const fill: Fill;
+export = fill;
diff --git a/types/lodash/fp/filter.d.ts b/types/lodash/fp/filter.d.ts
new file mode 100644
index 0000000000..289c0edcd5
--- /dev/null
+++ b/types/lodash/fp/filter.d.ts
@@ -0,0 +1,361 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Filter {
+    /**
+     * Iterates over elements of collection, returning an array of all elements predicate returns truthy for. The
+     * predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the new filtered array.
+     */
+    (): Filter;
+    /**
+     * Iterates over elements of collection, returning an array of all elements predicate returns truthy for. The
+     * predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the new filtered array.
+     */
+    (predicate: (value: string) => boolean): Filter1x1;
+    /**
+     * Iterates over elements of collection, returning an array of all elements predicate returns truthy for. The
+     * predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the new filtered array.
+     */
+    (predicate: (value: string) => boolean, collection: string | null | undefined): string[];
+    /**
+     * Iterates over elements of collection, returning an array of all elements predicate returns truthy for. The
+     * predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the new filtered array.
+     */
+    <T, S extends T>(predicate: _.ValueIteratorTypeGuard<T, S>): Filter2x1<T, S>;
+    /**
+     * Iterates over elements of collection, returning an array of all elements predicate returns truthy for. The
+     * predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the new filtered array.
+     */
+    <T, S extends T>(predicate: _.ValueIteratorTypeGuard<T, S>, collection: _.List<T> | null | undefined): S[];
+    /**
+     * Iterates over elements of collection, returning an array of all elements predicate returns truthy for. The
+     * predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the new filtered array.
+     */
+    <T>(predicate: _.ValueIterateeCustom<T, boolean>): Filter3x1<T>;
+    /**
+     * Iterates over elements of collection, returning an array of all elements predicate returns truthy for. The
+     * predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the new filtered array.
+     */
+    <T>(predicate: _.ValueIterateeCustom<T, boolean>, collection: _.List<T> | null | undefined): T[];
+    /**
+     * Iterates over elements of collection, returning an array of all elements predicate returns truthy for. The
+     * predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the new filtered array.
+     */
+    <T extends object, S extends T[keyof T]>(predicate: _.ValueIteratorTypeGuard<T[keyof T], S>): Filter4x1<T, S>;
+    /**
+     * Iterates over elements of collection, returning an array of all elements predicate returns truthy for. The
+     * predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the new filtered array.
+     */
+    <T extends object, S extends T[keyof T]>(predicate: _.ValueIteratorTypeGuard<T[keyof T], S>, collection: T | null | undefined): S[];
+    /**
+     * Iterates over elements of collection, returning an array of all elements predicate returns truthy for. The
+     * predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the new filtered array.
+     */
+    <T extends object>(predicate: _.ValueIterateeCustom<T[keyof T], boolean>, collection: T | null | undefined): Array<T[keyof T]>;
+}
+interface Filter1x1 {
+    /**
+     * Iterates over elements of collection, returning an array of all elements predicate returns truthy for. The
+     * predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the new filtered array.
+     */
+    (): Filter1x1;
+    /**
+     * Iterates over elements of collection, returning an array of all elements predicate returns truthy for. The
+     * predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the new filtered array.
+     */
+    (collection: string | null | undefined): string[];
+}
+interface Filter2x1<T, S extends T> {
+    /**
+     * Iterates over elements of collection, returning an array of all elements predicate returns truthy for. The
+     * predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the new filtered array.
+     */
+    (): Filter2x1<T, S>;
+    /**
+     * Iterates over elements of collection, returning an array of all elements predicate returns truthy for. The
+     * predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the new filtered array.
+     */
+    (collection: _.List<T> | null | undefined): S[];
+}
+interface Filter3x1<T> {
+    /**
+     * Iterates over elements of collection, returning an array of all elements predicate returns truthy for. The
+     * predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the new filtered array.
+     */
+    (): Filter3x1<T>;
+    /**
+     * Iterates over elements of collection, returning an array of all elements predicate returns truthy for. The
+     * predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the new filtered array.
+     */
+    (collection: _.List<T> | object | null | undefined): T[];
+}
+interface Filter4x1<T extends object, S extends T[keyof T]> {
+    /**
+     * Iterates over elements of collection, returning an array of all elements predicate returns truthy for. The
+     * predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the new filtered array.
+     */
+    (): Filter4x1<T, S>;
+    /**
+     * Iterates over elements of collection, returning an array of all elements predicate returns truthy for. The
+     * predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the new filtered array.
+     */
+    (collection: T | null | undefined): S[];
+}
+
+declare const filter: Filter;
+export = filter;
diff --git a/types/lodash/fp/find.d.ts b/types/lodash/fp/find.d.ts
new file mode 100644
index 0000000000..d562ef3894
--- /dev/null
+++ b/types/lodash/fp/find.d.ts
@@ -0,0 +1,283 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Find {
+    /**
+     * Iterates over elements of collection, returning the first element predicate returns truthy for.
+     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to search.
+     * @param predicate The function invoked per iteration.
+     * @param fromIndex The index to search from.
+     * @return Returns the matched element, else undefined.
+     */
+    (): Find;
+    /**
+     * Iterates over elements of collection, returning the first element predicate returns truthy for.
+     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to search.
+     * @param predicate The function invoked per iteration.
+     * @param fromIndex The index to search from.
+     * @return Returns the matched element, else undefined.
+     */
+    <T, S extends T>(predicate: _.ValueIteratorTypeGuard<T, S>): Find1x1<T, S>;
+    /**
+     * Iterates over elements of collection, returning the first element predicate returns truthy for.
+     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to search.
+     * @param predicate The function invoked per iteration.
+     * @param fromIndex The index to search from.
+     * @return Returns the matched element, else undefined.
+     */
+    <T, S extends T>(predicate: _.ValueIteratorTypeGuard<T, S>, collection: _.List<T> | null | undefined): S|undefined;
+    /**
+     * Iterates over elements of collection, returning the first element predicate returns truthy for.
+     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to search.
+     * @param predicate The function invoked per iteration.
+     * @param fromIndex The index to search from.
+     * @return Returns the matched element, else undefined.
+     */
+    <T>(predicate: _.ValueIterateeCustom<T, boolean>): Find2x1<T>;
+    /**
+     * Iterates over elements of collection, returning the first element predicate returns truthy for.
+     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to search.
+     * @param predicate The function invoked per iteration.
+     * @param fromIndex The index to search from.
+     * @return Returns the matched element, else undefined.
+     */
+    <T>(predicate: _.ValueIterateeCustom<T, boolean>, collection: _.List<T> | null | undefined): T|undefined;
+    /**
+     * Iterates over elements of collection, returning the first element predicate returns truthy for.
+     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to search.
+     * @param predicate The function invoked per iteration.
+     * @param fromIndex The index to search from.
+     * @return Returns the matched element, else undefined.
+     */
+    <T extends object, S extends T[keyof T]>(predicate: _.ValueIteratorTypeGuard<T[keyof T], S>): Find3x1<T, S>;
+    /**
+     * Iterates over elements of collection, returning the first element predicate returns truthy for.
+     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to search.
+     * @param predicate The function invoked per iteration.
+     * @param fromIndex The index to search from.
+     * @return Returns the matched element, else undefined.
+     */
+    <T extends object, S extends T[keyof T]>(predicate: _.ValueIteratorTypeGuard<T[keyof T], S>, collection: T | null | undefined): S|undefined;
+    /**
+     * Iterates over elements of collection, returning the first element predicate returns truthy for.
+     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to search.
+     * @param predicate The function invoked per iteration.
+     * @param fromIndex The index to search from.
+     * @return Returns the matched element, else undefined.
+     */
+    <T extends object>(predicate: _.ValueIterateeCustom<T[keyof T], boolean>, collection: T | null | undefined): T[keyof T]|undefined;
+}
+interface Find1x1<T, S extends T> {
+    /**
+     * Iterates over elements of collection, returning the first element predicate returns truthy for.
+     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to search.
+     * @param predicate The function invoked per iteration.
+     * @param fromIndex The index to search from.
+     * @return Returns the matched element, else undefined.
+     */
+    (): Find1x1<T, S>;
+    /**
+     * Iterates over elements of collection, returning the first element predicate returns truthy for.
+     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to search.
+     * @param predicate The function invoked per iteration.
+     * @param fromIndex The index to search from.
+     * @return Returns the matched element, else undefined.
+     */
+    (collection: _.List<T> | null | undefined): S|undefined;
+}
+interface Find2x1<T> {
+    /**
+     * Iterates over elements of collection, returning the first element predicate returns truthy for.
+     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to search.
+     * @param predicate The function invoked per iteration.
+     * @param fromIndex The index to search from.
+     * @return Returns the matched element, else undefined.
+     */
+    (): Find2x1<T>;
+    /**
+     * Iterates over elements of collection, returning the first element predicate returns truthy for.
+     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to search.
+     * @param predicate The function invoked per iteration.
+     * @param fromIndex The index to search from.
+     * @return Returns the matched element, else undefined.
+     */
+    (collection: _.List<T> | object | null | undefined): T|undefined;
+}
+interface Find3x1<T extends object, S extends T[keyof T]> {
+    /**
+     * Iterates over elements of collection, returning the first element predicate returns truthy for.
+     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to search.
+     * @param predicate The function invoked per iteration.
+     * @param fromIndex The index to search from.
+     * @return Returns the matched element, else undefined.
+     */
+    (): Find3x1<T, S>;
+    /**
+     * Iterates over elements of collection, returning the first element predicate returns truthy for.
+     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to search.
+     * @param predicate The function invoked per iteration.
+     * @param fromIndex The index to search from.
+     * @return Returns the matched element, else undefined.
+     */
+    (collection: T | null | undefined): S|undefined;
+}
+
+declare const find: Find;
+export = find;
diff --git a/types/lodash/fp/findFrom.d.ts b/types/lodash/fp/findFrom.d.ts
new file mode 100644
index 0000000000..c2c83b5644
--- /dev/null
+++ b/types/lodash/fp/findFrom.d.ts
@@ -0,0 +1,517 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Find {
+    /**
+     * Iterates over elements of collection, returning the first element predicate returns truthy for.
+     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to search.
+     * @param predicate The function invoked per iteration.
+     * @param fromIndex The index to search from.
+     * @return Returns the matched element, else undefined.
+     */
+    (): Find;
+    /**
+     * Iterates over elements of collection, returning the first element predicate returns truthy for.
+     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to search.
+     * @param predicate The function invoked per iteration.
+     * @param fromIndex The index to search from.
+     * @return Returns the matched element, else undefined.
+     */
+    <T, S extends T>(predicate: _.ValueIteratorTypeGuard<T, S>): Find1x1<T, S>;
+    /**
+     * Iterates over elements of collection, returning the first element predicate returns truthy for.
+     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to search.
+     * @param predicate The function invoked per iteration.
+     * @param fromIndex The index to search from.
+     * @return Returns the matched element, else undefined.
+     */
+    <T, S extends T>(predicate: _.ValueIteratorTypeGuard<T, S>, fromIndex: number): Find1x2<T, S>;
+    /**
+     * Iterates over elements of collection, returning the first element predicate returns truthy for.
+     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to search.
+     * @param predicate The function invoked per iteration.
+     * @param fromIndex The index to search from.
+     * @return Returns the matched element, else undefined.
+     */
+    <T, S extends T>(predicate: _.ValueIteratorTypeGuard<T, S>, fromIndex: number, collection: _.List<T> | null | undefined): S|undefined;
+    /**
+     * Iterates over elements of collection, returning the first element predicate returns truthy for.
+     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to search.
+     * @param predicate The function invoked per iteration.
+     * @param fromIndex The index to search from.
+     * @return Returns the matched element, else undefined.
+     */
+    <T>(predicate: _.ValueIterateeCustom<T, boolean>): Find2x1<T>;
+    /**
+     * Iterates over elements of collection, returning the first element predicate returns truthy for.
+     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to search.
+     * @param predicate The function invoked per iteration.
+     * @param fromIndex The index to search from.
+     * @return Returns the matched element, else undefined.
+     */
+    <T>(predicate: _.ValueIterateeCustom<T, boolean>, fromIndex: number): Find2x2<T>;
+    /**
+     * Iterates over elements of collection, returning the first element predicate returns truthy for.
+     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to search.
+     * @param predicate The function invoked per iteration.
+     * @param fromIndex The index to search from.
+     * @return Returns the matched element, else undefined.
+     */
+    <T>(predicate: _.ValueIterateeCustom<T, boolean>, fromIndex: number, collection: _.List<T> | null | undefined): T|undefined;
+    /**
+     * Iterates over elements of collection, returning the first element predicate returns truthy for.
+     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to search.
+     * @param predicate The function invoked per iteration.
+     * @param fromIndex The index to search from.
+     * @return Returns the matched element, else undefined.
+     */
+    <T extends object, S extends T[keyof T]>(predicate: _.ValueIteratorTypeGuard<T[keyof T], S>): Find3x1<T, S>;
+    /**
+     * Iterates over elements of collection, returning the first element predicate returns truthy for.
+     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to search.
+     * @param predicate The function invoked per iteration.
+     * @param fromIndex The index to search from.
+     * @return Returns the matched element, else undefined.
+     */
+    <T extends object, S extends T[keyof T]>(predicate: _.ValueIteratorTypeGuard<T[keyof T], S>, fromIndex: number): Find3x2<T, S>;
+    /**
+     * Iterates over elements of collection, returning the first element predicate returns truthy for.
+     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to search.
+     * @param predicate The function invoked per iteration.
+     * @param fromIndex The index to search from.
+     * @return Returns the matched element, else undefined.
+     */
+    <T extends object, S extends T[keyof T]>(predicate: _.ValueIteratorTypeGuard<T[keyof T], S>, fromIndex: number, collection: T | null | undefined): S|undefined;
+    /**
+     * Iterates over elements of collection, returning the first element predicate returns truthy for.
+     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to search.
+     * @param predicate The function invoked per iteration.
+     * @param fromIndex The index to search from.
+     * @return Returns the matched element, else undefined.
+     */
+    <T extends object>(predicate: _.ValueIterateeCustom<T[keyof T], boolean>, fromIndex: number, collection: T | null | undefined): T[keyof T]|undefined;
+}
+interface Find1x1<T, S extends T> {
+    /**
+     * Iterates over elements of collection, returning the first element predicate returns truthy for.
+     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to search.
+     * @param predicate The function invoked per iteration.
+     * @param fromIndex The index to search from.
+     * @return Returns the matched element, else undefined.
+     */
+    (): Find1x1<T, S>;
+    /**
+     * Iterates over elements of collection, returning the first element predicate returns truthy for.
+     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to search.
+     * @param predicate The function invoked per iteration.
+     * @param fromIndex The index to search from.
+     * @return Returns the matched element, else undefined.
+     */
+    (fromIndex: number): Find1x2<T, S>;
+    /**
+     * Iterates over elements of collection, returning the first element predicate returns truthy for.
+     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to search.
+     * @param predicate The function invoked per iteration.
+     * @param fromIndex The index to search from.
+     * @return Returns the matched element, else undefined.
+     */
+    (fromIndex: number, collection: _.List<T> | null | undefined): S|undefined;
+}
+interface Find1x2<T, S extends T> {
+    /**
+     * Iterates over elements of collection, returning the first element predicate returns truthy for.
+     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to search.
+     * @param predicate The function invoked per iteration.
+     * @param fromIndex The index to search from.
+     * @return Returns the matched element, else undefined.
+     */
+    (): Find1x2<T, S>;
+    /**
+     * Iterates over elements of collection, returning the first element predicate returns truthy for.
+     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to search.
+     * @param predicate The function invoked per iteration.
+     * @param fromIndex The index to search from.
+     * @return Returns the matched element, else undefined.
+     */
+    (collection: _.List<T> | null | undefined): S|undefined;
+}
+interface Find2x1<T> {
+    /**
+     * Iterates over elements of collection, returning the first element predicate returns truthy for.
+     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to search.
+     * @param predicate The function invoked per iteration.
+     * @param fromIndex The index to search from.
+     * @return Returns the matched element, else undefined.
+     */
+    (): Find2x1<T>;
+    /**
+     * Iterates over elements of collection, returning the first element predicate returns truthy for.
+     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to search.
+     * @param predicate The function invoked per iteration.
+     * @param fromIndex The index to search from.
+     * @return Returns the matched element, else undefined.
+     */
+    (fromIndex: number): Find2x2<T>;
+    /**
+     * Iterates over elements of collection, returning the first element predicate returns truthy for.
+     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to search.
+     * @param predicate The function invoked per iteration.
+     * @param fromIndex The index to search from.
+     * @return Returns the matched element, else undefined.
+     */
+    (fromIndex: number, collection: _.List<T> | object | null | undefined): T|undefined;
+}
+interface Find2x2<T> {
+    /**
+     * Iterates over elements of collection, returning the first element predicate returns truthy for.
+     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to search.
+     * @param predicate The function invoked per iteration.
+     * @param fromIndex The index to search from.
+     * @return Returns the matched element, else undefined.
+     */
+    (): Find2x2<T>;
+    /**
+     * Iterates over elements of collection, returning the first element predicate returns truthy for.
+     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to search.
+     * @param predicate The function invoked per iteration.
+     * @param fromIndex The index to search from.
+     * @return Returns the matched element, else undefined.
+     */
+    (collection: _.List<T> | object | null | undefined): T|undefined;
+}
+interface Find3x1<T extends object, S extends T[keyof T]> {
+    /**
+     * Iterates over elements of collection, returning the first element predicate returns truthy for.
+     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to search.
+     * @param predicate The function invoked per iteration.
+     * @param fromIndex The index to search from.
+     * @return Returns the matched element, else undefined.
+     */
+    (): Find3x1<T, S>;
+    /**
+     * Iterates over elements of collection, returning the first element predicate returns truthy for.
+     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to search.
+     * @param predicate The function invoked per iteration.
+     * @param fromIndex The index to search from.
+     * @return Returns the matched element, else undefined.
+     */
+    (fromIndex: number): Find3x2<T, S>;
+    /**
+     * Iterates over elements of collection, returning the first element predicate returns truthy for.
+     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to search.
+     * @param predicate The function invoked per iteration.
+     * @param fromIndex The index to search from.
+     * @return Returns the matched element, else undefined.
+     */
+    (fromIndex: number, collection: T | null | undefined): S|undefined;
+}
+interface Find3x2<T extends object, S extends T[keyof T]> {
+    /**
+     * Iterates over elements of collection, returning the first element predicate returns truthy for.
+     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to search.
+     * @param predicate The function invoked per iteration.
+     * @param fromIndex The index to search from.
+     * @return Returns the matched element, else undefined.
+     */
+    (): Find3x2<T, S>;
+    /**
+     * Iterates over elements of collection, returning the first element predicate returns truthy for.
+     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to search.
+     * @param predicate The function invoked per iteration.
+     * @param fromIndex The index to search from.
+     * @return Returns the matched element, else undefined.
+     */
+    (collection: T | null | undefined): S|undefined;
+}
+
+declare const findFrom: Find;
+export = findFrom;
diff --git a/types/lodash/fp/findIndex.d.ts b/types/lodash/fp/findIndex.d.ts
new file mode 100644
index 0000000000..18842b2513
--- /dev/null
+++ b/types/lodash/fp/findIndex.d.ts
@@ -0,0 +1,108 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface FindIndex {
+    /**
+     * This method is like _.find except that it returns the index of the first element predicate returns truthy
+     * for instead of the element itself.
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @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;
+    /**
+     * This method is like _.find except that it returns the index of the first element predicate returns truthy
+     * for instead of the element itself.
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @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.
+     */
+    <T>(predicate: _.ValueIterateeCustom<T, boolean>): FindIndex1x1<T>;
+    /**
+     * This method is like _.find except that it returns the index of the first element predicate returns truthy
+     * for instead of the element itself.
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @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.
+     */
+    <T>(predicate: _.ValueIterateeCustom<T, boolean>, array: _.List<T> | null | undefined): number;
+}
+interface FindIndex1x1<T> {
+    /**
+     * This method is like _.find except that it returns the index of the first element predicate returns truthy
+     * for instead of the element itself.
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @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.
+     */
+    (): FindIndex1x1<T>;
+    /**
+     * This method is like _.find except that it returns the index of the first element predicate returns truthy
+     * for instead of the element itself.
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @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.
+     */
+    (array: _.List<T> | null | undefined): number;
+}
+
+declare const findIndex: FindIndex;
+export = findIndex;
diff --git a/types/lodash/fp/findIndexFrom.d.ts b/types/lodash/fp/findIndexFrom.d.ts
new file mode 100644
index 0000000000..fbc5f7bac1
--- /dev/null
+++ b/types/lodash/fp/findIndexFrom.d.ts
@@ -0,0 +1,186 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface FindIndex {
+    /**
+     * This method is like _.find except that it returns the index of the first element predicate returns truthy
+     * for instead of the element itself.
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @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;
+    /**
+     * This method is like _.find except that it returns the index of the first element predicate returns truthy
+     * for instead of the element itself.
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @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.
+     */
+    <T>(predicate: _.ValueIterateeCustom<T, boolean>): FindIndex1x1<T>;
+    /**
+     * This method is like _.find except that it returns the index of the first element predicate returns truthy
+     * for instead of the element itself.
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @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.
+     */
+    <T>(predicate: _.ValueIterateeCustom<T, boolean>, fromIndex: number): FindIndex1x2<T>;
+    /**
+     * This method is like _.find except that it returns the index of the first element predicate returns truthy
+     * for instead of the element itself.
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @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.
+     */
+    <T>(predicate: _.ValueIterateeCustom<T, boolean>, fromIndex: number, array: _.List<T> | null | undefined): number;
+}
+interface FindIndex1x1<T> {
+    /**
+     * This method is like _.find except that it returns the index of the first element predicate returns truthy
+     * for instead of the element itself.
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @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.
+     */
+    (): FindIndex1x1<T>;
+    /**
+     * This method is like _.find except that it returns the index of the first element predicate returns truthy
+     * for instead of the element itself.
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @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.
+     */
+    (fromIndex: number): FindIndex1x2<T>;
+    /**
+     * This method is like _.find except that it returns the index of the first element predicate returns truthy
+     * for instead of the element itself.
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @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.
+     */
+    (fromIndex: number, array: _.List<T> | null | undefined): number;
+}
+interface FindIndex1x2<T> {
+    /**
+     * This method is like _.find except that it returns the index of the first element predicate returns truthy
+     * for instead of the element itself.
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @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.
+     */
+    (): FindIndex1x2<T>;
+    /**
+     * This method is like _.find except that it returns the index of the first element predicate returns truthy
+     * for instead of the element itself.
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @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.
+     */
+    (array: _.List<T> | null | undefined): number;
+}
+
+declare const findIndexFrom: FindIndex;
+export = findIndexFrom;
diff --git a/types/lodash/fp/findKey.d.ts b/types/lodash/fp/findKey.d.ts
new file mode 100644
index 0000000000..a776272bc0
--- /dev/null
+++ b/types/lodash/fp/findKey.d.ts
@@ -0,0 +1,108 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface FindKey {
+    /**
+     * This method is like _.find except that it returns the key of the first element predicate returns truthy for
+     * instead of the element itself.
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param object The object to search.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the key of the matched element, else undefined.
+     */
+    (): FindKey;
+    /**
+     * This method is like _.find except that it returns the key of the first element predicate returns truthy for
+     * instead of the element itself.
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param object The object to search.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the key of the matched element, else undefined.
+     */
+    <T>(predicate: _.ValueIteratee<T>): FindKey1x1<T>;
+    /**
+     * This method is like _.find except that it returns the key of the first element predicate returns truthy for
+     * instead of the element itself.
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param object The object to search.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the key of the matched element, else undefined.
+     */
+    <T>(predicate: _.ValueIteratee<T[keyof T]>, object: T | null | undefined): string | undefined;
+}
+interface FindKey1x1<T> {
+    /**
+     * This method is like _.find except that it returns the key of the first element predicate returns truthy for
+     * instead of the element itself.
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param object The object to search.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the key of the matched element, else undefined.
+     */
+    (): FindKey1x1<T>;
+    /**
+     * This method is like _.find except that it returns the key of the first element predicate returns truthy for
+     * instead of the element itself.
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param object The object to search.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the key of the matched element, else undefined.
+     */
+    (object: object | null | undefined): string | undefined;
+}
+
+declare const findKey: FindKey;
+export = findKey;
diff --git a/types/lodash/fp/findLast.d.ts b/types/lodash/fp/findLast.d.ts
new file mode 100644
index 0000000000..fb8c822bdf
--- /dev/null
+++ b/types/lodash/fp/findLast.d.ts
@@ -0,0 +1,143 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface FindLast {
+    /**
+     * This method is like _.find except that it iterates over elements of a collection from
+     * right to left.
+     * @param collection Searches for a value in this list.
+     * @param predicate The function called per iteration.
+     * @param fromIndex The index to search from.
+     * @return The found element, else undefined.
+     */
+    (): FindLast;
+    /**
+     * This method is like _.find except that it iterates over elements of a collection from
+     * right to left.
+     * @param collection Searches for a value in this list.
+     * @param predicate The function called per iteration.
+     * @param fromIndex The index to search from.
+     * @return The found element, else undefined.
+     */
+    <T, S extends T>(predicate: _.ValueIteratorTypeGuard<T, S>): FindLast1x1<T, S>;
+    /**
+     * This method is like _.find except that it iterates over elements of a collection from
+     * right to left.
+     * @param collection Searches for a value in this list.
+     * @param predicate The function called per iteration.
+     * @param fromIndex The index to search from.
+     * @return The found element, else undefined.
+     */
+    <T, S extends T>(predicate: _.ValueIteratorTypeGuard<T, S>, collection: _.List<T> | null | undefined): S|undefined;
+    /**
+     * This method is like _.find except that it iterates over elements of a collection from
+     * right to left.
+     * @param collection Searches for a value in this list.
+     * @param predicate The function called per iteration.
+     * @param fromIndex The index to search from.
+     * @return The found element, else undefined.
+     */
+    <T>(predicate: _.ValueIterateeCustom<T, boolean>): FindLast2x1<T>;
+    /**
+     * This method is like _.find except that it iterates over elements of a collection from
+     * right to left.
+     * @param collection Searches for a value in this list.
+     * @param predicate The function called per iteration.
+     * @param fromIndex The index to search from.
+     * @return The found element, else undefined.
+     */
+    <T>(predicate: _.ValueIterateeCustom<T, boolean>, collection: _.List<T> | null | undefined): T|undefined;
+    /**
+     * This method is like _.find except that it iterates over elements of a collection from
+     * right to left.
+     * @param collection Searches for a value in this list.
+     * @param predicate The function called per iteration.
+     * @param fromIndex The index to search from.
+     * @return The found element, else undefined.
+     */
+    <T extends object, S extends T[keyof T]>(predicate: _.ValueIteratorTypeGuard<T[keyof T], S>): FindLast3x1<T, S>;
+    /**
+     * This method is like _.find except that it iterates over elements of a collection from
+     * right to left.
+     * @param collection Searches for a value in this list.
+     * @param predicate The function called per iteration.
+     * @param fromIndex The index to search from.
+     * @return The found element, else undefined.
+     */
+    <T extends object, S extends T[keyof T]>(predicate: _.ValueIteratorTypeGuard<T[keyof T], S>, collection: T | null | undefined): S|undefined;
+    /**
+     * This method is like _.find except that it iterates over elements of a collection from
+     * right to left.
+     * @param collection Searches for a value in this list.
+     * @param predicate The function called per iteration.
+     * @param fromIndex The index to search from.
+     * @return The found element, else undefined.
+     */
+    <T extends object>(predicate: _.ValueIterateeCustom<T[keyof T], boolean>, collection: T | null | undefined): T[keyof T]|undefined;
+}
+interface FindLast1x1<T, S extends T> {
+    /**
+     * This method is like _.find except that it iterates over elements of a collection from
+     * right to left.
+     * @param collection Searches for a value in this list.
+     * @param predicate The function called per iteration.
+     * @param fromIndex The index to search from.
+     * @return The found element, else undefined.
+     */
+    (): FindLast1x1<T, S>;
+    /**
+     * This method is like _.find except that it iterates over elements of a collection from
+     * right to left.
+     * @param collection Searches for a value in this list.
+     * @param predicate The function called per iteration.
+     * @param fromIndex The index to search from.
+     * @return The found element, else undefined.
+     */
+    (collection: _.List<T> | null | undefined): S|undefined;
+}
+interface FindLast2x1<T> {
+    /**
+     * This method is like _.find except that it iterates over elements of a collection from
+     * right to left.
+     * @param collection Searches for a value in this list.
+     * @param predicate The function called per iteration.
+     * @param fromIndex The index to search from.
+     * @return The found element, else undefined.
+     */
+    (): FindLast2x1<T>;
+    /**
+     * This method is like _.find except that it iterates over elements of a collection from
+     * right to left.
+     * @param collection Searches for a value in this list.
+     * @param predicate The function called per iteration.
+     * @param fromIndex The index to search from.
+     * @return The found element, else undefined.
+     */
+    (collection: _.List<T> | object | null | undefined): T|undefined;
+}
+interface FindLast3x1<T extends object, S extends T[keyof T]> {
+    /**
+     * This method is like _.find except that it iterates over elements of a collection from
+     * right to left.
+     * @param collection Searches for a value in this list.
+     * @param predicate The function called per iteration.
+     * @param fromIndex The index to search from.
+     * @return The found element, else undefined.
+     */
+    (): FindLast3x1<T, S>;
+    /**
+     * This method is like _.find except that it iterates over elements of a collection from
+     * right to left.
+     * @param collection Searches for a value in this list.
+     * @param predicate The function called per iteration.
+     * @param fromIndex The index to search from.
+     * @return The found element, else undefined.
+     */
+    (collection: T | null | undefined): S|undefined;
+}
+
+declare const findLast: FindLast;
+export = findLast;
diff --git a/types/lodash/fp/findLastFrom.d.ts b/types/lodash/fp/findLastFrom.d.ts
new file mode 100644
index 0000000000..bd6bed3043
--- /dev/null
+++ b/types/lodash/fp/findLastFrom.d.ts
@@ -0,0 +1,257 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface FindLast {
+    /**
+     * This method is like _.find except that it iterates over elements of a collection from
+     * right to left.
+     * @param collection Searches for a value in this list.
+     * @param predicate The function called per iteration.
+     * @param fromIndex The index to search from.
+     * @return The found element, else undefined.
+     */
+    (): FindLast;
+    /**
+     * This method is like _.find except that it iterates over elements of a collection from
+     * right to left.
+     * @param collection Searches for a value in this list.
+     * @param predicate The function called per iteration.
+     * @param fromIndex The index to search from.
+     * @return The found element, else undefined.
+     */
+    <T, S extends T>(predicate: _.ValueIteratorTypeGuard<T, S>): FindLast1x1<T, S>;
+    /**
+     * This method is like _.find except that it iterates over elements of a collection from
+     * right to left.
+     * @param collection Searches for a value in this list.
+     * @param predicate The function called per iteration.
+     * @param fromIndex The index to search from.
+     * @return The found element, else undefined.
+     */
+    <T, S extends T>(predicate: _.ValueIteratorTypeGuard<T, S>, fromIndex: number): FindLast1x2<T, S>;
+    /**
+     * This method is like _.find except that it iterates over elements of a collection from
+     * right to left.
+     * @param collection Searches for a value in this list.
+     * @param predicate The function called per iteration.
+     * @param fromIndex The index to search from.
+     * @return The found element, else undefined.
+     */
+    <T, S extends T>(predicate: _.ValueIteratorTypeGuard<T, S>, fromIndex: number, collection: _.List<T> | null | undefined): S|undefined;
+    /**
+     * This method is like _.find except that it iterates over elements of a collection from
+     * right to left.
+     * @param collection Searches for a value in this list.
+     * @param predicate The function called per iteration.
+     * @param fromIndex The index to search from.
+     * @return The found element, else undefined.
+     */
+    <T>(predicate: _.ValueIterateeCustom<T, boolean>): FindLast2x1<T>;
+    /**
+     * This method is like _.find except that it iterates over elements of a collection from
+     * right to left.
+     * @param collection Searches for a value in this list.
+     * @param predicate The function called per iteration.
+     * @param fromIndex The index to search from.
+     * @return The found element, else undefined.
+     */
+    <T>(predicate: _.ValueIterateeCustom<T, boolean>, fromIndex: number): FindLast2x2<T>;
+    /**
+     * This method is like _.find except that it iterates over elements of a collection from
+     * right to left.
+     * @param collection Searches for a value in this list.
+     * @param predicate The function called per iteration.
+     * @param fromIndex The index to search from.
+     * @return The found element, else undefined.
+     */
+    <T>(predicate: _.ValueIterateeCustom<T, boolean>, fromIndex: number, collection: _.List<T> | null | undefined): T|undefined;
+    /**
+     * This method is like _.find except that it iterates over elements of a collection from
+     * right to left.
+     * @param collection Searches for a value in this list.
+     * @param predicate The function called per iteration.
+     * @param fromIndex The index to search from.
+     * @return The found element, else undefined.
+     */
+    <T extends object, S extends T[keyof T]>(predicate: _.ValueIteratorTypeGuard<T[keyof T], S>): FindLast3x1<T, S>;
+    /**
+     * This method is like _.find except that it iterates over elements of a collection from
+     * right to left.
+     * @param collection Searches for a value in this list.
+     * @param predicate The function called per iteration.
+     * @param fromIndex The index to search from.
+     * @return The found element, else undefined.
+     */
+    <T extends object, S extends T[keyof T]>(predicate: _.ValueIteratorTypeGuard<T[keyof T], S>, fromIndex: number): FindLast3x2<T, S>;
+    /**
+     * This method is like _.find except that it iterates over elements of a collection from
+     * right to left.
+     * @param collection Searches for a value in this list.
+     * @param predicate The function called per iteration.
+     * @param fromIndex The index to search from.
+     * @return The found element, else undefined.
+     */
+    <T extends object, S extends T[keyof T]>(predicate: _.ValueIteratorTypeGuard<T[keyof T], S>, fromIndex: number, collection: T | null | undefined): S|undefined;
+    /**
+     * This method is like _.find except that it iterates over elements of a collection from
+     * right to left.
+     * @param collection Searches for a value in this list.
+     * @param predicate The function called per iteration.
+     * @param fromIndex The index to search from.
+     * @return The found element, else undefined.
+     */
+    <T extends object>(predicate: _.ValueIterateeCustom<T[keyof T], boolean>, fromIndex: number, collection: T | null | undefined): T[keyof T]|undefined;
+}
+interface FindLast1x1<T, S extends T> {
+    /**
+     * This method is like _.find except that it iterates over elements of a collection from
+     * right to left.
+     * @param collection Searches for a value in this list.
+     * @param predicate The function called per iteration.
+     * @param fromIndex The index to search from.
+     * @return The found element, else undefined.
+     */
+    (): FindLast1x1<T, S>;
+    /**
+     * This method is like _.find except that it iterates over elements of a collection from
+     * right to left.
+     * @param collection Searches for a value in this list.
+     * @param predicate The function called per iteration.
+     * @param fromIndex The index to search from.
+     * @return The found element, else undefined.
+     */
+    (fromIndex: number): FindLast1x2<T, S>;
+    /**
+     * This method is like _.find except that it iterates over elements of a collection from
+     * right to left.
+     * @param collection Searches for a value in this list.
+     * @param predicate The function called per iteration.
+     * @param fromIndex The index to search from.
+     * @return The found element, else undefined.
+     */
+    (fromIndex: number, collection: _.List<T> | null | undefined): S|undefined;
+}
+interface FindLast1x2<T, S extends T> {
+    /**
+     * This method is like _.find except that it iterates over elements of a collection from
+     * right to left.
+     * @param collection Searches for a value in this list.
+     * @param predicate The function called per iteration.
+     * @param fromIndex The index to search from.
+     * @return The found element, else undefined.
+     */
+    (): FindLast1x2<T, S>;
+    /**
+     * This method is like _.find except that it iterates over elements of a collection from
+     * right to left.
+     * @param collection Searches for a value in this list.
+     * @param predicate The function called per iteration.
+     * @param fromIndex The index to search from.
+     * @return The found element, else undefined.
+     */
+    (collection: _.List<T> | null | undefined): S|undefined;
+}
+interface FindLast2x1<T> {
+    /**
+     * This method is like _.find except that it iterates over elements of a collection from
+     * right to left.
+     * @param collection Searches for a value in this list.
+     * @param predicate The function called per iteration.
+     * @param fromIndex The index to search from.
+     * @return The found element, else undefined.
+     */
+    (): FindLast2x1<T>;
+    /**
+     * This method is like _.find except that it iterates over elements of a collection from
+     * right to left.
+     * @param collection Searches for a value in this list.
+     * @param predicate The function called per iteration.
+     * @param fromIndex The index to search from.
+     * @return The found element, else undefined.
+     */
+    (fromIndex: number): FindLast2x2<T>;
+    /**
+     * This method is like _.find except that it iterates over elements of a collection from
+     * right to left.
+     * @param collection Searches for a value in this list.
+     * @param predicate The function called per iteration.
+     * @param fromIndex The index to search from.
+     * @return The found element, else undefined.
+     */
+    (fromIndex: number, collection: _.List<T> | object | null | undefined): T|undefined;
+}
+interface FindLast2x2<T> {
+    /**
+     * This method is like _.find except that it iterates over elements of a collection from
+     * right to left.
+     * @param collection Searches for a value in this list.
+     * @param predicate The function called per iteration.
+     * @param fromIndex The index to search from.
+     * @return The found element, else undefined.
+     */
+    (): FindLast2x2<T>;
+    /**
+     * This method is like _.find except that it iterates over elements of a collection from
+     * right to left.
+     * @param collection Searches for a value in this list.
+     * @param predicate The function called per iteration.
+     * @param fromIndex The index to search from.
+     * @return The found element, else undefined.
+     */
+    (collection: _.List<T> | object | null | undefined): T|undefined;
+}
+interface FindLast3x1<T extends object, S extends T[keyof T]> {
+    /**
+     * This method is like _.find except that it iterates over elements of a collection from
+     * right to left.
+     * @param collection Searches for a value in this list.
+     * @param predicate The function called per iteration.
+     * @param fromIndex The index to search from.
+     * @return The found element, else undefined.
+     */
+    (): FindLast3x1<T, S>;
+    /**
+     * This method is like _.find except that it iterates over elements of a collection from
+     * right to left.
+     * @param collection Searches for a value in this list.
+     * @param predicate The function called per iteration.
+     * @param fromIndex The index to search from.
+     * @return The found element, else undefined.
+     */
+    (fromIndex: number): FindLast3x2<T, S>;
+    /**
+     * This method is like _.find except that it iterates over elements of a collection from
+     * right to left.
+     * @param collection Searches for a value in this list.
+     * @param predicate The function called per iteration.
+     * @param fromIndex The index to search from.
+     * @return The found element, else undefined.
+     */
+    (fromIndex: number, collection: T | null | undefined): S|undefined;
+}
+interface FindLast3x2<T extends object, S extends T[keyof T]> {
+    /**
+     * This method is like _.find except that it iterates over elements of a collection from
+     * right to left.
+     * @param collection Searches for a value in this list.
+     * @param predicate The function called per iteration.
+     * @param fromIndex The index to search from.
+     * @return The found element, else undefined.
+     */
+    (): FindLast3x2<T, S>;
+    /**
+     * This method is like _.find except that it iterates over elements of a collection from
+     * right to left.
+     * @param collection Searches for a value in this list.
+     * @param predicate The function called per iteration.
+     * @param fromIndex The index to search from.
+     * @return The found element, else undefined.
+     */
+    (collection: T | null | undefined): S|undefined;
+}
+
+declare const findLastFrom: FindLast;
+export = findLastFrom;
diff --git a/types/lodash/fp/findLastIndex.d.ts b/types/lodash/fp/findLastIndex.d.ts
new file mode 100644
index 0000000000..230736f814
--- /dev/null
+++ b/types/lodash/fp/findLastIndex.d.ts
@@ -0,0 +1,103 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface FindLastIndex {
+    /**
+     * This method is like _.findIndex except that it iterates over elements of collection from right to left.
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @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;
+    /**
+     * This method is like _.findIndex except that it iterates over elements of collection from right to left.
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @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.
+     */
+    <T>(predicate: _.ValueIterateeCustom<T, boolean>): FindLastIndex1x1<T>;
+    /**
+     * This method is like _.findIndex except that it iterates over elements of collection from right to left.
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @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.
+     */
+    <T>(predicate: _.ValueIterateeCustom<T, boolean>, array: _.List<T> | null | undefined): number;
+}
+interface FindLastIndex1x1<T> {
+    /**
+     * This method is like _.findIndex except that it iterates over elements of collection from right to left.
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @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.
+     */
+    (): FindLastIndex1x1<T>;
+    /**
+     * This method is like _.findIndex except that it iterates over elements of collection from right to left.
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @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.
+     */
+    (array: _.List<T> | null | undefined): number;
+}
+
+declare const findLastIndex: FindLastIndex;
+export = findLastIndex;
diff --git a/types/lodash/fp/findLastIndexFrom.d.ts b/types/lodash/fp/findLastIndexFrom.d.ts
new file mode 100644
index 0000000000..df28dc685e
--- /dev/null
+++ b/types/lodash/fp/findLastIndexFrom.d.ts
@@ -0,0 +1,177 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface FindLastIndex {
+    /**
+     * This method is like _.findIndex except that it iterates over elements of collection from right to left.
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @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;
+    /**
+     * This method is like _.findIndex except that it iterates over elements of collection from right to left.
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @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.
+     */
+    <T>(predicate: _.ValueIterateeCustom<T, boolean>): FindLastIndex1x1<T>;
+    /**
+     * This method is like _.findIndex except that it iterates over elements of collection from right to left.
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @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.
+     */
+    <T>(predicate: _.ValueIterateeCustom<T, boolean>, fromIndex: number): FindLastIndex1x2<T>;
+    /**
+     * This method is like _.findIndex except that it iterates over elements of collection from right to left.
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @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.
+     */
+    <T>(predicate: _.ValueIterateeCustom<T, boolean>, fromIndex: number, array: _.List<T> | null | undefined): number;
+}
+interface FindLastIndex1x1<T> {
+    /**
+     * This method is like _.findIndex except that it iterates over elements of collection from right to left.
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @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.
+     */
+    (): FindLastIndex1x1<T>;
+    /**
+     * This method is like _.findIndex except that it iterates over elements of collection from right to left.
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @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.
+     */
+    (fromIndex: number): FindLastIndex1x2<T>;
+    /**
+     * This method is like _.findIndex except that it iterates over elements of collection from right to left.
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @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.
+     */
+    (fromIndex: number, array: _.List<T> | null | undefined): number;
+}
+interface FindLastIndex1x2<T> {
+    /**
+     * This method is like _.findIndex except that it iterates over elements of collection from right to left.
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @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.
+     */
+    (): FindLastIndex1x2<T>;
+    /**
+     * This method is like _.findIndex except that it iterates over elements of collection from right to left.
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @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.
+     */
+    (array: _.List<T> | null | undefined): number;
+}
+
+declare const findLastIndexFrom: FindLastIndex;
+export = findLastIndexFrom;
diff --git a/types/lodash/fp/findLastKey.d.ts b/types/lodash/fp/findLastKey.d.ts
new file mode 100644
index 0000000000..51e8d52ce1
--- /dev/null
+++ b/types/lodash/fp/findLastKey.d.ts
@@ -0,0 +1,103 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface FindLastKey {
+    /**
+     * This method is like _.findKey except that it iterates over elements of a collection in the opposite order.
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param object The object to search.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the key of the matched element, else undefined.
+     */
+    (): FindLastKey;
+    /**
+     * This method is like _.findKey except that it iterates over elements of a collection in the opposite order.
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param object The object to search.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the key of the matched element, else undefined.
+     */
+    <T>(predicate: _.ValueIteratee<T>): FindLastKey1x1<T>;
+    /**
+     * This method is like _.findKey except that it iterates over elements of a collection in the opposite order.
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param object The object to search.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the key of the matched element, else undefined.
+     */
+    <T>(predicate: _.ValueIteratee<T[keyof T]>, object: T | null | undefined): string | undefined;
+}
+interface FindLastKey1x1<T> {
+    /**
+     * This method is like _.findKey except that it iterates over elements of a collection in the opposite order.
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param object The object to search.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the key of the matched element, else undefined.
+     */
+    (): FindLastKey1x1<T>;
+    /**
+     * This method is like _.findKey except that it iterates over elements of a collection in the opposite order.
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param object The object to search.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the key of the matched element, else undefined.
+     */
+    (object: object | null | undefined): string | undefined;
+}
+
+declare const findLastKey: FindLastKey;
+export = findLastKey;
diff --git a/types/lodash/fp/first.d.ts b/types/lodash/fp/first.d.ts
new file mode 100644
index 0000000000..e93bdf4e4e
--- /dev/null
+++ b/types/lodash/fp/first.d.ts
@@ -0,0 +1,19 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+type Head =
+    /**
+     * Gets the first element of array.
+     *
+     * @alias _.first
+     *
+     * @param array The array to query.
+     * @return Returns the first element of array.
+     */
+    <T>(array: _.List<T> | null | undefined) => T | undefined;
+
+declare const first: Head;
+export = first;
diff --git a/types/lodash/fp/flatMap.d.ts b/types/lodash/fp/flatMap.d.ts
new file mode 100644
index 0000000000..a6713fe34d
--- /dev/null
+++ b/types/lodash/fp/flatMap.d.ts
@@ -0,0 +1,189 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface FlatMap {
+    /**
+     * Creates an array of flattened values by running each element in collection through iteratee
+     * and concating its result to the other mapped values. The iteratee is invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @return Returns the new flattened array.
+     */
+    (): FlatMap;
+    /**
+     * Creates an array of flattened values by running each element in collection through iteratee
+     * and concating its result to the other mapped values. The iteratee is invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @return Returns the new flattened array.
+     */
+    <T, TResult>(iteratee: (value: T) => _.Many<TResult>): FlatMap1x1<T, TResult>;
+    /**
+     * Creates an array of flattened values by running each element in collection through iteratee
+     * and concating its result to the other mapped values. The iteratee is invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @return Returns the new flattened array.
+     */
+    <T, TResult>(iteratee: (value: T) => _.Many<TResult>, collection: _.List<T> | null | undefined): TResult[];
+    /**
+     * Creates an array of flattened values by running each element in collection through iteratee
+     * and concating its result to the other mapped values. The iteratee is invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @return Returns the new flattened array.
+     */
+    <T extends object, TResult>(iteratee: (value: T[keyof T]) => _.Many<TResult>): FlatMap2x1<T, TResult>;
+    /**
+     * Creates an array of flattened values by running each element in collection through iteratee
+     * and concating its result to the other mapped values. The iteratee is invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @return Returns the new flattened array.
+     */
+    <T extends object, TResult>(iteratee: (value: T[keyof T]) => _.Many<TResult>, collection: T | null | undefined): TResult[];
+    /**
+     * Creates an array of flattened values by running each element in collection through iteratee
+     * and concating its result to the other mapped values. The iteratee is invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @return Returns the new flattened array.
+     */
+    (iteratee: string): FlatMap3x1;
+    /**
+     * Creates an array of flattened values by running each element in collection through iteratee
+     * and concating its result to the other mapped values. The iteratee is invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @return Returns the new flattened array.
+     */
+    (iteratee: string, collection: object | null | undefined): any[];
+    /**
+     * Creates an array of flattened values by running each element in collection through iteratee
+     * and concating its result to the other mapped values. The iteratee is invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @return Returns the new flattened array.
+     */
+    (iteratee: object): FlatMap4x1;
+    /**
+     * Creates an array of flattened values by running each element in collection through iteratee
+     * and concating its result to the other mapped values. The iteratee is invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @return Returns the new flattened array.
+     */
+    (iteratee: object, collection: object | null | undefined): boolean[];
+}
+interface FlatMap1x1<T, TResult> {
+    /**
+     * Creates an array of flattened values by running each element in collection through iteratee
+     * and concating its result to the other mapped values. The iteratee is invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @return Returns the new flattened array.
+     */
+    (): FlatMap1x1<T, TResult>;
+    /**
+     * Creates an array of flattened values by running each element in collection through iteratee
+     * and concating its result to the other mapped values. The iteratee is invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @return Returns the new flattened array.
+     */
+    (collection: _.List<T> | null | undefined): TResult[];
+}
+interface FlatMap2x1<T extends object, TResult> {
+    /**
+     * Creates an array of flattened values by running each element in collection through iteratee
+     * and concating its result to the other mapped values. The iteratee is invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @return Returns the new flattened array.
+     */
+    (): FlatMap2x1<T, TResult>;
+    /**
+     * Creates an array of flattened values by running each element in collection through iteratee
+     * and concating its result to the other mapped values. The iteratee is invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @return Returns the new flattened array.
+     */
+    (collection: T | null | undefined): TResult[];
+}
+interface FlatMap3x1 {
+    /**
+     * Creates an array of flattened values by running each element in collection through iteratee
+     * and concating its result to the other mapped values. The iteratee is invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @return Returns the new flattened array.
+     */
+    (): FlatMap3x1;
+    /**
+     * Creates an array of flattened values by running each element in collection through iteratee
+     * and concating its result to the other mapped values. The iteratee is invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @return Returns the new flattened array.
+     */
+    (collection: object | null | undefined): any[];
+}
+interface FlatMap4x1 {
+    /**
+     * Creates an array of flattened values by running each element in collection through iteratee
+     * and concating its result to the other mapped values. The iteratee is invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @return Returns the new flattened array.
+     */
+    (): FlatMap4x1;
+    /**
+     * Creates an array of flattened values by running each element in collection through iteratee
+     * and concating its result to the other mapped values. The iteratee is invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @return Returns the new flattened array.
+     */
+    (collection: object | null | undefined): boolean[];
+}
+
+declare const flatMap: FlatMap;
+export = flatMap;
diff --git a/types/lodash/fp/flatMapDeep.d.ts b/types/lodash/fp/flatMapDeep.d.ts
new file mode 100644
index 0000000000..9dad165793
--- /dev/null
+++ b/types/lodash/fp/flatMapDeep.d.ts
@@ -0,0 +1,342 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface FlatMapDeep {
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results.
+     *
+     * @since 4.7.0
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratee=_.identity] The function invoked per iteration.
+     * @returns Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDeep([1, 2], duplicate);
+     * // => [1, 1, 2, 2]
+     */
+    (): FlatMapDeep;
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results.
+     *
+     * @since 4.7.0
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratee=_.identity] The function invoked per iteration.
+     * @returns Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDeep([1, 2], duplicate);
+     * // => [1, 1, 2, 2]
+     */
+    <T, TResult>(iteratee: (value: T) => _.ListOfRecursiveArraysOrValues<TResult> | TResult): FlatMapDeep1x1<T, TResult>;
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results.
+     *
+     * @since 4.7.0
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratee=_.identity] The function invoked per iteration.
+     * @returns Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDeep([1, 2], duplicate);
+     * // => [1, 1, 2, 2]
+     */
+    <T, TResult>(iteratee: (value: T) => _.ListOfRecursiveArraysOrValues<TResult> | TResult, collection: _.List<T> | null | undefined): TResult[];
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results.
+     *
+     * @since 4.7.0
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratee=_.identity] The function invoked per iteration.
+     * @returns Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDeep([1, 2], duplicate);
+     * // => [1, 1, 2, 2]
+     */
+    <T extends object, TResult>(iteratee: (value: T[keyof T]) => _.ListOfRecursiveArraysOrValues<TResult> | TResult): FlatMapDeep2x1<T, TResult>;
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results.
+     *
+     * @since 4.7.0
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratee=_.identity] The function invoked per iteration.
+     * @returns Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDeep([1, 2], duplicate);
+     * // => [1, 1, 2, 2]
+     */
+    <T extends object, TResult>(iteratee: (value: T[keyof T]) => _.ListOfRecursiveArraysOrValues<TResult> | TResult, collection: T | null | undefined): TResult[];
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results.
+     *
+     * @since 4.7.0
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratee=_.identity] The function invoked per iteration.
+     * @returns Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDeep([1, 2], duplicate);
+     * // => [1, 1, 2, 2]
+     */
+    (iteratee: string): FlatMapDeep3x1;
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results.
+     *
+     * @since 4.7.0
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratee=_.identity] The function invoked per iteration.
+     * @returns Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDeep([1, 2], duplicate);
+     * // => [1, 1, 2, 2]
+     */
+    (iteratee: string, collection: object | null | undefined): any[];
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results.
+     *
+     * @since 4.7.0
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratee=_.identity] The function invoked per iteration.
+     * @returns Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDeep([1, 2], duplicate);
+     * // => [1, 1, 2, 2]
+     */
+    (iteratee: object): FlatMapDeep4x1;
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results.
+     *
+     * @since 4.7.0
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratee=_.identity] The function invoked per iteration.
+     * @returns Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDeep([1, 2], duplicate);
+     * // => [1, 1, 2, 2]
+     */
+    (iteratee: object, collection: object | null | undefined): boolean[];
+}
+interface FlatMapDeep1x1<T, TResult> {
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results.
+     *
+     * @since 4.7.0
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratee=_.identity] The function invoked per iteration.
+     * @returns Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDeep([1, 2], duplicate);
+     * // => [1, 1, 2, 2]
+     */
+    (): FlatMapDeep1x1<T, TResult>;
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results.
+     *
+     * @since 4.7.0
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratee=_.identity] The function invoked per iteration.
+     * @returns Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDeep([1, 2], duplicate);
+     * // => [1, 1, 2, 2]
+     */
+    (collection: _.List<T> | null | undefined): TResult[];
+}
+interface FlatMapDeep2x1<T extends object, TResult> {
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results.
+     *
+     * @since 4.7.0
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratee=_.identity] The function invoked per iteration.
+     * @returns Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDeep([1, 2], duplicate);
+     * // => [1, 1, 2, 2]
+     */
+    (): FlatMapDeep2x1<T, TResult>;
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results.
+     *
+     * @since 4.7.0
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratee=_.identity] The function invoked per iteration.
+     * @returns Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDeep([1, 2], duplicate);
+     * // => [1, 1, 2, 2]
+     */
+    (collection: T | null | undefined): TResult[];
+}
+interface FlatMapDeep3x1 {
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results.
+     *
+     * @since 4.7.0
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratee=_.identity] The function invoked per iteration.
+     * @returns Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDeep([1, 2], duplicate);
+     * // => [1, 1, 2, 2]
+     */
+    (): FlatMapDeep3x1;
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results.
+     *
+     * @since 4.7.0
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratee=_.identity] The function invoked per iteration.
+     * @returns Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDeep([1, 2], duplicate);
+     * // => [1, 1, 2, 2]
+     */
+    (collection: object | null | undefined): any[];
+}
+interface FlatMapDeep4x1 {
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results.
+     *
+     * @since 4.7.0
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratee=_.identity] The function invoked per iteration.
+     * @returns Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDeep([1, 2], duplicate);
+     * // => [1, 1, 2, 2]
+     */
+    (): FlatMapDeep4x1;
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results.
+     *
+     * @since 4.7.0
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratee=_.identity] The function invoked per iteration.
+     * @returns Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDeep([1, 2], duplicate);
+     * // => [1, 1, 2, 2]
+     */
+    (collection: object | null | undefined): boolean[];
+}
+
+declare const flatMapDeep: FlatMapDeep;
+export = flatMapDeep;
diff --git a/types/lodash/fp/flatMapDepth.d.ts b/types/lodash/fp/flatMapDepth.d.ts
new file mode 100644
index 0000000000..d576c2a322
--- /dev/null
+++ b/types/lodash/fp/flatMapDepth.d.ts
@@ -0,0 +1,687 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface FlatMapDepth {
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results up to `depth` times.
+     *
+     * @since 4.7.0
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratee=_.identity] The function invoked per iteration.
+     * @param [depth=1] The maximum recursion depth.
+     * @returns Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDepth([1, 2], duplicate, 2);
+     * // => [[1, 1], [2, 2]]
+     */
+    (): FlatMapDepth;
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results up to `depth` times.
+     *
+     * @since 4.7.0
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratee=_.identity] The function invoked per iteration.
+     * @param [depth=1] The maximum recursion depth.
+     * @returns Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDepth([1, 2], duplicate, 2);
+     * // => [[1, 1], [2, 2]]
+     */
+    <T, TResult>(iteratee: (value: T) => _.ListOfRecursiveArraysOrValues<TResult> | TResult): FlatMapDepth1x1<T, TResult>;
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results up to `depth` times.
+     *
+     * @since 4.7.0
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratee=_.identity] The function invoked per iteration.
+     * @param [depth=1] The maximum recursion depth.
+     * @returns Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDepth([1, 2], duplicate, 2);
+     * // => [[1, 1], [2, 2]]
+     */
+    <T, TResult>(iteratee: (value: T) => _.ListOfRecursiveArraysOrValues<TResult> | TResult, depth: number): FlatMapDepth1x2<T, TResult>;
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results up to `depth` times.
+     *
+     * @since 4.7.0
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratee=_.identity] The function invoked per iteration.
+     * @param [depth=1] The maximum recursion depth.
+     * @returns Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDepth([1, 2], duplicate, 2);
+     * // => [[1, 1], [2, 2]]
+     */
+    <T, TResult>(iteratee: (value: T) => _.ListOfRecursiveArraysOrValues<TResult> | TResult, depth: number, collection: _.List<T> | null | undefined): TResult[];
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results up to `depth` times.
+     *
+     * @since 4.7.0
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratee=_.identity] The function invoked per iteration.
+     * @param [depth=1] The maximum recursion depth.
+     * @returns Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDepth([1, 2], duplicate, 2);
+     * // => [[1, 1], [2, 2]]
+     */
+    <T extends object, TResult>(iteratee: (value: T[keyof T]) => _.ListOfRecursiveArraysOrValues<TResult> | TResult): FlatMapDepth2x1<T, TResult>;
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results up to `depth` times.
+     *
+     * @since 4.7.0
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratee=_.identity] The function invoked per iteration.
+     * @param [depth=1] The maximum recursion depth.
+     * @returns Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDepth([1, 2], duplicate, 2);
+     * // => [[1, 1], [2, 2]]
+     */
+    <T extends object, TResult>(iteratee: (value: T[keyof T]) => _.ListOfRecursiveArraysOrValues<TResult> | TResult, depth: number): FlatMapDepth2x2<T, TResult>;
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results up to `depth` times.
+     *
+     * @since 4.7.0
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratee=_.identity] The function invoked per iteration.
+     * @param [depth=1] The maximum recursion depth.
+     * @returns Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDepth([1, 2], duplicate, 2);
+     * // => [[1, 1], [2, 2]]
+     */
+    <T extends object, TResult>(iteratee: (value: T[keyof T]) => _.ListOfRecursiveArraysOrValues<TResult> | TResult, depth: number, collection: T | null | undefined): TResult[];
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results up to `depth` times.
+     *
+     * @since 4.7.0
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratee=_.identity] The function invoked per iteration.
+     * @param [depth=1] The maximum recursion depth.
+     * @returns Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDepth([1, 2], duplicate, 2);
+     * // => [[1, 1], [2, 2]]
+     */
+    (iteratee: string): FlatMapDepth3x1;
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results up to `depth` times.
+     *
+     * @since 4.7.0
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratee=_.identity] The function invoked per iteration.
+     * @param [depth=1] The maximum recursion depth.
+     * @returns Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDepth([1, 2], duplicate, 2);
+     * // => [[1, 1], [2, 2]]
+     */
+    (iteratee: string, depth: number): FlatMapDepth3x2;
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results up to `depth` times.
+     *
+     * @since 4.7.0
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratee=_.identity] The function invoked per iteration.
+     * @param [depth=1] The maximum recursion depth.
+     * @returns Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDepth([1, 2], duplicate, 2);
+     * // => [[1, 1], [2, 2]]
+     */
+    (iteratee: string, depth: number, collection: object | null | undefined): any[];
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results up to `depth` times.
+     *
+     * @since 4.7.0
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratee=_.identity] The function invoked per iteration.
+     * @param [depth=1] The maximum recursion depth.
+     * @returns Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDepth([1, 2], duplicate, 2);
+     * // => [[1, 1], [2, 2]]
+     */
+    (iteratee: object): FlatMapDepth4x1;
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results up to `depth` times.
+     *
+     * @since 4.7.0
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratee=_.identity] The function invoked per iteration.
+     * @param [depth=1] The maximum recursion depth.
+     * @returns Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDepth([1, 2], duplicate, 2);
+     * // => [[1, 1], [2, 2]]
+     */
+    (iteratee: object, depth: number): FlatMapDepth4x2;
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results up to `depth` times.
+     *
+     * @since 4.7.0
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratee=_.identity] The function invoked per iteration.
+     * @param [depth=1] The maximum recursion depth.
+     * @returns Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDepth([1, 2], duplicate, 2);
+     * // => [[1, 1], [2, 2]]
+     */
+    (iteratee: object, depth: number, collection: object | null | undefined): boolean[];
+}
+interface FlatMapDepth1x1<T, TResult> {
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results up to `depth` times.
+     *
+     * @since 4.7.0
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratee=_.identity] The function invoked per iteration.
+     * @param [depth=1] The maximum recursion depth.
+     * @returns Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDepth([1, 2], duplicate, 2);
+     * // => [[1, 1], [2, 2]]
+     */
+    (): FlatMapDepth1x1<T, TResult>;
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results up to `depth` times.
+     *
+     * @since 4.7.0
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratee=_.identity] The function invoked per iteration.
+     * @param [depth=1] The maximum recursion depth.
+     * @returns Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDepth([1, 2], duplicate, 2);
+     * // => [[1, 1], [2, 2]]
+     */
+    (depth: number): FlatMapDepth1x2<T, TResult>;
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results up to `depth` times.
+     *
+     * @since 4.7.0
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratee=_.identity] The function invoked per iteration.
+     * @param [depth=1] The maximum recursion depth.
+     * @returns Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDepth([1, 2], duplicate, 2);
+     * // => [[1, 1], [2, 2]]
+     */
+    (depth: number, collection: _.List<T> | null | undefined): TResult[];
+}
+interface FlatMapDepth1x2<T, TResult> {
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results up to `depth` times.
+     *
+     * @since 4.7.0
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratee=_.identity] The function invoked per iteration.
+     * @param [depth=1] The maximum recursion depth.
+     * @returns Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDepth([1, 2], duplicate, 2);
+     * // => [[1, 1], [2, 2]]
+     */
+    (): FlatMapDepth1x2<T, TResult>;
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results up to `depth` times.
+     *
+     * @since 4.7.0
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratee=_.identity] The function invoked per iteration.
+     * @param [depth=1] The maximum recursion depth.
+     * @returns Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDepth([1, 2], duplicate, 2);
+     * // => [[1, 1], [2, 2]]
+     */
+    (collection: _.List<T> | null | undefined): TResult[];
+}
+interface FlatMapDepth2x1<T extends object, TResult> {
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results up to `depth` times.
+     *
+     * @since 4.7.0
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratee=_.identity] The function invoked per iteration.
+     * @param [depth=1] The maximum recursion depth.
+     * @returns Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDepth([1, 2], duplicate, 2);
+     * // => [[1, 1], [2, 2]]
+     */
+    (): FlatMapDepth2x1<T, TResult>;
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results up to `depth` times.
+     *
+     * @since 4.7.0
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratee=_.identity] The function invoked per iteration.
+     * @param [depth=1] The maximum recursion depth.
+     * @returns Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDepth([1, 2], duplicate, 2);
+     * // => [[1, 1], [2, 2]]
+     */
+    (depth: number): FlatMapDepth2x2<T, TResult>;
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results up to `depth` times.
+     *
+     * @since 4.7.0
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratee=_.identity] The function invoked per iteration.
+     * @param [depth=1] The maximum recursion depth.
+     * @returns Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDepth([1, 2], duplicate, 2);
+     * // => [[1, 1], [2, 2]]
+     */
+    (depth: number, collection: T | null | undefined): TResult[];
+}
+interface FlatMapDepth2x2<T extends object, TResult> {
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results up to `depth` times.
+     *
+     * @since 4.7.0
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratee=_.identity] The function invoked per iteration.
+     * @param [depth=1] The maximum recursion depth.
+     * @returns Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDepth([1, 2], duplicate, 2);
+     * // => [[1, 1], [2, 2]]
+     */
+    (): FlatMapDepth2x2<T, TResult>;
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results up to `depth` times.
+     *
+     * @since 4.7.0
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratee=_.identity] The function invoked per iteration.
+     * @param [depth=1] The maximum recursion depth.
+     * @returns Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDepth([1, 2], duplicate, 2);
+     * // => [[1, 1], [2, 2]]
+     */
+    (collection: T | null | undefined): TResult[];
+}
+interface FlatMapDepth3x1 {
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results up to `depth` times.
+     *
+     * @since 4.7.0
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratee=_.identity] The function invoked per iteration.
+     * @param [depth=1] The maximum recursion depth.
+     * @returns Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDepth([1, 2], duplicate, 2);
+     * // => [[1, 1], [2, 2]]
+     */
+    (): FlatMapDepth3x1;
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results up to `depth` times.
+     *
+     * @since 4.7.0
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratee=_.identity] The function invoked per iteration.
+     * @param [depth=1] The maximum recursion depth.
+     * @returns Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDepth([1, 2], duplicate, 2);
+     * // => [[1, 1], [2, 2]]
+     */
+    (depth: number): FlatMapDepth3x2;
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results up to `depth` times.
+     *
+     * @since 4.7.0
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratee=_.identity] The function invoked per iteration.
+     * @param [depth=1] The maximum recursion depth.
+     * @returns Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDepth([1, 2], duplicate, 2);
+     * // => [[1, 1], [2, 2]]
+     */
+    (depth: number, collection: object | null | undefined): any[];
+}
+interface FlatMapDepth3x2 {
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results up to `depth` times.
+     *
+     * @since 4.7.0
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratee=_.identity] The function invoked per iteration.
+     * @param [depth=1] The maximum recursion depth.
+     * @returns Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDepth([1, 2], duplicate, 2);
+     * // => [[1, 1], [2, 2]]
+     */
+    (): FlatMapDepth3x2;
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results up to `depth` times.
+     *
+     * @since 4.7.0
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratee=_.identity] The function invoked per iteration.
+     * @param [depth=1] The maximum recursion depth.
+     * @returns Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDepth([1, 2], duplicate, 2);
+     * // => [[1, 1], [2, 2]]
+     */
+    (collection: object | null | undefined): any[];
+}
+interface FlatMapDepth4x1 {
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results up to `depth` times.
+     *
+     * @since 4.7.0
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratee=_.identity] The function invoked per iteration.
+     * @param [depth=1] The maximum recursion depth.
+     * @returns Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDepth([1, 2], duplicate, 2);
+     * // => [[1, 1], [2, 2]]
+     */
+    (): FlatMapDepth4x1;
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results up to `depth` times.
+     *
+     * @since 4.7.0
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratee=_.identity] The function invoked per iteration.
+     * @param [depth=1] The maximum recursion depth.
+     * @returns Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDepth([1, 2], duplicate, 2);
+     * // => [[1, 1], [2, 2]]
+     */
+    (depth: number): FlatMapDepth4x2;
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results up to `depth` times.
+     *
+     * @since 4.7.0
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratee=_.identity] The function invoked per iteration.
+     * @param [depth=1] The maximum recursion depth.
+     * @returns Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDepth([1, 2], duplicate, 2);
+     * // => [[1, 1], [2, 2]]
+     */
+    (depth: number, collection: object | null | undefined): boolean[];
+}
+interface FlatMapDepth4x2 {
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results up to `depth` times.
+     *
+     * @since 4.7.0
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratee=_.identity] The function invoked per iteration.
+     * @param [depth=1] The maximum recursion depth.
+     * @returns Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDepth([1, 2], duplicate, 2);
+     * // => [[1, 1], [2, 2]]
+     */
+    (): FlatMapDepth4x2;
+    /**
+     * This method is like `_.flatMap` except that it recursively flattens the
+     * mapped results up to `depth` times.
+     *
+     * @since 4.7.0
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratee=_.identity] The function invoked per iteration.
+     * @param [depth=1] The maximum recursion depth.
+     * @returns Returns the new flattened array.
+     * @example
+     *
+     * function duplicate(n) {
+     *   return [[[n, n]]];
+     * }
+     *
+     * _.flatMapDepth([1, 2], duplicate, 2);
+     * // => [[1, 1], [2, 2]]
+     */
+    (collection: object | null | undefined): boolean[];
+}
+
+declare const flatMapDepth: FlatMapDepth;
+export = flatMapDepth;
diff --git a/types/lodash/fp/flatten.d.ts b/types/lodash/fp/flatten.d.ts
new file mode 100644
index 0000000000..88c928c7b0
--- /dev/null
+++ b/types/lodash/fp/flatten.d.ts
@@ -0,0 +1,17 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+type Flatten =
+    /**
+     * Flattens `array` a single level deep.
+     *
+     * @param array The array to flatten.
+     * @return Returns the new flattened array.
+     */
+    <T>(array: _.List<_.Many<T>> | null | undefined) => T[];
+
+declare const flatten: Flatten;
+export = flatten;
diff --git a/types/lodash/fp/flattenDeep.d.ts b/types/lodash/fp/flattenDeep.d.ts
new file mode 100644
index 0000000000..4cfb955e6b
--- /dev/null
+++ b/types/lodash/fp/flattenDeep.d.ts
@@ -0,0 +1,17 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+type FlattenDeep =
+    /**
+     * Recursively flattens a nested array.
+     *
+     * @param array The array to recursively flatten.
+     * @return Returns the new flattened array.
+     */
+    <T>(array: _.ListOfRecursiveArraysOrValues<T> | null | undefined) => T[];
+
+declare const flattenDeep: FlattenDeep;
+export = flattenDeep;
diff --git a/types/lodash/fp/flattenDepth.d.ts b/types/lodash/fp/flattenDepth.d.ts
new file mode 100644
index 0000000000..f5516cf82e
--- /dev/null
+++ b/types/lodash/fp/flattenDepth.d.ts
@@ -0,0 +1,53 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface FlattenDepth {
+    /**
+       * Recursively flatten array up to depth times.
+       *
+       * @param array The array to recursively flatten.
+       * @param number The maximum recursion depth.
+       * @return Returns the new flattened array.
+       */
+    (): FlattenDepth;
+    /**
+       * Recursively flatten array up to depth times.
+       *
+       * @param array The array to recursively flatten.
+       * @param number The maximum recursion depth.
+       * @return Returns the new flattened array.
+       */
+    (depth: number): FlattenDepth1x1;
+    /**
+       * Recursively flatten array up to depth times.
+       *
+       * @param array The array to recursively flatten.
+       * @param number The maximum recursion depth.
+       * @return Returns the new flattened array.
+       */
+    <T>(depth: number, array: _.ListOfRecursiveArraysOrValues<T> | null | undefined): T[];
+}
+interface FlattenDepth1x1 {
+    /**
+       * Recursively flatten array up to depth times.
+       *
+       * @param array The array to recursively flatten.
+       * @param number The maximum recursion depth.
+       * @return Returns the new flattened array.
+       */
+    (): FlattenDepth1x1;
+    /**
+       * Recursively flatten array up to depth times.
+       *
+       * @param array The array to recursively flatten.
+       * @param number The maximum recursion depth.
+       * @return Returns the new flattened array.
+       */
+    <T>(array: _.ListOfRecursiveArraysOrValues<T> | null | undefined): T[];
+}
+
+declare const flattenDepth: FlattenDepth;
+export = flattenDepth;
diff --git a/types/lodash/fp/flip.d.ts b/types/lodash/fp/flip.d.ts
new file mode 100644
index 0000000000..db73a17b1a
--- /dev/null
+++ b/types/lodash/fp/flip.d.ts
@@ -0,0 +1,24 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type Flip =
+    /**
+     * Creates a function that invokes `func` with arguments reversed.
+     *
+     * @category Function
+     * @param func The function to flip arguments for.
+     * @returns Returns the new function.
+     * @example
+     *
+     * var flipped = _.flip(function() {
+     *   return _.toArray(arguments);
+     * });
+     *
+     * flipped('a', 'b', 'c', 'd');
+     * // => ['d', 'c', 'b', 'a']
+     */
+    <T extends (...args: any[]) => any>(func: T) => T;
+
+declare const flip: Flip;
+export = flip;
diff --git a/types/lodash/fp/floor.d.ts b/types/lodash/fp/floor.d.ts
new file mode 100644
index 0000000000..3275466204
--- /dev/null
+++ b/types/lodash/fp/floor.d.ts
@@ -0,0 +1,16 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type Floor =
+    /**
+     * Calculates n rounded down to precision.
+     *
+     * @param n The number to round down.
+     * @param precision The precision to round down to.
+     * @return Returns the rounded down number.
+     */
+    (n: number) => number;
+
+declare const floor: Floor;
+export = floor;
diff --git a/types/lodash/fp/flow.d.ts b/types/lodash/fp/flow.d.ts
new file mode 100644
index 0000000000..843b0180f8
--- /dev/null
+++ b/types/lodash/fp/flow.d.ts
@@ -0,0 +1,355 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Flow {
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <R1, R2>(f1: () => R1, f2: (a: R1) => R2): () => R2;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <R1, R2, R3>(f1: () => R1, f2: (a: R1) => R2, f3: (a: R2) => R3): () => R3;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <R1, R2, R3, R4>(f1: () => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): () => R4;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <R1, R2, R3, R4, R5>(f1: () => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): () => R5;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <R1, R2, R3, R4, R5, R6>(f1: () => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): () => R6;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <R1, R2, R3, R4, R5, R6, R7>(f1: () => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): () => R7;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <R1, R2, R3, R4, R5, R6, R7>(f1: () => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<_.Many<(a: any) => any>>): () => any;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, R1, R2>(f1: (a1: A1) => R1, f2: (a: R1) => R2): (a1: A1) => R2;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, R1, R2, R3>(f1: (a1: A1) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3): (a1: A1) => R3;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, R1, R2, R3, R4>(f1: (a1: A1) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): (a1: A1) => R4;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, R1, R2, R3, R4, R5>(f1: (a1: A1) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): (a1: A1) => R5;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, R1, R2, R3, R4, R5, R6>(f1: (a1: A1) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): (a1: A1) => R6;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): (a1: A1) => R7;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<_.Many<(a: any) => any>>): (a1: A1) => any;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, R1, R2>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2): (a1: A1, a2: A2) => R2;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, R1, R2, R3>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3): (a1: A1, a2: A2) => R3;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, R1, R2, R3, R4>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): (a1: A1, a2: A2) => R4;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, R1, R2, R3, R4, R5>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): (a1: A1, a2: A2) => R5;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, R1, R2, R3, R4, R5, R6>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): (a1: A1, a2: A2) => R6;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): (a1: A1, a2: A2) => R7;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<_.Many<(a: any) => any>>): (a1: A1, a2: A2) => any;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, R1, R2>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2): (a1: A1, a2: A2, a3: A3) => R2;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, R1, R2, R3>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3): (a1: A1, a2: A2, a3: A3) => R3;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, R1, R2, R3, R4>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): (a1: A1, a2: A2, a3: A3) => R4;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, R1, R2, R3, R4, R5>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): (a1: A1, a2: A2, a3: A3) => R5;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, R1, R2, R3, R4, R5, R6>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): (a1: A1, a2: A2, a3: A3) => R6;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): (a1: A1, a2: A2, a3: A3) => R7;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<_.Many<(a: any) => any>>): (a1: A1, a2: A2, a3: A3) => any;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, A4, R1, R2>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2): (a1: A1, a2: A2, a3: A3, a4: A4) => R2;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, A4, R1, R2, R3>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3): (a1: A1, a2: A2, a3: A3, a4: A4) => R3;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, A4, R1, R2, R3, R4>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): (a1: A1, a2: A2, a3: A3, a4: A4) => R4;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, A4, R1, R2, R3, R4, R5>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): (a1: A1, a2: A2, a3: A3, a4: A4) => R5;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, A4, R1, R2, R3, R4, R5, R6>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): (a1: A1, a2: A2, a3: A3, a4: A4) => R6;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): (a1: A1, a2: A2, a3: A3, a4: A4) => R7;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<_.Many<(a: any) => any>>): (a1: A1, a2: A2, a3: A3, a4: A4) => any;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, A4, R1, R2>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R2;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, A4, R1, R2, R3>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R3;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, A4, R1, R2, R3, R4>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R4;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, A4, R1, R2, R3, R4, R5>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R5;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, A4, R1, R2, R3, R4, R5, R6>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R6;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R7;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<_.Many<(a: any) => any>>): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => any;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    (funcs: Array<_.Many<(...args: any[]) => any>>): (...args: any[]) => any;
+}
+
+declare const flow: Flow;
+export = flow;
diff --git a/types/lodash/fp/flowRight.d.ts b/types/lodash/fp/flowRight.d.ts
new file mode 100644
index 0000000000..16f5f2f031
--- /dev/null
+++ b/types/lodash/fp/flowRight.d.ts
@@ -0,0 +1,315 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface FlowRight {
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <R2, R1>(f2: (a: R1) => R2, f1: () => R1): () => R2;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <R3, R2, R1>(f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): () => R3;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <R4, R3, R2, R1>(f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): () => R4;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <R5, R4, R3, R2, R1>(f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): () => R5;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <R6, R5, R4, R3, R2, R1>(f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): () => R6;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <R7, R6, R5, R4, R3, R2, R1>(f7: (a: R6) => R7, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): () => R7;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, R2, R1>(f2: (a: R1) => R2, f1: (a1: A1) => R1): (a1: A1) => R2;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, R3, R2, R1>(f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): (a1: A1) => R3;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, R4, R3, R2, R1>(f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): (a1: A1) => R4;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, R5, R4, R3, R2, R1>(f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): (a1: A1) => R5;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, R6, R5, R4, R3, R2, R1>(f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): (a1: A1) => R6;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, R7, R6, R5, R4, R3, R2, R1>(f7: (a: R6) => R7, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): (a1: A1) => R7;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, R2, R1>(f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): (a1: A1, a2: A2) => R2;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, R3, R2, R1>(f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): (a1: A1, a2: A2) => R3;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, R4, R3, R2, R1>(f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): (a1: A1, a2: A2) => R4;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, R5, R4, R3, R2, R1>(f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): (a1: A1, a2: A2) => R5;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, R6, R5, R4, R3, R2, R1>(f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): (a1: A1, a2: A2) => R6;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, R7, R6, R5, R4, R3, R2, R1>(f7: (a: R6) => R7, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): (a1: A1, a2: A2) => R7;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, R2, R1>(f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): (a1: A1, a2: A2, a3: A3) => R2;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, R3, R2, R1>(f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): (a1: A1, a2: A2, a3: A3) => R3;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, R4, R3, R2, R1>(f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): (a1: A1, a2: A2, a3: A3) => R4;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, R5, R4, R3, R2, R1>(f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): (a1: A1, a2: A2, a3: A3) => R5;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, R6, R5, R4, R3, R2, R1>(f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): (a1: A1, a2: A2, a3: A3) => R6;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, R7, R6, R5, R4, R3, R2, R1>(f7: (a: R6) => R7, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): (a1: A1, a2: A2, a3: A3) => R7;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, A4, R2, R1>(f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): (a1: A1, a2: A2, a3: A3, a4: A4) => R2;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, A4, R3, R2, R1>(f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): (a1: A1, a2: A2, a3: A3, a4: A4) => R3;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, A4, R4, R3, R2, R1>(f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): (a1: A1, a2: A2, a3: A3, a4: A4) => R4;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, A4, R5, R4, R3, R2, R1>(f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): (a1: A1, a2: A2, a3: A3, a4: A4) => R5;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, A4, R6, R5, R4, R3, R2, R1>(f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): (a1: A1, a2: A2, a3: A3, a4: A4) => R6;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, A4, R7, R6, R5, R4, R3, R2, R1>(f7: (a: R6) => R7, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): (a1: A1, a2: A2, a3: A3, a4: A4) => R7;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <R2, R1>(f2: (a: R1) => R2, f1: (...args: any[]) => R1): (...args: any[]) => R2;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <R3, R2, R1>(f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): (...args: any[]) => R3;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <R4, R3, R2, R1>(f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): (...args: any[]) => R4;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <R5, R4, R3, R2, R1>(f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): (...args: any[]) => R5;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <R6, R5, R4, R3, R2, R1>(f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): (...args: any[]) => R6;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <R7, R6, R5, R4, R3, R2, R1>(f7: (a: R6) => R7, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): (...args: any[]) => R7;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    (f7: (a: any) => any, f6: (a: any) => any, f5: (a: any) => any, f4: (a: any) => any, f3: (a: any) => any, f2: (a: any) => any, f1: () => any, ...funcs: Array<_.Many<(...args: any[]) => any>>): (...args: any[]) => any;
+    /**
+     * This method is like _.flow except that it creates a function that invokes the provided functions from right
+     * to left.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    (funcs: Array<_.Many<(...args: any[]) => any>>): (...args: any[]) => any;
+}
+
+declare const flowRight: FlowRight;
+export = flowRight;
diff --git a/types/lodash/fp/forEach.d.ts b/types/lodash/fp/forEach.d.ts
new file mode 100644
index 0000000000..50b4a45bf4
--- /dev/null
+++ b/types/lodash/fp/forEach.d.ts
@@ -0,0 +1,330 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface ForEach {
+    /**
+     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
+     * and invoked with three arguments:
+     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
+     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
+     *
+     * @alias _.each
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     */
+    (): ForEach;
+    /**
+     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
+     * and invoked with three arguments:
+     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
+     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
+     *
+     * @alias _.each
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     */
+    <T>(iteratee: (value: T) => any): ForEach1x1<T>;
+    /**
+     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
+     * and invoked with three arguments:
+     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
+     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
+     *
+     * @alias _.each
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     */
+    <T>(iteratee: (value: T) => any, collection: ReadonlyArray<T>): T[];
+    /**
+     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
+     * and invoked with three arguments:
+     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
+     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
+     *
+     * @alias _.each
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     */
+    (iteratee: (value: string) => any): ForEach2x1;
+    /**
+     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
+     * and invoked with three arguments:
+     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
+     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
+     *
+     * @alias _.each
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     */
+    (iteratee: (value: string) => any, collection: string): string;
+    /**
+     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
+     * and invoked with three arguments:
+     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
+     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
+     *
+     * @alias _.each
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     */
+    <T>(iteratee: (value: T) => any, collection: _.List<T>): _.List<T>;
+    /**
+     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
+     * and invoked with three arguments:
+     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
+     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
+     *
+     * @alias _.each
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     */
+    <T extends object>(iteratee: (value: T[keyof T]) => any, collection: T): T;
+    /**
+     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
+     * and invoked with three arguments:
+     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
+     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
+     *
+     * @alias _.each
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     */
+    <T, TArray extends T[] | null | undefined>(iteratee: (value: T) => any, collection: TArray & (T[] | null | undefined)): TArray;
+    /**
+     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
+     * and invoked with three arguments:
+     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
+     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
+     *
+     * @alias _.each
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     */
+    <TString extends string | null | undefined>(iteratee: (value: string) => any, collection: TString): TString;
+    /**
+     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
+     * and invoked with three arguments:
+     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
+     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
+     *
+     * @alias _.each
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     */
+    <T, TList extends _.List<T> | null | undefined>(iteratee: (value: T) => any, collection: TList & (_.List<T> | null | undefined)): TList;
+    /**
+     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
+     * and invoked with three arguments:
+     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
+     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
+     *
+     * @alias _.each
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     */
+    <T extends object>(iteratee: (value: T[keyof T]) => any, collection: T | null | undefined): T | null | undefined;
+}
+interface ForEach1x1<T> {
+    /**
+     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
+     * and invoked with three arguments:
+     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
+     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
+     *
+     * @alias _.each
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     */
+    (): ForEach1x1<T>;
+    /**
+     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
+     * and invoked with three arguments:
+     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
+     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
+     *
+     * @alias _.each
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     */
+    (collection: ReadonlyArray<T>): T[];
+    /**
+     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
+     * and invoked with three arguments:
+     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
+     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
+     *
+     * @alias _.each
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     */
+    (collection: _.List<T>): _.List<T>;
+    /**
+     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
+     * and invoked with three arguments:
+     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
+     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
+     *
+     * @alias _.each
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     */
+    <T1 extends object>(collection: T1): T1;
+    /**
+     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
+     * and invoked with three arguments:
+     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
+     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
+     *
+     * @alias _.each
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     */
+    <TArray extends T[] | null | undefined>(collection: TArray & (T[] | null | undefined)): TArray;
+    /**
+     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
+     * and invoked with three arguments:
+     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
+     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
+     *
+     * @alias _.each
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     */
+    <TList extends _.List<T> | null | undefined>(collection: TList & (_.List<T> | null | undefined)): TList;
+    /**
+     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
+     * and invoked with three arguments:
+     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
+     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
+     *
+     * @alias _.each
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     */
+    <T1 extends object>(collection: T1 | null | undefined): T1 | null | undefined;
+}
+interface ForEach2x1 {
+    /**
+     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
+     * and invoked with three arguments:
+     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
+     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
+     *
+     * @alias _.each
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     */
+    (): ForEach2x1;
+    /**
+     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
+     * and invoked with three arguments:
+     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
+     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
+     *
+     * @alias _.each
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     */
+    (collection: string): string;
+    /**
+     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
+     * and invoked with three arguments:
+     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
+     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
+     *
+     * @alias _.each
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     */
+    <TString extends string | null | undefined>(collection: TString): TString;
+}
+
+declare const forEach: ForEach;
+export = forEach;
diff --git a/types/lodash/fp/forEachRight.d.ts b/types/lodash/fp/forEachRight.d.ts
new file mode 100644
index 0000000000..75ed3e7fab
--- /dev/null
+++ b/types/lodash/fp/forEachRight.d.ts
@@ -0,0 +1,225 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface ForEachRight {
+    /**
+     * This method is like _.forEach except that it iterates over elements of collection from right to left.
+     *
+     * @alias _.eachRight
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function called per iteration.
+     * @param thisArg The this binding of callback.
+     */
+    (): ForEachRight;
+    /**
+     * This method is like _.forEach except that it iterates over elements of collection from right to left.
+     *
+     * @alias _.eachRight
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function called per iteration.
+     * @param thisArg The this binding of callback.
+     */
+    <T>(iteratee: (value: T) => any): ForEachRight1x1<T>;
+    /**
+     * This method is like _.forEach except that it iterates over elements of collection from right to left.
+     *
+     * @alias _.eachRight
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function called per iteration.
+     * @param thisArg The this binding of callback.
+     */
+    <T>(iteratee: (value: T) => any, collection: ReadonlyArray<T>): T[];
+    /**
+     * This method is like _.forEach except that it iterates over elements of collection from right to left.
+     *
+     * @alias _.eachRight
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function called per iteration.
+     * @param thisArg The this binding of callback.
+     */
+    (iteratee: (value: string) => any): ForEachRight2x1;
+    /**
+     * This method is like _.forEach except that it iterates over elements of collection from right to left.
+     *
+     * @alias _.eachRight
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function called per iteration.
+     * @param thisArg The this binding of callback.
+     */
+    (iteratee: (value: string) => any, collection: string): string;
+    /**
+     * This method is like _.forEach except that it iterates over elements of collection from right to left.
+     *
+     * @alias _.eachRight
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function called per iteration.
+     * @param thisArg The this binding of callback.
+     */
+    <T>(iteratee: (value: T) => any, collection: _.List<T>): _.List<T>;
+    /**
+     * This method is like _.forEach except that it iterates over elements of collection from right to left.
+     *
+     * @alias _.eachRight
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function called per iteration.
+     * @param thisArg The this binding of callback.
+     */
+    <T extends object>(iteratee: (value: T[keyof T]) => any, collection: T): T;
+    /**
+     * This method is like _.forEach except that it iterates over elements of collection from right to left.
+     *
+     * @alias _.eachRight
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function called per iteration.
+     * @param thisArg The this binding of callback.
+     */
+    <T, TArray extends T[] | null | undefined>(iteratee: (value: T) => any, collection: TArray & (T[] | null | undefined)): TArray;
+    /**
+     * This method is like _.forEach except that it iterates over elements of collection from right to left.
+     *
+     * @alias _.eachRight
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function called per iteration.
+     * @param thisArg The this binding of callback.
+     */
+    <TString extends string | null | undefined>(iteratee: (value: string) => any, collection: TString): TString;
+    /**
+     * This method is like _.forEach except that it iterates over elements of collection from right to left.
+     *
+     * @alias _.eachRight
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function called per iteration.
+     * @param thisArg The this binding of callback.
+     */
+    <T, TList extends _.List<T> | null | undefined>(iteratee: (value: T) => any, collection: TList & (_.List<T> | null | undefined)): TList;
+    /**
+     * This method is like _.forEach except that it iterates over elements of collection from right to left.
+     *
+     * @alias _.eachRight
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function called per iteration.
+     * @param thisArg The this binding of callback.
+     */
+    <T extends object>(iteratee: (value: T[keyof T]) => any, collection: T | null | undefined): T | null | undefined;
+}
+interface ForEachRight1x1<T> {
+    /**
+     * This method is like _.forEach except that it iterates over elements of collection from right to left.
+     *
+     * @alias _.eachRight
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function called per iteration.
+     * @param thisArg The this binding of callback.
+     */
+    (): ForEachRight1x1<T>;
+    /**
+     * This method is like _.forEach except that it iterates over elements of collection from right to left.
+     *
+     * @alias _.eachRight
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function called per iteration.
+     * @param thisArg The this binding of callback.
+     */
+    (collection: ReadonlyArray<T>): T[];
+    /**
+     * This method is like _.forEach except that it iterates over elements of collection from right to left.
+     *
+     * @alias _.eachRight
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function called per iteration.
+     * @param thisArg The this binding of callback.
+     */
+    (collection: _.List<T>): _.List<T>;
+    /**
+     * This method is like _.forEach except that it iterates over elements of collection from right to left.
+     *
+     * @alias _.eachRight
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function called per iteration.
+     * @param thisArg The this binding of callback.
+     */
+    <T1 extends object>(collection: T1): T1;
+    /**
+     * This method is like _.forEach except that it iterates over elements of collection from right to left.
+     *
+     * @alias _.eachRight
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function called per iteration.
+     * @param thisArg The this binding of callback.
+     */
+    <TArray extends T[] | null | undefined>(collection: TArray & (T[] | null | undefined)): TArray;
+    /**
+     * This method is like _.forEach except that it iterates over elements of collection from right to left.
+     *
+     * @alias _.eachRight
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function called per iteration.
+     * @param thisArg The this binding of callback.
+     */
+    <TList extends _.List<T> | null | undefined>(collection: TList & (_.List<T> | null | undefined)): TList;
+    /**
+     * This method is like _.forEach except that it iterates over elements of collection from right to left.
+     *
+     * @alias _.eachRight
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function called per iteration.
+     * @param thisArg The this binding of callback.
+     */
+    <T1 extends object>(collection: T1 | null | undefined): T1 | null | undefined;
+}
+interface ForEachRight2x1 {
+    /**
+     * This method is like _.forEach except that it iterates over elements of collection from right to left.
+     *
+     * @alias _.eachRight
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function called per iteration.
+     * @param thisArg The this binding of callback.
+     */
+    (): ForEachRight2x1;
+    /**
+     * This method is like _.forEach except that it iterates over elements of collection from right to left.
+     *
+     * @alias _.eachRight
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function called per iteration.
+     * @param thisArg The this binding of callback.
+     */
+    (collection: string): string;
+    /**
+     * This method is like _.forEach except that it iterates over elements of collection from right to left.
+     *
+     * @alias _.eachRight
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function called per iteration.
+     * @param thisArg The this binding of callback.
+     */
+    <TString extends string | null | undefined>(collection: TString): TString;
+}
+
+declare const forEachRight: ForEachRight;
+export = forEachRight;
diff --git a/types/lodash/fp/forIn.d.ts b/types/lodash/fp/forIn.d.ts
new file mode 100644
index 0000000000..added8f66b
--- /dev/null
+++ b/types/lodash/fp/forIn.d.ts
@@ -0,0 +1,88 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface ForIn {
+    /**
+     * Iterates over own and inherited enumerable properties of an object invoking iteratee for each property. The
+     * iteratee is bound to thisArg and invoked with three arguments: (value, key, object). Iteratee functions may
+     * exit iteration early by explicitly returning false.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns object.
+     */
+    (): ForIn;
+    /**
+     * Iterates over own and inherited enumerable properties of an object invoking iteratee for each property. The
+     * iteratee is bound to thisArg and invoked with three arguments: (value, key, object). Iteratee functions may
+     * exit iteration early by explicitly returning false.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns object.
+     */
+    <T>(iteratee: (value: T) => any): ForIn1x1<T>;
+    /**
+     * Iterates over own and inherited enumerable properties of an object invoking iteratee for each property. The
+     * iteratee is bound to thisArg and invoked with three arguments: (value, key, object). Iteratee functions may
+     * exit iteration early by explicitly returning false.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns object.
+     */
+    <T>(iteratee: (value: T[keyof T]) => any, object: T): T;
+    /**
+     * Iterates over own and inherited enumerable properties of an object invoking iteratee for each property. The
+     * iteratee is bound to thisArg and invoked with three arguments: (value, key, object). Iteratee functions may
+     * exit iteration early by explicitly returning false.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns object.
+     */
+    <T>(iteratee: (value: T[keyof T]) => any, object: T | null | undefined): T | null | undefined;
+}
+interface ForIn1x1<T> {
+    /**
+     * Iterates over own and inherited enumerable properties of an object invoking iteratee for each property. The
+     * iteratee is bound to thisArg and invoked with three arguments: (value, key, object). Iteratee functions may
+     * exit iteration early by explicitly returning false.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns object.
+     */
+    (): ForIn1x1<T>;
+    /**
+     * Iterates over own and inherited enumerable properties of an object invoking iteratee for each property. The
+     * iteratee is bound to thisArg and invoked with three arguments: (value, key, object). Iteratee functions may
+     * exit iteration early by explicitly returning false.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns object.
+     */
+    <T1 extends object>(object: T1): T1;
+    /**
+     * Iterates over own and inherited enumerable properties of an object invoking iteratee for each property. The
+     * iteratee is bound to thisArg and invoked with three arguments: (value, key, object). Iteratee functions may
+     * exit iteration early by explicitly returning false.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns object.
+     */
+    <T1 extends object>(object: T1 | null | undefined): T1 | null | undefined;
+}
+
+declare const forIn: ForIn;
+export = forIn;
diff --git a/types/lodash/fp/forInRight.d.ts b/types/lodash/fp/forInRight.d.ts
new file mode 100644
index 0000000000..0525b46d07
--- /dev/null
+++ b/types/lodash/fp/forInRight.d.ts
@@ -0,0 +1,74 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface ForInRight {
+    /**
+     * This method is like _.forIn except that it iterates over properties of object in the opposite order.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns object.
+     */
+    (): ForInRight;
+    /**
+     * This method is like _.forIn except that it iterates over properties of object in the opposite order.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns object.
+     */
+    <T>(iteratee: (value: T) => any): ForInRight1x1<T>;
+    /**
+     * This method is like _.forIn except that it iterates over properties of object in the opposite order.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns object.
+     */
+    <T>(iteratee: (value: T[keyof T]) => any, object: T): T;
+    /**
+     * This method is like _.forIn except that it iterates over properties of object in the opposite order.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns object.
+     */
+    <T>(iteratee: (value: T[keyof T]) => any, object: T | null | undefined): T | null | undefined;
+}
+interface ForInRight1x1<T> {
+    /**
+     * This method is like _.forIn except that it iterates over properties of object in the opposite order.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns object.
+     */
+    (): ForInRight1x1<T>;
+    /**
+     * This method is like _.forIn except that it iterates over properties of object in the opposite order.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns object.
+     */
+    <T1 extends object>(object: T1): T1;
+    /**
+     * This method is like _.forIn except that it iterates over properties of object in the opposite order.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns object.
+     */
+    <T1 extends object>(object: T1 | null | undefined): T1 | null | undefined;
+}
+
+declare const forInRight: ForInRight;
+export = forInRight;
diff --git a/types/lodash/fp/forOwn.d.ts b/types/lodash/fp/forOwn.d.ts
new file mode 100644
index 0000000000..222463960f
--- /dev/null
+++ b/types/lodash/fp/forOwn.d.ts
@@ -0,0 +1,88 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface ForOwn {
+    /**
+     * Iterates over own enumerable properties of an object invoking iteratee for each property. The iteratee is
+     * bound to thisArg and invoked with three arguments: (value, key, object). Iteratee functions may exit
+     * iteration early by explicitly returning false.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns object.
+     */
+    (): ForOwn;
+    /**
+     * Iterates over own enumerable properties of an object invoking iteratee for each property. The iteratee is
+     * bound to thisArg and invoked with three arguments: (value, key, object). Iteratee functions may exit
+     * iteration early by explicitly returning false.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns object.
+     */
+    <T>(iteratee: (value: T) => any): ForOwn1x1<T>;
+    /**
+     * Iterates over own enumerable properties of an object invoking iteratee for each property. The iteratee is
+     * bound to thisArg and invoked with three arguments: (value, key, object). Iteratee functions may exit
+     * iteration early by explicitly returning false.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns object.
+     */
+    <T>(iteratee: (value: T[keyof T]) => any, object: T): T;
+    /**
+     * Iterates over own enumerable properties of an object invoking iteratee for each property. The iteratee is
+     * bound to thisArg and invoked with three arguments: (value, key, object). Iteratee functions may exit
+     * iteration early by explicitly returning false.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns object.
+     */
+    <T>(iteratee: (value: T[keyof T]) => any, object: T | null | undefined): T | null | undefined;
+}
+interface ForOwn1x1<T> {
+    /**
+     * Iterates over own enumerable properties of an object invoking iteratee for each property. The iteratee is
+     * bound to thisArg and invoked with three arguments: (value, key, object). Iteratee functions may exit
+     * iteration early by explicitly returning false.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns object.
+     */
+    (): ForOwn1x1<T>;
+    /**
+     * Iterates over own enumerable properties of an object invoking iteratee for each property. The iteratee is
+     * bound to thisArg and invoked with three arguments: (value, key, object). Iteratee functions may exit
+     * iteration early by explicitly returning false.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns object.
+     */
+    <T1 extends object>(object: T1): T1;
+    /**
+     * Iterates over own enumerable properties of an object invoking iteratee for each property. The iteratee is
+     * bound to thisArg and invoked with three arguments: (value, key, object). Iteratee functions may exit
+     * iteration early by explicitly returning false.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns object.
+     */
+    <T1 extends object>(object: T1 | null | undefined): T1 | null | undefined;
+}
+
+declare const forOwn: ForOwn;
+export = forOwn;
diff --git a/types/lodash/fp/forOwnRight.d.ts b/types/lodash/fp/forOwnRight.d.ts
new file mode 100644
index 0000000000..310b720ace
--- /dev/null
+++ b/types/lodash/fp/forOwnRight.d.ts
@@ -0,0 +1,74 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface ForOwnRight {
+    /**
+     * This method is like _.forOwn except that it iterates over properties of object in the opposite order.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns object.
+     */
+    (): ForOwnRight;
+    /**
+     * This method is like _.forOwn except that it iterates over properties of object in the opposite order.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns object.
+     */
+    <T>(iteratee: (value: T) => any): ForOwnRight1x1<T>;
+    /**
+     * This method is like _.forOwn except that it iterates over properties of object in the opposite order.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns object.
+     */
+    <T>(iteratee: (value: T[keyof T]) => any, object: T): T;
+    /**
+     * This method is like _.forOwn except that it iterates over properties of object in the opposite order.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns object.
+     */
+    <T>(iteratee: (value: T[keyof T]) => any, object: T | null | undefined): T | null | undefined;
+}
+interface ForOwnRight1x1<T> {
+    /**
+     * This method is like _.forOwn except that it iterates over properties of object in the opposite order.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns object.
+     */
+    (): ForOwnRight1x1<T>;
+    /**
+     * This method is like _.forOwn except that it iterates over properties of object in the opposite order.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns object.
+     */
+    <T1 extends object>(object: T1): T1;
+    /**
+     * This method is like _.forOwn except that it iterates over properties of object in the opposite order.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns object.
+     */
+    <T1 extends object>(object: T1 | null | undefined): T1 | null | undefined;
+}
+
+declare const forOwnRight: ForOwnRight;
+export = forOwnRight;
diff --git a/types/lodash/fp/fromPairs.d.ts b/types/lodash/fp/fromPairs.d.ts
new file mode 100644
index 0000000000..5412865d75
--- /dev/null
+++ b/types/lodash/fp/fromPairs.d.ts
@@ -0,0 +1,37 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface FromPairs {
+    /**
+     * The inverse of `_.toPairs`; this method returns an object composed
+     * from key-value `pairs`.
+     *
+     * @category Array
+     * @param pairs The key-value pairs.
+     * @returns Returns the new object.
+     * @example
+     *
+     * _.fromPairs([['fred', 30], ['barney', 40]]);
+     * // => { 'fred': 30, 'barney': 40 }
+     */
+    <T>(pairs: _.List<[_.PropertyName, T]> | null | undefined): _.Dictionary<T>;
+    /**
+     * The inverse of `_.toPairs`; this method returns an object composed
+     * from key-value `pairs`.
+     *
+     * @category Array
+     * @param pairs The key-value pairs.
+     * @returns Returns the new object.
+     * @example
+     *
+     * _.fromPairs([['fred', 30], ['barney', 40]]);
+     * // => { 'fred': 30, 'barney': 40 }
+     */
+    (pairs: _.List<any[]> | null | undefined): _.Dictionary<any>;
+}
+
+declare const fromPairs: FromPairs;
+export = fromPairs;
diff --git a/types/lodash/fp/functions.d.ts b/types/lodash/fp/functions.d.ts
new file mode 100644
index 0000000000..bc5cb94ab1
--- /dev/null
+++ b/types/lodash/fp/functions.d.ts
@@ -0,0 +1,28 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type Functions =
+    /**
+     * Creates an array of function property names from own enumerable properties
+     * of `object`.
+     *
+     * @category Object
+     * @param object The object to inspect.
+     * @returns Returns the new array of property names.
+     * @example
+     *
+     * function Foo() {
+     *   this.a = _.constant('a');
+     *   this.b = _.constant('b');
+     * }
+     *
+     * Foo.prototype.c = _.constant('c');
+     *
+     * _.functions(new Foo);
+     * // => ['a', 'b']
+     */
+    (object: any) => string[];
+
+declare const functions: Functions;
+export = functions;
diff --git a/types/lodash/fp/functionsIn.d.ts b/types/lodash/fp/functionsIn.d.ts
new file mode 100644
index 0000000000..0189c213d6
--- /dev/null
+++ b/types/lodash/fp/functionsIn.d.ts
@@ -0,0 +1,28 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type FunctionsIn =
+    /**
+     * Creates an array of function property names from own and inherited
+     * enumerable properties of `object`.
+     *
+     * @category Object
+     * @param object The object to inspect.
+     * @returns Returns the new array of property names.
+     * @example
+     *
+     * function Foo() {
+     *   this.a = _.constant('a');
+     *   this.b = _.constant('b');
+     * }
+     *
+     * Foo.prototype.c = _.constant('c');
+     *
+     * _.functionsIn(new Foo);
+     * // => ['a', 'b', 'c']
+     */
+    (object: any) => string[];
+
+declare const functionsIn: FunctionsIn;
+export = functionsIn;
diff --git a/types/lodash/fp/get.d.ts b/types/lodash/fp/get.d.ts
new file mode 100644
index 0000000000..085f3d935f
--- /dev/null
+++ b/types/lodash/fp/get.d.ts
@@ -0,0 +1,207 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Get {
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (): Get;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey]): Get1x1<TObject, TKey>;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey], object: TObject): TObject[TKey];
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey], object: TObject | null | undefined): TObject[TKey] | undefined;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (path: number): Get3x1;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <T>(path: number, object: _.NumericDictionary<T>): T;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <T>(path: number, object: _.NumericDictionary<T> | null | undefined): T | undefined;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (path: _.PropertyPath): Get5x1;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (path: _.PropertyPath, object: null | undefined): undefined;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (path: _.PropertyPath, object: any): any;
+}
+interface Get1x1<TObject extends object, TKey extends keyof TObject> {
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (): Get1x1<TObject, TKey>;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (object: TObject): TObject[TKey];
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (object: TObject | null | undefined): TObject[TKey] | undefined;
+}
+interface Get3x1 {
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (): Get3x1;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <T>(object: _.NumericDictionary<T>): T;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <T>(object: _.NumericDictionary<T> | null | undefined): T | undefined;
+}
+interface Get5x1 {
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (): Get5x1;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (object: null | undefined): undefined;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (object: any): any;
+}
+
+declare const get: Get;
+export = get;
diff --git a/types/lodash/fp/getOr.d.ts b/types/lodash/fp/getOr.d.ts
new file mode 100644
index 0000000000..db63bd4b1a
--- /dev/null
+++ b/types/lodash/fp/getOr.d.ts
@@ -0,0 +1,313 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Get {
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (): Get;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <TDefault>(defaultValue: TDefault): Get1x1<TDefault>;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <TObject extends object, TKey extends keyof TObject, TDefault>(defaultValue: TDefault, path: TKey | [TKey]): Get1x2<TObject, TKey, TDefault>;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <TObject extends object, TKey extends keyof TObject, TDefault>(defaultValue: TDefault, path: TKey | [TKey], object: TObject | null | undefined): TObject[TKey] | TDefault;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <TDefault>(defaultValue: TDefault, path: number): Get2x2<TDefault>;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <T, TDefault>(defaultValue: TDefault, path: number, object: _.NumericDictionary<T> | null | undefined): T | TDefault;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <TDefault>(defaultValue: TDefault, path: _.PropertyPath): Get3x2<TDefault>;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <TDefault>(defaultValue: TDefault, path: _.PropertyPath, object: null | undefined): TDefault;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (defaultValue: any): Get4x1;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (defaultValue: any, path: _.PropertyPath): Get4x2;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (defaultValue: any, path: _.PropertyPath, object: any): any;
+}
+interface Get1x1<TDefault> {
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (): Get1x1<TDefault>;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey]): Get1x2<TObject, TKey, TDefault>;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey], object: TObject | null | undefined): TObject[TKey] | TDefault;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (path: number): Get2x2<TDefault>;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <T>(path: number, object: _.NumericDictionary<T> | null | undefined): T | TDefault;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (path: _.PropertyPath): Get3x2<TDefault>;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (path: _.PropertyPath, object: null | undefined): TDefault;
+}
+interface Get1x2<TObject extends object, TKey extends keyof TObject, TDefault> {
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (): Get1x2<TObject, TKey, TDefault>;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (object: TObject | null | undefined): TObject[TKey] | TDefault;
+}
+interface Get2x2<TDefault> {
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (): Get2x2<TDefault>;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <T>(object: _.NumericDictionary<T> | null | undefined): T | TDefault;
+}
+interface Get3x2<TDefault> {
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (): Get3x2<TDefault>;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (object: null | undefined): TDefault;
+}
+interface Get4x1 {
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (): Get4x1;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (path: _.PropertyPath): Get4x2;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (path: _.PropertyPath, object: any): any;
+}
+interface Get4x2 {
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (): Get4x2;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (object: any): any;
+}
+
+declare const getOr: Get;
+export = getOr;
diff --git a/types/lodash/fp/groupBy.d.ts b/types/lodash/fp/groupBy.d.ts
new file mode 100644
index 0000000000..49f6946225
--- /dev/null
+++ b/types/lodash/fp/groupBy.d.ts
@@ -0,0 +1,225 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface GroupBy {
+    /**
+     * Creates an object composed of keys generated from the results of running each element of collection through
+     * iteratee. The corresponding value of each key is an array of the elements responsible for generating the
+     * key. The iteratee is bound to thisArg and invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the composed aggregate object.
+     */
+    (): GroupBy;
+    /**
+     * Creates an object composed of keys generated from the results of running each element of collection through
+     * iteratee. The corresponding value of each key is an array of the elements responsible for generating the
+     * key. The iteratee is bound to thisArg and invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the composed aggregate object.
+     */
+    (iteratee: (value: string) => _.NotVoid): GroupBy1x1;
+    /**
+     * Creates an object composed of keys generated from the results of running each element of collection through
+     * iteratee. The corresponding value of each key is an array of the elements responsible for generating the
+     * key. The iteratee is bound to thisArg and invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the composed aggregate object.
+     */
+    (iteratee: (value: string) => _.NotVoid, collection: string | null | undefined): _.Dictionary<string[]>;
+    /**
+     * Creates an object composed of keys generated from the results of running each element of collection through
+     * iteratee. The corresponding value of each key is an array of the elements responsible for generating the
+     * key. The iteratee is bound to thisArg and invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the composed aggregate object.
+     */
+    <T>(iteratee: _.ValueIteratee<T>): GroupBy2x1<T>;
+    /**
+     * Creates an object composed of keys generated from the results of running each element of collection through
+     * iteratee. The corresponding value of each key is an array of the elements responsible for generating the
+     * key. The iteratee is bound to thisArg and invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the composed aggregate object.
+     */
+    <T>(iteratee: _.ValueIteratee<T>, collection: _.List<T> | null | undefined): _.Dictionary<T[]>;
+    /**
+     * Creates an object composed of keys generated from the results of running each element of collection through
+     * iteratee. The corresponding value of each key is an array of the elements responsible for generating the
+     * key. The iteratee is bound to thisArg and invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the composed aggregate object.
+     */
+    <T extends object>(iteratee: _.ValueIteratee<T[keyof T]>, collection: T | null | undefined): _.Dictionary<Array<T[keyof T]>>;
+}
+interface GroupBy1x1 {
+    /**
+     * Creates an object composed of keys generated from the results of running each element of collection through
+     * iteratee. The corresponding value of each key is an array of the elements responsible for generating the
+     * key. The iteratee is bound to thisArg and invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the composed aggregate object.
+     */
+    (): GroupBy1x1;
+    /**
+     * Creates an object composed of keys generated from the results of running each element of collection through
+     * iteratee. The corresponding value of each key is an array of the elements responsible for generating the
+     * key. The iteratee is bound to thisArg and invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the composed aggregate object.
+     */
+    (collection: string | null | undefined): _.Dictionary<string[]>;
+}
+interface GroupBy2x1<T> {
+    /**
+     * Creates an object composed of keys generated from the results of running each element of collection through
+     * iteratee. The corresponding value of each key is an array of the elements responsible for generating the
+     * key. The iteratee is bound to thisArg and invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the composed aggregate object.
+     */
+    (): GroupBy2x1<T>;
+    /**
+     * Creates an object composed of keys generated from the results of running each element of collection through
+     * iteratee. The corresponding value of each key is an array of the elements responsible for generating the
+     * key. The iteratee is bound to thisArg and invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the composed aggregate object.
+     */
+    (collection: _.List<T> | object | null | undefined): _.Dictionary<T[]>;
+}
+
+declare const groupBy: GroupBy;
+export = groupBy;
diff --git a/types/lodash/fp/gt.d.ts b/types/lodash/fp/gt.d.ts
new file mode 100644
index 0000000000..8102922aee
--- /dev/null
+++ b/types/lodash/fp/gt.d.ts
@@ -0,0 +1,51 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface Gt {
+    /**
+     * Checks if value is greater than other.
+     *
+     * @param value The value to compare.
+     * @param other The other value to compare.
+     * @return Returns true if value is greater than other, else false.
+     */
+    (): Gt;
+    /**
+     * Checks if value is greater than other.
+     *
+     * @param value The value to compare.
+     * @param other The other value to compare.
+     * @return Returns true if value is greater than other, else false.
+     */
+    (value: any): Gt1x1;
+    /**
+     * Checks if value is greater than other.
+     *
+     * @param value The value to compare.
+     * @param other The other value to compare.
+     * @return Returns true if value is greater than other, else false.
+     */
+    (value: any, other: any): boolean;
+}
+interface Gt1x1 {
+    /**
+     * Checks if value is greater than other.
+     *
+     * @param value The value to compare.
+     * @param other The other value to compare.
+     * @return Returns true if value is greater than other, else false.
+     */
+    (): Gt1x1;
+    /**
+     * Checks if value is greater than other.
+     *
+     * @param value The value to compare.
+     * @param other The other value to compare.
+     * @return Returns true if value is greater than other, else false.
+     */
+    (other: any): boolean;
+}
+
+declare const gt: Gt;
+export = gt;
diff --git a/types/lodash/fp/gte.d.ts b/types/lodash/fp/gte.d.ts
new file mode 100644
index 0000000000..df663c4438
--- /dev/null
+++ b/types/lodash/fp/gte.d.ts
@@ -0,0 +1,51 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface Gte {
+    /**
+     * Checks if value is greater than or equal to other.
+     *
+     * @param value The value to compare.
+     * @param other The other value to compare.
+     * @return Returns true if value is greater than or equal to other, else false.
+     */
+    (): Gte;
+    /**
+     * Checks if value is greater than or equal to other.
+     *
+     * @param value The value to compare.
+     * @param other The other value to compare.
+     * @return Returns true if value is greater than or equal to other, else false.
+     */
+    (value: any): Gte1x1;
+    /**
+     * Checks if value is greater than or equal to other.
+     *
+     * @param value The value to compare.
+     * @param other The other value to compare.
+     * @return Returns true if value is greater than or equal to other, else false.
+     */
+    (value: any, other: any): boolean;
+}
+interface Gte1x1 {
+    /**
+     * Checks if value is greater than or equal to other.
+     *
+     * @param value The value to compare.
+     * @param other The other value to compare.
+     * @return Returns true if value is greater than or equal to other, else false.
+     */
+    (): Gte1x1;
+    /**
+     * Checks if value is greater than or equal to other.
+     *
+     * @param value The value to compare.
+     * @param other The other value to compare.
+     * @return Returns true if value is greater than or equal to other, else false.
+     */
+    (other: any): boolean;
+}
+
+declare const gte: Gte;
+export = gte;
diff --git a/types/lodash/fp/has.d.ts b/types/lodash/fp/has.d.ts
new file mode 100644
index 0000000000..950a57a43b
--- /dev/null
+++ b/types/lodash/fp/has.d.ts
@@ -0,0 +1,138 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Has {
+    /**
+     * Checks if `path` is a direct property of `object`.
+     *
+     * @category Object
+     * @param object The object to query.
+     * @param path The path to check.
+     * @returns Returns `true` if `path` exists, else `false`.
+     * @example
+     *
+     * var object = { 'a': { 'b': { 'c': 3 } } };
+     * var other = _.create({ 'a': _.create({ 'b': _.create({ 'c': 3 }) }) });
+     *
+     * _.has(object, 'a');
+     * // => true
+     *
+     * _.has(object, 'a.b.c');
+     * // => true
+     *
+     * _.has(object, ['a', 'b', 'c']);
+     * // => true
+     *
+     * _.has(other, 'a');
+     * // => false
+     */
+    (): Has;
+    /**
+     * Checks if `path` is a direct property of `object`.
+     *
+     * @category Object
+     * @param object The object to query.
+     * @param path The path to check.
+     * @returns Returns `true` if `path` exists, else `false`.
+     * @example
+     *
+     * var object = { 'a': { 'b': { 'c': 3 } } };
+     * var other = _.create({ 'a': _.create({ 'b': _.create({ 'c': 3 }) }) });
+     *
+     * _.has(object, 'a');
+     * // => true
+     *
+     * _.has(object, 'a.b.c');
+     * // => true
+     *
+     * _.has(object, ['a', 'b', 'c']);
+     * // => true
+     *
+     * _.has(other, 'a');
+     * // => false
+     */
+    (path: _.PropertyPath): Has1x1;
+    /**
+     * Checks if `path` is a direct property of `object`.
+     *
+     * @category Object
+     * @param object The object to query.
+     * @param path The path to check.
+     * @returns Returns `true` if `path` exists, else `false`.
+     * @example
+     *
+     * var object = { 'a': { 'b': { 'c': 3 } } };
+     * var other = _.create({ 'a': _.create({ 'b': _.create({ 'c': 3 }) }) });
+     *
+     * _.has(object, 'a');
+     * // => true
+     *
+     * _.has(object, 'a.b.c');
+     * // => true
+     *
+     * _.has(object, ['a', 'b', 'c']);
+     * // => true
+     *
+     * _.has(other, 'a');
+     * // => false
+     */
+    <T>(path: _.PropertyPath, object: T): boolean;
+}
+interface Has1x1 {
+    /**
+     * Checks if `path` is a direct property of `object`.
+     *
+     * @category Object
+     * @param object The object to query.
+     * @param path The path to check.
+     * @returns Returns `true` if `path` exists, else `false`.
+     * @example
+     *
+     * var object = { 'a': { 'b': { 'c': 3 } } };
+     * var other = _.create({ 'a': _.create({ 'b': _.create({ 'c': 3 }) }) });
+     *
+     * _.has(object, 'a');
+     * // => true
+     *
+     * _.has(object, 'a.b.c');
+     * // => true
+     *
+     * _.has(object, ['a', 'b', 'c']);
+     * // => true
+     *
+     * _.has(other, 'a');
+     * // => false
+     */
+    (): Has1x1;
+    /**
+     * Checks if `path` is a direct property of `object`.
+     *
+     * @category Object
+     * @param object The object to query.
+     * @param path The path to check.
+     * @returns Returns `true` if `path` exists, else `false`.
+     * @example
+     *
+     * var object = { 'a': { 'b': { 'c': 3 } } };
+     * var other = _.create({ 'a': _.create({ 'b': _.create({ 'c': 3 }) }) });
+     *
+     * _.has(object, 'a');
+     * // => true
+     *
+     * _.has(object, 'a.b.c');
+     * // => true
+     *
+     * _.has(object, ['a', 'b', 'c']);
+     * // => true
+     *
+     * _.has(other, 'a');
+     * // => false
+     */
+    <T>(object: T): boolean;
+}
+
+declare const has: Has;
+export = has;
diff --git a/types/lodash/fp/hasIn.d.ts b/types/lodash/fp/hasIn.d.ts
new file mode 100644
index 0000000000..a5ffb7ae4e
--- /dev/null
+++ b/types/lodash/fp/hasIn.d.ts
@@ -0,0 +1,133 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface HasIn {
+    /**
+     * Checks if `path` is a direct or inherited property of `object`.
+     *
+     * @category Object
+     * @param object The object to query.
+     * @param path The path to check.
+     * @returns Returns `true` if `path` exists, else `false`.
+     * @example
+     *
+     * var object = _.create({ 'a': _.create({ 'b': _.create({ 'c': 3 }) }) });
+     *
+     * _.hasIn(object, 'a');
+     * // => true
+     *
+     * _.hasIn(object, 'a.b.c');
+     * // => true
+     *
+     * _.hasIn(object, ['a', 'b', 'c']);
+     * // => true
+     *
+     * _.hasIn(object, 'b');
+     * // => false
+     */
+    (): HasIn;
+    /**
+     * Checks if `path` is a direct or inherited property of `object`.
+     *
+     * @category Object
+     * @param object The object to query.
+     * @param path The path to check.
+     * @returns Returns `true` if `path` exists, else `false`.
+     * @example
+     *
+     * var object = _.create({ 'a': _.create({ 'b': _.create({ 'c': 3 }) }) });
+     *
+     * _.hasIn(object, 'a');
+     * // => true
+     *
+     * _.hasIn(object, 'a.b.c');
+     * // => true
+     *
+     * _.hasIn(object, ['a', 'b', 'c']);
+     * // => true
+     *
+     * _.hasIn(object, 'b');
+     * // => false
+     */
+    (path: _.PropertyPath): HasIn1x1;
+    /**
+     * Checks if `path` is a direct or inherited property of `object`.
+     *
+     * @category Object
+     * @param object The object to query.
+     * @param path The path to check.
+     * @returns Returns `true` if `path` exists, else `false`.
+     * @example
+     *
+     * var object = _.create({ 'a': _.create({ 'b': _.create({ 'c': 3 }) }) });
+     *
+     * _.hasIn(object, 'a');
+     * // => true
+     *
+     * _.hasIn(object, 'a.b.c');
+     * // => true
+     *
+     * _.hasIn(object, ['a', 'b', 'c']);
+     * // => true
+     *
+     * _.hasIn(object, 'b');
+     * // => false
+     */
+    <T>(path: _.PropertyPath, object: T): boolean;
+}
+interface HasIn1x1 {
+    /**
+     * Checks if `path` is a direct or inherited property of `object`.
+     *
+     * @category Object
+     * @param object The object to query.
+     * @param path The path to check.
+     * @returns Returns `true` if `path` exists, else `false`.
+     * @example
+     *
+     * var object = _.create({ 'a': _.create({ 'b': _.create({ 'c': 3 }) }) });
+     *
+     * _.hasIn(object, 'a');
+     * // => true
+     *
+     * _.hasIn(object, 'a.b.c');
+     * // => true
+     *
+     * _.hasIn(object, ['a', 'b', 'c']);
+     * // => true
+     *
+     * _.hasIn(object, 'b');
+     * // => false
+     */
+    (): HasIn1x1;
+    /**
+     * Checks if `path` is a direct or inherited property of `object`.
+     *
+     * @category Object
+     * @param object The object to query.
+     * @param path The path to check.
+     * @returns Returns `true` if `path` exists, else `false`.
+     * @example
+     *
+     * var object = _.create({ 'a': _.create({ 'b': _.create({ 'c': 3 }) }) });
+     *
+     * _.hasIn(object, 'a');
+     * // => true
+     *
+     * _.hasIn(object, 'a.b.c');
+     * // => true
+     *
+     * _.hasIn(object, ['a', 'b', 'c']);
+     * // => true
+     *
+     * _.hasIn(object, 'b');
+     * // => false
+     */
+    <T>(object: T): boolean;
+}
+
+declare const hasIn: HasIn;
+export = hasIn;
diff --git a/types/lodash/fp/head.d.ts b/types/lodash/fp/head.d.ts
new file mode 100644
index 0000000000..618e7ca561
--- /dev/null
+++ b/types/lodash/fp/head.d.ts
@@ -0,0 +1,19 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+type Head =
+    /**
+     * Gets the first element of array.
+     *
+     * @alias _.first
+     *
+     * @param array The array to query.
+     * @return Returns the first element of array.
+     */
+    <T>(array: _.List<T> | null | undefined) => T | undefined;
+
+declare const head: Head;
+export = head;
diff --git a/types/lodash/fp/identical.d.ts b/types/lodash/fp/identical.d.ts
new file mode 100644
index 0000000000..689227ac95
--- /dev/null
+++ b/types/lodash/fp/identical.d.ts
@@ -0,0 +1,156 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface Eq {
+    /**
+     * Performs a [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+     * comparison between two values to determine if they are equivalent.
+     *
+     * @category Lang
+     * @param value The value to compare.
+     * @param other The other value to compare.
+     * @returns Returns `true` if the values are equivalent, else `false`.
+     * @example
+     *
+     * var object = { 'user': 'fred' };
+     * var other = { 'user': 'fred' };
+     *
+     * _.eq(object, object);
+     * // => true
+     *
+     * _.eq(object, other);
+     * // => false
+     *
+     * _.eq('a', 'a');
+     * // => true
+     *
+     * _.eq('a', Object('a'));
+     * // => false
+     *
+     * _.eq(NaN, NaN);
+     * // => true
+     */
+    (): Eq;
+    /**
+     * Performs a [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+     * comparison between two values to determine if they are equivalent.
+     *
+     * @category Lang
+     * @param value The value to compare.
+     * @param other The other value to compare.
+     * @returns Returns `true` if the values are equivalent, else `false`.
+     * @example
+     *
+     * var object = { 'user': 'fred' };
+     * var other = { 'user': 'fred' };
+     *
+     * _.eq(object, object);
+     * // => true
+     *
+     * _.eq(object, other);
+     * // => false
+     *
+     * _.eq('a', 'a');
+     * // => true
+     *
+     * _.eq('a', Object('a'));
+     * // => false
+     *
+     * _.eq(NaN, NaN);
+     * // => true
+     */
+    (value: any): Eq1x1;
+    /**
+     * Performs a [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+     * comparison between two values to determine if they are equivalent.
+     *
+     * @category Lang
+     * @param value The value to compare.
+     * @param other The other value to compare.
+     * @returns Returns `true` if the values are equivalent, else `false`.
+     * @example
+     *
+     * var object = { 'user': 'fred' };
+     * var other = { 'user': 'fred' };
+     *
+     * _.eq(object, object);
+     * // => true
+     *
+     * _.eq(object, other);
+     * // => false
+     *
+     * _.eq('a', 'a');
+     * // => true
+     *
+     * _.eq('a', Object('a'));
+     * // => false
+     *
+     * _.eq(NaN, NaN);
+     * // => true
+     */
+    (value: any, other: any): boolean;
+}
+interface Eq1x1 {
+    /**
+     * Performs a [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+     * comparison between two values to determine if they are equivalent.
+     *
+     * @category Lang
+     * @param value The value to compare.
+     * @param other The other value to compare.
+     * @returns Returns `true` if the values are equivalent, else `false`.
+     * @example
+     *
+     * var object = { 'user': 'fred' };
+     * var other = { 'user': 'fred' };
+     *
+     * _.eq(object, object);
+     * // => true
+     *
+     * _.eq(object, other);
+     * // => false
+     *
+     * _.eq('a', 'a');
+     * // => true
+     *
+     * _.eq('a', Object('a'));
+     * // => false
+     *
+     * _.eq(NaN, NaN);
+     * // => true
+     */
+    (): Eq1x1;
+    /**
+     * Performs a [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+     * comparison between two values to determine if they are equivalent.
+     *
+     * @category Lang
+     * @param value The value to compare.
+     * @param other The other value to compare.
+     * @returns Returns `true` if the values are equivalent, else `false`.
+     * @example
+     *
+     * var object = { 'user': 'fred' };
+     * var other = { 'user': 'fred' };
+     *
+     * _.eq(object, object);
+     * // => true
+     *
+     * _.eq(object, other);
+     * // => false
+     *
+     * _.eq('a', 'a');
+     * // => true
+     *
+     * _.eq('a', Object('a'));
+     * // => false
+     *
+     * _.eq(NaN, NaN);
+     * // => true
+     */
+    (other: any): boolean;
+}
+
+declare const identical: Eq;
+export = identical;
diff --git a/types/lodash/fp/identity.d.ts b/types/lodash/fp/identity.d.ts
new file mode 100644
index 0000000000..46411f1db1
--- /dev/null
+++ b/types/lodash/fp/identity.d.ts
@@ -0,0 +1,23 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface Identity {
+    /**
+     * This method returns the first argument provided to it.
+     *
+     * @param value Any value.
+     * @return Returns value.
+     */
+    <T>(value: T): T;
+    /**
+     * This method returns the first argument provided to it.
+     *
+     * @param value Any value.
+     * @return Returns value.
+     */
+    (): undefined;
+}
+
+declare const identity: Identity;
+export = identity;
diff --git a/types/lodash/fp/inRange.d.ts b/types/lodash/fp/inRange.d.ts
new file mode 100644
index 0000000000..564ed81a4e
--- /dev/null
+++ b/types/lodash/fp/inRange.d.ts
@@ -0,0 +1,103 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface InRange {
+    /**
+     * Checks if n is between start and up to but not including, end. If end is not specified it’s set to start
+     * with start then set to 0.
+     *
+     * @param n The number to check.
+     * @param start The start of the range.
+     * @param end The end of the range.
+     * @return Returns true if n is in the range, else false.
+     */
+    (): InRange;
+    /**
+     * Checks if n is between start and up to but not including, end. If end is not specified it’s set to start
+     * with start then set to 0.
+     *
+     * @param n The number to check.
+     * @param start The start of the range.
+     * @param end The end of the range.
+     * @return Returns true if n is in the range, else false.
+     */
+    (start: number): InRange1x1;
+    /**
+     * Checks if n is between start and up to but not including, end. If end is not specified it’s set to start
+     * with start then set to 0.
+     *
+     * @param n The number to check.
+     * @param start The start of the range.
+     * @param end The end of the range.
+     * @return Returns true if n is in the range, else false.
+     */
+    (start: number, end: number): InRange1x2;
+    /**
+     * Checks if n is between start and up to but not including, end. If end is not specified it’s set to start
+     * with start then set to 0.
+     *
+     * @param n The number to check.
+     * @param start The start of the range.
+     * @param end The end of the range.
+     * @return Returns true if n is in the range, else false.
+     */
+    (start: number, end: number, n: number): boolean;
+}
+interface InRange1x1 {
+    /**
+     * Checks if n is between start and up to but not including, end. If end is not specified it’s set to start
+     * with start then set to 0.
+     *
+     * @param n The number to check.
+     * @param start The start of the range.
+     * @param end The end of the range.
+     * @return Returns true if n is in the range, else false.
+     */
+    (): InRange1x1;
+    /**
+     * Checks if n is between start and up to but not including, end. If end is not specified it’s set to start
+     * with start then set to 0.
+     *
+     * @param n The number to check.
+     * @param start The start of the range.
+     * @param end The end of the range.
+     * @return Returns true if n is in the range, else false.
+     */
+    (end: number): InRange1x2;
+    /**
+     * Checks if n is between start and up to but not including, end. If end is not specified it’s set to start
+     * with start then set to 0.
+     *
+     * @param n The number to check.
+     * @param start The start of the range.
+     * @param end The end of the range.
+     * @return Returns true if n is in the range, else false.
+     */
+    (end: number, n: number): boolean;
+}
+interface InRange1x2 {
+    /**
+     * Checks if n is between start and up to but not including, end. If end is not specified it’s set to start
+     * with start then set to 0.
+     *
+     * @param n The number to check.
+     * @param start The start of the range.
+     * @param end The end of the range.
+     * @return Returns true if n is in the range, else false.
+     */
+    (): InRange1x2;
+    /**
+     * Checks if n is between start and up to but not including, end. If end is not specified it’s set to start
+     * with start then set to 0.
+     *
+     * @param n The number to check.
+     * @param start The start of the range.
+     * @param end The end of the range.
+     * @return Returns true if n is in the range, else false.
+     */
+    (n: number): boolean;
+}
+
+declare const inRange: InRange;
+export = inRange;
diff --git a/types/lodash/fp/includes.d.ts b/types/lodash/fp/includes.d.ts
new file mode 100644
index 0000000000..b498f0e8aa
--- /dev/null
+++ b/types/lodash/fp/includes.d.ts
@@ -0,0 +1,63 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Includes {
+    /**
+     * Checks if target is in collection using SameValueZero for equality comparisons. If fromIndex is negative,
+     * it’s used as the offset from the end of collection.
+     *
+     * @param collection The collection to search.
+     * @param target The value to search for.
+     * @param fromIndex The index to search from.
+     * @return True if the target element is found, else false.
+     */
+    (): Includes;
+    /**
+     * Checks if target is in collection using SameValueZero for equality comparisons. If fromIndex is negative,
+     * it’s used as the offset from the end of collection.
+     *
+     * @param collection The collection to search.
+     * @param target The value to search for.
+     * @param fromIndex The index to search from.
+     * @return True if the target element is found, else false.
+     */
+    <T>(target: T): Includes1x1<T>;
+    /**
+     * Checks if target is in collection using SameValueZero for equality comparisons. If fromIndex is negative,
+     * it’s used as the offset from the end of collection.
+     *
+     * @param collection The collection to search.
+     * @param target The value to search for.
+     * @param fromIndex The index to search from.
+     * @return True if the target element is found, else false.
+     */
+    <T>(target: T, collection: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): boolean;
+}
+interface Includes1x1<T> {
+    /**
+     * Checks if target is in collection using SameValueZero for equality comparisons. If fromIndex is negative,
+     * it’s used as the offset from the end of collection.
+     *
+     * @param collection The collection to search.
+     * @param target The value to search for.
+     * @param fromIndex The index to search from.
+     * @return True if the target element is found, else false.
+     */
+    (): Includes1x1<T>;
+    /**
+     * Checks if target is in collection using SameValueZero for equality comparisons. If fromIndex is negative,
+     * it’s used as the offset from the end of collection.
+     *
+     * @param collection The collection to search.
+     * @param target The value to search for.
+     * @param fromIndex The index to search from.
+     * @return True if the target element is found, else false.
+     */
+    (collection: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): boolean;
+}
+
+declare const includes: Includes;
+export = includes;
diff --git a/types/lodash/fp/includesFrom.d.ts b/types/lodash/fp/includesFrom.d.ts
new file mode 100644
index 0000000000..45d2f6bab8
--- /dev/null
+++ b/types/lodash/fp/includesFrom.d.ts
@@ -0,0 +1,105 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Includes {
+    /**
+     * Checks if target is in collection using SameValueZero for equality comparisons. If fromIndex is negative,
+     * it’s used as the offset from the end of collection.
+     *
+     * @param collection The collection to search.
+     * @param target The value to search for.
+     * @param fromIndex The index to search from.
+     * @return True if the target element is found, else false.
+     */
+    (): Includes;
+    /**
+     * Checks if target is in collection using SameValueZero for equality comparisons. If fromIndex is negative,
+     * it’s used as the offset from the end of collection.
+     *
+     * @param collection The collection to search.
+     * @param target The value to search for.
+     * @param fromIndex The index to search from.
+     * @return True if the target element is found, else false.
+     */
+    <T>(target: T): Includes1x1<T>;
+    /**
+     * Checks if target is in collection using SameValueZero for equality comparisons. If fromIndex is negative,
+     * it’s used as the offset from the end of collection.
+     *
+     * @param collection The collection to search.
+     * @param target The value to search for.
+     * @param fromIndex The index to search from.
+     * @return True if the target element is found, else false.
+     */
+    <T>(target: T, fromIndex: number): Includes1x2<T>;
+    /**
+     * Checks if target is in collection using SameValueZero for equality comparisons. If fromIndex is negative,
+     * it’s used as the offset from the end of collection.
+     *
+     * @param collection The collection to search.
+     * @param target The value to search for.
+     * @param fromIndex The index to search from.
+     * @return True if the target element is found, else false.
+     */
+    <T>(target: T, fromIndex: number, collection: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): boolean;
+}
+interface Includes1x1<T> {
+    /**
+     * Checks if target is in collection using SameValueZero for equality comparisons. If fromIndex is negative,
+     * it’s used as the offset from the end of collection.
+     *
+     * @param collection The collection to search.
+     * @param target The value to search for.
+     * @param fromIndex The index to search from.
+     * @return True if the target element is found, else false.
+     */
+    (): Includes1x1<T>;
+    /**
+     * Checks if target is in collection using SameValueZero for equality comparisons. If fromIndex is negative,
+     * it’s used as the offset from the end of collection.
+     *
+     * @param collection The collection to search.
+     * @param target The value to search for.
+     * @param fromIndex The index to search from.
+     * @return True if the target element is found, else false.
+     */
+    (fromIndex: number): Includes1x2<T>;
+    /**
+     * Checks if target is in collection using SameValueZero for equality comparisons. If fromIndex is negative,
+     * it’s used as the offset from the end of collection.
+     *
+     * @param collection The collection to search.
+     * @param target The value to search for.
+     * @param fromIndex The index to search from.
+     * @return True if the target element is found, else false.
+     */
+    (fromIndex: number, collection: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): boolean;
+}
+interface Includes1x2<T> {
+    /**
+     * Checks if target is in collection using SameValueZero for equality comparisons. If fromIndex is negative,
+     * it’s used as the offset from the end of collection.
+     *
+     * @param collection The collection to search.
+     * @param target The value to search for.
+     * @param fromIndex The index to search from.
+     * @return True if the target element is found, else false.
+     */
+    (): Includes1x2<T>;
+    /**
+     * Checks if target is in collection using SameValueZero for equality comparisons. If fromIndex is negative,
+     * it’s used as the offset from the end of collection.
+     *
+     * @param collection The collection to search.
+     * @param target The value to search for.
+     * @param fromIndex The index to search from.
+     * @return True if the target element is found, else false.
+     */
+    (collection: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): boolean;
+}
+
+declare const includesFrom: Includes;
+export = includesFrom;
diff --git a/types/lodash/fp/indexBy.d.ts b/types/lodash/fp/indexBy.d.ts
new file mode 100644
index 0000000000..22a9e62a3b
--- /dev/null
+++ b/types/lodash/fp/indexBy.d.ts
@@ -0,0 +1,225 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface KeyBy {
+    /**
+     * Creates an object composed of keys generated from the results of running each element of collection through
+     * iteratee. The corresponding value of each key is the last element responsible for generating the key. The
+     * iteratee function is bound to thisArg and invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the composed aggregate object.
+     */
+    (): KeyBy;
+    /**
+     * Creates an object composed of keys generated from the results of running each element of collection through
+     * iteratee. The corresponding value of each key is the last element responsible for generating the key. The
+     * iteratee function is bound to thisArg and invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the composed aggregate object.
+     */
+    (iteratee: (value: string) => _.PropertyName): KeyBy1x1;
+    /**
+     * Creates an object composed of keys generated from the results of running each element of collection through
+     * iteratee. The corresponding value of each key is the last element responsible for generating the key. The
+     * iteratee function is bound to thisArg and invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the composed aggregate object.
+     */
+    (iteratee: (value: string) => _.PropertyName, collection: string | null | undefined): _.Dictionary<string>;
+    /**
+     * Creates an object composed of keys generated from the results of running each element of collection through
+     * iteratee. The corresponding value of each key is the last element responsible for generating the key. The
+     * iteratee function is bound to thisArg and invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the composed aggregate object.
+     */
+    <T>(iteratee: _.ValueIterateeCustom<T, _.PropertyName>): KeyBy2x1<T>;
+    /**
+     * Creates an object composed of keys generated from the results of running each element of collection through
+     * iteratee. The corresponding value of each key is the last element responsible for generating the key. The
+     * iteratee function is bound to thisArg and invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the composed aggregate object.
+     */
+    <T>(iteratee: _.ValueIterateeCustom<T, _.PropertyName>, collection: _.List<T> | null | undefined): _.Dictionary<T>;
+    /**
+     * Creates an object composed of keys generated from the results of running each element of collection through
+     * iteratee. The corresponding value of each key is the last element responsible for generating the key. The
+     * iteratee function is bound to thisArg and invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the composed aggregate object.
+     */
+    <T extends object>(iteratee: _.ValueIterateeCustom<T[keyof T], _.PropertyName>, collection: T | null | undefined): _.Dictionary<T[keyof T]>;
+}
+interface KeyBy1x1 {
+    /**
+     * Creates an object composed of keys generated from the results of running each element of collection through
+     * iteratee. The corresponding value of each key is the last element responsible for generating the key. The
+     * iteratee function is bound to thisArg and invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the composed aggregate object.
+     */
+    (): KeyBy1x1;
+    /**
+     * Creates an object composed of keys generated from the results of running each element of collection through
+     * iteratee. The corresponding value of each key is the last element responsible for generating the key. The
+     * iteratee function is bound to thisArg and invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the composed aggregate object.
+     */
+    (collection: string | null | undefined): _.Dictionary<string>;
+}
+interface KeyBy2x1<T> {
+    /**
+     * Creates an object composed of keys generated from the results of running each element of collection through
+     * iteratee. The corresponding value of each key is the last element responsible for generating the key. The
+     * iteratee function is bound to thisArg and invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the composed aggregate object.
+     */
+    (): KeyBy2x1<T>;
+    /**
+     * Creates an object composed of keys generated from the results of running each element of collection through
+     * iteratee. The corresponding value of each key is the last element responsible for generating the key. The
+     * iteratee function is bound to thisArg and invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the composed aggregate object.
+     */
+    (collection: _.List<T> | object | null | undefined): _.Dictionary<T>;
+}
+
+declare const indexBy: KeyBy;
+export = indexBy;
diff --git a/types/lodash/fp/indexOf.d.ts b/types/lodash/fp/indexOf.d.ts
new file mode 100644
index 0000000000..71c684508f
--- /dev/null
+++ b/types/lodash/fp/indexOf.d.ts
@@ -0,0 +1,118 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface IndexOf {
+    /**
+     * Gets the index at which the first occurrence of `value` is found in `array`
+     * using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+     * for equality comparisons. If `fromIndex` is negative, it's used as the offset
+     * from the end of `array`.
+     *
+     * @category Array
+     * @param array The array to search.
+     * @param value The value to search for.
+     * @param [fromIndex=0] The index to search from.
+     * @returns Returns the index of the matched value, else `-1`.
+     * @example
+     *
+     * _.indexOf([1, 2, 1, 2], 2);
+     * // => 1
+     *
+     * // using `fromIndex`
+     * _.indexOf([1, 2, 1, 2], 2, 2);
+     * // => 3
+     */
+    (): IndexOf;
+    /**
+     * Gets the index at which the first occurrence of `value` is found in `array`
+     * using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+     * for equality comparisons. If `fromIndex` is negative, it's used as the offset
+     * from the end of `array`.
+     *
+     * @category Array
+     * @param array The array to search.
+     * @param value The value to search for.
+     * @param [fromIndex=0] The index to search from.
+     * @returns Returns the index of the matched value, else `-1`.
+     * @example
+     *
+     * _.indexOf([1, 2, 1, 2], 2);
+     * // => 1
+     *
+     * // using `fromIndex`
+     * _.indexOf([1, 2, 1, 2], 2, 2);
+     * // => 3
+     */
+    <T>(value: T): IndexOf1x1<T>;
+    /**
+     * Gets the index at which the first occurrence of `value` is found in `array`
+     * using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+     * for equality comparisons. If `fromIndex` is negative, it's used as the offset
+     * from the end of `array`.
+     *
+     * @category Array
+     * @param array The array to search.
+     * @param value The value to search for.
+     * @param [fromIndex=0] The index to search from.
+     * @returns Returns the index of the matched value, else `-1`.
+     * @example
+     *
+     * _.indexOf([1, 2, 1, 2], 2);
+     * // => 1
+     *
+     * // using `fromIndex`
+     * _.indexOf([1, 2, 1, 2], 2, 2);
+     * // => 3
+     */
+    <T>(value: T, array: _.List<T> | null | undefined): number;
+}
+interface IndexOf1x1<T> {
+    /**
+     * Gets the index at which the first occurrence of `value` is found in `array`
+     * using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+     * for equality comparisons. If `fromIndex` is negative, it's used as the offset
+     * from the end of `array`.
+     *
+     * @category Array
+     * @param array The array to search.
+     * @param value The value to search for.
+     * @param [fromIndex=0] The index to search from.
+     * @returns Returns the index of the matched value, else `-1`.
+     * @example
+     *
+     * _.indexOf([1, 2, 1, 2], 2);
+     * // => 1
+     *
+     * // using `fromIndex`
+     * _.indexOf([1, 2, 1, 2], 2, 2);
+     * // => 3
+     */
+    (): IndexOf1x1<T>;
+    /**
+     * Gets the index at which the first occurrence of `value` is found in `array`
+     * using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+     * for equality comparisons. If `fromIndex` is negative, it's used as the offset
+     * from the end of `array`.
+     *
+     * @category Array
+     * @param array The array to search.
+     * @param value The value to search for.
+     * @param [fromIndex=0] The index to search from.
+     * @returns Returns the index of the matched value, else `-1`.
+     * @example
+     *
+     * _.indexOf([1, 2, 1, 2], 2);
+     * // => 1
+     *
+     * // using `fromIndex`
+     * _.indexOf([1, 2, 1, 2], 2, 2);
+     * // => 3
+     */
+    (array: _.List<T> | null | undefined): number;
+}
+
+declare const indexOf: IndexOf;
+export = indexOf;
diff --git a/types/lodash/fp/indexOfFrom.d.ts b/types/lodash/fp/indexOfFrom.d.ts
new file mode 100644
index 0000000000..22c8315ae5
--- /dev/null
+++ b/types/lodash/fp/indexOfFrom.d.ts
@@ -0,0 +1,204 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface IndexOf {
+    /**
+     * Gets the index at which the first occurrence of `value` is found in `array`
+     * using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+     * for equality comparisons. If `fromIndex` is negative, it's used as the offset
+     * from the end of `array`.
+     *
+     * @category Array
+     * @param array The array to search.
+     * @param value The value to search for.
+     * @param [fromIndex=0] The index to search from.
+     * @returns Returns the index of the matched value, else `-1`.
+     * @example
+     *
+     * _.indexOf([1, 2, 1, 2], 2);
+     * // => 1
+     *
+     * // using `fromIndex`
+     * _.indexOf([1, 2, 1, 2], 2, 2);
+     * // => 3
+     */
+    (): IndexOf;
+    /**
+     * Gets the index at which the first occurrence of `value` is found in `array`
+     * using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+     * for equality comparisons. If `fromIndex` is negative, it's used as the offset
+     * from the end of `array`.
+     *
+     * @category Array
+     * @param array The array to search.
+     * @param value The value to search for.
+     * @param [fromIndex=0] The index to search from.
+     * @returns Returns the index of the matched value, else `-1`.
+     * @example
+     *
+     * _.indexOf([1, 2, 1, 2], 2);
+     * // => 1
+     *
+     * // using `fromIndex`
+     * _.indexOf([1, 2, 1, 2], 2, 2);
+     * // => 3
+     */
+    <T>(value: T): IndexOf1x1<T>;
+    /**
+     * Gets the index at which the first occurrence of `value` is found in `array`
+     * using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+     * for equality comparisons. If `fromIndex` is negative, it's used as the offset
+     * from the end of `array`.
+     *
+     * @category Array
+     * @param array The array to search.
+     * @param value The value to search for.
+     * @param [fromIndex=0] The index to search from.
+     * @returns Returns the index of the matched value, else `-1`.
+     * @example
+     *
+     * _.indexOf([1, 2, 1, 2], 2);
+     * // => 1
+     *
+     * // using `fromIndex`
+     * _.indexOf([1, 2, 1, 2], 2, 2);
+     * // => 3
+     */
+    <T>(value: T, fromIndex: number): IndexOf1x2<T>;
+    /**
+     * Gets the index at which the first occurrence of `value` is found in `array`
+     * using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+     * for equality comparisons. If `fromIndex` is negative, it's used as the offset
+     * from the end of `array`.
+     *
+     * @category Array
+     * @param array The array to search.
+     * @param value The value to search for.
+     * @param [fromIndex=0] The index to search from.
+     * @returns Returns the index of the matched value, else `-1`.
+     * @example
+     *
+     * _.indexOf([1, 2, 1, 2], 2);
+     * // => 1
+     *
+     * // using `fromIndex`
+     * _.indexOf([1, 2, 1, 2], 2, 2);
+     * // => 3
+     */
+    <T>(value: T, fromIndex: number, array: _.List<T> | null | undefined): number;
+}
+interface IndexOf1x1<T> {
+    /**
+     * Gets the index at which the first occurrence of `value` is found in `array`
+     * using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+     * for equality comparisons. If `fromIndex` is negative, it's used as the offset
+     * from the end of `array`.
+     *
+     * @category Array
+     * @param array The array to search.
+     * @param value The value to search for.
+     * @param [fromIndex=0] The index to search from.
+     * @returns Returns the index of the matched value, else `-1`.
+     * @example
+     *
+     * _.indexOf([1, 2, 1, 2], 2);
+     * // => 1
+     *
+     * // using `fromIndex`
+     * _.indexOf([1, 2, 1, 2], 2, 2);
+     * // => 3
+     */
+    (): IndexOf1x1<T>;
+    /**
+     * Gets the index at which the first occurrence of `value` is found in `array`
+     * using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+     * for equality comparisons. If `fromIndex` is negative, it's used as the offset
+     * from the end of `array`.
+     *
+     * @category Array
+     * @param array The array to search.
+     * @param value The value to search for.
+     * @param [fromIndex=0] The index to search from.
+     * @returns Returns the index of the matched value, else `-1`.
+     * @example
+     *
+     * _.indexOf([1, 2, 1, 2], 2);
+     * // => 1
+     *
+     * // using `fromIndex`
+     * _.indexOf([1, 2, 1, 2], 2, 2);
+     * // => 3
+     */
+    (fromIndex: number): IndexOf1x2<T>;
+    /**
+     * Gets the index at which the first occurrence of `value` is found in `array`
+     * using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+     * for equality comparisons. If `fromIndex` is negative, it's used as the offset
+     * from the end of `array`.
+     *
+     * @category Array
+     * @param array The array to search.
+     * @param value The value to search for.
+     * @param [fromIndex=0] The index to search from.
+     * @returns Returns the index of the matched value, else `-1`.
+     * @example
+     *
+     * _.indexOf([1, 2, 1, 2], 2);
+     * // => 1
+     *
+     * // using `fromIndex`
+     * _.indexOf([1, 2, 1, 2], 2, 2);
+     * // => 3
+     */
+    (fromIndex: number, array: _.List<T> | null | undefined): number;
+}
+interface IndexOf1x2<T> {
+    /**
+     * Gets the index at which the first occurrence of `value` is found in `array`
+     * using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+     * for equality comparisons. If `fromIndex` is negative, it's used as the offset
+     * from the end of `array`.
+     *
+     * @category Array
+     * @param array The array to search.
+     * @param value The value to search for.
+     * @param [fromIndex=0] The index to search from.
+     * @returns Returns the index of the matched value, else `-1`.
+     * @example
+     *
+     * _.indexOf([1, 2, 1, 2], 2);
+     * // => 1
+     *
+     * // using `fromIndex`
+     * _.indexOf([1, 2, 1, 2], 2, 2);
+     * // => 3
+     */
+    (): IndexOf1x2<T>;
+    /**
+     * Gets the index at which the first occurrence of `value` is found in `array`
+     * using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+     * for equality comparisons. If `fromIndex` is negative, it's used as the offset
+     * from the end of `array`.
+     *
+     * @category Array
+     * @param array The array to search.
+     * @param value The value to search for.
+     * @param [fromIndex=0] The index to search from.
+     * @returns Returns the index of the matched value, else `-1`.
+     * @example
+     *
+     * _.indexOf([1, 2, 1, 2], 2);
+     * // => 1
+     *
+     * // using `fromIndex`
+     * _.indexOf([1, 2, 1, 2], 2, 2);
+     * // => 3
+     */
+    (array: _.List<T> | null | undefined): number;
+}
+
+declare const indexOfFrom: IndexOf;
+export = indexOfFrom;
diff --git a/types/lodash/fp/init.d.ts b/types/lodash/fp/init.d.ts
new file mode 100644
index 0000000000..3c22717976
--- /dev/null
+++ b/types/lodash/fp/init.d.ts
@@ -0,0 +1,17 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+type Initial =
+    /**
+     * Gets all but the last element of array.
+     *
+     * @param array The array to query.
+     * @return Returns the slice of array.
+     */
+    <T>(array: _.List<T> | null | undefined) => T[];
+
+declare const init: Initial;
+export = init;
diff --git a/types/lodash/fp/initial.d.ts b/types/lodash/fp/initial.d.ts
new file mode 100644
index 0000000000..e4d10ae946
--- /dev/null
+++ b/types/lodash/fp/initial.d.ts
@@ -0,0 +1,17 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+type Initial =
+    /**
+     * Gets all but the last element of array.
+     *
+     * @param array The array to query.
+     * @return Returns the slice of array.
+     */
+    <T>(array: _.List<T> | null | undefined) => T[];
+
+declare const initial: Initial;
+export = initial;
diff --git a/types/lodash/fp/intersection.d.ts b/types/lodash/fp/intersection.d.ts
new file mode 100644
index 0000000000..ad290ebd3e
--- /dev/null
+++ b/types/lodash/fp/intersection.d.ts
@@ -0,0 +1,53 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Intersection {
+    /**
+     * Creates an array of unique values that are included in all of the provided arrays using SameValueZero for
+     * equality comparisons.
+     *
+     * @param arrays The arrays to inspect.
+     * @return Returns the new array of shared values.
+     */
+    (): Intersection;
+    /**
+     * Creates an array of unique values that are included in all of the provided arrays using SameValueZero for
+     * equality comparisons.
+     *
+     * @param arrays The arrays to inspect.
+     * @return Returns the new array of shared values.
+     */
+    <T>(arrays2: _.List<T>): Intersection1x1<T>;
+    /**
+     * Creates an array of unique values that are included in all of the provided arrays using SameValueZero for
+     * equality comparisons.
+     *
+     * @param arrays The arrays to inspect.
+     * @return Returns the new array of shared values.
+     */
+    <T>(arrays2: _.List<T>, arrays: _.List<T>): T[];
+}
+interface Intersection1x1<T> {
+    /**
+     * Creates an array of unique values that are included in all of the provided arrays using SameValueZero for
+     * equality comparisons.
+     *
+     * @param arrays The arrays to inspect.
+     * @return Returns the new array of shared values.
+     */
+    (): Intersection1x1<T>;
+    /**
+     * Creates an array of unique values that are included in all of the provided arrays using SameValueZero for
+     * equality comparisons.
+     *
+     * @param arrays The arrays to inspect.
+     * @return Returns the new array of shared values.
+     */
+    (arrays: _.List<T>): T[];
+}
+
+declare const intersection: Intersection;
+export = intersection;
diff --git a/types/lodash/fp/intersectionBy.d.ts b/types/lodash/fp/intersectionBy.d.ts
new file mode 100644
index 0000000000..6b94ad98f7
--- /dev/null
+++ b/types/lodash/fp/intersectionBy.d.ts
@@ -0,0 +1,186 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface IntersectionBy {
+    /**
+     * This method is like `_.intersection` except that it accepts `iteratee`
+     * which is invoked for each element of each `arrays` to generate the criterion
+     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the new array of shared values.
+     * @example
+     *
+     * _.intersectionBy([2.1, 1.2], [4.3, 2.4], Math.floor);
+     * // => [2.1]
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.intersectionBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
+     * // => [{ 'x': 1 }]
+     */
+    (): IntersectionBy;
+    /**
+     * This method is like `_.intersection` except that it accepts `iteratee`
+     * which is invoked for each element of each `arrays` to generate the criterion
+     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the new array of shared values.
+     * @example
+     *
+     * _.intersectionBy([2.1, 1.2], [4.3, 2.4], Math.floor);
+     * // => [2.1]
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.intersectionBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
+     * // => [{ 'x': 1 }]
+     */
+    <T1, T2>(iteratee: _.ValueIteratee<T1 | T2>): IntersectionBy1x1<T1, T2>;
+    /**
+     * This method is like `_.intersection` except that it accepts `iteratee`
+     * which is invoked for each element of each `arrays` to generate the criterion
+     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the new array of shared values.
+     * @example
+     *
+     * _.intersectionBy([2.1, 1.2], [4.3, 2.4], Math.floor);
+     * // => [2.1]
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.intersectionBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
+     * // => [{ 'x': 1 }]
+     */
+    <T1, T2>(iteratee: _.ValueIteratee<T1 | T2>, array: _.List<T1> | null): IntersectionBy1x2<T1, T2>;
+    /**
+     * This method is like `_.intersection` except that it accepts `iteratee`
+     * which is invoked for each element of each `arrays` to generate the criterion
+     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the new array of shared values.
+     * @example
+     *
+     * _.intersectionBy([2.1, 1.2], [4.3, 2.4], Math.floor);
+     * // => [2.1]
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.intersectionBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
+     * // => [{ 'x': 1 }]
+     */
+    <T1, T2>(iteratee: _.ValueIteratee<T1 | T2>, array: _.List<T1> | null, values: _.List<T2>): T1[];
+}
+interface IntersectionBy1x1<T1, T2> {
+    /**
+     * This method is like `_.intersection` except that it accepts `iteratee`
+     * which is invoked for each element of each `arrays` to generate the criterion
+     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the new array of shared values.
+     * @example
+     *
+     * _.intersectionBy([2.1, 1.2], [4.3, 2.4], Math.floor);
+     * // => [2.1]
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.intersectionBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
+     * // => [{ 'x': 1 }]
+     */
+    (): IntersectionBy1x1<T1, T2>;
+    /**
+     * This method is like `_.intersection` except that it accepts `iteratee`
+     * which is invoked for each element of each `arrays` to generate the criterion
+     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the new array of shared values.
+     * @example
+     *
+     * _.intersectionBy([2.1, 1.2], [4.3, 2.4], Math.floor);
+     * // => [2.1]
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.intersectionBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
+     * // => [{ 'x': 1 }]
+     */
+    (array: _.List<T1> | null): IntersectionBy1x2<T1, T2>;
+    /**
+     * This method is like `_.intersection` except that it accepts `iteratee`
+     * which is invoked for each element of each `arrays` to generate the criterion
+     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the new array of shared values.
+     * @example
+     *
+     * _.intersectionBy([2.1, 1.2], [4.3, 2.4], Math.floor);
+     * // => [2.1]
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.intersectionBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
+     * // => [{ 'x': 1 }]
+     */
+    (array: _.List<T1> | null, values: _.List<T2>): T1[];
+}
+interface IntersectionBy1x2<T1, T2> {
+    /**
+     * This method is like `_.intersection` except that it accepts `iteratee`
+     * which is invoked for each element of each `arrays` to generate the criterion
+     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the new array of shared values.
+     * @example
+     *
+     * _.intersectionBy([2.1, 1.2], [4.3, 2.4], Math.floor);
+     * // => [2.1]
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.intersectionBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
+     * // => [{ 'x': 1 }]
+     */
+    (): IntersectionBy1x2<T1, T2>;
+    /**
+     * This method is like `_.intersection` except that it accepts `iteratee`
+     * which is invoked for each element of each `arrays` to generate the criterion
+     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the new array of shared values.
+     * @example
+     *
+     * _.intersectionBy([2.1, 1.2], [4.3, 2.4], Math.floor);
+     * // => [2.1]
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.intersectionBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
+     * // => [{ 'x': 1 }]
+     */
+    (values: _.List<T2>): T1[];
+}
+
+declare const intersectionBy: IntersectionBy;
+export = intersectionBy;
diff --git a/types/lodash/fp/intersectionWith.d.ts b/types/lodash/fp/intersectionWith.d.ts
new file mode 100644
index 0000000000..275d2fb3a9
--- /dev/null
+++ b/types/lodash/fp/intersectionWith.d.ts
@@ -0,0 +1,177 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface IntersectionWith {
+    /**
+     * Creates an array of unique `array` values not included in the other
+     * provided arrays using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+     * for equality comparisons.
+     *
+     * @category Array
+     * @param [values] The arrays to inspect.
+     * @param [comparator] The comparator invoked per element.
+     * @returns Returns the new array of filtered values.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
+
+     * _.intersectionWith(objects, others, _.isEqual);
+     * // => [{ 'x': 1, 'y': 2 }]
+     */
+    (): IntersectionWith;
+    /**
+     * Creates an array of unique `array` values not included in the other
+     * provided arrays using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+     * for equality comparisons.
+     *
+     * @category Array
+     * @param [values] The arrays to inspect.
+     * @param [comparator] The comparator invoked per element.
+     * @returns Returns the new array of filtered values.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
+
+     * _.intersectionWith(objects, others, _.isEqual);
+     * // => [{ 'x': 1, 'y': 2 }]
+     */
+    <T1, T2>(comparator: _.Comparator2<T1, T2>): IntersectionWith1x1<T1, T2>;
+    /**
+     * Creates an array of unique `array` values not included in the other
+     * provided arrays using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+     * for equality comparisons.
+     *
+     * @category Array
+     * @param [values] The arrays to inspect.
+     * @param [comparator] The comparator invoked per element.
+     * @returns Returns the new array of filtered values.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
+
+     * _.intersectionWith(objects, others, _.isEqual);
+     * // => [{ 'x': 1, 'y': 2 }]
+     */
+    <T1, T2>(comparator: _.Comparator2<T1, T2>, array: _.List<T1> | null | undefined): IntersectionWith1x2<T1, T2>;
+    /**
+     * Creates an array of unique `array` values not included in the other
+     * provided arrays using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+     * for equality comparisons.
+     *
+     * @category Array
+     * @param [values] The arrays to inspect.
+     * @param [comparator] The comparator invoked per element.
+     * @returns Returns the new array of filtered values.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
+
+     * _.intersectionWith(objects, others, _.isEqual);
+     * // => [{ 'x': 1, 'y': 2 }]
+     */
+    <T1, T2>(comparator: _.Comparator2<T1, T2>, array: _.List<T1> | null | undefined, values: _.List<T2>): T1[];
+}
+interface IntersectionWith1x1<T1, T2> {
+    /**
+     * Creates an array of unique `array` values not included in the other
+     * provided arrays using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+     * for equality comparisons.
+     *
+     * @category Array
+     * @param [values] The arrays to inspect.
+     * @param [comparator] The comparator invoked per element.
+     * @returns Returns the new array of filtered values.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
+
+     * _.intersectionWith(objects, others, _.isEqual);
+     * // => [{ 'x': 1, 'y': 2 }]
+     */
+    (): IntersectionWith1x1<T1, T2>;
+    /**
+     * Creates an array of unique `array` values not included in the other
+     * provided arrays using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+     * for equality comparisons.
+     *
+     * @category Array
+     * @param [values] The arrays to inspect.
+     * @param [comparator] The comparator invoked per element.
+     * @returns Returns the new array of filtered values.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
+
+     * _.intersectionWith(objects, others, _.isEqual);
+     * // => [{ 'x': 1, 'y': 2 }]
+     */
+    (array: _.List<T1> | null | undefined): IntersectionWith1x2<T1, T2>;
+    /**
+     * Creates an array of unique `array` values not included in the other
+     * provided arrays using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+     * for equality comparisons.
+     *
+     * @category Array
+     * @param [values] The arrays to inspect.
+     * @param [comparator] The comparator invoked per element.
+     * @returns Returns the new array of filtered values.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
+
+     * _.intersectionWith(objects, others, _.isEqual);
+     * // => [{ 'x': 1, 'y': 2 }]
+     */
+    (array: _.List<T1> | null | undefined, values: _.List<T2>): T1[];
+}
+interface IntersectionWith1x2<T1, T2> {
+    /**
+     * Creates an array of unique `array` values not included in the other
+     * provided arrays using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+     * for equality comparisons.
+     *
+     * @category Array
+     * @param [values] The arrays to inspect.
+     * @param [comparator] The comparator invoked per element.
+     * @returns Returns the new array of filtered values.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
+
+     * _.intersectionWith(objects, others, _.isEqual);
+     * // => [{ 'x': 1, 'y': 2 }]
+     */
+    (): IntersectionWith1x2<T1, T2>;
+    /**
+     * Creates an array of unique `array` values not included in the other
+     * provided arrays using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+     * for equality comparisons.
+     *
+     * @category Array
+     * @param [values] The arrays to inspect.
+     * @param [comparator] The comparator invoked per element.
+     * @returns Returns the new array of filtered values.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
+
+     * _.intersectionWith(objects, others, _.isEqual);
+     * // => [{ 'x': 1, 'y': 2 }]
+     */
+    (values: _.List<T2>): T1[];
+}
+
+declare const intersectionWith: IntersectionWith;
+export = intersectionWith;
diff --git a/types/lodash/fp/invert.d.ts b/types/lodash/fp/invert.d.ts
new file mode 100644
index 0000000000..fa6e62340e
--- /dev/null
+++ b/types/lodash/fp/invert.d.ts
@@ -0,0 +1,19 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+type Invert =
+    /**
+     * Creates an object composed of the inverted keys and values of object. If object contains duplicate values,
+     * subsequent values overwrite property assignments of previous values unless multiValue is true.
+     *
+     * @param object The object to invert.
+     * @param multiValue Allow multiple values per key.
+     * @return Returns the new inverted object.
+     */
+    (object: object) => _.Dictionary<string>;
+
+declare const invert: Invert;
+export = invert;
diff --git a/types/lodash/fp/invertBy.d.ts b/types/lodash/fp/invertBy.d.ts
new file mode 100644
index 0000000000..5a386385ae
--- /dev/null
+++ b/types/lodash/fp/invertBy.d.ts
@@ -0,0 +1,73 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface InvertBy {
+    /**
+     * This method is like _.invert except that the inverted object is generated from the results of running each
+     * element of object through iteratee. The corresponding inverted value of each inverted key is an array of
+     * keys responsible for generating the inverted value. The iteratee is invoked with one argument: (value).
+     *
+     * @param object The object to invert.
+     * @param interatee The iteratee invoked per element.
+     * @return Returns the new inverted object.
+     */
+    (): InvertBy;
+    /**
+     * This method is like _.invert except that the inverted object is generated from the results of running each
+     * element of object through iteratee. The corresponding inverted value of each inverted key is an array of
+     * keys responsible for generating the inverted value. The iteratee is invoked with one argument: (value).
+     *
+     * @param object The object to invert.
+     * @param interatee The iteratee invoked per element.
+     * @return Returns the new inverted object.
+     */
+    <T>(interatee: _.ValueIteratee<T>): InvertBy1x1<T>;
+    /**
+     * This method is like _.invert except that the inverted object is generated from the results of running each
+     * element of object through iteratee. The corresponding inverted value of each inverted key is an array of
+     * keys responsible for generating the inverted value. The iteratee is invoked with one argument: (value).
+     *
+     * @param object The object to invert.
+     * @param interatee The iteratee invoked per element.
+     * @return Returns the new inverted object.
+     */
+    <T>(interatee: _.ValueIteratee<T>, object: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): _.Dictionary<string[]>;
+    /**
+     * This method is like _.invert except that the inverted object is generated from the results of running each
+     * element of object through iteratee. The corresponding inverted value of each inverted key is an array of
+     * keys responsible for generating the inverted value. The iteratee is invoked with one argument: (value).
+     *
+     * @param object The object to invert.
+     * @param interatee The iteratee invoked per element.
+     * @return Returns the new inverted object.
+     */
+    <T extends object>(interatee: _.ValueIteratee<T[keyof T]>, object: T | null | undefined): _.Dictionary<string[]>;
+}
+interface InvertBy1x1<T> {
+    /**
+     * This method is like _.invert except that the inverted object is generated from the results of running each
+     * element of object through iteratee. The corresponding inverted value of each inverted key is an array of
+     * keys responsible for generating the inverted value. The iteratee is invoked with one argument: (value).
+     *
+     * @param object The object to invert.
+     * @param interatee The iteratee invoked per element.
+     * @return Returns the new inverted object.
+     */
+    (): InvertBy1x1<T>;
+    /**
+     * This method is like _.invert except that the inverted object is generated from the results of running each
+     * element of object through iteratee. The corresponding inverted value of each inverted key is an array of
+     * keys responsible for generating the inverted value. The iteratee is invoked with one argument: (value).
+     *
+     * @param object The object to invert.
+     * @param interatee The iteratee invoked per element.
+     * @return Returns the new inverted object.
+     */
+    (object: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | object | null | undefined): _.Dictionary<string[]>;
+}
+
+declare const invertBy: InvertBy;
+export = invertBy;
diff --git a/types/lodash/fp/invertObj.d.ts b/types/lodash/fp/invertObj.d.ts
new file mode 100644
index 0000000000..aeeb28ca48
--- /dev/null
+++ b/types/lodash/fp/invertObj.d.ts
@@ -0,0 +1,19 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+type Invert =
+    /**
+     * Creates an object composed of the inverted keys and values of object. If object contains duplicate values,
+     * subsequent values overwrite property assignments of previous values unless multiValue is true.
+     *
+     * @param object The object to invert.
+     * @param multiValue Allow multiple values per key.
+     * @return Returns the new inverted object.
+     */
+    (object: object) => _.Dictionary<string>;
+
+declare const invertObj: Invert;
+export = invertObj;
diff --git a/types/lodash/fp/invoke.d.ts b/types/lodash/fp/invoke.d.ts
new file mode 100644
index 0000000000..9a72390f8e
--- /dev/null
+++ b/types/lodash/fp/invoke.d.ts
@@ -0,0 +1,48 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Invoke {
+    /**
+    * Invokes the method at path of object.
+    * @param object The object to query.
+    * @param path The path of the method to invoke.
+    * @param args The arguments to invoke the method with.
+    **/
+    (): Invoke;
+    /**
+    * Invokes the method at path of object.
+    * @param object The object to query.
+    * @param path The path of the method to invoke.
+    * @param args The arguments to invoke the method with.
+    **/
+    (path: _.PropertyPath): Invoke1x1;
+    /**
+    * Invokes the method at path of object.
+    * @param object The object to query.
+    * @param path The path of the method to invoke.
+    * @param args The arguments to invoke the method with.
+    **/
+    (path: _.PropertyPath, object: any): any;
+}
+interface Invoke1x1 {
+    /**
+    * Invokes the method at path of object.
+    * @param object The object to query.
+    * @param path The path of the method to invoke.
+    * @param args The arguments to invoke the method with.
+    **/
+    (): Invoke1x1;
+    /**
+    * Invokes the method at path of object.
+    * @param object The object to query.
+    * @param path The path of the method to invoke.
+    * @param args The arguments to invoke the method with.
+    **/
+    (object: any): any;
+}
+
+declare const invoke: Invoke;
+export = invoke;
diff --git a/types/lodash/fp/invokeArgs.d.ts b/types/lodash/fp/invokeArgs.d.ts
new file mode 100644
index 0000000000..5c385579fd
--- /dev/null
+++ b/types/lodash/fp/invokeArgs.d.ts
@@ -0,0 +1,78 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Invoke {
+    /**
+    * Invokes the method at path of object.
+    * @param object The object to query.
+    * @param path The path of the method to invoke.
+    * @param args The arguments to invoke the method with.
+    **/
+    (): Invoke;
+    /**
+    * Invokes the method at path of object.
+    * @param object The object to query.
+    * @param path The path of the method to invoke.
+    * @param args The arguments to invoke the method with.
+    **/
+    (path: _.PropertyPath): Invoke1x1;
+    /**
+    * Invokes the method at path of object.
+    * @param object The object to query.
+    * @param path The path of the method to invoke.
+    * @param args The arguments to invoke the method with.
+    **/
+    (path: _.PropertyPath, args: ReadonlyArray<any>): Invoke1x2;
+    /**
+    * Invokes the method at path of object.
+    * @param object The object to query.
+    * @param path The path of the method to invoke.
+    * @param args The arguments to invoke the method with.
+    **/
+    (path: _.PropertyPath, args: ReadonlyArray<any>, object: any): any;
+}
+interface Invoke1x1 {
+    /**
+    * Invokes the method at path of object.
+    * @param object The object to query.
+    * @param path The path of the method to invoke.
+    * @param args The arguments to invoke the method with.
+    **/
+    (): Invoke1x1;
+    /**
+    * Invokes the method at path of object.
+    * @param object The object to query.
+    * @param path The path of the method to invoke.
+    * @param args The arguments to invoke the method with.
+    **/
+    (args: ReadonlyArray<any>): Invoke1x2;
+    /**
+    * Invokes the method at path of object.
+    * @param object The object to query.
+    * @param path The path of the method to invoke.
+    * @param args The arguments to invoke the method with.
+    **/
+    (args: ReadonlyArray<any>, object: any): any;
+}
+interface Invoke1x2 {
+    /**
+    * Invokes the method at path of object.
+    * @param object The object to query.
+    * @param path The path of the method to invoke.
+    * @param args The arguments to invoke the method with.
+    **/
+    (): Invoke1x2;
+    /**
+    * Invokes the method at path of object.
+    * @param object The object to query.
+    * @param path The path of the method to invoke.
+    * @param args The arguments to invoke the method with.
+    **/
+    (object: any): any;
+}
+
+declare const invokeArgs: Invoke;
+export = invokeArgs;
diff --git a/types/lodash/fp/invokeArgsMap.d.ts b/types/lodash/fp/invokeArgsMap.d.ts
new file mode 100644
index 0000000000..59e6170594
--- /dev/null
+++ b/types/lodash/fp/invokeArgsMap.d.ts
@@ -0,0 +1,187 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface InvokeMap {
+    /**
+    * Invokes the method named by methodName on each element in the collection returning
+    * an array of the results of each invoked method. Additional arguments will be provided
+    * to each invoked method. If methodName is a function it will be invoked for, and this
+    * bound to, each element in the collection.
+    * @param collection The collection to iterate over.
+    * @param methodName The name of the method to invoke.
+    * @param args Arguments to invoke the method with.
+    **/
+    (): InvokeMap;
+    /**
+    * Invokes the method named by methodName on each element in the collection returning
+    * an array of the results of each invoked method. Additional arguments will be provided
+    * to each invoked method. If methodName is a function it will be invoked for, and this
+    * bound to, each element in the collection.
+    * @param collection The collection to iterate over.
+    * @param methodName The name of the method to invoke.
+    * @param args Arguments to invoke the method with.
+    **/
+    (methodName: string): InvokeMap1x1;
+    /**
+    * Invokes the method named by methodName on each element in the collection returning
+    * an array of the results of each invoked method. Additional arguments will be provided
+    * to each invoked method. If methodName is a function it will be invoked for, and this
+    * bound to, each element in the collection.
+    * @param collection The collection to iterate over.
+    * @param methodName The name of the method to invoke.
+    * @param args Arguments to invoke the method with.
+    **/
+    (methodName: string, args: ReadonlyArray<any>): InvokeMap1x2;
+    /**
+    * Invokes the method named by methodName on each element in the collection returning
+    * an array of the results of each invoked method. Additional arguments will be provided
+    * to each invoked method. If methodName is a function it will be invoked for, and this
+    * bound to, each element in the collection.
+    * @param collection The collection to iterate over.
+    * @param methodName The name of the method to invoke.
+    * @param args Arguments to invoke the method with.
+    **/
+    (methodName: string, args: ReadonlyArray<any>, collection: object | null | undefined): any[];
+    /**
+    * Invokes the method named by methodName on each element in the collection returning
+    * an array of the results of each invoked method. Additional arguments will be provided
+    * to each invoked method. If methodName is a function it will be invoked for, and this
+    * bound to, each element in the collection.
+    * @param collection The collection to iterate over.
+    * @param methodName The name of the method to invoke.
+    * @param args Arguments to invoke the method with.
+    **/
+    <TResult>(method: (...args: any[]) => TResult): InvokeMap2x1<TResult>;
+    /**
+    * Invokes the method named by methodName on each element in the collection returning
+    * an array of the results of each invoked method. Additional arguments will be provided
+    * to each invoked method. If methodName is a function it will be invoked for, and this
+    * bound to, each element in the collection.
+    * @param collection The collection to iterate over.
+    * @param methodName The name of the method to invoke.
+    * @param args Arguments to invoke the method with.
+    **/
+    <TResult>(method: (...args: any[]) => TResult, args: ReadonlyArray<any>): InvokeMap2x2<TResult>;
+    /**
+    * Invokes the method named by methodName on each element in the collection returning
+    * an array of the results of each invoked method. Additional arguments will be provided
+    * to each invoked method. If methodName is a function it will be invoked for, and this
+    * bound to, each element in the collection.
+    * @param collection The collection to iterate over.
+    * @param methodName The name of the method to invoke.
+    * @param args Arguments to invoke the method with.
+    **/
+    <TResult>(method: (...args: any[]) => TResult, args: ReadonlyArray<any>, collection: object | null | undefined): TResult[];
+}
+interface InvokeMap1x1 {
+    /**
+    * Invokes the method named by methodName on each element in the collection returning
+    * an array of the results of each invoked method. Additional arguments will be provided
+    * to each invoked method. If methodName is a function it will be invoked for, and this
+    * bound to, each element in the collection.
+    * @param collection The collection to iterate over.
+    * @param methodName The name of the method to invoke.
+    * @param args Arguments to invoke the method with.
+    **/
+    (): InvokeMap1x1;
+    /**
+    * Invokes the method named by methodName on each element in the collection returning
+    * an array of the results of each invoked method. Additional arguments will be provided
+    * to each invoked method. If methodName is a function it will be invoked for, and this
+    * bound to, each element in the collection.
+    * @param collection The collection to iterate over.
+    * @param methodName The name of the method to invoke.
+    * @param args Arguments to invoke the method with.
+    **/
+    (args: ReadonlyArray<any>): InvokeMap1x2;
+    /**
+    * Invokes the method named by methodName on each element in the collection returning
+    * an array of the results of each invoked method. Additional arguments will be provided
+    * to each invoked method. If methodName is a function it will be invoked for, and this
+    * bound to, each element in the collection.
+    * @param collection The collection to iterate over.
+    * @param methodName The name of the method to invoke.
+    * @param args Arguments to invoke the method with.
+    **/
+    (args: ReadonlyArray<any>, collection: object | null | undefined): any[];
+}
+interface InvokeMap1x2 {
+    /**
+    * Invokes the method named by methodName on each element in the collection returning
+    * an array of the results of each invoked method. Additional arguments will be provided
+    * to each invoked method. If methodName is a function it will be invoked for, and this
+    * bound to, each element in the collection.
+    * @param collection The collection to iterate over.
+    * @param methodName The name of the method to invoke.
+    * @param args Arguments to invoke the method with.
+    **/
+    (): InvokeMap1x2;
+    /**
+    * Invokes the method named by methodName on each element in the collection returning
+    * an array of the results of each invoked method. Additional arguments will be provided
+    * to each invoked method. If methodName is a function it will be invoked for, and this
+    * bound to, each element in the collection.
+    * @param collection The collection to iterate over.
+    * @param methodName The name of the method to invoke.
+    * @param args Arguments to invoke the method with.
+    **/
+    (collection: object | null | undefined): any[];
+}
+interface InvokeMap2x1<TResult> {
+    /**
+    * Invokes the method named by methodName on each element in the collection returning
+    * an array of the results of each invoked method. Additional arguments will be provided
+    * to each invoked method. If methodName is a function it will be invoked for, and this
+    * bound to, each element in the collection.
+    * @param collection The collection to iterate over.
+    * @param methodName The name of the method to invoke.
+    * @param args Arguments to invoke the method with.
+    **/
+    (): InvokeMap2x1<TResult>;
+    /**
+    * Invokes the method named by methodName on each element in the collection returning
+    * an array of the results of each invoked method. Additional arguments will be provided
+    * to each invoked method. If methodName is a function it will be invoked for, and this
+    * bound to, each element in the collection.
+    * @param collection The collection to iterate over.
+    * @param methodName The name of the method to invoke.
+    * @param args Arguments to invoke the method with.
+    **/
+    (args: ReadonlyArray<any>): InvokeMap2x2<TResult>;
+    /**
+    * Invokes the method named by methodName on each element in the collection returning
+    * an array of the results of each invoked method. Additional arguments will be provided
+    * to each invoked method. If methodName is a function it will be invoked for, and this
+    * bound to, each element in the collection.
+    * @param collection The collection to iterate over.
+    * @param methodName The name of the method to invoke.
+    * @param args Arguments to invoke the method with.
+    **/
+    (args: ReadonlyArray<any>, collection: object | null | undefined): TResult[];
+}
+interface InvokeMap2x2<TResult> {
+    /**
+    * Invokes the method named by methodName on each element in the collection returning
+    * an array of the results of each invoked method. Additional arguments will be provided
+    * to each invoked method. If methodName is a function it will be invoked for, and this
+    * bound to, each element in the collection.
+    * @param collection The collection to iterate over.
+    * @param methodName The name of the method to invoke.
+    * @param args Arguments to invoke the method with.
+    **/
+    (): InvokeMap2x2<TResult>;
+    /**
+    * Invokes the method named by methodName on each element in the collection returning
+    * an array of the results of each invoked method. Additional arguments will be provided
+    * to each invoked method. If methodName is a function it will be invoked for, and this
+    * bound to, each element in the collection.
+    * @param collection The collection to iterate over.
+    * @param methodName The name of the method to invoke.
+    * @param args Arguments to invoke the method with.
+    **/
+    (collection: object | null | undefined): TResult[];
+}
+
+declare const invokeArgsMap: InvokeMap;
+export = invokeArgsMap;
diff --git a/types/lodash/fp/invokeMap.d.ts b/types/lodash/fp/invokeMap.d.ts
new file mode 100644
index 0000000000..3bb1072954
--- /dev/null
+++ b/types/lodash/fp/invokeMap.d.ts
@@ -0,0 +1,103 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface InvokeMap {
+    /**
+    * Invokes the method named by methodName on each element in the collection returning
+    * an array of the results of each invoked method. Additional arguments will be provided
+    * to each invoked method. If methodName is a function it will be invoked for, and this
+    * bound to, each element in the collection.
+    * @param collection The collection to iterate over.
+    * @param methodName The name of the method to invoke.
+    * @param args Arguments to invoke the method with.
+    **/
+    (): InvokeMap;
+    /**
+    * Invokes the method named by methodName on each element in the collection returning
+    * an array of the results of each invoked method. Additional arguments will be provided
+    * to each invoked method. If methodName is a function it will be invoked for, and this
+    * bound to, each element in the collection.
+    * @param collection The collection to iterate over.
+    * @param methodName The name of the method to invoke.
+    * @param args Arguments to invoke the method with.
+    **/
+    (methodName: string): InvokeMap1x1;
+    /**
+    * Invokes the method named by methodName on each element in the collection returning
+    * an array of the results of each invoked method. Additional arguments will be provided
+    * to each invoked method. If methodName is a function it will be invoked for, and this
+    * bound to, each element in the collection.
+    * @param collection The collection to iterate over.
+    * @param methodName The name of the method to invoke.
+    * @param args Arguments to invoke the method with.
+    **/
+    (methodName: string, collection: object | null | undefined): any[];
+    /**
+    * Invokes the method named by methodName on each element in the collection returning
+    * an array of the results of each invoked method. Additional arguments will be provided
+    * to each invoked method. If methodName is a function it will be invoked for, and this
+    * bound to, each element in the collection.
+    * @param collection The collection to iterate over.
+    * @param methodName The name of the method to invoke.
+    * @param args Arguments to invoke the method with.
+    **/
+    <TResult>(method: (...args: any[]) => TResult): InvokeMap2x1<TResult>;
+    /**
+    * Invokes the method named by methodName on each element in the collection returning
+    * an array of the results of each invoked method. Additional arguments will be provided
+    * to each invoked method. If methodName is a function it will be invoked for, and this
+    * bound to, each element in the collection.
+    * @param collection The collection to iterate over.
+    * @param methodName The name of the method to invoke.
+    * @param args Arguments to invoke the method with.
+    **/
+    <TResult>(method: (...args: any[]) => TResult, collection: object | null | undefined): TResult[];
+}
+interface InvokeMap1x1 {
+    /**
+    * Invokes the method named by methodName on each element in the collection returning
+    * an array of the results of each invoked method. Additional arguments will be provided
+    * to each invoked method. If methodName is a function it will be invoked for, and this
+    * bound to, each element in the collection.
+    * @param collection The collection to iterate over.
+    * @param methodName The name of the method to invoke.
+    * @param args Arguments to invoke the method with.
+    **/
+    (): InvokeMap1x1;
+    /**
+    * Invokes the method named by methodName on each element in the collection returning
+    * an array of the results of each invoked method. Additional arguments will be provided
+    * to each invoked method. If methodName is a function it will be invoked for, and this
+    * bound to, each element in the collection.
+    * @param collection The collection to iterate over.
+    * @param methodName The name of the method to invoke.
+    * @param args Arguments to invoke the method with.
+    **/
+    (collection: object | null | undefined): any[];
+}
+interface InvokeMap2x1<TResult> {
+    /**
+    * Invokes the method named by methodName on each element in the collection returning
+    * an array of the results of each invoked method. Additional arguments will be provided
+    * to each invoked method. If methodName is a function it will be invoked for, and this
+    * bound to, each element in the collection.
+    * @param collection The collection to iterate over.
+    * @param methodName The name of the method to invoke.
+    * @param args Arguments to invoke the method with.
+    **/
+    (): InvokeMap2x1<TResult>;
+    /**
+    * Invokes the method named by methodName on each element in the collection returning
+    * an array of the results of each invoked method. Additional arguments will be provided
+    * to each invoked method. If methodName is a function it will be invoked for, and this
+    * bound to, each element in the collection.
+    * @param collection The collection to iterate over.
+    * @param methodName The name of the method to invoke.
+    * @param args Arguments to invoke the method with.
+    **/
+    (collection: object | null | undefined): TResult[];
+}
+
+declare const invokeMap: InvokeMap;
+export = invokeMap;
diff --git a/types/lodash/fp/isArguments.d.ts b/types/lodash/fp/isArguments.d.ts
new file mode 100644
index 0000000000..53841e17fc
--- /dev/null
+++ b/types/lodash/fp/isArguments.d.ts
@@ -0,0 +1,15 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type IsArguments =
+    /**
+     * Checks if value is classified as an arguments object.
+     *
+     * @param value The value to check.
+     * @return Returns true if value is correctly classified, else false.
+     */
+    (value: any) => value is IArguments;
+
+declare const isArguments: IsArguments;
+export = isArguments;
diff --git a/types/lodash/fp/isArray.d.ts b/types/lodash/fp/isArray.d.ts
new file mode 100644
index 0000000000..6f96cdbe55
--- /dev/null
+++ b/types/lodash/fp/isArray.d.ts
@@ -0,0 +1,15 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type IsArray =
+    /**
+     * Checks if value is classified as an Array object.
+     * @param value The value to check.
+     *
+     * @return Returns true if value is correctly classified, else false.
+     */
+    (value: any) => value is any[];
+
+declare const isArray: IsArray;
+export = isArray;
diff --git a/types/lodash/fp/isArrayBuffer.d.ts b/types/lodash/fp/isArrayBuffer.d.ts
new file mode 100644
index 0000000000..a9fab817ec
--- /dev/null
+++ b/types/lodash/fp/isArrayBuffer.d.ts
@@ -0,0 +1,15 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type IsArrayBuffer =
+    /**
+     * Checks if value is classified as an ArrayBuffer object.
+     *
+     * @param value The value to check.
+     * @return Returns true if value is correctly classified, else false.
+     */
+    (value: any) => value is ArrayBuffer;
+
+declare const isArrayBuffer: IsArrayBuffer;
+export = isArrayBuffer;
diff --git a/types/lodash/fp/isArrayLike.d.ts b/types/lodash/fp/isArrayLike.d.ts
new file mode 100644
index 0000000000..4d99172433
--- /dev/null
+++ b/types/lodash/fp/isArrayLike.d.ts
@@ -0,0 +1,78 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface IsArrayLike {
+    /**
+     * Checks if `value` is array-like. A value is considered array-like if it's
+     * not a function and has a `value.length` that's an integer greater than or
+     * equal to `0` and less than or equal to `Number.MAX_SAFE_INTEGER`.
+     *
+     * @category Lang
+     * @param value The value to check.
+     * @returns Returns `true` if `value` is array-like, else `false`.
+     * @example
+     *
+     * _.isArrayLike([1, 2, 3]);
+     * // => true
+     *
+     * _.isArrayLike(document.body.children);
+     * // => true
+     *
+     * _.isArrayLike('abc');
+     * // => true
+     *
+     * _.isArrayLike(_.noop);
+     * // => false
+     */
+    <T>(value: T & string & number): boolean;
+    /**
+     * Checks if `value` is array-like. A value is considered array-like if it's
+     * not a function and has a `value.length` that's an integer greater than or
+     * equal to `0` and less than or equal to `Number.MAX_SAFE_INTEGER`.
+     *
+     * @category Lang
+     * @param value The value to check.
+     * @returns Returns `true` if `value` is array-like, else `false`.
+     * @example
+     *
+     * _.isArrayLike([1, 2, 3]);
+     * // => true
+     *
+     * _.isArrayLike(document.body.children);
+     * // => true
+     *
+     * _.isArrayLike('abc');
+     * // => true
+     *
+     * _.isArrayLike(_.noop);
+     * // => false
+     */
+    (value: ((...args: any[]) => any) | null | undefined): value is never;
+    /**
+     * Checks if `value` is array-like. A value is considered array-like if it's
+     * not a function and has a `value.length` that's an integer greater than or
+     * equal to `0` and less than or equal to `Number.MAX_SAFE_INTEGER`.
+     *
+     * @category Lang
+     * @param value The value to check.
+     * @returns Returns `true` if `value` is array-like, else `false`.
+     * @example
+     *
+     * _.isArrayLike([1, 2, 3]);
+     * // => true
+     *
+     * _.isArrayLike(document.body.children);
+     * // => true
+     *
+     * _.isArrayLike('abc');
+     * // => true
+     *
+     * _.isArrayLike(_.noop);
+     * // => false
+     */
+    (value: any): value is { length: number };
+}
+
+declare const isArrayLike: IsArrayLike;
+export = isArrayLike;
diff --git a/types/lodash/fp/isArrayLikeObject.d.ts b/types/lodash/fp/isArrayLikeObject.d.ts
new file mode 100644
index 0000000000..f21c1f6836
--- /dev/null
+++ b/types/lodash/fp/isArrayLikeObject.d.ts
@@ -0,0 +1,77 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface IsArrayLikeObject {
+    /**
+     * This method is like `_.isArrayLike` except that it also checks if `value`
+     * is an object.
+     *
+     * @category Lang
+     * @param value The value to check.
+     * @returns Returns `true` if `value` is an array-like object, else `false`.
+     * @example
+     *
+     * _.isArrayLikeObject([1, 2, 3]);
+     * // => true
+     *
+     * _.isArrayLikeObject(document.body.children);
+     * // => true
+     *
+     * _.isArrayLikeObject('abc');
+     * // => false
+     *
+     * _.isArrayLikeObject(_.noop);
+     * // => false
+     */
+    <T>(value: T & string & number): boolean;
+    /**
+     * This method is like `_.isArrayLike` except that it also checks if `value`
+     * is an object.
+     *
+     * @category Lang
+     * @param value The value to check.
+     * @returns Returns `true` if `value` is an array-like object, else `false`.
+     * @example
+     *
+     * _.isArrayLikeObject([1, 2, 3]);
+     * // => true
+     *
+     * _.isArrayLikeObject(document.body.children);
+     * // => true
+     *
+     * _.isArrayLikeObject('abc');
+     * // => false
+     *
+     * _.isArrayLikeObject(_.noop);
+     * // => false
+     */
+    // tslint:disable-next-line:ban-types (type guard doesn't seem to work correctly without the Function type)
+    (value: ((...args: any[]) => any) | Function | string | boolean | number | null | undefined): value is never;
+    /**
+     * This method is like `_.isArrayLike` except that it also checks if `value`
+     * is an object.
+     *
+     * @category Lang
+     * @param value The value to check.
+     * @returns Returns `true` if `value` is an array-like object, else `false`.
+     * @example
+     *
+     * _.isArrayLikeObject([1, 2, 3]);
+     * // => true
+     *
+     * _.isArrayLikeObject(document.body.children);
+     * // => true
+     *
+     * _.isArrayLikeObject('abc');
+     * // => false
+     *
+     * _.isArrayLikeObject(_.noop);
+     * // => false
+     */
+    // tslint:disable-next-line:ban-types (type guard doesn't seem to work correctly without the Function type)
+    <T extends object>(value: T | ((...args: any[]) => any) | Function | string | boolean | number | null | undefined): value is T & { length: number };
+}
+
+declare const isArrayLikeObject: IsArrayLikeObject;
+export = isArrayLikeObject;
diff --git a/types/lodash/fp/isBoolean.d.ts b/types/lodash/fp/isBoolean.d.ts
new file mode 100644
index 0000000000..45aaa6d2f9
--- /dev/null
+++ b/types/lodash/fp/isBoolean.d.ts
@@ -0,0 +1,15 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type IsBoolean =
+    /**
+     * Checks if value is classified as a boolean primitive or object.
+     *
+     * @param value The value to check.
+     * @return Returns true if value is correctly classified, else false.
+     */
+    (value: any) => value is boolean;
+
+declare const isBoolean: IsBoolean;
+export = isBoolean;
diff --git a/types/lodash/fp/isBuffer.d.ts b/types/lodash/fp/isBuffer.d.ts
new file mode 100644
index 0000000000..a603cf2d68
--- /dev/null
+++ b/types/lodash/fp/isBuffer.d.ts
@@ -0,0 +1,15 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type IsBuffer =
+    /**
+     * Checks if value is a buffer.
+     *
+     * @param value The value to check.
+     * @return Returns true if value is a buffer, else false.
+     */
+    (value: any) => boolean;
+
+declare const isBuffer: IsBuffer;
+export = isBuffer;
diff --git a/types/lodash/fp/isDate.d.ts b/types/lodash/fp/isDate.d.ts
new file mode 100644
index 0000000000..a602131f26
--- /dev/null
+++ b/types/lodash/fp/isDate.d.ts
@@ -0,0 +1,15 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type IsDate =
+    /**
+     * Checks if value is classified as a Date object.
+     * @param value The value to check.
+     *
+     * @return Returns true if value is correctly classified, else false.
+     */
+    (value: any) => value is Date;
+
+declare const isDate: IsDate;
+export = isDate;
diff --git a/types/lodash/fp/isElement.d.ts b/types/lodash/fp/isElement.d.ts
new file mode 100644
index 0000000000..56fe27d3a6
--- /dev/null
+++ b/types/lodash/fp/isElement.d.ts
@@ -0,0 +1,15 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type IsElement =
+    /**
+     * Checks if value is a DOM element.
+     *
+     * @param value The value to check.
+     * @return Returns true if value is a DOM element, else false.
+     */
+    (value: any) => boolean;
+
+declare const isElement: IsElement;
+export = isElement;
diff --git a/types/lodash/fp/isEmpty.d.ts b/types/lodash/fp/isEmpty.d.ts
new file mode 100644
index 0000000000..b24d33f88e
--- /dev/null
+++ b/types/lodash/fp/isEmpty.d.ts
@@ -0,0 +1,16 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type IsEmpty =
+    /**
+     * Checks if value is empty. A value is considered empty unless it’s an arguments object, array, string, or
+     * jQuery-like collection with a length greater than 0 or an object with own enumerable properties.
+     *
+     * @param value The value to inspect.
+     * @return Returns true if value is empty, else false.
+     */
+    (value: any) => boolean;
+
+declare const isEmpty: IsEmpty;
+export = isEmpty;
diff --git a/types/lodash/fp/isEqual.d.ts b/types/lodash/fp/isEqual.d.ts
new file mode 100644
index 0000000000..225f90f914
--- /dev/null
+++ b/types/lodash/fp/isEqual.d.ts
@@ -0,0 +1,141 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface IsEqual {
+    /**
+     * Performs a deep comparison between two values to determine if they are
+     * equivalent.
+     *
+     * **Note:** This method supports comparing arrays, array buffers, booleans,
+     * date objects, error objects, maps, numbers, `Object` objects, regexes,
+     * sets, strings, symbols, and typed arrays. `Object` objects are compared
+     * by their own, not inherited, enumerable properties. Functions and DOM
+     * nodes are **not** supported.
+     *
+     * @category Lang
+     * @param value The value to compare.
+     * @param other The other value to compare.
+     * @returns Returns `true` if the values are equivalent, else `false`.
+     * @example
+     *
+     * var object = { 'user': 'fred' };
+     * var other = { 'user': 'fred' };
+     *
+     * _.isEqual(object, other);
+     * // => true
+     *
+     * object === other;
+     * // => false
+     */
+    (): IsEqual;
+    /**
+     * Performs a deep comparison between two values to determine if they are
+     * equivalent.
+     *
+     * **Note:** This method supports comparing arrays, array buffers, booleans,
+     * date objects, error objects, maps, numbers, `Object` objects, regexes,
+     * sets, strings, symbols, and typed arrays. `Object` objects are compared
+     * by their own, not inherited, enumerable properties. Functions and DOM
+     * nodes are **not** supported.
+     *
+     * @category Lang
+     * @param value The value to compare.
+     * @param other The other value to compare.
+     * @returns Returns `true` if the values are equivalent, else `false`.
+     * @example
+     *
+     * var object = { 'user': 'fred' };
+     * var other = { 'user': 'fred' };
+     *
+     * _.isEqual(object, other);
+     * // => true
+     *
+     * object === other;
+     * // => false
+     */
+    (value: any): IsEqual1x1;
+    /**
+     * Performs a deep comparison between two values to determine if they are
+     * equivalent.
+     *
+     * **Note:** This method supports comparing arrays, array buffers, booleans,
+     * date objects, error objects, maps, numbers, `Object` objects, regexes,
+     * sets, strings, symbols, and typed arrays. `Object` objects are compared
+     * by their own, not inherited, enumerable properties. Functions and DOM
+     * nodes are **not** supported.
+     *
+     * @category Lang
+     * @param value The value to compare.
+     * @param other The other value to compare.
+     * @returns Returns `true` if the values are equivalent, else `false`.
+     * @example
+     *
+     * var object = { 'user': 'fred' };
+     * var other = { 'user': 'fred' };
+     *
+     * _.isEqual(object, other);
+     * // => true
+     *
+     * object === other;
+     * // => false
+     */
+    (value: any, other: any): boolean;
+}
+interface IsEqual1x1 {
+    /**
+     * Performs a deep comparison between two values to determine if they are
+     * equivalent.
+     *
+     * **Note:** This method supports comparing arrays, array buffers, booleans,
+     * date objects, error objects, maps, numbers, `Object` objects, regexes,
+     * sets, strings, symbols, and typed arrays. `Object` objects are compared
+     * by their own, not inherited, enumerable properties. Functions and DOM
+     * nodes are **not** supported.
+     *
+     * @category Lang
+     * @param value The value to compare.
+     * @param other The other value to compare.
+     * @returns Returns `true` if the values are equivalent, else `false`.
+     * @example
+     *
+     * var object = { 'user': 'fred' };
+     * var other = { 'user': 'fred' };
+     *
+     * _.isEqual(object, other);
+     * // => true
+     *
+     * object === other;
+     * // => false
+     */
+    (): IsEqual1x1;
+    /**
+     * Performs a deep comparison between two values to determine if they are
+     * equivalent.
+     *
+     * **Note:** This method supports comparing arrays, array buffers, booleans,
+     * date objects, error objects, maps, numbers, `Object` objects, regexes,
+     * sets, strings, symbols, and typed arrays. `Object` objects are compared
+     * by their own, not inherited, enumerable properties. Functions and DOM
+     * nodes are **not** supported.
+     *
+     * @category Lang
+     * @param value The value to compare.
+     * @param other The other value to compare.
+     * @returns Returns `true` if the values are equivalent, else `false`.
+     * @example
+     *
+     * var object = { 'user': 'fred' };
+     * var other = { 'user': 'fred' };
+     *
+     * _.isEqual(object, other);
+     * // => true
+     *
+     * object === other;
+     * // => false
+     */
+    (other: any): boolean;
+}
+
+declare const isEqual: IsEqual;
+export = isEqual;
diff --git a/types/lodash/fp/isEqualWith.d.ts b/types/lodash/fp/isEqualWith.d.ts
new file mode 100644
index 0000000000..832c80829c
--- /dev/null
+++ b/types/lodash/fp/isEqualWith.d.ts
@@ -0,0 +1,285 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface IsEqualWith {
+    /**
+     * This method is like `_.isEqual` except that it accepts `customizer` which is
+     * invoked to compare values. If `customizer` returns `undefined` comparisons are
+     * handled by the method instead. The `customizer` is invoked with up to seven arguments:
+     * (objValue, othValue [, index|key, object, other, stack]).
+     *
+     * @category Lang
+     * @param value The value to compare.
+     * @param other The other value to compare.
+     * @param [customizer] The function to customize comparisons.
+     * @returns Returns `true` if the values are equivalent, else `false`.
+     * @example
+     *
+     * function isGreeting(value) {
+     *   return /^h(?:i|ello)$/.test(value);
+     * }
+     *
+     * function customizer(objValue, othValue) {
+     *   if (isGreeting(objValue) && isGreeting(othValue)) {
+     * return true;
+     *   }
+     * }
+     *
+     * var array = ['hello', 'goodbye'];
+     * var other = ['hi', 'goodbye'];
+     *
+     * _.isEqualWith(array, other, customizer);
+     * // => true
+     */
+    (): IsEqualWith;
+    /**
+     * This method is like `_.isEqual` except that it accepts `customizer` which is
+     * invoked to compare values. If `customizer` returns `undefined` comparisons are
+     * handled by the method instead. The `customizer` is invoked with up to seven arguments:
+     * (objValue, othValue [, index|key, object, other, stack]).
+     *
+     * @category Lang
+     * @param value The value to compare.
+     * @param other The other value to compare.
+     * @param [customizer] The function to customize comparisons.
+     * @returns Returns `true` if the values are equivalent, else `false`.
+     * @example
+     *
+     * function isGreeting(value) {
+     *   return /^h(?:i|ello)$/.test(value);
+     * }
+     *
+     * function customizer(objValue, othValue) {
+     *   if (isGreeting(objValue) && isGreeting(othValue)) {
+     * return true;
+     *   }
+     * }
+     *
+     * var array = ['hello', 'goodbye'];
+     * var other = ['hi', 'goodbye'];
+     *
+     * _.isEqualWith(array, other, customizer);
+     * // => true
+     */
+    (customizer: _.IsEqualCustomizer): IsEqualWith1x1;
+    /**
+     * This method is like `_.isEqual` except that it accepts `customizer` which is
+     * invoked to compare values. If `customizer` returns `undefined` comparisons are
+     * handled by the method instead. The `customizer` is invoked with up to seven arguments:
+     * (objValue, othValue [, index|key, object, other, stack]).
+     *
+     * @category Lang
+     * @param value The value to compare.
+     * @param other The other value to compare.
+     * @param [customizer] The function to customize comparisons.
+     * @returns Returns `true` if the values are equivalent, else `false`.
+     * @example
+     *
+     * function isGreeting(value) {
+     *   return /^h(?:i|ello)$/.test(value);
+     * }
+     *
+     * function customizer(objValue, othValue) {
+     *   if (isGreeting(objValue) && isGreeting(othValue)) {
+     * return true;
+     *   }
+     * }
+     *
+     * var array = ['hello', 'goodbye'];
+     * var other = ['hi', 'goodbye'];
+     *
+     * _.isEqualWith(array, other, customizer);
+     * // => true
+     */
+    (customizer: _.IsEqualCustomizer, value: any): IsEqualWith1x2;
+    /**
+     * This method is like `_.isEqual` except that it accepts `customizer` which is
+     * invoked to compare values. If `customizer` returns `undefined` comparisons are
+     * handled by the method instead. The `customizer` is invoked with up to seven arguments:
+     * (objValue, othValue [, index|key, object, other, stack]).
+     *
+     * @category Lang
+     * @param value The value to compare.
+     * @param other The other value to compare.
+     * @param [customizer] The function to customize comparisons.
+     * @returns Returns `true` if the values are equivalent, else `false`.
+     * @example
+     *
+     * function isGreeting(value) {
+     *   return /^h(?:i|ello)$/.test(value);
+     * }
+     *
+     * function customizer(objValue, othValue) {
+     *   if (isGreeting(objValue) && isGreeting(othValue)) {
+     * return true;
+     *   }
+     * }
+     *
+     * var array = ['hello', 'goodbye'];
+     * var other = ['hi', 'goodbye'];
+     *
+     * _.isEqualWith(array, other, customizer);
+     * // => true
+     */
+    (customizer: _.IsEqualCustomizer, value: any, other: any): boolean;
+}
+interface IsEqualWith1x1 {
+    /**
+     * This method is like `_.isEqual` except that it accepts `customizer` which is
+     * invoked to compare values. If `customizer` returns `undefined` comparisons are
+     * handled by the method instead. The `customizer` is invoked with up to seven arguments:
+     * (objValue, othValue [, index|key, object, other, stack]).
+     *
+     * @category Lang
+     * @param value The value to compare.
+     * @param other The other value to compare.
+     * @param [customizer] The function to customize comparisons.
+     * @returns Returns `true` if the values are equivalent, else `false`.
+     * @example
+     *
+     * function isGreeting(value) {
+     *   return /^h(?:i|ello)$/.test(value);
+     * }
+     *
+     * function customizer(objValue, othValue) {
+     *   if (isGreeting(objValue) && isGreeting(othValue)) {
+     * return true;
+     *   }
+     * }
+     *
+     * var array = ['hello', 'goodbye'];
+     * var other = ['hi', 'goodbye'];
+     *
+     * _.isEqualWith(array, other, customizer);
+     * // => true
+     */
+    (): IsEqualWith1x1;
+    /**
+     * This method is like `_.isEqual` except that it accepts `customizer` which is
+     * invoked to compare values. If `customizer` returns `undefined` comparisons are
+     * handled by the method instead. The `customizer` is invoked with up to seven arguments:
+     * (objValue, othValue [, index|key, object, other, stack]).
+     *
+     * @category Lang
+     * @param value The value to compare.
+     * @param other The other value to compare.
+     * @param [customizer] The function to customize comparisons.
+     * @returns Returns `true` if the values are equivalent, else `false`.
+     * @example
+     *
+     * function isGreeting(value) {
+     *   return /^h(?:i|ello)$/.test(value);
+     * }
+     *
+     * function customizer(objValue, othValue) {
+     *   if (isGreeting(objValue) && isGreeting(othValue)) {
+     * return true;
+     *   }
+     * }
+     *
+     * var array = ['hello', 'goodbye'];
+     * var other = ['hi', 'goodbye'];
+     *
+     * _.isEqualWith(array, other, customizer);
+     * // => true
+     */
+    (value: any): IsEqualWith1x2;
+    /**
+     * This method is like `_.isEqual` except that it accepts `customizer` which is
+     * invoked to compare values. If `customizer` returns `undefined` comparisons are
+     * handled by the method instead. The `customizer` is invoked with up to seven arguments:
+     * (objValue, othValue [, index|key, object, other, stack]).
+     *
+     * @category Lang
+     * @param value The value to compare.
+     * @param other The other value to compare.
+     * @param [customizer] The function to customize comparisons.
+     * @returns Returns `true` if the values are equivalent, else `false`.
+     * @example
+     *
+     * function isGreeting(value) {
+     *   return /^h(?:i|ello)$/.test(value);
+     * }
+     *
+     * function customizer(objValue, othValue) {
+     *   if (isGreeting(objValue) && isGreeting(othValue)) {
+     * return true;
+     *   }
+     * }
+     *
+     * var array = ['hello', 'goodbye'];
+     * var other = ['hi', 'goodbye'];
+     *
+     * _.isEqualWith(array, other, customizer);
+     * // => true
+     */
+    (value: any, other: any): boolean;
+}
+interface IsEqualWith1x2 {
+    /**
+     * This method is like `_.isEqual` except that it accepts `customizer` which is
+     * invoked to compare values. If `customizer` returns `undefined` comparisons are
+     * handled by the method instead. The `customizer` is invoked with up to seven arguments:
+     * (objValue, othValue [, index|key, object, other, stack]).
+     *
+     * @category Lang
+     * @param value The value to compare.
+     * @param other The other value to compare.
+     * @param [customizer] The function to customize comparisons.
+     * @returns Returns `true` if the values are equivalent, else `false`.
+     * @example
+     *
+     * function isGreeting(value) {
+     *   return /^h(?:i|ello)$/.test(value);
+     * }
+     *
+     * function customizer(objValue, othValue) {
+     *   if (isGreeting(objValue) && isGreeting(othValue)) {
+     * return true;
+     *   }
+     * }
+     *
+     * var array = ['hello', 'goodbye'];
+     * var other = ['hi', 'goodbye'];
+     *
+     * _.isEqualWith(array, other, customizer);
+     * // => true
+     */
+    (): IsEqualWith1x2;
+    /**
+     * This method is like `_.isEqual` except that it accepts `customizer` which is
+     * invoked to compare values. If `customizer` returns `undefined` comparisons are
+     * handled by the method instead. The `customizer` is invoked with up to seven arguments:
+     * (objValue, othValue [, index|key, object, other, stack]).
+     *
+     * @category Lang
+     * @param value The value to compare.
+     * @param other The other value to compare.
+     * @param [customizer] The function to customize comparisons.
+     * @returns Returns `true` if the values are equivalent, else `false`.
+     * @example
+     *
+     * function isGreeting(value) {
+     *   return /^h(?:i|ello)$/.test(value);
+     * }
+     *
+     * function customizer(objValue, othValue) {
+     *   if (isGreeting(objValue) && isGreeting(othValue)) {
+     * return true;
+     *   }
+     * }
+     *
+     * var array = ['hello', 'goodbye'];
+     * var other = ['hi', 'goodbye'];
+     *
+     * _.isEqualWith(array, other, customizer);
+     * // => true
+     */
+    (other: any): boolean;
+}
+
+declare const isEqualWith: IsEqualWith;
+export = isEqualWith;
diff --git a/types/lodash/fp/isError.d.ts b/types/lodash/fp/isError.d.ts
new file mode 100644
index 0000000000..6c6f429fdf
--- /dev/null
+++ b/types/lodash/fp/isError.d.ts
@@ -0,0 +1,16 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type IsError =
+    /**
+     * Checks if value is an Error, EvalError, RangeError, ReferenceError, SyntaxError, TypeError, or URIError
+     * object.
+     *
+     * @param value The value to check.
+     * @return Returns true if value is an error object, else false.
+     */
+    (value: any) => value is Error;
+
+declare const isError: IsError;
+export = isError;
diff --git a/types/lodash/fp/isFinite.d.ts b/types/lodash/fp/isFinite.d.ts
new file mode 100644
index 0000000000..544f4c3fd5
--- /dev/null
+++ b/types/lodash/fp/isFinite.d.ts
@@ -0,0 +1,17 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type IsFinite =
+    /**
+     * Checks if value is a finite primitive number.
+     *
+     * Note: This method is based on Number.isFinite.
+     *
+     * @param value The value to check.
+     * @return Returns true if value is a finite number, else false.
+     */
+    (value: any) => boolean;
+
+declare const isFinite: IsFinite;
+export = isFinite;
diff --git a/types/lodash/fp/isFunction.d.ts b/types/lodash/fp/isFunction.d.ts
new file mode 100644
index 0000000000..7a85054a1f
--- /dev/null
+++ b/types/lodash/fp/isFunction.d.ts
@@ -0,0 +1,15 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type IsFunction =
+    /**
+     * Checks if value is a callable function.
+     *
+     * @param value The value to check.
+     * @return Returns true if value is correctly classified, else false.
+     */
+    (value: any) => value is (...args: any[]) => any;
+
+declare const isFunction: IsFunction;
+export = isFunction;
diff --git a/types/lodash/fp/isInteger.d.ts b/types/lodash/fp/isInteger.d.ts
new file mode 100644
index 0000000000..d04a6f5cce
--- /dev/null
+++ b/types/lodash/fp/isInteger.d.ts
@@ -0,0 +1,31 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type IsInteger =
+    /**
+     * Checks if `value` is an integer.
+     *
+     * **Note:** This method is based on [`Number.isInteger`](https://mdn.io/Number/isInteger).
+     *
+     * @category Lang
+     * @param value The value to check.
+     * @returns Returns `true` if `value` is an integer, else `false`.
+     * @example
+     *
+     * _.isInteger(3);
+     * // => true
+     *
+     * _.isInteger(Number.MIN_VALUE);
+     * // => false
+     *
+     * _.isInteger(Infinity);
+     * // => false
+     *
+     * _.isInteger('3');
+     * // => false
+     */
+    (value: any) => boolean;
+
+declare const isInteger: IsInteger;
+export = isInteger;
diff --git a/types/lodash/fp/isLength.d.ts b/types/lodash/fp/isLength.d.ts
new file mode 100644
index 0000000000..a48a867820
--- /dev/null
+++ b/types/lodash/fp/isLength.d.ts
@@ -0,0 +1,31 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type IsLength =
+    /**
+     * Checks if `value` is a valid array-like length.
+     *
+     * **Note:** This function is loosely based on [`ToLength`](http://ecma-international.org/ecma-262/6.0/#sec-tolength).
+     *
+     * @category Lang
+     * @param value The value to check.
+     * @returns Returns `true` if `value` is a valid length, else `false`.
+     * @example
+     *
+     * _.isLength(3);
+     * // => true
+     *
+     * _.isLength(Number.MIN_VALUE);
+     * // => false
+     *
+     * _.isLength(Infinity);
+     * // => false
+     *
+     * _.isLength('3');
+     * // => false
+     */
+    (value: any) => boolean;
+
+declare const isLength: IsLength;
+export = isLength;
diff --git a/types/lodash/fp/isMap.d.ts b/types/lodash/fp/isMap.d.ts
new file mode 100644
index 0000000000..940cb8a4ad
--- /dev/null
+++ b/types/lodash/fp/isMap.d.ts
@@ -0,0 +1,15 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type IsMap =
+    /**
+     * Checks if value is classified as a Map object.
+     *
+     * @param value The value to check.
+     * @returns Returns true if value is correctly classified, else false.
+     */
+    (value: any) => value is Map<any, any>;
+
+declare const isMap: IsMap;
+export = isMap;
diff --git a/types/lodash/fp/isMatch.d.ts b/types/lodash/fp/isMatch.d.ts
new file mode 100644
index 0000000000..231362c358
--- /dev/null
+++ b/types/lodash/fp/isMatch.d.ts
@@ -0,0 +1,116 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface IsMatch {
+    /**
+     * Performs a deep comparison between `object` and `source` to determine if
+     * `object` contains equivalent property values.
+     *
+     * **Note:** This method supports comparing the same values as `_.isEqual`.
+     *
+     * @category Lang
+     * @param object The object to inspect.
+     * @param source The object of property values to match.
+     * @returns Returns `true` if `object` is a match, else `false`.
+     * @example
+     *
+     * var object = { 'user': 'fred', 'age': 40 };
+     *
+     * _.isMatch(object, { 'age': 40 });
+     * // => true
+     *
+     * _.isMatch(object, { 'age': 36 });
+     * // => false
+     */
+    (): IsMatch;
+    /**
+     * Performs a deep comparison between `object` and `source` to determine if
+     * `object` contains equivalent property values.
+     *
+     * **Note:** This method supports comparing the same values as `_.isEqual`.
+     *
+     * @category Lang
+     * @param object The object to inspect.
+     * @param source The object of property values to match.
+     * @returns Returns `true` if `object` is a match, else `false`.
+     * @example
+     *
+     * var object = { 'user': 'fred', 'age': 40 };
+     *
+     * _.isMatch(object, { 'age': 40 });
+     * // => true
+     *
+     * _.isMatch(object, { 'age': 36 });
+     * // => false
+     */
+    (source: object): IsMatch1x1;
+    /**
+     * Performs a deep comparison between `object` and `source` to determine if
+     * `object` contains equivalent property values.
+     *
+     * **Note:** This method supports comparing the same values as `_.isEqual`.
+     *
+     * @category Lang
+     * @param object The object to inspect.
+     * @param source The object of property values to match.
+     * @returns Returns `true` if `object` is a match, else `false`.
+     * @example
+     *
+     * var object = { 'user': 'fred', 'age': 40 };
+     *
+     * _.isMatch(object, { 'age': 40 });
+     * // => true
+     *
+     * _.isMatch(object, { 'age': 36 });
+     * // => false
+     */
+    (source: object, object: object): boolean;
+}
+interface IsMatch1x1 {
+    /**
+     * Performs a deep comparison between `object` and `source` to determine if
+     * `object` contains equivalent property values.
+     *
+     * **Note:** This method supports comparing the same values as `_.isEqual`.
+     *
+     * @category Lang
+     * @param object The object to inspect.
+     * @param source The object of property values to match.
+     * @returns Returns `true` if `object` is a match, else `false`.
+     * @example
+     *
+     * var object = { 'user': 'fred', 'age': 40 };
+     *
+     * _.isMatch(object, { 'age': 40 });
+     * // => true
+     *
+     * _.isMatch(object, { 'age': 36 });
+     * // => false
+     */
+    (): IsMatch1x1;
+    /**
+     * Performs a deep comparison between `object` and `source` to determine if
+     * `object` contains equivalent property values.
+     *
+     * **Note:** This method supports comparing the same values as `_.isEqual`.
+     *
+     * @category Lang
+     * @param object The object to inspect.
+     * @param source The object of property values to match.
+     * @returns Returns `true` if `object` is a match, else `false`.
+     * @example
+     *
+     * var object = { 'user': 'fred', 'age': 40 };
+     *
+     * _.isMatch(object, { 'age': 40 });
+     * // => true
+     *
+     * _.isMatch(object, { 'age': 36 });
+     * // => false
+     */
+    (object: object): boolean;
+}
+
+declare const isMatch: IsMatch;
+export = isMatch;
diff --git a/types/lodash/fp/isMatchWith.d.ts b/types/lodash/fp/isMatchWith.d.ts
new file mode 100644
index 0000000000..5345ad3863
--- /dev/null
+++ b/types/lodash/fp/isMatchWith.d.ts
@@ -0,0 +1,285 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface IsMatchWith {
+    /**
+     * This method is like `_.isMatch` except that it accepts `customizer` which
+     * is invoked to compare values. If `customizer` returns `undefined` comparisons
+     * are handled by the method instead. The `customizer` is invoked with three
+     * arguments: (objValue, srcValue, index|key, object, source).
+     *
+     * @category Lang
+     * @param object The object to inspect.
+     * @param source The object of property values to match.
+     * @param [customizer] The function to customize comparisons.
+     * @returns Returns `true` if `object` is a match, else `false`.
+     * @example
+     *
+     * function isGreeting(value) {
+     *   return /^h(?:i|ello)$/.test(value);
+     * }
+     *
+     * function customizer(objValue, srcValue) {
+     *   if (isGreeting(objValue) && isGreeting(srcValue)) {
+     * return true;
+     *   }
+     * }
+     *
+     * var object = { 'greeting': 'hello' };
+     * var source = { 'greeting': 'hi' };
+     *
+     * _.isMatchWith(object, source, customizer);
+     * // => true
+     */
+    (): IsMatchWith;
+    /**
+     * This method is like `_.isMatch` except that it accepts `customizer` which
+     * is invoked to compare values. If `customizer` returns `undefined` comparisons
+     * are handled by the method instead. The `customizer` is invoked with three
+     * arguments: (objValue, srcValue, index|key, object, source).
+     *
+     * @category Lang
+     * @param object The object to inspect.
+     * @param source The object of property values to match.
+     * @param [customizer] The function to customize comparisons.
+     * @returns Returns `true` if `object` is a match, else `false`.
+     * @example
+     *
+     * function isGreeting(value) {
+     *   return /^h(?:i|ello)$/.test(value);
+     * }
+     *
+     * function customizer(objValue, srcValue) {
+     *   if (isGreeting(objValue) && isGreeting(srcValue)) {
+     * return true;
+     *   }
+     * }
+     *
+     * var object = { 'greeting': 'hello' };
+     * var source = { 'greeting': 'hi' };
+     *
+     * _.isMatchWith(object, source, customizer);
+     * // => true
+     */
+    (customizer: _.isMatchWithCustomizer): IsMatchWith1x1;
+    /**
+     * This method is like `_.isMatch` except that it accepts `customizer` which
+     * is invoked to compare values. If `customizer` returns `undefined` comparisons
+     * are handled by the method instead. The `customizer` is invoked with three
+     * arguments: (objValue, srcValue, index|key, object, source).
+     *
+     * @category Lang
+     * @param object The object to inspect.
+     * @param source The object of property values to match.
+     * @param [customizer] The function to customize comparisons.
+     * @returns Returns `true` if `object` is a match, else `false`.
+     * @example
+     *
+     * function isGreeting(value) {
+     *   return /^h(?:i|ello)$/.test(value);
+     * }
+     *
+     * function customizer(objValue, srcValue) {
+     *   if (isGreeting(objValue) && isGreeting(srcValue)) {
+     * return true;
+     *   }
+     * }
+     *
+     * var object = { 'greeting': 'hello' };
+     * var source = { 'greeting': 'hi' };
+     *
+     * _.isMatchWith(object, source, customizer);
+     * // => true
+     */
+    (customizer: _.isMatchWithCustomizer, source: object): IsMatchWith1x2;
+    /**
+     * This method is like `_.isMatch` except that it accepts `customizer` which
+     * is invoked to compare values. If `customizer` returns `undefined` comparisons
+     * are handled by the method instead. The `customizer` is invoked with three
+     * arguments: (objValue, srcValue, index|key, object, source).
+     *
+     * @category Lang
+     * @param object The object to inspect.
+     * @param source The object of property values to match.
+     * @param [customizer] The function to customize comparisons.
+     * @returns Returns `true` if `object` is a match, else `false`.
+     * @example
+     *
+     * function isGreeting(value) {
+     *   return /^h(?:i|ello)$/.test(value);
+     * }
+     *
+     * function customizer(objValue, srcValue) {
+     *   if (isGreeting(objValue) && isGreeting(srcValue)) {
+     * return true;
+     *   }
+     * }
+     *
+     * var object = { 'greeting': 'hello' };
+     * var source = { 'greeting': 'hi' };
+     *
+     * _.isMatchWith(object, source, customizer);
+     * // => true
+     */
+    (customizer: _.isMatchWithCustomizer, source: object, object: object): boolean;
+}
+interface IsMatchWith1x1 {
+    /**
+     * This method is like `_.isMatch` except that it accepts `customizer` which
+     * is invoked to compare values. If `customizer` returns `undefined` comparisons
+     * are handled by the method instead. The `customizer` is invoked with three
+     * arguments: (objValue, srcValue, index|key, object, source).
+     *
+     * @category Lang
+     * @param object The object to inspect.
+     * @param source The object of property values to match.
+     * @param [customizer] The function to customize comparisons.
+     * @returns Returns `true` if `object` is a match, else `false`.
+     * @example
+     *
+     * function isGreeting(value) {
+     *   return /^h(?:i|ello)$/.test(value);
+     * }
+     *
+     * function customizer(objValue, srcValue) {
+     *   if (isGreeting(objValue) && isGreeting(srcValue)) {
+     * return true;
+     *   }
+     * }
+     *
+     * var object = { 'greeting': 'hello' };
+     * var source = { 'greeting': 'hi' };
+     *
+     * _.isMatchWith(object, source, customizer);
+     * // => true
+     */
+    (): IsMatchWith1x1;
+    /**
+     * This method is like `_.isMatch` except that it accepts `customizer` which
+     * is invoked to compare values. If `customizer` returns `undefined` comparisons
+     * are handled by the method instead. The `customizer` is invoked with three
+     * arguments: (objValue, srcValue, index|key, object, source).
+     *
+     * @category Lang
+     * @param object The object to inspect.
+     * @param source The object of property values to match.
+     * @param [customizer] The function to customize comparisons.
+     * @returns Returns `true` if `object` is a match, else `false`.
+     * @example
+     *
+     * function isGreeting(value) {
+     *   return /^h(?:i|ello)$/.test(value);
+     * }
+     *
+     * function customizer(objValue, srcValue) {
+     *   if (isGreeting(objValue) && isGreeting(srcValue)) {
+     * return true;
+     *   }
+     * }
+     *
+     * var object = { 'greeting': 'hello' };
+     * var source = { 'greeting': 'hi' };
+     *
+     * _.isMatchWith(object, source, customizer);
+     * // => true
+     */
+    (source: object): IsMatchWith1x2;
+    /**
+     * This method is like `_.isMatch` except that it accepts `customizer` which
+     * is invoked to compare values. If `customizer` returns `undefined` comparisons
+     * are handled by the method instead. The `customizer` is invoked with three
+     * arguments: (objValue, srcValue, index|key, object, source).
+     *
+     * @category Lang
+     * @param object The object to inspect.
+     * @param source The object of property values to match.
+     * @param [customizer] The function to customize comparisons.
+     * @returns Returns `true` if `object` is a match, else `false`.
+     * @example
+     *
+     * function isGreeting(value) {
+     *   return /^h(?:i|ello)$/.test(value);
+     * }
+     *
+     * function customizer(objValue, srcValue) {
+     *   if (isGreeting(objValue) && isGreeting(srcValue)) {
+     * return true;
+     *   }
+     * }
+     *
+     * var object = { 'greeting': 'hello' };
+     * var source = { 'greeting': 'hi' };
+     *
+     * _.isMatchWith(object, source, customizer);
+     * // => true
+     */
+    (source: object, object: object): boolean;
+}
+interface IsMatchWith1x2 {
+    /**
+     * This method is like `_.isMatch` except that it accepts `customizer` which
+     * is invoked to compare values. If `customizer` returns `undefined` comparisons
+     * are handled by the method instead. The `customizer` is invoked with three
+     * arguments: (objValue, srcValue, index|key, object, source).
+     *
+     * @category Lang
+     * @param object The object to inspect.
+     * @param source The object of property values to match.
+     * @param [customizer] The function to customize comparisons.
+     * @returns Returns `true` if `object` is a match, else `false`.
+     * @example
+     *
+     * function isGreeting(value) {
+     *   return /^h(?:i|ello)$/.test(value);
+     * }
+     *
+     * function customizer(objValue, srcValue) {
+     *   if (isGreeting(objValue) && isGreeting(srcValue)) {
+     * return true;
+     *   }
+     * }
+     *
+     * var object = { 'greeting': 'hello' };
+     * var source = { 'greeting': 'hi' };
+     *
+     * _.isMatchWith(object, source, customizer);
+     * // => true
+     */
+    (): IsMatchWith1x2;
+    /**
+     * This method is like `_.isMatch` except that it accepts `customizer` which
+     * is invoked to compare values. If `customizer` returns `undefined` comparisons
+     * are handled by the method instead. The `customizer` is invoked with three
+     * arguments: (objValue, srcValue, index|key, object, source).
+     *
+     * @category Lang
+     * @param object The object to inspect.
+     * @param source The object of property values to match.
+     * @param [customizer] The function to customize comparisons.
+     * @returns Returns `true` if `object` is a match, else `false`.
+     * @example
+     *
+     * function isGreeting(value) {
+     *   return /^h(?:i|ello)$/.test(value);
+     * }
+     *
+     * function customizer(objValue, srcValue) {
+     *   if (isGreeting(objValue) && isGreeting(srcValue)) {
+     * return true;
+     *   }
+     * }
+     *
+     * var object = { 'greeting': 'hello' };
+     * var source = { 'greeting': 'hi' };
+     *
+     * _.isMatchWith(object, source, customizer);
+     * // => true
+     */
+    (object: object): boolean;
+}
+
+declare const isMatchWith: IsMatchWith;
+export = isMatchWith;
diff --git a/types/lodash/fp/isNaN.d.ts b/types/lodash/fp/isNaN.d.ts
new file mode 100644
index 0000000000..f227cd2061
--- /dev/null
+++ b/types/lodash/fp/isNaN.d.ts
@@ -0,0 +1,17 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type IsNaN =
+    /**
+     * Checks if value is NaN.
+     *
+     * Note: This method is not the same as isNaN which returns true for undefined and other non-numeric values.
+     *
+     * @param value The value to check.
+     * @return Returns true if value is NaN, else false.
+     */
+    (value: any) => boolean;
+
+declare const isNaN: IsNaN;
+export = isNaN;
diff --git a/types/lodash/fp/isNative.d.ts b/types/lodash/fp/isNative.d.ts
new file mode 100644
index 0000000000..9dd6543388
--- /dev/null
+++ b/types/lodash/fp/isNative.d.ts
@@ -0,0 +1,15 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type IsNative =
+    /**
+     * Checks if value is a native function.
+     * @param value The value to check.
+     *
+     * @retrun Returns true if value is a native function, else false.
+     */
+    (value: any) => value is (...args: any[]) => any;
+
+declare const isNative: IsNative;
+export = isNative;
diff --git a/types/lodash/fp/isNil.d.ts b/types/lodash/fp/isNil.d.ts
new file mode 100644
index 0000000000..07005f1fa1
--- /dev/null
+++ b/types/lodash/fp/isNil.d.ts
@@ -0,0 +1,26 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type IsNil =
+    /**
+     * Checks if `value` is `null` or `undefined`.
+     *
+     * @category Lang
+     * @param value The value to check.
+     * @returns Returns `true` if `value` is nullish, else `false`.
+     * @example
+     *
+     * _.isNil(null);
+     * // => true
+     *
+     * _.isNil(void 0);
+     * // => true
+     *
+     * _.isNil(NaN);
+     * // => false
+     */
+    (value: any) => value is null | undefined;
+
+declare const isNil: IsNil;
+export = isNil;
diff --git a/types/lodash/fp/isNull.d.ts b/types/lodash/fp/isNull.d.ts
new file mode 100644
index 0000000000..b1d5b53e0b
--- /dev/null
+++ b/types/lodash/fp/isNull.d.ts
@@ -0,0 +1,15 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type IsNull =
+    /**
+     * Checks if value is null.
+     *
+     * @param value The value to check.
+     * @return Returns true if value is null, else false.
+     */
+    (value: any) => value is null;
+
+declare const isNull: IsNull;
+export = isNull;
diff --git a/types/lodash/fp/isNumber.d.ts b/types/lodash/fp/isNumber.d.ts
new file mode 100644
index 0000000000..fda5cca1b8
--- /dev/null
+++ b/types/lodash/fp/isNumber.d.ts
@@ -0,0 +1,17 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type IsNumber =
+    /**
+     * Checks if value is classified as a Number primitive or object.
+     *
+     * Note: To exclude Infinity, -Infinity, and NaN, which are classified as numbers, use the _.isFinite method.
+     *
+     * @param value The value to check.
+     * @return Returns true if value is correctly classified, else false.
+     */
+    (value: any) => value is number;
+
+declare const isNumber: IsNumber;
+export = isNumber;
diff --git a/types/lodash/fp/isObject.d.ts b/types/lodash/fp/isObject.d.ts
new file mode 100644
index 0000000000..9f55786107
--- /dev/null
+++ b/types/lodash/fp/isObject.d.ts
@@ -0,0 +1,16 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type IsObject =
+    /**
+     * Checks if value is the language type of Object. (e.g. arrays, functions, objects, regexes, new Number(0),
+     * and new String(''))
+     *
+     * @param value The value to check.
+     * @return Returns true if value is an object, else false.
+     */
+    (value: any) => boolean;
+
+declare const isObject: IsObject;
+export = isObject;
diff --git a/types/lodash/fp/isObjectLike.d.ts b/types/lodash/fp/isObjectLike.d.ts
new file mode 100644
index 0000000000..17fc948a2d
--- /dev/null
+++ b/types/lodash/fp/isObjectLike.d.ts
@@ -0,0 +1,30 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type IsObjectLike =
+    /**
+     * Checks if `value` is object-like. A value is object-like if it's not `null`
+     * and has a `typeof` result of "object".
+     *
+     * @category Lang
+     * @param value The value to check.
+     * @returns Returns `true` if `value` is object-like, else `false`.
+     * @example
+     *
+     * _.isObjectLike({});
+     * // => true
+     *
+     * _.isObjectLike([1, 2, 3]);
+     * // => true
+     *
+     * _.isObjectLike(_.noop);
+     * // => false
+     *
+     * _.isObjectLike(null);
+     * // => false
+     */
+    (value: any) => boolean;
+
+declare const isObjectLike: IsObjectLike;
+export = isObjectLike;
diff --git a/types/lodash/fp/isPlainObject.d.ts b/types/lodash/fp/isPlainObject.d.ts
new file mode 100644
index 0000000000..e4cadb9806
--- /dev/null
+++ b/types/lodash/fp/isPlainObject.d.ts
@@ -0,0 +1,18 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type IsPlainObject =
+    /**
+     * Checks if value is a plain object, that is, an object created by the Object constructor or one with a
+     * [[Prototype]] of null.
+     *
+     * Note: This method assumes objects created by the Object constructor have no inherited enumerable properties.
+     *
+     * @param value The value to check.
+     * @return Returns true if value is a plain object, else false.
+     */
+    (value: any) => boolean;
+
+declare const isPlainObject: IsPlainObject;
+export = isPlainObject;
diff --git a/types/lodash/fp/isRegExp.d.ts b/types/lodash/fp/isRegExp.d.ts
new file mode 100644
index 0000000000..98adef2e36
--- /dev/null
+++ b/types/lodash/fp/isRegExp.d.ts
@@ -0,0 +1,15 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type IsRegExp =
+    /**
+     * Checks if value is classified as a RegExp object.
+     * @param value The value to check.
+     *
+     * @return Returns true if value is correctly classified, else false.
+     */
+    (value: any) => value is RegExp;
+
+declare const isRegExp: IsRegExp;
+export = isRegExp;
diff --git a/types/lodash/fp/isSafeInteger.d.ts b/types/lodash/fp/isSafeInteger.d.ts
new file mode 100644
index 0000000000..60d49e1be8
--- /dev/null
+++ b/types/lodash/fp/isSafeInteger.d.ts
@@ -0,0 +1,32 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type IsSafeInteger =
+    /**
+     * Checks if `value` is a safe integer. An integer is safe if it's an IEEE-754
+     * double precision number which isn't the result of a rounded unsafe integer.
+     *
+     * **Note:** This method is based on [`Number.isSafeInteger`](https://mdn.io/Number/isSafeInteger).
+     *
+     * @category Lang
+     * @param value The value to check.
+     * @returns Returns `true` if `value` is a safe integer, else `false`.
+     * @example
+     *
+     * _.isSafeInteger(3);
+     * // => true
+     *
+     * _.isSafeInteger(Number.MIN_VALUE);
+     * // => false
+     *
+     * _.isSafeInteger(Infinity);
+     * // => false
+     *
+     * _.isSafeInteger('3');
+     * // => false
+     */
+    (value: any) => boolean;
+
+declare const isSafeInteger: IsSafeInteger;
+export = isSafeInteger;
diff --git a/types/lodash/fp/isSet.d.ts b/types/lodash/fp/isSet.d.ts
new file mode 100644
index 0000000000..7be7de7600
--- /dev/null
+++ b/types/lodash/fp/isSet.d.ts
@@ -0,0 +1,15 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type IsSet =
+    /**
+     * Checks if value is classified as a Set object.
+     *
+     * @param value The value to check.
+     * @returns Returns true if value is correctly classified, else false.
+     */
+    (value: any) => value is Set<any>;
+
+declare const isSet: IsSet;
+export = isSet;
diff --git a/types/lodash/fp/isString.d.ts b/types/lodash/fp/isString.d.ts
new file mode 100644
index 0000000000..fea109178e
--- /dev/null
+++ b/types/lodash/fp/isString.d.ts
@@ -0,0 +1,15 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type IsString =
+    /**
+     * Checks if value is classified as a String primitive or object.
+     *
+     * @param value The value to check.
+     * @return Returns true if value is correctly classified, else false.
+     */
+    (value: any) => value is string;
+
+declare const isString: IsString;
+export = isString;
diff --git a/types/lodash/fp/isSymbol.d.ts b/types/lodash/fp/isSymbol.d.ts
new file mode 100644
index 0000000000..fe30bad576
--- /dev/null
+++ b/types/lodash/fp/isSymbol.d.ts
@@ -0,0 +1,23 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type IsSymbol =
+    /**
+     * Checks if `value` is classified as a `Symbol` primitive or object.
+     *
+     * @category Lang
+     * @param value The value to check.
+     * @returns Returns `true` if `value` is correctly classified, else `false`.
+     * @example
+     *
+     * _.isSymbol(Symbol.iterator);
+     * // => true
+     *
+     * _.isSymbol('abc');
+     * // => false
+     */
+    (value: any) => boolean;
+
+declare const isSymbol: IsSymbol;
+export = isSymbol;
diff --git a/types/lodash/fp/isTypedArray.d.ts b/types/lodash/fp/isTypedArray.d.ts
new file mode 100644
index 0000000000..076fb84e05
--- /dev/null
+++ b/types/lodash/fp/isTypedArray.d.ts
@@ -0,0 +1,15 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type IsTypedArray =
+    /**
+     * Checks if value is classified as a typed array.
+     *
+     * @param value The value to check.
+     * @return Returns true if value is correctly classified, else false.
+     */
+    (value: any) => boolean;
+
+declare const isTypedArray: IsTypedArray;
+export = isTypedArray;
diff --git a/types/lodash/fp/isUndefined.d.ts b/types/lodash/fp/isUndefined.d.ts
new file mode 100644
index 0000000000..3980dd5742
--- /dev/null
+++ b/types/lodash/fp/isUndefined.d.ts
@@ -0,0 +1,15 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type IsUndefined =
+    /**
+     * Checks if value is undefined.
+     *
+     * @param value The value to check.
+     * @return Returns true if value is undefined, else false.
+     */
+    (value: any) => value is undefined;
+
+declare const isUndefined: IsUndefined;
+export = isUndefined;
diff --git a/types/lodash/fp/isWeakMap.d.ts b/types/lodash/fp/isWeakMap.d.ts
new file mode 100644
index 0000000000..9edb2fbb71
--- /dev/null
+++ b/types/lodash/fp/isWeakMap.d.ts
@@ -0,0 +1,15 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type IsWeakMap =
+    /**
+     * Checks if value is classified as a WeakMap object.
+     *
+     * @param value The value to check.
+     * @returns Returns true if value is correctly classified, else false.
+     */
+    (value: any) => value is WeakMap<object, any>;
+
+declare const isWeakMap: IsWeakMap;
+export = isWeakMap;
diff --git a/types/lodash/fp/isWeakSet.d.ts b/types/lodash/fp/isWeakSet.d.ts
new file mode 100644
index 0000000000..cf7bd7cf01
--- /dev/null
+++ b/types/lodash/fp/isWeakSet.d.ts
@@ -0,0 +1,15 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type IsWeakSet =
+    /**
+     * Checks if value is classified as a WeakSet object.
+     *
+     * @param value The value to check.
+     * @returns Returns true if value is correctly classified, else false.
+     */
+    (value: any) => value is WeakSet<object>;
+
+declare const isWeakSet: IsWeakSet;
+export = isWeakSet;
diff --git a/types/lodash/fp/iteratee.d.ts b/types/lodash/fp/iteratee.d.ts
new file mode 100644
index 0000000000..669d1d92d5
--- /dev/null
+++ b/types/lodash/fp/iteratee.d.ts
@@ -0,0 +1,65 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface Iteratee {
+    /**
+     * Creates a function that invokes `func` with the arguments of the created
+     * function. If `func` is a property name the created callback returns the
+     * property value for a given element. If `func` is an object the created
+     * callback returns `true` for elements that contain the equivalent object properties, otherwise it returns `false`.
+     *
+     * @category Util
+     * @param [func=_.identity] The value to convert to a callback.
+     * @returns Returns the callback.
+     * @example
+     *
+     * var users = [
+     *   { 'user': 'barney', 'age': 36 },
+     *   { 'user': 'fred',   'age': 40 }
+     * ];
+     *
+     * // create custom iteratee shorthands
+     * _.iteratee = _.wrap(_.iteratee, function(callback, func) {
+     *   var p = /^(\S+)\s*([<>])\s*(\S+)$/.exec(func);
+     *   return !p ? callback(func) : function(object) {
+     * return (p[2] == '>' ? object[p[1]] > p[3] : object[p[1]] < p[3]);
+     *   };
+     * });
+     *
+     * _.filter(users, 'age > 36');
+     * // => [{ 'user': 'fred', 'age': 40 }]
+     */
+    <TFunction extends (...args: any[]) => any>(func: TFunction): TFunction;
+    /**
+     * Creates a function that invokes `func` with the arguments of the created
+     * function. If `func` is a property name the created callback returns the
+     * property value for a given element. If `func` is an object the created
+     * callback returns `true` for elements that contain the equivalent object properties, otherwise it returns `false`.
+     *
+     * @category Util
+     * @param [func=_.identity] The value to convert to a callback.
+     * @returns Returns the callback.
+     * @example
+     *
+     * var users = [
+     *   { 'user': 'barney', 'age': 36 },
+     *   { 'user': 'fred',   'age': 40 }
+     * ];
+     *
+     * // create custom iteratee shorthands
+     * _.iteratee = _.wrap(_.iteratee, function(callback, func) {
+     *   var p = /^(\S+)\s*([<>])\s*(\S+)$/.exec(func);
+     *   return !p ? callback(func) : function(object) {
+     * return (p[2] == '>' ? object[p[1]] > p[3] : object[p[1]] < p[3]);
+     *   };
+     * });
+     *
+     * _.filter(users, 'age > 36');
+     * // => [{ 'user': 'fred', 'age': 40 }]
+     */
+    (func: string | object): (...args: any[]) => any;
+}
+
+declare const iteratee: Iteratee;
+export = iteratee;
diff --git a/types/lodash/fp/join.d.ts b/types/lodash/fp/join.d.ts
new file mode 100644
index 0000000000..7b678d0738
--- /dev/null
+++ b/types/lodash/fp/join.d.ts
@@ -0,0 +1,53 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Join {
+    /**
+     * Converts all elements in `array` into a string separated by `separator`.
+     *
+     * @param array The array to convert.
+     * @param separator The element separator.
+     * @returns Returns the joined string.
+     */
+    (): Join;
+    /**
+     * Converts all elements in `array` into a string separated by `separator`.
+     *
+     * @param array The array to convert.
+     * @param separator The element separator.
+     * @returns Returns the joined string.
+     */
+    (separator: string): Join1x1;
+    /**
+     * Converts all elements in `array` into a string separated by `separator`.
+     *
+     * @param array The array to convert.
+     * @param separator The element separator.
+     * @returns Returns the joined string.
+     */
+    (separator: string, array: _.List<any> | null | undefined): string;
+}
+interface Join1x1 {
+    /**
+     * Converts all elements in `array` into a string separated by `separator`.
+     *
+     * @param array The array to convert.
+     * @param separator The element separator.
+     * @returns Returns the joined string.
+     */
+    (): Join1x1;
+    /**
+     * Converts all elements in `array` into a string separated by `separator`.
+     *
+     * @param array The array to convert.
+     * @param separator The element separator.
+     * @returns Returns the joined string.
+     */
+    (array: _.List<any> | null | undefined): string;
+}
+
+declare const join: Join;
+export = join;
diff --git a/types/lodash/fp/juxt.d.ts b/types/lodash/fp/juxt.d.ts
new file mode 100644
index 0000000000..9131ad7914
--- /dev/null
+++ b/types/lodash/fp/juxt.d.ts
@@ -0,0 +1,18 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+type Over =
+    /**
+     * Creates a function that invokes iteratees with the arguments provided to the created function and returns
+     * their results.
+     *
+     * @param iteratees The iteratees to invoke.
+     * @return Returns the new function.
+     */
+    <TResult>(iteratees: _.Many<(...args: any[]) => TResult>) => (...args: any[]) => TResult[];
+
+declare const juxt: Over;
+export = juxt;
diff --git a/types/lodash/fp/kebabCase.d.ts b/types/lodash/fp/kebabCase.d.ts
new file mode 100644
index 0000000000..6a46ada134
--- /dev/null
+++ b/types/lodash/fp/kebabCase.d.ts
@@ -0,0 +1,15 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type KebabCase =
+    /**
+     * Converts string to kebab case.
+     *
+     * @param string The string to convert.
+     * @return Returns the kebab cased string.
+     */
+    (string: string) => string;
+
+declare const kebabCase: KebabCase;
+export = kebabCase;
diff --git a/types/lodash/fp/keyBy.d.ts b/types/lodash/fp/keyBy.d.ts
new file mode 100644
index 0000000000..d9ebba52bf
--- /dev/null
+++ b/types/lodash/fp/keyBy.d.ts
@@ -0,0 +1,225 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface KeyBy {
+    /**
+     * Creates an object composed of keys generated from the results of running each element of collection through
+     * iteratee. The corresponding value of each key is the last element responsible for generating the key. The
+     * iteratee function is bound to thisArg and invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the composed aggregate object.
+     */
+    (): KeyBy;
+    /**
+     * Creates an object composed of keys generated from the results of running each element of collection through
+     * iteratee. The corresponding value of each key is the last element responsible for generating the key. The
+     * iteratee function is bound to thisArg and invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the composed aggregate object.
+     */
+    (iteratee: (value: string) => _.PropertyName): KeyBy1x1;
+    /**
+     * Creates an object composed of keys generated from the results of running each element of collection through
+     * iteratee. The corresponding value of each key is the last element responsible for generating the key. The
+     * iteratee function is bound to thisArg and invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the composed aggregate object.
+     */
+    (iteratee: (value: string) => _.PropertyName, collection: string | null | undefined): _.Dictionary<string>;
+    /**
+     * Creates an object composed of keys generated from the results of running each element of collection through
+     * iteratee. The corresponding value of each key is the last element responsible for generating the key. The
+     * iteratee function is bound to thisArg and invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the composed aggregate object.
+     */
+    <T>(iteratee: _.ValueIterateeCustom<T, _.PropertyName>): KeyBy2x1<T>;
+    /**
+     * Creates an object composed of keys generated from the results of running each element of collection through
+     * iteratee. The corresponding value of each key is the last element responsible for generating the key. The
+     * iteratee function is bound to thisArg and invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the composed aggregate object.
+     */
+    <T>(iteratee: _.ValueIterateeCustom<T, _.PropertyName>, collection: _.List<T> | null | undefined): _.Dictionary<T>;
+    /**
+     * Creates an object composed of keys generated from the results of running each element of collection through
+     * iteratee. The corresponding value of each key is the last element responsible for generating the key. The
+     * iteratee function is bound to thisArg and invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the composed aggregate object.
+     */
+    <T extends object>(iteratee: _.ValueIterateeCustom<T[keyof T], _.PropertyName>, collection: T | null | undefined): _.Dictionary<T[keyof T]>;
+}
+interface KeyBy1x1 {
+    /**
+     * Creates an object composed of keys generated from the results of running each element of collection through
+     * iteratee. The corresponding value of each key is the last element responsible for generating the key. The
+     * iteratee function is bound to thisArg and invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the composed aggregate object.
+     */
+    (): KeyBy1x1;
+    /**
+     * Creates an object composed of keys generated from the results of running each element of collection through
+     * iteratee. The corresponding value of each key is the last element responsible for generating the key. The
+     * iteratee function is bound to thisArg and invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the composed aggregate object.
+     */
+    (collection: string | null | undefined): _.Dictionary<string>;
+}
+interface KeyBy2x1<T> {
+    /**
+     * Creates an object composed of keys generated from the results of running each element of collection through
+     * iteratee. The corresponding value of each key is the last element responsible for generating the key. The
+     * iteratee function is bound to thisArg and invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the composed aggregate object.
+     */
+    (): KeyBy2x1<T>;
+    /**
+     * Creates an object composed of keys generated from the results of running each element of collection through
+     * iteratee. The corresponding value of each key is the last element responsible for generating the key. The
+     * iteratee function is bound to thisArg and invoked with three arguments:
+     * (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the composed aggregate object.
+     */
+    (collection: _.List<T> | object | null | undefined): _.Dictionary<T>;
+}
+
+declare const keyBy: KeyBy;
+export = keyBy;
diff --git a/types/lodash/fp/keys.d.ts b/types/lodash/fp/keys.d.ts
new file mode 100644
index 0000000000..0cfa0ac21e
--- /dev/null
+++ b/types/lodash/fp/keys.d.ts
@@ -0,0 +1,17 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type Keys =
+    /**
+     * Creates an array of the own enumerable property names of object.
+     *
+     * Note: Non-object values are coerced to objects. See the ES spec for more details.
+     *
+     * @param object The object to query.
+     * @return Returns the array of property names.
+     */
+    (object: any) => string[];
+
+declare const keys: Keys;
+export = keys;
diff --git a/types/lodash/fp/keysIn.d.ts b/types/lodash/fp/keysIn.d.ts
new file mode 100644
index 0000000000..827f1edbaa
--- /dev/null
+++ b/types/lodash/fp/keysIn.d.ts
@@ -0,0 +1,17 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type KeysIn =
+    /**
+     * Creates an array of the own and inherited enumerable property names of object.
+     *
+     * Note: Non-object values are coerced to objects.
+     *
+     * @param object The object to query.
+     * @return An array of property names.
+     */
+    (object: any) => string[];
+
+declare const keysIn: KeysIn;
+export = keysIn;
diff --git a/types/lodash/fp/last.d.ts b/types/lodash/fp/last.d.ts
new file mode 100644
index 0000000000..4473a221f9
--- /dev/null
+++ b/types/lodash/fp/last.d.ts
@@ -0,0 +1,17 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+type Last =
+    /**
+     * Gets the last element of array.
+     *
+     * @param array The array to query.
+     * @return Returns the last element of array.
+     */
+    <T>(array: _.List<T> | null | undefined) => T | undefined;
+
+declare const last: Last;
+export = last;
diff --git a/types/lodash/fp/lastIndexOf.d.ts b/types/lodash/fp/lastIndexOf.d.ts
new file mode 100644
index 0000000000..a21af0a596
--- /dev/null
+++ b/types/lodash/fp/lastIndexOf.d.ts
@@ -0,0 +1,58 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface LastIndexOf {
+    /**
+     * This method is like _.indexOf except that it iterates over elements of array from right to left.
+     *
+     * @param array The array to search.
+     * @param value The value to search for.
+     * @param fromIndex The index to search from or true to perform a binary search on a sorted array.
+     * @return Returns the index of the matched value, else -1.
+     */
+    (): LastIndexOf;
+    /**
+     * This method is like _.indexOf except that it iterates over elements of array from right to left.
+     *
+     * @param array The array to search.
+     * @param value The value to search for.
+     * @param fromIndex The index to search from or true to perform a binary search on a sorted array.
+     * @return Returns the index of the matched value, else -1.
+     */
+    <T>(value: T): LastIndexOf1x1<T>;
+    /**
+     * This method is like _.indexOf except that it iterates over elements of array from right to left.
+     *
+     * @param array The array to search.
+     * @param value The value to search for.
+     * @param fromIndex The index to search from or true to perform a binary search on a sorted array.
+     * @return Returns the index of the matched value, else -1.
+     */
+    <T>(value: T, array: _.List<T> | null | undefined): number;
+}
+interface LastIndexOf1x1<T> {
+    /**
+     * This method is like _.indexOf except that it iterates over elements of array from right to left.
+     *
+     * @param array The array to search.
+     * @param value The value to search for.
+     * @param fromIndex The index to search from or true to perform a binary search on a sorted array.
+     * @return Returns the index of the matched value, else -1.
+     */
+    (): LastIndexOf1x1<T>;
+    /**
+     * This method is like _.indexOf except that it iterates over elements of array from right to left.
+     *
+     * @param array The array to search.
+     * @param value The value to search for.
+     * @param fromIndex The index to search from or true to perform a binary search on a sorted array.
+     * @return Returns the index of the matched value, else -1.
+     */
+    (array: _.List<T> | null | undefined): number;
+}
+
+declare const lastIndexOf: LastIndexOf;
+export = lastIndexOf;
diff --git a/types/lodash/fp/lastIndexOfFrom.d.ts b/types/lodash/fp/lastIndexOfFrom.d.ts
new file mode 100644
index 0000000000..0bea8e22c7
--- /dev/null
+++ b/types/lodash/fp/lastIndexOfFrom.d.ts
@@ -0,0 +1,96 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface LastIndexOf {
+    /**
+     * This method is like _.indexOf except that it iterates over elements of array from right to left.
+     *
+     * @param array The array to search.
+     * @param value The value to search for.
+     * @param fromIndex The index to search from or true to perform a binary search on a sorted array.
+     * @return Returns the index of the matched value, else -1.
+     */
+    (): LastIndexOf;
+    /**
+     * This method is like _.indexOf except that it iterates over elements of array from right to left.
+     *
+     * @param array The array to search.
+     * @param value The value to search for.
+     * @param fromIndex The index to search from or true to perform a binary search on a sorted array.
+     * @return Returns the index of the matched value, else -1.
+     */
+    <T>(value: T): LastIndexOf1x1<T>;
+    /**
+     * This method is like _.indexOf except that it iterates over elements of array from right to left.
+     *
+     * @param array The array to search.
+     * @param value The value to search for.
+     * @param fromIndex The index to search from or true to perform a binary search on a sorted array.
+     * @return Returns the index of the matched value, else -1.
+     */
+    <T>(value: T, fromIndex: true|number): LastIndexOf1x2<T>;
+    /**
+     * This method is like _.indexOf except that it iterates over elements of array from right to left.
+     *
+     * @param array The array to search.
+     * @param value The value to search for.
+     * @param fromIndex The index to search from or true to perform a binary search on a sorted array.
+     * @return Returns the index of the matched value, else -1.
+     */
+    <T>(value: T, fromIndex: true|number, array: _.List<T> | null | undefined): number;
+}
+interface LastIndexOf1x1<T> {
+    /**
+     * This method is like _.indexOf except that it iterates over elements of array from right to left.
+     *
+     * @param array The array to search.
+     * @param value The value to search for.
+     * @param fromIndex The index to search from or true to perform a binary search on a sorted array.
+     * @return Returns the index of the matched value, else -1.
+     */
+    (): LastIndexOf1x1<T>;
+    /**
+     * This method is like _.indexOf except that it iterates over elements of array from right to left.
+     *
+     * @param array The array to search.
+     * @param value The value to search for.
+     * @param fromIndex The index to search from or true to perform a binary search on a sorted array.
+     * @return Returns the index of the matched value, else -1.
+     */
+    (fromIndex: true|number): LastIndexOf1x2<T>;
+    /**
+     * This method is like _.indexOf except that it iterates over elements of array from right to left.
+     *
+     * @param array The array to search.
+     * @param value The value to search for.
+     * @param fromIndex The index to search from or true to perform a binary search on a sorted array.
+     * @return Returns the index of the matched value, else -1.
+     */
+    (fromIndex: true|number, array: _.List<T> | null | undefined): number;
+}
+interface LastIndexOf1x2<T> {
+    /**
+     * This method is like _.indexOf except that it iterates over elements of array from right to left.
+     *
+     * @param array The array to search.
+     * @param value The value to search for.
+     * @param fromIndex The index to search from or true to perform a binary search on a sorted array.
+     * @return Returns the index of the matched value, else -1.
+     */
+    (): LastIndexOf1x2<T>;
+    /**
+     * This method is like _.indexOf except that it iterates over elements of array from right to left.
+     *
+     * @param array The array to search.
+     * @param value The value to search for.
+     * @param fromIndex The index to search from or true to perform a binary search on a sorted array.
+     * @return Returns the index of the matched value, else -1.
+     */
+    (array: _.List<T> | null | undefined): number;
+}
+
+declare const lastIndexOfFrom: LastIndexOf;
+export = lastIndexOfFrom;
diff --git a/types/lodash/fp/lowerCase.d.ts b/types/lodash/fp/lowerCase.d.ts
new file mode 100644
index 0000000000..628744e48b
--- /dev/null
+++ b/types/lodash/fp/lowerCase.d.ts
@@ -0,0 +1,15 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type LowerCase =
+    /**
+     * Converts `string`, as space separated words, to lower case.
+     *
+     * @param string The string to convert.
+     * @return Returns the lower cased string.
+     */
+    (string: string) => string;
+
+declare const lowerCase: LowerCase;
+export = lowerCase;
diff --git a/types/lodash/fp/lowerFirst.d.ts b/types/lodash/fp/lowerFirst.d.ts
new file mode 100644
index 0000000000..a88e572706
--- /dev/null
+++ b/types/lodash/fp/lowerFirst.d.ts
@@ -0,0 +1,15 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type LowerFirst =
+    /**
+     * Converts the first character of `string` to lower case.
+     *
+     * @param string The string to convert.
+     * @return Returns the converted string.
+     */
+    (string: string) => string;
+
+declare const lowerFirst: LowerFirst;
+export = lowerFirst;
diff --git a/types/lodash/fp/lt.d.ts b/types/lodash/fp/lt.d.ts
new file mode 100644
index 0000000000..8259c6d845
--- /dev/null
+++ b/types/lodash/fp/lt.d.ts
@@ -0,0 +1,51 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface Lt {
+    /**
+     * Checks if value is less than other.
+     *
+     * @param value The value to compare.
+     * @param other The other value to compare.
+     * @return Returns true if value is less than other, else false.
+     */
+    (): Lt;
+    /**
+     * Checks if value is less than other.
+     *
+     * @param value The value to compare.
+     * @param other The other value to compare.
+     * @return Returns true if value is less than other, else false.
+     */
+    (value: any): Lt1x1;
+    /**
+     * Checks if value is less than other.
+     *
+     * @param value The value to compare.
+     * @param other The other value to compare.
+     * @return Returns true if value is less than other, else false.
+     */
+    (value: any, other: any): boolean;
+}
+interface Lt1x1 {
+    /**
+     * Checks if value is less than other.
+     *
+     * @param value The value to compare.
+     * @param other The other value to compare.
+     * @return Returns true if value is less than other, else false.
+     */
+    (): Lt1x1;
+    /**
+     * Checks if value is less than other.
+     *
+     * @param value The value to compare.
+     * @param other The other value to compare.
+     * @return Returns true if value is less than other, else false.
+     */
+    (other: any): boolean;
+}
+
+declare const lt: Lt;
+export = lt;
diff --git a/types/lodash/fp/lte.d.ts b/types/lodash/fp/lte.d.ts
new file mode 100644
index 0000000000..e3ac6503f7
--- /dev/null
+++ b/types/lodash/fp/lte.d.ts
@@ -0,0 +1,51 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface Lte {
+    /**
+     * Checks if value is less than or equal to other.
+     *
+     * @param value The value to compare.
+     * @param other The other value to compare.
+     * @return Returns true if value is less than or equal to other, else false.
+     */
+    (): Lte;
+    /**
+     * Checks if value is less than or equal to other.
+     *
+     * @param value The value to compare.
+     * @param other The other value to compare.
+     * @return Returns true if value is less than or equal to other, else false.
+     */
+    (value: any): Lte1x1;
+    /**
+     * Checks if value is less than or equal to other.
+     *
+     * @param value The value to compare.
+     * @param other The other value to compare.
+     * @return Returns true if value is less than or equal to other, else false.
+     */
+    (value: any, other: any): boolean;
+}
+interface Lte1x1 {
+    /**
+     * Checks if value is less than or equal to other.
+     *
+     * @param value The value to compare.
+     * @param other The other value to compare.
+     * @return Returns true if value is less than or equal to other, else false.
+     */
+    (): Lte1x1;
+    /**
+     * Checks if value is less than or equal to other.
+     *
+     * @param value The value to compare.
+     * @param other The other value to compare.
+     * @return Returns true if value is less than or equal to other, else false.
+     */
+    (other: any): boolean;
+}
+
+declare const lte: Lte;
+export = lte;
diff --git a/types/lodash/fp/map.d.ts b/types/lodash/fp/map.d.ts
new file mode 100644
index 0000000000..900e11d0d0
--- /dev/null
+++ b/types/lodash/fp/map.d.ts
@@ -0,0 +1,588 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Map {
+    /**
+     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
+     * thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property value
+     * of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
+     * _.reject, and _.some.
+     *
+     * The guarded methods are:
+     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
+     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
+     * sample, some, sum, uniq, and words
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped array.
+     */
+    (): Map;
+    /**
+     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
+     * thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property value
+     * of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
+     * _.reject, and _.some.
+     *
+     * The guarded methods are:
+     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
+     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
+     * sample, some, sum, uniq, and words
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped array.
+     */
+    <T, TResult>(iteratee: (value: T) => TResult): Map1x1<T, TResult>;
+    /**
+     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
+     * thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property value
+     * of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
+     * _.reject, and _.some.
+     *
+     * The guarded methods are:
+     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
+     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
+     * sample, some, sum, uniq, and words
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped array.
+     */
+    <T, TResult>(iteratee: (value: T) => TResult, collection: T[] | _.List<T> | null | undefined): TResult[];
+    /**
+     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
+     * thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property value
+     * of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
+     * _.reject, and _.some.
+     *
+     * The guarded methods are:
+     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
+     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
+     * sample, some, sum, uniq, and words
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped array.
+     */
+    <T extends object, TResult>(iteratee: (value: T[keyof T]) => TResult): Map3x1<T, TResult>;
+    /**
+     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
+     * thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property value
+     * of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
+     * _.reject, and _.some.
+     *
+     * The guarded methods are:
+     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
+     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
+     * sample, some, sum, uniq, and words
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped array.
+     */
+    <T extends object, TResult>(iteratee: (value: T[keyof T]) => TResult, collection: T | null | undefined): TResult[];
+    /**
+     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
+     * thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property value
+     * of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
+     * _.reject, and _.some.
+     *
+     * The guarded methods are:
+     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
+     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
+     * sample, some, sum, uniq, and words
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped array.
+     */
+    <T, K extends keyof T>(iteratee: K): Map4x1<T, K>;
+    /**
+     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
+     * thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property value
+     * of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
+     * _.reject, and _.some.
+     *
+     * The guarded methods are:
+     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
+     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
+     * sample, some, sum, uniq, and words
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped array.
+     */
+    <T, K extends keyof T>(iteratee: K, collection: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): Array<T[K]>;
+    /**
+     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
+     * thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property value
+     * of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
+     * _.reject, and _.some.
+     *
+     * The guarded methods are:
+     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
+     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
+     * sample, some, sum, uniq, and words
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped array.
+     */
+    (iteratee: string): Map5x1;
+    /**
+     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
+     * thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property value
+     * of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
+     * _.reject, and _.some.
+     *
+     * The guarded methods are:
+     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
+     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
+     * sample, some, sum, uniq, and words
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped array.
+     */
+    <T>(iteratee: string, collection: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): any[];
+    /**
+     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
+     * thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property value
+     * of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
+     * _.reject, and _.some.
+     *
+     * The guarded methods are:
+     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
+     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
+     * sample, some, sum, uniq, and words
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped array.
+     */
+    (iteratee: object): Map6x1;
+    /**
+     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
+     * thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property value
+     * of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
+     * _.reject, and _.some.
+     *
+     * The guarded methods are:
+     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
+     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
+     * sample, some, sum, uniq, and words
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped array.
+     */
+    <T>(iteratee: object, collection: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): boolean[];
+}
+interface Map1x1<T, TResult> {
+    /**
+     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
+     * thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property value
+     * of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
+     * _.reject, and _.some.
+     *
+     * The guarded methods are:
+     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
+     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
+     * sample, some, sum, uniq, and words
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped array.
+     */
+    (): Map1x1<T, TResult>;
+    /**
+     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
+     * thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property value
+     * of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
+     * _.reject, and _.some.
+     *
+     * The guarded methods are:
+     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
+     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
+     * sample, some, sum, uniq, and words
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped array.
+     */
+    (collection: T[] | _.List<T> | null | undefined): TResult[];
+}
+interface Map3x1<T extends object, TResult> {
+    /**
+     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
+     * thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property value
+     * of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
+     * _.reject, and _.some.
+     *
+     * The guarded methods are:
+     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
+     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
+     * sample, some, sum, uniq, and words
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped array.
+     */
+    (): Map3x1<T, TResult>;
+    /**
+     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
+     * thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property value
+     * of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
+     * _.reject, and _.some.
+     *
+     * The guarded methods are:
+     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
+     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
+     * sample, some, sum, uniq, and words
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped array.
+     */
+    (collection: T | null | undefined): TResult[];
+}
+interface Map4x1<T, K extends keyof T> {
+    /**
+     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
+     * thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property value
+     * of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
+     * _.reject, and _.some.
+     *
+     * The guarded methods are:
+     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
+     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
+     * sample, some, sum, uniq, and words
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped array.
+     */
+    (): Map4x1<T, K>;
+    /**
+     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
+     * thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property value
+     * of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
+     * _.reject, and _.some.
+     *
+     * The guarded methods are:
+     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
+     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
+     * sample, some, sum, uniq, and words
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped array.
+     */
+    (collection: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): Array<T[K]>;
+}
+interface Map5x1 {
+    /**
+     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
+     * thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property value
+     * of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
+     * _.reject, and _.some.
+     *
+     * The guarded methods are:
+     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
+     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
+     * sample, some, sum, uniq, and words
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped array.
+     */
+    (): Map5x1;
+    /**
+     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
+     * thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property value
+     * of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
+     * _.reject, and _.some.
+     *
+     * The guarded methods are:
+     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
+     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
+     * sample, some, sum, uniq, and words
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped array.
+     */
+    <T>(collection: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): any[];
+}
+interface Map6x1 {
+    /**
+     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
+     * thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property value
+     * of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
+     * _.reject, and _.some.
+     *
+     * The guarded methods are:
+     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
+     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
+     * sample, some, sum, uniq, and words
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped array.
+     */
+    (): Map6x1;
+    /**
+     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
+     * thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property value
+     * of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
+     * _.reject, and _.some.
+     *
+     * The guarded methods are:
+     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
+     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
+     * sample, some, sum, uniq, and words
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped array.
+     */
+    <T>(collection: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): boolean[];
+}
+
+declare const map: Map;
+export = map;
diff --git a/types/lodash/fp/mapKeys.d.ts b/types/lodash/fp/mapKeys.d.ts
new file mode 100644
index 0000000000..348fdff591
--- /dev/null
+++ b/types/lodash/fp/mapKeys.d.ts
@@ -0,0 +1,105 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface MapKeys {
+    /**
+     * The opposite of _.mapValues; this method creates an object with the same values as object and keys generated
+     * by running each own enumerable property of object through iteratee.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped object.
+     */
+    (): MapKeys;
+    /**
+     * The opposite of _.mapValues; this method creates an object with the same values as object and keys generated
+     * by running each own enumerable property of object through iteratee.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped object.
+     */
+    (iteratee: _.ValueIteratee<number>): MapKeys1x1;
+    /**
+     * The opposite of _.mapValues; this method creates an object with the same values as object and keys generated
+     * by running each own enumerable property of object through iteratee.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped object.
+     */
+    <T>(iteratee: _.ValueIteratee<number>, object: _.List<T> | null | undefined): _.Dictionary<T>;
+    /**
+     * The opposite of _.mapValues; this method creates an object with the same values as object and keys generated
+     * by running each own enumerable property of object through iteratee.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped object.
+     */
+    (iteratee: _.ValueIteratee<string>): MapKeys2x1;
+    /**
+     * The opposite of _.mapValues; this method creates an object with the same values as object and keys generated
+     * by running each own enumerable property of object through iteratee.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped object.
+     */
+    <T extends object>(iteratee: _.ValueIteratee<string>, object: T | null | undefined): _.Dictionary<T[keyof T]>;
+}
+interface MapKeys1x1 {
+    /**
+     * The opposite of _.mapValues; this method creates an object with the same values as object and keys generated
+     * by running each own enumerable property of object through iteratee.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped object.
+     */
+    (): MapKeys1x1;
+    /**
+     * The opposite of _.mapValues; this method creates an object with the same values as object and keys generated
+     * by running each own enumerable property of object through iteratee.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped object.
+     */
+    <T>(object: _.List<T> | null | undefined): _.Dictionary<T>;
+}
+interface MapKeys2x1 {
+    /**
+     * The opposite of _.mapValues; this method creates an object with the same values as object and keys generated
+     * by running each own enumerable property of object through iteratee.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped object.
+     */
+    (): MapKeys2x1;
+    /**
+     * The opposite of _.mapValues; this method creates an object with the same values as object and keys generated
+     * by running each own enumerable property of object through iteratee.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped object.
+     */
+    <T extends object>(object: T | null | undefined): _.Dictionary<T[keyof T]>;
+}
+
+declare const mapKeys: MapKeys;
+export = mapKeys;
diff --git a/types/lodash/fp/mapValues.d.ts b/types/lodash/fp/mapValues.d.ts
new file mode 100644
index 0000000000..ce44dda737
--- /dev/null
+++ b/types/lodash/fp/mapValues.d.ts
@@ -0,0 +1,603 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface MapValues {
+    /**
+    * Creates an object with the same keys as object and values generated by running each own
+    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
+    * and invoked with three arguments: (value, key, object).
+    *
+    * If a property name is provided iteratee the created "_.property" style callback returns
+    * the property value of the given element.
+    *
+    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
+    * true for elements that have a matching property value, else false;.
+    *
+    * If an object is provided for iteratee the created "_.matches" style callback returns true
+    * for elements that have the properties of the given object, else false.
+    *
+    * @param object The object to iterate over.
+    * @param [iteratee=_.identity]  The function invoked per iteration.
+    * @param [thisArg] The `this` binding of `iteratee`.
+    * @return Returns the new mapped object.
+    */
+    (): MapValues;
+    /**
+    * Creates an object with the same keys as object and values generated by running each own
+    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
+    * and invoked with three arguments: (value, key, object).
+    *
+    * If a property name is provided iteratee the created "_.property" style callback returns
+    * the property value of the given element.
+    *
+    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
+    * true for elements that have a matching property value, else false;.
+    *
+    * If an object is provided for iteratee the created "_.matches" style callback returns true
+    * for elements that have the properties of the given object, else false.
+    *
+    * @param object The object to iterate over.
+    * @param [iteratee=_.identity]  The function invoked per iteration.
+    * @param [thisArg] The `this` binding of `iteratee`.
+    * @return Returns the new mapped object.
+    */
+    <TResult>(callback: (value: string) => TResult): MapValues1x1<TResult>;
+    /**
+    * Creates an object with the same keys as object and values generated by running each own
+    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
+    * and invoked with three arguments: (value, key, object).
+    *
+    * If a property name is provided iteratee the created "_.property" style callback returns
+    * the property value of the given element.
+    *
+    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
+    * true for elements that have a matching property value, else false;.
+    *
+    * If an object is provided for iteratee the created "_.matches" style callback returns true
+    * for elements that have the properties of the given object, else false.
+    *
+    * @param object The object to iterate over.
+    * @param [iteratee=_.identity]  The function invoked per iteration.
+    * @param [thisArg] The `this` binding of `iteratee`.
+    * @return Returns the new mapped object.
+    */
+    <TResult>(callback: (value: string) => TResult, obj: string | null | undefined): _.NumericDictionary<TResult>;
+    /**
+    * Creates an object with the same keys as object and values generated by running each own
+    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
+    * and invoked with three arguments: (value, key, object).
+    *
+    * If a property name is provided iteratee the created "_.property" style callback returns
+    * the property value of the given element.
+    *
+    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
+    * true for elements that have a matching property value, else false;.
+    *
+    * If an object is provided for iteratee the created "_.matches" style callback returns true
+    * for elements that have the properties of the given object, else false.
+    *
+    * @param object The object to iterate over.
+    * @param [iteratee=_.identity]  The function invoked per iteration.
+    * @param [thisArg] The `this` binding of `iteratee`.
+    * @return Returns the new mapped object.
+    */
+    <T, TResult>(callback: (value: T) => TResult): MapValues2x1<T, TResult>;
+    /**
+    * Creates an object with the same keys as object and values generated by running each own
+    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
+    * and invoked with three arguments: (value, key, object).
+    *
+    * If a property name is provided iteratee the created "_.property" style callback returns
+    * the property value of the given element.
+    *
+    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
+    * true for elements that have a matching property value, else false;.
+    *
+    * If an object is provided for iteratee the created "_.matches" style callback returns true
+    * for elements that have the properties of the given object, else false.
+    *
+    * @param object The object to iterate over.
+    * @param [iteratee=_.identity]  The function invoked per iteration.
+    * @param [thisArg] The `this` binding of `iteratee`.
+    * @return Returns the new mapped object.
+    */
+    <T, TResult>(callback: (value: T) => TResult, obj: _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): _.Dictionary<TResult>;
+    /**
+    * Creates an object with the same keys as object and values generated by running each own
+    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
+    * and invoked with three arguments: (value, key, object).
+    *
+    * If a property name is provided iteratee the created "_.property" style callback returns
+    * the property value of the given element.
+    *
+    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
+    * true for elements that have a matching property value, else false;.
+    *
+    * If an object is provided for iteratee the created "_.matches" style callback returns true
+    * for elements that have the properties of the given object, else false.
+    *
+    * @param object The object to iterate over.
+    * @param [iteratee=_.identity]  The function invoked per iteration.
+    * @param [thisArg] The `this` binding of `iteratee`.
+    * @return Returns the new mapped object.
+    */
+    <T extends object, TResult>(callback: (value: T[keyof T]) => TResult): MapValues3x1<T, TResult>;
+    /**
+    * Creates an object with the same keys as object and values generated by running each own
+    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
+    * and invoked with three arguments: (value, key, object).
+    *
+    * If a property name is provided iteratee the created "_.property" style callback returns
+    * the property value of the given element.
+    *
+    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
+    * true for elements that have a matching property value, else false;.
+    *
+    * If an object is provided for iteratee the created "_.matches" style callback returns true
+    * for elements that have the properties of the given object, else false.
+    *
+    * @param object The object to iterate over.
+    * @param [iteratee=_.identity]  The function invoked per iteration.
+    * @param [thisArg] The `this` binding of `iteratee`.
+    * @return Returns the new mapped object.
+    */
+    <T extends object, TResult>(callback: (value: T[keyof T]) => TResult, obj: T | null | undefined): { [P in keyof T]: TResult };
+    /**
+    * Creates an object with the same keys as object and values generated by running each own
+    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
+    * and invoked with three arguments: (value, key, object).
+    *
+    * If a property name is provided iteratee the created "_.property" style callback returns
+    * the property value of the given element.
+    *
+    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
+    * true for elements that have a matching property value, else false;.
+    *
+    * If an object is provided for iteratee the created "_.matches" style callback returns true
+    * for elements that have the properties of the given object, else false.
+    *
+    * @param object The object to iterate over.
+    * @param [iteratee=_.identity]  The function invoked per iteration.
+    * @param [thisArg] The `this` binding of `iteratee`.
+    * @return Returns the new mapped object.
+    */
+    (iteratee: object): MapValues4x1;
+    /**
+    * Creates an object with the same keys as object and values generated by running each own
+    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
+    * and invoked with three arguments: (value, key, object).
+    *
+    * If a property name is provided iteratee the created "_.property" style callback returns
+    * the property value of the given element.
+    *
+    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
+    * true for elements that have a matching property value, else false;.
+    *
+    * If an object is provided for iteratee the created "_.matches" style callback returns true
+    * for elements that have the properties of the given object, else false.
+    *
+    * @param object The object to iterate over.
+    * @param [iteratee=_.identity]  The function invoked per iteration.
+    * @param [thisArg] The `this` binding of `iteratee`.
+    * @return Returns the new mapped object.
+    */
+    <T>(iteratee: object, obj: _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): _.Dictionary<boolean>;
+    /**
+    * Creates an object with the same keys as object and values generated by running each own
+    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
+    * and invoked with three arguments: (value, key, object).
+    *
+    * If a property name is provided iteratee the created "_.property" style callback returns
+    * the property value of the given element.
+    *
+    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
+    * true for elements that have a matching property value, else false;.
+    *
+    * If an object is provided for iteratee the created "_.matches" style callback returns true
+    * for elements that have the properties of the given object, else false.
+    *
+    * @param object The object to iterate over.
+    * @param [iteratee=_.identity]  The function invoked per iteration.
+    * @param [thisArg] The `this` binding of `iteratee`.
+    * @return Returns the new mapped object.
+    */
+    <T extends object>(iteratee: object, obj: T | null | undefined): { [P in keyof T]: boolean };
+    /**
+    * Creates an object with the same keys as object and values generated by running each own
+    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
+    * and invoked with three arguments: (value, key, object).
+    *
+    * If a property name is provided iteratee the created "_.property" style callback returns
+    * the property value of the given element.
+    *
+    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
+    * true for elements that have a matching property value, else false;.
+    *
+    * If an object is provided for iteratee the created "_.matches" style callback returns true
+    * for elements that have the properties of the given object, else false.
+    *
+    * @param object The object to iterate over.
+    * @param [iteratee=_.identity]  The function invoked per iteration.
+    * @param [thisArg] The `this` binding of `iteratee`.
+    * @return Returns the new mapped object.
+    */
+    <T, TKey extends keyof T>(iteratee: TKey): MapValues6x1<T, TKey>;
+    /**
+    * Creates an object with the same keys as object and values generated by running each own
+    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
+    * and invoked with three arguments: (value, key, object).
+    *
+    * If a property name is provided iteratee the created "_.property" style callback returns
+    * the property value of the given element.
+    *
+    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
+    * true for elements that have a matching property value, else false;.
+    *
+    * If an object is provided for iteratee the created "_.matches" style callback returns true
+    * for elements that have the properties of the given object, else false.
+    *
+    * @param object The object to iterate over.
+    * @param [iteratee=_.identity]  The function invoked per iteration.
+    * @param [thisArg] The `this` binding of `iteratee`.
+    * @return Returns the new mapped object.
+    */
+    <T, TKey extends keyof T>(iteratee: TKey, obj: _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): _.Dictionary<T[TKey]>;
+    /**
+    * Creates an object with the same keys as object and values generated by running each own
+    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
+    * and invoked with three arguments: (value, key, object).
+    *
+    * If a property name is provided iteratee the created "_.property" style callback returns
+    * the property value of the given element.
+    *
+    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
+    * true for elements that have a matching property value, else false;.
+    *
+    * If an object is provided for iteratee the created "_.matches" style callback returns true
+    * for elements that have the properties of the given object, else false.
+    *
+    * @param object The object to iterate over.
+    * @param [iteratee=_.identity]  The function invoked per iteration.
+    * @param [thisArg] The `this` binding of `iteratee`.
+    * @return Returns the new mapped object.
+    */
+    (iteratee: string): MapValues7x1;
+    /**
+    * Creates an object with the same keys as object and values generated by running each own
+    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
+    * and invoked with three arguments: (value, key, object).
+    *
+    * If a property name is provided iteratee the created "_.property" style callback returns
+    * the property value of the given element.
+    *
+    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
+    * true for elements that have a matching property value, else false;.
+    *
+    * If an object is provided for iteratee the created "_.matches" style callback returns true
+    * for elements that have the properties of the given object, else false.
+    *
+    * @param object The object to iterate over.
+    * @param [iteratee=_.identity]  The function invoked per iteration.
+    * @param [thisArg] The `this` binding of `iteratee`.
+    * @return Returns the new mapped object.
+    */
+    <T>(iteratee: string, obj: _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): _.Dictionary<any>;
+    /**
+    * Creates an object with the same keys as object and values generated by running each own
+    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
+    * and invoked with three arguments: (value, key, object).
+    *
+    * If a property name is provided iteratee the created "_.property" style callback returns
+    * the property value of the given element.
+    *
+    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
+    * true for elements that have a matching property value, else false;.
+    *
+    * If an object is provided for iteratee the created "_.matches" style callback returns true
+    * for elements that have the properties of the given object, else false.
+    *
+    * @param object The object to iterate over.
+    * @param [iteratee=_.identity]  The function invoked per iteration.
+    * @param [thisArg] The `this` binding of `iteratee`.
+    * @return Returns the new mapped object.
+    */
+    <T extends object>(iteratee: string, obj: T | null | undefined): { [P in keyof T]: any };
+}
+interface MapValues1x1<TResult> {
+    /**
+    * Creates an object with the same keys as object and values generated by running each own
+    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
+    * and invoked with three arguments: (value, key, object).
+    *
+    * If a property name is provided iteratee the created "_.property" style callback returns
+    * the property value of the given element.
+    *
+    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
+    * true for elements that have a matching property value, else false;.
+    *
+    * If an object is provided for iteratee the created "_.matches" style callback returns true
+    * for elements that have the properties of the given object, else false.
+    *
+    * @param object The object to iterate over.
+    * @param [iteratee=_.identity]  The function invoked per iteration.
+    * @param [thisArg] The `this` binding of `iteratee`.
+    * @return Returns the new mapped object.
+    */
+    (): MapValues1x1<TResult>;
+    /**
+    * Creates an object with the same keys as object and values generated by running each own
+    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
+    * and invoked with three arguments: (value, key, object).
+    *
+    * If a property name is provided iteratee the created "_.property" style callback returns
+    * the property value of the given element.
+    *
+    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
+    * true for elements that have a matching property value, else false;.
+    *
+    * If an object is provided for iteratee the created "_.matches" style callback returns true
+    * for elements that have the properties of the given object, else false.
+    *
+    * @param object The object to iterate over.
+    * @param [iteratee=_.identity]  The function invoked per iteration.
+    * @param [thisArg] The `this` binding of `iteratee`.
+    * @return Returns the new mapped object.
+    */
+    (obj: string | null | undefined): _.NumericDictionary<TResult>;
+}
+interface MapValues2x1<T, TResult> {
+    /**
+    * Creates an object with the same keys as object and values generated by running each own
+    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
+    * and invoked with three arguments: (value, key, object).
+    *
+    * If a property name is provided iteratee the created "_.property" style callback returns
+    * the property value of the given element.
+    *
+    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
+    * true for elements that have a matching property value, else false;.
+    *
+    * If an object is provided for iteratee the created "_.matches" style callback returns true
+    * for elements that have the properties of the given object, else false.
+    *
+    * @param object The object to iterate over.
+    * @param [iteratee=_.identity]  The function invoked per iteration.
+    * @param [thisArg] The `this` binding of `iteratee`.
+    * @return Returns the new mapped object.
+    */
+    (): MapValues2x1<T, TResult>;
+    /**
+    * Creates an object with the same keys as object and values generated by running each own
+    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
+    * and invoked with three arguments: (value, key, object).
+    *
+    * If a property name is provided iteratee the created "_.property" style callback returns
+    * the property value of the given element.
+    *
+    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
+    * true for elements that have a matching property value, else false;.
+    *
+    * If an object is provided for iteratee the created "_.matches" style callback returns true
+    * for elements that have the properties of the given object, else false.
+    *
+    * @param object The object to iterate over.
+    * @param [iteratee=_.identity]  The function invoked per iteration.
+    * @param [thisArg] The `this` binding of `iteratee`.
+    * @return Returns the new mapped object.
+    */
+    (obj: _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): _.Dictionary<TResult>;
+}
+interface MapValues3x1<T extends object, TResult> {
+    /**
+    * Creates an object with the same keys as object and values generated by running each own
+    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
+    * and invoked with three arguments: (value, key, object).
+    *
+    * If a property name is provided iteratee the created "_.property" style callback returns
+    * the property value of the given element.
+    *
+    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
+    * true for elements that have a matching property value, else false;.
+    *
+    * If an object is provided for iteratee the created "_.matches" style callback returns true
+    * for elements that have the properties of the given object, else false.
+    *
+    * @param object The object to iterate over.
+    * @param [iteratee=_.identity]  The function invoked per iteration.
+    * @param [thisArg] The `this` binding of `iteratee`.
+    * @return Returns the new mapped object.
+    */
+    (): MapValues3x1<T, TResult>;
+    /**
+    * Creates an object with the same keys as object and values generated by running each own
+    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
+    * and invoked with three arguments: (value, key, object).
+    *
+    * If a property name is provided iteratee the created "_.property" style callback returns
+    * the property value of the given element.
+    *
+    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
+    * true for elements that have a matching property value, else false;.
+    *
+    * If an object is provided for iteratee the created "_.matches" style callback returns true
+    * for elements that have the properties of the given object, else false.
+    *
+    * @param object The object to iterate over.
+    * @param [iteratee=_.identity]  The function invoked per iteration.
+    * @param [thisArg] The `this` binding of `iteratee`.
+    * @return Returns the new mapped object.
+    */
+    (obj: T | null | undefined): { [P in keyof T]: TResult };
+}
+interface MapValues4x1 {
+    /**
+    * Creates an object with the same keys as object and values generated by running each own
+    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
+    * and invoked with three arguments: (value, key, object).
+    *
+    * If a property name is provided iteratee the created "_.property" style callback returns
+    * the property value of the given element.
+    *
+    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
+    * true for elements that have a matching property value, else false;.
+    *
+    * If an object is provided for iteratee the created "_.matches" style callback returns true
+    * for elements that have the properties of the given object, else false.
+    *
+    * @param object The object to iterate over.
+    * @param [iteratee=_.identity]  The function invoked per iteration.
+    * @param [thisArg] The `this` binding of `iteratee`.
+    * @return Returns the new mapped object.
+    */
+    (): MapValues4x1;
+    /**
+    * Creates an object with the same keys as object and values generated by running each own
+    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
+    * and invoked with three arguments: (value, key, object).
+    *
+    * If a property name is provided iteratee the created "_.property" style callback returns
+    * the property value of the given element.
+    *
+    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
+    * true for elements that have a matching property value, else false;.
+    *
+    * If an object is provided for iteratee the created "_.matches" style callback returns true
+    * for elements that have the properties of the given object, else false.
+    *
+    * @param object The object to iterate over.
+    * @param [iteratee=_.identity]  The function invoked per iteration.
+    * @param [thisArg] The `this` binding of `iteratee`.
+    * @return Returns the new mapped object.
+    */
+    <T>(obj: _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): _.Dictionary<boolean>;
+    /**
+    * Creates an object with the same keys as object and values generated by running each own
+    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
+    * and invoked with three arguments: (value, key, object).
+    *
+    * If a property name is provided iteratee the created "_.property" style callback returns
+    * the property value of the given element.
+    *
+    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
+    * true for elements that have a matching property value, else false;.
+    *
+    * If an object is provided for iteratee the created "_.matches" style callback returns true
+    * for elements that have the properties of the given object, else false.
+    *
+    * @param object The object to iterate over.
+    * @param [iteratee=_.identity]  The function invoked per iteration.
+    * @param [thisArg] The `this` binding of `iteratee`.
+    * @return Returns the new mapped object.
+    */
+    <T extends object>(obj: T | null | undefined): { [P in keyof T]: boolean };
+}
+interface MapValues6x1<T, TKey extends keyof T> {
+    /**
+    * Creates an object with the same keys as object and values generated by running each own
+    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
+    * and invoked with three arguments: (value, key, object).
+    *
+    * If a property name is provided iteratee the created "_.property" style callback returns
+    * the property value of the given element.
+    *
+    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
+    * true for elements that have a matching property value, else false;.
+    *
+    * If an object is provided for iteratee the created "_.matches" style callback returns true
+    * for elements that have the properties of the given object, else false.
+    *
+    * @param object The object to iterate over.
+    * @param [iteratee=_.identity]  The function invoked per iteration.
+    * @param [thisArg] The `this` binding of `iteratee`.
+    * @return Returns the new mapped object.
+    */
+    (): MapValues6x1<T, TKey>;
+    /**
+    * Creates an object with the same keys as object and values generated by running each own
+    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
+    * and invoked with three arguments: (value, key, object).
+    *
+    * If a property name is provided iteratee the created "_.property" style callback returns
+    * the property value of the given element.
+    *
+    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
+    * true for elements that have a matching property value, else false;.
+    *
+    * If an object is provided for iteratee the created "_.matches" style callback returns true
+    * for elements that have the properties of the given object, else false.
+    *
+    * @param object The object to iterate over.
+    * @param [iteratee=_.identity]  The function invoked per iteration.
+    * @param [thisArg] The `this` binding of `iteratee`.
+    * @return Returns the new mapped object.
+    */
+    (obj: _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): _.Dictionary<T[TKey]>;
+}
+interface MapValues7x1 {
+    /**
+    * Creates an object with the same keys as object and values generated by running each own
+    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
+    * and invoked with three arguments: (value, key, object).
+    *
+    * If a property name is provided iteratee the created "_.property" style callback returns
+    * the property value of the given element.
+    *
+    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
+    * true for elements that have a matching property value, else false;.
+    *
+    * If an object is provided for iteratee the created "_.matches" style callback returns true
+    * for elements that have the properties of the given object, else false.
+    *
+    * @param object The object to iterate over.
+    * @param [iteratee=_.identity]  The function invoked per iteration.
+    * @param [thisArg] The `this` binding of `iteratee`.
+    * @return Returns the new mapped object.
+    */
+    (): MapValues7x1;
+    /**
+    * Creates an object with the same keys as object and values generated by running each own
+    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
+    * and invoked with three arguments: (value, key, object).
+    *
+    * If a property name is provided iteratee the created "_.property" style callback returns
+    * the property value of the given element.
+    *
+    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
+    * true for elements that have a matching property value, else false;.
+    *
+    * If an object is provided for iteratee the created "_.matches" style callback returns true
+    * for elements that have the properties of the given object, else false.
+    *
+    * @param object The object to iterate over.
+    * @param [iteratee=_.identity]  The function invoked per iteration.
+    * @param [thisArg] The `this` binding of `iteratee`.
+    * @return Returns the new mapped object.
+    */
+    <T>(obj: _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): _.Dictionary<any>;
+    /**
+    * Creates an object with the same keys as object and values generated by running each own
+    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
+    * and invoked with three arguments: (value, key, object).
+    *
+    * If a property name is provided iteratee the created "_.property" style callback returns
+    * the property value of the given element.
+    *
+    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
+    * true for elements that have a matching property value, else false;.
+    *
+    * If an object is provided for iteratee the created "_.matches" style callback returns true
+    * for elements that have the properties of the given object, else false.
+    *
+    * @param object The object to iterate over.
+    * @param [iteratee=_.identity]  The function invoked per iteration.
+    * @param [thisArg] The `this` binding of `iteratee`.
+    * @return Returns the new mapped object.
+    */
+    <T extends object>(obj: T | null | undefined): { [P in keyof T]: any };
+}
+
+declare const mapValues: MapValues;
+export = mapValues;
diff --git a/types/lodash/fp/matches.d.ts b/types/lodash/fp/matches.d.ts
new file mode 100644
index 0000000000..e197d6b711
--- /dev/null
+++ b/types/lodash/fp/matches.d.ts
@@ -0,0 +1,116 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface IsMatch {
+    /**
+     * Performs a deep comparison between `object` and `source` to determine if
+     * `object` contains equivalent property values.
+     *
+     * **Note:** This method supports comparing the same values as `_.isEqual`.
+     *
+     * @category Lang
+     * @param object The object to inspect.
+     * @param source The object of property values to match.
+     * @returns Returns `true` if `object` is a match, else `false`.
+     * @example
+     *
+     * var object = { 'user': 'fred', 'age': 40 };
+     *
+     * _.isMatch(object, { 'age': 40 });
+     * // => true
+     *
+     * _.isMatch(object, { 'age': 36 });
+     * // => false
+     */
+    (): IsMatch;
+    /**
+     * Performs a deep comparison between `object` and `source` to determine if
+     * `object` contains equivalent property values.
+     *
+     * **Note:** This method supports comparing the same values as `_.isEqual`.
+     *
+     * @category Lang
+     * @param object The object to inspect.
+     * @param source The object of property values to match.
+     * @returns Returns `true` if `object` is a match, else `false`.
+     * @example
+     *
+     * var object = { 'user': 'fred', 'age': 40 };
+     *
+     * _.isMatch(object, { 'age': 40 });
+     * // => true
+     *
+     * _.isMatch(object, { 'age': 36 });
+     * // => false
+     */
+    (source: object): IsMatch1x1;
+    /**
+     * Performs a deep comparison between `object` and `source` to determine if
+     * `object` contains equivalent property values.
+     *
+     * **Note:** This method supports comparing the same values as `_.isEqual`.
+     *
+     * @category Lang
+     * @param object The object to inspect.
+     * @param source The object of property values to match.
+     * @returns Returns `true` if `object` is a match, else `false`.
+     * @example
+     *
+     * var object = { 'user': 'fred', 'age': 40 };
+     *
+     * _.isMatch(object, { 'age': 40 });
+     * // => true
+     *
+     * _.isMatch(object, { 'age': 36 });
+     * // => false
+     */
+    (source: object, object: object): boolean;
+}
+interface IsMatch1x1 {
+    /**
+     * Performs a deep comparison between `object` and `source` to determine if
+     * `object` contains equivalent property values.
+     *
+     * **Note:** This method supports comparing the same values as `_.isEqual`.
+     *
+     * @category Lang
+     * @param object The object to inspect.
+     * @param source The object of property values to match.
+     * @returns Returns `true` if `object` is a match, else `false`.
+     * @example
+     *
+     * var object = { 'user': 'fred', 'age': 40 };
+     *
+     * _.isMatch(object, { 'age': 40 });
+     * // => true
+     *
+     * _.isMatch(object, { 'age': 36 });
+     * // => false
+     */
+    (): IsMatch1x1;
+    /**
+     * Performs a deep comparison between `object` and `source` to determine if
+     * `object` contains equivalent property values.
+     *
+     * **Note:** This method supports comparing the same values as `_.isEqual`.
+     *
+     * @category Lang
+     * @param object The object to inspect.
+     * @param source The object of property values to match.
+     * @returns Returns `true` if `object` is a match, else `false`.
+     * @example
+     *
+     * var object = { 'user': 'fred', 'age': 40 };
+     *
+     * _.isMatch(object, { 'age': 40 });
+     * // => true
+     *
+     * _.isMatch(object, { 'age': 36 });
+     * // => false
+     */
+    (object: object): boolean;
+}
+
+declare const matches: IsMatch;
+export = matches;
diff --git a/types/lodash/fp/matchesProperty.d.ts b/types/lodash/fp/matchesProperty.d.ts
new file mode 100644
index 0000000000..8fec785733
--- /dev/null
+++ b/types/lodash/fp/matchesProperty.d.ts
@@ -0,0 +1,90 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface MatchesProperty {
+    /**
+     * Creates a function that compares the property value of path on a given object to value.
+     *
+     * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
+     * strings. Objects are compared by their own, not inherited, enumerable properties.
+     *
+     * @param path The path of the property to get.
+     * @param srcValue The value to match.
+     * @return Returns the new function.
+     */
+    (): MatchesProperty;
+    /**
+     * Creates a function that compares the property value of path on a given object to value.
+     *
+     * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
+     * strings. Objects are compared by their own, not inherited, enumerable properties.
+     *
+     * @param path The path of the property to get.
+     * @param srcValue The value to match.
+     * @return Returns the new function.
+     */
+    (path: _.PropertyPath): MatchesProperty1x1;
+    /**
+     * Creates a function that compares the property value of path on a given object to value.
+     *
+     * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
+     * strings. Objects are compared by their own, not inherited, enumerable properties.
+     *
+     * @param path The path of the property to get.
+     * @param srcValue The value to match.
+     * @return Returns the new function.
+     */
+    <T>(path: _.PropertyPath, srcValue: T): (value: any) => boolean;
+    /**
+     * Creates a function that compares the property value of path on a given object to value.
+     *
+     * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
+     * strings. Objects are compared by their own, not inherited, enumerable properties.
+     *
+     * @param path The path of the property to get.
+     * @param srcValue The value to match.
+     * @return Returns the new function.
+     */
+    <T, V>(path: _.PropertyPath, srcValue: T): (value: V) => boolean;
+}
+interface MatchesProperty1x1 {
+    /**
+     * Creates a function that compares the property value of path on a given object to value.
+     *
+     * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
+     * strings. Objects are compared by their own, not inherited, enumerable properties.
+     *
+     * @param path The path of the property to get.
+     * @param srcValue The value to match.
+     * @return Returns the new function.
+     */
+    (): MatchesProperty1x1;
+    /**
+     * Creates a function that compares the property value of path on a given object to value.
+     *
+     * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
+     * strings. Objects are compared by their own, not inherited, enumerable properties.
+     *
+     * @param path The path of the property to get.
+     * @param srcValue The value to match.
+     * @return Returns the new function.
+     */
+    <T>(srcValue: T): (value: any) => boolean;
+    /**
+     * Creates a function that compares the property value of path on a given object to value.
+     *
+     * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
+     * strings. Objects are compared by their own, not inherited, enumerable properties.
+     *
+     * @param path The path of the property to get.
+     * @param srcValue The value to match.
+     * @return Returns the new function.
+     */
+    <T, V>(srcValue: T): (value: V) => boolean;
+}
+
+declare const matchesProperty: MatchesProperty;
+export = matchesProperty;
diff --git a/types/lodash/fp/max.d.ts b/types/lodash/fp/max.d.ts
new file mode 100644
index 0000000000..138dba542d
--- /dev/null
+++ b/types/lodash/fp/max.d.ts
@@ -0,0 +1,19 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+type Max =
+    /**
+      * Computes the maximum value of `array`. If `array` is empty or falsey
+      * `undefined` is returned.
+      *
+      * @category Math
+      * @param array The array to iterate over.
+      * @returns Returns the maximum value.
+      */
+    <T>(collection: _.List<T> | null | undefined) => T | undefined;
+
+declare const max: Max;
+export = max;
diff --git a/types/lodash/fp/maxBy.d.ts b/types/lodash/fp/maxBy.d.ts
new file mode 100644
index 0000000000..44fb2ff7b1
--- /dev/null
+++ b/types/lodash/fp/maxBy.d.ts
@@ -0,0 +1,118 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface MaxBy {
+    /**
+     * This method is like `_.max` except that it accepts `iteratee` which is
+     * invoked for each element in `array` to generate the criterion by which
+     * the value is ranked. The iteratee is invoked with one argument: (value).
+     *
+     * @category Math
+     * @param array The array to iterate over.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the maximum value.
+     * @example
+     *
+     * var objects = [{ 'n': 1 }, { 'n': 2 }];
+     *
+     * _.maxBy(objects, function(o) { return o.a; });
+     * // => { 'n': 2 }
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.maxBy(objects, 'n');
+     * // => { 'n': 2 }
+     */
+    (): MaxBy;
+    /**
+     * This method is like `_.max` except that it accepts `iteratee` which is
+     * invoked for each element in `array` to generate the criterion by which
+     * the value is ranked. The iteratee is invoked with one argument: (value).
+     *
+     * @category Math
+     * @param array The array to iterate over.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the maximum value.
+     * @example
+     *
+     * var objects = [{ 'n': 1 }, { 'n': 2 }];
+     *
+     * _.maxBy(objects, function(o) { return o.a; });
+     * // => { 'n': 2 }
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.maxBy(objects, 'n');
+     * // => { 'n': 2 }
+     */
+    <T>(iteratee: _.ValueIteratee<T>): MaxBy1x1<T>;
+    /**
+     * This method is like `_.max` except that it accepts `iteratee` which is
+     * invoked for each element in `array` to generate the criterion by which
+     * the value is ranked. The iteratee is invoked with one argument: (value).
+     *
+     * @category Math
+     * @param array The array to iterate over.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the maximum value.
+     * @example
+     *
+     * var objects = [{ 'n': 1 }, { 'n': 2 }];
+     *
+     * _.maxBy(objects, function(o) { return o.a; });
+     * // => { 'n': 2 }
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.maxBy(objects, 'n');
+     * // => { 'n': 2 }
+     */
+    <T>(iteratee: _.ValueIteratee<T>, collection: _.List<T> | null | undefined): T | undefined;
+}
+interface MaxBy1x1<T> {
+    /**
+     * This method is like `_.max` except that it accepts `iteratee` which is
+     * invoked for each element in `array` to generate the criterion by which
+     * the value is ranked. The iteratee is invoked with one argument: (value).
+     *
+     * @category Math
+     * @param array The array to iterate over.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the maximum value.
+     * @example
+     *
+     * var objects = [{ 'n': 1 }, { 'n': 2 }];
+     *
+     * _.maxBy(objects, function(o) { return o.a; });
+     * // => { 'n': 2 }
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.maxBy(objects, 'n');
+     * // => { 'n': 2 }
+     */
+    (): MaxBy1x1<T>;
+    /**
+     * This method is like `_.max` except that it accepts `iteratee` which is
+     * invoked for each element in `array` to generate the criterion by which
+     * the value is ranked. The iteratee is invoked with one argument: (value).
+     *
+     * @category Math
+     * @param array The array to iterate over.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the maximum value.
+     * @example
+     *
+     * var objects = [{ 'n': 1 }, { 'n': 2 }];
+     *
+     * _.maxBy(objects, function(o) { return o.a; });
+     * // => { 'n': 2 }
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.maxBy(objects, 'n');
+     * // => { 'n': 2 }
+     */
+    (collection: _.List<T> | null | undefined): T | undefined;
+}
+
+declare const maxBy: MaxBy;
+export = maxBy;
diff --git a/types/lodash/fp/mean.d.ts b/types/lodash/fp/mean.d.ts
new file mode 100644
index 0000000000..0e37afaeaf
--- /dev/null
+++ b/types/lodash/fp/mean.d.ts
@@ -0,0 +1,22 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+type Mean =
+    /**
+     * Computes the mean of the values in `array`.
+     *
+     * @category Math
+     * @param array The array to iterate over.
+     * @returns Returns the mean.
+     * @example
+     *
+     * _.mean([4, 2, 8, 6]);
+     * // => 5
+     */
+    (collection: _.List<any> | null | undefined) => number;
+
+declare const mean: Mean;
+export = mean;
diff --git a/types/lodash/fp/meanBy.d.ts b/types/lodash/fp/meanBy.d.ts
new file mode 100644
index 0000000000..7ae670a7b5
--- /dev/null
+++ b/types/lodash/fp/meanBy.d.ts
@@ -0,0 +1,78 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface MeanBy {
+    /**
+       * Computes the mean of the provided propties of the objects in the `array`
+       *
+       * @category Math
+       * @param array The array to iterate over.
+       * @param [iteratee=_.identity] The iteratee invoked per element.
+       * @returns Returns the mean.
+       * @example
+       *
+       * _.mean([{ 'n': 4 }, { 'n': 2 }, { 'n': 8 }, { 'n': 6 }], 'n');
+       * // => 5
+       */
+    (): MeanBy;
+    /**
+       * Computes the mean of the provided propties of the objects in the `array`
+       *
+       * @category Math
+       * @param array The array to iterate over.
+       * @param [iteratee=_.identity] The iteratee invoked per element.
+       * @returns Returns the mean.
+       * @example
+       *
+       * _.mean([{ 'n': 4 }, { 'n': 2 }, { 'n': 8 }, { 'n': 6 }], 'n');
+       * // => 5
+       */
+    <T>(iteratee: _.ValueIteratee<T>): MeanBy1x1<T>;
+    /**
+       * Computes the mean of the provided propties of the objects in the `array`
+       *
+       * @category Math
+       * @param array The array to iterate over.
+       * @param [iteratee=_.identity] The iteratee invoked per element.
+       * @returns Returns the mean.
+       * @example
+       *
+       * _.mean([{ 'n': 4 }, { 'n': 2 }, { 'n': 8 }, { 'n': 6 }], 'n');
+       * // => 5
+       */
+    <T>(iteratee: _.ValueIteratee<T>, collection: _.List<T> | null | undefined): number;
+}
+interface MeanBy1x1<T> {
+    /**
+       * Computes the mean of the provided propties of the objects in the `array`
+       *
+       * @category Math
+       * @param array The array to iterate over.
+       * @param [iteratee=_.identity] The iteratee invoked per element.
+       * @returns Returns the mean.
+       * @example
+       *
+       * _.mean([{ 'n': 4 }, { 'n': 2 }, { 'n': 8 }, { 'n': 6 }], 'n');
+       * // => 5
+       */
+    (): MeanBy1x1<T>;
+    /**
+       * Computes the mean of the provided propties of the objects in the `array`
+       *
+       * @category Math
+       * @param array The array to iterate over.
+       * @param [iteratee=_.identity] The iteratee invoked per element.
+       * @returns Returns the mean.
+       * @example
+       *
+       * _.mean([{ 'n': 4 }, { 'n': 2 }, { 'n': 8 }, { 'n': 6 }], 'n');
+       * // => 5
+       */
+    (collection: _.List<T> | null | undefined): number;
+}
+
+declare const meanBy: MeanBy;
+export = meanBy;
diff --git a/types/lodash/fp/memoize.d.ts b/types/lodash/fp/memoize.d.ts
new file mode 100644
index 0000000000..c694ae0909
--- /dev/null
+++ b/types/lodash/fp/memoize.d.ts
@@ -0,0 +1,21 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+type Memoize =
+    /**
+     * Creates a function that memoizes the result of func. If resolver is provided it determines the cache key for
+     * storing the result based on the arguments provided to the memoized function. By default, the first argument
+     * provided to the memoized function is coerced to a string and used as the cache key. The func is invoked with
+     * the this binding of the memoized function.
+     *
+     * @param func The function to have its output memoized.
+     * @param resolver The function to resolve the cache key.
+     * @return Returns the new memoizing function.
+     */
+    <T extends (...args: any[]) => any>(func: T) => T & _.MemoizedFunction;
+
+declare const memoize: Memoize;
+export = memoize;
diff --git a/types/lodash/fp/merge.d.ts b/types/lodash/fp/merge.d.ts
new file mode 100644
index 0000000000..fe05c22488
--- /dev/null
+++ b/types/lodash/fp/merge.d.ts
@@ -0,0 +1,151 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface Merge {
+    /**
+     * Recursively merges own and inherited enumerable properties of source
+     * objects into the destination object, skipping source properties that resolve
+     * to `undefined`. Array and plain object properties are merged recursively.
+     * Other objects and value types are overridden by assignment. Source objects
+     * are applied from left to right. Subsequent sources overwrite property
+     * assignments of previous sources.
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @category Object
+     * @param object The destination object.
+     * @param [sources] The source objects.
+     * @returns Returns `object`.
+     * @example
+     *
+     * var users = {
+     *   'data': [{ 'user': 'barney' }, { 'user': 'fred' }]
+     * };
+     *
+     * var ages = {
+     *   'data': [{ 'age': 36 }, { 'age': 40 }]
+     * };
+     *
+     * _.merge(users, ages);
+     * // => { 'data': [{ 'user': 'barney', 'age': 36 }, { 'user': 'fred', 'age': 40 }] }
+     */
+    (): Merge;
+    /**
+     * Recursively merges own and inherited enumerable properties of source
+     * objects into the destination object, skipping source properties that resolve
+     * to `undefined`. Array and plain object properties are merged recursively.
+     * Other objects and value types are overridden by assignment. Source objects
+     * are applied from left to right. Subsequent sources overwrite property
+     * assignments of previous sources.
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @category Object
+     * @param object The destination object.
+     * @param [sources] The source objects.
+     * @returns Returns `object`.
+     * @example
+     *
+     * var users = {
+     *   'data': [{ 'user': 'barney' }, { 'user': 'fred' }]
+     * };
+     *
+     * var ages = {
+     *   'data': [{ 'age': 36 }, { 'age': 40 }]
+     * };
+     *
+     * _.merge(users, ages);
+     * // => { 'data': [{ 'user': 'barney', 'age': 36 }, { 'user': 'fred', 'age': 40 }] }
+     */
+    <TObject>(object: TObject): Merge1x1<TObject>;
+    /**
+     * Recursively merges own and inherited enumerable properties of source
+     * objects into the destination object, skipping source properties that resolve
+     * to `undefined`. Array and plain object properties are merged recursively.
+     * Other objects and value types are overridden by assignment. Source objects
+     * are applied from left to right. Subsequent sources overwrite property
+     * assignments of previous sources.
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @category Object
+     * @param object The destination object.
+     * @param [sources] The source objects.
+     * @returns Returns `object`.
+     * @example
+     *
+     * var users = {
+     *   'data': [{ 'user': 'barney' }, { 'user': 'fred' }]
+     * };
+     *
+     * var ages = {
+     *   'data': [{ 'age': 36 }, { 'age': 40 }]
+     * };
+     *
+     * _.merge(users, ages);
+     * // => { 'data': [{ 'user': 'barney', 'age': 36 }, { 'user': 'fred', 'age': 40 }] }
+     */
+    <TObject, TSource>(object: TObject, source: TSource): TObject & TSource;
+}
+interface Merge1x1<TObject> {
+    /**
+     * Recursively merges own and inherited enumerable properties of source
+     * objects into the destination object, skipping source properties that resolve
+     * to `undefined`. Array and plain object properties are merged recursively.
+     * Other objects and value types are overridden by assignment. Source objects
+     * are applied from left to right. Subsequent sources overwrite property
+     * assignments of previous sources.
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @category Object
+     * @param object The destination object.
+     * @param [sources] The source objects.
+     * @returns Returns `object`.
+     * @example
+     *
+     * var users = {
+     *   'data': [{ 'user': 'barney' }, { 'user': 'fred' }]
+     * };
+     *
+     * var ages = {
+     *   'data': [{ 'age': 36 }, { 'age': 40 }]
+     * };
+     *
+     * _.merge(users, ages);
+     * // => { 'data': [{ 'user': 'barney', 'age': 36 }, { 'user': 'fred', 'age': 40 }] }
+     */
+    (): Merge1x1<TObject>;
+    /**
+     * Recursively merges own and inherited enumerable properties of source
+     * objects into the destination object, skipping source properties that resolve
+     * to `undefined`. Array and plain object properties are merged recursively.
+     * Other objects and value types are overridden by assignment. Source objects
+     * are applied from left to right. Subsequent sources overwrite property
+     * assignments of previous sources.
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @category Object
+     * @param object The destination object.
+     * @param [sources] The source objects.
+     * @returns Returns `object`.
+     * @example
+     *
+     * var users = {
+     *   'data': [{ 'user': 'barney' }, { 'user': 'fred' }]
+     * };
+     *
+     * var ages = {
+     *   'data': [{ 'age': 36 }, { 'age': 40 }]
+     * };
+     *
+     * _.merge(users, ages);
+     * // => { 'data': [{ 'user': 'barney', 'age': 36 }, { 'user': 'fred', 'age': 40 }] }
+     */
+    <TSource>(source: TSource): TObject & TSource;
+}
+
+declare const merge: Merge;
+export = merge;
diff --git a/types/lodash/fp/mergeAll.d.ts b/types/lodash/fp/mergeAll.d.ts
new file mode 100644
index 0000000000..350ef6110c
--- /dev/null
+++ b/types/lodash/fp/mergeAll.d.ts
@@ -0,0 +1,36 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type Merge =
+    /**
+     * Recursively merges own and inherited enumerable properties of source
+     * objects into the destination object, skipping source properties that resolve
+     * to `undefined`. Array and plain object properties are merged recursively.
+     * Other objects and value types are overridden by assignment. Source objects
+     * are applied from left to right. Subsequent sources overwrite property
+     * assignments of previous sources.
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @category Object
+     * @param object The destination object.
+     * @param [sources] The source objects.
+     * @returns Returns `object`.
+     * @example
+     *
+     * var users = {
+     *   'data': [{ 'user': 'barney' }, { 'user': 'fred' }]
+     * };
+     *
+     * var ages = {
+     *   'data': [{ 'age': 36 }, { 'age': 40 }]
+     * };
+     *
+     * _.merge(users, ages);
+     * // => { 'data': [{ 'user': 'barney', 'age': 36 }, { 'user': 'fred', 'age': 40 }] }
+     */
+    (object: ReadonlyArray<any>) => any;
+
+declare const mergeAll: Merge;
+export = mergeAll;
diff --git a/types/lodash/fp/mergeAllWith.d.ts b/types/lodash/fp/mergeAllWith.d.ts
new file mode 100644
index 0000000000..96be3f4db9
--- /dev/null
+++ b/types/lodash/fp/mergeAllWith.d.ts
@@ -0,0 +1,183 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface MergeWith {
+    /**
+     * This method is like `_.merge` except that it accepts `customizer` which
+     * is invoked to produce the merged values of the destination and source
+     * properties. If `customizer` returns `undefined` merging is handled by the
+     * method instead. The `customizer` is invoked with seven arguments:
+     * (objValue, srcValue, key, object, source, stack).
+     *
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param customizer The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   if (_.isArray(objValue)) {
+     * return objValue.concat(srcValue);
+     *   }
+     * }
+     *
+     * var object = {
+     *   'fruits': ['apple'],
+     *   'vegetables': ['beet']
+     * };
+     *
+     * var other = {
+     *   'fruits': ['banana'],
+     *   'vegetables': ['carrot']
+     * };
+     *
+     * _.merge(object, other, customizer);
+     * // => { 'fruits': ['apple', 'banana'], 'vegetables': ['beet', 'carrot'] }
+     */
+    (): MergeWith;
+    /**
+     * This method is like `_.merge` except that it accepts `customizer` which
+     * is invoked to produce the merged values of the destination and source
+     * properties. If `customizer` returns `undefined` merging is handled by the
+     * method instead. The `customizer` is invoked with seven arguments:
+     * (objValue, srcValue, key, object, source, stack).
+     *
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param customizer The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   if (_.isArray(objValue)) {
+     * return objValue.concat(srcValue);
+     *   }
+     * }
+     *
+     * var object = {
+     *   'fruits': ['apple'],
+     *   'vegetables': ['beet']
+     * };
+     *
+     * var other = {
+     *   'fruits': ['banana'],
+     *   'vegetables': ['carrot']
+     * };
+     *
+     * _.merge(object, other, customizer);
+     * // => { 'fruits': ['apple', 'banana'], 'vegetables': ['beet', 'carrot'] }
+     */
+    (customizer: _.MergeWithCustomizer): MergeWith1x1;
+    /**
+     * This method is like `_.merge` except that it accepts `customizer` which
+     * is invoked to produce the merged values of the destination and source
+     * properties. If `customizer` returns `undefined` merging is handled by the
+     * method instead. The `customizer` is invoked with seven arguments:
+     * (objValue, srcValue, key, object, source, stack).
+     *
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param customizer The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   if (_.isArray(objValue)) {
+     * return objValue.concat(srcValue);
+     *   }
+     * }
+     *
+     * var object = {
+     *   'fruits': ['apple'],
+     *   'vegetables': ['beet']
+     * };
+     *
+     * var other = {
+     *   'fruits': ['banana'],
+     *   'vegetables': ['carrot']
+     * };
+     *
+     * _.merge(object, other, customizer);
+     * // => { 'fruits': ['apple', 'banana'], 'vegetables': ['beet', 'carrot'] }
+     */
+    (customizer: _.MergeWithCustomizer, args: ReadonlyArray<any>): any;
+}
+interface MergeWith1x1 {
+    /**
+     * This method is like `_.merge` except that it accepts `customizer` which
+     * is invoked to produce the merged values of the destination and source
+     * properties. If `customizer` returns `undefined` merging is handled by the
+     * method instead. The `customizer` is invoked with seven arguments:
+     * (objValue, srcValue, key, object, source, stack).
+     *
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param customizer The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   if (_.isArray(objValue)) {
+     * return objValue.concat(srcValue);
+     *   }
+     * }
+     *
+     * var object = {
+     *   'fruits': ['apple'],
+     *   'vegetables': ['beet']
+     * };
+     *
+     * var other = {
+     *   'fruits': ['banana'],
+     *   'vegetables': ['carrot']
+     * };
+     *
+     * _.merge(object, other, customizer);
+     * // => { 'fruits': ['apple', 'banana'], 'vegetables': ['beet', 'carrot'] }
+     */
+    (): MergeWith1x1;
+    /**
+     * This method is like `_.merge` except that it accepts `customizer` which
+     * is invoked to produce the merged values of the destination and source
+     * properties. If `customizer` returns `undefined` merging is handled by the
+     * method instead. The `customizer` is invoked with seven arguments:
+     * (objValue, srcValue, key, object, source, stack).
+     *
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param customizer The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   if (_.isArray(objValue)) {
+     * return objValue.concat(srcValue);
+     *   }
+     * }
+     *
+     * var object = {
+     *   'fruits': ['apple'],
+     *   'vegetables': ['beet']
+     * };
+     *
+     * var other = {
+     *   'fruits': ['banana'],
+     *   'vegetables': ['carrot']
+     * };
+     *
+     * _.merge(object, other, customizer);
+     * // => { 'fruits': ['apple', 'banana'], 'vegetables': ['beet', 'carrot'] }
+     */
+    (args: ReadonlyArray<any>): any;
+}
+
+declare const mergeAllWith: MergeWith;
+export = mergeAllWith;
diff --git a/types/lodash/fp/mergeWith.d.ts b/types/lodash/fp/mergeWith.d.ts
new file mode 100644
index 0000000000..64556114df
--- /dev/null
+++ b/types/lodash/fp/mergeWith.d.ts
@@ -0,0 +1,321 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface MergeWith {
+    /**
+     * This method is like `_.merge` except that it accepts `customizer` which
+     * is invoked to produce the merged values of the destination and source
+     * properties. If `customizer` returns `undefined` merging is handled by the
+     * method instead. The `customizer` is invoked with seven arguments:
+     * (objValue, srcValue, key, object, source, stack).
+     *
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param customizer The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   if (_.isArray(objValue)) {
+     * return objValue.concat(srcValue);
+     *   }
+     * }
+     *
+     * var object = {
+     *   'fruits': ['apple'],
+     *   'vegetables': ['beet']
+     * };
+     *
+     * var other = {
+     *   'fruits': ['banana'],
+     *   'vegetables': ['carrot']
+     * };
+     *
+     * _.merge(object, other, customizer);
+     * // => { 'fruits': ['apple', 'banana'], 'vegetables': ['beet', 'carrot'] }
+     */
+    (): MergeWith;
+    /**
+     * This method is like `_.merge` except that it accepts `customizer` which
+     * is invoked to produce the merged values of the destination and source
+     * properties. If `customizer` returns `undefined` merging is handled by the
+     * method instead. The `customizer` is invoked with seven arguments:
+     * (objValue, srcValue, key, object, source, stack).
+     *
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param customizer The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   if (_.isArray(objValue)) {
+     * return objValue.concat(srcValue);
+     *   }
+     * }
+     *
+     * var object = {
+     *   'fruits': ['apple'],
+     *   'vegetables': ['beet']
+     * };
+     *
+     * var other = {
+     *   'fruits': ['banana'],
+     *   'vegetables': ['carrot']
+     * };
+     *
+     * _.merge(object, other, customizer);
+     * // => { 'fruits': ['apple', 'banana'], 'vegetables': ['beet', 'carrot'] }
+     */
+    (customizer: _.MergeWithCustomizer): MergeWith1x1;
+    /**
+     * This method is like `_.merge` except that it accepts `customizer` which
+     * is invoked to produce the merged values of the destination and source
+     * properties. If `customizer` returns `undefined` merging is handled by the
+     * method instead. The `customizer` is invoked with seven arguments:
+     * (objValue, srcValue, key, object, source, stack).
+     *
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param customizer The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   if (_.isArray(objValue)) {
+     * return objValue.concat(srcValue);
+     *   }
+     * }
+     *
+     * var object = {
+     *   'fruits': ['apple'],
+     *   'vegetables': ['beet']
+     * };
+     *
+     * var other = {
+     *   'fruits': ['banana'],
+     *   'vegetables': ['carrot']
+     * };
+     *
+     * _.merge(object, other, customizer);
+     * // => { 'fruits': ['apple', 'banana'], 'vegetables': ['beet', 'carrot'] }
+     */
+    <TObject>(customizer: _.MergeWithCustomizer, object: TObject): MergeWith1x2<TObject>;
+    /**
+     * This method is like `_.merge` except that it accepts `customizer` which
+     * is invoked to produce the merged values of the destination and source
+     * properties. If `customizer` returns `undefined` merging is handled by the
+     * method instead. The `customizer` is invoked with seven arguments:
+     * (objValue, srcValue, key, object, source, stack).
+     *
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param customizer The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   if (_.isArray(objValue)) {
+     * return objValue.concat(srcValue);
+     *   }
+     * }
+     *
+     * var object = {
+     *   'fruits': ['apple'],
+     *   'vegetables': ['beet']
+     * };
+     *
+     * var other = {
+     *   'fruits': ['banana'],
+     *   'vegetables': ['carrot']
+     * };
+     *
+     * _.merge(object, other, customizer);
+     * // => { 'fruits': ['apple', 'banana'], 'vegetables': ['beet', 'carrot'] }
+     */
+    <TObject, TSource>(customizer: _.MergeWithCustomizer, object: TObject, source: TSource): TObject & TSource;
+}
+interface MergeWith1x1 {
+    /**
+     * This method is like `_.merge` except that it accepts `customizer` which
+     * is invoked to produce the merged values of the destination and source
+     * properties. If `customizer` returns `undefined` merging is handled by the
+     * method instead. The `customizer` is invoked with seven arguments:
+     * (objValue, srcValue, key, object, source, stack).
+     *
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param customizer The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   if (_.isArray(objValue)) {
+     * return objValue.concat(srcValue);
+     *   }
+     * }
+     *
+     * var object = {
+     *   'fruits': ['apple'],
+     *   'vegetables': ['beet']
+     * };
+     *
+     * var other = {
+     *   'fruits': ['banana'],
+     *   'vegetables': ['carrot']
+     * };
+     *
+     * _.merge(object, other, customizer);
+     * // => { 'fruits': ['apple', 'banana'], 'vegetables': ['beet', 'carrot'] }
+     */
+    (): MergeWith1x1;
+    /**
+     * This method is like `_.merge` except that it accepts `customizer` which
+     * is invoked to produce the merged values of the destination and source
+     * properties. If `customizer` returns `undefined` merging is handled by the
+     * method instead. The `customizer` is invoked with seven arguments:
+     * (objValue, srcValue, key, object, source, stack).
+     *
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param customizer The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   if (_.isArray(objValue)) {
+     * return objValue.concat(srcValue);
+     *   }
+     * }
+     *
+     * var object = {
+     *   'fruits': ['apple'],
+     *   'vegetables': ['beet']
+     * };
+     *
+     * var other = {
+     *   'fruits': ['banana'],
+     *   'vegetables': ['carrot']
+     * };
+     *
+     * _.merge(object, other, customizer);
+     * // => { 'fruits': ['apple', 'banana'], 'vegetables': ['beet', 'carrot'] }
+     */
+    <TObject>(object: TObject): MergeWith1x2<TObject>;
+    /**
+     * This method is like `_.merge` except that it accepts `customizer` which
+     * is invoked to produce the merged values of the destination and source
+     * properties. If `customizer` returns `undefined` merging is handled by the
+     * method instead. The `customizer` is invoked with seven arguments:
+     * (objValue, srcValue, key, object, source, stack).
+     *
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param customizer The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   if (_.isArray(objValue)) {
+     * return objValue.concat(srcValue);
+     *   }
+     * }
+     *
+     * var object = {
+     *   'fruits': ['apple'],
+     *   'vegetables': ['beet']
+     * };
+     *
+     * var other = {
+     *   'fruits': ['banana'],
+     *   'vegetables': ['carrot']
+     * };
+     *
+     * _.merge(object, other, customizer);
+     * // => { 'fruits': ['apple', 'banana'], 'vegetables': ['beet', 'carrot'] }
+     */
+    <TObject, TSource>(object: TObject, source: TSource): TObject & TSource;
+}
+interface MergeWith1x2<TObject> {
+    /**
+     * This method is like `_.merge` except that it accepts `customizer` which
+     * is invoked to produce the merged values of the destination and source
+     * properties. If `customizer` returns `undefined` merging is handled by the
+     * method instead. The `customizer` is invoked with seven arguments:
+     * (objValue, srcValue, key, object, source, stack).
+     *
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param customizer The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   if (_.isArray(objValue)) {
+     * return objValue.concat(srcValue);
+     *   }
+     * }
+     *
+     * var object = {
+     *   'fruits': ['apple'],
+     *   'vegetables': ['beet']
+     * };
+     *
+     * var other = {
+     *   'fruits': ['banana'],
+     *   'vegetables': ['carrot']
+     * };
+     *
+     * _.merge(object, other, customizer);
+     * // => { 'fruits': ['apple', 'banana'], 'vegetables': ['beet', 'carrot'] }
+     */
+    (): MergeWith1x2<TObject>;
+    /**
+     * This method is like `_.merge` except that it accepts `customizer` which
+     * is invoked to produce the merged values of the destination and source
+     * properties. If `customizer` returns `undefined` merging is handled by the
+     * method instead. The `customizer` is invoked with seven arguments:
+     * (objValue, srcValue, key, object, source, stack).
+     *
+     * @category Object
+     * @param object The destination object.
+     * @param sources The source objects.
+     * @param customizer The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * function customizer(objValue, srcValue) {
+     *   if (_.isArray(objValue)) {
+     * return objValue.concat(srcValue);
+     *   }
+     * }
+     *
+     * var object = {
+     *   'fruits': ['apple'],
+     *   'vegetables': ['beet']
+     * };
+     *
+     * var other = {
+     *   'fruits': ['banana'],
+     *   'vegetables': ['carrot']
+     * };
+     *
+     * _.merge(object, other, customizer);
+     * // => { 'fruits': ['apple', 'banana'], 'vegetables': ['beet', 'carrot'] }
+     */
+    <TSource>(source: TSource): TObject & TSource;
+}
+
+declare const mergeWith: MergeWith;
+export = mergeWith;
diff --git a/types/lodash/fp/method.d.ts b/types/lodash/fp/method.d.ts
new file mode 100644
index 0000000000..e44efd9f07
--- /dev/null
+++ b/types/lodash/fp/method.d.ts
@@ -0,0 +1,19 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+type Method =
+    /**
+     * Creates a function that invokes the method at path on a given object. Any additional arguments are provided
+     * to the invoked method.
+     *
+     * @param path The path of the method to invoke.
+     * @param args The arguments to invoke the method with.
+     * @return Returns the new function.
+     */
+    (path: _.PropertyPath) => (object: any) => any;
+
+declare const method: Method;
+export = method;
diff --git a/types/lodash/fp/methodOf.d.ts b/types/lodash/fp/methodOf.d.ts
new file mode 100644
index 0000000000..6a1a908de7
--- /dev/null
+++ b/types/lodash/fp/methodOf.d.ts
@@ -0,0 +1,19 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+type MethodOf =
+    /**
+     * The opposite of _.method; this method creates a function that invokes the method at a given path on object.
+     * Any additional arguments are provided to the invoked method.
+     *
+     * @param object The object to query.
+     * @param args The arguments to invoke the method with.
+     * @return Returns the new function.
+     */
+    (object: object) => (path: _.PropertyPath) => any;
+
+declare const methodOf: MethodOf;
+export = methodOf;
diff --git a/types/lodash/fp/min.d.ts b/types/lodash/fp/min.d.ts
new file mode 100644
index 0000000000..f637f397ac
--- /dev/null
+++ b/types/lodash/fp/min.d.ts
@@ -0,0 +1,19 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+type Min =
+    /**
+     * Computes the minimum value of `array`. If `array` is empty or falsey
+     * `undefined` is returned.
+     *
+     * @category Math
+     * @param array The array to iterate over.
+     * @returns Returns the minimum value.
+     */
+    <T>(collection: _.List<T> | null | undefined) => T | undefined;
+
+declare const min: Min;
+export = min;
diff --git a/types/lodash/fp/minBy.d.ts b/types/lodash/fp/minBy.d.ts
new file mode 100644
index 0000000000..b9bdebecd8
--- /dev/null
+++ b/types/lodash/fp/minBy.d.ts
@@ -0,0 +1,118 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface MinBy {
+    /**
+     * This method is like `_.min` except that it accepts `iteratee` which is
+     * invoked for each element in `array` to generate the criterion by which
+     * the value is ranked. The iteratee is invoked with one argument: (value).
+     *
+     * @category Math
+     * @param array The array to iterate over.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the minimum value.
+     * @example
+     *
+     * var objects = [{ 'n': 1 }, { 'n': 2 }];
+     *
+     * _.minBy(objects, function(o) { return o.a; });
+     * // => { 'n': 1 }
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.minBy(objects, 'n');
+     * // => { 'n': 1 }
+     */
+    (): MinBy;
+    /**
+     * This method is like `_.min` except that it accepts `iteratee` which is
+     * invoked for each element in `array` to generate the criterion by which
+     * the value is ranked. The iteratee is invoked with one argument: (value).
+     *
+     * @category Math
+     * @param array The array to iterate over.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the minimum value.
+     * @example
+     *
+     * var objects = [{ 'n': 1 }, { 'n': 2 }];
+     *
+     * _.minBy(objects, function(o) { return o.a; });
+     * // => { 'n': 1 }
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.minBy(objects, 'n');
+     * // => { 'n': 1 }
+     */
+    <T>(iteratee: _.ValueIteratee<T>): MinBy1x1<T>;
+    /**
+     * This method is like `_.min` except that it accepts `iteratee` which is
+     * invoked for each element in `array` to generate the criterion by which
+     * the value is ranked. The iteratee is invoked with one argument: (value).
+     *
+     * @category Math
+     * @param array The array to iterate over.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the minimum value.
+     * @example
+     *
+     * var objects = [{ 'n': 1 }, { 'n': 2 }];
+     *
+     * _.minBy(objects, function(o) { return o.a; });
+     * // => { 'n': 1 }
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.minBy(objects, 'n');
+     * // => { 'n': 1 }
+     */
+    <T>(iteratee: _.ValueIteratee<T>, collection: _.List<T> | null | undefined): T | undefined;
+}
+interface MinBy1x1<T> {
+    /**
+     * This method is like `_.min` except that it accepts `iteratee` which is
+     * invoked for each element in `array` to generate the criterion by which
+     * the value is ranked. The iteratee is invoked with one argument: (value).
+     *
+     * @category Math
+     * @param array The array to iterate over.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the minimum value.
+     * @example
+     *
+     * var objects = [{ 'n': 1 }, { 'n': 2 }];
+     *
+     * _.minBy(objects, function(o) { return o.a; });
+     * // => { 'n': 1 }
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.minBy(objects, 'n');
+     * // => { 'n': 1 }
+     */
+    (): MinBy1x1<T>;
+    /**
+     * This method is like `_.min` except that it accepts `iteratee` which is
+     * invoked for each element in `array` to generate the criterion by which
+     * the value is ranked. The iteratee is invoked with one argument: (value).
+     *
+     * @category Math
+     * @param array The array to iterate over.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the minimum value.
+     * @example
+     *
+     * var objects = [{ 'n': 1 }, { 'n': 2 }];
+     *
+     * _.minBy(objects, function(o) { return o.a; });
+     * // => { 'n': 1 }
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.minBy(objects, 'n');
+     * // => { 'n': 1 }
+     */
+    (collection: _.List<T> | null | undefined): T | undefined;
+}
+
+declare const minBy: MinBy;
+export = minBy;
diff --git a/types/lodash/fp/multiply.d.ts b/types/lodash/fp/multiply.d.ts
new file mode 100644
index 0000000000..a335372aac
--- /dev/null
+++ b/types/lodash/fp/multiply.d.ts
@@ -0,0 +1,46 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface Multiply {
+    /**
+     * Multiply two numbers.
+     * @param multiplier The first number in a multiplication.
+     * @param multiplicand The second number in a multiplication.
+     * @returns Returns the product.
+     */
+    (): Multiply;
+    /**
+     * Multiply two numbers.
+     * @param multiplier The first number in a multiplication.
+     * @param multiplicand The second number in a multiplication.
+     * @returns Returns the product.
+     */
+    (multiplier: number): Multiply1x1;
+    /**
+     * Multiply two numbers.
+     * @param multiplier The first number in a multiplication.
+     * @param multiplicand The second number in a multiplication.
+     * @returns Returns the product.
+     */
+    (multiplier: number, multiplicand: number): number;
+}
+interface Multiply1x1 {
+    /**
+     * Multiply two numbers.
+     * @param multiplier The first number in a multiplication.
+     * @param multiplicand The second number in a multiplication.
+     * @returns Returns the product.
+     */
+    (): Multiply1x1;
+    /**
+     * Multiply two numbers.
+     * @param multiplier The first number in a multiplication.
+     * @param multiplicand The second number in a multiplication.
+     * @returns Returns the product.
+     */
+    (multiplicand: number): number;
+}
+
+declare const multiply: Multiply;
+export = multiply;
diff --git a/types/lodash/fp/nAry.d.ts b/types/lodash/fp/nAry.d.ts
new file mode 100644
index 0000000000..daede14899
--- /dev/null
+++ b/types/lodash/fp/nAry.d.ts
@@ -0,0 +1,51 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface Ary {
+    /**
+     * Creates a function that accepts up to n arguments ignoring any additional arguments.
+     *
+     * @param func The function to cap arguments for.
+     * @param n The arity cap.
+     * @returns Returns the new function.
+     */
+    (): Ary;
+    /**
+     * Creates a function that accepts up to n arguments ignoring any additional arguments.
+     *
+     * @param func The function to cap arguments for.
+     * @param n The arity cap.
+     * @returns Returns the new function.
+     */
+    (n: number): Ary1x1;
+    /**
+     * Creates a function that accepts up to n arguments ignoring any additional arguments.
+     *
+     * @param func The function to cap arguments for.
+     * @param n The arity cap.
+     * @returns Returns the new function.
+     */
+    (n: number, func: (...args: any[]) => any): (...args: any[]) => any;
+}
+interface Ary1x1 {
+    /**
+     * Creates a function that accepts up to n arguments ignoring any additional arguments.
+     *
+     * @param func The function to cap arguments for.
+     * @param n The arity cap.
+     * @returns Returns the new function.
+     */
+    (): Ary1x1;
+    /**
+     * Creates a function that accepts up to n arguments ignoring any additional arguments.
+     *
+     * @param func The function to cap arguments for.
+     * @param n The arity cap.
+     * @returns Returns the new function.
+     */
+    (func: (...args: any[]) => any): (...args: any[]) => any;
+}
+
+declare const nAry: Ary;
+export = nAry;
diff --git a/types/lodash/fp/negate.d.ts b/types/lodash/fp/negate.d.ts
new file mode 100644
index 0000000000..681c5be961
--- /dev/null
+++ b/types/lodash/fp/negate.d.ts
@@ -0,0 +1,16 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type Negate =
+    /**
+     * Creates a function that negates the result of the predicate func. The func predicate is invoked with
+     * the this binding and arguments of the created function.
+     *
+     * @param predicate The predicate to negate.
+     * @return Returns the new function.
+     */
+    <T extends (...args: any[]) => any>(predicate: T) => T;
+
+declare const negate: Negate;
+export = negate;
diff --git a/types/lodash/fp/noConflict.d.ts b/types/lodash/fp/noConflict.d.ts
new file mode 100644
index 0000000000..2b1a6c71c9
--- /dev/null
+++ b/types/lodash/fp/noConflict.d.ts
@@ -0,0 +1,16 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+type NoConflict =
+    /**
+     * Reverts the _ variable to its previous value and returns a reference to the lodash function.
+     *
+     * @return Returns the lodash function.
+     */
+    () => typeof _;
+
+declare const noConflict: NoConflict;
+export = noConflict;
diff --git a/types/lodash/fp/noop.d.ts b/types/lodash/fp/noop.d.ts
new file mode 100644
index 0000000000..29ce7267ea
--- /dev/null
+++ b/types/lodash/fp/noop.d.ts
@@ -0,0 +1,14 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type Noop =
+    /**
+     * A no-operation function that returns undefined regardless of the arguments it receives.
+     *
+     * @return undefined
+     */
+    (...args: any[]) => void;
+
+declare const noop: Noop;
+export = noop;
diff --git a/types/lodash/fp/now.d.ts b/types/lodash/fp/now.d.ts
new file mode 100644
index 0000000000..d450c76116
--- /dev/null
+++ b/types/lodash/fp/now.d.ts
@@ -0,0 +1,14 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type Now =
+    /**
+     * Gets the number of milliseconds that have elapsed since the Unix epoch (1 January 1970 00:00:00 UTC).
+     *
+     * @return The number of milliseconds.
+     */
+    () => number;
+
+declare const now: Now;
+export = now;
diff --git a/types/lodash/fp/nth.d.ts b/types/lodash/fp/nth.d.ts
new file mode 100644
index 0000000000..a1fbedb1bf
--- /dev/null
+++ b/types/lodash/fp/nth.d.ts
@@ -0,0 +1,53 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Nth {
+    /**
+     * Gets the element at index `n` of `array`. If `n` is negative, the nth element from the end is returned.
+     *
+     * @param array array The array to query.
+     * @param value The index of the element to return.
+     * @return Returns the nth element of `array`.
+     */
+    (): Nth;
+    /**
+     * Gets the element at index `n` of `array`. If `n` is negative, the nth element from the end is returned.
+     *
+     * @param array array The array to query.
+     * @param value The index of the element to return.
+     * @return Returns the nth element of `array`.
+     */
+    (n: number): Nth1x1;
+    /**
+     * Gets the element at index `n` of `array`. If `n` is negative, the nth element from the end is returned.
+     *
+     * @param array array The array to query.
+     * @param value The index of the element to return.
+     * @return Returns the nth element of `array`.
+     */
+    <T>(n: number, array: _.List<T> | null | undefined): T | undefined;
+}
+interface Nth1x1 {
+    /**
+     * Gets the element at index `n` of `array`. If `n` is negative, the nth element from the end is returned.
+     *
+     * @param array array The array to query.
+     * @param value The index of the element to return.
+     * @return Returns the nth element of `array`.
+     */
+    (): Nth1x1;
+    /**
+     * Gets the element at index `n` of `array`. If `n` is negative, the nth element from the end is returned.
+     *
+     * @param array array The array to query.
+     * @param value The index of the element to return.
+     * @return Returns the nth element of `array`.
+     */
+    <T>(array: _.List<T> | null | undefined): T | undefined;
+}
+
+declare const nth: Nth;
+export = nth;
diff --git a/types/lodash/fp/nthArg.d.ts b/types/lodash/fp/nthArg.d.ts
new file mode 100644
index 0000000000..5e8335943b
--- /dev/null
+++ b/types/lodash/fp/nthArg.d.ts
@@ -0,0 +1,15 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type NthArg =
+    /**
+     * Creates a function that returns its nth argument.
+     *
+     * @param n The index of the argument to return.
+     * @return Returns the new function.
+     */
+    (n: number) => (...args: any[]) => any;
+
+declare const nthArg: NthArg;
+export = nthArg;
diff --git a/types/lodash/fp/omit.d.ts b/types/lodash/fp/omit.d.ts
new file mode 100644
index 0000000000..5c7a553b9f
--- /dev/null
+++ b/types/lodash/fp/omit.d.ts
@@ -0,0 +1,132 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Omit {
+    /**
+     * The opposite of `_.pick`; this method creates an object composed of the
+     * own and inherited enumerable properties of `object` that are not omitted.
+     *
+     * @category Object
+     * @param object The source object.
+     * @param [paths] The property names to omit, specified
+     *  individually or in arrays..
+     * @returns Returns the new object.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': '2', 'c': 3 };
+     *
+     * _.omit(object, ['a', 'c']);
+     * // => { 'b': '2' }
+     */
+    (): Omit;
+    /**
+     * The opposite of `_.pick`; this method creates an object composed of the
+     * own and inherited enumerable properties of `object` that are not omitted.
+     *
+     * @category Object
+     * @param object The source object.
+     * @param [paths] The property names to omit, specified
+     *  individually or in arrays..
+     * @returns Returns the new object.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': '2', 'c': 3 };
+     *
+     * _.omit(object, ['a', 'c']);
+     * // => { 'b': '2' }
+     */
+    (paths: _.PropertyPath): Omit1x1;
+    /**
+     * The opposite of `_.pick`; this method creates an object composed of the
+     * own and inherited enumerable properties of `object` that are not omitted.
+     *
+     * @category Object
+     * @param object The source object.
+     * @param [paths] The property names to omit, specified
+     *  individually or in arrays..
+     * @returns Returns the new object.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': '2', 'c': 3 };
+     *
+     * _.omit(object, ['a', 'c']);
+     * // => { 'b': '2' }
+     */
+    <T extends _.AnyKindOfDictionary>(paths: _.PropertyPath, object: T | null | undefined): T;
+    /**
+     * The opposite of `_.pick`; this method creates an object composed of the
+     * own and inherited enumerable properties of `object` that are not omitted.
+     *
+     * @category Object
+     * @param object The source object.
+     * @param [paths] The property names to omit, specified
+     *  individually or in arrays..
+     * @returns Returns the new object.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': '2', 'c': 3 };
+     *
+     * _.omit(object, ['a', 'c']);
+     * // => { 'b': '2' }
+     */
+    <T extends object>(paths: _.PropertyPath, object: T | null | undefined): _.PartialObject<T>;
+}
+interface Omit1x1 {
+    /**
+     * The opposite of `_.pick`; this method creates an object composed of the
+     * own and inherited enumerable properties of `object` that are not omitted.
+     *
+     * @category Object
+     * @param object The source object.
+     * @param [paths] The property names to omit, specified
+     *  individually or in arrays..
+     * @returns Returns the new object.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': '2', 'c': 3 };
+     *
+     * _.omit(object, ['a', 'c']);
+     * // => { 'b': '2' }
+     */
+    (): Omit1x1;
+    /**
+     * The opposite of `_.pick`; this method creates an object composed of the
+     * own and inherited enumerable properties of `object` that are not omitted.
+     *
+     * @category Object
+     * @param object The source object.
+     * @param [paths] The property names to omit, specified
+     *  individually or in arrays..
+     * @returns Returns the new object.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': '2', 'c': 3 };
+     *
+     * _.omit(object, ['a', 'c']);
+     * // => { 'b': '2' }
+     */
+    <T extends _.AnyKindOfDictionary>(object: T | null | undefined): T;
+    /**
+     * The opposite of `_.pick`; this method creates an object composed of the
+     * own and inherited enumerable properties of `object` that are not omitted.
+     *
+     * @category Object
+     * @param object The source object.
+     * @param [paths] The property names to omit, specified
+     *  individually or in arrays..
+     * @returns Returns the new object.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': '2', 'c': 3 };
+     *
+     * _.omit(object, ['a', 'c']);
+     * // => { 'b': '2' }
+     */
+    <T extends object>(object: T | null | undefined): _.PartialObject<T>;
+}
+
+declare const omit: Omit;
+export = omit;
diff --git a/types/lodash/fp/omitAll.d.ts b/types/lodash/fp/omitAll.d.ts
new file mode 100644
index 0000000000..a3aec48c5f
--- /dev/null
+++ b/types/lodash/fp/omitAll.d.ts
@@ -0,0 +1,132 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Omit {
+    /**
+     * The opposite of `_.pick`; this method creates an object composed of the
+     * own and inherited enumerable properties of `object` that are not omitted.
+     *
+     * @category Object
+     * @param object The source object.
+     * @param [paths] The property names to omit, specified
+     *  individually or in arrays..
+     * @returns Returns the new object.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': '2', 'c': 3 };
+     *
+     * _.omit(object, ['a', 'c']);
+     * // => { 'b': '2' }
+     */
+    (): Omit;
+    /**
+     * The opposite of `_.pick`; this method creates an object composed of the
+     * own and inherited enumerable properties of `object` that are not omitted.
+     *
+     * @category Object
+     * @param object The source object.
+     * @param [paths] The property names to omit, specified
+     *  individually or in arrays..
+     * @returns Returns the new object.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': '2', 'c': 3 };
+     *
+     * _.omit(object, ['a', 'c']);
+     * // => { 'b': '2' }
+     */
+    (paths: _.PropertyPath): Omit1x1;
+    /**
+     * The opposite of `_.pick`; this method creates an object composed of the
+     * own and inherited enumerable properties of `object` that are not omitted.
+     *
+     * @category Object
+     * @param object The source object.
+     * @param [paths] The property names to omit, specified
+     *  individually or in arrays..
+     * @returns Returns the new object.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': '2', 'c': 3 };
+     *
+     * _.omit(object, ['a', 'c']);
+     * // => { 'b': '2' }
+     */
+    <T extends _.AnyKindOfDictionary>(paths: _.PropertyPath, object: T | null | undefined): T;
+    /**
+     * The opposite of `_.pick`; this method creates an object composed of the
+     * own and inherited enumerable properties of `object` that are not omitted.
+     *
+     * @category Object
+     * @param object The source object.
+     * @param [paths] The property names to omit, specified
+     *  individually or in arrays..
+     * @returns Returns the new object.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': '2', 'c': 3 };
+     *
+     * _.omit(object, ['a', 'c']);
+     * // => { 'b': '2' }
+     */
+    <T extends object>(paths: _.PropertyPath, object: T | null | undefined): _.PartialObject<T>;
+}
+interface Omit1x1 {
+    /**
+     * The opposite of `_.pick`; this method creates an object composed of the
+     * own and inherited enumerable properties of `object` that are not omitted.
+     *
+     * @category Object
+     * @param object The source object.
+     * @param [paths] The property names to omit, specified
+     *  individually or in arrays..
+     * @returns Returns the new object.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': '2', 'c': 3 };
+     *
+     * _.omit(object, ['a', 'c']);
+     * // => { 'b': '2' }
+     */
+    (): Omit1x1;
+    /**
+     * The opposite of `_.pick`; this method creates an object composed of the
+     * own and inherited enumerable properties of `object` that are not omitted.
+     *
+     * @category Object
+     * @param object The source object.
+     * @param [paths] The property names to omit, specified
+     *  individually or in arrays..
+     * @returns Returns the new object.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': '2', 'c': 3 };
+     *
+     * _.omit(object, ['a', 'c']);
+     * // => { 'b': '2' }
+     */
+    <T extends _.AnyKindOfDictionary>(object: T | null | undefined): T;
+    /**
+     * The opposite of `_.pick`; this method creates an object composed of the
+     * own and inherited enumerable properties of `object` that are not omitted.
+     *
+     * @category Object
+     * @param object The source object.
+     * @param [paths] The property names to omit, specified
+     *  individually or in arrays..
+     * @returns Returns the new object.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': '2', 'c': 3 };
+     *
+     * _.omit(object, ['a', 'c']);
+     * // => { 'b': '2' }
+     */
+    <T extends object>(object: T | null | undefined): _.PartialObject<T>;
+}
+
+declare const omitAll: Omit;
+export = omitAll;
diff --git a/types/lodash/fp/omitBy.d.ts b/types/lodash/fp/omitBy.d.ts
new file mode 100644
index 0000000000..b0bf665afc
--- /dev/null
+++ b/types/lodash/fp/omitBy.d.ts
@@ -0,0 +1,98 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface OmitBy {
+    /**
+     * The opposite of `_.pickBy`; this method creates an object composed of the
+     * own and inherited enumerable properties of `object` that `predicate`
+     * doesn't return truthy for.
+     *
+     * @category Object
+     * @param object The source object.
+     * @param [predicate=_.identity] The function invoked per property.
+     * @returns Returns the new object.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': '2', 'c': 3 };
+     *
+     * _.omitBy(object, _.isNumber);
+     * // => { 'b': '2' }
+     */
+    (): OmitBy;
+    /**
+     * The opposite of `_.pickBy`; this method creates an object composed of the
+     * own and inherited enumerable properties of `object` that `predicate`
+     * doesn't return truthy for.
+     *
+     * @category Object
+     * @param object The source object.
+     * @param [predicate=_.identity] The function invoked per property.
+     * @returns Returns the new object.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': '2', 'c': 3 };
+     *
+     * _.omitBy(object, _.isNumber);
+     * // => { 'b': '2' }
+     */
+    <T>(predicate: _.ValueKeyIteratee<T>): OmitBy1x1<T>;
+    /**
+     * The opposite of `_.pickBy`; this method creates an object composed of the
+     * own and inherited enumerable properties of `object` that `predicate`
+     * doesn't return truthy for.
+     *
+     * @category Object
+     * @param object The source object.
+     * @param [predicate=_.identity] The function invoked per property.
+     * @returns Returns the new object.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': '2', 'c': 3 };
+     *
+     * _.omitBy(object, _.isNumber);
+     * // => { 'b': '2' }
+     */
+    <T extends object>(predicate: _.ValueKeyIteratee<T[keyof T]>, object: T | null | undefined): _.PartialObject<T>;
+}
+interface OmitBy1x1<T> {
+    /**
+     * The opposite of `_.pickBy`; this method creates an object composed of the
+     * own and inherited enumerable properties of `object` that `predicate`
+     * doesn't return truthy for.
+     *
+     * @category Object
+     * @param object The source object.
+     * @param [predicate=_.identity] The function invoked per property.
+     * @returns Returns the new object.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': '2', 'c': 3 };
+     *
+     * _.omitBy(object, _.isNumber);
+     * // => { 'b': '2' }
+     */
+    (): OmitBy1x1<T>;
+    /**
+     * The opposite of `_.pickBy`; this method creates an object composed of the
+     * own and inherited enumerable properties of `object` that `predicate`
+     * doesn't return truthy for.
+     *
+     * @category Object
+     * @param object The source object.
+     * @param [predicate=_.identity] The function invoked per property.
+     * @returns Returns the new object.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': '2', 'c': 3 };
+     *
+     * _.omitBy(object, _.isNumber);
+     * // => { 'b': '2' }
+     */
+    <T1 extends object>(object: T1 | null | undefined): _.PartialObject<T1>;
+}
+
+declare const omitBy: OmitBy;
+export = omitBy;
diff --git a/types/lodash/fp/once.d.ts b/types/lodash/fp/once.d.ts
new file mode 100644
index 0000000000..f97a08a13e
--- /dev/null
+++ b/types/lodash/fp/once.d.ts
@@ -0,0 +1,16 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type Once =
+    /**
+     * Creates a function that is restricted to invoking func once. Repeat calls to the function return the value
+     * of the first call. The func is invoked with the this binding and arguments of the created function.
+     *
+     * @param func The function to restrict.
+     * @return Returns the new restricted function.
+     */
+    <T extends (...args: any[]) => any>(func: T) => T;
+
+declare const once: Once;
+export = once;
diff --git a/types/lodash/fp/orderBy.d.ts b/types/lodash/fp/orderBy.d.ts
new file mode 100644
index 0000000000..4cf7048978
--- /dev/null
+++ b/types/lodash/fp/orderBy.d.ts
@@ -0,0 +1,461 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface OrderBy {
+    /**
+     * This method is like `_.sortBy` except that it allows specifying the sort
+     * orders of the iteratees to sort by. If `orders` is unspecified, all values
+     * are sorted in ascending order. Otherwise, specify an order of "desc" for
+     * descending or "asc" for ascending sort order of corresponding values.
+     *
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratees=[_.identity]] The iteratees to sort by.
+     * @param [orders] The sort orders of `iteratees`.
+     * @param- {Object} [guard] Enables use as an iteratee for functions like `_.reduce`.
+     * @returns Returns the new sorted array.
+     * @example
+     *
+     * var users = [
+     *   { 'user': 'fred',   'age': 48 },
+     *   { 'user': 'barney', 'age': 34 },
+     *   { 'user': 'fred',   'age': 42 },
+     *   { 'user': 'barney', 'age': 36 }
+     * ];
+     *
+     * // sort by `user` in ascending order and by `age` in descending order
+     * _.orderBy(users, ['user', 'age'], ['asc', 'desc']);
+     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
+     */
+    (): OrderBy;
+    /**
+     * This method is like `_.sortBy` except that it allows specifying the sort
+     * orders of the iteratees to sort by. If `orders` is unspecified, all values
+     * are sorted in ascending order. Otherwise, specify an order of "desc" for
+     * descending or "asc" for ascending sort order of corresponding values.
+     *
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratees=[_.identity]] The iteratees to sort by.
+     * @param [orders] The sort orders of `iteratees`.
+     * @param- {Object} [guard] Enables use as an iteratee for functions like `_.reduce`.
+     * @returns Returns the new sorted array.
+     * @example
+     *
+     * var users = [
+     *   { 'user': 'fred',   'age': 48 },
+     *   { 'user': 'barney', 'age': 34 },
+     *   { 'user': 'fred',   'age': 42 },
+     *   { 'user': 'barney', 'age': 36 }
+     * ];
+     *
+     * // sort by `user` in ascending order and by `age` in descending order
+     * _.orderBy(users, ['user', 'age'], ['asc', 'desc']);
+     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
+     */
+    <T>(iteratees: _.Many<(value: T) => _.NotVoid>): OrderBy1x1<T>;
+    /**
+     * This method is like `_.sortBy` except that it allows specifying the sort
+     * orders of the iteratees to sort by. If `orders` is unspecified, all values
+     * are sorted in ascending order. Otherwise, specify an order of "desc" for
+     * descending or "asc" for ascending sort order of corresponding values.
+     *
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratees=[_.identity]] The iteratees to sort by.
+     * @param [orders] The sort orders of `iteratees`.
+     * @param- {Object} [guard] Enables use as an iteratee for functions like `_.reduce`.
+     * @returns Returns the new sorted array.
+     * @example
+     *
+     * var users = [
+     *   { 'user': 'fred',   'age': 48 },
+     *   { 'user': 'barney', 'age': 34 },
+     *   { 'user': 'fred',   'age': 42 },
+     *   { 'user': 'barney', 'age': 36 }
+     * ];
+     *
+     * // sort by `user` in ascending order and by `age` in descending order
+     * _.orderBy(users, ['user', 'age'], ['asc', 'desc']);
+     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
+     */
+    <T>(iteratees: _.Many<(value: T) => _.NotVoid>, orders: _.Many<boolean|string>): OrderBy1x2<T>;
+    /**
+     * This method is like `_.sortBy` except that it allows specifying the sort
+     * orders of the iteratees to sort by. If `orders` is unspecified, all values
+     * are sorted in ascending order. Otherwise, specify an order of "desc" for
+     * descending or "asc" for ascending sort order of corresponding values.
+     *
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratees=[_.identity]] The iteratees to sort by.
+     * @param [orders] The sort orders of `iteratees`.
+     * @param- {Object} [guard] Enables use as an iteratee for functions like `_.reduce`.
+     * @returns Returns the new sorted array.
+     * @example
+     *
+     * var users = [
+     *   { 'user': 'fred',   'age': 48 },
+     *   { 'user': 'barney', 'age': 34 },
+     *   { 'user': 'fred',   'age': 42 },
+     *   { 'user': 'barney', 'age': 36 }
+     * ];
+     *
+     * // sort by `user` in ascending order and by `age` in descending order
+     * _.orderBy(users, ['user', 'age'], ['asc', 'desc']);
+     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
+     */
+    <T>(iteratees: _.Many<(value: T) => _.NotVoid> | _.Many<_.ValueIteratee<T>>, orders: _.Many<boolean | string>, collection: _.List<T> | null | undefined): T[];
+    /**
+     * This method is like `_.sortBy` except that it allows specifying the sort
+     * orders of the iteratees to sort by. If `orders` is unspecified, all values
+     * are sorted in ascending order. Otherwise, specify an order of "desc" for
+     * descending or "asc" for ascending sort order of corresponding values.
+     *
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratees=[_.identity]] The iteratees to sort by.
+     * @param [orders] The sort orders of `iteratees`.
+     * @param- {Object} [guard] Enables use as an iteratee for functions like `_.reduce`.
+     * @returns Returns the new sorted array.
+     * @example
+     *
+     * var users = [
+     *   { 'user': 'fred',   'age': 48 },
+     *   { 'user': 'barney', 'age': 34 },
+     *   { 'user': 'fred',   'age': 42 },
+     *   { 'user': 'barney', 'age': 36 }
+     * ];
+     *
+     * // sort by `user` in ascending order and by `age` in descending order
+     * _.orderBy(users, ['user', 'age'], ['asc', 'desc']);
+     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
+     */
+    <T>(iteratees: _.Many<_.ValueIteratee<T>>): OrderBy2x1<T>;
+    /**
+     * This method is like `_.sortBy` except that it allows specifying the sort
+     * orders of the iteratees to sort by. If `orders` is unspecified, all values
+     * are sorted in ascending order. Otherwise, specify an order of "desc" for
+     * descending or "asc" for ascending sort order of corresponding values.
+     *
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratees=[_.identity]] The iteratees to sort by.
+     * @param [orders] The sort orders of `iteratees`.
+     * @param- {Object} [guard] Enables use as an iteratee for functions like `_.reduce`.
+     * @returns Returns the new sorted array.
+     * @example
+     *
+     * var users = [
+     *   { 'user': 'fred',   'age': 48 },
+     *   { 'user': 'barney', 'age': 34 },
+     *   { 'user': 'fred',   'age': 42 },
+     *   { 'user': 'barney', 'age': 36 }
+     * ];
+     *
+     * // sort by `user` in ascending order and by `age` in descending order
+     * _.orderBy(users, ['user', 'age'], ['asc', 'desc']);
+     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
+     */
+    <T>(iteratees: _.Many<_.ValueIteratee<T>>, orders: _.Many<boolean|string>): OrderBy2x2<T>;
+    /**
+     * This method is like `_.sortBy` except that it allows specifying the sort
+     * orders of the iteratees to sort by. If `orders` is unspecified, all values
+     * are sorted in ascending order. Otherwise, specify an order of "desc" for
+     * descending or "asc" for ascending sort order of corresponding values.
+     *
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratees=[_.identity]] The iteratees to sort by.
+     * @param [orders] The sort orders of `iteratees`.
+     * @param- {Object} [guard] Enables use as an iteratee for functions like `_.reduce`.
+     * @returns Returns the new sorted array.
+     * @example
+     *
+     * var users = [
+     *   { 'user': 'fred',   'age': 48 },
+     *   { 'user': 'barney', 'age': 34 },
+     *   { 'user': 'fred',   'age': 42 },
+     *   { 'user': 'barney', 'age': 36 }
+     * ];
+     *
+     * // sort by `user` in ascending order and by `age` in descending order
+     * _.orderBy(users, ['user', 'age'], ['asc', 'desc']);
+     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
+     */
+    <T extends object>(iteratees: _.Many<(value: T[keyof T]) => _.NotVoid> | _.Many<_.ValueIteratee<T[keyof T]>>, orders: _.Many<boolean | string>, collection: T | null | undefined): Array<T[keyof T]>;
+}
+interface OrderBy1x1<T> {
+    /**
+     * This method is like `_.sortBy` except that it allows specifying the sort
+     * orders of the iteratees to sort by. If `orders` is unspecified, all values
+     * are sorted in ascending order. Otherwise, specify an order of "desc" for
+     * descending or "asc" for ascending sort order of corresponding values.
+     *
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratees=[_.identity]] The iteratees to sort by.
+     * @param [orders] The sort orders of `iteratees`.
+     * @param- {Object} [guard] Enables use as an iteratee for functions like `_.reduce`.
+     * @returns Returns the new sorted array.
+     * @example
+     *
+     * var users = [
+     *   { 'user': 'fred',   'age': 48 },
+     *   { 'user': 'barney', 'age': 34 },
+     *   { 'user': 'fred',   'age': 42 },
+     *   { 'user': 'barney', 'age': 36 }
+     * ];
+     *
+     * // sort by `user` in ascending order and by `age` in descending order
+     * _.orderBy(users, ['user', 'age'], ['asc', 'desc']);
+     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
+     */
+    (): OrderBy1x1<T>;
+    /**
+     * This method is like `_.sortBy` except that it allows specifying the sort
+     * orders of the iteratees to sort by. If `orders` is unspecified, all values
+     * are sorted in ascending order. Otherwise, specify an order of "desc" for
+     * descending or "asc" for ascending sort order of corresponding values.
+     *
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratees=[_.identity]] The iteratees to sort by.
+     * @param [orders] The sort orders of `iteratees`.
+     * @param- {Object} [guard] Enables use as an iteratee for functions like `_.reduce`.
+     * @returns Returns the new sorted array.
+     * @example
+     *
+     * var users = [
+     *   { 'user': 'fred',   'age': 48 },
+     *   { 'user': 'barney', 'age': 34 },
+     *   { 'user': 'fred',   'age': 42 },
+     *   { 'user': 'barney', 'age': 36 }
+     * ];
+     *
+     * // sort by `user` in ascending order and by `age` in descending order
+     * _.orderBy(users, ['user', 'age'], ['asc', 'desc']);
+     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
+     */
+    (orders: _.Many<boolean | string>): OrderBy1x2<T>;
+    /**
+     * This method is like `_.sortBy` except that it allows specifying the sort
+     * orders of the iteratees to sort by. If `orders` is unspecified, all values
+     * are sorted in ascending order. Otherwise, specify an order of "desc" for
+     * descending or "asc" for ascending sort order of corresponding values.
+     *
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratees=[_.identity]] The iteratees to sort by.
+     * @param [orders] The sort orders of `iteratees`.
+     * @param- {Object} [guard] Enables use as an iteratee for functions like `_.reduce`.
+     * @returns Returns the new sorted array.
+     * @example
+     *
+     * var users = [
+     *   { 'user': 'fred',   'age': 48 },
+     *   { 'user': 'barney', 'age': 34 },
+     *   { 'user': 'fred',   'age': 42 },
+     *   { 'user': 'barney', 'age': 36 }
+     * ];
+     *
+     * // sort by `user` in ascending order and by `age` in descending order
+     * _.orderBy(users, ['user', 'age'], ['asc', 'desc']);
+     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
+     */
+    (orders: _.Many<boolean | string>, collection: _.List<T> | object | null | undefined): T[];
+}
+interface OrderBy1x2<T> {
+    /**
+     * This method is like `_.sortBy` except that it allows specifying the sort
+     * orders of the iteratees to sort by. If `orders` is unspecified, all values
+     * are sorted in ascending order. Otherwise, specify an order of "desc" for
+     * descending or "asc" for ascending sort order of corresponding values.
+     *
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratees=[_.identity]] The iteratees to sort by.
+     * @param [orders] The sort orders of `iteratees`.
+     * @param- {Object} [guard] Enables use as an iteratee for functions like `_.reduce`.
+     * @returns Returns the new sorted array.
+     * @example
+     *
+     * var users = [
+     *   { 'user': 'fred',   'age': 48 },
+     *   { 'user': 'barney', 'age': 34 },
+     *   { 'user': 'fred',   'age': 42 },
+     *   { 'user': 'barney', 'age': 36 }
+     * ];
+     *
+     * // sort by `user` in ascending order and by `age` in descending order
+     * _.orderBy(users, ['user', 'age'], ['asc', 'desc']);
+     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
+     */
+    (): OrderBy1x2<T>;
+    /**
+     * This method is like `_.sortBy` except that it allows specifying the sort
+     * orders of the iteratees to sort by. If `orders` is unspecified, all values
+     * are sorted in ascending order. Otherwise, specify an order of "desc" for
+     * descending or "asc" for ascending sort order of corresponding values.
+     *
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratees=[_.identity]] The iteratees to sort by.
+     * @param [orders] The sort orders of `iteratees`.
+     * @param- {Object} [guard] Enables use as an iteratee for functions like `_.reduce`.
+     * @returns Returns the new sorted array.
+     * @example
+     *
+     * var users = [
+     *   { 'user': 'fred',   'age': 48 },
+     *   { 'user': 'barney', 'age': 34 },
+     *   { 'user': 'fred',   'age': 42 },
+     *   { 'user': 'barney', 'age': 36 }
+     * ];
+     *
+     * // sort by `user` in ascending order and by `age` in descending order
+     * _.orderBy(users, ['user', 'age'], ['asc', 'desc']);
+     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
+     */
+    (collection: _.List<T> | object | null | undefined): T[];
+}
+interface OrderBy2x1<T> {
+    /**
+     * This method is like `_.sortBy` except that it allows specifying the sort
+     * orders of the iteratees to sort by. If `orders` is unspecified, all values
+     * are sorted in ascending order. Otherwise, specify an order of "desc" for
+     * descending or "asc" for ascending sort order of corresponding values.
+     *
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratees=[_.identity]] The iteratees to sort by.
+     * @param [orders] The sort orders of `iteratees`.
+     * @param- {Object} [guard] Enables use as an iteratee for functions like `_.reduce`.
+     * @returns Returns the new sorted array.
+     * @example
+     *
+     * var users = [
+     *   { 'user': 'fred',   'age': 48 },
+     *   { 'user': 'barney', 'age': 34 },
+     *   { 'user': 'fred',   'age': 42 },
+     *   { 'user': 'barney', 'age': 36 }
+     * ];
+     *
+     * // sort by `user` in ascending order and by `age` in descending order
+     * _.orderBy(users, ['user', 'age'], ['asc', 'desc']);
+     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
+     */
+    (): OrderBy2x1<T>;
+    /**
+     * This method is like `_.sortBy` except that it allows specifying the sort
+     * orders of the iteratees to sort by. If `orders` is unspecified, all values
+     * are sorted in ascending order. Otherwise, specify an order of "desc" for
+     * descending or "asc" for ascending sort order of corresponding values.
+     *
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratees=[_.identity]] The iteratees to sort by.
+     * @param [orders] The sort orders of `iteratees`.
+     * @param- {Object} [guard] Enables use as an iteratee for functions like `_.reduce`.
+     * @returns Returns the new sorted array.
+     * @example
+     *
+     * var users = [
+     *   { 'user': 'fred',   'age': 48 },
+     *   { 'user': 'barney', 'age': 34 },
+     *   { 'user': 'fred',   'age': 42 },
+     *   { 'user': 'barney', 'age': 36 }
+     * ];
+     *
+     * // sort by `user` in ascending order and by `age` in descending order
+     * _.orderBy(users, ['user', 'age'], ['asc', 'desc']);
+     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
+     */
+    (orders: _.Many<boolean | string>): OrderBy2x2<T>;
+    /**
+     * This method is like `_.sortBy` except that it allows specifying the sort
+     * orders of the iteratees to sort by. If `orders` is unspecified, all values
+     * are sorted in ascending order. Otherwise, specify an order of "desc" for
+     * descending or "asc" for ascending sort order of corresponding values.
+     *
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratees=[_.identity]] The iteratees to sort by.
+     * @param [orders] The sort orders of `iteratees`.
+     * @param- {Object} [guard] Enables use as an iteratee for functions like `_.reduce`.
+     * @returns Returns the new sorted array.
+     * @example
+     *
+     * var users = [
+     *   { 'user': 'fred',   'age': 48 },
+     *   { 'user': 'barney', 'age': 34 },
+     *   { 'user': 'fred',   'age': 42 },
+     *   { 'user': 'barney', 'age': 36 }
+     * ];
+     *
+     * // sort by `user` in ascending order and by `age` in descending order
+     * _.orderBy(users, ['user', 'age'], ['asc', 'desc']);
+     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
+     */
+    (orders: _.Many<boolean | string>, collection: _.List<T> | object | null | undefined): T[];
+}
+interface OrderBy2x2<T> {
+    /**
+     * This method is like `_.sortBy` except that it allows specifying the sort
+     * orders of the iteratees to sort by. If `orders` is unspecified, all values
+     * are sorted in ascending order. Otherwise, specify an order of "desc" for
+     * descending or "asc" for ascending sort order of corresponding values.
+     *
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratees=[_.identity]] The iteratees to sort by.
+     * @param [orders] The sort orders of `iteratees`.
+     * @param- {Object} [guard] Enables use as an iteratee for functions like `_.reduce`.
+     * @returns Returns the new sorted array.
+     * @example
+     *
+     * var users = [
+     *   { 'user': 'fred',   'age': 48 },
+     *   { 'user': 'barney', 'age': 34 },
+     *   { 'user': 'fred',   'age': 42 },
+     *   { 'user': 'barney', 'age': 36 }
+     * ];
+     *
+     * // sort by `user` in ascending order and by `age` in descending order
+     * _.orderBy(users, ['user', 'age'], ['asc', 'desc']);
+     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
+     */
+    (): OrderBy2x2<T>;
+    /**
+     * This method is like `_.sortBy` except that it allows specifying the sort
+     * orders of the iteratees to sort by. If `orders` is unspecified, all values
+     * are sorted in ascending order. Otherwise, specify an order of "desc" for
+     * descending or "asc" for ascending sort order of corresponding values.
+     *
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratees=[_.identity]] The iteratees to sort by.
+     * @param [orders] The sort orders of `iteratees`.
+     * @param- {Object} [guard] Enables use as an iteratee for functions like `_.reduce`.
+     * @returns Returns the new sorted array.
+     * @example
+     *
+     * var users = [
+     *   { 'user': 'fred',   'age': 48 },
+     *   { 'user': 'barney', 'age': 34 },
+     *   { 'user': 'fred',   'age': 42 },
+     *   { 'user': 'barney', 'age': 36 }
+     * ];
+     *
+     * // sort by `user` in ascending order and by `age` in descending order
+     * _.orderBy(users, ['user', 'age'], ['asc', 'desc']);
+     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
+     */
+    (collection: _.List<T> | object | null | undefined): T[];
+}
+
+declare const orderBy: OrderBy;
+export = orderBy;
diff --git a/types/lodash/fp/over.d.ts b/types/lodash/fp/over.d.ts
new file mode 100644
index 0000000000..4bd1803827
--- /dev/null
+++ b/types/lodash/fp/over.d.ts
@@ -0,0 +1,18 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+type Over =
+    /**
+     * Creates a function that invokes iteratees with the arguments provided to the created function and returns
+     * their results.
+     *
+     * @param iteratees The iteratees to invoke.
+     * @return Returns the new function.
+     */
+    <TResult>(iteratees: _.Many<(...args: any[]) => TResult>) => (...args: any[]) => TResult[];
+
+declare const over: Over;
+export = over;
diff --git a/types/lodash/fp/overArgs.d.ts b/types/lodash/fp/overArgs.d.ts
new file mode 100644
index 0000000000..84241e3e58
--- /dev/null
+++ b/types/lodash/fp/overArgs.d.ts
@@ -0,0 +1,58 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface OverArgs {
+    /**
+     * Creates a function that runs each argument through a corresponding transform function.
+     *
+     * @param func The function to wrap.
+     * @param transforms The functions to transform arguments, specified as individual functions or arrays
+     * of functions.
+     * @return Returns the new function.
+     */
+    (): OverArgs;
+    /**
+     * Creates a function that runs each argument through a corresponding transform function.
+     *
+     * @param func The function to wrap.
+     * @param transforms The functions to transform arguments, specified as individual functions or arrays
+     * of functions.
+     * @return Returns the new function.
+     */
+    (func: (...args: any[]) => any): OverArgs1x1;
+    /**
+     * Creates a function that runs each argument through a corresponding transform function.
+     *
+     * @param func The function to wrap.
+     * @param transforms The functions to transform arguments, specified as individual functions or arrays
+     * of functions.
+     * @return Returns the new function.
+     */
+    (func: (...args: any[]) => any, transforms: _.Many<(...args: any[]) => any>): (...args: any[]) => any;
+}
+interface OverArgs1x1 {
+    /**
+     * Creates a function that runs each argument through a corresponding transform function.
+     *
+     * @param func The function to wrap.
+     * @param transforms The functions to transform arguments, specified as individual functions or arrays
+     * of functions.
+     * @return Returns the new function.
+     */
+    (): OverArgs1x1;
+    /**
+     * Creates a function that runs each argument through a corresponding transform function.
+     *
+     * @param func The function to wrap.
+     * @param transforms The functions to transform arguments, specified as individual functions or arrays
+     * of functions.
+     * @return Returns the new function.
+     */
+    (transforms: _.Many<(...args: any[]) => any>): (...args: any[]) => any;
+}
+
+declare const overArgs: OverArgs;
+export = overArgs;
diff --git a/types/lodash/fp/overEvery.d.ts b/types/lodash/fp/overEvery.d.ts
new file mode 100644
index 0000000000..3ebf8e2abf
--- /dev/null
+++ b/types/lodash/fp/overEvery.d.ts
@@ -0,0 +1,18 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+type OverEvery =
+    /**
+     * Creates a function that checks if all of the predicates return truthy when invoked with the arguments
+     * provided to the created function.
+     *
+     * @param predicates The predicates to check.
+     * @return Returns the new function.
+     */
+    <T>(predicates: _.Many<(...args: T[]) => boolean>) => (...args: T[]) => boolean;
+
+declare const overEvery: OverEvery;
+export = overEvery;
diff --git a/types/lodash/fp/overSome.d.ts b/types/lodash/fp/overSome.d.ts
new file mode 100644
index 0000000000..75315b07d0
--- /dev/null
+++ b/types/lodash/fp/overSome.d.ts
@@ -0,0 +1,18 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+type OverSome =
+    /**
+     * Creates a function that checks if any of the predicates return truthy when invoked with the arguments
+     * provided to the created function.
+     *
+     * @param predicates The predicates to check.
+     * @return Returns the new function.
+     */
+    <T>(predicates: _.Many<(...args: T[]) => boolean>) => (...args: T[]) => boolean;
+
+declare const overSome: OverSome;
+export = overSome;
diff --git a/types/lodash/fp/pad.d.ts b/types/lodash/fp/pad.d.ts
new file mode 100644
index 0000000000..e6581046a2
--- /dev/null
+++ b/types/lodash/fp/pad.d.ts
@@ -0,0 +1,61 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface Pad {
+    /**
+     * Pads string on the left and right sides if it’s shorter than length. Padding characters are truncated if
+     * they can’t be evenly divided by length.
+     *
+     * @param string The string to pad.
+     * @param length The padding length.
+     * @param chars The string used as padding.
+     * @return Returns the padded string.
+     */
+    (): Pad;
+    /**
+     * Pads string on the left and right sides if it’s shorter than length. Padding characters are truncated if
+     * they can’t be evenly divided by length.
+     *
+     * @param string The string to pad.
+     * @param length The padding length.
+     * @param chars The string used as padding.
+     * @return Returns the padded string.
+     */
+    (length: number): Pad1x1;
+    /**
+     * Pads string on the left and right sides if it’s shorter than length. Padding characters are truncated if
+     * they can’t be evenly divided by length.
+     *
+     * @param string The string to pad.
+     * @param length The padding length.
+     * @param chars The string used as padding.
+     * @return Returns the padded string.
+     */
+    (length: number, string: string): string;
+}
+interface Pad1x1 {
+    /**
+     * Pads string on the left and right sides if it’s shorter than length. Padding characters are truncated if
+     * they can’t be evenly divided by length.
+     *
+     * @param string The string to pad.
+     * @param length The padding length.
+     * @param chars The string used as padding.
+     * @return Returns the padded string.
+     */
+    (): Pad1x1;
+    /**
+     * Pads string on the left and right sides if it’s shorter than length. Padding characters are truncated if
+     * they can’t be evenly divided by length.
+     *
+     * @param string The string to pad.
+     * @param length The padding length.
+     * @param chars The string used as padding.
+     * @return Returns the padded string.
+     */
+    (string: string): string;
+}
+
+declare const pad: Pad;
+export = pad;
diff --git a/types/lodash/fp/padChars.d.ts b/types/lodash/fp/padChars.d.ts
new file mode 100644
index 0000000000..11d797db06
--- /dev/null
+++ b/types/lodash/fp/padChars.d.ts
@@ -0,0 +1,103 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface Pad {
+    /**
+     * Pads string on the left and right sides if it’s shorter than length. Padding characters are truncated if
+     * they can’t be evenly divided by length.
+     *
+     * @param string The string to pad.
+     * @param length The padding length.
+     * @param chars The string used as padding.
+     * @return Returns the padded string.
+     */
+    (): Pad;
+    /**
+     * Pads string on the left and right sides if it’s shorter than length. Padding characters are truncated if
+     * they can’t be evenly divided by length.
+     *
+     * @param string The string to pad.
+     * @param length The padding length.
+     * @param chars The string used as padding.
+     * @return Returns the padded string.
+     */
+    (chars: string): Pad1x1;
+    /**
+     * Pads string on the left and right sides if it’s shorter than length. Padding characters are truncated if
+     * they can’t be evenly divided by length.
+     *
+     * @param string The string to pad.
+     * @param length The padding length.
+     * @param chars The string used as padding.
+     * @return Returns the padded string.
+     */
+    (chars: string, length: number): Pad1x2;
+    /**
+     * Pads string on the left and right sides if it’s shorter than length. Padding characters are truncated if
+     * they can’t be evenly divided by length.
+     *
+     * @param string The string to pad.
+     * @param length The padding length.
+     * @param chars The string used as padding.
+     * @return Returns the padded string.
+     */
+    (chars: string, length: number, string: string): string;
+}
+interface Pad1x1 {
+    /**
+     * Pads string on the left and right sides if it’s shorter than length. Padding characters are truncated if
+     * they can’t be evenly divided by length.
+     *
+     * @param string The string to pad.
+     * @param length The padding length.
+     * @param chars The string used as padding.
+     * @return Returns the padded string.
+     */
+    (): Pad1x1;
+    /**
+     * Pads string on the left and right sides if it’s shorter than length. Padding characters are truncated if
+     * they can’t be evenly divided by length.
+     *
+     * @param string The string to pad.
+     * @param length The padding length.
+     * @param chars The string used as padding.
+     * @return Returns the padded string.
+     */
+    (length: number): Pad1x2;
+    /**
+     * Pads string on the left and right sides if it’s shorter than length. Padding characters are truncated if
+     * they can’t be evenly divided by length.
+     *
+     * @param string The string to pad.
+     * @param length The padding length.
+     * @param chars The string used as padding.
+     * @return Returns the padded string.
+     */
+    (length: number, string: string): string;
+}
+interface Pad1x2 {
+    /**
+     * Pads string on the left and right sides if it’s shorter than length. Padding characters are truncated if
+     * they can’t be evenly divided by length.
+     *
+     * @param string The string to pad.
+     * @param length The padding length.
+     * @param chars The string used as padding.
+     * @return Returns the padded string.
+     */
+    (): Pad1x2;
+    /**
+     * Pads string on the left and right sides if it’s shorter than length. Padding characters are truncated if
+     * they can’t be evenly divided by length.
+     *
+     * @param string The string to pad.
+     * @param length The padding length.
+     * @param chars The string used as padding.
+     * @return Returns the padded string.
+     */
+    (string: string): string;
+}
+
+declare const padChars: Pad;
+export = padChars;
diff --git a/types/lodash/fp/padCharsEnd.d.ts b/types/lodash/fp/padCharsEnd.d.ts
new file mode 100644
index 0000000000..01ec387810
--- /dev/null
+++ b/types/lodash/fp/padCharsEnd.d.ts
@@ -0,0 +1,103 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface PadEnd {
+    /**
+     * Pads string on the right side if it’s shorter than length. Padding characters are truncated if they exceed
+     * length.
+     *
+     * @param string The string to pad.
+     * @param length The padding length.
+     * @param chars The string used as padding.
+     * @return Returns the padded string.
+     */
+    (): PadEnd;
+    /**
+     * Pads string on the right side if it’s shorter than length. Padding characters are truncated if they exceed
+     * length.
+     *
+     * @param string The string to pad.
+     * @param length The padding length.
+     * @param chars The string used as padding.
+     * @return Returns the padded string.
+     */
+    (chars: string): PadEnd1x1;
+    /**
+     * Pads string on the right side if it’s shorter than length. Padding characters are truncated if they exceed
+     * length.
+     *
+     * @param string The string to pad.
+     * @param length The padding length.
+     * @param chars The string used as padding.
+     * @return Returns the padded string.
+     */
+    (chars: string, length: number): PadEnd1x2;
+    /**
+     * Pads string on the right side if it’s shorter than length. Padding characters are truncated if they exceed
+     * length.
+     *
+     * @param string The string to pad.
+     * @param length The padding length.
+     * @param chars The string used as padding.
+     * @return Returns the padded string.
+     */
+    (chars: string, length: number, string: string): string;
+}
+interface PadEnd1x1 {
+    /**
+     * Pads string on the right side if it’s shorter than length. Padding characters are truncated if they exceed
+     * length.
+     *
+     * @param string The string to pad.
+     * @param length The padding length.
+     * @param chars The string used as padding.
+     * @return Returns the padded string.
+     */
+    (): PadEnd1x1;
+    /**
+     * Pads string on the right side if it’s shorter than length. Padding characters are truncated if they exceed
+     * length.
+     *
+     * @param string The string to pad.
+     * @param length The padding length.
+     * @param chars The string used as padding.
+     * @return Returns the padded string.
+     */
+    (length: number): PadEnd1x2;
+    /**
+     * Pads string on the right side if it’s shorter than length. Padding characters are truncated if they exceed
+     * length.
+     *
+     * @param string The string to pad.
+     * @param length The padding length.
+     * @param chars The string used as padding.
+     * @return Returns the padded string.
+     */
+    (length: number, string: string): string;
+}
+interface PadEnd1x2 {
+    /**
+     * Pads string on the right side if it’s shorter than length. Padding characters are truncated if they exceed
+     * length.
+     *
+     * @param string The string to pad.
+     * @param length The padding length.
+     * @param chars The string used as padding.
+     * @return Returns the padded string.
+     */
+    (): PadEnd1x2;
+    /**
+     * Pads string on the right side if it’s shorter than length. Padding characters are truncated if they exceed
+     * length.
+     *
+     * @param string The string to pad.
+     * @param length The padding length.
+     * @param chars The string used as padding.
+     * @return Returns the padded string.
+     */
+    (string: string): string;
+}
+
+declare const padCharsEnd: PadEnd;
+export = padCharsEnd;
diff --git a/types/lodash/fp/padCharsStart.d.ts b/types/lodash/fp/padCharsStart.d.ts
new file mode 100644
index 0000000000..cc760b7d0a
--- /dev/null
+++ b/types/lodash/fp/padCharsStart.d.ts
@@ -0,0 +1,103 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface PadStart {
+    /**
+     * Pads string on the left side if it’s shorter than length. Padding characters are truncated if they exceed
+     * length.
+     *
+     * @param string The string to pad.
+     * @param length The padding length.
+     * @param chars The string used as padding.
+     * @return Returns the padded string.
+     */
+    (): PadStart;
+    /**
+     * Pads string on the left side if it’s shorter than length. Padding characters are truncated if they exceed
+     * length.
+     *
+     * @param string The string to pad.
+     * @param length The padding length.
+     * @param chars The string used as padding.
+     * @return Returns the padded string.
+     */
+    (chars: string): PadStart1x1;
+    /**
+     * Pads string on the left side if it’s shorter than length. Padding characters are truncated if they exceed
+     * length.
+     *
+     * @param string The string to pad.
+     * @param length The padding length.
+     * @param chars The string used as padding.
+     * @return Returns the padded string.
+     */
+    (chars: string, length: number): PadStart1x2;
+    /**
+     * Pads string on the left side if it’s shorter than length. Padding characters are truncated if they exceed
+     * length.
+     *
+     * @param string The string to pad.
+     * @param length The padding length.
+     * @param chars The string used as padding.
+     * @return Returns the padded string.
+     */
+    (chars: string, length: number, string: string): string;
+}
+interface PadStart1x1 {
+    /**
+     * Pads string on the left side if it’s shorter than length. Padding characters are truncated if they exceed
+     * length.
+     *
+     * @param string The string to pad.
+     * @param length The padding length.
+     * @param chars The string used as padding.
+     * @return Returns the padded string.
+     */
+    (): PadStart1x1;
+    /**
+     * Pads string on the left side if it’s shorter than length. Padding characters are truncated if they exceed
+     * length.
+     *
+     * @param string The string to pad.
+     * @param length The padding length.
+     * @param chars The string used as padding.
+     * @return Returns the padded string.
+     */
+    (length: number): PadStart1x2;
+    /**
+     * Pads string on the left side if it’s shorter than length. Padding characters are truncated if they exceed
+     * length.
+     *
+     * @param string The string to pad.
+     * @param length The padding length.
+     * @param chars The string used as padding.
+     * @return Returns the padded string.
+     */
+    (length: number, string: string): string;
+}
+interface PadStart1x2 {
+    /**
+     * Pads string on the left side if it’s shorter than length. Padding characters are truncated if they exceed
+     * length.
+     *
+     * @param string The string to pad.
+     * @param length The padding length.
+     * @param chars The string used as padding.
+     * @return Returns the padded string.
+     */
+    (): PadStart1x2;
+    /**
+     * Pads string on the left side if it’s shorter than length. Padding characters are truncated if they exceed
+     * length.
+     *
+     * @param string The string to pad.
+     * @param length The padding length.
+     * @param chars The string used as padding.
+     * @return Returns the padded string.
+     */
+    (string: string): string;
+}
+
+declare const padCharsStart: PadStart;
+export = padCharsStart;
diff --git a/types/lodash/fp/padEnd.d.ts b/types/lodash/fp/padEnd.d.ts
new file mode 100644
index 0000000000..aefc8b35ff
--- /dev/null
+++ b/types/lodash/fp/padEnd.d.ts
@@ -0,0 +1,61 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface PadEnd {
+    /**
+     * Pads string on the right side if it’s shorter than length. Padding characters are truncated if they exceed
+     * length.
+     *
+     * @param string The string to pad.
+     * @param length The padding length.
+     * @param chars The string used as padding.
+     * @return Returns the padded string.
+     */
+    (): PadEnd;
+    /**
+     * Pads string on the right side if it’s shorter than length. Padding characters are truncated if they exceed
+     * length.
+     *
+     * @param string The string to pad.
+     * @param length The padding length.
+     * @param chars The string used as padding.
+     * @return Returns the padded string.
+     */
+    (length: number): PadEnd1x1;
+    /**
+     * Pads string on the right side if it’s shorter than length. Padding characters are truncated if they exceed
+     * length.
+     *
+     * @param string The string to pad.
+     * @param length The padding length.
+     * @param chars The string used as padding.
+     * @return Returns the padded string.
+     */
+    (length: number, string: string): string;
+}
+interface PadEnd1x1 {
+    /**
+     * Pads string on the right side if it’s shorter than length. Padding characters are truncated if they exceed
+     * length.
+     *
+     * @param string The string to pad.
+     * @param length The padding length.
+     * @param chars The string used as padding.
+     * @return Returns the padded string.
+     */
+    (): PadEnd1x1;
+    /**
+     * Pads string on the right side if it’s shorter than length. Padding characters are truncated if they exceed
+     * length.
+     *
+     * @param string The string to pad.
+     * @param length The padding length.
+     * @param chars The string used as padding.
+     * @return Returns the padded string.
+     */
+    (string: string): string;
+}
+
+declare const padEnd: PadEnd;
+export = padEnd;
diff --git a/types/lodash/fp/padStart.d.ts b/types/lodash/fp/padStart.d.ts
new file mode 100644
index 0000000000..a40e611e8c
--- /dev/null
+++ b/types/lodash/fp/padStart.d.ts
@@ -0,0 +1,61 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface PadStart {
+    /**
+     * Pads string on the left side if it’s shorter than length. Padding characters are truncated if they exceed
+     * length.
+     *
+     * @param string The string to pad.
+     * @param length The padding length.
+     * @param chars The string used as padding.
+     * @return Returns the padded string.
+     */
+    (): PadStart;
+    /**
+     * Pads string on the left side if it’s shorter than length. Padding characters are truncated if they exceed
+     * length.
+     *
+     * @param string The string to pad.
+     * @param length The padding length.
+     * @param chars The string used as padding.
+     * @return Returns the padded string.
+     */
+    (length: number): PadStart1x1;
+    /**
+     * Pads string on the left side if it’s shorter than length. Padding characters are truncated if they exceed
+     * length.
+     *
+     * @param string The string to pad.
+     * @param length The padding length.
+     * @param chars The string used as padding.
+     * @return Returns the padded string.
+     */
+    (length: number, string: string): string;
+}
+interface PadStart1x1 {
+    /**
+     * Pads string on the left side if it’s shorter than length. Padding characters are truncated if they exceed
+     * length.
+     *
+     * @param string The string to pad.
+     * @param length The padding length.
+     * @param chars The string used as padding.
+     * @return Returns the padded string.
+     */
+    (): PadStart1x1;
+    /**
+     * Pads string on the left side if it’s shorter than length. Padding characters are truncated if they exceed
+     * length.
+     *
+     * @param string The string to pad.
+     * @param length The padding length.
+     * @param chars The string used as padding.
+     * @return Returns the padded string.
+     */
+    (string: string): string;
+}
+
+declare const padStart: PadStart;
+export = padStart;
diff --git a/types/lodash/fp/parseInt.d.ts b/types/lodash/fp/parseInt.d.ts
new file mode 100644
index 0000000000..b4257213bd
--- /dev/null
+++ b/types/lodash/fp/parseInt.d.ts
@@ -0,0 +1,66 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface ParseInt {
+    /**
+     * Converts string to an integer of the specified radix. If radix is undefined or 0, a radix of 10 is used
+     * unless value is a hexadecimal, in which case a radix of 16 is used.
+     *
+     * Note: This method aligns with the ES5 implementation of parseInt.
+     *
+     * @param string The string to convert.
+     * @param radix The radix to interpret value by.
+     * @return Returns the converted integer.
+     */
+    (): ParseInt;
+    /**
+     * Converts string to an integer of the specified radix. If radix is undefined or 0, a radix of 10 is used
+     * unless value is a hexadecimal, in which case a radix of 16 is used.
+     *
+     * Note: This method aligns with the ES5 implementation of parseInt.
+     *
+     * @param string The string to convert.
+     * @param radix The radix to interpret value by.
+     * @return Returns the converted integer.
+     */
+    (radix: number): ParseInt1x1;
+    /**
+     * Converts string to an integer of the specified radix. If radix is undefined or 0, a radix of 10 is used
+     * unless value is a hexadecimal, in which case a radix of 16 is used.
+     *
+     * Note: This method aligns with the ES5 implementation of parseInt.
+     *
+     * @param string The string to convert.
+     * @param radix The radix to interpret value by.
+     * @return Returns the converted integer.
+     */
+    (radix: number, string: string): number;
+}
+interface ParseInt1x1 {
+    /**
+     * Converts string to an integer of the specified radix. If radix is undefined or 0, a radix of 10 is used
+     * unless value is a hexadecimal, in which case a radix of 16 is used.
+     *
+     * Note: This method aligns with the ES5 implementation of parseInt.
+     *
+     * @param string The string to convert.
+     * @param radix The radix to interpret value by.
+     * @return Returns the converted integer.
+     */
+    (): ParseInt1x1;
+    /**
+     * Converts string to an integer of the specified radix. If radix is undefined or 0, a radix of 10 is used
+     * unless value is a hexadecimal, in which case a radix of 16 is used.
+     *
+     * Note: This method aligns with the ES5 implementation of parseInt.
+     *
+     * @param string The string to convert.
+     * @param radix The radix to interpret value by.
+     * @return Returns the converted integer.
+     */
+    (string: string): number;
+}
+
+declare const parseInt: ParseInt;
+export = parseInt;
diff --git a/types/lodash/fp/partial.d.ts b/types/lodash/fp/partial.d.ts
new file mode 100644
index 0000000000..37c796b0b8
--- /dev/null
+++ b/types/lodash/fp/partial.d.ts
@@ -0,0 +1,56 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface Partial {
+    /**
+    * Creates a function that, when called, invokes func with any additional partial arguments
+    * prepended to those provided to the new function. This method is similar to _.bind except
+    * it does not alter the this binding.
+    * @param func The function to partially apply arguments to.
+    * @param args Arguments to be partially applied.
+    * @return The new partially applied function.
+    **/
+    (): Partial;
+    /**
+    * Creates a function that, when called, invokes func with any additional partial arguments
+    * prepended to those provided to the new function. This method is similar to _.bind except
+    * it does not alter the this binding.
+    * @param func The function to partially apply arguments to.
+    * @param args Arguments to be partially applied.
+    * @return The new partially applied function.
+    **/
+    (args: ReadonlyArray<any>): Partial1x1;
+    /**
+    * Creates a function that, when called, invokes func with any additional partial arguments
+    * prepended to those provided to the new function. This method is similar to _.bind except
+    * it does not alter the this binding.
+    * @param func The function to partially apply arguments to.
+    * @param args Arguments to be partially applied.
+    * @return The new partially applied function.
+    **/
+    (args: ReadonlyArray<any>, func: (...args: any[]) => any): (...args: any[]) => any;
+}
+interface Partial1x1 {
+    /**
+    * Creates a function that, when called, invokes func with any additional partial arguments
+    * prepended to those provided to the new function. This method is similar to _.bind except
+    * it does not alter the this binding.
+    * @param func The function to partially apply arguments to.
+    * @param args Arguments to be partially applied.
+    * @return The new partially applied function.
+    **/
+    (): Partial1x1;
+    /**
+    * Creates a function that, when called, invokes func with any additional partial arguments
+    * prepended to those provided to the new function. This method is similar to _.bind except
+    * it does not alter the this binding.
+    * @param func The function to partially apply arguments to.
+    * @param args Arguments to be partially applied.
+    * @return The new partially applied function.
+    **/
+    (func: (...args: any[]) => any): (...args: any[]) => any;
+}
+
+declare const partial: Partial;
+export = partial;
diff --git a/types/lodash/fp/partialRight.d.ts b/types/lodash/fp/partialRight.d.ts
new file mode 100644
index 0000000000..d148198d3b
--- /dev/null
+++ b/types/lodash/fp/partialRight.d.ts
@@ -0,0 +1,51 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface PartialRight {
+    /**
+    * This method is like _.partial except that partial arguments are appended to those provided
+    * to the new function.
+    * @param func The function to partially apply arguments to.
+    * @param args Arguments to be partially applied.
+    * @return The new partially applied function.
+    **/
+    (): PartialRight;
+    /**
+    * This method is like _.partial except that partial arguments are appended to those provided
+    * to the new function.
+    * @param func The function to partially apply arguments to.
+    * @param args Arguments to be partially applied.
+    * @return The new partially applied function.
+    **/
+    (args: ReadonlyArray<any>): PartialRight1x1;
+    /**
+    * This method is like _.partial except that partial arguments are appended to those provided
+    * to the new function.
+    * @param func The function to partially apply arguments to.
+    * @param args Arguments to be partially applied.
+    * @return The new partially applied function.
+    **/
+    (args: ReadonlyArray<any>, func: (...args: any[]) => any): (...args: any[]) => any;
+}
+interface PartialRight1x1 {
+    /**
+    * This method is like _.partial except that partial arguments are appended to those provided
+    * to the new function.
+    * @param func The function to partially apply arguments to.
+    * @param args Arguments to be partially applied.
+    * @return The new partially applied function.
+    **/
+    (): PartialRight1x1;
+    /**
+    * This method is like _.partial except that partial arguments are appended to those provided
+    * to the new function.
+    * @param func The function to partially apply arguments to.
+    * @param args Arguments to be partially applied.
+    * @return The new partially applied function.
+    **/
+    (func: (...args: any[]) => any): (...args: any[]) => any;
+}
+
+declare const partialRight: PartialRight;
+export = partialRight;
diff --git a/types/lodash/fp/partition.d.ts b/types/lodash/fp/partition.d.ts
new file mode 100644
index 0000000000..5e97fd95de
--- /dev/null
+++ b/types/lodash/fp/partition.d.ts
@@ -0,0 +1,133 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Partition {
+    /**
+    * Creates an array of elements split into two groups, the first of which contains elements predicate returns truthy for,
+    * while the second of which contains elements predicate returns falsey for.
+    * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+    *
+    * If a property name is provided for predicate the created _.property style callback
+    * returns the property value of the given element.
+    *
+    * If a value is also provided for thisArg the created _.matchesProperty style callback
+    * returns true for elements that have a matching property value, else false.
+    *
+    * If an object is provided for predicate the created _.matches style callback returns
+    * true for elements that have the properties of the given object, else false.
+    *
+    * @param collection The collection to iterate over.
+    * @param callback The function called per iteration.
+    * @param thisArg The this binding of predicate.
+    * @return Returns the array of grouped elements.
+    **/
+    (): Partition;
+    /**
+    * Creates an array of elements split into two groups, the first of which contains elements predicate returns truthy for,
+    * while the second of which contains elements predicate returns falsey for.
+    * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+    *
+    * If a property name is provided for predicate the created _.property style callback
+    * returns the property value of the given element.
+    *
+    * If a value is also provided for thisArg the created _.matchesProperty style callback
+    * returns true for elements that have a matching property value, else false.
+    *
+    * If an object is provided for predicate the created _.matches style callback returns
+    * true for elements that have the properties of the given object, else false.
+    *
+    * @param collection The collection to iterate over.
+    * @param callback The function called per iteration.
+    * @param thisArg The this binding of predicate.
+    * @return Returns the array of grouped elements.
+    **/
+    <T>(callback: _.ValueIteratee<T>): Partition1x1<T>;
+    /**
+    * Creates an array of elements split into two groups, the first of which contains elements predicate returns truthy for,
+    * while the second of which contains elements predicate returns falsey for.
+    * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+    *
+    * If a property name is provided for predicate the created _.property style callback
+    * returns the property value of the given element.
+    *
+    * If a value is also provided for thisArg the created _.matchesProperty style callback
+    * returns true for elements that have a matching property value, else false.
+    *
+    * If an object is provided for predicate the created _.matches style callback returns
+    * true for elements that have the properties of the given object, else false.
+    *
+    * @param collection The collection to iterate over.
+    * @param callback The function called per iteration.
+    * @param thisArg The this binding of predicate.
+    * @return Returns the array of grouped elements.
+    **/
+    <T>(callback: _.ValueIteratee<T>, collection: _.List<T> | null | undefined): [T[], T[]];
+    /**
+    * Creates an array of elements split into two groups, the first of which contains elements predicate returns truthy for,
+    * while the second of which contains elements predicate returns falsey for.
+    * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+    *
+    * If a property name is provided for predicate the created _.property style callback
+    * returns the property value of the given element.
+    *
+    * If a value is also provided for thisArg the created _.matchesProperty style callback
+    * returns true for elements that have a matching property value, else false.
+    *
+    * If an object is provided for predicate the created _.matches style callback returns
+    * true for elements that have the properties of the given object, else false.
+    *
+    * @param collection The collection to iterate over.
+    * @param callback The function called per iteration.
+    * @param thisArg The this binding of predicate.
+    * @return Returns the array of grouped elements.
+    **/
+    <T extends object>(callback: _.ValueIteratee<T[keyof T]>, collection: T | null | undefined): [Array<T[keyof T]>, Array<T[keyof T]>];
+}
+interface Partition1x1<T> {
+    /**
+    * Creates an array of elements split into two groups, the first of which contains elements predicate returns truthy for,
+    * while the second of which contains elements predicate returns falsey for.
+    * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+    *
+    * If a property name is provided for predicate the created _.property style callback
+    * returns the property value of the given element.
+    *
+    * If a value is also provided for thisArg the created _.matchesProperty style callback
+    * returns true for elements that have a matching property value, else false.
+    *
+    * If an object is provided for predicate the created _.matches style callback returns
+    * true for elements that have the properties of the given object, else false.
+    *
+    * @param collection The collection to iterate over.
+    * @param callback The function called per iteration.
+    * @param thisArg The this binding of predicate.
+    * @return Returns the array of grouped elements.
+    **/
+    (): Partition1x1<T>;
+    /**
+    * Creates an array of elements split into two groups, the first of which contains elements predicate returns truthy for,
+    * while the second of which contains elements predicate returns falsey for.
+    * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
+    *
+    * If a property name is provided for predicate the created _.property style callback
+    * returns the property value of the given element.
+    *
+    * If a value is also provided for thisArg the created _.matchesProperty style callback
+    * returns true for elements that have a matching property value, else false.
+    *
+    * If an object is provided for predicate the created _.matches style callback returns
+    * true for elements that have the properties of the given object, else false.
+    *
+    * @param collection The collection to iterate over.
+    * @param callback The function called per iteration.
+    * @param thisArg The this binding of predicate.
+    * @return Returns the array of grouped elements.
+    **/
+    (collection: _.List<T> | object | null | undefined): [T[], T[]];
+}
+
+declare const partition: Partition;
+export = partition;
diff --git a/types/lodash/fp/path.d.ts b/types/lodash/fp/path.d.ts
new file mode 100644
index 0000000000..cb8b94efaf
--- /dev/null
+++ b/types/lodash/fp/path.d.ts
@@ -0,0 +1,207 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Get {
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (): Get;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey]): Get1x1<TObject, TKey>;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey], object: TObject): TObject[TKey];
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey], object: TObject | null | undefined): TObject[TKey] | undefined;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (path: number): Get3x1;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <T>(path: number, object: _.NumericDictionary<T>): T;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <T>(path: number, object: _.NumericDictionary<T> | null | undefined): T | undefined;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (path: _.PropertyPath): Get5x1;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (path: _.PropertyPath, object: null | undefined): undefined;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (path: _.PropertyPath, object: any): any;
+}
+interface Get1x1<TObject extends object, TKey extends keyof TObject> {
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (): Get1x1<TObject, TKey>;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (object: TObject): TObject[TKey];
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (object: TObject | null | undefined): TObject[TKey] | undefined;
+}
+interface Get3x1 {
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (): Get3x1;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <T>(object: _.NumericDictionary<T>): T;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <T>(object: _.NumericDictionary<T> | null | undefined): T | undefined;
+}
+interface Get5x1 {
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (): Get5x1;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (object: null | undefined): undefined;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (object: any): any;
+}
+
+declare const path: Get;
+export = path;
diff --git a/types/lodash/fp/pathEq.d.ts b/types/lodash/fp/pathEq.d.ts
new file mode 100644
index 0000000000..569fffabf8
--- /dev/null
+++ b/types/lodash/fp/pathEq.d.ts
@@ -0,0 +1,90 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface MatchesProperty {
+    /**
+     * Creates a function that compares the property value of path on a given object to value.
+     *
+     * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
+     * strings. Objects are compared by their own, not inherited, enumerable properties.
+     *
+     * @param path The path of the property to get.
+     * @param srcValue The value to match.
+     * @return Returns the new function.
+     */
+    (): MatchesProperty;
+    /**
+     * Creates a function that compares the property value of path on a given object to value.
+     *
+     * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
+     * strings. Objects are compared by their own, not inherited, enumerable properties.
+     *
+     * @param path The path of the property to get.
+     * @param srcValue The value to match.
+     * @return Returns the new function.
+     */
+    (path: _.PropertyPath): MatchesProperty1x1;
+    /**
+     * Creates a function that compares the property value of path on a given object to value.
+     *
+     * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
+     * strings. Objects are compared by their own, not inherited, enumerable properties.
+     *
+     * @param path The path of the property to get.
+     * @param srcValue The value to match.
+     * @return Returns the new function.
+     */
+    <T>(path: _.PropertyPath, srcValue: T): (value: any) => boolean;
+    /**
+     * Creates a function that compares the property value of path on a given object to value.
+     *
+     * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
+     * strings. Objects are compared by their own, not inherited, enumerable properties.
+     *
+     * @param path The path of the property to get.
+     * @param srcValue The value to match.
+     * @return Returns the new function.
+     */
+    <T, V>(path: _.PropertyPath, srcValue: T): (value: V) => boolean;
+}
+interface MatchesProperty1x1 {
+    /**
+     * Creates a function that compares the property value of path on a given object to value.
+     *
+     * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
+     * strings. Objects are compared by their own, not inherited, enumerable properties.
+     *
+     * @param path The path of the property to get.
+     * @param srcValue The value to match.
+     * @return Returns the new function.
+     */
+    (): MatchesProperty1x1;
+    /**
+     * Creates a function that compares the property value of path on a given object to value.
+     *
+     * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
+     * strings. Objects are compared by their own, not inherited, enumerable properties.
+     *
+     * @param path The path of the property to get.
+     * @param srcValue The value to match.
+     * @return Returns the new function.
+     */
+    <T>(srcValue: T): (value: any) => boolean;
+    /**
+     * Creates a function that compares the property value of path on a given object to value.
+     *
+     * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
+     * strings. Objects are compared by their own, not inherited, enumerable properties.
+     *
+     * @param path The path of the property to get.
+     * @param srcValue The value to match.
+     * @return Returns the new function.
+     */
+    <T, V>(srcValue: T): (value: V) => boolean;
+}
+
+declare const pathEq: MatchesProperty;
+export = pathEq;
diff --git a/types/lodash/fp/pathOr.d.ts b/types/lodash/fp/pathOr.d.ts
new file mode 100644
index 0000000000..a62252ce03
--- /dev/null
+++ b/types/lodash/fp/pathOr.d.ts
@@ -0,0 +1,313 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Get {
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (): Get;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <TDefault>(defaultValue: TDefault): Get1x1<TDefault>;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <TObject extends object, TKey extends keyof TObject, TDefault>(defaultValue: TDefault, path: TKey | [TKey]): Get1x2<TObject, TKey, TDefault>;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <TObject extends object, TKey extends keyof TObject, TDefault>(defaultValue: TDefault, path: TKey | [TKey], object: TObject | null | undefined): TObject[TKey] | TDefault;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <TDefault>(defaultValue: TDefault, path: number): Get2x2<TDefault>;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <T, TDefault>(defaultValue: TDefault, path: number, object: _.NumericDictionary<T> | null | undefined): T | TDefault;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <TDefault>(defaultValue: TDefault, path: _.PropertyPath): Get3x2<TDefault>;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <TDefault>(defaultValue: TDefault, path: _.PropertyPath, object: null | undefined): TDefault;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (defaultValue: any): Get4x1;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (defaultValue: any, path: _.PropertyPath): Get4x2;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (defaultValue: any, path: _.PropertyPath, object: any): any;
+}
+interface Get1x1<TDefault> {
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (): Get1x1<TDefault>;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey]): Get1x2<TObject, TKey, TDefault>;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey], object: TObject | null | undefined): TObject[TKey] | TDefault;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (path: number): Get2x2<TDefault>;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <T>(path: number, object: _.NumericDictionary<T> | null | undefined): T | TDefault;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (path: _.PropertyPath): Get3x2<TDefault>;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (path: _.PropertyPath, object: null | undefined): TDefault;
+}
+interface Get1x2<TObject extends object, TKey extends keyof TObject, TDefault> {
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (): Get1x2<TObject, TKey, TDefault>;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (object: TObject | null | undefined): TObject[TKey] | TDefault;
+}
+interface Get2x2<TDefault> {
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (): Get2x2<TDefault>;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <T>(object: _.NumericDictionary<T> | null | undefined): T | TDefault;
+}
+interface Get3x2<TDefault> {
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (): Get3x2<TDefault>;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (object: null | undefined): TDefault;
+}
+interface Get4x1 {
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (): Get4x1;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (path: _.PropertyPath): Get4x2;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (path: _.PropertyPath, object: any): any;
+}
+interface Get4x2 {
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (): Get4x2;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (object: any): any;
+}
+
+declare const pathOr: Get;
+export = pathOr;
diff --git a/types/lodash/fp/paths.d.ts b/types/lodash/fp/paths.d.ts
new file mode 100644
index 0000000000..6aa6bcb6e5
--- /dev/null
+++ b/types/lodash/fp/paths.d.ts
@@ -0,0 +1,96 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface At {
+    /**
+     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
+     * specified as individual arguments or as arrays of keys.
+     *
+     * @param object The object to iterate over.
+     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
+     * @return Returns the new array of picked elements.
+     */
+    (): At;
+    /**
+     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
+     * specified as individual arguments or as arrays of keys.
+     *
+     * @param object The object to iterate over.
+     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
+     * @return Returns the new array of picked elements.
+     */
+    (props: _.PropertyPath): At1x1;
+    /**
+     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
+     * specified as individual arguments or as arrays of keys.
+     *
+     * @param object The object to iterate over.
+     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
+     * @return Returns the new array of picked elements.
+     */
+    <T>(props: _.PropertyPath, object: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): T[];
+    /**
+     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
+     * specified as individual arguments or as arrays of keys.
+     *
+     * @param object The object to iterate over.
+     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
+     * @return Returns the new array of picked elements.
+     */
+    <T extends object>(props: _.Many<keyof T>): At2x1<T>;
+    /**
+     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
+     * specified as individual arguments or as arrays of keys.
+     *
+     * @param object The object to iterate over.
+     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
+     * @return Returns the new array of picked elements.
+     */
+    <T extends object>(props: _.Many<keyof T>, object: T | null | undefined): Array<T[keyof T]>;
+}
+interface At1x1 {
+    /**
+     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
+     * specified as individual arguments or as arrays of keys.
+     *
+     * @param object The object to iterate over.
+     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
+     * @return Returns the new array of picked elements.
+     */
+    (): At1x1;
+    /**
+     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
+     * specified as individual arguments or as arrays of keys.
+     *
+     * @param object The object to iterate over.
+     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
+     * @return Returns the new array of picked elements.
+     */
+    <T>(object: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): T[];
+}
+interface At2x1<T extends object> {
+    /**
+     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
+     * specified as individual arguments or as arrays of keys.
+     *
+     * @param object The object to iterate over.
+     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
+     * @return Returns the new array of picked elements.
+     */
+    (): At2x1<T>;
+    /**
+     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
+     * specified as individual arguments or as arrays of keys.
+     *
+     * @param object The object to iterate over.
+     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
+     * @return Returns the new array of picked elements.
+     */
+    (object: T | null | undefined): Array<T[keyof T]>;
+}
+
+declare const paths: At;
+export = paths;
diff --git a/types/lodash/fp/pick.d.ts b/types/lodash/fp/pick.d.ts
new file mode 100644
index 0000000000..d90def9925
--- /dev/null
+++ b/types/lodash/fp/pick.d.ts
@@ -0,0 +1,159 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface LodashPick {
+    /**
+     * Creates an object composed of the picked `object` properties.
+     *
+     * @category Object
+     * @param object The source object.
+     * @param [props] The property names to pick, specified
+     *  individually or in arrays.
+     * @returns Returns the new object.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': '2', 'c': 3 };
+     *
+     * _.pick(object, ['a', 'c']);
+     * // => { 'a': 1, 'c': 3 }
+     */
+    (): LodashPick;
+    /**
+     * Creates an object composed of the picked `object` properties.
+     *
+     * @category Object
+     * @param object The source object.
+     * @param [props] The property names to pick, specified
+     *  individually or in arrays.
+     * @returns Returns the new object.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': '2', 'c': 3 };
+     *
+     * _.pick(object, ['a', 'c']);
+     * // => { 'a': 1, 'c': 3 }
+     */
+    <T extends object, U extends keyof T>(props: _.Many<U>): LodashPick1x1<T, U>;
+    /**
+     * Creates an object composed of the picked `object` properties.
+     *
+     * @category Object
+     * @param object The source object.
+     * @param [props] The property names to pick, specified
+     *  individually or in arrays.
+     * @returns Returns the new object.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': '2', 'c': 3 };
+     *
+     * _.pick(object, ['a', 'c']);
+     * // => { 'a': 1, 'c': 3 }
+     */
+    <T extends object, U extends keyof T>(props: _.Many<U>, object: T): Pick<T, U>;
+    /**
+     * Creates an object composed of the picked `object` properties.
+     *
+     * @category Object
+     * @param object The source object.
+     * @param [props] The property names to pick, specified
+     *  individually or in arrays.
+     * @returns Returns the new object.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': '2', 'c': 3 };
+     *
+     * _.pick(object, ['a', 'c']);
+     * // => { 'a': 1, 'c': 3 }
+     */
+    (props: _.PropertyPath): LodashPick2x1;
+    /**
+     * Creates an object composed of the picked `object` properties.
+     *
+     * @category Object
+     * @param object The source object.
+     * @param [props] The property names to pick, specified
+     *  individually or in arrays.
+     * @returns Returns the new object.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': '2', 'c': 3 };
+     *
+     * _.pick(object, ['a', 'c']);
+     * // => { 'a': 1, 'c': 3 }
+     */
+    <T>(props: _.PropertyPath, object: T | null | undefined): _.PartialDeep<T>;
+}
+interface LodashPick1x1<T extends object, U extends keyof T> {
+    /**
+     * Creates an object composed of the picked `object` properties.
+     *
+     * @category Object
+     * @param object The source object.
+     * @param [props] The property names to pick, specified
+     *  individually or in arrays.
+     * @returns Returns the new object.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': '2', 'c': 3 };
+     *
+     * _.pick(object, ['a', 'c']);
+     * // => { 'a': 1, 'c': 3 }
+     */
+    (): LodashPick1x1<T, U>;
+    /**
+     * Creates an object composed of the picked `object` properties.
+     *
+     * @category Object
+     * @param object The source object.
+     * @param [props] The property names to pick, specified
+     *  individually or in arrays.
+     * @returns Returns the new object.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': '2', 'c': 3 };
+     *
+     * _.pick(object, ['a', 'c']);
+     * // => { 'a': 1, 'c': 3 }
+     */
+    (object: T): Pick<T, U>;
+}
+interface LodashPick2x1 {
+    /**
+     * Creates an object composed of the picked `object` properties.
+     *
+     * @category Object
+     * @param object The source object.
+     * @param [props] The property names to pick, specified
+     *  individually or in arrays.
+     * @returns Returns the new object.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': '2', 'c': 3 };
+     *
+     * _.pick(object, ['a', 'c']);
+     * // => { 'a': 1, 'c': 3 }
+     */
+    (): LodashPick2x1;
+    /**
+     * Creates an object composed of the picked `object` properties.
+     *
+     * @category Object
+     * @param object The source object.
+     * @param [props] The property names to pick, specified
+     *  individually or in arrays.
+     * @returns Returns the new object.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': '2', 'c': 3 };
+     *
+     * _.pick(object, ['a', 'c']);
+     * // => { 'a': 1, 'c': 3 }
+     */
+    <T>(object: T | null | undefined): _.PartialDeep<T>;
+}
+
+declare const pick: LodashPick;
+export = pick;
diff --git a/types/lodash/fp/pickAll.d.ts b/types/lodash/fp/pickAll.d.ts
new file mode 100644
index 0000000000..0b103c02b7
--- /dev/null
+++ b/types/lodash/fp/pickAll.d.ts
@@ -0,0 +1,159 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface LodashPick {
+    /**
+     * Creates an object composed of the picked `object` properties.
+     *
+     * @category Object
+     * @param object The source object.
+     * @param [props] The property names to pick, specified
+     *  individually or in arrays.
+     * @returns Returns the new object.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': '2', 'c': 3 };
+     *
+     * _.pick(object, ['a', 'c']);
+     * // => { 'a': 1, 'c': 3 }
+     */
+    (): LodashPick;
+    /**
+     * Creates an object composed of the picked `object` properties.
+     *
+     * @category Object
+     * @param object The source object.
+     * @param [props] The property names to pick, specified
+     *  individually or in arrays.
+     * @returns Returns the new object.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': '2', 'c': 3 };
+     *
+     * _.pick(object, ['a', 'c']);
+     * // => { 'a': 1, 'c': 3 }
+     */
+    <T extends object, U extends keyof T>(props: _.Many<U>): LodashPick1x1<T, U>;
+    /**
+     * Creates an object composed of the picked `object` properties.
+     *
+     * @category Object
+     * @param object The source object.
+     * @param [props] The property names to pick, specified
+     *  individually or in arrays.
+     * @returns Returns the new object.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': '2', 'c': 3 };
+     *
+     * _.pick(object, ['a', 'c']);
+     * // => { 'a': 1, 'c': 3 }
+     */
+    <T extends object, U extends keyof T>(props: _.Many<U>, object: T): Pick<T, U>;
+    /**
+     * Creates an object composed of the picked `object` properties.
+     *
+     * @category Object
+     * @param object The source object.
+     * @param [props] The property names to pick, specified
+     *  individually or in arrays.
+     * @returns Returns the new object.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': '2', 'c': 3 };
+     *
+     * _.pick(object, ['a', 'c']);
+     * // => { 'a': 1, 'c': 3 }
+     */
+    (props: _.PropertyPath): LodashPick2x1;
+    /**
+     * Creates an object composed of the picked `object` properties.
+     *
+     * @category Object
+     * @param object The source object.
+     * @param [props] The property names to pick, specified
+     *  individually or in arrays.
+     * @returns Returns the new object.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': '2', 'c': 3 };
+     *
+     * _.pick(object, ['a', 'c']);
+     * // => { 'a': 1, 'c': 3 }
+     */
+    <T>(props: _.PropertyPath, object: T | null | undefined): _.PartialDeep<T>;
+}
+interface LodashPick1x1<T extends object, U extends keyof T> {
+    /**
+     * Creates an object composed of the picked `object` properties.
+     *
+     * @category Object
+     * @param object The source object.
+     * @param [props] The property names to pick, specified
+     *  individually or in arrays.
+     * @returns Returns the new object.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': '2', 'c': 3 };
+     *
+     * _.pick(object, ['a', 'c']);
+     * // => { 'a': 1, 'c': 3 }
+     */
+    (): LodashPick1x1<T, U>;
+    /**
+     * Creates an object composed of the picked `object` properties.
+     *
+     * @category Object
+     * @param object The source object.
+     * @param [props] The property names to pick, specified
+     *  individually or in arrays.
+     * @returns Returns the new object.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': '2', 'c': 3 };
+     *
+     * _.pick(object, ['a', 'c']);
+     * // => { 'a': 1, 'c': 3 }
+     */
+    (object: T): Pick<T, U>;
+}
+interface LodashPick2x1 {
+    /**
+     * Creates an object composed of the picked `object` properties.
+     *
+     * @category Object
+     * @param object The source object.
+     * @param [props] The property names to pick, specified
+     *  individually or in arrays.
+     * @returns Returns the new object.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': '2', 'c': 3 };
+     *
+     * _.pick(object, ['a', 'c']);
+     * // => { 'a': 1, 'c': 3 }
+     */
+    (): LodashPick2x1;
+    /**
+     * Creates an object composed of the picked `object` properties.
+     *
+     * @category Object
+     * @param object The source object.
+     * @param [props] The property names to pick, specified
+     *  individually or in arrays.
+     * @returns Returns the new object.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': '2', 'c': 3 };
+     *
+     * _.pick(object, ['a', 'c']);
+     * // => { 'a': 1, 'c': 3 }
+     */
+    <T>(object: T | null | undefined): _.PartialDeep<T>;
+}
+
+declare const pickAll: LodashPick;
+export = pickAll;
diff --git a/types/lodash/fp/pickBy.d.ts b/types/lodash/fp/pickBy.d.ts
new file mode 100644
index 0000000000..189084f980
--- /dev/null
+++ b/types/lodash/fp/pickBy.d.ts
@@ -0,0 +1,93 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface PickBy {
+    /**
+     * Creates an object composed of the `object` properties `predicate` returns
+     * truthy for. The predicate is invoked with two arguments: (value, key).
+     *
+     * @category Object
+     * @param object The source object.
+     * @param [predicate=_.identity] The function invoked per property.
+     * @returns Returns the new object.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': '2', 'c': 3 };
+     *
+     * _.pickBy(object, _.isNumber);
+     * // => { 'a': 1, 'c': 3 }
+     */
+    (): PickBy;
+    /**
+     * Creates an object composed of the `object` properties `predicate` returns
+     * truthy for. The predicate is invoked with two arguments: (value, key).
+     *
+     * @category Object
+     * @param object The source object.
+     * @param [predicate=_.identity] The function invoked per property.
+     * @returns Returns the new object.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': '2', 'c': 3 };
+     *
+     * _.pickBy(object, _.isNumber);
+     * // => { 'a': 1, 'c': 3 }
+     */
+    <T>(predicate: _.ValueKeyIteratee<T>): PickBy1x1<T>;
+    /**
+     * Creates an object composed of the `object` properties `predicate` returns
+     * truthy for. The predicate is invoked with two arguments: (value, key).
+     *
+     * @category Object
+     * @param object The source object.
+     * @param [predicate=_.identity] The function invoked per property.
+     * @returns Returns the new object.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': '2', 'c': 3 };
+     *
+     * _.pickBy(object, _.isNumber);
+     * // => { 'a': 1, 'c': 3 }
+     */
+    <T extends object>(predicate: _.ValueKeyIteratee<T[keyof T]>, object: T | null | undefined): _.PartialObject<T>;
+}
+interface PickBy1x1<T> {
+    /**
+     * Creates an object composed of the `object` properties `predicate` returns
+     * truthy for. The predicate is invoked with two arguments: (value, key).
+     *
+     * @category Object
+     * @param object The source object.
+     * @param [predicate=_.identity] The function invoked per property.
+     * @returns Returns the new object.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': '2', 'c': 3 };
+     *
+     * _.pickBy(object, _.isNumber);
+     * // => { 'a': 1, 'c': 3 }
+     */
+    (): PickBy1x1<T>;
+    /**
+     * Creates an object composed of the `object` properties `predicate` returns
+     * truthy for. The predicate is invoked with two arguments: (value, key).
+     *
+     * @category Object
+     * @param object The source object.
+     * @param [predicate=_.identity] The function invoked per property.
+     * @returns Returns the new object.
+     * @example
+     *
+     * var object = { 'a': 1, 'b': '2', 'c': 3 };
+     *
+     * _.pickBy(object, _.isNumber);
+     * // => { 'a': 1, 'c': 3 }
+     */
+    <T1 extends object>(object: T1 | null | undefined): _.PartialObject<T1>;
+}
+
+declare const pickBy: PickBy;
+export = pickBy;
diff --git a/types/lodash/fp/pipe.d.ts b/types/lodash/fp/pipe.d.ts
new file mode 100644
index 0000000000..d5fae221ec
--- /dev/null
+++ b/types/lodash/fp/pipe.d.ts
@@ -0,0 +1,355 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Flow {
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <R1, R2>(f1: () => R1, f2: (a: R1) => R2): () => R2;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <R1, R2, R3>(f1: () => R1, f2: (a: R1) => R2, f3: (a: R2) => R3): () => R3;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <R1, R2, R3, R4>(f1: () => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): () => R4;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <R1, R2, R3, R4, R5>(f1: () => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): () => R5;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <R1, R2, R3, R4, R5, R6>(f1: () => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): () => R6;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <R1, R2, R3, R4, R5, R6, R7>(f1: () => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): () => R7;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <R1, R2, R3, R4, R5, R6, R7>(f1: () => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<_.Many<(a: any) => any>>): () => any;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, R1, R2>(f1: (a1: A1) => R1, f2: (a: R1) => R2): (a1: A1) => R2;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, R1, R2, R3>(f1: (a1: A1) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3): (a1: A1) => R3;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, R1, R2, R3, R4>(f1: (a1: A1) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): (a1: A1) => R4;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, R1, R2, R3, R4, R5>(f1: (a1: A1) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): (a1: A1) => R5;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, R1, R2, R3, R4, R5, R6>(f1: (a1: A1) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): (a1: A1) => R6;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): (a1: A1) => R7;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<_.Many<(a: any) => any>>): (a1: A1) => any;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, R1, R2>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2): (a1: A1, a2: A2) => R2;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, R1, R2, R3>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3): (a1: A1, a2: A2) => R3;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, R1, R2, R3, R4>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): (a1: A1, a2: A2) => R4;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, R1, R2, R3, R4, R5>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): (a1: A1, a2: A2) => R5;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, R1, R2, R3, R4, R5, R6>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): (a1: A1, a2: A2) => R6;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): (a1: A1, a2: A2) => R7;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<_.Many<(a: any) => any>>): (a1: A1, a2: A2) => any;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, R1, R2>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2): (a1: A1, a2: A2, a3: A3) => R2;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, R1, R2, R3>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3): (a1: A1, a2: A2, a3: A3) => R3;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, R1, R2, R3, R4>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): (a1: A1, a2: A2, a3: A3) => R4;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, R1, R2, R3, R4, R5>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): (a1: A1, a2: A2, a3: A3) => R5;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, R1, R2, R3, R4, R5, R6>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): (a1: A1, a2: A2, a3: A3) => R6;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): (a1: A1, a2: A2, a3: A3) => R7;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<_.Many<(a: any) => any>>): (a1: A1, a2: A2, a3: A3) => any;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, A4, R1, R2>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2): (a1: A1, a2: A2, a3: A3, a4: A4) => R2;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, A4, R1, R2, R3>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3): (a1: A1, a2: A2, a3: A3, a4: A4) => R3;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, A4, R1, R2, R3, R4>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): (a1: A1, a2: A2, a3: A3, a4: A4) => R4;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, A4, R1, R2, R3, R4, R5>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): (a1: A1, a2: A2, a3: A3, a4: A4) => R5;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, A4, R1, R2, R3, R4, R5, R6>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): (a1: A1, a2: A2, a3: A3, a4: A4) => R6;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): (a1: A1, a2: A2, a3: A3, a4: A4) => R7;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<_.Many<(a: any) => any>>): (a1: A1, a2: A2, a3: A3, a4: A4) => any;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, A4, R1, R2>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R2;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, A4, R1, R2, R3>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R3;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, A4, R1, R2, R3, R4>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R4;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, A4, R1, R2, R3, R4, R5>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R5;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, A4, R1, R2, R3, R4, R5, R6>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R6;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R7;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    <A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<_.Many<(a: any) => any>>): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => any;
+    /**
+     * Creates a function that returns the result of invoking the provided functions with the this binding of the
+     * created function, where each successive invocation is supplied the return value of the previous.
+     *
+     * @param funcs Functions to invoke.
+     * @return Returns the new function.
+     */
+    (funcs: Array<_.Many<(...args: any[]) => any>>): (...args: any[]) => any;
+}
+
+declare const pipe: Flow;
+export = pipe;
diff --git a/types/lodash/fp/pluck.d.ts b/types/lodash/fp/pluck.d.ts
new file mode 100644
index 0000000000..eec49c3f59
--- /dev/null
+++ b/types/lodash/fp/pluck.d.ts
@@ -0,0 +1,588 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Map {
+    /**
+     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
+     * thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property value
+     * of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
+     * _.reject, and _.some.
+     *
+     * The guarded methods are:
+     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
+     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
+     * sample, some, sum, uniq, and words
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped array.
+     */
+    (): Map;
+    /**
+     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
+     * thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property value
+     * of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
+     * _.reject, and _.some.
+     *
+     * The guarded methods are:
+     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
+     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
+     * sample, some, sum, uniq, and words
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped array.
+     */
+    <T, TResult>(iteratee: (value: T) => TResult): Map1x1<T, TResult>;
+    /**
+     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
+     * thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property value
+     * of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
+     * _.reject, and _.some.
+     *
+     * The guarded methods are:
+     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
+     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
+     * sample, some, sum, uniq, and words
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped array.
+     */
+    <T, TResult>(iteratee: (value: T) => TResult, collection: T[] | _.List<T> | null | undefined): TResult[];
+    /**
+     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
+     * thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property value
+     * of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
+     * _.reject, and _.some.
+     *
+     * The guarded methods are:
+     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
+     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
+     * sample, some, sum, uniq, and words
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped array.
+     */
+    <T extends object, TResult>(iteratee: (value: T[keyof T]) => TResult): Map3x1<T, TResult>;
+    /**
+     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
+     * thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property value
+     * of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
+     * _.reject, and _.some.
+     *
+     * The guarded methods are:
+     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
+     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
+     * sample, some, sum, uniq, and words
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped array.
+     */
+    <T extends object, TResult>(iteratee: (value: T[keyof T]) => TResult, collection: T | null | undefined): TResult[];
+    /**
+     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
+     * thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property value
+     * of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
+     * _.reject, and _.some.
+     *
+     * The guarded methods are:
+     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
+     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
+     * sample, some, sum, uniq, and words
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped array.
+     */
+    <T, K extends keyof T>(iteratee: K): Map4x1<T, K>;
+    /**
+     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
+     * thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property value
+     * of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
+     * _.reject, and _.some.
+     *
+     * The guarded methods are:
+     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
+     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
+     * sample, some, sum, uniq, and words
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped array.
+     */
+    <T, K extends keyof T>(iteratee: K, collection: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): Array<T[K]>;
+    /**
+     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
+     * thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property value
+     * of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
+     * _.reject, and _.some.
+     *
+     * The guarded methods are:
+     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
+     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
+     * sample, some, sum, uniq, and words
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped array.
+     */
+    (iteratee: string): Map5x1;
+    /**
+     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
+     * thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property value
+     * of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
+     * _.reject, and _.some.
+     *
+     * The guarded methods are:
+     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
+     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
+     * sample, some, sum, uniq, and words
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped array.
+     */
+    <T>(iteratee: string, collection: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): any[];
+    /**
+     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
+     * thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property value
+     * of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
+     * _.reject, and _.some.
+     *
+     * The guarded methods are:
+     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
+     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
+     * sample, some, sum, uniq, and words
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped array.
+     */
+    (iteratee: object): Map6x1;
+    /**
+     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
+     * thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property value
+     * of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
+     * _.reject, and _.some.
+     *
+     * The guarded methods are:
+     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
+     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
+     * sample, some, sum, uniq, and words
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped array.
+     */
+    <T>(iteratee: object, collection: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): boolean[];
+}
+interface Map1x1<T, TResult> {
+    /**
+     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
+     * thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property value
+     * of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
+     * _.reject, and _.some.
+     *
+     * The guarded methods are:
+     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
+     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
+     * sample, some, sum, uniq, and words
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped array.
+     */
+    (): Map1x1<T, TResult>;
+    /**
+     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
+     * thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property value
+     * of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
+     * _.reject, and _.some.
+     *
+     * The guarded methods are:
+     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
+     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
+     * sample, some, sum, uniq, and words
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped array.
+     */
+    (collection: T[] | _.List<T> | null | undefined): TResult[];
+}
+interface Map3x1<T extends object, TResult> {
+    /**
+     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
+     * thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property value
+     * of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
+     * _.reject, and _.some.
+     *
+     * The guarded methods are:
+     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
+     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
+     * sample, some, sum, uniq, and words
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped array.
+     */
+    (): Map3x1<T, TResult>;
+    /**
+     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
+     * thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property value
+     * of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
+     * _.reject, and _.some.
+     *
+     * The guarded methods are:
+     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
+     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
+     * sample, some, sum, uniq, and words
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped array.
+     */
+    (collection: T | null | undefined): TResult[];
+}
+interface Map4x1<T, K extends keyof T> {
+    /**
+     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
+     * thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property value
+     * of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
+     * _.reject, and _.some.
+     *
+     * The guarded methods are:
+     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
+     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
+     * sample, some, sum, uniq, and words
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped array.
+     */
+    (): Map4x1<T, K>;
+    /**
+     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
+     * thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property value
+     * of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
+     * _.reject, and _.some.
+     *
+     * The guarded methods are:
+     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
+     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
+     * sample, some, sum, uniq, and words
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped array.
+     */
+    (collection: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): Array<T[K]>;
+}
+interface Map5x1 {
+    /**
+     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
+     * thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property value
+     * of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
+     * _.reject, and _.some.
+     *
+     * The guarded methods are:
+     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
+     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
+     * sample, some, sum, uniq, and words
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped array.
+     */
+    (): Map5x1;
+    /**
+     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
+     * thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property value
+     * of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
+     * _.reject, and _.some.
+     *
+     * The guarded methods are:
+     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
+     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
+     * sample, some, sum, uniq, and words
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped array.
+     */
+    <T>(collection: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): any[];
+}
+interface Map6x1 {
+    /**
+     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
+     * thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property value
+     * of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
+     * _.reject, and _.some.
+     *
+     * The guarded methods are:
+     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
+     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
+     * sample, some, sum, uniq, and words
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped array.
+     */
+    (): Map6x1;
+    /**
+     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
+     * thisArg and invoked with three arguments: (value, index|key, collection).
+     *
+     * If a property name is provided for iteratee the created _.property style callback returns the property value
+     * of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
+     * _.reject, and _.some.
+     *
+     * The guarded methods are:
+     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
+     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
+     * sample, some, sum, uniq, and words
+     *
+     * @param collection The collection to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new mapped array.
+     */
+    <T>(collection: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): boolean[];
+}
+
+declare const pluck: Map;
+export = pluck;
diff --git a/types/lodash/fp/prop.d.ts b/types/lodash/fp/prop.d.ts
new file mode 100644
index 0000000000..c7d097d000
--- /dev/null
+++ b/types/lodash/fp/prop.d.ts
@@ -0,0 +1,207 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Get {
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (): Get;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey]): Get1x1<TObject, TKey>;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey], object: TObject): TObject[TKey];
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey], object: TObject | null | undefined): TObject[TKey] | undefined;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (path: number): Get3x1;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <T>(path: number, object: _.NumericDictionary<T>): T;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <T>(path: number, object: _.NumericDictionary<T> | null | undefined): T | undefined;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (path: _.PropertyPath): Get5x1;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (path: _.PropertyPath, object: null | undefined): undefined;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (path: _.PropertyPath, object: any): any;
+}
+interface Get1x1<TObject extends object, TKey extends keyof TObject> {
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (): Get1x1<TObject, TKey>;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (object: TObject): TObject[TKey];
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (object: TObject | null | undefined): TObject[TKey] | undefined;
+}
+interface Get3x1 {
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (): Get3x1;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <T>(object: _.NumericDictionary<T>): T;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <T>(object: _.NumericDictionary<T> | null | undefined): T | undefined;
+}
+interface Get5x1 {
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (): Get5x1;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (object: null | undefined): undefined;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (object: any): any;
+}
+
+declare const prop: Get;
+export = prop;
diff --git a/types/lodash/fp/propEq.d.ts b/types/lodash/fp/propEq.d.ts
new file mode 100644
index 0000000000..64175cc00a
--- /dev/null
+++ b/types/lodash/fp/propEq.d.ts
@@ -0,0 +1,90 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface MatchesProperty {
+    /**
+     * Creates a function that compares the property value of path on a given object to value.
+     *
+     * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
+     * strings. Objects are compared by their own, not inherited, enumerable properties.
+     *
+     * @param path The path of the property to get.
+     * @param srcValue The value to match.
+     * @return Returns the new function.
+     */
+    (): MatchesProperty;
+    /**
+     * Creates a function that compares the property value of path on a given object to value.
+     *
+     * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
+     * strings. Objects are compared by their own, not inherited, enumerable properties.
+     *
+     * @param path The path of the property to get.
+     * @param srcValue The value to match.
+     * @return Returns the new function.
+     */
+    (path: _.PropertyPath): MatchesProperty1x1;
+    /**
+     * Creates a function that compares the property value of path on a given object to value.
+     *
+     * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
+     * strings. Objects are compared by their own, not inherited, enumerable properties.
+     *
+     * @param path The path of the property to get.
+     * @param srcValue The value to match.
+     * @return Returns the new function.
+     */
+    <T>(path: _.PropertyPath, srcValue: T): (value: any) => boolean;
+    /**
+     * Creates a function that compares the property value of path on a given object to value.
+     *
+     * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
+     * strings. Objects are compared by their own, not inherited, enumerable properties.
+     *
+     * @param path The path of the property to get.
+     * @param srcValue The value to match.
+     * @return Returns the new function.
+     */
+    <T, V>(path: _.PropertyPath, srcValue: T): (value: V) => boolean;
+}
+interface MatchesProperty1x1 {
+    /**
+     * Creates a function that compares the property value of path on a given object to value.
+     *
+     * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
+     * strings. Objects are compared by their own, not inherited, enumerable properties.
+     *
+     * @param path The path of the property to get.
+     * @param srcValue The value to match.
+     * @return Returns the new function.
+     */
+    (): MatchesProperty1x1;
+    /**
+     * Creates a function that compares the property value of path on a given object to value.
+     *
+     * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
+     * strings. Objects are compared by their own, not inherited, enumerable properties.
+     *
+     * @param path The path of the property to get.
+     * @param srcValue The value to match.
+     * @return Returns the new function.
+     */
+    <T>(srcValue: T): (value: any) => boolean;
+    /**
+     * Creates a function that compares the property value of path on a given object to value.
+     *
+     * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
+     * strings. Objects are compared by their own, not inherited, enumerable properties.
+     *
+     * @param path The path of the property to get.
+     * @param srcValue The value to match.
+     * @return Returns the new function.
+     */
+    <T, V>(srcValue: T): (value: V) => boolean;
+}
+
+declare const propEq: MatchesProperty;
+export = propEq;
diff --git a/types/lodash/fp/propOr.d.ts b/types/lodash/fp/propOr.d.ts
new file mode 100644
index 0000000000..cfe67fc51c
--- /dev/null
+++ b/types/lodash/fp/propOr.d.ts
@@ -0,0 +1,313 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Get {
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (): Get;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <TDefault>(defaultValue: TDefault): Get1x1<TDefault>;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <TObject extends object, TKey extends keyof TObject, TDefault>(defaultValue: TDefault, path: TKey | [TKey]): Get1x2<TObject, TKey, TDefault>;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <TObject extends object, TKey extends keyof TObject, TDefault>(defaultValue: TDefault, path: TKey | [TKey], object: TObject | null | undefined): TObject[TKey] | TDefault;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <TDefault>(defaultValue: TDefault, path: number): Get2x2<TDefault>;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <T, TDefault>(defaultValue: TDefault, path: number, object: _.NumericDictionary<T> | null | undefined): T | TDefault;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <TDefault>(defaultValue: TDefault, path: _.PropertyPath): Get3x2<TDefault>;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <TDefault>(defaultValue: TDefault, path: _.PropertyPath, object: null | undefined): TDefault;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (defaultValue: any): Get4x1;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (defaultValue: any, path: _.PropertyPath): Get4x2;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (defaultValue: any, path: _.PropertyPath, object: any): any;
+}
+interface Get1x1<TDefault> {
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (): Get1x1<TDefault>;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey]): Get1x2<TObject, TKey, TDefault>;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey], object: TObject | null | undefined): TObject[TKey] | TDefault;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (path: number): Get2x2<TDefault>;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <T>(path: number, object: _.NumericDictionary<T> | null | undefined): T | TDefault;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (path: _.PropertyPath): Get3x2<TDefault>;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (path: _.PropertyPath, object: null | undefined): TDefault;
+}
+interface Get1x2<TObject extends object, TKey extends keyof TObject, TDefault> {
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (): Get1x2<TObject, TKey, TDefault>;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (object: TObject | null | undefined): TObject[TKey] | TDefault;
+}
+interface Get2x2<TDefault> {
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (): Get2x2<TDefault>;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <T>(object: _.NumericDictionary<T> | null | undefined): T | TDefault;
+}
+interface Get3x2<TDefault> {
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (): Get3x2<TDefault>;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (object: null | undefined): TDefault;
+}
+interface Get4x1 {
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (): Get4x1;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (path: _.PropertyPath): Get4x2;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (path: _.PropertyPath, object: any): any;
+}
+interface Get4x2 {
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (): Get4x2;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (object: any): any;
+}
+
+declare const propOr: Get;
+export = propOr;
diff --git a/types/lodash/fp/property.d.ts b/types/lodash/fp/property.d.ts
new file mode 100644
index 0000000000..47a4285028
--- /dev/null
+++ b/types/lodash/fp/property.d.ts
@@ -0,0 +1,207 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Get {
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (): Get;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey]): Get1x1<TObject, TKey>;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey], object: TObject): TObject[TKey];
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey], object: TObject | null | undefined): TObject[TKey] | undefined;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (path: number): Get3x1;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <T>(path: number, object: _.NumericDictionary<T>): T;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <T>(path: number, object: _.NumericDictionary<T> | null | undefined): T | undefined;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (path: _.PropertyPath): Get5x1;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (path: _.PropertyPath, object: null | undefined): undefined;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (path: _.PropertyPath, object: any): any;
+}
+interface Get1x1<TObject extends object, TKey extends keyof TObject> {
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (): Get1x1<TObject, TKey>;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (object: TObject): TObject[TKey];
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (object: TObject | null | undefined): TObject[TKey] | undefined;
+}
+interface Get3x1 {
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (): Get3x1;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <T>(object: _.NumericDictionary<T>): T;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <T>(object: _.NumericDictionary<T> | null | undefined): T | undefined;
+}
+interface Get5x1 {
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (): Get5x1;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (object: null | undefined): undefined;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (object: any): any;
+}
+
+declare const property: Get;
+export = property;
diff --git a/types/lodash/fp/propertyOf.d.ts b/types/lodash/fp/propertyOf.d.ts
new file mode 100644
index 0000000000..66e2afdaf8
--- /dev/null
+++ b/types/lodash/fp/propertyOf.d.ts
@@ -0,0 +1,207 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Get {
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (): Get;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey]): Get1x1<TObject, TKey>;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey], object: TObject): TObject[TKey];
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey], object: TObject | null | undefined): TObject[TKey] | undefined;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (path: number): Get3x1;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <T>(path: number, object: _.NumericDictionary<T>): T;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <T>(path: number, object: _.NumericDictionary<T> | null | undefined): T | undefined;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (path: _.PropertyPath): Get5x1;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (path: _.PropertyPath, object: null | undefined): undefined;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (path: _.PropertyPath, object: any): any;
+}
+interface Get1x1<TObject extends object, TKey extends keyof TObject> {
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (): Get1x1<TObject, TKey>;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (object: TObject): TObject[TKey];
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (object: TObject | null | undefined): TObject[TKey] | undefined;
+}
+interface Get3x1 {
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (): Get3x1;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <T>(object: _.NumericDictionary<T>): T;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <T>(object: _.NumericDictionary<T> | null | undefined): T | undefined;
+}
+interface Get5x1 {
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (): Get5x1;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (object: null | undefined): undefined;
+    /**
+     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
+     * in its place.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to get.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (object: any): any;
+}
+
+declare const propertyOf: Get;
+export = propertyOf;
diff --git a/types/lodash/fp/props.d.ts b/types/lodash/fp/props.d.ts
new file mode 100644
index 0000000000..2b22346229
--- /dev/null
+++ b/types/lodash/fp/props.d.ts
@@ -0,0 +1,96 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface At {
+    /**
+     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
+     * specified as individual arguments or as arrays of keys.
+     *
+     * @param object The object to iterate over.
+     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
+     * @return Returns the new array of picked elements.
+     */
+    (): At;
+    /**
+     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
+     * specified as individual arguments or as arrays of keys.
+     *
+     * @param object The object to iterate over.
+     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
+     * @return Returns the new array of picked elements.
+     */
+    (props: _.PropertyPath): At1x1;
+    /**
+     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
+     * specified as individual arguments or as arrays of keys.
+     *
+     * @param object The object to iterate over.
+     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
+     * @return Returns the new array of picked elements.
+     */
+    <T>(props: _.PropertyPath, object: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): T[];
+    /**
+     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
+     * specified as individual arguments or as arrays of keys.
+     *
+     * @param object The object to iterate over.
+     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
+     * @return Returns the new array of picked elements.
+     */
+    <T extends object>(props: _.Many<keyof T>): At2x1<T>;
+    /**
+     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
+     * specified as individual arguments or as arrays of keys.
+     *
+     * @param object The object to iterate over.
+     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
+     * @return Returns the new array of picked elements.
+     */
+    <T extends object>(props: _.Many<keyof T>, object: T | null | undefined): Array<T[keyof T]>;
+}
+interface At1x1 {
+    /**
+     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
+     * specified as individual arguments or as arrays of keys.
+     *
+     * @param object The object to iterate over.
+     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
+     * @return Returns the new array of picked elements.
+     */
+    (): At1x1;
+    /**
+     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
+     * specified as individual arguments or as arrays of keys.
+     *
+     * @param object The object to iterate over.
+     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
+     * @return Returns the new array of picked elements.
+     */
+    <T>(object: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): T[];
+}
+interface At2x1<T extends object> {
+    /**
+     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
+     * specified as individual arguments or as arrays of keys.
+     *
+     * @param object The object to iterate over.
+     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
+     * @return Returns the new array of picked elements.
+     */
+    (): At2x1<T>;
+    /**
+     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
+     * specified as individual arguments or as arrays of keys.
+     *
+     * @param object The object to iterate over.
+     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
+     * @return Returns the new array of picked elements.
+     */
+    (object: T | null | undefined): Array<T[keyof T]>;
+}
+
+declare const props: At;
+export = props;
diff --git a/types/lodash/fp/pull.d.ts b/types/lodash/fp/pull.d.ts
new file mode 100644
index 0000000000..3ae9a76b4c
--- /dev/null
+++ b/types/lodash/fp/pull.d.ts
@@ -0,0 +1,83 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Pull {
+    /**
+     * Removes all provided values from array using SameValueZero for equality comparisons.
+     *
+     * Note: Unlike _.without, this method mutates array.
+     *
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @return Returns array.
+     */
+    (): Pull;
+    /**
+     * Removes all provided values from array using SameValueZero for equality comparisons.
+     *
+     * Note: Unlike _.without, this method mutates array.
+     *
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @return Returns array.
+     */
+    <T>(values: T): Pull1x1<T>;
+    /**
+     * Removes all provided values from array using SameValueZero for equality comparisons.
+     *
+     * Note: Unlike _.without, this method mutates array.
+     *
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @return Returns array.
+     */
+    <T>(values: T, array: ReadonlyArray<T>): T[];
+    /**
+     * Removes all provided values from array using SameValueZero for equality comparisons.
+     *
+     * Note: Unlike _.without, this method mutates array.
+     *
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @return Returns array.
+     */
+    <T>(values: T, array: _.List<T>): _.List<T>;
+}
+interface Pull1x1<T> {
+    /**
+     * Removes all provided values from array using SameValueZero for equality comparisons.
+     *
+     * Note: Unlike _.without, this method mutates array.
+     *
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @return Returns array.
+     */
+    (): Pull1x1<T>;
+    /**
+     * Removes all provided values from array using SameValueZero for equality comparisons.
+     *
+     * Note: Unlike _.without, this method mutates array.
+     *
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @return Returns array.
+     */
+    (array: ReadonlyArray<T>): T[];
+    /**
+     * Removes all provided values from array using SameValueZero for equality comparisons.
+     *
+     * Note: Unlike _.without, this method mutates array.
+     *
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @return Returns array.
+     */
+    (array: _.List<T>): _.List<T>;
+}
+
+declare const pull: Pull;
+export = pull;
diff --git a/types/lodash/fp/pullAll.d.ts b/types/lodash/fp/pullAll.d.ts
new file mode 100644
index 0000000000..6df0d3fbe6
--- /dev/null
+++ b/types/lodash/fp/pullAll.d.ts
@@ -0,0 +1,139 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface PullAll {
+    /**
+     * This method is like `_.pull` except that it accepts an array of values to remove.
+     *
+     * **Note:** Unlike `_.difference`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [1, 2, 3, 1, 2, 3];
+     *
+     * _.pull(array, [2, 3]);
+     * console.log(array);
+     * // => [1, 1]
+     */
+    (): PullAll;
+    /**
+     * This method is like `_.pull` except that it accepts an array of values to remove.
+     *
+     * **Note:** Unlike `_.difference`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [1, 2, 3, 1, 2, 3];
+     *
+     * _.pull(array, [2, 3]);
+     * console.log(array);
+     * // => [1, 1]
+     */
+    <T>(values: _.List<T>): PullAll1x1<T>;
+    /**
+     * This method is like `_.pull` except that it accepts an array of values to remove.
+     *
+     * **Note:** Unlike `_.difference`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [1, 2, 3, 1, 2, 3];
+     *
+     * _.pull(array, [2, 3]);
+     * console.log(array);
+     * // => [1, 1]
+     */
+    <T>(values: _.List<T>, array: ReadonlyArray<T>): T[];
+    /**
+     * This method is like `_.pull` except that it accepts an array of values to remove.
+     *
+     * **Note:** Unlike `_.difference`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [1, 2, 3, 1, 2, 3];
+     *
+     * _.pull(array, [2, 3]);
+     * console.log(array);
+     * // => [1, 1]
+     */
+    <T>(values: _.List<T>, array: _.List<T>): _.List<T>;
+}
+interface PullAll1x1<T> {
+    /**
+     * This method is like `_.pull` except that it accepts an array of values to remove.
+     *
+     * **Note:** Unlike `_.difference`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [1, 2, 3, 1, 2, 3];
+     *
+     * _.pull(array, [2, 3]);
+     * console.log(array);
+     * // => [1, 1]
+     */
+    (): PullAll1x1<T>;
+    /**
+     * This method is like `_.pull` except that it accepts an array of values to remove.
+     *
+     * **Note:** Unlike `_.difference`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [1, 2, 3, 1, 2, 3];
+     *
+     * _.pull(array, [2, 3]);
+     * console.log(array);
+     * // => [1, 1]
+     */
+    (array: ReadonlyArray<T>): T[];
+    /**
+     * This method is like `_.pull` except that it accepts an array of values to remove.
+     *
+     * **Note:** Unlike `_.difference`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [1, 2, 3, 1, 2, 3];
+     *
+     * _.pull(array, [2, 3]);
+     * console.log(array);
+     * // => [1, 1]
+     */
+    (array: _.List<T>): _.List<T>;
+}
+
+declare const pullAll: PullAll;
+export = pullAll;
diff --git a/types/lodash/fp/pullAllBy.d.ts b/types/lodash/fp/pullAllBy.d.ts
new file mode 100644
index 0000000000..05a528de2d
--- /dev/null
+++ b/types/lodash/fp/pullAllBy.d.ts
@@ -0,0 +1,502 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface PullAllBy {
+    /**
+     * This method is like `_.pullAll` except that it accepts `iteratee` which is
+     * invoked for each element of `array` and `values` to to generate the criterion
+     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
+     *
+     * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
+     * console.log(array);
+     * // => [{ 'x': 2 }]
+     */
+    (): PullAllBy;
+    /**
+     * This method is like `_.pullAll` except that it accepts `iteratee` which is
+     * invoked for each element of `array` and `values` to to generate the criterion
+     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
+     *
+     * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
+     * console.log(array);
+     * // => [{ 'x': 2 }]
+     */
+    <T>(iteratee: _.ValueIteratee<T>): PullAllBy1x1<T>;
+    /**
+     * This method is like `_.pullAll` except that it accepts `iteratee` which is
+     * invoked for each element of `array` and `values` to to generate the criterion
+     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
+     *
+     * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
+     * console.log(array);
+     * // => [{ 'x': 2 }]
+     */
+    <T>(iteratee: _.ValueIteratee<T>, values: _.List<T>): PullAllBy1x2<T>;
+    /**
+     * This method is like `_.pullAll` except that it accepts `iteratee` which is
+     * invoked for each element of `array` and `values` to to generate the criterion
+     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
+     *
+     * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
+     * console.log(array);
+     * // => [{ 'x': 2 }]
+     */
+    <T>(iteratee: _.ValueIteratee<T>, values: _.List<T>, array: ReadonlyArray<T>): T[];
+    /**
+     * This method is like `_.pullAll` except that it accepts `iteratee` which is
+     * invoked for each element of `array` and `values` to to generate the criterion
+     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
+     *
+     * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
+     * console.log(array);
+     * // => [{ 'x': 2 }]
+     */
+    <T>(iteratee: _.ValueIteratee<T>, values: _.List<T>, array: _.List<T>): _.List<T>;
+    /**
+     * This method is like `_.pullAll` except that it accepts `iteratee` which is
+     * invoked for each element of `array` and `values` to to generate the criterion
+     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
+     *
+     * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
+     * console.log(array);
+     * // => [{ 'x': 2 }]
+     */
+    <T1, T2>(iteratee: _.ValueIteratee<T1 | T2>): PullAllBy3x1<T1, T2>;
+    /**
+     * This method is like `_.pullAll` except that it accepts `iteratee` which is
+     * invoked for each element of `array` and `values` to to generate the criterion
+     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
+     *
+     * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
+     * console.log(array);
+     * // => [{ 'x': 2 }]
+     */
+    <T1, T2>(iteratee: _.ValueIteratee<T1 | T2>, values: _.List<T2>): PullAllBy3x2<T1>;
+    /**
+     * This method is like `_.pullAll` except that it accepts `iteratee` which is
+     * invoked for each element of `array` and `values` to to generate the criterion
+     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
+     *
+     * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
+     * console.log(array);
+     * // => [{ 'x': 2 }]
+     */
+    <T1, T2>(iteratee: _.ValueIteratee<T1 | T2>, values: _.List<T2>, array: ReadonlyArray<T1>): T1[];
+    /**
+     * This method is like `_.pullAll` except that it accepts `iteratee` which is
+     * invoked for each element of `array` and `values` to to generate the criterion
+     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
+     *
+     * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
+     * console.log(array);
+     * // => [{ 'x': 2 }]
+     */
+    <T1, T2>(iteratee: _.ValueIteratee<T1 | T2>, values: _.List<T2>, array: _.List<T1>): _.List<T1>;
+}
+interface PullAllBy1x1<T> {
+    /**
+     * This method is like `_.pullAll` except that it accepts `iteratee` which is
+     * invoked for each element of `array` and `values` to to generate the criterion
+     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
+     *
+     * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
+     * console.log(array);
+     * // => [{ 'x': 2 }]
+     */
+    (): PullAllBy1x1<T>;
+    /**
+     * This method is like `_.pullAll` except that it accepts `iteratee` which is
+     * invoked for each element of `array` and `values` to to generate the criterion
+     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
+     *
+     * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
+     * console.log(array);
+     * // => [{ 'x': 2 }]
+     */
+    (values: _.List<T>): PullAllBy1x2<T>;
+    /**
+     * This method is like `_.pullAll` except that it accepts `iteratee` which is
+     * invoked for each element of `array` and `values` to to generate the criterion
+     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
+     *
+     * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
+     * console.log(array);
+     * // => [{ 'x': 2 }]
+     */
+    (values: _.List<T>, array: ReadonlyArray<T>): T[];
+    /**
+     * This method is like `_.pullAll` except that it accepts `iteratee` which is
+     * invoked for each element of `array` and `values` to to generate the criterion
+     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
+     *
+     * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
+     * console.log(array);
+     * // => [{ 'x': 2 }]
+     */
+    (values: _.List<T>, array: _.List<T>): _.List<T>;
+}
+interface PullAllBy1x2<T> {
+    /**
+     * This method is like `_.pullAll` except that it accepts `iteratee` which is
+     * invoked for each element of `array` and `values` to to generate the criterion
+     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
+     *
+     * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
+     * console.log(array);
+     * // => [{ 'x': 2 }]
+     */
+    (): PullAllBy1x2<T>;
+    /**
+     * This method is like `_.pullAll` except that it accepts `iteratee` which is
+     * invoked for each element of `array` and `values` to to generate the criterion
+     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
+     *
+     * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
+     * console.log(array);
+     * // => [{ 'x': 2 }]
+     */
+    (array: ReadonlyArray<T>): T[];
+    /**
+     * This method is like `_.pullAll` except that it accepts `iteratee` which is
+     * invoked for each element of `array` and `values` to to generate the criterion
+     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
+     *
+     * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
+     * console.log(array);
+     * // => [{ 'x': 2 }]
+     */
+    (array: _.List<T>): _.List<T>;
+}
+interface PullAllBy3x1<T1, T2> {
+    /**
+     * This method is like `_.pullAll` except that it accepts `iteratee` which is
+     * invoked for each element of `array` and `values` to to generate the criterion
+     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
+     *
+     * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
+     * console.log(array);
+     * // => [{ 'x': 2 }]
+     */
+    (): PullAllBy3x1<T1, T2>;
+    /**
+     * This method is like `_.pullAll` except that it accepts `iteratee` which is
+     * invoked for each element of `array` and `values` to to generate the criterion
+     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
+     *
+     * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
+     * console.log(array);
+     * // => [{ 'x': 2 }]
+     */
+    (values: _.List<T2>): PullAllBy3x2<T1>;
+    /**
+     * This method is like `_.pullAll` except that it accepts `iteratee` which is
+     * invoked for each element of `array` and `values` to to generate the criterion
+     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
+     *
+     * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
+     * console.log(array);
+     * // => [{ 'x': 2 }]
+     */
+    (values: _.List<T2>, array: ReadonlyArray<T1>): T1[];
+    /**
+     * This method is like `_.pullAll` except that it accepts `iteratee` which is
+     * invoked for each element of `array` and `values` to to generate the criterion
+     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
+     *
+     * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
+     * console.log(array);
+     * // => [{ 'x': 2 }]
+     */
+    (values: _.List<T2>, array: _.List<T1>): _.List<T1>;
+}
+interface PullAllBy3x2<T1> {
+    /**
+     * This method is like `_.pullAll` except that it accepts `iteratee` which is
+     * invoked for each element of `array` and `values` to to generate the criterion
+     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
+     *
+     * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
+     * console.log(array);
+     * // => [{ 'x': 2 }]
+     */
+    (): PullAllBy3x2<T1>;
+    /**
+     * This method is like `_.pullAll` except that it accepts `iteratee` which is
+     * invoked for each element of `array` and `values` to to generate the criterion
+     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
+     *
+     * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
+     * console.log(array);
+     * // => [{ 'x': 2 }]
+     */
+    <T2>(array: ReadonlyArray<T1>): T1[];
+    /**
+     * This method is like `_.pullAll` except that it accepts `iteratee` which is
+     * invoked for each element of `array` and `values` to to generate the criterion
+     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
+     *
+     * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
+     * console.log(array);
+     * // => [{ 'x': 2 }]
+     */
+    <T2>(array: _.List<T1>): _.List<T1>;
+}
+
+declare const pullAllBy: PullAllBy;
+export = pullAllBy;
diff --git a/types/lodash/fp/pullAllWith.d.ts b/types/lodash/fp/pullAllWith.d.ts
new file mode 100644
index 0000000000..566eb5ae84
--- /dev/null
+++ b/types/lodash/fp/pullAllWith.d.ts
@@ -0,0 +1,502 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface PullAllWith {
+    /**
+     * This method is like `_.pullAll` except that it accepts `comparator` which is
+     * invoked to compare elements of array to values. The comparator is invoked with
+     * two arguments: (arrVal, othVal).
+     *
+     * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
+     *
+     * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
+     * console.log(array);
+     * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
+     */
+    (): PullAllWith;
+    /**
+     * This method is like `_.pullAll` except that it accepts `comparator` which is
+     * invoked to compare elements of array to values. The comparator is invoked with
+     * two arguments: (arrVal, othVal).
+     *
+     * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
+     *
+     * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
+     * console.log(array);
+     * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
+     */
+    <T>(comparator: _.Comparator<T>): PullAllWith1x1<T>;
+    /**
+     * This method is like `_.pullAll` except that it accepts `comparator` which is
+     * invoked to compare elements of array to values. The comparator is invoked with
+     * two arguments: (arrVal, othVal).
+     *
+     * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
+     *
+     * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
+     * console.log(array);
+     * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
+     */
+    <T>(comparator: _.Comparator<T>, values: _.List<T>): PullAllWith1x2<T>;
+    /**
+     * This method is like `_.pullAll` except that it accepts `comparator` which is
+     * invoked to compare elements of array to values. The comparator is invoked with
+     * two arguments: (arrVal, othVal).
+     *
+     * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
+     *
+     * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
+     * console.log(array);
+     * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
+     */
+    <T>(comparator: _.Comparator<T>, values: _.List<T>, array: ReadonlyArray<T>): T[];
+    /**
+     * This method is like `_.pullAll` except that it accepts `comparator` which is
+     * invoked to compare elements of array to values. The comparator is invoked with
+     * two arguments: (arrVal, othVal).
+     *
+     * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
+     *
+     * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
+     * console.log(array);
+     * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
+     */
+    <T>(comparator: _.Comparator<T>, values: _.List<T>, array: _.List<T>): _.List<T>;
+    /**
+     * This method is like `_.pullAll` except that it accepts `comparator` which is
+     * invoked to compare elements of array to values. The comparator is invoked with
+     * two arguments: (arrVal, othVal).
+     *
+     * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
+     *
+     * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
+     * console.log(array);
+     * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
+     */
+    <T1, T2>(comparator: _.Comparator2<T1, T2>): PullAllWith3x1<T1, T2>;
+    /**
+     * This method is like `_.pullAll` except that it accepts `comparator` which is
+     * invoked to compare elements of array to values. The comparator is invoked with
+     * two arguments: (arrVal, othVal).
+     *
+     * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
+     *
+     * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
+     * console.log(array);
+     * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
+     */
+    <T1, T2>(comparator: _.Comparator2<T1, T2>, values: _.List<T2>): PullAllWith3x2<T1>;
+    /**
+     * This method is like `_.pullAll` except that it accepts `comparator` which is
+     * invoked to compare elements of array to values. The comparator is invoked with
+     * two arguments: (arrVal, othVal).
+     *
+     * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
+     *
+     * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
+     * console.log(array);
+     * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
+     */
+    <T1, T2>(comparator: _.Comparator2<T1, T2>, values: _.List<T2>, array: ReadonlyArray<T1>): T1[];
+    /**
+     * This method is like `_.pullAll` except that it accepts `comparator` which is
+     * invoked to compare elements of array to values. The comparator is invoked with
+     * two arguments: (arrVal, othVal).
+     *
+     * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
+     *
+     * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
+     * console.log(array);
+     * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
+     */
+    <T1, T2>(comparator: _.Comparator2<T1, T2>, values: _.List<T2>, array: _.List<T1>): _.List<T1>;
+}
+interface PullAllWith1x1<T> {
+    /**
+     * This method is like `_.pullAll` except that it accepts `comparator` which is
+     * invoked to compare elements of array to values. The comparator is invoked with
+     * two arguments: (arrVal, othVal).
+     *
+     * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
+     *
+     * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
+     * console.log(array);
+     * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
+     */
+    (): PullAllWith1x1<T>;
+    /**
+     * This method is like `_.pullAll` except that it accepts `comparator` which is
+     * invoked to compare elements of array to values. The comparator is invoked with
+     * two arguments: (arrVal, othVal).
+     *
+     * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
+     *
+     * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
+     * console.log(array);
+     * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
+     */
+    (values: _.List<T>): PullAllWith1x2<T>;
+    /**
+     * This method is like `_.pullAll` except that it accepts `comparator` which is
+     * invoked to compare elements of array to values. The comparator is invoked with
+     * two arguments: (arrVal, othVal).
+     *
+     * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
+     *
+     * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
+     * console.log(array);
+     * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
+     */
+    (values: _.List<T>, array: ReadonlyArray<T>): T[];
+    /**
+     * This method is like `_.pullAll` except that it accepts `comparator` which is
+     * invoked to compare elements of array to values. The comparator is invoked with
+     * two arguments: (arrVal, othVal).
+     *
+     * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
+     *
+     * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
+     * console.log(array);
+     * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
+     */
+    (values: _.List<T>, array: _.List<T>): _.List<T>;
+}
+interface PullAllWith1x2<T> {
+    /**
+     * This method is like `_.pullAll` except that it accepts `comparator` which is
+     * invoked to compare elements of array to values. The comparator is invoked with
+     * two arguments: (arrVal, othVal).
+     *
+     * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
+     *
+     * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
+     * console.log(array);
+     * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
+     */
+    (): PullAllWith1x2<T>;
+    /**
+     * This method is like `_.pullAll` except that it accepts `comparator` which is
+     * invoked to compare elements of array to values. The comparator is invoked with
+     * two arguments: (arrVal, othVal).
+     *
+     * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
+     *
+     * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
+     * console.log(array);
+     * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
+     */
+    (array: ReadonlyArray<T>): T[];
+    /**
+     * This method is like `_.pullAll` except that it accepts `comparator` which is
+     * invoked to compare elements of array to values. The comparator is invoked with
+     * two arguments: (arrVal, othVal).
+     *
+     * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
+     *
+     * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
+     * console.log(array);
+     * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
+     */
+    (array: _.List<T>): _.List<T>;
+}
+interface PullAllWith3x1<T1, T2> {
+    /**
+     * This method is like `_.pullAll` except that it accepts `comparator` which is
+     * invoked to compare elements of array to values. The comparator is invoked with
+     * two arguments: (arrVal, othVal).
+     *
+     * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
+     *
+     * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
+     * console.log(array);
+     * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
+     */
+    (): PullAllWith3x1<T1, T2>;
+    /**
+     * This method is like `_.pullAll` except that it accepts `comparator` which is
+     * invoked to compare elements of array to values. The comparator is invoked with
+     * two arguments: (arrVal, othVal).
+     *
+     * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
+     *
+     * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
+     * console.log(array);
+     * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
+     */
+    (values: _.List<T2>): PullAllWith3x2<T1>;
+    /**
+     * This method is like `_.pullAll` except that it accepts `comparator` which is
+     * invoked to compare elements of array to values. The comparator is invoked with
+     * two arguments: (arrVal, othVal).
+     *
+     * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
+     *
+     * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
+     * console.log(array);
+     * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
+     */
+    (values: _.List<T2>, array: ReadonlyArray<T1>): T1[];
+    /**
+     * This method is like `_.pullAll` except that it accepts `comparator` which is
+     * invoked to compare elements of array to values. The comparator is invoked with
+     * two arguments: (arrVal, othVal).
+     *
+     * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
+     *
+     * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
+     * console.log(array);
+     * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
+     */
+    (values: _.List<T2>, array: _.List<T1>): _.List<T1>;
+}
+interface PullAllWith3x2<T1> {
+    /**
+     * This method is like `_.pullAll` except that it accepts `comparator` which is
+     * invoked to compare elements of array to values. The comparator is invoked with
+     * two arguments: (arrVal, othVal).
+     *
+     * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
+     *
+     * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
+     * console.log(array);
+     * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
+     */
+    (): PullAllWith3x2<T1>;
+    /**
+     * This method is like `_.pullAll` except that it accepts `comparator` which is
+     * invoked to compare elements of array to values. The comparator is invoked with
+     * two arguments: (arrVal, othVal).
+     *
+     * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
+     *
+     * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
+     * console.log(array);
+     * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
+     */
+    <T2>(array: ReadonlyArray<T1>): T1[];
+    /**
+     * This method is like `_.pullAll` except that it accepts `comparator` which is
+     * invoked to compare elements of array to values. The comparator is invoked with
+     * two arguments: (arrVal, othVal).
+     *
+     * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
+     *
+     * @category Array
+     * @param array The array to modify.
+     * @param values The values to remove.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
+     *
+     * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
+     * console.log(array);
+     * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
+     */
+    <T2>(array: _.List<T1>): _.List<T1>;
+}
+
+declare const pullAllWith: PullAllWith;
+export = pullAllWith;
diff --git a/types/lodash/fp/pullAt.d.ts b/types/lodash/fp/pullAt.d.ts
new file mode 100644
index 0000000000..61d6fd04f0
--- /dev/null
+++ b/types/lodash/fp/pullAt.d.ts
@@ -0,0 +1,90 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface PullAt {
+    /**
+     * Removes elements from array corresponding to the given indexes and returns an array of the removed elements.
+     * Indexes may be specified as an array of indexes or as individual arguments.
+     *
+     * Note: Unlike _.at, this method mutates array.
+     *
+     * @param array The array to modify.
+     * @param indexes The indexes of elements to remove, specified as individual indexes or arrays of indexes.
+     * @return Returns the new array of removed elements.
+     */
+    (): PullAt;
+    /**
+     * Removes elements from array corresponding to the given indexes and returns an array of the removed elements.
+     * Indexes may be specified as an array of indexes or as individual arguments.
+     *
+     * Note: Unlike _.at, this method mutates array.
+     *
+     * @param array The array to modify.
+     * @param indexes The indexes of elements to remove, specified as individual indexes or arrays of indexes.
+     * @return Returns the new array of removed elements.
+     */
+    (indexes: _.Many<number>): PullAt1x1;
+    /**
+     * Removes elements from array corresponding to the given indexes and returns an array of the removed elements.
+     * Indexes may be specified as an array of indexes or as individual arguments.
+     *
+     * Note: Unlike _.at, this method mutates array.
+     *
+     * @param array The array to modify.
+     * @param indexes The indexes of elements to remove, specified as individual indexes or arrays of indexes.
+     * @return Returns the new array of removed elements.
+     */
+    <T>(indexes: _.Many<number>, array: ReadonlyArray<T>): T[];
+    /**
+     * Removes elements from array corresponding to the given indexes and returns an array of the removed elements.
+     * Indexes may be specified as an array of indexes or as individual arguments.
+     *
+     * Note: Unlike _.at, this method mutates array.
+     *
+     * @param array The array to modify.
+     * @param indexes The indexes of elements to remove, specified as individual indexes or arrays of indexes.
+     * @return Returns the new array of removed elements.
+     */
+    <T>(indexes: _.Many<number>, array: _.List<T>): _.List<T>;
+}
+interface PullAt1x1 {
+    /**
+     * Removes elements from array corresponding to the given indexes and returns an array of the removed elements.
+     * Indexes may be specified as an array of indexes or as individual arguments.
+     *
+     * Note: Unlike _.at, this method mutates array.
+     *
+     * @param array The array to modify.
+     * @param indexes The indexes of elements to remove, specified as individual indexes or arrays of indexes.
+     * @return Returns the new array of removed elements.
+     */
+    (): PullAt1x1;
+    /**
+     * Removes elements from array corresponding to the given indexes and returns an array of the removed elements.
+     * Indexes may be specified as an array of indexes or as individual arguments.
+     *
+     * Note: Unlike _.at, this method mutates array.
+     *
+     * @param array The array to modify.
+     * @param indexes The indexes of elements to remove, specified as individual indexes or arrays of indexes.
+     * @return Returns the new array of removed elements.
+     */
+    <T>(array: ReadonlyArray<T>): T[];
+    /**
+     * Removes elements from array corresponding to the given indexes and returns an array of the removed elements.
+     * Indexes may be specified as an array of indexes or as individual arguments.
+     *
+     * Note: Unlike _.at, this method mutates array.
+     *
+     * @param array The array to modify.
+     * @param indexes The indexes of elements to remove, specified as individual indexes or arrays of indexes.
+     * @return Returns the new array of removed elements.
+     */
+    <T>(array: _.List<T>): _.List<T>;
+}
+
+declare const pullAt: PullAt;
+export = pullAt;
diff --git a/types/lodash/fp/random.d.ts b/types/lodash/fp/random.d.ts
new file mode 100644
index 0000000000..075b54b2e4
--- /dev/null
+++ b/types/lodash/fp/random.d.ts
@@ -0,0 +1,66 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface Random {
+    /**
+     * Produces a random number between min and max (inclusive). If only one argument is provided a number between
+     * 0 and the given number is returned. If floating is true, or either min or max are floats, a floating-point
+     * number is returned instead of an integer.
+     *
+     * @param min The minimum possible value.
+     * @param max The maximum possible value.
+     * @param floating Specify returning a floating-point number.
+     * @return Returns the random number.
+     */
+    (): Random;
+    /**
+     * Produces a random number between min and max (inclusive). If only one argument is provided a number between
+     * 0 and the given number is returned. If floating is true, or either min or max are floats, a floating-point
+     * number is returned instead of an integer.
+     *
+     * @param min The minimum possible value.
+     * @param max The maximum possible value.
+     * @param floating Specify returning a floating-point number.
+     * @return Returns the random number.
+     */
+    (maxOrMin: number): Random1x1;
+    /**
+     * Produces a random number between min and max (inclusive). If only one argument is provided a number between
+     * 0 and the given number is returned. If floating is true, or either min or max are floats, a floating-point
+     * number is returned instead of an integer.
+     *
+     * @param min The minimum possible value.
+     * @param max The maximum possible value.
+     * @param floating Specify returning a floating-point number.
+     * @return Returns the random number.
+     */
+    (maxOrMin: number, floatingOrMax: boolean | number): number;
+}
+interface Random1x1 {
+    /**
+     * Produces a random number between min and max (inclusive). If only one argument is provided a number between
+     * 0 and the given number is returned. If floating is true, or either min or max are floats, a floating-point
+     * number is returned instead of an integer.
+     *
+     * @param min The minimum possible value.
+     * @param max The maximum possible value.
+     * @param floating Specify returning a floating-point number.
+     * @return Returns the random number.
+     */
+    (): Random1x1;
+    /**
+     * Produces a random number between min and max (inclusive). If only one argument is provided a number between
+     * 0 and the given number is returned. If floating is true, or either min or max are floats, a floating-point
+     * number is returned instead of an integer.
+     *
+     * @param min The minimum possible value.
+     * @param max The maximum possible value.
+     * @param floating Specify returning a floating-point number.
+     * @return Returns the random number.
+     */
+    (floatingOrMax: boolean | number): number;
+}
+
+declare const random: Random;
+export = random;
diff --git a/types/lodash/fp/range.d.ts b/types/lodash/fp/range.d.ts
new file mode 100644
index 0000000000..7526d40e03
--- /dev/null
+++ b/types/lodash/fp/range.d.ts
@@ -0,0 +1,66 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface Range {
+    /**
+     * Creates an array of numbers (positive and/or negative) progressing from start up to, but not including, end.
+     * If end is not specified it’s set to start with start then set to 0. If end is less than start a zero-length
+     * range is created unless a negative step is specified.
+     *
+     * @param start The start of the range.
+     * @param end The end of the range.
+     * @param step The value to increment or decrement by.
+     * @return Returns a new range array.
+     */
+    (): Range;
+    /**
+     * Creates an array of numbers (positive and/or negative) progressing from start up to, but not including, end.
+     * If end is not specified it’s set to start with start then set to 0. If end is less than start a zero-length
+     * range is created unless a negative step is specified.
+     *
+     * @param start The start of the range.
+     * @param end The end of the range.
+     * @param step The value to increment or decrement by.
+     * @return Returns a new range array.
+     */
+    (start: number): Range1x1;
+    /**
+     * Creates an array of numbers (positive and/or negative) progressing from start up to, but not including, end.
+     * If end is not specified it’s set to start with start then set to 0. If end is less than start a zero-length
+     * range is created unless a negative step is specified.
+     *
+     * @param start The start of the range.
+     * @param end The end of the range.
+     * @param step The value to increment or decrement by.
+     * @return Returns a new range array.
+     */
+    (start: number, end: number): number[];
+}
+interface Range1x1 {
+    /**
+     * Creates an array of numbers (positive and/or negative) progressing from start up to, but not including, end.
+     * If end is not specified it’s set to start with start then set to 0. If end is less than start a zero-length
+     * range is created unless a negative step is specified.
+     *
+     * @param start The start of the range.
+     * @param end The end of the range.
+     * @param step The value to increment or decrement by.
+     * @return Returns a new range array.
+     */
+    (): Range1x1;
+    /**
+     * Creates an array of numbers (positive and/or negative) progressing from start up to, but not including, end.
+     * If end is not specified it’s set to start with start then set to 0. If end is less than start a zero-length
+     * range is created unless a negative step is specified.
+     *
+     * @param start The start of the range.
+     * @param end The end of the range.
+     * @param step The value to increment or decrement by.
+     * @return Returns a new range array.
+     */
+    (end: number): number[];
+}
+
+declare const range: Range;
+export = range;
diff --git a/types/lodash/fp/rangeRight.d.ts b/types/lodash/fp/rangeRight.d.ts
new file mode 100644
index 0000000000..89337d055a
--- /dev/null
+++ b/types/lodash/fp/rangeRight.d.ts
@@ -0,0 +1,176 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface RangeRight {
+    /**
+     * This method is like `_.range` except that it populates values in
+     * descending order.
+     *
+     * @category Util
+     * @param start The start of the range.
+     * @param end The end of the range.
+     * @param step The value to increment or decrement by.
+     * @returns Returns the new array of numbers.
+     * @example
+     *
+     * _.rangeRight(4);
+     * // => [3, 2, 1, 0]
+     *
+     * _.rangeRight(-4);
+     * // => [-3, -2, -1, 0]
+     *
+     * _.rangeRight(1, 5);
+     * // => [4, 3, 2, 1]
+     *
+     * _.rangeRight(0, 20, 5);
+     * // => [15, 10, 5, 0]
+     *
+     * _.rangeRight(0, -4, -1);
+     * // => [-3, -2, -1, 0]
+     *
+     * _.rangeRight(1, 4, 0);
+     * // => [1, 1, 1]
+     *
+     * _.rangeRight(0);
+     * // => []
+     */
+    (): RangeRight;
+    /**
+     * This method is like `_.range` except that it populates values in
+     * descending order.
+     *
+     * @category Util
+     * @param start The start of the range.
+     * @param end The end of the range.
+     * @param step The value to increment or decrement by.
+     * @returns Returns the new array of numbers.
+     * @example
+     *
+     * _.rangeRight(4);
+     * // => [3, 2, 1, 0]
+     *
+     * _.rangeRight(-4);
+     * // => [-3, -2, -1, 0]
+     *
+     * _.rangeRight(1, 5);
+     * // => [4, 3, 2, 1]
+     *
+     * _.rangeRight(0, 20, 5);
+     * // => [15, 10, 5, 0]
+     *
+     * _.rangeRight(0, -4, -1);
+     * // => [-3, -2, -1, 0]
+     *
+     * _.rangeRight(1, 4, 0);
+     * // => [1, 1, 1]
+     *
+     * _.rangeRight(0);
+     * // => []
+     */
+    (start: number): RangeRight1x1;
+    /**
+     * This method is like `_.range` except that it populates values in
+     * descending order.
+     *
+     * @category Util
+     * @param start The start of the range.
+     * @param end The end of the range.
+     * @param step The value to increment or decrement by.
+     * @returns Returns the new array of numbers.
+     * @example
+     *
+     * _.rangeRight(4);
+     * // => [3, 2, 1, 0]
+     *
+     * _.rangeRight(-4);
+     * // => [-3, -2, -1, 0]
+     *
+     * _.rangeRight(1, 5);
+     * // => [4, 3, 2, 1]
+     *
+     * _.rangeRight(0, 20, 5);
+     * // => [15, 10, 5, 0]
+     *
+     * _.rangeRight(0, -4, -1);
+     * // => [-3, -2, -1, 0]
+     *
+     * _.rangeRight(1, 4, 0);
+     * // => [1, 1, 1]
+     *
+     * _.rangeRight(0);
+     * // => []
+     */
+    (start: number, end: number): number[];
+}
+interface RangeRight1x1 {
+    /**
+     * This method is like `_.range` except that it populates values in
+     * descending order.
+     *
+     * @category Util
+     * @param start The start of the range.
+     * @param end The end of the range.
+     * @param step The value to increment or decrement by.
+     * @returns Returns the new array of numbers.
+     * @example
+     *
+     * _.rangeRight(4);
+     * // => [3, 2, 1, 0]
+     *
+     * _.rangeRight(-4);
+     * // => [-3, -2, -1, 0]
+     *
+     * _.rangeRight(1, 5);
+     * // => [4, 3, 2, 1]
+     *
+     * _.rangeRight(0, 20, 5);
+     * // => [15, 10, 5, 0]
+     *
+     * _.rangeRight(0, -4, -1);
+     * // => [-3, -2, -1, 0]
+     *
+     * _.rangeRight(1, 4, 0);
+     * // => [1, 1, 1]
+     *
+     * _.rangeRight(0);
+     * // => []
+     */
+    (): RangeRight1x1;
+    /**
+     * This method is like `_.range` except that it populates values in
+     * descending order.
+     *
+     * @category Util
+     * @param start The start of the range.
+     * @param end The end of the range.
+     * @param step The value to increment or decrement by.
+     * @returns Returns the new array of numbers.
+     * @example
+     *
+     * _.rangeRight(4);
+     * // => [3, 2, 1, 0]
+     *
+     * _.rangeRight(-4);
+     * // => [-3, -2, -1, 0]
+     *
+     * _.rangeRight(1, 5);
+     * // => [4, 3, 2, 1]
+     *
+     * _.rangeRight(0, 20, 5);
+     * // => [15, 10, 5, 0]
+     *
+     * _.rangeRight(0, -4, -1);
+     * // => [-3, -2, -1, 0]
+     *
+     * _.rangeRight(1, 4, 0);
+     * // => [1, 1, 1]
+     *
+     * _.rangeRight(0);
+     * // => []
+     */
+    (end: number): number[];
+}
+
+declare const rangeRight: RangeRight;
+export = rangeRight;
diff --git a/types/lodash/fp/rangeStep.d.ts b/types/lodash/fp/rangeStep.d.ts
new file mode 100644
index 0000000000..1bd70ebf55
--- /dev/null
+++ b/types/lodash/fp/rangeStep.d.ts
@@ -0,0 +1,112 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface Range {
+    /**
+     * Creates an array of numbers (positive and/or negative) progressing from start up to, but not including, end.
+     * If end is not specified it’s set to start with start then set to 0. If end is less than start a zero-length
+     * range is created unless a negative step is specified.
+     *
+     * @param start The start of the range.
+     * @param end The end of the range.
+     * @param step The value to increment or decrement by.
+     * @return Returns a new range array.
+     */
+    (): Range;
+    /**
+     * Creates an array of numbers (positive and/or negative) progressing from start up to, but not including, end.
+     * If end is not specified it’s set to start with start then set to 0. If end is less than start a zero-length
+     * range is created unless a negative step is specified.
+     *
+     * @param start The start of the range.
+     * @param end The end of the range.
+     * @param step The value to increment or decrement by.
+     * @return Returns a new range array.
+     */
+    (start: number): Range1x1;
+    /**
+     * Creates an array of numbers (positive and/or negative) progressing from start up to, but not including, end.
+     * If end is not specified it’s set to start with start then set to 0. If end is less than start a zero-length
+     * range is created unless a negative step is specified.
+     *
+     * @param start The start of the range.
+     * @param end The end of the range.
+     * @param step The value to increment or decrement by.
+     * @return Returns a new range array.
+     */
+    (start: number, end: number): Range1x2;
+    /**
+     * Creates an array of numbers (positive and/or negative) progressing from start up to, but not including, end.
+     * If end is not specified it’s set to start with start then set to 0. If end is less than start a zero-length
+     * range is created unless a negative step is specified.
+     *
+     * @param start The start of the range.
+     * @param end The end of the range.
+     * @param step The value to increment or decrement by.
+     * @return Returns a new range array.
+     */
+    (start: number, end: number, step: number): number[];
+}
+interface Range1x1 {
+    /**
+     * Creates an array of numbers (positive and/or negative) progressing from start up to, but not including, end.
+     * If end is not specified it’s set to start with start then set to 0. If end is less than start a zero-length
+     * range is created unless a negative step is specified.
+     *
+     * @param start The start of the range.
+     * @param end The end of the range.
+     * @param step The value to increment or decrement by.
+     * @return Returns a new range array.
+     */
+    (): Range1x1;
+    /**
+     * Creates an array of numbers (positive and/or negative) progressing from start up to, but not including, end.
+     * If end is not specified it’s set to start with start then set to 0. If end is less than start a zero-length
+     * range is created unless a negative step is specified.
+     *
+     * @param start The start of the range.
+     * @param end The end of the range.
+     * @param step The value to increment or decrement by.
+     * @return Returns a new range array.
+     */
+    (end: number): Range1x2;
+    /**
+     * Creates an array of numbers (positive and/or negative) progressing from start up to, but not including, end.
+     * If end is not specified it’s set to start with start then set to 0. If end is less than start a zero-length
+     * range is created unless a negative step is specified.
+     *
+     * @param start The start of the range.
+     * @param end The end of the range.
+     * @param step The value to increment or decrement by.
+     * @return Returns a new range array.
+     */
+    (end: number, step: number): number[];
+}
+interface Range1x2 {
+    /**
+     * Creates an array of numbers (positive and/or negative) progressing from start up to, but not including, end.
+     * If end is not specified it’s set to start with start then set to 0. If end is less than start a zero-length
+     * range is created unless a negative step is specified.
+     *
+     * @param start The start of the range.
+     * @param end The end of the range.
+     * @param step The value to increment or decrement by.
+     * @return Returns a new range array.
+     */
+    (): Range1x2;
+    /**
+     * Creates an array of numbers (positive and/or negative) progressing from start up to, but not including, end.
+     * If end is not specified it’s set to start with start then set to 0. If end is less than start a zero-length
+     * range is created unless a negative step is specified.
+     *
+     * @param start The start of the range.
+     * @param end The end of the range.
+     * @param step The value to increment or decrement by.
+     * @return Returns a new range array.
+     */
+    (step: number): number[];
+}
+
+declare const rangeStep: Range;
+export = rangeStep;
diff --git a/types/lodash/fp/rangeStepRight.d.ts b/types/lodash/fp/rangeStepRight.d.ts
new file mode 100644
index 0000000000..dcc223f569
--- /dev/null
+++ b/types/lodash/fp/rangeStepRight.d.ts
@@ -0,0 +1,310 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface RangeRight {
+    /**
+     * This method is like `_.range` except that it populates values in
+     * descending order.
+     *
+     * @category Util
+     * @param start The start of the range.
+     * @param end The end of the range.
+     * @param step The value to increment or decrement by.
+     * @returns Returns the new array of numbers.
+     * @example
+     *
+     * _.rangeRight(4);
+     * // => [3, 2, 1, 0]
+     *
+     * _.rangeRight(-4);
+     * // => [-3, -2, -1, 0]
+     *
+     * _.rangeRight(1, 5);
+     * // => [4, 3, 2, 1]
+     *
+     * _.rangeRight(0, 20, 5);
+     * // => [15, 10, 5, 0]
+     *
+     * _.rangeRight(0, -4, -1);
+     * // => [-3, -2, -1, 0]
+     *
+     * _.rangeRight(1, 4, 0);
+     * // => [1, 1, 1]
+     *
+     * _.rangeRight(0);
+     * // => []
+     */
+    (): RangeRight;
+    /**
+     * This method is like `_.range` except that it populates values in
+     * descending order.
+     *
+     * @category Util
+     * @param start The start of the range.
+     * @param end The end of the range.
+     * @param step The value to increment or decrement by.
+     * @returns Returns the new array of numbers.
+     * @example
+     *
+     * _.rangeRight(4);
+     * // => [3, 2, 1, 0]
+     *
+     * _.rangeRight(-4);
+     * // => [-3, -2, -1, 0]
+     *
+     * _.rangeRight(1, 5);
+     * // => [4, 3, 2, 1]
+     *
+     * _.rangeRight(0, 20, 5);
+     * // => [15, 10, 5, 0]
+     *
+     * _.rangeRight(0, -4, -1);
+     * // => [-3, -2, -1, 0]
+     *
+     * _.rangeRight(1, 4, 0);
+     * // => [1, 1, 1]
+     *
+     * _.rangeRight(0);
+     * // => []
+     */
+    (start: number): RangeRight1x1;
+    /**
+     * This method is like `_.range` except that it populates values in
+     * descending order.
+     *
+     * @category Util
+     * @param start The start of the range.
+     * @param end The end of the range.
+     * @param step The value to increment or decrement by.
+     * @returns Returns the new array of numbers.
+     * @example
+     *
+     * _.rangeRight(4);
+     * // => [3, 2, 1, 0]
+     *
+     * _.rangeRight(-4);
+     * // => [-3, -2, -1, 0]
+     *
+     * _.rangeRight(1, 5);
+     * // => [4, 3, 2, 1]
+     *
+     * _.rangeRight(0, 20, 5);
+     * // => [15, 10, 5, 0]
+     *
+     * _.rangeRight(0, -4, -1);
+     * // => [-3, -2, -1, 0]
+     *
+     * _.rangeRight(1, 4, 0);
+     * // => [1, 1, 1]
+     *
+     * _.rangeRight(0);
+     * // => []
+     */
+    (start: number, end: number): RangeRight1x2;
+    /**
+     * This method is like `_.range` except that it populates values in
+     * descending order.
+     *
+     * @category Util
+     * @param start The start of the range.
+     * @param end The end of the range.
+     * @param step The value to increment or decrement by.
+     * @returns Returns the new array of numbers.
+     * @example
+     *
+     * _.rangeRight(4);
+     * // => [3, 2, 1, 0]
+     *
+     * _.rangeRight(-4);
+     * // => [-3, -2, -1, 0]
+     *
+     * _.rangeRight(1, 5);
+     * // => [4, 3, 2, 1]
+     *
+     * _.rangeRight(0, 20, 5);
+     * // => [15, 10, 5, 0]
+     *
+     * _.rangeRight(0, -4, -1);
+     * // => [-3, -2, -1, 0]
+     *
+     * _.rangeRight(1, 4, 0);
+     * // => [1, 1, 1]
+     *
+     * _.rangeRight(0);
+     * // => []
+     */
+    (start: number, end: number, step: number): number[];
+}
+interface RangeRight1x1 {
+    /**
+     * This method is like `_.range` except that it populates values in
+     * descending order.
+     *
+     * @category Util
+     * @param start The start of the range.
+     * @param end The end of the range.
+     * @param step The value to increment or decrement by.
+     * @returns Returns the new array of numbers.
+     * @example
+     *
+     * _.rangeRight(4);
+     * // => [3, 2, 1, 0]
+     *
+     * _.rangeRight(-4);
+     * // => [-3, -2, -1, 0]
+     *
+     * _.rangeRight(1, 5);
+     * // => [4, 3, 2, 1]
+     *
+     * _.rangeRight(0, 20, 5);
+     * // => [15, 10, 5, 0]
+     *
+     * _.rangeRight(0, -4, -1);
+     * // => [-3, -2, -1, 0]
+     *
+     * _.rangeRight(1, 4, 0);
+     * // => [1, 1, 1]
+     *
+     * _.rangeRight(0);
+     * // => []
+     */
+    (): RangeRight1x1;
+    /**
+     * This method is like `_.range` except that it populates values in
+     * descending order.
+     *
+     * @category Util
+     * @param start The start of the range.
+     * @param end The end of the range.
+     * @param step The value to increment or decrement by.
+     * @returns Returns the new array of numbers.
+     * @example
+     *
+     * _.rangeRight(4);
+     * // => [3, 2, 1, 0]
+     *
+     * _.rangeRight(-4);
+     * // => [-3, -2, -1, 0]
+     *
+     * _.rangeRight(1, 5);
+     * // => [4, 3, 2, 1]
+     *
+     * _.rangeRight(0, 20, 5);
+     * // => [15, 10, 5, 0]
+     *
+     * _.rangeRight(0, -4, -1);
+     * // => [-3, -2, -1, 0]
+     *
+     * _.rangeRight(1, 4, 0);
+     * // => [1, 1, 1]
+     *
+     * _.rangeRight(0);
+     * // => []
+     */
+    (end: number): RangeRight1x2;
+    /**
+     * This method is like `_.range` except that it populates values in
+     * descending order.
+     *
+     * @category Util
+     * @param start The start of the range.
+     * @param end The end of the range.
+     * @param step The value to increment or decrement by.
+     * @returns Returns the new array of numbers.
+     * @example
+     *
+     * _.rangeRight(4);
+     * // => [3, 2, 1, 0]
+     *
+     * _.rangeRight(-4);
+     * // => [-3, -2, -1, 0]
+     *
+     * _.rangeRight(1, 5);
+     * // => [4, 3, 2, 1]
+     *
+     * _.rangeRight(0, 20, 5);
+     * // => [15, 10, 5, 0]
+     *
+     * _.rangeRight(0, -4, -1);
+     * // => [-3, -2, -1, 0]
+     *
+     * _.rangeRight(1, 4, 0);
+     * // => [1, 1, 1]
+     *
+     * _.rangeRight(0);
+     * // => []
+     */
+    (end: number, step: number): number[];
+}
+interface RangeRight1x2 {
+    /**
+     * This method is like `_.range` except that it populates values in
+     * descending order.
+     *
+     * @category Util
+     * @param start The start of the range.
+     * @param end The end of the range.
+     * @param step The value to increment or decrement by.
+     * @returns Returns the new array of numbers.
+     * @example
+     *
+     * _.rangeRight(4);
+     * // => [3, 2, 1, 0]
+     *
+     * _.rangeRight(-4);
+     * // => [-3, -2, -1, 0]
+     *
+     * _.rangeRight(1, 5);
+     * // => [4, 3, 2, 1]
+     *
+     * _.rangeRight(0, 20, 5);
+     * // => [15, 10, 5, 0]
+     *
+     * _.rangeRight(0, -4, -1);
+     * // => [-3, -2, -1, 0]
+     *
+     * _.rangeRight(1, 4, 0);
+     * // => [1, 1, 1]
+     *
+     * _.rangeRight(0);
+     * // => []
+     */
+    (): RangeRight1x2;
+    /**
+     * This method is like `_.range` except that it populates values in
+     * descending order.
+     *
+     * @category Util
+     * @param start The start of the range.
+     * @param end The end of the range.
+     * @param step The value to increment or decrement by.
+     * @returns Returns the new array of numbers.
+     * @example
+     *
+     * _.rangeRight(4);
+     * // => [3, 2, 1, 0]
+     *
+     * _.rangeRight(-4);
+     * // => [-3, -2, -1, 0]
+     *
+     * _.rangeRight(1, 5);
+     * // => [4, 3, 2, 1]
+     *
+     * _.rangeRight(0, 20, 5);
+     * // => [15, 10, 5, 0]
+     *
+     * _.rangeRight(0, -4, -1);
+     * // => [-3, -2, -1, 0]
+     *
+     * _.rangeRight(1, 4, 0);
+     * // => [1, 1, 1]
+     *
+     * _.rangeRight(0);
+     * // => []
+     */
+    (step: number): number[];
+}
+
+declare const rangeStepRight: RangeRight;
+export = rangeStepRight;
diff --git a/types/lodash/fp/rearg.d.ts b/types/lodash/fp/rearg.d.ts
new file mode 100644
index 0000000000..9ff0dbccfb
--- /dev/null
+++ b/types/lodash/fp/rearg.d.ts
@@ -0,0 +1,58 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Rearg {
+    /**
+     * Creates a function that invokes func with arguments arranged according to the specified indexes where the
+     * argument value at the first index is provided as the first argument, the argument value at the second index
+     * is provided as the second argument, and so on.
+     * @param func The function to rearrange arguments for.
+     * @param indexes The arranged argument indexes, specified as individual indexes or arrays of indexes.
+     * @return Returns the new function.
+     */
+    (): Rearg;
+    /**
+     * Creates a function that invokes func with arguments arranged according to the specified indexes where the
+     * argument value at the first index is provided as the first argument, the argument value at the second index
+     * is provided as the second argument, and so on.
+     * @param func The function to rearrange arguments for.
+     * @param indexes The arranged argument indexes, specified as individual indexes or arrays of indexes.
+     * @return Returns the new function.
+     */
+    (indexes: _.Many<number>): Rearg1x1;
+    /**
+     * Creates a function that invokes func with arguments arranged according to the specified indexes where the
+     * argument value at the first index is provided as the first argument, the argument value at the second index
+     * is provided as the second argument, and so on.
+     * @param func The function to rearrange arguments for.
+     * @param indexes The arranged argument indexes, specified as individual indexes or arrays of indexes.
+     * @return Returns the new function.
+     */
+    (indexes: _.Many<number>, func: (...args: any[]) => any): (...args: any[]) => any;
+}
+interface Rearg1x1 {
+    /**
+     * Creates a function that invokes func with arguments arranged according to the specified indexes where the
+     * argument value at the first index is provided as the first argument, the argument value at the second index
+     * is provided as the second argument, and so on.
+     * @param func The function to rearrange arguments for.
+     * @param indexes The arranged argument indexes, specified as individual indexes or arrays of indexes.
+     * @return Returns the new function.
+     */
+    (): Rearg1x1;
+    /**
+     * Creates a function that invokes func with arguments arranged according to the specified indexes where the
+     * argument value at the first index is provided as the first argument, the argument value at the second index
+     * is provided as the second argument, and so on.
+     * @param func The function to rearrange arguments for.
+     * @param indexes The arranged argument indexes, specified as individual indexes or arrays of indexes.
+     * @return Returns the new function.
+     */
+    (func: (...args: any[]) => any): (...args: any[]) => any;
+}
+
+declare const rearg: Rearg;
+export = rearg;
diff --git a/types/lodash/fp/reduce.d.ts b/types/lodash/fp/reduce.d.ts
new file mode 100644
index 0000000000..70071a64e3
--- /dev/null
+++ b/types/lodash/fp/reduce.d.ts
@@ -0,0 +1,223 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Reduce {
+    /**
+    * Reduces a collection to a value which is the accumulated result of running each
+    * element in the collection through the callback, where each successive callback execution
+    * consumes the return value of the previous execution. If accumulator is not provided the
+    * first element of the collection will be used as the initial accumulator value. The callback
+    * is bound to thisArg and invoked with four arguments; (accumulator, value, index|key, collection).
+    * @param collection The collection to iterate over.
+    * @param callback The function called per iteration.
+    * @param accumulator Initial value of the accumulator.
+    * @return Returns the accumulated value.
+    **/
+    (): Reduce;
+    /**
+    * Reduces a collection to a value which is the accumulated result of running each
+    * element in the collection through the callback, where each successive callback execution
+    * consumes the return value of the previous execution. If accumulator is not provided the
+    * first element of the collection will be used as the initial accumulator value. The callback
+    * is bound to thisArg and invoked with four arguments; (accumulator, value, index|key, collection).
+    * @param collection The collection to iterate over.
+    * @param callback The function called per iteration.
+    * @param accumulator Initial value of the accumulator.
+    * @return Returns the accumulated value.
+    **/
+    <T, TResult>(callback: _.MemoIteratorCapped<T, TResult>): Reduce1x1<T, TResult>;
+    /**
+    * Reduces a collection to a value which is the accumulated result of running each
+    * element in the collection through the callback, where each successive callback execution
+    * consumes the return value of the previous execution. If accumulator is not provided the
+    * first element of the collection will be used as the initial accumulator value. The callback
+    * is bound to thisArg and invoked with four arguments; (accumulator, value, index|key, collection).
+    * @param collection The collection to iterate over.
+    * @param callback The function called per iteration.
+    * @param accumulator Initial value of the accumulator.
+    * @return Returns the accumulated value.
+    **/
+    <T, TResult>(callback: _.MemoIteratorCapped<T, TResult>, accumulator: TResult): Reduce1x2<T, TResult>;
+    /**
+    * Reduces a collection to a value which is the accumulated result of running each
+    * element in the collection through the callback, where each successive callback execution
+    * consumes the return value of the previous execution. If accumulator is not provided the
+    * first element of the collection will be used as the initial accumulator value. The callback
+    * is bound to thisArg and invoked with four arguments; (accumulator, value, index|key, collection).
+    * @param collection The collection to iterate over.
+    * @param callback The function called per iteration.
+    * @param accumulator Initial value of the accumulator.
+    * @return Returns the accumulated value.
+    **/
+    <T, TResult>(callback: _.MemoIteratorCapped<T, TResult>, accumulator: TResult, collection: T[] | _.List<T> | null | undefined): TResult;
+    /**
+    * Reduces a collection to a value which is the accumulated result of running each
+    * element in the collection through the callback, where each successive callback execution
+    * consumes the return value of the previous execution. If accumulator is not provided the
+    * first element of the collection will be used as the initial accumulator value. The callback
+    * is bound to thisArg and invoked with four arguments; (accumulator, value, index|key, collection).
+    * @param collection The collection to iterate over.
+    * @param callback The function called per iteration.
+    * @param accumulator Initial value of the accumulator.
+    * @return Returns the accumulated value.
+    **/
+    <T extends object, TResult>(callback: _.MemoIteratorCapped<T[keyof T], TResult>): Reduce3x1<T, TResult>;
+    /**
+    * Reduces a collection to a value which is the accumulated result of running each
+    * element in the collection through the callback, where each successive callback execution
+    * consumes the return value of the previous execution. If accumulator is not provided the
+    * first element of the collection will be used as the initial accumulator value. The callback
+    * is bound to thisArg and invoked with four arguments; (accumulator, value, index|key, collection).
+    * @param collection The collection to iterate over.
+    * @param callback The function called per iteration.
+    * @param accumulator Initial value of the accumulator.
+    * @return Returns the accumulated value.
+    **/
+    <T extends object, TResult>(callback: _.MemoIteratorCapped<T[keyof T], TResult>, accumulator: TResult): Reduce3x2<T, TResult>;
+    /**
+    * Reduces a collection to a value which is the accumulated result of running each
+    * element in the collection through the callback, where each successive callback execution
+    * consumes the return value of the previous execution. If accumulator is not provided the
+    * first element of the collection will be used as the initial accumulator value. The callback
+    * is bound to thisArg and invoked with four arguments; (accumulator, value, index|key, collection).
+    * @param collection The collection to iterate over.
+    * @param callback The function called per iteration.
+    * @param accumulator Initial value of the accumulator.
+    * @return Returns the accumulated value.
+    **/
+    <T extends object, TResult>(callback: _.MemoIteratorCapped<T[keyof T], TResult>, accumulator: TResult, collection: T | null | undefined): TResult;
+}
+interface Reduce1x1<T, TResult> {
+    /**
+    * Reduces a collection to a value which is the accumulated result of running each
+    * element in the collection through the callback, where each successive callback execution
+    * consumes the return value of the previous execution. If accumulator is not provided the
+    * first element of the collection will be used as the initial accumulator value. The callback
+    * is bound to thisArg and invoked with four arguments; (accumulator, value, index|key, collection).
+    * @param collection The collection to iterate over.
+    * @param callback The function called per iteration.
+    * @param accumulator Initial value of the accumulator.
+    * @return Returns the accumulated value.
+    **/
+    (): Reduce1x1<T, TResult>;
+    /**
+    * Reduces a collection to a value which is the accumulated result of running each
+    * element in the collection through the callback, where each successive callback execution
+    * consumes the return value of the previous execution. If accumulator is not provided the
+    * first element of the collection will be used as the initial accumulator value. The callback
+    * is bound to thisArg and invoked with four arguments; (accumulator, value, index|key, collection).
+    * @param collection The collection to iterate over.
+    * @param callback The function called per iteration.
+    * @param accumulator Initial value of the accumulator.
+    * @return Returns the accumulated value.
+    **/
+    (accumulator: TResult): Reduce1x2<T, TResult>;
+    /**
+    * Reduces a collection to a value which is the accumulated result of running each
+    * element in the collection through the callback, where each successive callback execution
+    * consumes the return value of the previous execution. If accumulator is not provided the
+    * first element of the collection will be used as the initial accumulator value. The callback
+    * is bound to thisArg and invoked with four arguments; (accumulator, value, index|key, collection).
+    * @param collection The collection to iterate over.
+    * @param callback The function called per iteration.
+    * @param accumulator Initial value of the accumulator.
+    * @return Returns the accumulated value.
+    **/
+    (accumulator: TResult, collection: T[] | _.List<T> | null | undefined): TResult;
+}
+interface Reduce1x2<T, TResult> {
+    /**
+    * Reduces a collection to a value which is the accumulated result of running each
+    * element in the collection through the callback, where each successive callback execution
+    * consumes the return value of the previous execution. If accumulator is not provided the
+    * first element of the collection will be used as the initial accumulator value. The callback
+    * is bound to thisArg and invoked with four arguments; (accumulator, value, index|key, collection).
+    * @param collection The collection to iterate over.
+    * @param callback The function called per iteration.
+    * @param accumulator Initial value of the accumulator.
+    * @return Returns the accumulated value.
+    **/
+    (): Reduce1x2<T, TResult>;
+    /**
+    * Reduces a collection to a value which is the accumulated result of running each
+    * element in the collection through the callback, where each successive callback execution
+    * consumes the return value of the previous execution. If accumulator is not provided the
+    * first element of the collection will be used as the initial accumulator value. The callback
+    * is bound to thisArg and invoked with four arguments; (accumulator, value, index|key, collection).
+    * @param collection The collection to iterate over.
+    * @param callback The function called per iteration.
+    * @param accumulator Initial value of the accumulator.
+    * @return Returns the accumulated value.
+    **/
+    (collection: T[] | _.List<T> | null | undefined): TResult;
+}
+interface Reduce3x1<T extends object, TResult> {
+    /**
+    * Reduces a collection to a value which is the accumulated result of running each
+    * element in the collection through the callback, where each successive callback execution
+    * consumes the return value of the previous execution. If accumulator is not provided the
+    * first element of the collection will be used as the initial accumulator value. The callback
+    * is bound to thisArg and invoked with four arguments; (accumulator, value, index|key, collection).
+    * @param collection The collection to iterate over.
+    * @param callback The function called per iteration.
+    * @param accumulator Initial value of the accumulator.
+    * @return Returns the accumulated value.
+    **/
+    (): Reduce3x1<T, TResult>;
+    /**
+    * Reduces a collection to a value which is the accumulated result of running each
+    * element in the collection through the callback, where each successive callback execution
+    * consumes the return value of the previous execution. If accumulator is not provided the
+    * first element of the collection will be used as the initial accumulator value. The callback
+    * is bound to thisArg and invoked with four arguments; (accumulator, value, index|key, collection).
+    * @param collection The collection to iterate over.
+    * @param callback The function called per iteration.
+    * @param accumulator Initial value of the accumulator.
+    * @return Returns the accumulated value.
+    **/
+    (accumulator: TResult): Reduce3x2<T, TResult>;
+    /**
+    * Reduces a collection to a value which is the accumulated result of running each
+    * element in the collection through the callback, where each successive callback execution
+    * consumes the return value of the previous execution. If accumulator is not provided the
+    * first element of the collection will be used as the initial accumulator value. The callback
+    * is bound to thisArg and invoked with four arguments; (accumulator, value, index|key, collection).
+    * @param collection The collection to iterate over.
+    * @param callback The function called per iteration.
+    * @param accumulator Initial value of the accumulator.
+    * @return Returns the accumulated value.
+    **/
+    (accumulator: TResult, collection: T | null | undefined): TResult;
+}
+interface Reduce3x2<T extends object, TResult> {
+    /**
+    * Reduces a collection to a value which is the accumulated result of running each
+    * element in the collection through the callback, where each successive callback execution
+    * consumes the return value of the previous execution. If accumulator is not provided the
+    * first element of the collection will be used as the initial accumulator value. The callback
+    * is bound to thisArg and invoked with four arguments; (accumulator, value, index|key, collection).
+    * @param collection The collection to iterate over.
+    * @param callback The function called per iteration.
+    * @param accumulator Initial value of the accumulator.
+    * @return Returns the accumulated value.
+    **/
+    (): Reduce3x2<T, TResult>;
+    /**
+    * Reduces a collection to a value which is the accumulated result of running each
+    * element in the collection through the callback, where each successive callback execution
+    * consumes the return value of the previous execution. If accumulator is not provided the
+    * first element of the collection will be used as the initial accumulator value. The callback
+    * is bound to thisArg and invoked with four arguments; (accumulator, value, index|key, collection).
+    * @param collection The collection to iterate over.
+    * @param callback The function called per iteration.
+    * @param accumulator Initial value of the accumulator.
+    * @return Returns the accumulated value.
+    **/
+    (collection: T | null | undefined): TResult;
+}
+
+declare const reduce: Reduce;
+export = reduce;
diff --git a/types/lodash/fp/reduceRight.d.ts b/types/lodash/fp/reduceRight.d.ts
new file mode 100644
index 0000000000..0c8813aa01
--- /dev/null
+++ b/types/lodash/fp/reduceRight.d.ts
@@ -0,0 +1,172 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface ReduceRight {
+    /**
+    * This method is like _.reduce except that it iterates over elements of a collection from
+    * right to left.
+    * @param collection The collection to iterate over.
+    * @param callback The function called per iteration.
+    * @param accumulator Initial value of the accumulator.
+    * @return The accumulated value.
+    **/
+    (): ReduceRight;
+    /**
+    * This method is like _.reduce except that it iterates over elements of a collection from
+    * right to left.
+    * @param collection The collection to iterate over.
+    * @param callback The function called per iteration.
+    * @param accumulator Initial value of the accumulator.
+    * @return The accumulated value.
+    **/
+    <T, TResult>(callback: _.MemoIteratorCappedRight<T, TResult>): ReduceRight1x1<T, TResult>;
+    /**
+    * This method is like _.reduce except that it iterates over elements of a collection from
+    * right to left.
+    * @param collection The collection to iterate over.
+    * @param callback The function called per iteration.
+    * @param accumulator Initial value of the accumulator.
+    * @return The accumulated value.
+    **/
+    <T, TResult>(callback: _.MemoIteratorCappedRight<T, TResult>, accumulator: TResult): ReduceRight1x2<T, TResult>;
+    /**
+    * This method is like _.reduce except that it iterates over elements of a collection from
+    * right to left.
+    * @param collection The collection to iterate over.
+    * @param callback The function called per iteration.
+    * @param accumulator Initial value of the accumulator.
+    * @return The accumulated value.
+    **/
+    <T, TResult>(callback: _.MemoIteratorCappedRight<T, TResult>, accumulator: TResult, collection: T[] | _.List<T> | null | undefined): TResult;
+    /**
+    * This method is like _.reduce except that it iterates over elements of a collection from
+    * right to left.
+    * @param collection The collection to iterate over.
+    * @param callback The function called per iteration.
+    * @param accumulator Initial value of the accumulator.
+    * @return The accumulated value.
+    **/
+    <T extends object, TResult>(callback: _.MemoIteratorCappedRight<T[keyof T], TResult>): ReduceRight3x1<T, TResult>;
+    /**
+    * This method is like _.reduce except that it iterates over elements of a collection from
+    * right to left.
+    * @param collection The collection to iterate over.
+    * @param callback The function called per iteration.
+    * @param accumulator Initial value of the accumulator.
+    * @return The accumulated value.
+    **/
+    <T extends object, TResult>(callback: _.MemoIteratorCappedRight<T[keyof T], TResult>, accumulator: TResult): ReduceRight3x2<T, TResult>;
+    /**
+    * This method is like _.reduce except that it iterates over elements of a collection from
+    * right to left.
+    * @param collection The collection to iterate over.
+    * @param callback The function called per iteration.
+    * @param accumulator Initial value of the accumulator.
+    * @return The accumulated value.
+    **/
+    <T extends object, TResult>(callback: _.MemoIteratorCappedRight<T[keyof T], TResult>, accumulator: TResult, collection: T | null | undefined): TResult;
+}
+interface ReduceRight1x1<T, TResult> {
+    /**
+    * This method is like _.reduce except that it iterates over elements of a collection from
+    * right to left.
+    * @param collection The collection to iterate over.
+    * @param callback The function called per iteration.
+    * @param accumulator Initial value of the accumulator.
+    * @return The accumulated value.
+    **/
+    (): ReduceRight1x1<T, TResult>;
+    /**
+    * This method is like _.reduce except that it iterates over elements of a collection from
+    * right to left.
+    * @param collection The collection to iterate over.
+    * @param callback The function called per iteration.
+    * @param accumulator Initial value of the accumulator.
+    * @return The accumulated value.
+    **/
+    (accumulator: TResult): ReduceRight1x2<T, TResult>;
+    /**
+    * This method is like _.reduce except that it iterates over elements of a collection from
+    * right to left.
+    * @param collection The collection to iterate over.
+    * @param callback The function called per iteration.
+    * @param accumulator Initial value of the accumulator.
+    * @return The accumulated value.
+    **/
+    (accumulator: TResult, collection: T[] | _.List<T> | null | undefined): TResult;
+}
+interface ReduceRight1x2<T, TResult> {
+    /**
+    * This method is like _.reduce except that it iterates over elements of a collection from
+    * right to left.
+    * @param collection The collection to iterate over.
+    * @param callback The function called per iteration.
+    * @param accumulator Initial value of the accumulator.
+    * @return The accumulated value.
+    **/
+    (): ReduceRight1x2<T, TResult>;
+    /**
+    * This method is like _.reduce except that it iterates over elements of a collection from
+    * right to left.
+    * @param collection The collection to iterate over.
+    * @param callback The function called per iteration.
+    * @param accumulator Initial value of the accumulator.
+    * @return The accumulated value.
+    **/
+    (collection: T[] | _.List<T> | null | undefined): TResult;
+}
+interface ReduceRight3x1<T extends object, TResult> {
+    /**
+    * This method is like _.reduce except that it iterates over elements of a collection from
+    * right to left.
+    * @param collection The collection to iterate over.
+    * @param callback The function called per iteration.
+    * @param accumulator Initial value of the accumulator.
+    * @return The accumulated value.
+    **/
+    (): ReduceRight3x1<T, TResult>;
+    /**
+    * This method is like _.reduce except that it iterates over elements of a collection from
+    * right to left.
+    * @param collection The collection to iterate over.
+    * @param callback The function called per iteration.
+    * @param accumulator Initial value of the accumulator.
+    * @return The accumulated value.
+    **/
+    (accumulator: TResult): ReduceRight3x2<T, TResult>;
+    /**
+    * This method is like _.reduce except that it iterates over elements of a collection from
+    * right to left.
+    * @param collection The collection to iterate over.
+    * @param callback The function called per iteration.
+    * @param accumulator Initial value of the accumulator.
+    * @return The accumulated value.
+    **/
+    (accumulator: TResult, collection: T | null | undefined): TResult;
+}
+interface ReduceRight3x2<T extends object, TResult> {
+    /**
+    * This method is like _.reduce except that it iterates over elements of a collection from
+    * right to left.
+    * @param collection The collection to iterate over.
+    * @param callback The function called per iteration.
+    * @param accumulator Initial value of the accumulator.
+    * @return The accumulated value.
+    **/
+    (): ReduceRight3x2<T, TResult>;
+    /**
+    * This method is like _.reduce except that it iterates over elements of a collection from
+    * right to left.
+    * @param collection The collection to iterate over.
+    * @param callback The function called per iteration.
+    * @param accumulator Initial value of the accumulator.
+    * @return The accumulated value.
+    **/
+    (collection: T | null | undefined): TResult;
+}
+
+declare const reduceRight: ReduceRight;
+export = reduceRight;
diff --git a/types/lodash/fp/reject.d.ts b/types/lodash/fp/reject.d.ts
new file mode 100644
index 0000000000..74a93c3783
--- /dev/null
+++ b/types/lodash/fp/reject.d.ts
@@ -0,0 +1,115 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Reject {
+    /**
+     * The opposite of _.filter; this method returns the elements of collection that predicate does not return
+     * truthy for.
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the new filtered array.
+     */
+    (): Reject;
+    /**
+     * The opposite of _.filter; this method returns the elements of collection that predicate does not return
+     * truthy for.
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the new filtered array.
+     */
+    (predicate: (value: string) => boolean): Reject1x1;
+    /**
+     * The opposite of _.filter; this method returns the elements of collection that predicate does not return
+     * truthy for.
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the new filtered array.
+     */
+    (predicate: (value: string) => boolean, collection: string | null | undefined): string[];
+    /**
+     * The opposite of _.filter; this method returns the elements of collection that predicate does not return
+     * truthy for.
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the new filtered array.
+     */
+    <T>(predicate: _.ValueIterateeCustom<T, boolean>): Reject2x1<T>;
+    /**
+     * The opposite of _.filter; this method returns the elements of collection that predicate does not return
+     * truthy for.
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the new filtered array.
+     */
+    <T>(predicate: _.ValueIterateeCustom<T, boolean>, collection: _.List<T> | null | undefined): T[];
+    /**
+     * The opposite of _.filter; this method returns the elements of collection that predicate does not return
+     * truthy for.
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the new filtered array.
+     */
+    <T extends object>(predicate: _.ValueIterateeCustom<T[keyof T], boolean>, collection: T | null | undefined): Array<T[keyof T]>;
+}
+interface Reject1x1 {
+    /**
+     * The opposite of _.filter; this method returns the elements of collection that predicate does not return
+     * truthy for.
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the new filtered array.
+     */
+    (): Reject1x1;
+    /**
+     * The opposite of _.filter; this method returns the elements of collection that predicate does not return
+     * truthy for.
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the new filtered array.
+     */
+    (collection: string | null | undefined): string[];
+}
+interface Reject2x1<T> {
+    /**
+     * The opposite of _.filter; this method returns the elements of collection that predicate does not return
+     * truthy for.
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the new filtered array.
+     */
+    (): Reject2x1<T>;
+    /**
+     * The opposite of _.filter; this method returns the elements of collection that predicate does not return
+     * truthy for.
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the new filtered array.
+     */
+    (collection: _.List<T> | object | null | undefined): T[];
+}
+
+declare const reject: Reject;
+export = reject;
diff --git a/types/lodash/fp/remove.d.ts b/types/lodash/fp/remove.d.ts
new file mode 100644
index 0000000000..51ac8aecf8
--- /dev/null
+++ b/types/lodash/fp/remove.d.ts
@@ -0,0 +1,118 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Remove {
+    /**
+     * Removes all elements from array that predicate returns truthy for and returns an array of the removed
+     * elements. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * Note: Unlike _.filter, this method mutates array.
+     *
+     * @param array The array to modify.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the new array of removed elements.
+     */
+    (): Remove;
+    /**
+     * Removes all elements from array that predicate returns truthy for and returns an array of the removed
+     * elements. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * Note: Unlike _.filter, this method mutates array.
+     *
+     * @param array The array to modify.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the new array of removed elements.
+     */
+    <T>(predicate: _.ValueIteratee<T>): Remove1x1<T>;
+    /**
+     * Removes all elements from array that predicate returns truthy for and returns an array of the removed
+     * elements. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * Note: Unlike _.filter, this method mutates array.
+     *
+     * @param array The array to modify.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the new array of removed elements.
+     */
+    <T>(predicate: _.ValueIteratee<T>, array: _.List<T>): T[];
+}
+interface Remove1x1<T> {
+    /**
+     * Removes all elements from array that predicate returns truthy for and returns an array of the removed
+     * elements. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * Note: Unlike _.filter, this method mutates array.
+     *
+     * @param array The array to modify.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the new array of removed elements.
+     */
+    (): Remove1x1<T>;
+    /**
+     * Removes all elements from array that predicate returns truthy for and returns an array of the removed
+     * elements. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * Note: Unlike _.filter, this method mutates array.
+     *
+     * @param array The array to modify.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the new array of removed elements.
+     */
+    (array: _.List<T>): T[];
+}
+
+declare const remove: Remove;
+export = remove;
diff --git a/types/lodash/fp/repeat.d.ts b/types/lodash/fp/repeat.d.ts
new file mode 100644
index 0000000000..4ba7cd4e17
--- /dev/null
+++ b/types/lodash/fp/repeat.d.ts
@@ -0,0 +1,51 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface Repeat {
+    /**
+     * Repeats the given string n times.
+     *
+     * @param string The string to repeat.
+     * @param n The number of times to repeat the string.
+     * @return Returns the repeated string.
+     */
+    (): Repeat;
+    /**
+     * Repeats the given string n times.
+     *
+     * @param string The string to repeat.
+     * @param n The number of times to repeat the string.
+     * @return Returns the repeated string.
+     */
+    (n: number): Repeat1x1;
+    /**
+     * Repeats the given string n times.
+     *
+     * @param string The string to repeat.
+     * @param n The number of times to repeat the string.
+     * @return Returns the repeated string.
+     */
+    (n: number, string: string): string;
+}
+interface Repeat1x1 {
+    /**
+     * Repeats the given string n times.
+     *
+     * @param string The string to repeat.
+     * @param n The number of times to repeat the string.
+     * @return Returns the repeated string.
+     */
+    (): Repeat1x1;
+    /**
+     * Repeats the given string n times.
+     *
+     * @param string The string to repeat.
+     * @param n The number of times to repeat the string.
+     * @return Returns the repeated string.
+     */
+    (string: string): string;
+}
+
+declare const repeat: Repeat;
+export = repeat;
diff --git a/types/lodash/fp/replace.d.ts b/types/lodash/fp/replace.d.ts
new file mode 100644
index 0000000000..18e76a4388
--- /dev/null
+++ b/types/lodash/fp/replace.d.ts
@@ -0,0 +1,87 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Replace {
+    /**
+     * Replaces matches for pattern in string with replacement.
+     *
+     * Note: This method is based on String#replace.
+     *
+     * @return Returns the modified string.
+     */
+    (): Replace;
+    /**
+     * Replaces matches for pattern in string with replacement.
+     *
+     * Note: This method is based on String#replace.
+     *
+     * @return Returns the modified string.
+     */
+    (pattern: RegExp | string): Replace1x1;
+    /**
+     * Replaces matches for pattern in string with replacement.
+     *
+     * Note: This method is based on String#replace.
+     *
+     * @return Returns the modified string.
+     */
+    (pattern: RegExp | string, replacement: _.ReplaceFunction | string): Replace1x2;
+    /**
+     * Replaces matches for pattern in string with replacement.
+     *
+     * Note: This method is based on String#replace.
+     *
+     * @return Returns the modified string.
+     */
+    (pattern: RegExp | string, replacement: _.ReplaceFunction | string, string: string): string;
+}
+interface Replace1x1 {
+    /**
+     * Replaces matches for pattern in string with replacement.
+     *
+     * Note: This method is based on String#replace.
+     *
+     * @return Returns the modified string.
+     */
+    (): Replace1x1;
+    /**
+     * Replaces matches for pattern in string with replacement.
+     *
+     * Note: This method is based on String#replace.
+     *
+     * @return Returns the modified string.
+     */
+    (replacement: _.ReplaceFunction | string): Replace1x2;
+    /**
+     * Replaces matches for pattern in string with replacement.
+     *
+     * Note: This method is based on String#replace.
+     *
+     * @return Returns the modified string.
+     */
+    (replacement: _.ReplaceFunction | string, string: string): string;
+}
+interface Replace1x2 {
+    /**
+     * Replaces matches for pattern in string with replacement.
+     *
+     * Note: This method is based on String#replace.
+     *
+     * @return Returns the modified string.
+     */
+    (): Replace1x2;
+    /**
+     * Replaces matches for pattern in string with replacement.
+     *
+     * Note: This method is based on String#replace.
+     *
+     * @return Returns the modified string.
+     */
+    (string: string): string;
+}
+
+declare const replace: Replace;
+export = replace;
diff --git a/types/lodash/fp/rest.d.ts b/types/lodash/fp/rest.d.ts
new file mode 100644
index 0000000000..b92f5adb85
--- /dev/null
+++ b/types/lodash/fp/rest.d.ts
@@ -0,0 +1,19 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type Rest =
+    /**
+     * Creates a function that invokes func with the this binding of the created function and arguments from start
+     * and beyond provided as an array.
+     *
+     * Note: This method is based on the rest parameter.
+     *
+     * @param func The function to apply a rest parameter to.
+     * @param start The start position of the rest parameter.
+     * @return Returns the new function.
+     */
+    (func: (...args: any[]) => any) => (...args: any[]) => any;
+
+declare const rest: Rest;
+export = rest;
diff --git a/types/lodash/fp/restFrom.d.ts b/types/lodash/fp/restFrom.d.ts
new file mode 100644
index 0000000000..3ca5389f0e
--- /dev/null
+++ b/types/lodash/fp/restFrom.d.ts
@@ -0,0 +1,66 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface Rest {
+    /**
+     * Creates a function that invokes func with the this binding of the created function and arguments from start
+     * and beyond provided as an array.
+     *
+     * Note: This method is based on the rest parameter.
+     *
+     * @param func The function to apply a rest parameter to.
+     * @param start The start position of the rest parameter.
+     * @return Returns the new function.
+     */
+    (): Rest;
+    /**
+     * Creates a function that invokes func with the this binding of the created function and arguments from start
+     * and beyond provided as an array.
+     *
+     * Note: This method is based on the rest parameter.
+     *
+     * @param func The function to apply a rest parameter to.
+     * @param start The start position of the rest parameter.
+     * @return Returns the new function.
+     */
+    (start: number): Rest1x1;
+    /**
+     * Creates a function that invokes func with the this binding of the created function and arguments from start
+     * and beyond provided as an array.
+     *
+     * Note: This method is based on the rest parameter.
+     *
+     * @param func The function to apply a rest parameter to.
+     * @param start The start position of the rest parameter.
+     * @return Returns the new function.
+     */
+    (start: number, func: (...args: any[]) => any): (...args: any[]) => any;
+}
+interface Rest1x1 {
+    /**
+     * Creates a function that invokes func with the this binding of the created function and arguments from start
+     * and beyond provided as an array.
+     *
+     * Note: This method is based on the rest parameter.
+     *
+     * @param func The function to apply a rest parameter to.
+     * @param start The start position of the rest parameter.
+     * @return Returns the new function.
+     */
+    (): Rest1x1;
+    /**
+     * Creates a function that invokes func with the this binding of the created function and arguments from start
+     * and beyond provided as an array.
+     *
+     * Note: This method is based on the rest parameter.
+     *
+     * @param func The function to apply a rest parameter to.
+     * @param start The start position of the rest parameter.
+     * @return Returns the new function.
+     */
+    (func: (...args: any[]) => any): (...args: any[]) => any;
+}
+
+declare const restFrom: Rest;
+export = restFrom;
diff --git a/types/lodash/fp/result.d.ts b/types/lodash/fp/result.d.ts
new file mode 100644
index 0000000000..de99d91ff9
--- /dev/null
+++ b/types/lodash/fp/result.d.ts
@@ -0,0 +1,63 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Result {
+    /**
+     * This method is like _.get except that if the resolved value is a function it’s invoked with the this binding
+     * of its parent object and its result is returned.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to resolve.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (): Result;
+    /**
+     * This method is like _.get except that if the resolved value is a function it’s invoked with the this binding
+     * of its parent object and its result is returned.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to resolve.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (path: _.PropertyPath): Result1x1;
+    /**
+     * This method is like _.get except that if the resolved value is a function it’s invoked with the this binding
+     * of its parent object and its result is returned.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to resolve.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <TResult>(path: _.PropertyPath, object: any): TResult;
+}
+interface Result1x1 {
+    /**
+     * This method is like _.get except that if the resolved value is a function it’s invoked with the this binding
+     * of its parent object and its result is returned.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to resolve.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    (): Result1x1;
+    /**
+     * This method is like _.get except that if the resolved value is a function it’s invoked with the this binding
+     * of its parent object and its result is returned.
+     *
+     * @param object The object to query.
+     * @param path The path of the property to resolve.
+     * @param defaultValue The value returned if the resolved value is undefined.
+     * @return Returns the resolved value.
+     */
+    <TResult>(object: any): TResult;
+}
+
+declare const result: Result;
+export = result;
diff --git a/types/lodash/fp/reverse.d.ts b/types/lodash/fp/reverse.d.ts
new file mode 100644
index 0000000000..5aa826c5eb
--- /dev/null
+++ b/types/lodash/fp/reverse.d.ts
@@ -0,0 +1,30 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+type Reverse =
+    /**
+     * Reverses `array` so that the first element becomes the last, the second
+     * element becomes the second to last, and so on.
+     *
+     * **Note:** This method mutates `array` and is based on
+     * [`Array#reverse`](https://mdn.io/Array/reverse).
+     *
+     * @category Array
+     * @returns Returns `array`.
+     * @example
+     *
+     * var array = [1, 2, 3];
+     *
+     * _.reverse(array);
+     * // => [3, 2, 1]
+     *
+     * console.log(array);
+     * // => [3, 2, 1]
+     */
+    <TList extends _.List<any>>(array: TList) => TList;
+
+declare const reverse: Reverse;
+export = reverse;
diff --git a/types/lodash/fp/round.d.ts b/types/lodash/fp/round.d.ts
new file mode 100644
index 0000000000..359693f99e
--- /dev/null
+++ b/types/lodash/fp/round.d.ts
@@ -0,0 +1,16 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type Round =
+    /**
+     * Calculates n rounded to precision.
+     *
+     * @param n The number to round.
+     * @param precision The precision to round to.
+     * @return Returns the rounded number.
+     */
+    (n: number) => number;
+
+declare const round: Round;
+export = round;
diff --git a/types/lodash/fp/runInContext.d.ts b/types/lodash/fp/runInContext.d.ts
new file mode 100644
index 0000000000..a09369abec
--- /dev/null
+++ b/types/lodash/fp/runInContext.d.ts
@@ -0,0 +1,17 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+type RunInContext =
+    /**
+     * Create a new pristine lodash function using the given context object.
+     *
+     * @param context The context object.
+     * @return Returns a new lodash function.
+     */
+    (context: object) => typeof _;
+
+declare const runInContext: RunInContext;
+export = runInContext;
diff --git a/types/lodash/fp/sample.d.ts b/types/lodash/fp/sample.d.ts
new file mode 100644
index 0000000000..3ba7c5b6e2
--- /dev/null
+++ b/types/lodash/fp/sample.d.ts
@@ -0,0 +1,25 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Sample {
+    /**
+     * Gets a random element from collection.
+     *
+     * @param collection The collection to sample.
+     * @return Returns the random element.
+     */
+    <T>(collection: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): T | undefined;
+    /**
+     * Gets a random element from collection.
+     *
+     * @param collection The collection to sample.
+     * @return Returns the random element.
+     */
+    <T extends object>(collection: T | null | undefined): T[keyof T] | undefined;
+}
+
+declare const sample: Sample;
+export = sample;
diff --git a/types/lodash/fp/sampleSize.d.ts b/types/lodash/fp/sampleSize.d.ts
new file mode 100644
index 0000000000..17ec045353
--- /dev/null
+++ b/types/lodash/fp/sampleSize.d.ts
@@ -0,0 +1,69 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface SampleSize {
+    /**
+     * Gets n random elements at unique keys from collection up to the size of collection.
+     *
+     * @param collection The collection to sample.
+     * @param n The number of elements to sample.
+     * @return Returns the random elements.
+     */
+    (): SampleSize;
+    /**
+     * Gets n random elements at unique keys from collection up to the size of collection.
+     *
+     * @param collection The collection to sample.
+     * @param n The number of elements to sample.
+     * @return Returns the random elements.
+     */
+    (n: number): SampleSize1x1;
+    /**
+     * Gets n random elements at unique keys from collection up to the size of collection.
+     *
+     * @param collection The collection to sample.
+     * @param n The number of elements to sample.
+     * @return Returns the random elements.
+     */
+    <T>(n: number, collection: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): T[];
+    /**
+     * Gets n random elements at unique keys from collection up to the size of collection.
+     *
+     * @param collection The collection to sample.
+     * @param n The number of elements to sample.
+     * @return Returns the random elements.
+     */
+    <T extends object>(n: number, collection: T | null | undefined): Array<T[keyof T]>;
+}
+interface SampleSize1x1 {
+    /**
+     * Gets n random elements at unique keys from collection up to the size of collection.
+     *
+     * @param collection The collection to sample.
+     * @param n The number of elements to sample.
+     * @return Returns the random elements.
+     */
+    (): SampleSize1x1;
+    /**
+     * Gets n random elements at unique keys from collection up to the size of collection.
+     *
+     * @param collection The collection to sample.
+     * @param n The number of elements to sample.
+     * @return Returns the random elements.
+     */
+    <T>(collection: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): T[];
+    /**
+     * Gets n random elements at unique keys from collection up to the size of collection.
+     *
+     * @param collection The collection to sample.
+     * @param n The number of elements to sample.
+     * @return Returns the random elements.
+     */
+    <T extends object>(collection: T | null | undefined): Array<T[keyof T]>;
+}
+
+declare const sampleSize: SampleSize;
+export = sampleSize;
diff --git a/types/lodash/fp/set.d.ts b/types/lodash/fp/set.d.ts
new file mode 100644
index 0000000000..ea13605dcc
--- /dev/null
+++ b/types/lodash/fp/set.d.ts
@@ -0,0 +1,147 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Set {
+    /**
+     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
+     * missing index properties while objects are created for all other missing properties. Use _.setWith to
+     * customize path creation.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @return Returns object.
+     */
+    (): Set;
+    /**
+     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
+     * missing index properties while objects are created for all other missing properties. Use _.setWith to
+     * customize path creation.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @return Returns object.
+     */
+    (path: _.PropertyPath): Set1x1;
+    /**
+     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
+     * missing index properties while objects are created for all other missing properties. Use _.setWith to
+     * customize path creation.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @return Returns object.
+     */
+    (path: _.PropertyPath, value: any): Set1x2;
+    /**
+     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
+     * missing index properties while objects are created for all other missing properties. Use _.setWith to
+     * customize path creation.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @return Returns object.
+     */
+    <T extends object>(path: _.PropertyPath, value: any, object: T): T;
+    /**
+     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
+     * missing index properties while objects are created for all other missing properties. Use _.setWith to
+     * customize path creation.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @return Returns object.
+     */
+    <TResult>(path: _.PropertyPath, value: any, object: object): TResult;
+}
+interface Set1x1 {
+    /**
+     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
+     * missing index properties while objects are created for all other missing properties. Use _.setWith to
+     * customize path creation.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @return Returns object.
+     */
+    (): Set1x1;
+    /**
+     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
+     * missing index properties while objects are created for all other missing properties. Use _.setWith to
+     * customize path creation.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @return Returns object.
+     */
+    (value: any): Set1x2;
+    /**
+     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
+     * missing index properties while objects are created for all other missing properties. Use _.setWith to
+     * customize path creation.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @return Returns object.
+     */
+    <T extends object>(value: any, object: T): T;
+    /**
+     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
+     * missing index properties while objects are created for all other missing properties. Use _.setWith to
+     * customize path creation.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @return Returns object.
+     */
+    <TResult>(value: any, object: object): TResult;
+}
+interface Set1x2 {
+    /**
+     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
+     * missing index properties while objects are created for all other missing properties. Use _.setWith to
+     * customize path creation.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @return Returns object.
+     */
+    (): Set1x2;
+    /**
+     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
+     * missing index properties while objects are created for all other missing properties. Use _.setWith to
+     * customize path creation.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @return Returns object.
+     */
+    <T extends object>(object: T): T;
+    /**
+     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
+     * missing index properties while objects are created for all other missing properties. Use _.setWith to
+     * customize path creation.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @return Returns object.
+     */
+    <TResult>(object: object): TResult;
+}
+
+declare const set: Set;
+export = set;
diff --git a/types/lodash/fp/setWith.d.ts b/types/lodash/fp/setWith.d.ts
new file mode 100644
index 0000000000..d26b1a88a1
--- /dev/null
+++ b/types/lodash/fp/setWith.d.ts
@@ -0,0 +1,233 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface SetWith {
+    /**
+     * This method is like _.set except that it accepts customizer which is invoked to produce the objects of
+     * path. If customizer returns undefined path creation is handled by the method instead. The customizer is
+     * invoked with three arguments: (nsValue, key, nsObject).
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @parem customizer The function to customize assigned values.
+     * @return Returns object.
+     */
+    (): SetWith;
+    /**
+     * This method is like _.set except that it accepts customizer which is invoked to produce the objects of
+     * path. If customizer returns undefined path creation is handled by the method instead. The customizer is
+     * invoked with three arguments: (nsValue, key, nsObject).
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @parem customizer The function to customize assigned values.
+     * @return Returns object.
+     */
+    <T extends object>(customizer: _.SetWithCustomizer<T>): SetWith1x1<T>;
+    /**
+     * This method is like _.set except that it accepts customizer which is invoked to produce the objects of
+     * path. If customizer returns undefined path creation is handled by the method instead. The customizer is
+     * invoked with three arguments: (nsValue, key, nsObject).
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @parem customizer The function to customize assigned values.
+     * @return Returns object.
+     */
+    <T extends object>(customizer: _.SetWithCustomizer<T>, path: _.PropertyPath): SetWith1x2<T>;
+    /**
+     * This method is like _.set except that it accepts customizer which is invoked to produce the objects of
+     * path. If customizer returns undefined path creation is handled by the method instead. The customizer is
+     * invoked with three arguments: (nsValue, key, nsObject).
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @parem customizer The function to customize assigned values.
+     * @return Returns object.
+     */
+    <T extends object>(customizer: _.SetWithCustomizer<T>, path: _.PropertyPath, value: any): SetWith1x3<T>;
+    /**
+     * This method is like _.set except that it accepts customizer which is invoked to produce the objects of
+     * path. If customizer returns undefined path creation is handled by the method instead. The customizer is
+     * invoked with three arguments: (nsValue, key, nsObject).
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @parem customizer The function to customize assigned values.
+     * @return Returns object.
+     */
+    <T extends object>(customizer: _.SetWithCustomizer<T>, path: _.PropertyPath, value: any, object: T): T;
+    /**
+     * This method is like _.set except that it accepts customizer which is invoked to produce the objects of
+     * path. If customizer returns undefined path creation is handled by the method instead. The customizer is
+     * invoked with three arguments: (nsValue, key, nsObject).
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @parem customizer The function to customize assigned values.
+     * @return Returns object.
+     */
+    <T extends object, TResult>(customizer: _.SetWithCustomizer<T>, path: _.PropertyPath, value: any, object: T): TResult;
+}
+interface SetWith1x1<T extends object> {
+    /**
+     * This method is like _.set except that it accepts customizer which is invoked to produce the objects of
+     * path. If customizer returns undefined path creation is handled by the method instead. The customizer is
+     * invoked with three arguments: (nsValue, key, nsObject).
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @parem customizer The function to customize assigned values.
+     * @return Returns object.
+     */
+    (): SetWith1x1<T>;
+    /**
+     * This method is like _.set except that it accepts customizer which is invoked to produce the objects of
+     * path. If customizer returns undefined path creation is handled by the method instead. The customizer is
+     * invoked with three arguments: (nsValue, key, nsObject).
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @parem customizer The function to customize assigned values.
+     * @return Returns object.
+     */
+    (path: _.PropertyPath): SetWith1x2<T>;
+    /**
+     * This method is like _.set except that it accepts customizer which is invoked to produce the objects of
+     * path. If customizer returns undefined path creation is handled by the method instead. The customizer is
+     * invoked with three arguments: (nsValue, key, nsObject).
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @parem customizer The function to customize assigned values.
+     * @return Returns object.
+     */
+    (path: _.PropertyPath, value: any): SetWith1x3<T>;
+    /**
+     * This method is like _.set except that it accepts customizer which is invoked to produce the objects of
+     * path. If customizer returns undefined path creation is handled by the method instead. The customizer is
+     * invoked with three arguments: (nsValue, key, nsObject).
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @parem customizer The function to customize assigned values.
+     * @return Returns object.
+     */
+    (path: _.PropertyPath, value: any, object: T): T;
+    /**
+     * This method is like _.set except that it accepts customizer which is invoked to produce the objects of
+     * path. If customizer returns undefined path creation is handled by the method instead. The customizer is
+     * invoked with three arguments: (nsValue, key, nsObject).
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @parem customizer The function to customize assigned values.
+     * @return Returns object.
+     */
+    <TResult>(path: _.PropertyPath, value: any, object: T): TResult;
+}
+interface SetWith1x2<T extends object> {
+    /**
+     * This method is like _.set except that it accepts customizer which is invoked to produce the objects of
+     * path. If customizer returns undefined path creation is handled by the method instead. The customizer is
+     * invoked with three arguments: (nsValue, key, nsObject).
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @parem customizer The function to customize assigned values.
+     * @return Returns object.
+     */
+    (): SetWith1x2<T>;
+    /**
+     * This method is like _.set except that it accepts customizer which is invoked to produce the objects of
+     * path. If customizer returns undefined path creation is handled by the method instead. The customizer is
+     * invoked with three arguments: (nsValue, key, nsObject).
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @parem customizer The function to customize assigned values.
+     * @return Returns object.
+     */
+    (value: any): SetWith1x3<T>;
+    /**
+     * This method is like _.set except that it accepts customizer which is invoked to produce the objects of
+     * path. If customizer returns undefined path creation is handled by the method instead. The customizer is
+     * invoked with three arguments: (nsValue, key, nsObject).
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @parem customizer The function to customize assigned values.
+     * @return Returns object.
+     */
+    (value: any, object: T): T;
+    /**
+     * This method is like _.set except that it accepts customizer which is invoked to produce the objects of
+     * path. If customizer returns undefined path creation is handled by the method instead. The customizer is
+     * invoked with three arguments: (nsValue, key, nsObject).
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @parem customizer The function to customize assigned values.
+     * @return Returns object.
+     */
+    <TResult>(value: any, object: T): TResult;
+}
+interface SetWith1x3<T extends object> {
+    /**
+     * This method is like _.set except that it accepts customizer which is invoked to produce the objects of
+     * path. If customizer returns undefined path creation is handled by the method instead. The customizer is
+     * invoked with three arguments: (nsValue, key, nsObject).
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @parem customizer The function to customize assigned values.
+     * @return Returns object.
+     */
+    (): SetWith1x3<T>;
+    /**
+     * This method is like _.set except that it accepts customizer which is invoked to produce the objects of
+     * path. If customizer returns undefined path creation is handled by the method instead. The customizer is
+     * invoked with three arguments: (nsValue, key, nsObject).
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @parem customizer The function to customize assigned values.
+     * @return Returns object.
+     */
+    (object: T): T;
+    /**
+     * This method is like _.set except that it accepts customizer which is invoked to produce the objects of
+     * path. If customizer returns undefined path creation is handled by the method instead. The customizer is
+     * invoked with three arguments: (nsValue, key, nsObject).
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param value The value to set.
+     * @parem customizer The function to customize assigned values.
+     * @return Returns object.
+     */
+    <TResult>(object: T): TResult;
+}
+
+declare const setWith: SetWith;
+export = setWith;
diff --git a/types/lodash/fp/shuffle.d.ts b/types/lodash/fp/shuffle.d.ts
new file mode 100644
index 0000000000..b49c3d10dc
--- /dev/null
+++ b/types/lodash/fp/shuffle.d.ts
@@ -0,0 +1,25 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Shuffle {
+    /**
+     * Creates an array of shuffled values, using a version of the Fisher-Yates shuffle.
+     *
+     * @param collection The collection to shuffle.
+     * @return Returns the new shuffled array.
+     */
+    <T>(collection: _.List<T> | null | undefined): T[];
+    /**
+     * Creates an array of shuffled values, using a version of the Fisher-Yates shuffle.
+     *
+     * @param collection The collection to shuffle.
+     * @return Returns the new shuffled array.
+     */
+    <T extends object>(collection: T | null | undefined): Array<T[keyof T]>;
+}
+
+declare const shuffle: Shuffle;
+export = shuffle;
diff --git a/types/lodash/fp/size.d.ts b/types/lodash/fp/size.d.ts
new file mode 100644
index 0000000000..cf4ca2d03b
--- /dev/null
+++ b/types/lodash/fp/size.d.ts
@@ -0,0 +1,16 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type Size =
+    /**
+     * Gets the size of collection by returning its length for array-like values or the number of own enumerable
+     * properties for objects.
+     *
+     * @param collection The collection to inspect.
+     * @return Returns the size of collection.
+     */
+    (collection: object | string | null | undefined) => number;
+
+declare const size: Size;
+export = size;
diff --git a/types/lodash/fp/slice.d.ts b/types/lodash/fp/slice.d.ts
new file mode 100644
index 0000000000..e602154fa1
--- /dev/null
+++ b/types/lodash/fp/slice.d.ts
@@ -0,0 +1,96 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Slice {
+    /**
+     * Creates a slice of array from start up to, but not including, end.
+     *
+     * @param array The array to slice.
+     * @param start The start position.
+     * @param end The end position.
+     * @return Returns the slice of array.
+     */
+    (): Slice;
+    /**
+     * Creates a slice of array from start up to, but not including, end.
+     *
+     * @param array The array to slice.
+     * @param start The start position.
+     * @param end The end position.
+     * @return Returns the slice of array.
+     */
+    (start: number): Slice1x1;
+    /**
+     * Creates a slice of array from start up to, but not including, end.
+     *
+     * @param array The array to slice.
+     * @param start The start position.
+     * @param end The end position.
+     * @return Returns the slice of array.
+     */
+    (start: number, end: number): Slice1x2;
+    /**
+     * Creates a slice of array from start up to, but not including, end.
+     *
+     * @param array The array to slice.
+     * @param start The start position.
+     * @param end The end position.
+     * @return Returns the slice of array.
+     */
+    <T>(start: number, end: number, array: _.List<T> | null | undefined): T[];
+}
+interface Slice1x1 {
+    /**
+     * Creates a slice of array from start up to, but not including, end.
+     *
+     * @param array The array to slice.
+     * @param start The start position.
+     * @param end The end position.
+     * @return Returns the slice of array.
+     */
+    (): Slice1x1;
+    /**
+     * Creates a slice of array from start up to, but not including, end.
+     *
+     * @param array The array to slice.
+     * @param start The start position.
+     * @param end The end position.
+     * @return Returns the slice of array.
+     */
+    (end: number): Slice1x2;
+    /**
+     * Creates a slice of array from start up to, but not including, end.
+     *
+     * @param array The array to slice.
+     * @param start The start position.
+     * @param end The end position.
+     * @return Returns the slice of array.
+     */
+    <T>(end: number, array: _.List<T> | null | undefined): T[];
+}
+interface Slice1x2 {
+    /**
+     * Creates a slice of array from start up to, but not including, end.
+     *
+     * @param array The array to slice.
+     * @param start The start position.
+     * @param end The end position.
+     * @return Returns the slice of array.
+     */
+    (): Slice1x2;
+    /**
+     * Creates a slice of array from start up to, but not including, end.
+     *
+     * @param array The array to slice.
+     * @param start The start position.
+     * @param end The end position.
+     * @return Returns the slice of array.
+     */
+    <T>(array: _.List<T> | null | undefined): T[];
+}
+
+declare const slice: Slice;
+export = slice;
diff --git a/types/lodash/fp/snakeCase.d.ts b/types/lodash/fp/snakeCase.d.ts
new file mode 100644
index 0000000000..ef35bad608
--- /dev/null
+++ b/types/lodash/fp/snakeCase.d.ts
@@ -0,0 +1,15 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type SnakeCase =
+    /**
+     * Converts string to snake case.
+     *
+     * @param string The string to convert.
+     * @return Returns the snake cased string.
+     */
+    (string: string) => string;
+
+declare const snakeCase: SnakeCase;
+export = snakeCase;
diff --git a/types/lodash/fp/some.d.ts b/types/lodash/fp/some.d.ts
new file mode 100644
index 0000000000..f554e380c5
--- /dev/null
+++ b/types/lodash/fp/some.d.ts
@@ -0,0 +1,67 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Some {
+    /**
+     * Checks if predicate returns truthy for any element of collection. Iteration is stopped once predicate
+     * returns truthy. The predicate is invoked with three arguments: (value, index|key, collection).
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @return Returns true if any element passes the predicate check, else false.
+     */
+    (): Some;
+    /**
+     * Checks if predicate returns truthy for any element of collection. Iteration is stopped once predicate
+     * returns truthy. The predicate is invoked with three arguments: (value, index|key, collection).
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @return Returns true if any element passes the predicate check, else false.
+     */
+    <T>(predicate: _.ValueIterateeCustom<T, boolean>): Some1x1<T>;
+    /**
+     * Checks if predicate returns truthy for any element of collection. Iteration is stopped once predicate
+     * returns truthy. The predicate is invoked with three arguments: (value, index|key, collection).
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @return Returns true if any element passes the predicate check, else false.
+     */
+    <T>(predicate: _.ValueIterateeCustom<T, boolean>, collection: _.List<T> | null | undefined): boolean;
+    /**
+     * Checks if predicate returns truthy for any element of collection. Iteration is stopped once predicate
+     * returns truthy. The predicate is invoked with three arguments: (value, index|key, collection).
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @return Returns true if any element passes the predicate check, else false.
+     */
+    <T extends object>(predicate: _.ValueIterateeCustom<T[keyof T], boolean>, collection: T | null | undefined): boolean;
+}
+interface Some1x1<T> {
+    /**
+     * Checks if predicate returns truthy for any element of collection. Iteration is stopped once predicate
+     * returns truthy. The predicate is invoked with three arguments: (value, index|key, collection).
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @return Returns true if any element passes the predicate check, else false.
+     */
+    (): Some1x1<T>;
+    /**
+     * Checks if predicate returns truthy for any element of collection. Iteration is stopped once predicate
+     * returns truthy. The predicate is invoked with three arguments: (value, index|key, collection).
+     *
+     * @param collection The collection to iterate over.
+     * @param predicate The function invoked per iteration.
+     * @return Returns true if any element passes the predicate check, else false.
+     */
+    (collection: _.List<T> | object | null | undefined): boolean;
+}
+
+declare const some: Some;
+export = some;
diff --git a/types/lodash/fp/sortBy.d.ts b/types/lodash/fp/sortBy.d.ts
new file mode 100644
index 0000000000..3b0a1c128c
--- /dev/null
+++ b/types/lodash/fp/sortBy.d.ts
@@ -0,0 +1,205 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface SortBy {
+    /**
+     * Creates an array of elements, sorted in ascending order by the results of
+     * running each element in a collection through each iteratee. This method
+     * performs a stable sort, that is, it preserves the original sort order of
+     * equal elements. The iteratees are invoked with one argument: (value).
+     *
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratees=[_.identity]]
+     *  The iteratees to sort by, specified individually or in arrays.
+     * @returns Returns the new sorted array.
+     * @example
+     *
+     * var users = [
+     *   { 'user': 'fred',   'age': 48 },
+     *   { 'user': 'barney', 'age': 36 },
+     *   { 'user': 'fred',   'age': 42 },
+     *   { 'user': 'barney', 'age': 34 }
+     * ];
+     *
+     * _.sortBy(users, function(o) { return o.user; });
+     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
+     *
+     * _.sortBy(users, ['user', 'age']);
+     * // => objects for [['barney', 34], ['barney', 36], ['fred', 42], ['fred', 48]]
+     *
+     * _.sortBy(users, 'user', function(o) {
+     *   return Math.floor(o.age / 10);
+     * });
+     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
+     */
+    (): SortBy;
+    /**
+     * Creates an array of elements, sorted in ascending order by the results of
+     * running each element in a collection through each iteratee. This method
+     * performs a stable sort, that is, it preserves the original sort order of
+     * equal elements. The iteratees are invoked with one argument: (value).
+     *
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratees=[_.identity]]
+     *  The iteratees to sort by, specified individually or in arrays.
+     * @returns Returns the new sorted array.
+     * @example
+     *
+     * var users = [
+     *   { 'user': 'fred',   'age': 48 },
+     *   { 'user': 'barney', 'age': 36 },
+     *   { 'user': 'fred',   'age': 42 },
+     *   { 'user': 'barney', 'age': 34 }
+     * ];
+     *
+     * _.sortBy(users, function(o) { return o.user; });
+     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
+     *
+     * _.sortBy(users, ['user', 'age']);
+     * // => objects for [['barney', 34], ['barney', 36], ['fred', 42], ['fred', 48]]
+     *
+     * _.sortBy(users, 'user', function(o) {
+     *   return Math.floor(o.age / 10);
+     * });
+     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
+     */
+    <T>(iteratees: _.Many<_.ValueIteratee<T>>): SortBy1x1<T>;
+    /**
+     * Creates an array of elements, sorted in ascending order by the results of
+     * running each element in a collection through each iteratee. This method
+     * performs a stable sort, that is, it preserves the original sort order of
+     * equal elements. The iteratees are invoked with one argument: (value).
+     *
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratees=[_.identity]]
+     *  The iteratees to sort by, specified individually or in arrays.
+     * @returns Returns the new sorted array.
+     * @example
+     *
+     * var users = [
+     *   { 'user': 'fred',   'age': 48 },
+     *   { 'user': 'barney', 'age': 36 },
+     *   { 'user': 'fred',   'age': 42 },
+     *   { 'user': 'barney', 'age': 34 }
+     * ];
+     *
+     * _.sortBy(users, function(o) { return o.user; });
+     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
+     *
+     * _.sortBy(users, ['user', 'age']);
+     * // => objects for [['barney', 34], ['barney', 36], ['fred', 42], ['fred', 48]]
+     *
+     * _.sortBy(users, 'user', function(o) {
+     *   return Math.floor(o.age / 10);
+     * });
+     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
+     */
+    <T>(iteratees: _.Many<_.ValueIteratee<T>>, collection: _.List<T> | null | undefined): T[];
+    /**
+     * Creates an array of elements, sorted in ascending order by the results of
+     * running each element in a collection through each iteratee. This method
+     * performs a stable sort, that is, it preserves the original sort order of
+     * equal elements. The iteratees are invoked with one argument: (value).
+     *
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratees=[_.identity]]
+     *  The iteratees to sort by, specified individually or in arrays.
+     * @returns Returns the new sorted array.
+     * @example
+     *
+     * var users = [
+     *   { 'user': 'fred',   'age': 48 },
+     *   { 'user': 'barney', 'age': 36 },
+     *   { 'user': 'fred',   'age': 42 },
+     *   { 'user': 'barney', 'age': 34 }
+     * ];
+     *
+     * _.sortBy(users, function(o) { return o.user; });
+     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
+     *
+     * _.sortBy(users, ['user', 'age']);
+     * // => objects for [['barney', 34], ['barney', 36], ['fred', 42], ['fred', 48]]
+     *
+     * _.sortBy(users, 'user', function(o) {
+     *   return Math.floor(o.age / 10);
+     * });
+     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
+     */
+    <T extends object>(iteratees: _.Many<_.ValueIteratee<T[keyof T]>>, collection: T | null | undefined): Array<T[keyof T]>;
+}
+interface SortBy1x1<T> {
+    /**
+     * Creates an array of elements, sorted in ascending order by the results of
+     * running each element in a collection through each iteratee. This method
+     * performs a stable sort, that is, it preserves the original sort order of
+     * equal elements. The iteratees are invoked with one argument: (value).
+     *
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratees=[_.identity]]
+     *  The iteratees to sort by, specified individually or in arrays.
+     * @returns Returns the new sorted array.
+     * @example
+     *
+     * var users = [
+     *   { 'user': 'fred',   'age': 48 },
+     *   { 'user': 'barney', 'age': 36 },
+     *   { 'user': 'fred',   'age': 42 },
+     *   { 'user': 'barney', 'age': 34 }
+     * ];
+     *
+     * _.sortBy(users, function(o) { return o.user; });
+     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
+     *
+     * _.sortBy(users, ['user', 'age']);
+     * // => objects for [['barney', 34], ['barney', 36], ['fred', 42], ['fred', 48]]
+     *
+     * _.sortBy(users, 'user', function(o) {
+     *   return Math.floor(o.age / 10);
+     * });
+     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
+     */
+    (): SortBy1x1<T>;
+    /**
+     * Creates an array of elements, sorted in ascending order by the results of
+     * running each element in a collection through each iteratee. This method
+     * performs a stable sort, that is, it preserves the original sort order of
+     * equal elements. The iteratees are invoked with one argument: (value).
+     *
+     * @category Collection
+     * @param collection The collection to iterate over.
+     * @param [iteratees=[_.identity]]
+     *  The iteratees to sort by, specified individually or in arrays.
+     * @returns Returns the new sorted array.
+     * @example
+     *
+     * var users = [
+     *   { 'user': 'fred',   'age': 48 },
+     *   { 'user': 'barney', 'age': 36 },
+     *   { 'user': 'fred',   'age': 42 },
+     *   { 'user': 'barney', 'age': 34 }
+     * ];
+     *
+     * _.sortBy(users, function(o) { return o.user; });
+     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
+     *
+     * _.sortBy(users, ['user', 'age']);
+     * // => objects for [['barney', 34], ['barney', 36], ['fred', 42], ['fred', 48]]
+     *
+     * _.sortBy(users, 'user', function(o) {
+     *   return Math.floor(o.age / 10);
+     * });
+     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
+     */
+    (collection: _.List<T> | object | null | undefined): T[];
+}
+
+declare const sortBy: SortBy;
+export = sortBy;
diff --git a/types/lodash/fp/sortedIndex.d.ts b/types/lodash/fp/sortedIndex.d.ts
new file mode 100644
index 0000000000..c230bd6858
--- /dev/null
+++ b/types/lodash/fp/sortedIndex.d.ts
@@ -0,0 +1,98 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface SortedIndex {
+    /**
+     * Uses a binary search to determine the lowest index at which `value` should
+     * be inserted into `array` in order to maintain its sort order.
+     *
+     * @category Array
+     * @param array The sorted array to inspect.
+     * @param value The value to evaluate.
+     * @returns Returns the index at which `value` should be inserted into `array`.
+     * @example
+     *
+     * _.sortedIndex([30, 50], 40);
+     * // => 1
+     *
+     * _.sortedIndex([4, 5], 4);
+     * // => 0
+     */
+    (): SortedIndex;
+    /**
+     * Uses a binary search to determine the lowest index at which `value` should
+     * be inserted into `array` in order to maintain its sort order.
+     *
+     * @category Array
+     * @param array The sorted array to inspect.
+     * @param value The value to evaluate.
+     * @returns Returns the index at which `value` should be inserted into `array`.
+     * @example
+     *
+     * _.sortedIndex([30, 50], 40);
+     * // => 1
+     *
+     * _.sortedIndex([4, 5], 4);
+     * // => 0
+     */
+    <T>(value: T): SortedIndex1x1<T>;
+    /**
+     * Uses a binary search to determine the lowest index at which `value` should
+     * be inserted into `array` in order to maintain its sort order.
+     *
+     * @category Array
+     * @param array The sorted array to inspect.
+     * @param value The value to evaluate.
+     * @returns Returns the index at which `value` should be inserted into `array`.
+     * @example
+     *
+     * _.sortedIndex([30, 50], 40);
+     * // => 1
+     *
+     * _.sortedIndex([4, 5], 4);
+     * // => 0
+     */
+    <T>(value: T, array: _.List<T> | null | undefined): number;
+}
+interface SortedIndex1x1<T> {
+    /**
+     * Uses a binary search to determine the lowest index at which `value` should
+     * be inserted into `array` in order to maintain its sort order.
+     *
+     * @category Array
+     * @param array The sorted array to inspect.
+     * @param value The value to evaluate.
+     * @returns Returns the index at which `value` should be inserted into `array`.
+     * @example
+     *
+     * _.sortedIndex([30, 50], 40);
+     * // => 1
+     *
+     * _.sortedIndex([4, 5], 4);
+     * // => 0
+     */
+    (): SortedIndex1x1<T>;
+    /**
+     * Uses a binary search to determine the lowest index at which `value` should
+     * be inserted into `array` in order to maintain its sort order.
+     *
+     * @category Array
+     * @param array The sorted array to inspect.
+     * @param value The value to evaluate.
+     * @returns Returns the index at which `value` should be inserted into `array`.
+     * @example
+     *
+     * _.sortedIndex([30, 50], 40);
+     * // => 1
+     *
+     * _.sortedIndex([4, 5], 4);
+     * // => 0
+     */
+    (array: _.List<T> | null | undefined): number;
+}
+
+declare const sortedIndex: SortedIndex;
+export = sortedIndex;
diff --git a/types/lodash/fp/sortedIndexBy.d.ts b/types/lodash/fp/sortedIndexBy.d.ts
new file mode 100644
index 0000000000..02a1ffbae6
--- /dev/null
+++ b/types/lodash/fp/sortedIndexBy.d.ts
@@ -0,0 +1,213 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface SortedIndexBy {
+    /**
+     * This method is like `_.sortedIndex` except that it accepts `iteratee`
+     * which is invoked for `value` and each element of `array` to compute their
+     * sort ranking. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param array The sorted array to inspect.
+     * @param value The value to evaluate.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the index at which `value` should be inserted into `array`.
+     * @example
+     *
+     * var dict = { 'thirty': 30, 'forty': 40, 'fifty': 50 };
+     *
+     * _.sortedIndexBy(['thirty', 'fifty'], 'forty', _.propertyOf(dict));
+     * // => 1
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.sortedIndexBy([{ 'x': 4 }, { 'x': 5 }], { 'x': 4 }, 'x');
+     * // => 0
+     */
+    (): SortedIndexBy;
+    /**
+     * This method is like `_.sortedIndex` except that it accepts `iteratee`
+     * which is invoked for `value` and each element of `array` to compute their
+     * sort ranking. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param array The sorted array to inspect.
+     * @param value The value to evaluate.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the index at which `value` should be inserted into `array`.
+     * @example
+     *
+     * var dict = { 'thirty': 30, 'forty': 40, 'fifty': 50 };
+     *
+     * _.sortedIndexBy(['thirty', 'fifty'], 'forty', _.propertyOf(dict));
+     * // => 1
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.sortedIndexBy([{ 'x': 4 }, { 'x': 5 }], { 'x': 4 }, 'x');
+     * // => 0
+     */
+    <T>(iteratee: _.ValueIteratee<T>): SortedIndexBy1x1<T>;
+    /**
+     * This method is like `_.sortedIndex` except that it accepts `iteratee`
+     * which is invoked for `value` and each element of `array` to compute their
+     * sort ranking. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param array The sorted array to inspect.
+     * @param value The value to evaluate.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the index at which `value` should be inserted into `array`.
+     * @example
+     *
+     * var dict = { 'thirty': 30, 'forty': 40, 'fifty': 50 };
+     *
+     * _.sortedIndexBy(['thirty', 'fifty'], 'forty', _.propertyOf(dict));
+     * // => 1
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.sortedIndexBy([{ 'x': 4 }, { 'x': 5 }], { 'x': 4 }, 'x');
+     * // => 0
+     */
+    <T>(iteratee: _.ValueIteratee<T>, value: T): SortedIndexBy1x2<T>;
+    /**
+     * This method is like `_.sortedIndex` except that it accepts `iteratee`
+     * which is invoked for `value` and each element of `array` to compute their
+     * sort ranking. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param array The sorted array to inspect.
+     * @param value The value to evaluate.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the index at which `value` should be inserted into `array`.
+     * @example
+     *
+     * var dict = { 'thirty': 30, 'forty': 40, 'fifty': 50 };
+     *
+     * _.sortedIndexBy(['thirty', 'fifty'], 'forty', _.propertyOf(dict));
+     * // => 1
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.sortedIndexBy([{ 'x': 4 }, { 'x': 5 }], { 'x': 4 }, 'x');
+     * // => 0
+     */
+    <T>(iteratee: _.ValueIteratee<T>, value: T, array: _.List<T> | null | undefined): number;
+}
+interface SortedIndexBy1x1<T> {
+    /**
+     * This method is like `_.sortedIndex` except that it accepts `iteratee`
+     * which is invoked for `value` and each element of `array` to compute their
+     * sort ranking. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param array The sorted array to inspect.
+     * @param value The value to evaluate.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the index at which `value` should be inserted into `array`.
+     * @example
+     *
+     * var dict = { 'thirty': 30, 'forty': 40, 'fifty': 50 };
+     *
+     * _.sortedIndexBy(['thirty', 'fifty'], 'forty', _.propertyOf(dict));
+     * // => 1
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.sortedIndexBy([{ 'x': 4 }, { 'x': 5 }], { 'x': 4 }, 'x');
+     * // => 0
+     */
+    (): SortedIndexBy1x1<T>;
+    /**
+     * This method is like `_.sortedIndex` except that it accepts `iteratee`
+     * which is invoked for `value` and each element of `array` to compute their
+     * sort ranking. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param array The sorted array to inspect.
+     * @param value The value to evaluate.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the index at which `value` should be inserted into `array`.
+     * @example
+     *
+     * var dict = { 'thirty': 30, 'forty': 40, 'fifty': 50 };
+     *
+     * _.sortedIndexBy(['thirty', 'fifty'], 'forty', _.propertyOf(dict));
+     * // => 1
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.sortedIndexBy([{ 'x': 4 }, { 'x': 5 }], { 'x': 4 }, 'x');
+     * // => 0
+     */
+    (value: T): SortedIndexBy1x2<T>;
+    /**
+     * This method is like `_.sortedIndex` except that it accepts `iteratee`
+     * which is invoked for `value` and each element of `array` to compute their
+     * sort ranking. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param array The sorted array to inspect.
+     * @param value The value to evaluate.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the index at which `value` should be inserted into `array`.
+     * @example
+     *
+     * var dict = { 'thirty': 30, 'forty': 40, 'fifty': 50 };
+     *
+     * _.sortedIndexBy(['thirty', 'fifty'], 'forty', _.propertyOf(dict));
+     * // => 1
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.sortedIndexBy([{ 'x': 4 }, { 'x': 5 }], { 'x': 4 }, 'x');
+     * // => 0
+     */
+    (value: T, array: _.List<T> | null | undefined): number;
+}
+interface SortedIndexBy1x2<T> {
+    /**
+     * This method is like `_.sortedIndex` except that it accepts `iteratee`
+     * which is invoked for `value` and each element of `array` to compute their
+     * sort ranking. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param array The sorted array to inspect.
+     * @param value The value to evaluate.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the index at which `value` should be inserted into `array`.
+     * @example
+     *
+     * var dict = { 'thirty': 30, 'forty': 40, 'fifty': 50 };
+     *
+     * _.sortedIndexBy(['thirty', 'fifty'], 'forty', _.propertyOf(dict));
+     * // => 1
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.sortedIndexBy([{ 'x': 4 }, { 'x': 5 }], { 'x': 4 }, 'x');
+     * // => 0
+     */
+    (): SortedIndexBy1x2<T>;
+    /**
+     * This method is like `_.sortedIndex` except that it accepts `iteratee`
+     * which is invoked for `value` and each element of `array` to compute their
+     * sort ranking. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param array The sorted array to inspect.
+     * @param value The value to evaluate.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the index at which `value` should be inserted into `array`.
+     * @example
+     *
+     * var dict = { 'thirty': 30, 'forty': 40, 'fifty': 50 };
+     *
+     * _.sortedIndexBy(['thirty', 'fifty'], 'forty', _.propertyOf(dict));
+     * // => 1
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.sortedIndexBy([{ 'x': 4 }, { 'x': 5 }], { 'x': 4 }, 'x');
+     * // => 0
+     */
+    (array: _.List<T> | null | undefined): number;
+}
+
+declare const sortedIndexBy: SortedIndexBy;
+export = sortedIndexBy;
diff --git a/types/lodash/fp/sortedIndexOf.d.ts b/types/lodash/fp/sortedIndexOf.d.ts
new file mode 100644
index 0000000000..0b9f5503ab
--- /dev/null
+++ b/types/lodash/fp/sortedIndexOf.d.ts
@@ -0,0 +1,83 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface SortedIndexOf {
+    /**
+     * This method is like `_.indexOf` except that it performs a binary
+     * search on a sorted `array`.
+     *
+     * @category Array
+     * @param array The array to search.
+     * @param value The value to search for.
+     * @returns Returns the index of the matched value, else `-1`.
+     * @example
+     *
+     * _.sortedIndexOf([1, 1, 2, 2], 2);
+     * // => 2
+     */
+    (): SortedIndexOf;
+    /**
+     * This method is like `_.indexOf` except that it performs a binary
+     * search on a sorted `array`.
+     *
+     * @category Array
+     * @param array The array to search.
+     * @param value The value to search for.
+     * @returns Returns the index of the matched value, else `-1`.
+     * @example
+     *
+     * _.sortedIndexOf([1, 1, 2, 2], 2);
+     * // => 2
+     */
+    <T>(value: T): SortedIndexOf1x1<T>;
+    /**
+     * This method is like `_.indexOf` except that it performs a binary
+     * search on a sorted `array`.
+     *
+     * @category Array
+     * @param array The array to search.
+     * @param value The value to search for.
+     * @returns Returns the index of the matched value, else `-1`.
+     * @example
+     *
+     * _.sortedIndexOf([1, 1, 2, 2], 2);
+     * // => 2
+     */
+    <T>(value: T, array: _.List<T> | null | undefined): number;
+}
+interface SortedIndexOf1x1<T> {
+    /**
+     * This method is like `_.indexOf` except that it performs a binary
+     * search on a sorted `array`.
+     *
+     * @category Array
+     * @param array The array to search.
+     * @param value The value to search for.
+     * @returns Returns the index of the matched value, else `-1`.
+     * @example
+     *
+     * _.sortedIndexOf([1, 1, 2, 2], 2);
+     * // => 2
+     */
+    (): SortedIndexOf1x1<T>;
+    /**
+     * This method is like `_.indexOf` except that it performs a binary
+     * search on a sorted `array`.
+     *
+     * @category Array
+     * @param array The array to search.
+     * @param value The value to search for.
+     * @returns Returns the index of the matched value, else `-1`.
+     * @example
+     *
+     * _.sortedIndexOf([1, 1, 2, 2], 2);
+     * // => 2
+     */
+    (array: _.List<T> | null | undefined): number;
+}
+
+declare const sortedIndexOf: SortedIndexOf;
+export = sortedIndexOf;
diff --git a/types/lodash/fp/sortedLastIndex.d.ts b/types/lodash/fp/sortedLastIndex.d.ts
new file mode 100644
index 0000000000..26b45fe1df
--- /dev/null
+++ b/types/lodash/fp/sortedLastIndex.d.ts
@@ -0,0 +1,88 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface SortedLastIndex {
+    /**
+     * This method is like `_.sortedIndex` except that it returns the highest
+     * index at which `value` should be inserted into `array` in order to
+     * maintain its sort order.
+     *
+     * @category Array
+     * @param array The sorted array to inspect.
+     * @param value The value to evaluate.
+     * @returns Returns the index at which `value` should be inserted into `array`.
+     * @example
+     *
+     * _.sortedLastIndex([4, 5], 4);
+     * // => 1
+     */
+    (): SortedLastIndex;
+    /**
+     * This method is like `_.sortedIndex` except that it returns the highest
+     * index at which `value` should be inserted into `array` in order to
+     * maintain its sort order.
+     *
+     * @category Array
+     * @param array The sorted array to inspect.
+     * @param value The value to evaluate.
+     * @returns Returns the index at which `value` should be inserted into `array`.
+     * @example
+     *
+     * _.sortedLastIndex([4, 5], 4);
+     * // => 1
+     */
+    <T>(value: T): SortedLastIndex1x1<T>;
+    /**
+     * This method is like `_.sortedIndex` except that it returns the highest
+     * index at which `value` should be inserted into `array` in order to
+     * maintain its sort order.
+     *
+     * @category Array
+     * @param array The sorted array to inspect.
+     * @param value The value to evaluate.
+     * @returns Returns the index at which `value` should be inserted into `array`.
+     * @example
+     *
+     * _.sortedLastIndex([4, 5], 4);
+     * // => 1
+     */
+    <T>(value: T, array: _.List<T> | null | undefined): number;
+}
+interface SortedLastIndex1x1<T> {
+    /**
+     * This method is like `_.sortedIndex` except that it returns the highest
+     * index at which `value` should be inserted into `array` in order to
+     * maintain its sort order.
+     *
+     * @category Array
+     * @param array The sorted array to inspect.
+     * @param value The value to evaluate.
+     * @returns Returns the index at which `value` should be inserted into `array`.
+     * @example
+     *
+     * _.sortedLastIndex([4, 5], 4);
+     * // => 1
+     */
+    (): SortedLastIndex1x1<T>;
+    /**
+     * This method is like `_.sortedIndex` except that it returns the highest
+     * index at which `value` should be inserted into `array` in order to
+     * maintain its sort order.
+     *
+     * @category Array
+     * @param array The sorted array to inspect.
+     * @param value The value to evaluate.
+     * @returns Returns the index at which `value` should be inserted into `array`.
+     * @example
+     *
+     * _.sortedLastIndex([4, 5], 4);
+     * // => 1
+     */
+    (array: _.List<T> | null | undefined): number;
+}
+
+declare const sortedLastIndex: SortedLastIndex;
+export = sortedLastIndex;
diff --git a/types/lodash/fp/sortedLastIndexBy.d.ts b/types/lodash/fp/sortedLastIndexBy.d.ts
new file mode 100644
index 0000000000..6f00b9c982
--- /dev/null
+++ b/types/lodash/fp/sortedLastIndexBy.d.ts
@@ -0,0 +1,168 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface SortedLastIndexBy {
+    /**
+     * This method is like `_.sortedLastIndex` except that it accepts `iteratee`
+     * which is invoked for `value` and each element of `array` to compute their
+     * sort ranking. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param array The sorted array to inspect.
+     * @param value The value to evaluate.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the index at which `value` should be inserted into `array`.
+     * @example
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.sortedLastIndexBy([{ 'x': 4 }, { 'x': 5 }], { 'x': 4 }, 'x');
+     * // => 1
+     */
+    (): SortedLastIndexBy;
+    /**
+     * This method is like `_.sortedLastIndex` except that it accepts `iteratee`
+     * which is invoked for `value` and each element of `array` to compute their
+     * sort ranking. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param array The sorted array to inspect.
+     * @param value The value to evaluate.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the index at which `value` should be inserted into `array`.
+     * @example
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.sortedLastIndexBy([{ 'x': 4 }, { 'x': 5 }], { 'x': 4 }, 'x');
+     * // => 1
+     */
+    <T>(iteratee: _.ValueIteratee<T>): SortedLastIndexBy1x1<T>;
+    /**
+     * This method is like `_.sortedLastIndex` except that it accepts `iteratee`
+     * which is invoked for `value` and each element of `array` to compute their
+     * sort ranking. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param array The sorted array to inspect.
+     * @param value The value to evaluate.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the index at which `value` should be inserted into `array`.
+     * @example
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.sortedLastIndexBy([{ 'x': 4 }, { 'x': 5 }], { 'x': 4 }, 'x');
+     * // => 1
+     */
+    <T>(iteratee: _.ValueIteratee<T>, value: T): SortedLastIndexBy1x2<T>;
+    /**
+     * This method is like `_.sortedLastIndex` except that it accepts `iteratee`
+     * which is invoked for `value` and each element of `array` to compute their
+     * sort ranking. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param array The sorted array to inspect.
+     * @param value The value to evaluate.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the index at which `value` should be inserted into `array`.
+     * @example
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.sortedLastIndexBy([{ 'x': 4 }, { 'x': 5 }], { 'x': 4 }, 'x');
+     * // => 1
+     */
+    <T>(iteratee: _.ValueIteratee<T>, value: T, array: _.List<T> | null | undefined): number;
+}
+interface SortedLastIndexBy1x1<T> {
+    /**
+     * This method is like `_.sortedLastIndex` except that it accepts `iteratee`
+     * which is invoked for `value` and each element of `array` to compute their
+     * sort ranking. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param array The sorted array to inspect.
+     * @param value The value to evaluate.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the index at which `value` should be inserted into `array`.
+     * @example
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.sortedLastIndexBy([{ 'x': 4 }, { 'x': 5 }], { 'x': 4 }, 'x');
+     * // => 1
+     */
+    (): SortedLastIndexBy1x1<T>;
+    /**
+     * This method is like `_.sortedLastIndex` except that it accepts `iteratee`
+     * which is invoked for `value` and each element of `array` to compute their
+     * sort ranking. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param array The sorted array to inspect.
+     * @param value The value to evaluate.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the index at which `value` should be inserted into `array`.
+     * @example
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.sortedLastIndexBy([{ 'x': 4 }, { 'x': 5 }], { 'x': 4 }, 'x');
+     * // => 1
+     */
+    (value: T): SortedLastIndexBy1x2<T>;
+    /**
+     * This method is like `_.sortedLastIndex` except that it accepts `iteratee`
+     * which is invoked for `value` and each element of `array` to compute their
+     * sort ranking. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param array The sorted array to inspect.
+     * @param value The value to evaluate.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the index at which `value` should be inserted into `array`.
+     * @example
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.sortedLastIndexBy([{ 'x': 4 }, { 'x': 5 }], { 'x': 4 }, 'x');
+     * // => 1
+     */
+    (value: T, array: _.List<T> | null | undefined): number;
+}
+interface SortedLastIndexBy1x2<T> {
+    /**
+     * This method is like `_.sortedLastIndex` except that it accepts `iteratee`
+     * which is invoked for `value` and each element of `array` to compute their
+     * sort ranking. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param array The sorted array to inspect.
+     * @param value The value to evaluate.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the index at which `value` should be inserted into `array`.
+     * @example
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.sortedLastIndexBy([{ 'x': 4 }, { 'x': 5 }], { 'x': 4 }, 'x');
+     * // => 1
+     */
+    (): SortedLastIndexBy1x2<T>;
+    /**
+     * This method is like `_.sortedLastIndex` except that it accepts `iteratee`
+     * which is invoked for `value` and each element of `array` to compute their
+     * sort ranking. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param array The sorted array to inspect.
+     * @param value The value to evaluate.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the index at which `value` should be inserted into `array`.
+     * @example
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.sortedLastIndexBy([{ 'x': 4 }, { 'x': 5 }], { 'x': 4 }, 'x');
+     * // => 1
+     */
+    (array: _.List<T> | null | undefined): number;
+}
+
+declare const sortedLastIndexBy: SortedLastIndexBy;
+export = sortedLastIndexBy;
diff --git a/types/lodash/fp/sortedLastIndexOf.d.ts b/types/lodash/fp/sortedLastIndexOf.d.ts
new file mode 100644
index 0000000000..3fb6d2d77b
--- /dev/null
+++ b/types/lodash/fp/sortedLastIndexOf.d.ts
@@ -0,0 +1,83 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface SortedLastIndexOf {
+    /**
+     * This method is like `_.lastIndexOf` except that it performs a binary
+     * search on a sorted `array`.
+     *
+     * @category Array
+     * @param array The array to search.
+     * @param value The value to search for.
+     * @returns Returns the index of the matched value, else `-1`.
+     * @example
+     *
+     * _.sortedLastIndexOf([1, 1, 2, 2], 2);
+     * // => 3
+     */
+    (): SortedLastIndexOf;
+    /**
+     * This method is like `_.lastIndexOf` except that it performs a binary
+     * search on a sorted `array`.
+     *
+     * @category Array
+     * @param array The array to search.
+     * @param value The value to search for.
+     * @returns Returns the index of the matched value, else `-1`.
+     * @example
+     *
+     * _.sortedLastIndexOf([1, 1, 2, 2], 2);
+     * // => 3
+     */
+    <T>(value: T): SortedLastIndexOf1x1<T>;
+    /**
+     * This method is like `_.lastIndexOf` except that it performs a binary
+     * search on a sorted `array`.
+     *
+     * @category Array
+     * @param array The array to search.
+     * @param value The value to search for.
+     * @returns Returns the index of the matched value, else `-1`.
+     * @example
+     *
+     * _.sortedLastIndexOf([1, 1, 2, 2], 2);
+     * // => 3
+     */
+    <T>(value: T, array: _.List<T> | null | undefined): number;
+}
+interface SortedLastIndexOf1x1<T> {
+    /**
+     * This method is like `_.lastIndexOf` except that it performs a binary
+     * search on a sorted `array`.
+     *
+     * @category Array
+     * @param array The array to search.
+     * @param value The value to search for.
+     * @returns Returns the index of the matched value, else `-1`.
+     * @example
+     *
+     * _.sortedLastIndexOf([1, 1, 2, 2], 2);
+     * // => 3
+     */
+    (): SortedLastIndexOf1x1<T>;
+    /**
+     * This method is like `_.lastIndexOf` except that it performs a binary
+     * search on a sorted `array`.
+     *
+     * @category Array
+     * @param array The array to search.
+     * @param value The value to search for.
+     * @returns Returns the index of the matched value, else `-1`.
+     * @example
+     *
+     * _.sortedLastIndexOf([1, 1, 2, 2], 2);
+     * // => 3
+     */
+    (array: _.List<T> | null | undefined): number;
+}
+
+declare const sortedLastIndexOf: SortedLastIndexOf;
+export = sortedLastIndexOf;
diff --git a/types/lodash/fp/sortedUniq.d.ts b/types/lodash/fp/sortedUniq.d.ts
new file mode 100644
index 0000000000..ae5c6a826b
--- /dev/null
+++ b/types/lodash/fp/sortedUniq.d.ts
@@ -0,0 +1,23 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+type SortedUniq =
+    /**
+     * This method is like `_.uniq` except that it's designed and optimized
+     * for sorted arrays.
+     *
+     * @category Array
+     * @param array The array to inspect.
+     * @returns Returns the new duplicate free array.
+     * @example
+     *
+     * _.sortedUniq([1, 1, 2]);
+     * // => [1, 2]
+     */
+    <T>(array: _.List<T> | null | undefined) => T[];
+
+declare const sortedUniq: SortedUniq;
+export = sortedUniq;
diff --git a/types/lodash/fp/sortedUniqBy.d.ts b/types/lodash/fp/sortedUniqBy.d.ts
new file mode 100644
index 0000000000..9300e80b75
--- /dev/null
+++ b/types/lodash/fp/sortedUniqBy.d.ts
@@ -0,0 +1,141 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface SortedUniqBy {
+    /**
+     * This method is like `_.uniqBy` except that it's designed and optimized
+     * for sorted arrays.
+     *
+     * @category Array
+     * @param array The array to inspect.
+     * @param [iteratee] The iteratee invoked per element.
+     * @returns Returns the new duplicate free array.
+     * @example
+     *
+     * _.sortedUniqBy([1.1, 1.2, 2.3, 2.4], Math.floor);
+     * // => [1.1, 2.2]
+     */
+    (): SortedUniqBy;
+    /**
+     * This method is like `_.uniqBy` except that it's designed and optimized
+     * for sorted arrays.
+     *
+     * @category Array
+     * @param array The array to inspect.
+     * @param [iteratee] The iteratee invoked per element.
+     * @returns Returns the new duplicate free array.
+     * @example
+     *
+     * _.sortedUniqBy([1.1, 1.2, 2.3, 2.4], Math.floor);
+     * // => [1.1, 2.2]
+     */
+    (iteratee: (value: string) => _.NotVoid): SortedUniqBy1x1;
+    /**
+     * This method is like `_.uniqBy` except that it's designed and optimized
+     * for sorted arrays.
+     *
+     * @category Array
+     * @param array The array to inspect.
+     * @param [iteratee] The iteratee invoked per element.
+     * @returns Returns the new duplicate free array.
+     * @example
+     *
+     * _.sortedUniqBy([1.1, 1.2, 2.3, 2.4], Math.floor);
+     * // => [1.1, 2.2]
+     */
+    (iteratee: (value: string) => _.NotVoid, array: string | null | undefined): string[];
+    /**
+     * This method is like `_.uniqBy` except that it's designed and optimized
+     * for sorted arrays.
+     *
+     * @category Array
+     * @param array The array to inspect.
+     * @param [iteratee] The iteratee invoked per element.
+     * @returns Returns the new duplicate free array.
+     * @example
+     *
+     * _.sortedUniqBy([1.1, 1.2, 2.3, 2.4], Math.floor);
+     * // => [1.1, 2.2]
+     */
+    <T>(iteratee: _.ValueIteratee<T>): SortedUniqBy2x1<T>;
+    /**
+     * This method is like `_.uniqBy` except that it's designed and optimized
+     * for sorted arrays.
+     *
+     * @category Array
+     * @param array The array to inspect.
+     * @param [iteratee] The iteratee invoked per element.
+     * @returns Returns the new duplicate free array.
+     * @example
+     *
+     * _.sortedUniqBy([1.1, 1.2, 2.3, 2.4], Math.floor);
+     * // => [1.1, 2.2]
+     */
+    <T>(iteratee: _.ValueIteratee<T>, array: _.List<T> | null | undefined): T[];
+}
+interface SortedUniqBy1x1 {
+    /**
+     * This method is like `_.uniqBy` except that it's designed and optimized
+     * for sorted arrays.
+     *
+     * @category Array
+     * @param array The array to inspect.
+     * @param [iteratee] The iteratee invoked per element.
+     * @returns Returns the new duplicate free array.
+     * @example
+     *
+     * _.sortedUniqBy([1.1, 1.2, 2.3, 2.4], Math.floor);
+     * // => [1.1, 2.2]
+     */
+    (): SortedUniqBy1x1;
+    /**
+     * This method is like `_.uniqBy` except that it's designed and optimized
+     * for sorted arrays.
+     *
+     * @category Array
+     * @param array The array to inspect.
+     * @param [iteratee] The iteratee invoked per element.
+     * @returns Returns the new duplicate free array.
+     * @example
+     *
+     * _.sortedUniqBy([1.1, 1.2, 2.3, 2.4], Math.floor);
+     * // => [1.1, 2.2]
+     */
+    (array: string | null | undefined): string[];
+}
+interface SortedUniqBy2x1<T> {
+    /**
+     * This method is like `_.uniqBy` except that it's designed and optimized
+     * for sorted arrays.
+     *
+     * @category Array
+     * @param array The array to inspect.
+     * @param [iteratee] The iteratee invoked per element.
+     * @returns Returns the new duplicate free array.
+     * @example
+     *
+     * _.sortedUniqBy([1.1, 1.2, 2.3, 2.4], Math.floor);
+     * // => [1.1, 2.2]
+     */
+    (): SortedUniqBy2x1<T>;
+    /**
+     * This method is like `_.uniqBy` except that it's designed and optimized
+     * for sorted arrays.
+     *
+     * @category Array
+     * @param array The array to inspect.
+     * @param [iteratee] The iteratee invoked per element.
+     * @returns Returns the new duplicate free array.
+     * @example
+     *
+     * _.sortedUniqBy([1.1, 1.2, 2.3, 2.4], Math.floor);
+     * // => [1.1, 2.2]
+     */
+    (array: _.List<T> | null | undefined): T[];
+}
+
+declare const sortedUniqBy: SortedUniqBy;
+export = sortedUniqBy;
diff --git a/types/lodash/fp/split.d.ts b/types/lodash/fp/split.d.ts
new file mode 100644
index 0000000000..50ad820360
--- /dev/null
+++ b/types/lodash/fp/split.d.ts
@@ -0,0 +1,66 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface Split {
+    /**
+     * Splits string by separator.
+     *
+     * Note: This method is based on String#split.
+     *
+     * @param string The string to trim.
+     * @param separator The separator pattern to split by.
+     * @param limit The length to truncate results to.
+     * @return Returns the new array of string segments.
+     */
+    (): Split;
+    /**
+     * Splits string by separator.
+     *
+     * Note: This method is based on String#split.
+     *
+     * @param string The string to trim.
+     * @param separator The separator pattern to split by.
+     * @param limit The length to truncate results to.
+     * @return Returns the new array of string segments.
+     */
+    (separator: RegExp|string): Split1x1;
+    /**
+     * Splits string by separator.
+     *
+     * Note: This method is based on String#split.
+     *
+     * @param string The string to trim.
+     * @param separator The separator pattern to split by.
+     * @param limit The length to truncate results to.
+     * @return Returns the new array of string segments.
+     */
+    (separator: RegExp|string, string: string): string[];
+}
+interface Split1x1 {
+    /**
+     * Splits string by separator.
+     *
+     * Note: This method is based on String#split.
+     *
+     * @param string The string to trim.
+     * @param separator The separator pattern to split by.
+     * @param limit The length to truncate results to.
+     * @return Returns the new array of string segments.
+     */
+    (): Split1x1;
+    /**
+     * Splits string by separator.
+     *
+     * Note: This method is based on String#split.
+     *
+     * @param string The string to trim.
+     * @param separator The separator pattern to split by.
+     * @param limit The length to truncate results to.
+     * @return Returns the new array of string segments.
+     */
+    (string: string): string[];
+}
+
+declare const split: Split;
+export = split;
diff --git a/types/lodash/fp/spread.d.ts b/types/lodash/fp/spread.d.ts
new file mode 100644
index 0000000000..197c49278d
--- /dev/null
+++ b/types/lodash/fp/spread.d.ts
@@ -0,0 +1,18 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type Spread =
+    /**
+     * Creates a function that invokes func with the this binding of the created function and an array of arguments
+     * much like Function#apply.
+     *
+     * Note: This method is based on the spread operator.
+     *
+     * @param func The function to spread arguments over.
+     * @return Returns the new function.
+     */
+    <TResult>(func: (...args: any[]) => TResult) => (...args: any[]) => TResult;
+
+declare const spread: Spread;
+export = spread;
diff --git a/types/lodash/fp/spreadFrom.d.ts b/types/lodash/fp/spreadFrom.d.ts
new file mode 100644
index 0000000000..7ac31bc9fe
--- /dev/null
+++ b/types/lodash/fp/spreadFrom.d.ts
@@ -0,0 +1,61 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface Spread {
+    /**
+     * Creates a function that invokes func with the this binding of the created function and an array of arguments
+     * much like Function#apply.
+     *
+     * Note: This method is based on the spread operator.
+     *
+     * @param func The function to spread arguments over.
+     * @return Returns the new function.
+     */
+    (): Spread;
+    /**
+     * Creates a function that invokes func with the this binding of the created function and an array of arguments
+     * much like Function#apply.
+     *
+     * Note: This method is based on the spread operator.
+     *
+     * @param func The function to spread arguments over.
+     * @return Returns the new function.
+     */
+    (start: number): Spread1x1;
+    /**
+     * Creates a function that invokes func with the this binding of the created function and an array of arguments
+     * much like Function#apply.
+     *
+     * Note: This method is based on the spread operator.
+     *
+     * @param func The function to spread arguments over.
+     * @return Returns the new function.
+     */
+    <TResult>(start: number, func: (...args: any[]) => TResult): (...args: any[]) => TResult;
+}
+interface Spread1x1 {
+    /**
+     * Creates a function that invokes func with the this binding of the created function and an array of arguments
+     * much like Function#apply.
+     *
+     * Note: This method is based on the spread operator.
+     *
+     * @param func The function to spread arguments over.
+     * @return Returns the new function.
+     */
+    (): Spread1x1;
+    /**
+     * Creates a function that invokes func with the this binding of the created function and an array of arguments
+     * much like Function#apply.
+     *
+     * Note: This method is based on the spread operator.
+     *
+     * @param func The function to spread arguments over.
+     * @return Returns the new function.
+     */
+    <TResult>(func: (...args: any[]) => TResult): (...args: any[]) => TResult;
+}
+
+declare const spreadFrom: Spread;
+export = spreadFrom;
diff --git a/types/lodash/fp/startCase.d.ts b/types/lodash/fp/startCase.d.ts
new file mode 100644
index 0000000000..ca27b6b47f
--- /dev/null
+++ b/types/lodash/fp/startCase.d.ts
@@ -0,0 +1,15 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type StartCase =
+    /**
+     * Converts string to start case.
+     *
+     * @param string The string to convert.
+     * @return Returns the start cased string.
+     */
+    (string: string) => string;
+
+declare const startCase: StartCase;
+export = startCase;
diff --git a/types/lodash/fp/startsWith.d.ts b/types/lodash/fp/startsWith.d.ts
new file mode 100644
index 0000000000..962f880742
--- /dev/null
+++ b/types/lodash/fp/startsWith.d.ts
@@ -0,0 +1,56 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface StartsWith {
+    /**
+     * Checks if string starts with the given target string.
+     *
+     * @param string The string to search.
+     * @param target The string to search for.
+     * @param position The position to search from.
+     * @return Returns true if string starts with target, else false.
+     */
+    (): StartsWith;
+    /**
+     * Checks if string starts with the given target string.
+     *
+     * @param string The string to search.
+     * @param target The string to search for.
+     * @param position The position to search from.
+     * @return Returns true if string starts with target, else false.
+     */
+    (target: string): StartsWith1x1;
+    /**
+     * Checks if string starts with the given target string.
+     *
+     * @param string The string to search.
+     * @param target The string to search for.
+     * @param position The position to search from.
+     * @return Returns true if string starts with target, else false.
+     */
+    (target: string, string: string): boolean;
+}
+interface StartsWith1x1 {
+    /**
+     * Checks if string starts with the given target string.
+     *
+     * @param string The string to search.
+     * @param target The string to search for.
+     * @param position The position to search from.
+     * @return Returns true if string starts with target, else false.
+     */
+    (): StartsWith1x1;
+    /**
+     * Checks if string starts with the given target string.
+     *
+     * @param string The string to search.
+     * @param target The string to search for.
+     * @param position The position to search from.
+     * @return Returns true if string starts with target, else false.
+     */
+    (string: string): boolean;
+}
+
+declare const startsWith: StartsWith;
+export = startsWith;
diff --git a/types/lodash/fp/stubArray.d.ts b/types/lodash/fp/stubArray.d.ts
new file mode 100644
index 0000000000..1dd9667827
--- /dev/null
+++ b/types/lodash/fp/stubArray.d.ts
@@ -0,0 +1,14 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type StubArray =
+    /**
+     * This method returns a new empty array.
+     *
+     * @returns Returns the new empty array.
+     */
+    () => any[];
+
+declare const stubArray: StubArray;
+export = stubArray;
diff --git a/types/lodash/fp/stubFalse.d.ts b/types/lodash/fp/stubFalse.d.ts
new file mode 100644
index 0000000000..abea160b5f
--- /dev/null
+++ b/types/lodash/fp/stubFalse.d.ts
@@ -0,0 +1,14 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type StubFalse =
+    /**
+     * This method returns `false`.
+     *
+     * @returns Returns `false`.
+     */
+    () => boolean;
+
+declare const stubFalse: StubFalse;
+export = stubFalse;
diff --git a/types/lodash/fp/stubObject.d.ts b/types/lodash/fp/stubObject.d.ts
new file mode 100644
index 0000000000..6765c18b5a
--- /dev/null
+++ b/types/lodash/fp/stubObject.d.ts
@@ -0,0 +1,14 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type StubObject =
+    /**
+     * This method returns a new empty object.
+     *
+     * @returns Returns the new empty object.
+     */
+    () => any;
+
+declare const stubObject: StubObject;
+export = stubObject;
diff --git a/types/lodash/fp/stubString.d.ts b/types/lodash/fp/stubString.d.ts
new file mode 100644
index 0000000000..66da9843e9
--- /dev/null
+++ b/types/lodash/fp/stubString.d.ts
@@ -0,0 +1,14 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type StubString =
+    /**
+     * This method returns an empty string.
+     *
+     * @returns Returns the empty string.
+     */
+    () => string;
+
+declare const stubString: StubString;
+export = stubString;
diff --git a/types/lodash/fp/stubTrue.d.ts b/types/lodash/fp/stubTrue.d.ts
new file mode 100644
index 0000000000..25cba4fcde
--- /dev/null
+++ b/types/lodash/fp/stubTrue.d.ts
@@ -0,0 +1,14 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type StubTrue =
+    /**
+     * This method returns `true`.
+     *
+     * @returns Returns `true`.
+     */
+    () => boolean;
+
+declare const stubTrue: StubTrue;
+export = stubTrue;
diff --git a/types/lodash/fp/subtract.d.ts b/types/lodash/fp/subtract.d.ts
new file mode 100644
index 0000000000..b19ddb1f7e
--- /dev/null
+++ b/types/lodash/fp/subtract.d.ts
@@ -0,0 +1,76 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface Subtract {
+    /**
+     * Subtract two numbers.
+     *
+     * @category Math
+     * @param minuend The first number in a subtraction.
+     * @param subtrahend The second number in a subtraction.
+     * @returns Returns the difference.
+     * @example
+     *
+     * _.subtract(6, 4);
+     * // => 2
+     */
+    (): Subtract;
+    /**
+     * Subtract two numbers.
+     *
+     * @category Math
+     * @param minuend The first number in a subtraction.
+     * @param subtrahend The second number in a subtraction.
+     * @returns Returns the difference.
+     * @example
+     *
+     * _.subtract(6, 4);
+     * // => 2
+     */
+    (minuend: number): Subtract1x1;
+    /**
+     * Subtract two numbers.
+     *
+     * @category Math
+     * @param minuend The first number in a subtraction.
+     * @param subtrahend The second number in a subtraction.
+     * @returns Returns the difference.
+     * @example
+     *
+     * _.subtract(6, 4);
+     * // => 2
+     */
+    (minuend: number, subtrahend: number): number;
+}
+interface Subtract1x1 {
+    /**
+     * Subtract two numbers.
+     *
+     * @category Math
+     * @param minuend The first number in a subtraction.
+     * @param subtrahend The second number in a subtraction.
+     * @returns Returns the difference.
+     * @example
+     *
+     * _.subtract(6, 4);
+     * // => 2
+     */
+    (): Subtract1x1;
+    /**
+     * Subtract two numbers.
+     *
+     * @category Math
+     * @param minuend The first number in a subtraction.
+     * @param subtrahend The second number in a subtraction.
+     * @returns Returns the difference.
+     * @example
+     *
+     * _.subtract(6, 4);
+     * // => 2
+     */
+    (subtrahend: number): number;
+}
+
+declare const subtract: Subtract;
+export = subtract;
diff --git a/types/lodash/fp/sum.d.ts b/types/lodash/fp/sum.d.ts
new file mode 100644
index 0000000000..84f6849067
--- /dev/null
+++ b/types/lodash/fp/sum.d.ts
@@ -0,0 +1,22 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+type Sum =
+    /**
+     * Computes the sum of the values in `array`.
+     *
+     * @category Math
+     * @param array The array to iterate over.
+     * @returns Returns the sum.
+     * @example
+     *
+     * _.sum([4, 2, 8, 6]);
+     * // => 20
+     */
+    (collection: _.List<any> | null | undefined) => number;
+
+declare const sum: Sum;
+export = sum;
diff --git a/types/lodash/fp/sumBy.d.ts b/types/lodash/fp/sumBy.d.ts
new file mode 100644
index 0000000000..93d6be33f7
--- /dev/null
+++ b/types/lodash/fp/sumBy.d.ts
@@ -0,0 +1,118 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface SumBy {
+    /**
+     * This method is like `_.sum` except that it accepts `iteratee` which is
+     * invoked for each element in `array` to generate the value to be summed.
+     * The iteratee is invoked with one argument: (value).
+     *
+     * @category Math
+     * @param array The array to iterate over.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the sum.
+     * @example
+     *
+     * var objects = [{ 'n': 4 }, { 'n': 2 }, { 'n': 8 }, { 'n': 6 }];
+     *
+     * _.sumBy(objects, function(o) { return o.n; });
+     * // => 20
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.sumBy(objects, 'n');
+     * // => 20
+     */
+    (): SumBy;
+    /**
+     * This method is like `_.sum` except that it accepts `iteratee` which is
+     * invoked for each element in `array` to generate the value to be summed.
+     * The iteratee is invoked with one argument: (value).
+     *
+     * @category Math
+     * @param array The array to iterate over.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the sum.
+     * @example
+     *
+     * var objects = [{ 'n': 4 }, { 'n': 2 }, { 'n': 8 }, { 'n': 6 }];
+     *
+     * _.sumBy(objects, function(o) { return o.n; });
+     * // => 20
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.sumBy(objects, 'n');
+     * // => 20
+     */
+    <T>(iteratee: ((value: T) => number) | string): SumBy1x1<T>;
+    /**
+     * This method is like `_.sum` except that it accepts `iteratee` which is
+     * invoked for each element in `array` to generate the value to be summed.
+     * The iteratee is invoked with one argument: (value).
+     *
+     * @category Math
+     * @param array The array to iterate over.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the sum.
+     * @example
+     *
+     * var objects = [{ 'n': 4 }, { 'n': 2 }, { 'n': 8 }, { 'n': 6 }];
+     *
+     * _.sumBy(objects, function(o) { return o.n; });
+     * // => 20
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.sumBy(objects, 'n');
+     * // => 20
+     */
+    <T>(iteratee: ((value: T) => number) | string, collection: _.List<T> | null | undefined): number;
+}
+interface SumBy1x1<T> {
+    /**
+     * This method is like `_.sum` except that it accepts `iteratee` which is
+     * invoked for each element in `array` to generate the value to be summed.
+     * The iteratee is invoked with one argument: (value).
+     *
+     * @category Math
+     * @param array The array to iterate over.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the sum.
+     * @example
+     *
+     * var objects = [{ 'n': 4 }, { 'n': 2 }, { 'n': 8 }, { 'n': 6 }];
+     *
+     * _.sumBy(objects, function(o) { return o.n; });
+     * // => 20
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.sumBy(objects, 'n');
+     * // => 20
+     */
+    (): SumBy1x1<T>;
+    /**
+     * This method is like `_.sum` except that it accepts `iteratee` which is
+     * invoked for each element in `array` to generate the value to be summed.
+     * The iteratee is invoked with one argument: (value).
+     *
+     * @category Math
+     * @param array The array to iterate over.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the sum.
+     * @example
+     *
+     * var objects = [{ 'n': 4 }, { 'n': 2 }, { 'n': 8 }, { 'n': 6 }];
+     *
+     * _.sumBy(objects, function(o) { return o.n; });
+     * // => 20
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.sumBy(objects, 'n');
+     * // => 20
+     */
+    (collection: _.List<T> | null | undefined): number;
+}
+
+declare const sumBy: SumBy;
+export = sumBy;
diff --git a/types/lodash/fp/symmetricDifference.d.ts b/types/lodash/fp/symmetricDifference.d.ts
new file mode 100644
index 0000000000..8d09e4f1a3
--- /dev/null
+++ b/types/lodash/fp/symmetricDifference.d.ts
@@ -0,0 +1,48 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Xor {
+    /**
+     * Creates an array of unique values that is the symmetric difference of the provided arrays.
+     *
+     * @param arrays The arrays to inspect.
+     * @return Returns the new array of values.
+     */
+    (): Xor;
+    /**
+     * Creates an array of unique values that is the symmetric difference of the provided arrays.
+     *
+     * @param arrays The arrays to inspect.
+     * @return Returns the new array of values.
+     */
+    <T>(arrays2: _.List<T> | null | undefined): Xor1x1<T>;
+    /**
+     * Creates an array of unique values that is the symmetric difference of the provided arrays.
+     *
+     * @param arrays The arrays to inspect.
+     * @return Returns the new array of values.
+     */
+    <T>(arrays2: _.List<T> | null | undefined, arrays: _.List<T> | null | undefined): T[];
+}
+interface Xor1x1<T> {
+    /**
+     * Creates an array of unique values that is the symmetric difference of the provided arrays.
+     *
+     * @param arrays The arrays to inspect.
+     * @return Returns the new array of values.
+     */
+    (): Xor1x1<T>;
+    /**
+     * Creates an array of unique values that is the symmetric difference of the provided arrays.
+     *
+     * @param arrays The arrays to inspect.
+     * @return Returns the new array of values.
+     */
+    (arrays: _.List<T> | null | undefined): T[];
+}
+
+declare const symmetricDifference: Xor;
+export = symmetricDifference;
diff --git a/types/lodash/fp/symmetricDifferenceBy.d.ts b/types/lodash/fp/symmetricDifferenceBy.d.ts
new file mode 100644
index 0000000000..1bfeb6c6cd
--- /dev/null
+++ b/types/lodash/fp/symmetricDifferenceBy.d.ts
@@ -0,0 +1,186 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface XorBy {
+    /**
+     * This method is like `_.xor` except that it accepts `iteratee` which is
+     * invoked for each element of each `arrays` to generate the criterion by which
+     * uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the new array of values.
+     * @example
+     *
+     * _.xorBy([2.1, 1.2], [4.3, 2.4], Math.floor);
+     * // => [1.2, 4.3]
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.xorBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
+     * // => [{ 'x': 2 }]
+     */
+    (): XorBy;
+    /**
+     * This method is like `_.xor` except that it accepts `iteratee` which is
+     * invoked for each element of each `arrays` to generate the criterion by which
+     * uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the new array of values.
+     * @example
+     *
+     * _.xorBy([2.1, 1.2], [4.3, 2.4], Math.floor);
+     * // => [1.2, 4.3]
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.xorBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
+     * // => [{ 'x': 2 }]
+     */
+    <T>(iteratee: _.ValueIteratee<T>): XorBy1x1<T>;
+    /**
+     * This method is like `_.xor` except that it accepts `iteratee` which is
+     * invoked for each element of each `arrays` to generate the criterion by which
+     * uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the new array of values.
+     * @example
+     *
+     * _.xorBy([2.1, 1.2], [4.3, 2.4], Math.floor);
+     * // => [1.2, 4.3]
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.xorBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
+     * // => [{ 'x': 2 }]
+     */
+    <T>(iteratee: _.ValueIteratee<T>, arrays: _.List<T> | null | undefined): XorBy1x2<T>;
+    /**
+     * This method is like `_.xor` except that it accepts `iteratee` which is
+     * invoked for each element of each `arrays` to generate the criterion by which
+     * uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the new array of values.
+     * @example
+     *
+     * _.xorBy([2.1, 1.2], [4.3, 2.4], Math.floor);
+     * // => [1.2, 4.3]
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.xorBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
+     * // => [{ 'x': 2 }]
+     */
+    <T>(iteratee: _.ValueIteratee<T>, arrays: _.List<T> | null | undefined, arrays2: _.List<T> | null | undefined): T[];
+}
+interface XorBy1x1<T> {
+    /**
+     * This method is like `_.xor` except that it accepts `iteratee` which is
+     * invoked for each element of each `arrays` to generate the criterion by which
+     * uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the new array of values.
+     * @example
+     *
+     * _.xorBy([2.1, 1.2], [4.3, 2.4], Math.floor);
+     * // => [1.2, 4.3]
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.xorBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
+     * // => [{ 'x': 2 }]
+     */
+    (): XorBy1x1<T>;
+    /**
+     * This method is like `_.xor` except that it accepts `iteratee` which is
+     * invoked for each element of each `arrays` to generate the criterion by which
+     * uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the new array of values.
+     * @example
+     *
+     * _.xorBy([2.1, 1.2], [4.3, 2.4], Math.floor);
+     * // => [1.2, 4.3]
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.xorBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
+     * // => [{ 'x': 2 }]
+     */
+    (arrays: _.List<T> | null | undefined): XorBy1x2<T>;
+    /**
+     * This method is like `_.xor` except that it accepts `iteratee` which is
+     * invoked for each element of each `arrays` to generate the criterion by which
+     * uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the new array of values.
+     * @example
+     *
+     * _.xorBy([2.1, 1.2], [4.3, 2.4], Math.floor);
+     * // => [1.2, 4.3]
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.xorBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
+     * // => [{ 'x': 2 }]
+     */
+    (arrays: _.List<T> | null | undefined, arrays2: _.List<T> | null | undefined): T[];
+}
+interface XorBy1x2<T> {
+    /**
+     * This method is like `_.xor` except that it accepts `iteratee` which is
+     * invoked for each element of each `arrays` to generate the criterion by which
+     * uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the new array of values.
+     * @example
+     *
+     * _.xorBy([2.1, 1.2], [4.3, 2.4], Math.floor);
+     * // => [1.2, 4.3]
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.xorBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
+     * // => [{ 'x': 2 }]
+     */
+    (): XorBy1x2<T>;
+    /**
+     * This method is like `_.xor` except that it accepts `iteratee` which is
+     * invoked for each element of each `arrays` to generate the criterion by which
+     * uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the new array of values.
+     * @example
+     *
+     * _.xorBy([2.1, 1.2], [4.3, 2.4], Math.floor);
+     * // => [1.2, 4.3]
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.xorBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
+     * // => [{ 'x': 2 }]
+     */
+    (arrays2: _.List<T> | null | undefined): T[];
+}
+
+declare const symmetricDifferenceBy: XorBy;
+export = symmetricDifferenceBy;
diff --git a/types/lodash/fp/symmetricDifferenceWith.d.ts b/types/lodash/fp/symmetricDifferenceWith.d.ts
new file mode 100644
index 0000000000..0aa1d417fb
--- /dev/null
+++ b/types/lodash/fp/symmetricDifferenceWith.d.ts
@@ -0,0 +1,177 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface XorWith {
+    /**
+     * This method is like `_.xor` except that it accepts `comparator` which is
+     * invoked to compare elements of `arrays`. The comparator is invoked with
+     * two arguments: (arrVal, othVal).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [comparator] The comparator invoked per element.
+     * @returns Returns the new array of values.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
+     *
+     * _.xorWith(objects, others, _.isEqual);
+     * // => [{ 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
+     */
+    (): XorWith;
+    /**
+     * This method is like `_.xor` except that it accepts `comparator` which is
+     * invoked to compare elements of `arrays`. The comparator is invoked with
+     * two arguments: (arrVal, othVal).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [comparator] The comparator invoked per element.
+     * @returns Returns the new array of values.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
+     *
+     * _.xorWith(objects, others, _.isEqual);
+     * // => [{ 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
+     */
+    <T>(comparator: _.Comparator<T>): XorWith1x1<T>;
+    /**
+     * This method is like `_.xor` except that it accepts `comparator` which is
+     * invoked to compare elements of `arrays`. The comparator is invoked with
+     * two arguments: (arrVal, othVal).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [comparator] The comparator invoked per element.
+     * @returns Returns the new array of values.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
+     *
+     * _.xorWith(objects, others, _.isEqual);
+     * // => [{ 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
+     */
+    <T>(comparator: _.Comparator<T>, arrays: _.List<T> | null | undefined): XorWith1x2<T>;
+    /**
+     * This method is like `_.xor` except that it accepts `comparator` which is
+     * invoked to compare elements of `arrays`. The comparator is invoked with
+     * two arguments: (arrVal, othVal).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [comparator] The comparator invoked per element.
+     * @returns Returns the new array of values.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
+     *
+     * _.xorWith(objects, others, _.isEqual);
+     * // => [{ 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
+     */
+    <T>(comparator: _.Comparator<T>, arrays: _.List<T> | null | undefined, arrays2: _.List<T> | null | undefined): T[];
+}
+interface XorWith1x1<T> {
+    /**
+     * This method is like `_.xor` except that it accepts `comparator` which is
+     * invoked to compare elements of `arrays`. The comparator is invoked with
+     * two arguments: (arrVal, othVal).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [comparator] The comparator invoked per element.
+     * @returns Returns the new array of values.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
+     *
+     * _.xorWith(objects, others, _.isEqual);
+     * // => [{ 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
+     */
+    (): XorWith1x1<T>;
+    /**
+     * This method is like `_.xor` except that it accepts `comparator` which is
+     * invoked to compare elements of `arrays`. The comparator is invoked with
+     * two arguments: (arrVal, othVal).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [comparator] The comparator invoked per element.
+     * @returns Returns the new array of values.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
+     *
+     * _.xorWith(objects, others, _.isEqual);
+     * // => [{ 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
+     */
+    (arrays: _.List<T> | null | undefined): XorWith1x2<T>;
+    /**
+     * This method is like `_.xor` except that it accepts `comparator` which is
+     * invoked to compare elements of `arrays`. The comparator is invoked with
+     * two arguments: (arrVal, othVal).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [comparator] The comparator invoked per element.
+     * @returns Returns the new array of values.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
+     *
+     * _.xorWith(objects, others, _.isEqual);
+     * // => [{ 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
+     */
+    (arrays: _.List<T> | null | undefined, arrays2: _.List<T> | null | undefined): T[];
+}
+interface XorWith1x2<T> {
+    /**
+     * This method is like `_.xor` except that it accepts `comparator` which is
+     * invoked to compare elements of `arrays`. The comparator is invoked with
+     * two arguments: (arrVal, othVal).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [comparator] The comparator invoked per element.
+     * @returns Returns the new array of values.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
+     *
+     * _.xorWith(objects, others, _.isEqual);
+     * // => [{ 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
+     */
+    (): XorWith1x2<T>;
+    /**
+     * This method is like `_.xor` except that it accepts `comparator` which is
+     * invoked to compare elements of `arrays`. The comparator is invoked with
+     * two arguments: (arrVal, othVal).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [comparator] The comparator invoked per element.
+     * @returns Returns the new array of values.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
+     *
+     * _.xorWith(objects, others, _.isEqual);
+     * // => [{ 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
+     */
+    (arrays2: _.List<T> | null | undefined): T[];
+}
+
+declare const symmetricDifferenceWith: XorWith;
+export = symmetricDifferenceWith;
diff --git a/types/lodash/fp/tail.d.ts b/types/lodash/fp/tail.d.ts
new file mode 100644
index 0000000000..1f4e5baea5
--- /dev/null
+++ b/types/lodash/fp/tail.d.ts
@@ -0,0 +1,17 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+type Tail =
+    /**
+     * Gets all but the first element of array.
+     *
+     * @param array The array to query.
+     * @return Returns the slice of array.
+     */
+    <T>(array: _.List<T> | null | undefined) => T[];
+
+declare const tail: Tail;
+export = tail;
diff --git a/types/lodash/fp/take.d.ts b/types/lodash/fp/take.d.ts
new file mode 100644
index 0000000000..8c64452d27
--- /dev/null
+++ b/types/lodash/fp/take.d.ts
@@ -0,0 +1,53 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Take {
+    /**
+     * Creates a slice of array with n elements taken from the beginning.
+     *
+     * @param array The array to query.
+     * @param n The number of elements to take.
+     * @return Returns the slice of array.
+     */
+    (): Take;
+    /**
+     * Creates a slice of array with n elements taken from the beginning.
+     *
+     * @param array The array to query.
+     * @param n The number of elements to take.
+     * @return Returns the slice of array.
+     */
+    (n: number): Take1x1;
+    /**
+     * Creates a slice of array with n elements taken from the beginning.
+     *
+     * @param array The array to query.
+     * @param n The number of elements to take.
+     * @return Returns the slice of array.
+     */
+    <T>(n: number, array: _.List<T> | null | undefined): T[];
+}
+interface Take1x1 {
+    /**
+     * Creates a slice of array with n elements taken from the beginning.
+     *
+     * @param array The array to query.
+     * @param n The number of elements to take.
+     * @return Returns the slice of array.
+     */
+    (): Take1x1;
+    /**
+     * Creates a slice of array with n elements taken from the beginning.
+     *
+     * @param array The array to query.
+     * @param n The number of elements to take.
+     * @return Returns the slice of array.
+     */
+    <T>(array: _.List<T> | null | undefined): T[];
+}
+
+declare const take: Take;
+export = take;
diff --git a/types/lodash/fp/takeLast.d.ts b/types/lodash/fp/takeLast.d.ts
new file mode 100644
index 0000000000..6677d06e16
--- /dev/null
+++ b/types/lodash/fp/takeLast.d.ts
@@ -0,0 +1,53 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface TakeRight {
+    /**
+     * Creates a slice of array with n elements taken from the end.
+     *
+     * @param array The array to query.
+     * @param n The number of elements to take.
+     * @return Returns the slice of array.
+     */
+    (): TakeRight;
+    /**
+     * Creates a slice of array with n elements taken from the end.
+     *
+     * @param array The array to query.
+     * @param n The number of elements to take.
+     * @return Returns the slice of array.
+     */
+    (n: number): TakeRight1x1;
+    /**
+     * Creates a slice of array with n elements taken from the end.
+     *
+     * @param array The array to query.
+     * @param n The number of elements to take.
+     * @return Returns the slice of array.
+     */
+    <T>(n: number, array: _.List<T> | null | undefined): T[];
+}
+interface TakeRight1x1 {
+    /**
+     * Creates a slice of array with n elements taken from the end.
+     *
+     * @param array The array to query.
+     * @param n The number of elements to take.
+     * @return Returns the slice of array.
+     */
+    (): TakeRight1x1;
+    /**
+     * Creates a slice of array with n elements taken from the end.
+     *
+     * @param array The array to query.
+     * @param n The number of elements to take.
+     * @return Returns the slice of array.
+     */
+    <T>(array: _.List<T> | null | undefined): T[];
+}
+
+declare const takeLast: TakeRight;
+export = takeLast;
diff --git a/types/lodash/fp/takeLastWhile.d.ts b/types/lodash/fp/takeLastWhile.d.ts
new file mode 100644
index 0000000000..4e2cd0a933
--- /dev/null
+++ b/types/lodash/fp/takeLastWhile.d.ts
@@ -0,0 +1,108 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface TakeRightWhile {
+    /**
+     * Creates a slice of array with elements taken from the end. Elements are taken until predicate returns
+     * falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param array The array to query.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the slice of array.
+     */
+    (): TakeRightWhile;
+    /**
+     * Creates a slice of array with elements taken from the end. Elements are taken until predicate returns
+     * falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param array The array to query.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the slice of array.
+     */
+    <T>(predicate: _.ValueIteratee<T>): TakeRightWhile1x1<T>;
+    /**
+     * Creates a slice of array with elements taken from the end. Elements are taken until predicate returns
+     * falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param array The array to query.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the slice of array.
+     */
+    <T>(predicate: _.ValueIteratee<T>, array: _.List<T> | null | undefined): T[];
+}
+interface TakeRightWhile1x1<T> {
+    /**
+     * Creates a slice of array with elements taken from the end. Elements are taken until predicate returns
+     * falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param array The array to query.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the slice of array.
+     */
+    (): TakeRightWhile1x1<T>;
+    /**
+     * Creates a slice of array with elements taken from the end. Elements are taken until predicate returns
+     * falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param array The array to query.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the slice of array.
+     */
+    (array: _.List<T> | null | undefined): T[];
+}
+
+declare const takeLastWhile: TakeRightWhile;
+export = takeLastWhile;
diff --git a/types/lodash/fp/takeRight.d.ts b/types/lodash/fp/takeRight.d.ts
new file mode 100644
index 0000000000..385f447919
--- /dev/null
+++ b/types/lodash/fp/takeRight.d.ts
@@ -0,0 +1,53 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface TakeRight {
+    /**
+     * Creates a slice of array with n elements taken from the end.
+     *
+     * @param array The array to query.
+     * @param n The number of elements to take.
+     * @return Returns the slice of array.
+     */
+    (): TakeRight;
+    /**
+     * Creates a slice of array with n elements taken from the end.
+     *
+     * @param array The array to query.
+     * @param n The number of elements to take.
+     * @return Returns the slice of array.
+     */
+    (n: number): TakeRight1x1;
+    /**
+     * Creates a slice of array with n elements taken from the end.
+     *
+     * @param array The array to query.
+     * @param n The number of elements to take.
+     * @return Returns the slice of array.
+     */
+    <T>(n: number, array: _.List<T> | null | undefined): T[];
+}
+interface TakeRight1x1 {
+    /**
+     * Creates a slice of array with n elements taken from the end.
+     *
+     * @param array The array to query.
+     * @param n The number of elements to take.
+     * @return Returns the slice of array.
+     */
+    (): TakeRight1x1;
+    /**
+     * Creates a slice of array with n elements taken from the end.
+     *
+     * @param array The array to query.
+     * @param n The number of elements to take.
+     * @return Returns the slice of array.
+     */
+    <T>(array: _.List<T> | null | undefined): T[];
+}
+
+declare const takeRight: TakeRight;
+export = takeRight;
diff --git a/types/lodash/fp/takeRightWhile.d.ts b/types/lodash/fp/takeRightWhile.d.ts
new file mode 100644
index 0000000000..b2a8934a14
--- /dev/null
+++ b/types/lodash/fp/takeRightWhile.d.ts
@@ -0,0 +1,108 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface TakeRightWhile {
+    /**
+     * Creates a slice of array with elements taken from the end. Elements are taken until predicate returns
+     * falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param array The array to query.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the slice of array.
+     */
+    (): TakeRightWhile;
+    /**
+     * Creates a slice of array with elements taken from the end. Elements are taken until predicate returns
+     * falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param array The array to query.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the slice of array.
+     */
+    <T>(predicate: _.ValueIteratee<T>): TakeRightWhile1x1<T>;
+    /**
+     * Creates a slice of array with elements taken from the end. Elements are taken until predicate returns
+     * falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param array The array to query.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the slice of array.
+     */
+    <T>(predicate: _.ValueIteratee<T>, array: _.List<T> | null | undefined): T[];
+}
+interface TakeRightWhile1x1<T> {
+    /**
+     * Creates a slice of array with elements taken from the end. Elements are taken until predicate returns
+     * falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param array The array to query.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the slice of array.
+     */
+    (): TakeRightWhile1x1<T>;
+    /**
+     * Creates a slice of array with elements taken from the end. Elements are taken until predicate returns
+     * falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param array The array to query.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the slice of array.
+     */
+    (array: _.List<T> | null | undefined): T[];
+}
+
+declare const takeRightWhile: TakeRightWhile;
+export = takeRightWhile;
diff --git a/types/lodash/fp/takeWhile.d.ts b/types/lodash/fp/takeWhile.d.ts
new file mode 100644
index 0000000000..3082de833b
--- /dev/null
+++ b/types/lodash/fp/takeWhile.d.ts
@@ -0,0 +1,108 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface TakeWhile {
+    /**
+     * Creates a slice of array with elements taken from the beginning. Elements are taken until predicate returns
+     * falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param array The array to query.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the slice of array.
+     */
+    (): TakeWhile;
+    /**
+     * Creates a slice of array with elements taken from the beginning. Elements are taken until predicate returns
+     * falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param array The array to query.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the slice of array.
+     */
+    <T>(predicate: _.ValueIteratee<T>): TakeWhile1x1<T>;
+    /**
+     * Creates a slice of array with elements taken from the beginning. Elements are taken until predicate returns
+     * falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param array The array to query.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the slice of array.
+     */
+    <T>(predicate: _.ValueIteratee<T>, array: _.List<T> | null | undefined): T[];
+}
+interface TakeWhile1x1<T> {
+    /**
+     * Creates a slice of array with elements taken from the beginning. Elements are taken until predicate returns
+     * falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param array The array to query.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the slice of array.
+     */
+    (): TakeWhile1x1<T>;
+    /**
+     * Creates a slice of array with elements taken from the beginning. Elements are taken until predicate returns
+     * falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
+     *
+     * If a property name is provided for predicate the created _.property style callback returns the property
+     * value of the given element.
+     *
+     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
+     * elements that have a matching property value, else false.
+     *
+     * If an object is provided for predicate the created _.matches style callback returns true for elements that
+     * have the properties of the given object, else false.
+     *
+     * @param array The array to query.
+     * @param predicate The function invoked per iteration.
+     * @param thisArg The this binding of predicate.
+     * @return Returns the slice of array.
+     */
+    (array: _.List<T> | null | undefined): T[];
+}
+
+declare const takeWhile: TakeWhile;
+export = takeWhile;
diff --git a/types/lodash/fp/tap.d.ts b/types/lodash/fp/tap.d.ts
new file mode 100644
index 0000000000..2091f9301a
--- /dev/null
+++ b/types/lodash/fp/tap.d.ts
@@ -0,0 +1,66 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface Tap {
+    /**
+     * This method invokes interceptor and returns value. The interceptor is bound to thisArg and invoked with one
+     * argument; (value). The purpose of this method is to "tap into" a method chain in order to perform operations
+     * on intermediate results within the chain.
+     *
+     * @param value The value to provide to interceptor.
+     * @param interceptor The function to invoke.
+     * @parem thisArg The this binding of interceptor.
+     * @return Returns value.
+     **/
+    (): Tap;
+    /**
+     * This method invokes interceptor and returns value. The interceptor is bound to thisArg and invoked with one
+     * argument; (value). The purpose of this method is to "tap into" a method chain in order to perform operations
+     * on intermediate results within the chain.
+     *
+     * @param value The value to provide to interceptor.
+     * @param interceptor The function to invoke.
+     * @parem thisArg The this binding of interceptor.
+     * @return Returns value.
+     **/
+    <T>(interceptor: (value: T) => void): Tap1x1<T>;
+    /**
+     * This method invokes interceptor and returns value. The interceptor is bound to thisArg and invoked with one
+     * argument; (value). The purpose of this method is to "tap into" a method chain in order to perform operations
+     * on intermediate results within the chain.
+     *
+     * @param value The value to provide to interceptor.
+     * @param interceptor The function to invoke.
+     * @parem thisArg The this binding of interceptor.
+     * @return Returns value.
+     **/
+    <T>(interceptor: (value: T) => void, value: T): T;
+}
+interface Tap1x1<T> {
+    /**
+     * This method invokes interceptor and returns value. The interceptor is bound to thisArg and invoked with one
+     * argument; (value). The purpose of this method is to "tap into" a method chain in order to perform operations
+     * on intermediate results within the chain.
+     *
+     * @param value The value to provide to interceptor.
+     * @param interceptor The function to invoke.
+     * @parem thisArg The this binding of interceptor.
+     * @return Returns value.
+     **/
+    (): Tap1x1<T>;
+    /**
+     * This method invokes interceptor and returns value. The interceptor is bound to thisArg and invoked with one
+     * argument; (value). The purpose of this method is to "tap into" a method chain in order to perform operations
+     * on intermediate results within the chain.
+     *
+     * @param value The value to provide to interceptor.
+     * @param interceptor The function to invoke.
+     * @parem thisArg The this binding of interceptor.
+     * @return Returns value.
+     **/
+    (value: T): T;
+}
+
+declare const tap: Tap;
+export = tap;
diff --git a/types/lodash/fp/template.d.ts b/types/lodash/fp/template.d.ts
new file mode 100644
index 0000000000..f913171374
--- /dev/null
+++ b/types/lodash/fp/template.d.ts
@@ -0,0 +1,37 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+type Template =
+    /**
+     * Creates a compiled template function that can interpolate data properties in "interpolate" delimiters,
+     * HTML-escape interpolated data properties in "escape" delimiters, and execute JavaScript in "evaluate"
+     * delimiters. Data properties may be accessed as free variables in the template. If a setting object is
+     * provided it takes precedence over _.templateSettings values.
+     *
+     * Note: In the development build _.template utilizes
+     * [sourceURLs](http://www.html5rocks.com/en/tutorials/developertools/sourcemaps/#toc-sourceurl) for easier
+     * debugging.
+     *
+     * For more information on precompiling templates see
+     * [lodash's custom builds documentation](https://lodash.com/custom-builds).
+     *
+     * For more information on Chrome extension sandboxes see
+     * [Chrome's extensions documentation](https://developer.chrome.com/extensions/sandboxingEval).
+     *
+     * @param string The template string.
+     * @param options The options object.
+     * @param options.escape The HTML "escape" delimiter.
+     * @param options.evaluate The "evaluate" delimiter.
+     * @param options.imports An object to import into the template as free variables.
+     * @param options.interpolate The "interpolate" delimiter.
+     * @param options.sourceURL The sourceURL of the template's compiled source.
+     * @param options.variable The data object variable name.
+     * @return Returns the compiled template function.
+     */
+    (string: string) => _.TemplateExecutor;
+
+declare const template: Template;
+export = template;
diff --git a/types/lodash/fp/throttle.d.ts b/types/lodash/fp/throttle.d.ts
new file mode 100644
index 0000000000..7644c669e4
--- /dev/null
+++ b/types/lodash/fp/throttle.d.ts
@@ -0,0 +1,98 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Throttle {
+    /**
+     * Creates a throttled function that only invokes func at most once per every wait milliseconds. The throttled
+     * function comes with a cancel method to cancel delayed invocations and a flush method to immediately invoke
+     * them. Provide an options object to indicate that func should be invoked on the leading and/or trailing edge
+     * of the wait timeout. Subsequent calls to the throttled function return the result of the last func call.
+     *
+     * Note: If leading and trailing options are true, func is invoked on the trailing edge of the timeout only if
+     * the the throttled function is invoked more than once during the wait timeout.
+     *
+     * @param func The function to throttle.
+     * @param wait The number of milliseconds to throttle invocations to.
+     * @param options The options object.
+     * @param options.leading Specify invoking on the leading edge of the timeout.
+     * @param options.trailing Specify invoking on the trailing edge of the timeout.
+     * @return Returns the new throttled function.
+     */
+    (): Throttle;
+    /**
+     * Creates a throttled function that only invokes func at most once per every wait milliseconds. The throttled
+     * function comes with a cancel method to cancel delayed invocations and a flush method to immediately invoke
+     * them. Provide an options object to indicate that func should be invoked on the leading and/or trailing edge
+     * of the wait timeout. Subsequent calls to the throttled function return the result of the last func call.
+     *
+     * Note: If leading and trailing options are true, func is invoked on the trailing edge of the timeout only if
+     * the the throttled function is invoked more than once during the wait timeout.
+     *
+     * @param func The function to throttle.
+     * @param wait The number of milliseconds to throttle invocations to.
+     * @param options The options object.
+     * @param options.leading Specify invoking on the leading edge of the timeout.
+     * @param options.trailing Specify invoking on the trailing edge of the timeout.
+     * @return Returns the new throttled function.
+     */
+    (wait: number): Throttle1x1;
+    /**
+     * Creates a throttled function that only invokes func at most once per every wait milliseconds. The throttled
+     * function comes with a cancel method to cancel delayed invocations and a flush method to immediately invoke
+     * them. Provide an options object to indicate that func should be invoked on the leading and/or trailing edge
+     * of the wait timeout. Subsequent calls to the throttled function return the result of the last func call.
+     *
+     * Note: If leading and trailing options are true, func is invoked on the trailing edge of the timeout only if
+     * the the throttled function is invoked more than once during the wait timeout.
+     *
+     * @param func The function to throttle.
+     * @param wait The number of milliseconds to throttle invocations to.
+     * @param options The options object.
+     * @param options.leading Specify invoking on the leading edge of the timeout.
+     * @param options.trailing Specify invoking on the trailing edge of the timeout.
+     * @return Returns the new throttled function.
+     */
+    <T extends (...args: any[]) => any>(wait: number, func: T): T & _.Cancelable;
+}
+interface Throttle1x1 {
+    /**
+     * Creates a throttled function that only invokes func at most once per every wait milliseconds. The throttled
+     * function comes with a cancel method to cancel delayed invocations and a flush method to immediately invoke
+     * them. Provide an options object to indicate that func should be invoked on the leading and/or trailing edge
+     * of the wait timeout. Subsequent calls to the throttled function return the result of the last func call.
+     *
+     * Note: If leading and trailing options are true, func is invoked on the trailing edge of the timeout only if
+     * the the throttled function is invoked more than once during the wait timeout.
+     *
+     * @param func The function to throttle.
+     * @param wait The number of milliseconds to throttle invocations to.
+     * @param options The options object.
+     * @param options.leading Specify invoking on the leading edge of the timeout.
+     * @param options.trailing Specify invoking on the trailing edge of the timeout.
+     * @return Returns the new throttled function.
+     */
+    (): Throttle1x1;
+    /**
+     * Creates a throttled function that only invokes func at most once per every wait milliseconds. The throttled
+     * function comes with a cancel method to cancel delayed invocations and a flush method to immediately invoke
+     * them. Provide an options object to indicate that func should be invoked on the leading and/or trailing edge
+     * of the wait timeout. Subsequent calls to the throttled function return the result of the last func call.
+     *
+     * Note: If leading and trailing options are true, func is invoked on the trailing edge of the timeout only if
+     * the the throttled function is invoked more than once during the wait timeout.
+     *
+     * @param func The function to throttle.
+     * @param wait The number of milliseconds to throttle invocations to.
+     * @param options The options object.
+     * @param options.leading Specify invoking on the leading edge of the timeout.
+     * @param options.trailing Specify invoking on the trailing edge of the timeout.
+     * @return Returns the new throttled function.
+     */
+    <T extends (...args: any[]) => any>(func: T): T & _.Cancelable;
+}
+
+declare const throttle: Throttle;
+export = throttle;
diff --git a/types/lodash/fp/thru.d.ts b/types/lodash/fp/thru.d.ts
new file mode 100644
index 0000000000..d7f60ba8d0
--- /dev/null
+++ b/types/lodash/fp/thru.d.ts
@@ -0,0 +1,56 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface Thru {
+    /**
+     * This method is like _.tap except that it returns the result of interceptor.
+     *
+     * @param value The value to provide to interceptor.
+     * @param interceptor The function to invoke.
+     * @param thisArg The this binding of interceptor.
+     * @return Returns the result of interceptor.
+     */
+    (): Thru;
+    /**
+     * This method is like _.tap except that it returns the result of interceptor.
+     *
+     * @param value The value to provide to interceptor.
+     * @param interceptor The function to invoke.
+     * @param thisArg The this binding of interceptor.
+     * @return Returns the result of interceptor.
+     */
+    <T, TResult>(interceptor: (value: T) => TResult): Thru1x1<T, TResult>;
+    /**
+     * This method is like _.tap except that it returns the result of interceptor.
+     *
+     * @param value The value to provide to interceptor.
+     * @param interceptor The function to invoke.
+     * @param thisArg The this binding of interceptor.
+     * @return Returns the result of interceptor.
+     */
+    <T, TResult>(interceptor: (value: T) => TResult, value: T): TResult;
+}
+interface Thru1x1<T, TResult> {
+    /**
+     * This method is like _.tap except that it returns the result of interceptor.
+     *
+     * @param value The value to provide to interceptor.
+     * @param interceptor The function to invoke.
+     * @param thisArg The this binding of interceptor.
+     * @return Returns the result of interceptor.
+     */
+    (): Thru1x1<T, TResult>;
+    /**
+     * This method is like _.tap except that it returns the result of interceptor.
+     *
+     * @param value The value to provide to interceptor.
+     * @param interceptor The function to invoke.
+     * @param thisArg The this binding of interceptor.
+     * @return Returns the result of interceptor.
+     */
+    (value: T): TResult;
+}
+
+declare const thru: Thru;
+export = thru;
diff --git a/types/lodash/fp/times.d.ts b/types/lodash/fp/times.d.ts
new file mode 100644
index 0000000000..777f7423fc
--- /dev/null
+++ b/types/lodash/fp/times.d.ts
@@ -0,0 +1,56 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface Times {
+    /**
+     * Invokes the iteratee function n times, returning an array of the results of each invocation. The iteratee
+     * is invoked with one argument; (index).
+     *
+     * @param n The number of times to invoke iteratee.
+     * @param iteratee The function invoked per iteration.
+     * @return Returns the array of results.
+     */
+    (): Times;
+    /**
+     * Invokes the iteratee function n times, returning an array of the results of each invocation. The iteratee
+     * is invoked with one argument; (index).
+     *
+     * @param n The number of times to invoke iteratee.
+     * @param iteratee The function invoked per iteration.
+     * @return Returns the array of results.
+     */
+    <TResult>(iteratee: (num: number) => TResult): Times1x1<TResult>;
+    /**
+     * Invokes the iteratee function n times, returning an array of the results of each invocation. The iteratee
+     * is invoked with one argument; (index).
+     *
+     * @param n The number of times to invoke iteratee.
+     * @param iteratee The function invoked per iteration.
+     * @return Returns the array of results.
+     */
+    <TResult>(iteratee: (num: number) => TResult, n: number): TResult[];
+}
+interface Times1x1<TResult> {
+    /**
+     * Invokes the iteratee function n times, returning an array of the results of each invocation. The iteratee
+     * is invoked with one argument; (index).
+     *
+     * @param n The number of times to invoke iteratee.
+     * @param iteratee The function invoked per iteration.
+     * @return Returns the array of results.
+     */
+    (): Times1x1<TResult>;
+    /**
+     * Invokes the iteratee function n times, returning an array of the results of each invocation. The iteratee
+     * is invoked with one argument; (index).
+     *
+     * @param n The number of times to invoke iteratee.
+     * @param iteratee The function invoked per iteration.
+     * @return Returns the array of results.
+     */
+    (n: number): TResult[];
+}
+
+declare const times: Times;
+export = times;
diff --git a/types/lodash/fp/toArray.d.ts b/types/lodash/fp/toArray.d.ts
new file mode 100644
index 0000000000..78d50b3fe3
--- /dev/null
+++ b/types/lodash/fp/toArray.d.ts
@@ -0,0 +1,32 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface ToArray {
+    /**
+     * Converts value to an array.
+     *
+     * @param value The value to convert.
+     * @return Returns the converted array.
+     */
+    <T>(value: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): T[];
+    /**
+     * Converts value to an array.
+     *
+     * @param value The value to convert.
+     * @return Returns the converted array.
+     */
+    <T>(value: T): Array<T[keyof T]>;
+    /**
+     * Converts value to an array.
+     *
+     * @param value The value to convert.
+     * @return Returns the converted array.
+     */
+    (): any[];
+}
+
+declare const toArray: ToArray;
+export = toArray;
diff --git a/types/lodash/fp/toFinite.d.ts b/types/lodash/fp/toFinite.d.ts
new file mode 100644
index 0000000000..7f28cb70da
--- /dev/null
+++ b/types/lodash/fp/toFinite.d.ts
@@ -0,0 +1,30 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type ToFinite =
+    /**
+     * Converts `value` to a finite number.
+     *
+     * @since 4.12.0
+     * @category Lang
+     * @param value The value to convert.
+     * @returns Returns the converted number.
+     * @example
+     *
+     * _.toFinite(3.2);
+     * // => 3.2
+     *
+     * _.toFinite(Number.MIN_VALUE);
+     * // => 5e-324
+     *
+     * _.toFinite(Infinity);
+     * // => 1.7976931348623157e+308
+     *
+     * _.toFinite('3.2');
+     * // => 3.2
+     */
+    (value: any) => number;
+
+declare const toFinite: ToFinite;
+export = toFinite;
diff --git a/types/lodash/fp/toInteger.d.ts b/types/lodash/fp/toInteger.d.ts
new file mode 100644
index 0000000000..7eb32253d7
--- /dev/null
+++ b/types/lodash/fp/toInteger.d.ts
@@ -0,0 +1,31 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type ToInteger =
+    /**
+     * Converts `value` to an integer.
+     *
+     * **Note:** This function is loosely based on [`ToInteger`](http://www.ecma-international.org/ecma-262/6.0/#sec-tointeger).
+     *
+     * @category Lang
+     * @param value The value to convert.
+     * @returns Returns the converted integer.
+     * @example
+     *
+     * _.toInteger(3);
+     * // => 3
+     *
+     * _.toInteger(Number.MIN_VALUE);
+     * // => 0
+     *
+     * _.toInteger(Infinity);
+     * // => 1.7976931348623157e+308
+     *
+     * _.toInteger('3');
+     * // => 3
+     */
+    (value: any) => number;
+
+declare const toInteger: ToInteger;
+export = toInteger;
diff --git a/types/lodash/fp/toLength.d.ts b/types/lodash/fp/toLength.d.ts
new file mode 100644
index 0000000000..9df6af979b
--- /dev/null
+++ b/types/lodash/fp/toLength.d.ts
@@ -0,0 +1,32 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type ToLength =
+    /**
+     * Converts `value` to an integer suitable for use as the length of an
+     * array-like object.
+     *
+     * **Note:** This method is based on [`ToLength`](http://ecma-international.org/ecma-262/6.0/#sec-tolength).
+     *
+     * @category Lang
+     * @param value The value to convert.
+     * @return Returns the converted integer.
+     * @example
+     *
+     * _.toLength(3);
+     * // => 3
+     *
+     * _.toLength(Number.MIN_VALUE);
+     * // => 0
+     *
+     * _.toLength(Infinity);
+     * // => 4294967295
+     *
+     * _.toLength('3');
+     * // => 3
+     */
+    (value: any) => number;
+
+declare const toLength: ToLength;
+export = toLength;
diff --git a/types/lodash/fp/toLower.d.ts b/types/lodash/fp/toLower.d.ts
new file mode 100644
index 0000000000..6423a579b2
--- /dev/null
+++ b/types/lodash/fp/toLower.d.ts
@@ -0,0 +1,15 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type ToLower =
+    /**
+     * Converts `string`, as a whole, to lower case.
+     *
+     * @param string The string to convert.
+     * @return Returns the lower cased string.
+     */
+    (string: string) => string;
+
+declare const toLower: ToLower;
+export = toLower;
diff --git a/types/lodash/fp/toNumber.d.ts b/types/lodash/fp/toNumber.d.ts
new file mode 100644
index 0000000000..346ded8778
--- /dev/null
+++ b/types/lodash/fp/toNumber.d.ts
@@ -0,0 +1,29 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type ToNumber =
+    /**
+     * Converts `value` to a number.
+     *
+     * @category Lang
+     * @param value The value to process.
+     * @returns Returns the number.
+     * @example
+     *
+     * _.toNumber(3);
+     * // => 3
+     *
+     * _.toNumber(Number.MIN_VALUE);
+     * // => 5e-324
+     *
+     * _.toNumber(Infinity);
+     * // => Infinity
+     *
+     * _.toNumber('3');
+     * // => 3
+     */
+    (value: any) => number;
+
+declare const toNumber: ToNumber;
+export = toNumber;
diff --git a/types/lodash/fp/toPairs.d.ts b/types/lodash/fp/toPairs.d.ts
new file mode 100644
index 0000000000..4097690ac8
--- /dev/null
+++ b/types/lodash/fp/toPairs.d.ts
@@ -0,0 +1,25 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface ToPairs {
+    /**
+     * Creates an array of own enumerable key-value pairs for object.
+     *
+     * @param object The object to query.
+     * @return Returns the new array of key-value pairs.
+     */
+    <T>(object: _.Dictionary<T> | _.NumericDictionary<T>): Array<[string, T]>;
+    /**
+     * Creates an array of own enumerable key-value pairs for object.
+     *
+     * @param object The object to query.
+     * @return Returns the new array of key-value pairs.
+     */
+    (object: object): Array<[string, any]>;
+}
+
+declare const toPairs: ToPairs;
+export = toPairs;
diff --git a/types/lodash/fp/toPairsIn.d.ts b/types/lodash/fp/toPairsIn.d.ts
new file mode 100644
index 0000000000..80859cc318
--- /dev/null
+++ b/types/lodash/fp/toPairsIn.d.ts
@@ -0,0 +1,25 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface ToPairsIn {
+    /**
+     * Creates an array of own and inherited enumerable key-value pairs for object.
+     *
+     * @param object The object to query.
+     * @return Returns the new array of key-value pairs.
+     */
+    <T>(object: _.Dictionary<T> | _.NumericDictionary<T>): Array<[string, T]>;
+    /**
+     * Creates an array of own and inherited enumerable key-value pairs for object.
+     *
+     * @param object The object to query.
+     * @return Returns the new array of key-value pairs.
+     */
+    (object: object): Array<[string, any]>;
+}
+
+declare const toPairsIn: ToPairsIn;
+export = toPairsIn;
diff --git a/types/lodash/fp/toPath.d.ts b/types/lodash/fp/toPath.d.ts
new file mode 100644
index 0000000000..a501811e14
--- /dev/null
+++ b/types/lodash/fp/toPath.d.ts
@@ -0,0 +1,32 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type ToPath =
+    /**
+     * Converts `value` to a property path array.
+     *
+     * @category Util
+     * @param value The value to convert.
+     * @returns Returns the new property path array.
+     * @example
+     *
+     * _.toPath('a.b.c');
+     * // => ['a', 'b', 'c']
+     *
+     * _.toPath('a[0].b.c');
+     * // => ['a', '0', 'b', 'c']
+     *
+     * var path = ['a', 'b', 'c'],
+     * newPath = _.toPath(path);
+     *
+     * console.log(newPath);
+     * // => ['a', 'b', 'c']
+     *
+     * console.log(path === newPath);
+     * // => false
+     */
+    (value: any) => string[];
+
+declare const toPath: ToPath;
+export = toPath;
diff --git a/types/lodash/fp/toPlainObject.d.ts b/types/lodash/fp/toPlainObject.d.ts
new file mode 100644
index 0000000000..18b2eada62
--- /dev/null
+++ b/types/lodash/fp/toPlainObject.d.ts
@@ -0,0 +1,16 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type ToPlainObject =
+    /**
+     * Converts value to a plain object flattening inherited enumerable properties of value to own properties
+     * of the plain object.
+     *
+     * @param value The value to convert.
+     * @return Returns the converted plain object.
+     */
+    (value: any) => any;
+
+declare const toPlainObject: ToPlainObject;
+export = toPlainObject;
diff --git a/types/lodash/fp/toSafeInteger.d.ts b/types/lodash/fp/toSafeInteger.d.ts
new file mode 100644
index 0000000000..9ddc6a79a1
--- /dev/null
+++ b/types/lodash/fp/toSafeInteger.d.ts
@@ -0,0 +1,30 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type ToSafeInteger =
+    /**
+     * Converts `value` to a safe integer. A safe integer can be compared and
+     * represented correctly.
+     *
+     * @category Lang
+     * @param value The value to convert.
+     * @returns Returns the converted integer.
+     * @example
+     *
+     * _.toSafeInteger(3);
+     * // => 3
+     *
+     * _.toSafeInteger(Number.MIN_VALUE);
+     * // => 0
+     *
+     * _.toSafeInteger(Infinity);
+     * // => 9007199254740991
+     *
+     * _.toSafeInteger('3');
+     * // => 3
+     */
+    (value: any) => number;
+
+declare const toSafeInteger: ToSafeInteger;
+export = toSafeInteger;
diff --git a/types/lodash/fp/toString.d.ts b/types/lodash/fp/toString.d.ts
new file mode 100644
index 0000000000..0dcf51fecf
--- /dev/null
+++ b/types/lodash/fp/toString.d.ts
@@ -0,0 +1,27 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type ToString =
+    /**
+     * Converts `value` to a string if it's not one. An empty string is returned
+     * for `null` and `undefined` values. The sign of `-0` is preserved.
+     *
+     * @category Lang
+     * @param value The value to process.
+     * @returns Returns the string.
+     * @example
+     *
+     * _.toString(null);
+     * // => ''
+     *
+     * _.toString(-0);
+     * // => '-0'
+     *
+     * _.toString([1, 2, 3]);
+     * // => '1,2,3'
+     */
+    (value: any) => string;
+
+declare const toString: ToString;
+export = toString;
diff --git a/types/lodash/fp/toUpper.d.ts b/types/lodash/fp/toUpper.d.ts
new file mode 100644
index 0000000000..af46b1dba8
--- /dev/null
+++ b/types/lodash/fp/toUpper.d.ts
@@ -0,0 +1,15 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type ToUpper =
+    /**
+     * Converts `string`, as a whole, to upper case.
+     *
+     * @param string The string to convert.
+     * @return Returns the upper cased string.
+     */
+    (string: string) => string;
+
+declare const toUpper: ToUpper;
+export = toUpper;
diff --git a/types/lodash/fp/transform.d.ts b/types/lodash/fp/transform.d.ts
new file mode 100644
index 0000000000..420258c514
--- /dev/null
+++ b/types/lodash/fp/transform.d.ts
@@ -0,0 +1,240 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Transform {
+    /**
+     * An alternative to _.reduce; this method transforms object to a new accumulator object which is the result of
+     * running each of its own enumerable properties through iteratee, with each invocation potentially mutating
+     * the accumulator object. The iteratee is bound to thisArg and invoked with four arguments: (accumulator,
+     * value, key, object). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param accumulator The custom accumulator value.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the accumulated value.
+     */
+    (): Transform;
+    /**
+     * An alternative to _.reduce; this method transforms object to a new accumulator object which is the result of
+     * running each of its own enumerable properties through iteratee, with each invocation potentially mutating
+     * the accumulator object. The iteratee is bound to thisArg and invoked with four arguments: (accumulator,
+     * value, key, object). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param accumulator The custom accumulator value.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the accumulated value.
+     */
+    <T, TResult>(iteratee: _.MemoVoidIteratorCapped<T, TResult[]>): Transform1x1<T, TResult>;
+    /**
+     * An alternative to _.reduce; this method transforms object to a new accumulator object which is the result of
+     * running each of its own enumerable properties through iteratee, with each invocation potentially mutating
+     * the accumulator object. The iteratee is bound to thisArg and invoked with four arguments: (accumulator,
+     * value, key, object). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param accumulator The custom accumulator value.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the accumulated value.
+     */
+    <T, TResult>(iteratee: _.MemoVoidIteratorCapped<T, TResult[]>, accumulator: ReadonlyArray<TResult>): Transform1x2<T, TResult>;
+    /**
+     * An alternative to _.reduce; this method transforms object to a new accumulator object which is the result of
+     * running each of its own enumerable properties through iteratee, with each invocation potentially mutating
+     * the accumulator object. The iteratee is bound to thisArg and invoked with four arguments: (accumulator,
+     * value, key, object). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param accumulator The custom accumulator value.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the accumulated value.
+     */
+    <T, TResult>(iteratee: _.MemoVoidIteratorCapped<T, TResult[]>, accumulator: ReadonlyArray<TResult>, object: ReadonlyArray<T> | _.Dictionary<T>): TResult[];
+    /**
+     * An alternative to _.reduce; this method transforms object to a new accumulator object which is the result of
+     * running each of its own enumerable properties through iteratee, with each invocation potentially mutating
+     * the accumulator object. The iteratee is bound to thisArg and invoked with four arguments: (accumulator,
+     * value, key, object). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param accumulator The custom accumulator value.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the accumulated value.
+     */
+    <T, TResult>(iteratee: _.MemoVoidIteratorCapped<T, _.Dictionary<TResult>>): Transform2x1<T, TResult>;
+    /**
+     * An alternative to _.reduce; this method transforms object to a new accumulator object which is the result of
+     * running each of its own enumerable properties through iteratee, with each invocation potentially mutating
+     * the accumulator object. The iteratee is bound to thisArg and invoked with four arguments: (accumulator,
+     * value, key, object). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param accumulator The custom accumulator value.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the accumulated value.
+     */
+    <T, TResult>(iteratee: _.MemoVoidIteratorCapped<T, _.Dictionary<TResult>>, accumulator: _.Dictionary<TResult>): Transform2x2<T, TResult>;
+    /**
+     * An alternative to _.reduce; this method transforms object to a new accumulator object which is the result of
+     * running each of its own enumerable properties through iteratee, with each invocation potentially mutating
+     * the accumulator object. The iteratee is bound to thisArg and invoked with four arguments: (accumulator,
+     * value, key, object). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param accumulator The custom accumulator value.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the accumulated value.
+     */
+    <T, TResult>(iteratee: _.MemoVoidIteratorCapped<T, _.Dictionary<TResult>>, accumulator: _.Dictionary<TResult>, object: ReadonlyArray<T> | _.Dictionary<T>): _.Dictionary<TResult>;
+}
+interface Transform1x1<T, TResult> {
+    /**
+     * An alternative to _.reduce; this method transforms object to a new accumulator object which is the result of
+     * running each of its own enumerable properties through iteratee, with each invocation potentially mutating
+     * the accumulator object. The iteratee is bound to thisArg and invoked with four arguments: (accumulator,
+     * value, key, object). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param accumulator The custom accumulator value.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the accumulated value.
+     */
+    (): Transform1x1<T, TResult>;
+    /**
+     * An alternative to _.reduce; this method transforms object to a new accumulator object which is the result of
+     * running each of its own enumerable properties through iteratee, with each invocation potentially mutating
+     * the accumulator object. The iteratee is bound to thisArg and invoked with four arguments: (accumulator,
+     * value, key, object). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param accumulator The custom accumulator value.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the accumulated value.
+     */
+    (accumulator: ReadonlyArray<TResult>): Transform1x2<T, TResult>;
+    /**
+     * An alternative to _.reduce; this method transforms object to a new accumulator object which is the result of
+     * running each of its own enumerable properties through iteratee, with each invocation potentially mutating
+     * the accumulator object. The iteratee is bound to thisArg and invoked with four arguments: (accumulator,
+     * value, key, object). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param accumulator The custom accumulator value.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the accumulated value.
+     */
+    (accumulator: ReadonlyArray<TResult>, object: ReadonlyArray<T> | _.Dictionary<T>): TResult[];
+}
+interface Transform1x2<T, TResult> {
+    /**
+     * An alternative to _.reduce; this method transforms object to a new accumulator object which is the result of
+     * running each of its own enumerable properties through iteratee, with each invocation potentially mutating
+     * the accumulator object. The iteratee is bound to thisArg and invoked with four arguments: (accumulator,
+     * value, key, object). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param accumulator The custom accumulator value.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the accumulated value.
+     */
+    (): Transform1x2<T, TResult>;
+    /**
+     * An alternative to _.reduce; this method transforms object to a new accumulator object which is the result of
+     * running each of its own enumerable properties through iteratee, with each invocation potentially mutating
+     * the accumulator object. The iteratee is bound to thisArg and invoked with four arguments: (accumulator,
+     * value, key, object). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param accumulator The custom accumulator value.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the accumulated value.
+     */
+    (object: ReadonlyArray<T> | _.Dictionary<T>): TResult[];
+}
+interface Transform2x1<T, TResult> {
+    /**
+     * An alternative to _.reduce; this method transforms object to a new accumulator object which is the result of
+     * running each of its own enumerable properties through iteratee, with each invocation potentially mutating
+     * the accumulator object. The iteratee is bound to thisArg and invoked with four arguments: (accumulator,
+     * value, key, object). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param accumulator The custom accumulator value.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the accumulated value.
+     */
+    (): Transform2x1<T, TResult>;
+    /**
+     * An alternative to _.reduce; this method transforms object to a new accumulator object which is the result of
+     * running each of its own enumerable properties through iteratee, with each invocation potentially mutating
+     * the accumulator object. The iteratee is bound to thisArg and invoked with four arguments: (accumulator,
+     * value, key, object). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param accumulator The custom accumulator value.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the accumulated value.
+     */
+    (accumulator: _.Dictionary<TResult>): Transform2x2<T, TResult>;
+    /**
+     * An alternative to _.reduce; this method transforms object to a new accumulator object which is the result of
+     * running each of its own enumerable properties through iteratee, with each invocation potentially mutating
+     * the accumulator object. The iteratee is bound to thisArg and invoked with four arguments: (accumulator,
+     * value, key, object). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param accumulator The custom accumulator value.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the accumulated value.
+     */
+    (accumulator: _.Dictionary<TResult>, object: ReadonlyArray<T> | _.Dictionary<T>): _.Dictionary<TResult>;
+}
+interface Transform2x2<T, TResult> {
+    /**
+     * An alternative to _.reduce; this method transforms object to a new accumulator object which is the result of
+     * running each of its own enumerable properties through iteratee, with each invocation potentially mutating
+     * the accumulator object. The iteratee is bound to thisArg and invoked with four arguments: (accumulator,
+     * value, key, object). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param accumulator The custom accumulator value.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the accumulated value.
+     */
+    (): Transform2x2<T, TResult>;
+    /**
+     * An alternative to _.reduce; this method transforms object to a new accumulator object which is the result of
+     * running each of its own enumerable properties through iteratee, with each invocation potentially mutating
+     * the accumulator object. The iteratee is bound to thisArg and invoked with four arguments: (accumulator,
+     * value, key, object). Iteratee functions may exit iteration early by explicitly returning false.
+     *
+     * @param object The object to iterate over.
+     * @param iteratee The function invoked per iteration.
+     * @param accumulator The custom accumulator value.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the accumulated value.
+     */
+    (object: ReadonlyArray<T> | _.Dictionary<T>): _.Dictionary<TResult>;
+}
+
+declare const transform: Transform;
+export = transform;
diff --git a/types/lodash/fp/trim.d.ts b/types/lodash/fp/trim.d.ts
new file mode 100644
index 0000000000..7b1c8696b4
--- /dev/null
+++ b/types/lodash/fp/trim.d.ts
@@ -0,0 +1,16 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type Trim =
+    /**
+     * Removes leading and trailing whitespace or specified characters from string.
+     *
+     * @param string The string to trim.
+     * @param chars The characters to trim.
+     * @return Returns the trimmed string.
+     */
+    (string: string) => string;
+
+declare const trim: Trim;
+export = trim;
diff --git a/types/lodash/fp/trimChars.d.ts b/types/lodash/fp/trimChars.d.ts
new file mode 100644
index 0000000000..8c0a97e9f5
--- /dev/null
+++ b/types/lodash/fp/trimChars.d.ts
@@ -0,0 +1,51 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface Trim {
+    /**
+     * Removes leading and trailing whitespace or specified characters from string.
+     *
+     * @param string The string to trim.
+     * @param chars The characters to trim.
+     * @return Returns the trimmed string.
+     */
+    (): Trim;
+    /**
+     * Removes leading and trailing whitespace or specified characters from string.
+     *
+     * @param string The string to trim.
+     * @param chars The characters to trim.
+     * @return Returns the trimmed string.
+     */
+    (chars: string): Trim1x1;
+    /**
+     * Removes leading and trailing whitespace or specified characters from string.
+     *
+     * @param string The string to trim.
+     * @param chars The characters to trim.
+     * @return Returns the trimmed string.
+     */
+    (chars: string, string: string): string;
+}
+interface Trim1x1 {
+    /**
+     * Removes leading and trailing whitespace or specified characters from string.
+     *
+     * @param string The string to trim.
+     * @param chars The characters to trim.
+     * @return Returns the trimmed string.
+     */
+    (): Trim1x1;
+    /**
+     * Removes leading and trailing whitespace or specified characters from string.
+     *
+     * @param string The string to trim.
+     * @param chars The characters to trim.
+     * @return Returns the trimmed string.
+     */
+    (string: string): string;
+}
+
+declare const trimChars: Trim;
+export = trimChars;
diff --git a/types/lodash/fp/trimCharsEnd.d.ts b/types/lodash/fp/trimCharsEnd.d.ts
new file mode 100644
index 0000000000..f8b74c9c5a
--- /dev/null
+++ b/types/lodash/fp/trimCharsEnd.d.ts
@@ -0,0 +1,51 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface TrimEnd {
+    /**
+     * Removes trailing whitespace or specified characters from string.
+     *
+     * @param string The string to trim.
+     * @param chars The characters to trim.
+     * @return Returns the trimmed string.
+     */
+    (): TrimEnd;
+    /**
+     * Removes trailing whitespace or specified characters from string.
+     *
+     * @param string The string to trim.
+     * @param chars The characters to trim.
+     * @return Returns the trimmed string.
+     */
+    (chars: string): TrimEnd1x1;
+    /**
+     * Removes trailing whitespace or specified characters from string.
+     *
+     * @param string The string to trim.
+     * @param chars The characters to trim.
+     * @return Returns the trimmed string.
+     */
+    (chars: string, string: string): string;
+}
+interface TrimEnd1x1 {
+    /**
+     * Removes trailing whitespace or specified characters from string.
+     *
+     * @param string The string to trim.
+     * @param chars The characters to trim.
+     * @return Returns the trimmed string.
+     */
+    (): TrimEnd1x1;
+    /**
+     * Removes trailing whitespace or specified characters from string.
+     *
+     * @param string The string to trim.
+     * @param chars The characters to trim.
+     * @return Returns the trimmed string.
+     */
+    (string: string): string;
+}
+
+declare const trimCharsEnd: TrimEnd;
+export = trimCharsEnd;
diff --git a/types/lodash/fp/trimCharsStart.d.ts b/types/lodash/fp/trimCharsStart.d.ts
new file mode 100644
index 0000000000..5b4da3996d
--- /dev/null
+++ b/types/lodash/fp/trimCharsStart.d.ts
@@ -0,0 +1,51 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface TrimStart {
+    /**
+     * Removes leading whitespace or specified characters from string.
+     *
+     * @param string The string to trim.
+     * @param chars The characters to trim.
+     * @return Returns the trimmed string.
+     */
+    (): TrimStart;
+    /**
+     * Removes leading whitespace or specified characters from string.
+     *
+     * @param string The string to trim.
+     * @param chars The characters to trim.
+     * @return Returns the trimmed string.
+     */
+    (chars: string): TrimStart1x1;
+    /**
+     * Removes leading whitespace or specified characters from string.
+     *
+     * @param string The string to trim.
+     * @param chars The characters to trim.
+     * @return Returns the trimmed string.
+     */
+    (chars: string, string: string): string;
+}
+interface TrimStart1x1 {
+    /**
+     * Removes leading whitespace or specified characters from string.
+     *
+     * @param string The string to trim.
+     * @param chars The characters to trim.
+     * @return Returns the trimmed string.
+     */
+    (): TrimStart1x1;
+    /**
+     * Removes leading whitespace or specified characters from string.
+     *
+     * @param string The string to trim.
+     * @param chars The characters to trim.
+     * @return Returns the trimmed string.
+     */
+    (string: string): string;
+}
+
+declare const trimCharsStart: TrimStart;
+export = trimCharsStart;
diff --git a/types/lodash/fp/trimEnd.d.ts b/types/lodash/fp/trimEnd.d.ts
new file mode 100644
index 0000000000..02754779a2
--- /dev/null
+++ b/types/lodash/fp/trimEnd.d.ts
@@ -0,0 +1,16 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type TrimEnd =
+    /**
+     * Removes trailing whitespace or specified characters from string.
+     *
+     * @param string The string to trim.
+     * @param chars The characters to trim.
+     * @return Returns the trimmed string.
+     */
+    (string: string) => string;
+
+declare const trimEnd: TrimEnd;
+export = trimEnd;
diff --git a/types/lodash/fp/trimStart.d.ts b/types/lodash/fp/trimStart.d.ts
new file mode 100644
index 0000000000..567dc22e5e
--- /dev/null
+++ b/types/lodash/fp/trimStart.d.ts
@@ -0,0 +1,16 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type TrimStart =
+    /**
+     * Removes leading whitespace or specified characters from string.
+     *
+     * @param string The string to trim.
+     * @param chars The characters to trim.
+     * @return Returns the trimmed string.
+     */
+    (string: string) => string;
+
+declare const trimStart: TrimStart;
+export = trimStart;
diff --git a/types/lodash/fp/truncate.d.ts b/types/lodash/fp/truncate.d.ts
new file mode 100644
index 0000000000..6645f41697
--- /dev/null
+++ b/types/lodash/fp/truncate.d.ts
@@ -0,0 +1,58 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Truncate {
+    /**
+     * Truncates string if it’s longer than the given maximum string length. The last characters of the truncated
+     * string are replaced with the omission string which defaults to "…".
+     *
+     * @param string The string to truncate.
+     * @param options The options object or maximum string length.
+     * @return Returns the truncated string.
+     */
+    (): Truncate;
+    /**
+     * Truncates string if it’s longer than the given maximum string length. The last characters of the truncated
+     * string are replaced with the omission string which defaults to "…".
+     *
+     * @param string The string to truncate.
+     * @param options The options object or maximum string length.
+     * @return Returns the truncated string.
+     */
+    (options: _.TruncateOptions): Truncate1x1;
+    /**
+     * Truncates string if it’s longer than the given maximum string length. The last characters of the truncated
+     * string are replaced with the omission string which defaults to "…".
+     *
+     * @param string The string to truncate.
+     * @param options The options object or maximum string length.
+     * @return Returns the truncated string.
+     */
+    (options: _.TruncateOptions, string: string): string;
+}
+interface Truncate1x1 {
+    /**
+     * Truncates string if it’s longer than the given maximum string length. The last characters of the truncated
+     * string are replaced with the omission string which defaults to "…".
+     *
+     * @param string The string to truncate.
+     * @param options The options object or maximum string length.
+     * @return Returns the truncated string.
+     */
+    (): Truncate1x1;
+    /**
+     * Truncates string if it’s longer than the given maximum string length. The last characters of the truncated
+     * string are replaced with the omission string which defaults to "…".
+     *
+     * @param string The string to truncate.
+     * @param options The options object or maximum string length.
+     * @return Returns the truncated string.
+     */
+    (string: string): string;
+}
+
+declare const truncate: Truncate;
+export = truncate;
diff --git a/types/lodash/fp/unapply.d.ts b/types/lodash/fp/unapply.d.ts
new file mode 100644
index 0000000000..8bde142263
--- /dev/null
+++ b/types/lodash/fp/unapply.d.ts
@@ -0,0 +1,19 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type Rest =
+    /**
+     * Creates a function that invokes func with the this binding of the created function and arguments from start
+     * and beyond provided as an array.
+     *
+     * Note: This method is based on the rest parameter.
+     *
+     * @param func The function to apply a rest parameter to.
+     * @param start The start position of the rest parameter.
+     * @return Returns the new function.
+     */
+    (func: (...args: any[]) => any) => (...args: any[]) => any;
+
+declare const unapply: Rest;
+export = unapply;
diff --git a/types/lodash/fp/unary.d.ts b/types/lodash/fp/unary.d.ts
new file mode 100644
index 0000000000..19e2946e96
--- /dev/null
+++ b/types/lodash/fp/unary.d.ts
@@ -0,0 +1,21 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type Unary =
+    /**
+     * Creates a function that accepts up to one argument, ignoring any
+     * additional arguments.
+     *
+     * @category Function
+     * @param func The function to cap arguments for.
+     * @returns Returns the new function.
+     * @example
+     *
+     * _.map(['6', '8', '10'], _.unary(parseInt));
+     * // => [6, 8, 10]
+     */
+    <T, TResult>(func: (arg1: T, ...args: any[]) => TResult) => (arg1: T) => TResult;
+
+declare const unary: Unary;
+export = unary;
diff --git a/types/lodash/fp/unescape.d.ts b/types/lodash/fp/unescape.d.ts
new file mode 100644
index 0000000000..20b602a298
--- /dev/null
+++ b/types/lodash/fp/unescape.d.ts
@@ -0,0 +1,19 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type Unescape =
+    /**
+     * The inverse of _.escape; this method converts the HTML entities &amp;, &lt;, &gt;, &quot;, &#39;, and &#96;
+     * in string to their corresponding characters.
+     *
+     * Note: No other HTML entities are unescaped. To unescape additional HTML entities use a third-party library
+     * like he.
+     *
+     * @param string The string to unescape.
+     * @return Returns the unescaped string.
+     */
+    (string: string) => string;
+
+declare const unescape: Unescape;
+export = unescape;
diff --git a/types/lodash/fp/union.d.ts b/types/lodash/fp/union.d.ts
new file mode 100644
index 0000000000..99c9e3d4ff
--- /dev/null
+++ b/types/lodash/fp/union.d.ts
@@ -0,0 +1,53 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Union {
+    /**
+     * Creates an array of unique values, in order, from all of the provided arrays using SameValueZero for
+     * equality comparisons.
+     *
+     * @param arrays The arrays to inspect.
+     * @return Returns the new array of combined values.
+     */
+    (): Union;
+    /**
+     * Creates an array of unique values, in order, from all of the provided arrays using SameValueZero for
+     * equality comparisons.
+     *
+     * @param arrays The arrays to inspect.
+     * @return Returns the new array of combined values.
+     */
+    <T>(arrays2: _.List<T> | null | undefined): Union1x1<T>;
+    /**
+     * Creates an array of unique values, in order, from all of the provided arrays using SameValueZero for
+     * equality comparisons.
+     *
+     * @param arrays The arrays to inspect.
+     * @return Returns the new array of combined values.
+     */
+    <T>(arrays2: _.List<T> | null | undefined, arrays: _.List<T> | null | undefined): T[];
+}
+interface Union1x1<T> {
+    /**
+     * Creates an array of unique values, in order, from all of the provided arrays using SameValueZero for
+     * equality comparisons.
+     *
+     * @param arrays The arrays to inspect.
+     * @return Returns the new array of combined values.
+     */
+    (): Union1x1<T>;
+    /**
+     * Creates an array of unique values, in order, from all of the provided arrays using SameValueZero for
+     * equality comparisons.
+     *
+     * @param arrays The arrays to inspect.
+     * @return Returns the new array of combined values.
+     */
+    (arrays: _.List<T> | null | undefined): T[];
+}
+
+declare const union: Union;
+export = union;
diff --git a/types/lodash/fp/unionBy.d.ts b/types/lodash/fp/unionBy.d.ts
new file mode 100644
index 0000000000..42db2e6352
--- /dev/null
+++ b/types/lodash/fp/unionBy.d.ts
@@ -0,0 +1,105 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface UnionBy {
+    /**
+     * This method is like `_.union` except that it accepts `iteratee` which is
+     * invoked for each element of each `arrays` to generate the criterion by which
+     * uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * @param arrays The arrays to inspect.
+     * @param iteratee The iteratee invoked per element.
+     * @return Returns the new array of combined values.
+     */
+    (): UnionBy;
+    /**
+     * This method is like `_.union` except that it accepts `iteratee` which is
+     * invoked for each element of each `arrays` to generate the criterion by which
+     * uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * @param arrays The arrays to inspect.
+     * @param iteratee The iteratee invoked per element.
+     * @return Returns the new array of combined values.
+     */
+    <T>(iteratee: _.ValueIteratee<T>): UnionBy1x1<T>;
+    /**
+     * This method is like `_.union` except that it accepts `iteratee` which is
+     * invoked for each element of each `arrays` to generate the criterion by which
+     * uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * @param arrays The arrays to inspect.
+     * @param iteratee The iteratee invoked per element.
+     * @return Returns the new array of combined values.
+     */
+    <T>(iteratee: _.ValueIteratee<T>, arrays1: _.List<T> | null | undefined): UnionBy1x2<T>;
+    /**
+     * This method is like `_.union` except that it accepts `iteratee` which is
+     * invoked for each element of each `arrays` to generate the criterion by which
+     * uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * @param arrays The arrays to inspect.
+     * @param iteratee The iteratee invoked per element.
+     * @return Returns the new array of combined values.
+     */
+    <T>(iteratee: _.ValueIteratee<T>, arrays1: _.List<T> | null | undefined, arrays2: _.List<T> | null | undefined): T[];
+}
+interface UnionBy1x1<T> {
+    /**
+     * This method is like `_.union` except that it accepts `iteratee` which is
+     * invoked for each element of each `arrays` to generate the criterion by which
+     * uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * @param arrays The arrays to inspect.
+     * @param iteratee The iteratee invoked per element.
+     * @return Returns the new array of combined values.
+     */
+    (): UnionBy1x1<T>;
+    /**
+     * This method is like `_.union` except that it accepts `iteratee` which is
+     * invoked for each element of each `arrays` to generate the criterion by which
+     * uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * @param arrays The arrays to inspect.
+     * @param iteratee The iteratee invoked per element.
+     * @return Returns the new array of combined values.
+     */
+    (arrays1: _.List<T> | null | undefined): UnionBy1x2<T>;
+    /**
+     * This method is like `_.union` except that it accepts `iteratee` which is
+     * invoked for each element of each `arrays` to generate the criterion by which
+     * uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * @param arrays The arrays to inspect.
+     * @param iteratee The iteratee invoked per element.
+     * @return Returns the new array of combined values.
+     */
+    (arrays1: _.List<T> | null | undefined, arrays2: _.List<T> | null | undefined): T[];
+}
+interface UnionBy1x2<T> {
+    /**
+     * This method is like `_.union` except that it accepts `iteratee` which is
+     * invoked for each element of each `arrays` to generate the criterion by which
+     * uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * @param arrays The arrays to inspect.
+     * @param iteratee The iteratee invoked per element.
+     * @return Returns the new array of combined values.
+     */
+    (): UnionBy1x2<T>;
+    /**
+     * This method is like `_.union` except that it accepts `iteratee` which is
+     * invoked for each element of each `arrays` to generate the criterion by which
+     * uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * @param arrays The arrays to inspect.
+     * @param iteratee The iteratee invoked per element.
+     * @return Returns the new array of combined values.
+     */
+    (arrays2: _.List<T> | null | undefined): T[];
+}
+
+declare const unionBy: UnionBy;
+export = unionBy;
diff --git a/types/lodash/fp/unionWith.d.ts b/types/lodash/fp/unionWith.d.ts
new file mode 100644
index 0000000000..89a5066ec0
--- /dev/null
+++ b/types/lodash/fp/unionWith.d.ts
@@ -0,0 +1,177 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface UnionWith {
+    /**
+     * This method is like `_.union` except that it accepts `comparator` which
+     * is invoked to compare elements of `arrays`. The comparator is invoked
+     * with two arguments: (arrVal, othVal).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [comparator] The comparator invoked per element.
+     * @returns Returns the new array of combined values.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
+     *
+     * _.unionWith(objects, others, _.isEqual);
+     * // => [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
+     */
+    (): UnionWith;
+    /**
+     * This method is like `_.union` except that it accepts `comparator` which
+     * is invoked to compare elements of `arrays`. The comparator is invoked
+     * with two arguments: (arrVal, othVal).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [comparator] The comparator invoked per element.
+     * @returns Returns the new array of combined values.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
+     *
+     * _.unionWith(objects, others, _.isEqual);
+     * // => [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
+     */
+    <T>(comparator: _.Comparator<T>): UnionWith1x1<T>;
+    /**
+     * This method is like `_.union` except that it accepts `comparator` which
+     * is invoked to compare elements of `arrays`. The comparator is invoked
+     * with two arguments: (arrVal, othVal).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [comparator] The comparator invoked per element.
+     * @returns Returns the new array of combined values.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
+     *
+     * _.unionWith(objects, others, _.isEqual);
+     * // => [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
+     */
+    <T>(comparator: _.Comparator<T>, arrays: _.List<T> | null | undefined): UnionWith1x2<T>;
+    /**
+     * This method is like `_.union` except that it accepts `comparator` which
+     * is invoked to compare elements of `arrays`. The comparator is invoked
+     * with two arguments: (arrVal, othVal).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [comparator] The comparator invoked per element.
+     * @returns Returns the new array of combined values.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
+     *
+     * _.unionWith(objects, others, _.isEqual);
+     * // => [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
+     */
+    <T>(comparator: _.Comparator<T>, arrays: _.List<T> | null | undefined, arrays2: _.List<T> | null | undefined): T[];
+}
+interface UnionWith1x1<T> {
+    /**
+     * This method is like `_.union` except that it accepts `comparator` which
+     * is invoked to compare elements of `arrays`. The comparator is invoked
+     * with two arguments: (arrVal, othVal).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [comparator] The comparator invoked per element.
+     * @returns Returns the new array of combined values.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
+     *
+     * _.unionWith(objects, others, _.isEqual);
+     * // => [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
+     */
+    (): UnionWith1x1<T>;
+    /**
+     * This method is like `_.union` except that it accepts `comparator` which
+     * is invoked to compare elements of `arrays`. The comparator is invoked
+     * with two arguments: (arrVal, othVal).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [comparator] The comparator invoked per element.
+     * @returns Returns the new array of combined values.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
+     *
+     * _.unionWith(objects, others, _.isEqual);
+     * // => [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
+     */
+    (arrays: _.List<T> | null | undefined): UnionWith1x2<T>;
+    /**
+     * This method is like `_.union` except that it accepts `comparator` which
+     * is invoked to compare elements of `arrays`. The comparator is invoked
+     * with two arguments: (arrVal, othVal).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [comparator] The comparator invoked per element.
+     * @returns Returns the new array of combined values.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
+     *
+     * _.unionWith(objects, others, _.isEqual);
+     * // => [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
+     */
+    (arrays: _.List<T> | null | undefined, arrays2: _.List<T> | null | undefined): T[];
+}
+interface UnionWith1x2<T> {
+    /**
+     * This method is like `_.union` except that it accepts `comparator` which
+     * is invoked to compare elements of `arrays`. The comparator is invoked
+     * with two arguments: (arrVal, othVal).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [comparator] The comparator invoked per element.
+     * @returns Returns the new array of combined values.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
+     *
+     * _.unionWith(objects, others, _.isEqual);
+     * // => [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
+     */
+    (): UnionWith1x2<T>;
+    /**
+     * This method is like `_.union` except that it accepts `comparator` which
+     * is invoked to compare elements of `arrays`. The comparator is invoked
+     * with two arguments: (arrVal, othVal).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [comparator] The comparator invoked per element.
+     * @returns Returns the new array of combined values.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
+     *
+     * _.unionWith(objects, others, _.isEqual);
+     * // => [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
+     */
+    (arrays2: _.List<T> | null | undefined): T[];
+}
+
+declare const unionWith: UnionWith;
+export = unionWith;
diff --git a/types/lodash/fp/uniq.d.ts b/types/lodash/fp/uniq.d.ts
new file mode 100644
index 0000000000..a627214680
--- /dev/null
+++ b/types/lodash/fp/uniq.d.ts
@@ -0,0 +1,25 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+type Uniq =
+    /**
+     * Creates a duplicate-free version of an array, using
+     * [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
+     * for equality comparisons, in which only the first occurrence of each element
+     * is kept.
+     *
+     * @category Array
+     * @param array The array to inspect.
+     * @returns Returns the new duplicate free array.
+     * @example
+     *
+     * _.uniq([2, 1, 2]);
+     * // => [2, 1]
+     */
+    <T>(array: _.List<T> | null | undefined) => T[];
+
+declare const uniq: Uniq;
+export = uniq;
diff --git a/types/lodash/fp/uniqBy.d.ts b/types/lodash/fp/uniqBy.d.ts
new file mode 100644
index 0000000000..d89b8908c5
--- /dev/null
+++ b/types/lodash/fp/uniqBy.d.ts
@@ -0,0 +1,186 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface UniqBy {
+    /**
+     * This method is like `_.uniq` except that it accepts `iteratee` which is
+     * invoked for each element in `array` to generate the criterion by which
+     * uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param array The array to inspect.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the new duplicate free array.
+     * @example
+     *
+     * _.uniqBy([2.1, 1.2, 2.3], Math.floor);
+     * // => [2.1, 1.2]
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.uniqBy([{ 'x': 1 }, { 'x': 2 }, { 'x': 1 }], 'x');
+     * // => [{ 'x': 1 }, { 'x': 2 }]
+     */
+    (): UniqBy;
+    /**
+     * This method is like `_.uniq` except that it accepts `iteratee` which is
+     * invoked for each element in `array` to generate the criterion by which
+     * uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param array The array to inspect.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the new duplicate free array.
+     * @example
+     *
+     * _.uniqBy([2.1, 1.2, 2.3], Math.floor);
+     * // => [2.1, 1.2]
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.uniqBy([{ 'x': 1 }, { 'x': 2 }, { 'x': 1 }], 'x');
+     * // => [{ 'x': 1 }, { 'x': 2 }]
+     */
+    (iteratee: (value: string) => _.NotVoid): UniqBy1x1;
+    /**
+     * This method is like `_.uniq` except that it accepts `iteratee` which is
+     * invoked for each element in `array` to generate the criterion by which
+     * uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param array The array to inspect.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the new duplicate free array.
+     * @example
+     *
+     * _.uniqBy([2.1, 1.2, 2.3], Math.floor);
+     * // => [2.1, 1.2]
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.uniqBy([{ 'x': 1 }, { 'x': 2 }, { 'x': 1 }], 'x');
+     * // => [{ 'x': 1 }, { 'x': 2 }]
+     */
+    (iteratee: (value: string) => _.NotVoid, array: string | null | undefined): string[];
+    /**
+     * This method is like `_.uniq` except that it accepts `iteratee` which is
+     * invoked for each element in `array` to generate the criterion by which
+     * uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param array The array to inspect.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the new duplicate free array.
+     * @example
+     *
+     * _.uniqBy([2.1, 1.2, 2.3], Math.floor);
+     * // => [2.1, 1.2]
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.uniqBy([{ 'x': 1 }, { 'x': 2 }, { 'x': 1 }], 'x');
+     * // => [{ 'x': 1 }, { 'x': 2 }]
+     */
+    <T>(iteratee: _.ValueIteratee<T>): UniqBy2x1<T>;
+    /**
+     * This method is like `_.uniq` except that it accepts `iteratee` which is
+     * invoked for each element in `array` to generate the criterion by which
+     * uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param array The array to inspect.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the new duplicate free array.
+     * @example
+     *
+     * _.uniqBy([2.1, 1.2, 2.3], Math.floor);
+     * // => [2.1, 1.2]
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.uniqBy([{ 'x': 1 }, { 'x': 2 }, { 'x': 1 }], 'x');
+     * // => [{ 'x': 1 }, { 'x': 2 }]
+     */
+    <T>(iteratee: _.ValueIteratee<T>, array: _.List<T> | null | undefined): T[];
+}
+interface UniqBy1x1 {
+    /**
+     * This method is like `_.uniq` except that it accepts `iteratee` which is
+     * invoked for each element in `array` to generate the criterion by which
+     * uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param array The array to inspect.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the new duplicate free array.
+     * @example
+     *
+     * _.uniqBy([2.1, 1.2, 2.3], Math.floor);
+     * // => [2.1, 1.2]
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.uniqBy([{ 'x': 1 }, { 'x': 2 }, { 'x': 1 }], 'x');
+     * // => [{ 'x': 1 }, { 'x': 2 }]
+     */
+    (): UniqBy1x1;
+    /**
+     * This method is like `_.uniq` except that it accepts `iteratee` which is
+     * invoked for each element in `array` to generate the criterion by which
+     * uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param array The array to inspect.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the new duplicate free array.
+     * @example
+     *
+     * _.uniqBy([2.1, 1.2, 2.3], Math.floor);
+     * // => [2.1, 1.2]
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.uniqBy([{ 'x': 1 }, { 'x': 2 }, { 'x': 1 }], 'x');
+     * // => [{ 'x': 1 }, { 'x': 2 }]
+     */
+    (array: string | null | undefined): string[];
+}
+interface UniqBy2x1<T> {
+    /**
+     * This method is like `_.uniq` except that it accepts `iteratee` which is
+     * invoked for each element in `array` to generate the criterion by which
+     * uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param array The array to inspect.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the new duplicate free array.
+     * @example
+     *
+     * _.uniqBy([2.1, 1.2, 2.3], Math.floor);
+     * // => [2.1, 1.2]
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.uniqBy([{ 'x': 1 }, { 'x': 2 }, { 'x': 1 }], 'x');
+     * // => [{ 'x': 1 }, { 'x': 2 }]
+     */
+    (): UniqBy2x1<T>;
+    /**
+     * This method is like `_.uniq` except that it accepts `iteratee` which is
+     * invoked for each element in `array` to generate the criterion by which
+     * uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param array The array to inspect.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the new duplicate free array.
+     * @example
+     *
+     * _.uniqBy([2.1, 1.2, 2.3], Math.floor);
+     * // => [2.1, 1.2]
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.uniqBy([{ 'x': 1 }, { 'x': 2 }, { 'x': 1 }], 'x');
+     * // => [{ 'x': 1 }, { 'x': 2 }]
+     */
+    (array: _.List<T> | null | undefined): T[];
+}
+
+declare const uniqBy: UniqBy;
+export = uniqBy;
diff --git a/types/lodash/fp/uniqWith.d.ts b/types/lodash/fp/uniqWith.d.ts
new file mode 100644
index 0000000000..f0e6de90ff
--- /dev/null
+++ b/types/lodash/fp/uniqWith.d.ts
@@ -0,0 +1,98 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface UniqWith {
+    /**
+     * This method is like `_.uniq` except that it accepts `comparator` which
+     * is invoked to compare elements of `array`. The comparator is invoked with
+     * two arguments: (arrVal, othVal).
+     *
+     * @category Array
+     * @param array The array to inspect.
+     * @param [comparator] The comparator invoked per element.
+     * @returns Returns the new duplicate free array.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 },  { 'x': 1, 'y': 2 }];
+     *
+     * _.uniqWith(objects, _.isEqual);
+     * // => [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }]
+     */
+    (): UniqWith;
+    /**
+     * This method is like `_.uniq` except that it accepts `comparator` which
+     * is invoked to compare elements of `array`. The comparator is invoked with
+     * two arguments: (arrVal, othVal).
+     *
+     * @category Array
+     * @param array The array to inspect.
+     * @param [comparator] The comparator invoked per element.
+     * @returns Returns the new duplicate free array.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 },  { 'x': 1, 'y': 2 }];
+     *
+     * _.uniqWith(objects, _.isEqual);
+     * // => [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }]
+     */
+    <T>(comparator: _.Comparator<T>): UniqWith1x1<T>;
+    /**
+     * This method is like `_.uniq` except that it accepts `comparator` which
+     * is invoked to compare elements of `array`. The comparator is invoked with
+     * two arguments: (arrVal, othVal).
+     *
+     * @category Array
+     * @param array The array to inspect.
+     * @param [comparator] The comparator invoked per element.
+     * @returns Returns the new duplicate free array.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 },  { 'x': 1, 'y': 2 }];
+     *
+     * _.uniqWith(objects, _.isEqual);
+     * // => [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }]
+     */
+    <T>(comparator: _.Comparator<T>, array: _.List<T> | null | undefined): T[];
+}
+interface UniqWith1x1<T> {
+    /**
+     * This method is like `_.uniq` except that it accepts `comparator` which
+     * is invoked to compare elements of `array`. The comparator is invoked with
+     * two arguments: (arrVal, othVal).
+     *
+     * @category Array
+     * @param array The array to inspect.
+     * @param [comparator] The comparator invoked per element.
+     * @returns Returns the new duplicate free array.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 },  { 'x': 1, 'y': 2 }];
+     *
+     * _.uniqWith(objects, _.isEqual);
+     * // => [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }]
+     */
+    (): UniqWith1x1<T>;
+    /**
+     * This method is like `_.uniq` except that it accepts `comparator` which
+     * is invoked to compare elements of `array`. The comparator is invoked with
+     * two arguments: (arrVal, othVal).
+     *
+     * @category Array
+     * @param array The array to inspect.
+     * @param [comparator] The comparator invoked per element.
+     * @returns Returns the new duplicate free array.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 },  { 'x': 1, 'y': 2 }];
+     *
+     * _.uniqWith(objects, _.isEqual);
+     * // => [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }]
+     */
+    (array: _.List<T> | null | undefined): T[];
+}
+
+declare const uniqWith: UniqWith;
+export = uniqWith;
diff --git a/types/lodash/fp/uniqueId.d.ts b/types/lodash/fp/uniqueId.d.ts
new file mode 100644
index 0000000000..d9ba028d53
--- /dev/null
+++ b/types/lodash/fp/uniqueId.d.ts
@@ -0,0 +1,15 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type UniqueId =
+    /**
+     * Generates a unique ID. If prefix is provided the ID is appended to it.
+     *
+     * @param prefix The value to prefix the ID with.
+     * @return Returns the unique ID.
+     */
+    (prefix: string) => string;
+
+declare const uniqueId: UniqueId;
+export = uniqueId;
diff --git a/types/lodash/fp/unnest.d.ts b/types/lodash/fp/unnest.d.ts
new file mode 100644
index 0000000000..fc05e923c5
--- /dev/null
+++ b/types/lodash/fp/unnest.d.ts
@@ -0,0 +1,17 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+type Flatten =
+    /**
+     * Flattens `array` a single level deep.
+     *
+     * @param array The array to flatten.
+     * @return Returns the new flattened array.
+     */
+    <T>(array: _.List<_.Many<T>> | null | undefined) => T[];
+
+declare const unnest: Flatten;
+export = unnest;
diff --git a/types/lodash/fp/unset.d.ts b/types/lodash/fp/unset.d.ts
new file mode 100644
index 0000000000..12199c061a
--- /dev/null
+++ b/types/lodash/fp/unset.d.ts
@@ -0,0 +1,63 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Unset {
+    /**
+     * Removes the property at path of object.
+     *
+     * Note: This method mutates object.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to unset.
+     * @return Returns true if the property is deleted, else false.
+     */
+    (): Unset;
+    /**
+     * Removes the property at path of object.
+     *
+     * Note: This method mutates object.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to unset.
+     * @return Returns true if the property is deleted, else false.
+     */
+    (path: _.PropertyPath): Unset1x1;
+    /**
+     * Removes the property at path of object.
+     *
+     * Note: This method mutates object.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to unset.
+     * @return Returns true if the property is deleted, else false.
+     */
+    (path: _.PropertyPath, object: any): boolean;
+}
+interface Unset1x1 {
+    /**
+     * Removes the property at path of object.
+     *
+     * Note: This method mutates object.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to unset.
+     * @return Returns true if the property is deleted, else false.
+     */
+    (): Unset1x1;
+    /**
+     * Removes the property at path of object.
+     *
+     * Note: This method mutates object.
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to unset.
+     * @return Returns true if the property is deleted, else false.
+     */
+    (object: any): boolean;
+}
+
+declare const unset: Unset;
+export = unset;
diff --git a/types/lodash/fp/unzip.d.ts b/types/lodash/fp/unzip.d.ts
new file mode 100644
index 0000000000..e6ce334d48
--- /dev/null
+++ b/types/lodash/fp/unzip.d.ts
@@ -0,0 +1,18 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+type Unzip =
+    /**
+     * This method is like _.zip except that it accepts an array of grouped elements and creates an array
+     * regrouping the elements to their pre-zip configuration.
+     *
+     * @param array The array of grouped elements to process.
+     * @return Returns the new array of regrouped elements.
+     */
+    <T>(array: T[][] | _.List<_.List<T>> | null | undefined) => T[][];
+
+declare const unzip: Unzip;
+export = unzip;
diff --git a/types/lodash/fp/unzipWith.d.ts b/types/lodash/fp/unzipWith.d.ts
new file mode 100644
index 0000000000..36fd2e6bf0
--- /dev/null
+++ b/types/lodash/fp/unzipWith.d.ts
@@ -0,0 +1,68 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface UnzipWith {
+    /**
+     * This method is like _.unzip except that it accepts an iteratee to specify how regrouped values should be
+     * combined. The iteratee is bound to thisArg and invoked with four arguments: (accumulator, value, index,
+     * group).
+     *
+     * @param array The array of grouped elements to process.
+     * @param iteratee The function to combine regrouped values.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new array of regrouped elements.
+     */
+    (): UnzipWith;
+    /**
+     * This method is like _.unzip except that it accepts an iteratee to specify how regrouped values should be
+     * combined. The iteratee is bound to thisArg and invoked with four arguments: (accumulator, value, index,
+     * group).
+     *
+     * @param array The array of grouped elements to process.
+     * @param iteratee The function to combine regrouped values.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new array of regrouped elements.
+     */
+    <T, TResult>(iteratee: (...values: T[]) => TResult): UnzipWith1x1<T, TResult>;
+    /**
+     * This method is like _.unzip except that it accepts an iteratee to specify how regrouped values should be
+     * combined. The iteratee is bound to thisArg and invoked with four arguments: (accumulator, value, index,
+     * group).
+     *
+     * @param array The array of grouped elements to process.
+     * @param iteratee The function to combine regrouped values.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new array of regrouped elements.
+     */
+    <T, TResult>(iteratee: (...values: T[]) => TResult, array: _.List<_.List<T>> | null | undefined): TResult[];
+}
+interface UnzipWith1x1<T, TResult> {
+    /**
+     * This method is like _.unzip except that it accepts an iteratee to specify how regrouped values should be
+     * combined. The iteratee is bound to thisArg and invoked with four arguments: (accumulator, value, index,
+     * group).
+     *
+     * @param array The array of grouped elements to process.
+     * @param iteratee The function to combine regrouped values.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new array of regrouped elements.
+     */
+    (): UnzipWith1x1<T, TResult>;
+    /**
+     * This method is like _.unzip except that it accepts an iteratee to specify how regrouped values should be
+     * combined. The iteratee is bound to thisArg and invoked with four arguments: (accumulator, value, index,
+     * group).
+     *
+     * @param array The array of grouped elements to process.
+     * @param iteratee The function to combine regrouped values.
+     * @param thisArg The this binding of iteratee.
+     * @return Returns the new array of regrouped elements.
+     */
+    (array: _.List<_.List<T>> | null | undefined): TResult[];
+}
+
+declare const unzipWith: UnzipWith;
+export = unzipWith;
diff --git a/types/lodash/fp/update.d.ts b/types/lodash/fp/update.d.ts
new file mode 100644
index 0000000000..011a8ea61e
--- /dev/null
+++ b/types/lodash/fp/update.d.ts
@@ -0,0 +1,105 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Update {
+    /**
+     * This method is like _.set except that accepts updater to produce the value to set. Use _.updateWith to
+     * customize path creation. The updater is invoked with one argument: (value).
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param updater The function to produce the updated value.
+     * @return Returns object.
+     */
+    (): Update;
+    /**
+     * This method is like _.set except that accepts updater to produce the value to set. Use _.updateWith to
+     * customize path creation. The updater is invoked with one argument: (value).
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param updater The function to produce the updated value.
+     * @return Returns object.
+     */
+    (path: _.PropertyPath): Update1x1;
+    /**
+     * This method is like _.set except that accepts updater to produce the value to set. Use _.updateWith to
+     * customize path creation. The updater is invoked with one argument: (value).
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param updater The function to produce the updated value.
+     * @return Returns object.
+     */
+    (path: _.PropertyPath, updater: (value: any) => any): Update1x2;
+    /**
+     * This method is like _.set except that accepts updater to produce the value to set. Use _.updateWith to
+     * customize path creation. The updater is invoked with one argument: (value).
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param updater The function to produce the updated value.
+     * @return Returns object.
+     */
+    (path: _.PropertyPath, updater: (value: any) => any, object: object): any;
+}
+interface Update1x1 {
+    /**
+     * This method is like _.set except that accepts updater to produce the value to set. Use _.updateWith to
+     * customize path creation. The updater is invoked with one argument: (value).
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param updater The function to produce the updated value.
+     * @return Returns object.
+     */
+    (): Update1x1;
+    /**
+     * This method is like _.set except that accepts updater to produce the value to set. Use _.updateWith to
+     * customize path creation. The updater is invoked with one argument: (value).
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param updater The function to produce the updated value.
+     * @return Returns object.
+     */
+    (updater: (value: any) => any): Update1x2;
+    /**
+     * This method is like _.set except that accepts updater to produce the value to set. Use _.updateWith to
+     * customize path creation. The updater is invoked with one argument: (value).
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param updater The function to produce the updated value.
+     * @return Returns object.
+     */
+    (updater: (value: any) => any, object: object): any;
+}
+interface Update1x2 {
+    /**
+     * This method is like _.set except that accepts updater to produce the value to set. Use _.updateWith to
+     * customize path creation. The updater is invoked with one argument: (value).
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param updater The function to produce the updated value.
+     * @return Returns object.
+     */
+    (): Update1x2;
+    /**
+     * This method is like _.set except that accepts updater to produce the value to set. Use _.updateWith to
+     * customize path creation. The updater is invoked with one argument: (value).
+     *
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param updater The function to produce the updated value.
+     * @return Returns object.
+     */
+    (object: object): any;
+}
+
+declare const update: Update;
+export = update;
diff --git a/types/lodash/fp/updateWith.d.ts b/types/lodash/fp/updateWith.d.ts
new file mode 100644
index 0000000000..e26ed161d2
--- /dev/null
+++ b/types/lodash/fp/updateWith.d.ts
@@ -0,0 +1,431 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface UpdateWith {
+    /**
+     * This method is like `_.update` except that it accepts `customizer` which is
+     * invoked to produce the objects of `path`.  If `customizer` returns `undefined`
+     * path creation is handled by the method instead. The `customizer` is invoked
+     * with three arguments: (nsValue, key, nsObject).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @since 4.6.0
+     * @category Object
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param updater The function to produce the updated value.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * var object = {};
+     *
+     * _.updateWith(object, '[0][1]', _.constant('a'), Object);
+     * // => { '0': { '1': 'a' } }
+     */
+    (): UpdateWith;
+    /**
+     * This method is like `_.update` except that it accepts `customizer` which is
+     * invoked to produce the objects of `path`.  If `customizer` returns `undefined`
+     * path creation is handled by the method instead. The `customizer` is invoked
+     * with three arguments: (nsValue, key, nsObject).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @since 4.6.0
+     * @category Object
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param updater The function to produce the updated value.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * var object = {};
+     *
+     * _.updateWith(object, '[0][1]', _.constant('a'), Object);
+     * // => { '0': { '1': 'a' } }
+     */
+    <T extends object>(customizer: _.SetWithCustomizer<T>): UpdateWith1x1<T>;
+    /**
+     * This method is like `_.update` except that it accepts `customizer` which is
+     * invoked to produce the objects of `path`.  If `customizer` returns `undefined`
+     * path creation is handled by the method instead. The `customizer` is invoked
+     * with three arguments: (nsValue, key, nsObject).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @since 4.6.0
+     * @category Object
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param updater The function to produce the updated value.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * var object = {};
+     *
+     * _.updateWith(object, '[0][1]', _.constant('a'), Object);
+     * // => { '0': { '1': 'a' } }
+     */
+    <T extends object>(customizer: _.SetWithCustomizer<T>, path: _.PropertyPath): UpdateWith1x2<T>;
+    /**
+     * This method is like `_.update` except that it accepts `customizer` which is
+     * invoked to produce the objects of `path`.  If `customizer` returns `undefined`
+     * path creation is handled by the method instead. The `customizer` is invoked
+     * with three arguments: (nsValue, key, nsObject).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @since 4.6.0
+     * @category Object
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param updater The function to produce the updated value.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * var object = {};
+     *
+     * _.updateWith(object, '[0][1]', _.constant('a'), Object);
+     * // => { '0': { '1': 'a' } }
+     */
+    <T extends object>(customizer: _.SetWithCustomizer<T>, path: _.PropertyPath, updater: (oldValue: any) => any): UpdateWith1x3<T>;
+    /**
+     * This method is like `_.update` except that it accepts `customizer` which is
+     * invoked to produce the objects of `path`.  If `customizer` returns `undefined`
+     * path creation is handled by the method instead. The `customizer` is invoked
+     * with three arguments: (nsValue, key, nsObject).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @since 4.6.0
+     * @category Object
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param updater The function to produce the updated value.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * var object = {};
+     *
+     * _.updateWith(object, '[0][1]', _.constant('a'), Object);
+     * // => { '0': { '1': 'a' } }
+     */
+    <T extends object>(customizer: _.SetWithCustomizer<T>, path: _.PropertyPath, updater: (oldValue: any) => any, object: T): T;
+    /**
+     * This method is like `_.update` except that it accepts `customizer` which is
+     * invoked to produce the objects of `path`.  If `customizer` returns `undefined`
+     * path creation is handled by the method instead. The `customizer` is invoked
+     * with three arguments: (nsValue, key, nsObject).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @since 4.6.0
+     * @category Object
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param updater The function to produce the updated value.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * var object = {};
+     *
+     * _.updateWith(object, '[0][1]', _.constant('a'), Object);
+     * // => { '0': { '1': 'a' } }
+     */
+    <T extends object, TResult>(customizer: _.SetWithCustomizer<T>, path: _.PropertyPath, updater: (oldValue: any) => any, object: T): TResult;
+}
+interface UpdateWith1x1<T extends object> {
+    /**
+     * This method is like `_.update` except that it accepts `customizer` which is
+     * invoked to produce the objects of `path`.  If `customizer` returns `undefined`
+     * path creation is handled by the method instead. The `customizer` is invoked
+     * with three arguments: (nsValue, key, nsObject).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @since 4.6.0
+     * @category Object
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param updater The function to produce the updated value.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * var object = {};
+     *
+     * _.updateWith(object, '[0][1]', _.constant('a'), Object);
+     * // => { '0': { '1': 'a' } }
+     */
+    (): UpdateWith1x1<T>;
+    /**
+     * This method is like `_.update` except that it accepts `customizer` which is
+     * invoked to produce the objects of `path`.  If `customizer` returns `undefined`
+     * path creation is handled by the method instead. The `customizer` is invoked
+     * with three arguments: (nsValue, key, nsObject).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @since 4.6.0
+     * @category Object
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param updater The function to produce the updated value.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * var object = {};
+     *
+     * _.updateWith(object, '[0][1]', _.constant('a'), Object);
+     * // => { '0': { '1': 'a' } }
+     */
+    (path: _.PropertyPath): UpdateWith1x2<T>;
+    /**
+     * This method is like `_.update` except that it accepts `customizer` which is
+     * invoked to produce the objects of `path`.  If `customizer` returns `undefined`
+     * path creation is handled by the method instead. The `customizer` is invoked
+     * with three arguments: (nsValue, key, nsObject).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @since 4.6.0
+     * @category Object
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param updater The function to produce the updated value.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * var object = {};
+     *
+     * _.updateWith(object, '[0][1]', _.constant('a'), Object);
+     * // => { '0': { '1': 'a' } }
+     */
+    (path: _.PropertyPath, updater: (oldValue: any) => any): UpdateWith1x3<T>;
+    /**
+     * This method is like `_.update` except that it accepts `customizer` which is
+     * invoked to produce the objects of `path`.  If `customizer` returns `undefined`
+     * path creation is handled by the method instead. The `customizer` is invoked
+     * with three arguments: (nsValue, key, nsObject).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @since 4.6.0
+     * @category Object
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param updater The function to produce the updated value.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * var object = {};
+     *
+     * _.updateWith(object, '[0][1]', _.constant('a'), Object);
+     * // => { '0': { '1': 'a' } }
+     */
+    (path: _.PropertyPath, updater: (oldValue: any) => any, object: T): T;
+    /**
+     * This method is like `_.update` except that it accepts `customizer` which is
+     * invoked to produce the objects of `path`.  If `customizer` returns `undefined`
+     * path creation is handled by the method instead. The `customizer` is invoked
+     * with three arguments: (nsValue, key, nsObject).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @since 4.6.0
+     * @category Object
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param updater The function to produce the updated value.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * var object = {};
+     *
+     * _.updateWith(object, '[0][1]', _.constant('a'), Object);
+     * // => { '0': { '1': 'a' } }
+     */
+    <TResult>(path: _.PropertyPath, updater: (oldValue: any) => any, object: T): TResult;
+}
+interface UpdateWith1x2<T extends object> {
+    /**
+     * This method is like `_.update` except that it accepts `customizer` which is
+     * invoked to produce the objects of `path`.  If `customizer` returns `undefined`
+     * path creation is handled by the method instead. The `customizer` is invoked
+     * with three arguments: (nsValue, key, nsObject).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @since 4.6.0
+     * @category Object
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param updater The function to produce the updated value.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * var object = {};
+     *
+     * _.updateWith(object, '[0][1]', _.constant('a'), Object);
+     * // => { '0': { '1': 'a' } }
+     */
+    (): UpdateWith1x2<T>;
+    /**
+     * This method is like `_.update` except that it accepts `customizer` which is
+     * invoked to produce the objects of `path`.  If `customizer` returns `undefined`
+     * path creation is handled by the method instead. The `customizer` is invoked
+     * with three arguments: (nsValue, key, nsObject).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @since 4.6.0
+     * @category Object
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param updater The function to produce the updated value.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * var object = {};
+     *
+     * _.updateWith(object, '[0][1]', _.constant('a'), Object);
+     * // => { '0': { '1': 'a' } }
+     */
+    (updater: (oldValue: any) => any): UpdateWith1x3<T>;
+    /**
+     * This method is like `_.update` except that it accepts `customizer` which is
+     * invoked to produce the objects of `path`.  If `customizer` returns `undefined`
+     * path creation is handled by the method instead. The `customizer` is invoked
+     * with three arguments: (nsValue, key, nsObject).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @since 4.6.0
+     * @category Object
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param updater The function to produce the updated value.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * var object = {};
+     *
+     * _.updateWith(object, '[0][1]', _.constant('a'), Object);
+     * // => { '0': { '1': 'a' } }
+     */
+    (updater: (oldValue: any) => any, object: T): T;
+    /**
+     * This method is like `_.update` except that it accepts `customizer` which is
+     * invoked to produce the objects of `path`.  If `customizer` returns `undefined`
+     * path creation is handled by the method instead. The `customizer` is invoked
+     * with three arguments: (nsValue, key, nsObject).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @since 4.6.0
+     * @category Object
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param updater The function to produce the updated value.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * var object = {};
+     *
+     * _.updateWith(object, '[0][1]', _.constant('a'), Object);
+     * // => { '0': { '1': 'a' } }
+     */
+    <TResult>(updater: (oldValue: any) => any, object: T): TResult;
+}
+interface UpdateWith1x3<T extends object> {
+    /**
+     * This method is like `_.update` except that it accepts `customizer` which is
+     * invoked to produce the objects of `path`.  If `customizer` returns `undefined`
+     * path creation is handled by the method instead. The `customizer` is invoked
+     * with three arguments: (nsValue, key, nsObject).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @since 4.6.0
+     * @category Object
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param updater The function to produce the updated value.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * var object = {};
+     *
+     * _.updateWith(object, '[0][1]', _.constant('a'), Object);
+     * // => { '0': { '1': 'a' } }
+     */
+    (): UpdateWith1x3<T>;
+    /**
+     * This method is like `_.update` except that it accepts `customizer` which is
+     * invoked to produce the objects of `path`.  If `customizer` returns `undefined`
+     * path creation is handled by the method instead. The `customizer` is invoked
+     * with three arguments: (nsValue, key, nsObject).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @since 4.6.0
+     * @category Object
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param updater The function to produce the updated value.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * var object = {};
+     *
+     * _.updateWith(object, '[0][1]', _.constant('a'), Object);
+     * // => { '0': { '1': 'a' } }
+     */
+    (object: T): T;
+    /**
+     * This method is like `_.update` except that it accepts `customizer` which is
+     * invoked to produce the objects of `path`.  If `customizer` returns `undefined`
+     * path creation is handled by the method instead. The `customizer` is invoked
+     * with three arguments: (nsValue, key, nsObject).
+     *
+     * **Note:** This method mutates `object`.
+     *
+     * @since 4.6.0
+     * @category Object
+     * @param object The object to modify.
+     * @param path The path of the property to set.
+     * @param updater The function to produce the updated value.
+     * @param [customizer] The function to customize assigned values.
+     * @returns Returns `object`.
+     * @example
+     *
+     * var object = {};
+     *
+     * _.updateWith(object, '[0][1]', _.constant('a'), Object);
+     * // => { '0': { '1': 'a' } }
+     */
+    <TResult>(object: T): TResult;
+}
+
+declare const updateWith: UpdateWith;
+export = updateWith;
diff --git a/types/lodash/fp/upperCase.d.ts b/types/lodash/fp/upperCase.d.ts
new file mode 100644
index 0000000000..5e6cab91bf
--- /dev/null
+++ b/types/lodash/fp/upperCase.d.ts
@@ -0,0 +1,15 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type UpperCase =
+    /**
+     * Converts `string`, as space separated words, to upper case.
+     *
+     * @param string The string to convert.
+     * @return Returns the upper cased string.
+     */
+    (string: string) => string;
+
+declare const upperCase: UpperCase;
+export = upperCase;
diff --git a/types/lodash/fp/upperFirst.d.ts b/types/lodash/fp/upperFirst.d.ts
new file mode 100644
index 0000000000..54a442030e
--- /dev/null
+++ b/types/lodash/fp/upperFirst.d.ts
@@ -0,0 +1,15 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type UpperFirst =
+    /**
+     * Converts the first character of `string` to upper case.
+     *
+     * @param string The string to convert.
+     * @return Returns the converted string.
+     */
+    (string: string) => string;
+
+declare const upperFirst: UpperFirst;
+export = upperFirst;
diff --git a/types/lodash/fp/useWith.d.ts b/types/lodash/fp/useWith.d.ts
new file mode 100644
index 0000000000..1196dfbade
--- /dev/null
+++ b/types/lodash/fp/useWith.d.ts
@@ -0,0 +1,58 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface OverArgs {
+    /**
+     * Creates a function that runs each argument through a corresponding transform function.
+     *
+     * @param func The function to wrap.
+     * @param transforms The functions to transform arguments, specified as individual functions or arrays
+     * of functions.
+     * @return Returns the new function.
+     */
+    (): OverArgs;
+    /**
+     * Creates a function that runs each argument through a corresponding transform function.
+     *
+     * @param func The function to wrap.
+     * @param transforms The functions to transform arguments, specified as individual functions or arrays
+     * of functions.
+     * @return Returns the new function.
+     */
+    (func: (...args: any[]) => any): OverArgs1x1;
+    /**
+     * Creates a function that runs each argument through a corresponding transform function.
+     *
+     * @param func The function to wrap.
+     * @param transforms The functions to transform arguments, specified as individual functions or arrays
+     * of functions.
+     * @return Returns the new function.
+     */
+    (func: (...args: any[]) => any, transforms: _.Many<(...args: any[]) => any>): (...args: any[]) => any;
+}
+interface OverArgs1x1 {
+    /**
+     * Creates a function that runs each argument through a corresponding transform function.
+     *
+     * @param func The function to wrap.
+     * @param transforms The functions to transform arguments, specified as individual functions or arrays
+     * of functions.
+     * @return Returns the new function.
+     */
+    (): OverArgs1x1;
+    /**
+     * Creates a function that runs each argument through a corresponding transform function.
+     *
+     * @param func The function to wrap.
+     * @param transforms The functions to transform arguments, specified as individual functions or arrays
+     * of functions.
+     * @return Returns the new function.
+     */
+    (transforms: _.Many<(...args: any[]) => any>): (...args: any[]) => any;
+}
+
+declare const useWith: OverArgs;
+export = useWith;
diff --git a/types/lodash/fp/values.d.ts b/types/lodash/fp/values.d.ts
new file mode 100644
index 0000000000..ec0ef37c08
--- /dev/null
+++ b/types/lodash/fp/values.d.ts
@@ -0,0 +1,32 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Values {
+    /**
+     * Creates an array of the own enumerable property values of object.
+     *
+     * @param object The object to query.
+     * @return Returns an array of property values.
+     */
+    <T>(object: _.Dictionary<T> | _.NumericDictionary<T> | _.List<T> | null | undefined): T[];
+    /**
+     * Creates an array of the own enumerable property values of object.
+     *
+     * @param object The object to query.
+     * @return Returns an array of property values.
+     */
+    <T extends object>(object: T | null | undefined): Array<T[keyof T]>;
+    /**
+     * Creates an array of the own enumerable property values of object.
+     *
+     * @param object The object to query.
+     * @return Returns an array of property values.
+     */
+    (object: any): any[];
+}
+
+declare const values: Values;
+export = values;
diff --git a/types/lodash/fp/valuesIn.d.ts b/types/lodash/fp/valuesIn.d.ts
new file mode 100644
index 0000000000..35e9073535
--- /dev/null
+++ b/types/lodash/fp/valuesIn.d.ts
@@ -0,0 +1,25 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface ValuesIn {
+    /**
+     * Creates an array of the own and inherited enumerable property values of object.
+     *
+     * @param object The object to query.
+     * @return Returns the array of property values.
+     */
+    <T>(object: _.Dictionary<T>|_.NumericDictionary<T>|_.List<T> | null | undefined): T[];
+    /**
+     * Creates an array of the own and inherited enumerable property values of object.
+     *
+     * @param object The object to query.
+     * @return Returns the array of property values.
+     */
+    <T extends object>(object: T | null | undefined): Array<T[keyof T]>;
+}
+
+declare const valuesIn: ValuesIn;
+export = valuesIn;
diff --git a/types/lodash/fp/where.d.ts b/types/lodash/fp/where.d.ts
new file mode 100644
index 0000000000..4270edf2e4
--- /dev/null
+++ b/types/lodash/fp/where.d.ts
@@ -0,0 +1,48 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface ConformsTo {
+    /**
+     * Checks if object conforms to source by invoking the predicate properties of source with the
+     * corresponding property values of object.
+     *
+     * Note: This method is equivalent to _.conforms when source is partially applied.
+     */
+    (): ConformsTo;
+    /**
+     * Checks if object conforms to source by invoking the predicate properties of source with the
+     * corresponding property values of object.
+     *
+     * Note: This method is equivalent to _.conforms when source is partially applied.
+     */
+    <T>(source: _.ConformsPredicateObject<T>): ConformsTo1x1<T>;
+    /**
+     * Checks if object conforms to source by invoking the predicate properties of source with the
+     * corresponding property values of object.
+     *
+     * Note: This method is equivalent to _.conforms when source is partially applied.
+     */
+    <T>(source: _.ConformsPredicateObject<T>, object: T): boolean;
+}
+interface ConformsTo1x1<T> {
+    /**
+     * Checks if object conforms to source by invoking the predicate properties of source with the
+     * corresponding property values of object.
+     *
+     * Note: This method is equivalent to _.conforms when source is partially applied.
+     */
+    (): ConformsTo1x1<T>;
+    /**
+     * Checks if object conforms to source by invoking the predicate properties of source with the
+     * corresponding property values of object.
+     *
+     * Note: This method is equivalent to _.conforms when source is partially applied.
+     */
+    (object: T): boolean;
+}
+
+declare const where: ConformsTo;
+export = where;
diff --git a/types/lodash/fp/whereEq.d.ts b/types/lodash/fp/whereEq.d.ts
new file mode 100644
index 0000000000..1a660655f8
--- /dev/null
+++ b/types/lodash/fp/whereEq.d.ts
@@ -0,0 +1,116 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface IsMatch {
+    /**
+     * Performs a deep comparison between `object` and `source` to determine if
+     * `object` contains equivalent property values.
+     *
+     * **Note:** This method supports comparing the same values as `_.isEqual`.
+     *
+     * @category Lang
+     * @param object The object to inspect.
+     * @param source The object of property values to match.
+     * @returns Returns `true` if `object` is a match, else `false`.
+     * @example
+     *
+     * var object = { 'user': 'fred', 'age': 40 };
+     *
+     * _.isMatch(object, { 'age': 40 });
+     * // => true
+     *
+     * _.isMatch(object, { 'age': 36 });
+     * // => false
+     */
+    (): IsMatch;
+    /**
+     * Performs a deep comparison between `object` and `source` to determine if
+     * `object` contains equivalent property values.
+     *
+     * **Note:** This method supports comparing the same values as `_.isEqual`.
+     *
+     * @category Lang
+     * @param object The object to inspect.
+     * @param source The object of property values to match.
+     * @returns Returns `true` if `object` is a match, else `false`.
+     * @example
+     *
+     * var object = { 'user': 'fred', 'age': 40 };
+     *
+     * _.isMatch(object, { 'age': 40 });
+     * // => true
+     *
+     * _.isMatch(object, { 'age': 36 });
+     * // => false
+     */
+    (source: object): IsMatch1x1;
+    /**
+     * Performs a deep comparison between `object` and `source` to determine if
+     * `object` contains equivalent property values.
+     *
+     * **Note:** This method supports comparing the same values as `_.isEqual`.
+     *
+     * @category Lang
+     * @param object The object to inspect.
+     * @param source The object of property values to match.
+     * @returns Returns `true` if `object` is a match, else `false`.
+     * @example
+     *
+     * var object = { 'user': 'fred', 'age': 40 };
+     *
+     * _.isMatch(object, { 'age': 40 });
+     * // => true
+     *
+     * _.isMatch(object, { 'age': 36 });
+     * // => false
+     */
+    (source: object, object: object): boolean;
+}
+interface IsMatch1x1 {
+    /**
+     * Performs a deep comparison between `object` and `source` to determine if
+     * `object` contains equivalent property values.
+     *
+     * **Note:** This method supports comparing the same values as `_.isEqual`.
+     *
+     * @category Lang
+     * @param object The object to inspect.
+     * @param source The object of property values to match.
+     * @returns Returns `true` if `object` is a match, else `false`.
+     * @example
+     *
+     * var object = { 'user': 'fred', 'age': 40 };
+     *
+     * _.isMatch(object, { 'age': 40 });
+     * // => true
+     *
+     * _.isMatch(object, { 'age': 36 });
+     * // => false
+     */
+    (): IsMatch1x1;
+    /**
+     * Performs a deep comparison between `object` and `source` to determine if
+     * `object` contains equivalent property values.
+     *
+     * **Note:** This method supports comparing the same values as `_.isEqual`.
+     *
+     * @category Lang
+     * @param object The object to inspect.
+     * @param source The object of property values to match.
+     * @returns Returns `true` if `object` is a match, else `false`.
+     * @example
+     *
+     * var object = { 'user': 'fred', 'age': 40 };
+     *
+     * _.isMatch(object, { 'age': 40 });
+     * // => true
+     *
+     * _.isMatch(object, { 'age': 36 });
+     * // => false
+     */
+    (object: object): boolean;
+}
+
+declare const whereEq: IsMatch;
+export = whereEq;
diff --git a/types/lodash/fp/without.d.ts b/types/lodash/fp/without.d.ts
new file mode 100644
index 0000000000..9c30e47289
--- /dev/null
+++ b/types/lodash/fp/without.d.ts
@@ -0,0 +1,53 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Without {
+    /**
+     * Creates an array excluding all provided values using SameValueZero for equality comparisons.
+     *
+     * @param array The array to filter.
+     * @param values The values to exclude.
+     * @return Returns the new array of filtered values.
+     */
+    (): Without;
+    /**
+     * Creates an array excluding all provided values using SameValueZero for equality comparisons.
+     *
+     * @param array The array to filter.
+     * @param values The values to exclude.
+     * @return Returns the new array of filtered values.
+     */
+    <T>(values: ReadonlyArray<T>): Without1x1<T>;
+    /**
+     * Creates an array excluding all provided values using SameValueZero for equality comparisons.
+     *
+     * @param array The array to filter.
+     * @param values The values to exclude.
+     * @return Returns the new array of filtered values.
+     */
+    <T>(values: ReadonlyArray<T>, array: _.List<T> | null | undefined): T[];
+}
+interface Without1x1<T> {
+    /**
+     * Creates an array excluding all provided values using SameValueZero for equality comparisons.
+     *
+     * @param array The array to filter.
+     * @param values The values to exclude.
+     * @return Returns the new array of filtered values.
+     */
+    (): Without1x1<T>;
+    /**
+     * Creates an array excluding all provided values using SameValueZero for equality comparisons.
+     *
+     * @param array The array to filter.
+     * @param values The values to exclude.
+     * @return Returns the new array of filtered values.
+     */
+    (array: _.List<T> | null | undefined): T[];
+}
+
+declare const without: Without;
+export = without;
diff --git a/types/lodash/fp/words.d.ts b/types/lodash/fp/words.d.ts
new file mode 100644
index 0000000000..c827eafb15
--- /dev/null
+++ b/types/lodash/fp/words.d.ts
@@ -0,0 +1,16 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+type Words =
+    /**
+     * Splits `string` into an array of its words.
+     *
+     * @param string The string to inspect.
+     * @param pattern The pattern to match words.
+     * @return Returns the words of `string`.
+     */
+    (string: string) => string[];
+
+declare const words: Words;
+export = words;
diff --git a/types/lodash/fp/wrap.d.ts b/types/lodash/fp/wrap.d.ts
new file mode 100644
index 0000000000..a906abe0f2
--- /dev/null
+++ b/types/lodash/fp/wrap.d.ts
@@ -0,0 +1,103 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+interface Wrap {
+    /**
+     * Creates a function that provides value to the wrapper function as its first argument. Any additional
+     * arguments provided to the function are appended to those provided to the wrapper function. The wrapper is
+     * invoked with the this binding of the created function.
+     *
+     * @param value The value to wrap.
+     * @param wrapper The wrapper function.
+     * @return Returns the new function.
+     */
+    (): Wrap;
+    /**
+     * Creates a function that provides value to the wrapper function as its first argument. Any additional
+     * arguments provided to the function are appended to those provided to the wrapper function. The wrapper is
+     * invoked with the this binding of the created function.
+     *
+     * @param value The value to wrap.
+     * @param wrapper The wrapper function.
+     * @return Returns the new function.
+     */
+    <T, TArgs, TResult>(wrapper: (value: T, ...args: TArgs[]) => TResult): Wrap1x1<T, TArgs, TResult>;
+    /**
+     * Creates a function that provides value to the wrapper function as its first argument. Any additional
+     * arguments provided to the function are appended to those provided to the wrapper function. The wrapper is
+     * invoked with the this binding of the created function.
+     *
+     * @param value The value to wrap.
+     * @param wrapper The wrapper function.
+     * @return Returns the new function.
+     */
+    <T, TArgs, TResult>(wrapper: (value: T, ...args: TArgs[]) => TResult, value: T): (...args: TArgs[]) => TResult;
+    /**
+     * Creates a function that provides value to the wrapper function as its first argument. Any additional
+     * arguments provided to the function are appended to those provided to the wrapper function. The wrapper is
+     * invoked with the this binding of the created function.
+     *
+     * @param value The value to wrap.
+     * @param wrapper The wrapper function.
+     * @return Returns the new function.
+     */
+    <T, TResult>(wrapper: (value: T, ...args: any[]) => TResult): Wrap2x1<T, TResult>;
+    /**
+     * Creates a function that provides value to the wrapper function as its first argument. Any additional
+     * arguments provided to the function are appended to those provided to the wrapper function. The wrapper is
+     * invoked with the this binding of the created function.
+     *
+     * @param value The value to wrap.
+     * @param wrapper The wrapper function.
+     * @return Returns the new function.
+     */
+    <T, TResult>(wrapper: (value: T, ...args: any[]) => TResult, value: T): (...args: any[]) => TResult;
+}
+interface Wrap1x1<T, TArgs, TResult> {
+    /**
+     * Creates a function that provides value to the wrapper function as its first argument. Any additional
+     * arguments provided to the function are appended to those provided to the wrapper function. The wrapper is
+     * invoked with the this binding of the created function.
+     *
+     * @param value The value to wrap.
+     * @param wrapper The wrapper function.
+     * @return Returns the new function.
+     */
+    (): Wrap1x1<T, TArgs, TResult>;
+    /**
+     * Creates a function that provides value to the wrapper function as its first argument. Any additional
+     * arguments provided to the function are appended to those provided to the wrapper function. The wrapper is
+     * invoked with the this binding of the created function.
+     *
+     * @param value The value to wrap.
+     * @param wrapper The wrapper function.
+     * @return Returns the new function.
+     */
+    (value: T): (...args: TArgs[]) => TResult;
+}
+interface Wrap2x1<T, TResult> {
+    /**
+     * Creates a function that provides value to the wrapper function as its first argument. Any additional
+     * arguments provided to the function are appended to those provided to the wrapper function. The wrapper is
+     * invoked with the this binding of the created function.
+     *
+     * @param value The value to wrap.
+     * @param wrapper The wrapper function.
+     * @return Returns the new function.
+     */
+    (): Wrap2x1<T, TResult>;
+    /**
+     * Creates a function that provides value to the wrapper function as its first argument. Any additional
+     * arguments provided to the function are appended to those provided to the wrapper function. The wrapper is
+     * invoked with the this binding of the created function.
+     *
+     * @param value The value to wrap.
+     * @param wrapper The wrapper function.
+     * @return Returns the new function.
+     */
+    (value: T): (...args: any[]) => TResult;
+}
+
+declare const wrap: Wrap;
+export = wrap;
diff --git a/types/lodash/fp/xor.d.ts b/types/lodash/fp/xor.d.ts
new file mode 100644
index 0000000000..d3e250cb5a
--- /dev/null
+++ b/types/lodash/fp/xor.d.ts
@@ -0,0 +1,48 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Xor {
+    /**
+     * Creates an array of unique values that is the symmetric difference of the provided arrays.
+     *
+     * @param arrays The arrays to inspect.
+     * @return Returns the new array of values.
+     */
+    (): Xor;
+    /**
+     * Creates an array of unique values that is the symmetric difference of the provided arrays.
+     *
+     * @param arrays The arrays to inspect.
+     * @return Returns the new array of values.
+     */
+    <T>(arrays2: _.List<T> | null | undefined): Xor1x1<T>;
+    /**
+     * Creates an array of unique values that is the symmetric difference of the provided arrays.
+     *
+     * @param arrays The arrays to inspect.
+     * @return Returns the new array of values.
+     */
+    <T>(arrays2: _.List<T> | null | undefined, arrays: _.List<T> | null | undefined): T[];
+}
+interface Xor1x1<T> {
+    /**
+     * Creates an array of unique values that is the symmetric difference of the provided arrays.
+     *
+     * @param arrays The arrays to inspect.
+     * @return Returns the new array of values.
+     */
+    (): Xor1x1<T>;
+    /**
+     * Creates an array of unique values that is the symmetric difference of the provided arrays.
+     *
+     * @param arrays The arrays to inspect.
+     * @return Returns the new array of values.
+     */
+    (arrays: _.List<T> | null | undefined): T[];
+}
+
+declare const xor: Xor;
+export = xor;
diff --git a/types/lodash/fp/xorBy.d.ts b/types/lodash/fp/xorBy.d.ts
new file mode 100644
index 0000000000..8d5b2fd05a
--- /dev/null
+++ b/types/lodash/fp/xorBy.d.ts
@@ -0,0 +1,186 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface XorBy {
+    /**
+     * This method is like `_.xor` except that it accepts `iteratee` which is
+     * invoked for each element of each `arrays` to generate the criterion by which
+     * uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the new array of values.
+     * @example
+     *
+     * _.xorBy([2.1, 1.2], [4.3, 2.4], Math.floor);
+     * // => [1.2, 4.3]
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.xorBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
+     * // => [{ 'x': 2 }]
+     */
+    (): XorBy;
+    /**
+     * This method is like `_.xor` except that it accepts `iteratee` which is
+     * invoked for each element of each `arrays` to generate the criterion by which
+     * uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the new array of values.
+     * @example
+     *
+     * _.xorBy([2.1, 1.2], [4.3, 2.4], Math.floor);
+     * // => [1.2, 4.3]
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.xorBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
+     * // => [{ 'x': 2 }]
+     */
+    <T>(iteratee: _.ValueIteratee<T>): XorBy1x1<T>;
+    /**
+     * This method is like `_.xor` except that it accepts `iteratee` which is
+     * invoked for each element of each `arrays` to generate the criterion by which
+     * uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the new array of values.
+     * @example
+     *
+     * _.xorBy([2.1, 1.2], [4.3, 2.4], Math.floor);
+     * // => [1.2, 4.3]
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.xorBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
+     * // => [{ 'x': 2 }]
+     */
+    <T>(iteratee: _.ValueIteratee<T>, arrays: _.List<T> | null | undefined): XorBy1x2<T>;
+    /**
+     * This method is like `_.xor` except that it accepts `iteratee` which is
+     * invoked for each element of each `arrays` to generate the criterion by which
+     * uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the new array of values.
+     * @example
+     *
+     * _.xorBy([2.1, 1.2], [4.3, 2.4], Math.floor);
+     * // => [1.2, 4.3]
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.xorBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
+     * // => [{ 'x': 2 }]
+     */
+    <T>(iteratee: _.ValueIteratee<T>, arrays: _.List<T> | null | undefined, arrays2: _.List<T> | null | undefined): T[];
+}
+interface XorBy1x1<T> {
+    /**
+     * This method is like `_.xor` except that it accepts `iteratee` which is
+     * invoked for each element of each `arrays` to generate the criterion by which
+     * uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the new array of values.
+     * @example
+     *
+     * _.xorBy([2.1, 1.2], [4.3, 2.4], Math.floor);
+     * // => [1.2, 4.3]
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.xorBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
+     * // => [{ 'x': 2 }]
+     */
+    (): XorBy1x1<T>;
+    /**
+     * This method is like `_.xor` except that it accepts `iteratee` which is
+     * invoked for each element of each `arrays` to generate the criterion by which
+     * uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the new array of values.
+     * @example
+     *
+     * _.xorBy([2.1, 1.2], [4.3, 2.4], Math.floor);
+     * // => [1.2, 4.3]
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.xorBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
+     * // => [{ 'x': 2 }]
+     */
+    (arrays: _.List<T> | null | undefined): XorBy1x2<T>;
+    /**
+     * This method is like `_.xor` except that it accepts `iteratee` which is
+     * invoked for each element of each `arrays` to generate the criterion by which
+     * uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the new array of values.
+     * @example
+     *
+     * _.xorBy([2.1, 1.2], [4.3, 2.4], Math.floor);
+     * // => [1.2, 4.3]
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.xorBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
+     * // => [{ 'x': 2 }]
+     */
+    (arrays: _.List<T> | null | undefined, arrays2: _.List<T> | null | undefined): T[];
+}
+interface XorBy1x2<T> {
+    /**
+     * This method is like `_.xor` except that it accepts `iteratee` which is
+     * invoked for each element of each `arrays` to generate the criterion by which
+     * uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the new array of values.
+     * @example
+     *
+     * _.xorBy([2.1, 1.2], [4.3, 2.4], Math.floor);
+     * // => [1.2, 4.3]
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.xorBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
+     * // => [{ 'x': 2 }]
+     */
+    (): XorBy1x2<T>;
+    /**
+     * This method is like `_.xor` except that it accepts `iteratee` which is
+     * invoked for each element of each `arrays` to generate the criterion by which
+     * uniqueness is computed. The iteratee is invoked with one argument: (value).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [iteratee=_.identity] The iteratee invoked per element.
+     * @returns Returns the new array of values.
+     * @example
+     *
+     * _.xorBy([2.1, 1.2], [4.3, 2.4], Math.floor);
+     * // => [1.2, 4.3]
+     *
+     * // using the `_.property` iteratee shorthand
+     * _.xorBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
+     * // => [{ 'x': 2 }]
+     */
+    (arrays2: _.List<T> | null | undefined): T[];
+}
+
+declare const xorBy: XorBy;
+export = xorBy;
diff --git a/types/lodash/fp/xorWith.d.ts b/types/lodash/fp/xorWith.d.ts
new file mode 100644
index 0000000000..6bdcabdbd2
--- /dev/null
+++ b/types/lodash/fp/xorWith.d.ts
@@ -0,0 +1,177 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface XorWith {
+    /**
+     * This method is like `_.xor` except that it accepts `comparator` which is
+     * invoked to compare elements of `arrays`. The comparator is invoked with
+     * two arguments: (arrVal, othVal).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [comparator] The comparator invoked per element.
+     * @returns Returns the new array of values.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
+     *
+     * _.xorWith(objects, others, _.isEqual);
+     * // => [{ 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
+     */
+    (): XorWith;
+    /**
+     * This method is like `_.xor` except that it accepts `comparator` which is
+     * invoked to compare elements of `arrays`. The comparator is invoked with
+     * two arguments: (arrVal, othVal).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [comparator] The comparator invoked per element.
+     * @returns Returns the new array of values.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
+     *
+     * _.xorWith(objects, others, _.isEqual);
+     * // => [{ 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
+     */
+    <T>(comparator: _.Comparator<T>): XorWith1x1<T>;
+    /**
+     * This method is like `_.xor` except that it accepts `comparator` which is
+     * invoked to compare elements of `arrays`. The comparator is invoked with
+     * two arguments: (arrVal, othVal).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [comparator] The comparator invoked per element.
+     * @returns Returns the new array of values.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
+     *
+     * _.xorWith(objects, others, _.isEqual);
+     * // => [{ 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
+     */
+    <T>(comparator: _.Comparator<T>, arrays: _.List<T> | null | undefined): XorWith1x2<T>;
+    /**
+     * This method is like `_.xor` except that it accepts `comparator` which is
+     * invoked to compare elements of `arrays`. The comparator is invoked with
+     * two arguments: (arrVal, othVal).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [comparator] The comparator invoked per element.
+     * @returns Returns the new array of values.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
+     *
+     * _.xorWith(objects, others, _.isEqual);
+     * // => [{ 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
+     */
+    <T>(comparator: _.Comparator<T>, arrays: _.List<T> | null | undefined, arrays2: _.List<T> | null | undefined): T[];
+}
+interface XorWith1x1<T> {
+    /**
+     * This method is like `_.xor` except that it accepts `comparator` which is
+     * invoked to compare elements of `arrays`. The comparator is invoked with
+     * two arguments: (arrVal, othVal).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [comparator] The comparator invoked per element.
+     * @returns Returns the new array of values.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
+     *
+     * _.xorWith(objects, others, _.isEqual);
+     * // => [{ 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
+     */
+    (): XorWith1x1<T>;
+    /**
+     * This method is like `_.xor` except that it accepts `comparator` which is
+     * invoked to compare elements of `arrays`. The comparator is invoked with
+     * two arguments: (arrVal, othVal).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [comparator] The comparator invoked per element.
+     * @returns Returns the new array of values.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
+     *
+     * _.xorWith(objects, others, _.isEqual);
+     * // => [{ 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
+     */
+    (arrays: _.List<T> | null | undefined): XorWith1x2<T>;
+    /**
+     * This method is like `_.xor` except that it accepts `comparator` which is
+     * invoked to compare elements of `arrays`. The comparator is invoked with
+     * two arguments: (arrVal, othVal).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [comparator] The comparator invoked per element.
+     * @returns Returns the new array of values.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
+     *
+     * _.xorWith(objects, others, _.isEqual);
+     * // => [{ 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
+     */
+    (arrays: _.List<T> | null | undefined, arrays2: _.List<T> | null | undefined): T[];
+}
+interface XorWith1x2<T> {
+    /**
+     * This method is like `_.xor` except that it accepts `comparator` which is
+     * invoked to compare elements of `arrays`. The comparator is invoked with
+     * two arguments: (arrVal, othVal).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [comparator] The comparator invoked per element.
+     * @returns Returns the new array of values.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
+     *
+     * _.xorWith(objects, others, _.isEqual);
+     * // => [{ 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
+     */
+    (): XorWith1x2<T>;
+    /**
+     * This method is like `_.xor` except that it accepts `comparator` which is
+     * invoked to compare elements of `arrays`. The comparator is invoked with
+     * two arguments: (arrVal, othVal).
+     *
+     * @category Array
+     * @param [arrays] The arrays to inspect.
+     * @param [comparator] The comparator invoked per element.
+     * @returns Returns the new array of values.
+     * @example
+     *
+     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
+     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
+     *
+     * _.xorWith(objects, others, _.isEqual);
+     * // => [{ 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
+     */
+    (arrays2: _.List<T> | null | undefined): T[];
+}
+
+declare const xorWith: XorWith;
+export = xorWith;
diff --git a/types/lodash/fp/zip.d.ts b/types/lodash/fp/zip.d.ts
new file mode 100644
index 0000000000..dd4e6a1e3c
--- /dev/null
+++ b/types/lodash/fp/zip.d.ts
@@ -0,0 +1,53 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface Zip {
+    /**
+     * Creates an array of grouped elements, the first of which contains the first elements of the given arrays,
+     * the second of which contains the second elements of the given arrays, and so on.
+     *
+     * @param arrays The arrays to process.
+     * @return Returns the new array of grouped elements.
+     */
+    (): Zip;
+    /**
+     * Creates an array of grouped elements, the first of which contains the first elements of the given arrays,
+     * the second of which contains the second elements of the given arrays, and so on.
+     *
+     * @param arrays The arrays to process.
+     * @return Returns the new array of grouped elements.
+     */
+    <T1>(arrays1: _.List<T1>): Zip1x1<T1>;
+    /**
+     * Creates an array of grouped elements, the first of which contains the first elements of the given arrays,
+     * the second of which contains the second elements of the given arrays, and so on.
+     *
+     * @param arrays The arrays to process.
+     * @return Returns the new array of grouped elements.
+     */
+    <T1, T2>(arrays1: _.List<T1>, arrays2: _.List<T2>): Array<[T1 | undefined, T2 | undefined]>;
+}
+interface Zip1x1<T1> {
+    /**
+     * Creates an array of grouped elements, the first of which contains the first elements of the given arrays,
+     * the second of which contains the second elements of the given arrays, and so on.
+     *
+     * @param arrays The arrays to process.
+     * @return Returns the new array of grouped elements.
+     */
+    (): Zip1x1<T1>;
+    /**
+     * Creates an array of grouped elements, the first of which contains the first elements of the given arrays,
+     * the second of which contains the second elements of the given arrays, and so on.
+     *
+     * @param arrays The arrays to process.
+     * @return Returns the new array of grouped elements.
+     */
+    <T2>(arrays2: _.List<T2>): Array<[T1 | undefined, T2 | undefined]>;
+}
+
+declare const zip: Zip;
+export = zip;
diff --git a/types/lodash/fp/zipAll.d.ts b/types/lodash/fp/zipAll.d.ts
new file mode 100644
index 0000000000..62cf6eb647
--- /dev/null
+++ b/types/lodash/fp/zipAll.d.ts
@@ -0,0 +1,18 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+type Zip =
+    /**
+     * Creates an array of grouped elements, the first of which contains the first elements of the given arrays,
+     * the second of which contains the second elements of the given arrays, and so on.
+     *
+     * @param arrays The arrays to process.
+     * @return Returns the new array of grouped elements.
+     */
+    <T>(arrays: ReadonlyArray<_.List<T> | null | undefined>) => Array<Array<T | undefined>>;
+
+declare const zipAll: Zip;
+export = zipAll;
diff --git a/types/lodash/fp/zipObj.d.ts b/types/lodash/fp/zipObj.d.ts
new file mode 100644
index 0000000000..7b1c5bb91a
--- /dev/null
+++ b/types/lodash/fp/zipObj.d.ts
@@ -0,0 +1,58 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface ZipObject {
+    /**
+     * This method is like _.fromPairs except that it accepts two arrays, one of property
+     * identifiers and one of corresponding values.
+     *
+     * @param props The property names.
+     * @param values The property values.
+     * @return Returns the new object.
+     */
+    (): ZipObject;
+    /**
+     * This method is like _.fromPairs except that it accepts two arrays, one of property
+     * identifiers and one of corresponding values.
+     *
+     * @param props The property names.
+     * @param values The property values.
+     * @return Returns the new object.
+     */
+    (props: _.List<_.PropertyName>): ZipObject1x1;
+    /**
+     * This method is like _.fromPairs except that it accepts two arrays, one of property
+     * identifiers and one of corresponding values.
+     *
+     * @param props The property names.
+     * @param values The property values.
+     * @return Returns the new object.
+     */
+    <T>(props: _.List<_.PropertyName>, values: _.List<T>): _.Dictionary<T>;
+}
+interface ZipObject1x1 {
+    /**
+     * This method is like _.fromPairs except that it accepts two arrays, one of property
+     * identifiers and one of corresponding values.
+     *
+     * @param props The property names.
+     * @param values The property values.
+     * @return Returns the new object.
+     */
+    (): ZipObject1x1;
+    /**
+     * This method is like _.fromPairs except that it accepts two arrays, one of property
+     * identifiers and one of corresponding values.
+     *
+     * @param props The property names.
+     * @param values The property values.
+     * @return Returns the new object.
+     */
+    <T>(values: _.List<T>): _.Dictionary<T>;
+}
+
+declare const zipObj: ZipObject;
+export = zipObj;
diff --git a/types/lodash/fp/zipObject.d.ts b/types/lodash/fp/zipObject.d.ts
new file mode 100644
index 0000000000..61f5d04e79
--- /dev/null
+++ b/types/lodash/fp/zipObject.d.ts
@@ -0,0 +1,58 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface ZipObject {
+    /**
+     * This method is like _.fromPairs except that it accepts two arrays, one of property
+     * identifiers and one of corresponding values.
+     *
+     * @param props The property names.
+     * @param values The property values.
+     * @return Returns the new object.
+     */
+    (): ZipObject;
+    /**
+     * This method is like _.fromPairs except that it accepts two arrays, one of property
+     * identifiers and one of corresponding values.
+     *
+     * @param props The property names.
+     * @param values The property values.
+     * @return Returns the new object.
+     */
+    (props: _.List<_.PropertyName>): ZipObject1x1;
+    /**
+     * This method is like _.fromPairs except that it accepts two arrays, one of property
+     * identifiers and one of corresponding values.
+     *
+     * @param props The property names.
+     * @param values The property values.
+     * @return Returns the new object.
+     */
+    <T>(props: _.List<_.PropertyName>, values: _.List<T>): _.Dictionary<T>;
+}
+interface ZipObject1x1 {
+    /**
+     * This method is like _.fromPairs except that it accepts two arrays, one of property
+     * identifiers and one of corresponding values.
+     *
+     * @param props The property names.
+     * @param values The property values.
+     * @return Returns the new object.
+     */
+    (): ZipObject1x1;
+    /**
+     * This method is like _.fromPairs except that it accepts two arrays, one of property
+     * identifiers and one of corresponding values.
+     *
+     * @param props The property names.
+     * @param values The property values.
+     * @return Returns the new object.
+     */
+    <T>(values: _.List<T>): _.Dictionary<T>;
+}
+
+declare const zipObject: ZipObject;
+export = zipObject;
diff --git a/types/lodash/fp/zipObjectDeep.d.ts b/types/lodash/fp/zipObjectDeep.d.ts
new file mode 100644
index 0000000000..0fd3f218ab
--- /dev/null
+++ b/types/lodash/fp/zipObjectDeep.d.ts
@@ -0,0 +1,53 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface ZipObjectDeep {
+    /**
+     * This method is like _.zipObject except that it supports property paths.
+     *
+     * @param paths The property names.
+     * @param values The property values.
+     * @return Returns the new object.
+     */
+    (): ZipObjectDeep;
+    /**
+     * This method is like _.zipObject except that it supports property paths.
+     *
+     * @param paths The property names.
+     * @param values The property values.
+     * @return Returns the new object.
+     */
+    (paths: _.List<_.PropertyPath>): ZipObjectDeep1x1;
+    /**
+     * This method is like _.zipObject except that it supports property paths.
+     *
+     * @param paths The property names.
+     * @param values The property values.
+     * @return Returns the new object.
+     */
+    (paths: _.List<_.PropertyPath>, values: _.List<any>): object;
+}
+interface ZipObjectDeep1x1 {
+    /**
+     * This method is like _.zipObject except that it supports property paths.
+     *
+     * @param paths The property names.
+     * @param values The property values.
+     * @return Returns the new object.
+     */
+    (): ZipObjectDeep1x1;
+    /**
+     * This method is like _.zipObject except that it supports property paths.
+     *
+     * @param paths The property names.
+     * @param values The property values.
+     * @return Returns the new object.
+     */
+    (values: _.List<any>): object;
+}
+
+declare const zipObjectDeep: ZipObjectDeep;
+export = zipObjectDeep;
diff --git a/types/lodash/fp/zipWith.d.ts b/types/lodash/fp/zipWith.d.ts
new file mode 100644
index 0000000000..36c02c053c
--- /dev/null
+++ b/types/lodash/fp/zipWith.d.ts
@@ -0,0 +1,105 @@
+// AUTO-GENERATED: do not modify this file directly.
+// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
+// npm run fp
+
+import _ = require("../index");
+
+interface ZipWith {
+    /**
+     * This method is like _.zip except that it accepts an iteratee to specify how grouped values should be
+     * combined. The iteratee is bound to thisArg and invoked with four arguments: (accumulator, value, index,
+     * group).
+     * @param [arrays] The arrays to process.
+     * @param [iteratee] The function to combine grouped values.
+     * @param [thisArg] The `this` binding of `iteratee`.
+     * @return Returns the new array of grouped elements.
+     */
+    (): ZipWith;
+    /**
+     * This method is like _.zip except that it accepts an iteratee to specify how grouped values should be
+     * combined. The iteratee is bound to thisArg and invoked with four arguments: (accumulator, value, index,
+     * group).
+     * @param [arrays] The arrays to process.
+     * @param [iteratee] The function to combine grouped values.
+     * @param [thisArg] The `this` binding of `iteratee`.
+     * @return Returns the new array of grouped elements.
+     */
+    <T1, T2, TResult>(iteratee: (value1: T1, value2: T2) => TResult): ZipWith1x1<T1, T2, TResult>;
+    /**
+     * This method is like _.zip except that it accepts an iteratee to specify how grouped values should be
+     * combined. The iteratee is bound to thisArg and invoked with four arguments: (accumulator, value, index,
+     * group).
+     * @param [arrays] The arrays to process.
+     * @param [iteratee] The function to combine grouped values.
+     * @param [thisArg] The `this` binding of `iteratee`.
+     * @return Returns the new array of grouped elements.
+     */
+    <T1, T2, TResult>(iteratee: (value1: T1, value2: T2) => TResult, arrays1: _.List<T1>): ZipWith1x2<T2, TResult>;
+    /**
+     * This method is like _.zip except that it accepts an iteratee to specify how grouped values should be
+     * combined. The iteratee is bound to thisArg and invoked with four arguments: (accumulator, value, index,
+     * group).
+     * @param [arrays] The arrays to process.
+     * @param [iteratee] The function to combine grouped values.
+     * @param [thisArg] The `this` binding of `iteratee`.
+     * @return Returns the new array of grouped elements.
+     */
+    <T1, T2, TResult>(iteratee: (value1: T1, value2: T2) => TResult, arrays1: _.List<T1>, arrays2: _.List<T2>): TResult[];
+}
+interface ZipWith1x1<T1, T2, TResult> {
+    /**
+     * This method is like _.zip except that it accepts an iteratee to specify how grouped values should be
+     * combined. The iteratee is bound to thisArg and invoked with four arguments: (accumulator, value, index,
+     * group).
+     * @param [arrays] The arrays to process.
+     * @param [iteratee] The function to combine grouped values.
+     * @param [thisArg] The `this` binding of `iteratee`.
+     * @return Returns the new array of grouped elements.
+     */
+    (): ZipWith1x1<T1, T2, TResult>;
+    /**
+     * This method is like _.zip except that it accepts an iteratee to specify how grouped values should be
+     * combined. The iteratee is bound to thisArg and invoked with four arguments: (accumulator, value, index,
+     * group).
+     * @param [arrays] The arrays to process.
+     * @param [iteratee] The function to combine grouped values.
+     * @param [thisArg] The `this` binding of `iteratee`.
+     * @return Returns the new array of grouped elements.
+     */
+    (arrays1: _.List<T1>): ZipWith1x2<T2, TResult>;
+    /**
+     * This method is like _.zip except that it accepts an iteratee to specify how grouped values should be
+     * combined. The iteratee is bound to thisArg and invoked with four arguments: (accumulator, value, index,
+     * group).
+     * @param [arrays] The arrays to process.
+     * @param [iteratee] The function to combine grouped values.
+     * @param [thisArg] The `this` binding of `iteratee`.
+     * @return Returns the new array of grouped elements.
+     */
+    (arrays1: _.List<T1>, arrays2: _.List<T2>): TResult[];
+}
+interface ZipWith1x2<T2, TResult> {
+    /**
+     * This method is like _.zip except that it accepts an iteratee to specify how grouped values should be
+     * combined. The iteratee is bound to thisArg and invoked with four arguments: (accumulator, value, index,
+     * group).
+     * @param [arrays] The arrays to process.
+     * @param [iteratee] The function to combine grouped values.
+     * @param [thisArg] The `this` binding of `iteratee`.
+     * @return Returns the new array of grouped elements.
+     */
+    (): ZipWith1x2<T2, TResult>;
+    /**
+     * This method is like _.zip except that it accepts an iteratee to specify how grouped values should be
+     * combined. The iteratee is bound to thisArg and invoked with four arguments: (accumulator, value, index,
+     * group).
+     * @param [arrays] The arrays to process.
+     * @param [iteratee] The function to combine grouped values.
+     * @param [thisArg] The `this` binding of `iteratee`.
+     * @return Returns the new array of grouped elements.
+     */
+    <T1>(arrays2: _.List<T2>): TResult[];
+}
+
+declare const zipWith: ZipWith;
+export = zipWith;
diff --git a/types/lodash/lodash-tests.ts b/types/lodash/lodash-tests.ts
index 20bde973aa..28d2967c86 100644
--- a/types/lodash/lodash-tests.ts
+++ b/types/lodash/lodash-tests.ts
@@ -1,26 +1,7 @@
-declare const $: any;
+import fp = require("lodash/fp");
+import _ = require("lodash");
 
-interface FoodOrganic {
-    name: string;
-    organic: boolean;
-}
-interface StoogesAge {
-    name: string;
-    age: number;
-}
-
-const foodsOrganic: FoodOrganic[] = [
-    { name: 'banana', organic: true },
-    { name: 'beet', organic: false },
-];
-const stoogesAges: StoogesAge[] = [
-    { 'name': 'moe', 'age': 40 },
-    { 'name': 'larry', 'age': 50 }
-];
-
-let result: any;
-
-let anything: any;
+declare const anything: any;
 
 interface AbcObject {
     a: number;
@@ -28,58 +9,6 @@ interface AbcObject {
     c: boolean;
 }
 
-// _.MapCache
-let testMapCache: _.MapCache = {
-    delete(key: string) { return true; },
-    get(key: string): any { return 1; },
-    has(key: string) { return true; },
-    set(key: string, value: any): _.Dictionary<any> { return {}; },
-    clear() { },
-};
-result = <(key: string) => boolean>testMapCache.delete;
-result = <(key: string) => any>testMapCache.get;
-result = <(key: string) => boolean>testMapCache.has;
-result = <(key: string, value: any) => _.Dictionary<any>>testMapCache.set;
-result = <() => void>testMapCache.clear;
-
-// _
-namespace TestWrapper {
-    {
-        let result: _.LoDashImplicitWrapper<string>;
-        result = _('');
-    }
-
-    {
-        let result: _.LoDashImplicitWrapper<number>;
-        result = _(42);
-    }
-
-    {
-        let result: _.LoDashImplicitWrapper<boolean>;
-        result = _(true);
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<string>;
-        result = _(['']);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<{a: string}>;
-        result = _<{a: string}>({a: ''});
-    }
-
-    {
-        let a: AbcObject[] = [];
-        _(a); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-    }
-
-    {
-        let a: AbcObject[] | null | undefined = anything;
-        _(a); // $ExpectType LoDashImplicitWrapper<AbcObject[] | null | undefined>
-    }
-}
-
 // Wrapped array shortcut methods
 _([1, 2, 3, 4]).pop(); // $ExpectType number | undefined
 _([1, 2, 3, 4]).push(5, 6, 7); // $ExpectType LoDashImplicitWrapper<number[]>
@@ -97,317 +26,122 @@ _.chain([1, 2, 3, 4]).splice(1); // $ExpectType LoDashExplicitWrapper<number[]>
 _.chain([1, 2, 3, 4]).splice(1, 2, 5, 6); // $ExpectType LoDashExplicitWrapper<number[]>
 _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number[]>
 
-/*********
- * Array *
- *********/
-
 // _.chunk
-namespace TestChunk {
-    let array: AbcObject[] | null | undefined = [] as any;
-    let list: _.List<AbcObject> | null | undefined = [] as any;
+{
+    const list: _.List<AbcObject> | null | undefined = anything;
 
-    {
-        let result: AbcObject[][];
+    _.chunk(list); // $ExpectType AbcObject[][]
+    _.chunk(list, 42); // $ExpectType AbcObject[][]
 
-        result = _.chunk(array);
-        result = _.chunk(array, 42);
+    _(list).chunk(); // $ExpectType LoDashImplicitWrapper<AbcObject[][]>
+    _(list).chunk(42); // $ExpectType LoDashImplicitWrapper<AbcObject[][]>
 
-        result = _.chunk(list);
-        result = _.chunk(list, 42);
-    }
+    _.chain(list).chunk(); // $ExpectType LoDashExplicitWrapper<AbcObject[][]>
+    _.chain(list).chunk(42); // $ExpectType LoDashExplicitWrapper<AbcObject[][]>
 
-    {
-        let result: _.LoDashImplicitArrayWrapper<AbcObject[]>;
-
-        result = _(array).chunk();
-        result = _(array).chunk(42);
-
-        result = _(list).chunk();
-        result = _(list).chunk(42);
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<AbcObject[]>;
-
-        result = _.chain(array).chunk();
-        result = _(array).chain().chunk();
-        result = _(array).chain().chunk(42);
-
-        result = _(list).chain().chunk();
-        result = _(list).chain().chunk(42);
-    }
+    fp.chunk(42, list); // $ExpectType AbcObject[][]
+    fp.chunk(42)(list); // $ExpectType AbcObject[][]
+    fp.chunk()(42)()(list); // $ExpectType AbcObject[][]
 }
 
 // _.compact
-namespace TestCompact {
-    let array: AbcObject[] | null | undefined = [] as any;
-    let list: _.List<AbcObject> | null | undefined = [] as any;
-    let array2: Array<AbcObject | null | undefined | false | "" | 0> | null | undefined = anything;
-    let list2: _.List<AbcObject | null | undefined | false | "" | 0> | null | undefined = anything;
+{
+    const list: _.List<AbcObject | null | undefined | false | "" | 0> | null | undefined = anything;
 
-    {
-        let result: AbcObject[];
-
-        result = _.compact(array);
-        result = _.compact(list);
-        result = _.compact(array2);
-        result = _.compact(list2);
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<AbcObject>;
-
-        result = _(array).compact();
-        result = _(list).compact();
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<AbcObject>;
-
-        result = _(array).chain().compact();
-        result = _(list).chain().compact();
-    }
+    _.compact(list); // $ExpectType AbcObject[]
+    _(list).compact(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _.chain(list).compact(); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    fp.compact(list); // $ExpectType AbcObject[]
 }
 
 // _.difference
-namespace TestDifference {
-    let array: AbcObject[] | null | undefined = [] as any;
-    let list: _.List<AbcObject> | null | undefined = [] as any;
-    let arrayParam: AbcObject[] = [];
-    let listParam: _.List<AbcObject> = [];
+{
+    const list: _.List<AbcObject> | null | undefined = anything;
+    const arrayParam: AbcObject[] = [];
+    const listParam: _.List<AbcObject> = [];
 
-    {
-        let result: AbcObject[];
+    _.difference(list); // $ExpectType AbcObject[]
+    _.difference(list, listParam); // $ExpectType AbcObject[]
+    _.difference(list, listParam, arrayParam, listParam); // $ExpectType AbcObject[]
 
-        result = _.difference(array);
-        result = _.difference(array, arrayParam);
-        result = _.difference(array, listParam, arrayParam);
-        result = _.difference(array, listParam, listParam, arrayParam);
+    _(list).difference(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).difference(listParam); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).difference(listParam, arrayParam, listParam); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
 
-        result = _.difference(list);
-        result = _.difference(list, listParam);
-        result = _.difference(list, arrayParam, listParam);
-        result = _.difference(list, listParam, arrayParam, listParam);
-    }
+    _.chain(list).difference(); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).difference(listParam); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).difference(listParam, arrayParam, listParam); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
 
-    {
-        let result: _.LoDashImplicitArrayWrapper<AbcObject>;
-
-        result = _(array).difference();
-        result = _(array).difference(arrayParam);
-        result = _(array).difference(listParam, arrayParam);
-        result = _(array).difference(arrayParam, listParam, arrayParam);
-
-        result = _(list).difference();
-        result = _(list).difference(listParam);
-        result = _(list).difference(arrayParam, listParam);
-        result = _(list).difference(listParam, arrayParam, listParam);
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<AbcObject>;
-
-        result = _(array).chain().difference();
-        result = _(array).chain().difference(arrayParam);
-        result = _(array).chain().difference(listParam, arrayParam);
-        result = _(array).chain().difference(arrayParam, listParam, arrayParam);
-
-        result = _(list).chain().difference();
-        result = _(list).chain().difference(listParam);
-        result = _(list).chain().difference(arrayParam, listParam);
-        result = _(list).chain().difference(listParam, arrayParam, listParam);
-    }
+    fp.difference(list, arrayParam); // $ExpectType AbcObject[]
+    fp.difference(list)(arrayParam); // $ExpectType AbcObject[]
 }
 
 // _.differenceBy
-namespace TestDifferenceBy {
-    let array: AbcObject[] | null | undefined = [] as any;
-    let list: _.List<AbcObject> | null | undefined = [] as any;
-    let arrayParam: AbcObject[] = [];
-    let listParam: _.List<AbcObject> = [];
-    let iteratee: (value: AbcObject) => any = (value: AbcObject) => 1;
+{
+    const list: _.List<AbcObject> | null | undefined = anything;
+    const arrayParam: AbcObject[] = [];
+    const listParam: _.List<AbcObject> = [];
+    const iteratee = (value: AbcObject) => 1;
 
-    {
-        let result: AbcObject[];
+    _.differenceBy(list); // $ExpectType AbcObject[]
+    _.differenceBy(list, listParam); // $ExpectType AbcObject[]
+    _.differenceBy(list, arrayParam, listParam, arrayParam, listParam, arrayParam, listParam); // $ExpectType AbcObject[]
 
-        result = _.differenceBy(array);
-        result = _.differenceBy(array, arrayParam);
-        result = _.differenceBy(array, listParam, arrayParam);
-        result = _.differenceBy(array, arrayParam, listParam, arrayParam);
-        result = _.differenceBy(array, listParam, arrayParam, listParam, arrayParam);
-        result = _.differenceBy(array, arrayParam, listParam, arrayParam, listParam, arrayParam);
-        result = _.differenceBy(array, listParam, arrayParam, listParam, arrayParam, listParam, arrayParam);
+    _.differenceBy(list, listParam, iteratee); // $ExpectType AbcObject[]
+    _.differenceBy(list, listParam, arrayParam, listParam, arrayParam, listParam, iteratee); // $ExpectType AbcObject[]
+    // $ExpectType AbcObject[]
+    _.differenceBy<AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject>(list, arrayParam, listParam, arrayParam, listParam, arrayParam, listParam, iteratee);
 
-        result = _.differenceBy(array, arrayParam, iteratee);
-        result = _.differenceBy(array, listParam, arrayParam, iteratee);
-        result = _.differenceBy(array, arrayParam, listParam, arrayParam, iteratee);
-        result = _.differenceBy(array, listParam, arrayParam, listParam, arrayParam, iteratee);
-        result = _.differenceBy(array, arrayParam, listParam, arrayParam, listParam, arrayParam, iteratee);
-        result = _.differenceBy<AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject>(array, listParam, arrayParam, listParam, arrayParam, listParam, arrayParam, iteratee);
+    _.differenceBy(list, listParam, "a"); // $ExpectType AbcObject[]
+    _.differenceBy(list, listParam, arrayParam, listParam, arrayParam, listParam, "a"); // $ExpectType AbcObject[]
+    // $ExpectType AbcObject[]
+    _.differenceBy<AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject>(list, arrayParam, listParam, arrayParam, listParam, arrayParam, listParam, "a");
 
-        result = _.differenceBy(array, arrayParam, 'a');
-        result = _.differenceBy(array, listParam, arrayParam, 'a');
-        result = _.differenceBy(array, arrayParam, listParam, arrayParam, 'a');
-        result = _.differenceBy(array, listParam, arrayParam, listParam, arrayParam, 'a');
-        result = _.differenceBy(array, arrayParam, listParam, arrayParam, listParam, arrayParam, 'a');
-        result = _.differenceBy<AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject>(array, listParam, arrayParam, listParam, arrayParam, listParam, arrayParam, 'a');
+    _.differenceBy(list, listParam, {a: 1}); // $ExpectType AbcObject[]
+    _.differenceBy(list, listParam, arrayParam, listParam, arrayParam, listParam, {a: 1}); // $ExpectType AbcObject[]
+    // $ExpectType AbcObject[]
+    _.differenceBy<AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject>(list, arrayParam, listParam, arrayParam, listParam, arrayParam, listParam, {a: 1});
 
-        result = _.differenceBy(array, arrayParam, {a: 1});
-        result = _.differenceBy(array, listParam, arrayParam, {a: 1});
-        result = _.differenceBy(array, arrayParam, listParam, arrayParam, {a: 1});
-        result = _.differenceBy(array, listParam, arrayParam, listParam, arrayParam, {a: 1});
-        result = _.differenceBy(array, arrayParam, listParam, arrayParam, listParam, arrayParam, {a: 1});
-        result = _.differenceBy<AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject>(array, listParam, arrayParam, listParam, arrayParam, listParam, arrayParam, {a: 1});
+    _(list).differenceBy(listParam); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).differenceBy(arrayParam, listParam, arrayParam, listParam, arrayParam, listParam); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
 
-        result = _.differenceBy(list);
-        result = _.differenceBy(list, listParam);
-        result = _.differenceBy(list, arrayParam, listParam);
-        result = _.differenceBy(list, listParam, arrayParam, listParam);
-        result = _.differenceBy(list, arrayParam, listParam, arrayParam, listParam);
-        result = _.differenceBy(list, listParam, arrayParam, listParam, arrayParam, listParam);
-        result = _.differenceBy(list, arrayParam, listParam, arrayParam, listParam, arrayParam, listParam);
+    _(list).differenceBy(listParam, iteratee); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).differenceBy(listParam, arrayParam, listParam, arrayParam, listParam, iteratee); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).differenceBy<AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject>(arrayParam, listParam, arrayParam, listParam, arrayParam, listParam, iteratee);
 
-        result = _.differenceBy(list, listParam, iteratee);
-        result = _.differenceBy(list, arrayParam, listParam, iteratee);
-        result = _.differenceBy(list, listParam, arrayParam, listParam, iteratee);
-        result = _.differenceBy(list, arrayParam, listParam, arrayParam, listParam, iteratee);
-        result = _.differenceBy(list, listParam, arrayParam, listParam, arrayParam, listParam, iteratee);
-        result = _.differenceBy<AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject>(list, arrayParam, listParam, arrayParam, listParam, arrayParam, listParam, iteratee);
+    _(list).differenceBy(listParam, "a"); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).differenceBy(listParam, arrayParam, listParam, arrayParam, listParam, "a"); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).differenceBy<AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject>(arrayParam, listParam, arrayParam, listParam, arrayParam, listParam, "a");
 
-        result = _.differenceBy(list, listParam, 'a');
-        result = _.differenceBy(list, arrayParam, listParam, 'a');
-        result = _.differenceBy(list, listParam, arrayParam, listParam, 'a');
-        result = _.differenceBy(list, arrayParam, listParam, arrayParam, listParam, 'a');
-        result = _.differenceBy(list, listParam, arrayParam, listParam, arrayParam, listParam, 'a');
-        result = _.differenceBy<AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject>(list, arrayParam, listParam, arrayParam, listParam, arrayParam, listParam, 'a');
+    _(list).differenceBy(listParam, {a: 1}); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).differenceBy(listParam, arrayParam, listParam, arrayParam, listParam, {a: 1}); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).differenceBy<AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject>(arrayParam, listParam, arrayParam, listParam, arrayParam, listParam, {a: 1});
 
-        result = _.differenceBy(list, listParam, {a: 1});
-        result = _.differenceBy(list, arrayParam, listParam, {a: 1});
-        result = _.differenceBy(list, listParam, arrayParam, listParam, {a: 1});
-        result = _.differenceBy(list, arrayParam, listParam, arrayParam, listParam, {a: 1});
-        result = _.differenceBy(list, listParam, arrayParam, listParam, arrayParam, listParam, {a: 1});
-        result = _.differenceBy<AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject>(list, arrayParam, listParam, arrayParam, listParam, arrayParam, listParam, {a: 1});
-    }
+    _.chain(list).differenceBy(arrayParam); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).differenceBy(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
 
-    {
-        let result: _.LoDashImplicitWrapper<AbcObject[]>;
+    _.chain(list).differenceBy(arrayParam, iteratee); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).differenceBy(arrayParam, listParam, arrayParam, listParam, arrayParam, iteratee); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).differenceBy<AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject>(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam, iteratee);
 
-        result = _(array).differenceBy(arrayParam);
-        result = _(array).differenceBy(listParam, arrayParam);
-        result = _(array).differenceBy(arrayParam, listParam, arrayParam);
-        result = _(array).differenceBy(listParam, arrayParam, listParam, arrayParam);
-        result = _(array).differenceBy(arrayParam, listParam, arrayParam, listParam, arrayParam);
-        result = _(array).differenceBy(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam);
+    _.chain(list).differenceBy(arrayParam, "a"); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).differenceBy(arrayParam, listParam, arrayParam, listParam, arrayParam, "a"); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).differenceBy<AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject>(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam, "a");
 
-        result = _(array).differenceBy(arrayParam, iteratee);
-        result = _(array).differenceBy(listParam, arrayParam, iteratee);
-        result = _(array).differenceBy(arrayParam, listParam, arrayParam, iteratee);
-        result = _(array).differenceBy(listParam, arrayParam, listParam, arrayParam, iteratee);
-        result = _(array).differenceBy(arrayParam, listParam, arrayParam, listParam, arrayParam, iteratee);
-        result = _(array).differenceBy<AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject>(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam, iteratee);
+    _.chain(list).differenceBy(arrayParam, {a: 1}); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).differenceBy(arrayParam, listParam, arrayParam, listParam, arrayParam, {a: 1}); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).differenceBy<AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject>(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam, {a: 1});
 
-        result = _(array).differenceBy(arrayParam, 'a');
-        result = _(array).differenceBy(listParam, arrayParam, 'a');
-        result = _(array).differenceBy(arrayParam, listParam, arrayParam, 'a');
-        result = _(array).differenceBy(listParam, arrayParam, listParam, arrayParam, 'a');
-        result = _(array).differenceBy(arrayParam, listParam, arrayParam, listParam, arrayParam, 'a');
-        result = _(array).differenceBy<AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject>(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam, 'a');
-
-        result = _(array).differenceBy(arrayParam, {a: 1});
-        result = _(array).differenceBy(listParam, arrayParam, {a: 1});
-        result = _(array).differenceBy(arrayParam, listParam, arrayParam, {a: 1});
-        result = _(array).differenceBy(listParam, arrayParam, listParam, arrayParam, {a: 1});
-        result = _(array).differenceBy(arrayParam, listParam, arrayParam, listParam, arrayParam, {a: 1});
-        result = _(array).differenceBy<AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject>(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam, {a: 1});
-
-        result = _(list).differenceBy(listParam);
-        result = _(list).differenceBy(arrayParam, listParam);
-        result = _(list).differenceBy(listParam, arrayParam, listParam);
-        result = _(list).differenceBy(arrayParam, listParam, arrayParam, listParam);
-        result = _(list).differenceBy(listParam, arrayParam, listParam, arrayParam, listParam);
-        result = _(list).differenceBy(arrayParam, listParam, arrayParam, listParam, arrayParam, listParam);
-
-        result = _(list).differenceBy(listParam, iteratee);
-        result = _(list).differenceBy(arrayParam, listParam, iteratee);
-        result = _(list).differenceBy(listParam, arrayParam, listParam, iteratee);
-        result = _(list).differenceBy(arrayParam, listParam, arrayParam, listParam, iteratee);
-        result = _(list).differenceBy(listParam, arrayParam, listParam, arrayParam, listParam, iteratee);
-        result = _(list).differenceBy<AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject>(arrayParam, listParam, arrayParam, listParam, arrayParam, listParam, iteratee);
-
-        result = _(list).differenceBy(listParam, 'a');
-        result = _(list).differenceBy(arrayParam, listParam, 'a');
-        result = _(list).differenceBy(listParam, arrayParam, listParam, 'a');
-        result = _(list).differenceBy(arrayParam, listParam, arrayParam, listParam, 'a');
-        result = _(list).differenceBy(listParam, arrayParam, listParam, arrayParam, listParam, 'a');
-        result = _(list).differenceBy<AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject>(arrayParam, listParam, arrayParam, listParam, arrayParam, listParam, 'a');
-
-        result = _(list).differenceBy(listParam, {a: 1});
-        result = _(list).differenceBy(arrayParam, listParam, {a: 1});
-        result = _(list).differenceBy(listParam, arrayParam, listParam, {a: 1});
-        result = _(list).differenceBy(arrayParam, listParam, arrayParam, listParam, {a: 1});
-        result = _(list).differenceBy(listParam, arrayParam, listParam, arrayParam, listParam, {a: 1});
-        result = _(list).differenceBy<AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject>(arrayParam, listParam, arrayParam, listParam, arrayParam, listParam, {a: 1});
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<AbcObject[]>;
-
-        result = _(array).chain().differenceBy(arrayParam);
-        result = _(array).chain().differenceBy(listParam, arrayParam);
-        result = _(array).chain().differenceBy(arrayParam, listParam, arrayParam);
-        result = _(array).chain().differenceBy(listParam, arrayParam, listParam, arrayParam);
-        result = _(array).chain().differenceBy(arrayParam, listParam, arrayParam, listParam, arrayParam);
-        result = _(array).chain().differenceBy(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam);
-
-        result = _(array).chain().differenceBy(arrayParam, iteratee);
-        result = _(array).chain().differenceBy(listParam, arrayParam, iteratee);
-        result = _(array).chain().differenceBy(arrayParam, listParam, arrayParam, iteratee);
-        result = _(array).chain().differenceBy(listParam, arrayParam, listParam, arrayParam, iteratee);
-        result = _(array).chain().differenceBy(arrayParam, listParam, arrayParam, listParam, arrayParam, iteratee);
-        result = _(array).chain().differenceBy<AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject>(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam, iteratee);
-
-        result = _(array).chain().differenceBy(arrayParam, 'a');
-        result = _(array).chain().differenceBy(listParam, arrayParam, 'a');
-        result = _(array).chain().differenceBy(arrayParam, listParam, arrayParam, 'a');
-        result = _(array).chain().differenceBy(listParam, arrayParam, listParam, arrayParam, 'a');
-        result = _(array).chain().differenceBy(arrayParam, listParam, arrayParam, listParam, arrayParam, 'a');
-        result = _(array).chain().differenceBy<AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject>(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam, 'a');
-
-        result = _(array).chain().differenceBy(arrayParam, {a: 1});
-        result = _(array).chain().differenceBy(listParam, arrayParam, {a: 1});
-        result = _(array).chain().differenceBy(arrayParam, listParam, arrayParam, {a: 1});
-        result = _(array).chain().differenceBy(listParam, arrayParam, listParam, arrayParam, {a: 1});
-        result = _(array).chain().differenceBy(arrayParam, listParam, arrayParam, listParam, arrayParam, {a: 1});
-        result = _(array).chain().differenceBy<AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject>(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam, {a: 1});
-
-        result = _(list).chain().differenceBy(listParam);
-        result = _(list).chain().differenceBy(arrayParam, listParam);
-        result = _(list).chain().differenceBy(listParam, arrayParam, listParam);
-        result = _(list).chain().differenceBy(arrayParam, listParam, arrayParam, listParam);
-        result = _(list).chain().differenceBy(listParam, arrayParam, listParam, arrayParam, listParam);
-        result = _(list).chain().differenceBy(arrayParam, listParam, arrayParam, listParam, arrayParam, listParam);
-
-        result = _(list).chain().differenceBy(listParam, iteratee);
-        result = _(list).chain().differenceBy(arrayParam, listParam, iteratee);
-        result = _(list).chain().differenceBy(listParam, arrayParam, listParam, iteratee);
-        result = _(list).chain().differenceBy(arrayParam, listParam, arrayParam, listParam, iteratee);
-        result = _(list).chain().differenceBy(listParam, arrayParam, listParam, arrayParam, listParam, iteratee);
-        result = _(list).chain().differenceBy<AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject>(arrayParam, listParam, arrayParam, listParam, arrayParam, listParam, iteratee);
-
-        result = _(list).chain().differenceBy(listParam, 'a');
-        result = _(list).chain().differenceBy(arrayParam, listParam, 'a');
-        result = _(list).chain().differenceBy(listParam, arrayParam, listParam, 'a');
-        result = _(list).chain().differenceBy(arrayParam, listParam, arrayParam, listParam, 'a');
-        result = _(list).chain().differenceBy(listParam, arrayParam, listParam, arrayParam, listParam, 'a');
-        result = _(list).chain().differenceBy<AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject>(arrayParam, listParam, arrayParam, listParam, arrayParam, listParam, 'a');
-
-        result = _(list).chain().differenceBy(listParam, {a: 1});
-        result = _(list).chain().differenceBy(arrayParam, listParam, {a: 1});
-        result = _(list).chain().differenceBy(listParam, arrayParam, listParam, {a: 1});
-        result = _(list).chain().differenceBy(arrayParam, listParam, arrayParam, listParam, {a: 1});
-        result = _(list).chain().differenceBy(listParam, arrayParam, listParam, arrayParam, listParam, {a: 1});
-        result = _(list).chain().differenceBy<AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject, AbcObject>(arrayParam, listParam, arrayParam, listParam, arrayParam, listParam, {a: 1});
-    }
+    fp.differenceBy(iteratee, list, arrayParam); // $ExpectType AbcObject[]
+    fp.differenceBy<AbcObject, AbcObject>(iteratee)(list)(listParam); // $ExpectType AbcObject[]
+    fp.differenceBy("a", list, arrayParam); // $ExpectType AbcObject[]
+    fp.differenceBy({a: 1}, list, arrayParam); // $ExpectType AbcObject[]
 
     {
         interface T1 {
@@ -427,13 +161,13 @@ namespace TestDifferenceBy {
             b: any[];
         }
 
-        const t1: T1 = { a: 'a', b: 'b' };
-        const t2: T2 = { a: 'a', b: 30 };
-        const t3: T3 = { a: 'a', b: true };
-        const t4: T4 = { a: 'a', b: [] };
+        const t1: T1 = { a: "a", b: "b" };
+        const t2: T2 = { a: "a", b: 30 };
+        const t3: T3 = { a: "a", b: true };
+        const t4: T4 = { a: "a", b: [] };
 
         // $ExpectType T1[]
-        _.differenceBy([t1], [t2], 'name');
+        _.differenceBy([t1], [t2], "name");
         // $ExpectType T1[]
         _.differenceBy([t1], [t2], (value) => {
             value; // $ExpectType T1 | T2
@@ -460,18 +194,18 @@ namespace TestDifferenceBy {
             return 0;
         });
         // $ExpectType T1[]
-        _.differenceBy([t1], [t2], [t3], [t4], [''], (value) => {
+        _.differenceBy([t1], [t2], [t3], [t4], [""], (value) => {
             value; // $ExpectType string | T1 | T2 | T3 | T4
             return 0;
         });
         // $ExpectType T1[]
-        _.differenceBy([t1], [t2], [t3], [t4], [''], [42], (value) => {
+        _.differenceBy([t1], [t2], [t3], [t4], [""], [42], (value) => {
             value; // $ExpectType string | number | T1 | T2 | T3 | T4
             return 0;
         });
 
         // $ExpectType LoDashImplicitWrapper<T1[]>
-        _([t1]).differenceBy([t2], 'name');
+        _([t1]).differenceBy([t2], "name");
         // $ExpectType LoDashImplicitWrapper<T1[]>
         _([t1]).differenceBy([t2], (value) => {
             value; // $ExpectType T1 | T2
@@ -498,18 +232,18 @@ namespace TestDifferenceBy {
             return 0;
         });
         // $ExpectType LoDashImplicitWrapper<T1[]>
-        _([t1]).differenceBy([t2], [t3], [t4], [''], (value) => {
+        _([t1]).differenceBy([t2], [t3], [t4], [""], (value) => {
             value; // $ExpectType string | T1 | T2 | T3 | T4
             return 0;
         });
         // $ExpectType LoDashImplicitWrapper<T1[]>
-        _([t1]).differenceBy([t2], [t3], [t4], [''], [42], (value) => {
+        _([t1]).differenceBy([t2], [t3], [t4], [""], [42], (value) => {
             value; // $ExpectType string | number | T1 | T2 | T3 | T4
             return 0;
         });
 
         // $ExpectType LoDashExplicitWrapper<T1[]>
-        _.chain([t1]).differenceBy([t2], 'name');
+        _.chain([t1]).differenceBy([t2], "name");
         // $ExpectType LoDashExplicitWrapper<T1[]>
         _.chain([t1]).differenceBy([t2], (value) => {
             value; // $ExpectType T1 | T2
@@ -536,79 +270,49 @@ namespace TestDifferenceBy {
             return 0;
         });
         // $ExpectType LoDashExplicitWrapper<T1[]>
-        _.chain([t1]).differenceBy([t2], [t3], [t4], [''], (value) => {
+        _.chain([t1]).differenceBy([t2], [t3], [t4], [""], (value) => {
             value; // $ExpectType string | T1 | T2 | T3 | T4
             return 0;
         });
         // $ExpectType LoDashExplicitWrapper<T1[]>
-        _.chain([t1]).differenceBy([t2], [t3], [t4], [''], [42], (value) => {
+        _.chain([t1]).differenceBy([t2], [t3], [t4], [""], [42], (value) => {
             value; // $ExpectType string | number | T1 | T2 | T3 | T4
             return 0;
         });
+
+        fp.differenceBy("name", [t1], [t2]); // $ExpectType T1[]
+        fp.differenceBy((value: T1 | T2) => 0, [t1], [t2]); // $ExpectType T1[]
+        fp.differenceBy((value: T1 | T2 | T3) => 0, [t1], [t2, t3]); // $ExpectType T1[]
     }
 }
 
 // _.differenceWith
 {
-    let array: AbcObject[] | null | undefined = [] as any;
-    let list: _.List<AbcObject> | null | undefined = [] as any;
-    let arrayParam: AbcObject[] = [];
-    let listParam: _.List<AbcObject> = [];
-    let comparator = (a: AbcObject, b: AbcObject) => true;
+    const list: _.List<AbcObject> | null | undefined = [] as any;
+    const arrayParam: AbcObject[] = [];
+    const listParam: _.List<AbcObject> = [];
+    const comparator = (a: AbcObject, b: AbcObject) => true;
 
-    {
-        // $ExpectType AbcObject[]
-        _.differenceWith(array);
-        // $ExpectType AbcObject[]
-        _.differenceWith(array, arrayParam);
-        // $ExpectType AbcObject[]
-        _.differenceWith(array, listParam, arrayParam);
-        // $ExpectType AbcObject[]
-        _.differenceWith(array, listParam, arrayParam, listParam, arrayParam, listParam, arrayParam);
+    _.differenceWith(list); // $ExpectType AbcObject[]
+    _.differenceWith(list, arrayParam); // $ExpectType AbcObject[]
+    _.differenceWith(list, listParam, arrayParam, listParam, arrayParam, listParam, arrayParam); // $ExpectType AbcObject[]
+    _.differenceWith(list, arrayParam, comparator); // $ExpectType AbcObject[]
+    _.differenceWith(list, listParam, arrayParam, listParam, arrayParam, listParam, arrayParam, comparator); // $ExpectType AbcObject[]
 
-        // $ExpectType AbcObject[]
-        _.differenceWith(array, arrayParam, comparator);
-        // $ExpectType AbcObject[]
-        _.differenceWith(array, listParam, arrayParam, comparator);
-        // $ExpectType AbcObject[]
-        _.differenceWith(array, listParam, arrayParam, listParam, arrayParam, listParam, arrayParam, comparator);
-    }
+    _(list).differenceWith(arrayParam); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).differenceWith(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).differenceWith(arrayParam, comparator); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).differenceWith(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam, comparator); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
 
-    {
-        // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-        _(array).differenceWith(arrayParam);
-        // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-        _(array).differenceWith(listParam, arrayParam);
-        // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-        _(array).differenceWith(arrayParam, listParam, arrayParam);
-        // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-        _(array).differenceWith(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam);
+    _.chain(list).differenceWith(arrayParam); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).differenceWith(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).differenceWith(arrayParam, comparator); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).differenceWith(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam, comparator); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
 
-        // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-        _(array).differenceWith(arrayParam, comparator);
-        // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-        _(array).differenceWith(listParam, arrayParam, comparator);
-        // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-        _(array).differenceWith(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam, comparator);
-    }
-
-    {
-        // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-        _.chain(array).differenceWith(arrayParam);
-        // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-        _.chain(array).differenceWith(listParam, arrayParam);
-        // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-        _.chain(array).differenceWith(arrayParam, listParam, arrayParam);
-        // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-        _.chain(array).differenceWith(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam);
-
-        // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-        _.chain(array).differenceWith(arrayParam, comparator);
-        // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-        _.chain(array).differenceWith(listParam, arrayParam, comparator);
-        // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-        _.chain(array).differenceWith(listParam, arrayParam, listParam, arrayParam, listParam, arrayParam, comparator);
-    }
+    fp.differenceWith(comparator, list, arrayParam); // $ExpectType AbcObject[]
+    fp.differenceWith(comparator)(list)(arrayParam); // $ExpectType AbcObject[]
+    fp.differenceWith(comparator)(list, arrayParam); // $ExpectType AbcObject[]
+    fp.differenceWith(comparator, list)(arrayParam); // $ExpectType AbcObject[]
 
     {
         interface T1 {
@@ -620,7 +324,7 @@ namespace TestDifferenceBy {
             b: number;
         }
 
-        const t1: T1 = { a: 'a', b: 'b' };
+        const t1: T1 = { a: "a", b: "b" };
         const t2: T2 | undefined = anything;
 
         // $ExpectType T1[]
@@ -643,824 +347,371 @@ namespace TestDifferenceBy {
             b; // $ExpectType T2 | undefined
             return true;
         });
+
+        fp.differenceWith((a: T1, b: T2 | undefined) => true, [t1], [t2]); // $ExpectType T1[]
     }
 }
 
 // _.drop
-{
-    let array: AbcObject[] | null | undefined = [] as any;
-    let list: _.List<AbcObject> | null | undefined = [] as any;
-
-    {
-        let result: AbcObject[];
-        result = _.drop(array);
-        result = _.drop(array, 42);
-
-        result = _.drop(list);
-        result = _.drop(list, 42);
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<AbcObject>;
-
-        result = _(array).drop();
-        result = _(array).drop(42);
-
-        result = _(list).drop();
-        result = _(list).drop(42);
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<AbcObject>;
-
-        result = _(array).chain().drop();
-        result = _(array).chain().drop(42);
-
-        result = _(list).chain().drop();
-        result = _(list).chain().drop(42);
-    }
-}
-
 // _.dropRight
-namespace TestDropRight {
-    let array: AbcObject[] | null | undefined = [] as any;
-    let list: _.List<AbcObject> | null | undefined = [] as any;
+{
+    const list: _.List<AbcObject> | null | undefined = anything;
 
-    {
-        let result: AbcObject[];
+    _.drop(list); // $ExpectType AbcObject[]
+    _.drop(list, 42); // $ExpectType AbcObject[]
+    _(list).drop(42); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _.chain(list).drop(42); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
 
-        result = _.dropRight(array);
-        result = _.dropRight(array, 42);
+    fp.drop(42, list); // $ExpectType AbcObject[]
+    fp.drop(42)(list); // $ExpectType AbcObject[]
 
-        result = _.dropRight(list);
-        result = _.dropRight(list, 42);
-    }
+    _.dropRight(list); // $ExpectType AbcObject[]
+    _.dropRight(list, 42); // $ExpectType AbcObject[]
+    _(list).dropRight(42); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _.chain(list).dropRight(42); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
 
-    {
-        let result: _.LoDashImplicitArrayWrapper<AbcObject>;
-
-        result = _(array).dropRight();
-        result = _(array).dropRight(42);
-
-        result = _(list).dropRight();
-        result = _(list).dropRight(42);
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<AbcObject>;
-
-        result = _(array).chain().dropRight();
-        result = _(array).chain().dropRight(42);
-
-        result = _(list).chain().dropRight();
-        result = _(list).chain().dropRight(42);
-    }
-}
-
-// _.dropRightWhile
-namespace TestDropRightWhile {
-    let array: AbcObject[] | null | undefined = [] as any;
-    let list: _.List<AbcObject> | null | undefined = [] as any;
-    let predicateFn = (value: AbcObject, index: number, collection: _.List<AbcObject>) => true;
-
-    {
-        let result: AbcObject[];
-
-        result = _.dropRightWhile(array);
-        result = _.dropRightWhile(array, predicateFn);
-        result = _.dropRightWhile(array, '');
-        result = _.dropRightWhile(array, {a: 42});
-
-        result = _.dropRightWhile(list);
-        result = _.dropRightWhile(list, predicateFn);
-        result = _.dropRightWhile(list, '');
-        result = _.dropRightWhile(list, {a: 42});
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<AbcObject>;
-
-        result = _(array).dropRightWhile();
-        result = _(array).dropRightWhile(predicateFn);
-        result = _(array).dropRightWhile('');
-        result = _(array).dropRightWhile({a: 42});
-
-        result = _(list).dropRightWhile();
-        result = _(list).dropRightWhile(predicateFn);
-        result = _(list).dropRightWhile('');
-        result = _(list).dropRightWhile({a: 42});
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<AbcObject>;
-
-        result = _(array).chain().dropRightWhile();
-        result = _(array).chain().dropRightWhile(predicateFn);
-        result = _(array).chain().dropRightWhile('');
-        result = _(array).chain().dropRightWhile({a: 42});
-
-        result = _(list).chain().dropRightWhile();
-        result = _(list).chain().dropRightWhile(predicateFn);
-        result = _(list).chain().dropRightWhile('');
-        result = _(list).chain().dropRightWhile({a: 42});
-    }
+    fp.dropRight(42, list); // $ExpectType AbcObject[]
+    fp.dropRight(42)(list); // $ExpectType AbcObject[]
 }
 
 // _.dropWhile
-namespace TestDropWhile {
-    let array: AbcObject[] | null | undefined = [] as any;
-    let list: _.List<AbcObject> | null | undefined = [] as any;
-    let predicateFn = (value: AbcObject, index: number, collection: _.List<AbcObject>) => true;
+// _.dropRightWhile
+{
+    const list: _.List<AbcObject> | null | undefined = anything;
+    const predicateFn = (value: AbcObject, index: number, collection: _.List<AbcObject>) => true;
+    const predicateFn2 = (value: AbcObject) => true;
 
-    {
-        let result: AbcObject[];
+    _.dropWhile(list); // $ExpectType AbcObject[]
+    _.dropWhile(list, predicateFn); // $ExpectType AbcObject[]
+    _.dropWhile(list, ""); // $ExpectType AbcObject[]
+    _.dropWhile(list, {a: 42}); // $ExpectType AbcObject[]
 
-        result = _.dropWhile(array);
-        result = _.dropWhile(array, predicateFn);
-        result = _.dropWhile(array, '');
-        result = _.dropWhile(array, {a: 42});
+    _(list).dropWhile(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).dropWhile(predicateFn); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).dropWhile(""); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).dropWhile({a: 42}); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
 
-        result = _.dropWhile(list);
-        result = _.dropWhile(list, predicateFn);
-        result = _.dropWhile(list, '');
-        result = _.dropWhile(list, {a: 42});
-    }
+    _.chain(list).dropWhile(); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).dropWhile(predicateFn); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).dropWhile(""); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).dropWhile({a: 42}); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
 
-    {
-        let result: _.LoDashImplicitArrayWrapper<AbcObject>;
+    fp.dropWhile(predicateFn2, list); // $ExpectType AbcObject[]
+    fp.dropWhile(predicateFn2)(list); // $ExpectType AbcObject[]
+    fp.dropWhile("", list); // $ExpectType AbcObject[]
+    fp.dropWhile({ a: 42 }, list); // $ExpectType AbcObject[]
 
-        result = _(array).dropWhile();
-        result = _(array).dropWhile(predicateFn);
-        result = _(array).dropWhile('');
-        result = _(array).dropWhile({a: 42});
+    _.dropRightWhile(list); // $ExpectType AbcObject[]
+    _.dropRightWhile(list, predicateFn); // $ExpectType AbcObject[]
+    _.dropRightWhile(list, ""); // $ExpectType AbcObject[]
+    _.dropRightWhile(list, {a: 42}); // $ExpectType AbcObject[]
 
-        result = _(list).dropWhile();
-        result = _(list).dropWhile(predicateFn);
-        result = _(list).dropWhile('');
-        result = _(list).dropWhile({a: 42});
-    }
+    _(list).dropRightWhile(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).dropRightWhile(predicateFn); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).dropRightWhile(""); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).dropRightWhile({a: 42}); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
 
-    {
-        let result: _.LoDashExplicitArrayWrapper<AbcObject>;
+    _.chain(list).dropRightWhile(); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).dropRightWhile(predicateFn); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).dropRightWhile(""); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).dropRightWhile({a: 42}); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
 
-        result = _(array).chain().dropWhile();
-        result = _(array).chain().dropWhile(predicateFn);
-        result = _(array).chain().dropWhile('');
-        result = _(array).chain().dropWhile({a: 42});
-
-        result = _(list).chain().dropWhile();
-        result = _(list).chain().dropWhile(predicateFn);
-        result = _(list).chain().dropWhile('');
-        result = _(list).chain().dropWhile({a: 42});
-    }
+    fp.dropRightWhile(predicateFn2, list); // $ExpectType AbcObject[]
+    fp.dropRightWhile(predicateFn2)(list); // $ExpectType AbcObject[]
+    fp.dropRightWhile("", list); // $ExpectType AbcObject[]
+    fp.dropRightWhile({ a: 42 }, list); // $ExpectType AbcObject[]
 }
 
 // _.fill
-namespace TestFill {
-    let array: number[] | null | undefined = [] as any;
-    let list: _.List<number> | null | undefined = [] as any;
+{
+    const array: number[] | null | undefined = anything;
+    const list: _.List<number> | null | undefined = anything;
 
-    {
-        let result: number[];
+    _.fill(array, 42); // $ExpectType number[]
+    _.fill(array, 42, 0); // $ExpectType number[]
+    _.fill(array, 42, 0, 10); // $ExpectType number[]
 
-        result = _.fill<number>(array, 42);
-        result = _.fill(array, 42, 0);
-        result = _.fill(array, 42, 0, 10);
-    }
+    _.fill(list, 42); // $ExpectType ArrayLike<number>
+    _.fill(list, 42, 0); // $ExpectType ArrayLike<number>
+    _.fill(list, 42, 0, 10); // $ExpectType ArrayLike<number>
 
-    {
-        let result: _.List<number>;
+    _(list).fill(42); // $ExpectType LoDashImplicitWrapper<ArrayLike<number>>
+    _(list).fill(42, 0); // $ExpectType LoDashImplicitWrapper<ArrayLike<number>>
+    _(list).fill(42, 0, 10); // $ExpectType LoDashImplicitWrapper<ArrayLike<number>>
 
-        result = _.fill<number>(list, 42);
-        result = _.fill(list, 42, 0);
-        result = _.fill(list, 42, 0, 10);
-    }
+    _.chain(list).fill(42); // $ExpectType LoDashExplicitWrapper<ArrayLike<number>>
+    _.chain(list).fill(42, 0); // $ExpectType LoDashExplicitWrapper<ArrayLike<number>>
+    _.chain(list).fill(42, 0, 10); // $ExpectType LoDashExplicitWrapper<ArrayLike<number>>
 
-    {
-        let result: _.LoDashImplicitArrayWrapper<number>;
-
-        result = _(array).fill<number>(42);
-        result = _(array).fill(42, 0);
-        result = _(array).fill(42, 0, 10);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<_.List<number>>;
-
-        result = _(list).fill<number>(42);
-        result = _(list).fill(42, 0);
-        result = _(list).fill(42, 0, 10);
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<number>;
-
-        result = _(array).chain().fill<number>(42);
-        result = _(array).chain().fill(42, 0);
-        result = _(array).chain().fill(42, 0, 10);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<_.List<number>>;
-
-        result = _(list).chain().fill<number>(42);
-        result = _(list).chain().fill(42, 0);
-        result = _(list).chain().fill(42, 0, 10);
-    }
+    fp.fill(0, 10, 42, array); // $ExpectType number[]
+    fp.fill(0)(10)(42)(array); // $ExpectType number[]
+    fp.fill(0, 10, 42, list); // $ExpectType ArrayLike<number>
 }
 
 // _.findIndex
-namespace TestFindIndex {
-    let array: AbcObject[] | null | undefined = [] as any;
-    let list: _.List<AbcObject> | null | undefined = [] as any;
-    let predicateFn = (value: AbcObject, index: number, collection: _.List<AbcObject>) => true;
-    let fromIndex = 0;
-
-    {
-        let result: number;
-
-        result = _.findIndex(array);
-        result = _.findIndex(array, predicateFn);
-        result = _.findIndex(array, '');
-        result = _.findIndex(array, {a: 42});
-        result = _.findIndex(array, predicateFn, fromIndex);
-
-        result = _.findIndex(list);
-        result = _.findIndex(list, predicateFn);
-        result = _.findIndex(list, '');
-        result = _.findIndex(list, {a: 42});
-        result = _.findIndex(list, predicateFn, fromIndex);
-        result = _.findIndex([{ b: 5 }], ['b', 5]);
-
-        result = _(array).findIndex();
-        result = _(array).findIndex(predicateFn);
-        result = _(array).findIndex('');
-        result = _(array).findIndex<{a: number}>({a: 42});
-        result = _(array).findIndex(predicateFn, fromIndex);
-
-        result = _(list).findIndex();
-        result = _(list).findIndex(predicateFn);
-        result = _(list).findIndex('');
-        result = _(list).findIndex<{a: number}>({a: 42});
-        result = _(list).findIndex(predicateFn, fromIndex);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<number>;
-
-        result = _(array).chain().findIndex();
-        result = _(array).chain().findIndex(predicateFn);
-        result = _(array).chain().findIndex('');
-        result = _(array).chain().findIndex<{a: number}>({a: 42});
-        result = _(array).chain().findIndex(predicateFn, fromIndex);
-
-        result = _(list).chain().findIndex();
-        result = _(list).chain().findIndex(predicateFn);
-        result = _(list).chain().findIndex('');
-        result = _(list).chain().findIndex<{a: number}>({a: 42});
-        result = _(list).chain().findIndex(predicateFn, fromIndex);
-    }
-}
-
 // _.findLastIndex
-namespace TestFindLastIndex {
-    let array: AbcObject[] | null | undefined = [] as any;
-    let list: _.List<AbcObject> | null | undefined = [] as any;
+{
+    const list: _.List<AbcObject> | null | undefined = anything;
+    const predicateFn = (value: AbcObject, index: number, collection: _.List<AbcObject>) => true;
+    const predicateFn2 = (value: AbcObject) => true;
 
-    let predicateFn = (value: AbcObject, index: number, collection: _.List<AbcObject>) => true;
-    let fromIndex = 0;
+    _.findIndex(list); // $ExpectType number
+    _.findIndex(list, predicateFn); // $ExpectType number
+    _.findIndex(list, ""); // $ExpectType number
+    _.findIndex(list, {a: 42}); // $ExpectType number
+    _.findIndex(list, predicateFn, 1); // $ExpectType number
 
-    {
-        let result: number;
+    _(list).findIndex(); // $ExpectType number
+    _(list).findIndex(predicateFn); // $ExpectType number
+    _(list).findIndex(""); // $ExpectType number
+    _(list).findIndex<{a: number}>({a: 42}); // $ExpectType number
+    _(list).findIndex(predicateFn, 1); // $ExpectType number
 
-        result = _.findLastIndex(array);
-        result = _.findLastIndex(array, predicateFn);
-        result = _.findLastIndex(array, '');
-        result = _.findLastIndex(array, {a: 42});
-        result = _.findLastIndex(array, predicateFn, fromIndex);
+    _.chain(list).findIndex(); // $ExpectType LoDashExplicitWrapper<number>
+    _.chain(list).findIndex(predicateFn); // $ExpectType LoDashExplicitWrapper<number>
+    _.chain(list).findIndex(""); // $ExpectType LoDashExplicitWrapper<number>
+    _.chain(list).findIndex<{a: number}>({a: 42}); // $ExpectType LoDashExplicitWrapper<number>
+    _.chain(list).findIndex(predicateFn, 1); // $ExpectType LoDashExplicitWrapper<number>
 
-        result = _.findLastIndex(list);
-        result = _.findLastIndex(list, predicateFn);
-        result = _.findLastIndex(list, '');
-        result = _.findLastIndex(list, {a: 42});
-        result = _.findLastIndex(list, predicateFn, fromIndex);
-        result = _.findLastIndex([{ b: 5 }], ['b', 5]);
+    fp.findIndex(predicateFn2, list); // $ExpectType number
+    fp.findIndex(predicateFn2)(list); // $ExpectType number
+    fp.findIndex("", list); // $ExpectType number
+    fp.findIndex({ a: 42 }, list); // $ExpectType number
 
-        result = _(array).findLastIndex();
-        result = _(array).findLastIndex(predicateFn);
-        result = _(array).findLastIndex('');
-        result = _(array).findLastIndex<{a: number}>({a: 42});
-        result = _(array).findLastIndex(predicateFn, fromIndex);
+    fp.findIndexFrom(predicateFn2, 1, list); // $ExpectType number
+    fp.findIndexFrom(predicateFn2)(1)(list); // $ExpectType number
+    fp.findIndexFrom("", 1, list); // $ExpectType number
+    fp.findIndexFrom({ a: 42 }, 1, list); // $ExpectType number
 
-        result = _(list).findLastIndex();
-        result = _(list).findLastIndex(predicateFn);
-        result = _(list).findLastIndex('');
-        result = _(list).findLastIndex<{a: number}>({a: 42});
-        result = _(list).findLastIndex(predicateFn, fromIndex);
-    }
+    _.findLastIndex(list); // $ExpectType number
+    _.findLastIndex(list, predicateFn); // $ExpectType number
+    _.findLastIndex(list, ""); // $ExpectType number
+    _.findLastIndex(list, {a: 42}); // $ExpectType number
+    _.findLastIndex(list, predicateFn, 1); // $ExpectType number
 
-    {
-        let result: _.LoDashExplicitWrapper<number>;
+    _(list).findLastIndex(); // $ExpectType number
+    _(list).findLastIndex(predicateFn); // $ExpectType number
+    _(list).findLastIndex(""); // $ExpectType number
+    _(list).findLastIndex<{a: number}>({a: 42}); // $ExpectType number
+    _(list).findLastIndex(predicateFn, 1); // $ExpectType number
 
-        result = _(array).chain().findLastIndex();
-        result = _(array).chain().findLastIndex(predicateFn);
-        result = _(array).chain().findLastIndex('');
-        result = _(array).chain().findLastIndex<{a: number}>({a: 42});
-        result = _(array).chain().findLastIndex(predicateFn, fromIndex);
+    _.chain(list).findLastIndex(); // $ExpectType LoDashExplicitWrapper<number>
+    _.chain(list).findLastIndex(predicateFn); // $ExpectType LoDashExplicitWrapper<number>
+    _.chain(list).findLastIndex(""); // $ExpectType LoDashExplicitWrapper<number>
+    _.chain(list).findLastIndex<{a: number}>({a: 42}); // $ExpectType LoDashExplicitWrapper<number>
+    _.chain(list).findLastIndex(predicateFn, 1); // $ExpectType LoDashExplicitWrapper<number>
 
-        result = _(list).chain().findLastIndex();
-        result = _(list).chain().findLastIndex(predicateFn);
-        result = _(list).chain().findLastIndex('');
-        result = _(list).chain().findLastIndex<{a: number}>({a: 42});
-        result = _(list).chain().findLastIndex(predicateFn, fromIndex);
-    }
+    fp.findLastIndex(predicateFn2, list); // $ExpectType number
+    fp.findLastIndex(predicateFn2)(list); // $ExpectType number
+    fp.findLastIndex("", list); // $ExpectType number
+    fp.findLastIndex({ a: 42 }, list); // $ExpectType number
+
+    fp.findLastIndexFrom(predicateFn2, 1, list); // $ExpectType number
+    fp.findLastIndexFrom(predicateFn2)(1)(list); // $ExpectType number
+    fp.findLastIndexFrom("", 1, list); // $ExpectType number
+    fp.findLastIndexFrom({ a: 42 }, 1, list); // $ExpectType number
 }
 
 // _.first
-namespace TestFirst {
-    let array: AbcObject[] | null | undefined = [] as any;
-    let list: _.List<AbcObject> | null | undefined = [] as any;
+{
+    const list: _.List<AbcObject> | null | undefined = anything;
 
-    {
-        let result: string | undefined;
+    _.first("abc"); // $ExpectType string | undefined
+    _.first(list); // $ExpectType AbcObject | undefined
 
-        result = _.first('abc');
-        result = _('abc').first();
-    }
+    _("abc").first(); // $ExpectType string | undefined
+    _(list).first(); // $ExpectType AbcObject | undefined
 
-    {
-        let result: AbcObject | undefined;
+    _.chain("abc").first(); // $ExpectType LoDashExplicitWrapper<string | undefined>
+    _.chain(list).first(); // $ExpectType LoDashExplicitWrapper<AbcObject | undefined>
 
-        result = _.first(array);
-        result = _.first(list);
-
-        result = _(array).first();
-        result = _(list).first();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<string | undefined>;
-
-        result = _('abc').chain().first();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<AbcObject | undefined>;
-
-        result = _(array).chain().first();
-        result = _(list).chain().first();
-    }
+    fp.first("abc"); // $ExpectType string | undefined
+    fp.first(list); // $ExpectType AbcObject | undefined
 }
 
 // _.flatten
-namespace TestFlatten {
-    let array: number[][] | null | undefined = [] as any;
-    let list: _.List<number[]> | null | undefined = [] as any;
+{
+    _.flatten("abc"); // $ExpectType string[]
+    _.flatten([1, 2, 3]); // $ExpectType number[]
+    _.flatten([1, [2, 3]]); // $ExpectType number[]
+    _.flatten({0: 1, 1: [2, 3], length: 2}); // $ExpectType number[]
 
-    {
-        let result: string[];
+    _("abc").flatten(); // $ExpectType LoDashImplicitWrapper<string[]>
+    _([1, 2, 3]).flatten(); // $ExpectType LoDashImplicitWrapper<number[]>
+    _([1, [2, 3]]).flatten(); // $ExpectType LoDashImplicitWrapper<number[]>
+    _({0: 1, 1: [2, 3], length: 2}).flatten(); // $ExpectType LoDashImplicitWrapper<number[]>
 
-        result = _.flatten('abc');
-    }
+    _.chain("abc").flatten(); // $ExpectType LoDashExplicitWrapper<string[]>
+    _.chain([1, 2, 3]).flatten(); // $ExpectType LoDashExplicitWrapper<number[]>
+    _.chain([1, [2, 3]]).flatten(); // $ExpectType LoDashExplicitWrapper<number[]>
+    _.chain({0: 1, 1: [2, 3], length: 2}).flatten(); // $ExpectType LoDashExplicitWrapper<number[]>
 
-    {
-        let result: number[];
-
-        result = _.flatten<number>(array);
-        result = _.flatten<number>(list);
-        result = _.flatten<number>([1, 2, 3]);
-        result = _.flatten<number>([1, 2, 3]);
-        result = _.flatten<number>([1, 2, 3]);
-        result = _.flatten<number>([1, [2, 3]]);
-        result = _.flatten<number>([1, [2, [3]]], true);
-        result = _.flatten<number>([1, [2, [3]], [[4]]], true);
-
-        result = _.flatten<number>({0: 1, 1: 2, 2: 3, length: 3});
-        result = _.flatten<number>({0: 1, 1: [2, 3], length: 2});
-        result = _.flatten<number>({0: 1, 1: [2, [3]], length: 2}, true);
-        result = _.flatten<number>({0: 1, 1: [2, [3]], 2: [[4]], length: 3}, true);
-    }
-
-    {
-        let result: _.RecursiveArray<number>;
-
-        result = _.flatten([1, [2, [3]]]);
-        result = _.flatten([1, [2, [3]], [[4]]]);
-
-        result = _.flatten({0: 1, 1: [2, [3]], length: 2});
-        result = _.flatten({0: 1, 1: [2, [3]], 2: [[4]], length: 3});
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<string>;
-
-        result = _('abc').flatten();
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<number>;
-
-        result = _([1, 2, 3]).flatten<number>();
-        result = _([1, [2, 3]]).flatten<number>();
-        result = _([1, [2, [3]]]).flatten<number>(true);
-        result = _([1, [2, [3]], [[4]]]).flatten<number>(true);
-
-        result = _({0: 1, 1: 2, 2: 3, length: 3}).flatten<number>();
-        result = _({0: 1, 1: [2, 3], length: 2}).flatten<number>();
-        result = _({0: 1, 1: [2, [3]], length: 2}).flatten<number>(true);
-        result = _({0: 1, 1: [2, [3]], 2: [[4]], length: 3}).flatten<number>(true);
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<number|number[]>;
-
-        result = _([1, [2, [3]]]).flatten<number|number[]>();
-        result = _([1, [2, [3]], [[4]]]).flatten<number|number[]>();
-
-        result = _({0: 1, 1: [2, [3]], length: 2}).flatten<number|number[]>();
-        result = _({0: 1, 1: [2, [3]], 2: [[4]], length: 3}).flatten<number|number[]>();
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<string>;
-
-        result = _('abc').chain().flatten();
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<number>;
-
-        result = _([1, 2, 3]).chain().flatten<number>();
-        result = _([1, [2, 3]]).chain().flatten<number>();
-        result = _([1, [2, [3]]]).chain().flatten<number>(true);
-        result = _([1, [2, [3]], [[4]]]).chain().flatten<number>(true);
-
-        result = _({0: 1, 1: 2, 2: 3, length: 3}).chain().flatten<number>();
-        result = _({0: 1, 1: [2, 3], length: 2}).chain().flatten<number>();
-        result = _({0: 1, 1: [2, [3]], length: 2}).chain().flatten<number>(true);
-        result = _({0: 1, 1: [2, [3]], 2: [[4]], length: 3}).chain().flatten<number>(true);
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<number|number[]>;
-
-        result = _([1, [2, [3]]]).chain().flatten<number|number[]>();
-        result = _([1, [2, [3]], [[4]]]).chain().flatten<number|number[]>();
-
-        result = _({0: 1, 1: [2, [3]], length: 2}).chain().flatten<number|number[]>();
-        result = _({0: 1, 1: [2, [3]], 2: [[4]], length: 3}).chain().flatten<number|number[]>();
-    }
+    fp.flatten("abc"); // $ExpectType string[]
+    fp.flatten([1, 2, 3]); // $ExpectType number[]
+    fp.flatten([1, [2, 3]]); // $ExpectType number[]
+    fp.flatten({0: 1, 1: [2, 3], length: 2}); // $ExpectType number[]
+    fp.unnest([1, [2, 3]]); // $ExpectType number[]
 }
 
 // _.flattenDeep
-namespace TestFlattenDeep {
-    let array: number[][] | null | undefined = [] as any;
-    let list: _.List<number[]> | null | undefined = [] as any;
+{
+    _.flattenDeep<number>([1, 2, 3]); // $ExpectType number[]
+    _.flattenDeep<number>([1, [2, [3, [4, 5]]]]); // $ExpectType number[]
+    _.flattenDeep<number>({0: 1, 1: [2, [3, [4, 5]]], length: 2}); // $ExpectType number[]
 
-    {
-        let result: string[];
+    _([1, 2, 3]).flattenDeep<number>(); // $ExpectType LoDashImplicitWrapper<number[]>
+    _([1, [2, [3, [4, 5]]]]).flattenDeep<number>(); // $ExpectType LoDashImplicitWrapper<number[]>
+    _({0: 1, 1: [2, [3, [4, 5]]], length: 2}).flattenDeep<number>(); // $ExpectType LoDashImplicitWrapper<number[]>
 
-        result = _.flattenDeep('abc');
-    }
+    _.chain([1, 2, 3]).flattenDeep<number>(); // $ExpectType LoDashExplicitWrapper<number[]>
+    _.chain([1, [2, [3, [4, 5]]]]).flattenDeep<number>(); // $ExpectType LoDashExplicitWrapper<number[]>
+    _.chain({0: 1, 1: [2, [3, [4, 5]]], length: 2}).flattenDeep<number>(); // $ExpectType LoDashExplicitWrapper<number[]>
 
-    {
-        let result: number[];
-
-        result = _.flattenDeep<number>(array);
-        result = _.flattenDeep<number>(list);
-        result = _.flattenDeep<number>([1, 2, 3]);
-        result = _.flattenDeep<number>([1, [2, 3]]);
-        result = _.flattenDeep<number>([1, [2, [3]]]);
-        result = _.flattenDeep<number>([1, [2, [3]], [[4]]]);
-
-        result = _.flattenDeep<number>({0: 1, 1: 2, 2: 3, length: 3});
-        result = _.flattenDeep<number>({0: 1, 1: [2, 3], length: 2});
-        result = _.flattenDeep<number>({0: 1, 1: [2, [3]], length: 2});
-        result = _.flattenDeep<number>({0: 1, 1: [2, [3]], 2: [[4]], length: 3});
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<string>;
-
-        result = _('abc').flattenDeep();
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<number>;
-
-        result = _([1, 2, 3]).flattenDeep<number>();
-        result = _([1, [2, 3]]).flattenDeep<number>();
-        result = _([1, [2, [3]]]).flattenDeep<number>();
-        result = _([1, [2, [3]], [[4]]]).flattenDeep<number>();
-
-        result = _({0: 1, 1: 2, 2: 3, length: 3}).flattenDeep<number>();
-        result = _({0: 1, 1: [2, 3], length: 2}).flattenDeep<number>();
-        result = _({0: 1, 1: [2, [3]], length: 2}).flattenDeep<number>();
-        result = _({0: 1, 1: [2, [3]], 2: [[4]], length: 3}).flattenDeep<number>();
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<number|number[]>;
-
-        result = _([1, [2, [3]]]).flattenDeep<number|number[]>();
-        result = _([1, [2, [3]], [[4]]]).flattenDeep<number|number[]>();
-
-        result = _({0: 1, 1: [2, [3]], length: 2}).flattenDeep<number|number[]>();
-        result = _({0: 1, 1: [2, [3]], 2: [[4]], length: 3}).flattenDeep<number|number[]>();
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<string>;
-
-        result = _('abc').chain().flattenDeep();
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<number>;
-
-        result = _([1, 2, 3]).chain().flattenDeep<number>();
-        result = _([1, [2, 3]]).chain().flattenDeep<number>();
-        result = _([1, [2, [3]]]).chain().flattenDeep<number>();
-        result = _([1, [2, [3]], [[4]]]).chain().flattenDeep<number>();
-
-        result = _({0: 1, 1: 2, 2: 3, length: 3}).chain().flattenDeep<number>();
-        result = _({0: 1, 1: [2, 3], length: 2}).chain().flattenDeep<number>();
-        result = _({0: 1, 1: [2, [3]], length: 2}).chain().flattenDeep<number>();
-        result = _({0: 1, 1: [2, [3]], 2: [[4]], length: 3}).chain().flattenDeep<number>();
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<number|number[]>;
-
-        result = _([1, [2, [3]]]).chain().flattenDeep<number|number[]>();
-        result = _([1, [2, [3]], [[4]]]).chain().flattenDeep<number|number[]>();
-
-        result = _({0: 1, 1: [2, [3]], length: 2}).chain().flattenDeep<number|number[]>();
-        result = _({0: 1, 1: [2, [3]], 2: [[4]], length: 3}).chain().flattenDeep<number|number[]>();
-    }
+    fp.flattenDeep<number>([1, 2, 3]); // $ExpectType number[]
+    fp.flattenDeep<number>([1, [2, [3, [4, 5]]]]); // $ExpectType number[]
+    fp.flattenDeep<number>({0: 1, 1: [2, [3, [4, 5]]], length: 2}); // $ExpectType number[]
 }
 
 // _.fromPairs
-namespace TestFromPairs {
-    let twoDimensionalArray: string[][] | null | undefined = [] as any;
-    let numberTupleArray: Array<[string, number]> | null | undefined = [] as any;
-    let stringDict: _.Dictionary<string>;
-    let numberDict: _.Dictionary<number>;
+{
+    const twoDimensionalArray: string[][] | null | undefined = anything;
+    const numberTupleArray: Array<[string, number]> | null | undefined = anything;
 
-    {
-        stringDict = _.fromPairs(twoDimensionalArray);
-        numberDict = _.fromPairs(numberTupleArray);
-        // Ensure we're getting the parameterized overload rather than the 'any' catch-all.
-        numberDict = _.fromPairs<number>(numberTupleArray);
-        // This doesn't compile because you can't assign arrays to tuples.
-        // stringDict = _.fromPairs<string>(twoDimensionalArray);
-    }
-
-    {
-        stringDict = _(twoDimensionalArray).fromPairs().value();
-    }
-
-    {
-        stringDict = _.chain(twoDimensionalArray).fromPairs().value();
-    }
+    _.fromPairs(twoDimensionalArray); // $ExpectType Dictionary<any>
+    _.fromPairs(numberTupleArray); // $ExpectType Dictionary<number>
+    _(twoDimensionalArray).fromPairs(); // $ExpectType LoDashImplicitWrapper<Dictionary<any>>
+    _.chain(twoDimensionalArray).fromPairs(); // $ExpectType LoDashExplicitWrapper<Dictionary<any>>
+    fp.fromPairs(numberTupleArray); // $ExpectType Dictionary<number>
 }
 
 // _.head
-namespace TestHead {
-    let array: AbcObject[] | null | undefined = [] as any;
-    let list: _.List<AbcObject> | null | undefined = [] as any;
+{
+    const list: _.List<AbcObject> | null | undefined = anything;
 
-    {
-        let result: string | undefined;
+    _.head("abc"); // $ExpectType string | undefined
+    _.head(list); // $ExpectType AbcObject | undefined
 
-        result = _.head('abc');
-        result = _('abc').head();
-    }
+    _("abc").head(); // $ExpectType string | undefined
+    _(list).head(); // $ExpectType AbcObject | undefined
 
-    {
-        let result: AbcObject | undefined;
+    _.chain("abc").head(); // $ExpectType LoDashExplicitWrapper<string | undefined>
+    _.chain(list).head(); // $ExpectType LoDashExplicitWrapper<AbcObject | undefined>
 
-        result = _.head(array);
-        result = _.head(list);
-
-        result = _(array).head();
-        result = _(list).head();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<string | undefined>;
-
-        result = _('abc').chain().head();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<AbcObject | undefined>;
-
-        result = _(array).chain().head();
-        result = _(list).chain().head();
-    }
+    fp.head("abc"); // $ExpectType string | undefined
+    fp.head(list); // $ExpectType AbcObject | undefined
 }
 
 // _.indexOf
-namespace TestIndexOf {
-    let array: AbcObject[] | null | undefined = [] as any;
-    let list: _.List<AbcObject> | null | undefined = [] as any;
-    let value: AbcObject = { a: 1, b: "", c: true };
-
-    {
-        let result: number;
-
-        result = _.indexOf(array, value);
-        result = _.indexOf(array, value, true);
-        result = _.indexOf(array, value, 42);
-
-        result = _.indexOf(list, value);
-        result = _.indexOf(list, value, true);
-        result = _.indexOf(list, value, 42);
-
-        result = _(array).indexOf(value);
-        result = _(array).indexOf(value, true);
-        result = _(array).indexOf(value, 42);
-
-        result = _(list).indexOf(value);
-        result = _(list).indexOf(value, true);
-        result = _(list).indexOf(value, 42);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<number>;
-
-        result = _(array).chain().indexOf(value);
-        result = _(array).chain().indexOf(value, true);
-        result = _(array).chain().indexOf(value, 42);
-
-        result = _(list).chain().indexOf(value);
-        result = _(list).chain().indexOf(value, true);
-        result = _(list).chain().indexOf(value, 42);
-    }
-}
-
+// _.lastIndexOf
 // _.sortedIndexOf
+// _.sortedLastIndexOf
 {
-    let array: AbcObject[] | null | undefined = [] as any;
-    let list: _.List<AbcObject> | null | undefined = [] as any;
-    let value: AbcObject = { a: 1, b: "", c: true };
+    const list: _.List<AbcObject> | null | undefined = anything;
+    const value: AbcObject = { a: 1, b: "", c: true };
 
-    {
-        let result: number;
+    _.indexOf(list, value); // $ExpectType number
+    _.indexOf(list, value, 42); // $ExpectType number
+    _(list).indexOf(value); // $ExpectType number
+    _(list).indexOf(value, 42); // $ExpectType number
+    _.chain(list).indexOf(value); // $ExpectType LoDashExplicitWrapper<number>
+    _.chain(list).indexOf(value, 42); // $ExpectType LoDashExplicitWrapper<number>
+    fp.indexOf(value, list); // $ExpectType number
+    fp.indexOf(value)(list); // $ExpectType number
+    fp.indexOfFrom(value)(42)(list); // $ExpectType number
 
-        result = _.sortedIndexOf(array, value);
-        result = _.sortedIndexOf(list, value);
-        result = _(array).sortedIndexOf(value);
-        result = _(list).sortedIndexOf(value);
-    }
+    _.lastIndexOf(list, value); // $ExpectType number
+    _.lastIndexOf(list, value, 42); // $ExpectType number
+    _(list).lastIndexOf(value); // $ExpectType number
+    _(list).lastIndexOf(value, 42); // $ExpectType number
+    _.chain(list).lastIndexOf(value); // $ExpectType LoDashExplicitWrapper<number>
+    _.chain(list).lastIndexOf(value, 42); // $ExpectType LoDashExplicitWrapper<number>
+    fp.lastIndexOf(value, list); // $ExpectType number
+    fp.lastIndexOf(value)(list); // $ExpectType number
+    fp.lastIndexOfFrom(value)(42)(list); // $ExpectType number
 
-    {
-        let result: _.LoDashExplicitWrapper<number>;
+    _.sortedIndexOf(list, value); // $ExpectType number
+    _(list).sortedIndexOf(value); // $ExpectType number
+    _.chain(list).indexOf(value); // $ExpectType LoDashExplicitWrapper<number>
+    fp.sortedIndexOf(value, list); // $ExpectType number
+    fp.sortedIndexOf(value)(list); // $ExpectType number
 
-        result = _(array).chain().sortedIndexOf(value);
-        result = _(list).chain().sortedIndexOf(value);
-    }
+    _.sortedLastIndexOf(list, value); // $ExpectType number
+    _(list).sortedLastIndexOf(value); // $ExpectType number
+    _.chain(list).sortedLastIndexOf(value); // $ExpectType LoDashExplicitWrapper<number>
+    fp.sortedLastIndexOf(value, list); // $ExpectType number
+    fp.sortedLastIndexOf(value)(list); // $ExpectType number
 }
 
-//_.initial
-namespace TestInitial {
-    let array: AbcObject[] | null | undefined = [] as any;
-    let list: _.List<AbcObject> | null | undefined = [] as any;
+// _.initial
+{
+    const list: _.List<AbcObject> | null | undefined = anything;
 
-    {
-        let result: AbcObject[];
-
-        result = _.initial(array);
-        result = _.initial(list);
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<AbcObject>;
-
-        result = _(array).initial();
-        result = _(list).initial();
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<AbcObject>;
-
-        result = _(array).chain().initial();
-        result = _(list).chain().initial();
-    }
+    _.initial(list); // $ExpectType AbcObject[]
+    _(list).initial(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _.chain(list).initial(); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    fp.initial(list); // $ExpectType AbcObject[]
 }
 
 // _.intersection
-namespace TestIntersection {
-    let array: AbcObject[] = [] as any;
-    let list: _.List<AbcObject> = [] as any;
-    let arrayParam: AbcObject[] = [] as any;
-    let listParam: _.List<AbcObject> = [] as any;
+{
+    const list: _.List<AbcObject> = anything;
 
-    {
-        let result: AbcObject[];
-
-        result = _.intersection(array, list);
-        result = _.intersection(list, array, list);
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<AbcObject>;
-
-        result = _(array).intersection(arrayParam);
-        result = _(array).intersection(listParam, arrayParam);
-
-        result = _(list).intersection(arrayParam);
-        result = _(list).intersection(listParam, arrayParam);
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<AbcObject>;
-
-        result = _(array).chain().intersection(arrayParam);
-        result = _(array).chain().intersection(listParam, arrayParam);
-
-        result = _(list).chain().intersection(arrayParam);
-        result = _(list).chain().intersection(listParam, arrayParam);
-    }
+    _.intersection(list, list); // $ExpectType AbcObject[]
+    _.intersection(list, list, list); // $ExpectType AbcObject[]
+    _(list).intersection(list); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).intersection(list, list); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _.chain(list).intersection(list); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).intersection(list, list); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    fp.intersection(list, list); // $ExpectType AbcObject[]
+    fp.intersection(list)(list); // $ExpectType AbcObject[]
 }
 
 // _.intersectionBy
 {
-    let array: AbcObject[] = [] as any;
-    let list: _.List<AbcObject> = [] as any;
-    let arrayParam: AbcObject[] = [] as any;
-    let listParam: _.List<AbcObject> = [] as any;
+    const list: _.List<AbcObject> = anything;
 
+    _.intersectionBy(list, list); // $ExpectType AbcObject[]
+    _.intersectionBy(list, list, list); // $ExpectType AbcObject[]
+    _.intersectionBy(list, list, "a"); // $ExpectType AbcObject[]
+    _.intersectionBy(list, list, list, { a: 42 }); // $ExpectType AbcObject[]
+    _.intersectionBy(list, list, ["a", 42]); // $ExpectType AbcObject[]
     // $ExpectType AbcObject[]
-    result = _.intersectionBy(array, list);
-    // $ExpectType AbcObject[]
-    result = _.intersectionBy(list, array, list);
-    // $ExpectType AbcObject[]
-    result = _.intersectionBy(array, list, 'a');
-    // $ExpectType AbcObject[]
-    result = _.intersectionBy(array, list, { a: 42 });
-    // $ExpectType AbcObject[]
-    result = _.intersectionBy(list, array, list, { a: 42 });
-    // $ExpectType AbcObject[]
-    result = _.intersectionBy(array, list, ['a', 42]);
-    // $ExpectType AbcObject[]
-    result = _.intersectionBy(array, list, (value) => {
+    _.intersectionBy(list, list, (value) => {
         value; // $ExpectType AbcObject
         return 0;
     });
     // $ExpectType AbcObject[]
-    result = _.intersectionBy(list, array, list, (value) => {
+    _.intersectionBy(list, list, list, (value) => {
         value; // $ExpectType AbcObject
         return 0;
     });
 
+    _(list).intersectionBy(list); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).intersectionBy(list, "a"); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).intersectionBy(list, list, { a: 42 }); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).intersectionBy(list, ["a", 42]); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
     // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-    result = _(array).intersectionBy(arrayParam);
-    // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-    result = _(array).intersectionBy(listParam, arrayParam);
-    // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-    result = _(array).intersectionBy(list, 'a');
-    // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-    result = _(array).intersectionBy(list, { a: 42 });
-    // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-    result = _(list).intersectionBy(array, list, { a: 42 });
-    // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-    result = _(array).intersectionBy(list, ['a', 42]);
-    // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-    result = _(array).intersectionBy(list, (value) => {
-        value; // $ExpectType AbcObject
-        return "";
-    });
-    // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-    result = _(list).intersectionBy(array, list, (value) => {
+    _(list).intersectionBy(list, (value) => {
         value; // $ExpectType AbcObject
         return 1;
     });
 
+    _.chain(list).intersectionBy(list); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).intersectionBy(list, "a"); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).intersectionBy(list, list, { a: 42 }); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).intersectionBy(list, ["a", 42]); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
     // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-    result = _.chain(array).intersectionBy(arrayParam);
-    // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-    result = _.chain(array).intersectionBy(listParam, arrayParam);
-    // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-    result = _.chain(array).intersectionBy(list, 'a');
-    // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-    result = _.chain(array).intersectionBy(list, { a: 42 });
-    // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-    result = _.chain(list).intersectionBy(array, list, { a: 42 });
-    // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-    result = _.chain(array).intersectionBy(list, ['a', 42]);
-    // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-    result = _.chain(array).intersectionBy(list, (value) => {
-        value; // $ExpectType AbcObject
-        return false;
-    });
-    // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-    result = _.chain(list).intersectionBy(array, list, (value) => {
+    _.chain(list).intersectionBy(list, (value) => {
         value; // $ExpectType AbcObject
         return null;
     });
 
+    fp.intersectionBy("a", list, list); // $ExpectType AbcObject[]
+    fp.intersectionBy("a", list, list); // $ExpectType AbcObject[]
+    fp.intersectionBy({ a: 42 }, list, list); // $ExpectType AbcObject[]
+    fp.intersectionBy(["a", 42], list, list); // $ExpectType AbcObject[]
+    fp.intersectionBy((value: AbcObject) => 0, list, list); // $ExpectType AbcObject[]
+
     interface T1 {
         a: string;
         b: string;
@@ -1469,20 +720,20 @@ namespace TestIntersection {
         a: string;
         b: number;
     }
-    const t1: T1 = { a: 'a', b: 'b' };
-    const t2: T2 = { a: 'a', b: 1 };
+    const t1: T1 = { a: "a", b: "b" };
+    const t2: T2 = { a: "a", b: 1 };
     // $ExpectType T1[]
-    result = _.intersectionBy([t1], [t2], (value) => {
+    _.intersectionBy([t1], [t2], (value) => {
         value; // $ExpectType T1 | T2
         return undefined;
     });
     // $ExpectType LoDashImplicitWrapper<T1[]>
-    result = _([t1]).intersectionBy([t2], (value) => {
+    _([t1]).intersectionBy([t2], (value) => {
         value; // $ExpectType T1 | T2
         return {};
     });
     // $ExpectType LoDashExplicitWrapper<T1[]>
-    result = _.chain([t1]).intersectionBy([t2], (value) => {
+    _.chain([t1]).intersectionBy([t2], (value) => {
         value; // $ExpectType T1 | T2
         return {};
     });
@@ -1490,62 +741,44 @@ namespace TestIntersection {
 
 // _.intersectionWith
 {
-    let array: AbcObject[] = [] as any;
-    let list: _.List<AbcObject> = [] as any;
-    let arrayParam: AbcObject[] = [] as any;
-    let listParam: _.List<AbcObject> = [] as any;
+    const list: _.List<AbcObject> = anything;
 
+    _.intersectionWith(list, list); // $ExpectType AbcObject[]
+    _.intersectionWith(list, list, list); // $ExpectType AbcObject[]
     // $ExpectType AbcObject[]
-    result = _.intersectionWith(array, list);
-    // $ExpectType AbcObject[]
-    result = _.intersectionWith(list, array, list);
-    // $ExpectType AbcObject[]
-    result = _.intersectionWith(array, list, (a, b) => {
+    _.intersectionWith(list, list, (a, b) => {
         a; // $ExpectType AbcObject
         b; // $ExpectType AbcObject
         return true;
     });
     // $ExpectType AbcObject[]
-    result = _.intersectionWith(list, array, list, (a, b) => {
+    _.intersectionWith(list, list, list, (a, b) => {
         a; // $ExpectType AbcObject
         b; // $ExpectType AbcObject
         return true;
     });
 
+    _(list).intersectionWith(list); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).intersectionWith(list, list); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
     // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-    result = _(array).intersectionWith(arrayParam);
-    // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-    result = _(array).intersectionWith(listParam, arrayParam);
-    // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-    result = _(array).intersectionWith(list, (a, b) => {
-        a; // $ExpectType AbcObject
-        b; // $ExpectType AbcObject
-        return true;
-    });
-    // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-    result = _(list).intersectionWith(array, list, (a, b) => {
+    _(list).intersectionWith(list, (a, b) => {
         a; // $ExpectType AbcObject
         b; // $ExpectType AbcObject
         return true;
     });
 
+    _.chain(list).intersectionWith(list); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).intersectionWith(list, list); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
     // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-    result = _.chain(array).intersectionWith(arrayParam);
-    // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-    result = _.chain(array).intersectionWith(listParam, arrayParam);
-    // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-    result = _.chain(array).intersectionWith(list, (a, b) => {
-        a; // $ExpectType AbcObject
-        b; // $ExpectType AbcObject
-        return true;
-    });
-    // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-    result = _.chain(list).intersectionWith(array, list, (a, b) => {
+    _.chain(list).intersectionWith(list, (a, b) => {
         a; // $ExpectType AbcObject
         b; // $ExpectType AbcObject
         return true;
     });
 
+    fp.intersectionWith((a: AbcObject, b: AbcObject) => true, list, list); // $ExpectType AbcObject[]
+    fp.intersectionWith((a: AbcObject, b: AbcObject) => true)(list)(list); // $ExpectType AbcObject[]
+
     interface T1 {
         a: string;
         b: string;
@@ -1554,434 +787,244 @@ namespace TestIntersection {
         a: string;
         b: number;
     }
-    const t1: T1 = { a: 'a', b: 'b' };
-    const t2: T2 = { a: 'a', b: 1 };
+    const t1: T1 = { a: "a", b: "b" };
+    const t2: T2 = { a: "a", b: 1 };
     // $ExpectType T1[]
-    result = _.intersectionWith([t1], [t2], (a, b) => {
+    _.intersectionWith([t1], [t2], (a, b) => {
         a; // $ExpectType T1
         b; // $ExpectType T2
         return true;
     });
     // $ExpectType LoDashImplicitWrapper<T1[]>
-    result = _([t1]).intersectionWith([t2], (a, b) => {
+    _([t1]).intersectionWith([t2], (a, b) => {
         a; // $ExpectType T1
         b; // $ExpectType T2
         return true;
     });
     // $ExpectType LoDashExplicitWrapper<T1[]>
-    result = _.chain([t1]).intersectionWith([t2], (a, b) => {
+    _.chain([t1]).intersectionWith([t2], (a, b) => {
         a; // $ExpectType T1
         b; // $ExpectType T2
         return true;
     });
+
+    fp.intersectionWith((a: T1, b: T2) => true)([t1])([t2]); // $ExpectType T1[]
 }
 
 // _.join
-namespace TestJoin {
-    let array = [1, 2];
-    let list = {0: 1, 1: 2, length: 2};
-    let nilArray: string[] | null | undefined = undefined as any;
-    let nilList: _.List<string> | null | undefined = undefined as any;
+{
+    const list: _.List<string> | null | undefined = anything;
 
-    {
-        let result: string;
+    _.join("abc"); // $ExpectType string
+    _.join("abc", "_"); // $ExpectType string
+    _.join(list); // $ExpectType string
+    _.join(list, "_"); // $ExpectType string
 
-        result = _.join('abc');
-        result = _.join('abc', '_');
-        result = _.join(array);
-        result = _.join(array, '_');
-        result = _.join(list);
-        result = _.join(list, '_');
-        result = _.join(nilArray);
-        result = _.join(nilArray, '_');
-        result = _.join(nilList);
-        result = _.join(nilList, '_');
+    _("abc").join(); // $ExpectType string
+    _("abc").join("_"); // $ExpectType string
+    _(list).join(); // $ExpectType string
+    _(list).join("_"); // $ExpectType string
 
-        result = _('abc').join();
-        result = _('abc').join('_');
-        result = _(array).join();
-        result = _(array).join('_');
-        result = _(list).join();
-        result = _(list).join('_');
-    }
+    _.chain("abc").join(); // $ExpectType LoDashExplicitWrapper<string>
+    _.chain("abc").join("_"); // $ExpectType LoDashExplicitWrapper<string>
+    _.chain(list).join(); // $ExpectType LoDashExplicitWrapper<string>
+    _.chain(list).join("_"); // $ExpectType LoDashExplicitWrapper<string>
 
-    {
-        let result: _.LoDashExplicitWrapper<string>;
-
-        result = _('abc').chain().join();
-        result = _('abc').chain().join('_');
-        result = _(array).chain().join();
-        result = _(array).chain().join('_');
-        result = _(list).chain().join();
-        result = _(list).chain().join('_');
-    }
+    fp.join("_", "abc"); // $ExpectType string
+    fp.join("_")(list); // $ExpectType string
 }
 
 // _.last
-namespace TestLast {
-    let array: AbcObject[] | null | undefined = [] as any;
-    let list: _.List<AbcObject> | null | undefined = [] as any;
+{
+    const list: _.List<AbcObject> | null | undefined = anything;
 
-    {
-        let result: string | undefined;
+    _.last("abc"); // $ExpectType string | undefined
+    _.last(list); // $ExpectType AbcObject | undefined
 
-        result = _.last('abc');
-        result = _('abc').last();
-    }
+    _("abc").last(); // $ExpectType string | undefined
+    _(list).last(); // $ExpectType AbcObject | undefined
 
-    {
-        let result: AbcObject | undefined;
+    _.chain("abc").last(); // $ExpectType LoDashExplicitWrapper<string | undefined>
+    _.chain(list).last(); // $ExpectType LoDashExplicitWrapper<AbcObject | undefined>
 
-        result = _.last(array);
-        result = _.last(list);
-
-        result = _(array).last();
-        result = _(list).last();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<string | undefined>;
-
-        result = _('abc').chain().last();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<AbcObject | undefined>;
-
-        result = _(array).chain().last();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<AbcObject | undefined>;
-
-        result = _(list).chain().last();
-    }
-}
-
-// _.lastIndexOf
-namespace TestLastIndexOf {
-    let array: AbcObject[] | null | undefined = [] as any;
-    let list: _.List<AbcObject> | null | undefined = [] as any;
-    let value: AbcObject = { a: 1, b: "", c: true };
-
-    {
-        let result: number;
-
-        result = _.lastIndexOf(array, value);
-        result = _.lastIndexOf(array, value, true);
-        result = _.lastIndexOf(array, value, 42);
-
-        result = _.lastIndexOf(list, value);
-        result = _.lastIndexOf(list, value, true);
-        result = _.lastIndexOf(list, value, 42);
-
-        result = _(array).lastIndexOf(value);
-        result = _(array).lastIndexOf(value, true);
-        result = _(array).lastIndexOf(value, 42);
-
-        result = _(list).lastIndexOf(value);
-        result = _(list).lastIndexOf(value, true);
-        result = _(list).lastIndexOf(value, 42);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<number>;
-
-        result = _(array).chain().lastIndexOf(value);
-        result = _(array).chain().lastIndexOf(value, true);
-        result = _(array).chain().lastIndexOf(value, 42);
-
-        result = _(list).chain().lastIndexOf(value);
-        result = _(list).chain().lastIndexOf(value, true);
-        result = _(list).chain().lastIndexOf(value, 42);
-    }
+    fp.last("abc"); // $ExpectType string | undefined
+    fp.last(list); // $ExpectType AbcObject | undefined
 }
 
 // _.nth
-namespace TestNth {
-    let array: AbcObject[] | null | undefined = [] as any;
-    let list: _.List<AbcObject> | null | undefined = [] as any;
-    let value = 0;
+{
+    const list: _.List<AbcObject> | null | undefined = anything;
 
-    {
-        let result: AbcObject | undefined;
+    _.nth(list, 42); // $ExpectType AbcObject | undefined
+    _(list).nth(42); // $ExpectType AbcObject | undefined
+    _.chain(list).nth(42); // $ExpectType LoDashExplicitWrapper<AbcObject | undefined>
 
-        result = _.nth(array);
-
-        result = _.nth(array, 42);
-
-        result = _(array).nth();
-        result = _(array).nth(42);
-
-        result = _(list).nth();
-        result = _(list).nth(42);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<AbcObject | undefined>;
-
-        result = _(array).chain().nth();
-        result = _(array).chain().nth(42);
-
-        result = _(list).chain().nth();
-        result = _(list).chain().nth(42);
-    }
+    fp.nth(42, list); // $ExpectType AbcObject | undefined
+    fp.nth(42)(list); // $ExpectType AbcObject | undefined
 }
 
 // _.pull
-namespace TestPull {
-    let array: AbcObject[] = [];
-    let list: _.List<AbcObject> = [];
-    let value: AbcObject = { a: 1, b: "", c: true };
+{
+    const array: AbcObject[] = [];
+    const list: _.List<AbcObject> = [];
+    const value: AbcObject = { a: 1, b: "", c: true };
 
-    {
-        let result: AbcObject[];
+    _.pull(array); // $ExpectType AbcObject[]
+    _.pull(array, value); // $ExpectType AbcObject[]
+    _.pull(array, value, value, value); // $ExpectType AbcObject[]
+    _.pull(list); // $ExpectType ArrayLike<AbcObject>
+    _.pull(list, value); // $ExpectType ArrayLike<AbcObject>
+    _.pull(list, value, value, value); // $ExpectType ArrayLike<AbcObject>
 
-        result = _.pull(array);
-        result = _.pull(array, value);
-        result = _.pull(array, value, value);
-        result = _.pull(array, value, value, value);
-    }
+    _(array).pull(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(array).pull(value); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(array).pull(value, value, value); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).pull(); // $ExpectType LoDashImplicitWrapper<ArrayLike<AbcObject>>
+    _(list).pull(value); // $ExpectType LoDashImplicitWrapper<ArrayLike<AbcObject>>
+    _(list).pull(value, value, value); // $ExpectType LoDashImplicitWrapper<ArrayLike<AbcObject>>
 
-    {
-        let result: _.List<AbcObject>;
+    _.chain(array).pull(); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(array).pull(value); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(array).pull(value, value, value); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).pull(); // $ExpectType LoDashExplicitWrapper<ArrayLike<AbcObject>>
+    _.chain(list).pull(value); // $ExpectType LoDashExplicitWrapper<ArrayLike<AbcObject>>
+    _.chain(list).pull(value, value, value); // $ExpectType LoDashExplicitWrapper<ArrayLike<AbcObject>>
 
-        result = _.pull(list);
-        result = _.pull(list, value);
-        result = _.pull(list, value, value);
-        result = _.pull(list, value, value, value);
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<AbcObject>;
-
-        result = _(array).pull();
-        result = _(array).pull(value);
-        result = _(array).pull(value, value);
-        result = _(array).pull(value, value, value);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<_.List<AbcObject>>;
-
-        result = _(list).pull();
-        result = _(list).pull(value);
-        result = _(list).pull(value, value);
-        result = _(list).pull(value, value, value);
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<AbcObject>;
-
-        result = _(array).chain().pull();
-        result = _(array).chain().pull(value);
-        result = _(array).chain().pull(value, value);
-        result = _(array).chain().pull(value, value, value);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<_.List<AbcObject>>;
-
-        result = _(list).chain().pull();
-        result = _(list).chain().pull(value);
-        result = _(list).chain().pull(value, value);
-        result = _(list).chain().pull(value, value, value);
-    }
+    fp.pull(value, array); // $ExpectType AbcObject[]
+    fp.pull(value, list); // $ExpectType ArrayLike<AbcObject>
+    fp.pull(value)(list); // $ExpectType ArrayLike<AbcObject>
 }
 
 // _.pullAt
-namespace TestPullAt {
-    let array: AbcObject[] = [];
-    let list: _.List<AbcObject> = [];
+{
+    const array: AbcObject[] = [];
+    const list: _.List<AbcObject> = [];
 
-    {
-        let result: AbcObject[];
+    _.pullAt(array); // $ExpectType AbcObject[]
+    _.pullAt(array, 1); // $ExpectType AbcObject[]
+    _.pullAt(array, [2, 3], 4); // $ExpectType AbcObject[]
+    _.pullAt(list); // $ExpectType ArrayLike<AbcObject>
+    _.pullAt(list, 1); // $ExpectType ArrayLike<AbcObject>
+    _.pullAt(list, [2, 3], 4); // $ExpectType ArrayLike<AbcObject>
 
-        result = _.pullAt(array);
-        result = _.pullAt(array, 1);
-        result = _.pullAt(array, [2, 3], 1);
-        result = _.pullAt(array, 4, [2, 3], 1);
-    }
+    _(array).pullAt(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(array).pullAt(1); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(array).pullAt([2, 3], 4); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).pullAt(); // $ExpectType LoDashImplicitWrapper<ArrayLike<AbcObject>>
+    _(list).pullAt(1); // $ExpectType LoDashImplicitWrapper<ArrayLike<AbcObject>>
+    _(list).pullAt([2, 3], 4); // $ExpectType LoDashImplicitWrapper<ArrayLike<AbcObject>>
 
-    {
-        let result: ArrayLike<AbcObject>;
+    _.chain(array).pullAt(); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(array).pullAt(1); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(array).pullAt([2, 3], 4); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).pullAt(); // $ExpectType LoDashExplicitWrapper<ArrayLike<AbcObject>>
+    _.chain(list).pullAt(1); // $ExpectType LoDashExplicitWrapper<ArrayLike<AbcObject>>
+    _.chain(list).pullAt([2, 3], 4); // $ExpectType LoDashExplicitWrapper<ArrayLike<AbcObject>>
 
-        result = _.pullAt(list);
-        result = _.pullAt(list, 1);
-        result = _.pullAt(list, [2, 3], 1);
-        result = _.pullAt(list, 4, [2, 3], 1);
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<AbcObject>;
-
-        result = _(array).pullAt();
-        result = _(array).pullAt(1);
-        result = _(array).pullAt([2, 3], 1);
-        result = _(array).pullAt(4, [2, 3], 1);
-    }
-
-    {
-        let result: _.LoDashImplicitWrapper<ArrayLike<AbcObject>>;
-
-        result = _(list).pullAt();
-        result = _(list).pullAt(1);
-        result = _(list).pullAt([2, 3], 1);
-        result = _(list).pullAt(4, [2, 3], 1);
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<AbcObject>;
-
-        result = _(array).chain().pullAt();
-        result = _(array).chain().pullAt(1);
-        result = _(array).chain().pullAt([2, 3], 1);
-        result = _(array).chain().pullAt(4, [2, 3], 1);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<ArrayLike<AbcObject>>;
-
-        result = _(list).chain().pullAt();
-        result = _(list).chain().pullAt(1);
-        result = _(list).chain().pullAt([2, 3], 1);
-        result = _(list).chain().pullAt(4, [2, 3], 1);
-    }
+    fp.pullAt(1, array); // $ExpectType AbcObject[]
+    fp.pullAt([2, 3], array); // $ExpectType AbcObject[]
+    fp.pullAt(1, list); // $ExpectType ArrayLike<AbcObject>
+    fp.pullAt([2, 3], list); // $ExpectType ArrayLike<AbcObject>
+    fp.pullAt(1)(list); // $ExpectType ArrayLike<AbcObject>
 }
 
 // _.pullAll
 {
-    let array: AbcObject[] = anything;
-    let list: _.List<AbcObject> = anything;
-    let values: _.List<AbcObject> = anything;
+    const array: AbcObject[] = anything;
+    const list: _.List<AbcObject> = anything;
+    const values: _.List<AbcObject> = anything;
 
-    // $ExpectType AbcObject[]
-    _.pullAll(array);
-    // $ExpectType AbcObject[]
-    _.pullAll(array, values);
-    // $ExpectType ArrayLike<AbcObject>
-    _.pullAll(list);
-    // $ExpectType ArrayLike<AbcObject>
-    _.pullAll(list, values);
+    _.pullAll(array); // $ExpectType AbcObject[]
+    _.pullAll(array, values); // $ExpectType AbcObject[]
+    _.pullAll(list); // $ExpectType ArrayLike<AbcObject>
+    _.pullAll(list, values); // $ExpectType ArrayLike<AbcObject>
 
-    // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-    _(array).pullAll();
-    // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-    _(array).pullAll(values);
-    // $ExpectType LoDashImplicitWrapper<ArrayLike<AbcObject>>
-    _(list).pullAll();
-    // $ExpectType LoDashImplicitWrapper<ArrayLike<AbcObject>>
-    _(list).pullAll(values);
+    _(array).pullAll(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(array).pullAll(values); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).pullAll(); // $ExpectType LoDashImplicitWrapper<ArrayLike<AbcObject>>
+    _(list).pullAll(values); // $ExpectType LoDashImplicitWrapper<ArrayLike<AbcObject>>
 
-    // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-    _.chain(array).pullAll();
-    // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-    _.chain(array).pullAll(values);
-    // $ExpectType LoDashExplicitWrapper<ArrayLike<AbcObject>>
-    _.chain(list).pullAll();
-    // $ExpectType LoDashExplicitWrapper<ArrayLike<AbcObject>>
-    _.chain(list).pullAll(values);
+    _.chain(array).pullAll(); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(array).pullAll(values); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).pullAll(); // $ExpectType LoDashExplicitWrapper<ArrayLike<AbcObject>>
+    _.chain(list).pullAll(values); // $ExpectType LoDashExplicitWrapper<ArrayLike<AbcObject>>
+
+    fp.pullAll(values, array); // $ExpectType AbcObject[]
+    fp.pullAll(values, list); // $ExpectType ArrayLike<AbcObject>
+    fp.pullAll(values)(list); // $ExpectType ArrayLike<AbcObject>
 }
 
 // _.pullAllBy
+// _.pullAllWith
 {
-    let array: AbcObject[] = anything;
-    let list: _.List<AbcObject> = anything;
-    let values: _.List<AbcObject> = anything;
+    const array: AbcObject[] = anything;
+    const list: _.List<AbcObject> = anything;
+    const values: _.List<AbcObject> = anything;
 
-    // $ExpectType AbcObject[]
-    _.pullAllBy(array);
-    // $ExpectType AbcObject[]
-    _.pullAllBy(array, values);
-    // $ExpectType AbcObject[]
-    _.pullAllBy(array, values, 'a');
-    // $ExpectType AbcObject[]
-    _.pullAllBy(array, values, { a: 42 });
-    // $ExpectType AbcObject[]
-    _.pullAllBy(array, values, ['a', 42]);
+    _.pullAllBy(array); // $ExpectType AbcObject[]
+    _.pullAllBy(array, values, "a"); // $ExpectType AbcObject[]
     // $ExpectType AbcObject[]
     _.pullAllBy(array, values, (value) => {
         value; // $ExpectType AbcObject
         return [];
     });
-    // $ExpectType ArrayLike<AbcObject>
-    _.pullAllBy(list);
-    // $ExpectType ArrayLike<AbcObject>
-    _.pullAllBy(list, values);
-    // $ExpectType ArrayLike<AbcObject>
-    _.pullAllBy(list, values, 'a');
-    // $ExpectType ArrayLike<AbcObject>
-    _.pullAllBy(list, values, { a: 42 });
-    // $ExpectType ArrayLike<AbcObject>
-    _.pullAllBy(list, values, ['a', 42]);
+
+    _.pullAllBy(list); // $ExpectType ArrayLike<AbcObject>
+    _.pullAllBy(list, values); // $ExpectType ArrayLike<AbcObject>
+    _.pullAllBy(list, values, "a"); // $ExpectType ArrayLike<AbcObject>
+    _.pullAllBy(list, values, { a: 42 }); // $ExpectType ArrayLike<AbcObject>
+    _.pullAllBy(list, values, ["a", 42]); // $ExpectType ArrayLike<AbcObject>
     // $ExpectType ArrayLike<AbcObject>
     _.pullAllBy(list, values, (value) => {
         value; // $ExpectType AbcObject
         return () => {};
     });
 
-    // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-    _(array).pullAllBy();
-    // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-    _(array).pullAllBy(values);
-    // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-    _(array).pullAllBy(values, 'a');
-    // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-    _(array).pullAllBy(values, { a: 42 });
-    // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-    _(array).pullAllBy(values, ['a', 42]);
+    _(array).pullAllBy(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(array).pullAllBy(values, "a"); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
     // $ExpectType LoDashImplicitWrapper<AbcObject[]>
     _(array).pullAllBy(values, (value) => {
         value; // $ExpectType AbcObject
         return 0;
     });
-    // $ExpectType LoDashImplicitWrapper<ArrayLike<AbcObject>>
-    _(list).pullAllBy();
-    // $ExpectType LoDashImplicitWrapper<ArrayLike<AbcObject>>
-    _(list).pullAllBy(values);
-    // $ExpectType LoDashImplicitWrapper<ArrayLike<AbcObject>>
-    _(list).pullAllBy(values, 'a');
-    // $ExpectType LoDashImplicitWrapper<ArrayLike<AbcObject>>
-    _(list).pullAllBy(values, { a: 42 });
-    // $ExpectType LoDashImplicitWrapper<ArrayLike<AbcObject>>
-    _(list).pullAllBy(values, ['a', 42]);
+    _(list).pullAllBy(); // $ExpectType LoDashImplicitWrapper<ArrayLike<AbcObject>>
+    _(list).pullAllBy(values, "a"); // $ExpectType LoDashImplicitWrapper<ArrayLike<AbcObject>>
     // $ExpectType LoDashImplicitWrapper<ArrayLike<AbcObject>>
     _(list).pullAllBy(values, (value) => {
         value; // $ExpectType AbcObject
         return 0;
     });
 
-    // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-    _.chain(array).pullAllBy();
-    // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-    _.chain(array).pullAllBy(values);
-    // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-    _.chain(array).pullAllBy(values, 'a');
-    // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-    _.chain(array).pullAllBy(values, { a: 42 });
-    // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-    _.chain(array).pullAllBy(values, ['a', 42]);
+    _.chain(array).pullAllBy(); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(array).pullAllBy(values, "a"); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
     // $ExpectType LoDashExplicitWrapper<AbcObject[]>
     _.chain(array).pullAllBy(values, (value) => {
         value; // $ExpectType AbcObject
         return 0;
     });
-    // $ExpectType LoDashExplicitWrapper<ArrayLike<AbcObject>>
-    _.chain(list).pullAllBy();
-    // $ExpectType LoDashExplicitWrapper<ArrayLike<AbcObject>>
-    _.chain(list).pullAllBy(values);
-    // $ExpectType LoDashExplicitWrapper<ArrayLike<AbcObject>>
-    _.chain(list).pullAllBy(values, 'a');
-    // $ExpectType LoDashExplicitWrapper<ArrayLike<AbcObject>>
-    _.chain(list).pullAllBy(values, { a: 42 });
-    // $ExpectType LoDashExplicitWrapper<ArrayLike<AbcObject>>
-    _.chain(list).pullAllBy(values, ['a', 42]);
+    _.chain(list).pullAllBy(); // $ExpectType LoDashExplicitWrapper<ArrayLike<AbcObject>>
+    _.chain(list).pullAllBy(values, "a"); // $ExpectType LoDashExplicitWrapper<ArrayLike<AbcObject>>
     // $ExpectType LoDashExplicitWrapper<ArrayLike<AbcObject>>
     _.chain(list).pullAllBy(values, (value) => {
         value; // $ExpectType AbcObject
         return 0;
     });
 
+    fp.pullAllBy("a", values, array); // $ExpectType AbcObject[]
+    fp.pullAllBy({ a: 42 }, values, array); // $ExpectType AbcObject[]
+    fp.pullAllBy(["a", 42], values, array); // $ExpectType AbcObject[]
+    fp.pullAllBy((value: AbcObject) => true, values, array); // $ExpectType AbcObject[]
+    fp.pullAllBy((value: AbcObject) => true)(values, array); // $ExpectType AbcObject[]
+    fp.pullAllBy((value: AbcObject) => true, values)(array); // $ExpectType AbcObject[]
+    fp.pullAllBy((value: AbcObject) => true)(values)(array); // $ExpectType AbcObject[]
+    fp.pullAllBy("a", values, list); // $ExpectType ArrayLike<AbcObject>
+    fp.pullAllBy({ a: 42 }, values, list); // $ExpectType ArrayLike<AbcObject>
+    fp.pullAllBy(["a", 42], values, list); // $ExpectType ArrayLike<AbcObject>
+    fp.pullAllBy((value: AbcObject) => true, values, list); // $ExpectType ArrayLike<AbcObject>
+    fp.pullAllBy((value: AbcObject) => true)(values, list); // $ExpectType ArrayLike<AbcObject>
+    fp.pullAllBy((value: AbcObject) => true, values)(list); // $ExpectType ArrayLike<AbcObject>
+    fp.pullAllBy((value: AbcObject) => true)(values)(list); // $ExpectType ArrayLike<AbcObject>
+
     interface T1 {
         a: string;
         b: string;
@@ -1990,45 +1033,36 @@ namespace TestPullAt {
         a: string;
         b: number;
     }
-    const t1: T1 = { a: 'a', b: 'b' };
-    const t2: T2 = { a: 'a', b: 1 };
+    const t1: T1 = { a: "a", b: "b" };
+    const t2: T2 = { a: "a", b: 1 };
     // $ExpectType T1[]
-    result = _.pullAllBy([t1], [t2], (value) => {
+    _.pullAllBy([t1], [t2], (value) => {
         value; // $ExpectType T1 | T2
         return "";
     });
     // $ExpectType LoDashImplicitWrapper<T1[]>
-    result = _([t1]).pullAllBy([t2], (value) => {
+    _([t1]).pullAllBy([t2], (value) => {
         value; // $ExpectType T1 | T2
         return "";
     });
     // $ExpectType LoDashExplicitWrapper<T1[]>
-    result = _.chain([t1]).pullAllBy([t2], (value) => {
+    _.chain([t1]).pullAllBy([t2], (value) => {
         value; // $ExpectType T1 | T2
         return "";
     });
-}
 
-// _.pullAllWith
-{
-    let array: AbcObject[] = anything;
-    let list: _.List<AbcObject> = anything;
-    let values: _.List<AbcObject> = anything;
+    fp.pullAllBy<T1, T2>((value: T1 | T2) => value.a, [t2], [t1]); // $ExpectType T1[]
+    fp.pullAllBy((value: T1 | T2) => value.a)([t2])([t1]); // $ExpectType (T1 | T2)[]
 
-    // $ExpectType AbcObject[]
-    _.pullAllWith(array);
-    // $ExpectType AbcObject[]
-    _.pullAllWith(array, values);
+    _.pullAllWith(array); // $ExpectType AbcObject[]
+    _.pullAllWith(array, values); // $ExpectType AbcObject[]
     // $ExpectType AbcObject[]
     _.pullAllWith(array, values, (a, b) => {
         a; // $ExpectType AbcObject
         b; // $ExpectType AbcObject
         return true;
     });
-    // $ExpectType ArrayLike<AbcObject>
-    _.pullAllWith(list);
-    // $ExpectType ArrayLike<AbcObject>
-    _.pullAllWith(list, values);
+    _.pullAllWith(list); // $ExpectType ArrayLike<AbcObject>
     // $ExpectType ArrayLike<AbcObject>
     _.pullAllWith(list, values, (a, b) => {
         a; // $ExpectType AbcObject
@@ -2036,20 +1070,15 @@ namespace TestPullAt {
         return true;
     });
 
-    // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-    _(array).pullAllWith();
-    // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-    _(array).pullAllWith(values);
+    _(array).pullAllWith(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(array).pullAllWith(values); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
     // $ExpectType LoDashImplicitWrapper<AbcObject[]>
     _(array).pullAllWith(values, (a, b) => {
         a; // $ExpectType AbcObject
         b; // $ExpectType AbcObject
         return true;
     });
-    // $ExpectType LoDashImplicitWrapper<ArrayLike<AbcObject>>
-    _(list).pullAllWith();
-    // $ExpectType LoDashImplicitWrapper<ArrayLike<AbcObject>>
-    _(list).pullAllWith(values);
+    _(list).pullAllWith(); // $ExpectType LoDashImplicitWrapper<ArrayLike<AbcObject>>
     // $ExpectType LoDashImplicitWrapper<ArrayLike<AbcObject>>
     _(list).pullAllWith(values, (a, b) => {
         a; // $ExpectType AbcObject
@@ -2057,20 +1086,15 @@ namespace TestPullAt {
         return true;
     });
 
-    // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-    _.chain(array).pullAllWith();
-    // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-    _.chain(array).pullAllWith(values);
+    _.chain(array).pullAllWith(); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(array).pullAllWith(values); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
     // $ExpectType LoDashExplicitWrapper<AbcObject[]>
     _.chain(array).pullAllWith(values, (a, b) => {
         a; // $ExpectType AbcObject
         b; // $ExpectType AbcObject
         return true;
     });
-    // $ExpectType LoDashExplicitWrapper<ArrayLike<AbcObject>>
-    _.chain(list).pullAllWith();
-    // $ExpectType LoDashExplicitWrapper<ArrayLike<AbcObject>>
-    _.chain(list).pullAllWith(values);
+    _.chain(list).pullAllWith(); // $ExpectType LoDashExplicitWrapper<ArrayLike<AbcObject>>
     // $ExpectType LoDashExplicitWrapper<ArrayLike<AbcObject>>
     _.chain(list).pullAllWith(values, (a, b) => {
         a; // $ExpectType AbcObject
@@ -2078,1987 +1102,585 @@ namespace TestPullAt {
         return true;
     });
 
-    interface T1 {
-        a: string;
-        b: string;
-    }
-    interface T2 {
-        a: string;
-        b: number;
-    }
-    const t1: T1 = { a: 'a', b: 'b' };
-    const t2: T2 = { a: 'a', b: 1 };
+    fp.pullAllWith((a, b) => true, values, array); // $ExpectType AbcObject[]
+    fp.pullAllWith((a: AbcObject, b: AbcObject) => true)(values, array); // $ExpectType AbcObject[]
+    fp.pullAllWith((a, b) => true, values, list); // $ExpectType ArrayLike<AbcObject>
+    fp.pullAllWith((a: AbcObject, b: AbcObject) => true)(values, list); // $ExpectType ArrayLike<AbcObject>
+
     // $ExpectType T1[]
-    result = _.pullAllWith([t1], [t2], (a, b) => {
+    _.pullAllWith([t1], [t2], (a, b) => {
         a; // $ExpectType T1
         b; // $ExpectType T2
         return true;
     });
     // $ExpectType LoDashImplicitWrapper<T1[]>
-    result = _([t1]).pullAllWith([t2], (a, b) => {
+    _([t1]).pullAllWith([t2], (a, b) => {
         a; // $ExpectType T1
         b; // $ExpectType T2
         return true;
     });
     // $ExpectType LoDashExplicitWrapper<T1[]>
-    result = _.chain([t1]).pullAllWith([t2], (a, b) => {
+    _.chain([t1]).pullAllWith([t2], (a, b) => {
         a; // $ExpectType T1
         b; // $ExpectType T2
         return true;
     });
+
+    fp.pullAllWith((a, b) => a.a === b.a, [t2], [t1]); // $ExpectType T1[]
+    fp.pullAllWith((a: T1, b: T2) => a.a === b.a)([t2], [t1]); // $ExpectType T1[]
 }
 
 // _.remove
-namespace TestRemove {
-    let array: AbcObject[] = [];
-    let list: _.List<AbcObject> = [];
-    let predicateFn = (value: AbcObject, index: number, collection: _.List<AbcObject>) => true;
+{
+    const list: _.List<AbcObject> = [];
+    const predicateFn = (value: AbcObject, index: number, collection: _.List<AbcObject>) => true;
 
-    {
-        let result: AbcObject[];
+    _.remove(list); // $ExpectType AbcObject[]
+    _.remove(list, predicateFn); // $ExpectType AbcObject[]
+    _.remove(list, ""); // $ExpectType AbcObject[]
+    _.remove(list, { a: 42 }); // $ExpectType AbcObject[]
 
-        result = _.remove(array);
-        result = _.remove(array, predicateFn);
-        result = _.remove(array, '');
-        result = _.remove(array, {a: 42});
+    _(list).remove(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).remove(predicateFn); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).remove(""); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).remove({ a: 42 }); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
 
-        result = _.remove(list);
-        result = _.remove(list, predicateFn);
-        result = _.remove(list, '');
-        result = _.remove(list, {a: 42});
-    }
+    _.chain(list).remove(); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).remove(predicateFn); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).remove(""); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).remove({ a: 42 }); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
 
-    {
-        let result: _.LoDashImplicitArrayWrapper<AbcObject>;
-
-        result = _(array).remove();
-        result = _(array).remove(predicateFn);
-        result = _(array).remove('');
-        result = _(array).remove({a: 42});
-
-        result = _(list).remove();
-        result = _(list).remove(predicateFn);
-        result = _(list).remove('');
-        result = _(list).remove({a: 42});
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<AbcObject>;
-
-        result = _(array).chain().remove();
-        result = _(array).chain().remove(predicateFn);
-        result = _(array).chain().remove('');
-        result = _(array).chain().remove({a: 42});
-
-        result = _(list).chain().remove();
-        result = _(list).chain().remove(predicateFn);
-        result = _(list).chain().remove('');
-        result = _(list).chain().remove({a: 42});
-    }
+    const predicateFn2 = (value: AbcObject) => true;
+    fp.remove(predicateFn2, list); // $ExpectType AbcObject[]
+    fp.remove(predicateFn2)(list); // $ExpectType AbcObject[]
+    fp.remove("", list); // $ExpectType AbcObject[]
+    fp.remove({ a: 42 }, list); // $ExpectType AbcObject[]
 }
 
 // _.tail
-namespace TestTail {
-    let array: AbcObject[] | null | undefined = [] as any;
-    let list: _.List<AbcObject> | null | undefined = [] as any;
+{
+    const list: _.List<AbcObject> | null | undefined = anything;
 
-    {
-        let result: AbcObject[];
-
-        result = _.tail(array);
-        result = _.tail(list);
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<AbcObject>;
-
-        result = _(array).tail();
-        result = _(list).tail();
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<AbcObject>;
-
-        result = _(array).chain().tail();
-        result = _(list).chain().tail();
-    }
+    _.tail(list); // $ExpectType AbcObject[]
+    _(list).tail(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _.chain(list).tail(); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    fp.tail(list); // $ExpectType AbcObject[]
 }
 
 // _.slice
-namespace TestSlice {
-    let array: AbcObject[] | null | undefined = [] as any;
+{
+    const array: AbcObject[] | null | undefined = anything;
 
-    {
-        let result: AbcObject[];
-
-        result = _.slice(array);
-        result = _.slice(array, 42);
-        result = _.slice(array, 42, 42);
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<AbcObject>;
-
-        result = _(array).slice();
-        result = _(array).slice(42);
-        result = _(array).slice(42, 42);
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<AbcObject>;
-
-        result = _(array).chain().slice();
-        result = _(array).chain().slice(42);
-        result = _(array).chain().slice(42, 42);
-    }
-}
-
-// _.sortedIndex
-namespace TestSortedIndex {
-    type SampleType = {a: number; b: string; c: boolean;};
-
-    let array: SampleType[] = [];
-    let list: _.List<SampleType> = [];
-
-    let value: SampleType = { a: 1, b: "", c: true };
-
-    let stringIterator: (x: string) => number;
-    let arrayIterator: (x: SampleType) => number;
-    let listIterator: (x: SampleType) => number;
-
-    {
-        let result: number;
-
-        result = _.sortedIndex<string>('', '');
-
-        result = _.sortedIndex<SampleType>(array, value);
-
-        result = _.sortedIndex<SampleType>(list, value);
-
-        result = _('').sortedIndex('');
-
-        result = _(array).sortedIndex(value);
-
-        result = _(list).sortedIndex<SampleType>(value);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<number>;
-
-        result = _('').chain().sortedIndex('');
-
-        result = _(array).chain().sortedIndex(value);
-
-        result = _(list).chain().sortedIndex<SampleType>(value);
-    }
+    _.slice(array); // $ExpectType AbcObject[]
+    _.slice(array, 42); // $ExpectType AbcObject[]
+    _.slice(array, 42, 42); // $ExpectType AbcObject[]
+    _(array).slice(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(array).slice(42, 42); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _.chain(array).slice(); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(array).slice(42, 42); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    fp.slice(0, 10, array); // $ExpectType AbcObject[]
+    fp.slice(0)(10, array); // $ExpectType AbcObject[]
+    fp.slice(0)(10)(array); // $ExpectType AbcObject[]
 }
 
 // _.sortedIndexBy
-namespace TestSortedIndexBy {
-    type SampleType = {a: number; b: string; c: boolean;};
-
-    let array: SampleType[] = [];
-    let list: _.List<SampleType> = [];
-
-    let value: SampleType = { a: 1, b: "", c: true };
-
-    let stringIterator = (x: string) => 0;
-    let arrayIterator = (x: SampleType) => 0;
-    let listIterator = (x: SampleType) => 0;
-
-    {
-        let result: number;
-
-        result = _.sortedIndexBy<string>('', '', stringIterator);
-
-        result = _.sortedIndexBy<SampleType>(array, value, arrayIterator);
-        result = _.sortedIndexBy<SampleType>(array, value, '');
-        result = _.sortedIndexBy<SampleType>(array, value, {a: 42});
-
-        result = _.sortedIndexBy<SampleType>(list, value, listIterator);
-        result = _.sortedIndexBy<SampleType>(list, value, '');
-        result = _.sortedIndexBy<SampleType>(list, value, {a: 42});
-
-        result = _('').sortedIndexBy('', stringIterator);
-
-        result = _(array).sortedIndexBy(value, arrayIterator);
-        result = _(array).sortedIndexBy(value, '');
-        result = _(array).sortedIndexBy(value, {a: 42});
-
-        result = _(list).sortedIndexBy<SampleType>(value, listIterator);
-        result = _(list).sortedIndexBy<SampleType>(value, '');
-        result = _(list).sortedIndexBy<SampleType>(value, {a: 42});
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<number>;
-
-        result = _('').chain().sortedIndexBy('', stringIterator);
-
-        result = _(array).chain().sortedIndexBy(value, arrayIterator);
-        result = _(array).chain().sortedIndexBy(value, '');
-        result = _(array).chain().sortedIndexBy(value, {a: 42});
-
-        result = _(list).chain().sortedIndexBy<SampleType>(value, listIterator);
-        result = _(list).chain().sortedIndexBy<SampleType>(value, '');
-        result = _(list).chain().sortedIndexBy<SampleType>(value, {a: 42});
-    }
-}
-
-// _.sortedLastIndex
-namespace TestSortedLastIndex {
-    type SampleType = {a: number; b: string; c: boolean;};
-
-    let array: SampleType[] = [];
-    let list: _.List<SampleType> = [];
-
-    let value: SampleType = { a: 1, b: "", c: true };
-
-    let stringIterator: (x: string) => number;
-    let arrayIterator: (x: SampleType) => number;
-    let listIterator: (x: SampleType) => number;
-
-    {
-        let result: number;
-
-        result = _.sortedLastIndex<string>('', '');
-
-        result = _.sortedLastIndex<SampleType>(array, value);
-
-        result = _.sortedLastIndex<SampleType>(list, value);
-
-        result = _('').sortedLastIndex('');
-
-        result = _(array).sortedLastIndex(value);
-
-        result = _(list).sortedLastIndex<SampleType>(value);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<number>;
-
-        result = _('').chain().sortedLastIndex('');
-
-        result = _(array).chain().sortedLastIndex(value);
-
-        result = _(list).chain().sortedLastIndex<SampleType>(value);
-    }
-}
-
 // _.sortedLastIndexBy
-namespace TestSortedLastIndexBy {
-    type SampleType = {a: number; b: string; c: boolean;};
+{
+    const list: _.List<AbcObject> | null | undefined = anything;
+    const value: AbcObject = { a: 1, b: "", c: true };
+    const listIterator = (value: AbcObject) => 0;
 
-    let array: SampleType[] = [];
-    let list: _.List<SampleType> = [];
+    _.sortedIndexBy(list, value, listIterator); // $ExpectType number
+    _.sortedIndexBy(list, value, ""); // $ExpectType number
+    _.sortedIndexBy(list, value, { a: 42 }); // $ExpectType number
+    _(list).sortedIndexBy(value, listIterator); // $ExpectType number
+    _(list).sortedIndexBy(value, ""); // $ExpectType number
+    _(list).sortedIndexBy(value, { a: 42 }); // $ExpectType number
+    _.chain(list).sortedIndexBy(value, listIterator); // $ExpectType LoDashExplicitWrapper<number>
+    _.chain(list).sortedIndexBy(value, ""); // $ExpectType LoDashExplicitWrapper<number>
+    _.chain(list).sortedIndexBy(value, { a: 42 }); // $ExpectType LoDashExplicitWrapper<number>
+    fp.sortedIndexBy(listIterator, value, list); // $ExpectType number
+    fp.sortedIndexBy(listIterator)(value)(list); // $ExpectType number
+    fp.sortedIndexBy("a", value, list); // $ExpectType number
+    fp.sortedIndexBy({ a: 42 }, value, list); // $ExpectType number
 
-    let value: SampleType = { a: 1, b: "", c: true };
+    _.sortedLastIndexBy(list, value, listIterator); // $ExpectType number
+    _.sortedLastIndexBy(list, value, ""); // $ExpectType number
+    _.sortedLastIndexBy(list, value, { a: 42 }); // $ExpectType number
+    _(list).sortedLastIndexBy(value, listIterator); // $ExpectType number
+    _(list).sortedLastIndexBy(value, ""); // $ExpectType number
+    _(list).sortedLastIndexBy(value, { a: 42 }); // $ExpectType number
+    _.chain(list).sortedLastIndexBy(value, listIterator); // $ExpectType LoDashExplicitWrapper<number>
+    _.chain(list).sortedLastIndexBy(value, ""); // $ExpectType LoDashExplicitWrapper<number>
+    _.chain(list).sortedLastIndexBy(value, { a: 42 }); // $ExpectType LoDashExplicitWrapper<number>
+    fp.sortedLastIndexBy(listIterator, value, list); // $ExpectType number
+    fp.sortedLastIndexBy(listIterator)(value)(list); // $ExpectType number
+    fp.sortedLastIndexBy("a", value, list); // $ExpectType number
+    fp.sortedLastIndexBy({ a: 42 }, value, list); // $ExpectType number
+}
 
-    let stringIterator = (x: string) => 0;
-    let arrayIterator = (x: SampleType) => 0;
-    let listIterator = (x: SampleType) => 0;
+// _.sortedIndex
+// _.sortedLastIndex
+{
+    const list: _.List<AbcObject> | null | undefined = anything;
+    const value: AbcObject = { a: 1, b: "", c: true };
 
-    {
-        let result: number;
+    _.sortedIndex(list, value); // $ExpectType number
+    _(list).sortedIndex(value); // $ExpectType number
+    _.chain(list).sortedIndex(value); // $ExpectType LoDashExplicitWrapper<number>
+    fp.sortedIndex(value, list); // $ExpectType number
+    fp.sortedIndex(value)(list); // $ExpectType number
 
-        result = _.sortedLastIndexBy<string>('', '', stringIterator);
-
-        result = _.sortedLastIndexBy<SampleType>(array, value, arrayIterator);
-        result = _.sortedLastIndexBy<SampleType>(array, value, '');
-        result = _.sortedLastIndexBy<SampleType>(array, value, {a: 42});
-
-        result = _.sortedLastIndexBy<SampleType>(list, value, listIterator);
-        result = _.sortedLastIndexBy<SampleType>(list, value, '');
-        result = _.sortedLastIndexBy<SampleType>(list, value, {a: 42});
-
-        result = _('').sortedLastIndexBy('', stringIterator);
-
-        result = _(array).sortedLastIndexBy(value, arrayIterator);
-        result = _(array).sortedLastIndexBy(value, '');
-        result = _(array).sortedLastIndexBy(value, {a: 42});
-
-        result = _(list).sortedLastIndexBy<SampleType>(value, listIterator);
-        result = _(list).sortedLastIndexBy<SampleType>(value, '');
-        result = _(list).sortedLastIndexBy<SampleType>(value, {a: 42});
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<number>;
-
-        result = _('').chain().sortedLastIndexBy('', stringIterator);
-
-        result = _(array).chain().sortedLastIndexBy(value, arrayIterator);
-        result = _(array).chain().sortedLastIndexBy(value, '');
-        result = _(array).chain().sortedLastIndexBy(value, {a: 42});
-
-        result = _(list).chain().sortedLastIndexBy<SampleType>(value, listIterator);
-        result = _(list).chain().sortedLastIndexBy<SampleType>(value, '');
-        result = _(list).chain().sortedLastIndexBy<SampleType>(value, {a: 42});
-    }
+    _.sortedLastIndex(list, value); // $ExpectType number
+    _(list).sortedLastIndex(value); // $ExpectType number
+    _.chain(list).sortedLastIndex(value); // $ExpectType LoDashExplicitWrapper<number>
+    fp.sortedLastIndex(value, list); // $ExpectType number
+    fp.sortedLastIndex(value)(list); // $ExpectType number
 }
 
 // _.take
-namespace TestTake {
-    let array: AbcObject[] | null | undefined = [] as any;
-    let list: _.List<AbcObject> | null | undefined = [] as any;
-
-    {
-        let result: AbcObject[];
-
-        result = _.take(array);
-        result = _.take(array, 42);
-
-        result = _.take(list);
-        result = _.take(list, 42);
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<AbcObject>;
-
-        result = _(array).take();
-        result = _(array).take(42);
-
-        result = _(list).take();
-        result = _(list).take(42);
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<AbcObject>;
-
-        result = _(array).chain().take();
-        result = _(array).chain().take(42);
-
-        result = _(list).chain().take();
-        result = _(list).chain().take(42);
-    }
-}
-
 // _.takeRight
-namespace TestTakeRight {
-    let array: AbcObject[] | null | undefined = [] as any;
-    let list: _.List<AbcObject> | null | undefined = [] as any;
+{
+    const list: _.List<AbcObject> | null | undefined = anything;
 
-    {
-        let result: AbcObject[];
+    _.take(list); // $ExpectType AbcObject[]
+    _.take(list, 42); // $ExpectType AbcObject[]
+    _(list).take(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).take(42); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _.chain(list).take(); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).take(42); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    fp.take(42, list); // $ExpectType AbcObject[]
+    fp.take(42)(list); // $ExpectType AbcObject[]
 
-        result = _.takeRight(array);
-        result = _.takeRight(array, 42);
-
-        result = _.takeRight(list);
-        result = _.takeRight(list, 42);
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<AbcObject>;
-
-        result = _(array).takeRight();
-        result = _(array).takeRight(42);
-
-        result = _(list).takeRight();
-        result = _(list).takeRight(42);
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<AbcObject>;
-
-        result = _(array).chain().takeRight();
-        result = _(array).chain().takeRight(42);
-
-        result = _(list).chain().takeRight();
-        result = _(list).chain().takeRight(42);
-    }
-}
-
-// _.takeRightWhile
-namespace TestTakeRightWhile {
-    let array: AbcObject[] | null | undefined = [] as any;
-    let list: _.List<AbcObject> | null | undefined = [] as any;
-    let predicateFn = (value: AbcObject, index: number, collection: _.List<AbcObject>) => true;
-
-    {
-        let result: AbcObject[];
-
-        result = _.takeRightWhile(array);
-        result = _.takeRightWhile(array, predicateFn);
-        result = _.takeRightWhile(array, '');
-        result = _.takeRightWhile(array, {a: 42});
-
-        result = _.takeRightWhile(list);
-        result = _.takeRightWhile(list, predicateFn);
-        result = _.takeRightWhile(list, '');
-        result = _.takeRightWhile(list, {a: 42});
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<AbcObject>;
-
-        result = _(array).takeRightWhile();
-        result = _(array).takeRightWhile(predicateFn);
-        result = _(array).takeRightWhile('');
-        result = _(array).takeRightWhile({a: 42});
-
-        result = _(list).takeRightWhile();
-        result = _(list).takeRightWhile(predicateFn);
-        result = _(list).takeRightWhile('');
-        result = _(list).takeRightWhile({a: 42});
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<AbcObject>;
-
-        result = _(array).chain().takeRightWhile();
-        result = _(array).chain().takeRightWhile(predicateFn);
-        result = _(array).chain().takeRightWhile('');
-        result = _(array).chain().takeRightWhile({a: 42});
-
-        result = _(list).chain().takeRightWhile();
-        result = _(list).chain().takeRightWhile(predicateFn);
-        result = _(list).chain().takeRightWhile('');
-        result = _(list).chain().takeRightWhile({a: 42});
-    }
+    _.takeRight(list); // $ExpectType AbcObject[]
+    _.takeRight(list, 42); // $ExpectType AbcObject[]
+    _(list).takeRight(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).takeRight(42); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _.chain(list).takeRight(); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).takeRight(42); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    fp.takeRight(42, list); // $ExpectType AbcObject[]
+    fp.takeRight(42)(list); // $ExpectType AbcObject[]
 }
 
 // _.takeWhile
-namespace TestTakeWhile {
-    let array: AbcObject[] | null | undefined = [] as any;
-    let list: _.List<AbcObject> | null | undefined = [] as any;
-    let predicateFn = (value: AbcObject, index: number, collection: _.List<AbcObject>) => true;
+// _.takeRightWhile
+{
+    const list: _.List<AbcObject> | null | undefined = anything;
+    const predicateFn = (value: AbcObject, index: number, collection: _.List<AbcObject>) => true;
+    const predicateFn2 = (value: AbcObject) => true;
 
-    {
-        let result: AbcObject[];
+    _.takeWhile(list); // $ExpectType AbcObject[]
+    _.takeWhile(list, predicateFn); // $ExpectType AbcObject[]
+    _.takeWhile(list, ""); // $ExpectType AbcObject[]
+    _.takeWhile(list, { a: 42 }); // $ExpectType AbcObject[]
 
-        result = _.takeWhile(array);
-        result = _.takeWhile(array, predicateFn);
-        result = _.takeWhile(array, '');
-        result = _.takeWhile(array, {a: 42});
+    _(list).takeWhile(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).takeWhile(predicateFn); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).takeWhile(""); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).takeWhile({ a: 42 }); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
 
-        result = _.takeWhile(list);
-        result = _.takeWhile(list, predicateFn);
-        result = _.takeWhile(list, '');
-        result = _.takeWhile(list, {a: 42});
-    }
+    _.chain(list).takeWhile(); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).takeWhile(predicateFn); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).takeWhile(""); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).takeWhile({ a: 42 }); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
 
-    {
-        let result: _.LoDashImplicitArrayWrapper<AbcObject>;
+    fp.takeWhile(predicateFn2, list); // $ExpectType AbcObject[]
+    fp.takeWhile(predicateFn2)(list); // $ExpectType AbcObject[]
+    fp.takeWhile("a", list); // $ExpectType AbcObject[]
+    fp.takeWhile({ a: 42 }, list); // $ExpectType AbcObject[]
 
-        result = _(array).takeWhile();
-        result = _(array).takeWhile(predicateFn);
-        result = _(array).takeWhile('');
-        result = _(array).takeWhile({a: 42});
+    _.takeRightWhile(list); // $ExpectType AbcObject[]
+    _.takeRightWhile(list, predicateFn); // $ExpectType AbcObject[]
+    _.takeRightWhile(list, ""); // $ExpectType AbcObject[]
+    _.takeRightWhile(list, { a: 42 }); // $ExpectType AbcObject[]
 
-        result = _(list).takeWhile();
-        result = _(list).takeWhile(predicateFn);
-        result = _(list).takeWhile('');
-        result = _(list).takeWhile({a: 42});
-    }
+    _(list).takeRightWhile(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).takeRightWhile(predicateFn); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).takeRightWhile(""); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).takeRightWhile({ a: 42 }); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
 
-    {
-        let result: _.LoDashExplicitArrayWrapper<AbcObject>;
+    _.chain(list).takeRightWhile(); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).takeRightWhile(predicateFn); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).takeRightWhile(""); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).takeRightWhile({ a: 42 }); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
 
-        result = _(array).chain().takeWhile();
-        result = _(array).chain().takeWhile(predicateFn);
-        result = _(array).chain().takeWhile('');
-        result = _(array).chain().takeWhile({a: 42});
-
-        result = _(list).chain().takeWhile();
-        result = _(list).chain().takeWhile(predicateFn);
-        result = _(list).chain().takeWhile('');
-        result = _(list).chain().takeWhile({a: 42});
-    }
+    fp.takeRightWhile(predicateFn2, list); // $ExpectType AbcObject[]
+    fp.takeRightWhile(predicateFn2)(list); // $ExpectType AbcObject[]
+    fp.takeRightWhile("a", list); // $ExpectType AbcObject[]
+    fp.takeRightWhile({ a: 42 }, list); // $ExpectType AbcObject[]
 }
 
 // _.union
-namespace TestUnion {
-    let array: AbcObject[] | null | undefined = [] as any;
-    let list: _.List<AbcObject> | null | undefined = [] as any;
+{
+    const list: _.List<AbcObject> | null | undefined = anything;
 
-    {
-        let result: AbcObject[];
+    _.union(list); // $ExpectType AbcObject[]
+    _.union(list, list); // $ExpectType AbcObject[]
+    _.union(list, list, list); // $ExpectType AbcObject[]
 
-        // $ExpectType {}[]
-        _.union();
+    _(list).union(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).union(list); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).union(list, list); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
 
-        result = _.union(array);
-        result = _.union(array, list);
-        result = _.union(array, list, array);
+    _.chain(list).union(); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).union(list); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).union(list, list); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
 
-        result = _.union(list);
-        result = _.union(list, array);
-        result = _.union(list, array, list);
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<AbcObject>;
-
-        result = _(array).union();
-        result = _(array).union(list);
-        result = _(array).union(list, array);
-
-        result = _(array).union();
-        result = _(array).union(list);
-        result = _(array).union(list, array);
-
-        result = _(list).union();
-        result = _(list).union(array);
-        result = _(list).union(array, list);
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<AbcObject>;
-
-        result = _(array).chain().union();
-        result = _(array).chain().union(list);
-        result = _(array).chain().union(list, array);
-
-        result = _(array).chain().union();
-        result = _(array).chain().union(list);
-        result = _(array).chain().union(list, array);
-
-        result = _(list).chain().union();
-        result = _(list).chain().union(array);
-        result = _(list).chain().union(array, list);
-    }
+    fp.union(list, list); // $ExpectType AbcObject[]
+    fp.union(list)(list); // $ExpectType AbcObject[]
 }
 
 // _.unionBy
-namespace TestUnionBy {
-    let array: AbcObject[] | null | undefined = [] as any;
-    let list: _.List<AbcObject> | null | undefined = [] as any;
-    let iteratee: (value: AbcObject) => any = (value: AbcObject) => 1;
+{
+    const list: _.List<AbcObject> | null | undefined = anything;
+    const iteratee = (value: AbcObject) => 1;
 
-    {
-        let result: AbcObject[];
+    _.unionBy(list, list); // $ExpectType AbcObject[]
+    _.unionBy(list, list, list, list, list, list); // $ExpectType AbcObject[]
+    _.unionBy(list, list, iteratee); // $ExpectType AbcObject[]
+    _.unionBy(list, list, list, list, list, list, iteratee); // $ExpectType AbcObject[]
+    _.unionBy(list, list, "a"); // $ExpectType AbcObject[]
+    // <AbcObject> param needed for TS 2.3
+    _.unionBy<AbcObject>(list, list, list, list, list, list, "a"); // $ExpectType AbcObject[]
+    _.unionBy(list, list, {a: 1}); // $ExpectType AbcObject[]
+    _.unionBy(list, list, list, list, list, list, {a: 1}); // $ExpectType AbcObject[]
 
-        result = _.unionBy(array, array);
-        result = _.unionBy(array, list, array);
-        result = _.unionBy(array, array, list, array);
-        result = _.unionBy(array, list, array, list, array);
-        result = _.unionBy(array, array, list, array, list, array);
+    _(list).unionBy(list); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).unionBy(list, list, list, list, list); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).unionBy(list, iteratee); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).unionBy(list, list, list, list, list, iteratee); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).unionBy(list, "a"); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    // <AbcObject> param needed for TS 2.3
+    _(list).unionBy<AbcObject>(list, list, list, list, list, "a"); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).unionBy(list, {a: 1}); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).unionBy(list, list, list, list, list, {a: 1}); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
 
-        result = _.unionBy(array, array, iteratee);
-        result = _.unionBy(array, list, array, iteratee);
-        result = _.unionBy(array, array, list, array, iteratee);
-        result = _.unionBy(array, list, array, list, array, iteratee);
-        result = _.unionBy(array, array, list, array, list, array, iteratee);
+    _.chain(list).unionBy(list); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).unionBy(list, list, list, list, list); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).unionBy(list, iteratee); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).unionBy(list, list, list, list, list, iteratee); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).unionBy(list, "a"); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    // <AbcObject> param needed for TS 2.3
+    _.chain(list).unionBy<AbcObject>(list, list, list, list, list, "a"); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).unionBy(list, {a: 1}); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).unionBy(list, list, list, list, list, {a: 1}); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
 
-        result = _.unionBy(array, array, 'a');
-        result = _.unionBy(array, list, array, 'a');
-        // <AbcObject> param needed for TS 2.3
-        result = _.unionBy<AbcObject>(array, array, list, array, 'a');
-        result = _.unionBy<AbcObject>(array, list, array, list, array, 'a');
-        result = _.unionBy<AbcObject>(array, array, list, array, list, array, 'a');
-
-        result = _.unionBy(array, array, {a: 1});
-        result = _.unionBy(array, list, array, {a: 1});
-        result = _.unionBy(array, array, list, array, {a: 1});
-        result = _.unionBy(array, list, array, list, array, {a: 1});
-        result = _.unionBy(array, list, array, list, array, list, {a: 1});
-
-        result = _.unionBy(list, list);
-        result = _.unionBy(list, array, list);
-        result = _.unionBy(list, list, array, list);
-        result = _.unionBy(list, array, list, array, list);
-        result = _.unionBy(list, list, array, list, array, list);
-
-        result = _.unionBy(list, list, iteratee);
-        result = _.unionBy(list, array, list, iteratee);
-        result = _.unionBy(list, list, array, list, iteratee);
-        result = _.unionBy(list, array, list, array, list, iteratee);
-        result = _.unionBy(list, list, array, list, array, list, iteratee);
-
-        result = _.unionBy(list, list, 'a');
-        result = _.unionBy(list, array, list, 'a');
-        // <AbcObject> param needed for TS 2.3
-        result = _.unionBy<AbcObject>(list, list, array, list, 'a');
-        result = _.unionBy<AbcObject>(list, array, list, array, list, 'a');
-        result = _.unionBy<AbcObject>(list, list, array, list, array, list, 'a');
-
-        result = _.unionBy(list, list, {a: 1});
-        result = _.unionBy(list, array, list, {a: 1});
-        result = _.unionBy(list, list, array, list, {a: 1});
-        result = _.unionBy(list, array, list, array, list, {a: 1});
-        result = _.unionBy(list, array, list, array, list, array, {a: 1});
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<AbcObject>;
-
-        result = _(array).unionBy(array);
-        result = _(array).unionBy(list, array);
-        result = _(array).unionBy(array, list, array);
-        result = _(array).unionBy(list, array, list, array);
-        result = _(array).unionBy(array, list, array, list, array);
-
-        result = _(array).unionBy(array, iteratee);
-        result = _(array).unionBy(list, array, iteratee);
-        result = _(array).unionBy(array, list, array, iteratee);
-        result = _(array).unionBy(list, array, list, array, iteratee);
-        result = _(array).unionBy(array, list, array, list, array, iteratee);
-
-        result = _(array).unionBy(array, 'a');
-        result = _(array).unionBy(list, array, 'a');
-        // <AbcObject> param needed for TS 2.3
-        result = _(array).unionBy<AbcObject>(array, list, array, 'a');
-        result = _(array).unionBy<AbcObject>(list, array, list, array, 'a');
-        result = _(array).unionBy<AbcObject>(array, list, array, list, array, 'a');
-
-        result = _(array).unionBy(array, {a: 1});
-        result = _(array).unionBy(list, array, {a: 1});
-        result = _(array).unionBy(array, list, array, {a: 1});
-        result = _(array).unionBy(list, array, list, array, {a: 1});
-        result = _(array).unionBy(list, array, list, array, list, {a: 1});
-
-        result = _(list).unionBy(list);
-        result = _(list).unionBy(array, list);
-        result = _(list).unionBy(list, array, list);
-        result = _(list).unionBy(array, list, array, list);
-        result = _(list).unionBy(list, array, list, array, list);
-
-        result = _(list).unionBy(list, iteratee);
-        result = _(list).unionBy(array, list, iteratee);
-        result = _(list).unionBy(list, array, list, iteratee);
-        result = _(list).unionBy(array, list, array, list, iteratee);
-        result = _(list).unionBy(list, array, list, array, list, iteratee);
-
-        result = _(list).unionBy(list, 'a');
-        result = _(list).unionBy(array, list, 'a');
-        // <AbcObject> param needed for TS 2.3
-        result = _(list).unionBy<AbcObject>(list, array, list, 'a');
-        result = _(list).unionBy<AbcObject>(array, list, array, list, 'a');
-        result = _(list).unionBy<AbcObject>(list, array, list, array, list, 'a');
-
-        result = _(list).unionBy(list, {a: 1});
-        result = _(list).unionBy(array, list, {a: 1});
-        result = _(list).unionBy(list, array, list, {a: 1});
-        result = _(list).unionBy(array, list, array, list, {a: 1});
-        result = _(list).unionBy(array, list, array, list, array, {a: 1});
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<AbcObject>;
-
-        result = _(array).chain().unionBy(array);
-        result = _(array).chain().unionBy(list, array);
-        result = _(array).chain().unionBy(array, list, array);
-        result = _(array).chain().unionBy(list, array, list, array);
-        result = _(array).chain().unionBy(array, list, array, list, array);
-
-        result = _(array).chain().unionBy(array, iteratee);
-        result = _(array).chain().unionBy(list, array, iteratee);
-        result = _(array).chain().unionBy(array, list, array, iteratee);
-        result = _(array).chain().unionBy(list, array, list, array, iteratee);
-        result = _(array).chain().unionBy(array, list, array, list, array, iteratee);
-
-        result = _(array).chain().unionBy(array, 'a');
-        result = _(array).chain().unionBy(list, array, 'a');
-        result = _(array).chain().unionBy(array, list, array, 'a');
-        // <AbcObject> param needed for TS 2.3
-        result = _(array).chain().unionBy<AbcObject>(list, array, list, array, 'a');
-        result = _(array).chain().unionBy<AbcObject>(array, list, array, list, array, 'a');
-
-        result = _(array).chain().unionBy(array, {a: 1});
-        result = _(array).chain().unionBy(list, array, {a: 1});
-        result = _(array).chain().unionBy(array, list, array, {a: 1});
-        result = _(array).chain().unionBy(list, array, list, array, {a: 1});
-        result = _(array).chain().unionBy(list, array, list, array, list, {a: 1});
-
-        result = _(list).chain().unionBy(list);
-        result = _(list).chain().unionBy(array, list);
-        result = _(list).chain().unionBy(list, array, list);
-        result = _(list).chain().unionBy(array, list, array, list);
-        result = _(list).chain().unionBy(list, array, list, array, list);
-
-        result = _(list).chain().unionBy(list, iteratee);
-        result = _(list).chain().unionBy(array, list, iteratee);
-        result = _(list).chain().unionBy(list, array, list, iteratee);
-        result = _(list).chain().unionBy(array, list, array, list, iteratee);
-        result = _(list).chain().unionBy(list, array, list, array, list, iteratee);
-
-        result = _(list).chain().unionBy(list, 'a');
-        result = _(list).chain().unionBy(array, list, 'a');
-        result = _(list).chain().unionBy(list, array, list, 'a');
-        // <AbcObject> param needed for TS 2.3
-        result = _(list).chain().unionBy<AbcObject>(array, list, array, list, 'a');
-        result = _(list).chain().unionBy<AbcObject>(list, array, list, array, list, 'a');
-
-        result = _(list).chain().unionBy(list, {a: 1});
-        result = _(list).chain().unionBy(array, list, {a: 1});
-        result = _(list).chain().unionBy(list, array, list, {a: 1});
-        result = _(list).chain().unionBy(array, list, array, list, {a: 1});
-        result = _(list).chain().unionBy(array, list, array, list, array, {a: 1});
-    }
+    fp.unionBy(iteratee, list, list); // $ExpectType AbcObject[]
+    fp.unionBy(iteratee)(list)(list); // $ExpectType AbcObject[]
+    fp.unionBy("a", list, list); // $ExpectType AbcObject[]
+    fp.unionBy({ a: 1 }, list, list); // $ExpectType AbcObject[]
 }
 
 // _.uniq
-namespace TestUniq {
-    type SampleObject = {a: number; b: string; c: boolean};
+// _.sortedUniq
+{
+    const list: _.List<AbcObject> | null | undefined = anything;
 
-    let array: SampleObject[] | null | undefined = [] as any;
-    let list: _.List<SampleObject> | null | undefined = [] as any;
+    _.uniq("abc"); // $ExpectType string[]
+    _.uniq(list); // $ExpectType AbcObject[]
+    _(list).uniq(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _.chain(list).uniq(); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    fp.uniq("abc"); // $ExpectType string[]
+    fp.uniq(list); // $ExpectType AbcObject[]
 
-    {
-        let result: string[];
-        result = _.uniq<string>('abc');
-    }
-
-    {
-        let result: SampleObject[];
-
-        result = _.uniq<SampleObject>(array);
-        result = _.uniq<SampleObject>(list);
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<string>;
-        result = _('abc').uniq();
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<SampleObject>;
-
-        result = _(array).uniq();
-        result = _(list).uniq<SampleObject>();
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<string>;
-
-        result = _('abc').chain().uniq();
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<SampleObject>;
-
-        result = _(array).chain().uniq();
-        result = _(list).chain().uniq<SampleObject>();
-    }
+    _.sortedUniq("abc"); // $ExpectType string[]
+    _.sortedUniq(list); // $ExpectType AbcObject[]
+    _(list).sortedUniq(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _.chain(list).sortedUniq(); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    fp.sortedUniq("abc"); // $ExpectType string[]
+    fp.sortedUniq(list); // $ExpectType AbcObject[]
 }
 
 // _.uniqBy
-namespace TestUniqBy {
-    type SampleObject = {a: number; b: string; c: boolean};
-
-    let array: SampleObject[] | null | undefined = [] as any;
-    let list: _.List<SampleObject> | null | undefined = [] as any;
-
-    let stringIterator = (value: string, index: number, collection: string) => "";
-    let listIterator = (value: SampleObject, index: number, collection: _.List<SampleObject>) => 0;
-
-    {
-        let result: string[];
-
-        result = _.uniqBy('abc', stringIterator);
-    }
-
-    {
-        let result: SampleObject[];
-
-        result = _.uniqBy<SampleObject>(array, listIterator);
-        result = _.uniqBy<SampleObject>(array, 'a');
-        result = _.uniqBy<SampleObject>(array, {a: 42});
-
-        result = _.uniqBy<SampleObject>(list, listIterator);
-        result = _.uniqBy<SampleObject>(list, 'a');
-        result = _.uniqBy<SampleObject>(list, {a: 42});
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<string>;
-
-        result = _('abc').uniqBy(stringIterator);
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<SampleObject>;
-
-        result = _(array).uniqBy(listIterator);
-        result = _(array).uniqBy('a');
-        result = _(array).uniqBy({a: 42});
-
-        result = _(list).uniqBy<SampleObject>(listIterator);
-        result = _(list).uniqBy<SampleObject>('a');
-        result = _(list).uniqBy<SampleObject>({a: 42});
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<string>;
-
-        result = _('abc').chain().uniqBy(stringIterator);
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<SampleObject>;
-
-        result = _(array).chain().uniqBy(listIterator);
-        result = _(array).chain().uniqBy('a');
-        result = _(array).chain().uniqBy({a: 42});
-
-        result = _(list).chain().uniqBy<SampleObject>(listIterator);
-        result = _(list).chain().uniqBy<SampleObject>('a');
-        result = _(list).chain().uniqBy<SampleObject>({a: 42});
-    }
-}
-
-// _.sortedUniq
-namespace TestSortedUniq {
-    type SampleObject = {a: number; b: string; c: boolean};
-
-    let array: SampleObject[] | null | undefined = [] as any;
-    let list: _.List<SampleObject> | null | undefined = [] as any;
-
-    {
-        let result: string[];
-        result = _.sortedUniq<string>('abc');
-    }
-
-    {
-        let result: SampleObject[];
-        result = _.sortedUniq<SampleObject>(array);
-        result = _.sortedUniq<SampleObject>(list);
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<string>;
-        result = _('abc').sortedUniq();
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<SampleObject>;
-        result = _(array).sortedUniq();
-        result = _(list).sortedUniq<SampleObject>();
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<string>;
-        result = _('abc').chain().sortedUniq();
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<SampleObject>;
-        result = _(array).chain().sortedUniq();
-        result = _(list).chain().sortedUniq<SampleObject>();
-    }
-}
-
 // _.sortedUniqBy
-namespace TestSortedUniqBy {
-    type SampleObject = {a: number; b: string; c: boolean};
+{
+    const list: _.List<AbcObject> | null | undefined = anything;
+    const stringIterator = (value: string, index: number, collection: string) => "";
+    const listIterator = (value: AbcObject, index: number, collection: _.List<AbcObject>) => 0;
+    const stringIterator2 = (value: string) => "";
+    const listIterator2 = (value: AbcObject) => 0;
 
-    let array: SampleObject[] | null | undefined = [] as any;
-    let list: _.List<SampleObject> | null | undefined = [] as any;
+    _.uniqBy("abc", stringIterator); // $ExpectType string[]
+    _.uniqBy(list, listIterator); // $ExpectType AbcObject[]
+    _.uniqBy(list, "a"); // $ExpectType AbcObject[]
+    _(list).uniqBy(listIterator); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).uniqBy("a"); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _.chain(list).uniqBy(listIterator); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).uniqBy("a"); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
 
-    let stringIterator = (value: string, index: number, collection: string) => "";
-    let listIterator = (value: SampleObject, index: number, collection: _.List<SampleObject>) => 0;
+    fp.uniqBy(stringIterator2, "abc"); // $ExpectType string[]
+    fp.uniqBy(listIterator2, list); // $ExpectType AbcObject[]
+    fp.uniqBy(listIterator2)(list); // $ExpectType AbcObject[]
+    fp.uniqBy("a", list); // $ExpectType AbcObject[]
 
-    {
-        let result: string[];
+    _.sortedUniqBy("abc", stringIterator); // $ExpectType string[]
+    _.sortedUniqBy(list, listIterator); // $ExpectType AbcObject[]
+    _.sortedUniqBy(list, "a"); // $ExpectType AbcObject[]
+    _(list).sortedUniqBy(listIterator); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).sortedUniqBy("a"); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _.chain(list).sortedUniqBy(listIterator); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).sortedUniqBy("a"); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
 
-        result = _.sortedUniqBy('abc', stringIterator);
-    }
-
-    {
-        let result: SampleObject[];
-
-        result = _.sortedUniqBy<SampleObject>(array, listIterator);
-        result = _.sortedUniqBy<SampleObject>(array, 'a');
-        result = _.sortedUniqBy<SampleObject>(array, {a: 42});
-
-        result = _.sortedUniqBy<SampleObject>(list, listIterator);
-        result = _.sortedUniqBy<SampleObject>(list, 'a');
-        result = _.sortedUniqBy<SampleObject>(list, {a: 42});
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<string>;
-
-        result = _('abc').sortedUniqBy(stringIterator);
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<SampleObject>;
-
-        result = _(array).sortedUniqBy(listIterator);
-        result = _(array).sortedUniqBy('a');
-        result = _(array).sortedUniqBy({a: 42});
-
-        result = _(list).sortedUniqBy<SampleObject>(listIterator);
-        result = _(list).sortedUniqBy<SampleObject>('a');
-        result = _(list).sortedUniqBy<SampleObject>({a: 42});
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<string>;
-
-        result = _('abc').chain().sortedUniqBy(stringIterator);
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<SampleObject>;
-
-        result = _(array).chain().sortedUniqBy(listIterator);
-        result = _(array).chain().sortedUniqBy('a');
-        result = _(array).chain().sortedUniqBy({a: 42});
-
-        result = _(list).chain().sortedUniqBy<SampleObject>(listIterator);
-        result = _(list).chain().sortedUniqBy<SampleObject>('a');
-        result = _(list).chain().sortedUniqBy<SampleObject>({a: 42});
-    }
+    fp.sortedUniqBy(stringIterator2, "abc"); // $ExpectType string[]
+    fp.sortedUniqBy(listIterator2, list); // $ExpectType AbcObject[]
+    fp.sortedUniqBy(listIterator2)(list); // $ExpectType AbcObject[]
+    fp.sortedUniqBy("a", list); // $ExpectType AbcObject[]
 }
 
 // _.unzip
-namespace TestUnzip {
-    let array = [['a', 'b'], [1, 2], [true, false]];
+{
+    const list: _.List<_.List<AbcObject>> | null | undefined = anything;
 
-    let list: _.List<_.List<string|number|boolean>> = {
-        0: {0: 'a', 1: 'b', length: 2},
-        1: {0: 1, 1: 2, length: 2},
-        2: {0: true, 1: false, length: 2},
-        length: 3
-    };
-    let nilArray: AbcObject[][] | null | undefined = [] as any;
-    let nilList: _.List<_.List<AbcObject>> | null | undefined = [] as any;
-
-    {
-        let result: AbcObject[][];
-
-        result = _.unzip(nilArray);
-        result = _.unzip(nilList);
-    }
-
-    {
-        let result: Array<Array<string|number|boolean>>;
-
-        result = _.unzip<string|number|boolean>(array);
-        result = _.unzip<string|number|boolean>(list);
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<Array<string|number|boolean>>;
-
-        result = _(array).unzip<string|number|boolean>();
-        result = _(list).unzip<string|number|boolean>();
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<Array<string|number|boolean>>;
-
-        result = _(array).chain().unzip<string|number|boolean>();
-        result = _(list).chain().unzip<string|number|boolean>();
-    }
+    _.unzip(list); // $ExpectType AbcObject[][]
+    _(list).unzip(); // $ExpectType LoDashImplicitWrapper<AbcObject[][]>
+    _.chain(list).unzip(); // $ExpectType LoDashExplicitWrapper<AbcObject[][]>
+    fp.unzip(list); // $ExpectType AbcObject[][]
 }
 
 // _.unzipWith
 {
-    let testUnzipWithArray: Array<number[]|_.List<number>> | null | undefined = [] as any;
-    let testUnzipWithList: _.List<number[]|_.List<number>> | null | undefined = [] as any;
+    const list: _.List<_.List<AbcObject>> | null | undefined = anything;
 
-    {
-        _.unzipWith(testUnzipWithArray); // $ExpectType number[][]
-        _.unzipWith(testUnzipWithList); // $ExpectType number[][]
-        _(testUnzipWithArray).unzipWith(); // $ExpectType LoDashImplicitWrapper<number[][]>
-        _(testUnzipWithList).unzipWith(); // $ExpectType LoDashImplicitWrapper<number[][]>
-        _.chain(testUnzipWithArray).unzipWith(); // $ExpectType LoDashExplicitWrapper<number[][]>
-        _.chain(testUnzipWithList).unzipWith(); // $ExpectType LoDashExplicitWrapper<number[][]>
-    }
+    _.unzipWith(list); // $ExpectType AbcObject[][]
+    // $ExpectType number[]
+    _.unzipWith(list, (...group) => {
+        group; // $ExpectType AbcObject[]
+        return 1;
+    });
+    // $ExpectType boolean[]
+    _.unzipWith(list, (value1, value2, value3) => {
+        value1; // $ExpectType AbcObject
+        value2; // $ExpectType AbcObject
+        value3; // $ExpectType AbcObject
+        return true;
+    });
+    _(list).unzipWith(); // $ExpectType LoDashImplicitWrapper<AbcObject[][]>
+    // $ExpectType LoDashImplicitWrapper<number[]>
+    _(list).unzipWith((...group) => {
+        group; // $ExpectType AbcObject[]
+        return 1;
+    });
+    _.chain(list).unzipWith(); // $ExpectType LoDashExplicitWrapper<AbcObject[][]>
+    // $ExpectType LoDashExplicitWrapper<number[]>
+    _.chain(list).unzipWith((...group) => {
+        group; // $ExpectType AbcObject[]
+        return 1;
+    });
 
-    {
-        let result: AbcObject[];
-        result = _.unzipWith(testUnzipWithArray, (...group) => {
-            group; // $ExpectType number[]
-            return anything as AbcObject;
-        });
-        result = _.unzipWith(testUnzipWithArray, (value1, value2, value3) => {
-            value1; // $ExpectType number
-            value2; // $ExpectType number
-            value3; // $ExpectType number
-            return anything as AbcObject;
-        });
-        result = _.unzipWith(testUnzipWithList, (...group) => {
-            group; // $ExpectType number[]
-            return anything as AbcObject;
-        });
-        result = _.unzipWith(testUnzipWithList, (value1, value2, value3) => {
-            value1; // $ExpectType number
-            value2; // $ExpectType number
-            value3; // $ExpectType number
-            return anything as AbcObject;
-        });
-
-        result = _(testUnzipWithArray).unzipWith((...group): AbcObject => {
-            group; // $ExpectType number[]
-            return anything as AbcObject;
-        }).value();
-        result = _(testUnzipWithArray).unzipWith((value1, value2, value3) => {
-            value1; // $ExpectType number
-            value2; // $ExpectType number
-            value3; // $ExpectType number
-            return anything as AbcObject;
-        }).value();
-        result = _(testUnzipWithList).unzipWith((...group): AbcObject => {
-            group; // $ExpectType number[]
-            return anything as AbcObject;
-        }).value();
-        result = _(testUnzipWithList).unzipWith((value1, value2, value3) => {
-            value1; // $ExpectType number
-            value2; // $ExpectType number
-            value3; // $ExpectType number
-            return anything as AbcObject;
-        }).value();
-    }
+    fp.unzipWith((...group: AbcObject[]) => 1, list); // $ExpectType number[]
+    fp.unzipWith((...group: AbcObject[]) => 1)(list); // $ExpectType number[]
 }
 
 // _.without
-namespace TestWithout {
-    let array: number[] | null | undefined = [] as any;
-    let list: _.List<number> | null | undefined = [] as any;
+{
+    const list: _.List<number> | null | undefined = anything;
 
-    {
-        let result: number[];
+    _.without(list); // $ExpectType number[]
+    _.without(list, 1); // $ExpectType number[]
+    _.without(list, 1, 2, 3); // $ExpectType number[]
 
-        result = _.without<number>(array);
-        result = _.without<number>(array, 1);
-        result = _.without<number>(array, 1, 2);
-        result = _.without<number>(array, 1, 2, 3);
+    _(list).without(); // $ExpectType LoDashImplicitWrapper<number[]>
+    _(list).without(1); // $ExpectType LoDashImplicitWrapper<number[]>
+    _(list).without(1, 2, 3); // $ExpectType LoDashImplicitWrapper<number[]>
 
-        result = _.without<number>(list);
-        result = _.without<number>(list, 1);
-        result = _.without<number>(list, 1, 2);
-        result = _.without<number>(list, 1, 2, 3);
-    }
+    _.chain(list).without(); // $ExpectType LoDashExplicitWrapper<number[]>
+    _.chain(list).without(1); // $ExpectType LoDashExplicitWrapper<number[]>
+    _.chain(list).without(1, 2, 3); // $ExpectType LoDashExplicitWrapper<number[]>
 
-    {
-        let result: _.LoDashImplicitArrayWrapper<number>;
-
-        result = _(array).without();
-        result = _(array).without(1);
-        result = _(array).without(1, 2);
-        result = _(array).without(1, 2, 3);
-        result = _(list).without<number>();
-        result = _(list).without<number>(1);
-        result = _(list).without<number>(1, 2);
-        result = _(list).without<number>(1, 2, 3);
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<number>;
-
-        result = _(array).chain().without();
-        result = _(array).chain().without(1);
-        result = _(array).chain().without(1, 2);
-        result = _(array).chain().without(1, 2, 3);
-
-        result = _(list).chain().without<number>();
-        result = _(list).chain().without<number>(1);
-        result = _(list).chain().without<number>(1, 2);
-        result = _(list).chain().without<number>(1, 2, 3);
-    }
+    fp.without([1, 2], list);
+    fp.without([1, 2])(list);
 }
 
 // _.xor
-namespace TestXor {
-    let array: AbcObject[] | null | undefined = [] as any;
-    let list: _.List<AbcObject> | null | undefined = [] as any;
+{
+    const list: _.List<AbcObject> | null | undefined = anything;
 
-    {
-        let result: AbcObject[];
+    _.xor(list); // $ExpectType AbcObject[]
+    _.xor(list, list); // $ExpectType AbcObject[]
+    _.xor(list, list, list); // $ExpectType AbcObject[]
 
-        // $ExpectType {}[]
-        _.xor();
+    _(list).xor(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).xor(list); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).xor(list, list); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
 
-        result = _.xor(array);
-        result = _.xor(array, list);
-        result = _.xor(array, list, array);
+    _.chain(list).xor(); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).xor(list); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).xor(list, list); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
 
-        result = _.xor(list);
-        result = _.xor(list, array);
-        result = _.xor(list, array, list);
-    }
+    fp.xor(list, list); // $ExpectType AbcObject[]
+    fp.xor(list)(list); // $ExpectType AbcObject[]
+}
 
-    {
-        let result: _.LoDashImplicitArrayWrapper<AbcObject>;
+// _.xorBy
+{
+    const list: _.List<AbcObject> | null | undefined = anything;
+    const iteratee = (value: AbcObject) => 1;
 
-        result = _(array).xor();
-        result = _(array).xor(list);
-        result = _(array).xor(list, array);
+    _.xorBy(list, list); // $ExpectType AbcObject[]
+    _.xorBy(list, list, list, list, list, list); // $ExpectType AbcObject[]
+    _.xorBy(list, list, iteratee); // $ExpectType AbcObject[]
+    _.xorBy(list, list, list, list, list, list, iteratee); // $ExpectType AbcObject[]
+    _.xorBy(list, list, "a"); // $ExpectType AbcObject[]
+    // <AbcObject> param needed for TS 2.3
+    _.xorBy<AbcObject>(list, list, list, list, list, list, "a"); // $ExpectType AbcObject[]
+    _.xorBy(list, list, {a: 1}); // $ExpectType AbcObject[]
+    _.xorBy(list, list, list, list, list, list, {a: 1}); // $ExpectType AbcObject[]
 
-        result = _(list).xor();
-        result = _(list).xor(array);
-        result = _(list).xor(array, list);
-    }
+    _(list).xorBy(list); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).xorBy(list, list, list, list, list); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).xorBy(list, iteratee); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).xorBy(list, list, list, list, list, iteratee); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).xorBy(list, "a"); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    // <AbcObject> param needed for TS 2.3
+    _(list).xorBy<AbcObject>(list, list, list, list, list, "a"); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).xorBy(list, {a: 1}); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).xorBy(list, list, list, list, list, {a: 1}); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
 
-    {
-        let result: _.LoDashExplicitArrayWrapper<AbcObject>;
+    _.chain(list).xorBy(list); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).xorBy(list, list, list, list, list); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).xorBy(list, iteratee); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).xorBy(list, list, list, list, list, iteratee); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).xorBy(list, "a"); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    // <AbcObject> param needed for TS 2.3
+    _.chain(list).xorBy<AbcObject>(list, list, list, list, list, "a"); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).xorBy(list, {a: 1}); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).xorBy(list, list, list, list, list, {a: 1}); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
 
-        result = _(array).chain().xor();
-        result = _(array).chain().xor(list);
-        result = _(array).chain().xor(list, array);
-
-        result = _(list).chain().xor();
-        result = _(list).chain().xor(array);
-        result = _(list).chain().xor(array, list);
-    }
+    fp.xorBy(iteratee, list, list); // $ExpectType AbcObject[]
+    fp.xorBy(iteratee)(list)(list); // $ExpectType AbcObject[]
+    fp.xorBy("a", list, list); // $ExpectType AbcObject[]
+    fp.xorBy({ a: 1 }, list, list); // $ExpectType AbcObject[]
 }
 
 // _.zip
 {
-    let array: AbcObject[] | null | undefined = [] as any;
-    let list: _.List<AbcObject> | null | undefined = [] as any;
+    const list: _.List<AbcObject> | null | undefined = anything;
 
-    {
-        // $ExpectType (AbcObject | undefined)[][]
-        _.zip(array);
-        // $ExpectType (AbcObject | undefined)[][]
-        _.zip(array, list);
-        // $ExpectType (AbcObject | undefined)[][]
-        _.zip(array, list, array);
+    _.zip(list); // $ExpectType (AbcObject | undefined)[][]
+    _.zip(list, list); // $ExpectType (AbcObject | undefined)[][]
+    _.zip(list, list, list, list, list, list); // $ExpectType (AbcObject | undefined)[][]
+    _.zip([1, 2], [3, 4]); // $ExpectType [number | undefined, number | undefined][]
+    _.zip([1, 2], ["a", "b"]); // $ExpectType [number | undefined, string | undefined][]
+    _.zip([1, 2], ["a", "b"], [true, false]); // $ExpectType [number | undefined, string | undefined, boolean | undefined][]
 
-        // $ExpectType (AbcObject | undefined)[][]
-        _.zip(list);
-        // $ExpectType (AbcObject | undefined)[][]
-        _.zip(list, array);
-        // $ExpectType (AbcObject | undefined)[][]
-        _.zip(list, array, list);
+    _(list).zip(list); // $ExpectType LoDashImplicitWrapper<(AbcObject | undefined)[][]>
+    _(list).zip(list, list, list, list, list); // $ExpectType LoDashImplicitWrapper<(AbcObject | undefined)[][]>
 
-        // $ExpectType (AbcObject | undefined)[][]
-        _.zip(list, array, list, array, list, array);
-    }
+    _.chain(list).zip(list); // $ExpectType LoDashExplicitWrapper<(AbcObject | undefined)[][]>
+    _.chain(list).zip(list, list, list, list, list); // $ExpectType LoDashExplicitWrapper<(AbcObject | undefined)[][]>
 
-    {
-        // $ExpectType LoDashImplicitWrapper<(AbcObject | undefined)[][]>
-        _(array).zip(list);
-        // $ExpectType LoDashImplicitWrapper<(AbcObject | undefined)[][]>
-        _(array).zip(list, array);
-
-        // $ExpectType LoDashImplicitWrapper<(AbcObject | undefined)[][]>
-        _(list).zip(array);
-        // $ExpectType LoDashImplicitWrapper<(AbcObject | undefined)[][]>
-        _(list).zip(array, list);
-    }
-
-    {
-        // $ExpectType LoDashExplicitWrapper<(AbcObject | undefined)[][]>
-        _(array).chain().zip(list);
-        // $ExpectType LoDashExplicitWrapper<(AbcObject | undefined)[][]>
-        _(array).chain().zip(list, array);
-
-        // $ExpectType LoDashExplicitWrapper<(AbcObject | undefined)[][]>
-        _(list).chain().zip(array);
-        // $ExpectType LoDashExplicitWrapper<(AbcObject | undefined)[][]>
-        _(list).chain().zip(array, list);
-    }
-
-    {
-        _.zip([1, 2], [3, 4]); // $ExpectType [number | undefined, number | undefined][]
-        _.zip([1, 2], ["a", "b"]); // $ExpectType [number | undefined, string | undefined][]
-        _.zip([1, 2], ["a", "b"], [true, false]); // $ExpectType [number | undefined, string | undefined, boolean | undefined][]
-    }
+    const list2: _.List<AbcObject> = anything;
+    fp.zip(list2, list2); // $ExpectType [AbcObject | undefined, AbcObject | undefined][]
+    fp.zip(list2)(list2); // $ExpectType [AbcObject | undefined, AbcObject | undefined][]
+    fp.zip(["a", "b"], [1, 2]); // $ExpectType [string | undefined, number | undefined][]
+    fp.zipAll<AbcObject>([list2, list2, list2]); // $ExpectType (AbcObject | undefined)[][]
+    fp.zipAll<number | string | boolean>([[1, 2], ["a", "b"], [true, false]]); // $ExpectType (string | number | boolean | undefined)[][]
 }
 
 // _.zipObject
-namespace TestZipObject {
-    const zipObjectResult = _.zipObject(['a', 'b'], [1, 2]);
-    const zipObjectDeepResult = _.zipObjectDeep(['a.b[0].c', 'a.b[1].d'], [1, 2]);
+// _.zipObjectDeep
+{
+    const listOfKeys: _.List<string> = anything;
+    const listOfValues: _.List<boolean> = anything;
 
-    let arrayOfKeys: string[] = [];
-    let arrayOfValues: number[] = [];
+    _.zipObject(["a", "b"], [1, 2]); // $ExpectType Dictionary<number>
+    _.zipObject(listOfKeys, listOfValues); // $ExpectType Dictionary<boolean>
+     _(listOfKeys).zipObject(listOfValues); // $ExpectType LoDashImplicitWrapper<Dictionary<boolean>>
+     _.chain(listOfKeys).zipObject(listOfValues); // $ExpectType LoDashExplicitWrapper<Dictionary<boolean>>
+    fp.zipObject(["a", "b"], [1, 2]); // $ExpectType Dictionary<number>
+    fp.zipObject(listOfKeys)(listOfValues); // $ExpectType Dictionary<boolean>
 
-    let listOfKeys: _.List<string> = [];
-    let listOfValues: _.List<number> = [];
-
-    {
-        let result: _.Dictionary<void>;
-
-        result = _.zipObject(arrayOfKeys);
-        result = _.zipObject(listOfKeys);
-    }
-
-    {
-        let result: _.Dictionary<number>;
-
-        result = _.zipObject(arrayOfKeys, arrayOfValues);
-        result = _.zipObject(arrayOfKeys, listOfValues);
-        result = _.zipObject(listOfKeys, listOfValues);
-        result = _.zipObject(listOfKeys, arrayOfValues);
-
-        result = _.zipObject(arrayOfKeys, arrayOfValues);
-        result = _.zipObject(arrayOfKeys, listOfValues);
-        result = _.zipObject(listOfKeys, listOfValues);
-        result = _.zipObject(listOfKeys, arrayOfValues);
-    }
-
-    {
-        let result: _.Dictionary<any>;
-
-        result = _.zipObject(arrayOfKeys);
-        result = _.zipObjectDeep(arrayOfKeys);
-        result = _.zipObject(arrayOfKeys, arrayOfValues);
-        result = _.zipObjectDeep(arrayOfKeys, arrayOfValues);
-        result = _.zipObject(arrayOfKeys, listOfValues);
-        result = _.zipObjectDeep(arrayOfKeys, listOfValues);
-
-        result = _.zipObject(listOfKeys);
-        result = _.zipObjectDeep(listOfKeys);
-        result = _.zipObject(listOfKeys, listOfValues);
-        result = _.zipObjectDeep(listOfKeys, listOfValues);
-        result = _.zipObject(listOfKeys, arrayOfValues);
-        result = _.zipObjectDeep(listOfKeys, arrayOfValues);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<_.Dictionary<void>>;
-
-        result = _(arrayOfKeys).zipObject();
-        result = _(listOfKeys).zipObject();
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<_.Dictionary<number>>;
-
-        result = _(arrayOfKeys).zipObject(arrayOfValues);
-        result = _(arrayOfKeys).zipObject(listOfValues);
-        result = _(listOfKeys).zipObject(listOfValues);
-        result = _(listOfKeys).zipObject(arrayOfValues);
-
-        result = _(arrayOfKeys).zipObject(arrayOfValues);
-        result = _(arrayOfKeys).zipObject(listOfValues);
-        result = _(listOfKeys).zipObject(listOfValues);
-        result = _(listOfKeys).zipObject(arrayOfValues);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<_.Dictionary<any>>;
-
-        result = _(arrayOfKeys).zipObject();
-        result = _(arrayOfKeys).zipObjectDeep();
-        result = _(arrayOfKeys).zipObject(arrayOfValues);
-        result = _(arrayOfKeys).zipObjectDeep(arrayOfValues);
-        result = _(arrayOfKeys).zipObject(listOfValues);
-        result = _(arrayOfKeys).zipObjectDeep(listOfValues);
-
-        result = _(listOfKeys).zipObject();
-        result = _(listOfKeys).zipObjectDeep();
-        result = _(listOfKeys).zipObject(listOfValues);
-        result = _(listOfKeys).zipObjectDeep(listOfValues);
-        result = _(listOfKeys).zipObject(arrayOfValues);
-        result = _(listOfKeys).zipObjectDeep(arrayOfValues);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<_.Dictionary<void>>;
-
-        result = _(arrayOfKeys).chain().zipObject();
-        result = _(listOfKeys).chain().zipObject();
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<_.Dictionary<number>>;
-
-        result = _(arrayOfKeys).chain().zipObject(arrayOfValues);
-        result = _(arrayOfKeys).chain().zipObject(listOfValues);
-        result = _(listOfKeys).chain().zipObject(listOfValues);
-        result = _(listOfKeys).chain().zipObject(arrayOfValues);
-
-        result = _(arrayOfKeys).chain().zipObject(arrayOfValues);
-        result = _(arrayOfKeys).chain().zipObject(listOfValues);
-        result = _(listOfKeys).chain().zipObject(listOfValues);
-        result = _(listOfKeys).chain().zipObject(arrayOfValues);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<_.Dictionary<any>>;
-
-        result = _(arrayOfKeys).chain().zipObject();
-        result = _(arrayOfKeys).chain().zipObjectDeep();
-        result = _(arrayOfKeys).chain().zipObject(arrayOfValues);
-        result = _(arrayOfKeys).chain().zipObjectDeep(arrayOfValues);
-        result = _(arrayOfKeys).chain().zipObject(listOfValues);
-        result = _(arrayOfKeys).chain().zipObjectDeep(listOfValues);
-
-        result = _(listOfKeys).chain().zipObject();
-        result = _(listOfKeys).chain().zipObjectDeep();
-        result = _(listOfKeys).chain().zipObject(listOfValues);
-        result = _(listOfKeys).chain().zipObjectDeep(listOfValues);
-        result = _(listOfKeys).chain().zipObject(arrayOfValues);
-        result = _(listOfKeys).chain().zipObjectDeep(arrayOfValues);
-    }
+    _.zipObjectDeep(["a.b[0].c", "a.b[1].d"], [1, 2]); // $ExpectType object
+    _.zipObjectDeep(listOfKeys, listOfValues); // $ExpectType object
+    _(listOfKeys).zipObjectDeep(listOfValues); // $ExpectType LoDashImplicitWrapper<object>
+    _.chain(listOfKeys).zipObjectDeep(listOfValues); // $ExpectType LoDashExplicitWrapper<object>
+    fp.zipObjectDeep(["a.b[0].c", "a.b[1].d"], [1, 2]); // $ExpectType object
+    fp.zipObjectDeep(listOfKeys)(listOfValues); // $ExpectType object
 }
 
 // _.zipWith
 {
-    type TestZipWithFn = (a1: number, a2: number) => number;
-
-    {
-        let result: number[];
-
-        result = _.zipWith([1, 2], (value1) => {
-            value1; // $ExpectType number
-            return 1;
-        });
-        result = _.zipWith([1, 2], [1, 2], (value1, value2) => {
-            value1; // $ExpectType number
-            value2; // $ExpectType number
-            return 1;
-        });
-        result = _.zipWith([1, 2], [1, 2], [1, 2], (value1, value2, value3) => {
-            value1; // $ExpectType number
-            value2; // $ExpectType number
-            value3; // $ExpectType number
-            return 1;
-        });
-        result = _.zipWith([1, 2], [1, 2], [1, 2], [1, 2], (value1, value2, value3, value4) => {
-            value1; // $ExpectType number
-            value2; // $ExpectType number
-            value3; // $ExpectType number
-            value4; // $ExpectType number
-            return 1;
-        });
-        result = _.zipWith([1, 2], [1, 2], [1, 2], [1, 2], [1, 2], (value1, value2, value3, value4, value5) => {
-            value1; // $ExpectType number
-            value2; // $ExpectType number
-            value3; // $ExpectType number
-            value4; // $ExpectType number
-            value5; // $ExpectType number
-            return 1;
-        });
-        result = _.zipWith([1, 2], [1, 2], [1, 2], [1, 2], [1, 2], [1, 2], (value1, value2, value3, value4, value5, value6) => {
-            value1; // $ExpectType number
-            value2; // $ExpectType number
-            value3; // $ExpectType number
-            value4; // $ExpectType number
-            value5; // $ExpectType number
-            value6; // $ExpectType number
-            return 1;
-        });
-        result = _.zipWith([1, 2], [1, 2], [1, 2], (...group: number[]) => 1);
-        result = _.zipWith([1, 2], [1, 2], [1, 2], [1, 2], [1, 2], [1, 2], (...group) => {
-            group; // $ExpectType number[]
-            return 1;
-        });
-
-        let mat = [[1, 2], [1, 2], [1, 2]];
-        result = _.zipWith(...mat, (...group: number[]) => 1);
-
-        result = _([1, 2]).zipWith((value1) => {
-            value1; // $ExpectType number
-            return 1;
-        }).value();
-        result = _([1, 2]).zipWith([1, 2], (value1, value2) => {
-            value1; // $ExpectType number
-            value2; // $ExpectType number
-            return 1;
-        }).value();
-        result = _([1, 2]).zipWith([1, 2], [1, 2], (value1, value2, value3) => {
-            value1; // $ExpectType number
-            value2; // $ExpectType number
-            value3; // $ExpectType number
-            return 1;
-        }).value();
-        result = _([1, 2]).zipWith([1, 2], [1, 2], [1, 2], (value1, value2, value3, value4) => {
-            value1; // $ExpectType number
-            value2; // $ExpectType number
-            value3; // $ExpectType number
-            value4; // $ExpectType number
-            return 1;
-        }).value();
-        result = _([1, 2]).zipWith([1, 2], [1, 2], [1, 2], [1, 2], (value1, value2, value3, value4, value5) => {
-            value1; // $ExpectType number
-            value2; // $ExpectType number
-            value3; // $ExpectType number
-            value4; // $ExpectType number
-            value5; // $ExpectType number
-            return 1;
-        }).value();
-        result = _([1, 2]).zipWith([1, 2], [1, 2], [1, 2], [1, 2], [1, 2], (value1, value2, value3, value4, value5, value6) => {
-            value1; // $ExpectType number
-            value2; // $ExpectType number
-            value3; // $ExpectType number
-            value4; // $ExpectType number
-            value5; // $ExpectType number
-            value6; // $ExpectType number
-            return 1;
-        }).value();
-        result = _([1, 2]).zipWith([1, 2], [1, 2], (...group: number[]) => 1).value();
-        result = _([1, 2]).zipWith([1, 2], [1, 2], [1, 2], [1, 2], [1, 2], (...group) => {
-            group; // $ExpectType number[]
-            return 1;
-        }).value();
-
-        result = _.chain([1, 2]).zipWith((value1) => {
-            value1; // $ExpectType number
-            return 1;
-        }).value();
-        result = _.chain([1, 2]).zipWith([1, 2], (value1, value2) => {
-            value1; // $ExpectType number
-            value2; // $ExpectType number
-            return 1;
-        }).value();
-        result = _.chain([1, 2]).zipWith([1, 2], [1, 2], (value1, value2, value3) => {
-            value1; // $ExpectType number
-            value2; // $ExpectType number
-            value3; // $ExpectType number
-            return 1;
-        }).value();
-        result = _.chain([1, 2]).zipWith([1, 2], [1, 2], [1, 2], (value1, value2, value3, value4) => {
-            value1; // $ExpectType number
-            value2; // $ExpectType number
-            value3; // $ExpectType number
-            value4; // $ExpectType number
-            return 1;
-        }).value();
-        result = _.chain([1, 2]).zipWith([1, 2], [1, 2], [1, 2], [1, 2], (value1, value2, value3, value4, value5) => {
-            value1; // $ExpectType number
-            value2; // $ExpectType number
-            value3; // $ExpectType number
-            value4; // $ExpectType number
-            value5; // $ExpectType number
-            return 1;
-        }).value();
-        result = _.chain([1, 2]).zipWith([1, 2], [1, 2], [1, 2], [1, 2], [1, 2], (value1, value2, value3, value4, value5, value6) => {
-            value1; // $ExpectType number
-            value2; // $ExpectType number
-            value3; // $ExpectType number
-            value4; // $ExpectType number
-            value5; // $ExpectType number
-            value6; // $ExpectType number
-            return 1;
-        }).value();
-        result = _.chain([1, 2]).zipWith([1, 2], [1, 2], (...group: number[]) => 1).value();
-        result = _.chain([1, 2]).zipWith([1, 2], [1, 2], [1, 2], [1, 2], [1, 2], (...group) => {
-            group; // $ExpectType number[]
-            return 1;
-        }).value();
-
-        result = _([1, 2]).zipWith(["a", "b"], (value1, value2) => {
-            value1; // $ExpectType number
-            value2; // $ExpectType string
-            return 1;
-        }).value();
-
-        result = _([1, 2]).zipWith(["a", "b"], [true, false], (value1, value2, value3) => {
-            value1; // $ExpectType number
-            value2; // $ExpectType string
-            value3; // $ExpectType boolean
-            return 1;
-        }).value();
-    }
-}
-
-/*********
- * Chain *
- *********/
-
-// _.chain
-namespace TestChain {
-    {
-        let result: _.LoDashExplicitWrapper<string>;
-
-        result = _.chain('');
-        result = _('').chain();
-
-        result = _.chain('').chain();
-        result = _('').chain().chain();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<number>;
-
-        result = _.chain(42);
-        result = _(42).chain();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _.chain(true);
-        result = _(true).chain();
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<string>;
-
-        result = _.chain(['']);
-        result = _(['']).chain();
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<{a: string}>;
-
-        result = _.chain<{a: string}>({a: ''});
-        result = _<{a: string}>({a: ''}).chain();
-    }
-}
-
-// _.tap
-namespace TestTap {
-    {
-        let interceptor = (value: string) => {};
-        let result: string;
-
-        _.tap('', interceptor);
-    }
-
-    {
-        let interceptor = (value: string[]) => {};
-        let result: _.LoDashImplicitArrayWrapper<string>;
-
-        _.tap([''], interceptor);
-    }
-
-    {
-        let interceptor = (value: {a: string}) => {};
-        let result: _.LoDashImplicitObjectWrapper<{a: string}>;
-
-        _.tap({a: ''}, interceptor);
-    }
-
-    {
-        let interceptor = (value: string) => {};
-        let result: _.LoDashImplicitWrapper<string>;
-
-        _.chain('').tap(interceptor);
-
-        _('').tap(interceptor);
-    }
-
-    {
-        let interceptor = (value: string[]) => {};
-        let result: _.LoDashImplicitArrayWrapper<string>;
-
-        _.chain(['']).tap(interceptor);
-
-        _(['']).tap(interceptor);
-    }
-
-    {
-        let interceptor = (value: {a: string}) => {};
-        let result: _.LoDashImplicitWrapper<{a: string}>;
-
-        _.chain({a: ''}).tap(interceptor);
-
-        _({a: ''}).tap(interceptor);
-    }
-
-    {
-        let interceptor = (value: string) => {};
-        let result: _.LoDashExplicitWrapper<string>;
-
-        _.chain('').tap(interceptor);
-
-        _('').chain().tap(interceptor);
-    }
-
-    {
-        let interceptor = (value: string[]) => {};
-        let result: _.LoDashExplicitArrayWrapper<string>;
-
-        _.chain(['']).tap(interceptor);
-
-        _(['']).chain().tap(interceptor);
-    }
-
-    {
-        let interceptor = (value: {a: string}) => {};
-        let result: _.LoDashExplicitWrapper<{a: string}>;
-
-        _.chain({a: ''}).tap(interceptor);
-
-        _({a: ''}).chain().tap(interceptor);
-    }
-}
-
-// _.thru
-namespace TestThru {
-    type Interceptor<T> = (value: T) => T;
-
-    {
-        let interceptor: Interceptor<number> = (x) => x;
-        let result: number;
-
-        result = _.thru<number, number>(1, interceptor);
-    }
-
-    {
-        let interceptor: Interceptor<number> = (x) => x;
-        let result: _.LoDashImplicitWrapper<number>;
-
-        result = _(1).thru<number>(interceptor);
-    }
-
-    {
-        let interceptor: Interceptor<string> = (x) => x;
-        let result: _.LoDashImplicitWrapper<string>;
-
-        result = _('').thru<string>(interceptor);
-    }
-
-    {
-        let interceptor: Interceptor<boolean> = (x) => x;
-        let result: _.LoDashImplicitWrapper<boolean>;
-
-        result = _(true).thru<boolean>(interceptor);
-    }
-
-    {
-        let interceptor: Interceptor<{a: string}> = (x) => x;
-        let result: _.LoDashImplicitObjectWrapper<{a: string}>;
-
-        result = _({a: ''}).thru<{a: string}>(interceptor);
-    }
-
-    {
-        let interceptor: Interceptor<number[]> = (x) => x;
-        let result: _.LoDashImplicitArrayWrapper<number>;
-
-        result = _([1, 2, 3]).thru(interceptor);
-    }
-
-    {
-        let interceptor: Interceptor<number> = (x) => x;
-        let result: _.LoDashExplicitWrapper<number>;
-
-        result = _(1).chain().thru<number>(interceptor);
-    }
-
-    {
-        let interceptor: Interceptor<string> = (x) => x;
-        let result: _.LoDashExplicitWrapper<string>;
-
-        result = _('').chain().thru<string>(interceptor);
-    }
-
-    {
-        let interceptor: Interceptor<boolean> = (x) => x;
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _(true).chain().thru<boolean>(interceptor);
-    }
-
-    {
-        let interceptor: Interceptor<{a: string}> = (x) => x;
-        let result: _.LoDashExplicitObjectWrapper<{a: string}>;
-
-        result = _({a: ''}).chain().thru<{a: string}>(interceptor);
-    }
-
-    {
-        let interceptor: Interceptor<number[]> = (x) => x;
-        let result: _.LoDashExplicitArrayWrapper<number>;
-
-        result = _([1, 2, 3]).chain().thru(interceptor);
-    }
-}
-
-// _.prototype.commit
-namespace TestCommit {
-    {
-        let result: _.LoDashImplicitWrapper<number>;
-        result = _(42).commit();
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<any>;
-        result = _<any>([]).commit();
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<any>;
-        result = _({}).commit();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<number>;
-        result = _(42).chain().commit();
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<any>;
-        result = _<any>([]).chain().commit();
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<any>;
-        result = _({}).chain().commit();
-    }
-}
-
-// _.prototype.concat
-namespace TestConcat {
-    const numberROA: number[] = [0]; // TODO: Should be ReadonlyArray, but see comment on type Many<T>
-
-    _.concat(1); // $ExpectType number[]
-    _.concat([1]); // $ExpectType number[]
-    _.concat(numberROA); // $ExpectType number[]
-    _.concat(1, 2); // $ExpectType number[]
-    _.concat(1, [1]); // $ExpectType number[]
-    _.concat(1, [1], numberROA); // $ExpectType number[]
-
-    _(1).concat(2); // $ExpectType LoDashImplicitWrapper<number[]>
-    _(1).concat([1]); // $ExpectType LoDashImplicitWrapper<number[]>
-    _(1).concat([2], numberROA); // $ExpectType LoDashImplicitWrapper<number[]>
-    _([1]).concat(2); // $ExpectType LoDashImplicitWrapper<number[]>
-    _(numberROA).concat(numberROA); // $ExpectType LoDashImplicitWrapper<number[]>
-    _(numberROA).concat(numberROA, numberROA); // $ExpectType LoDashImplicitWrapper<number[]>
-
-    _.chain(1).concat(2); // $ExpectType LoDashExplicitWrapper<number[]>
-    _.chain(1).concat([1]); // $ExpectType LoDashExplicitWrapper<number[]>
-    _.chain(1).concat([2], numberROA); // $ExpectType LoDashExplicitWrapper<number[]>
-    _.chain([1]).concat(2); // $ExpectType LoDashExplicitWrapper<number[]>
-    _.chain(numberROA).concat(numberROA); // $ExpectType LoDashExplicitWrapper<number[]>
-    _.chain(numberROA).concat(numberROA, numberROA); // $ExpectType LoDashExplicitWrapper<number[]>
-
-    const stringROA: string[] = ['']; // TODO: Should be ReadonlyArray, but see comment on type Many<T>
-
-    _.concat('a'); // $ExpectType string[]
-    _.concat(['a']); // $ExpectType string[]
-    _.concat(stringROA); // $ExpectType string[]
-    _.concat('a', 'b'); // $ExpectType string[]
-    _.concat('a', ['a']); // $ExpectType string[]
-    _.concat('a', ['a'], stringROA); // $ExpectType string[]
-
-    _('a').concat('b'); // $ExpectType LoDashImplicitWrapper<string[]>
-    _('a').concat(['a']); // $ExpectType LoDashImplicitWrapper<string[]>
-    _('a').concat(['b'], stringROA); // $ExpectType LoDashImplicitWrapper<string[]>
-    _(['a']).concat('b'); // $ExpectType LoDashImplicitWrapper<string[]>
-    _(stringROA).concat(stringROA); // $ExpectType LoDashImplicitWrapper<string[]>
-    _(stringROA).concat(stringROA, stringROA); // $ExpectType LoDashImplicitWrapper<string[]>
-
-    _.chain('a').concat('b'); // $ExpectType LoDashExplicitWrapper<string[]>
-    _.chain('a').concat(['a']); // $ExpectType LoDashExplicitWrapper<string[]>
-    _.chain('a').concat(['b'], stringROA); // $ExpectType LoDashExplicitWrapper<string[]>
-    _.chain(['a']).concat('b'); // $ExpectType LoDashExplicitWrapper<string[]>
-    _.chain(stringROA).concat(stringROA); // $ExpectType LoDashExplicitWrapper<string[]>
-    _.chain(stringROA).concat(stringROA, stringROA); // $ExpectType LoDashExplicitWrapper<string[]>
-
-    const abcObject: AbcObject = { a: 1, b: 'foo', c: true };
-    const objectROA: AbcObject[] = [{ a: 1, b: 'foo', c: true }]; // TODO: Should be ReadonlyArray, but see comment on type Many<T>
-
-    _.concat(abcObject); // $ExpectType AbcObject[]
-    _.concat([abcObject]); // $ExpectType AbcObject[]
-    _.concat(objectROA); // $ExpectType AbcObject[]
-    _.concat(abcObject, abcObject); // $ExpectType AbcObject[]
-    _.concat(abcObject, [abcObject]); // $ExpectType AbcObject[]
-    _.concat(abcObject, [abcObject], objectROA); // $ExpectType AbcObject[]
-
-    _(abcObject).concat(abcObject); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-    _(abcObject).concat([abcObject]); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-    _(abcObject).concat([abcObject], objectROA); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-    _([abcObject]).concat(abcObject); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-    _(objectROA).concat(objectROA); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-    _(objectROA).concat(objectROA, objectROA); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-
-    _.chain(abcObject).concat(abcObject); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-    _.chain(abcObject).concat([abcObject]); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-    _.chain(abcObject).concat([abcObject], objectROA); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-    _.chain([abcObject]).concat(abcObject); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-    _.chain(objectROA).concat(objectROA); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-    _.chain(objectROA).concat(objectROA, objectROA); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-}
-
-// _.prototype.plant
-namespace TestPlant {
-    {
-        let result: _.LoDashImplicitWrapper<number>;
-        result = _(anything).plant(42);
-    }
-
-    {
-        let result: _.LoDashImplicitStringWrapper;
-        result = _(anything).plant('');
-    }
-
-    {
-        let result: _.LoDashImplicitWrapper<boolean>;
-        result = _(anything).plant(true);
-    }
-
-    {
-        let result: _.LoDashImplicitNumberArrayWrapper;
-        result = _(anything).plant([42]);
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<any>;
-        result = _(anything).plant<any>([]);
-    }
-
-    {
-        let result: _.LoDashImplicitWrapper<{}>;
-        result = _(anything).plant<{}>({});
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<number>;
-        result = _(anything).chain().plant(42);
-    }
-
-    {
-        let result: _.LoDashExplicitStringWrapper;
-        result = _(anything).chain().plant('');
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-        result = _(anything).chain().plant(true);
-    }
-
-    {
-        let result: _.LoDashExplicitNumberArrayWrapper;
-        result = _(anything).chain().plant([42]);
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<any>;
-        result = _(anything).chain().plant<any>([]);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<{}>;
-        result = _(anything).chain().plant<{}>({});
-    }
-}
-
-// _.prototype.reverse
-namespace TestReverse {
-    {
-        let result: _.LoDashImplicitArrayWrapper<number>;
-        result = _([42]).reverse();
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<number>;
-        result = _([42]).chain().reverse();
-    }
-}
-
-// _.prototype.toJSON
-namespace TestToJSON {
-    {
-        let result: string;
-
-        result = _('').toJSON();
-        result = _('').chain().toJSON();
-    }
-
-    {
-        let result: number;
-
-        result = _(42).toJSON();
-        result = _(42).chain().toJSON();
-    }
-
-    {
-        let result: boolean;
-
-        result = _(true).toJSON();
-        result = _(true).chain().toJSON();
-    }
-
-    {
-        let result: string[];
-
-        result = _(['']).toJSON();
-        result = _(['']).chain().toJSON();
-    }
-
-    {
-        let result: {a: string};
-
-        result = _({a: ''}).toJSON();
-        result = _({a: ''}).chain().toJSON();
-    }
-}
-
-// _.prototype.toString
-namespace TestToString {
-    let result: string;
-
-    result = _('').toString();
-    result = _(42).toString();
-    result = _(true).toString();
-    result = _(['']).toString();
-    result = _({}).toString();
-
-    result = _('').chain().toString();
-    result = _(42).chain().toString();
-    result = _(true).chain().toString();
-    result = _(['']).chain().toString();
-    result = _({}).chain().toString();
-}
-
-// _.prototype.value
-namespace TestValue {
-    {
-        let result: string;
-
-        result = _('').value();
-        result = _('').chain().value();
-    }
-
-    {
-        let result: number;
-
-        result = _(42).value();
-        result = _(42).chain().value();
-    }
-
-    {
-        let result: boolean;
-
-        result = _(true).value();
-        result = _(true).chain().value();
-    }
-
-    {
-        let result: string[];
-
-        result = _(['']).value();
-        result = _(['']).chain().value();
-    }
-
-    {
-        let result: {a: string};
-
-        result = _({a: ''}).value();
-        result = _({a: ''}).chain().value();
-    }
-}
-
-// _.prototype.valueOf
-namespace TestValueOf {
-    {
-        let result: string;
-
-        result = _('').valueOf();
-        result = _('').chain().valueOf();
-    }
-
-    {
-        let result: number;
-
-        result = _(42).valueOf();
-        result = _(42).chain().valueOf();
-    }
-
-    {
-        let result: boolean;
-
-        result = _(true).valueOf();
-        result = _(true).chain().valueOf();
-    }
-
-    {
-        let result: string[];
-
-        result = _(['']).valueOf();
-        result = _(['']).chain().valueOf();
-    }
-
-    {
-        let result: {a: string};
-
-        result = _({a: ''}).valueOf();
-        result = _({a: ''}).chain().valueOf();
-    }
+    // $ExpectType string[]
+    _.zipWith([1, 2], (value1) => {
+        value1; // $ExpectType number
+        return "";
+    });
+    // $ExpectType string[]
+    _.zipWith([1, 2], [1, 2], (value1, value2) => {
+        value1; // $ExpectType number
+        value2; // $ExpectType number
+        return "";
+    });
+    // $ExpectType string[]
+    _.zipWith([1, 2], [1, 2], [1, 2], [1, 2], [1, 2], [1, 2], (value1, value2, value3, value4, value5, value6) => {
+        value1; // $ExpectType number
+        value2; // $ExpectType number
+        value3; // $ExpectType number
+        value4; // $ExpectType number
+        value5; // $ExpectType number
+        value6; // $ExpectType number
+        return "";
+    });
+    // $ExpectType string[]
+    _.zipWith([1, 2], [1, 2], [1, 2], [1, 2], [1, 2], [1, 2], (...group) => {
+        group; // $ExpectType number[]
+        return "";
+    });
+    // $ExpectType string[]
+    _.zipWith([1, 2], ["a", "b"], [true, false], (value1, value2, value3) => {
+        value1; // $ExpectType number
+        value2; // $ExpectType string
+        value3; // $ExpectType boolean
+        return "";
+    });
+
+    const values = [[1, 2], [1, 2], [1, 2]];
+    _.zipWith(...values, (...group: number[]) => ""); // $ExpectType string[]
+
+    // $ExpectType LoDashImplicitWrapper<string[]>
+    _([1, 2]).zipWith((value1) => {
+        value1; // $ExpectType number
+        return "";
+    });
+    // $ExpectType LoDashImplicitWrapper<string[]>
+    _([1, 2]).zipWith([1, 2], (value1, value2) => {
+        value1; // $ExpectType number
+        value2; // $ExpectType number
+        return "";
+    });
+    // $ExpectType LoDashImplicitWrapper<string[]>
+    _([1, 2]).zipWith([1, 2], [1, 2], [1, 2], [1, 2], [1, 2], (...group) => {
+        group; // $ExpectType number[]
+        return "";
+    });
+    // $ExpectType LoDashImplicitWrapper<string[]>
+    _([1, 2]).zipWith(["a", "b"], [true, false], (value1, value2, value3) => {
+        value1; // $ExpectType number
+        value2; // $ExpectType string
+        value3; // $ExpectType boolean
+        return "";
+    });
+
+    // $ExpectType LoDashExplicitWrapper<string[]>
+    _.chain([1, 2]).zipWith((value1) => {
+        value1; // $ExpectType number
+        return "";
+    });
+    // $ExpectType LoDashExplicitWrapper<string[]>
+    _.chain([1, 2]).zipWith([1, 2], [1, 2], [1, 2], [1, 2], [1, 2], (...group) => {
+        group; // $ExpectType number[]
+        return "";
+    });
+    // $ExpectType LoDashExplicitWrapper<string[]>
+    _.chain([1, 2]).zipWith(["a", "b"], [true, false], (value1, value2, value3) => {
+        value1; // $ExpectType number
+        value2; // $ExpectType string
+        value3; // $ExpectType boolean
+        return "";
+    });
+
+    fp.zipWith((value1, value2) => "a", [1, 2], [1, 2]); // $ExpectType string[]
+    fp.zipWith((value1: number, value2: number) => "a")([1, 2])([1, 2]); // $ExpectType string[]
 }
 
 /**************
@@ -4066,1233 +1688,599 @@ namespace TestValueOf {
  **************/
 
 // _.at
-namespace TestAt {
-    let array: AbcObject[] | null | undefined = [] as any;
-    let list: _.List<AbcObject> | null | undefined = [] as any;
-    let dictionary: _.Dictionary<AbcObject> | null | undefined = anything;
-    let numericDictionary: _.NumericDictionary<AbcObject> | null | undefined = anything;
-    let abcObject: AbcObject | null | undefined = anything;
+{
+    const list: _.List<AbcObject> | null | undefined = anything;
+    const dictionary: _.Dictionary<AbcObject> | null | undefined = anything;
+    const numericDictionary: _.NumericDictionary<AbcObject> | null | undefined = anything;
+    const abcObject: AbcObject | null | undefined = anything;
 
-    {
-        let result: AbcObject[];
+    _.at(list, 0, "1", [2], ["3"], [4, "5"]); // $ExpectType AbcObject[]
+    _.at(numericDictionary, 0, "1", [2], ["3"], [4, "5"]); // $ExpectType AbcObject[]
+    _.at(dictionary, "a", ["b", "c"]); // $ExpectType AbcObject[]
+    _.at(abcObject, "a", ["b", "c"]); // $ExpectType (string | number | boolean)[]
 
-        result = _.at(array, 0, '1', [2], ['3'], [4, '5']);
-        result = _.at(list, 0, '1', [2], ['3'], [4, '5']);
-        result = _.at(dictionary, 0, '1', [2], ['3'], [4, '5']);
-        result = _.at(numericDictionary, 0, '1', [2], ['3'], [4, '5']);
-    }
+    _(list).at(0, "1", [2], ["3"], [4, "5"]); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(numericDictionary).at(0, "1", [2], ["3"], [4, "5"]); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(dictionary).at("a", ["b", "c"]); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(abcObject).at("a", ["b", "c"]); // $ExpectType LoDashImplicitWrapper<(string | number | boolean)[]>
 
-    {
-        let result: Array<AbcObject[keyof AbcObject]>;
+    _.chain(list).at(0, "1", [2], ["3"], [4, "5"]); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(numericDictionary).at(0, "1", [2], ["3"], [4, "5"]); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(dictionary).at("a", ["b", "c"]); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(abcObject).at("a", ["b", "c"]); // $ExpectType LoDashExplicitWrapper<(string | number | boolean)[]>
 
-        result = _.at(abcObject, 'a', ['b'], ['a', 'b']);
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<AbcObject>;
-
-        result = _(array).at(0, '1', [2], ['3'], [4, '5']);
-        result = _(list).at(0, '1', [2], ['3'], [4, '5']);
-        result = _(dictionary).at(0, '1', [2], ['3'], [4, '5']);
-        result = _(numericDictionary).at(0, '1', [2], ['3'], [4, '5']);
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<AbcObject[keyof AbcObject]>;
-
-        result = _(abcObject).at('a', ['b'], ['a', 'b']);
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<AbcObject>;
-
-        result = _(array).chain().at(0, '1', [2], ['3'], [4, '5']);
-        result = _(list).chain().at(0, '1', [2], ['3'], [4, '5']);
-        result = _(dictionary).chain().at(0, '1', [2], ['3'], [4, '5']);
-        result = _(numericDictionary).chain().at(0, '1', [2], ['3'], [4, '5']);
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<AbcObject[keyof AbcObject]>;
-
-        result = _(abcObject).chain().at('a', ['b'], ['a', 'b']);
-    }
+    fp.at(0, list); // $ExpectType AbcObject[]
+    fp.at(0)(list); // $ExpectType AbcObject[]
+    fp.at([0, "1"], list); // $ExpectType AbcObject[]
+    fp.at("a", abcObject); // $ExpectType (string | number | boolean)[]
 }
 
 // _.countBy
-namespace TestCountBy {
-    let array: AbcObject[] | null | undefined = [] as any;
-    let list: _.List<AbcObject> | null | undefined = [] as any;
-    let obj: any = {};
-    let dictionary: _.Dictionary<AbcObject> | null | undefined = obj;
-    let numericDictionary: _.NumericDictionary<AbcObject> | null | undefined = obj;
-
-    let stringIterator: (value: string, index: number, collection: string) => any = (value: string, index: number, collection: string) => 1;
-    let listIterator: (value: AbcObject, index: number, collection: _.List<AbcObject>) => any = (value: AbcObject, index: number, collection: _.List<AbcObject>) => 1;
-    let dictionaryIterator: (value: AbcObject, key: string, collection: _.Dictionary<AbcObject>) => any = (value: AbcObject, key: string, collection: _.Dictionary<AbcObject>) => 1;
-    let numericDictionaryIterator: (value: AbcObject, key: string, collection: _.NumericDictionary<AbcObject>) => any = (value: AbcObject, key: string, collection: _.NumericDictionary<AbcObject>) => 1;
-
-    {
-        let result: _.Dictionary<number>;
-
-        result = _.countBy('');
-        result = _.countBy('', stringIterator);
-
-        result = _.countBy(array);
-        result = _.countBy(array, listIterator);
-        result = _.countBy(array, '');
-        result = _.countBy(array, {a: 42});
-        result = _.countBy(array, {a: 42});
-
-        result = _.countBy(list);
-        result = _.countBy(list, listIterator);
-        result = _.countBy(list, '');
-        result = _.countBy(list, {a: 42});
-
-        result = _.countBy(dictionary);
-        result = _.countBy(dictionary, dictionaryIterator);
-        result = _.countBy(dictionary, '');
-        result = _.countBy(dictionary, {a: 42});
-
-        result = _.countBy(numericDictionary);
-        result = _.countBy(numericDictionary, numericDictionaryIterator);
-        result = _.countBy(numericDictionary, '');
-        result = _.countBy(numericDictionary, {a: 42});
-    }
-
-    {
-        let resutl: _.LoDashImplicitObjectWrapper<_.Dictionary<number>>;
-
-        result = _('').countBy();
-        result = _('').countBy(stringIterator);
-
-        result = _(array).countBy();
-        result = _(array).countBy(listIterator);
-        result = _(array).countBy('');
-        result = _(array).countBy<{a: number}>({a: 42});
-        result = _(array).countBy({a: 42});
-
-        result = _(list).countBy();
-        result = _(list).countBy(listIterator);
-        result = _(list).countBy('');
-        result = _(list).countBy<{a: number}>({a: 42});
-        result = _(list).countBy({a: 42});
-
-        result = _(dictionary).countBy();
-        result = _(dictionary).countBy(dictionaryIterator);
-        result = _(dictionary).countBy('');
-        result = _(dictionary).countBy({a: 42});
-
-        result = _(numericDictionary).countBy();
-        result = _(numericDictionary).countBy(numericDictionaryIterator);
-        result = _(numericDictionary).countBy('');
-        result = _(numericDictionary).countBy({a: 42});
-    }
-
-    {
-        let resutl: _.LoDashExplicitObjectWrapper<_.Dictionary<number>>;
-
-        result = _('').chain().countBy();
-        result = _('').chain().countBy(stringIterator);
-
-        result = _(array).chain().countBy();
-        result = _(array).chain().countBy(listIterator);
-        result = _(array).chain().countBy('');
-        result = _(array).chain().countBy({a: 42});
-
-        result = _(list).chain().countBy();
-        result = _(list).chain().countBy(listIterator);
-        result = _(list).chain().countBy('');
-        result = _(list).chain().countBy({a: 42});
-
-        result = _(dictionary).chain().countBy();
-        result = _(dictionary).chain().countBy(dictionaryIterator);
-        result = _(dictionary).chain().countBy('');
-        result = _(dictionary).chain().countBy({a: 42});
-
-        result = _(numericDictionary).chain().countBy();
-        result = _(numericDictionary).chain().countBy(numericDictionaryIterator);
-        result = _(numericDictionary).chain().countBy('');
-        result = _(numericDictionary).chain().countBy({a: 42});
-    }
-}
-
-// _.each
-namespace TestEach {
-    let array: AbcObject[] = [];
-    let list: _.List<AbcObject> = [];
-    let dictionary: _.Dictionary<AbcObject> = {};
-    let nilArray: AbcObject[] | null | undefined = [] as any;
-    let nilList: _.List<AbcObject> | null | undefined = [] as any;
-    let nilDictionary: _.Dictionary<AbcObject> | null | undefined = anything;
-
-    let stringIterator: (char: string, index: number, string: string) => any = (char: string, index: number, string: string) => 1;
-    let listIterator: (value: AbcObject, index: number, collection: _.List<AbcObject>) => any = (value: AbcObject, index: number, collection: _.List<AbcObject>) => 1;
-    let dictionaryIterator: (value: AbcObject, key: string, collection: _.Dictionary<AbcObject>) => any = (value: AbcObject, key: string, collection: _.Dictionary<AbcObject>) => 1;
-
-    {
-        let result: string;
-
-        result = _.each('', stringIterator);
-    }
-
-    {
-        let result: string | null | undefined;
-
-        result = _.each('' as (string | null | undefined), stringIterator);
-    }
-
-    {
-        let result: AbcObject[];
-
-        result = _.each(array, listIterator);
-    }
-
-    {
-        let result: AbcObject[] | null | undefined;
-
-        result = _.each(nilArray, listIterator);
-    }
-
-    {
-        let result: _.List<AbcObject>;
-
-        result = _.each(list, listIterator);
-    }
-
-    {
-        let result: _.List<AbcObject> | null | undefined;
-
-        result = _.each(nilList, listIterator);
-    }
-
-    {
-        let result: _.Dictionary<AbcObject | null | undefined>;
-
-        result = _.each(dictionary, dictionaryIterator);
-    }
-
-    {
-        let result: _.Dictionary<AbcObject> | null | undefined;
-
-        result = _.each(nilDictionary, dictionaryIterator);
-    }
-
-    {
-        let result: _.LoDashImplicitWrapper<string>;
-
-        result = _('').each(stringIterator);
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<AbcObject>;
-
-        result = _(array).each(listIterator);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<_.List<AbcObject>>;
-
-        result = _(list).each(listIterator);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<_.Dictionary<AbcObject>>;
-
-        result = _(dictionary).each(dictionaryIterator);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<string>;
-
-        result = _('').chain().each(stringIterator);
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<AbcObject>;
-
-        result = _(array).chain().each(listIterator);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<_.List<AbcObject>>;
-
-        result = _(list).chain().each(listIterator);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<_.Dictionary<AbcObject>>;
-
-        result = _(dictionary).chain().each(dictionaryIterator);
-    }
-}
-
-// _.eachRight
-namespace TestEachRight {
-    let array: AbcObject[] = [];
-    let list: _.List<AbcObject> = [];
-    let dictionary: _.Dictionary<AbcObject> = {};
-    let nilArray: AbcObject[] | null | undefined = [] as any;
-    let nilList: _.List<AbcObject> | null | undefined = [] as any;
-    let nilDictionary: _.Dictionary<AbcObject> | null | undefined = anything;
-
-    let stringIterator: (char: string, index: number, string: string) => any = (char: string, index: number, string: string) => 1;
-    let listIterator: (value: AbcObject, index: number, collection: _.List<AbcObject>) => any = (value: AbcObject, index: number, collection: _.List<AbcObject>) => 1;
-    let dictionaryIterator: (value: AbcObject, key: string, collection: _.Dictionary<AbcObject>) => any = (value: AbcObject, key: string, collection: _.Dictionary<AbcObject>) => 1;
-
-    {
-        let result: string;
-
-        result = _.eachRight('', stringIterator);
-    }
-
-    {
-        let result: string | null | undefined;
-
-        result = _.eachRight('' as (string | null | undefined), stringIterator);
-    }
-
-    {
-        let result: AbcObject[];
-
-        result = _.eachRight(array, listIterator);
-    }
-
-    {
-        let result: AbcObject[] | null | undefined;
-
-        result = _.eachRight(nilArray, listIterator);
-    }
-
-    {
-        let result: _.List<AbcObject>;
-
-        result = _.eachRight(list, listIterator);
-    }
-
-    {
-        let result: _.List<AbcObject> | null | undefined;
-
-        result = _.eachRight(nilList, listIterator);
-    }
-
-    {
-        let result: _.Dictionary<AbcObject | null | undefined>;
-
-        result = _.eachRight(dictionary, dictionaryIterator);
-    }
-
-    {
-        let result: _.Dictionary<AbcObject> | null | undefined;
-
-        result = _.eachRight(nilDictionary, dictionaryIterator);
-    }
-
-    {
-        let result: _.LoDashImplicitWrapper<string>;
-
-        result = _('').eachRight(stringIterator);
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<AbcObject>;
-
-        result = _(array).eachRight(listIterator);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<_.List<AbcObject>>;
-
-        result = _(list).eachRight(listIterator);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<_.Dictionary<AbcObject>>;
-
-        result = _(dictionary).eachRight(dictionaryIterator);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<string>;
-
-        result = _('').chain().eachRight(stringIterator);
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<AbcObject>;
-
-        result = _(array).chain().eachRight(listIterator);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<_.List<AbcObject>>;
-
-        result = _(list).chain().eachRight(listIterator);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<_.Dictionary<AbcObject>>;
-
-        result = _(dictionary).chain().eachRight(dictionaryIterator);
-    }
+{
+    const list: _.List<AbcObject> | null | undefined = anything;
+    const dictionary: _.Dictionary<AbcObject> | null | undefined = anything;
+    const numericDictionary: _.NumericDictionary<AbcObject> | null | undefined = anything;
+
+    const stringIterator = (value: string, index: number, collection: string) => 1;
+    const listIterator = (value: AbcObject, index: number, collection: _.List<AbcObject>) => 1;
+    const dictionaryIterator = (value: AbcObject, key: string, collection: _.Dictionary<AbcObject>) => 1;
+    const numericDictionaryIterator = (value: AbcObject, key: string, collection: _.NumericDictionary<AbcObject>) => 1;
+
+    _.countBy(""); // $ExpectType Dictionary<number>
+    _.countBy("", stringIterator); // $ExpectType Dictionary<number>
+
+    _.countBy(list); // $ExpectType Dictionary<number>
+    _.countBy(list, listIterator); // $ExpectType Dictionary<number>
+    _.countBy(list, ""); // $ExpectType Dictionary<number>
+    _.countBy(list, { a: 42 }); // $ExpectType Dictionary<number>
+
+    _.countBy(dictionary); // $ExpectType Dictionary<number>
+    _.countBy(dictionary, dictionaryIterator); // $ExpectType Dictionary<number>
+    _.countBy(dictionary, ""); // $ExpectType Dictionary<number>
+    _.countBy(dictionary, { a: 42 }); // $ExpectType Dictionary<number>
+
+    _.countBy(numericDictionary); // $ExpectType Dictionary<number>
+    _.countBy(numericDictionary, numericDictionaryIterator); // $ExpectType Dictionary<number>
+    _.countBy(numericDictionary, ""); // $ExpectType Dictionary<number>
+    _.countBy(numericDictionary, { a: 42 }); // $ExpectType Dictionary<number>
+
+    _("").countBy(); // $ExpectType LoDashImplicitWrapper<Dictionary<number>>
+    _("").countBy(stringIterator); // $ExpectType LoDashImplicitWrapper<Dictionary<number>>
+
+    _(list).countBy(); // $ExpectType LoDashImplicitWrapper<Dictionary<number>>
+    _(list).countBy(listIterator); // $ExpectType LoDashImplicitWrapper<Dictionary<number>>
+    _(list).countBy(""); // $ExpectType LoDashImplicitWrapper<Dictionary<number>>
+    _(list).countBy({ a: 42 }); // $ExpectType LoDashImplicitWrapper<Dictionary<number>>
+
+    _(dictionary).countBy(); // $ExpectType LoDashImplicitWrapper<Dictionary<number>>
+    _(dictionary).countBy(dictionaryIterator); // $ExpectType LoDashImplicitWrapper<Dictionary<number>>
+    _(dictionary).countBy(""); // $ExpectType LoDashImplicitWrapper<Dictionary<number>>
+    _(dictionary).countBy({ a: 42 }); // $ExpectType LoDashImplicitWrapper<Dictionary<number>>
+
+    _(numericDictionary).countBy(); // $ExpectType LoDashImplicitWrapper<Dictionary<number>>
+    _(numericDictionary).countBy(numericDictionaryIterator); // $ExpectType LoDashImplicitWrapper<Dictionary<number>>
+    _(numericDictionary).countBy(""); // $ExpectType LoDashImplicitWrapper<Dictionary<number>>
+    _(numericDictionary).countBy({ a: 42 }); // $ExpectType LoDashImplicitWrapper<Dictionary<number>>
+
+    _.chain("").countBy(); // $ExpectType LoDashExplicitWrapper<Dictionary<number>>
+    _.chain("").countBy(stringIterator); // $ExpectType LoDashExplicitWrapper<Dictionary<number>>
+
+    _.chain(list).countBy(); // $ExpectType LoDashExplicitWrapper<Dictionary<number>>
+    _.chain(list).countBy(listIterator); // $ExpectType LoDashExplicitWrapper<Dictionary<number>>
+    _.chain(list).countBy(""); // $ExpectType LoDashExplicitWrapper<Dictionary<number>>
+    _.chain(list).countBy({ a: 42 }); // $ExpectType LoDashExplicitWrapper<Dictionary<number>>
+
+    _.chain(dictionary).countBy(); // $ExpectType LoDashExplicitWrapper<Dictionary<number>>
+    _.chain(dictionary).countBy(dictionaryIterator); // $ExpectType LoDashExplicitWrapper<Dictionary<number>>
+    _.chain(dictionary).countBy(""); // $ExpectType LoDashExplicitWrapper<Dictionary<number>>
+    _.chain(dictionary).countBy({ a: 42 }); // $ExpectType LoDashExplicitWrapper<Dictionary<number>>
+
+    _.chain(numericDictionary).countBy(); // $ExpectType LoDashExplicitWrapper<Dictionary<number>>
+    _.chain(numericDictionary).countBy(numericDictionaryIterator); // $ExpectType LoDashExplicitWrapper<Dictionary<number>>
+    _.chain(numericDictionary).countBy(""); // $ExpectType LoDashExplicitWrapper<Dictionary<number>>
+    _.chain(numericDictionary).countBy({ a: 42 }); // $ExpectType LoDashExplicitWrapper<Dictionary<number>>
+
+    const stringIterator2 = (value: string) => 1;
+    const listIterator2 = (value: AbcObject) => 1;
+    fp.countBy(stringIterator2, ""); // $ExpectType Dictionary<number>
+    fp.countBy(stringIterator2)(""); // $ExpectType Dictionary<number>
+    fp.countBy(listIterator2, list); // $ExpectType Dictionary<number>
+    fp.countBy("", list); // $ExpectType Dictionary<number>
+    fp.countBy({ a: 42 }, list); // $ExpectType Dictionary<number>
+    fp.countBy(listIterator2, dictionary); // $ExpectType Dictionary<number>
+    fp.countBy({ a: 42 }, dictionary); // $ExpectType Dictionary<number>
+    fp.countBy(listIterator2, numericDictionary); // $ExpectType Dictionary<number>
+    fp.countBy({ a: 42 }, numericDictionary); // $ExpectType Dictionary<number>
 }
 
 // _.every
-namespace TestEvery {
-    type SampleObject = {a: number; b: string; c: boolean;};
+{
+    const list: _.List<AbcObject> | null | undefined = anything;
+    const dictionary: _.Dictionary<AbcObject> | null | undefined = anything;
+    const numericDictionary: _.NumericDictionary<AbcObject> | null | undefined = anything;
 
-    let array: SampleObject[] | null | undefined = [] as any;
-    let list: _.List<SampleObject> | null | undefined = [] as any;
-    let obj: any = {};
-    let dictionary: _.Dictionary<SampleObject> | null | undefined = obj;
-    let numericDictionary: _.NumericDictionary<SampleObject> | null | undefined = obj;
+    const listIterator = (value: AbcObject, index: number, collection: _.List<AbcObject>) => true;
+    const dictionaryIterator = (value: AbcObject, key: string, collection: _.Dictionary<AbcObject>) => true;
+    const numericDictionaryIterator = (value: AbcObject, key: string, collection: _.NumericDictionary<AbcObject>) => true;
+    const valueIterator = (value: AbcObject) => true;
 
-    let listIterator = (value: SampleObject, index: number, collection: _.List<SampleObject>) => true;
-    let dictionaryIterator = (value: SampleObject, key: string, collection: _.Dictionary<SampleObject>) => true;
-    let numericDictionaryIterator = (value: SampleObject, key: string, collection: _.NumericDictionary<SampleObject>) => true;
+    _.every(list); // $ExpectType boolean
+    _.every(list, listIterator); // $ExpectType boolean
+    _.every(list, "a"); // $ExpectType boolean
+    _.every(list, ["a", 42]); // $ExpectType boolean
+    _.every(list, { a: 42 }); // $ExpectType boolean
 
-    {
-        let result: boolean;
+    _.every(dictionary); // $ExpectType boolean
+    _.every(dictionary, dictionaryIterator); // $ExpectType boolean
+    _.every(dictionary, "a"); // $ExpectType boolean
+    _.every(dictionary, ["a", 42]); // $ExpectType boolean
+    _.every(dictionary, { a: 42 }); // $ExpectType boolean
 
-        result = _.every(array);
-        result = _.every(array, listIterator);
-        result = _.every(array, 'a');
-        result = _.every(array, ['a', 42]);
-        result = _.every(array, {a: 42});
+    _.every(numericDictionary); // $ExpectType boolean
+    _.every(numericDictionary, numericDictionaryIterator); // $ExpectType boolean
+    _.every(numericDictionary, "a"); // $ExpectType boolean
+    _.every(numericDictionary, ["a", 42]); // $ExpectType boolean
+    _.every(numericDictionary, { a: 42 }); // $ExpectType boolean
 
-        result = _.every(list);
-        result = _.every(list, listIterator);
-        result = _.every(list, 'a');
-        result = _.every(list, ['a', 42]);
-        result = _.every(list, {a: 42});
+    _(list).every(); // $ExpectType boolean
+    _(list).every(listIterator); // $ExpectType boolean
+    _(list).every("a"); // $ExpectType boolean
+    _(list).every(["a", 42]); // $ExpectType boolean
+    _(list).every({ a: 42 }); // $ExpectType boolean
 
-        result = _.every(dictionary);
-        result = _.every(dictionary, dictionaryIterator);
-        result = _.every(dictionary, 'a');
-        result = _.every(dictionary, ['a', 42]);
-        result = _.every(dictionary, {a: 42});
+    _(dictionary).every(); // $ExpectType boolean
+    _(dictionary).every(dictionaryIterator); // $ExpectType boolean
+    _(dictionary).every("a"); // $ExpectType boolean
+    _(dictionary).every(["a", 42]); // $ExpectType boolean
+    _(dictionary).every({ a: 42 }); // $ExpectType boolean
 
-        result = _.every(numericDictionary);
-        result = _.every(numericDictionary, numericDictionaryIterator);
-        result = _.every(numericDictionary, 'a');
-        result = _.every(numericDictionary, ['a', 42]);
-        result = _.every(numericDictionary, {a: 42});
+    _(numericDictionary).every(); // $ExpectType boolean
+    _(numericDictionary).every(numericDictionaryIterator); // $ExpectType boolean
+    _(numericDictionary).every("a"); // $ExpectType boolean
+    _(numericDictionary).every(["a", 42]); // $ExpectType boolean
+    _(numericDictionary).every({ a: 42 }); // $ExpectType boolean
 
-        result = _(array).every();
-        result = _(array).every(listIterator);
-        result = _(array).every('a');
-        result = _(array).every(['a', 42]);
-        result = _(array).every({a: 42});
+    _.chain(list).every(); // $ExpectType LoDashExplicitWrapper<boolean>
+    _.chain(list).every(listIterator); // $ExpectType LoDashExplicitWrapper<boolean>
+    _.chain(list).every("a"); // $ExpectType LoDashExplicitWrapper<boolean>
+    _.chain(list).every(["a", 42]); // $ExpectType LoDashExplicitWrapper<boolean>
+    _.chain(list).every({ a: 42 }); // $ExpectType LoDashExplicitWrapper<boolean>
 
-        result = _(list).every();
-        result = _(list).every(listIterator);
-        result = _(list).every('a');
-        result = _(list).every(['a', 42]);
-        result = _(list).every({a: 42});
+    _.chain(dictionary).every(); // $ExpectType LoDashExplicitWrapper<boolean>
+    _.chain(dictionary).every(dictionaryIterator); // $ExpectType LoDashExplicitWrapper<boolean>
+    _.chain(dictionary).every("a"); // $ExpectType LoDashExplicitWrapper<boolean>
+    _.chain(dictionary).every(["a", 42]); // $ExpectType LoDashExplicitWrapper<boolean>
+    _.chain(dictionary).every({ a: 42 }); // $ExpectType LoDashExplicitWrapper<boolean>
 
-        result = _(dictionary).every();
-        result = _(dictionary).every(dictionaryIterator);
-        result = _(dictionary).every('a');
-        result = _(dictionary).every(['a', 42]);
-        result = _(dictionary).every({a: 42});
+    _.chain(numericDictionary).every(); // $ExpectType LoDashExplicitWrapper<boolean>
+    _.chain(numericDictionary).every(numericDictionaryIterator); // $ExpectType LoDashExplicitWrapper<boolean>
+    _.chain(numericDictionary).every("a"); // $ExpectType LoDashExplicitWrapper<boolean>
+    _.chain(numericDictionary).every(["a", 42]); // $ExpectType LoDashExplicitWrapper<boolean>
+    _.chain(numericDictionary).every({ a: 42 }); // $ExpectType LoDashExplicitWrapper<boolean>
 
-        result = _(numericDictionary).every();
-        result = _(numericDictionary).every(numericDictionaryIterator);
-        result = _(numericDictionary).every('a');
-        result = _(numericDictionary).every(['a', 42]);
-        result = _(numericDictionary).every({a: 42});
-    }
+    fp.every(valueIterator, list); // $ExpectType boolean
+    fp.every("a")(list); // $ExpectType boolean
+    fp.every({ a: 42 }, list); // $ExpectType boolean
+    fp.every(["a", 42], list); // $ExpectType boolean
 
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
+    fp.every(valueIterator, dictionary); // $ExpectType boolean
+    fp.every("a")(dictionary); // $ExpectType boolean
+    fp.every({ a: 42 })(dictionary); // $ExpectType boolean
+    fp.every(["a", 42])(dictionary); // $ExpectType boolean
 
-        result = _(array).chain().every();
-        result = _(array).chain().every(listIterator);
-        result = _(array).chain().every('a');
-        result = _(array).chain().every(['a', 42]);
-        result = _(array).chain().every({a: 42});
-
-        result = _(list).chain().every();
-        result = _(list).chain().every(listIterator);
-        result = _(list).chain().every('a');
-        result = _(list).chain().every(['a', 42]);
-        result = _(list).chain().every({a: 42});
-
-        result = _(dictionary).chain().every();
-        result = _(dictionary).chain().every(dictionaryIterator);
-        result = _(dictionary).chain().every('a');
-        result = _(dictionary).chain().every(['a', 42]);
-        result = _(dictionary).chain().every({a: 42});
-
-        result = _(numericDictionary).chain().every();
-        result = _(numericDictionary).chain().every(numericDictionaryIterator);
-        result = _(numericDictionary).chain().every('a');
-        result = _(numericDictionary).chain().every(['a', 42]);
-        result = _(numericDictionary).chain().every({a: 42});
-    }
+    fp.every(valueIterator, numericDictionary); // $ExpectType boolean
+    fp.every("a")(numericDictionary); // $ExpectType boolean
+    fp.every({ a: 42 })(numericDictionary); // $ExpectType boolean
+    fp.every(["a", 42])(numericDictionary); // $ExpectType boolean
 }
 
 // _.filter
-namespace TestFilter {
-    let array: AbcObject[] | null | undefined = [] as any;
-    let list: _.List<AbcObject> | null | undefined = [] as any;
-    let obj: any = {};
-    let dictionary: _.Dictionary<AbcObject> | null | undefined = obj;
+{
+    const list: _.List<AbcObject> | null | undefined = anything;
+    const dictionary: _.Dictionary<AbcObject> | null | undefined = anything;
 
-    let stringIterator = (char: string, index: number, string: string) => true;
-    let listIterator = (value: AbcObject, index: number, collection: _.List<AbcObject>) => true;
-    let dictionaryIterator = (value: AbcObject, key: string, collection: _.Dictionary<AbcObject>) => true;
+    const stringIterator = (char: string, index: number, string: string) => true;
+    const listIterator = (value: AbcObject, index: number, collection: _.List<AbcObject>) => true;
+    const dictionaryIterator = (value: AbcObject, key: string, collection: _.Dictionary<AbcObject>) => true;
+    const valueIterator = (value: AbcObject) => true;
 
-    {
-        let result: string[];
+    _.filter("", stringIterator); // $ExpectType string[]
+    _.filter(list, listIterator); // $ExpectType AbcObject[]
+    _.filter(list, ""); // $ExpectType AbcObject[]
+    _.filter(list, { a: 42 }); // $ExpectType AbcObject[]
+    _.filter(list, ["a", 42]); // $ExpectType AbcObject[]
+    _.filter(dictionary, dictionaryIterator); // $ExpectType AbcObject[]
+    _.filter(dictionary, ""); // $ExpectType AbcObject[]
+    _.filter(dictionary, { a: 42 }); // $ExpectType AbcObject[]
+    _.filter(dictionary, ["a", 42]); // $ExpectType AbcObject[]
 
-        result = _.filter('', stringIterator);
-    }
+    _("").filter(stringIterator); // $ExpectType LoDashImplicitWrapper<string[]>
+    _(list).filter(listIterator); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).filter(""); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).filter({ a: 42 }); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).filter(["a", 42]); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(dictionary).filter(dictionaryIterator); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(dictionary).filter(""); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(dictionary).filter({ a: 42 }); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(dictionary).filter(["a", 42]); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
 
-    {
-        let result: AbcObject[];
+    _.chain("").filter(stringIterator); // $ExpectType LoDashExplicitWrapper<string[]>
+    _.chain(list).filter(listIterator); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).filter(""); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).filter({ a: 42 }); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).filter(["a", 42]); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(dictionary).filter(dictionaryIterator); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(dictionary).filter(""); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(dictionary).filter({ a: 42 }); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(dictionary).filter(["a", 42]); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
 
-        result = _.filter(array, listIterator);
-        result = _.filter(array, '');
-        result = _.filter(array, {a: 42});
-        result = _.filter(array, ["a", 42]);
+    fp.filter(valueIterator, list); // $ExpectType AbcObject[]
+    fp.filter(valueIterator)(list); // $ExpectType AbcObject[]
+    fp.filter("", list); // $ExpectType AbcObject[]
+    fp.filter({ a: 42 }, list); // $ExpectType AbcObject[]
+    fp.filter(["a", 42], list); // $ExpectType AbcObject[]
+    fp.filter(valueIterator, dictionary); // $ExpectType AbcObject[]
+    fp.filter("", dictionary); // $ExpectType AbcObject[]
+    fp.filter({ a: 42 }, dictionary); // $ExpectType AbcObject[]
+    fp.filter(["a", 42], dictionary); // $ExpectType AbcObject[]
 
-        result = _.filter(list, listIterator);
-        result = _.filter(list, '');
-        result = _.filter(list, {a: 42});
-        result = _.filter(list, ["a", 42]);
+    // Test filtering with type guard
+    const a2: Array<string | number> | null | undefined = anything;
+    const d2: _.Dictionary<string | number> | null | undefined = anything;
 
-        result = _.filter(dictionary, dictionaryIterator);
-        result = _.filter(dictionary, '');
-        result = _.filter(dictionary, {a: 42});
-        result = _.filter(dictionary, ["a", 42]);
-    }
+    _.filter(a2, (item: string | number): item is number => typeof item === "number"); // $ExpectType number[]
+    _.filter(d2, (item: string | number): item is number => typeof item === "number"); // $ExpectType number[]
 
-    {
-        let result: _.LoDashImplicitArrayWrapper<string>;
+    _(a2).filter((item: string | number): item is number => typeof item === "number"); // $ExpectType LoDashImplicitWrapper<number[]>
+    _(d2).filter((item: string | number): item is number => typeof item === "number"); // $ExpectType LoDashImplicitWrapper<number[]>
 
-        result = _('').filter(stringIterator);
-    }
+    _.chain(a2).filter((item: string | number): item is number => typeof item === "number"); // $ExpectType LoDashExplicitWrapper<number[]>
+    _.chain(d2).filter((item: string | number): item is number => typeof item === "number"); // $ExpectType LoDashExplicitWrapper<number[]>
 
-    {
-        let result: _.LoDashImplicitArrayWrapper<AbcObject>;
-
-        result = _(array).filter(listIterator);
-        result = _(array).filter('');
-        result = _(array).filter({a: 42});
-        result = _(array).filter(["a", 42]);
-
-        result = _(list).filter(listIterator);
-        result = _(list).filter('');
-        result = _(list).filter({a: 42});
-        result = _(list).filter(["a", 42]);
-
-        result = _(dictionary).filter(dictionaryIterator);
-        result = _(dictionary).filter('');
-        result = _(dictionary).filter({a: 42});
-        result = _(dictionary).filter(["a", 42]);
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<string>;
-
-        result = _('').chain().filter(stringIterator);
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<AbcObject>;
-
-        result = _(array).chain().filter(listIterator);
-        result = _(array).chain().filter('');
-        result = _(array).chain().filter({a: 42});
-        result = _(array).chain().filter(["a", 42]);
-
-        result = _(list).chain().filter(listIterator);
-        result = _(list).chain().filter('');
-        result = _(list).chain().filter({a: 42});
-        result = _(list).chain().filter(["a", 42]);
-
-        result = _(dictionary).chain().filter(dictionaryIterator);
-        result = _(dictionary).chain().filter('');
-        result = _(dictionary).chain().filter({a: 42});
-        result = _(dictionary).chain().filter(["a", 42]);
-    }
-
-    {
-        // Test filtering with type guard
-        let a2: Array<string | number> | null | undefined = anything;
-        let d2: _.Dictionary<string | number> | null | undefined = anything;
-
-        _.filter(a2, (item: string | number): item is number => typeof item === "number"); // $ExpectType number[]
-        _.filter(d2, (item: string | number): item is number => typeof item === "number"); // $ExpectType number[]
-        _(a2).filter((item: string | number): item is number => typeof item === "number"); // $ExpectType LoDashImplicitWrapper<number[]>
-        _(d2).filter((item: string | number): item is number => typeof item === "number"); // $ExpectType LoDashImplicitWrapper<number[]>
-        _(a2).chain().filter((item: string | number): item is number => typeof item === "number"); // $ExpectType LoDashExplicitWrapper<number[]>
-        _(d2).chain().filter((item: string | number): item is number => typeof item === "number"); // $ExpectType LoDashExplicitWrapper<number[]>
-    }
+    fp.filter((item: string | number): item is number => typeof item === "number", a2); // $ExpectType number[]
+    fp.filter((item: string | number): item is number => typeof item === "number", d2); // $ExpectType number[]
 }
 
 // _.find
-namespace TestFind {
-    let array: AbcObject[] | null | undefined = [] as any;
-    let list: _.List<AbcObject> | null | undefined = [] as any;
-    let obj: any = {};
-    let dictionary: _.Dictionary<AbcObject> | null | undefined = obj;
-
-    let listIterator = (value: AbcObject, index: number, collection: _.List<AbcObject>) => true;
-    let dictionaryIterator = (value: AbcObject, key: string, collection: _.Dictionary<AbcObject>) => true;
-
-    let result: AbcObject | undefined;
-
-    result = _.find(array);
-    result = _.find(array, listIterator);
-    result = _.find(array, listIterator, 1);
-    result = _.find(array, '');
-    result = _.find(array, '', 1);
-    result = _.find(array, {a: 42});
-    result = _.find(array, {a: 42}, 1);
-    result = _.find(array, ['a', 5]);
-    result = _.find(array, ['a', 5], 1);
-
-    result = _.find(list);
-    result = _.find(list, listIterator);
-    result = _.find(list, listIterator, 1);
-    result = _.find(list, '');
-    result = _.find(list, '', 1);
-    result = _.find(list, {a: 42});
-    result = _.find(list, {a: 42}, 1);
-    result = _.find(list, ['a', 5]);
-    result = _.find(list, ['a', 5], 1);
-
-    result = _.find(dictionary);
-    result = _.find(dictionary, dictionaryIterator);
-    result = _.find(dictionary, dictionaryIterator, 1);
-    result = _.find(dictionary, '');
-    result = _.find(dictionary, '', 1);
-    result = _.find(dictionary, {a: 42});
-    result = _.find(dictionary, {a: 42}, 1);
-    result = _.find(dictionary, ['a', 5]);
-    result = _.find(dictionary, ['a', 5], 1);
-
-    result = _(array).find();
-    result = _(array).find(listIterator);
-    result = _(array).find(listIterator, 1);
-    result = _(array).find('');
-    result = _(array).find('', 1);
-    result = _(array).find({a: 42});
-    result = _(array).find({a: 42}, 1);
-    result = _(array).find(['a', 5]);
-    result = _(array).find(['a', 5], 1);
-
-    result = _(list).find();
-    result = _(list).find(listIterator);
-    result = _(list).find(listIterator, 1);
-    result = _(list).find('');
-    result = _(list).find('', 1);
-    result = _(list).find({a: 42});
-    result = _(list).find({a: 42}, 1);
-    result = _(list).find(['a', 5]);
-    result = _(list).find(['a', 5], 1);
-
-    result = _(dictionary).find();
-    result = _(dictionary).find(dictionaryIterator);
-    result = _(dictionary).find(dictionaryIterator, 1);
-    result = _(dictionary).find('');
-    result = _(dictionary).find('', 1);
-    result = _(dictionary).find({a: 42});
-    result = _(dictionary).find({a: 42}, 1);
-    result = _(dictionary).find(['a', 5]);
-    result = _(dictionary).find(['a', 5], 1);
-
-    result = _.find([anything as AbcObject, null, undefined], (value: AbcObject | null | undefined): value is AbcObject | undefined => value !== null);
-    result = _([anything as AbcObject, null, undefined]).find((value: AbcObject | null | undefined): value is AbcObject | undefined => value !== null);
-}
-
 // _.findLast
-namespace TestFindLast {
-    let array: AbcObject[] | null | undefined = [] as any;
-    let list: _.List<AbcObject> | null | undefined = [] as any;
-    let obj: any = {};
-    let dictionary: _.Dictionary<AbcObject> | null | undefined = obj;
+{
+    const list: _.List<AbcObject> | null | undefined = anything;
+    const dictionary: _.Dictionary<AbcObject> | null | undefined = anything;
 
-    let listIterator = (value: AbcObject, index: number, collection: _.List<AbcObject>) => true;
-    let dictionaryIterator = (value: AbcObject, key: string, collection: _.Dictionary<AbcObject>) => true;
+    const listIterator = (value: AbcObject, index: number, collection: _.List<AbcObject>) => true;
+    const dictionaryIterator = (value: AbcObject, key: string, collection: _.Dictionary<AbcObject>) => true;
+    const valueIterator = (value: AbcObject) => true;
 
-    let result: AbcObject | undefined;
+    _.find(list); // $ExpectType AbcObject | undefined
+    _.find(list, listIterator); // $ExpectType AbcObject | undefined
+    _.find(list, listIterator, 1); // $ExpectType AbcObject | undefined
+    _.find(list, "a"); // $ExpectType AbcObject | undefined
+    _.find(list, "a", 1); // $ExpectType AbcObject | undefined
+    _.find(list, { a: 42 }); // $ExpectType AbcObject | undefined
+    _.find(list, { a: 42 }, 1); // $ExpectType AbcObject | undefined
+    _.find(list, ["a", 5]); // $ExpectType AbcObject | undefined
+    _.find(list, ["a", 5], 1); // $ExpectType AbcObject | undefined
+    _.find(dictionary); // $ExpectType AbcObject | undefined
+    _.find(dictionary, dictionaryIterator); // $ExpectType AbcObject | undefined
+    _.find(dictionary, dictionaryIterator, 1); // $ExpectType AbcObject | undefined
+    _.find(dictionary, "a"); // $ExpectType AbcObject | undefined
+    _.find(dictionary, { a: 42 }); // $ExpectType AbcObject | undefined
+    _.find(dictionary, ["a", 5]); // $ExpectType AbcObject | undefined
+    _.find([anything as AbcObject, null, undefined], (value: AbcObject | null | undefined): value is AbcObject | undefined => value !== null); // $ExpectType AbcObject | undefined
 
-    result = _.findLast(array);
-    result = _.findLast(array, listIterator);
-    result = _.findLast(array, listIterator, 1);
-    result = _.findLast(array, '');
-    result = _.findLast(array, '', 1);
-    result = _.findLast(array, {a: 42});
-    result = _.findLast(array, {a: 42}, 1);
-    result = _.findLast(array, ['a', 5]);
-    result = _.findLast(array, ['a', 5], 1);
+    _(list).find(); // $ExpectType AbcObject | undefined
+    _(list).find(listIterator); // $ExpectType AbcObject | undefined
+    _(list).find(listIterator, 1); // $ExpectType AbcObject | undefined
+    _(list).find("a"); // $ExpectType AbcObject | undefined
+    _(list).find({ a: 42 }); // $ExpectType AbcObject | undefined
+    _(list).find(["a", 5]); // $ExpectType AbcObject | undefined
+    _(dictionary).find(); // $ExpectType AbcObject | undefined
+    _(dictionary).find(dictionaryIterator); // $ExpectType AbcObject | undefined
+    _(dictionary).find(dictionaryIterator, 1); // $ExpectType AbcObject | undefined
+    _(dictionary).find("a"); // $ExpectType AbcObject | undefined
+    _(dictionary).find({ a: 42 }); // $ExpectType AbcObject | undefined
+    _(dictionary).find(["a", 5]); // $ExpectType AbcObject | undefined
+    _([anything as AbcObject, null, undefined]).find((value: AbcObject | null | undefined): value is AbcObject | undefined => value !== null); // $ExpectType AbcObject | undefined
 
-    result = _.findLast(list);
-    result = _.findLast(list);
-    result = _.findLast(list, listIterator);
-    result = _.findLast(list, listIterator, 1);
-    result = _.findLast(list, '');
-    result = _.findLast(list, '', 1);
-    result = _.findLast(list, {a: 42});
-    result = _.findLast(list, {a: 42}, 1);
-    result = _.findLast(list, ['a', 5]);
-    result = _.findLast(list, ['a', 5], 1);
+    _.chain(list).find(); // $ExpectType LoDashExplicitWrapper<AbcObject | undefined>
+    _.chain(list).find(listIterator); // $ExpectType LoDashExplicitWrapper<AbcObject | undefined>
+    _.chain(list).find(listIterator, 1); // $ExpectType LoDashExplicitWrapper<AbcObject | undefined>
+    _.chain(list).find("a"); // $ExpectType LoDashExplicitWrapper<AbcObject | undefined>
+    _.chain(list).find({ a: 42 }); // $ExpectType LoDashExplicitWrapper<AbcObject | undefined>
+    _.chain(list).find(["a", 5]); // $ExpectType LoDashExplicitWrapper<AbcObject | undefined>
+    _.chain(dictionary).find(); // $ExpectType LoDashExplicitWrapper<AbcObject | undefined>
+    _.chain(dictionary).find(dictionaryIterator); // $ExpectType LoDashExplicitWrapper<AbcObject | undefined>
+    _.chain(dictionary).find(dictionaryIterator, 1); // $ExpectType LoDashExplicitWrapper<AbcObject | undefined>
+    _.chain(dictionary).find(""); // $ExpectType LoDashExplicitWrapper<AbcObject | undefined>
+    _.chain(dictionary).find({ a: 42 }); // $ExpectType LoDashExplicitWrapper<AbcObject | undefined>
+    _.chain(dictionary).find(["a", 5]); // $ExpectType LoDashExplicitWrapper<AbcObject | undefined>
+    // $ExpectType LoDashExplicitWrapper<AbcObject | undefined>
+    _.chain([anything as AbcObject, null, undefined]).find((value: AbcObject | null | undefined): value is AbcObject | undefined => value !== null);
 
-    result = _.findLast(dictionary);
-    result = _.findLast(dictionary);
-    result = _.findLast(dictionary, dictionaryIterator);
-    result = _.findLast(dictionary, dictionaryIterator, 1);
-    result = _.findLast(dictionary, '');
-    result = _.findLast(dictionary, '', 1);
-    result = _.findLast(dictionary, {a: 42});
-    result = _.findLast(dictionary, {a: 42}, 1);
-    result = _.findLast(dictionary, ['a', 5]);
-    result = _.findLast(dictionary, ['a', 5], 1);
+    fp.find(valueIterator, list); // $ExpectType AbcObject | undefined
+    fp.find(valueIterator)(list); // $ExpectType AbcObject | undefined
+    fp.find("a", list); // $ExpectType AbcObject | undefined
+    fp.find({ a: 42 }, list); // $ExpectType AbcObject | undefined
+    fp.find(["a", 42], list); // $ExpectType AbcObject | undefined
+    fp.find(valueIterator, dictionary); // $ExpectType AbcObject | undefined
+    fp.find(valueIterator)(dictionary); // $ExpectType AbcObject | undefined
+    fp.find({ a: 42 }, dictionary); // $ExpectType AbcObject | undefined
+    fp.find(["a", 42], dictionary); // $ExpectType AbcObject | undefined
+    fp.find((value: AbcObject | null | undefined): value is AbcObject | undefined => value !== null, [anything as AbcObject, null, undefined]); // $ExpectType AbcObject | undefined
+    fp.findFrom(valueIterator, 1, list); // $ExpectType AbcObject | undefined
+    fp.findFrom(valueIterator)(1)(list); // $ExpectType AbcObject | undefined
 
-    result = _(array).findLast();
-    result = _(array).findLast(listIterator);
-    result = _(array).findLast(listIterator, 1);
-    result = _(array).findLast('');
-    result = _(array).findLast('', 1);
-    result = _(array).findLast({a: 42});
-    result = _(array).findLast({a: 42}, 1);
-    result = _(array).findLast(['a', 5]);
-    result = _(array).findLast(['a', 5], 1);
+    _.findLast(list); // $ExpectType AbcObject | undefined
+    _.findLast(list, listIterator); // $ExpectType AbcObject | undefined
+    _.findLast(list, listIterator, 1); // $ExpectType AbcObject | undefined
+    _.findLast(list, "a"); // $ExpectType AbcObject | undefined
+    _.findLast(list, "a", 1); // $ExpectType AbcObject | undefined
+    _.findLast(list, { a: 42 }); // $ExpectType AbcObject | undefined
+    _.findLast(list, { a: 42 }, 1); // $ExpectType AbcObject | undefined
+    _.findLast(list, ["a", 5]); // $ExpectType AbcObject | undefined
+    _.findLast(list, ["a", 5], 1); // $ExpectType AbcObject | undefined
+    _.findLast(dictionary); // $ExpectType AbcObject | undefined
+    _.findLast(dictionary, dictionaryIterator); // $ExpectType AbcObject | undefined
+    _.findLast(dictionary, dictionaryIterator, 1); // $ExpectType AbcObject | undefined
+    _.findLast(dictionary, "a"); // $ExpectType AbcObject | undefined
+    _.findLast(dictionary, { a: 42 }); // $ExpectType AbcObject | undefined
+    _.findLast(dictionary, ["a", 5]); // $ExpectType AbcObject | undefined
+    _.findLast([anything as AbcObject, null, undefined], (value: AbcObject | null | undefined): value is AbcObject | undefined => value !== null); // $ExpectType AbcObject | undefined
 
-    result = _(list).findLast();
-    result = _(list).findLast(listIterator);
-    result = _(list).findLast(listIterator, 1);
-    result = _(list).findLast('');
-    result = _(list).findLast('', 1);
-    result = _(list).findLast({a: 42});
-    result = _(list).findLast({a: 42}, 1);
-    result = _(list).findLast(['a', 5]);
-    result = _(list).findLast(['a', 5], 1);
+    _(list).findLast(); // $ExpectType AbcObject | undefined
+    _(list).findLast(listIterator); // $ExpectType AbcObject | undefined
+    _(list).findLast(listIterator, 1); // $ExpectType AbcObject | undefined
+    _(list).findLast("a"); // $ExpectType AbcObject | undefined
+    _(list).findLast({ a: 42 }); // $ExpectType AbcObject | undefined
+    _(list).findLast(["a", 5]); // $ExpectType AbcObject | undefined
+    _(dictionary).findLast(); // $ExpectType AbcObject | undefined
+    _(dictionary).findLast(dictionaryIterator); // $ExpectType AbcObject | undefined
+    _(dictionary).findLast(dictionaryIterator, 1); // $ExpectType AbcObject | undefined
+    _(dictionary).findLast("a"); // $ExpectType AbcObject | undefined
+    _(dictionary).findLast({ a: 42 }); // $ExpectType AbcObject | undefined
+    _(dictionary).findLast(["a", 5]); // $ExpectType AbcObject | undefined
+    _([anything as AbcObject, null, undefined]).findLast((value: AbcObject | null | undefined): value is AbcObject | undefined => value !== null); // $ExpectType AbcObject | undefined
 
-    result = _(dictionary).findLast();
-    result = _(dictionary).findLast(dictionaryIterator);
-    result = _(dictionary).findLast(dictionaryIterator, 1);
-    result = _(dictionary).findLast('');
-    result = _(dictionary).findLast('', 1);
-    result = _(dictionary).findLast({a: 42});
-    result = _(dictionary).findLast({a: 42}, 1);
-    result = _(dictionary).findLast(['a', 5]);
-    result = _(dictionary).findLast(['a', 5], 1);
+    _.chain(list).findLast(); // $ExpectType LoDashExplicitWrapper<AbcObject | undefined>
+    _.chain(list).findLast(listIterator); // $ExpectType LoDashExplicitWrapper<AbcObject | undefined>
+    _.chain(list).findLast(listIterator, 1); // $ExpectType LoDashExplicitWrapper<AbcObject | undefined>
+    _.chain(list).findLast("a"); // $ExpectType LoDashExplicitWrapper<AbcObject | undefined>
+    _.chain(list).findLast({ a: 42 }); // $ExpectType LoDashExplicitWrapper<AbcObject | undefined>
+    _.chain(list).findLast(["a", 5]); // $ExpectType LoDashExplicitWrapper<AbcObject | undefined>
+    _.chain(dictionary).findLast(); // $ExpectType LoDashExplicitWrapper<AbcObject | undefined>
+    _.chain(dictionary).findLast(dictionaryIterator); // $ExpectType LoDashExplicitWrapper<AbcObject | undefined>
+    _.chain(dictionary).findLast(dictionaryIterator, 1); // $ExpectType LoDashExplicitWrapper<AbcObject | undefined>
+    _.chain(dictionary).findLast(""); // $ExpectType LoDashExplicitWrapper<AbcObject | undefined>
+    _.chain(dictionary).findLast({ a: 42 }); // $ExpectType LoDashExplicitWrapper<AbcObject | undefined>
+    _.chain(dictionary).findLast(["a", 5]); // $ExpectType LoDashExplicitWrapper<AbcObject | undefined>
+    // $ExpectType LoDashExplicitWrapper<AbcObject | undefined>
+    _.chain([anything as AbcObject, null, undefined]).findLast((value: AbcObject | null | undefined): value is AbcObject | undefined => value !== null);
 
-    result = _.findLast([anything as AbcObject, null, undefined], (value: AbcObject | null | undefined): value is AbcObject | undefined => value !== null);
-    result = _([anything as AbcObject, null, undefined]).findLast((value: AbcObject | null | undefined): value is AbcObject | undefined => value !== null);
+    fp.findLast(valueIterator, list); // $ExpectType AbcObject | undefined
+    fp.findLast(valueIterator)(list); // $ExpectType AbcObject | undefined
+    fp.findLast("a", list); // $ExpectType AbcObject | undefined
+    fp.findLast({ a: 42 }, list); // $ExpectType AbcObject | undefined
+    fp.findLast(["a", 42], list); // $ExpectType AbcObject | undefined
+    fp.findLast(valueIterator, dictionary); // $ExpectType AbcObject | undefined
+    fp.findLast(valueIterator)(dictionary); // $ExpectType AbcObject | undefined
+    fp.findLast({ a: 42 }, dictionary); // $ExpectType AbcObject | undefined
+    fp.findLast(["a", 42], dictionary); // $ExpectType AbcObject | undefined
+    fp.findLast((value: AbcObject | null | undefined): value is AbcObject | undefined => value !== null, [anything as AbcObject, null, undefined]); // $ExpectType AbcObject | undefined
+    fp.findLastFrom(valueIterator, 1, list); // $ExpectType AbcObject | undefined
+    fp.findLastFrom(valueIterator)(1)(list); // $ExpectType AbcObject | undefined
 }
 
 // _.flatMap
-namespace TestFlatMap {
-    let numArray: Array<number|number[]> | null | undefined = [1, [2, 3]] as any;
-    let objArray: Array<{a: number}|Array<{a: number}>> | null | undefined = [{a: 1}, [{a: 2}, {a: 3}]] as any;
+{
+    const numList: _.List<number|number[]> | null | undefined = anything;
+    const objList: _.List<{a: number}|Array<{a: number}>> | null | undefined = anything;
+    const numDictionary: _.Dictionary<number|number[]> | null | undefined = anything;
+    const objDictionary: _.Dictionary<{a: number}|Array<{a: number}>> | null | undefined = anything;
+    const numNumericDictionary: _.NumericDictionary<number|number[]> | null | undefined = anything;
+    const objNumericDictionary: _.NumericDictionary<{a: number}|Array<{a: number}>> | null | undefined = anything;
 
-    let obj: any = {};
-    let numList: _.List<number|number[]> | null | undefined = obj;
-    let objList: _.List<{a: number}|Array<{a: number}>> | null | undefined = obj;
+    const stringIterator = (value: string, index: number, collection: _.List<string>): string | string[] => "";
+    const listIterator = (value: number | number[], index: number, collection: _.List<number | number[]>): number | number[] => 1;
+    const dictionaryIterator = (value: number | number[], key: string, collection: _.Dictionary<number | number[]>): number | number[] => 1;
+    const numericDictionaryIterator = (value: number | number[], key: string, collection: _.NumericDictionary<number | number[]>): number | number[] => 1;
+    const valueIterator = (value: number | number[]): number | number[] => 1;
 
-    let numDictionary: _.Dictionary<number|number[]> | null | undefined = obj;
-    let objDictionary: _.Dictionary<{a: number}|Array<{a: number}>> | null | undefined = obj;
+    _.flatMap("abc"); // $ExpectType string[]
+    _.flatMap("abc", stringIterator); // $ExpectType string[]
+    _.flatMap(numList); // $ExpectType number[]
+    _.flatMap(numList, listIterator); // $ExpectType number[]
+    _.flatMap(objList, "a"); // $ExpectType any[]
+    _.flatMap(objList, ["a", 42]); // $ExpectType boolean[]
+    _.flatMap(objList, { a: 42 }); // $ExpectType boolean[]
+    _.flatMap(numDictionary); // $ExpectType number[]
+    _.flatMap(numDictionary, dictionaryIterator); // $ExpectType number[]
+    _.flatMap(objDictionary, "a"); // $ExpectType any[]
+    _.flatMap(objDictionary, ["a", 42]); // $ExpectType boolean[]
+    _.flatMap(objDictionary, { a: 42 }); // $ExpectType boolean[]
+    _.flatMap(numNumericDictionary); // $ExpectType number[]
+    _.flatMap(numNumericDictionary, numericDictionaryIterator); // $ExpectType number[]
+    _.flatMap(objNumericDictionary, "a"); // $ExpectType any[]
+    _.flatMap(objNumericDictionary, ["a", 42]); // $ExpectType boolean[]
+    _.flatMap(objNumericDictionary, { a: 42 }); // $ExpectType boolean[]
 
-    let numNumericDictionary: _.NumericDictionary<number|number[]> | null | undefined = obj;
-    let objNumericDictionary: _.NumericDictionary<{a: number}|Array<{a: number}>> | null | undefined = obj;
+    _("abc").flatMap(stringIterator); // $ExpectType LoDashImplicitWrapper<string[]>
+    _(numList).flatMap(); // $ExpectType LoDashImplicitWrapper<number[]>
+    _(numList).flatMap(listIterator); // $ExpectType LoDashImplicitWrapper<number[]>
+    _(objList).flatMap("a"); // $ExpectType LoDashImplicitWrapper<any[]>
+    _(objList).flatMap(["a", 42]); // $ExpectType LoDashImplicitWrapper<boolean[]>
+    _(objList).flatMap({ a: 42 }); // $ExpectType LoDashImplicitWrapper<boolean[]>
+    _(numDictionary).flatMap(dictionaryIterator); // $ExpectType LoDashImplicitWrapper<number[]>
+    _(objDictionary).flatMap("a"); // $ExpectType LoDashImplicitWrapper<any[]>
+    _(numNumericDictionary).flatMap(numericDictionaryIterator); // $ExpectType LoDashImplicitWrapper<number[]>
+    _(objNumericDictionary).flatMap("a"); // $ExpectType LoDashImplicitWrapper<any[]>
 
-    let stringIterator: (value: string, index: number, collection: _.List<string>) => string|string[] = (a, b, c) => "";
+    _.chain("abc").flatMap(stringIterator); // $ExpectType LoDashExplicitWrapper<string[]>
+    _.chain(numList).flatMap(); // $ExpectType LoDashExplicitWrapper<number[]>
+    _.chain(numList).flatMap(listIterator); // $ExpectType LoDashExplicitWrapper<number[]>
+    _.chain(objList).flatMap("a"); // $ExpectType LoDashExplicitWrapper<any[]>
+    _.chain(objList).flatMap(["a", 42]); // $ExpectType LoDashExplicitWrapper<boolean[]>
+    _.chain(objList).flatMap({ a: 42 }); // $ExpectType LoDashExplicitWrapper<boolean[]>
+    _.chain(numDictionary).flatMap(dictionaryIterator); // $ExpectType LoDashExplicitWrapper<number[]>
+    _.chain(objDictionary).flatMap("a"); // $ExpectType LoDashExplicitWrapper<any[]>
+    _.chain(numNumericDictionary).flatMap(numericDictionaryIterator); // $ExpectType LoDashExplicitWrapper<number[]>
+    _.chain(objNumericDictionary).flatMap("a"); // $ExpectType LoDashExplicitWrapper<any[]>
 
-    let listIterator: (value: number|number[], index: number, collection: _.List<number|number[]>) => number|number[] = (a, b, c) => 1;
-
-    let dictionaryIterator: (value: number|number[], key: string, collection: _.Dictionary<number|number[]>) => number|number[] = (a, b, c) => 1;
-
-    let numericDictionaryIterator: (value: number|number[], key: string, collection: _.NumericDictionary<number|number[]>) => number|number[] = (a, b, c) => 1;
-
-    {
-        let result: string[];
-
-        result = _.flatMap<string>('abc');
-        result = _.flatMap('abc');
-
-        result = _.flatMap<string, string>('abc', stringIterator);
-        result = _.flatMap('abc', stringIterator);
-    }
-
-    {
-        let result: number[];
-
-        result = _.flatMap(numArray);
-        result = _.flatMap<number>(numArray);
-
-        result = _.flatMap(numArray, listIterator);
-        result = _.flatMap<number|number[], number>(numArray, listIterator);
-
-        result = _.flatMap(objArray, 'a');
-
-        result = _.flatMap(numList);
-        result = _.flatMap<number>(numList);
-
-        result = _.flatMap(numList, listIterator);
-        result = _.flatMap<number|number[], number>(numList, listIterator);
-
-        result = _.flatMap(objList, 'a');
-
-        result = _.flatMap(numDictionary);
-        result = _.flatMap<number>(numDictionary);
-
-        result = _.flatMap(numDictionary, dictionaryIterator);
-
-        result = _.flatMap(objDictionary, 'a');
-
-        result = _.flatMap(numNumericDictionary);
-        result = _.flatMap<number>(numNumericDictionary);
-
-        result = _.flatMap(numNumericDictionary, numericDictionaryIterator);
-
-        result = _.flatMap(objNumericDictionary, 'a');
-    }
-
-    {
-        let result: boolean[];
-
-        result = _.flatMap(objArray, ['a', 42]);
-        result = _.flatMap(objArray, {'a': 42});
-
-        result = _.flatMap(objList, ['a', 42]);
-        result = _.flatMap(objList, {'a': 42});
-
-        result = _.flatMap(objDictionary, ['a', 42]);
-        result = _.flatMap(objDictionary, {'a': 42});
-
-        result = _.flatMap(objNumericDictionary, ['a', 42]);
-        result = _.flatMap(objNumericDictionary, {'a': 42});
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<string>;
-
-        result = _('abc').flatMap();
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<number>;
-
-        result = _(numArray).flatMap();
-        result = _(numArray).flatMap(listIterator);
-        result = _(objArray).flatMap('a');
-
-        result = _(numList).flatMap();
-        result = _(numList).flatMap(listIterator);
-        result = _(objList).flatMap('a');
-
-        result = _(numDictionary).flatMap();
-        result = _(numDictionary).flatMap(dictionaryIterator);
-        result = _(objDictionary).flatMap('a');
-
-        result = _(numNumericDictionary).flatMap();
-        result = _(numNumericDictionary).flatMap(numericDictionaryIterator);
-        result = _(objNumericDictionary).flatMap('a');
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<boolean>;
-
-        result = _(objArray).flatMap(['a', 42]);
-        result = _(objArray).flatMap({a: 42});
-
-        result = _(objList).flatMap(['a', 42]);
-        result = _(objList).flatMap({a: 42});
-
-        result = _(objDictionary).flatMap(['a', 42]);
-        result = _(objDictionary).flatMap({a: 42});
-
-        result = _(objNumericDictionary).flatMap(['a', 42]);
-        result = _(objNumericDictionary).flatMap({a: 42});
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<string>;
-
-        result = _('abc').chain().flatMap();
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<number>;
-
-        result = _(numArray).chain().flatMap();
-        result = _(numArray).chain().flatMap(listIterator);
-        result = _(objArray).chain().flatMap('a');
-
-        result = _(numList).chain().flatMap();
-        result = _(numList).chain().flatMap(listIterator);
-        result = _(objList).chain().flatMap('a');
-
-        result = _(numDictionary).chain().flatMap();
-        result = _(numDictionary).chain().flatMap(dictionaryIterator);
-        result = _(objDictionary).chain().flatMap('a');
-
-        result = _(numNumericDictionary).chain().flatMap();
-        result = _(numNumericDictionary).chain().flatMap(numericDictionaryIterator);
-        result = _(objNumericDictionary).chain().flatMap('a');
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<boolean>;
-
-        result = _(objArray).chain().flatMap(['a', 42]);
-        result = _(objArray).chain().flatMap({a: 42});
-
-        result = _(objList).chain().flatMap(['a', 42]);
-        result = _(objList).chain().flatMap({a: 42});
-
-        result = _(objDictionary).chain().flatMap(['a', 42]);
-        result = _(objDictionary).chain().flatMap({a: 42});
-
-        result = _(objNumericDictionary).chain().flatMap(['a', 42]);
-        result = _(objNumericDictionary).chain().flatMap({a: 42});
-    }
-
-    {
-        interface SampleObject {
-            bar: number;
-            foo: string[];
-        }
-        const obj: SampleObject = {
-            bar: 1,
-            foo: [''],
-        };
-
-        const result1: Array<string | number> = _.flatMap(obj);
-        const result2: _.LoDashImplicitWrapper<Array<string | number>> = _(obj).flatMap();
-        const result3: _.LoDashExplicitWrapper<Array<string | number>> = _.chain(obj).flatMap();
-    }
+    fp.flatMap(valueIterator, numList); // $ExpectType number[]
+    fp.flatMap(valueIterator)(numList); // $ExpectType number[]
+    fp.flatMap("a", objList); // $ExpectType any[]
+    fp.flatMap({ a: 42 }, objList); // $ExpectType boolean[]
+    fp.flatMap(["a", 42], objList); // $ExpectType boolean[]
+    fp.flatMap(valueIterator, numDictionary); // $ExpectType number[]
+    fp.flatMap("a", objDictionary); // $ExpectType any[]
+    fp.flatMap({ a: 42 }, objDictionary); // $ExpectType boolean[]
+    fp.flatMap(["a", 42], objDictionary); // $ExpectType boolean[]
+    fp.flatMap(valueIterator, numNumericDictionary); // $ExpectType number[]
+    fp.flatMap("a", objNumericDictionary); // $ExpectType any[]
+    fp.flatMap({ a: 42 }, objNumericDictionary); // $ExpectType boolean[]
+    fp.flatMap(["a", 42], objNumericDictionary); // $ExpectType boolean[]
 }
 
 // _.flatMapDeep
-namespace TestFlatMapDeep {
-    let numArray: Array<number|number[]> | null | undefined = [1, [2, 3]] as any;
-    let objArray: Array<{a: number}|Array<{a: number}>> | null | undefined = [{a: 1}, [{a: 2}, {a: 3}]] as any;
+{
+    const numList: _.List<number|number[]> | null | undefined = anything;
+    const objList: _.List<{a: number}|Array<{a: number}>> | null | undefined = anything;
+    const numDictionary: _.Dictionary<number|number[]> | null | undefined = anything;
+    const objDictionary: _.Dictionary<{a: number}|Array<{a: number}>> | null | undefined = anything;
+    const numNumericDictionary: _.NumericDictionary<number|number[]> | null | undefined = anything;
+    const objNumericDictionary: _.NumericDictionary<{a: number}|Array<{a: number}>> | null | undefined = anything;
 
-    let numList: _.List<number|number[]> | null | undefined = anything;
-    let objList: _.List<{a: number}|Array<{a: number}>> | null | undefined = anything;
+    const stringIterator = (value: string, index: number, collection: _.List<string>): _.ListOfRecursiveArraysOrValues<string> | string => "";
+    const listIterator = (value: number | number[], index: number, collection: _.List<number | number[]>): _.ListOfRecursiveArraysOrValues<number> | number => 1;
+    const dictionaryIterator = (value: number | number[], key: string, collection: _.Dictionary<number | number[]>): _.ListOfRecursiveArraysOrValues<number> | number => 1;
+    const numericDictionaryIterator = (value: number | number[], key: string, collection: _.NumericDictionary<number | number[]>): _.ListOfRecursiveArraysOrValues<number> | number => 1;
+    const valueIterator = (value: number | number[]): _.ListOfRecursiveArraysOrValues<number> | number => 1;
 
-    let numDictionary: _.Dictionary<number|number[]> | null | undefined = anything;
-    let objDictionary: _.Dictionary<{a: number}|Array<{a: number}>> | null | undefined = anything;
+    _.flatMapDeep("abc"); // $ExpectType string[]
+    _.flatMapDeep("abc", stringIterator); // $ExpectType string[]
+    _.flatMapDeep<number>(numList); // $ExpectType number[]
+    _.flatMapDeep(numList, listIterator); // $ExpectType number[]
+    _.flatMapDeep(objList, "a"); // $ExpectType any[]
+    _.flatMapDeep(objList, ["a", 42]); // $ExpectType boolean[]
+    _.flatMapDeep(objList, { a: 42 }); // $ExpectType boolean[]
+    _.flatMapDeep<number>(numDictionary); // $ExpectType number[]
+    _.flatMapDeep(numDictionary, dictionaryIterator); // $ExpectType number[]
+    _.flatMapDeep(objDictionary, "a"); // $ExpectType any[]
+    _.flatMapDeep(objDictionary, ["a", 42]); // $ExpectType boolean[]
+    _.flatMapDeep(objDictionary, { a: 42 }); // $ExpectType boolean[]
+    _.flatMapDeep<number>(numNumericDictionary); // $ExpectType number[]
+    _.flatMapDeep(numNumericDictionary, numericDictionaryIterator); // $ExpectType number[]
+    _.flatMapDeep(objNumericDictionary, "a"); // $ExpectType any[]
+    _.flatMapDeep(objNumericDictionary, ["a", 42]); // $ExpectType boolean[]
+    _.flatMapDeep(objNumericDictionary, { a: 42 }); // $ExpectType boolean[]
 
-    let numNumericDictionary: _.NumericDictionary<number|number[]> | null | undefined = anything;
-    let objNumericDictionary: _.NumericDictionary<{a: number}|Array<{a: number}>> | null | undefined = anything;
+    _("abc").flatMapDeep(stringIterator); // $ExpectType LoDashImplicitWrapper<string[]>
+    _(numList).flatMapDeep<number>(); // $ExpectType LoDashImplicitWrapper<number[]>
+    _(numList).flatMapDeep(listIterator); // $ExpectType LoDashImplicitWrapper<number[]>
+    _(objList).flatMapDeep("a"); // $ExpectType LoDashImplicitWrapper<any[]>
+    _(objList).flatMapDeep(["a", 42]); // $ExpectType LoDashImplicitWrapper<boolean[]>
+    _(objList).flatMapDeep({ a: 42 }); // $ExpectType LoDashImplicitWrapper<boolean[]>
+    _(numDictionary).flatMapDeep(dictionaryIterator); // $ExpectType LoDashImplicitWrapper<number[]>
+    _(objDictionary).flatMapDeep("a"); // $ExpectType LoDashImplicitWrapper<any[]>
+    _(numNumericDictionary).flatMapDeep(numericDictionaryIterator); // $ExpectType LoDashImplicitWrapper<number[]>
+    _(objNumericDictionary).flatMapDeep("a"); // $ExpectType LoDashImplicitWrapper<any[]>
 
-    let stringIterator: (value: string, index: number, collection: _.List<string>) => _.ListOfRecursiveArraysOrValues<string> = (a, b, c) => ['a', 'b', 'c'];
+    _.chain("abc").flatMapDeep(stringIterator); // $ExpectType LoDashExplicitWrapper<string[]>
+    _.chain(numList).flatMapDeep<number>(); // $ExpectType LoDashExplicitWrapper<number[]>
+    _.chain(numList).flatMapDeep(listIterator); // $ExpectType LoDashExplicitWrapper<number[]>
+    _.chain(objList).flatMapDeep("a"); // $ExpectType LoDashExplicitWrapper<any[]>
+    _.chain(objList).flatMapDeep(["a", 42]); // $ExpectType LoDashExplicitWrapper<boolean[]>
+    _.chain(objList).flatMapDeep({ a: 42 }); // $ExpectType LoDashExplicitWrapper<boolean[]>
+    _.chain(numDictionary).flatMapDeep(dictionaryIterator); // $ExpectType LoDashExplicitWrapper<number[]>
+    _.chain(objDictionary).flatMapDeep("a"); // $ExpectType LoDashExplicitWrapper<any[]>
+    _.chain(numNumericDictionary).flatMapDeep(numericDictionaryIterator); // $ExpectType LoDashExplicitWrapper<number[]>
+    _.chain(objNumericDictionary).flatMapDeep("a"); // $ExpectType LoDashExplicitWrapper<any[]>
 
-    let listIterator: (value: number|number[], index: number, collection: _.List<number|number[]>) => _.ListOfRecursiveArraysOrValues<number> = (a, b, c) => [1];
-
-    let dictionaryIterator: (value: number|number[], key: string, collection: _.Dictionary<number|number[]>) =>_.ListOfRecursiveArraysOrValues<number> = (a, b, c) => [1];
-
-    let numericDictionaryIterator: (value: number|number[], key: string, collection: _.NumericDictionary<number|number[]>) => _.ListOfRecursiveArraysOrValues<number> = (a, b, c) => [1];
-
-    {
-        let result: string[];
-
-        result = _.flatMapDeep('abc');
-
-        result = _.flatMapDeep('abc', stringIterator);
-    }
-
-    {
-        let result: number[];
-
-        result = _.flatMapDeep<number>(numArray);
-
-        result = _.flatMapDeep(numArray, listIterator);
-
-        result = _.flatMapDeep(objArray, 'a');
-
-        result = _.flatMapDeep<number>(numList);
-
-        result = _.flatMapDeep(numList, listIterator);
-
-        result = _.flatMapDeep(objList, 'a');
-
-        result = _.flatMapDeep<number>(numDictionary);
-
-        result = _.flatMapDeep(numDictionary, dictionaryIterator);
-
-        result = _.flatMapDeep(objDictionary, 'a');
-
-        result = _.flatMapDeep<number>(numNumericDictionary);
-
-        result = _.flatMapDeep(numNumericDictionary, numericDictionaryIterator);
-
-        result = _.flatMapDeep(objNumericDictionary, 'a');
-    }
-
-    {
-        let result: boolean[];
-
-        result = _.flatMapDeep(objArray, ['a', 42]);
-        result = _.flatMapDeep(objArray, {'a': 42});
-
-        result = _.flatMapDeep(objList, ['a', 42]);
-        result = _.flatMapDeep(objList, {'a': 42});
-
-        result = _.flatMapDeep(objDictionary, ['a', 42]);
-        result = _.flatMapDeep(objDictionary, {'a': 42});
-
-        result = _.flatMapDeep(objNumericDictionary, ['a', 42]);
-        result = _.flatMapDeep(objNumericDictionary, {'a': 42});
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<string>;
-
-        result = _('abc').flatMapDeep();
-        result = _('abc').flatMapDeep(stringIterator);
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<number>;
-
-        result = _(numArray).flatMapDeep<number>();
-        result = _(numArray).flatMapDeep(listIterator);
-        result = _(objArray).flatMapDeep('a');
-
-        result = _(numList).flatMapDeep<number>();
-        result = _(numList).flatMapDeep(listIterator);
-        result = _(objList).flatMapDeep('a');
-
-        result = _(numDictionary).flatMapDeep<number>();
-        result = _(numDictionary).flatMapDeep(dictionaryIterator);
-        result = _(objDictionary).flatMapDeep('a');
-
-        result = _(numNumericDictionary).flatMapDeep<number>();
-        result = _(numNumericDictionary).flatMapDeep(numericDictionaryIterator);
-        result = _(objNumericDictionary).flatMapDeep('a');
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<boolean>;
-
-        result = _(objArray).flatMapDeep(['a', 42]);
-        result = _(objArray).flatMapDeep({a: 42});
-
-        result = _(objList).flatMapDeep(['a', 42]);
-        result = _(objList).flatMapDeep({a: 42});
-
-        result = _(objDictionary).flatMapDeep(['a', 42]);
-        result = _(objDictionary).flatMapDeep({a: 42});
-
-        result = _(objNumericDictionary).flatMapDeep(['a', 42]);
-        result = _(objNumericDictionary).flatMapDeep({a: 42});
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<string>;
-
-        result = _('abc').chain().flatMapDeep();
-        result = _('abc').chain().flatMapDeep(stringIterator);
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<number>;
-
-        result = _(numArray).chain().flatMapDeep<number>();
-        result = _(numArray).chain().flatMapDeep(listIterator);
-        result = _(objArray).chain().flatMapDeep('a');
-
-        result = _(numList).chain().flatMapDeep<number>();
-        result = _(numList).chain().flatMapDeep(listIterator);
-        result = _(objList).chain().flatMapDeep('a');
-
-        result = _(numDictionary).chain().flatMapDeep<number>();
-        result = _(numDictionary).chain().flatMapDeep(dictionaryIterator);
-        result = _(objDictionary).chain().flatMapDeep('a');
-
-        result = _(numNumericDictionary).chain().flatMapDeep<number>();
-        result = _(numNumericDictionary).chain().flatMapDeep(numericDictionaryIterator);
-        result = _(objNumericDictionary).chain().flatMapDeep('a');
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<boolean>;
-
-        result = _(objArray).chain().flatMapDeep(['a', 42]);
-        result = _(objArray).chain().flatMapDeep({a: 42});
-
-        result = _(objList).chain().flatMapDeep(['a', 42]);
-        result = _(objList).chain().flatMapDeep({a: 42});
-
-        result = _(objDictionary).chain().flatMapDeep(['a', 42]);
-        result = _(objDictionary).chain().flatMapDeep({a: 42});
-
-        result = _(objNumericDictionary).chain().flatMapDeep(['a', 42]);
-        result = _(objNumericDictionary).chain().flatMapDeep({a: 42});
-    }
+    fp.flatMapDeep(valueIterator, numList); // $ExpectType number[]
+    fp.flatMapDeep(valueIterator)(numList); // $ExpectType number[]
+    fp.flatMapDeep("a", objList); // $ExpectType any[]
+    fp.flatMapDeep({ a: 42 }, objList); // $ExpectType boolean[]
+    fp.flatMapDeep(["a", 42], objList); // $ExpectType boolean[]
+    fp.flatMapDeep(valueIterator, numDictionary); // $ExpectType number[]
+    fp.flatMapDeep("a", objDictionary); // $ExpectType any[]
+    fp.flatMapDeep({ a: 42 }, objDictionary); // $ExpectType boolean[]
+    fp.flatMapDeep(["a", 42], objDictionary); // $ExpectType boolean[]
+    fp.flatMapDeep(valueIterator, numNumericDictionary); // $ExpectType number[]
+    fp.flatMapDeep("a", objNumericDictionary); // $ExpectType any[]
+    fp.flatMapDeep({ a: 42 }, objNumericDictionary); // $ExpectType boolean[]
+    fp.flatMapDeep(["a", 42], objNumericDictionary); // $ExpectType boolean[]
 }
 
 // _.flatMapDepth
-namespace TestFlatMapDepth {
-    let numArray: Array<number|number[]> | null | undefined = [1, [2, 3]] as any;
-    let objArray: Array<{a: number}|Array<{a: number}>> | null | undefined = [{a: 1}, [{a: 2}, {a: 3}]] as any;
+{
+    const numList: _.List<number|number[]> | null | undefined = anything;
+    const objList: _.List<{a: number}|Array<{a: number}>> | null | undefined = anything;
+    const numDictionary: _.Dictionary<number|number[]> | null | undefined = anything;
+    const objDictionary: _.Dictionary<{a: number}|Array<{a: number}>> | null | undefined = anything;
+    const numNumericDictionary: _.NumericDictionary<number|number[]> | null | undefined = anything;
+    const objNumericDictionary: _.NumericDictionary<{a: number}|Array<{a: number}>> | null | undefined = anything;
 
-    let numList: _.List<number|number[]> | null | undefined = anything;
-    let objList: _.List<{a: number}|Array<{a: number}>> | null | undefined = anything;
+    const stringIterator = (value: string, index: number, collection: _.List<string>): _.ListOfRecursiveArraysOrValues<string> | string => "";
+    const listIterator = (value: number | number[], index: number, collection: _.List<number | number[]>): _.ListOfRecursiveArraysOrValues<number> | number => 1;
+    const dictionaryIterator = (value: number | number[], key: string, collection: _.Dictionary<number | number[]>): _.ListOfRecursiveArraysOrValues<number> | number => 1;
+    const numericDictionaryIterator = (value: number | number[], key: string, collection: _.NumericDictionary<number | number[]>): _.ListOfRecursiveArraysOrValues<number> | number => 1;
+    const valueIterator = (value: number | number[]): _.ListOfRecursiveArraysOrValues<number> | number => 1;
 
-    let numDictionary: _.Dictionary<number|number[]> | null | undefined = anything;
-    let objDictionary: _.Dictionary<{a: number}|Array<{a: number}>> | null | undefined = anything;
+    _.flatMapDepth("abc"); // $ExpectType string[]
+    _.flatMapDepth("abc", stringIterator); // $ExpectType string[]
+    _.flatMapDepth("abc", stringIterator, 3); // $ExpectType string[]
+    _.flatMapDepth(numList, listIterator, 3); // $ExpectType number[]
+    _.flatMapDepth(objList, "a", 3); // $ExpectType any[]
+    _.flatMapDepth(objList, ["a", 42], 3); // $ExpectType boolean[]
+    _.flatMapDepth(objList, { a: 42 }, 3); // $ExpectType boolean[]
+    _.flatMapDepth(numDictionary, dictionaryIterator, 3); // $ExpectType number[]
+    _.flatMapDepth(objDictionary, "a", 3); // $ExpectType any[]
+    _.flatMapDepth(objDictionary, ["a", 42], 3); // $ExpectType boolean[]
+    _.flatMapDepth(objDictionary, { a: 42 }, 3); // $ExpectType boolean[]
+    _.flatMapDepth(numNumericDictionary, numericDictionaryIterator, 3); // $ExpectType number[]
+    _.flatMapDepth(objNumericDictionary, "a", 3); // $ExpectType any[]
+    _.flatMapDepth(objNumericDictionary, ["a", 42], 3); // $ExpectType boolean[]
+    _.flatMapDepth(objNumericDictionary, { a: 42 }, 3); // $ExpectType boolean[]
 
-    let numNumericDictionary: _.NumericDictionary<number|number[]> | null | undefined = anything;
-    let objNumericDictionary: _.NumericDictionary<{a: number}|Array<{a: number}>> | null | undefined = anything;
+    _("abc").flatMapDepth(stringIterator, 3); // $ExpectType LoDashImplicitWrapper<string[]>
+    _(numList).flatMapDepth(listIterator, 3); // $ExpectType LoDashImplicitWrapper<number[]>
+    _(objList).flatMapDepth("a", 3); // $ExpectType LoDashImplicitWrapper<any[]>
+    _(objList).flatMapDepth(["a", 42], 3); // $ExpectType LoDashImplicitWrapper<boolean[]>
+    _(objList).flatMapDepth({ a: 42 }, 3); // $ExpectType LoDashImplicitWrapper<boolean[]>
+    _(numDictionary).flatMapDepth(dictionaryIterator, 3); // $ExpectType LoDashImplicitWrapper<number[]>
+    _(objDictionary).flatMapDepth("a", 3); // $ExpectType LoDashImplicitWrapper<any[]>
+    _(numNumericDictionary).flatMapDepth(numericDictionaryIterator, 3); // $ExpectType LoDashImplicitWrapper<number[]>
+    _(objNumericDictionary).flatMapDepth("a", 3); // $ExpectType LoDashImplicitWrapper<any[]>
 
-    let stringIterator: (value: string, index: number, collection: _.List<string>) => _.ListOfRecursiveArraysOrValues<string> = (a, b, c) => "";
+    _.chain("abc").flatMapDepth(stringIterator, 3); // $ExpectType LoDashExplicitWrapper<string[]>
+    _.chain(numList).flatMapDepth(listIterator, 3); // $ExpectType LoDashExplicitWrapper<number[]>
+    _.chain(objList).flatMapDepth("a", 3); // $ExpectType LoDashExplicitWrapper<any[]>
+    _.chain(objList).flatMapDepth(["a", 42], 3); // $ExpectType LoDashExplicitWrapper<boolean[]>
+    _.chain(objList).flatMapDepth({ a: 42 }, 3); // $ExpectType LoDashExplicitWrapper<boolean[]>
+    _.chain(numDictionary).flatMapDepth(dictionaryIterator, 3); // $ExpectType LoDashExplicitWrapper<number[]>
+    _.chain(objDictionary).flatMapDepth("a", 3); // $ExpectType LoDashExplicitWrapper<any[]>
+    _.chain(numNumericDictionary).flatMapDepth(numericDictionaryIterator, 3); // $ExpectType LoDashExplicitWrapper<number[]>
+    _.chain(objNumericDictionary).flatMapDepth("a", 3); // $ExpectType LoDashExplicitWrapper<any[]>
 
-    let listIterator: (value: number|number[], index: number, collection: _.List<number|number[]>) => _.ListOfRecursiveArraysOrValues<number> = (a, b, c) =>[ 1];
-
-    let dictionaryIterator: (value: number|number[], key: string, collection: _.Dictionary<number|number[]>) => _.ListOfRecursiveArraysOrValues<number> = (a, b, c) => [1];
-
-    let numericDictionaryIterator: (value: number|number[], key: string, collection: _.NumericDictionary<number|number[]>) => _.ListOfRecursiveArraysOrValues<number> = (a, b, c) => [1];
-
-    {
-        let result: string[];
-
-        result = _.flatMapDepth('abc');
-
-        result = _.flatMapDepth('abc', stringIterator, 1);
-    }
-
-    {
-        let result: number[];
-
-        result = _.flatMapDepth<number>(numArray);
-
-        result = _.flatMapDepth(numArray, listIterator, 1);
-
-        result = _.flatMapDepth(objArray, 'a');
-
-        result = _.flatMapDepth<number>(numList);
-
-        result = _.flatMapDepth(numList, listIterator, 1);
-
-        result = _.flatMapDepth(objList, 'a', 1);
-
-        result = _.flatMapDepth<number>(numDictionary);
-
-        result = _.flatMapDepth(numDictionary, dictionaryIterator, 1);
-
-        result = _.flatMapDepth(objDictionary, 'a', 1);
-
-        result = _.flatMapDepth<number>(numNumericDictionary);
-
-        result = _.flatMapDepth(numNumericDictionary, numericDictionaryIterator, 1);
-
-        result = _.flatMapDepth(objNumericDictionary, 'a', 1);
-    }
-
-    {
-        let result: boolean[];
-
-        result = _.flatMapDepth(objArray, ['a', 42], 1);
-        result = _.flatMapDepth(objArray, {'a': 42}, 1);
-
-        result = _.flatMapDepth(objList, ['a', 42], 1);
-        result = _.flatMapDepth(objList, {'a': 42}, 1);
-
-        result = _.flatMapDepth(objDictionary, ['a', 42], 1);
-        result = _.flatMapDepth(objDictionary, {'a': 42}, 1);
-
-        result = _.flatMapDepth(objNumericDictionary, ['a', 42], 1);
-        result = _.flatMapDepth(objNumericDictionary, {'a': 42}, 1);
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<string>;
-
-        result = _('abc').flatMapDepth();
-        result = _('abc').flatMapDepth(stringIterator, 1);
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<number>;
-
-        result = _(numArray).flatMapDepth<number>();
-        result = _(numArray).flatMapDepth(listIterator, 1);
-        result = _(objArray).flatMapDepth('a', 1);
-
-        result = _(numList).flatMapDepth<number>();
-        result = _(numList).flatMapDepth(listIterator, 1);
-        result = _(objList).flatMapDepth('a', 1);
-
-        result = _(numDictionary).flatMapDepth<number>();
-        result = _(numDictionary).flatMapDepth(dictionaryIterator, 1);
-        result = _(objDictionary).flatMapDepth('a', 1);
-
-        result = _(numNumericDictionary).flatMapDepth<number>();
-        result = _(numNumericDictionary).flatMapDepth(numericDictionaryIterator, 1);
-        result = _(objNumericDictionary).flatMapDepth('a', 1);
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<boolean>;
-
-        result = _(objArray).flatMapDepth(['a', 42], 1);
-        result = _(objArray).flatMapDepth({a: 42}, 1);
-
-        result = _(objList).flatMapDepth(['a', 42], 1);
-        result = _(objList).flatMapDepth({a: 42}, 1);
-
-        result = _(objDictionary).flatMapDepth(['a', 42], 1);
-        result = _(objDictionary).flatMapDepth({a: 42}, 1);
-
-        result = _(objNumericDictionary).flatMapDepth(['a', 42], 1);
-        result = _(objNumericDictionary).flatMapDepth({a: 42}, 1);
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<string>;
-
-        result = _('abc').chain().flatMapDepth();
-        result = _('abc').chain().flatMapDepth(stringIterator, 1);
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<number>;
-
-        result = _(numArray).chain().flatMapDepth<number>();
-        result = _(numArray).chain().flatMapDepth(listIterator, 1);
-        result = _(objArray).chain().flatMapDepth('a', 1);
-
-        result = _(numList).chain().flatMapDepth<number>();
-        result = _(numList).chain().flatMapDepth(listIterator, 1);
-        result = _(objList).chain().flatMapDepth('a', 1);
-
-        result = _(numDictionary).chain().flatMapDepth<number>();
-        result = _(numDictionary).chain().flatMapDepth(dictionaryIterator, 1);
-        result = _(objDictionary).chain().flatMapDepth('a', 1);
-
-        result = _(numNumericDictionary).chain().flatMapDepth<number>();
-        result = _(numNumericDictionary).chain().flatMapDepth(numericDictionaryIterator, 1);
-        result = _(objNumericDictionary).chain().flatMapDepth('a', 1);
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<boolean>;
-
-        result = _(objArray).chain().flatMapDepth(['a', 42], 1);
-        result = _(objArray).chain().flatMapDepth({a: 42}, 1);
-
-        result = _(objList).chain().flatMapDepth(['a', 42], 1);
-        result = _(objList).chain().flatMapDepth({a: 42}, 1);
-
-        result = _(objDictionary).chain().flatMapDepth(['a', 42], 1);
-        result = _(objDictionary).chain().flatMapDepth({a: 42}, 1);
-
-        result = _(objNumericDictionary).chain().flatMapDepth(['a', 42], 1);
-        result = _(objNumericDictionary).chain().flatMapDepth({a: 42}, 1);
-    }
+    fp.flatMapDepth(valueIterator, 3, numList); // $ExpectType number[]
+    fp.flatMapDepth(valueIterator)(3)(numList); // $ExpectType number[]
+    fp.flatMapDepth("a", 3, objList); // $ExpectType any[]
+    fp.flatMapDepth({ a: 42 }, 3, objList); // $ExpectType boolean[]
+    fp.flatMapDepth(["a", 42], 3, objList); // $ExpectType boolean[]
+    fp.flatMapDepth(valueIterator, 3, numDictionary); // $ExpectType number[]
+    fp.flatMapDepth("a", 3, objDictionary); // $ExpectType any[]
+    fp.flatMapDepth({ a: 42 }, 3, objDictionary); // $ExpectType boolean[]
+    fp.flatMapDepth(["a", 42], 3, objDictionary); // $ExpectType boolean[]
+    fp.flatMapDepth(valueIterator, 3, numNumericDictionary); // $ExpectType number[]
+    fp.flatMapDepth("a", 3, objNumericDictionary); // $ExpectType any[]
+    fp.flatMapDepth({ a: 42 }, 3, objNumericDictionary); // $ExpectType boolean[]
+    fp.flatMapDepth(["a", 42], 3, objNumericDictionary); // $ExpectType boolean[]
 }
 
 // _.forEach
-namespace TestForEach {
+// _.forEachRight
+// _.each
+// _.eachRight
+{
     const str: string = anything;
     const nilStr: string | null | undefined = anything;
     const array: AbcObject[] = anything;
@@ -5448,7 +2436,7 @@ namespace TestForEach {
 
     // $ExpectType LoDashImplicitWrapper<NumericDictionary<AbcObject>>
     _(numericDictionary).forEach((value, index, collection) => {
-        /* Broken in TS 2.4: value; // AbcObject */
+        // Broken in TS 2.4: value; // AbcObject
         index; // $ExpectType string
         collection; // $ExpectType NumericDictionary<AbcObject>
     });
@@ -5461,2489 +2449,1369 @@ namespace TestForEach {
     });
 
     // $ExpectType LoDashExplicitWrapper<string>
-    _(str).chain().forEach((value, index, collection) => {
+    _.chain(str).forEach((value, index, collection) => {
         value; // $ExpectType string
         index; // $ExpectType number
         collection; // $ExpectType string
     });
 
     // $ExpectType LoDashExplicitWrapper<string | null | undefined>
-    _(nilStr).chain().forEach((value, index, collection) => {
+    _.chain(nilStr).forEach((value, index, collection) => {
         value; // $ExpectType string
         index; // $ExpectType number
         collection; // $ExpectType string
     });
 
     // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-    _(array).chain().forEach((value, index, collection) => {
+    _.chain(array).forEach((value, index, collection) => {
         value; // $ExpectType AbcObject
         index; // $ExpectType number
         collection; // $ExpectType AbcObject[]
     });
 
     // $ExpectType LoDashExplicitWrapper<AbcObject[] | null | undefined>
-    _(nilArray).chain().forEach((value, index, collection) => {
+    _.chain(nilArray).forEach((value, index, collection) => {
         value; // $ExpectType AbcObject
         index; // $ExpectType number
         collection; // $ExpectType AbcObject[]
     });
 
     // $ExpectType LoDashExplicitWrapper<ArrayLike<AbcObject>>
-    _(list).chain().forEach((value, index, collection) => {
+    _.chain(list).forEach((value, index, collection) => {
         value; // $ExpectType AbcObject
         index; // $ExpectType number
         collection; // $ExpectType ArrayLike<AbcObject>
     });
 
     // $ExpectType LoDashExplicitWrapper<ArrayLike<AbcObject> | null | undefined>
-    _(nilList).chain().forEach((value, index, collection) => {
+    _.chain(nilList).forEach((value, index, collection) => {
         value; // $ExpectType AbcObject
         index; // $ExpectType number
         collection; // $ExpectType ArrayLike<AbcObject>
     });
 
     // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
-    _(dictionary).chain().forEach((value, index, collection) => {
+    _.chain(dictionary).forEach((value, index, collection) => {
         value; // $ExpectType AbcObject
         index; // $ExpectType string
         collection; // $ExpectType Dictionary<AbcObject>
     });
 
     // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject> | null | undefined>
-    _(nilDictionary).chain().forEach((value, index, collection) => {
+    _.chain(nilDictionary).forEach((value, index, collection) => {
         value; // $ExpectType AbcObject
         index; // $ExpectType string
         collection; // $ExpectType Dictionary<AbcObject>
     });
 
     // $ExpectType LoDashExplicitWrapper<NumericDictionary<AbcObject>>
-    _(numericDictionary).chain().forEach((value, index, collection) => {
-        /* Broken in TS 2.4: value; // AbcObject */
+    _.chain(numericDictionary).forEach((value, index, collection) => {
+        // Broken in TS 2.4: value; // AbcObject
         index; // $ExpectType string
         collection; // $ExpectType NumericDictionary<AbcObject>
     });
 
     // $ExpectType LoDashExplicitWrapper<NumericDictionary<AbcObject> | null | undefined>
-    _(nilNumericDictionary).chain().forEach((value, index, collection) => {
-        /* Broken in TS 2.4: value; // AbcObject */
+    _.chain(nilNumericDictionary).forEach((value, index, collection) => {
+        // Broken in TS 2.4: value; // AbcObject
         index; // $ExpectType string
         collection; // $ExpectType NumericDictionary<AbcObject>
     });
-}
 
-// _.forEachRight
-namespace TestForEachRight {
-    let array: AbcObject[] = [];
-    let list: _.List<AbcObject> = [];
-    let dictionary: _.Dictionary<AbcObject> = {};
-    let nilArray: AbcObject[] | null | undefined = [] as any;
-    let nilList: _.List<AbcObject> | null | undefined = [] as any;
-    let nilDictionary: _.Dictionary<AbcObject> | null | undefined = anything;
+    const stringIterator2 = (char: string) => 1;
+    const listIterator2 = (value: AbcObject) => 1;
+    fp.forEach(stringIterator2, ""); // $ExpectType string
+    fp.forEach(listIterator2, array); // $ExpectType AbcObject[]
+    fp.forEach(listIterator2)(array); // $ExpectType AbcObject[]
+    fp.forEach(listIterator2, list); // $ExpectType ArrayLike<AbcObject>
+    fp.forEach(listIterator2, dictionary); // $ExpectType Dictionary<AbcObject>
+    fp.forEach(listIterator2, nilArray); // $ExpectType AbcObject[] | null | undefined
+    fp.forEach(listIterator2, nilList); // $ExpectType ArrayLike<AbcObject> | null | undefined
+    fp.forEach(listIterator2, nilDictionary); // $ExpectType Dictionary<AbcObject> | null | undefined
 
-    let listIterator: (value: AbcObject, index: number, collection: _.List<AbcObject>) => any = (value: AbcObject, index: number, collection: _.List<AbcObject>) => 1;
-    let dictionaryIterator: (value: AbcObject, key: string, collection: _.Dictionary<AbcObject>) => any = (value: AbcObject, key: string, collection: _.Dictionary<AbcObject>) => 1;
+    // $ExpectType AbcObject[]
+    _.forEachRight(array, (value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType AbcObject[]
+    });
+    // $ExpectType ArrayLike<AbcObject> | null | undefined
+    _.forEachRight(nilList, (value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType ArrayLike<AbcObject>
+    });
+    // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(array).forEachRight((value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType AbcObject[]
+    });
+    // $ExpectType LoDashImplicitWrapper<ArrayLike<AbcObject> | null | undefined>
+    _(nilList).forEachRight((value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType ArrayLike<AbcObject>
+    });
+    // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(array).forEachRight((value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType AbcObject[]
+    });
+    // $ExpectType LoDashExplicitWrapper<ArrayLike<AbcObject> | null | undefined>
+    _.chain(nilList).forEachRight((value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType ArrayLike<AbcObject>
+    });
+    fp.forEachRight(listIterator2, array); // $ExpectType AbcObject[]
+    fp.forEachRight(listIterator2)(array); // $ExpectType AbcObject[]
 
-    {
-        let result: string;
+    // $ExpectType AbcObject[]
+    _.each(array, (value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType AbcObject[]
+    });
+    // $ExpectType ArrayLike<AbcObject> | null | undefined
+    _.each(nilList, (value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType ArrayLike<AbcObject>
+    });
+    // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(array).each((value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType AbcObject[]
+    });
+    // $ExpectType LoDashImplicitWrapper<ArrayLike<AbcObject> | null | undefined>
+    _(nilList).each((value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType ArrayLike<AbcObject>
+    });
+    // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(array).each((value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType AbcObject[]
+    });
+    // $ExpectType LoDashExplicitWrapper<ArrayLike<AbcObject> | null | undefined>
+    _.chain(nilList).each((value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType ArrayLike<AbcObject>
+    });
+    fp.each(listIterator2, array); // $ExpectType AbcObject[]
+    fp.each(listIterator2)(array); // $ExpectType AbcObject[]
 
-        result = _.forEachRight('', (value, index, collection) => {
-            value; // $ExpectType string
-            index; // $ExpectType number
-            collection; // $ExpectType string
-        });
-    }
-
-    {
-        let result: string | null | undefined;
-
-        result = _.forEachRight('' as (string | null | undefined), (value, index, collection) => {
-            value; // $ExpectType string
-            index; // $ExpectType number
-            collection; // $ExpectType string
-        });
-    }
-
-    {
-        let result: AbcObject[];
-
-        result = _.forEachRight(array, (value, index, collection) => {
-            value; // $ExpectType AbcObject
-            index; // $ExpectType number
-            collection; // $ExpectType AbcObject[]
-        });
-    }
-
-    {
-        let result: AbcObject[] | null | undefined;
-
-        result = _.forEachRight(nilArray, (value, index, collection) => {
-            value; // $ExpectType AbcObject
-            index; // $ExpectType number
-            collection; // $ExpectType AbcObject[]
-        });
-    }
-
-    {
-        let result: _.List<AbcObject>;
-
-        result = _.forEachRight(list, (value, index, collection) => {
-            value; // $ExpectType AbcObject
-            index; // $ExpectType number
-            collection; // $ExpectType ArrayLike<AbcObject>
-        });
-    }
-
-    {
-        let result: _.List<AbcObject> | null | undefined;
-
-        result = _.forEachRight(nilList, (value, index, collection) => {
-            value; // $ExpectType AbcObject
-            index; // $ExpectType number
-            collection; // $ExpectType ArrayLike<AbcObject>
-        });
-    }
-
-    {
-        let result: _.Dictionary<AbcObject>;
-
-        result = _.forEachRight(dictionary, (value, index, collection) => {
-            value; // $ExpectType AbcObject
-            index; // $ExpectType string
-            collection; // $ExpectType Dictionary<AbcObject>
-        });
-    }
-
-    {
-        let result: _.Dictionary<AbcObject> | null | undefined;
-
-        result = _.forEachRight(nilDictionary, (value, index, collection) => {
-            value; // $ExpectType AbcObject
-            index; // $ExpectType string
-            collection; // $ExpectType Dictionary<AbcObject>
-        });
-    }
-
-    {
-        let result: _.LoDashImplicitWrapper<string>;
-
-        result = _('').forEachRight((value, index, collection) => {
-            value; // $ExpectType string
-            index; // $ExpectType number
-            collection; // $ExpectType string
-        });
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<AbcObject>;
-
-        result = _(array).forEachRight(listIterator);
-    }
-
-    {
-        let result: _.LoDashImplicitNillableArrayWrapper<AbcObject>;
-
-        result = _(nilArray).forEachRight(listIterator);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<_.List<AbcObject>>;
-
-        result = _(list).forEachRight(listIterator);
-    }
-
-    {
-        let result: _.LoDashImplicitNillableObjectWrapper<_.List<AbcObject>>;
-
-        result = _(nilList).forEachRight(listIterator);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<_.Dictionary<AbcObject>>;
-
-        result = _(dictionary).forEachRight(dictionaryIterator);
-    }
-
-    {
-        let result: _.LoDashImplicitNillableObjectWrapper<_.Dictionary<AbcObject>>;
-
-        result = _(nilDictionary).forEachRight(dictionaryIterator);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<string>;
-
-        result = _('').chain().forEachRight((value, index, collection) => {
-            value; // $ExpectType string
-            index; // $ExpectType number
-            collection; // $ExpectType string
-        });
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<AbcObject>;
-
-        result = _(array).chain().forEachRight((value, index, collection) => {
-            value; // $ExpectType AbcObject
-            index; // $ExpectType number
-            collection; // $ExpectType AbcObject[]
-        });
-    }
-
-    {
-        let result: _.LoDashExplicitNillableArrayWrapper<AbcObject>;
-
-        result = _(nilArray).chain().forEachRight((value, index, collection) => {
-            value; // $ExpectType AbcObject
-            index; // $ExpectType number
-            collection; // $ExpectType AbcObject[]
-        });
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<_.List<AbcObject>>;
-
-        result = _(list).chain().forEachRight(listIterator);
-    }
-
-    {
-        let result: _.LoDashExplicitNillableObjectWrapper<_.List<AbcObject>>;
-
-        result = _(nilList).chain().forEachRight(listIterator);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<_.Dictionary<AbcObject>>;
-
-        result = _(dictionary).chain().forEachRight(dictionaryIterator);
-    }
-
-    {
-        let result: _.LoDashExplicitNillableObjectWrapper<_.Dictionary<AbcObject>>;
-
-        result = _(nilDictionary).chain().forEachRight(dictionaryIterator);
-    }
+    // $ExpectType AbcObject[]
+    _.eachRight(array, (value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType AbcObject[]
+    });
+    // $ExpectType ArrayLike<AbcObject> | null | undefined
+    _.eachRight(nilList, (value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType ArrayLike<AbcObject>
+    });
+    // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(array).eachRight((value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType AbcObject[]
+    });
+    // $ExpectType LoDashImplicitWrapper<ArrayLike<AbcObject> | null | undefined>
+    _(nilList).eachRight((value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType ArrayLike<AbcObject>
+    });
+    // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(array).eachRight((value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType AbcObject[]
+    });
+    // $ExpectType LoDashExplicitWrapper<ArrayLike<AbcObject> | null | undefined>
+    _.chain(nilList).eachRight((value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType ArrayLike<AbcObject>
+    });
+    fp.eachRight(listIterator2, array); // $ExpectType AbcObject[]
+    fp.eachRight(listIterator2)(array); // $ExpectType AbcObject[]
 }
 
 // _.groupBy
-namespace TestGroupBy {
-    type SampleType = {a: number; b: string; c: boolean;};
+{
+    const list: _.List<AbcObject> | null | undefined = [] as any;
+    const dictionary: _.Dictionary<AbcObject> | null | undefined = anything;
 
-    let array: SampleType[] | null | undefined = [] as any;
-    let list: _.List<SampleType> | null | undefined = [] as any;
-    let dictionary: _.Dictionary<SampleType> | null | undefined = anything;
+    const stringIterator = (char: string, index: number, string: string) => 0;
+    const listIterator = (value: AbcObject, index: number, collection: _.List<AbcObject>) => 0;
+    const dictionaryIterator = (value: AbcObject, key: string, collection: _.Dictionary<AbcObject>) => 0;
+    const valueIterator = (value: AbcObject) => 0;
 
-    let stringIterator = (char: string, index: number, string: string) => 0;
-    let listIterator = (value: SampleType, index: number, collection: _.List<SampleType>) => 0;
-    let dictionaryIterator = (value: SampleType, key: string, collection: _.Dictionary<SampleType>) => 0;
+    _.groupBy(""); // $ExpectType Dictionary<string[]>
+    _.groupBy("", stringIterator); // $ExpectType Dictionary<string[]>
+    _.groupBy(list); // $ExpectType Dictionary<AbcObject[]>
+    _.groupBy(list, listIterator); // $ExpectType Dictionary<AbcObject[]>
+    _.groupBy(list, "a"); // $ExpectType Dictionary<AbcObject[]>
+    _.groupBy(list, { a: 42 }); // $ExpectType Dictionary<AbcObject[]>
+    _.groupBy(dictionary); // $ExpectType Dictionary<AbcObject[]>
+    _.groupBy(dictionary, dictionaryIterator); // $ExpectType Dictionary<AbcObject[]>
+    _.groupBy(dictionary, ""); // $ExpectType Dictionary<AbcObject[]>
+    _.groupBy(dictionary, { a: 42 }); // $ExpectType Dictionary<AbcObject[]>
 
-    {
-        let result: _.Dictionary<string[]>;
+    _("").groupBy(); // $ExpectType LoDashImplicitWrapper<Dictionary<string[]>>
+    _("").groupBy((char: string, index: number, string: ArrayLike<string>) => 0); // $ExpectType LoDashImplicitWrapper<Dictionary<string[]>>
+    _(list).groupBy(); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject[]>>
+    _(list).groupBy(listIterator); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject[]>>
+    _(list).groupBy(""); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject[]>>
+    _(list).groupBy({ a: 42 }); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject[]>>
+    _(dictionary).groupBy(); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject[]>>
+    _(dictionary).groupBy(dictionaryIterator); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject[]>>
+    _(dictionary).groupBy(""); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject[]>>
+    _(dictionary).groupBy({ a: 42 }); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject[]>>
 
-        result = _.groupBy('');
-        result = _.groupBy('', stringIterator);
-    }
+    _.chain("").groupBy(); // $ExpectType LoDashExplicitWrapper<Dictionary<string[]>>
+    _.chain("").groupBy((char: string, index: number, string: ArrayLike<string>) => 0); // $ExpectType LoDashExplicitWrapper<Dictionary<string[]>>
+    _.chain(list).groupBy(); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject[]>>
+    _.chain(list).groupBy(listIterator); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject[]>>
+    _.chain(list).groupBy(""); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject[]>>
+    _.chain(list).groupBy({ a: 42 }); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject[]>>
+    _.chain(dictionary).groupBy(); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject[]>>
+    _.chain(dictionary).groupBy(dictionaryIterator); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject[]>>
+    _.chain(dictionary).groupBy(""); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject[]>>
+    _.chain(dictionary).groupBy({ a: 42 }); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject[]>>
 
-    {
-        let result: _.Dictionary<SampleType[]>;
-
-        result = _.groupBy<SampleType>(array);
-        result = _.groupBy<SampleType>(array, listIterator);
-        result = _.groupBy<SampleType>(array, '');
-        result = _.groupBy<SampleType>(array, {a: 42});
-
-        result = _.groupBy<SampleType>(list);
-        result = _.groupBy<SampleType>(list, listIterator);
-        result = _.groupBy<SampleType>(list, '');
-        result = _.groupBy<SampleType>(list, {a: 42});
-
-        result = _.groupBy(dictionary);
-        result = _.groupBy(dictionary, dictionaryIterator);
-        result = _.groupBy(dictionary, '');
-        result = _.groupBy(dictionary, {a: 42});
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<_.Dictionary<string[]>>;
-
-        result = _('').groupBy();
-        result = _('').groupBy((char: string, index: number, string: ArrayLike<string>) => 0);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<_.Dictionary<SampleType[]>>;
-
-        result = _(array).groupBy();
-        result = _(array).groupBy(listIterator);
-        result = _(array).groupBy('');
-        result = _(array).groupBy({a: 42});
-
-        result = _(list).groupBy();
-        result = _(list).groupBy(listIterator);
-        result = _(list).groupBy('');
-        result = _(list).groupBy({a: 42});
-
-        result = _(dictionary).groupBy();
-        result = _(dictionary).groupBy(dictionaryIterator);
-        result = _(dictionary).groupBy('');
-        result = _(dictionary).groupBy({a: 42});
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<_.Dictionary<string[]>>;
-
-        result = _('').chain().groupBy();
-        result = _('').chain().groupBy((char: string, index: number, string: ArrayLike<string>) => 0);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<_.Dictionary<SampleType[]>>;
-
-        result = _(array).chain().groupBy();
-        result = _(array).chain().groupBy(listIterator);
-        result = _(array).chain().groupBy('');
-        result = _(array).chain().groupBy({a: 42});
-
-        result = _(list).chain().groupBy();
-        result = _(list).chain().groupBy(listIterator);
-        result = _(list).chain().groupBy('');
-        result = _(list).chain().groupBy({a: 42});
-
-        result = _(dictionary).chain().groupBy();
-        result = _(dictionary).chain().groupBy(dictionaryIterator);
-        result = _(dictionary).chain().groupBy('');
-        result = _(dictionary).chain().groupBy({a: 42});
-    }
+    fp.groupBy(valueIterator, list); // $ExpectType Dictionary<AbcObject[]>
+    fp.groupBy(valueIterator)(list); // $ExpectType Dictionary<AbcObject[]>
+    fp.groupBy("a", list); // $ExpectType Dictionary<AbcObject[]>
+    fp.groupBy({ a: 42 }, list); // $ExpectType Dictionary<AbcObject[]>
+    fp.groupBy(["a", 42], list); // $ExpectType Dictionary<AbcObject[]>
+    fp.groupBy(valueIterator, dictionary); // $ExpectType Dictionary<AbcObject[]>
+    fp.groupBy("a", dictionary); // $ExpectType Dictionary<AbcObject[]>
+    fp.groupBy({ a: 42 }, dictionary); // $ExpectType Dictionary<AbcObject[]>
+    fp.groupBy(["a", 42], dictionary); // $ExpectType Dictionary<AbcObject[]>
 }
 
 // _.includes
-namespace TestIncludes {
-    type SampleType = {a: string; b: number; c: boolean;};
+{
+    const list: _.List<AbcObject> | null | undefined = anything;
+    const dictionary: _.Dictionary<AbcObject> | null | undefined = anything;
+    const target: AbcObject = { a: 42, b: "", c: true };
 
-    let array: SampleType[] | null | undefined = [] as any;
-    let list: _.List<SampleType> | null | undefined = [] as any;
-    let obj: any = {};
-    let dictionary: _.Dictionary<SampleType> | null | undefined = obj;
+    _.includes(list, target); // $ExpectType boolean
+    _.includes(list, target, 42); // $ExpectType boolean
+    _.includes(dictionary, target); // $ExpectType boolean
+    _.includes(dictionary, target, 42); // $ExpectType boolean
 
-    let target: SampleType = { a: "", b: 1, c: true };
+    _(list).includes(target); // $ExpectType boolean
+    _(list).includes(target, 42); // $ExpectType boolean
+    _(dictionary).includes(target); // $ExpectType boolean
+    _(dictionary).includes(target, 42); // $ExpectType boolean
 
-    {
-        let result: boolean;
+    _.chain(list).includes(target); // $ExpectType LoDashExplicitWrapper<boolean>
+    _.chain(list).includes(target, 42); // $ExpectType LoDashExplicitWrapper<boolean>
+    _.chain(dictionary).includes(target); // $ExpectType LoDashExplicitWrapper<boolean>
+    _.chain(dictionary).includes(target, 42); // $ExpectType LoDashExplicitWrapper<boolean>
 
-        result = _.includes<SampleType>(array, target);
-        result = _.includes<SampleType>(array, target, 42);
+    fp.includes(target, list); // $ExpectType boolean
+    fp.includes(target)(list); // $ExpectType boolean
+    fp.includes(target, dictionary); // $ExpectType boolean
 
-        result = _.includes<SampleType>(list, target);
-        result = _.includes<SampleType>(list, target, 42);
-
-        result = _.includes<SampleType>(dictionary, target);
-        result = _.includes<SampleType>(dictionary, target, 42);
-
-        result = _(array).includes(target);
-        result = _(array).includes(target, 42);
-
-        result = _(list).includes<SampleType>(target);
-        result = _(list).includes<SampleType>(target, 42);
-
-        result = _(dictionary).includes<SampleType>(target);
-        result = _(dictionary).includes<SampleType>(target, 42);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _(array).chain().includes(target);
-        result = _(array).chain().includes(target, 42);
-
-        result = _(list).chain().includes<SampleType>(target);
-        result = _(list).chain().includes<SampleType>(target, 42);
-
-        result = _(dictionary).chain().includes<SampleType>(target);
-        result = _(dictionary).chain().includes<SampleType>(target, 42);
-    }
+    fp.includesFrom(target, 42, list); // $ExpectType boolean
+    fp.includesFrom(target)(42)(list); // $ExpectType boolean
+    fp.includesFrom(target, 42, dictionary); // $ExpectType boolean
 }
 
 // _.keyBy
-namespace TestKeyBy {
-    type SampleObject = {a: number; b: string; c: boolean;};
+{
+    const list: _.List<AbcObject> | null | undefined = anything;
+    const dictionary: _.Dictionary<AbcObject> | null | undefined = anything;
+    const numericDictionary: _.NumericDictionary<AbcObject> | null | undefined = anything;
 
-    let array: SampleObject[] | null | undefined = [] as any;
-    let list: _.List<SampleObject> | null | undefined = [] as any;
-    let obj: any = {};
-    let dictionary: _.Dictionary<SampleObject> | null | undefined = obj;
-    let numericDictionary: _.NumericDictionary<SampleObject> | null | undefined = obj;
+    const stringIterator = (value: string, index: number, collection: string) => "a";
+    const listIterator = (value: AbcObject, index: number, collection: _.List<AbcObject>) => 1;
+    const dictionaryIterator = (value: AbcObject, key: string, collection: _.Dictionary<AbcObject>) => Symbol.name;
+    const numericDictionaryIterator = (value: AbcObject, key: string, collection: _.NumericDictionary<AbcObject>) => "a";
+    const valueIterator = (value: AbcObject) => 1;
 
-    let stringIterator = (value: string, index: number, collection: string) => "a";
-    let listIterator = (value: SampleObject, index: number, collection: _.List<SampleObject>) => 1;
-    let dictionaryIterator = (value: SampleObject, key: string, collection: _.Dictionary<SampleObject>) => Symbol.name;
-    let numericDictionaryIterator = (value: SampleObject, key: string, collection: _.NumericDictionary<SampleObject>) => "a";
+    _.keyBy("abcd"); // $ExpectType Dictionary<string>
+    _.keyBy("abcd", stringIterator); // $ExpectType Dictionary<string>
+    _.keyBy(list); // $ExpectType Dictionary<AbcObject>
+    _.keyBy(list, listIterator); // $ExpectType Dictionary<AbcObject>
+    _.keyBy(list, "a"); // $ExpectType Dictionary<AbcObject>
+    _.keyBy(list, { a: 42 }); // $ExpectType Dictionary<AbcObject>
+    _.keyBy(dictionary); // $ExpectType Dictionary<AbcObject>
+    _.keyBy(dictionary, dictionaryIterator); // $ExpectType Dictionary<AbcObject>
+    _.keyBy(dictionary, "a"); // $ExpectType Dictionary<AbcObject>
+    _.keyBy(dictionary, { a: 42 }); // $ExpectType Dictionary<AbcObject>
+    // These fail in TS 2.4
+    // _.keyBy(numericDictionary); // Dictionary<AbcObject>
+    // _.keyBy(numericDictionary, numericDictionaryIterator); // Dictionary<AbcObject>
+    // _.keyBy(numericDictionary, "a"); // Dictionary<AbcObject>
+    // _.keyBy(numericDictionary, { a: 42 }); // Dictionary<AbcObject>
 
-    {
-        let result: _.Dictionary<string>;
+    _("abcd").keyBy(); // $ExpectType LoDashImplicitWrapper<Dictionary<string>>
+    _("abcd").keyBy(stringIterator); // $ExpectType LoDashImplicitWrapper<Dictionary<string>>
+    _(list).keyBy(); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+    _(list).keyBy(listIterator); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+    _(list).keyBy("a"); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+    _(list).keyBy({ a: 42 }); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+    _(dictionary).keyBy(); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+    _(dictionary).keyBy(dictionaryIterator); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+    _(dictionary).keyBy("a"); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+    _(dictionary).keyBy({ a: 42 }); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+    // These fail in TS 2.4
+    // _(numericDictionary).keyBy(); // LoDashImplicitWrapper<Dictionary<AbcObject>>
+    // _(numericDictionary).keyBy(numericDictionaryIterator); // LoDashImplicitWrapper<Dictionary<AbcObject>>
+    // _(numericDictionary).keyBy("a"); // LoDashImplicitWrapper<Dictionary<AbcObject>>
+    // _(numericDictionary).keyBy({ a: 42 }); // LoDashImplicitWrapper<Dictionary<AbcObject>>
 
-        result = _.keyBy('abcd');
-        result = _.keyBy('abcd', stringIterator);
-    }
+    _.chain("abcd").keyBy(); // $ExpectType LoDashExplicitWrapper<Dictionary<string>>
+    _.chain("abcd").keyBy(stringIterator); // $ExpectType LoDashExplicitWrapper<Dictionary<string>>
+    _.chain(list).keyBy(); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+    _.chain(list).keyBy(listIterator); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+    _.chain(list).keyBy("a"); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+    _.chain(list).keyBy({ a: 42 }); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+    _.chain(dictionary).keyBy(); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+    _.chain(dictionary).keyBy(dictionaryIterator); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+    _.chain(dictionary).keyBy("a"); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+    _.chain(dictionary).keyBy({ a: 42 }); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+    // These fail in TS 2.4
+    // _.chain(numericDictionary).keyBy(); // LoDashExplicitWrapper<Dictionary<AbcObject>>
+    // _.chain(numericDictionary).keyBy(numericDictionaryIterator); // LoDashExplicitWrapper<Dictionary<AbcObject>>
+    // _.chain(numericDictionary).keyBy("a"); // LoDashExplicitWrapper<Dictionary<AbcObject>>
+    // _.chain(numericDictionary).keyBy({ a: 42 }); // LoDashExplicitWrapper<Dictionary<AbcObject>>
 
-    {
-        let result: _.Dictionary<SampleObject>;
-
-        result = _.keyBy(array);
-        result = _.keyBy(array, listIterator);
-        result = _.keyBy(array, 'a');
-        result = _.keyBy(array, {a: 42});
-
-        result = _.keyBy(list);
-        result = _.keyBy(list, listIterator);
-        result = _.keyBy(list, 'a');
-        result = _.keyBy(list, {a: 42});
-
-        result = _.keyBy(numericDictionary);
-        result = _.keyBy(numericDictionary, numericDictionaryIterator);
-        result = _.keyBy(numericDictionary, 'a');
-        result = _.keyBy(numericDictionary, {a: 42});
-
-        result = _.keyBy(dictionary);
-        result = _.keyBy(dictionary, dictionaryIterator);
-        result = _.keyBy(dictionary, 'a');
-        result = _.keyBy(dictionary, {a: 42});
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<_.Dictionary<string>>;
-
-        result = _('abcd').keyBy();
-        result = _('abcd').keyBy(stringIterator);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<_.Dictionary<SampleObject>>;
-
-        result = _(array).keyBy();
-        result = _(array).keyBy(listIterator);
-        result = _(array).keyBy('a');
-        result = _(array).keyBy({a: 42});
-
-        result = _(list).keyBy();
-        result = _(list).keyBy(listIterator);
-        result = _(list).keyBy('a');
-        result = _(list).keyBy({a: 42});
-
-        result = _(numericDictionary).keyBy();
-        result = _(numericDictionary).keyBy(numericDictionaryIterator);
-        result = _(numericDictionary).keyBy('a');
-        result = _(numericDictionary).keyBy({a: 42});
-
-        result = _(dictionary).keyBy();
-        result = _(dictionary).keyBy(dictionaryIterator);
-        result = _(dictionary).keyBy('a');
-        result = _(dictionary).keyBy({a: 42});
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<_.Dictionary<string>>;
-
-        result = _('abcd').chain().keyBy();
-        result = _('abcd').chain().keyBy(stringIterator);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<_.Dictionary<SampleObject>>;
-
-        result = _(array).chain().keyBy();
-        result = _(array).chain().keyBy(listIterator);
-        result = _(array).chain().keyBy('a');
-        result = _(array).chain().keyBy({a: 42});
-
-        result = _(list).chain().keyBy();
-        result = _(list).chain().keyBy(listIterator);
-        result = _(list).chain().keyBy('a');
-        result = _(list).chain().keyBy({a: 42});
-
-        result = _(numericDictionary).chain().keyBy();
-        result = _(numericDictionary).chain().keyBy(numericDictionaryIterator);
-        result = _(numericDictionary).chain().keyBy('a');
-        result = _(numericDictionary).chain().keyBy({a: 42});
-
-        result = _(dictionary).chain().keyBy();
-        result = _(dictionary).chain().keyBy(dictionaryIterator);
-        result = _(dictionary).chain().keyBy('a');
-        result = _(dictionary).chain().keyBy({a: 42});
-    }
+    fp.keyBy(valueIterator, list); // $ExpectType Dictionary<AbcObject>
+    fp.keyBy(valueIterator)(list); // $ExpectType Dictionary<AbcObject>
+    fp.keyBy("a", list); // $ExpectType Dictionary<AbcObject>
+    fp.keyBy({ a: 42 }, list); // $ExpectType Dictionary<AbcObject>
+    fp.keyBy(["a", 42], list); // $ExpectType Dictionary<AbcObject>
+    fp.keyBy(valueIterator, dictionary); // $ExpectType Dictionary<AbcObject>
+    fp.keyBy("a", dictionary); // $ExpectType Dictionary<AbcObject>
+    fp.keyBy({ a: 42 }, dictionary); // $ExpectType Dictionary<AbcObject>
+    fp.keyBy(["a", 42], dictionary); // $ExpectType Dictionary<AbcObject>
+    // These fail in TS 2.4
+    // fp.keyBy(valueIterator, numericDictionary); // Dictionary<AbcObject>
+    // fp.keyBy("a", numericDictionary); // Dictionary<AbcObject>
+    // fp.keyBy({ a: 42 }, numericDictionary); // Dictionary<AbcObject>
+    // fp.keyBy(["a", 42], numericDictionary); // Dictionary<AbcObject>
 }
 
-//_.invoke
-namespace TestInvoke {
-    let boolArray: boolean[] = [true, false];
+// _.invoke
+{
+    const array = [(n?: number) => {}];
+    const nestedDict = { a: [(n?: number) => {}] };
 
-    let nestedDict: _.Dictionary<number[]> = {
-        a: [0, 1, 2]
-    }
+    _.invoke(array, "[0]"); // $ExpectType any
+    _.invoke(array, "[0]", 2); // $ExpectType any
+    _.invoke(array, [0, "call"]); // $ExpectType any
+    _.invoke(array, [0, "call"], 2); // $ExpectType any
 
-    let numDict: _.Dictionary<number> = {
-        a: 1,
-        b: 2,
-        c: 3,
-        d: 4
-    }
+    _.invoke(nestedDict, ["a[0].toString"]); // $ExpectType any
+    _.invoke(nestedDict, ["a[0].toString"], 2); // $ExpectType any
+    _.invoke(nestedDict, ["a", 0, "toString"]); // $ExpectType any
+    _.invoke(nestedDict, ["a", 0, "toString"], 2); // $ExpectType any
 
-    let result: string;
+    _(array).invoke("[0]"); // $ExpectType any
+    _(array).invoke("[0]", 2); // $ExpectType any
+    _(array).invoke([0, "call"]); // $ExpectType any
+    _(array).invoke([0, "call"], 2); // $ExpectType any
 
-    result = _.invoke(boolArray, "[1]");
-    result = _.invoke(boolArray, "[1]", 2);
-    result = _.invoke(boolArray, [1, "toString"]);
-    result = _.invoke(boolArray, [1, "toString"], 2);
+    _(nestedDict).invoke(["a[0].toString"]); // $ExpectType any
+    _(nestedDict).invoke(["a[0].toString"], 2); // $ExpectType any
+    _(nestedDict).invoke(["a", 0, "toString"]); // $ExpectType any
+    _(nestedDict).invoke(["a", 0, "toString"], 2); // $ExpectType any
 
-    result = _.invoke(boolArray, "[1]");
-    result = _.invoke(boolArray, "[1]", 2);
-    result = _.invoke(boolArray, [1, "toString"]);
-    result = _.invoke(boolArray, [1, "toString"], 2);
+    _.chain(array).invoke("[0]"); // $ExpectType LoDashExplicitWrapper<any>
+    _.chain(array).invoke("[0]", 2); // $ExpectType LoDashExplicitWrapper<any>
+    _.chain(array).invoke([0, "call"]); // $ExpectType LoDashExplicitWrapper<any>
+    _.chain(array).invoke([0, "call"], 2); // $ExpectType LoDashExplicitWrapper<any>
 
-    result = _.invoke(numDict, "a.toString");
-    result = _.invoke(numDict, "a.toString", 2);
-    result = _.invoke(numDict, ["a", "toString"]);
-    result = _.invoke(numDict, ["a", "toString"], 2);
+    _.chain(nestedDict).invoke(["a[0].toString"]); // $ExpectType LoDashExplicitWrapper<any>
+    _.chain(nestedDict).invoke(["a[0].toString"], 2); // $ExpectType LoDashExplicitWrapper<any>
+    _.chain(nestedDict).invoke(["a", 0, "toString"]); // $ExpectType LoDashExplicitWrapper<any>
+    _.chain(nestedDict).invoke(["a", 0, "toString"], 2); // $ExpectType LoDashExplicitWrapper<any>
 
-    result = _.invoke(numDict, "a.toString");
-    result = _.invoke(numDict, "a.toString", 2);
-    result = _.invoke(numDict, ["a", "toString"]);
-    result = _.invoke(numDict, ["a", "toString"], 2);
+    fp.invoke("[0]", array); // $ExpectType any
+    fp.invoke("[0]")(array); // $ExpectType any
+    fp.invoke(["[0]", 2], array); // $ExpectType any
 
-    result = _.invoke(nestedDict, ["a[0].toString"]);
-    result = _.invoke(nestedDict, ["a[0].toString"], 2);
-    result = _.invoke(nestedDict, ["a", 0, "toString"]);
-    result = _.invoke(nestedDict, ["a", 0, "toString"], 2);
-
-    result = _.invoke(nestedDict, ["a[0].toString"]);
-    result = _.invoke(nestedDict, ["a[0].toString"], 2);
-    result = _.invoke(nestedDict, ["a", 0, "toString"]);
-    result = _.invoke(nestedDict, ["a", 0, "toString"], 2);
-
-    result = _(boolArray).invoke("[1]");
-    result = _(boolArray).invoke("[1]", 2);
-    result = _(boolArray).invoke([1, "toString"]);
-    result = _(boolArray).invoke([1, "toString"], 2);
-
-    result = _(numDict).invoke("a.toString");
-    result = _(numDict).invoke("a.toString", 2);
-    result = _(numDict).invoke(["a", "toString"]);
-    result = _(numDict).invoke(["a", "toString"], 2);
-
-    result = _(nestedDict).invoke("a[0].toString");
-    result = _(nestedDict).invoke("a[0].toString", 2);
-    result = _(nestedDict).invoke(["a", 0, "toString"]);
-    result = _(nestedDict).invoke(["a", 0, "toString"], 2);
-
-    {
-        let result: _.LoDashExplicitWrapper<string>;
-
-        result = _(boolArray).chain().invoke("[1]");
-        result = _(boolArray).chain().invoke("[1]", 2);
-        result = _(boolArray).chain().invoke([1, "toString"]);
-        result = _(boolArray).chain().invoke([1, "toString"], 2);
-
-        result = _(numDict).chain().invoke("a.toString");
-        result = _(numDict).chain().invoke("a.toString", 2);
-        result = _(numDict).chain().invoke(["a", "toString"]);
-        result = _(numDict).chain().invoke(["a", "toString"], 2);
-
-        result = _(nestedDict).chain().invoke("a[0].toString");
-        result = _(nestedDict).chain().invoke("a[0].toString", 2);
-        result = _(nestedDict).chain().invoke(["a", 0, "toString"]);
-        result = _(nestedDict).chain().invoke(["a", 0, "toString"], 2);
-    }
+    fp.invoke("a[0].toString", nestedDict); // $ExpectType any
+    fp.invoke(["a", 0, "toString"], nestedDict); // $ExpectType any
 }
 
-//_.invokeMap
-namespace TestInvokeMap {
-    let numArray: number[] | null | undefined = [4, 2, 1, 3] as any;
-    let obj: _.Dictionary<number> = {
-        a: 1,
-        b: 2,
-        c: 3,
-        d: 4
-    };
-    let numDict: _.Dictionary<number> | null | undefined = obj as any;
+// _.invokeMap
+{
+    const numArray: number[] | null | undefined = anything;
+    const numDict: _.Dictionary<number> | null | undefined = anything;
 
-    let result: string[];
-    result = _.invokeMap(numArray, 'toString');
-    result = _.invokeMap(numArray, 'toString', 2);
-    result = _.invokeMap(numArray, 'toString');
-    result = _.invokeMap(numArray, 'toString', 2);
-    result = _(numArray).invokeMap('toString').value();
-    result = _(numArray).invokeMap('toString', 2).value();
-    result = _(numArray).chain().invokeMap('toString').value();
-    result = _(numArray).chain().invokeMap('toString', 2).value();
+    _.invokeMap(numArray, "toString"); // $ExpectType any[]
+    _.invokeMap(numArray, "toString", 2); // $ExpectType any[]
+    _.invokeMap(numArray, Number.prototype.toString); // $ExpectType string[]
+    _.invokeMap(numDict, "toString"); // $ExpectType any[]
 
-    result = _.invokeMap(numArray, Number.prototype.toString);
-    result = _.invokeMap(numArray, Number.prototype.toString, 2);
-    result = _.invokeMap<string>(numArray, Number.prototype.toString);
-    result = _.invokeMap<string>(numArray, Number.prototype.toString, 2);
-    result = _(numArray).invokeMap<string>(Number.prototype.toString).value();
-    result = _(numArray).invokeMap<string>(Number.prototype.toString, 2).value();
-    result = _(numArray).chain().invokeMap<string>(Number.prototype.toString).value();
-    result = _(numArray).chain().invokeMap<string>(Number.prototype.toString, 2).value();
+    _(numArray).invokeMap("toString"); // $ExpectType LoDashImplicitWrapper<any[]>
+    _(numArray).invokeMap("toString", 2); // $ExpectType LoDashImplicitWrapper<any[]>
+    _(numArray).invokeMap(Number.prototype.toString); // $ExpectType LoDashImplicitWrapper<string[]>
+    _(numDict).invokeMap("toString"); // $ExpectType LoDashImplicitWrapper<any[]>
 
-    result = _.invokeMap(numDict, 'toString');
-    result = _.invokeMap(numDict, 'toString', 2);
-    result = _.invokeMap(numDict, 'toString');
-    result = _.invokeMap(numDict, 'toString', 2);
-    result = _(numDict).invokeMap('toString').value();
-    result = _(numDict).invokeMap('toString', 2).value();
-    result = _(numDict).chain().invokeMap('toString').value();
-    result = _(numDict).chain().invokeMap('toString', 2).value();
+    _.chain(numArray).invokeMap("toString"); // $ExpectType LoDashExplicitWrapper<any[]>
+    _.chain(numArray).invokeMap("toString", 2); // $ExpectType LoDashExplicitWrapper<any[]>
+    _.chain(numArray).invokeMap(Number.prototype.toString); // $ExpectType LoDashExplicitWrapper<string[]>
+    _.chain(numDict).invokeMap("toString"); // $ExpectType LoDashExplicitWrapper<any[]>
 
-    result = _.invokeMap(numDict, Number.prototype.toString);
-    result = _.invokeMap(numDict, Number.prototype.toString, 2);
-    result = _.invokeMap<string>(numDict, Number.prototype.toString);
-    result = _.invokeMap<string>(numDict, Number.prototype.toString, 2);
-    result = _(numDict).invokeMap<string>(Number.prototype.toString).value();
-    result = _(numDict).invokeMap<string>(Number.prototype.toString, 2).value();
-    result = _(numDict).chain().invokeMap<string>(Number.prototype.toString).value();
-    result = _(numDict).chain().invokeMap<string>(Number.prototype.toString, 2).value();
+    fp.invokeMap("toString", numArray); // $ExpectType any[]
+    fp.invokeMap("toString")(numArray); // $ExpectType any[]
+    fp.invokeMap(Number.prototype.toString, numArray); // $ExpectType string[]
+    fp.invokeMap("toString", numDict); // $ExpectType any[]
+    fp.invokeMap(Number.prototype.toString, numDict); // $ExpectType string[]
+
+    fp.invokeArgsMap("toString", [16], numArray); // $ExpectType any[]
+    fp.invokeArgsMap("toString")([16])(numArray); // $ExpectType any[]
+    fp.invokeArgsMap(Number.prototype.toString, [16], numArray); // $ExpectType string[]
+    fp.invokeArgsMap("toString", [16], numDict); // $ExpectType any[]
+    fp.invokeArgsMap(Number.prototype.toString, [16], numDict); // $ExpectType string[]
 }
 
 // _.map
-namespace TestMap {
-    const array: AbcObject[] | null | undefined = anything;
+{
     const list: _.List<AbcObject> | null | undefined = anything;
     const dictionary: _.Dictionary<AbcObject> | null | undefined = anything;
     const numericDictionary: _.NumericDictionary<AbcObject> | null | undefined = anything;
     const abcObject: AbcObject = anything;
 
-    {
-        _.map(array);  // $ExpectType AbcObject[]
-        // $ExpectType number[]
-        _.map(array, (value, index, collection) => {
-            value; // $ExpectType AbcObject
-            index; // $ExpectType number
-            collection; // $ExpectType AbcObject[]
-            return 0;
-        });
+    _.map(list);  // $ExpectType AbcObject[]
+    // $ExpectType number[]
+    _.map(list, (value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType ArrayLike<AbcObject>
+        return 0;
+    });
+    _.map(dictionary);  // $ExpectType AbcObject[]
+    // $ExpectType number[]
+    _.map(dictionary, (value, key, collection) => {
+        value; // $ExpectType AbcObject
+        key; // $ExpectType string
+        collection; // $ExpectType Dictionary<AbcObject>
+        return 0;
+    });
+    _.map(numericDictionary);  // $ExpectType AbcObject[]
+    // $ExpectType number[]
+    _.map(numericDictionary, (value, key, collection) => {
+        /* Broken in TS 2.4: value; // AbcObject */
+        key; // $ExpectType string
+        collection; // $ExpectType NumericDictionary<AbcObject>
+        return 0;
+    });
+    _.map(list, "a"); // $ExpectType number[]
+    _.map(dictionary, "a"); // $ExpectType number[]
+    _.map(numericDictionary, "a"); // $ExpectType number[]
+    _.map(list, "d.0.b"); // $ExpectType any[]
+    _.map(dictionary, "d.0.b"); // $ExpectType any[]
+    _.map(numericDictionary, "d.0.b"); // $ExpectType any[]
+    _.map(list, { a: 42 });  // $ExpectType boolean[]
+    _.map(dictionary, { a: 42 });  // $ExpectType boolean[]
+    _.map(numericDictionary, { a: 42 });  // $ExpectType boolean[]
 
-        _.map(list);  // $ExpectType AbcObject[]
-        // $ExpectType number[]
-        _.map(list, (value, index, collection) => {
-            value; // $ExpectType AbcObject
-            index; // $ExpectType number
-            collection; // $ExpectType ArrayLike<AbcObject>
-            return 0;
-        });
+    _(list).map(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    // $ExpectType LoDashImplicitWrapper<number[]>
+    _(list).map((value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType ArrayLike<AbcObject>
+        return 0;
+    });
+    _(dictionary).map();  // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    // $ExpectType LoDashImplicitWrapper<number[]>
+    _(dictionary).map((value, key, collection) => {
+        value; // $ExpectType AbcObject
+        key; // $ExpectType string
+        collection; // $ExpectType Dictionary<AbcObject>
+        return 0;
+    });
+    _(numericDictionary).map();  // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    // $ExpectType LoDashImplicitWrapper<number[]>
+    _(numericDictionary).map((value, key, collection) => {
+        /* Broken in TS 2.4: value; // AbcObject */
+        key; // $ExpectType string
+        collection; // $ExpectType NumericDictionary<AbcObject>
+        return 0;
+    });
+    _(list).map("a"); // $ExpectType LoDashImplicitWrapper<number[]>
+    _(dictionary).map("a"); // $ExpectType LoDashImplicitWrapper<number[]>
+    _(numericDictionary).map("a"); // $ExpectType LoDashImplicitWrapper<number[]>
+    _(list).map("d.0.b"); // $ExpectType LoDashImplicitWrapper<any[]>
+    _(dictionary).map("d.0.b"); // $ExpectType LoDashImplicitWrapper<any[]>
+    _(numericDictionary).map("d.0.b"); // $ExpectType LoDashImplicitWrapper<any[]>
+    _(list).map({ a: 42 });  // $ExpectType LoDashImplicitWrapper<boolean[]>
+    _(dictionary).map({ a: 42 });  // $ExpectType LoDashImplicitWrapper<boolean[]>
+    _(numericDictionary).map({ a: 42 });  // $ExpectType LoDashImplicitWrapper<boolean[]>
 
-        _.map(dictionary);  // $ExpectType AbcObject[]
-        // $ExpectType number[]
-        _.map(dictionary, (value, key, collection) => {
-            value; // $ExpectType AbcObject
-            key; // $ExpectType string
-            collection; // $ExpectType Dictionary<AbcObject>
-            return 0;
-        });
+    _.chain(list).map();  // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    // $ExpectType LoDashExplicitWrapper<number[]>
+    _.chain(list).map((value, index, collection) => {
+        value; // $ExpectType AbcObject
+        index; // $ExpectType number
+        collection; // $ExpectType ArrayLike<AbcObject>
+        return 0;
+    });
+    _.chain(dictionary).map();  // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    // $ExpectType LoDashExplicitWrapper<number[]>
+    _.chain(dictionary).map((value, key, collection) => {
+        value; // $ExpectType AbcObject
+        key; // $ExpectType string
+        collection; // $ExpectType Dictionary<AbcObject>
+        return 0;
+    });
+    _.chain(numericDictionary).map();  // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    // $ExpectType LoDashExplicitWrapper<number[]>
+    _.chain(numericDictionary).map((value, key, collection) => {
+        /* Broken in TS 2.4: value; // AbcObject */
+        key; // $ExpectType string
+        collection; // $ExpectType NumericDictionary<AbcObject>
+        return 0;
+    });
+    _.chain(list).map("a"); // $ExpectType LoDashExplicitWrapper<number[]>
+    _.chain(dictionary).map("a"); // $ExpectType LoDashExplicitWrapper<number[]>
+    _.chain(numericDictionary).map("a"); // $ExpectType LoDashExplicitWrapper<number[]>
+    _.chain(list).map("d.0.b"); // $ExpectType LoDashExplicitWrapper<any[]>
+    _.chain(dictionary).map("d.0.b"); // $ExpectType LoDashExplicitWrapper<any[]>
+    _.chain(numericDictionary).map("d.0.b"); // $ExpectType LoDashExplicitWrapper<any[]>
+    _.chain(list).map({ a: 42 }); // $ExpectType LoDashExplicitWrapper<boolean[]>
+    _.chain(dictionary).map({ a: 42 }); // $ExpectType LoDashExplicitWrapper<boolean[]>
+    _.chain(numericDictionary).map({ a: 42 }); // $ExpectType LoDashExplicitWrapper<boolean[]>
 
-        _.map(numericDictionary);  // $ExpectType AbcObject[]
-        // $ExpectType number[]
-        _.map(numericDictionary, (value, key, collection) => {
-            /* Broken in TS 2.4: value; // AbcObject */
-            key; // $ExpectType string
-            collection; // $ExpectType NumericDictionary<AbcObject>
-            return 0;
-        });
-
-        _.map(array, 'a'); // $ExpectType number[]
-        _.map(list, 'a'); // $ExpectType number[]
-        _.map(dictionary, 'a'); // $ExpectType number[]
-        _.map(numericDictionary, 'a'); // $ExpectType number[]
-
-        _.map(array, 'd.0.b'); // $ExpectType any[]
-        _.map(list, 'd.0.b'); // $ExpectType any[]
-        _.map(dictionary, 'd.0.b'); // $ExpectType any[]
-        _.map(numericDictionary, 'd.0.b'); // $ExpectType any[]
-
-        // _.matches iteratee shorthand.
-        _.map(array, {});  // $ExpectType boolean[]
-        _.map(list, {});  // $ExpectType boolean[]
-        _.map(dictionary, {});  // $ExpectType boolean[]
-        _.map(numericDictionary, {});  // $ExpectType boolean[]
-    }
-
-    {
-        _(array).map(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-        // $ExpectType LoDashImplicitWrapper<number[]>
-        _(array).map((value, index, collection) => {
-            value; // $ExpectType AbcObject
-            index; // $ExpectType number
-            collection; // $ExpectType AbcObject[]
-            return 0;
-        });
-
-        _(list).map(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-        // $ExpectType LoDashImplicitWrapper<number[]>
-        _(list).map((value, index, collection) => {
-            value; // $ExpectType AbcObject
-            index; // $ExpectType number
-            collection; // $ExpectType ArrayLike<AbcObject>
-            return 0;
-        });
-
-        _(dictionary).map();  // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-        // $ExpectType LoDashImplicitWrapper<number[]>
-        _(dictionary).map((value, key, collection) => {
-            value; // $ExpectType AbcObject
-            key; // $ExpectType string
-            collection; // $ExpectType Dictionary<AbcObject>
-            return 0;
-        });
-
-        _(numericDictionary).map();  // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-        // $ExpectType LoDashImplicitWrapper<number[]>
-        _(numericDictionary).map((value, key, collection) => {
-            /* Broken in TS 2.4: value; // AbcObject */
-            key; // $ExpectType string
-            collection; // $ExpectType NumericDictionary<AbcObject>
-            return 0;
-        });
-
-        _(array).map('a'); // $ExpectType LoDashImplicitWrapper<number[]>
-        _(list).map('a'); // $ExpectType LoDashImplicitWrapper<number[]>
-        _(dictionary).map('a'); // $ExpectType LoDashImplicitWrapper<number[]>
-        _(numericDictionary).map('a'); // $ExpectType LoDashImplicitWrapper<number[]>
-
-        _(array).map('d.0.b'); // $ExpectType LoDashImplicitWrapper<any[]>
-        _(list).map('d.0.b'); // $ExpectType LoDashImplicitWrapper<any[]>
-        _(dictionary).map('d.0.b'); // $ExpectType LoDashImplicitWrapper<any[]>
-        _(numericDictionary).map('d.0.b'); // $ExpectType LoDashImplicitWrapper<any[]>
-
-        _(array).map({});  // $ExpectType LoDashImplicitWrapper<boolean[]>
-        _(list).map({});  // $ExpectType LoDashImplicitWrapper<boolean[]>
-        _(dictionary).map({});  // $ExpectType LoDashImplicitWrapper<boolean[]>
-        _(numericDictionary).map({});  // $ExpectType LoDashImplicitWrapper<boolean[]>
-    }
-
-    {
-        _(array).chain().map();  // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-        // $ExpectType LoDashExplicitWrapper<number[]>
-        _(array).chain().map((value, index, collection) => {
-            value; // $ExpectType AbcObject
-            index; // $ExpectType number
-            collection; // $ExpectType AbcObject[]
-            return 0;
-        });
-
-        _(list).chain().map();  // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-        // $ExpectType LoDashExplicitWrapper<number[]>
-        _(list).chain().map((value, index, collection) => {
-            value; // $ExpectType AbcObject
-            index; // $ExpectType number
-            collection; // $ExpectType ArrayLike<AbcObject>
-            return 0;
-        });
-
-        _(dictionary).chain().map();  // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-        // $ExpectType LoDashExplicitWrapper<number[]>
-        _(dictionary).chain().map((value, key, collection) => {
-            value; // $ExpectType AbcObject
-            key; // $ExpectType string
-            collection; // $ExpectType Dictionary<AbcObject>
-            return 0;
-        });
-
-        _(numericDictionary).chain().map();  // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-        // $ExpectType LoDashExplicitWrapper<number[]>
-        _(numericDictionary).chain().map((value, key, collection) => {
-            /* Broken in TS 2.4: value; // AbcObject */
-            key; // $ExpectType string
-            collection; // $ExpectType NumericDictionary<AbcObject>
-            return 0;
-        });
-
-        _(array).chain().map('a'); // $ExpectType LoDashExplicitWrapper<number[]>
-        _(list).chain().map('a'); // $ExpectType LoDashExplicitWrapper<number[]>
-        _(dictionary).chain().map('a'); // $ExpectType LoDashExplicitWrapper<number[]>
-        _(numericDictionary).chain().map('a'); // $ExpectType LoDashExplicitWrapper<number[]>
-
-        _(array).chain().map('d.0.b'); // $ExpectType LoDashExplicitWrapper<any[]>
-        _(list).chain().map('d.0.b'); // $ExpectType LoDashExplicitWrapper<any[]>
-        _(dictionary).chain().map('d.0.b'); // $ExpectType LoDashExplicitWrapper<any[]>
-        _(numericDictionary).chain().map('d.0.b'); // $ExpectType LoDashExplicitWrapper<any[]>
-
-        _(array).chain().map({}); // $ExpectType LoDashExplicitWrapper<boolean[]>
-        _(list).chain().map({}); // $ExpectType LoDashExplicitWrapper<boolean[]>
-        _(dictionary).chain().map({}); // $ExpectType LoDashExplicitWrapper<boolean[]>
-        _(numericDictionary).chain().map({}); // $ExpectType LoDashExplicitWrapper<boolean[]>
-    }
-
-    {
-        // "pluck"-style map.
-        _.map([{a: 1}, {a: 2}], 'a');  // $ExpectType number[]
-        _.map({a: {b: 'str'}, c: {b: 1}}, 'b');  // ExpectType (string | number)[]
-
-        _([{a: 1}, {a: 2}]).map('a').value();  // $ExpectType number[]
-        _.chain([{a: 1}, {a: 2}]).map('a').value();  // $ExpectType number[]
-        _([{a: 1}, {a: 2}]).chain().map('a').value();  // $ExpectType number[]
-    }
-
-    {
-        // $ExpectType number[]
-        _.map(['a', 'b', 'c'], (
-            v,  // $ExpectType string
-            k  // $ExpectType number
-          ) => k);
-    }
+    const valueIterator = (value: AbcObject): number => value.a;
+    fp.map(valueIterator)(list); // $ExpectType number[]
+    fp.map(valueIterator, dictionary); // $ExpectType number[]
+    fp.map("a", list); // $ExpectType number[]
+    fp.map({ a: 42 }, list); // $ExpectType boolean[]
+    fp.map(["a", 42], dictionary); // $ExpectType boolean[]
 }
 
 // _.partition
-namespace TestPartition {
-    {
-        let result: any[][];
+{
+    const list: ArrayLike<AbcObject> | null | undefined = anything;
 
-        result = _.partition(anything, (n) => {
-            n; // $ExpectType any
-            return n < 'c';
-        });
-    }
+    // $ExpectType [any[], any[]]
+    _.partition(anything, (value) => {
+        value; // $ExpectType any
+        return value < "c";
+    });
+    // $ExpectType [string[], string[]]
+    _.partition("abcd", (value) => {
+        value; // $ExpectType string
+        return value < "c";
+    });
+    // $ExpectType [AbcObject[], AbcObject[]]
+    _.partition(list, (value) => {
+        value; // $ExpectType AbcObject
+        return true;
+    });
 
-    {
-        let result: string[][];
+    // $ExpectType LoDashImplicitWrapper<[any[], any[]]>
+    _(anything).partition((value) => {
+        value; // $ExpectType any
+        return value < "c";
+    });
+    // $ExpectType LoDashImplicitWrapper<[string[], string[]]>
+    _("abcd").partition((value) => {
+        value; // $ExpectType string
+        return value < "c";
+    });
+    // $ExpectType LoDashImplicitWrapper<[AbcObject[], AbcObject[]]>
+    _(list).partition((value) => {
+        value; // $ExpectType AbcObject
+        return true;
+    });
 
-        result = _.partition('abcd', (n) => {
-            n; // $ExpectType string
-            return n < 'c';
-        });
-        result = _.partition(['a', 'b', 'c', 'd'], (n) => {
-            n; // $ExpectType string
-            return n < 'c';
-        });
-    }
+    // $ExpectType LoDashExplicitWrapper<[any[], any[]]>
+    _.chain(anything).partition((value) => {
+        value; // $ExpectType any
+        return value < "c";
+    });
+    // $ExpectType LoDashExplicitWrapper<[string[], string[]]>
+    _.chain("abcd").partition((value) => {
+        value; // $ExpectType string
+        return value < "c";
+    });
+    // $ExpectType LoDashExplicitWrapper<[AbcObject[], AbcObject[]]>
+    _.chain(list).partition((value) => {
+        value; // $ExpectType AbcObject
+        return true;
+    });
 
-    {
-        let result: number[][];
-
-        result = _.partition([1, 2, 3, 4], (n) => n < 3);
-        result = _.partition({0: 1, 1: 2, 2: 3, 3: 4, length: 4}, (n) => n < 3);
-        result = _.partition({a: 1, b: 2, c: 3, d: 4}, (n) => {
-            n; // $ExpectType number
-            return n < 3;
-        });
-    }
-
-    {
-        let result: Array<Array<{ a: number }>>;
-
-        result = _.partition([{a: 1}, {a: 2}], {a: 2});
-        result = _.partition({0: {a: 1}, 1: {a: 2}, length: 2}, {a: 2});
-        result = _.partition({0: {a: 1}, 1: {a: 2}}, {a: 2});
-        result = _.partition([{a: 1}, {a: 2}], 'a');
-        result = _.partition([{a: 1}, {a: 2}], ['a', 2]);
-        result = _.partition({0: {a: 1}, 1: {a: 2}, length: 2}, 'a');
-        result = _.partition({0: {a: 1}, 1: {a: 2}, length: 2}, ['a', 2]);
-        result = _.partition({0: {a: 1}, 1: {a: 2}}, 'a');
-        result = _.partition({0: {a: 1}, 1: {a: 2}}, ['a', 2]);
-    }
-
-    {
-        _.partition(null, 'a');
-    }
-
-    {
-        let result: _.LoDashImplicitWrapper<any[][]>;
-
-        result = _(anything).partition((n) => {
-            n; // $ExpectType any
-            return n < 'c';
-        });
-    }
-
-    {
-        let result: _.LoDashImplicitWrapper<string[][]>;
-
-        result = _('abcd').partition((n) => {
-            n; // $ExpectType string
-            return n < 'c';
-        });
-        result = _(['a', 'b', 'c', 'd']).partition((n) => {
-            n; // $ExpectType string
-            return n < 'c';
-        });
-    }
-
-    {
-        let result: _.LoDashImplicitWrapper<number[][]>;
-
-        result = _([1, 2, 3, 4]).partition((n) => n < 3);
-        result = _({0: 1, 1: 2, 2: 3, 3: 4, length: 4}).partition((n) => n < 3);
-        result = _({a: 1, b: 2, c: 3, d: 4}).partition((n) => {
-            n; // $ExpectType number
-            return n < 3;
-        });
-    }
-
-    {
-        let result: _.LoDashImplicitWrapper<Array<Array<{ a: number }>>>;
-
-        result = _([{a: 1}, {a: 2}]).partition({a: 2});
-        result = _({0: {a: 1}, 1: {a: 2}, length: 2}).partition({a: 2});
-        result = _({0: {a: 1}, 1: {a: 2}}).partition({a: 2});
-        result = _([{a: 1}, {a: 2}]).partition('a');
-        result = _([{a: 1}, {a: 2}]).partition(['a', 2]);
-        result = _({0: {a: 1}, 1: {a: 2}}).partition('a');
-        result = _({0: {a: 1}, 1: {a: 2}}).partition(['a', 2]);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<any[][]>;
-
-        result = _.chain(anything).partition((n) => {
-            n; // $ExpectType any
-            return n < 'c';
-        });
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<string[][]>;
-
-        result = _.chain('abcd').partition((n) => {
-            n; // $ExpectType string
-            return n < 'c';
-        });
-        result = _.chain(['a', 'b', 'c', 'd']).partition((n) => {
-            n; // $ExpectType string
-            return n < 'c';
-        });
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<number[][]>;
-
-        result = _.chain([1, 2, 3, 4]).partition((n) => n < 3);
-        result = _.chain({0: 1, 1: 2, 2: 3, 3: 4, length: 4}).partition((n) => n < 3);
-        result = _.chain({a: 1, b: 2, c: 3, d: 4}).partition((n) => {
-            n; // $ExpectType number
-            return n < 3;
-        });
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<Array<Array<{ a: number }>>>;
-
-        result = _.chain([{a: 1}, {a: 2}]).partition({a: 2});
-        result = _.chain({0: {a: 1}, 1: {a: 2}, length: 2}).partition({a: 2});
-        result = _.chain({0: {a: 1}, 1: {a: 2}}).partition({a: 2});
-        result = _.chain([{a: 1}, {a: 2}]).partition('a');
-        result = _.chain([{a: 1}, {a: 2}]).partition(['a', 2]);
-        result = _.chain({0: {a: 1}, 1: {a: 2}}).partition('a');
-        result = _.chain({0: {a: 1}, 1: {a: 2}}).partition(['a', 2]);
-    }
+    // $ExpectType [any[], any[]]
+    fp.partition((value) => {
+        value; // $ExpectType any
+        return value < "c";
+    }, anything);
+    // $ExpectType [any[], any[]]
+    fp.partition((value: any) => value < "c")(anything);
+    // $ExpectType [string[], string[]]
+    fp.partition((value) => {
+        value; // $ExpectType string
+        return value < "c";
+    }, "abcd");
+    // $ExpectType [AbcObject[], AbcObject[]]
+    fp.partition((value) => {
+        value; // $ExpectType AbcObject
+        return true;
+    }, list);
 }
 
-namespace TestReduce {
+// _.reduce
+{
     interface ABC {
         [key: string]: number;
         a: number;
         b: number;
         c: number;
     }
-
-    // $ExpectType number | undefined
-    _.reduce([1, 2, 3], (sum: number, num: number) => sum + num);
-    // $ExpectType number | undefined
-    _.reduce(null, (sum: number, num: number) => sum + num);
-
-    // chained
-    _([1, 2 ,3]).reduce((sum: number, num: number) => sum + num);
-    _.chain([1, 2 ,3]).reduce((sum: number, num: number) => sum + num).value();
-
-    // $ExpectType ABC
-    _.reduce({ 'a': 1, 'b': 2, 'c': 3 }, (r: ABC, num: number, key: string) => {
-        r[key] = num * 3;
-        return r;
-    // tslint:disable-next-line:no-object-literal-type-assertion
-    }, {} as ABC);
-
-    // $ExpectType number | undefined
-    _([1, 2, 3]).reduce((sum: number, num: number) => sum + num);
-
     const initial: ABC = { a: 1, b: 2, c: 3 };
-    // $ExpectType ABC
-    _({ 'a': 1, 'b': 2, 'c': 3 }).reduce((r: ABC, num: number, key: string) => {
-        r[key] = num * 3;
-        return r;
-    // tslint:disable-next-line:no-object-literal-type-assertion
-    }, initial);
 
-    // $ExpectType number[]
-    _.reduceRight([[0, 1], [2, 3], [4, 5]], (a: number[], b: number[]) => a.concat(b), []);
+    _.reduce([1, 2, 3], (sum: number, num: number) => sum + num); // $ExpectType number | undefined
+    _.reduce(null, (sum: number, num: number) => sum + num); // $ExpectType number | undefined
+    _.reduce({ a: 1, b: 2, c: 3 }, (r: ABC, num: number, key: string) => r, initial); // $ExpectType ABC
+
+    _([1, 2, 3]).reduce((sum: number, num: number) => sum + num); // $ExpectType number | undefined
+    _({ a: 1, b: 2, c: 3 }).reduce((r: ABC, num: number, key: string) => r, initial); // $ExpectType ABC
+
+    _.chain([1, 2, 3]).reduce((sum: number, num: number) => sum + num); // $ExpectType LoDashExplicitWrapper<number | undefined>
+    _.chain({ a: 1, b: 2, c: 3 }).reduce((r: ABC, num: number, key: string) => r, initial); // $ExpectType LoDashExplicitWrapper<ABC>
+
+    fp.reduce((s: string, num: number) => s + num, "", [1, 2, 3]); // $ExpectType string
+    fp.reduce((s: string, num: number) => s + num)("")([1, 2, 3]); // $ExpectType string
+
+    _.reduceRight([1, 2, 3], (sum: number, num: number) => sum + num); // $ExpectType number | undefined
+    _.reduceRight(null, (sum: number, num: number) => sum + num); // $ExpectType number | undefined
+    _.reduceRight({ a: 1, b: 2, c: 3 }, (r: ABC, num: number, key: string) => r, initial); // $ExpectType ABC
+
+    _([1, 2, 3]).reduceRight((sum: number, num: number) => sum + num); // $ExpectType number | undefined
+    _({ a: 1, b: 2, c: 3 }).reduceRight((r: ABC, num: number, key: string) => r, initial); // $ExpectType ABC
+
+    _.chain([1, 2, 3]).reduceRight((sum: number, num: number) => sum + num); // $ExpectType LoDashExplicitWrapper<number | undefined>
+    _.chain({ a: 1, b: 2, c: 3 }).reduceRight((r: ABC, num: number, key: string) => r, initial); // $ExpectType LoDashExplicitWrapper<ABC>
+
+    fp.reduceRight((num: number, s: string) => s + num, "", [1, 2, 3]); // $ExpectType string
+    fp.reduceRight((num: number, s: string) => s + num)("")([1, 2, 3]); // $ExpectType string
 }
 
 // _.reject
-namespace TestReject {
-    let array: AbcObject[] | null | undefined = [] as any;
-    let list: _.List<AbcObject> | null | undefined = [] as any;
-    let obj: any = {};
-    let dictionary: _.Dictionary<AbcObject> | null | undefined = obj;
+{
+    const list: _.List<AbcObject> | null | undefined = anything;
+    const dictionary: _.Dictionary<AbcObject> | null | undefined = anything;
 
-    let stringIterator = (char: string, index: number, string: string) => true;
-    let listIterator = (value: AbcObject, index: number, collection: _.List<AbcObject>) => true;
-    let dictionaryIterator = (value: AbcObject, key: string, collection: _.Dictionary<AbcObject>) => true;
+    const stringIterator = (char: string, index: number, string: string) => true;
+    const listIterator = (value: AbcObject, index: number, collection: _.List<AbcObject>) => true;
+    const dictionaryIterator = (value: AbcObject, key: string, collection: _.Dictionary<AbcObject>) => true;
+    const valueIterator = (value: AbcObject) => true;
 
-    {
-        let result: string[];
+    _.reject("", stringIterator); // $ExpectType string[]
+    _.reject(list, listIterator); // $ExpectType AbcObject[]
+    _.reject(list, ""); // $ExpectType AbcObject[]
+    _.reject(list, { a: 42 }); // $ExpectType AbcObject[]
+    _.reject(dictionary, dictionaryIterator); // $ExpectType AbcObject[]
+    _.reject(dictionary, ""); // $ExpectType AbcObject[]
+    _.reject(dictionary, { a: 42 }); // $ExpectType AbcObject[]
 
-        result = _.reject('', stringIterator);
-    }
+    _("").reject(stringIterator); // $ExpectType LoDashImplicitWrapper<string[]>
+    _(list).reject(listIterator); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).reject(""); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).reject({ a: 42 }); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(dictionary).reject(dictionaryIterator); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(dictionary).reject(""); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(dictionary).reject({ a: 42 }); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
 
-    {
-        let result: AbcObject[];
+    _.chain("").reject(stringIterator); // $ExpectType LoDashExplicitWrapper<string[]>
+    _.chain(list).reject(listIterator); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).reject(""); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).reject({ a: 42 }); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(dictionary).reject(dictionaryIterator); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(dictionary).reject(""); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(dictionary).reject({ a: 42 }); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
 
-        result = _.reject(array, listIterator);
-        result = _.reject(array, '');
-        result = _.reject(array, {a: 42});
-
-        result = _.reject(list, listIterator);
-        result = _.reject(list, '');
-        result = _.reject(list, {a: 42});
-
-        result = _.reject(dictionary, dictionaryIterator);
-        result = _.reject(dictionary, '');
-        result = _.reject(dictionary, {a: 42});
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<string>;
-
-        result = _('').reject(stringIterator);
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<AbcObject>;
-
-        result = _(array).reject(listIterator);
-        result = _(array).reject('');
-        result = _(array).reject({a: 42});
-
-        result = _(list).reject(listIterator);
-        result = _(list).reject('');
-        result = _(list).reject({a: 42});
-
-        result = _(dictionary).reject(dictionaryIterator);
-        result = _(dictionary).reject('');
-        result = _(dictionary).reject({a: 42});
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<string>;
-
-        result = _('').chain().reject(stringIterator);
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<AbcObject>;
-
-        result = _(array).chain().reject(listIterator);
-        result = _(array).chain().reject('');
-        result = _(array).chain().reject({a: 42});
-
-        result = _(list).chain().reject(listIterator);
-        result = _(list).chain().reject('');
-        result = _(list).chain().reject({a: 42});
-
-        result = _(dictionary).chain().reject(dictionaryIterator);
-        result = _(dictionary).chain().reject('');
-        result = _(dictionary).chain().reject({a: 42});
-    }
+    fp.reject(valueIterator, list); // $ExpectType AbcObject[]
+    fp.reject(valueIterator)(list); // $ExpectType AbcObject[]
+    fp.reject(valueIterator, dictionary); // $ExpectType AbcObject[]
+    fp.reject("a", list); // $ExpectType AbcObject[]
+    fp.reject({ a: 42 }, list); // $ExpectType AbcObject[]
+    fp.reject(["a", 42], list); // $ExpectType AbcObject[]
 }
 
 // _.sample
-namespace TestSample {
-    let array: string[] | null | undefined = [] as any;
-    let list: _.List<string> | null | undefined = [] as any;
-    let obj: any = {};
-    let dictionary: _.Dictionary<string> | null | undefined = obj;
-    let numericDictionary: _.NumericDictionary<string>  | null | undefined= obj;
-
-    {
-        let result: string | undefined;
-
-        result = _.sample('abc');
-        result = _.sample(array);
-        result = _.sample(list);
-        result = _.sample(dictionary);
-        result = _.sample(numericDictionary);
-        result = _.sample({a: 'foo'});
-        result = _.sample<string>({a: 'foo'});
-
-        result = _('abc').sample();
-        result = _(array).sample();
-        result = _(list).sample<string>();
-        result = _(dictionary).sample<string>();
-        result = _(numericDictionary).sample<string>();
-        result = _({a: 'foo'}).sample<string>();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<string | undefined>;
-
-        result = _('abc').chain().sample();
-        result = _(array).chain().sample();
-        result = _(list).chain().sample();
-        result = _(dictionary).chain().sample();
-        result = _(numericDictionary).chain().sample();
-        result = _({a: 'foo'}).chain().sample();
-    }
-}
-
 // _.sampleSize
-namespace TestSampleSize {
-    let array: string[] | null | undefined = [] as any;
-    let list: _.List<string> | null | undefined = [] as any;
-    let obj: any = {};
-    let dictionary: _.Dictionary<string> | null | undefined = obj;
-    let numericDictionary: _.NumericDictionary<string> | null | undefined = obj;
+{
+    const list: _.List<string> | null | undefined = anything;
+    const dictionary: _.Dictionary<string> | null | undefined = anything;
+    const numericDictionary: _.NumericDictionary<string>  | null | undefined = anything;
 
-    {
-        let result: string[];
+    _.sample("abc"); // $ExpectType string | undefined
+    _.sample(list); // $ExpectType string | undefined
+    _.sample(dictionary); // $ExpectType string | undefined
+    _.sample(numericDictionary); // $ExpectType string | undefined
+    _.sample({ a: "foo" }); // $ExpectType string | undefined
 
-        result = _.sampleSize('abc');
-        result = _.sampleSize('abc', 42);
-        result = _.sampleSize(array);
-        result = _.sampleSize(array, 42);
-        result = _.sampleSize(list);
-        result = _.sampleSize(list, 42);
-        result = _.sampleSize(dictionary);
-        result = _.sampleSize(dictionary, 42);
-        result = _.sampleSize(numericDictionary);
-        result = _.sampleSize(numericDictionary, 42);
-        result = _.sampleSize({a: 'foo'});
-        result = _.sampleSize({a: 'foo'}, 42);
-        result = _.sampleSize<string>({a: 'foo'});
-        result = _.sampleSize<string>({a: 'foo'}, 42);
-    }
+    _("abc").sample(); // $ExpectType string | undefined
+    _(list).sample(); // $ExpectType string | undefined
+    _(dictionary).sample(); // $ExpectType string | undefined
+    _(numericDictionary).sample(); // $ExpectType string | undefined
+    _({ a: "foo" }).sample(); // $ExpectType string | undefined
 
-    {
-        let result: _.LoDashImplicitArrayWrapper<string>;
+    _.chain("abc").sample(); // $ExpectType LoDashExplicitWrapper<string | undefined>
+    _.chain(list).sample(); // $ExpectType LoDashExplicitWrapper<string | undefined>
+    _.chain(dictionary).sample(); // $ExpectType LoDashExplicitWrapper<string | undefined>
+    _.chain(numericDictionary).sample(); // $ExpectType LoDashExplicitWrapper<string | undefined>
+    _.chain({ a: "foo" }).sample(); // $ExpectType LoDashExplicitWrapper<string | undefined>
 
-        result = _('abc').sampleSize();
-        result = _('abc').sampleSize(42);
-        result = _(array).sampleSize();
-        result = _(array).sampleSize(42);
-        result = _(list).sampleSize<string>();
-        result = _(list).sampleSize<string>(42);
-        result = _(dictionary).sampleSize<string>();
-        result = _(dictionary).sampleSize<string>(42);
-        result = _(numericDictionary).sampleSize<string>();
-        result = _(numericDictionary).sampleSize<string>(42);
-        result = _({a: 'foo'}).sampleSize<string>();
-        result = _({a: 'foo'}).sampleSize<string>(42);
-    }
+    fp.sample("abc"); // $ExpectType string | undefined
+    fp.sample(list); // $ExpectType string | undefined
+    fp.sample({ a: "foo" }); // $ExpectType string | undefined
 
-    {
-        let result: _.LoDashExplicitArrayWrapper<string>;
+    _.sampleSize("abc"); // $ExpectType string[]
+    _.sampleSize("abc", 3); // $ExpectType string[]
+    _.sampleSize(list, 3); // $ExpectType string[]
+    _.sampleSize(dictionary, 3); // $ExpectType string[]
+    _.sampleSize(numericDictionary, 3); // $ExpectType string[]
+    _.sampleSize({ a: "foo" }, 3); // $ExpectType string[]
 
-        result = _('abc').chain().sampleSize();
-        result = _('abc').chain().sampleSize(42);
-        result = _(array).chain().sampleSize();
-        result = _(array).chain().sampleSize(42);
-        result = _(list).chain().sampleSize<string>();
-        result = _(list).chain().sampleSize<string>(42);
-        result = _(dictionary).chain().sampleSize<string>();
-        result = _(dictionary).chain().sampleSize<string>(42);
-        result = _(numericDictionary).chain().sampleSize<string>();
-        result = _(numericDictionary).chain().sampleSize<string>(42);
-        result = _({a: 'foo'}).chain().sampleSize<string>();
-        result = _({a: 'foo'}).chain().sampleSize<string>(42);
-    }
+    _("abc").sampleSize(); // $ExpectType LoDashImplicitWrapper<string[]>
+    _("abc").sampleSize(3); // $ExpectType LoDashImplicitWrapper<string[]>
+    _(list).sampleSize(3); // $ExpectType LoDashImplicitWrapper<string[]>
+    _(dictionary).sampleSize(3); // $ExpectType LoDashImplicitWrapper<string[]>
+    _(numericDictionary).sampleSize(3); // $ExpectType LoDashImplicitWrapper<string[]>
+    _({ a: "foo" }).sampleSize(3); // $ExpectType LoDashImplicitWrapper<string[]>
+
+    _.chain("abc").sampleSize(); // $ExpectType LoDashExplicitWrapper<string[]>
+    _.chain("abc").sampleSize(3); // $ExpectType LoDashExplicitWrapper<string[]>
+    _.chain(list).sampleSize(3); // $ExpectType LoDashExplicitWrapper<string[]>
+    _.chain(dictionary).sampleSize(3); // $ExpectType LoDashExplicitWrapper<string[]>
+    _.chain(numericDictionary).sampleSize(3); // $ExpectType LoDashExplicitWrapper<string[]>
+    _.chain({ a: "foo" }).sampleSize(3); // $ExpectType LoDashExplicitWrapper<string[]>
+
+    fp.sampleSize(3, "abc"); // $ExpectType string[]
+    fp.sampleSize(3)(list); // $ExpectType string[]
+    fp.sampleSize(3)({ a: "foo" }); // $ExpectType string[]
 }
 
 // _.shuffle
-namespace TestShuffle {
-    let array: AbcObject[] | null | undefined = [] as any;
-    let list: _.List<AbcObject> | null | undefined = [] as any;
-    let obj: any = {};
-    let dictionary: _.Dictionary<AbcObject> | null | undefined = obj;
+{
+    const list: _.List<AbcObject> | null | undefined = anything;
+    const dictionary: _.Dictionary<AbcObject> | null | undefined = anything;
 
-    {
-        let result: string[];
-
-        result = _.shuffle('abc');
-    }
-
-    {
-        let result: AbcObject[];
-
-        result = _.shuffle(array);
-        result = _.shuffle(list);
-        result = _.shuffle(dictionary);
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<string>;
-
-        result = _('abc').shuffle();
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<AbcObject>;
-
-        result = _(array).shuffle();
-        result = _(list).shuffle();
-        result = _(dictionary).shuffle();
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<string>;
-
-        result = _('abc').chain().shuffle();
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<AbcObject>;
-
-        result = _(array).chain().shuffle();
-        result = _(list).chain().shuffle();
-        result = _(dictionary).chain().shuffle();
-    }
+    _.shuffle("abc"); // $ExpectType string[]
+    _.shuffle(list); // $ExpectType AbcObject[]
+    _.shuffle(dictionary); // $ExpectType AbcObject[]
+    _("abc").shuffle(); // $ExpectType LoDashImplicitWrapper<string[]>
+    _(list).shuffle(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(dictionary).shuffle(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _.chain("abc").shuffle(); // $ExpectType LoDashExplicitWrapper<string[]>
+    _.chain(list).shuffle(); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(dictionary).shuffle(); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    fp.shuffle("abc"); // $ExpectType string[]
+    fp.shuffle(list); // $ExpectType AbcObject[]
+    fp.shuffle(dictionary); // $ExpectType AbcObject[]
 }
 
 // _.size
-namespace TestSize {
-    type SampleType = {a: string; b: number; c: boolean;};
+{
+    const list: _.List<AbcObject> | null | undefined = anything;
+    const dictionary: _.Dictionary<AbcObject> | null | undefined = anything;
 
-    let array: SampleType[] | null | undefined = [] as any;
-    let list: _.List<SampleType> | null | undefined = [] as any;
-    let obj: any = {};
-    let dictionary: _.Dictionary<SampleType> | null | undefined = obj;
-
-    {
-        let result: number;
-
-        result = _.size(array);
-        result = _.size(list);
-        result = _.size(dictionary);
-        result = _.size('');
-
-        result = _(array).size();
-        result = _(list).size();
-        result = _(dictionary).size();
-        result = _('').size();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<number>;
-
-        result = _(array).chain().size();
-        result = _(list).chain().size();
-        result = _(dictionary).chain().size();
-        result = _('').chain().size();
-    }
+    _.size(list); // $ExpectType number
+    _.size(dictionary); // $ExpectType number
+    _.size(""); // $ExpectType number
+    _(list).size(); // $ExpectType number
+    _(dictionary).size(); // $ExpectType number
+    _("").size(); // $ExpectType number
+    _.chain(list).size(); // $ExpectType LoDashExplicitWrapper<number>
+    _.chain(dictionary).size(); // $ExpectType LoDashExplicitWrapper<number>
+    _.chain("").size(); // $ExpectType LoDashExplicitWrapper<number>
+    fp.size(list); // $ExpectType number
+    fp.size(dictionary); // $ExpectType number
+    fp.size(""); // $ExpectType number
 }
 
 // _.some
-namespace TestSome {
-    type SampleObject = {a: number; b: string; c: boolean;};
+{
+    const list: _.List<AbcObject> | null | undefined = anything;
+    const dictionary: _.Dictionary<AbcObject> | null | undefined = anything;
+    const numericDictionary: _.NumericDictionary<AbcObject> | null | undefined = anything;
 
-    let array: SampleObject[] | null | undefined = [] as any;
-    let list: _.List<SampleObject> | null | undefined = [] as any;
-    let obj: any = {};
-    let dictionary: _.Dictionary<SampleObject> | null | undefined = obj;
-    let numericDictionary: _.NumericDictionary<SampleObject> | null | undefined = obj;
-    let sampleObject: SampleObject | null | undefined = obj;
+    const listIterator = (value: AbcObject, index: number, collection: _.List<AbcObject>) => true;
+    const dictionaryIterator = (value: AbcObject, key: string, collection: _.Dictionary<AbcObject>) => true;
+    const numericDictionaryIterator = (value: AbcObject, key: string, collection: _.NumericDictionary<AbcObject>) => true;
+    const valueIterator = (value: AbcObject) => true;
 
-    let listIterator = (value: SampleObject, index: number, collection: _.List<SampleObject>) => true;
-    let dictionaryIterator = (value: SampleObject, key: string, collection: _.Dictionary<SampleObject>) => true;
-    let numericDictionaryIterator = (value: SampleObject, key: string, collection: _.NumericDictionary<SampleObject>) => true;
-    let objectIterator = (value: any, key: string, collection: any) => true;
+    _.some(list); // $ExpectType boolean
+    _.some(list, listIterator); // $ExpectType boolean
+    _.some(list, "a"); // $ExpectType boolean
+    _.some(list, ["a", 42]); // $ExpectType boolean
+    _.some(list, { a: 42 }); // $ExpectType boolean
 
-    {
-        let result: boolean;
+    _.some(dictionary); // $ExpectType boolean
+    _.some(dictionary, dictionaryIterator); // $ExpectType boolean
+    _.some(dictionary, "a"); // $ExpectType boolean
+    _.some(dictionary, ["a", 42]); // $ExpectType boolean
+    _.some(dictionary, { a: 42 }); // $ExpectType boolean
 
-        result = _.some(array);
-        result = _.some(array, listIterator);
-        result = _.some(array, 'a');
-        result = _.some(array, ['a', 42]);
-        result = _.some(array, {a: 42});
+    _.some(numericDictionary); // $ExpectType boolean
+    _.some(numericDictionary, numericDictionaryIterator); // $ExpectType boolean
+    _.some(numericDictionary, "a"); // $ExpectType boolean
+    _.some(numericDictionary, ["a", 42]); // $ExpectType boolean
+    _.some(numericDictionary, { a: 42 }); // $ExpectType boolean
 
-        result = _.some(list);
-        result = _.some(list, listIterator);
-        result = _.some(list, 'a');
-        result = _.some(list, ['a', 42]);
-        result = _.some(list, {a: 42});
+    _(list).some(); // $ExpectType boolean
+    _(list).some(listIterator); // $ExpectType boolean
+    _(list).some("a"); // $ExpectType boolean
+    _(list).some(["a", 42]); // $ExpectType boolean
+    _(list).some({ a: 42 }); // $ExpectType boolean
 
-        result = _.some(dictionary);
-        result = _.some(numericDictionary, numericDictionaryIterator);
-        result = _.some(dictionary, (value, key, collection) => {
-            value; // $ExpectType SampleObject
-            key; // $ExpectType string
-            collection; // $ExpectType Dictionary<SampleObject>
-            return true;
-        });
-        result = _.some(dictionary, 'a');
-        result = _.some(dictionary, ['a', 42]);
-        result = _.some(dictionary, {a: 42});
+    _(dictionary).some(); // $ExpectType boolean
+    _(dictionary).some(dictionaryIterator); // $ExpectType boolean
+    _(dictionary).some("a"); // $ExpectType boolean
+    _(dictionary).some(["a", 42]); // $ExpectType boolean
+    _(dictionary).some({ a: 42 }); // $ExpectType boolean
 
-        result = _.some(numericDictionary);
-        result = _.some(numericDictionary, numericDictionaryIterator);
-        result = _.some(numericDictionary, 'a');
-        result = _.some(numericDictionary, ['a', 42]);
-        result = _.some(numericDictionary, {a: 42});
+    _(numericDictionary).some(); // $ExpectType boolean
+    _(numericDictionary).some(numericDictionaryIterator); // $ExpectType boolean
+    _(numericDictionary).some("a"); // $ExpectType boolean
+    _(numericDictionary).some(["a", 42]); // $ExpectType boolean
+    _(numericDictionary).some({ a: 42 }); // $ExpectType boolean
 
-        result = _.some(sampleObject);
-        result = _.some(sampleObject, objectIterator);
-        result = _.some(sampleObject, 'a');
-        result = _.some(sampleObject, ['a', 42]);
+    _.chain(list).some(); // $ExpectType LoDashExplicitWrapper<boolean>
+    _.chain(list).some(listIterator); // $ExpectType LoDashExplicitWrapper<boolean>
+    _.chain(list).some("a"); // $ExpectType LoDashExplicitWrapper<boolean>
+    _.chain(list).some(["a", 42]); // $ExpectType LoDashExplicitWrapper<boolean>
+    _.chain(list).some({ a: 42 }); // $ExpectType LoDashExplicitWrapper<boolean>
 
-        result = _(array).some();
-        result = _(array).some(listIterator);
-        result = _(array).some('a');
-        result = _(array).some(['a', 42]);
-        result = _(array).some({a: 42});
+    _.chain(dictionary).some(); // $ExpectType LoDashExplicitWrapper<boolean>
+    _.chain(dictionary).some(dictionaryIterator); // $ExpectType LoDashExplicitWrapper<boolean>
+    _.chain(dictionary).some("a"); // $ExpectType LoDashExplicitWrapper<boolean>
+    _.chain(dictionary).some(["a", 42]); // $ExpectType LoDashExplicitWrapper<boolean>
+    _.chain(dictionary).some({ a: 42 }); // $ExpectType LoDashExplicitWrapper<boolean>
 
-        result = _(list).some();
-        result = _(list).some(listIterator);
-        result = _(list).some('a');
-        result = _(list).some(['a', 42]);
-        result = _(list).some({a: 42});
+    _.chain(numericDictionary).some(); // $ExpectType LoDashExplicitWrapper<boolean>
+    _.chain(numericDictionary).some(numericDictionaryIterator); // $ExpectType LoDashExplicitWrapper<boolean>
+    _.chain(numericDictionary).some("a"); // $ExpectType LoDashExplicitWrapper<boolean>
+    _.chain(numericDictionary).some(["a", 42]); // $ExpectType LoDashExplicitWrapper<boolean>
+    _.chain(numericDictionary).some({ a: 42 }); // $ExpectType LoDashExplicitWrapper<boolean>
 
-        result = _(dictionary).some();
-        result = _(dictionary).some(dictionaryIterator);
-        result = _(dictionary).some('a');
-        result = _(dictionary).some(['a', 42]);
-        result = _(dictionary).some({a: 42});
+    fp.some(valueIterator, list); // $ExpectType boolean
+    fp.some("a")(list); // $ExpectType boolean
+    fp.some({ a: 42 }, list); // $ExpectType boolean
+    fp.some(["a", 42], list); // $ExpectType boolean
 
-        result = _(numericDictionary).some();
-        result = _(numericDictionary).some(numericDictionaryIterator);
-        result = _(numericDictionary).some('a');
-        result = _(numericDictionary).some(['a', 42]);
-        result = _(numericDictionary).some({a: 42});
+    fp.some(valueIterator, dictionary); // $ExpectType boolean
+    fp.some("a")(dictionary); // $ExpectType boolean
+    fp.some({ a: 42 })(dictionary); // $ExpectType boolean
+    fp.some(["a", 42])(dictionary); // $ExpectType boolean
 
-        result = _(sampleObject).some();
-        result = _(sampleObject).some(objectIterator);
-        result = _(sampleObject).some('a');
-        result = _(sampleObject).some(['a', 42]);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _(array).chain().some();
-        result = _(array).chain().some(listIterator);
-        result = _(array).chain().some('a');
-        result = _(array).chain().some(['a', 42]);
-        result = _(array).chain().some({a: 42});
-
-        result = _(list).chain().some();
-        result = _(list).chain().some(listIterator);
-        result = _(list).chain().some('a');
-        result = _(list).chain().some(['a', 42]);
-        result = _(list).chain().some({a: 42});
-
-        result = _(dictionary).chain().some();
-        result = _(dictionary).chain().some(dictionaryIterator);
-        result = _(dictionary).chain().some('a');
-        result = _(dictionary).chain().some(['a', 42]);
-        result = _(dictionary).chain().some({a: 42});
-
-        result = _(numericDictionary).chain().some();
-        result = _(numericDictionary).chain().some(numericDictionaryIterator);
-        result = _(numericDictionary).chain().some('a');
-        result = _(numericDictionary).chain().some(['a', 42]);
-        result = _(numericDictionary).chain().some({a: 42});
-
-        result = _(sampleObject).chain().some();
-        result = _(sampleObject).chain().some(objectIterator);
-        result = _(sampleObject).chain().some('a');
-        result = _(sampleObject).chain().some(['a', 42]);
-    }
+    fp.some(valueIterator, numericDictionary); // $ExpectType boolean
+    fp.some("a")(numericDictionary); // $ExpectType boolean
+    fp.some({ a: 42 })(numericDictionary); // $ExpectType boolean
+    fp.some(["a", 42])(numericDictionary); // $ExpectType boolean
 }
 
 // _.sortBy
-namespace TestSortBy {
-    let array: AbcObject[] | null | undefined = [] as any;
-    let list: _.List<AbcObject> | null | undefined = [] as any;
-    let obj: any = {};
-    let dictionary: _.Dictionary<AbcObject> | null | undefined = obj;
+{
+    const list: _.List<AbcObject> | null | undefined = anything;
+    const dictionary: _.Dictionary<AbcObject> | null | undefined = anything;
 
-    let listIterator = (value: AbcObject, index: number, collection: _.List<AbcObject>) => 0;
-    let dictionaryIterator = (value: AbcObject, key: string, collection: _.Dictionary<AbcObject>) => 0;
+    const listIterator = (value: AbcObject, index: number, collection: _.List<AbcObject>) => 0;
+    const dictionaryIterator = (value: AbcObject, key: string, collection: _.Dictionary<AbcObject>) => 0;
+    const valueIterator = (value: AbcObject) => 0;
 
-    {
-        let result: AbcObject[];
+    _.sortBy(list); // $ExpectType AbcObject[]
+    _.sortBy(list, listIterator); // $ExpectType AbcObject[]
+    _.sortBy(list, listIterator, listIterator); // $ExpectType AbcObject[]
+    _.sortBy(list, [listIterator, listIterator]); // $ExpectType AbcObject[]
+    _.sortBy(list, ""); // $ExpectType AbcObject[]
+    _.sortBy(list, { a: 42 }); // $ExpectType AbcObject[]
+    _.sortBy(dictionary); // $ExpectType AbcObject[]
+    _.sortBy(dictionary, dictionaryIterator); // $ExpectType AbcObject[]
+    _.sortBy(dictionary, ""); // $ExpectType AbcObject[]
+    _.sortBy(dictionary, { a: 42 }); // $ExpectType AbcObject[]
 
-        result = _.sortBy(array);
-        result = _.sortBy(array, listIterator);
-        result = _.sortBy(array, '');
-        result = _.sortBy(array, {a: 42});
+    _(list).sortBy(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).sortBy(listIterator); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).sortBy(listIterator, listIterator); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).sortBy([listIterator, listIterator]); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).sortBy(""); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).sortBy({ a: 42 }); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(dictionary).sortBy(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(dictionary).sortBy(dictionaryIterator); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(dictionary).sortBy(""); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(dictionary).sortBy({ a: 42 }); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
 
-        result = _.sortBy(list);
-        result = _.sortBy(list, listIterator);
-        result = _.sortBy(list, '');
-        result = _.sortBy(list, {a: 42});
+    _.chain(list).sortBy(); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).sortBy(listIterator); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).sortBy(listIterator, listIterator); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).sortBy([listIterator, listIterator]); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).sortBy(""); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).sortBy({ a: 42 }); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(dictionary).sortBy(); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(dictionary).sortBy(dictionaryIterator); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(dictionary).sortBy(""); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(dictionary).sortBy({ a: 42 }); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
 
-        result = _.sortBy(dictionary);
-        result = _.sortBy(dictionary, dictionaryIterator);
-        result = _.sortBy(dictionary, '');
-        result = _.sortBy(dictionary, {a: 42});
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<AbcObject>;
-
-        result = _(array).sortBy();
-        result = _(array).sortBy(listIterator);
-        result = _(array).sortBy('');
-        result = _(array).sortBy({a: 42});
-
-        result = _(list).sortBy();
-        result = _(list).sortBy(listIterator);
-        result = _(list).sortBy('');
-        result = _(list).sortBy({a: 42});
-
-        result = _(dictionary).sortBy();
-        result = _(dictionary).sortBy(dictionaryIterator);
-        result = _(dictionary).sortBy('');
-        result = _(dictionary).sortBy({a: 42});
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<AbcObject>;
-
-        result = _(array).chain().sortBy();
-        result = _(array).chain().sortBy(listIterator);
-        result = _(array).chain().sortBy('');
-        result = _(array).chain().sortBy({a: 42});
-
-        result = _(list).chain().sortBy();
-        result = _(list).chain().sortBy(listIterator);
-        result = _(list).chain().sortBy('');
-        result = _(list).chain().sortBy({a: 42});
-
-        result = _(dictionary).chain().sortBy();
-        result = _(dictionary).chain().sortBy(dictionaryIterator);
-        result = _(dictionary).chain().sortBy('');
-        result = _(dictionary).chain().sortBy({a: 42});
-    }
+    fp.sortBy(fp.identity, "bca"); // $ExpectType string[]
+    fp.sortBy(valueIterator, list); // $ExpectType AbcObject[]
+    fp.sortBy(valueIterator)(list); // $ExpectType AbcObject[]
+    fp.sortBy([valueIterator, valueIterator])(list); // $ExpectType AbcObject[]
+    fp.sortBy("a", list); // $ExpectType AbcObject[]
+    fp.sortBy({ a: 42 }, list); // $ExpectType AbcObject[]
+    fp.sortBy(fp.identity, dictionary); // $ExpectType AbcObject[]
+    fp.sortBy(valueIterator, dictionary); // $ExpectType AbcObject[]
+    fp.sortBy("a", dictionary); // $ExpectType AbcObject[]
+    fp.sortBy({ a: 42 }, dictionary); // $ExpectType AbcObject[]
 }
 
-_.sortBy(stoogesAges, stooge => Math.sin(stooge.age), stooge => stooge.name.slice(1)); // $ExpectType StoogesAge[]
-_.sortBy(stoogesAges, ['name', 'age']); // $ExpectType StoogesAge[]
-_.sortBy(stoogesAges, 'name', stooge => Math.sin(stooge.age)); // $ExpectType StoogesAge[]
-
-_(foodsOrganic).sortBy('organic', (food) => food.name, { organic: true }).value(); // $ExpectType FoodOrganic[]
-
 // _.orderBy
-namespace TestorderBy {
-    type SampleObject = {a: number; b: string; c: boolean};
+{
+    const list: _.List<AbcObject> | null | undefined = anything;
+    const numericDictionary: _.NumericDictionary<AbcObject> | null | undefined = anything;
+    const dictionary: _.Dictionary<AbcObject> | null | undefined = anything;
 
-    const array: SampleObject[] | null | undefined = anything;
-    const list: _.List<SampleObject> | null | undefined = anything;
-    const numericDictionary: _.NumericDictionary<SampleObject> | null | undefined = anything;
-    const dictionary: _.Dictionary<SampleObject> | null | undefined = anything;
-    const orders: boolean|string|Array<boolean|string> = anything;
+    _.orderBy("acbd", (value) => 1); // $ExpectType string[]
+    _.orderBy("acbd", (value) => 1, true); // $ExpectType string[]
+    _.orderBy("acbd", [(value) => 1, (value) => 2], [true, false]); // $ExpectType string[]
+    _.orderBy(list, (value) => 1); // $ExpectType AbcObject[]
+    _.orderBy(list, (value) => 1, true); // $ExpectType AbcObject[]
+    _.orderBy(list, [(value) => 1, (value) => 2], [true, false]); // $ExpectType AbcObject[]
+    _.orderBy(dictionary, (value) => 1); // $ExpectType AbcObject[]
+    _.orderBy(dictionary, (value) => 1, true); // $ExpectType AbcObject[]
+    // These fail in TS 2.4
+    // _.orderBy(numericDictionary, (value) => 1); // AbcObject[]
+    // _.orderBy(numericDictionary, (value) => 1, true); // AbcObject[]
 
-    {
-        let iteratees: ((value: string) => any)|Array<(value: string) => any> = anything;
-        let result: string[];
+    _(list).orderBy((value) => 1); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).orderBy((value) => 1, true); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).orderBy([(value) => 1, (value) => 2], true); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(dictionary).orderBy((value) => 1); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(dictionary).orderBy((value) => 1, true); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    // These fail in TS 2.4
+    // _(numericDictionary).orderBy((value) => 1); // LoDashImplicitWrapper<AbcObject[]>
+    // _(numericDictionary).orderBy((value) => 1, true); // LoDashImplicitWrapper<AbcObject[]>
 
-        result = _.orderBy<string>('acbd', iteratees);
-        result = _.orderBy<string>('acbd', iteratees, orders);
-    }
+    _.chain(list).orderBy((value) => 1); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).orderBy((value) => 1, true); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).orderBy([(value) => 1, (value) => 2], true); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(dictionary).orderBy((value) => 1); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(dictionary).orderBy((value) => 1, true); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    // These fail in TS 2.4
+    // _.chain(numericDictionary).orderBy((value) => 1); // LoDashExplicitWrapper<AbcObject[]>
+    // _.chain(numericDictionary).orderBy((value) => 1, true); // LoDashExplicitWrapper<AbcObject[]>
 
-    {
-        const iteratees: ((value: SampleObject) => _.NotVoid)|string|_.PartialDeep<SampleObject>|Array<((value: SampleObject) => _.NotVoid)|string|_.PartialDeep<SampleObject>> = anything;
-        let result: SampleObject[];
-
-        result = _.orderBy(array, iteratees);
-        result = _.orderBy(array, iteratees, orders);
-
-        result = _.orderBy(list, iteratees);
-        result = _.orderBy(list, iteratees, orders);
-
-        result = _.orderBy(numericDictionary, iteratees);
-        result = _.orderBy(numericDictionary, iteratees, orders);
-
-        result = _.orderBy(dictionary, iteratees);
-        result = _.orderBy(dictionary, iteratees, orders);
-    }
-
-    {
-        const iteratees: ((value: SampleObject) => _.NotVoid)|string|_.PartialDeep<SampleObject>|Array<((value: SampleObject) => _.NotVoid)|string|_.PartialDeep<SampleObject>> = anything;
-        let result: _.LoDashImplicitArrayWrapper<SampleObject>;
-
-        result = _(array).orderBy(iteratees);
-        result = _(array).orderBy(iteratees, orders);
-
-        result = _(list).orderBy(iteratees);
-        result = _(list).orderBy(iteratees, orders);
-
-        result = _(numericDictionary).orderBy(iteratees);
-        result = _(numericDictionary).orderBy(iteratees, orders);
-
-        result = _(dictionary).orderBy(iteratees);
-        result = _(dictionary).orderBy(iteratees, orders);
-    }
-
-    {
-        const iteratees: ((value: SampleObject) => _.NotVoid)|string|_.PartialDeep<SampleObject>|Array<((value: SampleObject) => _.NotVoid)|string|_.PartialDeep<SampleObject>> = anything;
-        let result: _.LoDashExplicitArrayWrapper<SampleObject>;
-
-        result = _(array).chain().orderBy(iteratees);
-        result = _(array).chain().orderBy(iteratees, orders);
-
-        result = _(list).chain().orderBy(iteratees);
-        result = _(list).chain().orderBy(iteratees, orders);
-
-        result = _(numericDictionary).chain().orderBy(iteratees);
-        result = _(numericDictionary).chain().orderBy(iteratees, orders);
-
-        result = _(dictionary).chain().orderBy(iteratees);
-        result = _(dictionary).chain().orderBy(iteratees, orders);
-    }
+    fp.orderBy(fp.identity, "asc", "bca"); // $ExpectType string[]
+    fp.orderBy(fp.identity, true, "bca"); // $ExpectType string[]
+    fp.orderBy((value: AbcObject) => 1, true, list); // $ExpectType AbcObject[]
+    fp.orderBy([(value: AbcObject) => 1, (value: AbcObject) => 1])([true, false])(list); // $ExpectType AbcObject[]
+    fp.orderBy("a", true, list); // $ExpectType AbcObject[]
+    fp.orderBy({ a: 42 }, true, list); // $ExpectType AbcObject[]
+    fp.orderBy((value: AbcObject) => 1, true, dictionary); // $ExpectType AbcObject[]
+    fp.orderBy("a", true, dictionary); // $ExpectType AbcObject[]
+    fp.orderBy({ a: 42 }, true, dictionary); // $ExpectType AbcObject[]
 }
 
 /********
  * Date *
  ********/
 
-namespace TestNow {
-    {
-        let result: number;
+_.now(); // $ExpectType number
+_({}).now(); // $ExpectType number
+_.chain({}).now(); // $ExpectType LoDashExplicitWrapper<number>
+fp.now(); // $ExpectType number
 
-        result = _.now();
-        result = _(42).now();
-        result = _<any>([]).now();
-        result = _({}).now();
-    }
+/************
+ * Function *
+ ************/
 
-    {
-        let result: _.LoDashExplicitWrapper<number>;
-
-        result = _(42).chain().now();
-        result = _<any>([]).chain().now();
-        result = _({}).chain().now();
-    }
-}
-
-/*************
- * Functions *
- *************/
 // _.after
-namespace TestAfter {
-    type Func = (a: string, b: number) => boolean;
-
-    let func: Func = (a, b) => true;
-
-    {
-        let result: Func;
-
-        _.after(42, func);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<Func>;
-
-        _(42).after(func);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<Func>;
-
-        _(42).chain().after(func);
-    }
+{
+    _.after(42, (a: string, b: number): boolean => true); // $ExpectType (a: string, b: number) => boolean
+    _(42).after((a: string, b: number): boolean => true); // $ExpectType LoDashImplicitWrapper<(a: string, b: number) => boolean>
+    _.chain(42).after((a: string, b: number): boolean => true); // $ExpectType LoDashExplicitWrapper<(a: string, b: number) => boolean>
+    fp.after((a: string, b: number): boolean => true, 42); // $ExpectType (a: string, b: number) => boolean
+    fp.after((a: string, b: number): boolean => true)(42); // $ExpectType (a: string, b: number) => boolean
 }
 
 // _.ary
-namespace TestAry {
-    type SampleFunc = (a: number, b: string) => boolean;
+{
+    const func = (a: string, b: number) => true;
 
-    let func: SampleFunc = (a, b) => true;
-
-    {
-        let result: SampleFunc;
-
-        result = _.ary(func);
-        result = _.ary(func, 2);
-        result = _.ary(func);
-        result = _.ary(func, 2);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<SampleFunc>;
-
-        result = _(func).ary();
-        result = _(func).ary(2);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<SampleFunc>;
-
-        result = _(func).chain().ary();
-        result = _(func).chain().ary(2);
-    }
+    _.ary(func); // $ExpectType (...args: any[]) => any
+    _.ary(func, 2); // $ExpectType (...args: any[]) => any
+    _(func).ary(); // $ExpectType LoDashImplicitWrapper<(...args: any[]) => any>
+    _(func).ary(2); // $ExpectType LoDashImplicitWrapper<(...args: any[]) => any>
+    _.chain(func).ary(); // $ExpectType LoDashExplicitWrapper<(...args: any[]) => any>
+    _.chain(func).ary(2); // $ExpectType LoDashExplicitWrapper<(...args: any[]) => any>
+    fp.ary(1, func); // $ExpectType (...args: any[]) => any
 }
 
 // _.before
-namespace TestBefore {
-    type Func = (a: string, b: number) => boolean;
-
-    let func: Func = (a, b) => true;
-
-    {
-        let result: Func;
-
-        _.before(42, func);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<Func>;
-
-        _(42).before(func);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<Func>;
-
-        _(42).chain().before(func);
-    }
+{
+    _.before(42, (a: string, b: number): boolean => true); // $ExpectType (a: string, b: number) => boolean
+    _(42).before((a: string, b: number): boolean => true); // $ExpectType LoDashImplicitWrapper<(a: string, b: number) => boolean>
+    _.chain(42).before((a: string, b: number): boolean => true); // $ExpectType LoDashExplicitWrapper<(a: string, b: number) => boolean>
+    fp.before((a: string, b: number): boolean => true, 42); // $ExpectType (a: string, b: number) => boolean
+    fp.before((a: string, b: number): boolean => true)(42); // $ExpectType (a: string, b: number) => boolean
 }
 
 // _.bind
-namespace TestBind {
-    type SampleFunc = (a: number, b: string) => boolean;
+{
+    const func = (a: string, b: number) => true;
 
-    let func: SampleFunc = (a, b) => true;
-
-    {
-        type SampleResult = (a: number, b: string) => boolean;
-
-        let result: SampleResult;
-
-        result = _.bind(func, anything);
-        result = _.bind(func, anything);
-    }
-
-    {
-        type SampleResult = (b: string) => boolean;
-
-        let result: SampleResult;
-
-        result = _.bind(func, anything, 42);
-        result = _.bind(func, anything, 42);
-    }
-
-    {
-        type SampleResult = () => boolean;
-
-        let result: SampleResult;
-
-        result = _.bind(func, anything, 42, '');
-        result = _.bind(func, anything, 42, '');
-    }
-
-    {
-        type SampleResult = (a: number, b: string) => boolean;
-
-        let result: _.LoDashImplicitObjectWrapper<SampleResult>;
-
-        result = _(func).bind(anything);
-    }
-
-    {
-        type SampleResult = (b: string) => boolean;
-
-        let result: _.LoDashImplicitObjectWrapper<SampleResult>;
-
-        result = _(func).bind(anything, 42);
-    }
-
-    {
-        type SampleResult = () => boolean;
-
-        let result: _.LoDashImplicitObjectWrapper<SampleResult>;
-
-        result = _(func).bind(anything, 42, '');
-    }
-
-    {
-        type SampleResult = (a: number, b: string) => boolean;
-
-        let result: _.LoDashExplicitObjectWrapper<SampleResult>;
-
-        result = _(func).chain().bind(anything);
-    }
-
-    {
-        type SampleResult = (b: string) => boolean;
-
-        let result: _.LoDashExplicitWrapper<SampleResult>;
-
-        result = _(func).chain().bind(anything, 42);
-    }
-
-    {
-        type SampleResult = () => boolean;
-
-        let result: _.LoDashExplicitWrapper<SampleResult>;
-
-        result = _(func).chain().bind(anything, 42, '');
-    }
+    _.bind(func, anything); // $ExpectType (...args: any[]) => any
+    _.bind(func, anything, 42); // $ExpectType (...args: any[]) => any
+    _.bind(func, anything, 42, ""); // $ExpectType (...args: any[]) => any
+    _(func).bind(anything); // $ExpectType LoDashImplicitWrapper<(...args: any[]) => any>
+    _(func).bind(anything, 42); // $ExpectType LoDashImplicitWrapper<(...args: any[]) => any>
+    _(func).bind(anything, 42, ""); // $ExpectType LoDashImplicitWrapper<(...args: any[]) => any>
+    _.chain(func).bind(anything); // $ExpectType LoDashExplicitWrapper<(...args: any[]) => any>
+    _.chain(func).bind(anything, 42); // $ExpectType LoDashExplicitWrapper<(...args: any[]) => any>
+    _.chain(func).bind(anything, 42, ""); // $ExpectType LoDashExplicitWrapper<(...args: any[]) => any>
+    fp.bind((a: string, b: number) => true, anything); // $ExpectType (...args: any[]) => any
+    fp.bind((a: string, b: number) => true)(anything); // $ExpectType (...args: any[]) => any
 }
 
 // _.bindAll
-namespace TestBindAll {
-    interface SampleObject {
-        a(): void;
-        b(): void;
-        c(): void;
-    }
+{
+    const object = { a: () => {}, b: () => {}, c: () => {} };
 
-    let object: SampleObject = { a: () => {}, b: () => {}, c: () => {} };
-
-    {
-        let result: SampleObject;
-
-        result = _.bindAll<SampleObject>(object);
-        result = _.bindAll<SampleObject>(object, 'c');
-        result = _.bindAll<SampleObject>(object, ['b'], 'c');
-        result = _.bindAll<SampleObject>(object, 'a', ['b'], 'c');
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<SampleObject>;
-
-        result = _(object).bindAll();
-        result = _(object).bindAll('c');
-        result = _(object).bindAll(['b'], 'c');
-        result = _(object).bindAll('a', ['b'], 'c');
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<SampleObject>;
-
-        result = _(object).chain().bindAll();
-        result = _(object).chain().bindAll('c');
-        result = _(object).chain().bindAll(['b'], 'c');
-        result = _(object).chain().bindAll('a', ['b'], 'c');
-    }
+    _.bindAll(object); // $ExpectType { a: () => void; b: () => void; c: () => void; }
+    _.bindAll(object, "a", ["b", "c"]); // $ExpectType { a: () => void; b: () => void; c: () => void; }
+    _(object).bindAll(); // $ExpectType LoDashImplicitWrapper<{ a: () => void; b: () => void; c: () => void; }>
+    _(object).bindAll("a", ["b", "c"]); // $ExpectType LoDashImplicitWrapper<{ a: () => void; b: () => void; c: () => void; }>
+    _.chain(object).bindAll(); // $ExpectType LoDashExplicitWrapper<{ a: () => void; b: () => void; c: () => void; }>
+    _.chain(object).bindAll("a", ["b", "c"]); // $ExpectType LoDashExplicitWrapper<{ a: () => void; b: () => void; c: () => void; }>
+    fp.bindAll("a", object); // $ExpectType { a: () => void; b: () => void; c: () => void; }
+    fp.bindAll(["b", "c"])(object); // $ExpectType { a: () => void; b: () => void; c: () => void; }
 }
 
 // _.bindKey
-namespace TestBindKey {
-    let object = {
+{
+    const object = {
         foo: (a: number, b: string) => true,
     };
 
-    {
-        type SampleResult = (a: number, b: string) => boolean;
-
-        let result: SampleResult;
-
-        result = _.bindKey(object, 'foo');
-    }
-
-    {
-        type SampleResult = (b: string) => boolean;
-
-        let result: SampleResult;
-
-        result = _.bindKey(object, 'foo', 42);
-    }
-
-    {
-        type SampleResult = () => boolean;
-
-        let result: SampleResult;
-
-        result = _.bindKey(object, 'foo', 42, '');
-    }
-
-    {
-        type SampleResult = (a: number, b: string) => boolean;
-
-        let result: _.LoDashImplicitObjectWrapper<SampleResult>;
-
-        result = _(object).bindKey('foo');
-    }
-
-    {
-        type SampleResult = (b: string) => boolean;
-
-        let result: _.LoDashImplicitObjectWrapper<SampleResult>;
-
-        result = _(object).bindKey('foo', 42);
-    }
-
-    {
-        type SampleResult = () => boolean;
-
-        let result: _.LoDashImplicitObjectWrapper<SampleResult>;
-
-        result = _(object).bindKey('foo', 42, '');
-    }
-
-    {
-        type SampleResult = (a: number, b: string) => boolean;
-
-        let result: _.LoDashExplicitObjectWrapper<SampleResult>;
-
-        result = _(object).chain().bindKey('foo');
-    }
-
-    {
-        type SampleResult = (b: string) => boolean;
-
-        let result: _.LoDashExplicitObjectWrapper<SampleResult>;
-
-        result = _(object).chain().bindKey('foo', 42);
-    }
-
-    {
-        type SampleResult = () => boolean;
-
-        let result: _.LoDashExplicitObjectWrapper<SampleResult>;
-
-        result = _(object).chain().bindKey('foo', 42, '');
-    }
+    _.bindKey(object, "foo"); // $ExpectType (...args: any[]) => any
+    _.bindKey(object, "foo", 42, ""); // $ExpectType (...args: any[]) => any
+    _(object).bindKey("foo"); // $ExpectType LoDashImplicitWrapper<(...args: any[]) => any>
+    _(object).bindKey("foo", 42, ""); // $ExpectType LoDashImplicitWrapper<(...args: any[]) => any>
+    _.chain(object).bindKey("foo"); // $ExpectType LoDashExplicitWrapper<(...args: any[]) => any>
+    _.chain(object).bindKey("foo", 42, ""); // $ExpectType LoDashExplicitWrapper<(...args: any[]) => any>
+    fp.bindKey(object, "foo"); // $ExpectType (...args: any[]) => any
+    fp.bindKey(object)("foo"); // $ExpectType (...args: any[]) => any
 }
 
 // _.curry
-const testCurryFn = (a: number, b: number, c: number) => [a, b, c];
-let curryResult0: number[]
-let curryResult1: _.CurriedFunction1<number, number[]>
-let curryResult2: _.CurriedFunction2<number, number, number[]>
+{
+    const testCurry = (a: string, b: number, c: boolean): [string, number, boolean] => [a, b, c];
+    _.curry(testCurry)("1", 2, true); // $ExpectType [string, number, boolean]
+    _.curry(testCurry)("1", 2)(true); // $ExpectType [string, number, boolean]
+    _.curry(testCurry)("1")(2, true); // $ExpectType [string, number, boolean]
+    _.curry(testCurry)("1")(2)(true); // $ExpectType [string, number, boolean]
+    _.curry(testCurry)("1", 2); // $ExpectType CurriedFunction1<boolean, [string, number, boolean]>
+    _.curry(testCurry)("1")(2); // $ExpectType CurriedFunction1<boolean, [string, number, boolean]>
+    _.curry(testCurry)("1"); // $ExpectType CurriedFunction2<number, boolean, [string, number, boolean]>
+    _.curry(testCurry); // $ExpectType CurriedFunction3<string, number, boolean, [string, number, boolean]>
+    _(testCurry).curry(); // $ExpectType LoDashImplicitWrapper<CurriedFunction3<string, number, boolean, [string, number, boolean]>>
+    _.chain(testCurry).curry(); // $ExpectType LoDashExplicitWrapper<CurriedFunction3<string, number, boolean, [string, number, boolean]>>
 
-curryResult0 = _.curry(testCurryFn)(1, 2, 3);
-curryResult1 = _.curry(testCurryFn)(1, 2);
-curryResult0 = _.curry(testCurryFn)(1, 2)(3);
-curryResult0 = _.curry(testCurryFn)(1)(2)(3);
-curryResult2 = _.curry(testCurryFn)(1);
-curryResult1 = _.curry(testCurryFn)(1)(2);
-curryResult0 = _.curry(testCurryFn)(1)(2)(3);
-curryResult0 = _.curry(testCurryFn)(1)(2, 3);
-curryResult0 = _(testCurryFn).curry().value()(1, 2, 3);
-curryResult2 = _(testCurryFn).curry().value()(1);
+    fp.curry(testCurry)("1", 2, true); // $ExpectType [string, number, boolean]
+    fp.curry(testCurry)("1", 2)(true); // $ExpectType [string, number, boolean]
+    fp.curry(testCurry)("1")(2, true); // $ExpectType [string, number, boolean]
+    fp.curry(testCurry)("1")(2)(true); // $ExpectType [string, number, boolean]
+    fp.curry(testCurry)("1", 2); // $ExpectType CurriedFunction1<boolean, [string, number, boolean]>
+    fp.curry(testCurry)("1")(2); // $ExpectType CurriedFunction1<boolean, [string, number, boolean]>
+    fp.curry(testCurry)("1"); // $ExpectType CurriedFunction2<number, boolean, [string, number, boolean]>
+    fp.curry(testCurry); // $ExpectType CurriedFunction3<string, number, boolean, [string, number, boolean]>
 
-declare function testCurry2(a: string, b: number, c: boolean): [string, number, boolean];
-let curryResult3: [string, number, boolean];
-let curryResult4: _.CurriedFunction1<boolean, [string, number, boolean]>;
-let curryResult5: _.CurriedFunction2<number, boolean, [string, number, boolean]>;
-let curryResult6: _.CurriedFunction3<string, number, boolean, [string, number, boolean]>;
-curryResult3 = _.curry(testCurry2)("1", 2, true);
-curryResult3 = _.curry(testCurry2)("1", 2)(true);
-curryResult3 = _.curry(testCurry2)("1")(2, true);
-curryResult3 = _.curry(testCurry2)("1")(2)(true);
-curryResult4 = _.curry(testCurry2)("1", 2);
-curryResult4 = _.curry(testCurry2)("1")(2);
-curryResult5 = _.curry(testCurry2)("1");
-curryResult6 = _.curry(testCurry2);
+    // _.curryRight
+    _.curryRight(testCurry)("1", 2, true); // $ExpectType [string, number, boolean]
+    _.curryRight(testCurry)(2, true)("1"); // $ExpectType [string, number, boolean]
+    _.curryRight(testCurry)(true)("1", 2); // $ExpectType [string, number, boolean]
+    _.curryRight(testCurry)(true)(2)("1"); // $ExpectType [string, number, boolean]
+    _.curryRight(testCurry)(2, true); // $ExpectType RightCurriedFunction1<string, [string, number, boolean]>
+    _.curryRight(testCurry)(true)(2); // $ExpectType RightCurriedFunction1<string, [string, number, boolean]>
+    _.curryRight(testCurry)(true); // $ExpectType RightCurriedFunction2<string, number, [string, number, boolean]>
+    _.curryRight(testCurry); // $ExpectType RightCurriedFunction3<string, number, boolean, [string, number, boolean]>
+    _(testCurry).curryRight(); // $ExpectType LoDashImplicitWrapper<RightCurriedFunction3<string, number, boolean, [string, number, boolean]>>
+    _.chain(testCurry).curryRight(); // $ExpectType LoDashExplicitWrapper<RightCurriedFunction3<string, number, boolean, [string, number, boolean]>>
 
-// _.curryRight
-const testCurryRightFn = (a: number, b: number, c: number) => [a, b, c];
-curryResult0 = _.curryRight(testCurryRightFn)(1, 2, 3);
-curryResult2 = _.curryRight(testCurryRightFn)(1);
-curryResult0 = _(testCurryRightFn).curryRight().value()(1, 2, 3);
-curryResult2 = _(testCurryRightFn).curryRight().value()(1);
-let curryResult7: _.RightCurriedFunction1<string, [string, number, boolean]>;
-let curryResult8: _.RightCurriedFunction2<string,number , [string, number, boolean]>;
-let curryResult9: _.RightCurriedFunction3<string, number, boolean, [string, number, boolean]>;
-curryResult3 = _.curryRight(testCurry2)("1", 2, true);
-curryResult3 = _.curryRight(testCurry2)( 2,true)("1");
-curryResult3 = _.curryRight(testCurry2)(true)( "1",2);
-curryResult3 = _.curryRight(testCurry2)(true)(2)("1");
-curryResult7 = _.curryRight(testCurry2)(2,true);
-curryResult7 = _.curryRight(testCurry2)(true)(2);
-curryResult8 = _.curryRight(testCurry2)(true);
-curryResult9 = _.curryRight(testCurry2);
+    fp.curryRight(testCurry)("1", 2, true); // $ExpectType [string, number, boolean]
+    fp.curryRight(testCurry)(true)("1", 2); // $ExpectType [string, number, boolean]
+    fp.curryRight(testCurry)(2, true)("1"); // $ExpectType [string, number, boolean]
+    fp.curryRight(testCurry)(true)(2)("1"); // $ExpectType [string, number, boolean]
+    fp.curryRight(testCurry)(2, true); // $ExpectType RightCurriedFunction1<string, [string, number, boolean]>
+    fp.curryRight(testCurry)(true)(2); // $ExpectType RightCurriedFunction1<string, [string, number, boolean]>
+    fp.curryRight(testCurry)(true); // $ExpectType RightCurriedFunction2<string, number, [string, number, boolean]>
+    fp.curryRight(testCurry); // $ExpectType RightCurriedFunction3<string, number, boolean, [string, number, boolean]>
+}
 
 // _.debounce
-namespace TestDebounce {
-    type SampleFunc = (n: number, s: string) => boolean;
+{
+    const func = (n: number, s: string): boolean => true;
+    const options: _.DebounceSettings = {
+        leading: true,
+        maxWait: 100,
+        trailing: false,
+    };
 
-    interface Options {
-        leading?: boolean;
-        maxWait?: number;
-        trailing?: boolean;
-    }
+    const result = _.debounce(func); // $ExpectType ((n: number, s: string) => boolean) & Cancelable
+    result.cancel(); // $ExpectType void
+    result.flush(); // $ExpectType void
+    _.debounce(func, 42); // $ExpectType ((n: number, s: string) => boolean) & Cancelable
+    _.debounce(func, 42, options); // $ExpectType ((n: number, s: string) => boolean) & Cancelable
 
-    interface ResultFunc {
-        (n: number, s: string): boolean;
-        cancel(): void;
-        flush(): void;
-    }
-
-    let func: SampleFunc = (a, b) => true;
-    let options: Options = {};
-
-    {
-        let result: ResultFunc;
-
-        result = _.debounce<SampleFunc>(func);
-        result = _.debounce<SampleFunc>(func, 42);
-        result = _.debounce<SampleFunc>(func, 42, options);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<ResultFunc>;
-
-        result = _(func).debounce();
-        result = _(func).debounce(42);
-        result = _(func).debounce(42, options);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<ResultFunc>;
-
-        result = _(func).chain().debounce();
-        result = _(func).chain().debounce(42);
-        result = _(func).chain().debounce(42, options);
-    }
+    _(func).debounce(42, options); // $ExpectType LoDashImplicitWrapper<((n: number, s: string) => boolean) & Cancelable>
+    _.chain(func).debounce(42, options); // $ExpectType LoDashExplicitWrapper<((n: number, s: string) => boolean) & Cancelable>
+    fp.debounce(42, func); // $ExpectType ((n: number, s: string) => boolean) & Cancelable
+    fp.debounce(42)(func); // $ExpectType ((n: number, s: string) => boolean) & Cancelable
 }
 
 // _.defer
-namespace TestDefer {
-    type SampleFunc = (a: number, b: string) => boolean;
+{
+    const func = (a: number, b: string) => true;
 
-    let func: SampleFunc = (a, b) => true;
-
-    {
-        let result: number;
-
-        result = _.defer(func);
-        result = _.defer(func, anything);
-        result = _.defer(func, anything, anything);
-        result = _.defer(func, anything, anything, anything);
-    }
-
-    {
-        let result: _.LoDashImplicitWrapper<number>;
-
-        result = _(func).defer();
-        result = _(func).defer(anything);
-        result = _(func).defer(anything, anything);
-        result = _(func).defer(anything, anything, anything);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<number>;
-
-        result = _(func).chain().defer();
-        result = _(func).chain().defer(anything);
-        result = _(func).chain().defer(anything, anything);
-        result = _(func).chain().defer(anything, anything, anything);
-    }
+    _.defer(func); // $ExpectType number
+    _.defer(func, anything, anything, anything); // $ExpectType number
+    _(func).defer(); // $ExpectType LoDashImplicitWrapper<number>
+    _(func).defer(anything, anything, anything); // $ExpectType LoDashImplicitWrapper<number>
+    _.chain(func).defer(); // $ExpectType LoDashExplicitWrapper<number>
+    _.chain(func).defer(anything, anything, anything); // $ExpectType LoDashExplicitWrapper<number>
+    fp.defer(func); // $ExpectType number
 }
 
 // _.delay
-namespace TestDelay {
-    type SampleFunc = (a: number, b: string) => boolean;
+{
+    const func = (a: number, b: string) => true;
 
-    let func: SampleFunc = (a, b) => true;
-
-    {
-        let result: number;
-
-        result = _.delay(func, 1);
-        result = _.delay(func, 1, 2);
-        result = _.delay(func, 1, 2, '');
-    }
-
-    {
-        let result: _.LoDashImplicitWrapper<number>;
-
-        result = _(func).delay(1);
-        result = _(func).delay(1, 2);
-        result = _(func).delay(1, 2, '');
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<number>;
-
-        result = _(func).chain().delay(1);
-        result = _(func).chain().delay(1, 2);
-        result = _(func).chain().delay(1, 2, '');
-    }
+    _.delay(func, 500); // $ExpectType number
+    _.delay(func, 500, anything, anything); // $ExpectType number
+    _(func).delay(500); // $ExpectType LoDashImplicitWrapper<number>
+    _(func).delay(500, anything, anything); // $ExpectType LoDashImplicitWrapper<number>
+    _.chain(func).delay(500); // $ExpectType LoDashExplicitWrapper<number>
+    _.chain(func).delay(500, anything, anything); // $ExpectType LoDashExplicitWrapper<number>
+    fp.delay(500, func); // $ExpectType number
+    fp.delay(500)(func); // $ExpectType number
 }
 
 // _.flip
-namespace TestFlip {
-    type Func = (a: string, b: number) => boolean;
-
-    let func: Func = (a, b) => true;
-
-    {
-        let result: Func;
-
-        result = _.flip(func);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<Func>;
-
-        result = _(func).flip();
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<Func>;
-
-        result = _(func).chain().flip();
-    }
+{
+    // TODO: fix - output arguments should be reversed
+    _.flip((a: string, b: number): boolean => true); // $ExpectType (a: string, b: number) => boolean
+    _((a: string, b: number): boolean => true).flip(); // $ExpectType LoDashImplicitWrapper<(a: string, b: number) => boolean>
+    _.chain((a: string, b: number): boolean => true).flip(); // $ExpectType LoDashExplicitWrapper<(a: string, b: number) => boolean>
+    fp.flip((a: string, b: number): boolean => true); // $ExpectType (a: string, b: number) => boolean
 }
 
 // _.flow
-namespace TestFlow {
-    let Fn1 = (n: number) => 0;
-    let Fn2 = (m: number, n: number) => 0;
-    let Fn3 = (a: number) => "";
-    let Fn4 = (a: string) => 0;
-
-    {
-        // type infer test
-        let result: (m: number, n: number) => number;
-
-        result = _.flow(Fn2, Fn1);
-        result = _.flow(Fn2, Fn1, Fn1);
-        result = _.flow(Fn2, Fn1, Fn1, Fn1);
-        result = _.flow(Fn2, Fn1, Fn1, Fn1, Fn1);
-        result = _.flow(Fn2, Fn1, Fn1, Fn1, Fn1, Fn1);
-        result = _.flow(Fn2, Fn1, Fn1, Fn1, Fn1, Fn1, Fn1);
-        result = _.flow(Fn2, Fn1, Fn3, Fn4);
-        result = _.flow([Fn2, Fn1, Fn3, Fn4]);
-    }
-
-    {
-        let result: (m: number, n: number) => number;
-
-        result = _.flow(Fn2, Fn1);
-        result = _.flow(Fn2, Fn1, Fn1);
-        result = _.flow(Fn2, Fn1, Fn1, Fn1);
-        result = _.flow([Fn1, Fn1, Fn1, Fn2]);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<(m: number, n: number) => number>;
-
-        result = _(Fn2).flow(Fn1);
-        result = _(Fn2).flow(Fn1, Fn1);
-        result = _(Fn2).flow(Fn1, Fn1, Fn1);
-        result = _(Fn2).flow([Fn1, Fn1, Fn1]);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<(m: number, n: number) => number>;
-
-        result = _(Fn2).chain().flow(Fn1);
-        result = _(Fn2).chain().flow(Fn1, Fn1);
-        result = _(Fn2).chain().flow(Fn1, Fn1, Fn1);
-        result = _(Fn2).chain().flow([Fn1, Fn1, Fn1]);
-    }
-}
-
 // _.flowRight
-namespace TestFlowRight {
-    let Fn1 = (n: number) => 0;
-    let Fn2 = (m: number, n: number) => 0;
+{
+    const fn1 = (n: number): number => 0;
+    const fn2 = (m: number, n: number): number => 0;
+    const fn3 = (a: number): string => "";
+    const fn4 = (a: string): boolean => true;
 
-    {
-        let result: (m: number, n: number) => number;
+    _.flow(fn2, fn1); // $ExpectType (a1: number, a2: number) => number
+    _.flow(fn2, fn1, fn1, fn1, fn1, fn1, fn1); // $ExpectType (a1: number, a2: number) => number
+    _.flow(fn2, fn1, fn3, fn4); // $ExpectType (a1: number, a2: number) => boolean
+    _.flow([fn2, fn1, fn3, fn4]); // $ExpectType (...args: any[]) => any
 
-        result = _.flowRight(Fn1, Fn2);
-        result = _.flowRight(Fn1, Fn1, Fn2);
-        result = _.flowRight(Fn1, Fn1, Fn1, Fn2);
-        result = _.flowRight([Fn1, Fn1, Fn1, Fn2]);
-    }
+    _(fn2).flow(fn1); // $ExpectType LoDashImplicitWrapper<(a1: number, a2: number) => number>
+    _(fn2).flow(fn1, fn1); // $ExpectType LoDashImplicitWrapper<(a1: number, a2: number) => number>
+    _(fn2).flow(fn1, fn1, fn1); // $ExpectType LoDashImplicitWrapper<(a1: number, a2: number) => number>
+    _(fn2).flow([fn1, fn1, fn1]); // $ExpectType LoDashImplicitWrapper<(...args: any[]) => any>
 
-    {
-        let result: _.LoDashImplicitObjectWrapper<(m: number, n: number) => number>;
+    _.chain(fn2).flow(fn1); // $ExpectType LoDashExplicitWrapper<(a1: number, a2: number) => number>
+    _.chain(fn2).flow(fn1, fn1); // $ExpectType LoDashExplicitWrapper<(a1: number, a2: number) => number>
+    _.chain(fn2).flow(fn1, fn1, fn1); // $ExpectType LoDashExplicitWrapper<(a1: number, a2: number) => number>
+    _.chain(fn2).flow([fn1, fn1, fn1]); // $ExpectType LoDashExplicitWrapper<(...args: any[]) => any>
 
-        result = _(Fn1).flowRight(Fn2);
-        result = _(Fn1).flowRight(Fn1, Fn2);
-        result = _(Fn1).flowRight(Fn1, Fn1, Fn2);
-        result = _(Fn1).flowRight([Fn1, Fn1, Fn2]);
-    }
+    fp.flow(fn1, fn1); // $ExpectType (a1: number) => number
+    fp.flow(fn1, fn3); // $ExpectType (a1: number) => string
+    fp.flow(fn2, fn1, fn1); // $ExpectType (a1: number, a2: number) => number
+    fp.flow(fn2, fn1, fn1, fn1); // $ExpectType (a1: number, a2: number) => number
+    fp.flow(fn2, fn1, fn1, fn1, fn1); // $ExpectType (a1: number, a2: number) => number
+    fp.flow(fn2, fn1, fn1, fn1, fn1, fn1); // $ExpectType (a1: number, a2: number) => number
+    fp.flow(fn2, fn1, fn1, fn1, fn1, fn1, fn1); // $ExpectType (a1: number, a2: number) => number
+    fp.flow(fn2, fn3); // $ExpectType (a1: number, a2: number) => string
+    fp.flow(fn2, fn3, fn4); // $ExpectType (a1: number, a2: number) => boolean
+    fp.flow(fn2, fn1, fn3, fn4); // $ExpectType (a1: number, a2: number) => boolean
+    fp.flow([fn2, fn1, fn3, fn4]); // $ExpectType (...args: any[]) => any
 
-    {
-        let result: _.LoDashExplicitObjectWrapper<(m: number, n: number) => number>;
+    _.flowRight(fn1, fn2); // $ExpectType (a1: number, a2: number) => number
+    _.flowRight(fn1, fn1, fn2); // $ExpectType (a1: number, a2: number) => number
+    _.flowRight(fn1, fn1, fn1, fn2); // $ExpectType (a1: number, a2: number) => number
+    _.flowRight([fn1, fn1, fn1, fn2]); // $ExpectType (...args: any[]) => any
 
-        result = _(Fn1).chain().flowRight(Fn2);
-        result = _(Fn1).chain().flowRight(Fn1, Fn2);
-        result = _(Fn1).chain().flowRight(Fn1, Fn1, Fn2);
-        result = _(Fn1).chain().flowRight([Fn1, Fn1, Fn2]);
-    }
+    _(fn1).flowRight(fn2); // $ExpectType LoDashImplicitWrapper<(a1: number, a2: number) => number>
+    _(fn1).flowRight(fn1, fn2); // $ExpectType LoDashImplicitWrapper<(a1: number, a2: number) => number>
+    _(fn1).flowRight(fn1, fn1, fn2); // $ExpectType LoDashImplicitWrapper<(a1: number, a2: number) => number>
+    _(fn1).flowRight([fn1, fn1, fn2]); // $ExpectType LoDashImplicitWrapper<(...args: any[]) => any>
+
+    _.chain(fn1).flowRight(fn2); // $ExpectType LoDashExplicitWrapper<(a1: number, a2: number) => number>
+    _.chain(fn1).flowRight(fn1, fn2); // $ExpectType LoDashExplicitWrapper<(a1: number, a2: number) => number>
+    _.chain(fn1).flowRight(fn1, fn1, fn2); // $ExpectType LoDashExplicitWrapper<(a1: number, a2: number) => number>
+    _.chain(fn1).flowRight([fn1, fn1, fn2]); // $ExpectType LoDashExplicitWrapper<(...args: any[]) => any>
+
+    fp.flowRight(fn1, fn1); // $ExpectType (a1: number) => number
+    fp.flowRight(fn3, fn1); // $ExpectType (a1: number) => string
+    fp.flowRight(fn1, fn1, fn2); // $ExpectType (a1: number, a2: number) => number
+    fp.flowRight(fn1, fn1, fn1, fn2); // $ExpectType (a1: number, a2: number) => number
+    fp.flowRight(fn1, fn1, fn1, fn1, fn2); // $ExpectType (a1: number, a2: number) => number
+    fp.flowRight(fn1, fn1, fn1, fn1, fn1, fn2); // $ExpectType (a1: number, a2: number) => number
+    fp.flowRight(fn1, fn1, fn1, fn1, fn1, fn1, fn2); // $ExpectType (a1: number, a2: number) => number
+    fp.flowRight(fn3, fn2); // $ExpectType (a1: number, a2: number) => string
+    fp.flowRight(fn4, fn3, fn2); // $ExpectType (a1: number, a2: number) => boolean
+    fp.flowRight(fn4, fn3, fn1, fn2); // $ExpectType (a1: number, a2: number) => boolean
+    fp.flowRight([fn4, fn3, fn1, fn2]); // $ExpectType (...args: any[]) => any
 }
 
 // _.memoize
-namespace TestMemoize {
-    {
-        let fn: any = () => {};
-        let memoizedFunction: _.MemoizedFunction = fn;
-        let cache: _.MapCache = memoizedFunction.cache;
-    }
+{
+    const memoizedFunction: _.MemoizedFunction = anything;
+    memoizedFunction.cache; // $ExpectType MapCache
 
-    interface MemoizedResultFn extends _.MemoizedFunction {
-        (a1: string, a2: number): boolean;
-    }
+    const testMapCache: _.MapCache = {
+        delete(key: string) { return true; },
+        get(key: string): any { return 1; },
+        has(key: string) { return true; },
+        set(key: string, value: any): _.Dictionary<any> { return {}; },
+        clear() { },
+    };
 
-    let memoizeFn = (a1: string, a2: number) => true;
-    let memoizeResolverFn = (a1: string, a2: number) => "";
+    const memoizeFn = (a1: string, a2: number): boolean => true;
+    const memoizeResolverFn = (a1: string, a2: number) => "";
 
-    {
-        let result: MemoizedResultFn;
+    _.memoize(memoizeFn); // $ExpectType ((a1: string, a2: number) => boolean) & MemoizedFunction
+    _.memoize(memoizeFn, memoizeResolverFn); // $ExpectType ((a1: string, a2: number) => boolean) & MemoizedFunction
+    _(memoizeFn).memoize(); // $ExpectType LoDashImplicitWrapper<((a1: string, a2: number) => boolean) & MemoizedFunction>
+    _(memoizeFn).memoize(memoizeResolverFn); // $ExpectType LoDashImplicitWrapper<((a1: string, a2: number) => boolean) & MemoizedFunction>
+    _.chain(memoizeFn).memoize(); // $ExpectType LoDashExplicitWrapper<((a1: string, a2: number) => boolean) & MemoizedFunction>
+    _.chain(memoizeFn).memoize(memoizeResolverFn); // $ExpectType LoDashExplicitWrapper<((a1: string, a2: number) => boolean) & MemoizedFunction>
+    fp.memoize(memoizeFn); // $ExpectType ((a1: string, a2: number) => boolean) & MemoizedFunction
 
-        result = _.memoize(memoizeFn);
-        result = _.memoize(memoizeFn, memoizeResolverFn);
-
-        result('foo', 1);
-        result.cache.get('foo1');
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<MemoizedResultFn>;
-
-        result = _(memoizeFn).memoize();
-        result = _(memoizeFn).memoize(memoizeResolverFn);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<MemoizedResultFn>;
-
-        result = _(memoizeFn).chain().memoize();
-        result = _(memoizeFn).chain().memoize(memoizeResolverFn);
-    }
-
-    interface MemoizeCache<K, V> {
-        delete(key: K): boolean;
-        get(key: K): V;
-        has(key: K): boolean;
-        set(key: K, value: V): this;
-        clear(): void;
-    }
-    class MemoizeCacheClass implements MemoizeCache<any, any> {
-        delete: (key: any) => true;
-        get: (key: any) => 1;
-        has: (key: any) => true;
-        set: (key: any, value: any) => this;
-        clear: () => { };
-    }
-
-    _.memoize.Cache = MemoizeCacheClass;
+    // $ExpectType MapCache
+    new _.memoize.Cache();
 }
 
 // _.overArgs
-namespace TestOverArgs {
-    type Func1 = (a: boolean) => boolean;
-    type Func2 = (a: boolean, b: boolean) => boolean;
+{
+    const func = (a: number, b: string) => true;
 
-    let func1: Func1 = (a) => true;
-    let func2: Func2 = (a, b) => true;
+    _.overArgs(func, (a: number) => true, (b: string) => true); // $ExpectType (...args: any[]) => any
+    _.overArgs(func, [(a: number) => true, (b: string) => true]); // $ExpectType (...args: any[]) => any
+    _(func).overArgs((a: number) => true, (b: string) => true); // $ExpectType LoDashImplicitWrapper<(...args: any[]) => any>
+    _(func).overArgs([(a: number) => true, (b: string) => true]); // $ExpectType LoDashImplicitWrapper<(...args: any[]) => any>
+    _.chain(func).overArgs((a: number) => true, (b: string) => true); // $ExpectType LoDashExplicitWrapper<(...args: any[]) => any>
+    _.chain(func).overArgs([(a: number) => true, (b: string) => true]); // $ExpectType LoDashExplicitWrapper<(...args: any[]) => any>
 
-    let transform1 = (a: string) => true;
-    let transform2 = (b: number) => true;
-
-    {
-        let result: (a: string) => boolean;
-
-        result = _.overArgs(func1, transform1);
-        result = _.overArgs(func1, [transform1]);
-    }
-
-    {
-        let result: (a: string, b: number) => boolean;
-
-        result = _.overArgs(func2, transform1, transform2);
-        result = _.overArgs(func2, [transform1, transform2]);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<(a: string) => boolean>;
-
-        result = _(func1).overArgs(transform1);
-        result = _(func1).overArgs([transform1]);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<(a: string, b: number) => boolean>;
-
-        result = _(func2).overArgs(transform1, transform2);
-        result = _(func2).overArgs([transform1, transform2]);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<(a: string) => boolean>;
-
-        result = _(func1).chain().overArgs(transform1);
-        result = _(func1).chain().overArgs([transform1]);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<(a: string, b: number) => boolean>;
-
-        result = _(func2).chain().overArgs(transform1, transform2);
-        result = _(func2).chain().overArgs([transform1, transform2]);
-    }
+    fp.overArgs(func, [(a: number) => true, (b: string) => true]); // $ExpectType (...args: any[]) => any
+    fp.overArgs(func)([(a: number) => true, (b: string) => true]); // $ExpectType (...args: any[]) => any
 }
 
 // _.negate
-namespace TestNegate {
-    type PredicateFn = (a1: number, a2: number) => boolean;
-
-    const predicate = (a1: number, a2: number) => a1 > a2;
-
-    {
-        let result: PredicateFn;
-
-        result = _.negate<PredicateFn>(predicate);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<PredicateFn>;
-
-        result = _(predicate).negate();
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<PredicateFn>;
-
-        result = _(predicate).chain().negate();
-    }
+{
+    _.negate((a1: number, a2: number): boolean => true); // $ExpectType (a1: number, a2: number) => boolean
+    _((a1: number, a2: number): boolean => true).negate(); // $ExpectType LoDashImplicitWrapper<(a1: number, a2: number) => boolean>
+    _.chain((a1: number, a2: number): boolean => true).negate(); // $ExpectType LoDashExplicitWrapper<(a1: number, a2: number) => boolean>
+    fp.negate((a1: number, a2: number): boolean => true); // $ExpectType (a1: number, a2: number) => boolean
 }
 
 // _.once
-namespace TestOnce {
-    type Func = (a: string, b: number) => boolean;
-
-    let func: Func = (a, b) => true;
-
-    {
-        let result: Func;
-
-        result = _.once(func);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<Func>;
-
-        result = _(func).once();
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<Func>;
-
-        result = _(func).chain().once();
-    }
+{
+    _.once((a: string, b: number): boolean => true); // $ExpectType (a: string, b: number) => boolean
+    _((a: string, b: number): boolean => true).once(); // $ExpectType LoDashImplicitWrapper<(a: string, b: number) => boolean>
+    _.chain((a: string, b: number): boolean => true).once(); // $ExpectType LoDashExplicitWrapper<(a: string, b: number) => boolean>
+    fp.once((a: string, b: number): boolean => true); // $ExpectType (a: string, b: number) => boolean
 }
 
-const greetPartial = (greeting: string, name: string) => `${greeting} ${name}`;
-const hi = _.partial(greetPartial, 'hi');
-hi('moe');
+// _.rearg
+{
+    const testReargFn = (a: string, b: string, c: string) => [a, b, c];
+    _.rearg(testReargFn, 2, 0, 1); // $ExpectType (...args: any[]) => any
+    _.rearg(testReargFn, [2, 0, 1]); // $ExpectType (...args: any[]) => any
+    _(testReargFn).rearg(2, 0, 1); // $ExpectType LoDashImplicitWrapper<(...args: any[]) => any>
+    _(testReargFn).rearg([2, 0, 1]); // $ExpectType LoDashImplicitWrapper<(...args: any[]) => any>
+    _.chain(testReargFn).rearg(2, 0, 1); // $ExpectType LoDashExplicitWrapper<(...args: any[]) => any>
+    _.chain(testReargFn).rearg([2, 0, 1]); // $ExpectType LoDashExplicitWrapper<(...args: any[]) => any>
 
-const defaultsDeep: (...args: any[]) => any = _.partialRight(_.merge, _.defaults);
-
-const optionsPartialRight = {
-    'variable': 'data',
-    'imports': { 'jq': $ }
-};
-
-defaultsDeep(optionsPartialRight, _.templateSettings);
-
-//_.rearg
-const testReargFn = (a: string, b: string, c: string) => [a, b, c];
-result = <string[]>(_.rearg(testReargFn, 2, 0, 1))('b', 'c', 'a');
-result = <string[]>(_.rearg(testReargFn, [2, 0, 1]))('b', 'c', 'a');
-result = <string[]>(_(testReargFn).rearg(2, 0, 1).value())('b', 'c', 'a');
-result = <string[]>(_(testReargFn).rearg([2, 0, 1]).value())('b', 'c', 'a');
+    fp.rearg([2, 0, 1], testReargFn); // $ExpectType (...args: any[]) => any
+    fp.rearg([2, 0, 1])(testReargFn); // $ExpectType (...args: any[]) => any
+}
 
 // _.rest
-namespace TestRest {
-    type Func = (a: string, b: number[]) => boolean;
-    type ResultFunc = (a: string, ...b: number[]) => boolean;
-
-    let func: Func = (a, b) => true;
-
-    {
-        let result: ResultFunc;
-
-        result = _.rest(func);
-        result = _.rest(func, 1);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<ResultFunc>;
-
-        result = _(func).rest();
-        result = _(func).rest(1);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<ResultFunc>;
-
-        result = _(func).chain().rest();
-        result = _(func).chain().rest(1);
-    }
+{
+    _.rest((a: string, b: number[]) => true); // $ExpectType (...args: any[]) => any
+    _.rest((a: string, b: number[]) => true, 1); // $ExpectType (...args: any[]) => any
+    _((a: string, b: number[]) => true).rest(); // $ExpectType LoDashImplicitWrapper<(...args: any[]) => any>
+    _((a: string, b: number[]) => true).rest(1); // $ExpectType LoDashImplicitWrapper<(...args: any[]) => any>
+    _.chain((a: string, b: number[]) => true).rest(); // $ExpectType LoDashExplicitWrapper<(...args: any[]) => any>
+    _.chain((a: string, b: number[]) => true).rest(1); // $ExpectType LoDashExplicitWrapper<(...args: any[]) => any>
+    fp.rest((a: string, b: number[]) => true); // $ExpectType (...args: any[]) => any
+    fp.restFrom(1)((a: string, b: number[]) => true); // $ExpectType (...args: any[]) => any
 }
 
-//_.spread
-namespace TestSpread {
-    type SampleFunc = (args: Array<number|string>) => boolean;
-    type SampleResult = (a: number, b: string) => boolean;
-
-    let func: SampleFunc = (a) => true;
-
-    {
-        let result: SampleResult;
-
-        result = _.spread(func);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<SampleResult>;
-
-        result = _(func).spread();
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<SampleResult>;
-
-        result = _(func).chain().spread();
-    }
+// _.spread
+{
+    _.spread((a: Array<number | string>): boolean => true); // $ExpectType (...args: any[]) => boolean
+    _((a: Array<number | string>): boolean => true).spread(); // $ExpectType LoDashImplicitWrapper<(...args: any[]) => boolean>
+    _.chain((a: Array<number | string>): boolean => true).spread(); // $ExpectType LoDashExplicitWrapper<(...args: any[]) => boolean>
+    fp.spread((a: Array<number | string>): boolean => true); // $ExpectType (...args: any[]) => boolean
 }
 
 // _.throttle
-namespace TestThrottle {
-    type SampleFunc = (n: number, s: string) => boolean;
+{
+    const options: _.ThrottleSettings = {
+        leading: true,
+        trailing: false,
+    };
 
-    interface Options {
-        leading?: boolean;
-        trailing?: boolean;
-    }
+    const func = (a: number, b: string): boolean => true;
 
-    interface ResultFunc {
-        (n: number, s: string): boolean;
-        cancel(): void;
-        flush(): void;
-    }
+    _.throttle(func); // $ExpectType ((a: number, b: string) => boolean) & Cancelable
+    _.throttle(func, 42); // $ExpectType ((a: number, b: string) => boolean) & Cancelable
+    _.throttle(func, 42, options); // $ExpectType ((a: number, b: string) => boolean) & Cancelable
+    _(func).throttle(); // $ExpectType LoDashImplicitWrapper<((a: number, b: string) => boolean) & Cancelable>
+    _(func).throttle(42); // $ExpectType LoDashImplicitWrapper<((a: number, b: string) => boolean) & Cancelable>
+    _(func).throttle(42, options); // $ExpectType LoDashImplicitWrapper<((a: number, b: string) => boolean) & Cancelable>
+    _.chain(func).throttle(); // $ExpectType LoDashExplicitWrapper<((a: number, b: string) => boolean) & Cancelable>
+    _.chain(func).throttle(42); // $ExpectType LoDashExplicitWrapper<((a: number, b: string) => boolean) & Cancelable>
+    _.chain(func).throttle(42, options); // $ExpectType LoDashExplicitWrapper<((a: number, b: string) => boolean) & Cancelable>
 
-    let func: SampleFunc = (a, b) => true;
-    let options: Options = {};
-
-    {
-        let result: ResultFunc;
-
-        result = _.throttle<SampleFunc>(func);
-        result = _.throttle<SampleFunc>(func, 42);
-        result = _.throttle<SampleFunc>(func, 42, options);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<ResultFunc>;
-
-        result = _(func).throttle();
-        result = _(func).throttle(42);
-        result = _(func).throttle(42, options);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<ResultFunc>;
-
-        result = _(func).chain().throttle();
-        result = _(func).chain().throttle(42);
-        result = _(func).chain().throttle(42, options);
-    }
+    fp.throttle(42, func); // $ExpectType ((a: number, b: string) => boolean) & Cancelable
+    fp.throttle(42)(func); // $ExpectType ((a: number, b: string) => boolean) & Cancelable
 }
 
 // _.unary
-namespace TestUnary {
-    type Func = (a: string, b: number[]) => boolean;
-
-    let func: Func = (a, b) => true;
-
-    {
-        let result: Func;
-
-        result = _.unary(func);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<Func>;
-
-        result = _(func).unary();
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<Func>;
-
-        result = _(func).chain().unary();
-    }
+{
+    _.unary((a: string, b: number): boolean => true); // $ExpectType (arg1: string) => boolean
+    _((a: string, b: number): boolean => true).unary(); // $ExpectType LoDashImplicitWrapper<(arg1: string) => boolean>
+    _.chain((a: string, b: number): boolean => true).unary(); // $ExpectType LoDashExplicitWrapper<(arg1: string) => boolean>
+    fp.unary((a: string, b: number): boolean => true); // $ExpectType (arg1: string) => boolean
 }
 
 // _.wrap
-namespace TestWrap {
-    type SampleValue = {a: number; b: string; c: boolean}
-    type SampleResult = (arg2: number, arg3: string) => boolean;
-
-    {
-        type SampleWrapper = (arg1: SampleValue, arg2: number, arg3: string) => boolean;
-
-        let value: SampleValue = { a: 1, b: "", c: true };
-        let wrapper: SampleWrapper = (a, b, c) => true;
-        let result: SampleResult;
-
-        result = _.wrap(value, wrapper);
-    }
-
-    {
-        type SampleWrapper = (arg1: number, arg2: number, arg3: string) => boolean;
-
-        let value = 0;
-        let wrapper: SampleWrapper = (a, b, c) => true;
-        let result: _.LoDashImplicitObjectWrapper<SampleResult>;
-
-        result = _(value).wrap(wrapper);
-    }
-
-    {
-        type SampleWrapper = (arg1: number[], arg2: number, arg3: string) => boolean;
-
-        let value: number[] = [];
-        let wrapper: SampleWrapper = (a, b, c) => true;
-        let result: _.LoDashImplicitObjectWrapper<SampleResult>;
-
-        result = _(value).wrap(wrapper);
-    }
-
-    {
-        type SampleWrapper = (arg1: SampleValue, arg2: number, arg3: string) => boolean;
-
-        let value: SampleValue = { a: 1, b: "", c: true };
-        let wrapper: SampleWrapper = (a, b, c) => true;
-        let result: _.LoDashImplicitObjectWrapper<SampleResult>;
-
-        result = _(value).wrap(wrapper);
-    }
-
-    {
-        type SampleWrapper = (arg1: number, arg2: number, arg3: string) => boolean;
-
-        let value = 0;
-        let wrapper: SampleWrapper = (a, b, c) => true;
-        let result: _.LoDashExplicitObjectWrapper<SampleResult>;
-
-        result = _(value).chain().wrap(wrapper);
-    }
-
-    {
-        type SampleWrapper = (arg1: number[], arg2: number, arg3: string) => boolean;
-
-        let value: number[] = [];
-        let wrapper: SampleWrapper = (a, b, c) => true;
-        let result: _.LoDashExplicitObjectWrapper<SampleResult>;
-
-        result = _(value).chain().wrap(wrapper);
-    }
-
-    {
-        type SampleWrapper = (arg1: SampleValue, arg2: number, arg3: string) => boolean;
-
-        let value: SampleValue = { a: 1, b: "", c: true };
-        let wrapper: SampleWrapper = (a, b, c) => true;
-        let result: _.LoDashExplicitObjectWrapper<SampleResult>;
-
-        result = _(value).chain().wrap(wrapper);
-    }
+{
+    _.wrap("a", (arg1: string, ...args: number[]): boolean => true); // $ExpectType (...args: number[]) => boolean
+    _("a").wrap((arg1: string, ...args: number[]): boolean => true); // $ExpectType LoDashImplicitWrapper<(...args: number[]) => boolean>
+    _.chain("a").wrap((arg1: string, ...args: number[]): boolean => true); // $ExpectType LoDashExplicitWrapper<(...args: number[]) => boolean>
+    fp.wrap((arg1: string, ...args: number[]): boolean => true, "a"); // $ExpectType (...args: number[]) => boolean
+    fp.wrap((arg1: string, ...args: number[]): boolean => true)("a"); // $ExpectType (...args: number[]) => boolean
 }
 
 /********
@@ -7951,1548 +3819,984 @@ namespace TestWrap {
  ********/
 
 // _.castArray
-namespace TestCastArray {
-    {
-        let result: number[];
+{
+    _.castArray(42); // $ExpectType number[]
+    _.castArray([42]); // $ExpectType number[]
+    _.castArray({ a: 42 }); // $ExpectType { a: number; }[]
+    _(42).castArray(); // $ExpectType LoDashImplicitWrapper<number[]>
+    _([42]).castArray(); // $ExpectType LoDashImplicitWrapper<number[]>
+    _.chain(42).castArray(); // $ExpectType LoDashExplicitWrapper<number[]>
+    _.chain([42]).castArray(); // $ExpectType LoDashExplicitWrapper<number[]>
 
-        result = _.castArray(42);
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<number>;
-
-        result = _(42).castArray();
-        result = _([42]).castArray();
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<{a: number}>;
-
-        result = _({a: 42}).castArray();
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<number>;
-
-        result = _(42).chain().castArray();
-        result = _([42]).chain().castArray();
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<{a: number}>;
-
-        result = _({a: 42}).chain().castArray();
-    }
+    fp.castArray(42); // $ExpectType number[]
+    fp.castArray([42]); // $ExpectType number[]
 }
 
 // _.clone
-namespace TestClone {
-    {
-        let result: number;
-
-        result = _.clone<number>(42);
-        result = _(42).clone();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<number>;
-
-        result = _(42).chain().clone();
-    }
-
-    {
-        let result: string[];
-
-        result = _.clone<string[]>(['']);
-        result = _(['']).clone();
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<string>;
-
-        result = _(['']).chain().clone();
-    }
-
-    {
-        let result: {a: {b: number;};};
-
-        result = _.clone<{a: {b: number;};}>({a: {b: 42}});
-        result = _({a: {b: 42}}).clone();
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<{a: {b: number;};}>;
-
-        result = _({a: {b: 42}}).chain().clone();
-    }
+{
+    _.clone(42); // $ExpectType 42
+    _.clone({ a: { b: 42 } }); // $ExpectType { a: { b: number; }; }
+    _(42).clone(); // $ExpectType number
+    _({ a: { b: 42 } }).clone(); // $ExpectType { a: { b: number; }; }
+    _.chain(42).clone(); // $ExpectType LoDashExplicitWrapper<number>
+    _.chain({ a: { b: 42 } }).clone(); // $ExpectType LoDashExplicitWrapper<{ a: { b: number; }; }>
+    fp.clone(42); // $ExpectType 42
+    fp.clone({ a: { b: 42 } }); // $ExpectType { a: { b: number; }; }
 }
 
 // _.cloneDeep
-namespace TestCloneDeep {
-    {
-        let result: number;
-
-        result = _.cloneDeep<number>(42);
-        result = _(42).cloneDeep();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<number>;
-
-        result = _(42).chain().cloneDeep();
-    }
-
-    {
-        let result: string[];
-
-        result = _.cloneDeep<string[]>(['']);
-        result = _(['']).cloneDeep();
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<string>;
-
-        result = _(['']).chain().cloneDeep();
-    }
-
-    {
-        let result: {a: {b: number;};};
-
-        result = _.cloneDeep<{a: {b: number;};}>({a: {b: 42}});
-        result = _({a: {b: 42}}).cloneDeep();
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<{a: {b: number;};}>;
-
-        result = _({a: {b: 42}}).chain().cloneDeep();
-    }
+{
+    _.cloneDeep(42); // $ExpectType 42
+    _.cloneDeep({ a: { b: 42 } }); // $ExpectType { a: { b: number; }; }
+    _(42).cloneDeep(); // $ExpectType number
+    _({ a: { b: 42 } }).cloneDeep(); // $ExpectType { a: { b: number; }; }
+    _.chain(42).cloneDeep(); // $ExpectType LoDashExplicitWrapper<number>
+    _.chain({ a: { b: 42 } }).cloneDeep(); // $ExpectType LoDashExplicitWrapper<{ a: { b: number; }; }>
+    fp.cloneDeep(42); // $ExpectType 42
+    fp.cloneDeep({ a: { b: 42 } }); // $ExpectType { a: { b: number; }; }
 }
 
 // _.cloneDeepWith
-namespace TestCloneDeepWith {
-    type CloneDeepWithCustomizer<V, R> = (value: V) => R;
+{
+    const customizer = (x: any) => "";
 
-    {
-        let customizer: CloneDeepWithCustomizer<number, string> = (x) => "";
-        let reslut: string;
+    _.cloneDeepWith(42, customizer); // $ExpectType any
+    _(42).cloneDeepWith(customizer); // $ExpectType any
+    _.chain(42).cloneDeepWith(customizer); // $ExpectType LoDashExplicitWrapper<any>
 
-        result = _.cloneDeepWith(42, customizer);
-        result = _(42).cloneDeepWith(customizer);
-    }
+    _.cloneDeepWith({a: {b: 42}}, customizer); // $ExpectType any
 
-    {
-        let customizer: CloneDeepWithCustomizer<number, string> = (x) => "";
-        let result: _.LoDashExplicitWrapper<string>;
-
-        result = _(42).chain().cloneDeepWith(customizer);
-    }
-
-    {
-        let customizer: CloneDeepWithCustomizer<number[], string[]> = (x) => [];
-        let reslut: string[];
-
-        result = _.cloneDeepWith([42], customizer);
-        result = _([42]).cloneDeepWith(customizer);
-    }
-
-    {
-        let customizer: CloneDeepWithCustomizer<number[], string[]> = (x) => [];
-        let result: _.LoDashExplicitArrayWrapper<string>;
-
-        result = _([42]).chain().cloneDeepWith(customizer);
-    }
-
-    {
-        let customizer: CloneDeepWithCustomizer<{a: {b: number;};}, {a: {b: string;};}> = (x) => ({ a: { b: "" } });
-        let reslut: {a: {b: string;};};
-
-        result = _.cloneDeepWith({a: {b: 42}}, customizer);
-        result = _({a: {b: 42}}).cloneDeepWith(customizer);
-    }
-
-    {
-        let customizer: CloneDeepWithCustomizer<{a: {b: number;};}, {a: {b: string;};}> = (x) => ({ a: { b: "" } });
-        let result: _.LoDashExplicitObjectWrapper<{a: {b: string;};}>;
-
-        result = _({a: {b: 42}}).chain().cloneDeepWith(customizer);
-    }
+    fp.cloneDeepWith((x) => "", 42); // $ExpectType any
+    fp.cloneDeepWith((x) => "")(42); // $ExpectType any
+    fp.cloneDeepWith((x) => "", [42]); // $ExpectType any
+    fp.cloneDeepWith((x) => "", { a: { b: 42 } }); // $ExpectType any
 }
 
 // _.cloneWith
-namespace TestCloneWith {
-    type CloneWithCustomizer<V, R> = (value: V) => R;
-
+{
     {
-        let customizer: CloneWithCustomizer<number, string> = (x) => "";
-        let reslut: string;
+        const customizer = (x: number) => "";
 
-        result = _.cloneWith(42, customizer);
-        result = _.cloneWith<number, string>(42, customizer);
-        result = _(42).cloneWith<string>(customizer);
+        _.cloneWith(42, customizer); // $ExpectType string
+        _(42).cloneWith(customizer); // $ExpectType string
+        _.chain(42).cloneWith<string>(customizer); // $ExpectType LoDashExplicitWrapper<string>
+
+        fp.cloneWith(customizer, 42); // $ExpectType string
+        fp.cloneWith(customizer)(42); // $ExpectType string
     }
 
     {
-        let customizer: CloneWithCustomizer<number, string> = (x) => "";
-        let result: _.LoDashExplicitWrapper<string>;
+        const customizer = (x: number): string | undefined => "";
 
-        result = _(42).chain().cloneWith<string>(customizer);
-    }
+        _.cloneWith(42, customizer); // string | 42
+        _(42).cloneWith(customizer); // string | 42
+        _.chain(42).cloneWith(customizer); // string | 42
 
-    {
-        let customizer: CloneWithCustomizer<number[], string[]> = (x) => [];
-        let reslut: string[];
-
-        result = _.cloneWith([42], customizer);
-        result = _.cloneWith<number[], string[]>([42], customizer);
-        result = _([42]).cloneWith<string[]>(customizer);
-    }
-
-    {
-        let customizer: CloneWithCustomizer<number[], string[]> = (x) => [];
-        let result: _.LoDashExplicitArrayWrapper<string>;
-
-        result = _([42]).chain().cloneWith(customizer);
-    }
-
-    {
-        let customizer: CloneWithCustomizer<{a: {b: number;};}, {a: {b: string;};}> = (x) => ({ a: { b: "" } });
-        let reslut: {a: {b: string;};};
-
-        result = _.cloneWith({a: {b: 42}}, customizer);
-        result = _.cloneWith<{a: {b: number;};}, {a: {b: string;};}>({a: {b: 42}}, customizer);
-        result = _({a: {b: 42}}).cloneWith<{a: {b: string;};}>(customizer);
-    }
-
-    {
-        let customizer: CloneWithCustomizer<{a: {b: number;};}, {a: {b: string;};}> = (x) => ({ a: { b: "" } });
-        let result: _.LoDashExplicitObjectWrapper<{a: {b: string;};}>;
-
-        result = _({a: {b: 42}}).chain().cloneWith<{a: {b: string;};}>(customizer);
+        // Note: TS 2.5 fails without explicit <42, string>
+        fp.cloneWith<42, string>(customizer, 42); // $ExpectType string | 42
+        fp.cloneWith<42, string>(customizer)(42); // $ExpectType string | 42
     }
 }
 
 // _.conforms
-namespace TestConforms {
-    let result: boolean = _.conforms({foo: (v: string) => false})({foo: "foo"});
-    let result2: boolean = _.conforms({})({foo: "foo"});
+{
+    _.conforms({ foo: (v: string) => false })({ foo: "foo" }); // $ExpectType boolean
+    fp.conforms({ foo: (v: string) => false })({ foo: "foo" }); // $ExpectType boolean
 }
 
 // _.conformsTo
-namespace TestConformsTo {
-    let result: boolean = _.conformsTo({foo: "foo"}, {foo: (v: string) => false});
-    let result2: boolean = _.conformsTo({}, {foo: (v: string) => false});
+{
+    _.conformsTo({ foo: "foo" }, { foo: (v: string) => false }); // $ExpectType boolean
+    _({ foo: "foo" }).conformsTo({ foo: (v: string) => false }); // $ExpectType boolean
+    _.chain({ foo: "foo" }).conformsTo({ foo: (v: string) => false }); // $ExpectType LoDashExplicitWrapper<boolean>
+
+    fp.conformsTo({ foo: (v: string) => false }, { foo: "foo" }); // $ExpectType boolean
+    fp.conformsTo({ foo: (v: string) => false })({ foo: "foo" }); // $ExpectType boolean
 }
 
 // _.eq
-namespace TestEq {
-    let customizer: (value: any, other: any, indexOrKey?: number|string) => boolean;
+{
+    _.eq(anything, anything); // $ExpectType boolean
+    _(anything).eq(anything); // $ExpectType boolean
+    _.chain(anything).eq(anything); // $ExpectType LoDashExplicitWrapper<boolean>
 
-    {
-        let result: boolean;
-
-        result = _.eq(anything, anything);
-
-        result = _(anything).eq(anything);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _(anything).chain().eq(anything);
-    }
+    fp.eq(anything, anything); // $ExpectType boolean
+    fp.eq(anything)(anything); // $ExpectType boolean
 }
 
 // _.gt
-namespace TestGt {
-    {
-        let result: boolean;
+{
+    _.gt(anything, anything); // $ExpectType boolean
+    _(anything).gt(anything); // $ExpectType boolean
+    _.chain(anything).gt(anything); // $ExpectType LoDashExplicitWrapper<boolean>
 
-        result = _.gt(anything, anything);
-        result = _(1).gt(anything);
-        result = _([]).gt(anything);
-        result = _({}).gt(anything);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _(1).chain().gt(anything);
-        result = _([]).chain().gt(anything);
-        result = _({}).chain().gt(anything);
-    }
+    fp.gt(anything, anything); // $ExpectType boolean
+    fp.gt(anything)(anything); // $ExpectType boolean
 }
 
 // _.gte
-namespace TestGte {
-    {
-        let result: boolean;
+{
+    _.gte(anything, anything); // $ExpectType boolean
+    _(anything).gte(anything); // $ExpectType boolean
+    _.chain(anything).gte(anything); // $ExpectType LoDashExplicitWrapper<boolean>
 
-        result = _.gte(anything, anything);
-        result = _(1).gte(anything);
-        result = _([]).gte(anything);
-        result = _({}).gte(anything);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _(1).chain().gte(anything);
-        result = _([]).chain().gte(anything);
-        result = _({}).chain().gte(anything);
-    }
+    fp.gte(anything, anything); // $ExpectType boolean
+    fp.gte(anything)(anything); // $ExpectType boolean
 }
 
 // _.isArguments
-namespace TestisArguments {
-    {
-        let value: number|IArguments = 0;
+{
+    const  value: number | IArguments = 0;
 
-        if (_.isArguments(value)) {
-            let result: IArguments = value;
-        }
-        else {
-            let result: number = value;
-        }
+    if (_.isArguments(value)) {
+        const result: IArguments = value;
+    } else {
+        value; // $ExpectType number
     }
 
-    {
-        let result: boolean;
-
-        result = _.isArguments(anything);
-        result = _(1).isArguments();
-        result = _<any>([]).isArguments();
-        result = _({}).isArguments();
+    if (fp.isArguments(value)) {
+        const result: IArguments = value;
+    } else {
+        value; // $ExpectType number
     }
 
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _(1).chain().isArguments();
-        result = _<any>([]).chain().isArguments();
-        result = _({}).chain().isArguments();
-    }
+    _.isArguments(""); // $ExpectType boolean
+    _({}).isArguments(); // $ExpectType boolean
+    _.chain([]).isArguments(); // $ExpectType LoDashExplicitWrapper<boolean>
+    fp.isArguments(anything); // $ExpectType boolean
 }
 
 // _.isArray
-namespace TestIsArray {
-    {
-        let value: number|string[]|boolean[] = anything;
+{
+    const value: number | string[] | boolean[] = anything;
 
-        if (_.isArray(value)) {
-            value; // $ExpectType string[] | boolean[]
-        }
-        else {
-            value; // $ExpectType number
-        }
+    if (_.isArray(value)) {
+        const result: string[] | boolean[] = value;
+    } else {
+        value; // $ExpectType number
     }
 
-    {
-        let result: boolean;
-
-        result = _.isArray(anything);
-        result = _(1).isArray();
-        result = _<any>([]).isArray();
-        result = _({}).isArray();
+    if (fp.isArray(value)) {
+        const result: string[] | boolean[] = value;
+    } else {
+        value; // $ExpectType number
     }
 
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _(1).chain().isArray();
-        result = _<any>([]).chain().isArray();
-        result = _({}).chain().isArray();
-    }
+    _.isArray(anything); // $ExpectType boolean
+    _({}).isArray(); // $ExpectType boolean
+    _.chain([]).isArray(); // $ExpectType LoDashExplicitWrapper<boolean>
+    fp.isArray(anything); // $ExpectType boolean
 }
 
 // _.isArrayBuffer
-namespace TestIsArrayBuffer {
-    {
-        let value: ArrayBuffer|number = anything;
+{
+    const value: ArrayBuffer | number = anything;
 
-        if (_.isArrayBuffer(value)) {
-            value; // $ExpectType ArrayBuffer
-        }
-        else {
-            value; // $ExpectType number
-        }
+    if (_.isArrayBuffer(value)) {
+        value; // $ExpectType ArrayBuffer
+    } else {
+        value; // $ExpectType number
     }
 
-    {
-        let result: boolean;
-
-        result = _.isArrayBuffer(anything);
-        result = _(1).isArrayBuffer();
-        result = _<any>([]).isArrayBuffer();
-        result = _({}).isArrayBuffer();
+    if (fp.isArrayBuffer(value)) {
+        value; // $ExpectType ArrayBuffer
+    } else {
+        value; // $ExpectType number
     }
 
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _(1).chain().isArrayBuffer();
-        result = _<any>([]).chain().isArrayBuffer();
-        result = _({}).chain().isArrayBuffer();
-    }
+    _.isArrayBuffer(anything); // $ExpectType boolean
+    _({}).isArrayBuffer(); // $ExpectType boolean
+    _.chain([]).isArrayBuffer(); // $ExpectType LoDashExplicitWrapper<boolean>
+    fp.isArrayBuffer(anything); // $ExpectType boolean
 }
 
 // _.isArrayLike
-namespace TestIsArrayLike {
+{
     {
-        let value: string | string[] | { [index: number]: boolean, length: number } | [number, boolean]
+        const value: string | string[] | { [index: number]: boolean, length: number } | [number, boolean]
             | number | { length: string } | { a: string } | null | undefined
             = anything;
 
         if (_.isArrayLike(value)) {
-            let result: string | string[] | { [index: number]: boolean, length: number } | [number, boolean] = value;
+            const result: string | string[] | { [index: number]: boolean, length: number } | [number, boolean] = value;
         } else {
-            let result: number | { length: string } | { a: string; } | null | undefined = value;
+            const result: number | { length: string } | { a: string; } | null | undefined = value;
+        }
+
+        if (fp.isArrayLike(value)) {
+            const result: string | string[] | { [index: number]: boolean; length: number; } | [number, boolean] = value;
+        } else {
+            const result: number | { length: string; } | { a: string; } | null | undefined = value;
         }
     }
 
     {
-        let value: boolean[] = anything;
+        const value: boolean[] = anything;
 
         if (_.isArrayLike(value)) {
-            let result: boolean[] = value;
+            const result: boolean[] = value;
+        } else {
+            value; // $ExpectType never
         }
-        else {
+
+        if (fp.isArrayLike(value)) {
+            value; // $ExpectType boolean[]
+        } else {
             value; // $ExpectType never
         }
     }
 
     {
-        let value: () => number = anything;
+        const value: () => number = anything;
 
         if (_.isArrayLike(value)) {
             value; // $ExpectType never
         } else {
             value; // $ExpectType () => number
         }
+
+        if (fp.isArrayLike(value)) {
+            value; // $ExpectType never
+        } else {
+            value; // $ExpectType () => number
+        }
     }
 
     {
-        let value: { a: string } = anything;
+        const value: { a: string } = anything;
 
         if (_.isArrayLike(value)) {
-            let result: { a: string, length: number } = value;
+            const result: { a: string, length: number } = value;
+        } else {
+            value; // $ExpectType { a: string; }
         }
-        else {
+
+        if (fp.isArrayLike(value)) {
+            const result: { a: string, length: number } = value;
+        } else {
             value; // $ExpectType { a: string; }
         }
     }
 
     {
-        let value: any = anything;
+        const value: any = anything;
 
         if (_.isArrayLike(value)) {
             value; // $ExpectType any
+        } else {
+            value; // $ExpectType any
         }
-        else {
+
+        if (fp.isArrayLike(value)) {
+            value; // $ExpectType any
+        } else {
             value; // $ExpectType any
         }
     }
 
-    {
-        let result: boolean;
-
-        result = _.isArrayLike(anything);
-        result = _(1).isArrayLike();
-        result = _<any>([]).isArrayLike();
-        result = _({}).isArrayLike();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _(1).chain().isArrayLike();
-        result = _<any>([]).chain().isArrayLike();
-        result = _({}).chain().isArrayLike();
-    }
+    _.isArrayLike(anything); // $ExpectType boolean
+    _({}).isArrayLike(); // $ExpectType boolean
+    _.chain([]).isArrayLike(); // $ExpectType LoDashExplicitWrapper<boolean>
+    fp.isArrayLike(anything); // $ExpectType boolean
 }
 
 // _.isArrayLikeObject
-namespace TestIsArrayLikeObject {
+{
     {
-        let value: string[] | { [index: number]: boolean, length: number } | [number, boolean]
+        const value: string[] | { [index: number]: boolean, length: number } | [number, boolean]
             | number | string | { length: string } | { a: string } | null | undefined
             = anything;
 
         if (_.isArrayLikeObject(value)) {
-            let result: string[] | { [index: number]: boolean, length: number } | [number, boolean] = value;
+            const result: string[] | { [index: number]: boolean, length: number } | [number, boolean] = value;
         } else {
-            let result: string | number | { length: string; } | { a: string; } | null | undefined = value;
+            const result: string | number | { length: string; } | { a: string; } | null | undefined = value;
+        }
+
+        if (fp.isArrayLikeObject(value)) {
+            const result: string[] | [number, boolean] | { [index: number]: boolean; length: number; } =  value;
+        } else {
+            const result: string | number | { length: string; } | { a: string; } | null | undefined = value;
         }
     }
 
     {
-        let value: boolean[] = anything;
+        const value: boolean[] = anything;
 
         if (_.isArrayLikeObject(value)) {
-            let result: boolean[] = value;
+            const result: boolean[] = value;
+        } else {
+            value; // $ExpectType never
         }
-        else {
+
+        if (fp.isArrayLikeObject(value)) {
+            const result: boolean[] = value;
+        } else {
             value; // $ExpectType never
         }
     }
 
     {
-        let value: (a: string) => boolean = anything;
+        const value: (a: string) => boolean = anything;
 
         if (_.isArrayLikeObject(value)) {
             value; // $ExpectType never
         } else {
             value; // $ExpectType (a: string) => boolean
         }
+
+        if (fp.isArrayLikeObject(value)) {
+            value; // $ExpectType never
+        } else {
+            value; // $ExpectType (a: string) => boolean
+        }
     }
 
     {
-        let value: { a: string } = anything;
+        const value: { a: string } = anything;
 
         if (_.isArrayLikeObject(value)) {
-            let result: { a: string, length: number } = value;
+            const result: { a: string, length: number } = value;
+        } else {
+            value; // $ExpectType { a: string; }
         }
-        else {
+
+        if (fp.isArrayLikeObject(value)) {
+            const result: { a: string, length: number } = value;
+        } else {
             value; // $ExpectType { a: string; }
         }
     }
 
     {
-        let value: any = anything;
+        const value: any = anything;
 
         if (_.isArrayLikeObject(value)) {
             value; // $ExpectType any
+        } else {
+            value; // $ExpectType any
         }
-        else {
+
+        if (fp.isArrayLikeObject(value)) {
+            value; // $ExpectType any
+        } else {
             value; // $ExpectType any
         }
     }
 
-    {
-        let result: boolean;
-
-        result = _.isArrayLikeObject(anything);
-        result = _(1).isArrayLikeObject();
-        result = _<any>([]).isArrayLikeObject();
-        result = _({}).isArrayLikeObject();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _(1).chain().isArrayLikeObject();
-        result = _<any>([]).chain().isArrayLikeObject();
-        result = _({}).chain().isArrayLikeObject();
-    }
+    _.isArrayLikeObject(anything); // $ExpectType boolean
+    _({}).isArrayLikeObject(); // $ExpectType boolean
+    _.chain([]).isArrayLikeObject(); // $ExpectType LoDashExplicitWrapper<boolean>
+    fp.isArrayLikeObject(anything); // $ExpectType boolean
 }
 
 // _.isBoolean
-namespace TestIsBoolean {
-    {
-        let value: number|boolean = 0;
+{
+    const value: number | boolean = 0;
 
-        if (_.isBoolean(value)) {
-            let result: boolean = value;
-        }
-        else {
-            let result: number = value;
-        }
+    if (_.isBoolean(value)) {
+        const result: boolean = value;
+    } else {
+        value; // $ExpectType number
     }
 
-    {
-        let result: boolean;
-
-        result = _.isBoolean(anything);
-        result = _(1).isBoolean();
-        result = _<any>([]).isBoolean();
-        result = _({}).isBoolean();
+    if (fp.isBoolean(value)) {
+        const result: boolean = value;
+    } else {
+        value; // $ExpectType number
     }
 
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _(1).chain().isBoolean();
-        result = _<any>([]).chain().isBoolean();
-        result = _({}).chain().isBoolean();
-    }
+    _.isBoolean(anything); // $ExpectType boolean
+    _({}).isBoolean(); // $ExpectType boolean
+    _.chain([]).isBoolean(); // $ExpectType LoDashExplicitWrapper<boolean>
 }
 
 // _.isBuffer
-namespace TestIsBuffer {
-    {
-        let result: boolean;
-
-        result = _.isBuffer(anything);
-        result = _(1).isBuffer();
-        result = _<any>([]).isBuffer();
-        result = _({}).isBuffer();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _(1).chain().isBuffer();
-        result = _<any>([]).chain().isBuffer();
-        result = _({}).chain().isBuffer();
-    }
+{
+    _.isBuffer(anything); // $ExpectType boolean
+    _({}).isBuffer(); // $ExpectType boolean
+    _.chain([]).isBuffer(); // $ExpectType LoDashExplicitWrapper<boolean>
+    fp.isBuffer(anything); // $ExpectType boolean
 }
 
 // _.isDate
 {
-    {
-        let value: number|Date = 0;
+    const value: number | Date = 0;
 
-        if (_.isDate(value)) {
-            let result: Date = value;
-        }
-        else {
-            let result: number = value;
-        }
+    if (_.isDate(value)) {
+        const result: Date = value;
+    } else {
+        value; // $ExpectType number
     }
 
-    {
-        let result: boolean;
-
-        result = _.isDate(anything);
-        result = _(42).isDate();
-        result = _<any>([]).isDate();
-        result = _({}).isDate();
+    if (fp.isDate(value)) {
+        const date: Date = value;
+    } else {
+        value; // $ExpectType number
     }
 
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _(42).chain().isDate();
-        result = _<any>([]).chain().isDate();
-        result = _({}).chain().isDate();
-    }
+    _.isDate(anything); // $ExpectType boolean
+    _({}).isDate(); // $ExpectType boolean
+    _.chain([]).isDate(); // $ExpectType LoDashExplicitWrapper<boolean>
+    fp.isDate(anything); // $ExpectType boolean
 }
 
 // _.isElement
-namespace TestIsElement {
-    {
-        let result: boolean;
-
-        result = _.isElement(anything);
-
-        result = _(42).isElement();
-        result = _<any>([]).isElement();
-        result = _({}).isElement();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _(42).chain().isElement();
-        result = _<any>([]).chain().isElement();
-        result = _({}).chain().isElement();
-    }
+{
+    _.isElement(anything); // $ExpectType boolean
+    _({}).isElement(); // $ExpectType boolean
+    _.chain([]).isElement(); // $ExpectType LoDashExplicitWrapper<boolean>
+    fp.isElement(anything); // $ExpectType boolean
 }
 
 // _.isEmpty
-namespace TestIsEmpty {
-    {
-        let result: boolean;
-
-        result = _.isEmpty(anything);
-        result = _(1).isEmpty();
-        result = _('').isEmpty();
-        result = _<any>([]).isEmpty();
-        result = _({}).isEmpty();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _(1).chain().isEmpty();
-        result = _('').chain().isEmpty();
-        result = _<any>([]).chain().isEmpty();
-        result = _({}).chain().isEmpty();
-    }
+{
+    _.isEmpty(anything); // $ExpectType boolean
+    _({}).isEmpty(); // $ExpectType boolean
+    _.chain([]).isEmpty(); // $ExpectType LoDashExplicitWrapper<boolean>
+    fp.isEmpty(anything); // $ExpectType boolean
 }
 
 // _.isEqual
-namespace TestIsEqual {
-    let customizer: (value: any, other: any, indexOrKey?: number|string) => boolean;
+{
+    _.isEqual(anything, anything); // $ExpectType boolean
+    _(anything).isEqual(anything); // $ExpectType boolean
+    _.chain(anything).isEqual(anything); // $ExpectType LoDashExplicitWrapper<boolean>
 
-    {
-        let result: boolean;
-
-        result = _.isEqual(anything, anything);
-
-        result = _(anything).isEqual(anything);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _(anything).chain().isEqual(anything);
-    }
+    fp.isEqual(anything, anything); // $ExpectType boolean
+    fp.isEqual(anything)(anything); // $ExpectType boolean
+    fp.equals(anything)(anything); // $ExpectType boolean
 }
 
 // _.isEqualWith
-namespace TestIsEqualWith {
-    let customizer = (value: any, other: any, indexOrKey: number|string|symbol|undefined, parent: any, otherParent: any, stack: any) => true;
+{
+    const customizer = (value: any, other: any, indexOrKey: number|string|symbol|undefined, parent: any, otherParent: any, stack: any) => true;
 
-    {
-        let result: boolean;
+    _.isEqualWith(anything, anything, customizer); // $ExpectType boolean
+    _(anything).isEqualWith(anything, customizer); // $ExpectType boolean
+    _.chain(anything).isEqualWith(anything, customizer); // $ExpectType LoDashExplicitWrapper<boolean>
 
-        result = _.isEqualWith(anything, anything, customizer);
-
-        result = _(anything).isEqualWith(anything, customizer);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _(anything).chain().isEqualWith(anything, customizer);
-    }
+    fp.isEqualWith(customizer, anything, anything); // $ExpectType boolean
+    fp.isEqualWith(customizer)(anything)(anything); // $ExpectType boolean
 }
 
 // _.isError
-namespace TestIsError {
-    let x: any = 1;
+{
     {
-        let value: number|Error = x;
+        const value: number | Error = anything;
 
         if (_.isError(value)) {
-            let result: Error = value;
+            value; // $ExpectType Error
+        } else {
+            value; // $ExpectType number
         }
-        else {
-            let result: number = value;
+
+        if (fp.isError(value)) {
+            value; // $ExpectType Error
+        } else {
+            value; // $ExpectType number
         }
     }
 
     {
         class CustomError extends Error {
-            custom: string
+            custom: string;
         }
 
-        let value: number|CustomError = x;
+        const value: number | CustomError = anything;
 
         if (_.isError(value)) {
-            let result: CustomError = value;
-        }
-        else {
-            let result: number = value;
-        }
-    }
-
-    {
-        let result: boolean;
-
-        result = _.isError(anything);
-        result = _(1).isError();
-        result = _<any>([]).isError();
-        result = _({}).isError();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _(1).chain().isError();
-        result = _<any>([]).chain().isError();
-        result = _({}).chain().isError();
-    }
-}
-
-// _.isFinite
-namespace TestIsFinite {
-    {
-        let result: boolean;
-
-        result = _.isFinite(anything);
-        result = _(1).isFinite();
-        result = _<any>([]).isFinite();
-        result = _({}).isFinite();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _(1).chain().isFinite();
-        result = _<any>([]).chain().isFinite();
-        result = _({}).chain().isFinite();
-    }
-}
-
-// _.isFunction
-namespace TestIsFunction {
-    {
-        let value: number|(() => void) = anything;
-
-        if (_.isFunction(value)) {
-            value; // $ExpectType () => void
-        }
-        else {
+            value; // $ExpectType CustomError
+        } else {
             value; // $ExpectType number
         }
 
-        if (_.isFunction(anything)) {
-            anything();
+        if (fp.isError(value)) {
+            value; // $ExpectType CustomError
+        } else {
+            value; // $ExpectType number
         }
     }
 
-    {
-        let result: boolean;
+    _.isError(anything); // $ExpectType boolean
+    _({}).isError(); // $ExpectType boolean
+    _.chain([]).isError(); // $ExpectType LoDashExplicitWrapper<boolean>
+    fp.isError(anything); // $ExpectType boolean
+}
 
-        result = _.isFunction(anything);
-        result = _(1).isFunction();
-        result = _<any>([]).isFunction();
-        result = _({}).isFunction();
+// _.isFinite
+{
+    _.isFinite(NaN); // $ExpectType boolean
+    _(42).isFinite(); // $ExpectType boolean
+    _.chain([]).isFinite(); // $ExpectType LoDashExplicitWrapper<boolean>
+    fp.isFinite(anything); // $ExpectType boolean
+}
+
+// _.isFunction
+{
+    const value: number | (() => void) = anything;
+
+    if (_.isFunction(value)) {
+        value; // $ExpectType () => void
+    } else {
+        value; // $ExpectType number
     }
 
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _(1).chain().isFunction();
-        result = _<any>([]).chain().isFunction();
-        result = _({}).chain().isFunction();
+    if (fp.isFunction(value)) {
+        value; // $ExpectType () => void
+    } else {
+        value; // $ExpectType number
     }
+
+    if (_.isFunction(anything)) {
+        anything();
+    }
+
+    if (fp.isFunction(anything)) {
+        anything();
+    }
+
+    _.isFunction(anything); // $ExpectType boolean
+    _({}).isFunction(); // $ExpectType boolean
+    _.chain([]).isFunction(); // $ExpectType LoDashExplicitWrapper<boolean>
+    fp.isFunction(anything); // $ExpectType boolean
 }
 
 // _.isInteger
-namespace TestIsInteger {
-    {
-        let result: boolean;
-
-        result = _.isInteger(anything);
-
-        result = _(1).isInteger();
-        result = _<any>([]).isInteger();
-        result = _({}).isInteger();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _(1).chain().isInteger();
-        result = _<any>([]).chain().isInteger();
-        result = _({}).chain().isInteger();
-    }
+{
+    _.isInteger(NaN); // $ExpectType boolean
+    _(42).isInteger(); // $ExpectType boolean
+    _.chain([]).isInteger(); // $ExpectType LoDashExplicitWrapper<boolean>
+    fp.isInteger(anything); // $ExpectType boolean
 }
 
 // _.isLength
-namespace TestIsLength {
-    {
-        let result: boolean;
-
-        result = _.isLength(anything);
-
-        result = _(1).isLength();
-        result = _<any>([]).isLength();
-        result = _({}).isLength();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _(1).chain().isLength();
-        result = _<any>([]).chain().isLength();
-        result = _({}).chain().isLength();
-    }
+{
+    _.isLength(NaN); // $ExpectType boolean
+    _(42).isLength(); // $ExpectType boolean
+    _.chain([]).isLength(); // $ExpectType LoDashExplicitWrapper<boolean>
+    fp.isLength(anything); // $ExpectType boolean
 }
 
 // _.isMap
-namespace TestIsMap {
-    {
-        let value: number|Map<string, number> = 0;
+{
+    const value: number | Map<string, number> = 0;
 
-        if (_.isMap(value)) {
-            let result: Map<string, number> = value;
-        }
-        else {
-            let result: number = value;
-        }
+    if (_.isMap(value)) {
+        const result: Map<string, number> = value;
+    } else {
+        const result: number = value;
     }
 
-    {
-        let result: boolean;
-
-        result = _.isMap(anything);
-        result = _(1).isMap();
-        result = _<any>([]).isMap();
-        result = _({}).isMap();
+    if (fp.isMap(value)) {
+        const result: Map<string, number> = value;
+    } else {
+        const result: number = value;
     }
 
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _(1).chain().isMap();
-        result = _<any>([]).chain().isMap();
-        result = _({}).chain().isMap();
-    }
+    _.isMap(anything); // $ExpectType boolean
+    _({}).isMap(); // $ExpectType boolean
+    _.chain([]).isMap(); // $ExpectType LoDashExplicitWrapper<boolean>
+    fp.isMap(anything); // $ExpectType boolean
 }
 
 // _.isMatch
-namespace TestIsMatch {
+{
     _.isMatch({}, {}); // $ExpectType boolean
     _({}).isMatch({}); // $ExpectType boolean
     _.chain({}).isMatch({}); // $ExpectType LoDashExplicitWrapper<boolean>
+    fp.isMatch({}, {}); // $ExpectType boolean
+    fp.isMatch({})({}); // $ExpectType boolean
 }
 
 // _.isMatchWith
-namespace TestIsMatchWith {
-    let testIsMatchCustiomizerFn = (value: any, other: any, indexOrKey: number|string|symbol) => true;
+{
+    const testIsMatchCustiomizerFn = (value: any, other: any, indexOrKey: number|string|symbol) => true;
 
     _.isMatchWith({}, {}, testIsMatchCustiomizerFn); // $ExpectType boolean
     _({}).isMatchWith({}, testIsMatchCustiomizerFn); // $ExpectType boolean
     _.chain({}).isMatchWith({}, testIsMatchCustiomizerFn); // $ExpectType LoDashExplicitWrapper<boolean>
+
+    fp.isMatchWith(testIsMatchCustiomizerFn, {}, {}); // $ExpectType boolean
+    fp.isMatchWith(testIsMatchCustiomizerFn)({})({}); // $ExpectType boolean
 }
 
 // _.isNaN
-namespace TestIsNaN {
-    {
-        let result: boolean;
-
-        result = _.isNaN(anything);
-
-        result = _(1).isNaN();
-        result = _<any>([]).isNaN();
-        result = _({}).isNaN();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _(1).chain().isNaN();
-        result = _<any>([]).chain().isNaN();
-        result = _({}).chain().isNaN();
-    }
+{
+    _.isNaN(NaN); // $ExpectType boolean
+    _(42).isNaN(); // $ExpectType boolean
+    _.chain([]).isNaN(); // $ExpectType LoDashExplicitWrapper<boolean>
+    fp.isNaN(anything); // $ExpectType boolean
 }
 
 // _.isNative
-namespace TestIsNative {
-    {
-        let value: number|(() => void) = anything;
+{
+    const value: number | (() => void) = anything;
 
-        if (_.isNative(value)) {
-            value; // $ExpectType () => void
-        }
-        else {
-            value; // $ExpectType number
-        }
+    if (_.isNative(value)) {
+        value; // $ExpectType () => void
+    } else {
+        value; // $ExpectType number
     }
 
-    {
-        let result: boolean;
-
-        result = _.isNative(anything);
-
-        result = _(1).isNative();
-        result = _<any>([]).isNative();
-        result = _({}).isNative();
+    if (fp.isNative(value)) {
+        value; // $ExpectType () => void
+    } else {
+        value; // $ExpectType number
     }
 
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _(1).chain().isNative();
-        result = _<any>([]).chain().isNative();
-        result = _({}).chain().isNative();
-    }
+    _.isNative(anything); // $ExpectType boolean
+    _({}).isNative(); // $ExpectType boolean
+    _.chain([]).isNative(); // $ExpectType LoDashExplicitWrapper<boolean>
+    fp.isNative(anything); // $ExpectType boolean
 }
 
 // _.isNil
-namespace TestIsNil {
-    {
-        let result: boolean;
-
-        result = _.isNil(anything);
-
-        result = _(1).isNil();
-        result = _<any>([]).isNil();
-        result = _({}).isNil();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _(1).chain().isNil();
-        result = _<any>([]).chain().isNil();
-        result = _({}).chain().isNil();
-    }
+{
+    _.isNil(null); // $ExpectType boolean
+    _(undefined).isNil(); // $ExpectType boolean
+    _.chain(NaN).isNil(); // $ExpectType LoDashExplicitWrapper<boolean>
+    fp.isNil(undefined); // $ExpectType boolean
 }
 
 // _.isNull
-namespace TestIsNull {
-    {
-        let result: boolean;
-
-        result = _.isNull(anything);
-
-        result = _(1).isNull();
-        result = _<any>([]).isNull();
-        result = _({}).isNull();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _(1).chain().isNull();
-        result = _<any>([]).chain().isNull();
-        result = _({}).chain().isNull();
-    }
+{
+    _.isNull(null); // $ExpectType boolean
+    _(undefined).isNull(); // $ExpectType boolean
+    _.chain(NaN).isNull(); // $ExpectType LoDashExplicitWrapper<boolean>
+    fp.isNull(undefined); // $ExpectType boolean
 }
 
 // _.isNumber
-namespace TestIsNumber {
-    {
-        let value: string|number = 0;
+{
+    const value: string | number = 0;
 
-        if (_.isNumber(value)) {
-            let result: number = value;
-        }
-        else {
-            let result: string = value;
-        }
+    if (_.isNumber(value)) {
+        const result: number = value;
+    } else {
+        const result: string = value;
     }
 
-    {
-        let result: boolean;
-
-        result = _.isNumber(anything);
-
-        result = _(1).isNumber();
-        result = _<any>([]).isNumber();
-        result = _({}).isNumber();
+    if (fp.isNumber(value)) {
+        const result: number = value;
+    } else {
+        const result: string = value;
     }
 
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _(1).chain().isNumber();
-        result = _<any>([]).chain().isNumber();
-        result = _({}).chain().isNumber();
-    }
+    _.isNumber(NaN); // $ExpectType boolean
+    _(42).isNumber(); // $ExpectType boolean
+    _.chain([]).isNumber(); // $ExpectType LoDashExplicitWrapper<boolean>
+    fp.isNumber(anything); // $ExpectType boolean
 }
 
 // _.isObject
-namespace TestIsObject {
-    {
-        let result: boolean;
-
-        result = _.isObject(anything);
-        result = _(1).isObject();
-        result = _<any>([]).isObject();
-        result = _({}).isObject();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _(1).chain().isObject();
-        result = _<any>([]).chain().isObject();
-        result = _({}).chain().isObject();
-    }
+{
+    _.isObject(NaN); // $ExpectType boolean
+    _(42).isObject(); // $ExpectType boolean
+    _.chain([]).isObject(); // $ExpectType LoDashExplicitWrapper<boolean>
+    fp.isObject(anything); // $ExpectType boolean
 }
 
 // _.isObjectLike
-namespace TestIsObjectLike {
-    {
-        let result: boolean;
-
-        result = _.isObjectLike(anything);
-        result = _(1).isObjectLike();
-        result = _<any>([]).isObjectLike();
-        result = _({}).isObjectLike();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _(1).chain().isObjectLike();
-        result = _<any>([]).chain().isObjectLike();
-        result = _({}).chain().isObjectLike();
-    }
+{
+    _.isObjectLike(NaN); // $ExpectType boolean
+    _(42).isObjectLike(); // $ExpectType boolean
+    _.chain([]).isObjectLike(); // $ExpectType LoDashExplicitWrapper<boolean>
+    fp.isObjectLike(anything); // $ExpectType boolean
 }
 
 // _.isPlainObject
-namespace TestIsPlainObject {
-    {
-        let result: boolean;
-
-        result = _.isPlainObject(anything);
-        result = _(1).isPlainObject();
-        result = _<any>([]).isPlainObject();
-        result = _({}).isPlainObject();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _(1).chain().isPlainObject();
-        result = _<any>([]).chain().isPlainObject();
-        result = _({}).chain().isPlainObject();
-    }
+{
+    _.isPlainObject(NaN); // $ExpectType boolean
+    _(42).isPlainObject(); // $ExpectType boolean
+    _.chain([]).isPlainObject(); // $ExpectType LoDashExplicitWrapper<boolean>
+    fp.isPlainObject(anything); // $ExpectType boolean
 }
 
 // _.isRegExp
-namespace TestIsRegExp {
+{
     {
-        let value: number|RegExp = /./;
+        const value: number | RegExp = anything;
 
         if (_.isRegExp(value)) {
-            let result: RegExp = value;
+            const result: RegExp = value;
+        } else {
+            const result: number = value;
         }
-        else {
-            let result: number = value;
+
+        if (fp.isRegExp(value)) {
+            const result: RegExp = value;
+        } else {
+            const result: number = value;
         }
     }
 
-    {
-        let result: boolean;
-
-        result = _.isRegExp(anything);
-        result = _(1).isRegExp();
-        result = _<any>([]).isRegExp();
-        result = _({}).isRegExp();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _(1).chain().isRegExp();
-        result = _<any>([]).chain().isRegExp();
-        result = _({}).chain().isRegExp();
-    }
+    _.isRegExp(/./); // $ExpectType boolean
+    _(42).isRegExp(); // $ExpectType boolean
+    _.chain([]).isRegExp(); // $ExpectType LoDashExplicitWrapper<boolean>
+    fp.isRegExp(anything); // $ExpectType boolean
 }
 
 // _.isSafeInteger
-namespace TestIsSafeInteger {
-    {
-        let result: boolean;
-
-        result = _.isSafeInteger(anything);
-
-        result = _(1).isSafeInteger();
-        result = _<any>([]).isSafeInteger();
-        result = _({}).isSafeInteger();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _(1).chain().isSafeInteger();
-        result = _<any>([]).chain().isSafeInteger();
-        result = _({}).chain().isSafeInteger();
-    }
+{
+    _.isSafeInteger(NaN); // $ExpectType boolean
+    _(42).isSafeInteger(); // $ExpectType boolean
+    _.chain([]).isSafeInteger(); // $ExpectType LoDashExplicitWrapper<boolean>
+    fp.isSafeInteger(anything); // $ExpectType boolean
 }
 
 // _.isSet
-namespace TestIsSet {
-    {
-        let value: number|Set<string> = 0;
+{
+    const value: number | Set<string> = 0;
 
-        if (_.isSet(value)) {
-            let result: Set<string> = value;
-        }
-        else {
-            let result: number = value;
-        }
+    if (_.isSet(value)) {
+        const result: Set<string> = value;
+    } else {
+        const result: number = value;
     }
 
-    {
-        let result: boolean;
-
-        result = _.isSet(anything);
-        result = _(1).isSet();
-        result = _<any>([]).isSet();
-        result = _({}).isSet();
+    if (fp.isSet(value)) {
+        const result: Set<string> = value;
+    } else {
+        const result: number = value;
     }
 
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _(1).chain().isSet();
-        result = _<any>([]).chain().isSet();
-        result = _({}).chain().isSet();
-    }
+    _.isSet(NaN); // $ExpectType boolean
+    _(42).isSet(); // $ExpectType boolean
+    _.chain([]).isSet(); // $ExpectType LoDashExplicitWrapper<boolean>
+    fp.isSet(anything); // $ExpectType boolean
 }
 
 // _.isString
-namespace TestIsString {
-    {
-        let value: number|string = '';
+{
+    const value: number | string = "";
 
-        if (_.isString(value)) {
-            let result: string = value;
-        }
-        else {
-            let result: number = value;
-        }
+    if (_.isString(value)) {
+        const result: string = value;
+    } else {
+        const result: number = value;
     }
 
-    {
-        let result: boolean;
-
-        result = _.isString(anything);
-        result = _(1).isString();
-        result = _<any>([]).isString();
-        result = _({}).isString();
+    if (fp.isString(value)) {
+        const result: string = value;
+    } else {
+        const result: number = value;
     }
 
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _(1).chain().isString();
-        result = _<any>([]).chain().isString();
-        result = _({}).chain().isString();
-    }
+    _.isString(""); // $ExpectType boolean
+    _(42).isString(); // $ExpectType boolean
+    _.chain([]).isString(); // $ExpectType LoDashExplicitWrapper<boolean>
+    fp.isString(anything); // $ExpectType boolean
 }
 
 // _.isSymbol
-namespace TestIsSymbol {
-    {
-        let result: boolean;
-
-        result = _.isSymbol(anything);
-
-        result = _(1).isSymbol();
-        result = _<any>([]).isSymbol();
-        result = _({}).isSymbol();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _(1).chain().isSymbol();
-        result = _<any>([]).chain().isSymbol();
-        result = _({}).chain().isSymbol();
-    }
+{
+    _.isSymbol(NaN); // $ExpectType boolean
+    _(42).isSymbol(); // $ExpectType boolean
+    _.chain([]).isSymbol(); // $ExpectType LoDashExplicitWrapper<boolean>
+    fp.isSymbol(anything); // $ExpectType boolean
 }
 
 // _.isTypedArray
-namespace TestIsTypedArray {
-    {
-        let result: boolean;
-
-        result = _.isTypedArray([]);
-        result = _([]).isTypedArray();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _([]).chain().isTypedArray();
-    }
+{
+    _.isTypedArray(NaN); // $ExpectType boolean
+    _(42).isTypedArray(); // $ExpectType boolean
+    _.chain([]).isTypedArray(); // $ExpectType LoDashExplicitWrapper<boolean>
+    fp.isTypedArray(anything); // $ExpectType boolean
 }
 
 // _.isUndefined
-namespace TestIsUndefined {
-    {
-        let result: boolean;
-
-        result = _.isUndefined(anything);
-
-        result = _(1).isUndefined();
-        result = _<any>([]).isUndefined();
-        result = _({}).isUndefined();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _(1).chain().isUndefined();
-        result = _<any>([]).chain().isUndefined();
-        result = _({}).chain().isUndefined();
-    }
+{
+    _.isUndefined(null); // $ExpectType boolean
+    _(undefined).isUndefined(); // $ExpectType boolean
+    _.chain(NaN).isUndefined(); // $ExpectType LoDashExplicitWrapper<boolean>
+    fp.isUndefined(undefined); // $ExpectType boolean
 }
 
 // _.isWeakMap
-namespace TestIsWeakMap {
-    {
-        let value: number | WeakMap<object, number> = 0;
+{
+    const value: number | WeakMap<object, number> = 0;
 
-        if (_.isWeakMap(value)) {
-            let result: WeakMap<object, number> = value;
-        }
-        else {
-            let result: number = value;
-        }
+    if (_.isWeakMap(value)) {
+        const result: WeakMap<object, number> = value;
+    } else {
+        const result: number = value;
     }
 
-    {
-        let result: boolean;
-
-        result = _.isWeakMap(anything);
-        result = _(1).isWeakMap();
-        result = _<any>([]).isWeakMap();
-        result = _({}).isWeakMap();
+    if (fp.isWeakMap(value)) {
+        const result: WeakMap<object, number> = value;
+    } else {
+        const result: number = value;
     }
 
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _(1).chain().isWeakMap();
-        result = _<any>([]).chain().isWeakMap();
-        result = _({}).chain().isWeakMap();
-    }
+    _.isWeakMap(NaN); // $ExpectType boolean
+    _(42).isWeakMap(); // $ExpectType boolean
+    _.chain([]).isWeakMap(); // $ExpectType LoDashExplicitWrapper<boolean>
+    fp.isWeakMap(anything); // $ExpectType boolean
 }
 
 // _.isWeakSet
-namespace TestIsWeakSet {
-    {
-        let value: number | WeakSet<object> = 0;
+{
+    const value: number | WeakSet<object> = 0;
 
-        if (_.isWeakSet(value)) {
-            let result: WeakSet<object> = value;
-        }
-        else {
-            let result: number = value;
-        }
+    if (_.isWeakSet(value)) {
+        const result: WeakSet<object> = value;
+    } else {
+        const result: number = value;
     }
 
-    {
-        let result: boolean;
-
-        result = _.isWeakSet(anything);
-        result = _(1).isWeakSet();
-        result = _<any>([]).isWeakSet();
-        result = _({}).isWeakSet();
+    if (fp.isWeakSet(value)) {
+        const result: WeakSet<object> = value;
+    } else {
+        const result: number = value;
     }
 
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _(1).chain().isWeakSet();
-        result = _<any>([]).chain().isWeakSet();
-        result = _({}).chain().isWeakSet();
-    }
+    _.isWeakSet(NaN); // $ExpectType boolean
+    _(42).isWeakSet(); // $ExpectType boolean
+    _.chain([]).isWeakSet(); // $ExpectType LoDashExplicitWrapper<boolean>
+    fp.isWeakSet(anything); // $ExpectType boolean
 }
 
 // _.lt
-namespace TestLt {
-    {
-        let result: boolean;
+{
+    _.lt(anything, anything); // $ExpectType boolean
+    _(anything).lt(anything); // $ExpectType boolean
+    _.chain(anything).lt(anything); // $ExpectType LoDashExplicitWrapper<boolean>
 
-        result = _.lt(anything, anything);
-        result = _(1).lt(anything);
-        result = _([]).lt(anything);
-        result = _({}).lt(anything);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _(1).chain().lt(anything);
-        result = _([]).chain().lt(anything);
-        result = _({}).chain().lt(anything);
-    }
+    fp.lt(anything, anything); // $ExpectType boolean
+    fp.lt(anything)(anything); // $ExpectType boolean
 }
 
 // _.lte
-namespace TestLte {
-    {
-        let result: boolean;
+{
+    _.lte(anything, anything); // $ExpectType boolean
+    _(anything).lte(anything); // $ExpectType boolean
+    _.chain(anything).lte(anything); // $ExpectType LoDashExplicitWrapper<boolean>
 
-        result = _.lte(anything, anything);
-        result = _(1).lte(anything);
-        result = _([]).lte(anything);
-        result = _({}).lte(anything);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _(1).chain().lte(anything);
-        result = _([]).chain().lte(anything);
-        result = _({}).chain().lte(anything);
-    }
+    fp.lte(anything, anything); // $ExpectType boolean
+    fp.lte(anything)(anything); // $ExpectType boolean
 }
 
 // _.toArray
-namespace TestToArray {
-    let array: AbcObject[] = [];
-    let list: _.List<AbcObject> = [];
-    let dictionary: _.Dictionary<AbcObject> = {};
-    let numericDictionary: _.NumericDictionary<AbcObject> = {};
+{
+    const array: AbcObject[] = [];
+    const list: _.List<AbcObject> = [];
+    const dictionary: _.Dictionary<AbcObject> = {};
+    const numericDictionary: _.NumericDictionary<AbcObject> = {};
 
-    {
-        let result: string[];
+    _.toArray(""); // $ExpectType string[]
+    _.toArray(array); // $ExpectType AbcObject[]
+    _.toArray(list); // $ExpectType AbcObject[]
+    _.toArray(dictionary); // $ExpectType AbcObject[]
+    _.toArray(numericDictionary); // $ExpectType AbcObject[]
 
-        result = _.toArray<string>('');
-        result = _.toArray('');
-    }
+    _(array).toArray(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).toArray(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(dictionary).toArray(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(numericDictionary).toArray(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
 
-    {
-        let result: AbcObject[];
+    _.chain(array).toArray(); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).toArray(); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(dictionary).toArray(); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(numericDictionary).toArray(); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
 
-        result = _.toArray(array);
-        result = _.toArray(list);
-        result = _.toArray(dictionary);
-        result = _.toArray(numericDictionary);
-
-        result = _.toArray(array);
-        result = _.toArray(list);
-        result = _.toArray(dictionary);
-        result = _.toArray(numericDictionary);
-    }
-
-    {
-        let result: any[];
-
-        result = _.toArray();
-        result = _.toArray(42);
-        result = _.toArray(true);
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<AbcObject>;
-
-        result = _(array).toArray();
-        result = _(list).toArray();
-        result = _(dictionary).toArray();
-        result = _(numericDictionary).toArray();
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<AbcObject>;
-
-        result = _(array).chain().toArray();
-        result = _(list).chain().toArray();
-        result = _(dictionary).chain().toArray();
-        result = _(numericDictionary).chain().toArray();
-    }
+    fp.toArray(""); // $ExpectType string[]
+    fp.toArray(array); // $ExpectType AbcObject[]
+    fp.toArray(list); // $ExpectType AbcObject[]
+    fp.toArray(dictionary); // $ExpectType AbcObject[]
+    fp.toArray(numericDictionary); // $ExpectType AbcObject[]
 }
 
 // _.toPlainObject
-namespace TestToPlainObject {
-    {
-        let result: AbcObject;
-        result = _.toPlainObject();
-        result = _.toPlainObject(true);
-        result = _.toPlainObject(1);
-        result = _.toPlainObject('a');
-        result = _.toPlainObject([]);
-        result = _.toPlainObject({});
-    }
+{
+    _.toPlainObject(); // $ExpectType any
+    _.toPlainObject(true); // $ExpectType any
+    _.toPlainObject(1); // $ExpectType any
+    _.toPlainObject("a"); // $ExpectType any
+    _.toPlainObject([]); // $ExpectType any
+    _.toPlainObject({}); // $ExpectType any
 
-    {
-        let result: _.LoDashImplicitObjectWrapper<AbcObject>;
+    _(true).toPlainObject(); // $ExpectType LoDashImplicitWrapper<any>
+    _([""]).toPlainObject(); // $ExpectType LoDashImplicitWrapper<any>
+    _({}).toPlainObject(); // $ExpectType LoDashImplicitWrapper<any>
 
-        result = _(true).toPlainObject();
-        result = _(1).toPlainObject();
-        result = _('a').toPlainObject();
-        result = _([1]).toPlainObject();
-        result = _(['']).toPlainObject();
-        result = _({}).toPlainObject();
-    }
+    _.chain(true).toPlainObject(); // $ExpectType LoDashExplicitWrapper<any>
+    _.chain([""]).toPlainObject(); // $ExpectType LoDashExplicitWrapper<any>
+    _.chain({}).toPlainObject(); // $ExpectType LoDashExplicitWrapper<any>
+
+    fp.toPlainObject(true); // $ExpectType any
+    fp.toPlainObject(["a"]); // $ExpectType any
+    fp.toPlainObject({}); // $ExpectType any
 }
 
 // _.toFinite
-namespace TestToFinite {
-   {
-       let result: number;
-       result = _.toFinite(true);
-       result = _.toFinite(1);
-       result = _.toFinite('3.2');
-       result = _.toFinite([]);
-       result = _.toFinite({});
-   }
-
-   {
-       let result: number;
-
-       result = _(true).toFinite();
-       result = _(1).toFinite();
-       result = _('3.2').toFinite();
-       result = _([1]).toFinite();
-       result = _([]).toFinite();
-       result = _({}).toFinite();
-   }
+{
+    _.toFinite(true); // $ExpectType number
+    _.toFinite(1); // $ExpectType number
+    _.toFinite("3.2"); // $ExpectType number
+    _(1).toFinite(); // $ExpectType number
+    _("3.2").toFinite(); // $ExpectType number
+    _.chain(1).toFinite(); // $ExpectType LoDashExplicitWrapper<number>
+    _.chain("3.2").toFinite(); // $ExpectType LoDashExplicitWrapper<number>
+    fp.toFinite(true); // $ExpectType number
+    fp.toFinite(1); // $ExpectType number
+    fp.toFinite("3.2"); // $ExpectType number
 }
 
 // _.toInteger
-namespace TestToInteger {
-   {
-       let result: number;
-       result = _.toInteger(true);
-       result = _.toInteger(1);
-       result = _.toInteger('3.2');
-       result = _.toInteger([]);
-       result = _.toInteger({});
-   }
-
-   {
-       let result: number;
-
-       result = _(true).toInteger();
-       result = _(1).toInteger();
-       result = _('a').toInteger();
-       result = _([1]).toInteger();
-       result = _(['']).toInteger();
-       result = _({}).toInteger();
-   }
+{
+    _.toInteger(true); // $ExpectType number
+    _.toInteger(1); // $ExpectType number
+    _.toInteger("3.2"); // $ExpectType number
+    _(1).toInteger(); // $ExpectType number
+    _("3.2").toInteger(); // $ExpectType number
+    _.chain(1).toInteger(); // $ExpectType LoDashExplicitWrapper<number>
+    _.chain("3.2").toInteger(); // $ExpectType LoDashExplicitWrapper<number>
+    fp.toInteger(true); // $ExpectType number
+    fp.toInteger(1); // $ExpectType number
+    fp.toInteger("3.2"); // $ExpectType number
 }
 
 // _.toLength
-namespace TestToLength {
-   {
-       let result: number;
-       result = _.toLength(true);
-       result = _.toLength(1);
-       result = _.toLength('a');
-       result = _.toLength([]);
-       result = _.toLength({});
-   }
-
-   {
-       let result: number;
-
-       result = _(true).toLength();
-       result = _(1).toLength();
-       result = _('a').toLength();
-       result = _([1]).toLength();
-       result = _(['']).toLength();
-       result = _({}).toLength();
-   }
+{
+    _.toLength(true); // $ExpectType number
+    _.toLength(1); // $ExpectType number
+    _.toLength("3.2"); // $ExpectType number
+    _(1).toLength(); // $ExpectType number
+    _("3.2").toLength(); // $ExpectType number
+    _.chain(1).toLength(); // $ExpectType LoDashExplicitWrapper<number>
+    _.chain("3.2").toLength(); // $ExpectType LoDashExplicitWrapper<number>
+    fp.toLength(true); // $ExpectType number
+    fp.toLength(1); // $ExpectType number
+    fp.toLength("3.2"); // $ExpectType number
 }
 
 // _.toNumber
-namespace TestToNumber {
-   {
-       let result: number;
-       result = _.toNumber(true);
-       result = _.toNumber(1);
-       result = _.toNumber('a');
-       result = _.toNumber([]);
-       result = _.toNumber({});
-   }
-
-   {
-       let result: number;
-
-       result = _(true).toNumber();
-       result = _(1).toNumber();
-       result = _('a').toNumber();
-       result = _([1]).toNumber();
-       result = _(['']).toNumber();
-       result = _({}).toNumber();
-   }
+{
+    _.toNumber(true); // $ExpectType number
+    _.toNumber(1); // $ExpectType number
+    _.toNumber("3.2"); // $ExpectType number
+    _(1).toNumber(); // $ExpectType number
+    _("3.2").toNumber(); // $ExpectType number
+    _.chain(1).toNumber(); // $ExpectType LoDashExplicitWrapper<number>
+    _.chain("3.2").toNumber(); // $ExpectType LoDashExplicitWrapper<number>
+    fp.toNumber(true); // $ExpectType number
+    fp.toNumber(1); // $ExpectType number
+    fp.toNumber("3.2"); // $ExpectType number
 }
 
 // _.toSafeInteger
-namespace TestToSafeInteger {
-   {
-       let result: number;
-       result = _.toSafeInteger(true);
-       result = _.toSafeInteger(1);
-       result = _.toSafeInteger('a');
-       result = _.toSafeInteger([]);
-       result = _.toSafeInteger({});
-   }
-
-   {
-       let result: number;
-
-       result = _(true).toSafeInteger();
-       result = _(1).toSafeInteger();
-       result = _('a').toSafeInteger();
-       result = _([1]).toSafeInteger();
-       result = _(['']).toSafeInteger();
-       result = _({}).toSafeInteger();
-   }
+{
+    _.toSafeInteger(true); // $ExpectType number
+    _.toSafeInteger(1); // $ExpectType number
+    _.toSafeInteger("3.2"); // $ExpectType number
+    _(1).toSafeInteger(); // $ExpectType number
+    _("3.2").toSafeInteger(); // $ExpectType number
+    _.chain(1).toSafeInteger(); // $ExpectType LoDashExplicitWrapper<number>
+    _.chain("3.2").toSafeInteger(); // $ExpectType LoDashExplicitWrapper<number>
+    fp.toSafeInteger(true); // $ExpectType number
+    fp.toSafeInteger(1); // $ExpectType number
+    fp.toSafeInteger("3.2"); // $ExpectType number
 }
 
 /********
@@ -9500,400 +4804,230 @@ namespace TestToSafeInteger {
  ********/
 
 // _.add
-namespace TestAdd {
-    {
-        let result: number;
-
-        result = _.add(1, 1);
-        result = _(1).add(1);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<number>;
-
-        result = _(1).chain().add(1);
-    }
+{
+    _.add(1, 1); // $ExpectType number
+    _(1).add(1); // $ExpectType number
+    _(1).chain().add(1); // $ExpectType LoDashExplicitWrapper<number>
+    fp.add(1, 1); // $ExpectType number
+    fp.add(1)(1); // $ExpectType number
 }
 
 // _.ceil
-namespace TestCeil {
-    {
-        let result: number;
-
-        result = _.ceil(6.004);
-        result = _.ceil(6.004, 2);
-
-        result = _(6.004).ceil();
-        result = _(6.004).ceil(2);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<number>;
-
-        result = _(6.004).chain().ceil();
-        result = _(6.004).chain().ceil(2);
-    }
+{
+    _.ceil(6.004); // $ExpectType number
+    _.ceil(6.004, 2); // $ExpectType number
+    _(6.004).ceil(); // $ExpectType number
+    _(6.004).ceil(2); // $ExpectType number
+    _(6.004).chain().ceil(); // $ExpectType LoDashExplicitWrapper<number>
+    _(6.004).chain().ceil(2); // $ExpectType LoDashExplicitWrapper<number>
+    fp.ceil(6.004); // $ExpectType number
 }
 
 // _.divide
-namespace TestDivide {
-    {
-        let result: number;
-
-        result = _.divide(6, 4);
-
-        result = _(6).divide(4);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<number>;
-
-        result = _(6).chain().floor(4);
-    }
+{
+    _.divide(6, 4); // $ExpectType number
+    _(6).divide(4); // $ExpectType number
+    _(6).chain().floor(4); // $ExpectType LoDashExplicitWrapper<number>
+    fp.divide(6, 4); // $ExpectType number
+    fp.divide(6)(4); // $ExpectType number
 }
 
 // _.floor
-namespace TestFloor {
-    {
-        let result: number;
-
-        result = _.floor(4.006);
-        result = _.floor(0.046, 2);
-        result = _.floor(4060, -2);
-
-        result = _(4.006).floor();
-        result = _(0.046).floor(2);
-        result = _(4060).floor(-2);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<number>;
-
-        result = _(4.006).chain().floor();
-        result = _(0.046).chain().floor(2);
-        result = _(4060).chain().floor(-2);
-    }
+{
+    _.floor(4.006); // $ExpectType number
+    _.floor(0.046, 2); // $ExpectType number
+    _.floor(4060, -2); // $ExpectType number
+    _(4.006).floor(); // $ExpectType number
+    _(0.046).floor(2); // $ExpectType number
+    _(4060).floor(-2); // $ExpectType number
+    _(4.006).chain().floor(); // $ExpectType LoDashExplicitWrapper<number>
+    _(0.046).chain().floor(2); // $ExpectType LoDashExplicitWrapper<number>
+    _(4060).chain().floor(-2); // $ExpectType LoDashExplicitWrapper<number>
+    fp.floor(4.006); // $ExpectType number
 }
 
 // _.max
-namespace TestMax {
-    let array: number[] = [];
-    let list: _.List<number> = [];
+// _.min
+{
+    const list: ArrayLike<string> = anything;
 
-    let result: number | undefined;
+    _.max(list); // $ExpectType string | undefined
+     _(list).max(); // $ExpectType string | undefined
+    _.chain(list).max(); // $ExpectType LoDashExplicitWrapper<string | undefined>
+    fp.max(list); // $ExpectType string | undefined
 
-    result = _.max<number>(array);
-    result = _.max<number>(list);
-
-    result = _(array).max();
-    result = _(list).max<number>();
+    _.min(list); // $ExpectType string | undefined
+     _(list).min(); // $ExpectType string | undefined
+    _.chain(list).min(); // $ExpectType LoDashExplicitWrapper<string | undefined>
+    fp.min(list); // $ExpectType string | undefined
 }
 
 // _.maxBy
-namespace TestMaxBy {
-    let array: number[] = [];
-    let list: _.List<number> = [];
-    let array2: AbcObject[] = [];
-    let list2: _.List<AbcObject> = [];
+// _.minBy
+{
+    const list: ArrayLike<AbcObject> = anything;
 
-    let listIterator = (value: number, index: number, collection: _.List<number>) => 0;
+    const listIterator = (value: AbcObject, index: number, collection: ArrayLike<AbcObject>) => 0;
+    const valueIterator = (value: AbcObject) => 0;
 
-    let result: number | undefined;
-    let result2: AbcObject | undefined;
+    _.maxBy(list, listIterator); // $ExpectType AbcObject | undefined
+    _.maxBy(list, "a"); // $ExpectType AbcObject | undefined
+    _.maxBy(list, { a: 42 }); // $ExpectType AbcObject | undefined
+    _(list).maxBy(listIterator); // $ExpectType AbcObject | undefined
+    _(list).maxBy("a"); // $ExpectType AbcObject | undefined
+    _(list).maxBy({ a: 42 }); // $ExpectType AbcObject | undefined
+    _.chain(list).maxBy(listIterator); // $ExpectType LoDashExplicitWrapper<AbcObject | undefined>
+    _.chain(list).maxBy("a"); // $ExpectType LoDashExplicitWrapper<AbcObject | undefined>
+    _.chain(list).maxBy({ a: 42 }); // $ExpectType LoDashExplicitWrapper<AbcObject | undefined>
+    fp.maxBy(valueIterator)(list); // $ExpectType AbcObject | undefined
+    fp.maxBy("a", list); // $ExpectType AbcObject | undefined
+    fp.maxBy({ a: 42 }, list); // $ExpectType AbcObject | undefined
 
-    result = _.maxBy<number>(array);
-    result = _.maxBy<number>(array, listIterator);
-    result = _.maxBy<number>(array, '');
-    result2 = _.maxBy(array2, {a: 42});
-
-    result = _.maxBy<number>(list);
-    result = _.maxBy<number>(list, listIterator);
-    result = _.maxBy<number>(list, '');
-    result2 = _.maxBy(list2, {a: 42});
-
-    result = _(array).maxBy();
-    result = _(array).maxBy(listIterator);
-    result = _(array).maxBy('');
-    result2 = _(array2).maxBy({a: 42});
-
-    result = _(list).maxBy<number>();
-    result = _(list).maxBy<number>(listIterator);
-    result = _(list).maxBy<number>('');
-    result2 = _(list2).maxBy({a: 42});
+    _.minBy(list, listIterator); // $ExpectType AbcObject | undefined
+    _.minBy(list, "a"); // $ExpectType AbcObject | undefined
+    _.minBy(list, { a: 42 }); // $ExpectType AbcObject | undefined
+    _(list).minBy(listIterator); // $ExpectType AbcObject | undefined
+    _(list).minBy("a"); // $ExpectType AbcObject | undefined
+    _(list).minBy({ a: 42 }); // $ExpectType AbcObject | undefined
+    _.chain(list).minBy(listIterator); // $ExpectType LoDashExplicitWrapper<AbcObject | undefined>
+    _.chain(list).minBy("a"); // $ExpectType LoDashExplicitWrapper<AbcObject | undefined>
+    _.chain(list).minBy({ a: 42 }); // $ExpectType LoDashExplicitWrapper<AbcObject | undefined>
+    fp.minBy(valueIterator)(list); // $ExpectType AbcObject | undefined
+    fp.minBy("a", list); // $ExpectType AbcObject | undefined
+    fp.minBy({ a: 42 }, list); // $ExpectType AbcObject | undefined
 }
 
 // _.mean
-namespace TestMean {
-    let array: number[] = [];
+{
+    const list: ArrayLike<number> = anything;
 
-    let result: number;
-
-    result = _.mean(array);
-
-    result = _(array).mean();
+    _.mean(list); // $ExpectType number
+     _(list).mean(); // $ExpectType number
+    _.chain(list).mean(); // $ExpectType LoDashExplicitWrapper<number>
+    fp.mean(list); // $ExpectType number
 }
 
 // _.meanBy
 {
-    let array: AbcObject[] = [];
+    const list: ArrayLike<AbcObject> = anything;
 
-    let result: number;
+    _.meanBy(list, (x) => x.a); // $ExpectType number
+    _.meanBy(list, "a"); // $ExpectType number
+    _(list).meanBy((x) => x.a); // $ExpectType number
+    _.chain(list).meanBy((x) => x.a); // $ExpectType LoDashExplicitWrapper<number>
 
-    result = _.meanBy(array, (x) => x.a);
-    result = _.meanBy(array, 'a');
-
-    result = _(array).mean();
-}
-
-// _.min
-namespace TestMin {
-    let array: number[] = [];
-    let list: _.List<number> = [];
-
-    let result: number | undefined;
-
-    result = _.min<number>(array);
-    result = _.min<number>(list);
-
-    result = _(array).min();
-    result = _(list).min<number>();
-}
-
-// _.minBy
-namespace TestMinBy {
-    let array: number[] = [];
-    let list: _.List<number> = [];
-    let array2: AbcObject[] = [];
-    let list2: _.List<AbcObject> = [];
-
-    let listIterator = (value: number, index: number, collection: _.List<number>) => 0;
-
-    let result: number | undefined;
-    let result2: AbcObject | undefined;
-
-    result = _.minBy<number>(array);
-    result = _.minBy<number>(array, listIterator);
-    result = _.minBy<number>(array, '');
-    result2 = _.minBy(array2, {a: 42});
-
-    result = _.minBy<number>(list);
-    result = _.minBy<number>(list, listIterator);
-    result = _.minBy<number>(list, '');
-    result2 = _.minBy(list2, {a: 42});
-
-    result = _(array).minBy();
-    result = _(array).minBy(listIterator);
-    result = _(array).minBy('');
-    result2 = _(array2).minBy({a: 42});
-
-    result = _(list).minBy<number>();
-    result = _(list).minBy<number>(listIterator);
-    result = _(list).minBy<number>('');
-    result2 = _(list2).minBy({a: 42});
+    fp.meanBy((x) => x.a, list); // $ExpectType number
+    fp.meanBy((x: AbcObject) => x.a)(list); // $ExpectType number
+    fp.meanBy("a", list); // $ExpectType number
 }
 
 // _.multiply
-namespace TestMultiply {
-    {
-        let result: number;
-
-        result = _.multiply(6, 4);
-
-        result = _(6).multiply(4);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<number>;
-
-        result = _(6).chain().multiply(4);
-    }
+{
+    _.multiply(6, 4); // $ExpectType number
+    _(6).multiply(4); // $ExpectType number
+    _(6).chain().multiply(4); // $ExpectType LoDashExplicitWrapper<number>
+    fp.multiply(6, 4); // $ExpectType number
+    fp.multiply(6)(4); // $ExpectType number
 }
 
 // _.round
-namespace TestRound {
-    {
-        let result: number;
+{
+    _.round(4.006); // $ExpectType number
+    _.round(4.006, 2); // $ExpectType number
+    _(4.006).round(); // $ExpectType number
+    _(4.006).round(2); // $ExpectType number
+    _(4.006).chain().round(); // $ExpectType LoDashExplicitWrapper<number>
+    _(4.006).chain().round(2); // $ExpectType LoDashExplicitWrapper<number>
+    fp.round(4.006); // $ExpectType number
+}
 
-        result = _.round(4.006);
-        result = _.round(4.006, 2);
-
-        result = _(4.006).round();
-        result = _(4.006).round(2);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<number>;
-
-        result = _(4.006).chain().round();
-        result = _(4.006).chain().round(2);
-    }
+ // _.subtract
+{
+    _.subtract(3, 2); // $ExpectType number
+    _(3).subtract(2); // $ExpectType number
+    _(3).chain().subtract(2); // $ExpectType LoDashExplicitWrapper<number>
+    fp.subtract(3, 2); // $ExpectType number
+    fp.subtract(3)(2); // $ExpectType number
 }
 
 // _.sum
-namespace TestSum {
-    let array: number[] | null | undefined = [] as any;
-    let list: _.List<number> | null | undefined = [] as any;
-    let obj: any = {};
-    let dictionary: _.Dictionary<number> | null | undefined = obj;
+{
+    const list: ArrayLike<number> | null | undefined = anything;
 
-    let listIterator = (value: number, index: number, collection: _.List<number>) => 0;
-    let dictionaryIterator = (value: number, key: string, collection: _.Dictionary<number>) => 0;
-
-    {
-        let result: number;
-
-        result = _.sum(array);
-
-        result = _.sum(list);
-
-        result = _(array).sum();
-
-        result = _(list).sum();
-
-        result = _(dictionary).sum();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<number>;
-
-        result = _(array).chain().sum();
-
-        result = _(list).chain().sum();
-
-        result = _(dictionary).chain().sum();
-    }
+    _.sum(list); // $ExpectType number
+    _(list).sum(); // $ExpectType number
+    _(list).chain().sum(); // $ExpectType LoDashExplicitWrapper<number>
+    fp.sum(list); // $ExpectType number
 }
 
 // _.sumBy
-namespace TestSumBy {
-    let array: number[] | null | undefined = [] as any;
-    let objectArray: Array<{ 'age': number }> | null | undefined = [] as any;
+{
+    const list: ArrayLike<AbcObject> | null | undefined = anything;
+    const listIterator = (value: AbcObject) => 0;
 
-    let list: _.List<number> | null | undefined = [] as any;
-    let objectList: _.List<{ 'age': number }> | null | undefined = [] as any;
+    _.sumBy(list, listIterator); // $ExpectType number
+    _.sumBy(list, "a"); // $ExpectType number
+    _(list).sumBy(listIterator); // $ExpectType number
+    _(list).sumBy("a"); // $ExpectType number
+    _(list).chain().sumBy(listIterator); // $ExpectType LoDashExplicitWrapper<number>
+    _(list).chain().sumBy("a"); // $ExpectType LoDashExplicitWrapper<number>
 
-    let listIterator = (value: number) => 0;
-
-    {
-        let result: number;
-
-        result = _.sumBy(array);
-        result = _.sumBy(array, listIterator);
-        result = _.sumBy(objectArray, 'age');
-
-        result = _.sumBy(list);
-        result = _.sumBy(list, listIterator);
-        result = _.sumBy(objectList, 'age');
-
-        result = _(array).sumBy(listIterator);
-        result = _(objectArray).sumBy('age');
-
-        result = _(list).sumBy(listIterator);
-        result = _(objectList).sumBy('age');
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<number>;
-
-        result = _(array).chain().sumBy(listIterator);
-        result = _(objectArray).chain().sumBy('age');
-
-        result = _(list).chain().sumBy(listIterator);
-        result = _(objectList).chain().sumBy('age');
-    }
+    fp.sumBy(listIterator, list); // $ExpectType number
+    fp.sumBy("a")(list); // $ExpectType number
 }
 
 /**********
  * Number *
  **********/
 
- // _.subtract
- namespace subtract {
-     {
-         let result: number;
-
-         result = _.subtract(3, 2);
-
-         result = _(3).subtract(2);
-     }
-
-     {
-         let result: _.LoDashExplicitWrapper<number>;
-
-         result = _(3).chain().subtract(2);
-     }
- }
-
 // _.clamp
-namespace TestInClamp {
-    {
-        let result: number;
-
-        result = _.clamp(3, 2, 4);
-        result = _.clamp(3, 4);
-
-        result = _(3).clamp(2, 4);
-        result = _(3).clamp(4);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<number>;
-
-        result = _(3).chain().clamp(2, 4);
-    }
+{
+    _.clamp(3, 2, 4); // $ExpectType number
+    _.clamp(3, 4); // $ExpectType number
+    _(3).clamp(2, 4); // $ExpectType number
+    _(3).clamp(4); // $ExpectType number
+    _.chain(3).clamp(2, 4); // $ExpectType LoDashExplicitWrapper<number>
+    fp.clamp(2, 4, 3); // $ExpectType number
+    fp.clamp(2)(4)(3); // $ExpectType number
 }
 
 // _.inRange
-namespace TestInRange {
-    {
-        let result: boolean;
-
-        result = _.inRange(3, 2, 4);
-        result = _.inRange(4, 8);
-
-        result = _(3).inRange(2, 4);
-        result = _(4).inRange(8);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _(3).chain().inRange(2, 4);
-        result = _(4).chain().inRange(8);
-    }
+{
+    _.inRange(3, 2, 4); // $ExpectType boolean
+    _.inRange(4, 8); // $ExpectType boolean
+    _(3).inRange(2, 4); // $ExpectType boolean
+    _(4).inRange(8); // $ExpectType boolean
+    _.chain(3).inRange(2, 4); // $ExpectType LoDashExplicitWrapper<boolean>
+    _.chain(4).inRange(8); // $ExpectType LoDashExplicitWrapper<boolean>
+    fp.inRange(2, 4, 3); // $ExpectType boolean
+    fp.inRange(2)(4)(3); // $ExpectType boolean
 }
 
 // _.random
-namespace TestRandom {
-    {
-        let result: number;
+{
+    _.random(); // $ExpectType number
+    _.random(1); // $ExpectType number
+    _.random(1, 2); // $ExpectType number
+    _.random(1, 2, true); // $ExpectType number
+    _.random(1, true); // $ExpectType number
+    _.random(true); // $ExpectType number
 
-        result = _.random();
-        result = _.random(1);
-        result = _.random(1, 2);
-        result = _.random(1, 2, true);
-        result = _.random(1, true);
-        result = _.random(true);
+    _(1).random(); // $ExpectType number
+    _(1).random(2); // $ExpectType number
+    _(1).random(2, true); // $ExpectType number
+    _(1).random(true); // $ExpectType number
+    _(true).random(); // $ExpectType number
 
-        result = _(1).random();
-        result = _(1).random(2);
-        result = _(1).random(2, true);
-        result = _(1).random(true);
-        result = _(true).random();
-    }
+    _.chain(1).random(); // $ExpectType LoDashExplicitWrapper<number>
+    _.chain(1).random(2); // $ExpectType LoDashExplicitWrapper<number>
+    _.chain(1).random(2, true); // $ExpectType LoDashExplicitWrapper<number>
+    _.chain(1).random(true); // $ExpectType LoDashExplicitWrapper<number>
+    _.chain(true).random(); // $ExpectType LoDashExplicitWrapper<number>
 
-    {
-        let result: _.LoDashExplicitWrapper<number>;
+    fp.random(1, 2); // $ExpectType number
+    fp.random(1)(2); // $ExpectType number
 
-        result = _(1).chain().random();
-        result = _(1).chain().random(2);
-        result = _(1).chain().random(2, true);
-        result = _(1).chain().random(true);
-        result = _(true).chain().random();
-    }
-
-    // $ExpectType number[]
-    _.map([5, 5], _.random);
+    _.map([5, 5], _.random); // $ExpectType number[]
 }
 
 /**********
@@ -9901,1813 +5035,558 @@ namespace TestRandom {
  **********/
 
 // _.assign
-namespace TestAssign {
-    interface Obj { a: string };
-    interface S1 { a: number };
-    interface S2 { b: number };
-    interface S3 { c: number };
-    interface S4 { d: number };
-    interface S5 { e: number };
-
-    let obj: Obj = { a: "" };
-    let s1: S1 = { a: 1 };
-    let s2: S2 = { b: 1 };
-    let s3: S3 = { c: 1 };
-    let s4: S4 = { d: 1 };
-    let s5: S5 = { e: 1 };
-
-    {
-        let result: Obj;
-
-        result = _.assign(obj);
-    }
-
-    {
-        let result: { a: number };
-
-        result = _.assign(obj, s1);
-    }
-
-    {
-        let result: { a: number, b: number };
-
-        result = _.assign(obj, s1, s2);
-    }
-
-    {
-        let result: { a: number, b: number, c: number };
-
-        result = _.assign(obj, s1, s2, s3);
-    }
-
-    {
-        let result: { a: number, b: number, c: number, d: number };
-
-        result = _.assign(obj, s1, s2, s3, s4);
-    }
-
-    {
-        let result: { a: number, b: number, c: number, d: number, e: number };
-
-        result = _.assign(obj, s1, s2, s3, s4, s5);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<Obj>;
-
-        result = _(obj).assign();
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<{ a: number & string }>;
-
-        result = _(obj).assign(s1);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<{ a: number & string, b: number }>;
-
-        result = _(obj).assign(s1, s2);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<{ a: number & string, b: number, c: number }>;
-
-        result = _(obj).assign(s1, s2, s3);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<{ a: number & string, b: number, c: number, d: number }>;
-
-        result = _(obj).assign(s1, s2, s3, s4);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<{ a: number, b: number, c: number, d: number, e: number }>;
-
-        result = _(obj).assign(s1, s2, s3, s4, s5);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<Obj>;
-
-        result = _(obj).chain().assign();
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<{ a: number & string }>;
-
-        result = _(obj).chain().assign(s1);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<{ a: number & string, b: number }>;
-
-        result = _(obj).chain().assign(s1, s2);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<{ a: number & string, b: number, c: number }>;
-
-        result = _(obj).chain().assign(s1, s2, s3);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<{ a: number & string, b: number, c: number, d: number }>;
-
-        result = _(obj).chain().assign(s1, s2, s3, s4);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<{ a: number, b: number, c: number, d: number, e: number }>;
-
-        result = _(obj).chain().assign(s1, s2, s3, s4, s5);
-    }
-}
-
-// _.assignWith
-namespace TestAssignWith {
-    interface Obj { a: string };
-    interface S1 { a: number };
-    interface S2 { b: number };
-    interface S3 { c: number };
-    interface S4 { d: number };
-    interface S5 { e: number };
-
-    let obj: Obj = { a: "" };
-    let s1: S1 = { a: 1 };
-    let s2: S2 = { b: 1 };
-    let s3: S3 = { c: 1 };
-    let s4: S4 = { d: 1 };
-    let s5: S5 = { e: 1 };
-
-    let customizer: (objectValue: any, sourceValue: any, key?: string, object?: {}, source?: {}) => any = (objectValue: any, sourceValue: any, key?: string, object?: {}, source?: {}) => 1;
-
-    {
-        let result: Obj;
-
-        result = _.assignWith(obj);
-    }
-
-    {
-        let result: { a: number };
-        result = _.assignWith(obj, s1, customizer);
-    }
-
-    {
-        let result: { a: number, b: number };
-        result = _.assignWith(obj, s1, s2, customizer);
-    }
-
-    {
-        let result: { a: number, b: number, c: number };
-        result = _.assignWith(obj, s1, s2, s3, customizer);
-    }
-
-    {
-        let result: { a: number, b: number, c: number, d: number };
-        result = _.assignWith(obj, s1, s2, s3, s4, customizer);
-    }
-
-    {
-        let result: { a: number, b: number, c: number, d: number, e: number };
-        result = _.assignWith<{ a: number, b: number, c: number, d: number, e: number }>(obj, s1, s2, s3, s4, s5, customizer);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<Obj>;
-
-        result = _(obj).assignWith();
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<{ a: number & string }>;
-        result = _(obj).assignWith(s1, customizer);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<{ a: number & string, b: number }>;
-        result = _(obj).assignWith(s1, s2, customizer);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<{ a: number & string, b: number, c: number }>;
-        result = _(obj).assignWith(s1, s2, s3, customizer);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<{ a: number & string, b: number, c: number, d: number }>;
-        result = _(obj).assignWith(s1, s2, s3, s4, customizer);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<{ a: number, b: number, c: number, d: number, e: number }>;
-        result = _(obj).assignWith<{ a: number, b: number, c: number, d: number, e: number }>(s1, s2, s3, s4, s5, customizer);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<Obj>;
-
-        result = _(obj).chain().assignWith();
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<{ a: number & string }>;
-        result = _(obj).chain().assignWith(s1, customizer);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<{ a: number & string, b: number }>;
-        result = _(obj).chain().assignWith(s1, s2, customizer);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<{ a: number & string, b: number, c: number }>;
-        result = _(obj).chain().assignWith(s1, s2, s3, customizer);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<{ a: number & string, b: number, c: number, d: number }>;
-        result = _(obj).chain().assignWith(s1, s2, s3, s4, customizer);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<{ a: number, b: number, c: number, d: number, e: number }>;
-        result = _(obj).chain().assignWith(s1, s2, s3, s4, s5, customizer);
-    }
-}
-
 // _.assignIn
-namespace TestAssignIn {
-    interface Obj { a: string };
-    interface S1 { a: number };
-    interface S2 { b: number };
-    interface S3 { c: number };
-    interface S4 { d: number };
-    interface S5 { e: number };
-
-    let obj: Obj = { a: "" };
-    let s1: S1 = { a: 1 };
-    let s2: S2 = { b: 1 };
-    let s3: S3 = { c: 1 };
-    let s4: S4 = { d: 1 };
-    let s5: S5 = { e: 1 };
-
-    let customizer: (objectValue: any, sourceValue: any, key?: string, object?: {}, source?: {}) => any = (objectValue: any, sourceValue: any, key?: string, object?: {}, source?: {}) => 1;
-
-    {
-        let result: Obj;
-
-        result = _.assignIn(obj);
-    }
-
-    {
-        let result: { a: number };
-
-        result = _.assignIn(obj, s1);
-    }
-
-    {
-        let result: { a: number, b: number };
-
-        result = _.assignIn(obj, s1, s2);
-    }
-
-    {
-        let result: { a: number, b: number, c: number };
-
-        result = _.assignIn(obj, s1, s2, s3);
-    }
-
-    {
-        let result: { a: number, b: number, c: number, d: number };
-
-        result = _.assignIn(obj, s1, s2, s3, s4);
-    }
-
-    {
-        let result: { a: number, b: number, c: number, d: number, e: number };
-
-        result = _.assignIn<{ a: number, b: number, c: number, d: number, e: number }>(obj, s1, s2, s3, s4, s5);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<Obj>;
-
-        result = _(obj).assignIn();
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<{ a: number & string }>;
-
-        result = _(obj).assignIn(s1);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<{ a: number & string, b: number }>;
-
-        result = _(obj).assignIn(s1, s2);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<{ a: number & string, b: number, c: number }>;
-
-        result = _(obj).assignIn(s1, s2, s3);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<{ a: number & string, b: number, c: number, d: number }>;
-
-        result = _(obj).assignIn(s1, s2, s3, s4);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<{ a: number, b: number, c: number, d: number, e: number }>;
-
-        result = _(obj).assignIn<{ a: number, b: number, c: number, d: number, e: number }>(s1, s2, s3, s4, s5);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<Obj>;
-
-        result = _(obj).chain().assignIn();
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<{ a: number & string }>;
-
-        result = _(obj).chain().assignIn(s1);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<{ a: number & string, b: number }>;
-
-        result = _(obj).chain().assignIn(s1, s2);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<{ a: number & string, b: number, c: number }>;
-
-        result = _(obj).chain().assignIn(s1, s2, s3);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<{ a: number & string, b: number, c: number, d: number }>;
-
-        result = _(obj).chain().assignIn(s1, s2, s3, s4);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<{ a: number, b: number, c: number, d: number, e: number }>;
-
-        result = _(obj).chain().assignIn(s1, s2, s3, s4, s5);
-    }
-}
-
+// _.assignWith
 // _.assignInWith
-namespace TestAssignInWith {
-    interface Obj { a: string };
-    interface S1 { a: number };
-    interface S2 { b: number };
-    interface S3 { c: number };
-    interface S4 { d: number };
-    interface S5 { e: number };
+// _.defaults
+// _.extend
+// _.extendWith
+// _.merge
+// _.mergeWith
+{
+    const obj = { a: "" };
+    const s1 = { b: 1 };
+    const s2 = { c: 1 };
+    const s3 = { d: 1 };
+    const s4 = { e: 1 };
+    const s5 = { f: 1 };
 
-    let obj: Obj = { a: "" };
-    let s1: S1 = { a: 1 };
-    let s2: S2 = { b: 1 };
-    let s3: S3 = { c: 1 };
-    let s4: S4 = { d: 1 };
-    let s5: S5 = { e: 1 };
+    const customizer = (objectValue: any, sourceValue: any, key: string | undefined, object: {} | undefined, source: {} | undefined) => 1;
 
-    let customizer: (objectValue: any, sourceValue: any, key?: string, object?: {}, source?: {}) => any = (objectValue: any, sourceValue: any, key?: string, object?: {}, source?: {}) => 1;
+    _.assign(obj); // $ExpectType { a: string; }
+    _.assign(obj, s1); // $ExpectType { a: string; } & { b: number; }
+    _.assign(obj, s1, s2, s3, s4); // $ExpectType { a: string; } & { b: number; } & { c: number; } & { d: number; } & { e: number; }
+    _.assign(obj, s1, s2, s3, s4, s5);
+    _(obj).assign(); // $ExpectType LoDashImplicitWrapper<{ a: string; }>
+    _(obj).assign(s1); // $ExpectType LoDashImplicitWrapper<{ a: string; } & { b: number; }>
+    _(obj).assign(s1, s2, s3, s4); // $ExpectType LoDashImplicitWrapper<{ a: string; } & { b: number; } & { c: number; } & { d: number; } & { e: number; }>
+    _(obj).assign(s1, s2, s3, s4, s5);
+    _.chain(obj).assign(); // $ExpectType LoDashExplicitWrapper<{ a: string; }>
+    _.chain(obj).assign(s1); // $ExpectType LoDashExplicitWrapper<{ a: string; } & { b: number; }>
+    _.chain(obj).assign(s1, s2, s3, s4); // $ExpectType LoDashExplicitWrapper<{ a: string; } & { b: number; } & { c: number; } & { d: number; } & { e: number; }>
+    _.chain(obj).assign(s1, s2, s3, s4, s5);
+    fp.assign(obj, s1); // $ExpectType { a: string; } & { b: number; }
+    fp.assign(obj)(s1); // $ExpectType { a: string; } & { b: number; }
 
-    {
-        let result: Obj;
+    _.assignIn(obj); // $ExpectType { a: string; }
+    _.assignIn(obj, s1); // $ExpectType { a: string; } & { b: number; }
+    _.assignIn(obj, s1, s2, s3, s4); // $ExpectType { a: string; } & { b: number; } & { c: number; } & { d: number; } & { e: number; }
+    _.assignIn(obj, s1, s2, s3, s4, s5);
+    _(obj).assignIn(); // $ExpectType LoDashImplicitWrapper<{ a: string; }>
+    _(obj).assignIn(s1); // $ExpectType LoDashImplicitWrapper<{ a: string; } & { b: number; }>
+    _(obj).assignIn(s1, s2, s3, s4); // $ExpectType LoDashImplicitWrapper<{ a: string; } & { b: number; } & { c: number; } & { d: number; } & { e: number; }>
+    _(obj).assignIn(s1, s2, s3, s4, s5);
+    _.chain(obj).assignIn(); // $ExpectType LoDashExplicitWrapper<{ a: string; }>
+    _.chain(obj).assignIn(s1); // $ExpectType LoDashExplicitWrapper<{ a: string; } & { b: number; }>
+    _.chain(obj).assignIn(s1, s2, s3, s4); // $ExpectType LoDashExplicitWrapper<{ a: string; } & { b: number; } & { c: number; } & { d: number; } & { e: number; }>
+    _.chain(obj).assignIn(s1, s2, s3, s4, s5);
+    fp.assignIn(obj, s1); // $ExpectType { a: string; } & { b: number; }
+    fp.assignIn(obj)(s1); // $ExpectType { a: string; } & { b: number; }
 
-        result = _.assignInWith(obj);
-    }
+    _.assignWith(obj); // $ExpectType { a: string; }
+    _.assignWith(obj, s1, customizer); // $ExpectType { a: string; } & { b: number; }
+    _.assignWith(obj, s1, s2, s3, s4, customizer); // $ExpectType { a: string; } & { b: number; } & { c: number; } & { d: number; } & { e: number; }
+    _.assignWith(obj, s1, s2, s3, s4, s5, customizer);
+    _(obj).assignWith(); // $ExpectType LoDashImplicitWrapper<{ a: string; }>
+    _(obj).assignWith(s1, customizer); // $ExpectType LoDashImplicitWrapper<{ a: string; } & { b: number; }>
+    _(obj).assignWith(s1, s2, s3, s4, customizer); // $ExpectType LoDashImplicitWrapper<{ a: string; } & { b: number; } & { c: number; } & { d: number; } & { e: number; }>
+    _(obj).assignWith(s1, s2, s3, s4, s5, customizer);
+    _.chain(obj).assignWith(); // $ExpectType LoDashExplicitWrapper<{ a: string; }>
+    _.chain(obj).assignWith(s1, customizer); // $ExpectType LoDashExplicitWrapper<{ a: string; } & { b: number; }>
+    _.chain(obj).assignWith(s1, s2, s3, s4, customizer); // $ExpectType LoDashExplicitWrapper<{ a: string; } & { b: number; } & { c: number; } & { d: number; } & { e: number; }>
+    _.chain(obj).assignWith(s1, s2, s3, s4, s5, customizer);
+    fp.assignWith(customizer, obj, s1); // $ExpectType { a: string; } & { b: number; }
+    fp.assignWith(customizer)(obj)(s1); // $ExpectType { a: string; } & { b: number; }
 
-    {
-        let result: { a: number };
-        result = _.assignInWith(obj, s1, customizer);
-    }
+    _.assignInWith(obj); // $ExpectType { a: string; }
+    _.assignInWith(obj, s1, customizer); // $ExpectType { a: string; } & { b: number; }
+    _.assignInWith(obj, s1, s2, s3, s4, customizer); // $ExpectType { a: string; } & { b: number; } & { c: number; } & { d: number; } & { e: number; }
+    _.assignInWith(obj, s1, s2, s3, s4, s5, customizer);
+    _(obj).assignInWith(); // $ExpectType LoDashImplicitWrapper<{ a: string; }>
+    _(obj).assignInWith(s1, customizer); // $ExpectType LoDashImplicitWrapper<{ a: string; } & { b: number; }>
+    _(obj).assignInWith(s1, s2, s3, s4, customizer); // $ExpectType LoDashImplicitWrapper<{ a: string; } & { b: number; } & { c: number; } & { d: number; } & { e: number; }>
+    _(obj).assignInWith(s1, s2, s3, s4, s5, customizer);
+    _.chain(obj).assignInWith(); // $ExpectType LoDashExplicitWrapper<{ a: string; }>
+    _.chain(obj).assignInWith(s1, customizer); // $ExpectType LoDashExplicitWrapper<{ a: string; } & { b: number; }>
+    _.chain(obj).assignInWith(s1, s2, s3, s4, customizer); // $ExpectType LoDashExplicitWrapper<{ a: string; } & { b: number; } & { c: number; } & { d: number; } & { e: number; }>
+    _.chain(obj).assignInWith(s1, s2, s3, s4, s5, customizer);
+    fp.assignInWith(customizer, obj, s1); // $ExpectType { a: string; } & { b: number; }
+    fp.assignInWith(customizer)(obj)(s1); // $ExpectType { a: string; } & { b: number; }
 
-    {
-        let result: { a: number, b: number };
-        result = _.assignInWith(obj, s1, s2, customizer);
-    }
+    _.defaults(obj); // $ExpectType { a: string; }
+    _.defaults(obj, s1); // $ExpectType { b: number; } & { a: string; }
+    _.defaults(obj, s1, s2, s3, s4); // $ExpectType { e: number; } & { d: number; } & { c: number; } & { b: number; } & { a: string; }
+    _.defaults(obj, s1, s2, s3, s4, s5);
+    _(obj).defaults(); // $ExpectType LoDashImplicitWrapper<{ a: string; }>
+    _(obj).defaults(s1); // $ExpectType LoDashImplicitWrapper<{ b: number; } & { a: string; }>
+    _(obj).defaults(s1, s2, s3, s4); // $ExpectType LoDashImplicitWrapper<{ e: number; } & { d: number; } & { c: number; } & { b: number; } & { a: string; }>
+    _(obj).defaults(s1, s2, s3, s4, s5);
+    _.chain(obj).defaults(); // $ExpectType LoDashExplicitWrapper<{ a: string; }>
+    _.chain(obj).defaults(s1); // $ExpectType LoDashExplicitWrapper<{ b: number; } & { a: string; }>
+    _.chain(obj).defaults(s1, s2, s3, s4); // $ExpectType LoDashExplicitWrapper<{ e: number; } & { d: number; } & { c: number; } & { b: number; } & { a: string; }>
+    _.chain(obj).defaults(s1, s2, s3, s4, s5);
+    fp.defaults(obj, s1); // $ExpectType { a: string; } & { b: number; }
+    fp.defaults(obj)(s1); // $ExpectType { a: string; } & { b: number; }
 
-    {
-        let result: { a: number, b: number, c: number };
-        result = _.assignInWith(obj, s1, s2, s3, customizer);
-    }
+    _.extend(obj); // $ExpectType { a: string; }
+    _.extend(obj, s1); // $ExpectType { a: string; } & { b: number; }
+    _.extend(obj, s1, s2, s3, s4); // $ExpectType { a: string; } & { b: number; } & { c: number; } & { d: number; } & { e: number; }
+    _.extend(obj, s1, s2, s3, s4, s5);
+    _(obj).extend(); // $ExpectType LoDashImplicitWrapper<{ a: string; }>
+    _(obj).extend(s1); // $ExpectType LoDashImplicitWrapper<{ a: string; } & { b: number; }>
+    _(obj).extend(s1, s2, s3, s4); // $ExpectType LoDashImplicitWrapper<{ a: string; } & { b: number; } & { c: number; } & { d: number; } & { e: number; }>
+    _(obj).extend(s1, s2, s3, s4, s5);
+    _.chain(obj).extend(); // $ExpectType LoDashExplicitWrapper<{ a: string; }>
+    _.chain(obj).extend(s1); // $ExpectType LoDashExplicitWrapper<{ a: string; } & { b: number; }>
+    _.chain(obj).extend(s1, s2, s3, s4); // $ExpectType LoDashExplicitWrapper<{ a: string; } & { b: number; } & { c: number; } & { d: number; } & { e: number; }>
+    _.chain(obj).extend(s1, s2, s3, s4, s5);
+    fp.extend(obj, s1); // $ExpectType { a: string; } & { b: number; }
+    fp.extend(obj)(s1); // $ExpectType { a: string; } & { b: number; }
 
-    {
-        let result: { a: number, b: number, c: number, d: number };
-        result = _.assignInWith(obj, s1, s2, s3, s4, customizer);
-    }
+    _.extendWith(obj); // $ExpectType { a: string; }
+    _.extendWith(obj, s1, customizer); // $ExpectType { a: string; } & { b: number; }
+    _.extendWith(obj, s1, s2, s3, s4, customizer); // $ExpectType { a: string; } & { b: number; } & { c: number; } & { d: number; } & { e: number; }
+    _.extendWith(obj, s1, s2, s3, s4, s5, customizer);
+    _(obj).extendWith(); // $ExpectType LoDashImplicitWrapper<{ a: string; }>
+    _(obj).extendWith(s1, customizer); // $ExpectType LoDashImplicitWrapper<{ a: string; } & { b: number; }>
+    _(obj).extendWith(s1, s2, s3, s4, customizer); // $ExpectType LoDashImplicitWrapper<{ a: string; } & { b: number; } & { c: number; } & { d: number; } & { e: number; }>
+    _(obj).extendWith(s1, s2, s3, s4, s5, customizer);
+    _.chain(obj).extendWith(); // $ExpectType LoDashExplicitWrapper<{ a: string; }>
+    _.chain(obj).extendWith(s1, customizer); // $ExpectType LoDashExplicitWrapper<{ a: string; } & { b: number; }>
+    _.chain(obj).extendWith(s1, s2, s3, s4, customizer); // $ExpectType LoDashExplicitWrapper<{ a: string; } & { b: number; } & { c: number; } & { d: number; } & { e: number; }>
+    _.chain(obj).extendWith(s1, s2, s3, s4, s5, customizer);
+    fp.extendWith(customizer, obj, s1); // $ExpectType { a: string; } & { b: number; }
+    fp.extendWith(customizer)(obj)(s1); // $ExpectType { a: string; } & { b: number; }
 
-    {
-        let result: { a: number, b: number, c: number, d: number, e: number };
-        result = _.assignInWith<{ a: number, b: number, c: number, d: number, e: number }>(obj, s1, s2, s3, s4, s5, customizer);
-    }
+    _.merge(obj, s1); // $ExpectType { a: string; } & { b: number; }
+    _.merge(obj, s1, s2, s3, s4); // $ExpectType { a: string; } & { b: number; } & { c: number; } & { d: number; } & { e: number; }
+    _.merge(obj, s1, s2, s3, s4, s5);
+    _(obj).merge(s1); // $ExpectType LoDashImplicitWrapper<{ a: string; } & { b: number; }>
+    _(obj).merge(s1, s2, s3, s4); // $ExpectType LoDashImplicitWrapper<{ a: string; } & { b: number; } & { c: number; } & { d: number; } & { e: number; }>
+    _(obj).merge(s1, s2, s3, s4, s5);
+    _.chain(obj).merge(s1); // $ExpectType LoDashExplicitWrapper<{ a: string; } & { b: number; }>
+    _.chain(obj).merge(s1, s2, s3, s4); // $ExpectType LoDashExplicitWrapper<{ a: string; } & { b: number; } & { c: number; } & { d: number; } & { e: number; }>
+    _.chain(obj).merge(s1, s2, s3, s4, s5);
+    fp.merge(obj, s1); // $ExpectType { a: string; } & { b: number; }
+    fp.merge(obj)(s1); // $ExpectType { a: string; } & { b: number; }
 
-    {
-        let result: _.LoDashImplicitObjectWrapper<Obj>;
-
-        result = _(obj).assignInWith();
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<{ a: number & string }>;
-        result = _(obj).assignInWith(s1, customizer);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<{ a: number & string, b: number }>;
-        result = _(obj).assignInWith(s1, s2, customizer);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<{ a: number & string, b: number, c: number }>;
-        result = _(obj).assignInWith(s1, s2, s3, customizer);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<{ a: number & string, b: number, c: number, d: number }>;
-        result = _(obj).assignInWith(s1, s2, s3, s4, customizer);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<{ a: number, b: number, c: number, d: number, e: number }>;
-        result = _(obj).assignInWith<{ a: number, b: number, c: number, d: number, e: number }>(s1, s2, s3, s4, s5, customizer);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<Obj>;
-
-        result = _(obj).chain().assignInWith();
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<{ a: number & string }>;
-        result = _(obj).chain().assignInWith(s1, customizer);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<{ a: number & string, b: number }>;
-        result = _(obj).chain().assignInWith(s1, s2, customizer);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<{ a: number & string, b: number, c: number }>;
-        result = _(obj).chain().assignInWith(s1, s2, s3, customizer);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<{ a: number & string, b: number, c: number, d: number }>;
-        result = _(obj).chain().assignInWith(s1, s2, s3, s4, customizer);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<{ a: number, b: number, c: number, d: number, e: number }>;
-        result = _(obj).chain().assignInWith(s1, s2, s3, s4, s5, customizer);
-    }
+    _.mergeWith(obj, s1, customizer); // $ExpectType { a: string; } & { b: number; }
+    _.mergeWith(obj, s1, s2, s3, s4, customizer); // $ExpectType { a: string; } & { b: number; } & { c: number; } & { d: number; } & { e: number; }
+    _.mergeWith(obj, s1, s2, s3, s4, s5, customizer);
+    _(obj).mergeWith(s1, customizer); // $ExpectType LoDashImplicitWrapper<{ a: string; } & { b: number; }>
+    _(obj).mergeWith(s1, s2, s3, s4, customizer); // $ExpectType LoDashImplicitWrapper<{ a: string; } & { b: number; } & { c: number; } & { d: number; } & { e: number; }>
+    _(obj).mergeWith(s1, s2, s3, s4, s5, customizer);
+    _.chain(obj).mergeWith(s1, customizer); // $ExpectType LoDashExplicitWrapper<{ a: string; } & { b: number; }>
+    _.chain(obj).mergeWith(s1, s2, s3, s4, customizer); // $ExpectType LoDashExplicitWrapper<{ a: string; } & { b: number; } & { c: number; } & { d: number; } & { e: number; }>
+    _.chain(obj).mergeWith(s1, s2, s3, s4, s5, customizer);
+    fp.mergeWith(customizer, obj, s1); // $ExpectType { a: string; } & { b: number; }
+    fp.mergeWith(customizer)(obj)(s1); // $ExpectType { a: string; } & { b: number; }
 }
 
 // _.create
-namespace TestCreate {
-    type SampleProto = {a: number};
-    type SampleProps = {b: string};
+{
+    const prototype = { a: 1 };
+    const properties = { b: "" };
 
-    let prototype: SampleProto = { a: 1 };
-    let properties: SampleProps = { b: "" };
-
-    {
-        let result: {a: number; b: string};
-
-        result = _.create<SampleProto, SampleProps>(prototype, properties);
-        result = _.create(prototype, properties);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<{a: number; b: string}>;
-
-        result = _(prototype).create<SampleProps>(properties);
-        result = _(prototype).create(properties);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<{a: number; b: string}>;
-
-        result = _(prototype).chain().create<SampleProps>(properties);
-        result = _(prototype).chain().create(properties);
-    }
+    _.create(prototype, properties); // $ExpectType { a: number; } & { b: string; }
+    _(prototype).create(properties); // $ExpectType LoDashImplicitWrapper<{ a: number; } & { b: string; }>
+    _.chain(prototype).create(properties); // $ExpectType LoDashExplicitWrapper<{ a: number; } & { b: string; }>
+    // We can't expectType for this line because it fails in TS2.3
+    const result: { a: number; } = fp.create(prototype);
 }
 
-// _.defaults
-namespace TestDefaults {
-  interface Obj { a: string };
-  interface S1 { a: number };
-  interface S2 { b: number };
-  interface S3 { c: number };
-  interface S4 { d: number };
-  interface S5 { e: number };
-
-    let obj: Obj = { a: "" };
-    let s1: S1 = { a: 1 };
-    let s2: S2 = { b: 1 };
-    let s3: S3 = { c: 1 };
-    let s4: S4 = { d: 1 };
-    let s5: S5 = { e: 1 };
-
-    {
-    let result: Obj;
-
-    result = _.defaults(obj);
-    }
-
-    {
-    let result: { a: string };
-
-    result = _.defaults(obj, s1);
-    }
-
-    {
-    let result: { a: string, b: number };
-
-    result = _.defaults(obj, s1, s2);
-    }
-
-    {
-    let result: { a: string, b: number, c: number };
-
-    result = _.defaults(obj, s1, s2, s3);
-    }
-
-    {
-    let result: { a: string, b: number, c: number, d: number };
-
-    result = _.defaults(obj, s1, s2, s3, s4);
-    }
-
-    {
-    let result: { a: string, b: number, c: number, d: number, e: number };
-
-    result = _.defaults(obj, s1, s2, s3, s4, s5);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<Obj>;
-
-        result = _(obj).defaults();
-    }
-
-    {
-    let result: _.LoDashImplicitObjectWrapper<{ a: string & number }>;
-
-    result = _(obj).defaults(s1);
-    }
-
-    {
-    let result: _.LoDashImplicitObjectWrapper<{ a: string & number, b: number }>;
-
-    result = _(obj).defaults(s1, s2);
-    }
-
-    {
-    let result: _.LoDashImplicitObjectWrapper<{ a: string & number, b: number, c: number }>;
-
-    result = _(obj).defaults(s1, s2, s3);
-    }
-
-    {
-    let result: _.LoDashImplicitObjectWrapper<{ a: string & number, b: number, c: number, d: number }>;
-
-    result = _(obj).defaults(s1, s2, s3, s4);
-    }
-
-    {
-    let result: _.LoDashImplicitObjectWrapper<{ a: string, b: number, c: number, d: number, e: number }>;
-
-    result = _(obj).defaults(s1, s2, s3, s4, s5);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<Obj>;
-
-        result = _(obj).chain().defaults();
-    }
-
-    {
-    let result: _.LoDashExplicitObjectWrapper<{ a: string & number }>;
-
-    result = _(obj).chain().defaults(s1);
-    }
-
-    {
-    let result: _.LoDashExplicitObjectWrapper<{ a: string & number, b: number }>;
-
-    result = _(obj).chain().defaults(s1, s2);
-    }
-
-    {
-    let result: _.LoDashExplicitObjectWrapper<{ a: string & number, b: number, c: number }>;
-
-    result = _(obj).chain().defaults(s1, s2, s3);
-    }
-
-    {
-    let result: _.LoDashExplicitObjectWrapper<{ a: string & number, b: number, c: number, d: number }>;
-
-    result = _(obj).chain().defaults(s1, s2, s3, s4);
-    }
-
-    {
-    let result: _.LoDashExplicitObjectWrapper<{ a: string, b: number, c: number, d: number, e: number }>;
-
-    result = _(obj).chain().defaults(s1, s2, s3, s4, s5);
-    }
+{
+    const obj = { a: "" };
+    const s1 = { b: 1 };
+    const s2 = { c: 1 };
+    const s3 = { d: 1 };
+    const s4 = { e: 1 };
+    const s5 = { f: 1 };
 }
 
-//_.defaultsDeep
-interface DefaultsDeepResult {
-    user: {
-        name: string;
-        age: number;
-    }
+// _.defaultsDeep
+{
+    const testDefaultsDeepObject = { user: { name: "barney" } };
+    const testDefaultsDeepSource = { user: { name: "fred", age: 36 } };
+    _.defaultsDeep(testDefaultsDeepObject, testDefaultsDeepSource); // $ExpectType any
+    _(testDefaultsDeepObject).defaultsDeep(testDefaultsDeepSource); // $ExpectType LoDashImplicitWrapper<any>
+    _.chain(testDefaultsDeepObject).defaultsDeep(testDefaultsDeepSource); // $ExpectType LoDashExplicitWrapper<any>
+
+    fp.defaultsDeep(testDefaultsDeepSource, testDefaultsDeepObject); // $ExpectType any
+    fp.defaultsDeep(testDefaultsDeepSource)(testDefaultsDeepObject); // $ExpectType any
 }
-const TestDefaultsDeepObject = { 'user': { 'name': 'barney' } };
-const TestDefaultsDeepSource = { 'user': { 'name': 'fred', 'age': 36 } };
-result = <DefaultsDeepResult>_.defaultsDeep(TestDefaultsDeepObject, TestDefaultsDeepSource);
-result = <DefaultsDeepResult>_(TestDefaultsDeepObject).defaultsDeep(TestDefaultsDeepSource).value();
 
 // _.entries
-namespace TestEntries {
-    const dictionary: _.Dictionary<number> = anything;
-    const numericDictionary: _.NumericDictionary<number> = anything;
-    const abcObject: AbcObject = anything;
-
-    {
-        _.entries(dictionary); // $ExpectType [string, number][]
-        _.entries(numericDictionary); // $ExpectType [string, number][]
-        _.entries(abcObject); // $ExpectType [string, any][]
-    }
-
-    {
-        _(dictionary).entries(); // $ExpectType LoDashImplicitWrapper<[string, number][]>
-        _(numericDictionary).entries(); // $ExpectType LoDashImplicitWrapper<[string, number][]>
-        _(abcObject).entries(); // $ExpectType LoDashImplicitWrapper<[string, any][]>
-    }
-
-    {
-        _(dictionary).chain().entries(); // $ExpectType LoDashExplicitWrapper<[string, number][]>
-        _(numericDictionary).chain().entries(); // $ExpectType LoDashExplicitWrapper<[string, number][]>
-        _(abcObject).chain().entries(); // $ExpectType LoDashExplicitWrapper<[string, any][]>
-    }
-}
-
 // _.entriesIn
-namespace TestEntriesIn {
+{
     const dictionary: _.Dictionary<number> = anything;
     const numericDictionary: _.NumericDictionary<number> = anything;
     const abcObject: AbcObject = anything;
 
-    {
-        _.entriesIn(dictionary); // $ExpectType [string, number][]
-        _.entriesIn(numericDictionary); // $ExpectType [string, number][]
-        _.entriesIn(abcObject); // $ExpectType [string, any][]
-    }
-
-    {
-        _(dictionary).entriesIn(); // $ExpectType LoDashImplicitWrapper<[string, number][]>
-        _(numericDictionary).entriesIn(); // $ExpectType LoDashImplicitWrapper<[string, number][]>
-        _(abcObject).entriesIn(); // $ExpectType LoDashImplicitWrapper<[string, any][]>
-    }
-
-    {
-        _(dictionary).chain().entriesIn(); // $ExpectType LoDashExplicitWrapper<[string, number][]>
-        _(numericDictionary).chain().entriesIn(); // $ExpectType LoDashExplicitWrapper<[string, number][]>
-        _(abcObject).chain().entriesIn(); // $ExpectType LoDashExplicitWrapper<[string, any][]>
-    }
-}
-
-// _.extend
-namespace TestExtend {
-    type Obj = { a: string };
-    type S1 = { a: number };
-    type S2 = { b: number };
-    type S3 = { c: number };
-    type S4 = { d: number };
-    type S5 = { e: number };
-
-    let obj: Obj = { a: "" };
-    let s1: S1 = { a: 1 };
-    let s2: S2 = { b: 1 };
-    let s3: S3 = { c: 1 };
-    let s4: S4 = { d: 1 };
-    let s5: S5 = { e: 1 };
-
-    let customizer: (objectValue: any, sourceValue: any, key?: string, object?: {}, source?: {}) => any = (objectValue: any, sourceValue: any, key?: string, object?: {}, source?: {}) => 1;
-
-    {
-        let result: Obj;
-
-        result = _.extend(obj);
-    }
-
-    {
-        let result: { a: number };
-
-        result = _.extend(obj, s1);
-    }
-
-    {
-        let result: { a: number, b: number };
-
-        result = _.extend(obj, s1, s2);
-    }
-
-    {
-        let result: { a: number, b: number, c: number };
-
-        result = _.extend(obj, s1, s2, s3);
-    }
-
-    {
-        let result: { a: number, b: number, c: number, d: number };
-
-        result = _.extend(obj, s1, s2, s3, s4);
-    }
-
-    {
-        let result: { a: number, b: number, c: number, d: number, e: number };
-
-        result = _.extend<{ a: number, b: number, c: number, d: number, e: number }>(obj, s1, s2, s3, s4, s5);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<Obj>;
-
-        result = _(obj).extend();
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<{ a: number & string }>;
-
-        result = _(obj).extend(s1);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<{ a: number & string, b: number }>;
-
-        result = _(obj).extend(s1, s2);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<{ a: number & string, b: number, c: number }>;
-
-        result = _(obj).extend(s1, s2, s3);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<{ a: number & string, b: number, c: number, d: number }>;
-
-        result = _(obj).extend(s1, s2, s3, s4);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<{ a: number, b: number, c: number, d: number, e: number }>;
-
-        result = _(obj).extend(s1, s2, s3, s4, s5);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<Obj>;
-
-        result = _(obj).chain().extend();
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<{ a: number & string }>;
-
-        result = _(obj).chain().extend(s1);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<{ a: number & string, b: number }>;
-
-        result = _(obj).chain().extend(s1, s2);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<{ a: number & string, b: number, c: number }>;
-
-        result = _(obj).chain().extend(s1, s2, s3);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<{ a: number & string, b: number, c: number, d: number }>;
-
-        result = _(obj).chain().extend(s1, s2, s3, s4);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<{ a: number, b: number, c: number, d: number, e: number }>;
-
-        result = _(obj).chain().extend(s1, s2, s3, s4, s5);
-    }
-}
-
-// _.extendWith
-namespace TestExtendWith {
-    type Obj = { a: string };
-    type S1 = { a: number };
-    type S2 = { b: number };
-    type S3 = { c: number };
-    type S4 = { d: number };
-    type S5 = { e: number };
-
-    let obj: Obj = { a: "" };
-    let s1: S1 = { a: 1 };
-    let s2: S2 = { b: 1 };
-    let s3: S3 = { c: 1 };
-    let s4: S4 = { d: 1 };
-    let s5: S5 = { e: 1 };
-
-    let customizer: (objectValue: any, sourceValue: any, key?: string, object?: {}, source?: {}) => any = (objectValue: any, sourceValue: any, key?: string, object?: {}, source?: {}) => 1;
-
-    {
-        let result: Obj;
-
-        result = _.extendWith(obj);
-    }
-
-    {
-        let result: { a: number };
-
-        result = _.extendWith(obj, s1, customizer);
-    }
-
-    {
-        let result: { a: number, b: number };
-
-        result = _.extendWith(obj, s1, s2, customizer);
-    }
-
-    {
-        let result: { a: number, b: number, c: number };
-
-        result = _.extendWith(obj, s1, s2, s3, customizer);
-    }
-
-    {
-        let result: { a: number, b: number, c: number, d: number };
-
-        result = _.extendWith(obj, s1, s2, s3, s4, customizer);
-    }
-
-    {
-        let result: { a: number, b: number, c: number, d: number, e: number };
-
-        result = _.extendWith<{ a: number, b: number, c: number, d: number, e: number }>(obj, s1, s2, s3, s4, s5, customizer);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<Obj>;
-
-        result = _(obj).extendWith();
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<{ a: number & string }>;
-
-        result = _(obj).extendWith(s1, customizer);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<{ a: number & string, b: number }>;
-
-        result = _(obj).extendWith(s1, s2, customizer);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<{ a: number & string, b: number, c: number }>;
-
-        result = _(obj).extendWith(s1, s2, s3, customizer);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<{ a: number & string, b: number, c: number, d: number }>;
-
-        result = _(obj).extendWith(s1, s2, s3, s4, customizer);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<{ a: number, b: number, c: number, d: number, e: number }>;
-
-        result = _(obj).extendWith(s1, s2, s3, s4, s5, customizer);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<Obj>;
-
-        result = _(obj).chain().extendWith();
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<{ a: number & string }>;
-
-        result = _(obj).chain().extendWith(s1, customizer);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<{ a: number & string, b: number }>;
-
-        result = _(obj).chain().extendWith(s1, s2, customizer);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<{ a: number & string, b: number, c: number }>;
-
-        result = _(obj).chain().extendWith(s1, s2, s3, customizer);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<{ a: number & string, b: number, c: number, d: number }>;
-
-        result = _(obj).chain().extendWith(s1, s2, s3, s4, customizer);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<{ a: number, b: number, c: number, d: number, e: number }>;
-
-        result = _(obj).chain().extendWith(s1, s2, s3, s4, s5, customizer);
-    }
+    _.entries(dictionary); // $ExpectType [string, number][]
+    _.entries(numericDictionary); // $ExpectType [string, number][]
+    _.entries(abcObject); // $ExpectType [string, any][]
+    _(dictionary).entries(); // $ExpectType LoDashImplicitWrapper<[string, number][]>
+    _(numericDictionary).entries(); // $ExpectType LoDashImplicitWrapper<[string, number][]>
+    _.chain(dictionary).entries(); // $ExpectType LoDashExplicitWrapper<[string, number][]>
+    _.chain(numericDictionary).entries(); // $ExpectType LoDashExplicitWrapper<[string, number][]>
+    _.chain(abcObject).entries(); // $ExpectType LoDashExplicitWrapper<[string, any][]>
+    fp.entries(dictionary); // $ExpectType [string, number][]
+
+    _.entriesIn(dictionary); // $ExpectType [string, number][]
+    _.entriesIn(numericDictionary); // $ExpectType [string, number][]
+    _.entriesIn(abcObject); // $ExpectType [string, any][]
+    _(dictionary).entriesIn(); // $ExpectType LoDashImplicitWrapper<[string, number][]>
+    _(numericDictionary).entriesIn(); // $ExpectType LoDashImplicitWrapper<[string, number][]>
+    _.chain(dictionary).entriesIn(); // $ExpectType LoDashExplicitWrapper<[string, number][]>
+    _.chain(numericDictionary).entriesIn(); // $ExpectType LoDashExplicitWrapper<[string, number][]>
+    _.chain(abcObject).entriesIn(); // $ExpectType LoDashExplicitWrapper<[string, any][]>
+    fp.entriesIn(dictionary); // $ExpectType [string, number][]
 }
 
 // _.findKey
-namespace TestFindKey {
-    {
-        let a: keyof undefined;
-        let predicateFn = (value: any, key: string, object: {}) => true;
-        let result: string | undefined;
-
-        result = _.findKey<{a: string;}>({a: ''});
-
-        result = _.findKey<{a: string;}>({a: ''}, predicateFn);
-
-        result = _.findKey<{a: string;}>({a: ''}, '');
-
-        result = _.findKey({a: { b: 5 }}, {b: 42});
-
-        result = _.findKey({a: { b: 5 }}, ['b', 5]);
-
-        result = _<{a: string;}>({a: ''}).findKey();
-
-        result = _<{a: string;}>({a: ''}).findKey(predicateFn);
-
-        result = _<{a: string;}>({a: ''}).findKey('');
-
-        result = _({a: { b: 5 }}).findKey({b: 42});
-    }
-
-    {
-        let predicateFn = (value: string, key: string, collection: _.Dictionary<string>) => true;
-        let result: string | undefined;
-
-        result = _.findKey({a: ''}, predicateFn);
-
-        result = _({a: ''}).findKey(predicateFn);
-    }
-
-    {
-        let predicateFn = (value: any, key: string, object: {}) => true;
-        let result: _.LoDashExplicitWrapper<string | undefined>;
-
-        result = _<{a: string;}>({a: ''}).chain().findKey();
-
-        result = _<{a: string;}>({a: ''}).chain().findKey(predicateFn);
-
-        result = _<{a: string;}>({a: ''}).chain().findKey('');
-
-        result = _({a: { b: 5 }}).chain().findKey({b: 42});
-    }
-
-    {
-        let predicateFn = (value: string, key: string, collection: _.Dictionary<string>) => true;
-        let result: _.LoDashExplicitWrapper<string | undefined>;
-
-        result = _({a: ''}).chain().findKey(predicateFn);
-    }
-}
-
 // _.findLastKey
-namespace TestFindLastKey {
-    {
-        let predicateFn = (value: any, key: string, object: {}) => true;
-        let result: string | undefined;
+{
+    const predicateFn = (value: string, key: string, object: { a: string }) => true;
+    const predicateFn2 = (value: number) => true;
 
-        result = _.findLastKey<{a: string;}>({a: ''});
+    _.findKey({ a: "" }); // $ExpectType string | undefined
+    _.findKey({ a: "" }, predicateFn); // $ExpectType string | undefined
+    _.findKey({ a: "" }, ""); // $ExpectType string | undefined
+    _.findKey({ a: { b: 5 } }, { b: 42 }); // $ExpectType string | undefined
+    _.findKey({ a: { b: 5 } }, ["b", 5]); // $ExpectType string | undefined
+    _({ a: "" }).findKey(); // $ExpectType string | undefined
+    _({ a: "" }).findKey(predicateFn); // $ExpectType string | undefined
+    _({ a: "" }).findKey(""); // $ExpectType string | undefined
+    _({ a: { b: 5 } }).findKey({ b: 42 }); // $ExpectType string | undefined
+    _({ a: { b: 5 } }).findKey(["b", 5]); // $ExpectType string | undefined
+    _.chain({ a: "" }).findKey(); // $ExpectType LoDashExplicitWrapper<string | undefined>
+    _.chain({ a: "" }).findKey(predicateFn); // $ExpectType LoDashExplicitWrapper<string | undefined>
+    _.chain({ a: "" }).findKey(""); // $ExpectType LoDashExplicitWrapper<string | undefined>
+    _.chain({ a: { b: 5 } }).findKey({ b: 42 }); // $ExpectType LoDashExplicitWrapper<string | undefined>
+    _.chain({ a: { b: 5 } }).findKey(["b", 5]); // $ExpectType LoDashExplicitWrapper<string | undefined>
+    fp.findKey(predicateFn2, { a: 1 }); // $ExpectType string | undefined
+    fp.findKey(predicateFn2)({ a: 1 }); // $ExpectType string | undefined
 
-        result = _.findLastKey<{a: string;}>({a: ''}, predicateFn);
-
-        result = _.findLastKey<{a: string;}>({a: ''}, '');
-
-        result = _.findLastKey({a: { b: 5 }}, {b: 42});
-
-        result = _.findLastKey({a: { b: 5 }}, ['b', 5]);
-
-        result = _<{a: string;}>({a: ''}).findLastKey();
-
-        result = _<{a: string;}>({a: ''}).findLastKey(predicateFn);
-
-        result = _<{a: string;}>({a: ''}).findLastKey('');
-
-        result = _({a: { b: 5 }}).findLastKey({b: 42});
-    }
-
-    {
-        let predicateFn = (value: string, key: string, collection: _.Dictionary<string>) => true;
-        let result: string | undefined;
-
-        result = _.findLastKey({a: ''}, predicateFn);
-
-        result = _({a: ''}).findLastKey(predicateFn);
-    }
-
-    {
-        let predicateFn = (value: any, key: string, object: {}) => true;
-        let result: _.LoDashExplicitWrapper<string | undefined>;
-
-        result = _<{a: string;}>({a: ''}).chain().findLastKey();
-
-        result = _<{a: string;}>({a: ''}).chain().findLastKey(predicateFn);
-
-        result = _<{a: string;}>({a: ''}).chain().findLastKey('');
-
-        result = _({a: { b: 5 }}).chain().findLastKey({b: 42});
-    }
-
-    {
-        let predicateFn = (value: string, key: string, collection: _.Dictionary<string>) => true;
-        let result: _.LoDashExplicitWrapper<string | undefined>;
-
-        result = _({a: ''}).chain().findLastKey(predicateFn);
-    }
+    _.findLastKey({ a: "" }); // $ExpectType string | undefined
+    _.findLastKey({ a: "" }, predicateFn); // $ExpectType string | undefined
+    _.findLastKey({ a: "" }, ""); // $ExpectType string | undefined
+    _.findLastKey({ a: { b: 5 } }, { b: 42 }); // $ExpectType string | undefined
+    _.findLastKey({ a: { b: 5 } }, ["b", 5]); // $ExpectType string | undefined
+    _({ a: "" }).findLastKey(); // $ExpectType string | undefined
+    _({ a: "" }).findLastKey(predicateFn); // $ExpectType string | undefined
+    _({ a: "" }).findLastKey(""); // $ExpectType string | undefined
+    _({ a: { b: 5 } }).findLastKey({ b: 42 }); // $ExpectType string | undefined
+    _({ a: { b: 5 } }).findLastKey(["b", 5]); // $ExpectType string | undefined
+    _.chain({ a: "" }).findLastKey(); // $ExpectType LoDashExplicitWrapper<string | undefined>
+    _.chain({ a: "" }).findLastKey(predicateFn); // $ExpectType LoDashExplicitWrapper<string | undefined>
+    _.chain({ a: "" }).findLastKey(""); // $ExpectType LoDashExplicitWrapper<string | undefined>
+    _.chain({ a: { b: 5 } }).findLastKey({ b: 42 }); // $ExpectType LoDashExplicitWrapper<string | undefined>
+    _.chain({ a: { b: 5 } }).findLastKey(["b", 5]); // $ExpectType LoDashExplicitWrapper<string | undefined>
+    fp.findLastKey(predicateFn2, { a: 1 }); // $ExpectType string | undefined
+    fp.findLastKey(predicateFn2)({ a: 1 }); // $ExpectType string | undefined
 }
 
 // _.forIn
-namespace TestForIn {
-    type SampleObject = {a: number; b: string; c: boolean;};
-
-    let dictionary: _.Dictionary<number> = {};
-    let nilDictionary: _.Dictionary<number> | null | undefined = anything;
-    let dictionaryIterator: (value: number, key: string, collection: _.Dictionary<number>) => any = (value: number, key: string, collection: _.Dictionary<number>) => 1;
-
-    let object: SampleObject = { a: 1, b: "", c: true };
-    let nilObject: SampleObject | null | undefined = anything;
-    let objectIterator: (element: any, key?: string, collection?: any) => any = (element: any, key?: string, collection?: any) => 1;
-
-    {
-        let result: _.Dictionary<number>;
-
-        result = _.forIn(dictionary);
-        result = _.forIn(dictionary, dictionaryIterator);
-    }
-
-    {
-        let result: _.Dictionary<number> | null | undefined;
-
-        result = _.forIn(nilDictionary);
-        result = _.forIn(nilDictionary, dictionaryIterator);
-    }
-
-    {
-        let result: SampleObject;
-
-        result = _.forIn<SampleObject>(object);
-        result = _.forIn<SampleObject>(object, objectIterator);
-    }
-
-    {
-        let result: SampleObject | null | undefined;
-
-        result = _.forIn<SampleObject | null | undefined>(nilObject);
-        result = _.forIn<SampleObject | null | undefined>(nilObject, objectIterator);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<_.Dictionary<number>>;
-
-        result = _(dictionary).forIn();
-        result = _(dictionary).forIn(dictionaryIterator);
-    }
-
-    {
-        let result: _.LoDashImplicitNillableObjectWrapper<_.Dictionary<number>>;
-
-        result = _(nilDictionary).forIn();
-        result = _(nilDictionary).forIn(dictionaryIterator);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<_.Dictionary<number>>;
-
-        result = _(dictionary).chain().forIn();
-        result = _(dictionary).chain().forIn(dictionaryIterator);
-    }
-
-    {
-        let result: _.LoDashExplicitNillableObjectWrapper<_.Dictionary<number>>;
-
-        result = _(nilDictionary).chain().forIn();
-        result = _(nilDictionary).chain().forIn(dictionaryIterator);
-    }
-}
-
 // _.forInRight
-namespace TestForInRight {
-    type SampleObject = {a: number; b: string; c: boolean;};
-
-    let dictionary: _.Dictionary<number> = {};
-    let nilDictionary: _.Dictionary<number> | null | undefined = anything;
-    let dictionaryIterator: (value: number, key: string, collection: _.Dictionary<number>) => any = (value: number, key: string, collection: _.Dictionary<number>) => 1;
-
-    let object: SampleObject = { a: 1, b: "", c: true };
-    let nilObject: SampleObject | null | undefined = anything;
-    let objectIterator: (element: any, key?: string, collection?: any) => any = (element: any, key?: string, collection?: any) => 1;
-
-    {
-        let result: _.Dictionary<number>;
-
-        result = _.forInRight(dictionary);
-        result = _.forInRight(dictionary, dictionaryIterator);
-    }
-
-    {
-        let result: _.Dictionary<number> | null | undefined;
-
-        result = _.forInRight(nilDictionary);
-        result = _.forInRight(nilDictionary, dictionaryIterator);
-    }
-
-    {
-        let result: SampleObject;
-
-        result = _.forInRight<SampleObject>(object);
-        result = _.forInRight<SampleObject>(object, objectIterator);
-    }
-
-    {
-        let result: SampleObject | null | undefined;
-
-        result = _.forInRight<SampleObject | null | undefined>(nilObject);
-        result = _.forInRight<SampleObject | null | undefined>(nilObject, objectIterator);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<_.Dictionary<number>>;
-
-        result = _(dictionary).forInRight();
-        result = _(dictionary).forInRight(dictionaryIterator);
-    }
-
-    {
-        let result: _.LoDashImplicitNillableObjectWrapper<_.Dictionary<number>>;
-
-        result = _(nilDictionary).forInRight();
-        result = _(nilDictionary).forInRight(dictionaryIterator);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<_.Dictionary<number>>;
-
-        result = _(dictionary).chain().forInRight();
-        result = _(dictionary).chain().forInRight(dictionaryIterator);
-    }
-
-    {
-        let result: _.LoDashExplicitNillableObjectWrapper<_.Dictionary<number>>;
-
-        result = _(nilDictionary).chain().forInRight();
-        result = _(nilDictionary).chain().forInRight(dictionaryIterator);
-    }
-}
-
 // _.forOwn
-namespace TestForOwn {
-    type SampleObject = {a: number; b: string; c: boolean;};
-
-    let dictionary: _.Dictionary<number> = {};
-    let nilDictionary: _.Dictionary<number> | null | undefined = anything;
-    let dictionaryIterator: (value: number, key: string, collection: _.Dictionary<number>) => any = (value: number, key: string, collection: _.Dictionary<number>) => 1;
-
-    let object: SampleObject = { a: 1, b: "", c: true };
-    let nilObject: SampleObject | null | undefined = anything;
-    let objectIterator: (element: any, key?: string, collection?: any) => any = (element: any, key?: string, collection?: any) => 1;
-
-    {
-        let result: _.Dictionary<number>;
-
-        result = _.forOwn(dictionary);
-        result = _.forOwn(dictionary, dictionaryIterator);
-    }
-
-    {
-        let result: _.Dictionary<number> | null | undefined;
-
-        result = _.forOwn(nilDictionary);
-        result = _.forOwn(nilDictionary, dictionaryIterator);
-    }
-
-    {
-        let result: SampleObject;
-
-        result = _.forOwn<SampleObject>(object);
-        result = _.forOwn<SampleObject>(object, objectIterator);
-    }
-
-    {
-        let result: SampleObject | null | undefined;
-
-        result = _.forOwn<SampleObject | null | undefined>(nilObject);
-        result = _.forOwn<SampleObject | null | undefined>(nilObject, objectIterator);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<_.Dictionary<number>>;
-
-        result = _(dictionary).forOwn();
-        result = _(dictionary).forOwn(dictionaryIterator);
-    }
-
-    {
-        let result: _.LoDashImplicitNillableObjectWrapper<_.Dictionary<number>>;
-
-        result = _(nilDictionary).forOwn();
-        result = _(nilDictionary).forOwn(dictionaryIterator);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<_.Dictionary<number>>;
-
-        result = _(dictionary).chain().forOwn();
-        result = _(dictionary).chain().forOwn(dictionaryIterator);
-    }
-
-    {
-        let result: _.LoDashExplicitNillableObjectWrapper<_.Dictionary<number>>;
-
-        result = _(nilDictionary).chain().forOwn();
-        result = _(nilDictionary).chain().forOwn(dictionaryIterator);
-    }
-}
-
 // _.forOwnRight
-namespace TestForOwnRight {
-    type SampleObject = {a: number; b: string; c: boolean;};
+{
+    const dictionary: _.Dictionary<number> = {};
+    const dictionaryIterator = (value: number, key: string, collection: _.Dictionary<number>) => {};
+    const dictionaryIterator2 = (value: number) => {};
 
-    let dictionary: _.Dictionary<number> = {};
-    let nilDictionary: _.Dictionary<number> | null | undefined = anything;
-    let dictionaryIterator: (value: number, key: string, collection: _.Dictionary<number>) => any = (value: number, key: string, collection: _.Dictionary<number>) => 1;
+    const object: AbcObject | null | undefined = anything;
+    const objectIterator = (element: string | number | boolean, key: string, collection: AbcObject) => {};
+    const objectIterator2 = (element: number | string | boolean) => {};
 
-    let object: SampleObject = { a: 1, b: "", c: true };
-    let nilObject: SampleObject | null | undefined = anything;
-    let objectIterator: (element: any, key?: string, collection?: any) => any = (element: any, key?: string, collection?: any) => 1;
+    _.forIn(dictionary); // $ExpectType Dictionary<number>
+    _.forIn(dictionary, dictionaryIterator); // $ExpectType Dictionary<number>
+    _.forIn(object); // $ExpectType AbcObject | null | undefined
+    _.forIn(object, objectIterator); // $ExpectType AbcObject | null | undefined
+    _(object).forIn(); // $ExpectType LoDashImplicitWrapper<AbcObject | null | undefined>
+    _(object).forIn(objectIterator); // $ExpectType LoDashImplicitWrapper<AbcObject | null | undefined>
+    _.chain(object).forIn(); // $ExpectType LoDashExplicitWrapper<AbcObject | null | undefined>
+    _.chain(object).forIn(objectIterator); // $ExpectType LoDashExplicitWrapper<AbcObject | null | undefined>
+    fp.forIn(dictionaryIterator2, dictionary); // $ExpectType Dictionary<number>
+    fp.forIn(objectIterator2)(object); // $ExpectType AbcObject | null | undefined
 
-    {
-        let result: _.Dictionary<number>;
+    _.forInRight(dictionary); // $ExpectType Dictionary<number>
+    _.forInRight(dictionary, dictionaryIterator); // $ExpectType Dictionary<number>
+    _.forInRight(object); // $ExpectType AbcObject | null | undefined
+    _.forInRight(object, objectIterator); // $ExpectType AbcObject | null | undefined
+    _(object).forInRight(); // $ExpectType LoDashImplicitWrapper<AbcObject | null | undefined>
+    _(object).forInRight(objectIterator); // $ExpectType LoDashImplicitWrapper<AbcObject | null | undefined>
+    _.chain(object).forInRight(); // $ExpectType LoDashExplicitWrapper<AbcObject | null | undefined>
+    _.chain(object).forInRight(objectIterator); // $ExpectType LoDashExplicitWrapper<AbcObject | null | undefined>
+    fp.forInRight(dictionaryIterator2, dictionary); // $ExpectType Dictionary<number>
+    fp.forInRight(objectIterator2)(object); // $ExpectType AbcObject | null | undefined
 
-        result = _.forOwnRight(dictionary);
-        result = _.forOwnRight(dictionary, dictionaryIterator);
-    }
+    _.forOwn(dictionary); // $ExpectType Dictionary<number>
+    _.forOwn(dictionary, dictionaryIterator); // $ExpectType Dictionary<number>
+    _.forOwn(object); // $ExpectType AbcObject | null | undefined
+    _.forOwn(object, objectIterator); // $ExpectType AbcObject | null | undefined
+    _(object).forOwn(); // $ExpectType LoDashImplicitWrapper<AbcObject | null | undefined>
+    _(object).forOwn(objectIterator); // $ExpectType LoDashImplicitWrapper<AbcObject | null | undefined>
+    _.chain(object).forOwn(); // $ExpectType LoDashExplicitWrapper<AbcObject | null | undefined>
+    _.chain(object).forOwn(objectIterator); // $ExpectType LoDashExplicitWrapper<AbcObject | null | undefined>
+    fp.forOwn(dictionaryIterator2, dictionary); // $ExpectType Dictionary<number>
+    fp.forOwn(objectIterator2)(object); // $ExpectType AbcObject | null | undefined
 
-    {
-        let result: _.Dictionary<number> | null | undefined;
-
-        result = _.forOwnRight(nilDictionary);
-        result = _.forOwnRight(nilDictionary, dictionaryIterator);
-    }
-
-    {
-        let result: SampleObject;
-
-        result = _.forOwnRight<SampleObject>(object);
-        result = _.forOwnRight<SampleObject>(object, objectIterator);
-    }
-
-    {
-        let result: SampleObject | null | undefined;
-
-        result = _.forOwnRight<SampleObject | null | undefined>(nilObject);
-        result = _.forOwnRight<SampleObject | null | undefined>(nilObject, objectIterator);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<_.Dictionary<number>>;
-
-        result = _(dictionary).forOwnRight();
-        result = _(dictionary).forOwnRight(dictionaryIterator);
-    }
-
-    {
-        let result: _.LoDashImplicitNillableObjectWrapper<_.Dictionary<number>>;
-
-        result = _(nilDictionary).forOwnRight();
-        result = _(nilDictionary).forOwnRight(dictionaryIterator);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<_.Dictionary<number>>;
-
-        result = _(dictionary).chain().forOwnRight();
-        result = _(dictionary).chain().forOwnRight(dictionaryIterator);
-    }
-
-    {
-        let result: _.LoDashExplicitNillableObjectWrapper<_.Dictionary<number>>;
-
-        result = _(nilDictionary).chain().forOwnRight();
-        result = _(nilDictionary).chain().forOwnRight(dictionaryIterator);
-    }
+    _.forOwnRight(dictionary); // $ExpectType Dictionary<number>
+    _.forOwnRight(dictionary, dictionaryIterator); // $ExpectType Dictionary<number>
+    _.forOwnRight(object); // $ExpectType AbcObject | null | undefined
+    _.forOwnRight(object, objectIterator); // $ExpectType AbcObject | null | undefined
+    _(object).forOwnRight(); // $ExpectType LoDashImplicitWrapper<AbcObject | null | undefined>
+    _(object).forOwnRight(objectIterator); // $ExpectType LoDashImplicitWrapper<AbcObject | null | undefined>
+    _.chain(object).forOwnRight(); // $ExpectType LoDashExplicitWrapper<AbcObject | null | undefined>
+    _.chain(object).forOwnRight(objectIterator); // $ExpectType LoDashExplicitWrapper<AbcObject | null | undefined>
+    fp.forOwnRight(dictionaryIterator2, dictionary); // $ExpectType Dictionary<number>
+    fp.forOwnRight(objectIterator2)(object); // $ExpectType AbcObject | null | undefined
 }
 
 // _.functions
-namespace TestFunctions {
-    type SampleObject = {a: number; b: string; c: boolean;};
-
-    let object: SampleObject = { a: 1, b: "", c: true };
-
-    {
-        let result: string[];
-
-        result = _.functions(object);
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<string>;
-
-        result = _(object).functions();
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<string>;
-
-        result = _(object).chain().functions();
-    }
-}
-
 // _.functionsIn
-namespace TestFunctionsIn {
-    type SampleObject = {a: number; b: string; c: boolean;};
+{
+    const object: AbcObject = anything;
 
-    let object: SampleObject = { a: 1, b: "", c: true };
+    _.functions(object); // $ExpectType string[]
+    _(object).functions(); // $ExpectType LoDashImplicitWrapper<string[]>
+    _.chain(object).functions(); // $ExpectType LoDashExplicitWrapper<string[]>
+    fp.functions(object); // $ExpectType string[]
 
-    {
-        let result: string[];
-
-        result = _.functionsIn<SampleObject>(object);
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<string>;
-
-        result = _(object).functionsIn();
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<string>;
-
-        result = _(object).chain().functionsIn();
-    }
+    _.functionsIn(object); // $ExpectType string[]
+    _(object).functionsIn(); // $ExpectType LoDashImplicitWrapper<string[]>
+    _.chain(object).functionsIn(); // $ExpectType LoDashExplicitWrapper<string[]>
+    fp.functionsIn(object); // $ExpectType string[]
 }
 
 // _.get
-namespace TestGet {
+{
     _.get([], Symbol.iterator);
     _.get([], [Symbol.iterator]);
 
-    _.get('abc', 1); // $ExpectType string
-    _('abc').get(1); // $ExpectType string
-    _.chain('abc').get(1); // $ExpectType LoDashExplicitWrapper<string>
-
+    _.get("abc", 1); // $ExpectType string
+    _.get("abc", ["0"], "_");
+    _.get([42], 0, -1); // $ExpectType number
     _.get({ a: { b: true } }, "a"); // $ExpectType { b: boolean; }
-    _({ a: { b: true } }).get("a"); // $ExpectType { b: boolean; }
-    _.chain({ a: { b: true } }).get("a"); // $ExpectType LoDashExplicitWrapper<{ b: boolean; }>
-
     _.get({ a: { b: true } }, ["a"]); // $ExpectType { b: boolean; }
-    _({ a: { b: true } }).get(["a"]); // $ExpectType { b: boolean; }
-    _.chain({ a: { b: true } }).get(["a"]); // $ExpectType LoDashExplicitWrapper<{ b: boolean; }>
-
     _.get({ a: { b: true } }, ["a", "b"]); // $ExpectType any
+
+    _("abc").get(1); // $ExpectType string
+    _("abc").get(["0"], "_");
+    _([42]).get(0, -1); // $ExpectType number
+    _({ a: { b: true } }).get("a"); // $ExpectType { b: boolean; }
+    _({ a: { b: true } }).get(["a"]); // $ExpectType { b: boolean; }
     _({ a: { b: true } }).get(["a", "b"]); // $ExpectType any
+
+    _.chain("abc").get(1); // $ExpectType LoDashExplicitWrapper<string>
+    _.chain("abc").get(["0"], "_");
+    _.chain([42]).get(0, -1); // $ExpectType LoDashExplicitWrapper<number | undefined>
+    _.chain({ a: { b: true } }).get("a"); // $ExpectType LoDashExplicitWrapper<{ b: boolean; }>
+    _.chain({ a: { b: true } }).get(["a"]); // $ExpectType LoDashExplicitWrapper<{ b: boolean; }>
     _.chain({ a: { b: true } }).get(["a", "b"]); // $ExpectType LoDashExplicitWrapper<any>
 
-    {
-        let result: string;
+    fp.get(Symbol.iterator, []); // $ExpectType any
+    fp.get(Symbol.iterator)([]); // $ExpectType any
+    fp.get([Symbol.iterator], []); // $ExpectType any
+    fp.get(1)("abc"); // $ExpectType string
+    fp.get("1")("abc"); // $ExpectType any
+    fp.get("a", { a: { b: true } }); // $ExpectType { b: boolean; }
+    fp.get<{ a: { b: boolean } }, "a">("a")({ a: { b: true } }); // $ExpectType { b: boolean; }
+    fp.get(["a", "b"])({ a: { b: true } }); // $ExpectType any
+    fp.get(0)([42]); // $ExpectType number
 
-        result = _.get('abc', '0');
-        result = _.get('abc', '0', '_');
-        result = _.get('abc', ['0']);
-        result = _.get('abc', ['0'], '_');
-
-        result = _.get('abc', '0');
-        result = _.get('abc', '0', '_');
-        result = _.get('abc', ['0']);
-        result = _.get('abc', ['0'], '_');
-
-        result = _('abc').get<string>('0');
-        result = _('abc').get<string>('0', '_');
-        result = _('abc').get<string>(['0']);
-        result = _('abc').get<string>(['0'], '_');
-    }
-
-    {
-        let result: number;
-
-        result = _.get([42], '0');
-        result = _.get([42], '0', -1);
-        result = _.get([42], ['0']);
-        result = _.get([42], ['0'], -1);
-
-        result = _.get([42], '0');
-        result = _.get([42], '0', -1);
-        result = _.get([42], ['0']);
-        result = _.get([42], ['0'], -1);
-
-        result = _([42]).get<number>('0');
-        result = _([42]).get<number>('0', -1);
-        result = _([42]).get<number>(['0']);
-        result = _([42]).get<number>(['0'], -1);
-    }
-
-    {
-        let result: boolean;
-
-        result = _.get({a: true}, 'a');
-        result = _.get({a: true}, 'a', false);
-        result = _.get({a: true}, ['a']);
-        result = _.get({a: true}, ['a'], false);
-
-        result = _.get({a: true}, 'a');
-        result = _.get({a: true}, 'a', false);
-        result = _.get({a: true}, ['a']);
-        result = _.get({a: true}, ['a'], false);
-
-        result = _({a: true}).get<boolean>('a');
-        result = _({a: true}).get<boolean>('a', false);
-        result = _({a: true}).get<boolean>(['a']);
-        result = _({a: true}).get<boolean>(['a'], false);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<string>;
-
-        result = _('abc').chain().get('0');
-        result = _('abc').chain().get('0', '_');
-        result = _('abc').chain().get(['0']);
-        result = _('abc').chain().get(['0'], '_');
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<number>;
-
-        result = _([42]).chain().get('0');
-        result = _([42]).chain().get('0', -1);
-        result = _([42]).chain().get(['0']);
-        result = _([42]).chain().get(['0'], -1);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _({a: true}).chain().get('a');
-        result = _({a: true}).chain().get('a', false);
-        result = _({a: true}).chain().get(['a']);
-        result = _({a: true}).chain().get(['a'], false);
-    }
+    fp.getOr(-1, 0, [42]); // $ExpectType number
+    fp.getOr(-1)(0)([42]); // $ExpectType number
+    fp.getOr("empty" as "empty")(0)([42]); // $ExpectType number | "empty"
 }
 
 // _.has
-namespace TestHas {
-    type SampleObject = {a: number; b: string; c: boolean;};
-
-    let object: SampleObject = { a: 1, b: "", c: true };
-
-    {
-        let result: boolean;
-
-        result = _.has<SampleObject>(object, '');
-        result = _.has<SampleObject>(object, 42);
-        result = _.has<SampleObject>(object, ['', 42]);
-
-        result = _(object).has('');
-        result = _(object).has(42);
-        result = _(object).has(['', 42]);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _(object).chain().has('');
-        result = _(object).chain().has(42);
-        result = _(object).chain().has(['', 42]);
-    }
-}
-
 // _.hasIn
-namespace TestHasIn {
-    type SampleObject = {a: number; b: string; c: boolean;};
+{
+    const object: AbcObject = anything;
 
-    let object: SampleObject = { a: 1, b: "", c: true };
+    _.has(object, ""); // $ExpectType boolean
+    _.has(object, 42); // $ExpectType boolean
+    _.has(object, ["", 42]); // $ExpectType boolean
+    _(object).has(""); // $ExpectType boolean
+    _(object).has(42); // $ExpectType boolean
+    _(object).has(["", 42]); // $ExpectType boolean
+    _.chain(object).has(""); // $ExpectType LoDashExplicitWrapper<boolean>
+    _.chain(object).has(42); // $ExpectType LoDashExplicitWrapper<boolean>
+    _.chain(object).has(["", 42]); // $ExpectType LoDashExplicitWrapper<boolean>
+    fp.has("a", object); // $ExpectType boolean
+    fp.has("a")(object); // $ExpectType boolean
+    fp.has(["a", 42])(object); // $ExpectType boolean
 
-    {
-        let result: boolean;
-
-        result = _.hasIn<SampleObject>(object, '');
-        result = _.hasIn<SampleObject>(object, 42);
-        result = _.hasIn<SampleObject>(object, ['', 42]);
-
-        result = _(object).hasIn('');
-        result = _(object).hasIn(42);
-        result = _(object).hasIn(['', 42]);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _(object).chain().hasIn('');
-        result = _(object).chain().hasIn(42);
-        result = _(object).chain().hasIn(['', 42]);
-    }
+    _.hasIn(object, ""); // $ExpectType boolean
+    _.hasIn(object, 42); // $ExpectType boolean
+    _.hasIn(object, ["", 42]); // $ExpectType boolean
+    _(object).hasIn(""); // $ExpectType boolean
+    _(object).hasIn(42); // $ExpectType boolean
+    _(object).hasIn(["", 42]); // $ExpectType boolean
+    _.chain(object).hasIn(""); // $ExpectType LoDashExplicitWrapper<boolean>
+    _.chain(object).hasIn(42); // $ExpectType LoDashExplicitWrapper<boolean>
+    _.chain(object).hasIn(["", 42]); // $ExpectType LoDashExplicitWrapper<boolean>
+    fp.hasIn("a", object); // $ExpectType boolean
+    fp.hasIn("a")(object); // $ExpectType boolean
+    fp.hasIn(["a", 42])(object); // $ExpectType boolean
 }
 
 // _.invert
-namespace TestInvert {
-    {
-        let result: _.Dictionary<string>;
-
-        result = _.invert({});
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<_.Dictionary<string>>;
-
-        result = _({}).invert();
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<_.Dictionary<string>>;
-
-        result = _({}).chain().invert();
-    }
+{
+    _.invert({}); // $ExpectType Dictionary<string>
+    _({}).invert(); // $ExpectType LoDashImplicitWrapper<Dictionary<string>>
+    _.chain({}).invert(); // $ExpectType LoDashExplicitWrapper<Dictionary<string>>
+    fp.invert({}); // $ExpectType Dictionary<string>
 }
 
 // _.invertBy
-namespace TestInvertBy {
-    let array: Array<{a: number;}> = [];
-    let list: _.List<{a: number;}> = [];
-    let dictionary: _.Dictionary<{a: number;}> = {};
-    let numericDictionary: _.NumericDictionary<{a: number;}> = {};
+{
+    const list: ArrayLike<{ a: number }> = anything;
+    const dictionary: _.Dictionary<{ a: number }> = {};
+    const numericDictionary: _.NumericDictionary<{ a: number }> = {};
 
-    let stringIterator: (value: string) => any = (value: string) => 1;
-    let arrayIterator: (value: {a: number;}) => any = (value: {a: number;}) => 1;
-    let listIterator: (value: {a: number;}) => any = (value: {a: number;}) => 1;
-    let dictionaryIterator: (value: {a: number;}) => any = (value: {a: number;}) => 1;
-    let numericDictionaryIterator: (value: {a: number;}) => any = (value: {a: number;}) => 1;
+    const stringIterator = (value: string) => 1;
+    const valueIterator = (value: {a: number }) => 1;
 
-    {
-        let result: _.Dictionary<string[]>;
+    _.invertBy("foo"); // $ExpectType Dictionary<string[]>
+    _.invertBy("foo", stringIterator); // $ExpectType Dictionary<string[]>
+    _.invertBy(list); // $ExpectType Dictionary<string[]>
+    _.invertBy(list, "a"); // $ExpectType Dictionary<string[]>
+    _.invertBy(list, valueIterator); // $ExpectType Dictionary<string[]>
+    _.invertBy(list, {a: 1}); // $ExpectType Dictionary<string[]>
+    _.invertBy(dictionary); // $ExpectType Dictionary<string[]>
+    _.invertBy(dictionary, "a"); // $ExpectType Dictionary<string[]>
+    _.invertBy(dictionary, valueIterator); // $ExpectType Dictionary<string[]>
+    _.invertBy(dictionary, {a: 1}); // $ExpectType Dictionary<string[]>
+    _.invertBy(numericDictionary); // $ExpectType Dictionary<string[]>
+    _.invertBy(numericDictionary, "a"); // $ExpectType Dictionary<string[]>
+    _.invertBy(numericDictionary, valueIterator); // $ExpectType Dictionary<string[]>
+    _.invertBy(numericDictionary, {a: 1}); // $ExpectType Dictionary<string[]>
 
-        result = _.invertBy('foo');
-        result = _.invertBy('foo', stringIterator);
+    _("foo").invertBy(stringIterator); // $ExpectType LoDashImplicitWrapper<Dictionary<string[]>>
+    _(list).invertBy(); // $ExpectType LoDashImplicitWrapper<Dictionary<string[]>>
+    _(list).invertBy("a"); // $ExpectType LoDashImplicitWrapper<Dictionary<string[]>>
+    _(dictionary).invertBy(valueIterator); // $ExpectType LoDashImplicitWrapper<Dictionary<string[]>>
+    _(numericDictionary).invertBy({a: 1}); // $ExpectType LoDashImplicitWrapper<Dictionary<string[]>>
 
-        result = _.invertBy(array);
-        result = _.invertBy<{a: number;}>(array, 'a');
-        result = _.invertBy<{a: number;}>(array, arrayIterator);
-        result = _.invertBy<{a: number;}>(array, {a: 1});
+    _.chain("foo").invertBy(stringIterator); // $ExpectType LoDashExplicitWrapper<Dictionary<string[]>>
+    _.chain(list).invertBy(); // $ExpectType LoDashExplicitWrapper<Dictionary<string[]>>
+    _.chain(list).invertBy("a"); // $ExpectType LoDashExplicitWrapper<Dictionary<string[]>>
+    _.chain(dictionary).invertBy(valueIterator); // $ExpectType LoDashExplicitWrapper<Dictionary<string[]>>
+    _.chain(numericDictionary).invertBy({a: 1}); // $ExpectType LoDashExplicitWrapper<Dictionary<string[]>>
 
-        result = _.invertBy(list);
-        result = _.invertBy<{a: number;}>(list, 'a');
-        result = _.invertBy<{a: number;}>(list, listIterator);
-        result = _.invertBy<{a: number;}>(list, {a: 1});
-
-        result = _.invertBy(dictionary);
-        result = _.invertBy<{a: number;}>(dictionary, 'a');
-        result = _.invertBy<{a: number;}>(dictionary, dictionaryIterator);
-        result = _.invertBy<{a: number;}>(dictionary, {a: 1});
-
-        result = _.invertBy(numericDictionary);
-        result = _.invertBy<{a: number;}>(numericDictionary, 'a');
-        result = _.invertBy<{a: number;}>(numericDictionary, numericDictionaryIterator);
-        result = _.invertBy<{a: number;}>(numericDictionary, {a: 1});
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<_.Dictionary<string[]>>;
-
-        result = _('foo').invertBy();
-        result = _('foo').invertBy(stringIterator);
-
-        result = _(array).invertBy();
-        result = _(array).invertBy('a');
-        result = _(array).invertBy(arrayIterator);
-        result = _(array).invertBy({a: 1});
-
-        result = _(list).invertBy();
-        result = _(list).invertBy('a');
-        result = _(list).invertBy(listIterator);
-        result = _(list).invertBy<{a: number;}>({a: 1});
-
-        result = _(dictionary).invertBy();
-        result = _(dictionary).invertBy('a');
-        result = _(dictionary).invertBy(dictionaryIterator);
-        result = _(dictionary).invertBy<{a: number;}>({a: 1});
-
-        result = _(numericDictionary).invertBy();
-        result = _(numericDictionary).invertBy('a');
-        result = _(numericDictionary).invertBy(numericDictionaryIterator);
-        result = _(numericDictionary).invertBy<{a: number;}>({a: 1});
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<_.Dictionary<string[]>>;
-
-        result = _('foo').chain().invertBy();
-        result = _('foo').chain().invertBy(stringIterator);
-
-        result = _(array).chain().invertBy();
-        result = _(array).chain().invertBy('a');
-        result = _(array).chain().invertBy(arrayIterator);
-        result = _(array).chain().invertBy({a: 1});
-
-        result = _(list).chain().invertBy();
-        result = _(list).chain().invertBy('a');
-        result = _(list).chain().invertBy(listIterator);
-        result = _(list).chain().invertBy<{a: number;}>({a: 1});
-
-        result = _(dictionary).chain().invertBy();
-        result = _(dictionary).chain().invertBy('a');
-        result = _(dictionary).chain().invertBy(dictionaryIterator);
-        result = _(dictionary).chain().invertBy<{a: number;}>({a: 1});
-
-        result = _(numericDictionary).chain().invertBy();
-        result = _(numericDictionary).chain().invertBy('a');
-        result = _(numericDictionary).chain().invertBy(numericDictionaryIterator);
-        result = _(numericDictionary).chain().invertBy<{a: number;}>({a: 1});
-    }
+    fp.invertBy(stringIterator, "foo"); // $ExpectType Dictionary<string[]>
+    fp.invertBy(stringIterator)("foo"); // $ExpectType Dictionary<string[]>
+    fp.invertBy(valueIterator)(list); // $ExpectType Dictionary<string[]>
+    fp.invertBy("a")(list); // $ExpectType Dictionary<string[]>
+    fp.invertBy({ a: 1 })(list); // $ExpectType Dictionary<string[]>
+    fp.invertBy(valueIterator)(dictionary); // $ExpectType Dictionary<string[]>
+    fp.invertBy("a")(dictionary); // $ExpectType Dictionary<string[]>
+    fp.invertBy({ a: 1 })(dictionary); // $ExpectType Dictionary<string[]>
+    fp.invertBy(valueIterator)(numericDictionary); // $ExpectType Dictionary<string[]>
+    fp.invertBy("a")(numericDictionary); // $ExpectType Dictionary<string[]>
+    fp.invertBy({ a: 1 })(numericDictionary); // $ExpectType Dictionary<string[]>
 }
 
 // _.keys
-namespace TestKeys {
-    let object: _.Dictionary<any> | null | undefined = anything;
-
-    {
-        let result: string[];
-
-        result = _.keys(object);
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<string>;
-
-        result = _(object).keys();
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<string>;
-
-        result = _(object).chain().keys();
-    }
-}
-
 // _.keysIn
-namespace TestKeysIn {
-    let object: _.Dictionary<any> | null | undefined = anything;
+{
+    const object: AbcObject | null | undefined = anything;
 
-    {
-        let result: string[];
+    _.keys(object); // $ExpectType string[]
+    _(object).keys(); // $ExpectType LoDashImplicitWrapper<string[]>
+    _.chain(object).keys(); // $ExpectType LoDashExplicitWrapper<string[]>
+    fp.keys({}); // $ExpectType string[]
 
-        result = _.keysIn(object);
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<string>;
-
-        result = _(object).keysIn();
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<string>;
-
-        result = _(object).chain().keysIn();
-    }
+    _.keysIn(object); // $ExpectType string[]
+    _(object).keysIn(); // $ExpectType LoDashImplicitWrapper<string[]>
+    _.chain(object).keysIn(); // $ExpectType LoDashExplicitWrapper<string[]>
+    fp.keysIn({}); // $ExpectType string[]
 }
 
 // _.mapKeys
-namespace TestMapKeys {
-    let array: AbcObject[] | null | undefined = [] as any;
-    let list: _.List<AbcObject>| null | undefined = [] as any;
-    let dictionary: _.Dictionary<AbcObject> | null | undefined = anything;
-    let numericDictionary: _.NumericDictionary<AbcObject> | null | undefined = anything;
-    let abcObject: AbcObject = anything;
+{
+    const list: _.List<AbcObject>| null | undefined = [] as any;
+    const dictionary: _.Dictionary<AbcObject> | null | undefined = anything;
+    const numericDictionary: _.NumericDictionary<AbcObject> | null | undefined = anything;
+    const abcObject: AbcObject = anything;
 
-    let listIterator = (value: AbcObject, index: number, collection: _.List<AbcObject>) => "";
-    let dictionaryIterator = (value: AbcObject, key: string, collection: _.Dictionary<AbcObject>) => "";
-    let numericDictionaryIterator = (value: AbcObject, key: string, collection: _.NumericDictionary<AbcObject>) => "";
-    let abcObjectIterator = (value: AbcObject[keyof AbcObject], key: string, collection: AbcObject) => "";
+    const listIterator = (value: AbcObject, index: number, collection: _.List<AbcObject>) => "";
+    const dictionaryIterator = (value: AbcObject, key: string, collection: _.Dictionary<AbcObject>) => "";
+    const numericDictionaryIterator = (value: AbcObject, key: string, collection: _.NumericDictionary<AbcObject>) => "";
+    const abcObjectIterator = (value: AbcObject[keyof AbcObject], key: string, collection: AbcObject) => "";
 
-    {
-        _.mapKeys(array); // $ExpectType Dictionary<AbcObject>
-        _.mapKeys(array, listIterator); // $ExpectType Dictionary<AbcObject>
-        _.mapKeys(array, ''); // $ExpectType Dictionary<AbcObject>
-        _.mapKeys(array, {}); // $ExpectType Dictionary<AbcObject>
+    _.mapKeys(list); // $ExpectType Dictionary<AbcObject>
+    _.mapKeys(list, listIterator); // $ExpectType Dictionary<AbcObject>
+    _.mapKeys(list, ""); // $ExpectType Dictionary<AbcObject>
+    _.mapKeys(list, {}); // $ExpectType Dictionary<AbcObject>
 
-        _.mapKeys(list); // $ExpectType Dictionary<AbcObject>
-        _.mapKeys(list, listIterator); // $ExpectType Dictionary<AbcObject>
-        _.mapKeys(list, ''); // $ExpectType Dictionary<AbcObject>
-        _.mapKeys(list, {}); // $ExpectType Dictionary<AbcObject>
+    _.mapKeys(dictionary); // $ExpectType Dictionary<AbcObject>
+    _.mapKeys(dictionary, dictionaryIterator); // $ExpectType Dictionary<AbcObject>
+    _.mapKeys(dictionary, ""); // $ExpectType Dictionary<AbcObject>
+    _.mapKeys(dictionary, {}); // $ExpectType Dictionary<AbcObject>
 
-        _.mapKeys(dictionary); // $ExpectType Dictionary<AbcObject>
-        _.mapKeys(dictionary, dictionaryIterator); // $ExpectType Dictionary<AbcObject>
-        _.mapKeys(dictionary, ''); // $ExpectType Dictionary<AbcObject>
-        _.mapKeys(dictionary, {}); // $ExpectType Dictionary<AbcObject>
+    /* Broken in TS 2.4
+    _.mapKeys(numericDictionary); // Dictionary<AbcObject>
+    _.mapKeys(numericDictionary, numericDictionaryIterator); // Dictionary<AbcObject>
+    _.mapKeys(numericDictionary, ""); // Dictionary<AbcObject>
+    _.mapKeys(numericDictionary, {}); // Dictionary<AbcObject>
+    */
 
-        /* Broken in TS 2.4
-        _.mapKeys(numericDictionary); // Dictionary<AbcObject>
-        _.mapKeys(numericDictionary, numericDictionaryIterator); // Dictionary<AbcObject>
-        _.mapKeys(numericDictionary, ''); // Dictionary<AbcObject>
-        _.mapKeys(numericDictionary, {}); // Dictionary<AbcObject>
-        */
-    }
+    _.mapKeys(abcObject); // $ExpectType Dictionary<string | number | boolean>
+    _.mapKeys(abcObject, abcObjectIterator); // $ExpectType Dictionary<string | number | boolean>
+    _.mapKeys(abcObject, ""); // $ExpectType Dictionary<string | number | boolean>
 
-    {
-        _.mapKeys(abcObject); // $ExpectType Dictionary<string | number | boolean>
-        _.mapKeys(abcObject, abcObjectIterator); // $ExpectType Dictionary<string | number | boolean>
-        _.mapKeys(abcObject, ''); // $ExpectType Dictionary<string | number | boolean>
-    }
+    _(list).mapKeys(); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+    _(list).mapKeys(listIterator); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+    _(list).mapKeys(""); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+    _(list).mapKeys({}); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
 
-    {
-        _(array).mapKeys(); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
-        _(array).mapKeys(listIterator); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
-        _(array).mapKeys(''); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
-        _(array).mapKeys({}); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+    _(dictionary).mapKeys(); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+    _(dictionary).mapKeys(dictionaryIterator); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+    _(dictionary).mapKeys(""); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+    _(dictionary).mapKeys({}); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
 
-        _(list).mapKeys(); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
-        _(list).mapKeys(listIterator); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
-        _(list).mapKeys(''); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
-        _(list).mapKeys({}); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+    /* Broken in TS 2.4
+    _(numericDictionary).mapKeys(); // LoDashImplicitWrapper<Dictionary<AbcObject>>
+    _(numericDictionary).mapKeys(numericDictionaryIterator); // LoDashImplicitWrapper<Dictionary<AbcObject>>
+    _(numericDictionary).mapKeys(""); // LoDashImplicitWrapper<Dictionary<AbcObject>>
+    _(numericDictionary).mapKeys({}); // LoDashImplicitWrapper<Dictionary<AbcObject>>
+    */
 
-        _(dictionary).mapKeys(); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
-        _(dictionary).mapKeys(dictionaryIterator); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
-        _(dictionary).mapKeys(''); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
-        _(dictionary).mapKeys({}); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+    _(abcObject).mapKeys(); // $ExpectType LoDashImplicitWrapper<Dictionary<string | number | boolean>>
+    _(abcObject).mapKeys(abcObjectIterator); // $ExpectType LoDashImplicitWrapper<Dictionary<string | number | boolean>>
+    _(abcObject).mapKeys(""); // $ExpectType LoDashImplicitWrapper<Dictionary<string | number | boolean>>
 
-        /* Broken in TS 2.4
-        _(numericDictionary).mapKeys(); // LoDashImplicitWrapper<Dictionary<AbcObject>>
-        _(numericDictionary).mapKeys(numericDictionaryIterator); // LoDashImplicitWrapper<Dictionary<AbcObject>>
-        _(numericDictionary).mapKeys(''); // LoDashImplicitWrapper<Dictionary<AbcObject>>
-        _(numericDictionary).mapKeys({}); // LoDashImplicitWrapper<Dictionary<AbcObject>>
-        */
-    }
+    _.chain(list).mapKeys(); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+    _.chain(list).mapKeys(listIterator); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+    _.chain(list).mapKeys(""); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+    _.chain(list).mapKeys({}); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
 
-    {
-        _(abcObject).mapKeys(); // $ExpectType LoDashImplicitWrapper<Dictionary<string | number | boolean>>
-        _(abcObject).mapKeys(abcObjectIterator); // $ExpectType LoDashImplicitWrapper<Dictionary<string | number | boolean>>
-        _(abcObject).mapKeys(''); // $ExpectType LoDashImplicitWrapper<Dictionary<string | number | boolean>>
-    }
+    _.chain(dictionary).mapKeys(); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+    _.chain(dictionary).mapKeys(dictionaryIterator); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+    _.chain(dictionary).mapKeys(""); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+    _.chain(dictionary).mapKeys({}); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
 
-    {
-        _(array).chain().mapKeys(); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
-        _(array).chain().mapKeys(listIterator); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
-        _(array).chain().mapKeys(''); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
-        _(array).chain().mapKeys({}); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+    /* Broken in TS 2.4
+    _.chain(numericDictionary).mapKeys(); // LoDashExplicitWrapper<Dictionary<AbcObject>>
+    _.chain(numericDictionary).mapKeys(numericDictionaryIterator); // LoDashExplicitWrapper<Dictionary<AbcObject>>
+    _.chain(numericDictionary).mapKeys(""); // LoDashExplicitWrapper<Dictionary<AbcObject>>
+    _.chain(numericDictionary).mapKeys({}); // LoDashExplicitWrapper<Dictionary<AbcObject>>
+    */
 
-        _(list).chain().mapKeys(); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
-        _(list).chain().mapKeys(listIterator); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
-        _(list).chain().mapKeys(''); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
-        _(list).chain().mapKeys({}); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+    _.chain(abcObject).mapKeys(); // $ExpectType LoDashExplicitWrapper<Dictionary<string | number | boolean>>
+    _.chain(abcObject).mapKeys(abcObjectIterator); // $ExpectType LoDashExplicitWrapper<Dictionary<string | number | boolean>>
+    _.chain(abcObject).mapKeys(""); // $ExpectType LoDashExplicitWrapper<Dictionary<string | number | boolean>>
 
-        _(dictionary).chain().mapKeys(); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
-        _(dictionary).chain().mapKeys(dictionaryIterator); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
-        _(dictionary).chain().mapKeys(''); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
-        _(dictionary).chain().mapKeys({}); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
-
-        /* Broken in TS 2.4
-        _(numericDictionary).chain().mapKeys(); // LoDashExplicitWrapper<Dictionary<AbcObject>>
-        _(numericDictionary).chain().mapKeys(numericDictionaryIterator); // LoDashExplicitWrapper<Dictionary<AbcObject>>
-        _(numericDictionary).chain().mapKeys(''); // LoDashExplicitWrapper<Dictionary<AbcObject>>
-        _(numericDictionary).chain().mapKeys({}); // LoDashExplicitWrapper<Dictionary<AbcObject>>
-        */
-    }
-
-    {
-        _(abcObject).chain().mapKeys(); // $ExpectType LoDashExplicitWrapper<Dictionary<string | number | boolean>>
-        _(abcObject).chain().mapKeys(abcObjectIterator); // $ExpectType LoDashExplicitWrapper<Dictionary<string | number | boolean>>
-        _(abcObject).chain().mapKeys(''); // $ExpectType LoDashExplicitWrapper<Dictionary<string | number | boolean>>
-    }
+    const indexIterator = (index: number) => index + 1;
+    const keyIterator = (key: string) => "_" + key;
+    fp.mapKeys(indexIterator, list); // $ExpectType Dictionary<AbcObject>
+    fp.mapKeys(keyIterator)(dictionary); // $ExpectType Dictionary<AbcObject>
+    fp.mapKeys(keyIterator)(abcObject); // $ExpectType Dictionary<string | number | boolean>
 }
 
 // _.mapValues
@@ -11718,956 +5597,773 @@ namespace TestMapKeys {
     const abcObjectOrNull: AbcObject | null = anything;
     const key: string = anything;
 
-    {
-        // $ExpectType NumericDictionary<AbcObject>
-        _.mapValues("foo", (char, index, str) => {
-            char; // $ExpectType string
-            index; // $ExpectType number
-            str; // $ExpectType string
-            return abcObject;
-        });
+    // $ExpectType NumericDictionary<AbcObject>
+    _.mapValues("foo", (char, index, str) => {
+        char; // $ExpectType string
+        index; // $ExpectType number
+        str; // $ExpectType string
+        return abcObject;
+    });
 
-        // $ExpectType Dictionary<string>
-        _.mapValues(dictionary, (value, key, collection) => {
-            value;  // $ExpectType AbcObject
-            key; // $ExpectType string
-            collection; // $ExpectType Dictionary<AbcObject>
-            return "";
-        });
+    // $ExpectType Dictionary<string>
+    _.mapValues(dictionary, (value, key, collection) => {
+        value;  // $ExpectType AbcObject
+        key; // $ExpectType string
+        collection; // $ExpectType Dictionary<AbcObject>
+        return "";
+    });
 
-        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
-        // $ExpectType Dictionary<string>
-        _.mapValues(numericDictionary, (value, key, collection) => {
-            value;  // $ExpectType AbcObject
-            key; // $ExpectType string
-            collection; // $ExpectType Dictionary<AbcObject>
-            return "";
-        });
+    // Can"t really support NumericDictionary fully, but it at least gets treated like a Dictionary
+    // $ExpectType Dictionary<string>
+    _.mapValues(numericDictionary, (value, key, collection) => {
+        value;  // $ExpectType AbcObject
+        key; // $ExpectType string
+        collection; // $ExpectType Dictionary<AbcObject>
+        return "";
+    });
 
-        // $ExpectType { a: string; b: string; c: string; }
-        _.mapValues(abcObject, (value, key, collection) => {
-            value;  // $ExpectType string | number | boolean
-            key; // $ExpectType string
-            collection; // $ExpectType AbcObject
-            return "";
-        });
+    // $ExpectType { a: string; b: string; c: string; }
+    _.mapValues(abcObject, (value, key, collection) => {
+        value;  // $ExpectType string | number | boolean
+        key; // $ExpectType string
+        collection; // $ExpectType AbcObject
+        return "";
+    });
 
-        _.mapValues(dictionary, {}); // $ExpectType Dictionary<boolean>
-        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
-        _.mapValues(numericDictionary, {}); // $ExpectType Dictionary<boolean>
-        _.mapValues(abcObject, {}); // $ExpectType { a: boolean; b: boolean; c: boolean; }
+    _.mapValues(dictionary, {}); // $ExpectType Dictionary<boolean>
+    // Can"t really support NumericDictionary fully, but it at least gets treated like a Dictionary
+    _.mapValues(numericDictionary, {}); // $ExpectType Dictionary<boolean>
+    _.mapValues(abcObject, {}); // $ExpectType { a: boolean; b: boolean; c: boolean; }
 
-        _.mapValues(dictionary, "a"); // $ExpectType Dictionary<number>
-        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
-        _.mapValues(numericDictionary, "a"); // $ExpectType Dictionary<number>
+    _.mapValues(dictionary, "a"); // $ExpectType Dictionary<number>
+    // Can"t really support NumericDictionary fully, but it at least gets treated like a Dictionary
+    _.mapValues(numericDictionary, "a"); // $ExpectType Dictionary<number>
 
-        _.mapValues(abcObject, key); // $ExpectType { a: any; b: any; c: any; }
-        _.mapValues(dictionary, key); // $ExpectType Dictionary<any>
-        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
-        _.mapValues(numericDictionary, key); // $ExpectType Dictionary<any>
+    _.mapValues(abcObject, key); // $ExpectType { a: any; b: any; c: any; }
+    _.mapValues(dictionary, key); // $ExpectType Dictionary<any>
+    // Can"t really support NumericDictionary fully, but it at least gets treated like a Dictionary
+    _.mapValues(numericDictionary, key); // $ExpectType Dictionary<any>
 
-        _.mapValues("a"); // $ExpectType NumericDictionary<string>
-        _.mapValues(dictionary); // $ExpectType Dictionary<AbcObject>
-        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
-        _.mapValues(numericDictionary); // $ExpectType Dictionary<AbcObject>
-        _.mapValues(abcObject); // $ExpectType AbcObject
-        _.mapValues(abcObjectOrNull); // $ExpectType Partial<AbcObject>
-    }
+    _.mapValues("a"); // $ExpectType NumericDictionary<string>
+    _.mapValues(dictionary); // $ExpectType Dictionary<AbcObject>
+    // Can"t really support NumericDictionary fully, but it at least gets treated like a Dictionary
+    _.mapValues(numericDictionary); // $ExpectType Dictionary<AbcObject>
+    _.mapValues(abcObject); // $ExpectType AbcObject
+    _.mapValues(abcObjectOrNull); // $ExpectType Partial<AbcObject>
 
-    {
-        // $ExpectType LoDashImplicitWrapper<NumericDictionary<AbcObject>>
-        _("foo").mapValues((char, index, str) => {
-            char; // $ExpectType string
-            index; // $ExpectType number
-            str; // $ExpectType string
-            return abcObject;
-        });
+    // $ExpectType LoDashImplicitWrapper<NumericDictionary<AbcObject>>
+    _("foo").mapValues((char, index, str) => {
+        char; // $ExpectType string
+        index; // $ExpectType number
+        str; // $ExpectType string
+        return abcObject;
+    });
 
-        // $ExpectType LoDashImplicitWrapper<Dictionary<string>>
-        _(dictionary).mapValues((value, key, collection) => {
-            value;  // $ExpectType AbcObject
-            key; // $ExpectType string
-            collection; // $ExpectType Dictionary<AbcObject>
-            return "";
-        });
+    // $ExpectType LoDashImplicitWrapper<Dictionary<string>>
+    _(dictionary).mapValues((value, key, collection) => {
+        value;  // $ExpectType AbcObject
+        key; // $ExpectType string
+        collection; // $ExpectType Dictionary<AbcObject>
+        return "";
+    });
 
-        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
-        // $ExpectType LoDashImplicitWrapper<Dictionary<string>>
-        _(numericDictionary).mapValues((value, key, collection) => {
-            value;  // $ExpectType AbcObject
-            key; // $ExpectType string
-            collection; // $ExpectType Dictionary<AbcObject>
-            return "";
-        });
+    // Can"t really support NumericDictionary fully, but it at least gets treated like a Dictionary
+    // $ExpectType LoDashImplicitWrapper<Dictionary<string>>
+    _(numericDictionary).mapValues((value, key, collection) => {
+        value;  // $ExpectType AbcObject
+        key; // $ExpectType string
+        collection; // $ExpectType Dictionary<AbcObject>
+        return "";
+    });
 
-        // $ExpectType LoDashImplicitWrapper<{ a: string; b: string; c: string; }>
-        _(abcObject).mapValues((value, key, collection) => {
-            value;  // $ExpectType string | number | boolean
-            key; // $ExpectType string
-            collection; // $ExpectType AbcObject
-            return "";
-        });
+    // $ExpectType LoDashImplicitWrapper<{ a: string; b: string; c: string; }>
+    _(abcObject).mapValues((value, key, collection) => {
+        value;  // $ExpectType string | number | boolean
+        key; // $ExpectType string
+        collection; // $ExpectType AbcObject
+        return "";
+    });
 
-        _(dictionary).mapValues({}); // $ExpectType LoDashImplicitWrapper<Dictionary<boolean>>
-        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
-        _(numericDictionary).mapValues({}); // $ExpectType LoDashImplicitWrapper<Dictionary<boolean>>
-        _(abcObject).mapValues({}); // $ExpectType LoDashImplicitWrapper<{ a: boolean; b: boolean; c: boolean; }>
+    _(dictionary).mapValues({}); // $ExpectType LoDashImplicitWrapper<Dictionary<boolean>>
+    // Can"t really support NumericDictionary fully, but it at least gets treated like a Dictionary
+    _(numericDictionary).mapValues({}); // $ExpectType LoDashImplicitWrapper<Dictionary<boolean>>
+    _(abcObject).mapValues({}); // $ExpectType LoDashImplicitWrapper<{ a: boolean; b: boolean; c: boolean; }>
 
-        _(dictionary).mapValues("a"); // $ExpectType LoDashImplicitWrapper<Dictionary<number>>
-        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
-        _(numericDictionary).mapValues("a"); // $ExpectType LoDashImplicitWrapper<Dictionary<number>>
+    _(dictionary).mapValues("a"); // $ExpectType LoDashImplicitWrapper<Dictionary<number>>
+    // Can"t really support NumericDictionary fully, but it at least gets treated like a Dictionary
+    _(numericDictionary).mapValues("a"); // $ExpectType LoDashImplicitWrapper<Dictionary<number>>
 
-        _(abcObject).mapValues(key); // $ExpectType LoDashImplicitWrapper<{ a: any; b: any; c: any; }>
-        _(dictionary).mapValues(key); // $ExpectType LoDashImplicitWrapper<Dictionary<any>>
-        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
-        _(numericDictionary).mapValues(key); // $ExpectType LoDashImplicitWrapper<Dictionary<any>>
+    _(abcObject).mapValues(key); // $ExpectType LoDashImplicitWrapper<{ a: any; b: any; c: any; }>
+    _(dictionary).mapValues(key); // $ExpectType LoDashImplicitWrapper<Dictionary<any>>
+    // Can"t really support NumericDictionary fully, but it at least gets treated like a Dictionary
+    _(numericDictionary).mapValues(key); // $ExpectType LoDashImplicitWrapper<Dictionary<any>>
 
-        _("a").mapValues(); // $ExpectType LoDashImplicitWrapper<NumericDictionary<string>>
-        _(dictionary).mapValues(); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
-        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
-        _(numericDictionary).mapValues(); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
-        _(abcObject).mapValues(); // $ExpectType LoDashImplicitWrapper<AbcObject>
-        _(abcObjectOrNull).mapValues(); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
-    }
+    _("a").mapValues(); // $ExpectType LoDashImplicitWrapper<NumericDictionary<string>>
+    _(dictionary).mapValues(); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+    // Can"t really support NumericDictionary fully, but it at least gets treated like a Dictionary
+    _(numericDictionary).mapValues(); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+    _(abcObject).mapValues(); // $ExpectType LoDashImplicitWrapper<AbcObject>
+    _(abcObjectOrNull).mapValues(); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
 
-    {
-        // $ExpectType LoDashExplicitWrapper<NumericDictionary<AbcObject>>
-        _("foo").chain().mapValues((char, index, str) => {
-            char; // $ExpectType string
-            index; // $ExpectType number
-            str; // $ExpectType string
-            return abcObject;
-        });
+    // $ExpectType LoDashExplicitWrapper<NumericDictionary<AbcObject>>
+    _.chain("foo").mapValues((char, index, str) => {
+        char; // $ExpectType string
+        index; // $ExpectType number
+        str; // $ExpectType string
+        return abcObject;
+    });
 
-        // $ExpectType LoDashExplicitWrapper<Dictionary<string>>
-        _(dictionary).chain().mapValues((value, key, collection) => {
-            value;  // $ExpectType AbcObject
-            key; // $ExpectType string
-            collection; // $ExpectType Dictionary<AbcObject>
-            return "";
-        });
+    // $ExpectType LoDashExplicitWrapper<Dictionary<string>>
+    _.chain(dictionary).mapValues((value, key, collection) => {
+        value;  // $ExpectType AbcObject
+        key; // $ExpectType string
+        collection; // $ExpectType Dictionary<AbcObject>
+        return "";
+    });
 
-        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
-        // $ExpectType LoDashExplicitWrapper<Dictionary<string>>
-        _(numericDictionary).chain().mapValues((value, key, collection) => {
-            value;  // $ExpectType AbcObject
-            key; // $ExpectType string
-            collection; // $ExpectType Dictionary<AbcObject>
-            return "";
-        });
+    // Can"t really support NumericDictionary fully, but it at least gets treated like a Dictionary
+    // $ExpectType LoDashExplicitWrapper<Dictionary<string>>
+    _.chain(numericDictionary).mapValues((value, key, collection) => {
+        value;  // $ExpectType AbcObject
+        key; // $ExpectType string
+        collection; // $ExpectType Dictionary<AbcObject>
+        return "";
+    });
 
-        // $ExpectType LoDashExplicitWrapper<{ a: string; b: string; c: string; }>
-        _(abcObject).chain().mapValues((value, key, collection) => {
-            value;  // $ExpectType string | number | boolean
-            key; // $ExpectType string
-            collection; // $ExpectType AbcObject
-            return "";
-        });
+    // $ExpectType LoDashExplicitWrapper<{ a: string; b: string; c: string; }>
+    _.chain(abcObject).mapValues((value, key, collection) => {
+        value;  // $ExpectType string | number | boolean
+        key; // $ExpectType string
+        collection; // $ExpectType AbcObject
+        return "";
+    });
 
-        _(dictionary).chain().mapValues({}); // $ExpectType LoDashExplicitWrapper<Dictionary<boolean>>
-        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
-        _(numericDictionary).chain().mapValues({}); // $ExpectType LoDashExplicitWrapper<Dictionary<boolean>>
-        _(abcObject).chain().mapValues({}); // $ExpectType LoDashExplicitWrapper<{ a: boolean; b: boolean; c: boolean; }>
+    _.chain(dictionary).mapValues({}); // $ExpectType LoDashExplicitWrapper<Dictionary<boolean>>
+    // Can"t really support NumericDictionary fully, but it at least gets treated like a Dictionary
+    _.chain(numericDictionary).mapValues({}); // $ExpectType LoDashExplicitWrapper<Dictionary<boolean>>
+    _.chain(abcObject).mapValues({}); // $ExpectType LoDashExplicitWrapper<{ a: boolean; b: boolean; c: boolean; }>
 
-        _(dictionary).chain().mapValues("a"); // $ExpectType LoDashExplicitWrapper<Dictionary<number>>
-        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
-        _(numericDictionary).chain().mapValues("a"); // $ExpectType LoDashExplicitWrapper<Dictionary<number>>
+    _.chain(dictionary).mapValues("a"); // $ExpectType LoDashExplicitWrapper<Dictionary<number>>
+    // Can"t really support NumericDictionary fully, but it at least gets treated like a Dictionary
+    _.chain(numericDictionary).mapValues("a"); // $ExpectType LoDashExplicitWrapper<Dictionary<number>>
 
-        _(abcObject).chain().mapValues(key); // $ExpectType LoDashExplicitWrapper<{ a: any; b: any; c: any; }>
-        _(dictionary).chain().mapValues(key); // $ExpectType LoDashExplicitWrapper<Dictionary<any>>
-        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
-        _(numericDictionary).chain().mapValues(key); // $ExpectType LoDashExplicitWrapper<Dictionary<any>>
+    _.chain(abcObject).mapValues(key); // $ExpectType LoDashExplicitWrapper<{ a: any; b: any; c: any; }>
+    _.chain(dictionary).mapValues(key); // $ExpectType LoDashExplicitWrapper<Dictionary<any>>
+    // Can"t really support NumericDictionary fully, but it at least gets treated like a Dictionary
+    _.chain(numericDictionary).mapValues(key); // $ExpectType LoDashExplicitWrapper<Dictionary<any>>
 
-        _("a").chain().mapValues(); // $ExpectType LoDashExplicitWrapper<NumericDictionary<string>>
-        _(dictionary).chain().mapValues(); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
-        // Can't really support NumericDictionary fully, but it at least gets treated like a Dictionary
-        _(numericDictionary).chain().mapValues(); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+    _.chain("a").mapValues(); // $ExpectType LoDashExplicitWrapper<NumericDictionary<string>>
+    _.chain(dictionary).mapValues(); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+    // Can"t really support NumericDictionary fully, but it at least gets treated like a Dictionary
+    _.chain(numericDictionary).mapValues(); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
 
-        _(abcObject).chain().mapValues(); // $ExpectType LoDashExplicitWrapper<AbcObject>
-        _(abcObjectOrNull).chain().mapValues(); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
-    }
-}
+    _.chain(abcObject).mapValues(); // $ExpectType LoDashExplicitWrapper<AbcObject>
+    _.chain(abcObjectOrNull).mapValues(); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
 
-// _.merge
-namespace TestMerge {
-    type InitialValue = { a : number };
-    type MergingValue = { b : string };
-
-    const initialValue  = { a : 1 };
-    const mergingValue  = { b : "hi" };
-
-    type ExpectedResult = { a: number, b: string };
-    let result: ExpectedResult;
-
-    // Test for basic merging
-
-    result = _.merge(initialValue, mergingValue);
-
-    result = _.merge(initialValue, {}, mergingValue);
-
-    result = _.merge(initialValue, {}, {}, mergingValue);
-
-    result = _.merge(initialValue, {}, {}, {}, mergingValue);
-
-    // Once we get to the varargs version, you have to specify the result explicitly
-    result = _.merge(initialValue, {}, {}, {}, {}, mergingValue);
-
-    type ComplicatedExpectedType = { a: number, b: string, c: {}, d: number[], e: boolean };
-
-    let complicatedResult: ComplicatedExpectedType = _.merge({ a: 1 },
-                                                             { b: "string" },
-                                                             { c: {} },
-                                                             { d: [1] },
-                                                             { e: true });
-    // Test for type overriding
-
-    type ExpectedTypeAfterOverriding = { a: boolean };
-
-    let overriddenResult: ExpectedTypeAfterOverriding = _.merge({ a: 1 },
-                                                                { a: "string" },
-                                                                { a: {} },
-                                                                { a: [1] },
-                                                                { a: true });
-
-    // Tests for basic chaining with merge
-
-    result = _(initialValue).merge(mergingValue).value();
-
-    result = _(initialValue).merge({}, mergingValue).value();
-
-    result = _(initialValue).merge({}, {}, mergingValue).value();
-
-    result = _(initialValue).merge({}, {}, {}, mergingValue).value();
-
-    // Once we get to the varargs version, you have to specify the result explicitly
-    result = _(initialValue).merge({}, {}, {}, {}, mergingValue).value();
-
-    // Test complex multiple combinations with chaining
-
-    complicatedResult = _({ a: 1 }).merge({ b: "string" },
-                                                                       { c: {} },
-                                                                       { d: [1] },
-                                                                       { e: true }).value();
-
-    // Test for type overriding with chaining
-
-    overriddenResult = _({ a: 1 }).merge({ a: "string" },
-                                                                          { a: {} },
-                                                                          { a: [1] },
-                                                                          { a: true }).value();
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<ExpectedResult>;
-        // result = _(initialValue).chain().merge(mergingValue);
-        // result = _(initialValue).chain().merge({}, mergingValue);
-        // result = _(initialValue).chain().merge({}, {}, mergingValue);
-        // result = _(initialValue).chain().merge({}, {}, {}, mergingValue);
-        // result = _(initialValue).chain().merge<ExpectedResult>({}, {}, {}, {}, mergingValue);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<ComplicatedExpectedType>;
-
-        //result = _({ a: 1 }).chain().merge({ b: "string" }, { c: {} }, { d: [1] }, { e: true });
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<ExpectedTypeAfterOverriding>;
-
-        //result = _({ a: 1 }).chain().merge({ a: "string" }, { a: {} }, { a: [1] }, { a: true });
-    }
-}
-
-// _.mergeWith
-namespace TestMergeWith {
-    type InitialValue = { a : number };
-    type MergingValue = { b : string };
-
-    const initialValue  = { a : 1 };
-    const mergingValue  = { b : "hi" };
-
-    type ExpectedResult = { a: number, b: string };
-    let result: ExpectedResult;
-
-    let customizer: (value: any, srcValue: any, key: string, object: InitialValue, source: MergingValue) => any = (value: any, srcValue: any, key: string, object: InitialValue, source: MergingValue) => 1;
-
-    // Test for basic merging
-    result = _.mergeWith(initialValue, mergingValue, customizer);
-    result = _.mergeWith(initialValue, {}, mergingValue, customizer);
-    result = _.mergeWith(initialValue, {}, {}, mergingValue, customizer);
-    result = _.mergeWith(initialValue, {}, {}, {}, mergingValue, customizer);
-
-    // Once we get to the varargs version, you have to specify the result explicitl
-    result = _.mergeWith(initialValue, {}, {}, {}, {}, mergingValue, customizer);
-
-    // Tests for basic chaining with mergeWith
-    result = _(initialValue).mergeWith(mergingValue, customizer).value();
-    result = _(initialValue).mergeWith({}, mergingValue, customizer).value();
-    result = _(initialValue).mergeWith({}, {}, mergingValue, customizer).value();
-    result = _(initialValue).mergeWith({}, {}, {}, mergingValue, customizer).value();
-    result = _(initialValue).mergeWith({}, {}, {}, {}, mergingValue, customizer).value();
+    const valueIterator = (value: AbcObject) => "";
+    fp.mapValues(valueIterator)(dictionary); // $ExpectType Dictionary<string>
+    fp.mapValues("a", dictionary); // $ExpectType Dictionary<number>
+    fp.mapValues(valueIterator)(numericDictionary); // $ExpectType Dictionary<string>
+    fp.mapValues({ a: 42 })(numericDictionary); // $ExpectType Dictionary<boolean>
+    fp.mapValues(value => "", abcObjectOrNull); // $ExpectType { a: string; b: string; c: string; }
 }
 
 // _.omit
-namespace TestOmit {
-    let obj: AbcObject | null | undefined = anything;
-    let dictionary:_.Dictionary<AbcObject> = anything;
-    let numericDictionary:_.NumericDictionary<AbcObject> = anything;
-    let dictionaryWithNull:_.Dictionary<AbcObject | null> = anything;
-    let numericDictionaryWithNull:_.NumericDictionary<AbcObject | null> = anything;
-    let dictionaryWithUndefined:_.Dictionary<AbcObject | undefined> = anything;
-    let numericDictionaryWithUndefined:_.NumericDictionary<AbcObject | undefined> = anything;
-    let dictionaryWithNullAndUndefined:_.Dictionary<AbcObject | null | undefined> = anything;
-    let numericDictionaryWithNullAndUndefined:_.NumericDictionary<AbcObject | null | undefined> = anything;
+{
+    const obj: AbcObject | null | undefined = anything;
+    const dictionary: _.Dictionary<AbcObject> = anything;
+    const numericDictionary: _.NumericDictionary<AbcObject> = anything;
 
-    {
-        _.omit(obj, 'a'); // $ExpectType Partial<AbcObject>
-        _.omit(obj, 0, 'a'); // $ExpectType Partial<AbcObject>
-        _.omit(obj, ['b', 1], 0, 'a'); // $ExpectType Partial<AbcObject>
-        _.omit(dictionary, 'a'); // $ExpectType Dictionary<AbcObject>
-        _.omit(numericDictionary, 'a');  // $ExpectType NumericDictionary<AbcObject>
-        _.omit(dictionaryWithNull, 'a'); // $ExpectType Dictionary<AbcObject | null>
-        _.omit(numericDictionaryWithNull, 'a');  // $ExpectType NumericDictionary<AbcObject | null>
-        _.omit(dictionaryWithUndefined, 'a'); // $ExpectType Dictionary<AbcObject | undefined>
-        _.omit(numericDictionaryWithUndefined, 'a');  // $ExpectType NumericDictionary<AbcObject | undefined>
-        _.omit(dictionaryWithNullAndUndefined, 'a'); // $ExpectType Dictionary<AbcObject | null | undefined>
-        _.omit(numericDictionaryWithNullAndUndefined, 'a');  // $ExpectType NumericDictionary<AbcObject | null | undefined>
-    }
+    _.omit(obj, "a"); // $ExpectType Partial<AbcObject>
+    _.omit(obj, ["b", 1], 0, "a"); // $ExpectType Partial<AbcObject>
+    _.omit(dictionary, "a"); // $ExpectType Dictionary<AbcObject>
+    _.omit(numericDictionary, "a");  // $ExpectType NumericDictionary<AbcObject>
 
-    {
-        _(obj).omit('a'); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
-        _(obj).omit(0, 'a'); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
-        _(obj).omit(['b', 1], 0, 'a'); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
-        _(dictionary).omit('a'); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
-        _(numericDictionary).omit('a'); // $ExpectType LoDashImplicitWrapper<NumericDictionary<AbcObject>>
-        _(dictionaryWithNull).omit('a'); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject | null>>
-        _(numericDictionaryWithNull).omit('a'); // $ExpectType LoDashImplicitWrapper<NumericDictionary<AbcObject | null>>
-        _(dictionaryWithUndefined).omit('a'); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject | undefined>>
-        _(numericDictionaryWithUndefined).omit('a'); // $ExpectType LoDashImplicitWrapper<NumericDictionary<AbcObject | undefined>>
-        _(dictionaryWithNullAndUndefined).omit('a'); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject | null | undefined>>
-        _(numericDictionaryWithNullAndUndefined).omit('a'); // $ExpectType LoDashImplicitWrapper<NumericDictionary<AbcObject | null | undefined>>
-    }
+    _(obj).omit("a"); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
+    _(obj).omit(["b", 1], 0, "a"); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
+    _(dictionary).omit("a"); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+    _(numericDictionary).omit("a"); // $ExpectType LoDashImplicitWrapper<NumericDictionary<AbcObject>>
 
-    {
-        _(obj).chain().omit('a'); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
-        _(obj).chain().omit(0, 'a'); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
-        _(obj).chain().omit(['b', 1], 0, 'a'); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
-        _(dictionary).chain().omit('a'); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
-        _(numericDictionary).chain().omit('a'); // $ExpectType LoDashExplicitWrapper<NumericDictionary<AbcObject>>
-        _(dictionaryWithNull).chain().omit('a'); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject | null>>
-        _(numericDictionaryWithNull).chain().omit('a'); // $ExpectType LoDashExplicitWrapper<NumericDictionary<AbcObject | null>>
-        _(dictionaryWithUndefined).chain().omit('a'); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject | undefined>>
-        _(numericDictionaryWithUndefined).chain().omit('a'); // $ExpectType LoDashExplicitWrapper<NumericDictionary<AbcObject | undefined>>
-        _(dictionaryWithNullAndUndefined).chain().omit('a'); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject | null | undefined>>
-        _(numericDictionaryWithNullAndUndefined).chain().omit('a'); // $ExpectType LoDashExplicitWrapper<NumericDictionary<AbcObject | null | undefined>>
-    }
+    _.chain(obj).omit("a"); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
+    _.chain(obj).omit(["b", 1], 0, "a"); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
+    _.chain(dictionary).omit("a"); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+    _.chain(numericDictionary).omit("a"); // $ExpectType LoDashExplicitWrapper<NumericDictionary<AbcObject>>
+
+    fp.omit("a", obj); // $ExpectType Partial<AbcObject>
+    fp.omit("a")(obj); // $ExpectType Partial<AbcObject>
+    fp.omit(["a", "b"])(obj); // $ExpectType Partial<AbcObject>
 }
 
 // _.omitBy
-namespace TestOmitBy {
-    let obj: AbcObject | null | undefined = anything;
-    let predicate = (element: any, key: string) => true;
+{
+    const obj: AbcObject | null | undefined = anything;
+    const predicate = (element: string | number | boolean, key: string) => true;
 
-    {
-        let result: Partial<AbcObject>;
-
-        result = _.omitBy(obj, predicate);
-    }
-
-    {
-        let result: _.LoDashImplicitWrapper<Partial<AbcObject>>;
-
-        result = _(obj).omitBy(predicate);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<Partial<AbcObject>>;
-
-        result = _(obj).chain().omitBy(predicate);
-    }
+    _.omitBy(obj, predicate); // $ExpectType Partial<AbcObject>
+    _(obj).omitBy(predicate); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
+    _.chain(obj).omitBy(predicate); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
+    fp.omitBy(predicate, obj); // $ExpectType Partial<AbcObject>
+    fp.omitBy(predicate)(obj); // $ExpectType Partial<AbcObject>
 }
 
 // _.pick
-namespace TestPick {
+{
     const obj1: AbcObject | null | undefined = anything;
     const obj2: AbcObject = anything;
-    const readonlyArray: string[] = ['a', 'b']; // TODO: Should be ReadonlyArray, but see comment on type Many<T>
-    const literalsArray = ['a' as 'a', 'b' as 'b'];
-    const roLiteralsArray: Array<'a' | 'b'> = literalsArray; // TODO: Should be ReadonlyArray, but see comment on type Many<T>
+    const readonlyArray: string[] = ["a", "b"]; // TODO: Should be ReadonlyArray, but see comment on type Many<T>
+    const literalsArray = ["a" as "a", "b" as "b"];
+    const roLiteralsArray: Array<"a" | "b"> = literalsArray; // TODO: Should be ReadonlyArray, but see comment on type Many<T>
 
-    _.pick(obj1, 'a'); // $ExpectType PartialDeep<AbcObject>
-    _.pick(obj1, 0, 'a'); // $ExpectType PartialDeep<AbcObject>
-    _.pick(obj1, ['b', 1], 0, 'a'); // $ExpectType PartialDeep<AbcObject>
+    _.pick(obj1, "a"); // $ExpectType PartialDeep<AbcObject>
+    _.pick(obj1, 0, "a"); // $ExpectType PartialDeep<AbcObject>
+    _.pick(obj1, ["b", 1], 0, "a"); // $ExpectType PartialDeep<AbcObject>
     _.pick(obj1, readonlyArray); // $ExpectType PartialDeep<AbcObject>
     // Broken in TS 2.4
-    // _.pick(obj2, 'a', 'b'); // Pick<AbcObject, "a" | "b">
+    // _.pick(obj2, "a", "b"); // Pick<AbcObject, "a" | "b">
     _.pick(obj2, literalsArray); // $ExpectType Pick<AbcObject, "a" | "b">
     _.pick(obj2, roLiteralsArray); // $ExpectType Pick<AbcObject, "a" | "b">
 
-    _(obj1).pick('a'); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
-    _(obj1).pick(0, 'a'); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
-    _(obj1).pick(['b', 1], 0, 'a'); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
+    _(obj1).pick("a"); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
+    _(obj1).pick(0, "a"); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
+    _(obj1).pick(["b", 1], 0, "a"); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
     _(obj1).pick(readonlyArray); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
     // Broken in TS 2.4
-    // _(obj2).pick('a', 'b'); // LoDashImplicitWrapper<Pick<AbcObject, "a" | "b">>
+    // _(obj2).pick("a", "b"); // LoDashImplicitWrapper<Pick<AbcObject, "a" | "b">>
     _(obj2).pick(literalsArray); // $ExpectType LoDashImplicitWrapper<Pick<AbcObject, "a" | "b">>
     _(obj2).pick(roLiteralsArray); // $ExpectType LoDashImplicitWrapper<Pick<AbcObject, "a" | "b">>
 
-    _.chain(obj1).pick('a'); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
-    _.chain(obj1).pick(0, 'a'); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
-    _.chain(obj1).pick(['b', 1], 0, 'a'); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
+    _.chain(obj1).pick("a"); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
+    _.chain(obj1).pick(0, "a"); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
+    _.chain(obj1).pick(["b", 1], 0, "a"); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
     _.chain(obj1).pick(readonlyArray); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
     // Broken in TS 2.4
-    // _.chain(obj2).pick('a', 'b'); // LoDashExplicitWrapper<Pick<AbcObject, "a" | "b">>
+    // _.chain(obj2).pick("a", "b"); // LoDashExplicitWrapper<Pick<AbcObject, "a" | "b">>
     _.chain(obj2).pick(literalsArray); // $ExpectType LoDashExplicitWrapper<Pick<AbcObject, "a" | "b">>
     _.chain(obj2).pick(roLiteralsArray); // $ExpectType LoDashExplicitWrapper<Pick<AbcObject, "a" | "b">>
+
+    fp.pick<AbcObject, "a">("a", obj2); // $ExpectType Pick<AbcObject, "a">
+    fp.pick<AbcObject, "a">("a")(obj2); // $ExpectType Pick<AbcObject, "a">
+    fp.pick<AbcObject, "a" | "b">(["a" as "a", "b" as "b"])(obj2); // $ExpectType Pick<AbcObject, "a" | "b">
 }
 
 // _.pickBy
-namespace TestPickBy {
-    let obj: AbcObject | null | undefined = anything;
-    let predicate = (element: any, key: string) => true;
+{
+    const obj: AbcObject | null | undefined = anything;
+    const predicate = (element: string | number | boolean, key: string) => true;
 
-    {
-        let result: Partial<AbcObject>;
-
-        result = _.pickBy(obj, predicate);
-    }
-
-    {
-        let result: _.LoDashImplicitWrapper<Partial<AbcObject>>;
-
-        result = _(obj).pickBy(predicate);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<Partial<AbcObject>>;
-
-        result = _(obj).chain().pickBy(predicate);
-    }
+    _.pickBy(obj, predicate); // $ExpectType Partial<AbcObject>
+    _(obj).pickBy(predicate); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
+    _.chain(obj).pickBy(predicate); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
+    fp.pickBy(predicate, obj); // $ExpectType Partial<AbcObject>
+    fp.pickBy(predicate)(obj); // $ExpectType Partial<AbcObject>
 }
 
 // _.result
-namespace TestResult {
-    {
-        let result: string;
+{
+    _.result<string>("abc", "0"); // $ExpectType string
+    _.result<string>("abc", 0, "_"); // $ExpectType string
+    _.result<string>("abc", "0", () => "_"); // $ExpectType string
+    _.result<string>("abc", ["0"]); // $ExpectType string
+    _.result<string>("abc", [0], () => "_"); // $ExpectType string
+    _.result<boolean>({ a: () => true }, "a"); // $ExpectType boolean
+    _("abc").result<string>("0"); // $ExpectType string
+    _("abc").result<string>(0, "_"); // $ExpectType string
+    _("abc").result<string>("0", () => "_"); // $ExpectType string
+    _("abc").result<string>(["0"]); // $ExpectType string
+    _("abc").result<string>([0], () => "_"); // $ExpectType string
+    _({ a: () => true }).result<boolean>("a"); // $ExpectType boolean
+    _.chain("abc").result<string>("0"); // $ExpectType LoDashExplicitWrapper<string>
+    _.chain("abc").result<string>(0, "_"); // $ExpectType LoDashExplicitWrapper<string>
+    _.chain("abc").result<string>("0", () => "_"); // $ExpectType LoDashExplicitWrapper<string>
+    _.chain("abc").result<string>(["0"]); // $ExpectType LoDashExplicitWrapper<string>
+    _.chain("abc").result<string>([0], () => "_"); // $ExpectType LoDashExplicitWrapper<string>
+    _.chain({ a: () => true }).result<boolean>("a"); // $ExpectType LoDashExplicitWrapper<boolean>
 
-        result = _.result<string>('abc', '0');
-        result = _.result<string>('abc', '0', '_');
-        result = _.result<string>('abc', '0', () => '_');
-        result = _.result<string>('abc', ['0']);
-        result = _.result<string>('abc', ['0'], '_');
-        result = _.result<string>('abc', ['0'], () => '_');
-
-        result = _('abc').result<string>('0');
-        result = _('abc').result<string>('0', '_');
-        result = _('abc').result<string>('0', () => '_');
-        result = _('abc').result<string>(['0']);
-        result = _('abc').result<string>(['0'], '_');
-        result = _('abc').result<string>(['0'], () => '_');
-    }
-
-    {
-        let result: number;
-
-        result = _.result<number>([42], '0');
-        result = _.result<number>([42], '0', -1);
-        result = _.result<number>([42], '0', () => -1);
-        result = _.result<number>([42], ['0']);
-        result = _.result<number>([42], ['0'], -1);
-        result = _.result<number>([42], ['0'], () => -1);
-
-        result = _([42]).result<number>('0');
-        result = _([42]).result<number>('0', -1);
-        result = _([42]).result<number>('0', () => -1);
-        result = _([42]).result<number>(['0']);
-        result = _([42]).result<number>(['0'], -1);
-        result = _([42]).result<number>(['0'], () => -1);
-    }
-
-    {
-        let result: boolean;
-
-        result = _.result<boolean>({a: true}, 'a');
-        result = _.result<boolean>({a: true}, 'a', false);
-        result = _.result<boolean>({a: true}, 'a', () => false);
-        result = _.result<boolean>({a: true}, ['a']);
-        result = _.result<boolean>({a: true}, ['a'], false);
-        result = _.result<boolean>({a: true}, ['a'], () => false);
-
-        result = _({a: true}).result<boolean>('a');
-        result = _({a: true}).result<boolean>('a', false);
-        result = _({a: true}).result<boolean>('a', () => false);
-        result = _({a: true}).result<boolean>(['a']);
-        result = _({a: true}).result<boolean>(['a'], false);
-        result = _({a: true}).result<boolean>(['a'], () => false);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<string>;
-
-        result = _('abc').chain().result<string>('0');
-        result = _('abc').chain().result('0', '_');
-        result = _('abc').chain().result('0', '_');
-        result = _('abc').chain().result<string>(['0']);
-        result = _('abc').chain().result(['0'], () => '_');
-        result = _('abc').chain().result(['0'], () => '_');
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<number>;
-
-        result = _([42]).chain().result<number>('0');
-        result = _([42]).chain().result('0', -1);
-        result = _([42]).chain().result('0', () => -1);
-        result = _([42]).chain().result<number>(['0']);
-        result = _([42]).chain().result(['0'], -1);
-        result = _([42]).chain().result(['0'], () => -1);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _({a: true}).chain().result<boolean>('a');
-        result = _({a: true}).chain().result('a', false);
-        result = _({a: true}).chain().result('a', () => false);
-        result = _({a: true}).chain().result<boolean>(['a']);
-        result = _({a: true}).chain().result(['a'], false);
-        result = _({a: true}).chain().result(['a'], () => false);
-    }
+    fp.result<string>("0", "abc"); // $ExpectType string
+    fp.result("0")<string>("abc"); // $ExpectType string
 }
 
 // _.set
-namespace TestSet {
-    type SampleObject = {a: {}};
-    type SampleResult = {a: {b: number[]}};
-
-    let object: SampleObject = { a: {} };
-    let value = 0;
-
-    {
-        let result: SampleResult;
-
-        result = _.set<SampleResult>(object, 'a.b[1]', value);
-        result = _.set<SampleResult>(object, ['a', 'b', 1], value);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<SampleResult>;
-
-        result = _(object).set<SampleResult>('a.b[1]', value);
-        result = _(object).set<SampleResult>(['a', 'b', 1], value);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<SampleResult>;
-
-        result = _(object).chain().set<SampleResult>('a.b[1]', value);
-        result = _(object).chain().set<SampleResult>(['a', 'b', 1], value);
-    }
-}
-
 // _.setWith
-namespace TestSetWith {
-    type SampleResult = {a: {b: number[]}};
-
-    let object: SampleResult = { a: { b: [] } };
-    let value = 0;
-    let customizer = (value: any, key: string, object: SampleResult) => 0;
-
-    {
-        let result: SampleResult;
-
-        result = _.setWith<SampleResult>(object, 'a.b[1]', value);
-        result = _.setWith<SampleResult>(object, 'a.b[1]', value, customizer);
-        result = _.setWith<SampleResult>(object, ['a', 'b', 1], value);
-        result = _.setWith<SampleResult>(object, ['a', 'b', 1], value, customizer);
+{
+    interface SampleResult {
+        a: {
+            b: number[];
+        };
     }
 
-    {
-        let result: _.LoDashImplicitObjectWrapper<SampleResult>;
+    const object = { a: {} };
 
-        result = _(object).setWith<SampleResult>('a.b[1]', value);
-        result = _(object).setWith<SampleResult>('a.b[1]', value, customizer);
-        result = _(object).setWith<SampleResult>(['a', 'b', 1], value);
-        result = _(object).setWith<SampleResult>(['a', 'b', 1], value, customizer);
+    _.set<SampleResult>(object, "a.b[1]", 42); // $ExpectType SampleResult
+    _.set<SampleResult>(object, ["a", "b", 1], 42); // $ExpectType SampleResult
+
+    _(object).set<SampleResult>("a.b[1]", 42); // $ExpectType LoDashImplicitWrapper<SampleResult>
+    _(object).set<SampleResult>(["a", "b", 1], 42); // $ExpectType LoDashImplicitWrapper<SampleResult>
+
+    _.chain(object).set<SampleResult>("a.b[1]", 42); // $ExpectType LoDashExplicitWrapper<SampleResult>
+    _.chain(object).set<SampleResult>(["a", "b", 1], 42); // $ExpectType LoDashExplicitWrapper<SampleResult>
+
+    fp.set("a", 42, object); // $ExpectType { a: {}; }
+    fp.set("a.b[1]")(42)(object); // $ExpectType { a: {}; }
+    fp.set(["a", "b", 1])(42)(object); // $ExpectType { a: {}; }
+}
+{
+    interface SampleResult {
+        a: {
+            b: number[];
+        };
     }
 
-    {
-        let result: _.LoDashExplicitObjectWrapper<SampleResult>;
+    const object: SampleResult = { a: { b: [0, 1] } };
+    const customizer = (value: any, key: string, object: SampleResult) => 0;
 
-        result = _(object).chain().setWith<SampleResult>('a.b[1]', value);
-        result = _(object).chain().setWith<SampleResult>('a.b[1]', value, customizer);
-        result = _(object).chain().setWith<SampleResult>(['a', 'b', 1], value);
-        result = _(object).chain().setWith<SampleResult>(['a', 'b', 1], value, customizer);
-    }
+    _.setWith<SampleResult>(object, "a.b[1]", 42); // $ExpectType SampleResult
+    _.setWith<SampleResult>(object, "a.b[1]", 42, customizer); // $ExpectType SampleResult
+    _.setWith<SampleResult>(object, ["a", "b", 1], 42, customizer); // $ExpectType SampleResult
+
+    _(object).setWith<SampleResult>("a.b[1]", 42); // $ExpectType LoDashImplicitWrapper<SampleResult>
+    _(object).setWith<SampleResult>("a.b[1]", 42, customizer); // $ExpectType LoDashImplicitWrapper<SampleResult>
+    _(object).setWith<SampleResult>(["a", "b", 1], 42, customizer); // $ExpectType LoDashImplicitWrapper<SampleResult>
+
+    _.chain(object).setWith<SampleResult>("a.b[1]", 42); // $ExpectType LoDashExplicitWrapper<SampleResult>
+    _.chain(object).setWith<SampleResult>("a.b[1]", 42, customizer); // $ExpectType LoDashExplicitWrapper<SampleResult>
+    _.chain(object).setWith<SampleResult>(["a", "b", 1], 42, customizer); // $ExpectType LoDashExplicitWrapper<SampleResult>
+
+    fp.setWith(customizer, "a", 42, object); // $ExpectType SampleResult
+    fp.setWith(customizer)("a.b[1]")(42)(object); // $ExpectType SampleResult
+    fp.setWith(customizer)(["a", "b", 1])(42)(object); // $ExpectType SampleResult
 }
 
 // _.toPairs
-namespace TestToPairs {
-    let dictionary: _.Dictionary<number> = {};
-    let numericDictionary: _.NumericDictionary<number> = {};
-    let abcObject: AbcObject = anything;
-
-    {
-        _.toPairs(dictionary); // $ExpectType [string, number][]
-        _.toPairs(numericDictionary); // $ExpectType [string, number][]
-        _.toPairs(abcObject);  // $ExpectType [string, any][]
-    }
-
-    {
-        _(dictionary).toPairs(); // $ExpectType LoDashImplicitWrapper<[string, number][]>
-        _(numericDictionary).toPairs(); // $ExpectType LoDashImplicitWrapper<[string, number][]>
-        _(abcObject).toPairs(); // $ExpectType LoDashImplicitWrapper<[string, any][]>
-    }
-
-    {
-        _(dictionary).chain().toPairs(); // $ExpectType LoDashExplicitWrapper<[string, number][]>
-        _(numericDictionary).chain().toPairs(); // $ExpectType LoDashExplicitWrapper<[string, number][]>
-        _(abcObject).chain().toPairs(); // $ExpectType LoDashExplicitWrapper<[string, any][]>
-    }
-}
-
 // _.toPairsIn
-namespace TestToPairsIn {
-    let dictionary: _.Dictionary<number> = {};
-    let numericDictionary: _.NumericDictionary<number> = {};
-    let abcObject: AbcObject = anything;
+{
+    const dictionary: _.Dictionary<number> = {};
+    const numericDictionary: _.NumericDictionary<number> = {};
+    const abcObject: AbcObject = anything;
 
-    {
-        _.toPairsIn(dictionary); // $ExpectType [string, number][]
-        _.toPairsIn(numericDictionary); // $ExpectType [string, number][]
-        _.toPairsIn(abcObject);  // $ExpectType [string, any][]
-    }
+    _.toPairs(dictionary); // $ExpectType [string, number][]
+    _.toPairs(numericDictionary); // $ExpectType [string, number][]
+    _.toPairs(abcObject);  // $ExpectType [string, any][]
 
-    {
-        _(dictionary).toPairsIn(); // $ExpectType LoDashImplicitWrapper<[string, number][]>
-        _(numericDictionary).toPairsIn(); // $ExpectType LoDashImplicitWrapper<[string, number][]>
-        _(abcObject).toPairsIn(); // $ExpectType LoDashImplicitWrapper<[string, any][]>
-    }
+    _(dictionary).toPairs(); // $ExpectType LoDashImplicitWrapper<[string, number][]>
+    _(numericDictionary).toPairs(); // $ExpectType LoDashImplicitWrapper<[string, number][]>
+    _(abcObject).toPairs(); // $ExpectType LoDashImplicitWrapper<[string, any][]>
 
-    {
-        _(dictionary).chain().toPairsIn(); // $ExpectType LoDashExplicitWrapper<[string, number][]>
-        _(numericDictionary).chain().toPairsIn(); // $ExpectType LoDashExplicitWrapper<[string, number][]>
-        _(abcObject).chain().toPairsIn(); // $ExpectType LoDashExplicitWrapper<[string, any][]>
-    }
+    _.chain(dictionary).toPairs(); // $ExpectType LoDashExplicitWrapper<[string, number][]>
+    _.chain(numericDictionary).toPairs(); // $ExpectType LoDashExplicitWrapper<[string, number][]>
+    _.chain(abcObject).toPairs(); // $ExpectType LoDashExplicitWrapper<[string, any][]>
+
+    fp.toPairs(dictionary); // $ExpectType [string, number][]
+
+    _.toPairsIn(dictionary); // $ExpectType [string, number][]
+    _.toPairsIn(numericDictionary); // $ExpectType [string, number][]
+    _.toPairsIn(abcObject);  // $ExpectType [string, any][]
+
+    _(dictionary).toPairsIn(); // $ExpectType LoDashImplicitWrapper<[string, number][]>
+    _(numericDictionary).toPairsIn(); // $ExpectType LoDashImplicitWrapper<[string, number][]>
+    _(abcObject).toPairsIn(); // $ExpectType LoDashImplicitWrapper<[string, any][]>
+
+    _.chain(dictionary).toPairsIn(); // $ExpectType LoDashExplicitWrapper<[string, number][]>
+    _.chain(numericDictionary).toPairsIn(); // $ExpectType LoDashExplicitWrapper<[string, number][]>
+    _.chain(abcObject).toPairsIn(); // $ExpectType LoDashExplicitWrapper<[string, any][]>
+
+    fp.toPairsIn(dictionary); // $ExpectType [string, number][]
 }
 
 // _.transform
-namespace TestTransform {
-    let array: number[] = [];
-    let dictionary: _.Dictionary<number> = {};
+{
+    const array: number[] = [];
+    const dictionary: _.Dictionary<number> = {};
 
     {
-        let iterator = (acc: AbcObject[], curr: number, index?: number, arr?: number[]) => {};
-        let accumulator: AbcObject[] = [];
-        let result: AbcObject[];
+        const iterator = (acc: AbcObject[], curr: number, index?: number, arr?: number[]) => {};
+        const accumulator: AbcObject[] = [];
 
-        result = _.transform(array);
-        result = _.transform<number, AbcObject>(array, iterator);
-        result = _.transform<number, AbcObject>(array, iterator, accumulator);
-
-        result = _(array).transform().value();
-        result = _(array).transform(iterator).value();
-        result = _(array).transform(iterator, accumulator).value();
+        _.transform(array); // $ExpectType any[]
+        _.transform<number, AbcObject>(array, iterator); // $ExpectType AbcObject[]
+        _.transform<number, AbcObject>(array, iterator, accumulator); // $ExpectType AbcObject[]
+        _(array).transform(); // $ExpectType LoDashImplicitWrapper<any[]>
+        _(array).transform(iterator); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+        _(array).transform(iterator, accumulator); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+        _.chain(array).transform(iterator, accumulator); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
     }
 
     {
-        let iterator = (acc: _.Dictionary<AbcObject>, curr: number, index?: number, arr?: number[]) => {};
-        let accumulator: _.Dictionary<AbcObject> = {};
-        let result: _.Dictionary<AbcObject>;
+        const iterator = (acc: _.Dictionary<AbcObject>, curr: number, index?: number, arr?: number[]) => {};
+        const accumulator: _.Dictionary<AbcObject> = {};
 
-        result = _.transform<number, AbcObject>(array, iterator, accumulator);
-
-        result = _(array).transform(iterator, accumulator).value();
+        _.transform<number, AbcObject>(array, iterator, accumulator); // $ExpectType Dictionary<AbcObject>
+        _(array).transform(iterator, accumulator); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+        _.chain(array).transform(iterator, accumulator); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
     }
 
     {
-        let iterator = (acc: _.Dictionary<AbcObject>, curr: number, key?: string, dict?: _.Dictionary<number>) => {};
-        let accumulator: _.Dictionary<AbcObject> = {};
-        let result: _.Dictionary<AbcObject>;
+        const iterator = (acc: _.Dictionary<AbcObject>, curr: number, key?: string, dict?: _.Dictionary<number>) => {};
+        const accumulator: _.Dictionary<AbcObject> = {};
 
-        result = _.transform(dictionary);
-        result = _.transform<number, AbcObject>(dictionary, iterator);
-        result = _.transform<number, AbcObject>(dictionary, iterator, accumulator);
-
-        result = _(dictionary).transform().value();
-        result = _(dictionary).transform<number, AbcObject>(iterator).value();
-        result = _(dictionary).transform<number, AbcObject>(iterator, accumulator).value();
+        _.transform(dictionary); // $ExpectType Dictionary<any>
+        _.transform<number, AbcObject>(dictionary, iterator); // $ExpectType Dictionary<AbcObject>
+        _.transform<number, AbcObject>(dictionary, iterator, accumulator); // $ExpectType Dictionary<AbcObject>
+        _(dictionary).transform(); // $ExpectType LoDashImplicitWrapper<Dictionary<any>>
+        _(dictionary).transform<number, AbcObject>(iterator); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+        _(dictionary).transform<number, AbcObject>(iterator, accumulator); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
     }
 
     {
-        let iterator = (acc: AbcObject[], curr: number, key?: string, dict?: _.Dictionary<number>) => {};
-        let accumulator: AbcObject[] = [];
-        let result: AbcObject[];
+        const iterator = (acc: AbcObject[], curr: number, key?: string, dict?: _.Dictionary<number>) => {};
+        const accumulator: AbcObject[] = [];
 
-        result = _.transform<number, AbcObject>(dictionary, iterator, accumulator);
+        _.transform<number, AbcObject>(dictionary, iterator, accumulator); // $ExpectType AbcObject[]
+        _(dictionary).transform<number, AbcObject>(iterator, accumulator); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+        _.chain(dictionary).transform<number, AbcObject>(iterator, accumulator); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    }
 
-        result = _(dictionary).transform<number, AbcObject>(iterator, accumulator).value();
+    {
+        const iterator = (acc: AbcObject[], curr: number): AbcObject => anything;
+        const accumulator: AbcObject[] = [];
+
+        fp.transform(iterator, accumulator, array); // $ExpectType AbcObject[]
+        fp.transform(iterator)(accumulator)(array); // $ExpectType AbcObject[]
+        fp.transform(iterator)(accumulator)(dictionary); // $ExpectType AbcObject[]
+    }
+
+    {
+        const iterator = (acc: _.Dictionary<AbcObject>, curr: number): AbcObject => anything;
+        const accumulator: _.Dictionary<AbcObject> = {};
+
+        fp.transform(iterator)(accumulator)(array); // $ExpectType Dictionary<AbcObject>
+        fp.transform(iterator)(accumulator)(dictionary); // $ExpectType Dictionary<AbcObject>
     }
 }
 
 // _.unset
-namespace TestUnset {
-    type SampleObject = {a: {b: string; c: boolean}};
+{
+    const object = { a: { b: "", c: true } };
 
-    let object: SampleObject = { a: { b: "", c: true } };
-
-    {
-        let result: boolean;
-
-        result = _.unset(object, 'a.b');
-        result = _.unset(object, ['a', 'b']);
-    }
-
-    {
-        let result: _.LoDashImplicitWrapper<boolean>;
-
-        result = _(object).unset('a.b');
-        result = _(object).unset(['a', 'b']);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _(object).chain().unset('a.b');
-        result = _(object).chain().unset(['a', 'b']);
-    }
+    _.unset(object, "a.b"); // $ExpectType boolean
+    _.unset(object, ["a", "b"]); // $ExpectType boolean
+    _(object).unset("a.b"); // $ExpectType LoDashImplicitWrapper<boolean>
+    _(object).unset(["a", "b"]); // $ExpectType LoDashImplicitWrapper<boolean>
+    _.chain(object).unset("a.b"); // $ExpectType LoDashExplicitWrapper<boolean>
+    _.chain(object).unset(["a", "b"]); // $ExpectType LoDashExplicitWrapper<boolean>
+    fp.unset("a.b", object); // $ExpectType boolean
+    fp.unset("a.b")(object); // $ExpectType boolean
+    fp.unset(["a", "b"])(object); // $ExpectType boolean
 }
 
 // _.update
-namespace TestUpdate {
-    type SampleResult = {a: {b: number[]}};
+{
+    const object = { a: { b: [0] } };
+    const updater = (value: any) => 0;
 
-    let object: SampleResult = { a: { b: [] } };
-    let updater = (value: any) => 0;
-
-    {
-        let result: SampleResult;
-
-        result = _.update(object, 'a.b[1]', updater);
-        result = _.update(object, ['a', 'b', 1], updater);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<SampleResult>;
-
-        result = _(object).update('a.b[1]', updater);
-        result = _(object).update(['a', 'b', 1], updater);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<SampleResult>;
-
-        result = _(object).chain().update('a.b[1]', updater);
-        result = _(object).chain().update(['a', 'b', 1], updater);
-    }
+    _.update(object, "a.b[1]", updater); // $ExpectType any
+    _.update(object, ["a", "b", 1], updater); // $ExpectType any
+    _(object).update("a.b[1]", updater); // $ExpectType LoDashImplicitWrapper<any>
+    _(object).update(["a", "b", 1], updater); // $ExpectType LoDashImplicitWrapper<any>
+    _.chain(object).update("a.b[1]", updater); // $ExpectType LoDashExplicitWrapper<any>
+    _.chain(object).update(["a", "b", 1], updater); // $ExpectType LoDashExplicitWrapper<any>
+    fp.update("a.b[1]", updater, object); // $ExpectType any
+    fp.update(["a", "b", 1])(updater)(object); // $ExpectType any
 }
 
 // _.updateWith
-namespace TestUpdateWith {
-    type SampleResult = {a: {b: number[]}};
-
-    let object: SampleResult = { a: { b: [] } };
-    let updater = (value: any) => 0;
-    let customizer = (value: any, key: string, object: SampleResult) => 0;
-
-    {
-        let result: SampleResult;
-
-        result = _.updateWith<SampleResult>(object, 'a.b[1]', updater);
-        result = _.updateWith<SampleResult>(object, 'a.b[1]', updater, customizer);
-        result = _.updateWith<SampleResult>(object, ['a', 'b', 1], updater);
-        result = _.updateWith<SampleResult>(object, ['a', 'b', 1], updater, customizer);
-
-        result = _.updateWith<SampleResult>(object, 'a.b[1]', updater);
-        result = _.updateWith<SampleResult>(object, 'a.b[1]', updater, customizer);
-        result = _.updateWith<SampleResult>(object, ['a', 'b', 1], updater);
-        result = _.updateWith<SampleResult>(object, ['a', 'b', 1], updater, customizer);
+{
+    interface SampleResult {
+        a: {
+            b: number[];
+        };
     }
+    const object: SampleResult = { a: { b: [] } };
+    const updater = (value: any) => 0;
+    const customizer = (value: any, key: string, object: SampleResult) => 0;
 
-    {
-        let result: _.LoDashImplicitObjectWrapper<SampleResult>;
-
-        result = _(object).updateWith<SampleResult>('a.b[1]', updater);
-        result = _(object).updateWith<SampleResult>('a.b[1]', updater, customizer);
-        result = _(object).updateWith<SampleResult>(['a', 'b', 1], updater);
-        result = _(object).updateWith<SampleResult>(['a', 'b', 1], updater, customizer);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<SampleResult>;
-
-        result = _(object).chain().updateWith<SampleResult>('a.b[1]', updater);
-        result = _(object).chain().updateWith<SampleResult>('a.b[1]', updater, customizer);
-        result = _(object).chain().updateWith<SampleResult>(['a', 'b', 1], updater);
-        result = _(object).chain().updateWith<SampleResult>(['a', 'b', 1], updater, customizer);
-    }
+    _.updateWith<SampleResult>(object, "a.b[1]", updater); // $ExpectType SampleResult
+    _.updateWith<SampleResult>(object, "a.b[1]", updater, customizer); // $ExpectType SampleResult
+    _.updateWith<SampleResult>(object, ["a", "b", 1], updater, customizer); // $ExpectType SampleResult
+    _(object).updateWith<SampleResult>("a.b[1]", updater); // $ExpectType LoDashImplicitWrapper<SampleResult>
+    _(object).updateWith<SampleResult>("a.b[1]", updater, customizer); // $ExpectType LoDashImplicitWrapper<SampleResult>
+    _(object).updateWith<SampleResult>(["a", "b", 1], updater, customizer); // $ExpectType LoDashImplicitWrapper<SampleResult>
+    _.chain(object).updateWith<SampleResult>("a.b[1]", updater, customizer); // $ExpectType LoDashExplicitWrapper<SampleResult>
+    fp.updateWith(customizer, "a.b[1]", updater, object); // $ExpectType SampleResult
+    fp.updateWith(customizer)(["a", "b", 1])(updater)(object); // $ExpectType SampleResult
 }
 
 // _.values
-namespace TestValues {
-    type SampleObject = {a: {}};
+// _.valuesIn
+{
+    const dict: _.Dictionary<AbcObject> = {};
+    const numDict: _.NumericDictionary<AbcObject> = {};
+    const list: _.List<AbcObject> | null | undefined = anything;
+    const object: AbcObject = anything;
+
+    _.values(123); // $ExpectType any[]
+    _.values(true); // $ExpectType any[]
+    _.values("hi"); // $ExpectType string[]
+    _.values(["h", "i"]); // $ExpectType string[]
+    _.values([true, false]); // $ExpectType boolean[]
+    _.values(dict); // $ExpectType AbcObject[]
+    _.values(numDict); // $ExpectType AbcObject[]
+    _.values(list); // $ExpectType AbcObject[]
+    _.values(object); // $ExpectType (string | number | boolean)[]
+
+    _(true).values(); // $ExpectType LoDashImplicitWrapper<any[]>
+    _("hi").values(); // $ExpectType LoDashImplicitWrapper<string[]>
+    _(dict).values(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+
+    _.chain(true).values(); // $ExpectType LoDashExplicitWrapper<any[]>
+    _.chain("hi").values(); // $ExpectType LoDashExplicitWrapper<string[]>
+    _.chain(dict).values(); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+
+    fp.values("hi"); // $ExpectType string[]
+    fp.values(["h", "i"]); // $ExpectType string[]
+    fp.values([true, false]); // $ExpectType boolean[]
+    fp.values(dict); // $ExpectType AbcObject[]
+    fp.values(numDict); // $ExpectType AbcObject[]
+    fp.values(list); // $ExpectType AbcObject[]
+    fp.values(object); // $ExpectType (string | number | boolean)[]
+
+    _.valuesIn([true, false]); // $ExpectType boolean[]
+    _.valuesIn(dict); // $ExpectType AbcObject[]
+    _.valuesIn(numDict); // $ExpectType AbcObject[]
+    _.valuesIn(list); // $ExpectType AbcObject[]
+    _.valuesIn(object); // $ExpectType (string | number | boolean)[]
+
+    _(dict).valuesIn(); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _.chain(dict).valuesIn(); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+
+    fp.valuesIn(dict); // $ExpectType AbcObject[]
+    fp.valuesIn(numDict); // $ExpectType AbcObject[]
+    fp.valuesIn(list); // $ExpectType AbcObject[]
+    fp.valuesIn(object); // $ExpectType (string | number | boolean)[]
+}
+
+/*******
+ * Seq *
+ *******/
+
+// _
+{
+    _(""); // $ExpectType LoDashImplicitWrapper<string>
+    _(42); // $ExpectType LoDashImplicitWrapper<number>
+    _(true); // $ExpectType LoDashImplicitWrapper<boolean>
+    _([""]); // $ExpectType LoDashImplicitWrapper<string[]>
+    _({ a: "" }); // $ExpectType LoDashImplicitWrapper<{ a: string; }>
 
     {
-        let result: any[];
-
-        result = _.values(123);
-        result = _.values(true);
-        result = _.values(null);
+        const a: AbcObject[] = [];
+        _(a); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
     }
 
     {
-        let result: string[];
-
-        result = _.values('hi');
-        result = _.values(['h', 'i']);
-    }
-
-    {
-        let result: number[];
-
-        result = _.values([1, 2]);
-    }
-
-    {
-        let result: boolean[];
-
-        result = _.values([true, false]);
-    }
-
-    {
-        let dict: _.Dictionary<SampleObject> = {};
-        let numDict: _.NumericDictionary<SampleObject> = {};
-        let list: _.List<SampleObject> = [];
-        let object: {a: SampleObject} = { a: { a: {} } };
-        let result: SampleObject[];
-
-        result = _.values(dict);
-        result = _.values(numDict);
-        result = _.values(list);
-        result = _.values(object);
-    }
-
-    // Implicit wrapper
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<any>;
-
-        result = _(123).values();
-        result = _(true).values();
-        result = _(null).values();
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<string>;
-
-        result = _('hi').values();
-        result = _(['h', 'i']).values();
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<number>;
-
-        result = _([1, 2]).values();
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<boolean>;
-
-        result = _([true, false]).values();
-    }
-
-    {
-        let dict: _.Dictionary<SampleObject> = {};
-        let numDict: _.NumericDictionary<SampleObject> = {};
-        let list: _.List<SampleObject> = [];
-        let object: {a: SampleObject} = { a: { a: {} } };
-        let result: _.LoDashImplicitArrayWrapper<SampleObject>;
-
-        result = _(dict).values();
-        result = _(numDict).values();
-        result = _(list).values();
-        result = _(object).values();
-    }
-
-    // Explicit wrapper
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<any>;
-
-        result = _(123).chain().values();
-        result = _(true).chain().values();
-        result = _(null).chain().values();
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<string>;
-
-        result = _('hi').chain().values<string>();
-        result = _(['h', 'i']).chain().values();
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<number>;
-
-        result = _([1, 2]).chain().values();
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<boolean>;
-
-        result = _([true, false]).chain().values();
-    }
-
-    {
-        let dict: _.Dictionary<SampleObject> = {};
-        let numDict: _.NumericDictionary<SampleObject> = {};
-        let list: _.List<SampleObject> = [];
-        let object: {a: SampleObject} = { a: { a: {} } };
-        let result: _.LoDashExplicitArrayWrapper<SampleObject>;
-
-        result = _(dict).chain().values();
-        result = _(numDict).chain().values();
-        result = _(list).chain().values();
-        result = _(object).chain().values();
+        const a: AbcObject[] | null | undefined = anything;
+        _(a); // $ExpectType LoDashImplicitWrapper<AbcObject[] | null | undefined>
     }
 }
 
-// _.valuesIn
-namespace TestValuesIn {
-    let object: _.Dictionary<AbcObject> = {};
+// _.chain
+{
+    _.chain(""); // $ExpectType LoDashExplicitWrapper<string>
+    _("").chain(); // $ExpectType LoDashExplicitWrapper<string>
+    _.chain("").chain(); // $ExpectType LoDashExplicitWrapper<string>
+    _.chain(42); // $ExpectType LoDashExplicitWrapper<number>
+    _.chain([""]); // $ExpectType LoDashExplicitWrapper<string[]>
+    _.chain({ a: 42 }); // $ExpectType LoDashExplicitWrapper<{ a: number; }>
+}
 
-    {
-        let result: AbcObject[];
+// _.tap
+{
+    // $ExpectType string
+    _.tap("a", (value) => {
+        value; // $ExpectType string
+    });
+    // $ExpectType boolean[]
+    _.tap([true], (value) => {
+        value; // $ExpectType boolean[]
+    });
+    // $ExpectType { a: number; }
+    _.tap({ a: 42 }, (value) => {
+        value; // $ExpectType { a: number; }
+    });
 
-        result = _.valuesIn(object);
-    }
+    // $ExpectType LoDashImplicitWrapper<string>
+    _("a").tap((value) => {
+        value; // $ExpectType string
+    });
+    // $ExpectType LoDashImplicitWrapper<boolean[]>
+    _([true]).tap((value) => {
+        value; // $ExpectType boolean[]
+    });
+    // $ExpectType LoDashImplicitWrapper<{ a: number; }>
+    _({ a: 42 }).tap((value) => {
+        value; // $ExpectType { a: number; }
+    });
 
-    {
-        let result: AbcObject[];
+    // $ExpectType LoDashExplicitWrapper<string>
+    _.chain("a").tap((value) => {
+        value; // $ExpectType string
+    });
+    // $ExpectType LoDashExplicitWrapper<boolean[]>
+    _.chain([true]).tap((value) => {
+        value; // $ExpectType boolean[]
+    });
+    // $ExpectType LoDashExplicitWrapper<{ a: number; }>
+    _.chain({ a: 42 }).tap((value) => {
+        value; // $ExpectType { a: number; }
+    });
 
-        // Without this type hint, this will fail to compile, as expected.
-        result = _.valuesIn<AbcObject>({});
-    }
+    fp.tap((value: string) => {}, "a" as string); // $ExpectType string
+    fp.tap((value: string) => {})("a"); // $ExpectType string
+    fp.tap((value: string[]) => {}, ["a"]); // $ExpectType string[]
+}
 
-    {
-        let result: AbcObject[];
+// _.thru
+{
+    // $ExpectType number
+    _.thru("a", (value) => {
+        value; // $ExpectType string
+        return 1;
+    });
+    // $ExpectType number
+    _.thru([true], (value) => {
+        value; // $ExpectType boolean[]
+        return 1;
+    });
+    // $ExpectType number
+    _.thru({ a: 42 }, (value) => {
+        value; // $ExpectType { a: number; }
+        return 1;
+    });
 
-        result = _.valuesIn(object);
-    }
+    // $ExpectType LoDashImplicitWrapper<number>
+    _("a").thru((value) => {
+        value; // $ExpectType string
+        return 1;
+    });
+    // $ExpectType LoDashImplicitWrapper<number>
+    _([true]).thru((value) => {
+        value; // $ExpectType boolean[]
+        return 1;
+    });
+    // $ExpectType LoDashImplicitWrapper<number>
+    _({ a: 42 }).thru((value) => {
+        value; // $ExpectType { a: number; }
+        return 1;
+    });
 
-    {
-        let result: _.LoDashImplicitArrayWrapper<AbcObject>;
+    // $ExpectType LoDashExplicitWrapper<number>
+    _.chain("a").thru((value) => {
+        value; // $ExpectType string
+        return 1;
+    });
+    // $ExpectType LoDashExplicitWrapper<number>
+    _.chain([true]).thru((value) => {
+        value; // $ExpectType boolean[]
+        return 1;
+    });
+    // $ExpectType LoDashExplicitWrapper<number>
+    _.chain({ a: 42 }).thru((value) => {
+        value; // $ExpectType { a: number; }
+        return 1;
+    });
 
-        result = _(object).valuesIn();
-    }
+    fp.thru((x: number) => x.toString(), 1); // $ExpectType string
+    fp.thru((x: number) => x.toString())(1); // $ExpectType string
+    fp.thru((x: number[]) => x.toString())([1]); // $ExpectType string
+}
 
-    {
-        let result: _.LoDashExplicitArrayWrapper<AbcObject>;
+// _.prototype.commit
+{
+    _(42).commit(); // $ExpectType LoDashImplicitWrapper<number>
+    _({ a: 42 }).commit(); // $ExpectType LoDashImplicitWrapper<{ a: number; }>
+    _.chain(42).commit(); // $ExpectType LoDashExplicitWrapper<number>
+    _.chain({ a: 42 }).commit(); // $ExpectType LoDashExplicitWrapper<{ a: number; }>
+}
 
-        result = _(object).chain().valuesIn();
-    }
+// _.prototype.concat
+{
+    const numberROA: number[] = [0]; // TODO: Should be ReadonlyArray, but see comment on type Many<T>
+
+    _.concat(1); // $ExpectType number[]
+    _.concat([1]); // $ExpectType number[]
+    _.concat(numberROA); // $ExpectType number[]
+    _.concat(1, 2); // $ExpectType number[]
+    _.concat(1, [1]); // $ExpectType number[]
+    _.concat(1, [1], numberROA); // $ExpectType number[]
+
+    _(1).concat(2); // $ExpectType LoDashImplicitWrapper<number[]>
+    _(1).concat([1]); // $ExpectType LoDashImplicitWrapper<number[]>
+    _(1).concat([2], numberROA); // $ExpectType LoDashImplicitWrapper<number[]>
+    _([1]).concat(2); // $ExpectType LoDashImplicitWrapper<number[]>
+    _(numberROA).concat(numberROA); // $ExpectType LoDashImplicitWrapper<number[]>
+    _(numberROA).concat(numberROA, numberROA); // $ExpectType LoDashImplicitWrapper<number[]>
+
+    _.chain(1).concat(2); // $ExpectType LoDashExplicitWrapper<number[]>
+    _.chain(1).concat([1]); // $ExpectType LoDashExplicitWrapper<number[]>
+    _.chain(1).concat([2], numberROA); // $ExpectType LoDashExplicitWrapper<number[]>
+    _.chain([1]).concat(2); // $ExpectType LoDashExplicitWrapper<number[]>
+    _.chain(numberROA).concat(numberROA); // $ExpectType LoDashExplicitWrapper<number[]>
+    _.chain(numberROA).concat(numberROA, numberROA); // $ExpectType LoDashExplicitWrapper<number[]>
+
+    const abcObject: AbcObject = { a: 1, b: 'foo', c: true };
+    const objectROA: AbcObject[] = [{ a: 1, b: 'foo', c: true }]; // TODO: Should be ReadonlyArray, but see comment on type Many<T>
+
+    _.concat(abcObject, abcObject); // $ExpectType AbcObject[]
+    _.concat(abcObject, [abcObject], objectROA); // $ExpectType AbcObject[]
+
+    _(abcObject).concat(abcObject); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(abcObject).concat([abcObject], objectROA); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+
+    _.chain(abcObject).concat(abcObject); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(abcObject).concat([abcObject], objectROA); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+}
+
+// _.prototype.plant
+{
+    _(anything).plant(""); // $ExpectType LoDashImplicitWrapper<string>
+    _(anything).plant(42); // $ExpectType LoDashImplicitWrapper<number>
+    _(anything).plant([""]); // $ExpectType LoDashImplicitWrapper<string[]>
+    _(anything).plant({ a: 42 }); // $ExpectType LoDashImplicitWrapper<{ a: number; }>
+
+    _.chain(anything).plant(""); // $ExpectType LoDashExplicitWrapper<string>
+    _.chain(anything).plant(42); // $ExpectType LoDashExplicitWrapper<number>
+    _.chain(anything).plant([""]); // $ExpectType LoDashExplicitWrapper<string[]>
+    _.chain(anything).plant({ a: 42 }); // $ExpectType LoDashExplicitWrapper<{ a: number; }>
+}
+
+// _.prototype.reverse
+{
+    _([42]).reverse(); // $ExpectType LoDashImplicitWrapper<number[]>
+    _.chain([42]).reverse(); // $ExpectType LoDashExplicitWrapper<number[]>
+}
+
+// _.prototype.toString
+{
+    _('').toString(); // $ExpectType string
+    _(42).toString(); // $ExpectType string
+    _([true]).toString(); // $ExpectType string
+    _({}).toString(); // $ExpectType string
+
+    _.chain('').toString(); // $ExpectType string
+    _.chain(42).toString(); // $ExpectType string
+    _.chain([true]).toString(); // $ExpectType string
+    _.chain({}).toString(); // $ExpectType string
+}
+
+// _.prototype.value
+// _.prototype.valueOf
+// _.prototype.toJSON
+{
+    _("").value(); // $ExpectType string
+    _([true]).value(); // $ExpectType boolean[]
+    _({ a: 42 }).value(); // $ExpectType { a: number; }
+    _({ a: 42 }).valueOf(); // $ExpectType { a: number; }
+    _({ a: 42 }).toJSON(); // $ExpectType { a: number; }
+
+    _.chain("").value(); // $ExpectType string
+    _.chain([true]).value(); // $ExpectType boolean[]
+    _.chain({ a: 42 }).value(); // $ExpectType { a: number; }
+    _.chain({ a: 42 }).valueOf(); // $ExpectType { a: number; }
+    _.chain({ a: 42 }).toJSON(); // $ExpectType { a: number; }
 }
 
 /**********
@@ -12675,1650 +6371,824 @@ namespace TestValuesIn {
  **********/
 
 // _.camelCase
-namespace TestCamelCase {
-    {
-        let result: string;
-
-        result = _.camelCase('Foo Bar');
-        result = _('Foo Bar').camelCase();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<string>;
-
-        result = _('Foo Bar').chain().camelCase();
-    }
+{
+    _.camelCase("Foo Bar"); // $ExpectType string
+    _("Foo Bar").camelCase(); // $ExpectType string
+    _.chain("Foo Bar").camelCase(); // $ExpectType LoDashExplicitWrapper<string>
+    fp.camelCase("Foo Bar"); // $ExpectType string
 }
 
 // _.capitalize
-namespace TestCapitalize {
-    {
-        let result: string;
-
-        result = _.capitalize('fred');
-        result = _('fred').capitalize();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<string>;
-
-        result = _('fred').chain().capitalize();
-    }
+{
+    _.capitalize("fred"); // $ExpectType string
+    _("fred").capitalize(); // $ExpectType string
+    _.chain("fred").capitalize(); // $ExpectType LoDashExplicitWrapper<string>
+    fp.capitalize("fred"); // $ExpectType string
 }
 
 // _.deburr
-namespace TestDeburr {
-    {
-        let result: string;
-
-        result = _.deburr('déjà vu');
-        result = _('déjà vu').deburr();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<string>;
-
-        result = _('déjà vu').chain().deburr();
-    }
+{
+    _.deburr("déjà vu"); // $ExpectType string
+    _("déjà vu").deburr(); // $ExpectType string
+    _.chain("déjà vu").deburr(); // $ExpectType LoDashExplicitWrapper<string>
+    fp.deburr("déjà vu"); // $ExpectType string
 }
 
 // _.endsWith
-namespace TestEndsWith {
-    {
-        let result: boolean;
-
-        result = _.endsWith('abc', 'c');
-        result = _.endsWith('abc', 'c', 1);
-
-        result = _('abc').endsWith('c');
-        result = _('abc').endsWith('c', 1);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _('abc').chain().endsWith('c');
-        result = _('abc').chain().endsWith('c', 1);
-    }
+{
+    _.endsWith("abc", "c"); // $ExpectType boolean
+    _.endsWith("abc", "c", 1); // $ExpectType boolean
+    _("abc").endsWith("c"); // $ExpectType boolean
+    _("abc").endsWith("c", 1); // $ExpectType boolean
+    _.chain("abc").endsWith("c"); // $ExpectType LoDashExplicitWrapper<boolean>
+    _.chain("abc").endsWith("c", 1); // $ExpectType LoDashExplicitWrapper<boolean>
+    fp.endsWith("c", "abc"); // $ExpectType boolean
+    fp.endsWith("c")("abc"); // $ExpectType boolean
 }
 
 // _.escape
-namespace TestEscape {
-    {
-        let result: string;
-
-        result = _.escape('fred, barney, & pebbles');
-        result = _('fred, barney, & pebbles').escape();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<string>;
-
-        result = _('fred, barney, & pebbles').chain().escape();
-    }
+{
+    _.escape("fred, barney, & pebbles"); // $ExpectType string
+    _("fred, barney, & pebbles").escape(); // $ExpectType string
+    _.chain("fred, barney, & pebbles").escape(); // $ExpectType LoDashExplicitWrapper<string>
+    fp.escape("fred, barney, & pebbles"); // $ExpectType string
 }
 
 // _.escapeRegExp
-namespace TestEscapeRegExp {
-    {
-        let result: string;
-
-        result = _.escapeRegExp('[lodash](https://lodash.com/)');
-        result = _('[lodash](https://lodash.com/)').escapeRegExp();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<string>;
-
-        result = _('[lodash](https://lodash.com/)').chain().escapeRegExp();
-    }
+{
+    _.escapeRegExp("[lodash](https://lodash.com/)"); // $ExpectType string
+    _("[lodash](https://lodash.com/)").escapeRegExp(); // $ExpectType string
+    _.chain("[lodash](https://lodash.com/)").escapeRegExp(); // $ExpectType LoDashExplicitWrapper<string>
+    fp.escapeRegExp("[lodash](https://lodash.com/)"); // $ExpectType string
 }
 
 // _.kebabCase
-namespace TestKebabCase {
-    {
-        let result: string;
-
-        result = _.kebabCase('Foo Bar');
-        result = _('Foo Bar').kebabCase();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<string>;
-
-        result = _('Foo Bar').chain().kebabCase();
-    }
+{
+    _.kebabCase("Foo Bar"); // $ExpectType string
+    _("Foo Bar").kebabCase(); // $ExpectType string
+    _.chain("Foo Bar").kebabCase(); // $ExpectType LoDashExplicitWrapper<string>
+    fp.kebabCase("Foo Bar"); // $ExpectType string
 }
 
 // _.lowerCase
-namespace TestLowerCase {
-    {
-        let result: string;
-
-        result = _.lowerCase('Foo Bar');
-        result = _('Foo Bar').lowerCase();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<string>;
-
-        result = _('Foo Bar').chain().lowerCase();
-    }
+{
+    _.lowerCase("Foo Bar"); // $ExpectType string
+    _("Foo Bar").lowerCase(); // $ExpectType string
+    _.chain("Foo Bar").lowerCase(); // $ExpectType LoDashExplicitWrapper<string>
+    fp.lowerCase("Foo Bar"); // $ExpectType string
 }
 
 // _.lowerFirst
-namespace TestLowerFirst {
-    {
-        let result: string;
-
-        result = _.lowerFirst('Foo Bar');
-        result = _('Foo Bar').lowerFirst();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<string>;
-
-        result = _('Foo Bar').chain().lowerFirst();
-    }
+{
+    _.lowerFirst("Foo Bar"); // $ExpectType string
+    _("Foo Bar").lowerFirst(); // $ExpectType string
+    _.chain("Foo Bar").lowerFirst(); // $ExpectType LoDashExplicitWrapper<string>
+    fp.lowerFirst("Foo Bar"); // $ExpectType string
 }
 
 // _.pad
-namespace TestPad {
-    {
-        let result: string;
-
-        result = _.pad('abc');
-        result = _.pad('abc', 8);
-        result = _.pad('abc', 8, '_-');
-
-        result = _('abc').pad();
-        result = _('abc').pad(8);
-        result = _('abc').pad(8, '_-');
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<string>;
-
-        result = _('abc').chain().pad();
-        result = _('abc').chain().pad(8);
-        result = _('abc').chain().pad(8, '_-');
-    }
+{
+    _.pad("abc"); // $ExpectType string
+    _.pad("abc", 8); // $ExpectType string
+    _.pad("abc", 8, "_-"); // $ExpectType string
+    _("abc").pad(); // $ExpectType string
+    _("abc").pad(8); // $ExpectType string
+    _("abc").pad(8, "_-"); // $ExpectType string
+    _.chain("abc").pad(); // $ExpectType LoDashExplicitWrapper<string>
+    _.chain("abc").pad(8); // $ExpectType LoDashExplicitWrapper<string>
+    _.chain("abc").pad(8, "_-"); // $ExpectType LoDashExplicitWrapper<string>
+    fp.pad(8, "abc"); // $ExpectType string
+    fp.pad(8)("abc"); // $ExpectType string
+    fp.padChars("_", 8, "abc"); // $ExpectType string
+    fp.padChars("_")(8)("abc"); // $ExpectType string
 }
 
 // _.padEnd
-namespace TestPadEnd {
-    {
-        let result: string;
-
-        result = _.padEnd('abc');
-        result = _.padEnd('abc', 6);
-        result = _.padEnd('abc', 6, '_-');
-
-        result = _('abc').padEnd();
-        result = _('abc').padEnd(6);
-        result = _('abc').padEnd(6, '_-');
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<string>;
-
-        result = _('abc').chain().padEnd();
-        result = _('abc').chain().padEnd(6);
-        result = _('abc').chain().padEnd(6, '_-');
-    }
+{
+    _.padEnd("abc"); // $ExpectType string
+    _.padEnd("abc", 6); // $ExpectType string
+    _.padEnd("abc", 6, "_-"); // $ExpectType string
+    _("abc").padEnd(); // $ExpectType string
+    _("abc").padEnd(6); // $ExpectType string
+    _("abc").padEnd(6, "_-"); // $ExpectType string
+    _.chain("abc").padEnd(); // $ExpectType LoDashExplicitWrapper<string>
+    _.chain("abc").padEnd(6); // $ExpectType LoDashExplicitWrapper<string>
+    _.chain("abc").padEnd(6, "_-"); // $ExpectType LoDashExplicitWrapper<string>
+    fp.padEnd(8, "abc"); // $ExpectType string
+    fp.padEnd(8)("abc"); // $ExpectType string
+    fp.padCharsEnd("_", 8, "abc"); // $ExpectType string
+    fp.padCharsEnd("_")(8)("abc"); // $ExpectType string
 }
 
 // _.padStart
-namespace TestPadStart {
-    {
-        let result: string;
-
-        result = _.padStart('abc');
-        result = _.padStart('abc', 6);
-        result = _.padStart('abc', 6, '_-');
-
-        result = _('abc').padStart();
-        result = _('abc').padStart(6);
-        result = _('abc').padStart(6, '_-');
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<string>;
-
-        result = _('abc').chain().padStart();
-        result = _('abc').chain().padStart(6);
-        result = _('abc').chain().padStart(6, '_-');
-    }
+{
+    _.padStart("abc"); // $ExpectType string
+    _.padStart("abc", 6); // $ExpectType string
+    _.padStart("abc", 6, "_-"); // $ExpectType string
+    _("abc").padStart(); // $ExpectType string
+    _("abc").padStart(6); // $ExpectType string
+    _("abc").padStart(6, "_-"); // $ExpectType string
+    _.chain("abc").padStart(); // $ExpectType LoDashExplicitWrapper<string>
+    _.chain("abc").padStart(6); // $ExpectType LoDashExplicitWrapper<string>
+    _.chain("abc").padStart(6, "_-"); // $ExpectType LoDashExplicitWrapper<string>
+    fp.padStart(8, "abc"); // $ExpectType string
+    fp.padStart(8)("abc"); // $ExpectType string
+    fp.padCharsStart("_", 8, "abc"); // $ExpectType string
+    fp.padCharsStart("_")(8)("abc"); // $ExpectType string
 }
 
 // _.parseInt
-namespace TestParseInt {
-    {
-        let result: number;
-
-        result = _.parseInt('08');
-        result = _.parseInt('08', 10);
-
-        result = _('08').parseInt();
-        result = _('08').parseInt(10);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<number>;
-
-        result = _('08').chain().parseInt();
-        result = _('08').chain().parseInt(10);
-    }
+{
+    _.parseInt("08"); // $ExpectType number
+    _.parseInt("08", 10); // $ExpectType number
+    _("08").parseInt(); // $ExpectType number
+    _("08").parseInt(10); // $ExpectType number
+    _.chain("08").parseInt(); // $ExpectType LoDashExplicitWrapper<number>
+    _.chain("08").parseInt(10); // $ExpectType LoDashExplicitWrapper<number>
+    fp.parseInt(10, "08"); // $ExpectType number
+    fp.parseInt(10)("08"); // $ExpectType number
 }
 
 // _.repeat
-namespace TestRepeat {
-    {
-        let result: string;
-        result = _.repeat('*');
-        result = _.repeat('*', 3);
-
-        result = _('*').repeat();
-        result = _('*').repeat(3);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<string>;
-
-        result = _('*').chain().repeat();
-        result = _('*').chain().repeat(3);
-    }
+{
+    _.repeat("*"); // $ExpectType string
+    _.repeat("*", 3); // $ExpectType string
+    _("*").repeat(); // $ExpectType string
+    _("*").repeat(3); // $ExpectType string
+    _.chain("*").repeat(); // $ExpectType LoDashExplicitWrapper<string>
+    _.chain("*").repeat(3); // $ExpectType LoDashExplicitWrapper<string>
+    fp.repeat(3, "*"); // $ExpectType string
 }
 
 // _.replace
-namespace TestReplace {
-    let replacer = (match: string, offset: number, string: string) => 'Barney';
+{
+    const replacer = (match: string, offset: number, string: string) => "Barney";
 
-    {
-        let result: string;
+    _.replace("Hi Fred", "Fred", "Barney"); // $ExpectType string
+    _.replace("Hi Fred", "Fred", replacer); // $ExpectType string
+    _.replace("Hi Fred", /fred/i, "Barney"); // $ExpectType string
+    _.replace("Hi Fred", /fred/i, replacer); // $ExpectType string
 
-        result = _.replace('Hi Fred', 'Fred', 'Barney');
-        result = _.replace('Hi Fred', 'Fred', replacer);
+    _("Hi Fred").replace("Fred", "Barney"); // $ExpectType string
+    _("Hi Fred").replace("Fred", replacer); // $ExpectType string
+    _("Hi Fred").replace(/fred/i, "Barney"); // $ExpectType string
+    _("Hi Fred").replace(/fred/i, replacer); // $ExpectType string
 
-        result = _.replace('Hi Fred', /fred/i, 'Barney');
-        result = _.replace('Hi Fred', /fred/i, replacer);
+    _.chain("Hi Fred").replace("Fred", "Barney"); // $ExpectType LoDashExplicitWrapper<string>
+    _.chain("Hi Fred").replace("Fred", replacer); // $ExpectType LoDashExplicitWrapper<string>
+    _.chain("Hi Fred").replace(/fred/i, "Barney"); // $ExpectType LoDashExplicitWrapper<string>
+    _.chain("Hi Fred").replace(/fred/i, replacer); // $ExpectType LoDashExplicitWrapper<string>
 
-        result = _.replace('Fred', 'Barney');
-        result = _.replace('Fred', replacer);
-
-        result = _.replace(/fred/i, 'Barney');
-        result = _.replace(/fred/i, replacer);
-
-        result = _('Hi Fred').replace('Fred', 'Barney');
-        result = _('Hi Fred').replace('Fred', replacer);
-
-        result = _('Hi Fred').replace(/fred/i, 'Barney');
-        result = _('Hi Fred').replace(/fred/i, replacer);
-
-        result = _('Fred').replace('Barney');
-        result = _('Fred').replace(replacer);
-
-        result = _(/fred/i).replace('Barney');
-        result = _(/fred/i).replace(replacer);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<string>;
-
-        result = _('Hi Fred').chain().replace('Fred', 'Barney');
-        result = _('Hi Fred').chain().replace('Fred', replacer);
-
-        result = _('Hi Fred').chain().replace(/fred/i, 'Barney');
-        result = _('Hi Fred').chain().replace(/fred/i, replacer);
-
-        result = _('Fred').chain().replace('Barney');
-        result = _('Fred').chain().replace(replacer);
-
-        result = _(/fred/i).chain().replace('Barney');
-        result = _(/fred/i).chain().replace(replacer);
-    }
+    fp.replace("Fred", "Barney", "Hi Fred"); // $ExpectType string
+    fp.replace("Fred")("Barney")("Hi Fred"); // $ExpectType string
+    fp.replace("Fred")(replacer)("Hi Fred"); // $ExpectType string
+    fp.replace(/fred/i)("Barney")("Hi Fred"); // $ExpectType string
+    fp.replace(/fred/i)(replacer)("Hi Fred"); // $ExpectType string
 }
 
 // _.snakeCase
-namespace TestSnakeCase {
-    {
-        let result: string;
-
-        result = _.snakeCase('Foo Bar');
-        result = _('Foo Bar').snakeCase();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<string>;
-
-        result = _('Foo Bar').chain().snakeCase();
-    }
+{
+    _.snakeCase("Foo Bar"); // $ExpectType string
+    _("Foo Bar").snakeCase(); // $ExpectType string
+    _.chain("Foo Bar").snakeCase(); // $ExpectType LoDashExplicitWrapper<string>
+    fp.snakeCase("Foo Bar"); // $ExpectType string
 }
 
 // _.split
-namespace TestSplit {
-    {
-        let result: string[];
+{
+    _.split("a-b-c"); // $ExpectType string[]
+    _.split("a-b-c", "-"); // $ExpectType string[]
+    _.split("a-b-c", "-", 2); // $ExpectType string[]
+    _("a-b-c").split(); // $ExpectType LoDashImplicitWrapper<string[]>
+    _("a-b-c").split("-"); // $ExpectType LoDashImplicitWrapper<string[]>
+    _("a-b-c").split("-", 2); // $ExpectType LoDashImplicitWrapper<string[]>
+    _.chain("a-b-c").split(); // $ExpectType LoDashExplicitWrapper<string[]>
+    _.chain("a-b-c").split("-"); // $ExpectType LoDashExplicitWrapper<string[]>
+    _.chain("a-b-c").split("-", 2); // $ExpectType LoDashExplicitWrapper<string[]>
+    fp.split("-", "a-b-c"); // $ExpectType string[]
+    fp.split("-")("a-b-c"); // $ExpectType string[]
 
-        result = _.split('a-b-c');
-        result = _.split('a-b-c', '-');
-        result = _.split('a-b-c', '-', 2);
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<string>;
-
-        result = _('a-b-c').split();
-        result = _('a-b-c').split('-');
-        result = _('a-b-c').split('-', 2);
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<string>;
-
-        result = _('a-b-c').chain().split();
-        result = _('a-b-c').chain().split('-');
-        result = _('a-b-c').chain().split('-', 2);
-    }
-
-    // $ExpectType string[][]
-    _.map(['abc', 'def'], _.split);
+    _.map(["abc", "def"], _.split); // $ExpectType string[][]
 }
 
 // _.startCase
-namespace TestStartCase {
-    {
-        let result: string;
-
-        result = _.startCase('--foo-bar');
-        result = _('--foo-bar').startCase();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<string>;
-
-        result = _('--foo-bar').chain().startCase();
-    }
+{
+    _.startCase("--foo-bar"); // $ExpectType string
+    _("--foo-bar").startCase(); // $ExpectType string
+    _.chain("--foo-bar").startCase(); // $ExpectType LoDashExplicitWrapper<string>
+    fp.startCase("--foo-bar"); // $ExpectType string
 }
 
 // _.startsWith
-namespace TestStartsWith {
-    {
-        let result: boolean;
-
-        result = _.startsWith('abc', 'a');
-        result = _.startsWith('abc', 'a', 1);
-
-        result = _('abc').startsWith('a');
-        result = _('abc').startsWith('a', 1);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _('abc').chain().startsWith('a');
-        result = _('abc').chain().startsWith('a', 1);
-    }
+{
+    _.startsWith("abc", "a"); // $ExpectType boolean
+    _.startsWith("abc", "a", 1); // $ExpectType boolean
+    _("abc").startsWith("a"); // $ExpectType boolean
+    _("abc").startsWith("a", 1); // $ExpectType boolean
+    _.chain("abc").startsWith("a"); // $ExpectType LoDashExplicitWrapper<boolean>
+    _.chain("abc").startsWith("a", 1); // $ExpectType LoDashExplicitWrapper<boolean>
+    fp.startsWith("a", "abc"); // $ExpectType boolean
+    fp.startsWith("a")("abc"); // $ExpectType boolean
 }
 
 // _.template
-namespace TestTemplate {
-    interface TemplateExecutor {
-        (obj?: object): string;
-        source: string;
-    }
+{
+    const options: _.TemplateOptions = {
+        escape: / /,
+        evaluate: / /,
+        imports: {},
+        interpolate: / /,
+        sourceURL: "",
+        variable: "a",
+    };
 
-    let options: {
-        escape?: RegExp;
-        evaluate?: RegExp;
-        imports?: _.Dictionary<any>;
-        interpolate?: RegExp;
-        sourceURL?: string;
-        variable?: string;
-    } = {};
+    const result = _.template("");
+    result.source; // $ExpectType string
+    result({}); // $ExpectType string
 
-    {
-        let result: TemplateExecutor;
+    _.template(""); // $ExpectType TemplateExecutor
+    _.template("", options); // $ExpectType TemplateExecutor
+    _("").template(); // $ExpectType TemplateExecutor
+    _("").template(options); // $ExpectType TemplateExecutor
+    _.chain("").template(); // $ExpectType LoDashExplicitWrapper<TemplateExecutor>
+    _.chain("").template(options); // $ExpectType LoDashExplicitWrapper<TemplateExecutor>
 
-        result = _.template('');
-        result = _.template('', options);
-
-        result = _('').template();
-        result = _('').template(options);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<TemplateExecutor>;
-
-        result = _('').chain().template();
-        result = _('').chain().template(options);
-    }
+    const result2 = fp.template("");
+    result2(); // $ExpectType string
+    result2.source; // $ExpectType string
 }
 
 // _.toLower
-namespace TestToLower {
-    {
-        let result: string;
-
-        result = _.toLower('fred, barney, &amp; pebbles');
-        result = _('fred, barney, &amp; pebbles').toLower();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<string>;
-
-        result = _('fred, barney, &amp; pebbles').chain().toLower();
-    }
+{
+    _.toLower("fred, barney, &amp; pebbles"); // $ExpectType string
+    _("fred, barney, &amp; pebbles").toLower(); // $ExpectType string
+    _.chain("fred, barney, &amp; pebbles").toLower(); // $ExpectType LoDashExplicitWrapper<string>
+    fp.toLower("fred, barney, &amp; pebbles"); // $ExpectType string
 }
 
 // _.toUpper
-namespace TestToUpper {
-    {
-        let result: string;
-
-        result = _.toUpper('fred, barney, &amp; pebbles');
-        result = _('fred, barney, &amp; pebbles').toUpper();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<string>;
-
-        result = _('fred, barney, &amp; pebbles').chain().toUpper();
-    }
+{
+    _.toUpper("fred, barney, &amp; pebbles"); // $ExpectType string
+    _("fred, barney, &amp; pebbles").toUpper(); // $ExpectType string
+    _.chain("fred, barney, &amp; pebbles").toUpper(); // $ExpectType LoDashExplicitWrapper<string>
+    fp.toUpper("fred, barney, &amp; pebbles"); // $ExpectType string
 }
 
 // _.trim
-namespace TestTrim {
-    {
-        let result: string;
+{
+    _.trim(); // $ExpectType string
+    _.trim("  abc  "); // $ExpectType string
+    _.trim("-_-abc-_-", "_-"); // $ExpectType string
+    _("-_-abc-_-").trim(); // $ExpectType string
+    _("-_-abc-_-").trim("_-"); // $ExpectType string
+    _.chain("-_-abc-_-").trim(); // $ExpectType LoDashExplicitWrapper<string>
+    _.chain("-_-abc-_-").trim("_-"); // $ExpectType LoDashExplicitWrapper<string>
+    fp.trim("  abc  "); // $ExpectType string
+    fp.trimChars(" ", "  abc  "); // $ExpectType string
+    fp.trimChars(" ")("  abc  "); // $ExpectType string
 
-        result = _.trim();
-        result = _.trim('  abc  ');
-        result = _.trim('-_-abc-_-', '_-');
-
-        result = _('-_-abc-_-').trim();
-        result = _('-_-abc-_-').trim('_-');
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<string>;
-
-        result = _('-_-abc-_-').chain().trim();
-        result = _('-_-abc-_-').chain().trim('_-');
-    }
-
-    // $ExpectType string[]
-    _.map(['  foo  ', '  bar  '], _.trim);
+    _.map(["  foo  ", "  bar  "], _.trim); // $ExpectType string[]
 }
 
 // _.trimEnd
-namespace TestTrimEnd {
-    {
-        let result: string;
-
-        result = _.trimEnd();
-        result = _.trimEnd('  abc  ');
-        result = _.trimEnd('-_-abc-_-', '_-');
-
-        result = _('-_-abc-_-').trimEnd();
-        result = _('-_-abc-_-').trimEnd('_-');
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<string>;
-
-        result = _('-_-abc-_-').chain().trimEnd();
-        result = _('-_-abc-_-').chain().trimEnd('_-');
-    }
+{
+    _.trimEnd(); // $ExpectType string
+    _.trimEnd("  abc  "); // $ExpectType string
+    _.trimEnd("-_-abc-_-", "_-"); // $ExpectType string
+    _("-_-abc-_-").trimEnd(); // $ExpectType string
+    _("-_-abc-_-").trimEnd("_-"); // $ExpectType string
+    _.chain("-_-abc-_-").trimEnd(); // $ExpectType LoDashExplicitWrapper<string>
+    _.chain("-_-abc-_-").trimEnd("_-"); // $ExpectType LoDashExplicitWrapper<string>
+    fp.trimEnd("  abc  "); // $ExpectType string
+    fp.trimCharsEnd(" ", "  abc  "); // $ExpectType string
+    fp.trimCharsEnd(" ")("  abc  "); // $ExpectType string
 }
 
 // _.trimStart
-namespace TestTrimStart {
-    {
-        let result: string;
-
-        result = _.trimStart();
-        result = _.trimStart('  abc  ');
-        result = _.trimStart('-_-abc-_-', '_-');
-
-        result = _('-_-abc-_-').trimStart();
-        result = _('-_-abc-_-').trimStart('_-');
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<string>;
-
-        result = _('-_-abc-_-').chain().trimStart();
-        result = _('-_-abc-_-').chain().trimStart('_-');
-    }
+{
+    _.trimStart(); // $ExpectType string
+    _.trimStart("  abc  "); // $ExpectType string
+    _.trimStart("-_-abc-_-", "_-"); // $ExpectType string
+    _("-_-abc-_-").trimStart(); // $ExpectType string
+    _("-_-abc-_-").trimStart("_-"); // $ExpectType string
+    _.chain("-_-abc-_-").trimStart(); // $ExpectType LoDashExplicitWrapper<string>
+    _.chain("-_-abc-_-").trimStart("_-"); // $ExpectType LoDashExplicitWrapper<string>
+    fp.trimStart("  abc  "); // $ExpectType string
+    fp.trimCharsStart(" ", "  abc  "); // $ExpectType string
+    fp.trimCharsStart(" ")("  abc  "); // $ExpectType string
 }
 
 // _.truncate
-namespace TestTruncate {
-    {
-        let result: string;
+{
+    _.truncate("hi-diddly-ho there, neighborino"); // $ExpectType string
+    _.truncate("hi-diddly-ho there, neighborino", { length: 24, separator: " " }); // $ExpectType string
+    _.truncate("hi-diddly-ho there, neighborino", { length: 24, separator: /,? +/ }); // $ExpectType string
+    _.truncate("hi-diddly-ho there, neighborino", { omission: " […]" }); // $ExpectType string
 
-        result = _.truncate('hi-diddly-ho there, neighborino');
-        result = _.truncate('hi-diddly-ho there, neighborino', { 'length': 24, 'separator': ' ' });
-        result = _.truncate('hi-diddly-ho there, neighborino', { 'length': 24, 'separator': /,? +/ });
-        result = _.truncate('hi-diddly-ho there, neighborino', { 'omission': ' […]' });
+    _("hi-diddly-ho there, neighborino").truncate(); // $ExpectType string
+    _("hi-diddly-ho there, neighborino").truncate({ length: 24, separator: " " }); // $ExpectType string
+    _("hi-diddly-ho there, neighborino").truncate({ length: 24, separator: /,? +/ }); // $ExpectType string
+    _("hi-diddly-ho there, neighborino").truncate({ omission: " […]" }); // $ExpectType string
 
-        result = _('hi-diddly-ho there, neighborino').truncate();
-        result = _('hi-diddly-ho there, neighborino').truncate({ 'length': 24, 'separator': ' ' });
-        result = _('hi-diddly-ho there, neighborino').truncate({ 'length': 24, 'separator': /,? +/ });
-        result = _('hi-diddly-ho there, neighborino').truncate({ 'omission': ' […]' });
-    }
+    _.chain("hi-diddly-ho there, neighborino").truncate(); // $ExpectType LoDashExplicitWrapper<string>
+    _.chain("hi-diddly-ho there, neighborino").truncate({ length: 24, separator: " " }); // $ExpectType LoDashExplicitWrapper<string>
+    _.chain("hi-diddly-ho there, neighborino").truncate({ length: 24, separator: /,? +/ }); // $ExpectType LoDashExplicitWrapper<string>
+    _.chain("hi-diddly-ho there, neighborino").truncate({ omission: " […]" }); // $ExpectType LoDashExplicitWrapper<string>
 
-    {
-        let result: _.LoDashExplicitWrapper<string>;
-
-        result = _('hi-diddly-ho there, neighborino').chain().truncate();
-        result = _('hi-diddly-ho there, neighborino').chain().truncate({ 'length': 24, 'separator': ' ' });
-        result = _('hi-diddly-ho there, neighborino').chain().truncate({ 'length': 24, 'separator': /,? +/ });
-        result = _('hi-diddly-ho there, neighborino').chain().truncate({ 'omission': ' […]' });
-    }
+    fp.truncate({ length: 24, separator: " " }, "hi-diddly-ho there, neighborino"); // $ExpectType string
+    fp.truncate({ length: 24, separator: " " })("hi-diddly-ho there, neighborino"); // $ExpectType string
+    fp.truncate({ length: 24, separator: /,? +/ }, "hi-diddly-ho there, neighborino"); // $ExpectType string
+    fp.truncate({ omission: " […]" }, "hi-diddly-ho there, neighborino"); // $ExpectType string
 }
 
 // _.unescape
-namespace TestUnescape {
-    {
-        let result: string;
-
-        result = _.unescape('fred, barney, &amp; pebbles');
-        result = _('fred, barney, &amp; pebbles').unescape();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<string>;
-
-        result = _('fred, barney, &amp; pebbles').chain().unescape();
-    }
+{
+    _.unescape("fred, barney, &amp; pebbles"); // $ExpectType string
+    _("fred, barney, &amp; pebbles").unescape(); // $ExpectType string
+    _.chain("fred, barney, &amp; pebbles").unescape(); // $ExpectType LoDashExplicitWrapper<string>
+    fp.unescape("fred, barney, &amp; pebbles"); // $ExpectType string
 }
 
 // _.upperCase
-namespace TestUpperCase {
-    {
-        let result: string;
-
-        result = _.upperCase('fred, barney, &amp; pebbles');
-        result = _('fred, barney, &amp; pebbles').upperCase();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<string>;
-
-        result = _('fred, barney, &amp; pebbles').chain().upperCase();
-    }
+{
+    _.upperCase("fred, barney, &amp; pebbles"); // $ExpectType string
+    _("fred, barney, &amp; pebbles").upperCase(); // $ExpectType string
+    _.chain("fred, barney, &amp; pebbles").upperCase(); // $ExpectType LoDashExplicitWrapper<string>
+    fp.upperCase("fred, barney, &amp; pebbles"); // $ExpectType string
 }
 
 // _.upperFirst
-namespace TestUpperFirst {
-    {
-        let result: string;
-
-        result = _.upperFirst('fred, barney, &amp; pebbles');
-        result = _('fred, barney, &amp; pebbles').upperFirst();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<string>;
-
-        result = _('fred, barney, &amp; pebbles').chain().upperFirst();
-    }
+{
+    _.upperFirst("fred, barney, &amp; pebbles"); // $ExpectType string
+    _("fred, barney, &amp; pebbles").upperFirst(); // $ExpectType string
+    _.chain("fred, barney, &amp; pebbles").upperFirst(); // $ExpectType LoDashExplicitWrapper<string>
+    fp.upperFirst("fred, barney, &amp; pebbles"); // $ExpectType string
 }
 
 // _.words
-namespace TestWords {
-    {
-        let result: string[];
+{
+    _.words("fred, barney, & pebbles"); // $ExpectType string[]
+    _.words("fred, barney, & pebbles", /[^, ]+/g); // $ExpectType string[]
+    _("fred, barney, & pebbles").words(); // $ExpectType string[]
+    _("fred, barney, & pebbles").words(/[^, ]+/g); // $ExpectType string[]
+    _.chain("fred, barney, & pebbles").words(); // $ExpectType LoDashExplicitWrapper<string[]>
+    _.chain("fred, barney, & pebbles").words(/[^, ]+/g); // $ExpectType LoDashExplicitWrapper<string[]>
+    fp.words("fred, barney, & pebbles"); // $ExpectType string[]
 
-        result = _.words('fred, barney, & pebbles');
-        result = _.words('fred, barney, & pebbles', /[^, ]+/g);
-
-        result = _('fred, barney, & pebbles').words();
-        result = _('fred, barney, & pebbles').words(/[^, ]+/g);
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<string>;
-
-        result = _('fred, barney, & pebbles').chain().words();
-        result = _('fred, barney, & pebbles').chain().words(/[^, ]+/g);
-    }
-
-    // $ExpectType string[][]
-    _.map(['fred, barney', 'pebbles'], _.words);
+    _.map(["fred, barney", "pebbles"], _.words); // $ExpectType string[][]
 }
 
-/***********
- * Utility *
- ***********/
+/********
+ * Util *
+ ********/
 
 // _.attempt
-namespace TestAttempt {
-    let func: (...args: any[]) => {a: string} = (...args) => ({ a: "" });
+{
+    const func = (...args: any[]): AbcObject => anything;
 
-    {
-        let result: {a: string}|Error;
+    // We can't use ExpectType here because typescript keeps changing what order the types appear.
+    let result: Error | AbcObject;
+    result = _.attempt(func);
+    result = _.attempt(func, "foo", "bar", "baz");
+    result = _(func).attempt<AbcObject>();
+    result = _(func).attempt<AbcObject>("foo", "bar", "baz");
 
-        result = _.attempt<{a: string}>(func);
-        result = _.attempt<{a: string}>(func, 'foo', 'bar', 'baz');
-        result = _(func).attempt<{a: string}>();
-        result = _(func).attempt<{a: string}>('foo', 'bar', 'baz');
-    }
+    let explicitResult: _.LoDashExplicitWrapper<Error | AbcObject>;
+    explicitResult = _.chain(func).attempt<AbcObject>();
+    explicitResult = _.chain(func).attempt<AbcObject>("foo", "bar", "baz");
 
-    {
-        let result: _.LoDashExplicitObjectWrapper<{a: string}|Error>;
-
-        result = _(func).chain().attempt<{a: string}>();
-        result = _(func).chain().attempt<{a: string}>('foo', 'bar', 'baz');
-    }
+    result = fp.attempt(func);
 }
 
 // _.cond
-namespace TestCond {
-    let pairPred1: (val: string) => boolean = (val) => true;
-    let pairPred2: (val: string) => boolean = (val) => false;
-    let pairRes1: (val: string) => number = (val) => 1;
-    let pairRes2: (val: string) => number = (val) => 2;
+{
+    const pairPred1 = (val: string) => true;
+    const pairPred2 = (val: string) => false;
+    const pairRes1 = (val: string) => 1;
+    const pairRes2 = (val: string) => 2;
 
-    {
-        let result: number;
-
-        result = _.cond([[pairPred1, pairRes1],[pairPred2, pairRes2]])('hello');
-    }
+    _.cond([[pairPred1, pairRes1], [pairPred2, pairRes2]])("hello"); // $ExpectType number
+    fp.cond([[pairPred1, pairRes1], [pairPred2, pairRes2]])("hello"); // $ExpectType number
 }
 
 // _.constant
-namespace TestConstant {
-    {
-        let result: () => number;
-        result = _.constant<number>(42);
-    }
+{
+    _.constant(42); // $ExpectType () => number
+    _.constant("a"); // $ExpectType () => string
+    _.constant([true]); // $ExpectType () => boolean[]
+    _.constant({ a: "" }); // $ExpectType () => { a: string; }
 
-    {
-        let result: () => string;
-        result = _.constant<string>('a');
-    }
+    _(42).constant(); // $ExpectType LoDashImplicitWrapper<() => number>
+    _("a").constant(); // $ExpectType LoDashImplicitWrapper<() => string>
+    _([true]).constant(); // $ExpectType LoDashImplicitWrapper<() => boolean[]>
+    _({ a: "" }).constant(); // $ExpectType LoDashImplicitWrapper<() => { a: string; }>
 
-    {
-        let result: () => boolean;
-        result = _.constant<boolean>(true);
-    }
+    _.chain(42).constant(); // $ExpectType LoDashExplicitWrapper<() => number>
+    _.chain("a").constant(); // $ExpectType LoDashExplicitWrapper<() => string>
+    _.chain([true]).constant(); // $ExpectType LoDashExplicitWrapper<() => boolean[]>
+    _.chain({ a: "" }).constant(); // $ExpectType LoDashExplicitWrapper<() => { a: string; }>
 
-    {
-        let result: () => string[];
-        result = _.constant<string[]>(['a']);
-    }
-
-    {
-        let result: () => {a: string};
-        result = _.constant<{a: string}>({a: 'a'});
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<() => number>;
-        result = _(42).constant();
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<() => string>;
-        result = _('a').constant();
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<() => boolean>;
-        result = _(true).constant();
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<() => string[]>;
-        result = _(['a']).constant();
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<() => {a: string}>;
-        result = _({a: 'a'}).constant();
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<() => number>;
-        result = _(42).chain().constant();
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<() => string>;
-        result = _('a').chain().constant();
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<() => boolean>;
-        result = _(true).chain().constant();
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<() => string[]>;
-        result = _(['a']).chain().constant();
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<() => {a: string}>;
-        result = _({a: 'a'}).chain().constant();
-    }
+    fp.constant(42); // $ExpectType () => number
+    fp.constant("a"); // $ExpectType () => string
+    fp.constant([true]); // $ExpectType () => boolean[]
+    fp.constant({ a: "" }); // $ExpectType () => { a: string; }
 }
 
 // _.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);
-    }
+{
+    _.defaultTo(42, 42); // $ExpectType 42
+    _.defaultTo(undefined, 42); // $ExpectType 42
+    _.defaultTo(null, 42); // $ExpectType 42
+    _.defaultTo(NaN, 42); // $ExpectType number
+    _.defaultTo(undefined, "default"); // $ExpectType "default"
+    _.defaultTo(undefined, [true]); // $ExpectType boolean[]
+    _.defaultTo(undefined, { a: "" }); // $ExpectType { a: string; }
 
-    {
-        let result: string;
-        result = _.defaultTo<string>('a', 'default');
-        result = _.defaultTo<string>(undefined, 'default');
-        result = _.defaultTo<string>(null, 'default');
-    }
+    _(42).defaultTo(42); // $ExpectType number
+    _(undefined).defaultTo(42); // $ExpectType 42
+    _(null).defaultTo(42); // $ExpectType 42
+    _(NaN).defaultTo(42); // $ExpectType number
+    _(undefined).defaultTo("default"); // $ExpectType "default"
+    _(undefined).defaultTo([true]); // $ExpectType boolean[]
+    _(undefined).defaultTo({ a: "" }); // $ExpectType { a: string; }
 
-    {
-        let result: boolean;
-        result = _.defaultTo<boolean>(true, true);
-        result = _.defaultTo<boolean>(undefined, true);
-        result = _.defaultTo<boolean>(null, true);
-    }
+    _.chain(42).defaultTo(42); // $ExpectType LoDashExplicitWrapper<number>
+    _.chain(undefined).defaultTo(42); // $ExpectType LoDashExplicitWrapper<42>
+    _.chain(null).defaultTo(42); // $ExpectType LoDashExplicitWrapper<42>
+    _.chain(NaN).defaultTo(42); // $ExpectType LoDashExplicitWrapper<number>
+    _.chain(undefined).defaultTo("default"); // $ExpectType LoDashExplicitWrapper<"default">
+    _.chain(undefined).defaultTo([true]); // $ExpectType LoDashExplicitWrapper<boolean[]>
+    _.chain(undefined).defaultTo({ a: "" }); // $ExpectType LoDashExplicitWrapper<{ a: string; }>
 
-    {
-        let result: string[];
-        result = _.defaultTo<string[]>(['a'], ['default']);
-        result = _.defaultTo<string[]>(undefined, ['default']);
-        result = _.defaultTo<string[]>(null, ['default']);
-    }
+    const n: number = anything;
+    fp.defaultTo(42, n); // $ExpectType number
+    fp.defaultTo(42)(n); // $ExpectType number
+    fp.defaultTo(42)(undefined); // $ExpectType number
+    fp.defaultTo(42)(null); // $ExpectType number
+    fp.defaultTo(42)(NaN); // $ExpectType number
 
-    {
-        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: number;
-        result = _(42).defaultTo(42);
-        result = _(undefined).defaultTo(42);
-        result = _(null).defaultTo(42);
-        result = _(NaN).defaultTo(42);
-    }
-
-    {
-        let result: string;
-        result = _('a').defaultTo('default');
-        result = _(null).defaultTo('default');
-    }
-
-    {
-        let result: boolean;
-        result = _(true).defaultTo(true);
-        result = _(undefined).defaultTo(true);
-        result = _(null).defaultTo(true);
-    }
-
-    {
-        let result: string[];
-        result = _(['a']).defaultTo(['default']);
-        result = _(undefined).defaultTo(['default']);
-        result = _(null).defaultTo(['default']);
-    }
-
-    {
-        let result: { a: string };
-        result = _({ a: 'a' }).defaultTo({a : 'a'});
-        result = _(undefined).defaultTo({a : 'a'});
-        result = _(null).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');
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<boolean>;
-        result = _(true).chain().defaultTo(true);
-        result = _(undefined).chain().defaultTo(true);
-        result = _(null).chain().defaultTo(true);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<string[]>;
-        result = _(['a']).chain().defaultTo(['default']);
-        result = _(undefined).chain().defaultTo(['default']);
-        result = _(null).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'});
-    }
+    const arr: boolean[] | undefined = anything;
+    const result: boolean[] | "a" = fp.defaultTo("a", arr);
 }
 
 // _.identity
-namespace TestIdentity {
-    {
-        let result: number;
-
-        result = _.identity(42);
-        result = _(42).identity();
-    }
-
-    {
-        let result: number[];
-
-        result = _.identity([42]);
-        result = _([42]).identity();
-    }
-
-    {
-        let result: {a: number};
-
-        result = _.identity({a: 42});
-        result = _({a: 42}).identity();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<number>;
-
-        result = _(42).chain().identity();
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<number>;
-
-        result = _([42]).chain().identity();
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<{a: number}>;
-
-        result = _({a: 42}).chain().identity();
-    }
-
-    {
-        let input: { a: number; } | null | undefined = anything;
-        _.identity(input); // $ExpectType { a: number; } | null | undefined
-        _.identity(); // $ExpectType undefined
-    }
+{
+    _.identity(42); // $ExpectType 42
+    _.identity([""]); // $ExpectType string[]
+    _.identity({ a: true }); // $ExpectType { a: boolean; }
+    _(42).identity(); // $ExpectType number
+    _([""]).identity(); // $ExpectType string[]
+    _({ a: true }).identity(); // $ExpectType { a: boolean; }
+    _.chain(42).identity(); // $ExpectType LoDashExplicitWrapper<number>
+    _.chain([""]).identity(); // $ExpectType LoDashExplicitWrapper<string[]>
+    _.chain({ a: true }).identity(); // $ExpectType LoDashExplicitWrapper<{ a: boolean; }>
+    fp.identity(42); // $ExpectType 42
+    fp.identity([""]); // $ExpectType string[]
+    fp.identity({ a: true }); // $ExpectType { a: boolean; }
 }
 
 // _.iteratee
-namespace TestIteratee {
-    {
-        _.iteratee((...args: any[]): AbcObject => anything); // $ExpectType (...args: any[]) => AbcObject
-        _.iteratee((a: AbcObject): boolean => anything); // $ExpectType (a: AbcObject) => boolean
-        _.iteratee((a: AbcObject | undefined): a is undefined => anything); // $ExpectType (a: AbcObject | undefined) => a is undefined
-    }
+{
+    _.iteratee((a: AbcObject): boolean => anything); // $ExpectType (a: AbcObject) => boolean
+    _.iteratee((...args: any[]): AbcObject => anything); // $ExpectType (...args: any[]) => AbcObject
+    _.iteratee("a"); // $ExpectType (...args: any[]) => any
+    _.iteratee({ a: 42 }); // $ExpectType (...args: any[]) => any
+    _.iteratee(["a", 42]); // $ExpectType (...args: any[]) => any
 
-    {
-        let result: (object: any) => AbcObject;
+    _((a: AbcObject): boolean => anything).iteratee(); // $ExpectType LoDashImplicitWrapper<(a: AbcObject) => boolean>
+    _("a").iteratee(); // $ExpectType LoDashImplicitWrapper<(...args: any[]) => any>
+    _({ a: 42 }).iteratee(); // $ExpectType LoDashImplicitWrapper<(...args: any[]) => any>
+    _(["a", 42]).iteratee(); // $ExpectType LoDashImplicitWrapper<(...args: any[]) => any>
 
-        result = _.iteratee('');
-    }
+    _.chain((a: AbcObject): boolean => anything).iteratee(); // $ExpectType LoDashExplicitWrapper<(a: AbcObject) => boolean>
+    _.chain("a").iteratee(); // $ExpectType LoDashExplicitWrapper<(...args: any[]) => any>
+    _.chain({ a: 42 }).iteratee(); // $ExpectType LoDashExplicitWrapper<(...args: any[]) => any>
+    _.chain(["a", 42]).iteratee(); // $ExpectType LoDashExplicitWrapper<(...args: any[]) => any>
 
-    {
-        let result: (object: any) => boolean;
-
-        result = _.iteratee({});
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<(...args: any[]) => AbcObject>;
-
-        let func: (...args: any[]) => AbcObject = anything;
-        result = _(func).iteratee();
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<(object: any) => AbcObject>;
-
-        result = _('').iteratee();
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<(object: any) => boolean>;
-
-        result = _({}).iteratee();
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<(...args: any[]) => AbcObject>;
-
-        let func: (...args: any[]) => AbcObject = anything;
-        result = _(func).chain().iteratee();
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<(object: any) => AbcObject>;
-
-        result = _('').chain().iteratee();
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<(object: any) => boolean>;
-
-        result = _({}).chain().iteratee();
-    }
+    fp.iteratee((a: AbcObject): boolean => anything); // $ExpectType (a: AbcObject) => boolean
+    fp.iteratee((...args: any[]): AbcObject => anything); // $ExpectType (...args: any[]) => AbcObject
+    fp.iteratee(""); // $ExpectType (...args: any[]) => any
+    fp.iteratee({ a: 42 }); // $ExpectType (...args: any[]) => any
+    fp.iteratee(["a", 42]); // $ExpectType (...args: any[]) => any
 }
 
 // _.matches
-namespace TestMatches {
-    let source: AbcObject = { a: 1, b: "", c: true };
+{
+    const source: AbcObject = { a: 1, b: "", c: true };
 
-    {
-        let result: (value: any) => boolean;
-        result = _.matches(source);
-    }
+    _.matches(source); // $ExpectType (value: any) => boolean
+    _.matches<AbcObject, AbcObject>(source); // $ExpectType (value: AbcObject) => boolean
+    _(source).matches<AbcObject>(); // $ExpectType LoDashImplicitWrapper<(value: AbcObject) => boolean>
+    _.chain(source).matches<AbcObject>(); // $ExpectType LoDashExplicitWrapper<(value: AbcObject) => boolean>
 
-    {
-        let result: (value: AbcObject) => boolean;
-        result = _.matches<AbcObject, AbcObject>(source);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<(value: AbcObject) => boolean>;
-        result = _(source).matches();
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<(value: AbcObject) => boolean>;
-        result = _(source).chain().matches();
-    }
+    fp.matches(source, {}); // $ExpectType boolean
+    fp.matches(source)({}); // $ExpectType boolean
 }
 
 // _.matchesProperty
 {
-    let path: string | string[] = [];
-    let source: AbcObject = { a: 1, b: "", c: true };
+    const path: string | string[] = anything;
+    const source: AbcObject = { a: 1, b: "", c: true };
 
-    {
-        let result: (value: any) => boolean;
-
-        result = _.matchesProperty(path, source);
-    }
-
-    {
-        let result: (value: AbcObject) => boolean;
-
-        result = _.matchesProperty<AbcObject, AbcObject>(path, source);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<(value: any) => boolean>;
-
-        result = _(path).matchesProperty(source);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<(value: AbcObject) => boolean>;
-
-        result = _(path).matchesProperty<AbcObject, AbcObject>(source);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<(value: any) => boolean>;
-
-        result = _(path).chain().matchesProperty(source);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<(value: AbcObject) => boolean>;
-
-        result = _(path).chain().matchesProperty<AbcObject, AbcObject>(source);
-    }
+    _.matchesProperty(path, source); // $ExpectType (value: any) => boolean
+    _.matchesProperty<AbcObject, AbcObject>(path, source); // $ExpectType (value: AbcObject) => boolean
+    _(path).matchesProperty(source); // $ExpectType LoDashImplicitWrapper<(value: any) => boolean>
+    _(path).matchesProperty<AbcObject, AbcObject>(source);
+    _.chain(path).matchesProperty(source); // $ExpectType LoDashExplicitWrapper<(value: any) => boolean>
+    fp.matchesProperty(path, source); // $ExpectType (value: any) => boolean
 }
 
 // _.method
-namespace TestMethod {
-    {
-        let result: (object: any) => {a: string};
+{
+    _.method("a.0"); // $ExpectType (object: any) => any
+    _.method("a.0", anything, anything, anything); // $ExpectType (object: any) => any
+    _.method(["a", 0]); // $ExpectType (object: any) => any
+    _.method(["a", 0], anything, anything, anything); // $ExpectType (object: any) => any
 
-        result = _.method('a.0');
-        result = _.method('a.0', anything, anything);
-        result = _.method('a.0', anything, anything, anything);
+    _("a.0").method(); // $ExpectType LoDashImplicitWrapper<(object: any) => any>
+    _("a.0").method(anything, anything, anything); // $ExpectType LoDashImplicitWrapper<(object: any) => any>
+    _(["a", 0]).method(); // $ExpectType LoDashImplicitWrapper<(object: any) => any>
+    _(["a", 0]).method(anything, anything, anything); // $ExpectType LoDashImplicitWrapper<(object: any) => any>
 
-        result = _.method(['a', 0]);
-        result = _.method(['a', 0], anything);
-        result = _.method(['a', 0], anything, anything);
-        result = _.method(['a', 0], anything, anything, anything);
-    }
+    _.chain("a.0").method(); // $ExpectType LoDashExplicitWrapper<(object: any) => any>
+    _.chain("a.0").method(anything, anything, anything); // $ExpectType LoDashExplicitWrapper<(object: any) => any>
+    _.chain(["a", 0]).method(); // $ExpectType LoDashExplicitWrapper<(object: any) => any>
+    _.chain(["a", 0]).method(anything, anything, anything); // $ExpectType LoDashExplicitWrapper<(object: any) => any>
 
-    {
-        let result: (object: {a: string}) => {b: string};
-
-        result = _.method('a.0');
-        result = _.method('a.0', anything, anything);
-        result = _.method('a.0', anything, anything, anything);
-
-        result = _.method(['a', 0]);
-        result = _.method(['a', 0], anything);
-        result = _.method(['a', 0], anything, anything);
-        result = _.method(['a', 0], anything, anything, anything);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<(object: any) => {a: string}>;
-
-        result = _('a.0').method();
-        result = _('a.0').method(anything);
-        result = _('a.0').method(anything, anything);
-        result = _('a.0').method(anything, anything, anything);
-
-        result = _(['a', 0]).method();
-        result = _(['a', 0]).method(anything);
-        result = _(['a', 0]).method(anything, anything);
-        result = _(['a', 0]).method(anything, anything, anything);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<(object: {a: string}) => {b: string}>;
-
-        result = _('a.0').method();
-        result = _('a.0').method(anything);
-        result = _('a.0').method(anything, anything);
-        result = _('a.0').method(anything, anything, anything);
-
-        result = _(['a', 0]).method();
-        result = _(['a', 0]).method(anything);
-        result = _(['a', 0]).method(anything, anything);
-        result = _(['a', 0]).method(anything, anything, anything);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<(object: any) => {a: string}>;
-
-        result = _('a.0').chain().method();
-        result = _('a.0').chain().method(anything);
-        result = _('a.0').chain().method(anything, anything);
-        result = _('a.0').chain().method(anything, anything, anything);
-
-        result = _(['a', 0]).chain().method();
-        result = _(['a', 0]).chain().method(anything);
-        result = _(['a', 0]).chain().method(anything, anything);
-        result = _(['a', 0]).chain().method(anything, anything, anything);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<(object: {a: string}) => {b: string}>;
-
-        result = _('a.0').chain().method();
-        result = _('a.0').chain().method(anything);
-        result = _('a.0').chain().method(anything, anything);
-        result = _('a.0').chain().method(anything, anything, anything);
-
-        result = _(['a', 0]).chain().method();
-        result = _(['a', 0]).chain().method(anything);
-        result = _(['a', 0]).chain().method(anything, anything);
-        result = _(['a', 0]).chain().method(anything, anything, anything);
-    }
+    fp.method("a.0"); // $ExpectType (object: any) => any
+    fp.method(["a", 0]); // $ExpectType (object: any) => any
+    fp.method(Symbol.replace); // $ExpectType (object: any) => any
 }
 
 // _.methodOf
-namespace TestMethodOf {
-    type SampleObject = { a: Array<{ b(): AbcObject }> };
-    type ResultFn = (path: string | string[]) => AbcObject;
+{
+    const object: AbcObject = anything;
 
-    let object: SampleObject = { a: [] };
-
-    {
-        let result: ResultFn;
-
-        result = _.methodOf(object);
-        result = _.methodOf(object, anything);
-        result = _.methodOf(object, anything, anything);
-        result = _.methodOf(object, anything, anything, anything);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<ResultFn>;
-
-        result = _(object).methodOf();
-        result = _(object).methodOf(anything);
-        result = _(object).methodOf(anything, anything);
-        result = _(object).methodOf(anything, anything, anything);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<ResultFn>;
-
-        result = _(object).chain().methodOf();
-        result = _(object).chain().methodOf(anything);
-        result = _(object).chain().methodOf(anything, anything);
-        result = _(object).chain().methodOf(anything, anything, anything);
-    }
+    _.methodOf(object); // $ExpectType (path: Many<PropertyName>) => any
+    _.methodOf(object, anything, anything, anything); // $ExpectType (path: Many<PropertyName>) => any
+    _(object).methodOf(); // $ExpectType LoDashImplicitWrapper<(path: Many<PropertyName>) => any>
+    _(object).methodOf(anything, anything, anything); // $ExpectType LoDashImplicitWrapper<(path: Many<PropertyName>) => any>
+    _.chain(object).methodOf(); // $ExpectType LoDashExplicitWrapper<(path: Many<PropertyName>) => any>
+    _.chain(object).methodOf(anything, anything, anything); // $ExpectType LoDashExplicitWrapper<(path: Many<PropertyName>) => any>
+    fp.methodOf(object); // $ExpectType (path: Many<PropertyName>) => any
 }
 
 // _.mixin
-namespace TestMixin {
-    let source: _.Dictionary<(...args: any[]) => any> = {};
-    let dest: AbcObject = anything;
-    let options: {chain?: boolean} = {};
+{
+    const source: _.Dictionary<(...args: any[]) => any> = {};
+    const dest: AbcObject = anything;
+    const options: {chain?: boolean} = {};
 
-    {
-        let result: _.LoDashStatic;
+    _.mixin(source); // $ExpectType LoDashStatic
+    _.mixin(source, options); // $ExpectType LoDashStatic
+    _.mixin(dest, source); // $ExpectType AbcObject
+    _.mixin(dest, source, options); // $ExpectType AbcObject
 
-        result = _.mixin(source);
-        result = _.mixin(source, options);
-    }
+    _(source).mixin(); // $ExpectType LoDashImplicitWrapper<LoDashStatic>
+    _(source).mixin(options); // $ExpectType LoDashImplicitWrapper<LoDashStatic>
+    _(dest).mixin(source); // $ExpectType LoDashImplicitWrapper<AbcObject>
+    _(dest).mixin(source, options); // $ExpectType LoDashImplicitWrapper<AbcObject>
 
-    {
-        let result: AbcObject;
-
-        result = _.mixin(dest, source);
-        result = _.mixin(dest, source, options);
-    }
-
-    {
-        let result: _.LoDashImplicitWrapper<_.LoDashStatic>;
-
-        result = _(source).mixin();
-        result = _(source).mixin(options);
-    }
-
-    {
-        let result: _.LoDashImplicitWrapper<AbcObject>;
-
-        result = _(dest).mixin(source);
-        result = _(dest).mixin(source, options);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<_.LoDashStatic>;
-
-        result = _(source).chain().mixin();
-        result = _(source).chain().mixin(options);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<AbcObject>;
-
-        result = _(dest).chain().mixin(source);
-        result = _(dest).chain().mixin(source, options);
-    }
+    _.chain(source).mixin(); // $ExpectType LoDashExplicitWrapper<LoDashStatic>
+    _.chain(source).mixin(options); // $ExpectType LoDashExplicitWrapper<LoDashStatic>
+    _.chain(dest).mixin(source); // $ExpectType LoDashExplicitWrapper<AbcObject>
+    _.chain(dest).mixin(source, options); // $ExpectType LoDashExplicitWrapper<AbcObject>
 }
 
 // _.noConflict
-namespace TestNoConflict {
-    {
-        let result: typeof _;
-
-        result = _.noConflict();
-        result = _(42).noConflict();
-        result = _<any>([]).noConflict();
-        result = _({}).noConflict();
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<typeof _>;
-
-        result = _(42).chain().noConflict();
-        result = _<any>([]).chain().noConflict();
-        result = _({}).chain().noConflict();
-    }
+{
+    _.noConflict(); // $ExpectType LoDashStatic
+    _(42).noConflict(); // $ExpectType LoDashStatic
+    _.chain(42).noConflict(); // $ExpectType LoDashExplicitWrapper<LoDashStatic>
+    fp.noConflict(); // $ExpectType LoDashStatic
 }
 
 // _.noop
-namespace TestNoop {
-    {
-        let result: void; // tslint:disable-line:void-return
+{
+    _.noop(); // $ExpectType void
+    _.noop(1); // $ExpectType void
+    _.noop(true, "a", 1); // $ExpectType void
+    _("a").noop(true, "a", 1); // $ExpectType void
+    _.chain("a").noop(true, "a", 1); // $ExpectType LoDashExplicitWrapper<undefined>
 
-        result = _.noop();
-        result = _.noop(1);
-        result = _.noop('a', 1);
-        result = _.noop(true, 'a', 1);
-
-        result = _('a').noop(true, 'a', 1);
-        result = _([1]).noop(true, 'a', 1);
-        result = _(['']).noop(true, 'a', 1);
-        result = _({}).noop(true, 'a', 1);
-        result = _(anything).noop(true, 'a', 1);
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<void>;
-
-        result = _('a').chain().noop(true, 'a', 1);
-        result = _([1]).chain().noop(true, 'a', 1);
-        result = _(['']).chain().noop(true, 'a', 1);
-        result = _({}).chain().noop(true, 'a', 1);
-        result = _(anything).chain().noop(true, 'a', 1);
-    }
+    fp.noop(); // $ExpectType void
+    fp.noop(1); // $ExpectType void
+    fp.noop(true, "a", 1); // $ExpectType void
 }
 
-namespace TestNthArg {
-    type SampleFunc = (...args: any[]) => any;
-
-    {
-        let result: SampleFunc;
-
-        result = _.nthArg();
-        result = _.nthArg(1);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<SampleFunc>;
-
-        result = _(1).nthArg();
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<SampleFunc>;
-
-        result = _(1).chain().nthArg();
-    }
+{
+    _.nthArg(); // $ExpectType (...args: any[]) => any
+    _.nthArg(1); // $ExpectType (...args: any[]) => any
+    _(1).nthArg(); // $ExpectType LoDashImplicitWrapper<(...args: any[]) => any>
+    _.chain(1).nthArg(); // $ExpectType LoDashExplicitWrapper<(...args: any[]) => any>
+    fp.nthArg(1); // $ExpectType (...args: any[]) => any
 }
 
 // _.over
-namespace TestOver {
-    {
-        let result: (...args: any[]) => number[];
+{
+    _.over(Math.max); // $ExpectType (...args: any[]) => number[]
+    _.over(Math.max, Math.min); // $ExpectType (...args: any[]) => number[]
+    _.over([Math.max]); // $ExpectType (...args: any[]) => number[]
+    _.over([Math.max], [Math.min]); // $ExpectType (...args: any[]) => number[]
 
-        result = _.over<number>(Math.max);
-        result = _.over<number>(Math.max, Math.min);
-        result = _.over<number>([Math.max]);
-        result = _.over<number>([Math.max], [Math.min]);
-    }
+    _(Math.max).over<number>(); // $ExpectType LoDashImplicitWrapper<(...args: any[]) => number[]>
+    _(Math.max).over<number>(Math.min); // $ExpectType LoDashImplicitWrapper<(...args: any[]) => number[]>
+    _([Math.max]).over<number>(); // $ExpectType LoDashImplicitWrapper<(...args: any[]) => number[]>
+    _([Math.max]).over<number>([Math.min]); // $ExpectType LoDashImplicitWrapper<(...args: any[]) => number[]>
 
-    {
-        let result: _.LoDashImplicitObjectWrapper<(...args: any[]) => number[]>;
+    _.chain(Math.max).over<number>(); // $ExpectType LoDashExplicitWrapper<(...args: any[]) => number[]>
+    _.chain(Math.max).over<number>(Math.min); // $ExpectType LoDashExplicitWrapper<(...args: any[]) => number[]>
+    _.chain([Math.max]).over<number>(); // $ExpectType LoDashExplicitWrapper<(...args: any[]) => number[]>
+    _.chain([Math.max]).over<number>([Math.min]); // $ExpectType LoDashExplicitWrapper<(...args: any[]) => number[]>
 
-        result = _(Math.max).over<number>();
-        result = _(Math.max).over<number>(Math.min);
-        result = _([Math.max]).over<number>();
-        result = _([Math.max]).over<number>([Math.min]);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<(...args: any[]) => number[]>;
-
-        result = _(Math.max).chain().over<number>();
-        result = _(Math.max).chain().over<number>(Math.min);
-        result = _([Math.max]).chain().over<number>();
-        result = _([Math.max]).chain().over<number>([Math.min]);
-    }
+    fp.over(Math.max); // $ExpectType (...args: any[]) => number[]
+    fp.over([Math.max, Math.min]); // $ExpectType (...args: any[]) => number[]
 }
 
 // _.overEvery
-namespace TestOverEvery {
-    {
-        let result: (...args: number[]) => boolean;
-
-        result = _.overEvery((number) => true);
-        result = _.overEvery((number) => true, (number) => true);
-        result = _.overEvery([(number) => true]);
-        result = _.overEvery([(number) => true], [(number) => true]);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<(...args: number[]) => boolean>;
-
-        result = _(Math.max).overEvery();
-        result = _(Math.max).overEvery((number) => true);
-        result = _([Math.max]).overEvery();
-        result = _([Math.max]).overEvery([(number) => true]);
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<(...args: number[]) => boolean>;
-
-        result = _(Math.max).chain().overEvery();
-        result = _(Math.max).chain().overEvery((number) => true);
-        result = _([Math.max]).chain().overEvery();
-        result = _([Math.max]).chain().overEvery([(number) => true]);
-    }
-}
-
 // _.overSome
-namespace TestOverSome {
-    {
-        let result: (...args: number[]) => boolean;
+{
+    _.overEvery((number: number) => true); // $ExpectType (...args: number[]) => boolean
+    _.overEvery((number: number) => true, (number: number) => true); // $ExpectType (...args: number[]) => boolean
+    _.overEvery([(number: number) => true]); // $ExpectType (...args: number[]) => boolean
+    _.overEvery([(number: number) => true], [(number: number) => true]); // $ExpectType (...args: number[]) => boolean
 
-        result = _.overSome((n: number) => true);
-        result = _.overSome((n: number) => true, (n: number) => true);
-        result = _.overSome([(n: number) => true]);
-        result = _.overSome([(n: number) => true], [(n: number) => true]);
-    }
+    _(Math.max).overEvery<number>(); // $ExpectType LoDashImplicitWrapper<(...args: number[]) => boolean>
+    _(Math.max).overEvery((number: number) => true); // $ExpectType LoDashImplicitWrapper<(...args: number[]) => boolean>
+    _([Math.max]).overEvery([(number: number) => true]); // $ExpectType LoDashImplicitWrapper<(...args: number[]) => boolean>
 
-    {
-        let result: _.LoDashImplicitObjectWrapper<(...args: number[]) => boolean>;
+    _.chain(Math.max).overEvery<number>(); // $ExpectType LoDashExplicitWrapper<(...args: number[]) => boolean>
+    _.chain(Math.max).overEvery((number: number) => true); // $ExpectType LoDashExplicitWrapper<(...args: number[]) => boolean>
+    _.chain([Math.max]).overEvery([(number: number) => true]); // $ExpectType LoDashExplicitWrapper<(...args: number[]) => boolean>
 
-        result = _(Math.max).overSome();
-        result = _(Math.max).overSome((n: number) => true);
-        result = _([Math.max]).overSome();
-        result = _([Math.max]).overSome([(n: number) => true]);
-    }
+    fp.overEvery((number: number) => true); // $ExpectType (...args: number[]) => boolean
+    fp.overEvery([(number: number) => true, (number: number) => true]); // $ExpectType (...args: number[]) => boolean
 
-    {
-        let result: _.LoDashExplicitObjectWrapper<(...args: number[]) => boolean>;
+    _.overSome((number: number) => true); // $ExpectType (...args: number[]) => boolean
+    _.overSome((number: number) => true, (number: number) => true); // $ExpectType (...args: number[]) => boolean
+    _.overSome([(number: number) => true]); // $ExpectType (...args: number[]) => boolean
+    _.overSome([(number: number) => true], [(number: number) => true]); // $ExpectType (...args: number[]) => boolean
 
-        result = _(Math.max).chain().overSome();
-        result = _(Math.max).chain().overSome((n: number) => true);
-        result = _([Math.max]).chain().overSome();
-        result = _([Math.max]).chain().overSome([(n: number) => true]);
-    }
+    _(Math.max).overSome<number>(); // $ExpectType LoDashImplicitWrapper<(...args: number[]) => boolean>
+    _(Math.max).overSome((number: number) => true); // $ExpectType LoDashImplicitWrapper<(...args: number[]) => boolean>
+    _([Math.max]).overSome([(number: number) => true]); // $ExpectType LoDashImplicitWrapper<(...args: number[]) => boolean>
+
+    _.chain(Math.max).overSome<number>(); // $ExpectType LoDashExplicitWrapper<(...args: number[]) => boolean>
+    _.chain(Math.max).overSome((number: number) => true); // $ExpectType LoDashExplicitWrapper<(...args: number[]) => boolean>
+    _.chain([Math.max]).overSome([(number: number) => true]); // $ExpectType LoDashExplicitWrapper<(...args: number[]) => boolean>
+
+    fp.overSome((number: number) => true); // $ExpectType (...args: number[]) => boolean
+    fp.overSome([(number: number) => true, (number: number) => true]); // $ExpectType (...args: number[]) => boolean
 }
 
 // _.property
-namespace TestProperty {
+{
     interface SampleObject {
         a: {
             b: number[];
-        }
+        };
     }
 
-    {
-        let result: (object: SampleObject) => number;
-
-        result = _.property<SampleObject, number>('a.b[0]');
-        result = _.property<SampleObject, number>(['a', 'b', 0]);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<(object: SampleObject) => number>;
-
-        result = _('a.b[0]').property<SampleObject, number>();
-        result = _(['a', 'b', 0]).property<SampleObject, number>();
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<(object: SampleObject) => number>;
-
-        result = _('a.b[0]').chain().property<SampleObject, number>();
-        result = _(['a', 'b', 0]).chain().property<SampleObject, number>();
-    }
+    _.property<SampleObject, number>("a.b[0]"); // $ExpectType (obj: SampleObject) => number
+    _.property<SampleObject, number>(["a", "b", 0]); // $ExpectType (obj: SampleObject) => number
+    _("a.b[0]").property<SampleObject, number>(); // $ExpectType LoDashImplicitWrapper<(obj: SampleObject) => number>
+    _(["a", "b", 0]).property<SampleObject, number>(); // $ExpectType LoDashImplicitWrapper<(obj: SampleObject) => number>
+    _.chain("a.b[0]").property<SampleObject, number>(); // $ExpectType LoDashExplicitWrapper<(obj: SampleObject) => number>
+    _.chain(["a", "b", 0]).property<SampleObject, number>(); // $ExpectType LoDashExplicitWrapper<(obj: SampleObject) => number>
+    fp.property(Symbol.iterator)([]); // $ExpectType any
+    fp.property([Symbol.iterator], []); // $ExpectType any
+    fp.property(1)("abc"); // $ExpectType string
 }
 
 // _.propertyOf
-namespace TestPropertyOf {
-    interface SampleObject {
-        a: {
-            b: number[];
-        }
-    }
+{
+    _.propertyOf({}); // $ExpectType (path: Many<PropertyName>) => any
+    _({}).propertyOf(); // $ExpectType LoDashImplicitWrapper<(path: Many<PropertyName>) => any>
+    _.chain({}).propertyOf(); // $ExpectType LoDashExplicitWrapper<(path: Many<PropertyName>) => any>
 
-    let object: SampleObject = { a: { b: [] } };
-
-    {
-        let result: (path: string|string[]) => any;
-
-        result = _.propertyOf({});
-        result = _.propertyOf<SampleObject>(object);
-    }
-
-    {
-        let result: _.LoDashImplicitObjectWrapper<(path: string|string[]) => any>;
-
-        result = _({}).propertyOf();
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<(path: string|string[]) => any>;
-
-        result = _({}).chain().propertyOf();
-    }
+    fp.propertyOf(Symbol.iterator)([]); // $ExpectType any
+    fp.propertyOf([Symbol.iterator], []); // $ExpectType any
+    fp.propertyOf(1)("abc"); // $ExpectType string
 }
 
 // _.range
-namespace TestRange {
-    {
-        let result: number[];
-
-        result = _.range(10);
-        result = _.range(1, 11);
-        result = _.range(0, 30, 5);
-    }
-
-    {
-        let result: _.LoDashImplicitArrayWrapper<number>;
-
-        result = _(10).range();
-        result = _(1).range(11);
-        result = _(0).range(30, 5);
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<number>;
-
-        result = _(10).chain().range();
-        result = _(1).chain().range(11);
-        result = _(0).chain().range(30, 5);
-    }
-
-    // $ExpectType number[][]
-    _.map([5, 5], _.range);
-}
-
 // _.rangeRight
-namespace TestRangeRight {
-    {
-        let result: number[];
+{
+    _.range(10); // $ExpectType number[]
+    _.range(1, 11); // $ExpectType number[]
+    _.range(0, 30, 5); // $ExpectType number[]
+    _(10).range(); // $ExpectType LoDashImplicitWrapper<number[]>
+    _(1).range(11); // $ExpectType LoDashImplicitWrapper<number[]>
+    _(0).range(30, 5); // $ExpectType LoDashImplicitWrapper<number[]>
+    _.chain(10).range(); // $ExpectType LoDashExplicitWrapper<number[]>
+    _.chain(1).range(11); // $ExpectType LoDashExplicitWrapper<number[]>
+    _.chain(0).range(30, 5); // $ExpectType LoDashExplicitWrapper<number[]>
+    fp.range(1, 11); // $ExpectType number[]
+    fp.range(1)(11); // $ExpectType number[]
 
-        result = _.rangeRight(10);
-        result = _.rangeRight(1, 11);
-        result = _.rangeRight(0, 30, 5);
-    }
+    _.rangeRight(10); // $ExpectType number[]
+    _.rangeRight(1, 11); // $ExpectType number[]
+    _.rangeRight(0, 30, 5); // $ExpectType number[]
+    _(10).rangeRight(); // $ExpectType LoDashImplicitWrapper<number[]>
+    _(1).rangeRight(11); // $ExpectType LoDashImplicitWrapper<number[]>
+    _(0).rangeRight(30, 5); // $ExpectType LoDashImplicitWrapper<number[]>
+    _.chain(10).rangeRight(); // $ExpectType LoDashExplicitWrapper<number[]>
+    _.chain(1).rangeRight(11); // $ExpectType LoDashExplicitWrapper<number[]>
+    _.chain(0).rangeRight(30, 5); // $ExpectType LoDashExplicitWrapper<number[]>
+    fp.rangeRight(1, 11); // $ExpectType number[]
+    fp.rangeRight(1)(11); // $ExpectType number[]
 
-    {
-        let result: _.LoDashImplicitArrayWrapper<number>;
-
-        result = _(10).rangeRight();
-        result = _(1).rangeRight(11);
-        result = _(0).rangeRight(30, 5);
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<number>;
-
-        result = _(10).chain().rangeRight();
-        result = _(1).chain().rangeRight(11);
-        result = _(0).chain().rangeRight(30, 5);
-    }
-
-    // $ExpectType number[][]
-    _.map([5, 5], _.rangeRight);
+    _.map([5, 5], _.range); // $ExpectType number[][]
+    _.map([5, 5], _.rangeRight); // $ExpectType number[][]
 }
 
 // _.runInContext
 {
-    let result: typeof _;
-    result = _.runInContext();
-    result = _.runInContext({});
-    result = _({}).runInContext();
+    _.runInContext(); // $ExpectType LoDashStatic
+    _.runInContext({}); // $ExpectType LoDashStatic
+    _({}).runInContext(); // $ExpectType LoDashStatic
+    fp.runInContext({}); // $ExpectType LoDashStatic
 }
 
 // _.stubArray
 {
-    {
-        let result: any[];
-
-        result = _.stubArray();
-        result = _(anything).stubArray();
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<any>;
-
-        result = _('a').chain().stubArray();
-        result = _([1]).chain().stubArray();
-        result = _(['']).chain().stubArray();
-        result = _({}).chain().stubArray();
-        result = _(anything).chain().stubArray();
-    }
+    _.stubArray(); // $ExpectType any[]
+    _(anything).stubArray(); // $ExpectType any[]
+    _.chain(anything).stubArray(); // $ExpectType LoDashExplicitWrapper<any[]>
+    fp.stubArray(); // $ExpectType any[]
 }
 
 // _.stubFalse
 {
-    {
-        let result: boolean;
-
-        result = _.stubFalse();
-        result = _(anything).stubFalse();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _('a').chain().stubFalse();
-        result = _([1]).chain().stubFalse();
-        result = _(['']).chain().stubFalse();
-        result = _({}).chain().stubFalse();
-        result = _(anything).chain().stubFalse();
-    }
+    _.stubFalse(); // $ExpectType boolean
+    _(anything).stubFalse(); // $ExpectType boolean
+    _.chain(anything).stubFalse(); // $ExpectType LoDashExplicitWrapper<boolean>
+    fp.stubFalse(); // $ExpectType boolean
 }
 
 // _.stubObject
 {
-    {
-        let result: object;
-
-        result = _.stubObject();
-        result = _(anything).stubObject();
-    }
-
-    {
-        let result: _.LoDashExplicitObjectWrapper<object>;
-
-        result = _('a').chain().stubObject();
-        result = _([1]).chain().stubObject();
-        result = _(['']).chain().stubObject();
-        result = _({}).chain().stubObject();
-        result = _(anything).chain().stubObject();
-    }
+    _.stubObject(); // $ExpectType any
+    _(anything).stubObject(); // $ExpectType any
+    _.chain(anything).stubObject(); // $ExpectType LoDashExplicitWrapper<any>
+    fp.stubObject(); // $ExpectType any
 }
 
 // _.stubString
 {
-    {
-        let result: string;
-
-        result = _.stubString();
-        result = _(anything).stubString();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<string>;
-
-        result = _('a').chain().stubString();
-        result = _([1]).chain().stubString();
-        result = _(['']).chain().stubString();
-        result = _({}).chain().stubString();
-        result = _(anything).chain().stubString();
-    }
+    _.stubString(); // $ExpectType string
+    _(anything).stubString(); // $ExpectType string
+    _.chain(anything).stubString(); // $ExpectType LoDashExplicitWrapper<string>
+    fp.stubString(); // $ExpectType string
 }
 
 // _.stubTrue
 {
-    {
-        let result: boolean;
-
-        result = _.stubTrue();
-        result = _(anything).stubTrue();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<boolean>;
-
-        result = _('a').chain().stubTrue();
-        result = _([1]).chain().stubTrue();
-        result = _(['']).chain().stubTrue();
-        result = _({}).chain().stubTrue();
-        result = _(anything).chain().stubTrue();
-    }
+    _.stubTrue(); // $ExpectType boolean
+    _(anything).stubTrue(); // $ExpectType boolean
+    _.chain(anything).stubTrue(); // $ExpectType LoDashExplicitWrapper<boolean>
+    fp.stubTrue(); // $ExpectType boolean
 }
 
 // _.times
-namespace TestTimes {
-    let iteratee: (num: number) => AbcObject = (num: number) => ({ a: 1, b: "", c: true });
+{
+    const iteratee = (num: number): AbcObject => ({ a: 1, b: "", c: true });
 
-    {
-        let result: number[];
-
-        result = _.times(42);
-        result = _(42).times();
-    }
-
-    {
-        let result: AbcObject[];
-
-        result = _.times(42, iteratee);
-        result = _(42).times(iteratee);
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<number>;
-
-        result = _(42).chain().times();
-    }
-
-    {
-        let result: _.LoDashExplicitArrayWrapper<AbcObject>;
-
-        result = _(42).chain().times(iteratee);
-    }
+    _.times(42); // $ExpectType number[]
+    _.times(42, iteratee); // $ExpectType AbcObject[]
+    _(42).times(); // $ExpectType number[]
+    _(42).times(iteratee); // $ExpectType AbcObject[]
+    _.chain(42).times(); // $ExpectType LoDashExplicitWrapper<number[]>
+    _.chain(42).times(iteratee); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    fp.times(iteratee, 42); // $ExpectType AbcObject[]
+    fp.times(iteratee)(42); // $ExpectType AbcObject[]
 }
 
 // _.toPath
-namespace TestToPath {
-   {
-       let result: string[];
-       result = _.toPath(true);
-       result = _.toPath(1);
-       result = _.toPath('a');
-       result = _.toPath(["a"]);
-       result = _.toPath({});
-   }
-
-   {
-       let result: _.LoDashImplicitWrapper<string[]>;
-
-       result = _(true).toPath();
-       result = _(1).toPath();
-       result = _('a').toPath();
-       result = _([1]).toPath();
-       result = _(["a"]).toPath();
-       result = _({}).toPath();
-   }
+{
+   _.toPath(1); // $ExpectType string[]
+   _.toPath("a[0].b.c"); // $ExpectType string[]
+   _.toPath(["a", 1]); // $ExpectType string[]
+   _(1).toPath(); // $ExpectType LoDashImplicitWrapper<string[]>
+   _("a[0].b.c").toPath(); // $ExpectType LoDashImplicitWrapper<string[]>
+   _(["a", 1]).toPath(); // $ExpectType LoDashImplicitWrapper<string[]>
+   _.chain(1).toPath(); // $ExpectType LoDashExplicitWrapper<string[]>
+   _.chain("a[0].b.c").toPath(); // $ExpectType LoDashExplicitWrapper<string[]>
+   _.chain(["a", 1]).toPath(); // $ExpectType LoDashExplicitWrapper<string[]>
+   fp.toPath(true); // $ExpectType string[]
+   fp.toPath(1); // $ExpectType string[]
+   fp.toPath("a"); // $ExpectType string[]
+   fp.toPath(["a"]); // $ExpectType string[]
+   fp.toPath({}); // $ExpectType string[]
 }
 
 // _.uniqueId
-namespace TestUniqueId {
-    {
-        let result: string;
-
-        result = _.uniqueId();
-        result = _.uniqueId('');
-
-        result = _('').uniqueId();
-    }
-
-    {
-        let result: _.LoDashExplicitWrapper<string>;
-
-        result = _('').chain().uniqueId();
-    }
+{
+    _.uniqueId(); // $ExpectType string
+    _.uniqueId(""); // $ExpectType string
+    _("").uniqueId(); // $ExpectType string
+    _.chain("").uniqueId(); // $ExpectType LoDashExplicitWrapper<string>
+    fp.uniqueId(""); // $ExpectType string
 }
 
 _.VERSION; // $ExpectType string
@@ -14326,115 +7196,48 @@ _.templateSettings; // $ExpectType TemplateSettings
 
 // _.partial & _.partialRight
 {
-    function func0(): number {
+    const func0 = (): number => {
         return 42;
-    }
-    function func1(arg1: number): number {
+    };
+    const func1 = (arg1: number): number => {
         return arg1 * 2;
-    }
-    function func2(arg1: number, arg2: string): number {
+    };
+    const func2 = (arg1: number, arg2: string): number => {
         return arg1 * arg2.length;
-    }
-    function func3(arg1: number, arg2: string, arg3: boolean): number {
+    };
+    const func3 = (arg1: number, arg2: string, arg3: boolean): number => {
         return arg1 * arg2.length + (arg3 ? 1 : 0);
-    }
-    function func4(arg1: number, arg2: string, arg3: boolean, arg4: number): number {
-        return arg1 * arg2.length + (arg3 ? 1 : 0) - arg4;
-    }
-    let res____: () => number;
-    let res1___: (arg1: number                                              ) => number;
-    let res_2__: (              arg2: string                                ) => number;
-    let res__3_: (                              arg3: boolean               ) => number;
-    let res___4: (                                              arg4: number) => number;
-    let res12__: (arg1: number, arg2: string                                ) => number;
-    let res1_3_: (arg1: number,                 arg3: boolean               ) => number;
-    let res1__4: (arg1: number,                                 arg4: number) => number;
-    let res_23_: (              arg2: string,   arg3: boolean               ) => number;
-    let res_2_4: (              arg2: string,                   arg4: number) => number;
-    let res__34: (                              arg3: boolean,  arg4: number) => number;
-    let res123_: (arg1: number, arg2: string,   arg3: boolean               ) => number;
-    let res12_4: (arg1: number, arg2: string,                   arg4: number) => number;
-    let res1_34: (arg1: number,                 arg3: boolean,  arg4: number) => number;
-    let res_234: (              arg2: string,   arg3: boolean,  arg4: number) => number;
-    let res1234: (arg1: number, arg2: string,   arg3: boolean,  arg4: number) => number;
+    };
 
-    //
-    // _.partial
-    //
     // with arity 0 function
-    res____ = _.partial(func0);
+    _.partial(func0); // $ExpectType Function0<number>
     // with arity 1 function
-    res____ = _.partial(func1, 42       );
-    res1___ = _.partial(func1           );
+    _.partial(func1, 42); // $ExpectType Function0<number>
+    _.partial(func1); // $ExpectType Function1<number, number>
     // with arity 2 function
-    res12__ = _.partial(func2           );
-    res_2__ = _.partial(func2, 42       );
-    res1___ = _.partial(func2,  _, "foo");
-    res____ = _.partial(func2, 42, "foo");
+    _.partial(func2); // $ExpectType Function2<number, string, number>
+    _.partial(func2, 42); // $ExpectType Function1<string, number>
+    _.partial(func2,  _, "foo"); // $ExpectType Function1<number, number>
+    _.partial(func2, 42, "foo"); // $ExpectType Function0<number>
     // with arity 3 function
-    res123_ = _.partial(func3                 );
-    res_23_ = _.partial(func3, 42             );
-    res1_3_ = _.partial(func3,  _, "foo"      );
-    res__3_ = _.partial(func3, 42, "foo"      );
-    res12__ = _.partial(func3,  _,     _, true);
-    res_2__ = _.partial(func3, 42,     _, true);
-    res1___ = _.partial(func3,  _, "foo", true);
-    res____ = _.partial(func3, 42, "foo", true);
-    // with arity 4 function
-    res1234 = _.partial(func4                      );
-    res_234 = _.partial(func4, 42                  );
-    res1_34 = _.partial(func4,  _, "foo"           );
-    res__34 = _.partial(func4, 42, "foo"           );
-    res12_4 = _.partial(func4,  _,     _, true     );
-    res_2_4 = _.partial(func4, 42,     _, true     );
-    res1__4 = _.partial(func4,  _, "foo", true     );
-    res___4 = _.partial(func4, 42, "foo", true     );
-    res123_ = _.partial(func4,  _,     _,    _, 100);
-    res_23_ = _.partial(func4, 42,     _,    _, 100);
-    res1_3_ = _.partial(func4,  _, "foo",    _, 100);
-    res__3_ = _.partial(func4, 42, "foo",    _, 100);
-    res12__ = _.partial(func4,  _,     _, true, 100);
-    res_2__ = _.partial(func4, 42,     _, true, 100);
-    res1___ = _.partial(func4,  _, "foo", true, 100);
-    res____ = _.partial(func4, 42, "foo", true, 100);
+    _.partial(func3, 42,     _, true);
 
-    //
-    // _.partialRight
-    //
     // with arity 0 function
-    res____ = _.partialRight(func0);
+    _.partialRight(func0); // $ExpectType Function0<number>
     // with arity 1 function
-    res____ = _.partialRight(func1, 42       );
-    res1___ = _.partialRight(func1           );
+    _.partialRight(func1, 42); // $ExpectType Function0<number>
+    _.partialRight(func1); // $ExpectType Function1<number, number>
     // with arity 2 function
-    res12__ = _.partialRight(func2           );
-    res_2__ = _.partialRight(func2, 42,     _);
-    res1___ = _.partialRight(func2,     "foo");
-    res____ = _.partialRight(func2, 42, "foo");
+    _.partialRight(func2); // $ExpectType Function2<number, string, number>
+    _.partialRight(func2, 42,     _); // $ExpectType Function1<string, number>
+    _.partialRight(func2,     "foo"); // $ExpectType Function1<number, number>
+    _.partialRight(func2, 42, "foo"); // $ExpectType Function0<number>
     // with arity 3 function
-    res123_ = _.partialRight(func3                 );
-    res_23_ = _.partialRight(func3, 42,     _,    _);
-    res1_3_ = _.partialRight(func3,     "foo",    _);
-    res__3_ = _.partialRight(func3, 42, "foo",    _);
-    res12__ = _.partialRight(func3,            true);
-    res_2__ = _.partialRight(func3, 42,     _, true);
-    res1___ = _.partialRight(func3,     "foo", true);
-    res____ = _.partialRight(func3, 42, "foo", true);
-    // with arity 4 function
-    res1234 = _.partialRight(func4                      );
-    res_234 = _.partialRight(func4, 42,     _,    _,   _);
-    res1_34 = _.partialRight(func4,     "foo",    _,   _);
-    res__34 = _.partialRight(func4, 42, "foo",    _,   _);
-    res12_4 = _.partialRight(func4,            true,   _);
-    res_2_4 = _.partialRight(func4, 42,     _, true,   _);
-    res1__4 = _.partialRight(func4,     "foo", true,   _);
-    res___4 = _.partialRight(func4, 42, "foo", true,   _);
-    res123_ = _.partialRight(func4,                  100);
-    res_23_ = _.partialRight(func4, 42,     _,    _, 100);
-    res1_3_ = _.partialRight(func4,     "foo",    _, 100);
-    res__3_ = _.partialRight(func4, 42, "foo",    _, 100);
-    res12__ = _.partialRight(func4,            true, 100);
-    res_2__ = _.partialRight(func4, 42,     _, true, 100);
-    res1___ = _.partialRight(func4,     "foo", true, 100);
-    res____ = _.partialRight(func4, 42, "foo", true, 100);
+    _.partialRight(func3, 42,     _, true);
+
+    fp.partial([], func0); // $ExpectType (...args: any[]) => any
+    fp.partial([])(func0); // $ExpectType (...args: any[]) => any
+    fp.partial([42])(func1); // $ExpectType (...args: any[]) => any
+    fp.partialRight([])(func0); // $ExpectType (...args: any[]) => any
+    fp.partialRight([42])(func1); // $ExpectType (...args: any[]) => any
 }
diff --git a/types/lodash/readme.md b/types/lodash/readme.md
new file mode 100644
index 0000000000..d65d7f878f
--- /dev/null
+++ b/types/lodash/readme.md
@@ -0,0 +1,62 @@
+# Notes for lodash developers
+
+## Folder Structure
+
+- Root
+  - `index.d.ts`: this is the main file that will be imported when people do `import _ from "lodash"`.
+    It references files for the lodash types.
+  - `fp.d.ts`: like `index.d.ts`, but for the functional programming variant of lodash.
+    See https://github.com/lodash/lodash/wiki/FP-Guide.
+  - `lodash-tests.ts`: contains test cases. Update these as necessary when you make a change.
+  - `tsconfig.json`: usually you shouldn't modify this file. However, if you add a new file, you should
+    probably add it to the `files` list in `tsconfig.json`.
+  - `tslint.json`: contains lint rules. The goal is to remove all of the rule overrides and match only the `dtslint/dt.json` rules.
+  - All other files: these exist so people can import individual functions, e.g. `import * as flatMap from "lodash/flatMap"`
+- `common` directory: contains the main lodash types, split into multiple files for maintainability reasons.
+  These files are NOT meant to be imported directly - they should only be referenced by `index.d.ts`.
+- `fp` directory: contains individual functions for `lodash/fp`. These files may be imported.
+  You should not modify these scripts directly - you should use a script to re-generate them (see below).
+- `scripts` directory: contains code generation scripts.
+  - Before running any scripts, run `npm install` in this directory (it contains its own `package.json`).
+  - Most notable script is `npm run fp`, which re-generates all of the `fp` files.
+- `v3` directory: contains types for lodash v3.
+
+## Different ways people might use lodash
+
+- Importing
+  - `import * as _ from "lodash"`
+  - `import * as _ from "lodash/fp"`
+  - `import { flatMap } from "lodash"`
+  - `import { flatMap } from "lodash/fp"`
+  - `import * as flatMap from "lodash/flatMap"`
+  - `import * as flatMap from "lodash/fp/flatMap"`
+  - `import * as flatMap from "lodash.flatmap"` (requires `npm install lodash.flatmap`)
+  - `import _ = require("lodash")`
+  - `import _ from "lodash"` (only if `esModuleInterop` is enabled)
+- Global namespace
+
+## Before creating a PR
+
+- For every function you modify, don't forget to update the corresponding wrapper functions.
+- Re-generate the `fp` types by opening a terminal in the `scripts` directory and running `npm run fp`.
+  - Note that this directory has its own `package.json`, so you'll need to run `npm install` first if you haven't already.
+- Back at the root directory, do `npm run lint lodash` and make sure there are no errors.
+
+## FAQ
+- I'm fixing a bug in v4. Should I also update the v3 types?
+  - In general, no.
+- If the wrapper functions are almost copies of the original functions, shouldn't we auto-generate them like we do for `lodash/fp`?
+  - Good idea! If you have time, submit a PR.
+- When I ran `npm run lint lodash`, I got an error that loks like `<--- Last few GCs --->`.
+  - Yeah, this error is really annoying. It means that node.js ran out of memory before it could run all of your tests.
+    - If you see somthing like `Test with 2.6` before that error, it means that there's an error in an older version of typescript.
+      The hard part is figuring out what the error is.
+  - The general procedure for diagnosing these errors is:
+    1. Delete half of the tests in `lodash-tests.ts` (either the top half or the bottom half).
+      - If you delete the top half, don't delete the important stuff like `interface AbcObject`.
+    2. Run `npm run lint lodash`.
+    3. If it succeeds, add that half back and delete the other half.
+    4. If it fails with a GC error, delete half of the remaining tests.
+      - Note: If both halfs succeed on their own, then the tests are probably just consuming too much memory. Try simplifying them until they pass.
+    5. Repeat steps 1-4 until it gives you the real error message. Usually it's something obscure that only happens in TS 2.3/T.4,
+       so commenting/modifying the test is usually the best solution.
diff --git a/types/lodash/scripts/generate-all.sh b/types/lodash/scripts/generate-all.sh
index 2f79589533..a07bf37932 100644
--- a/types/lodash/scripts/generate-all.sh
+++ b/types/lodash/scripts/generate-all.sh
@@ -5,6 +5,7 @@
 npm i ts-node -g
 
 ts-node ./generate-modules.ts
+ts-node ./generate-fp.ts
 
 cd ../../../
 
diff --git a/types/lodash/scripts/generate-fp.ts b/types/lodash/scripts/generate-fp.ts
new file mode 100644
index 0000000000..bbe648c6cd
--- /dev/null
+++ b/types/lodash/scripts/generate-fp.ts
@@ -0,0 +1,841 @@
+// Script for converting the lodash types into unctional programming (FP) format.
+// The convertion is done based on this guide: https://github.com/lodash/lodash/wiki/FP-Guide
+
+// Assumptions:
+// - All functions are defined in one of the files in the "common" subfolder
+// - All functions are defined inside of the LoDashStatic interface (although functions like _.partial may refer to another interface in the same file)
+// - Consistent indentation is used for the start and end of the above interface
+// - Consistent spacing is used for interface definitions: interface MyInterface {
+// - Consistent line breaks (\n, \r, or \r\n) are used in all files
+// - All overloads of a given function are defined in the same file
+
+import fs from "fs";
+import _ from "lodash";
+import convert from "lodash/fp/convert";
+import path from "path";
+
+interface Definition {
+    name: string;
+    overloads: Overload[];
+    jsdoc: string;
+}
+interface Interface {
+    name: string;
+    typeParams: TypeParam[];
+    overloads: Overload[];
+}
+interface Overload {
+    typeParams: TypeParam[];
+    params: string[];
+    returnType: string;
+    jsdoc: string;
+    tslintDisable?: string;
+}
+interface TypeParam {
+    name: string;
+    extends?: string;
+    equals?: string;
+}
+
+let lineBreak = "\n";
+async function main() {
+    const commonTypes: string[] = [];
+    const tsconfigPath = path.join("..", "tsconfig.json");
+    const tsconfigFile = await readFile(tsconfigPath);
+    lineBreak = _.find(["\r\n", "\n", "\r"], x => tsconfigFile.includes(x)) || "\n";
+
+    // Read each function definition and fp-ify it
+    const subfolders = ["common"];
+    const promises: Array<Promise<string[]>> = [];
+    for (const subfolder of subfolders) {
+        promises.push(new Promise<string[]>((resolve, reject) => {
+            fs.readdir(path.join("..", subfolder), (err, files) => {
+                if (err) {
+                    console.error(`failed to list directory contents for '${subfolder}': `, err);
+                    reject(err);
+                    return;
+                }
+                const filePaths = files.map(f => path.join("..", subfolder, f));
+                try {
+                    resolve(processDefinitions(filePaths, commonTypes));
+                } catch (e) {
+                    console.error(`failed to process files in '${subfolder}': `, e);
+                    reject(e);
+                }
+            });
+        }));
+    }
+
+    let functionNames: string[];
+    try {
+        functionNames = _.flatten(await Promise.all(promises));
+    } catch (err) {
+        console.error("Failed to parse all functions: ", err);
+        return;
+    }
+    functionNames = _.sortedUniq(_.sortBy(functionNames, _.toLower));
+    const fpFile = [
+        "// AUTO-GENERATED: do not modify this file directly.",
+        "// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:",
+        "// npm run fp",
+        "",
+        ...functionNames.map(f => `import ${f} = require("./fp/${f}");`),
+        "",
+        "export = _;",
+        "",
+        "declare const _: _.LoDashFp;",
+        "declare namespace _ {",
+        "    interface LoDashFp {",
+        ...functionNames.map(f => `        ${f}: typeof ${f};`),
+        "    }",
+        "}",
+        "",
+        "// Backward compatibility with --target es5",
+        "declare global {",
+        "    // tslint:disable-next-line:no-empty-interface",
+        "    interface Set<T> { }",
+        "    // tslint:disable-next-line:no-empty-interface",
+        "    interface Map<K, V> { }",
+        "    // tslint:disable-next-line:no-empty-interface",
+        "    interface WeakSet<T> { }",
+        "    // tslint:disable-next-line:no-empty-interface",
+        "    interface WeakMap<K extends object, V> { }",
+        "}",
+        "",
+    ].join(lineBreak);
+    fs.writeFile(path.join("..", "fp.d.ts"), fpFile, (err) => {
+        if (err)
+            console.error("Failed to write fp.d.ts: ", err);
+    });
+
+    // Make sure the generated files are listed in tsconfig.json, so they are included in the lint checks
+    const tsconfig = tsconfigFile.split(lineBreak).filter(row => !row.includes("fp/") || row.includes("fp/convert.d.ts"));
+    const newRows = functionNames.map(f => `        "fp/${f}.d.ts",`);
+    newRows[newRows.length - 1] = newRows[newRows.length - 1].replace(",", "");
+
+    const insertIndex = _.findLastIndex(tsconfig, row => row.trim() === "]"); // Assume "files" is the last array
+    if (!tsconfig[insertIndex - 1].endsWith(","))
+        tsconfig[insertIndex - 1] += ",";
+    tsconfig.splice(insertIndex, 0, ...newRows);
+
+    fs.writeFile(tsconfigPath, tsconfig.join(lineBreak), (err) => {
+        if (err)
+            console.error(`Failed to write ${tsconfigPath}: `, err);
+    });
+}
+
+function readFile(filePath: string): Promise<string> {
+    return new Promise<string>((resolve, reject) => {
+        fs.readFile(filePath, "utf8", (err, data) => {
+            if (err) {
+                reject(err);
+                return;
+            }
+            try {
+                resolve(data);
+            } catch (e) {
+                reject(e);
+            }
+        });
+    });
+}
+
+async function processDefinitions(filePaths: string[], commonTypes: string[]): Promise<string[]> {
+    const builder: { [name: string]: (...args: number[][]) => () => Interface[] } = {};
+    const unconvertedBuilder: { [name: string]: (...args: number[][]) => () => Interface[] } = {};
+    for (const filePath of filePaths) {
+        const definitions = await parseFile(filePath, commonTypes);
+        for (const definition of definitions) {
+            if (definition.overloads.every(o => o.params.length <= 1 && o.returnType === "typeof _")) {
+                // Our convert technique doesn't work well on "typeof _" functions (or at least runInContext)
+                // Plus, if there are 0-1 parameters, there's nothing to curry anyways.
+                unconvertedBuilder[definition.name] = (...args: number[][]) => {
+                    return () => curryOverloads(definition.overloads, definition.name, args[0] || [], -1, false);
+                };
+            } else {
+                builder[definition.name] = (...args: Array<number | number[]>) => {
+                    // args were originally passed in as [0], [1], [2], [3], [4]. If they changed order, that indicates how the functoin was re-arged
+                    // Return a function because some definitons (like rearg) expect to have a function return value
+
+                    // If any argument is a number instead of an array, then the argument at that index is being spread (e.g. assignAll, invokeArgs, partial, without)
+                    const spreadIndex = args.findIndex(a => typeof a === "number");
+                    let isFixed = true;
+                    if (spreadIndex !== -1) {
+                        // If there's a spread parameter, convert() won't cap the number of arguments, so we need to do it manually
+                        const arity = Math.max(spreadIndex, args[spreadIndex] as number) + 1;
+                        args = args.slice(0, arity);
+                    } else if (args.length > 4 || definition.name === "flow" || definition.name === "flowRight") {
+                        // Arity wasn't fixed by convert()
+                        isFixed = false;
+                    } else {
+                        // For some reason, convert() doesn't seems to tell us which functions have unchanged argument order.
+                        // So we have to hard-code it.
+                        const unchangedOrders = ["add", "assign", "assignIn", "bind", "bindKey", "concat", "difference", "divide", "eq",
+                            "gt", "gte", "isEqual", "lt", "lte", "matchesProperty", "merge", "multiply", "overArgs", "partial", "partialRight",
+                            "propertyOf", "random", "range", "rangeRight", "subtract", "zip", "zipObject", "zipObjectDeep"];
+                        if (unchangedOrders.includes(definition.name))
+                            args = _.sortBy(args as number[][], (a: number[]) => a[0]);
+                    }
+
+                    return () => curryOverloads(definition.overloads, definition.name, _.flatten(args), spreadIndex, isFixed);
+                };
+            }
+        }
+    }
+
+    // Use convert() to tell us how functions will be rearged and aliased
+    const builderFp = convert(builder, { rearg: true, fixed: true, immutable: false, curry: false, cap: false });
+    _.defaults(builderFp, unconvertedBuilder);
+
+    const functionNames = Object.keys(builderFp).filter(key => key !== "convert" && typeof builderFp[key] === "function");
+    for (const functionName of functionNames) {
+        // Assuming the maximum arity is 4. Pass one more arg than the max arity so we can detect if arguments weren't fixed.
+        const outputFn: (...args: any[]) => Interface[] = builderFp[functionName]([0], [1], [2], [3], [4]);
+        const commonTypeSearch = new RegExp(`\\b(${commonTypes.join("|")})\\b`, "g");
+        commonTypeSearch.lastIndex;
+        let importCommon = false;
+        let output = outputFn([0], [1], [2], [3], [4])
+            .map(interfaceToString)
+            .join(lineBreak)
+            .replace(commonTypeSearch, match => {
+                importCommon = true;
+                return `_.${match}`;
+            });
+        if (!importCommon && output.includes("typeof _"))
+            importCommon = true;
+        const interfaceNameMatch = output.match(/(?:interface|type) ([A-Za-z0-9]+)/);
+        const interfaceName = (interfaceNameMatch ? interfaceNameMatch[1] : undefined) || _.upperFirst(functionName);
+        output = [
+            "// AUTO-GENERATED: do not modify this file directly.",
+            "// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:",
+            "// npm run fp",
+            importCommon ? `${lineBreak}import _ = require("../index");${lineBreak}` : '',
+            output,
+            "",
+            `declare const ${functionName}: ${interfaceName};`,
+            `export = ${functionName};`,
+            "",
+        ].join(lineBreak);
+        const targetFile = `../fp/${functionName}.d.ts`;
+        fs.writeFile(targetFile, output, (err) => {
+            if (err)
+                console.error(`failed to write file: ${targetFile}`, err);
+        });
+    }
+    return functionNames;
+}
+
+async function parseFile(filePath: string, commonTypes: string[]): Promise<Definition[]> {
+    const definitionString = await readFile(filePath);
+    const newCommonTypeRegExp = /    (?:type|interface) ([A-Za-z0-9]+)/g;
+    let newCommonType = newCommonTypeRegExp.exec(definitionString);
+    while (newCommonType) {
+        if (!commonTypes.includes(newCommonType[1]))
+            commonTypes.push(newCommonType[1]);
+        newCommonType = newCommonTypeRegExp.exec(definitionString);
+    }
+
+    const definitons: Definition[] = [];
+    const lodashStaticRegExp = /( *)interface LoDashStatic {/g;
+    let lodashStaticMatch = lodashStaticRegExp.exec(definitionString);
+    while (lodashStaticMatch) {
+        const startIndex = lodashStaticMatch.index;
+        const endIndex = definitionString.indexOf(`${lineBreak}${lodashStaticMatch[1]}}`, startIndex);
+        if (endIndex === -1) {
+            const lineNumber = getLineNumber(definitionString, startIndex);
+            console.warn(`Failed to find end of interface 'LoDashStatic' (starting at ${filePath} line ${lineNumber}).`);
+            break;
+        }
+        const definitions = parseDefinitions(definitionString, startIndex + lodashStaticMatch[0].length, endIndex, filePath, commonTypes);
+        definitons.push(...definitions);
+        lodashStaticMatch = lodashStaticRegExp.exec(definitionString);
+    }
+    return definitons;
+}
+
+function parseDefinitions(definitionString: string, startIndex: number, endIndex: number, filePath: string, commonTypes: string[], name?: string): Definition[] {
+    const overloadRegExp = name ? /     [<(]/g : /     (\w+)[<(:]/g;
+    overloadRegExp.lastIndex = startIndex;
+    let overloadMatch = overloadRegExp.exec(definitionString);
+    if (!overloadMatch) {
+        const lineNumber = getLineNumber(definitionString, startIndex);
+        console.warn(`No function definitions were found in interface at ${filePath} line ${lineNumber}.`);
+        return [];
+    }
+    const definitons: Definition[] = [];
+    let currentDefinition: Definition | undefined;
+    for (; overloadMatch && overloadMatch.index < endIndex; overloadMatch = overloadRegExp.exec(definitionString)) {
+        name = overloadMatch[1] || name!;
+
+        const overloadStartIndex = overloadMatch.index;
+        if (!currentDefinition || name !== currentDefinition.name) {
+            if (currentDefinition && !_.isEmpty(currentDefinition.overloads))
+                definitons.push(currentDefinition);
+            currentDefinition = { name, overloads: [], jsdoc: "" };
+            const jsdocStartIndex = definitionString.lastIndexOf("/**", overloadStartIndex);
+            const jsdocEndIndex = definitionString.indexOf("*/", jsdocStartIndex);
+            if (jsdocStartIndex !== -1 && jsdocStartIndex > startIndex && jsdocEndIndex !== -1 && jsdocEndIndex < overloadStartIndex) {
+                // Verify that the comment is for this overload
+                const overloadTestIndex = definitionString.indexOf("     " + name, jsdocEndIndex);
+                if (overloadTestIndex === overloadStartIndex)
+                    currentDefinition.jsdoc = definitionString.substring(jsdocStartIndex, jsdocEndIndex + 2).replace(/    /g, "");
+            }
+        }
+        let overloadEndIndex = definitionString.indexOf(";", overloadStartIndex);
+        if (overloadEndIndex === -1 || overloadEndIndex > endIndex) {
+            const lineNumber = getLineNumber(definitionString, overloadStartIndex);
+            console.warn(`Overload does not end with semicolon! ${filePath} line ${lineNumber}`);
+            break;
+        }
+        overloadRegExp.lastIndex = overloadEndIndex;
+        if (name === "chain" || name === "mixin" || name.startsWith("prototype."))
+            continue;
+
+        const overloadString = definitionString.substring(overloadStartIndex, overloadEndIndex);
+        let paramStartIndex = overloadString.indexOf("(");
+        if (paramStartIndex !== -1) {
+            const overload: Overload = { typeParams: [], params: [], returnType: "", jsdoc: currentDefinition.jsdoc };
+
+            const previousLine = getPreviousLine(definitionString, overloadStartIndex).trim();
+            if (previousLine.startsWith("// tslint:disable"))
+                overload.tslintDisable = previousLine;
+
+            const typeParamStartIndex = overloadString.indexOf("<");
+            if (typeParamStartIndex !== -1 && typeParamStartIndex < paramStartIndex) {
+                const typeParamEndIndex = overloadString.indexOf(">(", typeParamStartIndex);
+                if (typeParamEndIndex !== -1) {
+                    paramStartIndex = typeParamEndIndex + 1;
+                    overload.typeParams = overloadString
+                        .substring(typeParamStartIndex + 1, typeParamEndIndex)
+                        .split(",")
+                        .map((tpString): TypeParam => {
+                            const typeParam: TypeParam = { name: tpString };
+                            let parts = tpString.split(/=[^>]/);
+                            if (parts[1])
+                                typeParam.equals = parts[1].trim();
+                            parts = tpString.split(" extends ");
+                            if (parts[1])
+                                typeParam.extends = parts[1].trim();
+                            typeParam.name = parts[0].trim();
+                            return typeParam;
+                        });
+                }
+            }
+            const paramEndIndex = overloadString.indexOf("):", paramStartIndex);
+            if (paramEndIndex === -1) {
+                console.warn(`Failed to find parameter end position in overload for '${name}' (${filePath}).`);
+                continue;
+            }
+            overload.params = overloadString
+                .substring(paramStartIndex + 1, paramEndIndex)
+                .split(/,(?=[^,]+:)(?=(?:[^()]*|.*\(.*\).*)$)/m) // split on commas, but ignore Generic<T, U> and (a, b) => c
+                .map(_.trim)
+                .map(o => _.trim(o, ","))
+                .filter(o => !!o);
+            overload.returnType = overloadString.substring(paramEndIndex + 2).trim();
+            currentDefinition.overloads.push(overload);
+        } else {
+            // This overload actually points to an interface. Try to find said interface and get the overloads from there.
+            const overloadParts = overloadString.split(":");
+            const interfaceName = overloadParts[1].trim();
+            if (interfaceName.startsWith("typeof ") || interfaceName.startsWith("LoDashStatic[")) {
+                // This is an alias (e.g. first: typeof _.head, or first: LoDashStatic['head']).
+                // Ignore it since convert() will create this alias based on the original function.
+                continue;
+            }
+            let interfaceStartIndex: number;
+            let interfaceEndIndex: number;
+            if (!interfaceName.startsWith("{")) {
+                const ignoreInterfaceNames = ["string", "TemplateSettings", "MapCacheConstructor"];
+                if (ignoreInterfaceNames.includes(interfaceName))
+                    continue;
+                const interfaceRegExp = new RegExp(`( *)interface ${interfaceName} {`);
+                const interfaceMatch = interfaceRegExp.exec(definitionString);
+                if (!interfaceMatch) {
+                    const lineNumber = getLineNumber(definitionString, overloadStartIndex);
+                    console.warn(`Failed to parse function '${name}': interface '${interfaceName}' not found. (${filePath} line ${lineNumber})`);
+                    continue;
+                }
+                interfaceStartIndex = interfaceMatch.index + interfaceMatch[0].length;
+                interfaceEndIndex = definitionString.indexOf(`${lineBreak}${interfaceMatch[1]}}`, interfaceStartIndex);
+                if (interfaceEndIndex === -1) {
+                    const lineNumber = getLineNumber(definitionString, interfaceStartIndex);
+                    console.warn(`Failed to find end of interface '${interfaceName}' (starting at ${filePath} line ${lineNumber}).`);
+                    continue;
+                }
+                _.pull(commonTypes, interfaceName);
+            } else {
+                // This is an inline type definition
+                interfaceStartIndex = definitionString.indexOf("{", overloadStartIndex + overloadParts[0].length) + 1;
+                interfaceEndIndex = definitionString.indexOf("}", interfaceStartIndex);
+                if (interfaceEndIndex === -1 || interfaceEndIndex >= endIndex) {
+                    console.warn(`Failed to find closing '}' character for property '${name}' (${filePath}).`);
+                    continue;
+                }
+                overloadEndIndex = definitionString.indexOf(";", interfaceEndIndex);
+                if (overloadEndIndex === -1 || overloadEndIndex >= endIndex) {
+                    const lineNumber = getLineNumber(definitionString, overloadStartIndex);
+                    console.warn(`Overload does not end with semicolon! ${filePath} line ${lineNumber}`);
+                    continue;
+                }
+                overloadRegExp.lastIndex = overloadEndIndex;
+            }
+            const [definition] = parseDefinitions(definitionString, interfaceStartIndex, interfaceEndIndex, filePath, commonTypes, name);
+            if (definition) {
+                for (const overload of definition.overloads)
+                    overload.jsdoc = currentDefinition.jsdoc;
+                currentDefinition.overloads.push(...definition.overloads);
+            }
+        }
+    }
+    if (currentDefinition && !_.isEmpty(currentDefinition.overloads))
+        definitons.push(currentDefinition);
+    return definitons;
+}
+
+function curryOverloads(overloads: Overload[], functionName: string, paramOrder: number[], spreadIndex: number, isFixed: boolean): Interface[] {
+    overloads = _.cloneDeep(overloads);
+
+    // Remove unused type parameters
+    for (const overload of overloads) {
+        for (let i = 0; i < overload.typeParams.length; ++i) {
+            const search = new RegExp(`\\b${overload.typeParams[i].name}\\b`);
+            if (overload.params.every(p => !search.test(p)) && !search.test(overload.returnType)) {
+                overload.typeParams.splice(i, 1);
+                --i;
+            }
+        }
+        if (overloads.some(o => o !== overload && _.isEqual(o, overload)))
+            _.pull(overloads, overload);
+    }
+
+    if (!isFixed) {
+        // Non-fixed arity functions cannot be curried.
+        for (const overload of overloads)
+            overload.params = overload.params.map(p => p.replace(/\?:/g, ":")); // No optional parameters
+        return [{
+            name: _.upperFirst(functionName),
+            typeParams: [],
+            overloads,
+        }];
+    }
+    paramOrder = paramOrder.filter(p => typeof p === "number");
+    const arity = paramOrder.length;
+
+    if (spreadIndex !== -1) {
+        // The parameter at this index is an array that will be spread when passed down to the actual function (e.g. assignAll, invokeArgs, partial, without).
+        // For these parameters, we expect the input to be an array (so remove the "...")
+
+        // Spread/rest parameters could be in any of the following formats:
+        // 1. The rest parameter is at spreadIndex, and it is the last parameter.
+        // 2. The rest parameter is immediately after spreadIndex, e.g. assign(object, ...sources[]). In this case, convert it to assignAll(...object[])
+        // 3. The rest parameter is not the last parameter, e.g. assignWith(object, ...sources[], customizer)
+        if (spreadIndex === arity - 1) {
+            // cases 1-2
+            for (let i = 0; i < overloads.length; ++i) {
+                const overload = overloads[i];
+                if (overload.params.length === arity && overload.params[spreadIndex] && overload.params[spreadIndex].startsWith("...")) {
+                    overload.params[spreadIndex] = overload.params[spreadIndex].replace("...", "");
+                } else if (overload.params.length === arity + 1 && overload.params[spreadIndex + 1] && overload.params[spreadIndex + 1].startsWith("...")) {
+                    overload.params.splice(spreadIndex + 1, 1);
+                    const parts = overload.params[spreadIndex].split(":").map(_.trim);
+                    parts[1] = `ReadonlyArray<${parts[1]}>`;
+                    overload.params[spreadIndex] = `${parts[0]}: ${parts[1]}`;
+                } else {
+                    _.pull(overloads, overload);
+                    --i;
+                }
+            }
+        } else {
+            // case 3
+            const overload = overloads[0];
+            overloads = [{
+                jsdoc: overload.jsdoc,
+                typeParams: [],
+                params: [
+                    ...overload.params.slice(0, spreadIndex),
+                    "args: ReadonlyArray<any>",
+                    ...overload.params.slice(overload.params.length - (arity - spreadIndex - 1)),
+                ],
+                returnType: "any",
+            }];
+        }
+    }
+
+    let filteredOverloads = overloads.filter(o => o.params.length >= arity && o.params.slice(arity).every(p => p.includes("?") && !p.startsWith("iteratee"))
+        && o.params.every(p => !p.startsWith("...") && !p.startsWith("guard:")));
+    if (filteredOverloads.length === 0)
+        filteredOverloads = overloads.filter(o => o.params.length >= arity && o.params.slice(arity).every(p => p.includes("?") || p.startsWith("..."))
+            && o.params.every(p => !p.startsWith("guard:")));
+    if (filteredOverloads.length === 0)
+        filteredOverloads = overloads.filter(o => o.params.length > 0 && o.params.length <= arity + 1 && o.params[o.params.length - 1].startsWith("..."));
+    if (filteredOverloads.length === 0)
+        console.warn(`No matching overloads found for ${functionName} with arity ${arity}`);
+
+    const restOverloads = overloads.filter(o => o.params.length > 0 && o.params[o.params.length - 1].startsWith("..."));
+    for (const restOverload of restOverloads) {
+        restOverload.params[restOverload.params.length - 1] = restOverload.params[restOverload.params.length - 1]
+            .substring(3)
+            .replace(/\[\]$/, "")
+            .replace(/: Array<(.+)>$/, ": $1");
+        if (restOverload.params.length < arity) {
+            const paramToCopy = restOverload.params[restOverload.params.length - 1];
+            const copiedParams = _.range(2, arity - restOverload.params.length + 2).map(i => paramToCopy.replace(/(^.+?):/, `$1${i}:`));
+            restOverload.params.push(...copiedParams);
+        }
+    }
+
+    for (const overload of filteredOverloads)
+        preProcessOverload(overload, functionName, arity);
+
+    const interfaces = _.flatMap(filteredOverloads, (o, i) => {
+        const reargParams = o.params.map((p, i) => o.params[paramOrder.indexOf(i)]);
+        return curryOverload({
+            typeParams: o.typeParams,
+            params: reargParams,
+            returnType: o.returnType,
+            jsdoc: o.jsdoc,
+        }, functionName, i + 1);
+    });
+    if (interfaces.length === 0)
+        return [];
+    // Merge interfaces with the same name
+    const mainInterface = interfaces[0];
+    const interfacesToMerge = interfaces.filter(i => i.name === mainInterface.name);
+    mergeInterfaces(interfacesToMerge);
+    _.remove(interfaces, i => i !== mainInterface && interfacesToMerge.includes(i));
+    // Check for any non-main interfaces that should now be merged
+    for (const overload of mainInterface.overloads) {
+        const others = mainInterface.overloads.filter(o2 => o2 !== overload
+            && _.isEqual(overload.typeParams, o2.typeParams)
+            && _.isEqual(overload.params.map(getParamType), o2.params.map(getParamType)));
+        const returnInterface = interfaces.find(i => new RegExp(`\\b${i.name}\\b`).test(overload.returnType));
+        for (const otherOverload of others) {
+            for (let i = 0; i < overload.params.length; ++i) {
+                const paramNames = _.uniq([overload].concat(others).map(o => getParamName(o.params[i])));
+                if (paramNames.length > 1) {
+                    // Some param names are different. Merge them.
+                    const paramType = getParamType(overload.params[i]);
+                    overload.params[i] = `${paramNames[0]}Or${paramNames.slice(1).map(_.upperFirst).join("Or")}: ${paramType}`;
+                }
+            }
+            if (otherOverload.returnType === overload.returnType) {
+                // Exact duplicate - remove the second overload
+                _.pull(mainInterface.overloads, otherOverload);
+            } else {
+                // Duplicate except for the return type. If the return types are both known interfaces,
+                // merge the interfaces so we can remove the second overload
+                const otherReturnInterface = interfaces.find(i => new RegExp(`\\b${i.name}\\b`).test(otherOverload.returnType));
+                if (returnInterface && otherReturnInterface) {
+                    _.remove(otherReturnInterface.overloads, o => new RegExp(`\\b${otherReturnInterface.name}\\b`).test(o.returnType));
+                    mergeInterfaces([returnInterface, otherReturnInterface]);
+                    _.pull(interfaces, otherReturnInterface);
+                    // Rename any other references to the removed interface(s)
+                    for (const overload of _.flatMap(interfaces, i => i.overloads))
+                        overload.returnType = overload.returnType.replace(new RegExp(`\\b${otherReturnInterface.name}\\b`), returnInterface.name);
+                }
+            }
+        }
+        _.pull(mainInterface.overloads, ...others);
+    }
+    for (const interfaceDef of interfaces)
+        interfaceDef.overloads = mergeSimilarOverloads(interfaceDef.overloads);
+    return interfaces;
+}
+
+function getParamName(param: string) {
+    return param.split(":", 1)[0];
+}
+
+function getParamType(param: string) {
+    const index = param.indexOf(":");
+    return index !== -1 ? param.substring(index + 1).trim() : "any";
+}
+
+function preProcessOverload(overload: Overload, functionName: string, arity: number): void {
+    overload.params = overload.params
+            .slice(0, arity)
+            .map(p => p
+                .replace(/\?:/g, ":") // No optional parameters
+                .replace(/: *(?:Array<(.+)>|([^ |]+)\[\]|\((.+)\)\[\])$/, ": ReadonlyArray<$1$2$3>")); // Convert Array to ReadonlyArray because lodash/fp treats everything as immutable
+    // Cap the number of callback arguments
+    for (let i = 0; i < overload.params.length; ++i)
+        overload.params[i] = capCallback(overload.params[i], functionName);
+}
+
+function capCallback(parameter: string, functionName: string): string {
+    // We don't support capping these callbacks yet, so flag them if detected
+    if (functionName !== "zipWith" && functionName !== "unzipWith" && /(?:iteratee|predicate|callback): *\((?:[^,)]+,[^)]+| *\.\.\..+)\) ?=>/.test(parameter))
+        console.warn(`${functionName}: Failed to cap callback: ${parameter}`);
+
+    // Special case for mapKeys: callback is capped to the key parameter only
+    if (functionName === "mapKeys") {
+        parameter = parameter
+            .replace(/(iteratee|predicate|callback): *(?:Array|List|NumericDictionary|String)Iteratee<(.+)>$/g, "$1: ValueIteratee<number>")
+            .replace(/(iteratee|predicate|callback): *(?:Dictionary|Object)Iteratee<(.+)>$/g, "$1: ValueIteratee<string>")
+            .replace(/(iteratee|predicate|callback): *(?:Array|List|NumericDictionary|String)Iteratee(?:Custom)?<(.+?),(.+)>$/g, "$1: ValueIterateeCustom<number,$3>")
+            .replace(/(iteratee|predicate|callback): *(?:Dictionary|Object)Iteratee(?:Custom)?<(.+?),(.+)>$/g, "$1: ValueIterateeCustom<string,$3>");
+    }
+
+    // Special case for reduceRight: callback argument order of (b, a)
+    if (functionName === "reduceRight") {
+        parameter = parameter
+            .replace(/(iteratee|predicate|callback): *Memo(Void)?(?:List|Object|Dictionary)Iterator<([^,>]+),([^,>]+)(?:,[^,>]+?(<T>)?)?>/g, "$1: Memo$2IteratorCappedRight<$3,$4>");
+    }
+
+    return parameter
+        .replace(/(iteratee|predicate|callback): *(?:Array|List|Dictionary|NumericDictionary|String)Iteratee<(.+)>$/g, "$1: ValueIteratee<$2>")
+        .replace(/(iteratee|predicate|callback): *(?:Array|List|Dictionary|NumericDictionary|String)Iteratee(?:Custom)?<(.+?),(.+)>$/g, "$1: ValueIterateeCustom<$2,$3>")
+        .replace(/(iteratee|predicate|callback): *(?:Array|List|Dictionary|NumericDictionary|String)IteratorTypeGuard<(.+?),(.+)>$/g, "$1: ValueIteratorTypeGuard<$2,$3>")
+        .replace(/(iteratee|predicate|callback): *ObjectIteratee<(.+)>$/g, "$1: ValueIteratee<$2[keyof $2]>")
+        .replace(/(iteratee|predicate|callback): *ObjectIterateeCustom<(.+?),(.+)>$/g, "$1: ValueIterateeCustom<$2[keyof $2],$3>")
+        .replace(/(iteratee|predicate|callback): *ObjectIteratorTypeGuard<(.+?),(.+)>$/g, "$1: ValueIteratorTypeGuard<$2[keyof $2],$3>")
+        .replace(/(iteratee|predicate|callback): *(?:Array|List|Dictionary|NumericDictionary)Iterator<(.+?), *(.+)>$/g, "$1: (value: $2) => $3")
+        .replace(/(iteratee|predicate|callback): *StringIterator<(.+)>$/g, "$1: (value: string) => $2")
+        .replace(/(iteratee|predicate|callback): *ObjectIterator<(.+?), *(.+?)>$/g, "$1: (value: $2[keyof $2]) => $3")
+        .replace(/(iteratee|predicate|callback): *Memo(Void)?(?:Array|List|Object|Dictionary)Iterator<([^,>]+),([^,>]+)(?:,[^,>]+?(<T>)?)?>/g, "$1: Memo$2IteratorCapped<$3,$4>")
+        .replace(/(iteratees|predicates|callbacks): *Many<(?:Array|List|Dictionary|NumericDictionary|String)Iteratee<(.+?)>>/g, "$1: Many<ValueIteratee<$2>>")
+        .replace(/(iteratees|predicates|callbacks): *Many<ObjectIteratee<(.+?)>>/g, "$1: Many<ValueIteratee<$2[keyof $2]>>")
+        .replace(/(iteratees|predicates|callbacks): *Many<(?:Array|List|Dictionary|NumericDictionary)Iterator<(.+?), *(.+?)>>/g, "$1: Many<(value: $2) => $3>")
+        .replace(/(iteratees|predicates|callbacks): *Many<ObjectIterator<(.+?), *(.+?)>>/g, "$1: Many<(value: $2[keyof $2]) => $3>");
+}
+
+function curryOverload(overload: Overload, functionName: string, overloadId: number): Interface[] {
+    let baseName = _.upperFirst(functionName);
+    if (baseName === "Pick") // A type called "Pick" already exists, so rename to avoid conflicts
+        baseName = "Lodash" + baseName;
+    if (overload.params.length <= 1) {
+        // Functions with 0 or 1 arguments are not curried. Just use a basic function type.
+        return [{
+            name: baseName,
+            overloads: [overload],
+            typeParams: [],
+        }];
+    }
+
+    const interfaces: Interface[] = [];
+    let passTypeParams: TypeParam[] = [];
+    for (let i = 0; i < overload.params.length; ++i) {
+        const interfaceDef = {
+            name: getInterfaceName(baseName, overloadId, i, []),
+            typeParams: _.cloneDeep(passTypeParams),
+            overloads: curryParams(
+                overload.params.slice(i),
+                _.without(overload.typeParams, ...passTypeParams),
+                overload.returnType,
+                baseName,
+                passTypeParams,
+                overloadId,
+                i,
+                overload.jsdoc,
+            ),
+        };
+        interfaces.push(interfaceDef);
+        const currentParams = overload.params.slice(0, i + 1);
+        const usedTypeParams = overload.typeParams.filter(tp => currentParams.some(p => new RegExp(`\\b${tp.name}\\b`).test(p)));
+        usedTypeParams.unshift(...overload.typeParams.filter(tp => !usedTypeParams.includes(tp) && usedTypeParams.some(tp2 => !!tp2.extends && new RegExp(`\\b${tp.name}\\b`).test(tp2.extends))));
+        const unusedParams = overload.params.slice(i + 1).concat(overload.returnType);
+        passTypeParams = usedTypeParams.filter(tp => unusedParams.some(p => new RegExp(`\\b${tp.name}\\b`).test(p)));
+    }
+    // The T[keyof T] constraint doesn't work so well if it's the only constraint. Convert to a plain old T constraint so it can be merged with
+    // other ValueIteratee<T> overloads
+    for (const interfaceDef of interfaces) {
+        for (const overload of interfaceDef.overloads) {
+            const objectTypeParam = overload.typeParams.find(tp => tp.name === "T" && (tp.extends === "object" || !tp.extends));
+            if (objectTypeParam && overload.params.some(p => p.includes("T[keyof T]")) && !overload.params.some(p => /T(?!]|\[keyof T])/.test(p))) {
+                delete objectTypeParam.extends;
+                overload.params = overload.params.map(p => p.replace(/\bArray<T\[keyof T]>/g, " T[]").replace(/\bT\[keyof T]/g, "T"));
+                const fixInterfaceName = overload.returnType.split("<")[0];
+                const fixInterface = interfaces.find(i => i.name === fixInterfaceName);
+                if (fixInterface) {
+                    const fixTypeParam = fixInterface.typeParams.find(tp => tp.name === objectTypeParam.name && (tp.extends === "object" || !tp.extends));
+                    if (fixTypeParam) {
+                        delete fixTypeParam.extends;
+                        for (const fixOverload of fixInterface.overloads) {
+                            // This overload has T referring to a whole object. But now T refers to a single element, so fix it.
+                            // If there's only 1 usage, replace it with 'object'. If there are multiple, create a new type constraint.
+                            const typeParamSearch = new RegExp(`\\b${fixTypeParam.name}\\b(?:(?!(?:\\[keyof ${fixTypeParam.name})?\\])|$)`);
+                            const matches = fixOverload.params.concat(fixOverload.returnType).filter(value => typeParamSearch.test(value));
+                            let replacement = "object";
+                            if (matches.length >= 2) {
+                                let i = 1;
+                                const newTypeParam: TypeParam = { name: "T" + i, extends: replacement };
+                                while (fixInterface.typeParams.some(t => t.name === newTypeParam.name) || fixOverload.typeParams.some(t => t.name === newTypeParam.name))
+                                    newTypeParam.name = "T" + (++i);
+                                fixOverload.typeParams.push(newTypeParam);
+                                replacement = newTypeParam.name;
+                            }
+                            fixOverload.params = fixOverload.params
+                                .map(p => p.replace(new RegExp(typeParamSearch, "g"), replacement)
+                                           .replace(new RegExp(`\\bArray<${fixTypeParam.name}\\[keyof ${fixTypeParam.name}]>`, "g"), fixTypeParam.name + "[]")
+                                           .replace(new RegExp(`\\b${fixTypeParam.name}\\[keyof ${fixTypeParam.name}]`, "g"), fixTypeParam.name));
+                            if (!new RegExp(`\\b${baseName}[0-9]+x[0-9]+\\b`).test(fixOverload.returnType)) {
+                                fixOverload.returnType = fixOverload.returnType
+                                    .replace(new RegExp(typeParamSearch, "g"), replacement)
+                                    .replace(new RegExp(`\\bArray<${fixTypeParam.name}\\[keyof ${fixTypeParam.name}]>`, "g"), fixTypeParam.name + "[]")
+                                    .replace(new RegExp(`\\b${fixTypeParam.name}\\[keyof ${fixTypeParam.name}]`, "g"), fixTypeParam.name);
+                            }
+                        }
+                    }
+                } else {
+                    console.warn(`Fixed T[keyof T] overload, but could not find corresponding interface '${fixInterfaceName}'.`);
+                }
+            }
+        }
+    }
+    return interfaces;
+}
+
+function curryParams(
+    params: string[],
+    typeParams: TypeParam[],
+    returnType: string,
+    baseName: string,
+    interfaceTypeParams: TypeParam[],
+    overloadId: number,
+    index: number,
+    jsdoc: string,
+): Overload[] {
+    // Assume params.length >= 1
+    const overloads: Overload[] = [{
+        typeParams: [],
+        params: [],
+        returnType: getInterfaceName(baseName, overloadId, index, interfaceTypeParams),
+        jsdoc,
+    }];
+    for (let i = 1; i <= params.length; ++i) {
+        const currentParams = params.slice(0, i);
+        const usedTypeParams = i < params.length ? typeParams.filter(tp => currentParams.some(p => new RegExp(`\\b${tp.name}\\b`).test(p))) : typeParams;
+        usedTypeParams.unshift(...typeParams.filter(tp => !usedTypeParams.includes(tp) && usedTypeParams.some(tp2 => !!tp2.extends && new RegExp(`\\b${tp.name}\\b`).test(tp2.extends))));
+        const unusedParams = params.slice(i).concat(returnType);
+        const passTypeParams = usedTypeParams.concat(interfaceTypeParams).filter(tp => unusedParams.some(p => new RegExp(`\\b${tp.name}\\b`).test(p)));
+        const currentReturnType = i < params.length ? getInterfaceName(baseName, overloadId, index + i, passTypeParams) : returnType;
+
+        overloads.push({
+            typeParams: _.cloneDeep(usedTypeParams),
+            params: currentParams,
+            returnType: currentReturnType,
+            jsdoc,
+        });
+    }
+    return overloads;
+}
+
+function mergeInterfaces(interfaces: Interface[]): void {
+    const mainInterface = interfaces[0];
+    if (!mainInterface)
+        return;
+    mainInterface.overloads = _.uniqWith(_.flatMap(interfaces, i => i.overloads), _.isEqual);
+}
+
+function mergeSimilarOverloads(overloads: Overload[]): Overload[] {
+    const newOverloads = _.cloneDeep(overloads);
+    for (const overload of newOverloads) {
+        // We can merge if all param types are the same except one, and the return types are the same.
+        const others = newOverloads.filter(o2 => o2 !== overload
+            && _.isEqual(overload.typeParams, o2.typeParams)
+            && overload.params.length === o2.params.length
+            && overload.params.length >= 1
+            && overload.params.filter((p, i) => getParamType(p) !== getParamType(o2.params[i])).length <= 1
+            && overload.returnType === o2.returnType);
+        if (_.isEmpty(others))
+            continue;
+
+        const differingParamIndexes = _(others)
+            .map(o2 => overload.params.findIndex((p, i) => getParamType(p) !== getParamType(o2.params[i])))
+            .filter(i => i !== -1)
+            .uniq()
+            .value();
+        if (differingParamIndexes.length > 1)
+            continue; // Only one param is different, but it's a different param for some overloads, so we can't merge
+        for (let i = 0; i < overload.params.length; ++i) {
+            const similarOverloads = [overload].concat(others);
+            const paramNames = _.uniq(similarOverloads.map(o => getParamName(o.params[i])));
+            const newParamName = (paramNames.length > 1) ? `${paramNames[0]}Or${paramNames.slice(1).map(_.upperFirst).join("Or")}` : paramNames[0];
+
+            const newParamType = _(similarOverloads)
+                .map(o => o.params[i])
+                .flatMap(p => getParamType(p).split("|"))
+                .map(_.trim)
+                .uniq()
+                .sortBy(type => type === "undefined" ? 2 : (type === "null" ? 1 : 0))
+                .join(" | ");
+            overload.params[i] = `${newParamName}: ${newParamType}`;
+        }
+        _.pull(newOverloads, ...others);
+    }
+    return newOverloads;
+}
+
+function getInterfaceName(baseName: string, overloadId: number, index: number, typeParams: TypeParam[]): string {
+    let interfaceName = baseName;
+    if (index > 0)
+        interfaceName += `${overloadId}x${index}${typeParamsToString(typeParams, false)}`;
+    return interfaceName;
+}
+
+function interfaceToString(interfaceDef: Interface): string {
+    if (interfaceDef.overloads.length === 0) {
+        // No point in creating an empty interface
+        return "";
+    } else if (interfaceDef.overloads.length === 1) {
+        // Don't create an interface for a single type. Instead use a basic type def.
+        let jsdoc = interfaceDef.overloads[0].jsdoc;
+        if (jsdoc)
+            jsdoc += lineBreak;
+        interfaceDef.overloads[0].jsdoc = "";
+        return `type ${interfaceDef.name}${typeParamsToString(interfaceDef.typeParams)} =${lineBreak}${tab(jsdoc + overloadToString(interfaceDef.overloads[0], true), 1)}`;
+    } else {
+        const overloadStrings = interfaceDef.overloads.map(o => lineBreak + tab(overloadToString(o), 1)).join("");
+        return `interface ${interfaceDef.name}${typeParamsToString(interfaceDef.typeParams)} {${overloadStrings}${lineBreak}}`;
+    }
+}
+
+function overloadToString(overload: Overload, arrowSyntax = false): string {
+    const joinedParams = overload.params.join(", ");
+    let jsdoc = overload.jsdoc;
+    if (jsdoc)
+        jsdoc += lineBreak;
+    if (overload.tslintDisable)
+        jsdoc += overload.tslintDisable + lineBreak;
+    return `${jsdoc}${typeParamsToString(overload.typeParams)}(${joinedParams})${arrowSyntax ? " =>" : ":"} ${overload.returnType};`;
+}
+
+function typeParamsToString(typeParams: TypeParam[], includeConstraints = true): string {
+    return typeParams.length > 0 ? `<${typeParams.map(tp =>
+        tp.name
+            + (includeConstraints && tp.extends ? " extends " + tp.extends : "")
+            + (includeConstraints && tp.equals ? " = " + tp.equals : "")
+        ).join(", ")}>` : "";
+}
+
+function getPreviousLine(s: string, index: number): string {
+    const eol = s.lastIndexOf(lineBreak, index);
+    if (eol === -1)
+        return "";
+    const bol = s.lastIndexOf(lineBreak, eol - 1);
+    if (bol === -1)
+        return "";
+    return s.substring(bol + 1, eol);
+}
+
+function getLineNumber(fileContents: string, index: number) {
+    return fileContents.substring(0, index).split(lineBreak).length + 1;
+}
+
+function tab(s: string, count: number) {
+    const prepend: string = " ".repeat(count * 4);
+    return prepend + s.replace(/(?:\r\n|\n|\r)(.)/g, `${lineBreak}${prepend}$1`);
+}
+
+function indexOfAny(source: string, values: string[], position?: number): number {
+    const indexes: number[] = [];
+    for (const value of values) {
+        const index = source.indexOf(value, position);
+        if (index !== -1)
+            indexes.push(index);
+    }
+    return indexes.length > 0 ? _.min(indexes)! : -1;
+}
+
+main();
diff --git a/types/lodash/scripts/package.json b/types/lodash/scripts/package.json
new file mode 100644
index 0000000000..f98c233642
--- /dev/null
+++ b/types/lodash/scripts/package.json
@@ -0,0 +1,14 @@
+{
+  "private": true,
+  "name": "lodash-scripts",
+  "version": "0.0.1",
+  "scripts": {
+    "fp": "ts-node generate-fp"
+  },
+  "devDependencies": {
+    "lodash": "^4.17.4",
+    "ts-node": "^4.1.0",
+    "typescript": "^2.7.1"
+  },
+  "dependencies": {}
+}
diff --git a/types/lodash/scripts/tsconfig.json b/types/lodash/scripts/tsconfig.json
index a06b8ed24f..023cb6a0cb 100644
--- a/types/lodash/scripts/tsconfig.json
+++ b/types/lodash/scripts/tsconfig.json
@@ -1,10 +1,18 @@
 {
     "compilerOptions": {
-        "target": "es6",
+        "target": "es2017",
+        "module": "commonjs",
         "baseUrl": "../..",
+        "esModuleInterop": true,
+        "noEmit": true,
+        "noImplicitAny": true,
+        "pretty": true,
+        "strict": true,
         "typeRoots": [
             "../../"
         ],
-        "types": []
+        "types": [
+            "lodash"
+        ]
     }
-}
\ No newline at end of file
+}
diff --git a/types/lodash/tsconfig.json b/types/lodash/tsconfig.json
index 7ab3d8db99..926c4217d7 100644
--- a/types/lodash/tsconfig.json
+++ b/types/lodash/tsconfig.json
@@ -14,10 +14,12 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true
+        "forceConsistentCasingInFileNames": true,
+        "esModuleInterop": true
     },
     "files": [
         "index.d.ts",
+        "common/common.d.ts",
         "lodash-tests.ts",
         "add.d.ts",
         "after.d.ts",
@@ -103,6 +105,7 @@
         "forInRight.d.ts",
         "forOwn.d.ts",
         "forOwnRight.d.ts",
+        "fp.d.ts",
         "fromPairs.d.ts",
         "functions.d.ts",
         "functionsIn.d.ts",
@@ -316,6 +319,402 @@
         "zip.d.ts",
         "zipObject.d.ts",
         "zipObjectDeep.d.ts",
-        "zipWith.d.ts"
+        "zipWith.d.ts",
+        "common/array.d.ts",
+        "common/collection.d.ts",
+        "common/common.d.ts",
+        "common/date.d.ts",
+        "common/function.d.ts",
+        "common/lang.d.ts",
+        "common/math.d.ts",
+        "common/number.d.ts",
+        "common/object.d.ts",
+        "common/seq.d.ts",
+        "common/string.d.ts",
+        "common/util.d.ts",
+        "fp/convert.d.ts",
+        "fp/add.d.ts",
+        "fp/after.d.ts",
+        "fp/all.d.ts",
+        "fp/allPass.d.ts",
+        "fp/always.d.ts",
+        "fp/any.d.ts",
+        "fp/anyPass.d.ts",
+        "fp/apply.d.ts",
+        "fp/ary.d.ts",
+        "fp/assign.d.ts",
+        "fp/assignAll.d.ts",
+        "fp/assignAllWith.d.ts",
+        "fp/assignIn.d.ts",
+        "fp/assignInAll.d.ts",
+        "fp/assignInAllWith.d.ts",
+        "fp/assignInWith.d.ts",
+        "fp/assignWith.d.ts",
+        "fp/assoc.d.ts",
+        "fp/assocPath.d.ts",
+        "fp/at.d.ts",
+        "fp/attempt.d.ts",
+        "fp/before.d.ts",
+        "fp/bind.d.ts",
+        "fp/bindAll.d.ts",
+        "fp/bindKey.d.ts",
+        "fp/camelCase.d.ts",
+        "fp/capitalize.d.ts",
+        "fp/castArray.d.ts",
+        "fp/ceil.d.ts",
+        "fp/chunk.d.ts",
+        "fp/clamp.d.ts",
+        "fp/clone.d.ts",
+        "fp/cloneDeep.d.ts",
+        "fp/cloneDeepWith.d.ts",
+        "fp/cloneWith.d.ts",
+        "fp/compact.d.ts",
+        "fp/complement.d.ts",
+        "fp/compose.d.ts",
+        "fp/concat.d.ts",
+        "fp/cond.d.ts",
+        "fp/conforms.d.ts",
+        "fp/conformsTo.d.ts",
+        "fp/constant.d.ts",
+        "fp/contains.d.ts",
+        "fp/countBy.d.ts",
+        "fp/create.d.ts",
+        "fp/curry.d.ts",
+        "fp/curryN.d.ts",
+        "fp/curryRight.d.ts",
+        "fp/curryRightN.d.ts",
+        "fp/debounce.d.ts",
+        "fp/deburr.d.ts",
+        "fp/defaults.d.ts",
+        "fp/defaultsAll.d.ts",
+        "fp/defaultsDeep.d.ts",
+        "fp/defaultsDeepAll.d.ts",
+        "fp/defaultTo.d.ts",
+        "fp/defer.d.ts",
+        "fp/delay.d.ts",
+        "fp/difference.d.ts",
+        "fp/differenceBy.d.ts",
+        "fp/differenceWith.d.ts",
+        "fp/dissoc.d.ts",
+        "fp/dissocPath.d.ts",
+        "fp/divide.d.ts",
+        "fp/drop.d.ts",
+        "fp/dropLast.d.ts",
+        "fp/dropLastWhile.d.ts",
+        "fp/dropRight.d.ts",
+        "fp/dropRightWhile.d.ts",
+        "fp/dropWhile.d.ts",
+        "fp/each.d.ts",
+        "fp/eachRight.d.ts",
+        "fp/endsWith.d.ts",
+        "fp/entries.d.ts",
+        "fp/entriesIn.d.ts",
+        "fp/eq.d.ts",
+        "fp/equals.d.ts",
+        "fp/escape.d.ts",
+        "fp/escapeRegExp.d.ts",
+        "fp/every.d.ts",
+        "fp/extend.d.ts",
+        "fp/extendAll.d.ts",
+        "fp/extendAllWith.d.ts",
+        "fp/extendWith.d.ts",
+        "fp/F.d.ts",
+        "fp/fill.d.ts",
+        "fp/filter.d.ts",
+        "fp/find.d.ts",
+        "fp/findFrom.d.ts",
+        "fp/findIndex.d.ts",
+        "fp/findIndexFrom.d.ts",
+        "fp/findKey.d.ts",
+        "fp/findLast.d.ts",
+        "fp/findLastFrom.d.ts",
+        "fp/findLastIndex.d.ts",
+        "fp/findLastIndexFrom.d.ts",
+        "fp/findLastKey.d.ts",
+        "fp/first.d.ts",
+        "fp/flatMap.d.ts",
+        "fp/flatMapDeep.d.ts",
+        "fp/flatMapDepth.d.ts",
+        "fp/flatten.d.ts",
+        "fp/flattenDeep.d.ts",
+        "fp/flattenDepth.d.ts",
+        "fp/flip.d.ts",
+        "fp/floor.d.ts",
+        "fp/flow.d.ts",
+        "fp/flowRight.d.ts",
+        "fp/forEach.d.ts",
+        "fp/forEachRight.d.ts",
+        "fp/forIn.d.ts",
+        "fp/forInRight.d.ts",
+        "fp/forOwn.d.ts",
+        "fp/forOwnRight.d.ts",
+        "fp/fromPairs.d.ts",
+        "fp/functions.d.ts",
+        "fp/functionsIn.d.ts",
+        "fp/get.d.ts",
+        "fp/getOr.d.ts",
+        "fp/groupBy.d.ts",
+        "fp/gt.d.ts",
+        "fp/gte.d.ts",
+        "fp/has.d.ts",
+        "fp/hasIn.d.ts",
+        "fp/head.d.ts",
+        "fp/identical.d.ts",
+        "fp/identity.d.ts",
+        "fp/includes.d.ts",
+        "fp/includesFrom.d.ts",
+        "fp/indexBy.d.ts",
+        "fp/indexOf.d.ts",
+        "fp/indexOfFrom.d.ts",
+        "fp/init.d.ts",
+        "fp/initial.d.ts",
+        "fp/inRange.d.ts",
+        "fp/intersection.d.ts",
+        "fp/intersectionBy.d.ts",
+        "fp/intersectionWith.d.ts",
+        "fp/invert.d.ts",
+        "fp/invertBy.d.ts",
+        "fp/invertObj.d.ts",
+        "fp/invoke.d.ts",
+        "fp/invokeArgs.d.ts",
+        "fp/invokeArgsMap.d.ts",
+        "fp/invokeMap.d.ts",
+        "fp/isArguments.d.ts",
+        "fp/isArray.d.ts",
+        "fp/isArrayBuffer.d.ts",
+        "fp/isArrayLike.d.ts",
+        "fp/isArrayLikeObject.d.ts",
+        "fp/isBoolean.d.ts",
+        "fp/isBuffer.d.ts",
+        "fp/isDate.d.ts",
+        "fp/isElement.d.ts",
+        "fp/isEmpty.d.ts",
+        "fp/isEqual.d.ts",
+        "fp/isEqualWith.d.ts",
+        "fp/isError.d.ts",
+        "fp/isFinite.d.ts",
+        "fp/isFunction.d.ts",
+        "fp/isInteger.d.ts",
+        "fp/isLength.d.ts",
+        "fp/isMap.d.ts",
+        "fp/isMatch.d.ts",
+        "fp/isMatchWith.d.ts",
+        "fp/isNaN.d.ts",
+        "fp/isNative.d.ts",
+        "fp/isNil.d.ts",
+        "fp/isNull.d.ts",
+        "fp/isNumber.d.ts",
+        "fp/isObject.d.ts",
+        "fp/isObjectLike.d.ts",
+        "fp/isPlainObject.d.ts",
+        "fp/isRegExp.d.ts",
+        "fp/isSafeInteger.d.ts",
+        "fp/isSet.d.ts",
+        "fp/isString.d.ts",
+        "fp/isSymbol.d.ts",
+        "fp/isTypedArray.d.ts",
+        "fp/isUndefined.d.ts",
+        "fp/isWeakMap.d.ts",
+        "fp/isWeakSet.d.ts",
+        "fp/iteratee.d.ts",
+        "fp/join.d.ts",
+        "fp/juxt.d.ts",
+        "fp/kebabCase.d.ts",
+        "fp/keyBy.d.ts",
+        "fp/keys.d.ts",
+        "fp/keysIn.d.ts",
+        "fp/last.d.ts",
+        "fp/lastIndexOf.d.ts",
+        "fp/lastIndexOfFrom.d.ts",
+        "fp/lowerCase.d.ts",
+        "fp/lowerFirst.d.ts",
+        "fp/lt.d.ts",
+        "fp/lte.d.ts",
+        "fp/map.d.ts",
+        "fp/mapKeys.d.ts",
+        "fp/mapValues.d.ts",
+        "fp/matches.d.ts",
+        "fp/matchesProperty.d.ts",
+        "fp/max.d.ts",
+        "fp/maxBy.d.ts",
+        "fp/mean.d.ts",
+        "fp/meanBy.d.ts",
+        "fp/memoize.d.ts",
+        "fp/merge.d.ts",
+        "fp/mergeAll.d.ts",
+        "fp/mergeAllWith.d.ts",
+        "fp/mergeWith.d.ts",
+        "fp/method.d.ts",
+        "fp/methodOf.d.ts",
+        "fp/min.d.ts",
+        "fp/minBy.d.ts",
+        "fp/multiply.d.ts",
+        "fp/nAry.d.ts",
+        "fp/negate.d.ts",
+        "fp/noConflict.d.ts",
+        "fp/noop.d.ts",
+        "fp/now.d.ts",
+        "fp/nth.d.ts",
+        "fp/nthArg.d.ts",
+        "fp/omit.d.ts",
+        "fp/omitAll.d.ts",
+        "fp/omitBy.d.ts",
+        "fp/once.d.ts",
+        "fp/orderBy.d.ts",
+        "fp/over.d.ts",
+        "fp/overArgs.d.ts",
+        "fp/overEvery.d.ts",
+        "fp/overSome.d.ts",
+        "fp/pad.d.ts",
+        "fp/padChars.d.ts",
+        "fp/padCharsEnd.d.ts",
+        "fp/padCharsStart.d.ts",
+        "fp/padEnd.d.ts",
+        "fp/padStart.d.ts",
+        "fp/parseInt.d.ts",
+        "fp/partial.d.ts",
+        "fp/partialRight.d.ts",
+        "fp/partition.d.ts",
+        "fp/path.d.ts",
+        "fp/pathEq.d.ts",
+        "fp/pathOr.d.ts",
+        "fp/paths.d.ts",
+        "fp/pick.d.ts",
+        "fp/pickAll.d.ts",
+        "fp/pickBy.d.ts",
+        "fp/pipe.d.ts",
+        "fp/pluck.d.ts",
+        "fp/prop.d.ts",
+        "fp/propEq.d.ts",
+        "fp/property.d.ts",
+        "fp/propertyOf.d.ts",
+        "fp/propOr.d.ts",
+        "fp/props.d.ts",
+        "fp/pull.d.ts",
+        "fp/pullAll.d.ts",
+        "fp/pullAllBy.d.ts",
+        "fp/pullAllWith.d.ts",
+        "fp/pullAt.d.ts",
+        "fp/random.d.ts",
+        "fp/range.d.ts",
+        "fp/rangeRight.d.ts",
+        "fp/rangeStep.d.ts",
+        "fp/rangeStepRight.d.ts",
+        "fp/rearg.d.ts",
+        "fp/reduce.d.ts",
+        "fp/reduceRight.d.ts",
+        "fp/reject.d.ts",
+        "fp/remove.d.ts",
+        "fp/repeat.d.ts",
+        "fp/replace.d.ts",
+        "fp/rest.d.ts",
+        "fp/restFrom.d.ts",
+        "fp/result.d.ts",
+        "fp/reverse.d.ts",
+        "fp/round.d.ts",
+        "fp/runInContext.d.ts",
+        "fp/sample.d.ts",
+        "fp/sampleSize.d.ts",
+        "fp/set.d.ts",
+        "fp/setWith.d.ts",
+        "fp/shuffle.d.ts",
+        "fp/size.d.ts",
+        "fp/slice.d.ts",
+        "fp/snakeCase.d.ts",
+        "fp/some.d.ts",
+        "fp/sortBy.d.ts",
+        "fp/sortedIndex.d.ts",
+        "fp/sortedIndexBy.d.ts",
+        "fp/sortedIndexOf.d.ts",
+        "fp/sortedLastIndex.d.ts",
+        "fp/sortedLastIndexBy.d.ts",
+        "fp/sortedLastIndexOf.d.ts",
+        "fp/sortedUniq.d.ts",
+        "fp/sortedUniqBy.d.ts",
+        "fp/split.d.ts",
+        "fp/spread.d.ts",
+        "fp/spreadFrom.d.ts",
+        "fp/startCase.d.ts",
+        "fp/startsWith.d.ts",
+        "fp/stubArray.d.ts",
+        "fp/stubFalse.d.ts",
+        "fp/stubObject.d.ts",
+        "fp/stubString.d.ts",
+        "fp/stubTrue.d.ts",
+        "fp/subtract.d.ts",
+        "fp/sum.d.ts",
+        "fp/sumBy.d.ts",
+        "fp/symmetricDifference.d.ts",
+        "fp/symmetricDifferenceBy.d.ts",
+        "fp/symmetricDifferenceWith.d.ts",
+        "fp/T.d.ts",
+        "fp/tail.d.ts",
+        "fp/take.d.ts",
+        "fp/takeLast.d.ts",
+        "fp/takeLastWhile.d.ts",
+        "fp/takeRight.d.ts",
+        "fp/takeRightWhile.d.ts",
+        "fp/takeWhile.d.ts",
+        "fp/tap.d.ts",
+        "fp/template.d.ts",
+        "fp/throttle.d.ts",
+        "fp/thru.d.ts",
+        "fp/times.d.ts",
+        "fp/toArray.d.ts",
+        "fp/toFinite.d.ts",
+        "fp/toInteger.d.ts",
+        "fp/toLength.d.ts",
+        "fp/toLower.d.ts",
+        "fp/toNumber.d.ts",
+        "fp/toPairs.d.ts",
+        "fp/toPairsIn.d.ts",
+        "fp/toPath.d.ts",
+        "fp/toPlainObject.d.ts",
+        "fp/toSafeInteger.d.ts",
+        "fp/toString.d.ts",
+        "fp/toUpper.d.ts",
+        "fp/transform.d.ts",
+        "fp/trim.d.ts",
+        "fp/trimChars.d.ts",
+        "fp/trimCharsEnd.d.ts",
+        "fp/trimCharsStart.d.ts",
+        "fp/trimEnd.d.ts",
+        "fp/trimStart.d.ts",
+        "fp/truncate.d.ts",
+        "fp/unapply.d.ts",
+        "fp/unary.d.ts",
+        "fp/unescape.d.ts",
+        "fp/union.d.ts",
+        "fp/unionBy.d.ts",
+        "fp/unionWith.d.ts",
+        "fp/uniq.d.ts",
+        "fp/uniqBy.d.ts",
+        "fp/uniqueId.d.ts",
+        "fp/uniqWith.d.ts",
+        "fp/unnest.d.ts",
+        "fp/unset.d.ts",
+        "fp/unzip.d.ts",
+        "fp/unzipWith.d.ts",
+        "fp/update.d.ts",
+        "fp/updateWith.d.ts",
+        "fp/upperCase.d.ts",
+        "fp/upperFirst.d.ts",
+        "fp/useWith.d.ts",
+        "fp/values.d.ts",
+        "fp/valuesIn.d.ts",
+        "fp/where.d.ts",
+        "fp/whereEq.d.ts",
+        "fp/without.d.ts",
+        "fp/words.d.ts",
+        "fp/wrap.d.ts",
+        "fp/xor.d.ts",
+        "fp/xorBy.d.ts",
+        "fp/xorWith.d.ts",
+        "fp/zip.d.ts",
+        "fp/zipAll.d.ts",
+        "fp/zipObj.d.ts",
+        "fp/zipObject.d.ts",
+        "fp/zipObjectDeep.d.ts",
+        "fp/zipWith.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/types/lodash/tslint.json b/types/lodash/tslint.json
index 57df94df09..9457e4398f 100644
--- a/types/lodash/tslint.json
+++ b/types/lodash/tslint.json
@@ -2,20 +2,10 @@
     "extends": "dtslint/dt.json",
     "rules": {
         // All are TODOs
-        "comment-format": [false],
-        "interface-over-type-literal": false,
         "jsdoc-format": false,
         "max-line-length": [false],
-        "no-namespace": false,
         "no-unnecessary-generics": false,
-        "no-void-expression": false,
-        "object-literal-key-quotes": false,
-        "one-line": false,
-        "prefer-const": false,
-        "semicolon": false,
-        "space-within-parens": false,
         "typedef-whitespace": [false],
-        "unified-signatures": false,
-        "whitespace": [false]
+        "unified-signatures": false
     }
 }

From c2fd8880d7b165769c4a7973f5ceea2ea2d863e5 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Thu, 22 Mar 2018 19:39:13 +0100
Subject: [PATCH 0756/1382] feat: add types for `UglifyJS` V3

---
 types/express-minify/tsconfig.json    |   9 +-
 types/gulp-filter/tsconfig.json       |   7 +-
 types/gulp-html-replace/index.d.ts    |   2 +
 types/gulp-htmlmin/index.d.ts         |   1 +
 types/gulp-rev-replace/tsconfig.json  |   9 +-
 types/gulp-uglify/tsconfig.json       |   9 +-
 types/gulp-useref/tsconfig.json       |   7 +-
 types/html-minifier/index.d.ts        |   1 +
 types/html-minifier/v1/tsconfig.json  |   5 +-
 types/uglify-js/index.d.ts            | 633 +++++++++-----------------
 types/uglify-js/tsconfig.json         |   2 +-
 types/uglify-js/tslint.json           |  78 +---
 types/uglify-js/uglify-js-tests.ts    |  90 ++--
 types/uglify-js/v2/index.d.ts         | 429 +++++++++++++++++
 types/uglify-js/v2/package.json       |   6 +
 types/uglify-js/v2/tsconfig.json      |  26 ++
 types/uglify-js/v2/tslint.json        |  79 ++++
 types/uglify-js/v2/uglify-js-tests.ts |  72 +++
 types/webpack/v3/webpack-tests.ts     |   2 +-
 types/webpack/webpack-tests.ts        |   2 +-
 20 files changed, 890 insertions(+), 579 deletions(-)
 create mode 100644 types/uglify-js/v2/index.d.ts
 create mode 100644 types/uglify-js/v2/package.json
 create mode 100644 types/uglify-js/v2/tsconfig.json
 create mode 100644 types/uglify-js/v2/tslint.json
 create mode 100644 types/uglify-js/v2/uglify-js-tests.ts

diff --git a/types/express-minify/tsconfig.json b/types/express-minify/tsconfig.json
index 65c999883e..20480fc428 100644
--- a/types/express-minify/tsconfig.json
+++ b/types/express-minify/tsconfig.json
@@ -14,10 +14,15 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true
+        "forceConsistentCasingInFileNames": true,
+        "paths": {
+            "uglify-js": [
+                "uglify-js/v2"
+            ]
+        }
     },
     "files": [
         "index.d.ts",
         "express-minify-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/gulp-filter/tsconfig.json b/types/gulp-filter/tsconfig.json
index f4f7d56d52..43ae1fe5c5 100644
--- a/types/gulp-filter/tsconfig.json
+++ b/types/gulp-filter/tsconfig.json
@@ -14,10 +14,13 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true
+        "forceConsistentCasingInFileNames": true,
+        "paths": {
+            "uglify-js": ["uglify-js/v2"]
+        }
     },
     "files": [
         "index.d.ts",
         "gulp-filter-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/gulp-html-replace/index.d.ts b/types/gulp-html-replace/index.d.ts
index e0610326c8..f2612b3688 100644
--- a/types/gulp-html-replace/index.d.ts
+++ b/types/gulp-html-replace/index.d.ts
@@ -2,6 +2,8 @@
 // Project: https://www.npmjs.com/package/gulp-html-replace
 // Definitions by: Peter Juras <https://github.com/peterjuras>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
 /// <reference types="node" />
 
 
diff --git a/types/gulp-htmlmin/index.d.ts b/types/gulp-htmlmin/index.d.ts
index ec97434de2..1f5f3e4a26 100644
--- a/types/gulp-htmlmin/index.d.ts
+++ b/types/gulp-htmlmin/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/jonschlinkert/gulp-htmlmin
 // Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 /// <reference types="node" />
 
diff --git a/types/gulp-rev-replace/tsconfig.json b/types/gulp-rev-replace/tsconfig.json
index c9a020605c..dfef77b20b 100644
--- a/types/gulp-rev-replace/tsconfig.json
+++ b/types/gulp-rev-replace/tsconfig.json
@@ -14,10 +14,15 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true
+        "forceConsistentCasingInFileNames": true,
+        "paths": {
+            "uglify-js": [
+                "uglify-js/v2"
+            ]
+        }
     },
     "files": [
         "index.d.ts",
         "gulp-rev-replace-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/gulp-uglify/tsconfig.json b/types/gulp-uglify/tsconfig.json
index 72fd35c65e..70663fcc71 100644
--- a/types/gulp-uglify/tsconfig.json
+++ b/types/gulp-uglify/tsconfig.json
@@ -14,11 +14,16 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true
+        "forceConsistentCasingInFileNames": true,
+        "paths": {
+            "uglify-js": [
+                "uglify-js/v2"
+            ]
+        }
     },
     "files": [
         "index.d.ts",
         "composer.d.ts",
         "gulp-uglify-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/gulp-useref/tsconfig.json b/types/gulp-useref/tsconfig.json
index cdb7922c57..f3867032fa 100644
--- a/types/gulp-useref/tsconfig.json
+++ b/types/gulp-useref/tsconfig.json
@@ -14,10 +14,13 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true
+        "forceConsistentCasingInFileNames": true,
+        "paths": {
+            "uglify-js": ["uglify-js/v2"]
+        }
     },
     "files": [
         "index.d.ts",
         "gulp-useref-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/html-minifier/index.d.ts b/types/html-minifier/index.d.ts
index c190fc4a74..2f1281c442 100644
--- a/types/html-minifier/index.d.ts
+++ b/types/html-minifier/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
 //                 Riku <https://github.com/rikuayanokozy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 import * as UglifyJS from 'uglify-js';
 import * as CleanCSS from 'clean-css';
diff --git a/types/html-minifier/v1/tsconfig.json b/types/html-minifier/v1/tsconfig.json
index dd9586e561..846fa3a1f6 100644
--- a/types/html-minifier/v1/tsconfig.json
+++ b/types/html-minifier/v1/tsconfig.json
@@ -16,6 +16,9 @@
             "html-minifier": [
                 "html-minifier/v1"
             ],
+            "uglify-js": [
+                "uglify-js/v2"
+            ],
             "html-minifier/*": [
                 "html-minifier/v1/*"
             ]
@@ -28,4 +31,4 @@
         "index.d.ts",
         "html-minifier-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/uglify-js/index.d.ts b/types/uglify-js/index.d.ts
index d9410070a9..cab53cb4db 100644
--- a/types/uglify-js/index.d.ts
+++ b/types/uglify-js/index.d.ts
@@ -1,429 +1,212 @@
-// Type definitions for UglifyJS 2 v2.6.1
+// Type definitions for UglifyJS 3.0
 // Project: https://github.com/mishoo/UglifyJS2
-// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
+// Definitions by: Alan Agius <https://github.com/alan-agius4>, Tanguy Krotoff <https://github.com/tkrotoff>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference types="source-map" />
-
-
-import * as MOZ_SourceMap from 'source-map';
-
-declare namespace UglifyJS {
-    interface Tokenizer {
-        /**
-         * The type of this token.
-         * Can be "num", "string", "regexp", "operator", "punc", "atom", "name", "keyword", "comment1" or "comment2".
-         * "comment1" and "comment2" are for single-line, respectively multi-line comments.
-         */
-        type: string;
-
-        /**
-         * The name of the file where this token originated from. Useful when compressing multiple files at once to generate the proper source map.
-         */
-        file: string;
-
-        /**
-         * The "value" of the token.
-         * That's additional information and depends on the token type: "num", "string" and "regexp" tokens you get their literal value.
-         * - For "operator" you get the operator.
-         * - For "punc" it's the punctuation sign (parens, comma, semicolon etc).
-         * - For "atom", "name" and "keyword" it's the name of the identifier
-         * - For comments it's the body of the comment (excluding the initial "//" and "/*".
-         */
-        value: string;
-
-        /**
-         * The line number of this token in the original code.
-         * 1-based index.
-         */
-        line: number;
-
-        /**
-         * The column number of this token in the original code.
-         * 0-based index.
-         */
-        col: number;
-
-        /**
-         * Short for "newline before", it's a boolean that tells us whether there was a newline before this node in the original source. It helps for automatic semicolon insertion.
-         * For multi-line comments in particular this will be set to true if there either was a newline before this comment, or * * if this comment contains a newline.
-         */
-        nlb: boolean;
-
-        /**
-         * This doesn't apply for comment tokens, but for all other token types it will be an array of comment tokens that were found before.
-         */
-        comments_before: string[];
-    }
-
-    interface AST_Node {
-        // The first token of this node
-        start: AST_Node;
-
-        // The last token of this node
-        end: AST_Node;
-
-        transform(tt: TreeTransformer): AST_Toplevel;
-    }
-
-    interface AST_Toplevel extends AST_Node {
-        // UglifyJS contains a scope analyzer which figures out variable/function definitions, references etc.
-        // You need to call it manually before compression or mangling.
-        // The figure_out_scope method is defined only on the AST_Toplevel node.
-        figure_out_scope(): void;
-
-        // Get names that are optimized for GZip compression (names will be generated using the most frequent characters first)
-        compute_char_frequency(): void;
-
-        mangle_names(): void;
-
-        print(stream: OutputStream): void;
-
-        print_to_string(options?: BeautifierOptions): string;
-    }
-
-    interface MinifyOptions {
-        spidermonkey?: boolean;
-        outSourceMap?: string;
-        sourceRoot?: string;
-        inSourceMap?: string;
-        fromString?: boolean;
-        warnings?: boolean;
-        mangle?: Object;
-        output?: MinifyOutput,
-        compress?: Object;
-    }
-
-    interface MinifyOutput {
-        code: string;
-        map: string;
-    }
-
-    function minify(files: string | Array<string>, options?: MinifyOptions): MinifyOutput;
-
-
-    interface ParseOptions {
-        // Default is false
-        strict?: boolean;
-
-        // Input file name, default is null
-        filename?: string;
-
-        // Default is null
-        toplevel?: AST_Toplevel;
-    }
-
-    /**
-     * The parser creates a custom abstract syntax tree given a piece of JavaScript code.
-     * Perhaps you should read about the AST first.
-     */
-    function parse(code: string, options?: ParseOptions): AST_Toplevel;
-
-
-    interface BeautifierOptions {
-        /**
-         * Start indentation on every line (only when `beautify`)
-         */
-        indent_start?: number;
-
-        /**
-         * Indentation level (only when `beautify`)
-         */
-        indent_level?: number;
-
-        /**
-         * Quote all keys in object literals?
-         */
-        quote_keys?: boolean;
-
-        /**
-         * Add a space after colon signs?
-         */
-        space_colon?: boolean;
-
-        /**
-         * Output ASCII-safe? (encodes Unicode characters as ASCII)
-         */
-        ascii_only?: boolean;
-
-        /**
-         * Escape "</script"?
-         */
-        inline_script?: boolean;
-
-        /**
-         * Informative maximum line width (for beautified output)
-         */
-        width?: number;
-
-        /**
-         * Maximum line length (for non-beautified output)
-         */
-        max_line_len?: number;
-
-        /**
-         * Output IE-safe code?
-         */
-        ie_proof?: boolean;
-
-        /**
-         * Beautify output?
-         */
-        beautify?: boolean;
-
-        /**
-         * Output a source map
-         */
-        source_map?: SourceMap;
-
-        /**
-         * Use brackets every time?
-         */
-        bracketize?: boolean;
-
-        /**
-         * Output comments?
-         */
-        comments?: boolean;
-
-        /**
-         * Use semicolons to separate statements? (otherwise, newlines)
-         */
-        semicolons?: boolean;
-    }
-
-    interface OutputStream {
-        // Return the output so far as a string
-        get(): string;
-        toString(): string;
-
-        // Insert one indentation string (usually 4 characters).
-        // Optionally pass true to indent half the width (I'm using that for case and default lines in switch blocks.
-        // If beautify is off, this function does nothing.
-        indent(half?: boolean): void;
-
-        // Return the current indentation width (not level; for example if we're in level 2 and indent_level is 4, this method would return 8.
-        indentation(): number;
-
-        // return the width of the current line text minus indentation.
-        current_width(): number
-
-        // Return true if current_width() is bigger than options.width (assuming options.width is non-null, non-zero).
-        should_break(): boolean;
-
-        // If beautification is on, this inserts a newline. Otherwise it does nothing.
-        newline(): void;
-
-        // Include the given string into the output, adjusting current_line, current_col and current_pos accordingly.
-        print(str: string): void;
-
-        // If beautification is on this always includes a space character.
-        // Otherwise it saves a hint somewhere that a space might be needed at current point.
-        // The space will go in at the next output but only when absolutely required, for example it will insert the space in return 10 but not in return"stuff".
-        space(): void;
-
-        // Inserts a comma, and calls space() — that is, if beautification is on you'll get a space after the comma.
-        comma(): void;
-
-        // Inserts a colon, and calls space() if options.space_colon is set.
-        colon(): void;
-
-        // Returns the last printed chunk.
-        last(): string;
-
-        // If beautification is on it always inserts a semicolon.
-        // Otherwise it saves a hint that a semicolon might be needed at current point.
-        // The semicolon is inserted when the next output comes in, only if required to not break the JS syntax.
-        semicolon(): void;
-
-        // Always inserts a semicolon and clears the hint that a semicolon might be needed.
-        force_semicolon(): void;
-
-        // Encodes any non-ASCII characters in string with JavaScript's conventions (using \uCODE).
-        to_ascii(str: string): void;
-
-        // Prints an identifier. If options.ascii_only is set, non-ASCII chars will be encoded with JavaScript conventions.
-        print_name(name: string): void;
-
-        // Prints a string. It adds quotes automatically.
-        // It prefers double-quotes, but will actually count any quotes in the string and will use single-quotes if the output proves to be shorter (depending on how many backslashes it has to insert).
-        // It encodes to ASCII if options.ascii_only is set.
-        print_string(str: string): void;
-
-        // Returns the width of the next indentation level. For example if current level is 2 and options.indent_level is 4, it'll return 12.
-        next_indent(): number;
-
-        // Sets the current indentation to col (column), calls the function and thereafter restores the previous indentation level.
-        // If beautification is off it simply calls func.
-        with_indent(col: number, func: Function): void;
-
-        // This is used to output blocks in curly brackets.
-        // It'll print an open bracket at current point, then call newline() and with the next indentation level it calls your func.
-        // Lastly, it'll print an indented closing bracket. As usual, if beautification is off you'll just get {x} where x is whatever func outputs.
-        with_block(func: Function): void;
-
-        // Adds parens around the output that your function prints.
-        with_parens(func: Function): void;
-
-        // Adds square brackets around the output that your function prints.
-        with_square(func: Function): void;
-
-        // If options.source_map is set, this will generate a source mapping between the given token (which should be an AST_Token-like object) and the current line/col.
-        // The name is optional; in most cases it will be inferred from the token.
-        add_mapping(token: AST_Node, name?: string): void;
-
-        // Returns the option with the given name.
-        option(name: string): any;
-
-        // Returns the current line in the output (1-based).
-        line(): number;
-
-        // Returns the current column in the output (zero-based).
-        col(): number;
-
-        // Push the given node into an internal stack. This is used to keep track of current node's parent(s).
-        push_node(node: AST_Node): void;
-
-        // Pops the top of the stack and returns it.
-        pop_node(): AST_Node;
-
-        // Returns that internal stack.
-        stack(): any;
-
-        // Returns the n-th parent node (where zero means the direct parent).
-        parent(n: number): AST_Node;
-    }
-
-    /**
-     * The code generator is a recursive process of getting back source code from an AST returned by the parser.
-     * Every AST node has a “print” method that takes an OutputStream and dumps the code from that node into it.
-     * The stream object supports a lot of options that control the output.
-     * You can specify whether you'd like to get human-readable (indented) output, the indentation level, whether you'd like to quote all properties in object literals etc.
-     */
-    function OutputStream(options?: BeautifierOptions): OutputStream;
-
-
-    interface SourceMapOptions {
-        /**
-         * The compressed file name
-         */
-        file?: string;
-
-        /**
-         * The root URL to the original sources
-         */
-        root?: string;
-
-        /**
-         * The input source map.
-         * Useful when you compress code that was generated from some other source (possibly other programming language).
-         * If you have an input source map, pass it in this argument and UglifyJS will generate a mapping that maps back
-         * to the original source (as opposed to the compiled code that you are compressing).
-         */
-        orig?: Object | JSON;
-    }
-
-    interface SourceMap {
-        add(source: string, gen_line: number, gen_col: number, orig_line: number, orig_col: number, name?: string): void;
-        get(): MOZ_SourceMap.SourceMapGenerator;
-        toString(): string;
-    }
-
-    /**
-     * The output stream keeps track of the current line/column in the output and can trivially generate a source mapping to the original code via Mozilla's source-map library.
-     * To use this functionality, you must load this library (it's automatically require-d by UglifyJS in the NodeJS version, but in a browser you must load it yourself)
-     * and make it available via the global MOZ_SourceMap variable.
-     */
-    function SourceMap(options?: SourceMapOptions): SourceMap;
-
-
-    interface CompressorOptions {
-        // Join consecutive statemets with the “comma operator”
-        sequences?: boolean;
-
-        // Optimize property access: a["foo"] → a.foo
-        properties?: boolean;
-
-        // Discard unreachable code
-        dead_code?: boolean;
-
-        // Discard “debugger” statements
-        drop_debugger?: boolean;
-
-        // Some unsafe optimizations (see below)
-        unsafe?: boolean;
-
-        // Optimize if-s and conditional expressions
-        conditionals?: boolean;
-
-        // Optimize comparisons
-        comparisons?: boolean;
-
-        // Evaluate constant expressions
-        evaluate?: boolean;
-
-        // Optimize boolean expressions
-        booleans?: boolean;
-
-        // Optimize loops
-        loops?: boolean;
-
-        // Drop unused variables/functions
-        unused?: boolean;
-
-        // Hoist function declarations
-        hoist_funs?: boolean;
-
-        // Hoist variable declarations
-        hoist_vars?: boolean;
-
-        // Optimize if-s followed by return/continue
-        if_return?: boolean;
-
-        // Join var declarations
-        join_vars?: boolean;
-
-        // Try to cascade `right` into `left` in sequences
-        cascade?: boolean;
-
-        // Drop side-effect-free statements
-        side_effects?: boolean;
-
-        // Warn about potentially dangerous optimizations/code
-        warnings?: boolean;
-
-        // Global definitions
-        global_defs?: Object;
-    }
-
-    /**
-     * The compressor is a tree transformer which reduces the code size by applying various optimizations on the AST
-     */
-    function Compressor(options?: CompressorOptions): AST_Toplevel;
-
-
-    // TODO
-    interface TreeWalker {
-    }
-
-    type visitor = (node: AST_Node, descend: Function) => boolean;
-
-    /**
-     * UglifyJS provides a TreeWalker object and every node has a walk method that given a walker will apply your visitor to each node in the tree.
-     * Your visitor can return a non-falsy value in order to prevent descending the current node.
-     */
-    function TreeWalker(visitor: visitor): TreeWalker;
-
-
-    // TODO
-    interface TreeTransformer extends TreeWalker {
-    }
-
-    /**
-     * The tree transformer is a special case of a tree walker.
-     * In fact it even inherits from TreeWalker and you can use the same methods, but initialization and visitor protocol are a bit different.
-     */
-    function TreeTransformer(before: visitor, after: visitor): TreeTransformer;
+// TypeScript Version: 2.2
+
+import { RawSourceMap } from 'source-map';
+export interface ParseOptions {
+    /** Support top level `return` statements */
+    bare_returns?: boolean;
+    html5_comments?: boolean;
+    /** Support `#!command` as the first line */
+    shebang: boolean;
 }
 
-export = UglifyJS;
+export interface CompressOptions {
+    /** Replace `arguments[index]` with function parameter name whenever possible. */
+    arguments?: boolean;
+    /** Various optimizations for boolean context, for example `!!a ? b : c → a ? b : c` */
+    booleans?: boolean;
+    /** Collapse single-use non-constant variables, side effects permitting. */
+    collapse_vars?: boolean;
+    /** Apply certain optimizations to binary nodes, e.g. `!(a <= b) → a > b,` attempts to negate binary nodes, e.g. `a = !b && !c && !d && !e → a=!(b||c||d||e)` etc */
+    comparisons?: boolean;
+    /** Apply optimizations for `if-s` and conditional expressions. */
+    conditionals?: boolean;
+    /** Remove unreachable code */
+    dead_code?: boolean;
+    /**
+     * Pass `true` to discard calls to console.* functions.
+     * If you wish to drop a specific function call such as `console.info` and/or retain side effects from function
+     * arguments after dropping the function call then use `pure_funcs` instead.
+     */
+    drop_console?: boolean;
+    /** Remove `debugger;` statements */
+    drop_debugger?: boolean;
+    /** Attempt to evaluate constant expressions */
+    evaluate?: boolean;
+    /** Pass `true` to preserve completion values from terminal statements without `return`, e.g. in bookmarklets. */
+    expression?: boolean;
+    global_defs?: object;
+    /** hoist function declarations */
+    hoist_funs?: boolean;
+    /**
+     * Hoist properties from constant object and array literals into regular variables subject to a set of constraints.
+     * For example: `var o={p:1, q:2}; f(o.p, o.q);` is converted to `f(1, 2);`. Note: `hoist_props` works best with mangle enabled,
+     * the compress option passes set to 2 or higher, and the compress option toplevel enabled.
+     */
+    hoist_props?: boolean;
+    /** Hoist var declarations (this is `false` by default because it seems to increase the size of the output in general) */
+    hoist_vars?: boolean;
+    /** Optimizations for if/return and if/continue */
+    if_return?: boolean;
+    /**
+     * Inline calls to function with simple/return statement
+     * - false -- same as `Disabled`
+     * - `Disabled` -- disabled inlining
+     * - `SimpleFunctions` -- inline simple functions
+     * - `WithArguments` -- inline functions with arguments
+     * - `WithArgumentsAndVariables` -- inline functions with arguments and variables
+     * - true -- same as `WithArgumentsAndVariables`
+     */
+    inline?: boolean | InlineFunctions;
+    /** join consecutive `var` statements */
+    join_vars?: boolean;
+    /** Prevents the compressor from discarding unused function arguments. You need this for code which relies on `Function.length` */
+    keep_fargs?: boolean;
+    /** Pass true to prevent the compressor from discarding function names. Useful for code relying on `Function.prototype.name`. */
+    keep_fnames?: boolean;
+    /** Pass true to prevent Infinity from being compressed into `1/0`, which may cause performance issues on `Chrome` */
+    keep_infinity?: boolean;
+    /** Optimizations for `do`, `while` and `for` loops when we can statically determine the condition. */
+    loops?: boolean;
+    /** negate `Immediately-Called Function Expressions` where the return value is discarded, to avoid the parens that the code generator would insert. */
+    negate_iife?: boolean;
+    /** The maximum number of times to run compress. In some cases more than one pass leads to further compressed code. Keep in mind more passes will take more time. */
+    passes?: number;
+    /** Rewrite property access using the dot notation, for example `foo["bar"]` to `foo.bar` */
+    properties?: boolean;
+    /**
+     * An array of names and UglifyJS will assume that those functions do not produce side effects.
+     * DANGER: will not check if the name is redefined in scope.
+     * An example case here, for instance `var q = Math.floor(a/b)`.
+     * If variable q is not used elsewhere, UglifyJS will drop it, but will still keep the `Math.floor(a/b)`,
+     * not knowing what it does. You can pass `pure_funcs: [ 'Math.floor' ]` to let it know that this function
+     * won't produce any side effect, in which case the whole statement would get discarded. The current
+     * implementation adds some overhead (compression will be slower).
+     */
+    pure_funcs?: string[];
+    pure_getters?: boolean | 'strict';
+    /**
+     * Allows single-use functions to be inlined as function expressions when permissible allowing further optimization.
+     * Enabled by default. Option depends on reduce_vars being enabled. Some code runs faster in the Chrome V8 engine if
+     * this option is disabled. Does not negatively impact other major browsers.
+     */
+    reduce_funcs?: boolean;
+    /** Improve optimization on variables assigned with and used as constant values. */
+    reduce_vars?: boolean;
+    sequences?: boolean;
+    /** Pass false to disable potentially dropping functions marked as "pure". */
+    side_effects?: boolean;
+    /** De-duplicate and remove unreachable `switch` branches.  */
+    switches?: boolean;
+    /** Drop unreferenced functions ("funcs") and/or variables ("vars") in the top level scope (false by default, true to drop both unreferenced functions and variables) */
+    toplevel?: boolean;
+    /** Prevent specific toplevel functions and variables from unused removal (can be array, comma-separated, RegExp or function. Implies toplevel) */
+    top_retain?: boolean;
+    typeofs?: boolean;
+    unsafe?: boolean;
+    /** Compress expressions like a `<= b` assuming none of the operands can be (coerced to) `NaN`. */
+    unsafe_comps?: boolean;
+    /** Compress and mangle `Function(args, code)` when both args and code are string literals. */
+    unsafe_Function?: boolean;
+    /** Optimize numerical expressions like `2 * x * 3` into `6 * x`, which may give imprecise floating point results.  */
+    unsafe_math?: boolean;
+    /** Optimize expressions like `Array.prototype.slice.call(a)` into `[].slice.call(a)` */
+    unsafe_proto?: boolean;
+    /** Enable substitutions of variables with `RegExp` values the same way as if they are constants. */
+    unsafe_regexp?: boolean;
+    unsafe_undefined?: boolean;
+    unused?: boolean;
+    /** display warnings when dropping unreachable code or unused declarations etc. */
+    warnings?: boolean;
+}
+
+export enum InlineFunctions {
+    Disabled = 0,
+    SimpleFunctions = 1,
+    WithArguments = 2,
+    WithArgumentsAndVariables = 3
+}
+export interface MangleOptions {
+    /** Pass true to mangle names visible in scopes where `eval` or with are used. */
+    eval?: boolean;
+    /** Pass true to not mangle function names. Useful for code relying on `Function.prototype.name`. */
+    keep_fnames?: boolean;
+    /** Pass an array of identifiers that should be excluded from mangling. Example: `["foo", "bar"]`. */
+    reserved?: string[];
+    /** Pass true to mangle names declared in the top level scope. */
+    toplevel?: boolean;
+    properties?: boolean | ManglePropertiesOptions;
+}
+
+export interface ManglePropertiesOptions {
+    /** Use true to allow the mangling of builtin DOM properties. Not recommended to override this setting. */
+    builtins?: boolean;
+    /** Mangle names with the original name still present. Pass an empty string "" to enable, or a non-empty string to set the debug suffix. */
+    debug?: boolean;
+    /** Only mangle unquoted property names */
+    keep_quoted?: boolean;
+    /** Pass a RegExp literal to only mangle property names matching the regular expression. */
+    regex?: RegExp;
+    /** Do not mangle property names listed in the reserved array */
+    reserved?: string[];
+}
+
+export interface OutputOptions {
+    ascii_only?: boolean;
+    beautify?: boolean;
+    braces?: boolean;
+    comments?: boolean | 'all' | 'some' | RegExp;
+    indent_level?: number;
+    indent_start?: boolean;
+    inline_script?: boolean;
+    keep_quoted_props?: boolean;
+    max_line_len?: boolean;
+    preamble?: string;
+    preserve_line?: boolean;
+    quote_keys?: boolean;
+    quote_style?: OutputQuoteStyle;
+    semicolons?: boolean;
+    shebang?: boolean;
+    webkit?: boolean;
+    width?: number;
+    wrap_iife?: boolean;
+}
+
+export enum OutputQuoteStyle {
+    PreferDouble = 0,
+    AlwaysSingle = 1,
+    AlwaysDouble = 2,
+    AlwaysOriginal = 3
+}
+
+export interface MinifyOptions {
+    /** Pass true to return compressor warnings in result.warnings. Use the value `verbose` for more detailed warnings. */
+    warnings?: boolean | 'verbose';
+    parse?: ParseOptions;
+    compress?: boolean | CompressOptions;
+    mangle?: boolean | MangleOptions;
+    output?: OutputOptions;
+    sourceMap?: boolean | SourceMapOptions;
+    toplevel?: boolean;
+    nameCache?: object;
+    ie8?: boolean;
+    keep_fnames?: boolean;
+}
+
+export interface MinifyOutput {
+    error?: Error;
+    code: string;
+    map: string;
+}
+
+export interface SourceMapOptions {
+    filename?: string;
+    url?: string | 'inline';
+    root?: string;
+    content?: RawSourceMap;
+}
+
+export function minify(files: string | string[] | { [file: string]: string }, options?: MinifyOptions): MinifyOutput;
diff --git a/types/uglify-js/tsconfig.json b/types/uglify-js/tsconfig.json
index 314b32b709..07451065ee 100644
--- a/types/uglify-js/tsconfig.json
+++ b/types/uglify-js/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "uglify-js-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/uglify-js/tslint.json b/types/uglify-js/tslint.json
index a41bf5d19a..f93cf8562a 100644
--- a/types/uglify-js/tslint.json
+++ b/types/uglify-js/tslint.json
@@ -1,79 +1,3 @@
 {
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
-        "ban-types": false,
-        "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
-        "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
-        "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
-        "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
-        "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
-        "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
-        "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
-    }
+    "extends": "dtslint/dt.json"
 }
diff --git a/types/uglify-js/uglify-js-tests.ts b/types/uglify-js/uglify-js-tests.ts
index 19233bf7ad..6b146ab0e7 100644
--- a/types/uglify-js/uglify-js-tests.ts
+++ b/types/uglify-js/uglify-js-tests.ts
@@ -1,72 +1,36 @@
 /// <reference types="node" />
 
-import * as UglifyJS from 'uglify-js';
-import * as fs from 'fs';
+import { OutputQuoteStyle, minify } from 'uglify-js';
 
-var result = UglifyJS.minify("/path/to/file.js");
-console.log(result.code); // minified output
-// if you need to pass code instead of file name
-var result = UglifyJS.minify("var b = function () {};", {fromString: true});
+let code: any;
 
-var result = UglifyJS.minify([ "file1.js", "file2.js", "file3.js" ]);
-console.log(result.code);
+code = {
+    "file1.js": "function add(first, second) { return first + second; }",
+    "file2.js": "console.log(add(1 + 2, 3 + 4));"
+};
 
-var result = UglifyJS.minify([ "file1.js", "file2.js", "file3.js" ], {
-    outSourceMap: "out.js.map"
-});
-console.log(result.code); // minified output
-console.log(result.map);
+minify(code);
 
-var result = UglifyJS.minify([ "file1.js", "file2.js", "file3.js" ], {
-    outSourceMap: "out.js.map",
-    sourceRoot: "http://example.com/src"
+code = "function add(first, second) { return first + second; }";
+minify(code);
+
+minify(code, {
+    output: {
+        quote_style: OutputQuoteStyle.AlwaysDouble
+    }
 });
 
-var result = UglifyJS.minify("compiled.js", {
-    inSourceMap: "compiled.js.map",
-    outSourceMap: "minified.js.map"
+minify(code, {
+    warnings: 'verbose',
+    mangle: {
+        properties: {
+            regex: /reg/
+        }
+    },
+    sourceMap: {
+        filename: 'foo.map'
+    },
+    compress: {
+        arguments: true
+    }
 });
-// same as before, it returns `code` and `map`
-
-const my_source_map_string = 'sourceMap';
-var result = UglifyJS.minify("compiled.js", {
-    inSourceMap: JSON.parse(my_source_map_string),
-    outSourceMap: "minified.js.map"
-});
-
-var toplevel_ast = UglifyJS.parse(code, {});
-
-var toplevel: UglifyJS.AST_Toplevel = null;
-const files = ['file1', 'file2'];
-files.forEach(function(file){
-    var code = fs.readFileSync(file, "utf8");
-    toplevel = UglifyJS.parse(code, {
-        filename: file,
-        toplevel: toplevel
-    });
-});
-
-toplevel.figure_out_scope()
-
-var compressor = UglifyJS.Compressor({});
-var compressed_ast = toplevel.transform(compressor);
-
-compressed_ast.figure_out_scope();
-compressed_ast.compute_char_frequency();
-compressed_ast.mangle_names();
-
-var stream = UglifyJS.OutputStream({});
-compressed_ast.print(stream);
-var code = stream.toString(); // this is your minified code
-
-var code = compressed_ast.print_to_string({});
-
-var source_map = UglifyJS.SourceMap({});
-var stream = UglifyJS.OutputStream({
-    //...
-    source_map: source_map
-});
-compressed_ast.print(stream);
-
-var code = stream.toString();
-var map = source_map.toString(); // json output for your source map
diff --git a/types/uglify-js/v2/index.d.ts b/types/uglify-js/v2/index.d.ts
new file mode 100644
index 0000000000..d9410070a9
--- /dev/null
+++ b/types/uglify-js/v2/index.d.ts
@@ -0,0 +1,429 @@
+// Type definitions for UglifyJS 2 v2.6.1
+// Project: https://github.com/mishoo/UglifyJS2
+// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="source-map" />
+
+
+import * as MOZ_SourceMap from 'source-map';
+
+declare namespace UglifyJS {
+    interface Tokenizer {
+        /**
+         * The type of this token.
+         * Can be "num", "string", "regexp", "operator", "punc", "atom", "name", "keyword", "comment1" or "comment2".
+         * "comment1" and "comment2" are for single-line, respectively multi-line comments.
+         */
+        type: string;
+
+        /**
+         * The name of the file where this token originated from. Useful when compressing multiple files at once to generate the proper source map.
+         */
+        file: string;
+
+        /**
+         * The "value" of the token.
+         * That's additional information and depends on the token type: "num", "string" and "regexp" tokens you get their literal value.
+         * - For "operator" you get the operator.
+         * - For "punc" it's the punctuation sign (parens, comma, semicolon etc).
+         * - For "atom", "name" and "keyword" it's the name of the identifier
+         * - For comments it's the body of the comment (excluding the initial "//" and "/*".
+         */
+        value: string;
+
+        /**
+         * The line number of this token in the original code.
+         * 1-based index.
+         */
+        line: number;
+
+        /**
+         * The column number of this token in the original code.
+         * 0-based index.
+         */
+        col: number;
+
+        /**
+         * Short for "newline before", it's a boolean that tells us whether there was a newline before this node in the original source. It helps for automatic semicolon insertion.
+         * For multi-line comments in particular this will be set to true if there either was a newline before this comment, or * * if this comment contains a newline.
+         */
+        nlb: boolean;
+
+        /**
+         * This doesn't apply for comment tokens, but for all other token types it will be an array of comment tokens that were found before.
+         */
+        comments_before: string[];
+    }
+
+    interface AST_Node {
+        // The first token of this node
+        start: AST_Node;
+
+        // The last token of this node
+        end: AST_Node;
+
+        transform(tt: TreeTransformer): AST_Toplevel;
+    }
+
+    interface AST_Toplevel extends AST_Node {
+        // UglifyJS contains a scope analyzer which figures out variable/function definitions, references etc.
+        // You need to call it manually before compression or mangling.
+        // The figure_out_scope method is defined only on the AST_Toplevel node.
+        figure_out_scope(): void;
+
+        // Get names that are optimized for GZip compression (names will be generated using the most frequent characters first)
+        compute_char_frequency(): void;
+
+        mangle_names(): void;
+
+        print(stream: OutputStream): void;
+
+        print_to_string(options?: BeautifierOptions): string;
+    }
+
+    interface MinifyOptions {
+        spidermonkey?: boolean;
+        outSourceMap?: string;
+        sourceRoot?: string;
+        inSourceMap?: string;
+        fromString?: boolean;
+        warnings?: boolean;
+        mangle?: Object;
+        output?: MinifyOutput,
+        compress?: Object;
+    }
+
+    interface MinifyOutput {
+        code: string;
+        map: string;
+    }
+
+    function minify(files: string | Array<string>, options?: MinifyOptions): MinifyOutput;
+
+
+    interface ParseOptions {
+        // Default is false
+        strict?: boolean;
+
+        // Input file name, default is null
+        filename?: string;
+
+        // Default is null
+        toplevel?: AST_Toplevel;
+    }
+
+    /**
+     * The parser creates a custom abstract syntax tree given a piece of JavaScript code.
+     * Perhaps you should read about the AST first.
+     */
+    function parse(code: string, options?: ParseOptions): AST_Toplevel;
+
+
+    interface BeautifierOptions {
+        /**
+         * Start indentation on every line (only when `beautify`)
+         */
+        indent_start?: number;
+
+        /**
+         * Indentation level (only when `beautify`)
+         */
+        indent_level?: number;
+
+        /**
+         * Quote all keys in object literals?
+         */
+        quote_keys?: boolean;
+
+        /**
+         * Add a space after colon signs?
+         */
+        space_colon?: boolean;
+
+        /**
+         * Output ASCII-safe? (encodes Unicode characters as ASCII)
+         */
+        ascii_only?: boolean;
+
+        /**
+         * Escape "</script"?
+         */
+        inline_script?: boolean;
+
+        /**
+         * Informative maximum line width (for beautified output)
+         */
+        width?: number;
+
+        /**
+         * Maximum line length (for non-beautified output)
+         */
+        max_line_len?: number;
+
+        /**
+         * Output IE-safe code?
+         */
+        ie_proof?: boolean;
+
+        /**
+         * Beautify output?
+         */
+        beautify?: boolean;
+
+        /**
+         * Output a source map
+         */
+        source_map?: SourceMap;
+
+        /**
+         * Use brackets every time?
+         */
+        bracketize?: boolean;
+
+        /**
+         * Output comments?
+         */
+        comments?: boolean;
+
+        /**
+         * Use semicolons to separate statements? (otherwise, newlines)
+         */
+        semicolons?: boolean;
+    }
+
+    interface OutputStream {
+        // Return the output so far as a string
+        get(): string;
+        toString(): string;
+
+        // Insert one indentation string (usually 4 characters).
+        // Optionally pass true to indent half the width (I'm using that for case and default lines in switch blocks.
+        // If beautify is off, this function does nothing.
+        indent(half?: boolean): void;
+
+        // Return the current indentation width (not level; for example if we're in level 2 and indent_level is 4, this method would return 8.
+        indentation(): number;
+
+        // return the width of the current line text minus indentation.
+        current_width(): number
+
+        // Return true if current_width() is bigger than options.width (assuming options.width is non-null, non-zero).
+        should_break(): boolean;
+
+        // If beautification is on, this inserts a newline. Otherwise it does nothing.
+        newline(): void;
+
+        // Include the given string into the output, adjusting current_line, current_col and current_pos accordingly.
+        print(str: string): void;
+
+        // If beautification is on this always includes a space character.
+        // Otherwise it saves a hint somewhere that a space might be needed at current point.
+        // The space will go in at the next output but only when absolutely required, for example it will insert the space in return 10 but not in return"stuff".
+        space(): void;
+
+        // Inserts a comma, and calls space() — that is, if beautification is on you'll get a space after the comma.
+        comma(): void;
+
+        // Inserts a colon, and calls space() if options.space_colon is set.
+        colon(): void;
+
+        // Returns the last printed chunk.
+        last(): string;
+
+        // If beautification is on it always inserts a semicolon.
+        // Otherwise it saves a hint that a semicolon might be needed at current point.
+        // The semicolon is inserted when the next output comes in, only if required to not break the JS syntax.
+        semicolon(): void;
+
+        // Always inserts a semicolon and clears the hint that a semicolon might be needed.
+        force_semicolon(): void;
+
+        // Encodes any non-ASCII characters in string with JavaScript's conventions (using \uCODE).
+        to_ascii(str: string): void;
+
+        // Prints an identifier. If options.ascii_only is set, non-ASCII chars will be encoded with JavaScript conventions.
+        print_name(name: string): void;
+
+        // Prints a string. It adds quotes automatically.
+        // It prefers double-quotes, but will actually count any quotes in the string and will use single-quotes if the output proves to be shorter (depending on how many backslashes it has to insert).
+        // It encodes to ASCII if options.ascii_only is set.
+        print_string(str: string): void;
+
+        // Returns the width of the next indentation level. For example if current level is 2 and options.indent_level is 4, it'll return 12.
+        next_indent(): number;
+
+        // Sets the current indentation to col (column), calls the function and thereafter restores the previous indentation level.
+        // If beautification is off it simply calls func.
+        with_indent(col: number, func: Function): void;
+
+        // This is used to output blocks in curly brackets.
+        // It'll print an open bracket at current point, then call newline() and with the next indentation level it calls your func.
+        // Lastly, it'll print an indented closing bracket. As usual, if beautification is off you'll just get {x} where x is whatever func outputs.
+        with_block(func: Function): void;
+
+        // Adds parens around the output that your function prints.
+        with_parens(func: Function): void;
+
+        // Adds square brackets around the output that your function prints.
+        with_square(func: Function): void;
+
+        // If options.source_map is set, this will generate a source mapping between the given token (which should be an AST_Token-like object) and the current line/col.
+        // The name is optional; in most cases it will be inferred from the token.
+        add_mapping(token: AST_Node, name?: string): void;
+
+        // Returns the option with the given name.
+        option(name: string): any;
+
+        // Returns the current line in the output (1-based).
+        line(): number;
+
+        // Returns the current column in the output (zero-based).
+        col(): number;
+
+        // Push the given node into an internal stack. This is used to keep track of current node's parent(s).
+        push_node(node: AST_Node): void;
+
+        // Pops the top of the stack and returns it.
+        pop_node(): AST_Node;
+
+        // Returns that internal stack.
+        stack(): any;
+
+        // Returns the n-th parent node (where zero means the direct parent).
+        parent(n: number): AST_Node;
+    }
+
+    /**
+     * The code generator is a recursive process of getting back source code from an AST returned by the parser.
+     * Every AST node has a “print” method that takes an OutputStream and dumps the code from that node into it.
+     * The stream object supports a lot of options that control the output.
+     * You can specify whether you'd like to get human-readable (indented) output, the indentation level, whether you'd like to quote all properties in object literals etc.
+     */
+    function OutputStream(options?: BeautifierOptions): OutputStream;
+
+
+    interface SourceMapOptions {
+        /**
+         * The compressed file name
+         */
+        file?: string;
+
+        /**
+         * The root URL to the original sources
+         */
+        root?: string;
+
+        /**
+         * The input source map.
+         * Useful when you compress code that was generated from some other source (possibly other programming language).
+         * If you have an input source map, pass it in this argument and UglifyJS will generate a mapping that maps back
+         * to the original source (as opposed to the compiled code that you are compressing).
+         */
+        orig?: Object | JSON;
+    }
+
+    interface SourceMap {
+        add(source: string, gen_line: number, gen_col: number, orig_line: number, orig_col: number, name?: string): void;
+        get(): MOZ_SourceMap.SourceMapGenerator;
+        toString(): string;
+    }
+
+    /**
+     * The output stream keeps track of the current line/column in the output and can trivially generate a source mapping to the original code via Mozilla's source-map library.
+     * To use this functionality, you must load this library (it's automatically require-d by UglifyJS in the NodeJS version, but in a browser you must load it yourself)
+     * and make it available via the global MOZ_SourceMap variable.
+     */
+    function SourceMap(options?: SourceMapOptions): SourceMap;
+
+
+    interface CompressorOptions {
+        // Join consecutive statemets with the “comma operator”
+        sequences?: boolean;
+
+        // Optimize property access: a["foo"] → a.foo
+        properties?: boolean;
+
+        // Discard unreachable code
+        dead_code?: boolean;
+
+        // Discard “debugger” statements
+        drop_debugger?: boolean;
+
+        // Some unsafe optimizations (see below)
+        unsafe?: boolean;
+
+        // Optimize if-s and conditional expressions
+        conditionals?: boolean;
+
+        // Optimize comparisons
+        comparisons?: boolean;
+
+        // Evaluate constant expressions
+        evaluate?: boolean;
+
+        // Optimize boolean expressions
+        booleans?: boolean;
+
+        // Optimize loops
+        loops?: boolean;
+
+        // Drop unused variables/functions
+        unused?: boolean;
+
+        // Hoist function declarations
+        hoist_funs?: boolean;
+
+        // Hoist variable declarations
+        hoist_vars?: boolean;
+
+        // Optimize if-s followed by return/continue
+        if_return?: boolean;
+
+        // Join var declarations
+        join_vars?: boolean;
+
+        // Try to cascade `right` into `left` in sequences
+        cascade?: boolean;
+
+        // Drop side-effect-free statements
+        side_effects?: boolean;
+
+        // Warn about potentially dangerous optimizations/code
+        warnings?: boolean;
+
+        // Global definitions
+        global_defs?: Object;
+    }
+
+    /**
+     * The compressor is a tree transformer which reduces the code size by applying various optimizations on the AST
+     */
+    function Compressor(options?: CompressorOptions): AST_Toplevel;
+
+
+    // TODO
+    interface TreeWalker {
+    }
+
+    type visitor = (node: AST_Node, descend: Function) => boolean;
+
+    /**
+     * UglifyJS provides a TreeWalker object and every node has a walk method that given a walker will apply your visitor to each node in the tree.
+     * Your visitor can return a non-falsy value in order to prevent descending the current node.
+     */
+    function TreeWalker(visitor: visitor): TreeWalker;
+
+
+    // TODO
+    interface TreeTransformer extends TreeWalker {
+    }
+
+    /**
+     * The tree transformer is a special case of a tree walker.
+     * In fact it even inherits from TreeWalker and you can use the same methods, but initialization and visitor protocol are a bit different.
+     */
+    function TreeTransformer(before: visitor, after: visitor): TreeTransformer;
+}
+
+export = UglifyJS;
diff --git a/types/uglify-js/v2/package.json b/types/uglify-js/v2/package.json
new file mode 100644
index 0000000000..100334a89f
--- /dev/null
+++ b/types/uglify-js/v2/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "source-map": "^0.6.1"
+    }
+}
diff --git a/types/uglify-js/v2/tsconfig.json b/types/uglify-js/v2/tsconfig.json
new file mode 100644
index 0000000000..1f63939ac8
--- /dev/null
+++ b/types/uglify-js/v2/tsconfig.json
@@ -0,0 +1,26 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "paths": {
+            "uglify-js": ["uglify-js/v2"]
+        }
+    },
+    "files": [
+        "index.d.ts",
+        "uglify-js-tests.ts"
+    ]
+}
diff --git a/types/uglify-js/v2/tslint.json b/types/uglify-js/v2/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/uglify-js/v2/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/uglify-js/v2/uglify-js-tests.ts b/types/uglify-js/v2/uglify-js-tests.ts
new file mode 100644
index 0000000000..19233bf7ad
--- /dev/null
+++ b/types/uglify-js/v2/uglify-js-tests.ts
@@ -0,0 +1,72 @@
+/// <reference types="node" />
+
+import * as UglifyJS from 'uglify-js';
+import * as fs from 'fs';
+
+var result = UglifyJS.minify("/path/to/file.js");
+console.log(result.code); // minified output
+// if you need to pass code instead of file name
+var result = UglifyJS.minify("var b = function () {};", {fromString: true});
+
+var result = UglifyJS.minify([ "file1.js", "file2.js", "file3.js" ]);
+console.log(result.code);
+
+var result = UglifyJS.minify([ "file1.js", "file2.js", "file3.js" ], {
+    outSourceMap: "out.js.map"
+});
+console.log(result.code); // minified output
+console.log(result.map);
+
+var result = UglifyJS.minify([ "file1.js", "file2.js", "file3.js" ], {
+    outSourceMap: "out.js.map",
+    sourceRoot: "http://example.com/src"
+});
+
+var result = UglifyJS.minify("compiled.js", {
+    inSourceMap: "compiled.js.map",
+    outSourceMap: "minified.js.map"
+});
+// same as before, it returns `code` and `map`
+
+const my_source_map_string = 'sourceMap';
+var result = UglifyJS.minify("compiled.js", {
+    inSourceMap: JSON.parse(my_source_map_string),
+    outSourceMap: "minified.js.map"
+});
+
+var toplevel_ast = UglifyJS.parse(code, {});
+
+var toplevel: UglifyJS.AST_Toplevel = null;
+const files = ['file1', 'file2'];
+files.forEach(function(file){
+    var code = fs.readFileSync(file, "utf8");
+    toplevel = UglifyJS.parse(code, {
+        filename: file,
+        toplevel: toplevel
+    });
+});
+
+toplevel.figure_out_scope()
+
+var compressor = UglifyJS.Compressor({});
+var compressed_ast = toplevel.transform(compressor);
+
+compressed_ast.figure_out_scope();
+compressed_ast.compute_char_frequency();
+compressed_ast.mangle_names();
+
+var stream = UglifyJS.OutputStream({});
+compressed_ast.print(stream);
+var code = stream.toString(); // this is your minified code
+
+var code = compressed_ast.print_to_string({});
+
+var source_map = UglifyJS.SourceMap({});
+var stream = UglifyJS.OutputStream({
+    //...
+    source_map: source_map
+});
+compressed_ast.print(stream);
+
+var code = stream.toString();
+var map = source_map.toString(); // json output for your source map
diff --git a/types/webpack/v3/webpack-tests.ts b/types/webpack/v3/webpack-tests.ts
index f56dbb84b6..513895dac2 100644
--- a/types/webpack/v3/webpack-tests.ts
+++ b/types/webpack/v3/webpack-tests.ts
@@ -368,7 +368,7 @@ plugin = new webpack.optimize.UglifyJsPlugin({
 });
 plugin = new webpack.optimize.UglifyJsPlugin({
     mangle: {
-        except: ['$super', '$', 'exports', 'require']
+        reserved: ['$super', '$', 'exports', 'require']
     }
 });
 plugin = new webpack.optimize.UglifyJsPlugin({
diff --git a/types/webpack/webpack-tests.ts b/types/webpack/webpack-tests.ts
index 8fe0ab1e4d..38cf243b70 100644
--- a/types/webpack/webpack-tests.ts
+++ b/types/webpack/webpack-tests.ts
@@ -262,7 +262,7 @@ plugin = new webpack.optimize.UglifyJsPlugin({
 });
 plugin = new webpack.optimize.UglifyJsPlugin({
     mangle: {
-        except: ['$super', '$', 'exports', 'require']
+        reserved: ['$super', '$', 'exports', 'require']
     }
 });
 plugin = new webpack.optimize.UglifyJsPlugin({

From 2efa8936a13d2f8273b04d626658e31f06930780 Mon Sep 17 00:00:00 2001
From: Behind The Math <info@behindthemath.io>
Date: Thu, 22 Mar 2018 15:53:25 -0400
Subject: [PATCH 0757/1382] Remove the need for lint exception

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

diff --git a/types/sqlite3/index.d.ts b/types/sqlite3/index.d.ts
index d4fb7c9599..8b988b5b22 100644
--- a/types/sqlite3/index.d.ts
+++ b/types/sqlite3/index.d.ts
@@ -88,8 +88,7 @@ export class Database extends events.EventEmitter {
 
 export function verbose(): sqlite3;
 
-// tslint:disable-next-line:strict-export-declare-modifiers
-interface sqlite3 {
+export interface sqlite3 {
     OPEN_READONLY: number;
     OPEN_READWRITE: number;
     OPEN_CREATE: number;

From bffcb83f7ec54c26ae602245da8c9c69c9ad1c65 Mon Sep 17 00:00:00 2001
From: Hugues Stefanski <hugues.stefanski@gmail.com>
Date: Thu, 22 Mar 2018 21:20:07 +0100
Subject: [PATCH 0758/1382] d3-geo v1.10 : added projection.angle method

---
 types/d3-geo/d3-geo-tests.ts |  3 +++
 types/d3-geo/index.d.ts      | 10 +++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/types/d3-geo/d3-geo-tests.ts b/types/d3-geo/d3-geo-tests.ts
index c4508351a0..5124694378 100644
--- a/types/d3-geo/d3-geo-tests.ts
+++ b/types/d3-geo/d3-geo-tests.ts
@@ -395,6 +395,9 @@ constructedProjection = constructedProjection.translate([480, 250]);
 const center: [number, number] = constructedProjection.center();
 constructedProjection = constructedProjection.center([0, 0]);
 
+const angle = constructedProjection.angle();
+constructedProjection = constructedProjection.angle(45);
+
 const rotate: [number, number, number] = constructedProjection.rotate();
 constructedProjection = constructedProjection.rotate([0, 0]);
 constructedProjection = constructedProjection.rotate([0, 0, 0]);
diff --git a/types/d3-geo/index.d.ts b/types/d3-geo/index.d.ts
index 7efbb72010..a7fc0e9094 100644
--- a/types/d3-geo/index.d.ts
+++ b/types/d3-geo/index.d.ts
@@ -887,7 +887,15 @@ export interface GeoProjection extends GeoStreamWrapper {
      * @param precision A numeric value in pixels to use as the threshold for the projection’s adaptive resampling.
      */
     precision(precision: number): this;
-
+    /**
+     * Returns the projection’s current angle, which defaults to 0°.
+     */
+    angle(): number;
+    /**
+     * Sets the projection’s post-projection planar rotation angle to the specified angle in degrees and returns the projection.
+     * @param angle The new rotation angle of the projection.
+     */
+    angle(angle: number): this;
     /**
      * Returns the current rotation [lambda, phi, gamma] specifying the rotation angles in degrees about each spherical axis.
      * (These correspond to yaw, pitch and roll.) which defaults [0, 0, 0].

From 8a2283e0e6f36f88c708407511e5f5093bad634b Mon Sep 17 00:00:00 2001
From: Hugues Stefanski <hugues.stefanski@gmail.com>
Date: Thu, 22 Mar 2018 21:23:19 +0100
Subject: [PATCH 0759/1382] d3-geo version increase

---
 types/d3-geo/index.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/d3-geo/index.d.ts b/types/d3-geo/index.d.ts
index a7fc0e9094..d9f0931269 100644
--- a/types/d3-geo/index.d.ts
+++ b/types/d3-geo/index.d.ts
@@ -1,10 +1,10 @@
-// Type definitions for D3JS d3-geo module 1.9
+// Type definitions for D3JS d3-geo module 1.10
 // 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
 // TypeScript Version: 2.3
 
-// Last module patch version validated against: 1.9.0
+// Last module patch version validated against: 1.10.0
 
 import * as GeoJSON from 'geojson';
 

From dbb40c14f8a9901796e293d64adcad9c1fe9b789 Mon Sep 17 00:00:00 2001
From: Michael Zabka <zabka.michael@gmail.com>
Date: Thu, 22 Mar 2018 21:17:22 +0100
Subject: [PATCH 0760/1382] Allow omit second key argument in crypto-js Hash
 functions

* Fixes DefinitelyTyped/DefinitelyTyped#24425
---
 types/crypto-js/crypto-js-tests.ts |  2 ++
 types/crypto-js/index.d.ts         | 52 +++++++++++++++++++-----------
 2 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/types/crypto-js/crypto-js-tests.ts b/types/crypto-js/crypto-js-tests.ts
index 9b5dd1be6f..59f1d684ed 100644
--- a/types/crypto-js/crypto-js-tests.ts
+++ b/types/crypto-js/crypto-js-tests.ts
@@ -4,9 +4,11 @@ import CryptoJS = require('crypto-js');
 var wordArray: CryptoJS.WordArray;
 wordArray = CryptoJS.MD5('some message');
 wordArray = CryptoJS.MD5('some message', 'some key');
+wordArray = CryptoJS.MD5('some message', { any: true });
 
 wordArray = CryptoJS.SHA1('some message');
 wordArray = CryptoJS.SHA1('some message', 'some key', { any: true });
+wordArray = CryptoJS.SHA1('some message', { any: true });
 
 wordArray = CryptoJS.format.OpenSSL('some message');
 wordArray = CryptoJS.format.OpenSSL('some message', 'some key');
diff --git a/types/crypto-js/index.d.ts b/types/crypto-js/index.d.ts
index c066204df2..db9ed6c30e 100644
--- a/types/crypto-js/index.d.ts
+++ b/types/crypto-js/index.d.ts
@@ -8,7 +8,6 @@ export as namespace CryptoJS;
 
 declare var CryptoJS: CryptoJS.Hashes;
 declare namespace CryptoJS {
-	type Hash = (message: string | LibWordArray, key?: string | WordArray, ...options: any[]) => WordArray;
 	interface Cipher {
 		encrypt(message: string, secretPassphrase: string | WordArray, option?: CipherOption): WordArray;
 		decrypt(encryptedMessage: string | WordArray, secretPassphrase: string | WordArray, option?: CipherOption): DecryptedMessage;
@@ -54,23 +53,40 @@ declare namespace CryptoJS {
 	interface Padding {}
 
 	export interface Hashes {
-		MD5: Hash;
-		SHA1: Hash;
-		SHA256: Hash;
-		SHA224: Hash;
-		SHA512: Hash;
-		SHA384: Hash;
-		SHA3: Hash;
-		RIPEMD160: Hash;
-		HmacMD5: Hash;
-		HmacSHA1: Hash;
-		HmacSHA256: Hash;
-		HmacSHA224: Hash;
-		HmacSHA512: Hash;
-		HmacSHA384: Hash;
-		HmacSHA3: Hash;
-		HmacRIPEMD160: Hash;
-		PBKDF2: Hash;
+		MD5(message: string | LibWordArray, key?: string | WordArray, ...options: any[]): WordArray;
+		MD5(message: string | LibWordArray, ...options: any[]): WordArray;
+		SHA1(message: string | LibWordArray, key?: string | WordArray, ...options: any[]): WordArray;
+		SHA1(message: string | LibWordArray, ...options: any[]): WordArray;
+		SHA256(message: string | LibWordArray, key?: string | WordArray, ...options: any[]): WordArray;
+		SHA256(message: string | LibWordArray, ...options: any[]): WordArray;
+		SHA224(message: string | LibWordArray, key?: string | WordArray, ...options: any[]): WordArray;
+		SHA224(message: string | LibWordArray, ...options: any[]): WordArray;
+		SHA512(message: string | LibWordArray, key?: string | WordArray, ...options: any[]): WordArray;
+		SHA512(message: string | LibWordArray, ...options: any[]): WordArray;
+		SHA384(message: string | LibWordArray, key?: string | WordArray, ...options: any[]): WordArray;
+		SHA384(message: string | LibWordArray, ...options: any[]): WordArray;
+		SHA3(message: string | LibWordArray, key?: string | WordArray, ...options: any[]): WordArray;
+		SHA3(message: string | LibWordArray, ...options: any[]): WordArray;
+		RIPEMD160(message: string | LibWordArray, key?: string | WordArray, ...options: any[]): WordArray;
+		RIPEMD160(message: string | LibWordArray, ...options: any[]): WordArray;
+		HmacMD5(message: string | LibWordArray, key?: string | WordArray, ...options: any[]): WordArray;
+		HmacMD5(message: string | LibWordArray, ...options: any[]): WordArray;
+		HmacSHA1(message: string | LibWordArray, key?: string | WordArray, ...options: any[]): WordArray;
+		HmacSHA1(message: string | LibWordArray, ...options: any[]): WordArray;
+		HmacSHA256(message: string | LibWordArray, key?: string | WordArray, ...options: any[]): WordArray;
+		HmacSHA256(message: string | LibWordArray, ...options: any[]): WordArray;
+		HmacSHA224(message: string | LibWordArray, key?: string | WordArray, ...options: any[]): WordArray;
+		HmacSHA224(message: string | LibWordArray, ...options: any[]): WordArray;
+		HmacSHA512(message: string | LibWordArray, key?: string | WordArray, ...options: any[]): WordArray;
+		HmacSHA512(message: string | LibWordArray, ...options: any[]): WordArray;
+		HmacSHA384(message: string | LibWordArray, key?: string | WordArray, ...options: any[]): WordArray;
+		HmacSHA384(message: string | LibWordArray, ...options: any[]): WordArray;
+		HmacSHA3(message: string | LibWordArray, key?: string | WordArray, ...options: any[]): WordArray;
+		HmacSHA3(message: string | LibWordArray, ...options: any[]): WordArray;
+		HmacRIPEMD160(message: string | LibWordArray, key?: string | WordArray, ...options: any[]): WordArray;
+		HmacRIPEMD160(message: string | LibWordArray, ...options: any[]): WordArray;
+		PBKDF2(message: string | LibWordArray, key?: string | WordArray, ...options: any[]): WordArray;
+		PBKDF2(message: string | LibWordArray, ...options: any[]): WordArray;
 		AES: Cipher;
 		DES: Cipher;
 		TripleDES: Cipher;

From e1806c890eadd0e83c4af8512feee44621b13ac1 Mon Sep 17 00:00:00 2001
From: Alvis HT Tang <alvis@hilbert.space>
Date: Thu, 22 Mar 2018 23:48:26 +0000
Subject: [PATCH 0761/1382] highland: add the definition for the new isNil()
 for type guarding

This commit add the definition for the a very simple, and yet essential, isNil
function for type checking. This function is particularly useful in a consume
handler.

Example:
```
source.consume(function (err, x, push, next) {
  if (err) {
    // pass errors along the stream and consume next value
    push(err);
    next();
  } else if (_.isNil(x)) { // type guard is only possible with this function
    // pass nil (end event) along the stream
    push(null, x);
  } else {
    // pass on the value only if the value passes the predicate
    if (f(x)) {
      push(null, x);
    }
    next();
  }
});
```

See https://github.com/caolan/highland/pull/645
---
 types/highland/index.d.ts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/types/highland/index.d.ts b/types/highland/index.d.ts
index eff8fb2769..473e93880a 100644
--- a/types/highland/index.d.ts
+++ b/types/highland/index.d.ts
@@ -89,6 +89,17 @@ interface HighlandStatic {
 	// UTILS
 	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
+  /**
+	 * Returns true if `x` is the end of stream marker.
+	 *
+	 * @id isNil
+	 * @section Streams
+	 * @name _.isNil(x)
+	 * @param x - the object to test
+	 * @api public
+	 */
+  isNil<R>(x: R | Highland.Nil): x is Highland.Nil;
+
 	/**
 	 * Returns true if `x` is a Highland Stream.
 	 *

From a16cd3ea3211250b557fff6eb614a1d490e7d454 Mon Sep 17 00:00:00 2001
From: Alvis HT Tang <alvis@hilbert.space>
Date: Thu, 22 Mar 2018 23:54:08 +0000
Subject: [PATCH 0762/1382] highland: add a test for the new isNil()

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

diff --git a/types/highland/highland-tests.ts b/types/highland/highland-tests.ts
index 5f1c734395..a1c48c944b 100644
--- a/types/highland/highland-tests.ts
+++ b/types/highland/highland-tests.ts
@@ -337,6 +337,8 @@ fooStream.toCallback((err: Error) => {});
 // UTILS
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
+bool = _.isNil(x);
+
 bool = _.isStream(x);
 bool = _.isStream(fooStream);
 

From bd2d2d91b8c87554328298281314cd929152cc80 Mon Sep 17 00:00:00 2001
From: piq9117 <piq9117@gmail.com>
Date: Thu, 22 Mar 2018 19:01:21 -0500
Subject: [PATCH 0763/1382] Sanctuary

replaced all Array inputs to ReadonlyArray.
---
 types/sanctuary/index.d.ts | 75 +++++++++++++++++++-------------------
 1 file changed, 38 insertions(+), 37 deletions(-)

diff --git a/types/sanctuary/index.d.ts b/types/sanctuary/index.d.ts
index 0d61fe22aa..b0a8fd7750 100644
--- a/types/sanctuary/index.d.ts
+++ b/types/sanctuary/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/sanctuary-js/sanctuary#readme
 // Definitions by: David Chambers <https://github.com/davidchambers>
 //                 Juan J. Jimenez-Anca <https://github.com/cortopy>
+//                 Ken Aguilar <https://github.com/piq9117>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare var S: Sanctuary.Environment;
@@ -73,12 +74,12 @@ interface Contravariant<A> {}
 
 interface ListToMaybeList {
   (xs: string): Maybe<string>;
-  <A>(xs: A[]): Maybe<A[]>;
+  <A>(xs: ReadonlyArray<A>): Maybe<A[]>;
 }
 
 interface MatchObj {
   match: string;
-  groups: Array<Maybe<string>>;
+  groups: ReadonlyArray<Maybe<string>>;
 }
 
 declare namespace Sanctuary {
@@ -108,13 +109,13 @@ declare namespace Sanctuary {
     max<A>(x: Ord<A>): (y: Ord<A>) => A;
     id<A>(p: TypeRep): Fn<A, A> | Category<any>;
     concat<A>(x: Semigroup<A>): (y: Semigroup<A>) => Semigroup<A>;
-    concat<A>(x: A[]): (y: A[]) => A[];
+    concat<A>(x: ReadonlyArray<A>): (y: ReadonlyArray<A>) => A[];
     concat<A>(x: StrMap<A>): (y: StrMap<A>) => StrMap<A>;
     concat(x: string): (y: string) => string;
     empty(p: TypeRep): Monoid<any>;
     map<A, B>(p: Fn<A, B>): {
       <C>(q: Fn<C, A>): Fn<C, B>;
-        (q: A[]): B[];
+        (q: ReadonlyArray<A>): B[];
         (q: StrMap<A>): StrMap<B>;
         (q: Functor<A>): Functor<B>;
     };
@@ -125,7 +126,7 @@ declare namespace Sanctuary {
     };
     alt<A>(x: Alt<A>): (y: Alt<A>) => Alt<A>;
     zero(p: TypeRep): Plus<any>;
-    reduce<A, B>(p: Fn2<B, A, B>): (q: B) => (r: A[] | StrMap<A> | Maybe<A> | Either<any, A> | Foldable<A>) => B;
+    reduce<A, B>(p: Fn2<B, A, B>): (q: B) => (r: ReadonlyArray<A> | StrMap<A> | Maybe<A> | Either<any, A> | Foldable<A>) => B;
     traverse(typeRep: TypeRep): <A, B>(f: Fn<A, Applicative<B>>) => (traversable: Traversable<A>) => Applicative<Traversable<B>>;
     sequence(typeRep: TypeRep): <A>(traversable: Traversable<Applicative<A>>) => Applicative<Traversable<A>>;
     ap<A, B>(p: Apply<Fn<A, B>>): (q: Apply<A>) => Apply<B>;
@@ -144,7 +145,7 @@ declare namespace Sanctuary {
     chain<A, B, X>(f: Fn2<A, X, B>): (chain_: Fn<X, A>) => Fn<X, B>;
     chain<A, B>(f: Fn <A,  Chain<B>>): (chain_: Chain<A>) => Chain<B>;
     join<A, B>(chain_: Fn2<B, B, A>): Fn<B, A>;
-    join<A>(chain_: A[][]): A[];
+    join<A>(chain_: ReadonlyArray<ReadonlyArray<A>>): A[];
     join<A>(chain_: Maybe<Maybe<A>>): Maybe<A>;
     join<A>(chain_: Chain<Chain<A>>): Chain<A>;
     chainRec(typeRep: TypeRep): {
@@ -158,11 +159,11 @@ declare namespace Sanctuary {
         (contravariant: Contravariant<A>): Contravariant<B>;
     };
     filter <A>(pred: Predicate<A>): {
-      (m: A[]): A[];
+      (m: ReadonlyArray<A>): A[];
       (m: Foldable<A>): Foldable<A>;
     };
     filterM<A>(pred: Predicate<A>): {
-      (m: A[]): A[];
+      (m: ReadonlyArray<A>): A[];
       (m: Foldable<A>): Foldable<A>;
     };
     takeWhile<A>(pred: Predicate<A>): (foldable: Foldable<A>) => Foldable<A>;
@@ -185,7 +186,7 @@ declare namespace Sanctuary {
     pipe<A, B, C, D>(fs: [Fn<A, B>, Fn<B, C>, Fn<C, D>]): (x: A) => D;
     pipe<A, B, C, D, E>(fs: [Fn<A, B>, Fn<B, C>, Fn<C, D>, Fn<D, E>]): (x: A) => E;
     pipe<A, B, C, D, E, F>(fs: [Fn<A, B>, Fn<B, C>, Fn<C, D>, Fn<D, E>, Fn<E, F>]): (x: A) => F;
-    pipe(fs: Array<Fn<any, any>>): (x: any) => any;
+    pipe(fs: ReadonlyArray<Fn<any, any>>): (x: any) => any;
     on<A, B, C>(p: Fn2<B, B, C>): (q: Fn<A, B>) => (r: A) => Fn<A, C>;
     //  TODO: Maybe
     isNothing(p: Maybe<any>): boolean;
@@ -196,7 +197,7 @@ declare namespace Sanctuary {
     toMaybe<A>(p: A | null | undefined): Maybe<A>;
     maybe<B>(p: B): <A>(q: Fn<A, B>) => (r: Maybe<A>) => B;
     maybe_<B>(p: Thunk<B>): <A>(q: Fn<A, B>) => (r: Maybe<A>) => B;
-    justs<A>(p: Array<Maybe<A>>): A[];
+    justs<A>(p: ReadonlyArray<Maybe<A>>): A[];
     mapMaybe<A>(p: Fn<A, Maybe<any>>): (q: A[]) => A[];
     encase<A, B>(p: Fn<A, B>): Fn<A, Maybe<B>>;
     encase2<A, B, C>(p: Fn2<A, B, C>): Fn2<A, B, Maybe<C>>;
@@ -208,8 +209,8 @@ declare namespace Sanctuary {
     fromEither<B>(p: B): (q: Either<any, B>) => B;
     toEither<A>(p: A): <B>(q: B | null | undefined) => Either<A, B>;
     either<A, C>(p: Fn<A, C>): <B>(q: Fn<B, C>) => (r: Either<A, B>) => C;
-    lefts<A>(p: Array<Either<A, any>>): A[];
-    rights<B>(p: Array<Either<any, B>>): B[];
+    lefts<A>(p: ReadonlyArray<Either<A, any>>): A[];
+    rights<B>(p: ReadonlyArray<Either<any, B>>): B[];
     tagBy<A>(p: Predicate<A>): (q: A) => Either<A, A>;
     encaseEither<L>(p: Fn<Error, L>): <A, R>(q: Fn<A, R>) => Fn<A, Either<L, R>>;
     encaseEither2<L>(p: Fn<Error, L>): <A, B, R>(q: Fn2<A, B, R>) => Fn2<A, B, Either<L, R>>;
@@ -223,22 +224,22 @@ declare namespace Sanctuary {
     ifElse<A, B>(p: Predicate<A>): (q: Fn<A, B>) => (r: Fn<A, B>) => Fn<A, B>;
     when<A>(p: Predicate<A>): (q: Fn<A, A>) => Fn<A, A>;
     unless<A>(p: Predicate<A>): (q: Fn<A, A>) => Fn<A, A>;
-    allPass<A>(p: Array<Predicate<A>>): Predicate<A>;
-    anyPass<A>(p: Array<Predicate<A>>): Predicate<A>;
+    allPass<A>(p: ReadonlyArray<Predicate<A>>): Predicate<A>;
+    anyPass<A>(p: ReadonlyArray<Predicate<A>>): Predicate<A>;
     //  List
     slice(p: Integer): (q: Integer) => ListToMaybeList;
     at(p: Integer): {
       (q: string): Maybe<string>;
-      <A>(q: A[]): Maybe<A>;
+      <A>(q: ReadonlyArray<A>): Maybe<A>;
     };
     head(xs: string): Maybe<string>;
-    head<A>(xs: A[]): Maybe<A>;
+    head<A>(xs: ReadonlyArray<A>): Maybe<A>;
     last(xs: string): Maybe<string>;
-    last<A>(xs: A[]): Maybe<A>;
+    last<A>(xs: ReadonlyArray<A>): Maybe<A>;
     tail(xs: string): Maybe<string>;
-    tail<A>(xs: A[]): Maybe<A[]>;
+    tail<A>(xs: ReadonlyArray<A>): Maybe<A[]>;
     init(xs: string): Maybe<string>;
-    init<A>(xs: A[]): Maybe<A[]>;
+    init<A>(xs: ReadonlyArray<A>): Maybe<A[]>;
     take(n: Integer): ListToMaybeList;
     takeLast(n: Integer): ListToMaybeList;
     drop(n: Integer): ListToMaybeList;
@@ -246,33 +247,33 @@ declare namespace Sanctuary {
     //  Array
     //  TODO: Fantasyland overloads, non-curried versions
     append<A>(x: A): {
-      (xs: A[]): A[];
+      (xs: ReadonlyArray<A>): A[];
       (xs: Applicative<A>): Applicative<A>;
     };
     prepend<A>(x: A): {
-      (xs: A[]): A[];
+      (xs: ReadonlyArray<A>): A[];
       (xs: Applicative<A>): Applicative<A>;
     };
-    joinWith(p: string): (q: string[]) => string;
-    elem<A>(p: A): (q: Foldable<A> | StrMap<A> | A[]) => boolean;
-    find<A>(p: Predicate<A>): (q: A[] | StrMap<A> | Foldable<A>) => Maybe<A>;
+    joinWith(p: string): (q: ReadonlyArray<string>) => string;
+    elem<A>(p: A): (q: Foldable<A> | StrMap<A> | ReadonlyArray<A>) => boolean;
+    find<A>(p: Predicate<A>): (q: ReadonlyArray<A> | StrMap<A> | Foldable<A>) => Maybe<A>;
     pluck(key: string): (xs: Functor<any>) => Functor<any>;
     unfoldr<A, B>(f: Fn<B, Maybe<Pair<A, B>>>): (x: B) => A[];
     range(from: Integer): (to: Integer) => Integer[];
-    groupBy<A>(f: Fn2<A, A, boolean>): (xs: A[]) => A[][];
-    reverse<A>(foldable: A[]): A[];
+    groupBy<A>(f: Fn2<A, A, boolean>): (xs: ReadonlyArray<A>) => A[][];
+    reverse<A>(foldable: ReadonlyArray<A>): A[];
     reverse<A>(foldable: Foldable<A>): Foldable<A>;
-    sort<A>(foldable: A[]): A[];
+    sort<A>(foldable: ReadonlyArray<A>): A[];
     sort<A>(foldable: Foldable<A>): Foldable<A>;
     sortBy<A>(f: Fn<A, Ord<any>>): {
-      (foldable: A[]): A[];
+      (foldable: ReadonlyArray<A>): A[];
       (foldable: Foldable<A>): Foldable<A>;
     };
     //  Object
     prop(p: string): (q: any) => any;
-    props(p: string[]): (q: any) => any;
+    props(p: ReadonlyArray<string>): (q: any) => any;
     get(p: Predicate<any>): (q: string) => (r: any) => Maybe<any>;
-    gets(p: Predicate<any>): (q: string[]) => (r: any) => Maybe<any>;
+    gets(p: Predicate<any>): (q: ReadonlyArray<string>) => (r: any) => Maybe<any>;
     //  StrMap
     keys(p: StrMap<any>): string[];
     values<A>(p: StrMap<A>): A[];
@@ -280,13 +281,13 @@ declare namespace Sanctuary {
     //  Number
     negate(n: ValidNumber): ValidNumber;
     add(p: FiniteNumber): (q: FiniteNumber) => FiniteNumber;
-    sum(p: Foldable<FiniteNumber> | FiniteNumber[]): FiniteNumber;
+    sum(p: Foldable<FiniteNumber> | ReadonlyArray<FiniteNumber>): FiniteNumber;
     sub(p: FiniteNumber): (q: FiniteNumber) => FiniteNumber;
     mult(x: FiniteNumber): (q: FiniteNumber) => FiniteNumber;
-    product(p: Foldable<FiniteNumber> | FiniteNumber[]): FiniteNumber;
+    product(p: Foldable<FiniteNumber> | ReadonlyArray<FiniteNumber>): FiniteNumber;
     div(p: NonZeroFiniteNumber): (q: FiniteNumber) => FiniteNumber;
     pow(p: FiniteNumber): (q: FiniteNumber) => FiniteNumber;
-    mean(p: Foldable<FiniteNumber> | FiniteNumber[]): Maybe<FiniteNumber>;
+    mean(p: Foldable<FiniteNumber> | ReadonlyArray<FiniteNumber>): Maybe<FiniteNumber>;
     //  Integer
     even(n: Integer): boolean;
     odd(n: Integer): boolean;
@@ -308,15 +309,15 @@ declare namespace Sanctuary {
     stripPrefix(prefix: string): (q: string) => Maybe<string>;
     stripSuffix(suffix: string): (q: string) => Maybe<string>;
     words(s: string): string[];
-    unwords(xs: string[]): string;
+    unwords(xs: ReadonlyArray<string>): string;
     lines(s: string): string[];
-    unlines(xs: string[]): string;
+    unlines(xs: ReadonlyArray<string>): string;
     splitOn(separator: string): (q: string) => string[];
     splitOnRegex(pattern: RegExp): (q: string) => string[];
   }
 
   interface Environment extends Static {
-    env: any[];
-    create(opts: {checkTypes: boolean, env: any[]}): Static;
+    env: ReadonlyArray<any>;
+    create(opts: {checkTypes: boolean, env: ReadonlyArray<any>}): Static;
   }
 }

From 47337073e16adc1c22cda1f3237cfa1e231f36ae Mon Sep 17 00:00:00 2001
From: Uri Shaked <uri@urishaked.com>
Date: Fri, 23 Mar 2018 03:37:32 +0300
Subject: [PATCH 0764/1382] add types for seededshuffle

---
 types/seededshuffle/index.d.ts             | 13 ++++++++++++
 types/seededshuffle/seededshuffle-tests.ts |  7 +++++++
 types/seededshuffle/tsconfig.json          | 23 ++++++++++++++++++++++
 types/seededshuffle/tslint.json            |  1 +
 4 files changed, 44 insertions(+)
 create mode 100644 types/seededshuffle/index.d.ts
 create mode 100644 types/seededshuffle/seededshuffle-tests.ts
 create mode 100644 types/seededshuffle/tsconfig.json
 create mode 100644 types/seededshuffle/tslint.json

diff --git a/types/seededshuffle/index.d.ts b/types/seededshuffle/index.d.ts
new file mode 100644
index 0000000000..d32e5e3de1
--- /dev/null
+++ b/types/seededshuffle/index.d.ts
@@ -0,0 +1,13 @@
+// Type definitions for seededshuffle 0.2
+// Project: https://github.com/LouisT/SeededShuffle
+// Definitions by: Uri Shaked <https://github.com/urish>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export const seed: number;
+export const strSeed: string;
+
+export function shuffle<T>(arr: T[], seed: string|number): T[];
+export function shuffle<T>(arr: ReadonlyArray<T>, seed: string|number, copy: true): T[];
+
+export function unshuffle<T>(arr: T[], seed: string|number): T[];
+export function unshuffle<T>(arr: ReadonlyArray<T>, seed: string|number, copy: true): T[];
diff --git a/types/seededshuffle/seededshuffle-tests.ts b/types/seededshuffle/seededshuffle-tests.ts
new file mode 100644
index 0000000000..3abbd8ca71
--- /dev/null
+++ b/types/seededshuffle/seededshuffle-tests.ts
@@ -0,0 +1,7 @@
+import { shuffle, unshuffle } from 'seededshuffle';
+
+const a: number[] = shuffle([1, 2, 3] as ReadonlyArray<number>, 'Example seed', true);
+const b: number[] = unshuffle(a as ReadonlyArray<number>, 'Example seed', true);
+
+const c: string[] = shuffle(['a', 'b', 'c'], 'another seed');
+const d: string[] = unshuffle(c, 'another seed');
diff --git a/types/seededshuffle/tsconfig.json b/types/seededshuffle/tsconfig.json
new file mode 100644
index 0000000000..e816622b91
--- /dev/null
+++ b/types/seededshuffle/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "seededshuffle-tests.ts"
+    ]
+}
diff --git a/types/seededshuffle/tslint.json b/types/seededshuffle/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/seededshuffle/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 8d0bdd3e2edac1c405035243999848b3fd0ba375 Mon Sep 17 00:00:00 2001
From: Ricardo De Pena <ricardo@isnull.co>
Date: Thu, 22 Mar 2018 22:41:18 -0400
Subject: [PATCH 0765/1382] Fixed review items.

---
 types/openfin/v29/tsconfig.json | 2 +-
 types/openfin/v29/tslint.json   | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/types/openfin/v29/tsconfig.json b/types/openfin/v29/tsconfig.json
index a590982714..df2dae8b79 100644
--- a/types/openfin/v29/tsconfig.json
+++ b/types/openfin/v29/tsconfig.json
@@ -8,7 +8,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
-        "strictFunctionTypes": false,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
diff --git a/types/openfin/v29/tslint.json b/types/openfin/v29/tslint.json
index 64aace11d6..f93cf8562a 100644
--- a/types/openfin/v29/tslint.json
+++ b/types/openfin/v29/tslint.json
@@ -1,6 +1,3 @@
 {
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "max-line-length": false
-    }
+    "extends": "dtslint/dt.json"
 }

From 196d13df6f5dca28bdb6db85d87b3059033f8263 Mon Sep 17 00:00:00 2001
From: Walter Rumsby <walter.rumsby@myfoodbag.co.nz>
Date: Fri, 23 Mar 2018 16:09:12 +1300
Subject: [PATCH 0766/1382] Update based on PR comments

---
 types/mem-fs/mem-fs-tests.ts | 2 +-
 types/mem-fs/tslint.json     | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/types/mem-fs/mem-fs-tests.ts b/types/mem-fs/mem-fs-tests.ts
index 13a2649f19..ada05c22c7 100644
--- a/types/mem-fs/mem-fs-tests.ts
+++ b/types/mem-fs/mem-fs-tests.ts
@@ -5,4 +5,4 @@ const file = store.get('hello');
 
 store.add(file, 'hahahahah');
 
-store.each((file, index) => console.log(index, file.path));
+store.each(file => console.dir(store.get(file.path)));
diff --git a/types/mem-fs/tslint.json b/types/mem-fs/tslint.json
index 2ff396e742..f93cf8562a 100644
--- a/types/mem-fs/tslint.json
+++ b/types/mem-fs/tslint.json
@@ -1,6 +1,3 @@
 {
-    "extends": "dtslint/dt.json",
-    "rules": {
-
-    }
+    "extends": "dtslint/dt.json"
 }

From d6c651c1b3a98c9ca5a7464bff678605b5e77c04 Mon Sep 17 00:00:00 2001
From: Tim Wang <tim@thenetcircle.com>
Date: Fri, 23 Mar 2018 13:16:51 +0800
Subject: [PATCH 0767/1382] Add back params generic and remove remain action
 generic. Add support for stateless screen.

---
 types/react-navigation/index.d.ts             | 65 ++++++++++---------
 .../react-navigation-tests.tsx                | 31 +++++++--
 2 files changed, 62 insertions(+), 34 deletions(-)

diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index 0e6bb2d94c..47304a1856 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-navigation 1.2
+// Type definitions for react-navigation 1.5
 // Project: https://github.com/react-navigation/react-navigation
 // Definitions by: Huhuanming <https://github.com/huhuanming>
 //                 mhcgrq <https://github.com/mhcgrq>
@@ -45,7 +45,6 @@ export interface HeaderProps extends NavigationSceneRendererProps {
   mode: HeaderMode;
   router: NavigationRouter<
     NavigationState,
-    NavigationAction,
     NavigationStackScreenOptions
   >;
   getScreenDetails: (navigationScene: NavigationScene) => NavigationScreenDetails<
@@ -75,9 +74,9 @@ export interface NavigationState {
   routes: any[];
 }
 
-export type NavigationRoute = NavigationLeafRoute | NavigationStateRoute;
+export type NavigationRoute<Params = NavigationParams> = NavigationLeafRoute<Params> | NavigationStateRoute<Params>;
 
-export interface NavigationLeafRoute {
+export interface NavigationLeafRoute<Params> {
   /**
    * React's key used by some navigators. No need to specify these manually,
    * they will be defined by the router.
@@ -96,23 +95,23 @@ export interface NavigationLeafRoute {
    * Params passed to this route when navigating to it,
    * e.g. `{ car_id: 123 }` in a route that displays a car.
    */
-  params?: NavigationParams;
+  params?: Params;
 }
 
-export type NavigationStateRoute = NavigationLeafRoute & NavigationState;
+export type NavigationStateRoute<NavigationLeafRouteParams> = NavigationLeafRoute<NavigationLeafRouteParams> & NavigationState;
 
 export type NavigationScreenOptionsGetter<Options> = (
-  navigation: NavigationScreenProp<NavigationRoute>,
+  navigation: NavigationScreenProp<NavigationRoute<any>>,
   screenProps?: { [key: string]: any }
 ) => Options;
 
-export interface NavigationRouter<State, Action, Options> {
+export interface NavigationRouter<State = NavigationState, Options = {}> {
   /**
    * The reducer that outputs the new navigation state for a given action, with
    * an optional previous state. When the action is considered handled but the
    * state is unchanged, the output state is null.
    */
-  getStateForAction: (action: Action, lastState?: State) => (State | null);
+  getStateForAction: (action: NavigationAction, lastState?: State) => (State | null);
 
   /**
    * Maps a URI-like string to an action. This can be mapped to a state
@@ -121,7 +120,7 @@ export interface NavigationRouter<State, Action, Options> {
   getActionForPathAndParams: (
     path: string,
     params?: NavigationParams
-  ) => (Action | null);
+  ) => (NavigationAction | null);
 
   getPathAndParamsForState: (
     state: State
@@ -175,16 +174,24 @@ export type NavigationScreenConfig<Options> =
 
 export type NavigationComponent =
   NavigationScreenComponent<any, any>
-  | NavigationNavigator<any, any, any, any>;
+  | NavigationNavigator<any, any, any>
+  | any;
 
-export interface NavigationScreenComponent<T, Options> extends React.ComponentClass<T> {
-  navigationOptions?: NavigationScreenConfig<Options>;
-}
+export type NavigationScreenComponent<
+    Options = {},
+    Props = {}
+> = React.ComponentType<NavigationNavigatorProps<Options, NavigationState> & Props> &
+({} | { navigationOptions: NavigationScreenConfig<Options> });
 
-export interface NavigationNavigator<T, State, Action, Options> extends React.ComponentClass<T> {
-  router?: NavigationRouter<State, Action, Options>;
-  navigationOptions?: NavigationScreenConfig<Options>;
-}
+
+export type NavigationNavigator<
+    State = NavigationState,
+    Options = {},
+    Props = {}
+> = React.ComponentType<NavigationNavigatorProps<Options, State> & Props> & {
+    router: NavigationRouter<State, Options>,
+    navigationOptions?: NavigationScreenConfig<Options> | any,
+};
 
 export interface NavigationParams {
   [key: string]: any;
@@ -452,10 +459,10 @@ export interface NavigationScreenProp<S, P = NavigationParams> {
   popToTop: (params?: { immediate?: boolean }) => boolean;
 }
 
-export interface NavigationNavigatorProps<S = {}> {
+export interface NavigationNavigatorProps<O = {}, S = {}> {
   navigation?: NavigationProp<S>;
   screenProps?: { [key: string]: any };
-  navigationOptions?: any;
+  navigationOptions?: O;
 }
 
 /**
@@ -587,7 +594,7 @@ export interface NavigationContainerProps {
 export interface NavigationContainer extends React.ComponentClass<
   NavigationContainerProps & NavigationNavigatorProps<any>
 > {
-  router: NavigationRouter<any, any, any>;
+  router: NavigationRouter<any, any>;
   screenProps: { [key: string]: any };
   navigationOptions: any;
   state: { nav: NavigationState | null };
@@ -810,7 +817,7 @@ export class Transitioner extends React.Component<
 export function TabRouter(
   routeConfigs: NavigationRouteConfigMap,
   config: NavigationTabRouterConfig
-): NavigationRouter<any, any, any>;
+): NavigationRouter<any, any>;
 
 /**
  * Stack Router
@@ -820,19 +827,19 @@ export function TabRouter(
 export function StackRouter(
   routeConfigs: NavigationRouteConfigMap,
   config: NavigationTabRouterConfig
-): NavigationRouter<any, any, any>;
+): NavigationRouter<any, any>;
 
 /**
  * Create Navigator
  *
  * @see https://github.com/react-navigation/react-navigation/blob/master/src/navigators/createNavigator.js
  */
-export function createNavigator<C, S, A, Options>(
-  router: NavigationRouter<S, A, Options>,
+export function createNavigator<C, S, Options>(
+  router: NavigationRouter<S, Options>,
   routeConfigs?: NavigationRouteConfigMap,
   navigatorConfig?: {} | null,
   navigatorType?: NavigatorType
-): (NavigationView: React.ComponentClass<C>) => NavigationNavigator<C, S, A, Options>;
+): (NavigationView: React.ComponentClass<C>) => NavigationNavigator<C, S, Options>;
 
 /**
  * Create an HOC that injects the navigation and manages the navigation state
@@ -843,7 +850,7 @@ export function createNavigator<C, S, A, Options>(
  * @see https://github.com/react-navigation/react-navigation/blob/master/src/createNavigationContainer.js
  */
 export function createNavigationContainer(
-  Component: NavigationNavigator<any, any, any, any>
+  Component: NavigationNavigator<any, any, any>
 ): NavigationContainer;
 /**
  * END MANUAL DEFINITIONS OUTSIDE OF TYPEDEFINITION.JS
@@ -853,8 +860,8 @@ export function createNavigationContainer(
  * BEGIN CUSTOM CONVENIENCE INTERFACES
  */
 
-export interface NavigationScreenProps {
-  navigation: NavigationScreenProp<NavigationRoute>;
+export interface NavigationScreenProps<Params = NavigationParams> {
+  navigation: NavigationScreenProp<NavigationRoute<Params>>;
   screenProps?: { [key: string]: any };
   navigationOptions?: NavigationScreenConfig<any>;
 }
diff --git a/types/react-navigation/react-navigation-tests.tsx b/types/react-navigation/react-navigation-tests.tsx
index d0e65dfc8e..4c8ff5dd99 100644
--- a/types/react-navigation/react-navigation-tests.tsx
+++ b/types/react-navigation/react-navigation-tests.tsx
@@ -36,6 +36,7 @@ import {
     NavigationParams,
     NavigationPopAction,
     NavigationPopToTopAction,
+    NavigationScreenComponent,
 } from 'react-navigation';
 
 // Constants
@@ -48,14 +49,19 @@ const viewStyle: ViewStyle = {
 
 const ROUTE_NAME_START_SCREEN = "StartScreen";
 
+interface StartScreenNavigationParams {
+    id: number;
+    s: string;
+}
+
 /**
  * @desc Simple screen component class with typed component props that should
  *     receive the navigation prop from the AppNavigator.
  */
-class StartScreen extends React.Component<NavigationScreenProps> {
+class StartScreen extends React.Component<NavigationScreenProps<StartScreenNavigationParams>> {
     render() {
         // Implicit type checks.
-        const navigationStateParams = this.props.navigation.state.params;
+        const navigationStateParams: StartScreenNavigationParams | void = this.props.navigation.state.params;
         const id = this.props.navigation.state.params && this.props.navigation.state.params.id;
         const s = this.props.navigation.state.params && this.props.navigation.state.params.s;
 
@@ -84,10 +90,15 @@ class StartScreen extends React.Component<NavigationScreenProps> {
 
 const ROUTE_NAME_NEXT_SCREEN = "NextScreen";
 
-class NextScreen extends React.Component<NavigationScreenProps> {
+interface NextScreenNavigationParams {
+    id: number;
+    name: string;
+}
+
+class NextScreen extends React.Component<NavigationScreenProps<NextScreenNavigationParams>> {
     render() {
         // Implicit type checks.
-        const navigationStateParams = this.props.navigation.state.params;
+        const navigationStateParams: NextScreenNavigationParams | void = this.props.navigation.state.params;
         const id = this.props.navigation.state.params && this.props.navigation.state.params.id;
         const name = this.props.navigation.state.params && this.props.navigation.state.params.name;
 
@@ -100,7 +111,7 @@ class NextScreen extends React.Component<NavigationScreenProps> {
 const navigationOptions = {
     headerBackTitle: null,
 };
-const initialRouteParams: NavigationParams = {
+const initialRouteParams: StartScreenNavigationParams = {
     id: 1,
     s: "Start",
 };
@@ -123,6 +134,16 @@ export const AppNavigator = StackNavigator(
     },
 );
 
+const StatelessScreen: NavigationScreenComponent<{}, {}> = () => <View />;
+
+const SimpleStackNavigator = StackNavigator(
+    {
+        simple: {
+            screen: StatelessScreen,
+        },
+    }
+)
+
 /**
  * Router.
  */

From 8731027ec5db8ba1465e0b82492ee55ed63beaa5 Mon Sep 17 00:00:00 2001
From: Tim Wang <tim@thenetcircle.com>
Date: Fri, 23 Mar 2018 13:29:00 +0800
Subject: [PATCH 0768/1382] Fix CI

---
 types/react-navigation/index.d.ts                 | 1 -
 types/react-navigation/react-navigation-tests.tsx | 8 ++++----
 types/react-navigation/tslint.json                | 7 ++++++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index 47304a1856..3c6bffe130 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -183,7 +183,6 @@ export type NavigationScreenComponent<
 > = React.ComponentType<NavigationNavigatorProps<Options, NavigationState> & Props> &
 ({} | { navigationOptions: NavigationScreenConfig<Options> });
 
-
 export type NavigationNavigator<
     State = NavigationState,
     Options = {},
diff --git a/types/react-navigation/react-navigation-tests.tsx b/types/react-navigation/react-navigation-tests.tsx
index 4c8ff5dd99..5c03253d35 100644
--- a/types/react-navigation/react-navigation-tests.tsx
+++ b/types/react-navigation/react-navigation-tests.tsx
@@ -61,7 +61,7 @@ interface StartScreenNavigationParams {
 class StartScreen extends React.Component<NavigationScreenProps<StartScreenNavigationParams>> {
     render() {
         // Implicit type checks.
-        const navigationStateParams: StartScreenNavigationParams | void = this.props.navigation.state.params;
+        const navigationStateParams: StartScreenNavigationParams | undefined = this.props.navigation.state.params;
         const id = this.props.navigation.state.params && this.props.navigation.state.params.id;
         const s = this.props.navigation.state.params && this.props.navigation.state.params.s;
 
@@ -98,7 +98,7 @@ interface NextScreenNavigationParams {
 class NextScreen extends React.Component<NavigationScreenProps<NextScreenNavigationParams>> {
     render() {
         // Implicit type checks.
-        const navigationStateParams: NextScreenNavigationParams | void = this.props.navigation.state.params;
+        const navigationStateParams: NextScreenNavigationParams | undefined = this.props.navigation.state.params;
         const id = this.props.navigation.state.params && this.props.navigation.state.params.id;
         const name = this.props.navigation.state.params && this.props.navigation.state.params.name;
 
@@ -134,7 +134,7 @@ export const AppNavigator = StackNavigator(
     },
 );
 
-const StatelessScreen: NavigationScreenComponent<{}, {}> = () => <View />;
+const StatelessScreen: NavigationScreenComponent = () => <View />;
 
 const SimpleStackNavigator = StackNavigator(
     {
@@ -142,7 +142,7 @@ const SimpleStackNavigator = StackNavigator(
             screen: StatelessScreen,
         },
     }
-)
+);
 
 /**
  * Router.
diff --git a/types/react-navigation/tslint.json b/types/react-navigation/tslint.json
index 3db14f85ea..d9d49e375e 100644
--- a/types/react-navigation/tslint.json
+++ b/types/react-navigation/tslint.json
@@ -1 +1,6 @@
-{ "extends": "dtslint/dt.json" }
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-any-union": false
+    }
+}

From c7b050517023ebae62e0068c08609ba212679f43 Mon Sep 17 00:00:00 2001
From: Jiaren Liu <jrliu@alauda.io>
Date: Fri, 23 Mar 2018 13:48:42 +0800
Subject: [PATCH 0769/1382] add definition for mini-css-extract-plugin

---
 types/mini-css-extract-plugin/index.d.ts      | 32 ++++++++++
 .../mini-css-extract-plugin-tests.ts          | 58 +++++++++++++++++++
 types/mini-css-extract-plugin/tsconfig.json   | 23 ++++++++
 types/mini-css-extract-plugin/tslint.json     |  1 +
 4 files changed, 114 insertions(+)
 create mode 100644 types/mini-css-extract-plugin/index.d.ts
 create mode 100644 types/mini-css-extract-plugin/mini-css-extract-plugin-tests.ts
 create mode 100644 types/mini-css-extract-plugin/tsconfig.json
 create mode 100644 types/mini-css-extract-plugin/tslint.json

diff --git a/types/mini-css-extract-plugin/index.d.ts b/types/mini-css-extract-plugin/index.d.ts
new file mode 100644
index 0000000000..f9b57632ef
--- /dev/null
+++ b/types/mini-css-extract-plugin/index.d.ts
@@ -0,0 +1,32 @@
+// Type definitions for mini-css-extract-plugin 0.2
+// Project: https://github.com/webpack-contrib/mini-css-extract-plugin
+// Definitions by: JounQin <https://github.com/JounQin>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { Loader, Plugin } from 'webpack';
+
+/**
+ * Lightweight CSS extraction webpack plugin
+ * This plugin extract CSS into separate files. It creates a CSS file per JS file which contains CSS. It supports On-Demand-Loading of CSS and SourceMaps.
+ * Configuration Detail: https://github.com/webpack-contrib/mini-css-extract-plugin#configuration
+ */
+declare class MiniCssExtractPlugin extends Plugin {
+    /** webpack loader used always at the end of loaders list */
+    static loader: Loader;
+
+    constructor(options?: MiniCssExtractPlugin.PluginOptions);
+}
+
+declare namespace MiniCssExtractPlugin {
+    interface PluginOptions {
+        /**
+         * Options similar to the same options in webpackOptions.output, both options are optional
+         * May contain `[name]`, `[id]`, `hash` and `[chunkhash]`
+         */
+        filename?: string;
+        chunkFilename?: string;
+    }
+}
+
+export = MiniCssExtractPlugin;
diff --git a/types/mini-css-extract-plugin/mini-css-extract-plugin-tests.ts b/types/mini-css-extract-plugin/mini-css-extract-plugin-tests.ts
new file mode 100644
index 0000000000..9d418ed211
--- /dev/null
+++ b/types/mini-css-extract-plugin/mini-css-extract-plugin-tests.ts
@@ -0,0 +1,58 @@
+import webpack = require('webpack');
+import MiniCssExtractPlugin = require('mini-css-extract-plugin');
+
+let configuration: webpack.Configuration;
+
+configuration = {
+    // The standard entry point and output config
+    entry: {
+        posts: './posts',
+        post: './post',
+        about: './about',
+    },
+    output: {
+        filename: '[name].js',
+        chunkFilename: '[id].js',
+    },
+    module: {
+        rules: [
+            // Extract css files
+            {
+                test: /\.css$/,
+                use: [MiniCssExtractPlugin.loader, 'css-loader'],
+            },
+            // Optionally extract less files
+            // or any other compile-to-css language
+            {
+                test: /\.less$/,
+                use: [
+                    MiniCssExtractPlugin.loader,
+                    'css-loader',
+                    'style-loader',
+                ],
+            },
+            // You could also use other loaders the same way. I. e. the autoprefixer-loader
+        ],
+    },
+    // Use the plugin to specify the resulting filename (and add needed behavior to the compiler)
+    plugins: [
+        new MiniCssExtractPlugin({
+            filename: '[name].css',
+        }),
+    ],
+};
+
+configuration = {
+    // ...
+    plugins: [new MiniCssExtractPlugin()],
+};
+
+configuration = {
+    // ...
+    plugins: [
+        new MiniCssExtractPlugin({
+            filename: 'styles.css',
+            chunkFilename: 'style.css',
+        }),
+    ],
+};
diff --git a/types/mini-css-extract-plugin/tsconfig.json b/types/mini-css-extract-plugin/tsconfig.json
new file mode 100644
index 0000000000..e79daeceef
--- /dev/null
+++ b/types/mini-css-extract-plugin/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "mini-css-extract-plugin-tests.ts"
+    ]
+}
diff --git a/types/mini-css-extract-plugin/tslint.json b/types/mini-css-extract-plugin/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/mini-css-extract-plugin/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 8d4ee5cd512c407721d8e33d507f1312a6e6f512 Mon Sep 17 00:00:00 2001
From: Jovica Zoric <zoricjovica@gmail.com>
Date: Fri, 23 Mar 2018 10:09:33 +0100
Subject: [PATCH 0770/1382] fix(react-sortable-tree): Fix
 PreviousAnNextLocation type

* Rename nextParent to nextParentNode
* Remove prevParent because it doesn't exist
---
 types/react-sortable-tree/index.d.ts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/types/react-sortable-tree/index.d.ts b/types/react-sortable-tree/index.d.ts
index 441e0bb61b..345bd3c601 100644
--- a/types/react-sortable-tree/index.d.ts
+++ b/types/react-sortable-tree/index.d.ts
@@ -52,12 +52,11 @@ export interface OnVisibilityToggleData extends FullTree, TreeNode {
     expanded: boolean;
 }
 export interface PreviousAnNextLocation {
-    prevPath: number[];
-    prevParent: TreeItem;
     prevTreeIndex: number;
-    nextPath: number[];
-    nextParent: TreeItem;
+    prevPath: number[];
     nextTreeIndex: number;
+    nextPath: number[];
+    nextParentNode: TreeItem;
 }
 
 export type NodeRenderer = React.ComponentClass<NodeRendererProps>;

From f3b3166bb0713c90d2c37298f056b56863c3ab39 Mon Sep 17 00:00:00 2001
From: hisorange <hello@hisorange.me>
Date: Fri, 23 Mar 2018 10:16:38 +0100
Subject: [PATCH 0771/1382] Add missing 'bclient' type

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

diff --git a/types/bull/index.d.ts b/types/bull/index.d.ts
index 97cb7a23df..296009c4bd 100644
--- a/types/bull/index.d.ts
+++ b/types/bull/index.d.ts
@@ -41,7 +41,7 @@ declare namespace Bull {
      * When specified, the `Queue` will use this function to create new `ioredis` client connections.
      * This is useful if you want to re-use connections.
      */
-    createClient?(type: 'client' | 'subscriber', redisOpts?: Redis.RedisOptions): Redis.Redis;
+    createClient?(type: 'client' | 'subscriber' | 'bclient', redisOpts?: Redis.RedisOptions): Redis.Redis;
 
     /**
      * Prefix to use for all redis keys

From 93a7241b1e82e749fcceac58e2abe8e05760f178 Mon Sep 17 00:00:00 2001
From: Justin Chew <jchew@neworbit.co.uk>
Date: Fri, 23 Mar 2018 13:04:32 +0000
Subject: [PATCH 0772/1382] Correct casing for modernizr

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

diff --git a/types/modernizr/index.d.ts b/types/modernizr/index.d.ts
index ff88e9f523..a9cfb92f54 100644
--- a/types/modernizr/index.d.ts
+++ b/types/modernizr/index.d.ts
@@ -448,6 +448,6 @@ interface ModernizrAPI {
 interface ModernizrStatic extends ModernizrAPI, FeatureDetects { }
 
 declare var Modernizr: ModernizrStatic;
-declare module "Modernizr" {
+declare module "modernizr" {
     export = Modernizr;
 }

From 54b3965d34e7bdfb63b130fe1fe20bf26837b5bb Mon Sep 17 00:00:00 2001
From: Albert Yu <dev.yufan@gmail.com>
Date: Fri, 23 Mar 2018 21:20:46 +0800
Subject: [PATCH 0773/1382] [@types/ember-qunit] add missing definition for
 `setupApplicationTest`

---
 types/ember-qunit/index.d.ts | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/types/ember-qunit/index.d.ts b/types/ember-qunit/index.d.ts
index a669b977e1..ea129ec3ec 100644
--- a/types/ember-qunit/index.d.ts
+++ b/types/ember-qunit/index.d.ts
@@ -44,6 +44,20 @@ declare module 'ember-qunit' {
      */
     export function setResolver(resolver: Ember.Resolver): void;
 
+    /**
+     * Sets up acceptance tests.
+     *
+     * The `setupApplicationTest` function is used for all acceptance tests. It
+     * is invoked in the callback scope of a QUnit module (aka "nested module").
+     *
+     * Once invoked, all subsequent hooks.beforeEach and test invocations will
+     * have access to the following:
+     * * `this.owner` - the owner object that been set on the test context.
+     * * `this.pauseTest` and `this.resumeTest` - allow easy pausing/resuming of tests.
+     * * `this.element` which returns the DOM element representing the application's root element.
+     */
+    export function setupApplicationTest(hooks: NestedHooks): void;
+
     /**
      * Sets up tests that need to render snippets of templates.
      *
@@ -80,7 +94,7 @@ declare module 'ember-qunit' {
      */
     export function setupTest(hooks: NestedHooks): void;
 
-    export class QUnitAdapter extends Ember.Test.Adapter {}
+    export class QUnitAdapter extends Ember.Test.Adapter { }
 
     export { module, test, skip, only, todo } from 'qunit';
 }

From 9526aa700f36ebea5c10c592e16506ff72b63061 Mon Sep 17 00:00:00 2001
From: Albert Yu <dev.yufan@gmail.com>
Date: Fri, 23 Mar 2018 21:21:37 +0800
Subject: [PATCH 0774/1382] [@types/ember-qunit] improve `skip` definition to
 align with others

---
 types/ember-qunit/index.d.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/types/ember-qunit/index.d.ts b/types/ember-qunit/index.d.ts
index ea129ec3ec..ad12f43ffc 100644
--- a/types/ember-qunit/index.d.ts
+++ b/types/ember-qunit/index.d.ts
@@ -161,9 +161,10 @@ declare module 'qunit' {
      * ignoring the callback argument and the respective global and module's
      * hooks.
      *
-     * @param Title of unit being tested
+     * @param name Title of unit being tested
+     * @param callback Function to close over assertions
      */
-    export const skip: typeof QUnit.skip;
+    export function skip(name: string, callback: (this: TestContext, assert: Assert) => void): void;
 
     export default QUnit;
 }

From 64dde8ee374ac9fbc642b5a7319dea63dcd49661 Mon Sep 17 00:00:00 2001
From: Edward Sammut Alessi <edward.sammut.alessi@preeostudios.com>
Date: Fri, 23 Mar 2018 14:25:10 +0100
Subject: [PATCH 0775/1382] Update name of creator

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

diff --git a/types/steamid/index.d.ts b/types/steamid/index.d.ts
index 37967db201..e8b754ad57 100644
--- a/types/steamid/index.d.ts
+++ b/types/steamid/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for steamid 1.1
 // Project: https://github.com/DoctorMcKay/node-steamid
-// Definitions by: My Self <https://github.com/me>
+// Definitions by: Edward Sammut Alessi <https://github.com/Slessi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 

From 371c3bad16e85ae06a2b8bd5b0ec240d02f1119f Mon Sep 17 00:00:00 2001
From: Lenny <lenny.cunningham@gmail.com>
Date: Fri, 23 Mar 2018 08:39:11 -0500
Subject: [PATCH 0776/1382] @types\mapbox-gl Change RasterSource URL to
 optional.

---
 types/mapbox-gl/index.d.ts         |  2 +-
 types/mapbox-gl/mapbox-gl-tests.ts | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/types/mapbox-gl/index.d.ts b/types/mapbox-gl/index.d.ts
index a51172daec..24dca985e4 100644
--- a/types/mapbox-gl/index.d.ts
+++ b/types/mapbox-gl/index.d.ts
@@ -610,7 +610,7 @@ declare namespace mapboxgl {
 
     interface RasterSource extends Source {
         type: 'raster';
-        url: string;
+        url?: string;
         tiles?: string[];
         minzoom?: number;
         maxzoom?: number;
diff --git a/types/mapbox-gl/mapbox-gl-tests.ts b/types/mapbox-gl/mapbox-gl-tests.ts
index 422cb3913d..ce10a26564 100644
--- a/types/mapbox-gl/mapbox-gl-tests.ts
+++ b/types/mapbox-gl/mapbox-gl-tests.ts
@@ -205,6 +205,22 @@ var videoSourceObj = new mapboxgl.VideoSource({
 map.addSource('some id', videoSourceObj); // add
 map.removeSource('some id');  // remove
 
+/**
+ * Add Raster Source /// made URL optional to allow only tiles.
+ */
+map.addSource('radar', {
+	type: 'raster',
+	tiles: ['https://nowcoast.noaa.gov/arcgis/services/nowcoast/radar_meteo_imagery_nexrad_time/MapServer/WmsServer?bbox={bbox-epsg-3857}&service=WMS&request=GetMap&version=1.3.0&layers=1&styles=&format=image/png&transparent=true&height=256&width=256&crs=EPSG:3857'],
+	tileSize: 256
+})
+
+map.addLayer({
+	id: 'radar',
+	type: 'raster',
+	source: 'radar',
+	paint: {}
+})
+
 /**
  * Popup
  */

From e4edb35bf5f59e24129021c27ea6a2347e582ef8 Mon Sep 17 00:00:00 2001
From: Albert Yu <dev.yufan@gmail.com>
Date: Fri, 23 Mar 2018 21:39:33 +0800
Subject: [PATCH 0777/1382] fix: let callback be optional to pass the test case

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

diff --git a/types/ember-qunit/index.d.ts b/types/ember-qunit/index.d.ts
index ad12f43ffc..9dc93b980b 100644
--- a/types/ember-qunit/index.d.ts
+++ b/types/ember-qunit/index.d.ts
@@ -164,7 +164,7 @@ declare module 'qunit' {
      * @param name Title of unit being tested
      * @param callback Function to close over assertions
      */
-    export function skip(name: string, callback: (this: TestContext, assert: Assert) => void): void;
+    export function skip(name: string, callback?: (this: TestContext, assert: Assert) => void): void;
 
     export default QUnit;
 }

From f2b858e68f4c06db40dad388805b14ddac829963 Mon Sep 17 00:00:00 2001
From: doomsower <K.Kuznetcov@gmail.com>
Date: Fri, 23 Mar 2018 16:49:30 +0300
Subject: [PATCH 0778/1382] Some changes to react-navigation

---
 types/react-navigation/index.d.ts             | 31 ++++++++---
 .../react-navigation-tests.tsx                | 52 ++++++++++++++++++-
 2 files changed, 73 insertions(+), 10 deletions(-)

diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index 0e6bb2d94c..379a24d4ba 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -77,7 +77,7 @@ export interface NavigationState {
 
 export type NavigationRoute = NavigationLeafRoute | NavigationStateRoute;
 
-export interface NavigationLeafRoute {
+export interface NavigationLeafRoute<P extends NavigationParams = NavigationParams> {
   /**
    * React's key used by some navigators. No need to specify these manually,
    * they will be defined by the router.
@@ -96,7 +96,7 @@ export interface NavigationLeafRoute {
    * Params passed to this route when navigating to it,
    * e.g. `{ car_id: 123 }` in a route that displays a car.
    */
-  params?: NavigationParams;
+  params?: P;
 }
 
 export type NavigationStateRoute = NavigationLeafRoute & NavigationState;
@@ -175,6 +175,7 @@ export type NavigationScreenConfig<Options> =
 
 export type NavigationComponent =
   NavigationScreenComponent<any, any>
+  | NavigationStatelessScreen
   | NavigationNavigator<any, any, any, any>;
 
 export interface NavigationScreenComponent<T, Options> extends React.ComponentClass<T> {
@@ -299,7 +300,7 @@ export interface NavigationStackRouterConfig {
   initialRouteName?: string;
   initialRouteParams?: NavigationParams;
   paths?: NavigationPathsConfig;
-  navigationOptions?: NavigationScreenConfig<NavigationStackScreenOptions>;
+  navigationOptions?: NavigationScreenConfig<AnyScreenOptions>;
 }
 
 export type NavigationStackAction =
@@ -339,7 +340,7 @@ export interface NavigationPathsConfig {
 export interface NavigationTabRouterConfig {
   initialRouteName?: string;
   paths?: NavigationPathsConfig;
-  navigationOptions?: NavigationScreenConfig<NavigationTabScreenOptions>;
+  navigationOptions?: NavigationScreenConfig<AnyScreenOptions>;
   order?: string[]; // todo: type these as the real route names rather than 'string'
 
   // Does the back button cause the router to switch to the initial tab
@@ -433,7 +434,8 @@ export interface NavigationScreenProp<S, P = NavigationParams> {
     params?: P,
     action?: NavigationAction,
   ): boolean;
-  setParams: (newParams: NavigationParams) => boolean;
+  getParam: <T extends keyof P>(param: T, fallback?: P[T]) => P[T];
+  setParams: (newParams: P) => boolean;
   addListener: (
     eventName: string,
     callback: NavigationEventCallback
@@ -853,12 +855,25 @@ export function createNavigationContainer(
  * BEGIN CUSTOM CONVENIENCE INTERFACES
  */
 
-export interface NavigationScreenProps {
-  navigation: NavigationScreenProp<NavigationRoute>;
+export interface NavigationScreenProps<P extends NavigationParams = NavigationParams> {
+  navigation: NavigationScreenProp<NavigationRoute, P>;
   screenProps?: { [key: string]: any };
-  navigationOptions?: NavigationScreenConfig<any>;
+  navigationOptions?: NavigationScreenConfig<AnyScreenOptions>;
 }
 
+export type AnyScreenOptions =
+  NavigationDrawerScreenOptions &
+  NavigationStackScreenOptions &
+  NavigationTabScreenOptions;
+
+export interface NavigationScreenStatic<Options = AnyScreenOptions> {
+  navigationOptions?: NavigationScreenConfig<Options>;
+}
+
+export type NavigationStatelessScreen<Props = {}, Params = {}, NavOptions = AnyScreenOptions> =
+  React.StatelessComponent<Props & NavigationScreenProps<Params>> &
+  NavigationScreenStatic<NavOptions>;
+
 /**
  * END CUSTOM CONVENIENCE INTERFACES
  */
diff --git a/types/react-navigation/react-navigation-tests.tsx b/types/react-navigation/react-navigation-tests.tsx
index d0e65dfc8e..496009688e 100644
--- a/types/react-navigation/react-navigation-tests.tsx
+++ b/types/react-navigation/react-navigation-tests.tsx
@@ -36,6 +36,10 @@ import {
     NavigationParams,
     NavigationPopAction,
     NavigationPopToTopAction,
+    NavigationScreenStatic,
+    NavigationScreenConfig,
+    AnyScreenOptions,
+    NavigationStatelessScreen,
 } from 'react-navigation';
 
 // Constants
@@ -84,12 +88,24 @@ class StartScreen extends React.Component<NavigationScreenProps> {
 
 const ROUTE_NAME_NEXT_SCREEN = "NextScreen";
 
-class NextScreen extends React.Component<NavigationScreenProps> {
+interface NextScreenParams {
+    id: string;
+    name: string;
+}
+
+class NextScreen extends React.Component<NavigationScreenProps<NextScreenParams>> {
+    static navigationOptions: NavigationScreenConfig<AnyScreenOptions>  = {
+        tabBarLabel: 'Next tab',
+        drawerLabel: 'Next drawe label',
+    };
+
     render() {
         // Implicit type checks.
         const navigationStateParams = this.props.navigation.state.params;
+        // typeof id is any
         const id = this.props.navigation.state.params && this.props.navigation.state.params.id;
-        const name = this.props.navigation.state.params && this.props.navigation.state.params.name;
+        // typeof name is string
+        const name = this.props.navigation.getParam('name', 'Peter');
 
         return (
             <View />
@@ -97,6 +113,29 @@ class NextScreen extends React.Component<NavigationScreenProps> {
     }
 }
 
+const ROUTE_NAME_ANOTHER_SCREEN = "AnotherScreen";
+
+interface AnotherScreenParams {
+    color: string;
+}
+
+interface AnotherScreenProps {
+    apolloData: number[]; // Demonstrates that screen can be wrapped into HOCs
+}
+
+// View below compiles without TS errors, because props and navigation params are strongly typed
+const AnotherScreen: NavigationStatelessScreen<AnotherScreenProps, AnotherScreenParams> = ({ apolloData, navigation }) => (
+    <View
+        style={{ backgroundColor: navigation.getParam('color', 'red')}}
+        hitSlop={{ left: apolloData[0], right: apolloData[1] }}
+    />
+)
+
+// Demonstrates overriding navigationOptions on static components
+AnotherScreen.navigationOptions = ({ navigation, navigationOptions }) => ({
+    drawerLabel: navigation.state.params!.color + ' screen',
+});
+
 const navigationOptions = {
     headerBackTitle: null,
 };
@@ -113,6 +152,15 @@ const routeConfigMap: NavigationRouteConfigMap = {
         path: "next",
         screen: NextScreen,
     },
+    // Demonstrates stateless screen
+    [ROUTE_NAME_ANOTHER_SCREEN]: {
+        path: "another",
+        screen: AnotherScreen,
+        navigationOptions: {
+            // Demonstrates that stack entries can set optins for tab navigation (for deeper use)
+            tabBarVisible: false,
+        }
+    },
 };
 export const AppNavigator = StackNavigator(
     routeConfigMap,

From ec2685287a29cdbcd146db59b460391d49487596 Mon Sep 17 00:00:00 2001
From: Justin Chew <jchew@neworbit.co.uk>
Date: Fri, 23 Mar 2018 14:14:15 +0000
Subject: [PATCH 0779/1382] Remove module declaration

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

diff --git a/types/modernizr/index.d.ts b/types/modernizr/index.d.ts
index a9cfb92f54..ca5e6753f9 100644
--- a/types/modernizr/index.d.ts
+++ b/types/modernizr/index.d.ts
@@ -448,6 +448,4 @@ interface ModernizrAPI {
 interface ModernizrStatic extends ModernizrAPI, FeatureDetects { }
 
 declare var Modernizr: ModernizrStatic;
-declare module "modernizr" {
-    export = Modernizr;
-}
+export = Modernizr;

From 4b7cd30a28e597d5f839afd3cb1a7e92a7617b00 Mon Sep 17 00:00:00 2001
From: Clement Allen <clement.a.allen@accenture.com>
Date: Fri, 23 Mar 2018 14:27:09 +0000
Subject: [PATCH 0780/1382] [sumo-logger] - Added methods and config options
 from new version

---
 types/sumo-logger/index.d.ts           | 23 ++++++++++++++++++++++-
 types/sumo-logger/sumo-logger-tests.ts |  7 ++++---
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/types/sumo-logger/index.d.ts b/types/sumo-logger/index.d.ts
index bc89e0eaa8..8e3cd3a27e 100644
--- a/types/sumo-logger/index.d.ts
+++ b/types/sumo-logger/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for js-logging-sdk 1.0
+// Type definitions for js-logging-sdk 1.3
 // Project: https://github.com/SumoLogic/js-logging-sdk
 // Definitions by: forabi <https://github.com/forabi>
+//                 clementallen <https://github.com/clementallen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -67,6 +68,11 @@ declare namespace SumoLogger {
          * This value sets the Source Name for the logged message.
          */
         sourceName?: string;
+
+        /**
+         * This value enabled and disables sending data as graphite metrics
+         */
+        graphite?: boolean;
     }
 
     interface PerMessageOptions {
@@ -124,6 +130,21 @@ declare class SumoLogger {
      * messages are sent to Sumo Logic.
      */
     flushLogs(): void;
+
+    /**
+     * Stop sending batched logs
+     */
+    stopLogSending(): void;
+
+    /**
+     * Start sending batched logs at the preconfigured interval
+     */
+    startLogSending(): void;
+
+    /**
+     * Empty the current queue of logs
+     */
+    emptyLogQueue(): void;
 }
 
 export = SumoLogger;
diff --git a/types/sumo-logger/sumo-logger-tests.ts b/types/sumo-logger/sumo-logger-tests.ts
index 2a0066a4e4..dab4945906 100644
--- a/types/sumo-logger/sumo-logger-tests.ts
+++ b/types/sumo-logger/sumo-logger-tests.ts
@@ -6,14 +6,15 @@ const onSuccessSpy = expect.createSpy();
 
 const logger = new SumoLogger({
     endpoint: 'http://example.com/',
-    onSuccess() {
-        console.log('success');
-    },
+    onSuccess: onSuccessSpy,
     onError: onErrorSpy,
 });
 
 expect(logger.flushLogs).toExist();
 expect(logger.log).toExist();
+expect(logger.emptyLogQueue).toExist();
+expect(logger.startLogSending).toExist();
+expect(logger.stopLogSending).toExist();
 
 logger.log('message');
 logger.log({ json: 'object' });

From 3da30314df2e65115588a10ea76b2c5726b1787a Mon Sep 17 00:00:00 2001
From: Menushka Weeratunga <tmweeratunga@gmail.com>
Date: Fri, 23 Mar 2018 10:27:10 -0400
Subject: [PATCH 0781/1382] Added types for FBInstant

---
 types/fbinstant/fbinstant-tests.ts |  60 ++++++++
 types/fbinstant/index.d.ts         | 221 +++++++++++++++++++++++++++++
 types/fbinstant/tsconfig.json      |  23 +++
 types/fbinstant/tslint.json        |   8 ++
 4 files changed, 312 insertions(+)
 create mode 100644 types/fbinstant/fbinstant-tests.ts
 create mode 100644 types/fbinstant/index.d.ts
 create mode 100644 types/fbinstant/tsconfig.json
 create mode 100644 types/fbinstant/tslint.json

diff --git a/types/fbinstant/fbinstant-tests.ts b/types/fbinstant/fbinstant-tests.ts
new file mode 100644
index 0000000000..f4a72ea70e
--- /dev/null
+++ b/types/fbinstant/fbinstant-tests.ts
@@ -0,0 +1,60 @@
+declare const FBInstant: FBInstant;
+
+export class FBInstantTest {
+    winStreak: number;
+
+    init() {
+        FBInstant.initializeAsync().then(() => {
+            FBInstant.setLoadingProgress(100);
+            FBInstant.startGameAsync().then(() => {
+                this.startGame();
+            });
+        });
+    }
+
+    startGame() {
+        const contextId = FBInstant.context.getID();
+        const contextType = FBInstant.context.getType();
+
+        const playerName = FBInstant.player.getName();
+        const playerPic = FBInstant.player.getPhoto();
+        const playerId = FBInstant.player.getID();
+    }
+
+    saveState() {
+        FBInstant.player.setDataAsync({
+            score: this.winStreak
+        });
+    }
+
+    getState() {
+        FBInstant.player.getDataAsync(['score'])
+            .then((data) => {
+                if (typeof data['score'] !== 'undefined') {
+                    this.winStreak = +data['score'];
+                }
+            });
+    }
+
+    update() {
+        FBInstant.updateAsync({
+            action: 'CUSTOM',
+            cta: 'Play',
+            image: '',
+            text: {
+                default: 'Edgar played their move',
+                localizations: {
+                    en_US: 'Edgar played their move',
+                    es_LA: '\u00A1Edgar jug\u00F3 su jugada!'
+                }
+            },
+            template: 'play_turn',
+            data: { myReplayData: '...' },
+            strategy: 'IMMEDIATE',
+            notification: 'NO_PUSH'
+        }).then(() => {
+            // closes the game after the update is posted.
+            FBInstant.quit();
+        });
+    }
+}
diff --git a/types/fbinstant/index.d.ts b/types/fbinstant/index.d.ts
new file mode 100644
index 0000000000..c2237c749c
--- /dev/null
+++ b/types/fbinstant/index.d.ts
@@ -0,0 +1,221 @@
+// Type definitions for FBInstant 6.1
+// Project: https://developers.facebook.com/docs/games/instant-games
+// Definitions by: Menushka Weeratunga <https://github.com/menushka>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare class FBInstant {
+    player: Player;
+    context: Context;
+    payments: Payments;
+
+    getLocale(): string;
+    getPlatform(): string;
+    getSDKVersion(): string;
+    initializeAsync(): Promise<any>;
+    setLoadingProgress(progress: number): void;
+    getSupportedAPIs(): string[];
+    getEntryPointData(): any;
+    getEntryPointAsync(): Promise<string>;
+    setSessionData(sessionData: any): void;
+    startGameAsync(): Promise<any>;
+    shareAsync(payload: SharePayload): Promise<void>;
+    updateAsync(payload: UpdatePayload): Promise<void>;
+    switchGameAsync(appID: string, data: string): Promise<void>;
+    canCreateShortcutAsync(): Promise<boolean>;
+    createShortcutAsync(): Promise<void>;
+    quit(): void;
+    logEvent(eventName: string, valueToSum?: number, parameter?: any): APIError;
+    onPause(func: () => void): void;
+    getInterstitialAdAsync(placementID: string): Promise<AdInstance>;
+    getRewardedVideoAsync(placementID: string): Promise<AdInstance>;
+    matchPlayerAsync(matchTag: string, switchContextWhenMatched?: boolean): Promise<void>;
+    checkCanPlayerMatchAsync(): Promise<boolean>;
+    getLeaderboardAsync(name: string): Promise<Leaderboard>;
+}
+
+declare class Player {
+    getID(): string;
+    getSignedPlayerInfoAsync(requestPayload: string): Promise<SignedPlayerInfo>;
+    canSubscribeBotAsync(): Promise<boolean>;
+    subscribeBotAsync(): Promise<void>;
+    getName(): string;
+    getPhoto(): string;
+    getDataAsync(keys: string[]): Promise<DataObject>;
+    setDataAsync(data: DataObject): Promise<void>;
+    flushDataAsync(): Promise<void>;
+    getStatsAsync(keys: string[]): Promise<StatsObject>;
+    setStatsAsync(stats: StatsObject): Promise<void>;
+    incrementStatsAsync(increments: IncrementObject): Promise<StatsObject>;
+    getConnectedPlayersAsync(): Promise<ConnectedPlayer[]>;
+}
+
+declare class Context {
+    getID(): string;
+    getType(): Type;
+    isSizeBetween(minSize: number, maxSize: number): ContextSizeResponse;
+    switchAsync(id: string): Promise<void>;
+    chooseAsync(options: ContextOptions): Promise<void>;
+    createAsync(playerID: string): Promise<void>;
+    getPlayersAsync(): Promise<ContextPlayer[]>;
+}
+
+declare class Leaderboard {
+    getName(): string;
+    getContextID(): string;
+    getEntryCountAsync(): Promise<number>;
+    setScoreAsync(score: number, extraData: string): Promise<LeaderboardEntry>;
+    getPlayerEntryAsync(): Promise<LeaderboardEntry>;
+    getEntriesAsync(count: number, offset: number): Promise<LeaderboardEntry[]>;
+}
+
+declare class LeaderboardEntry {
+    getScore(): number;
+    getFormattedScore(): string;
+    getTimestamp(): number;
+    getRank(): number;
+    getExtraData(): string;
+    getPlayer(): LeaderboardPlayer;
+}
+
+declare class LeaderboardPlayer {
+    getName(): string;
+    getPhoto(): string;
+    getID(): string;
+}
+
+declare class ConnectedPlayer {
+    getID(): string;
+    getName(): string;
+    getPhoto(): string;
+}
+
+declare class SignedPlayerInfo {
+    getPlayerID(): string;
+    getSignature(): string;
+}
+
+declare class ContextPlayer {
+    getID(): string;
+    getName(): string;
+    getPhoto(): string;
+}
+
+declare class AdInstance {
+    getPlacementID(): string;
+    loadAsync(): Promise<void>;
+    showAsync(): Promise<void>;
+}
+
+declare class Payments {
+    purchaseAsync(purchaseConfig: PurchaseConfig): Promise<Purchase>;
+    getPurchasesAsync(): Promise<Purchase[]>;
+    consumePurchaseAsync(purchaseToken: string): Promise<void>;
+    onReady(callback: () => void): void;
+}
+
+declare interface Product {
+    title: string;
+    productID: string;
+    description?: string;
+    imageURI?: string;
+    price: string;
+    priceCurrencyCode: string;
+}
+
+declare interface ContextSizeResponse {
+    answer: boolean;
+    minSize?: number;
+    maxSize?: number;
+}
+
+declare interface Purchase {
+    developerPayload?: string;
+    paymentID: string;
+    productID: string;
+    purchaseTime: string;
+    purchaseToken: string;
+    signedRequest: SignedPurchaseRequest;
+}
+
+declare interface ContextOptions {
+    filters?: ContextFilter[];
+    maxSize?: number;
+    minSize?: number;
+}
+
+declare interface SharePayload {
+    intent?: Intent;
+    image?: string;
+    text?: string;
+    data?: any;
+}
+
+declare interface APIError {
+    code: ErrorCodeType;
+    message: string;
+}
+
+declare interface PurchaseConfig {
+    productID: string;
+    developerPayload?: string;
+}
+
+declare interface UpdatePayload {
+    action?: UpdateAction;
+    template?: string;
+    cta?: (string | LocalizableContent);
+    image?: string;
+    text?: (string | LocalizableContent);
+    data?: any;
+    strategy?: string;
+    notification?: string;
+}
+
+declare interface LeaderboardUpdatePayload {
+    action: UpdateAction;
+    name: string;
+    text?: string;
+}
+
+declare interface LocalizableContent {
+    default: string;
+    localizations: LocalizationsDict;
+}
+
+declare interface DataObject { [ key: string ]: string | number; }
+
+declare interface StatsObject { [ key: string ]: string | number; }
+
+declare interface IncrementObject { [ key: string ]: number; }
+
+declare type LocalizationsDict = any;
+
+declare type SignedPurchaseRequest = string;
+
+declare type ContextFilter = "NEW_CONTEXT_ONLY" | "INCLUDE_EXISTING_CHALLENGES" | "NEW_PLAYERS_ONLY";
+
+declare type UpdateAction = "CUSTOM" | "LEADERBOARD";
+
+declare type Platform = "IOS" | "ANDROID" | "WEB" | "MOBILE_WEB";
+
+declare type Type = "POST" | "THREAD" | "GROUP" | "SOLO";
+
+declare type Intent = "INVITE" | "REQUEST" | "CHALLENGE" | "SHARE";
+
+declare type ErrorCodeType = "ADS_FREQUENT_LOAD" |
+                             "ADS_NO_FILL" |
+                             "ADS_NOT_LOADED" |
+                             "ADS_TOO_MANY_INSTANCES" |
+                             "ANALYTICS_POST_EXCEPTION" |
+                             "CLIENT_REQUIRES_UPDATE" |
+                             "CLIENT_UNSUPPORTED_OPERATION" |
+                             "INVALID_OPERATION" |
+                             "INVALID_PARAM" |
+                             "LEADERBOARD_NOT_FOUND" |
+                             "LEADERBOARD_WRONG_CONTEXT" |
+                             "NETWORK_FAILURE" |
+                             "PENDING_REQUEST" |
+                             "RATE_LIMITED" |
+                             "SAME_CONTEXT" |
+                             "UNKNOWN" |
+                             "USER_INPUT";
diff --git a/types/fbinstant/tsconfig.json b/types/fbinstant/tsconfig.json
new file mode 100644
index 0000000000..7cb5ffc8ae
--- /dev/null
+++ b/types/fbinstant/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "fbinstant-tests.ts"
+    ]
+}
diff --git a/types/fbinstant/tslint.json b/types/fbinstant/tslint.json
new file mode 100644
index 0000000000..71918edac3
--- /dev/null
+++ b/types/fbinstant/tslint.json
@@ -0,0 +1,8 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        // Needs to be declares as it cannot be imported in typescript
+        // using the standard import statement
+        "strict-export-declare-modifiers": false
+    }
+}

From 97b9d47d3a5cc5d8a176a05705f528a73854f2c7 Mon Sep 17 00:00:00 2001
From: doomsower <K.Kuznetcov@gmail.com>
Date: Fri, 23 Mar 2018 17:46:30 +0300
Subject: [PATCH 0782/1382] fix linter

---
 types/react-navigation/react-navigation-tests.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/react-navigation/react-navigation-tests.tsx b/types/react-navigation/react-navigation-tests.tsx
index 496009688e..5ffabdef46 100644
--- a/types/react-navigation/react-navigation-tests.tsx
+++ b/types/react-navigation/react-navigation-tests.tsx
@@ -129,7 +129,7 @@ const AnotherScreen: NavigationStatelessScreen<AnotherScreenProps, AnotherScreen
         style={{ backgroundColor: navigation.getParam('color', 'red')}}
         hitSlop={{ left: apolloData[0], right: apolloData[1] }}
     />
-)
+);
 
 // Demonstrates overriding navigationOptions on static components
 AnotherScreen.navigationOptions = ({ navigation, navigationOptions }) => ({
@@ -159,7 +159,7 @@ const routeConfigMap: NavigationRouteConfigMap = {
         navigationOptions: {
             // Demonstrates that stack entries can set optins for tab navigation (for deeper use)
             tabBarVisible: false,
-        }
+        },
     },
 };
 export const AppNavigator = StackNavigator(

From 48662ad8dc57000bfa968fc021f54346615fb122 Mon Sep 17 00:00:00 2001
From: Justin Chew <justin.chew@outlook.com>
Date: Fri, 23 Mar 2018 14:48:12 +0000
Subject: [PATCH 0783/1382] Reverse commit

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

diff --git a/types/modernizr/index.d.ts b/types/modernizr/index.d.ts
index ca5e6753f9..71046d3840 100644
--- a/types/modernizr/index.d.ts
+++ b/types/modernizr/index.d.ts
@@ -447,5 +447,7 @@ interface ModernizrAPI {
 
 interface ModernizrStatic extends ModernizrAPI, FeatureDetects { }
 
-declare var Modernizr: ModernizrStatic;
-export = Modernizr;
+declare var Modernizr: ModernizrStatic;declare module "Modernizr" {
+declare module "Modernizr" {
+    export = Modernizr;
+}

From ff63f28d065ff53dc50e86c9191cc33222850e57 Mon Sep 17 00:00:00 2001
From: Justin Chew <jchew@neworbit.co.uk>
Date: Fri, 23 Mar 2018 14:55:47 +0000
Subject: [PATCH 0784/1382] Fix duplicate

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

diff --git a/types/modernizr/index.d.ts b/types/modernizr/index.d.ts
index 71046d3840..a9cfb92f54 100644
--- a/types/modernizr/index.d.ts
+++ b/types/modernizr/index.d.ts
@@ -447,7 +447,7 @@ interface ModernizrAPI {
 
 interface ModernizrStatic extends ModernizrAPI, FeatureDetects { }
 
-declare var Modernizr: ModernizrStatic;declare module "Modernizr" {
-declare module "Modernizr" {
+declare var Modernizr: ModernizrStatic;
+declare module "modernizr" {
     export = Modernizr;
 }

From 22d2e5efbb99c765d59d661f145209eaceb1b12e Mon Sep 17 00:00:00 2001
From: Justin Chew <jchew@neworbit.co.uk>
Date: Fri, 23 Mar 2018 14:57:11 +0000
Subject: [PATCH 0785/1382] Set declare-module tslint to true

---
 types/modernizr/tslint.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/modernizr/tslint.json b/types/modernizr/tslint.json
index 2279635eb4..bd2b0c4334 100644
--- a/types/modernizr/tslint.json
+++ b/types/modernizr/tslint.json
@@ -1,7 +1,7 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "no-single-declare-module": false,
+        "no-single-declare-module": true,
         "no-empty-interface": false
     }
 }

From a5dcf5b5994927caa3bcb1d50d8ae0c9b66c8d1d Mon Sep 17 00:00:00 2001
From: Menushka Weeratunga <tmweeratunga@gmail.com>
Date: Fri, 23 Mar 2018 10:59:29 -0400
Subject: [PATCH 0786/1382] Move into single class and namspace to avoid name
 conflicts

---
 types/fbinstant/index.d.ts | 390 +++++++++++++++++++------------------
 1 file changed, 196 insertions(+), 194 deletions(-)

diff --git a/types/fbinstant/index.d.ts b/types/fbinstant/index.d.ts
index c2237c749c..9b337bbc5e 100644
--- a/types/fbinstant/index.d.ts
+++ b/types/fbinstant/index.d.ts
@@ -4,9 +4,9 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare class FBInstant {
-    player: Player;
-    context: Context;
-    payments: Payments;
+    player: FBInstant.Player;
+    context: FBInstant.Context;
+    payments: FBInstant.Payments;
 
     getLocale(): string;
     getPlatform(): string;
@@ -18,204 +18,206 @@ declare class FBInstant {
     getEntryPointAsync(): Promise<string>;
     setSessionData(sessionData: any): void;
     startGameAsync(): Promise<any>;
-    shareAsync(payload: SharePayload): Promise<void>;
-    updateAsync(payload: UpdatePayload): Promise<void>;
+    shareAsync(payload: FBInstant.SharePayload): Promise<void>;
+    updateAsync(payload: FBInstant.UpdatePayload): Promise<void>;
     switchGameAsync(appID: string, data: string): Promise<void>;
     canCreateShortcutAsync(): Promise<boolean>;
     createShortcutAsync(): Promise<void>;
     quit(): void;
-    logEvent(eventName: string, valueToSum?: number, parameter?: any): APIError;
+    logEvent(eventName: string, valueToSum?: number, parameter?: any): FBInstant.APIError;
     onPause(func: () => void): void;
-    getInterstitialAdAsync(placementID: string): Promise<AdInstance>;
-    getRewardedVideoAsync(placementID: string): Promise<AdInstance>;
+    getInterstitialAdAsync(placementID: string): Promise<FBInstant.AdInstance>;
+    getRewardedVideoAsync(placementID: string): Promise<FBInstant.AdInstance>;
     matchPlayerAsync(matchTag: string, switchContextWhenMatched?: boolean): Promise<void>;
     checkCanPlayerMatchAsync(): Promise<boolean>;
-    getLeaderboardAsync(name: string): Promise<Leaderboard>;
+    getLeaderboardAsync(name: string): Promise<FBInstant.Leaderboard>;
 }
 
-declare class Player {
-    getID(): string;
-    getSignedPlayerInfoAsync(requestPayload: string): Promise<SignedPlayerInfo>;
-    canSubscribeBotAsync(): Promise<boolean>;
-    subscribeBotAsync(): Promise<void>;
-    getName(): string;
-    getPhoto(): string;
-    getDataAsync(keys: string[]): Promise<DataObject>;
-    setDataAsync(data: DataObject): Promise<void>;
-    flushDataAsync(): Promise<void>;
-    getStatsAsync(keys: string[]): Promise<StatsObject>;
-    setStatsAsync(stats: StatsObject): Promise<void>;
-    incrementStatsAsync(increments: IncrementObject): Promise<StatsObject>;
-    getConnectedPlayersAsync(): Promise<ConnectedPlayer[]>;
+declare namespace FBInstant {
+    class Player {
+        getID(): string;
+        getSignedPlayerInfoAsync(requestPayload: string): Promise<SignedPlayerInfo>;
+        canSubscribeBotAsync(): Promise<boolean>;
+        subscribeBotAsync(): Promise<void>;
+        getName(): string;
+        getPhoto(): string;
+        getDataAsync(keys: string[]): Promise<DataObject>;
+        setDataAsync(data: DataObject): Promise<void>;
+        flushDataAsync(): Promise<void>;
+        getStatsAsync(keys: string[]): Promise<StatsObject>;
+        setStatsAsync(stats: StatsObject): Promise<void>;
+        incrementStatsAsync(increments: IncrementObject): Promise<StatsObject>;
+        getConnectedPlayersAsync(): Promise<ConnectedPlayer[]>;
+    }
+
+    class Context {
+        getID(): string;
+        getType(): Type;
+        isSizeBetween(minSize: number, maxSize: number): ContextSizeResponse;
+        switchAsync(id: string): Promise<void>;
+        chooseAsync(options: ContextOptions): Promise<void>;
+        createAsync(playerID: string): Promise<void>;
+        getPlayersAsync(): Promise<ContextPlayer[]>;
+    }
+
+    class Leaderboard {
+        getName(): string;
+        getContextID(): string;
+        getEntryCountAsync(): Promise<number>;
+        setScoreAsync(score: number, extraData: string): Promise<LeaderboardEntry>;
+        getPlayerEntryAsync(): Promise<LeaderboardEntry>;
+        getEntriesAsync(count: number, offset: number): Promise<LeaderboardEntry[]>;
+    }
+
+    class LeaderboardEntry {
+        getScore(): number;
+        getFormattedScore(): string;
+        getTimestamp(): number;
+        getRank(): number;
+        getExtraData(): string;
+        getPlayer(): LeaderboardPlayer;
+    }
+
+    class LeaderboardPlayer {
+        getName(): string;
+        getPhoto(): string;
+        getID(): string;
+    }
+
+    class ConnectedPlayer {
+        getID(): string;
+        getName(): string;
+        getPhoto(): string;
+    }
+
+    class SignedPlayerInfo {
+        getPlayerID(): string;
+        getSignature(): string;
+    }
+
+    class ContextPlayer {
+        getID(): string;
+        getName(): string;
+        getPhoto(): string;
+    }
+
+    class AdInstance {
+        getPlacementID(): string;
+        loadAsync(): Promise<void>;
+        showAsync(): Promise<void>;
+    }
+
+    class Payments {
+        purchaseAsync(purchaseConfig: PurchaseConfig): Promise<Purchase>;
+        getPurchasesAsync(): Promise<Purchase[]>;
+        consumePurchaseAsync(purchaseToken: string): Promise<void>;
+        onReady(callback: () => void): void;
+    }
+
+    interface Product {
+        title: string;
+        productID: string;
+        description?: string;
+        imageURI?: string;
+        price: string;
+        priceCurrencyCode: string;
+    }
+
+    interface ContextSizeResponse {
+        answer: boolean;
+        minSize?: number;
+        maxSize?: number;
+    }
+
+    interface Purchase {
+        developerPayload?: string;
+        paymentID: string;
+        productID: string;
+        purchaseTime: string;
+        purchaseToken: string;
+        signedRequest: SignedPurchaseRequest;
+    }
+
+    interface ContextOptions {
+        filters?: ContextFilter[];
+        maxSize?: number;
+        minSize?: number;
+    }
+
+    interface SharePayload {
+        intent?: Intent;
+        image?: string;
+        text?: string;
+        data?: any;
+    }
+
+    interface APIError {
+        code: ErrorCodeType;
+        message: string;
+    }
+
+    interface PurchaseConfig {
+        productID: string;
+        developerPayload?: string;
+    }
+
+    interface UpdatePayload {
+        action?: UpdateAction;
+        template?: string;
+        cta?: (string | LocalizableContent);
+        image?: string;
+        text?: (string | LocalizableContent);
+        data?: any;
+        strategy?: string;
+        notification?: string;
+    }
+
+    interface LeaderboardUpdatePayload {
+        action: UpdateAction;
+        name: string;
+        text?: string;
+    }
+
+    interface LocalizableContent {
+        default: string;
+        localizations: LocalizationsDict;
+    }
+
+    interface DataObject { [ key: string ]: string | number; }
+
+    interface StatsObject { [ key: string ]: string | number; }
+
+    interface IncrementObject { [ key: string ]: number; }
+
+    type LocalizationsDict = any;
+
+    type SignedPurchaseRequest = string;
+
+    type ContextFilter = "NEW_CONTEXT_ONLY" | "INCLUDE_EXISTING_CHALLENGES" | "NEW_PLAYERS_ONLY";
+
+    type UpdateAction = "CUSTOM" | "LEADERBOARD";
+
+    type Platform = "IOS" | "ANDROID" | "WEB" | "MOBILE_WEB";
+
+    type Type = "POST" | "THREAD" | "GROUP" | "SOLO";
+
+    type Intent = "INVITE" | "REQUEST" | "CHALLENGE" | "SHARE";
+
+    type ErrorCodeType = "ADS_FREQUENT_LOAD" |
+                                 "ADS_NO_FILL" |
+                                 "ADS_NOT_LOADED" |
+                                 "ADS_TOO_MANY_INSTANCES" |
+                                 "ANALYTICS_POST_EXCEPTION" |
+                                 "CLIENT_REQUIRES_UPDATE" |
+                                 "CLIENT_UNSUPPORTED_OPERATION" |
+                                 "INVALID_OPERATION" |
+                                 "INVALID_PARAM" |
+                                 "LEADERBOARD_NOT_FOUND" |
+                                 "LEADERBOARD_WRONG_CONTEXT" |
+                                 "NETWORK_FAILURE" |
+                                 "PENDING_REQUEST" |
+                                 "RATE_LIMITED" |
+                                 "SAME_CONTEXT" |
+                                 "UNKNOWN" |
+                                 "USER_INPUT";
 }
-
-declare class Context {
-    getID(): string;
-    getType(): Type;
-    isSizeBetween(minSize: number, maxSize: number): ContextSizeResponse;
-    switchAsync(id: string): Promise<void>;
-    chooseAsync(options: ContextOptions): Promise<void>;
-    createAsync(playerID: string): Promise<void>;
-    getPlayersAsync(): Promise<ContextPlayer[]>;
-}
-
-declare class Leaderboard {
-    getName(): string;
-    getContextID(): string;
-    getEntryCountAsync(): Promise<number>;
-    setScoreAsync(score: number, extraData: string): Promise<LeaderboardEntry>;
-    getPlayerEntryAsync(): Promise<LeaderboardEntry>;
-    getEntriesAsync(count: number, offset: number): Promise<LeaderboardEntry[]>;
-}
-
-declare class LeaderboardEntry {
-    getScore(): number;
-    getFormattedScore(): string;
-    getTimestamp(): number;
-    getRank(): number;
-    getExtraData(): string;
-    getPlayer(): LeaderboardPlayer;
-}
-
-declare class LeaderboardPlayer {
-    getName(): string;
-    getPhoto(): string;
-    getID(): string;
-}
-
-declare class ConnectedPlayer {
-    getID(): string;
-    getName(): string;
-    getPhoto(): string;
-}
-
-declare class SignedPlayerInfo {
-    getPlayerID(): string;
-    getSignature(): string;
-}
-
-declare class ContextPlayer {
-    getID(): string;
-    getName(): string;
-    getPhoto(): string;
-}
-
-declare class AdInstance {
-    getPlacementID(): string;
-    loadAsync(): Promise<void>;
-    showAsync(): Promise<void>;
-}
-
-declare class Payments {
-    purchaseAsync(purchaseConfig: PurchaseConfig): Promise<Purchase>;
-    getPurchasesAsync(): Promise<Purchase[]>;
-    consumePurchaseAsync(purchaseToken: string): Promise<void>;
-    onReady(callback: () => void): void;
-}
-
-declare interface Product {
-    title: string;
-    productID: string;
-    description?: string;
-    imageURI?: string;
-    price: string;
-    priceCurrencyCode: string;
-}
-
-declare interface ContextSizeResponse {
-    answer: boolean;
-    minSize?: number;
-    maxSize?: number;
-}
-
-declare interface Purchase {
-    developerPayload?: string;
-    paymentID: string;
-    productID: string;
-    purchaseTime: string;
-    purchaseToken: string;
-    signedRequest: SignedPurchaseRequest;
-}
-
-declare interface ContextOptions {
-    filters?: ContextFilter[];
-    maxSize?: number;
-    minSize?: number;
-}
-
-declare interface SharePayload {
-    intent?: Intent;
-    image?: string;
-    text?: string;
-    data?: any;
-}
-
-declare interface APIError {
-    code: ErrorCodeType;
-    message: string;
-}
-
-declare interface PurchaseConfig {
-    productID: string;
-    developerPayload?: string;
-}
-
-declare interface UpdatePayload {
-    action?: UpdateAction;
-    template?: string;
-    cta?: (string | LocalizableContent);
-    image?: string;
-    text?: (string | LocalizableContent);
-    data?: any;
-    strategy?: string;
-    notification?: string;
-}
-
-declare interface LeaderboardUpdatePayload {
-    action: UpdateAction;
-    name: string;
-    text?: string;
-}
-
-declare interface LocalizableContent {
-    default: string;
-    localizations: LocalizationsDict;
-}
-
-declare interface DataObject { [ key: string ]: string | number; }
-
-declare interface StatsObject { [ key: string ]: string | number; }
-
-declare interface IncrementObject { [ key: string ]: number; }
-
-declare type LocalizationsDict = any;
-
-declare type SignedPurchaseRequest = string;
-
-declare type ContextFilter = "NEW_CONTEXT_ONLY" | "INCLUDE_EXISTING_CHALLENGES" | "NEW_PLAYERS_ONLY";
-
-declare type UpdateAction = "CUSTOM" | "LEADERBOARD";
-
-declare type Platform = "IOS" | "ANDROID" | "WEB" | "MOBILE_WEB";
-
-declare type Type = "POST" | "THREAD" | "GROUP" | "SOLO";
-
-declare type Intent = "INVITE" | "REQUEST" | "CHALLENGE" | "SHARE";
-
-declare type ErrorCodeType = "ADS_FREQUENT_LOAD" |
-                             "ADS_NO_FILL" |
-                             "ADS_NOT_LOADED" |
-                             "ADS_TOO_MANY_INSTANCES" |
-                             "ANALYTICS_POST_EXCEPTION" |
-                             "CLIENT_REQUIRES_UPDATE" |
-                             "CLIENT_UNSUPPORTED_OPERATION" |
-                             "INVALID_OPERATION" |
-                             "INVALID_PARAM" |
-                             "LEADERBOARD_NOT_FOUND" |
-                             "LEADERBOARD_WRONG_CONTEXT" |
-                             "NETWORK_FAILURE" |
-                             "PENDING_REQUEST" |
-                             "RATE_LIMITED" |
-                             "SAME_CONTEXT" |
-                             "UNKNOWN" |
-                             "USER_INPUT";

From 768b5c94e563c1fccaa9d8a72576e0b8f54cd320 Mon Sep 17 00:00:00 2001
From: Justin Chew <jchew@neworbit.co.uk>
Date: Fri, 23 Mar 2018 15:05:33 +0000
Subject: [PATCH 0787/1382] Fix tslint

---
 types/modernizr/tslint.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/types/modernizr/tslint.json b/types/modernizr/tslint.json
index bd2b0c4334..9edbcd99ab 100644
--- a/types/modernizr/tslint.json
+++ b/types/modernizr/tslint.json
@@ -1,7 +1,8 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "no-single-declare-module": true,
-        "no-empty-interface": false
+        "no-single-declare-module": false,
+        "no-empty-interface": false,
+        "no-declare-current-package": false
     }
 }

From 51256153206267f2a4113da390152a4c8efbc1bb Mon Sep 17 00:00:00 2001
From: Git Automerge <jcguarinpenaranda@gmail.com>
Date: Fri, 23 Mar 2018 10:18:46 -0500
Subject: [PATCH 0788/1382] added aggregate and distinct to Parse

---
 types/parse/index.d.ts     | 15 ++++++++++++++-
 types/parse/parse-tests.ts | 12 +++++++++++-
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/types/parse/index.d.ts b/types/parse/index.d.ts
index 15d653a791..9a158d9287 100644
--- a/types/parse/index.d.ts
+++ b/types/parse/index.d.ts
@@ -607,6 +607,7 @@ declare namespace Parse {
 
         static or<U extends Object>(...var_args: Query<U>[]): Query<U>;
 
+        aggregate(pipeline: Query.AggregationOptions|Query.AggregationOptions[]): Query<T>;
         addAscending(key: string): Query<T>;
         addAscending(key: string[]): Query<T>;
         addDescending(key: string): Query<T>;
@@ -623,6 +624,7 @@ declare namespace Parse {
         doesNotExist(key: string): Query<T>;
         doesNotMatchKeyInQuery<U extends Object>(key: string, queryKey: string, query: Query<U>): Query<T>;
         doesNotMatchQuery<U extends Object>(key: string, query: Query<U>): Query<T>;
+        distinct(key: string): Query<T>;
         each(callback: Function, options?: Query.EachOptions): Promise<void>;
         endsWith(key: string, suffix: string): Query<T>;
         equalTo(key: string, value: any): Query<T>;
@@ -659,6 +661,17 @@ declare namespace Parse {
         interface FindOptions extends SuccessFailureOptions, ScopeOptions { }
         interface FirstOptions extends SuccessFailureOptions, ScopeOptions { }
         interface GetOptions extends SuccessFailureOptions, ScopeOptions { }
+
+        // According to http://docs.parseplatform.org/rest/guide/#aggregate-queries
+        interface AggregationOptions {
+            group?: { objectId?: string, [key:string]: any };
+            match?: {[key: string]: any};
+            project?: {[key: string]: any};
+            limit?: number;
+            skip?: number;
+            // Sort documentation https://docs.mongodb.com/v3.2/reference/operator/aggregation/sort/#pipe._S_sort
+            sort?: {[key: string]: 1|-1};
+        }
     }
 
     /**
@@ -1151,4 +1164,4 @@ declare module "parse/node" {
 declare module "parse" {
     import * as parse from "parse/node";
     export = parse
-}
\ No newline at end of file
+}
diff --git a/types/parse/parse-tests.ts b/types/parse/parse-tests.ts
index ceb5693087..60b688ec6e 100644
--- a/types/parse/parse-tests.ts
+++ b/types/parse/parse-tests.ts
@@ -134,6 +134,16 @@ function test_query() {
     query.include("score");
     query.include(["score.team"]);
 
+    // Find objects that match the aggregation pipeline
+    query.aggregate({
+        group:{
+            objectId: '$name'
+        }
+    });
+
+    // Find objects with distinct key
+    query.distinct('name');
+
     const testQuery = Parse.Query.or(query, query);
 }
 
@@ -396,7 +406,7 @@ function test_cloud_functions() {
 
     Parse.Cloud.beforeSave('MyCustomClass', (request: Parse.Cloud.BeforeSaveRequest,
         response: Parse.Cloud.BeforeSaveResponse) => {
-            
+
             if (request.object.isNew()) {
                 if (!request.object.has('immutable')) return response.error('Field immutable is required')
             } else {

From bdc72814b1fd0c6599aa2a8c120d62e304a78348 Mon Sep 17 00:00:00 2001
From: Git Automerge <jcguarinpenaranda@gmail.com>
Date: Fri, 23 Mar 2018 10:21:07 -0500
Subject: [PATCH 0789/1382] space

---
 types/parse/parse-tests.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/types/parse/parse-tests.ts b/types/parse/parse-tests.ts
index 60b688ec6e..b72ae74d7f 100644
--- a/types/parse/parse-tests.ts
+++ b/types/parse/parse-tests.ts
@@ -406,7 +406,6 @@ function test_cloud_functions() {
 
     Parse.Cloud.beforeSave('MyCustomClass', (request: Parse.Cloud.BeforeSaveRequest,
         response: Parse.Cloud.BeforeSaveResponse) => {
-
             if (request.object.isNew()) {
                 if (!request.object.has('immutable')) return response.error('Field immutable is required')
             } else {

From c474a09bc9e6fdc0633d31c4ffe339ff393b521c Mon Sep 17 00:00:00 2001
From: Git Automerge <jcguarinpenaranda@gmail.com>
Date: Fri, 23 Mar 2018 10:21:38 -0500
Subject: [PATCH 0790/1382] back to normal

---
 types/parse/parse-tests.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/parse/parse-tests.ts b/types/parse/parse-tests.ts
index b72ae74d7f..60b688ec6e 100644
--- a/types/parse/parse-tests.ts
+++ b/types/parse/parse-tests.ts
@@ -406,6 +406,7 @@ function test_cloud_functions() {
 
     Parse.Cloud.beforeSave('MyCustomClass', (request: Parse.Cloud.BeforeSaveRequest,
         response: Parse.Cloud.BeforeSaveResponse) => {
+
             if (request.object.isNew()) {
                 if (!request.object.has('immutable')) return response.error('Field immutable is required')
             } else {

From 912bf84d30b37e0d9331968386338a7836af7e79 Mon Sep 17 00:00:00 2001
From: ozum <ozum@ozum.net>
Date: Fri, 23 Mar 2018 18:22:18 +0300
Subject: [PATCH 0791/1382] [cosmiconfig] cosmiconfig npm module added

---
 types/cosmiconfig/cosmiconfig-tests.ts | 26 +++++++++++++++++++++
 types/cosmiconfig/index.d.ts           | 31 ++++++++++++++++++++++++++
 types/cosmiconfig/tsconfig.json        | 22 ++++++++++++++++++
 types/cosmiconfig/tslint.json          |  1 +
 4 files changed, 80 insertions(+)
 create mode 100644 types/cosmiconfig/cosmiconfig-tests.ts
 create mode 100644 types/cosmiconfig/index.d.ts
 create mode 100644 types/cosmiconfig/tsconfig.json
 create mode 100644 types/cosmiconfig/tslint.json

diff --git a/types/cosmiconfig/cosmiconfig-tests.ts b/types/cosmiconfig/cosmiconfig-tests.ts
new file mode 100644
index 0000000000..5eb1045305
--- /dev/null
+++ b/types/cosmiconfig/cosmiconfig-tests.ts
@@ -0,0 +1,26 @@
+import cosmiconfig = require("cosmiconfig");
+
+const explorer = cosmiconfig("yourModuleName", {
+    packageProp: "yourModuleName",
+    rc: ".yourModuleNamerc",
+    js: "yourModuleName.config.js",
+    rcStrictJson: false,
+    rcExtensions: false,
+    stopDir: "someDir",
+    cache: true,
+    sync: false,
+    transform: ({ config, filePath }) => ({ config, filePath }),
+    format: "js"
+});
+
+Promise.all([
+    explorer.load(),
+    explorer.load("start/search/here"),
+    explorer.load(null, "load/this/file.json")
+]).then(result => result);
+
+explorer.load().then(({ config, filePath }) => ({ config, filePath }));
+
+explorer.clearFileCache();
+explorer.clearDirectoryCache();
+explorer.clearCaches();
diff --git a/types/cosmiconfig/index.d.ts b/types/cosmiconfig/index.d.ts
new file mode 100644
index 0000000000..ffbd2e4e3c
--- /dev/null
+++ b/types/cosmiconfig/index.d.ts
@@ -0,0 +1,31 @@
+type Options = {
+    packageProp?: string | false;
+    rc?: string | false;
+    js?: string | false;
+    rcStrictJson?: boolean;
+    rcExtensions?: boolean;
+    stopDir?: string;
+    cache?: boolean;
+    sync?: boolean;
+    transform?: (result: Result) => Promise<Result> | Result;
+    configPath?: string;
+    format?: "json" | "yaml" | "js";
+};
+
+type Result = {
+    config: Object;
+    filePath: string;
+};
+
+declare interface Explorer {
+    load(searchPath?: string): Promise<Result>;
+    load(searchPath?: null | undefined, configPath?: string): Promise<Result>;
+
+    clearFileCache(): void;
+    clearDirectoryCache(): void;
+    clearCaches(): void;
+}
+
+declare function cosmiconfig(moduleName: string, options?: Options): Explorer;
+
+export = cosmiconfig;
diff --git a/types/cosmiconfig/tsconfig.json b/types/cosmiconfig/tsconfig.json
new file mode 100644
index 0000000000..a30b1e37cf
--- /dev/null
+++ b/types/cosmiconfig/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "cosmiconfig-tests.ts"
+    ]
+}
diff --git a/types/cosmiconfig/tslint.json b/types/cosmiconfig/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/cosmiconfig/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From ae78157df74dc4367b9eb741c10e8c443a3d98af Mon Sep 17 00:00:00 2001
From: Git Automerge <jcguarinpenaranda@gmail.com>
Date: Fri, 23 Mar 2018 10:29:32 -0500
Subject: [PATCH 0792/1382] added right api version number and changed project
 link

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

diff --git a/types/parse/index.d.ts b/types/parse/index.d.ts
index 9a158d9287..d454f1a4d2 100644
--- a/types/parse/index.d.ts
+++ b/types/parse/index.d.ts
@@ -1,5 +1,5 @@
-// Type definitions for parse 2.4
-// Project: https://parse.com/
+// Type definitions for parse 1.11.1
+// Project: https://parseplatform.org/
 // Definitions by:  Ullisen Media Group <http://ullisenmedia.com>
 //                  David Poetzsch-Heffter <https://github.com/dpoetzsch>
 //                  Cedric Kemp <https://github.com/jaeggerr>

From 8d3043c949c4c75148a0bba11cd726cdaca4a415 Mon Sep 17 00:00:00 2001
From: ozum <ozum@ozum.net>
Date: Fri, 23 Mar 2018 18:34:36 +0300
Subject: [PATCH 0793/1382] =?UTF-8?q?[cosmiconfig]=C2=A0Headers=20added?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 types/cosmiconfig/index.d.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/types/cosmiconfig/index.d.ts b/types/cosmiconfig/index.d.ts
index ffbd2e4e3c..824a555b6b 100644
--- a/types/cosmiconfig/index.d.ts
+++ b/types/cosmiconfig/index.d.ts
@@ -1,3 +1,8 @@
+// Type definitions for cosmiconfig 4.0.0
+// Project: https://github.com/davidtheclark/cosmiconfig
+// Definitions by: ozum <https://github.com/ozum>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
 type Options = {
     packageProp?: string | false;
     rc?: string | false;

From 7fa71c0fb6382d94163c04c4d04c12b6b76cc5de Mon Sep 17 00:00:00 2001
From: Git Automerge <jcguarinpenaranda@gmail.com>
Date: Fri, 23 Mar 2018 10:39:09 -0500
Subject: [PATCH 0794/1382] added new definitions contributor

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

diff --git a/types/parse/index.d.ts b/types/parse/index.d.ts
index d454f1a4d2..9f63ed97fb 100644
--- a/types/parse/index.d.ts
+++ b/types/parse/index.d.ts
@@ -5,6 +5,7 @@
 //                  Cedric Kemp <https://github.com/jaeggerr>
 //                  Flavio Negrão <https://github.com/flavionegrao>
 //                  Wes Grimes <https://github.com/wesleygrimes>
+//                  Otherwise SAS <https://github.com/owsas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 

From 5588f282068abb82802f9a0dabb4ce2b7109b602 Mon Sep 17 00:00:00 2001
From: Jacob Hilker <hilker.j@gmail.com>
Date: Fri, 23 Mar 2018 11:46:50 -0400
Subject: [PATCH 0795/1382] [@types/find-root] Fix typo

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

diff --git a/types/find-root/index.d.ts b/types/find-root/index.d.ts
index b2fe6f572a..050781eacf 100644
--- a/types/find-root/index.d.ts
+++ b/types/find-root/index.d.ts
@@ -10,7 +10,7 @@ type FindRootCheckFn = (dir: string) => boolean;
 /**
  * Returns the path for the nearest directory to startingPath containing a package.json file. If a check function is
  * provided, then this will return the nearest directory for which the function returns true.
- * @param startingPath The path to start searching form, e.g. __dirname
+ * @param startingPath The path to start searching from, e.g. __dirname
  * @param check The check predicate
  * @throws {Error} if package.json cannot be found or if the function never returns true
  */

From 7c20629f4f629b7a1e67b916d0324f567b10bf8c Mon Sep 17 00:00:00 2001
From: ozum <ozum@ozum.net>
Date: Fri, 23 Mar 2018 18:52:48 +0300
Subject: [PATCH 0796/1382] [cosmiconfig] Fixed lint errors

---
 types/cosmiconfig/index.d.ts    | 18 ++++++++++--------
 types/cosmiconfig/tsconfig.json | 14 ++++----------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/types/cosmiconfig/index.d.ts b/types/cosmiconfig/index.d.ts
index 824a555b6b..ddb9fdbbc3 100644
--- a/types/cosmiconfig/index.d.ts
+++ b/types/cosmiconfig/index.d.ts
@@ -1,9 +1,10 @@
-// Type definitions for cosmiconfig 4.0.0
+// Type definitions for cosmiconfig 4.0
 // Project: https://github.com/davidtheclark/cosmiconfig
 // Definitions by: ozum <https://github.com/ozum>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
-type Options = {
+interface Options {
     packageProp?: string | false;
     rc?: string | false;
     js?: string | false;
@@ -15,16 +16,17 @@ type Options = {
     transform?: (result: Result) => Promise<Result> | Result;
     configPath?: string;
     format?: "json" | "yaml" | "js";
-};
+}
 
-type Result = {
-    config: Object;
+interface Result {
+    config: object;
     filePath: string;
-};
+}
 
-declare interface Explorer {
+interface Explorer {
+    // You should provide either searchPath or configPath for load method. To disallow both, overloaded definitions added.
     load(searchPath?: string): Promise<Result>;
-    load(searchPath?: null | undefined, configPath?: string): Promise<Result>;
+    load(searchPath: null | undefined, configPath?: string): Promise<Result>;
 
     clearFileCache(): void;
     clearDirectoryCache(): void;
diff --git a/types/cosmiconfig/tsconfig.json b/types/cosmiconfig/tsconfig.json
index a30b1e37cf..6f0f0ac3a2 100644
--- a/types/cosmiconfig/tsconfig.json
+++ b/types/cosmiconfig/tsconfig.json
@@ -1,22 +1,16 @@
 {
     "compilerOptions": {
         "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
+        "lib": ["es6"],
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
+        "typeRoots": ["../"],
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
-    "files": [
-        "index.d.ts",
-        "cosmiconfig-tests.ts"
-    ]
+    "files": ["index.d.ts", "cosmiconfig-tests.ts"]
 }

From 2fabcc3cedbbba186fd55b643174a4d3bfde7029 Mon Sep 17 00:00:00 2001
From: Thilak Rao <me@thilak.in>
Date: Fri, 23 Mar 2018 17:10:19 +0100
Subject: [PATCH 0797/1382] Added fields for disabling cookies in
 UniversalAnalytics namespace

---
 types/google.analytics/index.d.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/types/google.analytics/index.d.ts b/types/google.analytics/index.d.ts
index b71fdef286..9f522b3b9b 100644
--- a/types/google.analytics/index.d.ts
+++ b/types/google.analytics/index.d.ts
@@ -525,6 +525,8 @@ declare namespace UniversalAnalytics {
         socialTarget?: string;
         some?: string;
         step?: boolean | number;
+        storage?: string;
+        storeGac?: boolean;
         tax?: string;
         timingCategory?: string;
         timingLabel?: string;

From f32280e2c637ee0c4f4f4dd217471da91ffb0279 Mon Sep 17 00:00:00 2001
From: ozum <ozum@ozum.net>
Date: Fri, 23 Mar 2018 19:34:00 +0300
Subject: [PATCH 0798/1382] [cosmiconfig] Added: refinement for async and sync
 method.

---
 types/cosmiconfig/cosmiconfig-tests.ts | 31 ++++++++++++++-----
 types/cosmiconfig/index.d.ts           | 43 ++++++++++++++++++++------
 2 files changed, 57 insertions(+), 17 deletions(-)

diff --git a/types/cosmiconfig/cosmiconfig-tests.ts b/types/cosmiconfig/cosmiconfig-tests.ts
index 5eb1045305..2676c58407 100644
--- a/types/cosmiconfig/cosmiconfig-tests.ts
+++ b/types/cosmiconfig/cosmiconfig-tests.ts
@@ -1,6 +1,6 @@
 import cosmiconfig = require("cosmiconfig");
 
-const explorer = cosmiconfig("yourModuleName", {
+const asyncExplorer = cosmiconfig("yourModuleName", {
     packageProp: "yourModuleName",
     rc: ".yourModuleNamerc",
     js: "yourModuleName.config.js",
@@ -14,13 +14,28 @@ const explorer = cosmiconfig("yourModuleName", {
 });
 
 Promise.all([
-    explorer.load(),
-    explorer.load("start/search/here"),
-    explorer.load(null, "load/this/file.json")
+    asyncExplorer.load(),
+    asyncExplorer.load("start/search/here"),
+    asyncExplorer.load(null, "load/this/file.json")
 ]).then(result => result);
 
-explorer.load().then(({ config, filePath }) => ({ config, filePath }));
+asyncExplorer.load().then(({ config, filePath }) => ({ config, filePath }));
 
-explorer.clearFileCache();
-explorer.clearDirectoryCache();
-explorer.clearCaches();
+asyncExplorer.clearFileCache();
+asyncExplorer.clearDirectoryCache();
+asyncExplorer.clearCaches();
+
+const syncExplorer = cosmiconfig("yourModuleName", {
+    packageProp: "yourModuleName",
+    rc: ".yourModuleNamerc",
+    js: "yourModuleName.config.js",
+    rcStrictJson: false,
+    rcExtensions: false,
+    stopDir: "someDir",
+    cache: true,
+    sync: true,
+    transform: ({ config, filePath }) => ({ config, filePath }),
+    format: "js"
+});
+
+const { config, filePath } = syncExplorer.load();
diff --git a/types/cosmiconfig/index.d.ts b/types/cosmiconfig/index.d.ts
index ddb9fdbbc3..032f570d6f 100644
--- a/types/cosmiconfig/index.d.ts
+++ b/types/cosmiconfig/index.d.ts
@@ -4,6 +4,11 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
+interface Result {
+    config: object;
+    filePath: string;
+}
+
 interface Options {
     packageProp?: string | false;
     rc?: string | false;
@@ -12,27 +17,47 @@ interface Options {
     rcExtensions?: boolean;
     stopDir?: string;
     cache?: boolean;
-    sync?: boolean;
     transform?: (result: Result) => Promise<Result> | Result;
     configPath?: string;
     format?: "json" | "yaml" | "js";
 }
 
-interface Result {
-    config: object;
-    filePath: string;
+// Default is false and makes load() method async
+interface AsyncOptions extends Options {
+    sync?: false;
+}
+
+// Makes load() method sync
+interface SyncOptions extends Options {
+    sync: true;
 }
 
 interface Explorer {
-    // You should provide either searchPath or configPath for load method. To disallow both, overloaded definitions added.
-    load(searchPath?: string): Promise<Result>;
-    load(searchPath: null | undefined, configPath?: string): Promise<Result>;
-
     clearFileCache(): void;
     clearDirectoryCache(): void;
     clearCaches(): void;
 }
 
-declare function cosmiconfig(moduleName: string, options?: Options): Explorer;
+interface AsyncExplorer extends Explorer {
+    // You should provide either searchPath or configPath for load method. To disallow both, overloaded definitions added.
+    load(searchPath?: string): Promise<Result>;
+    load(searchPath: null | undefined, configPath?: string): Promise<Result>;
+}
+
+interface SyncExplorer extends Explorer {
+    // You should provide either searchPath or configPath for load method. To disallow both, overloaded definitions added.
+    load(searchPath?: string): Result;
+    load(searchPath: null | undefined, configPath?: string): Result;
+}
+
+declare function cosmiconfig(
+    moduleName: string,
+    options: SyncOptions
+): SyncExplorer;
+
+declare function cosmiconfig(
+    moduleName: string,
+    options?: AsyncOptions
+): AsyncExplorer;
 
 export = cosmiconfig;

From 8821490d489bd309343993a8167b85972964123e Mon Sep 17 00:00:00 2001
From: Matt Meshulam <matt@meshul.am>
Date: Fri, 23 Mar 2018 11:53:37 -0500
Subject: [PATCH 0799/1382] react-native-navigation: Add showAsAction optional
 field to NavigatorButton

---
 types/react-native-navigation/index.d.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/types/react-native-navigation/index.d.ts b/types/react-native-navigation/index.d.ts
index 6699f5bf9f..96b21b01e2 100644
--- a/types/react-native-navigation/index.d.ts
+++ b/types/react-native-navigation/index.d.ts
@@ -241,6 +241,8 @@ export type SystemItemIOS = 'done' | 'cancel' | 'edit' | 'save' | 'add' |
     'bookmarks' | 'search' | 'refresh' | 'stop' | 'camera' | 'trash' | 'play' |
     'pause' | 'rewind' | 'fastForward' | 'undo' | 'redo';
 
+export type ShowAsActionAndroid = 'ifRoom' | 'always' | 'withText' | 'never';
+
 export interface NavigatorButton {
     id: string | IdAndroid;
     title?: string;
@@ -254,6 +256,7 @@ export interface NavigatorButton {
     buttonFontSize?: number;
     buttonFontWeight?: string | number;
     systemItem?: SystemItemIOS;
+    showAsAction?: ShowAsActionAndroid;
 }
 
 export interface FABAndroid {

From a2c6ea7283908d6af71818a0e68e36aab377a1a9 Mon Sep 17 00:00:00 2001
From: Mathieu Dumont <mdumont@mirego.com>
Date: Fri, 23 Mar 2018 13:26:57 -0400
Subject: [PATCH 0800/1382] Fix react-i18next typings

---
 types/react-i18next/src/I18n.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/react-i18next/src/I18n.d.ts b/types/react-i18next/src/I18n.d.ts
index 122249c6e8..6bc1cf8f0f 100644
--- a/types/react-i18next/src/I18n.d.ts
+++ b/types/react-i18next/src/I18n.d.ts
@@ -8,7 +8,7 @@ export interface Options {
 
 export interface i18nProps {
     wait?: boolean;
-    ns: string | string[];
+    ns?: string | string[];
     nsMode?: string;
     bindI18n?: string;
     bindStore?: string;

From c5e3a155758aace83ce97f5615cc1671972f2e9f Mon Sep 17 00:00:00 2001
From: Walter Rumsby <walter.rumsby@myfoodbag.co.nz>
Date: Sat, 24 Mar 2018 07:13:02 +1300
Subject: [PATCH 0801/1382] Remove prototype

---
 types/mem-fs/index.d.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/types/mem-fs/index.d.ts b/types/mem-fs/index.d.ts
index 13d1c27105..da6a209bb6 100644
--- a/types/mem-fs/index.d.ts
+++ b/types/mem-fs/index.d.ts
@@ -18,7 +18,4 @@ export namespace memFs {
         get: (filepath: string) => File;
         stream: () => Transform;
     }
-
-    const prototype: {
-    };
 }

From a9dc8167a09f03aa3c2247ece908cb4abd6c185f Mon Sep 17 00:00:00 2001
From: Walter Rumsby <walter.rumsby@myfoodbag.co.nz>
Date: Sat, 24 Mar 2018 07:27:28 +1300
Subject: [PATCH 0802/1382] Remove readme from project link

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

diff --git a/types/mem-fs/index.d.ts b/types/mem-fs/index.d.ts
index da6a209bb6..0cece1da38 100644
--- a/types/mem-fs/index.d.ts
+++ b/types/mem-fs/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for mem-fs 1.1
-// Project: https://github.com/sboudrias/mem-fs#readme
+// Project: https://github.com/sboudrias/mem-fs
 // Definitions by: My Food Bag <https://github.com/MyFoodBag>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 

From 9363c54fa9da9dcf7c7e2264464eee0b9ddf9c48 Mon Sep 17 00:00:00 2001
From: Daniel Imhoff <dwieeb@gmail.com>
Date: Fri, 23 Mar 2018 14:48:30 -0500
Subject: [PATCH 0803/1382] add `wordWrap` and `trim` options for wrap-ansi v3

---
 types/wrap-ansi/index.d.ts            |  4 +-
 types/wrap-ansi/v2/index.d.ts         | 20 +++++++
 types/wrap-ansi/v2/tsconfig.json      | 26 +++++++++
 types/wrap-ansi/v2/tslint.json        | 79 +++++++++++++++++++++++++++
 types/wrap-ansi/v2/wrap-ansi-tests.ts |  8 +++
 types/wrap-ansi/wrap-ansi-tests.ts    |  4 ++
 6 files changed, 139 insertions(+), 2 deletions(-)
 create mode 100644 types/wrap-ansi/v2/index.d.ts
 create mode 100644 types/wrap-ansi/v2/tsconfig.json
 create mode 100644 types/wrap-ansi/v2/tslint.json
 create mode 100644 types/wrap-ansi/v2/wrap-ansi-tests.ts

diff --git a/types/wrap-ansi/index.d.ts b/types/wrap-ansi/index.d.ts
index fcbdd756e2..1a1ed41cf8 100644
--- a/types/wrap-ansi/index.d.ts
+++ b/types/wrap-ansi/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for wrap-ansi v2.0.0
+// Type definitions for wrap-ansi v3.0.0
 // Project: https://www.npmjs.com/package/wrap-ansi
 // Definitions by: Klaus Reimer <https://github.com/kayahr>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -12,7 +12,7 @@
  * @param options By default the wrap is soft, meaning long words may extend past the column width. Setting 
  *                this to true will make it hard wrap at the column width.
  */
-declare function wrapAnsi(input: string, columns: number, options?: { hard?: boolean }): string;
+declare function wrapAnsi(input: string, columns: number, options?: { hard?: boolean; trim?: boolean; wordWrap?: boolean; }): string;
 
 declare namespace wrapAnsi {}
 
diff --git a/types/wrap-ansi/v2/index.d.ts b/types/wrap-ansi/v2/index.d.ts
new file mode 100644
index 0000000000..fcbdd756e2
--- /dev/null
+++ b/types/wrap-ansi/v2/index.d.ts
@@ -0,0 +1,20 @@
+// Type definitions for wrap-ansi v2.0.0
+// Project: https://www.npmjs.com/package/wrap-ansi
+// Definitions by: Klaus Reimer <https://github.com/kayahr>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+/**
+ * Wrap words to the specified column width.
+ *
+ * @param input   String with ANSI escape codes. Like one styled by chalk.
+ * @param columns Number of columns to wrap the text to.
+ * @param options By default the wrap is soft, meaning long words may extend past the column width. Setting 
+ *                this to true will make it hard wrap at the column width.
+ */
+declare function wrapAnsi(input: string, columns: number, options?: { hard?: boolean }): string;
+
+declare namespace wrapAnsi {}
+
+export = wrapAnsi;
+
diff --git a/types/wrap-ansi/v2/tsconfig.json b/types/wrap-ansi/v2/tsconfig.json
new file mode 100644
index 0000000000..52f19a07de
--- /dev/null
+++ b/types/wrap-ansi/v2/tsconfig.json
@@ -0,0 +1,26 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "paths": {
+            "wrap-ansi": ["wrap-ansi/v2"]
+        }
+    },
+    "files": [
+        "index.d.ts",
+        "wrap-ansi-tests.ts"
+    ]
+}
diff --git a/types/wrap-ansi/v2/tslint.json b/types/wrap-ansi/v2/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/wrap-ansi/v2/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
diff --git a/types/wrap-ansi/v2/wrap-ansi-tests.ts b/types/wrap-ansi/v2/wrap-ansi-tests.ts
new file mode 100644
index 0000000000..e5ba8c294f
--- /dev/null
+++ b/types/wrap-ansi/v2/wrap-ansi-tests.ts
@@ -0,0 +1,8 @@
+
+
+import wrapAnsi = require("wrap-ansi");
+
+wrapAnsi("input", 80) === "output";
+wrapAnsi("input", 80, {}) === "output";
+wrapAnsi("input", 80, { hard: true }) === "output";
+wrapAnsi("input", 80, { hard: false }) === "output";
diff --git a/types/wrap-ansi/wrap-ansi-tests.ts b/types/wrap-ansi/wrap-ansi-tests.ts
index e5ba8c294f..49e1b64efe 100644
--- a/types/wrap-ansi/wrap-ansi-tests.ts
+++ b/types/wrap-ansi/wrap-ansi-tests.ts
@@ -6,3 +6,7 @@ wrapAnsi("input", 80) === "output";
 wrapAnsi("input", 80, {}) === "output";
 wrapAnsi("input", 80, { hard: true }) === "output";
 wrapAnsi("input", 80, { hard: false }) === "output";
+wrapAnsi("input", 80, { trim: true }) === "output";
+wrapAnsi("input", 80, { trim: false }) === "output";
+wrapAnsi("input", 80, { wordWrap: true }) === "output";
+wrapAnsi("input", 80, { wordWrap: false }) === "output";

From 6f6324a0ab089f94b8cf0fe2ac07ff8d4786798f Mon Sep 17 00:00:00 2001
From: Git Automerge <jcguarinpenaranda@gmail.com>
Date: Fri, 23 Mar 2018 14:59:24 -0500
Subject: [PATCH 0804/1382] added Parse.Promise catch function

---
 types/parse/index.d.ts     | 2 ++
 types/parse/parse-tests.ts | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/types/parse/index.d.ts b/types/parse/index.d.ts
index 9f63ed97fb..908281f84d 100644
--- a/types/parse/index.d.ts
+++ b/types/parse/index.d.ts
@@ -89,6 +89,7 @@ declare namespace Parse {
         then<U>(resolvedCallback: (...values: T[]) => IPromise<U>, rejectedCallback?: (reason: any) => IPromise<U>): IPromise<U>;
         then<U>(resolvedCallback: (...values: T[]) => U, rejectedCallback?: (reason: any) => IPromise<U>): IPromise<U>;
         then<U>(resolvedCallback: (...values: T[]) => U, rejectedCallback?: (reason: any) => U): IPromise<U>;
+        catch<U>(resolvedCallback: (...values: T[]) => U, rejectedCallback?: (reason: any) => U): IPromise<U>;
     }
 
     class Promise<T> implements IPromise<T> {
@@ -110,6 +111,7 @@ declare namespace Parse {
             rejectedCallback?: (reason: any) => IPromise<U>): IPromise<U>;
         then<U>(resolvedCallback: (...values: T[]) => U,
             rejectedCallback?: (reason: any) => U): IPromise<U>;
+        catch<U>(resolvedCallback: (...values: T[]) => U, rejectedCallback?: (reason: any) => U): IPromise<U>;
     }
 
     interface Pointer {
diff --git a/types/parse/parse-tests.ts b/types/parse/parse-tests.ts
index 60b688ec6e..acb194ed6a 100644
--- a/types/parse/parse-tests.ts
+++ b/types/parse/parse-tests.ts
@@ -514,6 +514,15 @@ function test_promise() {
         // failed
     });
 
+    // Test promise with a query
+    const query = new Parse.Query('Test');
+    query.find()
+    .then(() => {
+        // success
+    }).catch(() => {
+        // error
+    });
+
     // can check whether an object is a Parse.Promise object or not
     Parse.Promise.is(resolved);
 }

From 75ff0e94a9e1c467ef06de1496585788f3346955 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20H=C3=B8is=C3=A6ther=20Rasch?=
 <fredrik.rasch@gmail.com>
Date: Fri, 23 Mar 2018 23:48:18 +0100
Subject: [PATCH 0805/1382] Enforce package.json checkout with LF line-endings
 (#24353)

---
 .gitattributes | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.gitattributes b/.gitattributes
index dfe0770424..ac1e451d56 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,7 @@
 # Auto detect text files and perform LF normalization
 * text=auto
+
+# Checkout NPM package files with forced LF lineendings
+# to prevent git conflicts when running npm commands
+package.json text eol=lf
+package-lock.json text eol=lf

From a99c09f5988bbc57f5edd68682060eff942aa621 Mon Sep 17 00:00:00 2001
From: Valentin Sundermann <me@vsund.de>
Date: Fri, 23 Mar 2018 23:50:58 +0100
Subject: [PATCH 0806/1382] Add compressed and network as attributes for ECPair

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

diff --git a/types/bitcoinjs-lib/index.d.ts b/types/bitcoinjs-lib/index.d.ts
index 11d311a276..920df43d6e 100644
--- a/types/bitcoinjs-lib/index.d.ts
+++ b/types/bitcoinjs-lib/index.d.ts
@@ -71,6 +71,10 @@ export class ECPair {
 
     d: BigInteger;
 
+    readonly compressed: boolean;
+
+    readonly network: Network;
+
     getAddress(): string;
 
     getNetwork(): Network;

From b08baf3d2639742aab5ee027d6d7023857a9bc58 Mon Sep 17 00:00:00 2001
From: Uri Shaked <uri@urishaked.com>
Date: Sat, 24 Mar 2018 02:01:46 +0300
Subject: [PATCH 0807/1382] add types for base64-url

---
 types/base64-url/base64-url-tests.ts |  9 +++++++++
 types/base64-url/index.d.ts          |  9 +++++++++
 types/base64-url/tsconfig.json       | 23 +++++++++++++++++++++++
 types/base64-url/tslint.json         |  1 +
 4 files changed, 42 insertions(+)
 create mode 100644 types/base64-url/base64-url-tests.ts
 create mode 100644 types/base64-url/index.d.ts
 create mode 100644 types/base64-url/tsconfig.json
 create mode 100644 types/base64-url/tslint.json

diff --git a/types/base64-url/base64-url-tests.ts b/types/base64-url/base64-url-tests.ts
new file mode 100644
index 0000000000..fd5c07cac0
--- /dev/null
+++ b/types/base64-url/base64-url-tests.ts
@@ -0,0 +1,9 @@
+import * as base64url from 'base64-url';
+
+base64url.encode('Node.js is awesome.'); // $ExpectType string
+base64url.decode('Tm9kZS5qcyBpcyBhd2Vzb21lLg'); // $ExpectType string
+base64url.escape('This+is/goingto+escape=='); // $ExpectType string
+base64url.unescape('This-is_goingto-escape'); // $ExpectType string
+
+base64url.encode('string to encode', 'ascii'); // $ExpectType string
+base64url.decode('string to decode', 'ascii'); // $ExpectType string
diff --git a/types/base64-url/index.d.ts b/types/base64-url/index.d.ts
new file mode 100644
index 0000000000..1065cb9115
--- /dev/null
+++ b/types/base64-url/index.d.ts
@@ -0,0 +1,9 @@
+// Type definitions for base64-url 2.2
+// Project: https://github.com/joaquimserafim/base64-url
+// Definitions by: Uri Shaked <https://github.com/urish>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export function decode(value: string, encoding?: string): string;
+export function encode(value: string, encoding?: string): string;
+export function escape(value: string): string;
+export function unescape(value: string): string;
diff --git a/types/base64-url/tsconfig.json b/types/base64-url/tsconfig.json
new file mode 100644
index 0000000000..26ccd93511
--- /dev/null
+++ b/types/base64-url/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "base64-url-tests.ts"
+    ]
+}
diff --git a/types/base64-url/tslint.json b/types/base64-url/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/base64-url/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 329bf5da38b21c5785ba3069372bc25568be648c Mon Sep 17 00:00:00 2001
From: Aleksey Klimenko <klimenko@competentum.ru>
Date: Sat, 24 Mar 2018 04:29:35 +0300
Subject: [PATCH 0808/1382] [feathersjs__express] clarified definitions and
 tests

---
 .../feathersjs__express-tests.ts                | 11 +++++++----
 types/feathersjs__express/index.d.ts            | 17 ++++++++++++-----
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/types/feathersjs__express/feathersjs__express-tests.ts b/types/feathersjs__express/feathersjs__express-tests.ts
index 687191d0c6..6120ed483f 100644
--- a/types/feathersjs__express/feathersjs__express-tests.ts
+++ b/types/feathersjs__express/feathersjs__express-tests.ts
@@ -1,8 +1,11 @@
 import feathers, { Application } from '@feathersjs/feathers';
-import feathersExpress, { original, rest, notFound, errorHandler } from '@feathersjs/express';
+import feathersExpress, * as express from "@feathersjs/express";
 
 const app = feathersExpress(feathers());
 
-app.configure(rest());
-app.use(notFound());
-app.use(errorHandler());
+app.use(express.json());
+app.use(express.urlencoded({ extended: true }));
+app.use('/', express.static('./public'));
+app.configure(express.rest());
+app.use(express.notFound());
+app.use(express.errorHandler({ logger: console }));
diff --git a/types/feathersjs__express/index.d.ts b/types/feathersjs__express/index.d.ts
index f50203432f..7e1eea1a1d 100644
--- a/types/feathersjs__express/index.d.ts
+++ b/types/feathersjs__express/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for @feathersjs/express 1.1
 // Project: http://feathersjs.com/
 // Definitions by: Jan Lohage <https://github.com/j2L4e>
+//                 Aleksey Klimenko <https://github.com/DadUndead>
 // Definitions: https://github.com/feathersjs-ecosystem/feathers-typescript
 // TypeScript Version: 2.3
 
@@ -10,12 +11,18 @@ import * as express from 'express';
 export default function feathersExpress<T>(app: FeathersApplication<T>): Application<T>;
 export type Application<T> = express.Application & FeathersApplication<T>;
 
-export function errorHandler(options?: any): express.ErrorRequestHandler;
+export function errorHandler(options?: {
+    public?: string,
+    logger?: { error?: (msg: string) => void },
+    html?: any,
+    json?: any,
+}): express.ErrorRequestHandler;
 export function notFound(): express.RequestHandler;
-export const rest: {
-    (): () => void;
-    formatter: express.RequestHandler;
-};
+
+export function rest(): (handler?: express.RequestHandler) => void;
+export namespace rest {
+    export let formatter: express.RequestHandler;
+}
 
 /*
  * Re-export of the express package.

From dc1dc45ee36ed1e10a8bdb56877587d708ef04da Mon Sep 17 00:00:00 2001
From: ckboyjiy <ckboyjiy@nate.com>
Date: Sat, 24 Mar 2018 10:58:03 +0900
Subject: [PATCH 0809/1382] Added type definitions for Naver maps # modified
 tslint.json # move to /types

---
 navermaps/tslint.json                         | 79 -------------------
 {navermaps => scripts/navermaps}/index.d.ts   |  0
 .../navermaps}/navermaps-tests.ts             |  0
 .../navermaps}/tsconfig.json                  |  0
 scripts/navermaps/tslint.json                 |  3 +
 5 files changed, 3 insertions(+), 79 deletions(-)
 delete mode 100644 navermaps/tslint.json
 rename {navermaps => scripts/navermaps}/index.d.ts (100%)
 rename {navermaps => scripts/navermaps}/navermaps-tests.ts (100%)
 rename {navermaps => scripts/navermaps}/tsconfig.json (100%)
 create mode 100644 scripts/navermaps/tslint.json

diff --git a/navermaps/tslint.json b/navermaps/tslint.json
deleted file mode 100644
index a41bf5d19a..0000000000
--- a/navermaps/tslint.json
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
-        "ban-types": false,
-        "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
-        "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
-        "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
-        "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
-        "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
-        "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
-        "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
-    }
-}
diff --git a/navermaps/index.d.ts b/scripts/navermaps/index.d.ts
similarity index 100%
rename from navermaps/index.d.ts
rename to scripts/navermaps/index.d.ts
diff --git a/navermaps/navermaps-tests.ts b/scripts/navermaps/navermaps-tests.ts
similarity index 100%
rename from navermaps/navermaps-tests.ts
rename to scripts/navermaps/navermaps-tests.ts
diff --git a/navermaps/tsconfig.json b/scripts/navermaps/tsconfig.json
similarity index 100%
rename from navermaps/tsconfig.json
rename to scripts/navermaps/tsconfig.json
diff --git a/scripts/navermaps/tslint.json b/scripts/navermaps/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/scripts/navermaps/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}

From 60b5b351f07a5b15dbbcb74c2c119af4d7fe3d26 Mon Sep 17 00:00:00 2001
From: ckboyjiy <ckboyjiy@nate.com>
Date: Sat, 24 Mar 2018 11:06:13 +0900
Subject: [PATCH 0810/1382] Added type definitions for Naver maps # modified
 tslint.json # move to /types

---
 {scripts => types}/navermaps/index.d.ts         | 0
 {scripts => types}/navermaps/navermaps-tests.ts | 0
 {scripts => types}/navermaps/tsconfig.json      | 0
 {scripts => types}/navermaps/tslint.json        | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename {scripts => types}/navermaps/index.d.ts (100%)
 rename {scripts => types}/navermaps/navermaps-tests.ts (100%)
 rename {scripts => types}/navermaps/tsconfig.json (100%)
 rename {scripts => types}/navermaps/tslint.json (100%)

diff --git a/scripts/navermaps/index.d.ts b/types/navermaps/index.d.ts
similarity index 100%
rename from scripts/navermaps/index.d.ts
rename to types/navermaps/index.d.ts
diff --git a/scripts/navermaps/navermaps-tests.ts b/types/navermaps/navermaps-tests.ts
similarity index 100%
rename from scripts/navermaps/navermaps-tests.ts
rename to types/navermaps/navermaps-tests.ts
diff --git a/scripts/navermaps/tsconfig.json b/types/navermaps/tsconfig.json
similarity index 100%
rename from scripts/navermaps/tsconfig.json
rename to types/navermaps/tsconfig.json
diff --git a/scripts/navermaps/tslint.json b/types/navermaps/tslint.json
similarity index 100%
rename from scripts/navermaps/tslint.json
rename to types/navermaps/tslint.json

From 0f9cfb309b928e7b91f1fc365936631f5ee884fd Mon Sep 17 00:00:00 2001
From: Moritz Raguschat <moritz@jumplink.me>
Date: Sat, 24 Mar 2018 03:09:12 +0100
Subject: [PATCH 0811/1382] [koa-session] ContextStore constructor takes an
 argument of type Koa.Context

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

diff --git a/types/koa-session/index.d.ts b/types/koa-session/index.d.ts
index 8650a07d91..2fe4a37b95 100644
--- a/types/koa-session/index.d.ts
+++ b/types/koa-session/index.d.ts
@@ -166,7 +166,7 @@ declare namespace session {
          * ContextStore must be a class which claims three instance methods demonstrated above.
          * new ContextStore(ctx) will be executed on every request.
          */
-        ContextStore?: { new(): stores };
+        ContextStore?: { new(ctx: Koa.Context): stores };
 
         /**
          * If you want to add prefix for all external session id, you can use options.prefix, it will not work if options.genid present.

From ceb451152428810ab9e0bb858b51cad1ba68c99e Mon Sep 17 00:00:00 2001
From: AndersonFriaca <afriacaxd@gmail.com>
Date: Fri, 23 Mar 2018 22:13:48 -0400
Subject: [PATCH 0812/1382] Types for JQuery Pin

---
 types/jquery.pin/index.d.ts          | 22 ++++++++++++++++++++++
 types/jquery.pin/jquery.pin-tests.ts | 17 +++++++++++++++++
 types/jquery.pin/tsconfig.json       | 25 +++++++++++++++++++++++++
 types/jquery.pin/tslint.json         |  1 +
 4 files changed, 65 insertions(+)
 create mode 100644 types/jquery.pin/index.d.ts
 create mode 100644 types/jquery.pin/jquery.pin-tests.ts
 create mode 100644 types/jquery.pin/tsconfig.json
 create mode 100644 types/jquery.pin/tslint.json

diff --git a/types/jquery.pin/index.d.ts b/types/jquery.pin/index.d.ts
new file mode 100644
index 0000000000..df132c6571
--- /dev/null
+++ b/types/jquery.pin/index.d.ts
@@ -0,0 +1,22 @@
+// Type definitions for JQuery Pin 1.0
+// Project: https://github.com/webpop/jquery.pin
+// Definitions by: Anderson Friaça <https://github.com/AndersonFriaca>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="jquery" />
+
+export interface Options {
+    minWidth?: number;
+    activeClass?: string;
+    containerSelector?: string;
+    padding?: {
+        top?: number;
+        bottom?: number;
+    };
+}
+declare global {
+    interface JQuery {
+        pin(options?: Options): JQuery;
+    }
+}
diff --git a/types/jquery.pin/jquery.pin-tests.ts b/types/jquery.pin/jquery.pin-tests.ts
new file mode 100644
index 0000000000..b43c6e7881
--- /dev/null
+++ b/types/jquery.pin/jquery.pin-tests.ts
@@ -0,0 +1,17 @@
+import { Options } from "jquery.pin";
+
+// basic usage
+$(".pinned").pin();
+
+// with options
+const options: Options = {
+    activeClass: 'active',
+    minWidth: 940,
+    containerSelector: '.container',
+    padding: {
+        top: 10,
+        bottom: 10
+    }
+};
+
+$(".pinned").pin(options);
diff --git a/types/jquery.pin/tsconfig.json b/types/jquery.pin/tsconfig.json
new file mode 100644
index 0000000000..4e880d5205
--- /dev/null
+++ b/types/jquery.pin/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "esModuleInterop": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.pin-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/jquery.pin/tslint.json b/types/jquery.pin/tslint.json
new file mode 100644
index 0000000000..d04fe2e1fa
--- /dev/null
+++ b/types/jquery.pin/tslint.json
@@ -0,0 +1 @@
+{"extends": "dtslint/dt.json"}
\ No newline at end of file

From 240454d11c296e054d5b4ccf29a902d064d7918f Mon Sep 17 00:00:00 2001
From: Aleksey Klimenko <ralict@mail.ru>
Date: Sat, 24 Mar 2018 11:33:15 +0300
Subject: [PATCH 0813/1382] fix(@feathersjs/express): removed redudant export

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

diff --git a/types/feathersjs__express/index.d.ts b/types/feathersjs__express/index.d.ts
index 7e1eea1a1d..16bff00cd4 100644
--- a/types/feathersjs__express/index.d.ts
+++ b/types/feathersjs__express/index.d.ts
@@ -21,7 +21,7 @@ export function notFound(): express.RequestHandler;
 
 export function rest(): (handler?: express.RequestHandler) => void;
 export namespace rest {
-    export let formatter: express.RequestHandler;
+    let formatter: express.RequestHandler;
 }
 
 /*

From 840bdf168b550909f88a9549d2a323133d47c22e Mon Sep 17 00:00:00 2001
From: Stanislav Termosa <termosa.stanislav@gmail.com>
Date: Sat, 24 Mar 2018 10:53:23 +0200
Subject: [PATCH 0814/1382] Change `export default` to `export =`

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

diff --git a/types/is-empty/index.d.ts b/types/is-empty/index.d.ts
index 5ac0a155c2..ca712b74cb 100644
--- a/types/is-empty/index.d.ts
+++ b/types/is-empty/index.d.ts
@@ -8,4 +8,4 @@
  */
 declare function isEmpty(value: any): boolean;
 
-export default isEmpty;
+export = isEmpty;

From 11843a76f28167f56c3ae08102c492bc1d60a98c Mon Sep 17 00:00:00 2001
From: Stanislav Termosa <termosa.stanislav@gmail.com>
Date: Sat, 24 Mar 2018 10:59:11 +0200
Subject: [PATCH 0815/1382] Change test to require isEmpty dependency

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

diff --git a/types/is-empty/is-empty-tests.ts b/types/is-empty/is-empty-tests.ts
index 538ae6cc71..3c49359089 100644
--- a/types/is-empty/is-empty-tests.ts
+++ b/types/is-empty/is-empty-tests.ts
@@ -1,4 +1,4 @@
-import isEmpty from 'is-empty';
+import isEmpty = require('is-empty');
 
 isEmpty({});
 isEmpty(null);

From 8037f2788aa868f1186183e2de1d5957a0aa6eac Mon Sep 17 00:00:00 2001
From: Gareth Parker <gareth.parker@century.tech>
Date: Sat, 24 Mar 2018 09:06:24 +0000
Subject: [PATCH 0816/1382] Moved typings to types folder

---
 {glue => types/glue}/hapi-glue-test.ts | 0
 {glue => types/glue}/index.d.ts        | 0
 {glue => types/glue}/tsconfig.json     | 0
 {glue => types/glue}/tslint.json       | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename {glue => types/glue}/hapi-glue-test.ts (100%)
 rename {glue => types/glue}/index.d.ts (100%)
 rename {glue => types/glue}/tsconfig.json (100%)
 rename {glue => types/glue}/tslint.json (100%)

diff --git a/glue/hapi-glue-test.ts b/types/glue/hapi-glue-test.ts
similarity index 100%
rename from glue/hapi-glue-test.ts
rename to types/glue/hapi-glue-test.ts
diff --git a/glue/index.d.ts b/types/glue/index.d.ts
similarity index 100%
rename from glue/index.d.ts
rename to types/glue/index.d.ts
diff --git a/glue/tsconfig.json b/types/glue/tsconfig.json
similarity index 100%
rename from glue/tsconfig.json
rename to types/glue/tsconfig.json
diff --git a/glue/tslint.json b/types/glue/tslint.json
similarity index 100%
rename from glue/tslint.json
rename to types/glue/tslint.json

From 1fbf0acb08b4ea083194bb25c1b98aae4f358e45 Mon Sep 17 00:00:00 2001
From: Vladimir Tikhonov <vladimir@tikhonov.by>
Date: Sat, 24 Mar 2018 11:57:25 +0300
Subject: [PATCH 0817/1382] THREE.js: Vector2 improvements

* Added applyMatrix3 method.
* Fixed signature of fromBufferAttribute method.
* Added some missing docs.
---
 types/three/test/math/test_unit_math.ts |  19 +++-
 types/three/three-core.d.ts             | 117 +++++++++++++++++++++---
 2 files changed, 120 insertions(+), 16 deletions(-)

diff --git a/types/three/test/math/test_unit_math.ts b/types/three/test/math/test_unit_math.ts
index d49a60632c..b6c536085f 100644
--- a/types/three/test/math/test_unit_math.ts
+++ b/types/three/test/math/test_unit_math.ts
@@ -3,7 +3,7 @@ declare function ok(cond: any, desc?: string): void;
 declare function deepEqual<T>(a: T, b: T, desc?: string): void;
 declare function equal<T>(a: T, b: T, desc?: string): void;
 
-// https://github.com/mrdoob/three.js/tree/master/test/unit/math
+// https://github.com/mrdoob/three.js/tree/master/test/unit/src/math
 
 ()=>{
     // -------------------------------------------- Constants
@@ -2743,6 +2743,14 @@ declare function equal<T>(a: T, b: T, desc?: string): void;
         ok( b.y == -y, "Passed!" );
     });
 
+    test( "applyMatrix3", function () {
+        var a = new THREE.Vector2( x, y );
+        var m = new THREE.Matrix3().set( 2, 3, 5, 7, 11, 13, 17, 19, 23 );
+
+        a.applyMatrix3( m );
+        ok( a.x == 18, "Passed!" );
+        ok( a.y == 60, "Passed!" );
+    });
 
     test( "min/max/clamp", function() {
         var a = new THREE.Vector2( x, y );
@@ -2898,6 +2906,15 @@ declare function equal<T>(a: T, b: T, desc?: string): void;
         ok( b.equals( a ), "Passed!" );
     });
 
+    test( "fromBufferAttribute", function() {
+        var a = new THREE.Vector2();
+        var attr = new THREE.BufferAttribute( new Float32Array( [ 1, 2, 3, 4 ] ), 2 );
+
+        a.fromBufferAttribute( attr, 0 );
+        ok( a.x == 1, "Passed!" );
+        ok( a.y == 2, "Passed!" );
+    });
+
     // -------------------------------------------- Vector3
     test( "constructor", function() {
         var a = new THREE.Vector3();
diff --git a/types/three/three-core.d.ts b/types/three/three-core.d.ts
index e7e421b93d..2b012cd7e2 100644
--- a/types/three/three-core.d.ts
+++ b/types/three/three-core.d.ts
@@ -4319,6 +4319,9 @@ export class Vector2 implements Vector {
      */
     set(x: number, y: number): Vector2;
 
+    /**
+     * Sets the x and y values of this vector both equal to scalar.
+     */
     setScalar(scalar: number): Vector2;
 
     /**
@@ -4335,11 +4338,11 @@ export class Vector2 implements Vector {
      * Sets a component of this vector.
      */
     setComponent(index: number, value: number): void;
-
     /**
      * Gets a component of this vector.
      */
     getComponent(index: number): number;
+
     /**
      * Clones this vector.
      */
@@ -4353,29 +4356,44 @@ export class Vector2 implements Vector {
      * Adds v to this vector.
      */
     add(v: Vector2): Vector2;
-
+    /**
+     * Adds the scalar value s to this vector's x and y values.
+     */
+    addScalar(s: number): Vector2;
     /**
      * Sets this vector to a + b.
      */
-    addScalar(s: number): Vector2;
     addVectors(a: Vector2, b: Vector2): Vector2;
-    addScaledVector( v: Vector2, s: number ): Vector2;
+    /**
+     * Adds the multiple of v and s to this vector.
+     */
+    addScaledVector(v: Vector2, s: number): Vector2;
+
     /**
      * Subtracts v from this vector.
-     */
+    */
     sub(v: Vector2): Vector2;
-
+    /**
+     * Subtracts s from this vector's x and y components.
+     */
+    subScalar(s: number): Vector2;
     /**
      * Sets this vector to a - b.
      */
     subVectors(a: Vector2, b: Vector2): Vector2;
 
+    /**
+     * Multiplies this vector by v.
+     */
     multiply(v: Vector2): Vector2;
     /**
      * Multiplies this vector by scalar s.
      */
     multiplyScalar(scalar: number): Vector2;
 
+    /**
+     * Divides this vector by v.
+     */
     divide(v: Vector2): Vector2;
     /**
      * Divides this vector by scalar s.
@@ -4383,15 +4401,57 @@ export class Vector2 implements Vector {
      */
     divideScalar(s: number): Vector2;
 
-    min(v: Vector2): Vector2;
+    /**
+     * Multiplies this vector (with an implicit 1 as the 3rd component) by m.
+     */
+    applyMatrix3(m: Matrix3): Vector2;
 
+    /**
+     * If this vector's x or y value is greater than v's x or y value, replace that value with the corresponding min value.
+     */
+    min(v: Vector2): Vector2;
+    /**
+     * If this vector's x or y value is less than v's x or y value, replace that value with the corresponding max value.
+     */
     max(v: Vector2): Vector2;
+
+    /**
+     * If this vector's x or y value is greater than the max vector's x or y value, it is replaced by the corresponding value.
+     * If this vector's x or y value is less than the min vector's x or y value, it is replaced by the corresponding value.
+     * @param min the minimum x and y values.
+     * @param max the maximum x and y values in the desired range.
+     */
     clamp(min: Vector2, max: Vector2): Vector2;
+    /**
+     * If this vector's x or y values are greater than the max value, they are replaced by the max value.
+     * If this vector's x or y values are less than the min value, they are replaced by the min value.
+     * @param min the minimum value the components will be clamped to.
+     * @param max the maximum value the components will be clamped to.
+     */
     clampScalar(min: number, max: number): Vector2;
+    /**
+     * If this vector's length is greater than the max value, it is replaced by the max value.
+     * If this vector's length is less than the min value, it is replaced by the min value.
+     * @param min the minimum value the length will be clamped to.
+     * @param max the maximum value the length will be clamped to.
+     */
     clampLength(min: number, max: number): Vector2;
+
+    /**
+     * The components of the vector are rounded down to the nearest integer value.
+     */
     floor(): Vector2;
+    /**
+     * The x and y components of the vector are rounded up to the nearest integer value.
+     */
     ceil(): Vector2;
+    /**
+     * The components of the vector are rounded to the nearest integer value.
+     */
     round(): Vector2;
+    /**
+     * The components of the vector are rounded towards zero (up if negative, down if positive) to an integer value.
+     */
     roundToZero(): Vector2;
 
     /**
@@ -4433,12 +4493,10 @@ export class Vector2 implements Vector {
      * Computes distance of this vector to v.
      */
     distanceTo(v: Vector2): number;
-
     /**
      * Computes squared distance of this vector to v.
      */
     distanceToSquared(v: Vector2): number;
-
     /**
      * @deprecated Use {@link Vector2#manhattanDistanceTo .manhattanDistanceTo()} instead.
      */
@@ -4449,8 +4507,18 @@ export class Vector2 implements Vector {
      */
     setLength(length: number): Vector2;
 
+    /**
+     * Linearly interpolates between this vector and v, where alpha is the distance along the line - alpha = 0 will be this vector, and alpha = 1 will be v.
+     * @param v vector to interpolate towards.
+     * @param alpha interpolation factor in the closed interval [0, 1].
+     */
     lerp(v: Vector2, alpha: number): Vector2;
-
+    /**
+     * Sets this vector to be the vector linearly interpolated between v1 and v2 where alpha is the distance along the line connecting the two vectors - alpha = 0 will be v1, and alpha = 1 will be v2.
+     * @param v1 the starting vector.
+     * @param v2 vector to interpolate towards.
+     * @param alpha interpolation factor in the closed interval [0, 1].
+     */
     lerpVectors(v1: Vector2, v2: Vector2, alpha: number): Vector2;
 
     /**
@@ -4458,13 +4526,32 @@ export class Vector2 implements Vector {
      */
     equals(v: Vector2): boolean;
 
-    fromArray(xy: number[], offset?: number): Vector2;
+    /**
+     * Sets this vector's x value to be array[offset] and y value to be array[offset + 1].
+     * @param array the source array.
+     * @param offset (optional) offset into the array. Default is 0.
+     */
+    fromArray(array: number[], offset?: number): Vector2;
+    /**
+     * Returns an array [x, y], or copies x and y into the provided array.
+     * @param array (optional) array to store the vector to. If this is not provided, a new array will be created.
+     * @param offset (optional) optional offset into the array.
+     */
+    toArray(array?: number[], offset?: number): number[];
 
-    toArray(xy?: number[], offset?: number): number[];
+    /**
+     * Sets this vector's x and y values from the attribute.
+     * @param attribute the source attribute.
+     * @param index index in the attribute.
+     */
+    fromBufferAttribute(attribute: BufferAttribute, index: number): Vector2;
 
-    fromBufferAttribute( attribute: BufferAttribute, index: number, offset?: number): Vector2;
-
-    rotateAround( center: Vector2, angle: number ): Vector2;
+    /**
+     * Rotates the vector around center by angle radians.
+     * @param center the point around which to rotate.
+     * @param angle the angle to rotate, in radians.
+     */
+    rotateAround(center: Vector2, angle: number): Vector2;
 
     /**
      * Computes the Manhattan length of this vector.

From 95c06982ebea38a2dfcb65a69bed021c817fc42f Mon Sep 17 00:00:00 2001
From: Gareth Parker <gareth.parker@century.tech>
Date: Sat, 24 Mar 2018 09:57:13 +0000
Subject: [PATCH 0818/1382] Fixing build

---
 .../glue/{hapi-glue-test.ts => glue-tests.ts} |  4 +-
 types/glue/index.d.ts                         | 54 +++++++++----------
 types/glue/tsconfig.json                      |  2 +-
 3 files changed, 28 insertions(+), 32 deletions(-)
 rename types/glue/{hapi-glue-test.ts => glue-tests.ts} (90%)

diff --git a/types/glue/hapi-glue-test.ts b/types/glue/glue-tests.ts
similarity index 90%
rename from types/glue/hapi-glue-test.ts
rename to types/glue/glue-tests.ts
index 2d34fdb489..7ac309352c 100644
--- a/types/glue/hapi-glue-test.ts
+++ b/types/glue/glue-tests.ts
@@ -15,6 +15,6 @@ const manifest: Glue.Manifest = {
       }
     ]
   }
-}
+};
 
-Glue.compose(manifest);
\ No newline at end of file
+Glue.compose(manifest);
diff --git a/types/glue/index.d.ts b/types/glue/index.d.ts
index 5f40ba924b..e7f12c7a68 100644
--- a/types/glue/index.d.ts
+++ b/types/glue/index.d.ts
@@ -1,35 +1,31 @@
 // Type definitions for glue
 // Project: https://github.com/hapijs/glue
-// Definitions by: Gareth Parker
+// Definitions by: Gareth Parker <https://github.com/garfty>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.7
 
-declare module "glue" {
-  
-  import { Server, ServerOptions } from "hapi";
-
-  export interface Options {
-    relativeTo: string;
-    preConnections?: (Server:Server, next:(err:any)=>void ) => void;
-    preRegister?: (Server:Server, next:(err:any)=>void ) => void;
-  }
-  
-  interface Plugin {
-    plugin: string | {
-        register:string;
-        options?:any;
-    };
-    options?: any;
-    routes?: any
-  }
-  
-  interface Manifest {
-    server: ServerOptions;
-    register?: {
-      plugins: Array<Plugin>
-    }
-  }
-  
-  export function compose(manifest: Manifest, options?: Options): Server;
+import { Server, ServerOptions } from "hapi";
 
+export interface Options {
+  relativeTo: string;
+  preConnections?: (Server:Server, next:(err:any)=>void ) => void;
+  preRegister?: (Server:Server, next:(err:any)=>void ) => void;
 }
+
+interface Plugin {
+  plugin: string | {
+      register:string;
+      options?:any;
+  };
+  options?: any;
+  routes?: any
+}
+
+interface Manifest {
+  server: ServerOptions;
+  register?: {
+    plugins: Array<Plugin>
+  }
+}
+
+export function compose(manifest: Manifest, options?: Options): Server;
+
diff --git a/types/glue/tsconfig.json b/types/glue/tsconfig.json
index f2d4fcee28..2d9b76b8f7 100644
--- a/types/glue/tsconfig.json
+++ b/types/glue/tsconfig.json
@@ -21,6 +21,6 @@
   },
   "files": [
     "index.d.ts",
-    "hapi-glue-test.ts"
+    "glue-tests.ts"
   ]
 }
\ No newline at end of file

From 23083887e514e10c6be89a42ec8cb27ad7a84d0d Mon Sep 17 00:00:00 2001
From: Gareth Parker <gareth.parker@century.tech>
Date: Sat, 24 Mar 2018 10:01:39 +0000
Subject: [PATCH 0819/1382] Added typescript version

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

diff --git a/types/glue/index.d.ts b/types/glue/index.d.ts
index e7f12c7a68..39b339e575 100644
--- a/types/glue/index.d.ts
+++ b/types/glue/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/hapijs/glue
 // Definitions by: Gareth Parker <https://github.com/garfty>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
 
 import { Server, ServerOptions } from "hapi";
 

From 4e49fe797e19118bf7b25a462ac94b99e05e6e0c Mon Sep 17 00:00:00 2001
From: Gareth Parker <gareth.parker@century.tech>
Date: Sat, 24 Mar 2018 10:16:02 +0000
Subject: [PATCH 0820/1382] Fixing linting errors

---
 types/glue/index.d.ts | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/types/glue/index.d.ts b/types/glue/index.d.ts
index 39b339e575..e4dfb76e92 100644
--- a/types/glue/index.d.ts
+++ b/types/glue/index.d.ts
@@ -4,18 +4,22 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
+/// <reference types="hapi" />
+
 import { Server, ServerOptions } from "hapi";
 
+// import hapi = require('hapi');
+
 export interface Options {
   relativeTo: string;
-  preConnections?: (Server:Server, next:(err:any)=>void ) => void;
-  preRegister?: (Server:Server, next:(err:any)=>void ) => void;
+  preConnections?: (Server: Server, next:( err: any ) => void ) => void;
+  preRegister?: (Server: Server, next:( err: any ) => void ) => void;
 }
 
 interface Plugin {
   plugin: string | {
-      register:string;
-      options?:any;
+      register: string;
+      options?: any;
   };
   options?: any;
   routes?: any
@@ -24,9 +28,8 @@ interface Plugin {
 interface Manifest {
   server: ServerOptions;
   register?: {
-    plugins: Array<Plugin>
-  }
+    plugins: Plugin[]
+  };
 }
 
 export function compose(manifest: Manifest, options?: Options): Server;
-

From aa39b8c5b18661f82b283387d7c643c858e6ff5a Mon Sep 17 00:00:00 2001
From: Gareth Parker <gareth.parker@century.tech>
Date: Sat, 24 Mar 2018 10:23:18 +0000
Subject: [PATCH 0821/1382] Fixing linting errors

---
 types/glue/index.d.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/types/glue/index.d.ts b/types/glue/index.d.ts
index e4dfb76e92..47cc987f10 100644
--- a/types/glue/index.d.ts
+++ b/types/glue/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for glue
+// Type definitions for glue 5.0
 // Project: https://github.com/hapijs/glue
 // Definitions by: Gareth Parker <https://github.com/garfty>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -12,20 +12,20 @@ import { Server, ServerOptions } from "hapi";
 
 export interface Options {
   relativeTo: string;
-  preConnections?: (Server: Server, next:( err: any ) => void ) => void;
-  preRegister?: (Server: Server, next:( err: any ) => void ) => void;
+  preConnections?: (Server: Server, next: (err: any) => void) => void;
+  preRegister?: (Server: Server, next: (err: any) => void) => void;
 }
 
-interface Plugin {
+export interface Plugin {
   plugin: string | {
       register: string;
       options?: any;
   };
   options?: any;
-  routes?: any
+  routes?: any;
 }
 
-interface Manifest {
+export interface Manifest {
   server: ServerOptions;
   register?: {
     plugins: Plugin[]

From 22385d414c3c042f13862853668b0e725ef820e4 Mon Sep 17 00:00:00 2001
From: Gareth Parker <gareth.parker@century.tech>
Date: Sat, 24 Mar 2018 10:28:15 +0000
Subject: [PATCH 0822/1382] Removed reference to hapi

---
 types/glue/index.d.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/types/glue/index.d.ts b/types/glue/index.d.ts
index 47cc987f10..8e710d233a 100644
--- a/types/glue/index.d.ts
+++ b/types/glue/index.d.ts
@@ -4,12 +4,8 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
-/// <reference types="hapi" />
-
 import { Server, ServerOptions } from "hapi";
 
-// import hapi = require('hapi');
-
 export interface Options {
   relativeTo: string;
   preConnections?: (Server: Server, next: (err: any) => void) => void;

From 64c4bcef505364ffe74ab943a420114df2f268b5 Mon Sep 17 00:00:00 2001
From: ckboyjiy <ckboyjiy@nate.com>
Date: Sat, 24 Mar 2018 20:04:12 +0900
Subject: [PATCH 0823/1382] Added type definitions for Naver maps

---
 types/navermaps/index.d.ts         | 1396 ++++++++++++++--------------
 types/navermaps/navermaps-tests.ts |  205 ++--
 2 files changed, 821 insertions(+), 780 deletions(-)

diff --git a/types/navermaps/index.d.ts b/types/navermaps/index.d.ts
index 994c7218ff..92409a44b0 100644
--- a/types/navermaps/index.d.ts
+++ b/types/navermaps/index.d.ts
@@ -7,28 +7,28 @@ declare namespace naver.maps {
    * Types
    */
   type PointArrayLiteral = [number, number];
-  type PointLiteral = naver.maps.PointArrayLiteral | naver.maps.PointObjectLiteral;
+  type PointLiteral = PointArrayLiteral | PointObjectLiteral;
   type SizeArrayLiteral = [number, number];
-  type SizeLiteral = naver.maps.SizeArrayLiteral | naver.maps.SizeObjectLiteral;
-  type LatLngLiteral = naver.maps.PointLiteral | naver.maps.LatLngObjectLiteral;
+  type SizeLiteral = SizeArrayLiteral | SizeObjectLiteral;
+  type LatLngLiteral = PointLiteral | LatLngObjectLiteral;
   type PointBoundsArrayLiteral = [number, number, number, number];
-  type PointBoundsLiteral = naver.maps.PointBoundsArrayLiteral | naver.maps.PointBoundsObjectLiteral;
-  type LatLngBoundsLiteral = naver.maps.PointBoundsLiteral | naver.maps.LatLngBoundsObjectLiteral;
-  type BoundsLiteral = naver.maps.PointBoundsLiteral | naver.maps.LatLngBoundsLiteral;
-  type CoordLiteral = naver.maps.PointLiteral | naver.maps.LatLngLiteral;
-  type Coord = naver.maps.Point | naver.maps.LatLng;
-  type Bounds = naver.maps.PointBounds | naver.maps.LatLngBounds;
+  type PointBoundsLiteral = PointBoundsArrayLiteral | PointBoundsObjectLiteral;
+  type LatLngBoundsLiteral = PointBoundsLiteral | LatLngBoundsObjectLiteral;
+  type BoundsLiteral = PointBoundsLiteral | LatLngBoundsLiteral;
+  type CoordLiteral = PointLiteral | LatLngLiteral;
+  type Coord = Point | LatLng;
+  type Bounds = PointBounds | LatLngBounds;
   type DOMEvent = Event;
-  type StylingFunction = (feature: naver.maps.Feature) => naver.maps.StyleOptions;
-  type ArrayOfCoords = naver.maps.Point[] | naver.maps.LatLng[];
-  type ArrayOfBounds = naver.maps.PointBounds[] | naver.maps.LatLngBounds[];
-  type ArrayOfBoundsLiteral = naver.maps.PointBoundsLiteral[] | naver.maps.LatLngBoundsLiteral[];
-  type forEachOverlayCallback = (overlay: naver.maps.Marker | naver.maps.Polyline | naver.maps.Polygon, index: number) => void;
-  type GeoJSON = object;
-  type GPX = object;
-  type KML = object;
+  type StylingFunction = (feature: Feature) => StyleOptions;
+  type ArrayOfCoords = Point[] | LatLng[];
+  type ArrayOfBounds = PointBounds[] | LatLngBounds[];
+  type ArrayOfBoundsLiteral = PointBoundsLiteral[] | LatLngBoundsLiteral[];
+  type forEachOverlayCallback = (overlay: Marker | Polyline | Polygon, index: number) => void;
+  type GeoJSON = any;
+  type GPX = any;
+  type KML = any;
   type KVOArrayOfCoords = any;
-  type ArrayOfCoordsLiteral = naver.maps.PointLiteral[] | naver.maps.LatLngLiteral[];
+  type ArrayOfCoordsLiteral = PointLiteral[] | LatLngLiteral[];
   type strokeStyleType = 'solid' | 'shortdash' | 'shortdot' | 'shortdashdot' | 'shortdashdotdot' | 'dot' | 'dash' |
     'longdash' | 'dashdot' | 'longdashdot' | 'longdashdotdot';
   type strokeLineCapType = 'butt' | 'round' | 'square';
@@ -37,46 +37,51 @@ declare namespace naver.maps {
   /**
    * Interfaces
    */
-  export interface PointObjectLiteral {
+   interface MapEventListener {
+     eventName: string;
+     listener: () => any;
+     listenerId: string;
+     target: any;
+   }
+  interface PointObjectLiteral {
     x: number;
     y: number;
   }
-  export interface SizeObjectLiteral {
+  interface SizeObjectLiteral {
     width: number;
     height: number;
   }
-  export interface LatLngObjectLiteral {
+  interface LatLngObjectLiteral {
     lat: number;
     lng: number;
   }
-  export interface PointBoundsObjectLiteral {
+  interface PointBoundsObjectLiteral {
     minX: number;
     minY: number;
     maxX: number;
     maxY: number;
   }
-  export interface LatLngBoundsObjectLiteral {
+  interface LatLngBoundsObjectLiteral {
     north: number;
     east: number;
     south: number;
     west: number;
   }
-  export interface MapSystemProjection extends KVO {
+  interface MapSystemProjection extends KVO {
     factor(zoom: number): number;
-    fromCoordToOffset(coord: naver.maps.Coord): naver.maps.Point;
-    fromCoordToPoint(coord: naver.maps.Coord): naver.maps.Point;
-    fromOffsetToCoord(offset: naver.maps.Point): naver.maps.Coord;
-    fromOffsetToPoint(offset: naver.maps.Point): naver.maps.Point;
-    fromPointToCoord(point: naver.maps.Point): naver.maps.Coord;
-    fromPointToOffset(point: naver.maps.Point): naver.maps.Point;
-    getDestinationCoord(fromCoord: naver.maps.Coord, angle: number, meter: number): naver.maps.Coord;
-    getDistance(coord1: naver.maps.Coord, coord2: naver.maps.Coord): number;
+    fromCoordToOffset(coord: Coord): Point;
+    fromCoordToPoint(coord: Coord): Point;
+    fromOffsetToCoord(offset: Point): Coord;
+    fromOffsetToPoint(offset: Point): Point;
+    fromPointToCoord(point: Point): Coord;
+    fromPointToOffset(point: Point): Point;
+    getDestinationCoord(fromCoord: Coord, angle: number, meter: number): Coord;
+    getDistance(coord1: Coord, coord2: Coord): number;
     getProjectionName(): number;
-    scaleDown(operand: number | naver.maps.Point | naver.maps.Size, zoom: number): number | naver.maps.Point | naver.maps.Size;
-    scaleUp(operand: number | naver.maps.Point | naver.maps.Size, zoom: number): number | naver.maps.Point | naver.maps.Size;
-
+    scaleDown(operand: number | Point | Size, zoom: number): number | Point | Size;
+    scaleUp(operand: number | Point | Size, zoom: number): number | Point | Size;
   }
-  export interface MapOptions {
+  interface MapOptions {
     background?: string;
     baseTileOpacity?: number;
     bounds?: any;
@@ -113,7 +118,7 @@ declare namespace naver.maps {
     zoomControlOptions?: any;
     zoomOrigin?: any;
   }
-  export interface MarkerOptions {
+  interface MarkerOptions {
     animation?: any;
     map?: Map;
     position?: any;
@@ -126,344 +131,349 @@ declare namespace naver.maps {
     visible?: boolean;
     zIndex?: number;
   }
-  export interface MapPanes {
+  interface MapPanes {
     overlayLayer: HTMLElement;
     overlayImage: HTMLElement;
     floatPane: HTMLElement;
   }
-  export interface MapEventListener {
-    eventName: string;
-    listener: Function;
-    listenerId: string;
-    target: object;
-  }
-  export interface InfoWindowOptions {
-    position: naver.maps.Coord | naver.maps.CoordLiteral;
+  interface InfoWindowOptions {
+    position?: Coord | CoordLiteral;
     content: string | HTMLElement;
     zIndex?: number;
     maxWidth?: number;
-    pixelOffset?: naver.maps.Point | naver.maps.PointLiteral;
+    pixelOffset?: Point | PointLiteral;
     backgroundColor?: string;
     borderColor?: string;
     borderWidth?: number;
     disableAutoPan?: boolean;
     disableAnchor?: boolean;
     anchorSkew?: boolean;
-    anchorSize?: naver.maps.Size | naver.maps.SizeLiteral;
+    anchorSize?: Size | SizeLiteral;
     anchorColor?: string;
   }
-  export interface ImageTileOptions {
+  interface ImageTileOptions {
     urls: string[];
-    imgonload?: Function;
-    imgonerror?: Function;
+    imgonload?: () => any;
+    imgonerror?: () => any;
     opacity?: number;
     transition?: boolean;
-    offset?: naver.maps.Point;
+    offset?: Point;
     zIndex?: number;
-    size?: naver.maps.Size;
+    size?: Size;
     pane?: HTMLElement;
   }
-  export interface ImageMapTypeOptions {
+  interface ImageMapTypeOptions {
     name: string;
     maxZoom: number;
     minZoom: number;
-    projection: naver.maps.Projection;
-    tileSize?: naver.maps.Size | naver.maps.SizeLiteral;
+    projection: Projection;
+    tileSize?: Size | SizeLiteral;
     repeatX?: boolean;
     vendor?: string;
-    provider?: naver.maps.MapDataProvider;
+    provider?: MapDataProvider[];
     uid?: string;
     darktheme?: boolean;
-    getTileUrl?: Function;
+    getTileUrl?: () => any;
     tileSet?: string | string[];
   }
-  export interface GroundOverlayOptions {
+  interface GroundOverlayOptions {
     clickable?: boolean;
-    map?: 	naver.maps.Map | null;
+    map?: Map | null;
     opacity?: number;
   }
-  export interface EllipseOptions {
-    map?: naver.maps.Map;
-    bounds: naver.maps.Bounds | naver.maps.BoundsLiteral;
+  interface EllipseOptions {
+    map?: Map;
+    bounds: Bounds | BoundsLiteral;
     strokeWeight?: number;
     strokeOpacity?: number;
     strokeColor?: string;
-    strokeStyle?: naver.maps.strokeStyleType;
-    strokeLineCap?: naver.maps.strokeLineCapType;
-    strokeLineJoin?: naver.maps.strokeLineJoinType;
+    strokeStyle?: strokeStyleType;
+    strokeLineCap?: strokeLineCapType;
+    strokeLineJoin?: strokeLineJoinType;
     fillColor?: string;
     fillOpacity?: number;
     clickable?: boolean;
     visible?: boolean;
     zIndex?: number;
   }
-  export interface FeatureEvent {
-    feature: naver.maps.Feature;
+  interface FeatureEvent {
+    feature: Feature;
   }
-  export interface PointerEvent {
-    coord: naver.maps.Coord;
-    point: naver.maps.Point;
-    offset: naver.maps.Point;
-    pointerEvent: naver.maps.DOMEvent;
-    feature: naver.maps.Feature;
+  interface PointerEvent {
+    coord: Coord;
+    point: Point;
+    offset: Point;
+    pointerEvent: DOMEvent;
+    feature: Feature;
   }
-  export interface PropertyEvent {
-    feature: naver.maps.Feature;
+  interface PropertyEvent {
+    feature: Feature;
     name: string;
     oldValue: any;
     newValue: any;
   }
-  export interface StyleOptions {
+  interface StyleOptions {
     strokeColor?: string;
     strokeOpacity?: number;
     strokeWeight?: number;
     fillColor?: string;
     fillOpacity?: number;
     clickable?: boolean;
-    icon?: string | naver.maps.ImageIcon | naver.maps.SymbolIcon | naver.maps.HtmlIcon;
-    shape?: naver.maps.MarkerShape;
+    icon?: string | ImageIcon | SymbolIcon | HtmlIcon;
+    shape?: MarkerShape;
     title?: string;
     visible?: boolean;
     zIndex?: number;
   }
-  export interface ControlOptions {
-    position: naver.maps.Position;
+  interface ControlOptions {
+    position: Position;
   }
-  export interface CircleOptions {
-    map?: naver.maps.Map;
-    center: naver.maps.Coord | naver.maps.CoordLiteral;
+  interface CircleOptions {
+    map?: Map;
+    center: Coord | CoordLiteral;
     radius?: number;
     strokeWeight?: number;
     strokeOpacity?: number;
     strokeColor?: string;
-    strokeStyle?: naver.maps.strokeStyleType;
-    strokeLineCap?: naver.maps.strokeLineCapType;
-    strokeLineJoin?: naver.maps.strokeLineJoinType;
+    strokeStyle?: strokeStyleType;
+    strokeLineCap?: strokeLineCapType;
+    strokeLineJoin?: strokeLineJoinType;
     fillColor?: string;
     fillOpacity?: number;
     clickable?: boolean;
     visible?: boolean;
     zIndex?: number;
   }
-  export interface TileOptions {
+  interface TileOptions {
     opacity?: number;
     transition?: boolean;
-    offset?: naver.maps.Point;
+    offset?: Point;
     zIndex?: number;
-    size?: naver.maps.Size;
+    size?: Size;
     pane?: HTMLElement;
   }
-  export interface TileIndex {
+  interface TileIndex {
     xIndex: number;
     yIndex: number;
   }
-  export interface CanvasTileOptions {
+  interface CanvasTileOptions {
     imageData?: ImageData;
     opacity?: number;
     transition?: boolean;
-    offset?: naver.maps.Point;
+    offset?: Point;
     zIndex?: number;
-    size?: naver.maps.Size;
+    size?: Size;
     pane?: HTMLElement;
   }
-  export interface CanvasMapTypeOptions {
+  interface CanvasMapTypeOptions {
     name: string;
     maxZoom: number;
     minZoom: number;
-    projection: naver.maps.Projection;
-    tileSize?: naver.maps.Size | naver.maps.SizeLiteral;
+    projection: Projection;
+    tileSize?: Size | SizeLiteral;
     repeatX?: boolean;
     vendor?: string;
-    provider?: naver.maps.MapDataProvider;
+    provider?: MapDataProvider[];
     uid?: string;
     darktheme?: boolean;
-    getTileData?: Function;
+    getTileData?: () => any;
   }
-  export interface MapDataProvider {
+  interface MapDataProvider {
     title: string;
-    link: string;
-    bounds: naver.maps.Bounds | naver.maps.BoundsLiteral | naver.maps.ArrayOfBounds | naver.maps.ArrayOfBoundsLiteral;
+    link?: string;
+    bounds?: Bounds | BoundsLiteral | ArrayOfBounds | ArrayOfBoundsLiteral;
   }
-  export interface MapType {
+  interface MapType {
     maxZoom: number;
     minZoom: number;
     name: string;
-    projection: naver.maps.Projection;
-    tileSize: naver.maps.Size;
-    getTile(x: number, y: number, z: number): HTMLElement | naver.maps.Tile;
+    projection: Projection;
+    tileSize: Size;
+    getTile(x: number, y: number, z: number): HTMLElement | Tile;
   }
-  export interface Projection {
-    fromCoordToPoint(coord: naver.maps.Coord): naver.maps.Point;
-    fromPointToCoord(point: naver.maps.Point): Coord;
+  interface Projection {
+    fromCoordToPoint(coord: Coord): Point;
+    fromPointToCoord(point: Point): Coord;
   }
-  export interface CadastralLayerOptions {
-    overlayMap?: boolean;
-    zIndex?: number;
+  interface CadastralLayerOptions {
+    overlayMap: boolean | undefined;
+    zIndex: number | undefined;
   }
-  export interface AroundControlOptions {
-    position: naver.maps.Position;
+  interface AroundControlOptions {
+    position: Position;
   }
-  export interface NaverImageMapTypeOptions {
+  interface NaverImageMapTypeOptions {
     maxZoom?: number;
     minZoom?: number;
-    projection?: naver.maps.Projection;
-    tileSize?: naver.maps.Size;
+    projection?: Projection;
+    tileSize?: Size;
     hd?: string;
   }
-  export interface LogoControlOptions {
-    position: naver.maps.Position;
+  interface LogoControlOptions {
+    position: Position;
   }
-  export interface MapDataControlOptions {
-    position: naver.maps.Position;
+  interface MapDataControlOptions {
+    position: Position;
   }
-  export interface MapTypeControlOptions {
-    mapTypeIds: naver.maps.MapTypeId[] | null;
-    position: naver.maps.Position;
-    style: naver.maps.MapTypeControlStyle;
+  interface MapTypeControlOptions {
+    mapTypeIds: MapTypeId[] | null;
+    position: Position;
+    style: MapTypeControlStyle;
   }
-  export interface ScaleControlOptions {
-    position: naver.maps.Position;
+  interface ScaleControlOptions {
+    position: Position;
   }
-  export interface ZoomControlOptions {
-    position: naver.maps.Position;
-    style: naver.maps.ZoomControlStyle;
+  interface ZoomControlOptions {
+    position: Position;
+    style: ZoomControlStyle;
     legendDisabled: boolean;
   }
-  export interface LayerOptions {
+  interface LayerOptions {
     hd: boolean;
-    overlayMap: boolean;
-    zIndex: number;
+    overlayMap: boolean | undefined;
+    zIndex: number | undefined;
   }
-  export interface CadastralLayerOptions {
-    overlayMap: boolean;
-    zIndex: number;
+  interface CadastralLayerOptions {
+    overlayMap: boolean | undefined;
+    zIndex: number | undefined;
   }
-  export interface StreetLayerOptions {
-    overlayMap: boolean;
-    zIndex: number;
+  interface StreetLayerOptions {
+    overlayMap: boolean | undefined;
+    zIndex: number | undefined;
   }
-  export interface TrafficLayerOptions {
+  interface TrafficLayerOptions {
     interval: number;
-    overlayMap: boolean;
-    zIndex: number;
+    overlayMap: boolean | undefined;
+    zIndex: number | undefined;
   }
-  export interface HtmlIcon {
+  interface HtmlIcon {
     content: string | HTMLElement;
-    size?: naver.maps.Size | naver.maps.SizeLiteral;
-    anchor?: naver.maps.Point | naver.maps.PointLiteral | naver.maps.Position;
+    size?: Size | SizeLiteral;
+    anchor?: Point | PointLiteral | Position;
   }
-  export interface ImageIcon {
+  interface ImageIcon {
     url: string;
-    size?: naver.maps.Size | naver.maps.SizeLiteral;
-    scaledSize?: naver.maps.Size |naver.maps. SizeLiteral;
-    origin?: naver.maps.Point | naver.maps.PointLiteral;
-    anchor?: naver.maps.Point | naver.maps.PointLiteral | naver.maps.Position;
+    size?: Size | SizeLiteral;
+    scaledSize?: Size | SizeLiteral;
+    origin?: Point | PointLiteral;
+    anchor?: Point | PointLiteral | Position;
   }
-  export interface MarkerShape {
+  interface MarkerShape {
     coords: any[];
     type: string;
   }
-  export interface SymbolIcon {
-    path: naver.maps.SymbolPath | naver.maps.Point[] | naver.maps.PointLiteral[];
-    style?: naver.maps.SymbolStyle;
+  interface SymbolIcon {
+    path: SymbolPath | Point[] | PointLiteral[];
+    style?: SymbolStyle;
     radius?: number;
     fillColor?: string;
     fillOpacity?: number;
     strokeColor?: string;
     strokeWeight?: number;
     strokeOpacity?: number;
-    anchor?: naver.maps.Point | naver.maps.PointLiteral | naver.maps.Position;
+    anchor?: Point | PointLiteral | Position;
   }
-  export interface PolygonOptions {
-    map?: naver.maps.Map;
-    paths: naver.maps.ArrayOfCoords[] | naver.maps.KVOArrayOfCoords[] | naver.maps.ArrayOfCoordsLiteral[];
+  interface PolygonOptions {
+    map?: Map;
+    paths: ArrayOfCoords[] | KVOArrayOfCoords[] | ArrayOfCoordsLiteral[];
     strokeWeight?: number;
     strokeOpacity?: number;
     strokeColor?: string;
-    strokeStyle?: naver.maps.strokeStyleType;
-    strokeLineCap?: naver.maps.strokeLineCapType;
-    strokeLineJoin?: naver.maps.strokeLineJoinType;
+    strokeStyle?: strokeStyleType;
+    strokeLineCap?: strokeLineCapType;
+    strokeLineJoin?: strokeLineJoinType;
     fillColor?: string;
     fillOpacity?: number;
     clickable?: boolean;
     visible?: boolean;
     zIndex?: number;
   }
-  export interface PolylineOptions {
-    map?: naver.maps.Map;
-    path: naver.maps.ArrayOfCoords | naver.maps.KVOArrayOfCoords | naver.maps.ArrayOfCoordsLiteral;
+  interface PolylineOptions {
+    map?: Map;
+    path: ArrayOfCoords | KVOArrayOfCoords | ArrayOfCoordsLiteral;
     strokeWeight?: number;
     strokeOpacity?: number;
     strokeColor?: string;
-    strokeStyle?: naver.maps.strokeStyleType;
-    strokeLineCap?: naver.maps.strokeLineCapType;
-    strokeLineJoin?: naver.maps.strokeLineJoinType;
+    strokeStyle?: strokeStyleType;
+    strokeLineCap?: strokeLineCapType;
+    strokeLineJoin?: strokeLineJoinType;
     clickable?: boolean;
     visible?: boolean;
     zIndex?: number;
-    startIcon?: naver.maps.PointingIcon;
+    startIcon?: PointingIcon;
     startIconSize?: number;
-    endIcon?: naver.maps.PointingIcon;
+    endIcon?: PointingIcon;
     endIconSize?: number;
   }
-  export interface RectangleOptions {
-    map?: naver.maps.Map;
-    bounds: naver.maps.Bounds | naver.maps.BoundsLiteral;
+  interface RectangleOptions {
+    map?: Map;
+    bounds: Bounds | BoundsLiteral;
     strokeWeight?: number;
     strokeOpacity?: number;
     strokeColor?: string;
-    strokeStyle?: naver.maps.strokeStyleType;
-    strokeLineCap?: naver.maps.strokeLineCapType;
-    strokeLineJoin?: naver.maps.strokeLineJoinType;
+    strokeStyle?: strokeStyleType;
+    strokeLineCap?: strokeLineCapType;
+    strokeLineJoin?: strokeLineJoinType;
     fillColor?: string;
     fillOpacity?: number;
     clickable?: boolean;
     visible?: boolean;
     zIndex?: number;
   }
-  export interface PanoramaOptions {
-    size: naver.maps.Size | naver.maps.SizeLiteral;
+  interface PanoramaOptions {
+    size: Size | SizeLiteral;
     panoId: string;
-    position: naver.maps.LatLng | naver.maps.LatLngLiteral;
-    pov: naver.maps.PanoramaPov;
+    position: LatLng | LatLngLiteral;
+    pov: PanoramaPov;
     visible: boolean;
     minScale: number;
     maxScale: number;
     minZoom: number;
     maxZoom: number;
     logoControl: boolean;
-    logoControlOptions: naver.maps.LogoControlOptions;
+    logoControlOptions: LogoControlOptions;
     zoomControl: boolean;
-    zoomControlOptions: naver.maps.ZoomControlOptions;
+    zoomControlOptions: ZoomControlOptions;
     aroundControl: boolean;
-    aroundControlOptions: naver.maps.AroundControlOptions;
+    aroundControlOptions: AroundControlOptions;
   }
-  export interface PanoramaPov {
+  interface PanoramaPov {
     pan: number;
     tilt: number;
     fov: number;
   }
-  export interface PanoramaLocation {
+  interface PanoramaLocation {
     panoId: string;
     title: string;
     address: string;
-    coord: naver.maps.LatLng;
+    coord: LatLng;
     photodate: string;
   }
-  export interface DOMEventListener {
+  interface DOMEventListener {
     eventName: string;
-    listener: Function;
+    listener: () => any;
     target: HTMLElement;
   }
+  interface Margin {
+    top?: number;
+    right?: number;
+    bottom?: number;
+    left?: number;
+  }
+
+  interface TransitionOptions {
+    duration?: number;
+    easing?: string;
+  }
 
   /**
    * Enums
    */
-  export enum MapTypeControlStyle {
+  enum MapTypeControlStyle {
     BUTTON,
     DROPDOWN
   }
-  export enum ZoomControlStyle {
+  enum ZoomControlStyle {
     LARGE,
     SMALL
   }
@@ -471,25 +481,26 @@ declare namespace naver.maps {
   /**
    * Members
    */
-  export enum Animation {
+  enum Animation {
     BOUNCE = 1,
     DROP
   }
   let jsContentLoaded: boolean;
-  export enum MapTypeId { // TODO. 확실하지 않음
-    NORMAL,
-    TERRAIN,
-    SATELLITE,
-    HYBRID
+  type MapTypeId = string;
+  namespace MapTypeId { // TODO. 확실하지 않음
+    let NORMAL: string;
+    let TERRAIN: string;
+    let SATELLITE: string;
+    let HYBRID: string;
   }
-  export function onJSContentLoaded(...args: any[]): any;
-  export enum PointingIcon {
+  function onJSContentLoaded(...args: any[]): any;
+  enum PointingIcon {
     OPEN_ARROW = 1,
     BLOCK_ARROW,
     CIRCLE,
     DIAMOND
   }
-  export enum Position {
+  enum Position {
     CENTER = 0,
     TOP_LEFT,
     TOP_CENTER,
@@ -504,39 +515,40 @@ declare namespace naver.maps {
     BOTTOM_CENTER,
     BOTTOM_RIGHT
   }
-  export enum SymbolPath {
+  enum SymbolPath {
     BACKWARD_CLOSED_ARROW = 1,
     BACKWARD_OPEN_ARROW,
     CIRCLE,
     FORWARD_CLOSED_ARROW,
     FORWARD_OPEN_ARROW
   }
-  export enum SymbolStyle {
-    CIRCLE = 'circle',
-    PATH = 'path',
-    CLOSED_PATH = 'closedPath'
+  type SymbolStyle = string;
+  namespace SymbolStyle {
+    let CIRCLE: string;
+    let PATH: string;
+    let CLOSED_PATH: string;
   }
 
   /**
    * Classes
    */
-    // KVO
-  export class KVO {
+  // KVO
+  class KVO {
     constructor();
-    addListener(eventName: any, listener: Function): naver.maps.MapEventListener;
-    addListenerOnce(eventName: string | any, listener: Function): naver.maps.MapEventListener;
-    bindTo(key: string, target: naver.maps.KVO, targetKey?: string): void;
+    addListener(eventName: any, listener: () => any): MapEventListener;
+    addListenerOnce(eventName: any, listener: () => any): MapEventListener;
+    bindTo(key: string, target: KVO, targetKey?: string): void;
     clearListeners(eventName: string): void;
     get(key: string): any;
     hasListener(eventName: string): boolean;
-    removeListener(listeners: naver.maps.MapEventListener | MapEventListener[]): void;
+    removeListener(listeners: MapEventListener | MapEventListener[]): void;
     set(key: string, value: any, silently?: boolean): void;
-    setValues(properties: object): void;
+    setValues(properties: any): void;
     trigger(eventName: string, eventObject?: any): void;
     unbind(key: string): void;
     unbindAll(): void;
   }
-  export class KVOArray extends naver.maps.KVO {
+  class KVOArray extends KVO {
     constructor(array: any[]);
     clear(): void;
     forEach(callback: (element: any, index: number) => void): void;
@@ -553,533 +565,559 @@ declare namespace naver.maps {
     splice(startIndex: number, deleteCount: number, element?: any): any[];
   }
   // Base
-  export class Point {
+  class Point {
     constructor(x: number, y: number);
-    add(point: naver.maps.Coord | naver.maps.PointLiteral): naver.maps.Point;
-    add(x: number, y: number): naver.maps.Point;
-    ceil(): naver.maps.Point;
-    clone(): naver.maps.Point;
-    div(point: naver.maps.Coord | naver.maps.PointLiteral);
-    div(x: number, y: number): naver.maps.Point;
-    equals(point: naver.maps.Point): boolean;
-    floor(): naver.maps.Point;
-    mul(point: naver.maps.Coord | naver.maps.PointLiteral): naver.maps.Point;
-    mul(x: number, y: number): naver.maps.Point;
-    round(): naver.maps.Point;
-    sub(point: naver.maps.Coord | naver.maps.PointLiteral): naver.maps.Point;
-    sub(x: number, y: number): naver.maps.Point;
+    add(point: Coord | PointLiteral): Point;
+    add(x: number, y: number): Point;
+    ceil(): Point;
+    clone(): Point;
+    div(point: Coord | PointLiteral): void;
+    div(x: number, y: number): Point;
+    equals(point: Point): boolean;
+    floor(): Point;
+    mul(point: Coord | PointLiteral): Point;
+    mul(x: number, y: number): Point;
+    round(): Point;
+    sub(point: Coord | PointLiteral): Point;
+    sub(x: number, y: number): Point;
     toString(): string;
   }
-  export class Size {
+  class Size {
+    width: number;
+    height: number;
     constructor(width: number, height: number);
-    add(size: naver.maps.Size | naver.maps.SizeLiteral): naver.maps.Size;
-    add(width: number, height: number): naver.maps.Size;
-    ceil(): naver.maps.Size;
-    clone(): naver.maps.Size;
-    div(width: number, height: number): naver.maps.Size;
-    div(size: naver.maps.Size | naver.maps.SizeLiteral): naver.maps.Size;
-    equals(size: naver.maps.Size | naver.maps.SizeLiteral): boolean;
-    floor(): naver.maps.Size;
-    mul(size: naver.maps.Size | naver.maps.SizeLiteral): naver.maps.Size;
-    mul(width: number, height: number): naver.maps.Size;
-    round(): naver.maps.Size;
-    sub(size: naver.maps.Size | naver.maps.SizeLiteral): naver.maps.Size;
-    sub(width: number, height: number): naver.maps.Size;
+    add(size: Size | SizeLiteral): Size;
+    add(width: number, height: number): Size;
+    ceil(): Size;
+    clone(): Size;
+    div(width: number, height: number): Size;
+    div(size: Size | SizeLiteral): Size;
+    equals(size: Size | SizeLiteral): boolean;
+    floor(): Size;
+    mul(size: Size | SizeLiteral): Size;
+    mul(width: number, height: number): Size;
+    round(): Size;
+    sub(size: Size | SizeLiteral): Size;
+    sub(width: number, height: number): Size;
     toString(): string;
   }
-  export class PointBounds {
-    constructor(minPoint: naver.maps.Point, maxPoint: naver.maps.Point);
-    static bounds(point: naver.maps.Coord | naver.maps.PointLiteral,
-                  pointN: naver.maps.Coord | naver.maps.PointLiteral): naver.maps.PointBounds;
-    clone(): naver.maps.PointBounds;
-    equals(bounds: naver.maps.Bounds | naver.maps.PointBoundsLiteral): boolean;
-    extend(point: naver.maps.Coord | naver.maps.PointLiteral): naver.maps.PointBounds;
-    getCenter(): naver.maps.Point;
-    getMax(): naver.maps.Point;
-    getMin(): naver.maps.Point;
-    hasBounds(bounds: naver.maps.Bounds | naver.maps.PointBoundsLiteral): boolean;
-    hasPoint(point: naver.maps.Coord | naver.maps.PointLiteral): boolean;
-    intersects(bounds: naver.maps.Bounds | naver.maps.PointBoundsLiteral): boolean;
+  class PointBounds {
+    constructor(minPoint: Point, maxPoint: Point);
+    static bounds(point: Coord | PointLiteral,
+                  pointN: Coord | PointLiteral): PointBounds;
+    clone(): PointBounds;
+    equals(bounds: Bounds | PointBoundsLiteral): boolean;
+    extend(point: Coord | PointLiteral): PointBounds;
+    getCenter(): Point;
+    getMax(): Point;
+    getMin(): Point;
+    hasBounds(bounds: Bounds | PointBoundsLiteral): boolean;
+    hasPoint(point: Coord | PointLiteral): boolean;
+    intersects(bounds: Bounds | PointBoundsLiteral): boolean;
     maxX(): number;
     maxY(): number;
     minX(): number;
     minY(): number;
     toString(): string;
-    union(bounds: naver.maps.Bounds | naver.maps.PointBoundsLiteral): naver.maps.PointBounds;
+    union(bounds: Bounds | PointBoundsLiteral): PointBounds;
   }
-  export class LatLng extends Point {
+  class LatLng extends Point {
     constructor(lat: number, lng: number);
-    clone(): naver.maps.LatLng;
-    destinationPoint(angle: number, meter: number): naver.maps.LatLng;
-    equals(point: naver.maps.Coord | naver.maps.LatLngLiteral): boolean;
+    clone(): LatLng;
+    destinationPoint(angle: number, meter: number): LatLng;
+    equals(point: Coord | LatLngLiteral): boolean;
     lat(): number;
     lng(): number;
-    toPoint(): naver.maps.Point;
+    toPoint(): Point;
     toString(): string;
   }
-  export class LatLngBounds extends PointBounds {
-    constructor(sw: naver.maps.LatLng, ne: naver.maps.LatLng);
-    static bounds(latlng: naver.maps.Coord | naver.maps.LatLngLiteral,
-                  latlngN: naver.maps.Coord | naver.maps.LatLngLiteral): naver.maps.LatLngBounds;
-    clone(): naver.maps.LatLngBounds;
+  class LatLngBounds extends PointBounds {
+    constructor(sw: LatLng, ne: LatLng);
+    static bounds(latlng: Coord | LatLngLiteral,
+                  latlngN: Coord | LatLngLiteral): LatLngBounds;
+    clone(): LatLngBounds;
     east(): number;
-    equals(bounds: naver.maps.Bounds | naver.maps.LatLngBoundsLiteral): boolean;
-    extend(latlng: naver.maps.Coord | naver.maps.LatLngLiteral): naver.maps.LatLngBounds;
-    getCenter(): naver.maps.LatLng;
-    getNE(): naver.maps.LatLng;
-    getSW(): naver.maps.LatLng;
-    hasLatLng(latlng: naver.maps.Coord | naver.maps.LatLngLiteral): boolean;
-    intersects(bounds: naver.maps.Bounds | naver.maps.LatLngBoundsLiteral): boolean;
+    equals(bounds: Bounds | LatLngBoundsLiteral): boolean;
+    extend(latlng: Coord | LatLngLiteral): LatLngBounds;
+    getCenter(): LatLng;
+    getNE(): LatLng;
+    getSW(): LatLng;
+    hasLatLng(latlng: Coord | LatLngLiteral): boolean;
+    intersects(bounds: Bounds | LatLngBoundsLiteral): boolean;
     north(): number;
     south(): number;
-    toPointBounds(): naver.maps.PointBounds;
-    union(bounds: naver.maps.Bounds | naver.maps.LatLngBoundsLiteral): naver.maps.LatLngBounds;
+    toPointBounds(): PointBounds;
+    union(bounds: Bounds | LatLngBoundsLiteral): LatLngBounds;
     west(): number;
   }
   // Map
-  export class Map {
+  class Map extends KVO {
     controls: any;
     data: any;
     layers: any;
     mapTypes: any;
     mapSystemProjection: any;
-    constructor(mapDiv: string, mapOptions: MapOptions);
+    constructor(mapDiv: string, mapOptions?: MapOptions);
     addPane(name: string, elementOrIndex: HTMLElement | number): void;
     destory(): void;
-    fitBounds(bounds: any, margin: any): void;
-    getBounds(): any;
-    getSize(): any;
+    fitBounds(bounds: any, margin?: any): void;
+    getBounds(): Bounds;
+    getCenter(): Coord;
+    getCenterPoint(): Coord;
+    getElement(): HTMLElement;
+    getMapTypeId(): string;
+    getOptions(key?: string): any;
+    getPanes(): MapPanes;
+    getPrimitiveProjection(): Projection;
+    getProjection(): MapSystemProjection;
+    getSize(): Size;
+    getZoom(): number;
+    morph(coord: Coord | CoordLiteral, zoom?: number, transitionOptions?: TransitionOptions): void;
+    panBy(offset: Point | PointLiteral): void;
+    panTo(coord: Coord | CoordLiteral, transitionOptions: TransitionOptions): void;
+    panToBounds(bounds: Bounds | BoundsLiteral, transitionOptions: TransitionOptions, margin?: Margin): void;
+    refresh(noEffect?: boolean): void;
+    removePane(name: string): void;
+    setCenter(center: Coord | CoordLiteral): void;
+    setCenterPoint(point: Point | PointLiteral): void;
+    setMapTypeId(mapTypeId: string): void;
+    setOptions(newOptionsOrKey: any, value?: any): void;
+    setSize(size: Size | SizeLiteral): void;
+    setZoom(zoom: number, effect?: boolean): void;
+    updateBy(coord: Coord | CoordLiteral, zoom: number): void;
+    zoomBy(deltaZoom: number, zoomOrigin?: Coord | CoordLiteral, effect?: boolean): void;
   }
   // Map.Tile
-  export class Tile extends naver.maps.KVO {
-    constructor(element: HTMLElement, tileOptions?: naver.maps.TileOptions);
+  class Tile extends KVO {
+    constructor(element: HTMLElement, tileOptions?: TileOptions);
     appendTo(parentNode: HTMLElement): void;
     cancelFadeIn(): void;
     destroy(): void;
-    fadeIn(callback: Function, startOpacity?: number): void;
+    fadeIn(callback: () => any, startOpacity?: number): void;
     getElement(): HTMLElement;
-    getOffset(): naver.maps.Point;
+    getOffset(): Point;
     getOpacity(): number;
-    getSize(): naver.maps.Size;
-    getTileIndex(): naver.maps.TileIndex;
+    getSize(): Size;
+    getTileIndex(): TileIndex;
     getZIndex(): number;
     hide(): void;
-    load(tileOptions?: naver.maps.TileOptions): void;
+    load(tileOptions?: TileOptions): void;
     remove(): void;
-    reset(mapType: naver.maps.MapType, zoom: number, tileOptions?: naver.maps.TileOptions): void;
+    reset(mapType: MapType, zoom: number, tileOptions?: TileOptions): void;
     setBlank(): void;
-    setOffset(offset: naver.maps.Point): void;
+    setOffset(offset: Point): void;
     setOffset(x: number, y: number): void;
     setOpacity(opacity: number): void;
-    setSize(size: naver.maps.Size): void;
-    setTileIndex(tileIndex: naver.maps.TileIndex): void;
+    setSize(size: Size): void;
+    setTileIndex(tileIndex: TileIndex): void;
     setZIndex(zIndex: number): void;
     show(): void;
-
   }
-  export class CanvasTile extends naver.maps.Tile {
-    constructor(canvasTileOptions: naver.maps.CanvasTileOptions);
+  class CanvasTile extends Tile {
+    constructor(canvasTileOptions: CanvasTileOptions);
   }
-  export class ImageTile extends naver.maps.Tile {
-    constructor(imageTileOptions: naver.maps.ImageTileOptions);
+  class ImageTile extends Tile {
+    constructor(imageTileOptions: ImageTileOptions);
     getImageElements(): HTMLElement[];
     getUrls(): string[];
     setUrls(urls: string[]): void;
   }
   // Map.MapType
-  export class CanvasMapType implements naver.maps.MapType {
+  class CanvasMapType implements MapType {
     maxZoom: number;
     minZoom: number;
     name: string;
-    projection: naver.maps.Projection;
-    tileSize: naver.maps.Size;
-    constructor(canvasMapTypeOptions: naver.maps.CanvasMapTypeOptions);
-    getMapTypeOptions(): naver.maps.CanvasMapTypeOptions;
+    projection: Projection;
+    tileSize: Size;
+    constructor(canvasMapTypeOptions: CanvasMapTypeOptions);
+    getMapTypeOptions(): CanvasMapTypeOptions;
     getMaxZoom(): number;
     getMinZoom(): number;
     getName(): string;
-    getTile(x: number, y: number, z: number): naver.maps.CanvasTile;
+    getTile(x: number, y: number, z: number): CanvasTile;
     getTileData(x: number, y: number, z: number): ImageData;
-    setMapTypeOptions(canvasMapTypeOptions: naver.maps.CanvasMapTypeOptions): void;
+    setMapTypeOptions(canvasMapTypeOptions: CanvasMapTypeOptions): void;
   }
-  export class ImageMapType implements naver.maps.MapType {
+  class ImageMapType implements MapType {
     maxZoom: number;
     minZoom: number;
     name: string;
-    projection: naver.maps.Projection;
-    tileSize: naver.maps.Size;
-    constructor(imageMapTypeOptions);
-    getMapTypeOptions(): naver.maps.ImageMapTypeOptions;
+    projection: Projection;
+    tileSize: Size;
+    constructor(imageMapTypeOptions: ImageMapTypeOptions);
+    getMapTypeOptions(): ImageMapTypeOptions;
     getMaxZoom(): number;
     getMinZoom(): number;
     getName(): string;
-    getTile(x: number, y: number, z: number): naver.maps.ImageTile;
+    getTile(x: number, y: number, z: number): ImageTile;
     getTileUrls(x: number, y: number, z: number): string[];
-    setMapTypeOptions(imageMapTypeOptions: naver.maps.ImageMapTypeOptions): void;
+    setMapTypeOptions(imageMapTypeOptions: ImageMapTypeOptions): void;
   }
-  export class MapTypeRegistry extends naver.maps.KVO {
-    constructor(mapTypeInfo: object, defaultMapTypeId?: string);
+  class MapTypeRegistry extends KVO {
+    constructor(mapTypeInfo?: any, defaultMapTypeId?: string);
     getPreviousTypeId(): string;
-    getSelectedType(): naver.maps.MapType;
+    getSelectedType(): MapType;
     getSelectedTypeId(): string;
     getTypeIds(): string[];
-    set(mapTypeId: string, mapType: naver.maps.MapType): void;
+    set(mapTypeId: string, mapType: MapType): void;
     setSelectedTypeId(mapTypeId: string): void;
   }
+
   // Map.MapType.Preset
-  export class NaverMapTypeOption {
-    constructor(options: naver.maps.NaverImageMapTypeOptions);
-    static getBicycleLayer(opts: naver.maps.NaverImageMapTypeOptions): naver.maps.ImageMapType;
-    static getBlankMap(opts: naver.maps.NaverImageMapTypeOptions): naver.maps.ImageMapType;
-    static getCadastralLayer(opts?: naver.maps.NaverImageMapTypeOptions): naver.maps.ImageMapType;
-    static getHybridMap(opts?: naver.maps.NaverImageMapTypeOptions): naver.maps.ImageMapType;
-    static getMapTypes(opts?: naver.maps.NaverImageMapTypeOptions): naver.maps.MapTypeRegistry;
-    static getNormalLabelLayer(opts?: naver.maps.NaverImageMapTypeOptions): naver.maps.ImageMapType;
-    static getNormalMap(opts?: naver.maps.NaverImageMapTypeOptions): naver.maps.ImageMapType;
-    static getSatelliteLabelLayer(opts?: naver.maps.NaverImageMapTypeOptions): naver.maps.ImageMapType;
-    static getSatelliteMap(opts?: naver.maps.NaverImageMapTypeOptions): naver.maps.ImageMapType;
-    static getStreetLayer(opts?: naver.maps.NaverImageMapTypeOptions): naver.maps.ImageMapType;
-    static getTerrainMap(opts?: naver.maps.NaverImageMapTypeOptions): naver.maps.ImageMapType;
-    static getTrafficLayer(opts?: naver.maps.NaverImageMapTypeOptions): naver.maps.ImageMapType;
-    static getVectorMap(opts?: naver.maps.NaverImageMapTypeOptions): naver.maps.ImageMapType;
-    static getWorldMap(opts?: naver.maps.NaverImageMapTypeOptions): naver.maps.ImageMapType;
+  function NaverMapTypeOption(options: NaverImageMapTypeOptions): void;
+  namespace NaverMapTypeOption {
+    function getBicycleLayer(opts: NaverImageMapTypeOptions): ImageMapType;
+    function getBlankMap(opts: NaverImageMapTypeOptions): ImageMapType;
+    function getCadastralLayer(opts?: NaverImageMapTypeOptions): ImageMapType;
+    function getHybridMap(opts?: NaverImageMapTypeOptions): ImageMapType;
+    function getMapTypes(opts?: NaverImageMapTypeOptions): MapTypeRegistry;
+    function getNormalLabelLayer(opts?: NaverImageMapTypeOptions): ImageMapType;
+    function getNormalMap(opts?: NaverImageMapTypeOptions): ImageMapType;
+    function getSatelliteLabelLayer(opts?: NaverImageMapTypeOptions): ImageMapType;
+    function getSatelliteMap(opts?: NaverImageMapTypeOptions): ImageMapType;
+    function getStreetLayer(opts?: NaverImageMapTypeOptions): ImageMapType;
+    function getTerrainMap(opts?: NaverImageMapTypeOptions): ImageMapType;
+    function getTrafficLayer(opts?: NaverImageMapTypeOptions): ImageMapType;
+    function getVectorMap(opts?: NaverImageMapTypeOptions): ImageMapType;
+    function getWorldMap(opts?: NaverImageMapTypeOptions): ImageMapType;
   }
+
   // Control
-  export class CustomControl extends naver.maps.KVO {
-    constructor(html: string, ControlOptions: naver.maps.ControlOptions);
+  class CustomControl extends KVO {
+    constructor(html: string, ControlOptions: ControlOptions);
     getElement(): HTMLElement;
-    getMap(): naver.maps.Map | null;
+    getMap(): Map | null;
     getOptions(key?: string): any;
     html(html?: string): string | undefined;
-    setMap(map?: naver.maps.Map | null): void;
-    setOptions(newOptions: naver.maps.ControlOptions): void;
-    setPosition(position: naver.maps.Position): void;
+    setMap(map?: Map | null): void;
+    setOptions(newOptions: ControlOptions): void;
+    setPosition(position: Position): void;
   }
   // Naver Controls
-  export class LogoControl extends naver.maps.CustomControl {
-    constructor(LogoControlOptions: naver.maps.LogoControlOptions);
+  class LogoControl extends CustomControl {
+    constructor(LogoControlOptions: LogoControlOptions);
   }
-  export class MapDataControl extends naver.maps.CustomControl {
-    constructor(MapDataControlOptions);
+  class MapDataControl extends CustomControl {
+    constructor(MapDataControlOptions: MapDataControlOptions);
   }
-  export class MapTypeControl extends naver.maps.CustomControl {
-    constructor(MapTypeControlOptions: naver.maps.MapTypeControlOptions);
+  class MapTypeControl extends CustomControl {
+    constructor(MapTypeControlOptions: MapTypeControlOptions);
   }
-  export class ScaleControl extends naver.maps.CustomControl {
-    constructor(ScaleControlOptions: naver.maps.ScaleControlOptions);
+  class ScaleControl extends CustomControl {
+    constructor(ScaleControlOptions: ScaleControlOptions);
   }
-  export class ZoomControl extends naver.maps.CustomControl {
-    constructor(ZoomControlOptions);
+  class ZoomControl extends CustomControl {
+    constructor(ZoomControlOptions: ZoomControlOptions);
   }
   // Layer
-  export class Layer extends naver.maps.KVO {
-    constructor(name: string, MapTypeRegistry: naver.maps.MapTypeRegistry, options: naver.maps.LayerOptions);
-    getLayerType(): naver.maps.MapType;
+  class Layer extends KVO {
+    constructor(name: string, MapTypeRegistry: MapTypeRegistry, options: LayerOptions);
+    getLayerType(): MapType;
     getLayerTypeId(): string;
-    getMap(): naver.maps.Map | null;
+    getMap(): Map | null;
     getOpacity(): number;
     getPaneElement(): HTMLElement;
     refresh(noEffect?: boolean): void;
     setLayerTypeId(typeId: string): void;
-    setMap(map: naver.maps.Map | null): void;
+    setMap(map: Map | null): void;
     setOpacity(opacity: number): void;
   }
   // Naver Layers
-  export class LabelLayer extends naver.maps.Layer {
-    constructor(name: string, registry: naver.maps.ImageMapType, option: object);
+  class LabelLayer extends Layer {
+    constructor(name: string, registry: ImageMapType, option: any);
   }
-  export class CadastralLayer extends naver.maps.LabelLayer {
+  class CadastralLayer extends LabelLayer {
     name: string;
-    constructor(option?: naver.maps.CadastralLayerOptions);
+    constructor(option?: CadastralLayerOptions);
   }
-  export class StreetLayer extends naver.maps.LabelLayer {
+  class StreetLayer extends LabelLayer {
     name: string;
-    constructor(option?: naver.maps.StreetLayerOptions);
+    constructor(option?: StreetLayerOptions);
   }
-  export class TrafficLayer extends naver.maps.LabelLayer {
+  class TrafficLayer extends LabelLayer {
     name: string;
-    constructor(option?: naver.maps.TrafficLayerOptions);
+    constructor(option?: TrafficLayerOptions);
     endAutoRefresh(): void;
     startAutoRefresh(): void;
   }
   // Data Layer
-  export class Data extends naver.maps.KVO {
+  class Data extends KVO {
     constructor();
-    addFeature(feature: naver.maps.Feature, autoStyle: boolean): void;
-    addGeoJson(geojson: naver.maps.GeoJSON, autoStyle: boolean): void;
-    addGpx(xmlDoc: naver.maps.GPX, autoStyle: boolean): void;
-    addKml(xmlDoc: naver.maps.KML, autoStyle: boolean): void;
-    forEach(callback: (feature: naver.maps.Feature, index: number) => void): void;
-    getAllFeature(): naver.maps.Feature[];
-    getFeatureById(id: string | number): naver.maps.Feature;
-    getMap(): naver.maps.Map | null;
-    getStyle(): naver.maps.StyleOptions | naver.maps.StylingFunction;
-    overrideStyle(feature: naver.maps.Feature, style: naver.maps.StyleOptions): void;
-    removeFeature(feature: naver.maps.Feature): void;
-    removeGeoJson(geojson: naver.maps.GeoJSON): void;
-    revertStyle(feature: naver.maps.Feature): void;
-    setMap(map: naver.maps.Map | null): void;
-    setStyle(style: naver.maps.StyleOptions | naver.maps.StylingFunction): void;
-    toGeoJson(): naver.maps.GeoJSON;
+    addFeature(feature: Feature, autoStyle: boolean): void;
+    addGeoJson(geojson: GeoJSON, autoStyle: boolean): void;
+    addGpx(xmlDoc: GPX, autoStyle: boolean): void;
+    addKml(xmlDoc: KML, autoStyle: boolean): void;
+    forEach(callback: (feature: Feature, index: number) => void): void;
+    getAllFeature(): Feature[];
+    getFeatureById(id: string | number): Feature;
+    getMap(): Map | null;
+    getStyle(): StyleOptions | StylingFunction;
+    overrideStyle(feature: Feature, style: StyleOptions): void;
+    removeFeature(feature: Feature): void;
+    removeGeoJson(geojson: GeoJSON): void;
+    revertStyle(feature: Feature): void;
+    setMap(map: Map | null): void;
+    setStyle(style: StyleOptions | StylingFunction): void;
+    toGeoJson(): GeoJSON;
   }
-  export class Feature extends naver.maps.KVO {
-    constructor(rawFeature: object);
-    forEachOverlay(callback: naver.maps.forEachOverlayCallback): void;
-    getBounds(): naver.maps.Bounds;
-    getGeometries(): naver.maps.Geometry[];
+  class Feature extends KVO {
+    constructor(rawFeature: any);
+    forEachOverlay(callback: forEachOverlayCallback): void;
+    getBounds(): Bounds;
+    getGeometries(): Geometry[];
     getId(): string;
-    getOverlays(): naver.maps.Marker[] | naver.maps.Polyline[] | naver.maps.Polygon[];
+    getOverlays(): Marker[] | Polyline[] | Polygon[];
     getProperty(name: string): any;
-    getRaw(): naver.maps.GeoJSON;
+    getRaw(): GeoJSON;
     setProperty(name: string, value: any): void;
-    setStyle(styleOptions: naver.maps.StyleOptions); // naver.maps.Data.StyleOptions
+    setStyle(styleOptions: StyleOptions): void; // Data.StyleOptions
   }
-  export class Geometry extends naver.maps.KVO {
-    constructor(rawGeometry: object);
-    getCoords(): naver.maps.ArrayOfCoords;
+  class Geometry extends KVO {
+    constructor(rawGeometry: any);
+    getCoords(): ArrayOfCoords;
     getType(): string;
   }
   // Overlay
-  export abstract class OverlayView extends naver.maps.KVO {
+  class OverlayView extends KVO {
     draw(): void;
-    getContainerTopLeft(): naver.maps.Point;
-    getMap(): naver.maps.Map | null;
-    getPanes(): naver.maps.MapPanes;
-    getProjection(): naver.maps.MapSystemProjection;
-    abstract onAdd(): any;
-    abstract onRemove(): any;
-    setMap(map: naver.maps.Map | null): void;
+    getContainerTopLeft(): Point;
+    getMap(): Map | null;
+    getPanes(): MapPanes;
+    getProjection(): MapSystemProjection;
+    onAdd(): any;
+    onRemove(): any;
+    setMap(map: Map | null): void;
   }
   // Naver Overlays
-  export abstract class Circle extends naver.maps.OverlayView {
-    constructor(options?: naver.maps.CircleOptions);
+  class Circle extends OverlayView {
+    constructor(options?: CircleOptions);
     getAreaSize(): number;
-    getBounds(): naver.maps.Bounds;
-    getCenter(): naver.maps.Coord;
+    getBounds(): Bounds;
+    getCenter(): Coord;
     getClickable(): boolean;
-    getDrawingRect(): naver.maps.Bounds;
-    getOptions(key?: string): naver.maps.CircleOptions | any;
+    getDrawingRect(): Bounds;
+    getOptions(key?: string): CircleOptions;
     getRadius(): number;
-    getStyles(key: string): naver.maps.CircleOptions | any;
+    getStyles(key: string): CircleOptions;
     getVisible(): boolean;
     getZIndex(): number;
-    setCenter(center): naver.maps.Coord | naver.maps.CoordLiteral;
+    setCenter(center: Coord | CoordLiteral): void;
     setClickable(clickable: boolean): void;
     setOptions(key: string, value: any): void;
-    setOptions(options: naver.maps.CircleOptions): void;
+    setOptions(options: CircleOptions): void;
     setRadius(radius: number): void;
     setStyles(key: string, value: string): void;
-    setStyles(options: naver.maps.CircleOptions): void;
+    setStyles(options: CircleOptions): void;
     setVisible(visible: boolean): void;
     setZIndex(zIndex: number): void;
   }
-  export abstract class Ellipse extends naver.maps.OverlayView {
-    constructor();
+  class Ellipse extends OverlayView {
+    constructor(options?: EllipseOptions);
     getAreaSize(): number;
-    getBounds(): naver.maps.Bounds;
+    getBounds(): Bounds;
     getClickable(): boolean;
-    getDrawingRect(): naver.maps.Bounds;
-    getOptions(key?: string): naver.maps.EllipseOptions | any;
-    getStyles(key?: string): naver.maps.EllipseOptions | any;
+    getDrawingRect(): Bounds;
+    getOptions(key?: string): EllipseOptions;
+    getStyles(key?: string): EllipseOptions;
     getVisible(): boolean;
     getZIndex(): number;
-    setBounds(bounds: naver.maps.Bounds | naver.maps.BoundsLiteral): void;
-    setOptions(options: naver.maps.EllipseOptions): void;
+    setBounds(bounds: Bounds | BoundsLiteral): void;
+    setOptions(options: EllipseOptions): void;
     setOptions(key: string, value: any): void;
-    setStyles(options: naver.maps.EllipseOptions): void;
+    setStyles(options: EllipseOptions): void;
     setStyles(key: string, value: any): void;
     setVisible(visible: boolean): void;
     setZIndex(zIndex: number): void;
   }
-  export abstract class GroundOverlay extends naver.maps.OverlayView {
-    constructor(url: string, bounds: naver.maps.Bounds | naver.maps.BoundsLiteral, options?: naver.maps.GroundOverlayOptions);
-    getBounds(): naver.maps.Bounds;
+  class GroundOverlay extends OverlayView {
+    constructor(url: string, bounds: Bounds | BoundsLiteral, options?: GroundOverlayOptions);
+    getBounds(): Bounds;
     getOpacity(): number;
     getUrl(): string;
     setOpacity(opacity: number): void;
   }
-  export abstract class InfoWindow extends naver.maps.OverlayView {
-    constructor(options: naver.maps.InfoWindowOptions);
+  class InfoWindow extends OverlayView {
+    constructor(options: InfoWindowOptions);
     close(): void;
     getContent(): HTMLElement;
-    getOptions(key?: string): naver.maps.InfoWindowOptions;
-    getPosition(): naver.maps.Coord;
+    getOptions(key?: string): InfoWindowOptions;
+    getPosition(): Coord;
     getZIndex(): number;
-    open(map: naver.maps.Map, anchor: naver.maps.Coord | naver.maps.CoordLiteral | naver.maps.Marker	): void;
+    open(map: Map, anchor: Coord | CoordLiteral | Marker): void;
     setContent(content: string | HTMLElement): void;
-    setOptions(options: naver.maps.InfoWindowOptions): void;
-    setPosition(position: naver.maps.Coord | naver.maps.CoordLiteral): void;
+    setOptions(options: InfoWindowOptions): void;
+    setPosition(position: Coord | CoordLiteral): void;
     setZIndex(zIndex: number): void;
   }
-  export abstract class Marker extends naver.maps.OverlayView {
+  class Marker extends OverlayView {
     constructor(options: MarkerOptions);
-    abstract draw(): void;
-    getAnimation(): naver.maps.Animation;
+    draw(): void;
+    getAnimation(): Animation;
     getClickable(): boolean;
     getCursor(): string;
     getDraggable(): boolean;
-    getDrawingRect(): naver.maps.Bounds;
-    getIcon(): naver.maps.ImageIcon | naver.maps.SymbolIcon | naver.maps.HtmlIcon;
-    getOptions(key?: string): naver.maps.MarkerOptions;
-    getPosition(): naver.maps.Coord;
-    getShape(): naver.maps.MarkerShape;
+    getDrawingRect(): Bounds;
+    getIcon(): ImageIcon | SymbolIcon | HtmlIcon;
+    getOptions(key?: string): MarkerOptions;
+    getPosition(): Coord;
+    getShape(): MarkerShape;
     getTitle(): string;
     getVisible(): boolean;
     getZIndex(): number;
-    abstract onAdd(): void;
-    abstract onRemove(): void;
-    setAnimation(animation: naver.maps.Animation): void;
+    onAdd(): void;
+    onRemove(): void;
+    setAnimation(animation: Animation): void;
     setClickable(clickable: boolean): void;
     setCursor(cursor: string): void;
     setDraggable(draggable: boolean): void;
-    setIcon(icon: string | naver.maps.ImageIcon | naver.maps.SymbolIcon | naver.maps.HtmlIcon): void;
-    setOptions(options: naver.maps.MarkerOptions): void;
-    setPosition(position: naver.maps.Coord | naver.maps.CoordLiteral): void;
-    setShape(shape: naver.maps.MarkerShape): void;
+    setIcon(icon: string | ImageIcon | SymbolIcon | HtmlIcon): void;
+    setOptions(options: MarkerOptions): void;
+    setPosition(position: Coord | CoordLiteral): void;
+    setShape(shape: MarkerShape): void;
     setTitle(title: string): void;
     setVisible(visible: boolean): void;
     setZIndex(zIndex: number): void;
   }
-  export abstract class Polygon extends naver.maps.OverlayView {
-    constructor(options?: naver.maps.PolygonOptions);
+  class Polygon extends OverlayView {
+    constructor(options?: PolygonOptions);
     getAreaSize(): number;
-    getBounds(): naver.maps.Bounds;
+    getBounds(): Bounds;
     getClickable(): boolean;
-    getDrawingRect(): naver.maps.Bounds;
-    getOptions(key?: string): naver.maps.PolygonOptions | any;
-    getPath(): naver.maps.ArrayOfCoords | naver.maps.KVOArrayOfCoords;
+    getDrawingRect(): Bounds;
+    getOptions(key?: string): PolygonOptions;
+    getPath(): ArrayOfCoords | KVOArrayOfCoords;
     getPaths(): ArrayOfCoords[] | KVOArrayOfCoords[];
-    getStyles(key?: string): naver.maps.PolygonOptions | any;
+    getStyles(key?: string): PolygonOptions;
     getVisible(): boolean;
     getZIndex(): number;
     setClickable(clickable: boolean): void;
     setOptions(key: string, value: any): void;
-    setOptions(options: naver.maps.PolygonOptions): void;
-    setPath(path: naver.maps.ArrayOfCoords | naver.maps.KVOArrayOfCoords | naver.maps.ArrayOfCoordsLiteral): void;
-    setPaths(paths: naver.maps.ArrayOfCoords[] | naver.maps.ArrayOfCoordsLiteral | any): void; // TODO. KVOArray.<KVOArrayOfCoords>
+    setOptions(options: PolygonOptions): void;
+    setPath(path: ArrayOfCoords | KVOArrayOfCoords | ArrayOfCoordsLiteral): void;
+    setPaths(paths: ArrayOfCoords[] | ArrayOfCoordsLiteral): void; // TODO. KVOArray.<KVOArrayOfCoords>
     setStyles(key: string, value: any): void;
-    setStyles(options: naver.maps.PolygonOptions): void;
+    setStyles(options: PolygonOptions): void;
     setVisible(visible: boolean): void;
     setZIndex(zIndex: number): void;
   }
-  export abstract class Polyline extends naver.maps.OverlayView {
-    constructor(options?: naver.maps.PolylineOptions);
-    getBounds(): naver.maps.Bounds;
+  class Polyline extends OverlayView {
+    constructor(options?: PolylineOptions);
+    getBounds(): Bounds;
     getClickable(): boolean;
     getDistance(): number;
-    getDrawingRect(): naver.maps.Bounds;
-    getOptions(key?: string): naver.maps.PolylineOptions | any;
-    getPath(): naver.maps.ArrayOfCoords | naver.maps.KVOArrayOfCoords;
-    getStyles(key?: string): naver.maps.PolylineOptions | any;
+    getDrawingRect(): Bounds;
+    getOptions(key?: string): PolylineOptions;
+    getPath(): ArrayOfCoords | KVOArrayOfCoords;
+    getStyles(key?: string): PolylineOptions;
     getVisible(): boolean;
     getZIndex(): number;
     setClickable(clickable: boolean): void;
     setOptions(key: string, value: any): void;
-    setOptions(options: naver.maps.PolylineOptions): void;
-    setPath(path: naver.maps.ArrayOfCoords | naver.maps.KVOArrayOfCoords | naver.maps.ArrayOfCoordsLiteral): void;
+    setOptions(options: PolylineOptions): void;
+    setPath(path: ArrayOfCoords | KVOArrayOfCoords | ArrayOfCoordsLiteral): void;
     setStyles(key: string, value: any): void;
-    setStyles(options: naver.maps.PolylineOptions): void;
+    setStyles(options: PolylineOptions): void;
     setVisible(visible: boolean): void;
     setZIndex(zIndex: number): void;
   }
-  export abstract class Rectangle extends naver.maps.OverlayView {
-    constructor(options?: naver.maps.RectangleOptions);
+  class Rectangle extends OverlayView {
+    constructor(options?: RectangleOptions);
     getAreaSize(): number;
-    getBounds(): naver.maps.Bounds;
+    getBounds(): Bounds;
     getClickable(): boolean;
-    getDrawingRect(): naver.maps.Bounds;
-    getOptions(key?: string): naver.maps.RectangleOptions | any;
-    getStyles(key?: string): naver.maps.RectangleOptions | any;
+    getDrawingRect(): Bounds;
+    getOptions(key?: string): RectangleOptions;
+    getStyles(key?: string): RectangleOptions;
     getVisible(): boolean;
     getZIndex(): number;
-    setBounds(bounds: naver.maps.Bounds | naver.maps.BoundsLiteral): void;
+    setBounds(bounds: Bounds | BoundsLiteral): void;
     setClickable(clickable: boolean): void;
-    setOptions(options: naver.maps.RectangleOptions): void;
+    setOptions(options: RectangleOptions): void;
     setOptions(key: string, value: any): void;
     setStyles(key: string, value: any): void;
-    setStyles(options: naver.maps.RectangleOptions): void;
+    setStyles(options: RectangleOptions): void;
     setVisible(visible: boolean): void;
     setZIndex(zIndex: number): void;
   }
 
   // Sub module: panorama
-  export class PanoramaProjection extends naver.maps.KVO {
-    fromCoordToPov(coord: naver.maps.LatLng): naver.maps.PanoramaPov;
+  class PanoramaProjection extends KVO {
+    fromCoordToPov(coord: LatLng): PanoramaPov;
   }
-  export class Panorama extends naver.maps.KVO {
-    constructor(panoramaDiv: string | HTMLElement, panoramaOptions: naver.maps.PanoramaOptions);
-    getLocation(): naver.maps.PanoramaLocation;
+  class Panorama extends KVO {
+    constructor(panoramaDiv: string | HTMLElement, panoramaOptions: PanoramaOptions);
+    getLocation(): PanoramaLocation;
     getMaxScale(): number;
     getMaxZoom(): number;
     getMinScale(): number;
     getMinZoom(): number;
     getPanoId(): string;
-    getPosition(): naver.maps.LatLng;
-    getPov(): naver.maps.PanoramaPov;
-    getProjection(): naver.maps.PanoramaProjection;
+    getPosition(): LatLng;
+    getPov(): PanoramaPov;
+    getProjection(): PanoramaProjection;
     getScale(): number;
-    getSize(): naver.maps.Size;
+    getSize(): Size;
     getVisible(): boolean;
     getZoom(): number;
-    setOptions(key: string, value: any);
-    setOptions(newOptions: naver.maps.PanoramaOptions | object);
+    setOptions(key: string, value: any): void;
+    setOptions(newOptions: PanoramaOptions): void;
     setPanoId(panoId: string): void;
-    setPanoIdWithPov(panoId: string, pov: naver.maps.PanoramaPov): void;
-    setPosition(position: naver.maps.LatLng | naver.maps.LatLngLiteral): void;
-    setPov(pov: naver.maps.PanoramaPov): void;
+    setPanoIdWithPov(panoId: string, pov: PanoramaPov): void;
+    setPosition(position: LatLng | LatLngLiteral): void;
+    setPov(pov: PanoramaPov): void;
     setScale(scale: number): void;
-    setSize(size: naver.maps.Size | naver.maps.SizeLiteral): void;
+    setSize(size: Size | SizeLiteral): void;
     setVisible(visible: boolean): void;
     setZoom(zoom: number): void;
     zoomIn(): void;
     zoomOut(): void;
   }
-  export class FlightSpot extends naver.maps.KVO {
+  class FlightSpot extends KVO {
     constructor();
-    getMap(): naver.maps.Map | null;
-    setMap(map: naver.maps.Map | null): void;
+    getMap(): Map | null;
+    setMap(map: Map | null): void;
   }
-  export class AroundControl extends naver.maps.CustomControl {
+  class AroundControl extends CustomControl {
     constructor(aroundControlOptions: AroundControlOptions);
   }
 
   // Sub module: drawing
-  export module drawing {
-    export interface DrawingOptions {
-      map?: naver.maps.Map;
-      drawingControl?: naver.maps.drawing.DrawingMode[];
-      drawingControlOptions?: naver.maps.drawing.drawingControlOptions;
-      drawingMode?: naver.maps.drawing.DrawingMode;
-      controlPointOptions?: naver.maps.drawing.controlPointOptions;
-      rectangleOptions?: naver.maps.RectangleOptions;
-      ellipseOptions?: naver.maps.EllipseOptions;
-      polylineOptions?: naver.maps.PolylineOptions;
-      arrowlineOptions?: naver.maps.PolylineOptions;
-      polygonOptions?: naver.maps.PolygonOptions;
-      markerOptions?: naver.maps.MarkerOptions;
+  namespace drawing {
+    interface DrawingOptions {
+      map?: Map;
+      drawingControl?: DrawingMode[];
+      drawingControlOptions?: drawingControlOptions;
+      drawingMode?: DrawingMode;
+      controlPointOptions?: controlPointOptions;
+      rectangleOptions?: RectangleOptions;
+      ellipseOptions?: EllipseOptions;
+      polylineOptions?: PolylineOptions;
+      arrowlineOptions?: PolylineOptions;
+      polygonOptions?: PolygonOptions;
+      markerOptions?: MarkerOptions;
     }
     type drawingControlOptions = DrawingControlOptions;
-    export interface DrawingControlOptions {
-      position?: naver.maps.Position;
-      style?: naver.maps.drawing.DrawingStyle;
+    interface DrawingControlOptions {
+      position?: Position;
+      style?: DrawingStyle;
     }
     type controlPointOptions = ControlPointOptions;
-    export interface ControlPointOptions {
-      anchorPointOptions: naver.maps.CircleOptions;
-      midPointOptions: naver.maps.CircleOptions;
+    interface ControlPointOptions {
+      anchorPointOptions: CircleOptions;
+      midPointOptions: CircleOptions;
     }
-    export interface DrawingOverlay {
+    interface DrawingOverlay {
       id: string;
       name: string;
-      setEditable: (editable: boolean, controlPointOptions?: naver.maps.drawing.controlPointOptions) => void;
+      setEditable: (editable: boolean, controlPointOptions?: controlPointOptions) => void;
     }
-    export enum DrawingStyle {
+    enum DrawingStyle {
       HORIZONTAL = 0,
       VERTICAL,
       HORIZONTAL_2,
       VERTICAL_2
     }
-    export enum DrawingMode {
+    enum DrawingMode {
       HAND = 0,
       RECTANGLE,
       ELLIPSE,
@@ -1088,7 +1126,7 @@ declare namespace naver.maps {
       POLYGON,
       MARKER
     }
-    export enum DrawingEvent {
+    enum DrawingEvent {
       ADD,
       REMOVE,
       SELECT,
@@ -1096,41 +1134,41 @@ declare namespace naver.maps {
       Removed,
       Selected
     }
-    export class DrawingManager extends naver.maps.KVO {
-      constructor(options?: naver.maps.drawing.DrawingOptions);
-      addDrawing(overlay: naver.maps.drawing.DrawingOverlay, drawingMode: naver.maps.drawing.DrawingMode, id?: string): void;
-      addListener(eventName: naver.maps.drawing.DrawingEvent,
-                  listener: (overlay: naver.maps.drawing.DrawingOverlay) => void): naver.maps.MapEventListener;
+    class DrawingManager extends KVO {
+      constructor(options?: DrawingOptions);
+      addDrawing(overlay: DrawingOverlay, drawingMode: DrawingMode, id?: string): void;
+      addListener(eventName: DrawingEvent,
+                  listener: (overlay: DrawingOverlay) => void): MapEventListener;
       destroy(): void;
-      getDrawing(id: string): naver.maps.drawing.DrawingOverlay;
-      getDrawings(): object;
-      getMap(): naver.maps.Map | null;
-      setMap(map: naver.maps.Map | null): void;
-      toGeoJson(): object;
+      getDrawing(id: string): DrawingOverlay;
+      getDrawings(): any;
+      getMap(): Map | null;
+      setMap(map: Map | null): void;
+      toGeoJson(): any;
     }
   }
 
   // Sub module: visualization
-  export module visualization {
-    export interface DotMapOptions {
-      map: naver.maps.Map;
-      data: naver.maps.LatLng[] | naver.maps.PointArrayLiteral[] | naver.maps.visualization.WeightedLocation[];
+  namespace visualization {
+    interface DotMapOptions {
+      map: Map;
+      data: LatLng[] | PointArrayLiteral[] | WeightedLocation[];
       opacity?: number;
       radius?: number;
       strokeWeight?: number;
       strokeColor?: string;
-      strokeLineCap?: naver.maps.strokeLineCapType;
-      strokeLineJoin?: naver.maps.strokeLineJoinType;
+      strokeLineCap?: strokeLineCapType;
+      strokeLineJoin?: strokeLineJoinType;
       fillColor?: string;
     }
-    export interface HeatMapOptions {
-      map: naver.maps.Map;
-      data: naver.maps.LatLng[] | naver.maps.PointArrayLiteral[] | naver.maps.visualization.WeightedLocation[];
+    interface HeatMapOptions {
+      map: Map;
+      data: LatLng[] | PointArrayLiteral[] | WeightedLocation[];
       opacity?: number;
       radius?: number;
-      colorMap?: naver.maps.visualization.SpectrumStyle;
+      colorMap?: SpectrumStyle;
     }
-    export enum SpectrumStyle {
+    enum SpectrumStyle {
       JET,
       HSV,
       HOT,
@@ -1143,35 +1181,35 @@ declare namespace naver.maps {
       PORTLAND,
       OXYGEN
     }
-    export class DotMap extends naver.maps.KVO {
-      constructor(dotMapOptions?: naver.maps.visualization.DotMapOptions);
-      addDrawing(overlay: naver.maps.drawing.DrawingOverlay, drawingMode: naver.maps.drawing.DrawingMode, id?: string): void;
-      addListener(eventName: naver.maps.drawing.DrawingEvent,
-                  listener: (overlay: naver.maps.drawing.DrawingOverlay) => void): naver.maps.MapEventListener;
+    class DotMap extends KVO {
+      constructor(dotMapOptions?: DotMapOptions);
+      addDrawing(overlay: drawing.DrawingOverlay, drawingMode: drawing.DrawingMode, id?: string): void;
+      addListener(eventName: drawing.DrawingEvent,
+                  listener: (overlay: drawing.DrawingOverlay) => void): MapEventListener;
       destroy(): void;
-      getDrawing(id: string): naver.maps.drawing.DrawingOverlay;
-      getDrawings(): object;
-      getMap(): naver.maps.Map | null;
-      setMap(map: naver.maps.Map | null): void;
-      toGeoJson(): object;
+      getDrawing(id: string): drawing.DrawingOverlay;
+      getDrawings(): any;
+      getMap(): Map | null;
+      setMap(map: Map | null): void;
+      toGeoJson(): any;
     }
-    export class HeatMap {
-      constructor(heatMapOptions?: naver.maps.visualization.HeatMapOptions);
-      getColorMap(): naver.maps.visualization.SpectrumStyle;
-      getData(): naver.maps.LatLng[] | naver.maps.PointArrayLiteral[];
-      getMap(): naver.maps.Map | null;
-      getOptions(key?: string): naver.maps.visualization.HeatMapOptions | any;
+    class HeatMap {
+      constructor(heatMapOptions?: HeatMapOptions);
+      getColorMap(): SpectrumStyle;
+      getData(): LatLng[] | PointArrayLiteral[];
+      getMap(): Map | null;
+      getOptions(key?: string): HeatMapOptions;
       redraw(): void;
-      setColorMap(colormap: naver.maps.visualization.SpectrumStyle, inReverse: boolean): void;
-      setData(data: naver.maps.LatLng[] | naver.maps.PointArrayLiteral[]): void;
-      setMap(map: naver.maps.Map | null): void;
+      setColorMap(colormap: SpectrumStyle, inReverse: boolean): void;
+      setData(data: LatLng[] | PointArrayLiteral[]): void;
+      setMap(map: Map | null): void;
       setOptions(key: string, value: any): void;
-      setOptions(options: naver.maps.visualization.HeatMapOptions): void;
+      setOptions(options: HeatMapOptions): void;
     }
-    export class WeightedLocation {
+    class WeightedLocation {
       constructor(lat: number, lng: number, weight?: number);
-      clone(): naver.maps.visualization.WeightedLocation;
-      getLocation(): naver.maps.LatLng;
+      clone(): WeightedLocation;
+      getLocation(): LatLng;
       getWeight(): number;
       lat(): number;
       lng(): number;
@@ -1180,18 +1218,18 @@ declare namespace naver.maps {
   }
 
   // Sub module: geocoder
-  export module Service {
-    export interface ServiceOptions {
+  namespace Service {
+    interface ServiceOptions {
       encoding?: any;
       coordType?: any;
     }
-    export interface GeocodeServiceOptions extends ServiceOptions {
+    interface GeocodeServiceOptions extends ServiceOptions {
       address?: string;
     }
-    export interface ReverseServiceOptions extends ServiceOptions {
+    interface ReverseServiceOptions extends ServiceOptions {
       location?: Coord | CoordLiteral;
     }
-    export interface AddressItem {
+    interface AddressItem {
       address: string;
       addrdetail: {
         country: string;
@@ -1201,153 +1239,153 @@ declare namespace naver.maps {
         rest: string;
       };
     }
-    export interface GeocodeResponse {
+    interface GeocodeResponse {
       result: {
-        userquery: object;
+        userquery: any;
         total: number;
-        items: naver.maps.Service.AddressItem[];
+        items: AddressItem[];
       };
     }
-    export interface ReverseGeocodeResponse {
+    interface ReverseGeocodeResponse {
       result: {
         userquery: string;
         total: number;
-        items: naver.maps.Service.AddressItem[];
+        items: AddressItem[];
       };
     }
-    export enum CoordType {
-      LATLNG = 'latlng',
-      TM128 = 'tm128'
+    enum CoordType {
+      LATLNG,
+      TM128
     }
-    export enum Encoding {
-      UTF_8 = 'utf-8',
-      EUC_KR = 'euc-kr'
+    enum Encoding {
+      UTF_8,
+      EUC_KR
     }
-    export enum Status {
-      OK = 200,
-      ERROR = 500
+    enum Status {
+      OK,
+      ERROR
     }
 
-    function fromAddrToCoord();
-    function fromCoordToAddr();
-    function geocode(options: naver.maps.Service.GeocodeServiceOptions,
-                     callback?: (status: naver.maps.Service.Status, response: naver.maps.Service.GeocodeResponse) => void);
-    function reverseGeocode(options: naver.maps.Service.ReverseServiceOptions,
-                            callback?: (status: naver.maps.Service.Status, response: naver.maps.Service.ReverseGeocodeResponse) => void);
+    function fromAddrToCoord(): void;
+    function fromCoordToAddr(): void;
+    function geocode(options: GeocodeServiceOptions,
+                     callback?: (status: Status, response: GeocodeResponse) => void): void;
+    function reverseGeocode(options: ReverseServiceOptions,
+                            callback?: (status: Status, response: ReverseGeocodeResponse) => void): void;
   }
 
-  export module TransCoord {
-    function fromEPSG3857ToLatLng(coord: naver.maps.Point): naver.maps.LatLng;
-    function fromEPSG3857ToNaver(coord: naver.maps.Point): naver.maps.Point;
-    function fromEPSG3857ToTM128(coord: naver.maps.Point): naver.maps.Point;
-    function fromEPSG3857ToUTMK(coord: naver.maps.Point): naver.maps.Point;
-    function fromLatLngToEPSG3857(latlng: naver.maps.Coord): naver.maps.Point;
-    function fromLatLngToNaver(latlng: naver.maps.Coord): naver.maps.Point;
-    function fromLatLngToTM128(latlng: naver.maps.Coord): naver.maps.Point;
-    function fromLatLngToUTMK(latlng: naver.maps.Coord): naver.maps.Point;
-    function fromNaverToEPSG3857(n: naver.maps.Point): naver.maps.Point;
-    function fromNaverToLatLng(n: naver.maps.Point): naver.maps.LatLng;
-    function fromNaverToTM128(n: naver.maps.Point): naver.maps.Point;
-    function fromNaverToUTMK(n: naver.maps.Point): naver.maps.Point;
-    function fromTM128ToEPSG3857(tm128: naver.maps.Point): naver.maps.Point;
-    function fromTM128ToLatLng(tm128: naver.maps.Point): naver.maps.LatLng;
-    function fromTM128ToNaver(tm128: naver.maps.Point): naver.maps.Point;
-    function fromTM128ToUTMK(tm128: naver.maps.Point): naver.maps.Point;
-    function fromUTMKToEPSG3857(utmk: naver.maps.Point): naver.maps.Point;
-    function fromUTMKToLatLng(utmk: naver.maps.Point): naver.maps.LatLng;
-    function fromUTMKToNaver(utmk: naver.maps.Point): naver.maps.Point;
-    function fromUTMKToTM128(utmk: naver.maps.Point): naver.maps.Point;
+  namespace TransCoord {
+    function fromEPSG3857ToLatLng(coord: Point): LatLng;
+    function fromEPSG3857ToNaver(coord: Point): Point;
+    function fromEPSG3857ToTM128(coord: Point): Point;
+    function fromEPSG3857ToUTMK(coord: Point): Point;
+    function fromLatLngToEPSG3857(latlng: Coord): Point;
+    function fromLatLngToNaver(latlng: Coord): Point;
+    function fromLatLngToTM128(latlng: Coord): Point;
+    function fromLatLngToUTMK(latlng: Coord): Point;
+    function fromNaverToEPSG3857(n: Point): Point;
+    function fromNaverToLatLng(n: Point): LatLng;
+    function fromNaverToTM128(n: Point): Point;
+    function fromNaverToUTMK(n: Point): Point;
+    function fromTM128ToEPSG3857(tm128: Point): Point;
+    function fromTM128ToLatLng(tm128: Point): LatLng;
+    function fromTM128ToNaver(tm128: Point): Point;
+    function fromTM128ToUTMK(tm128: Point): Point;
+    function fromUTMKToEPSG3857(utmk: Point): Point;
+    function fromUTMKToLatLng(utmk: Point): LatLng;
+    function fromUTMKToNaver(utmk: Point): Point;
+    function fromUTMKToTM128(utmk: Point): Point;
   }
 
-  export module Event {
-    function addDOMListener(element: HTMLElement, eventName: string, listener: Function): void;
-    function addListener(target: object, eventName: string, listener: Function): naver.maps.MapEventListener;
-    function clearInstanceListeners(target: object): void;
-    function clearListeners(target: object, fromEventName: string): void;
-    function forward(source: object, fromEventName: string, target: object, toEventName: string): naver.maps.MapEventListener;
-    function hasListener(target: object, eventName: string): boolean;
-    function once(target: object, eventName: string, listener: Function): naver.maps.MapEventListener;
-    function removeDOMListener(element: HTMLElement, eventName: string, listener: Function): void;
-    function removeDOMListener(listeners: naver.maps.DOMEventListener | naver.maps.DOMEventListener[]): void;
-    function removeListener(listeners: naver.maps.MapEventListener | naver.maps.MapEventListener[]): void;
-    function resumeDispatch(target: object, eventName: string): void;
-    function stopDispatch(target: object, eventName: string): void;
-    function trigger(target: object, eventName: string, eventObject?: any): void;
+  namespace Event {
+    function addDOMListener(element: HTMLElement, eventName: string, listener: () => any): void;
+    function addListener(target: any, eventName: string, listener: () => any): MapEventListener;
+    function clearInstanceListeners(target: any): void;
+    function clearListeners(target: any, fromEventName: string): void;
+    function forward(source: any, fromEventName: string, target: any, toEventName: string): MapEventListener;
+    function hasListener(target: any, eventName: string): boolean;
+    function once(target: any, eventName: string, listener: () => any): MapEventListener;
+    function removeDOMListener(element: HTMLElement, eventName: string, listener: () => any): void;
+    function removeDOMListener(listeners: DOMEventListener | DOMEventListener[]): void;
+    function removeListener(listeners: MapEventListener | MapEventListener[]): void;
+    function resumeDispatch(target: any, eventName: string): void;
+    function stopDispatch(target: any, eventName: string): void;
+    function trigger(target: any, eventName: string, eventObject?: any): void;
   }
 
   // Projection
-  export module EPSG3857 { // implements naver.maps.Projection
-    function fromCoordToPoint(coord: naver.maps.Coord): naver.maps.Point;
-    function fromLatLngToPoint(latlng: naver.maps.LatLng): naver.maps.Point;
-    function fromPointToCoord(point: naver.maps.Point): naver.maps.LatLng;
-    function fromPointToLatLng(point: naver.maps.Point): naver.maps.LatLng;
-    function getDestinationCoord(fromLatLng: naver.maps.LatLng, angle: number, meter: number): naver.maps.LatLng;
-    function getDistance(latlng1: naver.maps.LatLng, latlng2: naver.maps.LatLng): number;
+  namespace EPSG3857 { // implements Projection
+    function fromCoordToPoint(coord: Coord): Point;
+    function fromLatLngToPoint(latlng: LatLng): Point;
+    function fromPointToCoord(point: Point): LatLng;
+    function fromPointToLatLng(point: Point): LatLng;
+    function getDestinationCoord(fromLatLng: LatLng, angle: number, meter: number): LatLng;
+    function getDistance(latlng1: LatLng, latlng2: LatLng): number;
   }
-  export class UTMK {
-    name: string;
-    pointPerMeter: number;
-    static fromCoordToPoint(latlng: naver.maps.LatLng): naver.maps.Point;
-    static fromCoordToUTMK(latlng: naver.maps.LatLng): naver.maps.Point;
-    static fromLatLngToPoint(latlng: naver.maps.LatLng): naver.maps.Point;
-    static fromLatLngToUTMK(latlng: naver.maps.LatLng): naver.maps.Point;
-    static fromPointToCoord(point: naver.maps.Point): naver.maps.LatLng;
-    static fromPointToLatLng(point: naver.maps.Point): naver.maps.LatLng;
-    static fromPointToUTMK(point: naver.maps.Point): naver.maps.Point;
-    static fromUTMKToCoord(utmk: naver.maps.Point): naver.maps.LatLng;
-    static fromUTMKToLatLng(utmk: naver.maps.Point): naver.maps.LatLng;
-    static fromUTMKToPoint(utmk: naver.maps.Point): naver.maps.Point;
-    static getDestinationCoord(fromLatLng: naver.maps.LatLng, angle: number, meter: number): naver.maps.LatLng;
-    static getDistance(latlng1: naver.maps.LatLng, latlng2: naver.maps.LatLng): number;
+  namespace UTMK {
+    let name: string;
+    let pointPerMeter: number;
+    function fromCoordToPoint(latlng: LatLng): Point;
+    function fromCoordToUTMK(latlng: LatLng): Point;
+    function fromLatLngToPoint(latlng: LatLng): Point;
+    function fromLatLngToUTMK(latlng: LatLng): Point;
+    function fromPointToCoord(point: Point): LatLng;
+    function fromPointToLatLng(point: Point): LatLng;
+    function fromPointToUTMK(point: Point): Point;
+    function fromUTMKToCoord(utmk: Point): LatLng;
+    function fromUTMKToLatLng(utmk: Point): LatLng;
+    function fromUTMKToPoint(utmk: Point): Point;
+    function getDestinationCoord(fromLatLng: LatLng, angle: number, meter: number): LatLng;
+    function getDistance(latlng1: LatLng, latlng2: LatLng): number;
   }
-  export class UTMK_NAVER { // extends naver.maps.UTMK
-    name: string;
-    pointPerMeter: number;
-    static fromCoordToNaver(latlng: naver.maps.LatLng): naver.maps.Point;
-    static fromLatLngToNaver(latlng: naver.maps.LatLng): naver.maps.Point;
-    static fromNaverToCoord(naverPoint: naver.maps.Point): naver.maps.LatLng;
-    static fromNaverToLatLng(naverPoint: naver.maps.Point): naver.maps.LatLng;
-    static fromNaverToPoint(naverPoint: naver.maps.Point): naver.maps.Point;
-    static fromNaverToUTMK(naverPoint: naver.maps.Point): naver.maps.Point;
-    static fromPointToNaver(point: naver.maps.Point): naver.maps.Point;
-    static fromUTMKToNaver(utmk: naver.maps.Point): naver.maps.Point;
+  namespace UTMK_NAVER { // extends UTMK
+    let name: string;
+    let pointPerMeter: number;
+    function fromCoordToNaver(latlng: LatLng): Point;
+    function fromLatLngToNaver(latlng: LatLng): Point;
+    function fromNaverToCoord(naverPoint: Point): LatLng;
+    function fromNaverToLatLng(naverPoint: Point): LatLng;
+    function fromNaverToPoint(naverPoint: Point): Point;
+    function fromNaverToUTMK(naverPoint: Point): Point;
+    function fromPointToNaver(point: Point): Point;
+    function fromUTMKToNaver(utmk: Point): Point;
   }
-  export class EPSG3857Coord {
-    static fromCoordToLatLng(coord: naver.maps.Point): naver.maps.LatLng;
-    static fromCoordToPoint(coord: naver.maps.Point): naver.maps.Point;
-    static fromEPSG3857ToLatLng(coord: naver.maps.Point): naver.maps.LatLng;
-    static fromEPSG3857ToPoint(coord: naver.maps.Point): naver.maps.Point;
-    static fromLatLngToCoord(coord: naver.maps.Coord): naver.maps.Point;
-    static fromLatLngToEPSG3857(coord: naver.maps.Coord): naver.maps.Point;
-    static fromPointToCoord(point: naver.maps.Point): naver.maps.Point;
-    static fromPointToEPSG3857(point: naver.maps.Point): naver.maps.Point;
+  namespace EPSG3857Coord {
+    function fromCoordToLatLng(coord: Point): LatLng;
+    function fromCoordToPoint(coord: Point): Point;
+    function fromEPSG3857ToLatLng(coord: Point): LatLng;
+    function fromEPSG3857ToPoint(coord: Point): Point;
+    function fromLatLngToCoord(coord: Coord): Point;
+    function fromLatLngToEPSG3857(coord: Coord): Point;
+    function fromPointToCoord(point: Point): Point;
+    function fromPointToEPSG3857(point: Point): Point;
   }
-  export class TM128 { // extends naver.maps.TM128Coord
-    static fromCoordToPoint(latlng: naver.maps.Coord): naver.maps.Point;
-    static fromPointToCoord(point: naver.maps.Point): naver.maps.LatLng;
+  namespace TM128 { // extends TM128Coord
+    function fromCoordToPoint(latlng: Coord): Point;
+    function fromPointToCoord(point: Point): LatLng;
   }
-  export class TM128Coord { // extends naver.maps.UTMK
-    static fromCoordToLatLng(tm128: naver.maps.Point): naver.maps.LatLng;
-    static fromCoordToPoint(tm128: naver.maps.Point): naver.maps.Point;
-    static fromLatLngToCoord(latlng: naver.maps.Coord): naver.maps.Point;
-    static fromLatLngToTM128(latlng: naver.maps.Coord): naver.maps.Point;
-    static fromPointToCoord(point: naver.maps.Point): naver.maps.Point;
-    static fromPointToTM128(point: naver.maps.Point): naver.maps.Point;
-    static fromTM128ToLatLng(tm128: naver.maps.Point): naver.maps.LatLng;
-    static fromTM128ToPoint(tm128: naver.maps.Point): naver.maps.Point;
-    static fromTM128ToUTMK(tm128: naver.maps.Point): naver.maps.Point;
-    static fromUTMKToTM128(utmk: naver.maps.Point): naver.maps.Point;
+  namespace TM128Coord { // extends UTMK
+    function fromCoordToLatLng(tm128: Point): LatLng;
+    function fromCoordToPoint(tm128: Point): Point;
+    function fromLatLngToCoord(latlng: Coord): Point;
+    function fromLatLngToTM128(latlng: Coord): Point;
+    function fromPointToCoord(point: Point): Point;
+    function fromPointToTM128(point: Point): Point;
+    function fromTM128ToLatLng(tm128: Point): LatLng;
+    function fromTM128ToPoint(tm128: Point): Point;
+    function fromTM128ToUTMK(tm128: Point): Point;
+    function fromUTMKToTM128(utmk: Point): Point;
   }
-  export class UTMK_NAVERCoord { // extends naver.maps.UTMK_NAVER
-    static fromCoordToLatLng(n: naver.maps.Point): naver.maps.LatLng;
-    static fromCoordToPoint(n: naver.maps.Point): naver.maps.Point;
-    static fromLatLngToCoord(latlng: naver.maps.Coord): naver.maps.Point;
-    static fromPointToCoord(point: naver.maps.Point): naver.maps.Point;
+  namespace UTMK_NAVERCoord { // extends UTMK_NAVER
+    function fromCoordToLatLng(n: Point): LatLng;
+    function fromCoordToPoint(n: Point): Point;
+    function fromLatLngToCoord(latlng: Coord): Point;
+    function fromPointToCoord(point: Point): Point;
   }
-  export class UTMKCoord { // extends naver.maps.UTMK
-    static fromCoordToLatLng(utmk: naver.maps.Point): naver.maps.LatLng;
-    static fromCoordToPoint(utmk: naver.maps.Point): naver.maps.Point;
-    static fromLatLngToCoord(latlng: naver.maps.Coord): naver.maps.Point;
-    static fromPointToCoord(point: naver.maps.Point): naver.maps.Point;
+  namespace UTMKCoord { // extends UTMK
+    function fromCoordToLatLng(utmk: Point): LatLng;
+    function fromCoordToPoint(utmk: Point): Point;
+    function fromLatLngToCoord(latlng: Coord): Point;
+    function fromPointToCoord(point: Point): Point;
   }
 }
diff --git a/types/navermaps/navermaps-tests.ts b/types/navermaps/navermaps-tests.ts
index a3e84e94a2..81bbe620f5 100644
--- a/types/navermaps/navermaps-tests.ts
+++ b/types/navermaps/navermaps-tests.ts
@@ -1,13 +1,12 @@
-var map = new naver.maps.Map('map');
+let map = new naver.maps.Map('map');
 map.setMapTypeId(naver.maps.MapTypeId.HYBRID);
 
-
-var jeju = new naver.maps.LatLng(33.3590628, 126.534361);
+const jeju = new naver.maps.LatLng(33.3590628, 126.534361);
 
 map.setCenter(jeju); // 중심 좌표 이동
 map.setZoom(13);     // 줌 레벨 변경
 
-var seoul = new naver.maps.LatLngBounds(
+const seoul = new naver.maps.LatLngBounds(
     new naver.maps.LatLng(37.42829747263545, 126.76620435615891),
     new naver.maps.LatLng(37.7010174173061, 127.18379493229875));
 
@@ -15,13 +14,13 @@ map.fitBounds(seoul); // 좌표 경계 이동
 
 map.panBy(new naver.maps.Point(10, 10)); // 우측 하단으로 10 픽셀 이동
 
-var map = new naver.maps.Map('map', {
+map = new naver.maps.Map('map', {
     mapTypeId: naver.maps.MapTypeId.HYBRID
 });
 
-var registry = new naver.maps.MapTypeRegistry();
+const registry = new naver.maps.MapTypeRegistry();
 
-var map = new naver.maps.Map('map', {
+map = new naver.maps.Map('map', {
     mapTypes: registry,
     mapTypeId: naver.maps.MapTypeId.SATELLITE
 });
@@ -31,118 +30,122 @@ map.mapTypes.set(naver.maps.MapTypeId.HYBRID, naver.maps.NaverMapTypeOption.getH
 
 map.setMapTypeId(naver.maps.MapTypeId.NORMAL); // error thrown
 
-var MyMapType = {
-    name: "Alphabet",
+const GTA5MapTypeOption1 = {
     minZoom: 0,
     maxZoom: 22,
     projection: naver.maps.EPSG3857,
-    tileSize: new naver.maps.Size(50, 50),
-    getTile: function(x, y, z) {
-        var w = this.tileSize.width,
-            h = this.tileSize.height;
-
-        var ascii = parseInt(Math.abs(x + y) % 26, 10) + 65;
-        alphabet = String.fromCharCode(ascii);
-        var tile = document.createElement('div');
-
-        tile.style.width = w +'px';
-        tile.style.height = w +'px';
-
-        return tile;
-    }
-};
-
-var map = new naver.maps.Map('map', {
-    center: new naver.maps.LatLng(37.3595704, 127.105399),
-    zoom: 10,
-    mapTypeId: 'mine',
-    mapTypes: new naver.maps.MapTypeRegistry({
-        'mine': MyMapType
-    }),
-    mapTypeControl: true,
-    mapTypeControlOptions: {
-        style: naver.maps.MapTypeControlStyle.DROPDOWN
-    }
-});
-
-var GTA5MapTypeOption = function(name, type) {
-    this.name = name;
-    this.type = type;
-};
-GTA5MapTypeOption.prototype = {
-    constructor: GTA5MapTypeOption,
-
-    name: '',
-    type: '',
-    projection: naver.maps.EPSG3857,
-    minZoom: 1,
-    maxZoom: 6,
+    name: '세계 지도',
     tileSize: new naver.maps.Size(256, 256),
-    TRANSPARENT_URL: 'http://static.naver.net/maps/dot.gif',
-    tileRanges: [1, 2, 4, 8, 16, 32],
-
-    getName: function() {
-        return this.name;
-    },
-
-    getTileUrl: function(x, y, z) {
-        var tileRange = this.tileRanges[z - 1];
-
-        if ((x >=0 && x < tileRange) && (y >=0 && y < tileRange)) {
-            return "http://gta-5-map.com/" +this.type+'/'+z+'-'+x+'_'+y+".png";
-        } else {
-            return this.TRANSPARENT_URL;
-        }
-    },
-
-    onerror: function(tileImg) {
-        tileImg.src = this.TRANSPARENT_URL;
-    }
+    repeatX: true,
+    vendor: 'MyCorp.',
+    provider: [{
+        title: "내 지도 ver 1.0"
+    }, {
+        title: "OpenStreetMap",
+        link: "http://www.openstreetmap.org/copyright"
+    }, {
+        title: "/인천광역시",
+        bounds: new naver.maps.LatLngBounds(
+            new naver.maps.LatLng(36.915887, 125.690716),
+            new naver.maps.LatLng(37.687529, 126.853252))
+    }],
+    tileSet: [
+        "http://mymap1.com/tiles/world/{z}/{x}/{y}.png",
+        "http://mymap2.com/tiles/world/{z}/{x}/{y}.png",
+        "http://mymap3.com/tiles/world/{z}/{x}/{y}.png",
+        "http://mymap4.com/tiles/world/{z}/{x}/{y}.png"
+    ]
 };
 
-var map = new naver.maps.Map('map', {
+map = new naver.maps.Map('map', {
     center: new naver.maps.LatLng(74.92514151088395, -127.880859375),
     zoom: 2,
     mapTypes: new naver.maps.MapTypeRegistry({
-        "Atlas": new naver.maps.ImageMapType(new GTA5MapTypeOption("Atlas", "Tiles_ATLAS")),
-        "Satellite": new naver.maps.ImageMapType(new GTA5MapTypeOption("Satellite", "Tiles_SAT")),
+        Atlas: new naver.maps.ImageMapType(GTA5MapTypeOption1)
     })
 });
 
 map.setMapTypeId("Atlas");
 
-var MyMapType = {
-    name: "Alphabet",
-    minZoom: 0,
-    maxZoom: 22,
-    tileSize: new naver.maps.Size(50, 50),
-    getTileData: function(x, y, z) {
-        var w = this.tileSize.width,
-            h = this.tileSize.height,
-            canvas = document.createElement("canvas"),
-            ctx = canvas.getContext("2d");
+const map2 = new naver.maps.Map('map', {
+    center: new naver.maps.LatLng(37.3595704, 127.105399),
+    zoom: 10
+});
 
-        var ascii = parseInt(Math.abs(x + y) % 26, 10) + 65;
-        alphabet = String.fromCharCode(ascii);
+const marker = new naver.maps.Marker({
+    position: new naver.maps.LatLng(37.3595704, 127.105399),
+    map: map2
+});
 
-        canvas.width = w;
-        canvas.height = h;
+const HOME_PATH = '';
 
-        ctx.globalAlpha = 1 - ((ascii - 65) * 0.04);
+const cityhall = new naver.maps.LatLng(37.5666805, 126.9784147);
+const map3 = new naver.maps.Map('map', {
+    center: cityhall.destinationPoint(0, 500),
+    zoom: 10
+});
+const marker2 = new naver.maps.Marker({
+    map: map3,
+    position: cityhall
+});
 
-        ctx.rect(0, 0, w, h);
-        ctx.fillStyle = "#000";
-        ctx.fill();
-        ctx.lineWidth = 1;
-        ctx.strokeStyle = "#aaa";
-        ctx.stroke();
+const contentString = [
+  `<div class="iw_inner">
+   <h3>서울특별시청</h3>
+   <p>서울특별시 중구 태평로1가 31 | 서울특별시 중구 세종대로 110 서울특별시청<br />
+       <img src="${HOME_PATH}/img/example/hi-seoul.jpg" width="55" height="55" alt="서울시청" class="thumb" /><br />
+       02-120 | 공공,사회기관 &gt; 특별,광역시청<br />
+       <a href="http://www.seoul.go.kr" target="_blank">www.seoul.go.kr/</a>
+   </p>
+</div>`
+    ].join('');
 
-        ctx.font = "bold " + (Math.min(w, h) - 10) + "px Arial";
-        ctx.textBaseline = "middle";
-        ctx.textAlign = "center";
-        ctx.fillStyle = "#fff";
-        ctx.fillText(alphabet, w / 2, h / 2);
+const infowindow = new naver.maps.InfoWindow({
+    content: contentString
+});
 
-        return ctx.getImageData(0, 0, w, h);
+naver.maps.Event.addListener(marker2, "click", () => {
+    if (infowindow.getMap()) {
+        infowindow.close();
+    } else {
+        infowindow.open(map3, marker2);
     }
-};
+});
+
+infowindow.open(map3, marker2);
+
+const GREEN_FACTORY = new naver.maps.LatLng(37.3595953, 127.1053971);
+
+const map4 = new naver.maps.Map('map', {
+    center: GREEN_FACTORY,
+    zoom: 3
+});
+
+const rectangle = new naver.maps.Rectangle({
+    map: map4,
+    bounds: new naver.maps.LatLngBounds(
+        new naver.maps.LatLng(37.1793196, 125.8795594),
+        new naver.maps.LatLng(37.5398662, 126.3312422)
+    )
+});
+
+const circle = new naver.maps.Circle({
+    map: map4,
+    center: GREEN_FACTORY,
+    radius: 20000,
+    fillColor: 'crimson',
+    fillOpacity: 0.8
+});
+
+const ellipse = new naver.maps.Ellipse({
+    map: map4,
+    bounds: new naver.maps.LatLngBounds(
+        new naver.maps.LatLng(37.1793196, 127.6795594),
+        new naver.maps.LatLng(37.5398662, 128.4312422)
+    ),
+    strokeColor: 'yellowgreen',
+    strokeOpacity: 1,
+    strokeWeight: 3,
+    fillColor: 'yellowgreen',
+    fillOpacity: 0.3
+});

From ad2322608dababe5b16451b7712fd7bb975aac48 Mon Sep 17 00:00:00 2001
From: Kyle Roach <kroach.work@gmail.com>
Date: Sat, 24 Mar 2018 08:15:07 -0400
Subject: [PATCH 0824/1382] Add onSearchCloseRequested prop to
 react-native-material-ui

---
 types/react-native-material-ui/index.d.ts     |  1 +
 .../react-native-material-ui-tests.tsx        | 27 ++++++++++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/types/react-native-material-ui/index.d.ts b/types/react-native-material-ui/index.d.ts
index e643b4198f..89b01d13bc 100644
--- a/types/react-native-material-ui/index.d.ts
+++ b/types/react-native-material-ui/index.d.ts
@@ -426,6 +426,7 @@ export interface Searchable {
     onSearchClosed?(): void;
     onSearchPressed?(): void;
     onSubmitEditing?(): void;
+    onSearchCloseRequested?(): void;
 }
 
 export interface ToolBarRightElement {
diff --git a/types/react-native-material-ui/react-native-material-ui-tests.tsx b/types/react-native-material-ui/react-native-material-ui-tests.tsx
index b4380fc388..5aed665ec4 100644
--- a/types/react-native-material-ui/react-native-material-ui-tests.tsx
+++ b/types/react-native-material-ui/react-native-material-ui-tests.tsx
@@ -11,7 +11,8 @@ import {
     Checkbox,
     Dialog,
     DialogDefaultActions,
-    BottomNavigation
+    BottomNavigation,
+    Toolbar
 } from 'react-native-material-ui';
 
 const theme = {
@@ -113,3 +114,27 @@ class BottomNavigationExample extends React.Component<null, {active: string}> {
         );
     }
 }
+
+class ToolbarExample extends React.Component<{}, {search: string}> {
+    state = {
+        search: ''
+    };
+
+    handleResults(search: string) {
+        this.setState({ search });
+    }
+
+    render() {
+        return (
+            <Toolbar
+                centerElement="Collections"
+                searchable={{
+                    autoFocus: true,
+                    placeholder: 'Search',
+                    onChangeText: (text: string) => this.handleResults(text),
+                    onSearchCloseRequested: () => this.handleResults(''),
+                }}
+            />
+        );
+    }
+}

From 08a358732a872a66d9c3404ce66959e791f7b302 Mon Sep 17 00:00:00 2001
From: Jan Vennemann <jan.vennemann@gmx.net>
Date: Tue, 13 Mar 2018 19:00:44 -0300
Subject: [PATCH 0825/1382] Update Titanium Mobile types to 7.1.0

---
 types/titanium/index.d.ts        | 71586 ++++++++++++++++++++++++++---
 types/titanium/titanium-tests.ts |    61 +-
 types/titanium/tsconfig.json     |     4 +-
 types/titanium/tslint.json       |    70 +-
 4 files changed, 64710 insertions(+), 7011 deletions(-)

diff --git a/types/titanium/index.d.ts b/types/titanium/index.d.ts
index 3cacf3c29e..b191fd2766 100644
--- a/types/titanium/index.d.ts
+++ b/types/titanium/index.d.ts
@@ -1,7001 +1,64767 @@
-// Type definitions for Titanium Mobile 3.5.0
-// Project: http://www.appcelerator.com/
-// Definitions by: Craig Younkins <https://github.com/cyounkins>
+// Type definitions for Titanium 7.1
+// Project: https://github.com/appcelerator/titanium_mobile
+// Definitions by: Axway Appcelerator <https://github.com/appcelerator>
+//                 Jan Vennemann <https://github.com/janvennemann>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
 
-declare namespace Ti {
-	export var apiName : string;
-	export var bubbleParent : boolean;
-	export var buildDate : string;
-	export var buildHash : string;
-	export var userAgent : string;
-	export var version : string;
-	export function addEventListener (name: string, callback: (...args : any[]) => any) : void;
-	export function applyProperties (props: Dictionary<Object>) : void;
-	export function createBuffer (params: CreateBufferArgs) : Ti.Buffer;
-	export function fireEvent (name: string, event: Dictionary<Object>) : void;
-	export function getApiName () : string;
-	export function getBubbleParent () : boolean;
-	export function getBuildDate () : string;
-	export function getBuildHash () : string;
-	export function getUserAgent () : string;
-	export function getVersion () : string;
-	export function include (name: string) : void;
-	export function removeEventListener (name: string, callback: (...args : any[]) => any) : void;
-	export function setBubbleParent (bubbleParent: boolean) : void;
-	export function setUserAgent (userAgent: string) : void;
-	export module XML {
-		export var apiName : string;
-		export var bubbleParent : boolean;
-		export function addEventListener (name: string, callback: (...args : any[]) => any) : void;
-		export function applyProperties (props: Dictionary<Object>) : void;
-		export function fireEvent (name: string, event: Dictionary<Object>) : void;
-		export function getApiName () : string;
-		export function getBubbleParent () : boolean;
-		export function parseString (xml: string) : Ti.XML.Document;
-		export function removeEventListener (name: string, callback: (...args : any[]) => any) : void;
-		export function serializeToString (node: Ti.XML.Node) : string;
-		export function setBubbleParent (bubbleParent: boolean) : void;
-		export interface Entity extends Ti.XML.Node {
-			notationName : string;
-			publicId : string;
-			systemId : string;
-			getNotationName () : string;
-			getPublicId () : string;
-			getSystemId () : string;
-		}
-		export interface Node extends Ti.Proxy {
-			ATTRIBUTE_NODE : number;
-			CDATA_SECTION_NODE : number;
-			COMMENT_NODE : number;
-			DOCUMENT_FRAGMENT_NODE : number;
-			DOCUMENT_NODE : number;
-			DOCUMENT_TYPE_NODE : number;
-			ELEMENT_NODE : number;
-			ENTITY_NODE : number;
-			ENTITY_REFERENCE_NODE : number;
-			NOTATION_NODE : number;
-			PROCESSING_INSTRUCTION_NODE : number;
-			TEXT_NODE : number;
-			attributes : Ti.XML.NamedNodeMap;
-			childNodes : Ti.XML.NodeList;
-			firstChild : Ti.XML.Node;
-			lastChild : Ti.XML.Node;
-			localName : string;
-			namespaceURI : string;
-			nextSibling : Ti.XML.Node;
-			nodeName : string;
-			nodeType : number;
-			nodeValue : string;
-			ownerDocument : Ti.XML.Document;
-			parentNode : Ti.XML.Node;
-			prefix : string;
-			previousSibling : Ti.XML.Node;
-			text : string;
-			textContent : string;
-			appendChild (newChild: Ti.XML.Node) : Ti.XML.Node;
-			cloneNode (deep: boolean) : Ti.XML.Node;
-			getAttributes () : Ti.XML.NamedNodeMap;
-			getChildNodes () : Ti.XML.NodeList;
-			getFirstChild () : Ti.XML.Node;
-			getLastChild () : Ti.XML.Node;
-			getLocalName () : string;
-			getNamespaceURI () : string;
-			getNextSibling () : Ti.XML.Node;
-			getNodeName () : string;
-			getNodeType () : number;
-			getNodeValue () : string;
-			getOwnerDocument () : Ti.XML.Document;
-			getParentNode () : Ti.XML.Node;
-			getPrefix () : string;
-			getPreviousSibling () : Ti.XML.Node;
-			getText () : string;
-			getTextContent () : string;
-			hasAttributes () : boolean;
-			hasChildNodes () : boolean;
-			insertBefore (newChild: Ti.XML.Node, refChild: Ti.XML.Node) : Ti.XML.Node;
-			isSupported (feature: string, version: string) : boolean;
-			normalize () : void;
-			removeChild (oldChild: Ti.XML.Node) : Ti.XML.Node;
-			replaceChild (newChild: Ti.XML.Node, oldChild: Ti.XML.Node) : Ti.XML.Node;
-			setLocalName (localName: string) : void;
-			setNodeValue (nodeValue: string) : void;
-			setPrefix (prefix: string) : void;
-		}
-		export enum EntityReference {
+declare const Ti: typeof Titanium;
 
-		}
-		export interface CharacterData extends Ti.XML.Node {
-			data : string;
-			length : number;
-			appendData (arg: string) : void;
-			deleteData (offset: number, count: number) : void;
-			getData () : string;
-			getLength () : number;
-			insertData (offset: number, arg: string) : void;
-			replaceData (offset: number, count: number, arg: string) : void;
-			setData (data: string) : void;
-			substringData (offset: number, count: number) : string;
-		}
-		export interface DOMImplementation extends Ti.Proxy {
-			createDocument (namespaceURI: string, qualifiedName: string, doctype: Ti.XML.DocumentType) : Ti.XML.Document;
-			createDocumentType (qualifiedName: string, publicId: string, systemId: string) : Ti.XML.DocumentType;
-			hasFeature (feature: string, version: string) : boolean;
-		}
-		export interface Document extends Ti.XML.Node {
-			doctype : Ti.XML.DocumentType;
-			documentElement : Ti.XML.Element;
-			implementation : Ti.XML.DOMImplementation;
-			createAttribute (name: string) : Ti.XML.Attr;
-			createAttributeNS (namespaceURI: string, name: string) : Ti.XML.Attr;
-			createCDATASection (data: string) : Ti.XML.CDATASection;
-			createComment (data: string) : Ti.XML.Comment;
-			createDocumentFragment () : Ti.XML.DocumentFragment;
-			createElement (tagName: string) : Ti.XML.Element;
-			createElementNS (namespaceURI: string, name: string) : Ti.XML.Element;
-			createEntityReference (name: string) : Ti.XML.EntityReference;
-			createProcessingInstruction (target: string, data: string) : Ti.XML.ProcessingInstruction;
-			createTextNode (data: string) : Ti.XML.Text;
-			getDoctype () : Ti.XML.DocumentType;
-			getDocumentElement () : Ti.XML.Element;
-			getElementById (elementId: string) : Ti.XML.Element;
-			getElementsByTagName (tagname: string) : Ti.XML.NodeList;
-			getElementsByTagNameNS (namespaceURI: string, localname: string) : Ti.XML.NodeList;
-			getImplementation () : Ti.XML.DOMImplementation;
-			importNode (importedNode: Ti.XML.Node, deep: boolean) : Ti.XML.Node;
-		}
-		export interface Attr extends Ti.XML.Node {
-			name : string;
-			ownerElement : Ti.XML.Element;
-			specified : boolean;
-			value : string;
-			getName () : string;
-			getOwnerElement () : Ti.XML.Element;
-			getSpecified () : boolean;
-			getValue () : string;
-			setValue (value: string) : void;
-		}
-		export interface ProcessingInstruction extends Ti.Proxy {
-			data : string;
-			target : string;
-			getData () : string;
-			getTarget () : string;
-			setData (data: string) : void;
-		}
-		export interface NamedNodeMap extends Ti.Proxy {
-			length : number;
-			getLength () : number;
-			getNamedItem (name: string) : Ti.XML.Node;
-			getNamedItemNS (namespaceURI: string, localName: string) : Ti.XML.Node;
-			item (index: number) : Ti.XML.Node;
-			removeNamedItem (name: string) : Ti.XML.Node;
-			removeNamedItemNS (namespaceURI: string, localName: string) : Ti.XML.Node;
-			setNamedItem (node: Ti.XML.Node) : Ti.XML.Node;
-			setNamedItemNS (node: Ti.XML.Node) : Ti.XML.Node;
-		}
-		export enum CDATASection {
+/**
+ * The top-level Titanium module.
+ */
+declare namespace Titanium {
+	/**
+	 * Indicates if the proxy will bubble an event to its parent.
+	 */
+	let bubbleParent: boolean;
 
-		}
-		export interface Text extends Ti.XML.CharacterData {
-			splitText (offset: number) : Ti.XML.Text;
-		}
-		export enum Comment {
+	/**
+	 * The name of the API that this proxy corresponds to.
+	 */
+	const apiName: string;
 
-		}
-		export enum DocumentFragment {
+	/**
+	 * The Window or TabGroup whose Activity lifecycle should be triggered on the proxy.
+	 */
+	let lifecycleContainer: Titanium.UI.Window | Titanium.UI.TabGroup;
 
-		}
-		export interface Notation extends Ti.Proxy {
-			publicId : string;
-			systemId : string;
-			getPublicId () : string;
-			getSystemId () : string;
-		}
-		export interface NodeList extends Ti.Proxy {
-			length : number;
-			getLength () : number;
-			item (index: number) : Ti.XML.Node;
-		}
-		export interface DocumentType extends Ti.XML.Node {
-			entities : Ti.XML.NamedNodeMap;
-			internalSubset : string;
-			name : string;
-			notations : Ti.XML.NamedNodeMap;
-			publicId : string;
-			systemId : string;
-			getEntities () : Ti.XML.NamedNodeMap;
-			getInternalSubset () : string;
-			getName () : string;
-			getNotations () : Ti.XML.NamedNodeMap;
-			getPublicId () : string;
-			getSystemId () : string;
-		}
-		export interface Element extends Ti.XML.Node {
-			tagName : string;
-			getAttribute (name: string) : string;
-			getAttributeNS (namespaceURI: string, localName: string) : string;
-			getAttributeNode (name: string) : Ti.XML.Attr;
-			getAttributeNodeNS (namespaceURI: string, localName: string) : Ti.XML.Attr;
-			getElementsByTagName (name: string) : Ti.XML.NodeList;
-			getElementsByTagNameNS (namespaceURI: string, localName: string) : Ti.XML.NodeList;
-			getTagName () : string;
-			hasAttribute (name: string) : boolean;
-			hasAttributeNS (namespaceURI: string, localName: string) : boolean;
-			removeAttribute (name: string) : void;
-			removeAttributeNS (namespaceURI: string, localName: string) : void;
-			removeAttributeNode (oldAttr: Ti.XML.Attr) : void;
-			setAttribute (name: string, value: string) : void;
-			setAttributeNS (namespaceURI: string, qualifiedName: string, value: string) : void;
-			setAttributeNode (newAttr: Ti.XML.Attr) : Ti.XML.Attr;
-			setAttributeNodeNS (newAttr: Ti.XML.Attr) : Ti.XML.Attr;
-		}
-	}
-	export enum BlobStream {
+	/**
+	 * User-agent string used by Titanium.
+	 */
+	let userAgent: string;
+
+	/**
+	 * Version of Titanium that is executing.
+	 */
+	const version: string;
+
+	/**
+	 * Date of the Titanium build.
+	 */
+	const buildDate: string;
+
+	/**
+	 * Git hash of the Titanium build.
+	 */
+	const buildHash: string;
+
+	/**
+	 * Adds the specified callback as an event listener for the named event.
+	 */
+	function addEventListener(name: string, callback: (param0: any) => any): void;
+
+	/**
+	 * Removes the specified callback as an event listener for the named event.
+	 */
+	function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+	/**
+	 * Fires a synthesized event to any registered listeners.
+	 */
+	function fireEvent(name: string, event: any): void;
+
+	/**
+	 * Applies the properties to the proxy.
+	 */
+	function applyProperties(props: any): void;
+
+	/**
+	 * Creates a new buffer based on the params.
+	 */
+	function createBuffer(params: CreateBufferArgs): Titanium.Buffer;
+
+	/**
+	 * Creates and returns an instance of <Titanium.Proxy>.
+	 */
+	function createProxy(parameters?: any): Titanium.Proxy;
+
+	/**
+	 * Gets the value of the <Titanium.bubbleParent> property.
+	 */
+	function getBubbleParent(): boolean;
+
+	/**
+	 * Sets the value of the <Titanium.bubbleParent> property.
+	 */
+	function setBubbleParent(bubbleParent: boolean): void;
+
+	/**
+	 * Gets the value of the <Titanium.apiName> property.
+	 */
+	function getApiName(): string;
+
+	/**
+	 * Gets the value of the <Titanium.lifecycleContainer> property.
+	 */
+	function getLifecycleContainer(): Titanium.UI.Window | Titanium.UI.TabGroup;
+
+	/**
+	 * Sets the value of the <Titanium.lifecycleContainer> property.
+	 */
+	function setLifecycleContainer(lifecycleContainer: Titanium.UI.Window): void;
+
+	/**
+	 * Sets the value of the <Titanium.lifecycleContainer> property.
+	 */
+	function setLifecycleContainer(lifecycleContainer: Titanium.UI.TabGroup): void;
+
+	/**
+	 * Gets the value of the <Titanium.userAgent> property.
+	 */
+	function getUserAgent(): string;
+
+	/**
+	 * Sets the value of the <Titanium.userAgent> property.
+	 */
+	function setUserAgent(userAgent: string): void;
+
+	/**
+	 * Gets the value of the <Titanium.version> property.
+	 */
+	function getVersion(): string;
+
+	/**
+	 * Gets the value of the <Titanium.buildDate> property.
+	 */
+	function getBuildDate(): string;
+
+	/**
+	 * Gets the value of the <Titanium.buildHash> property.
+	 */
+	function getBuildHash(): string;
+
+	/**
+	 * The base for all Titanium objects.
+	 */
+	interface Proxy {
+		/**
+		 * Indicates if the proxy will bubble an event to its parent.
+		 */
+		bubbleParent: boolean;
+
+		/**
+		 * The name of the API that this proxy corresponds to.
+		 */
+		readonly apiName: string;
+
+		/**
+		 * The Window or TabGroup whose Activity lifecycle should be triggered on the proxy.
+		 */
+		lifecycleContainer?: Titanium.UI.Window | Titanium.UI.TabGroup;
+
+		/**
+		 * Adds the specified callback as an event listener for the named event.
+		 */
+		addEventListener(name: string, callback: (param0: any) => any): void;
+
+		/**
+		 * Removes the specified callback as an event listener for the named event.
+		 */
+		removeEventListener(name: string, callback: (param0: any) => any): void;
+
+		/**
+		 * Fires a synthesized event to any registered listeners.
+		 */
+		fireEvent(name: string, event: any): void;
+
+		/**
+		 * Applies the properties to the proxy.
+		 */
+		applyProperties(props: any): void;
+
+		/**
+		 * Gets the value of the <Titanium.Proxy.bubbleParent> property.
+		 */
+		getBubbleParent(): boolean;
+
+		/**
+		 * Sets the value of the <Titanium.Proxy.bubbleParent> property.
+		 */
+		setBubbleParent(bubbleParent: boolean): void;
+
+		/**
+		 * Gets the value of the <Titanium.Proxy.apiName> property.
+		 */
+		getApiName(): string;
+
+		/**
+		 * Gets the value of the <Titanium.Proxy.lifecycleContainer> property.
+		 */
+		getLifecycleContainer?(): Titanium.UI.Window | Titanium.UI.TabGroup;
+
+		/**
+		 * Sets the value of the <Titanium.Proxy.lifecycleContainer> property.
+		 */
+		setLifecycleContainer?(lifecycleContainer: Titanium.UI.Window): void;
+
+		/**
+		 * Sets the value of the <Titanium.Proxy.lifecycleContainer> property.
+		 */
+		setLifecycleContainer?(lifecycleContainer: Titanium.UI.TabGroup): void;
 
 	}
-	export interface IOStream extends Ti.Proxy {
-		close () : void;
-		isReadable () : boolean;
-		isWriteable () : boolean;
-		read (buffer: Ti.Buffer, offset?: number, length?: number) : number;
-		write (buffer: Ti.Buffer, offset?: number, length?: number) : number;
-	}
-	export module UI {
-		export var ANIMATION_CURVE_EASE_IN : number;
-		export var ANIMATION_CURVE_EASE_IN_OUT : number;
-		export var ANIMATION_CURVE_EASE_OUT : number;
-		export var ANIMATION_CURVE_LINEAR : number;
-		export var AUTODETECT_ADDRESS : number;
-		export var AUTODETECT_ALL : number;
-		export var AUTODETECT_CALENDAR : number;
-		export var AUTODETECT_LINK : number;
-		export var AUTODETECT_NONE : number;
-		export var AUTODETECT_PHONE : number;
-		export var AUTOLINK_ALL : number;
-		export var AUTOLINK_CALENDAR : number;
-		export var AUTOLINK_EMAIL_ADDRESSES : number;
-		export var AUTOLINK_MAP_ADDRESSES : number;
-		export var AUTOLINK_NONE : number;
-		export var AUTOLINK_PHONE_NUMBERS : number;
-		export var AUTOLINK_URLS : number;
-		export var BLEND_MODE_CLEAR : number;
-		export var BLEND_MODE_COLOR : number;
-		export var BLEND_MODE_COLOR_BURN : number;
-		export var BLEND_MODE_COLOR_DODGE : number;
-		export var BLEND_MODE_COPY : number;
-		export var BLEND_MODE_DARKEN : number;
-		export var BLEND_MODE_DESTINATION_ATOP : number;
-		export var BLEND_MODE_DESTINATION_IN : number;
-		export var BLEND_MODE_DESTINATION_OUT : number;
-		export var BLEND_MODE_DESTINATION_OVER : number;
-		export var BLEND_MODE_DIFFERENCE : number;
-		export var BLEND_MODE_EXCLUSION : number;
-		export var BLEND_MODE_HARD_LIGHT : number;
-		export var BLEND_MODE_HUE : number;
-		export var BLEND_MODE_LIGHTEN : number;
-		export var BLEND_MODE_LUMINOSITY : number;
-		export var BLEND_MODE_MULTIPLY : number;
-		export var BLEND_MODE_NORMAL : number;
-		export var BLEND_MODE_OVERLAY : number;
-		export var BLEND_MODE_PLUS_DARKER : number;
-		export var BLEND_MODE_PLUS_LIGHTER : number;
-		export var BLEND_MODE_SATURATION : number;
-		export var BLEND_MODE_SCREEN : number;
-		export var BLEND_MODE_SOFT_LIGHT : number;
-		export var BLEND_MODE_SOURCE_ATOP : number;
-		export var BLEND_MODE_SOURCE_IN : number;
-		export var BLEND_MODE_SOURCE_OUT : number;
-		export var BLEND_MODE_XOR : number;
-		export var EXTEND_EDGE_ALL : number;
-		export var EXTEND_EDGE_BOTTOM : number;
-		export var EXTEND_EDGE_LEFT : number;
-		export var EXTEND_EDGE_NONE : number;
-		export var EXTEND_EDGE_RIGHT : number;
-		export var EXTEND_EDGE_TOP : number;
-		export var FACE_DOWN : number;
-		export var FACE_UP : number;
-		export var FILL : string;
-		export var INHERIT : string;
-		export var INPUT_BORDERSTYLE_BEZEL : number;
-		export var INPUT_BORDERSTYLE_LINE : number;
-		export var INPUT_BORDERSTYLE_NONE : number;
-		export var INPUT_BORDERSTYLE_ROUNDED : number;
-		export var INPUT_BUTTONMODE_ALWAYS : number;
-		export var INPUT_BUTTONMODE_NEVER : number;
-		export var INPUT_BUTTONMODE_ONBLUR : number;
-		export var INPUT_BUTTONMODE_ONFOCUS : number;
-		export var KEYBOARD_APPEARANCE_ALERT : number;
-		export var KEYBOARD_APPEARANCE_DEFAULT : number;
-		export var KEYBOARD_ASCII : number;
-		export var KEYBOARD_DECIMAL_PAD : number;
-		export var KEYBOARD_DEFAULT : number;
-		export var KEYBOARD_EMAIL : number;
-		export var KEYBOARD_NAMEPHONE_PAD : number;
-		export var KEYBOARD_NUMBERS_PUNCTUATION : number;
-		export var KEYBOARD_NUMBER_PAD : number;
-		export var KEYBOARD_PHONE_PAD : number;
-		export var KEYBOARD_URL : number;
-		export var LANDSCAPE_LEFT : number;
-		export var LANDSCAPE_RIGHT : number;
-		export var LIST_ACCESSORY_TYPE_CHECKMARK : number;
-		export var LIST_ACCESSORY_TYPE_DETAIL : number;
-		export var LIST_ACCESSORY_TYPE_DISCLOSURE : number;
-		export var LIST_ACCESSORY_TYPE_NONE : number;
-		export var LIST_ITEM_TEMPLATE_CONTACTS : number;
-		export var LIST_ITEM_TEMPLATE_DEFAULT : number;
-		export var LIST_ITEM_TEMPLATE_SETTINGS : number;
-		export var LIST_ITEM_TEMPLATE_SUBTITLE : number;
-		export var NOTIFICATION_DURATION_LONG : number;
-		export var NOTIFICATION_DURATION_SHORT : number;
-		export var PICKER_TYPE_COUNT_DOWN_TIMER : number;
-		export var PICKER_TYPE_DATE : number;
-		export var PICKER_TYPE_DATE_AND_TIME : number;
-		export var PICKER_TYPE_PLAIN : number;
-		export var PICKER_TYPE_TIME : number;
-		export var PORTRAIT : number;
-		export var RETURNKEY_DEFAULT : number;
-		export var RETURNKEY_DONE : number;
-		export var RETURNKEY_EMERGENCY_CALL : number;
-		export var RETURNKEY_GO : number;
-		export var RETURNKEY_GOOGLE : number;
-		export var RETURNKEY_JOIN : number;
-		export var RETURNKEY_NEXT : number;
-		export var RETURNKEY_ROUTE : number;
-		export var RETURNKEY_SEARCH : number;
-		export var RETURNKEY_SEND : number;
-		export var RETURNKEY_YAHOO : number;
-		export var SIZE : string;
-		export var TEXT_ALIGNMENT_CENTER : any;
-		export var TEXT_ALIGNMENT_LEFT : any;
-		export var TEXT_ALIGNMENT_RIGHT : any;
-		export var TEXT_AUTOCAPITALIZATION_ALL : number;
-		export var TEXT_AUTOCAPITALIZATION_NONE : number;
-		export var TEXT_AUTOCAPITALIZATION_SENTENCES : number;
-		export var TEXT_AUTOCAPITALIZATION_WORDS : number;
-		export var TEXT_STYLE_BODY : string;
-		export var TEXT_STYLE_CAPTION1 : string;
-		export var TEXT_STYLE_CAPTION2 : string;
-		export var TEXT_STYLE_FOOTNOTE : string;
-		export var TEXT_STYLE_HEADLINE : string;
-		export var TEXT_STYLE_SUBHEADLINE : string;
-		export var TEXT_VERTICAL_ALIGNMENT_BOTTOM : any;
-		export var TEXT_VERTICAL_ALIGNMENT_CENTER : any;
-		export var TEXT_VERTICAL_ALIGNMENT_TOP : any;
-		export var UNIT_CM : string;
-		export var UNIT_DIP : string;
-		export var UNIT_IN : string;
-		export var UNIT_MM : string;
-		export var UNIT_PX : string;
-		export var UNKNOWN : number;
-		export var UPSIDE_PORTRAIT : number;
-		export var URL_ERROR_AUTHENTICATION : number;
-		export var URL_ERROR_BAD_URL : number;
-		export var URL_ERROR_CONNECT : number;
-		export var URL_ERROR_FILE : number;
-		export var URL_ERROR_FILE_NOT_FOUND : number;
-		export var URL_ERROR_HOST_LOOKUP : number;
-		export var URL_ERROR_REDIRECT_LOOP : number;
-		export var URL_ERROR_SSL_FAILED : number;
-		export var URL_ERROR_TIMEOUT : number;
-		export var URL_ERROR_UNKNOWN : number;
-		export var URL_ERROR_UNSUPPORTED_SCHEME : number;
-		export var apiName : string;
-		export var backgroundColor : string;
-		export var backgroundImage : string;
-		export var bubbleParent : boolean;
-		export var currentTab : Ti.UI.Tab;
-		export var currentWindow : Ti.UI.Window;
-		export var orientation : number;
-		export function addEventListener (name: string, callback: (...args : any[]) => any) : void;
-		export function applyProperties (props: Dictionary<Object>) : void;
-		export function convertUnits (convertFromValue: string, convertToUnits: number) : number;
-		export function create2DMatrix (parameters?: MatrixCreationDict) : Ti.UI._2DMatrix;
-		export function create3DMatrix (parameters?: Dictionary<Ti.UI._3DMatrix>) : Ti.UI._3DMatrix;
-		export function createActivityIndicator (parameters?: Dictionary<Ti.UI.ActivityIndicator>) : Ti.UI.ActivityIndicator;
-		export function createAlertDialog (parameters?: Dictionary<Ti.UI.AlertDialog>) : Ti.UI.AlertDialog;
-		export function createAnimation (parameters?: Dictionary<Ti.UI.Animation>) : Ti.UI.Animation;
-		export function createButton (parameters?: Dictionary<Ti.UI.Button>) : Ti.UI.Button;
-		export function createButtonBar (parameters?: Dictionary<Ti.UI.ButtonBar>) : Ti.UI.ButtonBar;
-		export function createCoverFlowView (parameters?: Dictionary<Ti.UI.CoverFlowView>) : Ti.UI.CoverFlowView;
-		export function createDashboardItem (parameters?: Dictionary<Ti.UI.DashboardItem>) : Ti.UI.DashboardItem;
-		export function createDashboardView (parameters?: Dictionary<Ti.UI.DashboardView>) : Ti.UI.DashboardView;
-		export function createEmailDialog (parameters?: Dictionary<Ti.UI.EmailDialog>) : Ti.UI.EmailDialog;
-		export function createImageView (parameters?: Dictionary<Ti.UI.ImageView>) : Ti.UI.ImageView;
-		export function createLabel (parameters?: Dictionary<Ti.UI.Label>) : Ti.UI.Label;
-		export function createListSection (parameters?: Dictionary<Ti.UI.ListSection>) : Ti.UI.ListSection;
-		export function createListView (parameters?: Dictionary<Ti.UI.ListView>) : Ti.UI.ListView;
-		export function createMaskedImage (parameters?: Dictionary<Ti.UI.MaskedImage>) : Ti.UI.MaskedImage;
-		export function createNotification (parameters?: Dictionary<Ti.UI.Notification>) : Ti.UI.Notification;
-		export function createOptionDialog (parameters?: Dictionary<Ti.UI.OptionDialog>) : Ti.UI.OptionDialog;
-		export function createPicker (parameters?: Dictionary<Ti.UI.Picker>) : Ti.UI.Picker;
-		export function createPickerColumn (parameters?: Dictionary<Ti.UI.PickerColumn>) : Ti.UI.PickerColumn;
-		export function createPickerRow (parameters?: Dictionary<Ti.UI.PickerRow>) : Ti.UI.PickerRow;
-		export function createProgressBar (parameters?: Dictionary<Ti.UI.ProgressBar>) : Ti.UI.ProgressBar;
-		export function createRefreshControl (parameters?: Dictionary<Ti.UI.RefreshControl>) : Ti.UI.RefreshControl;
-		export function createSMSDialog (parameters?: Dictionary<Ti.UI.SMSDialog>) : Ti.UI.SMSDialog;
-		export function createScrollView (parameters?: Dictionary<Ti.UI.ScrollView>) : Ti.UI.ScrollView;
-		export function createScrollableView (parameters?: Dictionary<Ti.UI.ScrollableView>) : Ti.UI.ScrollableView;
-		export function createSearchBar (parameters?: Dictionary<Ti.UI.SearchBar>) : Ti.UI.SearchBar;
-		export function createSlider (parameters?: Dictionary<Ti.UI.Slider>) : Ti.UI.Slider;
-		export function createSwitch (parameters?: Dictionary<Ti.UI.Switch>) : Ti.UI.Switch;
-		export function createTab (parameters?: Dictionary<Ti.UI.Tab>) : Ti.UI.Tab;
-		export function createTabGroup (parameters?: Dictionary<Ti.UI.TabGroup>) : Ti.UI.TabGroup;
-		export function createTabbedBar (parameters?: Dictionary<Ti.UI.TabbedBar>) : Ti.UI.TabbedBar;
-		export function createTableView (parameters?: Dictionary<Ti.UI.TableView>) : Ti.UI.TableView;
-		export function createTableViewRow (parameters?: Dictionary<Ti.UI.TableViewRow>) : Ti.UI.TableViewRow;
-		export function createTableViewSection (parameters?: Dictionary<Ti.UI.TableViewSection>) : Ti.UI.TableViewSection;
-		export function createTextArea (parameters?: Dictionary<Ti.UI.TextArea>) : Ti.UI.TextArea;
-		export function createTextField (parameters?: Dictionary<Ti.UI.TextField>) : Ti.UI.TextField;
-		export function createToolbar (parameters?: Dictionary<Ti.UI.Toolbar>) : Ti.UI.Toolbar;
-		export function createView (parameters?: Dictionary<Ti.UI.View>) : Ti.UI.View;
-		export function createWebView (parameters?: Dictionary<Ti.UI.WebView>) : Ti.UI.WebView;
-		export function createWindow (parameters?: Dictionary<Ti.UI.Window>) : Ti.UI.Window;
-		export function fireEvent (name: string, event: Dictionary<Object>) : void;
-		export function getApiName () : string;
-		export function getBackgroundColor () : string;
-		export function getBackgroundImage () : string;
-		export function getBubbleParent () : boolean;
-		export function getCurrentTab () : Ti.UI.Tab;
-		export function getCurrentWindow () : Ti.UI.Window;
-		export function getOrientation () : number;
-		export function removeEventListener (name: string, callback: (...args : any[]) => any) : void;
-		export function setBackgroundColor (backgroundColor: string) : void;
-		export function setBackgroundImage (backgroundImage: string) : void;
-		export function setBubbleParent (bubbleParent: boolean) : void;
-		export function setCurrentTab (currentTab: Ti.UI.Tab) : void;
-		export function setOrientation (orientation: number) : void;
-		export module iPad {
-			export var POPOVER_ARROW_DIRECTION_ANY : number;
-			export var POPOVER_ARROW_DIRECTION_DOWN : number;
-			export var POPOVER_ARROW_DIRECTION_LEFT : number;
-			export var POPOVER_ARROW_DIRECTION_RIGHT : number;
-			export var POPOVER_ARROW_DIRECTION_UNKNOWN : number;
-			export var POPOVER_ARROW_DIRECTION_UP : number;
-			export var apiName : string;
-			export var bubbleParent : boolean;
-			export function addEventListener (name: string, callback: (...args : any[]) => any) : void;
-			export function applyProperties (props: Dictionary<Object>) : void;
-			export function createDocumentViewer (parameters?: Dictionary<Ti.UI.iPad.DocumentViewer>) : Ti.UI.iPad.DocumentViewer;
-			export function createPopover (parameters?: Dictionary<Ti.UI.iPad.Popover>) : Ti.UI.iPad.Popover;
-			export function createSplitWindow (parameters?: Dictionary<Ti.UI.iPad.SplitWindow>) : Ti.UI.iPad.SplitWindow;
-			export function fireEvent (name: string, event: Dictionary<Object>) : void;
-			export function getApiName () : string;
-			export function getBubbleParent () : boolean;
-			export function removeEventListener (name: string, callback: (...args : any[]) => any) : void;
-			export function setBubbleParent (bubbleParent: boolean) : void;
-			export interface SplitWindow extends Ti.UI.Window {
-				detailView : Ti.UI.View;
-				masterView : Ti.UI.View;
-				showMasterInPortrait : boolean;
-				getDetailView () : Ti.UI.View;
-				getMasterView () : Ti.UI.View;
-				getShowMasterInPortrait () : boolean;
-				setShowMasterInPortrait (showMasterInPortrait: boolean) : void;
-			}
-			export interface DocumentViewer extends Ti.UI.View {
-				setUrl (url: string) : void;
-				show () : void;
-			}
-			export interface Popover extends Ti.Proxy {
-				arrowDirection : number;
-				contentView : Ti.UI.View;
-				height : any;
-				leftNavButton : any;
-				passthroughViews : Array<Ti.UI.View>;
-				rightNavButton : any;
-				title : string;
-				width : any;
-				add () : void;
-				getArrowDirection () : number;
-				getContentView () : Ti.UI.View;
-				getHeight () : any;
-				getLeftNavButton () : any;
-				getPassthroughViews () : Array<Ti.UI.View>;
-				getRightNavButton () : any;
-				getTitle () : string;
-				getWidth () : any;
-				hide (options: PopoverParams) : void;
-				remove () : void;
-				setArrowDirection (arrowDirection: number) : void;
-				setContentView (contentView: Ti.UI.View) : void;
-				setHeight (height: number) : void;
-				setHeight (height: string) : void;
-				setLeftNavButton (leftNavButton: any) : void;
-				setPassthroughViews (passthroughViews: Array<Ti.UI.View>) : void;
-				setRightNavButton (rightNavButton: any) : void;
-				setTitle (title: string) : void;
-				setWidth (width: number) : void;
-				setWidth (width: string) : void;
-				show (params: PopoverParams) : void;
-			}
-		}
-		export module iOS {
-			export var AD_SIZE_LANDSCAPE : string;
-			export var AD_SIZE_PORTRAIT : string;
-			export var ANIMATION_CURVE_EASE_IN : number;
-			export var ANIMATION_CURVE_EASE_IN_OUT : number;
-			export var ANIMATION_CURVE_EASE_OUT : number;
-			export var ANIMATION_CURVE_LINEAR : number;
-			export var ATTRIBUTE_BACKGROUND_COLOR : number;
-			export var ATTRIBUTE_BASELINE_OFFSET : number;
-			export var ATTRIBUTE_EXPANSION : number;
-			export var ATTRIBUTE_FONT : number;
-			export var ATTRIBUTE_FOREGROUND_COLOR : number;
-			export var ATTRIBUTE_KERN : number;
-			export var ATTRIBUTE_LETTERPRESS_STYLE : number;
-			export var ATTRIBUTE_LIGATURE : number;
-			export var ATTRIBUTE_LINK : number;
-			export var ATTRIBUTE_OBLIQUENESS : number;
-			export var ATTRIBUTE_SHADOW : number;
-			export var ATTRIBUTE_STRIKETHROUGH_COLOR : number;
-			export var ATTRIBUTE_STRIKETHROUGH_STYLE : number;
-			export var ATTRIBUTE_STROKE_COLOR : number;
-			export var ATTRIBUTE_STROKE_WIDTH : number;
-			export var ATTRIBUTE_TEXT_EFFECT : number;
-			export var ATTRIBUTE_UNDERLINES_STYLE : number;
-			export var ATTRIBUTE_UNDERLINE_BY_WORD : number;
-			export var ATTRIBUTE_UNDERLINE_COLOR : number;
-			export var ATTRIBUTE_UNDERLINE_PATTERN_DASH : number;
-			export var ATTRIBUTE_UNDERLINE_PATTERN_DASH_DOT : number;
-			export var ATTRIBUTE_UNDERLINE_PATTERN_DASH_DOT_DOT : number;
-			export var ATTRIBUTE_UNDERLINE_PATTERN_DOT : number;
-			export var ATTRIBUTE_UNDERLINE_PATTERN_SOLID : number;
-			export var ATTRIBUTE_UNDERLINE_STYLE_DOUBLE : number;
-			export var ATTRIBUTE_UNDERLINE_STYLE_NONE : number;
-			export var ATTRIBUTE_UNDERLINE_STYLE_SINGLE : number;
-			export var ATTRIBUTE_UNDERLINE_STYLE_THICK : number;
-			export var ATTRIBUTE_WRITING_DIRECTION : number;
-			export var ATTRIBUTE_WRITING_DIRECTION_EMBEDDING : number;
-			export var ATTRIBUTE_WRITING_DIRECTION_LEFT_TO_RIGHT : number;
-			export var ATTRIBUTE_WRITING_DIRECTION_NATURAL : number;
-			export var ATTRIBUTE_WRITING_DIRECTION_OVERRIDE : number;
-			export var ATTRIBUTE_WRITING_DIRECTION_RIGHT_TO_LEFT : number;
-			export var AUTODETECT_ADDRESS : number;
-			export var AUTODETECT_ALL : number;
-			export var AUTODETECT_CALENDAR : number;
-			export var AUTODETECT_LINK : number;
-			export var AUTODETECT_NONE : number;
-			export var AUTODETECT_PHONE : number;
-			export var BLEND_MODE_CLEAR : number;
-			export var BLEND_MODE_COLOR : number;
-			export var BLEND_MODE_COLOR_BURN : number;
-			export var BLEND_MODE_COLOR_DODGE : number;
-			export var BLEND_MODE_COPY : number;
-			export var BLEND_MODE_DARKEN : number;
-			export var BLEND_MODE_DESTINATION_ATOP : number;
-			export var BLEND_MODE_DESTINATION_IN : number;
-			export var BLEND_MODE_DESTINATION_OUT : number;
-			export var BLEND_MODE_DESTINATION_OVER : number;
-			export var BLEND_MODE_DIFFERENCE : number;
-			export var BLEND_MODE_EXCLUSION : number;
-			export var BLEND_MODE_HARD_LIGHT : number;
-			export var BLEND_MODE_HUE : number;
-			export var BLEND_MODE_LIGHTEN : number;
-			export var BLEND_MODE_LUMINOSITY : number;
-			export var BLEND_MODE_MULTIPLY : number;
-			export var BLEND_MODE_NORMAL : number;
-			export var BLEND_MODE_OVERLAY : number;
-			export var BLEND_MODE_PLUS_DARKER : number;
-			export var BLEND_MODE_PLUS_LIGHTER : number;
-			export var BLEND_MODE_SATURATION : number;
-			export var BLEND_MODE_SCREEN : number;
-			export var BLEND_MODE_SOFT_LIGHT : number;
-			export var BLEND_MODE_SOURCE_ATOP : number;
-			export var BLEND_MODE_SOURCE_IN : number;
-			export var BLEND_MODE_SOURCE_OUT : number;
-			export var BLEND_MODE_XOR : number;
-			export var CLIP_MODE_DEFAULT : number;
-			export var CLIP_MODE_DISABLED : number;
-			export var CLIP_MODE_ENABLED : number;
-			export var COLLISION_MODE_ALL : number;
-			export var COLLISION_MODE_BOUNDARY : number;
-			export var COLLISION_MODE_ITEM : number;
-			export var COLOR_GROUP_TABLEVIEW_BACKGROUND : string;
-			export var COLOR_SCROLLVIEW_BACKGROUND : string;
-			export var COLOR_UNDER_PAGE_BACKGROUND : string;
-			export var COLOR_VIEW_FLIPSIDE_BACKGROUND : string;
-			export var PUSH_MODE_CONTINUOUS : number;
-			export var PUSH_MODE_INSTANTANEOUS : number;
-			export var SCROLL_DECELERATION_RATE_FAST : number;
-			export var SCROLL_DECELERATION_RATE_NORMAL : number;
-			export var WEBVIEW_NAVIGATIONTYPE_BACK_FORWARD : number;
-			export var WEBVIEW_NAVIGATIONTYPE_FORM_RESUBMITTED : number;
-			export var WEBVIEW_NAVIGATIONTYPE_FORM_SUBMITTED : number;
-			export var WEBVIEW_NAVIGATIONTYPE_LINK_CLICKED : number;
-			export var WEBVIEW_NAVIGATIONTYPE_OTHER : number;
-			export var WEBVIEW_NAVIGATIONTYPE_RELOAD : number;
-			export var apiName : string;
-			export var bubbleParent : boolean;
-			export function addEventListener (name: string, callback: (...args : any[]) => any) : void;
-			export function applyProperties (props: Dictionary<Object>) : void;
-			export function create3DMatrix (parameters?: Dictionary<Ti.UI.iOS._3DMatrix>) : Ti.UI.iOS._3DMatrix;
-			export function createAdView (parameters?: Dictionary<Ti.UI.iOS.AdView>) : Ti.UI.iOS.AdView;
-			export function createAnchorAttachmentBehavior (parameters?: Dictionary<Ti.UI.iOS.AnchorAttachmentBehavior>) : Ti.UI.iOS.AnchorAttachmentBehavior;
-			export function createAnimator (parameters?: Dictionary<Ti.UI.iOS.Animator>) : Ti.UI.iOS.Animator;
-			export function createAttributedString (parameters?: Dictionary<Ti.UI.iOS.AttributedString>) : Ti.UI.iOS.AttributedString;
-			export function createCollisionBehavior (parameters?: Dictionary<Ti.UI.iOS.CollisionBehavior>) : Ti.UI.iOS.CollisionBehavior;
-			export function createCoverFlowView (parameters?: Dictionary<Ti.UI.iOS.CoverFlowView>) : Ti.UI.iOS.CoverFlowView;
-			export function createDocumentViewer (parameters?: Dictionary<Ti.UI.iOS.DocumentViewer>) : Ti.UI.iOS.DocumentViewer;
-			export function createDynamicItemBehavior (parameters?: Dictionary<Ti.UI.iOS.DynamicItemBehavior>) : Ti.UI.iOS.DynamicItemBehavior;
-			export function createGravityBehavior (parameters?: Dictionary<Ti.UI.iOS.GravityBehavior>) : Ti.UI.iOS.GravityBehavior;
-			export function createNavigationWindow (parameters?: Dictionary<Ti.UI.iOS.NavigationWindow>) : Ti.UI.iOS.NavigationWindow;
-			export function createPushBehavior (parameters?: Dictionary<Ti.UI.iOS.PushBehavior>) : Ti.UI.iOS.PushBehavior;
-			export function createSnapBehavior (parameters?: Dictionary<Ti.UI.iOS.SnapBehavior>) : Ti.UI.iOS.SnapBehavior;
-			export function createTabbedBar (parameters?: Dictionary<Ti.UI.iOS.TabbedBar>) : Ti.UI.iOS.TabbedBar;
-			export function createToolbar (parameters?: Dictionary<Ti.UI.iOS.Toolbar>) : Ti.UI.iOS.Toolbar;
-			export function createTransitionAnimation (transition: transitionAnimationParam) : Ti.Proxy;
-			export function createViewAttachmentBehavior (parameters?: Dictionary<Ti.UI.iOS.ViewAttachmentBehavior>) : Ti.UI.iOS.ViewAttachmentBehavior;
-			export function fireEvent (name: string, event: Dictionary<Object>) : void;
-			export function getApiName () : string;
-			export function getBubbleParent () : boolean;
-			export function removeEventListener (name: string, callback: (...args : any[]) => any) : void;
-			export function setBubbleParent (bubbleParent: boolean) : void;
-			export interface Animator extends Ti.Proxy {
-				behaviors : Array<Ti.Proxy>;
-				referenceView : Ti.UI.View;
-				running : boolean;
-				addBehavior (behavior: Ti.Proxy) : void;
-				getBehaviors () : Array<Ti.Proxy>;
-				getReferenceView () : Ti.UI.View;
-				getRunning () : boolean;
-				removeAllBehaviors () : void;
-				removeBehavior (behavior: Ti.Proxy) : void;
-				setBehaviors (behaviors: Array<Ti.Proxy>) : void;
-				setReferenceView (referenceView: Ti.UI.View) : void;
-				startAnimator () : void;
-				stopAnimator () : void;
-				updateItemUsingCurrentState (item: Ti.UI.View) : void;
-			}
-			export interface DynamicItemBehavior extends Ti.Proxy {
-				allowsRotation : boolean;
-				angularResistance : number;
-				density : number;
-				elasticity : number;
-				friction : number;
-				items : Array<Ti.UI.View>;
-				resistance : number;
-				addAngularVelocityForItem (item: Ti.UI.View, velocity: number) : void;
-				addItem (item: Ti.UI.View) : void;
-				addLinearVelocityForItem (item: Ti.UI.View, velocity: Point) : void;
-				angularVelocityForItem (item: Ti.UI.View) : number;
-				getAllowsRotation () : boolean;
-				getAngularResistance () : number;
-				getDensity () : number;
-				getElasticity () : number;
-				getFriction () : number;
-				getItems () : Array<Ti.UI.View>;
-				getResistance () : number;
-				linearVelocityForItem (item: Ti.UI.View) : Point;
-				removeItem (item: Ti.UI.View) : void;
-				setAllowsRotation (allowsRotation: boolean) : void;
-				setAngularResistance (angularResistance: number) : void;
-				setDensity (density: number) : void;
-				setElasticity (elasticity: number) : void;
-				setFriction (friction: number) : void;
-				setResistance (resistance: number) : void;
-			}
-			export interface SnapBehavior extends Ti.Proxy {
-				damping : number;
-				item : Ti.UI.View;
-				snapPoint : Point;
-				getDamping () : number;
-				getItem () : Ti.UI.View;
-				getSnapPoint () : Point;
-				setDamping (damping: number) : void;
-				setItem (item: Ti.UI.View) : void;
-				setSnapPoint (snapPoint: Point) : void;
-			}
-			export interface GravityBehavior extends Ti.Proxy {
-				angle : number;
-				gravityDirection : Point;
-				items : Array<Ti.UI.View>;
-				magnitude : number;
-				addItem (item: Ti.UI.View) : void;
-				getAngle () : number;
-				getGravityDirection () : Point;
-				getItems () : Array<Ti.UI.View>;
-				getMagnitude () : number;
-				removeItem (item: Ti.UI.View) : void;
-				setAngle (angle: number) : void;
-				setGravityDirection (gravityDirection: Point) : void;
-				setMagnitude (magnitude: number) : void;
-			}
-			export interface CollisionBehavior extends Ti.Proxy {
-				boundaryIdentifiers : Array<BoundaryIdentifier>;
-				collisionMode : number;
-				items : Array<Ti.UI.View>;
-				referenceInsets : ReferenceInsets;
-				treatReferenceAsBoundary : boolean;
-				addBoundary (boundary: BoundaryIdentifier) : void;
-				addItem (item: Ti.UI.View) : void;
-				getBoundaryIdentifiers () : Array<BoundaryIdentifier>;
-				getCollisionMode () : number;
-				getItems () : Array<Ti.UI.View>;
-				getReferenceInsets () : ReferenceInsets;
-				getTreatReferenceAsBoundary () : boolean;
-				removeAllBoundaries () : void;
-				removeBoundary (boundary: BoundaryIdentifier) : void;
-				removeItem (item: Ti.UI.View) : void;
-				setCollisionMode (collisionMode: number) : void;
-				setReferenceInsets (referenceInsets: ReferenceInsets) : void;
-				setTreatReferenceAsBoundary (treatReferenceAsBoundary: boolean) : void;
-			}
-			export interface Toolbar extends Ti.UI.View {
-				barColor : string;
-				borderBottom : boolean;
-				borderTop : boolean;
-				extendBackground : boolean;
-				items : Array<Ti.UI.View>;
-				translucent : boolean;
-				getBarColor () : string;
-				getBorderBottom () : boolean;
-				getBorderTop () : boolean;
-				getExtendBackground () : boolean;
-				getItems () : Array<Ti.UI.View>;
-				getTranslucent () : boolean;
-				setBarColor (barColor: string) : void;
-				setBorderBottom (borderBottom: boolean) : void;
-				setBorderTop (borderTop: boolean) : void;
-				setItems (items: Array<Ti.UI.View>) : void;
-				setTranslucent (translucent: boolean) : void;
-			}
-			export interface ViewAttachmentBehavior extends Ti.Proxy {
-				anchorItem : Ti.UI.View;
-				anchorOffset : Point;
-				damping : number;
-				distance : number;
-				frequency : number;
-				item : Ti.UI.View;
-				itemOffset : Point;
-				getAnchorItem () : Ti.UI.View;
-				getAnchorOffset () : Point;
-				getDamping () : number;
-				getDistance () : number;
-				getFrequency () : number;
-				getItem () : Ti.UI.View;
-				getItemOffset () : Point;
-				setAnchorItem (anchorItem: Ti.UI.View) : void;
-				setAnchorOffset (anchorOffset: Point) : void;
-				setDamping (damping: number) : void;
-				setDistance (distance: number) : void;
-				setFrequency (frequency: number) : void;
-				setItem (item: Ti.UI.View) : void;
-				setItemOffset (itemOffset: Point) : void;
-			}
-			export interface PushBehavior extends Ti.Proxy {
-				active : boolean;
-				angle : number;
-				items : Array<Ti.UI.View>;
-				magnitude : number;
-				pushDirection : Point;
-				pushMode : number;
-				addItem (item: Ti.UI.View) : void;
-				getActive () : boolean;
-				getAngle () : number;
-				getItems () : Array<Ti.UI.View>;
-				getMagnitude () : number;
-				getPushDirection () : Point;
-				getPushMode () : number;
-				removeItem (item: Ti.UI.View) : void;
-				setActive (active: boolean) : void;
-				setAngle (angle: number) : void;
-				setMagnitude (magnitude: number) : void;
-				setPushDirection (pushDirection: Point) : void;
-				setPushMode (pushMode: number) : void;
-			}
-			export interface CoverFlowView extends Ti.UI.View {
-				images : any;
-				selected : number;
-				getImages () : any;
-				getSelected () : number;
-				setImage (index: number, image: string) : void;
-				setImage (image: Ti.Blob) : void;
-				setImage (image: Ti.Filesystem.File) : void;
-				setImage (index: number, image: CoverFlowImageType) : void;
-				setImages (images: Array<String>) : void;
-				setImages (images: Array<Ti.Blob>) : void;
-				setImages (images: Array<Ti.Filesystem.File>) : void;
-				setImages (images: Array<CoverFlowImageType>) : void;
-				setSelected (selected: number) : void;
-			}
-			export interface DocumentViewer extends Ti.UI.View {
-				name : string;
-				url : string;
-				getName () : string;
-				getUrl () : string;
-				hide (options?: DocumentViewerOptions) : void;
-				setUrl (url: string) : void;
-				show (options?: DocumentViewerOptions) : void;
-			}
-			export interface NavigationWindow extends Ti.UI.Window {
-				window : Ti.UI.Window;
-				closeWindow (window: Ti.UI.Window, options: Dictionary<Object>) : void;
-				getWindow () : Ti.UI.Window;
-				openWindow (window: Ti.UI.Window, options: Dictionary<Object>) : void;
-			}
-			export interface AttributedString extends Ti.Proxy {
-				attributes : Array<Attribute>;
-				text : string;
-				addAttribute (attribute: Attribute) : void;
-				getAttributes () : Array<Attribute>;
-				getText () : string;
-				setAttributes (attributes: Array<Attribute>) : void;
-				setText (text: string) : void;
-			}
-			export interface AnchorAttachmentBehavior extends Ti.Proxy {
-				anchor : Point;
-				damping : number;
-				distance : number;
-				frequency : number;
-				item : Ti.UI.View;
-				offset : Point;
-				getAnchor () : Point;
-				getDamping () : number;
-				getDistance () : number;
-				getFrequency () : number;
-				getItem () : Ti.UI.View;
-				getOffset () : Point;
-				setAnchor (anchor: Point) : void;
-				setDamping (damping: number) : void;
-				setDistance (distance: number) : void;
-				setFrequency (frequency: number) : void;
-				setItem (item: Ti.UI.View) : void;
-				setOffset (offset: Point) : void;
-			}
-			export interface TabbedBar extends Ti.UI.View {
-				index : number;
-				labels : any;
-				style : number;
-				getIndex () : number;
-				getLabels () : any;
-				getStyle () : number;
-				setIndex (index: number) : void;
-				setLabels (labels: Array<String>) : void;
-				setLabels (labels: Array<BarItemType>) : void;
-				setStyle (style: number) : void;
-			}
-			export interface _3DMatrix extends Ti.Proxy {
-				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;
-				getM11 () : number;
-				getM12 () : number;
-				getM13 () : number;
-				getM14 () : number;
-				getM21 () : number;
-				getM22 () : number;
-				getM23 () : number;
-				getM24 () : number;
-				getM31 () : number;
-				getM32 () : number;
-				getM33 () : number;
-				getM34 () : number;
-				getM41 () : number;
-				getM42 () : number;
-				getM43 () : number;
-				getM44 () : number;
-				invert () : Ti.UI._3DMatrix;
-				multiply (t2: Ti.UI._3DMatrix) : Ti.UI._3DMatrix;
-				rotate (angle: number, x: number, y: number, z: number) : Ti.UI._3DMatrix;
-				scale (sx: number, sy: number, sz: number) : Ti.UI._3DMatrix;
-				setM11 (m11: number) : void;
-				setM12 (m12: number) : void;
-				setM13 (m13: number) : void;
-				setM14 (m14: number) : void;
-				setM21 (m21: number) : void;
-				setM22 (m22: number) : void;
-				setM23 (m23: number) : void;
-				setM24 (m24: number) : void;
-				setM31 (m31: number) : void;
-				setM32 (m32: number) : void;
-				setM33 (m33: number) : void;
-				setM34 (m34: number) : void;
-				setM41 (m41: number) : void;
-				setM42 (m42: number) : void;
-				setM43 (m43: number) : void;
-				setM44 (m44: number) : void;
-				translate (tx: number, ty: number, tz: number) : Ti.UI._3DMatrix;
-			}
-			export interface AdView extends Ti.UI.View {
-				adSize : string;
-				cancelAction () : void;
-				getAdSize () : string;
-				setAdSize (adSize: string) : void;
-			}
-		}
-		export module iPhone {
-			export var MODAL_PRESENTATION_CURRENT_CONTEXT : number;
-			export var MODAL_PRESENTATION_FORMSHEET : number;
-			export var MODAL_PRESENTATION_FULLSCREEN : number;
-			export var MODAL_PRESENTATION_PAGESHEET : number;
-			export var MODAL_TRANSITION_STYLE_COVER_VERTICAL : number;
-			export var MODAL_TRANSITION_STYLE_CROSS_DISSOLVE : number;
-			export var MODAL_TRANSITION_STYLE_FLIP_HORIZONTAL : number;
-			export var MODAL_TRANSITION_STYLE_PARTIAL_CURL : number;
-			export var apiName : string;
-			export var appBadge : number;
-			export var appSupportsShakeToEdit : boolean;
-			export var bubbleParent : boolean;
-			export var statusBarHidden : boolean;
-			export var statusBarStyle : number;
-			export function addEventListener (name: string, callback: (...args : any[]) => any) : void;
-			export function applyProperties (props: Dictionary<Object>) : void;
-			export function createNavigationGroup (parameters?: Dictionary<Ti.UI.iPhone.NavigationGroup>) : Ti.UI.iPhone.NavigationGroup;
-			export function fireEvent (name: string, event: Dictionary<Object>) : void;
-			export function getApiName () : string;
-			export function getAppBadge () : number;
-			export function getAppSupportsShakeToEdit () : boolean;
-			export function getBubbleParent () : boolean;
-			export function getStatusBarHidden () : boolean;
-			export function getStatusBarStyle () : number;
-			export function hideStatusBar (params?: hideStatusBarParams) : void;
-			export function removeEventListener (name: string, callback: (...args : any[]) => any) : void;
-			export function setAppBadge (appBadge: number) : void;
-			export function setAppSupportsShakeToEdit (appSupportsShakeToEdit: boolean) : void;
-			export function setBubbleParent (bubbleParent: boolean) : void;
-			export function showStatusBar (params?: showStatusBarParams) : void;
-			export enum ScrollIndicatorStyle {
-				BLACK,
-				DEFAULT,
-				WHITE
-			}
-			export enum SystemButtonStyle {
-				BAR,
-				BORDERED,
-				DONE,
-				PLAIN
-			}
-			export enum ListViewStyle {
-				GROUPED,
-				PLAIN
-			}
-			export enum StatusBar {
-				ANIMATION_STYLE_FADE,
-				ANIMATION_STYLE_NONE,
-				ANIMATION_STYLE_SLIDE,
-				DEFAULT,
-				GRAY,
-				GREY,
-				LIGHT_CONTENT,
-				OPAQUE_BLACK,
-				TRANSLUCENT_BLACK
-			}
-			export enum SystemButton {
-				ACTION,
-				ACTIVITY,
-				ADD,
-				BOOKMARKS,
-				CAMERA,
-				CANCEL,
-				COMPOSE,
-				CONTACT_ADD,
-				DISCLOSURE,
-				DONE,
-				EDIT,
-				FAST_FORWARD,
-				FIXED_SPACE,
-				FLEXIBLE_SPACE,
-				INFO_DARK,
-				INFO_LIGHT,
-				ORGANIZE,
-				PAUSE,
-				PLAY,
-				REFRESH,
-				REPLY,
-				REWIND,
-				SAVE,
-				SPINNER,
-				STOP,
-				TRASH
-			}
-			export enum TableViewStyle {
-				GROUPED,
-				PLAIN
-			}
-			export enum SystemIcon {
-				BOOKMARKS,
-				CONTACTS,
-				DOWNLOADS,
-				FAVORITES,
-				FEATURED,
-				HISTORY,
-				MORE,
-				MOST_RECENT,
-				MOST_VIEWED,
-				RECENTS,
-				SEARCH,
-				TOP_RATED
-			}
-			export enum ActivityIndicatorStyle {
-				BIG,
-				DARK,
-				PLAIN
-			}
-			export enum ProgressBarStyle {
-				BAR,
-				DEFAULT,
-				PLAIN
-			}
-			export enum ListViewSeparatorStyle {
-				NONE,
-				SINGLE_LINE
-			}
-			export enum RowAnimationStyle {
-				BOTTOM,
-				FADE,
-				LEFT,
-				NONE,
-				RIGHT,
-				TOP
-			}
-			export enum AnimationStyle {
-				CURL_DOWN,
-				CURL_UP,
-				FLIP_FROM_LEFT,
-				FLIP_FROM_RIGHT,
-				NONE
-			}
-			export interface NavigationGroup extends Ti.UI.View {
-				window : Ti.UI.Window;
-				close (window: Ti.UI.Window, options: Dictionary<Object>) : void;
-				getWindow () : Ti.UI.Window;
-				open (window: Ti.UI.Window, options: Dictionary<Object>) : void;
-			}
-			export enum TableViewScrollPosition {
-				BOTTOM,
-				MIDDLE,
-				NONE,
-				TOP
-			}
-			export enum AlertDialogStyle {
-				DEFAULT,
-				LOGIN_AND_PASSWORD_INPUT,
-				PLAIN_TEXT_INPUT,
-				SECURE_TEXT_INPUT
-			}
-			export enum ListViewScrollPosition {
-				BOTTOM,
-				MIDDLE,
-				NONE,
-				TOP
-			}
-			export enum TableViewCellSelectionStyle {
-				BLUE,
-				GRAY,
-				NONE
-			}
-			export enum ListViewCellSelectionStyle {
-				BLUE,
-				GRAY,
-				NONE
-			}
-			export enum TableViewSeparatorStyle {
-				NONE,
-				SINGLE_LINE
-			}
-		}
-		export interface TextArea extends Ti.UI.View {
-			appearance : number;
-			attributedString : Ti.UI.iOS.AttributedString;
-			autoLink : number;
-			autocapitalization : number;
-			autocorrect : boolean;
-			clearOnEdit : boolean;
-			color : string;
-			editable : boolean;
-			ellipsize : boolean;
-			enableReturnKey : boolean;
-			font : Font;
-			handleLinks : boolean;
-			hintText : string;
-			keyboardToolbar : any;
-			keyboardToolbarColor : string;
-			keyboardToolbarHeight : number;
-			keyboardType : number;
-			maxLength : number;
-			returnKeyType : number;
-			scrollable : boolean;
-			scrollsToTop : boolean;
-			selection : textAreaSelectedParams;
-			suppressReturn : boolean;
-			textAlign : any;
-			value : string;
-			verticalAlign : any;
-			blur () : void;
-			focus () : void;
-			getAppearance () : number;
-			getAttributedString () : Ti.UI.iOS.AttributedString;
-			getAutoLink () : number;
-			getAutocapitalization () : number;
-			getAutocorrect () : boolean;
-			getClearOnEdit () : boolean;
-			getColor () : string;
-			getEditable () : boolean;
-			getEllipsize () : boolean;
-			getEnableReturnKey () : boolean;
-			getFont () : Font;
-			getHandleLinks () : boolean;
-			getHintText () : string;
-			getKeyboardToolbar () : any;
-			getKeyboardToolbarColor () : string;
-			getKeyboardToolbarHeight () : number;
-			getKeyboardType () : number;
-			getMaxLength () : number;
-			getReturnKeyType () : number;
-			getScrollable () : boolean;
-			getScrollsToTop () : boolean;
-			getSelection () : textAreaSelectedParams;
-			getSuppressReturn () : boolean;
-			getTextAlign () : any;
-			getValue () : string;
-			getVerticalAlign () : any;
-			hasText () : boolean;
-			setAppearance (appearance: number) : void;
-			setAttributedString (attributedString: Ti.UI.iOS.AttributedString) : void;
-			setAutoLink (autoLink: number) : void;
-			setAutocapitalization (autocapitalization: number) : void;
-			setAutocorrect (autocorrect: boolean) : void;
-			setClearOnEdit (clearOnEdit: boolean) : void;
-			setColor (color: string) : void;
-			setEditable (editable: boolean) : void;
-			setEllipsize (ellipsize: boolean) : void;
-			setEnableReturnKey (enableReturnKey: boolean) : void;
-			setFont (font: Font) : void;
-			setHandleLinks (handleLinks: boolean) : void;
-			setHintText (hintText: string) : void;
-			setKeyboardToolbar (keyboardToolbar: Array<Ti.UI.View>) : void;
-			setKeyboardToolbar (keyboardToolbar: Ti.UI.iOS.Toolbar) : void;
-			setKeyboardToolbarColor (keyboardToolbarColor: string) : void;
-			setKeyboardToolbarHeight (keyboardToolbarHeight: number) : void;
-			setKeyboardType (keyboardType: number) : void;
-			setMaxLength (maxLength: number) : void;
-			setReturnKeyType (returnKeyType: number) : void;
-			setScrollable (scrollable: boolean) : void;
-			setScrollsToTop (scrollsToTop: boolean) : void;
-			setSelection (start: number, end: number) : void;
-			setSuppressReturn (suppressReturn: boolean) : void;
-			setTextAlign (textAlign: string) : void;
-			setTextAlign (textAlign: number) : void;
-			setValue (value: string) : void;
-			setVerticalAlign (verticalAlign: number) : void;
-			setVerticalAlign (verticalAlign: string) : void;
-		}
-		export interface View extends Ti.Proxy {
-			accessibilityHidden : boolean;
-			accessibilityHint : string;
-			accessibilityLabel : string;
-			accessibilityValue : string;
-			anchorPoint : Point;
-			animatedCenter : Point;
-			backgroundColor : string;
-			backgroundDisabledColor : string;
-			backgroundDisabledImage : string;
-			backgroundFocusedColor : string;
-			backgroundFocusedImage : string;
-			backgroundGradient : Gradient;
-			backgroundImage : string;
-			backgroundLeftCap : number;
-			backgroundRepeat : boolean;
-			backgroundSelectedColor : string;
-			backgroundSelectedImage : string;
-			backgroundTopCap : number;
-			borderColor : string;
-			borderRadius : number;
-			borderWidth : number;
-			bottom : any;
-			center : Point;
-			children : Array<Ti.UI.View>;
-			clipMode : number;
-			enabled : boolean;
-			focusable : boolean;
-			height : any;
-			horizontalWrap : boolean;
-			keepScreenOn : boolean;
-			layout : string;
-			left : any;
-			opacity : number;
-			overrideCurrentAnimation : boolean;
-			pullBackgroundColor : string;
-			rect : Dimension;
-			right : any;
-			size : Dimension;
-			softKeyboardOnFocus : number;
-			tintColor : any;
-			top : any;
-			touchEnabled : boolean;
-			transform : any;
-			viewShadowColor : string;
-			viewShadowOffset : Point;
-			viewShadowRadius : number;
-			visible : boolean;
-			width : any;
-			zIndex : number;
-			add (view: Ti.UI.View) : void;
-			animate (animation: Ti.UI.Animation, callback: (...args : any[]) => any) : void;
-			animate (animation: Dictionary<Ti.UI.Animation>, callback: (...args : any[]) => any) : void;
-			convertPointToView (point: Point, destinationView: Ti.UI.View) : Point;
-			finishLayout () : void;
-			getAccessibilityHidden () : boolean;
-			getAccessibilityHint () : string;
-			getAccessibilityLabel () : string;
-			getAccessibilityValue () : string;
-			getAnchorPoint () : Point;
-			getAnimatedCenter () : Point;
-			getBackgroundColor () : string;
-			getBackgroundDisabledColor () : string;
-			getBackgroundDisabledImage () : string;
-			getBackgroundFocusedColor () : string;
-			getBackgroundFocusedImage () : string;
-			getBackgroundGradient () : Gradient;
-			getBackgroundImage () : string;
-			getBackgroundLeftCap () : number;
-			getBackgroundRepeat () : boolean;
-			getBackgroundSelectedColor () : string;
-			getBackgroundSelectedImage () : string;
-			getBackgroundTopCap () : number;
-			getBorderColor () : string;
-			getBorderRadius () : number;
-			getBorderWidth () : number;
-			getBottom () : any;
-			getCenter () : Point;
-			getChildren () : Array<Ti.UI.View>;
-			getClipMode () : number;
-			getEnabled () : boolean;
-			getFocusable () : boolean;
-			getHeight () : any;
-			getHorizontalWrap () : boolean;
-			getKeepScreenOn () : boolean;
-			getLayout () : string;
-			getLeft () : any;
-			getOpacity () : number;
-			getOverrideCurrentAnimation () : boolean;
-			getPullBackgroundColor () : string;
-			getRect () : Dimension;
-			getRight () : any;
-			getSize () : Dimension;
-			getSoftKeyboardOnFocus () : number;
-			getTintColor () : string;
-			getTop () : any;
-			getTouchEnabled () : boolean;
-			getTransform () : any;
-			getViewShadowColor () : string;
-			getViewShadowOffset () : Point;
-			getViewShadowRadius () : number;
-			getVisible () : boolean;
-			getWidth () : any;
-			getZIndex () : number;
-			hide () : void;
-			remove (view: Ti.UI.View) : void;
-			removeAllChildren () : void;
-			setAccessibilityHidden (accessibilityHidden: boolean) : void;
-			setAccessibilityHint (accessibilityHint: string) : void;
-			setAccessibilityLabel (accessibilityLabel: string) : void;
-			setAccessibilityValue (accessibilityValue: string) : void;
-			setAnchorPoint (anchorPoint: Point) : void;
-			setBackgroundColor (backgroundColor: string) : void;
-			setBackgroundDisabledColor (backgroundDisabledColor: string) : void;
-			setBackgroundDisabledImage (backgroundDisabledImage: string) : void;
-			setBackgroundFocusedColor (backgroundFocusedColor: string) : void;
-			setBackgroundFocusedImage (backgroundFocusedImage: string) : void;
-			setBackgroundGradient (backgroundGradient: Gradient) : void;
-			setBackgroundImage (backgroundImage: string) : void;
-			setBackgroundLeftCap (backgroundLeftCap: number) : void;
-			setBackgroundRepeat (backgroundRepeat: boolean) : void;
-			setBackgroundSelectedColor (backgroundSelectedColor: string) : void;
-			setBackgroundSelectedImage (backgroundSelectedImage: string) : void;
-			setBackgroundTopCap (backgroundTopCap: number) : void;
-			setBorderColor (borderColor: string) : void;
-			setBorderRadius (borderRadius: number) : void;
-			setBorderWidth (borderWidth: number) : void;
-			setBottom (bottom: number) : void;
-			setBottom (bottom: string) : void;
-			setCenter (center: Point) : void;
-			setClipMode (clipMode: number) : void;
-			setEnabled (enabled: boolean) : void;
-			setFocusable (focusable: boolean) : void;
-			setHeight (height: number) : void;
-			setHeight (height: string) : void;
-			setHorizontalWrap (horizontalWrap: boolean) : void;
-			setKeepScreenOn (keepScreenOn: boolean) : void;
-			setLayout (layout: string) : void;
-			setLeft (left: number) : void;
-			setLeft (left: string) : void;
-			setOpacity (opacity: number) : void;
-			setPullBackgroundColor (pullBackgroundColor: string) : void;
-			setRight (right: number) : void;
-			setRight (right: string) : void;
-			setSoftKeyboardOnFocus (softKeyboardOnFocus: number) : void;
-			setTintColor (tintColor: string) : void;
-			setTop (top: number) : void;
-			setTop (top: string) : void;
-			setTouchEnabled (touchEnabled: boolean) : void;
-			setTransform (transform: Ti.UI._2DMatrix) : void;
-			setTransform (transform: Ti.UI._3DMatrix) : void;
-			setViewShadowColor (viewShadowColor: string) : void;
-			setViewShadowOffset (viewShadowOffset: Point) : void;
-			setViewShadowRadius (viewShadowRadius: number) : void;
-			setVisible (visible: boolean) : void;
-			setWidth (width: number) : void;
-			setWidth (width: string) : void;
-			setZIndex (zIndex: number) : void;
-			show () : void;
-			startLayout () : void;
-			toImage (callback?: (...args : any[]) => any, honorScaleFactor?: boolean) : Ti.Blob;
-			updateLayout (params: Dictionary<Object>) : void;
-		}
-		export enum ActivityIndicatorStyle {
-			BIG,
-			BIG_DARK,
-			DARK,
-			PLAIN
-		}
-		export interface Switch extends Ti.UI.View {
-			color : string;
-			font : Font;
-			onTintColor : string;
-			style : number;
-			textAlign : any;
-			thumbTintColor : string;
-			tintColor : string;
-			title : string;
-			titleOff : string;
-			titleOn : string;
-			value : boolean;
-			verticalAlign : any;
-			getColor () : string;
-			getFont () : Font;
-			getOnTintColor () : string;
-			getStyle () : number;
-			getTextAlign () : any;
-			getThumbTintColor () : string;
-			getTitle () : string;
-			getTitleOff () : string;
-			getTitleOn () : string;
-			getValue () : boolean;
-			getVerticalAlign () : any;
-			setColor (color: string) : void;
-			setFont (font: Font) : void;
-			setOnTintColor (onTintColor: string) : void;
-			setStyle (style: number) : void;
-			setTextAlign (textAlign: string) : void;
-			setTextAlign (textAlign: number) : void;
-			setThumbTintColor (thumbTintColor: string) : void;
-			setTitle (title: string) : void;
-			setTitleOff (titleOff: string) : void;
-			setTitleOn (titleOn: string) : void;
-			setValue (value: boolean) : void;
-			setVerticalAlign (verticalAlign: number) : void;
-			setVerticalAlign (verticalAlign: string) : void;
-		}
-		export interface DashboardItem extends Ti.Proxy {
-			badge : number;
-			canDelete : boolean;
-			image : any;
-			selectedImage : any;
-			getBadge () : number;
-			getCanDelete () : boolean;
-			getImage () : any;
-			getSelectedImage () : any;
-			setBadge (badge: number) : void;
-			setCanDelete (canDelete: boolean) : void;
-			setImage (image: string) : void;
-			setImage (image: Ti.Blob) : void;
-			setSelectedImage (selectedImage: string) : void;
-			setSelectedImage (selectedImage: Ti.Blob) : void;
-		}
-		export interface Tab extends Ti.UI.View {
-			active : boolean;
-			activeIcon : string;
-			activeIconIsMask : any;
-			badge : string;
-			icon : string;
-			iconIsmask : any;
-			title : string;
-			titleid : string;
-			window : Ti.UI.Window;
-			close (window: Ti.UI.Window, options?: any) : void;
-			getActive () : boolean;
-			getActiveIcon () : string;
-			getActiveIconIsMask () : boolean;
-			getBadge () : string;
-			getIcon () : string;
-			getIconIsmask () : boolean;
-			getTitle () : string;
-			getTitleid () : string;
-			getWindow () : Ti.UI.Window;
-			open (window: Ti.UI.Window, options: any) : void;
-			setActive (active: boolean) : void;
-			setActiveIcon (activeIcon: string) : void;
-			setActiveIconIsMask (activeIconIsMask: boolean) : void;
-			setBadge (badge: string) : void;
-			setIcon (icon: string) : void;
-			setIconIsmask (iconIsmask: boolean) : void;
-			setTitle (title: string) : void;
-			setTitleid (titleid: string) : void;
-			setWindow (window: Ti.UI.Window) : void;
-		}
-		export interface TableViewRow extends Ti.UI.View {
-			className : string;
-			color : string;
-			editable : boolean;
-			font : Font;
-			hasCheck : boolean;
-			hasChild : boolean;
-			hasDetail : boolean;
-			indentionLevel : number;
-			leftImage : string;
-			moveable : boolean;
-			rightImage : string;
-			selectedBackgroundColor : string;
-			selectedBackgroundImage : string;
-			selectedColor : string;
-			selectionStyle : number;
-			title : string;
-			getClassName () : string;
-			getColor () : string;
-			getEditable () : boolean;
-			getFont () : Font;
-			getHasCheck () : boolean;
-			getHasChild () : boolean;
-			getHasDetail () : boolean;
-			getIndentionLevel () : number;
-			getLeftImage () : string;
-			getMoveable () : boolean;
-			getRightImage () : string;
-			getSelectedBackgroundColor () : string;
-			getSelectedBackgroundImage () : string;
-			getSelectedColor () : string;
-			getSelectionStyle () : number;
-			getTitle () : string;
-			setClassName (className: string) : void;
-			setColor (color: string) : void;
-			setEditable (editable: boolean) : void;
-			setFont (font: Font) : void;
-			setHasCheck (hasCheck: boolean) : void;
-			setHasChild (hasChild: boolean) : void;
-			setHasDetail (hasDetail: boolean) : void;
-			setIndentionLevel (indentionLevel: number) : void;
-			setLeftImage (leftImage: string) : void;
-			setMoveable (moveable: boolean) : void;
-			setRightImage (rightImage: string) : void;
-			setSelectedBackgroundColor (selectedBackgroundColor: string) : void;
-			setSelectedBackgroundImage (selectedBackgroundImage: string) : void;
-			setSelectedColor (selectedColor: string) : void;
-			setSelectionStyle (selectionStyle: number) : void;
-			setTitle (title: string) : void;
-		}
-		export interface PickerRow extends Ti.UI.View {
-			color : string;
-			font : Font;
-			fontSize : number;
-			title : string;
-			getColor () : string;
-			getFont () : Font;
-			getFontSize () : number;
-			getTitle () : string;
-			setColor (color: string) : void;
-			setFont (font: Font) : void;
-			setFontSize (fontSize: number) : void;
-			setTitle (title: string) : void;
-		}
-		export interface ButtonBar extends Ti.UI.View {
-			index : number;
-			labels : any;
-			style : number;
-			getIndex () : number;
-			getLabels () : any;
-			getStyle () : number;
-			setIndex (index: number) : void;
-			setLabels (labels: Array<String>) : void;
-			setLabels (labels: Array<BarItemType>) : void;
-			setStyle (style: number) : void;
-		}
-		export interface Slider extends Ti.UI.View {
-			disabledLeftTrackImage : string;
-			disabledRightTrackImage : string;
-			disabledThumbImage : string;
-			highlightedLeftTrackImage : string;
-			highlightedRightTrackImage : string;
-			highlightedThumbImage : string;
-			leftTrackImage : string;
-			leftTrackLeftCap : number;
-			leftTrackTopCap : number;
-			max : number;
-			maxRange : number;
-			min : number;
-			minRange : number;
-			rightTrackImage : string;
-			rightTrackLeftCap : number;
-			rightTrackTopCap : number;
-			selectedLeftTrackImage : string;
-			selectedRightTrackImage : string;
-			selectedThumbImage : string;
-			thumbImage : any;
-			value : string;
-			getDisabledLeftTrackImage () : string;
-			getDisabledRightTrackImage () : string;
-			getDisabledThumbImage () : string;
-			getHighlightedLeftTrackImage () : string;
-			getHighlightedRightTrackImage () : string;
-			getHighlightedThumbImage () : string;
-			getLeftTrackImage () : string;
-			getLeftTrackLeftCap () : number;
-			getLeftTrackTopCap () : number;
-			getMax () : number;
-			getMaxRange () : number;
-			getMin () : number;
-			getMinRange () : number;
-			getRightTrackImage () : string;
-			getRightTrackLeftCap () : number;
-			getRightTrackTopCap () : number;
-			getSelectedLeftTrackImage () : string;
-			getSelectedRightTrackImage () : string;
-			getSelectedThumbImage () : string;
-			getThumbImage () : any;
-			getValue () : string;
-			setDisabledLeftTrackImage (disabledLeftTrackImage: string) : void;
-			setDisabledRightTrackImage (disabledRightTrackImage: string) : void;
-			setDisabledThumbImage (disabledThumbImage: string) : void;
-			setHighlightedLeftTrackImage (highlightedLeftTrackImage: string) : void;
-			setHighlightedRightTrackImage (highlightedRightTrackImage: string) : void;
-			setHighlightedThumbImage (highlightedThumbImage: string) : void;
-			setLeftTrackImage (leftTrackImage: string) : void;
-			setLeftTrackLeftCap (leftTrackLeftCap: number) : void;
-			setLeftTrackTopCap (leftTrackTopCap: number) : void;
-			setMax (max: number) : void;
-			setMaxRange (maxRange: number) : void;
-			setMin (min: number) : void;
-			setMinRange (minRange: number) : void;
-			setRightTrackImage (rightTrackImage: string) : void;
-			setRightTrackLeftCap (rightTrackLeftCap: number) : void;
-			setRightTrackTopCap (rightTrackTopCap: number) : void;
-			setSelectedLeftTrackImage (selectedLeftTrackImage: string) : void;
-			setSelectedRightTrackImage (selectedRightTrackImage: string) : void;
-			setSelectedThumbImage (selectedThumbImage: string) : void;
-			setThumbImage (thumbImage: string) : void;
-			setThumbImage (thumbImage: Ti.Blob) : void;
-			setValue (value: number, options?: Dictionary<Object>) : void;
-		}
-		export module Android {
-			export var LINKIFY_ALL : number;
-			export var LINKIFY_EMAIL_ADDRESSES : number;
-			export var LINKIFY_MAP_ADDRESSES : number;
-			export var LINKIFY_PHONE_NUMBERS : number;
-			export var LINKIFY_WEB_URLS : number;
-			export var OVER_SCROLL_ALWAYS : number;
-			export var OVER_SCROLL_IF_CONTENT_SCROLLS : number;
-			export var OVER_SCROLL_NEVER : number;
-			export var PIXEL_FORMAT_A_8 : number;
-			export var PIXEL_FORMAT_LA_88 : number;
-			export var PIXEL_FORMAT_L_8 : number;
-			export var PIXEL_FORMAT_OPAQUE : number;
-			export var PIXEL_FORMAT_RGBA_4444 : number;
-			export var PIXEL_FORMAT_RGBA_5551 : number;
-			export var PIXEL_FORMAT_RGBA_8888 : number;
-			export var PIXEL_FORMAT_RGBX_8888 : number;
-			export var PIXEL_FORMAT_RGB_332 : number;
-			export var PIXEL_FORMAT_RGB_565 : number;
-			export var PIXEL_FORMAT_RGB_888 : number;
-			export var PIXEL_FORMAT_TRANSLUCENT : number;
-			export var PIXEL_FORMAT_TRANSPARENT : number;
-			export var PIXEL_FORMAT_UNKNOWN : number;
-			export var PROGRESS_INDICATOR_DETERMINANT : number;
-			export var PROGRESS_INDICATOR_DIALOG : number;
-			export var PROGRESS_INDICATOR_INDETERMINANT : number;
-			export var PROGRESS_INDICATOR_STATUS_BAR : number;
-			export var SOFT_INPUT_ADJUST_PAN : number;
-			export var SOFT_INPUT_ADJUST_RESIZE : number;
-			export var SOFT_INPUT_ADJUST_UNSPECIFIED : number;
-			export var SOFT_INPUT_STATE_ALWAYS_HIDDEN : number;
-			export var SOFT_INPUT_STATE_ALWAYS_VISIBLE : number;
-			export var SOFT_INPUT_STATE_HIDDEN : number;
-			export var SOFT_INPUT_STATE_UNSPECIFIED : number;
-			export var SOFT_INPUT_STATE_VISIBLE : number;
-			export var SOFT_KEYBOARD_DEFAULT_ON_FOCUS : number;
-			export var SOFT_KEYBOARD_HIDE_ON_FOCUS : number;
-			export var SOFT_KEYBOARD_SHOW_ON_FOCUS : number;
-			export var SWITCH_STYLE_CHECKBOX : number;
-			export var SWITCH_STYLE_TOGGLEBUTTON : number;
-			export var WEBVIEW_LOAD_CACHE_ELSE_NETWORK : number;
-			export var WEBVIEW_LOAD_CACHE_ONLY : number;
-			export var WEBVIEW_LOAD_DEFAULT : number;
-			export var WEBVIEW_LOAD_NO_CACHE : number;
-			export var WEBVIEW_PLUGINS_OFF : number;
-			export var WEBVIEW_PLUGINS_ON : number;
-			export var WEBVIEW_PLUGINS_ON_DEMAND : number;
-			export var apiName : string;
-			export var bubbleParent : boolean;
-			export function addEventListener (name: string, callback: (...args : any[]) => any) : void;
-			export function applyProperties (props: Dictionary<Object>) : void;
-			export function createProgressIndicator (parameters?: Dictionary<Ti.UI.Android.ProgressIndicator>) : Ti.UI.Android.ProgressIndicator;
-			export function createSearchView (parameters?: Dictionary<Ti.UI.Android.SearchView>) : Ti.UI.Android.SearchView;
-			export function fireEvent (name: string, event: Dictionary<Object>) : void;
-			export function getApiName () : string;
-			export function getBubbleParent () : boolean;
-			export function hideSoftKeyboard () : void;
-			export function openPreferences () : void;
-			export function removeEventListener (name: string, callback: (...args : any[]) => any) : void;
-			export function setBubbleParent (bubbleParent: boolean) : void;
-			export interface SearchView extends Ti.UI.View {
-				hintText : string;
-				iconified : boolean;
-				iconifiedByDefault : boolean;
-				submitEnabled : boolean;
-				value : string;
-				blur () : void;
-				focus () : void;
-				getHintText () : string;
-				getIconified () : boolean;
-				getIconifiedByDefault () : boolean;
-				getSubmitEnabled () : boolean;
-				getValue () : string;
-				setHintText (hintText: string) : void;
-				setIconified (iconified: boolean) : void;
-				setIconifiedByDefault (iconifiedByDefault: boolean) : void;
-				setSubmitEnabled (submitEnabled: boolean) : void;
-				setValue (value: string) : void;
-			}
-			export interface ProgressIndicator extends Ti.Proxy {
-				cancelable : boolean;
-				location : number;
-				max : number;
-				message : string;
-				messageid : string;
-				min : number;
-				type : number;
-				getCancelable () : boolean;
-				getLocation () : number;
-				getMax () : number;
-				getMessage () : string;
-				getMessageid () : string;
-				getMin () : number;
-				getType () : number;
-				hide () : void;
-				setCancelable (cancelable: boolean) : void;
-				setLocation (location: number) : void;
-				setMax (max: number) : void;
-				setMessage (message: string) : void;
-				setMessageid (messageid: string) : void;
-				setMin (min: number) : void;
-				setType (type: number) : void;
-				show () : void;
-			}
-		}
-		export interface DashboardView extends Ti.UI.View {
-			columnCount : number;
-			data : Array<Ti.UI.DashboardItem>;
-			editable : boolean;
-			rowCount : number;
-			wobble : boolean;
-			getColumnCount () : number;
-			getData () : Array<Ti.UI.DashboardItem>;
-			getEditable () : boolean;
-			getRowCount () : number;
-			getWobble () : boolean;
-			setData (data: Array<Ti.UI.DashboardItem>) : void;
-			setEditable (editable: boolean) : void;
-			setWobble (wobble: boolean) : void;
-			startEditing () : void;
-			stopEditing () : void;
-		}
-		export interface ListItem extends Ti.Proxy {
-			accessoryType : number;
-			backgroundColor : string;
-			backgroundGradient : Gradient;
-			backgroundImage : string;
-			canEdit : boolean;
-			canMove : boolean;
-			color : string;
-			font : Font;
-			height : any;
-			image : string;
-			itemId : string;
-			searchableText : string;
-			selectedBackgroundColor : string;
-			selectedBackgroundGradient : Gradient;
-			selectedBackgroundImage : string;
-			selectionStyle : number;
-			subtitle : string;
-			title : string;
-		}
-		export interface AlertDialog extends Ti.Proxy {
-			androidView : Ti.UI.View;
-			buttonNames : Array<String>;
-			cancel : number;
-			message : string;
-			messageid : string;
-			ok : string;
-			okid : string;
-			persistent : boolean;
-			style : number;
-			title : string;
-			titleid : string;
-			getAndroidView () : Ti.UI.View;
-			getButtonNames () : Array<String>;
-			getCancel () : number;
-			getMessage () : string;
-			getOk () : string;
-			getPersistent () : boolean;
-			getStyle () : number;
-			getTitle () : string;
-			hide () : void;
-			setAndroidView (androidView: Ti.UI.View) : void;
-			setCancel (cancel: number) : void;
-			setMessage (message: string) : void;
-			setOk (ok: string) : void;
-			setPersistent (persistent: boolean) : void;
-			setStyle (style: number) : void;
-			setTitle (title: string) : void;
-			show () : void;
-		}
-		export interface _2DMatrix extends Ti.Proxy {
-			a : number;
-			b : number;
-			c : number;
-			d : number;
-			tx : number;
-			ty : number;
-			getA () : number;
-			getB () : number;
-			getC () : number;
-			getD () : number;
-			getTx () : number;
-			getTy () : number;
-			invert () : Ti.UI._2DMatrix;
-			multiply (t2: Ti.UI._2DMatrix) : Ti.UI._2DMatrix;
-			rotate (angle: number, toAngle?: number) : Ti.UI._2DMatrix;
-			scale (sx: number, sy: number, toSx?: number, toSy?: number) : Ti.UI._2DMatrix;
-			setA (a: number) : void;
-			setB (b: number) : void;
-			setC (c: number) : void;
-			setD (d: number) : void;
-			setTx (tx: number) : void;
-			setTy (ty: number) : void;
-			translate (tx: number, ty: number) : Ti.UI._2DMatrix;
-		}
-		export interface TabbedBar extends Ti.UI.View {
-			index : number;
-			labels : any;
-			style : number;
-			getIndex () : number;
-			getLabels () : any;
-			getStyle () : number;
-			setIndex (index: number) : void;
-			setLabels (labels: Array<String>) : void;
-			setLabels (labels: Array<BarItemType>) : void;
-			setStyle (style: number) : void;
-		}
-		export interface Window extends Ti.UI.View {
-			activity : Ti.Android.Activity;
-			autoAdjustScrollViewInsets : boolean;
-			backButtonTitle : string;
-			backButtonTitleImage : any;
-			barColor : string;
-			barImage : string;
-			exitOnClose : boolean;
-			extendEdges : Array<Number>;
-			flagSecure : boolean;
-			fullscreen : boolean;
-			hideShadow : boolean;
-			includeOpaqueBars : boolean;
-			leftNavButton : Ti.UI.View;
-			leftNavButtons : Array<Ti.UI.View>;
-			modal : boolean;
-			navBarHidden : boolean;
-			navTintColor : any;
-			orientation : number;
-			orientationModes : Array<Number>;
-			rightNavButton : Ti.UI.View;
-			rightNavButtons : Array<Ti.UI.View>;
-			shadowImage : string;
-			statusBarStyle : any;
-			tabBarHidden : boolean;
-			theme : string;
-			title : string;
-			titleAttributes : titleAttributesParams;
-			titleControl : Ti.UI.View;
-			titleImage : string;
-			titlePrompt : string;
-			titleid : string;
-			titlepromptid : string;
-			toolbar : Array<Object>;
-			transitionAnimation : Ti.Proxy;
-			translucent : boolean;
-			url : string;
-			windowFlags : number;
-			windowPixelFormat : number;
-			windowSoftInputMode : number;
-			close (params?: Dictionary<Ti.UI.Animation>) : void;
-			close (params?: closeWindowParams) : void;
-			getActivity () : Ti.Android.Activity;
-			getAutoAdjustScrollViewInsets () : boolean;
-			getBackButtonTitle () : string;
-			getBackButtonTitleImage () : any;
-			getBarColor () : string;
-			getBarImage () : string;
-			getExitOnClose () : boolean;
-			getExtendEdges () : Array<Number>;
-			getFlagSecure () : boolean;
-			getFullscreen () : boolean;
-			getHideShadow () : boolean;
-			getIncludeOpaqueBars () : boolean;
-			getLeftNavButton () : Ti.UI.View;
-			getLeftNavButtons () : Array<Ti.UI.View>;
-			getModal () : boolean;
-			getNavBarHidden () : boolean;
-			getNavTintColor () : string;
-			getOrientation () : number;
-			getOrientationModes () : Array<Number>;
-			getRightNavButton () : Ti.UI.View;
-			getRightNavButtons () : Array<Ti.UI.View>;
-			getShadowImage () : string;
-			getStatusBarStyle () : number;
-			getTabBarHidden () : boolean;
-			getTheme () : string;
-			getTitle () : string;
-			getTitleAttributes () : titleAttributesParams;
-			getTitleControl () : Ti.UI.View;
-			getTitleImage () : string;
-			getTitlePrompt () : string;
-			getTitleid () : string;
-			getTitlepromptid () : string;
-			getToolbar () : Array<Object>;
-			getTransitionAnimation () : Ti.Proxy;
-			getTranslucent () : boolean;
-			getUrl () : string;
-			getWindowFlags () : number;
-			getWindowPixelFormat () : number;
-			getWindowSoftInputMode () : number;
-			hideNavBar (options?: Dictionary<Object>) : void;
-			hideTabBar () : void;
-			open (params?: openWindowParams) : void;
-			setAutoAdjustScrollViewInsets (autoAdjustScrollViewInsets: boolean) : void;
-			setBackButtonTitle (backButtonTitle: string) : void;
-			setBackButtonTitleImage (backButtonTitleImage: string) : void;
-			setBackButtonTitleImage (backButtonTitleImage: Ti.Blob) : void;
-			setBarColor (barColor: string) : void;
-			setBarImage (barImage: string) : void;
-			setExitOnClose (exitOnClose: boolean) : void;
-			setExtendEdges (extendEdges: Array<Number>) : void;
-			setFullscreen (fullscreen: boolean) : void;
-			setHideShadow (hideShadow: boolean) : void;
-			setIncludeOpaqueBars (includeOpaqueBars: boolean) : void;
-			setLeftNavButton (leftNavButton: Ti.UI.View) : void;
-			setLeftNavButtons (leftNavButtons: Array<Ti.UI.View>) : void;
-			setModal (modal: boolean) : void;
-			setNavBarHidden (navBarHidden: boolean) : void;
-			setNavTintColor (navTintColor: string) : void;
-			setOrientationModes (orientationModes: Array<Number>) : void;
-			setRightNavButton (rightNavButton: Ti.UI.View) : void;
-			setRightNavButtons (rightNavButtons: Array<Ti.UI.View>) : void;
-			setShadowImage (shadowImage: string) : void;
-			setStatusBarStyle (statusBarStyle: number) : void;
-			setTabBarHidden (tabBarHidden: boolean) : void;
-			setTitle (title: string) : void;
-			setTitleAttributes (titleAttributes: titleAttributesParams) : void;
-			setTitleControl (titleControl: Ti.UI.View) : void;
-			setTitleImage (titleImage: string) : void;
-			setTitlePrompt (titlePrompt: string) : void;
-			setTitleid (titleid: string) : void;
-			setTitlepromptid (titlepromptid: string) : void;
-			setToolbar (items: Array<Object>, params?: windowToolbarParam) : void;
-			setTransitionAnimation (transitionAnimation: Ti.Proxy) : void;
-			setTranslucent (translucent: boolean) : void;
-			setWindowPixelFormat (windowPixelFormat: number) : void;
-			showNavBar (options?: Dictionary<Object>) : void;
-		}
-		export interface TextField extends Ti.UI.View {
-			appearance : number;
-			attributedHintText : Ti.UI.iOS.AttributedString;
-			attributedString : Ti.UI.iOS.AttributedString;
-			autoLink : number;
-			autocapitalization : number;
-			autocorrect : boolean;
-			borderStyle : number;
-			clearButtonMode : number;
-			clearOnEdit : boolean;
-			color : string;
-			editable : boolean;
-			ellipsize : boolean;
-			enableReturnKey : boolean;
-			font : Font;
-			hintText : string;
-			keyboardToolbar : any;
-			keyboardToolbarColor : string;
-			keyboardToolbarHeight : number;
-			keyboardType : number;
-			leftButton : any;
-			leftButtonMode : number;
-			leftButtonPadding : number;
-			maxLength : number;
-			minimumFontSize : number;
-			paddingLeft : number;
-			paddingRight : number;
-			passwordMask : boolean;
-			returnKeyType : number;
-			rightButton : any;
-			rightButtonMode : number;
-			rightButtonPadding : number;
-			selection : textFieldSelectedParams;
-			suppressReturn : boolean;
-			textAlign : any;
-			value : string;
-			verticalAlign : any;
-			blur () : void;
-			focus () : void;
-			getAppearance () : number;
-			getAttributedHintText () : Ti.UI.iOS.AttributedString;
-			getAttributedString () : Ti.UI.iOS.AttributedString;
-			getAutoLink () : number;
-			getAutocapitalization () : number;
-			getAutocorrect () : boolean;
-			getBorderStyle () : number;
-			getClearButtonMode () : number;
-			getClearOnEdit () : boolean;
-			getColor () : string;
-			getEditable () : boolean;
-			getEllipsize () : boolean;
-			getEnableReturnKey () : boolean;
-			getFont () : Font;
-			getHintText () : string;
-			getKeyboardToolbar () : any;
-			getKeyboardToolbarColor () : string;
-			getKeyboardToolbarHeight () : number;
-			getKeyboardType () : number;
-			getLeftButton () : any;
-			getLeftButtonMode () : number;
-			getLeftButtonPadding () : number;
-			getMaxLength () : number;
-			getMinimumFontSize () : number;
-			getPaddingLeft () : number;
-			getPaddingRight () : number;
-			getPasswordMask () : boolean;
-			getReturnKeyType () : number;
-			getRightButton () : any;
-			getRightButtonMode () : number;
-			getRightButtonPadding () : number;
-			getSelection () : textFieldSelectedParams;
-			getSuppressReturn () : boolean;
-			getTextAlign () : any;
-			getValue () : string;
-			getVerticalAlign () : any;
-			hasText () : boolean;
-			setAppearance (appearance: number) : void;
-			setAttributedHintText (attributedHintText: Ti.UI.iOS.AttributedString) : void;
-			setAttributedString (attributedString: Ti.UI.iOS.AttributedString) : void;
-			setAutoLink (autoLink: number) : void;
-			setAutocapitalization (autocapitalization: number) : void;
-			setAutocorrect (autocorrect: boolean) : void;
-			setBorderStyle (borderStyle: number) : void;
-			setClearButtonMode (clearButtonMode: number) : void;
-			setClearOnEdit (clearOnEdit: boolean) : void;
-			setColor (color: string) : void;
-			setEditable (editable: boolean) : void;
-			setEllipsize (ellipsize: boolean) : void;
-			setEnableReturnKey (enableReturnKey: boolean) : void;
-			setFont (font: Font) : void;
-			setHintText (hintText: string) : void;
-			setKeyboardToolbar (keyboardToolbar: Array<Ti.UI.View>) : void;
-			setKeyboardToolbar (keyboardToolbar: Ti.UI.iOS.Toolbar) : void;
-			setKeyboardToolbarColor (keyboardToolbarColor: string) : void;
-			setKeyboardToolbarHeight (keyboardToolbarHeight: number) : void;
-			setKeyboardType (keyboardType: number) : void;
-			setLeftButton (leftButton: any) : void;
-			setLeftButtonMode (leftButtonMode: number) : void;
-			setLeftButtonPadding (leftButtonPadding: number) : void;
-			setMaxLength (maxLength: number) : void;
-			setMinimumFontSize (minimumFontSize: number) : void;
-			setPaddingLeft (paddingLeft: number) : void;
-			setPaddingRight (paddingRight: number) : void;
-			setPasswordMask (passwordMask: boolean) : void;
-			setReturnKeyType (returnKeyType: number) : void;
-			setRightButton (rightButton: any) : void;
-			setRightButtonMode (rightButtonMode: number) : void;
-			setRightButtonPadding (rightButtonPadding: number) : void;
-			setSelection (start: number, end: number) : void;
-			setSuppressReturn (suppressReturn: boolean) : void;
-			setTextAlign (textAlign: string) : void;
-			setTextAlign (textAlign: number) : void;
-			setValue (value: string) : void;
-			setVerticalAlign (verticalAlign: number) : void;
-			setVerticalAlign (verticalAlign: string) : void;
-		}
-		export interface _3DMatrix extends Ti.Proxy {
-			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;
-			getM11 () : number;
-			getM12 () : number;
-			getM13 () : number;
-			getM14 () : number;
-			getM21 () : number;
-			getM22 () : number;
-			getM23 () : number;
-			getM24 () : number;
-			getM31 () : number;
-			getM32 () : number;
-			getM33 () : number;
-			getM34 () : number;
-			getM41 () : number;
-			getM42 () : number;
-			getM43 () : number;
-			getM44 () : number;
-			invert () : Ti.UI._3DMatrix;
-			multiply (t2: Ti.UI._3DMatrix) : Ti.UI._3DMatrix;
-			rotate (angle: number, x: number, y: number, z: number) : Ti.UI._3DMatrix;
-			scale (sx: number, sy: number, sz: number) : Ti.UI._3DMatrix;
-			setM11 (m11: number) : void;
-			setM12 (m12: number) : void;
-			setM13 (m13: number) : void;
-			setM14 (m14: number) : void;
-			setM21 (m21: number) : void;
-			setM22 (m22: number) : void;
-			setM23 (m23: number) : void;
-			setM24 (m24: number) : void;
-			setM31 (m31: number) : void;
-			setM32 (m32: number) : void;
-			setM33 (m33: number) : void;
-			setM34 (m34: number) : void;
-			setM41 (m41: number) : void;
-			setM42 (m42: number) : void;
-			setM43 (m43: number) : void;
-			setM44 (m44: number) : void;
-			translate (tx: number, ty: number, tz: number) : Ti.UI._3DMatrix;
-		}
-		export interface WebView extends Ti.UI.View {
-			cacheMode : number;
-			data : any;
-			disableBounce : boolean;
-			enableZoomControls : boolean;
-			handlePlatformUrl : boolean;
-			hideLoadIndicator : boolean;
-			html : string;
-			ignoreSslError : boolean;
-			lightTouchEnabled : boolean;
-			loading : boolean;
-			onCreateWindow : (...args : any[]) => any;
-			overScrollMode : number;
-			pluginState : number;
-			scalesPageToFit : boolean;
-			scrollsToTop : boolean;
-			showScrollbars : boolean;
-			url : string;
-			userAgent : string;
-			willHandleTouches : boolean;
-			canGoBack () : boolean;
-			canGoForward () : boolean;
-			evalJS (code: string) : string;
-			getCacheMode () : number;
-			getData () : any;
-			getDisableBounce () : boolean;
-			getEnableZoomControls () : boolean;
-			getHandlePlatformUrl () : boolean;
-			getHideLoadIndicator () : boolean;
-			getHtml () : string;
-			getIgnoreSslError () : boolean;
-			getLightTouchEnabled () : boolean;
-			getLoading () : boolean;
-			getOnCreateWindow () : (...args : any[]) => any;
-			getOverScrollMode () : number;
-			getPluginState () : number;
-			getScalesPageToFit () : boolean;
-			getScrollsToTop () : boolean;
-			getShowScrollbars () : boolean;
-			getUrl () : string;
-			getUserAgent () : string;
-			getWillHandleTouches () : boolean;
-			goBack () : void;
-			goForward () : void;
-			pause () : void;
-			release () : void;
-			reload () : void;
-			repaint () : void;
-			resume () : void;
-			setBasicAuthentication (username: string, password: string) : void;
-			setCacheMode (cacheMode: number) : void;
-			setData (data: Ti.Blob) : void;
-			setData (data: Ti.Filesystem.File) : void;
-			setDisableBounce (disableBounce: boolean) : void;
-			setEnableZoomControls (enableZoomControls: boolean) : void;
-			setHandlePlatformUrl (handlePlatformUrl: boolean) : void;
-			setHideLoadIndicator (hideLoadIndicator: boolean) : void;
-			setHtml (html: any, options?: Dictionary<Object>) : void;
-			setIgnoreSslError (ignoreSslError: boolean) : void;
-			setLightTouchEnabled (lightTouchEnabled: boolean) : void;
-			setLoading (loading: boolean) : void;
-			setOnCreateWindow (onCreateWindow: (...args : any[]) => any) : void;
-			setOverScrollMode (overScrollMode: number) : void;
-			setPluginState (pluginState: number) : void;
-			setScalesPageToFit (scalesPageToFit: boolean) : void;
-			setScrollsToTop (scrollsToTop: boolean) : void;
-			setShowScrollbars (showScrollbars: boolean) : void;
-			setUrl (url: string) : void;
-			setUserAgent (userAgent: string) : void;
-			setWillHandleTouches (willHandleTouches: boolean) : void;
-			stopLoading (hardStop: boolean) : void;
-		}
-		export interface Clipboard  {
-			clearData (type?: string) : void;
-			clearText () : void;
-			getData (type: string) : any;
-			getText () : string;
-			hasData (type: string) : boolean;
-			hasText () : any;
-			setData (type: string, data: any) : void;
-			setText (text: string) : void;
-		}
-		export interface ScrollableView extends Ti.UI.View {
-			cacheSize : number;
-			clipViews : boolean;
-			currentPage : number;
-			disableBounce : boolean;
-			hitRect : Dimension;
-			overScrollMode : number;
-			overlayEnabled : boolean;
-			pagingControlAlpha : number;
-			pagingControlColor : string;
-			pagingControlHeight : number;
-			pagingControlOnTop : boolean;
-			pagingControlTimeout : number;
-			scrollingEnabled : boolean;
-			showPagingControl : boolean;
-			views : Array<Ti.UI.View>;
-			addView (view: Ti.UI.View) : void;
-			getCacheSize () : number;
-			getClipViews () : boolean;
-			getCurrentPage () : number;
-			getDisableBounce () : boolean;
-			getHitRect () : Dimension;
-			getOverScrollMode () : number;
-			getOverlayEnabled () : boolean;
-			getPagingControlAlpha () : number;
-			getPagingControlColor () : string;
-			getPagingControlHeight () : number;
-			getPagingControlOnTop () : boolean;
-			getPagingControlTimeout () : number;
-			getScrollingEnabled () : boolean;
-			getShowPagingControl () : boolean;
-			getViews () : Array<Ti.UI.View>;
-			moveNext () : void;
-			movePrevious () : void;
-			removeView (view: number) : void;
-			removeView (view: Ti.UI.View) : void;
-			scrollToView (view: number) : void;
-			scrollToView (view: Ti.UI.View) : void;
-			setCacheSize (cacheSize: number) : void;
-			setCurrentPage (currentPage: number) : void;
-			setDisableBounce (disableBounce: boolean) : void;
-			setHitRect (hitRect: Dimension) : void;
-			setOverScrollMode (overScrollMode: number) : void;
-			setOverlayEnabled (overlayEnabled: boolean) : void;
-			setPagingControlAlpha (pagingControlAlpha: number) : void;
-			setPagingControlColor (pagingControlColor: string) : void;
-			setPagingControlHeight (pagingControlHeight: number) : void;
-			setPagingControlOnTop (pagingControlOnTop: boolean) : void;
-			setScrollingEnabled (scrollingEnabled: boolean) : void;
-			setShowPagingControl (showPagingControl: boolean) : void;
-			setViews (views: Array<Ti.UI.View>) : void;
-		}
-		export interface ListSection extends Ti.Proxy {
-			footerTitle : string;
-			footerView : Ti.UI.View;
-			headerTitle : string;
-			headerView : Ti.UI.View;
-			items : Array<ListDataItem>;
-			appendItems (dataItems: Array<ListDataItem>, animation?: ListViewAnimationProperties) : void;
-			deleteItemsAt (itemIndex: number, count: number, animation?: ListViewAnimationProperties) : void;
-			getFooterTitle () : string;
-			getFooterView () : Ti.UI.View;
-			getHeaderTitle () : string;
-			getHeaderView () : Ti.UI.View;
-			getItemAt (itemIndex: number) : ListDataItem;
-			getItems () : Array<ListDataItem>;
-			insertItemsAt (itemIndex: number, dataItems: Array<ListDataItem>, animation?: ListViewAnimationProperties) : void;
-			replaceItemsAt (index: number, count: number, dataItems: Array<ListDataItem>, animation?: ListViewAnimationProperties) : void;
-			setFooterTitle (footerTitle: string) : void;
-			setFooterView (footerView: Ti.UI.View) : void;
-			setHeaderTitle (headerTitle: string) : void;
-			setHeaderView (headerView: Ti.UI.View) : void;
-			setItems (dataItems: Array<ListDataItem>, animation?: ListViewAnimationProperties) : void;
-			updateItemAt (index: number, dataItem: ListDataItem, animation?: ListViewAnimationProperties) : void;
-		}
-		export interface ScrollView extends Ti.UI.View {
-			canCancelEvents : boolean;
-			contentHeight : any;
-			contentOffset : Dictionary<Object>;
-			contentWidth : any;
-			decelerationRate : number;
-			disableBounce : boolean;
-			horizontalBounce : boolean;
-			maxZoomScale : number;
-			minZoomScale : number;
-			overScrollMode : number;
-			scrollIndicatorStyle : number;
-			scrollType : string;
-			scrollingEnabled : boolean;
-			scrollsToTop : boolean;
-			showHorizontalScrollIndicator : boolean;
-			showVerticalScrollIndicator : boolean;
-			verticalBounce : boolean;
-			zoomScale : number;
-			getCanCancelEvents () : boolean;
-			getContentHeight () : any;
-			getContentOffset () : Dictionary<Object>;
-			getContentWidth () : any;
-			getDecelerationRate () : number;
-			getDisableBounce () : boolean;
-			getHorizontalBounce () : boolean;
-			getMaxZoomScale () : number;
-			getMinZoomScale () : number;
-			getOverScrollMode () : number;
-			getScrollIndicatorStyle () : number;
-			getScrollType () : string;
-			getScrollingEnabled () : boolean;
-			getScrollsToTop () : boolean;
-			getShowHorizontalScrollIndicator () : boolean;
-			getShowVerticalScrollIndicator () : boolean;
-			getVerticalBounce () : boolean;
-			getZoomScale () : number;
-			scrollTo (x: number, y: number) : void;
-			scrollToBottom () : void;
-			setCanCancelEvents (canCancelEvents: boolean) : void;
-			setContentHeight (contentHeight: number) : void;
-			setContentHeight (contentHeight: string) : void;
-			setContentOffset (contentOffset: Dictionary<Object>, animated?: contentOffsetOption) : void;
-			setContentWidth (contentWidth: number) : void;
-			setContentWidth (contentWidth: string) : void;
-			setDecelerationRate (decelerationRate: number) : void;
-			setDisableBounce (disableBounce: boolean) : void;
-			setHorizontalBounce (horizontalBounce: boolean) : void;
-			setMaxZoomScale (maxZoomScale: number) : void;
-			setMinZoomScale (minZoomScale: number) : void;
-			setOverScrollMode (overScrollMode: number) : void;
-			setScrollIndicatorStyle (scrollIndicatorStyle: number) : void;
-			setScrollingEnabled (scrollingEnabled: boolean) : void;
-			setScrollsToTop (scrollsToTop: boolean) : void;
-			setShowHorizontalScrollIndicator (showHorizontalScrollIndicator: boolean) : void;
-			setShowVerticalScrollIndicator (showVerticalScrollIndicator: boolean) : void;
-			setVerticalBounce (verticalBounce: boolean) : void;
-			setZoomScale (zoomScale: number, animated?: zoomScaleOption) : void;
-		}
-		export interface ListView extends Ti.UI.View {
-			allowsSelection : boolean;
-			canScroll : boolean;
-			caseInsensitiveSearch : boolean;
-			defaultItemTemplate : any;
-			editing : boolean;
-			footerDividersEnabled : boolean;
-			footerTitle : string;
-			footerView : Ti.UI.View;
-			headerDividersEnabled : boolean;
-			headerTitle : string;
-			headerView : Ti.UI.View;
-			keepSectionsInSearch : boolean;
-			pruneSectionsOnEdit : boolean;
-			pullView : Ti.UI.View;
-			refreshControl : Ti.UI.RefreshControl;
-			scrollIndicatorStyle : number;
-			searchText : string;
-			searchView : any;
-			sectionCount : number;
-			sectionIndexTitles : Array<ListViewIndexEntry>;
-			sections : Array<Ti.UI.ListSection>;
-			separatorColor : string;
-			separatorInsets : Dictionary<Object>;
-			separatorStyle : number;
-			showVerticalScrollIndicator : boolean;
-			style : number;
-			templates : Dictionary<Object>;
-			willScrollOnStatusTap : boolean;
-			appendSection (section: Ti.UI.ListSection, animation?: ListViewAnimationProperties) : void;
-			appendSection (section: Array<Ti.UI.ListSection>, animation?: ListViewAnimationProperties) : void;
-			deleteSectionAt (sectionIndex: number, animation?: ListViewAnimationProperties) : void;
-			deselectItem (sectionIndex: number, itemIndex: number) : void;
-			getAllowsSelection () : boolean;
-			getCanScroll () : boolean;
-			getCaseInsensitiveSearch () : boolean;
-			getDefaultItemTemplate () : any;
-			getEditing () : boolean;
-			getFooterDividersEnabled () : boolean;
-			getFooterTitle () : string;
-			getFooterView () : Ti.UI.View;
-			getHeaderDividersEnabled () : boolean;
-			getHeaderTitle () : string;
-			getHeaderView () : Ti.UI.View;
-			getKeepSectionsInSearch () : boolean;
-			getPruneSectionsOnEdit () : boolean;
-			getPullView () : Ti.UI.View;
-			getRefreshControl () : Ti.UI.RefreshControl;
-			getScrollIndicatorStyle () : number;
-			getSearchText () : string;
-			getSearchView () : any;
-			getSectionCount () : number;
-			getSectionIndexTitles () : Array<ListViewIndexEntry>;
-			getSections () : Array<Ti.UI.ListSection>;
-			getSeparatorColor () : string;
-			getSeparatorInsets () : Dictionary<Object>;
-			getSeparatorStyle () : number;
-			getShowVerticalScrollIndicator () : boolean;
-			getStyle () : number;
-			getTemplates () : Dictionary<Object>;
-			getWillScrollOnStatusTap () : boolean;
-			insertSectionAt (sectionIndex: number, section: Ti.UI.ListSection, animation?: ListViewAnimationProperties) : void;
-			insertSectionAt (sectionIndex: number, section: Array<Ti.UI.ListSection>, animation?: ListViewAnimationProperties) : void;
-			replaceSectionAt (sectionIndex: number, section: Ti.UI.ListSection, animation: ListViewAnimationProperties) : void;
-			scrollToItem (sectionIndex: number, itemIndex: number, animation?: ListViewAnimationProperties) : void;
-			selectItem (sectionIndex: number, itemIndex: number) : void;
-			setAllowsSelection (allowsSelection: boolean) : void;
-			setCanScroll (canScroll: boolean) : void;
-			setCaseInsensitiveSearch (caseInsensitiveSearch: boolean) : void;
-			setContentInsets (edgeInsets: ListViewEdgeInsets, animated?: ListViewContentInsetOption) : void;
-			setDefaultItemTemplate (defaultItemTemplate: string) : void;
-			setDefaultItemTemplate (defaultItemTemplate: number) : void;
-			setEditing (editing: boolean) : void;
-			setFooterTitle (footerTitle: string) : void;
-			setFooterView (footerView: Ti.UI.View) : void;
-			setHeaderTitle (headerTitle: string) : void;
-			setHeaderView (headerView: Ti.UI.View) : void;
-			setKeepSectionsInSearch (keepSectionsInSearch: boolean) : void;
-			setMarker (markerProps: ListViewMarkerProps) : void;
-			setPruneSectionsOnEdit (pruneSectionsOnEdit: boolean) : void;
-			setPullView (pullView: Ti.UI.View) : void;
-			setRefreshControl (refreshControl: Ti.UI.RefreshControl) : void;
-			setScrollIndicatorStyle (scrollIndicatorStyle: number) : void;
-			setSearchText (searchText: string) : void;
-			setSearchView (searchView: Ti.UI.SearchBar) : void;
-			setSearchView (searchView: Ti.UI.Android.SearchView) : void;
-			setSectionIndexTitles (sectionIndexTitles: Array<ListViewIndexEntry>) : void;
-			setSections (sections: Array<Ti.UI.ListSection>) : void;
-			setSeparatorColor (separatorColor: string) : void;
-			setSeparatorInsets (separatorInsets: Dictionary<Object>) : void;
-			setSeparatorStyle (separatorStyle: number) : void;
-			setShowVerticalScrollIndicator (showVerticalScrollIndicator: boolean) : void;
-			setWillScrollOnStatusTap (willScrollOnStatusTap: boolean) : void;
-		}
-		export interface TabGroup extends Ti.UI.View {
-			activeTab : Ti.UI.Tab;
-			activeTabBackgroundColor : string;
-			activeTabBackgroundDisabledColor : string;
-			activeTabBackgroundDisabledImage : string;
-			activeTabBackgroundFocusedColor : string;
-			activeTabBackgroundFocusedImage : string;
-			activeTabBackgroundImage : string;
-			activeTabBackgroundSelectedColor : string;
-			activeTabBackgroundSelectedImage : string;
-			activeTabIconTint : string;
-			activity : Ti.Android.Activity;
-			allowUserCustomization : boolean;
-			barColor : string;
-			editButtonTitle : string;
-			exitOnClose : boolean;
-			navBarHidden : boolean;
-			navTintColor : any;
-			shadowImage : string;
-			tabDividerColor : string;
-			tabDividerWidth : any;
-			tabHeight : any;
-			tabs : Array<Ti.UI.Tab>;
-			tabsAtBottom : boolean;
-			tabsBackgroundColor : string;
-			tabsBackgroundDisabledColor : string;
-			tabsBackgroundDisabledImage : string;
-			tabsBackgroundFocusedColor : string;
-			tabsBackgroundFocusedImage : string;
-			tabsBackgroundImage : string;
-			tabsBackgroundSelectedColor : string;
-			tabsBackgroundSelectedImage : string;
-			tabsTintColor : any;
-			title : string;
-			titleAttributes : titleAttributesParams;
-			translucent : boolean;
-			windowSoftInputMode : number;
-			addTab (tab: Ti.UI.Tab) : void;
-			close () : void;
-			getActiveTab () : Ti.UI.Tab;
-			getActiveTabBackgroundColor () : string;
-			getActiveTabBackgroundDisabledColor () : string;
-			getActiveTabBackgroundDisabledImage () : string;
-			getActiveTabBackgroundFocusedColor () : string;
-			getActiveTabBackgroundFocusedImage () : string;
-			getActiveTabBackgroundImage () : string;
-			getActiveTabBackgroundSelectedColor () : string;
-			getActiveTabBackgroundSelectedImage () : string;
-			getActiveTabIconTint () : string;
-			getActivity () : Ti.Android.Activity;
-			getAllowUserCustomization () : boolean;
-			getBarColor () : string;
-			getEditButtonTitle () : string;
-			getExitOnClose () : boolean;
-			getNavBarHidden () : boolean;
-			getNavTintColor () : string;
-			getShadowImage () : string;
-			getTabDividerColor () : string;
-			getTabDividerWidth () : any;
-			getTabHeight () : any;
-			getTabs () : Array<Ti.UI.Tab>;
-			getTabsAtBottom () : boolean;
-			getTabsBackgroundColor () : string;
-			getTabsBackgroundDisabledColor () : string;
-			getTabsBackgroundDisabledImage () : string;
-			getTabsBackgroundFocusedColor () : string;
-			getTabsBackgroundFocusedImage () : string;
-			getTabsBackgroundImage () : string;
-			getTabsBackgroundSelectedColor () : string;
-			getTabsBackgroundSelectedImage () : string;
-			getTabsTintColor () : string;
-			getTitle () : string;
-			getTitleAttributes () : titleAttributesParams;
-			getTranslucent () : boolean;
-			getWindowSoftInputMode () : number;
-			open () : void;
-			removeTab (tab: Ti.UI.Tab) : void;
-			setActiveTab (indexOrObject: number) : void;
-			setActiveTab (indexOrObject: Ti.UI.Tab) : void;
-			setActiveTabBackgroundColor (activeTabBackgroundColor: string) : void;
-			setActiveTabBackgroundDisabledColor (activeTabBackgroundDisabledColor: string) : void;
-			setActiveTabBackgroundDisabledImage (activeTabBackgroundDisabledImage: string) : void;
-			setActiveTabBackgroundFocusedColor (activeTabBackgroundFocusedColor: string) : void;
-			setActiveTabBackgroundFocusedImage (activeTabBackgroundFocusedImage: string) : void;
-			setActiveTabBackgroundImage (activeTabBackgroundImage: string) : void;
-			setActiveTabBackgroundSelectedColor (activeTabBackgroundSelectedColor: string) : void;
-			setActiveTabBackgroundSelectedImage (activeTabBackgroundSelectedImage: string) : void;
-			setActiveTabIconTint (activeTabIconTint: string) : void;
-			setAllowUserCustomization (allowUserCustomization: boolean) : void;
-			setBarColor (barColor: string) : void;
-			setEditButtonTitle (editButtonTitle: string) : void;
-			setExitOnClose (exitOnClose: boolean) : void;
-			setNavBarHidden (navBarHidden: boolean) : void;
-			setNavTintColor (navTintColor: string) : void;
-			setShadowImage (shadowImage: string) : void;
-			setTabDividerColor (tabDividerColor: string) : void;
-			setTabDividerWidth (tabDividerWidth: number) : void;
-			setTabDividerWidth (tabDividerWidth: string) : void;
-			setTabHeight (tabHeight: number) : void;
-			setTabHeight (tabHeight: string) : void;
-			setTabs (tabs: Array<Ti.UI.Tab>) : void;
-			setTabsAtBottom (tabsAtBottom: boolean) : void;
-			setTabsBackgroundColor (tabsBackgroundColor: string) : void;
-			setTabsBackgroundDisabledColor (tabsBackgroundDisabledColor: string) : void;
-			setTabsBackgroundDisabledImage (tabsBackgroundDisabledImage: string) : void;
-			setTabsBackgroundFocusedColor (tabsBackgroundFocusedColor: string) : void;
-			setTabsBackgroundFocusedImage (tabsBackgroundFocusedImage: string) : void;
-			setTabsBackgroundImage (tabsBackgroundImage: string) : void;
-			setTabsBackgroundSelectedColor (tabsBackgroundSelectedColor: string) : void;
-			setTabsBackgroundSelectedImage (tabsBackgroundSelectedImage: string) : void;
-			setTabsTintColor (tabsTintColor: string) : void;
-			setTitle (title: string) : void;
-			setTitleAttributes (titleAttributes: titleAttributesParams) : void;
-			setTranslucent (translucent: boolean) : void;
-		}
-		export interface TableView extends Ti.UI.View {
-			allowsSelection : boolean;
-			allowsSelectionDuringEditing : boolean;
-			data : any;
-			editable : boolean;
-			editing : boolean;
-			filterAnchored : boolean;
-			filterAttribute : string;
-			filterCaseInsensitive : boolean;
-			footerDividersEnabled : boolean;
-			footerTitle : string;
-			footerView : Ti.UI.View;
-			headerDividersEnabled : boolean;
-			headerPullView : Ti.UI.View;
-			headerTitle : string;
-			headerView : Ti.UI.View;
-			hideSearchOnSelection : boolean;
-			index : Array<TableViewIndexEntry>;
-			maxRowHeight : number;
-			minRowHeight : number;
-			moveable : boolean;
-			moving : boolean;
-			overScrollMode : number;
-			refreshControl : Ti.UI.RefreshControl;
-			rowHeight : number;
-			scrollIndicatorStyle : number;
-			scrollable : boolean;
-			scrollsToTop : boolean;
-			search : any;
-			searchAsChild : boolean;
-			searchHidden : boolean;
-			sectionCount : number;
-			sections : Array<Ti.UI.TableViewSection>;
-			separatorColor : string;
-			separatorInsets : Dictionary<Object>;
-			separatorStyle : number;
-			showVerticalScrollIndicator : boolean;
-			style : number;
-			appendRow (row: Ti.UI.TableViewRow, animation?: TableViewAnimationProperties) : void;
-			appendRow (row: Dictionary<Ti.UI.TableViewRow>, animation?: TableViewAnimationProperties) : void;
-			appendRow (row: Array<Ti.UI.TableViewRow>, animation?: TableViewAnimationProperties) : void;
-			appendRow (row: Array<Dictionary<Ti.UI.TableViewRow>>, animation?: TableViewAnimationProperties) : void;
-			appendSection (section: Ti.UI.TableViewSection, animation?: TableViewAnimationProperties) : void;
-			appendSection (section: Dictionary<Ti.UI.TableViewSection>, animation?: TableViewAnimationProperties) : void;
-			appendSection (section: Array<Ti.UI.TableViewSection>, animation?: TableViewAnimationProperties) : void;
-			appendSection (section: Array<Dictionary<Ti.UI.TableViewSection>>, animation?: TableViewAnimationProperties) : void;
-			deleteRow (row: number, animation?: TableViewAnimationProperties) : void;
-			deleteRow (row: Ti.UI.TableViewRow, animation?: TableViewAnimationProperties) : void;
-			deleteSection (section: number, animation?: TableViewAnimationProperties) : void;
-			deselectRow (row: number) : void;
-			getAllowsSelection () : boolean;
-			getAllowsSelectionDuringEditing () : boolean;
-			getData () : any;
-			getEditable () : boolean;
-			getEditing () : boolean;
-			getFilterAnchored () : boolean;
-			getFilterAttribute () : string;
-			getFilterCaseInsensitive () : boolean;
-			getFooterDividersEnabled () : boolean;
-			getFooterTitle () : string;
-			getFooterView () : Ti.UI.View;
-			getHeaderDividersEnabled () : boolean;
-			getHeaderPullView () : Ti.UI.View;
-			getHeaderTitle () : string;
-			getHeaderView () : Ti.UI.View;
-			getHideSearchOnSelection () : boolean;
-			getIndex () : Array<TableViewIndexEntry>;
-			getMaxRowHeight () : number;
-			getMinRowHeight () : number;
-			getMoveable () : boolean;
-			getMoving () : boolean;
-			getOverScrollMode () : number;
-			getRefreshControl () : Ti.UI.RefreshControl;
-			getRowHeight () : number;
-			getScrollIndicatorStyle () : number;
-			getScrollable () : boolean;
-			getScrollsToTop () : boolean;
-			getSearch () : any;
-			getSearchAsChild () : boolean;
-			getSearchHidden () : boolean;
-			getSectionCount () : number;
-			getSections () : Array<Ti.UI.TableViewSection>;
-			getSeparatorColor () : string;
-			getSeparatorInsets () : Dictionary<Object>;
-			getSeparatorStyle () : number;
-			getShowVerticalScrollIndicator () : boolean;
-			getStyle () : number;
-			insertRowAfter (index: number, row: Ti.UI.TableViewRow, animation?: TableViewAnimationProperties) : void;
-			insertRowAfter (index: number, row: Dictionary<Ti.UI.TableViewRow>, animation?: TableViewAnimationProperties) : void;
-			insertRowBefore (index: number, row: Ti.UI.TableViewRow, animation?: TableViewAnimationProperties) : void;
-			insertRowBefore (index: number, row: Dictionary<Ti.UI.TableViewRow>, animation?: TableViewAnimationProperties) : void;
-			insertSectionAfter (index: number, section: Ti.UI.TableViewSection, animation?: TableViewAnimationProperties) : void;
-			insertSectionAfter (index: number, section: Dictionary<Ti.UI.TableViewSection>, animation?: TableViewAnimationProperties) : void;
-			insertSectionBefore (index: number, section: Ti.UI.TableViewSection, animation?: TableViewAnimationProperties) : void;
-			insertSectionBefore (index: number, section: Dictionary<Ti.UI.TableViewSection>, animation?: TableViewAnimationProperties) : void;
-			scrollToIndex (index: number, animation?: TableViewAnimationProperties) : void;
-			scrollToTop (top: number, animation?: TableViewAnimationProperties) : void;
-			selectRow (row: number) : void;
-			setAllowsSelection (allowsSelection: boolean) : void;
-			setAllowsSelectionDuringEditing (allowsSelectionDuringEditing: boolean) : void;
-			setContentInsets (edgeInsets: TableViewEdgeInsets, animated?: TableViewContentInsetOption) : void;
-			setData (data: Array<Ti.UI.TableViewRow>, animation: TableViewAnimationProperties) : void;
-			setData (data: Array<Dictionary<Ti.UI.TableViewRow>>, animation: TableViewAnimationProperties) : void;
-			setData (data: Array<Ti.UI.TableViewSection>, animation: TableViewAnimationProperties) : void;
-			setEditable (editable: boolean) : void;
-			setEditing (editing: boolean) : void;
-			setFilterAnchored (filterAnchored: boolean) : void;
-			setFilterAttribute (filterAttribute: string) : void;
-			setFilterCaseInsensitive (filterCaseInsensitive: boolean) : void;
-			setFooterTitle (footerTitle: string) : void;
-			setFooterView (footerView: Ti.UI.View) : void;
-			setHeaderPullView (view: Ti.UI.View) : void;
-			setHeaderTitle (headerTitle: string) : void;
-			setHeaderView (headerView: Ti.UI.View) : void;
-			setHideSearchOnSelection (hideSearchOnSelection: boolean) : void;
-			setIndex (index: Array<TableViewIndexEntry>) : void;
-			setMaxRowHeight (maxRowHeight: number) : void;
-			setMinRowHeight (minRowHeight: number) : void;
-			setMoveable (moveable: boolean) : void;
-			setMoving (moving: boolean) : void;
-			setOverScrollMode (overScrollMode: number) : void;
-			setRefreshControl (refreshControl: Ti.UI.RefreshControl) : void;
-			setRowHeight (rowHeight: number) : void;
-			setScrollIndicatorStyle (scrollIndicatorStyle: number) : void;
-			setScrollable (scrollable: boolean) : void;
-			setScrollsToTop (scrollsToTop: boolean) : void;
-			setSearch (search: Ti.UI.SearchBar) : void;
-			setSearch (search: Ti.UI.Android.SearchView) : void;
-			setSearchAsChild (searchAsChild: boolean) : void;
-			setSearchHidden (searchHidden: boolean) : void;
-			setSections (sections: Array<Ti.UI.TableViewSection>) : void;
-			setSeparatorColor (separatorColor: string) : void;
-			setSeparatorInsets (separatorInsets: Dictionary<Object>) : void;
-			setSeparatorStyle (separatorStyle: number) : void;
-			setShowVerticalScrollIndicator (showVerticalScrollIndicator: boolean) : void;
-			setStyle (style: number) : void;
-			updateRow (index: number, row: Ti.UI.TableViewRow, animation: TableViewAnimationProperties) : void;
-			updateSection (index: number, section: Ti.UI.TableViewSection, animation: TableViewAnimationProperties) : void;
-		}
-		export interface Button extends Ti.UI.View {
-			color : string;
-			disabledColor : string;
-			font : Font;
-			image : any;
-			selectedColor : string;
-			shadowColor : string;
-			shadowOffset : Dictionary<Object>;
-			shadowRadius : number;
-			style : number;
-			systemButton : number;
-			textAlign : any;
-			title : string;
-			titleid : string;
-			verticalAlign : any;
-			getColor () : string;
-			getDisabledColor () : string;
-			getFont () : Font;
-			getImage () : any;
-			getSelectedColor () : string;
-			getShadowColor () : string;
-			getShadowOffset () : Dictionary<Object>;
-			getShadowRadius () : number;
-			getStyle () : number;
-			getSystemButton () : number;
-			getTextAlign () : any;
-			getTitle () : string;
-			getTitleid () : string;
-			getVerticalAlign () : any;
-			setColor (color: string) : void;
-			setDisabledColor (disabledColor: string) : void;
-			setFont (font: Font) : void;
-			setImage (image: string) : void;
-			setImage (image: Ti.Blob) : void;
-			setSelectedColor (selectedColor: string) : void;
-			setShadowColor (shadowColor: string) : void;
-			setShadowOffset (shadowOffset: Dictionary<Object>) : void;
-			setShadowRadius (shadowRadius: number) : void;
-			setStyle (style: number) : void;
-			setSystemButton (systemButton: number) : void;
-			setTextAlign (textAlign: string) : void;
-			setTextAlign (textAlign: number) : void;
-			setTitle (title: string) : void;
-			setTitleid (titleid: string) : void;
-			setVerticalAlign (verticalAlign: number) : void;
-			setVerticalAlign (verticalAlign: string) : void;
-		}
-		export interface OptionDialog extends Ti.Proxy {
-			androidView : Ti.UI.View;
-			buttonNames : Array<String>;
-			cancel : number;
-			destructive : number;
-			opaquebackground : boolean;
-			options : Array<String>;
-			persistent : boolean;
-			selectedIndex : number;
-			title : string;
-			titleid : string;
-			getAndroidView () : Ti.UI.View;
-			getButtonNames () : Array<String>;
-			getCancel () : number;
-			getDestructive () : number;
-			getOpaquebackground () : boolean;
-			getOptions () : Array<String>;
-			getPersistent () : boolean;
-			getSelectedIndex () : number;
-			getTitle () : string;
-			getTitleid () : string;
-			hide (params?: hideParams) : void;
-			setAndroidView (androidView: Ti.UI.View) : void;
-			setCancel (cancel: number) : void;
-			setOpaquebackground (opaquebackground: boolean) : void;
-			setPersistent (persistent: boolean) : void;
-			setTitle (title: string) : void;
-			setTitleid (titleid: string) : void;
-			show (params?: showParams) : void;
-		}
-		export interface RefreshControl extends Ti.Proxy {
-			tintColor : string;
-			title : Ti.UI.iOS.AttributedString;
-			beginRefreshing () : void;
-			endRefreshing () : void;
-			getTintColor () : string;
-			getTitle () : Ti.UI.iOS.AttributedString;
-			setTintColor (tintColor: string) : void;
-			setTitle (title: Ti.UI.iOS.AttributedString) : void;
-		}
-		export interface EmailDialog extends Ti.Proxy {
-			CANCELLED : number;
-			FAILED : number;
-			SAVED : number;
-			SENT : number;
-			barColor : string;
-			bccRecipients : Array<String>;
-			ccRecipients : Array<String>;
-			html : boolean;
-			messageBody : string;
-			subject : string;
-			toRecipients : Array<String>;
-			addAttachment (attachment: Ti.Blob) : void;
-			addAttachment (attachment: Ti.Filesystem.File) : void;
-			getBarColor () : string;
-			getBccRecipients () : Array<String>;
-			getCcRecipients () : Array<String>;
-			getHtml () : boolean;
-			getMessageBody () : string;
-			getSubject () : string;
-			getToRecipients () : Array<String>;
-			isSupported () : boolean;
-			open (properties: any) : void;
-			setBarColor (barColor: string) : void;
-			setBccRecipients (bccRecipients: Array<String>) : void;
-			setCcRecipients (ccRecipients: Array<String>) : void;
-			setHtml (html: boolean) : void;
-			setMessageBody (messageBody: string) : void;
-			setSubject (subject: string) : void;
-			setToRecipients (toRecipients: Array<String>) : void;
-		}
-		export interface CoverFlowView extends Ti.UI.View {
-			images : any;
-			selected : number;
-			getImages () : any;
-			getSelected () : number;
-			setImage (index: number, image: string) : void;
-			setImage (image: Ti.Blob) : void;
-			setImage (image: Ti.Filesystem.File) : void;
-			setImage (index: number, image: CoverFlowImageType) : void;
-			setImages (images: Array<String>) : void;
-			setImages (images: Array<Ti.Blob>) : void;
-			setImages (images: Array<Ti.Filesystem.File>) : void;
-			setImages (images: Array<CoverFlowImageType>) : void;
-			setSelected (selected: number) : void;
-		}
-		export interface ImageView extends Ti.UI.View {
-			animating : boolean;
-			autorotate : boolean;
-			decodeRetries : number;
-			defaultImage : string;
-			duration : number;
-			enableZoomControls : boolean;
-			hires : boolean;
-			image : any;
-			images : any;
-			paused : boolean;
-			preventDefaultImage : boolean;
-			repeatCount : number;
-			reverse : boolean;
-			url : string;
-			getAnimating () : boolean;
-			getAutorotate () : boolean;
-			getDecodeRetries () : number;
-			getDefaultImage () : string;
-			getDuration () : number;
-			getEnableZoomControls () : boolean;
-			getHires () : boolean;
-			getImage () : any;
-			getImages () : any;
-			getPaused () : boolean;
-			getPreventDefaultImage () : boolean;
-			getRepeatCount () : number;
-			getReverse () : boolean;
-			getUrl () : string;
-			pause () : void;
-			resume () : void;
-			setDecodeRetries (decodeRetries: number) : void;
-			setDefaultImage (defaultImage: string) : void;
-			setDuration (duration: number) : void;
-			setEnableZoomControls (enableZoomControls: boolean) : void;
-			setHires (hires: boolean) : void;
-			setImage (image: string) : void;
-			setImage (image: Ti.Blob) : void;
-			setImage (image: Ti.Filesystem.File) : void;
-			setImages (images: Array<String>) : void;
-			setImages (images: Array<Ti.Blob>) : void;
-			setImages (images: Array<Ti.Filesystem.File>) : void;
-			setPreventDefaultImage (preventDefaultImage: boolean) : void;
-			setRepeatCount (repeatCount: number) : void;
-			setReverse (reverse: boolean) : void;
-			setUrl (url: string) : void;
-			start () : void;
-			stop () : void;
-			toBlob () : void;
-		}
-		export interface MaskedImage extends Ti.UI.View {
-			image : string;
-			mask : string;
-			mode : number;
-			tint : string;
-			getImage () : string;
-			getMask () : string;
-			getMode () : number;
-			getTint () : string;
-			setImage (image: string) : void;
-			setMask (mask: string) : void;
-			setMode (mode: number) : void;
-			setTint (tint: string) : void;
-		}
-		export interface ProgressBar extends Ti.UI.View {
-			color : string;
-			font : Font;
-			max : number;
-			message : string;
-			min : number;
-			style : number;
-			value : number;
-			getColor () : string;
-			getFont () : Font;
-			getMax () : number;
-			getMessage () : string;
-			getMin () : number;
-			getStyle () : number;
-			getValue () : number;
-			setColor (color: string) : void;
-			setFont (font: Font) : void;
-			setMax (max: number) : void;
-			setMessage (message: string) : void;
-			setMin (min: number) : void;
-			setStyle (style: number) : void;
-			setValue (value: number) : void;
-		}
-		export module MobileWeb {
-			export var apiName : string;
-			export function addEventListener (name: string, callback: (...args : any[]) => any) : void;
-			export function applyProperties (props: Dictionary<Object>) : void;
-			export function createNavigationGroup (parameters?: Dictionary<Ti.UI.MobileWeb.NavigationGroup>) : Ti.UI.MobileWeb.NavigationGroup;
-			export function fireEvent (name: string, event: Dictionary<Object>) : void;
-			export function getApiName () : string;
-			export function removeEventListener (name: string, callback: (...args : any[]) => any) : void;
-			export enum TableViewSeparatorStyle {
-				NONE,
-				SINGLE_LINE
-			}
-			export interface NavigationGroup extends Ti.UI.View {
-				navBarAtTop : boolean;
-				window : Ti.UI.Window;
-				close (window: Ti.UI.Window, options: Dictionary<Object>) : void;
-				getNavBarAtTop () : boolean;
-				getWindow () : Ti.UI.Window;
-				open (window: Ti.UI.Window, options: Dictionary<Object>) : void;
-				setNavBarAtTop (navBarAtTop: boolean) : void;
-			}
-		}
-		export interface Label extends Ti.UI.View {
-			attributedString : Ti.UI.iOS.AttributedString;
-			autoLink : number;
-			backgroundPaddingBottom : number;
-			backgroundPaddingLeft : number;
-			backgroundPaddingRight : number;
-			backgroundPaddingTop : number;
-			color : string;
-			ellipsize : boolean;
-			font : Font;
-			highlightedColor : string;
-			html : string;
-			includeFontPadding : boolean;
-			minimumFontSize : number;
-			shadowColor : string;
-			shadowOffset : Dictionary<Object>;
-			shadowRadius : number;
-			text : string;
-			textAlign : any;
-			textid : string;
-			verticalAlign : any;
-			wordWrap : boolean;
-			getAttributedString () : Ti.UI.iOS.AttributedString;
-			getAutoLink () : number;
-			getBackgroundPaddingBottom () : number;
-			getBackgroundPaddingLeft () : number;
-			getBackgroundPaddingRight () : number;
-			getBackgroundPaddingTop () : number;
-			getColor () : string;
-			getEllipsize () : boolean;
-			getFont () : Font;
-			getHighlightedColor () : string;
-			getHtml () : string;
-			getIncludeFontPadding () : boolean;
-			getMinimumFontSize () : number;
-			getShadowColor () : string;
-			getShadowOffset () : Dictionary<Object>;
-			getShadowRadius () : number;
-			getText () : string;
-			getTextAlign () : any;
-			getTextid () : string;
-			getVerticalAlign () : any;
-			getWordWrap () : boolean;
-			setAttributedString (attributedString: Ti.UI.iOS.AttributedString) : void;
-			setAutoLink (autoLink: number) : void;
-			setBackgroundPaddingBottom (backgroundPaddingBottom: number) : void;
-			setBackgroundPaddingLeft (backgroundPaddingLeft: number) : void;
-			setBackgroundPaddingRight (backgroundPaddingRight: number) : void;
-			setBackgroundPaddingTop (backgroundPaddingTop: number) : void;
-			setColor (color: string) : void;
-			setEllipsize (ellipsize: boolean) : void;
-			setFont (font: Font) : void;
-			setHighlightedColor (highlightedColor: string) : void;
-			setHtml (html: string) : void;
-			setIncludeFontPadding (includeFontPadding: boolean) : void;
-			setMinimumFontSize (minimumFontSize: number) : void;
-			setShadowColor (shadowColor: string) : void;
-			setShadowOffset (shadowOffset: Dictionary<Object>) : void;
-			setShadowRadius (shadowRadius: number) : void;
-			setText (text: string) : void;
-			setTextAlign (textAlign: string) : void;
-			setTextAlign (textAlign: number) : void;
-			setTextid (textid: string) : void;
-			setVerticalAlign (verticalAlign: number) : void;
-			setVerticalAlign (verticalAlign: string) : void;
-			setWordWrap (wordWrap: boolean) : void;
-		}
-		export interface SearchBar extends Ti.UI.View {
-			autocapitalization : number;
-			autocorrect : boolean;
-			barColor : string;
-			hintText : string;
-			hinttextid : string;
-			keyboardType : number;
-			prompt : string;
-			promptid : string;
-			showBookmark : boolean;
-			showCancel : boolean;
-			value : string;
-			blur () : void;
-			focus () : void;
-			getAutocapitalization () : number;
-			getAutocorrect () : boolean;
-			getBarColor () : string;
-			getHintText () : string;
-			getHinttextid () : string;
-			getKeyboardType () : number;
-			getPrompt () : string;
-			getPromptid () : string;
-			getShowBookmark () : boolean;
-			getShowCancel () : boolean;
-			getValue () : string;
-			setAutocapitalization (autocapitalization: number) : void;
-			setAutocorrect (autocorrect: boolean) : void;
-			setBarColor (barColor: string) : void;
-			setHintText (hintText: string) : void;
-			setHinttextid (hinttextid: string) : void;
-			setKeyboardType (keyboardType: number) : void;
-			setPrompt (prompt: string) : void;
-			setPromptid (promptid: string) : void;
-			setShowBookmark (showBookmark: boolean) : void;
-			setShowCancel (showCancel: boolean, animated?: Dictionary<Object>) : void;
-			setValue (value: string) : void;
-		}
-		export interface SMSDialog extends Ti.Proxy {
-			CANCELLED : number;
-			FAILED : number;
-			SENT : number;
-			messageBody : string;
-			toRecipients : Array<String>;
-			getMessageBody () : string;
-			getToRecipients () : Array<String>;
-			isSupported () : boolean;
-			open () : void;
-			setMessageBody (messageBody: string) : void;
-			setToRecipients (toRecipients: Array<String>) : void;
-		}
-		export interface TableViewSection extends Ti.Proxy {
-			footerTitle : string;
-			footerView : Ti.UI.View;
-			headerTitle : string;
-			headerView : Ti.UI.View;
-			rowCount : number;
-			rows : Array<Ti.UI.TableViewRow>;
-			add (row: Ti.UI.TableViewRow) : void;
-			getFooterTitle () : string;
-			getFooterView () : Ti.UI.View;
-			getHeaderTitle () : string;
-			getHeaderView () : Ti.UI.View;
-			getRowCount () : number;
-			getRows () : Array<Ti.UI.TableViewRow>;
-			remove (row: Ti.UI.TableViewRow) : void;
-			rowAtIndex (index: number) : Ti.UI.TableViewRow;
-			setFooterTitle (footerTitle: string) : void;
-			setFooterView (footerView: Ti.UI.View) : void;
-			setHeaderTitle (headerTitle: string) : void;
-			setHeaderView (headerView: Ti.UI.View) : void;
-		}
-		export interface Animation extends Ti.Proxy {
-			anchorPoint : Point;
-			autoreverse : boolean;
-			backgroundColor : string;
-			bottom : number;
-			center : any;
-			color : string;
-			curve : number;
-			delay : number;
-			duration : number;
-			height : number;
-			left : number;
-			opacity : number;
-			opaque : boolean;
-			repeat : number;
-			right : number;
-			top : number;
-			transform : any;
-			transition : number;
-			view : Ti.UI.View;
-			visible : boolean;
-			width : number;
-			zIndex : number;
-			getAnchorPoint () : Point;
-			getAutoreverse () : boolean;
-			getBackgroundColor () : string;
-			getBottom () : number;
-			getCenter () : any;
-			getColor () : string;
-			getCurve () : number;
-			getDelay () : number;
-			getDuration () : number;
-			getHeight () : number;
-			getLeft () : number;
-			getOpacity () : number;
-			getOpaque () : boolean;
-			getRepeat () : number;
-			getRight () : number;
-			getTop () : number;
-			getTransform () : any;
-			getTransition () : number;
-			getView () : Ti.UI.View;
-			getVisible () : boolean;
-			getWidth () : number;
-			getZIndex () : number;
-			setAnchorPoint (anchorPoint: Point) : void;
-			setAutoreverse (autoreverse: boolean) : void;
-			setBackgroundColor (backgroundColor: string) : void;
-			setBottom (bottom: number) : void;
-			setCenter (center: any) : void;
-			setColor (color: string) : void;
-			setCurve (curve: number) : void;
-			setDelay (delay: number) : void;
-			setDuration (duration: number) : void;
-			setHeight (height: number) : void;
-			setLeft (left: number) : void;
-			setOpacity (opacity: number) : void;
-			setOpaque (opaque: boolean) : void;
-			setRepeat (repeat: number) : void;
-			setRight (right: number) : void;
-			setTop (top: number) : void;
-			setTransform (transform: Ti.UI._2DMatrix) : void;
-			setTransform (transform: Ti.UI._3DMatrix) : void;
-			setTransition (transition: number) : void;
-			setView (view: Ti.UI.View) : void;
-			setVisible (visible: boolean) : void;
-			setWidth (width: number) : void;
-			setZIndex (zIndex: number) : void;
-		}
-		export interface Toolbar extends Ti.UI.View {
-			barColor : string;
-			borderBottom : boolean;
-			borderTop : boolean;
-			items : Array<Ti.UI.View>;
-			translucent : boolean;
-			getBarColor () : string;
-			getBorderBottom () : boolean;
-			getBorderTop () : boolean;
-			getItems () : Array<Ti.UI.View>;
-			getTranslucent () : boolean;
-			setBarColor (barColor: string) : void;
-			setBorderBottom (borderBottom: boolean) : void;
-			setBorderTop (borderTop: boolean) : void;
-			setItems (items: Array<Ti.UI.View>) : void;
-			setTranslucent (translucent: boolean) : void;
-		}
-		export interface Notification extends Ti.UI.View {
-			duration : number;
-			horizontalMargin : number;
-			message : string;
-			verticalMargin : number;
-			xOffset : number;
-			yOffset : number;
-			getDuration () : number;
-			getHorizontalMargin () : number;
-			getMessage () : string;
-			getVerticalMargin () : number;
-			getXOffset () : number;
-			getYOffset () : number;
-			setDuration (duration: number) : void;
-			setHorizontalMargin (horizontalMargin: number) : void;
-			setMessage (message: string) : void;
-			setVerticalMargin (verticalMargin: number) : void;
-			setXOffset (xOffset: number) : void;
-			setYOffset (yOffset: number) : void;
-		}
-		export interface PickerColumn extends Ti.UI.View {
-			font : Font;
-			rowCount : number;
-			rows : Array<Ti.UI.PickerRow>;
-			selectedRow : Ti.UI.PickerRow;
-			addRow (row: Ti.UI.PickerRow) : void;
-			getFont () : Font;
-			getRowCount () : number;
-			getRows () : Array<Ti.UI.PickerRow>;
-			getSelectedRow () : Ti.UI.PickerRow;
-			removeRow (row: Ti.UI.PickerRow) : void;
-			setFont (font: Font) : void;
-			setSelectedRow (selectedRow: Ti.UI.PickerRow) : void;
-		}
-		export interface ActivityIndicator extends Ti.Proxy {
-			bottom : any;
-			color : string;
-			font : Font;
-			height : string;
-			indicatorColor : string;
-			indicatorDiameter : string;
-			left : any;
-			message : string;
-			messageid : string;
-			right : any;
-			style : number;
-			top : any;
-			width : string;
-			add () : void;
-			getBottom () : any;
-			getColor () : string;
-			getFont () : Font;
-			getHeight () : string;
-			getIndicatorColor () : string;
-			getIndicatorDiameter () : string;
-			getLeft () : any;
-			getMessage () : string;
-			getMessageid () : string;
-			getRight () : any;
-			getStyle () : number;
-			getTop () : any;
-			getWidth () : string;
-			hide () : void;
-			remove () : void;
-			setBottom (bottom: number) : void;
-			setBottom (bottom: string) : void;
-			setColor (color: string) : void;
-			setFont (font: Font) : void;
-			setHeight (height: string) : void;
-			setIndicatorColor (indicatorColor: string) : void;
-			setIndicatorDiameter (indicatorDiameter: string) : void;
-			setLeft (left: number) : void;
-			setLeft (left: string) : void;
-			setMessage (message: string) : void;
-			setMessageid (messageid: string) : void;
-			setRight (right: number) : void;
-			setRight (right: string) : void;
-			setStyle (style: number) : void;
-			setTop (top: number) : void;
-			setTop (top: string) : void;
-			setWidth (width: string) : void;
-			show () : void;
-		}
-		export interface Picker extends Ti.UI.View {
-			calendarViewShown : boolean;
-			columns : Array<Ti.UI.PickerColumn>;
-			countDownDuration : number;
-			font : Font;
-			format24 : boolean;
-			locale : string;
-			maxDate : Date;
-			minDate : Date;
-			minuteInterval : number;
-			selectionIndicator : boolean;
-			type : number;
-			useSpinner : boolean;
-			value : Date;
-			visibleItems : number;
-			add (data: Array<Ti.UI.PickerRow>) : void;
-			add (data: Ti.UI.PickerRow) : void;
-			add (data: Array<Ti.UI.PickerColumn>) : void;
-			add (data: Ti.UI.PickerColumn) : void;
-			getCalendarViewShown () : boolean;
-			getColumns () : Array<Ti.UI.PickerColumn>;
-			getCountDownDuration () : number;
-			getFont () : Font;
-			getFormat24 () : boolean;
-			getLocale () : string;
-			getMaxDate () : Date;
-			getMinDate () : Date;
-			getMinuteInterval () : number;
-			getSelectedRow (index: number) : Ti.UI.PickerRow;
-			getSelectionIndicator () : boolean;
-			getType () : number;
-			getUseSpinner () : boolean;
-			getValue () : Date;
-			getVisibleItems () : number;
-			reloadColumn (column: Ti.UI.PickerColumn) : void;
-			setCalendarViewShown (calendarViewShown: boolean) : void;
-			setColumns (columns: Array<Ti.UI.PickerColumn>) : void;
-			setCountDownDuration (countDownDuration: number) : void;
-			setFont (font: Font) : void;
-			setFormat24 (format24: boolean) : void;
-			setLocale (locale: string) : void;
-			setMaxDate (maxDate: Date) : void;
-			setMinDate (minDate: Date) : void;
-			setMinuteInterval (minuteInterval: number) : void;
-			setSelectedRow (column: number, row: number, animated?: boolean) : void;
-			setSelectionIndicator (selectionIndicator: boolean) : void;
-			setType (type: number) : void;
-			setUseSpinner (useSpinner: boolean) : void;
-			setValue (date: any, suppressEvent: boolean) : Ti.UI.PickerRow;
-			setVisibleItems (visibleItems: number) : void;
-			showDatePickerDialog (dictObj: any) : void;
-			showTimePickerDialog (dictObj: any) : void;
-		}
-	}
-	export enum Module {
+
+	/**
+	 * A container for binary data.
+	 */
+	interface Blob extends Titanium.Proxy {
+		/**
+		 * File object represented by this blob, or `null` if this blob is not
+		 * associated with a file.
+		 */
+		readonly file: Titanium.Filesystem.File;
+
+		/**
+		 * Length of this blob in bytes.
+		 */
+		readonly length: number;
+
+		/**
+		 * UTF-8 string representation of the data in this blob.
+		 */
+		readonly text: string;
+
+		/**
+		 * Mime type of the data in this blob.
+		 */
+		readonly mimeType: string;
+
+		/**
+		 * If this blob represents an image, this is the height of the image in pixels.
+		 */
+		readonly height: number;
+
+		/**
+		 * If this blob represents an image, this is the width of the image in pixels.
+		 */
+		readonly width: number;
+
+		/**
+		 * If this blob represents a [File](Titanium.Filesystem.File), this is the file URL
+		 * that represents it.
+		 */
+		readonly nativePath: string;
+
+		/**
+		 * Size of the blob in pixels (for image blobs) or bytes (for all other blobs).
+		 */
+		readonly size: number;
+
+		/**
+		 * Returns a string representation of this blob.
+		 */
+		toString(): string;
+
+		/**
+		 * Appends the data from another blob to this blob.
+		 */
+		append(blob: Titanium.Blob): void;
+
+		/**
+		 * Creates a new blob by cropping the underlying image to the specified dimensions.
+		 */
+		imageAsCropped(options: any): Titanium.Blob;
+
+		/**
+		 * Creates a new blob by resizing and scaling the underlying image to the specified dimensions.
+		 */
+		imageAsResized(width: number, height: number): Titanium.Blob;
+
+		/**
+		 * Creates a new blob by compressing the underlying image to the specified quality.
+		 */
+		imageAsCompressed(quality: number): Titanium.Blob;
+
+		/**
+		 * Returns a thumbnail version of the underlying image, optionally with a border and rounded corners.
+		 */
+		imageAsThumbnail(size: number, borderSize?: number, cornerRadius?: number): Titanium.Blob;
+
+		/**
+		 * Returns a copy of the underlying image with an added alpha channel.
+		 */
+		imageWithAlpha(): Titanium.Blob;
+
+		/**
+		 * Returns a copy of the underlying image with rounded corners added.
+		 */
+		imageWithRoundedCorner(cornerSize: number, borderSize?: number): Titanium.Blob;
+
+		/**
+		 * Returns a copy of the underlying image with an added transparent border.
+		 */
+		imageWithTransparentBorder(size: number): Titanium.Blob;
+
+		/**
+		 * Gets the value of the <Titanium.Blob.file> property.
+		 */
+		getFile(): Titanium.Filesystem.File;
+
+		/**
+		 * Gets the value of the <Titanium.Blob.length> property.
+		 */
+		getLength(): number;
+
+		/**
+		 * Gets the value of the <Titanium.Blob.text> property.
+		 */
+		getText(): string;
+
+		/**
+		 * Gets the value of the <Titanium.Blob.mimeType> property.
+		 */
+		getMimeType(): string;
+
+		/**
+		 * Gets the value of the <Titanium.Blob.height> property.
+		 */
+		getHeight(): number;
+
+		/**
+		 * Gets the value of the <Titanium.Blob.width> property.
+		 */
+		getWidth(): number;
+
+		/**
+		 * Gets the value of the <Titanium.Blob.nativePath> property.
+		 */
+		getNativePath(): string;
+
+		/**
+		 * Gets the value of the <Titanium.Blob.size> property.
+		 */
+		getSize(): number;
 
 	}
-	export interface API  {
-		debug (message: Array<String>) : void;
-		debug (message: string) : void;
-		error (message: Array<String>) : void;
-		error (message: string) : void;
-		info (message: Array<String>) : void;
-		info (message: string) : void;
-		log (level: string, message: Array<String>) : void;
-		log (level: string, message: string) : void;
-		timestamp (message: Array<String>) : void;
-		timestamp (message: string) : void;
-		trace (message: Array<String>) : void;
-		trace (message: string) : void;
-		warn (message: Array<String>) : void;
-		warn (message: string) : void;
+
+	/**
+	 * Wrapper around <Titanium.Blob> that implements the <Titanium.IOStream> interface.
+	 */
+	interface BlobStream extends Titanium.Proxy {
+		/**
+		 * Reads data from this stream into a buffer.
+		 */
+		read(buffer: Titanium.Buffer, offset?: number, length?: number): number;
+
+		/**
+		 * Writes data from a buffer to this stream.
+		 */
+		write(buffer: Titanium.Buffer, offset?: number, length?: number): number;
+
+		/**
+		 * Indicates whether this stream is writable.
+		 */
+		isWritable(): boolean;
+
+		/**
+		 * Indicates whether this stream is readable.
+		 */
+		isReadable(): boolean;
+
+		/**
+		 * Closes this stream.
+		 */
+		close(): void;
+
 	}
-	export module Geolocation {
-		export var ACCURACY_BEST : number;
-		export var ACCURACY_BEST_FOR_NAVIGATION : number;
-		export var ACCURACY_HIGH : number;
-		export var ACCURACY_HUNDRED_METERS : number;
-		export var ACCURACY_KILOMETER : number;
-		export var ACCURACY_LOW : number;
-		export var ACCURACY_NEAREST_TEN_METERS : number;
-		export var ACCURACY_THREE_KILOMETERS : number;
-		export var ACTIVITYTYPE_AUTOMOTIVE_NAVIGATION : string;
-		export var ACTIVITYTYPE_FITNESS : string;
-		export var ACTIVITYTYPE_OTHER : string;
-		export var ACTIVITYTYPE_OTHER_NAVIGATION : string;
-		export var AUTHORIZATION_ALWAYS : number;
-		export var AUTHORIZATION_AUTHORIZED : number;
-		export var AUTHORIZATION_DENIED : number;
-		export var AUTHORIZATION_RESTRICTED : number;
-		export var AUTHORIZATION_UNKNOWN : number;
-		export var AUTHORIZATION_WHEN_IN_USE : number;
-		export var ERROR_DENIED : number;
-		export var ERROR_HEADING_FAILURE : number;
-		export var ERROR_LOCATION_UNKNOWN : number;
-		export var ERROR_NETWORK : number;
-		export var ERROR_REGION_MONITORING_DELAYED : number;
-		export var ERROR_REGION_MONITORING_DENIED : number;
-		export var ERROR_REGION_MONITORING_FAILURE : number;
-		export var ERROR_TIMEOUT : number;
-		export var PROVIDER_GPS : string;
-		export var PROVIDER_NETWORK : string;
-		export var PROVIDER_PASSIVE : string;
-		export var accuracy : number;
-		export var activityType : number;
-		export var apiName : string;
-		export var bubbleParent : boolean;
-		export var distanceFilter : number;
-		export var frequency : number;
-		export var hasCompass : boolean;
-		export var headingFilter : number;
-		export var lastGeolocation : string;
-		export var locationServicesAuthorization : number;
-		export var locationServicesEnabled : boolean;
-		export var pauseLocationUpdateAutomatically : boolean;
-		export var preferredProvider : string;
-		export var purpose : string;
-		export var showCalibration : boolean;
-		export var trackSignificantLocationChange : boolean;
-		export function addEventListener (name: string, callback: (...args : any[]) => any) : void;
-		export function applyProperties (props: Dictionary<Object>) : void;
-		export function fireEvent (name: string, event: Dictionary<Object>) : void;
-		export function forwardGeocoder (address: string, callback: (...args : any[]) => any) : void;
-		export function getAccuracy () : number;
-		export function getActivityType () : number;
-		export function getApiName () : string;
-		export function getBubbleParent () : boolean;
-		export function getCurrentHeading (callback: (...args : any[]) => any) : void;
-		export function getCurrentPosition (callback: (...args : any[]) => any) : void;
-		export function getDistanceFilter () : number;
-		export function getFrequency () : number;
-		export function getHasCompass () : boolean;
-		export function getHeadingFilter () : number;
-		export function getLastGeolocation () : string;
-		export function getLocationServicesAuthorization () : number;
-		export function getLocationServicesEnabled () : boolean;
-		export function getPauseLocationUpdateAutomatically () : boolean;
-		export function getPreferredProvider () : string;
-		export function getPurpose () : string;
-		export function getShowCalibration () : boolean;
-		export function getTrackSignificantLocationChange () : boolean;
-		export function removeEventListener (name: string, callback: (...args : any[]) => any) : void;
-		export function reverseGeocoder (latitude: number, longitude: number, callback: (...args : any[]) => any) : void;
-		export function setAccuracy (accuracy: number) : void;
-		export function setActivityType (activityType: number) : void;
-		export function setBubbleParent (bubbleParent: boolean) : void;
-		export function setDistanceFilter (distanceFilter: number) : void;
-		export function setFrequency (frequency: number) : void;
-		export function setHeadingFilter (headingFilter: number) : void;
-		export function setLocationServicesAuthorization (locationServicesAuthorization: number) : void;
-		export function setPauseLocationUpdateAutomatically (pauseLocationUpdateAutomatically: boolean) : void;
-		export function setPreferredProvider (preferredProvider: string) : void;
-		export function setPurpose (purpose: string) : void;
-		export function setShowCalibration (showCalibration: boolean) : void;
-		export function setTrackSignificantLocationChange (trackSignificantLocationChange: boolean) : void;
-		export module Android {
-			export var apiName : string;
-			export var bubbleParent : boolean;
-			export var manualMode : boolean;
-			export function addEventListener (name: string, callback: (...args : any[]) => any) : void;
-			export function addLocationProvider (provider: Ti.Geolocation.Android.LocationProvider) : void;
-			export function addLocationRule (rule: Ti.Geolocation.Android.LocationRule) : void;
-			export function applyProperties (props: Dictionary<Object>) : void;
-			export function createLocationProvider (parameters?: Dictionary<Ti.Geolocation.Android.LocationProvider>) : Ti.Geolocation.Android.LocationProvider;
-			export function createLocationRule (parameters?: Dictionary<Ti.Geolocation.Android.LocationRule>) : Ti.Geolocation.Android.LocationRule;
-			export function fireEvent (name: string, event: Dictionary<Object>) : void;
-			export function getApiName () : string;
-			export function getBubbleParent () : boolean;
-			export function getManualMode () : boolean;
-			export function removeEventListener (name: string, callback: (...args : any[]) => any) : void;
-			export function removeLocationProvider (provider: Ti.Geolocation.Android.LocationProvider) : void;
-			export function removeLocationRule (rule: Ti.Geolocation.Android.LocationRule) : void;
-			export function setBubbleParent (bubbleParent: boolean) : void;
-			export function setManualMode (manualMode: boolean) : void;
-			export interface LocationProvider extends Ti.Proxy {
-				minUpdateDistance : number;
-				minUpdateTime : number;
-				name : string;
-				getMinUpdateDistance () : number;
-				getMinUpdateTime () : number;
-				getName () : string;
-				setMinUpdateDistance (minUpdateDistance: number) : void;
-				setMinUpdateTime (minUpdateTime: number) : void;
-				setName (name: string) : void;
+
+	/**
+	 * Buffer is a mutable, resizable container for raw data.
+	 */
+	interface Buffer extends Titanium.Proxy {
+		/**
+		 * Length of the buffer in bytes.
+		 */
+		length: number;
+
+		/**
+		 * Data to be encoded.
+		 */
+		value: number | string;
+
+		/**
+		 * The type of data encoding to use with `value`.
+		 */
+		type: string;
+
+		/**
+		 * Byte order of this buffer.
+		 */
+		byteOrder: number;
+
+		/**
+		 * Appends `sourceBuffer` to the this buffer.
+		 */
+		append(sourceBuffer: Titanium.Buffer, sourceOffset?: number, sourceLength?: number): number;
+
+		/**
+		 * Inserts data from `sourceBuffer` into this buffer at `offset`.
+		 */
+		insert(sourceBuffer: Titanium.Buffer, offset: number, sourceOffset?: number, sourceLength?: number): number;
+
+		/**
+		 * Copies data from `sourceBuffer` into the current buffer at `offset`.
+		 */
+		copy(sourceBuffer: Titanium.Buffer, offset: number, sourceOffset?: number, sourceLength?: number): number;
+
+		/**
+		 * Creates a complete or partial copy of this buffer.
+		 */
+		clone(offset?: number, length?: number): Titanium.Buffer;
+
+		/**
+		 * Fills this buffer with the specified byte value.
+		 */
+		fill(fillByte: number, offset?: number, length?: number): void;
+
+		/**
+		 * Clears this buffer's contents but does not change the size of the buffer.
+		 */
+		clear(): void;
+
+		/**
+		 * Releases the space allocated to the buffer, and sets its length to 0.
+		 */
+		release(): void;
+
+		/**
+		 * Converts this buffer to a String.
+		 */
+		toString(): string;
+
+		/**
+		 * Converts this buffer to a <Titanium.Blob>.
+		 */
+		toBlob(): Titanium.Blob;
+
+		/**
+		 * Gets the value of the <Titanium.Buffer.length> property.
+		 */
+		getLength(): number;
+
+		/**
+		 * Sets the value of the <Titanium.Buffer.length> property.
+		 */
+		setLength(length: number): void;
+
+		/**
+		 * Gets the value of the <Titanium.Buffer.value> property.
+		 */
+		getValue(): number | string;
+
+		/**
+		 * Sets the value of the <Titanium.Buffer.value> property.
+		 */
+		setValue(value: number): void;
+
+		/**
+		 * Sets the value of the <Titanium.Buffer.value> property.
+		 */
+		setValue(value: string): void;
+
+		/**
+		 * Gets the value of the <Titanium.Buffer.type> property.
+		 */
+		getType(): string;
+
+		/**
+		 * Sets the value of the <Titanium.Buffer.type> property.
+		 */
+		setType(type: string): void;
+
+		/**
+		 * Gets the value of the <Titanium.Buffer.byteOrder> property.
+		 */
+		getByteOrder(): number;
+
+		/**
+		 * Sets the value of the <Titanium.Buffer.byteOrder> property.
+		 */
+		setByteOrder(byteOrder: number): void;
+
+	}
+
+	/**
+	 * Wrapper around <Titanium.Buffer> that implements the <Titanium.IOStream> interface.
+	 */
+	interface BufferStream extends Titanium.Proxy {
+		/**
+		 * Reads data from this stream into a buffer.
+		 */
+		read(buffer: Titanium.Buffer, offset?: number, length?: number): number;
+
+		/**
+		 * Writes data from a buffer to this stream.
+		 */
+		write(buffer: Titanium.Buffer, offset?: number, length?: number): number;
+
+		/**
+		 * Indicates whether this stream is writable.
+		 */
+		isWritable(): boolean;
+
+		/**
+		 * Indicates whether this stream is readable.
+		 */
+		isReadable(): boolean;
+
+		/**
+		 * Closes this stream.
+		 */
+		close(): void;
+
+	}
+
+	/**
+	 * The base type for all Titanium events.
+	 */
+	interface Event {
+		/**
+		 * Source object that fired the event.
+		 */
+		readonly source: any;
+
+		/**
+		 * Name of the event fired.
+		 */
+		readonly type: string;
+
+		/**
+		 * True if the event will try to bubble up if possible.
+		 */
+		readonly bubbles: boolean;
+
+		/**
+		 * Set to true to stop the event from bubbling.
+		 */
+		cancelBubble: boolean;
+
+	}
+
+	/**
+	 * IOStream is the interface that all stream types implement.
+	 */
+	// tslint:disable-next-line:interface-name
+	interface IOStream extends Titanium.Proxy {
+		/**
+		 * Reads data from this stream into a buffer.
+		 */
+		read(buffer: Titanium.Buffer, offset?: number, length?: number): number;
+
+		/**
+		 * Writes data from a buffer to this stream.
+		 */
+		write(buffer: Titanium.Buffer, offset?: number, length?: number): number;
+
+		/**
+		 * Indicates whether this stream is writable.
+		 */
+		isWritable(): boolean;
+
+		/**
+		 * Indicates whether this stream is readable.
+		 */
+		isReadable(): boolean;
+
+		/**
+		 * Closes this stream.
+		 */
+		close(): void;
+
+	}
+
+
+	/**
+	 * The main <Titanium.UI> module.
+	 */
+	namespace UI {
+		/**
+		 * Indicates if the proxy will bubble an event to its parent.
+		 */
+		let bubbleParent: boolean;
+
+		/**
+		 * The name of the API that this proxy corresponds to.
+		 */
+		const apiName: string;
+
+		/**
+		 * The Window or TabGroup whose Activity lifecycle should be triggered on the proxy.
+		 */
+		let lifecycleContainer: Titanium.UI.Window | Titanium.UI.TabGroup;
+
+		/**
+		 * Use with [Animation.curve](Titanium.UI.Animation.curve) to specify an animation that starts
+		 * slowly and speeds up.
+		 */
+		const ANIMATION_CURVE_EASE_IN: number;
+
+		/**
+		 * Use with [Animation.curve](Titanium.UI.Animation.curve) to specify an animation that starts
+		 * slowly, and speeds up, then slows down at the end of the animation.
+		 */
+		const ANIMATION_CURVE_EASE_IN_OUT: number;
+
+		/**
+		 * Use with [Animation.curve](Titanium.UI.Animation.curve) to specify an animation that starts
+		 * quickly, then slows down at the end of the animation.
+		 */
+		const ANIMATION_CURVE_EASE_OUT: number;
+
+		/**
+		 * Use with [Animation.curve](Titanium.UI.Animation.curve) to specify an animation that proceeds
+		 * at a constant rate.
+		 */
+		const ANIMATION_CURVE_LINEAR: number;
+
+		/**
+		 * Use with <Attribute.type> to specify a font.
+		 */
+		const ATTRIBUTE_FONT: number;
+
+		/**
+		 * Use with <Attribute.type> to specify a font color.
+		 */
+		const ATTRIBUTE_FOREGROUND_COLOR: number;
+
+		/**
+		 * Use with <Attribute.type> to specify a background color.
+		 */
+		const ATTRIBUTE_BACKGROUND_COLOR: number;
+
+		/**
+		 * Use with <Attribute.type> to enable or disable ligatures.
+		 */
+		const ATTRIBUTE_LIGATURE: number;
+
+		/**
+		 * Use with <Attribute.value> to use a letterpress text effect.
+		 */
+		const ATTRIBUTE_LETTERPRESS_STYLE: number;
+
+		/**
+		 * Use with <Attribute.type> to specify kerning (space between characters).
+		 */
+		const ATTRIBUTE_KERN: number;
+
+		/**
+		 * Use with <Attribute.type> to place a horizontal line through the text.
+		 */
+		const ATTRIBUTE_STRIKETHROUGH_STYLE: number;
+
+		/**
+		 * Use with <Attribute.type> to place a horizontal line under the text.
+		 */
+		const ATTRIBUTE_UNDERLINES_STYLE: number;
+
+		/**
+		 * Use with <Attribute.type> to place the text in an upper position.
+		 */
+		const ATTRIBUTE_SUPERSCRIPT_STYLE: number;
+
+		/**
+		 * Use with <Attribute.type> to place the text in a lower position.
+		 */
+		const ATTRIBUTE_SUBSCRIPT_STYLE: number;
+
+		/**
+		 * Use with <Attribute.type> to specify a color for the stroke text.
+		 */
+		const ATTRIBUTE_STROKE_COLOR: number;
+
+		/**
+		 * Use with <Attribute.type> to specify the width of the stroke text.
+		 */
+		const ATTRIBUTE_STROKE_WIDTH: number;
+
+		/**
+		 * Use with <Attribute.type> to display a shadow behind the text.
+		 */
+		const ATTRIBUTE_SHADOW: number;
+
+		/**
+		 * Use with <Attribute.type> to control the direction of the text.
+		 */
+		const ATTRIBUTE_WRITING_DIRECTION: number;
+
+		/**
+		 * Use with <Attribute.type> to apply a text effect.
+		 */
+		const ATTRIBUTE_TEXT_EFFECT: number;
+
+		/**
+		 * Use with <Attribute.type> to create a link.
+		 */
+		const ATTRIBUTE_LINK: number;
+
+		/**
+		 * Use with <Attribute.type> to apply a different baseline to the text.
+		 */
+		const ATTRIBUTE_BASELINE_OFFSET: number;
+
+		/**
+		 * Use with <Attribute.type> to change the color of the horizontal line.
+		 */
+		const ATTRIBUTE_UNDERLINE_COLOR: number;
+
+		/**
+		 * Use with <Attribute.type> to change the color of the horizontal line.
+		 */
+		const ATTRIBUTE_STRIKETHROUGH_COLOR: number;
+
+		/**
+		 * Use with <Attribute.type> to skew the text.
+		 */
+		const ATTRIBUTE_OBLIQUENESS: number;
+
+		/**
+		 * Use with <Attribute.type> to stretch the text horizontally.
+		 */
+		const ATTRIBUTE_EXPANSION: number;
+
+		/**
+		 * Use with <Attribute.type> to wrap and truncate the text.
+		 */
+		const ATTRIBUTE_LINE_BREAK: number;
+
+		/**
+		 * Use with <Attribute.value> to not draw a line.
+		 */
+		const ATTRIBUTE_UNDERLINE_STYLE_NONE: number;
+
+		/**
+		 * Use with <Attribute.value> to draw a single line.
+		 */
+		const ATTRIBUTE_UNDERLINE_STYLE_SINGLE: number;
+
+		/**
+		 * Use with <Attribute.value> to draw a thick line.
+		 */
+		const ATTRIBUTE_UNDERLINE_STYLE_THICK: number;
+
+		/**
+		 * Use with <Attribute.value> to draw a double line.
+		 */
+		const ATTRIBUTE_UNDERLINE_STYLE_DOUBLE: number;
+
+		/**
+		 * Use with <Attribute.value> to draw a solid line.
+		 */
+		const ATTRIBUTE_UNDERLINE_PATTERN_SOLID: number;
+
+		/**
+		 * Use with <Attribute.value> to draw a dotted line.
+		 */
+		const ATTRIBUTE_UNDERLINE_PATTERN_DOT: number;
+
+		/**
+		 * Use with <Attribute.value> to draw a dashed line.
+		 */
+		const ATTRIBUTE_UNDERLINE_PATTERN_DASH: number;
+
+		/**
+		 * Use with <Attribute.value> to draw an alternating line of dashes and dots.
+		 */
+		const ATTRIBUTE_UNDERLINE_PATTERN_DASH_DOT: number;
+
+		/**
+		 * Use with <Attribute.value> to draw an alternating line of dashes and two dots.
+		 */
+		const ATTRIBUTE_UNDERLINE_PATTERN_DASH_DOT_DOT: number;
+
+		/**
+		 * Use with <Attribute.value> to draw a line only underneath or through words.
+		 */
+		const ATTRIBUTE_UNDERLINE_BY_WORD: number;
+
+		/**
+		 * Use with <Attribute.value> to use the embedded text direction.
+		 */
+		const ATTRIBUTE_WRITING_DIRECTION_EMBEDDING: number;
+
+		/**
+		 * Use with <Attribute.value> to override the text direction.
+		 */
+		const ATTRIBUTE_WRITING_DIRECTION_OVERRIDE: number;
+
+		/**
+		 * Use with <Attribute.value> to use the
+		 * [Unicode Bidirection Algorithm rules P2 and P3](http://www.unicode.org/reports/tr9/#The_Paragraph_Level)
+		 * to determine which direction to use.
+		 */
+		const ATTRIBUTE_WRITING_DIRECTION_NATURAL: number;
+
+		/**
+		 * Use with <Attribute.value> to write text left to right.
+		 */
+		const ATTRIBUTE_WRITING_DIRECTION_LEFT_TO_RIGHT: number;
+
+		/**
+		 * Use with <Attribute.value> to write text right to left.
+		 */
+		const ATTRIBUTE_WRITING_DIRECTION_RIGHT_TO_LEFT: number;
+
+		/**
+		 * Use with <Attribute.value> to wrap words at word boundaries.
+		 */
+		const ATTRIBUTE_LINE_BREAK_BY_WORD_WRAPPING: number;
+
+		/**
+		 * Use with <Attribute.value> to wrap words at word boundaries.
+		 */
+		const ATTRIBUTE_LINE_BREAK_BY_CHAR_WRAPPING: number;
+
+		/**
+		 * Use with <Attribute.value> to set lines to not draw past the edge of the text container.
+		 */
+		const ATTRIBUTE_LINE_BREAK_BY_CLIPPING: number;
+
+		/**
+		 * Use with <Attribute.value> to use ellipsis glyph at the beginning of the line for missing text.
+		 */
+		const ATTRIBUTE_LINE_BREAK_BY_TRUNCATING_HEAD: number;
+
+		/**
+		 * Use with <Attribute.value> to use ellipsis glyph at the middle of the line for missing text.
+		 */
+		const ATTRIBUTE_LINE_BREAK_BY_TRUNCATING_MIDDLE: number;
+
+		/**
+		 * Use with <Attribute.value> to use ellipsis glyph at the end of the line for missing text.
+		 */
+		const ATTRIBUTE_LINE_BREAK_BY_TRUNCATING_TAIL: number;
+
+		/**
+		 * Converts strings formatted as addresses into clickable links.
+		 */
+		const AUTODETECT_ADDRESS: number;
+
+		/**
+		 * Converts all detectable types of data into clickable links.
+		 */
+		const AUTODETECT_ALL: number;
+
+		/**
+		 * Converts strings formatted as calendar events into clickable links.
+		 */
+		const AUTODETECT_CALENDAR: number;
+
+		/**
+		 * Converts strings formatted as URLs into clickable links.
+		 */
+		const AUTODETECT_LINK: number;
+
+		/**
+		 * Disables converting strings into clickable links.
+		 */
+		const AUTODETECT_NONE: number;
+
+		/**
+		 * Converts strings formatted as phone numbers into clickable links.
+		 */
+		const AUTODETECT_PHONE: number;
+
+		/**
+		 * Specifies the expectation of an account or login name.
+		 */
+		const AUTOFILL_TYPE_USERNAME: string;
+
+		/**
+		 * Specifies the expectation of a password.
+		 */
+		const AUTOFILL_TYPE_PASSWORD: string;
+
+		/**
+		 * Specifies the expectation of a name.
+		 */
+		const AUTOFILL_TYPE_NAME: string;
+
+		/**
+		 * Specifies the expectation of a prefix or title, such as 'Dr.'
+		 */
+		const AUTOFILL_TYPE_NAME_PREFIX: string;
+
+		/**
+		 * Specifies the expectation of a given name.
+		 */
+		const AUTOFILL_TYPE_GIVEN_NAME: string;
+
+		/**
+		 * Specifies the expectation of a middle name.
+		 */
+		const AUTOFILL_TYPE_MIDDLE_NAME: string;
+
+		/**
+		 * Specifies the expectation of a family name.
+		 */
+		const AUTOFILL_TYPE_FAMILY_NAME: string;
+
+		/**
+		 * Specifies the expectation of a suffix, such as 'Jr.'
+		 */
+		const AUTOFILL_TYPE_NAME_SUFFIX: string;
+
+		/**
+		 * Specifies the expectation of a nickname.
+		 */
+		const AUTOFILL_TYPE_NICKNAME: string;
+
+		/**
+		 * Specifies the expectation of a job title.
+		 */
+		const AUTOFILL_TYPE_JOB_TITLE: string;
+
+		/**
+		 * Specifies the expectation of an organization name.
+		 */
+		const AUTOFILL_TYPE_ORGANIZATION_NAME: string;
+
+		/**
+		 * Specifies the expectation of a location, such as a point of interest, an address, or another way to identify a location.
+		 */
+		const AUTOFILL_TYPE_LOCATION: string;
+
+		/**
+		 * Specifies the expectation of an address.
+		 */
+		const AUTOFILL_TYPE_ADDRESS: string;
+
+		/**
+		 * Specifies the expectation of the first line of a street address.
+		 */
+		const AUTOFILL_TYPE_ADDRESS_LINE1: string;
+
+		/**
+		 * Specifies the expectation of the second line of a street address.
+		 */
+		const AUTOFILL_TYPE_ADDRESS_LINE2: string;
+
+		/**
+		 * Specifies the expectation of a city name.
+		 */
+		const AUTOFILL_TYPE_ADDRESS_CITY: string;
+
+		/**
+		 * Specifies the expectation of a state name.
+		 */
+		const AUTOFILL_TYPE_ADDRESS_STATE: string;
+
+		/**
+		 * Specifies the expectation of a city name combined with a state name.
+		 */
+		const AUTOFILL_TYPE_ADDRESS_CITY_STATE: string;
+
+		/**
+		 * Specifies the expectation of a sublocality.
+		 */
+		const AUTOFILL_TYPE_SUBLOCALITY: string;
+
+		/**
+		 * Specifies the expectation of a country name.
+		 */
+		const AUTOFILL_TYPE_COUNTRY_NAME: string;
+
+		/**
+		 * Specifies the expectation of a postal code.
+		 */
+		const AUTOFILL_TYPE_POSTAL_CODE: string;
+
+		/**
+		 * Specifies the expectation of a telephone number.
+		 */
+		const AUTOFILL_TYPE_PHONE: string;
+
+		/**
+		 * Specifies the expectation of an email address.
+		 */
+		const AUTOFILL_TYPE_EMAIL: string;
+
+		/**
+		 * Specifies the expectation of a URL.
+		 */
+		const AUTOFILL_TYPE_URL: string;
+
+		/**
+		 * Specifies the expectation of a card number.
+		 */
+		const AUTOFILL_TYPE_CARD_NUMBER: string;
+
+		/**
+		 * Specifies the expectation of a card security code.
+		 */
+		const AUTOFILL_TYPE_CARD_SECURITY_CODE: string;
+
+		/**
+		 * Specifies the expectation of a card expiration date.
+		 */
+		const AUTOFILL_TYPE_CARD_EXPIRATION_DATE: string;
+
+		/**
+		 * Specifies the expectation of a card expectation day.
+		 */
+		const AUTOFILL_TYPE_CARD_EXPIRATION_DAY: string;
+
+		/**
+		 * Specifies the expectation of a card expectation month.
+		 */
+		const AUTOFILL_TYPE_CARD_EXPIRATION_MONTH: string;
+
+		/**
+		 * Specifies the expectation of a card expectation year.
+		 */
+		const AUTOFILL_TYPE_CARD_EXPIRATION_YEAR: string;
+
+		/**
+		 * Converts strings formatted as addresses into clickable links.
+		 */
+		const AUTOLINK_MAP_ADDRESSES: number;
+
+		/**
+		 * Converts all detectable types of data into clickable links.
+		 */
+		const AUTOLINK_ALL: number;
+
+		/**
+		 * Converts strings formatted as calendar events into clickable links.
+		 */
+		const AUTOLINK_CALENDAR: number;
+
+		/**
+		 * Converts strings formatted as URLs into clickable links.
+		 */
+		const AUTOLINK_URLS: number;
+
+		/**
+		 * Disables converting strings into clickable links.
+		 */
+		const AUTOLINK_NONE: number;
+
+		/**
+		 * Converts strings formatted as phone numbers into clickable links.
+		 */
+		const AUTOLINK_PHONE_NUMBERS: number;
+
+		/**
+		 * Converts strings formatted as email addresses into clickable links.
+		 */
+		const AUTOLINK_EMAIL_ADDRESSES: number;
+
+		/**
+		 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+		 */
+		const BLEND_MODE_CLEAR: number;
+
+		/**
+		 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+		 */
+		const BLEND_MODE_COLOR: number;
+
+		/**
+		 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+		 */
+		const BLEND_MODE_COLOR_BURN: number;
+
+		/**
+		 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+		 */
+		const BLEND_MODE_COLOR_DODGE: number;
+
+		/**
+		 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+		 */
+		const BLEND_MODE_COPY: number;
+
+		/**
+		 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+		 */
+		const BLEND_MODE_DARKEN: number;
+
+		/**
+		 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+		 */
+		const BLEND_MODE_DESTINATION_ATOP: number;
+
+		/**
+		 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+		 */
+		const BLEND_MODE_DESTINATION_IN: number;
+
+		/**
+		 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+		 */
+		const BLEND_MODE_DESTINATION_OUT: number;
+
+		/**
+		 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+		 */
+		const BLEND_MODE_DESTINATION_OVER: number;
+
+		/**
+		 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+		 */
+		const BLEND_MODE_DIFFERENCE: number;
+
+		/**
+		 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+		 */
+		const BLEND_MODE_EXCLUSION: number;
+
+		/**
+		 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+		 */
+		const BLEND_MODE_HARD_LIGHT: number;
+
+		/**
+		 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+		 */
+		const BLEND_MODE_HUE: number;
+
+		/**
+		 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+		 */
+		const BLEND_MODE_LIGHTEN: number;
+
+		/**
+		 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+		 */
+		const BLEND_MODE_LUMINOSITY: number;
+
+		/**
+		 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+		 */
+		const BLEND_MODE_MULTIPLY: number;
+
+		/**
+		 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+		 */
+		const BLEND_MODE_NORMAL: number;
+
+		/**
+		 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+		 */
+		const BLEND_MODE_OVERLAY: number;
+
+		/**
+		 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+		 */
+		const BLEND_MODE_PLUS_DARKER: number;
+
+		/**
+		 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+		 */
+		const BLEND_MODE_PLUS_LIGHTER: number;
+
+		/**
+		 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+		 */
+		const BLEND_MODE_SATURATION: number;
+
+		/**
+		 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+		 */
+		const BLEND_MODE_SCREEN: number;
+
+		/**
+		 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+		 */
+		const BLEND_MODE_SOFT_LIGHT: number;
+
+		/**
+		 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+		 */
+		const BLEND_MODE_SOURCE_ATOP: number;
+
+		/**
+		 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+		 */
+		const BLEND_MODE_SOURCE_IN: number;
+
+		/**
+		 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+		 */
+		const BLEND_MODE_SOURCE_OUT: number;
+
+		/**
+		 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+		 */
+		const BLEND_MODE_XOR: number;
+
+		/**
+		 * Use when creating a TextField to specify the hintType as static.
+		 */
+		const HINT_TYPE_STATIC: number;
+
+		/**
+		 * Use when creating a TextField to specify the hintType as animated.
+		 */
+		const HINT_TYPE_ANIMATED: number;
+
+		/**
+		 * Add ellipses at word boundaries, unless the word itself doesn't fit on a single line.
+		 */
+		const TEXT_ELLIPSIZE_TRUNCATE_WORD_WRAP: number;
+
+		/**
+		 * Add ellipses before the first character that doesnt fit.
+		 */
+		const TEXT_ELLIPSIZE_TRUNCATE_CHAR_WRAP: number;
+
+		/**
+		 * Lines are simply not drawn past the edge of the text container.
+		 */
+		const TEXT_ELLIPSIZE_TRUNCATE_CLIP: number;
+
+		/**
+		 * Add ellipses at the beginning of the label if the text is too large to fit.
+		 */
+		const TEXT_ELLIPSIZE_TRUNCATE_START: number;
+
+		/**
+		 * Add ellipses in the middle of the label if the text is too large to fit.
+		 */
+		const TEXT_ELLIPSIZE_TRUNCATE_MIDDLE: number;
+
+		/**
+		 * Add ellipses at the end of the label if the text is too large to fit.
+		 */
+		const TEXT_ELLIPSIZE_TRUNCATE_END: number;
+
+		/**
+		 * Turns on a marquee effect of the label if the text is too large to fit. (This requires <Titanium.UI.Label.focusable> to be true)
+		 */
+		const TEXT_ELLIPSIZE_TRUNCATE_MARQUEE: number;
+
+		/**
+		 * Disables ellipsizing of the label. The text will be cut off if it is too long.
+		 */
+		const TEXT_ELLIPSIZE_TRUNCATE_NONE: number;
+
+		/**
+		 * Specifies that the top edge of the window can extend.
+		 */
+		const EXTEND_EDGE_TOP: number;
+
+		/**
+		 * Specifies that the bottom edge of the window can extend.
+		 */
+		const EXTEND_EDGE_BOTTOM: number;
+
+		/**
+		 * Specifies that the left edge of the window can extend.
+		 */
+		const EXTEND_EDGE_LEFT: number;
+
+		/**
+		 * Specifies that the right edge of the window can extend.
+		 */
+		const EXTEND_EDGE_RIGHT: number;
+
+		/**
+		 * Specifies that none of the edges of the window can extend.
+		 */
+		const EXTEND_EDGE_NONE: number;
+
+		/**
+		 * Specifies that all the edges of the window can extend.
+		 */
+		const EXTEND_EDGE_ALL: number;
+
+		/**
+		 * Constant value for face-down orientation.
+		 */
+		const FACE_DOWN: number;
+
+		/**
+		 * Constant value for face-up orientation.
+		 */
+		const FACE_UP: number;
+
+		/**
+		 * FILL behavior for UI layout.
+		 */
+		const FILL: string;
+
+		/**
+		 * Release free space when hiding an object.
+		 */
+		const HIDDEN_BEHAVIOR_GONE: number;
+
+		/**
+		 * Keeps free space when hiding an object.
+		 */
+		const HIDDEN_BEHAVIOR_INVISIBLE: number;
+
+		/**
+		 * Use a bezel-style border on the input field.
+		 */
+		const INPUT_BORDERSTYLE_BEZEL: number;
+
+		/**
+		 * Use a simple line border on the input field.
+		 */
+		const INPUT_BORDERSTYLE_LINE: number;
+
+		/**
+		 * Use no border on the input field.
+		 */
+		const INPUT_BORDERSTYLE_NONE: number;
+
+		/**
+		 * Use a rounded-rectangle border on the input field.
+		 */
+		const INPUT_BORDERSTYLE_ROUNDED: number;
+
+		/**
+		 * Always show buttons on the input field.
+		 */
+		const INPUT_BUTTONMODE_ALWAYS: number;
+
+		/**
+		 * Never show buttons on the input field.
+		 */
+		const INPUT_BUTTONMODE_NEVER: number;
+
+		/**
+		 * Show buttons on the input field when it loses focus.
+		 */
+		const INPUT_BUTTONMODE_ONBLUR: number;
+
+		/**
+		 * Show buttons on the input field when it gains focus.
+		 */
+		const INPUT_BUTTONMODE_ONFOCUS: number;
+
+		/**
+		 * Use a keyboard with a number pad only, with the pad keyboard layout. Accepts only numbers.
+		 */
+		const INPUT_TYPE_CLASS_NUMBER: number;
+
+		/**
+		 * Use an ASCII keyboard, with the standard keyboard layout.
+		 */
+		const INPUT_TYPE_CLASS_TEXT: number;
+
+		/**
+		 * Use a keyboard appearance suitable for entering text on an alert.
+		 */
+		const KEYBOARD_APPEARANCE_ALERT: number;
+
+		/**
+		 * Use the platform-specific default keyboard appearance.
+		 */
+		const KEYBOARD_APPEARANCE_DEFAULT: number;
+
+		/**
+		 * Use the platform-specific dark keyboard appearance.
+		 */
+		const KEYBOARD_APPEARANCE_DARK: number;
+
+		/**
+		 * Use the platform-specific light keyboard appearance.
+		 */
+		const KEYBOARD_APPEARANCE_LIGHT: number;
+
+		/**
+		 * Use an ASCII keyboard, with the standard keyboard layout.
+		 */
+		const KEYBOARD_ASCII: number;
+
+		/**
+		 * Use a keyboard with decimal numbers only, with the pad keyboard layout.
+		 */
+		const KEYBOARD_DECIMAL_PAD: number;
+
+		/**
+		 * Use the default keyboard, depending on the platform.
+		 */
+		const KEYBOARD_DEFAULT: number;
+
+		/**
+		 * Use a keyboard suitable for composing email, with the standard keyboard layout.
+		 */
+		const KEYBOARD_EMAIL: number;
+
+		/**
+		 * Use a keyboard suitable for entering names and phone numbers, with the pad keyboard layout.
+		 */
+		const KEYBOARD_NAMEPHONE_PAD: number;
+
+		/**
+		 * Use a keyboard with numbers and punctuation only, with the standard keyboard layout.
+		 */
+		const KEYBOARD_NUMBERS_PUNCTUATION: number;
+
+		/**
+		 * Use a keyboard with a number pad only, with the pad keyboard layout.
+		 */
+		const KEYBOARD_NUMBER_PAD: number;
+
+		/**
+		 * Use a keyboard with a phone-style number pad, with the pad keyboard layout.
+		 */
+		const KEYBOARD_PHONE_PAD: number;
+
+		/**
+		 * Use a keyboard optimized for entering URLs, with the standard keyboard layout.
+		 */
+		const KEYBOARD_URL: number;
+
+		/**
+		 * Use a keyboard with decimal numbers only, with the pad keyboard layout.
+		 */
+		const KEYBOARD_TYPE_DECIMAL_PAD: number;
+
+		/**
+		 * Use an ASCII keyboard, with the standard keyboard layout.
+		 */
+		const KEYBOARD_TYPE_ASCII: number;
+
+		/**
+		 * Use the default keyboard, depending on the platform.
+		 */
+		const KEYBOARD_TYPE_DEFAULT: number;
+
+		/**
+		 * Use a keyboard suitable for composing email, with the standard keyboard layout.
+		 */
+		const KEYBOARD_TYPE_EMAIL: number;
+
+		/**
+		 * Use a keyboard suitable for entering names and phone numbers, with the pad keyboard layout.
+		 */
+		const KEYBOARD_TYPE_NAMEPHONE_PAD: number;
+
+		/**
+		 * Use a keyboard with numbers and punctuation only, with the standard keyboard layout.
+		 */
+		const KEYBOARD_TYPE_NUMBERS_PUNCTUATION: number;
+
+		/**
+		 * Use a keyboard with a number pad only, with the pad keyboard layout.
+		 */
+		const KEYBOARD_TYPE_NUMBER_PAD: number;
+
+		/**
+		 * Use a keyboard with a phone-style number pad, with the pad keyboard layout.
+		 */
+		const KEYBOARD_TYPE_PHONE_PAD: number;
+
+		/**
+		 * Use a keyboard optimized for web search terms and URL entry.
+		 */
+		const KEYBOARD_TYPE_WEBSEARCH: number;
+
+		/**
+		 * Use a keyboard optimized for twitter text entry, with easy access to the @ and
+		 */
+		const KEYBOARD_TYPE_TWITTER: number;
+
+		/**
+		 * Use a keyboard optimized for entering URLs, with the standard keyboard layout.
+		 */
+		const KEYBOARD_TYPE_URL: number;
+
+		/**
+		 * Standard landscape orientation (home button on left).
+		 */
+		const LANDSCAPE_LEFT: number;
+
+		/**
+		 * Reverse landscape orientation (home button on right).
+		 */
+		const LANDSCAPE_RIGHT: number;
+
+		/**
+		 * Do not display anything on the right side of an item in a list view.
+		 */
+		const LIST_ACCESSORY_TYPE_NONE: number;
+
+		/**
+		 * Displays a checkmark on the right side of an item in a list view.
+		 */
+		const LIST_ACCESSORY_TYPE_CHECKMARK: number;
+
+		/**
+		 * Displays a detail disclosure button on the right side of an item in a list view.
+		 */
+		const LIST_ACCESSORY_TYPE_DETAIL: number;
+
+		/**
+		 * Displays a disclosure indicator on the right side of an item in a list view.
+		 */
+		const LIST_ACCESSORY_TYPE_DISCLOSURE: number;
+
+		/**
+		 * A built-in style for an item with an image view and left-aligned title label.
+		 */
+		const LIST_ITEM_TEMPLATE_DEFAULT: number;
+
+		/**
+		 * A built-in style for a item with an image view; a left-aligned title label; and a
+		 * right-aligned subtitle label.
+		 */
+		const LIST_ITEM_TEMPLATE_SETTINGS: number;
+
+		/**
+		 * A built-in style for an item with a right-aligned title label on the left side of the cell,
+		 * which is next to a left-aligned subtitle label.
+		 */
+		const LIST_ITEM_TEMPLATE_CONTACTS: number;
+
+		/**
+		 * A built-in style for an item with an image view; a black, left-aligned title label across the
+		 * top of the cell and a subtitle label below it.
+		 */
+		const LIST_ITEM_TEMPLATE_SUBTITLE: number;
+
+		/**
+		 * Specifies a long duration for an Android Toast notification (<Titanium.UI.Notification>).
+		 */
+		const NOTIFICATION_DURATION_LONG: number;
+
+		/**
+		 * Specifies a short duration for an Android Toast notification (<Titanium.UI.Notification>).
+		 */
+		const NOTIFICATION_DURATION_SHORT: number;
+
+		/**
+		 * Specifies that the clipboard items should not be available to other devices through Handoff.
+		 */
+		const CLIPBOARD_OPTION_LOCAL_ONLY: string;
+
+		/**
+		 * Specifies the time and date that you want the system to remove the clipboard items from the clipboard.
+		 */
+		const CLIPBOARD_OPTION_EXPIRATION_DATE: string;
+
+		/**
+		 * Use a picker with a countdown timer appearance, showing hours and minutes.
+		 */
+		const PICKER_TYPE_COUNT_DOWN_TIMER: number;
+
+		/**
+		 * Use a date picker.
+		 */
+		const PICKER_TYPE_DATE: number;
+
+		/**
+		 * Use a date and time picker.
+		 */
+		const PICKER_TYPE_DATE_AND_TIME: number;
+
+		/**
+		 * Use a plain picker (for values other than date or time).
+		 */
+		const PICKER_TYPE_PLAIN: number;
+
+		/**
+		 * Use a time picker.
+		 */
+		const PICKER_TYPE_TIME: number;
+
+		/**
+		 * Orientation constant for portrait mode orientation.
+		 */
+		const PORTRAIT: number;
+
+		/**
+		 * Set the return key text to "Continue".
+		 */
+		const RETURNKEY_CONTINUE: number;
+
+		/**
+		 * Use the default return key on the virtual keyboard.
+		 */
+		const RETURNKEY_DEFAULT: number;
+
+		/**
+		 * Set the return key text to "Done".
+		 */
+		const RETURNKEY_DONE: number;
+
+		/**
+		 * Set the return key text to "Emergency Call".
+		 */
+		const RETURNKEY_EMERGENCY_CALL: number;
+
+		/**
+		 * Set the return key text to "Go".
+		 */
+		const RETURNKEY_GO: number;
+
+		/**
+		 * Set the return key text to "Google".
+		 */
+		const RETURNKEY_GOOGLE: number;
+
+		/**
+		 * Set the return key text to "Join".
+		 */
+		const RETURNKEY_JOIN: number;
+
+		/**
+		 * Set the return key text to "Next".
+		 */
+		const RETURNKEY_NEXT: number;
+
+		/**
+		 * Set the return key text to "Route".
+		 */
+		const RETURNKEY_ROUTE: number;
+
+		/**
+		 * Set the return key text to "Search".
+		 */
+		const RETURNKEY_SEARCH: number;
+
+		/**
+		 * Set the return key text to "Send".
+		 */
+		const RETURNKEY_SEND: number;
+
+		/**
+		 * Set the return key text to "Yahoo".
+		 */
+		const RETURNKEY_YAHOO: number;
+
+		/**
+		 * SIZE behavior for UI layout.
+		 */
+		const SIZE: string;
+
+		/**
+		 * The row divider is hidden.
+		 */
+		const TABLE_VIEW_SEPARATOR_STYLE_NONE: number;
+
+		/**
+		 * The row divider is shown as a single line.
+		 */
+		const TABLE_VIEW_SEPARATOR_STYLE_SINGLE_LINE: number;
+
+		/**
+		 * Center align text.
+		 */
+		const TEXT_ALIGNMENT_CENTER: number | string;
+
+		/**
+		 * Justify align text.
+		 */
+		const TEXT_ALIGNMENT_JUSTIFY: number | string;
+
+		/**
+		 * Left align text.
+		 */
+		const TEXT_ALIGNMENT_LEFT: number | string;
+
+		/**
+		 * Right align text.
+		 */
+		const TEXT_ALIGNMENT_RIGHT: number | string;
+
+		/**
+		 * Auto-capitalize all text in the input field.
+		 */
+		const TEXT_AUTOCAPITALIZATION_ALL: number;
+
+		/**
+		 * Do not auto-capitalize.
+		 */
+		const TEXT_AUTOCAPITALIZATION_NONE: number;
+
+		/**
+		 * Use sentence-style auto-capitalization in the input field.
+		 */
+		const TEXT_AUTOCAPITALIZATION_SENTENCES: number;
+
+		/**
+		 * Auto-capitalize the first letter of each word in the input field.
+		 */
+		const TEXT_AUTOCAPITALIZATION_WORDS: number;
+
+		/**
+		 * Specifies the text style for the <Font> Object.
+		 */
+		const TEXT_STYLE_HEADLINE: string;
+
+		/**
+		 * Specifies the text style for the <Font> Object.
+		 */
+		const TEXT_STYLE_SUBHEADLINE: string;
+
+		/**
+		 * Specifies the text style for the <Font> Object.
+		 */
+		const TEXT_STYLE_BODY: string;
+
+		/**
+		 * Specifies the text style for the <Font> Object.
+		 */
+		const TEXT_STYLE_FOOTNOTE: string;
+
+		/**
+		 * Specifies the text style for the <Font> Object.
+		 */
+		const TEXT_STYLE_CAPTION1: string;
+
+		/**
+		 * Specifies the text style for the <Font> Object.
+		 */
+		const TEXT_STYLE_CAPTION2: string;
+
+		/**
+		 * Specifies the text style for the <Font> Object.
+		 */
+		const TEXT_STYLE_CALLOUT: string;
+
+		/**
+		 * Specifies the text style for the <Font> Object.
+		 */
+		const TEXT_STYLE_TITLE1: string;
+
+		/**
+		 * Specifies the text style for the <Font> Object.
+		 */
+		const TEXT_STYLE_TITLE2: string;
+
+		/**
+		 * Specifies the text style for the <Font> Object.
+		 */
+		const TEXT_STYLE_TITLE3: string;
+
+		/**
+		 * Align text to the bottom of the view.
+		 */
+		const TEXT_VERTICAL_ALIGNMENT_BOTTOM: number | string;
+
+		/**
+		 * Vertically align text to the center of the view.
+		 */
+		const TEXT_VERTICAL_ALIGNMENT_CENTER: number | string;
+
+		/**
+		 * Align text to the top of the view.
+		 */
+		const TEXT_VERTICAL_ALIGNMENT_TOP: number | string;
+
+		/**
+		 * Unit constant representing units in centimeters.
+		 */
+		const UNIT_CM: string;
+
+		/**
+		 * Unit constant representing units in density-independent pixels.
+		 */
+		const UNIT_DIP: string;
+
+		/**
+		 * Unit constant representing units in inches.
+		 */
+		const UNIT_IN: string;
+
+		/**
+		 * Unit constant representing units in millimeters.
+		 */
+		const UNIT_MM: string;
+
+		/**
+		 * Unit constant representing units in pixels.
+		 */
+		const UNIT_PX: string;
+
+		/**
+		 * Orientation constant representing an unknown orientation.
+		 */
+		const UNKNOWN: number;
+
+		/**
+		 * Orientation constant for inverted portait orientation.
+		 */
+		const UPSIDE_PORTRAIT: number;
+
+		/**
+		 * Authentication error code reported via <Titanium.UI.WebView.error>.
+		 */
+		const URL_ERROR_AUTHENTICATION: number;
+
+		/**
+		 * Bad url error code reported via <Titanium.UI.WebView.error>.
+		 */
+		const URL_ERROR_BAD_URL: number;
+
+		/**
+		 * Error code reported via <Titanium.UI.WebView.error> for a failure to connect to host.
+		 */
+		const URL_ERROR_CONNECT: number;
+
+		/**
+		 * Error code reported via <Titanium.UI.WebView.error> for an SSL failure.
+		 */
+		const URL_ERROR_SSL_FAILED: number;
+
+		/**
+		 * Error code reported via <Titanium.UI.WebView.error> for a failure to access a file resource on a host, except "file not found", which has its own constant.
+		 */
+		const URL_ERROR_FILE: number;
+
+		/**
+		 * Error code reported via <Titanium.UI.WebView.error> when a requested file does not exist on the host.
+		 */
+		const URL_ERROR_FILE_NOT_FOUND: number;
+
+		/**
+		 * Error code reported via <Titanium.UI.WebView.error> when a host name cannot be resolved, such as via a DNS lookup error.
+		 */
+		const URL_ERROR_HOST_LOOKUP: number;
+
+		/**
+		 * Error code reported via <Titanium.UI.WebView.error> when a redirect loop is detected.
+		 */
+		const URL_ERROR_REDIRECT_LOOP: number;
+
+		/**
+		 * Error code reported via <Titanium.UI.WebView.error> when a timeout occurs.
+		 */
+		const URL_ERROR_TIMEOUT: number;
+
+		/**
+		 * Error code reported via <Titanium.UI.WebView.error> when an unknown error occurs.
+		 */
+		const URL_ERROR_UNKNOWN: number;
+
+		/**
+		 * Error code reported via <Titanium.UI.WebView.error> when a url contains an unsupported scheme.
+		 */
+		const URL_ERROR_UNSUPPORTED_SCHEME: number;
+
+		/**
+		 * Sets the background color of the master view (when there are no windows or other top-level
+		 * controls displayed).
+		 */
+		let backgroundColor: string;
+
+		/**
+		 * Local path or URL to an image file for setting a background for the master view (when there
+		 * are no windows or other top-level controls displayed).
+		 */
+		let backgroundImage: string;
+
+		/**
+		 * The currently active tab, if a tab group is open.
+		 */
+		let currentTab: Titanium.UI.Tab;
+
+		/**
+		 * The active window associated with the executing JavaScript context.
+		 */
+		const currentWindow: Titanium.UI.Window;
+
+		/**
+		 * Updates the orientation of the current window to the specified orientation value.
+		 */
+		let orientation: number;
+
+		/**
+		 * Sets the global tint color of the application. It is inherited by the child views and can be
+		 * overwritten by them using the `tintColor` property.
+		 */
+		let tintColor: string;
+
+		/**
+		 * Adds the specified callback as an event listener for the named event.
+		 */
+		function addEventListener(name: string, callback: (param0: any) => any): void;
+
+		/**
+		 * Removes the specified callback as an event listener for the named event.
+		 */
+		function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+		/**
+		 * Fires a synthesized event to any registered listeners.
+		 */
+		function fireEvent(name: string, event: any): void;
+
+		/**
+		 * Applies the properties to the proxy.
+		 */
+		function applyProperties(props: any): void;
+
+		/**
+		 * Creates and returns an instance of <Titanium.UI.2DMatrix>.
+		 */
+		function create2DMatrix(parameters?: MatrixCreationDict): Titanium.UI.Matrix2D;
+
+		/**
+		 * Converts one type of unit to another using the metrics of the main display.
+		 */
+		function convertUnits(convertFromValue: string, convertToUnits: number): number;
+
+		/**
+		 * Creates and returns an instance of <Titanium.UI.View>.
+		 */
+		function createView(parameters?: any): Titanium.UI.View;
+
+		/**
+		 * Creates and returns an instance of <Titanium.UI.3DMatrix>.
+		 */
+		function create3DMatrix(parameters?: any): Titanium.UI.Matrix3D;
+
+		/**
+		 * Creates and returns an instance of <Titanium.UI.ActivityIndicator>.
+		 */
+		function createActivityIndicator(parameters?: any): Titanium.UI.ActivityIndicator;
+
+		/**
+		 * Creates and returns an instance of <Titanium.UI.AlertDialog>.
+		 */
+		function createAlertDialog(parameters?: any): Titanium.UI.AlertDialog;
+
+		/**
+		 * Creates and returns an instance of <Titanium.UI.Animation>.
+		 */
+		function createAnimation(parameters?: any): Titanium.UI.Animation;
+
+		/**
+		 * Creates and returns an instance of <Titanium.UI.AttributedString>.
+		 */
+		function createAttributedString(parameters?: any): Titanium.UI.AttributedString;
+
+		/**
+		 * Creates and returns an instance of <Titanium.UI.Button>.
+		 */
+		function createButton(parameters?: any): Titanium.UI.Button;
+
+		/**
+		 * Creates and returns an instance of <Titanium.UI.ButtonBar>.
+		 */
+		function createButtonBar(parameters?: any): Titanium.UI.ButtonBar;
+
+		/**
+		 * Creates and returns an instance of <Titanium.UI.CoverFlowView>.
+		 */
+		function createCoverFlowView(parameters?: any): Titanium.UI.CoverFlowView;
+
+		/**
+		 * Creates and returns an instance of <Titanium.UI.DashboardItem>.
+		 */
+		function createDashboardItem(parameters?: any): Titanium.UI.DashboardItem;
+
+		/**
+		 * Creates and returns an instance of <Titanium.UI.DashboardView>.
+		 */
+		function createDashboardView(parameters?: any): Titanium.UI.DashboardView;
+
+		/**
+		 * Creates and returns an instance of <Titanium.UI.EmailDialog>.
+		 */
+		function createEmailDialog(parameters?: any): Titanium.UI.EmailDialog;
+
+		/**
+		 * Creates and returns an instance of <Titanium.UI.ImageView>.
+		 */
+		function createImageView(parameters?: any): Titanium.UI.ImageView;
+
+		/**
+		 * Creates and returns an instance of <Titanium.UI.Label>.
+		 */
+		function createLabel(parameters?: any): Titanium.UI.Label;
+
+		/**
+		 * Creates and returns an instance of <Titanium.UI.ListSection>.
+		 */
+		function createListSection(parameters?: any): Titanium.UI.ListSection;
+
+		/**
+		 * Creates and returns an instance of <Titanium.UI.ListView>.
+		 */
+		function createListView(parameters?: any): Titanium.UI.ListView;
+
+		/**
+		 * Creates and returns an instance of <Titanium.UI.MaskedImage>.
+		 */
+		function createMaskedImage(parameters?: any): Titanium.UI.MaskedImage;
+
+		/**
+		 * Creates and returns an instance of <Titanium.UI.Notification>.
+		 */
+		function createNotification(parameters?: any): Titanium.UI.Notification;
+
+		/**
+		 * Creates and returns an instance of <Titanium.UI.OptionDialog>.
+		 */
+		function createOptionDialog(parameters?: any): Titanium.UI.OptionDialog;
+
+		/**
+		 * Creates and returns an instance of <Titanium.UI.Picker>.
+		 */
+		function createPicker(parameters?: any): Titanium.UI.Picker;
+
+		/**
+		 * Creates and returns an instance of <Titanium.UI.PickerColumn>.
+		 */
+		function createPickerColumn(parameters?: any): Titanium.UI.PickerColumn;
+
+		/**
+		 * Creates and returns an instance of <Titanium.UI.PickerRow>.
+		 */
+		function createPickerRow(parameters?: any): Titanium.UI.PickerRow;
+
+		/**
+		 * Creates and returns an instance of <Titanium.UI.ProgressBar>.
+		 */
+		function createProgressBar(parameters?: any): Titanium.UI.ProgressBar;
+
+		/**
+		 * Creates and returns an instance of <Titanium.UI.RefreshControl>.
+		 */
+		function createRefreshControl(parameters?: any): Titanium.UI.RefreshControl;
+
+		/**
+		 * Creates and returns an instance of <Titanium.UI.ScrollView>.
+		 */
+		function createScrollView(parameters?: any): Titanium.UI.ScrollView;
+
+		/**
+		 * Creates and returns an instance of <Titanium.UI.ScrollableView>.
+		 */
+		function createScrollableView(parameters?: any): Titanium.UI.ScrollableView;
+
+		/**
+		 * Creates and returns an instance of <Titanium.UI.SearchBar>.
+		 */
+		function createSearchBar(parameters?: any): Titanium.UI.SearchBar;
+
+		/**
+		 * Creates and returns an instance of <Titanium.UI.Slider>.
+		 */
+		function createSlider(parameters?: any): Titanium.UI.Slider;
+
+		/**
+		 * Creates and returns an instance of <Titanium.UI.Switch>.
+		 */
+		function createSwitch(parameters?: any): Titanium.UI.Switch;
+
+		/**
+		 * Creates and returns an instance of <Titanium.UI.Tab>.
+		 */
+		function createTab(parameters?: any): Titanium.UI.Tab;
+
+		/**
+		 * Creates and returns an instance of <Titanium.UI.TabGroup>.
+		 */
+		function createTabGroup(parameters?: any): Titanium.UI.TabGroup;
+
+		/**
+		 * Creates and returns an instance of <Titanium.UI.TabbedBar>.
+		 */
+		function createTabbedBar(parameters?: any): Titanium.UI.TabbedBar;
+
+		/**
+		 * Creates and returns an instance of <Titanium.UI.TableView>.
+		 */
+		function createTableView(parameters?: any): Titanium.UI.TableView;
+
+		/**
+		 * Creates and returns an instance of <Titanium.UI.TableViewRow>.
+		 */
+		function createTableViewRow(parameters?: any): Titanium.UI.TableViewRow;
+
+		/**
+		 * Creates and returns an instance of <Titanium.UI.TableViewSection>.
+		 */
+		function createTableViewSection(parameters?: any): Titanium.UI.TableViewSection;
+
+		/**
+		 * Creates and returns an instance of <Titanium.UI.TextArea>.
+		 */
+		function createTextArea(parameters?: any): Titanium.UI.TextArea;
+
+		/**
+		 * Creates and returns an instance of <Titanium.UI.TextField>.
+		 */
+		function createTextField(parameters?: any): Titanium.UI.TextField;
+
+		/**
+		 * Creates and returns an instance of <Titanium.UI.Toolbar>.
+		 */
+		function createToolbar(parameters?: any): Titanium.UI.Toolbar;
+
+		/**
+		 * Gets the value of the <Titanium.UI.bubbleParent> property.
+		 */
+		function getBubbleParent(): boolean;
+
+		/**
+		 * Sets the value of the <Titanium.UI.bubbleParent> property.
+		 */
+		function setBubbleParent(bubbleParent: boolean): void;
+
+		/**
+		 * Gets the value of the <Titanium.UI.apiName> property.
+		 */
+		function getApiName(): string;
+
+		/**
+		 * Gets the value of the <Titanium.UI.lifecycleContainer> property.
+		 */
+		function getLifecycleContainer(): Titanium.UI.Window | Titanium.UI.TabGroup;
+
+		/**
+		 * Sets the value of the <Titanium.UI.lifecycleContainer> property.
+		 */
+		function setLifecycleContainer(lifecycleContainer: Titanium.UI.Window): void;
+
+		/**
+		 * Sets the value of the <Titanium.UI.lifecycleContainer> property.
+		 */
+		function setLifecycleContainer(lifecycleContainer: Titanium.UI.TabGroup): void;
+
+		/**
+		 * Gets the value of the <Titanium.UI.backgroundColor> property.
+		 */
+		function getBackgroundColor(): string;
+
+		/**
+		 * Sets the value of the <Titanium.UI.backgroundColor> property.
+		 */
+		function setBackgroundColor(backgroundColor: string): void;
+
+		/**
+		 * Gets the value of the <Titanium.UI.backgroundImage> property.
+		 */
+		function getBackgroundImage(): string;
+
+		/**
+		 * Sets the value of the <Titanium.UI.backgroundImage> property.
+		 */
+		function setBackgroundImage(backgroundImage: string): void;
+
+		/**
+		 * Gets the value of the <Titanium.UI.currentTab> property.
+		 */
+		function getCurrentTab(): Titanium.UI.Tab;
+
+		/**
+		 * Sets the value of the <Titanium.UI.currentTab> property.
+		 */
+		function setCurrentTab(currentTab: Titanium.UI.Tab): void;
+
+		/**
+		 * Gets the value of the <Titanium.UI.currentWindow> property.
+		 */
+		function getCurrentWindow(): Titanium.UI.Window;
+
+		/**
+		 * Gets the value of the <Titanium.UI.orientation> property.
+		 */
+		function getOrientation(): number;
+
+		/**
+		 * Sets the value of the <Titanium.UI.orientation> property.
+		 */
+		function setOrientation(orientation: number): void;
+
+		/**
+		 * Gets the value of the <Titanium.UI.tintColor> property.
+		 */
+		function getTintColor(): string;
+
+		/**
+		 * Sets the value of the <Titanium.UI.tintColor> property.
+		 */
+		function setTintColor(tintColor: string): void;
+
+		/**
+		 * Creates and returns an instance of <Titanium.UI.WebView>.
+		 */
+		function createWebView(parameters?: any): Titanium.UI.WebView;
+
+		/**
+		 * Creates and returns an instance of <Titanium.UI.Window>.
+		 */
+		function createWindow(parameters?: any): Titanium.UI.Window;
+
+		/**
+		 * An empty drawing surface or container
+		 */
+		interface View extends Titanium.Proxy {
+			/**
+			 * Whether the view should be "hidden" from (i.e., ignored by) the accessibility service.
+			 */
+			accessibilityHidden: boolean;
+
+			/**
+			 * Briefly describes what performing an action (such as a click) on the view will do.
+			 */
+			accessibilityHint: string;
+
+			/**
+			 * A succint label identifying the view for the device's accessibility service.
+			 */
+			accessibilityLabel: string;
+
+			/**
+			 * A string describing the value (if any) of the view for the device's accessibility service.
+			 */
+			accessibilityValue: string;
+
+			/**
+			 * Coordinate of the view about which to pivot an animation.
+			 */
+			anchorPoint: Point;
+
+			/**
+			 * Current position of the view during an animation.
+			 */
+			readonly animatedCenter: Point;
+
+			/**
+			 * Background color of the view, as a color name or hex triplet.
+			 */
+			backgroundColor: string;
+
+			/**
+			 * Disabled background color of the view, as a color name or hex triplet.
+			 */
+			backgroundDisabledColor: string;
+
+			/**
+			 * Disabled background image for the view, specified as a local file path or URL.
+			 */
+			backgroundDisabledImage: string;
+
+			/**
+			 * Focused background color of the view, as a color name or hex triplet.
+			 */
+			backgroundFocusedColor: string;
+
+			/**
+			 * Focused background image for the view, specified as a local file path or URL.
+			 */
+			backgroundFocusedImage: string;
+
+			/**
+			 * A background gradient for the view.
+			 */
+			backgroundGradient: Gradient;
+
+			/**
+			 * Background image for the view, specified as a local file path or URL.
+			 */
+			backgroundImage: string;
+
+			/**
+			 * Determines whether to tile a background across a view.
+			 */
+			backgroundRepeat: boolean;
+
+			/**
+			 * Size of the left end cap.
+			 */
+			backgroundLeftCap: number;
+
+			/**
+			 * Selected background color of the view, as a color name or hex triplet.
+			 */
+			backgroundSelectedColor: string;
+
+			/**
+			 * Selected background image url for the view, specified as a local file path or URL.
+			 */
+			backgroundSelectedImage: string;
+
+			/**
+			 * Size of the top end cap.
+			 */
+			backgroundTopCap: number;
+
+			/**
+			 * Border color of the view, as a color name or hex triplet.
+			 */
+			borderColor: string;
+
+			/**
+			 * Radius for the rounded corners of the view's border.
+			 */
+			borderRadius: number;
+
+			/**
+			 * Border width of the view.
+			 */
+			borderWidth: number;
+
+			/**
+			 * View's bottom position, in platform-specific units.
+			 */
+			bottom: number | string;
+
+			/**
+			 * View's center position, in the parent view's coordinates.
+			 */
+			center: Point;
+
+			/**
+			 * Array of this view's child views.
+			 */
+			readonly children: Titanium.UI.View[];
+
+			/**
+			 * View's clipping behavior.
+			 */
+			clipMode: number;
+
+			/**
+			 * Base elevation of the view relative to its parent in pixels.
+			 */
+			elevation: number;
+
+			/**
+			 * Whether view should be focusable while navigating with the trackball.
+			 */
+			focusable: boolean;
+
+			/**
+			 * View height, in platform-specific units.
+			 */
+			height: number | string;
+
+			/**
+			 * Sets the behavior when hiding an object to release or keep the free space
+			 */
+			hiddenBehavior: number;
+
+			/**
+			 * View's left position, in platform-specific units.
+			 */
+			left: number | string;
+
+			/**
+			 * Specifies how the view positions its children.
+			 * One of: 'composite', 'vertical', or 'horizontal'.
+			 */
+			layout: string;
+
+			/**
+			 * Opacity of this view, from 0.0 (transparent) to 1.0 (opaque).
+			 */
+			opacity: number;
+
+			/**
+			 * When on, animate call overrides current animation if applicable.
+			 */
+			overrideCurrentAnimation: boolean;
+
+			/**
+			 * Background color of the wrapper view when this view is used as either <Titanium.UI.ListView.pullView> or <Titanium.UI.TableView.headerPullView>.
+			 */
+			pullBackgroundColor: string;
+
+			/**
+			 * The preview context used in the 3D-Touch feature "Peek and Pop".
+			 */
+			previewContext: Titanium.UI.iOS.PreviewContext;
+
+			/**
+			 * View's right position, in platform-specific units.
+			 */
+			right: number | string;
+
+			/**
+			 * The bounding box of the view relative to its parent, in system units.
+			 */
+			readonly rect: Dimension;
+
+			/**
+			 * Clockwise 2D rotation of the view in degrees.
+			 */
+			rotation: number;
+
+			/**
+			 * Clockwise rotation of the view in degrees (x-axis).
+			 */
+			rotationX: number;
+
+			/**
+			 * Clockwise rotation of the view in degrees (y-axis).
+			 */
+			rotationY: number;
+
+			/**
+			 * Scaling of the view in x-axis in pixels.
+			 */
+			scaleX: number;
+
+			/**
+			 * Scaling of the view in y-axis in pixels.
+			 */
+			scaleY: number;
+
+			/**
+			 * The size of the view in system units.
+			 */
+			readonly size: Dimension;
+
+			/**
+			 * Determines keyboard behavior when this view is focused.
+			 */
+			softKeyboardOnFocus: number;
+
+			/**
+			 * The view's tintColor. This property is applicable on iOS 7 and greater.
+			 */
+			tintColor: string;
+
+			/**
+			 * The view's top position.
+			 */
+			top: number | string;
+
+			/**
+			 * Determines whether view should receive touch events.
+			 */
+			touchEnabled: boolean;
+
+			/**
+			 * A material design visual construct that provides an instantaneous visual confirmation of touch point.
+			 */
+			touchFeedback: boolean;
+
+			/**
+			 * Optional touch feedback ripple color. This has no effect unless `touchFeedback` is true.
+			 */
+			touchFeedbackColor: string;
+
+			/**
+			 * Transformation matrix to apply to the view.
+			 */
+			transform: Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
+
+			/**
+			 * Horizontal location of the view relative to its left position in pixels.
+			 */
+			translationX: number;
+
+			/**
+			 * Vertical location of the view relative to its top position in pixels.
+			 */
+			translationY: number;
+
+			/**
+			 * Depth of the view relative to its elevation in pixels.
+			 */
+			translationZ: number;
+
+			/**
+			 * A name to identify this view in activity transition.
+			 */
+			transitionName: string;
+
+			/**
+			 * Determines the blur radius used to create the shadow.
+			 */
+			viewShadowRadius: number;
+
+			/**
+			 * Determines the color of the shadow.
+			 */
+			viewShadowColor: string;
+
+			/**
+			 * Determines the offset for the shadow of the view.
+			 */
+			viewShadowOffset: Point;
+
+			/**
+			 * Determines whether the view is visible.
+			 */
+			visible: boolean;
+
+			/**
+			 * View's width, in platform-specific units.
+			 */
+			width: number | string;
+
+			/**
+			 * Determines whether the layout has wrapping behavior.
+			 */
+			horizontalWrap: boolean;
+
+			/**
+			 * Z-index stack order position, relative to other sibling views.
+			 */
+			zIndex: number;
+
+			/**
+			 * Determines whether to keep the device screen on.
+			 */
+			keepScreenOn: boolean;
+
+			/**
+			 * Adds a child to this view's hierarchy.
+			 */
+			add(view: any): void;
+
+			/**
+			 * Adds a child to this view's hierarchy.
+			 */
+			add(view: any[]): void;
+
+			/**
+			 * Animates this view.
+			 */
+			animate(animation: any, callback?: (param0: any) => any): void;
+
+			/**
+			 * Finishes a batch update of the View's layout properties and schedules a layout pass of the
+			 * view tree.
+			 */
+			finishLayout(): void;
+
+			/**
+			 * Hides this view.
+			 */
+			hide(options?: AnimationOption): void;
+
+			/**
+			 * Inserts a view at the specified position in the [children](Titanium.UI.View.children) array.
+			 */
+			insertAt(params: any): void;
+
+			/**
+			 * Removes a child view from this view's hierarchy.
+			 */
+			remove(view: any): void;
+
+			/**
+			 * Removes all child views from this view's hierarchy.
+			 */
+			removeAllChildren(): void;
+
+			/**
+			 * Replaces a view at the specified position in the [children](Titanium.UI.View.children) array.
+			 */
+			replaceAt(params: any): void;
+
+			/**
+			 * Makes this view visible.
+			 */
+			show(options?: AnimationOption): void;
+
+			/**
+			 * Starts a batch update of this view's layout properties.
+			 */
+			startLayout(): void;
+
+			/**
+			 * Returns an image of the rendered view, as a Blob.
+			 */
+			toImage(callback?: (param0: Titanium.Blob) => any, honorScaleFactor?: boolean): Titanium.Blob;
+
+			/**
+			 * Performs a batch update of all supplied layout properties and schedules a layout pass after
+			 * they have been updated.
+			 */
+			updateLayout(params: any): void;
+
+			/**
+			 * Translates a point from this view's coordinate system to another view's coordinate system.
+			 */
+			convertPointToView(point: Point, destinationView: any): Point;
+
+			/**
+			 * Returns the matching view of a given view ID.
+			 */
+			getViewById(id: string): Titanium.UI.View;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.accessibilityHidden> property.
+			 */
+			getAccessibilityHidden(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.accessibilityHidden> property.
+			 */
+			setAccessibilityHidden(accessibilityHidden: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.accessibilityHint> property.
+			 */
+			getAccessibilityHint(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.accessibilityHint> property.
+			 */
+			setAccessibilityHint(accessibilityHint: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.accessibilityLabel> property.
+			 */
+			getAccessibilityLabel(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.accessibilityLabel> property.
+			 */
+			setAccessibilityLabel(accessibilityLabel: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.accessibilityValue> property.
+			 */
+			getAccessibilityValue(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.accessibilityValue> property.
+			 */
+			setAccessibilityValue(accessibilityValue: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.anchorPoint> property.
+			 */
+			getAnchorPoint(): Point;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.anchorPoint> property.
+			 */
+			setAnchorPoint(anchorPoint: Point): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.animatedCenter> property.
+			 */
+			getAnimatedCenter(): Point;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.backgroundColor> property.
+			 */
+			getBackgroundColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.backgroundColor> property.
+			 */
+			setBackgroundColor(backgroundColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.backgroundDisabledColor> property.
+			 */
+			getBackgroundDisabledColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.backgroundDisabledColor> property.
+			 */
+			setBackgroundDisabledColor(backgroundDisabledColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.backgroundDisabledImage> property.
+			 */
+			getBackgroundDisabledImage(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.backgroundDisabledImage> property.
+			 */
+			setBackgroundDisabledImage(backgroundDisabledImage: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.backgroundFocusedColor> property.
+			 */
+			getBackgroundFocusedColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.backgroundFocusedColor> property.
+			 */
+			setBackgroundFocusedColor(backgroundFocusedColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.backgroundFocusedImage> property.
+			 */
+			getBackgroundFocusedImage(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.backgroundFocusedImage> property.
+			 */
+			setBackgroundFocusedImage(backgroundFocusedImage: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.backgroundGradient> property.
+			 */
+			getBackgroundGradient(): Gradient;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.backgroundGradient> property.
+			 */
+			setBackgroundGradient(backgroundGradient: Gradient): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.backgroundImage> property.
+			 */
+			getBackgroundImage(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.backgroundImage> property.
+			 */
+			setBackgroundImage(backgroundImage: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.backgroundRepeat> property.
+			 */
+			getBackgroundRepeat(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.backgroundRepeat> property.
+			 */
+			setBackgroundRepeat(backgroundRepeat: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.backgroundLeftCap> property.
+			 */
+			getBackgroundLeftCap(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.backgroundLeftCap> property.
+			 */
+			setBackgroundLeftCap(backgroundLeftCap: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.backgroundSelectedColor> property.
+			 */
+			getBackgroundSelectedColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.backgroundSelectedColor> property.
+			 */
+			setBackgroundSelectedColor(backgroundSelectedColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.backgroundSelectedImage> property.
+			 */
+			getBackgroundSelectedImage(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.backgroundSelectedImage> property.
+			 */
+			setBackgroundSelectedImage(backgroundSelectedImage: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.backgroundTopCap> property.
+			 */
+			getBackgroundTopCap(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.backgroundTopCap> property.
+			 */
+			setBackgroundTopCap(backgroundTopCap: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.borderColor> property.
+			 */
+			getBorderColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.borderColor> property.
+			 */
+			setBorderColor(borderColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.borderRadius> property.
+			 */
+			getBorderRadius(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.borderRadius> property.
+			 */
+			setBorderRadius(borderRadius: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.borderWidth> property.
+			 */
+			getBorderWidth(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.borderWidth> property.
+			 */
+			setBorderWidth(borderWidth: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.bottom> property.
+			 */
+			getBottom(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.bottom> property.
+			 */
+			setBottom(bottom: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.bottom> property.
+			 */
+			setBottom(bottom: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.center> property.
+			 */
+			getCenter(): Point;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.center> property.
+			 */
+			setCenter(center: Point): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.children> property.
+			 */
+			getChildren(): Titanium.UI.View[];
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.clipMode> property.
+			 */
+			getClipMode(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.clipMode> property.
+			 */
+			setClipMode(clipMode: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.elevation> property.
+			 */
+			getElevation(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.elevation> property.
+			 */
+			setElevation(elevation: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.focusable> property.
+			 */
+			getFocusable(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.focusable> property.
+			 */
+			setFocusable(focusable: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.height> property.
+			 */
+			getHeight(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.height> property.
+			 */
+			setHeight(height: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.height> property.
+			 */
+			setHeight(height: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.hiddenBehavior> property.
+			 */
+			getHiddenBehavior(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.hiddenBehavior> property.
+			 */
+			setHiddenBehavior(hiddenBehavior: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.left> property.
+			 */
+			getLeft(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.left> property.
+			 */
+			setLeft(left: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.left> property.
+			 */
+			setLeft(left: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.layout> property.
+			 */
+			getLayout(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.layout> property.
+			 */
+			setLayout(layout: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.opacity> property.
+			 */
+			getOpacity(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.opacity> property.
+			 */
+			setOpacity(opacity: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.overrideCurrentAnimation> property.
+			 */
+			getOverrideCurrentAnimation(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.overrideCurrentAnimation> property.
+			 */
+			setOverrideCurrentAnimation(overrideCurrentAnimation: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.pullBackgroundColor> property.
+			 */
+			getPullBackgroundColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.pullBackgroundColor> property.
+			 */
+			setPullBackgroundColor(pullBackgroundColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.previewContext> property.
+			 */
+			getPreviewContext(): Titanium.UI.iOS.PreviewContext;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.previewContext> property.
+			 */
+			setPreviewContext(previewContext: Titanium.UI.iOS.PreviewContext): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.right> property.
+			 */
+			getRight(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.right> property.
+			 */
+			setRight(right: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.right> property.
+			 */
+			setRight(right: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.rect> property.
+			 */
+			getRect(): Dimension;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.rotation> property.
+			 */
+			getRotation(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.rotation> property.
+			 */
+			setRotation(rotation: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.rotationX> property.
+			 */
+			getRotationX(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.rotationX> property.
+			 */
+			setRotationX(rotationX: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.rotationY> property.
+			 */
+			getRotationY(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.rotationY> property.
+			 */
+			setRotationY(rotationY: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.scaleX> property.
+			 */
+			getScaleX(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.scaleX> property.
+			 */
+			setScaleX(scaleX: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.scaleY> property.
+			 */
+			getScaleY(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.scaleY> property.
+			 */
+			setScaleY(scaleY: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.size> property.
+			 */
+			getSize(): Dimension;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.softKeyboardOnFocus> property.
+			 */
+			getSoftKeyboardOnFocus(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.softKeyboardOnFocus> property.
+			 */
+			setSoftKeyboardOnFocus(softKeyboardOnFocus: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.tintColor> property.
+			 */
+			getTintColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.tintColor> property.
+			 */
+			setTintColor(tintColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.top> property.
+			 */
+			getTop(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.top> property.
+			 */
+			setTop(top: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.top> property.
+			 */
+			setTop(top: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.touchEnabled> property.
+			 */
+			getTouchEnabled(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.touchEnabled> property.
+			 */
+			setTouchEnabled(touchEnabled: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.touchFeedback> property.
+			 */
+			getTouchFeedback(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.touchFeedback> property.
+			 */
+			setTouchFeedback(touchFeedback: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.touchFeedbackColor> property.
+			 */
+			getTouchFeedbackColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.touchFeedbackColor> property.
+			 */
+			setTouchFeedbackColor(touchFeedbackColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.transform> property.
+			 */
+			getTransform(): Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.transform> property.
+			 */
+			setTransform(transform: Titanium.UI.Matrix2D): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.transform> property.
+			 */
+			setTransform(transform: Titanium.UI.Matrix3D): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.translationX> property.
+			 */
+			getTranslationX(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.translationX> property.
+			 */
+			setTranslationX(translationX: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.translationY> property.
+			 */
+			getTranslationY(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.translationY> property.
+			 */
+			setTranslationY(translationY: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.translationZ> property.
+			 */
+			getTranslationZ(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.translationZ> property.
+			 */
+			setTranslationZ(translationZ: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.transitionName> property.
+			 */
+			getTransitionName(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.transitionName> property.
+			 */
+			setTransitionName(transitionName: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.viewShadowRadius> property.
+			 */
+			getViewShadowRadius(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.viewShadowRadius> property.
+			 */
+			setViewShadowRadius(viewShadowRadius: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.viewShadowColor> property.
+			 */
+			getViewShadowColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.viewShadowColor> property.
+			 */
+			setViewShadowColor(viewShadowColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.viewShadowOffset> property.
+			 */
+			getViewShadowOffset(): Point;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.viewShadowOffset> property.
+			 */
+			setViewShadowOffset(viewShadowOffset: Point): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.visible> property.
+			 */
+			getVisible(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.visible> property.
+			 */
+			setVisible(visible: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.width> property.
+			 */
+			getWidth(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.width> property.
+			 */
+			setWidth(width: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.width> property.
+			 */
+			setWidth(width: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.horizontalWrap> property.
+			 */
+			getHorizontalWrap(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.horizontalWrap> property.
+			 */
+			setHorizontalWrap(horizontalWrap: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.zIndex> property.
+			 */
+			getZIndex(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.zIndex> property.
+			 */
+			setZIndex(zIndex: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.keepScreenOn> property.
+			 */
+			getKeepScreenOn(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.keepScreenOn> property.
+			 */
+			setKeepScreenOn(keepScreenOn: boolean): void;
+
+		}
+
+		/**
+		 * An empty drawing surface or container
+		 */
+		interface View {
+			/**
+			 * Whether the view should be "hidden" from (i.e., ignored by) the accessibility service.
+			 */
+			accessibilityHidden: boolean;
+
+			/**
+			 * Briefly describes what performing an action (such as a click) on the view will do.
+			 */
+			accessibilityHint: string;
+
+			/**
+			 * A succint label identifying the view for the device's accessibility service.
+			 */
+			accessibilityLabel: string;
+
+			/**
+			 * A string describing the value (if any) of the view for the device's accessibility service.
+			 */
+			accessibilityValue: string;
+
+			/**
+			 * Coordinate of the view about which to pivot an animation.
+			 */
+			anchorPoint: Point;
+
+			/**
+			 * Current position of the view during an animation.
+			 */
+			readonly animatedCenter: Point;
+
+			/**
+			 * Background color of the view, as a color name or hex triplet.
+			 */
+			backgroundColor: string;
+
+			/**
+			 * Disabled background color of the view, as a color name or hex triplet.
+			 */
+			backgroundDisabledColor: string;
+
+			/**
+			 * Disabled background image for the view, specified as a local file path or URL.
+			 */
+			backgroundDisabledImage: string;
+
+			/**
+			 * Focused background color of the view, as a color name or hex triplet.
+			 */
+			backgroundFocusedColor: string;
+
+			/**
+			 * Focused background image for the view, specified as a local file path or URL.
+			 */
+			backgroundFocusedImage: string;
+
+			/**
+			 * A background gradient for the view.
+			 */
+			backgroundGradient: Gradient;
+
+			/**
+			 * Background image for the view, specified as a local file path or URL.
+			 */
+			backgroundImage: string;
+
+			/**
+			 * Determines whether to tile a background across a view.
+			 */
+			backgroundRepeat: boolean;
+
+			/**
+			 * Size of the left end cap.
+			 */
+			backgroundLeftCap: number;
+
+			/**
+			 * Selected background color of the view, as a color name or hex triplet.
+			 */
+			backgroundSelectedColor: string;
+
+			/**
+			 * Selected background image url for the view, specified as a local file path or URL.
+			 */
+			backgroundSelectedImage: string;
+
+			/**
+			 * Size of the top end cap.
+			 */
+			backgroundTopCap: number;
+
+			/**
+			 * Border color of the view, as a color name or hex triplet.
+			 */
+			borderColor: string;
+
+			/**
+			 * Radius for the rounded corners of the view's border.
+			 */
+			borderRadius: number;
+
+			/**
+			 * Border width of the view.
+			 */
+			borderWidth: number;
+
+			/**
+			 * View's bottom position, in platform-specific units.
+			 */
+			bottom: number | string;
+
+			/**
+			 * View's center position, in the parent view's coordinates.
+			 */
+			center: Point;
+
+			/**
+			 * Array of this view's child views.
+			 */
+			readonly children: Titanium.UI.View[];
+
+			/**
+			 * View's clipping behavior.
+			 */
+			clipMode: number;
+
+			/**
+			 * Base elevation of the view relative to its parent in pixels.
+			 */
+			elevation: number;
+
+			/**
+			 * Whether view should be focusable while navigating with the trackball.
+			 */
+			focusable: boolean;
+
+			/**
+			 * View height, in platform-specific units.
+			 */
+			height: number | string;
+
+			/**
+			 * Sets the behavior when hiding an object to release or keep the free space
+			 */
+			hiddenBehavior: number;
+
+			/**
+			 * View's left position, in platform-specific units.
+			 */
+			left: number | string;
+
+			/**
+			 * Specifies how the view positions its children.
+			 * One of: 'composite', 'vertical', or 'horizontal'.
+			 */
+			layout: string;
+
+			/**
+			 * Opacity of this view, from 0.0 (transparent) to 1.0 (opaque).
+			 */
+			opacity: number;
+
+			/**
+			 * When on, animate call overrides current animation if applicable.
+			 */
+			overrideCurrentAnimation: boolean;
+
+			/**
+			 * Background color of the wrapper view when this view is used as either <Titanium.UI.ListView.pullView> or <Titanium.UI.TableView.headerPullView>.
+			 */
+			pullBackgroundColor: string;
+
+			/**
+			 * The preview context used in the 3D-Touch feature "Peek and Pop".
+			 */
+			previewContext: Titanium.UI.iOS.PreviewContext;
+
+			/**
+			 * View's right position, in platform-specific units.
+			 */
+			right: number | string;
+
+			/**
+			 * The bounding box of the view relative to its parent, in system units.
+			 */
+			readonly rect: Dimension;
+
+			/**
+			 * Clockwise 2D rotation of the view in degrees.
+			 */
+			rotation: number;
+
+			/**
+			 * Clockwise rotation of the view in degrees (x-axis).
+			 */
+			rotationX: number;
+
+			/**
+			 * Clockwise rotation of the view in degrees (y-axis).
+			 */
+			rotationY: number;
+
+			/**
+			 * Scaling of the view in x-axis in pixels.
+			 */
+			scaleX: number;
+
+			/**
+			 * Scaling of the view in y-axis in pixels.
+			 */
+			scaleY: number;
+
+			/**
+			 * The size of the view in system units.
+			 */
+			readonly size: Dimension;
+
+			/**
+			 * Determines keyboard behavior when this view is focused.
+			 */
+			softKeyboardOnFocus: number;
+
+			/**
+			 * The view's tintColor. This property is applicable on iOS 7 and greater.
+			 */
+			tintColor: string;
+
+			/**
+			 * The view's top position.
+			 */
+			top: number | string;
+
+			/**
+			 * Determines whether view should receive touch events.
+			 */
+			touchEnabled: boolean;
+
+			/**
+			 * A material design visual construct that provides an instantaneous visual confirmation of touch point.
+			 */
+			touchFeedback: boolean;
+
+			/**
+			 * Optional touch feedback ripple color. This has no effect unless `touchFeedback` is true.
+			 */
+			touchFeedbackColor: string;
+
+			/**
+			 * Transformation matrix to apply to the view.
+			 */
+			transform: Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
+
+			/**
+			 * Horizontal location of the view relative to its left position in pixels.
+			 */
+			translationX: number;
+
+			/**
+			 * Vertical location of the view relative to its top position in pixels.
+			 */
+			translationY: number;
+
+			/**
+			 * Depth of the view relative to its elevation in pixels.
+			 */
+			translationZ: number;
+
+			/**
+			 * A name to identify this view in activity transition.
+			 */
+			transitionName: string;
+
+			/**
+			 * Determines the blur radius used to create the shadow.
+			 */
+			viewShadowRadius: number;
+
+			/**
+			 * Determines the color of the shadow.
+			 */
+			viewShadowColor: string;
+
+			/**
+			 * Determines the offset for the shadow of the view.
+			 */
+			viewShadowOffset: Point;
+
+			/**
+			 * Determines whether the view is visible.
+			 */
+			visible: boolean;
+
+			/**
+			 * View's width, in platform-specific units.
+			 */
+			width: number | string;
+
+			/**
+			 * Determines whether the layout has wrapping behavior.
+			 */
+			horizontalWrap: boolean;
+
+			/**
+			 * Z-index stack order position, relative to other sibling views.
+			 */
+			zIndex: number;
+
+			/**
+			 * Determines whether to keep the device screen on.
+			 */
+			keepScreenOn: boolean;
+
+			/**
+			 * Adds a child to this view's hierarchy.
+			 */
+			add(view: any): void;
+
+			/**
+			 * Adds a child to this view's hierarchy.
+			 */
+			add(view: any[]): void;
+
+			/**
+			 * Animates this view.
+			 */
+			animate(animation: any, callback?: (param0: any) => any): void;
+
+			/**
+			 * Finishes a batch update of the View's layout properties and schedules a layout pass of the
+			 * view tree.
+			 */
+			finishLayout(): void;
+
+			/**
+			 * Hides this view.
+			 */
+			hide(options?: AnimationOption): void;
+
+			/**
+			 * Inserts a view at the specified position in the [children](Titanium.UI.View.children) array.
+			 */
+			insertAt(params: any): void;
+
+			/**
+			 * Removes a child view from this view's hierarchy.
+			 */
+			remove(view: any): void;
+
+			/**
+			 * Removes all child views from this view's hierarchy.
+			 */
+			removeAllChildren(): void;
+
+			/**
+			 * Replaces a view at the specified position in the [children](Titanium.UI.View.children) array.
+			 */
+			replaceAt(params: any): void;
+
+			/**
+			 * Makes this view visible.
+			 */
+			show(options?: AnimationOption): void;
+
+			/**
+			 * Starts a batch update of this view's layout properties.
+			 */
+			startLayout(): void;
+
+			/**
+			 * Returns an image of the rendered view, as a Blob.
+			 */
+			toImage(callback?: (param0: Titanium.Blob) => any, honorScaleFactor?: boolean): Titanium.Blob;
+
+			/**
+			 * Performs a batch update of all supplied layout properties and schedules a layout pass after
+			 * they have been updated.
+			 */
+			updateLayout(params: any): void;
+
+			/**
+			 * Translates a point from this view's coordinate system to another view's coordinate system.
+			 */
+			convertPointToView(point: Point, destinationView: any): Point;
+
+			/**
+			 * Returns the matching view of a given view ID.
+			 */
+			getViewById(id: string): Titanium.UI.View;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.accessibilityHidden> property.
+			 */
+			getAccessibilityHidden(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.accessibilityHidden> property.
+			 */
+			setAccessibilityHidden(accessibilityHidden: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.accessibilityHint> property.
+			 */
+			getAccessibilityHint(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.accessibilityHint> property.
+			 */
+			setAccessibilityHint(accessibilityHint: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.accessibilityLabel> property.
+			 */
+			getAccessibilityLabel(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.accessibilityLabel> property.
+			 */
+			setAccessibilityLabel(accessibilityLabel: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.accessibilityValue> property.
+			 */
+			getAccessibilityValue(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.accessibilityValue> property.
+			 */
+			setAccessibilityValue(accessibilityValue: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.anchorPoint> property.
+			 */
+			getAnchorPoint(): Point;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.anchorPoint> property.
+			 */
+			setAnchorPoint(anchorPoint: Point): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.animatedCenter> property.
+			 */
+			getAnimatedCenter(): Point;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.backgroundColor> property.
+			 */
+			getBackgroundColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.backgroundColor> property.
+			 */
+			setBackgroundColor(backgroundColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.backgroundDisabledColor> property.
+			 */
+			getBackgroundDisabledColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.backgroundDisabledColor> property.
+			 */
+			setBackgroundDisabledColor(backgroundDisabledColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.backgroundDisabledImage> property.
+			 */
+			getBackgroundDisabledImage(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.backgroundDisabledImage> property.
+			 */
+			setBackgroundDisabledImage(backgroundDisabledImage: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.backgroundFocusedColor> property.
+			 */
+			getBackgroundFocusedColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.backgroundFocusedColor> property.
+			 */
+			setBackgroundFocusedColor(backgroundFocusedColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.backgroundFocusedImage> property.
+			 */
+			getBackgroundFocusedImage(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.backgroundFocusedImage> property.
+			 */
+			setBackgroundFocusedImage(backgroundFocusedImage: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.backgroundGradient> property.
+			 */
+			getBackgroundGradient(): Gradient;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.backgroundGradient> property.
+			 */
+			setBackgroundGradient(backgroundGradient: Gradient): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.backgroundImage> property.
+			 */
+			getBackgroundImage(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.backgroundImage> property.
+			 */
+			setBackgroundImage(backgroundImage: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.backgroundRepeat> property.
+			 */
+			getBackgroundRepeat(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.backgroundRepeat> property.
+			 */
+			setBackgroundRepeat(backgroundRepeat: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.backgroundLeftCap> property.
+			 */
+			getBackgroundLeftCap(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.backgroundLeftCap> property.
+			 */
+			setBackgroundLeftCap(backgroundLeftCap: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.backgroundSelectedColor> property.
+			 */
+			getBackgroundSelectedColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.backgroundSelectedColor> property.
+			 */
+			setBackgroundSelectedColor(backgroundSelectedColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.backgroundSelectedImage> property.
+			 */
+			getBackgroundSelectedImage(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.backgroundSelectedImage> property.
+			 */
+			setBackgroundSelectedImage(backgroundSelectedImage: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.backgroundTopCap> property.
+			 */
+			getBackgroundTopCap(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.backgroundTopCap> property.
+			 */
+			setBackgroundTopCap(backgroundTopCap: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.borderColor> property.
+			 */
+			getBorderColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.borderColor> property.
+			 */
+			setBorderColor(borderColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.borderRadius> property.
+			 */
+			getBorderRadius(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.borderRadius> property.
+			 */
+			setBorderRadius(borderRadius: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.borderWidth> property.
+			 */
+			getBorderWidth(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.borderWidth> property.
+			 */
+			setBorderWidth(borderWidth: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.bottom> property.
+			 */
+			getBottom(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.bottom> property.
+			 */
+			setBottom(bottom: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.bottom> property.
+			 */
+			setBottom(bottom: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.center> property.
+			 */
+			getCenter(): Point;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.center> property.
+			 */
+			setCenter(center: Point): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.children> property.
+			 */
+			getChildren(): Titanium.UI.View[];
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.clipMode> property.
+			 */
+			getClipMode(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.clipMode> property.
+			 */
+			setClipMode(clipMode: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.elevation> property.
+			 */
+			getElevation(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.elevation> property.
+			 */
+			setElevation(elevation: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.focusable> property.
+			 */
+			getFocusable(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.focusable> property.
+			 */
+			setFocusable(focusable: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.height> property.
+			 */
+			getHeight(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.height> property.
+			 */
+			setHeight(height: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.height> property.
+			 */
+			setHeight(height: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.hiddenBehavior> property.
+			 */
+			getHiddenBehavior(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.hiddenBehavior> property.
+			 */
+			setHiddenBehavior(hiddenBehavior: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.left> property.
+			 */
+			getLeft(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.left> property.
+			 */
+			setLeft(left: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.left> property.
+			 */
+			setLeft(left: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.layout> property.
+			 */
+			getLayout(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.layout> property.
+			 */
+			setLayout(layout: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.opacity> property.
+			 */
+			getOpacity(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.opacity> property.
+			 */
+			setOpacity(opacity: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.overrideCurrentAnimation> property.
+			 */
+			getOverrideCurrentAnimation(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.overrideCurrentAnimation> property.
+			 */
+			setOverrideCurrentAnimation(overrideCurrentAnimation: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.pullBackgroundColor> property.
+			 */
+			getPullBackgroundColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.pullBackgroundColor> property.
+			 */
+			setPullBackgroundColor(pullBackgroundColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.previewContext> property.
+			 */
+			getPreviewContext(): Titanium.UI.iOS.PreviewContext;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.previewContext> property.
+			 */
+			setPreviewContext(previewContext: Titanium.UI.iOS.PreviewContext): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.right> property.
+			 */
+			getRight(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.right> property.
+			 */
+			setRight(right: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.right> property.
+			 */
+			setRight(right: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.rect> property.
+			 */
+			getRect(): Dimension;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.rotation> property.
+			 */
+			getRotation(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.rotation> property.
+			 */
+			setRotation(rotation: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.rotationX> property.
+			 */
+			getRotationX(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.rotationX> property.
+			 */
+			setRotationX(rotationX: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.rotationY> property.
+			 */
+			getRotationY(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.rotationY> property.
+			 */
+			setRotationY(rotationY: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.scaleX> property.
+			 */
+			getScaleX(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.scaleX> property.
+			 */
+			setScaleX(scaleX: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.scaleY> property.
+			 */
+			getScaleY(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.scaleY> property.
+			 */
+			setScaleY(scaleY: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.size> property.
+			 */
+			getSize(): Dimension;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.softKeyboardOnFocus> property.
+			 */
+			getSoftKeyboardOnFocus(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.softKeyboardOnFocus> property.
+			 */
+			setSoftKeyboardOnFocus(softKeyboardOnFocus: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.tintColor> property.
+			 */
+			getTintColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.tintColor> property.
+			 */
+			setTintColor(tintColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.top> property.
+			 */
+			getTop(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.top> property.
+			 */
+			setTop(top: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.top> property.
+			 */
+			setTop(top: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.touchEnabled> property.
+			 */
+			getTouchEnabled(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.touchEnabled> property.
+			 */
+			setTouchEnabled(touchEnabled: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.touchFeedback> property.
+			 */
+			getTouchFeedback(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.touchFeedback> property.
+			 */
+			setTouchFeedback(touchFeedback: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.touchFeedbackColor> property.
+			 */
+			getTouchFeedbackColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.touchFeedbackColor> property.
+			 */
+			setTouchFeedbackColor(touchFeedbackColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.transform> property.
+			 */
+			getTransform(): Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.transform> property.
+			 */
+			setTransform(transform: Titanium.UI.Matrix2D): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.transform> property.
+			 */
+			setTransform(transform: Titanium.UI.Matrix3D): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.translationX> property.
+			 */
+			getTranslationX(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.translationX> property.
+			 */
+			setTranslationX(translationX: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.translationY> property.
+			 */
+			getTranslationY(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.translationY> property.
+			 */
+			setTranslationY(translationY: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.translationZ> property.
+			 */
+			getTranslationZ(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.translationZ> property.
+			 */
+			setTranslationZ(translationZ: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.transitionName> property.
+			 */
+			getTransitionName(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.transitionName> property.
+			 */
+			setTransitionName(transitionName: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.viewShadowRadius> property.
+			 */
+			getViewShadowRadius(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.viewShadowRadius> property.
+			 */
+			setViewShadowRadius(viewShadowRadius: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.viewShadowColor> property.
+			 */
+			getViewShadowColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.viewShadowColor> property.
+			 */
+			setViewShadowColor(viewShadowColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.viewShadowOffset> property.
+			 */
+			getViewShadowOffset(): Point;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.viewShadowOffset> property.
+			 */
+			setViewShadowOffset(viewShadowOffset: Point): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.visible> property.
+			 */
+			getVisible(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.visible> property.
+			 */
+			setVisible(visible: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.width> property.
+			 */
+			getWidth(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.width> property.
+			 */
+			setWidth(width: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.width> property.
+			 */
+			setWidth(width: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.horizontalWrap> property.
+			 */
+			getHorizontalWrap(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.horizontalWrap> property.
+			 */
+			setHorizontalWrap(horizontalWrap: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.zIndex> property.
+			 */
+			getZIndex(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.zIndex> property.
+			 */
+			setZIndex(zIndex: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.View.keepScreenOn> property.
+			 */
+			getKeepScreenOn(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.keepScreenOn> property.
+			 */
+			setKeepScreenOn(keepScreenOn: boolean): void;
+
+		}
+
+		/**
+		 * The 2D Matrix is an object for holding values for an affine transformation matrix.
+		 */
+		interface Matrix2D extends Titanium.Proxy {
+			/**
+			 * The entry at position [1,1] in the matrix.
+			 */
+			a: number;
+
+			/**
+			 * The entry at position [1,2] in the matrix.
+			 */
+			b: number;
+
+			/**
+			 * The entry at position [2,1] in the matrix.
+			 */
+			c: number;
+
+			/**
+			 * The entry at position [2,2] in the matrix.
+			 */
+			d: number;
+
+			/**
+			 * The entry at position [3,1] in the matrix.
+			 */
+			tx: number;
+
+			/**
+			 * The entry at position [3,2] in the matrix.
+			 */
+			ty: number;
+
+			/**
+			 * Returns a matrix constructed by inverting this matrix.
+			 */
+			invert(): Titanium.UI.Matrix2D;
+
+			/**
+			 * Returns a matrix constructed by combining two existing matrices.
+			 */
+			multiply(t2: Titanium.UI.Matrix2D): Titanium.UI.Matrix2D;
+
+			/**
+			 * Returns a matrix constructed by rotating this matrix.
+			 */
+			rotate(angle: number, toAngle?: number): Titanium.UI.Matrix2D;
+
+			/**
+			 * Returns a `2DMatrix` object that specifies a scaling animation from one scale to another.
+			 */
+			scale(sx: number, sy: number, toSx?: number, toSy?: number): Titanium.UI.Matrix2D;
+
+			/**
+			 * Returns a matrix constructed by applying a translation transform to this matrix.
+			 */
+			translate(tx: number, ty: number): Titanium.UI.Matrix2D;
+
+			/**
+			 * Gets the value of the <Titanium.UI.2DMatrix.a> property.
+			 */
+			getA(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.2DMatrix.a> property.
+			 */
+			setA(a: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.2DMatrix.b> property.
+			 */
+			getB(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.2DMatrix.b> property.
+			 */
+			setB(b: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.2DMatrix.c> property.
+			 */
+			getC(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.2DMatrix.c> property.
+			 */
+			setC(c: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.2DMatrix.d> property.
+			 */
+			getD(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.2DMatrix.d> property.
+			 */
+			setD(d: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.2DMatrix.tx> property.
+			 */
+			getTx(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.2DMatrix.tx> property.
+			 */
+			setTx(tx: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.2DMatrix.ty> property.
+			 */
+			getTy(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.2DMatrix.ty> property.
+			 */
+			setTy(ty: number): void;
+
+		}
+
+		/**
+		 * The 3D Matrix is an object for holding values for a 3D affine transform.
+		 */
+		interface Matrix3D extends Titanium.Proxy {
+			/**
+			 * The entry at position [1,1] in the matrix.
+			 */
+			m11: number;
+
+			/**
+			 * The entry at position [1,2] in the matrix.
+			 */
+			m12: number;
+
+			/**
+			 * The entry at position [1,3] in the matrix.
+			 */
+			m13: number;
+
+			/**
+			 * The entry at position [1,4] in the matrix.
+			 */
+			m14: number;
+
+			/**
+			 * The entry at position [2,1] in the matrix.
+			 */
+			m21: number;
+
+			/**
+			 * The entry at position [2,2] in the matrix.
+			 */
+			m22: number;
+
+			/**
+			 * The entry at position [2,3] in the matrix.
+			 */
+			m23: number;
+
+			/**
+			 * The entry at position [2,4] in the matrix.
+			 */
+			m24: number;
+
+			/**
+			 * The entry at position [3,1] in the matrix.
+			 */
+			m31: number;
+
+			/**
+			 * The entry at position [3,2] in the matrix.
+			 */
+			m32: number;
+
+			/**
+			 * The entry at position [3,3] in the matrix.
+			 */
+			m33: number;
+
+			/**
+			 * The entry at position [3,4] in the matrix.
+			 */
+			m34: number;
+
+			/**
+			 * The entry at position [4,1] in the matrix.
+			 */
+			m41: number;
+
+			/**
+			 * The entry at position [4,2] in the matrix.
+			 */
+			m42: number;
+
+			/**
+			 * The entry at position [4,3] in the matrix.
+			 */
+			m43: number;
+
+			/**
+			 * The entry at position [4,4] in the matrix.
+			 */
+			m44: number;
+
+			/**
+			 * Returns a matrix constructed by inverting this matrix.
+			 */
+			invert(): Titanium.UI.Matrix3D;
+
+			/**
+			 * Returns a matrix constructed by combining two existing matrix.
+			 */
+			multiply(t2: Titanium.UI.Matrix3D): Titanium.UI.Matrix3D;
+
+			/**
+			 * Returns a matrix constructed by rotating this matrix.
+			 */
+			rotate(angle: number, x: number, y: number, z: number): Titanium.UI.Matrix3D;
+
+			/**
+			 * Returns a matrix constructed by scaling this matrix.
+			 */
+			scale(sx: number, sy: number, sz: number): Titanium.UI.Matrix3D;
+
+			/**
+			 * Returns a matrix constructed by translating an existing matrix.
+			 */
+			translate(tx: number, ty: number, tz: number): Titanium.UI.Matrix3D;
+
+			/**
+			 * Gets the value of the <Titanium.UI.3DMatrix.m11> property.
+			 */
+			getM11(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.3DMatrix.m11> property.
+			 */
+			setM11(m11: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.3DMatrix.m12> property.
+			 */
+			getM12(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.3DMatrix.m12> property.
+			 */
+			setM12(m12: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.3DMatrix.m13> property.
+			 */
+			getM13(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.3DMatrix.m13> property.
+			 */
+			setM13(m13: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.3DMatrix.m14> property.
+			 */
+			getM14(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.3DMatrix.m14> property.
+			 */
+			setM14(m14: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.3DMatrix.m21> property.
+			 */
+			getM21(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.3DMatrix.m21> property.
+			 */
+			setM21(m21: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.3DMatrix.m22> property.
+			 */
+			getM22(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.3DMatrix.m22> property.
+			 */
+			setM22(m22: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.3DMatrix.m23> property.
+			 */
+			getM23(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.3DMatrix.m23> property.
+			 */
+			setM23(m23: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.3DMatrix.m24> property.
+			 */
+			getM24(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.3DMatrix.m24> property.
+			 */
+			setM24(m24: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.3DMatrix.m31> property.
+			 */
+			getM31(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.3DMatrix.m31> property.
+			 */
+			setM31(m31: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.3DMatrix.m32> property.
+			 */
+			getM32(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.3DMatrix.m32> property.
+			 */
+			setM32(m32: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.3DMatrix.m33> property.
+			 */
+			getM33(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.3DMatrix.m33> property.
+			 */
+			setM33(m33: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.3DMatrix.m34> property.
+			 */
+			getM34(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.3DMatrix.m34> property.
+			 */
+			setM34(m34: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.3DMatrix.m41> property.
+			 */
+			getM41(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.3DMatrix.m41> property.
+			 */
+			setM41(m41: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.3DMatrix.m42> property.
+			 */
+			getM42(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.3DMatrix.m42> property.
+			 */
+			setM42(m42: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.3DMatrix.m43> property.
+			 */
+			getM43(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.3DMatrix.m43> property.
+			 */
+			setM43(m43: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.3DMatrix.m44> property.
+			 */
+			getM44(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.3DMatrix.m44> property.
+			 */
+			setM44(m44: number): void;
+
+		}
+
+		/**
+		 * An activity indicator that lets the user know an action is taking place.
+		 */
+		interface ActivityIndicator extends Titanium.UI.View {
+			/**
+			 * Color of the message text, as a color name or hex triplet.
+			 */
+			color: string;
+
+			/**
+			 * Font used for the message text.
+			 */
+			font: Font;
+
+			/**
+			 * Message text.
+			 */
+			message: string;
+
+			/**
+			 * Key identifying a string in the locale file to use for the message text.
+			 */
+			messageid: string;
+
+			/**
+			 * The style for the activity indicator.
+			 */
+			style: number;
+
+			/**
+			 * Color of the animated indicator.
+			 */
+			indicatorColor: string;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ActivityIndicator.color> property.
+			 */
+			getColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ActivityIndicator.color> property.
+			 */
+			setColor(color: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ActivityIndicator.font> property.
+			 */
+			getFont(): Font;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ActivityIndicator.font> property.
+			 */
+			setFont(font: Font): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ActivityIndicator.message> property.
+			 */
+			getMessage(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ActivityIndicator.message> property.
+			 */
+			setMessage(message: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ActivityIndicator.messageid> property.
+			 */
+			getMessageid(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ActivityIndicator.messageid> property.
+			 */
+			setMessageid(messageid: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ActivityIndicator.style> property.
+			 */
+			getStyle(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ActivityIndicator.style> property.
+			 */
+			setStyle(style: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ActivityIndicator.indicatorColor> property.
+			 */
+			getIndicatorColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ActivityIndicator.indicatorColor> property.
+			 */
+			setIndicatorColor(indicatorColor: string): void;
+
+		}
+
+		/**
+		 * An alert dialog is a modal view that includes an optional title, a message and buttons,
+		 * positioned in the middle of the display.
+		 */
+		interface AlertDialog extends Titanium.UI.View {
+			/**
+			 * View to load inside the message area, to create a custom layout.
+			 */
+			androidView: Titanium.UI.View;
+
+			/**
+			 * Name of each button to create.
+			 */
+			buttonNames: string[];
+
+			/**
+			 * Index to define the cancel button.
+			 */
+			cancel: number;
+
+			/**
+			 * When this is set to `true`, the dialog is canceled when touched outside the window's bounds.
+			 */
+			canceledOnTouchOutside: boolean;
+
+			/**
+			 * Index to define the destructive button.
+			 */
+			destructive: number;
+
+			/**
+			 * Hint text of the text field inside the dialog.
+			 */
+			hintText: string;
+
+			/**
+			 * Key identifying a string from the locale file to use for the
+			 * [hintText](Titanium.UI.AlertDialog.hintText) property.
+			 */
+			hinttextid: string;
+
+			/**
+			 * Keyboard type to display when this text field inside the dialog is focused.
+			 */
+			keyboardType: number;
+
+			/**
+			 * Keyboard appearance to be displayed when the text field inside the dialog is focused.
+			 */
+			keyboardAppearance: number;
+
+			/**
+			 * Placeholder of the login text field inside the dialog.
+			 */
+			loginPlaceholder: string;
+
+			/**
+			 * Hint text of the login text field inside the dialog.
+			 */
+			loginHintText: string;
+
+			/**
+			 * Key identifying a string from the locale file to use for the
+			 * [loginHintText](Titanium.UI.AlertDialog.loginHintText) property.
+			 */
+			loginhinttextid: string;
+
+			/**
+			 * Specifies the text to display on the keyboard `Return` key when this field is focused.
+			 */
+			loginReturnKeyType: number;
+
+			/**
+			 * Value of the login text field inside the dialog.
+			 */
+			loginValue: string;
+
+			/**
+			 * Keyboard type to display when this text field inside the dialog is focused.
+			 */
+			loginKeyboardType: number;
+
+			/**
+			 * Dialog message.
+			 */
+			message: string;
+
+			/**
+			 * Key identifying a string in the locale file to use for the message text.
+			 */
+			messageid: string;
+
+			/**
+			 * Text for the `OK` button.
+			 */
+			ok: string;
+
+			/**
+			 * Key identifying a string in the locale file to use for the `ok` text.
+			 */
+			okid: string;
+
+			/**
+			 * Placeholder of the password text field inside the dialog.
+			 */
+			passwordPlaceholder: string;
+
+			/**
+			 * Hint text of the password text field inside the dialog.
+			 */
+			passwordHintText: string;
+
+			/**
+			 * Key identifying a string from the locale file to use for the
+			 * [passwordHintText](Titanium.UI.AlertDialog.passwordHintText) property.
+			 */
+			passwordhinttextid: string;
+
+			/**
+			 * Specifies the text to display on the keyboard `Return` key when this field is focused.
+			 */
+			passwordReturnKeyType: number;
+
+			/**
+			 * Value of the password text field inside the dialog.
+			 */
+			passwordValue: string;
+
+			/**
+			 * Keyboard type to display when this text field inside the dialog is focused.
+			 */
+			passwordKeyboardType: number;
+
+			/**
+			 * Placeholder of the text field inside the dialog.
+			 */
+			placeholder: string;
+
+			/**
+			 * Boolean value indicating if the alert dialog should only be cancelled by user gesture or by hide method.
+			 */
+			persistent: boolean;
+
+			/**
+			 * Index to define the preferred button.
+			 */
+			preferred: number;
+
+			/**
+			 * Specifies the text to display on the keyboard `Return` key when this field is focused.
+			 */
+			returnKeyType: number;
+
+			/**
+			 * The style for the alert dialog.
+			 */
+			style: number;
+
+			/**
+			 * Title of the dialog.
+			 */
+			title: string;
+
+			/**
+			 * Key identifying a string in the locale file to use for the title text.
+			 */
+			titleid: string;
+
+			/**
+			 * Value of the text field inside the dialog.
+			 */
+			value: string;
+
+			/**
+			 * Gets the value of the <Titanium.UI.AlertDialog.buttonNames> property.
+			 */
+			getButtonNames(): string[];
+
+			/**
+			 * Sets the value of the <Titanium.UI.AlertDialog.buttonNames> property.
+			 */
+			setButtonNames(buttonNames: ReadonlyArray<string>): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.AlertDialog.cancel> property.
+			 */
+			getCancel(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.AlertDialog.cancel> property.
+			 */
+			setCancel(cancel: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.AlertDialog.canceledOnTouchOutside> property.
+			 */
+			getCanceledOnTouchOutside(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.AlertDialog.canceledOnTouchOutside> property.
+			 */
+			setCanceledOnTouchOutside(canceledOnTouchOutside: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.AlertDialog.destructive> property.
+			 */
+			getDestructive(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.AlertDialog.destructive> property.
+			 */
+			setDestructive(destructive: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.AlertDialog.hintText> property.
+			 */
+			getHintText(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.AlertDialog.hintText> property.
+			 */
+			setHintText(hintText: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.AlertDialog.hinttextid> property.
+			 */
+			getHinttextid(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.AlertDialog.hinttextid> property.
+			 */
+			setHinttextid(hinttextid: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.AlertDialog.keyboardType> property.
+			 */
+			getKeyboardType(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.AlertDialog.keyboardType> property.
+			 */
+			setKeyboardType(keyboardType: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.AlertDialog.keyboardAppearance> property.
+			 */
+			getKeyboardAppearance(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.AlertDialog.keyboardAppearance> property.
+			 */
+			setKeyboardAppearance(keyboardAppearance: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.AlertDialog.loginPlaceholder> property.
+			 */
+			getLoginPlaceholder(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.AlertDialog.loginPlaceholder> property.
+			 */
+			setLoginPlaceholder(loginPlaceholder: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.AlertDialog.loginHintText> property.
+			 */
+			getLoginHintText(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.AlertDialog.loginHintText> property.
+			 */
+			setLoginHintText(loginHintText: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.AlertDialog.loginhinttextid> property.
+			 */
+			getLoginhinttextid(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.AlertDialog.loginhinttextid> property.
+			 */
+			setLoginhinttextid(loginhinttextid: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.AlertDialog.loginReturnKeyType> property.
+			 */
+			getLoginReturnKeyType(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.AlertDialog.loginReturnKeyType> property.
+			 */
+			setLoginReturnKeyType(loginReturnKeyType: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.AlertDialog.loginValue> property.
+			 */
+			getLoginValue(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.AlertDialog.loginValue> property.
+			 */
+			setLoginValue(loginValue: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.AlertDialog.loginKeyboardType> property.
+			 */
+			getLoginKeyboardType(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.AlertDialog.loginKeyboardType> property.
+			 */
+			setLoginKeyboardType(loginKeyboardType: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.AlertDialog.message> property.
+			 */
+			getMessage(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.AlertDialog.message> property.
+			 */
+			setMessage(message: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.AlertDialog.messageid> property.
+			 */
+			getMessageid(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.AlertDialog.messageid> property.
+			 */
+			setMessageid(messageid: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.AlertDialog.ok> property.
+			 */
+			getOk(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.AlertDialog.ok> property.
+			 */
+			setOk(ok: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.AlertDialog.okid> property.
+			 */
+			getOkid(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.AlertDialog.okid> property.
+			 */
+			setOkid(okid: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.AlertDialog.passwordPlaceholder> property.
+			 */
+			getPasswordPlaceholder(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.AlertDialog.passwordPlaceholder> property.
+			 */
+			setPasswordPlaceholder(passwordPlaceholder: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.AlertDialog.passwordHintText> property.
+			 */
+			getPasswordHintText(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.AlertDialog.passwordHintText> property.
+			 */
+			setPasswordHintText(passwordHintText: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.AlertDialog.passwordhinttextid> property.
+			 */
+			getPasswordhinttextid(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.AlertDialog.passwordhinttextid> property.
+			 */
+			setPasswordhinttextid(passwordhinttextid: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.AlertDialog.passwordReturnKeyType> property.
+			 */
+			getPasswordReturnKeyType(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.AlertDialog.passwordReturnKeyType> property.
+			 */
+			setPasswordReturnKeyType(passwordReturnKeyType: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.AlertDialog.passwordValue> property.
+			 */
+			getPasswordValue(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.AlertDialog.passwordValue> property.
+			 */
+			setPasswordValue(passwordValue: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.AlertDialog.passwordKeyboardType> property.
+			 */
+			getPasswordKeyboardType(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.AlertDialog.passwordKeyboardType> property.
+			 */
+			setPasswordKeyboardType(passwordKeyboardType: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.AlertDialog.placeholder> property.
+			 */
+			getPlaceholder(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.AlertDialog.placeholder> property.
+			 */
+			setPlaceholder(placeholder: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.AlertDialog.persistent> property.
+			 */
+			getPersistent(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.AlertDialog.persistent> property.
+			 */
+			setPersistent(persistent: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.AlertDialog.preferred> property.
+			 */
+			getPreferred(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.AlertDialog.preferred> property.
+			 */
+			setPreferred(preferred: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.AlertDialog.returnKeyType> property.
+			 */
+			getReturnKeyType(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.AlertDialog.returnKeyType> property.
+			 */
+			setReturnKeyType(returnKeyType: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.AlertDialog.style> property.
+			 */
+			getStyle(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.AlertDialog.style> property.
+			 */
+			setStyle(style: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.AlertDialog.title> property.
+			 */
+			getTitle(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.AlertDialog.title> property.
+			 */
+			setTitle(title: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.AlertDialog.titleid> property.
+			 */
+			getTitleid(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.AlertDialog.titleid> property.
+			 */
+			setTitleid(titleid: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.AlertDialog.value> property.
+			 */
+			getValue(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.AlertDialog.value> property.
+			 */
+			setValue(value: string): void;
+
+		}
+
+		/**
+		 * The `Animation` object defines an animation that can be applied to a view.
+		 */
+		interface Animation extends Titanium.Proxy {
+			/**
+			 * Coordinate of the view about which to pivot an animation.
+			 */
+			anchorPoint: Point;
+
+			/**
+			 * Specifies if the animation should be replayed in reverse upon completion.
+			 */
+			autoreverse: boolean;
+
+			/**
+			 * Value of the `backgroundColor` property at the end of the animation, as a color name
+			 * or hex triplet.
+			 */
+			backgroundColor: string;
+
+			/**
+			 * Value of the `bottom` property at the end of the animation.
+			 */
+			bottom: number;
+
+			/**
+			 * Value of the `center` property at the end of the animation.
+			 */
+			center: any;
+
+			/**
+			 * Value of the `color` property at the end of the animation, as a color name or hex triplet.
+			 */
+			color: string;
+
+			/**
+			 * Animation curve or easing function to apply to the animation.
+			 */
+			curve: number;
+
+			/**
+			 * Delay, in milliseconds before starting the animation.
+			 */
+			delay: number;
+
+			/**
+			 * Duration of the animation, in milliseconds.
+			 */
+			duration: number;
+
+			/**
+			 * Value of the `height` property at the end of the animation.
+			 */
+			height: number;
+
+			/**
+			 * Value of the `left` property at the end of the animation.
+			 */
+			left: number;
+
+			/**
+			 * Value of the `opacity` property at the end of the animation.
+			 */
+			opacity: number;
+
+			/**
+			 * Value of the `opaque` property at the end of the animation.
+			 */
+			opaque: boolean;
+
+			/**
+			 * Number of times the animation should be performed.
+			 */
+			repeat: number;
+
+			/**
+			 * Value of the `right` property at the end of the animation.
+			 */
+			right: number;
+
+			/**
+			 * Value of the `top` property at the end of the animation.
+			 */
+			top: number;
+
+			/**
+			 * Animate the view from its current tranform to the specified transform.
+			 */
+			transform: Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
+
+			/**
+			 * Transition type to use during a transition animation.
+			 */
+			transition: number;
+
+			/**
+			 * New view to transition to.
+			 */
+			view: Titanium.UI.View;
+
+			/**
+			 * Value of the `visible` property at the end of the animation.
+			 */
+			visible: boolean;
+
+			/**
+			 * Value of the `width` property at the end of the animation.
+			 */
+			width: number;
+
+			/**
+			 * Value of the `zIndex` property at the end of the animation.
+			 */
+			zIndex: number;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Animation.anchorPoint> property.
+			 */
+			getAnchorPoint(): Point;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Animation.anchorPoint> property.
+			 */
+			setAnchorPoint(anchorPoint: Point): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Animation.autoreverse> property.
+			 */
+			getAutoreverse(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Animation.autoreverse> property.
+			 */
+			setAutoreverse(autoreverse: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Animation.backgroundColor> property.
+			 */
+			getBackgroundColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Animation.backgroundColor> property.
+			 */
+			setBackgroundColor(backgroundColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Animation.bottom> property.
+			 */
+			getBottom(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Animation.bottom> property.
+			 */
+			setBottom(bottom: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Animation.center> property.
+			 */
+			getCenter(): any;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Animation.center> property.
+			 */
+			setCenter(center: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Animation.color> property.
+			 */
+			getColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Animation.color> property.
+			 */
+			setColor(color: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Animation.curve> property.
+			 */
+			getCurve(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Animation.curve> property.
+			 */
+			setCurve(curve: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Animation.delay> property.
+			 */
+			getDelay(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Animation.delay> property.
+			 */
+			setDelay(delay: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Animation.duration> property.
+			 */
+			getDuration(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Animation.duration> property.
+			 */
+			setDuration(duration: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Animation.height> property.
+			 */
+			getHeight(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Animation.height> property.
+			 */
+			setHeight(height: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Animation.left> property.
+			 */
+			getLeft(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Animation.left> property.
+			 */
+			setLeft(left: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Animation.opacity> property.
+			 */
+			getOpacity(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Animation.opacity> property.
+			 */
+			setOpacity(opacity: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Animation.opaque> property.
+			 */
+			getOpaque(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Animation.opaque> property.
+			 */
+			setOpaque(opaque: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Animation.repeat> property.
+			 */
+			getRepeat(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Animation.repeat> property.
+			 */
+			setRepeat(repeat: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Animation.right> property.
+			 */
+			getRight(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Animation.right> property.
+			 */
+			setRight(right: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Animation.top> property.
+			 */
+			getTop(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Animation.top> property.
+			 */
+			setTop(top: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Animation.transform> property.
+			 */
+			getTransform(): Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Animation.transform> property.
+			 */
+			setTransform(transform: Titanium.UI.Matrix2D): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Animation.transform> property.
+			 */
+			setTransform(transform: Titanium.UI.Matrix3D): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Animation.transition> property.
+			 */
+			getTransition(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Animation.transition> property.
+			 */
+			setTransition(transition: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Animation.view> property.
+			 */
+			getView(): Titanium.UI.View;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Animation.view> property.
+			 */
+			setView(view: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Animation.visible> property.
+			 */
+			getVisible(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Animation.visible> property.
+			 */
+			setVisible(visible: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Animation.width> property.
+			 */
+			getWidth(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Animation.width> property.
+			 */
+			setWidth(width: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Animation.zIndex> property.
+			 */
+			getZIndex(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Animation.zIndex> property.
+			 */
+			setZIndex(zIndex: number): void;
+
+		}
+
+		/**
+		 * An attributed string proxy manages character strings and associated sets of attributes (for example,
+		 * font and foregroundcolor) that apply to individual characters or ranges of characters in the string.
+		 */
+		interface AttributedString extends Titanium.Proxy {
+			/**
+			 * The text applied to the attributed string.
+			 */
+			text: string;
+
+			/**
+			 * An array of attributes to add.
+			 */
+			attributes: Attribute[];
+
+			/**
+			 * Adds an [attribute](Attribute) with the given name and value to the characters in the specified range.
+			 */
+			addAttribute(attribute: Attribute): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.AttributedString.text> property.
+			 */
+			getText(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.AttributedString.text> property.
+			 */
+			setText(text: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.AttributedString.attributes> property.
+			 */
+			getAttributes(): Attribute[];
+
+			/**
+			 * Sets the value of the <Titanium.UI.AttributedString.attributes> property.
+			 */
+			setAttributes(attributes: ReadonlyArray<Attribute>): void;
+
+		}
+
+		/**
+		 * A button widget that has four states: normal, disabled, focused and selected.
+		 */
+		interface Button extends Titanium.UI.View {
+			/**
+			 * Default button text color, as a color name or hex triplet.
+			 */
+			color: string;
+
+			/**
+			 * Text color of the button in its disabled state, as a color name or hex triplet.
+			 */
+			disabledColor: string;
+
+			/**
+			 * Set to `true` to enable the button, `false` to disable the button.
+			 */
+			enabled: boolean;
+
+			/**
+			 * Font to use for the button text.
+			 */
+			font: Font;
+
+			/**
+			 * Image to display on the button, specified as a local path, URL or a `Blob`.
+			 */
+			image: string | Titanium.Blob;
+
+			/**
+			 * Button text color used to indicate the selected state, as a color name or hex triplet.
+			 */
+			selectedColor: string;
+
+			/**
+			 * Shadow color of the [title](Titanium.UI.Button.title), as a color name or hex triplet.
+			 */
+			shadowColor: string;
+
+			/**
+			 * Shadow offset of the [title](Titanium.UI.Button.title), as a dictionary with the properties `x` and `y`.
+			 */
+			shadowOffset: any;
+
+			/**
+			 * Shadow radius of the [title](Titanium.UI.Button.title).
+			 */
+			shadowRadius: number;
+
+			/**
+			 * Style constant for the button, as defined in <Titanium.UI.iOS.SystemButtonStyle>.
+			 */
+			style: number;
+
+			/**
+			 * Specifies an iOS system button appearance, as defined in <Titanium.UI.iOS.SystemButton>.
+			 */
+			systemButton: number;
+
+			/**
+			 * Text alignment, specified using one of the <Titanium.UI> text alignment constants.
+			 */
+			textAlign: string | number;
+
+			/**
+			 * Button title.
+			 */
+			title: string;
+
+			/**
+			 * Key identifying a string from the locale file to use for the button title.
+			 */
+			titleid: string;
+
+			/**
+			 * Vertical alignment for the text field, specified using one of the
+			 * vertical alignment constants from <Titanium.UI>.
+			 */
+			verticalAlign: number | string;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Button.color> property.
+			 */
+			getColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Button.color> property.
+			 */
+			setColor(color: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Button.disabledColor> property.
+			 */
+			getDisabledColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Button.disabledColor> property.
+			 */
+			setDisabledColor(disabledColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Button.enabled> property.
+			 */
+			getEnabled(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Button.enabled> property.
+			 */
+			setEnabled(enabled: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Button.font> property.
+			 */
+			getFont(): Font;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Button.font> property.
+			 */
+			setFont(font: Font): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Button.image> property.
+			 */
+			getImage(): string | Titanium.Blob;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Button.image> property.
+			 */
+			setImage(image: string): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Button.image> property.
+			 */
+			setImage(image: Titanium.Blob): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Button.selectedColor> property.
+			 */
+			getSelectedColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Button.selectedColor> property.
+			 */
+			setSelectedColor(selectedColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Button.shadowColor> property.
+			 */
+			getShadowColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Button.shadowColor> property.
+			 */
+			setShadowColor(shadowColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Button.shadowOffset> property.
+			 */
+			getShadowOffset(): any;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Button.shadowOffset> property.
+			 */
+			setShadowOffset(shadowOffset: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Button.shadowRadius> property.
+			 */
+			getShadowRadius(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Button.shadowRadius> property.
+			 */
+			setShadowRadius(shadowRadius: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Button.style> property.
+			 */
+			getStyle(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Button.style> property.
+			 */
+			setStyle(style: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Button.systemButton> property.
+			 */
+			getSystemButton(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Button.systemButton> property.
+			 */
+			setSystemButton(systemButton: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Button.textAlign> property.
+			 */
+			getTextAlign(): string | number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Button.textAlign> property.
+			 */
+			setTextAlign(textAlign: string): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Button.textAlign> property.
+			 */
+			setTextAlign(textAlign: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Button.title> property.
+			 */
+			getTitle(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Button.title> property.
+			 */
+			setTitle(title: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Button.titleid> property.
+			 */
+			getTitleid(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Button.titleid> property.
+			 */
+			setTitleid(titleid: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Button.verticalAlign> property.
+			 */
+			getVerticalAlign(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Button.verticalAlign> property.
+			 */
+			setVerticalAlign(verticalAlign: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Button.verticalAlign> property.
+			 */
+			setVerticalAlign(verticalAlign: string): void;
+
+		}
+
+		/**
+		 * An iOS button bar component.
+		 */
+		interface ButtonBar extends Titanium.Proxy {
+			/**
+			 * Whether the view should be "hidden" from (i.e., ignored by) the accessibility service.
+			 */
+			accessibilityHidden: boolean;
+
+			/**
+			 * Briefly describes what performing an action (such as a click) on the view will do.
+			 */
+			accessibilityHint: string;
+
+			/**
+			 * A succint label identifying the view for the device's accessibility service.
+			 */
+			accessibilityLabel: string;
+
+			/**
+			 * A string describing the value (if any) of the view for the device's accessibility service.
+			 */
+			accessibilityValue: string;
+
+			/**
+			 * Coordinate of the view about which to pivot an animation.
+			 */
+			anchorPoint: Point;
+
+			/**
+			 * Current position of the view during an animation.
+			 */
+			readonly animatedCenter: Point;
+
+			/**
+			 * Background color of the view, as a color name or hex triplet.
+			 */
+			backgroundColor: string;
+
+			/**
+			 * A background gradient for the view.
+			 */
+			backgroundGradient: Gradient;
+
+			/**
+			 * Background image for the view, specified as a local file path or URL.
+			 */
+			backgroundImage: string;
+
+			/**
+			 * Determines whether to tile a background across a view.
+			 */
+			backgroundRepeat: boolean;
+
+			/**
+			 * Size of the left end cap.
+			 */
+			backgroundLeftCap: number;
+
+			/**
+			 * Size of the top end cap.
+			 */
+			backgroundTopCap: number;
+
+			/**
+			 * Border color of the view, as a color name or hex triplet.
+			 */
+			borderColor: string;
+
+			/**
+			 * Radius for the rounded corners of the view's border.
+			 */
+			borderRadius: number;
+
+			/**
+			 * Border width of the view.
+			 */
+			borderWidth: number;
+
+			/**
+			 * View's bottom position, in platform-specific units.
+			 */
+			bottom: number | string;
+
+			/**
+			 * View's center position, in the parent view's coordinates.
+			 */
+			center: Point;
+
+			/**
+			 * Array of this view's child views.
+			 */
+			readonly children: Titanium.UI.View[];
+
+			/**
+			 * View's clipping behavior.
+			 */
+			clipMode: number;
+
+			/**
+			 * View height, in platform-specific units.
+			 */
+			height: number | string;
+
+			/**
+			 * View's left position, in platform-specific units.
+			 */
+			left: number | string;
+
+			/**
+			 * Specifies how the view positions its children.
+			 * One of: 'composite', 'vertical', or 'horizontal'.
+			 */
+			layout: string;
+
+			/**
+			 * Opacity of this view, from 0.0 (transparent) to 1.0 (opaque).
+			 */
+			opacity: number;
+
+			/**
+			 * Background color of the wrapper view when this view is used as either <Titanium.UI.ListView.pullView> or <Titanium.UI.TableView.headerPullView>.
+			 */
+			pullBackgroundColor: string;
+
+			/**
+			 * The preview context used in the 3D-Touch feature "Peek and Pop".
+			 */
+			previewContext: Titanium.UI.iOS.PreviewContext;
+
+			/**
+			 * View's right position, in platform-specific units.
+			 */
+			right: number | string;
+
+			/**
+			 * The bounding box of the view relative to its parent, in system units.
+			 */
+			readonly rect: Dimension;
+
+			/**
+			 * The size of the view in system units.
+			 */
+			readonly size: Dimension;
+
+			/**
+			 * The view's tintColor. This property is applicable on iOS 7 and greater.
+			 */
+			tintColor: string;
+
+			/**
+			 * The view's top position.
+			 */
+			top: number | string;
+
+			/**
+			 * Determines whether view should receive touch events.
+			 */
+			touchEnabled: boolean;
+
+			/**
+			 * Transformation matrix to apply to the view.
+			 */
+			transform: Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
+
+			/**
+			 * Determines the blur radius used to create the shadow.
+			 */
+			viewShadowRadius: number;
+
+			/**
+			 * Determines the color of the shadow.
+			 */
+			viewShadowColor: string;
+
+			/**
+			 * Determines the offset for the shadow of the view.
+			 */
+			viewShadowOffset: Point;
+
+			/**
+			 * Determines whether the view is visible.
+			 */
+			visible: boolean;
+
+			/**
+			 * View's width, in platform-specific units.
+			 */
+			width: number | string;
+
+			/**
+			 * Determines whether the layout has wrapping behavior.
+			 */
+			horizontalWrap: boolean;
+
+			/**
+			 * Z-index stack order position, relative to other sibling views.
+			 */
+			zIndex: number;
+
+			/**
+			 * Index of the currently selected button.
+			 */
+			index: number;
+
+			/**
+			 * Array of labels for the button bar.
+			 */
+			labels: string[] | BarItemType[];
+
+			/**
+			 * Style of the button bar.
+			 */
+			style: number;
+
+			/**
+			 * Adds a child to this view's hierarchy.
+			 */
+			add(view: any): void;
+
+			/**
+			 * Adds a child to this view's hierarchy.
+			 */
+			add(view: any[]): void;
+
+			/**
+			 * Animates this view.
+			 */
+			animate(animation: any, callback?: (param0: any) => any): void;
+
+			/**
+			 * Finishes a batch update of the View's layout properties and schedules a layout pass of the
+			 * view tree.
+			 */
+			finishLayout(): void;
+
+			/**
+			 * Hides this view.
+			 */
+			hide(options?: AnimationOption): void;
+
+			/**
+			 * Inserts a view at the specified position in the [children](Titanium.UI.View.children) array.
+			 */
+			insertAt(params: any): void;
+
+			/**
+			 * Removes a child view from this view's hierarchy.
+			 */
+			remove(view: any): void;
+
+			/**
+			 * Removes all child views from this view's hierarchy.
+			 */
+			removeAllChildren(): void;
+
+			/**
+			 * Replaces a view at the specified position in the [children](Titanium.UI.View.children) array.
+			 */
+			replaceAt(params: any): void;
+
+			/**
+			 * Makes this view visible.
+			 */
+			show(options?: AnimationOption): void;
+
+			/**
+			 * Starts a batch update of this view's layout properties.
+			 */
+			startLayout(): void;
+
+			/**
+			 * Returns an image of the rendered view, as a Blob.
+			 */
+			toImage(callback?: (param0: Titanium.Blob) => any, honorScaleFactor?: boolean): Titanium.Blob;
+
+			/**
+			 * Performs a batch update of all supplied layout properties and schedules a layout pass after
+			 * they have been updated.
+			 */
+			updateLayout(params: any): void;
+
+			/**
+			 * Translates a point from this view's coordinate system to another view's coordinate system.
+			 */
+			convertPointToView(point: Point, destinationView: any): Point;
+
+			/**
+			 * Returns the matching view of a given view ID.
+			 */
+			getViewById(id: string): Titanium.UI.View;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ButtonBar.accessibilityHidden> property.
+			 */
+			getAccessibilityHidden(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ButtonBar.accessibilityHidden> property.
+			 */
+			setAccessibilityHidden(accessibilityHidden: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ButtonBar.accessibilityHint> property.
+			 */
+			getAccessibilityHint(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ButtonBar.accessibilityHint> property.
+			 */
+			setAccessibilityHint(accessibilityHint: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ButtonBar.accessibilityLabel> property.
+			 */
+			getAccessibilityLabel(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ButtonBar.accessibilityLabel> property.
+			 */
+			setAccessibilityLabel(accessibilityLabel: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ButtonBar.accessibilityValue> property.
+			 */
+			getAccessibilityValue(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ButtonBar.accessibilityValue> property.
+			 */
+			setAccessibilityValue(accessibilityValue: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ButtonBar.anchorPoint> property.
+			 */
+			getAnchorPoint(): Point;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ButtonBar.anchorPoint> property.
+			 */
+			setAnchorPoint(anchorPoint: Point): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ButtonBar.animatedCenter> property.
+			 */
+			getAnimatedCenter(): Point;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ButtonBar.backgroundColor> property.
+			 */
+			getBackgroundColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ButtonBar.backgroundColor> property.
+			 */
+			setBackgroundColor(backgroundColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ButtonBar.backgroundGradient> property.
+			 */
+			getBackgroundGradient(): Gradient;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ButtonBar.backgroundGradient> property.
+			 */
+			setBackgroundGradient(backgroundGradient: Gradient): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ButtonBar.backgroundImage> property.
+			 */
+			getBackgroundImage(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ButtonBar.backgroundImage> property.
+			 */
+			setBackgroundImage(backgroundImage: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ButtonBar.backgroundRepeat> property.
+			 */
+			getBackgroundRepeat(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ButtonBar.backgroundRepeat> property.
+			 */
+			setBackgroundRepeat(backgroundRepeat: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ButtonBar.backgroundLeftCap> property.
+			 */
+			getBackgroundLeftCap(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ButtonBar.backgroundLeftCap> property.
+			 */
+			setBackgroundLeftCap(backgroundLeftCap: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ButtonBar.backgroundTopCap> property.
+			 */
+			getBackgroundTopCap(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ButtonBar.backgroundTopCap> property.
+			 */
+			setBackgroundTopCap(backgroundTopCap: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ButtonBar.borderColor> property.
+			 */
+			getBorderColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ButtonBar.borderColor> property.
+			 */
+			setBorderColor(borderColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ButtonBar.borderRadius> property.
+			 */
+			getBorderRadius(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ButtonBar.borderRadius> property.
+			 */
+			setBorderRadius(borderRadius: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ButtonBar.borderWidth> property.
+			 */
+			getBorderWidth(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ButtonBar.borderWidth> property.
+			 */
+			setBorderWidth(borderWidth: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ButtonBar.bottom> property.
+			 */
+			getBottom(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ButtonBar.bottom> property.
+			 */
+			setBottom(bottom: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ButtonBar.bottom> property.
+			 */
+			setBottom(bottom: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ButtonBar.center> property.
+			 */
+			getCenter(): Point;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ButtonBar.center> property.
+			 */
+			setCenter(center: Point): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ButtonBar.children> property.
+			 */
+			getChildren(): Titanium.UI.View[];
+
+			/**
+			 * Gets the value of the <Titanium.UI.ButtonBar.clipMode> property.
+			 */
+			getClipMode(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ButtonBar.clipMode> property.
+			 */
+			setClipMode(clipMode: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ButtonBar.height> property.
+			 */
+			getHeight(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ButtonBar.height> property.
+			 */
+			setHeight(height: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ButtonBar.height> property.
+			 */
+			setHeight(height: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ButtonBar.left> property.
+			 */
+			getLeft(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ButtonBar.left> property.
+			 */
+			setLeft(left: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ButtonBar.left> property.
+			 */
+			setLeft(left: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ButtonBar.layout> property.
+			 */
+			getLayout(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ButtonBar.layout> property.
+			 */
+			setLayout(layout: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ButtonBar.opacity> property.
+			 */
+			getOpacity(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ButtonBar.opacity> property.
+			 */
+			setOpacity(opacity: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ButtonBar.pullBackgroundColor> property.
+			 */
+			getPullBackgroundColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ButtonBar.pullBackgroundColor> property.
+			 */
+			setPullBackgroundColor(pullBackgroundColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ButtonBar.previewContext> property.
+			 */
+			getPreviewContext(): Titanium.UI.iOS.PreviewContext;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ButtonBar.previewContext> property.
+			 */
+			setPreviewContext(previewContext: Titanium.UI.iOS.PreviewContext): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ButtonBar.right> property.
+			 */
+			getRight(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ButtonBar.right> property.
+			 */
+			setRight(right: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ButtonBar.right> property.
+			 */
+			setRight(right: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ButtonBar.rect> property.
+			 */
+			getRect(): Dimension;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ButtonBar.size> property.
+			 */
+			getSize(): Dimension;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ButtonBar.tintColor> property.
+			 */
+			getTintColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ButtonBar.tintColor> property.
+			 */
+			setTintColor(tintColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ButtonBar.top> property.
+			 */
+			getTop(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ButtonBar.top> property.
+			 */
+			setTop(top: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ButtonBar.top> property.
+			 */
+			setTop(top: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ButtonBar.touchEnabled> property.
+			 */
+			getTouchEnabled(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ButtonBar.touchEnabled> property.
+			 */
+			setTouchEnabled(touchEnabled: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ButtonBar.transform> property.
+			 */
+			getTransform(): Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ButtonBar.transform> property.
+			 */
+			setTransform(transform: Titanium.UI.Matrix2D): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ButtonBar.transform> property.
+			 */
+			setTransform(transform: Titanium.UI.Matrix3D): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ButtonBar.viewShadowRadius> property.
+			 */
+			getViewShadowRadius(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ButtonBar.viewShadowRadius> property.
+			 */
+			setViewShadowRadius(viewShadowRadius: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ButtonBar.viewShadowColor> property.
+			 */
+			getViewShadowColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ButtonBar.viewShadowColor> property.
+			 */
+			setViewShadowColor(viewShadowColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ButtonBar.viewShadowOffset> property.
+			 */
+			getViewShadowOffset(): Point;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ButtonBar.viewShadowOffset> property.
+			 */
+			setViewShadowOffset(viewShadowOffset: Point): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ButtonBar.visible> property.
+			 */
+			getVisible(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ButtonBar.visible> property.
+			 */
+			setVisible(visible: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ButtonBar.width> property.
+			 */
+			getWidth(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ButtonBar.width> property.
+			 */
+			setWidth(width: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ButtonBar.width> property.
+			 */
+			setWidth(width: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ButtonBar.horizontalWrap> property.
+			 */
+			getHorizontalWrap(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ButtonBar.horizontalWrap> property.
+			 */
+			setHorizontalWrap(horizontalWrap: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ButtonBar.zIndex> property.
+			 */
+			getZIndex(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ButtonBar.zIndex> property.
+			 */
+			setZIndex(zIndex: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ButtonBar.index> property.
+			 */
+			getIndex(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ButtonBar.index> property.
+			 */
+			setIndex(index: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ButtonBar.labels> property.
+			 */
+			getLabels(): string[] | BarItemType[];
+
+			/**
+			 * Sets the value of the <Titanium.UI.ButtonBar.labels> property.
+			 */
+			setLabels(labels: ReadonlyArray<string>): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ButtonBar.labels> property.
+			 */
+			setLabels(labels: ReadonlyArray<BarItemType>): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ButtonBar.style> property.
+			 */
+			getStyle(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ButtonBar.style> property.
+			 */
+			setStyle(style: number): void;
+
+		}
+
+		/**
+		 * The cover flow view is a container showing animated three-dimensional images in a style
+		 * consistent with the cover flow presentation used for iPod, iTunes, and file browsing.
+		 */
+		interface CoverFlowView extends Titanium.Proxy {
+			/**
+			 * Whether the view should be "hidden" from (i.e., ignored by) the accessibility service.
+			 */
+			accessibilityHidden: boolean;
+
+			/**
+			 * Briefly describes what performing an action (such as a click) on the view will do.
+			 */
+			accessibilityHint: string;
+
+			/**
+			 * A succint label identifying the view for the device's accessibility service.
+			 */
+			accessibilityLabel: string;
+
+			/**
+			 * A string describing the value (if any) of the view for the device's accessibility service.
+			 */
+			accessibilityValue: string;
+
+			/**
+			 * Coordinate of the view about which to pivot an animation.
+			 */
+			anchorPoint: Point;
+
+			/**
+			 * Current position of the view during an animation.
+			 */
+			readonly animatedCenter: Point;
+
+			/**
+			 * Background color of the view, as a color name or hex triplet.
+			 */
+			backgroundColor: string;
+
+			/**
+			 * A background gradient for the view.
+			 */
+			backgroundGradient: Gradient;
+
+			/**
+			 * Background image for the view, specified as a local file path or URL.
+			 */
+			backgroundImage: string;
+
+			/**
+			 * Determines whether to tile a background across a view.
+			 */
+			backgroundRepeat: boolean;
+
+			/**
+			 * Size of the left end cap.
+			 */
+			backgroundLeftCap: number;
+
+			/**
+			 * Size of the top end cap.
+			 */
+			backgroundTopCap: number;
+
+			/**
+			 * Border color of the view, as a color name or hex triplet.
+			 */
+			borderColor: string;
+
+			/**
+			 * Radius for the rounded corners of the view's border.
+			 */
+			borderRadius: number;
+
+			/**
+			 * Border width of the view.
+			 */
+			borderWidth: number;
+
+			/**
+			 * View's bottom position, in platform-specific units.
+			 */
+			bottom: number | string;
+
+			/**
+			 * View's center position, in the parent view's coordinates.
+			 */
+			center: Point;
+
+			/**
+			 * Array of this view's child views.
+			 */
+			readonly children: Titanium.UI.View[];
+
+			/**
+			 * View's clipping behavior.
+			 */
+			clipMode: number;
+
+			/**
+			 * View height, in platform-specific units.
+			 */
+			height: number | string;
+
+			/**
+			 * View's left position, in platform-specific units.
+			 */
+			left: number | string;
+
+			/**
+			 * Specifies how the view positions its children.
+			 * One of: 'composite', 'vertical', or 'horizontal'.
+			 */
+			layout: string;
+
+			/**
+			 * Opacity of this view, from 0.0 (transparent) to 1.0 (opaque).
+			 */
+			opacity: number;
+
+			/**
+			 * Background color of the wrapper view when this view is used as either <Titanium.UI.ListView.pullView> or <Titanium.UI.TableView.headerPullView>.
+			 */
+			pullBackgroundColor: string;
+
+			/**
+			 * The preview context used in the 3D-Touch feature "Peek and Pop".
+			 */
+			previewContext: Titanium.UI.iOS.PreviewContext;
+
+			/**
+			 * View's right position, in platform-specific units.
+			 */
+			right: number | string;
+
+			/**
+			 * The bounding box of the view relative to its parent, in system units.
+			 */
+			readonly rect: Dimension;
+
+			/**
+			 * The size of the view in system units.
+			 */
+			readonly size: Dimension;
+
+			/**
+			 * The view's tintColor. This property is applicable on iOS 7 and greater.
+			 */
+			tintColor: string;
+
+			/**
+			 * The view's top position.
+			 */
+			top: number | string;
+
+			/**
+			 * Determines whether view should receive touch events.
+			 */
+			touchEnabled: boolean;
+
+			/**
+			 * Transformation matrix to apply to the view.
+			 */
+			transform: Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
+
+			/**
+			 * Determines the blur radius used to create the shadow.
+			 */
+			viewShadowRadius: number;
+
+			/**
+			 * Determines the color of the shadow.
+			 */
+			viewShadowColor: string;
+
+			/**
+			 * Determines the offset for the shadow of the view.
+			 */
+			viewShadowOffset: Point;
+
+			/**
+			 * Determines whether the view is visible.
+			 */
+			visible: boolean;
+
+			/**
+			 * View's width, in platform-specific units.
+			 */
+			width: number | string;
+
+			/**
+			 * Determines whether the layout has wrapping behavior.
+			 */
+			horizontalWrap: boolean;
+
+			/**
+			 * Z-index stack order position, relative to other sibling views.
+			 */
+			zIndex: number;
+
+			/**
+			 * Array of images to display in the view.
+			 */
+			images: string[] | Titanium.Blob[] | Titanium.Filesystem.File[] | CoverFlowImageType[];
+
+			/**
+			 * Index to make selected.
+			 */
+			selected: number;
+
+			/**
+			 * Adds a child to this view's hierarchy.
+			 */
+			add(view: any): void;
+
+			/**
+			 * Adds a child to this view's hierarchy.
+			 */
+			add(view: any[]): void;
+
+			/**
+			 * Animates this view.
+			 */
+			animate(animation: any, callback?: (param0: any) => any): void;
+
+			/**
+			 * Finishes a batch update of the View's layout properties and schedules a layout pass of the
+			 * view tree.
+			 */
+			finishLayout(): void;
+
+			/**
+			 * Hides this view.
+			 */
+			hide(options?: AnimationOption): void;
+
+			/**
+			 * Inserts a view at the specified position in the [children](Titanium.UI.View.children) array.
+			 */
+			insertAt(params: any): void;
+
+			/**
+			 * Removes a child view from this view's hierarchy.
+			 */
+			remove(view: any): void;
+
+			/**
+			 * Removes all child views from this view's hierarchy.
+			 */
+			removeAllChildren(): void;
+
+			/**
+			 * Replaces a view at the specified position in the [children](Titanium.UI.View.children) array.
+			 */
+			replaceAt(params: any): void;
+
+			/**
+			 * Makes this view visible.
+			 */
+			show(options?: AnimationOption): void;
+
+			/**
+			 * Starts a batch update of this view's layout properties.
+			 */
+			startLayout(): void;
+
+			/**
+			 * Returns an image of the rendered view, as a Blob.
+			 */
+			toImage(callback?: (param0: Titanium.Blob) => any, honorScaleFactor?: boolean): Titanium.Blob;
+
+			/**
+			 * Performs a batch update of all supplied layout properties and schedules a layout pass after
+			 * they have been updated.
+			 */
+			updateLayout(params: any): void;
+
+			/**
+			 * Translates a point from this view's coordinate system to another view's coordinate system.
+			 */
+			convertPointToView(point: Point, destinationView: any): Point;
+
+			/**
+			 * Returns the matching view of a given view ID.
+			 */
+			getViewById(id: string): Titanium.UI.View;
+
+			/**
+			 * Changes the image for a specified index.
+			 */
+			setImage(index: number, image: string): void;
+
+			/**
+			 * Changes the image for a specified index.
+			 */
+			setImage(index: number, image: Titanium.Blob): void;
+
+			/**
+			 * Changes the image for a specified index.
+			 */
+			setImage(index: number, image: Titanium.Filesystem.File): void;
+
+			/**
+			 * Changes the image for a specified index.
+			 */
+			setImage(index: number, image: CoverFlowImageType): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.CoverFlowView.accessibilityHidden> property.
+			 */
+			getAccessibilityHidden(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.CoverFlowView.accessibilityHidden> property.
+			 */
+			setAccessibilityHidden(accessibilityHidden: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.CoverFlowView.accessibilityHint> property.
+			 */
+			getAccessibilityHint(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.CoverFlowView.accessibilityHint> property.
+			 */
+			setAccessibilityHint(accessibilityHint: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.CoverFlowView.accessibilityLabel> property.
+			 */
+			getAccessibilityLabel(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.CoverFlowView.accessibilityLabel> property.
+			 */
+			setAccessibilityLabel(accessibilityLabel: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.CoverFlowView.accessibilityValue> property.
+			 */
+			getAccessibilityValue(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.CoverFlowView.accessibilityValue> property.
+			 */
+			setAccessibilityValue(accessibilityValue: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.CoverFlowView.anchorPoint> property.
+			 */
+			getAnchorPoint(): Point;
+
+			/**
+			 * Sets the value of the <Titanium.UI.CoverFlowView.anchorPoint> property.
+			 */
+			setAnchorPoint(anchorPoint: Point): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.CoverFlowView.animatedCenter> property.
+			 */
+			getAnimatedCenter(): Point;
+
+			/**
+			 * Gets the value of the <Titanium.UI.CoverFlowView.backgroundColor> property.
+			 */
+			getBackgroundColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.CoverFlowView.backgroundColor> property.
+			 */
+			setBackgroundColor(backgroundColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.CoverFlowView.backgroundGradient> property.
+			 */
+			getBackgroundGradient(): Gradient;
+
+			/**
+			 * Sets the value of the <Titanium.UI.CoverFlowView.backgroundGradient> property.
+			 */
+			setBackgroundGradient(backgroundGradient: Gradient): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.CoverFlowView.backgroundImage> property.
+			 */
+			getBackgroundImage(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.CoverFlowView.backgroundImage> property.
+			 */
+			setBackgroundImage(backgroundImage: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.CoverFlowView.backgroundRepeat> property.
+			 */
+			getBackgroundRepeat(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.CoverFlowView.backgroundRepeat> property.
+			 */
+			setBackgroundRepeat(backgroundRepeat: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.CoverFlowView.backgroundLeftCap> property.
+			 */
+			getBackgroundLeftCap(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.CoverFlowView.backgroundLeftCap> property.
+			 */
+			setBackgroundLeftCap(backgroundLeftCap: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.CoverFlowView.backgroundTopCap> property.
+			 */
+			getBackgroundTopCap(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.CoverFlowView.backgroundTopCap> property.
+			 */
+			setBackgroundTopCap(backgroundTopCap: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.CoverFlowView.borderColor> property.
+			 */
+			getBorderColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.CoverFlowView.borderColor> property.
+			 */
+			setBorderColor(borderColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.CoverFlowView.borderRadius> property.
+			 */
+			getBorderRadius(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.CoverFlowView.borderRadius> property.
+			 */
+			setBorderRadius(borderRadius: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.CoverFlowView.borderWidth> property.
+			 */
+			getBorderWidth(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.CoverFlowView.borderWidth> property.
+			 */
+			setBorderWidth(borderWidth: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.CoverFlowView.bottom> property.
+			 */
+			getBottom(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.CoverFlowView.bottom> property.
+			 */
+			setBottom(bottom: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.CoverFlowView.bottom> property.
+			 */
+			setBottom(bottom: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.CoverFlowView.center> property.
+			 */
+			getCenter(): Point;
+
+			/**
+			 * Sets the value of the <Titanium.UI.CoverFlowView.center> property.
+			 */
+			setCenter(center: Point): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.CoverFlowView.children> property.
+			 */
+			getChildren(): Titanium.UI.View[];
+
+			/**
+			 * Gets the value of the <Titanium.UI.CoverFlowView.clipMode> property.
+			 */
+			getClipMode(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.CoverFlowView.clipMode> property.
+			 */
+			setClipMode(clipMode: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.CoverFlowView.height> property.
+			 */
+			getHeight(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.CoverFlowView.height> property.
+			 */
+			setHeight(height: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.CoverFlowView.height> property.
+			 */
+			setHeight(height: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.CoverFlowView.left> property.
+			 */
+			getLeft(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.CoverFlowView.left> property.
+			 */
+			setLeft(left: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.CoverFlowView.left> property.
+			 */
+			setLeft(left: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.CoverFlowView.layout> property.
+			 */
+			getLayout(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.CoverFlowView.layout> property.
+			 */
+			setLayout(layout: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.CoverFlowView.opacity> property.
+			 */
+			getOpacity(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.CoverFlowView.opacity> property.
+			 */
+			setOpacity(opacity: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.CoverFlowView.pullBackgroundColor> property.
+			 */
+			getPullBackgroundColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.CoverFlowView.pullBackgroundColor> property.
+			 */
+			setPullBackgroundColor(pullBackgroundColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.CoverFlowView.previewContext> property.
+			 */
+			getPreviewContext(): Titanium.UI.iOS.PreviewContext;
+
+			/**
+			 * Sets the value of the <Titanium.UI.CoverFlowView.previewContext> property.
+			 */
+			setPreviewContext(previewContext: Titanium.UI.iOS.PreviewContext): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.CoverFlowView.right> property.
+			 */
+			getRight(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.CoverFlowView.right> property.
+			 */
+			setRight(right: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.CoverFlowView.right> property.
+			 */
+			setRight(right: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.CoverFlowView.rect> property.
+			 */
+			getRect(): Dimension;
+
+			/**
+			 * Gets the value of the <Titanium.UI.CoverFlowView.size> property.
+			 */
+			getSize(): Dimension;
+
+			/**
+			 * Gets the value of the <Titanium.UI.CoverFlowView.tintColor> property.
+			 */
+			getTintColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.CoverFlowView.tintColor> property.
+			 */
+			setTintColor(tintColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.CoverFlowView.top> property.
+			 */
+			getTop(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.CoverFlowView.top> property.
+			 */
+			setTop(top: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.CoverFlowView.top> property.
+			 */
+			setTop(top: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.CoverFlowView.touchEnabled> property.
+			 */
+			getTouchEnabled(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.CoverFlowView.touchEnabled> property.
+			 */
+			setTouchEnabled(touchEnabled: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.CoverFlowView.transform> property.
+			 */
+			getTransform(): Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
+
+			/**
+			 * Sets the value of the <Titanium.UI.CoverFlowView.transform> property.
+			 */
+			setTransform(transform: Titanium.UI.Matrix2D): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.CoverFlowView.transform> property.
+			 */
+			setTransform(transform: Titanium.UI.Matrix3D): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.CoverFlowView.viewShadowRadius> property.
+			 */
+			getViewShadowRadius(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.CoverFlowView.viewShadowRadius> property.
+			 */
+			setViewShadowRadius(viewShadowRadius: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.CoverFlowView.viewShadowColor> property.
+			 */
+			getViewShadowColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.CoverFlowView.viewShadowColor> property.
+			 */
+			setViewShadowColor(viewShadowColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.CoverFlowView.viewShadowOffset> property.
+			 */
+			getViewShadowOffset(): Point;
+
+			/**
+			 * Sets the value of the <Titanium.UI.CoverFlowView.viewShadowOffset> property.
+			 */
+			setViewShadowOffset(viewShadowOffset: Point): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.CoverFlowView.visible> property.
+			 */
+			getVisible(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.CoverFlowView.visible> property.
+			 */
+			setVisible(visible: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.CoverFlowView.width> property.
+			 */
+			getWidth(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.CoverFlowView.width> property.
+			 */
+			setWidth(width: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.CoverFlowView.width> property.
+			 */
+			setWidth(width: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.CoverFlowView.horizontalWrap> property.
+			 */
+			getHorizontalWrap(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.CoverFlowView.horizontalWrap> property.
+			 */
+			setHorizontalWrap(horizontalWrap: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.CoverFlowView.zIndex> property.
+			 */
+			getZIndex(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.CoverFlowView.zIndex> property.
+			 */
+			setZIndex(zIndex: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.CoverFlowView.images> property.
+			 */
+			getImages(): string[] | Titanium.Blob[] | Titanium.Filesystem.File[] | CoverFlowImageType[];
+
+			/**
+			 * Sets the value of the <Titanium.UI.CoverFlowView.images> property.
+			 */
+			setImages(images: ReadonlyArray<string>): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.CoverFlowView.images> property.
+			 */
+			setImages(images: ReadonlyArray<Titanium.Blob>): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.CoverFlowView.images> property.
+			 */
+			setImages(images: ReadonlyArray<Titanium.Filesystem.File>): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.CoverFlowView.images> property.
+			 */
+			setImages(images: ReadonlyArray<CoverFlowImageType>): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.CoverFlowView.selected> property.
+			 */
+			getSelected(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.CoverFlowView.selected> property.
+			 */
+			setSelected(selected: number): void;
+
+		}
+
+		/**
+		 * A dashboard item is a view that is displayed as an icon in a <Titanium.UI.DashboardView>.
+		 */
+		interface DashboardItem extends Titanium.Proxy {
+			/**
+			 * Integer value displayed in a badge.
+			 */
+			badge: number;
+
+			/**
+			 * Determines whether this item can be deleted when it edit mode.
+			 */
+			canDelete: boolean;
+
+			/**
+			 * Image or path to image to display in the item by default.
+			 */
+			image: string | Titanium.Blob;
+
+			/**
+			 * Image or path to image to display in the item as it is selected.
+			 */
+			selectedImage: string | Titanium.Blob;
+
+			/**
+			 * Gets the value of the <Titanium.UI.DashboardItem.badge> property.
+			 */
+			getBadge(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardItem.badge> property.
+			 */
+			setBadge(badge: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.DashboardItem.canDelete> property.
+			 */
+			getCanDelete(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardItem.canDelete> property.
+			 */
+			setCanDelete(canDelete: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.DashboardItem.image> property.
+			 */
+			getImage(): string | Titanium.Blob;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardItem.image> property.
+			 */
+			setImage(image: string): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardItem.image> property.
+			 */
+			setImage(image: Titanium.Blob): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.DashboardItem.selectedImage> property.
+			 */
+			getSelectedImage(): string | Titanium.Blob;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardItem.selectedImage> property.
+			 */
+			setSelectedImage(selectedImage: string): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardItem.selectedImage> property.
+			 */
+			setSelectedImage(selectedImage: Titanium.Blob): void;
+
+		}
+
+		/**
+		 * A dashboard view is an iOS Springboard-like view of <Titanium.UI.DashboardItem> items that may
+		 * be deleted and reordered by the user using its built-in edit mode.
+		 */
+		interface DashboardView extends Titanium.Proxy {
+			/**
+			 * Whether the view should be "hidden" from (i.e., ignored by) the accessibility service.
+			 */
+			accessibilityHidden: boolean;
+
+			/**
+			 * Briefly describes what performing an action (such as a click) on the view will do.
+			 */
+			accessibilityHint: string;
+
+			/**
+			 * A succint label identifying the view for the device's accessibility service.
+			 */
+			accessibilityLabel: string;
+
+			/**
+			 * A string describing the value (if any) of the view for the device's accessibility service.
+			 */
+			accessibilityValue: string;
+
+			/**
+			 * Coordinate of the view about which to pivot an animation.
+			 */
+			anchorPoint: Point;
+
+			/**
+			 * Current position of the view during an animation.
+			 */
+			readonly animatedCenter: Point;
+
+			/**
+			 * Background color of the view, as a color name or hex triplet.
+			 */
+			backgroundColor: string;
+
+			/**
+			 * A background gradient for the view.
+			 */
+			backgroundGradient: Gradient;
+
+			/**
+			 * Background image for the view, specified as a local file path or URL.
+			 */
+			backgroundImage: string;
+
+			/**
+			 * Determines whether to tile a background across a view.
+			 */
+			backgroundRepeat: boolean;
+
+			/**
+			 * Size of the left end cap.
+			 */
+			backgroundLeftCap: number;
+
+			/**
+			 * Size of the top end cap.
+			 */
+			backgroundTopCap: number;
+
+			/**
+			 * Border color of the view, as a color name or hex triplet.
+			 */
+			borderColor: string;
+
+			/**
+			 * Radius for the rounded corners of the view's border.
+			 */
+			borderRadius: number;
+
+			/**
+			 * Border width of the view.
+			 */
+			borderWidth: number;
+
+			/**
+			 * View's bottom position, in platform-specific units.
+			 */
+			bottom: number | string;
+
+			/**
+			 * View's center position, in the parent view's coordinates.
+			 */
+			center: Point;
+
+			/**
+			 * Array of this view's child views.
+			 */
+			readonly children: Titanium.UI.View[];
+
+			/**
+			 * View's clipping behavior.
+			 */
+			clipMode: number;
+
+			/**
+			 * View height, in platform-specific units.
+			 */
+			height: number | string;
+
+			/**
+			 * View's left position, in platform-specific units.
+			 */
+			left: number | string;
+
+			/**
+			 * Specifies how the view positions its children.
+			 * One of: 'composite', 'vertical', or 'horizontal'.
+			 */
+			layout: string;
+
+			/**
+			 * Opacity of this view, from 0.0 (transparent) to 1.0 (opaque).
+			 */
+			opacity: number;
+
+			/**
+			 * Background color of the wrapper view when this view is used as either <Titanium.UI.ListView.pullView> or <Titanium.UI.TableView.headerPullView>.
+			 */
+			pullBackgroundColor: string;
+
+			/**
+			 * The preview context used in the 3D-Touch feature "Peek and Pop".
+			 */
+			previewContext: Titanium.UI.iOS.PreviewContext;
+
+			/**
+			 * View's right position, in platform-specific units.
+			 */
+			right: number | string;
+
+			/**
+			 * The bounding box of the view relative to its parent, in system units.
+			 */
+			readonly rect: Dimension;
+
+			/**
+			 * The size of the view in system units.
+			 */
+			readonly size: Dimension;
+
+			/**
+			 * The view's tintColor. This property is applicable on iOS 7 and greater.
+			 */
+			tintColor: string;
+
+			/**
+			 * The view's top position.
+			 */
+			top: number | string;
+
+			/**
+			 * Determines whether view should receive touch events.
+			 */
+			touchEnabled: boolean;
+
+			/**
+			 * Transformation matrix to apply to the view.
+			 */
+			transform: Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
+
+			/**
+			 * Determines the blur radius used to create the shadow.
+			 */
+			viewShadowRadius: number;
+
+			/**
+			 * Determines the color of the shadow.
+			 */
+			viewShadowColor: string;
+
+			/**
+			 * Determines the offset for the shadow of the view.
+			 */
+			viewShadowOffset: Point;
+
+			/**
+			 * Determines whether the view is visible.
+			 */
+			visible: boolean;
+
+			/**
+			 * View's width, in platform-specific units.
+			 */
+			width: number | string;
+
+			/**
+			 * Determines whether the layout has wrapping behavior.
+			 */
+			horizontalWrap: boolean;
+
+			/**
+			 * Z-index stack order position, relative to other sibling views.
+			 */
+			zIndex: number;
+
+			/**
+			 * The number of columns of items in the view.
+			 */
+			columnCount: number;
+
+			/**
+			 * The number of rows of items in the view.
+			 */
+			rowCount: number;
+
+			/**
+			 * Items to display in this view.
+			 */
+			data: Titanium.UI.DashboardItem[];
+
+			/**
+			 * Determines whether edit mode is activated by a longpress of an item.
+			 */
+			editable: boolean;
+
+			/**
+			 * Determines whether the wobble visual editing cue is enabled in edit mode.
+			 */
+			wobble: boolean;
+
+			/**
+			 * Adds a child to this view's hierarchy.
+			 */
+			add(view: any): void;
+
+			/**
+			 * Adds a child to this view's hierarchy.
+			 */
+			add(view: any[]): void;
+
+			/**
+			 * Animates this view.
+			 */
+			animate(animation: any, callback?: (param0: any) => any): void;
+
+			/**
+			 * Finishes a batch update of the View's layout properties and schedules a layout pass of the
+			 * view tree.
+			 */
+			finishLayout(): void;
+
+			/**
+			 * Hides this view.
+			 */
+			hide(options?: AnimationOption): void;
+
+			/**
+			 * Inserts a view at the specified position in the [children](Titanium.UI.View.children) array.
+			 */
+			insertAt(params: any): void;
+
+			/**
+			 * Removes a child view from this view's hierarchy.
+			 */
+			remove(view: any): void;
+
+			/**
+			 * Removes all child views from this view's hierarchy.
+			 */
+			removeAllChildren(): void;
+
+			/**
+			 * Replaces a view at the specified position in the [children](Titanium.UI.View.children) array.
+			 */
+			replaceAt(params: any): void;
+
+			/**
+			 * Makes this view visible.
+			 */
+			show(options?: AnimationOption): void;
+
+			/**
+			 * Starts a batch update of this view's layout properties.
+			 */
+			startLayout(): void;
+
+			/**
+			 * Returns an image of the rendered view, as a Blob.
+			 */
+			toImage(callback?: (param0: Titanium.Blob) => any, honorScaleFactor?: boolean): Titanium.Blob;
+
+			/**
+			 * Performs a batch update of all supplied layout properties and schedules a layout pass after
+			 * they have been updated.
+			 */
+			updateLayout(params: any): void;
+
+			/**
+			 * Translates a point from this view's coordinate system to another view's coordinate system.
+			 */
+			convertPointToView(point: Point, destinationView: any): Point;
+
+			/**
+			 * Returns the matching view of a given view ID.
+			 */
+			getViewById(id: string): Titanium.UI.View;
+
+			/**
+			 * Enable edit mode.
+			 */
+			startEditing(): void;
+
+			/**
+			 * Disable edit mode.
+			 */
+			stopEditing(): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.DashboardView.accessibilityHidden> property.
+			 */
+			getAccessibilityHidden(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardView.accessibilityHidden> property.
+			 */
+			setAccessibilityHidden(accessibilityHidden: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.DashboardView.accessibilityHint> property.
+			 */
+			getAccessibilityHint(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardView.accessibilityHint> property.
+			 */
+			setAccessibilityHint(accessibilityHint: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.DashboardView.accessibilityLabel> property.
+			 */
+			getAccessibilityLabel(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardView.accessibilityLabel> property.
+			 */
+			setAccessibilityLabel(accessibilityLabel: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.DashboardView.accessibilityValue> property.
+			 */
+			getAccessibilityValue(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardView.accessibilityValue> property.
+			 */
+			setAccessibilityValue(accessibilityValue: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.DashboardView.anchorPoint> property.
+			 */
+			getAnchorPoint(): Point;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardView.anchorPoint> property.
+			 */
+			setAnchorPoint(anchorPoint: Point): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.DashboardView.animatedCenter> property.
+			 */
+			getAnimatedCenter(): Point;
+
+			/**
+			 * Gets the value of the <Titanium.UI.DashboardView.backgroundColor> property.
+			 */
+			getBackgroundColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardView.backgroundColor> property.
+			 */
+			setBackgroundColor(backgroundColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.DashboardView.backgroundGradient> property.
+			 */
+			getBackgroundGradient(): Gradient;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardView.backgroundGradient> property.
+			 */
+			setBackgroundGradient(backgroundGradient: Gradient): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.DashboardView.backgroundImage> property.
+			 */
+			getBackgroundImage(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardView.backgroundImage> property.
+			 */
+			setBackgroundImage(backgroundImage: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.DashboardView.backgroundRepeat> property.
+			 */
+			getBackgroundRepeat(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardView.backgroundRepeat> property.
+			 */
+			setBackgroundRepeat(backgroundRepeat: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.DashboardView.backgroundLeftCap> property.
+			 */
+			getBackgroundLeftCap(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardView.backgroundLeftCap> property.
+			 */
+			setBackgroundLeftCap(backgroundLeftCap: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.DashboardView.backgroundTopCap> property.
+			 */
+			getBackgroundTopCap(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardView.backgroundTopCap> property.
+			 */
+			setBackgroundTopCap(backgroundTopCap: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.DashboardView.borderColor> property.
+			 */
+			getBorderColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardView.borderColor> property.
+			 */
+			setBorderColor(borderColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.DashboardView.borderRadius> property.
+			 */
+			getBorderRadius(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardView.borderRadius> property.
+			 */
+			setBorderRadius(borderRadius: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.DashboardView.borderWidth> property.
+			 */
+			getBorderWidth(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardView.borderWidth> property.
+			 */
+			setBorderWidth(borderWidth: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.DashboardView.bottom> property.
+			 */
+			getBottom(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardView.bottom> property.
+			 */
+			setBottom(bottom: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardView.bottom> property.
+			 */
+			setBottom(bottom: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.DashboardView.center> property.
+			 */
+			getCenter(): Point;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardView.center> property.
+			 */
+			setCenter(center: Point): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.DashboardView.children> property.
+			 */
+			getChildren(): Titanium.UI.View[];
+
+			/**
+			 * Gets the value of the <Titanium.UI.DashboardView.clipMode> property.
+			 */
+			getClipMode(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardView.clipMode> property.
+			 */
+			setClipMode(clipMode: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.DashboardView.height> property.
+			 */
+			getHeight(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardView.height> property.
+			 */
+			setHeight(height: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardView.height> property.
+			 */
+			setHeight(height: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.DashboardView.left> property.
+			 */
+			getLeft(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardView.left> property.
+			 */
+			setLeft(left: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardView.left> property.
+			 */
+			setLeft(left: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.DashboardView.layout> property.
+			 */
+			getLayout(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardView.layout> property.
+			 */
+			setLayout(layout: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.DashboardView.opacity> property.
+			 */
+			getOpacity(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardView.opacity> property.
+			 */
+			setOpacity(opacity: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.DashboardView.pullBackgroundColor> property.
+			 */
+			getPullBackgroundColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardView.pullBackgroundColor> property.
+			 */
+			setPullBackgroundColor(pullBackgroundColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.DashboardView.previewContext> property.
+			 */
+			getPreviewContext(): Titanium.UI.iOS.PreviewContext;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardView.previewContext> property.
+			 */
+			setPreviewContext(previewContext: Titanium.UI.iOS.PreviewContext): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.DashboardView.right> property.
+			 */
+			getRight(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardView.right> property.
+			 */
+			setRight(right: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardView.right> property.
+			 */
+			setRight(right: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.DashboardView.rect> property.
+			 */
+			getRect(): Dimension;
+
+			/**
+			 * Gets the value of the <Titanium.UI.DashboardView.size> property.
+			 */
+			getSize(): Dimension;
+
+			/**
+			 * Gets the value of the <Titanium.UI.DashboardView.tintColor> property.
+			 */
+			getTintColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardView.tintColor> property.
+			 */
+			setTintColor(tintColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.DashboardView.top> property.
+			 */
+			getTop(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardView.top> property.
+			 */
+			setTop(top: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardView.top> property.
+			 */
+			setTop(top: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.DashboardView.touchEnabled> property.
+			 */
+			getTouchEnabled(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardView.touchEnabled> property.
+			 */
+			setTouchEnabled(touchEnabled: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.DashboardView.transform> property.
+			 */
+			getTransform(): Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardView.transform> property.
+			 */
+			setTransform(transform: Titanium.UI.Matrix2D): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardView.transform> property.
+			 */
+			setTransform(transform: Titanium.UI.Matrix3D): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.DashboardView.viewShadowRadius> property.
+			 */
+			getViewShadowRadius(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardView.viewShadowRadius> property.
+			 */
+			setViewShadowRadius(viewShadowRadius: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.DashboardView.viewShadowColor> property.
+			 */
+			getViewShadowColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardView.viewShadowColor> property.
+			 */
+			setViewShadowColor(viewShadowColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.DashboardView.viewShadowOffset> property.
+			 */
+			getViewShadowOffset(): Point;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardView.viewShadowOffset> property.
+			 */
+			setViewShadowOffset(viewShadowOffset: Point): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.DashboardView.visible> property.
+			 */
+			getVisible(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardView.visible> property.
+			 */
+			setVisible(visible: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.DashboardView.width> property.
+			 */
+			getWidth(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardView.width> property.
+			 */
+			setWidth(width: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardView.width> property.
+			 */
+			setWidth(width: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.DashboardView.horizontalWrap> property.
+			 */
+			getHorizontalWrap(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardView.horizontalWrap> property.
+			 */
+			setHorizontalWrap(horizontalWrap: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.DashboardView.zIndex> property.
+			 */
+			getZIndex(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardView.zIndex> property.
+			 */
+			setZIndex(zIndex: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.DashboardView.columnCount> property.
+			 */
+			getColumnCount(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardView.columnCount> property.
+			 */
+			setColumnCount(columnCount: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.DashboardView.rowCount> property.
+			 */
+			getRowCount(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardView.rowCount> property.
+			 */
+			setRowCount(rowCount: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.DashboardView.data> property.
+			 */
+			getData(): Titanium.UI.DashboardItem[];
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardView.data> property.
+			 */
+			setData(data: ReadonlyArray<Titanium.UI.DashboardItem>): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.DashboardView.editable> property.
+			 */
+			getEditable(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardView.editable> property.
+			 */
+			setEditable(editable: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.DashboardView.wobble> property.
+			 */
+			getWobble(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardView.wobble> property.
+			 */
+			setWobble(wobble: boolean): void;
+
+		}
+
+		/**
+		 * An email dialog is a modal window that allows users to compose and send an email.
+		 */
+		interface EmailDialog extends Titanium.UI.View {
+			/**
+			 * Constant for the `CANCELLED` status result. On Android, this property exists but is not used.
+			 */
+			readonly CANCELLED: number;
+
+			/**
+			 * Constant for the `FAILED` status result.
+			 */
+			readonly FAILED: number;
+
+			/**
+			 * Constant for the `SAVED` status result. On Android, this property exists but is not used.
+			 */
+			readonly SAVED: number;
+
+			/**
+			 * Constant for the `SENT` status result.
+			 */
+			readonly SENT: number;
+
+			/**
+			 * Bar color of the email dialog window, as a color name or hex triplet.
+			 */
+			barColor: string;
+
+			/**
+			 * Recipients of the email included via the `BCC` (Blind Carbon Copy) field.
+			 */
+			bccRecipients: string[];
+
+			/**
+			 * Recipients of the email included via the `CC` (Carbon Copy) field.
+			 */
+			ccRecipients: string[];
+
+			/**
+			 * Determines whether the email message, specifically the contents of
+			 * [messageBody](Titanium.UI.EmailDialog.messageBody), should be sent as HTML content type
+			 * rather than plain text.
+			 */
+			html: boolean;
+
+			/**
+			 * Email message body.
+			 */
+			messageBody: string;
+
+			/**
+			 * Subject line for the email.
+			 */
+			subject: string;
+
+			/**
+			 * Recipients of the email included via the main `TO` field.
+			 */
+			toRecipients: string[];
+
+			/**
+			 * Adds an attachment.
+			 */
+			addAttachment(attachment: Titanium.Blob): void;
+
+			/**
+			 * Adds an attachment.
+			 */
+			addAttachment(attachment: Titanium.Filesystem.File): void;
+
+			/**
+			 * Indicates whether sending email is supported by the system.
+			 */
+			isSupported(): boolean;
+
+			/**
+			 * Opens this email dialog.
+			 */
+			open(properties: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.EmailDialog.barColor> property.
+			 */
+			getBarColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.EmailDialog.barColor> property.
+			 */
+			setBarColor(barColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.EmailDialog.bccRecipients> property.
+			 */
+			getBccRecipients(): string[];
+
+			/**
+			 * Sets the value of the <Titanium.UI.EmailDialog.bccRecipients> property.
+			 */
+			setBccRecipients(bccRecipients: ReadonlyArray<string>): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.EmailDialog.ccRecipients> property.
+			 */
+			getCcRecipients(): string[];
+
+			/**
+			 * Sets the value of the <Titanium.UI.EmailDialog.ccRecipients> property.
+			 */
+			setCcRecipients(ccRecipients: ReadonlyArray<string>): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.EmailDialog.html> property.
+			 */
+			getHtml(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.EmailDialog.html> property.
+			 */
+			setHtml(html: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.EmailDialog.messageBody> property.
+			 */
+			getMessageBody(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.EmailDialog.messageBody> property.
+			 */
+			setMessageBody(messageBody: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.EmailDialog.subject> property.
+			 */
+			getSubject(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.EmailDialog.subject> property.
+			 */
+			setSubject(subject: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.EmailDialog.toRecipients> property.
+			 */
+			getToRecipients(): string[];
+
+			/**
+			 * Sets the value of the <Titanium.UI.EmailDialog.toRecipients> property.
+			 */
+			setToRecipients(toRecipients: ReadonlyArray<string>): void;
+
+		}
+
+		/**
+		 * A view to display a single image or series of animated images.
+		 */
+		interface ImageView extends Titanium.UI.View {
+			/**
+			 * Indicates whether animation is running.
+			 */
+			readonly animating: boolean;
+
+			/**
+			 * Indicates whether the image should be rotated based on exif orientation data.
+			 * By default, this is false on android and true on iOS.
+			 */
+			autorotate: boolean;
+
+			/**
+			 * Number of times to retry decoding the bitmap at a URL.
+			 */
+			decodeRetries: number;
+
+			/**
+			 * Local path to the default image to display while loading a remote image.
+			 */
+			defaultImage: string;
+
+			/**
+			 * Amount of time in milliseconds to animate one cycle.
+			 */
+			duration: number;
+
+			/**
+			 * Show zoom controls when the user touches the image view.
+			 */
+			enableZoomControls: boolean;
+
+			/**
+			 * Set to `true` to prevent scaling of 2x-resolution remote images for Retina
+			 * displays.
+			 */
+			hires: boolean;
+
+			/**
+			 * Image to display.
+			 */
+			image: string | Titanium.Blob | Titanium.Filesystem.File;
+
+			/**
+			 * Array of images to animate, defined using local filesystem paths, `File` objects,
+			 * remote URLs (Android only), or `Blob` objects containing image data.
+			 * When using this property, an initial `start()` needs to be called upon the ImageView before any image will show in this imageview.
+			 * Related properties/methods to look at: `start`, `stop`, `pause`, `reverse`, `resume` and `repeatCount`
+			 */
+			images: string[] | Titanium.Blob[] | Titanium.Filesystem.File[];
+
+			/**
+			 * Indicates whether the animation is paused.
+			 */
+			readonly paused: boolean;
+
+			/**
+			 * Prevent the default image from being displayed while loading a remote image. This property
+			 * is ignored when the `defaultImage` property is set.
+			 */
+			preventDefaultImage: boolean;
+
+			/**
+			 * Number of times to repeat the image animation.
+			 */
+			repeatCount: number;
+
+			/**
+			 * Run the animation in reverse.
+			 */
+			reverse: boolean;
+
+			/**
+			 * URL to the image to display.
+			 */
+			url: string;
+
+			/**
+			 * Pauses a running animation. Use `resume` method to continue.
+			 */
+			pause(): void;
+
+			/**
+			 * Resumes an animation from a `pause` state.
+			 */
+			resume(): void;
+
+			/**
+			 * Starts the image animation. On Android, also resets `index` to the first image.
+			 */
+			start(): void;
+
+			/**
+			 * Stops a running animation. On iOS, also resets `index` to the first image.
+			 */
+			stop(): void;
+
+			/**
+			 * Returns the image as a Blob object.
+			 */
+			toBlob(): Titanium.Blob;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ImageView.animating> property.
+			 */
+			getAnimating(): boolean;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ImageView.autorotate> property.
+			 */
+			getAutorotate(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ImageView.autorotate> property.
+			 */
+			setAutorotate(autorotate: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ImageView.decodeRetries> property.
+			 */
+			getDecodeRetries(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ImageView.decodeRetries> property.
+			 */
+			setDecodeRetries(decodeRetries: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ImageView.defaultImage> property.
+			 */
+			getDefaultImage(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ImageView.defaultImage> property.
+			 */
+			setDefaultImage(defaultImage: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ImageView.duration> property.
+			 */
+			getDuration(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ImageView.duration> property.
+			 */
+			setDuration(duration: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ImageView.enableZoomControls> property.
+			 */
+			getEnableZoomControls(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ImageView.enableZoomControls> property.
+			 */
+			setEnableZoomControls(enableZoomControls: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ImageView.hires> property.
+			 */
+			getHires(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ImageView.hires> property.
+			 */
+			setHires(hires: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ImageView.image> property.
+			 */
+			getImage(): string | Titanium.Blob | Titanium.Filesystem.File;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ImageView.image> property.
+			 */
+			setImage(image: string): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ImageView.image> property.
+			 */
+			setImage(image: Titanium.Blob): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ImageView.image> property.
+			 */
+			setImage(image: Titanium.Filesystem.File): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ImageView.images> property.
+			 */
+			getImages(): string[] | Titanium.Blob[] | Titanium.Filesystem.File[];
+
+			/**
+			 * Sets the value of the <Titanium.UI.ImageView.images> property.
+			 */
+			setImages(images: ReadonlyArray<string>): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ImageView.images> property.
+			 */
+			setImages(images: ReadonlyArray<Titanium.Blob>): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ImageView.images> property.
+			 */
+			setImages(images: ReadonlyArray<Titanium.Filesystem.File>): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ImageView.paused> property.
+			 */
+			getPaused(): boolean;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ImageView.preventDefaultImage> property.
+			 */
+			getPreventDefaultImage(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ImageView.preventDefaultImage> property.
+			 */
+			setPreventDefaultImage(preventDefaultImage: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ImageView.repeatCount> property.
+			 */
+			getRepeatCount(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ImageView.repeatCount> property.
+			 */
+			setRepeatCount(repeatCount: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ImageView.reverse> property.
+			 */
+			getReverse(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ImageView.reverse> property.
+			 */
+			setReverse(reverse: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ImageView.url> property.
+			 */
+			getUrl(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ImageView.url> property.
+			 */
+			setUrl(url: string): void;
+
+		}
+
+		/**
+		 * A text label, with optional background image.
+		 */
+		interface Label extends Titanium.UI.View {
+			/**
+			 * Specify an attributed string for the label.
+			 */
+			attributedString: Titanium.UI.AttributedString;
+
+			/**
+			 * Automatically convert certain text items in the label to clickable links.
+			 */
+			autoLink: number;
+
+			/**
+			 * Number of pixels to extend the background image past the label on the bottom.
+			 */
+			backgroundPaddingBottom: number;
+
+			/**
+			 * Number of pixels to extend the background image past the label on the left.
+			 */
+			backgroundPaddingLeft: number;
+
+			/**
+			 * Number of pixels to extend the background image past the label on the right.
+			 */
+			backgroundPaddingRight: number;
+
+			/**
+			 * Number of pixels to extend the background image past the label on the top.
+			 */
+			backgroundPaddingTop: number;
+
+			/**
+			 * Color of the label text, as a color name or hex triplet.
+			 */
+			color: string;
+
+			/**
+			 * Causes words in the text that are longer than the view is wide to be ellipsized instead of broken in the middle.
+			 */
+			ellipsize: number;
+
+			/**
+			 * Font to use for the label text.
+			 */
+			font: Font;
+
+			/**
+			 * Color of the label when in the highlighted state, as a color name or hex triplet.
+			 */
+			highlightedColor: string;
+
+			/**
+			 * Simple HTML formatting.
+			 */
+			html: string;
+
+			/**
+			 * Includes extra top and bottom padding to make room for accents that go above normal ascent and descent.
+			 */
+			includeFontPadding: boolean;
+
+			/**
+			 * Makes the label be exactly this many lines tall.
+			 */
+			lines: number;
+
+			/**
+			 * Line spacing of the [text](Titanium.UI.Label.text), as a dictionary with the properties `add` and `multiply`.
+			 */
+			lineSpacing: any;
+
+			/**
+			 * Makes the label at most this many lines tall.
+			 */
+			maxLines: number;
+
+			/**
+			 * Minimum font size when the font is sized based on the contents.
+			 */
+			minimumFontSize: number;
+
+			/**
+			 * Shadow color of the [text](Titanium.UI.Label.text), as a color name or hex triplet.
+			 */
+			shadowColor: string;
+
+			/**
+			 * Shadow offset of the [text](Titanium.UI.Label.text), as a dictionary with the properties `x` and `y`.
+			 */
+			shadowOffset: any;
+
+			/**
+			 * Shadow radius of the [text](Titanium.UI.Label.text).
+			 */
+			shadowRadius: number;
+
+			/**
+			 * Label text.
+			 */
+			text: string;
+
+			/**
+			 * Text alignment.
+			 */
+			textAlign: string | number;
+
+			/**
+			 * Key identifying a string from the locale file to use for the label text.
+			 */
+			textid: string;
+
+			/**
+			 * Enable or disable word wrapping in the label.
+			 */
+			wordWrap: boolean;
+
+			/**
+			 * Vertical text alignment, specified using one of the  vertical alignment constants
+			 * from <Titanium.UI>.
+			 */
+			verticalAlign: number | string;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Label.attributedString> property.
+			 */
+			getAttributedString(): Titanium.UI.AttributedString;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Label.attributedString> property.
+			 */
+			setAttributedString(attributedString: Titanium.UI.AttributedString): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Label.autoLink> property.
+			 */
+			getAutoLink(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Label.autoLink> property.
+			 */
+			setAutoLink(autoLink: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Label.backgroundPaddingBottom> property.
+			 */
+			getBackgroundPaddingBottom(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Label.backgroundPaddingBottom> property.
+			 */
+			setBackgroundPaddingBottom(backgroundPaddingBottom: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Label.backgroundPaddingLeft> property.
+			 */
+			getBackgroundPaddingLeft(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Label.backgroundPaddingLeft> property.
+			 */
+			setBackgroundPaddingLeft(backgroundPaddingLeft: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Label.backgroundPaddingRight> property.
+			 */
+			getBackgroundPaddingRight(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Label.backgroundPaddingRight> property.
+			 */
+			setBackgroundPaddingRight(backgroundPaddingRight: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Label.backgroundPaddingTop> property.
+			 */
+			getBackgroundPaddingTop(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Label.backgroundPaddingTop> property.
+			 */
+			setBackgroundPaddingTop(backgroundPaddingTop: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Label.color> property.
+			 */
+			getColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Label.color> property.
+			 */
+			setColor(color: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Label.ellipsize> property.
+			 */
+			getEllipsize(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Label.ellipsize> property.
+			 */
+			setEllipsize(ellipsize: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Label.font> property.
+			 */
+			getFont(): Font;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Label.font> property.
+			 */
+			setFont(font: Font): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Label.highlightedColor> property.
+			 */
+			getHighlightedColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Label.highlightedColor> property.
+			 */
+			setHighlightedColor(highlightedColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Label.html> property.
+			 */
+			getHtml(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Label.html> property.
+			 */
+			setHtml(html: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Label.includeFontPadding> property.
+			 */
+			getIncludeFontPadding(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Label.includeFontPadding> property.
+			 */
+			setIncludeFontPadding(includeFontPadding: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Label.lines> property.
+			 */
+			getLines(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Label.lines> property.
+			 */
+			setLines(lines: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Label.lineSpacing> property.
+			 */
+			getLineSpacing(): any;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Label.lineSpacing> property.
+			 */
+			setLineSpacing(lineSpacing: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Label.maxLines> property.
+			 */
+			getMaxLines(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Label.maxLines> property.
+			 */
+			setMaxLines(maxLines: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Label.minimumFontSize> property.
+			 */
+			getMinimumFontSize(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Label.minimumFontSize> property.
+			 */
+			setMinimumFontSize(minimumFontSize: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Label.shadowColor> property.
+			 */
+			getShadowColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Label.shadowColor> property.
+			 */
+			setShadowColor(shadowColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Label.shadowOffset> property.
+			 */
+			getShadowOffset(): any;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Label.shadowOffset> property.
+			 */
+			setShadowOffset(shadowOffset: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Label.shadowRadius> property.
+			 */
+			getShadowRadius(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Label.shadowRadius> property.
+			 */
+			setShadowRadius(shadowRadius: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Label.text> property.
+			 */
+			getText(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Label.text> property.
+			 */
+			setText(text: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Label.textAlign> property.
+			 */
+			getTextAlign(): string | number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Label.textAlign> property.
+			 */
+			setTextAlign(textAlign: string): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Label.textAlign> property.
+			 */
+			setTextAlign(textAlign: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Label.textid> property.
+			 */
+			getTextid(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Label.textid> property.
+			 */
+			setTextid(textid: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Label.wordWrap> property.
+			 */
+			getWordWrap(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Label.wordWrap> property.
+			 */
+			setWordWrap(wordWrap: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Label.verticalAlign> property.
+			 */
+			getVerticalAlign(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Label.verticalAlign> property.
+			 */
+			setVerticalAlign(verticalAlign: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Label.verticalAlign> property.
+			 */
+			setVerticalAlign(verticalAlign: string): void;
+
+		}
+
+		/**
+		 * A list item is an individual item in a list section.
+		 */
+		interface ListItem extends Titanium.Proxy {
+			/**
+			 * A user defined string that gets passed to events.
+			 */
+			itemId: string;
+
+			/**
+			 * Sets an accessory on the right side of an item.
+			 */
+			accessoryType: number;
+
+			/**
+			 * Background color of the view, as a color name or hex triplet.
+			 */
+			backgroundColor: string;
+
+			/**
+			 * Background image to render when the item is not selected.
+			 */
+			backgroundImage: string;
+
+			/**
+			 * Background gradient to render when the item is not selected.
+			 */
+			backgroundGradient: Gradient;
+
+			/**
+			 * Background color of the view, as a color name or hex triplet when item is selected.
+			 */
+			selectedBackgroundColor: string;
+
+			/**
+			 * Background image to render when the item is selected.
+			 */
+			selectedBackgroundImage: string;
+
+			/**
+			 * Background gradient to render when the item is selected.
+			 */
+			selectedBackgroundGradient: Gradient;
+
+			/**
+			 * Specifies if the item can be deleted by a user initiated action.
+			 */
+			canEdit: boolean;
+
+			/**
+			 * Specifies if the item can be inserted by a user initiated action.
+			 */
+			canInsert: boolean;
+
+			/**
+			 * Specifies if the item can be reordered within the list view by a user initiated action.
+			 */
+			canMove: boolean;
+
+			/**
+			 * Specifies custom action items to be shown when when a list item is edited.
+			 */
+			editActions: RowActionType[];
+
+			/**
+			 * The text to match against when the [ListView](Titanium.UI.ListView) is performing a search.
+			 */
+			searchableText: string;
+
+			/**
+			 * Default text color of the item when not selected, as a color name or hex triplet.
+			 */
+			color: string;
+
+			/**
+			 * Default text color of the subtitle, as a color name or hex triplet.
+			 */
+			subtitleColor: string;
+
+			/**
+			 * Color to use for the item title when the item is selected, as a color name or hex triplet.
+			 */
+			selectedColor: string;
+
+			/**
+			 * Color to use for the item subtitle when the item is selected, as a color name or hex triplet.
+			 */
+			selectedSubtitleColor: string;
+
+			/**
+			 * Font to use for the item title.
+			 */
+			font: Font;
+
+			/**
+			 * Row height in platform-specific units.
+			 */
+			height: number | string;
+
+			/**
+			 * Image to render in the image area of the item, specified as a local path or URL.
+			 */
+			image: string;
+
+			/**
+			 * Title to set in the text area of the item.
+			 */
+			title: string;
+
+			/**
+			 * Selection style constant to control the selection color.
+			 */
+			selectionStyle: number;
+
+			/**
+			 * Subtitle to set in the text area of the item.
+			 */
+			subtitle: string;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListItem.editActions> property.
+			 */
+			getEditActions(): RowActionType[];
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListItem.editActions> property.
+			 */
+			setEditActions(editActions: ReadonlyArray<RowActionType>): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListItem.selectedColor> property.
+			 */
+			getSelectedColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListItem.selectedColor> property.
+			 */
+			setSelectedColor(selectedColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListItem.selectedSubtitleColor> property.
+			 */
+			getSelectedSubtitleColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListItem.selectedSubtitleColor> property.
+			 */
+			setSelectedSubtitleColor(selectedSubtitleColor: string): void;
+
+		}
+
+		/**
+		 * A list section is a container within a list view used to organize list items.
+		 */
+		interface ListSection extends Titanium.Proxy {
+			/**
+			 * Title of this section footer.
+			 */
+			footerTitle: string;
+
+			/**
+			 * View to use for this section footer.
+			 */
+			footerView: Titanium.UI.View;
+
+			/**
+			 * Title of this section header.
+			 */
+			headerTitle: string;
+
+			/**
+			 * View to use for this section header.
+			 */
+			headerView: Titanium.UI.View;
+
+			/**
+			 * Items of this list section.
+			 */
+			items: ListDataItem[];
+
+			/**
+			 * Sets the data entries in the list section.
+			 */
+			setItems(dataItems: ReadonlyArray<ListDataItem>, animation?: ListViewAnimationProperties): void;
+
+			/**
+			 * Appends the data entries to the end of the list section.
+			 */
+			appendItems(dataItems: ReadonlyArray<ListDataItem>, animation?: ListViewAnimationProperties): void;
+
+			/**
+			 * Inserts data entries to the list section at the specified index.
+			 */
+			insertItemsAt(itemIndex: number, dataItems: ReadonlyArray<ListDataItem>, animation?: ListViewAnimationProperties): void;
+
+			/**
+			 * Removes count entries from the list section at the specified index,
+			 * then inserts data entries to the list section at the same index.
+			 */
+			replaceItemsAt(index: number, count: number, dataItems: ReadonlyArray<ListDataItem>, animation?: ListViewAnimationProperties): void;
+
+			/**
+			 * Removes count entries from the list section at the specified index.
+			 */
+			deleteItemsAt(itemIndex: number, count: number, animation?: ListViewAnimationProperties): void;
+
+			/**
+			 * Returns the item entry from the list view at the specified index.
+			 */
+			getItemAt(itemIndex: number): ListDataItem;
+
+			/**
+			 * Updates an item at the specified index.
+			 */
+			updateItemAt(index: number, dataItem: ListDataItem, animation?: ListViewAnimationProperties): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListSection.footerTitle> property.
+			 */
+			getFooterTitle(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListSection.footerTitle> property.
+			 */
+			setFooterTitle(footerTitle: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListSection.footerView> property.
+			 */
+			getFooterView(): Titanium.UI.View;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListSection.footerView> property.
+			 */
+			setFooterView(footerView: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListSection.headerTitle> property.
+			 */
+			getHeaderTitle(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListSection.headerTitle> property.
+			 */
+			setHeaderTitle(headerTitle: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListSection.headerView> property.
+			 */
+			getHeaderView(): Titanium.UI.View;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListSection.headerView> property.
+			 */
+			setHeaderView(headerView: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListSection.items> property.
+			 */
+			getItems(): ListDataItem[];
+
+		}
+
+		/**
+		 * A list view is used to present information, organized in to sections and items,
+		 * in a vertically-scrolling view.
+		 */
+		interface ListView extends Titanium.UI.View {
+			/**
+			 * Determines whether this item can be selected.
+			 */
+			allowsSelection: boolean;
+
+			/**
+			 * Determines if the list view can scroll in response to user actions.
+			 */
+			canScroll: boolean;
+
+			/**
+			 * Determines whether the scroll-bounce of the list view should be disabled.
+			 */
+			disableBounce: boolean;
+
+			/**
+			 * Determines if the list view is currently in editing mode.
+			 */
+			editing: boolean;
+
+			/**
+			 * Determines whether this list view items can be selected while editing the table.
+			 */
+			allowsSelectionDuringEditing: boolean;
+
+			/**
+			 * Determines whether multiple items of this list view can be selected at the same time while editing the table.
+			 */
+			allowsMultipleSelectionDuringEditing: boolean;
+
+			/**
+			 * Determines if the list view should use lazy loading to load remote images.
+			 */
+			lazyLoadingEnabled: boolean;
+
+			/**
+			 * Determines if empty sections are retained when the user completes editing the list view.
+			 */
+			pruneSectionsOnEdit: boolean;
+
+			/**
+			 * Contain key-value pairs mapping a style name (key) to an <ItemTemplate> (value).
+			 */
+			templates: any;
+
+			/**
+			 * Sections of this list.
+			 */
+			sections: Titanium.UI.ListSection[];
+
+			/**
+			 * Sets the default template for list data items that do not specify the `template` property.
+			 */
+			defaultItemTemplate: string | number;
+
+			/**
+			 * height of the ListView separator.
+			 */
+			separatorHeight: string | number;
+
+			/**
+			 * When set to false, the ListView will not draw the divider before the footer view.
+			 */
+			footerDividersEnabled: boolean;
+
+			/**
+			 * List view footer title.
+			 */
+			footerTitle: string;
+
+			/**
+			 * List view footer as a view that will be rendered instead of a label.
+			 */
+			footerView: Titanium.UI.View;
+
+			/**
+			 * When set to false, the ListView will not draw the divider after the header view.
+			 */
+			headerDividersEnabled: boolean;
+
+			/**
+			 * List view header title.
+			 */
+			headerTitle: string;
+
+			/**
+			 * List view header as a view that will be rendered instead of a label.
+			 */
+			headerView: Titanium.UI.View;
+
+			/**
+			 * View positioned above the first row that is only revealed when the user drags the list view contents down.
+			 */
+			pullView: Titanium.UI.View;
+
+			/**
+			 * View positioned above the first row that is only revealed when the user drags the list view contents down.
+			 */
+			refreshControl: Titanium.UI.RefreshControl;
+
+			/**
+			 * Search field to use for the list view.
+			 */
+			searchView: Titanium.UI.SearchBar | Titanium.UI.Android.SearchView;
+
+			/**
+			 * The string to use as the search parameter.
+			 */
+			searchText: string;
+
+			/**
+			 * Determines if the search performed is case insensitive.
+			 */
+			caseInsensitiveSearch: boolean;
+
+			/**
+			 * Determines if the section information is displayed in the search results when using the `searchText` property.
+			 */
+			keepSectionsInSearch: boolean;
+
+			/**
+			 * The manner in which the keyboard is dismissed when a drag begins in the list view.
+			 */
+			keyboardDismissMode: number;
+
+			/**
+			 * Array of objects (with `title` and `index` properties) to control the list view index.
+			 */
+			sectionIndexTitles: ListViewIndexEntry[];
+
+			/**
+			 * Style of the scrollbar.
+			 */
+			scrollIndicatorStyle: number;
+
+			/**
+			 * Controls the scroll-to-top gesture.
+			 */
+			willScrollOnStatusTap: boolean;
+
+			/**
+			 * Number of sections in this list view.
+			 */
+			readonly sectionCount: number;
+
+			/**
+			 * Determines whether this list view displays a vertical scroll indicator.
+			 */
+			showVerticalScrollIndicator: boolean;
+
+			/**
+			 * Separator line color between items, as a color name or hex triplet.
+			 */
+			separatorColor: string;
+
+			/**
+			 * The insets for list view separators (applies to all cells). This property is applicable on iOS 7 and greater.
+			 */
+			separatorInsets: any;
+
+			/**
+			 * Separator style constant.
+			 */
+			separatorStyle: number;
+
+			/**
+			 * Style of the list view.
+			 */
+			style: number;
+
+			/**
+			 * The insets for the table view header and footer. This property is applicable on iOS 7 and greater.
+			 */
+			tableSeparatorInsets: any;
+
+			/**
+			 * The insets for the list view header and footer. This property is applicable on iOS 7 and greater.
+			 */
+			listSeparatorInsets: any;
+
+			/**
+			 * The insets for list view cells (applies to all cells). This property is applicable on iOS 7 and greater.
+			 */
+			rowSeparatorInsets: any;
+
+			/**
+			 * A Boolean indicating whether the underlying content is dimmed during a search.
+			 */
+			dimBackgroundForSearch: boolean;
+
+			/**
+			 * The background color of the search results (iOS-only).
+			 */
+			resultsBackgroundColor: string;
+
+			/**
+			 * Separator line color between rows inside search results,
+			 * as a color name or hex triplet (iOS-only).
+			 */
+			resultsSeparatorColor: string;
+
+			/**
+			 * The separator style of the search results (iOS-only).
+			 */
+			resultsSeparatorStyle: number;
+
+			/**
+			 * The insets for search results separators (applies to all cells & iOS-only).
+			 */
+			resultsSeparatorInsets: any;
+
+			/**
+			 * Returns the selected list view items.
+			 */
+			selectedItems: ListItemEventType[];
+
+			/**
+			 * Scrolls to a specific item.
+			 */
+			scrollToItem(sectionIndex: number, itemIndex: number, animation?: ListViewAnimationProperties): void;
+
+			/**
+			 * Deselects a specific item.
+			 */
+			deselectItem(sectionIndex: number, itemIndex: number): void;
+
+			/**
+			 * Appends a single section or an array of sections to the end of the list.
+			 */
+			appendSection(section: Titanium.UI.ListSection, animation?: ListViewAnimationProperties): void;
+
+			/**
+			 * Appends a single section or an array of sections to the end of the list.
+			 */
+			appendSection(section: ReadonlyArray<Titanium.UI.ListSection>, animation?: ListViewAnimationProperties): void;
+
+			/**
+			 * Deletes an existing section.
+			 */
+			deleteSectionAt(sectionIndex: number, animation?: ListViewAnimationProperties): void;
+
+			/**
+			 * Inserts a section or an array of sections at a specific index.
+			 */
+			insertSectionAt(sectionIndex: number, section: Titanium.UI.ListSection, animation?: ListViewAnimationProperties): void;
+
+			/**
+			 * Inserts a section or an array of sections at a specific index.
+			 */
+			insertSectionAt(sectionIndex: number, section: ReadonlyArray<Titanium.UI.ListSection>, animation?: ListViewAnimationProperties): void;
+
+			/**
+			 * Replaces an existing section.
+			 */
+			replaceSectionAt(sectionIndex: number, section: Titanium.UI.ListSection, animation: ListViewAnimationProperties): void;
+
+			/**
+			 * Selects an item in the list using the specified item and section indices.
+			 */
+			selectItem(sectionIndex: number, itemIndex: number): void;
+
+			/**
+			 * Sets this list view's content insets.
+			 */
+			setContentInsets(edgeInsets: ListViewEdgeInsets, animated?: ListViewContentInsetOption): void;
+
+			/**
+			 * Sets the value of the content offset of the list view without animation by default.
+			 */
+			setContentOffset(contentOffset: any): void;
+
+			/**
+			 * Sets a reference item in the list view.
+			 */
+			setMarker(markerProps: ListViewMarkerProps): void;
+
+			/**
+			 * Adds a reference item in the list view.
+			 */
+			addMarker(markerProps: ListViewMarkerProps): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListView.allowsSelection> property.
+			 */
+			getAllowsSelection(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListView.allowsSelection> property.
+			 */
+			setAllowsSelection(allowsSelection: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListView.canScroll> property.
+			 */
+			getCanScroll(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListView.canScroll> property.
+			 */
+			setCanScroll(canScroll: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListView.disableBounce> property.
+			 */
+			getDisableBounce(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListView.disableBounce> property.
+			 */
+			setDisableBounce(disableBounce: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListView.editing> property.
+			 */
+			getEditing(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListView.editing> property.
+			 */
+			setEditing(editing: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListView.allowsSelectionDuringEditing> property.
+			 */
+			getAllowsSelectionDuringEditing(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListView.allowsSelectionDuringEditing> property.
+			 */
+			setAllowsSelectionDuringEditing(allowsSelectionDuringEditing: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListView.allowsMultipleSelectionDuringEditing> property.
+			 */
+			getAllowsMultipleSelectionDuringEditing(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListView.allowsMultipleSelectionDuringEditing> property.
+			 */
+			setAllowsMultipleSelectionDuringEditing(allowsMultipleSelectionDuringEditing: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListView.lazyLoadingEnabled> property.
+			 */
+			getLazyLoadingEnabled(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListView.lazyLoadingEnabled> property.
+			 */
+			setLazyLoadingEnabled(lazyLoadingEnabled: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListView.pruneSectionsOnEdit> property.
+			 */
+			getPruneSectionsOnEdit(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListView.pruneSectionsOnEdit> property.
+			 */
+			setPruneSectionsOnEdit(pruneSectionsOnEdit: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListView.templates> property.
+			 */
+			getTemplates(): any;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListView.templates> property.
+			 */
+			setTemplates(templates: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListView.sections> property.
+			 */
+			getSections(): Titanium.UI.ListSection[];
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListView.sections> property.
+			 */
+			setSections(sections: ReadonlyArray<Titanium.UI.ListSection>): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListView.defaultItemTemplate> property.
+			 */
+			getDefaultItemTemplate(): string | number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListView.defaultItemTemplate> property.
+			 */
+			setDefaultItemTemplate(defaultItemTemplate: string): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListView.defaultItemTemplate> property.
+			 */
+			setDefaultItemTemplate(defaultItemTemplate: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListView.separatorHeight> property.
+			 */
+			getSeparatorHeight(): string | number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListView.separatorHeight> property.
+			 */
+			setSeparatorHeight(separatorHeight: string): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListView.separatorHeight> property.
+			 */
+			setSeparatorHeight(separatorHeight: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListView.footerDividersEnabled> property.
+			 */
+			getFooterDividersEnabled(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListView.footerDividersEnabled> property.
+			 */
+			setFooterDividersEnabled(footerDividersEnabled: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListView.footerTitle> property.
+			 */
+			getFooterTitle(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListView.footerTitle> property.
+			 */
+			setFooterTitle(footerTitle: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListView.footerView> property.
+			 */
+			getFooterView(): Titanium.UI.View;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListView.footerView> property.
+			 */
+			setFooterView(footerView: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListView.headerDividersEnabled> property.
+			 */
+			getHeaderDividersEnabled(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListView.headerDividersEnabled> property.
+			 */
+			setHeaderDividersEnabled(headerDividersEnabled: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListView.headerTitle> property.
+			 */
+			getHeaderTitle(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListView.headerTitle> property.
+			 */
+			setHeaderTitle(headerTitle: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListView.headerView> property.
+			 */
+			getHeaderView(): Titanium.UI.View;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListView.headerView> property.
+			 */
+			setHeaderView(headerView: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListView.pullView> property.
+			 */
+			getPullView(): Titanium.UI.View;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListView.pullView> property.
+			 */
+			setPullView(pullView: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListView.refreshControl> property.
+			 */
+			getRefreshControl(): Titanium.UI.RefreshControl;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListView.refreshControl> property.
+			 */
+			setRefreshControl(refreshControl: Titanium.UI.RefreshControl): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListView.searchView> property.
+			 */
+			getSearchView(): Titanium.UI.SearchBar | Titanium.UI.Android.SearchView;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListView.searchView> property.
+			 */
+			setSearchView(searchView: Titanium.UI.SearchBar): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListView.searchView> property.
+			 */
+			setSearchView(searchView: Titanium.UI.Android.SearchView): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListView.searchText> property.
+			 */
+			getSearchText(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListView.searchText> property.
+			 */
+			setSearchText(searchText: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListView.caseInsensitiveSearch> property.
+			 */
+			getCaseInsensitiveSearch(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListView.caseInsensitiveSearch> property.
+			 */
+			setCaseInsensitiveSearch(caseInsensitiveSearch: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListView.keepSectionsInSearch> property.
+			 */
+			getKeepSectionsInSearch(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListView.keepSectionsInSearch> property.
+			 */
+			setKeepSectionsInSearch(keepSectionsInSearch: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListView.keyboardDismissMode> property.
+			 */
+			getKeyboardDismissMode(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListView.keyboardDismissMode> property.
+			 */
+			setKeyboardDismissMode(keyboardDismissMode: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListView.sectionIndexTitles> property.
+			 */
+			getSectionIndexTitles(): ListViewIndexEntry[];
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListView.sectionIndexTitles> property.
+			 */
+			setSectionIndexTitles(sectionIndexTitles: ReadonlyArray<ListViewIndexEntry>): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListView.scrollIndicatorStyle> property.
+			 */
+			getScrollIndicatorStyle(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListView.scrollIndicatorStyle> property.
+			 */
+			setScrollIndicatorStyle(scrollIndicatorStyle: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListView.willScrollOnStatusTap> property.
+			 */
+			getWillScrollOnStatusTap(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListView.willScrollOnStatusTap> property.
+			 */
+			setWillScrollOnStatusTap(willScrollOnStatusTap: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListView.sectionCount> property.
+			 */
+			getSectionCount(): number;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListView.showVerticalScrollIndicator> property.
+			 */
+			getShowVerticalScrollIndicator(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListView.showVerticalScrollIndicator> property.
+			 */
+			setShowVerticalScrollIndicator(showVerticalScrollIndicator: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListView.separatorColor> property.
+			 */
+			getSeparatorColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListView.separatorColor> property.
+			 */
+			setSeparatorColor(separatorColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListView.separatorInsets> property.
+			 */
+			getSeparatorInsets(): any;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListView.separatorInsets> property.
+			 */
+			setSeparatorInsets(separatorInsets: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListView.separatorStyle> property.
+			 */
+			getSeparatorStyle(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListView.separatorStyle> property.
+			 */
+			setSeparatorStyle(separatorStyle: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListView.style> property.
+			 */
+			getStyle(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListView.style> property.
+			 */
+			setStyle(style: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListView.tableSeparatorInsets> property.
+			 */
+			getTableSeparatorInsets(): any;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListView.tableSeparatorInsets> property.
+			 */
+			setTableSeparatorInsets(tableSeparatorInsets: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListView.listSeparatorInsets> property.
+			 */
+			getListSeparatorInsets(): any;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListView.listSeparatorInsets> property.
+			 */
+			setListSeparatorInsets(listSeparatorInsets: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListView.rowSeparatorInsets> property.
+			 */
+			getRowSeparatorInsets(): any;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListView.rowSeparatorInsets> property.
+			 */
+			setRowSeparatorInsets(rowSeparatorInsets: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListView.dimBackgroundForSearch> property.
+			 */
+			getDimBackgroundForSearch(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListView.dimBackgroundForSearch> property.
+			 */
+			setDimBackgroundForSearch(dimBackgroundForSearch: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListView.resultsBackgroundColor> property.
+			 */
+			getResultsBackgroundColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListView.resultsBackgroundColor> property.
+			 */
+			setResultsBackgroundColor(resultsBackgroundColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListView.resultsSeparatorColor> property.
+			 */
+			getResultsSeparatorColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListView.resultsSeparatorColor> property.
+			 */
+			setResultsSeparatorColor(resultsSeparatorColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListView.resultsSeparatorStyle> property.
+			 */
+			getResultsSeparatorStyle(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListView.resultsSeparatorStyle> property.
+			 */
+			setResultsSeparatorStyle(resultsSeparatorStyle: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListView.resultsSeparatorInsets> property.
+			 */
+			getResultsSeparatorInsets(): any;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListView.resultsSeparatorInsets> property.
+			 */
+			setResultsSeparatorInsets(resultsSeparatorInsets: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ListView.selectedItems> property.
+			 */
+			getSelectedItems(): ListItemEventType[];
+
+			/**
+			 * Sets the value of the <Titanium.UI.ListView.selectedItems> property.
+			 */
+			setSelectedItems(selectedItems: ReadonlyArray<ListItemEventType>): void;
+
+		}
+
+		/**
+		 * A control that displays an image composited with a background image or color.
+		 */
+		interface MaskedImage extends Titanium.Proxy {
+			/**
+			 * Whether the view should be "hidden" from (i.e., ignored by) the accessibility service.
+			 */
+			accessibilityHidden: boolean;
+
+			/**
+			 * Briefly describes what performing an action (such as a click) on the view will do.
+			 */
+			accessibilityHint: string;
+
+			/**
+			 * A succint label identifying the view for the device's accessibility service.
+			 */
+			accessibilityLabel: string;
+
+			/**
+			 * A string describing the value (if any) of the view for the device's accessibility service.
+			 */
+			accessibilityValue: string;
+
+			/**
+			 * Coordinate of the view about which to pivot an animation.
+			 */
+			anchorPoint: Point;
+
+			/**
+			 * Current position of the view during an animation.
+			 */
+			readonly animatedCenter: Point;
+
+			/**
+			 * Background color of the view, as a color name or hex triplet.
+			 */
+			backgroundColor: string;
+
+			/**
+			 * A background gradient for the view.
+			 */
+			backgroundGradient: Gradient;
+
+			/**
+			 * Background image for the view, specified as a local file path or URL.
+			 */
+			backgroundImage: string;
+
+			/**
+			 * Determines whether to tile a background across a view.
+			 */
+			backgroundRepeat: boolean;
+
+			/**
+			 * Size of the left end cap.
+			 */
+			backgroundLeftCap: number;
+
+			/**
+			 * Size of the top end cap.
+			 */
+			backgroundTopCap: number;
+
+			/**
+			 * Border color of the view, as a color name or hex triplet.
+			 */
+			borderColor: string;
+
+			/**
+			 * Radius for the rounded corners of the view's border.
+			 */
+			borderRadius: number;
+
+			/**
+			 * Border width of the view.
+			 */
+			borderWidth: number;
+
+			/**
+			 * View's bottom position, in platform-specific units.
+			 */
+			bottom: number | string;
+
+			/**
+			 * View's center position, in the parent view's coordinates.
+			 */
+			center: Point;
+
+			/**
+			 * Array of this view's child views.
+			 */
+			readonly children: Titanium.UI.View[];
+
+			/**
+			 * View's clipping behavior.
+			 */
+			clipMode: number;
+
+			/**
+			 * View height, in platform-specific units.
+			 */
+			height: number | string;
+
+			/**
+			 * View's left position, in platform-specific units.
+			 */
+			left: number | string;
+
+			/**
+			 * Specifies how the view positions its children.
+			 * One of: 'composite', 'vertical', or 'horizontal'.
+			 */
+			layout: string;
+
+			/**
+			 * Opacity of this view, from 0.0 (transparent) to 1.0 (opaque).
+			 */
+			opacity: number;
+
+			/**
+			 * Background color of the wrapper view when this view is used as either <Titanium.UI.ListView.pullView> or <Titanium.UI.TableView.headerPullView>.
+			 */
+			pullBackgroundColor: string;
+
+			/**
+			 * The preview context used in the 3D-Touch feature "Peek and Pop".
+			 */
+			previewContext: Titanium.UI.iOS.PreviewContext;
+
+			/**
+			 * View's right position, in platform-specific units.
+			 */
+			right: number | string;
+
+			/**
+			 * The bounding box of the view relative to its parent, in system units.
+			 */
+			readonly rect: Dimension;
+
+			/**
+			 * The size of the view in system units.
+			 */
+			readonly size: Dimension;
+
+			/**
+			 * The view's tintColor. This property is applicable on iOS 7 and greater.
+			 */
+			tintColor: string;
+
+			/**
+			 * The view's top position.
+			 */
+			top: number | string;
+
+			/**
+			 * Determines whether view should receive touch events.
+			 */
+			touchEnabled: boolean;
+
+			/**
+			 * Transformation matrix to apply to the view.
+			 */
+			transform: Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
+
+			/**
+			 * Determines the blur radius used to create the shadow.
+			 */
+			viewShadowRadius: number;
+
+			/**
+			 * Determines the color of the shadow.
+			 */
+			viewShadowColor: string;
+
+			/**
+			 * Determines the offset for the shadow of the view.
+			 */
+			viewShadowOffset: Point;
+
+			/**
+			 * Determines whether the view is visible.
+			 */
+			visible: boolean;
+
+			/**
+			 * View's width, in platform-specific units.
+			 */
+			width: number | string;
+
+			/**
+			 * Determines whether the layout has wrapping behavior.
+			 */
+			horizontalWrap: boolean;
+
+			/**
+			 * Z-index stack order position, relative to other sibling views.
+			 */
+			zIndex: number;
+
+			/**
+			 * Image drawn as the background image.
+			 */
+			mask: string;
+
+			/**
+			 * Image drawn as the Foreground image.
+			 */
+			image: string;
+
+			/**
+			 * Blend mode to use to combine layers.
+			 */
+			mode: number;
+
+			/**
+			 * Color to combine with the image, as a color name or hex triplet.
+			 */
+			tint: string;
+
+			/**
+			 * Adds a child to this view's hierarchy.
+			 */
+			add(view: any): void;
+
+			/**
+			 * Adds a child to this view's hierarchy.
+			 */
+			add(view: any[]): void;
+
+			/**
+			 * Animates this view.
+			 */
+			animate(animation: any, callback?: (param0: any) => any): void;
+
+			/**
+			 * Finishes a batch update of the View's layout properties and schedules a layout pass of the
+			 * view tree.
+			 */
+			finishLayout(): void;
+
+			/**
+			 * Hides this view.
+			 */
+			hide(options?: AnimationOption): void;
+
+			/**
+			 * Inserts a view at the specified position in the [children](Titanium.UI.View.children) array.
+			 */
+			insertAt(params: any): void;
+
+			/**
+			 * Removes a child view from this view's hierarchy.
+			 */
+			remove(view: any): void;
+
+			/**
+			 * Removes all child views from this view's hierarchy.
+			 */
+			removeAllChildren(): void;
+
+			/**
+			 * Replaces a view at the specified position in the [children](Titanium.UI.View.children) array.
+			 */
+			replaceAt(params: any): void;
+
+			/**
+			 * Makes this view visible.
+			 */
+			show(options?: AnimationOption): void;
+
+			/**
+			 * Starts a batch update of this view's layout properties.
+			 */
+			startLayout(): void;
+
+			/**
+			 * Returns an image of the rendered view, as a Blob.
+			 */
+			toImage(callback?: (param0: Titanium.Blob) => any, honorScaleFactor?: boolean): Titanium.Blob;
+
+			/**
+			 * Performs a batch update of all supplied layout properties and schedules a layout pass after
+			 * they have been updated.
+			 */
+			updateLayout(params: any): void;
+
+			/**
+			 * Translates a point from this view's coordinate system to another view's coordinate system.
+			 */
+			convertPointToView(point: Point, destinationView: any): Point;
+
+			/**
+			 * Returns the matching view of a given view ID.
+			 */
+			getViewById(id: string): Titanium.UI.View;
+
+			/**
+			 * Gets the value of the <Titanium.UI.MaskedImage.accessibilityHidden> property.
+			 */
+			getAccessibilityHidden(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.MaskedImage.accessibilityHidden> property.
+			 */
+			setAccessibilityHidden(accessibilityHidden: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.MaskedImage.accessibilityHint> property.
+			 */
+			getAccessibilityHint(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.MaskedImage.accessibilityHint> property.
+			 */
+			setAccessibilityHint(accessibilityHint: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.MaskedImage.accessibilityLabel> property.
+			 */
+			getAccessibilityLabel(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.MaskedImage.accessibilityLabel> property.
+			 */
+			setAccessibilityLabel(accessibilityLabel: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.MaskedImage.accessibilityValue> property.
+			 */
+			getAccessibilityValue(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.MaskedImage.accessibilityValue> property.
+			 */
+			setAccessibilityValue(accessibilityValue: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.MaskedImage.anchorPoint> property.
+			 */
+			getAnchorPoint(): Point;
+
+			/**
+			 * Sets the value of the <Titanium.UI.MaskedImage.anchorPoint> property.
+			 */
+			setAnchorPoint(anchorPoint: Point): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.MaskedImage.animatedCenter> property.
+			 */
+			getAnimatedCenter(): Point;
+
+			/**
+			 * Gets the value of the <Titanium.UI.MaskedImage.backgroundColor> property.
+			 */
+			getBackgroundColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.MaskedImage.backgroundColor> property.
+			 */
+			setBackgroundColor(backgroundColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.MaskedImage.backgroundGradient> property.
+			 */
+			getBackgroundGradient(): Gradient;
+
+			/**
+			 * Sets the value of the <Titanium.UI.MaskedImage.backgroundGradient> property.
+			 */
+			setBackgroundGradient(backgroundGradient: Gradient): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.MaskedImage.backgroundImage> property.
+			 */
+			getBackgroundImage(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.MaskedImage.backgroundImage> property.
+			 */
+			setBackgroundImage(backgroundImage: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.MaskedImage.backgroundRepeat> property.
+			 */
+			getBackgroundRepeat(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.MaskedImage.backgroundRepeat> property.
+			 */
+			setBackgroundRepeat(backgroundRepeat: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.MaskedImage.backgroundLeftCap> property.
+			 */
+			getBackgroundLeftCap(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.MaskedImage.backgroundLeftCap> property.
+			 */
+			setBackgroundLeftCap(backgroundLeftCap: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.MaskedImage.backgroundTopCap> property.
+			 */
+			getBackgroundTopCap(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.MaskedImage.backgroundTopCap> property.
+			 */
+			setBackgroundTopCap(backgroundTopCap: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.MaskedImage.borderColor> property.
+			 */
+			getBorderColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.MaskedImage.borderColor> property.
+			 */
+			setBorderColor(borderColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.MaskedImage.borderRadius> property.
+			 */
+			getBorderRadius(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.MaskedImage.borderRadius> property.
+			 */
+			setBorderRadius(borderRadius: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.MaskedImage.borderWidth> property.
+			 */
+			getBorderWidth(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.MaskedImage.borderWidth> property.
+			 */
+			setBorderWidth(borderWidth: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.MaskedImage.bottom> property.
+			 */
+			getBottom(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.MaskedImage.bottom> property.
+			 */
+			setBottom(bottom: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.MaskedImage.bottom> property.
+			 */
+			setBottom(bottom: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.MaskedImage.center> property.
+			 */
+			getCenter(): Point;
+
+			/**
+			 * Sets the value of the <Titanium.UI.MaskedImage.center> property.
+			 */
+			setCenter(center: Point): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.MaskedImage.children> property.
+			 */
+			getChildren(): Titanium.UI.View[];
+
+			/**
+			 * Gets the value of the <Titanium.UI.MaskedImage.clipMode> property.
+			 */
+			getClipMode(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.MaskedImage.clipMode> property.
+			 */
+			setClipMode(clipMode: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.MaskedImage.height> property.
+			 */
+			getHeight(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.MaskedImage.height> property.
+			 */
+			setHeight(height: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.MaskedImage.height> property.
+			 */
+			setHeight(height: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.MaskedImage.left> property.
+			 */
+			getLeft(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.MaskedImage.left> property.
+			 */
+			setLeft(left: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.MaskedImage.left> property.
+			 */
+			setLeft(left: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.MaskedImage.layout> property.
+			 */
+			getLayout(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.MaskedImage.layout> property.
+			 */
+			setLayout(layout: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.MaskedImage.opacity> property.
+			 */
+			getOpacity(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.MaskedImage.opacity> property.
+			 */
+			setOpacity(opacity: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.MaskedImage.pullBackgroundColor> property.
+			 */
+			getPullBackgroundColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.MaskedImage.pullBackgroundColor> property.
+			 */
+			setPullBackgroundColor(pullBackgroundColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.MaskedImage.previewContext> property.
+			 */
+			getPreviewContext(): Titanium.UI.iOS.PreviewContext;
+
+			/**
+			 * Sets the value of the <Titanium.UI.MaskedImage.previewContext> property.
+			 */
+			setPreviewContext(previewContext: Titanium.UI.iOS.PreviewContext): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.MaskedImage.right> property.
+			 */
+			getRight(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.MaskedImage.right> property.
+			 */
+			setRight(right: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.MaskedImage.right> property.
+			 */
+			setRight(right: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.MaskedImage.rect> property.
+			 */
+			getRect(): Dimension;
+
+			/**
+			 * Gets the value of the <Titanium.UI.MaskedImage.size> property.
+			 */
+			getSize(): Dimension;
+
+			/**
+			 * Gets the value of the <Titanium.UI.MaskedImage.tintColor> property.
+			 */
+			getTintColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.MaskedImage.tintColor> property.
+			 */
+			setTintColor(tintColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.MaskedImage.top> property.
+			 */
+			getTop(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.MaskedImage.top> property.
+			 */
+			setTop(top: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.MaskedImage.top> property.
+			 */
+			setTop(top: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.MaskedImage.touchEnabled> property.
+			 */
+			getTouchEnabled(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.MaskedImage.touchEnabled> property.
+			 */
+			setTouchEnabled(touchEnabled: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.MaskedImage.transform> property.
+			 */
+			getTransform(): Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
+
+			/**
+			 * Sets the value of the <Titanium.UI.MaskedImage.transform> property.
+			 */
+			setTransform(transform: Titanium.UI.Matrix2D): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.MaskedImage.transform> property.
+			 */
+			setTransform(transform: Titanium.UI.Matrix3D): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.MaskedImage.viewShadowRadius> property.
+			 */
+			getViewShadowRadius(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.MaskedImage.viewShadowRadius> property.
+			 */
+			setViewShadowRadius(viewShadowRadius: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.MaskedImage.viewShadowColor> property.
+			 */
+			getViewShadowColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.MaskedImage.viewShadowColor> property.
+			 */
+			setViewShadowColor(viewShadowColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.MaskedImage.viewShadowOffset> property.
+			 */
+			getViewShadowOffset(): Point;
+
+			/**
+			 * Sets the value of the <Titanium.UI.MaskedImage.viewShadowOffset> property.
+			 */
+			setViewShadowOffset(viewShadowOffset: Point): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.MaskedImage.visible> property.
+			 */
+			getVisible(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.MaskedImage.visible> property.
+			 */
+			setVisible(visible: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.MaskedImage.width> property.
+			 */
+			getWidth(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.MaskedImage.width> property.
+			 */
+			setWidth(width: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.MaskedImage.width> property.
+			 */
+			setWidth(width: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.MaskedImage.horizontalWrap> property.
+			 */
+			getHorizontalWrap(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.MaskedImage.horizontalWrap> property.
+			 */
+			setHorizontalWrap(horizontalWrap: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.MaskedImage.zIndex> property.
+			 */
+			getZIndex(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.MaskedImage.zIndex> property.
+			 */
+			setZIndex(zIndex: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.MaskedImage.mask> property.
+			 */
+			getMask(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.MaskedImage.mask> property.
+			 */
+			setMask(mask: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.MaskedImage.image> property.
+			 */
+			getImage(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.MaskedImage.image> property.
+			 */
+			setImage(image: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.MaskedImage.mode> property.
+			 */
+			getMode(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.MaskedImage.mode> property.
+			 */
+			setMode(mode: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.MaskedImage.tint> property.
+			 */
+			getTint(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.MaskedImage.tint> property.
+			 */
+			setTint(tint: string): void;
+
+		}
+
+		/**
+		 * A toast notification.
+		 */
+		interface Notification extends Titanium.Proxy {
+			/**
+			 * Whether the view should be "hidden" from (i.e., ignored by) the accessibility service.
+			 */
+			accessibilityHidden: boolean;
+
+			/**
+			 * Briefly describes what performing an action (such as a click) on the view will do.
+			 */
+			accessibilityHint: string;
+
+			/**
+			 * A succint label identifying the view for the device's accessibility service.
+			 */
+			accessibilityLabel: string;
+
+			/**
+			 * A string describing the value (if any) of the view for the device's accessibility service.
+			 */
+			accessibilityValue: string;
+
+			/**
+			 * Background color of the view, as a color name or hex triplet.
+			 */
+			backgroundColor: string;
+
+			/**
+			 * Disabled background color of the view, as a color name or hex triplet.
+			 */
+			backgroundDisabledColor: string;
+
+			/**
+			 * Disabled background image for the view, specified as a local file path or URL.
+			 */
+			backgroundDisabledImage: string;
+
+			/**
+			 * Focused background color of the view, as a color name or hex triplet.
+			 */
+			backgroundFocusedColor: string;
+
+			/**
+			 * Focused background image for the view, specified as a local file path or URL.
+			 */
+			backgroundFocusedImage: string;
+
+			/**
+			 * A background gradient for the view.
+			 */
+			backgroundGradient: Gradient;
+
+			/**
+			 * Background image for the view, specified as a local file path or URL.
+			 */
+			backgroundImage: string;
+
+			/**
+			 * Determines whether to tile a background across a view.
+			 */
+			backgroundRepeat: boolean;
+
+			/**
+			 * Selected background color of the view, as a color name or hex triplet.
+			 */
+			backgroundSelectedColor: string;
+
+			/**
+			 * Selected background image url for the view, specified as a local file path or URL.
+			 */
+			backgroundSelectedImage: string;
+
+			/**
+			 * Border color of the view, as a color name or hex triplet.
+			 */
+			borderColor: string;
+
+			/**
+			 * Radius for the rounded corners of the view's border.
+			 */
+			borderRadius: number;
+
+			/**
+			 * Border width of the view.
+			 */
+			borderWidth: number;
+
+			/**
+			 * View's bottom position, in platform-specific units.
+			 */
+			bottom: number | string;
+
+			/**
+			 * View's center position, in the parent view's coordinates.
+			 */
+			center: Point;
+
+			/**
+			 * Array of this view's child views.
+			 */
+			readonly children: Titanium.UI.View[];
+
+			/**
+			 * Base elevation of the view relative to its parent in pixels.
+			 */
+			elevation: number;
+
+			/**
+			 * Whether view should be focusable while navigating with the trackball.
+			 */
+			focusable: boolean;
+
+			/**
+			 * View height, in platform-specific units.
+			 */
+			height: number | string;
+
+			/**
+			 * Sets the behavior when hiding an object to release or keep the free space
+			 */
+			hiddenBehavior: number;
+
+			/**
+			 * View's left position, in platform-specific units.
+			 */
+			left: number | string;
+
+			/**
+			 * Specifies how the view positions its children.
+			 * One of: 'composite', 'vertical', or 'horizontal'.
+			 */
+			layout: string;
+
+			/**
+			 * Opacity of this view, from 0.0 (transparent) to 1.0 (opaque).
+			 */
+			opacity: number;
+
+			/**
+			 * When on, animate call overrides current animation if applicable.
+			 */
+			overrideCurrentAnimation: boolean;
+
+			/**
+			 * View's right position, in platform-specific units.
+			 */
+			right: number | string;
+
+			/**
+			 * The bounding box of the view relative to its parent, in system units.
+			 */
+			readonly rect: Dimension;
+
+			/**
+			 * Clockwise 2D rotation of the view in degrees.
+			 */
+			rotation: number;
+
+			/**
+			 * Clockwise rotation of the view in degrees (x-axis).
+			 */
+			rotationX: number;
+
+			/**
+			 * Clockwise rotation of the view in degrees (y-axis).
+			 */
+			rotationY: number;
+
+			/**
+			 * Scaling of the view in x-axis in pixels.
+			 */
+			scaleX: number;
+
+			/**
+			 * Scaling of the view in y-axis in pixels.
+			 */
+			scaleY: number;
+
+			/**
+			 * The size of the view in system units.
+			 */
+			readonly size: Dimension;
+
+			/**
+			 * Determines keyboard behavior when this view is focused.
+			 */
+			softKeyboardOnFocus: number;
+
+			/**
+			 * The view's top position.
+			 */
+			top: number | string;
+
+			/**
+			 * Determines whether view should receive touch events.
+			 */
+			touchEnabled: boolean;
+
+			/**
+			 * A material design visual construct that provides an instantaneous visual confirmation of touch point.
+			 */
+			touchFeedback: boolean;
+
+			/**
+			 * Optional touch feedback ripple color. This has no effect unless `touchFeedback` is true.
+			 */
+			touchFeedbackColor: string;
+
+			/**
+			 * Transformation matrix to apply to the view.
+			 */
+			transform: Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
+
+			/**
+			 * Horizontal location of the view relative to its left position in pixels.
+			 */
+			translationX: number;
+
+			/**
+			 * Vertical location of the view relative to its top position in pixels.
+			 */
+			translationY: number;
+
+			/**
+			 * Depth of the view relative to its elevation in pixels.
+			 */
+			translationZ: number;
+
+			/**
+			 * A name to identify this view in activity transition.
+			 */
+			transitionName: string;
+
+			/**
+			 * Determines whether the view is visible.
+			 */
+			visible: boolean;
+
+			/**
+			 * View's width, in platform-specific units.
+			 */
+			width: number | string;
+
+			/**
+			 * Determines whether the layout has wrapping behavior.
+			 */
+			horizontalWrap: boolean;
+
+			/**
+			 * Z-index stack order position, relative to other sibling views.
+			 */
+			zIndex: number;
+
+			/**
+			 * Determines whether to keep the device screen on.
+			 */
+			keepScreenOn: boolean;
+
+			/**
+			 * Notification text to display.
+			 */
+			message: string;
+
+			/**
+			 * Determines how long the notification stays on screen.
+			 */
+			duration: number;
+
+			/**
+			 * Determines the location at which the notification should appear on the screen.
+			 */
+			gravity: number;
+
+			/**
+			 * X offset from the default position, in pixels.
+			 */
+			xOffset: number;
+
+			/**
+			 * Y offset from the default position, in pixels.
+			 */
+			yOffset: number;
+
+			/**
+			 * Horizontal placement of the notification, *as a fraction of the screen width*.
+			 */
+			horizontalMargin: number;
+
+			/**
+			 * Vertical placement of the notifcation, *as a fraction of the screen height*.
+			 */
+			verticalMargin: number;
+
+			/**
+			 * Adds a child to this view's hierarchy.
+			 */
+			add(view: any): void;
+
+			/**
+			 * Adds a child to this view's hierarchy.
+			 */
+			add(view: any[]): void;
+
+			/**
+			 * Animates this view.
+			 */
+			animate(animation: any, callback?: (param0: any) => any): void;
+
+			/**
+			 * Finishes a batch update of the View's layout properties and schedules a layout pass of the
+			 * view tree.
+			 */
+			finishLayout(): void;
+
+			/**
+			 * Hides this view.
+			 */
+			hide(options?: AnimationOption): void;
+
+			/**
+			 * Inserts a view at the specified position in the [children](Titanium.UI.View.children) array.
+			 */
+			insertAt(params: any): void;
+
+			/**
+			 * Removes a child view from this view's hierarchy.
+			 */
+			remove(view: any): void;
+
+			/**
+			 * Removes all child views from this view's hierarchy.
+			 */
+			removeAllChildren(): void;
+
+			/**
+			 * Replaces a view at the specified position in the [children](Titanium.UI.View.children) array.
+			 */
+			replaceAt(params: any): void;
+
+			/**
+			 * Show the notification.
+			 */
+			show(options?: AnimationOption): void;
+
+			/**
+			 * Starts a batch update of this view's layout properties.
+			 */
+			startLayout(): void;
+
+			/**
+			 * Returns an image of the rendered view, as a Blob.
+			 */
+			toImage(callback?: (param0: Titanium.Blob) => any, honorScaleFactor?: boolean): Titanium.Blob;
+
+			/**
+			 * Performs a batch update of all supplied layout properties and schedules a layout pass after
+			 * they have been updated.
+			 */
+			updateLayout(params: any): void;
+
+			/**
+			 * Translates a point from this view's coordinate system to another view's coordinate system.
+			 */
+			convertPointToView(point: Point, destinationView: any): Point;
+
+			/**
+			 * Returns the matching view of a given view ID.
+			 */
+			getViewById(id: string): Titanium.UI.View;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.accessibilityHidden> property.
+			 */
+			getAccessibilityHidden(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.accessibilityHidden> property.
+			 */
+			setAccessibilityHidden(accessibilityHidden: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.accessibilityHint> property.
+			 */
+			getAccessibilityHint(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.accessibilityHint> property.
+			 */
+			setAccessibilityHint(accessibilityHint: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.accessibilityLabel> property.
+			 */
+			getAccessibilityLabel(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.accessibilityLabel> property.
+			 */
+			setAccessibilityLabel(accessibilityLabel: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.accessibilityValue> property.
+			 */
+			getAccessibilityValue(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.accessibilityValue> property.
+			 */
+			setAccessibilityValue(accessibilityValue: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.backgroundColor> property.
+			 */
+			getBackgroundColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.backgroundColor> property.
+			 */
+			setBackgroundColor(backgroundColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.backgroundDisabledColor> property.
+			 */
+			getBackgroundDisabledColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.backgroundDisabledColor> property.
+			 */
+			setBackgroundDisabledColor(backgroundDisabledColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.backgroundDisabledImage> property.
+			 */
+			getBackgroundDisabledImage(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.backgroundDisabledImage> property.
+			 */
+			setBackgroundDisabledImage(backgroundDisabledImage: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.backgroundFocusedColor> property.
+			 */
+			getBackgroundFocusedColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.backgroundFocusedColor> property.
+			 */
+			setBackgroundFocusedColor(backgroundFocusedColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.backgroundFocusedImage> property.
+			 */
+			getBackgroundFocusedImage(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.backgroundFocusedImage> property.
+			 */
+			setBackgroundFocusedImage(backgroundFocusedImage: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.backgroundGradient> property.
+			 */
+			getBackgroundGradient(): Gradient;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.backgroundGradient> property.
+			 */
+			setBackgroundGradient(backgroundGradient: Gradient): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.backgroundImage> property.
+			 */
+			getBackgroundImage(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.backgroundImage> property.
+			 */
+			setBackgroundImage(backgroundImage: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.backgroundRepeat> property.
+			 */
+			getBackgroundRepeat(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.backgroundRepeat> property.
+			 */
+			setBackgroundRepeat(backgroundRepeat: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.backgroundSelectedColor> property.
+			 */
+			getBackgroundSelectedColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.backgroundSelectedColor> property.
+			 */
+			setBackgroundSelectedColor(backgroundSelectedColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.backgroundSelectedImage> property.
+			 */
+			getBackgroundSelectedImage(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.backgroundSelectedImage> property.
+			 */
+			setBackgroundSelectedImage(backgroundSelectedImage: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.borderColor> property.
+			 */
+			getBorderColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.borderColor> property.
+			 */
+			setBorderColor(borderColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.borderRadius> property.
+			 */
+			getBorderRadius(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.borderRadius> property.
+			 */
+			setBorderRadius(borderRadius: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.borderWidth> property.
+			 */
+			getBorderWidth(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.borderWidth> property.
+			 */
+			setBorderWidth(borderWidth: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.bottom> property.
+			 */
+			getBottom(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.bottom> property.
+			 */
+			setBottom(bottom: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.bottom> property.
+			 */
+			setBottom(bottom: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.center> property.
+			 */
+			getCenter(): Point;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.center> property.
+			 */
+			setCenter(center: Point): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.children> property.
+			 */
+			getChildren(): Titanium.UI.View[];
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.elevation> property.
+			 */
+			getElevation(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.elevation> property.
+			 */
+			setElevation(elevation: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.focusable> property.
+			 */
+			getFocusable(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.focusable> property.
+			 */
+			setFocusable(focusable: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.height> property.
+			 */
+			getHeight(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.height> property.
+			 */
+			setHeight(height: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.height> property.
+			 */
+			setHeight(height: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.hiddenBehavior> property.
+			 */
+			getHiddenBehavior(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.hiddenBehavior> property.
+			 */
+			setHiddenBehavior(hiddenBehavior: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.left> property.
+			 */
+			getLeft(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.left> property.
+			 */
+			setLeft(left: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.left> property.
+			 */
+			setLeft(left: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.layout> property.
+			 */
+			getLayout(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.layout> property.
+			 */
+			setLayout(layout: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.opacity> property.
+			 */
+			getOpacity(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.opacity> property.
+			 */
+			setOpacity(opacity: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.overrideCurrentAnimation> property.
+			 */
+			getOverrideCurrentAnimation(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.overrideCurrentAnimation> property.
+			 */
+			setOverrideCurrentAnimation(overrideCurrentAnimation: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.right> property.
+			 */
+			getRight(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.right> property.
+			 */
+			setRight(right: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.right> property.
+			 */
+			setRight(right: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.rect> property.
+			 */
+			getRect(): Dimension;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.rotation> property.
+			 */
+			getRotation(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.rotation> property.
+			 */
+			setRotation(rotation: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.rotationX> property.
+			 */
+			getRotationX(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.rotationX> property.
+			 */
+			setRotationX(rotationX: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.rotationY> property.
+			 */
+			getRotationY(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.rotationY> property.
+			 */
+			setRotationY(rotationY: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.scaleX> property.
+			 */
+			getScaleX(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.scaleX> property.
+			 */
+			setScaleX(scaleX: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.scaleY> property.
+			 */
+			getScaleY(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.scaleY> property.
+			 */
+			setScaleY(scaleY: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.size> property.
+			 */
+			getSize(): Dimension;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.softKeyboardOnFocus> property.
+			 */
+			getSoftKeyboardOnFocus(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.softKeyboardOnFocus> property.
+			 */
+			setSoftKeyboardOnFocus(softKeyboardOnFocus: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.top> property.
+			 */
+			getTop(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.top> property.
+			 */
+			setTop(top: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.top> property.
+			 */
+			setTop(top: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.touchEnabled> property.
+			 */
+			getTouchEnabled(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.touchEnabled> property.
+			 */
+			setTouchEnabled(touchEnabled: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.touchFeedback> property.
+			 */
+			getTouchFeedback(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.touchFeedback> property.
+			 */
+			setTouchFeedback(touchFeedback: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.touchFeedbackColor> property.
+			 */
+			getTouchFeedbackColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.touchFeedbackColor> property.
+			 */
+			setTouchFeedbackColor(touchFeedbackColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.transform> property.
+			 */
+			getTransform(): Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.transform> property.
+			 */
+			setTransform(transform: Titanium.UI.Matrix2D): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.transform> property.
+			 */
+			setTransform(transform: Titanium.UI.Matrix3D): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.translationX> property.
+			 */
+			getTranslationX(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.translationX> property.
+			 */
+			setTranslationX(translationX: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.translationY> property.
+			 */
+			getTranslationY(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.translationY> property.
+			 */
+			setTranslationY(translationY: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.translationZ> property.
+			 */
+			getTranslationZ(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.translationZ> property.
+			 */
+			setTranslationZ(translationZ: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.transitionName> property.
+			 */
+			getTransitionName(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.transitionName> property.
+			 */
+			setTransitionName(transitionName: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.visible> property.
+			 */
+			getVisible(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.visible> property.
+			 */
+			setVisible(visible: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.width> property.
+			 */
+			getWidth(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.width> property.
+			 */
+			setWidth(width: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.width> property.
+			 */
+			setWidth(width: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.horizontalWrap> property.
+			 */
+			getHorizontalWrap(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.horizontalWrap> property.
+			 */
+			setHorizontalWrap(horizontalWrap: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.zIndex> property.
+			 */
+			getZIndex(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.zIndex> property.
+			 */
+			setZIndex(zIndex: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.keepScreenOn> property.
+			 */
+			getKeepScreenOn(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.keepScreenOn> property.
+			 */
+			setKeepScreenOn(keepScreenOn: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.message> property.
+			 */
+			getMessage(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.message> property.
+			 */
+			setMessage(message: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.duration> property.
+			 */
+			getDuration(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.duration> property.
+			 */
+			setDuration(duration: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.gravity> property.
+			 */
+			getGravity(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.gravity> property.
+			 */
+			setGravity(gravity: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.xOffset> property.
+			 */
+			getXOffset(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.xOffset> property.
+			 */
+			setXOffset(xOffset: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.yOffset> property.
+			 */
+			getYOffset(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.yOffset> property.
+			 */
+			setYOffset(yOffset: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.horizontalMargin> property.
+			 */
+			getHorizontalMargin(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.horizontalMargin> property.
+			 */
+			setHorizontalMargin(horizontalMargin: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Notification.verticalMargin> property.
+			 */
+			getVerticalMargin(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Notification.verticalMargin> property.
+			 */
+			setVerticalMargin(verticalMargin: number): void;
+
+		}
+
+		/**
+		 * An option dialog is a modal view that includes a message and one or more option items positioned
+		 * in the middle of the display on Android and at the bottom edge on iOS. On Android, buttons may
+		 * be added below the options.
+		 */
+		interface OptionDialog extends Titanium.UI.View {
+			/**
+			 * View to load inside the message area, to create a custom layout.
+			 */
+			androidView: Titanium.UI.View;
+
+			/**
+			 * List of button names.
+			 */
+			buttonNames: string[];
+
+			/**
+			 * Index to define the cancel option.
+			 */
+			cancel: number;
+
+			/**
+			 * Index to define the destructive option, indicated by a visual cue when rendered.
+			 */
+			destructive: number;
+
+			/**
+			 * List of option names to display in the dialog.
+			 */
+			options: string[];
+
+			/**
+			 * Boolean value indicating if the option dialog should have an opaque background.
+			 */
+			opaquebackground: boolean;
+
+			/**
+			 * Boolean value indicating if the option dialog should only be cancelled by user gesture or by hide method.
+			 */
+			persistent: boolean;
+
+			/**
+			 * Defines the default selected option.
+			 */
+			selectedIndex: number;
+
+			/**
+			 * Title of the dialog.
+			 */
+			title: string;
+
+			/**
+			 * Key identifying a string in the locale file to use for the title text.
+			 */
+			titleid: string;
+
+			/**
+			 * Gets the value of the <Titanium.UI.OptionDialog.androidView> property.
+			 */
+			getAndroidView(): Titanium.UI.View;
+
+			/**
+			 * Sets the value of the <Titanium.UI.OptionDialog.androidView> property.
+			 */
+			setAndroidView(androidView: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.OptionDialog.buttonNames> property.
+			 */
+			getButtonNames(): string[];
+
+			/**
+			 * Sets the value of the <Titanium.UI.OptionDialog.buttonNames> property.
+			 */
+			setButtonNames(buttonNames: ReadonlyArray<string>): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.OptionDialog.cancel> property.
+			 */
+			getCancel(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.OptionDialog.cancel> property.
+			 */
+			setCancel(cancel: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.OptionDialog.destructive> property.
+			 */
+			getDestructive(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.OptionDialog.destructive> property.
+			 */
+			setDestructive(destructive: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.OptionDialog.options> property.
+			 */
+			getOptions(): string[];
+
+			/**
+			 * Sets the value of the <Titanium.UI.OptionDialog.options> property.
+			 */
+			setOptions(options: ReadonlyArray<string>): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.OptionDialog.opaquebackground> property.
+			 */
+			getOpaquebackground(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.OptionDialog.opaquebackground> property.
+			 */
+			setOpaquebackground(opaquebackground: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.OptionDialog.persistent> property.
+			 */
+			getPersistent(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.OptionDialog.persistent> property.
+			 */
+			setPersistent(persistent: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.OptionDialog.selectedIndex> property.
+			 */
+			getSelectedIndex(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.OptionDialog.selectedIndex> property.
+			 */
+			setSelectedIndex(selectedIndex: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.OptionDialog.title> property.
+			 */
+			getTitle(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.OptionDialog.title> property.
+			 */
+			setTitle(title: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.OptionDialog.titleid> property.
+			 */
+			getTitleid(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.OptionDialog.titleid> property.
+			 */
+			setTitleid(titleid: string): void;
+
+		}
+
+		/**
+		 * A control used to select one or more fixed values.
+		 */
+		interface Picker extends Titanium.UI.View {
+			/**
+			 * Columns used for this picker, as an array of <Titanium.UI.PickerColumn> objects.
+			 */
+			columns: Titanium.UI.PickerColumn[];
+
+			/**
+			 * Duration in milliseconds used for a Countdown Timer picker.
+			 */
+			countDownDuration: number;
+
+			/**
+			 * Sets the text color of date- and time-pickers.
+			 */
+			dateTimeColor: string;
+
+			/**
+			 * Determines whether the Time pickers display in 24-hour or 12-hour clock format.
+			 */
+			format24: boolean;
+
+			/**
+			 * Locale used when displaying Date and Time picker values.
+			 */
+			locale: string;
+
+			/**
+			 * Maximum date displayed when a Date picker is in use.
+			 */
+			maxDate: Date;
+
+			/**
+			 * Minimum date displayed when a Date picker is in use.
+			 */
+			minDate: Date;
+
+			/**
+			 * Interval in minutes displayed when one of the Time types of pickers is in use.
+			 */
+			minuteInterval: number;
+
+			/**
+			 * Determines whether the visual selection indicator is shown.
+			 */
+			selectionIndicator: boolean;
+
+			/**
+			 * Determines whether calling the method `setSelectedRow` opens when called
+			 */
+			selectionOpens: boolean;
+
+			/**
+			 * Determines the type of picker displayed
+			 */
+			type: number;
+
+			/**
+			 * Determines whether the non-native Android control, with a spinning wheel that looks and
+			 * behaves like the iOS picker, is invoked rather than the default native "dropdown" style.
+			 */
+			useSpinner: boolean;
+
+			/**
+			 * Creates a native Android control for creating a Time Spinner with Type `Ti.UI.PICKER_TYPE_TIME`.
+			 * This is invoked rather than the default native "dropdown" style.
+			 */
+			nativeSpinner: boolean;
+
+			/**
+			 * Date and time value for Date and Time pickers.
+			 */
+			value: Date;
+
+			/**
+			 * Number of visible rows to display. This is only applicable to a plain picker and when the
+			 * `useSpinner` is `true`.
+			 */
+			visibleItems: number;
+
+			/**
+			 * Determines whether the calenderView is visible.
+			 */
+			calendarViewShown: boolean;
+
+			/**
+			 * Font to use for text.
+			 */
+			font: Font;
+
+			/**
+			 * Gets the selected row for a column, or `null` if none exists.
+			 */
+			getSelectedRow(index: number): Titanium.UI.PickerRow;
+
+			/**
+			 * Repopulates values for a column.
+			 */
+			reloadColumn(column: Titanium.UI.PickerColumn): void;
+
+			/**
+			 * Selects a column's row.
+			 */
+			setSelectedRow(column: number, row: number, animated?: boolean): void;
+
+			/**
+			 * Sets the date and time value property for Date pickers.
+			 */
+			setValue(date: any, suppressEvent: boolean): Titanium.UI.PickerRow;
+
+			/**
+			 * Shows Date picker as a modal dialog.
+			 */
+			showDatePickerDialog(dictObj: any): void;
+
+			/**
+			 * Shows Time picker as a modal dialog.
+			 */
+			showTimePickerDialog(dictObj: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Picker.columns> property.
+			 */
+			getColumns(): Titanium.UI.PickerColumn[];
+
+			/**
+			 * Sets the value of the <Titanium.UI.Picker.columns> property.
+			 */
+			setColumns(columns: ReadonlyArray<Titanium.UI.PickerColumn>): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Picker.countDownDuration> property.
+			 */
+			getCountDownDuration(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Picker.countDownDuration> property.
+			 */
+			setCountDownDuration(countDownDuration: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Picker.dateTimeColor> property.
+			 */
+			getDateTimeColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Picker.dateTimeColor> property.
+			 */
+			setDateTimeColor(dateTimeColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Picker.format24> property.
+			 */
+			getFormat24(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Picker.format24> property.
+			 */
+			setFormat24(format24: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Picker.locale> property.
+			 */
+			getLocale(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Picker.locale> property.
+			 */
+			setLocale(locale: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Picker.maxDate> property.
+			 */
+			getMaxDate(): Date;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Picker.maxDate> property.
+			 */
+			setMaxDate(maxDate: Date): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Picker.minDate> property.
+			 */
+			getMinDate(): Date;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Picker.minDate> property.
+			 */
+			setMinDate(minDate: Date): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Picker.minuteInterval> property.
+			 */
+			getMinuteInterval(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Picker.minuteInterval> property.
+			 */
+			setMinuteInterval(minuteInterval: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Picker.selectionIndicator> property.
+			 */
+			getSelectionIndicator(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Picker.selectionIndicator> property.
+			 */
+			setSelectionIndicator(selectionIndicator: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Picker.selectionOpens> property.
+			 */
+			getSelectionOpens(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Picker.selectionOpens> property.
+			 */
+			setSelectionOpens(selectionOpens: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Picker.type> property.
+			 */
+			getType(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Picker.type> property.
+			 */
+			setType(type: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Picker.useSpinner> property.
+			 */
+			getUseSpinner(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Picker.useSpinner> property.
+			 */
+			setUseSpinner(useSpinner: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Picker.nativeSpinner> property.
+			 */
+			getNativeSpinner(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Picker.nativeSpinner> property.
+			 */
+			setNativeSpinner(nativeSpinner: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Picker.value> property.
+			 */
+			getValue(): Date;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Picker.value> property.
+			 */
+			setValue(value: Date): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Picker.visibleItems> property.
+			 */
+			getVisibleItems(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Picker.visibleItems> property.
+			 */
+			setVisibleItems(visibleItems: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Picker.calendarViewShown> property.
+			 */
+			getCalendarViewShown(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Picker.calendarViewShown> property.
+			 */
+			setCalendarViewShown(calendarViewShown: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Picker.font> property.
+			 */
+			getFont(): Font;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Picker.font> property.
+			 */
+			setFont(font: Font): void;
+
+		}
+
+		/**
+		 * A picker column, representing a selectable group of items in a <Titanium.UI.Picker>.
+		 */
+		interface PickerColumn extends Titanium.UI.View {
+			/**
+			 * Number of rows in this column.
+			 */
+			readonly rowCount: number;
+
+			/**
+			 * Rows of this column.
+			 */
+			readonly rows: Titanium.UI.PickerRow[];
+
+			/**
+			 * Font to use for text.
+			 */
+			font: Font;
+
+			/**
+			 * Adds a row to this column.
+			 */
+			addRow(row: Titanium.UI.PickerRow): void;
+
+			/**
+			 * Removes a row from this column.
+			 */
+			removeRow(row: Titanium.UI.PickerRow): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.PickerColumn.rowCount> property.
+			 */
+			getRowCount(): number;
+
+			/**
+			 * Gets the value of the <Titanium.UI.PickerColumn.rows> property.
+			 */
+			getRows(): Titanium.UI.PickerRow[];
+
+			/**
+			 * Gets the value of the <Titanium.UI.PickerColumn.font> property.
+			 */
+			getFont(): Font;
+
+			/**
+			 * Sets the value of the <Titanium.UI.PickerColumn.font> property.
+			 */
+			setFont(font: Font): void;
+
+		}
+
+		/**
+		 * A picker row, representing a selectable item in a <Titanium.UI.Picker>.
+		 */
+		interface PickerRow extends Titanium.UI.View {
+			/**
+			 * Color of the item text, as a color name or hex triplet.
+			 */
+			color: string;
+
+			/**
+			 * Font to use for the item text.
+			 */
+			font: Font;
+
+			/**
+			 * Item text.
+			 */
+			title: string;
+
+			/**
+			 * Gets the value of the <Titanium.UI.PickerRow.color> property.
+			 */
+			getColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.PickerRow.color> property.
+			 */
+			setColor(color: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.PickerRow.font> property.
+			 */
+			getFont(): Font;
+
+			/**
+			 * Sets the value of the <Titanium.UI.PickerRow.font> property.
+			 */
+			setFont(font: Font): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.PickerRow.title> property.
+			 */
+			getTitle(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.PickerRow.title> property.
+			 */
+			setTitle(title: string): void;
+
+		}
+
+		/**
+		 * A progress bar.
+		 */
+		interface ProgressBar extends Titanium.UI.View {
+			/**
+			 * Color of the progress bar message, as a color name or hex triplet.
+			 */
+			color: string;
+
+			/**
+			 * Font for the progress bar text.
+			 */
+			font: Font;
+
+			/**
+			 * Maximum value of the progress bar.
+			 */
+			max: number;
+
+			/**
+			 * Progress bar text.
+			 */
+			message: string;
+
+			/**
+			 * The color shown for the portion of the progress bar that is not filled.
+			 */
+			trackTintColor: string;
+
+			/**
+			 * Minimum value of the progress bar.
+			 */
+			min: number;
+
+			/**
+			 * Style of the progress bar.
+			 */
+			style: number;
+
+			/**
+			 * Current value of the progress bar.
+			 */
+			value: number;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ProgressBar.color> property.
+			 */
+			getColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ProgressBar.color> property.
+			 */
+			setColor(color: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ProgressBar.font> property.
+			 */
+			getFont(): Font;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ProgressBar.font> property.
+			 */
+			setFont(font: Font): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ProgressBar.max> property.
+			 */
+			getMax(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ProgressBar.max> property.
+			 */
+			setMax(max: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ProgressBar.message> property.
+			 */
+			getMessage(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ProgressBar.message> property.
+			 */
+			setMessage(message: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ProgressBar.trackTintColor> property.
+			 */
+			getTrackTintColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ProgressBar.trackTintColor> property.
+			 */
+			setTrackTintColor(trackTintColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ProgressBar.min> property.
+			 */
+			getMin(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ProgressBar.min> property.
+			 */
+			setMin(min: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ProgressBar.style> property.
+			 */
+			getStyle(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ProgressBar.style> property.
+			 */
+			setStyle(style: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ProgressBar.value> property.
+			 */
+			getValue(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ProgressBar.value> property.
+			 */
+			setValue(value: number): void;
+
+		}
+
+		/**
+		 * The RefreshControl is a representation of the native iOS
+		 * [UIRefreshControl](https://developer.apple.com/library/ios/documentation/uikit/reference/UIRefreshControl_class/Reference/Reference.html)
+		 * and Android [SwipeRefreshLayout](https://developer.android.com/reference/android/support/v4/widget/SwipeRefreshLayout.html).
+		 */
+		interface RefreshControl extends Titanium.Proxy {
+			/**
+			 * The attributed title of the control.
+			 */
+			title: Titanium.UI.AttributedString;
+
+			/**
+			 * The tint color for the refresh control, as a color name or hex triplet.
+			 */
+			tintColor: string;
+
+			/**
+			 * Tells the control that a refresh operation was started programmatically.
+			 */
+			beginRefreshing(): void;
+
+			/**
+			 * Tells the control that a refresh operation has ended.
+			 */
+			endRefreshing(): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.RefreshControl.title> property.
+			 */
+			getTitle(): Titanium.UI.AttributedString;
+
+			/**
+			 * Sets the value of the <Titanium.UI.RefreshControl.title> property.
+			 */
+			setTitle(title: Titanium.UI.AttributedString): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.RefreshControl.tintColor> property.
+			 */
+			getTintColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.RefreshControl.tintColor> property.
+			 */
+			setTintColor(tintColor: string): void;
+
+		}
+
+		/**
+		 * A view that contains a horizontally and/or vertically-scrollable region of content.
+		 */
+		interface ScrollView extends Titanium.UI.View {
+			/**
+			 * Determines whether this scroll view can cancel subview touches in order to scroll instead.
+			 */
+			canCancelEvents: boolean;
+
+			/**
+			 * Height of the scrollable region.
+			 */
+			contentHeight: number | string;
+
+			/**
+			 * X and Y coordinates to which to reposition the top-left point of the scrollable region.
+			 */
+			contentOffset: any;
+
+			/**
+			 * Width of the scrollable region.
+			 */
+			contentWidth: number | string;
+
+			/**
+			 * The deceleration rate of the ScrollView.
+			 */
+			decelerationRate: number;
+
+			/**
+			 * Determines whether scroll bounce of the scrollable region is enabled.
+			 */
+			disableBounce: boolean;
+
+			/**
+			 * Determines whether horizontal scroll bounce of the scrollable region is enabled.
+			 */
+			horizontalBounce: boolean;
+
+			/**
+			 * The manner in which the keyboard is dismissed when a drag begins in the scroll view.
+			 */
+			keyboardDismissMode: number;
+
+			/**
+			 * Maximum scaling factor of the scrollable region and its content.
+			 */
+			maxZoomScale: number;
+
+			/**
+			 * Minimum scaling factor of the scrollable region and its content.
+			 */
+			minZoomScale: number;
+
+			/**
+			 * Determines the behavior when the user overscolls the view.
+			 */
+			overScrollMode: number;
+
+			/**
+			 * View positioned above the first row that is only revealed when the user drags the scroll view contents down.
+			 */
+			refreshControl: Titanium.UI.RefreshControl;
+
+			/**
+			 * Controls whether the scroll-to-top gesture is effective.
+			 */
+			scrollsToTop: boolean;
+
+			/**
+			 * Style of the scrollbar.
+			 */
+			scrollIndicatorStyle: number;
+
+			/**
+			 * Limits the direction of the scrollable region, overriding the deduced setting. Set to
+			 * `horizontal` or `vertical`.
+			 */
+			scrollType: string;
+
+			/**
+			 * Determines whether scrolling is enabled for the view.
+			 */
+			scrollingEnabled: boolean;
+
+			/**
+			 * Determines whether the horizontal scroll indicator is visible.
+			 */
+			showHorizontalScrollIndicator: boolean;
+
+			/**
+			 * Determines whether the vertical scroll indicator is visible.
+			 */
+			showVerticalScrollIndicator: boolean;
+
+			/**
+			 * Determines whether vertical scroll bounce of the scrollable region is enabled.
+			 */
+			verticalBounce: boolean;
+
+			/**
+			 * Scaling factor of the scroll view's content.
+			 */
+			zoomScale: number;
+
+			/**
+			 * Moves the specified coordinate of the scrollable region into the viewable area.
+			 */
+			scrollTo(x: number, y: number, animation?: ScrollViewAnimationProperties): void;
+
+			/**
+			 * Sets the value of the [contentOffset](Titanium.UI.ScrollView.contentOffset) property.
+			 */
+			setContentOffset(contentOffset: any, animated?: contentOffsetOption): void;
+
+			/**
+			 * Sets the value of the [zoomScale](Titanium.UI.ScrollView.zoomScale) property.
+			 */
+			setZoomScale(zoomScale: number, animated?: zoomScaleOption): void;
+
+			/**
+			 * Moves the end of the scrollable region into the viewable area.
+			 */
+			scrollToBottom(): void;
+
+			/**
+			 * Moves the top of the scrollable region into the viewable area.
+			 */
+			scrollToTop(): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ScrollView.canCancelEvents> property.
+			 */
+			getCanCancelEvents(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ScrollView.canCancelEvents> property.
+			 */
+			setCanCancelEvents(canCancelEvents: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ScrollView.contentHeight> property.
+			 */
+			getContentHeight(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ScrollView.contentHeight> property.
+			 */
+			setContentHeight(contentHeight: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ScrollView.contentHeight> property.
+			 */
+			setContentHeight(contentHeight: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ScrollView.contentOffset> property.
+			 */
+			getContentOffset(): any;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ScrollView.contentOffset> property.
+			 */
+			setContentOffset(contentOffset: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ScrollView.contentWidth> property.
+			 */
+			getContentWidth(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ScrollView.contentWidth> property.
+			 */
+			setContentWidth(contentWidth: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ScrollView.contentWidth> property.
+			 */
+			setContentWidth(contentWidth: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ScrollView.decelerationRate> property.
+			 */
+			getDecelerationRate(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ScrollView.decelerationRate> property.
+			 */
+			setDecelerationRate(decelerationRate: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ScrollView.disableBounce> property.
+			 */
+			getDisableBounce(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ScrollView.disableBounce> property.
+			 */
+			setDisableBounce(disableBounce: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ScrollView.horizontalBounce> property.
+			 */
+			getHorizontalBounce(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ScrollView.horizontalBounce> property.
+			 */
+			setHorizontalBounce(horizontalBounce: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ScrollView.keyboardDismissMode> property.
+			 */
+			getKeyboardDismissMode(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ScrollView.keyboardDismissMode> property.
+			 */
+			setKeyboardDismissMode(keyboardDismissMode: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ScrollView.maxZoomScale> property.
+			 */
+			getMaxZoomScale(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ScrollView.maxZoomScale> property.
+			 */
+			setMaxZoomScale(maxZoomScale: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ScrollView.minZoomScale> property.
+			 */
+			getMinZoomScale(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ScrollView.minZoomScale> property.
+			 */
+			setMinZoomScale(minZoomScale: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ScrollView.overScrollMode> property.
+			 */
+			getOverScrollMode(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ScrollView.overScrollMode> property.
+			 */
+			setOverScrollMode(overScrollMode: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ScrollView.refreshControl> property.
+			 */
+			getRefreshControl(): Titanium.UI.RefreshControl;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ScrollView.refreshControl> property.
+			 */
+			setRefreshControl(refreshControl: Titanium.UI.RefreshControl): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ScrollView.scrollsToTop> property.
+			 */
+			getScrollsToTop(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ScrollView.scrollsToTop> property.
+			 */
+			setScrollsToTop(scrollsToTop: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ScrollView.scrollIndicatorStyle> property.
+			 */
+			getScrollIndicatorStyle(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ScrollView.scrollIndicatorStyle> property.
+			 */
+			setScrollIndicatorStyle(scrollIndicatorStyle: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ScrollView.scrollType> property.
+			 */
+			getScrollType(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ScrollView.scrollType> property.
+			 */
+			setScrollType(scrollType: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ScrollView.scrollingEnabled> property.
+			 */
+			getScrollingEnabled(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ScrollView.scrollingEnabled> property.
+			 */
+			setScrollingEnabled(scrollingEnabled: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ScrollView.showHorizontalScrollIndicator> property.
+			 */
+			getShowHorizontalScrollIndicator(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ScrollView.showHorizontalScrollIndicator> property.
+			 */
+			setShowHorizontalScrollIndicator(showHorizontalScrollIndicator: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ScrollView.showVerticalScrollIndicator> property.
+			 */
+			getShowVerticalScrollIndicator(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ScrollView.showVerticalScrollIndicator> property.
+			 */
+			setShowVerticalScrollIndicator(showVerticalScrollIndicator: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ScrollView.verticalBounce> property.
+			 */
+			getVerticalBounce(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ScrollView.verticalBounce> property.
+			 */
+			setVerticalBounce(verticalBounce: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ScrollView.zoomScale> property.
+			 */
+			getZoomScale(): number;
+
+		}
+
+		/**
+		 * A view that encapsulates a horizontally-scrolling set of child views, known as pages, navigable
+		 * using its built-in horizontal swipe gestures.
+		 */
+		interface ScrollableView extends Titanium.UI.View {
+			/**
+			 * Number of pages to cache (pre-render).
+			 */
+			cacheSize: number;
+
+			/**
+			 * Index of the active page.
+			 */
+			currentPage: number;
+
+			/**
+			 * Color for the current page of the paging control, as a color name or hex triplet.
+			 */
+			currentPageIndicatorColor: string;
+
+			/**
+			 * Determines whether page bouncing effect is disabled.
+			 */
+			disableBounce: boolean;
+
+			/**
+			 * Determines the behavior when the user overscolls the view.
+			 */
+			overScrollMode: number;
+
+			/**
+			 * Color of the paging control, as a color name or hex triplet.
+			 */
+			pagingControlColor: string;
+
+			/**
+			 * Height of the paging control, in pixels.
+			 */
+			pagingControlHeight: number;
+
+			/**
+			 * Color of the paging control, as a color name or hex triplet.
+			 */
+			pageIndicatorColor: string;
+
+			/**
+			 * Determines whether the paging control is visible.
+			 */
+			showPagingControl: boolean;
+
+			/**
+			 * Number of milliseconds to wait before hiding the paging control.
+			 */
+			pagingControlTimeout: number;
+
+			/**
+			 * Alpha value of the paging control.
+			 */
+			pagingControlAlpha: number;
+
+			/**
+			 * Determines whether the paging control is displayed at the top or bottom of the view.
+			 */
+			pagingControlOnTop: boolean;
+
+			/**
+			 * Determines whether the paging control is added as an overlay to the view.
+			 */
+			overlayEnabled: boolean;
+
+			/**
+			 * Determines whether scrolling is enabled for the view.
+			 */
+			scrollingEnabled: boolean;
+
+			/**
+			 * Sets the pages within this Scrollable View.
+			 */
+			views: Titanium.UI.View[];
+
+			/**
+			 * Determines whether the previous and next pages are clipped, so that they are not visible
+			 * adjacent to the current page.
+			 */
+			clipViews: boolean;
+
+			/**
+			 * Sets the region where this view responds to gestures.
+			 */
+			hitRect: Dimension;
+
+			/**
+			 * Inserts views at the specified position in the [views](Titanium.UI.ScrollableView.views) array.
+			 */
+			insertViewsAt(position: number, views: any[]): void;
+
+			/**
+			 * Adds a new page to this Scrollable View.
+			 */
+			addView(view: any): void;
+
+			/**
+			 * Sets the current page to the next consecutive page in <Titanium.UI.ScrollableView.views>.
+			 */
+			moveNext(): void;
+
+			/**
+			 * Sets the current page to the previous consecutive page in <Titanium.UI.ScrollableView.views>.
+			 */
+			movePrevious(): void;
+
+			/**
+			 * Removes an existing page from this Scrollable View.
+			 */
+			removeView(view: number): void;
+
+			/**
+			 * Removes an existing page from this Scrollable View.
+			 */
+			removeView(view: any): void;
+
+			/**
+			 * Scrolls to the specified page in <Titanium.UI.ScrollableView.views>.
+			 */
+			scrollToView(view: number): void;
+
+			/**
+			 * Scrolls to the specified page in <Titanium.UI.ScrollableView.views>.
+			 */
+			scrollToView(view: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ScrollableView.cacheSize> property.
+			 */
+			getCacheSize(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ScrollableView.cacheSize> property.
+			 */
+			setCacheSize(cacheSize: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ScrollableView.currentPage> property.
+			 */
+			getCurrentPage(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ScrollableView.currentPage> property.
+			 */
+			setCurrentPage(currentPage: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ScrollableView.currentPageIndicatorColor> property.
+			 */
+			getCurrentPageIndicatorColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ScrollableView.currentPageIndicatorColor> property.
+			 */
+			setCurrentPageIndicatorColor(currentPageIndicatorColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ScrollableView.disableBounce> property.
+			 */
+			getDisableBounce(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ScrollableView.disableBounce> property.
+			 */
+			setDisableBounce(disableBounce: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ScrollableView.overScrollMode> property.
+			 */
+			getOverScrollMode(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ScrollableView.overScrollMode> property.
+			 */
+			setOverScrollMode(overScrollMode: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ScrollableView.pagingControlColor> property.
+			 */
+			getPagingControlColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ScrollableView.pagingControlColor> property.
+			 */
+			setPagingControlColor(pagingControlColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ScrollableView.pagingControlHeight> property.
+			 */
+			getPagingControlHeight(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ScrollableView.pagingControlHeight> property.
+			 */
+			setPagingControlHeight(pagingControlHeight: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ScrollableView.pageIndicatorColor> property.
+			 */
+			getPageIndicatorColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ScrollableView.pageIndicatorColor> property.
+			 */
+			setPageIndicatorColor(pageIndicatorColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ScrollableView.showPagingControl> property.
+			 */
+			getShowPagingControl(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ScrollableView.showPagingControl> property.
+			 */
+			setShowPagingControl(showPagingControl: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ScrollableView.pagingControlTimeout> property.
+			 */
+			getPagingControlTimeout(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ScrollableView.pagingControlTimeout> property.
+			 */
+			setPagingControlTimeout(pagingControlTimeout: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ScrollableView.pagingControlAlpha> property.
+			 */
+			getPagingControlAlpha(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ScrollableView.pagingControlAlpha> property.
+			 */
+			setPagingControlAlpha(pagingControlAlpha: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ScrollableView.pagingControlOnTop> property.
+			 */
+			getPagingControlOnTop(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ScrollableView.pagingControlOnTop> property.
+			 */
+			setPagingControlOnTop(pagingControlOnTop: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ScrollableView.overlayEnabled> property.
+			 */
+			getOverlayEnabled(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ScrollableView.overlayEnabled> property.
+			 */
+			setOverlayEnabled(overlayEnabled: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ScrollableView.scrollingEnabled> property.
+			 */
+			getScrollingEnabled(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ScrollableView.scrollingEnabled> property.
+			 */
+			setScrollingEnabled(scrollingEnabled: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ScrollableView.views> property.
+			 */
+			getViews(): Titanium.UI.View[];
+
+			/**
+			 * Sets the value of the <Titanium.UI.ScrollableView.views> property.
+			 */
+			setViews(views: any[]): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ScrollableView.clipViews> property.
+			 */
+			getClipViews(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ScrollableView.clipViews> property.
+			 */
+			setClipViews(clipViews: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ScrollableView.hitRect> property.
+			 */
+			getHitRect(): Dimension;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ScrollableView.hitRect> property.
+			 */
+			setHitRect(hitRect: Dimension): void;
+
+		}
+
+		/**
+		 * A specialized text field for entering search text.
+		 */
+		interface SearchBar extends Titanium.UI.View {
+			/**
+			 * Determines how text is capitalized during typing.
+			 */
+			autocapitalization: number;
+
+			/**
+			 * Determines whether the text in the search bar is autocorrected during typing.
+			 */
+			autocorrect: boolean;
+
+			/**
+			 * Bar color of the search bar view, as a color name or hex triplet.
+			 */
+			barColor: string;
+
+			/**
+			 * The title of the cancel button when the search bar field is focused.
+			 */
+			cancelButtonTitle: string;
+
+			/**
+			 * Color of the text in this text field, as a color name or hex triplet.
+			 */
+			color: string;
+
+			/**
+			 * Text to show when the search bar field is not focused.
+			 */
+			hintText: string;
+
+			/**
+			 * Hint text color to display when the field is empty.
+			 */
+			hintTextColor: string;
+
+			/**
+			 * Key identifying a string from the locale file to use for the
+			 * [hintText](Titanium.UI.SearchBar.hintText) property.
+			 */
+			hinttextid: string;
+
+			/**
+			 * Keyboard type constant to use when the field is focused.
+			 */
+			keyboardType: number;
+
+			/**
+			 * Determines the appearance of the keyboard to be displayed the field is focused.
+			 */
+			keyboardAppearance: number;
+
+			/**
+			 * Single line of text displayed at the top of the search bar.
+			 */
+			prompt: string;
+
+			/**
+			 * Key identifying a string from the locale file to use for the
+			 * [prompt](Titanium.UI.SearchBar.prompt) property.
+			 */
+			promptid: string;
+
+			/**
+			 * Determines whether the bookmark button is displayed.
+			 */
+			showBookmark: boolean;
+
+			/**
+			 * Determines whether the cancel button is displayed.
+			 */
+			showCancel: boolean;
+
+			/**
+			 * Determines the style of the search bar.
+			 */
+			style: number;
+
+			/**
+			 * Value of the search bar.
+			 */
+			value: string;
+
+			/**
+			 * Causes the search bar to lose focus.
+			 */
+			blur(): void;
+
+			/**
+			 * Causes the search bar to gain focus.
+			 */
+			focus(): void;
+
+			/**
+			 * Shows or hides the cancel button.
+			 */
+			setShowCancel(showCancel: boolean, animated?: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.SearchBar.autocapitalization> property.
+			 */
+			getAutocapitalization(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.SearchBar.autocapitalization> property.
+			 */
+			setAutocapitalization(autocapitalization: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.SearchBar.autocorrect> property.
+			 */
+			getAutocorrect(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.SearchBar.autocorrect> property.
+			 */
+			setAutocorrect(autocorrect: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.SearchBar.barColor> property.
+			 */
+			getBarColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.SearchBar.barColor> property.
+			 */
+			setBarColor(barColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.SearchBar.cancelButtonTitle> property.
+			 */
+			getCancelButtonTitle(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.SearchBar.cancelButtonTitle> property.
+			 */
+			setCancelButtonTitle(cancelButtonTitle: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.SearchBar.color> property.
+			 */
+			getColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.SearchBar.color> property.
+			 */
+			setColor(color: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.SearchBar.hintText> property.
+			 */
+			getHintText(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.SearchBar.hintText> property.
+			 */
+			setHintText(hintText: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.SearchBar.hintTextColor> property.
+			 */
+			getHintTextColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.SearchBar.hintTextColor> property.
+			 */
+			setHintTextColor(hintTextColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.SearchBar.hinttextid> property.
+			 */
+			getHinttextid(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.SearchBar.hinttextid> property.
+			 */
+			setHinttextid(hinttextid: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.SearchBar.keyboardType> property.
+			 */
+			getKeyboardType(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.SearchBar.keyboardType> property.
+			 */
+			setKeyboardType(keyboardType: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.SearchBar.keyboardAppearance> property.
+			 */
+			getKeyboardAppearance(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.SearchBar.keyboardAppearance> property.
+			 */
+			setKeyboardAppearance(keyboardAppearance: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.SearchBar.prompt> property.
+			 */
+			getPrompt(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.SearchBar.prompt> property.
+			 */
+			setPrompt(prompt: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.SearchBar.promptid> property.
+			 */
+			getPromptid(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.SearchBar.promptid> property.
+			 */
+			setPromptid(promptid: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.SearchBar.showBookmark> property.
+			 */
+			getShowBookmark(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.SearchBar.showBookmark> property.
+			 */
+			setShowBookmark(showBookmark: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.SearchBar.showCancel> property.
+			 */
+			getShowCancel(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.SearchBar.showCancel> property.
+			 */
+			setShowCancel(showCancel: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.SearchBar.style> property.
+			 */
+			getStyle(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.SearchBar.style> property.
+			 */
+			setStyle(style: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.SearchBar.value> property.
+			 */
+			getValue(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.SearchBar.value> property.
+			 */
+			setValue(value: string): void;
+
+		}
+
+		/**
+		 * A slider component with a draggable thumb.
+		 */
+		interface Slider extends Titanium.UI.View {
+			/**
+			 * Image URL of the slider left track when in the disabled state.
+			 */
+			disabledLeftTrackImage: string;
+
+			/**
+			 * Image URL of the slider right track when in the disabled state.
+			 */
+			disabledRightTrackImage: string;
+
+			/**
+			 * Image URL of the slider thumb when in the disabled state.
+			 */
+			disabledThumbImage: string;
+
+			/**
+			 * Boolean to indicate the enabled state of the slider.
+			 */
+			enabled: boolean;
+
+			/**
+			 * Image URL of the slider left track when in the highlighted state.
+			 */
+			highlightedLeftTrackImage: string;
+
+			/**
+			 * Image URL of the slider right track when in the highlighted state.
+			 */
+			highlightedRightTrackImage: string;
+
+			/**
+			 * Image URL of the slider thumb when in the highlighted state.
+			 */
+			highlightedThumbImage: string;
+
+			/**
+			 * Image URL of the slider left track.
+			 */
+			leftTrackImage: string;
+
+			/**
+			 * Size of the left end cap for the leftTrackImage, disabledLeftTrackImage, highlightedLeftTrackImage and selectedLeftTrackImage properties.
+			 */
+			leftTrackLeftCap: number;
+
+			/**
+			 * Size of the top end cap for the leftTrackImage, disabledLeftTrackImage, highlightedLeftTrackImage and selectedLeftTrackImage properties.
+			 */
+			leftTrackTopCap: number;
+
+			/**
+			 * Maximum value of the slider.
+			 */
+			max: number;
+
+			/**
+			 * Upper limit on the slider value that can be selected.
+			 */
+			maxRange: number;
+
+			/**
+			 * Minimum value of the slider.
+			 */
+			min: number;
+
+			/**
+			 * Lower limit on the slider value that can be selected.
+			 */
+			minRange: number;
+
+			/**
+			 * Image URL of the slider right track.
+			 */
+			rightTrackImage: string;
+
+			/**
+			 * Size of the left end cap for the rightTrackImage, disabledRightTrackImage, highlightedRightTrackImage and selectedRightTrackImage properties.
+			 */
+			rightTrackLeftCap: number;
+
+			/**
+			 * Size of the top end cap for the rightTrackImage, disabledRightTrackImage, highlightedRightTrackImage and selectedRightTrackImage properties.
+			 */
+			rightTrackTopCap: number;
+
+			/**
+			 * Image URL of the slider left track when in the selected state.
+			 */
+			selectedLeftTrackImage: string;
+
+			/**
+			 * Image URL of the slider right track when in the selected state.
+			 */
+			selectedRightTrackImage: string;
+
+			/**
+			 * Image URL of the slider thumb when in the selected state.
+			 */
+			selectedThumbImage: string;
+
+			/**
+			 * Separates the thumbImage from the slider track.
+			 */
+			splitTrack: boolean;
+
+			/**
+			 * Image for the slider thumb.
+			 */
+			thumbImage: string | Titanium.Blob;
+
+			/**
+			 * Current value of the slider.
+			 */
+			value: string;
+
+			/**
+			 * Sets the [value](Titanium.UI.Slider.value) property.
+			 */
+			setValue(value: number, options?: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Slider.disabledLeftTrackImage> property.
+			 */
+			getDisabledLeftTrackImage(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Slider.disabledLeftTrackImage> property.
+			 */
+			setDisabledLeftTrackImage(disabledLeftTrackImage: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Slider.disabledRightTrackImage> property.
+			 */
+			getDisabledRightTrackImage(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Slider.disabledRightTrackImage> property.
+			 */
+			setDisabledRightTrackImage(disabledRightTrackImage: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Slider.disabledThumbImage> property.
+			 */
+			getDisabledThumbImage(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Slider.disabledThumbImage> property.
+			 */
+			setDisabledThumbImage(disabledThumbImage: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Slider.enabled> property.
+			 */
+			getEnabled(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Slider.enabled> property.
+			 */
+			setEnabled(enabled: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Slider.highlightedLeftTrackImage> property.
+			 */
+			getHighlightedLeftTrackImage(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Slider.highlightedLeftTrackImage> property.
+			 */
+			setHighlightedLeftTrackImage(highlightedLeftTrackImage: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Slider.highlightedRightTrackImage> property.
+			 */
+			getHighlightedRightTrackImage(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Slider.highlightedRightTrackImage> property.
+			 */
+			setHighlightedRightTrackImage(highlightedRightTrackImage: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Slider.highlightedThumbImage> property.
+			 */
+			getHighlightedThumbImage(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Slider.highlightedThumbImage> property.
+			 */
+			setHighlightedThumbImage(highlightedThumbImage: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Slider.leftTrackImage> property.
+			 */
+			getLeftTrackImage(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Slider.leftTrackImage> property.
+			 */
+			setLeftTrackImage(leftTrackImage: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Slider.leftTrackLeftCap> property.
+			 */
+			getLeftTrackLeftCap(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Slider.leftTrackLeftCap> property.
+			 */
+			setLeftTrackLeftCap(leftTrackLeftCap: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Slider.leftTrackTopCap> property.
+			 */
+			getLeftTrackTopCap(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Slider.leftTrackTopCap> property.
+			 */
+			setLeftTrackTopCap(leftTrackTopCap: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Slider.max> property.
+			 */
+			getMax(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Slider.max> property.
+			 */
+			setMax(max: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Slider.maxRange> property.
+			 */
+			getMaxRange(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Slider.maxRange> property.
+			 */
+			setMaxRange(maxRange: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Slider.min> property.
+			 */
+			getMin(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Slider.min> property.
+			 */
+			setMin(min: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Slider.minRange> property.
+			 */
+			getMinRange(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Slider.minRange> property.
+			 */
+			setMinRange(minRange: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Slider.rightTrackImage> property.
+			 */
+			getRightTrackImage(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Slider.rightTrackImage> property.
+			 */
+			setRightTrackImage(rightTrackImage: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Slider.rightTrackLeftCap> property.
+			 */
+			getRightTrackLeftCap(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Slider.rightTrackLeftCap> property.
+			 */
+			setRightTrackLeftCap(rightTrackLeftCap: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Slider.rightTrackTopCap> property.
+			 */
+			getRightTrackTopCap(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Slider.rightTrackTopCap> property.
+			 */
+			setRightTrackTopCap(rightTrackTopCap: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Slider.selectedLeftTrackImage> property.
+			 */
+			getSelectedLeftTrackImage(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Slider.selectedLeftTrackImage> property.
+			 */
+			setSelectedLeftTrackImage(selectedLeftTrackImage: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Slider.selectedRightTrackImage> property.
+			 */
+			getSelectedRightTrackImage(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Slider.selectedRightTrackImage> property.
+			 */
+			setSelectedRightTrackImage(selectedRightTrackImage: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Slider.selectedThumbImage> property.
+			 */
+			getSelectedThumbImage(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Slider.selectedThumbImage> property.
+			 */
+			setSelectedThumbImage(selectedThumbImage: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Slider.splitTrack> property.
+			 */
+			getSplitTrack(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Slider.splitTrack> property.
+			 */
+			setSplitTrack(splitTrack: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Slider.thumbImage> property.
+			 */
+			getThumbImage(): string | Titanium.Blob;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Slider.thumbImage> property.
+			 */
+			setThumbImage(thumbImage: string): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Slider.thumbImage> property.
+			 */
+			setThumbImage(thumbImage: Titanium.Blob): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Slider.value> property.
+			 */
+			getValue(): string;
+
+		}
+
+		/**
+		 * An on/off switch control.
+		 */
+		interface Switch extends Titanium.UI.View {
+			/**
+			 * Determines if there is animation when the switch value changes.
+			 */
+			animated: boolean;
+
+			/**
+			 * Color to use for switch text, as a color name or hex triplet.
+			 */
+			color: string;
+
+			/**
+			 * Determines whether the switch is enabled.
+			 */
+			enabled: boolean;
+
+			/**
+			 * Font to use for the switch text.
+			 */
+			font: Font;
+
+			/**
+			 * Style of the switch.
+			 */
+			style: number;
+
+			/**
+			 * Horizontal text alignment of the switch title.
+			 */
+			textAlign: string | number;
+
+			/**
+			 * Text to display next to the switch, when the checkbox style is in use.
+			 */
+			title: string;
+
+			/**
+			 * Text to display on the switch in its "off" state, when the toggle button style is in use.
+			 */
+			titleOff: string;
+
+			/**
+			 * Text to display on the switch in its "on" state, when the toggle button style is in use.
+			 */
+			titleOn: string;
+
+			/**
+			 * The color used to tint the appearance of the switch when it is turned on.
+			 */
+			onTintColor: string;
+
+			/**
+			 * The color used to tint the appearance of the thumb.
+			 */
+			thumbTintColor: string;
+
+			/**
+			 * Indicates whether the switch has been turned on or off by the user. May also be set
+			 * programmatically.
+			 */
+			value: boolean;
+
+			/**
+			 * Vertical alignment for the text field.
+			 */
+			verticalAlign: number | string;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Switch.animated> property.
+			 */
+			getAnimated(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Switch.animated> property.
+			 */
+			setAnimated(animated: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Switch.color> property.
+			 */
+			getColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Switch.color> property.
+			 */
+			setColor(color: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Switch.enabled> property.
+			 */
+			getEnabled(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Switch.enabled> property.
+			 */
+			setEnabled(enabled: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Switch.font> property.
+			 */
+			getFont(): Font;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Switch.font> property.
+			 */
+			setFont(font: Font): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Switch.style> property.
+			 */
+			getStyle(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Switch.style> property.
+			 */
+			setStyle(style: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Switch.textAlign> property.
+			 */
+			getTextAlign(): string | number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Switch.textAlign> property.
+			 */
+			setTextAlign(textAlign: string): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Switch.textAlign> property.
+			 */
+			setTextAlign(textAlign: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Switch.title> property.
+			 */
+			getTitle(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Switch.title> property.
+			 */
+			setTitle(title: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Switch.titleOff> property.
+			 */
+			getTitleOff(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Switch.titleOff> property.
+			 */
+			setTitleOff(titleOff: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Switch.titleOn> property.
+			 */
+			getTitleOn(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Switch.titleOn> property.
+			 */
+			setTitleOn(titleOn: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Switch.onTintColor> property.
+			 */
+			getOnTintColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Switch.onTintColor> property.
+			 */
+			setOnTintColor(onTintColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Switch.thumbTintColor> property.
+			 */
+			getThumbTintColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Switch.thumbTintColor> property.
+			 */
+			setThumbTintColor(thumbTintColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Switch.value> property.
+			 */
+			getValue(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Switch.value> property.
+			 */
+			setValue(value: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Switch.verticalAlign> property.
+			 */
+			getVerticalAlign(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Switch.verticalAlign> property.
+			 */
+			setVerticalAlign(verticalAlign: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Switch.verticalAlign> property.
+			 */
+			setVerticalAlign(verticalAlign: string): void;
+
+		}
+
+		/**
+		 * A tab instance for a [TabGroup](Titanium.UI.TabGroup).
+		 */
+		interface Tab extends Titanium.UI.View {
+			/**
+			 * `true` if this tab is active, `false` if it is not.
+			 */
+			active: boolean;
+
+			/**
+			 * Icon URL for this tab when active.
+			 */
+			activeIcon: string;
+
+			/**
+			 * Badge value for this tab. `null` indicates no badge.
+			 */
+			badge: string;
+
+			/**
+			 * If this item displays a badge, this color will be used for the badge's background.
+			 * If set to null, the default background color will be used instead.
+			 */
+			badgeColor: string;
+
+			/**
+			 * Icon URL for this tab.
+			 */
+			icon: string;
+
+			/**
+			 * The icon inset or outset for each edge.
+			 */
+			iconInsets: TabIconInsets;
+
+			/**
+			 * Defines if the icon property of the tab must be used as a mask. This property is applicable on iOS 7 and greater.
+			 */
+			iconIsMask: boolean;
+
+			/**
+			 * Defines if the active icon property of the tab must be used as a mask. This property is applicable on iOS 7 and greater.
+			 */
+			activeIconIsMask: boolean;
+
+			/**
+			 * Title for this tab.
+			 */
+			title: string;
+
+			/**
+			 * Key identifying a string from the locale file to use for the tab title. Only one of `title` or `titleid` should be specified.
+			 */
+			titleid: string;
+
+			/**
+			 * Defines the color of the title of tab when it's inactive.
+			 */
+			titleColor: string;
+
+			/**
+			 * Defines the color of the title of tab when it's active.
+			 */
+			activeTitleColor: string;
+
+			/**
+			 * Root-level tab window.  All tabs must have at least one root-level tab window.
+			 */
+			window: Titanium.UI.Window;
+
+			/**
+			 * Opens a new window.
+			 */
+			open(window: Titanium.UI.Window, options?: any): void;
+
+			/**
+			 * Closes the top-level window for this tab.
+			 */
+			close(window: Titanium.UI.Window, options?: any): void;
+
+			/**
+			 * Sets the root window that appears in the tab.
+			 */
+			setWindow(window: Titanium.UI.Window): void;
+
+			/**
+			 * Closes all windows that are currently opened inside the tab.
+			 */
+			popToRootWindow(options: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Tab.active> property.
+			 */
+			getActive(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Tab.active> property.
+			 */
+			setActive(active: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Tab.activeIcon> property.
+			 */
+			getActiveIcon(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Tab.activeIcon> property.
+			 */
+			setActiveIcon(activeIcon: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Tab.badge> property.
+			 */
+			getBadge(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Tab.badge> property.
+			 */
+			setBadge(badge: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Tab.badgeColor> property.
+			 */
+			getBadgeColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Tab.badgeColor> property.
+			 */
+			setBadgeColor(badgeColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Tab.icon> property.
+			 */
+			getIcon(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Tab.icon> property.
+			 */
+			setIcon(icon: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Tab.iconInsets> property.
+			 */
+			getIconInsets(): TabIconInsets;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Tab.iconInsets> property.
+			 */
+			setIconInsets(iconInsets: TabIconInsets): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Tab.iconIsMask> property.
+			 */
+			getIconIsMask(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Tab.iconIsMask> property.
+			 */
+			setIconIsMask(iconIsMask: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Tab.activeIconIsMask> property.
+			 */
+			getActiveIconIsMask(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Tab.activeIconIsMask> property.
+			 */
+			setActiveIconIsMask(activeIconIsMask: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Tab.title> property.
+			 */
+			getTitle(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Tab.title> property.
+			 */
+			setTitle(title: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Tab.titleid> property.
+			 */
+			getTitleid(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Tab.titleid> property.
+			 */
+			setTitleid(titleid: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Tab.titleColor> property.
+			 */
+			getTitleColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Tab.titleColor> property.
+			 */
+			setTitleColor(titleColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Tab.activeTitleColor> property.
+			 */
+			getActiveTitleColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Tab.activeTitleColor> property.
+			 */
+			setActiveTitleColor(activeTitleColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Tab.window> property.
+			 */
+			getWindow(): Titanium.UI.Window;
+
+		}
+
+		/**
+		 * A tabbed group of windows.
+		 */
+		interface TabGroup extends Titanium.UI.View {
+			/**
+			 * Active tab.
+			 */
+			activeTab: Titanium.UI.Tab;
+
+			/**
+			 * Reference to the Android Activity object associated with this tab group.
+			 */
+			readonly activity: Titanium.Android.Activity;
+
+			/**
+			 * Allow the user to reorder tabs in the tab group using the **Edit** button on the **More**
+			 * tab.
+			 */
+			allowUserCustomization: boolean;
+
+			/**
+			 * Default navigation bar color (typically for the **More** tab), as a color name or hex triplet.
+			 */
+			barColor: string;
+
+			/**
+			 * Boolean value indicating if the nav bar (typically for the **More** tab), is translucent.
+			 */
+			translucent: boolean;
+
+			/**
+			 * Title text attributes of the window to be applied on the **More** tab.
+			 */
+			titleAttributes: titleAttributesParams;
+
+			/**
+			 * The tintColor to apply to the navigation bar (typically for the **More** tab).
+			 */
+			navTintColor: string;
+
+			/**
+			 * Title for the edit button on the **More** tab.
+			 */
+			editButtonTitle: string;
+
+			/**
+			 * Boolean value indicating if the application should exit when closing the tab group, whether via Android
+			 * back button or the [close](Titanium.UI.TabGroup.close) method.
+			 */
+			exitOnClose: boolean;
+
+			/**
+			 * Boolean value indicating if tab navigation can be done by swipes, in addition to tab clicks.
+			 */
+			swipeable: boolean;
+
+			/**
+			 * Boolean value indicating if changing pages by tab clicks is animated.
+			 */
+			smoothScrollOnTabClick: boolean;
+
+			/**
+			 * Tabs managed by the tab group.
+			 */
+			tabs: Titanium.UI.Tab[];
+
+			/**
+			 * Determines how the tab group is treated when a soft input method (such as a virtual keyboard)
+			 * is displayed.
+			 */
+			windowSoftInputMode: number;
+
+			/**
+			 * Default background color for inactive tabs, as a color name or hex triplet.
+			 */
+			tabsBackgroundColor: string;
+
+			/**
+			 * The tintColor to apply to the tabs.
+			 */
+			tabsTintColor: string;
+
+			/**
+			 * A Boolean value that indicates whether the tab bar is translucent.
+			 */
+			tabsTranslucent: boolean;
+
+			/**
+			 * Title for this tabGroup.
+			 */
+			title: string;
+
+			/**
+			 * Default background image for tabs.
+			 */
+			tabsBackgroundImage: string;
+
+			/**
+			 * Unselected items in this tab group will be tinted with this color. Setting this value to null
+			 * indicates that the tab group should use its default value instead.
+			 */
+			unselectedItemTintColor: string;
+
+			/**
+			 * Image of the shadow placed between the tab bar and the content area.
+			 */
+			shadowImage: string;
+
+			/**
+			 * Color applied to active tabs icons, as a color name or hex triplet, where the tab's activeIcon was not defined.
+			 */
+			activeTabIconTint: string;
+
+			/**
+			 * Default background selected color for tabs, as a color name or hex triplet.
+			 */
+			tabsBackgroundSelectedColor: string;
+
+			/**
+			 * Default background image for the active tab.
+			 */
+			activeTabBackgroundImage: string;
+
+			/**
+			 * Adds a tab to the tab group.
+			 */
+			addTab(tab: Titanium.UI.Tab): void;
+
+			/**
+			 * Closes the tab group and removes it from the UI.
+			 */
+			close(): void;
+
+			/**
+			 * Disable (or re-enable) tab navigation. If tab navigation is disabled, the tabs are hidden and
+			 * the last selected tab window is shown.
+			 */
+			disableTabNavigation(disable: boolean): void;
+
+			/**
+			 * Gets the currently-active tab.
+			 */
+			getActiveTab(): Titanium.UI.Tab;
+
+			/**
+			 * Opens the tab group and makes it visible.
+			 */
+			open(): void;
+
+			/**
+			 * Removes a tab from the tab group.
+			 */
+			removeTab(tab: Titanium.UI.Tab): void;
+
+			/**
+			 * Selects the currently active tab in a tab group.
+			 */
+			setActiveTab(indexOrObject: number): void;
+
+			/**
+			 * Selects the currently active tab in a tab group.
+			 */
+			setActiveTab(indexOrObject: Titanium.UI.Tab): void;
+
+			/**
+			 * Gets all tabs that are managed by the tab group.
+			 */
+			getTabs(): Titanium.UI.Tab[];
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabGroup.activeTab> property.
+			 */
+			getActiveTab(): Titanium.UI.Tab;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabGroup.activeTab> property.
+			 */
+			setActiveTab(activeTab: Titanium.UI.Tab): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabGroup.activity> property.
+			 */
+			getActivity(): Titanium.Android.Activity;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabGroup.allowUserCustomization> property.
+			 */
+			getAllowUserCustomization(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabGroup.allowUserCustomization> property.
+			 */
+			setAllowUserCustomization(allowUserCustomization: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabGroup.barColor> property.
+			 */
+			getBarColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabGroup.barColor> property.
+			 */
+			setBarColor(barColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabGroup.translucent> property.
+			 */
+			getTranslucent(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabGroup.translucent> property.
+			 */
+			setTranslucent(translucent: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabGroup.titleAttributes> property.
+			 */
+			getTitleAttributes(): titleAttributesParams;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabGroup.titleAttributes> property.
+			 */
+			setTitleAttributes(titleAttributes: titleAttributesParams): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabGroup.navTintColor> property.
+			 */
+			getNavTintColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabGroup.navTintColor> property.
+			 */
+			setNavTintColor(navTintColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabGroup.editButtonTitle> property.
+			 */
+			getEditButtonTitle(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabGroup.editButtonTitle> property.
+			 */
+			setEditButtonTitle(editButtonTitle: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabGroup.exitOnClose> property.
+			 */
+			getExitOnClose(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabGroup.exitOnClose> property.
+			 */
+			setExitOnClose(exitOnClose: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabGroup.swipeable> property.
+			 */
+			getSwipeable(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabGroup.swipeable> property.
+			 */
+			setSwipeable(swipeable: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabGroup.smoothScrollOnTabClick> property.
+			 */
+			getSmoothScrollOnTabClick(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabGroup.smoothScrollOnTabClick> property.
+			 */
+			setSmoothScrollOnTabClick(smoothScrollOnTabClick: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabGroup.tabs> property.
+			 */
+			getTabs(): Titanium.UI.Tab[];
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabGroup.tabs> property.
+			 */
+			setTabs(tabs: ReadonlyArray<Titanium.UI.Tab>): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabGroup.windowSoftInputMode> property.
+			 */
+			getWindowSoftInputMode(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabGroup.windowSoftInputMode> property.
+			 */
+			setWindowSoftInputMode(windowSoftInputMode: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabGroup.tabsBackgroundColor> property.
+			 */
+			getTabsBackgroundColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabGroup.tabsBackgroundColor> property.
+			 */
+			setTabsBackgroundColor(tabsBackgroundColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabGroup.tabsTintColor> property.
+			 */
+			getTabsTintColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabGroup.tabsTintColor> property.
+			 */
+			setTabsTintColor(tabsTintColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabGroup.tabsTranslucent> property.
+			 */
+			getTabsTranslucent(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabGroup.tabsTranslucent> property.
+			 */
+			setTabsTranslucent(tabsTranslucent: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabGroup.title> property.
+			 */
+			getTitle(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabGroup.title> property.
+			 */
+			setTitle(title: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabGroup.tabsBackgroundImage> property.
+			 */
+			getTabsBackgroundImage(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabGroup.tabsBackgroundImage> property.
+			 */
+			setTabsBackgroundImage(tabsBackgroundImage: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabGroup.unselectedItemTintColor> property.
+			 */
+			getUnselectedItemTintColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabGroup.unselectedItemTintColor> property.
+			 */
+			setUnselectedItemTintColor(unselectedItemTintColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabGroup.shadowImage> property.
+			 */
+			getShadowImage(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabGroup.shadowImage> property.
+			 */
+			setShadowImage(shadowImage: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabGroup.activeTabIconTint> property.
+			 */
+			getActiveTabIconTint(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabGroup.activeTabIconTint> property.
+			 */
+			setActiveTabIconTint(activeTabIconTint: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabGroup.tabsBackgroundSelectedColor> property.
+			 */
+			getTabsBackgroundSelectedColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabGroup.tabsBackgroundSelectedColor> property.
+			 */
+			setTabsBackgroundSelectedColor(tabsBackgroundSelectedColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabGroup.activeTabBackgroundImage> property.
+			 */
+			getActiveTabBackgroundImage(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabGroup.activeTabBackgroundImage> property.
+			 */
+			setActiveTabBackgroundImage(activeTabBackgroundImage: string): void;
+
+		}
+
+		/**
+		 * A button bar that maintains a selected state.
+		 */
+		interface TabbedBar extends Titanium.Proxy {
+			/**
+			 * Whether the view should be "hidden" from (i.e., ignored by) the accessibility service.
+			 */
+			accessibilityHidden: boolean;
+
+			/**
+			 * Briefly describes what performing an action (such as a click) on the view will do.
+			 */
+			accessibilityHint: string;
+
+			/**
+			 * A succint label identifying the view for the device's accessibility service.
+			 */
+			accessibilityLabel: string;
+
+			/**
+			 * A string describing the value (if any) of the view for the device's accessibility service.
+			 */
+			accessibilityValue: string;
+
+			/**
+			 * Coordinate of the view about which to pivot an animation.
+			 */
+			anchorPoint: Point;
+
+			/**
+			 * Current position of the view during an animation.
+			 */
+			readonly animatedCenter: Point;
+
+			/**
+			 * Background color of the view, as a color name or hex triplet.
+			 */
+			backgroundColor: string;
+
+			/**
+			 * A background gradient for the view.
+			 */
+			backgroundGradient: Gradient;
+
+			/**
+			 * Background image for the view, specified as a local file path or URL.
+			 */
+			backgroundImage: string;
+
+			/**
+			 * Determines whether to tile a background across a view.
+			 */
+			backgroundRepeat: boolean;
+
+			/**
+			 * Size of the left end cap.
+			 */
+			backgroundLeftCap: number;
+
+			/**
+			 * Size of the top end cap.
+			 */
+			backgroundTopCap: number;
+
+			/**
+			 * Border color of the view, as a color name or hex triplet.
+			 */
+			borderColor: string;
+
+			/**
+			 * Radius for the rounded corners of the view's border.
+			 */
+			borderRadius: number;
+
+			/**
+			 * Border width of the view.
+			 */
+			borderWidth: number;
+
+			/**
+			 * View's bottom position, in platform-specific units.
+			 */
+			bottom: number | string;
+
+			/**
+			 * View's center position, in the parent view's coordinates.
+			 */
+			center: Point;
+
+			/**
+			 * Array of this view's child views.
+			 */
+			readonly children: Titanium.UI.View[];
+
+			/**
+			 * View's clipping behavior.
+			 */
+			clipMode: number;
+
+			/**
+			 * View height, in platform-specific units.
+			 */
+			height: number | string;
+
+			/**
+			 * View's left position, in platform-specific units.
+			 */
+			left: number | string;
+
+			/**
+			 * Specifies how the view positions its children.
+			 * One of: 'composite', 'vertical', or 'horizontal'.
+			 */
+			layout: string;
+
+			/**
+			 * Opacity of this view, from 0.0 (transparent) to 1.0 (opaque).
+			 */
+			opacity: number;
+
+			/**
+			 * Background color of the wrapper view when this view is used as either <Titanium.UI.ListView.pullView> or <Titanium.UI.TableView.headerPullView>.
+			 */
+			pullBackgroundColor: string;
+
+			/**
+			 * The preview context used in the 3D-Touch feature "Peek and Pop".
+			 */
+			previewContext: Titanium.UI.iOS.PreviewContext;
+
+			/**
+			 * View's right position, in platform-specific units.
+			 */
+			right: number | string;
+
+			/**
+			 * The bounding box of the view relative to its parent, in system units.
+			 */
+			readonly rect: Dimension;
+
+			/**
+			 * The size of the view in system units.
+			 */
+			readonly size: Dimension;
+
+			/**
+			 * The view's tintColor. This property is applicable on iOS 7 and greater.
+			 */
+			tintColor: string;
+
+			/**
+			 * The view's top position.
+			 */
+			top: number | string;
+
+			/**
+			 * Determines whether view should receive touch events.
+			 */
+			touchEnabled: boolean;
+
+			/**
+			 * Transformation matrix to apply to the view.
+			 */
+			transform: Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
+
+			/**
+			 * Determines the blur radius used to create the shadow.
+			 */
+			viewShadowRadius: number;
+
+			/**
+			 * Determines the color of the shadow.
+			 */
+			viewShadowColor: string;
+
+			/**
+			 * Determines the offset for the shadow of the view.
+			 */
+			viewShadowOffset: Point;
+
+			/**
+			 * Determines whether the view is visible.
+			 */
+			visible: boolean;
+
+			/**
+			 * View's width, in platform-specific units.
+			 */
+			width: number | string;
+
+			/**
+			 * Determines whether the layout has wrapping behavior.
+			 */
+			horizontalWrap: boolean;
+
+			/**
+			 * Z-index stack order position, relative to other sibling views.
+			 */
+			zIndex: number;
+
+			/**
+			 * Index of the currently selected button.
+			 */
+			index: number;
+
+			/**
+			 * Array of labels for the tabbed bar.
+			 */
+			labels: string[] | BarItemType[];
+
+			/**
+			 * Style of the tabbed bar.
+			 */
+			style: number;
+
+			/**
+			 * Adds a child to this view's hierarchy.
+			 */
+			add(view: any): void;
+
+			/**
+			 * Adds a child to this view's hierarchy.
+			 */
+			add(view: any[]): void;
+
+			/**
+			 * Animates this view.
+			 */
+			animate(animation: any, callback?: (param0: any) => any): void;
+
+			/**
+			 * Finishes a batch update of the View's layout properties and schedules a layout pass of the
+			 * view tree.
+			 */
+			finishLayout(): void;
+
+			/**
+			 * Hides this view.
+			 */
+			hide(options?: AnimationOption): void;
+
+			/**
+			 * Inserts a view at the specified position in the [children](Titanium.UI.View.children) array.
+			 */
+			insertAt(params: any): void;
+
+			/**
+			 * Removes a child view from this view's hierarchy.
+			 */
+			remove(view: any): void;
+
+			/**
+			 * Removes all child views from this view's hierarchy.
+			 */
+			removeAllChildren(): void;
+
+			/**
+			 * Replaces a view at the specified position in the [children](Titanium.UI.View.children) array.
+			 */
+			replaceAt(params: any): void;
+
+			/**
+			 * Makes this view visible.
+			 */
+			show(options?: AnimationOption): void;
+
+			/**
+			 * Starts a batch update of this view's layout properties.
+			 */
+			startLayout(): void;
+
+			/**
+			 * Returns an image of the rendered view, as a Blob.
+			 */
+			toImage(callback?: (param0: Titanium.Blob) => any, honorScaleFactor?: boolean): Titanium.Blob;
+
+			/**
+			 * Performs a batch update of all supplied layout properties and schedules a layout pass after
+			 * they have been updated.
+			 */
+			updateLayout(params: any): void;
+
+			/**
+			 * Translates a point from this view's coordinate system to another view's coordinate system.
+			 */
+			convertPointToView(point: Point, destinationView: any): Point;
+
+			/**
+			 * Returns the matching view of a given view ID.
+			 */
+			getViewById(id: string): Titanium.UI.View;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabbedBar.accessibilityHidden> property.
+			 */
+			getAccessibilityHidden(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabbedBar.accessibilityHidden> property.
+			 */
+			setAccessibilityHidden(accessibilityHidden: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabbedBar.accessibilityHint> property.
+			 */
+			getAccessibilityHint(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabbedBar.accessibilityHint> property.
+			 */
+			setAccessibilityHint(accessibilityHint: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabbedBar.accessibilityLabel> property.
+			 */
+			getAccessibilityLabel(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabbedBar.accessibilityLabel> property.
+			 */
+			setAccessibilityLabel(accessibilityLabel: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabbedBar.accessibilityValue> property.
+			 */
+			getAccessibilityValue(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabbedBar.accessibilityValue> property.
+			 */
+			setAccessibilityValue(accessibilityValue: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabbedBar.anchorPoint> property.
+			 */
+			getAnchorPoint(): Point;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabbedBar.anchorPoint> property.
+			 */
+			setAnchorPoint(anchorPoint: Point): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabbedBar.animatedCenter> property.
+			 */
+			getAnimatedCenter(): Point;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabbedBar.backgroundColor> property.
+			 */
+			getBackgroundColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabbedBar.backgroundColor> property.
+			 */
+			setBackgroundColor(backgroundColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabbedBar.backgroundGradient> property.
+			 */
+			getBackgroundGradient(): Gradient;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabbedBar.backgroundGradient> property.
+			 */
+			setBackgroundGradient(backgroundGradient: Gradient): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabbedBar.backgroundImage> property.
+			 */
+			getBackgroundImage(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabbedBar.backgroundImage> property.
+			 */
+			setBackgroundImage(backgroundImage: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabbedBar.backgroundRepeat> property.
+			 */
+			getBackgroundRepeat(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabbedBar.backgroundRepeat> property.
+			 */
+			setBackgroundRepeat(backgroundRepeat: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabbedBar.backgroundLeftCap> property.
+			 */
+			getBackgroundLeftCap(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabbedBar.backgroundLeftCap> property.
+			 */
+			setBackgroundLeftCap(backgroundLeftCap: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabbedBar.backgroundTopCap> property.
+			 */
+			getBackgroundTopCap(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabbedBar.backgroundTopCap> property.
+			 */
+			setBackgroundTopCap(backgroundTopCap: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabbedBar.borderColor> property.
+			 */
+			getBorderColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabbedBar.borderColor> property.
+			 */
+			setBorderColor(borderColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabbedBar.borderRadius> property.
+			 */
+			getBorderRadius(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabbedBar.borderRadius> property.
+			 */
+			setBorderRadius(borderRadius: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabbedBar.borderWidth> property.
+			 */
+			getBorderWidth(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabbedBar.borderWidth> property.
+			 */
+			setBorderWidth(borderWidth: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabbedBar.bottom> property.
+			 */
+			getBottom(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabbedBar.bottom> property.
+			 */
+			setBottom(bottom: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabbedBar.bottom> property.
+			 */
+			setBottom(bottom: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabbedBar.center> property.
+			 */
+			getCenter(): Point;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabbedBar.center> property.
+			 */
+			setCenter(center: Point): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabbedBar.children> property.
+			 */
+			getChildren(): Titanium.UI.View[];
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabbedBar.clipMode> property.
+			 */
+			getClipMode(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabbedBar.clipMode> property.
+			 */
+			setClipMode(clipMode: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabbedBar.height> property.
+			 */
+			getHeight(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabbedBar.height> property.
+			 */
+			setHeight(height: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabbedBar.height> property.
+			 */
+			setHeight(height: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabbedBar.left> property.
+			 */
+			getLeft(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabbedBar.left> property.
+			 */
+			setLeft(left: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabbedBar.left> property.
+			 */
+			setLeft(left: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabbedBar.layout> property.
+			 */
+			getLayout(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabbedBar.layout> property.
+			 */
+			setLayout(layout: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabbedBar.opacity> property.
+			 */
+			getOpacity(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabbedBar.opacity> property.
+			 */
+			setOpacity(opacity: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabbedBar.pullBackgroundColor> property.
+			 */
+			getPullBackgroundColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabbedBar.pullBackgroundColor> property.
+			 */
+			setPullBackgroundColor(pullBackgroundColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabbedBar.previewContext> property.
+			 */
+			getPreviewContext(): Titanium.UI.iOS.PreviewContext;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabbedBar.previewContext> property.
+			 */
+			setPreviewContext(previewContext: Titanium.UI.iOS.PreviewContext): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabbedBar.right> property.
+			 */
+			getRight(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabbedBar.right> property.
+			 */
+			setRight(right: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabbedBar.right> property.
+			 */
+			setRight(right: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabbedBar.rect> property.
+			 */
+			getRect(): Dimension;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabbedBar.size> property.
+			 */
+			getSize(): Dimension;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabbedBar.tintColor> property.
+			 */
+			getTintColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabbedBar.tintColor> property.
+			 */
+			setTintColor(tintColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabbedBar.top> property.
+			 */
+			getTop(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabbedBar.top> property.
+			 */
+			setTop(top: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabbedBar.top> property.
+			 */
+			setTop(top: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabbedBar.touchEnabled> property.
+			 */
+			getTouchEnabled(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabbedBar.touchEnabled> property.
+			 */
+			setTouchEnabled(touchEnabled: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabbedBar.transform> property.
+			 */
+			getTransform(): Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabbedBar.transform> property.
+			 */
+			setTransform(transform: Titanium.UI.Matrix2D): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabbedBar.transform> property.
+			 */
+			setTransform(transform: Titanium.UI.Matrix3D): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabbedBar.viewShadowRadius> property.
+			 */
+			getViewShadowRadius(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabbedBar.viewShadowRadius> property.
+			 */
+			setViewShadowRadius(viewShadowRadius: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabbedBar.viewShadowColor> property.
+			 */
+			getViewShadowColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabbedBar.viewShadowColor> property.
+			 */
+			setViewShadowColor(viewShadowColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabbedBar.viewShadowOffset> property.
+			 */
+			getViewShadowOffset(): Point;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabbedBar.viewShadowOffset> property.
+			 */
+			setViewShadowOffset(viewShadowOffset: Point): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabbedBar.visible> property.
+			 */
+			getVisible(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabbedBar.visible> property.
+			 */
+			setVisible(visible: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabbedBar.width> property.
+			 */
+			getWidth(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabbedBar.width> property.
+			 */
+			setWidth(width: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabbedBar.width> property.
+			 */
+			setWidth(width: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabbedBar.horizontalWrap> property.
+			 */
+			getHorizontalWrap(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabbedBar.horizontalWrap> property.
+			 */
+			setHorizontalWrap(horizontalWrap: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabbedBar.zIndex> property.
+			 */
+			getZIndex(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabbedBar.zIndex> property.
+			 */
+			setZIndex(zIndex: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabbedBar.index> property.
+			 */
+			getIndex(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabbedBar.index> property.
+			 */
+			setIndex(index: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabbedBar.labels> property.
+			 */
+			getLabels(): string[] | BarItemType[];
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabbedBar.labels> property.
+			 */
+			setLabels(labels: ReadonlyArray<string>): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabbedBar.labels> property.
+			 */
+			setLabels(labels: ReadonlyArray<BarItemType>): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TabbedBar.style> property.
+			 */
+			getStyle(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabbedBar.style> property.
+			 */
+			setStyle(style: number): void;
+
+		}
+
+		/**
+		 * A table view is used to present information, organized in sections and rows, in a
+		 * vertically-scrolling view.
+		 */
+		interface TableView extends Titanium.UI.View {
+			/**
+			 * Determines whether this table's rows can be selected.
+			 */
+			allowsSelection: boolean;
+
+			/**
+			 * Determines whether this table's rows can be selected while editing the table.
+			 */
+			allowsSelectionDuringEditing: boolean;
+
+			/**
+			 * Rows of the table view.
+			 */
+			data: Titanium.UI.TableViewRow[] | Titanium.UI.TableViewSection[];
+
+			/**
+			 * Determines the rows' default editable behavior, which allows them to be deleted by the user
+			 * when the table is in `editing` or `moving` mode.
+			 */
+			editable: boolean;
+
+			/**
+			 * Determines whether row editing mode is active.
+			 */
+			editing: boolean;
+
+			/**
+			 * Filter attribute to be used when searching.
+			 */
+			filterAttribute: string;
+
+			/**
+			 * Determines whether the search is limited to the start of the string
+			 */
+			filterAnchored: boolean;
+
+			/**
+			 * Determines whether the search is case insensitive.
+			 */
+			filterCaseInsensitive: boolean;
+
+			/**
+			 * When set to false, the ListView will not draw the divider before the footer view.
+			 */
+			footerDividersEnabled: boolean;
+
+			/**
+			 * Table view footer title.
+			 */
+			footerTitle: string;
+
+			/**
+			 * Max number of row class names.
+			 */
+			maxClassname: number;
+
+			/**
+			 * View positioned above the first row that is only revealed when the user drags the table
+			 * contents down.
+			 */
+			headerPullView: Titanium.UI.View;
+
+			/**
+			 * View positioned above the first row that is only revealed when the user drags the list view contents down.
+			 */
+			refreshControl: Titanium.UI.RefreshControl;
+
+			/**
+			 * Determines whether the search field should hide on completion.
+			 */
+			hideSearchOnSelection: boolean;
+
+			/**
+			 * Table view footer as a view that will be rendered instead of a label.
+			 */
+			footerView: Titanium.UI.View;
+
+			/**
+			 * When set to false, the ListView will not draw the divider after the header view.
+			 */
+			headerDividersEnabled: boolean;
+
+			/**
+			 * Table view header title.
+			 */
+			headerTitle: string;
+
+			/**
+			 * Table view header as a view that will be rendered instead of a label.
+			 */
+			headerView: Titanium.UI.View;
+
+			/**
+			 * Array of objects (with `title` and `index` properties) to control the table view index.
+			 */
+			index: TableViewIndexEntry[];
+
+			/**
+			 * Maximum row height for table view rows.
+			 */
+			maxRowHeight: number;
+
+			/**
+			 * Minimum row height for table view rows.
+			 */
+			minRowHeight: number;
+
+			/**
+			 * Determines the rows' default moveable behavior, which allows them to be re-ordered by the
+			 * user when the table is in `editing` or `moving` mode.
+			 */
+			moveable: boolean;
+
+			/**
+			 * Determines whether row moving mode is active.
+			 */
+			moving: boolean;
+
+			/**
+			 * Determines the behavior when the user overscrolls the view.
+			 */
+			overScrollMode: number;
+
+			/**
+			 * Default row height for table view rows.
+			 */
+			rowHeight: number;
+
+			/**
+			 * If `true`, the tableview can be scrolled.
+			 */
+			scrollable: boolean;
+
+			/**
+			 * Style of the scrollbar.
+			 */
+			scrollIndicatorStyle: number;
+
+			/**
+			 * Controls whether the scroll-to-top gesture is effective.
+			 */
+			scrollsToTop: boolean;
+
+			/**
+			 * Search field to use for the table view.
+			 */
+			search: Titanium.UI.SearchBar | Titanium.UI.Android.SearchView;
+
+			/**
+			 * A Boolean indicating whether the underlying content is dimmed during a search.
+			 */
+			dimBackgroundForSearch: boolean;
+
+			/**
+			 * Determines whether the [SearchBar](Titanium.UI.SearchBar) or [SearchView](Titanium.UI.Android.SearchView) appears as part of the TableView.
+			 */
+			searchAsChild: boolean;
+
+			/**
+			 * Determines whether the search field is visible.
+			 */
+			searchHidden: boolean;
+
+			/**
+			 * Number of sections in this table view.
+			 */
+			readonly sectionCount: number;
+
+			/**
+			 * Sections of this table.
+			 */
+			sections: Titanium.UI.TableViewSection[];
+
+			/**
+			 * Separator line color between rows, as a color name or hex triplet.
+			 */
+			separatorColor: string;
+
+			/**
+			 * The insets for table view separators (applies to all cells). This property is applicable on iOS 7 and greater.
+			 */
+			separatorInsets: any;
+
+			/**
+			 * The insets for the table view header and footer. This property is applicable on iOS 7 and greater.
+			 */
+			tableSeparatorInsets: any;
+
+			/**
+			 * The insets for table view cells (applies to all cells). This property is applicable on iOS 7 and greater.
+			 */
+			rowSeparatorInsets: any;
+
+			/**
+			 * Separator style constant.
+			 */
+			separatorStyle: number;
+
+			/**
+			 * Determines whether this table view displays a vertical scroll indicator.
+			 */
+			showVerticalScrollIndicator: boolean;
+
+			/**
+			 * Style of the table view, specified using one of the constants from
+			 * <Titanium.UI.iOS.TableViewStyle>.
+			 */
+			style: number;
+
+			/**
+			 * Appends a single row or an array of rows to the end of the table.
+			 */
+			appendRow(row: any, animation?: TableViewAnimationProperties): void;
+
+			/**
+			 * Appends a single section or an array of sections to the end of the table.
+			 */
+			appendSection(section: any, animation?: TableViewAnimationProperties): void;
+
+			/**
+			 * Deletes an existing row.
+			 */
+			deleteRow(row: number, animation?: TableViewAnimationProperties): void;
+
+			/**
+			 * Deletes an existing row.
+			 */
+			deleteRow(row: Titanium.UI.TableViewRow, animation?: TableViewAnimationProperties): void;
+
+			/**
+			 * Deletes an existing section.
+			 */
+			deleteSection(section: number, animation?: TableViewAnimationProperties): void;
+
+			/**
+			 * Programmatically deselects a row.
+			 */
+			deselectRow(row: number): void;
+
+			/**
+			 * Inserts a row after another row.
+			 */
+			insertRowAfter(index: number, row: any, animation?: TableViewAnimationProperties): void;
+
+			/**
+			 * Inserts a section after another section.
+			 */
+			insertSectionAfter(index: number, section: any, animation?: TableViewAnimationProperties): void;
+
+			/**
+			 * Inserts a row before another row.
+			 */
+			insertRowBefore(index: number, row: any, animation?: TableViewAnimationProperties): void;
+
+			/**
+			 * Inserts a section before another section.
+			 */
+			insertSectionBefore(index: number, section: any, animation?: TableViewAnimationProperties): void;
+
+			/**
+			 * Scrolls the table view to ensure that the specified row is on screen.
+			 */
+			scrollToIndex(index: number, animation?: TableViewAnimationProperties): void;
+
+			/**
+			 * Scrolls the table to a specific top position where 0 is the topmost y position in the
+			 * table view.
+			 */
+			scrollToTop(top: number, animation?: TableViewAnimationProperties): void;
+
+			/**
+			 * Sets this tableview's content insets.
+			 */
+			setContentInsets(edgeInsets: TableViewEdgeInsets, animated?: TableViewContentInsetOption): void;
+
+			/**
+			 * Sets the value of the content offset of the table view without animation by default.
+			 */
+			setContentOffset(contentOffset: any): void;
+
+			/**
+			 * Programmatically selects a row. In Android, it sets the currently selected item. If in touch mode,
+			 * the item will not be selected but it will still be positioned appropriately. If the specified
+			 * selection position is less than 0, then the item at position 0 will be selected.
+			 */
+			selectRow(row: number): void;
+
+			/**
+			 * Sets the data in the table.
+			 */
+			setData(data: any, animation: TableViewAnimationProperties): void;
+
+			/**
+			 * Sets the value of the [Titanium.UI.TableView.headerPullView] property.
+			 */
+			setHeaderPullView(view: any): void;
+
+			/**
+			 * Updates an existing row, optionally with animation.
+			 */
+			updateRow(index: number, row: Titanium.UI.TableViewRow, animation: TableViewAnimationProperties): void;
+
+			/**
+			 * Updates an existing section, optionally with animation.
+			 */
+			updateSection(index: number, section: Titanium.UI.TableViewSection, animation: TableViewAnimationProperties): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableView.allowsSelection> property.
+			 */
+			getAllowsSelection(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableView.allowsSelection> property.
+			 */
+			setAllowsSelection(allowsSelection: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableView.allowsSelectionDuringEditing> property.
+			 */
+			getAllowsSelectionDuringEditing(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableView.allowsSelectionDuringEditing> property.
+			 */
+			setAllowsSelectionDuringEditing(allowsSelectionDuringEditing: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableView.data> property.
+			 */
+			getData(): Titanium.UI.TableViewRow[] | Titanium.UI.TableViewSection[];
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableView.data> property.
+			 */
+			setData(data: ReadonlyArray<Titanium.UI.TableViewRow>): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableView.data> property.
+			 */
+			setData(data: ReadonlyArray<Titanium.UI.TableViewSection>): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableView.editable> property.
+			 */
+			getEditable(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableView.editable> property.
+			 */
+			setEditable(editable: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableView.editing> property.
+			 */
+			getEditing(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableView.editing> property.
+			 */
+			setEditing(editing: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableView.filterAttribute> property.
+			 */
+			getFilterAttribute(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableView.filterAttribute> property.
+			 */
+			setFilterAttribute(filterAttribute: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableView.filterAnchored> property.
+			 */
+			getFilterAnchored(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableView.filterAnchored> property.
+			 */
+			setFilterAnchored(filterAnchored: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableView.filterCaseInsensitive> property.
+			 */
+			getFilterCaseInsensitive(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableView.filterCaseInsensitive> property.
+			 */
+			setFilterCaseInsensitive(filterCaseInsensitive: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableView.footerDividersEnabled> property.
+			 */
+			getFooterDividersEnabled(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableView.footerDividersEnabled> property.
+			 */
+			setFooterDividersEnabled(footerDividersEnabled: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableView.footerTitle> property.
+			 */
+			getFooterTitle(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableView.footerTitle> property.
+			 */
+			setFooterTitle(footerTitle: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableView.maxClassname> property.
+			 */
+			getMaxClassname(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableView.maxClassname> property.
+			 */
+			setMaxClassname(maxClassname: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableView.headerPullView> property.
+			 */
+			getHeaderPullView(): Titanium.UI.View;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableView.headerPullView> property.
+			 */
+			setHeaderPullView(headerPullView: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableView.refreshControl> property.
+			 */
+			getRefreshControl(): Titanium.UI.RefreshControl;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableView.refreshControl> property.
+			 */
+			setRefreshControl(refreshControl: Titanium.UI.RefreshControl): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableView.hideSearchOnSelection> property.
+			 */
+			getHideSearchOnSelection(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableView.hideSearchOnSelection> property.
+			 */
+			setHideSearchOnSelection(hideSearchOnSelection: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableView.footerView> property.
+			 */
+			getFooterView(): Titanium.UI.View;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableView.footerView> property.
+			 */
+			setFooterView(footerView: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableView.headerDividersEnabled> property.
+			 */
+			getHeaderDividersEnabled(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableView.headerDividersEnabled> property.
+			 */
+			setHeaderDividersEnabled(headerDividersEnabled: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableView.headerTitle> property.
+			 */
+			getHeaderTitle(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableView.headerTitle> property.
+			 */
+			setHeaderTitle(headerTitle: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableView.headerView> property.
+			 */
+			getHeaderView(): Titanium.UI.View;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableView.headerView> property.
+			 */
+			setHeaderView(headerView: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableView.index> property.
+			 */
+			getIndex(): TableViewIndexEntry[];
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableView.index> property.
+			 */
+			setIndex(index: ReadonlyArray<TableViewIndexEntry>): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableView.maxRowHeight> property.
+			 */
+			getMaxRowHeight(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableView.maxRowHeight> property.
+			 */
+			setMaxRowHeight(maxRowHeight: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableView.minRowHeight> property.
+			 */
+			getMinRowHeight(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableView.minRowHeight> property.
+			 */
+			setMinRowHeight(minRowHeight: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableView.moveable> property.
+			 */
+			getMoveable(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableView.moveable> property.
+			 */
+			setMoveable(moveable: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableView.moving> property.
+			 */
+			getMoving(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableView.moving> property.
+			 */
+			setMoving(moving: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableView.overScrollMode> property.
+			 */
+			getOverScrollMode(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableView.overScrollMode> property.
+			 */
+			setOverScrollMode(overScrollMode: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableView.rowHeight> property.
+			 */
+			getRowHeight(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableView.rowHeight> property.
+			 */
+			setRowHeight(rowHeight: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableView.scrollable> property.
+			 */
+			getScrollable(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableView.scrollable> property.
+			 */
+			setScrollable(scrollable: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableView.scrollIndicatorStyle> property.
+			 */
+			getScrollIndicatorStyle(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableView.scrollIndicatorStyle> property.
+			 */
+			setScrollIndicatorStyle(scrollIndicatorStyle: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableView.scrollsToTop> property.
+			 */
+			getScrollsToTop(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableView.scrollsToTop> property.
+			 */
+			setScrollsToTop(scrollsToTop: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableView.search> property.
+			 */
+			getSearch(): Titanium.UI.SearchBar | Titanium.UI.Android.SearchView;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableView.search> property.
+			 */
+			setSearch(search: Titanium.UI.SearchBar): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableView.search> property.
+			 */
+			setSearch(search: Titanium.UI.Android.SearchView): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableView.dimBackgroundForSearch> property.
+			 */
+			getDimBackgroundForSearch(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableView.dimBackgroundForSearch> property.
+			 */
+			setDimBackgroundForSearch(dimBackgroundForSearch: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableView.searchAsChild> property.
+			 */
+			getSearchAsChild(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableView.searchAsChild> property.
+			 */
+			setSearchAsChild(searchAsChild: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableView.searchHidden> property.
+			 */
+			getSearchHidden(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableView.searchHidden> property.
+			 */
+			setSearchHidden(searchHidden: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableView.sectionCount> property.
+			 */
+			getSectionCount(): number;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableView.sections> property.
+			 */
+			getSections(): Titanium.UI.TableViewSection[];
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableView.sections> property.
+			 */
+			setSections(sections: ReadonlyArray<Titanium.UI.TableViewSection>): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableView.separatorColor> property.
+			 */
+			getSeparatorColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableView.separatorColor> property.
+			 */
+			setSeparatorColor(separatorColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableView.separatorInsets> property.
+			 */
+			getSeparatorInsets(): any;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableView.separatorInsets> property.
+			 */
+			setSeparatorInsets(separatorInsets: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableView.tableSeparatorInsets> property.
+			 */
+			getTableSeparatorInsets(): any;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableView.tableSeparatorInsets> property.
+			 */
+			setTableSeparatorInsets(tableSeparatorInsets: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableView.rowSeparatorInsets> property.
+			 */
+			getRowSeparatorInsets(): any;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableView.rowSeparatorInsets> property.
+			 */
+			setRowSeparatorInsets(rowSeparatorInsets: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableView.separatorStyle> property.
+			 */
+			getSeparatorStyle(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableView.separatorStyle> property.
+			 */
+			setSeparatorStyle(separatorStyle: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableView.showVerticalScrollIndicator> property.
+			 */
+			getShowVerticalScrollIndicator(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableView.showVerticalScrollIndicator> property.
+			 */
+			setShowVerticalScrollIndicator(showVerticalScrollIndicator: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableView.style> property.
+			 */
+			getStyle(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableView.style> property.
+			 */
+			setStyle(style: number): void;
+
+		}
+
+		/**
+		 * A table view row is an individual item in a table, organized into table view sections.
+		 */
+		interface TableViewRow extends Titanium.UI.View {
+			/**
+			 * Class name for the row.
+			 */
+			className: string;
+
+			/**
+			 * Default text color of the row when not selected, as a color name or hex triplet.
+			 */
+			color: string;
+
+			/**
+			 * Text to display on the delete button when editable is enabled
+			 */
+			deleteButtonTitle: string;
+
+			/**
+			 * Determines the rows' editable behavior, which allows them to be deleted by the user when the
+			 * table is in `editing` or `moving` mode.
+			 */
+			editable: boolean;
+
+			/**
+			 * Font to use for the row title.
+			 */
+			font: Font;
+
+			/**
+			 * The footer title of the row.
+			 */
+			footer: string;
+
+			/**
+			 * Determines whether a system-provided checkmark is displayed on the right-hand side of
+			 * the row.
+			 */
+			hasCheck: boolean;
+
+			/**
+			 * Determines whether a system-provided arrow is displayed on the right-hand side of the row.
+			 */
+			hasChild: boolean;
+
+			/**
+			 * Determines whether a system-provided detail disclosure button is displayed on the right-hand
+			 * side of the row.
+			 */
+			hasDetail: boolean;
+
+			/**
+			 * The header title of the row.
+			 */
+			header: string;
+
+			/**
+			 * Indention level for the row.
+			 */
+			indentionLevel: number;
+
+			/**
+			 * Image to render in the left image area of the row, specified as a local path or URL.
+			 */
+			leftImage: string;
+
+			/**
+			 * Determines the rows' moveable behavior, which allows them to be re-ordered by the user when
+			 * the table is in `editing` or `moving` mode.
+			 */
+			moveable: boolean;
+
+			/**
+			 * Image to render in the right image area of the row, specified as a local path or URL.
+			 */
+			rightImage: string;
+
+			/**
+			 * Background color to render when the row is selected, as a color name or hex triplet.
+			 */
+			selectedBackgroundColor: string;
+
+			/**
+			 * Background image to render when the row is selected.
+			 */
+			selectedBackgroundImage: string;
+
+			/**
+			 * Color of the row text when the row is selected, as a color name or hex triplet.
+			 */
+			selectedColor: string;
+
+			/**
+			 * Selection style constant to control the selection color.
+			 */
+			selectionStyle: number;
+
+			/**
+			 * Text to display on the row.
+			 */
+			title: string;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableViewRow.className> property.
+			 */
+			getClassName(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableViewRow.className> property.
+			 */
+			setClassName(className: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableViewRow.color> property.
+			 */
+			getColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableViewRow.color> property.
+			 */
+			setColor(color: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableViewRow.deleteButtonTitle> property.
+			 */
+			getDeleteButtonTitle(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableViewRow.deleteButtonTitle> property.
+			 */
+			setDeleteButtonTitle(deleteButtonTitle: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableViewRow.editable> property.
+			 */
+			getEditable(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableViewRow.editable> property.
+			 */
+			setEditable(editable: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableViewRow.font> property.
+			 */
+			getFont(): Font;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableViewRow.font> property.
+			 */
+			setFont(font: Font): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableViewRow.footer> property.
+			 */
+			getFooter(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableViewRow.footer> property.
+			 */
+			setFooter(footer: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableViewRow.hasCheck> property.
+			 */
+			getHasCheck(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableViewRow.hasCheck> property.
+			 */
+			setHasCheck(hasCheck: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableViewRow.hasChild> property.
+			 */
+			getHasChild(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableViewRow.hasChild> property.
+			 */
+			setHasChild(hasChild: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableViewRow.hasDetail> property.
+			 */
+			getHasDetail(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableViewRow.hasDetail> property.
+			 */
+			setHasDetail(hasDetail: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableViewRow.header> property.
+			 */
+			getHeader(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableViewRow.header> property.
+			 */
+			setHeader(header: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableViewRow.indentionLevel> property.
+			 */
+			getIndentionLevel(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableViewRow.indentionLevel> property.
+			 */
+			setIndentionLevel(indentionLevel: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableViewRow.leftImage> property.
+			 */
+			getLeftImage(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableViewRow.leftImage> property.
+			 */
+			setLeftImage(leftImage: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableViewRow.moveable> property.
+			 */
+			getMoveable(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableViewRow.moveable> property.
+			 */
+			setMoveable(moveable: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableViewRow.rightImage> property.
+			 */
+			getRightImage(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableViewRow.rightImage> property.
+			 */
+			setRightImage(rightImage: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableViewRow.selectedBackgroundColor> property.
+			 */
+			getSelectedBackgroundColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableViewRow.selectedBackgroundColor> property.
+			 */
+			setSelectedBackgroundColor(selectedBackgroundColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableViewRow.selectedBackgroundImage> property.
+			 */
+			getSelectedBackgroundImage(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableViewRow.selectedBackgroundImage> property.
+			 */
+			setSelectedBackgroundImage(selectedBackgroundImage: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableViewRow.selectedColor> property.
+			 */
+			getSelectedColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableViewRow.selectedColor> property.
+			 */
+			setSelectedColor(selectedColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableViewRow.selectionStyle> property.
+			 */
+			getSelectionStyle(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableViewRow.selectionStyle> property.
+			 */
+			setSelectionStyle(selectionStyle: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableViewRow.title> property.
+			 */
+			getTitle(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableViewRow.title> property.
+			 */
+			setTitle(title: string): void;
+
+		}
+
+		/**
+		 * A table view section is a container within a table used to organize table view rows.
+		 */
+		interface TableViewSection extends Titanium.Proxy {
+			/**
+			 * Title of this section footer.
+			 */
+			footerTitle: string;
+
+			/**
+			 * View to use for this section footer.
+			 */
+			footerView: Titanium.UI.View;
+
+			/**
+			 * Title of this section header.
+			 */
+			headerTitle: string;
+
+			/**
+			 * View to use for this section header.
+			 */
+			headerView: Titanium.UI.View;
+
+			/**
+			 * Number of rows in this section.
+			 */
+			readonly rowCount: number;
+
+			/**
+			 * Rows in this section.
+			 */
+			readonly rows: Titanium.UI.TableViewRow[];
+
+			/**
+			 * Adds a table view row to this section.
+			 */
+			add(row: Titanium.UI.TableViewRow): void;
+
+			/**
+			 * Removes a table view row from this section.
+			 */
+			remove(row: Titanium.UI.TableViewRow): void;
+
+			/**
+			 * Returns a row in this section.
+			 */
+			rowAtIndex(index: number): Titanium.UI.TableViewRow;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableViewSection.footerTitle> property.
+			 */
+			getFooterTitle(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableViewSection.footerTitle> property.
+			 */
+			setFooterTitle(footerTitle: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableViewSection.footerView> property.
+			 */
+			getFooterView(): Titanium.UI.View;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableViewSection.footerView> property.
+			 */
+			setFooterView(footerView: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableViewSection.headerTitle> property.
+			 */
+			getHeaderTitle(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableViewSection.headerTitle> property.
+			 */
+			setHeaderTitle(headerTitle: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableViewSection.headerView> property.
+			 */
+			getHeaderView(): Titanium.UI.View;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableViewSection.headerView> property.
+			 */
+			setHeaderView(headerView: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableViewSection.rowCount> property.
+			 */
+			getRowCount(): number;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableViewSection.rows> property.
+			 */
+			getRows(): Titanium.UI.TableViewRow[];
+
+		}
+
+		/**
+		 * A multiline text field that supports editing and scrolling.
+		 */
+		interface TextArea extends Titanium.UI.View {
+			/**
+			 * Determines the appearance of the keyboard displayed when this text area is focused.
+			 */
+			appearance: number;
+
+			/**
+			 * Determines the appearance of the keyboard displayed when this text area is focused.
+			 */
+			keyboardAppearance: number;
+
+			/**
+			 * Hint text attributed string.
+			 */
+			attributedHintText: Titanium.UI.AttributedString;
+
+			/**
+			 * TextArea attributed string.
+			 */
+			attributedString: Titanium.UI.AttributedString;
+
+			/**
+			 * Determines how text is capitalized during typing.
+			 */
+			autocapitalization: number;
+
+			/**
+			 * Determines whether to automatically correct text entered into this text area.
+			 */
+			autocorrect: boolean;
+
+			/**
+			 * Sets the autofill type for the text area.
+			 */
+			autofillType: string;
+
+			/**
+			 * Automatically convert text to clickable links.
+			 */
+			autoLink: number;
+
+			/**
+			 * Determines whether the value of this text area should be cleared when it is focused.
+			 */
+			clearOnEdit: boolean;
+
+			/**
+			 * Color of the text in this text area, as a color name or hex triplet.
+			 */
+			color: string;
+
+			/**
+			 * Determines whether this field can be edited.
+			 */
+			editable: boolean;
+
+			/**
+			 * Determines whether an ellipsis (`...`) should be used to indicate truncated text.
+			 */
+			ellipsize: boolean;
+
+			/**
+			 * Determines whether the return key is enabled automatically when there is text in this text
+			 * area.
+			 */
+			enableReturnKey: boolean;
+
+			/**
+			 * Font to use for text.
+			 */
+			font: Font;
+
+			/**
+			 * Leave some space above the keyboard in landscape mode or not.
+			 */
+			fullscreen: boolean;
+
+			/**
+			 * Hint text to display when the field is empty.
+			 */
+			hintText: string;
+
+			/**
+			 * Color of hint text that displays when field is empty.
+			 */
+			hintTextColor: string;
+
+			/**
+			 * Hint type to display on the text field.
+			 */
+			hintType: number;
+
+			/**
+			 * Specifies if the text area should allow user interaction with the given URL in the given range of text.
+			 */
+			handleLinks: boolean;
+
+			/**
+			 * Array of toolbar button objects or a [toolbar](Titanium.UI.iOS.Toolbar) to be used when the
+			 * keyboard is displayed.
+			 */
+			keyboardToolbar: Titanium.UI.View[] | Titanium.UI.iOS.Toolbar;
+
+			/**
+			 * Color of the keyboard toolbar if keyboardToolbar is an array, as a color name or hex triplet.
+			 */
+			keyboardToolbarColor: string;
+
+			/**
+			 * Height of the keyboard toolbar if keyboardToolbar is an array.
+			 */
+			keyboardToolbarHeight: number;
+
+			/**
+			 * Keyboard type to display when this text area is focused.
+			 */
+			keyboardType: number;
+
+			/**
+			 * Maximum length of text field input.
+			 */
+			maxLength: number;
+
+			/**
+			 * Sets the left and right padding of this TextArea. The text will always be vertically centered.
+			 */
+			padding: TextAreaPadding;
+
+			/**
+			 * Specifies the text to display on the keyboard `Return` key when this text area is focused.
+			 */
+			returnKeyType: number;
+
+			/**
+			 * Controls whether the scroll-to-top gesture is effective.
+			 */
+			scrollsToTop: boolean;
+
+			/**
+			 * Determinates if the undo and redo buttons on the left side of the keyboard should be displayed or not. Only valid on iOS9 and above. This property can only be set upon creation.
+			 */
+			showUndoRedoActions: boolean;
+
+			/**
+			 * Determines if the return key should be suppressed during text entry.
+			 */
+			suppressReturn: boolean;
+
+			/**
+			 * Text alignment within this text area.
+			 * This has no effect on `hintText` when `hintType` is Ti.UI.HINT_TYPE_ANIMATED.
+			 */
+			textAlign: string | number;
+
+			/**
+			 * Value of this text area, which may be set programmatically and modified by the user.
+			 */
+			value: string;
+
+			/**
+			 * Determines whether this text area can be scrolled.
+			 */
+			scrollable: boolean;
+
+			/**
+			 * Returns the currently selected text of the text area.
+			 */
+			readonly selection: textAreaSelectedParams;
+
+			/**
+			 * Vertical alignment within this text area.
+			 */
+			verticalAlign: number | string;
+
+			/**
+			 * Forces this text area to lose focus.
+			 */
+			blur(): void;
+
+			/**
+			 * Forces this text area to gain focus.
+			 */
+			focus(): void;
+
+			/**
+			 * Returns `true` if this text area contains text.
+			 */
+			hasText(): boolean;
+
+			/**
+			 * Selects the text in range (start, end).
+			 */
+			setSelection(start: number, end: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextArea.appearance> property.
+			 */
+			getAppearance(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextArea.appearance> property.
+			 */
+			setAppearance(appearance: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextArea.keyboardAppearance> property.
+			 */
+			getKeyboardAppearance(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextArea.keyboardAppearance> property.
+			 */
+			setKeyboardAppearance(keyboardAppearance: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextArea.attributedHintText> property.
+			 */
+			getAttributedHintText(): Titanium.UI.AttributedString;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextArea.attributedHintText> property.
+			 */
+			setAttributedHintText(attributedHintText: Titanium.UI.AttributedString): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextArea.attributedString> property.
+			 */
+			getAttributedString(): Titanium.UI.AttributedString;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextArea.attributedString> property.
+			 */
+			setAttributedString(attributedString: Titanium.UI.AttributedString): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextArea.autocapitalization> property.
+			 */
+			getAutocapitalization(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextArea.autocapitalization> property.
+			 */
+			setAutocapitalization(autocapitalization: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextArea.autocorrect> property.
+			 */
+			getAutocorrect(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextArea.autocorrect> property.
+			 */
+			setAutocorrect(autocorrect: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextArea.autofillType> property.
+			 */
+			getAutofillType(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextArea.autofillType> property.
+			 */
+			setAutofillType(autofillType: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextArea.autoLink> property.
+			 */
+			getAutoLink(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextArea.autoLink> property.
+			 */
+			setAutoLink(autoLink: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextArea.clearOnEdit> property.
+			 */
+			getClearOnEdit(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextArea.clearOnEdit> property.
+			 */
+			setClearOnEdit(clearOnEdit: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextArea.color> property.
+			 */
+			getColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextArea.color> property.
+			 */
+			setColor(color: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextArea.editable> property.
+			 */
+			getEditable(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextArea.editable> property.
+			 */
+			setEditable(editable: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextArea.ellipsize> property.
+			 */
+			getEllipsize(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextArea.ellipsize> property.
+			 */
+			setEllipsize(ellipsize: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextArea.enableReturnKey> property.
+			 */
+			getEnableReturnKey(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextArea.enableReturnKey> property.
+			 */
+			setEnableReturnKey(enableReturnKey: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextArea.font> property.
+			 */
+			getFont(): Font;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextArea.font> property.
+			 */
+			setFont(font: Font): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextArea.fullscreen> property.
+			 */
+			getFullscreen(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextArea.fullscreen> property.
+			 */
+			setFullscreen(fullscreen: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextArea.hintText> property.
+			 */
+			getHintText(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextArea.hintText> property.
+			 */
+			setHintText(hintText: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextArea.hintTextColor> property.
+			 */
+			getHintTextColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextArea.hintTextColor> property.
+			 */
+			setHintTextColor(hintTextColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextArea.hintType> property.
+			 */
+			getHintType(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextArea.hintType> property.
+			 */
+			setHintType(hintType: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextArea.handleLinks> property.
+			 */
+			getHandleLinks(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextArea.handleLinks> property.
+			 */
+			setHandleLinks(handleLinks: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextArea.keyboardToolbar> property.
+			 */
+			getKeyboardToolbar(): Titanium.UI.View[] | Titanium.UI.iOS.Toolbar;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextArea.keyboardToolbar> property.
+			 */
+			setKeyboardToolbar(keyboardToolbar: any[]): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextArea.keyboardToolbar> property.
+			 */
+			setKeyboardToolbar(keyboardToolbar: Titanium.UI.iOS.Toolbar): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextArea.keyboardToolbarColor> property.
+			 */
+			getKeyboardToolbarColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextArea.keyboardToolbarColor> property.
+			 */
+			setKeyboardToolbarColor(keyboardToolbarColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextArea.keyboardToolbarHeight> property.
+			 */
+			getKeyboardToolbarHeight(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextArea.keyboardToolbarHeight> property.
+			 */
+			setKeyboardToolbarHeight(keyboardToolbarHeight: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextArea.keyboardType> property.
+			 */
+			getKeyboardType(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextArea.keyboardType> property.
+			 */
+			setKeyboardType(keyboardType: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextArea.maxLength> property.
+			 */
+			getMaxLength(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextArea.maxLength> property.
+			 */
+			setMaxLength(maxLength: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextArea.padding> property.
+			 */
+			getPadding(): TextAreaPadding;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextArea.padding> property.
+			 */
+			setPadding(padding: TextAreaPadding): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextArea.returnKeyType> property.
+			 */
+			getReturnKeyType(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextArea.returnKeyType> property.
+			 */
+			setReturnKeyType(returnKeyType: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextArea.scrollsToTop> property.
+			 */
+			getScrollsToTop(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextArea.scrollsToTop> property.
+			 */
+			setScrollsToTop(scrollsToTop: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextArea.showUndoRedoActions> property.
+			 */
+			getShowUndoRedoActions(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextArea.showUndoRedoActions> property.
+			 */
+			setShowUndoRedoActions(showUndoRedoActions: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextArea.suppressReturn> property.
+			 */
+			getSuppressReturn(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextArea.suppressReturn> property.
+			 */
+			setSuppressReturn(suppressReturn: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextArea.textAlign> property.
+			 */
+			getTextAlign(): string | number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextArea.textAlign> property.
+			 */
+			setTextAlign(textAlign: string): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextArea.textAlign> property.
+			 */
+			setTextAlign(textAlign: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextArea.value> property.
+			 */
+			getValue(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextArea.value> property.
+			 */
+			setValue(value: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextArea.scrollable> property.
+			 */
+			getScrollable(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextArea.scrollable> property.
+			 */
+			setScrollable(scrollable: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextArea.selection> property.
+			 */
+			getSelection(): textAreaSelectedParams;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextArea.verticalAlign> property.
+			 */
+			getVerticalAlign(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextArea.verticalAlign> property.
+			 */
+			setVerticalAlign(verticalAlign: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextArea.verticalAlign> property.
+			 */
+			setVerticalAlign(verticalAlign: string): void;
+
+		}
+
+		/**
+		 * A single line text field.
+		 */
+		interface TextField extends Titanium.UI.View {
+			/**
+			 * Determines the appearance of the keyboard displayed when this field is focused.
+			 */
+			appearance: number;
+
+			/**
+			 * Determines the appearance of the keyboard displayed when this field is focused.
+			 */
+			keyboardAppearance: number;
+
+			/**
+			 * TextField attributed string.
+			 */
+			attributedString: Titanium.UI.AttributedString;
+
+			/**
+			 * Hint text attributed string.
+			 */
+			attributedHintText: Titanium.UI.AttributedString;
+
+			/**
+			 * Determines how text is capitalized during typing.
+			 */
+			autocapitalization: number;
+
+			/**
+			 * Determines whether to automatically correct text entered into this text field.
+			 */
+			autocorrect: boolean;
+
+			/**
+			 * Sets the autofill type for the text field.
+			 */
+			autofillType: string;
+
+			/**
+			 * Automatically convert text to clickable links.
+			 */
+			autoLink: number;
+
+			/**
+			 * Border style for the field.
+			 */
+			borderStyle: number;
+
+			/**
+			 * Determines when the clear button is displayed.
+			 */
+			clearButtonMode: number;
+
+			/**
+			 * Determines whether the value of this text field should be cleared when it is focused.
+			 */
+			clearOnEdit: boolean;
+
+			/**
+			 * Color of the text in this text field, as a color name or hex triplet.
+			 */
+			color: string;
+
+			/**
+			 * Determines whether this field can be edited.
+			 */
+			editable: boolean;
+
+			/**
+			 * Determines whether an ellipsis (`...`) should be used to indicate truncated text.
+			 */
+			ellipsize: boolean;
+
+			/**
+			 * Determines whether the return key is enabled automatically when there is text in this text
+			 * field.
+			 */
+			enableReturnKey: boolean;
+
+			/**
+			 * Font to use for text.
+			 */
+			font: Font;
+
+			/**
+			 * Leave some space above the keyboard in landscape mode or not.
+			 */
+			fullscreen: boolean;
+
+			/**
+			 * Hint text to display when the field is empty.
+			 */
+			hintText: string;
+
+			/**
+			 * Hint text color to display when the field is empty.
+			 */
+			hintTextColor: string;
+
+			/**
+			 * Key identifying a string from the locale file to use for the
+			 * [hintText](Titanium.UI.TextField.hintText) property.
+			 */
+			hinttextid: string;
+
+			/**
+			 * Hint type to display on the text field.
+			 */
+			hintType: number;
+
+			/**
+			 * Input type to accept in the text field. Also influences the Keyboard type to display.
+			 */
+			inputType: number[];
+
+			/**
+			 * Array of toolbar button objects or a [toolbar](Titanium.UI.iOS.Toolbar) to be used when the
+			 * keyboard is displayed.
+			 */
+			keyboardToolbar: Titanium.UI.View[] | Titanium.UI.iOS.Toolbar;
+
+			/**
+			 * Color of the keyboard toolbar if keyboardToolbar is an array, as a color name or hex triplet.
+			 */
+			keyboardToolbarColor: string;
+
+			/**
+			 * Height of the keyboard toolbar if keyboardToolbar is an array.
+			 */
+			keyboardToolbarHeight: number;
+
+			/**
+			 * Keyboard type to display when this text field is focused.
+			 */
+			keyboardType: number;
+
+			/**
+			 * Left button view to display in the `TextField`.
+			 */
+			leftButton: any;
+
+			/**
+			 * Determines when to display the left button view.
+			 */
+			leftButtonMode: number;
+
+			/**
+			 * Padding between the left button and the edge of the field.
+			 */
+			leftButtonPadding: number;
+
+			/**
+			 * Minimum size of the font when the font is sized based on the contents.  Enables font
+			 * scaling to fit.
+			 */
+			minimumFontSize: number;
+
+			/**
+			 * Sets the padding of this text field.
+			 */
+			padding: TextFieldPadding;
+
+			/**
+			 * Left padding of this text field.
+			 */
+			paddingLeft: number;
+
+			/**
+			 * Right padding of this text field.
+			 */
+			paddingRight: number;
+
+			/**
+			 * Obscure the input text from the user.
+			 */
+			passwordMask: boolean;
+
+			/**
+			 * Specifies the text to display on the keyboard `Return` key when this field is focused.
+			 */
+			returnKeyType: number;
+
+			/**
+			 * Right button view.
+			 */
+			rightButton: any;
+
+			/**
+			 * Determines when to display the right button view.
+			 */
+			rightButtonMode: number;
+
+			/**
+			 * Padding between the right button and the edge of the field.
+			 */
+			rightButtonPadding: number;
+
+			/**
+			 * Determines whether the return key should be suppressed during entry.
+			 */
+			suppressReturn: boolean;
+
+			/**
+			 * Returns the currently selected text of the text field.
+			 */
+			readonly selection: textFieldSelectedParams;
+
+			/**
+			 * Determinates if the undo and redo buttons on the left side of the keyboard should be displayed or not. Only valid on iOS9 and above.
+			 */
+			showUndoRedoActions: boolean;
+
+			/**
+			 * Text alignment within this text field.
+			 * This has no effect on `hintText` when `hintType` is Ti.UI.HINT_TYPE_ANIMATED.
+			 */
+			textAlign: string | number;
+
+			/**
+			 * Value of this text field, which may be set programmatically and modified by the user.
+			 */
+			value: string;
+
+			/**
+			 * Vertical alignment within this text field.
+			 */
+			verticalAlign: number | string;
+
+			/**
+			 * Maximum length of text field input.
+			 */
+			maxLength: number;
+
+			/**
+			 * Forces the field to lose focus.
+			 */
+			blur(): void;
+
+			/**
+			 * Forces the field to gain focus.
+			 */
+			focus(): void;
+
+			/**
+			 * Returns `true` if this text field contains text.
+			 */
+			hasText(): boolean;
+
+			/**
+			 * Selects the text in range (start, end).
+			 */
+			setSelection(start: number, end: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextField.appearance> property.
+			 */
+			getAppearance(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextField.appearance> property.
+			 */
+			setAppearance(appearance: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextField.keyboardAppearance> property.
+			 */
+			getKeyboardAppearance(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextField.keyboardAppearance> property.
+			 */
+			setKeyboardAppearance(keyboardAppearance: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextField.attributedString> property.
+			 */
+			getAttributedString(): Titanium.UI.AttributedString;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextField.attributedString> property.
+			 */
+			setAttributedString(attributedString: Titanium.UI.AttributedString): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextField.attributedHintText> property.
+			 */
+			getAttributedHintText(): Titanium.UI.AttributedString;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextField.attributedHintText> property.
+			 */
+			setAttributedHintText(attributedHintText: Titanium.UI.AttributedString): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextField.autocapitalization> property.
+			 */
+			getAutocapitalization(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextField.autocapitalization> property.
+			 */
+			setAutocapitalization(autocapitalization: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextField.autocorrect> property.
+			 */
+			getAutocorrect(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextField.autocorrect> property.
+			 */
+			setAutocorrect(autocorrect: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextField.autofillType> property.
+			 */
+			getAutofillType(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextField.autofillType> property.
+			 */
+			setAutofillType(autofillType: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextField.autoLink> property.
+			 */
+			getAutoLink(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextField.autoLink> property.
+			 */
+			setAutoLink(autoLink: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextField.borderStyle> property.
+			 */
+			getBorderStyle(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextField.borderStyle> property.
+			 */
+			setBorderStyle(borderStyle: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextField.clearButtonMode> property.
+			 */
+			getClearButtonMode(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextField.clearButtonMode> property.
+			 */
+			setClearButtonMode(clearButtonMode: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextField.clearOnEdit> property.
+			 */
+			getClearOnEdit(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextField.clearOnEdit> property.
+			 */
+			setClearOnEdit(clearOnEdit: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextField.color> property.
+			 */
+			getColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextField.color> property.
+			 */
+			setColor(color: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextField.editable> property.
+			 */
+			getEditable(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextField.editable> property.
+			 */
+			setEditable(editable: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextField.ellipsize> property.
+			 */
+			getEllipsize(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextField.ellipsize> property.
+			 */
+			setEllipsize(ellipsize: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextField.enableReturnKey> property.
+			 */
+			getEnableReturnKey(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextField.enableReturnKey> property.
+			 */
+			setEnableReturnKey(enableReturnKey: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextField.font> property.
+			 */
+			getFont(): Font;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextField.font> property.
+			 */
+			setFont(font: Font): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextField.fullscreen> property.
+			 */
+			getFullscreen(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextField.fullscreen> property.
+			 */
+			setFullscreen(fullscreen: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextField.hintText> property.
+			 */
+			getHintText(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextField.hintText> property.
+			 */
+			setHintText(hintText: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextField.hintTextColor> property.
+			 */
+			getHintTextColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextField.hintTextColor> property.
+			 */
+			setHintTextColor(hintTextColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextField.hinttextid> property.
+			 */
+			getHinttextid(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextField.hinttextid> property.
+			 */
+			setHinttextid(hinttextid: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextField.hintType> property.
+			 */
+			getHintType(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextField.hintType> property.
+			 */
+			setHintType(hintType: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextField.inputType> property.
+			 */
+			getInputType(): number[];
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextField.inputType> property.
+			 */
+			setInputType(inputType: ReadonlyArray<number>): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextField.keyboardToolbar> property.
+			 */
+			getKeyboardToolbar(): Titanium.UI.View[] | Titanium.UI.iOS.Toolbar;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextField.keyboardToolbar> property.
+			 */
+			setKeyboardToolbar(keyboardToolbar: any[]): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextField.keyboardToolbar> property.
+			 */
+			setKeyboardToolbar(keyboardToolbar: Titanium.UI.iOS.Toolbar): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextField.keyboardToolbarColor> property.
+			 */
+			getKeyboardToolbarColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextField.keyboardToolbarColor> property.
+			 */
+			setKeyboardToolbarColor(keyboardToolbarColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextField.keyboardToolbarHeight> property.
+			 */
+			getKeyboardToolbarHeight(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextField.keyboardToolbarHeight> property.
+			 */
+			setKeyboardToolbarHeight(keyboardToolbarHeight: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextField.keyboardType> property.
+			 */
+			getKeyboardType(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextField.keyboardType> property.
+			 */
+			setKeyboardType(keyboardType: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextField.leftButton> property.
+			 */
+			getLeftButton(): any;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextField.leftButton> property.
+			 */
+			setLeftButton(leftButton: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextField.leftButtonMode> property.
+			 */
+			getLeftButtonMode(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextField.leftButtonMode> property.
+			 */
+			setLeftButtonMode(leftButtonMode: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextField.leftButtonPadding> property.
+			 */
+			getLeftButtonPadding(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextField.leftButtonPadding> property.
+			 */
+			setLeftButtonPadding(leftButtonPadding: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextField.minimumFontSize> property.
+			 */
+			getMinimumFontSize(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextField.minimumFontSize> property.
+			 */
+			setMinimumFontSize(minimumFontSize: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextField.padding> property.
+			 */
+			getPadding(): TextFieldPadding;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextField.padding> property.
+			 */
+			setPadding(padding: TextFieldPadding): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextField.paddingLeft> property.
+			 */
+			getPaddingLeft(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextField.paddingLeft> property.
+			 */
+			setPaddingLeft(paddingLeft: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextField.paddingRight> property.
+			 */
+			getPaddingRight(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextField.paddingRight> property.
+			 */
+			setPaddingRight(paddingRight: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextField.passwordMask> property.
+			 */
+			getPasswordMask(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextField.passwordMask> property.
+			 */
+			setPasswordMask(passwordMask: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextField.returnKeyType> property.
+			 */
+			getReturnKeyType(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextField.returnKeyType> property.
+			 */
+			setReturnKeyType(returnKeyType: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextField.rightButton> property.
+			 */
+			getRightButton(): any;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextField.rightButton> property.
+			 */
+			setRightButton(rightButton: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextField.rightButtonMode> property.
+			 */
+			getRightButtonMode(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextField.rightButtonMode> property.
+			 */
+			setRightButtonMode(rightButtonMode: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextField.rightButtonPadding> property.
+			 */
+			getRightButtonPadding(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextField.rightButtonPadding> property.
+			 */
+			setRightButtonPadding(rightButtonPadding: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextField.suppressReturn> property.
+			 */
+			getSuppressReturn(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextField.suppressReturn> property.
+			 */
+			setSuppressReturn(suppressReturn: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextField.selection> property.
+			 */
+			getSelection(): textFieldSelectedParams;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextField.showUndoRedoActions> property.
+			 */
+			getShowUndoRedoActions(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextField.showUndoRedoActions> property.
+			 */
+			setShowUndoRedoActions(showUndoRedoActions: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextField.textAlign> property.
+			 */
+			getTextAlign(): string | number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextField.textAlign> property.
+			 */
+			setTextAlign(textAlign: string): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextField.textAlign> property.
+			 */
+			setTextAlign(textAlign: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextField.value> property.
+			 */
+			getValue(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextField.value> property.
+			 */
+			setValue(value: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextField.verticalAlign> property.
+			 */
+			getVerticalAlign(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextField.verticalAlign> property.
+			 */
+			setVerticalAlign(verticalAlign: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextField.verticalAlign> property.
+			 */
+			setVerticalAlign(verticalAlign: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TextField.maxLength> property.
+			 */
+			getMaxLength(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextField.maxLength> property.
+			 */
+			setMaxLength(maxLength: number): void;
+
+		}
+
+		/**
+		 * A toolbar, which can contain buttons and certain other controls.
+		 */
+		interface Toolbar extends Titanium.UI.View {
+			/**
+			 * Background color for the toolbar, as a color name or hex triplet.
+			 */
+			barColor: string;
+
+			/**
+			 * An array of buttons (or other widgets) contained in the toolbar.
+			 */
+			items: Titanium.UI.View[];
+
+			/**
+			 * If `true`, the background of the toolbar extends upwards.
+			 */
+			extendBackground: boolean;
+
+			/**
+			 * If `true`, a translucent background color is used for the toolbar.
+			 */
+			translucent: boolean;
+
+			/**
+			 * Returns the margin after the toolbar's content when there are action buttons.
+			 */
+			contentInsetEndWithActions: number;
+
+			/**
+			 * Returns the margin at the toolbar's content start when there is a navigation button.
+			 */
+			contentInsetStartWithNavigation: number;
+
+			/**
+			 * Image to be used as a logo in the Toolbar.
+			 */
+			logo: string | Titanium.Blob | Titanium.Filesystem.File;
+
+			/**
+			 * Image to be used for a navigation icon.
+			 */
+			navigationIcon: string | Titanium.Blob | Titanium.Filesystem.File;
+
+			/**
+			 * Image to be used for the overflow menu.
+			 */
+			overflowIcon: string | Titanium.Blob | Titanium.Filesystem.File;
+
+			/**
+			 * Text of the subtitle.
+			 */
+			subtitle: string;
+
+			/**
+			 * Color for toolbar's subtitle
+			 */
+			subtitleTextColor: string;
+
+			/**
+			 * Text of the title.
+			 */
+			title: string;
+
+			/**
+			 * Color string with any Titanium supported format
+			 */
+			titleTextColor: string;
+
+			/**
+			 * Collapses expanded ActionViews if there is any
+			 */
+			collapseActionViews(): void;
+
+			/**
+			 * Collapses expandend ActionViews and hides overflow menu
+			 */
+			dismissPopupMenus(): void;
+
+			/**
+			 * Returns the margin at the toolbar's content end.
+			 */
+			getContentInsetEnd(): number;
+
+			/**
+			 * Returns the margin on the left of the toolbar's content.
+			 */
+			getContentInsetLeft(): number;
+
+			/**
+			 * Returns the margin on the right of the toolbar's content.
+			 */
+			getContentInsetRight(): number;
+
+			/**
+			 * Returns the margin at the toolbar's content start.
+			 */
+			getContentInsetStart(): number;
+
+			/**
+			 * Returns the margin at the toolbar's content end that will be used with the current configuration of the toolbar.
+			 */
+			getCurrentContentInsetEnd(): number;
+
+			/**
+			 * Returns the margin on the left of the toolbar's content that will be used with the current configuration of the toolbar.
+			 */
+			getCurrentContentInsetLeft(): number;
+
+			/**
+			 * Returns the margin on the right of the toolbar's content that will be used with the current configuration of the toolbar.
+			 */
+			getCurrentContentInsetRight(): number;
+
+			/**
+			 * Returns the margin at the toolbar's content start that will be used with the current configuration of the toolbar.
+			 */
+			getCurrentContentInsetStart(): number;
+
+			/**
+			 * Checks if the toolbar is currently hosting an expanded action view.
+			 */
+			hasExpandedActionView(): boolean;
+
+			/**
+			 * Hides the overflow menu if there is one.
+			 */
+			hideOverflowMenu(): void;
+
+			/**
+			 * Checks if the toolbar is currently hosting an expanded action view.
+			 */
+			isOverflowMenuShowing(): boolean;
+
+			/**
+			 * Sets the content margins of the toolbar
+			 */
+			setContentInsetsAbsolute(insetLeft: number, insetRight: number): void;
+
+			/**
+			 * Sets the content margins relative to the layout direction
+			 */
+			setContentInsetsRelative(insetStart: number, insetEnd: number): void;
+
+			/**
+			 * Shows the overflow menu if there is one
+			 */
+			showOverflowMenu(): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Toolbar.barColor> property.
+			 */
+			getBarColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Toolbar.barColor> property.
+			 */
+			setBarColor(barColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Toolbar.items> property.
+			 */
+			getItems(): Titanium.UI.View[];
+
+			/**
+			 * Sets the value of the <Titanium.UI.Toolbar.items> property.
+			 */
+			setItems(items: any[]): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Toolbar.translucent> property.
+			 */
+			getTranslucent(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Toolbar.translucent> property.
+			 */
+			setTranslucent(translucent: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Toolbar.contentInsetEndWithActions> property.
+			 */
+			getContentInsetEndWithActions(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Toolbar.contentInsetEndWithActions> property.
+			 */
+			setContentInsetEndWithActions(contentInsetEndWithActions: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Toolbar.contentInsetStartWithNavigation> property.
+			 */
+			getContentInsetStartWithNavigation(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Toolbar.contentInsetStartWithNavigation> property.
+			 */
+			setContentInsetStartWithNavigation(contentInsetStartWithNavigation: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Toolbar.logo> property.
+			 */
+			getLogo(): string | Titanium.Blob | Titanium.Filesystem.File;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Toolbar.logo> property.
+			 */
+			setLogo(logo: string): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Toolbar.logo> property.
+			 */
+			setLogo(logo: Titanium.Blob): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Toolbar.logo> property.
+			 */
+			setLogo(logo: Titanium.Filesystem.File): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Toolbar.navigationIcon> property.
+			 */
+			getNavigationIcon(): string | Titanium.Blob | Titanium.Filesystem.File;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Toolbar.navigationIcon> property.
+			 */
+			setNavigationIcon(navigationIcon: string): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Toolbar.navigationIcon> property.
+			 */
+			setNavigationIcon(navigationIcon: Titanium.Blob): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Toolbar.navigationIcon> property.
+			 */
+			setNavigationIcon(navigationIcon: Titanium.Filesystem.File): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Toolbar.overflowIcon> property.
+			 */
+			getOverflowIcon(): string | Titanium.Blob | Titanium.Filesystem.File;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Toolbar.overflowIcon> property.
+			 */
+			setOverflowIcon(overflowIcon: string): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Toolbar.overflowIcon> property.
+			 */
+			setOverflowIcon(overflowIcon: Titanium.Blob): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Toolbar.overflowIcon> property.
+			 */
+			setOverflowIcon(overflowIcon: Titanium.Filesystem.File): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Toolbar.subtitle> property.
+			 */
+			getSubtitle(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Toolbar.subtitle> property.
+			 */
+			setSubtitle(subtitle: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Toolbar.subtitleTextColor> property.
+			 */
+			getSubtitleTextColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Toolbar.subtitleTextColor> property.
+			 */
+			setSubtitleTextColor(subtitleTextColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Toolbar.title> property.
+			 */
+			getTitle(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Toolbar.title> property.
+			 */
+			setTitle(title: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Toolbar.titleTextColor> property.
+			 */
+			getTitleTextColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Toolbar.titleTextColor> property.
+			 */
+			setTitleTextColor(titleTextColor: string): void;
+
+		}
+
+		/**
+		 * The web view allows you to open an HTML5 based view which can load either local or remote content.
+		 */
+		interface WebView extends Titanium.UI.View {
+			/**
+			 * A Boolean value that determines whether pressing on a link displays a preview of the
+			 * destination for the link.
+			 */
+			allowsLinkPreview: boolean;
+
+			/**
+			 * An array of url strings to blacklist.
+			 */
+			blacklistedURLs: string[];
+
+			/**
+			 * Web content to load.
+			 */
+			data: Titanium.Blob | Titanium.Filesystem.File;
+
+			/**
+			 * Determines whether the view will bounce when scrolling to the edge of the scrollable region.
+			 */
+			disableBounce: boolean;
+
+			/**
+			 * Determines whether or not the webview should not be able to display the context menu.
+			 */
+			disableContextMenu: boolean;
+
+			/**
+			 * Enable adding javascript interfaces internally to webview prior to JELLY_BEAN_MR1 (Android 4.2)
+			 */
+			enableJavascriptInterface: boolean;
+
+			/**
+			 * Lets the webview handle platform supported urls
+			 */
+			handlePlatformUrl: boolean;
+
+			/**
+			 * Hides activity indicator when loading remote URL.
+			 */
+			hideLoadIndicator: boolean;
+
+			/**
+			 * HTML content of this web view.
+			 */
+			html: string;
+
+			/**
+			 * A Boolean value indicating whether web content can programmatically display the keyboard.
+			 */
+			keyboardDisplayRequiresUserAction: boolean;
+
+			/**
+			 * Controls whether to ignore invalid SSL certificates or not.
+			 */
+			ignoreSslError: boolean;
+
+			/**
+			 * Indicates if the webview is loading content.
+			 */
+			loading: boolean;
+
+			/**
+			 * Callback function called when there is a request for the application to create a new window
+			 * to host new content.
+			 */
+			onCreateWindow: (param0: any) => any;
+
+			/**
+			 * Determines the behavior when the user overscrolls the view.
+			 */
+			overScrollMode: number;
+
+			/**
+			 * Determines how a cache is used in this web view.
+			 */
+			cacheMode: number;
+
+			/**
+			 * Determines how to treat content that requires plugins in this web view.
+			 */
+			pluginState: number;
+
+			/**
+			 * Controls whether the scroll-to-top gesture is effective.
+			 */
+			scrollsToTop: boolean;
+
+			/**
+			 * If `true`, zoom controls are enabled.
+			 */
+			enableZoomControls: boolean;
+
+			/**
+			 * If `true`, scale contents to fit the web view.
+			 */
+			scalesPageToFit: boolean;
+
+			/**
+			 * URL to the web document.
+			 */
+			url: string;
+
+			/**
+			 * The User-Agent header used by the web view when requesting content.
+			 */
+			userAgent: string;
+
+			/**
+			 * Explicitly specifies if this web view handles touches.
+			 */
+			willHandleTouches: boolean;
+
+			/**
+			 * Enables using light touches to make a selection and activate mouseovers.
+			 */
+			lightTouchEnabled: boolean;
+
+			/**
+			 * Sets extra request headers for this web view to use on subsequent URL requests.
+			 */
+			requestHeaders: any;
+
+			/**
+			 * Sets the value of [html](Titanium.UI.WebView.html) property.
+			 */
+			setHtml(html: any, options?: any): void;
+
+			/**
+			 * Returns `true` if the web view can go back in its history list.
+			 */
+			canGoBack(): boolean;
+
+			/**
+			 * Returns `true` if the web view can go forward in its history list.
+			 */
+			canGoForward(): boolean;
+
+			/**
+			 * Evaluates a JavaScript expression inside the context of the web view and
+			 * optionally, returns a result.
+			 */
+			evalJS(code: string): string;
+
+			/**
+			 * Goes back one entry in the web view's history list, to the previous page.
+			 */
+			goBack(): void;
+
+			/**
+			 * Goes forward one entry in this web view's history list, if possible.
+			 */
+			goForward(): void;
+
+			/**
+			 * Pauses native webview plugins.
+			 */
+			pause(): void;
+
+			/**
+			 * Reloads the current webpage.
+			 */
+			reload(): void;
+
+			/**
+			 * Forces the web view to repaint its contents.
+			 */
+			repaint(): void;
+
+			/**
+			 * Releases memory when the web view is no longer needed.
+			 */
+			release(): void;
+
+			/**
+			 * Resume native webview plugins.
+			 */
+			resume(): void;
+
+			/**
+			 * Sets the basic authentication for this web view to use on subsequent URl requests.
+			 */
+			setBasicAuthentication(username: string, password: string): void;
+
+			/**
+			 * Stops loading a currently loading page.
+			 */
+			stopLoading(): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.WebView.allowsLinkPreview> property.
+			 */
+			getAllowsLinkPreview(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.WebView.allowsLinkPreview> property.
+			 */
+			setAllowsLinkPreview(allowsLinkPreview: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.WebView.blacklistedURLs> property.
+			 */
+			getBlacklistedURLs(): string[];
+
+			/**
+			 * Sets the value of the <Titanium.UI.WebView.blacklistedURLs> property.
+			 */
+			setBlacklistedURLs(blacklistedURLs: ReadonlyArray<string>): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.WebView.data> property.
+			 */
+			getData(): Titanium.Blob | Titanium.Filesystem.File;
+
+			/**
+			 * Sets the value of the <Titanium.UI.WebView.data> property.
+			 */
+			setData(data: Titanium.Blob): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.WebView.data> property.
+			 */
+			setData(data: Titanium.Filesystem.File): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.WebView.disableBounce> property.
+			 */
+			getDisableBounce(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.WebView.disableBounce> property.
+			 */
+			setDisableBounce(disableBounce: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.WebView.disableContextMenu> property.
+			 */
+			getDisableContextMenu(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.WebView.disableContextMenu> property.
+			 */
+			setDisableContextMenu(disableContextMenu: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.WebView.enableJavascriptInterface> property.
+			 */
+			getEnableJavascriptInterface(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.WebView.enableJavascriptInterface> property.
+			 */
+			setEnableJavascriptInterface(enableJavascriptInterface: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.WebView.handlePlatformUrl> property.
+			 */
+			getHandlePlatformUrl(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.WebView.handlePlatformUrl> property.
+			 */
+			setHandlePlatformUrl(handlePlatformUrl: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.WebView.hideLoadIndicator> property.
+			 */
+			getHideLoadIndicator(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.WebView.hideLoadIndicator> property.
+			 */
+			setHideLoadIndicator(hideLoadIndicator: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.WebView.html> property.
+			 */
+			getHtml(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.WebView.html> property.
+			 */
+			setHtml(html: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.WebView.keyboardDisplayRequiresUserAction> property.
+			 */
+			getKeyboardDisplayRequiresUserAction(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.WebView.keyboardDisplayRequiresUserAction> property.
+			 */
+			setKeyboardDisplayRequiresUserAction(keyboardDisplayRequiresUserAction: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.WebView.ignoreSslError> property.
+			 */
+			getIgnoreSslError(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.WebView.ignoreSslError> property.
+			 */
+			setIgnoreSslError(ignoreSslError: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.WebView.loading> property.
+			 */
+			getLoading(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.WebView.loading> property.
+			 */
+			setLoading(loading: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.WebView.onCreateWindow> property.
+			 */
+			getOnCreateWindow(): (param0: any) => any;
+
+			/**
+			 * Sets the value of the <Titanium.UI.WebView.onCreateWindow> property.
+			 */
+			setOnCreateWindow(onCreateWindow: (param0: any) => any): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.WebView.overScrollMode> property.
+			 */
+			getOverScrollMode(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.WebView.overScrollMode> property.
+			 */
+			setOverScrollMode(overScrollMode: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.WebView.cacheMode> property.
+			 */
+			getCacheMode(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.WebView.cacheMode> property.
+			 */
+			setCacheMode(cacheMode: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.WebView.pluginState> property.
+			 */
+			getPluginState(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.WebView.pluginState> property.
+			 */
+			setPluginState(pluginState: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.WebView.scrollsToTop> property.
+			 */
+			getScrollsToTop(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.WebView.scrollsToTop> property.
+			 */
+			setScrollsToTop(scrollsToTop: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.WebView.enableZoomControls> property.
+			 */
+			getEnableZoomControls(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.WebView.enableZoomControls> property.
+			 */
+			setEnableZoomControls(enableZoomControls: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.WebView.scalesPageToFit> property.
+			 */
+			getScalesPageToFit(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.WebView.scalesPageToFit> property.
+			 */
+			setScalesPageToFit(scalesPageToFit: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.WebView.url> property.
+			 */
+			getUrl(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.WebView.url> property.
+			 */
+			setUrl(url: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.WebView.userAgent> property.
+			 */
+			getUserAgent(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.WebView.userAgent> property.
+			 */
+			setUserAgent(userAgent: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.WebView.willHandleTouches> property.
+			 */
+			getWillHandleTouches(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.WebView.willHandleTouches> property.
+			 */
+			setWillHandleTouches(willHandleTouches: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.WebView.lightTouchEnabled> property.
+			 */
+			getLightTouchEnabled(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.WebView.lightTouchEnabled> property.
+			 */
+			setLightTouchEnabled(lightTouchEnabled: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.WebView.requestHeaders> property.
+			 */
+			getRequestHeaders(): any;
+
+			/**
+			 * Sets the value of the <Titanium.UI.WebView.requestHeaders> property.
+			 */
+			setRequestHeaders(requestHeaders: any): void;
+
+		}
+
+		/**
+		 * The Window is an empty drawing surface or container.
+		 */
+		interface Window extends Titanium.UI.View {
+			/**
+			 * For lightweight windows, this property returns undefined.
+			 * For heavyweight windows, this property contains a reference to the
+			 * Android Activity object associated with this window.
+			 */
+			readonly activity: Titanium.Android.Activity;
+
+			/**
+			 * Title for the back button. This is only valid when the window is a child of a tab.
+			 */
+			backButtonTitle: string;
+
+			/**
+			 * The image to show as the back button. This is only valid when the window is a child of a tab.
+			 */
+			backButtonTitleImage: string | Titanium.Blob;
+
+			/**
+			 * Background color for the nav bar, as a color name or hex triplet.
+			 */
+			barColor: string;
+
+			/**
+			 * Background image for the nav bar, specified as a URL to a local image.
+			 */
+			barImage: string;
+
+			/**
+			 * Boolean value indicating if the application should exit when the Android
+			 * Back button is pressed while the window is being shown or when the window
+			 * is closed programmatically.
+			 */
+			exitOnClose: boolean;
+
+			/**
+			 * An array of supported values specified using the EXTEND_EDGE constants in <Titanium.UI>. Valid on iOS 7 and greater.
+			 */
+			extendEdges: number[];
+
+			/**
+			 * Treat the content of the window as secure, preventing it from appearing in screenshots or from being viewed on non-secure displays.
+			 */
+			flagSecure: boolean;
+
+			/**
+			 * Specifies if the edges should extend beyond opaque bars (navigation bar, tab bar, toolbar). Valid on iOS 7 and greater.
+			 */
+			includeOpaqueBars: boolean;
+
+			/**
+			 * Specifies whether or not the view controller should automatically adjust its scroll view insets. Valid on iOS 7 and greater.
+			 */
+			autoAdjustScrollViewInsets: boolean;
+
+			/**
+			 * Specifies whether the content (subviews) of the window  will render inside the safe-area or not.
+			 * Only used in iOS 11.0 and later.
+			 */
+			extendSafeArea: boolean;
+
+			/**
+			 * Boolean value indicating if the window is fullscreen.
+			 */
+			fullscreen: boolean;
+
+			/**
+			 * Set this to true to hide the shadow image of the navigation bar.
+			 */
+			hideShadow: boolean;
+
+			/**
+			 * Set this to true to hide the navigation bar on swipe.
+			 */
+			hidesBarsOnSwipe: boolean;
+
+			/**
+			 * Set this to true to hide the navigation bar on tap.
+			 */
+			hidesBarsOnTap: boolean;
+
+			/**
+			 * Set this to true to hide the navigation bar when the keyboard appears.
+			 */
+			hidesBarsWhenKeyboardAppears: boolean;
+
+			/**
+			 * A Boolean value indicating whether the title should be displayed in a large format.
+			 */
+			largeTitleEnabled: string;
+
+			/**
+			 * The mode to use when displaying the title of the navigation bar.
+			 */
+			largeTitleDisplayMode: number;
+
+			/**
+			 * View to show in the left nav bar area.
+			 */
+			leftNavButton: Titanium.UI.View;
+
+			/**
+			 * An Array of views to show in the left nav bar area.
+			 */
+			leftNavButtons: Titanium.UI.View[];
+
+			/**
+			 * Indicates to open a modal window or not.
+			 */
+			modal: boolean;
+
+			/**
+			 * Hides the navigation bar (`true`) or shows the navigation bar (`false`).
+			 */
+			navBarHidden: boolean;
+
+			/**
+			 * The tintColor to apply to the navigation bar. This property is applicable on iOS 7 and greater.
+			 */
+			navTintColor: string;
+
+			/**
+			 * Callback function that overrides the default behavior when the user presses the **Back**
+			 * button.
+			 */
+			onBack: (param0: any) => any;
+
+			/**
+			 * Array of supported orientation modes, specified using the orientation
+			 * constants defined in <Titanium.UI>.
+			 */
+			orientationModes: number[];
+
+			/**
+			 * Current orientation of the window.
+			 */
+			readonly orientation: number;
+
+			/**
+			 * View to show in the right nav bar area.
+			 */
+			rightNavButton: Titanium.UI.View;
+
+			/**
+			 * An Array of views to show in the right nav bar area.
+			 */
+			rightNavButtons: Titanium.UI.View[];
+
+			/**
+			 * Shadow image for the navigation bar, specified as a URL to a local image..
+			 */
+			shadowImage: string;
+
+			/**
+			 * Boolean value to enable split action bar.
+			 */
+			splitActionBar: boolean;
+
+			/**
+			 * The status bar style associated with this window.
+			 */
+			statusBarStyle: number;
+
+			/**
+			 * Maintain a sustainable level of performance.
+			 */
+			sustainedPerformanceMode: boolean;
+
+			/**
+			 * Boolean value indicating if the user should be able to close a window using a swipe gesture.
+			 */
+			swipeToClose: boolean;
+
+			/**
+			 * Boolean value indicating if the tab bar should be hidden.
+			 */
+			tabBarHidden: boolean;
+
+			/**
+			 * Name of the theme to apply to the window.
+			 */
+			theme: string;
+
+			/**
+			 * Title of the window.
+			 */
+			title: string;
+
+			/**
+			 * Title text attributes of the window.
+			 */
+			titleAttributes: titleAttributesParams;
+
+			/**
+			 * View to show in the title area of the nav bar.
+			 */
+			titleControl: Titanium.UI.View;
+
+			/**
+			 * Image to show in the title area of the nav bar, specified as a local file path or URL.
+			 */
+			titleImage: string;
+
+			/**
+			 * Title prompt for the window.
+			 */
+			titlePrompt: string;
+
+			/**
+			 * Key identifying a string from the locale file to use for the window title.
+			 */
+			titleid: string;
+
+			/**
+			 * Key identifying a string from the locale file to use for the window title prompt.
+			 */
+			titlepromptid: string;
+
+			/**
+			 * Array of button objects to show in the window's toolbar.
+			 */
+			toolbar: any[];
+
+			/**
+			 * Use a transition animation when opening or closing windows in a
+			 * <Titanium.UI.iOS.NavigationWindow> or <Titanium.UI.Tab>.
+			 */
+			transitionAnimation: Titanium.Proxy;
+
+			/**
+			 * Boolean value indicating if the nav bar is translucent.
+			 */
+			translucent: boolean;
+
+			/**
+			 * Loads a JavaScript file from a local URL.
+			 */
+			url: string;
+
+			/**
+			 * Additional flags to set on the Activity Window.
+			 */
+			windowFlags: number;
+
+			/**
+			 * Determines whether a heavyweight window's soft input area (ie software keyboard) is visible
+			 * as it receives focus and how the window behaves in order to accomodate it while keeping its
+			 * contents in view.
+			 */
+			windowSoftInputMode: number;
+
+			/**
+			 * Set the pixel format for the Activity's Window.
+			 */
+			windowPixelFormat: number;
+
+			/**
+			 * The type of transition used when activity is exiting.
+			 */
+			activityExitTransition: number;
+
+			/**
+			 * The type of transition used when activity is entering.
+			 */
+			activityEnterTransition: number;
+
+			/**
+			 * The type of transition used when returning from a previously started activity.
+			 */
+			activityReturnTransition: number;
+
+			/**
+			 * The type of transition used when reentering to a previously started activity.
+			 */
+			activityReenterTransition: number;
+
+			/**
+			 * The type of exit transition used when animating shared elements between two activities.
+			 */
+			activitySharedElementExitTransition: number;
+
+			/**
+			 * The type of enter transition used when animating shared elements between two activities.
+			 */
+			activitySharedElementEnterTransition: number;
+
+			/**
+			 * The type of return transition used when animating shared elements between two activities.
+			 */
+			activitySharedElementReturnTransition: number;
+
+			/**
+			 * The type of reenter transition used when animating shared elements between two activities.
+			 */
+			activitySharedElementReenterTransition: number;
+
+			/**
+			 * Adds a common UI element to participate in window transition animation.
+			 */
+			addSharedElement(view: any, transitionName: string): void;
+
+			/**
+			 * Closes the window.
+			 */
+			close(params?: any): void;
+
+			/**
+			 * Hides the navigation bar.
+			 */
+			hideNavBar(options?: any): void;
+
+			/**
+			 * Hides the tab bar. Must be called before opening the window.
+			 */
+			hideTabBar(): void;
+
+			/**
+			 * Opens the window.
+			 */
+			open(params?: openWindowParams): void;
+
+			/**
+			 * Clears all added shared elements.
+			 */
+			removeAllSharedElements(): void;
+
+			/**
+			 * Sets the array of items to show in the window's toolbar.
+			 */
+			setToolbar(items: ReadonlyArray<any>, params?: windowToolbarParam): void;
+
+			/**
+			 * Makes the navigation bar visible.
+			 */
+			showNavBar(options?: any): void;
+
+			/**
+			 * Makes the bottom toolbar visible.
+			 */
+			showToolbar(options?: any): void;
+
+			/**
+			 * Makes the bottom toolbar invisible.
+			 */
+			hideToolbar(options?: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.activity> property.
+			 */
+			getActivity(): Titanium.Android.Activity;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.backButtonTitle> property.
+			 */
+			getBackButtonTitle(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.backButtonTitle> property.
+			 */
+			setBackButtonTitle(backButtonTitle: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.backButtonTitleImage> property.
+			 */
+			getBackButtonTitleImage(): string | Titanium.Blob;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.backButtonTitleImage> property.
+			 */
+			setBackButtonTitleImage(backButtonTitleImage: string): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.backButtonTitleImage> property.
+			 */
+			setBackButtonTitleImage(backButtonTitleImage: Titanium.Blob): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.barColor> property.
+			 */
+			getBarColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.barColor> property.
+			 */
+			setBarColor(barColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.barImage> property.
+			 */
+			getBarImage(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.barImage> property.
+			 */
+			setBarImage(barImage: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.exitOnClose> property.
+			 */
+			getExitOnClose(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.exitOnClose> property.
+			 */
+			setExitOnClose(exitOnClose: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.extendEdges> property.
+			 */
+			getExtendEdges(): number[];
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.extendEdges> property.
+			 */
+			setExtendEdges(extendEdges: ReadonlyArray<number>): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.flagSecure> property.
+			 */
+			getFlagSecure(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.flagSecure> property.
+			 */
+			setFlagSecure(flagSecure: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.includeOpaqueBars> property.
+			 */
+			getIncludeOpaqueBars(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.includeOpaqueBars> property.
+			 */
+			setIncludeOpaqueBars(includeOpaqueBars: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.autoAdjustScrollViewInsets> property.
+			 */
+			getAutoAdjustScrollViewInsets(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.autoAdjustScrollViewInsets> property.
+			 */
+			setAutoAdjustScrollViewInsets(autoAdjustScrollViewInsets: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.extendSafeArea> property.
+			 */
+			getExtendSafeArea(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.extendSafeArea> property.
+			 */
+			setExtendSafeArea(extendSafeArea: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.fullscreen> property.
+			 */
+			getFullscreen(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.fullscreen> property.
+			 */
+			setFullscreen(fullscreen: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.hideShadow> property.
+			 */
+			getHideShadow(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.hideShadow> property.
+			 */
+			setHideShadow(hideShadow: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.hidesBarsOnSwipe> property.
+			 */
+			getHidesBarsOnSwipe(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.hidesBarsOnSwipe> property.
+			 */
+			setHidesBarsOnSwipe(hidesBarsOnSwipe: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.hidesBarsOnTap> property.
+			 */
+			getHidesBarsOnTap(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.hidesBarsOnTap> property.
+			 */
+			setHidesBarsOnTap(hidesBarsOnTap: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.hidesBarsWhenKeyboardAppears> property.
+			 */
+			getHidesBarsWhenKeyboardAppears(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.hidesBarsWhenKeyboardAppears> property.
+			 */
+			setHidesBarsWhenKeyboardAppears(hidesBarsWhenKeyboardAppears: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.largeTitleEnabled> property.
+			 */
+			getLargeTitleEnabled(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.largeTitleEnabled> property.
+			 */
+			setLargeTitleEnabled(largeTitleEnabled: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.largeTitleDisplayMode> property.
+			 */
+			getLargeTitleDisplayMode(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.largeTitleDisplayMode> property.
+			 */
+			setLargeTitleDisplayMode(largeTitleDisplayMode: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.leftNavButton> property.
+			 */
+			getLeftNavButton(): Titanium.UI.View;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.leftNavButton> property.
+			 */
+			setLeftNavButton(leftNavButton: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.leftNavButtons> property.
+			 */
+			getLeftNavButtons(): Titanium.UI.View[];
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.leftNavButtons> property.
+			 */
+			setLeftNavButtons(leftNavButtons: any[]): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.modal> property.
+			 */
+			getModal(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.modal> property.
+			 */
+			setModal(modal: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.navBarHidden> property.
+			 */
+			getNavBarHidden(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.navBarHidden> property.
+			 */
+			setNavBarHidden(navBarHidden: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.navTintColor> property.
+			 */
+			getNavTintColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.navTintColor> property.
+			 */
+			setNavTintColor(navTintColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.onBack> property.
+			 */
+			getOnBack(): (param0: any) => any;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.onBack> property.
+			 */
+			setOnBack(onBack: (param0: any) => any): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.orientationModes> property.
+			 */
+			getOrientationModes(): number[];
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.orientationModes> property.
+			 */
+			setOrientationModes(orientationModes: ReadonlyArray<number>): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.orientation> property.
+			 */
+			getOrientation(): number;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.rightNavButton> property.
+			 */
+			getRightNavButton(): Titanium.UI.View;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.rightNavButton> property.
+			 */
+			setRightNavButton(rightNavButton: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.rightNavButtons> property.
+			 */
+			getRightNavButtons(): Titanium.UI.View[];
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.rightNavButtons> property.
+			 */
+			setRightNavButtons(rightNavButtons: any[]): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.shadowImage> property.
+			 */
+			getShadowImage(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.shadowImage> property.
+			 */
+			setShadowImage(shadowImage: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.splitActionBar> property.
+			 */
+			getSplitActionBar(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.splitActionBar> property.
+			 */
+			setSplitActionBar(splitActionBar: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.statusBarStyle> property.
+			 */
+			getStatusBarStyle(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.statusBarStyle> property.
+			 */
+			setStatusBarStyle(statusBarStyle: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.sustainedPerformanceMode> property.
+			 */
+			getSustainedPerformanceMode(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.sustainedPerformanceMode> property.
+			 */
+			setSustainedPerformanceMode(sustainedPerformanceMode: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.swipeToClose> property.
+			 */
+			getSwipeToClose(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.swipeToClose> property.
+			 */
+			setSwipeToClose(swipeToClose: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.tabBarHidden> property.
+			 */
+			getTabBarHidden(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.tabBarHidden> property.
+			 */
+			setTabBarHidden(tabBarHidden: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.theme> property.
+			 */
+			getTheme(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.theme> property.
+			 */
+			setTheme(theme: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.title> property.
+			 */
+			getTitle(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.title> property.
+			 */
+			setTitle(title: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.titleAttributes> property.
+			 */
+			getTitleAttributes(): titleAttributesParams;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.titleAttributes> property.
+			 */
+			setTitleAttributes(titleAttributes: titleAttributesParams): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.titleControl> property.
+			 */
+			getTitleControl(): Titanium.UI.View;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.titleControl> property.
+			 */
+			setTitleControl(titleControl: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.titleImage> property.
+			 */
+			getTitleImage(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.titleImage> property.
+			 */
+			setTitleImage(titleImage: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.titlePrompt> property.
+			 */
+			getTitlePrompt(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.titlePrompt> property.
+			 */
+			setTitlePrompt(titlePrompt: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.titleid> property.
+			 */
+			getTitleid(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.titleid> property.
+			 */
+			setTitleid(titleid: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.titlepromptid> property.
+			 */
+			getTitlepromptid(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.titlepromptid> property.
+			 */
+			setTitlepromptid(titlepromptid: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.toolbar> property.
+			 */
+			getToolbar(): any[];
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.toolbar> property.
+			 */
+			setToolbar(toolbar: ReadonlyArray<any>): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.transitionAnimation> property.
+			 */
+			getTransitionAnimation(): Titanium.Proxy;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.transitionAnimation> property.
+			 */
+			setTransitionAnimation(transitionAnimation: Titanium.Proxy): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.translucent> property.
+			 */
+			getTranslucent(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.translucent> property.
+			 */
+			setTranslucent(translucent: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.url> property.
+			 */
+			getUrl(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.url> property.
+			 */
+			setUrl(url: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.windowFlags> property.
+			 */
+			getWindowFlags(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.windowFlags> property.
+			 */
+			setWindowFlags(windowFlags: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.windowSoftInputMode> property.
+			 */
+			getWindowSoftInputMode(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.windowSoftInputMode> property.
+			 */
+			setWindowSoftInputMode(windowSoftInputMode: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.windowPixelFormat> property.
+			 */
+			getWindowPixelFormat(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.windowPixelFormat> property.
+			 */
+			setWindowPixelFormat(windowPixelFormat: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.activityExitTransition> property.
+			 */
+			getActivityExitTransition(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.activityExitTransition> property.
+			 */
+			setActivityExitTransition(activityExitTransition: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.activityEnterTransition> property.
+			 */
+			getActivityEnterTransition(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.activityEnterTransition> property.
+			 */
+			setActivityEnterTransition(activityEnterTransition: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.activityReturnTransition> property.
+			 */
+			getActivityReturnTransition(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.activityReturnTransition> property.
+			 */
+			setActivityReturnTransition(activityReturnTransition: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.activityReenterTransition> property.
+			 */
+			getActivityReenterTransition(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.activityReenterTransition> property.
+			 */
+			setActivityReenterTransition(activityReenterTransition: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.activitySharedElementExitTransition> property.
+			 */
+			getActivitySharedElementExitTransition(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.activitySharedElementExitTransition> property.
+			 */
+			setActivitySharedElementExitTransition(activitySharedElementExitTransition: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.activitySharedElementEnterTransition> property.
+			 */
+			getActivitySharedElementEnterTransition(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.activitySharedElementEnterTransition> property.
+			 */
+			setActivitySharedElementEnterTransition(activitySharedElementEnterTransition: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.activitySharedElementReturnTransition> property.
+			 */
+			getActivitySharedElementReturnTransition(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.activitySharedElementReturnTransition> property.
+			 */
+			setActivitySharedElementReturnTransition(activitySharedElementReturnTransition: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Window.activitySharedElementReenterTransition> property.
+			 */
+			getActivitySharedElementReenterTransition(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.activitySharedElementReenterTransition> property.
+			 */
+			setActivitySharedElementReenterTransition(activitySharedElementReenterTransition: number): void;
+
+		}
+
+
+		/**
+		 * A set of constants for the styles available for <Titanium.UI.ActivityIndicator> objects.
+		 */
+		namespace ActivityIndicatorStyle {
+			/**
+			 * Indicates if the proxy will bubble an event to its parent.
+			 */
+			let bubbleParent: boolean;
+
+			/**
+			 * The name of the API that this proxy corresponds to.
+			 */
+			const apiName: string;
+
+			/**
+			 * The Window or TabGroup whose Activity lifecycle should be triggered on the proxy.
+			 */
+			let lifecycleContainer: Titanium.UI.Window | Titanium.UI.TabGroup;
+
+			/**
+			 * Large white spinning indicator.
+			 */
+			const BIG: number;
+
+			/**
+			 * Small gray spinning indicator.
+			 */
+			const DARK: number;
+
+			/**
+			 * Large gray spinning indicator.
+			 */
+			const BIG_DARK: number;
+
+			/**
+			 * Small white spinning indicator (default).
+			 */
+			const PLAIN: number;
+
+			/**
+			 * Adds the specified callback as an event listener for the named event.
+			 */
+			function addEventListener(name: string, callback: (param0: any) => any): void;
+
+			/**
+			 * Removes the specified callback as an event listener for the named event.
+			 */
+			function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+			/**
+			 * Fires a synthesized event to any registered listeners.
+			 */
+			function fireEvent(name: string, event: any): void;
+
+			/**
+			 * Applies the properties to the proxy.
+			 */
+			function applyProperties(props: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ActivityIndicatorStyle.bubbleParent> property.
+			 */
+			function getBubbleParent(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ActivityIndicatorStyle.bubbleParent> property.
+			 */
+			function setBubbleParent(bubbleParent: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ActivityIndicatorStyle.apiName> property.
+			 */
+			function getApiName(): string;
+
+			/**
+			 * Gets the value of the <Titanium.UI.ActivityIndicatorStyle.lifecycleContainer> property.
+			 */
+			function getLifecycleContainer(): Titanium.UI.Window | Titanium.UI.TabGroup;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ActivityIndicatorStyle.lifecycleContainer> property.
+			 */
+			function setLifecycleContainer(lifecycleContainer: Titanium.UI.Window): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ActivityIndicatorStyle.lifecycleContainer> property.
+			 */
+			function setLifecycleContainer(lifecycleContainer: Titanium.UI.TabGroup): void;
+
+		}
+
+		/**
+		 * The Android-specific UI capabilities. All properties, methods and events in this namespace will
+		 * only work on Android systems.
+		 */
+		namespace Android {
+			/**
+			 * Indicates if the proxy will bubble an event to its parent.
+			 */
+			let bubbleParent: boolean;
+
+			/**
+			 * The name of the API that this proxy corresponds to.
+			 */
+			const apiName: string;
+
+			/**
+			 * The Window or TabGroup whose Activity lifecycle should be triggered on the proxy.
+			 */
+			let lifecycleContainer: Titanium.UI.Window | Titanium.UI.TabGroup;
+
+			/**
+			 * Raw bit controlling whether the right/bottom edge is clipped to its container, based on the gravity direction being applied.
+			 */
+			const GRAVITY_AXIS_CLIP: number;
+
+			/**
+			 * Raw bit controlling how the right/bottom edge is placed.
+			 */
+			const GRAVITY_AXIS_PULL_AFTER: number;
+
+			/**
+			 * Raw bit controlling how the left/top edge is placed.
+			 */
+			const GRAVITY_AXIS_PULL_BEFORE: number;
+
+			/**
+			 * Raw bit indicating the gravity for an axis has been specified.
+			 */
+			const GRAVITY_AXIS_SPECIFIED: number;
+
+			/**
+			 * Bits defining the horizontal axis.
+			 */
+			const GRAVITY_AXIS_X_SHIFT: number;
+
+			/**
+			 * Bits defining the vertical axis.
+			 */
+			const GRAVITY_AXIS_Y_SHIFT: number;
+
+			/**
+			 * Push object to the bottom of its container, not changing its size.
+			 */
+			const GRAVITY_BOTTOM: number;
+
+			/**
+			 * Place the object in the center of its container in both the vertical and horizontal axis, not changing its size.
+			 */
+			const GRAVITY_CENTER: number;
+
+			/**
+			 * Place object in the horizontal center of its container, not changing its size.
+			 */
+			const GRAVITY_CENTER_HORIZONTAL: number;
+
+			/**
+			 * Place object in the vertical center of its container, not changing its size.
+			 */
+			const GRAVITY_CENTER_VERTICAL: number;
+
+			/**
+			 * Flag to clip the edges of the object to its container along the horizontal axis.
+			 */
+			const GRAVITY_CLIP_HORIZONTAL: number;
+
+			/**
+			 * Flag to clip the edges of the object to its container along the vertical axis.
+			 */
+			const GRAVITY_CLIP_VERTICAL: number;
+
+			/**
+			 * Special constant to enable clipping to an overall display along the horizontal dimension.
+			 */
+			const GRAVITY_DISPLAY_CLIP_HORIZONTAL: number;
+
+			/**
+			 * Special constant to enable clipping to an overall display along the vertical dimension.
+			 */
+			const GRAVITY_DISPLAY_CLIP_VERTICAL: number;
+
+			/**
+			 * Push object to x-axis position at the end of its container, not changing its size.
+			 */
+			const GRAVITY_END: number;
+
+			/**
+			 * Grow the horizontal and vertical size of the object if needed so it completely fills its container.
+			 */
+			const GRAVITY_FILL: number;
+
+			/**
+			 * Grow the horizontal size of the object if needed so it completely fills its container.
+			 */
+			const GRAVITY_FILL_HORIZONTAL: number;
+
+			/**
+			 * Grow the vertical size of the object if needed so it completely fills its container.
+			 */
+			const GRAVITY_FILL_VERTICAL: number;
+
+			/**
+			 * Binary mask to get the absolute horizontal gravity of a gravity.
+			 */
+			const GRAVITY_HORIZONTAL_GRAVITY_MASK: number;
+
+			/**
+			 * Push object to the left of its container, not changing its size.
+			 */
+			const GRAVITY_LEFT: number;
+
+			/**
+			 * Constant indicating that no gravity has been set
+			 */
+			const GRAVITY_NO_GRAVITY: number;
+
+			/**
+			 * Binary mask for the horizontal gravity and script specific direction bit.
+			 */
+			const GRAVITY_RELATIVE_HORIZONTAL_GRAVITY_MASK: number;
+
+			/**
+			 * Raw bit controlling whether the layout direction is relative or not (GRAVITY_START/GRAVITY_END instead of absolute GRAVITY_LEFT/GRAVITY_RIGHT).
+			 */
+			const GRAVITY_RELATIVE_LAYOUT_DIRECTION: number;
+
+			/**
+			 * Push object to the right of its container, not changing its size.
+			 */
+			const GRAVITY_RIGHT: number;
+
+			/**
+			 * Push object to x-axis position at the start of its container, not changing its size.
+			 */
+			const GRAVITY_START: number;
+
+			/**
+			 * Push object to the top of its container, not changing its size.
+			 */
+			const GRAVITY_TOP: number;
+
+			/**
+			 * Binary mask to get the vertical gravity of a gravity.
+			 */
+			const GRAVITY_VERTICAL_GRAVITY_MASK: number;
+
+			/**
+			 * Converts all detectable types of data into clickable links.
+			 */
+			const LINKIFY_ALL: number;
+
+			/**
+			 * Converts strings formatted as email addresses into clickable links.
+			 */
+			const LINKIFY_EMAIL_ADDRESSES: number;
+
+			/**
+			 * Converts strings formatted as addresses into clickable links.
+			 */
+			const LINKIFY_MAP_ADDRESSES: number;
+
+			/**
+			 * Converts strings formatted as phone numbers into clickable links.
+			 */
+			const LINKIFY_PHONE_NUMBERS: number;
+
+			/**
+			 * Converts strings formatted as URLs into clickable links.
+			 */
+			const LINKIFY_WEB_URLS: number;
+
+			/**
+			 * Always allow a user to over-scroll this view, provided it is a view that can scroll.
+			 */
+			const OVER_SCROLL_ALWAYS: number;
+
+			/**
+			 * Allow a user to over-scroll this view only if the content is large enough to meaningfully scroll, provided it is a view that can scroll.
+			 */
+			const OVER_SCROLL_IF_CONTENT_SCROLLS: number;
+
+			/**
+			 * Never allow a user to over-scroll this view.
+			 */
+			const OVER_SCROLL_NEVER: number;
+
+			/**
+			 * Android A_8 pixel format for <Titanium.UI.Window>. Selecting the correct pixel format
+			 * can improve image clarity and performance.
+			 */
+			const PIXEL_FORMAT_A_8: number;
+
+			/**
+			 * Android LA_88 pixel format for <Titanium.UI.Window>. Selecting the correct pixel format
+			 * can improve image clarity and performance.
+			 */
+			const PIXEL_FORMAT_LA_88: number;
+
+			/**
+			 * Android L_8 pixel format for <Titanium.UI.Window>. Selecting the correct pixel format
+			 * can improve image clarity and performance.
+			 */
+			const PIXEL_FORMAT_L_8: number;
+
+			/**
+			 * Android OPAQUE pixel format for <Titanium.UI.Window>. Selecting the correct pixel format
+			 * can improve image clarity and performance.
+			 */
+			const PIXEL_FORMAT_OPAQUE: number;
+
+			/**
+			 * Android RGBA_4444 pixel format for <Titanium.UI.Window>. Selecting the correct pixel format
+			 * can improve image clarity and performance.
+			 */
+			const PIXEL_FORMAT_RGBA_4444: number;
+
+			/**
+			 * Android RGBA_5551 pixel format for <Titanium.UI.Window>. Selecting the correct pixel format
+			 * can improve image clarity and performance.
+			 */
+			const PIXEL_FORMAT_RGBA_5551: number;
+
+			/**
+			 * Android RGBA_8888 pixel format for <Titanium.UI.Window>. Selecting the correct pixel format
+			 * can improve image clarity and performance.
+			 */
+			const PIXEL_FORMAT_RGBA_8888: number;
+
+			/**
+			 * Android RGBX_8888 pixel format for <Titanium.UI.Window>. Selecting the correct pixel format
+			 * can improve image clarity and performance.
+			 */
+			const PIXEL_FORMAT_RGBX_8888: number;
+
+			/**
+			 * Android RGB_332 pixel format for <Titanium.UI.Window>. Selecting the correct pixel format
+			 * can improve image clarity and performance.
+			 */
+			const PIXEL_FORMAT_RGB_332: number;
+
+			/**
+			 * Android RGB_565 pixel format for <Titanium.UI.Window>. Selecting the correct pixel format
+			 * can improve image clarity and performance.
+			 */
+			const PIXEL_FORMAT_RGB_565: number;
+
+			/**
+			 * Android RGB_888 pixel format for <Titanium.UI.Window>. Selecting the correct pixel format
+			 * can improve image clarity and performance.
+			 */
+			const PIXEL_FORMAT_RGB_888: number;
+
+			/**
+			 * Android TRANSLUCENT pixel format for <Titanium.UI.Window>. Selecting the correct pixel format
+			 * can improve image clarity and performance.
+			 */
+			const PIXEL_FORMAT_TRANSLUCENT: number;
+
+			/**
+			 * Android A_8 pixel format for <Titanium.UI.Window>. Selecting the correct pixel format can
+			 * improve image clarity and performance.
+			 */
+			const PIXEL_FORMAT_TRANSPARENT: number;
+
+			/**
+			 * Android UNKNOWN pixel format for <Titanium.UI.Window>. Selecting the correct pixel format
+			 * can improve image clarity and performance.
+			 */
+			const PIXEL_FORMAT_UNKNOWN: number;
+
+			/**
+			 * Display <Titanium.UI.Android.ProgressIndicator> as a modal dialog. (default)
+			 */
+			const PROGRESS_INDICATOR_DIALOG: number;
+
+			/**
+			 * Display <Titanium.UI.Android.ProgressIndicator> as a horizontal progress bar in the title of
+			 * the window.
+			 */
+			const PROGRESS_INDICATOR_STATUS_BAR: number;
+
+			/**
+			 * Used with the <Titanium.UI.Android.ProgressIndicator.type> property to indicate an ongoing
+			 * activity of indeterminate length. (default)
+			 */
+			const PROGRESS_INDICATOR_INDETERMINANT: number;
+
+			/**
+			 * Used with the <Titanium.UI.Android.ProgressIndicator.type> property to indicate an ongoing
+			 * activity of determinate length.
+			 */
+			const PROGRESS_INDICATOR_DETERMINANT: number;
+
+			/**
+			 * Pan the current heavyweight window when the input method (ie software keyboard) is shown, to
+			 * ensure that its contents are not obscured.
+			 */
+			const SOFT_INPUT_ADJUST_PAN: number;
+
+			/**
+			 * Resize the current heavyweight window when the input method (ie software keyboard) is shown,
+			 * to ensure that its contents are not obscured.
+			 */
+			const SOFT_INPUT_ADJUST_RESIZE: number;
+
+			/**
+			 * Use the system-default behavior to determine how the soft input area (ie software keyboard)
+			 * is accomodated by the current heavyweight window when it receives focus (default.)
+			 */
+			const SOFT_INPUT_ADJUST_UNSPECIFIED: number;
+
+			/**
+			 * Always hide the soft input area (ie software keyboard) when the current heavyweight window
+			 * receives focus.
+			 */
+			const SOFT_INPUT_STATE_ALWAYS_HIDDEN: number;
+
+			/**
+			 * Always show the soft input area (ie software keyboard) when the current heavyweight window
+			 * receives focus.
+			 */
+			const SOFT_INPUT_STATE_ALWAYS_VISIBLE: number;
+
+			/**
+			 * Attempt to hide the soft input area (ie software keyboard) when the current heavyweight
+			 * window receives focus.
+			 */
+			const SOFT_INPUT_STATE_HIDDEN: number;
+
+			/**
+			 * Use the system-default behavior to determine whether to show the soft input area
+			 * (ie software keyboard) when the current heavyweight window receives focus.
+			 */
+			const SOFT_INPUT_STATE_UNSPECIFIED: number;
+
+			/**
+			 * Attempt to show the soft input area (ie software keyboard) when the current heavyweight
+			 * window receives focus.
+			 */
+			const SOFT_INPUT_STATE_VISIBLE: number;
+
+			/**
+			 * Use Android default behavior to handle keyboard visibility when a view receives focus.
+			 * (default)
+			 */
+			const SOFT_KEYBOARD_DEFAULT_ON_FOCUS: number;
+
+			/**
+			 * Attempt to hide the soft keyboard when a view receives focus. Note: system can override
+			 * request.
+			 */
+			const SOFT_KEYBOARD_HIDE_ON_FOCUS: number;
+
+			/**
+			 * Attempt to show the soft keyboard when a view receives focus. Note: system can override
+			 * request.
+			 */
+			const SOFT_KEYBOARD_SHOW_ON_FOCUS: number;
+
+			/**
+			 * Display a checkbox.
+			 */
+			const SWITCH_STYLE_CHECKBOX: number;
+
+			/**
+			 * Display a toggle button.
+			 */
+			const SWITCH_STYLE_TOGGLEBUTTON: number;
+
+			/**
+			 * Display a switch.
+			 */
+			const SWITCH_STYLE_SWITCH: number;
+
+			/**
+			 * Use with [WebView.pluginState](Titanium.UI.WebView.pluginState) to disable plugins in a web view.
+			 */
+			const WEBVIEW_PLUGINS_OFF: number;
+
+			/**
+			 * Use with [WebView.pluginState](Titanium.UI.WebView.pluginState) to enable plugins in a web view.
+			 */
+			const WEBVIEW_PLUGINS_ON: number;
+
+			/**
+			 * Display a placeholder and only load plugins when user selects it.
+			 */
+			const WEBVIEW_PLUGINS_ON_DEMAND: number;
+
+			/**
+			 * Use with [WebView.cacheMode](Titanium.UI.WebView.cacheMode) to override how the cache is used in a web view.
+			 */
+			const WEBVIEW_LOAD_DEFAULT: number;
+
+			/**
+			 * Use with [WebView.cacheMode](Titanium.UI.WebView.cacheMode) to override how the cache is used in a web view.
+			 */
+			const WEBVIEW_LOAD_NO_CACHE: number;
+
+			/**
+			 * Use with [WebView.cacheMode](Titanium.UI.WebView.cacheMode) to override how the cache is used in a web view.
+			 */
+			const WEBVIEW_LOAD_CACHE_ONLY: number;
+
+			/**
+			 * Use with [WebView.cacheMode](Titanium.UI.WebView.cacheMode) to override how the cache is used in a web view.
+			 */
+			const WEBVIEW_LOAD_CACHE_ELSE_NETWORK: number;
+
+			/**
+			 * Moves views in or out from the edges of the scene.
+			 */
+			const TRANSITION_EXPLODE: number;
+
+			/**
+			 * Fades in the views.
+			 */
+			const TRANSITION_FADE_IN: number;
+
+			/**
+			 * Fades out the views.
+			 */
+			const TRANSITION_FADE_OUT: number;
+
+			/**
+			 * Moves views to top.
+			 */
+			const TRANSITION_SLIDE_TOP: number;
+
+			/**
+			 * Moves views to right.
+			 */
+			const TRANSITION_SLIDE_RIGHT: number;
+
+			/**
+			 * Moves views to bottom.
+			 */
+			const TRANSITION_SLIDE_BOTTOM: number;
+
+			/**
+			 * Moves views to left.
+			 */
+			const TRANSITION_SLIDE_LEFT: number;
+
+			/**
+			 * Captures layout bounds of target views before and after the scene change and animates those changes during the transition.
+			 */
+			const TRANSITION_CHANGE_BOUNDS: number;
+
+			/**
+			 * Captures the clip bounds before and after the scene change and animates those changes during the transition.
+			 */
+			const TRANSITION_CHANGE_CLIP_BOUNDS: number;
+
+			/**
+			 * Captures scale and rotation for Views before and after the scene change and animates those changes during the transition.
+			 */
+			const TRANSITION_CHANGE_TRANSFORM: number;
+
+			/**
+			 * Captures an ImageView's matrix before and after the scene change and animates it during the transition.
+			 */
+			const TRANSITION_CHANGE_IMAGE_TRANSFORM: number;
+
+			/**
+			 * Resets transition to platform default.
+			 */
+			const TRANSITION_NONE: number;
+
+			/**
+			 * Adds the specified callback as an event listener for the named event.
+			 */
+			function addEventListener(name: string, callback: (param0: any) => any): void;
+
+			/**
+			 * Removes the specified callback as an event listener for the named event.
+			 */
+			function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+			/**
+			 * Fires a synthesized event to any registered listeners.
+			 */
+			function fireEvent(name: string, event: any): void;
+
+			/**
+			 * Applies the properties to the proxy.
+			 */
+			function applyProperties(props: any): void;
+
+			/**
+			 * Hides the soft keyboard.
+			 */
+			function hideSoftKeyboard(): void;
+
+			/**
+			 * Opens an application preferences dialog, using the native Android system settings interface,
+			 * defined by the platform-specific `preferences.xml` and `array.xml` files.
+			 */
+			function openPreferences(): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Android.bubbleParent> property.
+			 */
+			function getBubbleParent(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Android.bubbleParent> property.
+			 */
+			function setBubbleParent(bubbleParent: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Android.apiName> property.
+			 */
+			function getApiName(): string;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Android.lifecycleContainer> property.
+			 */
+			function getLifecycleContainer(): Titanium.UI.Window | Titanium.UI.TabGroup;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Android.lifecycleContainer> property.
+			 */
+			function setLifecycleContainer(lifecycleContainer: Titanium.UI.Window): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Android.lifecycleContainer> property.
+			 */
+			function setLifecycleContainer(lifecycleContainer: Titanium.UI.TabGroup): void;
+
+			/**
+			 * Creates and returns an instance of <Titanium.UI.Android.CardView>.
+			 */
+			function createCardView(parameters?: any): Titanium.UI.Android.CardView;
+
+			/**
+			 * Creates and returns an instance of <Titanium.UI.Android.DrawerLayout>.
+			 */
+			function createDrawerLayout(parameters?: any): Titanium.UI.Android.DrawerLayout;
+
+			/**
+			 * Creates and returns an instance of <Titanium.UI.Android.ProgressIndicator>.
+			 */
+			function createProgressIndicator(parameters?: any): Titanium.UI.Android.ProgressIndicator;
+
+			/**
+			 * Creates and returns an instance of <Titanium.UI.Android.SearchView>.
+			 */
+			function createSearchView(parameters?: any): Titanium.UI.Android.SearchView;
+
+			/**
+			 * An elevated view with rounded corners.
+			 */
+			interface CardView extends Titanium.Proxy {
+				/**
+				 * Whether the view should be "hidden" from (i.e., ignored by) the accessibility service.
+				 */
+				accessibilityHidden: boolean;
+
+				/**
+				 * Briefly describes what performing an action (such as a click) on the view will do.
+				 */
+				accessibilityHint: string;
+
+				/**
+				 * A succint label identifying the view for the device's accessibility service.
+				 */
+				accessibilityLabel: string;
+
+				/**
+				 * A string describing the value (if any) of the view for the device's accessibility service.
+				 */
+				accessibilityValue: string;
+
+				/**
+				 * Background color for CardView as a color name or hex triplet.
+				 */
+				backgroundColor: string;
+
+				/**
+				 * Disabled background color of the view, as a color name or hex triplet.
+				 */
+				backgroundDisabledColor: string;
+
+				/**
+				 * Disabled background image for the view, specified as a local file path or URL.
+				 */
+				backgroundDisabledImage: string;
+
+				/**
+				 * Focused background color of the view, as a color name or hex triplet.
+				 */
+				backgroundFocusedColor: string;
+
+				/**
+				 * Focused background image for the view, specified as a local file path or URL.
+				 */
+				backgroundFocusedImage: string;
+
+				/**
+				 * A background gradient for the view.
+				 */
+				backgroundGradient: Gradient;
+
+				/**
+				 * Background image for the view, specified as a local file path or URL.
+				 */
+				backgroundImage: string;
+
+				/**
+				 * Determines whether to tile a background across a view.
+				 */
+				backgroundRepeat: boolean;
+
+				/**
+				 * Selected background color of the view, as a color name or hex triplet.
+				 */
+				backgroundSelectedColor: string;
+
+				/**
+				 * Selected background image url for the view, specified as a local file path or URL.
+				 */
+				backgroundSelectedImage: string;
+
+				/**
+				 * Border color of the view, as a color name or hex triplet.
+				 */
+				borderColor: string;
+
+				/**
+				 * Corner radius for CardView.
+				 */
+				borderRadius: number;
+
+				/**
+				 * Border width of the view.
+				 */
+				borderWidth: number;
+
+				/**
+				 * View's bottom position, in platform-specific units.
+				 */
+				bottom: number | string;
+
+				/**
+				 * View's center position, in the parent view's coordinates.
+				 */
+				center: Point;
+
+				/**
+				 * Array of this view's child views.
+				 */
+				readonly children: Titanium.UI.View[];
+
+				/**
+				 * Elevation for CardView.
+				 */
+				elevation: number;
+
+				/**
+				 * Whether view should be focusable while navigating with the trackball.
+				 */
+				focusable: boolean;
+
+				/**
+				 * View height, in platform-specific units.
+				 */
+				height: number | string;
+
+				/**
+				 * Sets the behavior when hiding an object to release or keep the free space
+				 */
+				hiddenBehavior: number;
+
+				/**
+				 * View's left position, in platform-specific units.
+				 */
+				left: number | string;
+
+				/**
+				 * Specifies how the view positions its children.
+				 * One of: 'composite', 'vertical', or 'horizontal'.
+				 */
+				layout: string;
+
+				/**
+				 * Opacity of this view, from 0.0 (transparent) to 1.0 (opaque).
+				 */
+				opacity: number;
+
+				/**
+				 * When on, animate call overrides current animation if applicable.
+				 */
+				overrideCurrentAnimation: boolean;
+
+				/**
+				 * View's right position, in platform-specific units.
+				 */
+				right: number | string;
+
+				/**
+				 * The bounding box of the view relative to its parent, in system units.
+				 */
+				readonly rect: Dimension;
+
+				/**
+				 * Clockwise 2D rotation of the view in degrees.
+				 */
+				rotation: number;
+
+				/**
+				 * Clockwise rotation of the view in degrees (x-axis).
+				 */
+				rotationX: number;
+
+				/**
+				 * Clockwise rotation of the view in degrees (y-axis).
+				 */
+				rotationY: number;
+
+				/**
+				 * Scaling of the view in x-axis in pixels.
+				 */
+				scaleX: number;
+
+				/**
+				 * Scaling of the view in y-axis in pixels.
+				 */
+				scaleY: number;
+
+				/**
+				 * The size of the view in system units.
+				 */
+				readonly size: Dimension;
+
+				/**
+				 * Determines keyboard behavior when this view is focused.
+				 */
+				softKeyboardOnFocus: number;
+
+				/**
+				 * The view's top position.
+				 */
+				top: number | string;
+
+				/**
+				 * Determines whether view should receive touch events.
+				 */
+				touchEnabled: boolean;
+
+				/**
+				 * A material design visual construct that provides an instantaneous visual confirmation of touch point.
+				 */
+				touchFeedback: boolean;
+
+				/**
+				 * Optional touch feedback ripple color. This has no effect unless `touchFeedback` is true.
+				 */
+				touchFeedbackColor: string;
+
+				/**
+				 * Transformation matrix to apply to the view.
+				 */
+				transform: Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
+
+				/**
+				 * Horizontal location of the view relative to its left position in pixels.
+				 */
+				translationX: number;
+
+				/**
+				 * Vertical location of the view relative to its top position in pixels.
+				 */
+				translationY: number;
+
+				/**
+				 * Depth of the view relative to its elevation in pixels.
+				 */
+				translationZ: number;
+
+				/**
+				 * A name to identify this view in activity transition.
+				 */
+				transitionName: string;
+
+				/**
+				 * Determines whether the view is visible.
+				 */
+				visible: boolean;
+
+				/**
+				 * View's width, in platform-specific units.
+				 */
+				width: number | string;
+
+				/**
+				 * Determines whether the layout has wrapping behavior.
+				 */
+				horizontalWrap: boolean;
+
+				/**
+				 * Z-index stack order position, relative to other sibling views.
+				 */
+				zIndex: number;
+
+				/**
+				 * Determines whether to keep the device screen on.
+				 */
+				keepScreenOn: boolean;
+
+				/**
+				 * Background color for CardView as a color name or hex triplet.
+				 */
+				cardBackgroundColor: string;
+
+				/**
+				 * Corner radius for CardView.
+				 */
+				cardCornerRadius: number;
+
+				/**
+				 * Elevation for CardView.
+				 */
+				cardElevation: number;
+
+				/**
+				 * Maximum Elevation for CardView.
+				 */
+				cardMaxElevation: number;
+
+				/**
+				 * Maximum Elevation for CardView.
+				 */
+				maxElevation: number;
+
+				/**
+				 * Add padding to CardView on API level 20 and before to prevent intersections between
+				 * the Card content and rounded corners.
+				 */
+				cardPreventCornerOverlap: boolean;
+
+				/**
+				 * Add padding to CardView on API level 20 and before to prevent intersections between
+				 * the Card content and rounded corners.
+				 */
+				preventCornerOverlap: boolean;
+
+				/**
+				 * Add padding on API level 21 and above to have the same measurements with previous versions.
+				 */
+				cardUseCompatPadding: boolean;
+
+				/**
+				 * Add padding on API level 21 and above to have the same measurements with previous versions.
+				 */
+				useCompatPadding: boolean;
+
+				/**
+				 * Inner padding between the edges of the Card and children of the CardView.
+				 */
+				contentPadding: number;
+
+				/**
+				 * Inner padding between the edges of the Card and children of the CardView.
+				 */
+				padding: number;
+
+				/**
+				 * Inner padding between the bottom edge of the Card and children of the CardView.
+				 */
+				contentPaddingBottom: number;
+
+				/**
+				 * Inner padding between the bottom edge of the Card and children of the CardView.
+				 */
+				paddingBottom: number;
+
+				/**
+				 * Inner padding between the left edge of the Card and children of the CardView.
+				 */
+				contentPaddingLeft: number;
+
+				/**
+				 * Inner padding between the left edge of the Card and children of the CardView.
+				 */
+				paddingLeft: number;
+
+				/**
+				 * Inner padding between the right edge of the Card and children of the CardView.
+				 */
+				contentPaddingRight: number;
+
+				/**
+				 * Inner padding between the right edge of the Card and children of the CardView.
+				 */
+				paddingRight: number;
+
+				/**
+				 * Inner padding between the top edge of the Card and children of the CardView.
+				 */
+				contentPaddingTop: number;
+
+				/**
+				 * Inner padding between the top edge of the Card and children of the CardView.
+				 */
+				paddingTop: number;
+
+				/**
+				 * Adds a child to this view's hierarchy.
+				 */
+				add(view: any): void;
+
+				/**
+				 * Adds a child to this view's hierarchy.
+				 */
+				add(view: any[]): void;
+
+				/**
+				 * Animates this view.
+				 */
+				animate(animation: any, callback?: (param0: any) => any): void;
+
+				/**
+				 * Finishes a batch update of the View's layout properties and schedules a layout pass of the
+				 * view tree.
+				 */
+				finishLayout(): void;
+
+				/**
+				 * Hides this view.
+				 */
+				hide(options?: AnimationOption): void;
+
+				/**
+				 * Inserts a view at the specified position in the [children](Titanium.UI.View.children) array.
+				 */
+				insertAt(params: any): void;
+
+				/**
+				 * Removes a child view from this view's hierarchy.
+				 */
+				remove(view: any): void;
+
+				/**
+				 * Removes all child views from this view's hierarchy.
+				 */
+				removeAllChildren(): void;
+
+				/**
+				 * Replaces a view at the specified position in the [children](Titanium.UI.View.children) array.
+				 */
+				replaceAt(params: any): void;
+
+				/**
+				 * Makes this view visible.
+				 */
+				show(options?: AnimationOption): void;
+
+				/**
+				 * Starts a batch update of this view's layout properties.
+				 */
+				startLayout(): void;
+
+				/**
+				 * Returns an image of the rendered view, as a Blob.
+				 */
+				toImage(callback?: (param0: Titanium.Blob) => any, honorScaleFactor?: boolean): Titanium.Blob;
+
+				/**
+				 * Performs a batch update of all supplied layout properties and schedules a layout pass after
+				 * they have been updated.
+				 */
+				updateLayout(params: any): void;
+
+				/**
+				 * Translates a point from this view's coordinate system to another view's coordinate system.
+				 */
+				convertPointToView(point: Point, destinationView: any): Point;
+
+				/**
+				 * Returns the matching view of a given view ID.
+				 */
+				getViewById(id: string): Titanium.UI.View;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.accessibilityHidden> property.
+				 */
+				getAccessibilityHidden(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.accessibilityHidden> property.
+				 */
+				setAccessibilityHidden(accessibilityHidden: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.accessibilityHint> property.
+				 */
+				getAccessibilityHint(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.accessibilityHint> property.
+				 */
+				setAccessibilityHint(accessibilityHint: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.accessibilityLabel> property.
+				 */
+				getAccessibilityLabel(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.accessibilityLabel> property.
+				 */
+				setAccessibilityLabel(accessibilityLabel: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.accessibilityValue> property.
+				 */
+				getAccessibilityValue(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.accessibilityValue> property.
+				 */
+				setAccessibilityValue(accessibilityValue: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.backgroundColor> property.
+				 */
+				getBackgroundColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.backgroundColor> property.
+				 */
+				setBackgroundColor(backgroundColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.backgroundDisabledColor> property.
+				 */
+				getBackgroundDisabledColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.backgroundDisabledColor> property.
+				 */
+				setBackgroundDisabledColor(backgroundDisabledColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.backgroundDisabledImage> property.
+				 */
+				getBackgroundDisabledImage(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.backgroundDisabledImage> property.
+				 */
+				setBackgroundDisabledImage(backgroundDisabledImage: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.backgroundFocusedColor> property.
+				 */
+				getBackgroundFocusedColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.backgroundFocusedColor> property.
+				 */
+				setBackgroundFocusedColor(backgroundFocusedColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.backgroundFocusedImage> property.
+				 */
+				getBackgroundFocusedImage(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.backgroundFocusedImage> property.
+				 */
+				setBackgroundFocusedImage(backgroundFocusedImage: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.backgroundGradient> property.
+				 */
+				getBackgroundGradient(): Gradient;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.backgroundGradient> property.
+				 */
+				setBackgroundGradient(backgroundGradient: Gradient): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.backgroundImage> property.
+				 */
+				getBackgroundImage(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.backgroundImage> property.
+				 */
+				setBackgroundImage(backgroundImage: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.backgroundRepeat> property.
+				 */
+				getBackgroundRepeat(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.backgroundRepeat> property.
+				 */
+				setBackgroundRepeat(backgroundRepeat: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.backgroundSelectedColor> property.
+				 */
+				getBackgroundSelectedColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.backgroundSelectedColor> property.
+				 */
+				setBackgroundSelectedColor(backgroundSelectedColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.backgroundSelectedImage> property.
+				 */
+				getBackgroundSelectedImage(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.backgroundSelectedImage> property.
+				 */
+				setBackgroundSelectedImage(backgroundSelectedImage: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.borderColor> property.
+				 */
+				getBorderColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.borderColor> property.
+				 */
+				setBorderColor(borderColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.borderRadius> property.
+				 */
+				getBorderRadius(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.borderRadius> property.
+				 */
+				setBorderRadius(borderRadius: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.borderWidth> property.
+				 */
+				getBorderWidth(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.borderWidth> property.
+				 */
+				setBorderWidth(borderWidth: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.bottom> property.
+				 */
+				getBottom(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.bottom> property.
+				 */
+				setBottom(bottom: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.bottom> property.
+				 */
+				setBottom(bottom: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.center> property.
+				 */
+				getCenter(): Point;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.center> property.
+				 */
+				setCenter(center: Point): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.children> property.
+				 */
+				getChildren(): Titanium.UI.View[];
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.elevation> property.
+				 */
+				getElevation(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.elevation> property.
+				 */
+				setElevation(elevation: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.focusable> property.
+				 */
+				getFocusable(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.focusable> property.
+				 */
+				setFocusable(focusable: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.height> property.
+				 */
+				getHeight(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.height> property.
+				 */
+				setHeight(height: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.height> property.
+				 */
+				setHeight(height: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.hiddenBehavior> property.
+				 */
+				getHiddenBehavior(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.hiddenBehavior> property.
+				 */
+				setHiddenBehavior(hiddenBehavior: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.left> property.
+				 */
+				getLeft(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.left> property.
+				 */
+				setLeft(left: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.left> property.
+				 */
+				setLeft(left: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.layout> property.
+				 */
+				getLayout(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.layout> property.
+				 */
+				setLayout(layout: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.opacity> property.
+				 */
+				getOpacity(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.opacity> property.
+				 */
+				setOpacity(opacity: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.overrideCurrentAnimation> property.
+				 */
+				getOverrideCurrentAnimation(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.overrideCurrentAnimation> property.
+				 */
+				setOverrideCurrentAnimation(overrideCurrentAnimation: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.right> property.
+				 */
+				getRight(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.right> property.
+				 */
+				setRight(right: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.right> property.
+				 */
+				setRight(right: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.rect> property.
+				 */
+				getRect(): Dimension;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.rotation> property.
+				 */
+				getRotation(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.rotation> property.
+				 */
+				setRotation(rotation: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.rotationX> property.
+				 */
+				getRotationX(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.rotationX> property.
+				 */
+				setRotationX(rotationX: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.rotationY> property.
+				 */
+				getRotationY(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.rotationY> property.
+				 */
+				setRotationY(rotationY: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.scaleX> property.
+				 */
+				getScaleX(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.scaleX> property.
+				 */
+				setScaleX(scaleX: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.scaleY> property.
+				 */
+				getScaleY(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.scaleY> property.
+				 */
+				setScaleY(scaleY: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.size> property.
+				 */
+				getSize(): Dimension;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.softKeyboardOnFocus> property.
+				 */
+				getSoftKeyboardOnFocus(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.softKeyboardOnFocus> property.
+				 */
+				setSoftKeyboardOnFocus(softKeyboardOnFocus: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.top> property.
+				 */
+				getTop(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.top> property.
+				 */
+				setTop(top: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.top> property.
+				 */
+				setTop(top: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.touchEnabled> property.
+				 */
+				getTouchEnabled(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.touchEnabled> property.
+				 */
+				setTouchEnabled(touchEnabled: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.touchFeedback> property.
+				 */
+				getTouchFeedback(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.touchFeedback> property.
+				 */
+				setTouchFeedback(touchFeedback: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.touchFeedbackColor> property.
+				 */
+				getTouchFeedbackColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.touchFeedbackColor> property.
+				 */
+				setTouchFeedbackColor(touchFeedbackColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.transform> property.
+				 */
+				getTransform(): Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.transform> property.
+				 */
+				setTransform(transform: Titanium.UI.Matrix2D): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.transform> property.
+				 */
+				setTransform(transform: Titanium.UI.Matrix3D): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.translationX> property.
+				 */
+				getTranslationX(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.translationX> property.
+				 */
+				setTranslationX(translationX: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.translationY> property.
+				 */
+				getTranslationY(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.translationY> property.
+				 */
+				setTranslationY(translationY: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.translationZ> property.
+				 */
+				getTranslationZ(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.translationZ> property.
+				 */
+				setTranslationZ(translationZ: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.transitionName> property.
+				 */
+				getTransitionName(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.transitionName> property.
+				 */
+				setTransitionName(transitionName: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.visible> property.
+				 */
+				getVisible(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.visible> property.
+				 */
+				setVisible(visible: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.width> property.
+				 */
+				getWidth(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.width> property.
+				 */
+				setWidth(width: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.width> property.
+				 */
+				setWidth(width: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.horizontalWrap> property.
+				 */
+				getHorizontalWrap(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.horizontalWrap> property.
+				 */
+				setHorizontalWrap(horizontalWrap: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.zIndex> property.
+				 */
+				getZIndex(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.zIndex> property.
+				 */
+				setZIndex(zIndex: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.keepScreenOn> property.
+				 */
+				getKeepScreenOn(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.keepScreenOn> property.
+				 */
+				setKeepScreenOn(keepScreenOn: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.cardBackgroundColor> property.
+				 */
+				getCardBackgroundColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.cardBackgroundColor> property.
+				 */
+				setCardBackgroundColor(cardBackgroundColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.cardCornerRadius> property.
+				 */
+				getCardCornerRadius(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.cardCornerRadius> property.
+				 */
+				setCardCornerRadius(cardCornerRadius: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.cardElevation> property.
+				 */
+				getCardElevation(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.cardElevation> property.
+				 */
+				setCardElevation(cardElevation: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.cardMaxElevation> property.
+				 */
+				getCardMaxElevation(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.cardMaxElevation> property.
+				 */
+				setCardMaxElevation(cardMaxElevation: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.maxElevation> property.
+				 */
+				getMaxElevation(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.maxElevation> property.
+				 */
+				setMaxElevation(maxElevation: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.cardPreventCornerOverlap> property.
+				 */
+				getCardPreventCornerOverlap(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.cardPreventCornerOverlap> property.
+				 */
+				setCardPreventCornerOverlap(cardPreventCornerOverlap: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.preventCornerOverlap> property.
+				 */
+				getPreventCornerOverlap(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.preventCornerOverlap> property.
+				 */
+				setPreventCornerOverlap(preventCornerOverlap: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.cardUseCompatPadding> property.
+				 */
+				getCardUseCompatPadding(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.cardUseCompatPadding> property.
+				 */
+				setCardUseCompatPadding(cardUseCompatPadding: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.useCompatPadding> property.
+				 */
+				getUseCompatPadding(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.useCompatPadding> property.
+				 */
+				setUseCompatPadding(useCompatPadding: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.contentPadding> property.
+				 */
+				getContentPadding(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.contentPadding> property.
+				 */
+				setContentPadding(contentPadding: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.padding> property.
+				 */
+				getPadding(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.padding> property.
+				 */
+				setPadding(padding: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.contentPaddingBottom> property.
+				 */
+				getContentPaddingBottom(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.contentPaddingBottom> property.
+				 */
+				setContentPaddingBottom(contentPaddingBottom: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.paddingBottom> property.
+				 */
+				getPaddingBottom(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.paddingBottom> property.
+				 */
+				setPaddingBottom(paddingBottom: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.contentPaddingLeft> property.
+				 */
+				getContentPaddingLeft(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.contentPaddingLeft> property.
+				 */
+				setContentPaddingLeft(contentPaddingLeft: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.paddingLeft> property.
+				 */
+				getPaddingLeft(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.paddingLeft> property.
+				 */
+				setPaddingLeft(paddingLeft: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.contentPaddingRight> property.
+				 */
+				getContentPaddingRight(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.contentPaddingRight> property.
+				 */
+				setContentPaddingRight(contentPaddingRight: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.paddingRight> property.
+				 */
+				getPaddingRight(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.paddingRight> property.
+				 */
+				setPaddingRight(paddingRight: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.contentPaddingTop> property.
+				 */
+				getContentPaddingTop(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.contentPaddingTop> property.
+				 */
+				setContentPaddingTop(contentPaddingTop: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.CardView.paddingTop> property.
+				 */
+				getPaddingTop(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.CardView.paddingTop> property.
+				 */
+				setPaddingTop(paddingTop: number): void;
+
 			}
-			export interface LocationRule extends Ti.Proxy {
-				accuracy : number;
-				maxAge : number;
-				minAge : number;
-				name : string;
-				getAccuracy () : number;
-				getMaxAge () : number;
-				getMinAge () : number;
-				getName () : string;
-				setAccuracy (accuracy: number) : void;
-				setMaxAge (maxAge: number) : void;
-				setMinAge (minAge: number) : void;
-				setName (name: string) : void;
+
+			/**
+			 * A panel that displays the app's main navigation options on the left edge of the screen.
+			 */
+			interface DrawerLayout extends Titanium.Proxy {
+				/**
+				 * Whether the view should be "hidden" from (i.e., ignored by) the accessibility service.
+				 */
+				accessibilityHidden: boolean;
+
+				/**
+				 * Briefly describes what performing an action (such as a click) on the view will do.
+				 */
+				accessibilityHint: string;
+
+				/**
+				 * A succint label identifying the view for the device's accessibility service.
+				 */
+				accessibilityLabel: string;
+
+				/**
+				 * A string describing the value (if any) of the view for the device's accessibility service.
+				 */
+				accessibilityValue: string;
+
+				/**
+				 * Background color of the view, as a color name or hex triplet.
+				 */
+				backgroundColor: string;
+
+				/**
+				 * Disabled background color of the view, as a color name or hex triplet.
+				 */
+				backgroundDisabledColor: string;
+
+				/**
+				 * Disabled background image for the view, specified as a local file path or URL.
+				 */
+				backgroundDisabledImage: string;
+
+				/**
+				 * Focused background color of the view, as a color name or hex triplet.
+				 */
+				backgroundFocusedColor: string;
+
+				/**
+				 * Focused background image for the view, specified as a local file path or URL.
+				 */
+				backgroundFocusedImage: string;
+
+				/**
+				 * A background gradient for the view.
+				 */
+				backgroundGradient: Gradient;
+
+				/**
+				 * Background image for the view, specified as a local file path or URL.
+				 */
+				backgroundImage: string;
+
+				/**
+				 * Determines whether to tile a background across a view.
+				 */
+				backgroundRepeat: boolean;
+
+				/**
+				 * Selected background color of the view, as a color name or hex triplet.
+				 */
+				backgroundSelectedColor: string;
+
+				/**
+				 * Selected background image url for the view, specified as a local file path or URL.
+				 */
+				backgroundSelectedImage: string;
+
+				/**
+				 * Border color of the view, as a color name or hex triplet.
+				 */
+				borderColor: string;
+
+				/**
+				 * Radius for the rounded corners of the view's border.
+				 */
+				borderRadius: number;
+
+				/**
+				 * Border width of the view.
+				 */
+				borderWidth: number;
+
+				/**
+				 * View's bottom position, in platform-specific units.
+				 */
+				bottom: number | string;
+
+				/**
+				 * View's center position, in the parent view's coordinates.
+				 */
+				center: Point;
+
+				/**
+				 * Array of this view's child views.
+				 */
+				readonly children: Titanium.UI.View[];
+
+				/**
+				 * Base elevation of the view relative to its parent in pixels.
+				 */
+				elevation: number;
+
+				/**
+				 * Whether view should be focusable while navigating with the trackball.
+				 */
+				focusable: boolean;
+
+				/**
+				 * View height, in platform-specific units.
+				 */
+				height: number | string;
+
+				/**
+				 * Sets the behavior when hiding an object to release or keep the free space
+				 */
+				hiddenBehavior: number;
+
+				/**
+				 * View's left position, in platform-specific units.
+				 */
+				left: number | string;
+
+				/**
+				 * Specifies how the view positions its children.
+				 * One of: 'composite', 'vertical', or 'horizontal'.
+				 */
+				layout: string;
+
+				/**
+				 * Opacity of this view, from 0.0 (transparent) to 1.0 (opaque).
+				 */
+				opacity: number;
+
+				/**
+				 * When on, animate call overrides current animation if applicable.
+				 */
+				overrideCurrentAnimation: boolean;
+
+				/**
+				 * View's right position, in platform-specific units.
+				 */
+				right: number | string;
+
+				/**
+				 * The bounding box of the view relative to its parent, in system units.
+				 */
+				readonly rect: Dimension;
+
+				/**
+				 * Clockwise 2D rotation of the view in degrees.
+				 */
+				rotation: number;
+
+				/**
+				 * Clockwise rotation of the view in degrees (x-axis).
+				 */
+				rotationX: number;
+
+				/**
+				 * Clockwise rotation of the view in degrees (y-axis).
+				 */
+				rotationY: number;
+
+				/**
+				 * Scaling of the view in x-axis in pixels.
+				 */
+				scaleX: number;
+
+				/**
+				 * Scaling of the view in y-axis in pixels.
+				 */
+				scaleY: number;
+
+				/**
+				 * The size of the view in system units.
+				 */
+				readonly size: Dimension;
+
+				/**
+				 * Determines keyboard behavior when this view is focused.
+				 */
+				softKeyboardOnFocus: number;
+
+				/**
+				 * The view's top position.
+				 */
+				top: number | string;
+
+				/**
+				 * Determines whether view should receive touch events.
+				 */
+				touchEnabled: boolean;
+
+				/**
+				 * A material design visual construct that provides an instantaneous visual confirmation of touch point.
+				 */
+				touchFeedback: boolean;
+
+				/**
+				 * Optional touch feedback ripple color. This has no effect unless `touchFeedback` is true.
+				 */
+				touchFeedbackColor: string;
+
+				/**
+				 * Transformation matrix to apply to the view.
+				 */
+				transform: Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
+
+				/**
+				 * Horizontal location of the view relative to its left position in pixels.
+				 */
+				translationX: number;
+
+				/**
+				 * Vertical location of the view relative to its top position in pixels.
+				 */
+				translationY: number;
+
+				/**
+				 * Depth of the view relative to its elevation in pixels.
+				 */
+				translationZ: number;
+
+				/**
+				 * A name to identify this view in activity transition.
+				 */
+				transitionName: string;
+
+				/**
+				 * Determines whether the view is visible.
+				 */
+				visible: boolean;
+
+				/**
+				 * View's width, in platform-specific units.
+				 */
+				width: number | string;
+
+				/**
+				 * Determines whether the layout has wrapping behavior.
+				 */
+				horizontalWrap: boolean;
+
+				/**
+				 * Z-index stack order position, relative to other sibling views.
+				 */
+				zIndex: number;
+
+				/**
+				 * Determines whether to keep the device screen on.
+				 */
+				keepScreenOn: boolean;
+
+				/**
+				 * Use with [DrawerLayout.drawerLockMode](Titanium.UI.Android.DrawerLayout.drawerLockMode) to specify the drawer is locked closed.
+				 */
+				readonly LOCK_MODE_LOCKED_CLOSED: number;
+
+				/**
+				 * Use with [DrawerLayout.drawerLockMode](Titanium.UI.Android.DrawerLayout.drawerLockMode) to specify the drawer is locked opened.
+				 */
+				readonly LOCK_MODE_LOCKED_OPEN: number;
+
+				/**
+				 * Use with [DrawerLayout.drawerLockMode](Titanium.UI.Android.DrawerLayout.drawerLockMode) to specify the drawer is reset to default lock state.
+				 */
+				readonly LOCK_MODE_UNDEFINED: number;
+
+				/**
+				 * Use with [DrawerLayout.drawerLockMode](Titanium.UI.Android.DrawerLayout.drawerLockMode) to specify the drawer is unlocked.
+				 */
+				readonly LOCK_MODE_UNLOCKED: number;
+
+				/**
+				 * Determine whether the left drawer is open
+				 */
+				isLeftOpen: boolean;
+
+				/**
+				 * Determine whether the right drawer is open
+				 */
+				isRightOpen: boolean;
+
+				/**
+				 * Determine whether the left drawer is visible
+				 */
+				isLeftVisible: boolean;
+
+				/**
+				 * Determine whether the right drawer is visible
+				 */
+				isRightVisible: boolean;
+
+				/**
+				 * Get or set the width of the left drawer
+				 */
+				leftWidth: number;
+
+				/**
+				 * Get or set the width of the right drawer
+				 */
+				rightWidth: number;
+
+				/**
+				 * Get or set the view of the left drawer
+				 */
+				leftView: Titanium.UI.View;
+
+				/**
+				 * Get or set the view of the right drawer
+				 */
+				rightView: Titanium.UI.View;
+
+				/**
+				 * Get or set the center view
+				 */
+				centerView: Titanium.UI.View;
+
+				/**
+				 * Determine the drawer indicator status
+				 */
+				drawerIndicatorEnabled: boolean;
+
+				/**
+				 * Get or set the drawerLockMode
+				 */
+				drawerLockMode: number;
+
+				/**
+				 * Determine whether to enable the toolbar.
+				 */
+				toolbarEnabled: boolean;
+
+				/**
+				 * A Toolbar instance to use as a toolbar.
+				 */
+				toolbar: Titanium.UI.Toolbar;
+
+				/**
+				 * Adds a child to this view's hierarchy.
+				 */
+				add(view: any): void;
+
+				/**
+				 * Adds a child to this view's hierarchy.
+				 */
+				add(view: any[]): void;
+
+				/**
+				 * Animates this view.
+				 */
+				animate(animation: any, callback?: (param0: any) => any): void;
+
+				/**
+				 * Finishes a batch update of the View's layout properties and schedules a layout pass of the
+				 * view tree.
+				 */
+				finishLayout(): void;
+
+				/**
+				 * Hides this view.
+				 */
+				hide(options?: AnimationOption): void;
+
+				/**
+				 * Inserts a view at the specified position in the [children](Titanium.UI.View.children) array.
+				 */
+				insertAt(params: any): void;
+
+				/**
+				 * Removes a child view from this view's hierarchy.
+				 */
+				remove(view: any): void;
+
+				/**
+				 * Removes all child views from this view's hierarchy.
+				 */
+				removeAllChildren(): void;
+
+				/**
+				 * Replaces a view at the specified position in the [children](Titanium.UI.View.children) array.
+				 */
+				replaceAt(params: any): void;
+
+				/**
+				 * Makes this view visible.
+				 */
+				show(options?: AnimationOption): void;
+
+				/**
+				 * Starts a batch update of this view's layout properties.
+				 */
+				startLayout(): void;
+
+				/**
+				 * Returns an image of the rendered view, as a Blob.
+				 */
+				toImage(callback?: (param0: Titanium.Blob) => any, honorScaleFactor?: boolean): Titanium.Blob;
+
+				/**
+				 * Performs a batch update of all supplied layout properties and schedules a layout pass after
+				 * they have been updated.
+				 */
+				updateLayout(params: any): void;
+
+				/**
+				 * Translates a point from this view's coordinate system to another view's coordinate system.
+				 */
+				convertPointToView(point: Point, destinationView: any): Point;
+
+				/**
+				 * Returns the matching view of a given view ID.
+				 */
+				getViewById(id: string): Titanium.UI.View;
+
+				/**
+				 * Toggle the visibility of the left view.
+				 */
+				toggleLeft(): void;
+
+				/**
+				 * Open the left view.
+				 */
+				openLeft(): void;
+
+				/**
+				 * Close the left view.
+				 */
+				closeLeft(): void;
+
+				/**
+				 * Toggle the visibility of the right view.
+				 */
+				toggleRight(): void;
+
+				/**
+				 * Open the right view.
+				 */
+				openRight(): void;
+
+				/**
+				 * Close the right view.
+				 */
+				closeRight(): void;
+
+				/**
+				 * Disallow touch events on a specific view.
+				 */
+				interceptTouchEvent(view: any, disallowIntercept: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.accessibilityHidden> property.
+				 */
+				getAccessibilityHidden(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.accessibilityHidden> property.
+				 */
+				setAccessibilityHidden(accessibilityHidden: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.accessibilityHint> property.
+				 */
+				getAccessibilityHint(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.accessibilityHint> property.
+				 */
+				setAccessibilityHint(accessibilityHint: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.accessibilityLabel> property.
+				 */
+				getAccessibilityLabel(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.accessibilityLabel> property.
+				 */
+				setAccessibilityLabel(accessibilityLabel: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.accessibilityValue> property.
+				 */
+				getAccessibilityValue(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.accessibilityValue> property.
+				 */
+				setAccessibilityValue(accessibilityValue: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.backgroundColor> property.
+				 */
+				getBackgroundColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.backgroundColor> property.
+				 */
+				setBackgroundColor(backgroundColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.backgroundDisabledColor> property.
+				 */
+				getBackgroundDisabledColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.backgroundDisabledColor> property.
+				 */
+				setBackgroundDisabledColor(backgroundDisabledColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.backgroundDisabledImage> property.
+				 */
+				getBackgroundDisabledImage(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.backgroundDisabledImage> property.
+				 */
+				setBackgroundDisabledImage(backgroundDisabledImage: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.backgroundFocusedColor> property.
+				 */
+				getBackgroundFocusedColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.backgroundFocusedColor> property.
+				 */
+				setBackgroundFocusedColor(backgroundFocusedColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.backgroundFocusedImage> property.
+				 */
+				getBackgroundFocusedImage(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.backgroundFocusedImage> property.
+				 */
+				setBackgroundFocusedImage(backgroundFocusedImage: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.backgroundGradient> property.
+				 */
+				getBackgroundGradient(): Gradient;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.backgroundGradient> property.
+				 */
+				setBackgroundGradient(backgroundGradient: Gradient): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.backgroundImage> property.
+				 */
+				getBackgroundImage(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.backgroundImage> property.
+				 */
+				setBackgroundImage(backgroundImage: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.backgroundRepeat> property.
+				 */
+				getBackgroundRepeat(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.backgroundRepeat> property.
+				 */
+				setBackgroundRepeat(backgroundRepeat: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.backgroundSelectedColor> property.
+				 */
+				getBackgroundSelectedColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.backgroundSelectedColor> property.
+				 */
+				setBackgroundSelectedColor(backgroundSelectedColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.backgroundSelectedImage> property.
+				 */
+				getBackgroundSelectedImage(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.backgroundSelectedImage> property.
+				 */
+				setBackgroundSelectedImage(backgroundSelectedImage: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.borderColor> property.
+				 */
+				getBorderColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.borderColor> property.
+				 */
+				setBorderColor(borderColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.borderRadius> property.
+				 */
+				getBorderRadius(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.borderRadius> property.
+				 */
+				setBorderRadius(borderRadius: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.borderWidth> property.
+				 */
+				getBorderWidth(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.borderWidth> property.
+				 */
+				setBorderWidth(borderWidth: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.bottom> property.
+				 */
+				getBottom(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.bottom> property.
+				 */
+				setBottom(bottom: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.bottom> property.
+				 */
+				setBottom(bottom: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.center> property.
+				 */
+				getCenter(): Point;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.center> property.
+				 */
+				setCenter(center: Point): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.children> property.
+				 */
+				getChildren(): Titanium.UI.View[];
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.elevation> property.
+				 */
+				getElevation(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.elevation> property.
+				 */
+				setElevation(elevation: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.focusable> property.
+				 */
+				getFocusable(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.focusable> property.
+				 */
+				setFocusable(focusable: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.height> property.
+				 */
+				getHeight(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.height> property.
+				 */
+				setHeight(height: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.height> property.
+				 */
+				setHeight(height: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.hiddenBehavior> property.
+				 */
+				getHiddenBehavior(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.hiddenBehavior> property.
+				 */
+				setHiddenBehavior(hiddenBehavior: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.left> property.
+				 */
+				getLeft(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.left> property.
+				 */
+				setLeft(left: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.left> property.
+				 */
+				setLeft(left: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.layout> property.
+				 */
+				getLayout(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.layout> property.
+				 */
+				setLayout(layout: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.opacity> property.
+				 */
+				getOpacity(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.opacity> property.
+				 */
+				setOpacity(opacity: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.overrideCurrentAnimation> property.
+				 */
+				getOverrideCurrentAnimation(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.overrideCurrentAnimation> property.
+				 */
+				setOverrideCurrentAnimation(overrideCurrentAnimation: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.right> property.
+				 */
+				getRight(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.right> property.
+				 */
+				setRight(right: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.right> property.
+				 */
+				setRight(right: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.rect> property.
+				 */
+				getRect(): Dimension;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.rotation> property.
+				 */
+				getRotation(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.rotation> property.
+				 */
+				setRotation(rotation: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.rotationX> property.
+				 */
+				getRotationX(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.rotationX> property.
+				 */
+				setRotationX(rotationX: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.rotationY> property.
+				 */
+				getRotationY(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.rotationY> property.
+				 */
+				setRotationY(rotationY: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.scaleX> property.
+				 */
+				getScaleX(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.scaleX> property.
+				 */
+				setScaleX(scaleX: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.scaleY> property.
+				 */
+				getScaleY(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.scaleY> property.
+				 */
+				setScaleY(scaleY: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.size> property.
+				 */
+				getSize(): Dimension;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.softKeyboardOnFocus> property.
+				 */
+				getSoftKeyboardOnFocus(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.softKeyboardOnFocus> property.
+				 */
+				setSoftKeyboardOnFocus(softKeyboardOnFocus: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.top> property.
+				 */
+				getTop(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.top> property.
+				 */
+				setTop(top: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.top> property.
+				 */
+				setTop(top: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.touchEnabled> property.
+				 */
+				getTouchEnabled(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.touchEnabled> property.
+				 */
+				setTouchEnabled(touchEnabled: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.touchFeedback> property.
+				 */
+				getTouchFeedback(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.touchFeedback> property.
+				 */
+				setTouchFeedback(touchFeedback: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.touchFeedbackColor> property.
+				 */
+				getTouchFeedbackColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.touchFeedbackColor> property.
+				 */
+				setTouchFeedbackColor(touchFeedbackColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.transform> property.
+				 */
+				getTransform(): Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.transform> property.
+				 */
+				setTransform(transform: Titanium.UI.Matrix2D): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.transform> property.
+				 */
+				setTransform(transform: Titanium.UI.Matrix3D): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.translationX> property.
+				 */
+				getTranslationX(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.translationX> property.
+				 */
+				setTranslationX(translationX: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.translationY> property.
+				 */
+				getTranslationY(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.translationY> property.
+				 */
+				setTranslationY(translationY: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.translationZ> property.
+				 */
+				getTranslationZ(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.translationZ> property.
+				 */
+				setTranslationZ(translationZ: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.transitionName> property.
+				 */
+				getTransitionName(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.transitionName> property.
+				 */
+				setTransitionName(transitionName: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.visible> property.
+				 */
+				getVisible(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.visible> property.
+				 */
+				setVisible(visible: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.width> property.
+				 */
+				getWidth(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.width> property.
+				 */
+				setWidth(width: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.width> property.
+				 */
+				setWidth(width: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.horizontalWrap> property.
+				 */
+				getHorizontalWrap(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.horizontalWrap> property.
+				 */
+				setHorizontalWrap(horizontalWrap: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.zIndex> property.
+				 */
+				getZIndex(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.zIndex> property.
+				 */
+				setZIndex(zIndex: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.keepScreenOn> property.
+				 */
+				getKeepScreenOn(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.keepScreenOn> property.
+				 */
+				setKeepScreenOn(keepScreenOn: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.isLeftOpen> property.
+				 */
+				getIsLeftOpen(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.isLeftOpen> property.
+				 */
+				setIsLeftOpen(isLeftOpen: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.isRightOpen> property.
+				 */
+				getIsRightOpen(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.isRightOpen> property.
+				 */
+				setIsRightOpen(isRightOpen: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.isLeftVisible> property.
+				 */
+				getIsLeftVisible(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.isLeftVisible> property.
+				 */
+				setIsLeftVisible(isLeftVisible: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.isRightVisible> property.
+				 */
+				getIsRightVisible(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.isRightVisible> property.
+				 */
+				setIsRightVisible(isRightVisible: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.leftWidth> property.
+				 */
+				getLeftWidth(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.leftWidth> property.
+				 */
+				setLeftWidth(leftWidth: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.rightWidth> property.
+				 */
+				getRightWidth(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.rightWidth> property.
+				 */
+				setRightWidth(rightWidth: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.leftView> property.
+				 */
+				getLeftView(): Titanium.UI.View;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.leftView> property.
+				 */
+				setLeftView(leftView: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.rightView> property.
+				 */
+				getRightView(): Titanium.UI.View;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.rightView> property.
+				 */
+				setRightView(rightView: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.centerView> property.
+				 */
+				getCenterView(): Titanium.UI.View;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.centerView> property.
+				 */
+				setCenterView(centerView: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.drawerIndicatorEnabled> property.
+				 */
+				getDrawerIndicatorEnabled(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.drawerIndicatorEnabled> property.
+				 */
+				setDrawerIndicatorEnabled(drawerIndicatorEnabled: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.drawerLockMode> property.
+				 */
+				getDrawerLockMode(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.drawerLockMode> property.
+				 */
+				setDrawerLockMode(drawerLockMode: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.toolbarEnabled> property.
+				 */
+				getToolbarEnabled(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.toolbarEnabled> property.
+				 */
+				setToolbarEnabled(toolbarEnabled: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.DrawerLayout.toolbar> property.
+				 */
+				getToolbar(): Titanium.UI.Toolbar;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.DrawerLayout.toolbar> property.
+				 */
+				setToolbar(toolbar: Titanium.UI.Toolbar): void;
+
 			}
+
+			/**
+			 * A progress dialog or a horizontal progress bar in the title of the window.
+			 */
+			interface ProgressIndicator extends Titanium.Proxy {
+				/**
+				 * Base elevation of the view relative to its parent in pixels.
+				 */
+				elevation: number;
+
+				/**
+				 * Sets the behavior when hiding an object to release or keep the free space
+				 */
+				hiddenBehavior: number;
+
+				/**
+				 * Clockwise 2D rotation of the view in degrees.
+				 */
+				rotation: number;
+
+				/**
+				 * Clockwise rotation of the view in degrees (x-axis).
+				 */
+				rotationX: number;
+
+				/**
+				 * Clockwise rotation of the view in degrees (y-axis).
+				 */
+				rotationY: number;
+
+				/**
+				 * Scaling of the view in x-axis in pixels.
+				 */
+				scaleX: number;
+
+				/**
+				 * Scaling of the view in y-axis in pixels.
+				 */
+				scaleY: number;
+
+				/**
+				 * A material design visual construct that provides an instantaneous visual confirmation of touch point.
+				 */
+				touchFeedback: boolean;
+
+				/**
+				 * Optional touch feedback ripple color. This has no effect unless `touchFeedback` is true.
+				 */
+				touchFeedbackColor: string;
+
+				/**
+				 * Horizontal location of the view relative to its left position in pixels.
+				 */
+				translationX: number;
+
+				/**
+				 * Vertical location of the view relative to its top position in pixels.
+				 */
+				translationY: number;
+
+				/**
+				 * Depth of the view relative to its elevation in pixels.
+				 */
+				translationZ: number;
+
+				/**
+				 * A name to identify this view in activity transition.
+				 */
+				transitionName: string;
+
+				/**
+				 * When `true` allows the user to cancel the progress dialog by pressing the BACK button.
+				 */
+				cancelable: boolean;
+
+				/**
+				 * When `cancelable` is set to `true` and this is set to `true`, the dialog is canceled when touched outside the window's bounds.
+				 */
+				canceledOnTouchOutside: boolean;
+
+				/**
+				 * Message text.
+				 */
+				message: string;
+
+				/**
+				 * Key identifying a string in the locale file to use for the message text.
+				 */
+				messageid: string;
+
+				/**
+				 * Minimum value of the progress bar.
+				 */
+				min: number;
+
+				/**
+				 * Maximum value of the progress bar.
+				 */
+				max: number;
+
+				/**
+				 * Location for the progress indicator.
+				 */
+				location: number;
+
+				/**
+				 * Type for the progress indicator.
+				 */
+				type: number;
+
+				/**
+				 * Finishes a batch update of the View's layout properties and schedules a layout pass of the
+				 * view tree.
+				 */
+				finishLayout(): void;
+
+				/**
+				 * Hides the progress indicator and stops the animation.
+				 */
+				hide(options?: AnimationOption): void;
+
+				/**
+				 * Inserts a view at the specified position in the [children](Titanium.UI.View.children) array.
+				 */
+				insertAt(params: any): void;
+
+				/**
+				 * Replaces a view at the specified position in the [children](Titanium.UI.View.children) array.
+				 */
+				replaceAt(params: any): void;
+
+				/**
+				 * Shows the progress indicator and starts the animation.
+				 */
+				show(options?: AnimationOption): void;
+
+				/**
+				 * Starts a batch update of this view's layout properties.
+				 */
+				startLayout(): void;
+
+				/**
+				 * Performs a batch update of all supplied layout properties and schedules a layout pass after
+				 * they have been updated.
+				 */
+				updateLayout(params: any): void;
+
+				/**
+				 * Returns the matching view of a given view ID.
+				 */
+				getViewById(id: string): Titanium.UI.View;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.ProgressIndicator.elevation> property.
+				 */
+				getElevation(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.ProgressIndicator.elevation> property.
+				 */
+				setElevation(elevation: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.ProgressIndicator.hiddenBehavior> property.
+				 */
+				getHiddenBehavior(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.ProgressIndicator.hiddenBehavior> property.
+				 */
+				setHiddenBehavior(hiddenBehavior: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.ProgressIndicator.rotation> property.
+				 */
+				getRotation(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.ProgressIndicator.rotation> property.
+				 */
+				setRotation(rotation: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.ProgressIndicator.rotationX> property.
+				 */
+				getRotationX(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.ProgressIndicator.rotationX> property.
+				 */
+				setRotationX(rotationX: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.ProgressIndicator.rotationY> property.
+				 */
+				getRotationY(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.ProgressIndicator.rotationY> property.
+				 */
+				setRotationY(rotationY: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.ProgressIndicator.scaleX> property.
+				 */
+				getScaleX(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.ProgressIndicator.scaleX> property.
+				 */
+				setScaleX(scaleX: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.ProgressIndicator.scaleY> property.
+				 */
+				getScaleY(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.ProgressIndicator.scaleY> property.
+				 */
+				setScaleY(scaleY: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.ProgressIndicator.touchFeedback> property.
+				 */
+				getTouchFeedback(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.ProgressIndicator.touchFeedback> property.
+				 */
+				setTouchFeedback(touchFeedback: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.ProgressIndicator.touchFeedbackColor> property.
+				 */
+				getTouchFeedbackColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.ProgressIndicator.touchFeedbackColor> property.
+				 */
+				setTouchFeedbackColor(touchFeedbackColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.ProgressIndicator.translationX> property.
+				 */
+				getTranslationX(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.ProgressIndicator.translationX> property.
+				 */
+				setTranslationX(translationX: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.ProgressIndicator.translationY> property.
+				 */
+				getTranslationY(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.ProgressIndicator.translationY> property.
+				 */
+				setTranslationY(translationY: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.ProgressIndicator.translationZ> property.
+				 */
+				getTranslationZ(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.ProgressIndicator.translationZ> property.
+				 */
+				setTranslationZ(translationZ: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.ProgressIndicator.transitionName> property.
+				 */
+				getTransitionName(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.ProgressIndicator.transitionName> property.
+				 */
+				setTransitionName(transitionName: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.ProgressIndicator.cancelable> property.
+				 */
+				getCancelable(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.ProgressIndicator.cancelable> property.
+				 */
+				setCancelable(cancelable: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.ProgressIndicator.canceledOnTouchOutside> property.
+				 */
+				getCanceledOnTouchOutside(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.ProgressIndicator.canceledOnTouchOutside> property.
+				 */
+				setCanceledOnTouchOutside(canceledOnTouchOutside: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.ProgressIndicator.message> property.
+				 */
+				getMessage(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.ProgressIndicator.message> property.
+				 */
+				setMessage(message: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.ProgressIndicator.messageid> property.
+				 */
+				getMessageid(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.ProgressIndicator.messageid> property.
+				 */
+				setMessageid(messageid: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.ProgressIndicator.min> property.
+				 */
+				getMin(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.ProgressIndicator.min> property.
+				 */
+				setMin(min: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.ProgressIndicator.max> property.
+				 */
+				getMax(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.ProgressIndicator.max> property.
+				 */
+				setMax(max: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.ProgressIndicator.location> property.
+				 */
+				getLocation(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.ProgressIndicator.location> property.
+				 */
+				setLocation(location: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.ProgressIndicator.type> property.
+				 */
+				getType(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.ProgressIndicator.type> property.
+				 */
+				setType(type: number): void;
+
+			}
+
+			/**
+			 * A specialized text field for entering search text.
+			 */
+			interface SearchView extends Titanium.Proxy {
+				/**
+				 * Whether the view should be "hidden" from (i.e., ignored by) the accessibility service.
+				 */
+				accessibilityHidden: boolean;
+
+				/**
+				 * Briefly describes what performing an action (such as a click) on the view will do.
+				 */
+				accessibilityHint: string;
+
+				/**
+				 * A succint label identifying the view for the device's accessibility service.
+				 */
+				accessibilityLabel: string;
+
+				/**
+				 * A string describing the value (if any) of the view for the device's accessibility service.
+				 */
+				accessibilityValue: string;
+
+				/**
+				 * Background color of the view, as a color name or hex triplet.
+				 */
+				backgroundColor: string;
+
+				/**
+				 * Disabled background color of the view, as a color name or hex triplet.
+				 */
+				backgroundDisabledColor: string;
+
+				/**
+				 * Disabled background image for the view, specified as a local file path or URL.
+				 */
+				backgroundDisabledImage: string;
+
+				/**
+				 * Focused background color of the view, as a color name or hex triplet.
+				 */
+				backgroundFocusedColor: string;
+
+				/**
+				 * Focused background image for the view, specified as a local file path or URL.
+				 */
+				backgroundFocusedImage: string;
+
+				/**
+				 * A background gradient for the view.
+				 */
+				backgroundGradient: Gradient;
+
+				/**
+				 * Background image for the view, specified as a local file path or URL.
+				 */
+				backgroundImage: string;
+
+				/**
+				 * Determines whether to tile a background across a view.
+				 */
+				backgroundRepeat: boolean;
+
+				/**
+				 * Selected background color of the view, as a color name or hex triplet.
+				 */
+				backgroundSelectedColor: string;
+
+				/**
+				 * Selected background image url for the view, specified as a local file path or URL.
+				 */
+				backgroundSelectedImage: string;
+
+				/**
+				 * Border color of the view, as a color name or hex triplet.
+				 */
+				borderColor: string;
+
+				/**
+				 * Radius for the rounded corners of the view's border.
+				 */
+				borderRadius: number;
+
+				/**
+				 * Border width of the view.
+				 */
+				borderWidth: number;
+
+				/**
+				 * View's bottom position, in platform-specific units.
+				 */
+				bottom: number | string;
+
+				/**
+				 * View's center position, in the parent view's coordinates.
+				 */
+				center: Point;
+
+				/**
+				 * Array of this view's child views.
+				 */
+				readonly children: Titanium.UI.View[];
+
+				/**
+				 * Base elevation of the view relative to its parent in pixels.
+				 */
+				elevation: number;
+
+				/**
+				 * Whether view should be focusable while navigating with the trackball.
+				 */
+				focusable: boolean;
+
+				/**
+				 * View height, in platform-specific units.
+				 */
+				height: number | string;
+
+				/**
+				 * Sets the behavior when hiding an object to release or keep the free space
+				 */
+				hiddenBehavior: number;
+
+				/**
+				 * View's left position, in platform-specific units.
+				 */
+				left: number | string;
+
+				/**
+				 * Specifies how the view positions its children.
+				 * One of: 'composite', 'vertical', or 'horizontal'.
+				 */
+				layout: string;
+
+				/**
+				 * Opacity of this view, from 0.0 (transparent) to 1.0 (opaque).
+				 */
+				opacity: number;
+
+				/**
+				 * When on, animate call overrides current animation if applicable.
+				 */
+				overrideCurrentAnimation: boolean;
+
+				/**
+				 * View's right position, in platform-specific units.
+				 */
+				right: number | string;
+
+				/**
+				 * The bounding box of the view relative to its parent, in system units.
+				 */
+				readonly rect: Dimension;
+
+				/**
+				 * Clockwise 2D rotation of the view in degrees.
+				 */
+				rotation: number;
+
+				/**
+				 * Clockwise rotation of the view in degrees (x-axis).
+				 */
+				rotationX: number;
+
+				/**
+				 * Clockwise rotation of the view in degrees (y-axis).
+				 */
+				rotationY: number;
+
+				/**
+				 * Scaling of the view in x-axis in pixels.
+				 */
+				scaleX: number;
+
+				/**
+				 * Scaling of the view in y-axis in pixels.
+				 */
+				scaleY: number;
+
+				/**
+				 * The size of the view in system units.
+				 */
+				readonly size: Dimension;
+
+				/**
+				 * Determines keyboard behavior when this view is focused.
+				 */
+				softKeyboardOnFocus: number;
+
+				/**
+				 * The view's top position.
+				 */
+				top: number | string;
+
+				/**
+				 * Determines whether view should receive touch events.
+				 */
+				touchEnabled: boolean;
+
+				/**
+				 * A material design visual construct that provides an instantaneous visual confirmation of touch point.
+				 */
+				touchFeedback: boolean;
+
+				/**
+				 * Optional touch feedback ripple color. This has no effect unless `touchFeedback` is true.
+				 */
+				touchFeedbackColor: string;
+
+				/**
+				 * Transformation matrix to apply to the view.
+				 */
+				transform: Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
+
+				/**
+				 * Horizontal location of the view relative to its left position in pixels.
+				 */
+				translationX: number;
+
+				/**
+				 * Vertical location of the view relative to its top position in pixels.
+				 */
+				translationY: number;
+
+				/**
+				 * Depth of the view relative to its elevation in pixels.
+				 */
+				translationZ: number;
+
+				/**
+				 * A name to identify this view in activity transition.
+				 */
+				transitionName: string;
+
+				/**
+				 * Determines whether the view is visible.
+				 */
+				visible: boolean;
+
+				/**
+				 * View's width, in platform-specific units.
+				 */
+				width: number | string;
+
+				/**
+				 * Determines whether the layout has wrapping behavior.
+				 */
+				horizontalWrap: boolean;
+
+				/**
+				 * Z-index stack order position, relative to other sibling views.
+				 */
+				zIndex: number;
+
+				/**
+				 * Determines whether to keep the device screen on.
+				 */
+				keepScreenOn: boolean;
+
+				/**
+				 * Color of the text in this SearchView, as a color name or hex triplet.
+				 */
+				color: string;
+
+				/**
+				 * Text to show when the search view field is not focused.
+				 */
+				hintText: string;
+
+				/**
+				 * Value of the search view.
+				 */
+				value: string;
+
+				/**
+				 * Iconifies or expands the search view
+				 */
+				iconified: boolean;
+
+				/**
+				 * Sets the default or resting state of the search view
+				 */
+				iconifiedByDefault: boolean;
+
+				/**
+				 * Whether to display the submit button when necessary or never display.
+				 */
+				submitEnabled: boolean;
+
+				/**
+				 * Animates this view.
+				 */
+				animate(animation: any, callback?: (param0: any) => any): void;
+
+				/**
+				 * Finishes a batch update of the View's layout properties and schedules a layout pass of the
+				 * view tree.
+				 */
+				finishLayout(): void;
+
+				/**
+				 * Hides this view.
+				 */
+				hide(options?: AnimationOption): void;
+
+				/**
+				 * Inserts a view at the specified position in the [children](Titanium.UI.View.children) array.
+				 */
+				insertAt(params: any): void;
+
+				/**
+				 * Removes a child view from this view's hierarchy.
+				 */
+				remove(view: any): void;
+
+				/**
+				 * Removes all child views from this view's hierarchy.
+				 */
+				removeAllChildren(): void;
+
+				/**
+				 * Replaces a view at the specified position in the [children](Titanium.UI.View.children) array.
+				 */
+				replaceAt(params: any): void;
+
+				/**
+				 * Makes this view visible.
+				 */
+				show(options?: AnimationOption): void;
+
+				/**
+				 * Starts a batch update of this view's layout properties.
+				 */
+				startLayout(): void;
+
+				/**
+				 * Returns an image of the rendered view, as a Blob.
+				 */
+				toImage(callback?: (param0: Titanium.Blob) => any, honorScaleFactor?: boolean): Titanium.Blob;
+
+				/**
+				 * Performs a batch update of all supplied layout properties and schedules a layout pass after
+				 * they have been updated.
+				 */
+				updateLayout(params: any): void;
+
+				/**
+				 * Translates a point from this view's coordinate system to another view's coordinate system.
+				 */
+				convertPointToView(point: Point, destinationView: any): Point;
+
+				/**
+				 * Returns the matching view of a given view ID.
+				 */
+				getViewById(id: string): Titanium.UI.View;
+
+				/**
+				 * Causes the search view to lose focus.
+				 */
+				blur(): void;
+
+				/**
+				 * Causes the search view to gain focus.
+				 */
+				focus(): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.accessibilityHidden> property.
+				 */
+				getAccessibilityHidden(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.accessibilityHidden> property.
+				 */
+				setAccessibilityHidden(accessibilityHidden: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.accessibilityHint> property.
+				 */
+				getAccessibilityHint(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.accessibilityHint> property.
+				 */
+				setAccessibilityHint(accessibilityHint: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.accessibilityLabel> property.
+				 */
+				getAccessibilityLabel(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.accessibilityLabel> property.
+				 */
+				setAccessibilityLabel(accessibilityLabel: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.accessibilityValue> property.
+				 */
+				getAccessibilityValue(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.accessibilityValue> property.
+				 */
+				setAccessibilityValue(accessibilityValue: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.backgroundColor> property.
+				 */
+				getBackgroundColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.backgroundColor> property.
+				 */
+				setBackgroundColor(backgroundColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.backgroundDisabledColor> property.
+				 */
+				getBackgroundDisabledColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.backgroundDisabledColor> property.
+				 */
+				setBackgroundDisabledColor(backgroundDisabledColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.backgroundDisabledImage> property.
+				 */
+				getBackgroundDisabledImage(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.backgroundDisabledImage> property.
+				 */
+				setBackgroundDisabledImage(backgroundDisabledImage: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.backgroundFocusedColor> property.
+				 */
+				getBackgroundFocusedColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.backgroundFocusedColor> property.
+				 */
+				setBackgroundFocusedColor(backgroundFocusedColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.backgroundFocusedImage> property.
+				 */
+				getBackgroundFocusedImage(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.backgroundFocusedImage> property.
+				 */
+				setBackgroundFocusedImage(backgroundFocusedImage: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.backgroundGradient> property.
+				 */
+				getBackgroundGradient(): Gradient;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.backgroundGradient> property.
+				 */
+				setBackgroundGradient(backgroundGradient: Gradient): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.backgroundImage> property.
+				 */
+				getBackgroundImage(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.backgroundImage> property.
+				 */
+				setBackgroundImage(backgroundImage: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.backgroundRepeat> property.
+				 */
+				getBackgroundRepeat(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.backgroundRepeat> property.
+				 */
+				setBackgroundRepeat(backgroundRepeat: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.backgroundSelectedColor> property.
+				 */
+				getBackgroundSelectedColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.backgroundSelectedColor> property.
+				 */
+				setBackgroundSelectedColor(backgroundSelectedColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.backgroundSelectedImage> property.
+				 */
+				getBackgroundSelectedImage(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.backgroundSelectedImage> property.
+				 */
+				setBackgroundSelectedImage(backgroundSelectedImage: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.borderColor> property.
+				 */
+				getBorderColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.borderColor> property.
+				 */
+				setBorderColor(borderColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.borderRadius> property.
+				 */
+				getBorderRadius(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.borderRadius> property.
+				 */
+				setBorderRadius(borderRadius: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.borderWidth> property.
+				 */
+				getBorderWidth(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.borderWidth> property.
+				 */
+				setBorderWidth(borderWidth: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.bottom> property.
+				 */
+				getBottom(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.bottom> property.
+				 */
+				setBottom(bottom: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.bottom> property.
+				 */
+				setBottom(bottom: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.center> property.
+				 */
+				getCenter(): Point;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.center> property.
+				 */
+				setCenter(center: Point): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.children> property.
+				 */
+				getChildren(): Titanium.UI.View[];
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.elevation> property.
+				 */
+				getElevation(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.elevation> property.
+				 */
+				setElevation(elevation: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.focusable> property.
+				 */
+				getFocusable(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.focusable> property.
+				 */
+				setFocusable(focusable: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.height> property.
+				 */
+				getHeight(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.height> property.
+				 */
+				setHeight(height: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.height> property.
+				 */
+				setHeight(height: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.hiddenBehavior> property.
+				 */
+				getHiddenBehavior(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.hiddenBehavior> property.
+				 */
+				setHiddenBehavior(hiddenBehavior: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.left> property.
+				 */
+				getLeft(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.left> property.
+				 */
+				setLeft(left: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.left> property.
+				 */
+				setLeft(left: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.layout> property.
+				 */
+				getLayout(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.layout> property.
+				 */
+				setLayout(layout: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.opacity> property.
+				 */
+				getOpacity(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.opacity> property.
+				 */
+				setOpacity(opacity: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.overrideCurrentAnimation> property.
+				 */
+				getOverrideCurrentAnimation(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.overrideCurrentAnimation> property.
+				 */
+				setOverrideCurrentAnimation(overrideCurrentAnimation: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.right> property.
+				 */
+				getRight(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.right> property.
+				 */
+				setRight(right: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.right> property.
+				 */
+				setRight(right: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.rect> property.
+				 */
+				getRect(): Dimension;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.rotation> property.
+				 */
+				getRotation(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.rotation> property.
+				 */
+				setRotation(rotation: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.rotationX> property.
+				 */
+				getRotationX(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.rotationX> property.
+				 */
+				setRotationX(rotationX: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.rotationY> property.
+				 */
+				getRotationY(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.rotationY> property.
+				 */
+				setRotationY(rotationY: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.scaleX> property.
+				 */
+				getScaleX(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.scaleX> property.
+				 */
+				setScaleX(scaleX: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.scaleY> property.
+				 */
+				getScaleY(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.scaleY> property.
+				 */
+				setScaleY(scaleY: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.size> property.
+				 */
+				getSize(): Dimension;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.softKeyboardOnFocus> property.
+				 */
+				getSoftKeyboardOnFocus(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.softKeyboardOnFocus> property.
+				 */
+				setSoftKeyboardOnFocus(softKeyboardOnFocus: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.top> property.
+				 */
+				getTop(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.top> property.
+				 */
+				setTop(top: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.top> property.
+				 */
+				setTop(top: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.touchEnabled> property.
+				 */
+				getTouchEnabled(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.touchEnabled> property.
+				 */
+				setTouchEnabled(touchEnabled: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.touchFeedback> property.
+				 */
+				getTouchFeedback(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.touchFeedback> property.
+				 */
+				setTouchFeedback(touchFeedback: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.touchFeedbackColor> property.
+				 */
+				getTouchFeedbackColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.touchFeedbackColor> property.
+				 */
+				setTouchFeedbackColor(touchFeedbackColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.transform> property.
+				 */
+				getTransform(): Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.transform> property.
+				 */
+				setTransform(transform: Titanium.UI.Matrix2D): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.transform> property.
+				 */
+				setTransform(transform: Titanium.UI.Matrix3D): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.translationX> property.
+				 */
+				getTranslationX(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.translationX> property.
+				 */
+				setTranslationX(translationX: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.translationY> property.
+				 */
+				getTranslationY(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.translationY> property.
+				 */
+				setTranslationY(translationY: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.translationZ> property.
+				 */
+				getTranslationZ(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.translationZ> property.
+				 */
+				setTranslationZ(translationZ: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.transitionName> property.
+				 */
+				getTransitionName(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.transitionName> property.
+				 */
+				setTransitionName(transitionName: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.visible> property.
+				 */
+				getVisible(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.visible> property.
+				 */
+				setVisible(visible: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.width> property.
+				 */
+				getWidth(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.width> property.
+				 */
+				setWidth(width: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.width> property.
+				 */
+				setWidth(width: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.horizontalWrap> property.
+				 */
+				getHorizontalWrap(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.horizontalWrap> property.
+				 */
+				setHorizontalWrap(horizontalWrap: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.zIndex> property.
+				 */
+				getZIndex(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.zIndex> property.
+				 */
+				setZIndex(zIndex: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.keepScreenOn> property.
+				 */
+				getKeepScreenOn(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.keepScreenOn> property.
+				 */
+				setKeepScreenOn(keepScreenOn: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.color> property.
+				 */
+				getColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.color> property.
+				 */
+				setColor(color: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.hintText> property.
+				 */
+				getHintText(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.hintText> property.
+				 */
+				setHintText(hintText: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.value> property.
+				 */
+				getValue(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.value> property.
+				 */
+				setValue(value: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.iconified> property.
+				 */
+				getIconified(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.iconified> property.
+				 */
+				setIconified(iconified: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.iconifiedByDefault> property.
+				 */
+				getIconifiedByDefault(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.iconifiedByDefault> property.
+				 */
+				setIconifiedByDefault(iconifiedByDefault: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.submitEnabled> property.
+				 */
+				getSubmitEnabled(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.submitEnabled> property.
+				 */
+				setSubmitEnabled(submitEnabled: boolean): void;
+
+			}
+
 		}
-		export interface MobileWeb  {
-			forwardGeocoderTimeout : number;
-			locationTimeout : number;
-			maximumHeadingAge : number;
-			maximumLocationAge : number;
-			reverseGeocoderTimeout : number;
-			getForwardGeocoderTimeout () : number;
-			getLocationTimeout () : number;
-			getMaximumHeadingAge () : number;
-			getMaximumLocationAge () : number;
-			getReverseGeocoderTimeout () : number;
-			setForwardGeocoderTimeout (forwardGeocoderTimeout: number) : void;
-			setLocationTimeout (locationTimeout: number) : void;
-			setMaximumHeadingAge (maximumHeadingAge: number) : void;
-			setMaximumLocationAge (maximumLocationAge: number) : void;
-			setReverseGeocoderTimeout (reverseGeocoderTimeout: number) : void;
+
+		/**
+		 * A module used for accessing clipboard data.
+		 */
+		namespace Clipboard {
+			/**
+			 * Indicates if the proxy will bubble an event to its parent.
+			 */
+			let bubbleParent: boolean;
+
+			/**
+			 * The name of the API that this proxy corresponds to.
+			 */
+			const apiName: string;
+
+			/**
+			 * The Window or TabGroup whose Activity lifecycle should be triggered on the proxy.
+			 */
+			let lifecycleContainer: Titanium.UI.Window | Titanium.UI.TabGroup;
+
+			/**
+			 * Create a new named clipboard.
+			 */
+			let name: string;
+
+			/**
+			 * Create a new clipboard identified by a unique system-generated name.
+			 */
+			let unique: boolean;
+
+			/**
+			 * Create a clipboard identified by name if it doesn't exist.
+			 */
+			let allowCreation: boolean;
+
+			/**
+			 * Adds the specified callback as an event listener for the named event.
+			 */
+			function addEventListener(name: string, callback: (param0: any) => any): void;
+
+			/**
+			 * Removes the specified callback as an event listener for the named event.
+			 */
+			function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+			/**
+			 * Fires a synthesized event to any registered listeners.
+			 */
+			function fireEvent(name: string, event: any): void;
+
+			/**
+			 * Applies the properties to the proxy.
+			 */
+			function applyProperties(props: any): void;
+
+			/**
+			 * Deletes data of the specified MIME type stored in the clipboard. If MIME type omitted, all
+			 * data is deleted.
+			 */
+			function clearData(type?: string): void;
+
+			/**
+			 * Deletes all text data stored in the clipboard.
+			 */
+			function clearText(): void;
+
+			/**
+			 * Gets data of the specified MIME type stored in the clipboard.
+			 */
+			function getData(type: string): string | Titanium.Blob;
+
+			/**
+			 * Gets text data stored in the clipboard.
+			 */
+			function getText(): string;
+
+			/**
+			 * Indicates whether any data of the specified MIME type is stored in the clipboard.
+			 */
+			function hasData(type: string): boolean;
+
+			/**
+			 * Indicates whether any text data is stored in the clipboard.
+			 */
+			function hasText(): boolean;
+
+			/**
+			 * Indicates whether any URLs are stored in the clipboard.
+			 */
+			function hasURLs(): boolean;
+
+			/**
+			 * Indicates whether any images are stored in the clipboard.
+			 */
+			function hasImages(): boolean;
+
+			/**
+			 * Indicates whether any colors are stored in the clipboard.
+			 */
+			function hasColors(): boolean;
+
+			/**
+			 * Stores data of the specified MIME type in the clipboard.
+			 */
+			function setData(type: string, data: any): void;
+
+			/**
+			 * Stores text data in the clipboard.
+			 */
+			function setText(text: string): void;
+
+			/**
+			 * Adds an array of items to a clipboard, and sets privacy options for all included items.
+			 */
+			function setItems(items: ClipboardItemsType): void;
+
+			/**
+			 * Gets the items that have been specified earlier using <Titanium.UI.Clipboard.setItems>.
+			 */
+			function getItems(): any[];
+
+			/**
+			 * Removes the clipboard.
+			 */
+			function remove(): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Clipboard.bubbleParent> property.
+			 */
+			function getBubbleParent(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Clipboard.bubbleParent> property.
+			 */
+			function setBubbleParent(bubbleParent: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Clipboard.apiName> property.
+			 */
+			function getApiName(): string;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Clipboard.lifecycleContainer> property.
+			 */
+			function getLifecycleContainer(): Titanium.UI.Window | Titanium.UI.TabGroup;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Clipboard.lifecycleContainer> property.
+			 */
+			function setLifecycleContainer(lifecycleContainer: Titanium.UI.Window): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Clipboard.lifecycleContainer> property.
+			 */
+			function setLifecycleContainer(lifecycleContainer: Titanium.UI.TabGroup): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Clipboard.name> property.
+			 */
+			function getName(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Clipboard.name> property.
+			 */
+			function setName(name: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Clipboard.unique> property.
+			 */
+			function getUnique(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Clipboard.unique> property.
+			 */
+			function setUnique(unique: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.Clipboard.allowCreation> property.
+			 */
+			function getAllowCreation(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Clipboard.allowCreation> property.
+			 */
+			function setAllowCreation(allowCreation: boolean): void;
+
 		}
-	}
-	export interface Proxy  {
-		apiName : string;
-		bubbleParent : boolean;
-		addEventListener (name: string, callback: (...args : any[]) => any) : void;
-		applyProperties (props: Dictionary<Object>) : void;
-		fireEvent (name: string, event: Dictionary<Object>) : void;
-		getApiName () : string;
-		getBubbleParent () : boolean;
-		removeEventListener (name: string, callback: (...args : any[]) => any) : void;
-		setBubbleParent (bubbleParent: boolean) : void;
-	}
-	export module Map {
-		export var ANNOTATION_DRAG_STATE_CANCEL : number;
-		export var ANNOTATION_DRAG_STATE_DRAG : number;
-		export var ANNOTATION_DRAG_STATE_END : number;
-		export var ANNOTATION_DRAG_STATE_NONE : number;
-		export var ANNOTATION_DRAG_STATE_START : number;
-		export var ANNOTATION_GREEN : number;
-		export var ANNOTATION_PURPLE : number;
-		export var ANNOTATION_RED : number;
-		export var HYBRID_TYPE : number;
-		export var SATELLITE_TYPE : number;
-		export var STANDARD_TYPE : number;
-		export var TERRAIN_TYPE : number;
-		export var apiName : string;
-		export var bubbleParent : boolean;
-		export function addEventListener (name: string, callback: (...args : any[]) => any) : void;
-		export function applyProperties (props: Dictionary<Object>) : void;
-		export function createAnnotation (parameters?: Dictionary<Ti.Map.Annotation>) : Ti.Map.Annotation;
-		export function createView (parameters?: Dictionary<Ti.Map.View>) : Ti.Map.View;
-		export function fireEvent (name: string, event: Dictionary<Object>) : void;
-		export function getApiName () : string;
-		export function getBubbleParent () : boolean;
-		export function removeEventListener (name: string, callback: (...args : any[]) => any) : void;
-		export function setBubbleParent (bubbleParent: boolean) : void;
-		export interface View extends Ti.UI.View {
-			animated : boolean;
-			annotations : Array<Ti.Map.Annotation>;
-			hideAnnotationWhenTouchMap : boolean;
-			latitudeDelta : number;
-			longitudeDelta : number;
-			mapType : number;
-			region : MapRegionType;
-			regionFit : boolean;
-			userLocation : boolean;
-			addAnnotation (annotation: Dictionary<Ti.Map.Annotation>) : void;
-			addAnnotation (annotation: Ti.Map.Annotation) : void;
-			addAnnotations (annotations: Array<Ti.Map.Annotation>) : void;
-			addAnnotations (annotations: Array<Dictionary<Ti.Map.Annotation>>) : void;
-			addRoute (route: MapRouteType) : void;
-			deselectAnnotation (annotation: string) : void;
-			deselectAnnotation (annotation: Ti.Map.Annotation) : void;
-			getAnimate () : boolean;
-			getAnimated () : boolean;
-			getAnnotations () : Array<Ti.Map.Annotation>;
-			getHideAnnotationWhenTouchMap () : boolean;
-			getLatitudeDelta () : number;
-			getLongitudeDelta () : number;
-			getMapType () : number;
-			getRegion () : MapRegionType;
-			getRegionFit () : boolean;
-			getUserLocation () : boolean;
-			removeAllAnnotations () : void;
-			removeAnnotation (annotation: string) : void;
-			removeAnnotation (annotation: Ti.Map.Annotation) : void;
-			removeAnnotations (annotations: Array<String>) : void;
-			removeAnnotations (annotations: Array<Ti.Map.Annotation>) : void;
-			removeRoute (route: MapRouteType) : void;
-			selectAnnotation (annotation: string) : void;
-			selectAnnotation (annotation: Ti.Map.Annotation) : void;
-			setAnimate (animate: boolean) : void;
-			setAnimated (animated: boolean) : void;
-			setAnnotations (annotations: Array<Ti.Map.Annotation>) : void;
-			setHideAnnotationWhenTouchMap (hideAnnotationWhenTouchMap: boolean) : void;
-			setLocation (location: MapLocationType) : void;
-			setMapType (mapType: number) : void;
-			setRegion (region: MapRegionType) : void;
-			setRegionFit (regionFit: boolean) : void;
-			setUserLocation (userLocation: boolean) : void;
-			zoom (level: number) : void;
-		}
-		export interface Annotation extends Ti.Proxy {
-			animate : boolean;
-			canShowCallout : boolean;
-			centerOffset : Point;
-			customView : Ti.UI.View;
-			draggable : boolean;
-			image : any;
-			latitude : number;
-			leftButton : any;
-			leftView : Ti.UI.View;
-			longitude : number;
-			pinImage : string;
-			pincolor : number;
-			rightButton : any;
-			rightView : Ti.UI.View;
-			subtitle : string;
-			subtitleid : string;
-			title : string;
-			titleid : string;
-			getAnimate () : boolean;
-			getCanShowCallout () : boolean;
-			getCenterOffset () : Point;
-			getCustomView () : Ti.UI.View;
-			getDraggable () : boolean;
-			getImage () : any;
-			getLatitude () : number;
-			getLeftButton () : any;
-			getLeftView () : Ti.UI.View;
-			getLongitude () : number;
-			getPinImage () : string;
-			getPincolor () : number;
-			getRightButton () : any;
-			getRightView () : Ti.UI.View;
-			getSubtitle () : string;
-			getSubtitleid () : string;
-			getTitle () : string;
-			getTitleid () : string;
-			setAnimate (animate: boolean) : void;
-			setCanShowCallout (canShowCallout: boolean) : void;
-			setCenterOffset (centerOffset: Point) : void;
-			setCustomView (customView: Ti.UI.View) : void;
-			setDraggable (draggable: boolean) : void;
-			setImage (image: string) : void;
-			setImage (image: Ti.Blob) : void;
-			setLatitude (latitude: number) : void;
-			setLeftButton (leftButton: number) : void;
-			setLeftButton (leftButton: string) : void;
-			setLeftView (leftView: Ti.UI.View) : void;
-			setLongitude (longitude: number) : void;
-			setPinImage (pinImage: string) : void;
-			setPincolor (pincolor: number) : void;
-			setRightButton (rightButton: number) : void;
-			setRightButton (rightButton: string) : void;
-			setRightView (rightView: Ti.UI.View) : void;
-			setSubtitle (subtitle: string) : void;
-			setSubtitleid (subtitleid: string) : void;
-			setTitle (title: string) : void;
-			setTitleid (titleid: string) : void;
-		}
-	}
-	export module Cloud {
-		export var accessToken : string;
-		export var apiName : string;
-		export var bubbleParent : boolean;
-		export var debug : boolean;
-		export var expiresIn : number;
-		export var ondatastream : (...args : any[]) => any;
-		export var onsendstream : (...args : any[]) => any;
-		export var sessionId : string;
-		export var useSecure : boolean;
-		export function applyProperties (props: Dictionary<Object>) : void;
-		export function getAccessToken () : string;
-		export function getApiName () : string;
-		export function getBubbleParent () : boolean;
-		export function getDebug () : boolean;
-		export function getExpiresIn () : number;
-		export function getOndatastream () : (...args : any[]) => any;
-		export function getOnsendstream () : (...args : any[]) => any;
-		export function getSessionId () : string;
-		export function getUseSecure () : boolean;
-		export function hasStoredSession () : boolean;
-		export function retrieveStoredSession () : string;
-		export function sendRequest (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-		export function setAccessToken (accessToken: string) : void;
-		export function setBubbleParent (bubbleParent: boolean) : void;
-		export function setDebug (debug: boolean) : void;
-		export function setOndatastream (ondatastream: (...args : any[]) => any) : void;
-		export function setOnsendstream (onsendstream: (...args : any[]) => any) : void;
-		export function setSessionId (sessionId: string) : void;
-		export function setUseSecure (useSecure: boolean) : void;
-		export interface Objects  {
-			create (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			query (parameters?: Dictionary<Object>, callback?: (...args : any[]) => any) : void;
-			remove (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			show (parameters?: Dictionary<Object>, callback?: (...args : any[]) => any) : void;
-			update (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-		}
-		export interface SocialIntegrations  {
-			externalAccountLink (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			externalAccountLogin (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			externalAccountUnlink (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			searchFacebookFriends (callback: (...args : any[]) => any) : void;
-		}
-		export interface PushNotifications  {
-			notify (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			notifyTokens (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			query (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			queryChannels (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			resetBadge (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			setBadge (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			showChannels (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			subscribe (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			subscribeToken (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			unsubscribe (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			unsubscribeToken (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			updateSubscription (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-		}
-		export interface Clients  {
-			geolocate (parameters?: Dictionary<Object>, callback?: (...args : any[]) => any) : void;
-		}
-		export interface ACLs  {
-			addUser (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			checkUser (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			create (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			remove (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			removeUser (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			show (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			update (parameters?: Dictionary<Object>, callback?: (...args : any[]) => any) : void;
-		}
-		export interface Users  {
-			create (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			login (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			logout (callback: (...args : any[]) => any) : void;
-			query (parameters?: Dictionary<Object>, callback?: (...args : any[]) => any) : void;
-			remove (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			requestResetPassword (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			resendConfirmation (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			search (parameters?: Dictionary<Object>, callback?: (...args : any[]) => any) : void;
-			secureCreate (parameters?: Dictionary<CloudUsersSecureDialog>, callback?: (...args : any[]) => any) : void;
-			secureLogin (parameters?: Dictionary<CloudUsersSecureDialog>, callback?: (...args : any[]) => any) : void;
-			secureStatus () : boolean;
-			show (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			showMe (callback: (...args : any[]) => any) : void;
-			update (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-		}
-		export interface Messages  {
-			create (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			remove (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			removeThread (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			reply (parameters?: Dictionary<Object>, callback?: (...args : any[]) => any) : void;
-			show (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			showInbox (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			showSent (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			showThread (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			showThreads (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-		}
-		export interface Events  {
-			create (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			query (parameters?: Dictionary<Object>, callback?: (...args : any[]) => any) : void;
-			queryOccurrences (parameters?: Dictionary<Object>, callback?: (...args : any[]) => any) : void;
-			remove (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			search (parameters?: Dictionary<Object>, callback?: (...args : any[]) => any) : void;
-			searchOccurrences (parameters?: Dictionary<Object>, callback?: (...args : any[]) => any) : void;
-			show (parameters?: Dictionary<Object>, callback?: (...args : any[]) => any) : void;
-			showOccurrences (parameters?: Dictionary<Object>, callback?: (...args : any[]) => any) : void;
-			update (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-		}
-		export interface Reviews  {
-			create (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			query (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			remove (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			show (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			update (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-		}
-		export interface Chats  {
-			create (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			getChatGroups (parameters?: Dictionary<Object>, callback?: (...args : any[]) => any) : void;
-			query (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			queryChatGroups (parameters?: Dictionary<Object>, callback?: (...args : any[]) => any) : void;
-			remove (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-		}
-		export interface KeyValues  {
-			append (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			get (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			increment (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			remove (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			set (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-		}
-		export interface GeoFences  {
-			create (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			query (parameters?: Dictionary<Object>, callback?: (...args : any[]) => any) : void;
-			remove (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			update (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-		}
-		export interface Checkins  {
-			create (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			query (parameters?: Dictionary<Object>, callback?: (...args : any[]) => any) : void;
-			remove (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			show (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-		}
-		export interface Friends  {
-			add (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			approve (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			remove (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			requests (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			search (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-		}
-		export interface Files  {
-			create (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			query (parameters?: Dictionary<Object>, callback?: (...args : any[]) => any) : void;
-			remove (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			show (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			update (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-		}
-		export interface PushSchedules  {
-			create (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			query (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			remove (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-		}
-		export interface Likes  {
-			create (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			remove (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-		}
-		export interface Photos  {
-			create (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			query (parameters?: Dictionary<Object>, callback?: (...args : any[]) => any) : void;
-			remove (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			search (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			show (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			update (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-		}
-		export interface Statuses  {
-			create (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			delete (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			query (parameters?: Dictionary<Object>, callback?: (...args : any[]) => any) : void;
-			search (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			show (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			update (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-		}
-		export interface PhotoCollections  {
-			create (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			remove (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			search (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			show (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			showPhotos (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			showSubCollections (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			update (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-		}
-		export interface Posts  {
-			create (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			query (parameters?: Dictionary<Object>, callback?: (...args : any[]) => any) : void;
-			remove (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			show (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			update (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-		}
-		export interface Emails  {
-			send (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-		}
-		export interface Places  {
-			create (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			query (parameters?: Dictionary<Object>, callback?: (...args : any[]) => any) : void;
-			remove (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			search (parameters?: Dictionary<Object>, callback?: (...args : any[]) => any) : void;
-			show (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-			update (parameters: Dictionary<Object>, callback: (...args : any[]) => any) : void;
-		}
-	}
-	export interface Blob extends Ti.Proxy {
-		file : Ti.Filesystem.File;
-		height : number;
-		length : number;
-		mimeType : string;
-		nativePath : string;
-		size : number;
-		text : string;
-		width : number;
-		append (blob: Ti.Blob) : void;
-		getFile () : Ti.Filesystem.File;
-		getHeight () : number;
-		getLength () : number;
-		getMimeType () : string;
-		getNativePath () : string;
-		getSize () : number;
-		getText () : string;
-		getWidth () : number;
-		imageAsCropped (options: Dictionary<ImageAsCroppedDict>) : Ti.Blob;
-		imageAsResized (width: number, height: number) : Ti.Blob;
-		imageAsThumbnail (size: number, borderSize?: number, cornerRadius?: number) : Ti.Blob;
-		imageWithAlpha () : Ti.Blob;
-		imageWithRoundedCorner (cornerSize: number, borderSize?: number) : Ti.Blob;
-		imageWithTransparentBorder (size: number) : Ti.Blob;
-		toString () : string;
-	}
-	export interface Codec  {
-		BIG_ENDIAN : number;
-		CHARSET_ASCII : string;
-		CHARSET_ISO_LATIN_1 : string;
-		CHARSET_UTF16 : string;
-		CHARSET_UTF16BE : string;
-		CHARSET_UTF16LE : string;
-		CHARSET_UTF8 : string;
-		LITTLE_ENDIAN : number;
-		TYPE_BYTE : string;
-		TYPE_DOUBLE : string;
-		TYPE_FLOAT : string;
-		TYPE_INT : string;
-		TYPE_LONG : string;
-		TYPE_SHORT : string;
-		decodeNumber (options: DecodeNumberDict) : number;
-		decodeString (options: DecodeStringDict) : string;
-		encodeNumber (options: EncodeNumberDict) : number;
-		encodeString (options: Dictionary<EncodeStringDict>) : number;
-		getNativeByteOrder () : number;
-	}
-	export interface Locale  {
-		currentCountry : string;
-		currentLanguage : string;
-		currentLocale : string;
-		formatTelephoneNumber (number: string) : string;
-		getCurrencyCode (locale: string) : string;
-		getCurrencySymbol (currencyCode: string) : string;
-		getCurrentCountry () : string;
-		getCurrentLanguage () : string;
-		getCurrentLocale () : string;
-		getLocaleCurrencySymbol (locale: string) : string;
-		getString (key: string, hint?: string) : string;
-	}
-	export module App {
-		export var EVENT_ACCESSIBILITY_ANNOUNCEMENT : string;
-		export var EVENT_ACCESSIBILITY_CHANGED : string;
-		export var accessibilityEnabled : boolean;
-		export var analytics : boolean;
-		export var apiName : string;
-		export var bubbleParent : boolean;
-		export var copyright : string;
-		export var deployType : string;
-		export var description : string;
-		export var disableNetworkActivityIndicator : boolean;
-		export var forceSplashAsSnapshot : boolean;
-		export var guid : string;
-		export var id : string;
-		export var idleTimerDisabled : boolean;
-		export var installId : string;
-		export var keyboardVisible : boolean;
-		export var name : string;
-		export var proximityDetection : boolean;
-		export var proximityState : boolean;
-		export var publisher : string;
-		export var sessionId : string;
-		export var url : string;
-		export var version : string;
-		export function addEventListener (name: string, callback: (...args : any[]) => any) : void;
-		export function applyProperties (props: Dictionary<Object>) : void;
-		export function fireEvent (name: string, event: Dictionary<Object>) : void;
-		export function fireSystemEvent (eventName: string, param?: any) : void;
-		export function getAccessibilityEnabled () : boolean;
-		export function getAnalytics () : boolean;
-		export function getApiName () : string;
-		export function getArguments () : launchOptions;
-		export function getBubbleParent () : boolean;
-		export function getCopyright () : string;
-		export function getDeployType () : string;
-		export function getDescription () : string;
-		export function getDisableNetworkActivityIndicator () : boolean;
-		export function getForceSplashAsSnapshot () : boolean;
-		export function getGuid () : string;
-		export function getId () : string;
-		export function getIdleTimerDisabled () : boolean;
-		export function getInstallId () : string;
-		export function getKeyboardVisible () : boolean;
-		export function getName () : string;
-		export function getProximityDetection () : boolean;
-		export function getProximityState () : boolean;
-		export function getPublisher () : string;
-		export function getSessionId () : string;
-		export function getUrl () : string;
-		export function getVersion () : string;
-		export function removeEventListener (name: string, callback: (...args : any[]) => any) : void;
-		export function setBubbleParent (bubbleParent: boolean) : void;
-		export function setDisableNetworkActivityIndicator (disableNetworkActivityIndicator: boolean) : void;
-		export function setForceSplashAsSnapshot (forceSplashAsSnapshot: boolean) : void;
-		export function setIdleTimerDisabled (idleTimerDisabled: boolean) : void;
-		export function setProximityDetection (proximityDetection: boolean) : void;
-		export module Android {
-			export var R : Ti.App.Android.R;
-			export var apiName : string;
-			export var appVersionCode : number;
-			export var appVersionName : string;
-			export var bubbleParent : boolean;
-			export var launchIntent : Ti.Android.Intent;
-			export function addEventListener (name: string, callback: (...args : any[]) => any) : void;
-			export function applyProperties (props: Dictionary<Object>) : void;
-			export function fireEvent (name: string, event: Dictionary<Object>) : void;
-			export function getApiName () : string;
-			export function getAppVersionCode () : number;
-			export function getAppVersionName () : string;
-			export function getBubbleParent () : boolean;
-			export function getLaunchIntent () : Ti.Android.Intent;
-			export function removeEventListener (name: string, callback: (...args : any[]) => any) : void;
-			export function setBubbleParent (bubbleParent: boolean) : void;
-			export interface R {
+
+		/**
+		 * Apple iOS specific UI capabilities.  All properties, methods and events in this namespace will
+		 * only work on Apple iOS devices.
+		 */
+		namespace iOS {
+			/**
+			 * Indicates if the proxy will bubble an event to its parent.
+			 */
+			let bubbleParent: boolean;
+
+			/**
+			 * The name of the API that this proxy corresponds to.
+			 */
+			const apiName: string;
+
+			/**
+			 * Automatically use the large out-of-line title based on the state of the p
+			 * revious item in the navigation bar.
+			 */
+			const LARGE_TITLE_DISPLAY_MODE_AUTOMATIC: number;
+
+			/**
+			 * Always use a larger title when this item is top most.
+			 */
+			const LARGE_TITLE_DISPLAY_MODE_ALWAYS: number;
+
+			/**
+			 * Never use a larger title when this item is top most.
+			 */
+			const LARGE_TITLE_DISPLAY_MODE_NEVER: number;
+
+			/**
+			 * Include treatments so this image can be shown directly over the content
+			 * of the Live Photo.
+			 */
+			const LIVEPHOTO_BADGE_OPTIONS_OVER_CONTENT: number;
+
+			/**
+			 * To indicate that the Live Photo aspect is turned off and it will
+			 * be treated as a still (e.g. for sharing).
+			 */
+			const LIVEPHOTO_BADGE_OPTIONS_LIVE_OFF: number;
+
+			/**
+			 * Use with [Animation.curve](Titanium.UI.Animation.curve) to specify an animation that starts
+			 * slowly and speeds up.
+			 */
+			const ANIMATION_CURVE_EASE_IN: number;
+
+			/**
+			 * Use with [Animation.curve](Titanium.UI.Animation.curve) to specify an animation that starts
+			 * slowly, and speeds up, then slows down at the end of the animation.
+			 */
+			const ANIMATION_CURVE_EASE_IN_OUT: number;
+
+			/**
+			 * Use with [Animation.curve](Titanium.UI.Animation.curve) to specify an animation that starts
+			 * quickly, then slows down at the end of the animation.
+			 */
+			const ANIMATION_CURVE_EASE_OUT: number;
+
+			/**
+			 * Use with [Animation.curve](Titanium.UI.Animation.curve) to specify an animation that proceeds
+			 * at a constant rate.
+			 */
+			const ANIMATION_CURVE_LINEAR: number;
+
+			/**
+			 * Use with <Attribute.type> to specify a font.
+			 */
+			const ATTRIBUTE_FONT: number;
+
+			/**
+			 * Use with <Attribute.type> to specify a font color.
+			 */
+			const ATTRIBUTE_FOREGROUND_COLOR: number;
+
+			/**
+			 * Use with <Attribute.type> to specify a background color.
+			 */
+			const ATTRIBUTE_BACKGROUND_COLOR: number;
+
+			/**
+			 * Use with <Attribute.type> to enable or disable ligatures.
+			 */
+			const ATTRIBUTE_LIGATURE: number;
+
+			/**
+			 * Use with <Attribute.value> to use a letterpress text effect.
+			 */
+			const ATTRIBUTE_LETTERPRESS_STYLE: number;
+
+			/**
+			 * Use with <Attribute.type> to specify kerning (space between characters).
+			 */
+			const ATTRIBUTE_KERN: number;
+
+			/**
+			 * Use with <Attribute.type> to place a horizontal line through the text.
+			 */
+			const ATTRIBUTE_STRIKETHROUGH_STYLE: number;
+
+			/**
+			 * Use with <Attribute.type> to place a horizontal line under the text.
+			 */
+			const ATTRIBUTE_UNDERLINES_STYLE: number;
+
+			/**
+			 * Use with <Attribute.type> to specify a color for the stroke text.
+			 */
+			const ATTRIBUTE_STROKE_COLOR: number;
+
+			/**
+			 * Use with <Attribute.type> to specify the width of the stroke text.
+			 */
+			const ATTRIBUTE_STROKE_WIDTH: number;
+
+			/**
+			 * Use with <Attribute.type> to display a shadow behind the text.
+			 */
+			const ATTRIBUTE_SHADOW: number;
+
+			/**
+			 * Use with <Attribute.type> to control the direction of the text.
+			 */
+			const ATTRIBUTE_WRITING_DIRECTION: number;
+
+			/**
+			 * Use with <Attribute.type> to apply a text effect.
+			 */
+			const ATTRIBUTE_TEXT_EFFECT: number;
+
+			/**
+			 * Use with <Attribute.type> to create a link.
+			 */
+			const ATTRIBUTE_LINK: number;
+
+			/**
+			 * Use with <Attribute.type> to apply a different baseline to the text.
+			 */
+			const ATTRIBUTE_BASELINE_OFFSET: number;
+
+			/**
+			 * Use with <Attribute.type> to change the color of the horizontal line.
+			 */
+			const ATTRIBUTE_UNDERLINE_COLOR: number;
+
+			/**
+			 * Use with <Attribute.type> to change the color of the horizontal line.
+			 */
+			const ATTRIBUTE_STRIKETHROUGH_COLOR: number;
+
+			/**
+			 * Use with <Attribute.type> to skew the text.
+			 */
+			const ATTRIBUTE_OBLIQUENESS: number;
+
+			/**
+			 * Use with <Attribute.type> to stretch the text horizontally.
+			 */
+			const ATTRIBUTE_EXPANSION: number;
+
+			/**
+			 * Use with <Attribute.value> to not draw a line.
+			 */
+			const ATTRIBUTE_UNDERLINE_STYLE_NONE: number;
+
+			/**
+			 * Use with <Attribute.value> to draw a single line.
+			 */
+			const ATTRIBUTE_UNDERLINE_STYLE_SINGLE: number;
+
+			/**
+			 * Use with <Attribute.value> to draw a thick line.
+			 */
+			const ATTRIBUTE_UNDERLINE_STYLE_THICK: number;
+
+			/**
+			 * Use with <Attribute.value> to draw a double line.
+			 */
+			const ATTRIBUTE_UNDERLINE_STYLE_DOUBLE: number;
+
+			/**
+			 * Use with <Attribute.value> to draw a solid line.
+			 */
+			const ATTRIBUTE_UNDERLINE_PATTERN_SOLID: number;
+
+			/**
+			 * Use with <Attribute.value> to draw a dotted line.
+			 */
+			const ATTRIBUTE_UNDERLINE_PATTERN_DOT: number;
+
+			/**
+			 * Use with <Attribute.value> to draw a dashed line.
+			 */
+			const ATTRIBUTE_UNDERLINE_PATTERN_DASH: number;
+
+			/**
+			 * Use with <Attribute.value> to draw an alternating line of dashes and dots.
+			 */
+			const ATTRIBUTE_UNDERLINE_PATTERN_DASH_DOT: number;
+
+			/**
+			 * Use with <Attribute.value> to draw an alternating line of dashes and two dots.
+			 */
+			const ATTRIBUTE_UNDERLINE_PATTERN_DASH_DOT_DOT: number;
+
+			/**
+			 * Use with <Attribute.value> to draw a line only underneath or through words.
+			 */
+			const ATTRIBUTE_UNDERLINE_BY_WORD: number;
+
+			/**
+			 * Use with <Attribute.value> to use the embedded text direction.
+			 */
+			const ATTRIBUTE_WRITING_DIRECTION_EMBEDDING: number;
+
+			/**
+			 * Use with <Attribute.value> to override the text direction.
+			 */
+			const ATTRIBUTE_WRITING_DIRECTION_OVERRIDE: number;
+
+			/**
+			 * Use with <Attribute.value> to use the
+			 * [Unicode Bidirection Algorithm rules P2 and P3](http://www.unicode.org/reports/tr9/#The_Paragraph_Level)
+			 * to determine which direction to use.
+			 */
+			const ATTRIBUTE_WRITING_DIRECTION_NATURAL: number;
+
+			/**
+			 * Use with <Attribute.value> to write text left to right.
+			 */
+			const ATTRIBUTE_WRITING_DIRECTION_LEFT_TO_RIGHT: number;
+
+			/**
+			 * Use with <Attribute.value> to write text right to left.
+			 */
+			const ATTRIBUTE_WRITING_DIRECTION_RIGHT_TO_LEFT: number;
+
+			/**
+			 * Converts strings formatted as addresses into clickable links.
+			 */
+			const AUTODETECT_ADDRESS: number;
+
+			/**
+			 * Converts all detectable types of data into clickable links.
+			 */
+			const AUTODETECT_ALL: number;
+
+			/**
+			 * Converts strings formatted as calendar events into clickable links.
+			 */
+			const AUTODETECT_CALENDAR: number;
+
+			/**
+			 * Converts strings formatted as URLs into clickable links.
+			 */
+			const AUTODETECT_LINK: number;
+
+			/**
+			 * Disables converting strings into clickable links.
+			 */
+			const AUTODETECT_NONE: number;
+
+			/**
+			 * Converts strings formatted as phone numbers into clickable links.
+			 */
+			const AUTODETECT_PHONE: number;
+
+			/**
+			 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+			 */
+			const BLEND_MODE_CLEAR: number;
+
+			/**
+			 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+			 */
+			const BLEND_MODE_COLOR: number;
+
+			/**
+			 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+			 */
+			const BLEND_MODE_COLOR_BURN: number;
+
+			/**
+			 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+			 */
+			const BLEND_MODE_COLOR_DODGE: number;
+
+			/**
+			 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+			 */
+			const BLEND_MODE_COPY: number;
+
+			/**
+			 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+			 */
+			const BLEND_MODE_DARKEN: number;
+
+			/**
+			 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+			 */
+			const BLEND_MODE_DESTINATION_ATOP: number;
+
+			/**
+			 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+			 */
+			const BLEND_MODE_DESTINATION_IN: number;
+
+			/**
+			 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+			 */
+			const BLEND_MODE_DESTINATION_OUT: number;
+
+			/**
+			 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+			 */
+			const BLEND_MODE_DESTINATION_OVER: number;
+
+			/**
+			 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+			 */
+			const BLEND_MODE_DIFFERENCE: number;
+
+			/**
+			 * Image mode constant. Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+			 */
+			const BLEND_MODE_EXCLUSION: number;
+
+			/**
+			 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+			 */
+			const BLEND_MODE_HARD_LIGHT: number;
+
+			/**
+			 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+			 */
+			const BLEND_MODE_HUE: number;
+
+			/**
+			 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+			 */
+			const BLEND_MODE_LIGHTEN: number;
+
+			/**
+			 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+			 */
+			const BLEND_MODE_LUMINOSITY: number;
+
+			/**
+			 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+			 */
+			const BLEND_MODE_MULTIPLY: number;
+
+			/**
+			 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+			 */
+			const BLEND_MODE_NORMAL: number;
+
+			/**
+			 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+			 */
+			const BLEND_MODE_OVERLAY: number;
+
+			/**
+			 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+			 */
+			const BLEND_MODE_PLUS_DARKER: number;
+
+			/**
+			 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+			 */
+			const BLEND_MODE_PLUS_LIGHTER: number;
+
+			/**
+			 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+			 */
+			const BLEND_MODE_SATURATION: number;
+
+			/**
+			 * Image mode constant. Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+			 */
+			const BLEND_MODE_SCREEN: number;
+
+			/**
+			 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+			 */
+			const BLEND_MODE_SOFT_LIGHT: number;
+
+			/**
+			 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+			 */
+			const BLEND_MODE_SOURCE_ATOP: number;
+
+			/**
+			 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+			 */
+			const BLEND_MODE_SOURCE_IN: number;
+
+			/**
+			 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+			 */
+			const BLEND_MODE_SOURCE_OUT: number;
+
+			/**
+			 * Use with [MaskedImage.mode](Titanium.UI.MaskedImage.mode) to specify a blend mode.
+			 */
+			const BLEND_MODE_XOR: number;
+
+			/**
+			 * Use with [BlurView.effect](Titanium.UI.iOS.BlurView.effect) to specify a blur effect.
+			 */
+			const BLUR_EFFECT_STYLE_EXTRA_LIGHT: number;
+
+			/**
+			 * Use with [BlurView.effect](Titanium.UI.iOS.BlurView.effect) to specify a blur effect.
+			 */
+			const BLUR_EFFECT_STYLE_LIGHT: number;
+
+			/**
+			 * Use with [BlurView.effect](Titanium.UI.iOS.BlurView.effect) to specify a blur effect.
+			 */
+			const BLUR_EFFECT_STYLE_DARK: number;
+
+			/**
+			 * Use with [BlurView.effect](Titanium.UI.iOS.BlurView.effect) to specify a blur effect.
+			 */
+			const BLUR_EFFECT_STYLE_REGULAR: number;
+
+			/**
+			 * Use with [BlurView.effect](Titanium.UI.iOS.BlurView.effect) to specify a blur effect.
+			 */
+			const BLUR_EFFECT_STYLE_PROMINENT: number;
+
+			/**
+			 * Use with [AdView.adSize](Titanium.UI.iOS.AdView.adSize) to specify a banner ad size
+			 * appropriate for portrait orientations.
+			 */
+			const AD_SIZE_PORTRAIT: string;
+
+			/**
+			 * Use with [AdView.adSize](Titanium.UI.iOS.AdView.adSize) to specify a banner ad size
+			 * appropriate for landscape orientations.
+			 */
+			const AD_SIZE_LANDSCAPE: string;
+
+			/**
+			 * Use with <Titanium.UI.View.clipMode> to specify clipping behavior.
+			 */
+			const CLIP_MODE_DEFAULT: number;
+
+			/**
+			 * Use with <Titanium.UI.View.clipMode> to specify clipping behavior.
+			 */
+			const CLIP_MODE_DISABLED: number;
+
+			/**
+			 * Use with <Titanium.UI.View.clipMode> to specify clipping behavior.
+			 */
+			const CLIP_MODE_ENABLED: number;
+
+			/**
+			 * Use with <Titanium.UI.iOS.CollisionBehavior.collisionMode> to specify collisions with both items and
+			 * boundaries.
+			 */
+			const COLLISION_MODE_ALL: number;
+
+			/**
+			 * Use with <Titanium.UI.iOS.CollisionBehavior.collisionMode> to specify collisions with
+			 * boundaries only.
+			 */
+			const COLLISION_MODE_BOUNDARY: number;
+
+			/**
+			 * Use with <Titanium.UI.iOS.CollisionBehavior.collisionMode> to specify collisions with items only.
+			 */
+			const COLLISION_MODE_ITEM: number;
+
+			/**
+			 * Returns the iOS system texture used to render the background on a group table view.
+			 */
+			const COLOR_GROUP_TABLEVIEW_BACKGROUND: string;
+
+			/**
+			 * Returns the iOS system texture used to render the area behind scrollable content.
+			 */
+			const COLOR_SCROLLVIEW_BACKGROUND: string;
+
+			/**
+			 * Returns the iOS system texture used for the back side of a view while it is being flipped.
+			 */
+			const COLOR_VIEW_FLIPSIDE_BACKGROUND: string;
+
+			/**
+			 * Returns the iOS system texture used to render the background of a page.
+			 */
+			const COLOR_UNDER_PAGE_BACKGROUND: string;
+
+			/**
+			 * Determines if the 3D-Touch capability "Force Touch" is supported (`true`) or not (`false`) by the device.
+			 */
+			const forceTouchSupported: boolean;
+
+			/**
+			 * The feedback type to be used when specifying a selection in <Titanium.UI.iOS.FeedbackGenerator>.
+			 */
+			const FEEDBACK_GENERATOR_TYPE_SELECTION: number;
+
+			/**
+			 * The feedback type to be used when specifying an impact in <Titanium.UI.iOS.FeedbackGenerator>.
+			 */
+			const FEEDBACK_GENERATOR_TYPE_IMPACT: number;
+
+			/**
+			 * The feedback type to be used when specifying a received notification in <Titanium.UI.iOS.FeedbackGenerator>.
+			 */
+			const FEEDBACK_GENERATOR_TYPE_NOTIFICATION: number;
+
+			/**
+			 * The success notification type used as the argument in <Titanium.UI.iOS.FeedbackGenerator.notificationOccurred>.
+			 */
+			const FEEDBACK_GENERATOR_NOTIFICATION_TYPE_SUCCESS: number;
+
+			/**
+			 * The warning notification type used as the argument in <Titanium.UI.iOS.FeedbackGenerator.notificationOccurred>.
+			 */
+			const FEEDBACK_GENERATOR_NOTIFICATION_TYPE_WARNING: number;
+
+			/**
+			 * The error notification type used as the argument in <Titanium.UI.iOS.FeedbackGenerator.notificationOccurred>.
+			 */
+			const FEEDBACK_GENERATOR_NOTIFICATION_TYPE_ERROR: number;
+
+			/**
+			 * The light impact style used as the `style` argument when creating a <Titanium.UI.iOS.FeedbackGenerator> with the
+			 * type <Titanium.UI.iOS.FEEDBACK_GENERATOR_TYPE_IMPACT>.
+			 */
+			const FEEDBACK_GENERATOR_IMPACT_STYLE_LIGHT: number;
+
+			/**
+			 * The medium impact style used as the `style` argument when creating a <Titanium.UI.iOS.FeedbackGenerator> with the
+			 * type <Titanium.UI.iOS.FEEDBACK_GENERATOR_TYPE_IMPACT>.
+			 */
+			const FEEDBACK_GENERATOR_IMPACT_STYLE_MEDIUM: number;
+
+			/**
+			 * The heavy impact style used as the `style` argument when creating a <Titanium.UI.iOS.FeedbackGenerator> with the
+			 * type <Titanium.UI.iOS.FEEDBACK_GENERATOR_TYPE_IMPACT>.
+			 */
+			const FEEDBACK_GENERATOR_IMPACT_STYLE_HEAVY: number;
+
+			/**
+			 * Plays back the entire motion and sound content of the Live Photo, including transition
+			 * effects at the start and end.
+			 */
+			const LIVEPHOTO_PLAYBACK_STYLE_FULL: number;
+
+			/**
+			 * Plays back only a brief section of the motion content of the Live Photo, without sound.
+			 */
+			const LIVEPHOTO_PLAYBACK_STYLE_HINT: number;
+
+			/**
+			 * An arrow that points upward.
+			 */
+			const MENU_POPUP_ARROW_DIRECTION_UP: number;
+
+			/**
+			 * An arrow that points downward.
+			 */
+			const MENU_POPUP_ARROW_DIRECTION_DOWN: number;
+
+			/**
+			 * An arrow that points toward the left.
+			 */
+			const MENU_POPUP_ARROW_DIRECTION_LEFT: number;
+
+			/**
+			 * An arrow that points toward the right.
+			 */
+			const MENU_POPUP_ARROW_DIRECTION_RIGHT: number;
+
+			/**
+			 * An arrow that is automatically aligned.
+			 */
+			const MENU_POPUP_ARROW_DIRECTION_DEFAULT: number;
+
+			/**
+			 * View presented with the same style as its parent window.
+			 */
+			let MODAL_PRESENTATION_CURRENT_CONTEXT: number;
+
+			/**
+			 * Window width and height are smaller than those of the screen and the view is centered on
+			 * the screen.
+			 */
+			const MODAL_PRESENTATION_FORMSHEET: number;
+
+			/**
+			 * Window covers the screen.
+			 */
+			const MODAL_PRESENTATION_FULLSCREEN: number;
+
+			/**
+			 * Window height is the height of the screen and width is equal to screen width in a portrait
+			 * orientation.
+			 */
+			const MODAL_PRESENTATION_PAGESHEET: number;
+
+			/**
+			 * When the window is presented, its view slides up from the bottom of the screen. On dismissal,
+			 * the view slides back down (default.)
+			 */
+			const MODAL_TRANSITION_STYLE_COVER_VERTICAL: number;
+
+			/**
+			 * When the window is presented, the current view fades out while the new view fades in at the
+			 * same time. On dismissal, a similar type of cross-fade is used to return to the original view.
+			 */
+			const MODAL_TRANSITION_STYLE_CROSS_DISSOLVE: number;
+
+			/**
+			 * When the window is presented, the current view initiates a horizontal 3D flip from
+			 * right-to-left, resulting in the revealing of the new view as if it were on the back of the
+			 * previous view. On dismissal, the flip occurs from left-to-right, returning to the original
+			 * view.
+			 */
+			const MODAL_TRANSITION_STYLE_FLIP_HORIZONTAL: number;
+
+			/**
+			 * When the window is presented, one corner of the current view curls up to reveal the modal
+			 * view underneath. On dismissal, the curled up page unfurls itself back on top of the modal
+			 * view.
+			 */
+			const MODAL_TRANSITION_STYLE_PARTIAL_CURL: number;
+
+			/**
+			 * Use with <Titanium.UI.iOS.PushBehavior.pushMode> to specifiy a continuous force.
+			 */
+			const PUSH_MODE_CONTINUOUS: number;
+
+			/**
+			 * Use with <Titanium.UI.iOS.PushBehavior.pushMode> to specifiy an instantaneous force.
+			 */
+			const PUSH_MODE_INSTANTANEOUS: number;
+
+			/**
+			 * The normal style for preview actions.
+			 */
+			const PREVIEW_ACTION_STYLE_DEFAULT: number;
+
+			/**
+			 * The selected style for preview actions.
+			 */
+			const PREVIEW_ACTION_STYLE_SELECTED: number;
+
+			/**
+			 * The destructive style for preview actions.
+			 */
+			const PREVIEW_ACTION_STYLE_DESTRUCTIVE: number;
+
+			/**
+			 * The default style for <RowActionType>.
+			 */
+			const ROW_ACTION_STYLE_DEFAULT: number;
+
+			/**
+			 * The destructive style for <RowActionType>.
+			 */
+			const ROW_ACTION_STYLE_DESTRUCTIVE: number;
+
+			/**
+			 * The normal style for <RowActionType>.
+			 */
+			const ROW_ACTION_STYLE_NORMAL: number;
+
+			/**
+			 * Use with <Titanium.UI.ScrollView.decelerationRate> to control deceleration rate.
+			 */
+			const SCROLL_DECELERATION_RATE_FAST: number;
+
+			/**
+			 * Use with <Titanium.UI.ScrollView.decelerationRate> to control deceleration rate.
+			 */
+			const SCROLL_DECELERATION_RATE_NORMAL: number;
+
+			/**
+			 * Use with <Titanium.UI.ScrollView.keyboardDismissMode> to control keyboard dismiss mode.
+			 */
+			const KEYBOARD_DISMISS_MODE_NONE: number;
+
+			/**
+			 * Use with <Titanium.UI.ScrollView.keyboardDismissMode> to control keyboard dismiss mode.
+			 */
+			const KEYBOARD_DISMISS_MODE_ON_DRAG: number;
+
+			/**
+			 * Use with <Titanium.UI.ScrollView.keyboardDismissMode> to control keyboard dismiss mode.
+			 */
+			const KEYBOARD_DISMISS_MODE_INTERACTIVE: number;
+
+			/**
+			 * Use with <Titanium.UI.Searchbar.style> to change the search bar style.
+			 */
+			const SEARCH_BAR_STYLE_PROMINENT: number;
+
+			/**
+			 * Use with <Titanium.UI.Searchbar.style> to change the search bar style.
+			 */
+			const SEARCH_BAR_STYLE_MINIMAL: number;
+
+			/**
+			 * User tapped a link.
+			 */
+			const WEBVIEW_NAVIGATIONTYPE_LINK_CLICKED: number;
+
+			/**
+			 * User submitted a form.
+			 */
+			const WEBVIEW_NAVIGATIONTYPE_FORM_SUBMITTED: number;
+
+			/**
+			 * User tapped the back or forward button.
+			 */
+			const WEBVIEW_NAVIGATIONTYPE_BACK_FORWARD: number;
+
+			/**
+			 * User tapped the reload button.
+			 */
+			const WEBVIEW_NAVIGATIONTYPE_RELOAD: number;
+
+			/**
+			 * User resubmitted a form.
+			 */
+			const WEBVIEW_NAVIGATIONTYPE_FORM_RESUBMITTED: number;
+
+			/**
+			 * Some other action occurred.
+			 */
+			const WEBVIEW_NAVIGATIONTYPE_OTHER: number;
+
+			/**
+			 * String that represents the magnifying glass on the table view index bar
+			 */
+			const TABLEVIEW_INDEX_SEARCH: string;
+
+			/**
+			 * Number that represents the icon used for the application shortcut
+			 */
+			const SHORTCUT_ICON_TYPE_COMPOSE: number;
+
+			/**
+			 * Number that represents the icon used for the application shortcut
+			 */
+			const SHORTCUT_ICON_TYPE_PLAY: number;
+
+			/**
+			 * Number that represents the icon used for the application shortcut
+			 */
+			const SHORTCUT_ICON_TYPE_PAUSE: number;
+
+			/**
+			 * Number that represents the icon used for the application shortcut
+			 */
+			const SHORTCUT_ICON_TYPE_ADD: number;
+
+			/**
+			 * Number that represents the icon used for the application shortcut
+			 */
+			const SHORTCUT_ICON_TYPE_LOCATION: number;
+
+			/**
+			 * Number that represents the icon used for the application shortcut
+			 */
+			const SHORTCUT_ICON_TYPE_SEARCH: number;
+
+			/**
+			 * Number that represents the icon used for the application shortcut
+			 */
+			const SHORTCUT_ICON_TYPE_SHARE: number;
+
+			/**
+			 * Number that represents the icon used for the application shortcut
+			 */
+			const SHORTCUT_ICON_TYPE_PROHIBIT: number;
+
+			/**
+			 * Number that represents the icon used for the application shortcut
+			 */
+			const SHORTCUT_ICON_TYPE_CONTACT: number;
+
+			/**
+			 * Number that represents the icon used for the application shortcut
+			 */
+			const SHORTCUT_ICON_TYPE_HOME: number;
+
+			/**
+			 * Number that represents the icon used for the application shortcut
+			 */
+			const SHORTCUT_ICON_TYPE_MARK_LOCATION: number;
+
+			/**
+			 * Number that represents the icon used for the application shortcut
+			 */
+			const SHORTCUT_ICON_TYPE_FAVORITE: number;
+
+			/**
+			 * Number that represents the icon used for the application shortcut
+			 */
+			const SHORTCUT_ICON_TYPE_LOVE: number;
+
+			/**
+			 * Number that represents the icon used for the application shortcut
+			 */
+			const SHORTCUT_ICON_TYPE_CLOUD: number;
+
+			/**
+			 * Number that represents the icon used for the application shortcut
+			 */
+			const SHORTCUT_ICON_TYPE_INVITATION: number;
+
+			/**
+			 * Number that represents the icon used for the application shortcut
+			 */
+			const SHORTCUT_ICON_TYPE_CONFIRMATION: number;
+
+			/**
+			 * Number that represents the icon used for the application shortcut
+			 */
+			const SHORTCUT_ICON_TYPE_MAIL: number;
+
+			/**
+			 * Number that represents the icon used for the application shortcut
+			 */
+			const SHORTCUT_ICON_TYPE_MESSAGE: number;
+
+			/**
+			 * Number that represents the icon used for the application shortcut
+			 */
+			const SHORTCUT_ICON_TYPE_DATE: number;
+
+			/**
+			 * Number that represents the icon used for the application shortcut
+			 */
+			const SHORTCUT_ICON_TYPE_TIME: number;
+
+			/**
+			 * Number that represents the icon used for the application shortcut
+			 */
+			const SHORTCUT_ICON_TYPE_CAPTURE_PHOTO: number;
+
+			/**
+			 * Number that represents the icon used for the application shortcut
+			 */
+			const SHORTCUT_ICON_TYPE_CAPTURE_VIDEO: number;
+
+			/**
+			 * Number that represents the icon used for the application shortcut
+			 */
+			const SHORTCUT_ICON_TYPE_TASK: number;
+
+			/**
+			 * Number that represents the icon used for the application shortcut
+			 */
+			const SHORTCUT_ICON_TYPE_TASK_COMPLETED: number;
+
+			/**
+			 * Number that represents the icon used for the application shortcut
+			 */
+			const SHORTCUT_ICON_TYPE_ALARM: number;
+
+			/**
+			 * Number that represents the icon used for the application shortcut
+			 */
+			const SHORTCUT_ICON_TYPE_BOOKMARK: number;
+
+			/**
+			 * Number that represents the icon used for the application shortcut
+			 */
+			const SHORTCUT_ICON_TYPE_SHUFFLE: number;
+
+			/**
+			 * Number that represents the icon used for the application shortcut
+			 */
+			const SHORTCUT_ICON_TYPE_AUDIO: number;
+
+			/**
+			 * Number that represents the icon used for the application shortcut
+			 */
+			const SHORTCUT_ICON_TYPE_UPDATE: number;
+
+			/**
+			 * Value of the badge for the application's springboard icon.
+			 */
+			let appBadge: number;
+
+			/**
+			 * Determines whether the shake to edit system-wide capability is enabled.
+			 */
+			let appSupportsShakeToEdit: boolean;
+
+			/**
+			 * Sets the global status bar background color for the application.
+			 */
+			let statusBarBackgroundColor: string;
+
+			/**
+			 * Adds the specified callback as an event listener for the named event.
+			 */
+			function addEventListener(name: string, callback: (param0: any) => any): void;
+
+			/**
+			 * Removes the specified callback as an event listener for the named event.
+			 */
+			function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+			/**
+			 * Fires a synthesized event to any registered listeners.
+			 */
+			function fireEvent(name: string, event: any): void;
+
+			/**
+			 * Applies the properties to the proxy.
+			 */
+			function applyProperties(props: any): void;
+
+			/**
+			 * Creates a transition animation when opening or closing windows in a
+			 * <Titanium.UI.iOS.NavigationWindow> or <Titanium.UI.Tab>.
+			 */
+			function createTransitionAnimation(transition: transitionAnimationParam): Titanium.Proxy;
+
+			/**
+			 * Creates a live photo badge to be used together with the
+			 * <Titanium.UI.iOS.LivePhotoView> API.
+			 */
+			function createLivePhotoBadge(type: number): Titanium.Blob;
+
+			/**
+			 * Creates and returns an instance of <Titanium.UI.iOS.3DMatrix>.
+			 */
+			function create3DMatrix(parameters?: any): Titanium.UI.iOS.Matrix3D;
+
+			/**
+			 * Creates and returns an instance of <Titanium.UI.iOS.AdView>.
+			 */
+			function createAdView(parameters?: any): Titanium.UI.iOS.AdView;
+
+			/**
+			 * Creates and returns an instance of <Titanium.UI.iOS.AnchorAttachmentBehavior>.
+			 */
+			function createAnchorAttachmentBehavior(parameters?: any): Titanium.UI.iOS.AnchorAttachmentBehavior;
+
+			/**
+			 * Creates and returns an instance of <Titanium.UI.iOS.Animator>.
+			 */
+			function createAnimator(parameters?: any): Titanium.UI.iOS.Animator;
+
+			/**
+			 * Creates and returns an instance of <Titanium.UI.iOS.ApplicationShortcuts>.
+			 */
+			function createApplicationShortcuts(parameters?: any): Titanium.UI.iOS.ApplicationShortcuts;
+
+			/**
+			 * Creates and returns an instance of <Titanium.UI.iOS.Attribute>.
+			 */
+			function createAttribute(parameters?: any): Titanium.UI.iOS.Attribute;
+
+			/**
+			 * Creates and returns an instance of <Titanium.UI.iOS.AttributedString>.
+			 */
+			function createAttributedString(parameters?: any): Titanium.UI.iOS.AttributedString;
+
+			/**
+			 * Creates and returns an instance of <Titanium.UI.iOS.BlurView>.
+			 */
+			function createBlurView(parameters?: any): Titanium.UI.iOS.BlurView;
+
+			/**
+			 * Creates and returns an instance of <Titanium.UI.iOS.CollisionBehavior>.
+			 */
+			function createCollisionBehavior(parameters?: any): Titanium.UI.iOS.CollisionBehavior;
+
+			/**
+			 * Creates and returns an instance of <Titanium.UI.iOS.CoverFlowView>.
+			 */
+			function createCoverFlowView(parameters?: any): Titanium.UI.iOS.CoverFlowView;
+
+			/**
+			 * Creates and returns an instance of <Titanium.UI.iOS.DocumentViewer>.
+			 */
+			function createDocumentViewer(parameters?: any): Titanium.UI.iOS.DocumentViewer;
+
+			/**
+			 * Creates and returns an instance of <Titanium.UI.iOS.DynamicItemBehavior>.
+			 */
+			function createDynamicItemBehavior(parameters?: any): Titanium.UI.iOS.DynamicItemBehavior;
+
+			/**
+			 * Creates and returns an instance of <Titanium.UI.iOS.FeedbackGenerator>.
+			 */
+			function createFeedbackGenerator(parameters?: any): Titanium.UI.iOS.FeedbackGenerator;
+
+			/**
+			 * Creates and returns an instance of <Titanium.UI.iOS.GravityBehavior>.
+			 */
+			function createGravityBehavior(parameters?: any): Titanium.UI.iOS.GravityBehavior;
+
+			/**
+			 * Creates and returns an instance of <Titanium.UI.iOS.LivePhotoView>.
+			 */
+			function createLivePhotoView(parameters?: any): Titanium.UI.iOS.LivePhotoView;
+
+			/**
+			 * Creates and returns an instance of <Titanium.UI.iOS.MenuPopup>.
+			 */
+			function createMenuPopup(parameters?: any): Titanium.UI.iOS.MenuPopup;
+
+			/**
+			 * Creates and returns an instance of <Titanium.UI.iOS.NavigationWindow>.
+			 */
+			function createNavigationWindow(parameters?: any): Titanium.UI.iOS.NavigationWindow;
+
+			/**
+			 * Creates and returns an instance of <Titanium.UI.iOS.PreviewAction>.
+			 */
+			function createPreviewAction(parameters?: any): Titanium.UI.iOS.PreviewAction;
+
+			/**
+			 * Creates and returns an instance of <Titanium.UI.iOS.PreviewActionGroup>.
+			 */
+			function createPreviewActionGroup(parameters?: any): Titanium.UI.iOS.PreviewActionGroup;
+
+			/**
+			 * Creates and returns an instance of <Titanium.UI.iOS.PreviewContext>.
+			 */
+			function createPreviewContext(parameters?: any): Titanium.UI.iOS.PreviewContext;
+
+			/**
+			 * Creates and returns an instance of <Titanium.UI.iOS.PushBehavior>.
+			 */
+			function createPushBehavior(parameters?: any): Titanium.UI.iOS.PushBehavior;
+
+			/**
+			 * Creates and returns an instance of <Titanium.UI.iOS.SnapBehavior>.
+			 */
+			function createSnapBehavior(parameters?: any): Titanium.UI.iOS.SnapBehavior;
+
+			/**
+			 * Creates and returns an instance of <Titanium.UI.iOS.SplitWindow>.
+			 */
+			function createSplitWindow(parameters?: any): Titanium.UI.iOS.SplitWindow;
+
+			/**
+			 * Creates and returns an instance of <Titanium.UI.iOS.Stepper>.
+			 */
+			function createStepper(parameters?: any): Titanium.UI.iOS.Stepper;
+
+			/**
+			 * Creates and returns an instance of <Titanium.UI.iOS.TabbedBar>.
+			 */
+			function createTabbedBar(parameters?: any): Titanium.UI.iOS.TabbedBar;
+
+			/**
+			 * Creates and returns an instance of <Titanium.UI.iOS.Toolbar>.
+			 */
+			function createToolbar(parameters?: any): Titanium.UI.iOS.Toolbar;
+
+			/**
+			 * Creates and returns an instance of <Titanium.UI.iOS.ViewAttachmentBehavior>.
+			 */
+			function createViewAttachmentBehavior(parameters?: any): Titanium.UI.iOS.ViewAttachmentBehavior;
+
+			/**
+			 * Gets the value of the <Titanium.UI.iOS.bubbleParent> property.
+			 */
+			function getBubbleParent(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.iOS.bubbleParent> property.
+			 */
+			function setBubbleParent(bubbleParent: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.iOS.apiName> property.
+			 */
+			function getApiName(): string;
+
+			/**
+			 * Gets the value of the <Titanium.UI.iOS.forceTouchSupported> property.
+			 */
+			function getForceTouchSupported(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.iOS.MODAL_PRESENTATION_CURRENT_CONTEXT> property.
+			 */
+			function setMODAL_PRESENTATION_CURRENT_CONTEXT(MODAL_PRESENTATION_CURRENT_CONTEXT: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.iOS.appBadge> property.
+			 */
+			function getAppBadge(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.iOS.appBadge> property.
+			 */
+			function setAppBadge(appBadge: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.iOS.appSupportsShakeToEdit> property.
+			 */
+			function getAppSupportsShakeToEdit(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.iOS.appSupportsShakeToEdit> property.
+			 */
+			function setAppSupportsShakeToEdit(appSupportsShakeToEdit: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.iOS.statusBarBackgroundColor> property.
+			 */
+			function getStatusBarBackgroundColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.iOS.statusBarBackgroundColor> property.
+			 */
+			function setStatusBarBackgroundColor(statusBarBackgroundColor: string): void;
+
+			/**
+			 * The 3D Matrix is an object for holding values for a 3D affine transform.
+			 */
+			interface Matrix3D extends Titanium.Proxy {
+				/**
+				 * The entry at position [1,1] in the matrix.
+				 */
+				m11: number;
+
+				/**
+				 * The entry at position [1,2] in the matrix.
+				 */
+				m12: number;
+
+				/**
+				 * The entry at position [1,3] in the matrix.
+				 */
+				m13: number;
+
+				/**
+				 * The entry at position [1,4] in the matrix.
+				 */
+				m14: number;
+
+				/**
+				 * The entry at position [2,1] in the matrix.
+				 */
+				m21: number;
+
+				/**
+				 * The entry at position [2,2] in the matrix.
+				 */
+				m22: number;
+
+				/**
+				 * The entry at position [2,3] in the matrix.
+				 */
+				m23: number;
+
+				/**
+				 * The entry at position [2,4] in the matrix.
+				 */
+				m24: number;
+
+				/**
+				 * The entry at position [3,1] in the matrix.
+				 */
+				m31: number;
+
+				/**
+				 * The entry at position [3,2] in the matrix.
+				 */
+				m32: number;
+
+				/**
+				 * The entry at position [3,3] in the matrix.
+				 */
+				m33: number;
+
+				/**
+				 * The entry at position [3,4] in the matrix.
+				 */
+				m34: number;
+
+				/**
+				 * The entry at position [4,1] in the matrix.
+				 */
+				m41: number;
+
+				/**
+				 * The entry at position [4,2] in the matrix.
+				 */
+				m42: number;
+
+				/**
+				 * The entry at position [4,3] in the matrix.
+				 */
+				m43: number;
+
+				/**
+				 * The entry at position [4,4] in the matrix.
+				 */
+				m44: number;
+
+				/**
+				 * Returns a matrix constructed by inverting an existing matrix.
+				 */
+				invert(): Titanium.UI.Matrix3D;
+
+				/**
+				 * Returns a matrix constructed by combining two existing matrices.
+				 */
+				multiply(t2: Titanium.UI.Matrix3D): Titanium.UI.Matrix3D;
+
+				/**
+				 * Returns a matrix constructed by rotating an existing matrix.
+				 */
+				rotate(angle: number, x: number, y: number, z: number): Titanium.UI.Matrix3D;
+
+				/**
+				 * Returns a matrix constructed by scaling an existing matrix.
+				 */
+				scale(sx: number, sy: number, sz: number): Titanium.UI.Matrix3D;
+
+				/**
+				 * Returns a matrix constructed by translating an existing matrix.
+				 */
+				translate(tx: number, ty: number, tz: number): Titanium.UI.Matrix3D;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.3DMatrix.m11> property.
+				 */
+				getM11(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.3DMatrix.m11> property.
+				 */
+				setM11(m11: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.3DMatrix.m12> property.
+				 */
+				getM12(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.3DMatrix.m12> property.
+				 */
+				setM12(m12: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.3DMatrix.m13> property.
+				 */
+				getM13(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.3DMatrix.m13> property.
+				 */
+				setM13(m13: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.3DMatrix.m14> property.
+				 */
+				getM14(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.3DMatrix.m14> property.
+				 */
+				setM14(m14: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.3DMatrix.m21> property.
+				 */
+				getM21(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.3DMatrix.m21> property.
+				 */
+				setM21(m21: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.3DMatrix.m22> property.
+				 */
+				getM22(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.3DMatrix.m22> property.
+				 */
+				setM22(m22: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.3DMatrix.m23> property.
+				 */
+				getM23(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.3DMatrix.m23> property.
+				 */
+				setM23(m23: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.3DMatrix.m24> property.
+				 */
+				getM24(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.3DMatrix.m24> property.
+				 */
+				setM24(m24: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.3DMatrix.m31> property.
+				 */
+				getM31(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.3DMatrix.m31> property.
+				 */
+				setM31(m31: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.3DMatrix.m32> property.
+				 */
+				getM32(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.3DMatrix.m32> property.
+				 */
+				setM32(m32: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.3DMatrix.m33> property.
+				 */
+				getM33(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.3DMatrix.m33> property.
+				 */
+				setM33(m33: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.3DMatrix.m34> property.
+				 */
+				getM34(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.3DMatrix.m34> property.
+				 */
+				setM34(m34: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.3DMatrix.m41> property.
+				 */
+				getM41(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.3DMatrix.m41> property.
+				 */
+				setM41(m41: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.3DMatrix.m42> property.
+				 */
+				getM42(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.3DMatrix.m42> property.
+				 */
+				setM42(m42: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.3DMatrix.m43> property.
+				 */
+				getM43(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.3DMatrix.m43> property.
+				 */
+				setM43(m43: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.3DMatrix.m44> property.
+				 */
+				getM44(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.3DMatrix.m44> property.
+				 */
+				setM44(m44: number): void;
+
+			}
+
+			/**
+			 * The AdView is a view for display Apple iAds.
+			 */
+			interface AdView extends Titanium.Proxy {
+				/**
+				 * Whether the view should be "hidden" from (i.e., ignored by) the accessibility service.
+				 */
+				accessibilityHidden: boolean;
+
+				/**
+				 * Briefly describes what performing an action (such as a click) on the view will do.
+				 */
+				accessibilityHint: string;
+
+				/**
+				 * A succint label identifying the view for the device's accessibility service.
+				 */
+				accessibilityLabel: string;
+
+				/**
+				 * A string describing the value (if any) of the view for the device's accessibility service.
+				 */
+				accessibilityValue: string;
+
+				/**
+				 * Coordinate of the view about which to pivot an animation.
+				 */
+				anchorPoint: Point;
+
+				/**
+				 * Current position of the view during an animation.
+				 */
+				readonly animatedCenter: Point;
+
+				/**
+				 * Background color of the view, as a color name or hex triplet.
+				 */
+				backgroundColor: string;
+
+				/**
+				 * A background gradient for the view.
+				 */
+				backgroundGradient: Gradient;
+
+				/**
+				 * Background image for the view, specified as a local file path or URL.
+				 */
+				backgroundImage: string;
+
+				/**
+				 * Determines whether to tile a background across a view.
+				 */
+				backgroundRepeat: boolean;
+
+				/**
+				 * Size of the left end cap.
+				 */
+				backgroundLeftCap: number;
+
+				/**
+				 * Size of the top end cap.
+				 */
+				backgroundTopCap: number;
+
+				/**
+				 * Border color of the view, as a color name or hex triplet.
+				 */
+				borderColor: string;
+
+				/**
+				 * Radius for the rounded corners of the view's border.
+				 */
+				borderRadius: number;
+
+				/**
+				 * Border width of the view.
+				 */
+				borderWidth: number;
+
+				/**
+				 * View's bottom position, in platform-specific units.
+				 */
+				bottom: number | string;
+
+				/**
+				 * View's center position, in the parent view's coordinates.
+				 */
+				center: Point;
+
+				/**
+				 * Array of this view's child views.
+				 */
+				readonly children: Titanium.UI.View[];
+
+				/**
+				 * View's clipping behavior.
+				 */
+				clipMode: number;
+
+				/**
+				 * View height, in platform-specific units.
+				 */
+				height: number | string;
+
+				/**
+				 * View's left position, in platform-specific units.
+				 */
+				left: number | string;
+
+				/**
+				 * Specifies how the view positions its children.
+				 * One of: 'composite', 'vertical', or 'horizontal'.
+				 */
+				layout: string;
+
+				/**
+				 * Opacity of this view, from 0.0 (transparent) to 1.0 (opaque).
+				 */
+				opacity: number;
+
+				/**
+				 * Background color of the wrapper view when this view is used as either <Titanium.UI.ListView.pullView> or <Titanium.UI.TableView.headerPullView>.
+				 */
+				pullBackgroundColor: string;
+
+				/**
+				 * The preview context used in the 3D-Touch feature "Peek and Pop".
+				 */
+				previewContext: Titanium.UI.iOS.PreviewContext;
+
+				/**
+				 * View's right position, in platform-specific units.
+				 */
+				right: number | string;
+
+				/**
+				 * The bounding box of the view relative to its parent, in system units.
+				 */
+				readonly rect: Dimension;
+
+				/**
+				 * The size of the view in system units.
+				 */
+				readonly size: Dimension;
+
+				/**
+				 * The view's tintColor. This property is applicable on iOS 7 and greater.
+				 */
+				tintColor: string;
+
+				/**
+				 * The view's top position.
+				 */
+				top: number | string;
+
+				/**
+				 * Determines whether view should receive touch events.
+				 */
+				touchEnabled: boolean;
+
+				/**
+				 * Transformation matrix to apply to the view.
+				 */
+				transform: Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
+
+				/**
+				 * Determines the blur radius used to create the shadow.
+				 */
+				viewShadowRadius: number;
+
+				/**
+				 * Determines the color of the shadow.
+				 */
+				viewShadowColor: string;
+
+				/**
+				 * Determines the offset for the shadow of the view.
+				 */
+				viewShadowOffset: Point;
+
+				/**
+				 * Determines whether the view is visible.
+				 */
+				visible: boolean;
+
+				/**
+				 * View's width, in platform-specific units.
+				 */
+				width: number | string;
+
+				/**
+				 * Determines whether the layout has wrapping behavior.
+				 */
+				horizontalWrap: boolean;
+
+				/**
+				 * Z-index stack order position, relative to other sibling views.
+				 */
+				zIndex: number;
+
+				/**
+				 * Size of the advertisement when minimized.
+				 */
+				adSize: string;
+
+				/**
+				 * Adds a child to this view's hierarchy.
+				 */
+				add(view: any): void;
+
+				/**
+				 * Adds a child to this view's hierarchy.
+				 */
+				add(view: any[]): void;
+
+				/**
+				 * Animates this view.
+				 */
+				animate(animation: any, callback?: (param0: any) => any): void;
+
+				/**
+				 * Finishes a batch update of the View's layout properties and schedules a layout pass of the
+				 * view tree.
+				 */
+				finishLayout(): void;
+
+				/**
+				 * Hides this view.
+				 */
+				hide(options?: AnimationOption): void;
+
+				/**
+				 * Inserts a view at the specified position in the [children](Titanium.UI.View.children) array.
+				 */
+				insertAt(params: any): void;
+
+				/**
+				 * Removes a child view from this view's hierarchy.
+				 */
+				remove(view: any): void;
+
+				/**
+				 * Removes all child views from this view's hierarchy.
+				 */
+				removeAllChildren(): void;
+
+				/**
+				 * Replaces a view at the specified position in the [children](Titanium.UI.View.children) array.
+				 */
+				replaceAt(params: any): void;
+
+				/**
+				 * Makes this view visible.
+				 */
+				show(options?: AnimationOption): void;
+
+				/**
+				 * Starts a batch update of this view's layout properties.
+				 */
+				startLayout(): void;
+
+				/**
+				 * Returns an image of the rendered view, as a Blob.
+				 */
+				toImage(callback?: (param0: Titanium.Blob) => any, honorScaleFactor?: boolean): Titanium.Blob;
+
+				/**
+				 * Performs a batch update of all supplied layout properties and schedules a layout pass after
+				 * they have been updated.
+				 */
+				updateLayout(params: any): void;
+
+				/**
+				 * Translates a point from this view's coordinate system to another view's coordinate system.
+				 */
+				convertPointToView(point: Point, destinationView: any): Point;
+
+				/**
+				 * Returns the matching view of a given view ID.
+				 */
+				getViewById(id: string): Titanium.UI.View;
+
+				/**
+				 * Cancel a banner to uncover the user interface.
+				 */
+				cancelAction(): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AdView.accessibilityHidden> property.
+				 */
+				getAccessibilityHidden(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AdView.accessibilityHidden> property.
+				 */
+				setAccessibilityHidden(accessibilityHidden: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AdView.accessibilityHint> property.
+				 */
+				getAccessibilityHint(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AdView.accessibilityHint> property.
+				 */
+				setAccessibilityHint(accessibilityHint: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AdView.accessibilityLabel> property.
+				 */
+				getAccessibilityLabel(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AdView.accessibilityLabel> property.
+				 */
+				setAccessibilityLabel(accessibilityLabel: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AdView.accessibilityValue> property.
+				 */
+				getAccessibilityValue(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AdView.accessibilityValue> property.
+				 */
+				setAccessibilityValue(accessibilityValue: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AdView.anchorPoint> property.
+				 */
+				getAnchorPoint(): Point;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AdView.anchorPoint> property.
+				 */
+				setAnchorPoint(anchorPoint: Point): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AdView.animatedCenter> property.
+				 */
+				getAnimatedCenter(): Point;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AdView.backgroundColor> property.
+				 */
+				getBackgroundColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AdView.backgroundColor> property.
+				 */
+				setBackgroundColor(backgroundColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AdView.backgroundGradient> property.
+				 */
+				getBackgroundGradient(): Gradient;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AdView.backgroundGradient> property.
+				 */
+				setBackgroundGradient(backgroundGradient: Gradient): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AdView.backgroundImage> property.
+				 */
+				getBackgroundImage(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AdView.backgroundImage> property.
+				 */
+				setBackgroundImage(backgroundImage: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AdView.backgroundRepeat> property.
+				 */
+				getBackgroundRepeat(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AdView.backgroundRepeat> property.
+				 */
+				setBackgroundRepeat(backgroundRepeat: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AdView.backgroundLeftCap> property.
+				 */
+				getBackgroundLeftCap(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AdView.backgroundLeftCap> property.
+				 */
+				setBackgroundLeftCap(backgroundLeftCap: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AdView.backgroundTopCap> property.
+				 */
+				getBackgroundTopCap(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AdView.backgroundTopCap> property.
+				 */
+				setBackgroundTopCap(backgroundTopCap: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AdView.borderColor> property.
+				 */
+				getBorderColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AdView.borderColor> property.
+				 */
+				setBorderColor(borderColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AdView.borderRadius> property.
+				 */
+				getBorderRadius(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AdView.borderRadius> property.
+				 */
+				setBorderRadius(borderRadius: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AdView.borderWidth> property.
+				 */
+				getBorderWidth(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AdView.borderWidth> property.
+				 */
+				setBorderWidth(borderWidth: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AdView.bottom> property.
+				 */
+				getBottom(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AdView.bottom> property.
+				 */
+				setBottom(bottom: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AdView.bottom> property.
+				 */
+				setBottom(bottom: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AdView.center> property.
+				 */
+				getCenter(): Point;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AdView.center> property.
+				 */
+				setCenter(center: Point): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AdView.children> property.
+				 */
+				getChildren(): Titanium.UI.View[];
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AdView.clipMode> property.
+				 */
+				getClipMode(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AdView.clipMode> property.
+				 */
+				setClipMode(clipMode: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AdView.height> property.
+				 */
+				getHeight(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AdView.height> property.
+				 */
+				setHeight(height: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AdView.height> property.
+				 */
+				setHeight(height: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AdView.left> property.
+				 */
+				getLeft(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AdView.left> property.
+				 */
+				setLeft(left: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AdView.left> property.
+				 */
+				setLeft(left: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AdView.layout> property.
+				 */
+				getLayout(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AdView.layout> property.
+				 */
+				setLayout(layout: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AdView.opacity> property.
+				 */
+				getOpacity(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AdView.opacity> property.
+				 */
+				setOpacity(opacity: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AdView.pullBackgroundColor> property.
+				 */
+				getPullBackgroundColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AdView.pullBackgroundColor> property.
+				 */
+				setPullBackgroundColor(pullBackgroundColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AdView.previewContext> property.
+				 */
+				getPreviewContext(): Titanium.UI.iOS.PreviewContext;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AdView.previewContext> property.
+				 */
+				setPreviewContext(previewContext: Titanium.UI.iOS.PreviewContext): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AdView.right> property.
+				 */
+				getRight(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AdView.right> property.
+				 */
+				setRight(right: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AdView.right> property.
+				 */
+				setRight(right: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AdView.rect> property.
+				 */
+				getRect(): Dimension;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AdView.size> property.
+				 */
+				getSize(): Dimension;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AdView.tintColor> property.
+				 */
+				getTintColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AdView.tintColor> property.
+				 */
+				setTintColor(tintColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AdView.top> property.
+				 */
+				getTop(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AdView.top> property.
+				 */
+				setTop(top: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AdView.top> property.
+				 */
+				setTop(top: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AdView.touchEnabled> property.
+				 */
+				getTouchEnabled(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AdView.touchEnabled> property.
+				 */
+				setTouchEnabled(touchEnabled: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AdView.transform> property.
+				 */
+				getTransform(): Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AdView.transform> property.
+				 */
+				setTransform(transform: Titanium.UI.Matrix2D): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AdView.transform> property.
+				 */
+				setTransform(transform: Titanium.UI.Matrix3D): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AdView.viewShadowRadius> property.
+				 */
+				getViewShadowRadius(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AdView.viewShadowRadius> property.
+				 */
+				setViewShadowRadius(viewShadowRadius: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AdView.viewShadowColor> property.
+				 */
+				getViewShadowColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AdView.viewShadowColor> property.
+				 */
+				setViewShadowColor(viewShadowColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AdView.viewShadowOffset> property.
+				 */
+				getViewShadowOffset(): Point;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AdView.viewShadowOffset> property.
+				 */
+				setViewShadowOffset(viewShadowOffset: Point): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AdView.visible> property.
+				 */
+				getVisible(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AdView.visible> property.
+				 */
+				setVisible(visible: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AdView.width> property.
+				 */
+				getWidth(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AdView.width> property.
+				 */
+				setWidth(width: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AdView.width> property.
+				 */
+				setWidth(width: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AdView.horizontalWrap> property.
+				 */
+				getHorizontalWrap(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AdView.horizontalWrap> property.
+				 */
+				setHorizontalWrap(horizontalWrap: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AdView.zIndex> property.
+				 */
+				getZIndex(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AdView.zIndex> property.
+				 */
+				setZIndex(zIndex: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AdView.adSize> property.
+				 */
+				getAdSize(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AdView.adSize> property.
+				 */
+				setAdSize(adSize: string): void;
+
+			}
+
+			/**
+			 * Dynamic behavior to support connections between an anchor point and an item.
+			 */
+			interface AnchorAttachmentBehavior extends Titanium.Proxy {
+				/**
+				 * Anchor point for the attachment behavior relative to the animator's coordinate system.
+				 */
+				anchor: Point;
+
+				/**
+				 * Amount of damping to apply to the attachment behavior.
+				 */
+				damping: number;
+
+				/**
+				 * Distance, in points, between the two attachment points.
+				 */
+				distance: number;
+
+				/**
+				 * Frequency of oscillation for the behavior.
+				 */
+				frequency: number;
+
+				/**
+				 * Item to connect to use the attachment behavior.
+				 */
+				item: Titanium.UI.View;
+
+				/**
+				 * Offset from the center point of the item for the attachment.
+				 */
+				offset: Point;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AnchorAttachmentBehavior.anchor> property.
+				 */
+				getAnchor(): Point;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AnchorAttachmentBehavior.anchor> property.
+				 */
+				setAnchor(anchor: Point): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AnchorAttachmentBehavior.damping> property.
+				 */
+				getDamping(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AnchorAttachmentBehavior.damping> property.
+				 */
+				setDamping(damping: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AnchorAttachmentBehavior.distance> property.
+				 */
+				getDistance(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AnchorAttachmentBehavior.distance> property.
+				 */
+				setDistance(distance: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AnchorAttachmentBehavior.frequency> property.
+				 */
+				getFrequency(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AnchorAttachmentBehavior.frequency> property.
+				 */
+				setFrequency(frequency: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AnchorAttachmentBehavior.item> property.
+				 */
+				getItem(): Titanium.UI.View;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AnchorAttachmentBehavior.item> property.
+				 */
+				setItem(item: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AnchorAttachmentBehavior.offset> property.
+				 */
+				getOffset(): Point;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AnchorAttachmentBehavior.offset> property.
+				 */
+				setOffset(offset: Point): void;
+
+			}
+
+			/**
+			 * Provides support for the built-in iOS dynamic animations
+			 */
+			interface Animator extends Titanium.Proxy {
+				/**
+				 * Behaviors associated with this animator.
+				 */
+				behaviors: Titanium.Proxy[];
+
+				/**
+				 * Titanium View object to initialize as the reference view for the animator.
+				 */
+				referenceView: Titanium.UI.View;
+
+				/**
+				 * Returns `true` if the animator is running else `false`.
+				 */
+				readonly running: boolean;
+
+				/**
+				 * Adds a dynamic behavior to the animator.
+				 */
+				addBehavior(behavior: Titanium.Proxy): void;
+
+				/**
+				 * Removes all behaviors from this animator.
+				 */
+				removeAllBehaviors(): void;
+
+				/**
+				 * Removes the specified behavior from the animator.
+				 */
+				removeBehavior(behavior: Titanium.Proxy): void;
+
+				/**
+				 * Starts the animation behaviors.
+				 */
+				startAnimator(): void;
+
+				/**
+				 * Stops the animation behaviors.
+				 */
+				stopAnimator(): void;
+
+				/**
+				 * Updates the animator's state information with the current state of the specified item.
+				 */
+				updateItemUsingCurrentState(item: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Animator.behaviors> property.
+				 */
+				getBehaviors(): Titanium.Proxy[];
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Animator.behaviors> property.
+				 */
+				setBehaviors(behaviors: ReadonlyArray<Titanium.Proxy>): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Animator.referenceView> property.
+				 */
+				getReferenceView(): Titanium.UI.View;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Animator.referenceView> property.
+				 */
+				setReferenceView(referenceView: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Animator.running> property.
+				 */
+				getRunning(): boolean;
+
+			}
+
+			/**
+			 * The Home screen quick actions API is for adding shortcuts to your app icon that anticipate and accelerate a
+			 * user's interaction with your app.
+			 */
+			interface ApplicationShortcuts extends Titanium.Proxy {
+				/**
+				 * Returns an array of the application shortcuts created dynamically.
+				 */
+				listDynamicShortcuts(): ShortcutParams[];
+
+				/**
+				 * Returns an array of the application shortcuts listed in your tiapp.xml file.
+				 */
+				listStaticShortcuts(): ShortcutParams[];
+
+				/**
+				 * Removes all dynamically created application shortcuts.
+				 */
+				removeAllDynamicShortcuts(): void;
+
+				/**
+				 * Returns true or false depending if the provided shortcut object already exists.
+				 */
+				dynamicShortcutExists(itemtype: string): boolean;
+
+				/**
+				 * Creates a new dynamic application shortcut item.
+				 */
+				addDynamicShortcut(params: ShortcutParams): void;
+
+				/**
+				 * Removes the dynamic application shortcut item identified by the `itemtype`.
+				 */
+				removeDynamicShortcut(itemtype: string): void;
+
+				/**
+				 * Gets the dynamic application shortcut item identified by the `itemtype`.
+				 */
+				getDynamicShortcut(itemtype: string): void;
+
+			}
+
+			/**
+			 * An abstract datatype for specifying an attributed string attribute.
+			 */
+			interface Attribute extends Titanium.Proxy {
+				/**
+				 * Attribute to apply to the text.
+				 */
+				type: number;
+
+				/**
+				 * Attribute value.
+				 */
+				value: number;
+
+				/**
+				 * Attribute range.
+				 */
+				range: number[];
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Attribute.type> property.
+				 */
+				getType(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Attribute.type> property.
+				 */
+				setType(type: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Attribute.value> property.
+				 */
+				getValue(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Attribute.value> property.
+				 */
+				setValue(value: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Attribute.range> property.
+				 */
+				getRange(): number[];
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Attribute.range> property.
+				 */
+				setRange(range: ReadonlyArray<number>): void;
+
+			}
+
+			/**
+			 * An attributed string proxy manages character strings and associated sets of attributes (for example,
+			 * font and kerning) that apply to individual characters or ranges of characters in the string.
+			 */
+			interface AttributedString extends Titanium.Proxy {
+				/**
+				 * The text applied to the attributed string.
+				 */
+				text: string;
+
+				/**
+				 * An array of attributes to add.
+				 */
+				attributes: Attribute[];
+
+				/**
+				 * Adds an [attribute](Attribute) with the given name and value to the characters in the specified range.
+				 */
+				addAttribute(attribute: Attribute): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AttributedString.text> property.
+				 */
+				getText(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AttributedString.text> property.
+				 */
+				setText(text: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AttributedString.attributes> property.
+				 */
+				getAttributes(): Attribute[];
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AttributedString.attributes> property.
+				 */
+				setAttributes(attributes: ReadonlyArray<Attribute>): void;
+
+			}
+
+			/**
+			 * A <Titanium.UI.iOS.BlurView> object gives you an easy way implement some complex visual effects.
+			 * The blur effect is applied to every view the blur view is added to by default. You can also place the
+			 * blur view above other views and all visible views layered under the blur view are blurred as well.
+			 * For more information on BlurView, please refer to the official [Apple documentation](https://developer.apple.com/library/ios/documentation/UIKit/Reference/UIVisualEffectView/).
+			 * Note: Apple introduced two new constants <Titanium.UI.iOS.BLUR_EFFECT_STYLE_REGULAR> and <Titanium.UI.iOS.BLUR_EFFECT_STYLE_PROMINENT> in
+			 * iOS 10. These are internally mapped to <Titanium.UI.iOS.BLUR_EFFECT_STYLE_LIGHT> and <Titanium.UI.iOS.BLUR_EFFECT_STYLE_EXTRA_LIGHT>.
+			 */
+			interface BlurView extends Titanium.Proxy {
+				/**
+				 * Whether the view should be "hidden" from (i.e., ignored by) the accessibility service.
+				 */
+				accessibilityHidden: boolean;
+
+				/**
+				 * Briefly describes what performing an action (such as a click) on the view will do.
+				 */
+				accessibilityHint: string;
+
+				/**
+				 * A succint label identifying the view for the device's accessibility service.
+				 */
+				accessibilityLabel: string;
+
+				/**
+				 * A string describing the value (if any) of the view for the device's accessibility service.
+				 */
+				accessibilityValue: string;
+
+				/**
+				 * Coordinate of the view about which to pivot an animation.
+				 */
+				anchorPoint: Point;
+
+				/**
+				 * Current position of the view during an animation.
+				 */
+				readonly animatedCenter: Point;
+
+				/**
+				 * Background color of the view, as a color name or hex triplet.
+				 */
+				backgroundColor: string;
+
+				/**
+				 * A background gradient for the view.
+				 */
+				backgroundGradient: Gradient;
+
+				/**
+				 * Background image for the view, specified as a local file path or URL.
+				 */
+				backgroundImage: string;
+
+				/**
+				 * Determines whether to tile a background across a view.
+				 */
+				backgroundRepeat: boolean;
+
+				/**
+				 * Size of the left end cap.
+				 */
+				backgroundLeftCap: number;
+
+				/**
+				 * Size of the top end cap.
+				 */
+				backgroundTopCap: number;
+
+				/**
+				 * Border color of the view, as a color name or hex triplet.
+				 */
+				borderColor: string;
+
+				/**
+				 * Radius for the rounded corners of the view's border.
+				 */
+				borderRadius: number;
+
+				/**
+				 * Border width of the view.
+				 */
+				borderWidth: number;
+
+				/**
+				 * View's bottom position, in platform-specific units.
+				 */
+				bottom: number | string;
+
+				/**
+				 * View's center position, in the parent view's coordinates.
+				 */
+				center: Point;
+
+				/**
+				 * Array of this view's child views.
+				 */
+				readonly children: Titanium.UI.View[];
+
+				/**
+				 * View's clipping behavior.
+				 */
+				clipMode: number;
+
+				/**
+				 * View height, in platform-specific units.
+				 */
+				height: number | string;
+
+				/**
+				 * View's left position, in platform-specific units.
+				 */
+				left: number | string;
+
+				/**
+				 * Specifies how the view positions its children.
+				 * One of: 'composite', 'vertical', or 'horizontal'.
+				 */
+				layout: string;
+
+				/**
+				 * Opacity of this view, from 0.0 (transparent) to 1.0 (opaque).
+				 */
+				opacity: number;
+
+				/**
+				 * Background color of the wrapper view when this view is used as either <Titanium.UI.ListView.pullView> or <Titanium.UI.TableView.headerPullView>.
+				 */
+				pullBackgroundColor: string;
+
+				/**
+				 * The preview context used in the 3D-Touch feature "Peek and Pop".
+				 */
+				previewContext: Titanium.UI.iOS.PreviewContext;
+
+				/**
+				 * View's right position, in platform-specific units.
+				 */
+				right: number | string;
+
+				/**
+				 * The bounding box of the view relative to its parent, in system units.
+				 */
+				readonly rect: Dimension;
+
+				/**
+				 * The size of the view in system units.
+				 */
+				readonly size: Dimension;
+
+				/**
+				 * The view's tintColor. This property is applicable on iOS 7 and greater.
+				 */
+				tintColor: string;
+
+				/**
+				 * The view's top position.
+				 */
+				top: number | string;
+
+				/**
+				 * Determines whether view should receive touch events.
+				 */
+				touchEnabled: boolean;
+
+				/**
+				 * Transformation matrix to apply to the view.
+				 */
+				transform: Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
+
+				/**
+				 * Determines the blur radius used to create the shadow.
+				 */
+				viewShadowRadius: number;
+
+				/**
+				 * Determines the color of the shadow.
+				 */
+				viewShadowColor: string;
+
+				/**
+				 * Determines the offset for the shadow of the view.
+				 */
+				viewShadowOffset: Point;
+
+				/**
+				 * Determines whether the view is visible.
+				 */
+				visible: boolean;
+
+				/**
+				 * View's width, in platform-specific units.
+				 */
+				width: number | string;
+
+				/**
+				 * Determines whether the layout has wrapping behavior.
+				 */
+				horizontalWrap: boolean;
+
+				/**
+				 * Z-index stack order position, relative to other sibling views.
+				 */
+				zIndex: number;
+
+				/**
+				 * The effect you provide for the view.
+				 */
+				effect: number;
+
+				/**
+				 * Adds a child to this view's hierarchy.
+				 */
+				add(view: any): void;
+
+				/**
+				 * Adds a child to this view's hierarchy.
+				 */
+				add(view: any[]): void;
+
+				/**
+				 * Animates this view.
+				 */
+				animate(animation: any, callback?: (param0: any) => any): void;
+
+				/**
+				 * Finishes a batch update of the View's layout properties and schedules a layout pass of the
+				 * view tree.
+				 */
+				finishLayout(): void;
+
+				/**
+				 * Hides this view.
+				 */
+				hide(options?: AnimationOption): void;
+
+				/**
+				 * Inserts a view at the specified position in the [children](Titanium.UI.View.children) array.
+				 */
+				insertAt(params: any): void;
+
+				/**
+				 * Removes a child view from this view's hierarchy.
+				 */
+				remove(view: any): void;
+
+				/**
+				 * Removes all child views from this view's hierarchy.
+				 */
+				removeAllChildren(): void;
+
+				/**
+				 * Replaces a view at the specified position in the [children](Titanium.UI.View.children) array.
+				 */
+				replaceAt(params: any): void;
+
+				/**
+				 * Makes this view visible.
+				 */
+				show(options?: AnimationOption): void;
+
+				/**
+				 * Starts a batch update of this view's layout properties.
+				 */
+				startLayout(): void;
+
+				/**
+				 * Returns an image of the rendered view, as a Blob.
+				 */
+				toImage(callback?: (param0: Titanium.Blob) => any, honorScaleFactor?: boolean): Titanium.Blob;
+
+				/**
+				 * Performs a batch update of all supplied layout properties and schedules a layout pass after
+				 * they have been updated.
+				 */
+				updateLayout(params: any): void;
+
+				/**
+				 * Translates a point from this view's coordinate system to another view's coordinate system.
+				 */
+				convertPointToView(point: Point, destinationView: any): Point;
+
+				/**
+				 * Returns the matching view of a given view ID.
+				 */
+				getViewById(id: string): Titanium.UI.View;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.BlurView.accessibilityHidden> property.
+				 */
+				getAccessibilityHidden(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.BlurView.accessibilityHidden> property.
+				 */
+				setAccessibilityHidden(accessibilityHidden: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.BlurView.accessibilityHint> property.
+				 */
+				getAccessibilityHint(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.BlurView.accessibilityHint> property.
+				 */
+				setAccessibilityHint(accessibilityHint: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.BlurView.accessibilityLabel> property.
+				 */
+				getAccessibilityLabel(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.BlurView.accessibilityLabel> property.
+				 */
+				setAccessibilityLabel(accessibilityLabel: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.BlurView.accessibilityValue> property.
+				 */
+				getAccessibilityValue(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.BlurView.accessibilityValue> property.
+				 */
+				setAccessibilityValue(accessibilityValue: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.BlurView.anchorPoint> property.
+				 */
+				getAnchorPoint(): Point;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.BlurView.anchorPoint> property.
+				 */
+				setAnchorPoint(anchorPoint: Point): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.BlurView.animatedCenter> property.
+				 */
+				getAnimatedCenter(): Point;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.BlurView.backgroundColor> property.
+				 */
+				getBackgroundColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.BlurView.backgroundColor> property.
+				 */
+				setBackgroundColor(backgroundColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.BlurView.backgroundGradient> property.
+				 */
+				getBackgroundGradient(): Gradient;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.BlurView.backgroundGradient> property.
+				 */
+				setBackgroundGradient(backgroundGradient: Gradient): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.BlurView.backgroundImage> property.
+				 */
+				getBackgroundImage(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.BlurView.backgroundImage> property.
+				 */
+				setBackgroundImage(backgroundImage: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.BlurView.backgroundRepeat> property.
+				 */
+				getBackgroundRepeat(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.BlurView.backgroundRepeat> property.
+				 */
+				setBackgroundRepeat(backgroundRepeat: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.BlurView.backgroundLeftCap> property.
+				 */
+				getBackgroundLeftCap(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.BlurView.backgroundLeftCap> property.
+				 */
+				setBackgroundLeftCap(backgroundLeftCap: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.BlurView.backgroundTopCap> property.
+				 */
+				getBackgroundTopCap(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.BlurView.backgroundTopCap> property.
+				 */
+				setBackgroundTopCap(backgroundTopCap: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.BlurView.borderColor> property.
+				 */
+				getBorderColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.BlurView.borderColor> property.
+				 */
+				setBorderColor(borderColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.BlurView.borderRadius> property.
+				 */
+				getBorderRadius(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.BlurView.borderRadius> property.
+				 */
+				setBorderRadius(borderRadius: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.BlurView.borderWidth> property.
+				 */
+				getBorderWidth(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.BlurView.borderWidth> property.
+				 */
+				setBorderWidth(borderWidth: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.BlurView.bottom> property.
+				 */
+				getBottom(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.BlurView.bottom> property.
+				 */
+				setBottom(bottom: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.BlurView.bottom> property.
+				 */
+				setBottom(bottom: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.BlurView.center> property.
+				 */
+				getCenter(): Point;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.BlurView.center> property.
+				 */
+				setCenter(center: Point): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.BlurView.children> property.
+				 */
+				getChildren(): Titanium.UI.View[];
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.BlurView.clipMode> property.
+				 */
+				getClipMode(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.BlurView.clipMode> property.
+				 */
+				setClipMode(clipMode: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.BlurView.height> property.
+				 */
+				getHeight(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.BlurView.height> property.
+				 */
+				setHeight(height: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.BlurView.height> property.
+				 */
+				setHeight(height: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.BlurView.left> property.
+				 */
+				getLeft(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.BlurView.left> property.
+				 */
+				setLeft(left: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.BlurView.left> property.
+				 */
+				setLeft(left: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.BlurView.layout> property.
+				 */
+				getLayout(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.BlurView.layout> property.
+				 */
+				setLayout(layout: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.BlurView.opacity> property.
+				 */
+				getOpacity(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.BlurView.opacity> property.
+				 */
+				setOpacity(opacity: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.BlurView.pullBackgroundColor> property.
+				 */
+				getPullBackgroundColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.BlurView.pullBackgroundColor> property.
+				 */
+				setPullBackgroundColor(pullBackgroundColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.BlurView.previewContext> property.
+				 */
+				getPreviewContext(): Titanium.UI.iOS.PreviewContext;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.BlurView.previewContext> property.
+				 */
+				setPreviewContext(previewContext: Titanium.UI.iOS.PreviewContext): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.BlurView.right> property.
+				 */
+				getRight(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.BlurView.right> property.
+				 */
+				setRight(right: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.BlurView.right> property.
+				 */
+				setRight(right: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.BlurView.rect> property.
+				 */
+				getRect(): Dimension;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.BlurView.size> property.
+				 */
+				getSize(): Dimension;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.BlurView.tintColor> property.
+				 */
+				getTintColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.BlurView.tintColor> property.
+				 */
+				setTintColor(tintColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.BlurView.top> property.
+				 */
+				getTop(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.BlurView.top> property.
+				 */
+				setTop(top: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.BlurView.top> property.
+				 */
+				setTop(top: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.BlurView.touchEnabled> property.
+				 */
+				getTouchEnabled(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.BlurView.touchEnabled> property.
+				 */
+				setTouchEnabled(touchEnabled: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.BlurView.transform> property.
+				 */
+				getTransform(): Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.BlurView.transform> property.
+				 */
+				setTransform(transform: Titanium.UI.Matrix2D): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.BlurView.transform> property.
+				 */
+				setTransform(transform: Titanium.UI.Matrix3D): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.BlurView.viewShadowRadius> property.
+				 */
+				getViewShadowRadius(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.BlurView.viewShadowRadius> property.
+				 */
+				setViewShadowRadius(viewShadowRadius: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.BlurView.viewShadowColor> property.
+				 */
+				getViewShadowColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.BlurView.viewShadowColor> property.
+				 */
+				setViewShadowColor(viewShadowColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.BlurView.viewShadowOffset> property.
+				 */
+				getViewShadowOffset(): Point;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.BlurView.viewShadowOffset> property.
+				 */
+				setViewShadowOffset(viewShadowOffset: Point): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.BlurView.visible> property.
+				 */
+				getVisible(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.BlurView.visible> property.
+				 */
+				setVisible(visible: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.BlurView.width> property.
+				 */
+				getWidth(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.BlurView.width> property.
+				 */
+				setWidth(width: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.BlurView.width> property.
+				 */
+				setWidth(width: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.BlurView.horizontalWrap> property.
+				 */
+				getHorizontalWrap(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.BlurView.horizontalWrap> property.
+				 */
+				setHorizontalWrap(horizontalWrap: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.BlurView.zIndex> property.
+				 */
+				getZIndex(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.BlurView.zIndex> property.
+				 */
+				setZIndex(zIndex: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.BlurView.effect> property.
+				 */
+				getEffect(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.BlurView.effect> property.
+				 */
+				setEffect(effect: number): void;
+
+			}
+
+			/**
+			 * Dynamic behavior to support collisions between items and boundaries.
+			 */
+			interface CollisionBehavior extends Titanium.Proxy {
+				/**
+				 * Boundary identfiers added to this behavior.
+				 */
+				readonly boundaryIdentifiers: BoundaryIdentifier[];
+
+				/**
+				 * Specifies the collision behavior.
+				 */
+				collisionMode: number;
+
+				/**
+				 * Items added to this behavior.
+				 */
+				readonly items: Titanium.UI.View[];
+
+				/**
+				 * Insets to apply when using the animator's reference view as the boundary.
+				 */
+				referenceInsets: ReferenceInsets;
+
+				/**
+				 * Use the animator's reference view as the boundary.
+				 */
+				treatReferenceAsBoundary: boolean;
+
+				/**
+				 * Adds a boundary to this behavior.
+				 */
+				addBoundary(boundary: BoundaryIdentifier): void;
+
+				/**
+				 * Adds an item to this behavior.
+				 */
+				addItem(item: any): void;
+
+				/**
+				 * Removes all boundaries from this behavior.
+				 */
+				removeAllBoundaries(): void;
+
+				/**
+				 * Removes the specified boundary from this behavior.
+				 */
+				removeBoundary(boundary: BoundaryIdentifier): void;
+
+				/**
+				 * Removes the specified item from this behavior.
+				 */
+				removeItem(item: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.CollisionBehavior.boundaryIdentifiers> property.
+				 */
+				getBoundaryIdentifiers(): BoundaryIdentifier[];
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.CollisionBehavior.collisionMode> property.
+				 */
+				getCollisionMode(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CollisionBehavior.collisionMode> property.
+				 */
+				setCollisionMode(collisionMode: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.CollisionBehavior.items> property.
+				 */
+				getItems(): Titanium.UI.View[];
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.CollisionBehavior.referenceInsets> property.
+				 */
+				getReferenceInsets(): ReferenceInsets;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CollisionBehavior.referenceInsets> property.
+				 */
+				setReferenceInsets(referenceInsets: ReferenceInsets): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.CollisionBehavior.treatReferenceAsBoundary> property.
+				 */
+				getTreatReferenceAsBoundary(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CollisionBehavior.treatReferenceAsBoundary> property.
+				 */
+				setTreatReferenceAsBoundary(treatReferenceAsBoundary: boolean): void;
+
+			}
+
+			/**
+			 * The cover flow view is a container showing animated three-dimensional images in a style
+			 * consistent with the cover flow presentation style used for iPod, iTunes, and file browsing.
+			 */
+			interface CoverFlowView extends Titanium.Proxy {
+				/**
+				 * Whether the view should be "hidden" from (i.e., ignored by) the accessibility service.
+				 */
+				accessibilityHidden: boolean;
+
+				/**
+				 * Briefly describes what performing an action (such as a click) on the view will do.
+				 */
+				accessibilityHint: string;
+
+				/**
+				 * A succint label identifying the view for the device's accessibility service.
+				 */
+				accessibilityLabel: string;
+
+				/**
+				 * A string describing the value (if any) of the view for the device's accessibility service.
+				 */
+				accessibilityValue: string;
+
+				/**
+				 * Coordinate of the view about which to pivot an animation.
+				 */
+				anchorPoint: Point;
+
+				/**
+				 * Current position of the view during an animation.
+				 */
+				readonly animatedCenter: Point;
+
+				/**
+				 * Background color of the view, as a color name or hex triplet.
+				 */
+				backgroundColor: string;
+
+				/**
+				 * A background gradient for the view.
+				 */
+				backgroundGradient: Gradient;
+
+				/**
+				 * Background image for the view, specified as a local file path or URL.
+				 */
+				backgroundImage: string;
+
+				/**
+				 * Determines whether to tile a background across a view.
+				 */
+				backgroundRepeat: boolean;
+
+				/**
+				 * Size of the left end cap.
+				 */
+				backgroundLeftCap: number;
+
+				/**
+				 * Size of the top end cap.
+				 */
+				backgroundTopCap: number;
+
+				/**
+				 * Border color of the view, as a color name or hex triplet.
+				 */
+				borderColor: string;
+
+				/**
+				 * Radius for the rounded corners of the view's border.
+				 */
+				borderRadius: number;
+
+				/**
+				 * Border width of the view.
+				 */
+				borderWidth: number;
+
+				/**
+				 * View's bottom position, in platform-specific units.
+				 */
+				bottom: number | string;
+
+				/**
+				 * View's center position, in the parent view's coordinates.
+				 */
+				center: Point;
+
+				/**
+				 * Array of this view's child views.
+				 */
+				readonly children: Titanium.UI.View[];
+
+				/**
+				 * View's clipping behavior.
+				 */
+				clipMode: number;
+
+				/**
+				 * View height, in platform-specific units.
+				 */
+				height: number | string;
+
+				/**
+				 * View's left position, in platform-specific units.
+				 */
+				left: number | string;
+
+				/**
+				 * Specifies how the view positions its children.
+				 * One of: 'composite', 'vertical', or 'horizontal'.
+				 */
+				layout: string;
+
+				/**
+				 * Opacity of this view, from 0.0 (transparent) to 1.0 (opaque).
+				 */
+				opacity: number;
+
+				/**
+				 * Background color of the wrapper view when this view is used as either <Titanium.UI.ListView.pullView> or <Titanium.UI.TableView.headerPullView>.
+				 */
+				pullBackgroundColor: string;
+
+				/**
+				 * The preview context used in the 3D-Touch feature "Peek and Pop".
+				 */
+				previewContext: Titanium.UI.iOS.PreviewContext;
+
+				/**
+				 * View's right position, in platform-specific units.
+				 */
+				right: number | string;
+
+				/**
+				 * The bounding box of the view relative to its parent, in system units.
+				 */
+				readonly rect: Dimension;
+
+				/**
+				 * The size of the view in system units.
+				 */
+				readonly size: Dimension;
+
+				/**
+				 * The view's tintColor. This property is applicable on iOS 7 and greater.
+				 */
+				tintColor: string;
+
+				/**
+				 * The view's top position.
+				 */
+				top: number | string;
+
+				/**
+				 * Determines whether view should receive touch events.
+				 */
+				touchEnabled: boolean;
+
+				/**
+				 * Transformation matrix to apply to the view.
+				 */
+				transform: Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
+
+				/**
+				 * Determines the blur radius used to create the shadow.
+				 */
+				viewShadowRadius: number;
+
+				/**
+				 * Determines the color of the shadow.
+				 */
+				viewShadowColor: string;
+
+				/**
+				 * Determines the offset for the shadow of the view.
+				 */
+				viewShadowOffset: Point;
+
+				/**
+				 * Determines whether the view is visible.
+				 */
+				visible: boolean;
+
+				/**
+				 * View's width, in platform-specific units.
+				 */
+				width: number | string;
+
+				/**
+				 * Determines whether the layout has wrapping behavior.
+				 */
+				horizontalWrap: boolean;
+
+				/**
+				 * Z-index stack order position, relative to other sibling views.
+				 */
+				zIndex: number;
+
+				/**
+				 * Images to display in the view.
+				 */
+				images: string[] | Titanium.Blob[] | Titanium.Filesystem.File[] | CoverFlowImageType[];
+
+				/**
+				 * Index to make selected.
+				 */
+				selected: number;
+
+				/**
+				 * Adds a child to this view's hierarchy.
+				 */
+				add(view: any): void;
+
+				/**
+				 * Adds a child to this view's hierarchy.
+				 */
+				add(view: any[]): void;
+
+				/**
+				 * Animates this view.
+				 */
+				animate(animation: any, callback?: (param0: any) => any): void;
+
+				/**
+				 * Finishes a batch update of the View's layout properties and schedules a layout pass of the
+				 * view tree.
+				 */
+				finishLayout(): void;
+
+				/**
+				 * Hides this view.
+				 */
+				hide(options?: AnimationOption): void;
+
+				/**
+				 * Inserts a view at the specified position in the [children](Titanium.UI.View.children) array.
+				 */
+				insertAt(params: any): void;
+
+				/**
+				 * Removes a child view from this view's hierarchy.
+				 */
+				remove(view: any): void;
+
+				/**
+				 * Removes all child views from this view's hierarchy.
+				 */
+				removeAllChildren(): void;
+
+				/**
+				 * Replaces a view at the specified position in the [children](Titanium.UI.View.children) array.
+				 */
+				replaceAt(params: any): void;
+
+				/**
+				 * Makes this view visible.
+				 */
+				show(options?: AnimationOption): void;
+
+				/**
+				 * Starts a batch update of this view's layout properties.
+				 */
+				startLayout(): void;
+
+				/**
+				 * Returns an image of the rendered view, as a Blob.
+				 */
+				toImage(callback?: (param0: Titanium.Blob) => any, honorScaleFactor?: boolean): Titanium.Blob;
+
+				/**
+				 * Performs a batch update of all supplied layout properties and schedules a layout pass after
+				 * they have been updated.
+				 */
+				updateLayout(params: any): void;
+
+				/**
+				 * Translates a point from this view's coordinate system to another view's coordinate system.
+				 */
+				convertPointToView(point: Point, destinationView: any): Point;
+
+				/**
+				 * Returns the matching view of a given view ID.
+				 */
+				getViewById(id: string): Titanium.UI.View;
+
+				/**
+				 * Changes the image for a specified index.
+				 */
+				setImage(index: number, image: string): void;
+
+				/**
+				 * Changes the image for a specified index.
+				 */
+				setImage(index: number, image: Titanium.Blob): void;
+
+				/**
+				 * Changes the image for a specified index.
+				 */
+				setImage(index: number, image: Titanium.Filesystem.File): void;
+
+				/**
+				 * Changes the image for a specified index.
+				 */
+				setImage(index: number, image: CoverFlowImageType): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.CoverFlowView.accessibilityHidden> property.
+				 */
+				getAccessibilityHidden(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CoverFlowView.accessibilityHidden> property.
+				 */
+				setAccessibilityHidden(accessibilityHidden: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.CoverFlowView.accessibilityHint> property.
+				 */
+				getAccessibilityHint(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CoverFlowView.accessibilityHint> property.
+				 */
+				setAccessibilityHint(accessibilityHint: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.CoverFlowView.accessibilityLabel> property.
+				 */
+				getAccessibilityLabel(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CoverFlowView.accessibilityLabel> property.
+				 */
+				setAccessibilityLabel(accessibilityLabel: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.CoverFlowView.accessibilityValue> property.
+				 */
+				getAccessibilityValue(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CoverFlowView.accessibilityValue> property.
+				 */
+				setAccessibilityValue(accessibilityValue: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.CoverFlowView.anchorPoint> property.
+				 */
+				getAnchorPoint(): Point;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CoverFlowView.anchorPoint> property.
+				 */
+				setAnchorPoint(anchorPoint: Point): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.CoverFlowView.animatedCenter> property.
+				 */
+				getAnimatedCenter(): Point;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.CoverFlowView.backgroundColor> property.
+				 */
+				getBackgroundColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CoverFlowView.backgroundColor> property.
+				 */
+				setBackgroundColor(backgroundColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.CoverFlowView.backgroundGradient> property.
+				 */
+				getBackgroundGradient(): Gradient;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CoverFlowView.backgroundGradient> property.
+				 */
+				setBackgroundGradient(backgroundGradient: Gradient): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.CoverFlowView.backgroundImage> property.
+				 */
+				getBackgroundImage(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CoverFlowView.backgroundImage> property.
+				 */
+				setBackgroundImage(backgroundImage: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.CoverFlowView.backgroundRepeat> property.
+				 */
+				getBackgroundRepeat(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CoverFlowView.backgroundRepeat> property.
+				 */
+				setBackgroundRepeat(backgroundRepeat: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.CoverFlowView.backgroundLeftCap> property.
+				 */
+				getBackgroundLeftCap(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CoverFlowView.backgroundLeftCap> property.
+				 */
+				setBackgroundLeftCap(backgroundLeftCap: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.CoverFlowView.backgroundTopCap> property.
+				 */
+				getBackgroundTopCap(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CoverFlowView.backgroundTopCap> property.
+				 */
+				setBackgroundTopCap(backgroundTopCap: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.CoverFlowView.borderColor> property.
+				 */
+				getBorderColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CoverFlowView.borderColor> property.
+				 */
+				setBorderColor(borderColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.CoverFlowView.borderRadius> property.
+				 */
+				getBorderRadius(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CoverFlowView.borderRadius> property.
+				 */
+				setBorderRadius(borderRadius: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.CoverFlowView.borderWidth> property.
+				 */
+				getBorderWidth(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CoverFlowView.borderWidth> property.
+				 */
+				setBorderWidth(borderWidth: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.CoverFlowView.bottom> property.
+				 */
+				getBottom(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CoverFlowView.bottom> property.
+				 */
+				setBottom(bottom: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CoverFlowView.bottom> property.
+				 */
+				setBottom(bottom: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.CoverFlowView.center> property.
+				 */
+				getCenter(): Point;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CoverFlowView.center> property.
+				 */
+				setCenter(center: Point): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.CoverFlowView.children> property.
+				 */
+				getChildren(): Titanium.UI.View[];
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.CoverFlowView.clipMode> property.
+				 */
+				getClipMode(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CoverFlowView.clipMode> property.
+				 */
+				setClipMode(clipMode: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.CoverFlowView.height> property.
+				 */
+				getHeight(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CoverFlowView.height> property.
+				 */
+				setHeight(height: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CoverFlowView.height> property.
+				 */
+				setHeight(height: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.CoverFlowView.left> property.
+				 */
+				getLeft(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CoverFlowView.left> property.
+				 */
+				setLeft(left: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CoverFlowView.left> property.
+				 */
+				setLeft(left: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.CoverFlowView.layout> property.
+				 */
+				getLayout(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CoverFlowView.layout> property.
+				 */
+				setLayout(layout: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.CoverFlowView.opacity> property.
+				 */
+				getOpacity(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CoverFlowView.opacity> property.
+				 */
+				setOpacity(opacity: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.CoverFlowView.pullBackgroundColor> property.
+				 */
+				getPullBackgroundColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CoverFlowView.pullBackgroundColor> property.
+				 */
+				setPullBackgroundColor(pullBackgroundColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.CoverFlowView.previewContext> property.
+				 */
+				getPreviewContext(): Titanium.UI.iOS.PreviewContext;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CoverFlowView.previewContext> property.
+				 */
+				setPreviewContext(previewContext: Titanium.UI.iOS.PreviewContext): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.CoverFlowView.right> property.
+				 */
+				getRight(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CoverFlowView.right> property.
+				 */
+				setRight(right: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CoverFlowView.right> property.
+				 */
+				setRight(right: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.CoverFlowView.rect> property.
+				 */
+				getRect(): Dimension;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.CoverFlowView.size> property.
+				 */
+				getSize(): Dimension;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.CoverFlowView.tintColor> property.
+				 */
+				getTintColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CoverFlowView.tintColor> property.
+				 */
+				setTintColor(tintColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.CoverFlowView.top> property.
+				 */
+				getTop(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CoverFlowView.top> property.
+				 */
+				setTop(top: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CoverFlowView.top> property.
+				 */
+				setTop(top: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.CoverFlowView.touchEnabled> property.
+				 */
+				getTouchEnabled(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CoverFlowView.touchEnabled> property.
+				 */
+				setTouchEnabled(touchEnabled: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.CoverFlowView.transform> property.
+				 */
+				getTransform(): Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CoverFlowView.transform> property.
+				 */
+				setTransform(transform: Titanium.UI.Matrix2D): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CoverFlowView.transform> property.
+				 */
+				setTransform(transform: Titanium.UI.Matrix3D): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.CoverFlowView.viewShadowRadius> property.
+				 */
+				getViewShadowRadius(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CoverFlowView.viewShadowRadius> property.
+				 */
+				setViewShadowRadius(viewShadowRadius: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.CoverFlowView.viewShadowColor> property.
+				 */
+				getViewShadowColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CoverFlowView.viewShadowColor> property.
+				 */
+				setViewShadowColor(viewShadowColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.CoverFlowView.viewShadowOffset> property.
+				 */
+				getViewShadowOffset(): Point;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CoverFlowView.viewShadowOffset> property.
+				 */
+				setViewShadowOffset(viewShadowOffset: Point): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.CoverFlowView.visible> property.
+				 */
+				getVisible(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CoverFlowView.visible> property.
+				 */
+				setVisible(visible: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.CoverFlowView.width> property.
+				 */
+				getWidth(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CoverFlowView.width> property.
+				 */
+				setWidth(width: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CoverFlowView.width> property.
+				 */
+				setWidth(width: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.CoverFlowView.horizontalWrap> property.
+				 */
+				getHorizontalWrap(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CoverFlowView.horizontalWrap> property.
+				 */
+				setHorizontalWrap(horizontalWrap: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.CoverFlowView.zIndex> property.
+				 */
+				getZIndex(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CoverFlowView.zIndex> property.
+				 */
+				setZIndex(zIndex: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.CoverFlowView.images> property.
+				 */
+				getImages(): string[] | Titanium.Blob[] | Titanium.Filesystem.File[] | CoverFlowImageType[];
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CoverFlowView.images> property.
+				 */
+				setImages(images: ReadonlyArray<string>): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CoverFlowView.images> property.
+				 */
+				setImages(images: ReadonlyArray<Titanium.Blob>): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CoverFlowView.images> property.
+				 */
+				setImages(images: ReadonlyArray<Titanium.Filesystem.File>): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CoverFlowView.images> property.
+				 */
+				setImages(images: ReadonlyArray<CoverFlowImageType>): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.CoverFlowView.selected> property.
+				 */
+				getSelected(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CoverFlowView.selected> property.
+				 */
+				setSelected(selected: number): void;
+
+			}
+
+			/**
+			 * A DocumentViewer provides in-app support for managing user interactions with files on the
+			 * local system.
+			 */
+			interface DocumentViewer extends Titanium.Proxy {
+				/**
+				 * Whether the view should be "hidden" from (i.e., ignored by) the accessibility service.
+				 */
+				accessibilityHidden: boolean;
+
+				/**
+				 * Briefly describes what performing an action (such as a click) on the view will do.
+				 */
+				accessibilityHint: string;
+
+				/**
+				 * A succint label identifying the view for the device's accessibility service.
+				 */
+				accessibilityLabel: string;
+
+				/**
+				 * A string describing the value (if any) of the view for the device's accessibility service.
+				 */
+				accessibilityValue: string;
+
+				/**
+				 * Coordinate of the view about which to pivot an animation.
+				 */
+				anchorPoint: Point;
+
+				/**
+				 * Current position of the view during an animation.
+				 */
+				readonly animatedCenter: Point;
+
+				/**
+				 * Background color of the view, as a color name or hex triplet.
+				 */
+				backgroundColor: string;
+
+				/**
+				 * A background gradient for the view.
+				 */
+				backgroundGradient: Gradient;
+
+				/**
+				 * Background image for the view, specified as a local file path or URL.
+				 */
+				backgroundImage: string;
+
+				/**
+				 * Determines whether to tile a background across a view.
+				 */
+				backgroundRepeat: boolean;
+
+				/**
+				 * Size of the left end cap.
+				 */
+				backgroundLeftCap: number;
+
+				/**
+				 * Size of the top end cap.
+				 */
+				backgroundTopCap: number;
+
+				/**
+				 * Border color of the view, as a color name or hex triplet.
+				 */
+				borderColor: string;
+
+				/**
+				 * Radius for the rounded corners of the view's border.
+				 */
+				borderRadius: number;
+
+				/**
+				 * Border width of the view.
+				 */
+				borderWidth: number;
+
+				/**
+				 * View's bottom position, in platform-specific units.
+				 */
+				bottom: number | string;
+
+				/**
+				 * View's center position, in the parent view's coordinates.
+				 */
+				center: Point;
+
+				/**
+				 * Array of this view's child views.
+				 */
+				readonly children: Titanium.UI.View[];
+
+				/**
+				 * View's clipping behavior.
+				 */
+				clipMode: number;
+
+				/**
+				 * View height, in platform-specific units.
+				 */
+				height: number | string;
+
+				/**
+				 * View's left position, in platform-specific units.
+				 */
+				left: number | string;
+
+				/**
+				 * Specifies how the view positions its children.
+				 * One of: 'composite', 'vertical', or 'horizontal'.
+				 */
+				layout: string;
+
+				/**
+				 * Opacity of this view, from 0.0 (transparent) to 1.0 (opaque).
+				 */
+				opacity: number;
+
+				/**
+				 * Background color of the wrapper view when this view is used as either <Titanium.UI.ListView.pullView> or <Titanium.UI.TableView.headerPullView>.
+				 */
+				pullBackgroundColor: string;
+
+				/**
+				 * The preview context used in the 3D-Touch feature "Peek and Pop".
+				 */
+				previewContext: Titanium.UI.iOS.PreviewContext;
+
+				/**
+				 * View's right position, in platform-specific units.
+				 */
+				right: number | string;
+
+				/**
+				 * The bounding box of the view relative to its parent, in system units.
+				 */
+				readonly rect: Dimension;
+
+				/**
+				 * The size of the view in system units.
+				 */
+				readonly size: Dimension;
+
+				/**
+				 * The view's tintColor. This property is applicable on iOS 7 and greater.
+				 */
+				tintColor: string;
+
+				/**
+				 * The view's top position.
+				 */
+				top: number | string;
+
+				/**
+				 * Determines whether view should receive touch events.
+				 */
+				touchEnabled: boolean;
+
+				/**
+				 * Transformation matrix to apply to the view.
+				 */
+				transform: Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
+
+				/**
+				 * Determines the blur radius used to create the shadow.
+				 */
+				viewShadowRadius: number;
+
+				/**
+				 * Determines the color of the shadow.
+				 */
+				viewShadowColor: string;
+
+				/**
+				 * Determines the offset for the shadow of the view.
+				 */
+				viewShadowOffset: Point;
+
+				/**
+				 * Determines whether the view is visible.
+				 */
+				visible: boolean;
+
+				/**
+				 * View's width, in platform-specific units.
+				 */
+				width: number | string;
+
+				/**
+				 * Determines whether the layout has wrapping behavior.
+				 */
+				horizontalWrap: boolean;
+
+				/**
+				 * Z-index stack order position, relative to other sibling views.
+				 */
+				zIndex: number;
+
+				/**
+				 * Name of the file (without the path).
+				 */
+				readonly name: string;
+
+				/**
+				 * URL of the document being previewed.
+				 */
+				url: string;
+
+				/**
+				 * Adds a child to this view's hierarchy.
+				 */
+				add(view: any): void;
+
+				/**
+				 * Adds a child to this view's hierarchy.
+				 */
+				add(view: any[]): void;
+
+				/**
+				 * Animates this view.
+				 */
+				animate(animation: any, callback?: (param0: any) => any): void;
+
+				/**
+				 * Finishes a batch update of the View's layout properties and schedules a layout pass of the
+				 * view tree.
+				 */
+				finishLayout(): void;
+
+				/**
+				 * Dismisses the document viewer.
+				 */
+				hide(options?: DocumentViewerOptions): void;
+
+				/**
+				 * Inserts a view at the specified position in the [children](Titanium.UI.View.children) array.
+				 */
+				insertAt(params: any): void;
+
+				/**
+				 * Removes a child view from this view's hierarchy.
+				 */
+				remove(view: any): void;
+
+				/**
+				 * Removes all child views from this view's hierarchy.
+				 */
+				removeAllChildren(): void;
+
+				/**
+				 * Replaces a view at the specified position in the [children](Titanium.UI.View.children) array.
+				 */
+				replaceAt(params: any): void;
+
+				/**
+				 * Displays the document viewer over the current view.
+				 */
+				show(options?: DocumentViewerOptions): void;
+
+				/**
+				 * Starts a batch update of this view's layout properties.
+				 */
+				startLayout(): void;
+
+				/**
+				 * Returns an image of the rendered view, as a Blob.
+				 */
+				toImage(callback?: (param0: Titanium.Blob) => any, honorScaleFactor?: boolean): Titanium.Blob;
+
+				/**
+				 * Performs a batch update of all supplied layout properties and schedules a layout pass after
+				 * they have been updated.
+				 */
+				updateLayout(params: any): void;
+
+				/**
+				 * Translates a point from this view's coordinate system to another view's coordinate system.
+				 */
+				convertPointToView(point: Point, destinationView: any): Point;
+
+				/**
+				 * Returns the matching view of a given view ID.
+				 */
+				getViewById(id: string): Titanium.UI.View;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.accessibilityHidden> property.
+				 */
+				getAccessibilityHidden(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.accessibilityHidden> property.
+				 */
+				setAccessibilityHidden(accessibilityHidden: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.accessibilityHint> property.
+				 */
+				getAccessibilityHint(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.accessibilityHint> property.
+				 */
+				setAccessibilityHint(accessibilityHint: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.accessibilityLabel> property.
+				 */
+				getAccessibilityLabel(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.accessibilityLabel> property.
+				 */
+				setAccessibilityLabel(accessibilityLabel: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.accessibilityValue> property.
+				 */
+				getAccessibilityValue(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.accessibilityValue> property.
+				 */
+				setAccessibilityValue(accessibilityValue: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.anchorPoint> property.
+				 */
+				getAnchorPoint(): Point;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.anchorPoint> property.
+				 */
+				setAnchorPoint(anchorPoint: Point): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.animatedCenter> property.
+				 */
+				getAnimatedCenter(): Point;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.backgroundColor> property.
+				 */
+				getBackgroundColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.backgroundColor> property.
+				 */
+				setBackgroundColor(backgroundColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.backgroundGradient> property.
+				 */
+				getBackgroundGradient(): Gradient;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.backgroundGradient> property.
+				 */
+				setBackgroundGradient(backgroundGradient: Gradient): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.backgroundImage> property.
+				 */
+				getBackgroundImage(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.backgroundImage> property.
+				 */
+				setBackgroundImage(backgroundImage: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.backgroundRepeat> property.
+				 */
+				getBackgroundRepeat(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.backgroundRepeat> property.
+				 */
+				setBackgroundRepeat(backgroundRepeat: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.backgroundLeftCap> property.
+				 */
+				getBackgroundLeftCap(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.backgroundLeftCap> property.
+				 */
+				setBackgroundLeftCap(backgroundLeftCap: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.backgroundTopCap> property.
+				 */
+				getBackgroundTopCap(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.backgroundTopCap> property.
+				 */
+				setBackgroundTopCap(backgroundTopCap: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.borderColor> property.
+				 */
+				getBorderColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.borderColor> property.
+				 */
+				setBorderColor(borderColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.borderRadius> property.
+				 */
+				getBorderRadius(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.borderRadius> property.
+				 */
+				setBorderRadius(borderRadius: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.borderWidth> property.
+				 */
+				getBorderWidth(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.borderWidth> property.
+				 */
+				setBorderWidth(borderWidth: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.bottom> property.
+				 */
+				getBottom(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.bottom> property.
+				 */
+				setBottom(bottom: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.bottom> property.
+				 */
+				setBottom(bottom: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.center> property.
+				 */
+				getCenter(): Point;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.center> property.
+				 */
+				setCenter(center: Point): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.children> property.
+				 */
+				getChildren(): Titanium.UI.View[];
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.clipMode> property.
+				 */
+				getClipMode(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.clipMode> property.
+				 */
+				setClipMode(clipMode: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.height> property.
+				 */
+				getHeight(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.height> property.
+				 */
+				setHeight(height: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.height> property.
+				 */
+				setHeight(height: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.left> property.
+				 */
+				getLeft(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.left> property.
+				 */
+				setLeft(left: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.left> property.
+				 */
+				setLeft(left: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.layout> property.
+				 */
+				getLayout(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.layout> property.
+				 */
+				setLayout(layout: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.opacity> property.
+				 */
+				getOpacity(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.opacity> property.
+				 */
+				setOpacity(opacity: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.pullBackgroundColor> property.
+				 */
+				getPullBackgroundColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.pullBackgroundColor> property.
+				 */
+				setPullBackgroundColor(pullBackgroundColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.previewContext> property.
+				 */
+				getPreviewContext(): Titanium.UI.iOS.PreviewContext;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.previewContext> property.
+				 */
+				setPreviewContext(previewContext: Titanium.UI.iOS.PreviewContext): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.right> property.
+				 */
+				getRight(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.right> property.
+				 */
+				setRight(right: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.right> property.
+				 */
+				setRight(right: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.rect> property.
+				 */
+				getRect(): Dimension;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.size> property.
+				 */
+				getSize(): Dimension;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.tintColor> property.
+				 */
+				getTintColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.tintColor> property.
+				 */
+				setTintColor(tintColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.top> property.
+				 */
+				getTop(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.top> property.
+				 */
+				setTop(top: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.top> property.
+				 */
+				setTop(top: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.touchEnabled> property.
+				 */
+				getTouchEnabled(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.touchEnabled> property.
+				 */
+				setTouchEnabled(touchEnabled: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.transform> property.
+				 */
+				getTransform(): Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.transform> property.
+				 */
+				setTransform(transform: Titanium.UI.Matrix2D): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.transform> property.
+				 */
+				setTransform(transform: Titanium.UI.Matrix3D): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.viewShadowRadius> property.
+				 */
+				getViewShadowRadius(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.viewShadowRadius> property.
+				 */
+				setViewShadowRadius(viewShadowRadius: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.viewShadowColor> property.
+				 */
+				getViewShadowColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.viewShadowColor> property.
+				 */
+				setViewShadowColor(viewShadowColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.viewShadowOffset> property.
+				 */
+				getViewShadowOffset(): Point;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.viewShadowOffset> property.
+				 */
+				setViewShadowOffset(viewShadowOffset: Point): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.visible> property.
+				 */
+				getVisible(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.visible> property.
+				 */
+				setVisible(visible: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.width> property.
+				 */
+				getWidth(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.width> property.
+				 */
+				setWidth(width: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.width> property.
+				 */
+				setWidth(width: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.horizontalWrap> property.
+				 */
+				getHorizontalWrap(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.horizontalWrap> property.
+				 */
+				setHorizontalWrap(horizontalWrap: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.zIndex> property.
+				 */
+				getZIndex(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.zIndex> property.
+				 */
+				setZIndex(zIndex: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.name> property.
+				 */
+				getName(): string;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.url> property.
+				 */
+				getUrl(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.url> property.
+				 */
+				setUrl(url: string): void;
+
+			}
+
+			/**
+			 * Base dynamic configuration for an item.
+			 */
+			interface DynamicItemBehavior extends Titanium.Proxy {
+				/**
+				 * Specifies if this item can rotate.
+				 */
+				allowsRotation: boolean;
+
+				/**
+				 * Specifies the angular resistance of this item.
+				 */
+				angularResistance: number;
+
+				/**
+				 * Specifies the relative mass density of this item.
+				 */
+				density: number;
+
+				/**
+				 * Specifies the elasticity applied to collisions for this item.
+				 */
+				elasticity: number;
+
+				/**
+				 * Specifies the linear resistance of the item when it slides against another item.
+				 */
+				friction: number;
+
+				/**
+				 * Items added to this behavior.
+				 */
+				readonly items: Titanium.UI.View[];
+
+				/**
+				 * Specifies the linear resistance of this item which reduces linear velocity over time.
+				 */
+				resistance: number;
+
+				/**
+				 * Adds a specified angular velocity for the item.
+				 */
+				addAngularVelocityForItem(item: any, velocity: number): void;
+
+				/**
+				 * Adds an item to this behavior.
+				 */
+				addItem(item: any): void;
+
+				/**
+				 * Adds a specified linear velocity for the item.
+				 */
+				addLinearVelocityForItem(item: any, velocity: Point): void;
+
+				/**
+				 * Returns the angular velocity of the item.
+				 */
+				angularVelocityForItem(item: any): number;
+
+				/**
+				 * Returns the linear velocity of the item.
+				 */
+				linearVelocityForItem(item: any): Point;
+
+				/**
+				 * Removes the specified item from this behavior.
+				 */
+				removeItem(item: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.DynamicItemBehavior.allowsRotation> property.
+				 */
+				getAllowsRotation(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.DynamicItemBehavior.allowsRotation> property.
+				 */
+				setAllowsRotation(allowsRotation: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.DynamicItemBehavior.angularResistance> property.
+				 */
+				getAngularResistance(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.DynamicItemBehavior.angularResistance> property.
+				 */
+				setAngularResistance(angularResistance: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.DynamicItemBehavior.density> property.
+				 */
+				getDensity(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.DynamicItemBehavior.density> property.
+				 */
+				setDensity(density: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.DynamicItemBehavior.elasticity> property.
+				 */
+				getElasticity(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.DynamicItemBehavior.elasticity> property.
+				 */
+				setElasticity(elasticity: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.DynamicItemBehavior.friction> property.
+				 */
+				getFriction(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.DynamicItemBehavior.friction> property.
+				 */
+				setFriction(friction: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.DynamicItemBehavior.items> property.
+				 */
+				getItems(): Titanium.UI.View[];
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.DynamicItemBehavior.resistance> property.
+				 */
+				getResistance(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.DynamicItemBehavior.resistance> property.
+				 */
+				setResistance(resistance: number): void;
+
+			}
+
+			/**
+			 * The feedback generator API is introduced in iOS 10 to handle the haptic feedback when using an iPhone 7 or
+			 * later devices.
+			 */
+			interface FeedbackGenerator extends Titanium.Proxy {
+				/**
+				 * The type of feedback generator you want to create.
+				 */
+				type: number;
+
+				/**
+				 * Used to prepare the haptic sensor for the upcoming interaction with it.
+				 */
+				prepare(): void;
+
+				/**
+				 * Used to trigger a haptic feedback after a selection has been made.
+				 */
+				selectionChanged(): void;
+
+				/**
+				 * Used to trigger a haptic feedback after an impact occurred.
+				 */
+				impactOccurred(): void;
+
+				/**
+				 * Used to trigger a haptic feedback after a notification has been received.
+				 */
+				notificationOccurred(notificationType: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.FeedbackGenerator.type> property.
+				 */
+				getType(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.FeedbackGenerator.type> property.
+				 */
+				setType(type: number): void;
+
+			}
+
+			/**
+			 * Gravitational force to apply to an item.
+			 */
+			interface GravityBehavior extends Titanium.Proxy {
+				/**
+				 * Specifies the angle of the gravity vector in radians.
+				 */
+				angle: number;
+
+				/**
+				 * Specifies the direction of the gravity vector as an x, y pair.
+				 */
+				gravityDirection: Point;
+
+				/**
+				 * Items added to this behavior.
+				 */
+				readonly items: Titanium.UI.View[];
+
+				/**
+				 * Specifies the magnitude of the gravity vector.
+				 */
+				magnitude: number;
+
+				/**
+				 * Adds an item to this behavior.
+				 */
+				addItem(item: any): void;
+
+				/**
+				 * Removes the specified item from this behavior.
+				 */
+				removeItem(item: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.GravityBehavior.angle> property.
+				 */
+				getAngle(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.GravityBehavior.angle> property.
+				 */
+				setAngle(angle: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.GravityBehavior.gravityDirection> property.
+				 */
+				getGravityDirection(): Point;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.GravityBehavior.gravityDirection> property.
+				 */
+				setGravityDirection(gravityDirection: Point): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.GravityBehavior.items> property.
+				 */
+				getItems(): Titanium.UI.View[];
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.GravityBehavior.magnitude> property.
+				 */
+				getMagnitude(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.GravityBehavior.magnitude> property.
+				 */
+				setMagnitude(magnitude: number): void;
+
+			}
+
+			/**
+			 * A set of constants for the style that can be used for the `selectionStyle` property of a
+			 * ListItem, which is set in the `properties` dictionary of either the <ListDataItem> or
+			 * <ItemTemplate>.
+			 */
+			interface ListViewCellSelectionStyle extends Titanium.Proxy {
+				/**
+				 * The cell when selected has a blue background. This is the default value.
+				 */
+				readonly BLUE: number;
+
+				/**
+				 * The cell when selected has a gray background.
+				 */
+				readonly GRAY: number;
+
+				/**
+				 * The cell has no distinct style for when it is selected.
+				 */
+				readonly NONE: number;
+
+			}
+
+			/**
+			 * A set of constants for the position value that can be used for the `position` property of
+			 * <ListViewAnimationProperties> when invoking the ListView's `scrollToItem`, `appendSection`,
+			 * `deleteSectionAt`, `insertSectionAt` and `replaceSectionAt` methods.
+			 */
+			interface ListViewScrollPosition extends Titanium.Proxy {
+				/**
+				 * The list view scrolls the row of interest to the bottom of the visible list view.
+				 */
+				readonly BOTTOM: number;
+
+				/**
+				 * The list view scrolls the row of interest to the middle of the list table view.
+				 */
+				readonly MIDDLE: number;
+
+				/**
+				 * The table view scrolls the row of interest to be fully visible with a minimal movement.
+				 * If the row is already fully visible, no scrolling occurs. For example, if the row is above the
+				 * visible area, the behavior is identical to that specified by `TOP`. This is the default.
+				 */
+				readonly NONE: number;
+
+				/**
+				 * The list view scrolls the row of interest to the top of the visible list view.
+				 */
+				readonly TOP: number;
+
+			}
+
+			/**
+			 * A set of constants for the style that can be used for the `style` property of
+			 * <Titanium.UI.ListView>.
+			 */
+			interface ListViewStyle extends Titanium.Proxy {
+				/**
+				 * A list view whose sections present distinct groups of rows. The section headers and footers
+				 * do not float.
+				 */
+				readonly GROUPED: number;
+
+				/**
+				 * A plain list view. Any section headers or footers are displayed as inline separators and
+				 * float when the list view is scrolled.
+				 */
+				readonly PLAIN: number;
+
+			}
+
+			/**
+			 * Abstract object representing a live photo used in <Titanium.UI.iOS.LivePhotoView>.
+			 */
+			interface LivePhoto extends Titanium.Proxy {
+			}
+
+			/**
+			 * A view to display a <Titanium.UI.iOS.LivePhoto> object introduced in iOS 9.1.
+			 */
+			interface LivePhotoView extends Titanium.Proxy {
+				/**
+				 * Whether the view should be "hidden" from (i.e., ignored by) the accessibility service.
+				 */
+				accessibilityHidden: boolean;
+
+				/**
+				 * Briefly describes what performing an action (such as a click) on the view will do.
+				 */
+				accessibilityHint: string;
+
+				/**
+				 * A succint label identifying the view for the device's accessibility service.
+				 */
+				accessibilityLabel: string;
+
+				/**
+				 * A string describing the value (if any) of the view for the device's accessibility service.
+				 */
+				accessibilityValue: string;
+
+				/**
+				 * Coordinate of the view about which to pivot an animation.
+				 */
+				anchorPoint: Point;
+
+				/**
+				 * Current position of the view during an animation.
+				 */
+				readonly animatedCenter: Point;
+
+				/**
+				 * Background color of the view, as a color name or hex triplet.
+				 */
+				backgroundColor: string;
+
+				/**
+				 * A background gradient for the view.
+				 */
+				backgroundGradient: Gradient;
+
+				/**
+				 * Background image for the view, specified as a local file path or URL.
+				 */
+				backgroundImage: string;
+
+				/**
+				 * Determines whether to tile a background across a view.
+				 */
+				backgroundRepeat: boolean;
+
+				/**
+				 * Size of the left end cap.
+				 */
+				backgroundLeftCap: number;
+
+				/**
+				 * Size of the top end cap.
+				 */
+				backgroundTopCap: number;
+
+				/**
+				 * Border color of the view, as a color name or hex triplet.
+				 */
+				borderColor: string;
+
+				/**
+				 * Radius for the rounded corners of the view's border.
+				 */
+				borderRadius: number;
+
+				/**
+				 * Border width of the view.
+				 */
+				borderWidth: number;
+
+				/**
+				 * View's bottom position, in platform-specific units.
+				 */
+				bottom: number | string;
+
+				/**
+				 * View's center position, in the parent view's coordinates.
+				 */
+				center: Point;
+
+				/**
+				 * Array of this view's child views.
+				 */
+				readonly children: Titanium.UI.View[];
+
+				/**
+				 * View's clipping behavior.
+				 */
+				clipMode: number;
+
+				/**
+				 * View height, in platform-specific units.
+				 */
+				height: number | string;
+
+				/**
+				 * View's left position, in platform-specific units.
+				 */
+				left: number | string;
+
+				/**
+				 * Specifies how the view positions its children.
+				 * One of: 'composite', 'vertical', or 'horizontal'.
+				 */
+				layout: string;
+
+				/**
+				 * Opacity of this view, from 0.0 (transparent) to 1.0 (opaque).
+				 */
+				opacity: number;
+
+				/**
+				 * Background color of the wrapper view when this view is used as either <Titanium.UI.ListView.pullView> or <Titanium.UI.TableView.headerPullView>.
+				 */
+				pullBackgroundColor: string;
+
+				/**
+				 * The preview context used in the 3D-Touch feature "Peek and Pop".
+				 */
+				previewContext: Titanium.UI.iOS.PreviewContext;
+
+				/**
+				 * View's right position, in platform-specific units.
+				 */
+				right: number | string;
+
+				/**
+				 * The bounding box of the view relative to its parent, in system units.
+				 */
+				readonly rect: Dimension;
+
+				/**
+				 * The size of the view in system units.
+				 */
+				readonly size: Dimension;
+
+				/**
+				 * The view's tintColor. This property is applicable on iOS 7 and greater.
+				 */
+				tintColor: string;
+
+				/**
+				 * The view's top position.
+				 */
+				top: number | string;
+
+				/**
+				 * Determines whether view should receive touch events.
+				 */
+				touchEnabled: boolean;
+
+				/**
+				 * Transformation matrix to apply to the view.
+				 */
+				transform: Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
+
+				/**
+				 * Determines the blur radius used to create the shadow.
+				 */
+				viewShadowRadius: number;
+
+				/**
+				 * Determines the color of the shadow.
+				 */
+				viewShadowColor: string;
+
+				/**
+				 * Determines the offset for the shadow of the view.
+				 */
+				viewShadowOffset: Point;
+
+				/**
+				 * Determines whether the view is visible.
+				 */
+				visible: boolean;
+
+				/**
+				 * View's width, in platform-specific units.
+				 */
+				width: number | string;
+
+				/**
+				 * Determines whether the layout has wrapping behavior.
+				 */
+				horizontalWrap: boolean;
+
+				/**
+				 * Z-index stack order position, relative to other sibling views.
+				 */
+				zIndex: number;
+
+				/**
+				 * The Live Photo displayed in the view.
+				 */
+				livePhoto: Titanium.UI.iOS.LivePhoto;
+
+				/**
+				 * A Boolean value that determines whether the view plays the audio content of its Live Photo.
+				 */
+				muted: boolean;
+
+				/**
+				 * Adds a child to this view's hierarchy.
+				 */
+				add(view: any): void;
+
+				/**
+				 * Adds a child to this view's hierarchy.
+				 */
+				add(view: any[]): void;
+
+				/**
+				 * Animates this view.
+				 */
+				animate(animation: any, callback?: (param0: any) => any): void;
+
+				/**
+				 * Finishes a batch update of the View's layout properties and schedules a layout pass of the
+				 * view tree.
+				 */
+				finishLayout(): void;
+
+				/**
+				 * Hides this view.
+				 */
+				hide(options?: AnimationOption): void;
+
+				/**
+				 * Inserts a view at the specified position in the [children](Titanium.UI.View.children) array.
+				 */
+				insertAt(params: any): void;
+
+				/**
+				 * Removes a child view from this view's hierarchy.
+				 */
+				remove(view: any): void;
+
+				/**
+				 * Removes all child views from this view's hierarchy.
+				 */
+				removeAllChildren(): void;
+
+				/**
+				 * Replaces a view at the specified position in the [children](Titanium.UI.View.children) array.
+				 */
+				replaceAt(params: any): void;
+
+				/**
+				 * Makes this view visible.
+				 */
+				show(options?: AnimationOption): void;
+
+				/**
+				 * Starts a batch update of this view's layout properties.
+				 */
+				startLayout(): void;
+
+				/**
+				 * Returns an image of the rendered view, as a Blob.
+				 */
+				toImage(callback?: (param0: Titanium.Blob) => any, honorScaleFactor?: boolean): Titanium.Blob;
+
+				/**
+				 * Performs a batch update of all supplied layout properties and schedules a layout pass after
+				 * they have been updated.
+				 */
+				updateLayout(params: any): void;
+
+				/**
+				 * Translates a point from this view's coordinate system to another view's coordinate system.
+				 */
+				convertPointToView(point: Point, destinationView: any): Point;
+
+				/**
+				 * Returns the matching view of a given view ID.
+				 */
+				getViewById(id: string): Titanium.UI.View;
+
+				/**
+				 * Begins playback of Live Photo content in the view.
+				 */
+				startPlaybackWithStyle(playbackStyle: number): void;
+
+				/**
+				 * Ends playback of Live Photo content in the view.
+				 */
+				stopPlayback(): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.LivePhotoView.accessibilityHidden> property.
+				 */
+				getAccessibilityHidden(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.LivePhotoView.accessibilityHidden> property.
+				 */
+				setAccessibilityHidden(accessibilityHidden: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.LivePhotoView.accessibilityHint> property.
+				 */
+				getAccessibilityHint(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.LivePhotoView.accessibilityHint> property.
+				 */
+				setAccessibilityHint(accessibilityHint: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.LivePhotoView.accessibilityLabel> property.
+				 */
+				getAccessibilityLabel(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.LivePhotoView.accessibilityLabel> property.
+				 */
+				setAccessibilityLabel(accessibilityLabel: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.LivePhotoView.accessibilityValue> property.
+				 */
+				getAccessibilityValue(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.LivePhotoView.accessibilityValue> property.
+				 */
+				setAccessibilityValue(accessibilityValue: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.LivePhotoView.anchorPoint> property.
+				 */
+				getAnchorPoint(): Point;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.LivePhotoView.anchorPoint> property.
+				 */
+				setAnchorPoint(anchorPoint: Point): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.LivePhotoView.animatedCenter> property.
+				 */
+				getAnimatedCenter(): Point;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.LivePhotoView.backgroundColor> property.
+				 */
+				getBackgroundColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.LivePhotoView.backgroundColor> property.
+				 */
+				setBackgroundColor(backgroundColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.LivePhotoView.backgroundGradient> property.
+				 */
+				getBackgroundGradient(): Gradient;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.LivePhotoView.backgroundGradient> property.
+				 */
+				setBackgroundGradient(backgroundGradient: Gradient): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.LivePhotoView.backgroundImage> property.
+				 */
+				getBackgroundImage(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.LivePhotoView.backgroundImage> property.
+				 */
+				setBackgroundImage(backgroundImage: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.LivePhotoView.backgroundRepeat> property.
+				 */
+				getBackgroundRepeat(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.LivePhotoView.backgroundRepeat> property.
+				 */
+				setBackgroundRepeat(backgroundRepeat: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.LivePhotoView.backgroundLeftCap> property.
+				 */
+				getBackgroundLeftCap(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.LivePhotoView.backgroundLeftCap> property.
+				 */
+				setBackgroundLeftCap(backgroundLeftCap: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.LivePhotoView.backgroundTopCap> property.
+				 */
+				getBackgroundTopCap(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.LivePhotoView.backgroundTopCap> property.
+				 */
+				setBackgroundTopCap(backgroundTopCap: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.LivePhotoView.borderColor> property.
+				 */
+				getBorderColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.LivePhotoView.borderColor> property.
+				 */
+				setBorderColor(borderColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.LivePhotoView.borderRadius> property.
+				 */
+				getBorderRadius(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.LivePhotoView.borderRadius> property.
+				 */
+				setBorderRadius(borderRadius: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.LivePhotoView.borderWidth> property.
+				 */
+				getBorderWidth(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.LivePhotoView.borderWidth> property.
+				 */
+				setBorderWidth(borderWidth: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.LivePhotoView.bottom> property.
+				 */
+				getBottom(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.LivePhotoView.bottom> property.
+				 */
+				setBottom(bottom: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.LivePhotoView.bottom> property.
+				 */
+				setBottom(bottom: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.LivePhotoView.center> property.
+				 */
+				getCenter(): Point;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.LivePhotoView.center> property.
+				 */
+				setCenter(center: Point): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.LivePhotoView.children> property.
+				 */
+				getChildren(): Titanium.UI.View[];
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.LivePhotoView.clipMode> property.
+				 */
+				getClipMode(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.LivePhotoView.clipMode> property.
+				 */
+				setClipMode(clipMode: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.LivePhotoView.height> property.
+				 */
+				getHeight(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.LivePhotoView.height> property.
+				 */
+				setHeight(height: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.LivePhotoView.height> property.
+				 */
+				setHeight(height: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.LivePhotoView.left> property.
+				 */
+				getLeft(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.LivePhotoView.left> property.
+				 */
+				setLeft(left: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.LivePhotoView.left> property.
+				 */
+				setLeft(left: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.LivePhotoView.layout> property.
+				 */
+				getLayout(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.LivePhotoView.layout> property.
+				 */
+				setLayout(layout: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.LivePhotoView.opacity> property.
+				 */
+				getOpacity(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.LivePhotoView.opacity> property.
+				 */
+				setOpacity(opacity: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.LivePhotoView.pullBackgroundColor> property.
+				 */
+				getPullBackgroundColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.LivePhotoView.pullBackgroundColor> property.
+				 */
+				setPullBackgroundColor(pullBackgroundColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.LivePhotoView.previewContext> property.
+				 */
+				getPreviewContext(): Titanium.UI.iOS.PreviewContext;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.LivePhotoView.previewContext> property.
+				 */
+				setPreviewContext(previewContext: Titanium.UI.iOS.PreviewContext): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.LivePhotoView.right> property.
+				 */
+				getRight(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.LivePhotoView.right> property.
+				 */
+				setRight(right: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.LivePhotoView.right> property.
+				 */
+				setRight(right: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.LivePhotoView.rect> property.
+				 */
+				getRect(): Dimension;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.LivePhotoView.size> property.
+				 */
+				getSize(): Dimension;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.LivePhotoView.tintColor> property.
+				 */
+				getTintColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.LivePhotoView.tintColor> property.
+				 */
+				setTintColor(tintColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.LivePhotoView.top> property.
+				 */
+				getTop(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.LivePhotoView.top> property.
+				 */
+				setTop(top: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.LivePhotoView.top> property.
+				 */
+				setTop(top: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.LivePhotoView.touchEnabled> property.
+				 */
+				getTouchEnabled(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.LivePhotoView.touchEnabled> property.
+				 */
+				setTouchEnabled(touchEnabled: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.LivePhotoView.transform> property.
+				 */
+				getTransform(): Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.LivePhotoView.transform> property.
+				 */
+				setTransform(transform: Titanium.UI.Matrix2D): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.LivePhotoView.transform> property.
+				 */
+				setTransform(transform: Titanium.UI.Matrix3D): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.LivePhotoView.viewShadowRadius> property.
+				 */
+				getViewShadowRadius(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.LivePhotoView.viewShadowRadius> property.
+				 */
+				setViewShadowRadius(viewShadowRadius: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.LivePhotoView.viewShadowColor> property.
+				 */
+				getViewShadowColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.LivePhotoView.viewShadowColor> property.
+				 */
+				setViewShadowColor(viewShadowColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.LivePhotoView.viewShadowOffset> property.
+				 */
+				getViewShadowOffset(): Point;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.LivePhotoView.viewShadowOffset> property.
+				 */
+				setViewShadowOffset(viewShadowOffset: Point): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.LivePhotoView.visible> property.
+				 */
+				getVisible(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.LivePhotoView.visible> property.
+				 */
+				setVisible(visible: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.LivePhotoView.width> property.
+				 */
+				getWidth(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.LivePhotoView.width> property.
+				 */
+				setWidth(width: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.LivePhotoView.width> property.
+				 */
+				setWidth(width: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.LivePhotoView.horizontalWrap> property.
+				 */
+				getHorizontalWrap(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.LivePhotoView.horizontalWrap> property.
+				 */
+				setHorizontalWrap(horizontalWrap: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.LivePhotoView.zIndex> property.
+				 */
+				getZIndex(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.LivePhotoView.zIndex> property.
+				 */
+				setZIndex(zIndex: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.LivePhotoView.livePhoto> property.
+				 */
+				getLivePhoto(): Titanium.UI.iOS.LivePhoto;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.LivePhotoView.livePhoto> property.
+				 */
+				setLivePhoto(livePhoto: Titanium.UI.iOS.LivePhoto): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.LivePhotoView.muted> property.
+				 */
+				getMuted(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.LivePhotoView.muted> property.
+				 */
+				setMuted(muted: boolean): void;
+
+			}
+
+			/**
+			 * A menu popup provides the ability to create custom tooltip options using the `items` property
+			 * covering the native `UIMenuController` class.
+			 * See also:
+			 * * [iOS Developer Library: UIMenuController](https://developer.apple.com/library/prerelease/ios/documentation/iPhone/Reference/UIMenuController_Class/index.html)
+			 */
+			interface MenuPopup extends Titanium.Proxy {
+				/**
+				 * The items of the menu popup.
+				 */
+				items: string;
+
+				/**
+				 * Shows the menu popup.
+				 */
+				show(params: MenuPopupShowParams): void;
+
+				/**
+				 * Hides the menu popup.
+				 */
+				hide(params?: MenuPopupHideParams): void;
+
+				/**
+				 * Indicates whether the menu popup is currently visible.
+				 */
+				isVisible(): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.MenuPopup.items> property.
+				 */
+				getItems(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.MenuPopup.items> property.
+				 */
+				setItems(items: string): void;
+
+			}
+
+			/**
+			 * A `NavigationWindow` implements a specialized view that manages the navigation of hierarchical
+			 * content.
+			 */
+			interface NavigationWindow extends Titanium.Proxy {
+				/**
+				 * Whether the view should be "hidden" from (i.e., ignored by) the accessibility service.
+				 */
+				accessibilityHidden: boolean;
+
+				/**
+				 * Briefly describes what performing an action (such as a click) on the view will do.
+				 */
+				accessibilityHint: string;
+
+				/**
+				 * A succint label identifying the view for the device's accessibility service.
+				 */
+				accessibilityLabel: string;
+
+				/**
+				 * A string describing the value (if any) of the view for the device's accessibility service.
+				 */
+				accessibilityValue: string;
+
+				/**
+				 * Coordinate of the view about which to pivot an animation.
+				 */
+				anchorPoint: Point;
+
+				/**
+				 * Current position of the view during an animation.
+				 */
+				readonly animatedCenter: Point;
+
+				/**
+				 * Background color of the window, as a color name or hex triplet.
+				 */
+				backgroundColor: string;
+
+				/**
+				 * A background gradient for the view.
+				 */
+				backgroundGradient: Gradient;
+
+				/**
+				 * Background image for the view, specified as a local file path or URL.
+				 */
+				backgroundImage: string;
+
+				/**
+				 * Determines whether to tile a background across a view.
+				 */
+				backgroundRepeat: boolean;
+
+				/**
+				 * Size of the left end cap.
+				 */
+				backgroundLeftCap: number;
+
+				/**
+				 * Size of the top end cap.
+				 */
+				backgroundTopCap: number;
+
+				/**
+				 * Border color of the view, as a color name or hex triplet.
+				 */
+				borderColor: string;
+
+				/**
+				 * Radius for the rounded corners of the view's border.
+				 */
+				borderRadius: number;
+
+				/**
+				 * Border width of the view.
+				 */
+				borderWidth: number;
+
+				/**
+				 * Window's bottom position, in platform-specific units.
+				 */
+				bottom: number | string;
+
+				/**
+				 * View's center position, in the parent view's coordinates.
+				 */
+				center: Point;
+
+				/**
+				 * Array of this view's child views.
+				 */
+				readonly children: Titanium.UI.View[];
+
+				/**
+				 * View's clipping behavior.
+				 */
+				clipMode: number;
+
+				/**
+				 * View height, in platform-specific units.
+				 */
+				height: number | string;
+
+				/**
+				 * Window's left position, in platform-specific units.
+				 */
+				left: number | string;
+
+				/**
+				 * Specifies how the view positions its children.
+				 * One of: 'composite', 'vertical', or 'horizontal'.
+				 */
+				layout: string;
+
+				/**
+				 * The opacity from 0.0-1.0.
+				 */
+				opacity: number;
+
+				/**
+				 * Background color of the wrapper view when this view is used as either <Titanium.UI.ListView.pullView> or <Titanium.UI.TableView.headerPullView>.
+				 */
+				pullBackgroundColor: string;
+
+				/**
+				 * The preview context used in the 3D-Touch feature "Peek and Pop".
+				 */
+				previewContext: Titanium.UI.iOS.PreviewContext;
+
+				/**
+				 * Window's right position, in platform-specific units.
+				 */
+				right: number | string;
+
+				/**
+				 * The bounding box of the view relative to its parent, in system units.
+				 */
+				readonly rect: Dimension;
+
+				/**
+				 * The size of the view in system units.
+				 */
+				readonly size: Dimension;
+
+				/**
+				 * The view's tintColor. This property is applicable on iOS 7 and greater.
+				 */
+				tintColor: string;
+
+				/**
+				 * Window's top position, in platform-specific units.
+				 */
+				top: number | string;
+
+				/**
+				 * Determines whether view should receive touch events.
+				 */
+				touchEnabled: boolean;
+
+				/**
+				 * Transformation matrix to apply to the view.
+				 */
+				transform: Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
+
+				/**
+				 * Determines the blur radius used to create the shadow.
+				 */
+				viewShadowRadius: number;
+
+				/**
+				 * Determines the color of the shadow.
+				 */
+				viewShadowColor: string;
+
+				/**
+				 * Determines the offset for the shadow of the view.
+				 */
+				viewShadowOffset: Point;
+
+				/**
+				 * Determines whether the view is visible.
+				 */
+				visible: boolean;
+
+				/**
+				 * View's width, in platform-specific units.
+				 */
+				width: number | string;
+
+				/**
+				 * Determines whether the layout has wrapping behavior.
+				 */
+				horizontalWrap: boolean;
+
+				/**
+				 * Z-index stack order position, relative to other sibling views.
+				 */
+				zIndex: number;
+
+				/**
+				 * An array of supported values specified using the EXTEND_EDGE constants in <Titanium.UI>. Valid on iOS 7 and greater.
+				 */
+				extendEdges: number[];
+
+				/**
+				 * Specifies if the edges should extend beyond opaque bars (navigation bar, tab bar, toolbar). Valid on iOS 7 and greater.
+				 */
+				includeOpaqueBars: boolean;
+
+				/**
+				 * Specifies whether or not the view controller should automatically adjust its scroll view insets. Valid on iOS 7 and greater.
+				 */
+				autoAdjustScrollViewInsets: boolean;
+
+				/**
+				 * Specifies whether the content (subviews) of the window  will render inside the safe-area or not.
+				 * Only used in iOS 11.0 and later.
+				 */
+				extendSafeArea: boolean;
+
+				/**
+				 * Boolean value indicating if the window is fullscreen.
+				 */
+				fullscreen: boolean;
+
+				/**
+				 * Set this to true to hide the navigation bar on swipe.
+				 */
+				hidesBarsOnSwipe: boolean;
+
+				/**
+				 * Set this to true to hide the navigation bar on tap.
+				 */
+				hidesBarsOnTap: boolean;
+
+				/**
+				 * Set this to true to hide the navigation bar when the keyboard appears.
+				 */
+				hidesBarsWhenKeyboardAppears: boolean;
+
+				/**
+				 * A Boolean value indicating whether the title should be displayed in a large format.
+				 */
+				largeTitleEnabled: string;
+
+				/**
+				 * The mode to use when displaying the title of the navigation bar.
+				 */
+				largeTitleDisplayMode: number;
+
+				/**
+				 * An Array of views to show in the left nav bar area.
+				 */
+				leftNavButtons: Titanium.UI.View[];
+
+				/**
+				 * Indicates to open a modal window or not.
+				 */
+				modal: boolean;
+
+				/**
+				 * Array of supported orientation modes, specified using the orientation
+				 * constants defined in <Titanium.UI>.
+				 */
+				orientationModes: number[];
+
+				/**
+				 * Current orientation of the window.
+				 */
+				readonly orientation: number;
+
+				/**
+				 * An Array of views to show in the right nav bar area.
+				 */
+				rightNavButtons: Titanium.UI.View[];
+
+				/**
+				 * The status bar style associated with this window.
+				 */
+				statusBarStyle: number;
+
+				/**
+				 * Title text attributes of the window.
+				 */
+				titleAttributes: titleAttributesParams;
+
+				/**
+				 * Window to add to this navigation window.
+				 */
+				window: Titanium.UI.Window;
+
+				/**
+				 * Adds a child to this view's hierarchy.
+				 */
+				add(view: any): void;
+
+				/**
+				 * Adds a child to this view's hierarchy.
+				 */
+				add(view: any[]): void;
+
+				/**
+				 * Animates this view.
+				 */
+				animate(animation: any, callback?: (param0: any) => any): void;
+
+				/**
+				 * Finishes a batch update of the View's layout properties and schedules a layout pass of the
+				 * view tree.
+				 */
+				finishLayout(): void;
+
+				/**
+				 * Hides this view.
+				 */
+				hide(options?: AnimationOption): void;
+
+				/**
+				 * Inserts a view at the specified position in the [children](Titanium.UI.View.children) array.
+				 */
+				insertAt(params: any): void;
+
+				/**
+				 * Removes a child view from this view's hierarchy.
+				 */
+				remove(view: any): void;
+
+				/**
+				 * Replaces a view at the specified position in the [children](Titanium.UI.View.children) array.
+				 */
+				replaceAt(params: any): void;
+
+				/**
+				 * Makes this view visible.
+				 */
+				show(options?: AnimationOption): void;
+
+				/**
+				 * Starts a batch update of this view's layout properties.
+				 */
+				startLayout(): void;
+
+				/**
+				 * Returns an image of the rendered view, as a Blob.
+				 */
+				toImage(callback?: (param0: Titanium.Blob) => any, honorScaleFactor?: boolean): Titanium.Blob;
+
+				/**
+				 * Performs a batch update of all supplied layout properties and schedules a layout pass after
+				 * they have been updated.
+				 */
+				updateLayout(params: any): void;
+
+				/**
+				 * Translates a point from this view's coordinate system to another view's coordinate system.
+				 */
+				convertPointToView(point: Point, destinationView: any): Point;
+
+				/**
+				 * Returns the matching view of a given view ID.
+				 */
+				getViewById(id: string): Titanium.UI.View;
+
+				/**
+				 * Closes the window.
+				 */
+				close(params?: any): void;
+
+				/**
+				 * Hides the navigation bar.
+				 */
+				hideNavBar(options?: any): void;
+
+				/**
+				 * Opens the window.
+				 */
+				open(params?: openWindowParams): void;
+
+				/**
+				 * Makes the navigation bar visible.
+				 */
+				showNavBar(options?: any): void;
+
+				/**
+				 * Makes the bottom toolbar visible.
+				 */
+				showToolbar(options?: any): void;
+
+				/**
+				 * Makes the bottom toolbar invisible.
+				 */
+				hideToolbar(options?: any): void;
+
+				/**
+				 * Closes a window and removes it from the navigation window.
+				 */
+				closeWindow(window: Titanium.UI.Window, options: any): void;
+
+				/**
+				 * Opens a window within the navigation window.
+				 */
+				openWindow(window: Titanium.UI.Window, options: any): void;
+
+				/**
+				 * Closes all windows that are currently opened inside the navigation window.
+				 */
+				popToRootWindow(options: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.accessibilityHidden> property.
+				 */
+				getAccessibilityHidden(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.accessibilityHidden> property.
+				 */
+				setAccessibilityHidden(accessibilityHidden: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.accessibilityHint> property.
+				 */
+				getAccessibilityHint(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.accessibilityHint> property.
+				 */
+				setAccessibilityHint(accessibilityHint: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.accessibilityLabel> property.
+				 */
+				getAccessibilityLabel(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.accessibilityLabel> property.
+				 */
+				setAccessibilityLabel(accessibilityLabel: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.accessibilityValue> property.
+				 */
+				getAccessibilityValue(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.accessibilityValue> property.
+				 */
+				setAccessibilityValue(accessibilityValue: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.anchorPoint> property.
+				 */
+				getAnchorPoint(): Point;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.anchorPoint> property.
+				 */
+				setAnchorPoint(anchorPoint: Point): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.animatedCenter> property.
+				 */
+				getAnimatedCenter(): Point;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.backgroundColor> property.
+				 */
+				getBackgroundColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.backgroundColor> property.
+				 */
+				setBackgroundColor(backgroundColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.backgroundGradient> property.
+				 */
+				getBackgroundGradient(): Gradient;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.backgroundGradient> property.
+				 */
+				setBackgroundGradient(backgroundGradient: Gradient): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.backgroundImage> property.
+				 */
+				getBackgroundImage(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.backgroundImage> property.
+				 */
+				setBackgroundImage(backgroundImage: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.backgroundRepeat> property.
+				 */
+				getBackgroundRepeat(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.backgroundRepeat> property.
+				 */
+				setBackgroundRepeat(backgroundRepeat: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.backgroundLeftCap> property.
+				 */
+				getBackgroundLeftCap(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.backgroundLeftCap> property.
+				 */
+				setBackgroundLeftCap(backgroundLeftCap: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.backgroundTopCap> property.
+				 */
+				getBackgroundTopCap(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.backgroundTopCap> property.
+				 */
+				setBackgroundTopCap(backgroundTopCap: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.borderColor> property.
+				 */
+				getBorderColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.borderColor> property.
+				 */
+				setBorderColor(borderColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.borderRadius> property.
+				 */
+				getBorderRadius(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.borderRadius> property.
+				 */
+				setBorderRadius(borderRadius: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.borderWidth> property.
+				 */
+				getBorderWidth(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.borderWidth> property.
+				 */
+				setBorderWidth(borderWidth: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.bottom> property.
+				 */
+				getBottom(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.bottom> property.
+				 */
+				setBottom(bottom: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.bottom> property.
+				 */
+				setBottom(bottom: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.center> property.
+				 */
+				getCenter(): Point;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.center> property.
+				 */
+				setCenter(center: Point): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.children> property.
+				 */
+				getChildren(): Titanium.UI.View[];
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.clipMode> property.
+				 */
+				getClipMode(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.clipMode> property.
+				 */
+				setClipMode(clipMode: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.height> property.
+				 */
+				getHeight(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.height> property.
+				 */
+				setHeight(height: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.height> property.
+				 */
+				setHeight(height: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.left> property.
+				 */
+				getLeft(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.left> property.
+				 */
+				setLeft(left: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.left> property.
+				 */
+				setLeft(left: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.layout> property.
+				 */
+				getLayout(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.layout> property.
+				 */
+				setLayout(layout: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.opacity> property.
+				 */
+				getOpacity(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.opacity> property.
+				 */
+				setOpacity(opacity: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.pullBackgroundColor> property.
+				 */
+				getPullBackgroundColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.pullBackgroundColor> property.
+				 */
+				setPullBackgroundColor(pullBackgroundColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.previewContext> property.
+				 */
+				getPreviewContext(): Titanium.UI.iOS.PreviewContext;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.previewContext> property.
+				 */
+				setPreviewContext(previewContext: Titanium.UI.iOS.PreviewContext): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.right> property.
+				 */
+				getRight(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.right> property.
+				 */
+				setRight(right: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.right> property.
+				 */
+				setRight(right: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.rect> property.
+				 */
+				getRect(): Dimension;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.size> property.
+				 */
+				getSize(): Dimension;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.tintColor> property.
+				 */
+				getTintColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.tintColor> property.
+				 */
+				setTintColor(tintColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.top> property.
+				 */
+				getTop(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.top> property.
+				 */
+				setTop(top: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.top> property.
+				 */
+				setTop(top: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.touchEnabled> property.
+				 */
+				getTouchEnabled(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.touchEnabled> property.
+				 */
+				setTouchEnabled(touchEnabled: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.transform> property.
+				 */
+				getTransform(): Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.transform> property.
+				 */
+				setTransform(transform: Titanium.UI.Matrix2D): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.transform> property.
+				 */
+				setTransform(transform: Titanium.UI.Matrix3D): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.viewShadowRadius> property.
+				 */
+				getViewShadowRadius(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.viewShadowRadius> property.
+				 */
+				setViewShadowRadius(viewShadowRadius: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.viewShadowColor> property.
+				 */
+				getViewShadowColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.viewShadowColor> property.
+				 */
+				setViewShadowColor(viewShadowColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.viewShadowOffset> property.
+				 */
+				getViewShadowOffset(): Point;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.viewShadowOffset> property.
+				 */
+				setViewShadowOffset(viewShadowOffset: Point): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.visible> property.
+				 */
+				getVisible(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.visible> property.
+				 */
+				setVisible(visible: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.width> property.
+				 */
+				getWidth(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.width> property.
+				 */
+				setWidth(width: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.width> property.
+				 */
+				setWidth(width: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.horizontalWrap> property.
+				 */
+				getHorizontalWrap(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.horizontalWrap> property.
+				 */
+				setHorizontalWrap(horizontalWrap: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.zIndex> property.
+				 */
+				getZIndex(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.zIndex> property.
+				 */
+				setZIndex(zIndex: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.extendEdges> property.
+				 */
+				getExtendEdges(): number[];
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.extendEdges> property.
+				 */
+				setExtendEdges(extendEdges: ReadonlyArray<number>): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.includeOpaqueBars> property.
+				 */
+				getIncludeOpaqueBars(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.includeOpaqueBars> property.
+				 */
+				setIncludeOpaqueBars(includeOpaqueBars: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.autoAdjustScrollViewInsets> property.
+				 */
+				getAutoAdjustScrollViewInsets(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.autoAdjustScrollViewInsets> property.
+				 */
+				setAutoAdjustScrollViewInsets(autoAdjustScrollViewInsets: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.extendSafeArea> property.
+				 */
+				getExtendSafeArea(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.extendSafeArea> property.
+				 */
+				setExtendSafeArea(extendSafeArea: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.fullscreen> property.
+				 */
+				getFullscreen(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.fullscreen> property.
+				 */
+				setFullscreen(fullscreen: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.hidesBarsOnSwipe> property.
+				 */
+				getHidesBarsOnSwipe(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.hidesBarsOnSwipe> property.
+				 */
+				setHidesBarsOnSwipe(hidesBarsOnSwipe: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.hidesBarsOnTap> property.
+				 */
+				getHidesBarsOnTap(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.hidesBarsOnTap> property.
+				 */
+				setHidesBarsOnTap(hidesBarsOnTap: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.hidesBarsWhenKeyboardAppears> property.
+				 */
+				getHidesBarsWhenKeyboardAppears(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.hidesBarsWhenKeyboardAppears> property.
+				 */
+				setHidesBarsWhenKeyboardAppears(hidesBarsWhenKeyboardAppears: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.largeTitleEnabled> property.
+				 */
+				getLargeTitleEnabled(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.largeTitleEnabled> property.
+				 */
+				setLargeTitleEnabled(largeTitleEnabled: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.largeTitleDisplayMode> property.
+				 */
+				getLargeTitleDisplayMode(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.largeTitleDisplayMode> property.
+				 */
+				setLargeTitleDisplayMode(largeTitleDisplayMode: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.leftNavButtons> property.
+				 */
+				getLeftNavButtons(): Titanium.UI.View[];
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.leftNavButtons> property.
+				 */
+				setLeftNavButtons(leftNavButtons: any[]): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.modal> property.
+				 */
+				getModal(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.modal> property.
+				 */
+				setModal(modal: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.orientationModes> property.
+				 */
+				getOrientationModes(): number[];
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.orientationModes> property.
+				 */
+				setOrientationModes(orientationModes: ReadonlyArray<number>): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.orientation> property.
+				 */
+				getOrientation(): number;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.rightNavButtons> property.
+				 */
+				getRightNavButtons(): Titanium.UI.View[];
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.rightNavButtons> property.
+				 */
+				setRightNavButtons(rightNavButtons: any[]): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.statusBarStyle> property.
+				 */
+				getStatusBarStyle(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.statusBarStyle> property.
+				 */
+				setStatusBarStyle(statusBarStyle: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.titleAttributes> property.
+				 */
+				getTitleAttributes(): titleAttributesParams;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.titleAttributes> property.
+				 */
+				setTitleAttributes(titleAttributes: titleAttributesParams): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.window> property.
+				 */
+				getWindow(): Titanium.UI.Window;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.window> property.
+				 */
+				setWindow(window: Titanium.UI.Window): void;
+
+			}
+
+			/**
+			 * A PreviewAction provides options to configure actions used by the iOS 9 3D-Touch "Peek and Pop"
+			 * feature.
+			 */
+			interface PreviewAction extends Titanium.Proxy {
+				/**
+				 * The title of the action.
+				 */
+				title: string;
+
+				/**
+				 * The style of the action.
+				 */
+				style: number;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.PreviewAction.title> property.
+				 */
+				getTitle(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.PreviewAction.title> property.
+				 */
+				setTitle(title: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.PreviewAction.style> property.
+				 */
+				getStyle(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.PreviewAction.style> property.
+				 */
+				setStyle(style: number): void;
+
+			}
+
+			/**
+			 * A PreviewActionGroup provides options to configure a group of actions used by the iOS9 3D-Touch
+			 * feature "Peek and Pop".
+			 */
+			interface PreviewActionGroup extends Titanium.Proxy {
+				/**
+				 * The title of the action group.
+				 */
+				title: string;
+
+				/**
+				 * The style of the action group.
+				 */
+				style: number;
+
+				/**
+				 * The preview actions assigned to this preview action group.
+				 */
+				actions: Titanium.UI.iOS.PreviewAction[];
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.PreviewActionGroup.title> property.
+				 */
+				getTitle(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.PreviewActionGroup.title> property.
+				 */
+				setTitle(title: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.PreviewActionGroup.style> property.
+				 */
+				getStyle(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.PreviewActionGroup.style> property.
+				 */
+				setStyle(style: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.PreviewActionGroup.actions> property.
+				 */
+				getActions(): Titanium.UI.iOS.PreviewAction[];
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.PreviewActionGroup.actions> property.
+				 */
+				setActions(actions: ReadonlyArray<Titanium.UI.iOS.PreviewAction>): void;
+
+			}
+
+			/**
+			 * A PreviewContext provides options to configure the iOS 9 3D-Touch "Peek and Pop" feature.
+			 */
+			interface PreviewContext extends Titanium.Proxy {
+				/**
+				 * The preview actions and preview action groups.
+				 */
+				actions: Titanium.UI.iOS.PreviewAction[];
+
+				/**
+				 * The height of the preview.
+				 */
+				contentHeight: number;
+
+				/**
+				 * The preview view.
+				 */
+				preview: Titanium.UI.View;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.PreviewContext.actions> property.
+				 */
+				getActions(): Titanium.UI.iOS.PreviewAction[];
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.PreviewContext.actions> property.
+				 */
+				setActions(actions: ReadonlyArray<Titanium.UI.iOS.PreviewAction>): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.PreviewContext.contentHeight> property.
+				 */
+				getContentHeight(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.PreviewContext.contentHeight> property.
+				 */
+				setContentHeight(contentHeight: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.PreviewContext.preview> property.
+				 */
+				getPreview(): Titanium.UI.View;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.PreviewContext.preview> property.
+				 */
+				setPreview(preview: any): void;
+
+			}
+
+			/**
+			 * Continuous or instantaneous force to apply to an item.
+			 */
+			interface PushBehavior extends Titanium.Proxy {
+				/**
+				 * State of the push behavior's force.
+				 */
+				active: boolean;
+
+				/**
+				 * Specifies the angle of the force vector in radians.
+				 */
+				angle: number;
+
+				/**
+				 * Items added to this behavior.
+				 */
+				readonly items: Titanium.UI.View[];
+
+				/**
+				 * Specifies the magnitude of the force vector.
+				 */
+				magnitude: number;
+
+				/**
+				 * Specifies the direction of the force vector as an x, y pair.
+				 */
+				pushDirection: Point;
+
+				/**
+				 * Specifies the push mode.
+				 */
+				pushMode: number;
+
+				/**
+				 * Adds an item to this behavior.
+				 */
+				addItem(item: any): void;
+
+				/**
+				 * Removes the specified item from this behavior.
+				 */
+				removeItem(item: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.PushBehavior.active> property.
+				 */
+				getActive(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.PushBehavior.active> property.
+				 */
+				setActive(active: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.PushBehavior.angle> property.
+				 */
+				getAngle(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.PushBehavior.angle> property.
+				 */
+				setAngle(angle: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.PushBehavior.items> property.
+				 */
+				getItems(): Titanium.UI.View[];
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.PushBehavior.magnitude> property.
+				 */
+				getMagnitude(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.PushBehavior.magnitude> property.
+				 */
+				setMagnitude(magnitude: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.PushBehavior.pushDirection> property.
+				 */
+				getPushDirection(): Point;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.PushBehavior.pushDirection> property.
+				 */
+				setPushDirection(pushDirection: Point): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.PushBehavior.pushMode> property.
+				 */
+				getPushMode(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.PushBehavior.pushMode> property.
+				 */
+				setPushMode(pushMode: number): void;
+
+			}
+
+			/**
+			 * Dynamic behavior defining an item's movement to a specific point.
+			 */
+			interface SnapBehavior extends Titanium.Proxy {
+				/**
+				 * Specifies the amount of oscillation during the conclusion of the snap.
+				 */
+				damping: number;
+
+				/**
+				 * Item to add to this behavior.
+				 */
+				item: Titanium.UI.View;
+
+				/**
+				 * Specifies the point to snap to.
+				 */
+				snapPoint: Point;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SnapBehavior.damping> property.
+				 */
+				getDamping(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SnapBehavior.damping> property.
+				 */
+				setDamping(damping: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SnapBehavior.item> property.
+				 */
+				getItem(): Titanium.UI.View;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SnapBehavior.item> property.
+				 */
+				setItem(item: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SnapBehavior.snapPoint> property.
+				 */
+				getSnapPoint(): Point;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SnapBehavior.snapPoint> property.
+				 */
+				setSnapPoint(snapPoint: Point): void;
+
+			}
+
+			/**
+			 * A SplitWindow is a window that manages the presentation of two side-by-side view
+			 * controllers.
+			 */
+			interface SplitWindow extends Titanium.Proxy {
+				/**
+				 * Whether the view should be "hidden" from (i.e., ignored by) the accessibility service.
+				 */
+				accessibilityHidden: boolean;
+
+				/**
+				 * Briefly describes what performing an action (such as a click) on the view will do.
+				 */
+				accessibilityHint: string;
+
+				/**
+				 * A succint label identifying the view for the device's accessibility service.
+				 */
+				accessibilityLabel: string;
+
+				/**
+				 * A string describing the value (if any) of the view for the device's accessibility service.
+				 */
+				accessibilityValue: string;
+
+				/**
+				 * Coordinate of the view about which to pivot an animation.
+				 */
+				anchorPoint: Point;
+
+				/**
+				 * Current position of the view during an animation.
+				 */
+				readonly animatedCenter: Point;
+
+				/**
+				 * Background color of the window, as a color name or hex triplet.
+				 */
+				backgroundColor: string;
+
+				/**
+				 * A background gradient for the view.
+				 */
+				backgroundGradient: Gradient;
+
+				/**
+				 * Background image for the view, specified as a local file path or URL.
+				 */
+				backgroundImage: string;
+
+				/**
+				 * Determines whether to tile a background across a view.
+				 */
+				backgroundRepeat: boolean;
+
+				/**
+				 * Size of the left end cap.
+				 */
+				backgroundLeftCap: number;
+
+				/**
+				 * Size of the top end cap.
+				 */
+				backgroundTopCap: number;
+
+				/**
+				 * Border color of the view, as a color name or hex triplet.
+				 */
+				borderColor: string;
+
+				/**
+				 * Radius for the rounded corners of the view's border.
+				 */
+				borderRadius: number;
+
+				/**
+				 * Border width of the view.
+				 */
+				borderWidth: number;
+
+				/**
+				 * Window's bottom position, in platform-specific units.
+				 */
+				bottom: number | string;
+
+				/**
+				 * View's center position, in the parent view's coordinates.
+				 */
+				center: Point;
+
+				/**
+				 * Array of this view's child views.
+				 */
+				readonly children: Titanium.UI.View[];
+
+				/**
+				 * View's clipping behavior.
+				 */
+				clipMode: number;
+
+				/**
+				 * View height, in platform-specific units.
+				 */
+				height: number | string;
+
+				/**
+				 * Window's left position, in platform-specific units.
+				 */
+				left: number | string;
+
+				/**
+				 * Specifies how the view positions its children.
+				 * One of: 'composite', 'vertical', or 'horizontal'.
+				 */
+				layout: string;
+
+				/**
+				 * The opacity from 0.0-1.0.
+				 */
+				opacity: number;
+
+				/**
+				 * Background color of the wrapper view when this view is used as either <Titanium.UI.ListView.pullView> or <Titanium.UI.TableView.headerPullView>.
+				 */
+				pullBackgroundColor: string;
+
+				/**
+				 * The preview context used in the 3D-Touch feature "Peek and Pop".
+				 */
+				previewContext: Titanium.UI.iOS.PreviewContext;
+
+				/**
+				 * Window's right position, in platform-specific units.
+				 */
+				right: number | string;
+
+				/**
+				 * The bounding box of the view relative to its parent, in system units.
+				 */
+				readonly rect: Dimension;
+
+				/**
+				 * The size of the view in system units.
+				 */
+				readonly size: Dimension;
+
+				/**
+				 * The view's tintColor. This property is applicable on iOS 7 and greater.
+				 */
+				tintColor: string;
+
+				/**
+				 * Window's top position, in platform-specific units.
+				 */
+				top: number | string;
+
+				/**
+				 * Determines whether view should receive touch events.
+				 */
+				touchEnabled: boolean;
+
+				/**
+				 * Transformation matrix to apply to the view.
+				 */
+				transform: Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
+
+				/**
+				 * Determines the blur radius used to create the shadow.
+				 */
+				viewShadowRadius: number;
+
+				/**
+				 * Determines the color of the shadow.
+				 */
+				viewShadowColor: string;
+
+				/**
+				 * Determines the offset for the shadow of the view.
+				 */
+				viewShadowOffset: Point;
+
+				/**
+				 * Determines whether the view is visible.
+				 */
+				visible: boolean;
+
+				/**
+				 * View's width, in platform-specific units.
+				 */
+				width: number | string;
+
+				/**
+				 * Determines whether the layout has wrapping behavior.
+				 */
+				horizontalWrap: boolean;
+
+				/**
+				 * Z-index stack order position, relative to other sibling views.
+				 */
+				zIndex: number;
+
+				/**
+				 * Title for the back button. This is only valid when the window is a child of a tab.
+				 */
+				backButtonTitle: string;
+
+				/**
+				 * The image to show as the back button. This is only valid when the window is a child of a tab.
+				 */
+				backButtonTitleImage: string | Titanium.Blob;
+
+				/**
+				 * Background color for the nav bar, as a color name or hex triplet.
+				 */
+				barColor: string;
+
+				/**
+				 * Background image for the nav bar, specified as a URL to a local image.
+				 */
+				barImage: string;
+
+				/**
+				 * An array of supported values specified using the EXTEND_EDGE constants in <Titanium.UI>. Valid on iOS 7 and greater.
+				 */
+				extendEdges: number[];
+
+				/**
+				 * Specifies if the edges should extend beyond opaque bars (navigation bar, tab bar, toolbar). Valid on iOS 7 and greater.
+				 */
+				includeOpaqueBars: boolean;
+
+				/**
+				 * Specifies whether or not the view controller should automatically adjust its scroll view insets. Valid on iOS 7 and greater.
+				 */
+				autoAdjustScrollViewInsets: boolean;
+
+				/**
+				 * Specifies whether the content (subviews) of the window  will render inside the safe-area or not.
+				 * Only used in iOS 11.0 and later.
+				 */
+				extendSafeArea: boolean;
+
+				/**
+				 * Boolean value indicating if the window is fullscreen.
+				 */
+				fullscreen: boolean;
+
+				/**
+				 * Set this to true to hide the shadow image of the navigation bar.
+				 */
+				hideShadow: boolean;
+
+				/**
+				 * Set this to true to hide the navigation bar on swipe.
+				 */
+				hidesBarsOnSwipe: boolean;
+
+				/**
+				 * Set this to true to hide the navigation bar on tap.
+				 */
+				hidesBarsOnTap: boolean;
+
+				/**
+				 * Set this to true to hide the navigation bar when the keyboard appears.
+				 */
+				hidesBarsWhenKeyboardAppears: boolean;
+
+				/**
+				 * A Boolean value indicating whether the title should be displayed in a large format.
+				 */
+				largeTitleEnabled: string;
+
+				/**
+				 * The mode to use when displaying the title of the navigation bar.
+				 */
+				largeTitleDisplayMode: number;
+
+				/**
+				 * View to show in the left nav bar area.
+				 */
+				leftNavButton: Titanium.UI.View;
+
+				/**
+				 * An Array of views to show in the left nav bar area.
+				 */
+				leftNavButtons: Titanium.UI.View[];
+
+				/**
+				 * Indicates to open a modal window or not.
+				 */
+				modal: boolean;
+
+				/**
+				 * Hides the navigation bar (`true`) or shows the navigation bar (`false`).
+				 */
+				navBarHidden: boolean;
+
+				/**
+				 * The tintColor to apply to the navigation bar. This property is applicable on iOS 7 and greater.
+				 */
+				navTintColor: string;
+
+				/**
+				 * Array of supported orientation modes, specified using the orientation
+				 * constants defined in <Titanium.UI>.
+				 */
+				orientationModes: number[];
+
+				/**
+				 * Current orientation of the window.
+				 */
+				readonly orientation: number;
+
+				/**
+				 * View to show in the right nav bar area.
+				 */
+				rightNavButton: Titanium.UI.View;
+
+				/**
+				 * An Array of views to show in the right nav bar area.
+				 */
+				rightNavButtons: Titanium.UI.View[];
+
+				/**
+				 * Shadow image for the navigation bar, specified as a URL to a local image..
+				 */
+				shadowImage: string;
+
+				/**
+				 * The status bar style associated with this window.
+				 */
+				statusBarStyle: number;
+
+				/**
+				 * Boolean value indicating if the tab bar should be hidden.
+				 */
+				tabBarHidden: boolean;
+
+				/**
+				 * Title of the window.
+				 */
+				title: string;
+
+				/**
+				 * Title text attributes of the window.
+				 */
+				titleAttributes: titleAttributesParams;
+
+				/**
+				 * View to show in the title area of the nav bar.
+				 */
+				titleControl: Titanium.UI.View;
+
+				/**
+				 * Image to show in the title area of the nav bar, specified as a local file path or URL.
+				 */
+				titleImage: string;
+
+				/**
+				 * Title prompt for the window.
+				 */
+				titlePrompt: string;
+
+				/**
+				 * Key identifying a string from the locale file to use for the window title.
+				 */
+				titleid: string;
+
+				/**
+				 * Key identifying a string from the locale file to use for the window title prompt.
+				 */
+				titlepromptid: string;
+
+				/**
+				 * Array of button objects to show in the window's toolbar.
+				 */
+				toolbar: any[];
+
+				/**
+				 * Boolean value indicating if the nav bar is translucent.
+				 */
+				translucent: boolean;
+
+				/**
+				 * Loads a JavaScript file from a local URL.
+				 */
+				url: string;
+
+				/**
+				 * View for the detail view section of the SplitWindow.
+				 */
+				detailView: Titanium.UI.View;
+
+				/**
+				 * View for the master view section of the SplitWindow.
+				 */
+				masterView: Titanium.UI.View;
+
+				/**
+				 * Determines whether to show the master view in portrait orientation.
+				 */
+				showMasterInPortrait: boolean;
+
+				/**
+				 * Determines whether to show the master view is overlayed in portrait orientation.
+				 */
+				masterIsOverlayed: boolean;
+
+				/**
+				 * Determines the width of the `masterView` in portrait mode.
+				 */
+				portraitSplit: number;
+
+				/**
+				 * Determines the width of the `masterView` in landscape mode.
+				 */
+				landscapeSplit: number;
+
+				/**
+				 * Adds a child to this view's hierarchy.
+				 */
+				add(view: any): void;
+
+				/**
+				 * Adds a child to this view's hierarchy.
+				 */
+				add(view: any[]): void;
+
+				/**
+				 * Animates this view.
+				 */
+				animate(animation: any, callback?: (param0: any) => any): void;
+
+				/**
+				 * Finishes a batch update of the View's layout properties and schedules a layout pass of the
+				 * view tree.
+				 */
+				finishLayout(): void;
+
+				/**
+				 * Hides this view.
+				 */
+				hide(options?: AnimationOption): void;
+
+				/**
+				 * Inserts a view at the specified position in the [children](Titanium.UI.View.children) array.
+				 */
+				insertAt(params: any): void;
+
+				/**
+				 * Removes a child view from this view's hierarchy.
+				 */
+				remove(view: any): void;
+
+				/**
+				 * Replaces a view at the specified position in the [children](Titanium.UI.View.children) array.
+				 */
+				replaceAt(params: any): void;
+
+				/**
+				 * Makes this view visible.
+				 */
+				show(options?: AnimationOption): void;
+
+				/**
+				 * Starts a batch update of this view's layout properties.
+				 */
+				startLayout(): void;
+
+				/**
+				 * Returns an image of the rendered view, as a Blob.
+				 */
+				toImage(callback?: (param0: Titanium.Blob) => any, honorScaleFactor?: boolean): Titanium.Blob;
+
+				/**
+				 * Performs a batch update of all supplied layout properties and schedules a layout pass after
+				 * they have been updated.
+				 */
+				updateLayout(params: any): void;
+
+				/**
+				 * Translates a point from this view's coordinate system to another view's coordinate system.
+				 */
+				convertPointToView(point: Point, destinationView: any): Point;
+
+				/**
+				 * Returns the matching view of a given view ID.
+				 */
+				getViewById(id: string): Titanium.UI.View;
+
+				/**
+				 * Closes the window.
+				 */
+				close(params?: any): void;
+
+				/**
+				 * Hides the navigation bar.
+				 */
+				hideNavBar(options?: any): void;
+
+				/**
+				 * Hides the tab bar. Must be called before opening the window.
+				 */
+				hideTabBar(): void;
+
+				/**
+				 * Opens the window.
+				 */
+				open(params?: openWindowParams): void;
+
+				/**
+				 * Sets the array of items to show in the window's toolbar.
+				 */
+				setToolbar(items: ReadonlyArray<any>, params?: windowToolbarParam): void;
+
+				/**
+				 * Makes the navigation bar visible.
+				 */
+				showNavBar(options?: any): void;
+
+				/**
+				 * Makes the bottom toolbar visible.
+				 */
+				showToolbar(options?: any): void;
+
+				/**
+				 * Makes the bottom toolbar invisible.
+				 */
+				hideToolbar(options?: any): void;
+
+				/**
+				 * Sets the value of the [showMasterInPortrait](Titanium.UI.iOS.SplitWindow.showMasterInPortrait) property.
+				 */
+				setShowMasterInPortrait(showMasterInPortrait: boolean, animated?: animationOption): void;
+
+				/**
+				 * Sets the value of the [masterIsOverlayed](Titanium.UI.iOS.SplitWindow.masterIsOverlayed) property.
+				 */
+				setMasterIsOverlayed(masterIsOverlayed: boolean, animated?: animationOption): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.accessibilityHidden> property.
+				 */
+				getAccessibilityHidden(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.accessibilityHidden> property.
+				 */
+				setAccessibilityHidden(accessibilityHidden: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.accessibilityHint> property.
+				 */
+				getAccessibilityHint(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.accessibilityHint> property.
+				 */
+				setAccessibilityHint(accessibilityHint: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.accessibilityLabel> property.
+				 */
+				getAccessibilityLabel(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.accessibilityLabel> property.
+				 */
+				setAccessibilityLabel(accessibilityLabel: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.accessibilityValue> property.
+				 */
+				getAccessibilityValue(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.accessibilityValue> property.
+				 */
+				setAccessibilityValue(accessibilityValue: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.anchorPoint> property.
+				 */
+				getAnchorPoint(): Point;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.anchorPoint> property.
+				 */
+				setAnchorPoint(anchorPoint: Point): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.animatedCenter> property.
+				 */
+				getAnimatedCenter(): Point;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.backgroundColor> property.
+				 */
+				getBackgroundColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.backgroundColor> property.
+				 */
+				setBackgroundColor(backgroundColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.backgroundGradient> property.
+				 */
+				getBackgroundGradient(): Gradient;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.backgroundGradient> property.
+				 */
+				setBackgroundGradient(backgroundGradient: Gradient): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.backgroundImage> property.
+				 */
+				getBackgroundImage(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.backgroundImage> property.
+				 */
+				setBackgroundImage(backgroundImage: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.backgroundRepeat> property.
+				 */
+				getBackgroundRepeat(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.backgroundRepeat> property.
+				 */
+				setBackgroundRepeat(backgroundRepeat: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.backgroundLeftCap> property.
+				 */
+				getBackgroundLeftCap(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.backgroundLeftCap> property.
+				 */
+				setBackgroundLeftCap(backgroundLeftCap: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.backgroundTopCap> property.
+				 */
+				getBackgroundTopCap(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.backgroundTopCap> property.
+				 */
+				setBackgroundTopCap(backgroundTopCap: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.borderColor> property.
+				 */
+				getBorderColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.borderColor> property.
+				 */
+				setBorderColor(borderColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.borderRadius> property.
+				 */
+				getBorderRadius(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.borderRadius> property.
+				 */
+				setBorderRadius(borderRadius: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.borderWidth> property.
+				 */
+				getBorderWidth(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.borderWidth> property.
+				 */
+				setBorderWidth(borderWidth: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.bottom> property.
+				 */
+				getBottom(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.bottom> property.
+				 */
+				setBottom(bottom: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.bottom> property.
+				 */
+				setBottom(bottom: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.center> property.
+				 */
+				getCenter(): Point;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.center> property.
+				 */
+				setCenter(center: Point): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.children> property.
+				 */
+				getChildren(): Titanium.UI.View[];
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.clipMode> property.
+				 */
+				getClipMode(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.clipMode> property.
+				 */
+				setClipMode(clipMode: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.height> property.
+				 */
+				getHeight(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.height> property.
+				 */
+				setHeight(height: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.height> property.
+				 */
+				setHeight(height: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.left> property.
+				 */
+				getLeft(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.left> property.
+				 */
+				setLeft(left: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.left> property.
+				 */
+				setLeft(left: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.layout> property.
+				 */
+				getLayout(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.layout> property.
+				 */
+				setLayout(layout: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.opacity> property.
+				 */
+				getOpacity(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.opacity> property.
+				 */
+				setOpacity(opacity: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.pullBackgroundColor> property.
+				 */
+				getPullBackgroundColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.pullBackgroundColor> property.
+				 */
+				setPullBackgroundColor(pullBackgroundColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.previewContext> property.
+				 */
+				getPreviewContext(): Titanium.UI.iOS.PreviewContext;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.previewContext> property.
+				 */
+				setPreviewContext(previewContext: Titanium.UI.iOS.PreviewContext): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.right> property.
+				 */
+				getRight(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.right> property.
+				 */
+				setRight(right: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.right> property.
+				 */
+				setRight(right: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.rect> property.
+				 */
+				getRect(): Dimension;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.size> property.
+				 */
+				getSize(): Dimension;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.tintColor> property.
+				 */
+				getTintColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.tintColor> property.
+				 */
+				setTintColor(tintColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.top> property.
+				 */
+				getTop(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.top> property.
+				 */
+				setTop(top: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.top> property.
+				 */
+				setTop(top: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.touchEnabled> property.
+				 */
+				getTouchEnabled(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.touchEnabled> property.
+				 */
+				setTouchEnabled(touchEnabled: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.transform> property.
+				 */
+				getTransform(): Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.transform> property.
+				 */
+				setTransform(transform: Titanium.UI.Matrix2D): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.transform> property.
+				 */
+				setTransform(transform: Titanium.UI.Matrix3D): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.viewShadowRadius> property.
+				 */
+				getViewShadowRadius(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.viewShadowRadius> property.
+				 */
+				setViewShadowRadius(viewShadowRadius: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.viewShadowColor> property.
+				 */
+				getViewShadowColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.viewShadowColor> property.
+				 */
+				setViewShadowColor(viewShadowColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.viewShadowOffset> property.
+				 */
+				getViewShadowOffset(): Point;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.viewShadowOffset> property.
+				 */
+				setViewShadowOffset(viewShadowOffset: Point): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.visible> property.
+				 */
+				getVisible(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.visible> property.
+				 */
+				setVisible(visible: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.width> property.
+				 */
+				getWidth(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.width> property.
+				 */
+				setWidth(width: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.width> property.
+				 */
+				setWidth(width: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.horizontalWrap> property.
+				 */
+				getHorizontalWrap(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.horizontalWrap> property.
+				 */
+				setHorizontalWrap(horizontalWrap: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.zIndex> property.
+				 */
+				getZIndex(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.zIndex> property.
+				 */
+				setZIndex(zIndex: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.backButtonTitle> property.
+				 */
+				getBackButtonTitle(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.backButtonTitle> property.
+				 */
+				setBackButtonTitle(backButtonTitle: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.backButtonTitleImage> property.
+				 */
+				getBackButtonTitleImage(): string | Titanium.Blob;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.backButtonTitleImage> property.
+				 */
+				setBackButtonTitleImage(backButtonTitleImage: string): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.backButtonTitleImage> property.
+				 */
+				setBackButtonTitleImage(backButtonTitleImage: Titanium.Blob): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.barColor> property.
+				 */
+				getBarColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.barColor> property.
+				 */
+				setBarColor(barColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.barImage> property.
+				 */
+				getBarImage(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.barImage> property.
+				 */
+				setBarImage(barImage: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.extendEdges> property.
+				 */
+				getExtendEdges(): number[];
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.extendEdges> property.
+				 */
+				setExtendEdges(extendEdges: ReadonlyArray<number>): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.includeOpaqueBars> property.
+				 */
+				getIncludeOpaqueBars(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.includeOpaqueBars> property.
+				 */
+				setIncludeOpaqueBars(includeOpaqueBars: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.autoAdjustScrollViewInsets> property.
+				 */
+				getAutoAdjustScrollViewInsets(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.autoAdjustScrollViewInsets> property.
+				 */
+				setAutoAdjustScrollViewInsets(autoAdjustScrollViewInsets: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.extendSafeArea> property.
+				 */
+				getExtendSafeArea(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.extendSafeArea> property.
+				 */
+				setExtendSafeArea(extendSafeArea: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.fullscreen> property.
+				 */
+				getFullscreen(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.fullscreen> property.
+				 */
+				setFullscreen(fullscreen: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.hideShadow> property.
+				 */
+				getHideShadow(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.hideShadow> property.
+				 */
+				setHideShadow(hideShadow: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.hidesBarsOnSwipe> property.
+				 */
+				getHidesBarsOnSwipe(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.hidesBarsOnSwipe> property.
+				 */
+				setHidesBarsOnSwipe(hidesBarsOnSwipe: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.hidesBarsOnTap> property.
+				 */
+				getHidesBarsOnTap(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.hidesBarsOnTap> property.
+				 */
+				setHidesBarsOnTap(hidesBarsOnTap: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.hidesBarsWhenKeyboardAppears> property.
+				 */
+				getHidesBarsWhenKeyboardAppears(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.hidesBarsWhenKeyboardAppears> property.
+				 */
+				setHidesBarsWhenKeyboardAppears(hidesBarsWhenKeyboardAppears: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.largeTitleEnabled> property.
+				 */
+				getLargeTitleEnabled(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.largeTitleEnabled> property.
+				 */
+				setLargeTitleEnabled(largeTitleEnabled: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.largeTitleDisplayMode> property.
+				 */
+				getLargeTitleDisplayMode(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.largeTitleDisplayMode> property.
+				 */
+				setLargeTitleDisplayMode(largeTitleDisplayMode: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.leftNavButton> property.
+				 */
+				getLeftNavButton(): Titanium.UI.View;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.leftNavButton> property.
+				 */
+				setLeftNavButton(leftNavButton: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.leftNavButtons> property.
+				 */
+				getLeftNavButtons(): Titanium.UI.View[];
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.leftNavButtons> property.
+				 */
+				setLeftNavButtons(leftNavButtons: any[]): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.modal> property.
+				 */
+				getModal(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.modal> property.
+				 */
+				setModal(modal: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.navBarHidden> property.
+				 */
+				getNavBarHidden(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.navBarHidden> property.
+				 */
+				setNavBarHidden(navBarHidden: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.navTintColor> property.
+				 */
+				getNavTintColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.navTintColor> property.
+				 */
+				setNavTintColor(navTintColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.orientationModes> property.
+				 */
+				getOrientationModes(): number[];
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.orientationModes> property.
+				 */
+				setOrientationModes(orientationModes: ReadonlyArray<number>): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.orientation> property.
+				 */
+				getOrientation(): number;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.rightNavButton> property.
+				 */
+				getRightNavButton(): Titanium.UI.View;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.rightNavButton> property.
+				 */
+				setRightNavButton(rightNavButton: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.rightNavButtons> property.
+				 */
+				getRightNavButtons(): Titanium.UI.View[];
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.rightNavButtons> property.
+				 */
+				setRightNavButtons(rightNavButtons: any[]): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.shadowImage> property.
+				 */
+				getShadowImage(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.shadowImage> property.
+				 */
+				setShadowImage(shadowImage: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.statusBarStyle> property.
+				 */
+				getStatusBarStyle(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.statusBarStyle> property.
+				 */
+				setStatusBarStyle(statusBarStyle: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.tabBarHidden> property.
+				 */
+				getTabBarHidden(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.tabBarHidden> property.
+				 */
+				setTabBarHidden(tabBarHidden: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.title> property.
+				 */
+				getTitle(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.title> property.
+				 */
+				setTitle(title: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.titleAttributes> property.
+				 */
+				getTitleAttributes(): titleAttributesParams;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.titleAttributes> property.
+				 */
+				setTitleAttributes(titleAttributes: titleAttributesParams): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.titleControl> property.
+				 */
+				getTitleControl(): Titanium.UI.View;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.titleControl> property.
+				 */
+				setTitleControl(titleControl: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.titleImage> property.
+				 */
+				getTitleImage(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.titleImage> property.
+				 */
+				setTitleImage(titleImage: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.titlePrompt> property.
+				 */
+				getTitlePrompt(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.titlePrompt> property.
+				 */
+				setTitlePrompt(titlePrompt: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.titleid> property.
+				 */
+				getTitleid(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.titleid> property.
+				 */
+				setTitleid(titleid: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.titlepromptid> property.
+				 */
+				getTitlepromptid(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.titlepromptid> property.
+				 */
+				setTitlepromptid(titlepromptid: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.toolbar> property.
+				 */
+				getToolbar(): any[];
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.toolbar> property.
+				 */
+				setToolbar(toolbar: ReadonlyArray<any>): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.translucent> property.
+				 */
+				getTranslucent(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.translucent> property.
+				 */
+				setTranslucent(translucent: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.url> property.
+				 */
+				getUrl(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.url> property.
+				 */
+				setUrl(url: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.detailView> property.
+				 */
+				getDetailView(): Titanium.UI.View;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.detailView> property.
+				 */
+				setDetailView(detailView: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.masterView> property.
+				 */
+				getMasterView(): Titanium.UI.View;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.masterView> property.
+				 */
+				setMasterView(masterView: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.showMasterInPortrait> property.
+				 */
+				getShowMasterInPortrait(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.showMasterInPortrait> property.
+				 */
+				setShowMasterInPortrait(showMasterInPortrait: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.masterIsOverlayed> property.
+				 */
+				getMasterIsOverlayed(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.masterIsOverlayed> property.
+				 */
+				setMasterIsOverlayed(masterIsOverlayed: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.portraitSplit> property.
+				 */
+				getPortraitSplit(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.portraitSplit> property.
+				 */
+				setPortraitSplit(portraitSplit: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.landscapeSplit> property.
+				 */
+				getLandscapeSplit(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.landscapeSplit> property.
+				 */
+				setLandscapeSplit(landscapeSplit: number): void;
+
+			}
+
+			/**
+			 * A widget used to increment and decrement a value.
+			 */
+			interface Stepper extends Titanium.Proxy {
+				/**
+				 * Whether the view should be "hidden" from (i.e., ignored by) the accessibility service.
+				 */
+				accessibilityHidden: boolean;
+
+				/**
+				 * Briefly describes what performing an action (such as a click) on the view will do.
+				 */
+				accessibilityHint: string;
+
+				/**
+				 * A succint label identifying the view for the device's accessibility service.
+				 */
+				accessibilityLabel: string;
+
+				/**
+				 * A string describing the value (if any) of the view for the device's accessibility service.
+				 */
+				accessibilityValue: string;
+
+				/**
+				 * Coordinate of the view about which to pivot an animation.
+				 */
+				anchorPoint: Point;
+
+				/**
+				 * Current position of the view during an animation.
+				 */
+				readonly animatedCenter: Point;
+
+				/**
+				 * Background color of the view, as a color name or hex triplet.
+				 */
+				backgroundColor: string;
+
+				/**
+				 * A background gradient for the view.
+				 */
+				backgroundGradient: Gradient;
+
+				/**
+				 * Background image for the stepper in its normal state, specified as a local file path or URL.
+				 */
+				backgroundImage: string;
+
+				/**
+				 * Determines whether to tile a background across a view.
+				 */
+				backgroundRepeat: boolean;
+
+				/**
+				 * Size of the left end cap.
+				 */
+				backgroundLeftCap: number;
+
+				/**
+				 * Size of the top end cap.
+				 */
+				backgroundTopCap: number;
+
+				/**
+				 * Border color of the view, as a color name or hex triplet.
+				 */
+				borderColor: string;
+
+				/**
+				 * Radius for the rounded corners of the view's border.
+				 */
+				borderRadius: number;
+
+				/**
+				 * Border width of the view.
+				 */
+				borderWidth: number;
+
+				/**
+				 * View's bottom position, in platform-specific units.
+				 */
+				bottom: number | string;
+
+				/**
+				 * View's center position, in the parent view's coordinates.
+				 */
+				center: Point;
+
+				/**
+				 * Array of this view's child views.
+				 */
+				readonly children: Titanium.UI.View[];
+
+				/**
+				 * View's clipping behavior.
+				 */
+				clipMode: number;
+
+				/**
+				 * View height, in platform-specific units.
+				 */
+				height: number | string;
+
+				/**
+				 * View's left position, in platform-specific units.
+				 */
+				left: number | string;
+
+				/**
+				 * Specifies how the view positions its children.
+				 * One of: 'composite', 'vertical', or 'horizontal'.
+				 */
+				layout: string;
+
+				/**
+				 * Opacity of this view, from 0.0 (transparent) to 1.0 (opaque).
+				 */
+				opacity: number;
+
+				/**
+				 * Background color of the wrapper view when this view is used as either <Titanium.UI.ListView.pullView> or <Titanium.UI.TableView.headerPullView>.
+				 */
+				pullBackgroundColor: string;
+
+				/**
+				 * The preview context used in the 3D-Touch feature "Peek and Pop".
+				 */
+				previewContext: Titanium.UI.iOS.PreviewContext;
+
+				/**
+				 * View's right position, in platform-specific units.
+				 */
+				right: number | string;
+
+				/**
+				 * The bounding box of the view relative to its parent, in system units.
+				 */
+				readonly rect: Dimension;
+
+				/**
+				 * The size of the view in system units.
+				 */
+				readonly size: Dimension;
+
+				/**
+				 * Sets the color for the widget, any backgroundImages added will be set to the same color.
+				 */
+				tintColor: string;
+
+				/**
+				 * The view's top position.
+				 */
+				top: number | string;
+
+				/**
+				 * Determines whether view should receive touch events.
+				 */
+				touchEnabled: boolean;
+
+				/**
+				 * Transformation matrix to apply to the view.
+				 */
+				transform: Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
+
+				/**
+				 * Determines the blur radius used to create the shadow.
+				 */
+				viewShadowRadius: number;
+
+				/**
+				 * Determines the color of the shadow.
+				 */
+				viewShadowColor: string;
+
+				/**
+				 * Determines the offset for the shadow of the view.
+				 */
+				viewShadowOffset: Point;
+
+				/**
+				 * Determines whether the view is visible.
+				 */
+				visible: boolean;
+
+				/**
+				 * View's width, in platform-specific units.
+				 */
+				width: number | string;
+
+				/**
+				 * Determines whether the layout has wrapping behavior.
+				 */
+				horizontalWrap: boolean;
+
+				/**
+				 * Z-index stack order position, relative to other sibling views.
+				 */
+				zIndex: number;
+
+				/**
+				 * Determines if the stepper is enabled or disabled.
+				 */
+				enabled: boolean;
+
+				/**
+				 * The current value of the stepper.
+				 */
+				value: number;
+
+				/**
+				 * If YES, value change events are sent immediately when the value changes during user interaction.
+				 * If NO, a value change event is sent when user interaction ends.
+				 * The default value is YES.
+				 */
+				continuous: boolean;
+
+				/**
+				 * If YES, the user pressing and holding on the stepper repeatedly alters value.
+				 * The default value is YES.
+				 */
+				autorepeat: boolean;
+
+				/**
+				 * If YES, incrementing beyond <Ti.UI.iOS.Stepper.maximum> sets value to <Ti.UI.iOS.Stepper.minimum>. likewise, decrementing below
+				 * <Ti.UI.iOS.Stepper.minimum> sets value to <Ti.UI.iOS.Stepper.maximum>. If NO, the stepper does not increment beyond <Ti.UI.iOS.Stepper.maximum> nor
+				 * does it decrement below <Ti.UI.iOS.Stepper.minimum> but rather holds at those values.
+				 * The default value is NO.
+				 */
+				wraps: boolean;
+
+				/**
+				 * The minimum value the stepper will be set to, the value must be smaller than the maximum value.
+				 * If you attempt to set a value equal to or greater than maximum, the system will default the
+				 * value to 0.
+				 */
+				minimum: number;
+
+				/**
+				 * The maximum value the stepper will be set to, the value must be greater than the minimum value.
+				 * If you attempt to set a value equal to or lower than minimum, the system will default the
+				 * value to 100.
+				 */
+				maximum: number;
+
+				/**
+				 * The value the stepper will increment and decrement by, default value for this property is 1. When setting
+				 * a new value, it must be greater than 1.
+				 */
+				steps: number;
+
+				/**
+				 * Background image for the stepper decrement button in its normal state, specified as a local
+				 * file path or URL.
+				 */
+				decrementImage: string;
+
+				/**
+				 * Background image for the stepper decrement button in its disabled state, specified as a local
+				 * file path or URL. The decrement button enters a disabled state ones the value is equal to the
+				 * minimumValue , setting the enabled property to false will have no effect to decrement button state.
+				 */
+				decrementDisabledImage: string;
+
+				/**
+				 * Background image for the stepper increment button in its normal state, specified as a local
+				 * file path or URL.
+				 */
+				incrementImage: string;
+
+				/**
+				 * Background image for the stepper increment button in its disabled state, specified as a local
+				 * file path or URL.The increment button enters a disabled state ones the value is equal to the
+				 * maximumValue , setting the enabled property to false will have no effect to increment button state.
+				 */
+				incrementDisabledImage: string;
+
+				/**
+				 * Adds a child to this view's hierarchy.
+				 */
+				add(view: any): void;
+
+				/**
+				 * Adds a child to this view's hierarchy.
+				 */
+				add(view: any[]): void;
+
+				/**
+				 * Animates this view.
+				 */
+				animate(animation: any, callback?: (param0: any) => any): void;
+
+				/**
+				 * Finishes a batch update of the View's layout properties and schedules a layout pass of the
+				 * view tree.
+				 */
+				finishLayout(): void;
+
+				/**
+				 * Hides this view.
+				 */
+				hide(options?: AnimationOption): void;
+
+				/**
+				 * Inserts a view at the specified position in the [children](Titanium.UI.View.children) array.
+				 */
+				insertAt(params: any): void;
+
+				/**
+				 * Removes a child view from this view's hierarchy.
+				 */
+				remove(view: any): void;
+
+				/**
+				 * Removes all child views from this view's hierarchy.
+				 */
+				removeAllChildren(): void;
+
+				/**
+				 * Replaces a view at the specified position in the [children](Titanium.UI.View.children) array.
+				 */
+				replaceAt(params: any): void;
+
+				/**
+				 * Makes this view visible.
+				 */
+				show(options?: AnimationOption): void;
+
+				/**
+				 * Starts a batch update of this view's layout properties.
+				 */
+				startLayout(): void;
+
+				/**
+				 * Returns an image of the rendered view, as a Blob.
+				 */
+				toImage(callback?: (param0: Titanium.Blob) => any, honorScaleFactor?: boolean): Titanium.Blob;
+
+				/**
+				 * Performs a batch update of all supplied layout properties and schedules a layout pass after
+				 * they have been updated.
+				 */
+				updateLayout(params: any): void;
+
+				/**
+				 * Translates a point from this view's coordinate system to another view's coordinate system.
+				 */
+				convertPointToView(point: Point, destinationView: any): Point;
+
+				/**
+				 * Returns the matching view of a given view ID.
+				 */
+				getViewById(id: string): Titanium.UI.View;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.accessibilityHidden> property.
+				 */
+				getAccessibilityHidden(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.accessibilityHidden> property.
+				 */
+				setAccessibilityHidden(accessibilityHidden: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.accessibilityHint> property.
+				 */
+				getAccessibilityHint(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.accessibilityHint> property.
+				 */
+				setAccessibilityHint(accessibilityHint: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.accessibilityLabel> property.
+				 */
+				getAccessibilityLabel(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.accessibilityLabel> property.
+				 */
+				setAccessibilityLabel(accessibilityLabel: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.accessibilityValue> property.
+				 */
+				getAccessibilityValue(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.accessibilityValue> property.
+				 */
+				setAccessibilityValue(accessibilityValue: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.anchorPoint> property.
+				 */
+				getAnchorPoint(): Point;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.anchorPoint> property.
+				 */
+				setAnchorPoint(anchorPoint: Point): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.animatedCenter> property.
+				 */
+				getAnimatedCenter(): Point;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.backgroundColor> property.
+				 */
+				getBackgroundColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.backgroundColor> property.
+				 */
+				setBackgroundColor(backgroundColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.backgroundGradient> property.
+				 */
+				getBackgroundGradient(): Gradient;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.backgroundGradient> property.
+				 */
+				setBackgroundGradient(backgroundGradient: Gradient): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.backgroundImage> property.
+				 */
+				getBackgroundImage(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.backgroundImage> property.
+				 */
+				setBackgroundImage(backgroundImage: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.backgroundRepeat> property.
+				 */
+				getBackgroundRepeat(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.backgroundRepeat> property.
+				 */
+				setBackgroundRepeat(backgroundRepeat: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.backgroundLeftCap> property.
+				 */
+				getBackgroundLeftCap(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.backgroundLeftCap> property.
+				 */
+				setBackgroundLeftCap(backgroundLeftCap: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.backgroundTopCap> property.
+				 */
+				getBackgroundTopCap(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.backgroundTopCap> property.
+				 */
+				setBackgroundTopCap(backgroundTopCap: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.borderColor> property.
+				 */
+				getBorderColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.borderColor> property.
+				 */
+				setBorderColor(borderColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.borderRadius> property.
+				 */
+				getBorderRadius(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.borderRadius> property.
+				 */
+				setBorderRadius(borderRadius: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.borderWidth> property.
+				 */
+				getBorderWidth(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.borderWidth> property.
+				 */
+				setBorderWidth(borderWidth: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.bottom> property.
+				 */
+				getBottom(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.bottom> property.
+				 */
+				setBottom(bottom: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.bottom> property.
+				 */
+				setBottom(bottom: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.center> property.
+				 */
+				getCenter(): Point;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.center> property.
+				 */
+				setCenter(center: Point): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.children> property.
+				 */
+				getChildren(): Titanium.UI.View[];
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.clipMode> property.
+				 */
+				getClipMode(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.clipMode> property.
+				 */
+				setClipMode(clipMode: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.height> property.
+				 */
+				getHeight(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.height> property.
+				 */
+				setHeight(height: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.height> property.
+				 */
+				setHeight(height: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.left> property.
+				 */
+				getLeft(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.left> property.
+				 */
+				setLeft(left: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.left> property.
+				 */
+				setLeft(left: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.layout> property.
+				 */
+				getLayout(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.layout> property.
+				 */
+				setLayout(layout: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.opacity> property.
+				 */
+				getOpacity(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.opacity> property.
+				 */
+				setOpacity(opacity: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.pullBackgroundColor> property.
+				 */
+				getPullBackgroundColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.pullBackgroundColor> property.
+				 */
+				setPullBackgroundColor(pullBackgroundColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.previewContext> property.
+				 */
+				getPreviewContext(): Titanium.UI.iOS.PreviewContext;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.previewContext> property.
+				 */
+				setPreviewContext(previewContext: Titanium.UI.iOS.PreviewContext): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.right> property.
+				 */
+				getRight(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.right> property.
+				 */
+				setRight(right: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.right> property.
+				 */
+				setRight(right: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.rect> property.
+				 */
+				getRect(): Dimension;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.size> property.
+				 */
+				getSize(): Dimension;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.tintColor> property.
+				 */
+				getTintColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.tintColor> property.
+				 */
+				setTintColor(tintColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.top> property.
+				 */
+				getTop(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.top> property.
+				 */
+				setTop(top: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.top> property.
+				 */
+				setTop(top: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.touchEnabled> property.
+				 */
+				getTouchEnabled(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.touchEnabled> property.
+				 */
+				setTouchEnabled(touchEnabled: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.transform> property.
+				 */
+				getTransform(): Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.transform> property.
+				 */
+				setTransform(transform: Titanium.UI.Matrix2D): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.transform> property.
+				 */
+				setTransform(transform: Titanium.UI.Matrix3D): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.viewShadowRadius> property.
+				 */
+				getViewShadowRadius(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.viewShadowRadius> property.
+				 */
+				setViewShadowRadius(viewShadowRadius: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.viewShadowColor> property.
+				 */
+				getViewShadowColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.viewShadowColor> property.
+				 */
+				setViewShadowColor(viewShadowColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.viewShadowOffset> property.
+				 */
+				getViewShadowOffset(): Point;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.viewShadowOffset> property.
+				 */
+				setViewShadowOffset(viewShadowOffset: Point): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.visible> property.
+				 */
+				getVisible(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.visible> property.
+				 */
+				setVisible(visible: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.width> property.
+				 */
+				getWidth(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.width> property.
+				 */
+				setWidth(width: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.width> property.
+				 */
+				setWidth(width: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.horizontalWrap> property.
+				 */
+				getHorizontalWrap(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.horizontalWrap> property.
+				 */
+				setHorizontalWrap(horizontalWrap: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.zIndex> property.
+				 */
+				getZIndex(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.zIndex> property.
+				 */
+				setZIndex(zIndex: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.enabled> property.
+				 */
+				getEnabled(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.enabled> property.
+				 */
+				setEnabled(enabled: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.value> property.
+				 */
+				getValue(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.value> property.
+				 */
+				setValue(value: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.continuous> property.
+				 */
+				getContinuous(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.continuous> property.
+				 */
+				setContinuous(continuous: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.autorepeat> property.
+				 */
+				getAutorepeat(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.autorepeat> property.
+				 */
+				setAutorepeat(autorepeat: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.wraps> property.
+				 */
+				getWraps(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.wraps> property.
+				 */
+				setWraps(wraps: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.minimum> property.
+				 */
+				getMinimum(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.minimum> property.
+				 */
+				setMinimum(minimum: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.maximum> property.
+				 */
+				getMaximum(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.maximum> property.
+				 */
+				setMaximum(maximum: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.steps> property.
+				 */
+				getSteps(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.steps> property.
+				 */
+				setSteps(steps: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.decrementImage> property.
+				 */
+				getDecrementImage(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.decrementImage> property.
+				 */
+				setDecrementImage(decrementImage: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.decrementDisabledImage> property.
+				 */
+				getDecrementDisabledImage(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.decrementDisabledImage> property.
+				 */
+				setDecrementDisabledImage(decrementDisabledImage: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.incrementImage> property.
+				 */
+				getIncrementImage(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.incrementImage> property.
+				 */
+				setIncrementImage(incrementImage: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.incrementDisabledImage> property.
+				 */
+				getIncrementDisabledImage(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.incrementDisabledImage> property.
+				 */
+				setIncrementDisabledImage(incrementDisabledImage: string): void;
+
+			}
+
+			/**
+			 * A button bar that maintains a selected state.
+			 */
+			interface TabbedBar extends Titanium.Proxy {
+				/**
+				 * Whether the view should be "hidden" from (i.e., ignored by) the accessibility service.
+				 */
+				accessibilityHidden: boolean;
+
+				/**
+				 * Briefly describes what performing an action (such as a click) on the view will do.
+				 */
+				accessibilityHint: string;
+
+				/**
+				 * A succint label identifying the view for the device's accessibility service.
+				 */
+				accessibilityLabel: string;
+
+				/**
+				 * A string describing the value (if any) of the view for the device's accessibility service.
+				 */
+				accessibilityValue: string;
+
+				/**
+				 * Coordinate of the view about which to pivot an animation.
+				 */
+				anchorPoint: Point;
+
+				/**
+				 * Current position of the view during an animation.
+				 */
+				readonly animatedCenter: Point;
+
+				/**
+				 * Background color of the view, as a color name or hex triplet.
+				 */
+				backgroundColor: string;
+
+				/**
+				 * A background gradient for the view.
+				 */
+				backgroundGradient: Gradient;
+
+				/**
+				 * Background image for the view, specified as a local file path or URL.
+				 */
+				backgroundImage: string;
+
+				/**
+				 * Determines whether to tile a background across a view.
+				 */
+				backgroundRepeat: boolean;
+
+				/**
+				 * Size of the left end cap.
+				 */
+				backgroundLeftCap: number;
+
+				/**
+				 * Size of the top end cap.
+				 */
+				backgroundTopCap: number;
+
+				/**
+				 * Border color of the view, as a color name or hex triplet.
+				 */
+				borderColor: string;
+
+				/**
+				 * Radius for the rounded corners of the view's border.
+				 */
+				borderRadius: number;
+
+				/**
+				 * Border width of the view.
+				 */
+				borderWidth: number;
+
+				/**
+				 * View's bottom position, in platform-specific units.
+				 */
+				bottom: number | string;
+
+				/**
+				 * View's center position, in the parent view's coordinates.
+				 */
+				center: Point;
+
+				/**
+				 * Array of this view's child views.
+				 */
+				readonly children: Titanium.UI.View[];
+
+				/**
+				 * View's clipping behavior.
+				 */
+				clipMode: number;
+
+				/**
+				 * View height, in platform-specific units.
+				 */
+				height: number | string;
+
+				/**
+				 * View's left position, in platform-specific units.
+				 */
+				left: number | string;
+
+				/**
+				 * Specifies how the view positions its children.
+				 * One of: 'composite', 'vertical', or 'horizontal'.
+				 */
+				layout: string;
+
+				/**
+				 * Opacity of this view, from 0.0 (transparent) to 1.0 (opaque).
+				 */
+				opacity: number;
+
+				/**
+				 * Background color of the wrapper view when this view is used as either <Titanium.UI.ListView.pullView> or <Titanium.UI.TableView.headerPullView>.
+				 */
+				pullBackgroundColor: string;
+
+				/**
+				 * The preview context used in the 3D-Touch feature "Peek and Pop".
+				 */
+				previewContext: Titanium.UI.iOS.PreviewContext;
+
+				/**
+				 * View's right position, in platform-specific units.
+				 */
+				right: number | string;
+
+				/**
+				 * The bounding box of the view relative to its parent, in system units.
+				 */
+				readonly rect: Dimension;
+
+				/**
+				 * The size of the view in system units.
+				 */
+				readonly size: Dimension;
+
+				/**
+				 * The view's tintColor. This property is applicable on iOS 7 and greater.
+				 */
+				tintColor: string;
+
+				/**
+				 * The view's top position.
+				 */
+				top: number | string;
+
+				/**
+				 * Determines whether view should receive touch events.
+				 */
+				touchEnabled: boolean;
+
+				/**
+				 * Transformation matrix to apply to the view.
+				 */
+				transform: Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
+
+				/**
+				 * Determines the blur radius used to create the shadow.
+				 */
+				viewShadowRadius: number;
+
+				/**
+				 * Determines the color of the shadow.
+				 */
+				viewShadowColor: string;
+
+				/**
+				 * Determines the offset for the shadow of the view.
+				 */
+				viewShadowOffset: Point;
+
+				/**
+				 * Determines whether the view is visible.
+				 */
+				visible: boolean;
+
+				/**
+				 * View's width, in platform-specific units.
+				 */
+				width: number | string;
+
+				/**
+				 * Determines whether the layout has wrapping behavior.
+				 */
+				horizontalWrap: boolean;
+
+				/**
+				 * Z-index stack order position, relative to other sibling views.
+				 */
+				zIndex: number;
+
+				/**
+				 * Index of the currently selected button.
+				 */
+				index: number;
+
+				/**
+				 * Array of labels for the tabbed bar.
+				 */
+				labels: string[] | BarItemType[];
+
+				/**
+				 * Style of the tabbed bar.
+				 */
+				style: number;
+
+				/**
+				 * Adds a child to this view's hierarchy.
+				 */
+				add(view: any): void;
+
+				/**
+				 * Adds a child to this view's hierarchy.
+				 */
+				add(view: any[]): void;
+
+				/**
+				 * Animates this view.
+				 */
+				animate(animation: any, callback?: (param0: any) => any): void;
+
+				/**
+				 * Finishes a batch update of the View's layout properties and schedules a layout pass of the
+				 * view tree.
+				 */
+				finishLayout(): void;
+
+				/**
+				 * Hides this view.
+				 */
+				hide(options?: AnimationOption): void;
+
+				/**
+				 * Inserts a view at the specified position in the [children](Titanium.UI.View.children) array.
+				 */
+				insertAt(params: any): void;
+
+				/**
+				 * Removes a child view from this view's hierarchy.
+				 */
+				remove(view: any): void;
+
+				/**
+				 * Removes all child views from this view's hierarchy.
+				 */
+				removeAllChildren(): void;
+
+				/**
+				 * Replaces a view at the specified position in the [children](Titanium.UI.View.children) array.
+				 */
+				replaceAt(params: any): void;
+
+				/**
+				 * Makes this view visible.
+				 */
+				show(options?: AnimationOption): void;
+
+				/**
+				 * Starts a batch update of this view's layout properties.
+				 */
+				startLayout(): void;
+
+				/**
+				 * Returns an image of the rendered view, as a Blob.
+				 */
+				toImage(callback?: (param0: Titanium.Blob) => any, honorScaleFactor?: boolean): Titanium.Blob;
+
+				/**
+				 * Performs a batch update of all supplied layout properties and schedules a layout pass after
+				 * they have been updated.
+				 */
+				updateLayout(params: any): void;
+
+				/**
+				 * Translates a point from this view's coordinate system to another view's coordinate system.
+				 */
+				convertPointToView(point: Point, destinationView: any): Point;
+
+				/**
+				 * Returns the matching view of a given view ID.
+				 */
+				getViewById(id: string): Titanium.UI.View;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.TabbedBar.accessibilityHidden> property.
+				 */
+				getAccessibilityHidden(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TabbedBar.accessibilityHidden> property.
+				 */
+				setAccessibilityHidden(accessibilityHidden: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.TabbedBar.accessibilityHint> property.
+				 */
+				getAccessibilityHint(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TabbedBar.accessibilityHint> property.
+				 */
+				setAccessibilityHint(accessibilityHint: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.TabbedBar.accessibilityLabel> property.
+				 */
+				getAccessibilityLabel(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TabbedBar.accessibilityLabel> property.
+				 */
+				setAccessibilityLabel(accessibilityLabel: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.TabbedBar.accessibilityValue> property.
+				 */
+				getAccessibilityValue(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TabbedBar.accessibilityValue> property.
+				 */
+				setAccessibilityValue(accessibilityValue: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.TabbedBar.anchorPoint> property.
+				 */
+				getAnchorPoint(): Point;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TabbedBar.anchorPoint> property.
+				 */
+				setAnchorPoint(anchorPoint: Point): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.TabbedBar.animatedCenter> property.
+				 */
+				getAnimatedCenter(): Point;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.TabbedBar.backgroundColor> property.
+				 */
+				getBackgroundColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TabbedBar.backgroundColor> property.
+				 */
+				setBackgroundColor(backgroundColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.TabbedBar.backgroundGradient> property.
+				 */
+				getBackgroundGradient(): Gradient;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TabbedBar.backgroundGradient> property.
+				 */
+				setBackgroundGradient(backgroundGradient: Gradient): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.TabbedBar.backgroundImage> property.
+				 */
+				getBackgroundImage(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TabbedBar.backgroundImage> property.
+				 */
+				setBackgroundImage(backgroundImage: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.TabbedBar.backgroundRepeat> property.
+				 */
+				getBackgroundRepeat(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TabbedBar.backgroundRepeat> property.
+				 */
+				setBackgroundRepeat(backgroundRepeat: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.TabbedBar.backgroundLeftCap> property.
+				 */
+				getBackgroundLeftCap(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TabbedBar.backgroundLeftCap> property.
+				 */
+				setBackgroundLeftCap(backgroundLeftCap: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.TabbedBar.backgroundTopCap> property.
+				 */
+				getBackgroundTopCap(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TabbedBar.backgroundTopCap> property.
+				 */
+				setBackgroundTopCap(backgroundTopCap: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.TabbedBar.borderColor> property.
+				 */
+				getBorderColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TabbedBar.borderColor> property.
+				 */
+				setBorderColor(borderColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.TabbedBar.borderRadius> property.
+				 */
+				getBorderRadius(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TabbedBar.borderRadius> property.
+				 */
+				setBorderRadius(borderRadius: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.TabbedBar.borderWidth> property.
+				 */
+				getBorderWidth(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TabbedBar.borderWidth> property.
+				 */
+				setBorderWidth(borderWidth: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.TabbedBar.bottom> property.
+				 */
+				getBottom(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TabbedBar.bottom> property.
+				 */
+				setBottom(bottom: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TabbedBar.bottom> property.
+				 */
+				setBottom(bottom: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.TabbedBar.center> property.
+				 */
+				getCenter(): Point;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TabbedBar.center> property.
+				 */
+				setCenter(center: Point): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.TabbedBar.children> property.
+				 */
+				getChildren(): Titanium.UI.View[];
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.TabbedBar.clipMode> property.
+				 */
+				getClipMode(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TabbedBar.clipMode> property.
+				 */
+				setClipMode(clipMode: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.TabbedBar.height> property.
+				 */
+				getHeight(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TabbedBar.height> property.
+				 */
+				setHeight(height: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TabbedBar.height> property.
+				 */
+				setHeight(height: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.TabbedBar.left> property.
+				 */
+				getLeft(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TabbedBar.left> property.
+				 */
+				setLeft(left: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TabbedBar.left> property.
+				 */
+				setLeft(left: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.TabbedBar.layout> property.
+				 */
+				getLayout(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TabbedBar.layout> property.
+				 */
+				setLayout(layout: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.TabbedBar.opacity> property.
+				 */
+				getOpacity(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TabbedBar.opacity> property.
+				 */
+				setOpacity(opacity: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.TabbedBar.pullBackgroundColor> property.
+				 */
+				getPullBackgroundColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TabbedBar.pullBackgroundColor> property.
+				 */
+				setPullBackgroundColor(pullBackgroundColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.TabbedBar.previewContext> property.
+				 */
+				getPreviewContext(): Titanium.UI.iOS.PreviewContext;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TabbedBar.previewContext> property.
+				 */
+				setPreviewContext(previewContext: Titanium.UI.iOS.PreviewContext): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.TabbedBar.right> property.
+				 */
+				getRight(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TabbedBar.right> property.
+				 */
+				setRight(right: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TabbedBar.right> property.
+				 */
+				setRight(right: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.TabbedBar.rect> property.
+				 */
+				getRect(): Dimension;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.TabbedBar.size> property.
+				 */
+				getSize(): Dimension;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.TabbedBar.tintColor> property.
+				 */
+				getTintColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TabbedBar.tintColor> property.
+				 */
+				setTintColor(tintColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.TabbedBar.top> property.
+				 */
+				getTop(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TabbedBar.top> property.
+				 */
+				setTop(top: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TabbedBar.top> property.
+				 */
+				setTop(top: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.TabbedBar.touchEnabled> property.
+				 */
+				getTouchEnabled(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TabbedBar.touchEnabled> property.
+				 */
+				setTouchEnabled(touchEnabled: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.TabbedBar.transform> property.
+				 */
+				getTransform(): Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TabbedBar.transform> property.
+				 */
+				setTransform(transform: Titanium.UI.Matrix2D): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TabbedBar.transform> property.
+				 */
+				setTransform(transform: Titanium.UI.Matrix3D): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.TabbedBar.viewShadowRadius> property.
+				 */
+				getViewShadowRadius(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TabbedBar.viewShadowRadius> property.
+				 */
+				setViewShadowRadius(viewShadowRadius: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.TabbedBar.viewShadowColor> property.
+				 */
+				getViewShadowColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TabbedBar.viewShadowColor> property.
+				 */
+				setViewShadowColor(viewShadowColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.TabbedBar.viewShadowOffset> property.
+				 */
+				getViewShadowOffset(): Point;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TabbedBar.viewShadowOffset> property.
+				 */
+				setViewShadowOffset(viewShadowOffset: Point): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.TabbedBar.visible> property.
+				 */
+				getVisible(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TabbedBar.visible> property.
+				 */
+				setVisible(visible: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.TabbedBar.width> property.
+				 */
+				getWidth(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TabbedBar.width> property.
+				 */
+				setWidth(width: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TabbedBar.width> property.
+				 */
+				setWidth(width: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.TabbedBar.horizontalWrap> property.
+				 */
+				getHorizontalWrap(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TabbedBar.horizontalWrap> property.
+				 */
+				setHorizontalWrap(horizontalWrap: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.TabbedBar.zIndex> property.
+				 */
+				getZIndex(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TabbedBar.zIndex> property.
+				 */
+				setZIndex(zIndex: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.TabbedBar.index> property.
+				 */
+				getIndex(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TabbedBar.index> property.
+				 */
+				setIndex(index: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.TabbedBar.labels> property.
+				 */
+				getLabels(): string[] | BarItemType[];
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TabbedBar.labels> property.
+				 */
+				setLabels(labels: ReadonlyArray<string>): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TabbedBar.labels> property.
+				 */
+				setLabels(labels: ReadonlyArray<BarItemType>): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.TabbedBar.style> property.
+				 */
+				getStyle(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TabbedBar.style> property.
+				 */
+				setStyle(style: number): void;
+
+			}
+
+			/**
+			 * An iOS toolbar, which can contain buttons and certain other controls.
+			 */
+			interface Toolbar extends Titanium.Proxy {
+				/**
+				 * Whether the view should be "hidden" from (i.e., ignored by) the accessibility service.
+				 */
+				accessibilityHidden: boolean;
+
+				/**
+				 * Briefly describes what performing an action (such as a click) on the view will do.
+				 */
+				accessibilityHint: string;
+
+				/**
+				 * A succint label identifying the view for the device's accessibility service.
+				 */
+				accessibilityLabel: string;
+
+				/**
+				 * A string describing the value (if any) of the view for the device's accessibility service.
+				 */
+				accessibilityValue: string;
+
+				/**
+				 * Coordinate of the view about which to pivot an animation.
+				 */
+				anchorPoint: Point;
+
+				/**
+				 * Current position of the view during an animation.
+				 */
+				readonly animatedCenter: Point;
+
+				/**
+				 * A background gradient for the view.
+				 */
+				backgroundGradient: Gradient;
+
+				/**
+				 * Background image for the view, specified as a local file path or URL.
+				 */
+				backgroundImage: string;
+
+				/**
+				 * Border color of the view, as a color name or hex triplet.
+				 */
+				borderColor: string;
+
+				/**
+				 * Radius for the rounded corners of the view's border.
+				 */
+				borderRadius: number;
+
+				/**
+				 * Border width of the view.
+				 */
+				borderWidth: number;
+
+				/**
+				 * View's bottom position, in platform-specific units.
+				 */
+				bottom: number | string;
+
+				/**
+				 * View's center position, in the parent view's coordinates.
+				 */
+				center: Point;
+
+				/**
+				 * Array of this view's child views.
+				 */
+				readonly children: Titanium.UI.View[];
+
+				/**
+				 * View's clipping behavior.
+				 */
+				clipMode: number;
+
+				/**
+				 * View height, in platform-specific units.
+				 */
+				height: number | string;
+
+				/**
+				 * View's left position, in platform-specific units.
+				 */
+				left: number | string;
+
+				/**
+				 * Opacity of this view, from 0.0 (transparent) to 1.0 (opaque).
+				 */
+				opacity: number;
+
+				/**
+				 * Background color of the wrapper view when this view is used as either <Titanium.UI.ListView.pullView> or <Titanium.UI.TableView.headerPullView>.
+				 */
+				pullBackgroundColor: string;
+
+				/**
+				 * The preview context used in the 3D-Touch feature "Peek and Pop".
+				 */
+				previewContext: Titanium.UI.iOS.PreviewContext;
+
+				/**
+				 * View's right position, in platform-specific units.
+				 */
+				right: number | string;
+
+				/**
+				 * The bounding box of the view relative to its parent, in system units.
+				 */
+				readonly rect: Dimension;
+
+				/**
+				 * The size of the view in system units.
+				 */
+				readonly size: Dimension;
+
+				/**
+				 * The view's tintColor. This property is applicable on iOS 7 and greater.
+				 */
+				tintColor: string;
+
+				/**
+				 * The view's top position.
+				 */
+				top: number | string;
+
+				/**
+				 * Determines whether view should receive touch events.
+				 */
+				touchEnabled: boolean;
+
+				/**
+				 * Transformation matrix to apply to the view.
+				 */
+				transform: Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
+
+				/**
+				 * Determines the blur radius used to create the shadow.
+				 */
+				viewShadowRadius: number;
+
+				/**
+				 * Determines the color of the shadow.
+				 */
+				viewShadowColor: string;
+
+				/**
+				 * Determines the offset for the shadow of the view.
+				 */
+				viewShadowOffset: Point;
+
+				/**
+				 * Determines whether the view is visible.
+				 */
+				visible: boolean;
+
+				/**
+				 * View's width, in platform-specific units.
+				 */
+				width: number | string;
+
+				/**
+				 * Determines whether the layout has wrapping behavior.
+				 */
+				horizontalWrap: boolean;
+
+				/**
+				 * Z-index stack order position, relative to other sibling views.
+				 */
+				zIndex: number;
+
+				/**
+				 * Background color for the toolbar, as a color name or hex triplet.
+				 */
+				barColor: string;
+
+				/**
+				 * An array of buttons (or other widgets) contained in the toolbar.
+				 */
+				items: Titanium.UI.View[];
+
+				/**
+				 * If `true`, the background of the toolbar extends upwards.
+				 */
+				extendBackground: boolean;
+
+				/**
+				 * If `true`, a translucent background color is used for the toolbar.
+				 */
+				translucent: boolean;
+
+				/**
+				 * Adds a child to this view's hierarchy.
+				 */
+				add(view: any): void;
+
+				/**
+				 * Adds a child to this view's hierarchy.
+				 */
+				add(view: any[]): void;
+
+				/**
+				 * Animates this view.
+				 */
+				animate(animation: any, callback?: (param0: any) => any): void;
+
+				/**
+				 * Finishes a batch update of the View's layout properties and schedules a layout pass of the
+				 * view tree.
+				 */
+				finishLayout(): void;
+
+				/**
+				 * Hides this view.
+				 */
+				hide(options?: AnimationOption): void;
+
+				/**
+				 * Inserts a view at the specified position in the [children](Titanium.UI.View.children) array.
+				 */
+				insertAt(params: any): void;
+
+				/**
+				 * Removes a child view from this view's hierarchy.
+				 */
+				remove(view: any): void;
+
+				/**
+				 * Removes all child views from this view's hierarchy.
+				 */
+				removeAllChildren(): void;
+
+				/**
+				 * Replaces a view at the specified position in the [children](Titanium.UI.View.children) array.
+				 */
+				replaceAt(params: any): void;
+
+				/**
+				 * Makes this view visible.
+				 */
+				show(options?: AnimationOption): void;
+
+				/**
+				 * Starts a batch update of this view's layout properties.
+				 */
+				startLayout(): void;
+
+				/**
+				 * Returns an image of the rendered view, as a Blob.
+				 */
+				toImage(callback?: (param0: Titanium.Blob) => any, honorScaleFactor?: boolean): Titanium.Blob;
+
+				/**
+				 * Performs a batch update of all supplied layout properties and schedules a layout pass after
+				 * they have been updated.
+				 */
+				updateLayout(params: any): void;
+
+				/**
+				 * Translates a point from this view's coordinate system to another view's coordinate system.
+				 */
+				convertPointToView(point: Point, destinationView: any): Point;
+
+				/**
+				 * Returns the matching view of a given view ID.
+				 */
+				getViewById(id: string): Titanium.UI.View;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Toolbar.accessibilityHidden> property.
+				 */
+				getAccessibilityHidden(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Toolbar.accessibilityHidden> property.
+				 */
+				setAccessibilityHidden(accessibilityHidden: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Toolbar.accessibilityHint> property.
+				 */
+				getAccessibilityHint(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Toolbar.accessibilityHint> property.
+				 */
+				setAccessibilityHint(accessibilityHint: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Toolbar.accessibilityLabel> property.
+				 */
+				getAccessibilityLabel(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Toolbar.accessibilityLabel> property.
+				 */
+				setAccessibilityLabel(accessibilityLabel: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Toolbar.accessibilityValue> property.
+				 */
+				getAccessibilityValue(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Toolbar.accessibilityValue> property.
+				 */
+				setAccessibilityValue(accessibilityValue: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Toolbar.anchorPoint> property.
+				 */
+				getAnchorPoint(): Point;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Toolbar.anchorPoint> property.
+				 */
+				setAnchorPoint(anchorPoint: Point): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Toolbar.animatedCenter> property.
+				 */
+				getAnimatedCenter(): Point;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Toolbar.backgroundGradient> property.
+				 */
+				getBackgroundGradient(): Gradient;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Toolbar.backgroundGradient> property.
+				 */
+				setBackgroundGradient(backgroundGradient: Gradient): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Toolbar.backgroundImage> property.
+				 */
+				getBackgroundImage(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Toolbar.backgroundImage> property.
+				 */
+				setBackgroundImage(backgroundImage: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Toolbar.borderColor> property.
+				 */
+				getBorderColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Toolbar.borderColor> property.
+				 */
+				setBorderColor(borderColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Toolbar.borderRadius> property.
+				 */
+				getBorderRadius(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Toolbar.borderRadius> property.
+				 */
+				setBorderRadius(borderRadius: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Toolbar.borderWidth> property.
+				 */
+				getBorderWidth(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Toolbar.borderWidth> property.
+				 */
+				setBorderWidth(borderWidth: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Toolbar.bottom> property.
+				 */
+				getBottom(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Toolbar.bottom> property.
+				 */
+				setBottom(bottom: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Toolbar.bottom> property.
+				 */
+				setBottom(bottom: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Toolbar.center> property.
+				 */
+				getCenter(): Point;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Toolbar.center> property.
+				 */
+				setCenter(center: Point): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Toolbar.children> property.
+				 */
+				getChildren(): Titanium.UI.View[];
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Toolbar.clipMode> property.
+				 */
+				getClipMode(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Toolbar.clipMode> property.
+				 */
+				setClipMode(clipMode: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Toolbar.height> property.
+				 */
+				getHeight(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Toolbar.height> property.
+				 */
+				setHeight(height: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Toolbar.height> property.
+				 */
+				setHeight(height: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Toolbar.left> property.
+				 */
+				getLeft(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Toolbar.left> property.
+				 */
+				setLeft(left: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Toolbar.left> property.
+				 */
+				setLeft(left: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Toolbar.opacity> property.
+				 */
+				getOpacity(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Toolbar.opacity> property.
+				 */
+				setOpacity(opacity: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Toolbar.pullBackgroundColor> property.
+				 */
+				getPullBackgroundColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Toolbar.pullBackgroundColor> property.
+				 */
+				setPullBackgroundColor(pullBackgroundColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Toolbar.previewContext> property.
+				 */
+				getPreviewContext(): Titanium.UI.iOS.PreviewContext;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Toolbar.previewContext> property.
+				 */
+				setPreviewContext(previewContext: Titanium.UI.iOS.PreviewContext): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Toolbar.right> property.
+				 */
+				getRight(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Toolbar.right> property.
+				 */
+				setRight(right: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Toolbar.right> property.
+				 */
+				setRight(right: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Toolbar.rect> property.
+				 */
+				getRect(): Dimension;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Toolbar.size> property.
+				 */
+				getSize(): Dimension;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Toolbar.tintColor> property.
+				 */
+				getTintColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Toolbar.tintColor> property.
+				 */
+				setTintColor(tintColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Toolbar.top> property.
+				 */
+				getTop(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Toolbar.top> property.
+				 */
+				setTop(top: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Toolbar.top> property.
+				 */
+				setTop(top: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Toolbar.touchEnabled> property.
+				 */
+				getTouchEnabled(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Toolbar.touchEnabled> property.
+				 */
+				setTouchEnabled(touchEnabled: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Toolbar.transform> property.
+				 */
+				getTransform(): Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Toolbar.transform> property.
+				 */
+				setTransform(transform: Titanium.UI.Matrix2D): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Toolbar.transform> property.
+				 */
+				setTransform(transform: Titanium.UI.Matrix3D): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Toolbar.viewShadowRadius> property.
+				 */
+				getViewShadowRadius(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Toolbar.viewShadowRadius> property.
+				 */
+				setViewShadowRadius(viewShadowRadius: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Toolbar.viewShadowColor> property.
+				 */
+				getViewShadowColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Toolbar.viewShadowColor> property.
+				 */
+				setViewShadowColor(viewShadowColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Toolbar.viewShadowOffset> property.
+				 */
+				getViewShadowOffset(): Point;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Toolbar.viewShadowOffset> property.
+				 */
+				setViewShadowOffset(viewShadowOffset: Point): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Toolbar.visible> property.
+				 */
+				getVisible(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Toolbar.visible> property.
+				 */
+				setVisible(visible: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Toolbar.width> property.
+				 */
+				getWidth(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Toolbar.width> property.
+				 */
+				setWidth(width: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Toolbar.width> property.
+				 */
+				setWidth(width: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Toolbar.horizontalWrap> property.
+				 */
+				getHorizontalWrap(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Toolbar.horizontalWrap> property.
+				 */
+				setHorizontalWrap(horizontalWrap: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Toolbar.zIndex> property.
+				 */
+				getZIndex(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Toolbar.zIndex> property.
+				 */
+				setZIndex(zIndex: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Toolbar.barColor> property.
+				 */
+				getBarColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Toolbar.barColor> property.
+				 */
+				setBarColor(barColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Toolbar.items> property.
+				 */
+				getItems(): Titanium.UI.View[];
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Toolbar.items> property.
+				 */
+				setItems(items: any[]): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Toolbar.extendBackground> property.
+				 */
+				getExtendBackground(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Toolbar.extendBackground> property.
+				 */
+				setExtendBackground(extendBackground: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Toolbar.translucent> property.
+				 */
+				getTranslucent(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Toolbar.translucent> property.
+				 */
+				setTranslucent(translucent: boolean): void;
+
+			}
+
+			/**
+			 * Dynamic behavior to support connections between two items.
+			 */
+			interface ViewAttachmentBehavior extends Titanium.Proxy {
+				/**
+				 * Item to use as the anchor in this behavior.
+				 */
+				anchorItem: Titanium.UI.View;
+
+				/**
+				 * Offset from the center point of the anchor item for the attachment.
+				 */
+				anchorOffset: Point;
+
+				/**
+				 * Amount of damping to apply to the attachment behavior.
+				 */
+				damping: number;
+
+				/**
+				 * Distance, in points, between the two attachment points.
+				 */
+				distance: number;
+
+				/**
+				 * Frequency of oscillation for the behavior.
+				 */
+				frequency: number;
+
+				/**
+				 * Item to connect to use the attachment behavior.
+				 */
+				item: Titanium.UI.View;
+
+				/**
+				 * Offset from the center point of the item for the attachment.
+				 */
+				itemOffset: Point;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.ViewAttachmentBehavior.anchorItem> property.
+				 */
+				getAnchorItem(): Titanium.UI.View;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.ViewAttachmentBehavior.anchorItem> property.
+				 */
+				setAnchorItem(anchorItem: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.ViewAttachmentBehavior.anchorOffset> property.
+				 */
+				getAnchorOffset(): Point;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.ViewAttachmentBehavior.anchorOffset> property.
+				 */
+				setAnchorOffset(anchorOffset: Point): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.ViewAttachmentBehavior.damping> property.
+				 */
+				getDamping(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.ViewAttachmentBehavior.damping> property.
+				 */
+				setDamping(damping: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.ViewAttachmentBehavior.distance> property.
+				 */
+				getDistance(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.ViewAttachmentBehavior.distance> property.
+				 */
+				setDistance(distance: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.ViewAttachmentBehavior.frequency> property.
+				 */
+				getFrequency(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.ViewAttachmentBehavior.frequency> property.
+				 */
+				setFrequency(frequency: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.ViewAttachmentBehavior.item> property.
+				 */
+				getItem(): Titanium.UI.View;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.ViewAttachmentBehavior.item> property.
+				 */
+				setItem(item: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.ViewAttachmentBehavior.itemOffset> property.
+				 */
+				getItemOffset(): Point;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.ViewAttachmentBehavior.itemOffset> property.
+				 */
+				setItemOffset(itemOffset: Point): void;
+
+			}
+
+
+			/**
+			 * A set of constants for the style that can be used for the `style` property of
+			 * <Titanium.UI.AlertDialog>.
+			 */
+			namespace AlertDialogStyle {
+				/**
+				 * Indicates if the proxy will bubble an event to its parent.
+				 */
+				let bubbleParent: boolean;
+
+				/**
+				 * The name of the API that this proxy corresponds to.
+				 */
+				const apiName: string;
+
+				/**
+				 * A standard alert dialog. This is the default value.
+				 */
+				const DEFAULT: number;
+
+				/**
+				 * An alert dialog that allows the user to enter text.
+				 */
+				const PLAIN_TEXT_INPUT: number;
+
+				/**
+				 * An alert dialog that allows the user to enter text. The text field is obscured.
+				 */
+				const SECURE_TEXT_INPUT: number;
+
+				/**
+				 * An alert dialog that allows the user to enter login identifier and password.
+				 */
+				const LOGIN_AND_PASSWORD_INPUT: number;
+
+				/**
+				 * Adds the specified callback as an event listener for the named event.
+				 */
+				function addEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Removes the specified callback as an event listener for the named event.
+				 */
+				function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Fires a synthesized event to any registered listeners.
+				 */
+				function fireEvent(name: string, event: any): void;
+
+				/**
+				 * Applies the properties to the proxy.
+				 */
+				function applyProperties(props: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AlertDialogStyle.bubbleParent> property.
+				 */
+				function getBubbleParent(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AlertDialogStyle.bubbleParent> property.
+				 */
+				function setBubbleParent(bubbleParent: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AlertDialogStyle.apiName> property.
+				 */
+				function getApiName(): string;
+
+			}
+
+			/**
+			 * A set of constants for the animation styles used for view transitions.
+			 * One of the group of animation style constants
+			 *   * [CURL_DOWN](Titanium.UI.iOS.AnimationStyle.CURL_DOWN)
+			 *   * [CURL_UP](Titanium.UI.iOS.AnimationStyle.CURL_UP)
+			 *   * [FLIP_FROM_LEFT](Titanium.UI.iOS.AnimationStyle.FLIP_FROM_LEFT)
+			 *   * [FLIP_FROM_RIGHT](Titanium.UI.iOS.AnimationStyle.FLIP_FROM_RIGHT)
+			 *   * [FLIP_FROM_TOP](Titanium.UI.iOS.AnimationStyle.FLIP_FROM_TOP)
+			 *   * [FLIP_FROM_BOTTOM](Titanium.UI.iOS.AnimationStyle.FLIP_FROM_BOTTOM)
+			 *   * [CROSS_DISSOLVE](Titanium.UI.iOS.AnimationStyle.CROSS_DISSOLVE)
+			 *   * [NONE](Titanium.UI.iOS.AnimationStyle.NONE)
+			 */
+			namespace AnimationStyle {
+				/**
+				 * Indicates if the proxy will bubble an event to its parent.
+				 */
+				let bubbleParent: boolean;
+
+				/**
+				 * The name of the API that this proxy corresponds to.
+				 */
+				const apiName: string;
+
+				/**
+				 * Curl downwards during a transition animation.
+				 */
+				const CURL_DOWN: number;
+
+				/**
+				 * Curl upwards during a transition animation.
+				 */
+				const CURL_UP: number;
+
+				/**
+				 * Flip from left to right during a transition animation.
+				 */
+				const FLIP_FROM_LEFT: number;
+
+				/**
+				 * Flip from right to left during a transition animation.
+				 */
+				const FLIP_FROM_RIGHT: number;
+
+				/**
+				 * Flip from top to bottom during a transition animation.
+				 */
+				const FLIP_FROM_TOP: number;
+
+				/**
+				 * Flip from bottom to top during a transition animation.
+				 */
+				const FLIP_FROM_BOTTOM: number;
+
+				/**
+				 * A transition that dissolves from one view to the next.
+				 */
+				const CROSS_DISSOLVE: number;
+
+				/**
+				 * No animation.
+				 */
+				const NONE: number;
+
+				/**
+				 * Adds the specified callback as an event listener for the named event.
+				 */
+				function addEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Removes the specified callback as an event listener for the named event.
+				 */
+				function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Fires a synthesized event to any registered listeners.
+				 */
+				function fireEvent(name: string, event: any): void;
+
+				/**
+				 * Applies the properties to the proxy.
+				 */
+				function applyProperties(props: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AnimationStyle.bubbleParent> property.
+				 */
+				function getBubbleParent(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AnimationStyle.bubbleParent> property.
+				 */
+				function setBubbleParent(bubbleParent: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AnimationStyle.apiName> property.
+				 */
+				function getApiName(): string;
+
+			}
+
+			/**
+			 * A set of constants for the bar styles used on the `style` property of <Titanium.UI.ProgressBar>.
+			 */
+			namespace ProgressBarStyle {
+				/**
+				 * Indicates if the proxy will bubble an event to its parent.
+				 */
+				let bubbleParent: boolean;
+
+				/**
+				 * The name of the API that this proxy corresponds to.
+				 */
+				const apiName: string;
+
+				/**
+				 * The style of progress view that is used in a toolbar.
+				 */
+				const BAR: number;
+
+				/**
+				 * he standard progress-view style. This is the default.
+				 */
+				const DEFAULT: number;
+
+				/**
+				 * The standard progress-view style. Same as `DEFAULT`.
+				 */
+				const PLAIN: number;
+
+				/**
+				 * Adds the specified callback as an event listener for the named event.
+				 */
+				function addEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Removes the specified callback as an event listener for the named event.
+				 */
+				function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Fires a synthesized event to any registered listeners.
+				 */
+				function fireEvent(name: string, event: any): void;
+
+				/**
+				 * Applies the properties to the proxy.
+				 */
+				function applyProperties(props: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.ProgressBarStyle.bubbleParent> property.
+				 */
+				function getBubbleParent(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.ProgressBarStyle.bubbleParent> property.
+				 */
+				function setBubbleParent(bubbleParent: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.ProgressBarStyle.apiName> property.
+				 */
+				function getApiName(): string;
+
+			}
+
+			/**
+			 * A set of constants for the Animation Styles used for transition on table view rows.
+			 */
+			namespace RowAnimationStyle {
+				/**
+				 * Indicates if the proxy will bubble an event to its parent.
+				 */
+				let bubbleParent: boolean;
+
+				/**
+				 * The name of the API that this proxy corresponds to.
+				 */
+				const apiName: string;
+
+				/**
+				 * The inserted row or rows slides in from the bottom; the deleted row or rows slides out
+				 * toward the bottom.
+				 */
+				const BOTTOM: number;
+
+				/**
+				 * The inserted or deleted row or rows fades into or out of the table view.
+				 */
+				const FADE: number;
+
+				/**
+				 * The inserted row or rows slides in from the left; the deleted row or rows slides out to the
+				 * left.
+				 */
+				const LEFT: number;
+
+				/**
+				 * No animation is performed. The new cell value appears as if the cell had just been reloaded.
+				 */
+				const NONE: number;
+
+				/**
+				 * The inserted row or rows slides in from the right; the deleted row or rows slides out to
+				 * the right.
+				 */
+				const RIGHT: number;
+
+				/**
+				 * The inserted row or rows slides in from the top; the deleted row or rows slides out toward
+				 * the top.
+				 */
+				const TOP: number;
+
+				/**
+				 * Adds the specified callback as an event listener for the named event.
+				 */
+				function addEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Removes the specified callback as an event listener for the named event.
+				 */
+				function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Fires a synthesized event to any registered listeners.
+				 */
+				function fireEvent(name: string, event: any): void;
+
+				/**
+				 * Applies the properties to the proxy.
+				 */
+				function applyProperties(props: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.RowAnimationStyle.bubbleParent> property.
+				 */
+				function getBubbleParent(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.RowAnimationStyle.bubbleParent> property.
+				 */
+				function setBubbleParent(bubbleParent: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.RowAnimationStyle.apiName> property.
+				 */
+				function getApiName(): string;
+
+			}
+
+			/**
+			 * A set of constants for the styles available for scrollbars used with <Titanium.UI.ScrollView.scrollIndicatorStyle> and <Titanium.UI.TableView.scrollIndicatorStyle> properties.
+			 */
+			namespace ScrollIndicatorStyle {
+				/**
+				 * Indicates if the proxy will bubble an event to its parent.
+				 */
+				let bubbleParent: boolean;
+
+				/**
+				 * The name of the API that this proxy corresponds to.
+				 */
+				const apiName: string;
+
+				/**
+				 * A style of indicator which is black smaller than the default style. This style is good
+				 * against a white content background.
+				 */
+				const BLACK: number;
+
+				/**
+				 * The default style of scroll indicator, which is black with a white border. This style is
+				 * good against any content background.
+				 */
+				const DEFAULT: number;
+
+				/**
+				 * A style of indicator is white and smaller than the default style. This style is good against
+				 * a black content background.
+				 */
+				const WHITE: number;
+
+				/**
+				 * Adds the specified callback as an event listener for the named event.
+				 */
+				function addEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Removes the specified callback as an event listener for the named event.
+				 */
+				function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Fires a synthesized event to any registered listeners.
+				 */
+				function fireEvent(name: string, event: any): void;
+
+				/**
+				 * Applies the properties to the proxy.
+				 */
+				function applyProperties(props: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.ScrollIndicatorStyle.bubbleParent> property.
+				 */
+				function getBubbleParent(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.ScrollIndicatorStyle.bubbleParent> property.
+				 */
+				function setBubbleParent(bubbleParent: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.ScrollIndicatorStyle.apiName> property.
+				 */
+				function getApiName(): string;
+
+			}
+
+			/**
+			 * A set of constants for the status bar style.
+			 */
+			namespace StatusBar {
+				/**
+				 * Indicates if the proxy will bubble an event to its parent.
+				 */
+				let bubbleParent: boolean;
+
+				/**
+				 * The name of the API that this proxy corresponds to.
+				 */
+				const apiName: string;
+
+				/**
+				 * No animation style, when the status bar is hidden or shown.
+				 */
+				const ANIMATION_STYLE_NONE: number;
+
+				/**
+				 * Slide animation style, when the status bar is hidden or shown.
+				 */
+				const ANIMATION_STYLE_SLIDE: number;
+
+				/**
+				 * Fade animation style, when the status bar is hidden or shown.
+				 */
+				const ANIMATION_STYLE_FADE: number;
+
+				/**
+				 * Default status bar style.
+				 */
+				const DEFAULT: number;
+
+				/**
+				 * Gray-colored status bar style.
+				 */
+				const GRAY: number;
+
+				/**
+				 * Gray-colored status bar style.
+				 */
+				const GREY: number;
+
+				/**
+				 * Status bar style to use with dark backgrounds. Valid on iOS 7 and above.
+				 */
+				const LIGHT_CONTENT: number;
+
+				/**
+				 * Adds the specified callback as an event listener for the named event.
+				 */
+				function addEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Removes the specified callback as an event listener for the named event.
+				 */
+				function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Fires a synthesized event to any registered listeners.
+				 */
+				function fireEvent(name: string, event: any): void;
+
+				/**
+				 * Applies the properties to the proxy.
+				 */
+				function applyProperties(props: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.StatusBar.bubbleParent> property.
+				 */
+				function getBubbleParent(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.StatusBar.bubbleParent> property.
+				 */
+				function setBubbleParent(bubbleParent: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.StatusBar.apiName> property.
+				 */
+				function getApiName(): string;
+
+			}
+
+			/**
+			 * A set of constants for creating standard iOS system buttons.
+			 */
+			namespace SystemButton {
+				/**
+				 * Indicates if the proxy will bubble an event to its parent.
+				 */
+				let bubbleParent: boolean;
+
+				/**
+				 * The name of the API that this proxy corresponds to.
+				 */
+				const apiName: string;
+
+				/**
+				 * Use with [Button.systemButton](Titanium.UI.Button.systemButton) to specify an **Action** button.
+				 */
+				const ACTION: number;
+
+				/**
+				 * Use with [Button.systemButton](Titanium.UI.Button.systemButton) to create an activity indicator that
+				 * can be used in navigation bars and toolbars.
+				 */
+				const ACTIVITY: number;
+
+				/**
+				 * Use with [Button.systemButton](Titanium.UI.Button.systemButton) to specify an **Add** button.
+				 */
+				const ADD: number;
+
+				/**
+				 * Use with [Button.systemButton](Titanium.UI.Button.systemButton) to specify a **Bookmarks** button.
+				 */
+				const BOOKMARKS: number;
+
+				/**
+				 * Use with [Button.systemButton](Titanium.UI.Button.systemButton) to specify a **Camera** button.
+				 */
+				const CAMERA: number;
+
+				/**
+				 * Use with [Button.systemButton](Titanium.UI.Button.systemButton) to specify a **Cancel** button.
+				 */
+				const CANCEL: number;
+
+				/**
+				 * Use with [Button.systemButton](Titanium.UI.Button.systemButton) to specify a **Compose** button.
+				 */
+				const COMPOSE: number;
+
+				/**
+				 * Use with [Button.style](Titanium.UI.Button.style) to specify a **ContactAdd** button.
+				 */
+				const CONTACT_ADD: number;
+
+				/**
+				 * Use with [Button.style](Titanium.UI.Button.style) to specify a **Disclosure** button.
+				 */
+				const DISCLOSURE: number;
+
+				/**
+				 * Use with [Button.systemButton](Titanium.UI.Button.systemButton) to specify a **Done** button.
+				 */
+				const DONE: number;
+
+				/**
+				 * Use with [Button.systemButton](Titanium.UI.Button.systemButton) to specify an **Edit** button.
+				 */
+				const EDIT: number;
+
+				/**
+				 * Use with [Button.systemButton](Titanium.UI.Button.systemButton) to specify a **Fast Forward** button.
+				 */
+				const FAST_FORWARD: number;
+
+				/**
+				 * Use with [Button.systemButton](Titanium.UI.Button.systemButton) to create a fixed-width blank space
+				 * for spacing items in toolbars.
+				 */
+				const FIXED_SPACE: number;
+
+				/**
+				 * Use with [Button.systemButton](Titanium.UI.Button.systemButton) to create a flexible blank space
+				 * for spacing items in toolbars.
+				 */
+				const FLEXIBLE_SPACE: number;
+
+				/**
+				 * Use with [Button.style](Titanium.UI.Button.style) to specify a dark-colored **Info** button.
+				 */
+				const INFO_DARK: number;
+
+				/**
+				 * Use with [Button.style](Titanium.UI.Button.style) to specify a light-colored **Info** button.
+				 */
+				const INFO_LIGHT: number;
+
+				/**
+				 * Use with [Button.systemButton](Titanium.UI.Button.systemButton) to specify an **Organize** button.
+				 */
+				const ORGANIZE: number;
+
+				/**
+				 * Use with [Button.systemButton](Titanium.UI.Button.systemButton) to specify a **Pause** button.
+				 */
+				const PAUSE: number;
+
+				/**
+				 * Use with [Button.systemButton](Titanium.UI.Button.systemButton) to specify a **Play** button.
+				 */
+				const PLAY: number;
+
+				/**
+				 * Use with [Button.systemButton](Titanium.UI.Button.systemButton) to specify a **Refresh** button.
+				 */
+				const REFRESH: number;
+
+				/**
+				 * Use with [Button.systemButton](Titanium.UI.Button.systemButton) to specify a **Reply** button.
+				 */
+				const REPLY: number;
+
+				/**
+				 * Use with [Button.systemButton](Titanium.UI.Button.systemButton) to specify a **Rewind** button.
+				 */
+				const REWIND: number;
+
+				/**
+				 * Use with [Button.systemButton](Titanium.UI.Button.systemButton) to specify a **Save** button.
+				 */
+				const SAVE: number;
+
+				/**
+				 * Identical to [ACTIVITY](Titanium.UI.iOS.SystemButton.ACTIVITY).
+				 */
+				const SPINNER: number;
+
+				/**
+				 * Use with [Button.systemButton](Titanium.UI.Button.systemButton) to specify a **Stop** button.
+				 */
+				const STOP: number;
+
+				/**
+				 * Use with [Button.systemButton](Titanium.UI.Button.systemButton) to specify a **Trash** button.
+				 */
+				const TRASH: number;
+
+				/**
+				 * Adds the specified callback as an event listener for the named event.
+				 */
+				function addEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Removes the specified callback as an event listener for the named event.
+				 */
+				function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Fires a synthesized event to any registered listeners.
+				 */
+				function fireEvent(name: string, event: any): void;
+
+				/**
+				 * Applies the properties to the proxy.
+				 */
+				function applyProperties(props: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SystemButton.bubbleParent> property.
+				 */
+				function getBubbleParent(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SystemButton.bubbleParent> property.
+				 */
+				function setBubbleParent(bubbleParent: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SystemButton.apiName> property.
+				 */
+				function getApiName(): string;
+
+			}
+
+			/**
+			 * A set of constants for the system button styles that can be used for the button `style` property.
+			 */
+			namespace SystemButtonStyle {
+				/**
+				 * Indicates if the proxy will bubble an event to its parent.
+				 */
+				let bubbleParent: boolean;
+
+				/**
+				 * The name of the API that this proxy corresponds to.
+				 */
+				const apiName: string;
+
+				/**
+				 * A simple button style with a border.
+				 */
+				const BORDERED: number;
+
+				/**
+				 * The style for a **Done** button--for example, a button that completes some task and returns
+				 * to the previous view.
+				 */
+				const DONE: number;
+
+				/**
+				 * Specifies a borderless button, the default style for toolbars, button bars, and tabbed bars.
+				 */
+				const PLAIN: number;
+
+				/**
+				 * Adds the specified callback as an event listener for the named event.
+				 */
+				function addEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Removes the specified callback as an event listener for the named event.
+				 */
+				function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Fires a synthesized event to any registered listeners.
+				 */
+				function fireEvent(name: string, event: any): void;
+
+				/**
+				 * Applies the properties to the proxy.
+				 */
+				function applyProperties(props: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SystemButtonStyle.bubbleParent> property.
+				 */
+				function getBubbleParent(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SystemButtonStyle.bubbleParent> property.
+				 */
+				function setBubbleParent(bubbleParent: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SystemButtonStyle.apiName> property.
+				 */
+				function getApiName(): string;
+
+			}
+
+			/**
+			 * A set of constants for the system icon styles that can be used on a tab group tab.
+			 */
+			namespace SystemIcon {
+				/**
+				 * Indicates if the proxy will bubble an event to its parent.
+				 */
+				let bubbleParent: boolean;
+
+				/**
+				 * The name of the API that this proxy corresponds to.
+				 */
+				const apiName: string;
+
+				/**
+				 * Bookmark style icon
+				 */
+				const BOOKMARKS: number;
+
+				/**
+				 * Contacts style icon
+				 */
+				const CONTACTS: number;
+
+				/**
+				 * Downloads style icon
+				 */
+				const DOWNLOADS: number;
+
+				/**
+				 * Favorites style icon
+				 */
+				const FAVORITES: number;
+
+				/**
+				 * Featured style icon
+				 */
+				const FEATURED: number;
+
+				/**
+				 * History style icon
+				 */
+				const HISTORY: number;
+
+				/**
+				 * More style icon
+				 */
+				const MORE: number;
+
+				/**
+				 * Most recent style icon
+				 */
+				const MOST_RECENT: number;
+
+				/**
+				 * Most viewed style icon
+				 */
+				const MOST_VIEWED: number;
+
+				/**
+				 * Recents style icon
+				 */
+				const RECENTS: number;
+
+				/**
+				 * Search style icon
+				 */
+				const SEARCH: number;
+
+				/**
+				 * Top rated style icon
+				 */
+				const TOP_RATED: number;
+
+				/**
+				 * Adds the specified callback as an event listener for the named event.
+				 */
+				function addEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Removes the specified callback as an event listener for the named event.
+				 */
+				function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Fires a synthesized event to any registered listeners.
+				 */
+				function fireEvent(name: string, event: any): void;
+
+				/**
+				 * Applies the properties to the proxy.
+				 */
+				function applyProperties(props: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SystemIcon.bubbleParent> property.
+				 */
+				function getBubbleParent(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SystemIcon.bubbleParent> property.
+				 */
+				function setBubbleParent(bubbleParent: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SystemIcon.apiName> property.
+				 */
+				function getApiName(): string;
+
+			}
+
+			/**
+			 * A set of constants for the style that can be used for the `selectionStyle` property of
+			 * <Titanium.UI.TableViewRow>.
+			 */
+			namespace TableViewCellSelectionStyle {
+				/**
+				 * Indicates if the proxy will bubble an event to its parent.
+				 */
+				let bubbleParent: boolean;
+
+				/**
+				 * The name of the API that this proxy corresponds to.
+				 */
+				const apiName: string;
+
+				/**
+				 * The cell when selected has a blue background. This is the default value.
+				 */
+				const BLUE: number;
+
+				/**
+				 * Then cell when selected has a gray background.
+				 */
+				const GRAY: number;
+
+				/**
+				 * The cell has no distinct style for when it is selected.
+				 */
+				const NONE: number;
+
+				/**
+				 * Adds the specified callback as an event listener for the named event.
+				 */
+				function addEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Removes the specified callback as an event listener for the named event.
+				 */
+				function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Fires a synthesized event to any registered listeners.
+				 */
+				function fireEvent(name: string, event: any): void;
+
+				/**
+				 * Applies the properties to the proxy.
+				 */
+				function applyProperties(props: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.TableViewCellSelectionStyle.bubbleParent> property.
+				 */
+				function getBubbleParent(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TableViewCellSelectionStyle.bubbleParent> property.
+				 */
+				function setBubbleParent(bubbleParent: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.TableViewCellSelectionStyle.apiName> property.
+				 */
+				function getApiName(): string;
+
+			}
+
+			/**
+			 * A set of constants for the position value that can be used for the `position` property of
+			 * <Titanium.UI.TableView> when invoking `scrollToIndex`.
+			 */
+			namespace TableViewScrollPosition {
+				/**
+				 * Indicates if the proxy will bubble an event to its parent.
+				 */
+				let bubbleParent: boolean;
+
+				/**
+				 * The name of the API that this proxy corresponds to.
+				 */
+				const apiName: string;
+
+				/**
+				 * The table view scrolls the row of interest to the bottom of the visible table view.
+				 */
+				const BOTTOM: number;
+
+				/**
+				 * The table view scrolls the row of interest to the middle of the visible table view.
+				 */
+				const MIDDLE: number;
+
+				/**
+				 * The table view scrolls the row of interest to be fully visible with a minimum of movement. If the row is already fully visible, no scrolling occurs. For example, if the row is above the visible area, the behavior is identical to that specified by `TOP`. This is the default.
+				 */
+				const NONE: number;
+
+				/**
+				 * The table view scrolls the row of interest to the top of the visible table view.
+				 */
+				const TOP: number;
+
+				/**
+				 * Adds the specified callback as an event listener for the named event.
+				 */
+				function addEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Removes the specified callback as an event listener for the named event.
+				 */
+				function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Fires a synthesized event to any registered listeners.
+				 */
+				function fireEvent(name: string, event: any): void;
+
+				/**
+				 * Applies the properties to the proxy.
+				 */
+				function applyProperties(props: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.TableViewScrollPosition.bubbleParent> property.
+				 */
+				function getBubbleParent(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TableViewScrollPosition.bubbleParent> property.
+				 */
+				function setBubbleParent(bubbleParent: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.TableViewScrollPosition.apiName> property.
+				 */
+				function getApiName(): string;
+
+			}
+
+			/**
+			 * A set of constants for the style that can be used for the button `style` property of
+			 * <Titanium.UI.TableView>.
+			 */
+			namespace TableViewStyle {
+				/**
+				 * Indicates if the proxy will bubble an event to its parent.
+				 */
+				let bubbleParent: boolean;
+
+				/**
+				 * The name of the API that this proxy corresponds to.
+				 */
+				const apiName: string;
+
+				/**
+				 * A table view whose sections present distinct groups of rows. The section headers and footers
+				 * do not float.
+				 */
+				const GROUPED: number;
+
+				/**
+				 * A plain table view. Any section headers or footers are displayed as inline separators and
+				 * float when the table view is scrolled.
+				 */
+				const PLAIN: number;
+
+				/**
+				 * Adds the specified callback as an event listener for the named event.
+				 */
+				function addEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Removes the specified callback as an event listener for the named event.
+				 */
+				function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Fires a synthesized event to any registered listeners.
+				 */
+				function fireEvent(name: string, event: any): void;
+
+				/**
+				 * Applies the properties to the proxy.
+				 */
+				function applyProperties(props: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.TableViewStyle.bubbleParent> property.
+				 */
+				function getBubbleParent(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TableViewStyle.bubbleParent> property.
+				 */
+				function setBubbleParent(bubbleParent: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.TableViewStyle.apiName> property.
+				 */
+				function getApiName(): string;
 
 			}
 		}
-		export module iOS {
-			export var BACKGROUNDFETCHINTERVAL_MIN : number;
-			export var BACKGROUNDFETCHINTERVAL_NEVER : number;
-			export var EVENT_ACCESSIBILITY_LAYOUT_CHANGED : string;
-			export var EVENT_ACCESSIBILITY_SCREEN_CHANGED : string;
-			export var USER_NOTIFICATION_ACTIVATION_MODE_BACKGROUND : number;
-			export var USER_NOTIFICATION_ACTIVATION_MODE_FOREGROUND : number;
-			export var USER_NOTIFICATION_TYPE_ALERT : number;
-			export var USER_NOTIFICATION_TYPE_BADGE : number;
-			export var USER_NOTIFICATION_TYPE_NONE : number;
-			export var USER_NOTIFICATION_TYPE_SOUND : number;
-			export var apiName : string;
-			export var applicationOpenSettingsURL : string;
-			export var bubbleParent : boolean;
-			export var currentUserNotificationSettings : UserNotificationSettings;
-			export function addEventListener (name: string, callback: (...args : any[]) => any) : void;
-			export function applyProperties (props: Dictionary<Object>) : void;
-			export function cancelAllLocalNotifications () : void;
-			export function cancelLocalNotification (id: number) : void;
-			export function cancelLocalNotification (id: string) : void;
-			export function createUserNotificationAction (parameters?: Dictionary<Ti.App.iOS.UserNotificationAction>) : Ti.App.iOS.UserNotificationAction;
-			export function createUserNotificationCategory (parameters?: Dictionary<Ti.App.iOS.UserNotificationCategory>) : Ti.App.iOS.UserNotificationCategory;
-			export function endBackgroundHandler (handlerID: string) : void;
-			export function fireEvent (name: string, event: Dictionary<Object>) : void;
-			export function getApiName () : string;
-			export function getApplicationOpenSettingsURL () : string;
-			export function getBubbleParent () : boolean;
-			export function getCurrentUserNotificationSettings () : UserNotificationSettings;
-			export function registerBackgroundService (params: Dictionary<Object>) : Ti.App.iOS.BackgroundService;
-			export function registerUserNotificationSettings (params: UserNotificationSettings) : void;
-			export function removeEventListener (name: string, callback: (...args : any[]) => any) : void;
-			export function scheduleLocalNotification (params: NotificationParams) : Ti.App.iOS.LocalNotification;
-			export function setBubbleParent (bubbleParent: boolean) : void;
-			export function setMinimumBackgroundFetchInterval (fetchInterval: number) : void;
-			export interface UserNotificationAction extends Ti.Proxy {
-				activationMode : number;
-				authenticationRequired : boolean;
-				destructive : boolean;
-				identifier : string;
-				title : string;
-				getActivationMode () : number;
-				getAuthenticationRequired () : boolean;
-				getDestructive () : boolean;
-				getIdentifier () : string;
-				getTitle () : string;
+
+		/**
+		 * iPad specific UI capabilities.
+		 */
+		namespace iPad {
+			/**
+			 * Indicates if the proxy will bubble an event to its parent.
+			 */
+			let bubbleParent: boolean;
+
+			/**
+			 * The name of the API that this proxy corresponds to.
+			 */
+			const apiName: string;
+
+			/**
+			 * An arrow that points in any direction.
+			 */
+			const POPOVER_ARROW_DIRECTION_ANY: number;
+
+			/**
+			 * An arrow that points downward.
+			 */
+			const POPOVER_ARROW_DIRECTION_DOWN: number;
+
+			/**
+			 * An arrow that points toward the left.
+			 */
+			const POPOVER_ARROW_DIRECTION_LEFT: number;
+
+			/**
+			 * An arrow that points toward the right.
+			 */
+			const POPOVER_ARROW_DIRECTION_RIGHT: number;
+
+			/**
+			 * The status of the arrow is currently unknown.
+			 */
+			const POPOVER_ARROW_DIRECTION_UNKNOWN: number;
+
+			/**
+			 * An arrow that points upward.
+			 */
+			const POPOVER_ARROW_DIRECTION_UP: number;
+
+			/**
+			 * Adds the specified callback as an event listener for the named event.
+			 */
+			function addEventListener(name: string, callback: (param0: any) => any): void;
+
+			/**
+			 * Removes the specified callback as an event listener for the named event.
+			 */
+			function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+			/**
+			 * Fires a synthesized event to any registered listeners.
+			 */
+			function fireEvent(name: string, event: any): void;
+
+			/**
+			 * Applies the properties to the proxy.
+			 */
+			function applyProperties(props: any): void;
+
+			/**
+			 * Creates and returns an instance of <Titanium.UI.iPad.DocumentViewer>.
+			 */
+			function createDocumentViewer(parameters?: any): Titanium.UI.iPad.DocumentViewer;
+
+			/**
+			 * Creates and returns an instance of <Titanium.UI.iPad.Popover>.
+			 */
+			function createPopover(parameters?: any): Titanium.UI.iPad.Popover;
+
+			/**
+			 * Creates and returns an instance of <Titanium.UI.iPad.SplitWindow>.
+			 */
+			function createSplitWindow(parameters?: any): Titanium.UI.iPad.SplitWindow;
+
+			/**
+			 * Gets the value of the <Titanium.UI.iPad.bubbleParent> property.
+			 */
+			function getBubbleParent(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.iPad.bubbleParent> property.
+			 */
+			function setBubbleParent(bubbleParent: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.iPad.apiName> property.
+			 */
+			function getApiName(): string;
+
+			/**
+			 * A DocumentViewer provides in-app support for managing user interactions with files on the
+			 * local system.
+			 */
+			interface DocumentViewer extends Titanium.Proxy {
+				/**
+				 * Whether the view should be "hidden" from (i.e., ignored by) the accessibility service.
+				 */
+				accessibilityHidden: boolean;
+
+				/**
+				 * Briefly describes what performing an action (such as a click) on the view will do.
+				 */
+				accessibilityHint: string;
+
+				/**
+				 * A succint label identifying the view for the device's accessibility service.
+				 */
+				accessibilityLabel: string;
+
+				/**
+				 * A string describing the value (if any) of the view for the device's accessibility service.
+				 */
+				accessibilityValue: string;
+
+				/**
+				 * Coordinate of the view about which to pivot an animation.
+				 */
+				anchorPoint: Point;
+
+				/**
+				 * Current position of the view during an animation.
+				 */
+				readonly animatedCenter: Point;
+
+				/**
+				 * Background color of the view, as a color name or hex triplet.
+				 */
+				backgroundColor: string;
+
+				/**
+				 * A background gradient for the view.
+				 */
+				backgroundGradient: Gradient;
+
+				/**
+				 * Background image for the view, specified as a local file path or URL.
+				 */
+				backgroundImage: string;
+
+				/**
+				 * Determines whether to tile a background across a view.
+				 */
+				backgroundRepeat: boolean;
+
+				/**
+				 * Size of the left end cap.
+				 */
+				backgroundLeftCap: number;
+
+				/**
+				 * Size of the top end cap.
+				 */
+				backgroundTopCap: number;
+
+				/**
+				 * Border color of the view, as a color name or hex triplet.
+				 */
+				borderColor: string;
+
+				/**
+				 * Radius for the rounded corners of the view's border.
+				 */
+				borderRadius: number;
+
+				/**
+				 * Border width of the view.
+				 */
+				borderWidth: number;
+
+				/**
+				 * View's bottom position, in platform-specific units.
+				 */
+				bottom: number | string;
+
+				/**
+				 * View's center position, in the parent view's coordinates.
+				 */
+				center: Point;
+
+				/**
+				 * Array of this view's child views.
+				 */
+				readonly children: Titanium.UI.View[];
+
+				/**
+				 * View's clipping behavior.
+				 */
+				clipMode: number;
+
+				/**
+				 * View height, in platform-specific units.
+				 */
+				height: number | string;
+
+				/**
+				 * View's left position, in platform-specific units.
+				 */
+				left: number | string;
+
+				/**
+				 * Specifies how the view positions its children.
+				 * One of: 'composite', 'vertical', or 'horizontal'.
+				 */
+				layout: string;
+
+				/**
+				 * Opacity of this view, from 0.0 (transparent) to 1.0 (opaque).
+				 */
+				opacity: number;
+
+				/**
+				 * Background color of the wrapper view when this view is used as either <Titanium.UI.ListView.pullView> or <Titanium.UI.TableView.headerPullView>.
+				 */
+				pullBackgroundColor: string;
+
+				/**
+				 * View's right position, in platform-specific units.
+				 */
+				right: number | string;
+
+				/**
+				 * The bounding box of the view relative to its parent, in system units.
+				 */
+				readonly rect: Dimension;
+
+				/**
+				 * The size of the view in system units.
+				 */
+				readonly size: Dimension;
+
+				/**
+				 * The view's tintColor. This property is applicable on iOS 7 and greater.
+				 */
+				tintColor: string;
+
+				/**
+				 * The view's top position.
+				 */
+				top: number | string;
+
+				/**
+				 * Determines whether view should receive touch events.
+				 */
+				touchEnabled: boolean;
+
+				/**
+				 * Transformation matrix to apply to the view.
+				 */
+				transform: Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
+
+				/**
+				 * Determines the blur radius used to create the shadow.
+				 */
+				viewShadowRadius: number;
+
+				/**
+				 * Determines the color of the shadow.
+				 */
+				viewShadowColor: string;
+
+				/**
+				 * Determines the offset for the shadow of the view.
+				 */
+				viewShadowOffset: Point;
+
+				/**
+				 * Determines whether the view is visible.
+				 */
+				visible: boolean;
+
+				/**
+				 * View's width, in platform-specific units.
+				 */
+				width: number | string;
+
+				/**
+				 * Determines whether the layout has wrapping behavior.
+				 */
+				horizontalWrap: boolean;
+
+				/**
+				 * Z-index stack order position, relative to other sibling views.
+				 */
+				zIndex: number;
+
+				/**
+				 * Adds a child to this view's hierarchy.
+				 */
+				add(view: any): void;
+
+				/**
+				 * Adds a child to this view's hierarchy.
+				 */
+				add(view: any[]): void;
+
+				/**
+				 * Animates this view.
+				 */
+				animate(animation: any, callback?: (param0: any) => any): void;
+
+				/**
+				 * Finishes a batch update of the View's layout properties and schedules a layout pass of the
+				 * view tree.
+				 */
+				finishLayout(): void;
+
+				/**
+				 * Hides this view.
+				 */
+				hide(options?: AnimationOption): void;
+
+				/**
+				 * Inserts a view at the specified position in the [children](Titanium.UI.View.children) array.
+				 */
+				insertAt(params: any): void;
+
+				/**
+				 * Removes a child view from this view's hierarchy.
+				 */
+				remove(view: any): void;
+
+				/**
+				 * Removes all child views from this view's hierarchy.
+				 */
+				removeAllChildren(): void;
+
+				/**
+				 * Replaces a view at the specified position in the [children](Titanium.UI.View.children) array.
+				 */
+				replaceAt(params: any): void;
+
+				/**
+				 * Displays the document viewer over the current view.
+				 */
+				show(animated: boolean, view: any): void;
+
+				/**
+				 * Starts a batch update of this view's layout properties.
+				 */
+				startLayout(): void;
+
+				/**
+				 * Returns an image of the rendered view, as a Blob.
+				 */
+				toImage(callback?: (param0: Titanium.Blob) => any, honorScaleFactor?: boolean): Titanium.Blob;
+
+				/**
+				 * Performs a batch update of all supplied layout properties and schedules a layout pass after
+				 * they have been updated.
+				 */
+				updateLayout(params: any): void;
+
+				/**
+				 * Translates a point from this view's coordinate system to another view's coordinate system.
+				 */
+				convertPointToView(point: Point, destinationView: any): Point;
+
+				/**
+				 * Returns the matching view of a given view ID.
+				 */
+				getViewById(id: string): Titanium.UI.View;
+
+				/**
+				 * Sets the url of the document viewer.
+				 */
+				setUrl(url: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.accessibilityHidden> property.
+				 */
+				getAccessibilityHidden(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.accessibilityHidden> property.
+				 */
+				setAccessibilityHidden(accessibilityHidden: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.accessibilityHint> property.
+				 */
+				getAccessibilityHint(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.accessibilityHint> property.
+				 */
+				setAccessibilityHint(accessibilityHint: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.accessibilityLabel> property.
+				 */
+				getAccessibilityLabel(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.accessibilityLabel> property.
+				 */
+				setAccessibilityLabel(accessibilityLabel: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.accessibilityValue> property.
+				 */
+				getAccessibilityValue(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.accessibilityValue> property.
+				 */
+				setAccessibilityValue(accessibilityValue: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.anchorPoint> property.
+				 */
+				getAnchorPoint(): Point;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.anchorPoint> property.
+				 */
+				setAnchorPoint(anchorPoint: Point): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.animatedCenter> property.
+				 */
+				getAnimatedCenter(): Point;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.backgroundColor> property.
+				 */
+				getBackgroundColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.backgroundColor> property.
+				 */
+				setBackgroundColor(backgroundColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.backgroundGradient> property.
+				 */
+				getBackgroundGradient(): Gradient;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.backgroundGradient> property.
+				 */
+				setBackgroundGradient(backgroundGradient: Gradient): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.backgroundImage> property.
+				 */
+				getBackgroundImage(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.backgroundImage> property.
+				 */
+				setBackgroundImage(backgroundImage: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.backgroundRepeat> property.
+				 */
+				getBackgroundRepeat(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.backgroundRepeat> property.
+				 */
+				setBackgroundRepeat(backgroundRepeat: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.backgroundLeftCap> property.
+				 */
+				getBackgroundLeftCap(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.backgroundLeftCap> property.
+				 */
+				setBackgroundLeftCap(backgroundLeftCap: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.backgroundTopCap> property.
+				 */
+				getBackgroundTopCap(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.backgroundTopCap> property.
+				 */
+				setBackgroundTopCap(backgroundTopCap: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.borderColor> property.
+				 */
+				getBorderColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.borderColor> property.
+				 */
+				setBorderColor(borderColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.borderRadius> property.
+				 */
+				getBorderRadius(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.borderRadius> property.
+				 */
+				setBorderRadius(borderRadius: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.borderWidth> property.
+				 */
+				getBorderWidth(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.borderWidth> property.
+				 */
+				setBorderWidth(borderWidth: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.bottom> property.
+				 */
+				getBottom(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.bottom> property.
+				 */
+				setBottom(bottom: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.bottom> property.
+				 */
+				setBottom(bottom: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.center> property.
+				 */
+				getCenter(): Point;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.center> property.
+				 */
+				setCenter(center: Point): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.children> property.
+				 */
+				getChildren(): Titanium.UI.View[];
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.clipMode> property.
+				 */
+				getClipMode(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.clipMode> property.
+				 */
+				setClipMode(clipMode: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.height> property.
+				 */
+				getHeight(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.height> property.
+				 */
+				setHeight(height: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.height> property.
+				 */
+				setHeight(height: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.left> property.
+				 */
+				getLeft(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.left> property.
+				 */
+				setLeft(left: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.left> property.
+				 */
+				setLeft(left: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.layout> property.
+				 */
+				getLayout(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.layout> property.
+				 */
+				setLayout(layout: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.opacity> property.
+				 */
+				getOpacity(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.opacity> property.
+				 */
+				setOpacity(opacity: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.pullBackgroundColor> property.
+				 */
+				getPullBackgroundColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.pullBackgroundColor> property.
+				 */
+				setPullBackgroundColor(pullBackgroundColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.right> property.
+				 */
+				getRight(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.right> property.
+				 */
+				setRight(right: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.right> property.
+				 */
+				setRight(right: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.rect> property.
+				 */
+				getRect(): Dimension;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.size> property.
+				 */
+				getSize(): Dimension;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.tintColor> property.
+				 */
+				getTintColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.tintColor> property.
+				 */
+				setTintColor(tintColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.top> property.
+				 */
+				getTop(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.top> property.
+				 */
+				setTop(top: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.top> property.
+				 */
+				setTop(top: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.touchEnabled> property.
+				 */
+				getTouchEnabled(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.touchEnabled> property.
+				 */
+				setTouchEnabled(touchEnabled: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.transform> property.
+				 */
+				getTransform(): Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.transform> property.
+				 */
+				setTransform(transform: Titanium.UI.Matrix2D): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.transform> property.
+				 */
+				setTransform(transform: Titanium.UI.Matrix3D): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.viewShadowRadius> property.
+				 */
+				getViewShadowRadius(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.viewShadowRadius> property.
+				 */
+				setViewShadowRadius(viewShadowRadius: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.viewShadowColor> property.
+				 */
+				getViewShadowColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.viewShadowColor> property.
+				 */
+				setViewShadowColor(viewShadowColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.viewShadowOffset> property.
+				 */
+				getViewShadowOffset(): Point;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.viewShadowOffset> property.
+				 */
+				setViewShadowOffset(viewShadowOffset: Point): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.visible> property.
+				 */
+				getVisible(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.visible> property.
+				 */
+				setVisible(visible: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.width> property.
+				 */
+				getWidth(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.width> property.
+				 */
+				setWidth(width: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.width> property.
+				 */
+				setWidth(width: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.horizontalWrap> property.
+				 */
+				getHorizontalWrap(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.horizontalWrap> property.
+				 */
+				setHorizontalWrap(horizontalWrap: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.zIndex> property.
+				 */
+				getZIndex(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.zIndex> property.
+				 */
+				setZIndex(zIndex: number): void;
+
 			}
-			export interface LocalNotification extends Ti.Proxy {
-				cancel () : void;
+
+			/**
+			 * A Popover is used to manage the presentation of content in a popover.
+			 */
+			interface Popover extends Titanium.Proxy {
+				/**
+				 * Sets the background color of the popover.
+				 */
+				backgroundColor: string;
+
+				/**
+				 * Height of the popover.
+				 */
+				height: number | string;
+
+				/**
+				 * Width of the popover.
+				 */
+				width: number | string;
+
+				/**
+				 * Indicates the arrow direction of the popover.
+				 */
+				arrowDirection: number;
+
+				/**
+				 * View to use for the popover content. Must be set before calling the `show()` method.
+				 */
+				contentView: Titanium.UI.View;
+
+				/**
+				 * Left button in the navigation area of the popover.
+				 */
+				leftNavButton: any;
+
+				/**
+				 * Passthrough views to use when the popover is shown.
+				 */
+				passthroughViews: Titanium.UI.View[];
+
+				/**
+				 * Right button in the navigation area of the popover.
+				 */
+				rightNavButton: any;
+
+				/**
+				 * Title of the navigation area of the popover.
+				 */
+				title: string;
+
+				/**
+				 * Adds a child to the popover.
+				 */
+				add(view: any): void;
+
+				/**
+				 * Adds a child to the popover.
+				 */
+				add(view: any[]): void;
+
+				/**
+				 * Finishes a batch update of the View's layout properties and schedules a layout pass of the
+				 * view tree.
+				 */
+				finishLayout(): void;
+
+				/**
+				 * Hides the popover.
+				 */
+				hide(options: PopoverParams): void;
+
+				/**
+				 * Inserts a view at the specified position in the [children](Titanium.UI.View.children) array.
+				 */
+				insertAt(params: any): void;
+
+				/**
+				 * Removes a child from the popover.
+				 */
+				remove(view: any): void;
+
+				/**
+				 * Replaces a view at the specified position in the [children](Titanium.UI.View.children) array.
+				 */
+				replaceAt(params: any): void;
+
+				/**
+				 * Displays the popover.
+				 */
+				show(params: PopoverParams): void;
+
+				/**
+				 * Starts a batch update of this view's layout properties.
+				 */
+				startLayout(): void;
+
+				/**
+				 * Performs a batch update of all supplied layout properties and schedules a layout pass after
+				 * they have been updated.
+				 */
+				updateLayout(params: any): void;
+
+				/**
+				 * Returns the matching view of a given view ID.
+				 */
+				getViewById(id: string): Titanium.UI.View;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.Popover.backgroundColor> property.
+				 */
+				getBackgroundColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.Popover.backgroundColor> property.
+				 */
+				setBackgroundColor(backgroundColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.Popover.height> property.
+				 */
+				getHeight(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.Popover.height> property.
+				 */
+				setHeight(height: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.Popover.height> property.
+				 */
+				setHeight(height: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.Popover.width> property.
+				 */
+				getWidth(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.Popover.width> property.
+				 */
+				setWidth(width: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.Popover.width> property.
+				 */
+				setWidth(width: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.Popover.arrowDirection> property.
+				 */
+				getArrowDirection(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.Popover.arrowDirection> property.
+				 */
+				setArrowDirection(arrowDirection: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.Popover.contentView> property.
+				 */
+				getContentView(): Titanium.UI.View;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.Popover.contentView> property.
+				 */
+				setContentView(contentView: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.Popover.leftNavButton> property.
+				 */
+				getLeftNavButton(): any;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.Popover.leftNavButton> property.
+				 */
+				setLeftNavButton(leftNavButton: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.Popover.passthroughViews> property.
+				 */
+				getPassthroughViews(): Titanium.UI.View[];
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.Popover.passthroughViews> property.
+				 */
+				setPassthroughViews(passthroughViews: any[]): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.Popover.rightNavButton> property.
+				 */
+				getRightNavButton(): any;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.Popover.rightNavButton> property.
+				 */
+				setRightNavButton(rightNavButton: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.Popover.title> property.
+				 */
+				getTitle(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.Popover.title> property.
+				 */
+				setTitle(title: string): void;
+
 			}
-			export interface UserNotificationCategory extends Ti.Proxy {
-				actionsForDefaultContext : Array<Ti.App.iOS.UserNotificationAction>;
-				actionsForMinimalContext : Array<Ti.App.iOS.UserNotificationAction>;
-				identifier : string;
-				getActionsForDefaultContext () : Array<Ti.App.iOS.UserNotificationAction>;
-				getActionsForMinimalContext () : Array<Ti.App.iOS.UserNotificationAction>;
-				getIdentifier () : string;
-			}
-			export interface BackgroundService extends Ti.Proxy {
-				url : string;
-				getUrl () : string;
-				stop () : void;
-				unregister () : void;
+
+			/**
+			 * A SplitWindow is a window that manages the presentation of two side-by-side view
+			 * controllers.
+			 */
+			interface SplitWindow extends Titanium.Proxy {
+				/**
+				 * Whether the view should be "hidden" from (i.e., ignored by) the accessibility service.
+				 */
+				accessibilityHidden: boolean;
+
+				/**
+				 * Briefly describes what performing an action (such as a click) on the view will do.
+				 */
+				accessibilityHint: string;
+
+				/**
+				 * A succint label identifying the view for the device's accessibility service.
+				 */
+				accessibilityLabel: string;
+
+				/**
+				 * A string describing the value (if any) of the view for the device's accessibility service.
+				 */
+				accessibilityValue: string;
+
+				/**
+				 * Coordinate of the view about which to pivot an animation.
+				 */
+				anchorPoint: Point;
+
+				/**
+				 * Current position of the view during an animation.
+				 */
+				readonly animatedCenter: Point;
+
+				/**
+				 * Background color of the window, as a color name or hex triplet.
+				 */
+				backgroundColor: string;
+
+				/**
+				 * A background gradient for the view.
+				 */
+				backgroundGradient: Gradient;
+
+				/**
+				 * Background image for the view, specified as a local file path or URL.
+				 */
+				backgroundImage: string;
+
+				/**
+				 * Determines whether to tile a background across a view.
+				 */
+				backgroundRepeat: boolean;
+
+				/**
+				 * Size of the left end cap.
+				 */
+				backgroundLeftCap: number;
+
+				/**
+				 * Size of the top end cap.
+				 */
+				backgroundTopCap: number;
+
+				/**
+				 * Border color of the view, as a color name or hex triplet.
+				 */
+				borderColor: string;
+
+				/**
+				 * Radius for the rounded corners of the view's border.
+				 */
+				borderRadius: number;
+
+				/**
+				 * Border width of the view.
+				 */
+				borderWidth: number;
+
+				/**
+				 * Window's bottom position, in platform-specific units.
+				 */
+				bottom: number | string;
+
+				/**
+				 * View's center position, in the parent view's coordinates.
+				 */
+				center: Point;
+
+				/**
+				 * Array of this view's child views.
+				 */
+				readonly children: Titanium.UI.View[];
+
+				/**
+				 * View's clipping behavior.
+				 */
+				clipMode: number;
+
+				/**
+				 * View height, in platform-specific units.
+				 */
+				height: number | string;
+
+				/**
+				 * Window's left position, in platform-specific units.
+				 */
+				left: number | string;
+
+				/**
+				 * Specifies how the view positions its children.
+				 * One of: 'composite', 'vertical', or 'horizontal'.
+				 */
+				layout: string;
+
+				/**
+				 * The opacity from 0.0-1.0.
+				 */
+				opacity: number;
+
+				/**
+				 * Background color of the wrapper view when this view is used as either <Titanium.UI.ListView.pullView> or <Titanium.UI.TableView.headerPullView>.
+				 */
+				pullBackgroundColor: string;
+
+				/**
+				 * Window's right position, in platform-specific units.
+				 */
+				right: number | string;
+
+				/**
+				 * The bounding box of the view relative to its parent, in system units.
+				 */
+				readonly rect: Dimension;
+
+				/**
+				 * The size of the view in system units.
+				 */
+				readonly size: Dimension;
+
+				/**
+				 * The view's tintColor. This property is applicable on iOS 7 and greater.
+				 */
+				tintColor: string;
+
+				/**
+				 * Window's top position, in platform-specific units.
+				 */
+				top: number | string;
+
+				/**
+				 * Determines whether view should receive touch events.
+				 */
+				touchEnabled: boolean;
+
+				/**
+				 * Transformation matrix to apply to the view.
+				 */
+				transform: Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
+
+				/**
+				 * Determines the blur radius used to create the shadow.
+				 */
+				viewShadowRadius: number;
+
+				/**
+				 * Determines the color of the shadow.
+				 */
+				viewShadowColor: string;
+
+				/**
+				 * Determines the offset for the shadow of the view.
+				 */
+				viewShadowOffset: Point;
+
+				/**
+				 * Determines whether the view is visible.
+				 */
+				visible: boolean;
+
+				/**
+				 * View's width, in platform-specific units.
+				 */
+				width: number | string;
+
+				/**
+				 * Determines whether the layout has wrapping behavior.
+				 */
+				horizontalWrap: boolean;
+
+				/**
+				 * Z-index stack order position, relative to other sibling views.
+				 */
+				zIndex: number;
+
+				/**
+				 * Title for the back button. This is only valid when the window is a child of a tab.
+				 */
+				backButtonTitle: string;
+
+				/**
+				 * The image to show as the back button. This is only valid when the window is a child of a tab.
+				 */
+				backButtonTitleImage: string | Titanium.Blob;
+
+				/**
+				 * Background color for the nav bar, as a color name or hex triplet.
+				 */
+				barColor: string;
+
+				/**
+				 * Background image for the nav bar, specified as a URL to a local image.
+				 */
+				barImage: string;
+
+				/**
+				 * An array of supported values specified using the EXTEND_EDGE constants in <Titanium.UI>. Valid on iOS 7 and greater.
+				 */
+				extendEdges: number[];
+
+				/**
+				 * Specifies if the edges should extend beyond opaque bars (navigation bar, tab bar, toolbar). Valid on iOS 7 and greater.
+				 */
+				includeOpaqueBars: boolean;
+
+				/**
+				 * Specifies whether or not the view controller should automatically adjust its scroll view insets. Valid on iOS 7 and greater.
+				 */
+				autoAdjustScrollViewInsets: boolean;
+
+				/**
+				 * Specifies whether the content (subviews) of the window  will render inside the safe-area or not.
+				 * Only used in iOS 11.0 and later.
+				 */
+				extendSafeArea: boolean;
+
+				/**
+				 * Boolean value indicating if the window is fullscreen.
+				 */
+				fullscreen: boolean;
+
+				/**
+				 * Set this to true to hide the shadow image of the navigation bar.
+				 */
+				hideShadow: boolean;
+
+				/**
+				 * Set this to true to hide the navigation bar on swipe.
+				 */
+				hidesBarsOnSwipe: boolean;
+
+				/**
+				 * Set this to true to hide the navigation bar on tap.
+				 */
+				hidesBarsOnTap: boolean;
+
+				/**
+				 * Set this to true to hide the navigation bar when the keyboard appears.
+				 */
+				hidesBarsWhenKeyboardAppears: boolean;
+
+				/**
+				 * A Boolean value indicating whether the title should be displayed in a large format.
+				 */
+				largeTitleEnabled: string;
+
+				/**
+				 * The mode to use when displaying the title of the navigation bar.
+				 */
+				largeTitleDisplayMode: number;
+
+				/**
+				 * View to show in the left nav bar area.
+				 */
+				leftNavButton: Titanium.UI.View;
+
+				/**
+				 * An Array of views to show in the left nav bar area.
+				 */
+				leftNavButtons: Titanium.UI.View[];
+
+				/**
+				 * Indicates to open a modal window or not.
+				 */
+				modal: boolean;
+
+				/**
+				 * Hides the navigation bar (`true`) or shows the navigation bar (`false`).
+				 */
+				navBarHidden: boolean;
+
+				/**
+				 * The tintColor to apply to the navigation bar. This property is applicable on iOS 7 and greater.
+				 */
+				navTintColor: string;
+
+				/**
+				 * Array of supported orientation modes, specified using the orientation
+				 * constants defined in <Titanium.UI>.
+				 */
+				orientationModes: number[];
+
+				/**
+				 * Current orientation of the window.
+				 */
+				readonly orientation: number;
+
+				/**
+				 * View to show in the right nav bar area.
+				 */
+				rightNavButton: Titanium.UI.View;
+
+				/**
+				 * An Array of views to show in the right nav bar area.
+				 */
+				rightNavButtons: Titanium.UI.View[];
+
+				/**
+				 * Shadow image for the navigation bar, specified as a URL to a local image..
+				 */
+				shadowImage: string;
+
+				/**
+				 * The status bar style associated with this window.
+				 */
+				statusBarStyle: number;
+
+				/**
+				 * Boolean value indicating if the tab bar should be hidden.
+				 */
+				tabBarHidden: boolean;
+
+				/**
+				 * Title of the window.
+				 */
+				title: string;
+
+				/**
+				 * Title text attributes of the window.
+				 */
+				titleAttributes: titleAttributesParams;
+
+				/**
+				 * View to show in the title area of the nav bar.
+				 */
+				titleControl: Titanium.UI.View;
+
+				/**
+				 * Image to show in the title area of the nav bar, specified as a local file path or URL.
+				 */
+				titleImage: string;
+
+				/**
+				 * Title prompt for the window.
+				 */
+				titlePrompt: string;
+
+				/**
+				 * Key identifying a string from the locale file to use for the window title.
+				 */
+				titleid: string;
+
+				/**
+				 * Key identifying a string from the locale file to use for the window title prompt.
+				 */
+				titlepromptid: string;
+
+				/**
+				 * Array of button objects to show in the window's toolbar.
+				 */
+				toolbar: any[];
+
+				/**
+				 * Boolean value indicating if the nav bar is translucent.
+				 */
+				translucent: boolean;
+
+				/**
+				 * Loads a JavaScript file from a local URL.
+				 */
+				url: string;
+
+				/**
+				 * View for the detail view section of the SplitWindow.
+				 */
+				detailView: Titanium.UI.View;
+
+				/**
+				 * View for the master view section of the SplitWindow.
+				 */
+				masterView: Titanium.UI.View;
+
+				/**
+				 * Determines whether to show the master view in portrait orientation.
+				 */
+				showMasterInPortrait: boolean;
+
+				/**
+				 * Adds a child to this view's hierarchy.
+				 */
+				add(view: any): void;
+
+				/**
+				 * Adds a child to this view's hierarchy.
+				 */
+				add(view: any[]): void;
+
+				/**
+				 * Animates this view.
+				 */
+				animate(animation: any, callback?: (param0: any) => any): void;
+
+				/**
+				 * Finishes a batch update of the View's layout properties and schedules a layout pass of the
+				 * view tree.
+				 */
+				finishLayout(): void;
+
+				/**
+				 * Hides this view.
+				 */
+				hide(options?: AnimationOption): void;
+
+				/**
+				 * Inserts a view at the specified position in the [children](Titanium.UI.View.children) array.
+				 */
+				insertAt(params: any): void;
+
+				/**
+				 * Removes a child view from this view's hierarchy.
+				 */
+				remove(view: any): void;
+
+				/**
+				 * Replaces a view at the specified position in the [children](Titanium.UI.View.children) array.
+				 */
+				replaceAt(params: any): void;
+
+				/**
+				 * Makes this view visible.
+				 */
+				show(options?: AnimationOption): void;
+
+				/**
+				 * Starts a batch update of this view's layout properties.
+				 */
+				startLayout(): void;
+
+				/**
+				 * Returns an image of the rendered view, as a Blob.
+				 */
+				toImage(callback?: (param0: Titanium.Blob) => any, honorScaleFactor?: boolean): Titanium.Blob;
+
+				/**
+				 * Performs a batch update of all supplied layout properties and schedules a layout pass after
+				 * they have been updated.
+				 */
+				updateLayout(params: any): void;
+
+				/**
+				 * Translates a point from this view's coordinate system to another view's coordinate system.
+				 */
+				convertPointToView(point: Point, destinationView: any): Point;
+
+				/**
+				 * Returns the matching view of a given view ID.
+				 */
+				getViewById(id: string): Titanium.UI.View;
+
+				/**
+				 * Closes the window.
+				 */
+				close(params?: any): void;
+
+				/**
+				 * Hides the navigation bar.
+				 */
+				hideNavBar(options?: any): void;
+
+				/**
+				 * Hides the tab bar. Must be called before opening the window.
+				 */
+				hideTabBar(): void;
+
+				/**
+				 * Opens the window.
+				 */
+				open(params?: openWindowParams): void;
+
+				/**
+				 * Sets the array of items to show in the window's toolbar.
+				 */
+				setToolbar(items: ReadonlyArray<any>, params?: windowToolbarParam): void;
+
+				/**
+				 * Makes the navigation bar visible.
+				 */
+				showNavBar(options?: any): void;
+
+				/**
+				 * Makes the bottom toolbar visible.
+				 */
+				showToolbar(options?: any): void;
+
+				/**
+				 * Makes the bottom toolbar invisible.
+				 */
+				hideToolbar(options?: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.accessibilityHidden> property.
+				 */
+				getAccessibilityHidden(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.accessibilityHidden> property.
+				 */
+				setAccessibilityHidden(accessibilityHidden: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.accessibilityHint> property.
+				 */
+				getAccessibilityHint(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.accessibilityHint> property.
+				 */
+				setAccessibilityHint(accessibilityHint: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.accessibilityLabel> property.
+				 */
+				getAccessibilityLabel(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.accessibilityLabel> property.
+				 */
+				setAccessibilityLabel(accessibilityLabel: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.accessibilityValue> property.
+				 */
+				getAccessibilityValue(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.accessibilityValue> property.
+				 */
+				setAccessibilityValue(accessibilityValue: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.anchorPoint> property.
+				 */
+				getAnchorPoint(): Point;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.anchorPoint> property.
+				 */
+				setAnchorPoint(anchorPoint: Point): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.animatedCenter> property.
+				 */
+				getAnimatedCenter(): Point;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.backgroundColor> property.
+				 */
+				getBackgroundColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.backgroundColor> property.
+				 */
+				setBackgroundColor(backgroundColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.backgroundGradient> property.
+				 */
+				getBackgroundGradient(): Gradient;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.backgroundGradient> property.
+				 */
+				setBackgroundGradient(backgroundGradient: Gradient): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.backgroundImage> property.
+				 */
+				getBackgroundImage(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.backgroundImage> property.
+				 */
+				setBackgroundImage(backgroundImage: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.backgroundRepeat> property.
+				 */
+				getBackgroundRepeat(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.backgroundRepeat> property.
+				 */
+				setBackgroundRepeat(backgroundRepeat: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.backgroundLeftCap> property.
+				 */
+				getBackgroundLeftCap(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.backgroundLeftCap> property.
+				 */
+				setBackgroundLeftCap(backgroundLeftCap: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.backgroundTopCap> property.
+				 */
+				getBackgroundTopCap(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.backgroundTopCap> property.
+				 */
+				setBackgroundTopCap(backgroundTopCap: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.borderColor> property.
+				 */
+				getBorderColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.borderColor> property.
+				 */
+				setBorderColor(borderColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.borderRadius> property.
+				 */
+				getBorderRadius(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.borderRadius> property.
+				 */
+				setBorderRadius(borderRadius: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.borderWidth> property.
+				 */
+				getBorderWidth(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.borderWidth> property.
+				 */
+				setBorderWidth(borderWidth: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.bottom> property.
+				 */
+				getBottom(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.bottom> property.
+				 */
+				setBottom(bottom: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.bottom> property.
+				 */
+				setBottom(bottom: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.center> property.
+				 */
+				getCenter(): Point;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.center> property.
+				 */
+				setCenter(center: Point): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.children> property.
+				 */
+				getChildren(): Titanium.UI.View[];
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.clipMode> property.
+				 */
+				getClipMode(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.clipMode> property.
+				 */
+				setClipMode(clipMode: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.height> property.
+				 */
+				getHeight(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.height> property.
+				 */
+				setHeight(height: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.height> property.
+				 */
+				setHeight(height: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.left> property.
+				 */
+				getLeft(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.left> property.
+				 */
+				setLeft(left: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.left> property.
+				 */
+				setLeft(left: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.layout> property.
+				 */
+				getLayout(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.layout> property.
+				 */
+				setLayout(layout: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.opacity> property.
+				 */
+				getOpacity(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.opacity> property.
+				 */
+				setOpacity(opacity: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.pullBackgroundColor> property.
+				 */
+				getPullBackgroundColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.pullBackgroundColor> property.
+				 */
+				setPullBackgroundColor(pullBackgroundColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.right> property.
+				 */
+				getRight(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.right> property.
+				 */
+				setRight(right: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.right> property.
+				 */
+				setRight(right: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.rect> property.
+				 */
+				getRect(): Dimension;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.size> property.
+				 */
+				getSize(): Dimension;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.tintColor> property.
+				 */
+				getTintColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.tintColor> property.
+				 */
+				setTintColor(tintColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.top> property.
+				 */
+				getTop(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.top> property.
+				 */
+				setTop(top: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.top> property.
+				 */
+				setTop(top: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.touchEnabled> property.
+				 */
+				getTouchEnabled(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.touchEnabled> property.
+				 */
+				setTouchEnabled(touchEnabled: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.transform> property.
+				 */
+				getTransform(): Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.transform> property.
+				 */
+				setTransform(transform: Titanium.UI.Matrix2D): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.transform> property.
+				 */
+				setTransform(transform: Titanium.UI.Matrix3D): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.viewShadowRadius> property.
+				 */
+				getViewShadowRadius(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.viewShadowRadius> property.
+				 */
+				setViewShadowRadius(viewShadowRadius: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.viewShadowColor> property.
+				 */
+				getViewShadowColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.viewShadowColor> property.
+				 */
+				setViewShadowColor(viewShadowColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.viewShadowOffset> property.
+				 */
+				getViewShadowOffset(): Point;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.viewShadowOffset> property.
+				 */
+				setViewShadowOffset(viewShadowOffset: Point): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.visible> property.
+				 */
+				getVisible(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.visible> property.
+				 */
+				setVisible(visible: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.width> property.
+				 */
+				getWidth(): number | string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.width> property.
+				 */
+				setWidth(width: number): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.width> property.
+				 */
+				setWidth(width: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.horizontalWrap> property.
+				 */
+				getHorizontalWrap(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.horizontalWrap> property.
+				 */
+				setHorizontalWrap(horizontalWrap: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.zIndex> property.
+				 */
+				getZIndex(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.zIndex> property.
+				 */
+				setZIndex(zIndex: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.backButtonTitle> property.
+				 */
+				getBackButtonTitle(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.backButtonTitle> property.
+				 */
+				setBackButtonTitle(backButtonTitle: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.backButtonTitleImage> property.
+				 */
+				getBackButtonTitleImage(): string | Titanium.Blob;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.backButtonTitleImage> property.
+				 */
+				setBackButtonTitleImage(backButtonTitleImage: string): void;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.backButtonTitleImage> property.
+				 */
+				setBackButtonTitleImage(backButtonTitleImage: Titanium.Blob): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.barColor> property.
+				 */
+				getBarColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.barColor> property.
+				 */
+				setBarColor(barColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.barImage> property.
+				 */
+				getBarImage(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.barImage> property.
+				 */
+				setBarImage(barImage: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.extendEdges> property.
+				 */
+				getExtendEdges(): number[];
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.extendEdges> property.
+				 */
+				setExtendEdges(extendEdges: ReadonlyArray<number>): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.includeOpaqueBars> property.
+				 */
+				getIncludeOpaqueBars(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.includeOpaqueBars> property.
+				 */
+				setIncludeOpaqueBars(includeOpaqueBars: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.autoAdjustScrollViewInsets> property.
+				 */
+				getAutoAdjustScrollViewInsets(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.autoAdjustScrollViewInsets> property.
+				 */
+				setAutoAdjustScrollViewInsets(autoAdjustScrollViewInsets: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.extendSafeArea> property.
+				 */
+				getExtendSafeArea(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.extendSafeArea> property.
+				 */
+				setExtendSafeArea(extendSafeArea: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.fullscreen> property.
+				 */
+				getFullscreen(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.fullscreen> property.
+				 */
+				setFullscreen(fullscreen: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.hideShadow> property.
+				 */
+				getHideShadow(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.hideShadow> property.
+				 */
+				setHideShadow(hideShadow: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.hidesBarsOnSwipe> property.
+				 */
+				getHidesBarsOnSwipe(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.hidesBarsOnSwipe> property.
+				 */
+				setHidesBarsOnSwipe(hidesBarsOnSwipe: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.hidesBarsOnTap> property.
+				 */
+				getHidesBarsOnTap(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.hidesBarsOnTap> property.
+				 */
+				setHidesBarsOnTap(hidesBarsOnTap: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.hidesBarsWhenKeyboardAppears> property.
+				 */
+				getHidesBarsWhenKeyboardAppears(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.hidesBarsWhenKeyboardAppears> property.
+				 */
+				setHidesBarsWhenKeyboardAppears(hidesBarsWhenKeyboardAppears: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.largeTitleEnabled> property.
+				 */
+				getLargeTitleEnabled(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.largeTitleEnabled> property.
+				 */
+				setLargeTitleEnabled(largeTitleEnabled: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.largeTitleDisplayMode> property.
+				 */
+				getLargeTitleDisplayMode(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.largeTitleDisplayMode> property.
+				 */
+				setLargeTitleDisplayMode(largeTitleDisplayMode: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.leftNavButton> property.
+				 */
+				getLeftNavButton(): Titanium.UI.View;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.leftNavButton> property.
+				 */
+				setLeftNavButton(leftNavButton: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.leftNavButtons> property.
+				 */
+				getLeftNavButtons(): Titanium.UI.View[];
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.leftNavButtons> property.
+				 */
+				setLeftNavButtons(leftNavButtons: any[]): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.modal> property.
+				 */
+				getModal(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.modal> property.
+				 */
+				setModal(modal: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.navBarHidden> property.
+				 */
+				getNavBarHidden(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.navBarHidden> property.
+				 */
+				setNavBarHidden(navBarHidden: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.navTintColor> property.
+				 */
+				getNavTintColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.navTintColor> property.
+				 */
+				setNavTintColor(navTintColor: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.orientationModes> property.
+				 */
+				getOrientationModes(): number[];
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.orientationModes> property.
+				 */
+				setOrientationModes(orientationModes: ReadonlyArray<number>): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.orientation> property.
+				 */
+				getOrientation(): number;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.rightNavButton> property.
+				 */
+				getRightNavButton(): Titanium.UI.View;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.rightNavButton> property.
+				 */
+				setRightNavButton(rightNavButton: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.rightNavButtons> property.
+				 */
+				getRightNavButtons(): Titanium.UI.View[];
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.rightNavButtons> property.
+				 */
+				setRightNavButtons(rightNavButtons: any[]): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.shadowImage> property.
+				 */
+				getShadowImage(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.shadowImage> property.
+				 */
+				setShadowImage(shadowImage: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.statusBarStyle> property.
+				 */
+				getStatusBarStyle(): number;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.statusBarStyle> property.
+				 */
+				setStatusBarStyle(statusBarStyle: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.tabBarHidden> property.
+				 */
+				getTabBarHidden(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.tabBarHidden> property.
+				 */
+				setTabBarHidden(tabBarHidden: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.title> property.
+				 */
+				getTitle(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.title> property.
+				 */
+				setTitle(title: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.titleAttributes> property.
+				 */
+				getTitleAttributes(): titleAttributesParams;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.titleAttributes> property.
+				 */
+				setTitleAttributes(titleAttributes: titleAttributesParams): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.titleControl> property.
+				 */
+				getTitleControl(): Titanium.UI.View;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.titleControl> property.
+				 */
+				setTitleControl(titleControl: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.titleImage> property.
+				 */
+				getTitleImage(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.titleImage> property.
+				 */
+				setTitleImage(titleImage: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.titlePrompt> property.
+				 */
+				getTitlePrompt(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.titlePrompt> property.
+				 */
+				setTitlePrompt(titlePrompt: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.titleid> property.
+				 */
+				getTitleid(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.titleid> property.
+				 */
+				setTitleid(titleid: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.titlepromptid> property.
+				 */
+				getTitlepromptid(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.titlepromptid> property.
+				 */
+				setTitlepromptid(titlepromptid: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.toolbar> property.
+				 */
+				getToolbar(): any[];
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.toolbar> property.
+				 */
+				setToolbar(toolbar: ReadonlyArray<any>): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.translucent> property.
+				 */
+				getTranslucent(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.translucent> property.
+				 */
+				setTranslucent(translucent: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.url> property.
+				 */
+				getUrl(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.url> property.
+				 */
+				setUrl(url: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.detailView> property.
+				 */
+				getDetailView(): Titanium.UI.View;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.detailView> property.
+				 */
+				setDetailView(detailView: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.masterView> property.
+				 */
+				getMasterView(): Titanium.UI.View;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.masterView> property.
+				 */
+				setMasterView(masterView: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.showMasterInPortrait> property.
+				 */
+				getShowMasterInPortrait(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.showMasterInPortrait> property.
+				 */
+				setShowMasterInPortrait(showMasterInPortrait: boolean): void;
+
 			}
+
 		}
-		export interface Properties  {
-			getBool (property: string, _default?: boolean) : boolean;
-			getDouble (property: string, _default?: number) : number;
-			getInt (property: string, _default?: number) : number;
-			getList (property: string, _default?: Array<Object>) : Array<Object>;
-			getObject (property: string, _default?: any) : any;
-			getString (property: string, _default?: string) : string;
-			hasProperty (property: string) : boolean;
-			listProperties () : Array<Object>;
-			removeProperty (property: string) : void;
-			setBool (property: string, value: boolean) : void;
-			setDouble (property: string, value: number) : void;
-			setInt (property: string, value: number) : void;
-			setList (property: string, value: Array<Object>) : void;
-			setObject (property: string, value: any) : void;
-			setString (property: string, value: string) : void;
-		}
-		export interface Tizen  {
-			categories : Array<String>;
-			iconPath : string;
-			id : string;
-			installDate : Date;
-			name : string;
-			show : boolean;
-			size : number;
-			exit () : void;
-			getCategories () : Array<String>;
-			getIconPath () : string;
-			getId () : string;
-			getInstallDate () : Date;
-			getName () : string;
-			getShow () : boolean;
-			getSize () : number;
-			hide () : void;
+
+		/**
+		 * The iPhone/iPad-specific UI capabilities.  All properties, methods and events in this namespace
+		 * will only work on Apple iOS systems.
+		 */
+		namespace iPhone {
+			/**
+			 * Indicates if the proxy will bubble an event to its parent.
+			 */
+			let bubbleParent: boolean;
+
+			/**
+			 * The name of the API that this proxy corresponds to.
+			 */
+			const apiName: string;
+
+			/**
+			 * View presented with the same style as its parent window.
+			 */
+			const MODAL_PRESENTATION_CURRENT_CONTEXT: number;
+
+			/**
+			 * Window width and height are smaller than those of the screen and the view is centered on
+			 * the screen.
+			 */
+			const MODAL_PRESENTATION_FORMSHEET: number;
+
+			/**
+			 * Window covers the screen.
+			 */
+			const MODAL_PRESENTATION_FULLSCREEN: number;
+
+			/**
+			 * Window height is the height of the screen and width is equal to screen width in a portrait
+			 * orientation.
+			 */
+			const MODAL_PRESENTATION_PAGESHEET: number;
+
+			/**
+			 * When the window is presented, its view slides up from the bottom of the screen. On dismissal,
+			 * the view slides back down (default.)
+			 */
+			const MODAL_TRANSITION_STYLE_COVER_VERTICAL: number;
+
+			/**
+			 * When the window is presented, the current view fades out while the new view fades in at the
+			 * same time. On dismissal, a similar type of cross-fade is used to return to the original view.
+			 */
+			const MODAL_TRANSITION_STYLE_CROSS_DISSOLVE: number;
+
+			/**
+			 * When the window is presented, the current view initiates a horizontal 3D flip from
+			 * right-to-left, resulting in the revealing of the new view as if it were on the back of the
+			 * previous view. On dismissal, the flip occurs from left-to-right, returning to the original
+			 * view.
+			 */
+			const MODAL_TRANSITION_STYLE_FLIP_HORIZONTAL: number;
+
+			/**
+			 * When the window is presented, one corner of the current view curls up to reveal the modal
+			 * view underneath. On dismissal, the curled up page unfurls itself back on top of the modal
+			 * view.
+			 */
+			const MODAL_TRANSITION_STYLE_PARTIAL_CURL: number;
+
+			/**
+			 * Value of the badge for the application's springboard icon.
+			 */
+			let appBadge: number;
+
+			/**
+			 * Determines whether the shake to edit system-wide capability is enabled.
+			 */
+			let appSupportsShakeToEdit: boolean;
+
+			/**
+			 * Determines whether the status bar is hidden.
+			 */
+			const statusBarHidden: boolean;
+
+			/**
+			 * Determines the status bar color style.
+			 */
+			const statusBarStyle: number;
+
+			/**
+			 * Adds the specified callback as an event listener for the named event.
+			 */
+			function addEventListener(name: string, callback: (param0: any) => any): void;
+
+			/**
+			 * Removes the specified callback as an event listener for the named event.
+			 */
+			function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+			/**
+			 * Fires a synthesized event to any registered listeners.
+			 */
+			function fireEvent(name: string, event: any): void;
+
+			/**
+			 * Applies the properties to the proxy.
+			 */
+			function applyProperties(props: any): void;
+
+			/**
+			 * Hides the status bar.
+			 */
+			function hideStatusBar(params?: hideStatusBarParams): void;
+
+			/**
+			 * Shows the status bar.
+			 */
+			function showStatusBar(params?: showStatusBarParams): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.iPhone.bubbleParent> property.
+			 */
+			function getBubbleParent(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.iPhone.bubbleParent> property.
+			 */
+			function setBubbleParent(bubbleParent: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.iPhone.apiName> property.
+			 */
+			function getApiName(): string;
+
+			/**
+			 * Gets the value of the <Titanium.UI.iPhone.appBadge> property.
+			 */
+			function getAppBadge(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.iPhone.appBadge> property.
+			 */
+			function setAppBadge(appBadge: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.iPhone.appSupportsShakeToEdit> property.
+			 */
+			function getAppSupportsShakeToEdit(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.iPhone.appSupportsShakeToEdit> property.
+			 */
+			function setAppSupportsShakeToEdit(appSupportsShakeToEdit: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.iPhone.statusBarHidden> property.
+			 */
+			function getStatusBarHidden(): boolean;
+
+			/**
+			 * Gets the value of the <Titanium.UI.iPhone.statusBarStyle> property.
+			 */
+			function getStatusBarStyle(): number;
+
+			/**
+			 * A set of constants for the style that can be used for the `selectionStyle` property of a
+			 * ListItem, which is set in the `properties` dictionary of either the <ListDataItem> or
+			 * <ItemTemplate>.
+			 */
+			interface ListViewCellSelectionStyle extends Titanium.Proxy {
+				/**
+				 * The cell when selected has a blue background. This is the default value.
+				 */
+				readonly BLUE: number;
+
+				/**
+				 * The cell when selected has a gray background.
+				 */
+				readonly GRAY: number;
+
+				/**
+				 * The cell has no distinct style for when it is selected.
+				 */
+				readonly NONE: number;
+
+			}
+
+			/**
+			 * A set of constants for the position value that can be used for the `position` property of
+			 * <ListViewAnimationProperties> when invoking the ListView's `scrollToItem`, `appendSection`,
+			 * `deleteSectionAt`, `insertSectionAt` and `replaceSectionAt` methods.
+			 */
+			interface ListViewScrollPosition extends Titanium.Proxy {
+				/**
+				 * The list view scrolls the row of interest to the bottom of the visible list view.
+				 */
+				readonly BOTTOM: number;
+
+				/**
+				 * The list view scrolls the row of interest to the middle of the list table view.
+				 */
+				readonly MIDDLE: number;
+
+				/**
+				 * The table view scrolls the row of interest to be fully visible with a minimal movement.
+				 * If the row is already fully visible, no scrolling occurs. For example, if the row is above the
+				 * visible area, the behavior is identical to that specified by `TOP`. This is the default.
+				 */
+				readonly NONE: number;
+
+				/**
+				 * The list view scrolls the row of interest to the top of the visible list view.
+				 */
+				readonly TOP: number;
+
+			}
+
+			/**
+			 * A set of constants for the style that can be used for the `style` property of
+			 * <Titanium.UI.ListView>.
+			 */
+			interface ListViewStyle extends Titanium.Proxy {
+				/**
+				 * A list view whose sections present distinct groups of rows. The section headers and footers
+				 * do not float.
+				 */
+				readonly GROUPED: number;
+
+				/**
+				 * A plain list view. Any section headers or footers are displayed as inline separators and
+				 * float when the list view is scrolled.
+				 */
+				readonly PLAIN: number;
+
+			}
+
+
+			/**
+			 * A set of constants for the styles available for <Titanium.UI.ActivityIndicator> objects.
+			 */
+			namespace ActivityIndicatorStyle {
+				/**
+				 * Indicates if the proxy will bubble an event to its parent.
+				 */
+				let bubbleParent: boolean;
+
+				/**
+				 * The name of the API that this proxy corresponds to.
+				 */
+				const apiName: string;
+
+				/**
+				 * Large white spinning indicator.
+				 */
+				const BIG: number;
+
+				/**
+				 * Small gray spinning indicator.
+				 */
+				const DARK: number;
+
+				/**
+				 * Small white spinning indicator (default.)
+				 */
+				const PLAIN: number;
+
+				/**
+				 * Adds the specified callback as an event listener for the named event.
+				 */
+				function addEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Removes the specified callback as an event listener for the named event.
+				 */
+				function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Fires a synthesized event to any registered listeners.
+				 */
+				function fireEvent(name: string, event: any): void;
+
+				/**
+				 * Applies the properties to the proxy.
+				 */
+				function applyProperties(props: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPhone.ActivityIndicatorStyle.bubbleParent> property.
+				 */
+				function getBubbleParent(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPhone.ActivityIndicatorStyle.bubbleParent> property.
+				 */
+				function setBubbleParent(bubbleParent: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPhone.ActivityIndicatorStyle.apiName> property.
+				 */
+				function getApiName(): string;
+
+			}
+
+			/**
+			 * A set of constants for the style that can be used for the `style` property of
+			 * <Titanium.UI.AlertDialog>.
+			 */
+			namespace AlertDialogStyle {
+				/**
+				 * Indicates if the proxy will bubble an event to its parent.
+				 */
+				let bubbleParent: boolean;
+
+				/**
+				 * The name of the API that this proxy corresponds to.
+				 */
+				const apiName: string;
+
+				/**
+				 * A standard alert dialog. This is the default value.
+				 */
+				const DEFAULT: number;
+
+				/**
+				 * An alert dialog that allows the user to enter text.
+				 */
+				const PLAIN_TEXT_INPUT: number;
+
+				/**
+				 * An alert dialog that allows the user to enter text. The text field is obscured.
+				 */
+				const SECURE_TEXT_INPUT: number;
+
+				/**
+				 * An alert dialog that allows the user to enter login identifier and password.
+				 */
+				const LOGIN_AND_PASSWORD_INPUT: number;
+
+				/**
+				 * Adds the specified callback as an event listener for the named event.
+				 */
+				function addEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Removes the specified callback as an event listener for the named event.
+				 */
+				function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Fires a synthesized event to any registered listeners.
+				 */
+				function fireEvent(name: string, event: any): void;
+
+				/**
+				 * Applies the properties to the proxy.
+				 */
+				function applyProperties(props: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPhone.AlertDialogStyle.bubbleParent> property.
+				 */
+				function getBubbleParent(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPhone.AlertDialogStyle.bubbleParent> property.
+				 */
+				function setBubbleParent(bubbleParent: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPhone.AlertDialogStyle.apiName> property.
+				 */
+				function getApiName(): string;
+
+			}
+
+			/**
+			 * A set of constants for the animation styles used for view transitions.
+			 */
+			namespace AnimationStyle {
+				/**
+				 * Indicates if the proxy will bubble an event to its parent.
+				 */
+				let bubbleParent: boolean;
+
+				/**
+				 * The name of the API that this proxy corresponds to.
+				 */
+				const apiName: string;
+
+				/**
+				 * Curl downwards during a transition animation.
+				 */
+				const CURL_DOWN: number;
+
+				/**
+				 * Curl upwards during a transition animation.
+				 */
+				const CURL_UP: number;
+
+				/**
+				 * Flip from left to right during a transition animation.
+				 */
+				const FLIP_FROM_LEFT: number;
+
+				/**
+				 * Flip from right to left during a transition animation.
+				 */
+				const FLIP_FROM_RIGHT: number;
+
+				/**
+				 * No animation.
+				 */
+				const NONE: number;
+
+				/**
+				 * Adds the specified callback as an event listener for the named event.
+				 */
+				function addEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Removes the specified callback as an event listener for the named event.
+				 */
+				function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Fires a synthesized event to any registered listeners.
+				 */
+				function fireEvent(name: string, event: any): void;
+
+				/**
+				 * Applies the properties to the proxy.
+				 */
+				function applyProperties(props: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPhone.AnimationStyle.bubbleParent> property.
+				 */
+				function getBubbleParent(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPhone.AnimationStyle.bubbleParent> property.
+				 */
+				function setBubbleParent(bubbleParent: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPhone.AnimationStyle.apiName> property.
+				 */
+				function getApiName(): string;
+
+			}
+
+			/**
+			 * A set of constants for the style that can be used for the `separatorStyle` property of
+			 * <Titanium.UI.ListView>.
+			 */
+			namespace ListViewSeparatorStyle {
+				/**
+				 * Indicates if the proxy will bubble an event to its parent.
+				 */
+				let bubbleParent: boolean;
+
+				/**
+				 * The name of the API that this proxy corresponds to.
+				 */
+				const apiName: string;
+
+				/**
+				 * The separator cell has no distinct style.
+				 */
+				const NONE: number;
+
+				/**
+				 * The separator cell has a single line running across its width. This is the default value.
+				 */
+				const SINGLE_LINE: number;
+
+				/**
+				 * Adds the specified callback as an event listener for the named event.
+				 */
+				function addEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Removes the specified callback as an event listener for the named event.
+				 */
+				function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Fires a synthesized event to any registered listeners.
+				 */
+				function fireEvent(name: string, event: any): void;
+
+				/**
+				 * Applies the properties to the proxy.
+				 */
+				function applyProperties(props: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPhone.ListViewSeparatorStyle.bubbleParent> property.
+				 */
+				function getBubbleParent(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPhone.ListViewSeparatorStyle.bubbleParent> property.
+				 */
+				function setBubbleParent(bubbleParent: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPhone.ListViewSeparatorStyle.apiName> property.
+				 */
+				function getApiName(): string;
+
+			}
+
+			/**
+			 * A set of constants for the bar styles used on the `style` property of <Titanium.UI.ProgressBar>.
+			 */
+			namespace ProgressBarStyle {
+				/**
+				 * Indicates if the proxy will bubble an event to its parent.
+				 */
+				let bubbleParent: boolean;
+
+				/**
+				 * The name of the API that this proxy corresponds to.
+				 */
+				const apiName: string;
+
+				/**
+				 * The style of progress view that is used in a toolbar.
+				 */
+				const BAR: number;
+
+				/**
+				 * he standard progress-view style. This is the default.
+				 */
+				const DEFAULT: number;
+
+				/**
+				 * The standard progress-view style. Same as `DEFAULT`.
+				 */
+				const PLAIN: number;
+
+				/**
+				 * Adds the specified callback as an event listener for the named event.
+				 */
+				function addEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Removes the specified callback as an event listener for the named event.
+				 */
+				function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Fires a synthesized event to any registered listeners.
+				 */
+				function fireEvent(name: string, event: any): void;
+
+				/**
+				 * Applies the properties to the proxy.
+				 */
+				function applyProperties(props: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPhone.ProgressBarStyle.bubbleParent> property.
+				 */
+				function getBubbleParent(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPhone.ProgressBarStyle.bubbleParent> property.
+				 */
+				function setBubbleParent(bubbleParent: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPhone.ProgressBarStyle.apiName> property.
+				 */
+				function getApiName(): string;
+
+			}
+
+			/**
+			 * A set of constants for the Animation Styles used for transition on table view rows.
+			 */
+			namespace RowAnimationStyle {
+				/**
+				 * Indicates if the proxy will bubble an event to its parent.
+				 */
+				let bubbleParent: boolean;
+
+				/**
+				 * The name of the API that this proxy corresponds to.
+				 */
+				const apiName: string;
+
+				/**
+				 * The inserted row or rows slides in from the bottom; the deleted row or rows slides out
+				 * toward the bottom.
+				 */
+				const BOTTOM: number;
+
+				/**
+				 * The inserted or deleted row or rows fades into or out of the table view.
+				 */
+				const FADE: number;
+
+				/**
+				 * The inserted row or rows slides in from the left; the deleted row or rows slides out to the
+				 * left.
+				 */
+				const LEFT: number;
+
+				/**
+				 * No animation is performed. The new cell value appears as if the cell had just been reloaded.
+				 */
+				const NONE: number;
+
+				/**
+				 * The inserted row or rows slides in from the right; the deleted row or rows slides out to
+				 * the right.
+				 */
+				const RIGHT: number;
+
+				/**
+				 * The inserted row or rows slides in from the top; the deleted row or rows slides out toward
+				 * the top.
+				 */
+				const TOP: number;
+
+				/**
+				 * Adds the specified callback as an event listener for the named event.
+				 */
+				function addEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Removes the specified callback as an event listener for the named event.
+				 */
+				function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Fires a synthesized event to any registered listeners.
+				 */
+				function fireEvent(name: string, event: any): void;
+
+				/**
+				 * Applies the properties to the proxy.
+				 */
+				function applyProperties(props: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPhone.RowAnimationStyle.bubbleParent> property.
+				 */
+				function getBubbleParent(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPhone.RowAnimationStyle.bubbleParent> property.
+				 */
+				function setBubbleParent(bubbleParent: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPhone.RowAnimationStyle.apiName> property.
+				 */
+				function getApiName(): string;
+
+			}
+
+			/**
+			 * A set of constants for the styles available for scrollbars used with <Titanium.UI.ScrollView.scrollIndicatorStyle> and <Titanium.UI.TableView.scrollIndicatorStyle> properties.
+			 */
+			namespace ScrollIndicatorStyle {
+				/**
+				 * Indicates if the proxy will bubble an event to its parent.
+				 */
+				let bubbleParent: boolean;
+
+				/**
+				 * The name of the API that this proxy corresponds to.
+				 */
+				const apiName: string;
+
+				/**
+				 * A style of indicator which is black smaller than the default style. This style is good
+				 * against a white content background.
+				 */
+				const BLACK: number;
+
+				/**
+				 * The default style of scroll indicator, which is black with a white border. This style is
+				 * good against any content background.
+				 */
+				const DEFAULT: number;
+
+				/**
+				 * A style of indicator is white and smaller than the default style. This style is good against
+				 * a black content background.
+				 */
+				const WHITE: number;
+
+				/**
+				 * Adds the specified callback as an event listener for the named event.
+				 */
+				function addEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Removes the specified callback as an event listener for the named event.
+				 */
+				function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Fires a synthesized event to any registered listeners.
+				 */
+				function fireEvent(name: string, event: any): void;
+
+				/**
+				 * Applies the properties to the proxy.
+				 */
+				function applyProperties(props: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPhone.ScrollIndicatorStyle.bubbleParent> property.
+				 */
+				function getBubbleParent(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPhone.ScrollIndicatorStyle.bubbleParent> property.
+				 */
+				function setBubbleParent(bubbleParent: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPhone.ScrollIndicatorStyle.apiName> property.
+				 */
+				function getApiName(): string;
+
+			}
+
+			/**
+			 * A set of constants for the status bar style.
+			 */
+			namespace StatusBar {
+				/**
+				 * Indicates if the proxy will bubble an event to its parent.
+				 */
+				let bubbleParent: boolean;
+
+				/**
+				 * The name of the API that this proxy corresponds to.
+				 */
+				const apiName: string;
+
+				/**
+				 * No animation style, when the status bar is hidden or shown.
+				 */
+				const ANIMATION_STYLE_NONE: number;
+
+				/**
+				 * Slide animation style, when the status bar is hidden or shown.
+				 */
+				const ANIMATION_STYLE_SLIDE: number;
+
+				/**
+				 * Fade animation style, when the status bar is hidden or shown.
+				 */
+				const ANIMATION_STYLE_FADE: number;
+
+				/**
+				 * Default status bar style.
+				 */
+				const DEFAULT: number;
+
+				/**
+				 * Gray-colored status bar style.
+				 */
+				const GRAY: number;
+
+				/**
+				 * Gray-colored status bar style.
+				 */
+				const GREY: number;
+
+				/**
+				 * Status bar style to use with dark backgrounds. Valid on iOS 7 and above.
+				 */
+				const LIGHT_CONTENT: number;
+
+				/**
+				 * Opaque black-colored status bar style.
+				 */
+				const OPAQUE_BLACK: number;
+
+				/**
+				 * Translucent black-colored status bar style, which provides some degree of transparency to
+				 * the device background.
+				 */
+				const TRANSLUCENT_BLACK: number;
+
+				/**
+				 * Adds the specified callback as an event listener for the named event.
+				 */
+				function addEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Removes the specified callback as an event listener for the named event.
+				 */
+				function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Fires a synthesized event to any registered listeners.
+				 */
+				function fireEvent(name: string, event: any): void;
+
+				/**
+				 * Applies the properties to the proxy.
+				 */
+				function applyProperties(props: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPhone.StatusBar.bubbleParent> property.
+				 */
+				function getBubbleParent(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPhone.StatusBar.bubbleParent> property.
+				 */
+				function setBubbleParent(bubbleParent: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPhone.StatusBar.apiName> property.
+				 */
+				function getApiName(): string;
+
+			}
+
+			/**
+			 * A set of constants for creating standard iOS system buttons.
+			 */
+			namespace SystemButton {
+				/**
+				 * Indicates if the proxy will bubble an event to its parent.
+				 */
+				let bubbleParent: boolean;
+
+				/**
+				 * The name of the API that this proxy corresponds to.
+				 */
+				const apiName: string;
+
+				/**
+				 * Use with [Button.systemButton](Titanium.UI.Button.systemButton) to specify an **Action** button.
+				 */
+				const ACTION: number;
+
+				/**
+				 * Use with [Button.systemButton](Titanium.UI.Button.systemButton) to create an activity indicator that
+				 * can be used in navigation bars and toolbars.
+				 */
+				const ACTIVITY: number;
+
+				/**
+				 * Use with [Button.systemButton](Titanium.UI.Button.systemButton) to specify an **Add** button.
+				 */
+				const ADD: number;
+
+				/**
+				 * Use with [Button.systemButton](Titanium.UI.Button.systemButton) to specify a **Bookmarks** button.
+				 */
+				const BOOKMARKS: number;
+
+				/**
+				 * Use with [Button.systemButton](Titanium.UI.Button.systemButton) to specify a **Camera** button.
+				 */
+				const CAMERA: number;
+
+				/**
+				 * Use with [Button.systemButton](Titanium.UI.Button.systemButton) to specify a **Cancel** button.
+				 */
+				const CANCEL: number;
+
+				/**
+				 * Use with [Button.systemButton](Titanium.UI.Button.systemButton) to specify a **Compose** button.
+				 */
+				const COMPOSE: number;
+
+				/**
+				 * Use with [Button.style](Titanium.UI.Button.style) to specify a **ContactAdd** button.
+				 */
+				const CONTACT_ADD: number;
+
+				/**
+				 * Use with [Button.style](Titanium.UI.Button.style) to specify a **Disclosure** button.
+				 */
+				const DISCLOSURE: number;
+
+				/**
+				 * Use with [Button.systemButton](Titanium.UI.Button.systemButton) to specify a **Done** button.
+				 */
+				const DONE: number;
+
+				/**
+				 * Use with [Button.systemButton](Titanium.UI.Button.systemButton) to specify an **Edit** button.
+				 */
+				const EDIT: number;
+
+				/**
+				 * Use with [Button.systemButton](Titanium.UI.Button.systemButton) to specify a **Fast Forward** button.
+				 */
+				const FAST_FORWARD: number;
+
+				/**
+				 * Use with [Button.systemButton](Titanium.UI.Button.systemButton) to create a fixed-width blank space
+				 * for spacing items in toolbars.
+				 */
+				const FIXED_SPACE: number;
+
+				/**
+				 * Use with [Button.systemButton](Titanium.UI.Button.systemButton) to create a flexible blank space
+				 * for spacing items in toolbars.
+				 */
+				const FLEXIBLE_SPACE: number;
+
+				/**
+				 * Use with [Button.style](Titanium.UI.Button.style) to specify a dark-colored **Info** button.
+				 */
+				const INFO_DARK: number;
+
+				/**
+				 * Use with [Button.style](Titanium.UI.Button.style) to specify a light-colored **Info** button.
+				 */
+				const INFO_LIGHT: number;
+
+				/**
+				 * Use with [Button.systemButton](Titanium.UI.Button.systemButton) to specify an **Organize** button.
+				 */
+				const ORGANIZE: number;
+
+				/**
+				 * Use with [Button.systemButton](Titanium.UI.Button.systemButton) to specify a **Pause** button.
+				 */
+				const PAUSE: number;
+
+				/**
+				 * Use with [Button.systemButton](Titanium.UI.Button.systemButton) to specify a **Play** button.
+				 */
+				const PLAY: number;
+
+				/**
+				 * Use with [Button.systemButton](Titanium.UI.Button.systemButton) to specify a **Refresh** button.
+				 */
+				const REFRESH: number;
+
+				/**
+				 * Use with [Button.systemButton](Titanium.UI.Button.systemButton) to specify a **Reply** button.
+				 */
+				const REPLY: number;
+
+				/**
+				 * Use with [Button.systemButton](Titanium.UI.Button.systemButton) to specify a **Rewind** button.
+				 */
+				const REWIND: number;
+
+				/**
+				 * Use with [Button.systemButton](Titanium.UI.Button.systemButton) to specify a **Save** button.
+				 */
+				const SAVE: number;
+
+				/**
+				 * Identical to [ACTIVITY](Titanium.UI.iPhone.SystemButton.ACTIVITY).
+				 */
+				const SPINNER: number;
+
+				/**
+				 * Use with [Button.systemButton](Titanium.UI.Button.systemButton) to specify a **Stop** button.
+				 */
+				const STOP: number;
+
+				/**
+				 * Use with [Button.systemButton](Titanium.UI.Button.systemButton) to specify a **Trash** button.
+				 */
+				const TRASH: number;
+
+				/**
+				 * Adds the specified callback as an event listener for the named event.
+				 */
+				function addEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Removes the specified callback as an event listener for the named event.
+				 */
+				function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Fires a synthesized event to any registered listeners.
+				 */
+				function fireEvent(name: string, event: any): void;
+
+				/**
+				 * Applies the properties to the proxy.
+				 */
+				function applyProperties(props: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPhone.SystemButton.bubbleParent> property.
+				 */
+				function getBubbleParent(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPhone.SystemButton.bubbleParent> property.
+				 */
+				function setBubbleParent(bubbleParent: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPhone.SystemButton.apiName> property.
+				 */
+				function getApiName(): string;
+
+			}
+
+			/**
+			 * A set of constants for the system button styles that can be used for the button `style` property.
+			 */
+			namespace SystemButtonStyle {
+				/**
+				 * Indicates if the proxy will bubble an event to its parent.
+				 */
+				let bubbleParent: boolean;
+
+				/**
+				 * The name of the API that this proxy corresponds to.
+				 */
+				const apiName: string;
+
+				/**
+				 * Used with [ButtonBar](Titanium.UI.ButtonBar) or [TabbedBar](Titanium.UI.iOS.TabbedBar) only,
+				 * to use the more condensed style used in nav bars and tool bars.
+				 */
+				const BAR: number;
+
+				/**
+				 * A simple button style with a border.
+				 */
+				const BORDERED: number;
+
+				/**
+				 * The style for a **Done** button--for example, a button that completes some task and returns
+				 * to the previous view.
+				 */
+				const DONE: number;
+
+				/**
+				 * Specifies a borderless button, the default style for toolbars, button bars, and tabbed bars.
+				 */
+				const PLAIN: number;
+
+				/**
+				 * Adds the specified callback as an event listener for the named event.
+				 */
+				function addEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Removes the specified callback as an event listener for the named event.
+				 */
+				function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Fires a synthesized event to any registered listeners.
+				 */
+				function fireEvent(name: string, event: any): void;
+
+				/**
+				 * Applies the properties to the proxy.
+				 */
+				function applyProperties(props: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPhone.SystemButtonStyle.bubbleParent> property.
+				 */
+				function getBubbleParent(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPhone.SystemButtonStyle.bubbleParent> property.
+				 */
+				function setBubbleParent(bubbleParent: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPhone.SystemButtonStyle.apiName> property.
+				 */
+				function getApiName(): string;
+
+			}
+
+			/**
+			 * A set of constants for the system icon styles that can be used on a tab group tab.
+			 */
+			namespace SystemIcon {
+				/**
+				 * Indicates if the proxy will bubble an event to its parent.
+				 */
+				let bubbleParent: boolean;
+
+				/**
+				 * The name of the API that this proxy corresponds to.
+				 */
+				const apiName: string;
+
+				/**
+				 * Bookmark style icon
+				 */
+				const BOOKMARKS: number;
+
+				/**
+				 * Contacts style icon
+				 */
+				const CONTACTS: number;
+
+				/**
+				 * Downloads style icon
+				 */
+				const DOWNLOADS: number;
+
+				/**
+				 * Favorites style icon
+				 */
+				const FAVORITES: number;
+
+				/**
+				 * Featured style icon
+				 */
+				const FEATURED: number;
+
+				/**
+				 * History style icon
+				 */
+				const HISTORY: number;
+
+				/**
+				 * More style icon
+				 */
+				const MORE: number;
+
+				/**
+				 * Most recent style icon
+				 */
+				const MOST_RECENT: number;
+
+				/**
+				 * Most viewed style icon
+				 */
+				const MOST_VIEWED: number;
+
+				/**
+				 * Recents style icon
+				 */
+				const RECENTS: number;
+
+				/**
+				 * Search style icon
+				 */
+				const SEARCH: number;
+
+				/**
+				 * Top rated style icon
+				 */
+				const TOP_RATED: number;
+
+				/**
+				 * Adds the specified callback as an event listener for the named event.
+				 */
+				function addEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Removes the specified callback as an event listener for the named event.
+				 */
+				function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Fires a synthesized event to any registered listeners.
+				 */
+				function fireEvent(name: string, event: any): void;
+
+				/**
+				 * Applies the properties to the proxy.
+				 */
+				function applyProperties(props: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPhone.SystemIcon.bubbleParent> property.
+				 */
+				function getBubbleParent(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPhone.SystemIcon.bubbleParent> property.
+				 */
+				function setBubbleParent(bubbleParent: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPhone.SystemIcon.apiName> property.
+				 */
+				function getApiName(): string;
+
+			}
+
+			/**
+			 * A set of constants for the style that can be used for the `selectionStyle` property of
+			 * <Titanium.UI.TableViewRow>.
+			 */
+			namespace TableViewCellSelectionStyle {
+				/**
+				 * Indicates if the proxy will bubble an event to its parent.
+				 */
+				let bubbleParent: boolean;
+
+				/**
+				 * The name of the API that this proxy corresponds to.
+				 */
+				const apiName: string;
+
+				/**
+				 * The cell when selected has a blue background. This is the default value.
+				 */
+				const BLUE: number;
+
+				/**
+				 * Then cell when selected has a gray background.
+				 */
+				const GRAY: number;
+
+				/**
+				 * The cell has no distinct style for when it is selected.
+				 */
+				const NONE: number;
+
+				/**
+				 * Adds the specified callback as an event listener for the named event.
+				 */
+				function addEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Removes the specified callback as an event listener for the named event.
+				 */
+				function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Fires a synthesized event to any registered listeners.
+				 */
+				function fireEvent(name: string, event: any): void;
+
+				/**
+				 * Applies the properties to the proxy.
+				 */
+				function applyProperties(props: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPhone.TableViewCellSelectionStyle.bubbleParent> property.
+				 */
+				function getBubbleParent(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPhone.TableViewCellSelectionStyle.bubbleParent> property.
+				 */
+				function setBubbleParent(bubbleParent: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPhone.TableViewCellSelectionStyle.apiName> property.
+				 */
+				function getApiName(): string;
+
+			}
+
+			/**
+			 * A set of constants for the position value that can be used for the `position` property of
+			 * <Titanium.UI.TableView> when invoking `scrollToIndex`.
+			 */
+			namespace TableViewScrollPosition {
+				/**
+				 * Indicates if the proxy will bubble an event to its parent.
+				 */
+				let bubbleParent: boolean;
+
+				/**
+				 * The name of the API that this proxy corresponds to.
+				 */
+				const apiName: string;
+
+				/**
+				 * The table view scrolls the row of interest to the bottom of the visible table view.
+				 */
+				const BOTTOM: number;
+
+				/**
+				 * The table view scrolls the row of interest to the middle of the visible table view.
+				 */
+				const MIDDLE: number;
+
+				/**
+				 * The table view scrolls the row of interest to be fully visible with a minimum of movement. If the row is already fully visible, no scrolling occurs. For example, if the row is above the visible area, the behavior is identical to that specified by `TOP`. This is the default.
+				 */
+				const NONE: number;
+
+				/**
+				 * The table view scrolls the row of interest to the top of the visible table view.
+				 */
+				const TOP: number;
+
+				/**
+				 * Adds the specified callback as an event listener for the named event.
+				 */
+				function addEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Removes the specified callback as an event listener for the named event.
+				 */
+				function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Fires a synthesized event to any registered listeners.
+				 */
+				function fireEvent(name: string, event: any): void;
+
+				/**
+				 * Applies the properties to the proxy.
+				 */
+				function applyProperties(props: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPhone.TableViewScrollPosition.bubbleParent> property.
+				 */
+				function getBubbleParent(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPhone.TableViewScrollPosition.bubbleParent> property.
+				 */
+				function setBubbleParent(bubbleParent: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPhone.TableViewScrollPosition.apiName> property.
+				 */
+				function getApiName(): string;
+
+			}
+
+			/**
+			 * A set of constants for the style that can be used for the `separatorStyle` property of
+			 * <Titanium.UI.TableView>.
+			 */
+			namespace TableViewSeparatorStyle {
+				/**
+				 * Indicates if the proxy will bubble an event to its parent.
+				 */
+				let bubbleParent: boolean;
+
+				/**
+				 * The name of the API that this proxy corresponds to.
+				 */
+				const apiName: string;
+
+				/**
+				 * The separator cell has no distinct style.
+				 */
+				const NONE: number;
+
+				/**
+				 * The separator cell has a single line running across its width. This is the default value.
+				 */
+				const SINGLE_LINE: number;
+
+				/**
+				 * Adds the specified callback as an event listener for the named event.
+				 */
+				function addEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Removes the specified callback as an event listener for the named event.
+				 */
+				function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Fires a synthesized event to any registered listeners.
+				 */
+				function fireEvent(name: string, event: any): void;
+
+				/**
+				 * Applies the properties to the proxy.
+				 */
+				function applyProperties(props: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPhone.TableViewSeparatorStyle.bubbleParent> property.
+				 */
+				function getBubbleParent(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPhone.TableViewSeparatorStyle.bubbleParent> property.
+				 */
+				function setBubbleParent(bubbleParent: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPhone.TableViewSeparatorStyle.apiName> property.
+				 */
+				function getApiName(): string;
+
+			}
+
+			/**
+			 * A set of constants for the style that can be used for the button `style` property of
+			 * <Titanium.UI.TableView>.
+			 */
+			namespace TableViewStyle {
+				/**
+				 * Indicates if the proxy will bubble an event to its parent.
+				 */
+				let bubbleParent: boolean;
+
+				/**
+				 * The name of the API that this proxy corresponds to.
+				 */
+				const apiName: string;
+
+				/**
+				 * A table view whose sections present distinct groups of rows. The section headers and footers
+				 * do not float.
+				 */
+				const GROUPED: number;
+
+				/**
+				 * A plain table view. Any section headers or footers are displayed as inline separators and
+				 * float when the table view is scrolled.
+				 */
+				const PLAIN: number;
+
+				/**
+				 * Adds the specified callback as an event listener for the named event.
+				 */
+				function addEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Removes the specified callback as an event listener for the named event.
+				 */
+				function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Fires a synthesized event to any registered listeners.
+				 */
+				function fireEvent(name: string, event: any): void;
+
+				/**
+				 * Applies the properties to the proxy.
+				 */
+				function applyProperties(props: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPhone.TableViewStyle.bubbleParent> property.
+				 */
+				function getBubbleParent(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPhone.TableViewStyle.bubbleParent> property.
+				 */
+				function setBubbleParent(bubbleParent: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPhone.TableViewStyle.apiName> property.
+				 */
+				function getApiName(): string;
+
+			}
 		}
 	}
-	export module Android {
-		export var ACTION_AIRPLANE_MODE_CHANGED : string;
-		export var ACTION_ALL_APPS : string;
-		export var ACTION_ANSWER : string;
-		export var ACTION_ATTACH_DATA : string;
-		export var ACTION_BATTERY_CHANGED : string;
-		export var ACTION_BATTERY_LOW : string;
-		export var ACTION_BATTERY_OKAY : string;
-		export var ACTION_BOOT_COMPLETED : string;
-		export var ACTION_BUG_REPORT : string;
-		export var ACTION_CALL : string;
-		export var ACTION_CALL_BUTTON : string;
-		export var ACTION_CAMERA_BUTTON : string;
-		export var ACTION_CHOOSER : string;
-		export var ACTION_CLOSE_SYSTEM_DIALOGS : string;
-		export var ACTION_CONFIGURATION_CHANGED : string;
-		export var ACTION_CREATE_SHORTCUT : string;
-		export var ACTION_DATE_CHANGED : string;
-		export var ACTION_DEFAULT : string;
-		export var ACTION_DELETE : string;
-		export var ACTION_DEVICE_STORAGE_LOW : string;
-		export var ACTION_DIAL : string;
-		export var ACTION_EDIT : string;
-		export var ACTION_GET_CONTENT : string;
-		export var ACTION_GTALK_SERVICE_CONNECTED : string;
-		export var ACTION_GTALK_SERVICE_DISCONNECTED : string;
-		export var ACTION_HEADSET_PLUG : string;
-		export var ACTION_INPUT_METHOD_CHANGED : string;
-		export var ACTION_INSERT : string;
-		export var ACTION_INSERT_OR_EDIT : string;
-		export var ACTION_MAIN : string;
-		export var ACTION_MANAGE_PACKAGE_STORAGE : string;
-		export var ACTION_MEDIA_BAD_REMOVAL : string;
-		export var ACTION_MEDIA_BUTTON : string;
-		export var ACTION_MEDIA_CHECKING : string;
-		export var ACTION_MEDIA_EJECT : string;
-		export var ACTION_MEDIA_MOUNTED : string;
-		export var ACTION_MEDIA_NOFS : string;
-		export var ACTION_MEDIA_REMOVED : string;
-		export var ACTION_MEDIA_SCANNER_FINISHED : string;
-		export var ACTION_MEDIA_SCANNER_SCAN_FILE : string;
-		export var ACTION_MEDIA_SCANNER_STARTED : string;
-		export var ACTION_MEDIA_SHARED : string;
-		export var ACTION_MEDIA_UNMOUNTABLE : string;
-		export var ACTION_MEDIA_UNMOUNTED : string;
-		export var ACTION_NEW_OUTGOING_CALL : string;
-		export var ACTION_PACKAGE_ADDED : string;
-		export var ACTION_PACKAGE_CHANGED : string;
-		export var ACTION_PACKAGE_DATA_CLEARED : string;
-		export var ACTION_PACKAGE_INSTALL : string;
-		export var ACTION_PACKAGE_REMOVED : string;
-		export var ACTION_PACKAGE_REPLACED : string;
-		export var ACTION_PACKAGE_RESTARTED : string;
-		export var ACTION_PICK : string;
-		export var ACTION_PICK_ACTIVITY : string;
-		export var ACTION_POWER_CONNECTED : string;
-		export var ACTION_POWER_DISCONNECTED : string;
-		export var ACTION_POWER_USAGE_SUMMARY : string;
-		export var ACTION_PROVIDER_CHANGED : string;
-		export var ACTION_REBOOT : string;
-		export var ACTION_RUN : string;
-		export var ACTION_SCREEN_OFF : string;
-		export var ACTION_SCREEN_ON : string;
-		export var ACTION_SEARCH : string;
-		export var ACTION_SEARCH_LONG_PRESS : string;
-		export var ACTION_SEND : string;
-		export var ACTION_SENDTO : string;
-		export var ACTION_SEND_MULTIPLE : string;
-		export var ACTION_SET_WALLPAPER : string;
-		export var ACTION_SHUTDOWN : string;
-		export var ACTION_SYNC : string;
-		export var ACTION_SYSTEM_TUTORIAL : string;
-		export var ACTION_TIME_CHANGED : string;
-		export var ACTION_TIME_TICK : string;
-		export var ACTION_UID_REMOVED : string;
-		export var ACTION_UMS_CONNECTED : string;
-		export var ACTION_UMS_DISCONNECTED : string;
-		export var ACTION_USER_PRESENT : string;
-		export var ACTION_VIEW : string;
-		export var ACTION_VOICE_COMMAND : string;
-		export var ACTION_WALLPAPER_CHANGED : string;
-		export var ACTION_WEB_SEARCH : string;
-		export var CATEGORY_ALTERNATIVE : string;
-		export var CATEGORY_BROWSABLE : string;
-		export var CATEGORY_DEFAULT : string;
-		export var CATEGORY_DEVELOPMENT_PREFERENCE : string;
-		export var CATEGORY_EMBED : string;
-		export var CATEGORY_FRAMEWORK_INSTRUMENTATION_TEST : string;
-		export var CATEGORY_HOME : string;
-		export var CATEGORY_INFO : string;
-		export var CATEGORY_LAUNCHER : string;
-		export var CATEGORY_MONKEY : string;
-		export var CATEGORY_OPENABLE : string;
-		export var CATEGORY_PREFERENCE : string;
-		export var CATEGORY_SAMPLE_CODE : string;
-		export var CATEGORY_SELECTED_ALTERNATIVE : string;
-		export var CATEGORY_TAB : string;
-		export var CATEGORY_TEST : string;
-		export var CATEGORY_UNIT_TEST : string;
-		export var DEFAULT_ALL : number;
-		export var DEFAULT_LIGHTS : number;
-		export var DEFAULT_SOUND : number;
-		export var DEFAULT_VIBRATE : number;
-		export var EXTRA_ALARM_COUNT : string;
-		export var EXTRA_BCC : string;
-		export var EXTRA_CC : string;
-		export var EXTRA_DATA_REMOVED : string;
-		export var EXTRA_DONT_KILL_APP : string;
-		export var EXTRA_EMAIL : string;
-		export var EXTRA_INTENT : string;
-		export var EXTRA_KEY_EVENT : string;
-		export var EXTRA_PHONE_NUMBER : string;
-		export var EXTRA_REPLACING : string;
-		export var EXTRA_SHORTCUT_ICON : string;
-		export var EXTRA_SHORTCUT_ICON_RESOURCE : string;
-		export var EXTRA_SHORTCUT_INTENT : string;
-		export var EXTRA_SHORTCUT_NAME : string;
-		export var EXTRA_STREAM : string;
-		export var EXTRA_SUBJECT : string;
-		export var EXTRA_TEMPLATE : string;
-		export var EXTRA_TEXT : string;
-		export var EXTRA_TITLE : string;
-		export var EXTRA_UID : string;
-		export var FILL_IN_ACTION : number;
-		export var FILL_IN_CATEGORIES : number;
-		export var FILL_IN_COMPONENT : number;
-		export var FILL_IN_DATA : number;
-		export var FILL_IN_PACKAGE : number;
-		export var FLAG_ACTIVITY_BROUGHT_TO_FRONT : number;
-		export var FLAG_ACTIVITY_CLEAR_TOP : number;
-		export var FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET : number;
-		export var FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS : number;
-		export var FLAG_ACTIVITY_FORWARD_RESULT : number;
-		export var FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY : number;
-		export var FLAG_ACTIVITY_MULTIPLE_TASK : number;
-		export var FLAG_ACTIVITY_NEW_TASK : number;
-		export var FLAG_ACTIVITY_NO_ANIMATION : number;
-		export var FLAG_ACTIVITY_NO_HISTORY : number;
-		export var FLAG_ACTIVITY_NO_USER_ACTION : number;
-		export var FLAG_ACTIVITY_PREVIOUS_IS_TOP : number;
-		export var FLAG_ACTIVITY_REORDER_TO_FRONT : number;
-		export var FLAG_ACTIVITY_RESET_TASK_IF_NEEDED : number;
-		export var FLAG_ACTIVITY_SINGLE_TOP : number;
-		export var FLAG_AUTO_CANCEL : number;
-		export var FLAG_CANCEL_CURRENT : number;
-		export var FLAG_DEBUG_LOG_RESOLUTION : number;
-		export var FLAG_FROM_BACKGROUND : number;
-		export var FLAG_GRANT_READ_URI_PERMISSION : number;
-		export var FLAG_GRANT_WRITE_URI_PERMISSION : number;
-		export var FLAG_INSISTENT : number;
-		export var FLAG_NO_CLEAR : number;
-		export var FLAG_NO_CREATE : number;
-		export var FLAG_ONE_SHOT : number;
-		export var FLAG_ONGOING_EVENT : number;
-		export var FLAG_ONLY_ALERT_ONCE : number;
-		export var FLAG_RECEIVER_REGISTERED_ONLY : number;
-		export var FLAG_SHOW_LIGHTS : number;
-		export var FLAG_UPDATE_CURRENT : number;
-		export var NAVIGATION_MODE_STANDARD : number;
-		export var NAVIGATION_MODE_TABS : number;
-		export var PENDING_INTENT_FOR_ACTIVITY : number;
-		export var PENDING_INTENT_FOR_BROADCAST : number;
-		export var PENDING_INTENT_FOR_SERVICE : number;
-		export var PENDING_INTENT_MAX_VALUE : number;
-		export var R : Ti.Android.R;
-		export var RESULT_CANCELED : number;
-		export var RESULT_FIRST_USER : number;
-		export var RESULT_OK : number;
-		export var SCREEN_ORIENTATION_BEHIND : number;
-		export var SCREEN_ORIENTATION_LANDSCAPE : number;
-		export var SCREEN_ORIENTATION_NOSENSOR : number;
-		export var SCREEN_ORIENTATION_PORTRAIT : number;
-		export var SCREEN_ORIENTATION_SENSOR : number;
-		export var SCREEN_ORIENTATION_UNSPECIFIED : number;
-		export var SCREEN_ORIENTATION_USER : number;
-		export var SHOW_AS_ACTION_ALWAYS : number;
-		export var SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW : number;
-		export var SHOW_AS_ACTION_IF_ROOM : number;
-		export var SHOW_AS_ACTION_NEVER : number;
-		export var SHOW_AS_ACTION_WITH_TEXT : number;
-		export var START_NOT_STICKY : number;
-		export var START_REDELIVER_INTENT : number;
-		export var STREAM_ALARM : number;
-		export var STREAM_DEFAULT : number;
-		export var STREAM_MUSIC : number;
-		export var STREAM_NOTIFICATION : number;
-		export var STREAM_RING : number;
-		export var STREAM_SYSTEM : number;
-		export var STREAM_VOICE_CALL : number;
-		export var URI_INTENT_SCHEME : number;
-		export var apiName : string;
-		export var bubbleParent : boolean;
-		export var currentActivity : Ti.Android.Activity;
-		export var currentService : Ti.Android.Service;
-		export function addEventListener (name: string, callback: (...args : any[]) => any) : void;
-		export function applyProperties (props: Dictionary<Object>) : void;
-		export function createBroadcastIntent (options: BroadcastIntentOptions) : Ti.Android.Intent;
-		export function createBroadcastReceiver (parameters?: Dictionary<Ti.Android.BroadcastReceiver>) : Ti.Android.BroadcastReceiver;
-		export function createIntent (parameters?: Dictionary<Ti.Android.Intent>) : Ti.Android.Intent;
-		export function createIntentChooser (intent: Ti.Android.Intent, title: string) : Ti.Android.Intent;
-		export function createNotification (parameters?: Dictionary<Ti.Android.Notification>) : Ti.Android.Notification;
-		export function createPendingIntent (parameters?: Dictionary<Ti.Android.PendingIntent>) : Ti.Android.PendingIntent;
-		export function createRemoteViews (parameters?: Dictionary<Ti.Android.RemoteViews>) : Ti.Android.RemoteViews;
-		export function createService (intent: Ti.Android.Intent) : Ti.Android.Service;
-		export function createServiceIntent (options: ServiceIntentOptions) : Ti.Android.Intent;
-		export function fireEvent (name: string, event: Dictionary<Object>) : void;
-		export function getApiName () : string;
-		export function getBubbleParent () : boolean;
-		export function getCurrentActivity () : Ti.Android.Activity;
-		export function getCurrentService () : Ti.Android.Service;
-		export function isServiceRunning (intent: Ti.Android.Intent) : boolean;
-		export function registerBroadcastReceiver (broadcastReceiver: Ti.Android.BroadcastReceiver, actions: Array<String>) : void;
-		export function removeEventListener (name: string, callback: (...args : any[]) => any) : void;
-		export function setBubbleParent (bubbleParent: boolean) : void;
-		export function startService (intent: Ti.Android.Intent) : void;
-		export function stopService (intent: Ti.Android.Intent) : void;
-		export function unregisterBroadcastReceiver (broadcastReceiver: Ti.Android.BroadcastReceiver) : void;
-		export interface Intent extends Ti.Proxy {
-			action : string;
-			className : string;
-			data : string;
-			flags : number;
-			packageName : string;
-			type : string;
-			url : string;
-			addCategory (name: string) : void;
-			addFlags (flags: number) : void;
-			getAction () : string;
-			getBlobExtra (name: string) : Ti.Blob;
-			getBooleanExtra (name: string) : boolean;
-			getClassName () : string;
-			getData () : string;
-			getDoubleExtra (name: string) : number;
-			getFlags () : number;
-			getIntExtra (name: string) : number;
-			getLongExtra (name: string) : number;
-			getPackageName () : string;
-			getStringExtra (name: string) : string;
-			getType () : string;
-			getUrl () : string;
-			hasExtra (name: string) : boolean;
-			putExtra (name: string, value: any) : void;
-			putExtraUri (name: string, value: string) : void;
-			setFlags (flags: number) : void;
-		}
-		export interface Notification extends Ti.Proxy {
-			audioStreamType : number;
-			contentIntent : Ti.Android.PendingIntent;
-			contentText : string;
-			contentTitle : string;
-			contentView : Ti.Android.RemoteViews;
-			defaults : number;
-			deleteIntent : Ti.Android.PendingIntent;
-			flags : number;
-			icon : any;
-			ledARGB : number;
-			ledOffMS : number;
-			ledOnMS : number;
-			number : number;
-			sound : string;
-			tickerText : string;
-			when : any;
-			getAudioStreamType () : number;
-			getContentIntent () : Ti.Android.PendingIntent;
-			getContentText () : string;
-			getContentTitle () : string;
-			getDefaults () : number;
-			getDeleteIntent () : Ti.Android.PendingIntent;
-			getFlags () : number;
-			getIcon () : any;
-			getLedARGB () : number;
-			getLedOffMS () : number;
-			getLedOnMS () : number;
-			getNumber () : number;
-			getSound () : string;
-			getTickerText () : string;
-			getWhen () : any;
-			setAudioStreamType (audioStreamType: number) : void;
-			setContentIntent (contentIntent: Ti.Android.PendingIntent) : void;
-			setContentText (contentText: string) : void;
-			setContentTitle (contentTitle: string) : void;
-			setContentView (contentView: Ti.Android.RemoteViews) : void;
-			setDefaults (defaults: number) : void;
-			setDeleteIntent (deleteIntent: Ti.Android.PendingIntent) : void;
-			setFlags (flags: number) : void;
-			setIcon (icon: number) : void;
-			setIcon (icon: string) : void;
-			setLatestEventInfo (contentTitle: string, contentText: string, contentIntent: Ti.Android.PendingIntent) : void;
-			setLedARGB (ledARGB: number) : void;
-			setLedOffMS (ledOffMS: number) : void;
-			setLedOnMS (ledOnMS: number) : void;
-			setNumber (number: number) : void;
-			setSound (sound: string) : void;
-			setTickerText (tickerText: string) : void;
-			setWhen (when: Date) : void;
-			setWhen (when: number) : void;
-		}
-		export module Calendar {
-			export var METHOD_ALERT : number;
-			export var METHOD_DEFAULT : number;
-			export var METHOD_EMAIL : number;
-			export var METHOD_SMS : number;
-			export var STATE_DISMISSED : number;
-			export var STATE_FIRED : number;
-			export var STATE_SCHEDULED : number;
-			export var STATUS_CANCELED : number;
-			export var STATUS_CONFIRMED : number;
-			export var STATUS_TENTATIVE : number;
-			export var VISIBILITY_CONFIDENTIAL : number;
-			export var VISIBILITY_DEFAULT : number;
-			export var VISIBILITY_PRIVATE : number;
-			export var VISIBILITY_PUBLIC : number;
-			export var allAlerts : Array<Ti.Android.Calendar.Alert>;
-			export var allCalendars : Array<Ti.Android.Calendar.Calendar>;
-			export var apiName : string;
-			export var bubbleParent : boolean;
-			export var selectableCalendars : Array<Ti.Android.Calendar.Calendar>;
-			export function addEventListener (name: string, callback: (...args : any[]) => any) : void;
-			export function applyProperties (props: Dictionary<Object>) : void;
-			export function fireEvent (name: string, event: Dictionary<Object>) : void;
-			export function getAllAlerts () : Array<Ti.Android.Calendar.Alert>;
-			export function getAllCalendars () : Array<Ti.Android.Calendar.Calendar>;
-			export function getApiName () : string;
-			export function getBubbleParent () : boolean;
-			export function getCalendarById (id: number) : Ti.Android.Calendar.Calendar;
-			export function getSelectableCalendars () : Array<Ti.Android.Calendar.Calendar>;
-			export function removeEventListener (name: string, callback: (...args : any[]) => any) : void;
-			export function setBubbleParent (bubbleParent: boolean) : void;
-			export interface Event extends Ti.Proxy {
-				alerts : Array<Ti.Android.Calendar.Alert>;
-				allDay : boolean;
-				begin : Date;
-				description : string;
-				end : Date;
-				extendedProperties : Dictionary<Object>;
-				hasAlarm : boolean;
-				hasExtendedProperties : boolean;
-				id : string;
-				location : string;
-				reminders : Array<Ti.Android.Calendar.Reminder>;
-				status : number;
-				title : string;
-				visibility : number;
-				createAlert (data: Dictionary<Ti.Android.Calendar.Alert>) : Ti.Android.Calendar.Alert;
-				createReminder (data: Dictionary<Ti.Android.Calendar.Reminder>) : Ti.Android.Calendar.Reminder;
-				getAlerts () : Array<Ti.Android.Calendar.Alert>;
-				getAllDay () : boolean;
-				getBegin () : Date;
-				getDescription () : string;
-				getEnd () : Date;
-				getExtendedProperties () : Dictionary<Object>;
-				getExtendedProperty (name: string) : string;
-				getHasAlarm () : boolean;
-				getHasExtendedProperties () : boolean;
-				getId () : string;
-				getLocation () : string;
-				getReminders () : Array<Ti.Android.Calendar.Reminder>;
-				getStatus () : number;
-				getTitle () : string;
-				getVisibility () : number;
-				setExtendedProperty (name: string, value: string) : void;
-			}
-			export interface Reminder extends Ti.Proxy {
-				id : string;
-				method : number;
-				minutes : number;
-				getId () : string;
-				getMethod () : number;
-				getMinutes () : number;
-			}
-			export interface Calendar extends Ti.Proxy {
-				hidden : boolean;
-				id : string;
-				name : string;
-				selected : boolean;
-				createEvent (properties: Dictionary<Ti.Android.Calendar.Event>) : Ti.Android.Calendar.Event;
-				getEventById (id: number) : Ti.Android.Calendar.Event;
-				getEventsBetweenDates (date1: Date, date2: Date) : Array<Ti.Android.Calendar.Event>;
-				getEventsInDate (year: number, month: number, day: number) : Array<Ti.Android.Calendar.Event>;
-				getEventsInMonth (year: number, month: number) : Array<Ti.Android.Calendar.Event>;
-				getEventsInYear (year: number) : Array<Ti.Android.Calendar.Event>;
-				getHidden () : boolean;
-				getId () : string;
-				getName () : string;
-				getSelected () : boolean;
-			}
-			export interface Alert extends Ti.Proxy {
-				alarmTime : Date;
-				begin : Date;
-				end : Date;
-				eventId : number;
-				id : string;
-				minutes : number;
-				state : number;
-				getAlarmTime () : Date;
-				getBegin () : Date;
-				getEnd () : Date;
-				getEventId () : number;
-				getId () : string;
-				getMinutes () : number;
-				getState () : number;
-			}
-		}
-		export interface MenuItem extends Ti.Proxy {
-			actionView : Ti.UI.View;
-			actionViewExpanded : boolean;
-			checkable : boolean;
-			checked : boolean;
-			enabled : boolean;
-			groupId : number;
-			icon : any;
-			itemId : number;
-			order : number;
-			showAsAction : number;
-			title : string;
-			titleCondensed : string;
-			visible : boolean;
-			collapseActionView () : void;
-			expandActionView () : void;
-			getActionView () : Ti.UI.View;
-			getGroupId () : number;
-			getItemId () : number;
-			getOrder () : number;
-			getTitle () : string;
-			getTitleCondensed () : string;
-			isActionViewExpanded () : boolean;
-			isCheckable () : boolean;
-			isChecked () : boolean;
-			isEnabled () : boolean;
-			isVisible () : boolean;
-			setActionView (actionView: Ti.UI.View) : void;
-			setCheckable (checkable: boolean) : void;
-			setChecked (enabled: boolean) : void;
-			setEnabled (enabled: boolean) : void;
-			setIcon (icon: number) : void;
-			setIcon (icon: string) : void;
-			setShowAsAction (showAsAction: number) : void;
-			setTitle (title: string) : void;
-			setTitleCondensed (titleCondensed: string) : void;
-			setVisible (visible: boolean) : void;
-		}
-		export interface NotificationManager  {
-			DEFAULT_ALL : number;
-			DEFAULT_LIGHTS : number;
-			DEFAULT_SOUND : number;
-			DEFAULT_VIBRATE : number;
-			FLAG_AUTO_CANCEL : number;
-			FLAG_INSISTENT : number;
-			FLAG_NO_CLEAR : number;
-			FLAG_ONGOING_EVENT : number;
-			FLAG_ONLY_ALERT_ONCE : number;
-			FLAG_SHOW_LIGHTS : number;
-			STREAM_DEFAULT : number;
-			cancel (id: number) : void;
-			cancelAll () : void;
-			notify (id: number, notification: Ti.Android.Notification) : void;
-		}
-		export interface R extends Ti.Proxy {
-			anim : any;
-			array : any;
-			attr : any;
-			color : any;
-			dimen : any;
-			drawable : any;
-			id : any;
-			integer : any;
-			layout : any;
-			string : any;
-			style : any;
-			styleable : any;
-		}
-		export interface ActionBar extends Ti.Proxy {
-			backgroundImage : string;
-			displayHomeAsUp : boolean;
-			homeButtonEnabled : boolean;
-			icon : string;
-			logo : string;
-			navigationMode : number;
-			onHomeIconItemSelected : (...args : any[]) => any;
-			subtitle : string;
-			title : string;
-			getNavigationMode () : number;
-			getSubtitle () : string;
-			getTitle () : string;
-			hide () : void;
-			setBackgroundImage (backgroundImage: string) : void;
-			setDisplayHomeAsUp (displayHomeAsUp: boolean) : void;
-			setDisplayShowHomeEnabled (show: boolean) : void;
-			setDisplayShowTitleEnabled (show: boolean) : void;
-			setHomeButtonEnabled (homeButtonEnabled: boolean) : void;
-			setIcon (icon: string) : void;
-			setLogo (logo: string) : void;
-			setNavigationMode (navigationMode: number) : void;
-			setOnHomeIconItemSelected (onHomeIconItemSelected: (...args : any[]) => any) : void;
-			setSubtitle (subtitle: string) : void;
-			setTitle (title: string) : void;
-			show () : void;
-		}
-		export interface BroadcastReceiver extends Ti.Proxy {
-			onReceived : (...args : any[]) => any;
-			url : string;
-			getOnReceived () : (...args : any[]) => any;
-			getUrl () : string;
-			setOnReceived (onReceived: (...args : any[]) => any) : void;
-			setUrl (url: string) : void;
-		}
-		export interface Menu extends Ti.Proxy {
-			items : Array<Ti.Android.MenuItem>;
-			add (options: any) : Ti.Android.MenuItem;
-			clear () : void;
-			close () : void;
-			findItem (item: number) : Ti.Android.MenuItem;
-			findItem (item: Ti.Android.MenuItem) : Ti.Android.MenuItem;
-			getItem (index: number) : Ti.Android.MenuItem;
-			getItems () : Array<Ti.Android.MenuItem>;
-			hasVisibleItems () : boolean;
-			removeGroup (groupId: number) : void;
-			removeItem (itemId: number) : void;
-			setGroupEnabled (groupId: number, enabled: boolean) : void;
-			setGroupVisible (groupId: number, visible: boolean) : void;
-			size () : number;
-		}
-		export interface Activity extends Ti.Proxy {
-			actionBar : Ti.Android.ActionBar;
-			intent : Ti.Android.Intent;
-			onCreate : (...args : any[]) => any;
-			onCreateOptionsMenu : (...args : any[]) => any;
-			onDestroy : (...args : any[]) => any;
-			onPause : (...args : any[]) => any;
-			onPrepareOptionsMenu : (...args : any[]) => any;
-			onRestart : (...args : any[]) => any;
-			onResume : (...args : any[]) => any;
-			onStart : (...args : any[]) => any;
-			onStop : (...args : any[]) => any;
-			requestedOrientation : number;
-			finish () : void;
-			getActionBar () : Ti.Android.ActionBar;
-			getIntent () : Ti.Android.Intent;
-			getOnCreate () : (...args : any[]) => any;
-			getOnCreateOptionsMenu () : (...args : any[]) => any;
-			getOnDestroy () : (...args : any[]) => any;
-			getOnPause () : (...args : any[]) => any;
-			getOnPrepareOptionsMenu () : (...args : any[]) => any;
-			getOnRestart () : (...args : any[]) => any;
-			getOnResume () : (...args : any[]) => any;
-			getOnStart () : (...args : any[]) => any;
-			getOnStop () : (...args : any[]) => any;
-			getString (resourceId: number, format: any) : string;
-			invalidateOptionsMenu () : void;
-			openOptionsMenu () : void;
-			sendBroadcast (intent: Ti.Android.Intent) : void;
-			sendBroadcastWithPermission (intent: Ti.Android.Intent, receiverPermission?: string) : void;
-			setOnCreate (onCreate: (...args : any[]) => any) : void;
-			setOnCreateOptionsMenu (onCreateOptionsMenu: (...args : any[]) => any) : void;
-			setOnDestroy (onDestroy: (...args : any[]) => any) : void;
-			setOnPause (onPause: (...args : any[]) => any) : void;
-			setOnPrepareOptionsMenu (onPrepareOptionsMenu: (...args : any[]) => any) : void;
-			setOnRestart (onRestart: (...args : any[]) => any) : void;
-			setOnResume (onResume: (...args : any[]) => any) : void;
-			setOnStart (onStart: (...args : any[]) => any) : void;
-			setOnStop (onStop: (...args : any[]) => any) : void;
-			setRequestedOrientation (orientation: number) : void;
-			setResult (resultCode: number, intent?: Ti.Android.Intent) : void;
-			startActivity (intent: Ti.Android.Intent) : void;
-			startActivityForResult (intent: Ti.Android.Intent, callback: (...args : any[]) => any) : void;
-		}
-		export interface Service extends Ti.Proxy {
-			intent : Ti.Android.Intent;
-			serviceInstanceId : number;
-			getIntent () : Ti.Android.Intent;
-			getServiceInstanceId () : number;
-			start () : void;
-			stop () : void;
-		}
-		export interface RemoteViews extends Ti.Proxy {
-			layoutId : number;
-			packageName : string;
-			getLayoutId () : number;
-			getPackageName () : string;
-			setBoolean (viewId: number, methodName: string, value: boolean) : void;
-			setChronometer (viewId: number, base: Date, format: string, started: boolean) : void;
-			setDouble (viewId: number, methodName: string, value: number) : void;
-			setImageViewResource (viewId: number, srcId: number) : void;
-			setImageViewUri (viewId: number, uri: string) : void;
-			setInt (viewId: number, methodName: string, value: number) : void;
-			setOnClickPendingIntent (viewId: number, pendingIntent: Ti.Android.PendingIntent) : void;
-			setProgressBar (viewId: number, max: number, progress: number, indeterminate: boolean) : void;
-			setString (viewId: number, methodName: string, value: string) : void;
-			setTextColor (viewId: number, color: number) : void;
-			setTextViewText (viewId: number, text: string) : void;
-			setUri (viewId: number, methodName: string, value: string) : void;
-			setViewVisibility (viewId: number, visibility: number) : void;
-		}
-		export interface PendingIntent extends Ti.Proxy {
-			flags : number;
-			intent : Ti.Android.Intent;
-			updateCurrentIntent : boolean;
-			getFlags () : number;
-			getIntent () : Ti.Android.Intent;
-			getUpdateCurrentIntent () : boolean;
-		}
-	}
-	export module Database {
-		export var FIELD_TYPE_DOUBLE : number;
-		export var FIELD_TYPE_FLOAT : number;
-		export var FIELD_TYPE_INT : number;
-		export var FIELD_TYPE_STRING : number;
-		export var apiName : string;
-		export var bubbleParent : boolean;
-		export function addEventListener (name: string, callback: (...args : any[]) => any) : void;
-		export function applyProperties (props: Dictionary<Object>) : void;
-		export function fireEvent (name: string, event: Dictionary<Object>) : void;
-		export function getApiName () : string;
-		export function getBubbleParent () : boolean;
-		export function install (path: string, dbName: string) : Ti.Database.DB;
-		export function open (dbName: string) : Ti.Database.DB;
-		export function removeEventListener (name: string, callback: (...args : any[]) => any) : void;
-		export function setBubbleParent (bubbleParent: boolean) : void;
-		export interface ResultSet extends Ti.Proxy {
-			rowCount : number;
-			validRow : boolean;
-			close () : void;
-			field (index: number, type?: number) : any;
-			fieldByName (name: string, type?: number) : any;
-			fieldCount () : number;
-			fieldName (index: number) : string;
-			getFieldCount () : number;
-			getFieldName (index: number) : string;
-			getRowCount () : number;
-			getValidRow () : boolean;
-			isValidRow () : boolean;
-			next () : boolean;
-		}
-		export interface DB extends Ti.Proxy {
-			file : Ti.Filesystem.File;
-			lastInsertRowId : number;
-			name : string;
-			rowsAffected : number;
-			close () : void;
-			execute (sql: string, vararg?: string) : Ti.Database.ResultSet;
-			execute (vararg?: Array<String>) : Ti.Database.ResultSet;
-			execute (vararg?: any) : Ti.Database.ResultSet;
-			execute (sql: string, vararg?: Array<Object>) : Ti.Database.ResultSet;
-			getFile () : Ti.Filesystem.File;
-			getLastInsertRowId () : number;
-			getName () : string;
-			getRowsAffected () : number;
-			remove () : void;
-			setLastInsertRowId (lastInsertRowId: number) : void;
-			setName (name: string) : void;
-			setRowsAffected (rowsAffected: number) : void;
-		}
-	}
-	export module Contacts {
-		export var AUTHORIZATION_AUTHORIZED : number;
-		export var AUTHORIZATION_DENIED : number;
-		export var AUTHORIZATION_RESTRICTED : number;
-		export var AUTHORIZATION_UNKNOWN : number;
-		export var CONTACTS_KIND_ORGANIZATION : number;
-		export var CONTACTS_KIND_PERSON : number;
-		export var CONTACTS_SORT_FIRST_NAME : number;
-		export var CONTACTS_SORT_LAST_NAME : number;
-		export var apiName : string;
-		export var bubbleParent : boolean;
-		export var contactsAuthorization : number;
-		export function addEventListener (name: string, callback: (...args : any[]) => any) : void;
-		export function applyProperties (props: Dictionary<Object>) : void;
-		export function createGroup (parameters?: Dictionary<Ti.Contacts.Group>) : Ti.Contacts.Group;
-		export function createPerson (parameters?: Dictionary<Ti.Contacts.Person>) : Ti.Contacts.Person;
-		export function fireEvent (name: string, event: Dictionary<Object>) : void;
-		export function getAllGroups () : Array<Ti.Contacts.Group>;
-		export function getAllPeople (limit: number) : Array<Ti.Contacts.Person>;
-		export function getApiName () : string;
-		export function getBubbleParent () : boolean;
-		export function getContactsAuthorization () : number;
-		export function getGroupByID (id: number) : Ti.Contacts.Group;
-		export function getPeopleWithName (name: string) : Array<Ti.Contacts.Person>;
-		export function getPersonByID (id: number) : Ti.Contacts.Person;
-		export function removeEventListener (name: string, callback: (...args : any[]) => any) : void;
-		export function removeGroup (group: Ti.Contacts.Group) : void;
-		export function removePerson (person: Ti.Contacts.Person) : void;
-		export function requestAuthorization (callback: (...args : any[]) => any) : void;
-		export function revert () : void;
-		export function save (contacts: Array<Ti.Contacts.Person>) : void;
-		export function setBubbleParent (bubbleParent: boolean) : void;
-		export function showContacts (params: showContactsParams) : void;
-		export module Tizen {
-			export var apiName : string;
-			export function addEventListener (name: string, callback: (...args : any[]) => any) : void;
-			export function applyProperties (props: Dictionary<Object>) : void;
-			export function fireEvent (name: string, event: Dictionary<Object>) : void;
-			export function getAllPeople (callback: (...args : any[]) => any) : void;
-			export function getApiName () : string;
-			export function getPeopleWithName (name: string, callback: (...args : any[]) => any) : void;
-			export function removeEventListener (name: string, callback: (...args : any[]) => any) : void;
-			export interface Group  {
-				members (group: Ti.Contacts.Group, callback: (...args : any[]) => any) : void;
-				sortedMembers (sortBy: number, group: Ti.Contacts.Group, callback: (...args : any[]) => any) : void;
-			}
-		}
-		export interface Group extends Ti.Proxy {
-			name : string;
-			recordId : number;
-			add (person: Ti.Contacts.Person) : void;
-			getName () : string;
-			getRecordId () : number;
-			members () : Array<Ti.Contacts.Person>;
-			remove (person: Ti.Contacts.Person) : void;
-			setName (name: string) : void;
-			setRecordId (recordId: number) : void;
-			sortedMembers (sortBy: number) : Array<Ti.Contacts.Person>;
-		}
-		export interface Person extends Ti.Proxy {
-			address : Dictionary<Object>;
-			birthday : string;
-			created : string;
-			date : Dictionary<Object>;
-			department : string;
-			email : Dictionary<Object>;
-			firstName : string;
-			firstPhonetic : string;
-			fullName : string;
-			id : number;
-			image : Ti.Blob;
-			instantMessage : Dictionary<Object>;
-			jobTitle : string;
-			kind : number;
-			lastName : string;
-			lastPhonetic : string;
-			middleName : string;
-			middlePhonetic : string;
-			modified : string;
-			nickname : string;
-			note : string;
-			organization : string;
-			phone : Dictionary<Object>;
-			prefix : string;
-			recordId : number;
-			relatedNames : Dictionary<Object>;
-			suffix : string;
-			url : Dictionary<Object>;
-			getAddress () : Dictionary<Object>;
-			getBirthday () : string;
-			getCreated () : string;
-			getDate () : Dictionary<Object>;
-			getDepartment () : string;
-			getEmail () : Dictionary<Object>;
-			getFirstName () : string;
-			getFirstPhonetic () : string;
-			getFullName () : string;
-			getId () : number;
-			getImage () : Ti.Blob;
-			getInstantMessage () : Dictionary<Object>;
-			getJobTitle () : string;
-			getKind () : number;
-			getLastName () : string;
-			getLastPhonetic () : string;
-			getMiddleName () : string;
-			getMiddlePhonetic () : string;
-			getModified () : string;
-			getNickname () : string;
-			getNote () : string;
-			getOrganization () : string;
-			getPhone () : Dictionary<Object>;
-			getPrefix () : string;
-			getRecordId () : number;
-			getRelatedNames () : Dictionary<Object>;
-			getSuffix () : string;
-			getUrl () : Dictionary<Object>;
-			setAddress (address: Dictionary<Object>) : void;
-			setBirthday (birthday: string) : void;
-			setDate (date: Dictionary<Object>) : void;
-			setDepartment (department: string) : void;
-			setEmail (email: Dictionary<Object>) : void;
-			setFirstName (firstName: string) : void;
-			setFirstPhonetic (firstPhonetic: string) : void;
-			setImage (image: Ti.Blob) : void;
-			setInstantMessage (instantMessage: Dictionary<Object>) : void;
-			setJobTitle (jobTitle: string) : void;
-			setKind (kind: number) : void;
-			setLastName (lastName: string) : void;
-			setLastPhonetic (lastPhonetic: string) : void;
-			setMiddleName (middleName: string) : void;
-			setMiddlePhonetic (middlePhonetic: string) : void;
-			setNickname (nickname: string) : void;
-			setNote (note: string) : void;
-			setOrganization (organization: string) : void;
-			setPhone (phone: Dictionary<Object>) : void;
-			setRecordId (recordId: number) : void;
-			setRelatedNames (relatedNames: Dictionary<Object>) : void;
-			setUrl (url: Dictionary<Object>) : void;
-		}
-	}
-	export interface CloudPush  {
-		SERVICE_DISABLED : number;
-		SERVICE_INVALID : number;
-		SERVICE_MISSING : number;
-		SERVICE_VERSION_UPDATE_REQUIRED : number;
-		SUCCESS : number;
-		enabled : boolean;
-		focusAppOnPush : boolean;
-		showAppOnTrayClick : boolean;
-		showTrayNotification : boolean;
-		showTrayNotificationsWhenFocused : boolean;
-		singleCallback : boolean;
-		clearStatus () : void;
-		getEnabled () : boolean;
-		getFocusAppOnPush () : boolean;
-		getShowAppOnTrayClick () : boolean;
-		getShowTrayNotification () : boolean;
-		getShowTrayNotificationsWhenFocused () : boolean;
-		getSingleCallback () : boolean;
-		isGooglePlayServicesAvailable () : number;
-		retrieveDeviceToken (config: CloudPushNotificationConfig) : void;
-		setEnabled (enabled: boolean) : void;
-		setFocusAppOnPush (focusAppOnPush: boolean) : void;
-		setShowAppOnTrayClick (showAppOnTrayClick: boolean) : void;
-		setShowTrayNotification (showTrayNotification: boolean) : void;
-		setShowTrayNotificationsWhenFocused (showTrayNotificationsWhenFocused: boolean) : void;
-		setSingleCallback (singleCallback: boolean) : void;
-	}
-	export module Media {
-		export var AUDIO_FILEFORMAT_3GP2 : number;
-		export var AUDIO_FILEFORMAT_3GPP : number;
-		export var AUDIO_FILEFORMAT_AIFF : number;
-		export var AUDIO_FILEFORMAT_AMR : number;
-		export var AUDIO_FILEFORMAT_CAF : number;
-		export var AUDIO_FILEFORMAT_MP3 : number;
-		export var AUDIO_FILEFORMAT_MP4 : number;
-		export var AUDIO_FILEFORMAT_MP4A : number;
-		export var AUDIO_FILEFORMAT_WAVE : number;
-		export var AUDIO_FORMAT_AAC : number;
-		export var AUDIO_FORMAT_ALAW : number;
-		export var AUDIO_FORMAT_APPLE_LOSSLESS : number;
-		export var AUDIO_FORMAT_ILBC : number;
-		export var AUDIO_FORMAT_IMA4 : number;
-		export var AUDIO_FORMAT_LINEAR_PCM : number;
-		export var AUDIO_FORMAT_ULAW : number;
-		export var AUDIO_HEADPHONES : number;
-		export var AUDIO_HEADPHONES_AND_MIC : number;
-		export var AUDIO_HEADSET_INOUT : number;
-		export var AUDIO_LINEOUT : number;
-		export var AUDIO_MICROPHONE : number;
-		export var AUDIO_MUTED : number;
-		export var AUDIO_RECEIVER_AND_MIC : number;
-		export var AUDIO_SESSION_CATEGORY_AMBIENT : string;
-		export var AUDIO_SESSION_CATEGORY_PLAYBACK : string;
-		export var AUDIO_SESSION_CATEGORY_PLAY_AND_RECORD : string;
-		export var AUDIO_SESSION_CATEGORY_RECORD : string;
-		export var AUDIO_SESSION_CATEGORY_SOLO_AMBIENT : string;
-		export var AUDIO_SESSION_MODE_AMBIENT : number;
-		export var AUDIO_SESSION_MODE_PLAYBACK : number;
-		export var AUDIO_SESSION_MODE_PLAY_AND_RECORD : number;
-		export var AUDIO_SESSION_MODE_RECORD : number;
-		export var AUDIO_SESSION_MODE_SOLO_AMBIENT : number;
-		export var AUDIO_SESSION_OVERRIDE_ROUTE_NONE : number;
-		export var AUDIO_SESSION_OVERRIDE_ROUTE_SPEAKER : number;
-		export var AUDIO_SESSION_PORT_AIRPLAY : string;
-		export var AUDIO_SESSION_PORT_BLUETOOTHA2DP : string;
-		export var AUDIO_SESSION_PORT_BLUETOOTHHFP : string;
-		export var AUDIO_SESSION_PORT_BLUETOOTHLE : string;
-		export var AUDIO_SESSION_PORT_BUILTINMIC : string;
-		export var AUDIO_SESSION_PORT_BUILTINRECEIVER : string;
-		export var AUDIO_SESSION_PORT_BUILTINSPEAKER : string;
-		export var AUDIO_SESSION_PORT_CARAUDIO : string;
-		export var AUDIO_SESSION_PORT_HDMI : string;
-		export var AUDIO_SESSION_PORT_HEADPHONES : string;
-		export var AUDIO_SESSION_PORT_HEADSETMIC : string;
-		export var AUDIO_SESSION_PORT_LINEIN : string;
-		export var AUDIO_SESSION_PORT_LINEOUT : string;
-		export var AUDIO_SESSION_PORT_USBAUDIO : string;
-		export var AUDIO_SPEAKER : number;
-		export var AUDIO_UNAVAILABLE : number;
-		export var AUDIO_UNKNOWN : number;
-		export var CAMERA_FLASH_AUTO : number;
-		export var CAMERA_FLASH_OFF : number;
-		export var CAMERA_FLASH_ON : number;
-		export var CAMERA_FRONT : number;
-		export var CAMERA_REAR : number;
-		export var DEVICE_BUSY : number;
-		export var MEDIA_TYPE_PHOTO : string;
-		export var MEDIA_TYPE_VIDEO : string;
-		export var MUSIC_MEDIA_GROUP_ALBUM : number;
-		export var MUSIC_MEDIA_GROUP_ALBUM_ARTIST : number;
-		export var MUSIC_MEDIA_GROUP_ARTIST : number;
-		export var MUSIC_MEDIA_GROUP_COMPOSER : number;
-		export var MUSIC_MEDIA_GROUP_GENRE : number;
-		export var MUSIC_MEDIA_GROUP_PLAYLIST : number;
-		export var MUSIC_MEDIA_GROUP_PODCAST_TITLE : number;
-		export var MUSIC_MEDIA_GROUP_TITLE : number;
-		export var MUSIC_MEDIA_TYPE_ALL : number;
-		export var MUSIC_MEDIA_TYPE_ANY_AUDIO : number;
-		export var MUSIC_MEDIA_TYPE_AUDIOBOOK : number;
-		export var MUSIC_MEDIA_TYPE_MUSIC : number;
-		export var MUSIC_MEDIA_TYPE_PODCAST : number;
-		export var MUSIC_PLAYER_REPEAT_ALL : number;
-		export var MUSIC_PLAYER_REPEAT_DEFAULT : number;
-		export var MUSIC_PLAYER_REPEAT_NONE : number;
-		export var MUSIC_PLAYER_REPEAT_ONE : number;
-		export var MUSIC_PLAYER_SHUFFLE_ALBUMS : number;
-		export var MUSIC_PLAYER_SHUFFLE_DEFAULT : number;
-		export var MUSIC_PLAYER_SHUFFLE_NONE : number;
-		export var MUSIC_PLAYER_SHUFFLE_SONGS : number;
-		export var MUSIC_PLAYER_STATE_INTERRUPTED : number;
-		export var MUSIC_PLAYER_STATE_PAUSED : number;
-		export var MUSIC_PLAYER_STATE_PLAYING : number;
-		export var MUSIC_PLAYER_STATE_SEEK_BACKWARD : number;
-		export var MUSIC_PLAYER_STATE_SEEK_FORWARD : number;
-		export var MUSIC_PLAYER_STATE_STOPPED : number;
-		export var NO_CAMERA : number;
-		export var NO_VIDEO : number;
-		export var QUALITY_HIGH : number;
-		export var QUALITY_LOW : number;
-		export var QUALITY_MEDIUM : number;
-		export var UNKNOWN_ERROR : number;
-		export var VIDEO_CONTROL_DEFAULT : number;
-		export var VIDEO_CONTROL_EMBEDDED : number;
-		export var VIDEO_CONTROL_FULLSCREEN : number;
-		export var VIDEO_CONTROL_HIDDEN : number;
-		export var VIDEO_CONTROL_NONE : number;
-		export var VIDEO_CONTROL_VOLUME_ONLY : number;
-		export var VIDEO_FINISH_REASON_PLAYBACK_ENDED : number;
-		export var VIDEO_FINISH_REASON_PLAYBACK_ERROR : number;
-		export var VIDEO_FINISH_REASON_USER_EXITED : number;
-		export var VIDEO_LOAD_STATE_PLAYABLE : number;
-		export var VIDEO_LOAD_STATE_PLAYTHROUGH_OK : number;
-		export var VIDEO_LOAD_STATE_STALLED : number;
-		export var VIDEO_LOAD_STATE_UNKNOWN : number;
-		export var VIDEO_MEDIA_TYPE_AUDIO : number;
-		export var VIDEO_MEDIA_TYPE_NONE : number;
-		export var VIDEO_MEDIA_TYPE_VIDEO : number;
-		export var VIDEO_PLAYBACK_STATE_INTERRUPTED : number;
-		export var VIDEO_PLAYBACK_STATE_PAUSED : number;
-		export var VIDEO_PLAYBACK_STATE_PLAYING : number;
-		export var VIDEO_PLAYBACK_STATE_SEEKING_BACKWARD : number;
-		export var VIDEO_PLAYBACK_STATE_SEEKING_FORWARD : number;
-		export var VIDEO_PLAYBACK_STATE_STOPPED : number;
-		export var VIDEO_REPEAT_MODE_NONE : number;
-		export var VIDEO_REPEAT_MODE_ONE : number;
-		export var VIDEO_SCALING_ASPECT_FILL : number;
-		export var VIDEO_SCALING_ASPECT_FIT : number;
-		export var VIDEO_SCALING_MODE_FILL : number;
-		export var VIDEO_SCALING_NONE : number;
-		export var VIDEO_SOURCE_TYPE_FILE : number;
-		export var VIDEO_SOURCE_TYPE_STREAMING : number;
-		export var VIDEO_SOURCE_TYPE_UNKNOWN : number;
-		export var VIDEO_TIME_OPTION_EXACT : number;
-		export var VIDEO_TIME_OPTION_NEAREST_KEYFRAME : number;
-		export var apiName : string;
-		export var appMusicPlayer : Ti.Media.MusicPlayer;
-		export var audioLineType : number;
-		export var audioPlaying : boolean;
-		export var audioSessionCategory : number;
-		export var audioSessionMode : number;
-		export var availableCameraMediaTypes : Array<Object>;
-		export var availableCameras : Array<Number>;
-		export var availablePhotoGalleryMediaTypes : Array<Object>;
-		export var availablePhotoMediaTypes : Array<Object>;
-		export var averageMicrophonePower : number;
-		export var bubbleParent : boolean;
-		export var cameraFlashMode : number;
-		export var canRecord : boolean;
-		export var currentRoute : RouteDescription;
-		export var isCameraSupported : boolean;
-		export var peakMicrophonePower : number;
-		export var systemMusicPlayer : Ti.Media.MusicPlayer;
-		export var volume : number;
-		export function addEventListener (name: string, callback: (...args : any[]) => any) : void;
-		export function applyProperties (props: Dictionary<Object>) : void;
-		export function beep () : void;
-		export function createAudioPlayer (parameters?: Dictionary<Ti.Media.AudioPlayer>) : Ti.Media.AudioPlayer;
-		export function createAudioRecorder (parameters?: Dictionary<Ti.Media.AudioRecorder>) : Ti.Media.AudioRecorder;
-		export function createItem (parameters?: Dictionary<Ti.Media.Item>) : Ti.Media.Item;
-		export function createMusicPlayer (parameters?: Dictionary<Ti.Media.MusicPlayer>) : Ti.Media.MusicPlayer;
-		export function createSound (parameters?: Dictionary<Ti.Media.Sound>) : Ti.Media.Sound;
-		export function createVideoPlayer (parameters?: Dictionary<Ti.Media.VideoPlayer>) : Ti.Media.VideoPlayer;
-		export function fireEvent (name: string, event: Dictionary<Object>) : void;
-		export function getApiName () : string;
-		export function getAppMusicPlayer () : Ti.Media.MusicPlayer;
-		export function getAudioLineType () : number;
-		export function getAudioPlaying () : boolean;
-		export function getAudioSessionCategory () : number;
-		export function getAudioSessionMode () : number;
-		export function getAvailableCameraMediaTypes () : Array<Object>;
-		export function getAvailableCameras () : Array<Number>;
-		export function getAvailablePhotoGalleryMediaTypes () : Array<Object>;
-		export function getAvailablePhotoMediaTypes () : Array<Object>;
-		export function getAverageMicrophonePower () : number;
-		export function getBubbleParent () : boolean;
-		export function getCameraFlashMode () : number;
-		export function getCanRecord () : boolean;
-		export function getCurrentRoute () : RouteDescription;
-		export function getIsCameraSupported () : boolean;
-		export function getPeakMicrophonePower () : number;
-		export function getSystemMusicPlayer () : Ti.Media.MusicPlayer;
-		export function getVolume () : number;
-		export function hideCamera () : void;
-		export function hideMusicLibrary () : void;
-		export function isMediaTypeSupported (source: string, type: string) : boolean;
-		export function openMusicLibrary (options: MusicLibraryOptionsType) : void;
-		export function openPhotoGallery (options: PhotoGalleryOptionsType) : void;
-		export function previewImage (options: Dictionary<PreviewImageOptions>) : void;
-		export function queryMusicLibrary (query: MediaQueryType) : Array<Ti.Media.Item>;
-		export function removeEventListener (name: string, callback: (...args : any[]) => any) : void;
-		export function requestAuthorization (callback: (...args : any[]) => any) : void;
-		export function saveToPhotoGallery (media: Ti.Blob, callbacks: any) : void;
-		export function saveToPhotoGallery (media: Ti.Filesystem.File, callbacks: any) : void;
-		export function setAudioSessionCategory (audioSessionCategory: number) : void;
-		export function setAudioSessionMode (audioSessionMode: number) : void;
-		export function setAvailableCameraMediaTypes (availableCameraMediaTypes: Array<Object>) : void;
-		export function setAvailablePhotoGalleryMediaTypes (availablePhotoGalleryMediaTypes: Array<Object>) : void;
-		export function setAvailablePhotoMediaTypes (availablePhotoMediaTypes: Array<Object>) : void;
-		export function setAverageMicrophonePower (averageMicrophonePower: number) : void;
-		export function setBubbleParent (bubbleParent: boolean) : void;
-		export function setCameraFlashMode (cameraFlashMode: number) : void;
-		export function setOverrideAudioRoute (route: number) : void;
-		export function showCamera (options: CameraOptionsType) : void;
-		export function startMicrophoneMonitor () : void;
-		export function stopMicrophoneMonitor () : void;
-		export function switchCamera (camera: number) : void;
-		export function takePicture () : void;
-		export function takeScreenshot (callback: (...args : any[]) => any) : void;
-		export function vibrate (pattern?: Array<Number>) : void;
-		export interface Sound extends Ti.Proxy {
-			STATE_BUFFERING : number;
-			STATE_INITIALIZED : number;
-			STATE_PAUSED : number;
-			STATE_PLAYING : number;
-			STATE_STARTING : number;
-			STATE_STOPPED : number;
-			STATE_STOPPING : number;
-			STATE_WAITING_FOR_DATA : number;
-			STATE_WAITING_FOR_QUEUE : number;
-			allowBackground : boolean;
-			duration : number;
-			looping : boolean;
-			paused : boolean;
-			playing : boolean;
-			time : number;
-			url : string;
-			volume : number;
-			getDuration () : number;
-			getTime () : number;
-			getUrl () : string;
-			getVolume () : number;
-			isLooping () : boolean;
-			isPaused () : boolean;
-			isPlaying () : boolean;
-			pause () : void;
-			play () : void;
-			release () : void;
-			reset () : void;
-			setLooping (looping: boolean) : void;
-			setPaused (paused: boolean) : void;
-			setTime (time: number) : void;
-			setUrl (url: string) : void;
-			setVolume (volume: number) : void;
-			stop () : void;
-		}
-		export interface VideoPlayer extends Ti.UI.View {
-			allowsAirPlay : boolean;
-			autoplay : boolean;
-			contentURL : string;
-			currentPlaybackTime : number;
-			duration : number;
-			endPlaybackTime : number;
-			fullscreen : boolean;
-			initialPlaybackTime : number;
-			loadState : number;
-			media : any;
-			mediaControlStyle : number;
-			mediaTypes : number;
-			movieControlMode : number;
-			naturalSize : MovieSize;
-			playableDuration : number;
-			playbackState : number;
-			playing : boolean;
-			repeatMode : number;
-			scalingMode : number;
-			sourceType : number;
-			url : any;
-			useApplicationAudioSession : boolean;
-			volume : number;
-			cancelAllThumbnailImageRequests () : void;
-			getAllowsAirPlay () : boolean;
-			getAutoplay () : boolean;
-			getContentURL () : string;
-			getCurrentPlaybackTime () : number;
-			getDuration () : number;
-			getEndPlaybackTime () : number;
-			getFullscreen () : boolean;
-			getInitialPlaybackTime () : number;
-			getLoadState () : number;
-			getMediaControlStyle () : number;
-			getMediaTypes () : number;
-			getMovieControlMode () : number;
-			getNaturalSize () : MovieSize;
-			getPlayableDuration () : number;
-			getPlaybackState () : number;
-			getPlaying () : boolean;
-			getRepeatMode () : number;
-			getScalingMode () : number;
-			getSourceType () : number;
-			getUrl () : any;
-			getUseApplicationAudioSession () : boolean;
-			getVolume () : number;
-			pause () : void;
-			play () : void;
-			release () : void;
-			requestThumbnailImagesAtTimes (times: Array<Number>, option: number, callback: (...args : any[]) => any) : void;
-			setAllowsAirPlay (allowsAirPlay: boolean) : void;
-			setAutoplay (autoplay: boolean) : void;
-			setBackgroundView (view: Ti.UI.View) : void;
-			setContentURL (contentURL: string) : void;
-			setCurrentPlaybackTime (currentPlaybackTime: number) : void;
-			setDuration (duration: number) : void;
-			setEndPlaybackTime (endPlaybackTime: number) : void;
-			setFullscreen (fullscreen: boolean) : void;
-			setInitialPlaybackTime (initialPlaybackTime: number) : void;
-			setMedia (media: Ti.Blob) : void;
-			setMedia (media: Ti.Filesystem.File) : void;
-			setMedia (media: string) : void;
-			setMediaControlStyle (mediaControlStyle: number) : void;
-			setMediaTypes (mediaTypes: number) : void;
-			setMovieControlMode (movieControlMode: number) : void;
-			setNaturalSize (naturalSize: MovieSize) : void;
-			setRepeatMode (repeatMode: number) : void;
-			setScalingMode (scalingMode: number) : void;
-			setSourceType (sourceType: number) : void;
-			setUrl (url: string) : void;
-			setUrl (url: Array<String>) : void;
-			setUseApplicationAudioSession (useApplicationAudioSession: boolean) : void;
-			setVolume (volume: number) : void;
-			stop () : void;
-			thumbnailImageAtTime (time: number, option: number) : Ti.Blob;
-		}
-		export interface AudioRecorder extends Ti.Proxy {
-			compression : number;
-			format : number;
-			paused : boolean;
-			recording : boolean;
-			stopped : boolean;
-			getCompression () : number;
-			getFormat () : number;
-			getPaused () : boolean;
-			getRecording () : boolean;
-			getStopped () : boolean;
-			pause () : void;
-			resume () : void;
-			setCompression (compression: number) : void;
-			setFormat (format: number) : void;
-			start () : void;
-			stop () : Ti.Filesystem.File;
-		}
-		export interface Item extends Ti.Proxy {
-			albumArtist : string;
-			albumTitle : string;
-			albumTrackCount : number;
-			albumTrackNumber : number;
-			artist : string;
-			artwork : Ti.Blob;
-			composer : string;
-			discCount : number;
-			discNumber : number;
-			genre : string;
-			isCompilation : boolean;
-			lyrics : string;
-			mediaType : number;
-			playCount : number;
-			playbackDuration : number;
-			podcastTitle : string;
-			rating : number;
-			skipCount : number;
-			title : string;
-			getAlbumArtist () : string;
-			getAlbumTitle () : string;
-			getAlbumTrackCount () : number;
-			getAlbumTrackNumber () : number;
-			getArtist () : string;
-			getArtwork () : Ti.Blob;
-			getComposer () : string;
-			getDiscCount () : number;
-			getDiscNumber () : number;
-			getGenre () : string;
-			getIsCompilation () : boolean;
-			getLyrics () : string;
-			getMediaType () : number;
-			getPlayCount () : number;
-			getPlaybackDuration () : number;
-			getPodcastTitle () : string;
-			getRating () : number;
-			getSkipCount () : number;
-			getTitle () : string;
-		}
-		export interface MusicPlayer extends Ti.Proxy {
-			currentPlaybackTime : number;
-			nowPlaying : Ti.Media.Item;
-			playbackState : number;
-			repeatMode : number;
-			shuffleMode : number;
-			volume : number;
-			getCurrentPlaybackTime () : number;
-			getNowPlaying () : Ti.Media.Item;
-			getPlaybackState () : number;
-			getRepeatMode () : number;
-			getShuffleMode () : number;
-			getVolume () : number;
-			pause () : void;
-			play () : void;
-			seekBackward () : void;
-			seekForward () : void;
-			setCurrentPlaybackTime (currentPlaybackTime: number) : void;
-			setQueue (queue: Ti.Media.Item) : void;
-			setQueue (queue: Array<Ti.Media.Item>) : void;
-			setQueue (queue: PlayerQueue) : void;
-			setRepeatMode (repeatMode: number) : void;
-			setShuffleMode (shuffleMode: number) : void;
-			setVolume (volume: number) : void;
-			skipToBeginning () : void;
-			skipToNext () : void;
-			skipToPrevious () : void;
-			stop () : void;
-			stopSeeking () : void;
-		}
-		export interface AudioPlayer extends Ti.Proxy {
-			STATE_BUFFERING : number;
-			STATE_INITIALIZED : number;
-			STATE_PAUSED : number;
-			STATE_PLAYING : number;
-			STATE_STARTING : number;
-			STATE_STOPPED : number;
-			STATE_STOPPING : number;
-			STATE_WAITING_FOR_DATA : number;
-			STATE_WAITING_FOR_QUEUE : number;
-			allowBackground : boolean;
-			autoplay : boolean;
-			bitRate : number;
-			bufferSize : number;
-			duration : number;
-			idle : boolean;
-			paused : boolean;
-			playing : boolean;
-			progress : number;
-			state : number;
-			time : number;
-			url : string;
-			volume : number;
-			waiting : boolean;
-			getAllowBackground () : boolean;
-			getAutoplay () : boolean;
-			getBitRate () : number;
-			getBufferSize () : number;
-			getDuration () : number;
-			getIdle () : boolean;
-			getPaused () : boolean;
-			getPlaying () : boolean;
-			getProgress () : number;
-			getState () : number;
-			getTime () : number;
-			getUrl () : string;
-			getVolume () : number;
-			getWaiting () : boolean;
-			isPaused () : boolean;
-			isPlaying () : boolean;
-			pause () : void;
-			play () : void;
-			release () : void;
-			setBitRate (bitRate: number) : void;
-			setBufferSize (bufferSize: number) : void;
-			setPaused (paused: boolean) : void;
-			setTime (time: number) : void;
-			setUrl (url: string) : void;
-			setVolume (volume: number) : void;
-			start () : void;
-			stateDescription (state: number) : string;
-			stop () : void;
-		}
-		export interface Android  {
-			scanMediaFiles (paths: Array<String>, mimeTypes: Array<String>, callback: (...args : any[]) => any) : void;
-			setSystemWallpaper (image: Ti.Blob, scale: boolean) : void;
-		}
-	}
-	export module Platform {
-		export var BATTERY_STATE_CHARGING : number;
-		export var BATTERY_STATE_FULL : number;
-		export var BATTERY_STATE_UNKNOWN : number;
-		export var BATTERY_STATE_UNPLUGGED : number;
-		export var address : string;
-		export var apiName : string;
-		export var architecture : string;
-		export var availableMemory : number;
-		export var batteryLevel : number;
-		export var batteryMonitoring : boolean;
-		export var batteryState : number;
-		export var bubbleParent : boolean;
-		export var displayCaps : Ti.Platform.DisplayCaps;
-		export var id : string;
-		export var locale : string;
-		export var macaddress : string;
-		export var manufacturer : string;
-		export var model : string;
-		export var name : string;
-		export var netmask : string;
-		export var osname : string;
-		export var ostype : string;
-		export var processorCount : number;
-		export var runtime : string;
-		export var username : string;
-		export var version : string;
-		export function addEventListener (name: string, callback: (...args : any[]) => any) : void;
-		export function applyProperties (props: Dictionary<Object>) : void;
-		export function canOpenURL (url: string) : boolean;
-		export function createUUID () : string;
-		export function fireEvent (name: string, event: Dictionary<Object>) : void;
-		export function getAddress () : string;
-		export function getApiName () : string;
-		export function getArchitecture () : string;
-		export function getAvailableMemory () : number;
-		export function getBatteryLevel () : number;
-		export function getBatteryMonitoring () : boolean;
-		export function getBatteryState () : number;
-		export function getBubbleParent () : boolean;
-		export function getDisplayCaps () : Ti.Platform.DisplayCaps;
-		export function getId () : string;
-		export function getLocale () : string;
-		export function getMacaddress () : string;
-		export function getManufacturer () : string;
-		export function getModel () : string;
-		export function getName () : string;
-		export function getNetmask () : string;
-		export function getOsname () : string;
-		export function getOstype () : string;
-		export function getProcessorCount () : number;
-		export function getRuntime () : string;
-		export function getUsername () : string;
-		export function getVersion () : string;
-		export function is24HourTimeFormat () : boolean;
-		export function openURL (url: string) : boolean;
-		export function removeEventListener (name: string, callback: (...args : any[]) => any) : void;
-		export function setBatteryMonitoring (batteryMonitoring: boolean) : void;
-		export function setBubbleParent (bubbleParent: boolean) : void;
-		export interface DisplayCaps extends Ti.Proxy {
-			density : string;
-			dpi : number;
-			logicalDensityFactor : number;
-			platformHeight : number;
-			platformWidth : number;
-			xdpi : number;
-			ydpi : number;
-			getDensity () : string;
-			getDpi () : number;
-			getLogicalDensityFactor () : number;
-			getPlatformHeight () : number;
-			getPlatformWidth () : number;
-			getXdpi () : number;
-			getYdpi () : number;
-		}
-		export interface Android  {
-			API_LEVEL : number;
-			PHYSICAL_SIZE_CATEGORY_LARGE : number;
-			PHYSICAL_SIZE_CATEGORY_NORMAL : number;
-			PHYSICAL_SIZE_CATEGORY_SMALL : number;
-			PHYSICAL_SIZE_CATEGORY_UNDEFINED : number;
-			PHYSICAL_SIZE_CATEGORY_XLARGE : number;
-			physicalSizeCategory : number;
-			getPhysicalSizeCategory () : number;
-		}
-	}
-	export interface Buffer extends Ti.Proxy {
-		byteOrder : number;
-		length : number;
-		type : string;
-		value : any;
-		append (sourceBuffer: Ti.Buffer, sourceOffset?: number, sourceLength?: number) : number;
-		clear () : void;
-		clone (offset?: number, length?: number) : Ti.Buffer;
-		copy (sourceBuffer: Ti.Buffer, offset: number, sourceOffset?: number, sourceLength?: number) : number;
-		fill (fillByte: number, offset?: number, length?: number) : void;
-		getByteOrder () : number;
-		getLength () : number;
-		getType () : string;
-		getValue () : any;
-		insert (sourceBuffer: Ti.Buffer, offset: number, sourceOffset?: number, sourceLength?: number) : number;
-		release () : void;
-		setLength (length: number) : void;
-		toBlob () : Ti.Blob;
-		toString () : string;
-	}
-	export enum BufferStream {
+
+	/**
+	 * Base type for all Titanium modules.
+	 */
+	namespace Module {
+		/**
+		 * Indicates if the proxy will bubble an event to its parent.
+		 */
+		let bubbleParent: boolean;
+
+		/**
+		 * The name of the API that this proxy corresponds to.
+		 */
+		const apiName: string;
+
+		/**
+		 * The Window or TabGroup whose Activity lifecycle should be triggered on the proxy.
+		 */
+		let lifecycleContainer: Titanium.UI.Window | Titanium.UI.TabGroup;
+
+		/**
+		 * Adds the specified callback as an event listener for the named event.
+		 */
+		function addEventListener(name: string, callback: (param0: any) => any): void;
+
+		/**
+		 * Removes the specified callback as an event listener for the named event.
+		 */
+		function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+		/**
+		 * Fires a synthesized event to any registered listeners.
+		 */
+		function fireEvent(name: string, event: any): void;
+
+		/**
+		 * Applies the properties to the proxy.
+		 */
+		function applyProperties(props: any): void;
+
+		/**
+		 * Gets the value of the <Titanium.Module.bubbleParent> property.
+		 */
+		function getBubbleParent(): boolean;
+
+		/**
+		 * Sets the value of the <Titanium.Module.bubbleParent> property.
+		 */
+		function setBubbleParent(bubbleParent: boolean): void;
+
+		/**
+		 * Gets the value of the <Titanium.Module.apiName> property.
+		 */
+		function getApiName(): string;
+
+		/**
+		 * Gets the value of the <Titanium.Module.lifecycleContainer> property.
+		 */
+		function getLifecycleContainer(): Titanium.UI.Window | Titanium.UI.TabGroup;
+
+		/**
+		 * Sets the value of the <Titanium.Module.lifecycleContainer> property.
+		 */
+		function setLifecycleContainer(lifecycleContainer: Titanium.UI.Window): void;
+
+		/**
+		 * Sets the value of the <Titanium.Module.lifecycleContainer> property.
+		 */
+		function setLifecycleContainer(lifecycleContainer: Titanium.UI.TabGroup): void;
 
 	}
-	export module Calendar {
-		export var AUTHORIZATION_AUTHORIZED : number;
-		export var AUTHORIZATION_DENIED : number;
-		export var AUTHORIZATION_RESTRICTED : number;
-		export var AUTHORIZATION_UNKNOWN : number;
-		export var AVAILABILITY_BUSY : number;
-		export var AVAILABILITY_FREE : number;
-		export var AVAILABILITY_NOTSUPPORTED : number;
-		export var AVAILABILITY_TENTATIVE : number;
-		export var AVAILABILITY_UNAVAILABLE : number;
-		export var METHOD_ALERT : number;
-		export var METHOD_DEFAULT : number;
-		export var METHOD_EMAIL : number;
-		export var METHOD_SMS : number;
-		export var RECURRENCEFREQUENCY_DAILY : number;
-		export var RECURRENCEFREQUENCY_MONTHLY : number;
-		export var RECURRENCEFREQUENCY_WEEKLY : number;
-		export var RECURRENCEFREQUENCY_YEARLY : number;
-		export var SPAN_FUTUREEVENTS : number;
-		export var SPAN_THISEVENT : number;
-		export var STATE_DISMISSED : number;
-		export var STATE_FIRED : number;
-		export var STATE_SCHEDULED : number;
-		export var STATUS_CANCELED : number;
-		export var STATUS_CONFIRMED : number;
-		export var STATUS_NONE : number;
-		export var STATUS_TENTATIVE : number;
-		export var VISIBILITY_CONFIDENTIAL : number;
-		export var VISIBILITY_DEFAULT : number;
-		export var VISIBILITY_PRIVATE : number;
-		export var VISIBILITY_PUBLIC : number;
-		export var allAlerts : Array<Ti.Calendar.Alert>;
-		export var allCalendars : Array<Ti.Calendar.Calendar>;
-		export var allEditableCalendars : Array<Ti.Calendar.Calendar>;
-		export var apiName : string;
-		export var bubbleParent : boolean;
-		export var defaultCalendar : Ti.Calendar.Calendar;
-		export var eventsAuthorization : number;
-		export var selectableCalendars : Array<Ti.Calendar.Calendar>;
-		export function addEventListener (name: string, callback: (...args : any[]) => any) : void;
-		export function applyProperties (props: Dictionary<Object>) : void;
-		export function fireEvent (name: string, event: Dictionary<Object>) : void;
-		export function getAllAlerts () : Array<Ti.Calendar.Alert>;
-		export function getAllCalendars () : Array<Ti.Calendar.Calendar>;
-		export function getAllEditableCalendars () : Array<Ti.Calendar.Calendar>;
-		export function getApiName () : string;
-		export function getBubbleParent () : boolean;
-		export function getCalendarById (id: string) : Ti.Calendar.Calendar;
-		export function getDefaultCalendar () : Ti.Calendar.Calendar;
-		export function getEventsAuthorization () : number;
-		export function getSelectableCalendars () : Array<Ti.Calendar.Calendar>;
-		export function removeEventListener (name: string, callback: (...args : any[]) => any) : void;
-		export function requestEventsAuthorization (callback: (...args : any[]) => any) : void;
-		export function setBubbleParent (bubbleParent: boolean) : void;
-		export interface Calendar extends Ti.Proxy {
-			hidden : boolean;
-			id : string;
-			name : string;
-			selected : boolean;
-			createEvent (properties: Dictionary<Ti.Calendar.Event>) : Ti.Calendar.Event;
-			getEventById (id: number) : Ti.Calendar.Event;
-			getEventsBetweenDates (date1: Date, date2: Date) : Array<Ti.Calendar.Event>;
-			getEventsInDate (year: number, month: number, day: number) : Array<Ti.Calendar.Event>;
-			getEventsInMonth (year: number, month: number) : Array<Ti.Calendar.Event>;
-			getEventsInYear (year: number) : Array<Ti.Calendar.Event>;
-			getHidden () : boolean;
-			getId () : string;
-			getName () : string;
-			getSelected () : boolean;
-		}
-		export interface Reminder extends Ti.Proxy {
-			id : string;
-			method : number;
-			minutes : number;
-			getId () : string;
-			getMethod () : number;
-			getMinutes () : number;
-		}
-		export interface Event extends Ti.Proxy {
-			alerts : Array<Ti.Calendar.Alert>;
-			allDay : boolean;
-			availability : number;
-			begin : Date;
-			description : string;
-			end : Date;
-			extendedProperties : Dictionary<Object>;
-			hasAlarm : boolean;
-			id : string;
-			isDetached : boolean;
-			location : string;
-			notes : string;
-			recurenceRule : Ti.Calendar.RecurrenceRule;
-			recurenceRules : Array<Ti.Calendar.RecurrenceRule>;
-			reminders : Array<Ti.Calendar.Reminder>;
-			status : number;
-			title : string;
-			visibility : number;
-			addRecurrenceRule (rule: Ti.Calendar.RecurrenceRule) : void;
-			createAlert (data: Dictionary<Ti.Calendar.Alert>) : Ti.Calendar.Alert;
-			createRecurenceRule (data: Dictionary<Ti.Calendar.RecurrenceRule>) : Ti.Calendar.RecurrenceRule;
-			createReminder (data: Dictionary<Ti.Calendar.Reminder>) : Ti.Calendar.Reminder;
-			getAlerts () : Array<Ti.Calendar.Alert>;
-			getAllDay () : boolean;
-			getAvailability () : number;
-			getBegin () : Date;
-			getDescription () : string;
-			getEnd () : Date;
-			getExtendedProperties () : Dictionary<Object>;
-			getExtendedProperty (name: string) : string;
-			getHasAlarm () : boolean;
-			getId () : string;
-			getIsDetached () : boolean;
-			getLocation () : string;
-			getNotes () : string;
-			getRecurenceRule () : Ti.Calendar.RecurrenceRule;
-			getRecurenceRules () : Array<Ti.Calendar.RecurrenceRule>;
-			getReminders () : Array<Ti.Calendar.Reminder>;
-			getStatus () : number;
-			getTitle () : string;
-			getVisibility () : number;
-			refresh () : boolean;
-			remove (span: number) : boolean;
-			removeRecurenceRule (rule: Ti.Calendar.RecurrenceRule) : void;
-			save (span: number) : boolean;
-			setAlerts (alerts: Array<Ti.Calendar.Alert>) : void;
-			setAllDay (allDay: boolean) : void;
-			setBegin (begin: Date) : void;
-			setEnd (end: Date) : void;
-			setExtendedProperty (name: string, value: string) : void;
-			setLocation (location: string) : void;
-			setNotes (notes: string) : void;
-			setRecurenceRule (recurenceRule: Ti.Calendar.RecurrenceRule) : void;
-			setRecurenceRules (recurenceRules: Array<Ti.Calendar.RecurrenceRule>) : void;
-			setTitle (title: string) : void;
-		}
-		export interface RecurrenceRule extends Ti.Proxy {
-			calendarID : string;
-			daysOfTheMonth : Array<Number>;
-			daysOfTheWeek : daysOfTheWeekDictionary;
-			daysOfTheYear : Array<Number>;
-			end : recurrenceEndDictionary;
-			frequency : number;
-			interval : number;
-			monthsOfTheYear : Array<Number>;
-			setPositions : Array<Number>;
-			weeksOfTheYear : Array<Number>;
-			getCalendarID () : string;
-			getDaysOfTheMonth () : Array<Number>;
-			getDaysOfTheWeek () : daysOfTheWeekDictionary;
-			getDaysOfTheYear () : Array<Number>;
-			getEnd () : recurrenceEndDictionary;
-			getFrequency () : number;
-			getInterval () : number;
-			getMonthsOfTheYear () : Array<Number>;
-			getSetPositions () : Array<Number>;
-			getWeeksOfTheYear () : Array<Number>;
-		}
-		export interface Alert extends Ti.Proxy {
-			absoluteDate : Date;
-			alarmTime : Date;
-			begin : Date;
-			end : Date;
-			eventId : number;
-			id : string;
-			minutes : number;
-			relativeOffset : number;
-			state : number;
-			getAbsoluteDate () : Date;
-			getAlarmTime () : Date;
-			getBegin () : Date;
-			getEnd () : Date;
-			getEventId () : number;
-			getId () : string;
-			getMinutes () : number;
-			getRelativeOffset () : number;
-			getState () : number;
-			setAbsoluteDate (absoluteDate: Date) : void;
-			setRelativeOffset (relativeOffset: number) : void;
-		}
+
+	/**
+	 * The top-level API module, containing methods to output messages to the system log.
+	 */
+	namespace API {
+		/**
+		 * Indicates if the proxy will bubble an event to its parent.
+		 */
+		let bubbleParent: boolean;
+
+		/**
+		 * The name of the API that this proxy corresponds to.
+		 */
+		const apiName: string;
+
+		/**
+		 * The Window or TabGroup whose Activity lifecycle should be triggered on the proxy.
+		 */
+		let lifecycleContainer: Titanium.UI.Window | Titanium.UI.TabGroup;
+
+		/**
+		 * Adds the specified callback as an event listener for the named event.
+		 */
+		function addEventListener(name: string, callback: (param0: any) => any): void;
+
+		/**
+		 * Removes the specified callback as an event listener for the named event.
+		 */
+		function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+		/**
+		 * Fires a synthesized event to any registered listeners.
+		 */
+		function fireEvent(name: string, event: any): void;
+
+		/**
+		 * Applies the properties to the proxy.
+		 */
+		function applyProperties(props: any): void;
+
+		/**
+		 * Logs messages with a `debug` severity-level.
+		 */
+		function debug(message: ReadonlyArray<string>): void;
+
+		/**
+		 * Logs messages with a `debug` severity-level.
+		 */
+		function debug(message: string): void;
+
+		/**
+		 * Logs messages with an `error` severity-level.
+		 */
+		function error(message: ReadonlyArray<string>): void;
+
+		/**
+		 * Logs messages with an `error` severity-level.
+		 */
+		function error(message: string): void;
+
+		/**
+		 * Logs messages with an `info` severity-level.
+		 */
+		function info(message: ReadonlyArray<string>): void;
+
+		/**
+		 * Logs messages with an `info` severity-level.
+		 */
+		function info(message: string): void;
+
+		/**
+		 * Logs messages with the specified severity-level.
+		 */
+		function log(level: string, message: ReadonlyArray<string>): void;
+
+		/**
+		 * Logs messages with the specified severity-level.
+		 */
+		function log(level: string, message: string): void;
+
+		/**
+		 * Logs messages with a `timestamp` severity-level, prefixed with a timestamp float number
+		 * representing the number of seconds since January 1st, 2001.
+		 */
+		function timestamp(message: ReadonlyArray<string>): void;
+
+		/**
+		 * Logs messages with a `timestamp` severity-level, prefixed with a timestamp float number
+		 * representing the number of seconds since January 1st, 2001.
+		 */
+		function timestamp(message: string): void;
+
+		/**
+		 * Logs messages with a `trace` severity-level.
+		 */
+		function trace(message: ReadonlyArray<string>): void;
+
+		/**
+		 * Logs messages with a `trace` severity-level.
+		 */
+		function trace(message: string): void;
+
+		/**
+		 * Logs messages with a `warn` severity-level.
+		 */
+		function warn(message: ReadonlyArray<string>): void;
+
+		/**
+		 * Logs messages with a `warn` severity-level.
+		 */
+		function warn(message: string): void;
+
+		/**
+		 * Gets the value of the <Titanium.API.bubbleParent> property.
+		 */
+		function getBubbleParent(): boolean;
+
+		/**
+		 * Sets the value of the <Titanium.API.bubbleParent> property.
+		 */
+		function setBubbleParent(bubbleParent: boolean): void;
+
+		/**
+		 * Gets the value of the <Titanium.API.apiName> property.
+		 */
+		function getApiName(): string;
+
+		/**
+		 * Gets the value of the <Titanium.API.lifecycleContainer> property.
+		 */
+		function getLifecycleContainer(): Titanium.UI.Window | Titanium.UI.TabGroup;
+
+		/**
+		 * Sets the value of the <Titanium.API.lifecycleContainer> property.
+		 */
+		function setLifecycleContainer(lifecycleContainer: Titanium.UI.Window): void;
+
+		/**
+		 * Sets the value of the <Titanium.API.lifecycleContainer> property.
+		 */
+		function setLifecycleContainer(lifecycleContainer: Titanium.UI.TabGroup): void;
+
 	}
-	export module Filesystem {
-		export var MODE_APPEND : number;
-		export var MODE_READ : number;
-		export var MODE_WRITE : number;
-		export var apiName : string;
-		export var applicationCacheDirectory : string;
-		export var applicationDataDirectory : string;
-		export var applicationDirectory : string;
-		export var applicationSupportDirectory : string;
-		export var bubbleParent : boolean;
-		export var externalStorageDirectory : string;
-		export var lineEnding : string;
-		export var resRawDirectory : string;
-		export var resourcesDirectory : string;
-		export var separator : string;
-		export var tempDirectory : string;
-		export function addEventListener (name: string, callback: (...args : any[]) => any) : void;
-		export function applyProperties (props: Dictionary<Object>) : void;
-		export function createTempDirectory () : Ti.Filesystem.File;
-		export function createTempFile () : Ti.Filesystem.File;
-		export function fireEvent (name: string, event: Dictionary<Object>) : void;
-		export function getApiName () : string;
-		export function getApplicationCacheDirectory () : string;
-		export function getApplicationDataDirectory () : string;
-		export function getApplicationDirectory () : string;
-		export function getApplicationSupportDirectory () : string;
-		export function getBubbleParent () : boolean;
-		export function getExternalStorageDirectory () : string;
-		export function getFile (path: string, ...extraPaths: string[]) : Ti.Filesystem.File;
-		export function getLineEnding () : string;
-		export function getResRawDirectory () : string;
-		export function getResourcesDirectory () : string;
-		export function getSeparator () : string;
-		export function getTempDirectory () : string;
-		export function isExternalStoragePresent () : boolean;
-		export function openStream (mode: number, path: string, ...extraPaths: string[]) : Ti.Filesystem.FileStream;
-		export function removeEventListener (name: string, callback: (...args : any[]) => any) : void;
-		export function setBubbleParent (bubbleParent: boolean) : void;
-		export interface File extends Ti.Proxy {
-			executable : boolean;
-			hidden : boolean;
-			name : string;
-			nativePath : string;
-			parent : Ti.Filesystem.File;
-			readonly : boolean;
-			remoteBackup : boolean;
-			size : number;
-			symbolicLink : boolean;
-			writable : boolean;
-			writeable : boolean;
-			append (data: string) : boolean;
-			append (data: Ti.Blob) : boolean;
-			append (data: Ti.Filesystem.File) : boolean;
-			copy (destinationPath: string) : boolean;
-			createDirectory () : boolean;
-			createFile () : boolean;
-			createTimestamp () : number;
-			deleteDirectory (recursive?: boolean) : boolean;
-			deleteFile () : boolean;
-			exists () : boolean;
-			extension () : string;
-			getDirectoryListing () : Array<String>;
-			getExecutable () : boolean;
-			getHidden () : boolean;
-			getName () : string;
-			getNativePath () : string;
-			getParent () : any;
-			getReadonly () : boolean;
-			getRemoteBackup () : boolean;
-			getSize () : number;
-			getSymbolicLink () : boolean;
-			getWritable () : boolean;
-			getWriteable () : boolean;
-			isDirectory () : boolean;
-			isFile () : boolean;
-			modificationTimestamp () : number;
-			move (newpath: string) : boolean;
-			open (mode: number) : Ti.Filesystem.FileStream;
-			read () : Ti.Blob;
-			rename (newname: string) : boolean;
-			resolve () : string;
-			setHidden (hidden: boolean) : void;
-			setRemoteBackup (remoteBackup: boolean) : void;
-			spaceAvailable () : number;
-			write (data: string, append?: boolean) : boolean;
-			write (data: Ti.Filesystem.File, append?: boolean) : boolean;
-			write (data: Ti.Blob, append?: boolean) : boolean;
+
+	/**
+	 * The top-level Accelerometer module, used to determine the device's physical position.
+	 */
+	namespace Accelerometer {
+		/**
+		 * Indicates if the proxy will bubble an event to its parent.
+		 */
+		let bubbleParent: boolean;
+
+		/**
+		 * The name of the API that this proxy corresponds to.
+		 */
+		const apiName: string;
+
+		/**
+		 * The Window or TabGroup whose Activity lifecycle should be triggered on the proxy.
+		 */
+		let lifecycleContainer: Titanium.UI.Window | Titanium.UI.TabGroup;
+
+		/**
+		 * Adds the specified callback as an event listener for the named event.
+		 */
+		function addEventListener(name: string, callback: (param0: any) => any): void;
+
+		/**
+		 * Removes the specified callback as an event listener for the named event.
+		 */
+		function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+		/**
+		 * Fires a synthesized event to any registered listeners.
+		 */
+		function fireEvent(name: string, event: any): void;
+
+		/**
+		 * Applies the properties to the proxy.
+		 */
+		function applyProperties(props: any): void;
+
+		/**
+		 * Gets the value of the <Titanium.Accelerometer.bubbleParent> property.
+		 */
+		function getBubbleParent(): boolean;
+
+		/**
+		 * Sets the value of the <Titanium.Accelerometer.bubbleParent> property.
+		 */
+		function setBubbleParent(bubbleParent: boolean): void;
+
+		/**
+		 * Gets the value of the <Titanium.Accelerometer.apiName> property.
+		 */
+		function getApiName(): string;
+
+		/**
+		 * Gets the value of the <Titanium.Accelerometer.lifecycleContainer> property.
+		 */
+		function getLifecycleContainer(): Titanium.UI.Window | Titanium.UI.TabGroup;
+
+		/**
+		 * Sets the value of the <Titanium.Accelerometer.lifecycleContainer> property.
+		 */
+		function setLifecycleContainer(lifecycleContainer: Titanium.UI.Window): void;
+
+		/**
+		 * Sets the value of the <Titanium.Accelerometer.lifecycleContainer> property.
+		 */
+		function setLifecycleContainer(lifecycleContainer: Titanium.UI.TabGroup): void;
+
+	}
+
+	/**
+	 * Used for transmitting developer-defined Analytics events to the Appcelerator Analytics product.
+	 */
+	namespace Analytics {
+		/**
+		 * Indicates if the proxy will bubble an event to its parent.
+		 */
+		let bubbleParent: boolean;
+
+		/**
+		 * The name of the API that this proxy corresponds to.
+		 */
+		const apiName: string;
+
+		/**
+		 * The Window or TabGroup whose Activity lifecycle should be triggered on the proxy.
+		 */
+		let lifecycleContainer: Titanium.UI.Window | Titanium.UI.TabGroup;
+
+		/**
+		 * JSON representation of the last analytics event generated.
+		 */
+		const lastEvent: string;
+
+		/**
+		 * Sends a generic event for this application session.
+		 * **Not displayed in Analytics UI**.
+		 */
+		function addEvent(type: string, name: string, data?: any): void;
+
+		/**
+		 * Sends a feature event for this application session.
+		 */
+		function featureEvent(name: string, data?: any): number;
+
+		/**
+		 * Sets a list of events that will not be sent to the analytics server.
+		 */
+		function filterEvents(events: ReadonlyArray<string>): void;
+
+		/**
+		 * Sends a navigation event for this application session.
+		 * **Not displayed in Analytics UI**.
+		 */
+		function navEvent(from: string, to: string, name?: string, data?: any): void;
+
+		/**
+		 * Sends a settings event for this application session.
+		 * **Not displayed in Analytics UI**.
+		 */
+		function settingsEvent(name: string, data?: any): void;
+
+		/**
+		 * Send a timed event for this application session.
+		 * **Not displayed in Analytics UI**.
+		 */
+		function timedEvent(name: string, start: Date, stop: Date, duration: number, data?: any): void;
+
+		/**
+		 * Sends a user event for this application session. **Not displayed in Analytics UI**.
+		 */
+		function userEvent(name: string, data?: any): void;
+
+		/**
+		 * Gets the value of the <Titanium.Analytics.bubbleParent> property.
+		 */
+		function getBubbleParent(): boolean;
+
+		/**
+		 * Sets the value of the <Titanium.Analytics.bubbleParent> property.
+		 */
+		function setBubbleParent(bubbleParent: boolean): void;
+
+		/**
+		 * Gets the value of the <Titanium.Analytics.apiName> property.
+		 */
+		function getApiName(): string;
+
+		/**
+		 * Gets the value of the <Titanium.Analytics.lifecycleContainer> property.
+		 */
+		function getLifecycleContainer(): Titanium.UI.Window | Titanium.UI.TabGroup;
+
+		/**
+		 * Sets the value of the <Titanium.Analytics.lifecycleContainer> property.
+		 */
+		function setLifecycleContainer(lifecycleContainer: Titanium.UI.Window): void;
+
+		/**
+		 * Sets the value of the <Titanium.Analytics.lifecycleContainer> property.
+		 */
+		function setLifecycleContainer(lifecycleContainer: Titanium.UI.TabGroup): void;
+
+		/**
+		 * Gets the value of the <Titanium.Analytics.lastEvent> property.
+		 */
+		function getLastEvent(): string;
+
+	}
+
+	/**
+	 * The top-level Android module.
+	 */
+	namespace Android {
+		/**
+		 * Indicates if the proxy will bubble an event to its parent.
+		 */
+		let bubbleParent: boolean;
+
+		/**
+		 * The name of the API that this proxy corresponds to.
+		 */
+		const apiName: string;
+
+		/**
+		 * The Window or TabGroup whose Activity lifecycle should be triggered on the proxy.
+		 */
+		let lifecycleContainer: Titanium.UI.Window | Titanium.UI.TabGroup;
+
+		/**
+		 * User switched airplane mode on or off.
+		 */
+		const ACTION_AIRPLANE_MODE_CHANGED: string;
+
+		/**
+		 * List all applications.
+		 */
+		const ACTION_ALL_APPS: string;
+
+		/**
+		 * Handle an incoming phone call.
+		 */
+		const ACTION_ANSWER: string;
+
+		/**
+		 * Used to indicate that the data is an attachment.
+		 */
+		const ACTION_ATTACH_DATA: string;
+
+		/**
+		 * Listen to battery state change status.
+		 */
+		const ACTION_BATTERY_CHANGED: string;
+
+		/**
+		 * Indicates low battery condition on the device.
+		 */
+		const ACTION_BATTERY_LOW: string;
+
+		/**
+		 * Inidicates the battery is now okay after being low.
+		 */
+		const ACTION_BATTERY_OKAY: string;
+
+		/**
+		 * Indicates the system has finished booting.
+		 */
+		const ACTION_BOOT_COMPLETED: string;
+
+		/**
+		 * Show activity for reporting a bug.
+		 */
+		const ACTION_BUG_REPORT: string;
+
+		/**
+		 * Perform a call to someone specified by the `data` property.
+		 */
+		const ACTION_CALL: string;
+
+		/**
+		 * User pressed the call button.
+		 */
+		const ACTION_CALL_BUTTON: string;
+
+		/**
+		 * The camera button was pressed.
+		 */
+		const ACTION_CAMERA_BUTTON: string;
+
+		/**
+		 * Display an activity chooser.
+		 */
+		const ACTION_CHOOSER: string;
+
+		/**
+		 * User dismissed a temporary system dialog, such as the notification drawer or recent-app drawer.
+		 */
+		const ACTION_CLOSE_SYSTEM_DIALOGS: string;
+
+		/**
+		 * The device's configuration changed.
+		 */
+		const ACTION_CONFIGURATION_CHANGED: string;
+
+		/**
+		 * Create a shortcut.
+		 */
+		const ACTION_CREATE_SHORTCUT: string;
+
+		/**
+		 * Date changed.
+		 */
+		const ACTION_DATE_CHANGED: string;
+
+		/**
+		 * Default action, which is `Titanium.Android.ACTION_VIEW`
+		 */
+		const ACTION_DEFAULT: string;
+
+		/**
+		 * Delete the data specified by the Intent's `data` property.
+		 */
+		const ACTION_DELETE: string;
+
+		/**
+		 * Indicates a low memory condition on the device.
+		 */
+		const ACTION_DEVICE_STORAGE_LOW: string;
+
+		/**
+		 * Dial a number specified by the Intent's `data` property.
+		 */
+		const ACTION_DIAL: string;
+
+		/**
+		 * Provide editable access to the data specified by the Intent's `data` property.
+		 */
+		const ACTION_EDIT: string;
+
+		/**
+		 * Allow the user to select a particular kind of data specified by the Intent's `type` property.
+		 */
+		const ACTION_GET_CONTENT: string;
+
+		/**
+		 * GTalk connection has been established.
+		 */
+		const ACTION_GTALK_SERVICE_CONNECTED: string;
+
+		/**
+		 * GTalk connections has been disconnected.
+		 */
+		const ACTION_GTALK_SERVICE_DISCONNECTED: string;
+
+		/**
+		 * A wired headset has been plugged in or unplugged.
+		 */
+		const ACTION_HEADSET_PLUG: string;
+
+		/**
+		 * An input method has been changed.
+		 */
+		const ACTION_INPUT_METHOD_CHANGED: string;
+
+		/**
+		 * Insert an empty item into the given container.
+		 */
+		const ACTION_INSERT: string;
+
+		/**
+		 * Pick an existing item or insert an empty item, then edit it.
+		 */
+		const ACTION_INSERT_OR_EDIT: string;
+
+		/**
+		 * Start as the main entry point.
+		 */
+		const ACTION_MAIN: string;
+
+		/**
+		 * Indicates low memory condition notification acknowledged by user and package management should be started.
+		 */
+		const ACTION_MANAGE_PACKAGE_STORAGE: string;
+
+		/**
+		 * External media was removed from SD card slot, but mount point was not unmounted.
+		 */
+		const ACTION_MEDIA_BAD_REMOVAL: string;
+
+		/**
+		 * The media button was pressed.
+		 */
+		const ACTION_MEDIA_BUTTON: string;
+
+		/**
+		 * External media is present and being disk-checked
+		 */
+		const ACTION_MEDIA_CHECKING: string;
+
+		/**
+		 * User has expressed the desire to remove the external storage media.
+		 */
+		const ACTION_MEDIA_EJECT: string;
+
+		/**
+		 * External media is present and mounted at its mount point.
+		 */
+		const ACTION_MEDIA_MOUNTED: string;
+
+		/**
+		 * External media is present, but is using an incompatible filesystem or is blank.
+		 */
+		const ACTION_MEDIA_NOFS: string;
+
+		/**
+		 * External media has been removed.
+		 */
+		const ACTION_MEDIA_REMOVED: string;
+
+		/**
+		 * The media scanner has finished scanning a directory.
+		 */
+		const ACTION_MEDIA_SCANNER_FINISHED: string;
+
+		/**
+		 * Request the media scanner to scan a file and add it to the media database.
+		 */
+		const ACTION_MEDIA_SCANNER_SCAN_FILE: string;
+
+		/**
+		 * The media scanner has started scanning a directory.
+		 */
+		const ACTION_MEDIA_SCANNER_STARTED: string;
+
+		/**
+		 * External media is unmounted because it is being shared via USB mass storage.
+		 */
+		const ACTION_MEDIA_SHARED: string;
+
+		/**
+		 * Corresponds to the Android `Intent.ACTION_MEDIA_UNMOUNTABLE` constant.
+		 */
+		const ACTION_MEDIA_UNMOUNTABLE: string;
+
+		/**
+		 * External media is present, but not mounted at its mount point.
+		 */
+		const ACTION_MEDIA_UNMOUNTED: string;
+
+		/**
+		 * An outgoing call is about to be placed.
+		 */
+		const ACTION_NEW_OUTGOING_CALL: string;
+
+		/**
+		 * A new application package has been installed on the device.
+		 */
+		const ACTION_PACKAGE_ADDED: string;
+
+		/**
+		 * An existing application package has been changed.
+		 */
+		const ACTION_PACKAGE_CHANGED: string;
+
+		/**
+		 * The user has cleared the data of a package.
+		 */
+		const ACTION_PACKAGE_DATA_CLEARED: string;
+
+		/**
+		 * Trigger the download and eventual installation of a package.
+		 */
+		const ACTION_PACKAGE_INSTALL: string;
+
+		/**
+		 * An existing application package has been removed from the device.
+		 */
+		const ACTION_PACKAGE_REMOVED: string;
+
+		/**
+		 * A new version of an application package has been installed, replacing an existing version that was previously installed.
+		 */
+		const ACTION_PACKAGE_REPLACED: string;
+
+		/**
+		 * The user has restarted a package, and all of its processes have been killed.
+		 */
+		const ACTION_PACKAGE_RESTARTED: string;
+
+		/**
+		 * Pick an item from the directory indicated by the Intent's `data` property.
+		 */
+		const ACTION_PICK: string;
+
+		/**
+		 * Pick an activity given an intent.
+		 */
+		const ACTION_PICK_ACTIVITY: string;
+
+		/**
+		 * External power has been connected to the device.
+		 */
+		const ACTION_POWER_CONNECTED: string;
+
+		/**
+		 * External power has been disconnected from the device.
+		 */
+		const ACTION_POWER_DISCONNECTED: string;
+
+		/**
+		 * Show power usage information to the user.
+		 */
+		const ACTION_POWER_USAGE_SUMMARY: string;
+
+		/**
+		 * Content provider published new events or items.
+		 */
+		const ACTION_PROVIDER_CHANGED: string;
+
+		/**
+		 * Device rebooted.
+		 */
+		const ACTION_REBOOT: string;
+
+		/**
+		 * Run the data.
+		 */
+		const ACTION_RUN: string;
+
+		/**
+		 * Sent when the device goes to sleep and becomes non-interactive.
+		 */
+		const ACTION_SCREEN_OFF: string;
+
+		/**
+		 * Sent when the device wakes up and becomes interactive.
+		 */
+		const ACTION_SCREEN_ON: string;
+
+		/**
+		 * Perform a search.
+		 */
+		const ACTION_SEARCH: string;
+
+		/**
+		 * Start action associated with long pressing on the search key.
+		 */
+		const ACTION_SEARCH_LONG_PRESS: string;
+
+		/**
+		 * Deliver data to another activity.
+		 */
+		const ACTION_SEND: string;
+
+		/**
+		 * Deliver data to the recipient specified by the Intent's `data` property.
+		 */
+		const ACTION_SENDTO: string;
+
+		/**
+		 * Deliver multiple data to another activity.
+		 */
+		const ACTION_SEND_MULTIPLE: string;
+
+		/**
+		 * Show settings for choosing the system wallpaper.
+		 */
+		const ACTION_SET_WALLPAPER: string;
+
+		/**
+		 * Device is shutting down.
+		 */
+		const ACTION_SHUTDOWN: string;
+
+		/**
+		 * Perform data synchronization.
+		 */
+		const ACTION_SYNC: string;
+
+		/**
+		 * Start the platform-defined tutorial.
+		 */
+		const ACTION_SYSTEM_TUTORIAL: string;
+
+		/**
+		 * The time was set.
+		 */
+		const ACTION_TIME_CHANGED: string;
+
+		/**
+		 * The current time changed.  Sent every minute.
+		 */
+		const ACTION_TIME_TICK: string;
+
+		/**
+		 * A user ID was removed from the system.
+		 */
+		const ACTION_UID_REMOVED: string;
+
+		/**
+		 * The device has entered USB Mass Storage mode.
+		 */
+		const ACTION_UMS_CONNECTED: string;
+
+		/**
+		 * The device has exited USB Mass Storage mode.
+		 */
+		const ACTION_UMS_DISCONNECTED: string;
+
+		/**
+		 * Sent when the user is present after device wakes up.
+		 */
+		const ACTION_USER_PRESENT: string;
+
+		/**
+		 * Display data to the user.
+		 */
+		const ACTION_VIEW: string;
+
+		/**
+		 * Start voice command.
+		 */
+		const ACTION_VOICE_COMMAND: string;
+
+		/**
+		 * The current system wallpaper has changed.
+		 */
+		const ACTION_WALLPAPER_CHANGED: string;
+
+		/**
+		 * Perform a web search.
+		 */
+		const ACTION_WEB_SEARCH: string;
+
+		/**
+		 * Set if the activity should be considered as an alternative action to the data the user is currently viewing.
+		 */
+		const CATEGORY_ALTERNATIVE: string;
+
+		/**
+		 * Activity can browse the Internet.
+		 */
+		const CATEGORY_BROWSABLE: string;
+
+		/**
+		 * Activity should be used as the default action to perform on a piece of data.
+		 */
+		const CATEGORY_DEFAULT: string;
+
+		/**
+		 * Activity is in the development preference panel.
+		 */
+		const CATEGORY_DEVELOPMENT_PREFERENCE: string;
+
+		/**
+		 * Activity can run inside a parent activity.
+		 */
+		const CATEGORY_EMBED: string;
+
+		/**
+		 * To be used as test code for framework instrumentation tests.
+		 */
+		const CATEGORY_FRAMEWORK_INSTRUMENTATION_TEST: string;
+
+		/**
+		 * Home activity, the first activity that is displayed when the device boots.
+		 */
+		const CATEGORY_HOME: string;
+
+		/**
+		 * Provides information about the package it is in.
+		 */
+		const CATEGORY_INFO: string;
+
+		/**
+		 * Activity is in the device's launcher.
+		 */
+		const CATEGORY_LAUNCHER: string;
+
+		/**
+		 * This activity may be exercised by the monkey or other automated test tools.
+		 */
+		const CATEGORY_MONKEY: string;
+
+		/**
+		 * Activity can open raw `file://` or `scheme://` URIs.
+		 */
+		const CATEGORY_OPENABLE: string;
+
+		/**
+		 * This activity is a preference panel.
+		 */
+		const CATEGORY_PREFERENCE: string;
+
+		/**
+		 * To be used as a sample code example (not part of the normal user experience).
+		 */
+		const CATEGORY_SAMPLE_CODE: string;
+
+		/**
+		 * Activity should be considered as an alternative selection action to the data the user
+		 * has currently selected.
+		 */
+		const CATEGORY_SELECTED_ALTERNATIVE: string;
+
+		/**
+		 * Activity to be used in a tab activity.
+		 */
+		const CATEGORY_TAB: string;
+
+		/**
+		 * To be used as a test (not part of the normal user experience).
+		 */
+		const CATEGORY_TEST: string;
+
+		/**
+		 * To be used as a unit test (run through the Test Harness).
+		 */
+		const CATEGORY_UNIT_TEST: string;
+
+		/**
+		 * Integer indicating how many pending alarms are being delivered with the intent.
+		 */
+		const EXTRA_ALARM_COUNT: string;
+
+		/**
+		 * String array containing e-mail addresses for blind carbon copying.
+		 */
+		const EXTRA_BCC: string;
+
+		/**
+		 * String array containing e-mail addresses for carbon copying.
+		 */
+		const EXTRA_CC: string;
+
+		/**
+		 * Boolean indicating full uninstall (true) or partial uninstall (false).
+		 */
+		const EXTRA_DATA_REMOVED: string;
+
+		/**
+		 * Boolean indicating to restart the application or not.
+		 */
+		const EXTRA_DONT_KILL_APP: string;
+
+		/**
+		 * String array containing e-mail addresses.
+		 */
+		const EXTRA_EMAIL: string;
+
+		/**
+		 * An Intent describing the choices you would like shown.
+		 */
+		const EXTRA_INTENT: string;
+
+		/**
+		 * A KeyEvent object containing the event that triggered the creation of the Intent it is in.
+		 */
+		const EXTRA_KEY_EVENT: string;
+
+		/**
+		 * String holding the phone number to call or number that was called.
+		 */
+		const EXTRA_PHONE_NUMBER: string;
+
+		/**
+		 * Boolean indicating if the package is being replaced.
+		 */
+		const EXTRA_REPLACING: string;
+
+		/**
+		 * Bitmap icon.
+		 */
+		const EXTRA_SHORTCUT_ICON: string;
+
+		/**
+		 * Resource of the shortcut.
+		 */
+		const EXTRA_SHORTCUT_ICON_RESOURCE: string;
+
+		/**
+		 * Intent of a shortcut.
+		 */
+		const EXTRA_SHORTCUT_INTENT: string;
+
+		/**
+		 * Name of the shortcut.
+		 */
+		const EXTRA_SHORTCUT_NAME: string;
+
+		/**
+		 * URI containing the stream data.
+		 */
+		const EXTRA_STREAM: string;
+
+		/**
+		 * Subject line of a message.
+		 */
+		const EXTRA_SUBJECT: string;
+
+		/**
+		 * Initial data to place in a newly created record.
+		 */
+		const EXTRA_TEMPLATE: string;
+
+		/**
+		 * Corresponds to the Android `Intent.EXTRA_TEXT` constant.
+		 */
+		const EXTRA_TEXT: string;
+
+		/**
+		 * Corresponds to the Android `Intent.EXTRA_TITLE` constant.
+		 */
+		const EXTRA_TITLE: string;
+
+		/**
+		 * UID of the assigned packaged.
+		 */
+		const EXTRA_UID: string;
+
+		/**
+		 * Not used.
+		 */
+		const FILL_IN_ACTION: number;
+
+		/**
+		 * Not used.
+		 */
+		const FILL_IN_CATEGORIES: number;
+
+		/**
+		 * Not used.
+		 */
+		const FILL_IN_COMPONENT: number;
+
+		/**
+		 * Not used.
+		 */
+		const FILL_IN_DATA: number;
+
+		/**
+		 * Not used.
+		 */
+		const FILL_IN_PACKAGE: number;
+
+		/**
+		 * If activity is already running, bring it to the foreground.
+		 */
+		const FLAG_ACTIVITY_BROUGHT_TO_FRONT: number;
+
+		/**
+		 * If the activity is present, removes any activities on top of it to make it the foreground activity.
+		 */
+		const FLAG_ACTIVITY_CLEAR_TOP: number;
+
+		/**
+		 * Corresponds to the Android `Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET` constant.
+		 */
+		const FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET: number;
+
+		/**
+		 * Exclude the activity from recently launched activities.
+		 */
+		const FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS: number;
+
+		/**
+		 * Return result to the original calling activity.
+		 */
+		const FLAG_ACTIVITY_FORWARD_RESULT: number;
+
+		/**
+		 * Activity was launched from history.
+		 */
+		const FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY: number;
+
+		/**
+		 * Start the activity as a new task even if it exists.
+		 */
+		const FLAG_ACTIVITY_MULTIPLE_TASK: number;
+
+		/**
+		 * Activity will be the start of a new task (collection of activities).
+		 */
+		const FLAG_ACTIVITY_NEW_TASK: number;
+
+		/**
+		 * Prevent transition animation.
+		 */
+		const FLAG_ACTIVITY_NO_ANIMATION: number;
+
+		/**
+		 * Do not keep the activity in the history stack.
+		 */
+		const FLAG_ACTIVITY_NO_HISTORY: number;
+
+		/**
+		 * Disables the [onUserLeaveHint()](http://developer.android.com/reference/android/app/Activity.html#onUserLeaveHint()) callback.
+		 */
+		const FLAG_ACTIVITY_NO_USER_ACTION: number;
+
+		/**
+		 * Corresponds to the Android `Intent.FLAG_ACTIVITY_PREVIOUS_IS_TOP` constant.
+		 */
+		const FLAG_ACTIVITY_PREVIOUS_IS_TOP: number;
+
+		/**
+		 * If the activity already exists, place it at the top of the history stack.
+		 */
+		const FLAG_ACTIVITY_REORDER_TO_FRONT: number;
+
+		/**
+		 * If the task already exists, resets the task to its initial state.
+		 */
+		const FLAG_ACTIVITY_RESET_TASK_IF_NEEDED: number;
+
+		/**
+		 * Do not launch the activity if it is already running.
+		 */
+		const FLAG_ACTIVITY_SINGLE_TOP: number;
+
+		/**
+		 * Enable a log message to print out the resolution of the intent.
+		 */
+		const FLAG_DEBUG_LOG_RESOLUTION: number;
+
+		/**
+		 * Indicates the intent is coming from a background operation.
+		 */
+		const FLAG_FROM_BACKGROUND: number;
+
+		/**
+		 * Grant read permission on the URI in the Intent's data or clipboard.
+		 */
+		const FLAG_GRANT_READ_URI_PERMISSION: number;
+
+		/**
+		 * Grants write permission on the URI in the Intent's data or clipboard.
+		 */
+		const FLAG_GRANT_WRITE_URI_PERMISSION: number;
+
+		/**
+		 * When sending a broadcast, only registered receivers will be called.
+		 */
+		const FLAG_RECEIVER_REGISTERED_ONLY: number;
+
+		/**
+		 * Cancel the current pending intent before creating a new one.
+		 */
+		const FLAG_CANCEL_CURRENT: number;
+
+		/**
+		 * If the current intent does not exist, do not create it.
+		 */
+		const FLAG_NO_CREATE: number;
+
+		/**
+		 * The pending intent can only be used once.
+		 */
+		const FLAG_ONE_SHOT: number;
+
+		/**
+		 * If the current pending intent already exists, only update the current intent's extra data.
+		 */
+		const FLAG_UPDATE_CURRENT: number;
+
+		/**
+		 * Notification category indicating an alarm or timer.
+		 */
+		const CATEGORY_ALARM: string;
+
+		/**
+		 * Notification category indicating an incoming call (voice or video) or similar synchronous
+		 * communication request.
+		 */
+		const CATEGORY_CALL: string;
+
+		/**
+		 * Notification category indicating an asynchronous bulk message (email).
+		 */
+		const CATEGORY_EMAIL: string;
+
+		/**
+		 * Notification category indicating an error in background operation or authentication status.
+		 */
+		const CATEGORY_ERROR: string;
+
+		/**
+		 * Notification category indicating a calendar event.
+		 */
+		const CATEGORY_EVENT: string;
+
+		/**
+		 * Notification category indicating an incoming direct message (SMS, instant message, etc.).
+		 */
+		const CATEGORY_MESSAGE: string;
+
+		/**
+		 * Notification category indicating the progress of a long-running background operation.
+		 */
+		const CATEGORY_PROGRESS: string;
+
+		/**
+		 * Notification category indicating a promotion or advertisement.
+		 */
+		const CATEGORY_PROMO: string;
+
+		/**
+		 * Notification category indicating a specific, timely recommendation for a single thing.
+		 */
+		const CATEGORY_RECOMMENDATION: string;
+
+		/**
+		 * Notification category for a running background service.
+		 */
+		const CATEGORY_SERVICE: string;
+
+		/**
+		 * Notification category for a social network or sharing update.
+		 */
+		const CATEGORY_SOCIAL: string;
+
+		/**
+		 * Notification category indicating ongoing information about device or contextual status.
+		 */
+		const CATEGORY_STATUS: string;
+
+		/**
+		 * Notification category indicating media transport control for playback.
+		 */
+		const CATEGORY_TRANSPORT: string;
+
+		/**
+		 * Use all default settings for a notification; see
+		 * [Notification.defaults](Titanium.Android.Notification.defaults).
+		 */
+		const DEFAULT_ALL: number;
+
+		/**
+		 * Use the default light settings for a notification; see
+		 * [Notification.defaults](Titanium.Android.Notification.defaults).
+		 */
+		const DEFAULT_LIGHTS: number;
+
+		/**
+		 * Use the default sound settings for a notification; see
+		 * [Notification.defaults](Titanium.Android.Notification.defaults).
+		 */
+		const DEFAULT_SOUND: number;
+
+		/**
+		 * Use the default vibration settings for a notification; see
+		 * [Notification.defaults](Titanium.Android.Notification.defaults).
+		 */
+		const DEFAULT_VIBRATE: number;
+
+		/**
+		 * Cancel the notification when it is clicked by the user.
+		 */
+		const FLAG_AUTO_CANCEL: number;
+
+		/**
+		 * Repeat audio until the notification is cancelled or the notification window
+		 * is opened.
+		 */
+		const FLAG_INSISTENT: number;
+
+		/**
+		 * Do not cancel the notification when the user clicks the Clear All button.
+		 */
+		const FLAG_NO_CLEAR: number;
+
+		/**
+		 * Specifies that a notification is in reference to something that is ongoing, like a phone call.
+		 */
+		const FLAG_ONGOING_EVENT: number;
+
+		/**
+		 * Play an alert (sound, lights, and/or vibration) once each time the notification is sent, even if it has not been canceled before that.
+		 */
+		const FLAG_ONLY_ALERT_ONCE: number;
+
+		/**
+		 * Use LED lights to alert the user to the notification.
+		 */
+		const FLAG_SHOW_LIGHTS: number;
+
+		/**
+		 * Use for urgent or time-critical notifications, for example, turn-by-turn directions or
+		 * emergency alerts.
+		 */
+		const PRIORITY_MAX: number;
+
+		/**
+		 * Use for high priority notifications like real-time chat messages.
+		 */
+		const PRIORITY_HIGH: number;
+
+		/**
+		 * Default priority if it does no fit into another priority category.
+		 */
+		const PRIORITY_DEFAULT: number;
+
+		/**
+		 * Use for low priority notifications like software updates.
+		 */
+		const PRIORITY_LOW: number;
+
+		/**
+		 * Use for expired events.
+		 */
+		const PRIORITY_MIN: number;
+
+		/**
+		 * Shows basic information about the notification.
+		 */
+		const VISIBILITY_PRIVATE: number;
+
+		/**
+		 * Shows the notification's full content on the lockscreen. This is the system default if visibility is left unspecified.
+		 */
+		const VISIBILITY_PUBLIC: number;
+
+		/**
+		 * Shows the most minimal information of the notification on the lockscreen.
+		 */
+		const VISIBILITY_SECRET: number;
+
+		/**
+		 * QuickSettings tile is unavailble.
+		 */
+		const TILE_STATE_UNAVAILABLE: number;
+
+		/**
+		 * QuickSettings tile is inactive.
+		 */
+		const TILE_STATE_INACTIVE: number;
+
+		/**
+		 * QuickSettings tile is active.
+		 */
+		const TILE_STATE_ACTIVE: number;
+
+		/**
+		 * Ensures that the CPU is running; the screen and keyboard backlight will be allowed to go off.
+		 */
+		const WAKE_LOCK_PARTIAL: number;
+
+		/**
+		 * Ensures that the screen and keyboard backlight are on at full brightness.
+		 */
+		const WAKE_LOCK_FULL: number;
+
+		/**
+		 * Ensures that the screen is on (but may be dimmed); the keyboard backlight will be allowed to go off.
+		 */
+		const WAKE_LOCK_SCREEN_DIM: number;
+
+		/**
+		 * Ensures that the screen is on at full brightness; the keyboard backlight will be allowed to go off.
+		 */
+		const WAKE_LOCK_SCREEN_BRIGHT: number;
+
+		/**
+		 * Turn the screen on when the wake lock is acquired.
+		 */
+		const WAKE_LOCK_ACQUIRE_CAUSES_WAKEUP: number;
+
+		/**
+		 * When this wake lock is released, poke the user activity timer so the screen stays on for a little longer.
+		 */
+		const WAKE_LOCK_ON_AFTER_RELEASE: number;
+
+		/**
+		 * Not used.
+		 */
+		const PENDING_INTENT_FOR_ACTIVITY: number;
+
+		/**
+		 * Not used.
+		 */
+		const PENDING_INTENT_FOR_BROADCAST: number;
+
+		/**
+		 * Not used.
+		 */
+		const PENDING_INTENT_FOR_SERVICE: number;
+
+		/**
+		 * Not used.
+		 */
+		const PENDING_INTENT_MAX_VALUE: number;
+
+		/**
+		 * Used with [setResult](Titanium.Android.Activity.setResult) to specify that
+		 * an activity was canceled.
+		 */
+		const RESULT_CANCELED: number;
+
+		/**
+		 * Used with [setResult](Titanium.Android.Activity.setResult) to specify a
+		 * user-defined result.
+		 */
+		const RESULT_FIRST_USER: number;
+
+		/**
+		 * Used with [setResult](Titanium.Android.Activity.setResult) to specify that
+		 * an activity succeeded.
+		 */
+		const RESULT_OK: number;
+
+		/**
+		 * Use with [requestedOrientation](Titanium.Android.Activity.requestedOrientation) to
+		 * specify the activity should run in the same orientation as the activity behind it
+		 * in the activity stack.
+		 */
+		const SCREEN_ORIENTATION_BEHIND: number;
+
+		/**
+		 * Use with [requestedOrientation](Titanium.Android.Activity.requestedOrientation) to
+		 * specify a landscape screen orientation.
+		 */
+		const SCREEN_ORIENTATION_LANDSCAPE: number;
+
+		/**
+		 * Use with [requestedOrientation](Titanium.Android.Activity.requestedOrientation) to
+		 * specify that the sensor should be ignored and the display should not rotate.
+		 */
+		const SCREEN_ORIENTATION_NOSENSOR: number;
+
+		/**
+		 * Use with [requestedOrientation](Titanium.Android.Activity.requestedOrientation) to
+		 * specify a portrait screen orientation.
+		 */
+		const SCREEN_ORIENTATION_PORTRAIT: number;
+
+		/**
+		 * Use with [requestedOrientation](Titanium.Android.Activity.requestedOrientation) to
+		 * specify that orientation should be determined by the orientation sensor.
+		 */
+		const SCREEN_ORIENTATION_SENSOR: number;
+
+		/**
+		 * Use with [requestedOrientation](Titanium.Android.Activity.requestedOrientation) to
+		 * specify that the system should use its default rules for determining the best
+		 * orientation.
+		 */
+		const SCREEN_ORIENTATION_UNSPECIFIED: number;
+
+		/**
+		 * Use with [requestedOrientation](Titanium.Android.Activity.requestedOrientation) to
+		 * specify that the system should use the user's preferred orientation.
+		 */
+		const SCREEN_ORIENTATION_USER: number;
+
+		/**
+		 * Always show this item as an action button in the action bar.
+		 */
+		const SHOW_AS_ACTION_ALWAYS: number;
+
+		/**
+		 * The action view can collapse to a normal menu item.
+		 */
+		const SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW: number;
+
+		/**
+		 * Show this item as an action button if the system decides there is room for it.
+		 */
+		const SHOW_AS_ACTION_IF_ROOM: number;
+
+		/**
+		 * Never display this item as an action button in the action bar.
+		 */
+		const SHOW_AS_ACTION_NEVER: number;
+
+		/**
+		 * When this item is in the action bar, always show it with a text label.
+		 */
+		const SHOW_AS_ACTION_WITH_TEXT: number;
+
+		/**
+		 * Standard Action Bar navigation mode
+		 */
+		const NAVIGATION_MODE_STANDARD: number;
+
+		/**
+		 * Action Bar tab navigation mode
+		 */
+		const NAVIGATION_MODE_TABS: number;
+
+		/**
+		 * A Service start mode indicating that if the host application is stopped by Android, the service should not be restarted automatically.
+		 */
+		const START_NOT_STICKY: number;
+
+		/**
+		 * A Service start mode indicating that if the host application is stopped by Android, the service should be restarted automatically and the original Intent re-sent.
+		 */
+		const START_REDELIVER_INTENT: number;
+
+		/**
+		 * Use with [audioStreamType](Titanium.Android.Notification.audioStreamType) to
+		 * request that the alarm stream type for notifications be used.
+		 */
+		const STREAM_ALARM: number;
+
+		/**
+		 * Use with [audioStreamType](Titanium.Android.Notification.audioStreamType) to request that the
+		 * default stream type for notifications be used.
+		 */
+		const STREAM_DEFAULT: number;
+
+		/**
+		 * Use with [audioStreamType](Titanium.Android.Notification.audioStreamType) to
+		 * request that the music stream type for notifications be used.
+		 */
+		const STREAM_MUSIC: number;
+
+		/**
+		 * Use with [audioStreamType](Titanium.Android.Notification.audioStreamType) to request that the
+		 * notification stream type for notifications be used.
+		 */
+		const STREAM_NOTIFICATION: number;
+
+		/**
+		 * Use with [audioStreamType](Titanium.Android.Notification.audioStreamType) to request that the
+		 * ring stream type for notifications be used.
+		 */
+		const STREAM_RING: number;
+
+		/**
+		 * Use with [audioStreamType](Titanium.Android.Notification.audioStreamType) to request that the
+		 * system stream type for notifications be used.
+		 */
+		const STREAM_SYSTEM: number;
+
+		/**
+		 * Use with [audioStreamType](Titanium.Android.Notification.audioStreamType) to request that the
+		 * voice call stream type for notifications be used.
+		 */
+		const STREAM_VOICE_CALL: number;
+
+		/**
+		 * The URI scheme used for intent URIs.
+		 */
+		const URI_INTENT_SCHEME: number;
+
+		/**
+		 * Used with [NotificationChannel](Titanium.Android.NotificationChannel) to specify an importance level.
+		 */
+		const IMPORTANCE_DEFAULT: number;
+
+		/**
+		 * Used with [NotificationChannel](Titanium.Android.NotificationChannel) to specify an importance level.
+		 */
+		const IMPORTANCE_HIGH: number;
+
+		/**
+		 * Used with [NotificationChannel](Titanium.Android.NotificationChannel) to specify an importance level.
+		 */
+		const IMPORTANCE_LOW: number;
+
+		/**
+		 * Used with [NotificationChannel](Titanium.Android.NotificationChannel) to specify an importance level.
+		 */
+		const IMPORTANCE_MAX: number;
+
+		/**
+		 * Used with [NotificationChannel](Titanium.Android.NotificationChannel) to specify an importance level.
+		 */
+		const IMPORTANCE_MIN: number;
+
+		/**
+		 * Used with [NotificationChannel](Titanium.Android.NotificationChannel) to specify an importance level.
+		 */
+		const IMPORTANCE_NONE: number;
+
+		/**
+		 * Used with [NotificationChannel](Titanium.Android.NotificationChannel) to specify an importance level.
+		 */
+		const IMPORTANCE_UNSPECIFIED: number;
+
+		/**
+		 * Activity of the active context.
+		 */
+		const currentActivity: Titanium.Android.Activity;
+
+		/**
+		 * Service in the active context.
+		 */
+		const currentService: Titanium.Android.Service;
+
+		/**
+		 * Adds the specified callback as an event listener for the named event.
+		 */
+		function addEventListener(name: string, callback: (param0: any) => any): void;
+
+		/**
+		 * Removes the specified callback as an event listener for the named event.
+		 */
+		function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+		/**
+		 * Fires a synthesized event to any registered listeners.
+		 */
+		function fireEvent(name: string, event: any): void;
+
+		/**
+		 * Applies the properties to the proxy.
+		 */
+		function applyProperties(props: any): void;
+
+		/**
+		 * Creates an activity chooser intent, used to allow the user to select a target activity
+		 * for an intent.
+		 */
+		function createIntentChooser(intent: Titanium.Android.Intent, title: string): Titanium.Android.Intent;
+
+		/**
+		 * Creates a [PendingIntent](Titanium.Android.PendingIntent) to be used inside a
+		 * [Notification](Titanium.Android.Notification).
+		 */
+		function createPendingIntent(parameters?: any): Titanium.Android.PendingIntent;
+
+		/**
+		 * Create a <Titanium.Android.Service> so you can start/stop it and listen for events from it.
+		 */
+		function createService(intent: Titanium.Android.Intent): Titanium.Android.Service;
+
+		/**
+		 * Create an `Intent` to be used to start a service.
+		 */
+		function createServiceIntent(options: ServiceIntentOptions): Titanium.Android.Intent;
+
+		/**
+		 * Creates a [DrawerLayout](Titanium.UI.Android.DrawerLayout).
+		 */
+		function createDrawerLayout(parameters?: any): Titanium.UI.Android.DrawerLayout;
+
+		/**
+		 * Returns `true` if the app has permission access.
+		 */
+		function hasPermission(permission: string): boolean;
+
+		/**
+		 * Returns `true` if the app has permission access.
+		 */
+		function hasPermission(permission: ReadonlyArray<string>): boolean;
+
+		/**
+		 * Request for permission access.
+		 */
+		function requestPermissions(permissions: string, callback?: (param0: RequestPermissionAccessResult) => any): void;
+
+		/**
+		 * Request for permission access.
+		 */
+		function requestPermissions(permissions: ReadonlyArray<string>, callback?: (param0: RequestPermissionAccessResult) => any): void;
+
+		/**
+		 * Check on state of Service.
+		 */
+		function isServiceRunning(intent: Titanium.Android.Intent): boolean;
+
+		/**
+		 * Registers broadcast receiver for the given actions
+		 */
+		function registerBroadcastReceiver(broadcastReceiver: Titanium.Android.BroadcastReceiver, actions: ReadonlyArray<string>): void;
+
+		/**
+		 * Unregisters a broadcast receiver
+		 */
+		function unregisterBroadcastReceiver(broadcastReceiver: Titanium.Android.BroadcastReceiver): void;
+
+		/**
+		 * Starts a simple service.
+		 */
+		function startService(intent: Titanium.Android.Intent): void;
+
+		/**
+		 * Stop a simple service that was started with `startService`.
+		 */
+		function stopService(intent: Titanium.Android.Intent): void;
+
+		/**
+		 * Create an `Intent` to be used in a broadcast.
+		 */
+		function createBroadcastIntent(parameters?: any): Titanium.Android.Intent;
+
+		/**
+		 * Gets the value of the <Titanium.Android.bubbleParent> property.
+		 */
+		function getBubbleParent(): boolean;
+
+		/**
+		 * Sets the value of the <Titanium.Android.bubbleParent> property.
+		 */
+		function setBubbleParent(bubbleParent: boolean): void;
+
+		/**
+		 * Gets the value of the <Titanium.Android.apiName> property.
+		 */
+		function getApiName(): string;
+
+		/**
+		 * Gets the value of the <Titanium.Android.lifecycleContainer> property.
+		 */
+		function getLifecycleContainer(): Titanium.UI.Window | Titanium.UI.TabGroup;
+
+		/**
+		 * Sets the value of the <Titanium.Android.lifecycleContainer> property.
+		 */
+		function setLifecycleContainer(lifecycleContainer: Titanium.UI.Window): void;
+
+		/**
+		 * Sets the value of the <Titanium.Android.lifecycleContainer> property.
+		 */
+		function setLifecycleContainer(lifecycleContainer: Titanium.UI.TabGroup): void;
+
+		/**
+		 * Creates and returns an instance of <Titanium.Android.BigPictureStyle>.
+		 */
+		function createBigPictureStyle(parameters?: any): Titanium.Android.BigPictureStyle;
+
+		/**
+		 * Creates and returns an instance of <Titanium.Android.BigTextStyle>.
+		 */
+		function createBigTextStyle(parameters?: any): Titanium.Android.BigTextStyle;
+
+		/**
+		 * Creates and returns an instance of <Titanium.Android.BroadcastReceiver>.
+		 */
+		function createBroadcastReceiver(parameters?: any): Titanium.Android.BroadcastReceiver;
+
+		/**
+		 * Creates and returns an instance of <Titanium.Android.Intent>.
+		 */
+		function createIntent(parameters?: any): Titanium.Android.Intent;
+
+		/**
+		 * Creates and returns an instance of <Titanium.Android.Notification>.
+		 */
+		function createNotification(parameters?: any): Titanium.Android.Notification;
+
+		/**
+		 * Creates and returns an instance of <Titanium.Android.NotificationChannel>.
+		 */
+		function createNotificationChannel(parameters?: any): Titanium.Android.NotificationChannel;
+
+		/**
+		 * Creates and returns an instance of <Titanium.Android.QuickSettingsService>.
+		 */
+		function createQuickSettingsService(parameters?: any): Titanium.Android.QuickSettingsService;
+
+		/**
+		 * Creates and returns an instance of <Titanium.Android.RemoteViews>.
+		 */
+		function createRemoteViews(parameters?: any): Titanium.Android.RemoteViews;
+
+		/**
+		 * An action bar is a window feature that identifies the application and user location,
+		 * and provides user actions and navigation modes.
+		 */
+		interface ActionBar extends Titanium.Proxy {
+			/**
+			 * The background image for the action bar, specified as a local file path or URL.
+			 */
+			backgroundImage: string;
+
+			/**
+			 * Displays an "up" affordance on the "home" area of the action bar.
+			 */
+			displayHomeAsUp: boolean;
+
+			/**
+			 * Enable or disable the "home" button in the corner of the action bar.
+			 */
+			homeButtonEnabled: boolean;
+
+			/**
+			 * Sets the application icon displayed in the "home" area of the action bar, specified as a local file path or URL.
+			 */
+			icon: string;
+
+			/**
+			 * Sets the application logo displayed in the "home" area of the action bar, specified as a local file path or URL.
+			 */
+			logo: string;
+
+			/**
+			 * Controls the navigation mode.
+			 */
+			navigationMode: number;
+
+			/**
+			 * Callback function called when the home icon is clicked.
+			 */
+			onHomeIconItemSelected: () => any;
+
+			/**
+			 * Sets the subtitle of the action bar.
+			 */
+			subtitle: string;
+
+			/**
+			 * Sets the title of the action bar.
+			 */
+			title: string;
+
+			/**
+			 * Sets a view to be used for a custom navigation mode.
+			 */
+			customView: Titanium.UI.View;
+
+			/**
+			 * Hides the action bar if it is currently showing.
+			 */
+			hide(): void;
+
+			/**
+			 * Shows or hides the action bar home icon
+			 */
+			setDisplayShowHomeEnabled(show: boolean): void;
+
+			/**
+			 * Shows or hides the action bar title/subtitle
+			 */
+			setDisplayShowTitleEnabled(show: boolean): void;
+
+			/**
+			 * Shows the action bar if it is currently hidden.
+			 */
+			show(): void;
+
+			/**
+			 * Sets the value of the <Titanium.Android.ActionBar.backgroundImage> property.
+			 */
+			setBackgroundImage(backgroundImage: string): void;
+
+			/**
+			 * Sets the value of the <Titanium.Android.ActionBar.displayHomeAsUp> property.
+			 */
+			setDisplayHomeAsUp(displayHomeAsUp: boolean): void;
+
+			/**
+			 * Sets the value of the <Titanium.Android.ActionBar.homeButtonEnabled> property.
+			 */
+			setHomeButtonEnabled(homeButtonEnabled: boolean): void;
+
+			/**
+			 * Sets the value of the <Titanium.Android.ActionBar.icon> property.
+			 */
+			setIcon(icon: string): void;
+
+			/**
+			 * Sets the value of the <Titanium.Android.ActionBar.logo> property.
+			 */
+			setLogo(logo: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.ActionBar.navigationMode> property.
+			 */
+			getNavigationMode(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Android.ActionBar.navigationMode> property.
+			 */
+			setNavigationMode(navigationMode: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.Android.ActionBar.onHomeIconItemSelected> property.
+			 */
+			setOnHomeIconItemSelected(onHomeIconItemSelected: () => any): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.ActionBar.subtitle> property.
+			 */
+			getSubtitle(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Android.ActionBar.subtitle> property.
+			 */
+			setSubtitle(subtitle: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.ActionBar.title> property.
+			 */
+			getTitle(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Android.ActionBar.title> property.
+			 */
+			setTitle(title: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.ActionBar.customView> property.
+			 */
+			getCustomView(): Titanium.UI.View;
+
+			/**
+			 * Sets the value of the <Titanium.Android.ActionBar.customView> property.
+			 */
+			setCustomView(customView: any): void;
+
 		}
-		export enum FileStream {
+
+		/**
+		 * The Titanium binding of an Android Activity.
+		 */
+		interface Activity extends Titanium.Proxy {
+			/**
+			 * The action bar for this activity.
+			 */
+			readonly actionBar: Titanium.Android.ActionBar;
+
+			/**
+			 * The `Intent` that was used to start this Activity.
+			 */
+			readonly intent: Titanium.Android.Intent;
+
+			/**
+			 * Callback function called when the Android activity is created.
+			 */
+			onCreate: (param0: any) => any;
+
+			/**
+			 * Callback function called to initially create an Android options menu
+			 * for this Activity when the user presses the **Menu** button.
+			 */
+			onCreateOptionsMenu: (param0: any) => any;
+
+			/**
+			 * Callback function called when the Android activity is destroyed.
+			 */
+			onDestroy: (param0: any) => any;
+
+			/**
+			 * Callback function called when the Android activity is paused.
+			 */
+			onPause: (param0: any) => any;
+
+			/**
+			 * Callback function called to prepare an options menu for display when the user presses
+			 * the **Menu** button.
+			 */
+			onPrepareOptionsMenu: (param0: any) => any;
+
+			/**
+			 * Callback function called when the Android activity is restarted.
+			 */
+			onRestart: (param0: any) => any;
+
+			/**
+			 * Callback function called when the Android activity is resumed.
+			 */
+			onResume: (param0: any) => any;
+
+			/**
+			 * Callback function called when the Android activity is started.
+			 */
+			onStart: (param0: any) => any;
+
+			/**
+			 * Callback function called when the Android activity is stopped.
+			 */
+			onStop: (param0: any) => any;
+
+			/**
+			 * Specifies a specific orientation for this activity.
+			 */
+			requestedOrientation: number;
+
+			/**
+			 * Toolbar instance that serves as ActionBar
+			 */
+			supportToolbar: Titanium.UI.Toolbar;
+
+			/**
+			 * Closes this activity.
+			 */
+			finish(): void;
+
+			/**
+			 * Gets an Android or Application string using the specified Resource ID and optional format arguments.
+			 */
+			getString(resourceId: number, format: any): string;
+
+			/**
+			 * Declares that the option menu has changed and should be recreated.
+			 */
+			invalidateOptionsMenu(): void;
+
+			/**
+			 * Sets the requested Activity orientation.
+			 */
+			setRequestedOrientation(orientation: number): void;
+
+			/**
+			 * Sets the result of this activity using an `Intent`.
+			 */
+			setResult(resultCode: number, intent?: Titanium.Android.Intent): void;
+
+			/**
+			 * Sets a toolbar instance to be used as an ActionBar.
+			 */
+			setSupportActionBar(toolbar: Titanium.UI.Toolbar): void;
+
+			/**
+			 * Starts a new activity, using the passed in `Intent` as the description.
+			 */
+			startActivity(intent: Titanium.Android.Intent): void;
+
+			/**
+			 * The same as `startActivity`, but also accepts a callback function for handling the result of the started Activity.
+			 */
+			startActivityForResult(intent: Titanium.Android.Intent, callback: (param0: ActivityResult) => any): void;
+
+			/**
+			 * Programmatically opens the options menu.
+			 */
+			openOptionsMenu(): void;
+
+			/**
+			 * Broadcast the passed in `Intent` to all `BroadcastReceiver`s.
+			 */
+			sendBroadcast(intent: Titanium.Android.Intent): void;
+
+			/**
+			 * Broadcast the passed in `Intent` to all `BroadcastReceiver`s with an optional permission.
+			 */
+			sendBroadcastWithPermission(intent: Titanium.Android.Intent, receiverPermission?: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.Activity.actionBar> property.
+			 */
+			getActionBar(): Titanium.Android.ActionBar;
+
+			/**
+			 * Gets the value of the <Titanium.Android.Activity.intent> property.
+			 */
+			getIntent(): Titanium.Android.Intent;
+
+			/**
+			 * Gets the value of the <Titanium.Android.Activity.onCreate> property.
+			 */
+			getOnCreate(): (param0: any) => any;
+
+			/**
+			 * Sets the value of the <Titanium.Android.Activity.onCreate> property.
+			 */
+			setOnCreate(onCreate: (param0: any) => any): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.Activity.onCreateOptionsMenu> property.
+			 */
+			getOnCreateOptionsMenu(): (param0: any) => any;
+
+			/**
+			 * Sets the value of the <Titanium.Android.Activity.onCreateOptionsMenu> property.
+			 */
+			setOnCreateOptionsMenu(onCreateOptionsMenu: (param0: any) => any): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.Activity.onDestroy> property.
+			 */
+			getOnDestroy(): (param0: any) => any;
+
+			/**
+			 * Sets the value of the <Titanium.Android.Activity.onDestroy> property.
+			 */
+			setOnDestroy(onDestroy: (param0: any) => any): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.Activity.onPause> property.
+			 */
+			getOnPause(): (param0: any) => any;
+
+			/**
+			 * Sets the value of the <Titanium.Android.Activity.onPause> property.
+			 */
+			setOnPause(onPause: (param0: any) => any): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.Activity.onPrepareOptionsMenu> property.
+			 */
+			getOnPrepareOptionsMenu(): (param0: any) => any;
+
+			/**
+			 * Sets the value of the <Titanium.Android.Activity.onPrepareOptionsMenu> property.
+			 */
+			setOnPrepareOptionsMenu(onPrepareOptionsMenu: (param0: any) => any): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.Activity.onRestart> property.
+			 */
+			getOnRestart(): (param0: any) => any;
+
+			/**
+			 * Sets the value of the <Titanium.Android.Activity.onRestart> property.
+			 */
+			setOnRestart(onRestart: (param0: any) => any): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.Activity.onResume> property.
+			 */
+			getOnResume(): (param0: any) => any;
+
+			/**
+			 * Sets the value of the <Titanium.Android.Activity.onResume> property.
+			 */
+			setOnResume(onResume: (param0: any) => any): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.Activity.onStart> property.
+			 */
+			getOnStart(): (param0: any) => any;
+
+			/**
+			 * Sets the value of the <Titanium.Android.Activity.onStart> property.
+			 */
+			setOnStart(onStart: (param0: any) => any): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.Activity.onStop> property.
+			 */
+			getOnStop(): (param0: any) => any;
+
+			/**
+			 * Sets the value of the <Titanium.Android.Activity.onStop> property.
+			 */
+			setOnStop(onStop: (param0: any) => any): void;
+
+			/**
+			 * Sets the value of the <Titanium.Android.Activity.requestedOrientation> property.
+			 */
+			setRequestedOrientation(requestedOrientation: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.Activity.supportToolbar> property.
+			 */
+			getSupportToolbar(): Titanium.UI.Toolbar;
+
+			/**
+			 * Sets the value of the <Titanium.Android.Activity.supportToolbar> property.
+			 */
+			setSupportToolbar(supportToolbar: Titanium.UI.Toolbar): void;
+
+		}
+
+		/**
+		 * Helper object for generating large-format notifications that include a large image attachment.
+		 */
+		interface BigPictureStyle extends Titanium.Proxy {
+			/**
+			 * Override the <Titanium.Android.Notification.largeIcon> when the big notification is shown.
+			 */
+			bigLargeIcon: number | string;
+
+			/**
+			 * Provide the bitmap to be used as the payload for the BigPicture notification.
+			 */
+			bigPicture: number | string | Titanium.Blob | Titanium.Filesystem.File;
+
+			/**
+			 * Overrides <Titanium.Android.Notification.contentTitle> in the big form of the notification. This defaults to the value passed to <Titanium.Android.Notification.contentTitle>.
+			 */
+			bigContentTitle: string;
+
+			/**
+			 * Number of times to retry decoding the bitmap at bigPicture URL.
+			 */
+			decodeRetries: number;
+
+			/**
+			 * Set the first line of text after the detail section in the big form of the notification.
+			 */
+			summaryText: string;
+
+			/**
+			 * Gets the value of the <Titanium.Android.BigPictureStyle.bigLargeIcon> property.
+			 */
+			getBigLargeIcon(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.Android.BigPictureStyle.bigLargeIcon> property.
+			 */
+			setBigLargeIcon(bigLargeIcon: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.Android.BigPictureStyle.bigLargeIcon> property.
+			 */
+			setBigLargeIcon(bigLargeIcon: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.BigPictureStyle.bigPicture> property.
+			 */
+			getBigPicture(): number | string | Titanium.Blob | Titanium.Filesystem.File;
+
+			/**
+			 * Sets the value of the <Titanium.Android.BigPictureStyle.bigPicture> property.
+			 */
+			setBigPicture(bigPicture: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.Android.BigPictureStyle.bigPicture> property.
+			 */
+			setBigPicture(bigPicture: string): void;
+
+			/**
+			 * Sets the value of the <Titanium.Android.BigPictureStyle.bigPicture> property.
+			 */
+			setBigPicture(bigPicture: Titanium.Blob): void;
+
+			/**
+			 * Sets the value of the <Titanium.Android.BigPictureStyle.bigPicture> property.
+			 */
+			setBigPicture(bigPicture: Titanium.Filesystem.File): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.BigPictureStyle.bigContentTitle> property.
+			 */
+			getBigContentTitle(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Android.BigPictureStyle.bigContentTitle> property.
+			 */
+			setBigContentTitle(bigContentTitle: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.BigPictureStyle.decodeRetries> property.
+			 */
+			getDecodeRetries(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Android.BigPictureStyle.decodeRetries> property.
+			 */
+			setDecodeRetries(decodeRetries: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.BigPictureStyle.summaryText> property.
+			 */
+			getSummaryText(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Android.BigPictureStyle.summaryText> property.
+			 */
+			setSummaryText(summaryText: string): void;
+
+		}
+
+		/**
+		 * Helper object for generating large-format notifications that include a lot of text.
+		 */
+		interface BigTextStyle extends Titanium.Proxy {
+			/**
+			 * Sets the longer text to be displayed in the big form of the notification in place of the content text.
+			 */
+			bigText: string;
+
+			/**
+			 * Overrides <Titanium.Android.Notification.contentTitle> in the big form of the notification. This defaults to the value passed to <Titanium.Android.Notification.contentTitle>.
+			 */
+			bigContentTitle: string;
+
+			/**
+			 * Set the first line of text after the detail section in the big form of the notification.
+			 */
+			summaryText: string;
+
+			/**
+			 * Gets the value of the <Titanium.Android.BigTextStyle.bigText> property.
+			 */
+			getBigText(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Android.BigTextStyle.bigText> property.
+			 */
+			setBigText(bigText: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.BigTextStyle.bigContentTitle> property.
+			 */
+			getBigContentTitle(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Android.BigTextStyle.bigContentTitle> property.
+			 */
+			setBigContentTitle(bigContentTitle: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.BigTextStyle.summaryText> property.
+			 */
+			getSummaryText(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Android.BigTextStyle.summaryText> property.
+			 */
+			setSummaryText(summaryText: string): void;
+
+		}
+
+		/**
+		 * Monitor and handle Android system broadcasts.
+		 */
+		interface BroadcastReceiver extends Titanium.Proxy {
+			/**
+			 * The function called when a broadcast is received.
+			 */
+			onReceived: (param0: any) => any;
+
+			/**
+			 * URL of the JavaScript file to handle the broadcast.
+			 */
+			url: string;
+
+			/**
+			 * Gets the value of the <Titanium.Android.BroadcastReceiver.onReceived> property.
+			 */
+			getOnReceived(): (param0: any) => any;
+
+			/**
+			 * Sets the value of the <Titanium.Android.BroadcastReceiver.onReceived> property.
+			 */
+			setOnReceived(onReceived: (param0: any) => any): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.BroadcastReceiver.url> property.
+			 */
+			getUrl(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Android.BroadcastReceiver.url> property.
+			 */
+			setUrl(url: string): void;
+
+		}
+
+		/**
+		 * Message objects passed between Android application components.
+		 */
+		interface Intent extends Titanium.Proxy {
+			/**
+			 * The action associated with this intent.
+			 */
+			action: string;
+
+			/**
+			 * The Java class name of the activity associated with this intent
+			 * ([packageName](Titanium.Android.Intent.packageName) must also be set).
+			 */
+			className: string;
+
+			/**
+			 * The Intent's Data URI.
+			 */
+			readonly data: string;
+
+			/**
+			 * Intent flags.
+			 */
+			flags: number;
+
+			/**
+			 * The fully-qualified Java package name of the activity.
+			 */
+			packageName: string;
+
+			/**
+			 * The MIME type for this Intent.
+			 */
+			readonly type: string;
+
+			/**
+			 * The URL to a Titanium JavaScript Activity.
+			 */
+			url: string;
+
+			/**
+			 * Adds a category to this Intent.
+			 */
+			addCategory(name: string): void;
+
+			/**
+			 * Adds to the existing flags on the `Intent`.
+			 */
+			addFlags(flags: number): void;
+
+			/**
+			 * Get a <Titanium.Blob> property from this `Intent`.
+			 */
+			getBlobExtra(name: string): Titanium.Blob;
+
+			/**
+			 * Get a boolean property from this Intent.
+			 */
+			getBooleanExtra(name: string): boolean;
+
+			/**
+			 * Get the Data URI from this `Intent`.
+			 */
+			getData(): string;
+
+			/**
+			 * Get a double property from this `Intent`.
+			 */
+			getDoubleExtra(name: string): number;
+
+			/**
+			 * Get an integer property from this `Intent`.
+			 */
+			getIntExtra(name: string): number;
+
+			/**
+			 * Get a long property from this `Intent`.
+			 */
+			getLongExtra(name: string): number;
+
+			/**
+			 * Get a string property from this `Intent`.
+			 */
+			getStringExtra(name: string): string;
+
+			/**
+			 * Returns `true` if this `Intent` has the specified property.
+			 */
+			hasExtra(name: string): boolean;
+
+			/**
+			 * Puts an extra property on this `Intent`.
+			 */
+			putExtra(name: string, value: any): void;
+
+			/**
+			 * Put a URI property on this `Intent` (useful for <Titanium.Android.EXTRA_STREAM>).
+			 */
+			putExtraUri(name: string, value: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.Intent.action> property.
+			 */
+			getAction(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Android.Intent.action> property.
+			 */
+			setAction(action: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.Intent.className> property.
+			 */
+			getClassName(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Android.Intent.className> property.
+			 */
+			setClassName(className: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.Intent.data> property.
+			 */
+			getData(): string;
+
+			/**
+			 * Gets the value of the <Titanium.Android.Intent.flags> property.
+			 */
+			getFlags(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Android.Intent.flags> property.
+			 */
+			setFlags(flags: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.Intent.packageName> property.
+			 */
+			getPackageName(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Android.Intent.packageName> property.
+			 */
+			setPackageName(packageName: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.Intent.type> property.
+			 */
+			getType(): string;
+
+			/**
+			 * Gets the value of the <Titanium.Android.Intent.url> property.
+			 */
+			getUrl(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Android.Intent.url> property.
+			 */
+			setUrl(url: string): void;
+
+		}
+
+		/**
+		 * The Titanium binding of an Android Options Menu.
+		 */
+		interface Menu extends Titanium.Proxy {
+			/**
+			 * Array of menu items in this menu.
+			 */
+			readonly items: Titanium.Android.MenuItem[];
+
+			/**
+			 * Creates a <Titanium.Android.MenuItem> from the passed creation options.
+			 */
+			add(options: any): Titanium.Android.MenuItem;
+
+			/**
+			 * Clears all items from this menu.
+			 */
+			clear(): void;
+
+			/**
+			 * Closes the menu, if visible.
+			 */
+			close(): void;
+
+			/**
+			 * Locates a [MenuItem](Titanium.Android.MenuItem) in this menu, by item ID or reference.
+			 */
+			findItem(item: number): Titanium.Android.MenuItem;
+
+			/**
+			 * Locates a [MenuItem](Titanium.Android.MenuItem) in this menu, by item ID or reference.
+			 */
+			findItem(item: Titanium.Android.MenuItem): Titanium.Android.MenuItem;
+
+			/**
+			 * Returns the [MenuItem](Titanium.Android.MenuItem) at a specific index.
+			 */
+			getItem(index: number): Titanium.Android.MenuItem;
+
+			/**
+			 * Returns `true` if this menu has visible items.
+			 */
+			hasVisibleItems(): boolean;
+
+			/**
+			 * Removes all menu items with the specified
+			 * [groupId](Titanium.Android.MenuItem.groupId).
+			 */
+			removeGroup(groupId: number): void;
+
+			/**
+			 * Removes a specific [MenuItem](Titanium.Android.MenuItem) identified by its
+			 * [itemId](Titanium.Android.MenuItem.itemId).
+			 */
+			removeItem(itemId: number): void;
+
+			/**
+			 * Enables or disables a group of menu items identified by a
+			 * [groupId](Titanium.Android.MenuItem.groupId).
+			 */
+			setGroupEnabled(groupId: number, enabled: boolean): void;
+
+			/**
+			 * Shows or hides a group of menu items identified by a
+			 * [groupId](Titanium.Android.MenuItem.groupId).
+			 */
+			setGroupVisible(groupId: number, visible: boolean): void;
+
+			/**
+			 * Number of items in this menu.
+			 */
+			size(): number;
+
+			/**
+			 * Gets the value of the <Titanium.Android.Menu.items> property.
+			 */
+			getItems(): Titanium.Android.MenuItem[];
+
+		}
+
+		/**
+		 * The Titanium binding of an Android menu item.
+		 */
+		interface MenuItem extends Titanium.Proxy {
+			/**
+			 * Custom view that replaces the default menu item button.
+			 */
+			actionView: Titanium.UI.View;
+
+			/**
+			 * True if this menu item's action view has been expanded.
+			 */
+			readonly actionViewExpanded: boolean;
+
+			/**
+			 * Determines if the item can be checked.
+			 */
+			checkable: boolean;
+
+			/**
+			 * Determines if the item is checked.
+			 */
+			checked: boolean;
+
+			/**
+			 * Determines if the item is enabled.
+			 */
+			enabled: boolean;
+
+			/**
+			 * Group ID for this item.
+			 */
+			readonly groupId: number;
+
+			/**
+			 * Icon to display for the this menu item.
+			 */
+			icon: number | string;
+
+			/**
+			 * Item ID for this item.
+			 */
+			readonly itemId: number;
+
+			/**
+			 * Integer used for controlling the category and sort order for menu items.
+			 */
+			readonly order: number;
+
+			/**
+			 * A set of flags that controls how this item appears in the action bar.
+			 */
+			showAsAction: number;
+
+			/**
+			 * Title of the item.
+			 */
+			title: string;
+
+			/**
+			 * Shortened version of the item's title.
+			 */
+			titleCondensed: string;
+
+			/**
+			 * Determines whether the menu item is visible.
+			 */
+			visible: boolean;
+
+			/**
+			 * Collapse the action view associated with this menu item.
+			 */
+			collapseActionView(): void;
+
+			/**
+			 * Expand the action view associated with this menu item.
+			 */
+			expandActionView(): void;
+
+			/**
+			 * Returns the [actionViewExpanded](Titanium.Android.MenuItem.actionViewExpanded) state of the menu item.
+			 */
+			isActionViewExpanded(): boolean;
+
+			/**
+			 * Returns the [checkable](Titanium.Android.MenuItem.checkable) state of the menu item.
+			 */
+			isCheckable(): boolean;
+
+			/**
+			 * Returns the [checked](Titanium.Android.MenuItem.checked) state of the menu item.
+			 */
+			isChecked(): boolean;
+
+			/**
+			 * Returns the [enabled](Titanium.Android.MenuItem.enabled) state of the menu item.
+			 */
+			isEnabled(): boolean;
+
+			/**
+			 * Returns the [visible](Titanium.Android.MenuItem.visible) state of the menu item.
+			 */
+			isVisible(): boolean;
+
+			/**
+			 * Sets the [checkable](Titanium.Android.MenuItem.checkable) state of the menu item.
+			 */
+			setCheckable(checkable: boolean): void;
+
+			/**
+			 * Sets the [checked](Titanium.Android.MenuItem.checked) state of the menu item.
+			 */
+			setChecked(enabled: boolean): void;
+
+			/**
+			 * Sets the [enabled](Titanium.Android.MenuItem.enabled) state of the menu item.
+			 */
+			setEnabled(enabled: boolean): void;
+
+			/**
+			 * Sets the [visible](Titanium.Android.MenuItem.visible) state of the menu item.
+			 */
+			setVisible(visible: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.MenuItem.actionView> property.
+			 */
+			getActionView(): Titanium.UI.View;
+
+			/**
+			 * Sets the value of the <Titanium.Android.MenuItem.actionView> property.
+			 */
+			setActionView(actionView: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.MenuItem.groupId> property.
+			 */
+			getGroupId(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Android.MenuItem.icon> property.
+			 */
+			setIcon(icon: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.Android.MenuItem.icon> property.
+			 */
+			setIcon(icon: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.MenuItem.itemId> property.
+			 */
+			getItemId(): number;
+
+			/**
+			 * Gets the value of the <Titanium.Android.MenuItem.order> property.
+			 */
+			getOrder(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Android.MenuItem.showAsAction> property.
+			 */
+			setShowAsAction(showAsAction: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.MenuItem.title> property.
+			 */
+			getTitle(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Android.MenuItem.title> property.
+			 */
+			setTitle(title: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.MenuItem.titleCondensed> property.
+			 */
+			getTitleCondensed(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Android.MenuItem.titleCondensed> property.
+			 */
+			setTitleCondensed(titleCondensed: string): void;
+
+		}
+
+		/**
+		 * UI notifications that can be sent while the application is in the background.
+		 */
+		interface Notification extends Titanium.Proxy {
+			/**
+			 * The audio stream type to use when playing the sound.
+			 */
+			audioStreamType: number;
+
+			/**
+			 * Sets the notification's category.
+			 */
+			category: string;
+
+			/**
+			 * The `PendingIntent` to execute when the expanded status entry is clicked.
+			 */
+			contentIntent: Titanium.Android.PendingIntent;
+
+			/**
+			 * Description text of the notification.
+			 */
+			contentText: string;
+
+			/**
+			 * Title of the notification.
+			 */
+			contentTitle: string;
+
+			/**
+			 * Custom layout to display in the notification.
+			 */
+			contentView: Titanium.Android.RemoteViews;
+
+			/**
+			 * Specifies which values should be taken from the defaults.
+			 */
+			defaults: number;
+
+			/**
+			 * The `PendingIntent` to execute when the status entry is deleted by the user with the "Clear All Notifications" button.
+			 */
+			deleteIntent: Titanium.Android.PendingIntent;
+
+			/**
+			 * Set of flags for the notification.
+			 */
+			flags: number;
+
+			/**
+			 * The group key that the notification will belong to.
+			 */
+			groupKey: string;
+
+			/**
+			 * Specifies if this is a group summary notification.
+			 */
+			groupSummary: boolean;
+
+			/**
+			 * Notification icon, specified as an Android resource ID, or a local URL to a density-specific image.
+			 */
+			icon: number | string;
+
+			/**
+			 * Add a large icon to the notification (and the ticker on some devices) specified as an Android resource ID, or a local URL to a density-specific image.
+			 */
+			largeIcon: number | string;
+
+			/**
+			 * Accent color used behind icon.
+			 */
+			color: string;
+
+			/**
+			 * The color for the LED to blink.
+			 */
+			ledARGB: number;
+
+			/**
+			 * The number of milliseconds for the LED to be off while it's flashing.
+			 */
+			ledOffMS: number;
+
+			/**
+			 * The number of milliseconds for the LED to be on while it's flashing.
+			 */
+			ledOnMS: number;
+
+			/**
+			 * The number of events that this notification represents.
+			 */
+			number: number;
+
+			/**
+			 * Sets the priority of the notification.
+			 */
+			priority: number;
+
+			/**
+			 * A URL to the sound to play.
+			 */
+			sound: string;
+
+			/**
+			 * Style object that can apply a rich notification style.
+			 */
+			style: Titanium.Android.BigTextStyle | Titanium.Android.BigPictureStyle;
+
+			/**
+			 * Text to scroll across the screen when this item is added to the status bar.
+			 */
+			tickerText: string;
+
+			/**
+			 * Allows user to conceal private information of the notification on the lockscreen.
+			 */
+			visibility: number;
+
+			/**
+			 * Will wake up the device for the given time (in milliseconds) when the notification is shown.
+			 * The application needs to also set the `android.permission.WAKE_LOCK` permission
+			 * in the Android manifest section of the `tiapp.xml` file.
+			 * <ti:app>
+			 *     <android>
+			 *         <manifest>
+			 *             <uses-permission android:name="android.permission.WAKE_LOCK" />
+			 *         </manifest>
+			 *     </android>
+			 * </ti:app>
+			 */
+			wakeLock: wakeLockOptions;
+
+			/**
+			 * The timestamp for the notification (defaults to the current time).
+			 */
+			when: Date | number;
+
+			/**
+			 * Sets the latest event info using the built-in notification view for this notification.
+			 */
+			setLatestEventInfo(contentTitle: string, contentText: string, contentIntent: Titanium.Android.PendingIntent): void;
+
+			/**
+			 * Set the progress this notification represents.
+			 */
+			setProgress(max: number, progress: number, indeterminate: boolean): void;
+
+			/**
+			 * Add an action button to the notification
+			 */
+			addAction(icon: number, title: string, intent: Titanium.Android.PendingIntent): void;
+
+			/**
+			 * Add an action button to the notification
+			 */
+			addAction(icon: string, title: string, intent: Titanium.Android.PendingIntent): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.Notification.audioStreamType> property.
+			 */
+			getAudioStreamType(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Android.Notification.audioStreamType> property.
+			 */
+			setAudioStreamType(audioStreamType: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.Notification.category> property.
+			 */
+			getCategory(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Android.Notification.category> property.
+			 */
+			setCategory(category: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.Notification.contentIntent> property.
+			 */
+			getContentIntent(): Titanium.Android.PendingIntent;
+
+			/**
+			 * Sets the value of the <Titanium.Android.Notification.contentIntent> property.
+			 */
+			setContentIntent(contentIntent: Titanium.Android.PendingIntent): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.Notification.contentText> property.
+			 */
+			getContentText(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Android.Notification.contentText> property.
+			 */
+			setContentText(contentText: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.Notification.contentTitle> property.
+			 */
+			getContentTitle(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Android.Notification.contentTitle> property.
+			 */
+			setContentTitle(contentTitle: string): void;
+
+			/**
+			 * Sets the value of the <Titanium.Android.Notification.contentView> property.
+			 */
+			setContentView(contentView: Titanium.Android.RemoteViews): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.Notification.defaults> property.
+			 */
+			getDefaults(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Android.Notification.defaults> property.
+			 */
+			setDefaults(defaults: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.Notification.deleteIntent> property.
+			 */
+			getDeleteIntent(): Titanium.Android.PendingIntent;
+
+			/**
+			 * Sets the value of the <Titanium.Android.Notification.deleteIntent> property.
+			 */
+			setDeleteIntent(deleteIntent: Titanium.Android.PendingIntent): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.Notification.flags> property.
+			 */
+			getFlags(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Android.Notification.flags> property.
+			 */
+			setFlags(flags: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.Notification.groupKey> property.
+			 */
+			getGroupKey(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Android.Notification.groupKey> property.
+			 */
+			setGroupKey(groupKey: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.Notification.groupSummary> property.
+			 */
+			getGroupSummary(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.Android.Notification.groupSummary> property.
+			 */
+			setGroupSummary(groupSummary: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.Notification.icon> property.
+			 */
+			getIcon(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.Android.Notification.icon> property.
+			 */
+			setIcon(icon: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.Android.Notification.icon> property.
+			 */
+			setIcon(icon: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.Notification.largeIcon> property.
+			 */
+			getLargeIcon(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.Android.Notification.largeIcon> property.
+			 */
+			setLargeIcon(largeIcon: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.Android.Notification.largeIcon> property.
+			 */
+			setLargeIcon(largeIcon: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.Notification.color> property.
+			 */
+			getColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Android.Notification.color> property.
+			 */
+			setColor(color: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.Notification.ledARGB> property.
+			 */
+			getLedARGB(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Android.Notification.ledARGB> property.
+			 */
+			setLedARGB(ledARGB: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.Notification.ledOffMS> property.
+			 */
+			getLedOffMS(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Android.Notification.ledOffMS> property.
+			 */
+			setLedOffMS(ledOffMS: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.Notification.ledOnMS> property.
+			 */
+			getLedOnMS(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Android.Notification.ledOnMS> property.
+			 */
+			setLedOnMS(ledOnMS: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.Notification.number> property.
+			 */
+			getNumber(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Android.Notification.number> property.
+			 */
+			setNumber(number: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.Notification.priority> property.
+			 */
+			getPriority(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Android.Notification.priority> property.
+			 */
+			setPriority(priority: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.Notification.sound> property.
+			 */
+			getSound(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Android.Notification.sound> property.
+			 */
+			setSound(sound: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.Notification.style> property.
+			 */
+			getStyle(): Titanium.Android.BigTextStyle | Titanium.Android.BigPictureStyle;
+
+			/**
+			 * Sets the value of the <Titanium.Android.Notification.style> property.
+			 */
+			setStyle(style: Titanium.Android.BigTextStyle): void;
+
+			/**
+			 * Sets the value of the <Titanium.Android.Notification.style> property.
+			 */
+			setStyle(style: Titanium.Android.BigPictureStyle): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.Notification.tickerText> property.
+			 */
+			getTickerText(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Android.Notification.tickerText> property.
+			 */
+			setTickerText(tickerText: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.Notification.visibility> property.
+			 */
+			getVisibility(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Android.Notification.visibility> property.
+			 */
+			setVisibility(visibility: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.Notification.wakeLock> property.
+			 */
+			getWakeLock(): wakeLockOptions;
+
+			/**
+			 * Sets the value of the <Titanium.Android.Notification.wakeLock> property.
+			 */
+			setWakeLock(wakeLock: wakeLockOptions): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.Notification.when> property.
+			 */
+			getWhen(): Date | number;
+
+			/**
+			 * Sets the value of the <Titanium.Android.Notification.when> property.
+			 */
+			setWhen(when: Date): void;
+
+			/**
+			 * Sets the value of the <Titanium.Android.Notification.when> property.
+			 */
+			setWhen(when: number): void;
+
+		}
+
+		/**
+		 * Module for notification channels.
+		 */
+		interface NotificationChannel extends Titanium.Proxy {
+			/**
+			 * Whether or not notifications posted to this channel can interrupt the user.
+			 */
+			bypassDnd: boolean;
+
+			/**
+			 * User visible description of this channel.
+			 */
+			description: string;
+
+			/**
+			 * Whether notifications posted to this channel should display notification lights
+			 */
+			enableLights: boolean;
+
+			/**
+			 * Whether notification posted to this channel should vibrate.
+			 */
+			enableVibration: boolean;
+
+			/**
+			 * Group id this channel belongs to.
+			 */
+			groupId: string;
+
+			/**
+			 * The audio stream type to use when playing the sound.
+			 */
+			importance: number;
+
+			/**
+			 * The channel id specified for the notification channel.
+			 */
+			id: string;
+
+			/**
+			 * The notification light color for notifications posted to this channel.
+			 */
+			lightColor: number;
+
+			/**
+			 * Whether or not notifications posted to this channel are shown on the lockscreen in full or redacted form.
+			 */
+			lockscreenVisibility: number;
+
+			/**
+			 * Whether notifications posted to this channel can appear as application icon badges in a Launcher.
+			 */
+			showBadge: boolean;
+
+			/**
+			 * The vibration pattern for notifications posted to this channel.
+			 */
+			vibratePattern: number[];
+
+			/**
+			 * Gets the value of the <Titanium.Android.NotificationChannel.bypassDnd> property.
+			 */
+			getBypassDnd(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.Android.NotificationChannel.bypassDnd> property.
+			 */
+			setBypassDnd(bypassDnd: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.NotificationChannel.description> property.
+			 */
+			getDescription(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Android.NotificationChannel.description> property.
+			 */
+			setDescription(description: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.NotificationChannel.enableLights> property.
+			 */
+			getEnableLights(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.Android.NotificationChannel.enableLights> property.
+			 */
+			setEnableLights(enableLights: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.NotificationChannel.enableVibration> property.
+			 */
+			getEnableVibration(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.Android.NotificationChannel.enableVibration> property.
+			 */
+			setEnableVibration(enableVibration: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.NotificationChannel.groupId> property.
+			 */
+			getGroupId(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Android.NotificationChannel.groupId> property.
+			 */
+			setGroupId(groupId: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.NotificationChannel.importance> property.
+			 */
+			getImportance(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Android.NotificationChannel.importance> property.
+			 */
+			setImportance(importance: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.NotificationChannel.id> property.
+			 */
+			getId(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Android.NotificationChannel.id> property.
+			 */
+			setId(id: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.NotificationChannel.lightColor> property.
+			 */
+			getLightColor(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Android.NotificationChannel.lightColor> property.
+			 */
+			setLightColor(lightColor: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.NotificationChannel.lockscreenVisibility> property.
+			 */
+			getLockscreenVisibility(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Android.NotificationChannel.lockscreenVisibility> property.
+			 */
+			setLockscreenVisibility(lockscreenVisibility: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.NotificationChannel.showBadge> property.
+			 */
+			getShowBadge(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.Android.NotificationChannel.showBadge> property.
+			 */
+			setShowBadge(showBadge: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.NotificationChannel.vibratePattern> property.
+			 */
+			getVibratePattern(): number[];
+
+			/**
+			 * Sets the value of the <Titanium.Android.NotificationChannel.vibratePattern> property.
+			 */
+			setVibratePattern(vibratePattern: ReadonlyArray<number>): void;
+
+		}
+
+		/**
+		 * The Titanium binding of an Android `PendingIntent`.
+		 */
+		interface PendingIntent extends Titanium.Proxy {
+			/**
+			 * Flags used for creating the Pending Intent.
+			 */
+			flags: number;
+
+			/**
+			 * The intent data to pass to the [Activity](Titanium.Android.Activity) launched by this `PendingIntent`.
+			 */
+			intent: Titanium.Android.Intent;
+
+			/**
+			 * If this property is true, flag <Titanium.Android.FLAG_UPDATE_CURRENT> will be
+			 * appended to `flags` automatically. Default value is true.
+			 */
+			updateCurrentIntent: boolean;
+
+			/**
+			 * Gets the value of the <Titanium.Android.PendingIntent.flags> property.
+			 */
+			getFlags(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Android.PendingIntent.flags> property.
+			 */
+			setFlags(flags: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.PendingIntent.intent> property.
+			 */
+			getIntent(): Titanium.Android.Intent;
+
+			/**
+			 * Sets the value of the <Titanium.Android.PendingIntent.intent> property.
+			 */
+			setIntent(intent: Titanium.Android.Intent): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.PendingIntent.updateCurrentIntent> property.
+			 */
+			getUpdateCurrentIntent(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.Android.PendingIntent.updateCurrentIntent> property.
+			 */
+			setUpdateCurrentIntent(updateCurrentIntent: boolean): void;
+
+		}
+
+		/**
+		 * Android service for creating custom quick settings tiles and handling user's interaction with them.
+		 */
+		interface QuickSettingsService extends Titanium.Proxy {
+			/**
+			 * The intent used to start or bind to the Service.
+			 */
+			readonly intent: Titanium.Android.Intent;
+
+			/**
+			 * A service can be started more than once -- this number (based on an incrementing integer)
+			 * indicates which "start number" in the sequence the current service instance is.
+			 */
+			readonly serviceInstanceId: number;
+
+			/**
+			 * Starts the Service.
+			 */
+			start(): void;
+
+			/**
+			 * Stops this running instance of the Service.
+			 */
+			stop(): void;
+
+			/**
+			 * Applies current tile's properties.
+			 */
+			updateTile(): void;
+
+			/**
+			 * Changes the Tile's icon.
+			 */
+			setIcon(icon: string): void;
+
+			/**
+			 * Changes the Tile's icon.
+			 */
+			setIcon(icon: Titanium.Blob): void;
+
+			/**
+			 * Changes the Tile's icon.
+			 */
+			setIcon(icon: Titanium.Filesystem.File): void;
+
+			/**
+			 * Sets the state of the Tile.
+			 */
+			setState(state: number): void;
+
+			/**
+			 * Changes the Tile's label.
+			 */
+			setLabel(label: string): void;
+
+			/**
+			 * Returns the Tile's current icon.
+			 */
+			getIcon(): string | Titanium.Blob | Titanium.Filesystem.File;
+
+			/**
+			 * Returns the Tile's current state.
+			 */
+			getState(): number;
+
+			/**
+			 * Returns 'true' if the device is in secure state, 'false' otherwise.
+			 */
+			isSecure(): boolean;
+
+			/**
+			 * Opens an Alert dialog.
+			 */
+			showDialog(options: showParams): void;
+
+			/**
+			 * Colapses the quick settings menu and starts an activity for the passed Intent.
+			 */
+			startActivityAndCollapse(intent: Titanium.Android.Intent): void;
+
+			/**
+			 * Prompts the user to unlock the device and runs the JS code.
+			 */
+			unlockAndRun(jsCode: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.QuickSettingsService.intent> property.
+			 */
+			getIntent(): Titanium.Android.Intent;
+
+			/**
+			 * Gets the value of the <Titanium.Android.QuickSettingsService.serviceInstanceId> property.
+			 */
+			getServiceInstanceId(): number;
+
+		}
+
+		/**
+		 * The Titanium binding of [Android RemoteViews](http://developer.android.com/reference/android/widget/RemoteViews.html).
+		 */
+		interface RemoteViews extends Titanium.Proxy {
+			/**
+			 * Android layout resource ID for the view to display. Required.
+			 */
+			layoutId: number;
+
+			/**
+			 * Package name that the resource ID lives in. Optional.
+			 */
+			packageName: string;
+
+			/**
+			 * Calls a method taking a single `boolean` argument on a view in the remote view
+			 * hierarchy.  See Android's documentation for
+			 * [setBoolean](http://developer.android.com/reference/android/widget/RemoteViews.html#setBoolean(int, java.lang.String, boolean)).
+			 */
+			setBoolean(viewId: number, methodName: string, value: boolean): void;
+
+			/**
+			 * Sets the base time, format string, and started flag for a chronometer
+			 * in the remote view hierarchy.
+			 */
+			setChronometer(viewId: number, base: Date, format: string, started: boolean): void;
+
+			/**
+			 * Calls a method taking a single `double` argument on a view in the remote view
+			 * hierarchy.
+			 */
+			setDouble(viewId: number, methodName: string, value: number): void;
+
+			/**
+			 * Sets the image for an image view in the remote view hierarchy using an Android drawable resource.
+			 */
+			setImageViewResource(viewId: number, srcId: number): void;
+
+			/**
+			 * Sets the image for an image view in the remote view hierarchy using a URI.
+			 */
+			setImageViewUri(viewId: number, uri: string): void;
+
+			/**
+			 * Calls a method taking a single `int` argument on a view in the remote view hierarchy.
+			 */
+			setInt(viewId: number, methodName: string, value: number): void;
+
+			/**
+			 * Launches a <Titanium.Android.PendingIntent> when the specified view is clicked.
+			 */
+			setOnClickPendingIntent(viewId: number, pendingIntent: Titanium.Android.PendingIntent): void;
+
+			/**
+			 * Sets the progress, max value, and indeterminate flag of a progress bar in the
+			 * remote view hierarchy.
+			 */
+			setProgressBar(viewId: number, max: number, progress: number, indeterminate: boolean): void;
+
+			/**
+			 * Calls a method taking a single String argument on a view in the remote view
+			 * hierarchy.
+			 */
+			setString(viewId: number, methodName: string, value: string): void;
+
+			/**
+			 * Sets the text color of a view in the remote view hierarchy.
+			 */
+			setTextColor(viewId: number, color: number): void;
+
+			/**
+			 * Sets the text of a text view in the remote view hierarchy.
+			 */
+			setTextViewText(viewId: number, text: string): void;
+
+			/**
+			 * Calls a method taking one URI on a view in the remote view hierarchy.
+			 */
+			setUri(viewId: number, methodName: string, value: string): void;
+
+			/**
+			 * Sets the visibility of a view in the remote view hierarchy.
+			 */
+			setViewVisibility(viewId: number, visibility: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.RemoteViews.layoutId> property.
+			 */
+			getLayoutId(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Android.RemoteViews.layoutId> property.
+			 */
+			setLayoutId(layoutId: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.RemoteViews.packageName> property.
+			 */
+			getPackageName(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Android.RemoteViews.packageName> property.
+			 */
+			setPackageName(packageName: string): void;
+
+		}
+
+		/**
+		 * Android application component that executes in the background.
+		 */
+		interface Service extends Titanium.Proxy {
+			/**
+			 * The intent used to start or bind to the Service.
+			 */
+			readonly intent: Titanium.Android.Intent;
+
+			/**
+			 * A service can be started more than once -- this number (based on an incrementing integer)
+			 * indicates which "start number" in the sequence the current service instance is.
+			 */
+			readonly serviceInstanceId: number;
+
+			/**
+			 * Starts the Service.
+			 */
+			start(): void;
+
+			/**
+			 * Stops this running instance of the Service.
+			 */
+			stop(): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.Service.intent> property.
+			 */
+			getIntent(): Titanium.Android.Intent;
+
+			/**
+			 * Gets the value of the <Titanium.Android.Service.serviceInstanceId> property.
+			 */
+			getServiceInstanceId(): number;
+
+		}
+
+
+		/**
+		 * The Android.Calendar module provides proxies and methods for accessing the native Android
+		 * calendar functionality.
+		 */
+		namespace Calendar {
+			/**
+			 * Indicates if the proxy will bubble an event to its parent.
+			 */
+			let bubbleParent: boolean;
+
+			/**
+			 * The name of the API that this proxy corresponds to.
+			 */
+			const apiName: string;
+
+			/**
+			 * The Window or TabGroup whose Activity lifecycle should be triggered on the proxy.
+			 */
+			let lifecycleContainer: Titanium.UI.Window | Titanium.UI.TabGroup;
+
+			/**
+			 * Reminder alert delivery method.
+			 */
+			const METHOD_ALERT: number;
+
+			/**
+			 * Reminder default delivery method.
+			 */
+			const METHOD_DEFAULT: number;
+
+			/**
+			 * Reminder email delivery method.
+			 */
+			const METHOD_EMAIL: number;
+
+			/**
+			 * Reminder SMS delivery method.
+			 */
+			const METHOD_SMS: number;
+
+			/**
+			 * Alert dismissed state.
+			 */
+			const STATE_DISMISSED: number;
+
+			/**
+			 * Alert fired state.
+			 */
+			const STATE_FIRED: number;
+
+			/**
+			 * Alert scheduled status.
+			 */
+			const STATE_SCHEDULED: number;
+
+			/**
+			 * Event canceled status.
+			 */
+			const STATUS_CANCELED: number;
+
+			/**
+			 * Event confirmed status.
+			 */
+			const STATUS_CONFIRMED: number;
+
+			/**
+			 * Event tentative status.
+			 */
+			const STATUS_TENTATIVE: number;
+
+			/**
+			 * Event confidential visibility.
+			 */
+			const VISIBILITY_CONFIDENTIAL: number;
+
+			/**
+			 * Event default visibility.
+			 */
+			const VISIBILITY_DEFAULT: number;
+
+			/**
+			 * Event private visibility.
+			 */
+			const VISIBILITY_PRIVATE: number;
+
+			/**
+			 * Event public visibility.
+			 */
+			const VISIBILITY_PUBLIC: number;
+
+			/**
+			 * All alerts in selected calendars.
+			 */
+			const allAlerts: Titanium.Android.Calendar.Alert[];
+
+			/**
+			 * All calendars known to the native calendar app.
+			 */
+			const allCalendars: Titanium.Android.Calendar.Calendar[];
+
+			/**
+			 * All calendars selected within the native calendar app, which may be a subset of `allCalendars`.
+			 */
+			const selectableCalendars: Titanium.Android.Calendar.Calendar[];
+
+			/**
+			 * Adds the specified callback as an event listener for the named event.
+			 */
+			function addEventListener(name: string, callback: (param0: any) => any): void;
+
+			/**
+			 * Removes the specified callback as an event listener for the named event.
+			 */
+			function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+			/**
+			 * Fires a synthesized event to any registered listeners.
+			 */
+			function fireEvent(name: string, event: any): void;
+
+			/**
+			 * Applies the properties to the proxy.
+			 */
+			function applyProperties(props: any): void;
+
+			/**
+			 * Gets the calendar with the specified identifier.
+			 */
+			function getCalendarById(id: number): Titanium.Android.Calendar.Calendar;
+
+			/**
+			 * Gets the value of the <Titanium.Android.Calendar.bubbleParent> property.
+			 */
+			function getBubbleParent(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.Android.Calendar.bubbleParent> property.
+			 */
+			function setBubbleParent(bubbleParent: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.Calendar.apiName> property.
+			 */
+			function getApiName(): string;
+
+			/**
+			 * Gets the value of the <Titanium.Android.Calendar.lifecycleContainer> property.
+			 */
+			function getLifecycleContainer(): Titanium.UI.Window | Titanium.UI.TabGroup;
+
+			/**
+			 * Sets the value of the <Titanium.Android.Calendar.lifecycleContainer> property.
+			 */
+			function setLifecycleContainer(lifecycleContainer: Titanium.UI.Window): void;
+
+			/**
+			 * Sets the value of the <Titanium.Android.Calendar.lifecycleContainer> property.
+			 */
+			function setLifecycleContainer(lifecycleContainer: Titanium.UI.TabGroup): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.Calendar.allAlerts> property.
+			 */
+			function getAllAlerts(): Titanium.Android.Calendar.Alert[];
+
+			/**
+			 * Gets the value of the <Titanium.Android.Calendar.allCalendars> property.
+			 */
+			function getAllCalendars(): Titanium.Android.Calendar.Calendar[];
+
+			/**
+			 * Gets the value of the <Titanium.Android.Calendar.selectableCalendars> property.
+			 */
+			function getSelectableCalendars(): Titanium.Android.Calendar.Calendar[];
+
+			/**
+			 * An object that represents a single alert for an event in an Android calendar.
+			 */
+			interface Alert extends Titanium.Proxy {
+				/**
+				 * Date/time at which this alert alarm is set to trigger.
+				 */
+				readonly alarmTime: Date;
+
+				/**
+				 * Start date/time for the corresponding event.
+				 */
+				readonly begin: Date;
+
+				/**
+				 * End date/time for the corresponding event.
+				 */
+				readonly end: Date;
+
+				/**
+				 * Identifier of the event for which this alert is set.
+				 */
+				readonly eventId: number;
+
+				/**
+				 * Identifier of this alert.
+				 */
+				readonly id: string;
+
+				/**
+				 * Reminder notice period in minutes, that determines how long prior to the event this alert
+				 * should trigger.
+				 */
+				readonly minutes: number;
+
+				/**
+				 * The current state of the alert.
+				 */
+				readonly state: number;
+
+				/**
+				 * Gets the value of the <Titanium.Android.Calendar.Alert.alarmTime> property.
+				 */
+				getAlarmTime(): Date;
+
+				/**
+				 * Gets the value of the <Titanium.Android.Calendar.Alert.begin> property.
+				 */
+				getBegin(): Date;
+
+				/**
+				 * Gets the value of the <Titanium.Android.Calendar.Alert.end> property.
+				 */
+				getEnd(): Date;
+
+				/**
+				 * Gets the value of the <Titanium.Android.Calendar.Alert.eventId> property.
+				 */
+				getEventId(): number;
+
+				/**
+				 * Gets the value of the <Titanium.Android.Calendar.Alert.id> property.
+				 */
+				getId(): string;
+
+				/**
+				 * Gets the value of the <Titanium.Android.Calendar.Alert.minutes> property.
+				 */
+				getMinutes(): number;
+
+				/**
+				 * Gets the value of the <Titanium.Android.Calendar.Alert.state> property.
+				 */
+				getState(): number;
+
+			}
+
+			/**
+			 * An object that represents a single calendar on Android.
+			 */
+			interface Calendar extends Titanium.Proxy {
+				/**
+				 * Indicates whether this calendar is hidden.
+				 */
+				readonly hidden: boolean;
+
+				/**
+				 * Identifier of this calendar.
+				 */
+				readonly id: string;
+
+				/**
+				 * Display name of this calendar.
+				 */
+				readonly name: string;
+
+				/**
+				 * Indicates whether the calendar is selected.
+				 */
+				readonly selected: boolean;
+
+				/**
+				 * Creates an event in this calendar.
+				 */
+				createEvent(properties: any): Titanium.Android.Calendar.Event;
+
+				/**
+				 * Gets the event with the specified identifier.
+				 */
+				getEventById(id: number): Titanium.Android.Calendar.Event;
+
+				/**
+				 * Gets events that occur between two dates.
+				 */
+				getEventsBetweenDates(date1: Date, date2: Date): Titanium.Android.Calendar.Event[];
+
+				/**
+				 * Gets events that occur on a specified date.
+				 */
+				getEventsInDate(year: number, month: number, day: number): Titanium.Android.Calendar.Event[];
+
+				/**
+				 * Gets events that occur during a specified month.
+				 */
+				getEventsInMonth(year: number, month: number): Titanium.Android.Calendar.Event[];
+
+				/**
+				 * Gets all events that occur during a specified year.
+				 */
+				getEventsInYear(year: number): Titanium.Android.Calendar.Event[];
+
+				/**
+				 * Gets the value of the <Titanium.Android.Calendar.Calendar.hidden> property.
+				 */
+				getHidden(): boolean;
+
+				/**
+				 * Gets the value of the <Titanium.Android.Calendar.Calendar.id> property.
+				 */
+				getId(): string;
+
+				/**
+				 * Gets the value of the <Titanium.Android.Calendar.Calendar.name> property.
+				 */
+				getName(): string;
+
+				/**
+				 * Gets the value of the <Titanium.Android.Calendar.Calendar.selected> property.
+				 */
+				getSelected(): boolean;
+
+			}
+
+			/**
+			 * An object that represents a single event in an Android calendar.
+			 */
+			interface Event extends Titanium.Proxy {
+				/**
+				 * Existing alerts for this event.
+				 */
+				readonly alerts: Titanium.Android.Calendar.Alert[];
+
+				/**
+				 * Indicates whether this event is all day.
+				 */
+				readonly allDay: boolean;
+
+				/**
+				 * Start date/time of this event.
+				 */
+				readonly begin: Date;
+
+				/**
+				 * Description of this event.
+				 */
+				readonly description: string;
+
+				/**
+				 * End date/time of this event.
+				 */
+				readonly end: Date;
+
+				/**
+				 * Extended properties of this event.
+				 */
+				readonly extendedProperties: any;
+
+				/**
+				 * Indicates whether an alarm is scheduled for this event.
+				 */
+				readonly hasAlarm: boolean;
+
+				/**
+				 * Indicates whether [extendedProperties](Titanium.Android.Calendar.Event.extendedProperties)
+				 * exists for this event.
+				 */
+				readonly hasExtendedProperties: boolean;
+
+				/**
+				 * Identifier of this event.
+				 */
+				readonly id: string;
+
+				/**
+				 * Location of this event.
+				 */
+				readonly location: string;
+
+				/**
+				 * Existing reminders for this event.
+				 */
+				readonly reminders: Titanium.Android.Calendar.Reminder[];
+
+				/**
+				 * Status of this event.
+				 */
+				readonly status: number;
+
+				/**
+				 * Title of this event.
+				 */
+				readonly title: string;
+
+				/**
+				 * Visibility of this event.
+				 */
+				readonly visibility: number;
+
+				/**
+				 * Creates an alert for this event.
+				 */
+				createAlert(data: any): Titanium.Android.Calendar.Alert;
+
+				/**
+				 * Creates a reminder for this event.
+				 */
+				createReminder(data: any): Titanium.Android.Calendar.Reminder;
+
+				/**
+				 * Gets the value of the specified extended property.
+				 */
+				getExtendedProperty(name: string): string;
+
+				/**
+				 * Sets the value of the specified extended property.
+				 */
+				setExtendedProperty(name: string, value: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.Android.Calendar.Event.alerts> property.
+				 */
+				getAlerts(): Titanium.Android.Calendar.Alert[];
+
+				/**
+				 * Gets the value of the <Titanium.Android.Calendar.Event.allDay> property.
+				 */
+				getAllDay(): boolean;
+
+				/**
+				 * Gets the value of the <Titanium.Android.Calendar.Event.begin> property.
+				 */
+				getBegin(): Date;
+
+				/**
+				 * Gets the value of the <Titanium.Android.Calendar.Event.description> property.
+				 */
+				getDescription(): string;
+
+				/**
+				 * Gets the value of the <Titanium.Android.Calendar.Event.end> property.
+				 */
+				getEnd(): Date;
+
+				/**
+				 * Gets the value of the <Titanium.Android.Calendar.Event.extendedProperties> property.
+				 */
+				getExtendedProperties(): any;
+
+				/**
+				 * Gets the value of the <Titanium.Android.Calendar.Event.hasAlarm> property.
+				 */
+				getHasAlarm(): boolean;
+
+				/**
+				 * Gets the value of the <Titanium.Android.Calendar.Event.hasExtendedProperties> property.
+				 */
+				getHasExtendedProperties(): boolean;
+
+				/**
+				 * Gets the value of the <Titanium.Android.Calendar.Event.id> property.
+				 */
+				getId(): string;
+
+				/**
+				 * Gets the value of the <Titanium.Android.Calendar.Event.location> property.
+				 */
+				getLocation(): string;
+
+				/**
+				 * Gets the value of the <Titanium.Android.Calendar.Event.reminders> property.
+				 */
+				getReminders(): Titanium.Android.Calendar.Reminder[];
+
+				/**
+				 * Gets the value of the <Titanium.Android.Calendar.Event.status> property.
+				 */
+				getStatus(): number;
+
+				/**
+				 * Gets the value of the <Titanium.Android.Calendar.Event.title> property.
+				 */
+				getTitle(): string;
+
+				/**
+				 * Gets the value of the <Titanium.Android.Calendar.Event.visibility> property.
+				 */
+				getVisibility(): number;
+
+			}
+
+			/**
+			 * An object that represents a single reminder for an event in an Android calendar.
+			 */
+			interface Reminder extends Titanium.Proxy {
+				/**
+				 * Identifier of this reminder.
+				 */
+				readonly id: string;
+
+				/**
+				 * Method by which this reminder will be delivered.
+				 */
+				readonly method: number;
+
+				/**
+				 * Reminder notice period in minutes, that determines how long prior to the event this reminder
+				 * should trigger.
+				 */
+				readonly minutes: number;
+
+				/**
+				 * Gets the value of the <Titanium.Android.Calendar.Reminder.id> property.
+				 */
+				getId(): string;
+
+				/**
+				 * Gets the value of the <Titanium.Android.Calendar.Reminder.method> property.
+				 */
+				getMethod(): number;
+
+				/**
+				 * Gets the value of the <Titanium.Android.Calendar.Reminder.minutes> property.
+				 */
+				getMinutes(): number;
+
+			}
+
+		}
+
+		/**
+		 * Module for managing notifications.
+		 */
+		namespace NotificationManager {
+			/**
+			 * Indicates if the proxy will bubble an event to its parent.
+			 */
+			let bubbleParent: boolean;
+
+			/**
+			 * The name of the API that this proxy corresponds to.
+			 */
+			const apiName: string;
+
+			/**
+			 * The Window or TabGroup whose Activity lifecycle should be triggered on the proxy.
+			 */
+			let lifecycleContainer: Titanium.UI.Window | Titanium.UI.TabGroup;
+
+			/**
+			 * Use <Titanium.Android.DEFAULT_ALL> instead.
+			 */
+			const DEFAULT_ALL: number;
+
+			/**
+			 * Use <Titanium.Android.DEFAULT_LIGHTS> instead.
+			 */
+			const DEFAULT_LIGHTS: number;
+
+			/**
+			 * Use <Titanium.Android.DEFAULT_SOUND> instead.
+			 */
+			const DEFAULT_SOUND: number;
+
+			/**
+			 * Use <Titanium.Android.DEFAULT_VIBRATE> instead.
+			 */
+			const DEFAULT_VIBRATE: number;
+
+			/**
+			 * Use <Titanium.Android.FLAG_AUTO_CANCEL> instead.
+			 */
+			const FLAG_AUTO_CANCEL: number;
+
+			/**
+			 * Use <Titanium.Android.FLAG_INSISTENT> instead.
+			 */
+			const FLAG_INSISTENT: number;
+
+			/**
+			 * Use <Titanium.Android.FLAG_NO_CLEAR> instead.
+			 */
+			const FLAG_NO_CLEAR: number;
+
+			/**
+			 * Use <Titanium.Android.FLAG_ONGOING_EVENT> instead.
+			 */
+			const FLAG_ONGOING_EVENT: number;
+
+			/**
+			 * Use <Titanium.Android.FLAG_ONLY_ALERT_ONCE> instead.
+			 */
+			const FLAG_ONLY_ALERT_ONCE: number;
+
+			/**
+			 * Use <Titanium.Android.FLAG_SHOW_LIGHTS> instead.
+			 */
+			const FLAG_SHOW_LIGHTS: number;
+
+			/**
+			 * Use <Titanium.Android.STREAM_DEFAULT> instead.
+			 */
+			const STREAM_DEFAULT: number;
+
+			/**
+			 * Adds the specified callback as an event listener for the named event.
+			 */
+			function addEventListener(name: string, callback: (param0: any) => any): void;
+
+			/**
+			 * Removes the specified callback as an event listener for the named event.
+			 */
+			function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+			/**
+			 * Fires a synthesized event to any registered listeners.
+			 */
+			function fireEvent(name: string, event: any): void;
+
+			/**
+			 * Applies the properties to the proxy.
+			 */
+			function applyProperties(props: any): void;
+
+			/**
+			 * Cancels a previously displayed notification.
+			 */
+			function cancel(id: number): void;
+
+			/**
+			 * Cancels all previously displayed notifications.
+			 */
+			function cancelAll(): void;
+
+			/**
+			 * Adds a persistent notification to the status bar.
+			 */
+			function notify(id: number, notification: Titanium.Android.Notification): void;
+
+			/**
+			 * Create a notification channel.
+			 */
+			function createNotificationChannel(parameters: any): Titanium.Android.NotificationChannel;
+
+			/**
+			 * Returns whether showing notifications is enabled for the application.
+			 */
+			function areNotificationsEnabled(): boolean;
+
+			/**
+			 * Gets the value of the <Titanium.Android.NotificationManager.bubbleParent> property.
+			 */
+			function getBubbleParent(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.Android.NotificationManager.bubbleParent> property.
+			 */
+			function setBubbleParent(bubbleParent: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.NotificationManager.apiName> property.
+			 */
+			function getApiName(): string;
+
+			/**
+			 * Gets the value of the <Titanium.Android.NotificationManager.lifecycleContainer> property.
+			 */
+			function getLifecycleContainer(): Titanium.UI.Window | Titanium.UI.TabGroup;
+
+			/**
+			 * Sets the value of the <Titanium.Android.NotificationManager.lifecycleContainer> property.
+			 */
+			function setLifecycleContainer(lifecycleContainer: Titanium.UI.Window): void;
+
+			/**
+			 * Sets the value of the <Titanium.Android.NotificationManager.lifecycleContainer> property.
+			 */
+			function setLifecycleContainer(lifecycleContainer: Titanium.UI.TabGroup): void;
+
+		}
+
+		/**
+		 * The Titanium binding of the Android system-wide resources class.
+		 */
+		namespace R {
+			/**
+			 * Indicates if the proxy will bubble an event to its parent.
+			 */
+			let bubbleParent: boolean;
+
+			/**
+			 * The name of the API that this proxy corresponds to.
+			 */
+			const apiName: string;
+
+			/**
+			 * The Window or TabGroup whose Activity lifecycle should be triggered on the proxy.
+			 */
+			let lifecycleContainer: Titanium.UI.Window | Titanium.UI.TabGroup;
+
+			/**
+			 * Animation resources. See
+			 * [R.anim](http://developer.android.com/reference/android/R.anim.html)
+			 * in the Android Developer Reference.
+			 */
+			const anim: any;
+
+			/**
+			 * Array resources. See [R.array](http://developer.android.com/reference/android/R.array.html)
+			 * in the Android Developer Reference.
+			 */
+			const array: any;
+
+			/**
+			 * Attribute resources. See
+			 * [R.attr](http://developer.android.com/reference/android/R.attr.html)
+			 * in the Android Developer Reference.
+			 */
+			const attr: any;
+
+			/**
+			 * Color resources. See
+			 * [R.color](http://developer.android.com/reference/android/R.color.html)
+			 * in the Android Developer Reference.
+			 */
+			const color: any;
+
+			/**
+			 * Dimension resources.  See
+			 * [http://developer.android.com/reference/android/R.dimen.html](http://developer.android.com/reference/android/R.dimen.html)
+			 * in the Android Developer Reference.
+			 */
+			const dimen: any;
+
+			/**
+			 * Drawable resources. See
+			 * [R.drawable](http://developer.android.com/reference/android/R.drawable.html)
+			 * in the Android Developer Reference.
+			 * Accessing drawables using Ti.Android.R.drawable is deprecated and not a recommended practice since the system provided
+			 * drawables can be removed across Android versions. Prefer to copy the images to application res folder.
+			 */
+			const drawable: any;
+
+			/**
+			 * ID resources.  See
+			 * [R.id](http://developer.android.com/reference/android/R.id.html)
+			 * in the Android Developer Reference.
+			 */
+			const id: any;
+
+			/**
+			 * Integer resources. See
+			 * [R.integer](http://developer.android.com/reference/android/R.integer.html)
+			 * in the Android Developer Reference.
+			 */
+			const integer: any;
+
+			/**
+			 * Layout resources. See
+			 * [R.layout](http://developer.android.com/reference/android/R.layout.html)
+			 * in the Android Developer Reference.
+			 */
+			const layout: any;
+
+			/**
+			 * String resources. See
+			 * [R.string](http://developer.android.com/reference/android/R.string.html)
+			 * in the Android Developer Reference.
+			 */
+			const string: any;
+
+			/**
+			 * Style resources. See
+			 * [R.style](http://developer.android.com/reference/android/R.style.html)
+			 * in the Android Developer Reference.
+			 */
+			const style: any;
+
+			/**
+			 * Styleable reosurces. See
+			 * [R.styleable](http://developer.android.com/reference/android/R.styleable.html)
+			 * in the Android Developer Reference.
+			 */
+			const styleable: any;
+
+			/**
+			 * Adds the specified callback as an event listener for the named event.
+			 */
+			function addEventListener(name: string, callback: (param0: any) => any): void;
+
+			/**
+			 * Removes the specified callback as an event listener for the named event.
+			 */
+			function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+			/**
+			 * Fires a synthesized event to any registered listeners.
+			 */
+			function fireEvent(name: string, event: any): void;
+
+			/**
+			 * Applies the properties to the proxy.
+			 */
+			function applyProperties(props: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.R.bubbleParent> property.
+			 */
+			function getBubbleParent(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.Android.R.bubbleParent> property.
+			 */
+			function setBubbleParent(bubbleParent: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.Android.R.apiName> property.
+			 */
+			function getApiName(): string;
+
+			/**
+			 * Gets the value of the <Titanium.Android.R.lifecycleContainer> property.
+			 */
+			function getLifecycleContainer(): Titanium.UI.Window | Titanium.UI.TabGroup;
+
+			/**
+			 * Sets the value of the <Titanium.Android.R.lifecycleContainer> property.
+			 */
+			function setLifecycleContainer(lifecycleContainer: Titanium.UI.Window): void;
+
+			/**
+			 * Sets the value of the <Titanium.Android.R.lifecycleContainer> property.
+			 */
+			function setLifecycleContainer(lifecycleContainer: Titanium.UI.TabGroup): void;
 
 		}
 	}
-	export module Network {
-		export var INADDR_ANY : string;
-		export var NETWORK_LAN : number;
-		export var NETWORK_MOBILE : number;
-		export var NETWORK_NONE : number;
-		export var NETWORK_UNKNOWN : number;
-		export var NETWORK_WIFI : number;
-		export var NOTIFICATION_TYPE_ALERT : number;
-		export var NOTIFICATION_TYPE_BADGE : number;
-		export var NOTIFICATION_TYPE_NEWSSTAND : number;
-		export var NOTIFICATION_TYPE_SOUND : number;
-		export var PROGRESS_UNKNOWN : number;
-		export var READ_MODE : number;
-		export var READ_WRITE_MODE : number;
-		export var SOCKET_CLOSED : number;
-		export var SOCKET_CONNECTED : number;
-		export var SOCKET_ERROR : number;
-		export var SOCKET_INITIALIZED : number;
-		export var SOCKET_LISTENING : number;
-		export var TLS_VERSION_1_0 : number;
-		export var TLS_VERSION_1_1 : number;
-		export var TLS_VERSION_1_2 : number;
-		export var WRITE_MODE : number;
-		export var allHTTPCookies : Array<Ti.Network.Cookie>;
-		export var apiName : string;
-		export var bubbleParent : boolean;
-		export var httpURLFormatter : (...args : any[]) => any;
-		export var networkType : number;
-		export var networkTypeName : string;
-		export var online : boolean;
-		export var remoteDeviceUUID : string;
-		export var remoteNotificationTypes : Array<Number>;
-		export var remoteNotificationsEnabled : boolean;
-		export function addConnectivityListener (callback: (...args : any[]) => any) : void;
-		export function addEventListener (name: string, callback: (...args : any[]) => any) : void;
-		export function addHTTPCookie (cookie: Ti.Network.Cookie) : void;
-		export function addSystemCookie (cookie: Ti.Network.Cookie) : void;
-		export function applyProperties (props: Dictionary<Object>) : void;
-		export function createBonjourBrowser (serviceType: string, domain: string, parameters?: Dictionary<Ti.Network.BonjourBrowser>) : Ti.Network.BonjourBrowser;
-		export function createBonjourService (name: string, type: string, domain: string, parameters?: Dictionary<Ti.Network.BonjourService>) : Ti.Network.BonjourService;
-		export function createCookie (parameters?: Dictionary<Ti.Network.Cookie>) : Ti.Network.Cookie;
-		export function createHTTPClient (parameters?: Dictionary<Ti.Network.HTTPClient>) : Ti.Network.HTTPClient;
-		export function createTCPSocket (hostName: string, port: number, mode: number, parameters: Dictionary<Ti.Network.TCPSocket>) : Ti.Network.TCPSocket;
-		export function decodeURIComponent (value: string) : string;
-		export function encodeURIComponent (value: string) : string;
-		export function fireEvent (name: string, event: Dictionary<Object>) : void;
-		export function getAllHTTPCookies () : Array<Ti.Network.Cookie>;
-		export function getApiName () : string;
-		export function getBubbleParent () : boolean;
-		export function getHTTPCookies (domain: string, path: string, name: string) : Array<Ti.Network.Cookie>;
-		export function getHTTPCookiesForDomain (domain: string) : Array<Ti.Network.Cookie>;
-		export function getHttpURLFormatter () : (...args : any[]) => any;
-		export function getNetworkType () : number;
-		export function getNetworkTypeName () : string;
-		export function getOnline () : boolean;
-		export function getRemoteDeviceUUID () : string;
-		export function getRemoteNotificationTypes () : Array<Number>;
-		export function getRemoteNotificationsEnabled () : boolean;
-		export function getSystemCookies (domain: string, path: string, name: string) : Array<Ti.Network.Cookie>;
-		export function registerForPushNotifications (config: PushNotificationConfig) : void;
-		export function removeAllHTTPCookies () : void;
-		export function removeAllSystemCookies () : void;
-		export function removeConnectivityListener (callback: (...args : any[]) => any) : void;
-		export function removeEventListener (name: string, callback: (...args : any[]) => any) : void;
-		export function removeHTTPCookie (domain: string, path: string, name: string) : void;
-		export function removeHTTPCookiesForDomain (domain: string) : void;
-		export function removeSystemCookie (domain: string, path: string, name: string) : void;
-		export function setBubbleParent (bubbleParent: boolean) : void;
-		export function setHttpURLFormatter (httpURLFormatter: (...args : any[]) => any) : void;
-		export function unregisterForPushNotifications () : void;
-		export interface TCPSocket extends Ti.Proxy {
-			hostName : string;
-			isValid : boolean;
-			mode : number;
-			port : number;
-			stripTerminator : boolean;
-			close () : void;
-			connect () : void;
-			getHostName () : string;
-			getIsValid () : boolean;
-			getMode () : number;
-			getPort () : number;
-			getStripTerminator () : boolean;
-			listen () : void;
-			setHostName (hostName: string) : void;
-			setIsValid (isValid: boolean) : void;
-			setMode (mode: number) : void;
-			setPort (port: number) : void;
-			setStripTerminator (stripTerminator: boolean) : void;
-			write (data: any, sendTo: number) : void;
-			write (data: string, sendTo: number) : void;
-		}
-		export module Socket {
-			export var CLOSED : number;
-			export var CONNECTED : number;
-			export var ERROR : number;
-			export var INITIALIZED : number;
-			export var LISTENING : number;
-			export var apiName : string;
-			export var bubbleParent : boolean;
-			export function addEventListener (name: string, callback: (...args : any[]) => any) : void;
-			export function applyProperties (props: Dictionary<Object>) : void;
-			export function createTCP (params?: Dictionary<Ti.Network.Socket.TCP>) : Ti.Network.Socket.TCP;
-			export function createUDP (params?: Dictionary<Ti.Network.Socket.UDP>) : Ti.Network.Socket.UDP;
-			export function fireEvent (name: string, event: Dictionary<Object>) : void;
-			export function getApiName () : string;
-			export function getBubbleParent () : boolean;
-			export function removeEventListener (name: string, callback: (...args : any[]) => any) : void;
-			export function setBubbleParent (bubbleParent: boolean) : void;
-			export interface UDP extends Ti.IOStream {
-				data : (...args : any[]) => any;
-				error : (...args : any[]) => any;
-				port : number;
-				started : (...args : any[]) => any;
-				getData () : (...args : any[]) => any;
-				getError () : (...args : any[]) => any;
-				getPort () : number;
-				getStarted () : (...args : any[]) => any;
-				sendBytes (port: number, host: string, data: Array<Number>) : void;
-				sendString (port: number, host: string, data: string) : void;
-				setData (data: (...args : any[]) => any) : void;
-				setError (error: (...args : any[]) => any) : void;
-				setPort (port: number) : void;
-				setStarted (started: (...args : any[]) => any) : void;
-				start (port: number) : void;
-				stop () : void;
+
+	/**
+	 * The top-level App module is mainly used for accessing information about the
+	 * application at runtime, and for sending or listening for system events.
+	 */
+	namespace App {
+		/**
+		 * Indicates if the proxy will bubble an event to its parent.
+		 */
+		let bubbleParent: boolean;
+
+		/**
+		 * The name of the API that this proxy corresponds to.
+		 */
+		const apiName: string;
+
+		/**
+		 * The Window or TabGroup whose Activity lifecycle should be triggered on the proxy.
+		 */
+		let lifecycleContainer: Titanium.UI.Window | Titanium.UI.TabGroup;
+
+		/**
+		 * Convenience constant for system event "accessibilityannouncement".
+		 */
+		const EVENT_ACCESSIBILITY_ANNOUNCEMENT: string;
+
+		/**
+		 * Convenience constant for system event "accessibilitychanged".
+		 */
+		const EVENT_ACCESSIBILITY_CHANGED: string;
+
+		/**
+		 * Indicates whether Accessibility is enabled by the system.
+		 */
+		const accessibilityEnabled: boolean;
+
+		/**
+		 * Indicates whether Analytics is enabled, determined by `tiapp.xml`.
+		 */
+		const analytics: boolean;
+
+		/**
+		 * Application copyright statement, determined by `tiapp.xml`.
+		 */
+		const copyright: string;
+
+		/**
+		 * Build type that reflects how the application was packaged.
+		 * Returns one of the following values:
+		 * * `development` (Simulator)
+		 * * `test` (Device)
+		 * * `production` (App Store / Adhoc)
+		 */
+		const deployType: string;
+
+		/**
+		 * Application description, determined by `tiapp.xml`.
+		 */
+		const description: string;
+
+		/**
+		 * Application globally-unique ID, determined by `tiapp.xml`.
+		 */
+		const guid: string;
+
+		/**
+		 * Shows the application's splash screen on app resume.
+		 */
+		let forceSplashAsSnapshot: boolean;
+
+		/**
+		 * Application ID, from `tiapp.xml`.
+		 */
+		const id: string;
+
+		/**
+		 * The install ID for this application.
+		 */
+		const installId: string;
+
+		/**
+		 * Determines whether the screen is locked when the device is idle.
+		 */
+		let idleTimerDisabled: boolean;
+
+		/**
+		 * Application name, determined by `tiapp.xml`.
+		 */
+		const name: string;
+
+		/**
+		 * Determines whether proximity detection is enabled.
+		 */
+		let proximityDetection: boolean;
+
+		/**
+		 * Indicates the state of the device's proximity sensor, according to the
+		 * <Titanium.App.proximity> event.
+		 */
+		const proximityState: boolean;
+
+		/**
+		 * Prevents network activity indicator from being displayed.
+		 */
+		let disableNetworkActivityIndicator: boolean;
+
+		/**
+		 * Application publisher, from `tiapp.xml`.
+		 */
+		const publisher: string;
+
+		/**
+		 * Unique session identifier for the current continuous run of the application.
+		 */
+		const sessionId: string;
+
+		/**
+		 * Application URL, from `tiapp.xml`.
+		 */
+		const url: string;
+
+		/**
+		 * Application version, from `tiapp.xml`.
+		 */
+		const version: string;
+
+		/**
+		 * Indicates whether or not the soft keyboard is visible.
+		 */
+		const keyboardVisible: boolean;
+
+		/**
+		 * Adds the specified callback as an event listener for the named event.
+		 */
+		function addEventListener(name: string, callback: (param0: any) => any): void;
+
+		/**
+		 * Removes the specified callback as an event listener for the named event.
+		 */
+		function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+		/**
+		 * Fires a synthesized event to any registered listeners.
+		 */
+		function fireEvent(name: string, event: any): void;
+
+		/**
+		 * Applies the properties to the proxy.
+		 */
+		function applyProperties(props: any): void;
+
+		/**
+		 * Fire a system-level event such as <Titanium.App.EVENT_ACCESSIBILITY_ANNOUNCEMENT>.
+		 */
+		function fireSystemEvent(eventName: string, param?: any): void;
+
+		/**
+		 * Returns the arguments passed to the application on startup.
+		 */
+		function getArguments(): launchOptions;
+
+		/**
+		 * Gets the value of the <Titanium.App.bubbleParent> property.
+		 */
+		function getBubbleParent(): boolean;
+
+		/**
+		 * Sets the value of the <Titanium.App.bubbleParent> property.
+		 */
+		function setBubbleParent(bubbleParent: boolean): void;
+
+		/**
+		 * Gets the value of the <Titanium.App.apiName> property.
+		 */
+		function getApiName(): string;
+
+		/**
+		 * Gets the value of the <Titanium.App.lifecycleContainer> property.
+		 */
+		function getLifecycleContainer(): Titanium.UI.Window | Titanium.UI.TabGroup;
+
+		/**
+		 * Sets the value of the <Titanium.App.lifecycleContainer> property.
+		 */
+		function setLifecycleContainer(lifecycleContainer: Titanium.UI.Window): void;
+
+		/**
+		 * Sets the value of the <Titanium.App.lifecycleContainer> property.
+		 */
+		function setLifecycleContainer(lifecycleContainer: Titanium.UI.TabGroup): void;
+
+		/**
+		 * Gets the value of the <Titanium.App.accessibilityEnabled> property.
+		 */
+		function getAccessibilityEnabled(): boolean;
+
+		/**
+		 * Gets the value of the <Titanium.App.analytics> property.
+		 */
+		function getAnalytics(): boolean;
+
+		/**
+		 * Gets the value of the <Titanium.App.copyright> property.
+		 */
+		function getCopyright(): string;
+
+		/**
+		 * Gets the value of the <Titanium.App.deployType> property.
+		 */
+		function getDeployType(): string;
+
+		/**
+		 * Gets the value of the <Titanium.App.description> property.
+		 */
+		function getDescription(): string;
+
+		/**
+		 * Gets the value of the <Titanium.App.guid> property.
+		 */
+		function getGuid(): string;
+
+		/**
+		 * Gets the value of the <Titanium.App.forceSplashAsSnapshot> property.
+		 */
+		function getForceSplashAsSnapshot(): boolean;
+
+		/**
+		 * Sets the value of the <Titanium.App.forceSplashAsSnapshot> property.
+		 */
+		function setForceSplashAsSnapshot(forceSplashAsSnapshot: boolean): void;
+
+		/**
+		 * Gets the value of the <Titanium.App.id> property.
+		 */
+		function getId(): string;
+
+		/**
+		 * Gets the value of the <Titanium.App.installId> property.
+		 */
+		function getInstallId(): string;
+
+		/**
+		 * Gets the value of the <Titanium.App.idleTimerDisabled> property.
+		 */
+		function getIdleTimerDisabled(): boolean;
+
+		/**
+		 * Sets the value of the <Titanium.App.idleTimerDisabled> property.
+		 */
+		function setIdleTimerDisabled(idleTimerDisabled: boolean): void;
+
+		/**
+		 * Gets the value of the <Titanium.App.name> property.
+		 */
+		function getName(): string;
+
+		/**
+		 * Gets the value of the <Titanium.App.proximityDetection> property.
+		 */
+		function getProximityDetection(): boolean;
+
+		/**
+		 * Sets the value of the <Titanium.App.proximityDetection> property.
+		 */
+		function setProximityDetection(proximityDetection: boolean): void;
+
+		/**
+		 * Gets the value of the <Titanium.App.proximityState> property.
+		 */
+		function getProximityState(): boolean;
+
+		/**
+		 * Gets the value of the <Titanium.App.disableNetworkActivityIndicator> property.
+		 */
+		function getDisableNetworkActivityIndicator(): boolean;
+
+		/**
+		 * Sets the value of the <Titanium.App.disableNetworkActivityIndicator> property.
+		 */
+		function setDisableNetworkActivityIndicator(disableNetworkActivityIndicator: boolean): void;
+
+		/**
+		 * Gets the value of the <Titanium.App.publisher> property.
+		 */
+		function getPublisher(): string;
+
+		/**
+		 * Gets the value of the <Titanium.App.sessionId> property.
+		 */
+		function getSessionId(): string;
+
+		/**
+		 * Gets the value of the <Titanium.App.url> property.
+		 */
+		function getUrl(): string;
+
+		/**
+		 * Gets the value of the <Titanium.App.version> property.
+		 */
+		function getVersion(): string;
+
+		/**
+		 * Gets the value of the <Titanium.App.keyboardVisible> property.
+		 */
+		function getKeyboardVisible(): boolean;
+
+
+		/**
+		 * A module used to access Android application resources.
+		 */
+		namespace Android {
+			/**
+			 * Indicates if the proxy will bubble an event to its parent.
+			 */
+			let bubbleParent: boolean;
+
+			/**
+			 * The name of the API that this proxy corresponds to.
+			 */
+			const apiName: string;
+
+			/**
+			 * The Window or TabGroup whose Activity lifecycle should be triggered on the proxy.
+			 */
+			let lifecycleContainer: Titanium.UI.Window | Titanium.UI.TabGroup;
+
+			/**
+			 * The `R` namespace for application resources.
+			 */
+			const R: Titanium.App.Android.R;
+
+			/**
+			 * The version number of the application.
+			 */
+			const appVersionCode: number;
+
+			/**
+			 * The version name of the application.
+			 */
+			const appVersionName: string;
+
+			/**
+			 * Return the intent that was used to launch the application.
+			 */
+			const launchIntent: Titanium.Android.Intent;
+
+			/**
+			 * Adds the specified callback as an event listener for the named event.
+			 */
+			function addEventListener(name: string, callback: (param0: any) => any): void;
+
+			/**
+			 * Removes the specified callback as an event listener for the named event.
+			 */
+			function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+			/**
+			 * Fires a synthesized event to any registered listeners.
+			 */
+			function fireEvent(name: string, event: any): void;
+
+			/**
+			 * Applies the properties to the proxy.
+			 */
+			function applyProperties(props: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.App.Android.bubbleParent> property.
+			 */
+			function getBubbleParent(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.App.Android.bubbleParent> property.
+			 */
+			function setBubbleParent(bubbleParent: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.App.Android.apiName> property.
+			 */
+			function getApiName(): string;
+
+			/**
+			 * Gets the value of the <Titanium.App.Android.lifecycleContainer> property.
+			 */
+			function getLifecycleContainer(): Titanium.UI.Window | Titanium.UI.TabGroup;
+
+			/**
+			 * Sets the value of the <Titanium.App.Android.lifecycleContainer> property.
+			 */
+			function setLifecycleContainer(lifecycleContainer: Titanium.UI.Window): void;
+
+			/**
+			 * Sets the value of the <Titanium.App.Android.lifecycleContainer> property.
+			 */
+			function setLifecycleContainer(lifecycleContainer: Titanium.UI.TabGroup): void;
+
+			/**
+			 * Gets the value of the <Titanium.App.Android.appVersionCode> property.
+			 */
+			function getAppVersionCode(): number;
+
+			/**
+			 * Gets the value of the <Titanium.App.Android.appVersionName> property.
+			 */
+			function getAppVersionName(): string;
+
+			/**
+			 * Gets the value of the <Titanium.App.Android.launchIntent> property.
+			 */
+			function getLaunchIntent(): Titanium.Android.Intent;
+
+			/**
+			 * The Titanium binding of the native Android `R` class, giving access to application resources.
+			 */
+			interface R extends Titanium.Proxy {
 			}
-			export interface TCP extends Ti.IOStream {
-				accepted : (...args : any[]) => any;
-				connected : (...args : any[]) => any;
-				error : (...args : any[]) => any;
-				host : string;
-				listenQueueSize : number;
-				port : number;
-				state : number;
-				timeout : number;
-				accept (options: AcceptDict) : void;
-				connect () : void;
-				getAccepted () : (...args : any[]) => any;
-				getConnected () : (...args : any[]) => any;
-				getError () : (...args : any[]) => any;
-				getHost () : string;
-				getListenQueueSize () : number;
-				getPort () : number;
-				getState () : number;
-				getTimeout () : number;
-				listen () : void;
-				setAccepted (accepted: (...args : any[]) => any) : void;
-				setConnected (connected: (...args : any[]) => any) : void;
-				setError (error: (...args : any[]) => any) : void;
-				setHost (host: string) : void;
-				setListenQueueSize (listenQueueSize: number) : void;
-				setPort (port: number) : void;
-				setTimeout (timeout: number) : void;
+
+		}
+
+		/**
+		 * The App Properties module is used for storing application-related data in property/value pairs
+		 * that persist beyond application sessions and device power cycles.
+		 */
+		namespace Properties {
+			/**
+			 * Indicates if the proxy will bubble an event to its parent.
+			 */
+			let bubbleParent: boolean;
+
+			/**
+			 * The name of the API that this proxy corresponds to.
+			 */
+			const apiName: string;
+
+			/**
+			 * The Window or TabGroup whose Activity lifecycle should be triggered on the proxy.
+			 */
+			let lifecycleContainer: Titanium.UI.Window | Titanium.UI.TabGroup;
+
+			/**
+			 * Adds the specified callback as an event listener for the named event.
+			 */
+			function addEventListener(name: string, callback: (param0: any) => any): void;
+
+			/**
+			 * Removes the specified callback as an event listener for the named event.
+			 */
+			function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+			/**
+			 * Fires a synthesized event to any registered listeners.
+			 */
+			function fireEvent(name: string, event: any): void;
+
+			/**
+			 * Applies the properties to the proxy.
+			 */
+			function applyProperties(props: any): void;
+
+			/**
+			 * Returns the value of a property as a boolean data type.
+			 */
+			function getBool(property: string, defaultValue?: boolean): boolean;
+
+			/**
+			 * Returns the value of a property as a double (double-precision, floating point) data type.
+			 */
+			function getDouble(property: string, defaultValue?: number): number;
+
+			/**
+			 * Returns the value of a property as an integer data type.
+			 */
+			function getInt(property: string, defaultValue?: number): number;
+
+			/**
+			 * Returns the value of a property as an array data type.
+			 */
+			function getList(property: string, defaultValue?: ReadonlyArray<any>): any[];
+
+			/**
+			 * Returns the value of a property as an object.
+			 */
+			function getObject(property: string, defaultValue?: any): any;
+
+			/**
+			 * Returns the value of a property as a string data type.
+			 */
+			function getString(property: string, defaultValue?: string): string;
+
+			/**
+			 * Indicates whether a property exists.
+			 */
+			function hasProperty(property: string): boolean;
+
+			/**
+			 * Returns an array of property names.
+			 */
+			function listProperties(): any[];
+
+			/**
+			 * Removes a property if it exists, or does nothing otherwise.
+			 */
+			function removeProperty(property: string): void;
+
+			/**
+			 * Removes all properties that have been set by the user on runtime, or does nothing otherwise.
+			 */
+			function removeAllProperties(): void;
+
+			/**
+			 * Sets the value of a property as a boolean data type. The property will be created if it
+			 * does not exist.
+			 */
+			function setBool(property: string, value: boolean): void;
+
+			/**
+			 * Sets the value of a property as a double (double-precision, floating point) data type. The
+			 * property will be created if it does not exist.
+			 */
+			function setDouble(property: string, value: number): void;
+
+			/**
+			 * Sets the value of a property as an integer data type. The property will be created if it
+			 * does not exist.
+			 */
+			function setInt(property: string, value: number): void;
+
+			/**
+			 * Sets the value of a property as an array data type. The property will be created if it
+			 * does not exist.
+			 */
+			function setList(property: string, value: ReadonlyArray<any>): void;
+
+			/**
+			 * Sets the value of a property as an object data type. The property will be created if it
+			 * does not exist.
+			 */
+			function setObject(property: string, value: any): void;
+
+			/**
+			 * Sets the value of a property as a string data type. The property will be created if it
+			 * does not exist.
+			 */
+			function setString(property: string, value: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.App.Properties.bubbleParent> property.
+			 */
+			function getBubbleParent(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.App.Properties.bubbleParent> property.
+			 */
+			function setBubbleParent(bubbleParent: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.App.Properties.apiName> property.
+			 */
+			function getApiName(): string;
+
+			/**
+			 * Gets the value of the <Titanium.App.Properties.lifecycleContainer> property.
+			 */
+			function getLifecycleContainer(): Titanium.UI.Window | Titanium.UI.TabGroup;
+
+			/**
+			 * Sets the value of the <Titanium.App.Properties.lifecycleContainer> property.
+			 */
+			function setLifecycleContainer(lifecycleContainer: Titanium.UI.Window): void;
+
+			/**
+			 * Sets the value of the <Titanium.App.Properties.lifecycleContainer> property.
+			 */
+			function setLifecycleContainer(lifecycleContainer: Titanium.UI.TabGroup): void;
+
+		}
+
+		/**
+		 * The top-level App iOS module, available only to iOS devices, that includes the facilities to
+		 * create and manage local notifications and background services.
+		 */
+		namespace iOS {
+			/**
+			 * Indicates if the proxy will bubble an event to its parent.
+			 */
+			let bubbleParent: boolean;
+
+			/**
+			 * The name of the API that this proxy corresponds to.
+			 */
+			const apiName: string;
+
+			/**
+			 * Convenience constant for system event "accessibilitylayoutchanged".
+			 */
+			const EVENT_ACCESSIBILITY_LAYOUT_CHANGED: string;
+
+			/**
+			 * Convenience constant for system event "accessibilityscreenchanged".
+			 */
+			const EVENT_ACCESSIBILITY_SCREEN_CHANGED: string;
+
+			/**
+			 * Use with [setMinimumBackgroundFetchInterval](Titanium.App.iOS.setMinimumBackgroundFetchInterval) method.
+			 * Specifies the smallest fetch interval supported by the system.
+			 */
+			const BACKGROUNDFETCHINTERVAL_MIN: number;
+
+			/**
+			 * Use with [setMinimumBackgroundFetchInterval](Titanium.App.iOS.setMinimumBackgroundFetchInterval) method.
+			 * Used to specify a fetch interval large enough to prevent fetch operations from occurring.
+			 */
+			const BACKGROUNDFETCHINTERVAL_NEVER: number;
+
+			/**
+			 * The application may not present any UI upon a notification being received.
+			 * Use with the [types](UserNotificationSettings.types) property.
+			 */
+			const USER_NOTIFICATION_TYPE_NONE: number;
+
+			/**
+			 * The application may badge its icon upon a notification being received.
+			 * Use with the [types](UserNotificationSettings.types) property.
+			 */
+			const USER_NOTIFICATION_TYPE_BADGE: number;
+
+			/**
+			 * The application may play a sound upon a notification being received.
+			 * Use with the [types](UserNotificationSettings.types) property.
+			 */
+			const USER_NOTIFICATION_TYPE_SOUND: number;
+
+			/**
+			 * The application may display an alert upon a notification being received.
+			 * Use with the [types](UserNotificationSettings.types) property.
+			 */
+			const USER_NOTIFICATION_TYPE_ALERT: number;
+
+			/**
+			 * The action will execute in background.  Use with the
+			 * [activationMode](Titanium.App.iOS.UserNotificationAction.activationMode) property.
+			 */
+			const USER_NOTIFICATION_ACTIVATION_MODE_BACKGROUND: number;
+
+			/**
+			 * The action will launch the application and execute in the foreground.
+			 * Use with the [activationMode](Titanium.App.iOS.UserNotificationAction.activationMode) property.
+			 */
+			const USER_NOTIFICATION_ACTIVATION_MODE_FOREGROUND: number;
+
+			/**
+			 * Default action behavior with no additional action support.
+			 */
+			const USER_NOTIFICATION_BEHAVIOR_DEFAULT: number;
+
+			/**
+			 * Provides a textfield with the notification for the user to enter a text response.
+			 */
+			const USER_NOTIFICATION_BEHAVIOR_TEXTINPUT: number;
+
+			/**
+			 * Uniform type identifier for all text types.
+			 */
+			const UTTYPE_TEXT: string;
+
+			/**
+			 * Uniform type identifier for a plain text type, equivalent to MIME type text/plain.
+			 */
+			const UTTYPE_PLAIN_TEXT: string;
+
+			/**
+			 * Uniform type identifier for Unicode-8 plain text type.
+			 */
+			const UTTYPE_UTF8_PLAIN_TEXT: string;
+
+			/**
+			 * Uniform type identifier for Unicode-16 with byte-order mark (BOM), or if BOM is not present,
+			 * an external representation byte order (big-endian).
+			 */
+			const UTTYPE_UTF16_EXTERNAL_PLAIN_TEXT: string;
+
+			/**
+			 * Uniform type identifier for Unicode-16, native byte order, with an optional byte-order mark (BOM).
+			 */
+			const UTTYPE_UTF16_PLAIN_TEXT: string;
+
+			/**
+			 * Uniform type identifier for Rich Text.
+			 */
+			const UTTYPE_RTF: string;
+
+			/**
+			 * Uniform type identifier for HTML.
+			 */
+			const UTTYPE_HTML: string;
+
+			/**
+			 * Uniform type identifier for XML.
+			 */
+			const UTTYPE_XML: string;
+
+			/**
+			 * Uniform type identifier for PDF data.
+			 */
+			const UTTYPE_PDF: string;
+
+			/**
+			 * Uniform type identifier for Rich Text Format Directory, that is, Rich Text with content embedding, on-disk format.
+			 */
+			const UTTYPE_RTFD: string;
+
+			/**
+			 * Uniform type identifier for Rich Text with content embedding, pasteboard format.
+			 */
+			const UTTYPE_FLAT_RTFD: string;
+
+			/**
+			 * Uniform type identifier for MLTE (Textension) format for mixed text and multimedia data.
+			 */
+			const UTTYPE_TXN_TEXT_AND_MULTIMEDIA_DATA: string;
+
+			/**
+			 * Uniform type identifier for WebKit webarchive format.
+			 */
+			const UTTYPE_WEB_ARCHIVE: string;
+
+			/**
+			 * Uniform type identifier for all image types.
+			 */
+			const UTTYPE_IMAGE: string;
+
+			/**
+			 * Uniform type identifier for JPEG images.
+			 */
+			const UTTYPE_JPEG: string;
+
+			/**
+			 * Uniform type identifier for JPEG 2000 images.
+			 */
+			const UTTYPE_JPEG2000: string;
+
+			/**
+			 * Uniform type identifier for TIFF images.
+			 */
+			const UTTYPE_TIFF: string;
+
+			/**
+			 * Uniform type identifier for PICT images.
+			 */
+			const UTTYPE_PICT: string;
+
+			/**
+			 * Uniform type identifier for GIF images.
+			 */
+			const UTTYPE_GIF: string;
+
+			/**
+			 * Uniform type identifier for PNG images.
+			 */
+			const UTTYPE_PNG: string;
+
+			/**
+			 * Uniform type identifier for QuickTime images.
+			 */
+			const UTTYPE_QUICKTIME_IMAGE: string;
+
+			/**
+			 * Uniform type identifier for Mac OS icon images.
+			 */
+			const UTTYPE_APPLE_ICNS: string;
+
+			/**
+			 * Uniform type identifier for Windows bitmap images.
+			 */
+			const UTTYPE_BMP: string;
+
+			/**
+			 * Uniform type identifier for Windows icon images.
+			 */
+			const UTTYPE_ICO: string;
+
+			/**
+			 * Uniform type identifier for all audiovisual content.
+			 */
+			const UTTYPE_MOVIE: string;
+
+			/**
+			 * Uniform type identifier for all video content without audio.
+			 */
+			const UTTYPE_VIDEO: string;
+
+			/**
+			 * Uniform type identifier for all audio content.
+			 */
+			const UTTYPE_AUDIO: string;
+
+			/**
+			 * Uniform type identifier for QuickTime movies.
+			 */
+			const UTTYPE_QUICKTIME_MOVIE: string;
+
+			/**
+			 * Uniform type identifier for MPEG-1 and MPEG-2 content.
+			 */
+			const UTTYPE_MPEG: string;
+
+			/**
+			 * Uniform type identifier for MPEG-4 content.
+			 */
+			const UTTYPE_MPEG4: string;
+
+			/**
+			 * Uniform type identifier for MP3 audio.
+			 */
+			const UTTYPE_MP3: string;
+
+			/**
+			 * Uniform type identifier for MPEG-4 audio.
+			 */
+			const UTTYPE_MPEG4_AUDIO: string;
+
+			/**
+			 * Uniform type identifier for protected MPEG-4 audio (iTunes music store format).
+			 */
+			const UTTYPE_APPLE_PROTECTED_MPEG4_AUDIO: string;
+
+			/**
+			 * Notification types and user notification categories the application is registered to use
+			 * (available on iOS 8 and later).
+			 */
+			const currentUserNotificationSettings: UserNotificationSettings;
+
+			/**
+			 * Provides an Array of the NSUserActivityTypes keys defined within your Titanium project.
+			 * (available on iOS 8 and later).
+			 */
+			const supportedUserActivityTypes: string[];
+
+			/**
+			 * Returns a URL to open the app's settings.
+			 */
+			const applicationOpenSettingsURL: string;
+
+			/**
+			 * Adds the specified callback as an event listener for the named event.
+			 */
+			function addEventListener(name: string, callback: (param0: any) => any): void;
+
+			/**
+			 * Removes the specified callback as an event listener for the named event.
+			 */
+			function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+			/**
+			 * Fires a synthesized event to any registered listeners.
+			 */
+			function fireEvent(name: string, event: any): void;
+
+			/**
+			 * Applies the properties to the proxy.
+			 */
+			function applyProperties(props: any): void;
+
+			/**
+			 * Creates and returns an instance of Titanium.App.iOS.UserDefaults.
+			 */
+			function createUserDefaults(parameters: any): Titanium.App.iOS.UserDefaults;
+
+			/**
+			 * Cancels all scheduled local notifications.
+			 */
+			function cancelAllLocalNotifications(): void;
+
+			/**
+			 * Cancels a local notification.
+			 */
+			function cancelLocalNotification(id: number): void;
+
+			/**
+			 * Cancels a local notification.
+			 */
+			function cancelLocalNotification(id: string): void;
+
+			/**
+			 * Registers a service to run when the application is placed in the background.
+			 */
+			function registerBackgroundService(params: any): Titanium.App.iOS.BackgroundService;
+
+			/**
+			 * Registers the application to use the requested notification types and categories
+			 * (for devices running iOS 8 or later).
+			 */
+			function registerUserNotificationSettings(params: UserNotificationSettings): void;
+
+			/**
+			 * Schedule a local notification.
+			 */
+			function scheduleLocalNotification(params: NotificationParams): Titanium.App.iOS.LocalNotification;
+
+			/**
+			 * Specifies the minimum amount of time that must elapse between background fetch operations.
+			 * Available only on iOS 7 and later.
+			 */
+			function setMinimumBackgroundFetchInterval(fetchInterval: number): void;
+
+			/**
+			 * Marks the end of the app execution after initiating the download operation. Available only on iOS 7 and later.
+			 */
+			function endBackgroundHandler(handlerID: string): void;
+
+			/**
+			 * Marks the end of an `openParentApplication:reply` execution by a WatchKit extension.
+			 */
+			function sendWatchExtensionReply(handlerId: string, userInfo: any): void;
+
+			/**
+			 * Creates and returns an instance of <Titanium.App.iOS.SearchQuery>.
+			 */
+			function createSearchQuery(parameters?: any): Titanium.App.iOS.SearchQuery;
+
+			/**
+			 * Creates and returns an instance of <Titanium.App.iOS.SearchableIndex>.
+			 */
+			function createSearchableIndex(parameters?: any): Titanium.App.iOS.SearchableIndex;
+
+			/**
+			 * Creates and returns an instance of <Titanium.App.iOS.SearchableItem>.
+			 */
+			function createSearchableItem(parameters?: any): Titanium.App.iOS.SearchableItem;
+
+			/**
+			 * Creates and returns an instance of <Titanium.App.iOS.SearchableItemAttributeSet>.
+			 */
+			function createSearchableItemAttributeSet(parameters?: any): Titanium.App.iOS.SearchableItemAttributeSet;
+
+			/**
+			 * Creates and returns an instance of <Titanium.App.iOS.UserActivity>.
+			 */
+			function createUserActivity(parameters?: any): Titanium.App.iOS.UserActivity;
+
+			/**
+			 * Creates and returns an instance of <Titanium.App.iOS.UserNotificationAction>.
+			 */
+			function createUserNotificationAction(parameters?: any): Titanium.App.iOS.UserNotificationAction;
+
+			/**
+			 * Creates and returns an instance of <Titanium.App.iOS.UserNotificationCategory>.
+			 */
+			function createUserNotificationCategory(parameters?: any): Titanium.App.iOS.UserNotificationCategory;
+
+			/**
+			 * Gets the value of the <Titanium.App.iOS.bubbleParent> property.
+			 */
+			function getBubbleParent(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.App.iOS.bubbleParent> property.
+			 */
+			function setBubbleParent(bubbleParent: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.App.iOS.apiName> property.
+			 */
+			function getApiName(): string;
+
+			/**
+			 * Gets the value of the <Titanium.App.iOS.currentUserNotificationSettings> property.
+			 */
+			function getCurrentUserNotificationSettings(): UserNotificationSettings;
+
+			/**
+			 * Gets the value of the <Titanium.App.iOS.supportedUserActivityTypes> property.
+			 */
+			function getSupportedUserActivityTypes(): string[];
+
+			/**
+			 * Gets the value of the <Titanium.App.iOS.applicationOpenSettingsURL> property.
+			 */
+			function getApplicationOpenSettingsURL(): string;
+
+			/**
+			 * A service that runs when the application is placed in the background.
+			 */
+			interface BackgroundService extends Titanium.Proxy {
+				/**
+				 * A local URL to a JavaScript file containing the code to run in the background.
+				 */
+				url: string;
+
+				/**
+				 * Stops the service from running during the current background session to conserve resources.
+				 */
+				stop(): void;
+
+				/**
+				 * Unregisters the background service.
+				 */
+				unregister(): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.BackgroundService.url> property.
+				 */
+				getUrl(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.BackgroundService.url> property.
+				 */
+				setUrl(url: string): void;
+
 			}
-		}
-		export interface BonjourService extends Ti.Proxy {
-			domain : string;
-			isLocal : boolean;
-			name : string;
-			socket : any;
-			type : string;
-			getDomain () : string;
-			getIsLocal () : boolean;
-			getName () : string;
-			getSocket () : any;
-			getType () : string;
-			publish (socket: any) : void;
-			resolve (timeout: number) : void;
-			setDomain (domain: string) : void;
-			setIsLocal (isLocal: boolean) : void;
-			setName (name: string) : void;
-			setSocket (socket: any) : void;
-			setType (type: string) : void;
-			stop () : void;
-		}
-		export interface HTTPClient extends Ti.Proxy {
-			DONE : number;
-			HEADERS_RECEIVED : number;
-			LOADING : number;
-			OPENED : number;
-			UNSENT : number;
-			allResponseHeaders : string;
-			autoEncodeUrl : boolean;
-			autoRedirect : boolean;
-			cache : boolean;
-			connected : boolean;
-			connectionType : string;
-			domain : string;
-			enableKeepAlive : boolean;
-			file : string;
-			location : string;
-			ondatastream : (...args : any[]) => any;
-			onerror : (...args : any[]) => any;
-			onload : (...args : any[]) => any;
-			onreadystatechange : (...args : any[]) => any;
-			onsendstream : (...args : any[]) => any;
-			password : string;
-			readyState : number;
-			responseData : Ti.Blob;
-			responseText : string;
-			responseXML : Ti.XML.Document;
-			securityManager : SecurityManagerProtocol;
-			status : number;
-			statusText : string;
-			timeout : number;
-			tlsVersion : number;
-			username : string;
-			validatesSecureCertificate : boolean;
-			withCredentials : boolean;
-			abort () : void;
-			addAuthFactory (scheme: string, factory: any) : void;
-			addKeyManager (X509KeyManager: any) : void;
-			addTrustManager (X509TrustManager: any) : void;
-			clearCookies (host: string) : void;
-			getAllResponseHeaders () : string;
-			getAutoEncodeUrl () : boolean;
-			getAutoRedirect () : boolean;
-			getCache () : boolean;
-			getConnected () : boolean;
-			getConnectionType () : string;
-			getDomain () : string;
-			getEnableKeepAlive () : boolean;
-			getFile () : string;
-			getLocation () : string;
-			getOndatastream () : (...args : any[]) => any;
-			getOnerror () : (...args : any[]) => any;
-			getOnload () : (...args : any[]) => any;
-			getOnreadystatechange () : (...args : any[]) => any;
-			getOnsendstream () : (...args : any[]) => any;
-			getPassword () : string;
-			getReadyState () : number;
-			getResponseData () : Ti.Blob;
-			getResponseHeader (name: string) : string;
-			getResponseText () : string;
-			getResponseXML () : Ti.XML.Document;
-			getSecurityManager () : SecurityManagerProtocol;
-			getStatus () : number;
-			getStatusText () : string;
-			getTimeout () : number;
-			getTlsVersion () : number;
-			getUsername () : string;
-			getValidatesSecureCertificate () : boolean;
-			getWithCredentials () : boolean;
-			open (method: string, url: string, async?: boolean) : void;
-			send (data?: any) : void;
-			send (data?: string) : void;
-			send (data?: Ti.Filesystem.File) : void;
-			send (data?: Ti.Blob) : void;
-			setAutoEncodeUrl (autoEncodeUrl: boolean) : void;
-			setAutoRedirect (autoRedirect: boolean) : void;
-			setCache (cache: boolean) : void;
-			setDomain (domain: string) : void;
-			setEnableKeepAlive (enableKeepAlive: boolean) : void;
-			setFile (file: string) : void;
-			setOndatastream (ondatastream: (...args : any[]) => any) : void;
-			setOnerror (onerror: (...args : any[]) => any) : void;
-			setOnload (onload: (...args : any[]) => any) : void;
-			setOnreadystatechange (onreadystatechange: (...args : any[]) => any) : void;
-			setOnsendstream (onsendstream: (...args : any[]) => any) : void;
-			setPassword (password: string) : void;
-			setRequestHeader (name: string, value: string) : void;
-			setTimeout (timeout: number) : void;
-			setTlsVersion (tlsVersion: number) : void;
-			setUsername (username: string) : void;
-			setValidatesSecureCertificate (validatesSecureCertificate: boolean) : void;
-			setWithCredentials (withCredentials: boolean) : void;
-		}
-		export interface BonjourBrowser extends Ti.Proxy {
-			domain : string;
-			isSearching : boolean;
-			serviceType : string;
-			getDomain () : string;
-			getIsSearching () : boolean;
-			getServiceType () : string;
-			search () : void;
-			setDomain (domain: string) : void;
-			setIsSearching (isSearching: boolean) : void;
-			setServiceType (serviceType: string) : void;
-			stopSearch () : void;
-		}
-		export interface Cookie extends Ti.Proxy {
-			comment : string;
-			domain : string;
-			expiryDate : string;
-			httponly : boolean;
-			name : string;
-			originalUrl : string;
-			path : string;
-			secure : boolean;
-			value : string;
-			version : number;
-			getComment () : string;
-			getDomain () : string;
-			getExpiryDate () : string;
-			getHttponly () : boolean;
-			getName () : string;
-			getOriginalUrl () : string;
-			getPath () : string;
-			getSecure () : boolean;
-			getValue () : string;
-			getVersion () : number;
-			isValid () : boolean;
-			setComment (comment: string) : void;
-			setDomain (domain: string) : void;
-			setExpiryDate (expiryDate: string) : void;
-			setHttponly (httponly: boolean) : void;
-			setOriginalUrl (originalUrl: string) : void;
-			setPath (path: string) : void;
-			setSecure (secure: boolean) : void;
-			setValue (value: string) : void;
-			setVersion (version: number) : void;
+
+			/**
+			 * A local notification to alert the user of new or pending application information.
+			 */
+			interface LocalNotification extends Titanium.Proxy {
+				/**
+				 * Cancels the pending notification.
+				 */
+				cancel(): void;
+
+			}
+
+			/**
+			 * A search query object manages the criteria to apply when searching app content that you have previously
+			 * indexed by using the Core Spotlight APIs.
+			 */
+			interface SearchQuery extends Titanium.Proxy {
+				/**
+				 * A formatted string that defines the matching criteria to apply to indexed items.
+				 */
+				queryString: string;
+
+				/**
+				 * An array of strings that represent the attributes of indexed items.
+				 */
+				attributes: string[];
+
+				/**
+				 * Asynchronously queries the index for items that match the query object's specifications.
+				 */
+				start(): void;
+
+				/**
+				 * Cancels a query operation.
+				 */
+				cancel(): void;
+
+				/**
+				 * A Boolean value that indicates if the query has been cancelled (`true`) or not (`false`).
+				 */
+				isCancelled(): boolean;
+
+			}
+
+			/**
+			 * The SearchableIndex module is used to add or remove Ti.App.iOS.SearchableItem objects from the device search index.
+			 */
+			interface SearchableIndex extends Titanium.Proxy {
+				/**
+				 * Indicates whether indexing is supported by the device.
+				 */
+				isSupported(): boolean;
+
+				/**
+				 * Adds an array of Titanium.App.iOS.SearchableItem objects to the default search index.
+				 */
+				addToDefaultSearchableIndex(Array: ReadonlyArray<Titanium.App.iOS.SearchableItem>, callback: (param0: any) => any): void;
+
+				/**
+				 * Removes all search items added by the application.
+				 */
+				deleteAllSearchableItems(callback: (param0: any) => any): void;
+
+				/**
+				 * Removes search items based on an array of domain identifiers.
+				 */
+				deleteAllSearchableItemByDomainIdenifiers(Array: ReadonlyArray<string>, callback: (param0: any) => any): void;
+
+				/**
+				 * Removes search items based on an array of identifiers.
+				 */
+				deleteSearchableItemsByIdentifiers(Array: ReadonlyArray<string>, callback: (param0: any) => any): void;
+
+			}
+
+			/**
+			 * Used to create a unique object containing all of the search information that will appear in the device search index.
+			 */
+			interface SearchableItem extends Titanium.Proxy {
+				/**
+				 * Set of metadata properties to display for the item.
+				 */
+				attributeSet: Titanium.App.iOS.SearchableItemAttributeSet;
+
+				/**
+				 * Identifier that represents the "domain" or owner of this item.
+				 */
+				domainIdentifier: string;
+
+				/**
+				 * Searchable items have an expiration date or time to live.  By default it is set to one month.
+				 */
+				expirationDate: string;
+
+				/**
+				 * Unique identifier to your application group.
+				 */
+				uniqueIdentifier: string;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItem.domainIdentifier> property.
+				 */
+				getDomainIdentifier(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItem.domainIdentifier> property.
+				 */
+				setDomainIdentifier(domainIdentifier: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItem.expirationDate> property.
+				 */
+				getExpirationDate(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItem.expirationDate> property.
+				 */
+				setExpirationDate(expirationDate: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItem.uniqueIdentifier> property.
+				 */
+				getUniqueIdentifier(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItem.uniqueIdentifier> property.
+				 */
+				setUniqueIdentifier(uniqueIdentifier: string): void;
+
+			}
+
+			/**
+			 * The SearchableItemAttributeSet module defines metadata properties for SearchItem and UserActivity objects.
+			 */
+			interface SearchableItemAttributeSet extends Titanium.Proxy {
+				/**
+				 * Content type of the attribute set.
+				 */
+				itemContentType: string;
+
+				/**
+				 * A localized string to be displayed in the UI for this item.
+				 */
+				displayName: string;
+
+				/**
+				 * An array of localized strings of alternate display names for this item.
+				 */
+				alternateNames: string[];
+
+				/**
+				 * The complete path to the item.
+				 */
+				path: string;
+
+				/**
+				 * File URL representing the content to be indexed.
+				 */
+				contentURL: string;
+
+				/**
+				 * File URL pointing to a thumbnail image for this item.
+				 */
+				thumbnailURL: string;
+
+				/**
+				 * Image data for thumbnail for this item.
+				 */
+				thumbnailData: string | Titanium.Blob;
+
+				/**
+				 * For activities this is the unique identifier for the item this activity is related to.
+				 */
+				relatedUniqueIdentifier: string;
+
+				/**
+				 * The date that the last metadata attribute was changed.
+				 */
+				metadataModificationDate: string;
+
+				/**
+				 * UTI Type pedigree for an item.
+				 */
+				contentType: string;
+
+				/**
+				 * Array of strings related to the content tree of the item.
+				 */
+				contentTypeTree: string[];
+
+				/**
+				 * Represents keywords associated with this particular item. Example keywords might be Birthday etc.
+				 */
+				keywords: string[];
+
+				/**
+				 * The title of the particular item.
+				 */
+				title: string;
+
+				/**
+				 * Subject of the the item.
+				 */
+				subject: string;
+
+				/**
+				 * Theme of the the item.
+				 */
+				theme: string;
+
+				/**
+				 * An account of the content of the resource.
+				 */
+				contentDescription: string;
+
+				/**
+				 * Used to reference to the resource within a given context.
+				 */
+				identifier: string;
+
+				/**
+				 * A class of entity for whom the resource is intended or useful.
+				 */
+				audiences: string[];
+
+				/**
+				 * Size of the document in MB.
+				 */
+				fileSize: number;
+
+				/**
+				 * Number of pages in the item.
+				 */
+				pageCount: number;
+
+				/**
+				 * Width in points (72 points per inch) of the document page.
+				 */
+				pageWidth: number;
+
+				/**
+				 * Height in points (72 points per inch) of the document page.
+				 */
+				pageHeight: number;
+
+				/**
+				 * Security (encryption) method used in the file.
+				 */
+				securityMethod: string;
+
+				/**
+				 * Application used to create the document content (e.g. "Word","Framemaker", etc.).
+				 */
+				creator: string;
+
+				/**
+				 * Software used to convert the original content into a PDF stream.
+				 */
+				encodingApplications: string[];
+
+				/**
+				 * Kind that the item represents.
+				 */
+				kind: string;
+
+				/**
+				 * Array of font names used in the item.
+				 */
+				fontNames: string[];
+
+				/**
+				 * The sample rate of the audio data contained in the file.
+				 */
+				audioSampleRate: number;
+
+				/**
+				 * The number of channels in the audio data contained in the file.
+				 */
+				audioChannelCount: number;
+
+				/**
+				 * The tempo of the music contained in the audio file in Beats Per Minute.
+				 */
+				tempo: number;
+
+				/**
+				 * The musical key of the song/composition contained in an audio file.
+				 */
+				keySignature: string;
+
+				/**
+				 * The time signature of the musical composition contained in the audio/MIDI file.
+				 */
+				timeSignature: string;
+
+				/**
+				 * The name of the application that encoded the data contained in the audio file.
+				 */
+				audioEncodingApplication: string;
+
+				/**
+				 * The composer of the song/composition contained in the audio file.
+				 */
+				composer: string;
+
+				/**
+				 * The lyricist/text writer for song/composition contained in the audio file.
+				 */
+				lyricist: string;
+
+				/**
+				 * The title for a collection of media.
+				 */
+				album: string;
+
+				/**
+				 * The artist for the media.
+				 */
+				artist: string;
+
+				/**
+				 * The track number of a song/composition when it is part of an album.
+				 */
+				audioTrackNumber: number;
+
+				/**
+				 * The recording date of the song/composition.
+				 */
+				recordingDate: string;
+
+				/**
+				 * The musical genre of the song/composition contained in the audio file.
+				 */
+				musicalGenre: string;
+
+				/**
+				 * Used to indicates whether the MIDI sequence contained in the file is setup for use with a General MIDI device.
+				 */
+				generalMIDISequence: number;
+
+				/**
+				 * Metadata attribute that stores the category of instrument.
+				 */
+				musicalInstrumentCategory: string;
+
+				/**
+				 * Metadata attribute that stores the name of instrument.
+				 */
+				musicalInstrumentName: string;
+
+				/**
+				 * Used to indicate that using the phone number is appropriate.
+				 */
+				supportsPhoneCall: number;
+
+				/**
+				 * Used to determine if navigation is supported.
+				 */
+				supportsNavigation: number;
+
+				/**
+				 * Title displayed in the search container
+				 */
+				containerTitle: string;
+
+				/**
+				 * Display of the search container
+				 */
+				containerDisplayName: string;
+
+				/**
+				 * Identifier for the search container
+				 */
+				containerIdentifier: string;
+
+				/**
+				 * Order the search container is displayed.
+				 */
+				containerOrder: number;
+
+				/**
+				 * The list of editor/editors that have worked on this item.
+				 */
+				editors: string[];
+
+				/**
+				 * The list of people who are visible in an image or movie or written about in a document.
+				 */
+				participants: string[];
+
+				/**
+				 * The list of projects that this item is part of.
+				 */
+				projects: string[];
+
+				/**
+				 * The date that the file was last downloaded / received.
+				 */
+				downloadedDate: string;
+
+				/**
+				 * The date that the item was last used.
+				 */
+				lastUsedDate: string;
+
+				/**
+				 * The date that the contents of the item were created.
+				 */
+				contentCreationDate: string;
+
+				/**
+				 * The date that the contents of the item were last modified.
+				 */
+				contentModificationDate: string;
+
+				/**
+				 * The date that the item was moved into the current location.
+				 */
+				addedDate: string;
+
+				/**
+				 * Used to indicate where the item was obtained from.
+				 */
+				contentSources: string[];
+
+				/**
+				 * Comment related to a file.
+				 */
+				comment: string;
+
+				/**
+				 * Copyright of the content.
+				 */
+				copyright: string;
+
+				/**
+				 * Duration in seconds of the content of the item (if appropriate).
+				 */
+				duration: number;
+
+				/**
+				 * A list of contacts that are somehow associated with this document beyond what is captured as Author.
+				 */
+				contactKeywords: string[];
+
+				/**
+				 * The codecs used to encode/decode the media.
+				 */
+				codecs: string[];
+
+				/**
+				 * Used to indicate company/Organization that created the document.
+				 */
+				organizations: string[];
+
+				/**
+				 * Media types present in the content.
+				 */
+				mediaTypes: string[];
+
+				/**
+				 * A version specifier for this item.
+				 */
+				version: string;
+
+				/**
+				 * Used to indicate the role of the document creator.
+				 */
+				role: string;
+
+				/**
+				 * Whether the content is prepared for streaming.  Set to `0` for not streamable and `1` for streamable.
+				 */
+				streamable: number;
+
+				/**
+				 * The total bit rate (audio and video combined) of the media.
+				 */
+				totalBitRate: number;
+
+				/**
+				 * The video bit rate.
+				 */
+				videoBitRate: number;
+
+				/**
+				 * The audio bit rate.
+				 */
+				audioBitRate: number;
+
+				/**
+				 * The delivery type of the item.  Set to `0` for fast start and `1` for RTSP.
+				 */
+				deliveryType: number;
+
+				/**
+				 * Used to designate the languages of the intellectual content of the resource.
+				 */
+				languages: string[];
+
+				/**
+				 * Used to provide a link to information about rights held in and over resource.
+				 */
+				rights: string[];
+
+				/**
+				 * Used to designate the entity responsible for making the resource available.
+				 */
+				publishers: string[];
+
+				/**
+				 * Used to designate the entity responsible for making contributions to the content of the resource.
+				 */
+				contributors: string[];
+
+				/**
+				 * Used to designate the extent or scope of the content of the resource.
+				 */
+				coverage: string[];
+
+				/**
+				 * User rating of this item out of 5 stars.
+				 */
+				rating: number;
+
+				/**
+				 * A description of the rating, for example, the number of reviewers.
+				 */
+				ratingDescription: string;
+
+				/**
+				 * User play count of this item.
+				 */
+				playCount: number;
+
+				/**
+				 * Information about the item.
+				 */
+				information: string;
+
+				/**
+				 * Director of the item, for example, the movie director.
+				 */
+				director: string;
+
+				/**
+				 * Producer of the content.
+				 */
+				producer: string;
+
+				/**
+				 * Genre of the item, for example, movie genre.
+				 */
+				genre: string;
+
+				/**
+				 * Performers in the movie.
+				 */
+				performers: string[];
+
+				/**
+				 * Original format of the movie.
+				 */
+				originalFormat: string;
+
+				/**
+				 * Original source of the movie.
+				 */
+				originalSource: string;
+
+				/**
+				 * Whether or not the item is local. Set to `1` if true and `0` otherwise.
+				 */
+				local: number;
+
+				/**
+				 * Whether or not the item has explicit content. Set to `1` for explicit or `0` for clean.
+				 */
+				contentRating: number;
+
+				/**
+				 * URL of the item.
+				 */
+				url: string;
+
+				/**
+				 * The fully formatted address of the item (obtained from MapKit).
+				 */
+				fullyFormattedAddress: string;
+
+				/**
+				 * The sub-location (e.g., street number) for the item according to guidelines established by the provider.
+				 */
+				subThoroughfare: string;
+
+				/**
+				 * The location (e.g., street name) for the item according to guidelines established by the provider.
+				 */
+				thoroughfare: string;
+
+				/**
+				 * The postal code for the item according to guidelines established by the provider.
+				 */
+				postalCode: string;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.displayName> property.
+				 */
+				getDisplayName(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.displayName> property.
+				 */
+				setDisplayName(displayName: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.alternateNames> property.
+				 */
+				getAlternateNames(): string[];
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.alternateNames> property.
+				 */
+				setAlternateNames(alternateNames: ReadonlyArray<string>): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.path> property.
+				 */
+				getPath(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.path> property.
+				 */
+				setPath(path: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.contentURL> property.
+				 */
+				getContentURL(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.contentURL> property.
+				 */
+				setContentURL(contentURL: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.thumbnailURL> property.
+				 */
+				getThumbnailURL(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.thumbnailURL> property.
+				 */
+				setThumbnailURL(thumbnailURL: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.thumbnailData> property.
+				 */
+				getThumbnailData(): string | Titanium.Blob;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.thumbnailData> property.
+				 */
+				setThumbnailData(thumbnailData: string): void;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.thumbnailData> property.
+				 */
+				setThumbnailData(thumbnailData: Titanium.Blob): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.relatedUniqueIdentifier> property.
+				 */
+				getRelatedUniqueIdentifier(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.relatedUniqueIdentifier> property.
+				 */
+				setRelatedUniqueIdentifier(relatedUniqueIdentifier: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.metadataModificationDate> property.
+				 */
+				getMetadataModificationDate(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.metadataModificationDate> property.
+				 */
+				setMetadataModificationDate(metadataModificationDate: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.contentType> property.
+				 */
+				getContentType(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.contentType> property.
+				 */
+				setContentType(contentType: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.contentTypeTree> property.
+				 */
+				getContentTypeTree(): string[];
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.contentTypeTree> property.
+				 */
+				setContentTypeTree(contentTypeTree: ReadonlyArray<string>): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.keywords> property.
+				 */
+				getKeywords(): string[];
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.keywords> property.
+				 */
+				setKeywords(keywords: ReadonlyArray<string>): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.title> property.
+				 */
+				getTitle(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.title> property.
+				 */
+				setTitle(title: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.subject> property.
+				 */
+				getSubject(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.subject> property.
+				 */
+				setSubject(subject: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.theme> property.
+				 */
+				getTheme(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.theme> property.
+				 */
+				setTheme(theme: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.contentDescription> property.
+				 */
+				getContentDescription(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.contentDescription> property.
+				 */
+				setContentDescription(contentDescription: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.identifier> property.
+				 */
+				getIdentifier(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.identifier> property.
+				 */
+				setIdentifier(identifier: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.audiences> property.
+				 */
+				getAudiences(): string[];
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.audiences> property.
+				 */
+				setAudiences(audiences: ReadonlyArray<string>): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.fileSize> property.
+				 */
+				getFileSize(): number;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.fileSize> property.
+				 */
+				setFileSize(fileSize: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.pageCount> property.
+				 */
+				getPageCount(): number;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.pageCount> property.
+				 */
+				setPageCount(pageCount: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.pageWidth> property.
+				 */
+				getPageWidth(): number;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.pageWidth> property.
+				 */
+				setPageWidth(pageWidth: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.pageHeight> property.
+				 */
+				getPageHeight(): number;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.pageHeight> property.
+				 */
+				setPageHeight(pageHeight: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.securityMethod> property.
+				 */
+				getSecurityMethod(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.securityMethod> property.
+				 */
+				setSecurityMethod(securityMethod: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.creator> property.
+				 */
+				getCreator(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.creator> property.
+				 */
+				setCreator(creator: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.encodingApplications> property.
+				 */
+				getEncodingApplications(): string[];
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.encodingApplications> property.
+				 */
+				setEncodingApplications(encodingApplications: ReadonlyArray<string>): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.kind> property.
+				 */
+				getKind(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.kind> property.
+				 */
+				setKind(kind: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.fontNames> property.
+				 */
+				getFontNames(): string[];
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.fontNames> property.
+				 */
+				setFontNames(fontNames: ReadonlyArray<string>): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.audioSampleRate> property.
+				 */
+				getAudioSampleRate(): number;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.audioSampleRate> property.
+				 */
+				setAudioSampleRate(audioSampleRate: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.audioChannelCount> property.
+				 */
+				getAudioChannelCount(): number;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.audioChannelCount> property.
+				 */
+				setAudioChannelCount(audioChannelCount: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.tempo> property.
+				 */
+				getTempo(): number;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.tempo> property.
+				 */
+				setTempo(tempo: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.keySignature> property.
+				 */
+				getKeySignature(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.keySignature> property.
+				 */
+				setKeySignature(keySignature: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.timeSignature> property.
+				 */
+				getTimeSignature(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.timeSignature> property.
+				 */
+				setTimeSignature(timeSignature: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.audioEncodingApplication> property.
+				 */
+				getAudioEncodingApplication(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.audioEncodingApplication> property.
+				 */
+				setAudioEncodingApplication(audioEncodingApplication: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.composer> property.
+				 */
+				getComposer(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.composer> property.
+				 */
+				setComposer(composer: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.lyricist> property.
+				 */
+				getLyricist(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.lyricist> property.
+				 */
+				setLyricist(lyricist: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.album> property.
+				 */
+				getAlbum(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.album> property.
+				 */
+				setAlbum(album: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.artist> property.
+				 */
+				getArtist(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.artist> property.
+				 */
+				setArtist(artist: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.audioTrackNumber> property.
+				 */
+				getAudioTrackNumber(): number;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.audioTrackNumber> property.
+				 */
+				setAudioTrackNumber(audioTrackNumber: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.recordingDate> property.
+				 */
+				getRecordingDate(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.recordingDate> property.
+				 */
+				setRecordingDate(recordingDate: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.musicalGenre> property.
+				 */
+				getMusicalGenre(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.musicalGenre> property.
+				 */
+				setMusicalGenre(musicalGenre: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.generalMIDISequence> property.
+				 */
+				getGeneralMIDISequence(): number;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.generalMIDISequence> property.
+				 */
+				setGeneralMIDISequence(generalMIDISequence: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.musicalInstrumentCategory> property.
+				 */
+				getMusicalInstrumentCategory(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.musicalInstrumentCategory> property.
+				 */
+				setMusicalInstrumentCategory(musicalInstrumentCategory: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.musicalInstrumentName> property.
+				 */
+				getMusicalInstrumentName(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.musicalInstrumentName> property.
+				 */
+				setMusicalInstrumentName(musicalInstrumentName: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.supportsPhoneCall> property.
+				 */
+				getSupportsPhoneCall(): number;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.supportsPhoneCall> property.
+				 */
+				setSupportsPhoneCall(supportsPhoneCall: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.supportsNavigation> property.
+				 */
+				getSupportsNavigation(): number;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.supportsNavigation> property.
+				 */
+				setSupportsNavigation(supportsNavigation: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.containerTitle> property.
+				 */
+				getContainerTitle(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.containerTitle> property.
+				 */
+				setContainerTitle(containerTitle: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.containerDisplayName> property.
+				 */
+				getContainerDisplayName(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.containerDisplayName> property.
+				 */
+				setContainerDisplayName(containerDisplayName: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.containerIdentifier> property.
+				 */
+				getContainerIdentifier(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.containerIdentifier> property.
+				 */
+				setContainerIdentifier(containerIdentifier: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.containerOrder> property.
+				 */
+				getContainerOrder(): number;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.containerOrder> property.
+				 */
+				setContainerOrder(containerOrder: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.editors> property.
+				 */
+				getEditors(): string[];
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.editors> property.
+				 */
+				setEditors(editors: ReadonlyArray<string>): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.participants> property.
+				 */
+				getParticipants(): string[];
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.participants> property.
+				 */
+				setParticipants(participants: ReadonlyArray<string>): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.projects> property.
+				 */
+				getProjects(): string[];
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.projects> property.
+				 */
+				setProjects(projects: ReadonlyArray<string>): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.downloadedDate> property.
+				 */
+				getDownloadedDate(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.downloadedDate> property.
+				 */
+				setDownloadedDate(downloadedDate: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.lastUsedDate> property.
+				 */
+				getLastUsedDate(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.lastUsedDate> property.
+				 */
+				setLastUsedDate(lastUsedDate: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.contentCreationDate> property.
+				 */
+				getContentCreationDate(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.contentCreationDate> property.
+				 */
+				setContentCreationDate(contentCreationDate: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.contentModificationDate> property.
+				 */
+				getContentModificationDate(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.contentModificationDate> property.
+				 */
+				setContentModificationDate(contentModificationDate: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.addedDate> property.
+				 */
+				getAddedDate(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.addedDate> property.
+				 */
+				setAddedDate(addedDate: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.contentSources> property.
+				 */
+				getContentSources(): string[];
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.contentSources> property.
+				 */
+				setContentSources(contentSources: ReadonlyArray<string>): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.comment> property.
+				 */
+				getComment(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.comment> property.
+				 */
+				setComment(comment: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.copyright> property.
+				 */
+				getCopyright(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.copyright> property.
+				 */
+				setCopyright(copyright: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.duration> property.
+				 */
+				getDuration(): number;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.duration> property.
+				 */
+				setDuration(duration: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.contactKeywords> property.
+				 */
+				getContactKeywords(): string[];
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.contactKeywords> property.
+				 */
+				setContactKeywords(contactKeywords: ReadonlyArray<string>): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.codecs> property.
+				 */
+				getCodecs(): string[];
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.codecs> property.
+				 */
+				setCodecs(codecs: ReadonlyArray<string>): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.organizations> property.
+				 */
+				getOrganizations(): string[];
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.organizations> property.
+				 */
+				setOrganizations(organizations: ReadonlyArray<string>): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.mediaTypes> property.
+				 */
+				getMediaTypes(): string[];
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.mediaTypes> property.
+				 */
+				setMediaTypes(mediaTypes: ReadonlyArray<string>): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.version> property.
+				 */
+				getVersion(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.version> property.
+				 */
+				setVersion(version: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.role> property.
+				 */
+				getRole(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.role> property.
+				 */
+				setRole(role: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.streamable> property.
+				 */
+				getStreamable(): number;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.streamable> property.
+				 */
+				setStreamable(streamable: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.totalBitRate> property.
+				 */
+				getTotalBitRate(): number;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.totalBitRate> property.
+				 */
+				setTotalBitRate(totalBitRate: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.videoBitRate> property.
+				 */
+				getVideoBitRate(): number;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.videoBitRate> property.
+				 */
+				setVideoBitRate(videoBitRate: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.audioBitRate> property.
+				 */
+				getAudioBitRate(): number;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.audioBitRate> property.
+				 */
+				setAudioBitRate(audioBitRate: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.deliveryType> property.
+				 */
+				getDeliveryType(): number;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.deliveryType> property.
+				 */
+				setDeliveryType(deliveryType: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.languages> property.
+				 */
+				getLanguages(): string[];
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.languages> property.
+				 */
+				setLanguages(languages: ReadonlyArray<string>): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.rights> property.
+				 */
+				getRights(): string[];
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.rights> property.
+				 */
+				setRights(rights: ReadonlyArray<string>): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.publishers> property.
+				 */
+				getPublishers(): string[];
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.publishers> property.
+				 */
+				setPublishers(publishers: ReadonlyArray<string>): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.contributors> property.
+				 */
+				getContributors(): string[];
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.contributors> property.
+				 */
+				setContributors(contributors: ReadonlyArray<string>): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.coverage> property.
+				 */
+				getCoverage(): string[];
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.coverage> property.
+				 */
+				setCoverage(coverage: ReadonlyArray<string>): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.rating> property.
+				 */
+				getRating(): number;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.rating> property.
+				 */
+				setRating(rating: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.ratingDescription> property.
+				 */
+				getRatingDescription(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.ratingDescription> property.
+				 */
+				setRatingDescription(ratingDescription: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.playCount> property.
+				 */
+				getPlayCount(): number;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.playCount> property.
+				 */
+				setPlayCount(playCount: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.information> property.
+				 */
+				getInformation(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.information> property.
+				 */
+				setInformation(information: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.director> property.
+				 */
+				getDirector(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.director> property.
+				 */
+				setDirector(director: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.producer> property.
+				 */
+				getProducer(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.producer> property.
+				 */
+				setProducer(producer: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.genre> property.
+				 */
+				getGenre(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.genre> property.
+				 */
+				setGenre(genre: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.performers> property.
+				 */
+				getPerformers(): string[];
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.performers> property.
+				 */
+				setPerformers(performers: ReadonlyArray<string>): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.originalFormat> property.
+				 */
+				getOriginalFormat(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.originalFormat> property.
+				 */
+				setOriginalFormat(originalFormat: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.originalSource> property.
+				 */
+				getOriginalSource(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.originalSource> property.
+				 */
+				setOriginalSource(originalSource: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.local> property.
+				 */
+				getLocal(): number;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.local> property.
+				 */
+				setLocal(local: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.contentRating> property.
+				 */
+				getContentRating(): number;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.contentRating> property.
+				 */
+				setContentRating(contentRating: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.url> property.
+				 */
+				getUrl(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.url> property.
+				 */
+				setUrl(url: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.fullyFormattedAddress> property.
+				 */
+				getFullyFormattedAddress(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.fullyFormattedAddress> property.
+				 */
+				setFullyFormattedAddress(fullyFormattedAddress: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.subThoroughfare> property.
+				 */
+				getSubThoroughfare(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.subThoroughfare> property.
+				 */
+				setSubThoroughfare(subThoroughfare: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.thoroughfare> property.
+				 */
+				getThoroughfare(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.thoroughfare> property.
+				 */
+				setThoroughfare(thoroughfare: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.postalCode> property.
+				 */
+				getPostalCode(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.SearchableItemAttributeSet.postalCode> property.
+				 */
+				setPostalCode(postalCode: string): void;
+
+			}
+
+			/**
+			 * The UserActivity module is used to enable device Handoff and to create User Activities.
+			 */
+			interface UserActivity extends Titanium.Proxy {
+				/**
+				 * Name of the activity type.
+				 */
+				activityType: string;
+
+				/**
+				 * Set to `true` if the user activity can be publicly accessed by all iOS users.
+				 */
+				eligibleForPublicIndexing: boolean;
+
+				/**
+				 * Set to true if the user activity should be added to the on-device index.
+				 */
+				eligibleForSearch: boolean;
+
+				/**
+				 * Set to true if this user activity should be eligible to be handed off to another device
+				 */
+				eligibleForHandoff: boolean;
+
+				/**
+				 * Absolute date after which the activity is no longer eligible to be indexed or handed off.
+				 */
+				expirationDate: string;
+
+				/**
+				 * An array of string keywords representing words or phrases that might help the user to find the activity in the application history.
+				 */
+				keywords: string[];
+
+				/**
+				 * Set to true everytime you have updated the user activity and need the changes to be saved before handing it off to another device.
+				 */
+				needsSave: boolean;
+
+				/**
+				 * An array of String keys from the userInfo property which represent the minimal information about the user activity that should be stored for later restoration.
+				 */
+				requiredUserInfoKeys: string[];
+
+				/**
+				 * Determines if user activities are supported (`true`) or not (`false`) by the device.
+				 */
+				supported: boolean;
+
+				/**
+				 * An optional, user-visible title for this activity such as a document name or web page title.
+				 */
+				title: string;
+
+				/**
+				 * The userInfo dictionary contains application-specific state needed to continue an activity on another device.
+				 */
+				userInfo: any;
+
+				/**
+				 * When no suitable application is installed on a resuming device and the `webpageURL` property is set,
+				 * the user activity will instead be continued in a web browser by loading the specified URL.
+				 */
+				webpageURL: string;
+
+				/**
+				 * Adds a Titanium.App.iOS.SearchableItemAttributeSet to the user activity.
+				 */
+				addContentAttributeSet(contentAttributeSet: Titanium.App.iOS.SearchableItemAttributeSet): void;
+
+				/**
+				 * Marks the activity as currently in use by the user.
+				 */
+				becomeCurrent(): void;
+
+				/**
+				 * Invalidates an activity when it is no longer eligible for continuation.
+				 */
+				invalidate(): void;
+
+				/**
+				 * Marks the activity as currently **not** in use and ineligible to be continued.
+				 */
+				resignCurrent(): void;
+
+				/**
+				 * Determines if user activities are supported (`true`) or not (`false`) by the device.
+				 */
+				isSupported(): boolean;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.UserActivity.activityType> property.
+				 */
+				getActivityType(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.UserActivity.activityType> property.
+				 */
+				setActivityType(activityType: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.UserActivity.eligibleForPublicIndexing> property.
+				 */
+				getEligibleForPublicIndexing(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.UserActivity.eligibleForPublicIndexing> property.
+				 */
+				setEligibleForPublicIndexing(eligibleForPublicIndexing: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.UserActivity.eligibleForSearch> property.
+				 */
+				getEligibleForSearch(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.UserActivity.eligibleForSearch> property.
+				 */
+				setEligibleForSearch(eligibleForSearch: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.UserActivity.eligibleForHandoff> property.
+				 */
+				getEligibleForHandoff(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.UserActivity.eligibleForHandoff> property.
+				 */
+				setEligibleForHandoff(eligibleForHandoff: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.UserActivity.expirationDate> property.
+				 */
+				getExpirationDate(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.UserActivity.expirationDate> property.
+				 */
+				setExpirationDate(expirationDate: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.UserActivity.keywords> property.
+				 */
+				getKeywords(): string[];
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.UserActivity.keywords> property.
+				 */
+				setKeywords(keywords: ReadonlyArray<string>): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.UserActivity.needsSave> property.
+				 */
+				getNeedsSave(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.UserActivity.needsSave> property.
+				 */
+				setNeedsSave(needsSave: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.UserActivity.requiredUserInfoKeys> property.
+				 */
+				getRequiredUserInfoKeys(): string[];
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.UserActivity.requiredUserInfoKeys> property.
+				 */
+				setRequiredUserInfoKeys(requiredUserInfoKeys: ReadonlyArray<string>): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.UserActivity.supported> property.
+				 */
+				getSupported(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.UserActivity.supported> property.
+				 */
+				setSupported(supported: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.UserActivity.title> property.
+				 */
+				getTitle(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.UserActivity.title> property.
+				 */
+				setTitle(title: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.UserActivity.userInfo> property.
+				 */
+				getUserInfo(): any;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.UserActivity.userInfo> property.
+				 */
+				setUserInfo(userInfo: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.UserActivity.webpageURL> property.
+				 */
+				getWebpageURL(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.UserActivity.webpageURL> property.
+				 */
+				setWebpageURL(webpageURL: string): void;
+
+			}
+
+			/**
+			 * The UserDefaults module is used for storing application-related data in property/value pairs
+			 * that persist beyond application sessions and device power cycles. UserDefaults allows the suiteName
+			 * of the UserDefaults to be specified at creation time.
+			 */
+			interface UserDefaults extends Titanium.Proxy {
+				/**
+				 * Sets the name of the suite to be used to access UserDefaults.
+				 */
+				suiteName: string;
+
+				/**
+				 * Returns the value of a property as a boolean data type.
+				 */
+				getBool(property: string, defaultValue?: boolean): boolean;
+
+				/**
+				 * Returns the value of a property as a double (double-precision, floating point) data type.
+				 */
+				getDouble(property: string, defaultValue?: number): number;
+
+				/**
+				 * Returns the value of a property as an integer data type.
+				 */
+				getInt(property: string, defaultValue?: number): number;
+
+				/**
+				 * Returns the value of a property as an array data type.
+				 */
+				getList(property: string, defaultValue?: ReadonlyArray<any>): any[];
+
+				/**
+				 * Returns the value of a property as an object.
+				 */
+				getObject(property: string, defaultValue?: any): any;
+
+				/**
+				 * Returns the value of a property as a string data type.
+				 */
+				getString(property: string, defaultValue?: string): string;
+
+				/**
+				 * Indicates whether a property exists.
+				 */
+				hasProperty(property: string): boolean;
+
+				/**
+				 * Returns an array of property names.
+				 */
+				listProperties(): any[];
+
+				/**
+				 * Removes a property if it exists, or does nothing otherwise.
+				 */
+				removeProperty(property: string): void;
+
+				/**
+				 * Removes all properties that have been set by the user on runtime, or does nothing otherwise.
+				 */
+				removeAllProperties(): void;
+
+				/**
+				 * Sets the value of a property as a boolean data type. The property will be created if it
+				 * does not exist.
+				 */
+				setBool(property: string, value: boolean): void;
+
+				/**
+				 * Sets the value of a property as a double (double-precision, floating point) data type. The
+				 * property will be created if it does not exist.
+				 */
+				setDouble(property: string, value: number): void;
+
+				/**
+				 * Sets the value of a property as an integer data type. The property will be created if it
+				 * does not exist.
+				 */
+				setInt(property: string, value: number): void;
+
+				/**
+				 * Sets the value of a property as an array data type. The property will be created if it
+				 * does not exist.
+				 */
+				setList(property: string, value: ReadonlyArray<any>): void;
+
+				/**
+				 * Sets the value of a property as an object data type. The property will be created if it
+				 * does not exist.
+				 */
+				setObject(property: string, value: any): void;
+
+				/**
+				 * Sets the value of a property as a string data type. The property will be created if it
+				 * does not exist.
+				 */
+				setString(property: string, value: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.UserDefaults.suiteName> property.
+				 */
+				getSuiteName(): string;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.UserDefaults.suiteName> property.
+				 */
+				setSuiteName(suiteName: string): void;
+
+			}
+
+			/**
+			 * An action the user selects in response to an interactive notification.
+			 */
+			interface UserNotificationAction extends Titanium.Proxy {
+				/**
+				 * Selects how to activate the application.
+				 */
+				activationMode: number;
+
+				/**
+				 * Custom behavior the user notification supports.
+				 */
+				behavior: number;
+
+				/**
+				 * Set to true if the action requires the device to be unlocked. On the Apple Watch actions never require authentication.
+				 */
+				authenticationRequired: boolean;
+
+				/**
+				 * Set to true if the action causes destructive behavior to the user's data or the application.
+				 */
+				destructive: boolean;
+
+				/**
+				 * Identifier for this action. Used to identify the action the user pressed.
+				 */
+				identifier: string;
+
+				/**
+				 * Title of the button displayed in the notification.
+				 */
+				title: string;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.UserNotificationAction.activationMode> property.
+				 */
+				getActivationMode(): number;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.UserNotificationAction.activationMode> property.
+				 */
+				setActivationMode(activationMode: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.UserNotificationAction.behavior> property.
+				 */
+				getBehavior(): number;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.UserNotificationAction.behavior> property.
+				 */
+				setBehavior(behavior: number): void;
+
+			}
+
+			/**
+			 * A set of notification actions to associate with a notification.
+			 */
+			interface UserNotificationCategory extends Titanium.Proxy {
+				/**
+				 * Array of notification actions to associate with the group.
+				 */
+				actionsForDefaultContext: Titanium.App.iOS.UserNotificationAction[];
+
+				/**
+				 * Array of notification actions to display for non-dialog-style notification.
+				 */
+				actionsForMinimalContext: Titanium.App.iOS.UserNotificationAction[];
+
+				/**
+				 * Identifier for this category.
+				 */
+				identifier: string;
+
+			}
+
 		}
 	}
-	export interface Yahoo  {
-		yql (yql: string, callback: (...args : any[]) => any) : void;
+
+	/**
+	 * The Calendar module provides an API for accessing the native calendar functionality.
+	 */
+	namespace Calendar {
+		/**
+		 * Indicates if the proxy will bubble an event to its parent.
+		 */
+		let bubbleParent: boolean;
+
+		/**
+		 * The name of the API that this proxy corresponds to.
+		 */
+		const apiName: string;
+
+		/**
+		 * The Window or TabGroup whose Activity lifecycle should be triggered on the proxy.
+		 */
+		let lifecycleContainer: Titanium.UI.Window | Titanium.UI.TabGroup;
+
+		/**
+		 * Reminder alert delivery method.
+		 */
+		const METHOD_ALERT: number;
+
+		/**
+		 * Reminder default delivery method.
+		 */
+		const METHOD_DEFAULT: number;
+
+		/**
+		 * Reminder email delivery method.
+		 */
+		const METHOD_EMAIL: number;
+
+		/**
+		 * Reminder SMS delivery method.
+		 */
+		const METHOD_SMS: number;
+
+		/**
+		 * Alert dismissed state.
+		 */
+		const STATE_DISMISSED: number;
+
+		/**
+		 * Alert fired state.
+		 */
+		const STATE_FIRED: number;
+
+		/**
+		 * Alert scheduled status.
+		 */
+		const STATE_SCHEDULED: number;
+
+		/**
+		 * Event has no status.
+		 */
+		const STATUS_NONE: number;
+
+		/**
+		 * Event canceled status.
+		 */
+		const STATUS_CANCELLED: number;
+
+		/**
+		 * Event canceled status.
+		 */
+		const STATUS_CANCELED: number;
+
+		/**
+		 * Event confirmed status.
+		 */
+		const STATUS_CONFIRMED: number;
+
+		/**
+		 * Event tentative status.
+		 */
+		const STATUS_TENTATIVE: number;
+
+		/**
+		 * Availability settings are not supported by the event's calendar.
+		 */
+		const AVAILABILITY_NOTSUPPORTED: number;
+
+		/**
+		 * Event has a busy availability setting.
+		 */
+		const AVAILABILITY_BUSY: number;
+
+		/**
+		 * Event has a free availability setting.
+		 */
+		const AVAILABILITY_FREE: number;
+
+		/**
+		 * Event has a tentative availability setting.
+		 */
+		const AVAILABILITY_TENTATIVE: number;
+
+		/**
+		 * Event has a tentative availability setting.
+		 */
+		const AVAILABILITY_UNAVAILABLE: number;
+
+		/**
+		 * A [eventsAuthorization](Titanium.Calendar.eventsAuthorization) value
+		 * indicating that the application is authorized to use events in the Calendar.
+		 */
+		const AUTHORIZATION_AUTHORIZED: number;
+
+		/**
+		 * A [eventsAuthorization](Titanium.Calendar.eventsAuthorization) value
+		 * indicating that the application is not authorized to use events in the Calendar.
+		 */
+		const AUTHORIZATION_DENIED: number;
+
+		/**
+		 * A [eventsAuthorization](Titanium.Calendar.eventsAuthorization) value
+		 * indicating that the application is not authorized to use events in the Calendar.
+		 * the user cannot change this application's status.
+		 */
+		const AUTHORIZATION_RESTRICTED: number;
+
+		/**
+		 * A [eventsAuthorization](Titanium.Calendar.eventsAuthorization) value
+		 * indicating that the authorization state is unknown.
+		 */
+		const AUTHORIZATION_UNKNOWN: number;
+
+		/**
+		 * A [save](Titanium.Calendar.Event.save)/[remove](Titanium.Calendar.Event.remove) event value,
+		 * indicating modifications to this event instance should affect only this instance.
+		 */
+		const SPAN_THISEVENT: number;
+
+		/**
+		 * A [save](Titanium.Calendar.Event.save)/[remove](Titanium.Calendar.Event.remove) event value,
+		 * indicating modifications to this event instance should also affect future instances of this event.
+		 */
+		const SPAN_FUTUREEVENTS: number;
+
+		/**
+		 * Indicates a daily recurrence rule for a events reccurance frequency.
+		 */
+		const RECURRENCEFREQUENCY_DAILY: number;
+
+		/**
+		 * Indicates a weekly recurrence rule for a events reccurance frequency.
+		 */
+		const RECURRENCEFREQUENCY_WEEKLY: number;
+
+		/**
+		 * Indicates a monthly recurrence rule for a events reccurance frequency.
+		 */
+		const RECURRENCEFREQUENCY_MONTHLY: number;
+
+		/**
+		 * Indicates a yearly recurrence rule for a events reccurance frequency.
+		 */
+		const RECURRENCEFREQUENCY_YEARLY: number;
+
+		/**
+		 * Event confidential visibility.
+		 */
+		const VISIBILITY_CONFIDENTIAL: number;
+
+		/**
+		 * Event default visibility.
+		 */
+		const VISIBILITY_DEFAULT: number;
+
+		/**
+		 * Event private visibility.
+		 */
+		const VISIBILITY_PRIVATE: number;
+
+		/**
+		 * Event public visibility.
+		 */
+		const VISIBILITY_PUBLIC: number;
+
+		/**
+		 * Attendee status is unknown.
+		 */
+		const ATTENDEE_STATUS_UNKNOWN: number;
+
+		/**
+		 * Attendee status is pending.
+		 */
+		const ATTENDEE_STATUS_PENDING: number;
+
+		/**
+		 * Attendee status is accepted.
+		 */
+		const ATTENDEE_STATUS_ACCEPTED: number;
+
+		/**
+		 * Attendee status is declined.
+		 */
+		const ATTENDEE_STATUS_DECLINED: number;
+
+		/**
+		 * Attendee status is tentative.
+		 */
+		const ATTENDEE_STATUS_TENTATIVE: number;
+
+		/**
+		 * Attendee status is invited.
+		 */
+		const ATTENDEE_STATUS_INVITED: number;
+
+		/**
+		 * There is no Attendee status.
+		 */
+		const ATTENDEE_STATUS_NONE: number;
+
+		/**
+		 * Attendee status is delegated.
+		 */
+		const ATTENDEE_STATUS_DELEGATED: number;
+
+		/**
+		 * Attendee status is in process.
+		 */
+		const ATTENDEE_STATUS_IN_PROCESS: number;
+
+		/**
+		 * Relationship is attendee.
+		 */
+		const RELATIONSHIP_ATTENDEE: number;
+
+		/**
+		 * There is no relationship.
+		 */
+		const RELATIONSHIP_NONE: number;
+
+		/**
+		 * Attendee is organizer.
+		 */
+		const RELATIONSHIP_ORGANIZER: number;
+
+		/**
+		 * Attendee is performer.
+		 */
+		const RELATIONSHIP_PERFORMER: number;
+
+		/**
+		 * Attendee is speaker.
+		 */
+		const RELATIONSHIP_SPEAKER: number;
+
+		/**
+		 * Relationship is unknown.
+		 */
+		const RELATIONSHIP_UNKNOWN: number;
+
+		/**
+		 * Attendee role is unknown.
+		 */
+		const ATTENDEE_ROLE_UNKNOWN: number;
+
+		/**
+		 * Attendee role is optional.
+		 */
+		const ATTENDEE_ROLE_OPTIONAL: number;
+
+		/**
+		 * Attendee role is required.
+		 */
+		const ATTENDEE_ROLE_REQUIRED: number;
+
+		/**
+		 * Attendee role is chair.
+		 */
+		const ATTENDEE_ROLE_CHAIR: number;
+
+		/**
+		 * Attendee is not a participant.
+		 */
+		const ATTENDEE_ROLE_NON_PARTICIPANT: number;
+
+		/**
+		 * Attendee type is unknown.
+		 */
+		const ATTENDEE_TYPE_UNKNOWN: number;
+
+		/**
+		 * Attendee type is person.
+		 */
+		const ATTENDEE_TYPE_PERSON: number;
+
+		/**
+		 * Attendee type is room.
+		 */
+		const ATTENDEE_TYPE_ROOM: number;
+
+		/**
+		 * Attendee type is resource.
+		 */
+		const ATTENDEE_TYPE_RESOURCE: number;
+
+		/**
+		 * There is not attendee type.
+		 */
+		const ATTENDEE_TYPE_NONE: number;
+
+		/**
+		 * Attendee type is required.
+		 */
+		const ATTENDEE_TYPE_REQUIRED: number;
+
+		/**
+		 * Attendee type is group.
+		 */
+		const ATTENDEE_TYPE_GROUP: number;
+
+		/**
+		 * A local calendar source.
+		 */
+		const SOURCE_TYPE_LOCAL: number;
+
+		/**
+		 * A microsoft exchange calendar source.
+		 */
+		const SOURCE_TYPE_EXCHANGE: number;
+
+		/**
+		 * A calDev calendar source.
+		 */
+		const SOURCE_TYPE_CALDAV: number;
+
+		/**
+		 * A mobileMe calendar source.
+		 */
+		const SOURCE_TYPE_MOBILEME: number;
+
+		/**
+		 * A subscribed calendar source.
+		 */
+		const SOURCE_TYPE_SUBSCRIBED: number;
+
+		/**
+		 * A birthday calendar source.
+		 */
+		const SOURCE_TYPE_BIRTHDAYS: number;
+
+		/**
+		 * Returns an authorization constant indicating if the application has access to the events in the EventKit.
+		 */
+		const eventsAuthorization: number;
+
+		/**
+		 * Returns an authorization constant indicating if the application has access to the events in the EventKit.
+		 */
+		const calendarAuthorization: number;
+
+		/**
+		 * All alerts in selected calendars.
+		 */
+		const allAlerts: Titanium.Calendar.Alert[];
+
+		/**
+		 * All calendars known to the native calendar app.
+		 */
+		const allCalendars: Titanium.Calendar.Calendar[];
+
+		/**
+		 * All calendars known to the native calendar app that can add, edit, and
+		 * delete items in the calendar.
+		 */
+		const allEditableCalendars: Titanium.Calendar.Calendar[];
+
+		/**
+		 * All calendars selected within the native calendar app, which may be a subset of `allCalendars`.
+		 */
+		const selectableCalendars: Titanium.Calendar.Calendar[];
+
+		/**
+		 * Calendar that events are added to by default, as specified by user settings.
+		 */
+		const defaultCalendar: Titanium.Calendar.Calendar;
+
+		/**
+		 * Adds the specified callback as an event listener for the named event.
+		 */
+		function addEventListener(name: string, callback: (param0: any) => any): void;
+
+		/**
+		 * Removes the specified callback as an event listener for the named event.
+		 */
+		function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+		/**
+		 * Fires a synthesized event to any registered listeners.
+		 */
+		function fireEvent(name: string, event: any): void;
+
+		/**
+		 * Applies the properties to the proxy.
+		 */
+		function applyProperties(props: any): void;
+
+		/**
+		 * Gets the calendar with the specified identifier.
+		 */
+		function getCalendarById(id: string): Titanium.Calendar.Calendar;
+
+		/**
+		 * Returns `true` if the app has calendar access.
+		 */
+		function hasCalendarPermissions(): boolean;
+
+		/**
+		 * Requests for calendar access.
+		 */
+		function requestCalendarPermissions(callback: (param0: EventsAuthorizationResponse) => any): void;
+
+		/**
+		 * If authorization is unknown, will bring up a dialog requesting permission.
+		 */
+		function requestEventsAuthorization(callback: (param0: EventsAuthorizationResponse) => any): void;
+
+		/**
+		 * Gets the value of the <Titanium.Calendar.bubbleParent> property.
+		 */
+		function getBubbleParent(): boolean;
+
+		/**
+		 * Sets the value of the <Titanium.Calendar.bubbleParent> property.
+		 */
+		function setBubbleParent(bubbleParent: boolean): void;
+
+		/**
+		 * Gets the value of the <Titanium.Calendar.apiName> property.
+		 */
+		function getApiName(): string;
+
+		/**
+		 * Gets the value of the <Titanium.Calendar.lifecycleContainer> property.
+		 */
+		function getLifecycleContainer(): Titanium.UI.Window | Titanium.UI.TabGroup;
+
+		/**
+		 * Sets the value of the <Titanium.Calendar.lifecycleContainer> property.
+		 */
+		function setLifecycleContainer(lifecycleContainer: Titanium.UI.Window): void;
+
+		/**
+		 * Sets the value of the <Titanium.Calendar.lifecycleContainer> property.
+		 */
+		function setLifecycleContainer(lifecycleContainer: Titanium.UI.TabGroup): void;
+
+		/**
+		 * Gets the value of the <Titanium.Calendar.eventsAuthorization> property.
+		 */
+		function getEventsAuthorization(): number;
+
+		/**
+		 * Gets the value of the <Titanium.Calendar.calendarAuthorization> property.
+		 */
+		function getCalendarAuthorization(): number;
+
+		/**
+		 * Gets the value of the <Titanium.Calendar.allAlerts> property.
+		 */
+		function getAllAlerts(): Titanium.Calendar.Alert[];
+
+		/**
+		 * Gets the value of the <Titanium.Calendar.allCalendars> property.
+		 */
+		function getAllCalendars(): Titanium.Calendar.Calendar[];
+
+		/**
+		 * Gets the value of the <Titanium.Calendar.allEditableCalendars> property.
+		 */
+		function getAllEditableCalendars(): Titanium.Calendar.Calendar[];
+
+		/**
+		 * Gets the value of the <Titanium.Calendar.selectableCalendars> property.
+		 */
+		function getSelectableCalendars(): Titanium.Calendar.Calendar[];
+
+		/**
+		 * Gets the value of the <Titanium.Calendar.defaultCalendar> property.
+		 */
+		function getDefaultCalendar(): Titanium.Calendar.Calendar;
+
+		/**
+		 * An object that represents a single alert for an event in an calendar.
+		 */
+		interface Alert extends Titanium.Proxy {
+			/**
+			 * The absolute date for the alarm.
+			 */
+			absoluteDate: Date;
+
+			/**
+			 * The offset from the start of an event, at which the alarm fires.
+			 */
+			relativeOffset: number;
+
+			/**
+			 * Date/time at which this alert alarm is set to trigger.
+			 */
+			readonly alarmTime: Date;
+
+			/**
+			 * Start date/time for the corresponding event.
+			 */
+			readonly begin: Date;
+
+			/**
+			 * End date/time for the corresponding event.
+			 */
+			readonly end: Date;
+
+			/**
+			 * Identifier of the event for which this alert is set.
+			 */
+			readonly eventId: number;
+
+			/**
+			 * Identifier of this alert.
+			 */
+			readonly id: string;
+
+			/**
+			 * Reminder notice period in minutes, that determines how long prior to the event this alert
+			 * should trigger.
+			 */
+			readonly minutes: number;
+
+			/**
+			 * The current state of the alert.
+			 */
+			readonly state: number;
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.Alert.absoluteDate> property.
+			 */
+			getAbsoluteDate(): Date;
+
+			/**
+			 * Sets the value of the <Titanium.Calendar.Alert.absoluteDate> property.
+			 */
+			setAbsoluteDate(absoluteDate: Date): void;
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.Alert.relativeOffset> property.
+			 */
+			getRelativeOffset(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Calendar.Alert.relativeOffset> property.
+			 */
+			setRelativeOffset(relativeOffset: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.Alert.alarmTime> property.
+			 */
+			getAlarmTime(): Date;
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.Alert.begin> property.
+			 */
+			getBegin(): Date;
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.Alert.end> property.
+			 */
+			getEnd(): Date;
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.Alert.eventId> property.
+			 */
+			getEventId(): number;
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.Alert.id> property.
+			 */
+			getId(): string;
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.Alert.minutes> property.
+			 */
+			getMinutes(): number;
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.Alert.state> property.
+			 */
+			getState(): number;
+
+		}
+
+		/**
+		 * An object that represents a single attendee of an event.
+		 */
+		interface Attendee extends Titanium.Proxy {
+			/**
+			 * Indicates whether this attendee is the event organizer.
+			 */
+			isOrganizer: boolean;
+
+			/**
+			 * The attendee name.
+			 */
+			name: string;
+
+			/**
+			 * The attendee email.
+			 */
+			email: string;
+
+			/**
+			 * The role of the attendee.
+			 */
+			role: number;
+
+			/**
+			 * The type of the attendee.
+			 */
+			type: number;
+
+			/**
+			 * The status of the attendee.
+			 */
+			status: number;
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.Attendee.isOrganizer> property.
+			 */
+			getIsOrganizer(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.Calendar.Attendee.isOrganizer> property.
+			 */
+			setIsOrganizer(isOrganizer: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.Attendee.name> property.
+			 */
+			getName(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Calendar.Attendee.name> property.
+			 */
+			setName(name: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.Attendee.email> property.
+			 */
+			getEmail(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Calendar.Attendee.email> property.
+			 */
+			setEmail(email: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.Attendee.role> property.
+			 */
+			getRole(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Calendar.Attendee.role> property.
+			 */
+			setRole(role: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.Attendee.type> property.
+			 */
+			getType(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Calendar.Attendee.type> property.
+			 */
+			setType(type: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.Attendee.status> property.
+			 */
+			getStatus(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Calendar.Attendee.status> property.
+			 */
+			setStatus(status: number): void;
+
+		}
+
+		/**
+		 * An object that represents a single calendar.
+		 */
+		interface Calendar extends Titanium.Proxy {
+			/**
+			 * Indicates whether this calendar can be edited or deleted.
+			 */
+			readonly hidden: boolean;
+
+			/**
+			 * Identifier of this calendar. Available only in iOS 5.0 and above.
+			 */
+			readonly id: string;
+
+			/**
+			 * Display name of this calendar.
+			 */
+			readonly name: string;
+
+			/**
+			 * Indicates whether the calendar is selected.
+			 */
+			readonly selected: boolean;
+
+			/**
+			 * Displays the source title.
+			 */
+			readonly sourceTitle: string;
+
+			/**
+			 * Displays the source type.
+			 */
+			readonly sourceType: number;
+
+			/**
+			 * Displays the source identifier.
+			 */
+			readonly sourceIdentifier: string;
+
+			/**
+			 * Creates an event in this calendar.
+			 */
+			createEvent(properties: any): Titanium.Calendar.Event;
+
+			/**
+			 * Gets the event with the specified identifier.
+			 */
+			getEventById(id: number): Titanium.Calendar.Event;
+
+			/**
+			 * Gets events that occur between two dates.
+			 */
+			getEventsBetweenDates(date1: Date, date2: Date | string): Titanium.Calendar.Event[];
+
+			/**
+			 * Gets events that occur between two dates.
+			 */
+			getEventsBetweenDates(date1: string, date2: Date | string): Titanium.Calendar.Event[];
+
+			/**
+			 * Gets events that occur between two dates.
+			 */
+			getEventsBetweenDates(date1: Date | string, date2: Date): Titanium.Calendar.Event[];
+
+			/**
+			 * Gets events that occur between two dates.
+			 */
+			getEventsBetweenDates(date1: Date | string, date2: string): Titanium.Calendar.Event[];
+
+			/**
+			 * Gets events that occur on a specified date.
+			 */
+			getEventsInDate(year: number, month: number, day: number): Titanium.Calendar.Event[];
+
+			/**
+			 * Gets events that occur during a specified month.
+			 */
+			getEventsInMonth(year: number, month: number): Titanium.Calendar.Event[];
+
+			/**
+			 * Gets all events that occur during a specified year.
+			 */
+			getEventsInYear(year: number): Titanium.Calendar.Event[];
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.Calendar.hidden> property.
+			 */
+			getHidden(): boolean;
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.Calendar.id> property.
+			 */
+			getId(): string;
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.Calendar.name> property.
+			 */
+			getName(): string;
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.Calendar.selected> property.
+			 */
+			getSelected(): boolean;
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.Calendar.sourceTitle> property.
+			 */
+			getSourceTitle(): string;
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.Calendar.sourceType> property.
+			 */
+			getSourceType(): number;
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.Calendar.sourceIdentifier> property.
+			 */
+			getSourceIdentifier(): string;
+
+		}
+
+		/**
+		 * An object that represents a single event in a calendar.
+		 */
+		interface Event extends Titanium.Proxy {
+			/**
+			 * Alarms associated with the calendar item, as an array of <Titanium.Calendar.Alert> objects.
+			 */
+			alerts: Titanium.Calendar.Alert[];
+
+			/**
+			 * Indicates whether this event is all day.
+			 */
+			allDay: boolean;
+
+			/**
+			 * Start date/time of this event.
+			 */
+			begin: Date;
+
+			/**
+			 * Notes for this event.
+			 */
+			notes: string;
+
+			/**
+			 * Description of this event.
+			 */
+			readonly description: string;
+
+			/**
+			 * End date/time of this event.
+			 */
+			end: Date;
+
+			/**
+			 * Extended properties of this event.
+			 */
+			readonly extendedProperties: any;
+
+			/**
+			 * Indicates whether an alarm is scheduled for this event.
+			 */
+			readonly hasAlarm: boolean;
+
+			/**
+			 * Identifier of this event.
+			 */
+			readonly id: string;
+
+			/**
+			 * Location of this event.
+			 */
+			location: string;
+
+			/**
+			 * Existing reminders for this event.
+			 */
+			readonly reminders: Titanium.Calendar.Reminder[];
+
+			/**
+			 * Status of this event.
+			 */
+			readonly status: number;
+
+			/**
+			 * Availability of this event.
+			 */
+			readonly availability: number;
+
+			/**
+			 * Boolean value that indicates whether an event is a detached instance of a
+			 * repeating event.
+			 */
+			readonly isDetached: boolean;
+
+			/**
+			 * Title of this event.
+			 */
+			title: string;
+
+			/**
+			 * Recurrence rule associated with the event. (Available in iOS 4.0 through iOS 5.1.)
+			 */
+			recurrenceRule: Titanium.Calendar.RecurrenceRule;
+
+			/**
+			 * The recurrence rules for the calendar item. (Available in iOS 5.1 and above.)
+			 */
+			recurrenceRules: Titanium.Calendar.RecurrenceRule[];
+
+			/**
+			 * Visibility of this event.
+			 */
+			readonly visibility: number;
+
+			/**
+			 * The list of event attendees. This list will be empty if the event has no attendees.
+			 */
+			readonly attendees: Titanium.Calendar.Attendee[];
+
+			/**
+			 * Creates an alert for this event.
+			 */
+			createAlert(data: any): Titanium.Calendar.Alert;
+
+			/**
+			 * Creates a reminder for this event.
+			 */
+			createReminder(data: any): Titanium.Calendar.Reminder;
+
+			/**
+			 * Gets the value of the specified extended property.
+			 */
+			getExtendedProperty(name: string): string;
+
+			/**
+			 * Sets the value of the specified extended property.
+			 */
+			setExtendedProperty(name: string, value: string): void;
+
+			/**
+			 * Creates an recurrence pattern for a recurring event.
+			 * All of the properties for the recurrence rule must be set during creation.
+			 * The recurrence rule properties cannot be modified.
+			 */
+			createRecurrenceRule(data: any): Titanium.Calendar.RecurrenceRule;
+
+			/**
+			 * Saves changes to an event permanently.
+			 */
+			save(span: number): boolean;
+
+			/**
+			 * Removes an event from the event store.
+			 */
+			remove(span: number): boolean;
+
+			/**
+			 * Updates the event's data with the current information in the Calendar database.
+			 */
+			refresh(): boolean;
+
+			/**
+			 * Adds a recurrence rule to the recurrence rule array.
+			 */
+			addRecurrenceRule(rule: Titanium.Calendar.RecurrenceRule): void;
+
+			/**
+			 * Removes a recurrence rule to the recurrence rule array.
+			 */
+			removeRecurrenceRule(rule: Titanium.Calendar.RecurrenceRule): void;
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.Event.alerts> property.
+			 */
+			getAlerts(): Titanium.Calendar.Alert[];
+
+			/**
+			 * Sets the value of the <Titanium.Calendar.Event.alerts> property.
+			 */
+			setAlerts(alerts: ReadonlyArray<Titanium.Calendar.Alert>): void;
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.Event.allDay> property.
+			 */
+			getAllDay(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.Calendar.Event.allDay> property.
+			 */
+			setAllDay(allDay: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.Event.begin> property.
+			 */
+			getBegin(): Date;
+
+			/**
+			 * Sets the value of the <Titanium.Calendar.Event.begin> property.
+			 */
+			setBegin(begin: Date): void;
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.Event.notes> property.
+			 */
+			getNotes(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Calendar.Event.notes> property.
+			 */
+			setNotes(notes: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.Event.description> property.
+			 */
+			getDescription(): string;
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.Event.end> property.
+			 */
+			getEnd(): Date;
+
+			/**
+			 * Sets the value of the <Titanium.Calendar.Event.end> property.
+			 */
+			setEnd(end: Date): void;
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.Event.extendedProperties> property.
+			 */
+			getExtendedProperties(): any;
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.Event.hasAlarm> property.
+			 */
+			getHasAlarm(): boolean;
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.Event.id> property.
+			 */
+			getId(): string;
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.Event.location> property.
+			 */
+			getLocation(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Calendar.Event.location> property.
+			 */
+			setLocation(location: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.Event.reminders> property.
+			 */
+			getReminders(): Titanium.Calendar.Reminder[];
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.Event.status> property.
+			 */
+			getStatus(): number;
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.Event.availability> property.
+			 */
+			getAvailability(): number;
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.Event.isDetached> property.
+			 */
+			getIsDetached(): boolean;
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.Event.title> property.
+			 */
+			getTitle(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Calendar.Event.title> property.
+			 */
+			setTitle(title: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.Event.recurrenceRule> property.
+			 */
+			getRecurrenceRule(): Titanium.Calendar.RecurrenceRule;
+
+			/**
+			 * Sets the value of the <Titanium.Calendar.Event.recurrenceRule> property.
+			 */
+			setRecurrenceRule(recurrenceRule: Titanium.Calendar.RecurrenceRule): void;
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.Event.recurrenceRules> property.
+			 */
+			getRecurrenceRules(): Titanium.Calendar.RecurrenceRule[];
+
+			/**
+			 * Sets the value of the <Titanium.Calendar.Event.recurrenceRules> property.
+			 */
+			setRecurrenceRules(recurrenceRules: ReadonlyArray<Titanium.Calendar.RecurrenceRule>): void;
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.Event.visibility> property.
+			 */
+			getVisibility(): number;
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.Event.attendees> property.
+			 */
+			getAttendees(): Titanium.Calendar.Attendee[];
+
+		}
+
+		/**
+		 * An object that is used to describe the recurrence pattern for a recurring event.
+		 */
+		interface RecurrenceRule extends Titanium.Proxy {
+			/**
+			 * Identifier for the recurrence rule's calendar.
+			 */
+			readonly calendarID: string;
+
+			/**
+			 * Frequency of the recurrence rule.
+			 */
+			readonly frequency: number;
+
+			/**
+			 * The interval between instances of this recurrence. For example, a weekly
+			 * recurrence rule with an interval of 2 occurs every other week. Must be greater than 0.
+			 */
+			readonly interval: number;
+
+			/**
+			 * The days of the week that the event occurs, as an Dictionay of `daysOfWeek` and `Week`.
+			 */
+			readonly daysOfTheWeek: daysOfTheWeekDictionary;
+
+			/**
+			 * The days of the month that the event occurs, as an array of number objects.
+			 * Values can be from 1 to 31 and from -1 to -31. This parameter is only valid for
+			 * recurrence rules of type
+			 * [RECURRENCEFREQUENCY_MONTHLY](Titanium.Calendar.RECURRENCEFREQUENCY_MONTHLY).
+			 */
+			readonly daysOfTheMonth: number[];
+
+			/**
+			 * The months of the year that the event occurs, as an array of Number objects.
+			 * Values can be from 1 to 12. This parameter is only valid for recurrence rules of
+			 * type [RECURRENCEFREQUENCY_YEARLY](Titanium.Calendar.RECURRENCEFREQUENCY_YEARLY).
+			 */
+			readonly monthsOfTheYear: number[];
+
+			/**
+			 * The weeks of the year that the event occurs, as an array of number objects.
+			 * Values can be from 1 to 53 and from -1 to -53. This parameter is only valid for
+			 * recurrence rules of type [RECURRENCEFREQUENCY_YEARLY](Titanium.Calendar.RECURRENCEFREQUENCY_YEARLY).
+			 */
+			readonly weeksOfTheYear: number[];
+
+			/**
+			 * The days of the year that the event occurs, as an array of number objects.
+			 * Values can be from 1 to 366 and from -1 to -366. This parameter is only valid for
+			 * recurrence rules of type [RECURRENCEFREQUENCY_YEARLY](Titanium.Calendar.RECURRENCEFREQUENCY_YEARLY).
+			 */
+			readonly daysOfTheYear: number[];
+
+			/**
+			 * An array of ordinal numbers that filters which recurrences to include in the
+			 * recurrence rule's frequency. For example, a yearly recurrence rule that has a
+			 * [daysOfTheWeek](Titanium.Calendar.RecurrenceRule.daysOfTheWeek) value that specifies
+			 * Monday through Friday, and a `setPositions` array containing 2 and -1, occurs only
+			 * on the second weekday and last weekday of every year.
+			 */
+			readonly setPositions: number[];
+
+			/**
+			 * End of a recurrence rule.
+			 */
+			readonly end: recurrenceEndDictionary;
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.RecurrenceRule.calendarID> property.
+			 */
+			getCalendarID(): string;
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.RecurrenceRule.frequency> property.
+			 */
+			getFrequency(): number;
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.RecurrenceRule.interval> property.
+			 */
+			getInterval(): number;
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.RecurrenceRule.daysOfTheWeek> property.
+			 */
+			getDaysOfTheWeek(): daysOfTheWeekDictionary;
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.RecurrenceRule.daysOfTheMonth> property.
+			 */
+			getDaysOfTheMonth(): number[];
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.RecurrenceRule.monthsOfTheYear> property.
+			 */
+			getMonthsOfTheYear(): number[];
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.RecurrenceRule.weeksOfTheYear> property.
+			 */
+			getWeeksOfTheYear(): number[];
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.RecurrenceRule.daysOfTheYear> property.
+			 */
+			getDaysOfTheYear(): number[];
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.RecurrenceRule.setPositions> property.
+			 */
+			getSetPositions(): number[];
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.RecurrenceRule.end> property.
+			 */
+			getEnd(): recurrenceEndDictionary;
+
+		}
+
+		/**
+		 * An object that represents a single reminder for an event in a calendar.
+		 */
+		interface Reminder extends Titanium.Proxy {
+			/**
+			 * Identifier of this reminder.
+			 */
+			readonly id: string;
+
+			/**
+			 * Method by which this reminder will be delivered.
+			 */
+			readonly method: number;
+
+			/**
+			 * Reminder notice period in minutes, that determines how long prior to the event this reminder
+			 * should trigger.
+			 */
+			readonly minutes: number;
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.Reminder.id> property.
+			 */
+			getId(): string;
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.Reminder.method> property.
+			 */
+			getMethod(): number;
+
+			/**
+			 * Gets the value of the <Titanium.Calendar.Reminder.minutes> property.
+			 */
+			getMinutes(): number;
+
+		}
+
 	}
-	export interface Gesture  {
-		landscape : boolean;
-		orientation : number;
-		portrait : boolean;
-		getLandscape () : boolean;
-		getOrientation () : number;
-		getPortrait () : boolean;
-		isFaceDown () : boolean;
-		isFaceUp () : boolean;
-		isLandscape () : boolean;
-		isPortrait () : boolean;
+
+	/**
+	 * A module for translating between primitive types and raw byte streams.
+	 */
+	namespace Codec {
+		/**
+		 * Indicates if the proxy will bubble an event to its parent.
+		 */
+		let bubbleParent: boolean;
+
+		/**
+		 * The name of the API that this proxy corresponds to.
+		 */
+		const apiName: string;
+
+		/**
+		 * The Window or TabGroup whose Activity lifecycle should be triggered on the proxy.
+		 */
+		let lifecycleContainer: Titanium.UI.Window | Titanium.UI.TabGroup;
+
+		/**
+		 * ASCII character encoding..
+		 */
+		const CHARSET_ASCII: string;
+
+		/**
+		 * ISO 8859-1 (Latin-1) character encoding.
+		 */
+		const CHARSET_ISO_LATIN_1: string;
+
+		/**
+		 * UTF-8 character encoding.
+		 */
+		const CHARSET_UTF8: string;
+
+		/**
+		 * UTF-16 character encoding with default byte order.
+		 */
+		const CHARSET_UTF16: string;
+
+		/**
+		 * UTF-16 character encoding with big endian byte order.
+		 */
+		const CHARSET_UTF16BE: string;
+
+		/**
+		 * UTF-16 character encoding with little endian byte order.
+		 */
+		const CHARSET_UTF16LE: string;
+
+		/**
+		 * 8-bit integer encoding type.
+		 */
+		const TYPE_BYTE: string;
+
+		/**
+		 * 16-bit integer encoding type.
+		 */
+		const TYPE_SHORT: string;
+
+		/**
+		 * 32-bit integer encoding type.
+		 */
+		const TYPE_INT: string;
+
+		/**
+		 * 32-bit single precision floating-point type.
+		 */
+		const TYPE_FLOAT: string;
+
+		/**
+		 * 64-bit integer encoding type.
+		 */
+		const TYPE_LONG: string;
+
+		/**
+		 * 64-bit double precision floating-point type.
+		 */
+		const TYPE_DOUBLE: string;
+
+		/**
+		 * Big endian (network) byte order -- that is, the most significant byte first.
+		 */
+		const BIG_ENDIAN: number;
+
+		/**
+		 * Little endian byte order -- that is, the least significant byte first.
+		 */
+		const LITTLE_ENDIAN: number;
+
+		/**
+		 * Adds the specified callback as an event listener for the named event.
+		 */
+		function addEventListener(name: string, callback: (param0: any) => any): void;
+
+		/**
+		 * Removes the specified callback as an event listener for the named event.
+		 */
+		function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+		/**
+		 * Fires a synthesized event to any registered listeners.
+		 */
+		function fireEvent(name: string, event: any): void;
+
+		/**
+		 * Applies the properties to the proxy.
+		 */
+		function applyProperties(props: any): void;
+
+		/**
+		 * Get the OS native byte order (either <Titanium.Codec.BIG_ENDIAN> or
+		 * <Titanium.Codec.LITTLE_ENDIAN>).
+		 */
+		function getNativeByteOrder(): number;
+
+		/**
+		 * Encodes a number and writes it to a buffer.
+		 */
+		function encodeNumber(options: EncodeNumberDict): number;
+
+		/**
+		 * Decodes a number from the `source` buffer using the specified data type.
+		 */
+		function decodeNumber(options: DecodeNumberDict): number;
+
+		/**
+		 * Encodes a string into a series of bytes in a buffer using the specified character set.
+		 */
+		function encodeString(options: any): number;
+
+		/**
+		 * Decodes the source buffer into a String using the supplied character set.
+		 */
+		function decodeString(options: DecodeStringDict): string;
+
+		/**
+		 * Gets the value of the <Titanium.Codec.bubbleParent> property.
+		 */
+		function getBubbleParent(): boolean;
+
+		/**
+		 * Sets the value of the <Titanium.Codec.bubbleParent> property.
+		 */
+		function setBubbleParent(bubbleParent: boolean): void;
+
+		/**
+		 * Gets the value of the <Titanium.Codec.apiName> property.
+		 */
+		function getApiName(): string;
+
+		/**
+		 * Gets the value of the <Titanium.Codec.lifecycleContainer> property.
+		 */
+		function getLifecycleContainer(): Titanium.UI.Window | Titanium.UI.TabGroup;
+
+		/**
+		 * Sets the value of the <Titanium.Codec.lifecycleContainer> property.
+		 */
+		function setLifecycleContainer(lifecycleContainer: Titanium.UI.Window): void;
+
+		/**
+		 * Sets the value of the <Titanium.Codec.lifecycleContainer> property.
+		 */
+		function setLifecycleContainer(lifecycleContainer: Titanium.UI.TabGroup): void;
+
 	}
-	export interface Analytics  {
-		lastEvent : string;
-		addEvent (type: string, name: string, data?: any) : void;
-		featureEvent (name: string, data?: any) : void;
-		getLastEvent () : string;
-		navEvent (from: string, to: string, name?: string, data?: any) : void;
-		settingsEvent (name: string, data?: any) : void;
-		timedEvent (name: string, start: Date, stop: Date, duration: number, data?: any) : void;
-		userEvent (name: string, data?: any) : void;
+
+	/**
+	 * The top-level Contacts module, used for accessing and modifying the system contacts address book.
+	 */
+	namespace Contacts {
+		/**
+		 * Indicates if the proxy will bubble an event to its parent.
+		 */
+		let bubbleParent: boolean;
+
+		/**
+		 * The name of the API that this proxy corresponds to.
+		 */
+		const apiName: string;
+
+		/**
+		 * The Window or TabGroup whose Activity lifecycle should be triggered on the proxy.
+		 */
+		let lifecycleContainer: Titanium.UI.Window | Titanium.UI.TabGroup;
+
+		/**
+		 * Specifies that a contact is an organization.
+		 */
+		const CONTACTS_KIND_ORGANIZATION: number;
+
+		/**
+		 * Specifies that a contact is a person.
+		 */
+		const CONTACTS_KIND_PERSON: number;
+
+		/**
+		 * Specifies that group members will be sorted by first name.
+		 */
+		const CONTACTS_SORT_FIRST_NAME: number;
+
+		/**
+		 * Specifies that group members will be sorted by last name.
+		 */
+		const CONTACTS_SORT_LAST_NAME: number;
+
+		/**
+		 * A [contactsAuthorization](Titanium.Contacts.contactsAuthorization) value
+		 * indicating that the application is authorized to use the address book.
+		 */
+		const AUTHORIZATION_AUTHORIZED: number;
+
+		/**
+		 * A [contactsAuthorization](Titanium.Contacts.contactsAuthorization) value
+		 * indicating that the application is not authorized to use the address book.
+		 */
+		const AUTHORIZATION_DENIED: number;
+
+		/**
+		 * A [contactsAuthorization](Titanium.Contacts.contactsAuthorization) value
+		 * indicating that the application is not authorized to use the address book *and*
+		 * the user cannot change this application's status.
+		 */
+		const AUTHORIZATION_RESTRICTED: number;
+
+		/**
+		 * A [contactsAuthorization](Titanium.Contacts.contactsAuthorization) value
+		 * indicating that the authorization state is unknown.
+		 */
+		const AUTHORIZATION_UNKNOWN: number;
+
+		/**
+		 * Returns an authorization constant indicating if the application has access to the address book.
+		 */
+		const contactsAuthorization: number;
+
+		/**
+		 * Adds the specified callback as an event listener for the named event.
+		 */
+		function addEventListener(name: string, callback: (param0: any) => any): void;
+
+		/**
+		 * Removes the specified callback as an event listener for the named event.
+		 */
+		function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+		/**
+		 * Fires a synthesized event to any registered listeners.
+		 */
+		function fireEvent(name: string, event: any): void;
+
+		/**
+		 * Applies the properties to the proxy.
+		 */
+		function applyProperties(props: any): void;
+
+		/**
+		 * Creates and returns an instance of <Titanium.Contacts.Group>.
+		 */
+		function createGroup(parameters?: any): Titanium.Contacts.Group;
+
+		/**
+		 * Creates and returns an instance of <Titanium.Contacts.Person>, and commits all pending
+		 * changes to the underlying contacts database.
+		 */
+		function createPerson(parameters?: any): Titanium.Contacts.Person;
+
+		/**
+		 * Gets all groups.
+		 */
+		function getAllGroups(): Titanium.Contacts.Group[];
+
+		/**
+		 * Gets all people, unless a limit is specified.
+		 */
+		function getAllPeople(limit: number): Titanium.Contacts.Person[];
+
+		/**
+		 * Gets the group with the specified identifier. Deprecated for >= iOS9. Use <Titanium.Contacts.getGroupByIdentifier> instead.
+		 */
+		function getGroupByID(id: number): Titanium.Contacts.Group;
+
+		/**
+		 * Gets the group with the specified identifier.
+		 */
+		function getGroupByIdentifier(id: string): Titanium.Contacts.Group;
+
+		/**
+		 * Gets people with a `firstName`, `middleName` or `lastName` field, or a combination
+		 * of these fields, that match the specified name.
+		 */
+		function getPeopleWithName(name: string): Titanium.Contacts.Person[];
+
+		/**
+		 * Gets the person with the specified identifier. Deprecated for >= iOS9. Use <Titanium.Contacts.getPersonByIdentifier> instead.
+		 */
+		function getPersonByID(id: number): Titanium.Contacts.Person;
+
+		/**
+		 * Gets the person with the specified identifier.
+		 */
+		function getPersonByIdentifier(id: number): Titanium.Contacts.Person;
+
+		/**
+		 * Removes a group from the address book.
+		 */
+		function removeGroup(group: Titanium.Contacts.Group): void;
+
+		/**
+		 * Removes a contact from the address book.
+		 */
+		function removePerson(person: Titanium.Contacts.Person): void;
+
+		/**
+		 * Reverts all changes made by the previous save to the address book. Deprecated for >= iOS9.
+		 */
+		function revert(): void;
+
+		/**
+		 * Commits all pending changes to the underlying contacts database.
+		 */
+		function save(contacts: ReadonlyArray<Titanium.Contacts.Person>): void;
+
+		/**
+		 * Displays a picker that allows a person to be selected.
+		 */
+		function showContacts(params: showContactsParams): void;
+
+		/**
+		 * Returns `true` if the app has contacts access.
+		 */
+		function hasContactsPermissions(): boolean;
+
+		/**
+		 * Requests for contacts access.
+		 */
+		function requestContactsPermissions(callback: (param0: ContactsAuthorizationResponse) => any): void;
+
+		/**
+		 * If authorization is unknown, will bring up a dialog requesting permission.
+		 */
+		function requestAuthorization(callback: (param0: ContactsAuthorizationResponse) => any): void;
+
+		/**
+		 * Gets the value of the <Titanium.Contacts.bubbleParent> property.
+		 */
+		function getBubbleParent(): boolean;
+
+		/**
+		 * Sets the value of the <Titanium.Contacts.bubbleParent> property.
+		 */
+		function setBubbleParent(bubbleParent: boolean): void;
+
+		/**
+		 * Gets the value of the <Titanium.Contacts.apiName> property.
+		 */
+		function getApiName(): string;
+
+		/**
+		 * Gets the value of the <Titanium.Contacts.lifecycleContainer> property.
+		 */
+		function getLifecycleContainer(): Titanium.UI.Window | Titanium.UI.TabGroup;
+
+		/**
+		 * Sets the value of the <Titanium.Contacts.lifecycleContainer> property.
+		 */
+		function setLifecycleContainer(lifecycleContainer: Titanium.UI.Window): void;
+
+		/**
+		 * Sets the value of the <Titanium.Contacts.lifecycleContainer> property.
+		 */
+		function setLifecycleContainer(lifecycleContainer: Titanium.UI.TabGroup): void;
+
+		/**
+		 * Gets the value of the <Titanium.Contacts.contactsAuthorization> property.
+		 */
+		function getContactsAuthorization(): number;
+
+		/**
+		 * An object which represents a group in the system contacts address book.
+		 */
+		interface Group extends Titanium.Proxy {
+			/**
+			 * Name of this group.
+			 */
+			name: string;
+
+			/**
+			 * Record identifier of the group. Single value. Deprecated for >= iOS9.
+			 */
+			recordId: number;
+
+			/**
+			 * Identifier of the group.
+			 */
+			readonly identifier: string;
+
+			/**
+			 * Adds a person to this group.
+			 */
+			add(person: Titanium.Contacts.Person): void;
+
+			/**
+			 * Gets people that are members of this group.
+			 */
+			members(): Titanium.Contacts.Person[];
+
+			/**
+			 * Removes a person from this group. For >= iOS9, it is not
+			 * required to call <Titanium.Contacts.save> after calling this method.
+			 */
+			remove(person: Titanium.Contacts.Person): void;
+
+			/**
+			 * Gets people that are members of this group, sorted in the specified order.
+			 */
+			sortedMembers(sortBy: number): Titanium.Contacts.Person[];
+
+			/**
+			 * Gets the value of the <Titanium.Contacts.Group.name> property.
+			 */
+			getName(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Contacts.Group.name> property.
+			 */
+			setName(name: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Contacts.Group.recordId> property.
+			 */
+			getRecordId(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Contacts.Group.recordId> property.
+			 */
+			setRecordId(recordId: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Contacts.Group.identifier> property.
+			 */
+			getIdentifier(): string;
+
+		}
+
+		/**
+		 * An object that represents a contact record for a person or organization in the system contacts
+		 * address book.
+		 */
+		interface Person extends Titanium.Proxy {
+			/**
+			 * Addresses for the person. Multi-value. Read-only on Android.
+			 */
+			address: any;
+
+			/**
+			 * Date of birth of the person. Single value.
+			 */
+			birthday: string;
+
+			/**
+			 * Alternate birthday of the person. Single Dictionary.
+			 */
+			alternateBirthday: any;
+
+			/**
+			 * Date and time that the person record was created. Single value. Deprecated since iOS 9.
+			 */
+			readonly created: string;
+
+			/**
+			 * Dates associated with the person. Multi-value.
+			 */
+			date: any;
+
+			/**
+			 * Department of the person. Single value.
+			 */
+			department: string;
+
+			/**
+			 * Email addresses for the person. Multi-value. Read-only on Android.
+			 */
+			email: any;
+
+			/**
+			 * First name of the person. Single value.
+			 */
+			firstName: string;
+
+			/**
+			 * Phonetic first name of the person.  Single value.
+			 */
+			firstPhonetic: string;
+
+			/**
+			 * Localized full name of the person. Single value. Read-only on Android.
+			 */
+			readonly fullName: string;
+
+			/**
+			 * Record identifier of the person. Single value.
+			 */
+			readonly id: number;
+
+			/**
+			 * Identifier of the person.
+			 */
+			readonly identifier: string;
+
+			/**
+			 * Image for the person. Single value. Read-only for >= iOS9
+			 */
+			image: Titanium.Blob;
+
+			/**
+			 * Instant messenger information of the person. Multi-value.
+			 */
+			instantMessage: any;
+
+			/**
+			 * Social profile information of the person. Multi-value.
+			 */
+			socialProfile: any;
+
+			/**
+			 * Job title of the person. Single value.
+			 */
+			jobTitle: string;
+
+			/**
+			 * Determines the type of information the person record contains; either person or organization.
+			 * Read-only on Android.
+			 */
+			kind: number;
+
+			/**
+			 * Last name of the person. Single value.
+			 */
+			lastName: string;
+
+			/**
+			 * Phonetic last name of the person. Single value.
+			 */
+			lastPhonetic: string;
+
+			/**
+			 * Middle name of the person. Single value.
+			 */
+			middleName: string;
+
+			/**
+			 * Phonetic middle name of the person. Single value.
+			 */
+			middlePhonetic: string;
+
+			/**
+			 * Date and time that the person record was last modified. Single value. Deprecated since iOS 9.
+			 */
+			readonly modified: string;
+
+			/**
+			 * Nickname of the person. Single value.
+			 */
+			nickname: string;
+
+			/**
+			 * Notes for the person. Single value.
+			 */
+			note: string;
+
+			/**
+			 * Organization to which the person belongs. Single value.
+			 */
+			organization: string;
+
+			/**
+			 * Phone numbers for the person. Multi-value. Read-only on Android.
+			 */
+			phone: any;
+
+			/**
+			 * Prefix for the person. Single value.
+			 */
+			readonly prefix: string;
+
+			/**
+			 * Record identifier of the person. Single value. Deprecated since iOS 9.
+			 */
+			recordId: number;
+
+			/**
+			 * Names of people to which the person is related. Multi-value.
+			 */
+			relatedNames: any;
+
+			/**
+			 * Suffix for the person. Single value.
+			 */
+			readonly suffix: string;
+
+			/**
+			 * URLs of webpages associated with the person. Multi-value.
+			 */
+			url: any;
+
+			/**
+			 * Gets the value of the <Titanium.Contacts.Person.address> property.
+			 */
+			getAddress(): any;
+
+			/**
+			 * Sets the value of the <Titanium.Contacts.Person.address> property.
+			 */
+			setAddress(address: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.Contacts.Person.birthday> property.
+			 */
+			getBirthday(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Contacts.Person.birthday> property.
+			 */
+			setBirthday(birthday: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Contacts.Person.alternateBirthday> property.
+			 */
+			getAlternateBirthday(): any;
+
+			/**
+			 * Sets the value of the <Titanium.Contacts.Person.alternateBirthday> property.
+			 */
+			setAlternateBirthday(alternateBirthday: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.Contacts.Person.created> property.
+			 */
+			getCreated(): string;
+
+			/**
+			 * Gets the value of the <Titanium.Contacts.Person.date> property.
+			 */
+			getDate(): any;
+
+			/**
+			 * Sets the value of the <Titanium.Contacts.Person.date> property.
+			 */
+			setDate(date: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.Contacts.Person.department> property.
+			 */
+			getDepartment(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Contacts.Person.department> property.
+			 */
+			setDepartment(department: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Contacts.Person.email> property.
+			 */
+			getEmail(): any;
+
+			/**
+			 * Sets the value of the <Titanium.Contacts.Person.email> property.
+			 */
+			setEmail(email: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.Contacts.Person.firstName> property.
+			 */
+			getFirstName(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Contacts.Person.firstName> property.
+			 */
+			setFirstName(firstName: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Contacts.Person.firstPhonetic> property.
+			 */
+			getFirstPhonetic(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Contacts.Person.firstPhonetic> property.
+			 */
+			setFirstPhonetic(firstPhonetic: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Contacts.Person.fullName> property.
+			 */
+			getFullName(): string;
+
+			/**
+			 * Gets the value of the <Titanium.Contacts.Person.id> property.
+			 */
+			getId(): number;
+
+			/**
+			 * Gets the value of the <Titanium.Contacts.Person.identifier> property.
+			 */
+			getIdentifier(): string;
+
+			/**
+			 * Gets the value of the <Titanium.Contacts.Person.image> property.
+			 */
+			getImage(): Titanium.Blob;
+
+			/**
+			 * Sets the value of the <Titanium.Contacts.Person.image> property.
+			 */
+			setImage(image: Titanium.Blob): void;
+
+			/**
+			 * Gets the value of the <Titanium.Contacts.Person.instantMessage> property.
+			 */
+			getInstantMessage(): any;
+
+			/**
+			 * Sets the value of the <Titanium.Contacts.Person.instantMessage> property.
+			 */
+			setInstantMessage(instantMessage: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.Contacts.Person.socialProfile> property.
+			 */
+			getSocialProfile(): any;
+
+			/**
+			 * Sets the value of the <Titanium.Contacts.Person.socialProfile> property.
+			 */
+			setSocialProfile(socialProfile: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.Contacts.Person.jobTitle> property.
+			 */
+			getJobTitle(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Contacts.Person.jobTitle> property.
+			 */
+			setJobTitle(jobTitle: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Contacts.Person.kind> property.
+			 */
+			getKind(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Contacts.Person.kind> property.
+			 */
+			setKind(kind: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Contacts.Person.lastName> property.
+			 */
+			getLastName(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Contacts.Person.lastName> property.
+			 */
+			setLastName(lastName: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Contacts.Person.lastPhonetic> property.
+			 */
+			getLastPhonetic(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Contacts.Person.lastPhonetic> property.
+			 */
+			setLastPhonetic(lastPhonetic: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Contacts.Person.middleName> property.
+			 */
+			getMiddleName(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Contacts.Person.middleName> property.
+			 */
+			setMiddleName(middleName: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Contacts.Person.middlePhonetic> property.
+			 */
+			getMiddlePhonetic(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Contacts.Person.middlePhonetic> property.
+			 */
+			setMiddlePhonetic(middlePhonetic: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Contacts.Person.modified> property.
+			 */
+			getModified(): string;
+
+			/**
+			 * Gets the value of the <Titanium.Contacts.Person.nickname> property.
+			 */
+			getNickname(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Contacts.Person.nickname> property.
+			 */
+			setNickname(nickname: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Contacts.Person.note> property.
+			 */
+			getNote(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Contacts.Person.note> property.
+			 */
+			setNote(note: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Contacts.Person.organization> property.
+			 */
+			getOrganization(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Contacts.Person.organization> property.
+			 */
+			setOrganization(organization: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Contacts.Person.phone> property.
+			 */
+			getPhone(): any;
+
+			/**
+			 * Sets the value of the <Titanium.Contacts.Person.phone> property.
+			 */
+			setPhone(phone: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.Contacts.Person.prefix> property.
+			 */
+			getPrefix(): string;
+
+			/**
+			 * Gets the value of the <Titanium.Contacts.Person.recordId> property.
+			 */
+			getRecordId(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Contacts.Person.recordId> property.
+			 */
+			setRecordId(recordId: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Contacts.Person.relatedNames> property.
+			 */
+			getRelatedNames(): any;
+
+			/**
+			 * Sets the value of the <Titanium.Contacts.Person.relatedNames> property.
+			 */
+			setRelatedNames(relatedNames: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.Contacts.Person.suffix> property.
+			 */
+			getSuffix(): string;
+
+			/**
+			 * Gets the value of the <Titanium.Contacts.Person.url> property.
+			 */
+			getUrl(): any;
+
+			/**
+			 * Sets the value of the <Titanium.Contacts.Person.url> property.
+			 */
+			setUrl(url: any): void;
+
+		}
+
 	}
-	export module Facebook {
-		export var BUTTON_STYLE_NORMAL : number;
-		export var BUTTON_STYLE_WIDE : number;
-		export var accessToken : string;
-		export var apiName : string;
-		export var appid : string;
-		export var bubbleParent : boolean;
-		export var expirationDate : Date;
-		export var forceDialogAuth : boolean;
-		export var loggedIn : boolean;
-		export var permissions : Array<String>;
-		export var uid : string;
-		export function addEventListener (name: string, callback: (...args : any[]) => any) : void;
-		export function applyProperties (props: Dictionary<Object>) : void;
-		export function authorize () : void;
-		export function createLoginButton (parameters?: Dictionary<Ti.Facebook.LoginButton>) : Ti.Facebook.LoginButton;
-		export function dialog (action: string, params: any, callback: (...args : any[]) => any) : void;
-		export function fireEvent (name: string, event: Dictionary<Object>) : void;
-		export function getAccessToken () : string;
-		export function getApiName () : string;
-		export function getAppid () : string;
-		export function getBubbleParent () : boolean;
-		export function getExpirationDate () : Date;
-		export function getForceDialogAuth () : boolean;
-		export function getLoggedIn () : boolean;
-		export function getPermissions () : Array<String>;
-		export function getUid () : string;
-		export function logout () : void;
-		export function removeEventListener (name: string, callback: (...args : any[]) => any) : void;
-		export function request (method: string, params: any, callback: (...args : any[]) => any) : void;
-		export function requestWithGraphPath (path: string, params: Dictionary<Object>, httpMethod: string, callback: (...args : any[]) => any) : void;
-		export function setAccessToken (accessToken: string) : void;
-		export function setAppid (appid: string) : void;
-		export function setBubbleParent (bubbleParent: boolean) : void;
-		export function setExpirationDate (expirationDate: Date) : void;
-		export function setForceDialogAuth (forceDialogAuth: boolean) : void;
-		export function setLoggedIn (loggedIn: boolean) : void;
-		export function setPermissions (permissions: Array<String>) : void;
-		export function setUid (uid: string) : void;
-		export interface LoginButton extends Ti.UI.View {
-			style : string;
-			getStyle () : string;
-			setStyle (style: string) : void;
+
+	/**
+	 * The top-level `Database` module, used for creating and accessing the
+	 * in-application SQLite database.
+	 */
+	namespace Database {
+		/**
+		 * Indicates if the proxy will bubble an event to its parent.
+		 */
+		let bubbleParent: boolean;
+
+		/**
+		 * The name of the API that this proxy corresponds to.
+		 */
+		const apiName: string;
+
+		/**
+		 * The Window or TabGroup whose Activity lifecycle should be triggered on the proxy.
+		 */
+		let lifecycleContainer: Titanium.UI.Window | Titanium.UI.TabGroup;
+
+		/**
+		 * Constant for requesting a column's value returned in double form.
+		 */
+		const FIELD_TYPE_DOUBLE: number;
+
+		/**
+		 * Constant for requesting a column's value returned in float form.
+		 */
+		const FIELD_TYPE_FLOAT: number;
+
+		/**
+		 * Constant for requesting a column's value returned in integer form.
+		 */
+		const FIELD_TYPE_INT: number;
+
+		/**
+		 * Constant for requesting a column's value returned in string form.
+		 */
+		const FIELD_TYPE_STRING: number;
+
+		/**
+		 * Adds the specified callback as an event listener for the named event.
+		 */
+		function addEventListener(name: string, callback: (param0: any) => any): void;
+
+		/**
+		 * Removes the specified callback as an event listener for the named event.
+		 */
+		function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+		/**
+		 * Fires a synthesized event to any registered listeners.
+		 */
+		function fireEvent(name: string, event: any): void;
+
+		/**
+		 * Applies the properties to the proxy.
+		 */
+		function applyProperties(props: any): void;
+
+		/**
+		 * Installs an SQLite database to device's internal storage.
+		 */
+		function install(path: string, dbName: string): Titanium.Database.DB;
+
+		/**
+		 * Opens an SQLite database.
+		 */
+		function open(dbName: string): Titanium.Database.DB;
+
+		/**
+		 * Gets the value of the <Titanium.Database.bubbleParent> property.
+		 */
+		function getBubbleParent(): boolean;
+
+		/**
+		 * Sets the value of the <Titanium.Database.bubbleParent> property.
+		 */
+		function setBubbleParent(bubbleParent: boolean): void;
+
+		/**
+		 * Gets the value of the <Titanium.Database.apiName> property.
+		 */
+		function getApiName(): string;
+
+		/**
+		 * Gets the value of the <Titanium.Database.lifecycleContainer> property.
+		 */
+		function getLifecycleContainer(): Titanium.UI.Window | Titanium.UI.TabGroup;
+
+		/**
+		 * Sets the value of the <Titanium.Database.lifecycleContainer> property.
+		 */
+		function setLifecycleContainer(lifecycleContainer: Titanium.UI.Window): void;
+
+		/**
+		 * Sets the value of the <Titanium.Database.lifecycleContainer> property.
+		 */
+		function setLifecycleContainer(lifecycleContainer: Titanium.UI.TabGroup): void;
+
+		/**
+		 * The `Database` instance returned by <Titanium.Database.open> or <Titanium.Database.install>.
+		 */
+		interface DB extends Titanium.Proxy {
+			/**
+			 * A `File` object representing the file where this database is stored. Must only be used for
+			 * setting file properties.
+			 */
+			readonly file: Titanium.Filesystem.File;
+
+			/**
+			 * The identifier of the last populated row.
+			 */
+			lastInsertRowId: number;
+
+			/**
+			 * The name of the database.
+			 */
+			name: string;
+
+			/**
+			 * The number of rows affected by the last query.
+			 */
+			rowsAffected: number;
+
+			/**
+			 * Closes the database and releases resources from memory. Once closed, this instance is no
+			 * longer valid and should not be used. On iOS, also closes all <Titanium.Database.ResultSet>
+			 * instances that exist.
+			 */
+			close(): void;
+
+			/**
+			 * Executes an SQL statement against the database and returns a `ResultSet`.
+			 */
+			execute(sql: string, vararg?: string): Titanium.Database.ResultSet;
+
+			/**
+			 * Executes an SQL statement against the database and returns a `ResultSet`.
+			 */
+			execute(sql: string, vararg?: ReadonlyArray<string>): Titanium.Database.ResultSet;
+
+			/**
+			 * Executes an SQL statement against the database and returns a `ResultSet`.
+			 */
+			execute(sql: string, vararg?: any): Titanium.Database.ResultSet;
+
+			/**
+			 * Executes an SQL statement against the database and returns a `ResultSet`.
+			 */
+			execute(sql: string, vararg?: ReadonlyArray<any>): Titanium.Database.ResultSet;
+
+			/**
+			 * Removes the database files for this instance from disk. WARNING: this is a destructive
+			 * operation and cannot be reversed. All data in the database will be lost; use with caution.
+			 */
+			remove(): void;
+
+			/**
+			 * Gets the value of the <Titanium.Database.DB.file> property.
+			 */
+			getFile(): Titanium.Filesystem.File;
+
+			/**
+			 * Gets the value of the <Titanium.Database.DB.lastInsertRowId> property.
+			 */
+			getLastInsertRowId(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Database.DB.lastInsertRowId> property.
+			 */
+			setLastInsertRowId(lastInsertRowId: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Database.DB.name> property.
+			 */
+			getName(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Database.DB.name> property.
+			 */
+			setName(name: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Database.DB.rowsAffected> property.
+			 */
+			getRowsAffected(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Database.DB.rowsAffected> property.
+			 */
+			setRowsAffected(rowsAffected: number): void;
+
+		}
+
+		/**
+		 * The ResultSet instance returned by <Titanium.Database.DB.execute>.
+		 */
+		interface ResultSet extends Titanium.Proxy {
+			/**
+			 * The number of columns in this result set.
+			 */
+			readonly fieldCount: number;
+
+			/**
+			 * The number of rows in this result set.
+			 */
+			readonly rowCount: number;
+
+			/**
+			 * Indicates whether the current row is valid.
+			 */
+			readonly validRow: boolean;
+
+			/**
+			 * Closes this result set and release resources. Once closed, the result set must no longer
+			 * be used.
+			 */
+			close(): void;
+
+			/**
+			 * Retrieves the value for the specified field in the current row,
+			 * and casts it to the specified type (String, Integer, Float or Double.)
+			 */
+			field(index: number, type?: number): string | number | Titanium.Blob;
+
+			/**
+			 * Retrieves the value for the specified field in the current row,
+			 * and casts it to the specified type (String, Integer, Float or Double.)
+			 */
+			fieldByName(name: string, type?: number): string | number | Titanium.Blob;
+
+			/**
+			 * Returns the field name for the specified field index.
+			 */
+			fieldName(index: number): string;
+
+			/**
+			 * Returns the field name for the specified field index.
+			 */
+			getFieldName(index: number): string;
+
+			/**
+			 * Returns whether the current row is valid.
+			 */
+			isValidRow(): boolean;
+
+			/**
+			 * Advances to the next row in the result set and returns `true` if one exists,
+			 * or `false` otherwise.
+			 */
+			next(): boolean;
+
+			/**
+			 * Gets the value of the <Titanium.Database.ResultSet.fieldCount> property.
+			 */
+			getFieldCount(): number;
+
+			/**
+			 * Gets the value of the <Titanium.Database.ResultSet.rowCount> property.
+			 */
+			getRowCount(): number;
+
+			/**
+			 * Gets the value of the <Titanium.Database.ResultSet.validRow> property.
+			 */
+			getValidRow(): boolean;
+
+		}
+
+	}
+
+	/**
+	 * The top level filesystem module, used to access files and directories on the device.
+	 */
+	namespace Filesystem {
+		/**
+		 * Indicates if the proxy will bubble an event to its parent.
+		 */
+		let bubbleParent: boolean;
+
+		/**
+		 * The name of the API that this proxy corresponds to.
+		 */
+		const apiName: string;
+
+		/**
+		 * The Window or TabGroup whose Activity lifecycle should be triggered on the proxy.
+		 */
+		let lifecycleContainer: Titanium.UI.Window | Titanium.UI.TabGroup;
+
+		/**
+		 * Constant for append mode for file operations.
+		 */
+		const MODE_APPEND: number;
+
+		/**
+		 * Constant for read mode for file operations.
+		 */
+		const MODE_READ: number;
+
+		/**
+		 * Constant for write mode for file operations.
+		 */
+		const MODE_WRITE: number;
+
+		/**
+		 * Constant used to set protection key to NSFileProtectionNone in file attributes.
+		 */
+		const IOS_FILE_PROTECTION_NONE: string;
+
+		/**
+		 * Constant used to set protection key to NSFileProtectionComplete in file attributes.
+		 */
+		const IOS_FILE_PROTECTION_COMPLETE: string;
+
+		/**
+		 * Constant used to set protection key to NSFileProtectionCompleteUnlessOpen in file attributes.
+		 */
+		const IOS_FILE_PROTECTION_COMPLETE_UNLESS_OPEN: string;
+
+		/**
+		 * Constant used to set protection key to NSFileProtectionCompleteUntilFirstUserAuthentication in file attributes.
+		 */
+		const IOS_FILE_PROTECTION_COMPLETE_UNTIL_FIRST_USER_AUTHENTICATION: string;
+
+		/**
+		 * Path to the application's internal cache directory.
+		 */
+		const applicationCacheDirectory: string;
+
+		/**
+		 * Path to the application's data directory.
+		 */
+		const applicationDataDirectory: string;
+
+		/**
+		 * Path to the iOS application directory.
+		 */
+		const applicationDirectory: string;
+
+		/**
+		 * Path to the application support directory.
+		 */
+		const applicationSupportDirectory: string;
+
+		/**
+		 * Path to a directory on removable storage, such as SD card.
+		 */
+		const externalStorageDirectory: string;
+
+		/**
+		 * Platform-specific line ending constant.
+		 */
+		const lineEnding: string;
+
+		/**
+		 * Path to the application's resource directory.
+		 */
+		const resourcesDirectory: string;
+
+		/**
+		 * Path to the application's raw resource directory.
+		 */
+		const resRawDirectory: string;
+
+		/**
+		 * Platform-specific path separator constant.
+		 */
+		const separator: string;
+
+		/**
+		 * Path for the application's temporary directory.
+		 */
+		const tempDirectory: string;
+
+		/**
+		 * Adds the specified callback as an event listener for the named event.
+		 */
+		function addEventListener(name: string, callback: (param0: any) => any): void;
+
+		/**
+		 * Removes the specified callback as an event listener for the named event.
+		 */
+		function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+		/**
+		 * Fires a synthesized event to any registered listeners.
+		 */
+		function fireEvent(name: string, event: any): void;
+
+		/**
+		 * Applies the properties to the proxy.
+		 */
+		function applyProperties(props: any): void;
+
+		/**
+		 * Creates a temporary directory and returns a [File](Titanium.Filesystem.File) object representing the new directory.
+		 */
+		function createTempDirectory(): Titanium.Filesystem.File;
+
+		/**
+		 * Creates a temporary file and returns a [File](Titanium.Filesystem.File) object representing the new file.
+		 */
+		function createTempFile(): Titanium.Filesystem.File;
+
+		/**
+		 * Returns a `File` object representing the file identified by the path arguments.
+		 */
+		function getFile(...paths: string[]): Titanium.Filesystem.File;
+
+		/**
+		 * Returns a `Blob` object representing the asset catalog image identified by the path arguments.
+		 */
+		function getAsset(path: string): Titanium.Blob;
+
+		/**
+		 * Returns `true` if the device supports external storage *and* the external storage device is mounted.
+		 */
+		function isExternalStoragePresent(): boolean;
+
+		/**
+		 * Returns `true` if the app has storage permissions.
+		 */
+		function hasStoragePermissions(): boolean;
+
+		/**
+		 * Requests for storage permissions
+		 */
+		function requestStoragePermissions(callback: (param0: RequestStorageAccessResult) => any): void;
+
+		/**
+		 * Opens file using the <Titanium.IOStream> interface.
+		 */
+		function openStream(mode: number, path: string): Titanium.Filesystem.FileStream;
+
+		/**
+		 * Returns the path to the container directory associated with the specified security application group ID.
+		 */
+		function directoryForSuite(suiteName: string): string;
+
+		/**
+		 * Gets the value of the <Titanium.Filesystem.bubbleParent> property.
+		 */
+		function getBubbleParent(): boolean;
+
+		/**
+		 * Sets the value of the <Titanium.Filesystem.bubbleParent> property.
+		 */
+		function setBubbleParent(bubbleParent: boolean): void;
+
+		/**
+		 * Gets the value of the <Titanium.Filesystem.apiName> property.
+		 */
+		function getApiName(): string;
+
+		/**
+		 * Gets the value of the <Titanium.Filesystem.lifecycleContainer> property.
+		 */
+		function getLifecycleContainer(): Titanium.UI.Window | Titanium.UI.TabGroup;
+
+		/**
+		 * Sets the value of the <Titanium.Filesystem.lifecycleContainer> property.
+		 */
+		function setLifecycleContainer(lifecycleContainer: Titanium.UI.Window): void;
+
+		/**
+		 * Sets the value of the <Titanium.Filesystem.lifecycleContainer> property.
+		 */
+		function setLifecycleContainer(lifecycleContainer: Titanium.UI.TabGroup): void;
+
+		/**
+		 * Gets the value of the <Titanium.Filesystem.applicationCacheDirectory> property.
+		 */
+		function getApplicationCacheDirectory(): string;
+
+		/**
+		 * Gets the value of the <Titanium.Filesystem.applicationDataDirectory> property.
+		 */
+		function getApplicationDataDirectory(): string;
+
+		/**
+		 * Gets the value of the <Titanium.Filesystem.applicationDirectory> property.
+		 */
+		function getApplicationDirectory(): string;
+
+		/**
+		 * Gets the value of the <Titanium.Filesystem.applicationSupportDirectory> property.
+		 */
+		function getApplicationSupportDirectory(): string;
+
+		/**
+		 * Gets the value of the <Titanium.Filesystem.externalStorageDirectory> property.
+		 */
+		function getExternalStorageDirectory(): string;
+
+		/**
+		 * Gets the value of the <Titanium.Filesystem.lineEnding> property.
+		 */
+		function getLineEnding(): string;
+
+		/**
+		 * Gets the value of the <Titanium.Filesystem.resourcesDirectory> property.
+		 */
+		function getResourcesDirectory(): string;
+
+		/**
+		 * Gets the value of the <Titanium.Filesystem.resRawDirectory> property.
+		 */
+		function getResRawDirectory(): string;
+
+		/**
+		 * Gets the value of the <Titanium.Filesystem.separator> property.
+		 */
+		function getSeparator(): string;
+
+		/**
+		 * Gets the value of the <Titanium.Filesystem.tempDirectory> property.
+		 */
+		function getTempDirectory(): string;
+
+		/**
+		 * Object representing a path to a file or directory in the device's persistent storage.
+		 */
+		interface File extends Titanium.Proxy {
+			/**
+			 * `true` if the file is executable.
+			 */
+			readonly executable: boolean;
+
+			/**
+			 * Set to `true` if the file is hidden.
+			 */
+			hidden: boolean;
+
+			/**
+			 * Name of the file.
+			 */
+			readonly name: string;
+
+			/**
+			 * Native path associated with this file object, as a file URL.
+			 */
+			readonly nativePath: string;
+
+			/**
+			 * A `File` object representing the parent directory of the file identified by this object.
+			 */
+			readonly parent: Titanium.Filesystem.File;
+
+			/**
+			 * `true` if the file identified by this object is read-only.
+			 */
+			readonly readonly: boolean;
+
+			/**
+			 * Size, in bytes, of the file identified by this object.
+			 */
+			readonly size: number;
+
+			/**
+			 * Value indicating whether or not to back up to a cloud service.
+			 */
+			remoteBackup: boolean;
+
+			/**
+			 * `true` if the file identified by this object is a symbolic link.
+			 */
+			readonly symbolicLink: boolean;
+
+			/**
+			 * `true` if the file identified by this object is writable.
+			 */
+			readonly writable: boolean;
+
+			/**
+			 * `true` if the file identified by this object is writable.
+			 */
+			readonly writeable: boolean;
+
+			/**
+			 * Appends data to the file identified by this file object.
+			 */
+			append(data: string): boolean;
+
+			/**
+			 * Appends data to the file identified by this file object.
+			 */
+			append(data: Titanium.Blob): boolean;
+
+			/**
+			 * Appends data to the file identified by this file object.
+			 */
+			append(data: Titanium.Filesystem.File): boolean;
+
+			/**
+			 * Copies the file identified by this file object to a new path.
+			 */
+			copy(destinationPath: string): boolean;
+
+			/**
+			 * Creates a directory at the path identified by this file object.
+			 */
+			createDirectory(): boolean;
+
+			/**
+			 * Creates a file at the path identified by this file object.
+			 */
+			createFile(): boolean;
+
+			/**
+			 * Returns the creation timestamp for the file identified by this file object.
+			 */
+			createTimestamp(): number;
+
+			/**
+			 * Deletes the directory identified by this file object.
+			 */
+			deleteDirectory(recursive?: boolean): boolean;
+
+			/**
+			 * Deletes the file identified by this file object.
+			 */
+			deleteFile(): boolean;
+
+			/**
+			 * Returns `true` if the file or directory identified by this file object exists on the device.
+			 */
+			exists(): boolean;
+
+			/**
+			 * Returns the extension for the file identified by this file object.
+			 */
+			extension(): string;
+
+			/**
+			 * Returns a listing of the directory identified by this file object, or `null`
+			 * if this object doesn't identify a directory.
+			 */
+			getDirectoryListing(): string[];
+
+			/**
+			 * Returns the path of the parent directory holding the file identified by this
+			 * file object, as a String (deprecated) **or** as a `File` object.
+			 */
+			getParent(): string | Titanium.Filesystem.File;
+
+			/**
+			 * Returns the protection key value of this file object.
+			 * Returns `null` if there's an error.
+			 */
+			getProtectionKey(): string;
+
+			/**
+			 * Returns `true` if this file object represents a directory.
+			 */
+			isDirectory(): boolean;
+
+			/**
+			 * Returns `true` if this file object represents an ordinary file.
+			 */
+			isFile(): boolean;
+
+			/**
+			 * Returns the last modification time for this file.
+			 */
+			modificationTimestamp(): number;
+
+			/**
+			 * Moves the file identified by this file object to another path.
+			 */
+			move(newpath: string): boolean;
+
+			/**
+			 * Opens the file identified by this file object for random access.
+			 */
+			open(mode: number): Titanium.Filesystem.FileStream;
+
+			/**
+			 * Returns the contents of the file identified by this file object as a `Blob`.
+			 */
+			read(): Titanium.Blob;
+
+			/**
+			 * Renames the file identified by this file object.
+			 */
+			rename(newname: string): boolean;
+
+			/**
+			 * Returns the fully-resolved native path associated with this file object.
+			 */
+			resolve(): string;
+
+			/**
+			 * Sets the protection key as an attribute to the file identified by this file object.
+			 */
+			setProtectionKey(fileProtectionType: string): boolean;
+
+			/**
+			 * Returns the amount of free space available on the device where the file identified by this file object is stored.
+			 */
+			spaceAvailable(): number;
+
+			/**
+			 * Writes the specified data to the file identified by this file object.
+			 */
+			write(data: string, append?: boolean): boolean;
+
+			/**
+			 * Writes the specified data to the file identified by this file object.
+			 */
+			write(data: Titanium.Filesystem.File, append?: boolean): boolean;
+
+			/**
+			 * Writes the specified data to the file identified by this file object.
+			 */
+			write(data: Titanium.Blob, append?: boolean): boolean;
+
+			/**
+			 * Gets the value of the <Titanium.Filesystem.File.executable> property.
+			 */
+			getExecutable(): boolean;
+
+			/**
+			 * Gets the value of the <Titanium.Filesystem.File.hidden> property.
+			 */
+			getHidden(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.Filesystem.File.hidden> property.
+			 */
+			setHidden(hidden: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.Filesystem.File.name> property.
+			 */
+			getName(): string;
+
+			/**
+			 * Gets the value of the <Titanium.Filesystem.File.nativePath> property.
+			 */
+			getNativePath(): string;
+
+			/**
+			 * Gets the value of the <Titanium.Filesystem.File.parent> property.
+			 */
+			getParent(): Titanium.Filesystem.File;
+
+			/**
+			 * Gets the value of the <Titanium.Filesystem.File.readonly> property.
+			 */
+			getReadonly(): boolean;
+
+			/**
+			 * Gets the value of the <Titanium.Filesystem.File.size> property.
+			 */
+			getSize(): number;
+
+			/**
+			 * Gets the value of the <Titanium.Filesystem.File.remoteBackup> property.
+			 */
+			getRemoteBackup(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.Filesystem.File.remoteBackup> property.
+			 */
+			setRemoteBackup(remoteBackup: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.Filesystem.File.symbolicLink> property.
+			 */
+			getSymbolicLink(): boolean;
+
+			/**
+			 * Gets the value of the <Titanium.Filesystem.File.writable> property.
+			 */
+			getWritable(): boolean;
+
+			/**
+			 * Gets the value of the <Titanium.Filesystem.File.writeable> property.
+			 */
+			getWriteable(): boolean;
+
+		}
+
+		/**
+		 * Wrapper around `Titanium.Filesystem.File` that implements the `Titanium.IOStream` interface
+		 */
+		interface FileStream extends Titanium.Proxy {
+			/**
+			 * Reads data from this stream into a buffer.
+			 */
+			read(buffer: Titanium.Buffer, offset?: number, length?: number): number;
+
+			/**
+			 * Writes data from a buffer to this stream.
+			 */
+			write(buffer: Titanium.Buffer, offset?: number, length?: number): number;
+
+			/**
+			 * Indicates whether this stream is writable.
+			 */
+			isWritable(): boolean;
+
+			/**
+			 * Indicates whether this stream is readable.
+			 */
+			isReadable(): boolean;
+
+			/**
+			 * closes file stream, exception is thrown on error
+			 */
+			close(): void;
+
+		}
+
+	}
+
+	/**
+	 * The top level Geolocation module. The Geolocation module is used for accessing device location based information.
+	 */
+	namespace Geolocation {
+		/**
+		 * Indicates if the proxy will bubble an event to its parent.
+		 */
+		let bubbleParent: boolean;
+
+		/**
+		 * The name of the API that this proxy corresponds to.
+		 */
+		const apiName: string;
+
+		/**
+		 * The Window or TabGroup whose Activity lifecycle should be triggered on the proxy.
+		 */
+		let lifecycleContainer: Titanium.UI.Window | Titanium.UI.TabGroup;
+
+		/**
+		 * Use with [accuracy](Titanium.Geolocation.accuracy) to request the best
+		 * accuracy available.
+		 */
+		const ACCURACY_BEST: number;
+
+		/**
+		 * Use with [accuracy](Titanium.Geolocation.accuracy) to request location
+		 * updates accurate to the nearest 100 meters.
+		 */
+		const ACCURACY_HUNDRED_METERS: number;
+
+		/**
+		 * Use with [accuracy](Titanium.Geolocation.accuracy) to request location
+		 * updates accurate to the nearest kilometer.
+		 */
+		const ACCURACY_KILOMETER: number;
+
+		/**
+		 * Use with [accuracy](Titanium.Geolocation.accuracy) to request location
+		 * updates accurate to the nearest 10 meters.
+		 */
+		const ACCURACY_NEAREST_TEN_METERS: number;
+
+		/**
+		 * Use with [accuracy](Titanium.Geolocation.accuracy) to request location
+		 * updates accurate to the nearest three kilometers.
+		 */
+		const ACCURACY_THREE_KILOMETERS: number;
+
+		/**
+		 * Use with [accuracy](Titanium.Geolocation.accuracy) to request more
+		 * accurate location updates with higher battery usage.
+		 */
+		const ACCURACY_HIGH: number;
+
+		/**
+		 * Use with [accuracy](Titanium.Geolocation.accuracy) to request highest possible
+		 * accuracy and combine it with additional sensor data.
+		 */
+		const ACCURACY_BEST_FOR_NAVIGATION: number;
+
+		/**
+		 * Use with [accuracy](Titanium.Geolocation.accuracy) to request less
+		 * accurate location updates with lower battery usage.
+		 */
+		const ACCURACY_LOW: number;
+
+		/**
+		 * A [locationServicesAuthorization](Titanium.Geolocation.locationServicesAuthorization) value
+		 * indicating that the application is authorized to use location services.
+		 */
+		const AUTHORIZATION_AUTHORIZED: number;
+
+		/**
+		 * A [locationServicesAuthorization](Titanium.Geolocation.locationServicesAuthorization) value
+		 * indicating that the application is not authorized to use location services, *or*
+		 * location services are disabled.
+		 */
+		const AUTHORIZATION_DENIED: number;
+
+		/**
+		 * A [locationServicesAuthorization](Titanium.Geolocation.locationServicesAuthorization) value
+		 * indicating that the application is not authorized to use location servies *and*
+		 * the user cannot change this application's status.
+		 */
+		const AUTHORIZATION_RESTRICTED: number;
+
+		/**
+		 * A [locationServicesAuthorization](Titanium.Geolocation.locationServicesAuthorization) value
+		 * indicating that the authorization state is unknown.
+		 */
+		const AUTHORIZATION_UNKNOWN: number;
+
+		/**
+		 * A [locationServicesAuthorization](Titanium.Geolocation.locationServicesAuthorization) value
+		 * indicating that the application is authorized to start location services at any time. This authorization
+		 * includes the use of all location services, including monitoring regions and significant location changes.
+		 */
+		const AUTHORIZATION_ALWAYS: number;
+
+		/**
+		 * A [locationServicesAuthorization](Titanium.Geolocation.locationServicesAuthorization) value
+		 * indicating that the application is authorized to start most location services only while running in the foreground.
+		 */
+		const AUTHORIZATION_WHEN_IN_USE: number;
+
+		/**
+		 * Error code indicating that the user denied access to the location service.
+		 */
+		const ERROR_DENIED: number;
+
+		/**
+		 * Error code indicating that the heading could not be determined.
+		 */
+		const ERROR_HEADING_FAILURE: number;
+
+		/**
+		 * Error code indicating that the user's location could not be determined.
+		 */
+		const ERROR_LOCATION_UNKNOWN: number;
+
+		/**
+		 * Error code indicating that the network was unavailable.
+		 */
+		const ERROR_NETWORK: number;
+
+		/**
+		 * Error code indicating that region monitoring is delayed.
+		 */
+		const ERROR_REGION_MONITORING_DELAYED: number;
+
+		/**
+		 * Error code indicating that region monitoring is denied.
+		 */
+		const ERROR_REGION_MONITORING_DENIED: number;
+
+		/**
+		 * Error code indicating a region monitoring failure.
+		 */
+		const ERROR_REGION_MONITORING_FAILURE: number;
+
+		/**
+		 * Specifies the GPS location provider.
+		 */
+		const PROVIDER_GPS: string;
+
+		/**
+		 * Specifies the network location provider.
+		 */
+		const PROVIDER_NETWORK: string;
+
+		/**
+		 * Specifies the passive location provider.
+		 */
+		const PROVIDER_PASSIVE: string;
+
+		/**
+		 * The location data is being used for an unknown activity.
+		 */
+		const ACTIVITYTYPE_OTHER: string;
+
+		/**
+		 * The location data is used for tracking location changes to the automobile specifically during vehicular navigation.
+		 */
+		const ACTIVITYTYPE_AUTOMOTIVE_NAVIGATION: string;
+
+		/**
+		 * The location data is used for tracking any pedestrian-related activity.
+		 */
+		const ACTIVITYTYPE_FITNESS: string;
+
+		/**
+		 * The location data is used for tracking movements of other types of vehicular
+		 * navigation that are not automobile related.
+		 */
+		const ACTIVITYTYPE_OTHER_NAVIGATION: string;
+
+		/**
+		 * Specifies the requested accuracy for location updates.
+		 */
+		let accuracy: number;
+
+		/**
+		 * The minimum change of position (in meters) before a 'location' event is fired.
+		 */
+		let distanceFilter: number;
+
+		/**
+		 * Requested frequency for location updates, in milliseconds.
+		 */
+		let frequency: number;
+
+		/**
+		 * Indicates whether the current device supports a compass.
+		 */
+		const hasCompass: boolean;
+
+		/**
+		 * Minimum heading change (in degrees) before a `heading` event is fired.
+		 */
+		let headingFilter: number;
+
+		/**
+		 * Returns an authorization constant indicating if the application has access to location services.
+		 */
+		let locationServicesAuthorization: number;
+
+		/**
+		 * Indicates if the user has enabled or disabled location services for the device (not the application).
+		 */
+		const locationServicesEnabled: boolean;
+
+		/**
+		 * Determines the preferred location provider.
+		 */
+		let preferredProvider: string;
+
+		/**
+		 * Text to display in the permission dialog when requesting location
+		 * services.
+		 */
+		let purpose: string;
+
+		/**
+		 * Determines whether the compass calibration UI is shown if needed.
+		 */
+		let showCalibration: boolean;
+
+		/**
+		 * Indicates if the location changes should be updated only when a significant change
+		 * in location occurs.
+		 */
+		let trackSignificantLocationChange: boolean;
+
+		/**
+		 * Determines if the app can do background location updates.
+		 */
+		let allowsBackgroundLocationUpdates: boolean;
+
+		/**
+		 * The type of user activity to be associated with the location updates. Available in iOS 6.0 and later.
+		 */
+		let activityType: number;
+
+		/**
+		 * Indicates whether the location updates may be paused. Available in iOS 6.0 and later.
+		 */
+		let pauseLocationUpdateAutomatically: boolean;
+
+		/**
+		 * JSON representation of the last geolocation received.
+		 */
+		const lastGeolocation: string;
+
+		/**
+		 * Adds the specified callback as an event listener for the named event.
+		 */
+		function addEventListener(name: string, callback: (param0: any) => any): void;
+
+		/**
+		 * Removes the specified callback as an event listener for the named event.
+		 */
+		function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+		/**
+		 * Fires a synthesized event to any registered listeners.
+		 */
+		function fireEvent(name: string, event: any): void;
+
+		/**
+		 * Applies the properties to the proxy.
+		 */
+		function applyProperties(props: any): void;
+
+		/**
+		 * Resolves an address to a location.
+		 */
+		function forwardGeocoder(address: string, callback: (param0: ForwardGeocodeResponse) => any): void;
+
+		/**
+		 * Retrieves the current compass heading.
+		 */
+		function getCurrentHeading(callback: (param0: HeadingResponse) => any): void;
+
+		/**
+		 * Retrieves the last known location from the device.
+		 */
+		function getCurrentPosition(callback: (param0: LocationResults) => any): void;
+
+		/**
+		 * Returns `true` if the app has location access.
+		 */
+		function hasLocationPermissions(authorizationType: number): boolean;
+
+		/**
+		 * Requests for location access.
+		 */
+		function requestLocationPermissions(authorizationType: number, callback: (param0: LocationAuthorizationResponse) => any): void;
+
+		/**
+		 * Tries to resolve a location to an address.
+		 */
+		function reverseGeocoder(latitude: number, longitude: number, callback: (param0: ReverseGeocodeResponse) => any): void;
+
+		/**
+		 * Gets the value of the <Titanium.Geolocation.bubbleParent> property.
+		 */
+		function getBubbleParent(): boolean;
+
+		/**
+		 * Sets the value of the <Titanium.Geolocation.bubbleParent> property.
+		 */
+		function setBubbleParent(bubbleParent: boolean): void;
+
+		/**
+		 * Gets the value of the <Titanium.Geolocation.apiName> property.
+		 */
+		function getApiName(): string;
+
+		/**
+		 * Gets the value of the <Titanium.Geolocation.lifecycleContainer> property.
+		 */
+		function getLifecycleContainer(): Titanium.UI.Window | Titanium.UI.TabGroup;
+
+		/**
+		 * Sets the value of the <Titanium.Geolocation.lifecycleContainer> property.
+		 */
+		function setLifecycleContainer(lifecycleContainer: Titanium.UI.Window): void;
+
+		/**
+		 * Sets the value of the <Titanium.Geolocation.lifecycleContainer> property.
+		 */
+		function setLifecycleContainer(lifecycleContainer: Titanium.UI.TabGroup): void;
+
+		/**
+		 * Gets the value of the <Titanium.Geolocation.accuracy> property.
+		 */
+		function getAccuracy(): number;
+
+		/**
+		 * Sets the value of the <Titanium.Geolocation.accuracy> property.
+		 */
+		function setAccuracy(accuracy: number): void;
+
+		/**
+		 * Gets the value of the <Titanium.Geolocation.distanceFilter> property.
+		 */
+		function getDistanceFilter(): number;
+
+		/**
+		 * Sets the value of the <Titanium.Geolocation.distanceFilter> property.
+		 */
+		function setDistanceFilter(distanceFilter: number): void;
+
+		/**
+		 * Gets the value of the <Titanium.Geolocation.frequency> property.
+		 */
+		function getFrequency(): number;
+
+		/**
+		 * Sets the value of the <Titanium.Geolocation.frequency> property.
+		 */
+		function setFrequency(frequency: number): void;
+
+		/**
+		 * Gets the value of the <Titanium.Geolocation.hasCompass> property.
+		 */
+		function getHasCompass(): boolean;
+
+		/**
+		 * Gets the value of the <Titanium.Geolocation.headingFilter> property.
+		 */
+		function getHeadingFilter(): number;
+
+		/**
+		 * Sets the value of the <Titanium.Geolocation.headingFilter> property.
+		 */
+		function setHeadingFilter(headingFilter: number): void;
+
+		/**
+		 * Gets the value of the <Titanium.Geolocation.locationServicesAuthorization> property.
+		 */
+		function getLocationServicesAuthorization(): number;
+
+		/**
+		 * Sets the value of the <Titanium.Geolocation.locationServicesAuthorization> property.
+		 */
+		function setLocationServicesAuthorization(locationServicesAuthorization: number): void;
+
+		/**
+		 * Gets the value of the <Titanium.Geolocation.locationServicesEnabled> property.
+		 */
+		function getLocationServicesEnabled(): boolean;
+
+		/**
+		 * Gets the value of the <Titanium.Geolocation.preferredProvider> property.
+		 */
+		function getPreferredProvider(): string;
+
+		/**
+		 * Sets the value of the <Titanium.Geolocation.preferredProvider> property.
+		 */
+		function setPreferredProvider(preferredProvider: string): void;
+
+		/**
+		 * Gets the value of the <Titanium.Geolocation.purpose> property.
+		 */
+		function getPurpose(): string;
+
+		/**
+		 * Sets the value of the <Titanium.Geolocation.purpose> property.
+		 */
+		function setPurpose(purpose: string): void;
+
+		/**
+		 * Gets the value of the <Titanium.Geolocation.showCalibration> property.
+		 */
+		function getShowCalibration(): boolean;
+
+		/**
+		 * Sets the value of the <Titanium.Geolocation.showCalibration> property.
+		 */
+		function setShowCalibration(showCalibration: boolean): void;
+
+		/**
+		 * Gets the value of the <Titanium.Geolocation.trackSignificantLocationChange> property.
+		 */
+		function getTrackSignificantLocationChange(): boolean;
+
+		/**
+		 * Sets the value of the <Titanium.Geolocation.trackSignificantLocationChange> property.
+		 */
+		function setTrackSignificantLocationChange(trackSignificantLocationChange: boolean): void;
+
+		/**
+		 * Gets the value of the <Titanium.Geolocation.allowsBackgroundLocationUpdates> property.
+		 */
+		function getAllowsBackgroundLocationUpdates(): boolean;
+
+		/**
+		 * Sets the value of the <Titanium.Geolocation.allowsBackgroundLocationUpdates> property.
+		 */
+		function setAllowsBackgroundLocationUpdates(allowsBackgroundLocationUpdates: boolean): void;
+
+		/**
+		 * Gets the value of the <Titanium.Geolocation.activityType> property.
+		 */
+		function getActivityType(): number;
+
+		/**
+		 * Sets the value of the <Titanium.Geolocation.activityType> property.
+		 */
+		function setActivityType(activityType: number): void;
+
+		/**
+		 * Gets the value of the <Titanium.Geolocation.pauseLocationUpdateAutomatically> property.
+		 */
+		function getPauseLocationUpdateAutomatically(): boolean;
+
+		/**
+		 * Sets the value of the <Titanium.Geolocation.pauseLocationUpdateAutomatically> property.
+		 */
+		function setPauseLocationUpdateAutomatically(pauseLocationUpdateAutomatically: boolean): void;
+
+		/**
+		 * Gets the value of the <Titanium.Geolocation.lastGeolocation> property.
+		 */
+		function getLastGeolocation(): string;
+
+
+		/**
+		 * Module for Android-specific geolocation functionality.
+		 */
+		namespace Android {
+			/**
+			 * Indicates if the proxy will bubble an event to its parent.
+			 */
+			let bubbleParent: boolean;
+
+			/**
+			 * The name of the API that this proxy corresponds to.
+			 */
+			const apiName: string;
+
+			/**
+			 * The Window or TabGroup whose Activity lifecycle should be triggered on the proxy.
+			 */
+			let lifecycleContainer: Titanium.UI.Window | Titanium.UI.TabGroup;
+
+			/**
+			 * Set to `true` to enable manual configuration of location updates through this module.
+			 */
+			let manualMode: boolean;
+
+			/**
+			 * Adds the specified callback as an event listener for the named event.
+			 */
+			function addEventListener(name: string, callback: (param0: any) => any): void;
+
+			/**
+			 * Removes the specified callback as an event listener for the named event.
+			 */
+			function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+			/**
+			 * Fires a synthesized event to any registered listeners.
+			 */
+			function fireEvent(name: string, event: any): void;
+
+			/**
+			 * Applies the properties to the proxy.
+			 */
+			function applyProperties(props: any): void;
+
+			/**
+			 * Adds and enables the specified location provider, possibly replacing an existing one.
+			 */
+			function addLocationProvider(provider: Titanium.Geolocation.Android.LocationProvider): void;
+
+			/**
+			 * Disables and removes the specified location provider.
+			 */
+			function removeLocationProvider(provider: Titanium.Geolocation.Android.LocationProvider): void;
+
+			/**
+			 * Adds and enables the specified location rule.
+			 */
+			function addLocationRule(rule: Titanium.Geolocation.Android.LocationRule): void;
+
+			/**
+			 * Disables and removes the specified location rule.
+			 */
+			function removeLocationRule(rule: Titanium.Geolocation.Android.LocationRule): void;
+
+			/**
+			 * Gets the value of the <Titanium.Geolocation.Android.bubbleParent> property.
+			 */
+			function getBubbleParent(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.Geolocation.Android.bubbleParent> property.
+			 */
+			function setBubbleParent(bubbleParent: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.Geolocation.Android.apiName> property.
+			 */
+			function getApiName(): string;
+
+			/**
+			 * Gets the value of the <Titanium.Geolocation.Android.lifecycleContainer> property.
+			 */
+			function getLifecycleContainer(): Titanium.UI.Window | Titanium.UI.TabGroup;
+
+			/**
+			 * Sets the value of the <Titanium.Geolocation.Android.lifecycleContainer> property.
+			 */
+			function setLifecycleContainer(lifecycleContainer: Titanium.UI.Window): void;
+
+			/**
+			 * Sets the value of the <Titanium.Geolocation.Android.lifecycleContainer> property.
+			 */
+			function setLifecycleContainer(lifecycleContainer: Titanium.UI.TabGroup): void;
+
+			/**
+			 * Gets the value of the <Titanium.Geolocation.Android.manualMode> property.
+			 */
+			function getManualMode(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.Geolocation.Android.manualMode> property.
+			 */
+			function setManualMode(manualMode: boolean): void;
+
+			/**
+			 * Creates and returns an instance of <Titanium.Geolocation.Android.LocationProvider>.
+			 */
+			function createLocationProvider(parameters?: any): Titanium.Geolocation.Android.LocationProvider;
+
+			/**
+			 * Creates and returns an instance of <Titanium.Geolocation.Android.LocationRule>.
+			 */
+			function createLocationRule(parameters?: any): Titanium.Geolocation.Android.LocationRule;
+
+			/**
+			 * Represents a source of location information, such as GPS.
+			 */
+			interface LocationProvider extends Titanium.Proxy {
+				/**
+				 * Type of location provider: [PROVIDER_GPS](Titanium.Geolocation.PROVIDER_GPS),
+				 * [PROVIDER_NETWORK](Titanium.Geolocation.PROVIDER_NETWORK), or
+				 * [PROVIDER_PASSIVE](Titanium.Geolocation.PROVIDER_PASSIVE).
+				 */
+				name: string;
+
+				/**
+				 * Limits the frequency of location updates to no more than one per `minUpdateTime` seconds.
+				 */
+				minUpdateTime: number;
+
+				/**
+				 * Don't send a location update unless the location has changed at least `minUpdateDistance`
+				 * meters since the previous update.
+				 */
+				minUpdateDistance: number;
+
+				/**
+				 * Gets the value of the <Titanium.Geolocation.Android.LocationProvider.name> property.
+				 */
+				getName(): string;
+
+				/**
+				 * Sets the value of the <Titanium.Geolocation.Android.LocationProvider.name> property.
+				 */
+				setName(name: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.Geolocation.Android.LocationProvider.minUpdateTime> property.
+				 */
+				getMinUpdateTime(): number;
+
+				/**
+				 * Sets the value of the <Titanium.Geolocation.Android.LocationProvider.minUpdateTime> property.
+				 */
+				setMinUpdateTime(minUpdateTime: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.Geolocation.Android.LocationProvider.minUpdateDistance> property.
+				 */
+				getMinUpdateDistance(): number;
+
+				/**
+				 * Sets the value of the <Titanium.Geolocation.Android.LocationProvider.minUpdateDistance> property.
+				 */
+				setMinUpdateDistance(minUpdateDistance: number): void;
+
+			}
+
+			/**
+			 * A location rule to filter the results returned by location providers.
+			 */
+			interface LocationRule extends Titanium.Proxy {
+				/**
+				 * If specified, this rule only applies to updates generated
+				 * by the specified provider. If `null`, this rule applies to all updates.
+				 */
+				name: string;
+
+				/**
+				 * Minimum accuracy required for a location update.
+				 */
+				accuracy: number;
+
+				/**
+				 * Controls the frequency of location updates.
+				 */
+				minAge: number;
+
+				/**
+				 * Controls the freshness of location updates. Do not forward an update
+				 * unless it is newer than `maxAge` milliseconds.
+				 */
+				maxAge: number;
+
+				/**
+				 * Gets the value of the <Titanium.Geolocation.Android.LocationRule.name> property.
+				 */
+				getName(): string;
+
+				/**
+				 * Sets the value of the <Titanium.Geolocation.Android.LocationRule.name> property.
+				 */
+				setName(name: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.Geolocation.Android.LocationRule.accuracy> property.
+				 */
+				getAccuracy(): number;
+
+				/**
+				 * Sets the value of the <Titanium.Geolocation.Android.LocationRule.accuracy> property.
+				 */
+				setAccuracy(accuracy: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.Geolocation.Android.LocationRule.minAge> property.
+				 */
+				getMinAge(): number;
+
+				/**
+				 * Sets the value of the <Titanium.Geolocation.Android.LocationRule.minAge> property.
+				 */
+				setMinAge(minAge: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.Geolocation.Android.LocationRule.maxAge> property.
+				 */
+				getMaxAge(): number;
+
+				/**
+				 * Sets the value of the <Titanium.Geolocation.Android.LocationRule.maxAge> property.
+				 */
+				setMaxAge(maxAge: number): void;
+
+			}
+
 		}
 	}
-	export enum Accelerometer {
+
+	/**
+	 * The Gesture module is responsible for high-level device gestures such as orientation changes
+	 * and shake gestures.
+	 */
+	namespace Gesture {
+		/**
+		 * Indicates if the proxy will bubble an event to its parent.
+		 */
+		let bubbleParent: boolean;
+
+		/**
+		 * The name of the API that this proxy corresponds to.
+		 */
+		const apiName: string;
+
+		/**
+		 * The Window or TabGroup whose Activity lifecycle should be triggered on the proxy.
+		 */
+		let lifecycleContainer: Titanium.UI.Window | Titanium.UI.TabGroup;
+
+		/**
+		 * Indicates if the device is currently held in portrait form.
+		 */
+		const portrait: boolean;
+
+		/**
+		 * Indicates if the device is currently held in landscape form.
+		 */
+		const landscape: boolean;
+
+		/**
+		 * Orientation of the device.
+		 */
+		const orientation: number;
+
+		/**
+		 * Adds the specified callback as an event listener for the named event.
+		 */
+		function addEventListener(name: string, callback: (param0: any) => any): void;
+
+		/**
+		 * Removes the specified callback as an event listener for the named event.
+		 */
+		function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+		/**
+		 * Fires a synthesized event to any registered listeners.
+		 */
+		function fireEvent(name: string, event: any): void;
+
+		/**
+		 * Applies the properties to the proxy.
+		 */
+		function applyProperties(props: any): void;
+
+		/**
+		 * Returns whether or not the device is currently held in landscape form.
+		 */
+		function isLandscape(): boolean;
+
+		/**
+		 * Returns whether or not the device is currently held in portrait form.
+		 */
+		function isPortrait(): boolean;
+
+		/**
+		 * Gets the value of the <Titanium.Gesture.bubbleParent> property.
+		 */
+		function getBubbleParent(): boolean;
+
+		/**
+		 * Sets the value of the <Titanium.Gesture.bubbleParent> property.
+		 */
+		function setBubbleParent(bubbleParent: boolean): void;
+
+		/**
+		 * Gets the value of the <Titanium.Gesture.apiName> property.
+		 */
+		function getApiName(): string;
+
+		/**
+		 * Gets the value of the <Titanium.Gesture.lifecycleContainer> property.
+		 */
+		function getLifecycleContainer(): Titanium.UI.Window | Titanium.UI.TabGroup;
+
+		/**
+		 * Sets the value of the <Titanium.Gesture.lifecycleContainer> property.
+		 */
+		function setLifecycleContainer(lifecycleContainer: Titanium.UI.Window): void;
+
+		/**
+		 * Sets the value of the <Titanium.Gesture.lifecycleContainer> property.
+		 */
+		function setLifecycleContainer(lifecycleContainer: Titanium.UI.TabGroup): void;
+
+		/**
+		 * Gets the value of the <Titanium.Gesture.orientation> property.
+		 */
+		function getOrientation(): number;
 
 	}
-	export interface Utils  {
-		base64decode (obj: string) : Ti.Blob;
-		base64decode (obj: Ti.Blob) : Ti.Blob;
-		base64encode (obj: string) : Ti.Blob;
-		base64encode (obj: Ti.Blob) : Ti.Blob;
-		base64encode (obj: Ti.Filesystem.File) : Ti.Blob;
-		md5HexDigest (obj: string) : string;
-		md5HexDigest (obj: Ti.Blob) : string;
-		sha1 (obj: string) : string;
-		sha1 (obj: Ti.Blob) : string;
-		sha256 (obj: string) : string;
-		sha256 (obj: Ti.Blob) : string;
+
+	/**
+	 * The top level Locale module.
+	 */
+	namespace Locale {
+		/**
+		 * Indicates if the proxy will bubble an event to its parent.
+		 */
+		let bubbleParent: boolean;
+
+		/**
+		 * The name of the API that this proxy corresponds to.
+		 */
+		const apiName: string;
+
+		/**
+		 * The Window or TabGroup whose Activity lifecycle should be triggered on the proxy.
+		 */
+		let lifecycleContainer: Titanium.UI.Window | Titanium.UI.TabGroup;
+
+		/**
+		 * Country of the current system locale, as an ISO 2-letter code.
+		 */
+		const currentCountry: string;
+
+		/**
+		 * Language of the current system locale, as an ISO 2-letter code.
+		 */
+		const currentLanguage: string;
+
+		/**
+		 * Current system locale, as a combination of ISO 2-letter language and country codes.
+		 */
+		const currentLocale: string;
+
+		/**
+		 * Adds the specified callback as an event listener for the named event.
+		 */
+		function addEventListener(name: string, callback: (param0: any) => any): void;
+
+		/**
+		 * Removes the specified callback as an event listener for the named event.
+		 */
+		function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+		/**
+		 * Fires a synthesized event to any registered listeners.
+		 */
+		function fireEvent(name: string, event: any): void;
+
+		/**
+		 * Applies the properties to the proxy.
+		 */
+		function applyProperties(props: any): void;
+
+		/**
+		 * Formats a telephone number according to the current system locale.
+		 */
+		function formatTelephoneNumber(number: string): string;
+
+		/**
+		 * Returns the ISO 3-letter currency code for the specified locale.
+		 */
+		function getCurrencyCode(locale: string): string;
+
+		/**
+		 * Returns the currency symbol for the specified currency code.
+		 */
+		function getCurrencySymbol(currencyCode: string): string;
+
+		/**
+		 * Sets the current language of the application.
+		 */
+		function setLanguage(language: string): void;
+
+		/**
+		 * Returns the currency symbol for the specified locale.
+		 */
+		function getLocaleCurrencySymbol(locale: string): string;
+
+		/**
+		 * Returns a string, localized according to the current system locale using the appropriate
+		 * `/i18n/LANG/strings.xml` localization file.
+		 */
+		function getString(key: string, hint?: string): string;
+
+		/**
+		 * Gets the value of the <Titanium.Locale.bubbleParent> property.
+		 */
+		function getBubbleParent(): boolean;
+
+		/**
+		 * Sets the value of the <Titanium.Locale.bubbleParent> property.
+		 */
+		function setBubbleParent(bubbleParent: boolean): void;
+
+		/**
+		 * Gets the value of the <Titanium.Locale.apiName> property.
+		 */
+		function getApiName(): string;
+
+		/**
+		 * Gets the value of the <Titanium.Locale.lifecycleContainer> property.
+		 */
+		function getLifecycleContainer(): Titanium.UI.Window | Titanium.UI.TabGroup;
+
+		/**
+		 * Sets the value of the <Titanium.Locale.lifecycleContainer> property.
+		 */
+		function setLifecycleContainer(lifecycleContainer: Titanium.UI.Window): void;
+
+		/**
+		 * Sets the value of the <Titanium.Locale.lifecycleContainer> property.
+		 */
+		function setLifecycleContainer(lifecycleContainer: Titanium.UI.TabGroup): void;
+
+		/**
+		 * Gets the value of the <Titanium.Locale.currentCountry> property.
+		 */
+		function getCurrentCountry(): string;
+
+		/**
+		 * Gets the value of the <Titanium.Locale.currentLanguage> property.
+		 */
+		function getCurrentLanguage(): string;
+
+		/**
+		 * Gets the value of the <Titanium.Locale.currentLocale> property.
+		 */
+		function getCurrentLocale(): string;
+
 	}
-	export interface Event  {
-		bubbles : boolean;
-		cancelBubble : boolean;
-		source : any;
-		type : string;
+
+	/**
+	 * The top level Map module.  The Map module is used for creating in-application native maps.
+	 */
+	namespace Map {
+		/**
+		 * Indicates if the proxy will bubble an event to its parent.
+		 */
+		let bubbleParent: boolean;
+
+		/**
+		 * The name of the API that this proxy corresponds to.
+		 */
+		const apiName: string;
+
+		/**
+		 * The Window or TabGroup whose Activity lifecycle should be triggered on the proxy.
+		 */
+		let lifecycleContainer: Titanium.UI.Window | Titanium.UI.TabGroup;
+
+		/**
+		 * Used in the [pinchangedragstate](Titanium.Map.View.pinchangedragstate) event
+		 * to indicate that the annotation is not being dragged.
+		 */
+		const ANNOTATION_DRAG_STATE_NONE: number;
+
+		/**
+		 * Used in the [pinchangedragstate](Titanium.Map.View.pinchangedragstate) event
+		 * to indicate that the user started dragging the annotation.
+		 */
+		const ANNOTATION_DRAG_STATE_START: number;
+
+		/**
+		 * Used in the [pinchangedragstate](Titanium.Map.View.pinchangedragstate) event
+		 * to indicate that the user moved the annotation.
+		 */
+		const ANNOTATION_DRAG_STATE_DRAG: number;
+
+		/**
+		 * Used in the [pinchangedragstate](Titanium.Map.View.pinchangedragstate) event
+		 * to indicate that the user canceled the drag action.
+		 */
+		const ANNOTATION_DRAG_STATE_CANCEL: number;
+
+		/**
+		 * Used in the [pinchangedragstate](Titanium.Map.View.pinchangedragstate) event
+		 * to indicate that the user finished moving the annotation.
+		 */
+		const ANNOTATION_DRAG_STATE_END: number;
+
+		/**
+		 * Color constant used to set a map annotation to green via the
+		 * <Titanium.Map.Annotation.pincolor> property.
+		 */
+		const ANNOTATION_GREEN: number;
+
+		/**
+		 * Color constant used to set a map annotation to purple via the
+		 * <Titanium.Map.Annotation.pincolor> property.
+		 */
+		const ANNOTATION_PURPLE: number;
+
+		/**
+		 * Color constant used to set a map annotation to red via the
+		 * <Titanium.Map.Annotation.pincolor> property.
+		 */
+		const ANNOTATION_RED: number;
+
+		/**
+		 * Used with [mapType](Titanium.Map.View.mapType) to display a satellite image of the area with road and road name information layered on top.
+		 */
+		const HYBRID_TYPE: number;
+
+		/**
+		 * Used with [mapType](Titanium.Map.View.mapType) to display satellite imagery of the area.
+		 */
+		const SATELLITE_TYPE: number;
+
+		/**
+		 * Used with [mapType](Titanium.Map.View.mapType) to display a street map that shows the position of all roads and some road names.
+		 */
+		const STANDARD_TYPE: number;
+
+		/**
+		 * Adds the specified callback as an event listener for the named event.
+		 */
+		function addEventListener(name: string, callback: (param0: any) => any): void;
+
+		/**
+		 * Removes the specified callback as an event listener for the named event.
+		 */
+		function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+		/**
+		 * Fires a synthesized event to any registered listeners.
+		 */
+		function fireEvent(name: string, event: any): void;
+
+		/**
+		 * Applies the properties to the proxy.
+		 */
+		function applyProperties(props: any): void;
+
+		/**
+		 * Creates and returns an instance of <Titanium.Map.Annotation>.
+		 */
+		function createAnnotation(parameters?: any): Titanium.Map.Annotation;
+
+		/**
+		 * Gets the value of the <Titanium.Map.bubbleParent> property.
+		 */
+		function getBubbleParent(): boolean;
+
+		/**
+		 * Sets the value of the <Titanium.Map.bubbleParent> property.
+		 */
+		function setBubbleParent(bubbleParent: boolean): void;
+
+		/**
+		 * Gets the value of the <Titanium.Map.apiName> property.
+		 */
+		function getApiName(): string;
+
+		/**
+		 * Gets the value of the <Titanium.Map.lifecycleContainer> property.
+		 */
+		function getLifecycleContainer(): Titanium.UI.Window | Titanium.UI.TabGroup;
+
+		/**
+		 * Sets the value of the <Titanium.Map.lifecycleContainer> property.
+		 */
+		function setLifecycleContainer(lifecycleContainer: Titanium.UI.Window): void;
+
+		/**
+		 * Sets the value of the <Titanium.Map.lifecycleContainer> property.
+		 */
+		function setLifecycleContainer(lifecycleContainer: Titanium.UI.TabGroup): void;
+
+		/**
+		 * Creates and returns an instance of <Titanium.Map.View>.
+		 */
+		function createView(parameters?: any): Titanium.Map.View;
+
+		/**
+		 * Represents a labeled point of interest on the map that the user can click on.
+		 */
+		interface Annotation extends Titanium.Proxy {
+			/**
+			 * Boolean to indicate whether the pin should animate when dropped.
+			 */
+			animate: boolean;
+
+			/**
+			 * Defines whether the annotation view is able to display extra information in a callout bubble.
+			 */
+			canShowCallout: boolean;
+
+			/**
+			 * Defines a center offset point for the annotation.
+			 */
+			centerOffset: Point;
+
+			/**
+			 * Defines a custom view to be used by the annotation.
+			 */
+			customView: Titanium.UI.View;
+
+			/**
+			 * Determines whether the pin can be dragged by the user.
+			 */
+			draggable: boolean;
+
+			/**
+			 * Image to use for the the pin.
+			 */
+			image: string | Titanium.Blob;
+
+			/**
+			 * Latitude of the annotation, in decimal degrees.
+			 */
+			latitude: number;
+
+			/**
+			 * Longitude of the annotation, in decimal degrees.
+			 */
+			longitude: number;
+
+			/**
+			 * Left button image on the annotation, specified as an image URL or an iOS
+			 * button constant.
+			 */
+			leftButton: number | string;
+
+			/**
+			 * Left view that is displayed on the annotation.
+			 */
+			leftView: Titanium.UI.View;
+
+			/**
+			 * Image for the pin instead of the default image.
+			 */
+			pinImage: string;
+
+			/**
+			 * Pin color. Specify one of: <Titanium.Map.ANNOTATION_GREEN>, <Titanium.Map.ANNOTATION_PURPLE>
+			 * or <Titanium.Map.ANNOTATION_RED>.
+			 */
+			pincolor: number;
+
+			/**
+			 * Right button image on the annotation, specified as an image URL or an iOS
+			 * button constant.
+			 */
+			rightButton: number | string;
+
+			/**
+			 * Right view that is displayed on the annotation.
+			 */
+			rightView: Titanium.UI.View;
+
+			/**
+			 * Secondary title of the annotation view.
+			 */
+			subtitle: string;
+
+			/**
+			 * Key in the locale file to use for the subtitle property.
+			 */
+			subtitleid: string;
+
+			/**
+			 * Primary title of the annotation view.
+			 */
+			title: string;
+
+			/**
+			 * Key in the locale file to use for the title property.
+			 */
+			titleid: string;
+
+			/**
+			 * Gets the value of the <Titanium.Map.Annotation.animate> property.
+			 */
+			getAnimate(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.Map.Annotation.animate> property.
+			 */
+			setAnimate(animate: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.Map.Annotation.canShowCallout> property.
+			 */
+			getCanShowCallout(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.Map.Annotation.canShowCallout> property.
+			 */
+			setCanShowCallout(canShowCallout: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.Map.Annotation.centerOffset> property.
+			 */
+			getCenterOffset(): Point;
+
+			/**
+			 * Sets the value of the <Titanium.Map.Annotation.centerOffset> property.
+			 */
+			setCenterOffset(centerOffset: Point): void;
+
+			/**
+			 * Gets the value of the <Titanium.Map.Annotation.customView> property.
+			 */
+			getCustomView(): Titanium.UI.View;
+
+			/**
+			 * Sets the value of the <Titanium.Map.Annotation.customView> property.
+			 */
+			setCustomView(customView: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.Map.Annotation.draggable> property.
+			 */
+			getDraggable(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.Map.Annotation.draggable> property.
+			 */
+			setDraggable(draggable: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.Map.Annotation.image> property.
+			 */
+			getImage(): string | Titanium.Blob;
+
+			/**
+			 * Sets the value of the <Titanium.Map.Annotation.image> property.
+			 */
+			setImage(image: string): void;
+
+			/**
+			 * Sets the value of the <Titanium.Map.Annotation.image> property.
+			 */
+			setImage(image: Titanium.Blob): void;
+
+			/**
+			 * Gets the value of the <Titanium.Map.Annotation.latitude> property.
+			 */
+			getLatitude(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Map.Annotation.latitude> property.
+			 */
+			setLatitude(latitude: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Map.Annotation.longitude> property.
+			 */
+			getLongitude(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Map.Annotation.longitude> property.
+			 */
+			setLongitude(longitude: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Map.Annotation.leftButton> property.
+			 */
+			getLeftButton(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.Map.Annotation.leftButton> property.
+			 */
+			setLeftButton(leftButton: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.Map.Annotation.leftButton> property.
+			 */
+			setLeftButton(leftButton: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Map.Annotation.leftView> property.
+			 */
+			getLeftView(): Titanium.UI.View;
+
+			/**
+			 * Sets the value of the <Titanium.Map.Annotation.leftView> property.
+			 */
+			setLeftView(leftView: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.Map.Annotation.pinImage> property.
+			 */
+			getPinImage(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Map.Annotation.pinImage> property.
+			 */
+			setPinImage(pinImage: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Map.Annotation.pincolor> property.
+			 */
+			getPincolor(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Map.Annotation.pincolor> property.
+			 */
+			setPincolor(pincolor: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Map.Annotation.rightButton> property.
+			 */
+			getRightButton(): number | string;
+
+			/**
+			 * Sets the value of the <Titanium.Map.Annotation.rightButton> property.
+			 */
+			setRightButton(rightButton: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.Map.Annotation.rightButton> property.
+			 */
+			setRightButton(rightButton: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Map.Annotation.rightView> property.
+			 */
+			getRightView(): Titanium.UI.View;
+
+			/**
+			 * Sets the value of the <Titanium.Map.Annotation.rightView> property.
+			 */
+			setRightView(rightView: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.Map.Annotation.subtitle> property.
+			 */
+			getSubtitle(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Map.Annotation.subtitle> property.
+			 */
+			setSubtitle(subtitle: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Map.Annotation.subtitleid> property.
+			 */
+			getSubtitleid(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Map.Annotation.subtitleid> property.
+			 */
+			setSubtitleid(subtitleid: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Map.Annotation.title> property.
+			 */
+			getTitle(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Map.Annotation.title> property.
+			 */
+			setTitle(title: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Map.Annotation.titleid> property.
+			 */
+			getTitleid(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Map.Annotation.titleid> property.
+			 */
+			setTitleid(titleid: string): void;
+
+		}
+
+		/**
+		 * Map view is used for embedding native mapping capabilities as a view in your application.
+		 */
+		interface View extends Titanium.UI.View {
+			/**
+			 * An array of annotations to add to the map.
+			 */
+			annotations: Titanium.Map.Annotation[];
+
+			/**
+			 * Hide the annotation when clicking in the map view outside of the annotation.
+			 */
+			hideAnnotationWhenTouchMap: boolean;
+
+			/**
+			 * Map type, either: <Titanium.Map.STANDARD_TYPE>, <Titanium.Map.SATELLITE_TYPE> or <Titanium.Map.HYBRID_TYPE>.
+			 */
+			mapType: number;
+
+			/**
+			 * A dictionary specifying the location and zoom level of the map.
+			 * On the iOS platform, this property can only be set after the map view is loaded.
+			 * To ensure this property is set when the application starts, wait for the
+			 * [complete][Titanium.UI.Map-event-complete] event.
+			 */
+			region: MapRegionType;
+
+			/**
+			 * Boolean indicating if the map region should be modified
+			 * to fit the map view's aspect ratio.
+			 */
+			regionFit: boolean;
+
+			/**
+			 * Boolean indicating if the user's current device location should be shown on the
+			 * map.
+			 */
+			userLocation: boolean;
+
+			/**
+			 * The amount of north-to-south distance displayed on the map, measured in decimal degrees.
+			 */
+			readonly latitudeDelta: number;
+
+			/**
+			 * The amount of east-to-west distance displayed on the map, measured in decimal degrees.
+			 */
+			readonly longitudeDelta: number;
+
+			/**
+			 * Adds a new annotation to the map.
+			 */
+			addAnnotation(annotation: any): void;
+
+			/**
+			 * Adds one or more new annotations to the map.
+			 */
+			addAnnotations(annotations: any): void;
+
+			/**
+			 * Adds a route to the map.
+			 */
+			addRoute(route: MapRouteType): void;
+
+			/**
+			 * Deselects the specified annotation, so the main annotation is hidden and only
+			 * a pin image is shown.
+			 */
+			deselectAnnotation(annotation: string): void;
+
+			/**
+			 * Deselects the specified annotation, so the main annotation is hidden and only
+			 * a pin image is shown.
+			 */
+			deselectAnnotation(annotation: Titanium.Map.Annotation): void;
+
+			/**
+			 * Removes all annotations from the map.
+			 */
+			removeAllAnnotations(): void;
+
+			/**
+			 * Removes an existing annotation from the map.
+			 */
+			removeAnnotation(annotation: string): void;
+
+			/**
+			 * Removes an existing annotation from the map.
+			 */
+			removeAnnotation(annotation: Titanium.Map.Annotation): void;
+
+			/**
+			 * Removes one or more existing annotations from the map.
+			 */
+			removeAnnotations(annotations: ReadonlyArray<string>): void;
+
+			/**
+			 * Removes one or more existing annotations from the map.
+			 */
+			removeAnnotations(annotations: ReadonlyArray<Titanium.Map.Annotation>): void;
+
+			/**
+			 * Remove a previously added route.
+			 */
+			removeRoute(route: MapRouteType): void;
+
+			/**
+			 * Selects the annoation, showing the full annotation.
+			 */
+			selectAnnotation(annotation: string): void;
+
+			/**
+			 * Selects the annoation, showing the full annotation.
+			 */
+			selectAnnotation(annotation: Titanium.Map.Annotation): void;
+
+			/**
+			 * Sets the map location and zoom level.
+			 */
+			setLocation(location: MapLocationType): void;
+
+			/**
+			 * Sets the type of map (satellite, hybrid, or standard).
+			 */
+			setMapType(mapType: number): void;
+
+			/**
+			 * Zooms in or out of the map.
+			 */
+			zoom(level: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Map.View.animate> property.
+			 */
+			getAnimate(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.Map.View.animate> property.
+			 */
+			setAnimate(animate: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.Map.View.annotations> property.
+			 */
+			getAnnotations(): Titanium.Map.Annotation[];
+
+			/**
+			 * Sets the value of the <Titanium.Map.View.annotations> property.
+			 */
+			setAnnotations(annotations: ReadonlyArray<Titanium.Map.Annotation>): void;
+
+			/**
+			 * Gets the value of the <Titanium.Map.View.hideAnnotationWhenTouchMap> property.
+			 */
+			getHideAnnotationWhenTouchMap(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.Map.View.hideAnnotationWhenTouchMap> property.
+			 */
+			setHideAnnotationWhenTouchMap(hideAnnotationWhenTouchMap: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.Map.View.mapType> property.
+			 */
+			getMapType(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Map.View.mapType> property.
+			 */
+			setMapType(mapType: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Map.View.region> property.
+			 */
+			getRegion(): MapRegionType;
+
+			/**
+			 * Sets the value of the <Titanium.Map.View.region> property.
+			 */
+			setRegion(region: MapRegionType): void;
+
+			/**
+			 * Gets the value of the <Titanium.Map.View.regionFit> property.
+			 */
+			getRegionFit(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.Map.View.regionFit> property.
+			 */
+			setRegionFit(regionFit: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.Map.View.userLocation> property.
+			 */
+			getUserLocation(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.Map.View.userLocation> property.
+			 */
+			setUserLocation(userLocation: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.Map.View.latitudeDelta> property.
+			 */
+			getLatitudeDelta(): number;
+
+			/**
+			 * Gets the value of the <Titanium.Map.View.longitudeDelta> property.
+			 */
+			getLongitudeDelta(): number;
+
+		}
+
 	}
-	export interface Stream  {
-		MODE_APPEND : number;
-		MODE_READ : number;
-		MODE_WRITE : number;
-		createStream (params: CreateStreamArgs) : Ti.IOStream;
-		pump (inputStream: Ti.IOStream, handler: (...args : any[]) => any, maxChunkSize: number, isAsync?: boolean) : void;
-		read (sourceStream: Ti.IOStream, buffer: Ti.Buffer, offset?: number, length?: number, resultsCallback?: (...args : any[]) => any) : void;
-		readAll (sourceStream: Ti.IOStream, buffer?: Ti.Buffer, resultsCallback?: (...args : any[]) => any) : any;
-		write (outputStream: Ti.IOStream, buffer: Ti.Buffer, offset?: number, length?: number, resultsCallback?: (...args : any[]) => any) : void;
-		writeStream (inputStream: Ti.IOStream, outputStream: Ti.IOStream, maxChunkSize: number, resultsCallback?: (...args : any[]) => any) : void;
+
+	/**
+	 * The top-level Media module.
+	 */
+	namespace Media {
+		/**
+		 * Indicates if the proxy will bubble an event to its parent.
+		 */
+		let bubbleParent: boolean;
+
+		/**
+		 * The name of the API that this proxy corresponds to.
+		 */
+		const apiName: string;
+
+		/**
+		 * The Window or TabGroup whose Activity lifecycle should be triggered on the proxy.
+		 */
+		let lifecycleContainer: Titanium.UI.Window | Titanium.UI.TabGroup;
+
+		/**
+		 * Audio file format 3GPP2.
+		 */
+		const AUDIO_FILEFORMAT_3GP2: number;
+
+		/**
+		 * Audio file format 3GPP.
+		 */
+		const AUDIO_FILEFORMAT_3GPP: number;
+
+		/**
+		 * Audio file format Audio Interchange File Format (AIFF).
+		 */
+		const AUDIO_FILEFORMAT_AIFF: number;
+
+		/**
+		 * Audio file format Adaptive Multi-Rate (AMR).
+		 */
+		const AUDIO_FILEFORMAT_AMR: number;
+
+		/**
+		 * Audio file format Apple Compressed Audio Format (CAF).
+		 */
+		const AUDIO_FILEFORMAT_CAF: number;
+
+		/**
+		 * Audio file format MP3.
+		 */
+		const AUDIO_FILEFORMAT_MP3: number;
+
+		/**
+		 * Audio file format MP4.
+		 */
+		const AUDIO_FILEFORMAT_MP4: number;
+
+		/**
+		 * Audio file format MP4A.
+		 */
+		const AUDIO_FILEFORMAT_MP4A: number;
+
+		/**
+		 * Audio file format WAVE.
+		 */
+		const AUDIO_FILEFORMAT_WAVE: number;
+
+		/**
+		 * Audio format MPEG4 AAC encoding.
+		 */
+		const AUDIO_FORMAT_AAC: number;
+
+		/**
+		 * Audio format 8-bit aLaw encoding.
+		 */
+		const AUDIO_FORMAT_ALAW: number;
+
+		/**
+		 * Audio format Apple lossless encoding.
+		 */
+		const AUDIO_FORMAT_APPLE_LOSSLESS: number;
+
+		/**
+		 * Audio format iLBC encoding.
+		 */
+		const AUDIO_FORMAT_ILBC: number;
+
+		/**
+		 * Audio format Apple IMA4 encoding.
+		 */
+		const AUDIO_FORMAT_IMA4: number;
+
+		/**
+		 * Audio format 16-bit, linear PCM encoding.
+		 */
+		const AUDIO_FORMAT_LINEAR_PCM: number;
+
+		/**
+		 * Audio format 8-bit muLaw encoding.
+		 */
+		const AUDIO_FORMAT_ULAW: number;
+
+		/**
+		 * Line-type constant for headphones.
+		 */
+		const AUDIO_HEADPHONES: number;
+
+		/**
+		 * Line-type constant for headphones and microphone.
+		 */
+		const AUDIO_HEADPHONES_AND_MIC: number;
+
+		/**
+		 * Line-type constant for headset in/out.
+		 */
+		const AUDIO_HEADSET_INOUT: number;
+
+		/**
+		 * Line-type constant for line-out.
+		 */
+		const AUDIO_LINEOUT: number;
+
+		/**
+		 * Line-type constant for microphone.
+		 */
+		const AUDIO_MICROPHONE: number;
+
+		/**
+		 * Line-type constant indicated mute switch is on.
+		 */
+		const AUDIO_MUTED: number;
+
+		/**
+		 * Line-type constant indicating receiver and microphone.
+		 */
+		const AUDIO_RECEIVER_AND_MIC: number;
+
+		/**
+		 * For long-duration sounds such as rain, car engine noise, and so on.
+		 */
+		const AUDIO_SESSION_CATEGORY_AMBIENT: string;
+
+		/**
+		 * Session mode for playing recorded music or other sounds that are central to the successful use of your application.
+		 */
+		const AUDIO_SESSION_CATEGORY_PLAYBACK: string;
+
+		/**
+		 * Session mode for recording (input) and playback (output) of audio, such as for a VOIP (voice over IP) application.
+		 */
+		const AUDIO_SESSION_CATEGORY_PLAY_AND_RECORD: string;
+
+		/**
+		 * Session mode for recording audio; it silences playback audio.
+		 */
+		const AUDIO_SESSION_CATEGORY_RECORD: string;
+
+		/**
+		 * Session mode for long-duration sounds such as rain, car engine noise, and so on.
+		 */
+		const AUDIO_SESSION_CATEGORY_SOLO_AMBIENT: string;
+
+		/**
+		 * For long-duration sounds such as rain, car engine noise, and so on.
+		 */
+		const AUDIO_SESSION_MODE_AMBIENT: number;
+
+		/**
+		 * Session mode for playing recorded music or other sounds that are central to the successful use of your application.
+		 */
+		const AUDIO_SESSION_MODE_PLAYBACK: number;
+
+		/**
+		 * Session mode for recording (input) and playback (output) of audio, such as for a VOIP (voice over IP) application.
+		 */
+		const AUDIO_SESSION_MODE_PLAY_AND_RECORD: number;
+
+		/**
+		 * Session mode for recording audio; it silences playback audio.
+		 */
+		const AUDIO_SESSION_MODE_RECORD: number;
+
+		/**
+		 * Session mode for long-duration sounds such as rain, car engine noise, and so on.
+		 */
+		const AUDIO_SESSION_MODE_SOLO_AMBIENT: number;
+
+		/**
+		 * Constant that specifies audio should output to the default audio route. See <Titanium.Media.setOverrideAudioRoute> for more information.
+		 */
+		const AUDIO_SESSION_OVERRIDE_ROUTE_NONE: number;
+
+		/**
+		 * Constant that specifies audio should output to the speaker. See <Titanium.Media.setOverrideAudioRoute> for more information.
+		 */
+		const AUDIO_SESSION_OVERRIDE_ROUTE_SPEAKER: number;
+
+		/**
+		 * Constant for line level input on a dock connector. This is an input port.
+		 */
+		const AUDIO_SESSION_PORT_LINEIN: string;
+
+		/**
+		 * Constant for built-in microphone on an iOS device. This is an input port.
+		 */
+		const AUDIO_SESSION_PORT_BUILTINMIC: string;
+
+		/**
+		 * Constant for microphone on a wired headset. This is an input port.
+		 */
+		const AUDIO_SESSION_PORT_HEADSETMIC: string;
+
+		/**
+		 * Constant for line level output on a dock connector. This is an output port.
+		 */
+		const AUDIO_SESSION_PORT_LINEOUT: string;
+
+		/**
+		 * Constant for headphone or headset output. This is an output port.
+		 */
+		const AUDIO_SESSION_PORT_HEADPHONES: string;
+
+		/**
+		 * Constant for output on a Bluetooth A2DP device. This is an output port.
+		 */
+		const AUDIO_SESSION_PORT_BLUETOOTHA2DP: string;
+
+		/**
+		 * Constant for the speaker you hold to your ear when on a phone call. This is an output port.
+		 */
+		const AUDIO_SESSION_PORT_BUILTINRECEIVER: string;
+
+		/**
+		 * Constant for built-in speaker on an iOS device. This is an output port.
+		 */
+		const AUDIO_SESSION_PORT_BUILTINSPEAKER: string;
+
+		/**
+		 * Constant for output via High-Definition Multimedia Interface. This is an output port
+		 */
+		const AUDIO_SESSION_PORT_HDMI: string;
+
+		/**
+		 * Constant for output on a remote Air Play device. This is an output port.
+		 */
+		const AUDIO_SESSION_PORT_AIRPLAY: string;
+
+		/**
+		 * Constant for input or output on a Bluetooth Hands-Free Profile device. This can be both an input and output port.
+		 */
+		const AUDIO_SESSION_PORT_BLUETOOTHHFP: string;
+
+		/**
+		 * Constant for input or output on a Universal Serial Bus device. This can be both an input and output port.
+		 */
+		const AUDIO_SESSION_PORT_USBAUDIO: string;
+
+		/**
+		 * Constant for output on a Bluetooth Low Energy device. This is an output port. This is available on iOS7 and later.
+		 */
+		const AUDIO_SESSION_PORT_BLUETOOTHLE: string;
+
+		/**
+		 * Constant for Input or output via Car Audio. This can be both an input and output port. This is available on iOS7 and later.
+		 */
+		const AUDIO_SESSION_PORT_CARAUDIO: string;
+
+		/**
+		 * Line-type constant for speaker output.
+		 */
+		const AUDIO_SPEAKER: number;
+
+		/**
+		 * Line-type constant indicating that audio is unavailable.
+		 */
+		const AUDIO_UNAVAILABLE: number;
+
+		/**
+		 * Line-type constant indicating that line-type is unknown or not determined.
+		 */
+		const AUDIO_UNKNOWN: number;
+
+		/**
+		 * Constant specifying to have the device determine to use the flash or not.
+		 */
+		const CAMERA_FLASH_AUTO: number;
+
+		/**
+		 * Constant specifying to never fire the flash.
+		 */
+		const CAMERA_FLASH_OFF: number;
+
+		/**
+		 * Constant specifying to always fire the flash.
+		 */
+		const CAMERA_FLASH_ON: number;
+
+		/**
+		 * Constant specifying the front camera.
+		 */
+		const CAMERA_FRONT: number;
+
+		/**
+		 * Constant indicating the rear camera.
+		 */
+		const CAMERA_REAR: number;
+
+		/**
+		 * Constant specifying that app is authorized to use camera. This is available on iOS7 and later.
+		 */
+		const CAMERA_AUTHORIZATION_AUTHORIZED: number;
+
+		/**
+		 * Constant specifying that app is denied usage of camera. This is available on iOS7 and later.
+		 */
+		const CAMERA_AUTHORIZATION_DENIED: number;
+
+		/**
+		 * Constant specifying that app is restricted from using camera. This is available on iOS7 and later.
+		 */
+		const CAMERA_AUTHORIZATION_RESTRICTED: number;
+
+		/**
+		 * Constant specifying that app is not yet authorized to use camera. This is available on iOS7 and later.
+		 */
+		const CAMERA_AUTHORIZATION_NOT_DETERMINED: number;
+
+		/**
+		 * Constant specifying that app is not yet authorized to use camera. This is available on iOS7 and later.
+		 */
+		const CAMERA_AUTHORIZATION_UNKNOWN: number;
+
+		/**
+		 * Constant for media device busy error.
+		 */
+		const DEVICE_BUSY: number;
+
+		/**
+		 * Media type constant for photo media.
+		 */
+		const MEDIA_TYPE_PHOTO: string;
+
+		/**
+		 * Media type constant for live photo media.
+		 */
+		const MEDIA_TYPE_LIVEPHOTO: string;
+
+		/**
+		 * Media type constant for video media.
+		 */
+		const MEDIA_TYPE_VIDEO: string;
+
+		/**
+		 * Music library media containing any type of content.
+		 */
+		const MUSIC_MEDIA_TYPE_ALL: number;
+
+		/**
+		 * Music library media containing any type of audio content.
+		 */
+		const MUSIC_MEDIA_TYPE_ANY_AUDIO: number;
+
+		/**
+		 * Music library media containing audiobook content.
+		 */
+		const MUSIC_MEDIA_TYPE_AUDIOBOOK: number;
+
+		/**
+		 * Music library media containing music content.
+		 */
+		const MUSIC_MEDIA_TYPE_MUSIC: number;
+
+		/**
+		 * Music library media containing podcast content.
+		 */
+		const MUSIC_MEDIA_TYPE_PODCAST: number;
+
+		/**
+		 * Constant for grouping query results by title.
+		 */
+		const MUSIC_MEDIA_GROUP_TITLE: number;
+
+		/**
+		 * Constant for grouping query results by album.
+		 */
+		const MUSIC_MEDIA_GROUP_ALBUM: number;
+
+		/**
+		 * Constant for grouping query results by artist.
+		 */
+		const MUSIC_MEDIA_GROUP_ARTIST: number;
+
+		/**
+		 * Constant for grouping query results by album and artist.
+		 */
+		const MUSIC_MEDIA_GROUP_ALBUM_ARTIST: number;
+
+		/**
+		 * Constant for grouping query results by composer.
+		 */
+		const MUSIC_MEDIA_GROUP_COMPOSER: number;
+
+		/**
+		 * Constant for grouping query results by genre.
+		 */
+		const MUSIC_MEDIA_GROUP_GENRE: number;
+
+		/**
+		 * Constant for grouping query results by playlist.
+		 */
+		const MUSIC_MEDIA_GROUP_PLAYLIST: number;
+
+		/**
+		 * Constant for grouping query results by podcast title.
+		 */
+		const MUSIC_MEDIA_GROUP_PODCAST_TITLE: number;
+
+		/**
+		 * Constant for "Repeat All" setting.
+		 */
+		const MUSIC_PLAYER_REPEAT_ALL: number;
+
+		/**
+		 * Constant for user's default repeat setting.
+		 */
+		const MUSIC_PLAYER_REPEAT_DEFAULT: number;
+
+		/**
+		 * Constant for "No Repeat" setting.
+		 */
+		const MUSIC_PLAYER_REPEAT_NONE: number;
+
+		/**
+		 * Constant for "Repeat one item" setting.
+		 */
+		const MUSIC_PLAYER_REPEAT_ONE: number;
+
+		/**
+		 * Constant for shuffling complete albums setting.
+		 */
+		const MUSIC_PLAYER_SHUFFLE_ALBUMS: number;
+
+		/**
+		 * Constant for user's default shuffle setting.
+		 */
+		const MUSIC_PLAYER_SHUFFLE_DEFAULT: number;
+
+		/**
+		 * Constant for "no shuffle" setting.
+		 */
+		const MUSIC_PLAYER_SHUFFLE_NONE: number;
+
+		/**
+		 * Constant for shuffling songs setting.
+		 */
+		const MUSIC_PLAYER_SHUFFLE_SONGS: number;
+
+		/**
+		 * Constant for interrupted state.
+		 */
+		const MUSIC_PLAYER_STATE_INTERRUPTED: number;
+
+		/**
+		 * Constant for paused state.
+		 */
+		const MUSIC_PLAYER_STATE_PAUSED: number;
+
+		/**
+		 * Constant for playing state.
+		 */
+		const MUSIC_PLAYER_STATE_PLAYING: number;
+
+		/**
+		 * Constant for backward seek state.
+		 */
+		const MUSIC_PLAYER_STATE_SEEK_BACKWARD: number;
+
+		/**
+		 * Constant for forward seek state.
+		 */
+		const MUSIC_PLAYER_STATE_SEEK_FORWARD: number;
+
+		/**
+		 * Constant for stopped state.
+		 */
+		const MUSIC_PLAYER_STATE_STOPPED: number;
+
+		/**
+		 * Constant for media no camera error.
+		 */
+		const NO_CAMERA: number;
+
+		/**
+		 * Constant for media no video error.
+		 */
+		const NO_VIDEO: number;
+
+		/**
+		 * Media type constant for high-quality video recording.
+		 */
+		const QUALITY_HIGH: number;
+
+		/**
+		 * Media type constant for low-quality video recording.
+		 */
+		const QUALITY_LOW: number;
+
+		/**
+		 * Media type constant for medium-quality video recording.
+		 */
+		const QUALITY_MEDIUM: number;
+
+		/**
+		 * Media type constant for medium-quality video recording.
+		 */
+		const QUALITY_640x480: number;
+
+		/**
+		 * Media type constant for medium-quality video recording.
+		 */
+		const QUALITY_IFRAME_1280x720: number;
+
+		/**
+		 * Media type constant for medium-quality video recording.
+		 */
+		const QUALITY_IFRAME_960x540: number;
+
+		/**
+		 * Constant for unknown media error.
+		 */
+		const UNKNOWN_ERROR: number;
+
+		/**
+		 * Constant for default video controls.
+		 */
+		const VIDEO_CONTROL_DEFAULT: number;
+
+		/**
+		 * Constant for video controls for an embedded view.
+		 */
+		const VIDEO_CONTROL_EMBEDDED: number;
+
+		/**
+		 * Constant for fullscreen video controls.
+		 */
+		const VIDEO_CONTROL_FULLSCREEN: number;
+
+		/**
+		 * Constant for video controls hidden.
+		 */
+		const VIDEO_CONTROL_HIDDEN: number;
+
+		/**
+		 * Constant for no video controls.
+		 */
+		const VIDEO_CONTROL_NONE: number;
+
+		/**
+		 * Constant for video controls volume only.
+		 */
+		const VIDEO_CONTROL_VOLUME_ONLY: number;
+
+		/**
+		 * Video playback ended normally.
+		 */
+		const VIDEO_FINISH_REASON_PLAYBACK_ENDED: number;
+
+		/**
+		 * Video playback ended abnormally.
+		 */
+		const VIDEO_FINISH_REASON_PLAYBACK_ERROR: number;
+
+		/**
+		 * Video playback ended by user action (such as clicking the `Done` button).
+		 */
+		const VIDEO_FINISH_REASON_USER_EXITED: number;
+
+		/**
+		 * Indicates that the player can no longer play media items because of an error.
+		 */
+		const VIDEO_LOAD_STATE_FAILED: number;
+
+		/**
+		 * Current media is playable.
+		 */
+		const VIDEO_LOAD_STATE_PLAYABLE: number;
+
+		/**
+		 * Playback will be automatically started in this state when `autoplay` is true.
+		 */
+		const VIDEO_LOAD_STATE_PLAYTHROUGH_OK: number;
+
+		/**
+		 * Playback will be automatically paused in this state, if started.
+		 */
+		const VIDEO_LOAD_STATE_STALLED: number;
+
+		/**
+		 * Current load state is not known.
+		 */
+		const VIDEO_LOAD_STATE_UNKNOWN: number;
+
+		/**
+		 * A audio type of media in the movie returned by <Titanium.Media.VideoPlayer> `mediaTypes` property.
+		 */
+		const VIDEO_MEDIA_TYPE_AUDIO: number;
+
+		/**
+		 * An unknown type of media in the movie returned by <Titanium.Media.VideoPlayer> `mediaTypes` property.
+		 */
+		const VIDEO_MEDIA_TYPE_NONE: number;
+
+		/**
+		 * A video type of media in the movie returned by <Titanium.Media.VideoPlayer> `mediaTypes` property.
+		 */
+		const VIDEO_MEDIA_TYPE_VIDEO: number;
+
+		/**
+		 * Video playback has been interrupted.
+		 */
+		const VIDEO_PLAYBACK_STATE_INTERRUPTED: number;
+
+		/**
+		 * Video playback is paused.
+		 */
+		const VIDEO_PLAYBACK_STATE_PAUSED: number;
+
+		/**
+		 * Video is being played.
+		 */
+		const VIDEO_PLAYBACK_STATE_PLAYING: number;
+
+		/**
+		 * Video playback is rewinding.
+		 */
+		const VIDEO_PLAYBACK_STATE_SEEKING_BACKWARD: number;
+
+		/**
+		 * Video playback is seeking forward.
+		 */
+		const VIDEO_PLAYBACK_STATE_SEEKING_FORWARD: number;
+
+		/**
+		 * Video playback is stopped.
+		 */
+		const VIDEO_PLAYBACK_STATE_STOPPED: number;
+
+		/**
+		 * Constant for disabling repeat on video playback.
+		 */
+		const VIDEO_REPEAT_MODE_NONE: number;
+
+		/**
+		 * Constant for repeating one video (i.e., the one video will repeat constantly) during playback.
+		 */
+		const VIDEO_REPEAT_MODE_ONE: number;
+
+		/**
+		 * Scale video to fill the screen, clipping edges if necessary.
+		 */
+		const VIDEO_SCALING_ASPECT_FILL: number;
+
+		/**
+		 * Scale video to fit the screen, letterboxing if necessary.
+		 */
+		const VIDEO_SCALING_ASPECT_FIT: number;
+
+		/**
+		 * Video is scaled until both dimensions fit the screen exactly, stretching if necessary.
+		 */
+		const VIDEO_SCALING_MODE_FILL: number;
+
+		/**
+		 * Video scaling is disabled.
+		 */
+		const VIDEO_SCALING_NONE: number;
+
+		/**
+		 * Specifies that the video should be stretched to fill the bounds of layer.
+		 */
+		const VIDEO_SCALING_RESIZE: string;
+
+		/**
+		 * Specifies that the player should preserve the aspect ratio of video and fit the video within the bounds of layer.
+		 */
+		const VIDEO_SCALING_RESIZE_ASPECT: string;
+
+		/**
+		 * Specifies that the player should preserve the aspect ratio of video and fill the bounds of layer.
+		 */
+		const VIDEO_SCALING_RESIZE_ASPECT_FILL: string;
+
+		/**
+		 * Video source type is a file.
+		 */
+		const VIDEO_SOURCE_TYPE_FILE: number;
+
+		/**
+		 * Video source type is a remote stream.
+		 */
+		const VIDEO_SOURCE_TYPE_STREAMING: number;
+
+		/**
+		 * Video source type is unknown.
+		 */
+		const VIDEO_SOURCE_TYPE_UNKNOWN: number;
+
+		/**
+		 * Use the exact time.
+		 */
+		const VIDEO_TIME_OPTION_EXACT: number;
+
+		/**
+		 * Use the closest keyframe in the time.
+		 */
+		const VIDEO_TIME_OPTION_NEAREST_KEYFRAME: number;
+
+		/**
+		 * Use the closest sync (or key) frame at given the time.
+		 */
+		const VIDEO_TIME_OPTION_CLOSEST_SYNC: number;
+
+		/**
+		 * Use the sync (or key) frame located right after or at given the time.
+		 */
+		const VIDEO_TIME_OPTION_NEXT_SYNC: number;
+
+		/**
+		 * Use the sync (or key) frame located right before or at given the time.
+		 */
+		const VIDEO_TIME_OPTION_PREVIOUS_SYNC: number;
+
+		/**
+		 * An instance of <Titanium.Media.MusicPlayer> representing the app-specific music player.
+		 */
+		const appMusicPlayer: Titanium.Media.MusicPlayer;
+
+		/**
+		 * Returns the line type constant for the current line type.
+		 */
+		const audioLineType: number;
+
+		/**
+		 * Returns `true` if the device is playing audio.
+		 */
+		const audioPlaying: boolean;
+
+		/**
+		 * A constant for the audio session category to be used.
+		 */
+		let audioSessionCategory: number;
+
+		/**
+		 * A constant for the audio session mode to be used.
+		 */
+		let audioSessionMode: number;
+
+		/**
+		 * Array indicating which cameras are available, `CAMERA_FRONT`, `CAMERA_REAR` or both.
+		 */
+		const availableCameras: number[];
+
+		/**
+		 * Array of media type constants supported for the camera.
+		 */
+		let availableCameraMediaTypes: any[];
+
+		/**
+		 * Array of media type constants supported for saving to the device's camera roll or saved images album.
+		 */
+		let availablePhotoGalleryMediaTypes: any[];
+
+		/**
+		 * Array of media type constants supported for the photo library.
+		 */
+		let availablePhotoMediaTypes: any[];
+
+		/**
+		 * Current average microphone level in dB or -1 if microphone monitoring is disabled.
+		 */
+		let averageMicrophonePower: number;
+
+		/**
+		 * Determines how the flash is fired when using the device's camera.
+		 */
+		let cameraFlashMode: number;
+
+		/**
+		 * `true` if the device has a recording input device available.
+		 */
+		const canRecord: boolean;
+
+		/**
+		 * Returns a description of the current route, consisting of zero or more input ports and zero or more output ports.
+		 */
+		const currentRoute: RouteDescription;
+
+		/**
+		 * `true` if the device has camera support.
+		 */
+		const isCameraSupported: boolean;
+
+		/**
+		 * Returns the authorization status for the camera.
+		 */
+		const cameraAuthorizationStatus: number;
+
+		/**
+		 * Returns the authorization status for the camera.
+		 */
+		const cameraAuthorization: number;
+
+		/**
+		 * Current microphone level peak power in dB or -1 if microphone monitoring is disabled.
+		 */
+		const peakMicrophonePower: number;
+
+		/**
+		 * An instance of <Titanium.Media.MusicPlayer> representing the system-wide music player.
+		 */
+		const systemMusicPlayer: Titanium.Media.MusicPlayer;
+
+		/**
+		 * Current volume of the playback device.
+		 */
+		const volume: number;
+
+		/**
+		 * Adds the specified callback as an event listener for the named event.
+		 */
+		function addEventListener(name: string, callback: (param0: any) => any): void;
+
+		/**
+		 * Removes the specified callback as an event listener for the named event.
+		 */
+		function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+		/**
+		 * Fires a synthesized event to any registered listeners.
+		 */
+		function fireEvent(name: string, event: any): void;
+
+		/**
+		 * Applies the properties to the proxy.
+		 */
+		function applyProperties(props: any): void;
+
+		/**
+		 * Plays a device beep notification.
+		 */
+		function beep(): void;
+
+		/**
+		 * Hides the device camera UI.
+		 */
+		function hideCamera(): void;
+
+		/**
+		 * Hides the music library.
+		 */
+		function hideMusicLibrary(): void;
+
+		/**
+		 * Returns `true` if the source supports the specified media type.
+		 */
+		function isMediaTypeSupported(source: string, type: string): boolean;
+
+		/**
+		 * Shows the music library and allows the user to select one or more tracks.
+		 */
+		function openMusicLibrary(options: MusicLibraryOptionsType): void;
+
+		/**
+		 * Opens the photo gallery image picker.
+		 */
+		function openPhotoGallery(options: PhotoGalleryOptionsType): void;
+
+		/**
+		 * Displays the given image.
+		 */
+		function previewImage(options: any): void;
+
+		/**
+		 * Saves media to the device's photo gallery / camera roll.
+		 */
+		function saveToPhotoGallery(media: Titanium.Blob, callbacks: any): void;
+
+		/**
+		 * Saves media to the device's photo gallery / camera roll.
+		 */
+		function saveToPhotoGallery(media: Titanium.Filesystem.File, callbacks: any): void;
+
+		/**
+		 * Overrides the default audio route when using the <Titanium.Media.AUDIO_SESSION_CATEGORY_PLAY_AND_RECORD> session mode.
+		 */
+		function setOverrideAudioRoute(route: number): void;
+
+		/**
+		 * Shows the camera.
+		 */
+		function showCamera(options: CameraOptionsType): void;
+
+		/**
+		 * Returns `true` if the app has camera access.
+		 */
+		function hasMusicLibraryPermissions(): boolean;
+
+		/**
+		 * Request permissions for the native music-library.
+		 */
+		function requestMusicLibraryPermissions(callback: (param0: RequestMusicLibraryAccessResult) => any): void;
+
+		/**
+		 * Searches the music library for items matching the specified search predicates.
+		 */
+		function queryMusicLibrary(query: MediaQueryType): Titanium.Media.Item[];
+
+		/**
+		 * Starts monitoring the microphone sound level.
+		 */
+		function startMicrophoneMonitor(): void;
+
+		/**
+		 * Stops monitoring the microphone sound level.
+		 */
+		function stopMicrophoneMonitor(): void;
+
+		/**
+		 * Uses the device camera to capture a photo.
+		 */
+		function takePicture(): void;
+
+		/**
+		 * Starts video capture using the camera specified.
+		 */
+		function startVideoCapture(): void;
+
+		/**
+		 * Stops video capture using the camera specified.
+		 */
+		function stopVideoCapture(): void;
+
+		/**
+		 * Switches between front and rear-facing cameras. Make sure to set one of the below constants to determine
+		 * the camera you want to switch to.
+		 */
+		function switchCamera(camera: number): void;
+
+		/**
+		 * Returns `true` if the app has camera access.
+		 */
+		function hasCameraPermissions(): boolean;
+
+		/**
+		 * Requests for camera access.
+		 */
+		function requestCameraPermissions(callback: (param0: RequestCameraAccessResult) => any): void;
+
+		/**
+		 * Returns `true` if the app has photo gallery permissions.
+		 */
+		function hasPhotoGalleryPermissions(): boolean;
+
+		/**
+		 * Requests for photo gallery permissions.
+		 */
+		function requestPhotoGalleryPermissions(callback: (param0: RequestPhotoGalleryAccessResult) => any): void;
+
+		/**
+		 * Requests for camera access.
+		 */
+		function requestCameraAccess(callback: (param0: RequestCameraAccessResult) => any): void;
+
+		/**
+		 * Takes a screen shot of the visible UI on the device.
+		 */
+		function takeScreenshot(callback: (param0: ScreenshotResult) => any): void;
+
+		/**
+		 * Makes the device vibrate.
+		 */
+		function vibrate(pattern?: ReadonlyArray<number>): void;
+
+		/**
+		 * Request the user's permission for audio recording.
+		 */
+		function requestAuthorization(callback: (param0: MediaAuthorizationResponse) => any): void;
+
+		/**
+		 * Returns `true` if the app has audio permissions.
+		 */
+		function hasAudioPermissions(): boolean;
+
+		/**
+		 * Returns `true` if the app has audio permissions.
+		 */
+		function hasAudioRecorderPermissions(): boolean;
+
+		/**
+		 * Request the user's permission for audio recording.
+		 */
+		function requestAudioPermissions(callback: (param0: MediaAuthorizationResponse) => any): void;
+
+		/**
+		 * Request the user's permission for audio recording.
+		 */
+		function requestAudioRecorderPermissions(callback: (param0: MediaAuthorizationResponse) => any): void;
+
+		/**
+		 * Creates and returns an instance of <Titanium.Media.AudioPlayer>.
+		 */
+		function createAudioPlayer(parameters?: any): Titanium.Media.AudioPlayer;
+
+		/**
+		 * Creates and returns an instance of <Titanium.Media.AudioRecorder>.
+		 */
+		function createAudioRecorder(parameters?: any): Titanium.Media.AudioRecorder;
+
+		/**
+		 * Gets the value of the <Titanium.Media.bubbleParent> property.
+		 */
+		function getBubbleParent(): boolean;
+
+		/**
+		 * Sets the value of the <Titanium.Media.bubbleParent> property.
+		 */
+		function setBubbleParent(bubbleParent: boolean): void;
+
+		/**
+		 * Gets the value of the <Titanium.Media.apiName> property.
+		 */
+		function getApiName(): string;
+
+		/**
+		 * Gets the value of the <Titanium.Media.lifecycleContainer> property.
+		 */
+		function getLifecycleContainer(): Titanium.UI.Window | Titanium.UI.TabGroup;
+
+		/**
+		 * Sets the value of the <Titanium.Media.lifecycleContainer> property.
+		 */
+		function setLifecycleContainer(lifecycleContainer: Titanium.UI.Window): void;
+
+		/**
+		 * Sets the value of the <Titanium.Media.lifecycleContainer> property.
+		 */
+		function setLifecycleContainer(lifecycleContainer: Titanium.UI.TabGroup): void;
+
+		/**
+		 * Gets the value of the <Titanium.Media.QUALITY_640x480> property.
+		 */
+		function getQUALITY_640x480(): number;
+
+		/**
+		 * Gets the value of the <Titanium.Media.QUALITY_IFRAME_1280x720> property.
+		 */
+		function getQUALITY_IFRAME_1280x720(): number;
+
+		/**
+		 * Gets the value of the <Titanium.Media.QUALITY_IFRAME_960x540> property.
+		 */
+		function getQUALITY_IFRAME_960x540(): number;
+
+		/**
+		 * Gets the value of the <Titanium.Media.appMusicPlayer> property.
+		 */
+		function getAppMusicPlayer(): Titanium.Media.MusicPlayer;
+
+		/**
+		 * Gets the value of the <Titanium.Media.audioLineType> property.
+		 */
+		function getAudioLineType(): number;
+
+		/**
+		 * Gets the value of the <Titanium.Media.audioPlaying> property.
+		 */
+		function getAudioPlaying(): boolean;
+
+		/**
+		 * Gets the value of the <Titanium.Media.audioSessionCategory> property.
+		 */
+		function getAudioSessionCategory(): number;
+
+		/**
+		 * Sets the value of the <Titanium.Media.audioSessionCategory> property.
+		 */
+		function setAudioSessionCategory(audioSessionCategory: number): void;
+
+		/**
+		 * Gets the value of the <Titanium.Media.audioSessionMode> property.
+		 */
+		function getAudioSessionMode(): number;
+
+		/**
+		 * Sets the value of the <Titanium.Media.audioSessionMode> property.
+		 */
+		function setAudioSessionMode(audioSessionMode: number): void;
+
+		/**
+		 * Gets the value of the <Titanium.Media.availableCameras> property.
+		 */
+		function getAvailableCameras(): number[];
+
+		/**
+		 * Gets the value of the <Titanium.Media.availableCameraMediaTypes> property.
+		 */
+		function getAvailableCameraMediaTypes(): any[];
+
+		/**
+		 * Sets the value of the <Titanium.Media.availableCameraMediaTypes> property.
+		 */
+		function setAvailableCameraMediaTypes(availableCameraMediaTypes: ReadonlyArray<any>): void;
+
+		/**
+		 * Gets the value of the <Titanium.Media.availablePhotoGalleryMediaTypes> property.
+		 */
+		function getAvailablePhotoGalleryMediaTypes(): any[];
+
+		/**
+		 * Sets the value of the <Titanium.Media.availablePhotoGalleryMediaTypes> property.
+		 */
+		function setAvailablePhotoGalleryMediaTypes(availablePhotoGalleryMediaTypes: ReadonlyArray<any>): void;
+
+		/**
+		 * Gets the value of the <Titanium.Media.availablePhotoMediaTypes> property.
+		 */
+		function getAvailablePhotoMediaTypes(): any[];
+
+		/**
+		 * Sets the value of the <Titanium.Media.availablePhotoMediaTypes> property.
+		 */
+		function setAvailablePhotoMediaTypes(availablePhotoMediaTypes: ReadonlyArray<any>): void;
+
+		/**
+		 * Gets the value of the <Titanium.Media.averageMicrophonePower> property.
+		 */
+		function getAverageMicrophonePower(): number;
+
+		/**
+		 * Sets the value of the <Titanium.Media.averageMicrophonePower> property.
+		 */
+		function setAverageMicrophonePower(averageMicrophonePower: number): void;
+
+		/**
+		 * Gets the value of the <Titanium.Media.cameraFlashMode> property.
+		 */
+		function getCameraFlashMode(): number;
+
+		/**
+		 * Sets the value of the <Titanium.Media.cameraFlashMode> property.
+		 */
+		function setCameraFlashMode(cameraFlashMode: number): void;
+
+		/**
+		 * Gets the value of the <Titanium.Media.canRecord> property.
+		 */
+		function getCanRecord(): boolean;
+
+		/**
+		 * Gets the value of the <Titanium.Media.currentRoute> property.
+		 */
+		function getCurrentRoute(): RouteDescription;
+
+		/**
+		 * Gets the value of the <Titanium.Media.isCameraSupported> property.
+		 */
+		function getIsCameraSupported(): boolean;
+
+		/**
+		 * Gets the value of the <Titanium.Media.cameraAuthorizationStatus> property.
+		 */
+		function getCameraAuthorizationStatus(): number;
+
+		/**
+		 * Gets the value of the <Titanium.Media.cameraAuthorization> property.
+		 */
+		function getCameraAuthorization(): number;
+
+		/**
+		 * Gets the value of the <Titanium.Media.peakMicrophonePower> property.
+		 */
+		function getPeakMicrophonePower(): number;
+
+		/**
+		 * Gets the value of the <Titanium.Media.systemMusicPlayer> property.
+		 */
+		function getSystemMusicPlayer(): Titanium.Media.MusicPlayer;
+
+		/**
+		 * Gets the value of the <Titanium.Media.volume> property.
+		 */
+		function getVolume(): number;
+
+		/**
+		 * Creates and returns an instance of <Titanium.Media.Sound>.
+		 */
+		function createSound(parameters?: any): Titanium.Media.Sound;
+
+		/**
+		 * Creates and returns an instance of <Titanium.Media.SystemAlert>.
+		 */
+		function createSystemAlert(parameters?: any): Titanium.Media.SystemAlert;
+
+		/**
+		 * Creates and returns an instance of <Titanium.Media.VideoPlayer>.
+		 */
+		function createVideoPlayer(parameters?: any): Titanium.Media.VideoPlayer;
+
+		/**
+		 * An audio player object used for streaming audio to the device, and low-level control of the audio playback.
+		 */
+		interface AudioPlayer extends Titanium.Proxy {
+			/**
+			 * Audio data is being buffered from the network.
+			 */
+			readonly STATE_BUFFERING: number;
+
+			/**
+			 * Audio playback is being initialized.
+			 */
+			readonly STATE_INITIALIZED: number;
+
+			/**
+			 * Playback is paused.
+			 */
+			readonly STATE_PAUSED: number;
+
+			/**
+			 * Audio playback is active.
+			 */
+			readonly STATE_PLAYING: number;
+
+			/**
+			 * Audio playback is starting.
+			 */
+			readonly STATE_STARTING: number;
+
+			/**
+			 * Audio playback is stopped.
+			 */
+			readonly STATE_STOPPED: number;
+
+			/**
+			 * Audio playback is stopping.
+			 */
+			readonly STATE_STOPPING: number;
+
+			/**
+			 * Player is waiting for audio data from the network.
+			 */
+			readonly STATE_WAITING_FOR_DATA: number;
+
+			/**
+			 * Player is waiting for audio data to fill the queue.
+			 */
+			readonly STATE_WAITING_FOR_QUEUE: number;
+
+			/**
+			 * Used to identify the volume of audio streams for alarms.
+			 */
+			readonly AUDIO_TYPE_ALARM: number;
+
+			/**
+			 * Used to identify the volume of audio streams for DTMF tones or beeps.
+			 */
+			readonly AUDIO_TYPE_SIGNALLING: number;
+
+			/**
+			 * Used to identify the volume of audio streams for media playback.
+			 */
+			readonly AUDIO_TYPE_MEDIA: number;
+
+			/**
+			 * Used to identify the volume of audio streams for notifications.
+			 */
+			readonly AUDIO_TYPE_NOTIFICATION: number;
+
+			/**
+			 * Used to identify the volume of audio streams for the phone ring.
+			 */
+			readonly AUDIO_TYPE_RING: number;
+
+			/**
+			 * Used to identify the volume of audio streams for voice calls.
+			 */
+			readonly AUDIO_TYPE_VOICE: number;
+
+			/**
+			 * Boolean to indicate if audio should continue playing even if the associated
+			 * Android [Activity](Titanium.Android.Activity) is paused.
+			 */
+			allowBackground: boolean;
+
+			/**
+			 * Focuses on the current audio player and stops other audio playing.
+			 */
+			audioFocus: boolean;
+
+			/**
+			 * Changes the audio-stream-type.
+			 */
+			audioType: number;
+
+			/**
+			 * Bit rate of the current playback stream.
+			 */
+			bitRate: number;
+
+			/**
+			 * Estimated duration in milliseconds of the file being played.
+			 */
+			readonly duration: number;
+
+			/**
+			 * Boolean indicating if the player is idle.
+			 */
+			readonly idle: boolean;
+
+			/**
+			 * Boolean indicating if audio playback is paused.
+			 */
+			paused: boolean;
+
+			/**
+			 * Boolean indicating if audio is currently playing.
+			 */
+			readonly playing: boolean;
+
+			/**
+			 * Current playback progress, in milliseconds.
+			 */
+			readonly progress: number;
+
+			/**
+			 * Current state of playback, specified using one of the `STATE` constants defined on this object.
+			 */
+			readonly state: number;
+
+			/**
+			 * URL for the audio stream.
+			 */
+			url: string;
+
+			/**
+			 * Volume of the audio, from 0.0 (muted) to 1.0 (loudest).
+			 */
+			volume: number;
+
+			/**
+			 * Boolean indicating if the playback is waiting for audio data from the network.
+			 */
+			readonly waiting: boolean;
+
+			/**
+			 * Size of the buffer used for streaming, in bytes.
+			 */
+			bufferSize: number;
+
+			/**
+			 * Current playback position of the audio.
+			 */
+			time: number;
+
+			/**
+			 * Returns the value of the [paused](Titanium.Media.AudioPlayer.paused) property.
+			 */
+			getPaused(): boolean;
+
+			/**
+			 * Returns the value of the [paused](Titanium.Media.AudioPlayer.paused) property.
+			 */
+			isPaused(): boolean;
+
+			/**
+			 * Returns the value of the [playing](Titanium.Media.AudioPlayer.playing) property.
+			 */
+			getPlaying(): boolean;
+
+			/**
+			 * Returns the value of the [playing](Titanium.Media.AudioPlayer.playing) property.
+			 */
+			isPlaying(): boolean;
+
+			/**
+			 * Pauses audio playback.
+			 */
+			pause(): void;
+
+			/**
+			 * Starts or resumes audio playback.
+			 */
+			play(): void;
+
+			/**
+			 * Sets the value of the [paused](Titanium.Media.AudioPlayer.paused) property.
+			 */
+			setPaused(paused: boolean): void;
+
+			/**
+			 * Stops buffering audio data and releases audio resources.
+			 */
+			release(): void;
+
+			/**
+			 * Returns the audio session id.
+			 */
+			getAudioSessionId(): number;
+
+			/**
+			 * Starts or resumes audio playback.
+			 */
+			start(): void;
+
+			/**
+			 * Converts a [state](Titanium.Media.AudioPlayer.state) value into a text description
+			 * suitable for display.
+			 */
+			stateDescription(state: number): string;
+
+			/**
+			 * Stops audio playback.
+			 */
+			stop(): void;
+
+			/**
+			 * Gets the value of the <Titanium.Media.AudioPlayer.allowBackground> property.
+			 */
+			getAllowBackground(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.Media.AudioPlayer.allowBackground> property.
+			 */
+			setAllowBackground(allowBackground: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.Media.AudioPlayer.audioFocus> property.
+			 */
+			getAudioFocus(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.Media.AudioPlayer.audioFocus> property.
+			 */
+			setAudioFocus(audioFocus: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.Media.AudioPlayer.audioType> property.
+			 */
+			getAudioType(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Media.AudioPlayer.audioType> property.
+			 */
+			setAudioType(audioType: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Media.AudioPlayer.bitRate> property.
+			 */
+			getBitRate(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Media.AudioPlayer.bitRate> property.
+			 */
+			setBitRate(bitRate: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Media.AudioPlayer.duration> property.
+			 */
+			getDuration(): number;
+
+			/**
+			 * Gets the value of the <Titanium.Media.AudioPlayer.idle> property.
+			 */
+			getIdle(): boolean;
+
+			/**
+			 * Gets the value of the <Titanium.Media.AudioPlayer.paused> property.
+			 */
+			getPaused(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.Media.AudioPlayer.paused> property.
+			 */
+			setPaused(paused: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.Media.AudioPlayer.playing> property.
+			 */
+			getPlaying(): boolean;
+
+			/**
+			 * Gets the value of the <Titanium.Media.AudioPlayer.progress> property.
+			 */
+			getProgress(): number;
+
+			/**
+			 * Gets the value of the <Titanium.Media.AudioPlayer.state> property.
+			 */
+			getState(): number;
+
+			/**
+			 * Gets the value of the <Titanium.Media.AudioPlayer.url> property.
+			 */
+			getUrl(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Media.AudioPlayer.url> property.
+			 */
+			setUrl(url: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Media.AudioPlayer.volume> property.
+			 */
+			getVolume(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Media.AudioPlayer.volume> property.
+			 */
+			setVolume(volume: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Media.AudioPlayer.waiting> property.
+			 */
+			getWaiting(): boolean;
+
+			/**
+			 * Gets the value of the <Titanium.Media.AudioPlayer.bufferSize> property.
+			 */
+			getBufferSize(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Media.AudioPlayer.bufferSize> property.
+			 */
+			setBufferSize(bufferSize: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Media.AudioPlayer.time> property.
+			 */
+			getTime(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Media.AudioPlayer.time> property.
+			 */
+			setTime(time: number): void;
+
+		}
+
+		/**
+		 * An audio recorder object used for recording audio from the device microphone.
+		 */
+		interface AudioRecorder extends Titanium.Proxy {
+			/**
+			 * Audio compression to be used for the recording.
+			 */
+			compression: number;
+
+			/**
+			 * Audio format to be used for the recording.
+			 */
+			format: number;
+
+			/**
+			 * Indicates if the audio recorder is paused.
+			 */
+			readonly paused: boolean;
+
+			/**
+			 * Indicates if the audio recorder is recording.
+			 */
+			readonly recording: boolean;
+
+			/**
+			 * Indicates if the audio recorder is stopped.
+			 */
+			readonly stopped: boolean;
+
+			/**
+			 * Pauses the current audio recording.
+			 */
+			pause(): void;
+
+			/**
+			 * Resumes a paused recording.
+			 */
+			resume(): void;
+
+			/**
+			 * Starts an audio recording.
+			 */
+			start(): void;
+
+			/**
+			 * Stops the current audio recording and returns the recorded audio file.
+			 */
+			stop(): Titanium.Filesystem.File;
+
+			/**
+			 * Gets the value of the <Titanium.Media.AudioRecorder.compression> property.
+			 */
+			getCompression(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Media.AudioRecorder.compression> property.
+			 */
+			setCompression(compression: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Media.AudioRecorder.format> property.
+			 */
+			getFormat(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Media.AudioRecorder.format> property.
+			 */
+			setFormat(format: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Media.AudioRecorder.paused> property.
+			 */
+			getPaused(): boolean;
+
+			/**
+			 * Gets the value of the <Titanium.Media.AudioRecorder.recording> property.
+			 */
+			getRecording(): boolean;
+
+			/**
+			 * Gets the value of the <Titanium.Media.AudioRecorder.stopped> property.
+			 */
+			getStopped(): boolean;
+
+		}
+
+		/**
+		 * A representation of a media item returned by [openMusicLibrary](Titanium.Media.openMusicLibrary) or [queryMusicLibrary](Titanium.Media.queryMusicLibrary).
+		 */
+		interface Item extends Titanium.Proxy {
+			/**
+			 * Artist credited for the album containing this item.
+			 */
+			readonly albumArtist: string;
+
+			/**
+			 * The persistent identifier for an album artist.
+			 */
+			readonly albumArtistPersistentID: number;
+
+			/**
+			 * The key for the persistent identifier for an album.
+			 */
+			readonly albumPersistentID: number;
+
+			/**
+			 * Title of the album containing this item.
+			 */
+			readonly albumTitle: string;
+
+			/**
+			 * Number of tracks for the album containing this item.
+			 */
+			readonly albumTrackCount: number;
+
+			/**
+			 * Track number for this item.
+			 */
+			readonly albumTrackNumber: number;
+
+			/**
+			 * Artist credited for this item.
+			 */
+			readonly artist: string;
+
+			/**
+			 * Image for the item's artwork as a `Blob` object,  or `null` if no artwork is
+			 * available.
+			 */
+			readonly artwork: Titanium.Blob;
+
+			/**
+			 * A URL pointing to the media item.
+			 */
+			readonly assetURL: string;
+
+			/**
+			 * The number of musical beats per minute for the media item, corresponding
+			 * to the "BPM" field in the Info tab in the "Get Info" dialog in iTunes.
+			 */
+			readonly beatsPerMinute: number;
+
+			/**
+			 * The user's place in the media item the most recent time it was played.
+			 */
+			readonly bookmarkTime: string;
+
+			/**
+			 * Textual information about the media item, corresponding to the "Comments"
+			 * field in in the Info tab in the Get Info dialog in iTunes.
+			 */
+			readonly comments: string;
+
+			/**
+			 * Composer of this item.
+			 */
+			readonly composer: string;
+
+			/**
+			 * Date when the item was added to the music library.
+			 */
+			readonly dateAdded: Date;
+
+			/**
+			 * Total number of discs for the album containing this item.
+			 */
+			readonly discCount: number;
+
+			/**
+			 * Disc number for this item in the album.
+			 */
+			readonly discNumber: number;
+
+			/**
+			 * Genre of this item.
+			 */
+			readonly genre: string;
+
+			/**
+			 * The persistent identifier for a genre.
+			 */
+			readonly genrePersistentID: number;
+
+			/**
+			 * True if the item represents a protected asset.
+			 */
+			readonly hasProtectedAsset: boolean;
+
+			/**
+			 * True if the media item is an iCloud item.
+			 */
+			readonly isCloudItem: boolean;
+
+			/**
+			 * True if this item is part of a compilation album.
+			 */
+			readonly isCompilation: boolean;
+
+			/**
+			 * True if this item is marked as "Explicit".
+			 */
+			readonly isExplicit: boolean;
+
+			/**
+			 * The most recent calendar date on which the user played the media item.
+			 */
+			readonly lastPlayedDate: Date;
+
+			/**
+			 * Lyrics for this item.
+			 */
+			readonly lyrics: string;
+
+			/**
+			 * The type of the media.
+			 */
+			readonly mediaType: number;
+
+			/**
+			 * The key for the persistent identifier for the media item.
+			 */
+			readonly persistentID: string;
+
+			/**
+			 * Number of times the item has been played.
+			 */
+			readonly playCount: number;
+
+			/**
+			 * Length (in seconds) of this item.
+			 */
+			readonly playbackDuration: number;
+
+			/**
+			 * Used to enqueue store tracks by their ID.
+			 */
+			readonly playbackStoreID: number;
+
+			/**
+			 * Title of a podcast item.
+			 */
+			readonly podcastTitle: string;
+
+			/**
+			 * The persistent identifier for an audio podcast.
+			 */
+			readonly podcastPersistentID: number;
+
+			/**
+			 * Rating for this item.
+			 */
+			readonly rating: number;
+
+			/**
+			 * Date when this this item was released.
+			 */
+			readonly releaseDate: Date;
+
+			/**
+			 * Number of times this item has been skipped.
+			 */
+			readonly skipCount: number;
+
+			/**
+			 * Title of this item.
+			 */
+			readonly title: string;
+
+			/**
+			 * Corresponds to the "Grouping" field in the Info tab in the "Get Info"
+			 * dialog in iTunes.
+			 */
+			readonly userGrouping: string;
+
+			/**
+			 * Gets the value of the <Titanium.Media.Item.albumArtist> property.
+			 */
+			getAlbumArtist(): string;
+
+			/**
+			 * Gets the value of the <Titanium.Media.Item.albumArtistPersistentID> property.
+			 */
+			getAlbumArtistPersistentID(): number;
+
+			/**
+			 * Gets the value of the <Titanium.Media.Item.albumPersistentID> property.
+			 */
+			getAlbumPersistentID(): number;
+
+			/**
+			 * Gets the value of the <Titanium.Media.Item.albumTitle> property.
+			 */
+			getAlbumTitle(): string;
+
+			/**
+			 * Gets the value of the <Titanium.Media.Item.albumTrackCount> property.
+			 */
+			getAlbumTrackCount(): number;
+
+			/**
+			 * Gets the value of the <Titanium.Media.Item.albumTrackNumber> property.
+			 */
+			getAlbumTrackNumber(): number;
+
+			/**
+			 * Gets the value of the <Titanium.Media.Item.artist> property.
+			 */
+			getArtist(): string;
+
+			/**
+			 * Gets the value of the <Titanium.Media.Item.artwork> property.
+			 */
+			getArtwork(): Titanium.Blob;
+
+			/**
+			 * Gets the value of the <Titanium.Media.Item.assetURL> property.
+			 */
+			getAssetURL(): string;
+
+			/**
+			 * Gets the value of the <Titanium.Media.Item.beatsPerMinute> property.
+			 */
+			getBeatsPerMinute(): number;
+
+			/**
+			 * Gets the value of the <Titanium.Media.Item.bookmarkTime> property.
+			 */
+			getBookmarkTime(): string;
+
+			/**
+			 * Gets the value of the <Titanium.Media.Item.comments> property.
+			 */
+			getComments(): string;
+
+			/**
+			 * Gets the value of the <Titanium.Media.Item.composer> property.
+			 */
+			getComposer(): string;
+
+			/**
+			 * Gets the value of the <Titanium.Media.Item.dateAdded> property.
+			 */
+			getDateAdded(): Date;
+
+			/**
+			 * Gets the value of the <Titanium.Media.Item.discCount> property.
+			 */
+			getDiscCount(): number;
+
+			/**
+			 * Gets the value of the <Titanium.Media.Item.discNumber> property.
+			 */
+			getDiscNumber(): number;
+
+			/**
+			 * Gets the value of the <Titanium.Media.Item.genre> property.
+			 */
+			getGenre(): string;
+
+			/**
+			 * Gets the value of the <Titanium.Media.Item.genrePersistentID> property.
+			 */
+			getGenrePersistentID(): number;
+
+			/**
+			 * Gets the value of the <Titanium.Media.Item.hasProtectedAsset> property.
+			 */
+			getHasProtectedAsset(): boolean;
+
+			/**
+			 * Gets the value of the <Titanium.Media.Item.isCloudItem> property.
+			 */
+			getIsCloudItem(): boolean;
+
+			/**
+			 * Gets the value of the <Titanium.Media.Item.isCompilation> property.
+			 */
+			getIsCompilation(): boolean;
+
+			/**
+			 * Gets the value of the <Titanium.Media.Item.isExplicit> property.
+			 */
+			getIsExplicit(): boolean;
+
+			/**
+			 * Gets the value of the <Titanium.Media.Item.lastPlayedDate> property.
+			 */
+			getLastPlayedDate(): Date;
+
+			/**
+			 * Gets the value of the <Titanium.Media.Item.lyrics> property.
+			 */
+			getLyrics(): string;
+
+			/**
+			 * Gets the value of the <Titanium.Media.Item.mediaType> property.
+			 */
+			getMediaType(): number;
+
+			/**
+			 * Gets the value of the <Titanium.Media.Item.persistentID> property.
+			 */
+			getPersistentID(): string;
+
+			/**
+			 * Gets the value of the <Titanium.Media.Item.playCount> property.
+			 */
+			getPlayCount(): number;
+
+			/**
+			 * Gets the value of the <Titanium.Media.Item.playbackDuration> property.
+			 */
+			getPlaybackDuration(): number;
+
+			/**
+			 * Gets the value of the <Titanium.Media.Item.playbackStoreID> property.
+			 */
+			getPlaybackStoreID(): number;
+
+			/**
+			 * Gets the value of the <Titanium.Media.Item.podcastTitle> property.
+			 */
+			getPodcastTitle(): string;
+
+			/**
+			 * Gets the value of the <Titanium.Media.Item.podcastPersistentID> property.
+			 */
+			getPodcastPersistentID(): number;
+
+			/**
+			 * Gets the value of the <Titanium.Media.Item.rating> property.
+			 */
+			getRating(): number;
+
+			/**
+			 * Gets the value of the <Titanium.Media.Item.releaseDate> property.
+			 */
+			getReleaseDate(): Date;
+
+			/**
+			 * Gets the value of the <Titanium.Media.Item.skipCount> property.
+			 */
+			getSkipCount(): number;
+
+			/**
+			 * Gets the value of the <Titanium.Media.Item.title> property.
+			 */
+			getTitle(): string;
+
+			/**
+			 * Gets the value of the <Titanium.Media.Item.userGrouping> property.
+			 */
+			getUserGrouping(): string;
+
+		}
+
+		/**
+		 * This object represents a music controller.
+		 */
+		interface MusicPlayer extends Titanium.Proxy {
+			/**
+			 * Current point in song playback, in seconds.
+			 */
+			currentPlaybackTime: number;
+
+			/**
+			 * An `Item` object representing the currently playing media item.
+			 */
+			readonly nowPlaying: Titanium.Media.Item;
+
+			/**
+			 * Playback state.
+			 */
+			readonly playbackState: number;
+
+			/**
+			 * Repeat setting.
+			 */
+			repeatMode: number;
+
+			/**
+			 * Shuffle setting.
+			 */
+			shuffleMode: number;
+
+			/**
+			 * Volume level for the music player from 0.0 (muted) to 1.0 (loudest).
+			 */
+			volume: number;
+
+			/**
+			 * Pauses playback of the current media item.
+			 */
+			pause(): void;
+
+			/**
+			 * Begins playback of the current media item.
+			 */
+			play(): void;
+
+			/**
+			 * Begins seeking backward in the currently playing media.
+			 */
+			seekBackward(): void;
+
+			/**
+			 * Begins seeking forward in the currently playing media item.
+			 */
+			seekForward(): void;
+
+			/**
+			 * Sets the media queue.
+			 */
+			setQueue(queue: Titanium.Media.Item): void;
+
+			/**
+			 * Sets the media queue.
+			 */
+			setQueue(queue: ReadonlyArray<Titanium.Media.Item>): void;
+
+			/**
+			 * Sets the media queue.
+			 */
+			setQueue(queue: string): void;
+
+			/**
+			 * Skips to the beginning of the currently playing media item.
+			 */
+			skipToBeginning(): void;
+
+			/**
+			 * Skips to the next media item in the queue.
+			 */
+			skipToNext(): void;
+
+			/**
+			 * Skips to the previous media item in the queue.
+			 */
+			skipToPrevious(): void;
+
+			/**
+			 * Stops playback of the current media queue.
+			 */
+			stop(): void;
+
+			/**
+			 * Ends a seek operation and returns to the previous playback state.
+			 * See also: [seekForward](Titanium.Media.MusicPlayer.seekForward) and
+			 * [seekBackward](Titanium.Media.MusicPlayer.seekBackward).
+			 */
+			stopSeeking(): void;
+
+			/**
+			 * Gets the value of the <Titanium.Media.MusicPlayer.currentPlaybackTime> property.
+			 */
+			getCurrentPlaybackTime(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Media.MusicPlayer.currentPlaybackTime> property.
+			 */
+			setCurrentPlaybackTime(currentPlaybackTime: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Media.MusicPlayer.nowPlaying> property.
+			 */
+			getNowPlaying(): Titanium.Media.Item;
+
+			/**
+			 * Gets the value of the <Titanium.Media.MusicPlayer.playbackState> property.
+			 */
+			getPlaybackState(): number;
+
+			/**
+			 * Gets the value of the <Titanium.Media.MusicPlayer.repeatMode> property.
+			 */
+			getRepeatMode(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Media.MusicPlayer.repeatMode> property.
+			 */
+			setRepeatMode(repeatMode: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Media.MusicPlayer.shuffleMode> property.
+			 */
+			getShuffleMode(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Media.MusicPlayer.shuffleMode> property.
+			 */
+			setShuffleMode(shuffleMode: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Media.MusicPlayer.volume> property.
+			 */
+			getVolume(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Media.MusicPlayer.volume> property.
+			 */
+			setVolume(volume: number): void;
+
+		}
+
+		/**
+		 * An object for playing basic audio resources.
+		 */
+		interface Sound extends Titanium.Proxy {
+			/**
+			 * Audio data is being buffered from the network.
+			 */
+			readonly STATE_BUFFERING: number;
+
+			/**
+			 * Audio playback is being initialized.
+			 */
+			readonly STATE_INITIALIZED: number;
+
+			/**
+			 * Playback is paused.
+			 */
+			readonly STATE_PAUSED: number;
+
+			/**
+			 * Audio playback is active.
+			 */
+			readonly STATE_PLAYING: number;
+
+			/**
+			 * Audio playback is starting.
+			 */
+			readonly STATE_STARTING: number;
+
+			/**
+			 * Audio playback is stopped.
+			 */
+			readonly STATE_STOPPED: number;
+
+			/**
+			 * Audio playback is stopping.
+			 */
+			readonly STATE_STOPPING: number;
+
+			/**
+			 * Player is waiting for audio data from the network.
+			 */
+			readonly STATE_WAITING_FOR_DATA: number;
+
+			/**
+			 * Player is waiting for audio data to fill the queue.
+			 */
+			readonly STATE_WAITING_FOR_QUEUE: number;
+
+			/**
+			 * Used to identify the volume of audio streams for alarms.
+			 */
+			readonly AUDIO_TYPE_ALARM: number;
+
+			/**
+			 * Used to identify the volume of audio streams for DTMF tones or beeps.
+			 */
+			readonly AUDIO_TYPE_SIGNALLING: number;
+
+			/**
+			 * Used to identify the volume of audio streams for media playback.
+			 */
+			readonly AUDIO_TYPE_MEDIA: number;
+
+			/**
+			 * Used to identify the volume of audio streams for notifications.
+			 */
+			readonly AUDIO_TYPE_NOTIFICATION: number;
+
+			/**
+			 * Used to identify the volume of audio streams for the phone ring.
+			 */
+			readonly AUDIO_TYPE_RING: number;
+
+			/**
+			 * Used to identify the volume of audio streams for voice calls.
+			 */
+			readonly AUDIO_TYPE_VOICE: number;
+
+			/**
+			 * Determines whether the audio should continue playing even when its activity is paused.
+			 */
+			allowBackground: boolean;
+
+			/**
+			 * Changes the audio-stream-type.
+			 */
+			audioType: number;
+
+			/**
+			 * Duration of the audio resource.
+			 */
+			readonly duration: number;
+
+			/**
+			 * Determines whether the audio should loop upon completion.
+			 */
+			looping: boolean;
+
+			/**
+			 * Indicates if the audio is paused.
+			 */
+			paused: boolean;
+
+			/**
+			 * Indicates if the audio is playing.
+			 */
+			readonly playing: boolean;
+
+			/**
+			 * Current playback position of the audio.
+			 */
+			time: number;
+
+			/**
+			 * URL identifying the audio resource.
+			 */
+			url: string;
+
+			/**
+			 * Volume of the audio from 0.0 (muted) to 1.0 (loudest).
+			 */
+			volume: number;
+
+			/**
+			 * Returns the value of the [looping](Titanium.Media.Sound.looping) property.
+			 */
+			isLooping(): boolean;
+
+			/**
+			 * Returns the value of the [paused](Titanium.Media.Sound.paused) property.
+			 */
+			isPaused(): boolean;
+
+			/**
+			 * Returns the value of the [playing](Titanium.Media.Sound.playing) property.
+			 */
+			isPlaying(): boolean;
+
+			/**
+			 * Pauses the audio.
+			 */
+			pause(): void;
+
+			/**
+			 * Starting playing the sound, or resume playing a paused sound.
+			 */
+			play(): void;
+
+			/**
+			 * Releases all internal resources.
+			 */
+			release(): void;
+
+			/**
+			 * Resets the audio playback position to the beginning.
+			 */
+			reset(): void;
+
+			/**
+			 * Sets the value of the [looping](Titanium.Media.Sound.looping) property.
+			 */
+			setLooping(looping: boolean): void;
+
+			/**
+			 * Sets the value of the [paused](Titanium.Media.Sound.paused) property.
+			 */
+			setPaused(paused: boolean): void;
+
+			/**
+			 * Stops playing the audio and resets the playback position to the beginning of the clip.
+			 */
+			stop(): void;
+
+			/**
+			 * Gets the value of the <Titanium.Media.Sound.audioType> property.
+			 */
+			getAudioType(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Media.Sound.audioType> property.
+			 */
+			setAudioType(audioType: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Media.Sound.duration> property.
+			 */
+			getDuration(): number;
+
+			/**
+			 * Gets the value of the <Titanium.Media.Sound.time> property.
+			 */
+			getTime(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Media.Sound.time> property.
+			 */
+			setTime(time: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Media.Sound.url> property.
+			 */
+			getUrl(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Media.Sound.url> property.
+			 */
+			setUrl(url: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Media.Sound.volume> property.
+			 */
+			getVolume(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Media.Sound.volume> property.
+			 */
+			setVolume(volume: number): void;
+
+		}
+
+		/**
+		 * An object for playing system sounds.
+		 */
+		interface SystemAlert extends Titanium.Proxy {
+			/**
+			 * URL identifying the audio resource.
+			 */
+			url: string;
+
+			/**
+			 * Start playing the system alert.
+			 */
+			play(): void;
+
+			/**
+			 * Gets the value of the <Titanium.Media.SystemAlert.url> property.
+			 */
+			getUrl(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Media.SystemAlert.url> property.
+			 */
+			setUrl(url: string): void;
+
+		}
+
+		/**
+		 * A native control for playing videos.
+		 */
+		interface VideoPlayer extends Titanium.UI.View {
+			/**
+			 * Whether or not the current movie can be played on a remote device.
+			 */
+			allowsAirPlay: boolean;
+
+			/**
+			 * Indicates if a movie should automatically start playback.
+			 */
+			autoplay: boolean;
+
+			/**
+			 * Sets the background view for customization which is always displayed behind movie content.
+			 */
+			backgroundView: Titanium.UI.View;
+
+			/**
+			 * URL of the media to play.
+			 */
+			contentURL: string;
+
+			/**
+			 * Current playback time of the current movie in milliseconds.
+			 */
+			currentPlaybackTime: number;
+
+			/**
+			 * The duration of the current movie in milliseconds, or 0.0 if not known.
+			 */
+			duration: number;
+
+			/**
+			 * The end time of movie playback, in milliseconds.
+			 */
+			endPlaybackTime: number;
+
+			/**
+			 * Determines if the movie is presented in the entire screen (obscuring all other application content).
+			 */
+			fullscreen: boolean;
+
+			/**
+			 * The start time of movie playback, in milliseconds.
+			 */
+			initialPlaybackTime: number;
+
+			/**
+			 * Returns the network load state of the movie player.
+			 */
+			readonly loadState: number;
+
+			/**
+			 * Media object to play, as either a `File`,  a `Blob`, or a URL.
+			 */
+			media: Titanium.Blob | Titanium.Filesystem.File | string;
+
+			/**
+			 * The style of the playback controls.
+			 */
+			mediaControlStyle: number;
+
+			/**
+			 * The types of media in the movie, or <Titanium.Media.VIDEO_MEDIA_TYPE_NONE> if not known.
+			 */
+			mediaTypes: number;
+
+			/**
+			 * Style of the media playback controls.
+			 */
+			movieControlMode: number;
+
+			/**
+			 * Returns the status of the movie player.
+			 */
+			readonly moviePlayerStatus: number;
+
+			/**
+			 * Returns the natural size of the movie.
+			 */
+			naturalSize: MovieSize;
+
+			/**
+			 * Use the overlay view to add additional custom views between the video content and the controls.
+			 */
+			overlayView: Titanium.UI.View;
+
+			/**
+			 * Whether or not the receiver allows Picture in Picture playback.
+			 */
+			pictureInPictureEnabled: boolean;
+
+			/**
+			 * Currently playable duration of the movie, in milliseconds, for progressively
+			 * downloaded network content, or 0.0 if not known.
+			 */
+			readonly playableDuration: number;
+
+			/**
+			 * Current playback state of the video player.
+			 */
+			readonly playbackState: number;
+
+			/**
+			 * Boolean to indicate if the player has started playing.
+			 */
+			readonly playing: boolean;
+
+			/**
+			 * Determines how the movie player repeats when reaching the end of playback.
+			 */
+			repeatMode: number;
+
+			/**
+			 * Determines how the content scales to fit the view.
+			 */
+			scalingMode: number;
+
+			/**
+			 * Whether or not the receiver shows playback controls. Default is YES.
+			 */
+			showsControls: boolean;
+
+			/**
+			 * The playback type of the movie.
+			 */
+			sourceType: number;
+
+			/**
+			 * URL of the media to play.
+			 */
+			url: string | string[];
+
+			/**
+			 * Indicates if the movie player should inherit the application's audio session
+			 * instead of creating a new session.
+			 */
+			useApplicationAudioSession: boolean;
+
+			/**
+			 * Volume of the audio portion of the video.
+			 */
+			volume: number;
+
+			/**
+			 * Cancels all pending asynchronous thumbnail requests.
+			 */
+			cancelAllThumbnailImageRequests(): void;
+
+			/**
+			 * Pauses playing the video.
+			 */
+			pause(): void;
+
+			/**
+			 * Starts playing the video.
+			 */
+			play(): void;
+
+			/**
+			 * Releases the internal video resources immediately.
+			 */
+			release(): void;
+
+			/**
+			 * Asynchronously request thumbnail images for one or more points in time in the video.
+			 */
+			requestThumbnailImagesAtTimes(times: ReadonlyArray<number>, option: number, callback: (param0: ThumbnailResponse) => any): void;
+
+			/**
+			 * Stops playing the video.
+			 */
+			stop(): void;
+
+			/**
+			 * Returns a thumbnail image for the video at the specified time.
+			 */
+			thumbnailImageAtTime(time: number, option: number): Titanium.Blob;
+
+			/**
+			 * Gets the value of the <Titanium.Media.VideoPlayer.allowsAirPlay> property.
+			 */
+			getAllowsAirPlay(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.Media.VideoPlayer.allowsAirPlay> property.
+			 */
+			setAllowsAirPlay(allowsAirPlay: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.Media.VideoPlayer.autoplay> property.
+			 */
+			getAutoplay(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.Media.VideoPlayer.autoplay> property.
+			 */
+			setAutoplay(autoplay: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.Media.VideoPlayer.backgroundView> property.
+			 */
+			getBackgroundView(): Titanium.UI.View;
+
+			/**
+			 * Sets the value of the <Titanium.Media.VideoPlayer.backgroundView> property.
+			 */
+			setBackgroundView(backgroundView: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.Media.VideoPlayer.contentURL> property.
+			 */
+			getContentURL(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Media.VideoPlayer.contentURL> property.
+			 */
+			setContentURL(contentURL: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Media.VideoPlayer.currentPlaybackTime> property.
+			 */
+			getCurrentPlaybackTime(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Media.VideoPlayer.currentPlaybackTime> property.
+			 */
+			setCurrentPlaybackTime(currentPlaybackTime: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Media.VideoPlayer.duration> property.
+			 */
+			getDuration(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Media.VideoPlayer.duration> property.
+			 */
+			setDuration(duration: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Media.VideoPlayer.endPlaybackTime> property.
+			 */
+			getEndPlaybackTime(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Media.VideoPlayer.endPlaybackTime> property.
+			 */
+			setEndPlaybackTime(endPlaybackTime: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Media.VideoPlayer.fullscreen> property.
+			 */
+			getFullscreen(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.Media.VideoPlayer.fullscreen> property.
+			 */
+			setFullscreen(fullscreen: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.Media.VideoPlayer.initialPlaybackTime> property.
+			 */
+			getInitialPlaybackTime(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Media.VideoPlayer.initialPlaybackTime> property.
+			 */
+			setInitialPlaybackTime(initialPlaybackTime: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Media.VideoPlayer.loadState> property.
+			 */
+			getLoadState(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Media.VideoPlayer.media> property.
+			 */
+			setMedia(media: Titanium.Blob): void;
+
+			/**
+			 * Sets the value of the <Titanium.Media.VideoPlayer.media> property.
+			 */
+			setMedia(media: Titanium.Filesystem.File): void;
+
+			/**
+			 * Sets the value of the <Titanium.Media.VideoPlayer.media> property.
+			 */
+			setMedia(media: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Media.VideoPlayer.mediaControlStyle> property.
+			 */
+			getMediaControlStyle(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Media.VideoPlayer.mediaControlStyle> property.
+			 */
+			setMediaControlStyle(mediaControlStyle: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Media.VideoPlayer.mediaTypes> property.
+			 */
+			getMediaTypes(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Media.VideoPlayer.mediaTypes> property.
+			 */
+			setMediaTypes(mediaTypes: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Media.VideoPlayer.movieControlMode> property.
+			 */
+			getMovieControlMode(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Media.VideoPlayer.movieControlMode> property.
+			 */
+			setMovieControlMode(movieControlMode: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Media.VideoPlayer.moviePlayerStatus> property.
+			 */
+			getMoviePlayerStatus(): number;
+
+			/**
+			 * Gets the value of the <Titanium.Media.VideoPlayer.naturalSize> property.
+			 */
+			getNaturalSize(): MovieSize;
+
+			/**
+			 * Sets the value of the <Titanium.Media.VideoPlayer.naturalSize> property.
+			 */
+			setNaturalSize(naturalSize: MovieSize): void;
+
+			/**
+			 * Gets the value of the <Titanium.Media.VideoPlayer.overlayView> property.
+			 */
+			getOverlayView(): Titanium.UI.View;
+
+			/**
+			 * Sets the value of the <Titanium.Media.VideoPlayer.overlayView> property.
+			 */
+			setOverlayView(overlayView: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.Media.VideoPlayer.pictureInPictureEnabled> property.
+			 */
+			getPictureInPictureEnabled(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.Media.VideoPlayer.pictureInPictureEnabled> property.
+			 */
+			setPictureInPictureEnabled(pictureInPictureEnabled: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.Media.VideoPlayer.playableDuration> property.
+			 */
+			getPlayableDuration(): number;
+
+			/**
+			 * Gets the value of the <Titanium.Media.VideoPlayer.playbackState> property.
+			 */
+			getPlaybackState(): number;
+
+			/**
+			 * Gets the value of the <Titanium.Media.VideoPlayer.playing> property.
+			 */
+			getPlaying(): boolean;
+
+			/**
+			 * Gets the value of the <Titanium.Media.VideoPlayer.repeatMode> property.
+			 */
+			getRepeatMode(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Media.VideoPlayer.repeatMode> property.
+			 */
+			setRepeatMode(repeatMode: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Media.VideoPlayer.scalingMode> property.
+			 */
+			getScalingMode(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Media.VideoPlayer.scalingMode> property.
+			 */
+			setScalingMode(scalingMode: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Media.VideoPlayer.showsControls> property.
+			 */
+			getShowsControls(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.Media.VideoPlayer.showsControls> property.
+			 */
+			setShowsControls(showsControls: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.Media.VideoPlayer.sourceType> property.
+			 */
+			getSourceType(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Media.VideoPlayer.sourceType> property.
+			 */
+			setSourceType(sourceType: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Media.VideoPlayer.url> property.
+			 */
+			getUrl(): string | string[];
+
+			/**
+			 * Sets the value of the <Titanium.Media.VideoPlayer.url> property.
+			 */
+			setUrl(url: string): void;
+
+			/**
+			 * Sets the value of the <Titanium.Media.VideoPlayer.url> property.
+			 */
+			setUrl(url: ReadonlyArray<string>): void;
+
+			/**
+			 * Gets the value of the <Titanium.Media.VideoPlayer.useApplicationAudioSession> property.
+			 */
+			getUseApplicationAudioSession(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.Media.VideoPlayer.useApplicationAudioSession> property.
+			 */
+			setUseApplicationAudioSession(useApplicationAudioSession: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.Media.VideoPlayer.volume> property.
+			 */
+			getVolume(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Media.VideoPlayer.volume> property.
+			 */
+			setVolume(volume: number): void;
+
+		}
+
+
+		/**
+		 * Android-specific media-related functionality.
+		 */
+		namespace Android {
+			/**
+			 * Indicates if the proxy will bubble an event to its parent.
+			 */
+			let bubbleParent: boolean;
+
+			/**
+			 * The name of the API that this proxy corresponds to.
+			 */
+			const apiName: string;
+
+			/**
+			 * The Window or TabGroup whose Activity lifecycle should be triggered on the proxy.
+			 */
+			let lifecycleContainer: Titanium.UI.Window | Titanium.UI.TabGroup;
+
+			/**
+			 * Adds the specified callback as an event listener for the named event.
+			 */
+			function addEventListener(name: string, callback: (param0: any) => any): void;
+
+			/**
+			 * Removes the specified callback as an event listener for the named event.
+			 */
+			function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+			/**
+			 * Fires a synthesized event to any registered listeners.
+			 */
+			function fireEvent(name: string, event: any): void;
+
+			/**
+			 * Applies the properties to the proxy.
+			 */
+			function applyProperties(props: any): void;
+
+			/**
+			 * Scans newly created or downloaded media files to make them available to other
+			 * Android media providers, such as the Gallery.
+			 */
+			function scanMediaFiles(paths: ReadonlyArray<string>, mimeTypes: ReadonlyArray<string>, callback: (param0: MediaScannerResponse) => any): void;
+
+			/**
+			 * Set the system homescreen wallpaper.
+			 */
+			function setSystemWallpaper(image: Titanium.Blob, scale: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.Media.Android.bubbleParent> property.
+			 */
+			function getBubbleParent(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.Media.Android.bubbleParent> property.
+			 */
+			function setBubbleParent(bubbleParent: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.Media.Android.apiName> property.
+			 */
+			function getApiName(): string;
+
+			/**
+			 * Gets the value of the <Titanium.Media.Android.lifecycleContainer> property.
+			 */
+			function getLifecycleContainer(): Titanium.UI.Window | Titanium.UI.TabGroup;
+
+			/**
+			 * Sets the value of the <Titanium.Media.Android.lifecycleContainer> property.
+			 */
+			function setLifecycleContainer(lifecycleContainer: Titanium.UI.Window): void;
+
+			/**
+			 * Sets the value of the <Titanium.Media.Android.lifecycleContainer> property.
+			 */
+			function setLifecycleContainer(lifecycleContainer: Titanium.UI.TabGroup): void;
+
+		}
+	}
+
+	/**
+	 * The top level network module.
+	 */
+	namespace Network {
+		/**
+		 * Indicates if the proxy will bubble an event to its parent.
+		 */
+		let bubbleParent: boolean;
+
+		/**
+		 * The name of the API that this proxy corresponds to.
+		 */
+		const apiName: string;
+
+		/**
+		 * The Window or TabGroup whose Activity lifecycle should be triggered on the proxy.
+		 */
+		let lifecycleContainer: Titanium.UI.Window | Titanium.UI.TabGroup;
+
+		/**
+		 * Special hostname value for listening sockets, representing all
+		 * locally available network interfaces.
+		 */
+		const INADDR_ANY: string;
+
+		/**
+		 * A [networkType](Titanium.Network.networkType) value indicating that the device is
+		 * communicating over a local-area network.
+		 */
+		const NETWORK_LAN: number;
+
+		/**
+		 * A [networkType](Titanium.Network.networkType) value indicating that the device is
+		 * communicating over a mobile network.
+		 */
+		const NETWORK_MOBILE: number;
+
+		/**
+		 * A [networkType](Titanium.Network.networkType) value indicating that no
+		 * network is available.
+		 */
+		const NETWORK_NONE: number;
+
+		/**
+		 * A [networkType](Titanium.Network.networkType) value indicating that the
+		 * current network type is unknown.
+		 */
+		const NETWORK_UNKNOWN: number;
+
+		/**
+		 * A [networkType](Titanium.Network.networkType) value indicating that the
+		 * device is communicating over a WiFi network.
+		 */
+		const NETWORK_WIFI: number;
+
+		/**
+		 * Constant value for an Alert style push notification.
+		 */
+		const NOTIFICATION_TYPE_ALERT: number;
+
+		/**
+		 * Constant value for a Badge style push notification.
+		 */
+		const NOTIFICATION_TYPE_BADGE: number;
+
+		/**
+		 * Constant value for a Sound style push notification.
+		 */
+		const NOTIFICATION_TYPE_SOUND: number;
+
+		/**
+		 * Constant value for a Newsstand style push notification. Only available on iOS5 and later
+		 */
+		const NOTIFICATION_TYPE_NEWSSTAND: number;
+
+		/**
+		 * Constant value specifying read-only mode for sockets.
+		 */
+		const READ_MODE: number;
+
+		/**
+		 * Constant value specifying read-write mode for sockets.
+		 */
+		const READ_WRITE_MODE: number;
+
+		/**
+		 * Constant value representing a socket in the CLOSED state.
+		 */
+		const SOCKET_CLOSED: number;
+
+		/**
+		 * Constant value representing a socket in the CONNECTED state.
+		 */
+		const SOCKET_CONNECTED: number;
+
+		/**
+		 * Constant value representing a socket in the ERROR state.
+		 */
+		const SOCKET_ERROR: number;
+
+		/**
+		 * Constant value representing a socket in the INITIALIZED state.
+		 */
+		const SOCKET_INITIALIZED: number;
+
+		/**
+		 * Constant value representing a socket in the LISTENING state.
+		 */
+		const SOCKET_LISTENING: number;
+
+		/**
+		 * Constant value specifying write-only mode for sockets.
+		 */
+		const WRITE_MODE: number;
+
+		/**
+		 * Constant value specifying TLS version 1.0 for SSL.
+		 */
+		const TLS_VERSION_1_0: number;
+
+		/**
+		 * Constant value specifying TLS version 1.1 for SSL.
+		 */
+		const TLS_VERSION_1_1: number;
+
+		/**
+		 * Constant value specifying TLS version 1.2 for SSL.
+		 */
+		const TLS_VERSION_1_2: number;
+
+		/**
+		 * Constant value specifying that the progress of a download can not be calculated.
+		 */
+		const PROGRESS_UNKNOWN: number;
+
+		/**
+		 * A list of all cookies in the cookie storage.
+		 */
+		const allHTTPCookies: Titanium.Network.Cookie[];
+
+		/**
+		 * Network type value as a constant.
+		 */
+		const networkType: number;
+
+		/**
+		 * Network type as a String. Returns one of `NONE`, `WIFI`, `LAN`, `MOBILE`, or `UNKNOWN`.
+		 */
+		const networkTypeName: string;
+
+		/**
+		 * Boolean value indicating if the device can reach the Internet.
+		 */
+		const online: boolean;
+
+		/**
+		 * Remote device UUID if the device is registered with the Apple Push Notification
+		 * Service, or null if it is not registered.
+		 */
+		const remoteDeviceUUID: string;
+
+		/**
+		 * Array of push notification type constants enabled for the application.
+		 */
+		const remoteNotificationTypes: number[];
+
+		/**
+		 * Indicates whether push  notifications have been enabled using
+		 * [registerForPushNotifications](Titanium.Network.registerForPushNotifications).
+		 */
+		const remoteNotificationsEnabled: boolean;
+
+		/**
+		 * Adds the specified callback as an event listener for the named event.
+		 */
+		function addEventListener(name: string, callback: (param0: any) => any): void;
+
+		/**
+		 * Removes the specified callback as an event listener for the named event.
+		 */
+		function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+		/**
+		 * Fires a synthesized event to any registered listeners.
+		 */
+		function fireEvent(name: string, event: any): void;
+
+		/**
+		 * Applies the properties to the proxy.
+		 */
+		function applyProperties(props: any): void;
+
+		/**
+		 * Legacy method to add a connectivity listener to listen for network changes.
+		 */
+		function addConnectivityListener(callback: (param0: any) => any): void;
+
+		/**
+		 * Adds a cookie to the HTTP client cookie store.
+		 */
+		function addHTTPCookie(cookie: Titanium.Network.Cookie): void;
+
+		/**
+		 * Adds a cookie to the system cookie store.
+		 */
+		function addSystemCookie(cookie: Titanium.Network.Cookie): void;
+
+		/**
+		 * Creates and returns a `BonjourBrowser` object.
+		 */
+		function createBonjourBrowser(serviceType: string, domain: string, parameters?: any): Titanium.Network.BonjourBrowser;
+
+		/**
+		 * Creates and returns a `BonjourService` object.
+		 */
+		function createBonjourService(name: string, type: string, domain: string, parameters?: any): Titanium.Network.BonjourService;
+
+		/**
+		 * Legacy method to create and return an instance of <Titanium.Network.TCPSocket>.
+		 */
+		function createTCPSocket(hostName: string, port: number, mode: number, parameters: any): Titanium.Network.TCPSocket;
+
+		/**
+		 * Returns a decoded version of a URI encoded value.
+		 */
+		function decodeURIComponent(value: string): string;
+
+		/**
+		 * Returns a URI encoded version of the specified URI component.
+		 */
+		function encodeURIComponent(value: string): string;
+
+		/**
+		 * Gets all the cookies with the domain, path and name matched with the given values from the HTTP client cookie store.
+		 */
+		function getHTTPCookies(domain: string, path: string, name: string): Titanium.Network.Cookie[];
+
+		/**
+		 * Gets all the cookies with the domain matched with the given values from the HTTP client cookie store.
+		 */
+		function getHTTPCookiesForDomain(domain: string): Titanium.Network.Cookie[];
+
+		/**
+		 * Gets all the cookies with the domain, path and name matched with the given values from the system cookie store.
+		 */
+		function getSystemCookies(domain: string, path: string, name: string): Titanium.Network.Cookie[];
+
+		/**
+		 * Removes all the cookies from the HTTP client cookie store.
+		 */
+		function removeAllHTTPCookies(): void;
+
+		/**
+		 * Removes all the cookie from the system client cookie store.
+		 */
+		function removeAllSystemCookies(): void;
+
+		/**
+		 * Removes the cookie with the domain, path and name exactly the same as the given values from the HTTP client cookie store.
+		 */
+		function removeHTTPCookie(domain: string, path: string, name: string): void;
+
+		/**
+		 * Removes the cookies with the domain matched with the given values from the HTTP client cookie store.
+		 */
+		function removeHTTPCookiesForDomain(domain: string): void;
+
+		/**
+		 * Removes the cookie with the domain, path and name exactly the same as the given values from the system cookie store.
+		 */
+		function removeSystemCookie(domain: string, path: string, name: string): void;
+
+		/**
+		 * Registers for push notifications with the Apple Push Notification Service.
+		 */
+		function registerForPushNotifications(config: PushNotificationConfig): void;
+
+		/**
+		 * Legacy method to remove a connectivity listener.
+		 */
+		function removeConnectivityListener(callback: (param0: any) => any): void;
+
+		/**
+		 * Unregisters the application for push notifications.
+		 */
+		function unregisterForPushNotifications(): void;
+
+		/**
+		 * Creates and returns an instance of <Titanium.Network.Cookie>.
+		 */
+		function createCookie(parameters?: any): Titanium.Network.Cookie;
+
+		/**
+		 * Creates and returns an instance of <Titanium.Network.HTTPClient>.
+		 */
+		function createHTTPClient(parameters?: any): Titanium.Network.HTTPClient;
+
+		/**
+		 * Gets the value of the <Titanium.Network.bubbleParent> property.
+		 */
+		function getBubbleParent(): boolean;
+
+		/**
+		 * Sets the value of the <Titanium.Network.bubbleParent> property.
+		 */
+		function setBubbleParent(bubbleParent: boolean): void;
+
+		/**
+		 * Gets the value of the <Titanium.Network.apiName> property.
+		 */
+		function getApiName(): string;
+
+		/**
+		 * Gets the value of the <Titanium.Network.lifecycleContainer> property.
+		 */
+		function getLifecycleContainer(): Titanium.UI.Window | Titanium.UI.TabGroup;
+
+		/**
+		 * Sets the value of the <Titanium.Network.lifecycleContainer> property.
+		 */
+		function setLifecycleContainer(lifecycleContainer: Titanium.UI.Window): void;
+
+		/**
+		 * Sets the value of the <Titanium.Network.lifecycleContainer> property.
+		 */
+		function setLifecycleContainer(lifecycleContainer: Titanium.UI.TabGroup): void;
+
+		/**
+		 * Gets the value of the <Titanium.Network.allHTTPCookies> property.
+		 */
+		function getAllHTTPCookies(): Titanium.Network.Cookie[];
+
+		/**
+		 * Gets the value of the <Titanium.Network.networkType> property.
+		 */
+		function getNetworkType(): number;
+
+		/**
+		 * Gets the value of the <Titanium.Network.networkTypeName> property.
+		 */
+		function getNetworkTypeName(): string;
+
+		/**
+		 * Gets the value of the <Titanium.Network.online> property.
+		 */
+		function getOnline(): boolean;
+
+		/**
+		 * Gets the value of the <Titanium.Network.remoteDeviceUUID> property.
+		 */
+		function getRemoteDeviceUUID(): string;
+
+		/**
+		 * Gets the value of the <Titanium.Network.remoteNotificationTypes> property.
+		 */
+		function getRemoteNotificationTypes(): number[];
+
+		/**
+		 * Gets the value of the <Titanium.Network.remoteNotificationsEnabled> property.
+		 */
+		function getRemoteNotificationsEnabled(): boolean;
+
+		/**
+		 * A browser for the discovery and retrieval of Bonjour services available on the network.
+		 */
+		interface BonjourBrowser extends Titanium.Proxy {
+			/**
+			 * The domain the browser is searching in
+			 */
+			domain: string;
+
+			/**
+			 * Whether or not the browser is currently searching
+			 */
+			isSearching: boolean;
+
+			/**
+			 * The type of the service the browser searches for
+			 */
+			serviceType: string;
+
+			/**
+			 * Conduct a search for Bonjour services matching the type and domain specified during creation
+			 */
+			search(): void;
+
+			/**
+			 * Halt an ongoing search
+			 */
+			stopSearch(): void;
+
+			/**
+			 * Gets the value of the <Titanium.Network.BonjourBrowser.domain> property.
+			 */
+			getDomain(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Network.BonjourBrowser.domain> property.
+			 */
+			setDomain(domain: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Network.BonjourBrowser.isSearching> property.
+			 */
+			getIsSearching(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.Network.BonjourBrowser.isSearching> property.
+			 */
+			setIsSearching(isSearching: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.Network.BonjourBrowser.serviceType> property.
+			 */
+			getServiceType(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Network.BonjourBrowser.serviceType> property.
+			 */
+			setServiceType(serviceType: string): void;
+
+		}
+
+		/**
+		 * Describes a service on the network which is published by Bonjour.
+		 */
+		interface BonjourService extends Titanium.Proxy {
+			/**
+			 * the domain of the service
+			 */
+			domain: string;
+
+			/**
+			 * whether or not the service is local to the device
+			 */
+			isLocal: boolean;
+
+			/**
+			 * the name of the service
+			 */
+			name: string;
+
+			/**
+			 * the TCPSocket object that is used to connect to the service
+			 */
+			socket: any;
+
+			/**
+			 * the type of the service
+			 */
+			type: string;
+
+			/**
+			 * Publish a Bonjour service to the network.  Only works if isLocal is TRUE
+			 */
+			publish(socket: any): void;
+
+			/**
+			 * Resolve a Bonjour service from the network.  Must be done before attempting to access the service's socket information, if a remote service.  You cannot resolve a locally published service.
+			 */
+			resolve(timeout: number): void;
+
+			/**
+			 * Halts publication of a service.
+			 */
+			stop(): void;
+
+			/**
+			 * Gets the value of the <Titanium.Network.BonjourService.domain> property.
+			 */
+			getDomain(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Network.BonjourService.domain> property.
+			 */
+			setDomain(domain: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Network.BonjourService.isLocal> property.
+			 */
+			getIsLocal(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.Network.BonjourService.isLocal> property.
+			 */
+			setIsLocal(isLocal: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.Network.BonjourService.name> property.
+			 */
+			getName(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Network.BonjourService.name> property.
+			 */
+			setName(name: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Network.BonjourService.socket> property.
+			 */
+			getSocket(): any;
+
+			/**
+			 * Sets the value of the <Titanium.Network.BonjourService.socket> property.
+			 */
+			setSocket(socket: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.Network.BonjourService.type> property.
+			 */
+			getType(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Network.BonjourService.type> property.
+			 */
+			setType(type: string): void;
+
+		}
+
+		/**
+		 * Cookie object used to manage the system cookie store and HTTP client cookie store.
+		 */
+		interface Cookie extends Titanium.Proxy {
+			/**
+			 * The comment describing the purpose of this cookie
+			 */
+			comment: string;
+
+			/**
+			 * The domain attribute of the cookie.
+			 */
+			domain: string;
+
+			/**
+			 * The expiration Date of the cookie.
+			 */
+			expiryDate: string;
+
+			/**
+			 * Sets the Max-Age attribute of a Cookie, in delta-seconds.
+			 */
+			maxAge: number;
+
+			/**
+			 * The httponly attribute of the cookie.
+			 */
+			httponly: boolean;
+
+			/**
+			 * The name of the cookie.
+			 */
+			readonly name: string;
+
+			/**
+			 * The origual url attribute of the cookie.
+			 */
+			originalUrl: string;
+
+			/**
+			 * The path attribute of the cookie.
+			 */
+			path: string;
+
+			/**
+			 * The secure attribute of the cookie.
+			 */
+			secure: boolean;
+
+			/**
+			 * The value of the cookie.
+			 */
+			value: string;
+
+			/**
+			 * The version of the cookie specification to which this cookie conforms.
+			 */
+			version: number;
+
+			/**
+			 * Returns true if the cookie is valid.
+			 */
+			isValid(): boolean;
+
+			/**
+			 * Gets the value of the <Titanium.Network.Cookie.comment> property.
+			 */
+			getComment(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Network.Cookie.comment> property.
+			 */
+			setComment(comment: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Network.Cookie.domain> property.
+			 */
+			getDomain(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Network.Cookie.domain> property.
+			 */
+			setDomain(domain: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Network.Cookie.expiryDate> property.
+			 */
+			getExpiryDate(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Network.Cookie.expiryDate> property.
+			 */
+			setExpiryDate(expiryDate: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Network.Cookie.maxAge> property.
+			 */
+			getMaxAge(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Network.Cookie.maxAge> property.
+			 */
+			setMaxAge(maxAge: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Network.Cookie.httponly> property.
+			 */
+			getHttponly(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.Network.Cookie.httponly> property.
+			 */
+			setHttponly(httponly: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.Network.Cookie.name> property.
+			 */
+			getName(): string;
+
+			/**
+			 * Gets the value of the <Titanium.Network.Cookie.originalUrl> property.
+			 */
+			getOriginalUrl(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Network.Cookie.originalUrl> property.
+			 */
+			setOriginalUrl(originalUrl: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Network.Cookie.path> property.
+			 */
+			getPath(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Network.Cookie.path> property.
+			 */
+			setPath(path: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Network.Cookie.secure> property.
+			 */
+			getSecure(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.Network.Cookie.secure> property.
+			 */
+			setSecure(secure: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.Network.Cookie.value> property.
+			 */
+			getValue(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Network.Cookie.value> property.
+			 */
+			setValue(value: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Network.Cookie.version> property.
+			 */
+			getVersion(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Network.Cookie.version> property.
+			 */
+			setVersion(version: number): void;
+
+		}
+
+		/**
+		 * HTTP client object that (mostly) implements the XMLHttpRequest specification.
+		 */
+		interface HTTPClient extends Titanium.Proxy {
+			/**
+			 * Ready state constant indicating that the request is complete.
+			 */
+			readonly DONE: number;
+
+			/**
+			 * Ready state constant indicating that response headers have been received.
+			 */
+			readonly HEADERS_RECEIVED: number;
+
+			/**
+			 * Ready state constant indicating that response data is being received from the remote server.
+			 */
+			readonly LOADING: number;
+
+			/**
+			 * Ready state constant indicating that the connection has been opened, but the request has
+			 * not yet been sent.
+			 */
+			readonly OPENED: number;
+
+			/**
+			 * Ready state constant indicating that HTTPClient request has not been opened or sent.
+			 */
+			readonly UNSENT: number;
+
+			/**
+			 * All of the response headers.
+			 */
+			readonly allResponseHeaders: string;
+
+			/**
+			 * Returns all the response headers returned with the request.
+			 */
+			readonly responseHeaders: any;
+
+			/**
+			 * Determines whether automatic encoding is enabled for the specified URL.
+			 */
+			autoEncodeUrl: boolean;
+
+			/**
+			 * Determines whether automatic automatic handling of HTTP redirects is enabled.
+			 */
+			autoRedirect: boolean;
+
+			/**
+			 * Indicates whether the response was successful.
+			 */
+			readonly connected: boolean;
+
+			/**
+			 * Connection type, normally either `GET`, `POST` or `PATCH`.
+			 */
+			readonly connectionType: string;
+
+			/**
+			 * Sets the domain parameter for authentication credentials.
+			 */
+			domain: string;
+
+			/**
+			 * Determines whether the client should attempt to keep a persistent connection.
+			 */
+			enableKeepAlive: boolean;
+
+			/**
+			 * Target local file to receive data.
+			 */
+			file: string;
+
+			/**
+			 * Absolute URL of the request.
+			 */
+			readonly location: string;
+
+			/**
+			 * Function to be called at regular intervals as the request data is being received.
+			 */
+			ondatastream: (param0: any) => any;
+
+			/**
+			 * Function to be called upon a error response.
+			 */
+			onerror: (param0: FailureResponse) => any;
+
+			/**
+			 * Function to be called upon a successful response.
+			 */
+			onload: (param0: SuccessResponse) => any;
+
+			/**
+			 * Function to be called for each [readyState](Titanium.Network.HTTPClient.readyState) change.
+			 */
+			onreadystatechange: (param0: any) => any;
+
+			/**
+			 * Function to be called at regular intervals as the request data is being transmitted.
+			 */
+			onsendstream: (param0: any) => any;
+
+			/**
+			 * Sets the password parameter for authentication credentials.
+			 */
+			password: string;
+
+			/**
+			 * The current ready state of this HTTP request.
+			 */
+			readonly readyState: number;
+
+			/**
+			 * Response data as a `Blob` object.
+			 */
+			readonly responseData: Titanium.Blob;
+
+			/**
+			 * Response as text.
+			 */
+			readonly responseText: string;
+
+			/**
+			 * Response object as an XML DOM Document object.
+			 */
+			readonly responseXML: Titanium.XML.Document;
+
+			/**
+			 * The Security Manager for this client.
+			 */
+			securityManager: SecurityManagerProtocol;
+
+			/**
+			 * Response HTTP status code.
+			 */
+			readonly status: number;
+
+			/**
+			 * Human-readable status message associated with the status code.
+			 */
+			readonly statusText: string;
+
+			/**
+			 * Timeout in milliseconds when the connection should be aborted.
+			 */
+			timeout: number;
+
+			/**
+			 * Sets the username parameter for authentication credentials.
+			 */
+			username: string;
+
+			/**
+			 * Determines how SSL certification validation is performed on connection.
+			 */
+			validatesSecureCertificate: boolean;
+
+			/**
+			 * Sets the TLS version to use for handshakes.
+			 */
+			tlsVersion: number;
+
+			/**
+			 * Determines whether HTTP responses are cached.
+			 */
+			cache: boolean;
+
+			/**
+			 * Cancels a pending request.
+			 */
+			abort(): void;
+
+			/**
+			 * Registers a new AuthSchemeFactory for a given scheme.
+			 */
+			addAuthFactory(scheme: string, factory: any): void;
+
+			/**
+			 * Adds a custom key manager.
+			 */
+			addKeyManager(X509KeyManager: any): void;
+
+			/**
+			 * Adds a custom trust manager.
+			 */
+			addTrustManager(X509TrustManager: any): void;
+
+			/**
+			 * Clears any cookies stored for the host.
+			 */
+			clearCookies(host: string): void;
+
+			/**
+			 * Returns the value of the specified response header.
+			 */
+			getResponseHeader(name: string): string;
+
+			/**
+			 * Opens the request and prepares the connection.
+			 */
+			open(method: string, url: string, async?: boolean): void;
+
+			/**
+			 * Sends the request.
+			 */
+			send(data?: any): void;
+
+			/**
+			 * Sends the request.
+			 */
+			send(data?: string): void;
+
+			/**
+			 * Sends the request.
+			 */
+			send(data?: Titanium.Filesystem.File): void;
+
+			/**
+			 * Sends the request.
+			 */
+			send(data?: Titanium.Blob): void;
+
+			/**
+			 * Sets the value for the specified request header. Must be called after `open` but before `send`.
+			 */
+			setRequestHeader(name: string, value: string): void;
+
+			/**
+			 * Sets the request timeout.
+			 */
+			setTimeout(timeout: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Network.HTTPClient.allResponseHeaders> property.
+			 */
+			getAllResponseHeaders(): string;
+
+			/**
+			 * Gets the value of the <Titanium.Network.HTTPClient.responseHeaders> property.
+			 */
+			getResponseHeaders(): any;
+
+			/**
+			 * Gets the value of the <Titanium.Network.HTTPClient.autoEncodeUrl> property.
+			 */
+			getAutoEncodeUrl(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.Network.HTTPClient.autoEncodeUrl> property.
+			 */
+			setAutoEncodeUrl(autoEncodeUrl: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.Network.HTTPClient.autoRedirect> property.
+			 */
+			getAutoRedirect(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.Network.HTTPClient.autoRedirect> property.
+			 */
+			setAutoRedirect(autoRedirect: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.Network.HTTPClient.connected> property.
+			 */
+			getConnected(): boolean;
+
+			/**
+			 * Gets the value of the <Titanium.Network.HTTPClient.connectionType> property.
+			 */
+			getConnectionType(): string;
+
+			/**
+			 * Gets the value of the <Titanium.Network.HTTPClient.domain> property.
+			 */
+			getDomain(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Network.HTTPClient.domain> property.
+			 */
+			setDomain(domain: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Network.HTTPClient.enableKeepAlive> property.
+			 */
+			getEnableKeepAlive(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.Network.HTTPClient.enableKeepAlive> property.
+			 */
+			setEnableKeepAlive(enableKeepAlive: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.Network.HTTPClient.file> property.
+			 */
+			getFile(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Network.HTTPClient.file> property.
+			 */
+			setFile(file: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Network.HTTPClient.location> property.
+			 */
+			getLocation(): string;
+
+			/**
+			 * Gets the value of the <Titanium.Network.HTTPClient.ondatastream> property.
+			 */
+			getOndatastream(): (param0: any) => any;
+
+			/**
+			 * Sets the value of the <Titanium.Network.HTTPClient.ondatastream> property.
+			 */
+			setOndatastream(ondatastream: (param0: any) => any): void;
+
+			/**
+			 * Gets the value of the <Titanium.Network.HTTPClient.onerror> property.
+			 */
+			getOnerror(): (param0: FailureResponse) => any;
+
+			/**
+			 * Sets the value of the <Titanium.Network.HTTPClient.onerror> property.
+			 */
+			setOnerror(onerror: (param0: FailureResponse) => any): void;
+
+			/**
+			 * Gets the value of the <Titanium.Network.HTTPClient.onload> property.
+			 */
+			getOnload(): (param0: SuccessResponse) => any;
+
+			/**
+			 * Sets the value of the <Titanium.Network.HTTPClient.onload> property.
+			 */
+			setOnload(onload: (param0: SuccessResponse) => any): void;
+
+			/**
+			 * Gets the value of the <Titanium.Network.HTTPClient.onreadystatechange> property.
+			 */
+			getOnreadystatechange(): (param0: any) => any;
+
+			/**
+			 * Sets the value of the <Titanium.Network.HTTPClient.onreadystatechange> property.
+			 */
+			setOnreadystatechange(onreadystatechange: (param0: any) => any): void;
+
+			/**
+			 * Gets the value of the <Titanium.Network.HTTPClient.onsendstream> property.
+			 */
+			getOnsendstream(): (param0: any) => any;
+
+			/**
+			 * Sets the value of the <Titanium.Network.HTTPClient.onsendstream> property.
+			 */
+			setOnsendstream(onsendstream: (param0: any) => any): void;
+
+			/**
+			 * Gets the value of the <Titanium.Network.HTTPClient.password> property.
+			 */
+			getPassword(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Network.HTTPClient.password> property.
+			 */
+			setPassword(password: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Network.HTTPClient.readyState> property.
+			 */
+			getReadyState(): number;
+
+			/**
+			 * Gets the value of the <Titanium.Network.HTTPClient.responseData> property.
+			 */
+			getResponseData(): Titanium.Blob;
+
+			/**
+			 * Gets the value of the <Titanium.Network.HTTPClient.responseText> property.
+			 */
+			getResponseText(): string;
+
+			/**
+			 * Gets the value of the <Titanium.Network.HTTPClient.responseXML> property.
+			 */
+			getResponseXML(): Titanium.XML.Document;
+
+			/**
+			 * Gets the value of the <Titanium.Network.HTTPClient.securityManager> property.
+			 */
+			getSecurityManager(): SecurityManagerProtocol;
+
+			/**
+			 * Sets the value of the <Titanium.Network.HTTPClient.securityManager> property.
+			 */
+			setSecurityManager(securityManager: SecurityManagerProtocol): void;
+
+			/**
+			 * Gets the value of the <Titanium.Network.HTTPClient.status> property.
+			 */
+			getStatus(): number;
+
+			/**
+			 * Gets the value of the <Titanium.Network.HTTPClient.statusText> property.
+			 */
+			getStatusText(): string;
+
+			/**
+			 * Gets the value of the <Titanium.Network.HTTPClient.timeout> property.
+			 */
+			getTimeout(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Network.HTTPClient.timeout> property.
+			 */
+			setTimeout(timeout: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Network.HTTPClient.username> property.
+			 */
+			getUsername(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Network.HTTPClient.username> property.
+			 */
+			setUsername(username: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Network.HTTPClient.validatesSecureCertificate> property.
+			 */
+			getValidatesSecureCertificate(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.Network.HTTPClient.validatesSecureCertificate> property.
+			 */
+			setValidatesSecureCertificate(validatesSecureCertificate: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.Network.HTTPClient.tlsVersion> property.
+			 */
+			getTlsVersion(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Network.HTTPClient.tlsVersion> property.
+			 */
+			setTlsVersion(tlsVersion: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Network.HTTPClient.cache> property.
+			 */
+			getCache(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.Network.HTTPClient.cache> property.
+			 */
+			setCache(cache: boolean): void;
+
+		}
+
+		/**
+		 * The TCPSocket instance returned from <Titanium.Network.createTCPSocket>.  This object
+		 * represents a socket which either listens locally on the device for connections,
+		 * or connects to a remote machine.
+		 */
+		interface TCPSocket extends Titanium.Proxy {
+			/**
+			 * the host name to connect to.  Must be <Titanium.Network.INADDR_ANY> or an identifier for the local device in order to listen
+			 */
+			hostName: string;
+
+			/**
+			 * whether or not the socket is valid
+			 */
+			isValid: boolean;
+
+			/**
+			 * the socket's mode
+			 */
+			mode: number;
+
+			/**
+			 * the port to connect/listen on
+			 */
+			port: number;
+
+			/**
+			 * strip terminating null character when sending string data; default is false
+			 */
+			stripTerminator: boolean;
+
+			/**
+			 * close the socket
+			 */
+			close(): void;
+
+			/**
+			 * connect the scocket to a TCP server
+			 */
+			connect(): void;
+
+			/**
+			 * set up the socket to receive connections
+			 */
+			listen(): void;
+
+			/**
+			 * write data to the socket, if the mode is WRITE_MODE or READ_WRITE_MODE
+			 */
+			write(data: any, sendTo: number): void;
+
+			/**
+			 * write data to the socket, if the mode is WRITE_MODE or READ_WRITE_MODE
+			 */
+			write(data: string, sendTo: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Network.TCPSocket.hostName> property.
+			 */
+			getHostName(): string;
+
+			/**
+			 * Sets the value of the <Titanium.Network.TCPSocket.hostName> property.
+			 */
+			setHostName(hostName: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.Network.TCPSocket.isValid> property.
+			 */
+			getIsValid(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.Network.TCPSocket.isValid> property.
+			 */
+			setIsValid(isValid: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.Network.TCPSocket.mode> property.
+			 */
+			getMode(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Network.TCPSocket.mode> property.
+			 */
+			setMode(mode: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Network.TCPSocket.port> property.
+			 */
+			getPort(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Network.TCPSocket.port> property.
+			 */
+			setPort(port: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.Network.TCPSocket.stripTerminator> property.
+			 */
+			getStripTerminator(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.Network.TCPSocket.stripTerminator> property.
+			 */
+			setStripTerminator(stripTerminator: boolean): void;
+
+		}
+
+
+		/**
+		 * Socket module, used for creating sockets.
+		 */
+		namespace Socket {
+			/**
+			 * Indicates if the proxy will bubble an event to its parent.
+			 */
+			let bubbleParent: boolean;
+
+			/**
+			 * The name of the API that this proxy corresponds to.
+			 */
+			const apiName: string;
+
+			/**
+			 * The Window or TabGroup whose Activity lifecycle should be triggered on the proxy.
+			 */
+			let lifecycleContainer: Titanium.UI.Window | Titanium.UI.TabGroup;
+
+			/**
+			 * State value representing an initialized socket.
+			 */
+			const INITIALIZED: number;
+
+			/**
+			 * State value representing a connected socket.
+			 */
+			const CONNECTED: number;
+
+			/**
+			 * State value representing a socket that is listening for connections.
+			 */
+			const LISTENING: number;
+
+			/**
+			 * State value representing a closed socket.
+			 */
+			const CLOSED: number;
+
+			/**
+			 * State value indicating an error has occurred on the socket.
+			 */
+			const ERROR: number;
+
+			/**
+			 * Adds the specified callback as an event listener for the named event.
+			 */
+			function addEventListener(name: string, callback: (param0: any) => any): void;
+
+			/**
+			 * Removes the specified callback as an event listener for the named event.
+			 */
+			function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+			/**
+			 * Fires a synthesized event to any registered listeners.
+			 */
+			function fireEvent(name: string, event: any): void;
+
+			/**
+			 * Applies the properties to the proxy.
+			 */
+			function applyProperties(props: any): void;
+
+			/**
+			 * Returns a new TCP socket object.
+			 */
+			function createTCP(params?: any): Titanium.Network.Socket.TCP;
+
+			/**
+			 * Gets the value of the <Titanium.Network.Socket.bubbleParent> property.
+			 */
+			function getBubbleParent(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.Network.Socket.bubbleParent> property.
+			 */
+			function setBubbleParent(bubbleParent: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.Network.Socket.apiName> property.
+			 */
+			function getApiName(): string;
+
+			/**
+			 * Gets the value of the <Titanium.Network.Socket.lifecycleContainer> property.
+			 */
+			function getLifecycleContainer(): Titanium.UI.Window | Titanium.UI.TabGroup;
+
+			/**
+			 * Sets the value of the <Titanium.Network.Socket.lifecycleContainer> property.
+			 */
+			function setLifecycleContainer(lifecycleContainer: Titanium.UI.Window): void;
+
+			/**
+			 * Sets the value of the <Titanium.Network.Socket.lifecycleContainer> property.
+			 */
+			function setLifecycleContainer(lifecycleContainer: Titanium.UI.TabGroup): void;
+
+			/**
+			 * TCP socket that implements the `Titanium.IOStream` interface.
+			 */
+			interface TCP extends Titanium.Proxy {
+				/**
+				 * The host to connect to or listen on.
+				 */
+				host: string;
+
+				/**
+				 * The port to connect to or listen on.
+				 */
+				port: number;
+
+				/**
+				 * Max number of pending incoming connections to be allowed when the socket is in the [LISTENING](Titanium.Network.Socket.LISTENING) state.
+				 */
+				listenQueueSize: number;
+
+				/**
+				 * Timeout, in milliseconds, for `connect` and all `write` operations.
+				 */
+				timeout: number;
+
+				/**
+				 * Callback to be fired when the socket enters the "connected" state.
+				 */
+				connected: (param0: ConnectedCallbackArgs) => any;
+
+				/**
+				 * Callback to be fired when the socket enters the [ERROR](Titanium.Network.Socket.ERROR) state.
+				 */
+				error: (param0: ErrorCallbackArgs) => any;
+
+				/**
+				 * Callback to be fired when a listener accepts a connection.
+				 */
+				accepted: (param0: AcceptedCallbackArgs) => any;
+
+				/**
+				 * Current state of the socket.
+				 */
+				readonly state: number;
+
+				/**
+				 * Reads data from this stream into a buffer.
+				 */
+				read(buffer: Titanium.Buffer, offset?: number, length?: number): number;
+
+				/**
+				 * Writes data from a buffer to this stream.
+				 */
+				write(buffer: Titanium.Buffer, offset?: number, length?: number): number;
+
+				/**
+				 * Indicates whether this stream is writable.
+				 */
+				isWritable(): boolean;
+
+				/**
+				 * Indicates whether this stream is readable.
+				 */
+				isReadable(): boolean;
+
+				/**
+				 * Closes a socket.
+				 */
+				close(): void;
+
+				/**
+				 * Attempts to connect the socket to its host/port.
+				 */
+				connect(): void;
+
+				/**
+				 * Attempts to start listening on the socket's host/port.
+				 */
+				listen(): void;
+
+				/**
+				 * Tells a [LISTENING](Titanium.Network.Socket.LISTENING) socket to accept a connection request at the top of a listener's request queue when one becomes available.
+				 */
+				accept(options: AcceptDict): void;
+
+				/**
+				 * Gets the value of the <Titanium.Network.Socket.TCP.host> property.
+				 */
+				getHost(): string;
+
+				/**
+				 * Sets the value of the <Titanium.Network.Socket.TCP.host> property.
+				 */
+				setHost(host: string): void;
+
+				/**
+				 * Gets the value of the <Titanium.Network.Socket.TCP.port> property.
+				 */
+				getPort(): number;
+
+				/**
+				 * Sets the value of the <Titanium.Network.Socket.TCP.port> property.
+				 */
+				setPort(port: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.Network.Socket.TCP.listenQueueSize> property.
+				 */
+				getListenQueueSize(): number;
+
+				/**
+				 * Sets the value of the <Titanium.Network.Socket.TCP.listenQueueSize> property.
+				 */
+				setListenQueueSize(listenQueueSize: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.Network.Socket.TCP.timeout> property.
+				 */
+				getTimeout(): number;
+
+				/**
+				 * Sets the value of the <Titanium.Network.Socket.TCP.timeout> property.
+				 */
+				setTimeout(timeout: number): void;
+
+				/**
+				 * Gets the value of the <Titanium.Network.Socket.TCP.connected> property.
+				 */
+				getConnected(): (param0: ConnectedCallbackArgs) => any;
+
+				/**
+				 * Sets the value of the <Titanium.Network.Socket.TCP.connected> property.
+				 */
+				setConnected(connected: (param0: ConnectedCallbackArgs) => any): void;
+
+				/**
+				 * Gets the value of the <Titanium.Network.Socket.TCP.error> property.
+				 */
+				getError(): (param0: ErrorCallbackArgs) => any;
+
+				/**
+				 * Sets the value of the <Titanium.Network.Socket.TCP.error> property.
+				 */
+				setError(error: (param0: ErrorCallbackArgs) => any): void;
+
+				/**
+				 * Gets the value of the <Titanium.Network.Socket.TCP.accepted> property.
+				 */
+				getAccepted(): (param0: AcceptedCallbackArgs) => any;
+
+				/**
+				 * Sets the value of the <Titanium.Network.Socket.TCP.accepted> property.
+				 */
+				setAccepted(accepted: (param0: AcceptedCallbackArgs) => any): void;
+
+				/**
+				 * Gets the value of the <Titanium.Network.Socket.TCP.state> property.
+				 */
+				getState(): number;
+
+			}
+
+		}
+	}
+
+	/**
+	 * The top-level Platform module.  The Platform module is used to access the device's platform-related
+	 * functionality.
+	 */
+	namespace Platform {
+		/**
+		 * Indicates if the proxy will bubble an event to its parent.
+		 */
+		let bubbleParent: boolean;
+
+		/**
+		 * The name of the API that this proxy corresponds to.
+		 */
+		const apiName: string;
+
+		/**
+		 * The Window or TabGroup whose Activity lifecycle should be triggered on the proxy.
+		 */
+		let lifecycleContainer: Titanium.UI.Window | Titanium.UI.TabGroup;
+
+		/**
+		 * Constant to indicate that the system is plugged in and currently being charged.
+		 */
+		const BATTERY_STATE_CHARGING: number;
+
+		/**
+		 * Constant to indicate that the battery is fully charged.
+		 */
+		const BATTERY_STATE_FULL: number;
+
+		/**
+		 * Constant to indicate that the battery state is not known or monitoring is disabled.
+		 */
+		const BATTERY_STATE_UNKNOWN: number;
+
+		/**
+		 * Constant to indicate that the system is unplugged.
+		 */
+		const BATTERY_STATE_UNPLUGGED: number;
+
+		/**
+		 * System's WIFI IP address. No other network types are supported.
+		 */
+		const address: string;
+
+		/**
+		 * System's processor architecture.
+		 */
+		const architecture: string;
+
+		/**
+		 * System's unused memory, measured in megabytes on iOS and bytes on Android.
+		 */
+		const availableMemory: number;
+
+		/**
+		 * Battery level in percent, accessible only when `batteryMonitoring` is enabled. Measured
+		 * in 5% increments on iPhone/iPad.
+		 */
+		const batteryLevel: number;
+
+		/**
+		 * Determines whether battery monitoring is enabled.
+		 */
+		let batteryMonitoring: boolean;
+
+		/**
+		 * Indicates the state of the battery. Accessible only when `batteryMonitoring` is enabled.
+		 */
+		const batteryState: number;
+
+		/**
+		 * Returns the DisplayCaps object.
+		 */
+		const displayCaps: Titanium.Platform.DisplayCaps;
+
+		/**
+		 * Applications's globally-unique ID (UUID).
+		 */
+		const id: string;
+
+		/**
+		 * An alphanumeric string that uniquely identifies a device to the app's vendor.
+		 */
+		const identifierForVendor: string;
+
+		/**
+		 * An alphanumeric string unique to each device, used only for serving advertisements.
+		 */
+		let identifierForAdvertising: string;
+
+		/**
+		 * A Boolean value that indicates whether the user has limited ad tracking.
+		 */
+		const isAdvertisingTrackingEnabled: boolean;
+
+		/**
+		 * System's default language.
+		 */
+		const locale: string;
+
+		/**
+		 * System's network interface mac address, or app UUID.
+		 */
+		const macaddress: string;
+
+		/**
+		 * Manufacturer of the device.
+		 */
+		const manufacturer: string;
+
+		/**
+		 * Model of the device.
+		 */
+		const model: string;
+
+		/**
+		 * Name of the platform. Returns `android` for the Android platform, `iPhone OS` for the iOS
+		 * platform (iPhone, iPad, or iPod Touch), and `windows` for the Windows platform.
+		 * Since iOS 10 this property returns `iOS` for for the iOS platform (iPhone, iPad, or iPod Touch).
+		 */
+		const name: string;
+
+		/**
+		 * System's WIFI network mask. No other network types are supported.
+		 */
+		const netmask: string;
+
+		/**
+		 * Short name of the system's Operating System. Returns `android` for the Android platfrom,
+		 * `iphone` for the iPhone or iPod Touch, `ipad` for the iPad, `windowsphone` for Windows Phone, and `windowsstore` for Windows Store
+		 * platform.
+		 */
+		const osname: string;
+
+		/**
+		 * Operating System architecture. On Android, this is `32bit`.
+		 */
+		const ostype: string;
+
+		/**
+		 * Number of processing cores.
+		 */
+		const processorCount: number;
+
+		/**
+		 * Short name of the JavaScript runtime in use.
+		 */
+		const runtime: string;
+
+		/**
+		 * System name, if set. On iOS, this can be found in Settings > General > About > Name.
+		 */
+		const username: string;
+
+		/**
+		 * System's OS version.
+		 */
+		const version: string;
+
+		/**
+		 * Adds the specified callback as an event listener for the named event.
+		 */
+		function addEventListener(name: string, callback: (param0: any) => any): void;
+
+		/**
+		 * Removes the specified callback as an event listener for the named event.
+		 */
+		function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+		/**
+		 * Fires a synthesized event to any registered listeners.
+		 */
+		function fireEvent(name: string, event: any): void;
+
+		/**
+		 * Applies the properties to the proxy.
+		 */
+		function applyProperties(props: any): void;
+
+		/**
+		 * Returns whether the system is configured with a default application to handle the URL's protocol.
+		 */
+		function canOpenURL(url: string): boolean;
+
+		/**
+		 * Creates a globally-unique identifier.
+		 */
+		function createUUID(): string;
+
+		/**
+		 * Opens this URL using the system's default application for its protocol.
+		 */
+		function openURL(url: string): boolean;
+
+		/**
+		 * Returns whether the system settings are configured to show times in 24-hour format.
+		 */
+		function is24HourTimeFormat(): boolean;
+
+		/**
+		 * Gets the value of the <Titanium.Platform.bubbleParent> property.
+		 */
+		function getBubbleParent(): boolean;
+
+		/**
+		 * Sets the value of the <Titanium.Platform.bubbleParent> property.
+		 */
+		function setBubbleParent(bubbleParent: boolean): void;
+
+		/**
+		 * Gets the value of the <Titanium.Platform.apiName> property.
+		 */
+		function getApiName(): string;
+
+		/**
+		 * Gets the value of the <Titanium.Platform.lifecycleContainer> property.
+		 */
+		function getLifecycleContainer(): Titanium.UI.Window | Titanium.UI.TabGroup;
+
+		/**
+		 * Sets the value of the <Titanium.Platform.lifecycleContainer> property.
+		 */
+		function setLifecycleContainer(lifecycleContainer: Titanium.UI.Window): void;
+
+		/**
+		 * Sets the value of the <Titanium.Platform.lifecycleContainer> property.
+		 */
+		function setLifecycleContainer(lifecycleContainer: Titanium.UI.TabGroup): void;
+
+		/**
+		 * Gets the value of the <Titanium.Platform.address> property.
+		 */
+		function getAddress(): string;
+
+		/**
+		 * Gets the value of the <Titanium.Platform.architecture> property.
+		 */
+		function getArchitecture(): string;
+
+		/**
+		 * Gets the value of the <Titanium.Platform.availableMemory> property.
+		 */
+		function getAvailableMemory(): number;
+
+		/**
+		 * Gets the value of the <Titanium.Platform.batteryLevel> property.
+		 */
+		function getBatteryLevel(): number;
+
+		/**
+		 * Gets the value of the <Titanium.Platform.batteryMonitoring> property.
+		 */
+		function getBatteryMonitoring(): boolean;
+
+		/**
+		 * Sets the value of the <Titanium.Platform.batteryMonitoring> property.
+		 */
+		function setBatteryMonitoring(batteryMonitoring: boolean): void;
+
+		/**
+		 * Gets the value of the <Titanium.Platform.batteryState> property.
+		 */
+		function getBatteryState(): number;
+
+		/**
+		 * Gets the value of the <Titanium.Platform.displayCaps> property.
+		 */
+		function getDisplayCaps(): Titanium.Platform.DisplayCaps;
+
+		/**
+		 * Gets the value of the <Titanium.Platform.id> property.
+		 */
+		function getId(): string;
+
+		/**
+		 * Gets the value of the <Titanium.Platform.identifierForVendor> property.
+		 */
+		function getIdentifierForVendor(): string;
+
+		/**
+		 * Gets the value of the <Titanium.Platform.identifierForAdvertising> property.
+		 */
+		function getIdentifierForAdvertising(): string;
+
+		/**
+		 * Sets the value of the <Titanium.Platform.identifierForAdvertising> property.
+		 */
+		function setIdentifierForAdvertising(identifierForAdvertising: string): void;
+
+		/**
+		 * Gets the value of the <Titanium.Platform.isAdvertisingTrackingEnabled> property.
+		 */
+		function getIsAdvertisingTrackingEnabled(): boolean;
+
+		/**
+		 * Gets the value of the <Titanium.Platform.locale> property.
+		 */
+		function getLocale(): string;
+
+		/**
+		 * Gets the value of the <Titanium.Platform.macaddress> property.
+		 */
+		function getMacaddress(): string;
+
+		/**
+		 * Gets the value of the <Titanium.Platform.manufacturer> property.
+		 */
+		function getManufacturer(): string;
+
+		/**
+		 * Gets the value of the <Titanium.Platform.model> property.
+		 */
+		function getModel(): string;
+
+		/**
+		 * Gets the value of the <Titanium.Platform.name> property.
+		 */
+		function getName(): string;
+
+		/**
+		 * Gets the value of the <Titanium.Platform.netmask> property.
+		 */
+		function getNetmask(): string;
+
+		/**
+		 * Gets the value of the <Titanium.Platform.osname> property.
+		 */
+		function getOsname(): string;
+
+		/**
+		 * Gets the value of the <Titanium.Platform.ostype> property.
+		 */
+		function getOstype(): string;
+
+		/**
+		 * Gets the value of the <Titanium.Platform.processorCount> property.
+		 */
+		function getProcessorCount(): number;
+
+		/**
+		 * Gets the value of the <Titanium.Platform.runtime> property.
+		 */
+		function getRuntime(): string;
+
+		/**
+		 * Gets the value of the <Titanium.Platform.username> property.
+		 */
+		function getUsername(): string;
+
+		/**
+		 * Gets the value of the <Titanium.Platform.version> property.
+		 */
+		function getVersion(): string;
+
+		/**
+		 * The Display Caps object returned by the <Titanium.Platform.displayCaps> property.
+		 */
+		interface DisplayCaps extends Titanium.Proxy {
+			/**
+			 * Logical density of the display.
+			 */
+			readonly density: string;
+
+			/**
+			 * Display density expressed as dots-per-inch.
+			 */
+			readonly dpi: number;
+
+			/**
+			 * Logical density of the display, as a scaling factor for the Density Independent Pixel (dip)
+			 * unit.
+			 */
+			readonly logicalDensityFactor: number;
+
+			/**
+			 * Absolute height of the display in relation to UI orientation. Measured in platform-specific
+			 * units; pixels on Android and density-independent pixels (dip) on iOS.
+			 */
+			readonly platformHeight: number;
+
+			/**
+			 * Absolute width of the display in relation to UI orientation. Measured in platform-specific
+			 * units; pixels on Android and density-independent pixels (dip) on iOS.
+			 */
+			readonly platformWidth: number;
+
+			/**
+			 * Physical pixels per inch of the display in the X dimension.
+			 */
+			readonly xdpi: number;
+
+			/**
+			 * Physical pixels per inch of the display in the Y dimension.
+			 */
+			readonly ydpi: number;
+
+			/**
+			 * Gets the value of the <Titanium.Platform.DisplayCaps.density> property.
+			 */
+			getDensity(): string;
+
+			/**
+			 * Gets the value of the <Titanium.Platform.DisplayCaps.dpi> property.
+			 */
+			getDpi(): number;
+
+			/**
+			 * Gets the value of the <Titanium.Platform.DisplayCaps.logicalDensityFactor> property.
+			 */
+			getLogicalDensityFactor(): number;
+
+			/**
+			 * Gets the value of the <Titanium.Platform.DisplayCaps.platformHeight> property.
+			 */
+			getPlatformHeight(): number;
+
+			/**
+			 * Gets the value of the <Titanium.Platform.DisplayCaps.platformWidth> property.
+			 */
+			getPlatformWidth(): number;
+
+			/**
+			 * Gets the value of the <Titanium.Platform.DisplayCaps.xdpi> property.
+			 */
+			getXdpi(): number;
+
+			/**
+			 * Gets the value of the <Titanium.Platform.DisplayCaps.ydpi> property.
+			 */
+			getYdpi(): number;
+
+		}
+
+
+		/**
+		 * The Android-specific Platform module, used to access the device's platform-related functionality.
+		 */
+		namespace Android {
+			/**
+			 * Indicates if the proxy will bubble an event to its parent.
+			 */
+			let bubbleParent: boolean;
+
+			/**
+			 * The name of the API that this proxy corresponds to.
+			 */
+			const apiName: string;
+
+			/**
+			 * The Window or TabGroup whose Activity lifecycle should be triggered on the proxy.
+			 */
+			let lifecycleContainer: Titanium.UI.Window | Titanium.UI.TabGroup;
+
+			/**
+			 * Android API level identifier of the Operating System.
+			 */
+			const API_LEVEL: number;
+
+			/**
+			 * Constant to indicate that the physical size category of the current device/emulator is large
+			 */
+			const PHYSICAL_SIZE_CATEGORY_LARGE: number;
+
+			/**
+			 * Constant to indicate that the physical size category of the current device/emulator is normal
+			 */
+			const PHYSICAL_SIZE_CATEGORY_NORMAL: number;
+
+			/**
+			 * Constant to indicate that the physical size category of the current device/emulator is small
+			 */
+			const PHYSICAL_SIZE_CATEGORY_SMALL: number;
+
+			/**
+			 * Constant to indicate that the physical size category of the current device/emulator is undefined
+			 */
+			const PHYSICAL_SIZE_CATEGORY_UNDEFINED: number;
+
+			/**
+			 * Constant to indicate that the physical size category of the current device/emulator is extra large
+			 */
+			const PHYSICAL_SIZE_CATEGORY_XLARGE: number;
+
+			/**
+			 * The physical size category of the Android device or emulator.
+			 */
+			const physicalSizeCategory: number;
+
+			/**
+			 * Adds the specified callback as an event listener for the named event.
+			 */
+			function addEventListener(name: string, callback: (param0: any) => any): void;
+
+			/**
+			 * Removes the specified callback as an event listener for the named event.
+			 */
+			function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+			/**
+			 * Fires a synthesized event to any registered listeners.
+			 */
+			function fireEvent(name: string, event: any): void;
+
+			/**
+			 * Applies the properties to the proxy.
+			 */
+			function applyProperties(props: any): void;
+
+			/**
+			 * Gets the value of the <Titanium.Platform.Android.bubbleParent> property.
+			 */
+			function getBubbleParent(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.Platform.Android.bubbleParent> property.
+			 */
+			function setBubbleParent(bubbleParent: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.Platform.Android.apiName> property.
+			 */
+			function getApiName(): string;
+
+			/**
+			 * Gets the value of the <Titanium.Platform.Android.lifecycleContainer> property.
+			 */
+			function getLifecycleContainer(): Titanium.UI.Window | Titanium.UI.TabGroup;
+
+			/**
+			 * Sets the value of the <Titanium.Platform.Android.lifecycleContainer> property.
+			 */
+			function setLifecycleContainer(lifecycleContainer: Titanium.UI.Window): void;
+
+			/**
+			 * Sets the value of the <Titanium.Platform.Android.lifecycleContainer> property.
+			 */
+			function setLifecycleContainer(lifecycleContainer: Titanium.UI.TabGroup): void;
+
+			/**
+			 * Gets the value of the <Titanium.Platform.Android.physicalSizeCategory> property.
+			 */
+			function getPhysicalSizeCategory(): number;
+
+		}
+	}
+
+	/**
+	 * Stream module containing stream utility methods.
+	 */
+	namespace Stream {
+		/**
+		 * Indicates if the proxy will bubble an event to its parent.
+		 */
+		let bubbleParent: boolean;
+
+		/**
+		 * The name of the API that this proxy corresponds to.
+		 */
+		const apiName: string;
+
+		/**
+		 * The Window or TabGroup whose Activity lifecycle should be triggered on the proxy.
+		 */
+		let lifecycleContainer: Titanium.UI.Window | Titanium.UI.TabGroup;
+
+		/**
+		 * Use with [createStream](Titanium.Stream.createStream) to open a stream in read
+		 * mode.
+		 */
+		const MODE_READ: number;
+
+		/**
+		 * Use with [createStream](Titanium.Stream.createStream) to open a stream in write
+		 * mode.
+		 */
+		const MODE_WRITE: number;
+
+		/**
+		 * Use with [createStream](Titanium.Stream.createStream) to open a stream in append
+		 * mode.
+		 */
+		const MODE_APPEND: number;
+
+		/**
+		 * Adds the specified callback as an event listener for the named event.
+		 */
+		function addEventListener(name: string, callback: (param0: any) => any): void;
+
+		/**
+		 * Removes the specified callback as an event listener for the named event.
+		 */
+		function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+		/**
+		 * Fires a synthesized event to any registered listeners.
+		 */
+		function fireEvent(name: string, event: any): void;
+
+		/**
+		 * Applies the properties to the proxy.
+		 */
+		function applyProperties(props: any): void;
+
+		/**
+		 * Creates stream from a `Buffer` or `Blob` object.
+		 */
+		function createStream(params: CreateStreamArgs): Titanium.IOStream;
+
+		/**
+		 * Asynchronously reads data from an [IOStream](Titanium.IOStream) into a buffer.
+		 */
+		function read(sourceStream: Titanium.IOStream, buffer: Titanium.Buffer, offset?: number, length?: number, resultsCallback?: (param0: ReadCallbackArgs) => any): void;
+
+		/**
+		 * Reads all data from the specified [IOStream](Titanium.IOStream).
+		 */
+		function readAll(sourceStream: Titanium.IOStream, buffer?: Titanium.Buffer, resultsCallback?: (param0: ReadCallbackArgs) => any): Titanium.Buffer | void;
+
+		/**
+		 * Asynchronously writes data from a buffer to an [IOStream](Titanium.IOStream).
+		 */
+		function write(outputStream: Titanium.IOStream, buffer: Titanium.Buffer, offset?: number, length?: number, resultsCallback?: (param0: WriteCallbackArgs) => any): void;
+
+		/**
+		 * Writes all data from an input stream to an output stream.
+		 */
+		function writeStream(inputStream: Titanium.IOStream, outputStream: Titanium.IOStream, maxChunkSize: number, resultsCallback?: (param0: WriteStreamCallbackArgs) => any): void;
+
+		/**
+		 * Reads data from input stream and passes it to a handler method.
+		 */
+		function pump(inputStream: Titanium.IOStream, handler: (param0: PumpCallbackArgs) => any, maxChunkSize: number, isAsync?: boolean): void;
+
+		/**
+		 * Gets the value of the <Titanium.Stream.bubbleParent> property.
+		 */
+		function getBubbleParent(): boolean;
+
+		/**
+		 * Sets the value of the <Titanium.Stream.bubbleParent> property.
+		 */
+		function setBubbleParent(bubbleParent: boolean): void;
+
+		/**
+		 * Gets the value of the <Titanium.Stream.apiName> property.
+		 */
+		function getApiName(): string;
+
+		/**
+		 * Gets the value of the <Titanium.Stream.lifecycleContainer> property.
+		 */
+		function getLifecycleContainer(): Titanium.UI.Window | Titanium.UI.TabGroup;
+
+		/**
+		 * Sets the value of the <Titanium.Stream.lifecycleContainer> property.
+		 */
+		function setLifecycleContainer(lifecycleContainer: Titanium.UI.Window): void;
+
+		/**
+		 * Sets the value of the <Titanium.Stream.lifecycleContainer> property.
+		 */
+		function setLifecycleContainer(lifecycleContainer: Titanium.UI.TabGroup): void;
+
+	}
+
+	/**
+	 * The top-level Utils module, containing a set of JavaScript methods that are often useful when
+	 * building applications.
+	 */
+	namespace Utils {
+		/**
+		 * Indicates if the proxy will bubble an event to its parent.
+		 */
+		let bubbleParent: boolean;
+
+		/**
+		 * The name of the API that this proxy corresponds to.
+		 */
+		const apiName: string;
+
+		/**
+		 * The Window or TabGroup whose Activity lifecycle should be triggered on the proxy.
+		 */
+		let lifecycleContainer: Titanium.UI.Window | Titanium.UI.TabGroup;
+
+		/**
+		 * Adds the specified callback as an event listener for the named event.
+		 */
+		function addEventListener(name: string, callback: (param0: any) => any): void;
+
+		/**
+		 * Removes the specified callback as an event listener for the named event.
+		 */
+		function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+		/**
+		 * Fires a synthesized event to any registered listeners.
+		 */
+		function fireEvent(name: string, event: any): void;
+
+		/**
+		 * Applies the properties to the proxy.
+		 */
+		function applyProperties(props: any): void;
+
+		/**
+		 * Returns the specified data decoded from Base64.
+		 */
+		function base64decode(obj: string): Titanium.Blob;
+
+		/**
+		 * Returns the specified data decoded from Base64.
+		 */
+		function base64decode(obj: Titanium.Blob): Titanium.Blob;
+
+		/**
+		 * Returns the specified data decoded from Base64.
+		 */
+		function base64decode(obj: Titanium.Filesystem.File): Titanium.Blob;
+
+		/**
+		 * Returns the specified data encoded to Base64.
+		 */
+		function base64encode(obj: string): Titanium.Blob;
+
+		/**
+		 * Returns the specified data encoded to Base64.
+		 */
+		function base64encode(obj: Titanium.Blob): Titanium.Blob;
+
+		/**
+		 * Returns the specified data encoded to Base64.
+		 */
+		function base64encode(obj: Titanium.Filesystem.File): Titanium.Blob;
+
+		/**
+		 * Returns a MD5 digest of the specified data as a hex-based String.
+		 */
+		function md5HexDigest(obj: string): string;
+
+		/**
+		 * Returns a MD5 digest of the specified data as a hex-based String.
+		 */
+		function md5HexDigest(obj: Titanium.Blob): string;
+
+		/**
+		 * Returns a SHA-1 hash of the specified data as a hex-based String.
+		 */
+		function sha1(obj: string): string;
+
+		/**
+		 * Returns a SHA-1 hash of the specified data as a hex-based String.
+		 */
+		function sha1(obj: Titanium.Blob): string;
+
+		/**
+		 * Returns a SHA-256 hash of the specified data as a hex-based String.
+		 */
+		function sha256(obj: string): string;
+
+		/**
+		 * Returns a SHA-256 hash of the specified data as a hex-based String.
+		 */
+		function sha256(obj: Titanium.Blob): string;
+
+		/**
+		 * Gets the value of the <Titanium.Utils.bubbleParent> property.
+		 */
+		function getBubbleParent(): boolean;
+
+		/**
+		 * Sets the value of the <Titanium.Utils.bubbleParent> property.
+		 */
+		function setBubbleParent(bubbleParent: boolean): void;
+
+		/**
+		 * Gets the value of the <Titanium.Utils.apiName> property.
+		 */
+		function getApiName(): string;
+
+		/**
+		 * Gets the value of the <Titanium.Utils.lifecycleContainer> property.
+		 */
+		function getLifecycleContainer(): Titanium.UI.Window | Titanium.UI.TabGroup;
+
+		/**
+		 * Sets the value of the <Titanium.Utils.lifecycleContainer> property.
+		 */
+		function setLifecycleContainer(lifecycleContainer: Titanium.UI.Window): void;
+
+		/**
+		 * Sets the value of the <Titanium.Utils.lifecycleContainer> property.
+		 */
+		function setLifecycleContainer(lifecycleContainer: Titanium.UI.TabGroup): void;
+
+	}
+
+	/**
+	 * Used to enable data and file transfers between a watchOS and iOS application.
+	 */
+	namespace WatchSession {
+		/**
+		 * Indicates if the proxy will bubble an event to its parent.
+		 */
+		let bubbleParent: boolean;
+
+		/**
+		 * The name of the API that this proxy corresponds to.
+		 */
+		const apiName: string;
+
+		/**
+		 * Returns the current activation state of the watch.
+		 */
+		const activationState: number;
+
+		/**
+		 * The watch is currently not activated.
+		 */
+		const ACTIVATION_STATE_NOT_ACTIVATED: number;
+
+		/**
+		 * The watch is currently inactive.
+		 */
+		const ACTIVATION_STATE_INACTIVE: number;
+
+		/**
+		 * The watch is currently activated.
+		 */
+		const ACTIVATION_STATE_ACTIVATED: number;
+
+		/**
+		 * Returns `true` if there is more content for the session to deliver.
+		 */
+		const hasContentPending: boolean;
+
+		/**
+		 * The number of calls remaining to `transferCurrentComplication` before the system starts
+		 * transferring the complicationUserInfo as regular userInfos.
+		 */
+		const remainingComplicationUserInfoTransfers: number;
+
+		/**
+		 * Returns `true` if the device supports watch connectivity.
+		 */
+		const isSupported: boolean;
+
+		/**
+		 * Returns `true` if the device is paired with a watch.
+		 */
+		const isPaired: boolean;
+
+		/**
+		 * Returns `true` if the accompanying watch app is installed.
+		 */
+		const isWatchAppInstalled: boolean;
+
+		/**
+		 * Returns `true` if complication is enabled on the installed watch app.
+		 */
+		const isComplicationEnabled: boolean;
+
+		/**
+		 * Returns `true` if the watch is currently reachable.
+		 */
+		const isReachable: boolean;
+
+		/**
+		 * Returns `true` if the watch is currently activated.
+		 */
+		const isActivated: boolean;
+
+		/**
+		 * The most recent application context sent to the watch app.
+		 */
+		const recentApplicationContext: any;
+
+		/**
+		 * Adds the specified callback as an event listener for the named event.
+		 */
+		function addEventListener(name: string, callback: (param0: any) => any): void;
+
+		/**
+		 * Removes the specified callback as an event listener for the named event.
+		 */
+		function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+		/**
+		 * Fires a synthesized event to any registered listeners.
+		 */
+		function fireEvent(name: string, event: any): void;
+
+		/**
+		 * Applies the properties to the proxy.
+		 */
+		function applyProperties(props: any): void;
+
+		/**
+		 * Activates the watch session
+		 */
+		function activateSession(): void;
+
+		/**
+		 * Sends a message to the apple watch.
+		 */
+		function sendMessage(message: any, reply?: (param0: MessageReply) => any): void;
+
+		/**
+		 * Sends an app context update to the apple watch.
+		 */
+		function updateApplicationContext(params: any): void;
+
+		/**
+		 * Transfers an user info to the apple watch.
+		 */
+		function transferUserInfo(params: any): void;
+
+		/**
+		 * Transfers a file to the apple watch.
+		 */
+		function transferFile(params: any): void;
+
+		/**
+		 * Transfers complication data to the watch application.
+		 */
+		function transferCurrentComplication(params: any): void;
+
+		/**
+		 * Cancels all incomplete user info and complication transfers to the apple watch.
+		 */
+		function cancelAllUserInfoTransfers(): void;
+
+		/**
+		 * Cancels all incomplete file transfers to the apple watch.
+		 */
+		function cancelAllFileTransfers(): void;
+
+		/**
+		 * Cancels all incomplete transfers to the apple watch.
+		 */
+		function cancelAllTransfers(): void;
+
+		/**
+		 * Gets the value of the <Titanium.WatchSession.bubbleParent> property.
+		 */
+		function getBubbleParent(): boolean;
+
+		/**
+		 * Sets the value of the <Titanium.WatchSession.bubbleParent> property.
+		 */
+		function setBubbleParent(bubbleParent: boolean): void;
+
+		/**
+		 * Gets the value of the <Titanium.WatchSession.apiName> property.
+		 */
+		function getApiName(): string;
+
+		/**
+		 * Gets the value of the <Titanium.WatchSession.activationState> property.
+		 */
+		function getActivationState(): number;
+
+		/**
+		 * Gets the value of the <Titanium.WatchSession.hasContentPending> property.
+		 */
+		function getHasContentPending(): boolean;
+
+		/**
+		 * Gets the value of the <Titanium.WatchSession.remainingComplicationUserInfoTransfers> property.
+		 */
+		function getRemainingComplicationUserInfoTransfers(): number;
+
+		/**
+		 * Gets the value of the <Titanium.WatchSession.isSupported> property.
+		 */
+		function getIsSupported(): boolean;
+
+		/**
+		 * Gets the value of the <Titanium.WatchSession.isPaired> property.
+		 */
+		function getIsPaired(): boolean;
+
+		/**
+		 * Gets the value of the <Titanium.WatchSession.isWatchAppInstalled> property.
+		 */
+		function getIsWatchAppInstalled(): boolean;
+
+		/**
+		 * Gets the value of the <Titanium.WatchSession.isComplicationEnabled> property.
+		 */
+		function getIsComplicationEnabled(): boolean;
+
+		/**
+		 * Gets the value of the <Titanium.WatchSession.isReachable> property.
+		 */
+		function getIsReachable(): boolean;
+
+		/**
+		 * Gets the value of the <Titanium.WatchSession.isActivated> property.
+		 */
+		function getIsActivated(): boolean;
+
+		/**
+		 * Gets the value of the <Titanium.WatchSession.recentApplicationContext> property.
+		 */
+		function getRecentApplicationContext(): any;
+
+	}
+
+	/**
+	 * The top level XML module.  The XML module is used for parsing and processing XML-based content.
+	 */
+	namespace XML {
+		/**
+		 * Indicates if the proxy will bubble an event to its parent.
+		 */
+		let bubbleParent: boolean;
+
+		/**
+		 * The name of the API that this proxy corresponds to.
+		 */
+		const apiName: string;
+
+		/**
+		 * The Window or TabGroup whose Activity lifecycle should be triggered on the proxy.
+		 */
+		let lifecycleContainer: Titanium.UI.Window | Titanium.UI.TabGroup;
+
+		/**
+		 * Adds the specified callback as an event listener for the named event.
+		 */
+		function addEventListener(name: string, callback: (param0: any) => any): void;
+
+		/**
+		 * Removes the specified callback as an event listener for the named event.
+		 */
+		function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+		/**
+		 * Fires a synthesized event to any registered listeners.
+		 */
+		function fireEvent(name: string, event: any): void;
+
+		/**
+		 * Applies the properties to the proxy.
+		 */
+		function applyProperties(props: any): void;
+
+		/**
+		 * Parses an XML string into a <Titanium.XML.Document> object.
+		 */
+		function parseString(xml: string): Titanium.XML.Document;
+
+		/**
+		 * Serializes a [Node](Titanium.XML.Node) object into a string.
+		 */
+		function serializeToString(node: Titanium.XML.Node): string;
+
+		/**
+		 * Gets the value of the <Titanium.XML.bubbleParent> property.
+		 */
+		function getBubbleParent(): boolean;
+
+		/**
+		 * Sets the value of the <Titanium.XML.bubbleParent> property.
+		 */
+		function setBubbleParent(bubbleParent: boolean): void;
+
+		/**
+		 * Gets the value of the <Titanium.XML.apiName> property.
+		 */
+		function getApiName(): string;
+
+		/**
+		 * Gets the value of the <Titanium.XML.lifecycleContainer> property.
+		 */
+		function getLifecycleContainer(): Titanium.UI.Window | Titanium.UI.TabGroup;
+
+		/**
+		 * Sets the value of the <Titanium.XML.lifecycleContainer> property.
+		 */
+		function setLifecycleContainer(lifecycleContainer: Titanium.UI.Window): void;
+
+		/**
+		 * Sets the value of the <Titanium.XML.lifecycleContainer> property.
+		 */
+		function setLifecycleContainer(lifecycleContainer: Titanium.UI.TabGroup): void;
+
+		/**
+		 * Represents an attribute of an [Element](Titanium.XML.Element).
+		 */
+		interface Attr extends Titanium.Proxy {
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify an
+			 * [Element](Titanium.XML.Element) node.
+			 */
+			readonly ELEMENT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify an
+			 * [Attr](Titanium.XML.Attr) node.
+			 */
+			readonly ATTRIBUTE_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [Text](Titanium.XML.Text) node.
+			 */
+			readonly TEXT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [CDATASection](Titanium.XML.CDATASection) node.
+			 */
+			readonly CDATA_SECTION_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify an
+			 * [EntityReference](Titanium.XML.EntityReference) node.
+			 */
+			readonly ENTITY_REFERENCE_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify an
+			 * [Entity](Titanium.XML.Entity) node.
+			 */
+			readonly ENTITY_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [ProcessingInstruction](Titanium.XML.ProcessingInstruction) node.
+			 */
+			readonly PROCESSING_INSTRUCTION_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [Comment](Titanium.XML.Comment) node.
+			 */
+			readonly COMMENT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [Document](Titanium.XML.Document) node.
+			 */
+			readonly DOCUMENT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [DocumentType](Titanium.XML.DocumentType) node.
+			 */
+			readonly DOCUMENT_TYPE_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [DocumentFragment](Titanium.XML.DocumentFragment) node.
+			 */
+			readonly DOCUMENT_FRAGMENT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [Notation](Titanium.XML.Notation) node.
+			 */
+			readonly NOTATION_NODE: number;
+
+			/**
+			 * Name of this node.
+			 */
+			readonly nodeName: string;
+
+			/**
+			 * Content (value) of this node.
+			 */
+			nodeValue: string;
+
+			/**
+			 * Content (value) of all text nodes within this node.
+			 */
+			readonly textContent: string;
+
+			/**
+			 * Content (value) of all text nodes within this node.
+			 */
+			readonly text: string;
+
+			/**
+			 * This node's type. One of `ELEMENT_NODE`, `ATTRIBUTE_NODE`, `TEXT_NODE`, `CDATA_SECTION_NODE`,
+			 * `ENTITY_REFERENCE_NODE`, `ENTITY_NODE`, `PROCESSING_INSTRUCTION_NODE`, `COMMENT_NODE`,
+			 * `DOCUMENT_NODE`, `DOCUMENT_TYPE_NODE`, `DOCUMENT_FRAGMENT_NODE`, `NOTATION_NODE`.
+			 */
+			readonly nodeType: number;
+
+			/**
+			 * This node's parent node.
+			 */
+			readonly parentNode: Titanium.XML.Node;
+
+			/**
+			 * A <Titanium.XML.NodeList> of this node's children.
+			 */
+			readonly childNodes: Titanium.XML.NodeList;
+
+			/**
+			 * This node's first child.
+			 */
+			readonly firstChild: Titanium.XML.Node;
+
+			/**
+			 * This node's last child.
+			 */
+			readonly lastChild: Titanium.XML.Node;
+
+			/**
+			 * This node's previous sibling.
+			 */
+			readonly previousSibling: Titanium.XML.Node;
+
+			/**
+			 * This node's next sibling.
+			 */
+			readonly nextSibling: Titanium.XML.Node;
+
+			/**
+			 * A map of this node's attributes.
+			 */
+			readonly attributes: Titanium.XML.NamedNodeMap;
+
+			/**
+			 * This node's owning document.
+			 */
+			readonly ownerDocument: Titanium.XML.Document;
+
+			/**
+			 * Namespace URI of this node.
+			 */
+			readonly namespaceURI: string;
+
+			/**
+			 * Namespace prefix of this node.
+			 */
+			prefix: string;
+
+			/**
+			 * Local part of the qualified name of this node.
+			 */
+			localName: string;
+
+			/**
+			 * Attribute name
+			 */
+			readonly name: string;
+
+			/**
+			 * The <Titanium.XML.Element> to which the attribute belongs.
+			 */
+			readonly ownerElement: Titanium.XML.Element;
+
+			/**
+			 * True if this attribute was explicitly given a value in the instance document, false otherwise.
+			 */
+			readonly specified: boolean;
+
+			/**
+			 * The attribute value as a string.
+			 */
+			value: string;
+
+			/**
+			 * Appends the node `newChild` as a child of this node.
+			 */
+			appendChild(newChild: Titanium.XML.Node): Titanium.XML.Node;
+
+			/**
+			 * Returns a duplicate of this node.
+			 */
+			cloneNode(deep: boolean): Titanium.XML.Node;
+
+			/**
+			 * Returns `true` if this node has attributes.
+			 */
+			hasAttributes(): boolean;
+
+			/**
+			 * Returns `true` if this node has child nodes.
+			 */
+			hasChildNodes(): boolean;
+
+			/**
+			 * Inserts the node `newChild` before the node `refChild`.
+			 */
+			insertBefore(newChild: Titanium.XML.Node, refChild: Titanium.XML.Node): Titanium.XML.Node;
+
+			/**
+			 * Tests whether the DOM implementation supports a specific feature.
+			 */
+			isSupported(feature: string, version: string): boolean;
+
+			/**
+			 * Normalizes text and attribute nodes in this node's child hierarchy.
+			 */
+			normalize(): void;
+
+			/**
+			 * Removes a child node from this node.
+			 */
+			removeChild(oldChild: Titanium.XML.Node): Titanium.XML.Node;
+
+			/**
+			 * Replaces the node `oldChild` with the node `newChild`.
+			 */
+			replaceChild(newChild: Titanium.XML.Node, oldChild: Titanium.XML.Node): Titanium.XML.Node;
+
+			/**
+			 * Gets the value of the <Titanium.XML.Attr.attributes> property.
+			 */
+			getAttributes(): Titanium.XML.NamedNodeMap;
+
+			/**
+			 * Gets the value of the <Titanium.XML.Attr.name> property.
+			 */
+			getName(): string;
+
+			/**
+			 * Gets the value of the <Titanium.XML.Attr.ownerElement> property.
+			 */
+			getOwnerElement(): Titanium.XML.Element;
+
+			/**
+			 * Gets the value of the <Titanium.XML.Attr.specified> property.
+			 */
+			getSpecified(): boolean;
+
+			/**
+			 * Gets the value of the <Titanium.XML.Attr.value> property.
+			 */
+			getValue(): string;
+
+			/**
+			 * Sets the value of the <Titanium.XML.Attr.value> property.
+			 */
+			setValue(value: string): void;
+
+		}
+
+		/**
+		 * Used to include blocks of literal text containing characters that would otherwise need
+		 * to be escaped.
+		 */
+		interface CDATASection extends Titanium.Proxy {
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify an
+			 * [Element](Titanium.XML.Element) node.
+			 */
+			readonly ELEMENT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify an
+			 * [Attr](Titanium.XML.Attr) node.
+			 */
+			readonly ATTRIBUTE_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [Text](Titanium.XML.Text) node.
+			 */
+			readonly TEXT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [CDATASection](Titanium.XML.CDATASection) node.
+			 */
+			readonly CDATA_SECTION_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify an
+			 * [EntityReference](Titanium.XML.EntityReference) node.
+			 */
+			readonly ENTITY_REFERENCE_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify an
+			 * [Entity](Titanium.XML.Entity) node.
+			 */
+			readonly ENTITY_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [ProcessingInstruction](Titanium.XML.ProcessingInstruction) node.
+			 */
+			readonly PROCESSING_INSTRUCTION_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [Comment](Titanium.XML.Comment) node.
+			 */
+			readonly COMMENT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [Document](Titanium.XML.Document) node.
+			 */
+			readonly DOCUMENT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [DocumentType](Titanium.XML.DocumentType) node.
+			 */
+			readonly DOCUMENT_TYPE_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [DocumentFragment](Titanium.XML.DocumentFragment) node.
+			 */
+			readonly DOCUMENT_FRAGMENT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [Notation](Titanium.XML.Notation) node.
+			 */
+			readonly NOTATION_NODE: number;
+
+			/**
+			 * Name of this node.
+			 */
+			readonly nodeName: string;
+
+			/**
+			 * Content (value) of this node.
+			 */
+			nodeValue: string;
+
+			/**
+			 * Content (value) of all text nodes within this node.
+			 */
+			readonly textContent: string;
+
+			/**
+			 * Content (value) of all text nodes within this node.
+			 */
+			readonly text: string;
+
+			/**
+			 * This node's type. One of `ELEMENT_NODE`, `ATTRIBUTE_NODE`, `TEXT_NODE`, `CDATA_SECTION_NODE`,
+			 * `ENTITY_REFERENCE_NODE`, `ENTITY_NODE`, `PROCESSING_INSTRUCTION_NODE`, `COMMENT_NODE`,
+			 * `DOCUMENT_NODE`, `DOCUMENT_TYPE_NODE`, `DOCUMENT_FRAGMENT_NODE`, `NOTATION_NODE`.
+			 */
+			readonly nodeType: number;
+
+			/**
+			 * This node's parent node.
+			 */
+			readonly parentNode: Titanium.XML.Node;
+
+			/**
+			 * A <Titanium.XML.NodeList> of this node's children.
+			 */
+			readonly childNodes: Titanium.XML.NodeList;
+
+			/**
+			 * This node's first child.
+			 */
+			readonly firstChild: Titanium.XML.Node;
+
+			/**
+			 * This node's last child.
+			 */
+			readonly lastChild: Titanium.XML.Node;
+
+			/**
+			 * This node's previous sibling.
+			 */
+			readonly previousSibling: Titanium.XML.Node;
+
+			/**
+			 * This node's next sibling.
+			 */
+			readonly nextSibling: Titanium.XML.Node;
+
+			/**
+			 * A map of this node's attributes.
+			 */
+			readonly attributes: Titanium.XML.NamedNodeMap;
+
+			/**
+			 * This node's owning document.
+			 */
+			readonly ownerDocument: Titanium.XML.Document;
+
+			/**
+			 * Namespace URI of this node.
+			 */
+			readonly namespaceURI: string;
+
+			/**
+			 * Namespace prefix of this node.
+			 */
+			prefix: string;
+
+			/**
+			 * Local part of the qualified name of this node.
+			 */
+			localName: string;
+
+			/**
+			 * The character data of the node that implements this interface. Throws an exception during setting if this node is readonly.
+			 */
+			data: string;
+
+			/**
+			 * The number of characters that are available through data and the substringData method. This may have the value zero, i.e., <Titanium.XML.CharacterData> may be empty.
+			 */
+			readonly length: number;
+
+			/**
+			 * Appends the node `newChild` as a child of this node.
+			 */
+			appendChild(newChild: Titanium.XML.Node): Titanium.XML.Node;
+
+			/**
+			 * Returns a duplicate of this node.
+			 */
+			cloneNode(deep: boolean): Titanium.XML.Node;
+
+			/**
+			 * Returns `true` if this node has attributes.
+			 */
+			hasAttributes(): boolean;
+
+			/**
+			 * Returns `true` if this node has child nodes.
+			 */
+			hasChildNodes(): boolean;
+
+			/**
+			 * Inserts the node `newChild` before the node `refChild`.
+			 */
+			insertBefore(newChild: Titanium.XML.Node, refChild: Titanium.XML.Node): Titanium.XML.Node;
+
+			/**
+			 * Tests whether the DOM implementation supports a specific feature.
+			 */
+			isSupported(feature: string, version: string): boolean;
+
+			/**
+			 * Normalizes text and attribute nodes in this node's child hierarchy.
+			 */
+			normalize(): void;
+
+			/**
+			 * Removes a child node from this node.
+			 */
+			removeChild(oldChild: Titanium.XML.Node): Titanium.XML.Node;
+
+			/**
+			 * Replaces the node `oldChild` with the node `newChild`.
+			 */
+			replaceChild(newChild: Titanium.XML.Node, oldChild: Titanium.XML.Node): Titanium.XML.Node;
+
+			/**
+			 * Append the string to the end of the character data of the node. Upon success, data provides access to the concatenation of data and the string specified. Throws an exception if this node is readonly.
+			 */
+			appendData(arg: string): void;
+
+			/**
+			 * Remove a range of characters from the node. Upon success, data and length reflect the change. Throws an exception if this node is readonly, if offset is negative, offset is beyond the data's length, or if count is negative.
+			 */
+			deleteData(offset: number, count: number): void;
+
+			/**
+			 * Insert a string at the specified offset. Throws an exception if this node is readonly, if offset is negative, or if offset is beyond the data's length.
+			 */
+			insertData(offset: number, arg: string): void;
+
+			/**
+			 * Replace the characters starting at the specified offset with the specified string. Throws an exception if this node is readonly, if offset is negative, offset is beyond the data's length, or if count is negative.
+			 */
+			replaceData(offset: number, count: number, arg: string): void;
+
+			/**
+			 * Extracts a range of data from the node. Throws an exception if offset is negative, offset is beyond the data's length, or if count is negative.
+			 */
+			substringData(offset: number, count: number): string;
+
+			/**
+			 * Breaks this node into two nodes at the specified by offset, and returns a new node of the same type, which contains all the content at and after the offset point. Throws an exception if the specified offset is negative or if this node is read only.
+			 */
+			splitText(offset: number): Titanium.XML.Text;
+
+			/**
+			 * Gets the value of the <Titanium.XML.CDATASection.attributes> property.
+			 */
+			getAttributes(): Titanium.XML.NamedNodeMap;
+
+			/**
+			 * Gets the value of the <Titanium.XML.CDATASection.data> property.
+			 */
+			getData(): string;
+
+			/**
+			 * Sets the value of the <Titanium.XML.CDATASection.data> property.
+			 */
+			setData(data: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.XML.CDATASection.length> property.
+			 */
+			getLength(): number;
+
+		}
+
+		/**
+		 * An interface extending <Titanium.XML.Node> with a set of attributes and methods for accessing character data in the DOM.
+		 * Implements the [DOM Level 2 API](http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-FF21A306) on Android and iOS. For reasons of compatibility with the javascript engine, text is represented by UTF-8 instead of UTF-16 on Android and iOS.
+		 */
+		interface CharacterData extends Titanium.Proxy {
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify an
+			 * [Element](Titanium.XML.Element) node.
+			 */
+			readonly ELEMENT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify an
+			 * [Attr](Titanium.XML.Attr) node.
+			 */
+			readonly ATTRIBUTE_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [Text](Titanium.XML.Text) node.
+			 */
+			readonly TEXT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [CDATASection](Titanium.XML.CDATASection) node.
+			 */
+			readonly CDATA_SECTION_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify an
+			 * [EntityReference](Titanium.XML.EntityReference) node.
+			 */
+			readonly ENTITY_REFERENCE_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify an
+			 * [Entity](Titanium.XML.Entity) node.
+			 */
+			readonly ENTITY_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [ProcessingInstruction](Titanium.XML.ProcessingInstruction) node.
+			 */
+			readonly PROCESSING_INSTRUCTION_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [Comment](Titanium.XML.Comment) node.
+			 */
+			readonly COMMENT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [Document](Titanium.XML.Document) node.
+			 */
+			readonly DOCUMENT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [DocumentType](Titanium.XML.DocumentType) node.
+			 */
+			readonly DOCUMENT_TYPE_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [DocumentFragment](Titanium.XML.DocumentFragment) node.
+			 */
+			readonly DOCUMENT_FRAGMENT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [Notation](Titanium.XML.Notation) node.
+			 */
+			readonly NOTATION_NODE: number;
+
+			/**
+			 * Name of this node.
+			 */
+			readonly nodeName: string;
+
+			/**
+			 * Content (value) of this node.
+			 */
+			nodeValue: string;
+
+			/**
+			 * Content (value) of all text nodes within this node.
+			 */
+			readonly textContent: string;
+
+			/**
+			 * Content (value) of all text nodes within this node.
+			 */
+			readonly text: string;
+
+			/**
+			 * This node's type. One of `ELEMENT_NODE`, `ATTRIBUTE_NODE`, `TEXT_NODE`, `CDATA_SECTION_NODE`,
+			 * `ENTITY_REFERENCE_NODE`, `ENTITY_NODE`, `PROCESSING_INSTRUCTION_NODE`, `COMMENT_NODE`,
+			 * `DOCUMENT_NODE`, `DOCUMENT_TYPE_NODE`, `DOCUMENT_FRAGMENT_NODE`, `NOTATION_NODE`.
+			 */
+			readonly nodeType: number;
+
+			/**
+			 * This node's parent node.
+			 */
+			readonly parentNode: Titanium.XML.Node;
+
+			/**
+			 * A <Titanium.XML.NodeList> of this node's children.
+			 */
+			readonly childNodes: Titanium.XML.NodeList;
+
+			/**
+			 * This node's first child.
+			 */
+			readonly firstChild: Titanium.XML.Node;
+
+			/**
+			 * This node's last child.
+			 */
+			readonly lastChild: Titanium.XML.Node;
+
+			/**
+			 * This node's previous sibling.
+			 */
+			readonly previousSibling: Titanium.XML.Node;
+
+			/**
+			 * This node's next sibling.
+			 */
+			readonly nextSibling: Titanium.XML.Node;
+
+			/**
+			 * A map of this node's attributes.
+			 */
+			readonly attributes: Titanium.XML.NamedNodeMap;
+
+			/**
+			 * This node's owning document.
+			 */
+			readonly ownerDocument: Titanium.XML.Document;
+
+			/**
+			 * Namespace URI of this node.
+			 */
+			readonly namespaceURI: string;
+
+			/**
+			 * Namespace prefix of this node.
+			 */
+			prefix: string;
+
+			/**
+			 * Local part of the qualified name of this node.
+			 */
+			localName: string;
+
+			/**
+			 * The character data of the node that implements this interface. Throws an exception during setting if this node is readonly.
+			 */
+			data: string;
+
+			/**
+			 * The number of characters that are available through data and the substringData method. This may have the value zero, i.e., <Titanium.XML.CharacterData> may be empty.
+			 */
+			readonly length: number;
+
+			/**
+			 * Appends the node `newChild` as a child of this node.
+			 */
+			appendChild(newChild: Titanium.XML.Node): Titanium.XML.Node;
+
+			/**
+			 * Returns a duplicate of this node.
+			 */
+			cloneNode(deep: boolean): Titanium.XML.Node;
+
+			/**
+			 * Returns `true` if this node has attributes.
+			 */
+			hasAttributes(): boolean;
+
+			/**
+			 * Returns `true` if this node has child nodes.
+			 */
+			hasChildNodes(): boolean;
+
+			/**
+			 * Inserts the node `newChild` before the node `refChild`.
+			 */
+			insertBefore(newChild: Titanium.XML.Node, refChild: Titanium.XML.Node): Titanium.XML.Node;
+
+			/**
+			 * Tests whether the DOM implementation supports a specific feature.
+			 */
+			isSupported(feature: string, version: string): boolean;
+
+			/**
+			 * Normalizes text and attribute nodes in this node's child hierarchy.
+			 */
+			normalize(): void;
+
+			/**
+			 * Removes a child node from this node.
+			 */
+			removeChild(oldChild: Titanium.XML.Node): Titanium.XML.Node;
+
+			/**
+			 * Replaces the node `oldChild` with the node `newChild`.
+			 */
+			replaceChild(newChild: Titanium.XML.Node, oldChild: Titanium.XML.Node): Titanium.XML.Node;
+
+			/**
+			 * Append the string to the end of the character data of the node. Upon success, data provides access to the concatenation of data and the string specified. Throws an exception if this node is readonly.
+			 */
+			appendData(arg: string): void;
+
+			/**
+			 * Remove a range of characters from the node. Upon success, data and length reflect the change. Throws an exception if this node is readonly, if offset is negative, offset is beyond the data's length, or if count is negative.
+			 */
+			deleteData(offset: number, count: number): void;
+
+			/**
+			 * Insert a string at the specified offset. Throws an exception if this node is readonly, if offset is negative, or if offset is beyond the data's length.
+			 */
+			insertData(offset: number, arg: string): void;
+
+			/**
+			 * Replace the characters starting at the specified offset with the specified string. Throws an exception if this node is readonly, if offset is negative, offset is beyond the data's length, or if count is negative.
+			 */
+			replaceData(offset: number, count: number, arg: string): void;
+
+			/**
+			 * Extracts a range of data from the node. Throws an exception if offset is negative, offset is beyond the data's length, or if count is negative.
+			 */
+			substringData(offset: number, count: number): string;
+
+			/**
+			 * Gets the value of the <Titanium.XML.CharacterData.attributes> property.
+			 */
+			getAttributes(): Titanium.XML.NamedNodeMap;
+
+			/**
+			 * Gets the value of the <Titanium.XML.CharacterData.data> property.
+			 */
+			getData(): string;
+
+			/**
+			 * Sets the value of the <Titanium.XML.CharacterData.data> property.
+			 */
+			setData(data: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.XML.CharacterData.length> property.
+			 */
+			getLength(): number;
+
+		}
+
+		/**
+		 * Represents the contents of an XML comment.
+		 */
+		interface Comment extends Titanium.Proxy {
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify an
+			 * [Element](Titanium.XML.Element) node.
+			 */
+			readonly ELEMENT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify an
+			 * [Attr](Titanium.XML.Attr) node.
+			 */
+			readonly ATTRIBUTE_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [Text](Titanium.XML.Text) node.
+			 */
+			readonly TEXT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [CDATASection](Titanium.XML.CDATASection) node.
+			 */
+			readonly CDATA_SECTION_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify an
+			 * [EntityReference](Titanium.XML.EntityReference) node.
+			 */
+			readonly ENTITY_REFERENCE_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify an
+			 * [Entity](Titanium.XML.Entity) node.
+			 */
+			readonly ENTITY_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [ProcessingInstruction](Titanium.XML.ProcessingInstruction) node.
+			 */
+			readonly PROCESSING_INSTRUCTION_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [Comment](Titanium.XML.Comment) node.
+			 */
+			readonly COMMENT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [Document](Titanium.XML.Document) node.
+			 */
+			readonly DOCUMENT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [DocumentType](Titanium.XML.DocumentType) node.
+			 */
+			readonly DOCUMENT_TYPE_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [DocumentFragment](Titanium.XML.DocumentFragment) node.
+			 */
+			readonly DOCUMENT_FRAGMENT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [Notation](Titanium.XML.Notation) node.
+			 */
+			readonly NOTATION_NODE: number;
+
+			/**
+			 * Name of this node.
+			 */
+			readonly nodeName: string;
+
+			/**
+			 * Content (value) of this node.
+			 */
+			nodeValue: string;
+
+			/**
+			 * Content (value) of all text nodes within this node.
+			 */
+			readonly textContent: string;
+
+			/**
+			 * Content (value) of all text nodes within this node.
+			 */
+			readonly text: string;
+
+			/**
+			 * This node's type. One of `ELEMENT_NODE`, `ATTRIBUTE_NODE`, `TEXT_NODE`, `CDATA_SECTION_NODE`,
+			 * `ENTITY_REFERENCE_NODE`, `ENTITY_NODE`, `PROCESSING_INSTRUCTION_NODE`, `COMMENT_NODE`,
+			 * `DOCUMENT_NODE`, `DOCUMENT_TYPE_NODE`, `DOCUMENT_FRAGMENT_NODE`, `NOTATION_NODE`.
+			 */
+			readonly nodeType: number;
+
+			/**
+			 * This node's parent node.
+			 */
+			readonly parentNode: Titanium.XML.Node;
+
+			/**
+			 * A <Titanium.XML.NodeList> of this node's children.
+			 */
+			readonly childNodes: Titanium.XML.NodeList;
+
+			/**
+			 * This node's first child.
+			 */
+			readonly firstChild: Titanium.XML.Node;
+
+			/**
+			 * This node's last child.
+			 */
+			readonly lastChild: Titanium.XML.Node;
+
+			/**
+			 * This node's previous sibling.
+			 */
+			readonly previousSibling: Titanium.XML.Node;
+
+			/**
+			 * This node's next sibling.
+			 */
+			readonly nextSibling: Titanium.XML.Node;
+
+			/**
+			 * A map of this node's attributes.
+			 */
+			readonly attributes: Titanium.XML.NamedNodeMap;
+
+			/**
+			 * This node's owning document.
+			 */
+			readonly ownerDocument: Titanium.XML.Document;
+
+			/**
+			 * Namespace URI of this node.
+			 */
+			readonly namespaceURI: string;
+
+			/**
+			 * Namespace prefix of this node.
+			 */
+			prefix: string;
+
+			/**
+			 * Local part of the qualified name of this node.
+			 */
+			localName: string;
+
+			/**
+			 * The character data of the node that implements this interface. Throws an exception during setting if this node is readonly.
+			 */
+			data: string;
+
+			/**
+			 * The number of characters that are available through data and the substringData method. This may have the value zero, i.e., <Titanium.XML.CharacterData> may be empty.
+			 */
+			readonly length: number;
+
+			/**
+			 * Appends the node `newChild` as a child of this node.
+			 */
+			appendChild(newChild: Titanium.XML.Node): Titanium.XML.Node;
+
+			/**
+			 * Returns a duplicate of this node.
+			 */
+			cloneNode(deep: boolean): Titanium.XML.Node;
+
+			/**
+			 * Returns `true` if this node has attributes.
+			 */
+			hasAttributes(): boolean;
+
+			/**
+			 * Returns `true` if this node has child nodes.
+			 */
+			hasChildNodes(): boolean;
+
+			/**
+			 * Inserts the node `newChild` before the node `refChild`.
+			 */
+			insertBefore(newChild: Titanium.XML.Node, refChild: Titanium.XML.Node): Titanium.XML.Node;
+
+			/**
+			 * Tests whether the DOM implementation supports a specific feature.
+			 */
+			isSupported(feature: string, version: string): boolean;
+
+			/**
+			 * Normalizes text and attribute nodes in this node's child hierarchy.
+			 */
+			normalize(): void;
+
+			/**
+			 * Removes a child node from this node.
+			 */
+			removeChild(oldChild: Titanium.XML.Node): Titanium.XML.Node;
+
+			/**
+			 * Replaces the node `oldChild` with the node `newChild`.
+			 */
+			replaceChild(newChild: Titanium.XML.Node, oldChild: Titanium.XML.Node): Titanium.XML.Node;
+
+			/**
+			 * Append the string to the end of the character data of the node. Upon success, data provides access to the concatenation of data and the string specified. Throws an exception if this node is readonly.
+			 */
+			appendData(arg: string): void;
+
+			/**
+			 * Remove a range of characters from the node. Upon success, data and length reflect the change. Throws an exception if this node is readonly, if offset is negative, offset is beyond the data's length, or if count is negative.
+			 */
+			deleteData(offset: number, count: number): void;
+
+			/**
+			 * Insert a string at the specified offset. Throws an exception if this node is readonly, if offset is negative, or if offset is beyond the data's length.
+			 */
+			insertData(offset: number, arg: string): void;
+
+			/**
+			 * Replace the characters starting at the specified offset with the specified string. Throws an exception if this node is readonly, if offset is negative, offset is beyond the data's length, or if count is negative.
+			 */
+			replaceData(offset: number, count: number, arg: string): void;
+
+			/**
+			 * Extracts a range of data from the node. Throws an exception if offset is negative, offset is beyond the data's length, or if count is negative.
+			 */
+			substringData(offset: number, count: number): string;
+
+			/**
+			 * Gets the value of the <Titanium.XML.Comment.attributes> property.
+			 */
+			getAttributes(): Titanium.XML.NamedNodeMap;
+
+			/**
+			 * Gets the value of the <Titanium.XML.Comment.data> property.
+			 */
+			getData(): string;
+
+			/**
+			 * Sets the value of the <Titanium.XML.Comment.data> property.
+			 */
+			setData(data: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.XML.Comment.length> property.
+			 */
+			getLength(): number;
+
+		}
+
+		/**
+		 * The <Titanium.XML.DOMImplementation> interface provides a number of methods for performing operations that are independent of any particular instance of the document object model.Implements the [DOM Level 2 API](http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-102161490) on Android and iOS.
+		 */
+		interface DOMImplementation extends Titanium.Proxy {
+			/**
+			 * Creates an <Titanium.XML.Document> object of the specified type with its document element. Raises an exception if qualifiedName is malformed, contains an illegal character, or is inconsistent with namespaceURI. Also raises an exception if doctype has already been used with a different document.
+			 */
+			createDocument(namespaceURI: string, qualifiedName: string, doctype: Titanium.XML.DocumentType): Titanium.XML.Document;
+
+			/**
+			 * Creates an empty <Titanium.XML.DocumentType> node. Entity declarations and notations are not made available. Entity reference expansions and default attribute additions do not occur. Raises an exception if qualifiedName is malformed or contains an illegal character.
+			 */
+			createDocumentType(qualifiedName: string, publicId: string, systemId: string): Titanium.XML.DocumentType;
+
+			/**
+			 * Test if the <Titanium.XML.DOMImplementation> implements a specific feature.
+			 */
+			hasFeature(feature: string, version: string): boolean;
+
+		}
+
+		/**
+		 * The DOM Document returned from <Titanium.XML.parseString>.
+		 */
+		interface Document extends Titanium.Proxy {
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify an
+			 * [Element](Titanium.XML.Element) node.
+			 */
+			readonly ELEMENT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify an
+			 * [Attr](Titanium.XML.Attr) node.
+			 */
+			readonly ATTRIBUTE_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [Text](Titanium.XML.Text) node.
+			 */
+			readonly TEXT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [CDATASection](Titanium.XML.CDATASection) node.
+			 */
+			readonly CDATA_SECTION_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify an
+			 * [EntityReference](Titanium.XML.EntityReference) node.
+			 */
+			readonly ENTITY_REFERENCE_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify an
+			 * [Entity](Titanium.XML.Entity) node.
+			 */
+			readonly ENTITY_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [ProcessingInstruction](Titanium.XML.ProcessingInstruction) node.
+			 */
+			readonly PROCESSING_INSTRUCTION_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [Comment](Titanium.XML.Comment) node.
+			 */
+			readonly COMMENT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [Document](Titanium.XML.Document) node.
+			 */
+			readonly DOCUMENT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [DocumentType](Titanium.XML.DocumentType) node.
+			 */
+			readonly DOCUMENT_TYPE_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [DocumentFragment](Titanium.XML.DocumentFragment) node.
+			 */
+			readonly DOCUMENT_FRAGMENT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [Notation](Titanium.XML.Notation) node.
+			 */
+			readonly NOTATION_NODE: number;
+
+			/**
+			 * Name of this node.
+			 */
+			readonly nodeName: string;
+
+			/**
+			 * Content (value) of this node.
+			 */
+			nodeValue: string;
+
+			/**
+			 * Content (value) of all text nodes within this node.
+			 */
+			readonly textContent: string;
+
+			/**
+			 * Content (value) of all text nodes within this node.
+			 */
+			readonly text: string;
+
+			/**
+			 * This node's type. One of `ELEMENT_NODE`, `ATTRIBUTE_NODE`, `TEXT_NODE`, `CDATA_SECTION_NODE`,
+			 * `ENTITY_REFERENCE_NODE`, `ENTITY_NODE`, `PROCESSING_INSTRUCTION_NODE`, `COMMENT_NODE`,
+			 * `DOCUMENT_NODE`, `DOCUMENT_TYPE_NODE`, `DOCUMENT_FRAGMENT_NODE`, `NOTATION_NODE`.
+			 */
+			readonly nodeType: number;
+
+			/**
+			 * This node's parent node.
+			 */
+			readonly parentNode: Titanium.XML.Node;
+
+			/**
+			 * A <Titanium.XML.NodeList> of this node's children.
+			 */
+			readonly childNodes: Titanium.XML.NodeList;
+
+			/**
+			 * This node's first child.
+			 */
+			readonly firstChild: Titanium.XML.Node;
+
+			/**
+			 * This node's last child.
+			 */
+			readonly lastChild: Titanium.XML.Node;
+
+			/**
+			 * This node's previous sibling.
+			 */
+			readonly previousSibling: Titanium.XML.Node;
+
+			/**
+			 * This node's next sibling.
+			 */
+			readonly nextSibling: Titanium.XML.Node;
+
+			/**
+			 * A map of this node's attributes.
+			 */
+			readonly attributes: Titanium.XML.NamedNodeMap;
+
+			/**
+			 * This node's owning document.
+			 */
+			readonly ownerDocument: Titanium.XML.Document;
+
+			/**
+			 * Namespace URI of this node.
+			 */
+			readonly namespaceURI: string;
+
+			/**
+			 * Namespace prefix of this node.
+			 */
+			prefix: string;
+
+			/**
+			 * Local part of the qualified name of this node.
+			 */
+			localName: string;
+
+			/**
+			 * An interface to the list of entities that are defined for the document, such as via a Document Type Definition (DTD).
+			 */
+			readonly doctype: Titanium.XML.DocumentType;
+
+			/**
+			 * Root element of this document.
+			 */
+			readonly documentElement: Titanium.XML.Element;
+
+			/**
+			 * [DOMImplementation](Titanium.XML.DOMImplementation) object associated with this
+			 * document.
+			 */
+			readonly implementation: Titanium.XML.DOMImplementation;
+
+			/**
+			 * Appends the node `newChild` as a child of this node.
+			 */
+			appendChild(newChild: Titanium.XML.Node): Titanium.XML.Node;
+
+			/**
+			 * Returns a duplicate of this node.
+			 */
+			cloneNode(deep: boolean): Titanium.XML.Node;
+
+			/**
+			 * Returns `true` if this node has attributes.
+			 */
+			hasAttributes(): boolean;
+
+			/**
+			 * Returns `true` if this node has child nodes.
+			 */
+			hasChildNodes(): boolean;
+
+			/**
+			 * Inserts the node `newChild` before the node `refChild`.
+			 */
+			insertBefore(newChild: Titanium.XML.Node, refChild: Titanium.XML.Node): Titanium.XML.Node;
+
+			/**
+			 * Tests whether the DOM implementation supports a specific feature.
+			 */
+			isSupported(feature: string, version: string): boolean;
+
+			/**
+			 * Normalizes text and attribute nodes in this node's child hierarchy.
+			 */
+			normalize(): void;
+
+			/**
+			 * Removes a child node from this node.
+			 */
+			removeChild(oldChild: Titanium.XML.Node): Titanium.XML.Node;
+
+			/**
+			 * Replaces the node `oldChild` with the node `newChild`.
+			 */
+			replaceChild(newChild: Titanium.XML.Node, oldChild: Titanium.XML.Node): Titanium.XML.Node;
+
+			/**
+			 * Creates an attribute with the given name.
+			 */
+			createAttribute(name: string): Titanium.XML.Attr;
+
+			/**
+			 * Creates an attribute with the given name and namespace.
+			 */
+			createAttributeNS(namespaceURI: string, name: string): Titanium.XML.Attr;
+
+			/**
+			 * Creates and returns a [CDATASection](Titanium.XML.CDATASection).
+			 */
+			createCDATASection(data: string): Titanium.XML.CDATASection;
+
+			/**
+			 * Creates a [Comment](Titanium.XML.Comment) with the supplied string data.
+			 */
+			createComment(data: string): Titanium.XML.Comment;
+
+			/**
+			 * Creates an empty [DocumentFragment](Titanium.XML.DocumentFragment).
+			 */
+			createDocumentFragment(): Titanium.XML.DocumentFragment;
+
+			/**
+			 * Creates an element with the given tag name.
+			 */
+			createElement(tagName: string): Titanium.XML.Element;
+
+			/**
+			 * Create a new element with the given namespace and name.
+			 */
+			createElementNS(namespaceURI: string, name: string): Titanium.XML.Element;
+
+			/**
+			 * Creates an [EntityReference](Titanium.XML.EntityReference) with the given name.
+			 */
+			createEntityReference(name: string): Titanium.XML.EntityReference;
+
+			/**
+			 * Creates a processing instruction for inserting into the DOM tree.
+			 */
+			createProcessingInstruction(target: string, data: string): Titanium.XML.ProcessingInstruction;
+
+			/**
+			 * Creates a text node.
+			 */
+			createTextNode(data: string): Titanium.XML.Text;
+
+			/**
+			 * Returns an [Element](Titanium.XML.Element) that has an ID attribute with the given value.
+			 */
+			getElementById(elementId: string): Titanium.XML.Element;
+
+			/**
+			 * Returns a node list of elements in the document which have the given tag.
+			 */
+			getElementsByTagName(tagname: string): Titanium.XML.NodeList;
+
+			/**
+			 * Returns a node list of elements in the document which belong to the given namespace and have the given tag name.
+			 */
+			getElementsByTagNameNS(namespaceURI: string, localname: string): Titanium.XML.NodeList;
+
+			/**
+			 * Imports a node from another document to this document,
+			 * without altering or removing the source node from the original document.
+			 */
+			importNode(importedNode: Titanium.XML.Node, deep: boolean): Titanium.XML.Node;
+
+			/**
+			 * Gets the value of the <Titanium.XML.Document.attributes> property.
+			 */
+			getAttributes(): Titanium.XML.NamedNodeMap;
+
+			/**
+			 * Gets the value of the <Titanium.XML.Document.doctype> property.
+			 */
+			getDoctype(): Titanium.XML.DocumentType;
+
+			/**
+			 * Gets the value of the <Titanium.XML.Document.documentElement> property.
+			 */
+			getDocumentElement(): Titanium.XML.Element;
+
+			/**
+			 * Gets the value of the <Titanium.XML.Document.implementation> property.
+			 */
+			getImplementation(): Titanium.XML.DOMImplementation;
+
+		}
+
+		/**
+		 * A lightweight document object used as a container for a group of nodes.
+		 */
+		interface DocumentFragment extends Titanium.Proxy {
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify an
+			 * [Element](Titanium.XML.Element) node.
+			 */
+			readonly ELEMENT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify an
+			 * [Attr](Titanium.XML.Attr) node.
+			 */
+			readonly ATTRIBUTE_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [Text](Titanium.XML.Text) node.
+			 */
+			readonly TEXT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [CDATASection](Titanium.XML.CDATASection) node.
+			 */
+			readonly CDATA_SECTION_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify an
+			 * [EntityReference](Titanium.XML.EntityReference) node.
+			 */
+			readonly ENTITY_REFERENCE_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify an
+			 * [Entity](Titanium.XML.Entity) node.
+			 */
+			readonly ENTITY_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [ProcessingInstruction](Titanium.XML.ProcessingInstruction) node.
+			 */
+			readonly PROCESSING_INSTRUCTION_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [Comment](Titanium.XML.Comment) node.
+			 */
+			readonly COMMENT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [Document](Titanium.XML.Document) node.
+			 */
+			readonly DOCUMENT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [DocumentType](Titanium.XML.DocumentType) node.
+			 */
+			readonly DOCUMENT_TYPE_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [DocumentFragment](Titanium.XML.DocumentFragment) node.
+			 */
+			readonly DOCUMENT_FRAGMENT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [Notation](Titanium.XML.Notation) node.
+			 */
+			readonly NOTATION_NODE: number;
+
+			/**
+			 * Name of this node.
+			 */
+			readonly nodeName: string;
+
+			/**
+			 * Content (value) of this node.
+			 */
+			nodeValue: string;
+
+			/**
+			 * Content (value) of all text nodes within this node.
+			 */
+			readonly textContent: string;
+
+			/**
+			 * Content (value) of all text nodes within this node.
+			 */
+			readonly text: string;
+
+			/**
+			 * This node's type. One of `ELEMENT_NODE`, `ATTRIBUTE_NODE`, `TEXT_NODE`, `CDATA_SECTION_NODE`,
+			 * `ENTITY_REFERENCE_NODE`, `ENTITY_NODE`, `PROCESSING_INSTRUCTION_NODE`, `COMMENT_NODE`,
+			 * `DOCUMENT_NODE`, `DOCUMENT_TYPE_NODE`, `DOCUMENT_FRAGMENT_NODE`, `NOTATION_NODE`.
+			 */
+			readonly nodeType: number;
+
+			/**
+			 * This node's parent node.
+			 */
+			readonly parentNode: Titanium.XML.Node;
+
+			/**
+			 * A <Titanium.XML.NodeList> of this node's children.
+			 */
+			readonly childNodes: Titanium.XML.NodeList;
+
+			/**
+			 * This node's first child.
+			 */
+			readonly firstChild: Titanium.XML.Node;
+
+			/**
+			 * This node's last child.
+			 */
+			readonly lastChild: Titanium.XML.Node;
+
+			/**
+			 * This node's previous sibling.
+			 */
+			readonly previousSibling: Titanium.XML.Node;
+
+			/**
+			 * This node's next sibling.
+			 */
+			readonly nextSibling: Titanium.XML.Node;
+
+			/**
+			 * A map of this node's attributes.
+			 */
+			readonly attributes: Titanium.XML.NamedNodeMap;
+
+			/**
+			 * This node's owning document.
+			 */
+			readonly ownerDocument: Titanium.XML.Document;
+
+			/**
+			 * Namespace URI of this node.
+			 */
+			readonly namespaceURI: string;
+
+			/**
+			 * Namespace prefix of this node.
+			 */
+			prefix: string;
+
+			/**
+			 * Local part of the qualified name of this node.
+			 */
+			localName: string;
+
+			/**
+			 * Appends the node `newChild` as a child of this node.
+			 */
+			appendChild(newChild: Titanium.XML.Node): Titanium.XML.Node;
+
+			/**
+			 * Returns a duplicate of this node.
+			 */
+			cloneNode(deep: boolean): Titanium.XML.Node;
+
+			/**
+			 * Returns `true` if this node has attributes.
+			 */
+			hasAttributes(): boolean;
+
+			/**
+			 * Returns `true` if this node has child nodes.
+			 */
+			hasChildNodes(): boolean;
+
+			/**
+			 * Inserts the node `newChild` before the node `refChild`.
+			 */
+			insertBefore(newChild: Titanium.XML.Node, refChild: Titanium.XML.Node): Titanium.XML.Node;
+
+			/**
+			 * Tests whether the DOM implementation supports a specific feature.
+			 */
+			isSupported(feature: string, version: string): boolean;
+
+			/**
+			 * Normalizes text and attribute nodes in this node's child hierarchy.
+			 */
+			normalize(): void;
+
+			/**
+			 * Removes a child node from this node.
+			 */
+			removeChild(oldChild: Titanium.XML.Node): Titanium.XML.Node;
+
+			/**
+			 * Replaces the node `oldChild` with the node `newChild`.
+			 */
+			replaceChild(newChild: Titanium.XML.Node, oldChild: Titanium.XML.Node): Titanium.XML.Node;
+
+			/**
+			 * Gets the value of the <Titanium.XML.DocumentFragment.attributes> property.
+			 */
+			getAttributes(): Titanium.XML.NamedNodeMap;
+
+		}
+
+		/**
+		 * Each <Titanium.XML.Document> has a `doctype` attribute whose value is either 'null' or a <Titanium.XML.DocumentType> object.
+		 */
+		interface DocumentType extends Titanium.Proxy {
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify an
+			 * [Element](Titanium.XML.Element) node.
+			 */
+			readonly ELEMENT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify an
+			 * [Attr](Titanium.XML.Attr) node.
+			 */
+			readonly ATTRIBUTE_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [Text](Titanium.XML.Text) node.
+			 */
+			readonly TEXT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [CDATASection](Titanium.XML.CDATASection) node.
+			 */
+			readonly CDATA_SECTION_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify an
+			 * [EntityReference](Titanium.XML.EntityReference) node.
+			 */
+			readonly ENTITY_REFERENCE_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify an
+			 * [Entity](Titanium.XML.Entity) node.
+			 */
+			readonly ENTITY_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [ProcessingInstruction](Titanium.XML.ProcessingInstruction) node.
+			 */
+			readonly PROCESSING_INSTRUCTION_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [Comment](Titanium.XML.Comment) node.
+			 */
+			readonly COMMENT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [Document](Titanium.XML.Document) node.
+			 */
+			readonly DOCUMENT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [DocumentType](Titanium.XML.DocumentType) node.
+			 */
+			readonly DOCUMENT_TYPE_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [DocumentFragment](Titanium.XML.DocumentFragment) node.
+			 */
+			readonly DOCUMENT_FRAGMENT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [Notation](Titanium.XML.Notation) node.
+			 */
+			readonly NOTATION_NODE: number;
+
+			/**
+			 * Name of this node.
+			 */
+			readonly nodeName: string;
+
+			/**
+			 * Content (value) of this node.
+			 */
+			nodeValue: string;
+
+			/**
+			 * Content (value) of all text nodes within this node.
+			 */
+			readonly textContent: string;
+
+			/**
+			 * Content (value) of all text nodes within this node.
+			 */
+			readonly text: string;
+
+			/**
+			 * This node's type. One of `ELEMENT_NODE`, `ATTRIBUTE_NODE`, `TEXT_NODE`, `CDATA_SECTION_NODE`,
+			 * `ENTITY_REFERENCE_NODE`, `ENTITY_NODE`, `PROCESSING_INSTRUCTION_NODE`, `COMMENT_NODE`,
+			 * `DOCUMENT_NODE`, `DOCUMENT_TYPE_NODE`, `DOCUMENT_FRAGMENT_NODE`, `NOTATION_NODE`.
+			 */
+			readonly nodeType: number;
+
+			/**
+			 * This node's parent node.
+			 */
+			readonly parentNode: Titanium.XML.Node;
+
+			/**
+			 * A <Titanium.XML.NodeList> of this node's children.
+			 */
+			readonly childNodes: Titanium.XML.NodeList;
+
+			/**
+			 * This node's first child.
+			 */
+			readonly firstChild: Titanium.XML.Node;
+
+			/**
+			 * This node's last child.
+			 */
+			readonly lastChild: Titanium.XML.Node;
+
+			/**
+			 * This node's previous sibling.
+			 */
+			readonly previousSibling: Titanium.XML.Node;
+
+			/**
+			 * This node's next sibling.
+			 */
+			readonly nextSibling: Titanium.XML.Node;
+
+			/**
+			 * A map of this node's attributes.
+			 */
+			readonly attributes: Titanium.XML.NamedNodeMap;
+
+			/**
+			 * This node's owning document.
+			 */
+			readonly ownerDocument: Titanium.XML.Document;
+
+			/**
+			 * Namespace URI of this node.
+			 */
+			readonly namespaceURI: string;
+
+			/**
+			 * Namespace prefix of this node.
+			 */
+			prefix: string;
+
+			/**
+			 * Local part of the qualified name of this node.
+			 */
+			localName: string;
+
+			/**
+			 * A <Titanium.XML.NamedNodeMap> containing the general entities, both external and internal, declared in the DTD. Parameter entities are not contained. Duplicates are discarded.
+			 */
+			readonly entities: Titanium.XML.NamedNodeMap;
+
+			/**
+			 * The internal subset as a string.
+			 */
+			readonly internalSubset: string;
+
+			/**
+			 * The name of DTD; i.e., the name immediately following the `DOCTYPE` keyword.
+			 */
+			readonly name: string;
+
+			/**
+			 * A <Titanium.XML.NamedNodeMap> containing the notations declared in the DTD. Duplicates are discarded. Every node in this map also implements the <Titanium.XML.Notation> interface.
+			 */
+			readonly notations: Titanium.XML.NamedNodeMap;
+
+			/**
+			 * The public identifier of the external subset.
+			 */
+			readonly publicId: string;
+
+			/**
+			 * The system identifier of the external subset.
+			 */
+			readonly systemId: string;
+
+			/**
+			 * Appends the node `newChild` as a child of this node.
+			 */
+			appendChild(newChild: Titanium.XML.Node): Titanium.XML.Node;
+
+			/**
+			 * Returns a duplicate of this node.
+			 */
+			cloneNode(deep: boolean): Titanium.XML.Node;
+
+			/**
+			 * Returns `true` if this node has attributes.
+			 */
+			hasAttributes(): boolean;
+
+			/**
+			 * Returns `true` if this node has child nodes.
+			 */
+			hasChildNodes(): boolean;
+
+			/**
+			 * Inserts the node `newChild` before the node `refChild`.
+			 */
+			insertBefore(newChild: Titanium.XML.Node, refChild: Titanium.XML.Node): Titanium.XML.Node;
+
+			/**
+			 * Tests whether the DOM implementation supports a specific feature.
+			 */
+			isSupported(feature: string, version: string): boolean;
+
+			/**
+			 * Normalizes text and attribute nodes in this node's child hierarchy.
+			 */
+			normalize(): void;
+
+			/**
+			 * Removes a child node from this node.
+			 */
+			removeChild(oldChild: Titanium.XML.Node): Titanium.XML.Node;
+
+			/**
+			 * Replaces the node `oldChild` with the node `newChild`.
+			 */
+			replaceChild(newChild: Titanium.XML.Node, oldChild: Titanium.XML.Node): Titanium.XML.Node;
+
+			/**
+			 * Gets the value of the <Titanium.XML.DocumentType.attributes> property.
+			 */
+			getAttributes(): Titanium.XML.NamedNodeMap;
+
+			/**
+			 * Gets the value of the <Titanium.XML.DocumentType.entities> property.
+			 */
+			getEntities(): Titanium.XML.NamedNodeMap;
+
+			/**
+			 * Gets the value of the <Titanium.XML.DocumentType.internalSubset> property.
+			 */
+			getInternalSubset(): string;
+
+			/**
+			 * Gets the value of the <Titanium.XML.DocumentType.name> property.
+			 */
+			getName(): string;
+
+			/**
+			 * Gets the value of the <Titanium.XML.DocumentType.notations> property.
+			 */
+			getNotations(): Titanium.XML.NamedNodeMap;
+
+			/**
+			 * Gets the value of the <Titanium.XML.DocumentType.publicId> property.
+			 */
+			getPublicId(): string;
+
+			/**
+			 * Gets the value of the <Titanium.XML.DocumentType.systemId> property.
+			 */
+			getSystemId(): string;
+
+		}
+
+		/**
+		 * Represents an element in a DOM document, a <Titanium.XML.Node> defined by a start-tag and end-tag (or an empty tag). Elements may have [attributes](Titanium.XML.Attr) associated with them.
+		 * Implements the [DOM Level 2 API](http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-745549614) on Android and iOS with some non-standard extensions.
+		 */
+		interface Element extends Titanium.Proxy {
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify an
+			 * [Element](Titanium.XML.Element) node.
+			 */
+			readonly ELEMENT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify an
+			 * [Attr](Titanium.XML.Attr) node.
+			 */
+			readonly ATTRIBUTE_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [Text](Titanium.XML.Text) node.
+			 */
+			readonly TEXT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [CDATASection](Titanium.XML.CDATASection) node.
+			 */
+			readonly CDATA_SECTION_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify an
+			 * [EntityReference](Titanium.XML.EntityReference) node.
+			 */
+			readonly ENTITY_REFERENCE_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify an
+			 * [Entity](Titanium.XML.Entity) node.
+			 */
+			readonly ENTITY_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [ProcessingInstruction](Titanium.XML.ProcessingInstruction) node.
+			 */
+			readonly PROCESSING_INSTRUCTION_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [Comment](Titanium.XML.Comment) node.
+			 */
+			readonly COMMENT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [Document](Titanium.XML.Document) node.
+			 */
+			readonly DOCUMENT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [DocumentType](Titanium.XML.DocumentType) node.
+			 */
+			readonly DOCUMENT_TYPE_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [DocumentFragment](Titanium.XML.DocumentFragment) node.
+			 */
+			readonly DOCUMENT_FRAGMENT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [Notation](Titanium.XML.Notation) node.
+			 */
+			readonly NOTATION_NODE: number;
+
+			/**
+			 * Name of this node.
+			 */
+			readonly nodeName: string;
+
+			/**
+			 * Content (value) of this node.
+			 */
+			nodeValue: string;
+
+			/**
+			 * Content (value) of all text nodes within this node.
+			 */
+			readonly textContent: string;
+
+			/**
+			 * Content (value) of all text nodes within this node.
+			 */
+			readonly text: string;
+
+			/**
+			 * This node's type. One of `ELEMENT_NODE`, `ATTRIBUTE_NODE`, `TEXT_NODE`, `CDATA_SECTION_NODE`,
+			 * `ENTITY_REFERENCE_NODE`, `ENTITY_NODE`, `PROCESSING_INSTRUCTION_NODE`, `COMMENT_NODE`,
+			 * `DOCUMENT_NODE`, `DOCUMENT_TYPE_NODE`, `DOCUMENT_FRAGMENT_NODE`, `NOTATION_NODE`.
+			 */
+			readonly nodeType: number;
+
+			/**
+			 * This node's parent node.
+			 */
+			readonly parentNode: Titanium.XML.Node;
+
+			/**
+			 * A <Titanium.XML.NodeList> of this node's children.
+			 */
+			readonly childNodes: Titanium.XML.NodeList;
+
+			/**
+			 * This node's first child.
+			 */
+			readonly firstChild: Titanium.XML.Node;
+
+			/**
+			 * This node's last child.
+			 */
+			readonly lastChild: Titanium.XML.Node;
+
+			/**
+			 * This node's previous sibling.
+			 */
+			readonly previousSibling: Titanium.XML.Node;
+
+			/**
+			 * This node's next sibling.
+			 */
+			readonly nextSibling: Titanium.XML.Node;
+
+			/**
+			 * A map of this node's attributes.
+			 */
+			readonly attributes: Titanium.XML.NamedNodeMap;
+
+			/**
+			 * This node's owning document.
+			 */
+			readonly ownerDocument: Titanium.XML.Document;
+
+			/**
+			 * Namespace URI of this node.
+			 */
+			readonly namespaceURI: string;
+
+			/**
+			 * Namespace prefix of this node.
+			 */
+			prefix: string;
+
+			/**
+			 * Local part of the qualified name of this node.
+			 */
+			localName: string;
+
+			/**
+			 * The name of the element, as defined by its tag.
+			 */
+			readonly tagName: string;
+
+			/**
+			 * Appends the node `newChild` as a child of this node.
+			 */
+			appendChild(newChild: Titanium.XML.Node): Titanium.XML.Node;
+
+			/**
+			 * Returns a duplicate of this node.
+			 */
+			cloneNode(deep: boolean): Titanium.XML.Node;
+
+			/**
+			 * Returns `true` if this node has attributes.
+			 */
+			hasAttributes(): boolean;
+
+			/**
+			 * Returns `true` if this node has child nodes.
+			 */
+			hasChildNodes(): boolean;
+
+			/**
+			 * Inserts the node `newChild` before the node `refChild`.
+			 */
+			insertBefore(newChild: Titanium.XML.Node, refChild: Titanium.XML.Node): Titanium.XML.Node;
+
+			/**
+			 * Tests whether the DOM implementation supports a specific feature.
+			 */
+			isSupported(feature: string, version: string): boolean;
+
+			/**
+			 * Normalizes text and attribute nodes in this node's child hierarchy.
+			 */
+			normalize(): void;
+
+			/**
+			 * Removes a child node from this node.
+			 */
+			removeChild(oldChild: Titanium.XML.Node): Titanium.XML.Node;
+
+			/**
+			 * Replaces the node `oldChild` with the node `newChild`.
+			 */
+			replaceChild(newChild: Titanium.XML.Node, oldChild: Titanium.XML.Node): Titanium.XML.Node;
+
+			/**
+			 * Retrieves an attribute value by name, returning it as a string.
+			 */
+			getAttribute(name: string): string;
+
+			/**
+			 * Adds a new attribute. Any attribute with the same name is replaced. Throws an exception if the element is read-only, or if the name contains an illegal character.
+			 */
+			setAttribute(name: string, value: string): void;
+
+			/**
+			 * Removes an attribute by name. If the attribute has a default value, it is immediately replaced with this default, including namespace URI and local name. Throws an exception if the element is read-only.
+			 */
+			removeAttribute(name: string): void;
+
+			/**
+			 * Retrieves an attribute value by name, returning it as a <Titanium.XML.Attr> object.
+			 */
+			getAttributeNode(name: string): Titanium.XML.Attr;
+
+			/**
+			 * Adds a new attribute. Any attribute with the same `nodeName` as the argument is replaced. Throws an exception if the element is read-only, if `newAttr` is from a different document, or if `newAttr` is already an attribute of another element.
+			 */
+			setAttributeNode(newAttr: Titanium.XML.Attr): Titanium.XML.Attr;
+
+			/**
+			 * Removes the specified attribute node. If the removed attribute has a default value, it is replaced immediately, with the same namespace and local name as the removed attribute, if applicable. Throws an exception if the element is read-only, or the attribute is not an attribute of the element.
+			 */
+			removeAttributeNode(oldAttr: Titanium.XML.Attr): void;
+
+			/**
+			 * Retrieves a <Titanium.XML.NodeList> of all descendant elements with a given tag name, in preorder traversal.
+			 */
+			getElementsByTagName(name: string): Titanium.XML.NodeList;
+
+			/**
+			 * Retrieves an attribute value by local name and namespace URI, returning it as a string.
+			 */
+			getAttributeNS(namespaceURI: string, localName: string): string;
+
+			/**
+			 * Adds a new attribute. Any attribute with the same local name and namespace URI is present on the element is replaced, with its prefix changed to that of the `qualifiedName` parameter. Throws an exception if the element is read-only, if the name contains an illegal character, or if the qualified name contains an error.
+			 */
+			setAttributeNS(namespaceURI: string, qualifiedName: string, value: string): void;
+
+			/**
+			 * Removes an attribute by local name and namespace URI. If the attribute has a default value, it is immediately replaced with this default, including namespace URI and local name. Throws an exception if the element is read-only.
+			 */
+			removeAttributeNS(namespaceURI: string, localName: string): void;
+
+			/**
+			 * Retrieves an attribute value by local name and namespace URI, returning it as a <Titanium.XML.Attr> object.
+			 */
+			getAttributeNodeNS(namespaceURI: string, localName: string): Titanium.XML.Attr;
+
+			/**
+			 * Adds a new attribute. Any attribute with the same local name and namespace URI is replaced. Throws an exception if the element is read-only, if `newAttr` is from a different document, or if `newAttr` is already an attribute of another element.
+			 */
+			setAttributeNodeNS(newAttr: Titanium.XML.Attr): Titanium.XML.Attr;
+
+			/**
+			 * Retrieves a <Titanium.XML.NodeList> of all descendant elements with a given local name and namespace URI, in preorder traversal.
+			 */
+			getElementsByTagNameNS(namespaceURI: string, localName: string): Titanium.XML.NodeList;
+
+			/**
+			 * Determines whether or not an attribute with the given name is available in the element, or has a default value.
+			 */
+			hasAttribute(name: string): boolean;
+
+			/**
+			 * Determines whether or not an attribute with the given name is available in the element, or has a default value.
+			 */
+			hasAttributeNS(namespaceURI: string, localName: string): boolean;
+
+			/**
+			 * Gets the value of the <Titanium.XML.Element.attributes> property.
+			 */
+			getAttributes(): Titanium.XML.NamedNodeMap;
+
+			/**
+			 * Gets the value of the <Titanium.XML.Element.tagName> property.
+			 */
+			getTagName(): string;
+
+		}
+
+		/**
+		 * This interface represents an entity, either parsed or unparsed, in an XML document. Note that this models the entity itself not the entity declaration. The nodeName attribute that is inherited from Node contains the name of the entity. An Entity node does not have any parent.
+		 * Implements the [DOM Level 2 API](http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-527DCFF2) on Android and iOS.
+		 */
+		interface Entity extends Titanium.Proxy {
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify an
+			 * [Element](Titanium.XML.Element) node.
+			 */
+			readonly ELEMENT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify an
+			 * [Attr](Titanium.XML.Attr) node.
+			 */
+			readonly ATTRIBUTE_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [Text](Titanium.XML.Text) node.
+			 */
+			readonly TEXT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [CDATASection](Titanium.XML.CDATASection) node.
+			 */
+			readonly CDATA_SECTION_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify an
+			 * [EntityReference](Titanium.XML.EntityReference) node.
+			 */
+			readonly ENTITY_REFERENCE_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify an
+			 * [Entity](Titanium.XML.Entity) node.
+			 */
+			readonly ENTITY_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [ProcessingInstruction](Titanium.XML.ProcessingInstruction) node.
+			 */
+			readonly PROCESSING_INSTRUCTION_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [Comment](Titanium.XML.Comment) node.
+			 */
+			readonly COMMENT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [Document](Titanium.XML.Document) node.
+			 */
+			readonly DOCUMENT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [DocumentType](Titanium.XML.DocumentType) node.
+			 */
+			readonly DOCUMENT_TYPE_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [DocumentFragment](Titanium.XML.DocumentFragment) node.
+			 */
+			readonly DOCUMENT_FRAGMENT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [Notation](Titanium.XML.Notation) node.
+			 */
+			readonly NOTATION_NODE: number;
+
+			/**
+			 * Name of this node.
+			 */
+			readonly nodeName: string;
+
+			/**
+			 * Content (value) of this node.
+			 */
+			nodeValue: string;
+
+			/**
+			 * Content (value) of all text nodes within this node.
+			 */
+			readonly textContent: string;
+
+			/**
+			 * Content (value) of all text nodes within this node.
+			 */
+			readonly text: string;
+
+			/**
+			 * This node's type. One of `ELEMENT_NODE`, `ATTRIBUTE_NODE`, `TEXT_NODE`, `CDATA_SECTION_NODE`,
+			 * `ENTITY_REFERENCE_NODE`, `ENTITY_NODE`, `PROCESSING_INSTRUCTION_NODE`, `COMMENT_NODE`,
+			 * `DOCUMENT_NODE`, `DOCUMENT_TYPE_NODE`, `DOCUMENT_FRAGMENT_NODE`, `NOTATION_NODE`.
+			 */
+			readonly nodeType: number;
+
+			/**
+			 * This node's parent node.
+			 */
+			readonly parentNode: Titanium.XML.Node;
+
+			/**
+			 * A <Titanium.XML.NodeList> of this node's children.
+			 */
+			readonly childNodes: Titanium.XML.NodeList;
+
+			/**
+			 * This node's first child.
+			 */
+			readonly firstChild: Titanium.XML.Node;
+
+			/**
+			 * This node's last child.
+			 */
+			readonly lastChild: Titanium.XML.Node;
+
+			/**
+			 * This node's previous sibling.
+			 */
+			readonly previousSibling: Titanium.XML.Node;
+
+			/**
+			 * This node's next sibling.
+			 */
+			readonly nextSibling: Titanium.XML.Node;
+
+			/**
+			 * A map of this node's attributes.
+			 */
+			readonly attributes: Titanium.XML.NamedNodeMap;
+
+			/**
+			 * This node's owning document.
+			 */
+			readonly ownerDocument: Titanium.XML.Document;
+
+			/**
+			 * Namespace URI of this node.
+			 */
+			readonly namespaceURI: string;
+
+			/**
+			 * Namespace prefix of this node.
+			 */
+			prefix: string;
+
+			/**
+			 * Local part of the qualified name of this node.
+			 */
+			localName: string;
+
+			/**
+			 * For unparsed entities, the name of the notation for the entity. For parsed entities, this is `null`.
+			 */
+			readonly notationName: string;
+
+			/**
+			 * The public identifier associated with the entity, if specified. If the public identifier was not specified, this is `null`.
+			 */
+			readonly publicId: string;
+
+			/**
+			 * The system identifier associated with the entity, if specified. If the system identifier was not specified, this is null.
+			 */
+			readonly systemId: string;
+
+			/**
+			 * Appends the node `newChild` as a child of this node.
+			 */
+			appendChild(newChild: Titanium.XML.Node): Titanium.XML.Node;
+
+			/**
+			 * Returns a duplicate of this node.
+			 */
+			cloneNode(deep: boolean): Titanium.XML.Node;
+
+			/**
+			 * Returns `true` if this node has attributes.
+			 */
+			hasAttributes(): boolean;
+
+			/**
+			 * Returns `true` if this node has child nodes.
+			 */
+			hasChildNodes(): boolean;
+
+			/**
+			 * Inserts the node `newChild` before the node `refChild`.
+			 */
+			insertBefore(newChild: Titanium.XML.Node, refChild: Titanium.XML.Node): Titanium.XML.Node;
+
+			/**
+			 * Tests whether the DOM implementation supports a specific feature.
+			 */
+			isSupported(feature: string, version: string): boolean;
+
+			/**
+			 * Normalizes text and attribute nodes in this node's child hierarchy.
+			 */
+			normalize(): void;
+
+			/**
+			 * Removes a child node from this node.
+			 */
+			removeChild(oldChild: Titanium.XML.Node): Titanium.XML.Node;
+
+			/**
+			 * Replaces the node `oldChild` with the node `newChild`.
+			 */
+			replaceChild(newChild: Titanium.XML.Node, oldChild: Titanium.XML.Node): Titanium.XML.Node;
+
+			/**
+			 * Gets the value of the <Titanium.XML.Entity.attributes> property.
+			 */
+			getAttributes(): Titanium.XML.NamedNodeMap;
+
+			/**
+			 * Gets the value of the <Titanium.XML.Entity.notationName> property.
+			 */
+			getNotationName(): string;
+
+			/**
+			 * Gets the value of the <Titanium.XML.Entity.publicId> property.
+			 */
+			getPublicId(): string;
+
+			/**
+			 * Gets the value of the <Titanium.XML.Entity.systemId> property.
+			 */
+			getSystemId(): string;
+
+		}
+
+		/**
+		 * Represents an XML entity reference.
+		 */
+		interface EntityReference extends Titanium.Proxy {
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify an
+			 * [Element](Titanium.XML.Element) node.
+			 */
+			readonly ELEMENT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify an
+			 * [Attr](Titanium.XML.Attr) node.
+			 */
+			readonly ATTRIBUTE_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [Text](Titanium.XML.Text) node.
+			 */
+			readonly TEXT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [CDATASection](Titanium.XML.CDATASection) node.
+			 */
+			readonly CDATA_SECTION_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify an
+			 * [EntityReference](Titanium.XML.EntityReference) node.
+			 */
+			readonly ENTITY_REFERENCE_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify an
+			 * [Entity](Titanium.XML.Entity) node.
+			 */
+			readonly ENTITY_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [ProcessingInstruction](Titanium.XML.ProcessingInstruction) node.
+			 */
+			readonly PROCESSING_INSTRUCTION_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [Comment](Titanium.XML.Comment) node.
+			 */
+			readonly COMMENT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [Document](Titanium.XML.Document) node.
+			 */
+			readonly DOCUMENT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [DocumentType](Titanium.XML.DocumentType) node.
+			 */
+			readonly DOCUMENT_TYPE_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [DocumentFragment](Titanium.XML.DocumentFragment) node.
+			 */
+			readonly DOCUMENT_FRAGMENT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [Notation](Titanium.XML.Notation) node.
+			 */
+			readonly NOTATION_NODE: number;
+
+			/**
+			 * Name of this node.
+			 */
+			readonly nodeName: string;
+
+			/**
+			 * Content (value) of this node.
+			 */
+			nodeValue: string;
+
+			/**
+			 * Content (value) of all text nodes within this node.
+			 */
+			readonly textContent: string;
+
+			/**
+			 * Content (value) of all text nodes within this node.
+			 */
+			readonly text: string;
+
+			/**
+			 * This node's type. One of `ELEMENT_NODE`, `ATTRIBUTE_NODE`, `TEXT_NODE`, `CDATA_SECTION_NODE`,
+			 * `ENTITY_REFERENCE_NODE`, `ENTITY_NODE`, `PROCESSING_INSTRUCTION_NODE`, `COMMENT_NODE`,
+			 * `DOCUMENT_NODE`, `DOCUMENT_TYPE_NODE`, `DOCUMENT_FRAGMENT_NODE`, `NOTATION_NODE`.
+			 */
+			readonly nodeType: number;
+
+			/**
+			 * This node's parent node.
+			 */
+			readonly parentNode: Titanium.XML.Node;
+
+			/**
+			 * A <Titanium.XML.NodeList> of this node's children.
+			 */
+			readonly childNodes: Titanium.XML.NodeList;
+
+			/**
+			 * This node's first child.
+			 */
+			readonly firstChild: Titanium.XML.Node;
+
+			/**
+			 * This node's last child.
+			 */
+			readonly lastChild: Titanium.XML.Node;
+
+			/**
+			 * This node's previous sibling.
+			 */
+			readonly previousSibling: Titanium.XML.Node;
+
+			/**
+			 * This node's next sibling.
+			 */
+			readonly nextSibling: Titanium.XML.Node;
+
+			/**
+			 * A map of this node's attributes.
+			 */
+			readonly attributes: Titanium.XML.NamedNodeMap;
+
+			/**
+			 * This node's owning document.
+			 */
+			readonly ownerDocument: Titanium.XML.Document;
+
+			/**
+			 * Namespace URI of this node.
+			 */
+			readonly namespaceURI: string;
+
+			/**
+			 * Namespace prefix of this node.
+			 */
+			prefix: string;
+
+			/**
+			 * Local part of the qualified name of this node.
+			 */
+			localName: string;
+
+			/**
+			 * Appends the node `newChild` as a child of this node.
+			 */
+			appendChild(newChild: Titanium.XML.Node): Titanium.XML.Node;
+
+			/**
+			 * Returns a duplicate of this node.
+			 */
+			cloneNode(deep: boolean): Titanium.XML.Node;
+
+			/**
+			 * Returns `true` if this node has attributes.
+			 */
+			hasAttributes(): boolean;
+
+			/**
+			 * Returns `true` if this node has child nodes.
+			 */
+			hasChildNodes(): boolean;
+
+			/**
+			 * Inserts the node `newChild` before the node `refChild`.
+			 */
+			insertBefore(newChild: Titanium.XML.Node, refChild: Titanium.XML.Node): Titanium.XML.Node;
+
+			/**
+			 * Tests whether the DOM implementation supports a specific feature.
+			 */
+			isSupported(feature: string, version: string): boolean;
+
+			/**
+			 * Normalizes text and attribute nodes in this node's child hierarchy.
+			 */
+			normalize(): void;
+
+			/**
+			 * Removes a child node from this node.
+			 */
+			removeChild(oldChild: Titanium.XML.Node): Titanium.XML.Node;
+
+			/**
+			 * Replaces the node `oldChild` with the node `newChild`.
+			 */
+			replaceChild(newChild: Titanium.XML.Node, oldChild: Titanium.XML.Node): Titanium.XML.Node;
+
+			/**
+			 * Gets the value of the <Titanium.XML.EntityReference.attributes> property.
+			 */
+			getAttributes(): Titanium.XML.NamedNodeMap;
+
+		}
+
+		/**
+		 * A key-value paired map that maps String objects to <Titanium.XML.Node> objects.
+		 * Implements the [DOM Level 2 API](http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-1780488922) on Android and iOS.
+		 */
+		interface NamedNodeMap extends Titanium.Proxy {
+			/**
+			 * The number of nodes in the map. The valid range of child node indices is 0-`length`-1, inclusive.
+			 */
+			readonly length: number;
+
+			/**
+			 * Retrieves a node specified by name.
+			 */
+			getNamedItem(name: string): Titanium.XML.Node;
+
+			/**
+			 * Adds a node using its `nodeName` attribute. If a node with that name is already present, it is replaced. Throws an exception if the argument is from a different document, the map is read-only, or the argument is an attribute of another element.
+			 */
+			setNamedItem(node: Titanium.XML.Node): Titanium.XML.Node;
+
+			/**
+			 * Removes a node from the map specified by name. When this map contains attributes attached to an element, if the removed attribtue is known to have a default, it is replaced with that value.
+			 */
+			removeNamedItem(name: string): Titanium.XML.Node;
+
+			/**
+			 * Retrieves the node at the specified index of the map. Note that NamedNodeMaps are not ordered.
+			 */
+			item(index: number): Titanium.XML.Node;
+
+			/**
+			 * Retrieves a node specified by name and namespace. Returns `null` if no matching node is in the map.
+			 */
+			getNamedItemNS(namespaceURI: string, localName: string): Titanium.XML.Node;
+
+			/**
+			 * Adds a node using its `namespaceURI` and `localName` attributes. If a node with that name is already present, it is replaced. Throws an exception if the argument is from a different document, the map is read-only, or the argument is an attribute of another element.
+			 */
+			setNamedItemNS(node: Titanium.XML.Node): Titanium.XML.Node;
+
+			/**
+			 * Removes a node from the map specified by local name and namespace URI. When this map contains attributes attached to an element, if the removed attribtue is known to have a default, it is replaced with that value. Returns the node removed from the map, or `null` if there is no corresponding node.
+			 */
+			removeNamedItemNS(namespaceURI: string, localName: string): Titanium.XML.Node;
+
+			/**
+			 * Gets the value of the <Titanium.XML.NamedNodeMap.length> property.
+			 */
+			getLength(): number;
+
+		}
+
+		/**
+		 * A single node in the [Document](Titanium.XML.Document) tree.
+		 */
+		interface Node extends Titanium.Proxy {
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify an
+			 * [Element](Titanium.XML.Element) node.
+			 */
+			readonly ELEMENT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify an
+			 * [Attr](Titanium.XML.Attr) node.
+			 */
+			readonly ATTRIBUTE_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [Text](Titanium.XML.Text) node.
+			 */
+			readonly TEXT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [CDATASection](Titanium.XML.CDATASection) node.
+			 */
+			readonly CDATA_SECTION_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify an
+			 * [EntityReference](Titanium.XML.EntityReference) node.
+			 */
+			readonly ENTITY_REFERENCE_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify an
+			 * [Entity](Titanium.XML.Entity) node.
+			 */
+			readonly ENTITY_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [ProcessingInstruction](Titanium.XML.ProcessingInstruction) node.
+			 */
+			readonly PROCESSING_INSTRUCTION_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [Comment](Titanium.XML.Comment) node.
+			 */
+			readonly COMMENT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [Document](Titanium.XML.Document) node.
+			 */
+			readonly DOCUMENT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [DocumentType](Titanium.XML.DocumentType) node.
+			 */
+			readonly DOCUMENT_TYPE_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [DocumentFragment](Titanium.XML.DocumentFragment) node.
+			 */
+			readonly DOCUMENT_FRAGMENT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [Notation](Titanium.XML.Notation) node.
+			 */
+			readonly NOTATION_NODE: number;
+
+			/**
+			 * Name of this node.
+			 */
+			readonly nodeName: string;
+
+			/**
+			 * Content (value) of this node.
+			 */
+			nodeValue: string;
+
+			/**
+			 * Content (value) of all text nodes within this node.
+			 */
+			readonly textContent: string;
+
+			/**
+			 * Content (value) of all text nodes within this node.
+			 */
+			readonly text: string;
+
+			/**
+			 * This node's type. One of `ELEMENT_NODE`, `ATTRIBUTE_NODE`, `TEXT_NODE`, `CDATA_SECTION_NODE`,
+			 * `ENTITY_REFERENCE_NODE`, `ENTITY_NODE`, `PROCESSING_INSTRUCTION_NODE`, `COMMENT_NODE`,
+			 * `DOCUMENT_NODE`, `DOCUMENT_TYPE_NODE`, `DOCUMENT_FRAGMENT_NODE`, `NOTATION_NODE`.
+			 */
+			readonly nodeType: number;
+
+			/**
+			 * This node's parent node.
+			 */
+			readonly parentNode: Titanium.XML.Node;
+
+			/**
+			 * A <Titanium.XML.NodeList> of this node's children.
+			 */
+			readonly childNodes: Titanium.XML.NodeList;
+
+			/**
+			 * This node's first child.
+			 */
+			readonly firstChild: Titanium.XML.Node;
+
+			/**
+			 * This node's last child.
+			 */
+			readonly lastChild: Titanium.XML.Node;
+
+			/**
+			 * This node's previous sibling.
+			 */
+			readonly previousSibling: Titanium.XML.Node;
+
+			/**
+			 * This node's next sibling.
+			 */
+			readonly nextSibling: Titanium.XML.Node;
+
+			/**
+			 * A map of this node's attributes.
+			 */
+			readonly attributes: Titanium.XML.NamedNodeMap;
+
+			/**
+			 * This node's owning document.
+			 */
+			readonly ownerDocument: Titanium.XML.Document;
+
+			/**
+			 * Namespace URI of this node.
+			 */
+			readonly namespaceURI: string;
+
+			/**
+			 * Namespace prefix of this node.
+			 */
+			prefix: string;
+
+			/**
+			 * Local part of the qualified name of this node.
+			 */
+			localName: string;
+
+			/**
+			 * Appends the node `newChild` as a child of this node.
+			 */
+			appendChild(newChild: Titanium.XML.Node): Titanium.XML.Node;
+
+			/**
+			 * Returns a duplicate of this node.
+			 */
+			cloneNode(deep: boolean): Titanium.XML.Node;
+
+			/**
+			 * Returns `true` if this node has attributes.
+			 */
+			hasAttributes(): boolean;
+
+			/**
+			 * Returns `true` if this node has child nodes.
+			 */
+			hasChildNodes(): boolean;
+
+			/**
+			 * Inserts the node `newChild` before the node `refChild`.
+			 */
+			insertBefore(newChild: Titanium.XML.Node, refChild: Titanium.XML.Node): Titanium.XML.Node;
+
+			/**
+			 * Tests whether the DOM implementation supports a specific feature.
+			 */
+			isSupported(feature: string, version: string): boolean;
+
+			/**
+			 * Normalizes text and attribute nodes in this node's child hierarchy.
+			 */
+			normalize(): void;
+
+			/**
+			 * Removes a child node from this node.
+			 */
+			removeChild(oldChild: Titanium.XML.Node): Titanium.XML.Node;
+
+			/**
+			 * Replaces the node `oldChild` with the node `newChild`.
+			 */
+			replaceChild(newChild: Titanium.XML.Node, oldChild: Titanium.XML.Node): Titanium.XML.Node;
+
+			/**
+			 * Gets the value of the <Titanium.XML.Node.attributes> property.
+			 */
+			getAttributes(): Titanium.XML.NamedNodeMap;
+
+		}
+
+		/**
+		 * A list of <Titanium.XML.Node> objects. Implements the [DOM Level 2 API](http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-536297177) on Android and iOS.
+		 */
+		interface NodeList extends Titanium.Proxy {
+			/**
+			 * The length of the node list.
+			 */
+			readonly length: number;
+
+			/**
+			 * Returns the <Titanium.XML.Node> object at the specified index.
+			 */
+			item(index: number): Titanium.XML.Node;
+
+			/**
+			 * Gets the value of the <Titanium.XML.NodeList.length> property.
+			 */
+			getLength(): number;
+
+		}
+
+		/**
+		 * Represents a notation declared in the DTD.  Implements the [DOM Level 2 API](http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-5431D1B9) on Android and iOS.
+		 */
+		interface Notation extends Titanium.Proxy {
+			/**
+			 * The public identifier of this notation. If the public identifier was not specified, this is `null`.
+			 */
+			readonly publicId: string;
+
+			/**
+			 * The system identifier of this notation. If the system identifier was not specified, this is `null`.
+			 */
+			readonly systemId: string;
+
+			/**
+			 * Gets the value of the <Titanium.XML.Notation.publicId> property.
+			 */
+			getPublicId(): string;
+
+			/**
+			 * Gets the value of the <Titanium.XML.Notation.systemId> property.
+			 */
+			getSystemId(): string;
+
+		}
+
+		/**
+		 * A way to keep processor-specific information in the text of the document. Implements the [DOM Level 2 API](http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-1004215813) on Android and iOS.
+		 */
+		interface ProcessingInstruction extends Titanium.Proxy {
+			/**
+			 * Retrieve the content of this processing instruction. This from the first non white space character after the target to the character immediatly preceding the ?>. When setting a processing instruction, a DOMException may be thrown on an invalid instruction.
+			 */
+			data: string;
+
+			/**
+			 * Retrieve the target of this processing instruction. XML defines this as being the first token following the markup that begins the processing instruction.
+			 */
+			readonly target: string;
+
+			/**
+			 * Gets the value of the <Titanium.XML.ProcessingInstruction.data> property.
+			 */
+			getData(): string;
+
+			/**
+			 * Sets the value of the <Titanium.XML.ProcessingInstruction.data> property.
+			 */
+			setData(data: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.XML.ProcessingInstruction.target> property.
+			 */
+			getTarget(): string;
+
+		}
+
+		/**
+		 * Represents the textual content of an <Titanium.XML.Element> or <Titanium.XML.Attr> Implements the [DOM Level 2 API](http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-1312295772) on Android and iOS.
+		 */
+		interface Text extends Titanium.Proxy {
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify an
+			 * [Element](Titanium.XML.Element) node.
+			 */
+			readonly ELEMENT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify an
+			 * [Attr](Titanium.XML.Attr) node.
+			 */
+			readonly ATTRIBUTE_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [Text](Titanium.XML.Text) node.
+			 */
+			readonly TEXT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [CDATASection](Titanium.XML.CDATASection) node.
+			 */
+			readonly CDATA_SECTION_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify an
+			 * [EntityReference](Titanium.XML.EntityReference) node.
+			 */
+			readonly ENTITY_REFERENCE_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify an
+			 * [Entity](Titanium.XML.Entity) node.
+			 */
+			readonly ENTITY_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [ProcessingInstruction](Titanium.XML.ProcessingInstruction) node.
+			 */
+			readonly PROCESSING_INSTRUCTION_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [Comment](Titanium.XML.Comment) node.
+			 */
+			readonly COMMENT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [Document](Titanium.XML.Document) node.
+			 */
+			readonly DOCUMENT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [DocumentType](Titanium.XML.DocumentType) node.
+			 */
+			readonly DOCUMENT_TYPE_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [DocumentFragment](Titanium.XML.DocumentFragment) node.
+			 */
+			readonly DOCUMENT_FRAGMENT_NODE: number;
+
+			/**
+			 * Used with [nodeType](Titanium.XML.Node.nodeType) to identify a
+			 * [Notation](Titanium.XML.Notation) node.
+			 */
+			readonly NOTATION_NODE: number;
+
+			/**
+			 * Name of this node.
+			 */
+			readonly nodeName: string;
+
+			/**
+			 * Content (value) of this node.
+			 */
+			nodeValue: string;
+
+			/**
+			 * Content (value) of all text nodes within this node.
+			 */
+			readonly textContent: string;
+
+			/**
+			 * Content (value) of all text nodes within this node.
+			 */
+			readonly text: string;
+
+			/**
+			 * This node's type. One of `ELEMENT_NODE`, `ATTRIBUTE_NODE`, `TEXT_NODE`, `CDATA_SECTION_NODE`,
+			 * `ENTITY_REFERENCE_NODE`, `ENTITY_NODE`, `PROCESSING_INSTRUCTION_NODE`, `COMMENT_NODE`,
+			 * `DOCUMENT_NODE`, `DOCUMENT_TYPE_NODE`, `DOCUMENT_FRAGMENT_NODE`, `NOTATION_NODE`.
+			 */
+			readonly nodeType: number;
+
+			/**
+			 * This node's parent node.
+			 */
+			readonly parentNode: Titanium.XML.Node;
+
+			/**
+			 * A <Titanium.XML.NodeList> of this node's children.
+			 */
+			readonly childNodes: Titanium.XML.NodeList;
+
+			/**
+			 * This node's first child.
+			 */
+			readonly firstChild: Titanium.XML.Node;
+
+			/**
+			 * This node's last child.
+			 */
+			readonly lastChild: Titanium.XML.Node;
+
+			/**
+			 * This node's previous sibling.
+			 */
+			readonly previousSibling: Titanium.XML.Node;
+
+			/**
+			 * This node's next sibling.
+			 */
+			readonly nextSibling: Titanium.XML.Node;
+
+			/**
+			 * A map of this node's attributes.
+			 */
+			readonly attributes: Titanium.XML.NamedNodeMap;
+
+			/**
+			 * This node's owning document.
+			 */
+			readonly ownerDocument: Titanium.XML.Document;
+
+			/**
+			 * Namespace URI of this node.
+			 */
+			readonly namespaceURI: string;
+
+			/**
+			 * Namespace prefix of this node.
+			 */
+			prefix: string;
+
+			/**
+			 * Local part of the qualified name of this node.
+			 */
+			localName: string;
+
+			/**
+			 * The character data of the node that implements this interface. Throws an exception during setting if this node is readonly.
+			 */
+			data: string;
+
+			/**
+			 * The number of characters that are available through data and the substringData method. This may have the value zero, i.e., <Titanium.XML.CharacterData> may be empty.
+			 */
+			readonly length: number;
+
+			/**
+			 * Appends the node `newChild` as a child of this node.
+			 */
+			appendChild(newChild: Titanium.XML.Node): Titanium.XML.Node;
+
+			/**
+			 * Returns a duplicate of this node.
+			 */
+			cloneNode(deep: boolean): Titanium.XML.Node;
+
+			/**
+			 * Returns `true` if this node has attributes.
+			 */
+			hasAttributes(): boolean;
+
+			/**
+			 * Returns `true` if this node has child nodes.
+			 */
+			hasChildNodes(): boolean;
+
+			/**
+			 * Inserts the node `newChild` before the node `refChild`.
+			 */
+			insertBefore(newChild: Titanium.XML.Node, refChild: Titanium.XML.Node): Titanium.XML.Node;
+
+			/**
+			 * Tests whether the DOM implementation supports a specific feature.
+			 */
+			isSupported(feature: string, version: string): boolean;
+
+			/**
+			 * Normalizes text and attribute nodes in this node's child hierarchy.
+			 */
+			normalize(): void;
+
+			/**
+			 * Removes a child node from this node.
+			 */
+			removeChild(oldChild: Titanium.XML.Node): Titanium.XML.Node;
+
+			/**
+			 * Replaces the node `oldChild` with the node `newChild`.
+			 */
+			replaceChild(newChild: Titanium.XML.Node, oldChild: Titanium.XML.Node): Titanium.XML.Node;
+
+			/**
+			 * Append the string to the end of the character data of the node. Upon success, data provides access to the concatenation of data and the string specified. Throws an exception if this node is readonly.
+			 */
+			appendData(arg: string): void;
+
+			/**
+			 * Remove a range of characters from the node. Upon success, data and length reflect the change. Throws an exception if this node is readonly, if offset is negative, offset is beyond the data's length, or if count is negative.
+			 */
+			deleteData(offset: number, count: number): void;
+
+			/**
+			 * Insert a string at the specified offset. Throws an exception if this node is readonly, if offset is negative, or if offset is beyond the data's length.
+			 */
+			insertData(offset: number, arg: string): void;
+
+			/**
+			 * Replace the characters starting at the specified offset with the specified string. Throws an exception if this node is readonly, if offset is negative, offset is beyond the data's length, or if count is negative.
+			 */
+			replaceData(offset: number, count: number, arg: string): void;
+
+			/**
+			 * Extracts a range of data from the node. Throws an exception if offset is negative, offset is beyond the data's length, or if count is negative.
+			 */
+			substringData(offset: number, count: number): string;
+
+			/**
+			 * Breaks this node into two nodes at the specified by offset, and returns a new node of the same type, which contains all the content at and after the offset point. Throws an exception if the specified offset is negative or if this node is read only.
+			 */
+			splitText(offset: number): Titanium.XML.Text;
+
+			/**
+			 * Gets the value of the <Titanium.XML.Text.attributes> property.
+			 */
+			getAttributes(): Titanium.XML.NamedNodeMap;
+
+			/**
+			 * Gets the value of the <Titanium.XML.Text.data> property.
+			 */
+			getData(): string;
+
+			/**
+			 * Sets the value of the <Titanium.XML.Text.data> property.
+			 */
+			setData(data: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.XML.Text.length> property.
+			 */
+			getLength(): number;
+
+		}
+
+	}
+
+	/**
+	 * The top level Yahoo module.  The Yahoo module is used for accessing Yahoo related API services.
+	 */
+	namespace Yahoo {
+		/**
+		 * Indicates if the proxy will bubble an event to its parent.
+		 */
+		let bubbleParent: boolean;
+
+		/**
+		 * The name of the API that this proxy corresponds to.
+		 */
+		const apiName: string;
+
+		/**
+		 * The Window or TabGroup whose Activity lifecycle should be triggered on the proxy.
+		 */
+		let lifecycleContainer: Titanium.UI.Window | Titanium.UI.TabGroup;
+
+		/**
+		 * Adds the specified callback as an event listener for the named event.
+		 */
+		function addEventListener(name: string, callback: (param0: any) => any): void;
+
+		/**
+		 * Removes the specified callback as an event listener for the named event.
+		 */
+		function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+		/**
+		 * Fires a synthesized event to any registered listeners.
+		 */
+		function fireEvent(name: string, event: any): void;
+
+		/**
+		 * Applies the properties to the proxy.
+		 */
+		function applyProperties(props: any): void;
+
+		/**
+		 * invoke a Yahoo YQL query
+		 */
+		function yql(yql: string, callback: (param0: YQLResponse) => any): void;
+
+		/**
+		 * Gets the value of the <Titanium.Yahoo.bubbleParent> property.
+		 */
+		function getBubbleParent(): boolean;
+
+		/**
+		 * Sets the value of the <Titanium.Yahoo.bubbleParent> property.
+		 */
+		function setBubbleParent(bubbleParent: boolean): void;
+
+		/**
+		 * Gets the value of the <Titanium.Yahoo.apiName> property.
+		 */
+		function getApiName(): string;
+
+		/**
+		 * Gets the value of the <Titanium.Yahoo.lifecycleContainer> property.
+		 */
+		function getLifecycleContainer(): Titanium.UI.Window | Titanium.UI.TabGroup;
+
+		/**
+		 * Sets the value of the <Titanium.Yahoo.lifecycleContainer> property.
+		 */
+		function setLifecycleContainer(lifecycleContainer: Titanium.UI.Window): void;
+
+		/**
+		 * Sets the value of the <Titanium.Yahoo.lifecycleContainer> property.
+		 */
+		function setLifecycleContainer(lifecycleContainer: Titanium.UI.TabGroup): void;
+
 	}
 }
-
-declare class Dictionary<Object>  {
-
-}
-
-declare class BarItemType  {
-	accessibilityLabel : string;
-	enabled : boolean;
-	image : any;
-	title : string;
-	width : number;
-}
-
-declare class MatrixCreationDict  {
-	anchorPoint : Dictionary<Object>;
-	rotate : number;
-	scale : number;
-}
-
-declare class TableViewIndexEntry  {
-	index : number;
-	title : string;
-}
-
-declare class FacebookRESTResponsev1  {
-	error : string;
-	method : string;
-	result : string;
-	success : boolean;
-}
-
-declare class titleAttributesParams  {
-	color : string;
-	font : Font;
-	shadow : shadowDict;
-}
-
-declare class MapRegionType  {
-	latitude : number;
-	latitudeDelta : number;
-	longitude : number;
-	longitudeDelta : number;
-}
-
-declare class CropRectType  {
-	height : number;
-	width : number;
-	x : number;
-	y : number;
-}
-
-declare class LocationResults extends ErrorResponse {
-	coords : LocationCoordinates;
-	provider : LocationProviderDict;
-}
-
-declare class ErrorResponse  {
-	code : number;
-	error : string;
-	success : boolean;
-}
-
-declare class CloudPushNotificationsQueryResponse extends CloudResponse {
-	subscriptions : Array<Dictionary<Object>>;
-}
-
-declare class CloudResponse  {
-	code : number;
-	error : boolean;
-	message : string;
-	meta : Dictionary<Object>;
-	success : boolean;
-}
-
-declare enum CloudPushNotificationsResponse {
-
-}
-
-declare class textFieldSelectedParams  {
-	length : number;
-	location : number;
-}
-
-declare class recurrenceEndDictionary  {
-	endDate : Date;
-	occurrenceCount : number;
-}
-
-declare namespace Global {
-	export function L (key: string, hint?: string) : string;
-	export function alert (message: string) : void;
-	export function clearInterval (timerId: number) : void;
-	export function clearTimeout (timerId: number) : void;
-	export function decodeURIComponent (encodedURI: string) : string;
-	export function encodeURIComponent (string: string) : string;
-	export function require (moduleId: string) : any;
-	export function setInterval (_function: (...args : any[]) => any, delay: number) : number;
-	export function setTimeout (_function: (...args : any[]) => any, delay: number) : number;
-	export interface console  {
-		debug (message: any) : void;
-		error (message: any) : void;
-		info (message: any) : void;
-		log (message: any) : void;
-		warn (message: any) : void;
-	}
-	export interface String  {
-		format (formatString: string, value: string) : string;
-		format (formatString: string, value: number) : string;
-		formatCurrency (value: number) : string;
-		formatDate (date: Date, format?: string) : string;
-		formatDecimal (value: number, locale?: string, pattern?: string) : string;
-		formatTime (date: Date, format?: string) : string;
-	}
-	export interface JSON  {
-		parse (text: string, reviver: (...args : any[]) => any) : any;
-		stringify (value: any, replacer?: (...args : any[]) => any, space?: number) : string;
-		stringify (value: any, replacer?: Array<String>, space?: string) : string;
-		stringify (value: any, replacer?: Array<String>, space?: number) : string;
-		stringify (value: any, replacer?: (...args : any[]) => any, space?: string) : string;
-	}
-}
-
-declare class CloudGeoFenceResponse extends CloudResponse {
-	geo_fences : Array<Dictionary<Object>>;
-}
-
-declare class ServiceIntentOptions  {
-	startMode : number;
-	url : string;
-}
-
-declare class AcceptedCallbackArgs  {
-	inbound : Ti.Network.Socket.TCP;
-	socket : Ti.Network.Socket.TCP;
-}
-
-declare class HeadingData  {
-	accuracy : number;
-	magneticHeading : number;
-	timestamp : number;
-	trueHeading : number;
-	x : number;
-	y : number;
-	z : number;
-}
-
-declare class FacebookGraphResponsev1  {
-	error : string;
-	path : string;
-	result : string;
-	success : boolean;
-}
-
-declare class textAreaSelectedParams  {
-	length : number;
-	location : number;
-}
-
-declare class ThumbnailResponse extends ErrorResponse {
-	image : Ti.Blob;
-	time : number;
-}
-
-declare class Dimension  {
-	height : number;
-	width : number;
-	x : number;
-	y : number;
-}
-
-declare class ReadCallbackArgs extends ErrorResponse {
-	bytesProcessed : number;
-	errorDescription : string;
-	errorState : number;
-	source : Ti.IOStream;
-}
-
-declare class CloudACLsCheckResponse extends CloudResponse {
-	permission : Dictionary<Object>;
-}
-
-declare class ViewTemplate  {
-	bindId : string;
-	childTemplates : Array<ViewTemplate>;
-	events : Dictionary<Object>;
-	properties : Dictionary<Object>;
-	type : string;
-}
-
-declare class CloudChatsResponse extends CloudResponse {
-	chats : Array<Dictionary<Object>>;
-}
-
-declare class MediaQueryType  {
-	albumArtist : any;
-	albumTitle : any;
-	artist : any;
-	composer : any;
-	genre : any;
-	grouping : number;
-	isCompilation : any;
-	mediaType : any;
-	title : any;
-}
-
-declare class WebAPIError  {
-	code : number;
-	message : string;
-	name : string;
-}
-
-declare class DocumentViewerOptions  {
-	animated : boolean;
-	view : Ti.UI.View;
-}
-
-declare class ListViewAnimationProperties  {
-	animated : boolean;
-	animationStyle : number;
-	position : number;
-}
-
-declare class CloudPushSchedulesResponse extends CloudResponse {
-	push_schedules : Array<Object>;
-}
-
-declare class DataCallbackArgs  {
-	address : string;
-	bytesData : Array<Number>;
-	port : string;
-	stringData : string;
-}
-
-declare class CloudPushNotificationErrorArg  {
-	error : string;
-}
-
-declare class ScreenshotResult  {
-	media : Ti.Blob;
-}
-
-declare class YQLResponse extends ErrorResponse {
-	data : any;
-	message : string;
-}
-
-declare class ForwardGeocodeResponse extends ErrorResponse {
-	accuracy : number;
-	address : string;
-	city : string;
-	country : string;
-	countryCode : string;
-	country_code : string;
-	displayAddress : string;
-	latitude : string;
-	longitude : string;
-	postalCode : string;
-	region1 : string;
-	region2 : string;
-	street : string;
-	street1 : string;
-}
-
-declare class CloudEventsResponse extends CloudResponse {
-	events : Array<Dictionary<Object>>;
-}
-
-declare class ReadyStatePayload  {
-	readyState : number;
-}
-
-declare class ErrorCallbackArgs  {
-	errorCode : number;
-	socket : Ti.Network.Socket.TCP;
-}
-
-declare class FailureResponse {
-	code: Number;
-	error: string;
-	success: boolean;
-}
-
-declare class WriteCallbackArgs extends ErrorResponse {
-	bytesProcessed : number;
-	errorDescription : string;
-	errorState : number;
-	source : Ti.IOStream;
-}
-
-declare class CloudPushNotificationSuccessArg  {
-	deviceToken : string;
-}
-
-declare class MapLocationType  {
-	animate : boolean;
-	latitude : number;
-	latitudeDelta : number;
-	longitude : number;
-	longitudeDelta : number;
-	regionFit : boolean;
-}
-
-declare class DecodeStringDict  {
-	charset : string;
-	length : number;
-	position : number;
-	source : Ti.Buffer;
-}
-
-declare class ListViewContentInsetOption  {
-	animated : boolean;
-	duration : number;
-}
-
-declare class RouteDescription  {
-	inputs : Array<Object>;
-	outputs : Array<Object>;
-}
-
-declare class CreateStreamArgs  {
-	mode : number;
-	source : any;
-}
-
-declare enum ContactsAuthorizationResponse {
-
-}
-
-declare class CloudCheckinsResponse extends CloudResponse {
-	checkins : Array<Dictionary<Object>>;
-}
-
-declare class CreateBufferArgs  {
-	byteOrder : number;
-	length : number;
-	type : string;
-	value : any;
-}
-
-declare class CloudPushNotificationConfig  {
-	error : (...args : any[]) => any;
-	success : (...args : any[]) => any;
-}
-
-declare class CloudReviewsResponse extends CloudResponse {
-	reviews : Array<Dictionary<Object>>;
-}
-
-declare class Point  {
-	x : number;
-	y : number;
-}
-
-declare class CloudPhotosResponse extends CloudResponse {
-	photos : Array<Dictionary<Object>>;
-}
-
-declare class PushNotificationConfig  {
-	callback : (...args : any[]) => any;
-	error : (...args : any[]) => any;
-	success : (...args : any[]) => any;
-	types : Array<Number>;
-}
-
-declare class MapRouteType  {
-	color : string;
-	name : string;
-	points : Array<MapPointType>;
-	width : number;
-}
-
-declare class AcceptDict  {
-	error : (...args : any[]) => any;
-	timeout : number;
-}
-
-declare class MediaQueryInfoType  {
-	exact : boolean;
-	value : any;
-}
-
-declare class PumpCallbackArgs extends ErrorResponse {
-	buffer : Ti.Buffer;
-	bytesProcessed : number;
-	errorDescription : string;
-	errorState : number;
-	source : Ti.IOStream;
-	totalBytesProcessed : number;
-}
-
-declare class MusicLibraryOptionsType  {
-	allowMultipleSelections : boolean;
-	animated : boolean;
-	autohide : boolean;
-	cancel : (...args : any[]) => any;
-	error : (...args : any[]) => any;
-	mediaTypes : any;
-	success : (...args : any[]) => any;
-}
-
-declare class shadowDict  {
-	blurRadius : number;
-	color : string;
-	offset : Dictionary<Object>;
-}
-
-declare class launchOptions  {
-	launchOptionsLocationKey : boolean;
-	source : string;
-	url : string;
-}
-
-declare class WriteStreamCallbackArgs extends ErrorResponse {
-	bytesProcessed : number;
-	errorDescription : string;
-	errorState : number;
-	fromStream : Ti.IOStream;
-	toStream : Ti.IOStream;
-}
-
-declare class CloudChatGroupsResponse extends CloudResponse {
-	chat_groups : Array<Dictionary<Object>>;
-}
-
-declare class CloudPhotoCollectionsPhotosResponse extends CloudResponse {
-	photos : Array<Dictionary<Object>>;
-}
-
-declare class DecodeNumberDict  {
-	byteOrder : number;
-	position : number;
-	source : Ti.Buffer;
-	type : string;
-}
-
-declare class ConnectedCallbackArgs  {
-	socket : Ti.Network.Socket.TCP;
-}
-
-declare class CloudPhotoCollectionsResponse extends CloudResponse {
-	collections : Array<Dictionary<Object>>;
-}
-
-declare class CloudObjectsResponse extends CloudResponse {
-	classname : Array<Dictionary<Object>>;
-}
-
-declare class PopoverParams  {
-	animated : boolean;
-	rect : Dimension;
-	view : Ti.UI.View;
-}
-
-declare class MediaScannerResponse  {
-	path : string;
-	uri : string;
-}
-
-declare class CloudPushNotificationsQueryChannelResponse extends CloudResponse {
-	push_channels : Array<String>;
-}
-
-declare class CloudPostsResponse extends CloudResponse {
-	posts : Array<Dictionary<Object>>;
-}
-
-declare class CloudSocialIntegrationsResponse extends CloudResponse {
-	users : Array<Dictionary<Object>>;
-}
-
-declare class APSConnectionDelegate  {
-
-}
-
-declare class CameraOptionsType  {
-	allowEditing : boolean;
-	animated : boolean;
-	arrowDirection : number;
-	autohide : boolean;
-	autorotate : boolean;
-	cancel : (...args : any[]) => any;
-	error : (...args : any[]) => any;
-	inPopOver : boolean;
-	mediaTypes : Array<String>;
-	overlay : Ti.UI.View;
-	popoverView : Ti.UI.View;
-	saveToPhotoGallery : boolean;
-	showControls : boolean;
-	success : (...args : any[]) => any;
-	transform : Ti.UI._2DMatrix;
-	videoMaximumDuration : number;
-	videoQuality : number;
-}
-
-declare class ListViewIndexEntry  {
-	index : number;
-	title : string;
-}
-
-declare class CloudStreamProgress  {
-	progress : number;
-	url : string;
-}
-
-declare class MusicLibraryResponseType  {
-	items : Array<Ti.Media.Item>;
-	representative : Ti.Media.Item;
-	types : number;
-}
-
-declare class CloudEventOccurrencesResponse extends CloudResponse {
-	event_occurrences : Array<Dictionary<Object>>;
-}
-
-declare class CloudUsersResponse extends CloudResponse {
-	users : Array<Dictionary<Object>>;
-}
-
-declare class TableViewContentInsetOption  {
-	animated : boolean;
-	duration : number;
-}
-
-declare class CloudFriendRequestsResponse extends CloudResponse {
-	friend_requests : Array<Dictionary<Object>>;
-}
-
-declare class CloudACLsResponse extends CloudResponse {
-	acls : Array<Dictionary<Object>>;
-}
-
-declare class ListViewMarkerProps  {
-	itemIndex : number;
-	sectionIndex : number;
-}
-
-declare class EventsAuthorizationResponse  {
-	code : number;
-	error : string;
-	success : boolean;
+/**
+ * Argument passed to the callback when a request finishes successfully or erroneously.
+ */
+interface CloudACLsResponse {
+	/**
+	 * Indicates whether the request succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Indicates whether the request failed.
+	 */
+	error?: boolean;
+
+	/**
+	 * Meta data, if any returned.
+	 */
+	meta?: any;
+
+	/**
+	 * Error code, if any returned.
+	 */
+	code?: number;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	message?: string;
+
+	/**
+	 * Set of ACL objects, if any exist.
+	 */
+	acls?: any[];
+
+}
+
+/**
+ * Argument passed to the callback when a request finishes successfully or erroneously.
+ */
+interface CloudACLsCheckResponse {
+	/**
+	 * Indicates whether the request succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Indicates whether the request failed.
+	 */
+	error?: boolean;
+
+	/**
+	 * Meta data, if any returned.
+	 */
+	meta?: any;
+
+	/**
+	 * Error code, if any returned.
+	 */
+	code?: number;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	message?: string;
+
+	/**
+	 * Dictionary of permissions.
+	 */
+	permission?: any;
+
+}
+
+/**
+ * Argument passed to the callback when a request finishes successfully or erroneously.
+ */
+interface CloudChatsResponse {
+	/**
+	 * Indicates whether the request succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Indicates whether the request failed.
+	 */
+	error?: boolean;
+
+	/**
+	 * Meta data, if any returned.
+	 */
+	meta?: any;
+
+	/**
+	 * Error code, if any returned.
+	 */
+	code?: number;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	message?: string;
+
+	/**
+	 * Set of `chats` objects, if any exist.
+	 */
+	chats?: any[];
+
+}
+
+/**
+ * Argument passed to the callback when a request finishes successfully or erroneously.
+ */
+interface CloudChatGroupsResponse {
+	/**
+	 * Indicates whether the request succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Indicates whether the request failed.
+	 */
+	error?: boolean;
+
+	/**
+	 * Meta data, if any returned.
+	 */
+	meta?: any;
+
+	/**
+	 * Error code, if any returned.
+	 */
+	code?: number;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	message?: string;
+
+	/**
+	 * Set of `chat_groups` objects, if any exist.
+	 */
+	chat_groups?: any[];
+
+}
+
+/**
+ * Argument passed to the callback when a request finishes successfully or erroneously.
+ */
+interface CloudCheckinsResponse {
+	/**
+	 * Indicates whether the request succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Indicates whether the request failed.
+	 */
+	error?: boolean;
+
+	/**
+	 * Meta data, if any returned.
+	 */
+	meta?: any;
+
+	/**
+	 * Error code, if any returned.
+	 */
+	code?: number;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	message?: string;
+
+	/**
+	 * Set of `checkins` objects, if any exist.
+	 */
+	checkins?: any[];
+
+}
+
+/**
+ * Argument passed to the callback when a request finishes successfully or erroneously.
+ */
+interface CloudClientsResponse {
+	/**
+	 * Indicates whether the request succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Indicates whether the request failed.
+	 */
+	error?: boolean;
+
+	/**
+	 * Meta data, if any returned.
+	 */
+	meta?: any;
+
+	/**
+	 * Error code, if any returned.
+	 */
+	code?: number;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	message?: string;
+
+	/**
+	 * IP address of client.
+	 */
+	ip_address?: string;
+
+	/**
+	 * Location of client.
+	 */
+	location?: any;
+
+}
+
+/**
+ * Argument passed to the callback as a request is transmitted or received.
+ */
+interface CloudStreamProgress {
+	/**
+	 * A value from 0.0-1.0 with the progress of the exchange.
+	 */
+	progress?: number;
+
+	/**
+	 * The URL for the request, to help identify it.
+	 */
+	url?: string;
+
+}
+
+/**
+ * Argument passed to the callback when a request finishes successfully or erroneously.
+ */
+interface CloudResponse {
+	/**
+	 * Indicates whether the request succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Indicates whether the request failed.
+	 */
+	error?: boolean;
+
+	/**
+	 * Meta data, if any returned.
+	 */
+	meta?: any;
+
+	/**
+	 * Error code, if any returned.
+	 */
+	code?: number;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	message?: string;
+
+}
+
+/**
+ * Argument passed to the callback when a request finishes successfully or erroneously.
+ */
+interface CloudEmailsResponse {
+	/**
+	 * Indicates whether the request succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Indicates whether the request failed.
+	 */
+	error?: boolean;
+
+	/**
+	 * Meta data, if any returned.
+	 */
+	meta?: any;
+
+	/**
+	 * Error code, if any returned.
+	 */
+	code?: number;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	message?: string;
+
+}
+
+/**
+ * Argument passed to the callback when a request finishes successfully or erroneously.
+ */
+interface CloudEventsResponse {
+	/**
+	 * Indicates whether the request succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Indicates whether the request failed.
+	 */
+	error?: boolean;
+
+	/**
+	 * Meta data, if any returned.
+	 */
+	meta?: any;
+
+	/**
+	 * Error code, if any returned.
+	 */
+	code?: number;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	message?: string;
+
+	/**
+	 * Set of `event` objects, if any exist.
+	 */
+	events?: any[];
+
+}
+
+/**
+ * Argument passed to the callback when a request finishes successfully or erroneously.
+ */
+interface CloudEventOccurrencesResponse {
+	/**
+	 * Indicates whether the request succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Indicates whether the request failed.
+	 */
+	error?: boolean;
+
+	/**
+	 * Meta data, if any returned.
+	 */
+	meta?: any;
+
+	/**
+	 * Error code, if any returned.
+	 */
+	code?: number;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	message?: string;
+
+	/**
+	 * Set of `event` objects, if any exist.
+	 */
+	event_occurrences?: any[];
+
+}
+
+/**
+ * Argument passed to the callback when a request finishes successfully or erroneously.
+ */
+interface CloudFilesResponse {
+	/**
+	 * Indicates whether the request succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Indicates whether the request failed.
+	 */
+	error?: boolean;
+
+	/**
+	 * Meta data, if any returned.
+	 */
+	meta?: any;
+
+	/**
+	 * Error code, if any returned.
+	 */
+	code?: number;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	message?: string;
+
+	/**
+	 * Set of `file` objects, if any exist.
+	 */
+	files?: any[];
+
+}
+
+/**
+ * Argument passed to the callback when a request finishes successfully or erroneously.
+ */
+interface CloudFriendsResponse {
+	/**
+	 * Indicates whether the request succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Indicates whether the request failed.
+	 */
+	error?: boolean;
+
+	/**
+	 * Meta data, if any returned.
+	 */
+	meta?: any;
+
+	/**
+	 * Error code, if any returned.
+	 */
+	code?: number;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	message?: string;
+
+	/**
+	 * Set of `user` objects, if any exist.
+	 */
+	users?: any[];
+
+}
+
+/**
+ * Argument passed to the callback when a request finishes successfully or erroneously.
+ */
+interface CloudFriendRequestsResponse {
+	/**
+	 * Indicates whether the request succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Indicates whether the request failed.
+	 */
+	error?: boolean;
+
+	/**
+	 * Meta data, if any returned.
+	 */
+	meta?: any;
+
+	/**
+	 * Error code, if any returned.
+	 */
+	code?: number;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	message?: string;
+
+	/**
+	 * Set of `user` objects, if any exist.
+	 */
+	friend_requests?: any[];
+
+}
+
+/**
+ * Argument passed to the callback when a request finishes successfully or erroneously.
+ */
+interface CloudGeoFenceResponse {
+	/**
+	 * Indicates whether the request succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Indicates whether the request failed.
+	 */
+	error?: boolean;
+
+	/**
+	 * Meta data, if any returned.
+	 */
+	meta?: any;
+
+	/**
+	 * Error code, if any returned.
+	 */
+	code?: number;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	message?: string;
+
+	/**
+	 * Set of geo-fence objects, if any exist.
+	 */
+	geo_fences?: any[];
+
+}
+
+/**
+ * Argument passed to the callback when a request finishes successfully or erroneously.
+ */
+interface CloudKeyValuesResponse {
+	/**
+	 * Indicates whether the request succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Indicates whether the request failed.
+	 */
+	error?: boolean;
+
+	/**
+	 * Meta data, if any returned.
+	 */
+	meta?: any;
+
+	/**
+	 * Error code, if any returned.
+	 */
+	code?: number;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	message?: string;
+
+	/**
+	 * Set of `keyvalues` objects, if any exist.
+	 */
+	keyvalues?: any[];
+
+}
+
+/**
+ * Argument passed to the callback when a request finishes successfully or erroneously.
+ */
+interface CloudLikesResponse {
+	/**
+	 * Indicates whether the request succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Indicates whether the request failed.
+	 */
+	error?: boolean;
+
+	/**
+	 * Meta data, if any returned.
+	 */
+	meta?: any;
+
+	/**
+	 * Error code, if any returned.
+	 */
+	code?: number;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	message?: string;
+
+	/**
+	 * Set of `like` objects, if any exist.
+	 */
+	likes?: any[];
+
+}
+
+/**
+ * Argument passed to the callback when a request finishes successfully or erroneously.
+ */
+interface CloudMessagesResponse {
+	/**
+	 * Indicates whether the request succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Indicates whether the request failed.
+	 */
+	error?: boolean;
+
+	/**
+	 * Meta data, if any returned.
+	 */
+	meta?: any;
+
+	/**
+	 * Error code, if any returned.
+	 */
+	code?: number;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	message?: string;
+
+	/**
+	 * Set of `message` objects, if any exist.
+	 */
+	messages?: any[];
+
+}
+
+/**
+ * Argument passed to the callback when a request finishes successfully or erroneously.
+ */
+interface CloudObjectsResponse {
+	/**
+	 * Indicates whether the request succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Indicates whether the request failed.
+	 */
+	error?: boolean;
+
+	/**
+	 * Meta data, if any returned.
+	 */
+	meta?: any;
+
+	/**
+	 * Error code, if any returned.
+	 */
+	code?: number;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	message?: string;
+
+	/**
+	 * Set of `classname` objects, if any exist.
+	 */
+	classname?: any[];
+
+}
+
+/**
+ * Argument passed to the callback when a request finishes successfully or erroneously.
+ */
+interface CloudPhotoCollectionsResponse {
+	/**
+	 * Indicates whether the request succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Indicates whether the request failed.
+	 */
+	error?: boolean;
+
+	/**
+	 * Meta data, if any returned.
+	 */
+	meta?: any;
+
+	/**
+	 * Error code, if any returned.
+	 */
+	code?: number;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	message?: string;
+
+	/**
+	 * Set of `collections` objects, if any exist.
+	 */
+	collections?: any[];
+
+}
+
+/**
+ * Argument passed to the callback when a request finishes successfully or erroneously.
+ */
+interface CloudPhotoCollectionsPhotosResponse {
+	/**
+	 * Indicates whether the request succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Indicates whether the request failed.
+	 */
+	error?: boolean;
+
+	/**
+	 * Meta data, if any returned.
+	 */
+	meta?: any;
+
+	/**
+	 * Error code, if any returned.
+	 */
+	code?: number;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	message?: string;
+
+	/**
+	 * Set of `photos` objects, if any exist.
+	 */
+	photos?: any[];
+
+}
+
+/**
+ * Argument passed to the callback when a request finishes successfully or erroneously.
+ */
+interface CloudPhotosResponse {
+	/**
+	 * Indicates whether the request succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Indicates whether the request failed.
+	 */
+	error?: boolean;
+
+	/**
+	 * Meta data, if any returned.
+	 */
+	meta?: any;
+
+	/**
+	 * Error code, if any returned.
+	 */
+	code?: number;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	message?: string;
+
+	/**
+	 * Set of `photos` objects, if any exist.
+	 */
+	photos?: any[];
+
+}
+
+/**
+ * Argument passed to the callback when a request finishes successfully or erroneously.
+ */
+interface CloudPlacesResponse {
+	/**
+	 * Indicates whether the request succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Indicates whether the request failed.
+	 */
+	error?: boolean;
+
+	/**
+	 * Meta data, if any returned.
+	 */
+	meta?: any;
+
+	/**
+	 * Error code, if any returned.
+	 */
+	code?: number;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	message?: string;
+
+	/**
+	 * Set of `places` objects, if any exist.
+	 */
+	places?: any[];
+
+}
+
+/**
+ * Argument passed to the callback when a request finishes successfully or erroneously.
+ */
+interface CloudPostsResponse {
+	/**
+	 * Indicates whether the request succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Indicates whether the request failed.
+	 */
+	error?: boolean;
+
+	/**
+	 * Meta data, if any returned.
+	 */
+	meta?: any;
+
+	/**
+	 * Error code, if any returned.
+	 */
+	code?: number;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	message?: string;
+
+	/**
+	 * Set of `posts` objects, if any exist.
+	 */
+	posts?: any[];
+
+}
+
+/**
+ * Argument passed to the callback when a request finishes successfully or erroneously.
+ */
+interface CloudPushNotificationsResponse {
+	/**
+	 * Indicates whether the request succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Indicates whether the request failed.
+	 */
+	error?: boolean;
+
+	/**
+	 * Meta data, if any returned.
+	 */
+	meta?: any;
+
+	/**
+	 * Error code, if any returned.
+	 */
+	code?: number;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	message?: string;
+
+}
+
+/**
+ * Argument passed to the callback when a request finishes successfully.
+ */
+interface CloudPushNotificationsQueryChannelResponse {
+	/**
+	 * Indicates whether the request succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Indicates whether the request failed.
+	 */
+	error?: boolean;
+
+	/**
+	 * Meta data, if any returned.
+	 */
+	meta?: any;
+
+	/**
+	 * Error code, if any returned.
+	 */
+	code?: number;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	message?: string;
+
+	/**
+	 * Array of `push_channel` names, if any exist.
+	 */
+	push_channels?: string[];
+
+}
+
+/**
+ * Argument passed to the callback when a request finishes successfully.
+ */
+interface CloudPushNotificationsShowChannelResponse {
+	/**
+	 * Indicates whether the request succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Indicates whether the request failed.
+	 */
+	error?: boolean;
+
+	/**
+	 * Meta data, if any returned.
+	 */
+	meta?: any;
+
+	/**
+	 * Error code, if any returned.
+	 */
+	code?: number;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	message?: string;
+
+	/**
+	 * Dictionary containing counts of devices subscribed to a push channel, grouped by platform.
+	 */
+	devices?: any;
+
+}
+
+/**
+ * Argument passed to the callback when a request finishes successfully or erroneously.
+ */
+interface CloudPushNotificationsQueryResponse {
+	/**
+	 * Indicates whether the request succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Indicates whether the request failed.
+	 */
+	error?: boolean;
+
+	/**
+	 * Meta data, if any returned.
+	 */
+	meta?: any;
+
+	/**
+	 * Error code, if any returned.
+	 */
+	code?: number;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	message?: string;
+
+	/**
+	 * Set of `subscription` objects, if any exist.
+	 */
+	subscriptions?: any[];
+
+}
+
+/**
+ * Argument passed to the callback when a request finishes successfully.
+ */
+interface CloudPushSchedulesResponse {
+	/**
+	 * Indicates whether the request succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Indicates whether the request failed.
+	 */
+	error?: boolean;
+
+	/**
+	 * Meta data, if any returned.
+	 */
+	meta?: any;
+
+	/**
+	 * Error code, if any returned.
+	 */
+	code?: number;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	message?: string;
+
+	/**
+	 * Array of [schedules push notifications](http://docs.appcelerator.com/arrowdb/latest/#!/api/PushSchedules), if any exist.
+	 */
+	push_schedules?: any[];
+
+}
+
+/**
+ * Argument passed to the callback when a request finishes successfully or erroneously.
+ */
+interface CloudReviewsResponse {
+	/**
+	 * Indicates whether the request succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Indicates whether the request failed.
+	 */
+	error?: boolean;
+
+	/**
+	 * Meta data, if any returned.
+	 */
+	meta?: any;
+
+	/**
+	 * Error code, if any returned.
+	 */
+	code?: number;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	message?: string;
+
+	/**
+	 * Set of `reviews` objects, if any exist.
+	 */
+	reviews?: any[];
+
+}
+
+/**
+ * Argument passed to the callback when a request finishes successfully or erroneously.
+ */
+interface CloudSocialIntegrationsResponse {
+	/**
+	 * Indicates whether the request succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Indicates whether the request failed.
+	 */
+	error?: boolean;
+
+	/**
+	 * Meta data, if any returned.
+	 */
+	meta?: any;
+
+	/**
+	 * Error code, if any returned.
+	 */
+	code?: number;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	message?: string;
+
+	/**
+	 * Set of `users` objects, if any exist.
+	 */
+	users?: any[];
+
+}
+
+/**
+ * Argument passed to the callback when a request finishes successfully or erroneously.
+ */
+interface CloudStatusesResponse {
+	/**
+	 * Indicates whether the request succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Indicates whether the request failed.
+	 */
+	error?: boolean;
+
+	/**
+	 * Meta data, if any returned.
+	 */
+	meta?: any;
+
+	/**
+	 * Error code, if any returned.
+	 */
+	code?: number;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	message?: string;
+
+	/**
+	 * Set of `statuses` objects, if any exist.
+	 */
+	statuses?: any[];
+
+}
+
+/**
+ * Properties for the modal dialog used in 3-Legged OAuth
+ */
+interface CloudUsersSecureDialog {
+	/**
+	 * Defines the title for the dialog.
+	 */
+	title?: string;
+
+}
+
+/**
+ * Argument passed to the callback when a request finishes successfully or erroneously.
+ */
+interface CloudUsersResponse {
+	/**
+	 * Indicates whether the request succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Indicates whether the request failed.
+	 */
+	error?: boolean;
+
+	/**
+	 * Meta data, if any returned.
+	 */
+	meta?: any;
+
+	/**
+	 * Error code, if any returned.
+	 */
+	code?: number;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	message?: string;
+
+	/**
+	 * Set of `user` objects, if any exist.
+	 */
+	users?: any[];
+
+}
+
+/**
+ * Argument passed to the callback when a request finishes successfully or erroneously.
+ */
+interface CloudUsersSecureResponse {
+	/**
+	 * Indicates whether the request succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Indicates whether the request failed.
+	 */
+	error?: boolean;
+
+	/**
+	 * Meta data, if any returned.
+	 */
+	meta?: any;
+
+	/**
+	 * Error code, if any returned.
+	 */
+	code?: number;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	message?: string;
+
+	/**
+	 * Identifies the current access token when using 3-Legged OAuth.
+	 */
+	accessToken?: string;
+
+	/**
+	 * Indicates the number of seconds before the access token expires.
+	 */
+	expiresIn?: number;
+
+}
+
+/**
+ * Simple object for specifying token retrieval options to [retrieveDeviceToken](Modules.CloudPush.retrieveDeviceToken).
+ */
+interface CloudPushNotificationConfig {
+	/**
+	 * Callback function called when the push registration is successfully completed.
+	 */
+	success?: (param0: CloudPushNotificationSuccessArg) => any;
+
+	/**
+	 * Callback function called when an error occurs during registration.
+	 */
+	error?: (param0: CloudPushNotificationErrorArg) => any;
+
+}
+
+/**
+ * A simple object passed to the [retrieveDeviceToken](Modules.CloudPush.retrieveDeviceToken) success callback.
+ */
+interface CloudPushNotificationSuccessArg {
+	/**
+	 * The device token which this device was registered for.
+	 */
+	deviceToken?: string;
+
+}
+
+/**
+ * A simple object passed to the [retrieveDeviceToken](Modules.CloudPush.retrieveDeviceToken) error callback.
+ */
+interface CloudPushNotificationErrorArg {
+	/**
+	 * Description of the error.
+	 */
+	error?: string;
+
+}
+
+/**
+ * Optional Titanium modules.
+ */
+interface Modules {
+}
+
+/**
+ * Simple object passed to the
+ * [startActivityForResult](Titanium.Android.Activity.startActivityForResult) callback.
+ */
+interface ActivityResult {
+	/**
+	 * Unique, automatically generated integer request code.
+	 */
+	requestCode?: number;
+
+	/**
+	 * Integer result code that the started activity passed to
+	 * [setResult](Titanium.Android.Activity.setResult).
+	 */
+	resultCode?: number;
+
+	/**
+	 * Intent that can contain data returned to the caller. Data can be attached to
+	 * the intent as "extras").
+	 */
+	intent?: Titanium.Android.Intent;
+
+}
+
+/**
+ * Options passed to <Titanium.Android.createServiceIntent>.
+ */
+interface ServiceIntentOptions {
+	/**
+	 * URL for the service's JavaScript.
+	 */
+	url?: string;
+
+	/**
+	 * One of the `START_` constants from <Titanium.Android> to specify the "stickiness" of the Service when Android shuts down the host application.
+	 */
+	startMode?: number;
+
 }
 
-declare class PlayerQueue  {
-	items : Array<Ti.Media.Item>;
+/**
+ * Argument passed to the callback when a request finishes successfully or erroneously.
+ */
+interface RequestPermissionAccessResult {
+	/**
+	 * Indicates if the operation succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	error?: string;
+
+	/**
+	 * Error code. Returns 0 if `success` is `true`.
+	 */
+	code?: number;
+
+}
+
+/**
+ * Argument passed to the callback when a request finishes successfully or erroneously.
+ */
+interface CalendarPermissionResponse {
+	/**
+	 * Indicates whether the request succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	error?: string;
+
+	/**
+	 * Error code, if any returned.
+	 */
+	code?: number;
+
+}
+
+/**
+ * Parameter for wakeLock
+ */
+interface wakeLockOptions {
+	/**
+	 * Minimum time the device will be switched on (plus device switch-off time)
+	 */
+	time?: number;
+
+	/**
+	 * Wake lock level and flag. See [PowerManager.newWakeLock in the Android API Reference](https://developer.android.com/reference/android/os/PowerManager.html#newWakeLock(int,%20java.lang.String))
+	 */
+	flags?: number;
+
+}
+
+/**
+ * Dictionary of options for the <Titanium.UI.OptionDialog.show> method.
+ */
+interface showParams {
+	/**
+	 * String to be used as title for the dialog.
+	 */
+	title?: string;
+
+	/**
+	 * String to be used as a message for the dialog.
+	 */
+	message?: string;
+
+	/**
+	 * Array of String instances.
+	 */
+	buttonNames?: string[];
+
+	/**
+	 * Array of String instances.
+	 */
+	options?: string[];
+
+	/**
+	 * Determines whether to animate the dialog as it is shown.
+	 */
+	animated?: boolean;
+
+	/**
+	 * View to which to attach the dialog.
+	 */
+	view?: Titanium.UI.View;
+
+	/**
+	 * Positions the arrow of the option dialog relative to the attached view's dimensions.
+	 */
+	rect?: Dimension;
+
+}
+
+/**
+ * Dictionary describing the arguments passed to the application on startup.
+ * Use the [getArguments](Titanium.App.getArguments) method to retrieve the launch options.
+ */
+interface launchOptions {
+	/**
+	 * This key indicates that the application was launched in order to open
+	 * the specified URL.
+	 */
+	url?: string;
+
+	/**
+	 * This key indicates that the application was launched by another
+	 * application with the specified bundle ID.
+	 */
+	source?: string;
+
+	/**
+	 * If set to `true`, this key indicates that the application was launched in response to an
+	 * incoming location event.
+	 */
+	launchOptionsLocationKey?: boolean;
+
+}
+
+/**
+ * Dictionary object of parameters used to create a notification using
+ * <Titanium.App.iOS.scheduleLocalNotification>.
+ */
+interface NotificationParams {
+	/**
+	 * Alert button text ('Open', by default) or slider text ('slide to unlock...', by default)
+	 * to display.
+	 */
+	alertAction?: string;
+
+	/**
+	 * Alert message to display.
+	 */
+	alertBody?: string;
+
+	/**
+	 * Alert title to display. Available since Titanium SDK 5.4.0.
+	 */
+	alertTitle?: string;
+
+	/**
+	 * Image to display instead of `Default.png` when launching the application.
+	 */
+	alertLaunchImage?: string;
+
+	/**
+	 * Application badge value.
+	 */
+	badge?: number;
+
+	/**
+	 * String identifier of category of actions to be displayed for an interactive
+	 * notification (only for iOS 8 and above).
+	 */
+	category?: string;
+
+	/**
+	 * Date and time for the notification to occur.
+	 */
+	date?: Date;
+
+	/**
+	 * Interval to repeat the notification. One of `weekly`, `daily`, `yearly,` `monthly`.
+	 */
+	repeat?: string;
+
+	/**
+	 * Path to the sound file to play when notification occurs, relative to the `Resources` folder.
+	 */
+	sound?: string;
+
+	/**
+	 * Timezone of the date configured for the notification. If not set, the system timezone is used.
+	 */
+	timezone?: string;
+
+	/**
+	 * Data to pass to the application with the notification event.
+	 */
+	userInfo?: any;
+
+	/**
+	 * Region the notification will be triggered in. Allowed parameter are:
+	 * - `latitude`: Latitude of the location center, in decimal degrees (required).
+	 * - `longitude`: Longitude of the location center, in decimal degrees (required).
+	 * - `triggersOnce`: Whether or not the notification will only fire once (optional, default: true).
+	 * - `identifier`: Identifier of the region (optional).
+	 */
+	region?: any;
+
+}
+
+/**
+ * Dictionary object of parameters used to identify an incoming URL that is handled
+ * by the application.
+ */
+interface LaunchOptionsType {
+	/**
+	 * The application or service that triggered the handled URL.
+	 */
+	source?: string;
+
+	/**
+	 * The url that was triggered by the application or service.
+	 */
+	url?: string;
+
+}
+
+/**
+ * Dictionary object of parameters used to register the application with local notifications using
+ * the <Titanium.App.iOS.registerUserNotificationSettings> method.
+ * To retrieve the current notification settings, use the
+ * <Titanium.App.iOS.currentUserNotificationSettings> property.
+ */
+interface UserNotificationSettings {
+	/**
+	 * Notification types to use.
+	 */
+	types?: number[];
+
+	/**
+	 * Set of categories of user notification actions required by the applicaiton to use.
+	 */
+	categories?: Titanium.App.iOS.UserNotificationCategory[];
+
+}
+
+/**
+ * Simple object used to specify options for [imageAsCropped](Titanium.Blob.imageAsCropped).
+ */
+interface ImageAsCroppedDict {
+	/**
+	 * Width to crop this image to.
+	 */
+	width?: number;
+
+	/**
+	 * Height to crop this image to.
+	 */
+	height?: number;
+
+	/**
+	 * Left coordinate of the cropped rectangle within the source image.
+	 */
+	x?: number;
+
+	/**
+	 * Top coordinate of the cropped rectangle within the source image.
+	 */
+	y?: number;
+
+}
+
+/**
+ * Argument passed to the callback when a request finishes successfully or erroneously.
+ */
+interface EventsAuthorizationResponse {
+	/**
+	 * Indicates whether the request succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	error?: string;
+
+	/**
+	 * Error code, if any returned.
+	 */
+	code?: number;
+
+}
+
+/**
+ * Dictionary containing `daysOfWeek` and `week`.
+ */
+interface daysOfTheWeekDictionary {
+	/**
+	 * The day of the week. Values are from 1 to 7, with Sunday being 1.
+	 */
+	daysOfWeek?: number;
+
+	/**
+	 * The week number of the day of the week.
+	 * Values range from -53 to 53. A negative value indicates a value from the end of
+	 * the range. 0 indicates the week number is irrelevant.
+	 */
+	week?: number;
+
+}
+
+/**
+ * Dictionary containing either `endDate` or `occurrenceCount` property.
+ */
+interface recurrenceEndDictionary {
+	/**
+	 * End date of the recurrence end, or undefined if the recurrence end is count-based.
+	 */
+	endDate?: Date;
+
+	/**
+	 * Occurrence count of the recurrence end, or 0 if the recurrence end is date-based.
+	 */
+	occurrenceCount?: number;
+
+}
+
+/**
+ * Named parameters for <Titanium.Codec.encodeNumber>.
+ */
+interface EncodeNumberDict {
+	/**
+	 * Number to encode.
+	 */
+	source: number;
+
+	/**
+	 * Destination buffer.
+	 */
+	dest: Titanium.Buffer;
+
+	/**
+	 * Encoding type to use.
+	 */
+	type: string;
+
+	/**
+	 * Index in the `dest` buffer of the first byte of encoded data.
+	 */
+	position?: number;
+
+	/**
+	 * Byte order to encode with.
+	 */
+	byteOrder?: number;
+
+}
+
+/**
+ * Named parameters for <Titanium.Codec.decodeNumber>.
+ */
+interface DecodeNumberDict {
+	/**
+	 * Buffer to decode.
+	 */
+	source: Titanium.Buffer;
+
+	/**
+	 * The encoding type to use.
+	 */
+	type: string;
+
+	/**
+	 * Index in the `source` buffer of the first byte of data to decode.
+	 */
+	position?: number;
+
+	/**
+	 * byte order to decode with.
+	 */
+	byteOrder?: number;
+
+}
+
+/**
+ * Named parameters for <Titanium.Codec.encodeString>.
+ */
+interface EncodeStringDict {
+	/**
+	 * Source string to encode.
+	 */
+	source: string;
+
+	/**
+	 * Destination buffer.
+	 */
+	dest: Titanium.Buffer;
+
+	/**
+	 * Index in the `dest` buffer of the first byte of the encoded string.
+	 */
+	destPosition?: number;
+
+	/**
+	 * Position in `source` to start encoding.
+	 */
+	sourcePosition?: number;
+
+	/**
+	 * Number of characters in `source` to encode.
+	 */
+	sourceLength?: number;
+
+	/**
+	 * Character encoding to use when encoding this string to bytes.
+	 */
+	charset?: string;
+
+}
+
+/**
+ * Named parameters for <Titanium.Codec.decodeString>.
+ */
+interface DecodeStringDict {
+	/**
+	 * Buffer to decode.
+	 */
+	source: Titanium.Buffer;
+
+	/**
+	 * Index in the `source` buffer of the first byte of data to decode.
+	 */
+	position?: number;
+
+	/**
+	 * Number of bytes to decode.
+	 */
+	length?: number;
+
+	/**
+	 * Character set to use when encoding this string to bytes.
+	 */
+	charset?: string;
+
+}
+
+/**
+ * Dictionary of options for the <Titanium.Contacts.showContacts> method.
+ */
+interface showContactsParams {
+	/**
+	 * Determines whether to animate the show/hide of the contacts picker (iPhone, iPad only.)
+	 */
+	animated?: boolean;
+
+	/**
+	 * Field names to show when selecting properties. By default, shows all available.
+	 */
+	fields?: string[];
+
+	/**
+	 * Function to call when selection is canceled.
+	 */
+	cancel?: (param0: any) => any;
+
+	/**
+	 * Function to call when a person is selected. Must not be used with `selectedProperty` property.
+	 */
+	selectedPerson?: (param0: any) => any;
+
+	/**
+	 * Function to call when a property is selected. Must not be used with `selectedPerson`
+	 * property.
+	 * Note: If ringtone or texttone is selected, null values are returned, since these are unsupported
+	 * by Apple.
+	 * Since iOS 9.0, there is a native apple issue whereby it may return null if the birthday property
+	 * is selected on certain device models.
+	 * The callback contains the selected property and a 'person' object of type <Titanium.Contacts.Person>.
+	 * Since iOS 9.0, apple only returns the person object with partial information. Currently it is known to
+	 * at least contain the selected property and fullName.
+	 */
+	selectedProperty?: (param0: any) => any;
+
+}
+
+/**
+ * Argument passed to the callback when a request finishes successfully or erroneously.
+ */
+interface ContactsAuthorizationResponse {
+	/**
+	 * Indicates if the operation succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	error?: string;
+
+	/**
+	 * Error code. Returns 0 if `success` is `true`.
+	 */
+	code?: number;
+
+}
+
+/**
+ * Properties used in any event or callback which needs to report a success or failure.
+ */
+interface ErrorResponse {
+	/**
+	 * Indicates if the operation succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	error?: string;
+
+	/**
+	 * Error code. Returns 0 if `success` is `true`.
+	 */
+	code?: number;
+
+}
+
+/**
+ * Properties used in any event or callback which needs to report a success.
+ */
+interface SuccessResponse {
+	/**
+	 * Indicates if the operation succeeded. Returns `true`.
+	 */
+	success?: boolean;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	error?: string;
+
+	/**
+	 * Error code. Returns 0.
+	 */
+	code?: number;
+
+}
+
+/**
+ * Properties used in any event or callback which needs to report a failure.
+ */
+interface FailureResponse {
+	/**
+	 * Indicates if the operation succeeded. Returns `false`.
+	 */
+	success?: boolean;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	error?: string;
+
+	/**
+	 * Error code. Returns a non-zero value.
+	 */
+	code?: number;
+
+}
+
+/**
+ * Argument passed to the callback when a request finishes successfully or erroneously.
+ */
+interface RequestStorageAccessResult {
+	/**
+	 * Indicates if the operation succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	error?: string;
+
+	/**
+	 * Error code. Returns 0 if `success` is `true`.
+	 */
+	code?: number;
+
+}
+
+/**
+ * Argument passed to the [getCurrentPosition](Titanium.Geolocation.getCurrentPosition) callback.
+ */
+interface LocationResults {
+	/**
+	 * Indicates if the operation succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	error?: string;
+
+	/**
+	 * Error code. Returns 0 if `success` is `true`.
+	 */
+	code?: number;
+
+	/**
+	 * If `success` is true, object describing the location provider generating this update.
+	 */
+	provider?: LocationProviderDict;
+
+	/**
+	 * If `success` is true, actual location data for this update.
+	 */
+	coords?: LocationCoordinates;
+
+}
+
+/**
+ * Simple object holding the data for a location update.
+ */
+interface LocationCoordinates {
+	/**
+	 * Latitude of the location update, in decimal degrees.
+	 */
+	latitude?: number;
+
+	/**
+	 * Longitude of the location update, in decimal degrees.
+	 */
+	longitude?: number;
+
+	/**
+	 * Altitude of the location update, in meters.
+	 */
+	altitude?: number;
+
+	/**
+	 * Accuracy of the location update, in meters.
+	 */
+	accuracy?: number;
+
+	/**
+	 * Vertical accuracy of the location update, in meters.
+	 */
+	altitudeAccuracy?: number;
+
+	/**
+	 * Compass heading, in degrees. May be unknown if device is not moving. On
+	 * iOS, a negative value indicates that the heading data is not valid.
+	 */
+	heading?: number;
+
+	/**
+	 * Current speed in meters/second. On iOS, a negative value indicates that the
+	 * heading data is not valid or the accuracy is configured incorrectly.
+	 * Note: Due to the Apple Geolocation API, set the <Titanium.Geolocation.accuracy>
+	 * property to <Titanium.Geolocation.ACCURACY_BEST_FOR_NAVIGATION> in order to properly
+	 * measure speed changes and prevent the app from returning negative values.
+	 */
+	speed?: number;
+
+	/**
+	 * Timestamp for this location update, in milliseconds.
+	 */
+	timestamp?: number;
+
+	/**
+	 * The floor of the building on which the user is located. Available in iOS 8.0 and later.
+	 */
+	floor?: LocationCoordinatesFloor;
+
+}
+
+/**
+ * Simple object holding floor of the building on which the user is located.
+ * In places where floor information can be determined.
+ */
+interface LocationCoordinatesFloor {
+	/**
+	 * The logical floor of the building.
+	 */
+	level?: number;
+
+}
+
+/**
+ * Simple object returned in the callback from the
+ * [forwardGeocoder](Titanium.Geolocation.forwardGeocoder) method.
+ * Note that Android includes a number of extra fields.
+ */
+interface ForwardGeocodeResponse {
+	/**
+	 * Indicates if the operation succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	error?: string;
+
+	/**
+	 * Error code. Returns 0 if `success` is `true`.
+	 */
+	code?: number;
+
+	/**
+	 * Estimated accuracy of the geocoding, in meters.
+	 */
+	accuracy?: number;
+
+	/**
+	 * Longitude of the geocoded address.
+	 */
+	longitude?: string;
+
+	/**
+	 * Latitude of the geocoded address.
+	 */
+	latitude?: string;
+
+	/**
+	 * Street name, without street address.
+	 */
+	street?: string;
+
+	/**
+	 * Street name.
+	 */
+	street1?: string;
+
+	/**
+	 * City name.
+	 */
+	city?: string;
+
+	/**
+	 * First line of region.
+	 */
+	region1?: string;
+
+	/**
+	 * Not used.
+	 */
+	region2?: string;
+
+	/**
+	 * Postal code.
+	 */
+	postalCode?: string;
+
+	/**
+	 * Country name.
+	 */
+	country?: string;
+
+	/**
+	 * Country code.
+	 */
+	countryCode?: string;
+
+	/**
+	 * Country code. Same as `countryCode`.
+	 */
+	country_code?: string;
+
+	/**
+	 * Display address. Identical to `address`.
+	 */
+	displayAddress?: string;
+
+	/**
+	 * Full address.
+	 */
+	address?: string;
+
+}
+
+/**
+ * Argument passed to the [getCurrentHeading](Titanium.Geolocation.getCurrentHeading) callback.
+ */
+interface HeadingResponse {
+	/**
+	 * Indicates a successful operation.
+	 */
+	success?: boolean;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	error?: string;
+
+	/**
+	 * Error code.
+	 */
+	code?: number;
+
+	/**
+	 * If `success` is true, the actual heading data.
+	 */
+	heading?: HeadingData;
+
+}
+
+/**
+ * Simple object holding compass heading data.
+ */
+interface HeadingData {
+	/**
+	 * Accuracy of the compass heading, in platform-specific units.
+	 */
+	accuracy?: number;
+
+	/**
+	 * Declination in degrees from magnetic North.
+	 */
+	magneticHeading?: number;
+
+	/**
+	 * Declination in degrees from true North.
+	 */
+	trueHeading?: number;
+
+	/**
+	 * Timestamp for the heading data, in milliseconds.
+	 */
+	timestamp?: number;
+
+	/**
+	 * Raw geomagnetic data for the X axis.
+	 */
+	x?: number;
+
+	/**
+	 * Raw geomagnetic data for the Y axis.
+	 */
+	y?: number;
+
+	/**
+	 * Raw geomagnetic data for the Z axis.
+	 */
+	z?: number;
+
+}
+
+/**
+ * Simple object describing a location provider.
+ */
+interface LocationProviderDict {
+	/**
+	 * Accuracy of the location provider, either fine (1) or coarse (2).
+	 */
+	accuracy?: number;
+
+	/**
+	 * Name of the location provider.
+	 */
+	name?: string;
+
+	/**
+	 * Power consumption for this provider, either low (1), medium (2), or high (3).
+	 */
+	power?: number;
+
+}
+
+/**
+ * Simple object returned in the callback from the
+ * [reverseGeocoder](Titanium.Geolocation.reverseGeocoder) method.
+ */
+interface ReverseGeocodeResponse {
+	/**
+	 * Indicates if the operation succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	error?: string;
+
+	/**
+	 * Error code. Returns 0 if `success` is `true`.
+	 */
+	code?: number;
+
+	/**
+	 * An array of reverse-geocoded addresses matching the requested location.
+	 */
+	places?: GeocodedAddress[];
+
+}
+
+/**
+ * Simple object representing a place, returned in the callback from the
+ * [reverseGeocoder](Titanium.Geolocation.reverseGeocoder) method.
+ */
+interface GeocodedAddress {
+	/**
+	 * Street name, without street address.
+	 */
+	street?: string;
+
+	/**
+	 * Street name.
+	 */
+	street1?: string;
+
+	/**
+	 * City name.
+	 */
+	city?: string;
+
+	/**
+	 * First line of region.
+	 */
+	region1?: string;
+
+	/**
+	 * Not used.
+	 */
+	region2?: string;
+
+	/**
+	 * Postal code. On iOS, use `zipcode`.
+	 */
+	postalCode?: string;
+
+	/**
+	 * Postal code. On Android, use `postalCode`.
+	 */
+	zipcode?: string;
+
+	/**
+	 * Country name.
+	 */
+	country?: string;
+
+	/**
+	 * Country code. On iOS, use `country_code`.
+	 */
+	countryCode?: string;
+
+	/**
+	 * Country code. Same as `country_code`.
+	 */
+	country_code?: string;
+
+	/**
+	 * Longitude of the geocoded point.
+	 */
+	longitude?: string;
+
+	/**
+	 * Latitude of the geocoded point.
+	 */
+	latitude?: string;
+
+	/**
+	 * Display address. Identical to `address`.
+	 */
+	displayAddress?: string;
+
+	/**
+	 * Full address.
+	 */
+	address?: string;
+
+}
+
+/**
+ * Argument passed to the callback when a request finishes successfully or erroneously.
+ */
+interface LocationAuthorizationResponse {
+	/**
+	 * Indicates if the operation succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	error?: string;
+
+	/**
+	 * Error code. Returns 0 if `success` is `true`.
+	 */
+	code?: number;
+
+}
+
+/**
+ * Simple object representing a map location and zoom level.
+ */
+interface MapRegionType {
+	/**
+	 * Longitude value for the center point of the map, in decimal degrees.
+	 */
+	longitude?: number;
+
+	/**
+	 * Latitude value for the center point of the map, in decimal degrees.
+	 */
+	latitude?: number;
+
+	/**
+	 * The amount of east-to-west distance displayed on the map, measured in decimal degrees.
+	 */
+	longitudeDelta?: number;
+
+	/**
+	 * The amount of north-to-south distance displayed on the map, measured in decimal degrees.
+	 */
+	latitudeDelta?: number;
+
+}
+
+/**
+ * Simple object used as an argument to [setLocation](Titanium.Map.View.setLocation).
+ */
+interface MapLocationType {
+	/**
+	 * Longitude value for the center point of the map, in decimal degrees.
+	 */
+	longitude?: number;
+
+	/**
+	 * Latitude value for the center point of the map, in decimal degrees.
+	 */
+	latitude?: number;
+
+	/**
+	 * The amount of east-to-west distance displayed on the map, measured in decimal degrees.
+	 */
+	longitudeDelta?: number;
+
+	/**
+	 * The amount of north-to-south distance displayed on the map, measured in decimal degrees.
+	 */
+	latitudeDelta?: number;
+
+	/**
+	 * Set to `true` to animate the move to the new location.
+	 */
+	animate?: boolean;
+
+	/**
+	 * If `true`, the specified region is modified to fit the aspect ratio of the
+	 * map view, while remaining centered on `latitude`,`longitude`.
+	 */
+	regionFit?: boolean;
+
+}
+
+/**
+ * Simple object defining a map route.
+ */
+interface MapRouteType {
+	/**
+	 * Route name.
+	 */
+	name: string;
+
+	/**
+	 * Array of map points making up the route.
+	 */
+	points: MapPointType[];
+
+	/**
+	 * Color to use when drawing the route, as a color name or hex triplet.
+	 */
+	color?: string;
+
+	/**
+	 * Line width to use when drawing the route.
+	 */
+	width?: number;
+
+}
+
+/**
+ * Simple object representing a point on the map.
+ */
+interface MapPointType {
+	/**
+	 * Longitude value of the map point, in decimal degrees.
+	 */
+	longitude?: number;
+
+	/**
+	 * Latitude value of the map point, in decimal degrees.
+	 */
+	latitude?: number;
+
+}
+
+/**
+ * Simple object passed to the [scanMediaFiles](Titanium.Media.Android.scanMediaFiles) callback.
+ */
+interface MediaScannerResponse {
+	/**
+	 * Path to the media file that was scanned.
+	 */
+	path?: string;
+
+	/**
+	 * URI to the file if it was scanned and added to the media library, or `null`
+	 * if the file was not added.
+	 */
+	uri?: string;
+
+}
+
+/**
+ * Simple object for specifying options to [openMusicLibrary](Titanium.Media.openMusicLibrary).
+ */
+interface MusicLibraryOptionsType {
+	/**
+	 * Function to call when the music library selection is made.
+	 */
+	success?: (param0: MusicLibraryResponseType) => any;
+
+	/**
+	 * Function to call upon receiving an error.
+	 */
+	error?: (param0: FailureResponse) => any;
+
+	/**
+	 * Function to call if the user presses the cancel button.
+	 */
+	cancel?: (param0: FailureResponse) => any;
+
+	/**
+	 * Specifies that the library should be hidden automatically after media selection is completed.
+	 */
+	autohide?: boolean;
+
+	/**
+	 * Boolean if the dialog should be animated when showing and hiding.
+	 */
+	animated?: boolean;
+
+	/**
+	 * An array of media type constants defining selectable media.
+	 */
+	mediaTypes?: number | number[];
+
+	/**
+	 * Set to `true` to allow the user to select multiple items from the library.
+	 */
+	allowMultipleSelections?: boolean;
+
+}
+
+/**
+ * Simple object passed to the [openMusicLibrary](Titanium.Media.openMusicLibrary)
+ * `success` callback function.
+ */
+interface MusicLibraryResponseType {
+	/**
+	 * A single representative of the selected items.
+	 */
+	representative?: Titanium.Media.Item;
+
+	/**
+	 * A list of all the items chosen by the user.
+	 */
+	items?: Titanium.Media.Item[];
+
+	/**
+	 * Media types in this collection, represented as the bitwise OR of the media type
+	 * values for all media types represented in `items`.
+	 */
+	types?: number;
+
+}
+
+/**
+ * A specifier for a media library query. By default, filters perform an exact match.
+ */
+interface MediaQueryType {
+	/**
+	 * A constant that specifies the ordering of the result array.
+	 */
+	grouping?: number;
+
+	/**
+	 * The media type to filter on.
+	 */
+	mediaType?: MediaQueryInfoType | number;
+
+	/**
+	 * The title to filter on. Value should be a String.
+	 */
+	title?: MediaQueryInfoType | string;
+
+	/**
+	 * The album title to filter on. Value should be a String.
+	 */
+	albumTitle?: MediaQueryInfoType | string;
+
+	/**
+	 * The artist to filter on. Value should be a String.
+	 */
+	artist?: MediaQueryInfoType | string;
+
+	/**
+	 * The album artist to filter on. Value should be a String.
+	 */
+	albumArtist?: MediaQueryInfoType | string;
+
+	/**
+	 * The genre to filter on. Value should be a String.
+	 */
+	genre?: MediaQueryInfoType | string;
+
+	/**
+	 * The composer to filter on. Value should be a String.
+	 */
+	composer?: MediaQueryInfoType | string;
+
+	/**
+	 * Filter by whether or not the item is a compilation.
+	 * The value should be a Boolean.
+	 */
+	isCompilation?: MediaQueryInfoType | boolean;
+
+	/**
+	 * The play count to filter on. Value should be a Number.
+	 */
+	playCount?: MediaQueryInfoType | number;
+
+	/**
+	 * The persistent ID to filter on. Value should be a Number.
+	 */
+	persistentID?: MediaQueryInfoType | number;
+
+	/**
+	 * The album persistent ID to filter on. Value should be a Number.
+	 */
+	albumPersistentID?: MediaQueryInfoType | number;
+
+	/**
+	 * The album artist persistent ID to filter on. Value should be a Number.
+	 */
+	albumArtistPersistentID?: MediaQueryInfoType | number;
+
+	/**
+	 * The genre persistent ID to filter on. Value should be a Number.
+	 */
+	genrePersistentID?: MediaQueryInfoType | number;
+
+	/**
+	 * The composer persistent ID to filter on. Value should be a Number.
+	 */
+	composerPersistentID?: MediaQueryInfoType | number;
+
+	/**
+	 * Filter by whether or not the item is a cloud item.
+	 * Value should be a Boolean.
+	 */
+	isCloudItem?: MediaQueryInfoType | boolean;
+
+	/**
+	 * Filter by whether or not the item is a protected asset.
+	 * Value should be a Boolean.
+	 */
+	hasProtectedAsset?: MediaQueryInfoType | boolean;
+
+	/**
+	 * The podcast title to filter on. Value should be a String.
+	 */
+	podcastTitle?: MediaQueryInfoType | string;
+
+	/**
+	 * The podcast persistent ID to filter on. Value should be a Number.
+	 */
+	podcastPersistentID?: MediaQueryInfoType | number;
+
+}
+
+/**
+ * A full query descriptor for a filtering predicate.
+ */
+interface MediaQueryInfoType {
+	/**
+	 * The value for the given predicate. See the descriptions in <MediaQueryType> for information about which properties require which values.
+	 */
+	value?: number | string | boolean;
+
+	/**
+	 * Whether or not the predicate is for an exact match.  The default is `true`.
+	 */
+	exact?: boolean;
+
+}
+
+/**
+ * Simple object for specifying options to [showCamera](Titanium.Media.showCamera).
+ */
+interface CameraOptionsType {
+	/**
+	 * Function to call when the camera is closed after a successful capture/selection.
+	 */
+	success?: (param0: CameraMediaItemType) => any;
+
+	/**
+	 * Function to call upon receiving an error.
+	 */
+	error?: (param0: FailureResponse) => any;
+
+	/**
+	 * Function to call if the user presses the cancel button.
+	 */
+	cancel?: (param0: FailureResponse) => any;
+
+	/**
+	 * Specifies if the camera should be hidden automatically after the media capture is completed.
+	 */
+	autohide?: boolean;
+
+	/**
+	 * Specifies if the dialog should be animated upon showing and hiding.
+	 */
+	animated?: boolean;
+
+	/**
+	 * Specifies if the media should be saved to the photo gallery upon successful capture.
+	 */
+	saveToPhotoGallery?: boolean;
+
+	/**
+	 * Specifies if the media should be editable after capture/selection.
+	 */
+	allowEditing?: boolean;
+
+	/**
+	 * Array of media type constants to allow. Note: If you want to select live photos, iOS only  allows
+	 * you to select existing live photos from the gallery, capturing new live photos is not supported by
+	 * iOS public API, yet.
+	 */
+	mediaTypes?: string[];
+
+	/**
+	 * Maximum duration (in milliseconds) to allow video capture before completing.
+	 */
+	videoMaximumDuration?: number;
+
+	/**
+	 * Constant to indicate the video quality during capture.
+	 */
+	videoQuality?: number;
+
+	/**
+	 * Opens the camera with the specified camera direction.
+	 */
+	whichCamera?: number;
+
+	/**
+	 * Indicates if the built-in camera controls should be displayed.
+	 */
+	showControls?: boolean;
+
+	/**
+	 * View to added as an overlay to the camera UI (on top).
+	 */
+	overlay?: Titanium.UI.View;
+
+	/**
+	 * Transformation matrix to apply to the camera or photogallery view.
+	 */
+	transform?: Titanium.UI.Matrix2D;
+
+	/**
+	 * Show the camera in a popover.
+	 */
+	inPopOver?: boolean;
+
+	/**
+	 * View to position the camera or photo gallery popover on top of.
+	 */
+	popoverView?: Titanium.UI.View;
+
+	/**
+	 * Controls the type of arrow and position of the popover.
+	 */
+	arrowDirection?: number;
+
+	/**
+	 * Determines if the camera preview should rotate or not.
+	 */
+	autorotate?: boolean;
+
+}
+
+/**
+ * Simple object for specifying options to
+ * [openPhotoGallery](Titanium.Media.openPhotoGallery).
+ */
+interface PhotoGalleryOptionsType {
+	/**
+	 * Function to call when the photo gallery is closed after a successful selection.
+	 */
+	success?: (param0: CameraMediaItemType) => any;
+
+	/**
+	 * Function to call upon receiving an error.
+	 */
+	error?: (param0: FailureResponse) => any;
+
+	/**
+	 * Function to call if the user presses the cancel button.
+	 */
+	cancel?: (param0: FailureResponse) => any;
+
+	/**
+	 * Specifies if the photo gallery should be hidden automatically after the media
+	 * selection is completed.
+	 */
+	autohide?: boolean;
+
+	/**
+	 * Specifies if the dialog should be animated upon showing and hiding.
+	 */
+	animated?: boolean;
+
+	/**
+	 * Specifies if the media should be editable after capture/selection.
+	 */
+	allowEditing?: boolean;
+
+	/**
+	 * Array of media type constants to allow. If you want to allow live photos with
+	 * <Titanium.Media.MEDIA_TYPE_LIVEPHOTO> on iOS 9.1 and later, you also need to specify
+	 * at least <Titanium.Media.MEDIA_TYPE_PHOTO> as a fallback. If you do not allow live
+	 * photos, they still can be selected, but will be represented as a normal photo (static).
+	 */
+	mediaTypes?: string[];
+
+	/**
+	 * View to position the photo gallery popover on top of.
+	 */
+	popoverView?: Titanium.UI.View;
+
+	/**
+	 * Controls the type of arrow and position of the popover.
+	 */
+	arrowDirection?: number;
+
+	/**
+	 * Specifies if the user should be able to select multiple photos.
+	 */
+	allowMultiple?: boolean;
+
+}
+
+/**
+ * A media object from the camera or photo gallery.
+ */
+interface CameraMediaItemType {
+	/**
+	 * Indicates if the operation succeeded. Returns `true`.
+	 */
+	success?: boolean;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	error?: string;
+
+	/**
+	 * Error code. Returns 0.
+	 */
+	code?: number;
+
+	/**
+	 * The media object, as a [Blob](Titanium.Blob).
+	 */
+	media?: Titanium.Blob;
+
+	/**
+	 * The type of media, either `MEDIA_TYPE_PHOTO`, `MEDIA_TYPE_LIVEPHOTO` or `MEDIA_TYPE_VIDEO` defined in <Titanium.Media>.
+	 */
+	mediaType?: string;
+
+	/**
+	 * Simple object defining the user's selected crop rectangle, or `null` if the user has not edited the photo.
+	 */
+	cropRect?: CropRectType;
+
+	/**
+	 * Simple object defining the preview image size.
+	 */
+	previewRect?: PreviewRectType;
+
+	/**
+	 * The live photo object, as a <Titanium.UI.iOS.LivePhoto> and
+	 * `undefined` if no live photo is selected.
+	 */
+	livePhoto?: Titanium.UI.iOS.LivePhoto;
+
+}
+
+/**
+ * Simple object for describing the crop rectangle for an image.
+ */
+interface CropRectType {
+	/**
+	 * X coordinate of the crop rectangle's upper-left corner.
+	 */
+	x?: number;
+
+	/**
+	 * Y coordinate of the crop rectangle's upper-left corner.
+	 */
+	y?: number;
+
+	/**
+	 * Width of the crop rectangle, in pixels.
+	 */
+	width?: number;
+
+	/**
+	 * Height of the crop rectangle, in pixels.
+	 */
+	height?: number;
+
+}
+
+/**
+ * Simple object for describing the preview image rectangle. This will be undefined when custom camera overlay is not used.
+ */
+interface PreviewRectType {
+	/**
+	 * Width preview image, in pixels.
+	 */
+	width?: number;
+
+	/**
+	 * Height preview image, in pixels.
+	 */
+	height?: number;
+
+}
+
+/**
+ * Options passed to <Titanium.Media.previewImage>.
+ */
+interface PreviewImageOptions {
+	/**
+	 * The image to preview. Must be a blob based on a file, such as from <Titanium.Filesystem.File.read>.
+	 */
+	image?: Titanium.Blob;
+
+	/**
+	 * Function to be called back if the preview succeeds. No info is passed.
+	 */
+	success?: (param0: any) => any;
+
+	/**
+	 * Function called back if the preview fails. Check the `message` property of passed back parameter.
+	 */
+	error?: (param0: PreviewImageError) => any;
+
+}
+
+/**
+ * The parameter passed to the `error` callback of <PreviewImageOptions>.
+ */
+interface PreviewImageError {
+	/**
+	 * Indicates if the operation succeeded. Returns `false`.
+	 */
+	success?: boolean;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	error?: string;
+
+	/**
+	 * Error code, if applicable.
+	 */
+	code?: number;
+
+	/**
+	 * Description of the error.
+	 */
+	message?: string;
+
+}
+
+/**
+ * The parameter passed to the <Titanium.Media.takeScreenshot> callback.
+ */
+interface ScreenshotResult {
+	/**
+	 * The screenshot image.
+	 */
+	media?: Titanium.Blob;
+
+}
+
+/**
+ * Argument passed to the callback when a request finishes successfully or erroneously.
+ */
+interface MediaAuthorizationResponse {
+	/**
+	 * Indicates if the operation succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	error?: string;
+
+	/**
+	 * Error code. Returns 0 if `success` is `true`.
+	 */
+	code?: number;
+
+}
+
+/**
+ * Argument passed to the callback when a request finishes successfully or erroneously.
+ */
+interface RequestCameraAccessResult {
+	/**
+	 * Indicates if the operation succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	error?: string;
+
+	/**
+	 * Error code. Returns 0 if `success` is `true`.
+	 */
+	code?: number;
+
+}
+
+/**
+ * Argument passed to the callback when a request finishes successfully or erroneously.
+ */
+interface RequestMusicLibraryAccessResult {
+	/**
+	 * Indicates if the operation succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	error?: string;
+
+	/**
+	 * Error code. Returns 0 if `success` is `true`.
+	 */
+	code?: number;
+
+}
+
+/**
+ * Argument passed to the callback when a request finishes successfully or erroneously.
+ */
+interface RequestPhotoGalleryAccessResult {
+	/**
+	 * Indicates if the operation succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	error?: string;
+
+	/**
+	 * Error code. Returns 0 if `success` is `true`.
+	 */
+	code?: number;
+
+}
+
+/**
+ * An Object describing the current audio route.
+ */
+interface RouteDescription {
+	/**
+	 * An Array of current input ports for the session. See the `AUDIO_SESSION_PORT` constants.
+	 */
+	inputs?: any[];
+
+	/**
+	 * An Array of current output ports for the session. See the `AUDIO_SESSION_PORT` constants.
+	 */
+	outputs?: any[];
+
+}
+
+/**
+ * Simple object passed to the thumbnail callback in response to the
+ * [requestThumbnailImagesAtTimes](Titanium.Media.VideoPlayer.requestThumbnailImagesAtTimes)
+ * method.
+ */
+interface ThumbnailResponse {
+	/**
+	 * Indicates if the operation succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	error?: string;
+
+	/**
+	 * Error code. Returns 0 if `success` is `true`.
+	 */
+	code?: number;
+
+	/**
+	 * Thumbnail image, as a `Blob`.
+	 */
+	image?: Titanium.Blob;
+
+	/**
+	 * Time offset for the thumbnail, in seconds.
+	 */
+	time?: number;
+
+}
+
+/**
+ * Simple object used to describe the size of a movie.
+ */
+interface MovieSize {
+	/**
+	 * Width of the movie.
+	 */
+	width?: number;
+
+	/**
+	 * Height of the movie.
+	 */
+	height?: number;
+
+}
+
+/**
+ * The protocol that the <Titanium.Network.HTTPClient.securityManager> must implement.
+ */
+interface SecurityManagerProtocol {
+	/**
+	 * Returns if the security manager will participate in authentication of this end point.
+	 */
+	willHandleURL(url: any): boolean;
+
+	/**
+	 * The <APSConnectionDelegate> for this connection.
+	 */
+	connectionDelegateForUrl(url: any): APSConnectionDelegate;
+
+	/**
+	 * Returns an array of objects implementing the [X509TrustManager](http://developer.android.com/reference/javax/net/ssl/X509TrustManager.html) protocol for the SSL Context.
+	 */
+	getTrustManagers(proxy: any): any[];
+
+	/**
+	 * Returns an array of objects implementing the [X509KeyManager](http://developer.android.com/reference/javax/net/ssl/X509KeyManager.html) protocol for the SSL Context.
+	 */
+	getKeyManagers(proxy: any): any[];
+
+}
+
+/**
+ * An extension of the [NSURLConnectionDelegate](https://developer.apple.com/library/mac/documentation/Foundation/Reference/NSURLConnectionDelegate_Protocol/Reference/Reference.html#//apple_ref/occ/intf/NSURLConnectionDelegate) protocol to allow users to participate in authentication and resource management for this HTTPClient.
+ */
+interface APSConnectionDelegate {
+}
+
+/**
+ * An Object describing the current ready state. See [onreadystatechange](Titanium.Network.HTTPClient.onreadystatechange) for more information.
+ */
+interface ReadyStatePayload {
+	/**
+	 * The state for which `onreadystatechange` was invoked. Set to one of `Titanium.Network.HTTPClient` ready-state constants
+	 */
+	readyState?: number;
+
+}
+
+/**
+ * Simple object for specifying push notification options to
+ * [registerForPushNotifications](Titanium.Network.registerForPushNotifications).
+ */
+interface PushNotificationConfig {
+	/**
+	 * Array of `NOTIFICATION_TYPE` constants that the application would like to receive.
+	 */
+	types?: number[];
+
+	/**
+	 * Callback function called when the push registration is successfully completed.
+	 */
+	success?: (param0: PushNotificationSuccessArg) => any;
+
+	/**
+	 * Callback function called when an error occurs during registration.
+	 */
+	error?: (param0: PushNotificationErrorArg) => any;
+
+	/**
+	 * Callback function invoked upon receiving a new push notification.
+	 */
+	callback?: (param0: PushNotificationData) => any;
+
+}
+
+/**
+ * A simple object passed to the
+ * [registerForPushNotifications](Titanium.Network.registerForPushNotifications) success callback.
+ */
+interface PushNotificationSuccessArg {
+	/**
+	 * Indicates if the operation succeeded. Returns `true`.
+	 */
+	success?: boolean;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	error?: string;
+
+	/**
+	 * Error code. Returns 0.
+	 */
+	code?: number;
+
+	/**
+	 * The value of this string is always "remote".
+	 */
+	type?: string;
+
+	/**
+	 * The device token which this device was registered for.
+	 */
+	deviceToken?: string;
+
+}
+
+/**
+ * A simple object passed to the
+ * [registerForPushNotifications](Titanium.Network.registerForPushNotifications) error callback.
+ */
+interface PushNotificationErrorArg {
+	/**
+	 * Indicates if the operation succeeded. Returns `false`.
+	 */
+	success?: boolean;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	error?: string;
+
+	/**
+	 * Error code. Returns a non-zero value.
+	 */
+	code?: number;
+
+	/**
+	 * The value of this string is always "remote".
+	 */
+	type?: string;
+
+}
+
+/**
+ * A simple object representing a push notification.
+ */
+interface PushNotificationData {
+	/**
+	 * The `userinfo` dictionary passed to the Apple Push Notification Service.
+	 */
+	data?: any;
+
+	/**
+	 * Boolean indicating if notification was received while app was in background.
+	 * This property became available in Titanium Mobile 3.1.0 for iOS.
+	 */
+	inBackground?: boolean;
+
+}
+
+/**
+ * Argument object passed to the [connected](Titanium.Network.Socket.TCP.connected) callback when the socket connects.
+ */
+interface ConnectedCallbackArgs {
+	/**
+	 * Socket instance that has been connected.
+	 */
+	socket?: Titanium.Network.Socket.TCP;
+
+}
+
+/**
+ * Object passed to the error callback when the socket enters the [ERROR](Titanium.Network.Socket.ERROR) state.
+ */
+interface ErrorCallbackArgs {
+	/**
+	 * Indicates if the operation succeeded. Returns `false`.
+	 */
+	success?: boolean;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	error?: string;
+
+	/**
+	 * Error code. Returns a non-zero value.
+	 */
+	code?: number;
+
+	/**
+	 * Socket that experienced the error.
+	 */
+	socket?: Titanium.Network.Socket.TCP;
+
+	/**
+	 * The error code of the error (potentially system-dependent).
+	 */
+	errorCode?: number;
+
+}
+
+/**
+ * Argument object passed to the [accepted](Titanium.Network.Socket.TCP.accepted)
+ * callback when a listener accepts a connection.
+ */
+interface AcceptedCallbackArgs {
+	/**
+	 * Socket which received the connection.
+	 */
+	socket?: Titanium.Network.Socket.TCP;
+
+	/**
+	 * Socket which represents the inbound connection.
+	 */
+	inbound?: Titanium.Network.Socket.TCP;
+
+}
+
+/**
+ * Options object for the [accept](Titanium.Network.Socket.TCP.accept) method.
+ */
+interface AcceptDict {
+	/**
+	 * Timeout, in milliseconds, for all `write` operations.
+	 */
+	timeout?: number;
+
+	/**
+	 * Callback to be fired when the socket enters the [ERROR](Titanium.Network.Socket.ERROR) state.
+	 */
+	error?: (param0: ErrorCallbackArgs) => any;
+
+}
+
+/**
+ * Argument passed to [createStream](Titanium.Stream.createStream).
+ */
+interface CreateStreamArgs {
+	/**
+	 * Object that the stream will read from or write to.
+	 */
+	source?: Titanium.Blob | Titanium.Buffer;
+
+	/**
+	 * Mode to open the stream in.
+	 */
+	mode?: number;
+
+}
+
+/**
+ * Argument passed to the read callback when an asynchronous [read](Titanium.Stream.read) operation
+ * finishes.
+ */
+interface ReadCallbackArgs {
+	/**
+	 * Indicates if the operation succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	error?: string;
+
+	/**
+	 * Error code. Returns 0 if `success` is `true`.
+	 */
+	code?: number;
+
+	/**
+	 * Stream being read.
+	 */
+	source?: Titanium.IOStream;
+
+	/**
+	 * Number of bytes processed, or -1 in the event of an error or end of stream.
+	 */
+	bytesProcessed?: number;
+
+	/**
+	 * Whether an error was encountered. Set to 1 in the case of an error, 0
+	 * otherwise.
+	 */
+	errorState?: number;
+
+	/**
+	 * Text description of the error.
+	 */
+	errorDescription?: string;
+
+}
+
+/**
+ * Argument passed to the write callback when an asynchronous
+ * [write](Titanium.Stream.write) operation
+ * finishes.
+ */
+interface WriteCallbackArgs {
+	/**
+	 * Indicates if the operation succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	error?: string;
+
+	/**
+	 * Error code. Returns 0 if `success` is `true`.
+	 */
+	code?: number;
+
+	/**
+	 * Stream being written to.
+	 */
+	source?: Titanium.IOStream;
+
+	/**
+	 * Number of bytes processed, or -1 in the event of an error or end of stream.
+	 */
+	bytesProcessed?: number;
+
+	/**
+	 * Whether an error was encountered. Set to 1 in the case of an error, 0
+	 * otherwise.
+	 */
+	errorState?: number;
+
+	/**
+	 * Text description of the error.
+	 */
+	errorDescription?: string;
+
+}
+
+/**
+ * Argument passed to the callback when an asynchronous
+ * [writeStream](Titanium.Stream.writeStream) operation finishes.
+ */
+interface WriteStreamCallbackArgs {
+	/**
+	 * Indicates if the operation succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	error?: string;
+
+	/**
+	 * Error code. Returns 0 if `success` is `true`.
+	 */
+	code?: number;
+
+	/**
+	 * Stream being read from.
+	 */
+	fromStream?: Titanium.IOStream;
+
+	/**
+	 * Stream being written to.
+	 */
+	toStream?: Titanium.IOStream;
+
+	/**
+	 * Number of bytes processed, or -1 in the event of an error or end of stream.
+	 */
+	bytesProcessed?: number;
+
+	/**
+	 * Whether an error was encountered. Set to 1 in the case of an error, 0
+	 * otherwise.
+	 */
+	errorState?: number;
+
+	/**
+	 * Text description of the error.
+	 */
+	errorDescription?: string;
+
+}
+
+/**
+ * Argument passed to the callback each time the
+ * [pump](Titanium.Stream.pump) operation has new data to deliver.
+ */
+interface PumpCallbackArgs {
+	/**
+	 * Indicates if the operation succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	error?: string;
+
+	/**
+	 * Error code. Returns 0 if `success` is `true`.
+	 */
+	code?: number;
+
+	/**
+	 * Stream being read from.
+	 */
+	source?: Titanium.IOStream;
+
+	/**
+	 * Buffer object holding the data currently being pumped to the handler method.
+	 */
+	buffer?: Titanium.Buffer;
+
+	/**
+	 * Number of bytes being passed to this invocation of the handler, or
+	 * -1 in the event of an error or end of stream.
+	 */
+	bytesProcessed?: number;
+
+	/**
+	 * Total number of bytes read from the stream so far,
+	 * including the data passed to this current invocation of the handler.
+	 */
+	totalBytesProcessed?: number;
+
+	/**
+	 * Whether an error was encountered. Set to 1 in the case of an error, 0
+	 * otherwise.
+	 */
+	errorState?: number;
+
+	/**
+	 * Text description of the error.
+	 */
+	errorDescription?: string;
+
+}
+
+/**
+ * Arguments to be passed to createBuffer
+ */
+interface CreateBufferArgs {
+	/**
+	 * An initial value which will be encoded and placed in the buffer. If value is a Number, type must also be set. (this is simply a convenient way of calling <Titanium.Codec.encodeString> or <Titanium.Codec.encodeNumber> and placing the encoded value in the returned buffer.)
+	 */
+	value?: string | number;
+
+	/**
+	 * The length of the buffer.
+	 */
+	length?: number;
+
+	/**
+	 * The type of data encoding to use with `value`.
+	 */
+	type?: string;
+
+	/**
+	 * The byte order of this buffer.
+	 */
+	byteOrder?: number;
+
+}
+
+/**
+ * Simple object passed to <Titanium.UI.create2DMatrix> to initialize a matrix.
+ */
+interface MatrixCreationDict {
+	/**
+	 * Scale the matrix by the specified scaling factor. The same scaling factor is used
+	 * for both horizontal and vertical scaling.
+	 */
+	scale?: number;
+
+	/**
+	 * Rotation angle, in degrees. See the [rotate](Titanium.UI.2DMatrix.rotate) method
+	 * for a discussion of rotation.
+	 */
+	rotate?: number;
+
+	/**
+	 * Point to rotate around, specified as a dictionary object with `x` and `y`
+	 * properties, where { x: 0.5, y: 0.5 } represents the center of whatever is being
+	 * rotated.
+	 */
+	anchorPoint?: any;
+
+}
+
+/**
+ * An abstract datatype for specifying an attributed string attribute.
+ */
+interface Attribute {
+	/**
+	 * Attribute to apply to the text.
+	 */
+	type: number;
+
+	/**
+	 * Attribute value.
+	 */
+	value: number;
+
+	/**
+	 * Attribute range.
+	 */
+	range: number[];
+
 }
+
+/**
+ * Dictionary describing the items for <Titanium.UI.Clipboard.setItems>.
+ */
+interface ClipboardItemsType {
+	/**
+	 * An array of key-value items to add to the clipboard. The key must a valid mime-type
+	 * matching the mime-type of the value.
+	 */
+	items?: any[];
+
+	/**
+	 * The privacy options to apply to all the items on the clipboard. The available options are
+	 * described in `Ti.UI.CLIPBOARD_OPTION_*`. Depending on the key, the value can be a Date or
+	 * Boolean.
+	 */
+	options?: any;
 
-declare class CoverFlowImageType  {
-	height : number;
-	image : any;
-	width : number;
 }
+
+/**
+ * An abstract datatype for specifying a text font.
+ */
+interface Font {
+	/**
+	 * Specifies the font family or specific font to use.
+	 */
+	fontFamily?: string;
+
+	/**
+	 * Font size, in platform-dependent units.
+	 */
+	fontSize?: number | string;
+
+	/**
+	 * Font weight. Valid values are "bold", "semibold", "normal", "thin",
+	 * "light" and "ultralight".
+	 */
+	fontWeight?: string;
+
+	/**
+	 * Font style. Valid values are "italic" or "normal".
+	 */
+	fontStyle?: string;
 
-declare class BroadcastIntentOptions  {
-	action : string;
-	className : string;
-	data : string;
-	flags : number;
-	packageName : string;
-	url : string;
+	/**
+	 * The text style for the font.
+	 */
+	textStyle?: string;
+
 }
+
+/**
+ * Template that represents the basic appearance of a list item.
+ */
+interface ItemTemplate {
+	/**
+	 * Contains key-value pairs of view properties and their values that are applied to the ListItem.
+	 */
+	properties?: any;
+
+	/**
+	 * Contains key-value pairs of view events and their listeners that are applied to the ListItem.
+	 */
+	events?: any;
+
+	/**
+	 * Contains an array of subview templates to be added (in order) as children to this view.
+	 */
+	childTemplates?: ViewTemplate[];
 
-declare class CloudUsersSecureResponse extends CloudResponse {
-	accessToken : string;
-	expiresIn : number;
 }
+
+/**
+ * Template that represents a view subcomponent of an <ItemTemplate>.
+ */
+interface ViewTemplate {
+	/**
+	 * View's class name, for example, `Ti.UI.Button`.
+	 */
+	type: string;
+
+	/**
+	 * View's ID (or set of IDs) used for data binding. This value must be unique.
+	 */
+	bindId?: string;
+
+	/**
+	 * Contains key-value pairs of view properties and their values that are applied to this view component.
+	 */
+	properties?: any;
+
+	/**
+	 * Contains key-value pairs of view events and their listeners that are applied to this view component.
+	 */
+	events?: any;
 
-declare class CloudClientsResponse extends CloudResponse {
-	ip_address : string;
-	location : Dictionary<Object>;
+	/**
+	 * Contains an array of subview templates to be added (in order) as children to this view.
+	 */
+	childTemplates?: ViewTemplate[];
+
 }
+
+/**
+ * Represents displayed item data.
+ */
+interface ListDataItem {
+	/**
+	 * Template ID configured with the <Titanium.UI.ListView.templates> property or
+	 * <Titanium.UI.LIST_ITEM_TEMPLATE_DEFAULT>.
+	 */
+	template?: string | number;
 
-declare class PushNotificationErrorArg  {
-	type : string;
+	/**
+	 * Contains key-value pairs of view properties and their values that are applied to the
+	 * `ListItem`.
+	 */
+	properties?: any;
+
 }
+
+/**
+ * Represents the custom edit action for a ListItem.
+ */
+interface RowActionType {
+	/**
+	 * The title of the row action.
+	 */
+	title: string;
 
-declare class CloudStatusesResponse extends CloudResponse {
-	statuses : Array<Dictionary<Object>>;
+	/**
+	 * The [identifier](RowActionType. identifier) of the row action. Only included in the event
+	 * if previously defined. Available in Titanium 6.0.0 and later.
+	 */
+	identifier?: string;
+
+	/**
+	 * The style of the row action.
+	 */
+	style: number;
+
+	/**
+	 * The background color of the row action.
+	 */
+	color?: string;
+
 }
+
+/**
+ * A simple object for specifying the animation properties to use when inserting or deleting
+ * sections or cells, or scrolling the list.
+ */
+interface ListViewAnimationProperties {
+	/**
+	 * Whether this list change should be animated. Ignored if any `animationStyle` value is specified.
+	 */
+	animated?: boolean;
 
-declare class windowToolbarParam  {
-	animated : boolean;
-	barColor : string;
-	tintColor : string;
-	translucent : boolean;
+	/**
+	 * Type of animation to use for cell insertions and deletions.
+	 */
+	animationStyle?: number;
+
+	/**
+	 * Specifies what position to scroll the selected cell to.
+	 */
+	position?: number;
+
 }
+
+/**
+ * A simple object that represents an index entry in a `ListView`.
+ */
+interface ListViewIndexEntry {
+	/**
+	 * Title to display in the index bar.
+	 */
+	title?: string;
+
+	/**
+	 * Section index associated with this title.
+	 */
+	index?: number;
 
-declare class GeocodedAddress  {
-	address : string;
-	city : string;
-	country : string;
-	countryCode : string;
-	country_code : string;
-	displayAddress : string;
-	latitude : string;
-	longitude : string;
-	postalCode : string;
-	region1 : string;
-	region2 : string;
-	street : string;
-	street1 : string;
-	zipcode : string;
 }
 
-declare class ContactsCallbackArgs extends ErrorResponse {
-	data : Array<Ti.Contacts.Person>;
+/**
+ * Optional parameter for [setContentInsets](Titanium.UI.ListView.setContentInsets) method.
+ */
+interface ListViewContentInsetOption {
+	/**
+	 * Determines whether the list view's content inset change is animated.
+	 */
+	animated?: boolean;
+
+	/**
+	 * The duration in `milliseconds` for animation while the content inset is  being changed.
+	 */
+	duration?: number;
+
 }
+
+/**
+ * The parameter for [setMarker](Titanium.UI.ListView.setMarker) and [addMarker](Titanium.UI.ListView.addMarker) methods.
+ */
+interface ListViewMarkerProps {
+	/**
+	 * The sectionIndex of the reference item.
+	 */
+	sectionIndex?: number;
+
+	/**
+	 * The itemIndex of the reference item.
+	 */
+	itemIndex?: number;
 
-declare class zoomScaleOption  {
-	animated : boolean;
 }
 
-declare class LocationCoordinates  {
-	accuracy : number;
-	altitude : number;
-	altitudeAccuracy : number;
-	heading : number;
-	latitude : number;
-	longitude : number;
-	speed : number;
-	timestamp : number;
-}
+/**
+ * The parameter for [setContentInsets](Titanium.UI.TableView.setContentInsets) method.
+ */
+interface ListViewEdgeInsets {
+	/**
+	 * Value specifying the top insets for the enclosing scroll view of the list view.
+	 */
+	top?: number;
+
+	/**
+	 * Value specifying the left insets for the enclosing scroll view of the list view.
+	 */
+	left?: number;
 
-declare class ActivityResult  {
-	intent : Ti.Android.Intent;
-	requestCode : number;
-	resultCode : number;
-}
+	/**
+	 * Value specifying the right insets for the enclosing scroll view of the list view.
+	 */
+	right?: number;
+
+	/**
+	 * Value specifying the bottom insets for the enclosing scroll view of the list view.
+	 */
+	bottom?: number;
+
+}
 
-declare class CloudUsersSecureDialog  {
-	title : string;
-}
+/**
+ * The arguments for the <Titanium.UI.ListView.prefetch> and <Titanium.UI.ListView.cancelprefetch> events.
+ */
+interface ListItemEventType {
+	/**
+	 * List section if the item is contained in a list section.
+	 */
+	section?: Titanium.UI.ListSection;
 
-declare class CloudFriendsResponse extends CloudResponse {
-	users : Array<Dictionary<Object>>;
-}
-
-declare class PhotoGalleryOptionsType  {
-	allowEditing : boolean;
-	animated : boolean;
-	arrowDirection : number;
-	autohide : boolean;
-	cancel : (...args : any[]) => any;
-	error : (...args : any[]) => any;
-	mediaTypes : Array<String>;
-	popoverView : Ti.UI.View;
-	success : (...args : any[]) => any;
-}
-
-declare class NotificationParams  {
-	alertAction : string;
-	alertBody : string;
-	alertLaunchImage : string;
-	badge : number;
-	category : string;
-	date : Date;
-	repeat : string;
-	sound : string;
-	timezone : string;
-	userInfo : Dictionary<Object>;
-}
+	/**
+	 * Section index.
+	 */
+	sectionIndex?: number;
 
-declare enum SuccessResponse {
+	/**
+	 * Item index.
+	 */
+	itemIndex?: number;
 
-}
+	/**
+	 * The item ID bound to the list item that generated the event.
+	 */
+	itemId?: string;
 
-declare class daysOfTheWeekDictionary  {
-	daysOfWeek : number;
-	week : number;
 }
 
-declare class Modules  {
+/**
+ * Dictionary of options for the <Titanium.UI.OptionDialog.hide> method.
+ */
+interface hideParams {
+	/**
+	 * Determines whether to animate the dialog as it is dismissed.
+	 */
+	animated?: boolean;
 
-}
+}
 
-declare class ReferenceInsets  {
-	bottom : number;
-	left : number;
-	right : number;
-	top : number;
-}
+/**
+ * Optional parameter for [setContentOffset](Titanium.UI.ScrollView.setContentOffset) method.
+ */
+interface contentOffsetOption {
+	/**
+	 * Determines whether the scroll view's content area change is animated.
+	 */
+	animated?: boolean;
+
+}
 
-declare class hideStatusBarParams  {
-	animated : boolean;
-	animationStyle : number;
-}
+/**
+ * Optional parameter for [setZoomScale](Titanium.UI.ScrollView.setZoomScale) method.
+ */
+interface zoomScaleOption {
+	/**
+	 * Determines whether the scroll view's zooming is animated.
+	 */
+	animated?: boolean;
+
+}
+
+/**
+ * A simple object for specifying the animation properties when scrolling the view.
+ */
+interface ScrollViewAnimationProperties {
+	/**
+	 * When set to `true` it will scroll smoothly to the destination.
+	 */
+	animated?: boolean;
 
-declare class PreviewImageOptions  {
-	error : (...args : any[]) => any;
-	image : Ti.Blob;
-	success : (...args : any[]) => any;
 }
 
-declare class ListDataItem  {
-	properties : Dictionary<Ti.UI.ListItem>;
-	template : any;
-}
+/**
+ * Dictionary to specify edge insets for <Titanium.UI.Tab.iconInsets>.
+ */
+interface TabIconInsets {
+	/**
+	 * Top inset.
+	 */
+	top?: number;
+
+	/**
+	 * Left inset.
+	 */
+	left?: number;
 
-declare class ItemTemplate  {
-	childTemplates : Array<ViewTemplate>;
-	events : Dictionary<Object>;
-	properties : Dictionary<Ti.UI.ListItem>;
 }
 
-declare class MovieSize  {
-	height : number;
-	width : number;
-}
-
-declare class CameraMediaItemType  {
-	cropRect : CropRectType;
-	media : Ti.Blob;
-	mediaType : string;
-}
+/**
+ * A simple object for specifying the animation properties to use when inserting or deleting rows, or scrolling the table.
+ */
+interface TableViewAnimationProperties {
+	/**
+	 * Whether this table change should be animated. Ignored if any `animationStyle` value is specified.
+	 */
+	animated?: boolean;
+
+	/**
+	 * Type of animation to use for row insertions and deletions.
+	 */
+	animationStyle?: number;
+
+	/**
+	 * Specifies what position to scroll the selected row to.
+	 */
+	position?: number;
+
+}
 
-declare class HeadingResponse extends ErrorResponse {
-	heading : HeadingData;
-}
+/**
+ * A simple object that represents an index entry in a `TableView`.
+ */
+interface TableViewIndexEntry {
+	/**
+	 * Title to display in the index bar for this item.
+	 */
+	title?: string;
+
+	/**
+	 * Row index associated with this item.
+	 */
+	index?: number;
+
+}
 
-declare class ListViewEdgeInsets  {
-	bottom : number;
-	left : number;
-	right : number;
-	top : number;
-}
-
-declare class BoundaryIdentifier  {
-	identifier : string;
-	point1 : Point;
-	point2 : Point;
-}
-
-declare enum CloudEmailsResponse {
-
-}
-
-declare class GradientColorRef  {
-	color : string;
-	offset : number;
-}
-
-declare class Font  {
-	fontFamily : string;
-	fontSize : any;
-	fontStyle : string;
-	fontWeight : string;
-	textStyle : string;
-}
-
-declare class CloudPlacesResponse extends CloudResponse {
-	places : Array<Dictionary<Object>>;
-}
-
-declare class EncodeNumberDict  {
-	byteOrder : number;
-	dest : Ti.Buffer;
-	position : number;
-	source : number;
-	type : string;
-}
-
-declare class showContactsParams  {
-	animated : boolean;
-	cancel : (...args : any[]) => any;
-	fields : Array<String>;
-	selectedPerson : (...args : any[]) => any;
-	selectedProperty : (...args : any[]) => any;
-}
-
-declare class LocationProviderDict  {
-	accuracy : number;
-	name : string;
-	power : number;
-}
-
-declare class FacebookDialogResponsev1  {
-	cancelled : boolean;
-	error : string;
-	result : string;
-	success : boolean;
-}
-
-declare class CloudFilesResponse extends CloudResponse {
-	files : Array<Dictionary<Object>>;
-}
-
-declare class hideParams  {
-	animated : boolean;
-}
-
-declare class SecurityManagerProtocol  {
-	connectionDelegateForUrl (url: any) : APSConnectionDelegate;
-	getKeyManagers (proxy: any) : Array<Object>;
-	getTrustManagers (proxy: any) : Array<Object>;
-	willHandleURL (url: any) : boolean;
-}
-
-declare class openWindowParams  {
-	activityEnterAnimation : number;
-	activityExitAnimation : number;
-	animated : boolean;
-	bottom : any;
-	fullscreen : boolean;
-	height : any;
-	left : any;
-	modal : boolean;
-	modalStyle : number;
-	modalTransitionStyle : number;
-	navBarHidden : boolean;
-	right : any;
-	top : any;
-	transition : number;
-	width : any;
-}
-
-declare class Gradient  {
-	backfillEnd : boolean;
-	backfillStart : boolean;
-	colors : any;
-	endPoint : Point;
-	endRadius : number;
-	startPoint : Point;
-	startRadius : number;
-	type : string;
-}
-
-declare class showStatusBarParams  {
-	animated : boolean;
-	animationStyle : number;
-}
-
-declare class transitionAnimationParam  {
-	duration : number;
-	tranistionTo : Ti.UI.Animation;
-	transitionFrom : Ti.UI.Animation;
-}
-
-declare class MapPointType  {
-	latitude : number;
-	longitude : number;
-}
-
-declare class CloudKeyValuesResponse extends CloudResponse {
-	keyvalues : Array<Dictionary<Object>>;
-}
-
-declare class TableViewEdgeInsets  {
-	bottom : number;
-	left : number;
-	right : number;
-	top : number;
-}
-
-declare class ReverseGeocodeResponse extends ErrorResponse {
-	places : Array<GeocodedAddress>;
-}
-
-declare class contentOffsetOption  {
-	animated : boolean;
-}
-
-declare class Attribute  {
-	range : Array<Number>;
-	type : number;
-	value : number;
-}
-
-declare class PushNotificationSuccessArg  {
-	deviceToken : string;
-	type : string;
-}
-
-declare class PushNotificationData  {
-	data : Dictionary<Object>;
-	inBackground : boolean;
-}
-
-declare class closeWindowParams  {
-	activityEnterAnimation : number;
-	activityExitAnimation : number;
-	animated : boolean;
-}
-
-declare class CloudLikesResponse extends CloudResponse {
-	likes : Array<Dictionary<Object>>;
-}
-
-declare class showParams  {
-	animated : boolean;
-	rect : Dimension;
-	view : Ti.UI.View;
-}
-
-declare class PreviewImageError  {
-	message : string;
-}
-
-declare class CloudMessagesResponse extends CloudResponse {
-	messages : Array<Dictionary<Object>>;
-}
-
-declare class CloudPushNotificationsShowChannelResponse extends CloudResponse {
-	devices : Dictionary<Object>;
-}
-
-declare class ImageAsCroppedDict  {
-	height : number;
-	width : number;
-	x : number;
-	y : number;
-}
-
-declare class UserNotificationSettings  {
-	categories : Array<Ti.App.iOS.UserNotificationCategory>;
-	types : Array<Number>;
-}
-
-declare class TableViewAnimationProperties  {
-	animated : boolean;
-	animationStyle : number;
-	position : number;
-}
-
-declare enum MediaAuthorizationResponse {
-
-}
+/**
+ * Optional parameter for [setContentInsets](Titanium.UI.TableView.setContentInsets) method.
+ */
+interface TableViewContentInsetOption {
+	/**
+	 * Determines whether the table view's content inset change is animated.
+	 */
+	animated?: boolean;
+
+	/**
+	 * The duration in `milleseconds` for animation while the content inset is  being changed.
+	 */
+	duration?: number;
+
+}
+
+/**
+ * The parameter for [setContentInsets](Titanium.UI.TableView.setContentInsets) method.
+ */
+interface TableViewEdgeInsets {
+	/**
+	 * Value specifying the top insets for the enclosing scroll view of the table.
+	 */
+	top?: number;
+
+	/**
+	 * Value specifying the left insets for the enclosing scroll view of the table.
+	 */
+	left?: number;
+
+	/**
+	 * Value specifying the right insets for the enclosing scroll view of the table.
+	 */
+	right?: number;
+
+	/**
+	 * Value specifying the bottom insets for the enclosing scroll view of the table.
+	 */
+	bottom?: number;
+
+}
+
+/**
+ * Dictionary object of parameters for the <Titanium.UI.TextArea.selected> event and <Titanium.UI.TextArea.selection> property that describes
+ * position and length of the selected text.
+ */
+interface textAreaSelectedParams {
+	/**
+	 * Starting position of selected text.
+	 */
+	location?: number;
+
+	/**
+	 * Number of characters selected.
+	 */
+	length?: number;
+
+}
+
+/**
+ * Dictionary object of parameters for the <Titanium.UI.TextArea.padding>  that describes the padding
+ */
+interface TextAreaPadding {
+	/**
+	 * Left padding
+	 */
+	left?: number;
+
+	/**
+	 * Right padding
+	 */
+	right?: number;
+
+	/**
+	 * Top padding
+	 */
+	top?: number;
+
+	/**
+	 * Bottom padding
+	 */
+	bottom?: number;
+
+}
+
+/**
+ * Dictionary object of parameters for the <Titanium.UI.TextField.selection> property that describes
+ * position and length of the selected text.
+ */
+interface textFieldSelectedParams {
+	/**
+	 * Starting position of selected text.
+	 */
+	location?: number;
+
+	/**
+	 * Number of characters selected.
+	 */
+	length?: number;
+
+}
+
+/**
+ * Dictionary object of parameters for the <Titanium.UI.TextField.padding>  that describes the padding
+ */
+interface TextFieldPadding {
+	/**
+	 * Left padding
+	 */
+	left?: number;
+
+	/**
+	 * Right padding
+	 */
+	right?: number;
+
+	/**
+	 * Top padding (Android only, since 6.1.0)
+	 */
+	top?: number;
+
+	/**
+	 * Bottom padding (Android only, since 6.1.0)
+	 */
+	bottom?: number;
+
+}
+
+/**
+ * A pair of coordinates used to describe the location of a <Titanium.UI.View>.
+ */
+interface Point {
+	/**
+	 * The x-axis coordinate of this point.
+	 */
+	x?: number | string;
+
+	/**
+	 * The y-axis coordinate of this point.
+	 */
+	y?: number | string;
+
+}
+
+/**
+ * A simple object defining a color gradient.
+ */
+interface Gradient {
+	/**
+	 * Type of gradient, either 'linear' or 'radial'.
+	 */
+	type?: string;
+
+	/**
+	 * Start point for the gradient.
+	 */
+	startPoint?: Point;
+
+	/**
+	 * End point for the gradient.
+	 */
+	endPoint?: Point;
+
+	/**
+	 * For a radial gradient, the radius at the `startPoint`.
+	 */
+	startRadius?: number;
+
+	/**
+	 * For a radial gradient, the radius at the `endPoint`.
+	 */
+	endRadius?: number;
+
+	/**
+	 * An array of colors, as a color name or hex triplet.
+	 */
+	colors?: string[] | GradientColorRef[];
+
+	/**
+	 * Set to `true` to continue filling with the starting color beyond the `startPoint`.
+	 */
+	backfillStart?: boolean;
+
+	/**
+	 * Set to `true` to continue filling with the final color beyond the `endPoint`.
+	 */
+	backfillEnd?: boolean;
+
+}
+
+/**
+ * A simple object consisting of a color and an offset.
+ */
+interface GradientColorRef {
+	/**
+	 * Color value at this point in the gradient, as a color name or hex triplet.
+	 */
+	color?: string;
+
+	/**
+	 * The color's normalized position within the gradient, ranging from 0 (start) to 1 (end).
+	 */
+	offset?: number;
+
+}
+
+/**
+ * A simple object consisting of the position and size measurements.
+ */
+interface Dimension {
+	/**
+	 * The height measurement.
+	 */
+	height?: number;
+
+	/**
+	 * The width measurement.
+	 */
+	width?: number;
+
+	/**
+	 * The x-axis coordinate of the position.
+	 */
+	x?: number;
+
+	/**
+	 * The y-axis coordinate of the position.
+	 */
+	y?: number;
+
+}
+
+/**
+ * Optional parameter to enable animation to [hide](Titanium.UI.View.hide) and [show](Titanium.UI.View.show).
+ */
+interface AnimationOption {
+	/**
+	 * Determines whether to enable a circular reveal animation.
+	 */
+	animated?: boolean;
+
+}
+
+/**
+ * Dictionary of options for the <Titanium.UI.Window.open> method.
+ */
+interface openWindowParams {
+	/**
+	 * Determines whether to use an animated effect when the window is shown.
+	 */
+	animated?: boolean;
+
+	/**
+	 * Window's bottom position, in platform-specific units.
+	 */
+	bottom?: number | string;
+
+	/**
+	 * Determines if the window is fullscreen.
+	 */
+	fullscreen?: boolean;
+
+	/**
+	 * Window's height, in platform-specific units.
+	 */
+	height?: number | string;
+
+	/**
+	 * Window's left position, in platform-specific units.
+	 */
+	left?: number | string;
+
+	/**
+	 * Determines whether to open the window modal in front of other windows.
+	 */
+	modal?: boolean;
+
+	/**
+	 * Presentation style of this modal window.
+	 */
+	modalStyle?: number;
+
+	/**
+	 * Transition style of this modal window.
+	 */
+	modalTransitionStyle?: number;
+
+	/**
+	 * For modal windows, hides the nav bar (`true`) or shows the nav bar (`false`).
+	 */
+	navBarHidden?: boolean;
+
+	/**
+	 * Window's right position, in platform-specific units.
+	 */
+	right?: number | string;
+
+	/**
+	 * Window's top position, in platform-specific units.
+	 */
+	top?: number | string;
+
+	/**
+	 * Transition style of this non-modal window.
+	 */
+	transition?: number;
+
+	/**
+	 * Window's width, in platform-specific units.
+	 */
+	width?: number | string;
+
+	/**
+	 * Animation resource to run on the activity (heavyweight window) being opened.
+	 */
+	activityEnterAnimation?: number;
+
+	/**
+	 * Animation resource to run on the activity that is being put in background as a heavyweight window is being opened above it.
+	 */
+	activityExitAnimation?: number;
+
+}
+
+/**
+ * Dictionary of options for the <Titanium.UI.Window.setToolbar> method.
+ */
+interface windowToolbarParam {
+	/**
+	 * Defines if the toolbar is translucent.
+	 */
+	translucent?: boolean;
+
+	/**
+	 * Defines if the toolbar appearance is animated.
+	 */
+	animated?: boolean;
+
+	/**
+	 * Background color for the toolbar, as a color name or hex triplet.
+	 */
+	barColor?: string;
+
+	/**
+	 * The tintColor to apply to the tool bar. Applicable on iOS 7 and above.
+	 */
+	tintColor?: string;
+
+}
+
+/**
+ * Dictionary of options for the <Titanium.UI.Window.close> method.
+ */
+interface closeWindowParams {
+	/**
+	 * Determines whether to use an animated effect when the window is closed.
+	 */
+	animated?: boolean;
+
+	/**
+	 * Animation resource to use for the incoming activity.
+	 */
+	activityEnterAnimation?: number;
+
+	/**
+	 * Animation resource to use for the outgoing activity (heavyweight window).
+	 */
+	activityExitAnimation?: number;
+
+}
+
+/**
+ * Dictionary of options for the <Titanium.UI.Window.titleAttributes> property.
+ */
+interface titleAttributesParams {
+	/**
+	 * Color of the window title, as a color name or hex triplet.
+	 */
+	color?: string;
+
+	/**
+	 * Font to use for the window title.
+	 */
+	font?: Font;
+
+	/**
+	 * Shadow color and offset for the window title.
+	 */
+	shadow?: shadowDict;
+
+}
+
+/**
+ * Dictionary describing the shadow effect for text.
+ */
+interface shadowDict {
+	/**
+	 * Specifies the blur radius of the shadow.
+	 */
+	blurRadius?: number;
+
+	/**
+	 * Color name or hex triplet specifying the color of the shadow.
+	 */
+	color?: string;
+
+	/**
+	 * Dictionary with the properties `width` and `height` used as the horizontal
+	 * and vertical offset of the shadow, respectively.
+	 */
+	offset?: any;
+
+}
+
+/**
+ * Object of options for <Titanium.UI.iOS.ApplicationShortcuts.addDynamicShortcut>.
+ */
+interface ShortcutParams {
+	/**
+	 * The unique key for the application shortcut.
+	 */
+	itemtype: string;
+
+	/**
+	 * The title of the application shortcut.
+	 */
+	title: string;
+
+	/**
+	 * The subtitle displayed on the application shortcut.
+	 */
+	subtitle?: string;
+
+	/**
+	 * The icon to be displayed on the application shortcut. You can either use one of the constants like
+	 * <Titanium.UI.iOS.SHORTCUT_ICON_TYPE_COMPOSE>, a local image specified by the image path or a reference to a
+	 * <Titanium.Contacts.Person>.
+	 */
+	icon?: number | string | Titanium.Contacts.Person;
+
+	/**
+	 * The userInfo of the application shortcut.
+	 */
+	userInfo?: any;
+
+}
+
+/**
+ * Dictionary to specify a boundary identifier for <Titanium.UI.iOS.CollisionBehavior.addBoundary>.
+ */
+interface BoundaryIdentifier {
+	/**
+	 * Arbitrary identifier for the boundary
+	 */
+	identifier?: string;
+
+	/**
+	 * Start point for the boundary
+	 */
+	point1?: Point;
+
+	/**
+	 * End point for the boundary
+	 */
+	point2?: Point;
+
+}
+
+/**
+ * Dictionary to specify edge insets for <Titanium.UI.iOS.CollisionBehavior.referenceInsets>.
+ */
+interface ReferenceInsets {
+	/**
+	 * Top inset.
+	 */
+	top?: number;
+
+	/**
+	 * Left inset.
+	 */
+	left?: number;
+
+	/**
+	 * Right inset.
+	 */
+	right?: number;
+
+	/**
+	 * Bottom inset.
+	 */
+	bottom?: number;
+
+}
+
+/**
+ * Simple object for defining a single image in a cover flow view.
+ */
+interface CoverFlowImageType {
+	/**
+	 * Image to use, as a local file URL, `Blob`, or `File`.
+	 */
+	image?: string | Titanium.Blob | Titanium.Filesystem.File;
+
+	/**
+	 * Display width for the image, in Apple points.
+	 */
+	width?: number;
+
+	/**
+	 * Display height of the image, in Apple points.
+	 */
+	height?: number;
+
+}
+
+/**
+ * A simple object for specifying options when showing or dismissing a <Titanium.UI.iOS.DocumentViewer>.
+ */
+interface DocumentViewerOptions {
+	/**
+	 * Indicates whether to animate the transition.
+	 */
+	animated?: boolean;
+
+	/**
+	 * Anchors the options menu to the specified view.
+	 */
+	view?: Titanium.UI.View;
+
+}
+
+/**
+ * Dictionary of options for showing a menu popup with <Titanium.UI.iOS.MenuPopup.show>.
+ */
+interface MenuPopupShowParams {
+	/**
+	 * The view where the menu pop is shown at.
+	 */
+	view: Titanium.UI.View;
+
+	/**
+	 * Determines whether the menu popup should be opened or closed animated.
+	 */
+	animated?: boolean;
+
+	/**
+	 * Indicates the arrow direction of the menu popup.
+	 */
+	arrowDirection?: number;
+
+}
+
+/**
+ * Dictionary of options for hiding a menu popup with <Titanium.UI.iOS.MenuPopup.hide>.
+ */
+interface MenuPopupHideParams {
+	/**
+	 * Determines whether the menu popup should be opened or closed animated.
+	 */
+	animated?: boolean;
+
+}
+
+/**
+ * Optional parameter for [setShowMasterInPortrait](Titanium.UI.iOS.SplitWindow.setShowMasterInPortrait) and
+ * [setMasterIsOverlayed](Titanium.UI.iOS.SplitWindow.setMasterIsOverlayed) methods.
+ */
+interface animationOption {
+	/**
+	 * Determines whether the change is animated.
+	 */
+	animated?: boolean;
+
+}
+
+/**
+ * Object describing a button bar or tabbed bar item.
+ */
+interface BarItemType {
+	/**
+	 * Button title, used if no `image` is specified.
+	 */
+	title?: string;
+
+	/**
+	 * Button icon. If specified, takes precedence over `title`.
+	 */
+	image?: string | Titanium.Blob | Titanium.Filesystem.File;
+
+	/**
+	 * Width for this button.
+	 */
+	width?: number;
+
+	/**
+	 * Whether the button is enabled initially.
+	 */
+	enabled?: boolean;
+
+	/**
+	 * A succint label associated with the bar item for the device's accessibility service.
+	 */
+	accessibilityLabel?: string;
+
+}
+
+/**
+ * Dictionary specifying the transition animation used with the <Titanium.UI.iOS.createTransitionAnimation> method.
+ * Only supported on iOS 7 and later.
+ */
+interface transitionAnimationParam {
+	/**
+	 * Length of the transition in milliseconds.
+	 */
+	duration?: number;
+
+	/**
+	 * Animation to hide the current window.
+	 */
+	transitionFrom?: Titanium.UI.Animation;
+
+	/**
+	 * Animation to show the new window.
+	 */
+	transitionTo?: Titanium.UI.Animation;
+
+}
+
+/**
+ * Dictionary of options for <Titanium.UI.iPad.Popover.show> and <Titanium.UI.iPad.Popover.hide>.
+ */
+interface PopoverParams {
+	/**
+	 * Indicates whether to animate showing or hiding the popover.
+	 */
+	animated?: boolean;
+
+	/**
+	 * Sets the arrow position of the popover relative to the attached view object's dimensions
+	 * when showing the popover.
+	 */
+	rect?: Dimension;
+
+	/**
+	 * Attaches the popover to the specified view when showing the popover.
+	 */
+	view: Titanium.UI.View;
+
+}
+
+/**
+ * Dictionary of options for the <Titanium.UI.iPhone.hideStatusBar> method.
+ */
+interface hideStatusBarParams {
+	/**
+	 * Determines whether to animate the dialog as it is hidden.
+	 */
+	animated?: boolean;
+
+	/**
+	 * Style of the animation.
+	 */
+	animationStyle?: number;
+
+}
+
+/**
+ * Dictionary of options for the <Titanium.UI.iPhone.showStatusBar> method.
+ */
+interface showStatusBarParams {
+	/**
+	 * Determines whether to animate the dialog as it is shown.
+	 */
+	animated?: boolean;
+
+	/**
+	 * Style of the animation.
+	 */
+	animationStyle?: number;
+
+}
+
+/**
+ * Reply message received from watch app.
+ */
+interface MessageReply {
+	/**
+	 * Reply message from watchapp.
+	 */
+	message?: any;
+
+	/**
+	 * Indicates if the operation succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	error?: string;
+
+	/**
+	 * Error code. Returns 0 if `success` is `true`.
+	 */
+	code?: number;
+
+}
+
+/**
+ * Properties passed to a yql callback to report a success or failure.
+ */
+interface YQLResponse {
+	/**
+	 * Indicates if the operation succeeded.
+	 */
+	success?: boolean;
+
+	/**
+	 * Error message, if any returned.
+	 */
+	error?: string;
+
+	/**
+	 * Error code. Returns 0 if `success` is `true`.
+	 */
+	code?: number;
+
+	/**
+	 * Error message, if any returned. Use `error` instead
+	 */
+	message?: string;
+
+	/**
+	 * The data payload received from the YQL.
+	 */
+	data?: any;
 
-declare class EncodeStringDict  {
-	charset : string;
-	dest : Ti.Buffer;
-	destPosition : number;
-	source : string;
-	sourceLength : number;
-	sourcePosition : number;
 }
diff --git a/types/titanium/titanium-tests.ts b/types/titanium/titanium-tests.ts
index 9113f49835..bc5f4794c2 100644
--- a/types/titanium/titanium-tests.ts
+++ b/types/titanium/titanium-tests.ts
@@ -1,7 +1,5 @@
-
-
 function test_window() {
-	var window: Ti.UI.Window = Ti.UI.createWindow({
+	const window: Titanium.UI.Window = Ti.UI.createWindow({
 		title: 'Test',
 		backgroundColor: 'white',
 		borderRadius: 10
@@ -10,10 +8,10 @@ function test_window() {
 	window.setBackgroundColor('blue');
 	window.opacity = 0.92;
 
-	var matrix = Ti.UI.create2DMatrix().scale(1.1, 1);
+	const matrix = Ti.UI.create2DMatrix().scale(1.1, 1);
 	window.transform = matrix;
 
-	var label: Ti.UI.Label;
+	let label: Titanium.UI.Label;
 	label = Ti.UI.createLabel({
 		color: '#900',
 		text: 'Simple label'
@@ -26,17 +24,17 @@ function test_window() {
 }
 
 function test_tableview() {
-	var data : Ti.UI.View[] = [];
-	for (var i = 0; i < 10; i++) {
-		var row = Ti.UI.createTableViewRow();
-		var label = Ti.UI.createLabel({
+	const data: Titanium.UI.TableViewRow[] = [];
+	for (let i = 0; i < 10; i++) {
+		const row = Ti.UI.createTableViewRow();
+		const label = Ti.UI.createLabel({
 			left: 10,
 			text: 'Row ' + (i + 1)
 		});
-		var image = Ti.UI.createImageView({
+		const image = Ti.UI.createImageView({
 			url: 'KS_nav_ui.png'
 		});
-		var button = Ti.UI.createButton({
+		const button = Ti.UI.createButton({
 			right: 10,
 			height: 30,
 			width: 80,
@@ -47,19 +45,19 @@ function test_tableview() {
 		row.add(button);
 		data.push(row);
 	}
-	var table = Ti.UI.createTableView({
-		data: data,
-		style: Ti.UI.iPhone.TableViewStyle.PLAIN
+	const table = Ti.UI.createTableView({
+		data,
+		style: Ti.UI.iOS.TableViewStyle.PLAIN
 	});
 }
 
 function test_fs() {
-	var imageDir = Ti.Filesystem.getFile(Ti.Filesystem.applicationDataDirectory + 'downloaded_images');
+	let imageDir = Ti.Filesystem.getFile(Ti.Filesystem.applicationDataDirectory + 'downloaded_images');
 	if (!imageDir.exists()) {
 		imageDir.createDirectory();
 	}
-	var data: Ti.Blob;
-	var imageFile = Ti.Filesystem.getFile(imageDir.resolve() + 'image.jpg');
+	let data: Titanium.Blob; // tslint:disable-line:prefer-const
+	let imageFile = Ti.Filesystem.getFile(imageDir.resolve() + 'image.jpg');
 	if (!imageFile.write(data)) {
 		Ti.UI.createAlertDialog({
 			message: 'IO Error'
@@ -70,17 +68,17 @@ function test_fs() {
 }
 
 function test_network() {
-	var url = "http://www.appcelerator.com";
-	var client = Ti.Network.createHTTPClient({
+	const url = "http://www.appcelerator.com";
+	const client = Ti.Network.createHTTPClient({
 		// function called when the response data is available
-		onload : function(e: SuccessResponse) {
+		onload: (e: SuccessResponse) => {
 			alert(this.responseText);
 		},
 		// function called when an error occurs, including a timeout
-		onerror : function(e: FailureResponse) {
+		onerror: (e: FailureResponse) => {
 			alert(e.error);
 		},
-		timeout : 5000  // in milliseconds
+		timeout: 5000  // in milliseconds
 	});
 	// Prepare the connection.
 	client.open('GET', url);
@@ -89,8 +87,8 @@ function test_network() {
 }
 
 function test_map() {
-	var win = Ti.UI.createWindow();
-	var mountainView = Ti.Map.createAnnotation({
+	const win = Ti.UI.createWindow();
+	const mountainView = Ti.Map.createAnnotation({
 		animate: true,
 		leftButton: '../images/appcelerator_small.png',
 		myid: 1
@@ -101,19 +99,20 @@ function test_map() {
 	mountainView.setSubtitle('Mountain View, CA');
 	mountainView.setPincolor(Ti.Map.ANNOTATION_RED);
 
-	var mapview = Ti.Map.createView({
+	const mapview = Ti.Map.createView({
 		mapType: Ti.Map.STANDARD_TYPE,
 		region: {
-			latitude:37.390749, longitude:-122.081651,
-			latitudeDelta:0.01, longitudeDelta:0.01},
-		animate:true,
+			latitude: 37.390749, longitude: -122.081651,
+			latitudeDelta: 0.01, longitudeDelta: 0.01
+		},
+		animate: true,
 	});
 	mapview.regionFit = true;
 	mapview.userLocation = true;
 	mapview.annotations = [mountainView];
-	mapview.addEventListener('click', function(evt?) {
-		if (evt.clicksource === 'leftButton' || evt.clicksource === 'leftPane') {
-			alert(evt.title + ' left button clicked');
+	mapview.addEventListener('click', event => {
+		if (event.clicksource === 'leftButton' || event.clicksource === 'leftPane') {
+			alert(event.title + ' left button clicked');
 		}
 	});
 	win.add(mapview);
diff --git a/types/titanium/tsconfig.json b/types/titanium/tsconfig.json
index 86e5902e63..815fb8c48b 100644
--- a/types/titanium/tsconfig.json
+++ b/types/titanium/tsconfig.json
@@ -2,8 +2,8 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es6",
-            "dom"
+            "dom",
+            "es6"
         ],
         "noImplicitAny": true,
         "noImplicitThis": false,
diff --git a/types/titanium/tslint.json b/types/titanium/tslint.json
index a41bf5d19a..9a29b5bc8f 100644
--- a/types/titanium/tslint.json
+++ b/types/titanium/tslint.json
@@ -2,78 +2,12 @@
     "extends": "dtslint/dt.json",
     "rules": {
         "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
-        "ban-types": false,
-        "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
         "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
         "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
         "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
         "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
-        "no-unnecessary-generics": false,
         "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
-        "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
-        "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
-        "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
+        "max-line-length": false,
+        "unified-signatures": false
     }
 }

From 370bb2b55d2bcfb9a0cda18f26f04a7172a6050f Mon Sep 17 00:00:00 2001
From: fhelwanger <fhelwanger@gmail.com>
Date: Sat, 24 Mar 2018 22:57:25 -0300
Subject: [PATCH 0826/1382] Add react-native-elevated-view types

---
 types/react-native-elevated-view/index.d.ts   | 14 +++++++++++
 .../react-native-elevated-view-tests.tsx      | 10 ++++++++
 .../react-native-elevated-view/tsconfig.json  | 24 +++++++++++++++++++
 types/react-native-elevated-view/tslint.json  |  1 +
 4 files changed, 49 insertions(+)
 create mode 100644 types/react-native-elevated-view/index.d.ts
 create mode 100644 types/react-native-elevated-view/react-native-elevated-view-tests.tsx
 create mode 100644 types/react-native-elevated-view/tsconfig.json
 create mode 100644 types/react-native-elevated-view/tslint.json

diff --git a/types/react-native-elevated-view/index.d.ts b/types/react-native-elevated-view/index.d.ts
new file mode 100644
index 0000000000..4ad853294b
--- /dev/null
+++ b/types/react-native-elevated-view/index.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for react-native-elevated-view 0.0
+// Project: https://github.com/alekhurst/react-native-elevated-view
+// Definitions by: fhelwanger <https://github.com/fhelwanger>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+import * as React from 'react';
+import * as ReactNative from 'react-native';
+
+export interface ElevatedViewProperties extends ReactNative.ViewProperties {
+    elevation?: number;
+}
+
+export default class ElevatedView extends React.Component<ElevatedViewProperties> {}
diff --git a/types/react-native-elevated-view/react-native-elevated-view-tests.tsx b/types/react-native-elevated-view/react-native-elevated-view-tests.tsx
new file mode 100644
index 0000000000..f66932b1bf
--- /dev/null
+++ b/types/react-native-elevated-view/react-native-elevated-view-tests.tsx
@@ -0,0 +1,10 @@
+import * as React from "react";
+import ElevatedView from "react-native-elevated-view";
+
+() => {
+    <ElevatedView />;
+};
+
+() => {
+    <ElevatedView elevation={5} style={{ backgroundColor: 'red' }} />;
+};
diff --git a/types/react-native-elevated-view/tsconfig.json b/types/react-native-elevated-view/tsconfig.json
new file mode 100644
index 0000000000..89b476781c
--- /dev/null
+++ b/types/react-native-elevated-view/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react"
+    },
+    "files": [
+        "index.d.ts",
+        "react-native-elevated-view-tests.tsx"
+    ]
+}
diff --git a/types/react-native-elevated-view/tslint.json b/types/react-native-elevated-view/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-native-elevated-view/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 3c228f9d1ed04042e9d090d583850baa27d72cd0 Mon Sep 17 00:00:00 2001
From: TeamworkGuy2 <straitfrommars@rocketmail.com>
Date: Sun, 25 Mar 2018 02:53:12 +0000
Subject: [PATCH 0827/1382] [q] fix Promise not being assignable to IWhenable
 with strictFunctionTypes

---
 types/q/index.d.ts    | 396 ++++++++++++++++++++++++++++++++----------
 types/q/q-tests.ts    | 110 ++++++------
 types/q/tsconfig.json |   4 +-
 3 files changed, 365 insertions(+), 145 deletions(-)

diff --git a/types/q/index.d.ts b/types/q/index.d.ts
index 724925d802..bdcd3c68ca 100644
--- a/types/q/index.d.ts
+++ b/types/q/index.d.ts
@@ -1,9 +1,10 @@
-// Type definitions for Q 1.0
+// Type definitions for Q 1.5
 // Project: https://github.com/kriskowal/q
 // Definitions by: Barrie Nemetchek <https://github.com/bnemetchek>
 //                 Andrew Gaspar <https://github.com/AndrewGaspar>
 //                 John Reilly <https://github.com/johnnyreilly>
 //                 Michel Boudreau <https://github.com/mboudreau>
+//                 TeamworkGuy2 <https://github.com/TeamworkGuy2>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -28,74 +29,99 @@ declare namespace Q {
 	export interface Deferred<T> {
 		promise: Promise<T>;
 
+		/**
+		 * Calling resolve with a pending promise causes promise to wait on the passed promise, becoming fulfilled with its
+		 * fulfillment value or rejected with its rejection reason (or staying pending forever, if the passed promise does).
+		 * Calling resolve with a rejected promise causes promise to be rejected with the passed promise's rejection reason.
+		 * Calling resolve with a fulfilled promise causes promise to be fulfilled with the passed promise's fulfillment value.
+		 * Calling resolve with a non-promise value causes promise to be fulfilled with that value.
+		 */
 		resolve(value?: IWhenable<T>): void;
 
+		/**
+		 * Calling reject with a reason causes promise to be rejected with that reason.
+		 */
 		reject(reason?: any): void;
 
+		/**
+		 * Calling notify with a value causes promise to be notified of progress with that value. That is, any onProgress
+		 * handlers registered with promise or promises derived from promise will be called with the progress value.
+		 */
 		notify(value: any): void;
 
+		/**
+		 * Returns a function suitable for passing to a Node.js API. That is, it has a signature (err, result) and will
+		 * reject deferred.promise with err if err is given, or fulfill it with result if that is given.
+		 */
 		makeNodeResolver(): (reason: any, value: T) => void;
 	}
 
 	export interface Promise<T> {
 		/**
-		 * Like a finally clause, allows you to observe either the fulfillment or rejection of a promise, but to do so without modifying the final value. This is useful for collecting resources
-		 * regardless of whether a job succeeded, like closing a database connection, shutting a server down, or deleting an unneeded key from an object. finally returns a promise, which will become
-		 * resolved with the same fulfillment value or rejection reason as promise. However, if callback returns a promise, the resolution of the returned promise will be delayed until the promise
-		 * returned from callback is finished.
+		 * The then method from the Promises/A+ specification, with an additional progress handler.
 		 */
-		fin(finallyCallback: () => any): Promise<T>;
+		then<U>(onFulfill?: ((value: T) => IWhenable<U>) | null, onReject?: ((error: any) => IWhenable<U>) | null, onProgress?: ((progress: any) => any) | null): Promise<U>;
 
 		/**
-		 * Like a finally clause, allows you to observe either the fulfillment or rejection of a promise, but to do so without modifying the final value. This is useful for collecting resources
-		 * regardless of whether a job succeeded, like closing a database connection, shutting a server down, or deleting an unneeded key from an object. finally returns a promise, which will become
-		 * resolved with the same fulfillment value or rejection reason as promise. However, if callback returns a promise, the resolution of the returned promise will be delayed until the promise
-		 * returned from callback is finished.
+		 * Like a finally clause, allows you to observe either the fulfillment or rejection of a promise, but to do so
+		 * without modifying the final value. This is useful for collecting resources regardless of whether a job succeeded,
+		 * like closing a database connection, shutting a server down, or deleting an unneeded key from an object.
+		 * finally returns a promise, which will become resolved with the same fulfillment value or rejection reason
+		 * as promise. However, if callback returns a promise, the resolution of the returned promise will be delayed
+		 * until the promise returned from callback is finished. Furthermore, if the returned promise rejects, that
+		 * rejection will be passed down the chain instead of the previous result.
 		 */
 		finally(finallyCallback: () => any): Promise<T>;
 
 		/**
-		 * The then method from the Promises/A+ specification, with an additional progress handler.
+		 * Alias for finally() (for non-ES5 browsers)
 		 */
-		then<U>(onFulfill?: (value: T) => IWhenable<U>, onReject?: (error: any) => IWhenable<U>, onProgress?: (progress: any) => any): Promise<U>;
+		fin(finallyCallback: () => any): Promise<T>;
 
 		/**
-		 * Like then, but "spreads" the array into a variadic fulfillment handler. If any of the promises in the array are rejected, instead calls onRejected with the first rejected promise's
-		 * rejection reason.
-		 *
+		 * Like then, but "spreads" the array into a variadic fulfillment handler. If any of the promises in the array are
+		 * rejected, instead calls onRejected with the first rejected promise's rejection reason.
 		 * This is especially useful in conjunction with all
 		 */
 		spread<U>(onFulfill: (...args: any[]) => IWhenable<U>, onReject?: (reason: any) => IWhenable<U>): Promise<U>;
 
-		fail<U>(onRejected: (reason: any) => IWhenable<U>): Promise<U>;
-
 		/**
 		 * A sugar method, equivalent to promise.then(undefined, onRejected).
 		 */
 		catch<U>(onRejected: (reason: any) => IWhenable<U>): Promise<U>;
 
+		/**
+		 * Alias for catch() (for non-ES5 browsers)
+		 */
+		fail<U>(onRejected: (reason: any) => IWhenable<U>): Promise<U>;
+
 		/**
 		 * A sugar method, equivalent to promise.then(undefined, undefined, onProgress).
 		 */
 		progress(onProgress: (progress: any) => any): Promise<T>;
 
 		/**
-		 * Much like then, but with different behavior around unhandled rejection. If there is an unhandled rejection, either because promise is rejected and no onRejected callback was provided, or
-		 * because onFulfilled or onRejected threw an error or returned a rejected promise, the resulting rejection reason is thrown as an exception in a future turn of the event loop.
-		 *
-		 * This method should be used to terminate chains of promises that will not be passed elsewhere. Since exceptions thrown in then callbacks are consumed and transformed into rejections,
-		 * exceptions at the end of the chain are easy to accidentally, silently ignore. By arranging for the exception to be thrown in a future turn of the event loop, so that it won't be caught, it
-		 * causes an onerror event on the browser window, or an uncaughtException event on Node.js's process object.
-		 *
-		 * Exceptions thrown by done will have long stack traces, if Q.longStackSupport is set to true. If Q.onerror is set, exceptions will be delivered there instead of thrown in a future turn.
-		 *
-		 * The Golden Rule of done vs. then usage is: either return your promise to someone else, or if the chain ends with you, call done to terminate it.
+		 * Much like then, but with different behavior around unhandled rejection. If there is an unhandled rejection,
+		 * either because promise is rejected and no onRejected callback was provided, or because onFulfilled or onRejected
+		 * threw an error or returned a rejected promise, the resulting rejection reason is thrown as an exception in a
+		 * future turn of the event loop.
+		 * This method should be used to terminate chains of promises that will not be passed elsewhere. Since exceptions
+		 * thrown in then callbacks are consumed and transformed into rejections, exceptions at the end of the chain are
+		 * easy to accidentally, silently ignore. By arranging for the exception to be thrown in a future turn of the
+		 * event loop, so that it won't be caught, it causes an onerror event on the browser window, or an uncaughtException
+		 * event on Node.js's process object.
+		 * Exceptions thrown by done will have long stack traces, if Q.longStackSupport is set to true. If Q.onerror is set,
+		 * exceptions will be delivered there instead of thrown in a future turn.
+		 * The Golden Rule of done vs. then usage is: either return your promise to someone else, or if the chain ends
+		 * with you, call done to terminate it. Terminating with catch is not sufficient because the catch handler may
+		 * itself throw an error.
 		 */
-		done(onFulfilled?: (value: T) => any, onRejected?: (reason: any) => any, onProgress?: (progress: any) => any): void;
+		done(onFulfilled?: ((value: T) => any) | null, onRejected?: ((reason: any) => any) | null, onProgress?: ((progress: any) => any) | null): void;
 
 		/**
-		 * If callback is a function, assumes it's a Node.js-style callback, and calls it as either callback(rejectionReason) when/if promise becomes rejected, or as callback(null, fulfillmentValue)
-		 * when/if promise becomes fulfilled. If callback is not a function, simply returns promise.
+		 * If callback is a function, assumes it's a Node.js-style callback, and calls it as either callback(rejectionReason)
+		 * when/if promise becomes rejected, or as callback(null, fulfillmentValue) when/if promise becomes fulfilled.
+		 * If callback is not a function, simply returns promise.
 		 */
 		nodeify(callback: (reason: any, value: any) => void): Promise<T>;
 
@@ -112,8 +138,8 @@ declare namespace Q {
 		delete<U>(propertyName: string): Promise<U>;
 
 		/**
-		 * Returns a promise for the result of calling the named method of an object with the given array of arguments. The object itself is this in the function, just like a synchronous method call.
-		 * Essentially equivalent to
+		 * Returns a promise for the result of calling the named method of an object with the given array of arguments.
+		 * The object itself is this in the function, just like a synchronous method call. Essentially equivalent to
 		 *
 		 * @example
 		 * promise.then(function (o) { return o[methodName].apply(o, args); });
@@ -121,14 +147,11 @@ declare namespace Q {
 		post<U>(methodName: string, args: any[]): Promise<U>;
 
 		/**
-		 * Returns a promise for the result of calling the named method of an object with the given variadic arguments. The object itself is this in the function, just like a synchronous method call.
+		 * Returns a promise for the result of calling the named method of an object with the given variadic arguments.
+		 * The object itself is this in the function, just like a synchronous method call.
 		 */
 		invoke<U>(methodName: string, ...args: any[]): Promise<U>;
 
-		fapply<U>(args: any[]): Promise<U>;
-
-		fcall<U>(...args: any[]): Promise<U>;
-
 		/**
 		 * Returns a promise for an array of the property names of an object. Essentially equivalent to
 		 *
@@ -137,6 +160,35 @@ declare namespace Q {
 		 */
 		keys(): Promise<string[]>;
 
+		/**
+		 * Returns a promise for the result of calling a function, with the given array of arguments. Essentially equivalent to
+		 *
+		 * @example
+		 * promise.then(function (f) {
+		 *     return f.apply(undefined, args);
+		 * });
+		 */
+		fapply<U>(args: any[]): Promise<U>;
+
+		/**
+		 * Returns a promise for the result of calling a function, with the given variadic arguments. Has the same return
+		 * value/thrown exception translation as explained above for fbind.
+		 * In its static form, it is aliased as Q.try, since it has semantics similar to a try block (but handling both
+		 * synchronous exceptions and asynchronous rejections). This allows code like
+		 *
+		 * @example
+		 * Q.try(function () {
+		 *     if (!isConnectedToCloud()) {
+		 *         throw new Error("The cloud is down!");
+		 *     }
+		 *     return syncToCloud();
+		 * })
+		 * .catch(function (error) {
+		 *     console.error("Couldn't sync to the cloud", error);
+		 * });
+		 */
+		fcall<U>(...args: any[]): Promise<U>;
+
 		/**
 		 * A sugar method, equivalent to promise.then(function () { return value; }).
 		 */
@@ -148,30 +200,39 @@ declare namespace Q {
 		thenReject<U = T>(reason?: any): Promise<U>;
 
 		/**
-		 * Attaches a handler that will observe the value of the promise when it becomes fulfilled, returning a promise for that same value, perhaps deferred but not replaced by the promise returned
-		 * by the onFulfilled handler.
+		 * Attaches a handler that will observe the value of the promise when it becomes fulfilled, returning a promise for
+		 * that same value, perhaps deferred but not replaced by the promise returned by the onFulfilled handler.
 		 */
 		tap(onFulfilled: (value: T) => any): Promise<T>;
 
+		/**
+		 * Returns a promise that will have the same result as promise, except that if promise is not fulfilled or rejected
+		 * before ms milliseconds, the returned promise will be rejected with an Error with the given message. If message
+		 * is not supplied, the message will be "Timed out after " + ms + " ms".
+		 */
 		timeout(ms: number, message?: string): Promise<T>;
 
 		/**
-		 * Returns a promise that will have the same result as promise, but will only be fulfilled or rejected after at least ms milliseconds have passed.
+		 * Returns a promise that will have the same result as promise, but will only be fulfilled or rejected after at least
+		 * ms milliseconds have passed.
 		 */
 		delay(ms: number): Promise<T>;
 
 		/**
-		 * Returns whether a given promise is in the fulfilled state. When the static version is used on non-promises, the result is always true.
+		 * Returns whether a given promise is in the fulfilled state. When the static version is used on non-promises, the
+		 * result is always true.
 		 */
 		isFulfilled(): boolean;
 
 		/**
-		 * Returns whether a given promise is in the rejected state. When the static version is used on non-promises, the result is always false.
+		 * Returns whether a given promise is in the rejected state. When the static version is used on non-promises, the
+		 * result is always false.
 		 */
 		isRejected(): boolean;
 
 		/**
-		 * Returns whether a given promise is in the pending state. When the static version is used on non-promises, the result is always false.
+		 * Returns whether a given promise is in the pending state. When the static version is used on non-promises, the
+		 * result is always false.
 		 */
 		isPending(): boolean;
 
@@ -193,6 +254,30 @@ declare namespace Q {
 		reason?: any;
 	}
 
+	/**
+	 * Returns a "deferred" object with a:
+	 * promise property
+	 * resolve(value) method
+	 * reject(reason) method
+	 * notify(value) method
+	 * makeNodeResolver() method
+	 */
+	export function defer<T>(): Deferred<T>;
+
+	/**
+	 * Calling resolve with a pending promise causes promise to wait on the passed promise, becoming fulfilled with its
+	 * fulfillment value or rejected with its rejection reason (or staying pending forever, if the passed promise does).
+	 * Calling resolve with a rejected promise causes promise to be rejected with the passed promise's rejection reason.
+	 * Calling resolve with a fulfilled promise causes promise to be fulfilled with the passed promise's fulfillment value.
+	 * Calling resolve with a non-promise value causes promise to be fulfilled with that value.
+	 */
+	export function resolve<T>(object?: IWhenable<T>): Promise<T>;
+
+	/**
+	 * Returns a promise that is rejected with reason.
+	 */
+	export function reject<T>(reason?: any): Promise<T>;
+
 	// If no value provided, returned promise will be of void type
 	export function when(): Promise<void>;
 
@@ -200,38 +285,168 @@ declare namespace Q {
 	export function when<T>(value: IWhenable<T>): Promise<T>;
 
 	// If a non-promise value is provided, it will not reject or progress
-	export function when<T, U>(value: IWhenable<T>, onFulfilled: (val: T) => IWhenable<U>, onRejected?: (reason: any) => IWhenable<U>, onProgress?: (progress: any) => any): Promise<U>;
+	export function when<T, U>(value: IWhenable<T>, onFulfilled: (val: T) => IWhenable<U>, onRejected?: ((reason: any) => IWhenable<U>) | null, onProgress?: ((progress: any) => any) | null): Promise<U>;
 
+	/**
+	 * (Deprecated) Returns a new function that calls a function asynchronously with the given variadic arguments, and returns a promise.
+	 * Notably, any synchronous return values or thrown exceptions are transformed, respectively, into fulfillment values
+	 * or rejection reasons for the promise returned by this new function.
+	 * This method is especially useful in its static form for wrapping functions to ensure that they are always
+	 * asynchronous, and that any thrown exceptions (intentional or accidental) are appropriately transformed into a
+	 * returned rejected promise. For example:
+	 *
+	 * @example
+	 * var getUserData = Q.fbind(function (userName) {
+	 *     if (!userName) {
+	 *         throw new Error("userName must be truthy!");
+	 *     }
+	 *     if (localCache.has(userName)) {
+	 *         return localCache.get(userName);
+	 *     }
+	 *     return getUserFromCloud(userName);
+	 * });
+	 */
 	export function fbind<T>(method: (...args: any[]) => IWhenable<T>, ...args: any[]): (...args: any[]) => Promise<T>;
 
+	/**
+	 * Returns a promise for the result of calling a function, with the given variadic arguments. Has the same return
+	 * value/thrown exception translation as explained above for fbind.
+	 * In its static form, it is aliased as Q.try, since it has semantics similar to a try block (but handling both synchronous
+	 * exceptions and asynchronous rejections). This allows code like
+	 *
+	 * @example
+	 * Q.try(function () {
+	 *     if (!isConnectedToCloud()) {
+	 *         throw new Error("The cloud is down!");
+	 *     }
+	 *     return syncToCloud();
+	 * })
+	 * .catch(function (error) {
+	 *     console.error("Couldn't sync to the cloud", error);
+	 * });
+	 */
 	export function fcall<T>(method: (...args: any[]) => T, ...args: any[]): Promise<T>;
 
-	// Try is an alias for fcall, but 'try' is a reserved word.  This is the only way to get around this
+	// but 'try' is a reserved word.  This is the only way to get around this
+	/**
+	 * Alias for fcall()
+	 */
 	export {fcall as try};
 
-	export function send<T>(obj: any, functionName: string, ...args: any[]): Promise<T>;
-
+	/**
+	 * Returns a promise for the result of calling the named method of an object with the given variadic arguments.
+	 * The object itself is this in the function, just like a synchronous method call.
+	 */
 	export function invoke<T>(obj: any, functionName: string, ...args: any[]): Promise<T>;
 
+	/**
+	 * Alias for invoke()
+	 */
+	export function send<T>(obj: any, functionName: string, ...args: any[]): Promise<T>;
+
+	/**
+	 * Alias for invoke()
+	 */
 	export function mcall<T>(obj: any, functionName: string, ...args: any[]): Promise<T>;
 
-	export function denodeify<T>(nodeFunction: (...args: any[]) => any, ...args: any[]): (...args: any[]) => Promise<T>;
-
-	export function nbind<T>(nodeFunction: (...args: any[]) => any, thisArg: any, ...args: any[]): (...args: any[]) => Promise<T>;
-
+	/**
+	 * Creates a promise-returning function from a Node.js-style function, optionally binding it with the given
+	 * variadic arguments. An example:
+	 *
+	 * @example
+	 * var readFile = Q.nfbind(FS.readFile);
+	 * readFile("foo.txt", "utf-8").done(function (text) {
+	 *     //...
+	 * });
+	 *
+	 * Note that if you have a method that uses the Node.js callback pattern, as opposed to just a function, you will
+	 * need to bind its this value before passing it to nfbind, like so:
+	 *
+	 * @example
+	 * var Kitty = mongoose.model("Kitty");
+	 * var findKitties = Q.nfbind(Kitty.find.bind(Kitty));
+	 *
+	 * The better strategy for methods would be to use Q.nbind, as shown below.
+	 */
 	export function nfbind<T>(nodeFunction: (...args: any[]) => any, ...args: any[]): (...args: any[]) => Promise<T>;
 
-	export function nfcall<T>(nodeFunction: (...args: any[]) => any, ...args: any[]): Promise<T>;
+	/**
+	 * Alias for nfbind()
+	 */
+	export function denodeify<T>(nodeFunction: (...args: any[]) => any, ...args: any[]): (...args: any[]) => Promise<T>;
 
+	/**
+	 * Creates a promise-returning function from a Node.js-style method, optionally binding it with the given
+	 * variadic arguments. An example:
+	 *
+	 * @example
+	 * var Kitty = mongoose.model("Kitty");
+	 * var findKitties = Q.nbind(Kitty.find, Kitty);
+	 * findKitties({ cute: true }).done(function (theKitties) {
+	 *     //...
+	 * });
+	 */
+	export function nbind<T>(nodeFunction: (...args: any[]) => any, thisArg: any, ...args: any[]): (...args: any[]) => Promise<T>;
+
+	/**
+	 * Calls a Node.js-style function with the given array of arguments, returning a promise that is fulfilled if the
+	 * Node.js function calls back with a result, or rejected if it calls back with an error
+	 * (or throws one synchronously). An example:
+	 *
+	 * @example
+	 * Q.nfapply(FS.readFile, ["foo.txt", "utf-8"]).done(function (text) {
+	 * });
+	 *
+	 * Note that this example only works because FS.readFile is a function exported from a module, not a method on
+	 * an object. For methods, e.g. redisClient.get, you must bind the method to an instance before passing it to
+	 * Q.nfapply (or, generally, as an argument to any function call):
+	 *
+	 * @example
+	 * Q.nfapply(redisClient.get.bind(redisClient), ["user:1:id"]).done(function (user) {
+	 * });
+	 *
+	 * The better strategy for methods would be to use Q.npost, as shown below.
+	 */
 	export function nfapply<T>(nodeFunction: (...args: any[]) => any, args: any[]): Promise<T>;
 
-	export function ninvoke<T>(nodeModule: any, functionName: string, ...args: any[]): Promise<T>;
+	/**
+	 * Calls a Node.js-style function with the given variadic arguments, returning a promise that is fulfilled if the
+	 * Node.js function calls back with a result, or rejected if it calls back with an error
+	 * (or throws one synchronously). An example:
+	 *
+	 * @example
+	 * Q.nfcall(FS.readFile, "foo.txt", "utf-8").done(function (text) {
+	 * });
+	 *
+	 * The same warning about functions vs. methods applies for nfcall as it does for nfapply. In this case, the better
+	 * strategy would be to use Q.ninvoke.
+	 */
+	export function nfcall<T>(nodeFunction: (...args: any[]) => any, ...args: any[]): Promise<T>;
 
+	/**
+	 * Calls a Node.js-style method with the given arguments array, returning a promise that is fulfilled if the method
+	 * calls back with a result, or rejected if it calls back with an error (or throws one synchronously). An example:
+	 *
+	 * @example
+	 * Q.npost(redisClient, "get", ["user:1:id"]).done(function (user) {
+	 * });
+	 */
 	export function npost<T>(nodeModule: any, functionName: string, args: any[]): Promise<T>;
 
-	export function nsend<T>(nodeModule: any, functionName: string, ...args: any[]): Promise<T>;
+	/**
+	 * Calls a Node.js-style method with the given variadic arguments, returning a promise that is fulfilled if the
+	 * method calls back with a result, or rejected if it calls back with an error (or throws one synchronously). An example:
+	 *
+	 * @example
+	 * Q.ninvoke(redisClient, "get", "user:1:id").done(function (user) {
+	 * });
+	 */
+	export function ninvoke<T>(nodeModule: any, functionName: string, ...args: any[]): Promise<T>;
 
-	export function nmcall<T>(nodeModule: any, functionName: string, ...args: any[]): Promise<T>;
+	/**
+	 * Alias for ninvoke()
+	 */
+	export function nsend<T>(nodeModule: any, functionName: string, ...args: any[]): Promise<T>;
 
 	/**
 	 * Returns a promise that is fulfilled with an array containing the fulfillment value of each promise, or is rejected with the same rejection reason as the first promise to be rejected.
@@ -267,21 +482,27 @@ declare namespace Q {
 	export function race<T>(promises: Array<IWhenable<T>>): Promise<T>;
 
 	/**
-	 * Returns a promise that is fulfilled with an array of promise state snapshots, but only after all the original promises have settled, i.e. become either fulfilled or rejected.
+	 * Returns a promise that is fulfilled with an array of promise state snapshots, but only after all the original promises
+	 * have settled, i.e. become either fulfilled or rejected.
 	 */
 	export function allSettled<T>(promises: IWhenable<Array<IWhenable<T>>>): Promise<Array<PromiseState<T>>>;
 
+	/**
+	 * Deprecated Alias for allSettled()
+	 */
 	export function allResolved<T>(promises: IWhenable<Array<IWhenable<T>>>): Promise<Array<Promise<T>>>;
 
 	/**
-	 * Like then, but "spreads" the array into a variadic fulfillment handler. If any of the promises in the array are rejected, instead calls onRejected with the first rejected promise's rejection
-	 * reason. This is especially useful in conjunction with all.
+	 * Like then, but "spreads" the array into a variadic fulfillment handler. If any of the promises in the array are
+	 * rejected, instead calls onRejected with the first rejected promise's rejection reason. This is especially useful
+	 * in conjunction with all.
 	 */
 	export function spread<T, U>(promises: Array<IWhenable<T>>, onFulfilled: (...args: T[]) => IWhenable<U>, onRejected?: (reason: any) => IWhenable<U>): Promise<U>;
 
 	/**
-	 * Returns a promise that will have the same result as promise, except that if promise is not fulfilled or rejected before ms milliseconds, the returned promise will be rejected with an Error
-	 * with the given message. If message is not supplied, the message will be "Timed out after " + ms + " ms".
+	 * Returns a promise that will have the same result as promise, except that if promise is not fulfilled or rejected
+	 * before ms milliseconds, the returned promise will be rejected with an Error with the given message. If message
+	 * is not supplied, the message will be "Timed out after " + ms + " ms".
 	 */
 	export function timeout<T>(promise: Promise<T>, ms: number, message?: string): Promise<T>;
 
@@ -310,75 +531,64 @@ declare namespace Q {
 	export function isPending(promiseOrObject: Promise<any> | any): boolean;
 
 	/**
-	 * Returns a "deferred" object with a:
-	 * promise property
-	 * resolve(value) method
-	 * reject(reason) method
-	 * notify(value) method
-	 * makeNodeResolver() method
+	 * Synchronously calls resolver(resolve, reject, notify) and returns a promise whose state is controlled by the
+	 * functions passed to resolver. This is an alternative promise-creation API that has the same power as the deferred
+	 * concept, but without introducing another conceptual entity.
+	 * If resolver throws an exception, the returned promise will be rejected with that thrown exception as the rejection reason.
+	 * note: In the latest github, this method is called Q.Promise, but if you are using the npm package version 0.9.7
+	 * or below, the method is called Q.promise (lowercase vs uppercase p).
 	 */
-	export function defer<T>(): Deferred<T>;
-
-	/**
-	 * Returns a promise that is rejected with reason.
-	 */
-	export function reject<T>(reason?: any): Promise<T>;
-
 	export function Promise<T>(resolver: (resolve: (val?: IWhenable<T>) => void, reject: (reason?: any) => void, notify: (progress: any) => void) => void): Promise<T>;
 
 	/**
-	 * Creates a new version of func that accepts any combination of promise and non-promise values, converting them to their fulfillment values before calling the original func. The returned version
-	 * also always returns a promise: if func does a return or throw, then Q.promised(func) will return fulfilled or rejected promise, respectively.
-	 *
-	 * This can be useful for creating functions that accept either promises or non-promise values, and for ensuring that the function always returns a promise even in the face of unintentional
-	 * thrown exceptions.
+	 * Creates a new version of func that accepts any combination of promise and non-promise values, converting them to their
+	 * fulfillment values before calling the original func. The returned version also always returns a promise: if func does
+	 * a return or throw, then Q.promised(func) will return fulfilled or rejected promise, respectively.
+	 * This can be useful for creating functions that accept either promises or non-promise values, and for ensuring that
+	 * the function always returns a promise even in the face of unintentional thrown exceptions.
 	 */
 	export function promised<T>(callback: (...args: any[]) => T): (...args: any[]) => Promise<T>;
 
 	/**
 	 * Returns whether the given value is a Q promise.
 	 */
-	export function isPromise(object: any): boolean;
+	export function isPromise(object: any): object is Promise<any>;
 
 	/**
 	 * Returns whether the given value is a promise (i.e. it's an object with a then function).
 	 */
-	export function isPromiseAlike(object: any): boolean;
+    export function isPromiseAlike(object: any): object is IPromise<any>;
 
 	/**
 	 * If an object is not a promise, it is as "near" as possible.
 	 * If a promise is rejected, it is as "near" as possible too.
-	 * If it’s a fulfilled promise, the fulfillment value is nearer.
-	 * If it’s a deferred promise and the deferred has been resolved, the
+	 * If it's a fulfilled promise, the fulfillment value is nearer.
+	 * If it's a deferred promise and the deferred has been resolved, the
 	 * resolution is "nearer".
 	 */
 	export function nearer<T>(promise: Promise<T>): T;
 
 	/**
-	 * This is an experimental tool for converting a generator function into a deferred function. This has the potential of reducing nested callbacks in engines that support yield.
+	 * This is an experimental tool for converting a generator function into a deferred function. This has the potential
+	 * of reducing nested callbacks in engines that support yield.
 	 */
 	export function async<T>(generatorFunction: any): (...args: any[]) => Promise<T>;
 
 	export function nextTick(callback: (...args: any[]) => any): void;
 
 	/**
-	 * A settable property that will intercept any uncaught errors that would otherwise be thrown in the next tick of the event loop, usually as a result of done. Can be useful for getting the full
+	 * A settable property that will intercept any uncaught errors that would otherwise be thrown in the next tick of the
+	 * event loop, usually as a result of done. Can be useful for getting the full
 	 * stack trace of an error in browsers, which is not usually possible with window.onerror.
 	 */
 	export let onerror: (reason: any) => void;
 	/**
-	 * A settable property that lets you turn on long stack trace support. If turned on, "stack jumps" will be tracked across asynchronous promise operations, so that if an uncaught error is thrown
-	 * by done or a rejection reason's stack property is inspected in a rejection callback, a long stack trace is produced.
+	 * A settable property that lets you turn on long stack trace support. If turned on, "stack jumps" will be tracked
+	 * across asynchronous promise operations, so that if an uncaught error is thrown by done or a rejection reason's stack
+	 * property is inspected in a rejection callback, a long stack trace is produced.
 	 */
 	export let longStackSupport: boolean;
 
-	/**
-	 * Calling resolve with a pending promise causes promise to wait on the passed promise, becoming fulfilled with its fulfillment value or rejected with its rejection reason (or staying pending
-	 * forever, if the passed promise does). Calling resolve with a rejected promise causes promise to be rejected with the passed promise's rejection reason. Calling resolve with a fulfilled promise
-	 * causes promise to be fulfilled with the passed promise's fulfillment value. Calling resolve with a non-promise value causes promise to be fulfilled with that value.
-	 */
-	export function resolve<T>(object?: IWhenable<T>): Promise<T>;
-
 	/**
 	 * Resets the global "Q" variable to the value it has before Q was loaded.
 	 * This will either be undefined if there was no version or the version of Q which was already loaded before.
diff --git a/types/q/q-tests.ts b/types/q/q-tests.ts
index c0c29d9642..226d86ced8 100644
--- a/types/q/q-tests.ts
+++ b/types/q/q-tests.ts
@@ -1,18 +1,20 @@
 /// <reference types="jquery" />
 
-import Q = require('q');
+import Q = require("q");
 
-Q(8).then(x => console.log(x.toExponential()));
+const _when: Q.IWhenable<number> = Q.resolve(0); // was an issue when strictFunctionTypes were enforced on all of DefinitelyTyped
+
+Q(8).then((x) => console.log(x.toExponential()));
 Q().then(() => console.log("nothing"));
 
-const delay = (delay: number) => {
+function delay(delay: number): Q.Promise<void> {
 	const d = Q.defer<void>();
 	setTimeout(d.resolve, delay);
 	return d.promise;
-};
+}
 
 Q.when(delay(1000), (val) => {
-	console.log('Hello, World!');
+	console.log("Hello, World!");
 	return;
 });
 
@@ -20,15 +22,15 @@ Q.when(delay(1000), (val) => {
 const otherPromise = Q.defer<string>().promise;
 Q.defer<string>().resolve(otherPromise);
 
-Q.timeout(Q(new Date()), 1000, "My dates never arrived. :(").then(d => d.toJSON());
+Q.timeout(Q(new Date()), 1000, "My dates never arrived. :(").then((d) => d.toJSON());
 
-Q.delay(Q(8), 1000).then(x => x.toExponential());
-Q.delay(8, 1000).then(x => x.toExponential());
-Q.delay(Q("asdf"), 1000).then(x => x.length);
-Q.delay("asdf", 1000).then(x => x.length);
+Q.delay(Q(8), 1000).then((x) => x.toExponential());
+Q.delay(8, 1000).then((x) => x.toExponential());
+Q.delay(Q("asdf"), 1000).then((x) => x.length);
+Q.delay("asdf", 1000).then((x) => x.length);
 
-const eventualAdd = Q.promised((a?: number, b?: number) => a + b);
-eventualAdd(Q(1), Q(2)).then(x => x.toExponential());
+const eventualAdd = Q.promised((a?: number, b?: number) => <number> a + <number> b);
+eventualAdd(Q(1), Q(2)).then((x) => x.toExponential());
 
 function eventually<T>(eventually: T) {
 	return Q.delay(eventually, 1000);
@@ -36,6 +38,7 @@ function eventually<T>(eventually: T) {
 
 const x = Q.all([1, 2, 3].map(eventually));
 Q.when(x, (x) => {
+	const _x: number[] = x;
 	console.log(x);
 });
 
@@ -81,10 +84,11 @@ Q.allResolved([])
 
 Q(42)
 	.tap(() => "hello")
-	.tap(x => {
+	.tap((x) => {
 		console.log(x);
 	})
-	.then(x => {
+	.then((x) => {
+		const _x: number = x;
 		console.log("42 == " + x);
 	});
 
@@ -94,34 +98,34 @@ declare let stringPromise: Q.IPromise<string>;
 declare function returnsNumPromise(text: string): Q.Promise<number>;
 declare function returnsNumPromise(text: string): JQueryPromise<number>;
 
-Q<number[]>(arrayPromise) // type specification required
-	.then(arr => arr.join(','))
-	.then<number>(returnsNumPromise) // requires specification
-	.then(num => num.toFixed());
+Q(arrayPromise)
+	.then((arr) => arr.join(','))
+	.then(returnsNumPromise) // requires specification
+	.then((num) => num.toFixed());
 
 declare let jPromise: JQueryPromise<string>;
 
 // if jQuery promises definition supported generics, this could be more interesting example
-Q<string>(jPromise).then(str => str.split(','));
+Q<string>(jPromise).then((str) => str.split(','));
 jPromise.then(returnsNumPromise);
 
 // watch the typing flow through from jQueryPromise to Q.Promise
-Q(jPromise).then(str => str.split(','));
+Q(jPromise).then((str) => str.split(','));
 
 declare let promiseArray: Array<Q.IPromise<number>>;
-const qPromiseArray = promiseArray.map(p => {
+const qPromiseArray = promiseArray.map((p) => {
 	return Q<number>(p);
 });
 const myNums: any[] = [2, 3, Q(4), 5, Q(6), Q(7)];
 
-Q.all(promiseArray).then(nums => nums.map(num => num.toPrecision(2)).join(','));
+Q.all(promiseArray).then((nums) => nums.map((num) => num.toPrecision(2)).join(','));
 
-Q.all<number>(myNums).then(nums => nums.map(Math.round));
+Q.all<number>(myNums).then((nums) => nums.map(Math.round));
 
-Q.fbind((dateString?: string) => new Date(dateString), "11/11/1991")().then(d => d.toLocaleDateString());
+Q.fbind((dateString?: string) => new Date(<string> dateString), "11/11/1991")().then((d) => d.toLocaleDateString());
 
-Q.when(8, num => num + "!");
-Q.when(Q(8), num => num + "!").then(str => str.split(','));
+Q.when(8, (num) => num + "!");
+Q.when(Q(8), (num) => num + "!").then((str) => str.split(','));
 const voidPromise: Q.Promise<void> = Q.when();
 
 declare function saveToDisk(): Q.Promise<any>;
@@ -147,22 +151,27 @@ Q.nfapply<string>(nodeStyle, ["foo"]).done((result: string) => {
 });
 Q.nfcall<string>(nodeStyle, "foo").done((result: string) => {
 });
-Q.denodeify<string>(nodeStyle)('foo').done((result: string) => {
+Q.denodeify<string>(nodeStyle)("foo").done((result: string) => {
 });
-Q.nfbind<string>(nodeStyle)('foo').done((result: string) => {
+Q.nfbind<string>(nodeStyle)("foo").done((result: string) => {
 });
 
+interface Kitty {
+	name: string;
+	cute: boolean;
+}
+
 class Repo {
-	private readonly items: any[] = [
-		{name: 'Max', cute: false},
-		{name: 'Annie', cute: true}
+	private readonly items: Kitty[] = [
+		{name: "Max", cute: false},
+		{name: "Annie", cute: true}
 	];
 
-	find(options: any): Q.Promise<any[]> {
+	find(options: {[K in keyof Kitty]: Kitty[K] }): Q.Promise<Kitty[]> {
 		let result = this.items;
 
 		for (const key in options) {
-			result = result.filter(i => i[key] === options[key]);
+			result = result.filter((i) => i[<keyof Kitty> key] === options[<keyof Kitty> key]);
 		}
 
 		return Q(result);
@@ -170,7 +179,8 @@ class Repo {
 }
 
 const kitty = new Repo();
-Q.nbind<any[]>(kitty.find, kitty)({cute: true}).done((kitties: any[]) => {
+Q.nbind<Kitty[]>(kitty.find, kitty)({ cute: true }).done((kitties) => {
+	const _kitties: Kitty[] = kitties;
 });
 
 /**
@@ -194,10 +204,6 @@ function TestCanRethrowRejectedPromises() {
 			.fail((error) => {
 				console.log("Intermediate error handling");
 
-				/*
-				 * Cannot do this, because:
-				 *     error TS2322: Type 'Promise<void>' is not assignable to type 'Promise<Foo>'
-				 */
 				return Q.reject<Foo>(error);
 			});
 	}
@@ -206,10 +212,14 @@ function TestCanRethrowRejectedPromises() {
 		.finally(() => {
 			console.log("Cleanup");
 		})
-		.done();
+		.done((foo) => {
+			const _foo: Foo = foo;
+		});
 }
 
-// test Q.Promise.all
+/**
+ * test Q.Promise.all
+ */
 const y1 = Q().then(() => {
 	const s = Q("hello");
 	const n = Q(1);
@@ -222,9 +232,9 @@ const y2 = Q().then(() => {
 	return <[typeof s, typeof n]> [s, n];
 });
 
-const p2: Q.Promise<[string, number]> = y1.then(val => Q.all(val));
+const p2: Q.Promise<[string, number]> = y1.then((val) => Q.all(val));
 const p3: Q.Promise<[string, number]> = Q.all(y1);
-const p5: Q.Promise<[string, number]> = y2.then(val => Q.all(val));
+const p5: Q.Promise<[string, number]> = y2.then((val) => Q.all(val));
 const p6: Q.Promise<[string, number]> = Q.all(y2);
 
 Q.try(() => {
@@ -238,8 +248,8 @@ Q.try(() => {
 // thenReject, returning a Promise of the same type as the Promise it is called on
 function thenRejectSameType(arg: any): Q.Promise<number> {
 	if (!arg) {
-		return returnsNumPromise('')
-			.thenReject(new Error('failed'));
+		return returnsNumPromise("")
+			.thenReject(new Error("failed"));
 	}
 	return Q.resolve(2);
 }
@@ -248,10 +258,10 @@ function thenRejectSameType(arg: any): Q.Promise<number> {
 // The generic type argument is specified.
 function thenRejectSpecificOtherType(arg: any): Q.Promise<string> {
 	if (!arg) {
-		return returnsNumPromise('')
-			.thenReject<string>(new Error('failed'));
+		return returnsNumPromise("")
+			.thenReject<string>(new Error("failed"));
 	}
-	return Q.resolve('');
+	return Q.resolve("");
 }
 
 // thenReject, returning a Promise of a different type to the Promise it is called on.
@@ -262,9 +272,9 @@ function thenRejectSpecificOtherType(arg: any): Q.Promise<string> {
 /*
 function thenRejectInferredOtherType(arg: any): Q.Promise<string> {
 	if (!arg) {
-		return returnsNumPromise('')
-			.thenReject(new Error('failed'));
+		return returnsNumPromise("")
+			.thenReject(new Error("failed"));
 	}
-	return Q.resolve('');
+	return Q.resolve("");
 }
 */
diff --git a/types/q/tsconfig.json b/types/q/tsconfig.json
index d78aa85a14..ba7c0d33d6 100644
--- a/types/q/tsconfig.json
+++ b/types/q/tsconfig.json
@@ -7,8 +7,8 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": false,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"

From b2d16a83b3a76d63e80548b437eaa707ae144302 Mon Sep 17 00:00:00 2001
From: Jiaren Liu <jrliu@alauda.io>
Date: Sun, 25 Mar 2018 11:04:38 +0800
Subject: [PATCH 0828/1382] add resourceQuery for webpack loader

---
 types/webpack/index.d.ts       | 2 ++
 types/webpack/webpack-tests.ts | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/types/webpack/index.d.ts b/types/webpack/index.d.ts
index c6f4ae6c12..8c93019f24 100644
--- a/types/webpack/index.d.ts
+++ b/types/webpack/index.d.ts
@@ -421,6 +421,8 @@ declare namespace webpack {
         include?: Condition | Condition[];
         /** A Condition matched with the resource. */
         resource?: Condition | Condition[];
+        /** A Condition matched with the resource query. */
+        resourceQuery?: Condition | Condition[];
         /** A condition matched with the issuer */
         issuer?: Condition | Condition[];
         /**
diff --git a/types/webpack/webpack-tests.ts b/types/webpack/webpack-tests.ts
index 971df8cd78..4ce24fb25d 100644
--- a/types/webpack/webpack-tests.ts
+++ b/types/webpack/webpack-tests.ts
@@ -145,6 +145,15 @@ rule = {
     loader: "babel-loader"
 };
 
+rule = {
+    test: /\.css$/,
+    resourceQuery: /module/,
+    loader: 'css-loader',
+    options: {
+        modules: true
+    }
+};
+
 declare const require: any;
 declare const path: any;
 configuration = {

From e203ff0b228cc5800c54c0d5f67dcb0659120e27 Mon Sep 17 00:00:00 2001
From: Llorenc Muntaner <llorenc.muntaner@onedot.com>
Date: Sun, 25 Mar 2018 08:44:04 +0200
Subject: [PATCH 0829/1382] react-data-grid: add missing GridProp
 headerFiltersHeight

---
 types/react-data-grid/index.d.ts | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/types/react-data-grid/index.d.ts b/types/react-data-grid/index.d.ts
index 27f12bccb6..af6edce257 100644
--- a/types/react-data-grid/index.d.ts
+++ b/types/react-data-grid/index.d.ts
@@ -97,6 +97,11 @@ declare namespace AdazzleReactDataGrid {
          * @default rowHeight
          */
         headerRowHeight?: number
+        /**
+         * The height of the header filter row in pixels.
+         * @default 45
+         */
+        headerFiltersHeight?: number
         /**
          * The minimum width of each column in pixels.
          * @default 80
@@ -163,11 +168,11 @@ declare namespace AdazzleReactDataGrid {
         enableCellSelect?: boolean
 
         /**
-         * Enables cells to be dragged and dropped 
+         * Enables cells to be dragged and dropped
          * @default false
          */
         enableDragAndDrop?: boolean
-        
+
         /**
          * Called when a cell is selected.
          * @param coordinates The row and column indices of the selected cell.
@@ -211,10 +216,10 @@ declare namespace AdazzleReactDataGrid {
          * @param props OnRowExpandToggle object
          */
         onRowExpandToggle?: (props: OnRowExpandToggle ) => void
-        
+
         /**
          * Responsible for returning an Array of values that can be used for filtering
-         * a column that is column.filterable and using a column.filterRenderer that 
+         * a column that is column.filterable and using a column.filterRenderer that
          * displays a list of options.
          * @param columnKey the column key that we are looking to pull values from
          */
@@ -485,7 +490,7 @@ declare namespace AdazzleReactDataGrid {
      * Excel-like grid component built with React, with editors, keyboard navigation, copy & paste, and the like
      * http://adazzle.github.io/react-data-grid/
      */
-    export class ReactDataGrid extends React.Component<GridProps> { 
+    export class ReactDataGrid extends React.Component<GridProps> {
         /**
          * Opens the editor for the cell (idx) in the given row (rowIdx). If the column is not editable then nothing will happen.
          */

From c6ff674097975aa2d1f356dfcdba921679e9c96e Mon Sep 17 00:00:00 2001
From: Siim Tiilen <siim.tiilen@ekspressdigital.eu>
Date: Sun, 25 Mar 2018 13:23:08 +0300
Subject: [PATCH 0830/1382] jwplayer code is now located in github

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

diff --git a/types/jwplayer/index.d.ts b/types/jwplayer/index.d.ts
index cb40e26da7..5be14b2733 100644
--- a/types/jwplayer/index.d.ts
+++ b/types/jwplayer/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for JW Player V8.0
-// Project: http://developer.longtailvideo.com/trac/
+// Project: https://github.com/jwplayer/jwplayer/
 // Definitions by: Martin Duparc <https://github.com/martinduparc>
 //                 Tomer Kruvi <https://github.com/kutomer>
 //                 Philipp Gürtler <https://github.com/philippguertler>

From f90b2f5f147ccb6280f8804aadc7ab3fa7d92cc4 Mon Sep 17 00:00:00 2001
From: Siim Tiilen <siim.tiilen@ekspressdigital.eu>
Date: Sun, 25 Mar 2018 13:24:53 +0300
Subject: [PATCH 0831/1382] fix indent for getContainer and getEnvironment

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

diff --git a/types/jwplayer/index.d.ts b/types/jwplayer/index.d.ts
index 5be14b2733..58c656956c 100644
--- a/types/jwplayer/index.d.ts
+++ b/types/jwplayer/index.d.ts
@@ -255,8 +255,8 @@ interface JWPlayer {
 	getSafeRegion(): Region;
 	getState(): string;
 	getVolume(): number;
-  getContainer(): HTMLElement;
-  getEnvironment(): Environment;
+	getContainer(): HTMLElement;
+	getEnvironment(): Environment;
 	getWidth(): number;
 	load(playlist: any[]): void;
 	load(playlist: string): void;

From 010136012882e6409764cbda9d9a0a6d118480c0 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Sun, 25 Mar 2018 13:06:31 +0200
Subject: [PATCH 0832/1382] fix: `shebang` should be optional in `ParseOptions`

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

diff --git a/types/uglify-js/index.d.ts b/types/uglify-js/index.d.ts
index cab53cb4db..12bcefa7af 100644
--- a/types/uglify-js/index.d.ts
+++ b/types/uglify-js/index.d.ts
@@ -10,7 +10,7 @@ export interface ParseOptions {
     bare_returns?: boolean;
     html5_comments?: boolean;
     /** Support `#!command` as the first line */
-    shebang: boolean;
+    shebang?: boolean;
 }
 
 export interface CompressOptions {

From d18f4a1d002538fd53a44d109c152879170f6f99 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Sun, 25 Mar 2018 13:16:16 +0200
Subject: [PATCH 0833/1382] fix: add `warnings` to `MinifyOutput`

---
 types/uglify-js/index.d.ts         | 1 +
 types/uglify-js/uglify-js-tests.ts | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/types/uglify-js/index.d.ts b/types/uglify-js/index.d.ts
index 12bcefa7af..eca756bd53 100644
--- a/types/uglify-js/index.d.ts
+++ b/types/uglify-js/index.d.ts
@@ -198,6 +198,7 @@ export interface MinifyOptions {
 
 export interface MinifyOutput {
     error?: Error;
+    warnings?: string[];
     code: string;
     map: string;
 }
diff --git a/types/uglify-js/uglify-js-tests.ts b/types/uglify-js/uglify-js-tests.ts
index 6b146ab0e7..19c11dfdf1 100644
--- a/types/uglify-js/uglify-js-tests.ts
+++ b/types/uglify-js/uglify-js-tests.ts
@@ -20,7 +20,7 @@ minify(code, {
     }
 });
 
-minify(code, {
+const output = minify(code, {
     warnings: 'verbose',
     mangle: {
         properties: {
@@ -34,3 +34,7 @@ minify(code, {
         arguments: true
     }
 });
+
+if (output.warnings) {
+    output.warnings.filter(x => x === 'Dropping unused variable');
+}

From 5cb7a9ee17d9f14518d7eb771e9ed4384a40fc45 Mon Sep 17 00:00:00 2001
From: Austin Turner <paustint@gmail.com>
Date: Sun, 25 Mar 2018 09:47:48 -0600
Subject: [PATCH 0834/1382] updated react-beautiful-dnd to 6.0

Included updates from version 5.0 and version 6.0 as per the docs:
https://github.com/atlassian/react-beautiful-dnd/releases/tag/v5.0.0
https://github.com/atlassian/react-beautiful-dnd/releases/tag/v6.0.0
---
 types/react-beautiful-dnd/index.d.ts          | 35 ++++++++++++-------
 .../react-beautiful-dnd-tests.tsx             | 16 ++++++---
 2 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/types/react-beautiful-dnd/index.d.ts b/types/react-beautiful-dnd/index.d.ts
index e1dd58a179..d02c86bbcf 100644
--- a/types/react-beautiful-dnd/index.d.ts
+++ b/types/react-beautiful-dnd/index.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for react-beautiful-dnd 4.0
+// Type definitions for react-beautiful-dnd 6.0
 // Project: https://github.com/atlassian/react-beautiful-dnd
 // Definitions by: varHarrie <https://github.com/varHarrie>
 //                 Bradley Ayers <https://github.com/bradleyayers>
+//                 Austin Turner <https://github.com/paustint>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -12,12 +13,18 @@ export type DraggableId = Id;
 export type DroppableId = Id;
 export type TypeId = Id;
 export type ZIndex = number | string;
+export type DropReason = 'DROP' | 'CANCEL';
+export type Announce = (message: string) => void;
 
 export interface DraggableLocation {
     droppableId: DroppableId;
     index: number;
 }
 
+export interface HookProvided {
+    announce: Announce;
+}
+
 /**
  *  DragDropContext
  */
@@ -32,17 +39,14 @@ export interface DragUpdate extends DragStart {
     destination?: DraggableLocation | null;
 }
 
-export interface DropResult {
-    draggableId: DraggableId;
-    type: TypeId;
-    source: DraggableLocation;
-    destination?: DraggableLocation | null;
+export interface DropResult extends DragUpdate {
+    reason: DropReason;
 }
 
 export interface DragDropContextProps {
-    onDragStart?(initial: DragStart): void;
-    onDragUpdate?(initial: DragUpdate): void;
-    onDragEnd(result: DropResult): void;
+    onDragStart?(initial: DragStart, provided: HookProvided): void;
+    onDragUpdate?(initial: DragUpdate, provided: HookProvided): void;
+    onDragEnd(result: DropResult, provided: HookProvided): void;
 }
 
 export class DragDropContext extends React.Component<DragDropContextProps> {}
@@ -51,9 +55,14 @@ export class DragDropContext extends React.Component<DragDropContextProps> {}
  *  Droppable
  */
 
+export interface DroppableProvidedProps {
+    // used for shared global styles
+    'data-react-beautiful-dnd-droppable': string;
+}
 export interface DroppableProvided {
     innerRef(element: HTMLElement | null): any;
     placeholder?: React.ReactElement<any> | null;
+    droppableProps: DroppableProvidedProps;
 }
 
 export interface DroppableStateSnapshot {
@@ -103,12 +112,14 @@ export interface DraggableProvidedDraggableProps {
 export interface DraggableProvidedDragHandleProps {
     onMouseDown: React.MouseEventHandler<any>;
     onKeyDown: React.KeyboardEventHandler<any>;
-    onClick: React.MouseEventHandler<any>;
+    onTouchStart: React.TouchEventHandler<any>;
+    onTouchMove: React.TouchEventHandler<any>;
+    'data-react-beautiful-dnd-drag-handle': string;
+    'aria-roledescription': string;
     tabIndex: number;
     'aria-grabbed': boolean;
     draggable: boolean;
-    onDragStart(): void;
-    onDrop(): void;
+    onDragStart: React.DragEventHandler<any>;
 }
 
 export interface DraggableProvided {
diff --git a/types/react-beautiful-dnd/react-beautiful-dnd-tests.tsx b/types/react-beautiful-dnd/react-beautiful-dnd-tests.tsx
index b05ff46550..882b28a9ad 100644
--- a/types/react-beautiful-dnd/react-beautiful-dnd-tests.tsx
+++ b/types/react-beautiful-dnd/react-beautiful-dnd-tests.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
-import { DragDropContext, Draggable, Droppable, DropResult } from 'react-beautiful-dnd';
+import { DragDropContext, Draggable, Droppable, DropResult, DragStart, DragUpdate, HookProvided } from 'react-beautiful-dnd';
 
 interface Item {
   id: string;
@@ -49,7 +49,15 @@ class App extends React.Component<{}, AppState> {
     this.onDragEnd = this.onDragEnd.bind(this);
   }
 
-  onDragEnd(result: DropResult) {
+  onDragStart(dragStart: DragStart, provided: HookProvided) {
+    //
+  }
+
+  onDragUpdate(dragUpdate: DragUpdate, provided: HookProvided) {
+    //
+  }
+
+  onDragEnd(result: DropResult, provided: HookProvided) {
     if (!result.destination) {
       return;
     }
@@ -65,10 +73,10 @@ class App extends React.Component<{}, AppState> {
 
   render() {
     return (
-      <DragDropContext onDragEnd={this.onDragEnd}>
+      <DragDropContext onDragStart={this.onDragStart} onDragUpdate={this.onDragUpdate} onDragEnd={this.onDragEnd}>
         <Droppable droppableId="droppable">
           {(provided, snapshot) => (
-            <div ref={provided.innerRef} style={getListStyle(snapshot.isDraggingOver)}>
+            <div ref={provided.innerRef} style={getListStyle(snapshot.isDraggingOver)} {...provided.droppableProps}>
               {this.state.items.map((item, index) => (
                 <Draggable key={item.id} draggableId={item.id} index={index}>
                   {(provided, snapshot) => (

From e43d96d643b07f17d3703e393d06d0a30ef73aa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Rodr=C3=ADguez?= <pabloviolin8@gmail.com>
Date: Sun, 25 Mar 2018 21:18:27 +0200
Subject: [PATCH 0835/1382] Fix async-retry's exports

The exports of the package async-retry were misrepresenting the
original package's.
---
 types/async-retry/async-retry-tests.ts |  3 ++-
 types/async-retry/index.d.ts           | 30 +++++++++++++++++---------
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/types/async-retry/async-retry-tests.ts b/types/async-retry/async-retry-tests.ts
index 29c90b36c8..68327b66bd 100644
--- a/types/async-retry/async-retry-tests.ts
+++ b/types/async-retry/async-retry-tests.ts
@@ -1,4 +1,5 @@
-import { Options, RetryFunction, retry } from 'async-retry';
+import { Options, RetryFunction } from 'async-retry';
+import retry = require("async-retry");
 
 const o: Options = {
   retries: 1,
diff --git a/types/async-retry/index.d.ts b/types/async-retry/index.d.ts
index 38d0d8aeec..fdbc9ecf24 100644
--- a/types/async-retry/index.d.ts
+++ b/types/async-retry/index.d.ts
@@ -1,17 +1,27 @@
-// Type definitions for async-retry 1.1
+// Type definitions for async-retry 1.2
 // Project: https://github.com/zeit/async-retry#readme
 // Definitions by: Albert Wu <https://github.com/albertywu>
+//                 Pablo Rodríguez <https://github.com/MeLlamoPablo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-export function retry<A>(fn: RetryFunction<A>, opts: Options): Promise<A>;
+declare function AsyncRetry<A>(
+	fn: AsyncRetry.RetryFunction<A>,
+	opts: AsyncRetry.Options
+): Promise<A>;
 
-export interface Options {
-    retries?: number;
-    factor?: number;
-    minTimeout?: number;
-    maxTimeout?: number;
-    randomize?: boolean;
-    onRetry?: (e: Error) => any;
+declare namespace AsyncRetry {
+	function retry<A>(fn: RetryFunction<A>, opts: Options): Promise<A>;
+
+	interface Options {
+		retries?: number;
+		factor?: number;
+		minTimeout?: number;
+		maxTimeout?: number;
+		randomize?: boolean;
+		onRetry?: (e: Error) => any;
+	}
+
+	type RetryFunction<A> = (bail: (e: Error) => A, attempt: number) => A|Promise<A>;
 }
 
-export type RetryFunction<A> = (bail: (e: Error) => A, attempt: number) => A|Promise<A>;
+export = AsyncRetry;

From f113a24a8c3783fa8c773c78af72981e4d37f0d2 Mon Sep 17 00:00:00 2001
From: Aleksey Klimenko <klimenko@competentum.ru>
Date: Mon, 26 Mar 2018 02:13:46 +0300
Subject: [PATCH 0836/1382] fix(@feathersjs/express): defined 'rest' as
 calllable-object and fixed codystyle

---
 types/feathersjs__express/feathersjs__express-tests.ts | 2 +-
 types/feathersjs__express/index.d.ts                   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/types/feathersjs__express/feathersjs__express-tests.ts b/types/feathersjs__express/feathersjs__express-tests.ts
index 6120ed483f..1bd1f5221a 100644
--- a/types/feathersjs__express/feathersjs__express-tests.ts
+++ b/types/feathersjs__express/feathersjs__express-tests.ts
@@ -1,5 +1,5 @@
 import feathers, { Application } from '@feathersjs/feathers';
-import feathersExpress, * as express from "@feathersjs/express";
+import feathersExpress, * as express from '@feathersjs/express';
 
 const app = feathersExpress(feathers());
 
diff --git a/types/feathersjs__express/index.d.ts b/types/feathersjs__express/index.d.ts
index 16bff00cd4..d526a3db0c 100644
--- a/types/feathersjs__express/index.d.ts
+++ b/types/feathersjs__express/index.d.ts
@@ -19,10 +19,10 @@ export function errorHandler(options?: {
 }): express.ErrorRequestHandler;
 export function notFound(): express.RequestHandler;
 
-export function rest(): (handler?: express.RequestHandler) => void;
-export namespace rest {
-    let formatter: express.RequestHandler;
-}
+export const rest: {
+    (handler?: express.RequestHandler): () => void;
+    formatter: express.RequestHandler;
+};
 
 /*
  * Re-export of the express package.

From fd991797cd15c8bffea86bc8406f3f027f48d48b Mon Sep 17 00:00:00 2001
From: Philip Jackson <p-jackson@live.com>
Date: Mon, 26 Mar 2018 14:37:03 +1300
Subject: [PATCH 0837/1382] Add `innerRef` prop to <Link> component

An `innerRef` prop was added to <Link> in `react-router-dom@4.2`

The node will be an anchor tag, which is why I made the callback accept
an `HTMLAnchorElement` rather than an `HTMLElement`, however this isn't
explicitly documented.
---
 types/react-router-dom/index.d.ts                 | 2 ++
 types/react-router-dom/react-router-dom-tests.tsx | 8 +++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/types/react-router-dom/index.d.ts b/types/react-router-dom/index.d.ts
index c5b795761c..9165f1182e 100644
--- a/types/react-router-dom/index.d.ts
+++ b/types/react-router-dom/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/ReactTraining/react-router
 // Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
 //                 Huy Nguyen <https://github.com/huy-nguyen>
+//                 Philip Jackson <https://github.com/p-jackson>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -44,6 +45,7 @@ export class HashRouter extends React.Component<HashRouterProps, any> {}
 export interface LinkProps extends React.AnchorHTMLAttributes<HTMLAnchorElement> {
     to: H.LocationDescriptor;
     replace?: boolean;
+    innerRef?: (node: HTMLAnchorElement | null) => void;
 }
 export class Link extends React.Component<LinkProps, any> {}
 
diff --git a/types/react-router-dom/react-router-dom-tests.tsx b/types/react-router-dom/react-router-dom-tests.tsx
index c748405580..0fedbe412e 100644
--- a/types/react-router-dom/react-router-dom-tests.tsx
+++ b/types/react-router-dom/react-router-dom-tests.tsx
@@ -2,7 +2,8 @@ import * as React from 'react';
 import {
   NavLink,
   NavLinkProps,
-  match
+  match,
+  Link
 } from 'react-router-dom';
 import * as H from 'history';
 
@@ -19,3 +20,8 @@ export default function(props: Props) {
     <NavLink {...rest} isActive={isActive}/>
   );
 }
+
+<Link to="/url" />;
+
+const acceptRef = (node: HTMLAnchorElement | null) => {};
+<Link to="/url" replace={true} innerRef={acceptRef} />;

From 8206cfa97338fa0cd0b9cf64cb6747738c96da81 Mon Sep 17 00:00:00 2001
From: Ricardo De Pena <ricardo@isnull.co>
Date: Sun, 25 Mar 2018 21:40:12 -0400
Subject: [PATCH 0838/1382] Backed up v17 definitions to the v17 folder, moved
 v29 definitions to the index folder.

---
 types/openfin/index.d.ts                 | 3581 +++++++++++-----------
 types/openfin/openfin-tests.ts           | 1472 ++++-----
 types/openfin/tsconfig.json              |    9 +-
 types/openfin/tslint.json                |    5 +-
 types/openfin/v17/index.d.ts             | 1732 +++++++++++
 types/openfin/v17/openfin-tests.ts       |  721 +++++
 types/openfin/{v29 => v17}/tsconfig.json |    9 +-
 types/openfin/v17/tslint.json            |    6 +
 types/openfin/v29/index.d.ts             | 1891 ------------
 types/openfin/v29/openfin-tests.ts       |  797 -----
 types/openfin/v29/tslint.json            |    3 -
 11 files changed, 5113 insertions(+), 5113 deletions(-)
 create mode 100644 types/openfin/v17/index.d.ts
 create mode 100644 types/openfin/v17/openfin-tests.ts
 rename types/openfin/{v29 => v17}/tsconfig.json (77%)
 create mode 100644 types/openfin/v17/tslint.json
 delete mode 100644 types/openfin/v29/index.d.ts
 delete mode 100644 types/openfin/v29/openfin-tests.ts
 delete mode 100644 types/openfin/v29/tslint.json

diff --git a/types/openfin/index.d.ts b/types/openfin/index.d.ts
index 30afded19b..3ddbdf2edd 100644
--- a/types/openfin/index.d.ts
+++ b/types/openfin/index.d.ts
@@ -1,9 +1,9 @@
-// Type definitions for OpenFin API 17.0
+// Type definitions for OpenFin API 29.0
 // Project: https://openfin.co/
 // Definitions by: Chris Barker <https://github.com/chrisbarker>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-// based on v6.49.17.14
+// based on v8.56.29.51
 // see https://openfin.co/support/technical-faq/#what-do-the-numbers-in-the-runtime-version-mean
 
 /**
@@ -18,1715 +18,1874 @@
  *
  * Overview
  * When running within the OpenFin Runtime your web applications have access to the "fin" namespace and all the modules within the API
- * without the need to include additional source files. You can treat the "fin" namespace as you would the "window", "navigator" or "document" objects.
+ * without the need to include additional source files. You can treat the "fin" namespace as you would the "window", "navigator" or "documennt" objects.
  */
 declare namespace fin {
-	const desktop: OpenFinDesktop;
-
-	interface OpenFinDesktop {
-		main(f: () => any): void;
-		Application: OpenFinApplicationStatic;
-		ExternalApp: OpenFinExternalApplicationStatic;
-		InterApplicationBus: OpenFinInterApplicationBus;
-		Notification: OpenFinNotificationStatic;
-		System: OpenFinSystem;
-		Window: OpenFinWindowStatic;
-	}
-
-	interface OpenFinApplicationStatic {
-		/**
-		 * Creates a new Application.
-		 * An object representing an application. Allows the developer to create, execute, show/close an application as well as listen to application events.
-		 */
-		new (
-			options: ApplicationOptions,
-			callback?: (successObj: { httpResponseCode: number }) => void,
-			errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): OpenFinApplication;
-		/**
-		 * Returns an Application object that represents an existing application.
-		 */
-		getCurrent(): OpenFinApplication;
-		/**
-		 * Returns an Application object that represents an existing application.
-		 */
-		wrap(uuid: string): OpenFinApplication;
-	}
-
-	/**
-	 * Application
-	 * An object representing an application.Allows the developer to create, execute, show / close an application as well as listen to application events.
-	 */
-	interface OpenFinApplication {
-		/**
-		 * Returns an instance of the main Window of the application
-		 */
-		getWindow(): OpenFinWindow;
-		/**
-		 * Registers an event listener on the specified event.
-		 */
-		addEventListener(
-			type: OpenFinApplicationEventType,
-			listener: (event: ApplicationBaseEvent
-				| TrayIconClickedEvent
-				| WindowEvent
-				| WindowAlertRequestedEvent
-				| WindowAuthRequested
-				| WindowNavigationRejectedEvent
-				| WindowEndLoadEvent) => void,
-			callback?: () => void,
-			errorCallback?: (reason: string) => void): void;
-		/**
-		 * Closes the application and any child windows created by the application.
-		 */
-		close(force?: boolean, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves an array of wrapped fin.desktop.Windows for each of the application's child windows.
-		 */
-		getChildWindows(callback?: (children: OpenFinWindow[]) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves an array of active window groups for all of the application's windows. Each group is represented as an array of wrapped fin.desktop.Windows.
-		 */
-		getGroups(callback?: (groups: OpenFinWindow[][]) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves the JSON manifest that was used to create the application. Invokes the error callback if the application was not created from a manifest.
-		 */
-		getManifest(callback?: (manifest: any) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves UUID of the application that launches this application. Invokes the error callback if the application was created from a manifest.
-		 */
-		getParentUuid(callback?: (uuid: string) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves current configuration of application's shortcuts.
-		 */
-		getShortcuts(callback?: (config: ShortCutConfig) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves information about the application.
-		 */
-		getInfo(callback?: (info: LaunchInfo) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Determines if the application is currently running.
-		 */
-		isRunning(callback?: (running: boolean) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Passes in custom data that will be relayed to the RVM
-		 */
-		registerCustomData(data: any, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Removes a previously registered event listener from the specified event.
-		 */
-		removeEventListener(
-			type: OpenFinApplicationEventType,
-			previouslyRegisteredListener: (event: ApplicationBaseEvent
-				| TrayIconClickedEvent
-				| WindowEvent
-				| WindowAlertRequestedEvent
-				| WindowAuthRequested
-				| WindowNavigationRejectedEvent
-				| WindowEndLoadEvent) => any,
-			callback?: () => void,
-			errorCallback?: (reason: string) => void): void;
-		/**
-		 * Removes the application's icon from the tray.
-		 */
-		removeTrayIcon(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Restarts the application.
-		 */
-		restart(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Runs the application. When the application is created, run must be called.
-		 */
-		run(callback?: (successObj: SuccessObj) => void, errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): void;
-		/**
-		 * Tells the rvm to relaunch the main application once upon a complete shutdown
-		 */
-		scheduleRestart(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Sets new shortcut configuration for current application.
-		 * Application has to be launched with a manifest and has to have shortcut configuration (icon url, name, etc.) in its manifest to
-		 * be able to change shortcut states.
-		 */
-		setShortcuts(config: ShortCutConfig, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Adds a customizable icon in the system tray and notifies the application when clicked.
-		 */
-		setTrayIcon(iconUrl: string, listener: (clickInfo: TrayIconClickedEvent) => void, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Closes the application by terminating its process.
-		 */
-		terminate(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Waits for a hanging application. This method can be called in response to an application "not-responding" to allow the application
-		 * to continue and to generate another "not-responding" message after a certain period of time.
-		 */
-		wait(callback?: () => void, errorCallback?: (reason: string) => void): void;
-	}
-
-	interface ShortCutConfig {
-		/**
-		 * application has a shortcut on the desktop
-		 */
-		desktop?: boolean;
-		/**
-		 * application has no shortcut in the start menu
-		 */
-		startMenu?: boolean;
-		/**
-		 * application will be launched on system startup
-		 */
-		systemStartup?: boolean;
-	}
-
-	interface SuccessObj {
-		httpResponseCode: number;
-	}
-
-	interface NetworkErrorInfo extends ErrorInfo {
-		networkErrorCode: number;
-	}
-
-	interface ErrorInfo {
-		stack: string;
-		message: string;
-	}
-
-	interface ApplicationOptions {
-		/**
-		 * The name of the application.
-		 */
-		name?: string;
-		/**
-		 * The url to the application.
-		 */
-		url?: string;
-		/**
-		 * The UUID of the application, unique within the set of all other applications running in the OpenFin Runtime. name and uuid must match.
-		 */
-		uuid?: string;
-		/**
-		 * Enable Flash at the application level. Default: false.
-		 */
-		plugins?: boolean;
-		/**
-		 * The options of the main window of the application.
-		 */
-		mainWindowOptions?: WindowOptions;
-	}
-
-	interface WindowOptions {
-		/**
-		 * Enable keyboard shortcuts for devtools and zoom. Default: false for both.
-		 */
-		accelerator?: {
-			devtools?: boolean,
-			zoom?: boolean,
-			reload?: boolean,
-			reloadIgnoreCache?: boolean,
-		};
-		/**
-		 * A flag to always position the window at the top of the window stack. Default: false.
-		 * Updatable
-		 */
-		alwaysOnTop?: boolean;
-		/**
-		 * A flag to automatically show the Window when it is created. Default: false.
-		 */
-		autoShow?: boolean;
-		/**
-		 * A flag to show the context menu when right-clicking on a window. Gives access to the Developer Console for the Window. Default: true
-		 * Updatable
-		 */
-		contextMenu?: boolean;
-		/**
-		 * This defines and applies rounded corners for a frameless window. Default for both width and height: 0.
-		 * Updatable
-		 */
-		cornerRounding?: {
-			width?: number;
-			height?: number;
-		};
-		/**
-		 * A field that the user can attach serializable data to to be ferried around with the window options. Default: ''.
-		 */
-		customData?: any;
-		/**
-		 * Specifies that the window will be positioned in the center of the primary monitor when loaded for the first time on a machine.
-		 * When the window corresponding to that id is loaded again, the position from before the window was closed is used.
-		 * This option overrides defaultLeft and defaultTop. Default: false.
-		 */
-		defaultCentered?: boolean;
-		/**
-		 * The default height of the window. Specifies the height of the window when loaded for the first time on a machine.
-		 *  When the window corresponding to that id is loaded again, the height is taken to be the last height of the window before it was closed. Default: 500.
-		 */
-		defaultHeight?: number;
-		/**
-		 * The default left position of the window. Specifies the position of the left of the window when loaded for the first time on a machine.
-		 *  When the window corresponding to that id is loaded again, the value of left is taken to be the last value before the window was closed. Default: 100.
-		 */
-		defaultWidth?: number;
-		/**
-		 * The default top position of the window. Specifies the position of the top of the window when loaded for the first time on a machine.
-		 * When the window corresponding to that id is loaded again, the value of top is taken to be the last value before the window was closed. Default: 100.
-		 */
-		defaultTop?: number;
-		/**
-		 * The default width of the window. Specifies the width of the window when loaded for the first time on a machine.
-		 * When the window corresponding to that id is loaded again, the width is taken to be the last width of the window before it was closed. Default: 800.
-		 */
-		defaultLeft?: number;
-		/**
-		 * A flag to show the frame. Default: true.
-		 * Updatable
-		 */
-		frame?: boolean;
-		/**
-		 * A flag to allow a window to be hidden when the close button is clicked.Default: false.
-		 * Updatable
-		 */
-		hideOnClose?: boolean;
-		/**
-		 * A URL for the icon to be shown in the window title bar and the taskbar.Default: The parent application's applicationIcon.
-		 * Updatable
-		 */
-		icon?: string;
-		/**
-		 * The maximum height of a window.Will default to the OS defined value if set to - 1. Default: -1.
-		 * Updatable
-		 */
-		maxHeight?: number;
-		/**
-		 * A flag that lets the window be maximized.Default: true.
-		 * Updatable
-		 */
-		maximizable?: boolean;
-		/**
-		 * The maximum width of a window.Will default to the OS defined value if set to - 1. Default: -1.
-		 * Updatable
-		 */
-		maxWidth?: number;
-		/**
-		 * The minimum height of a window.Default: 0.
-		 * Updatable
-		 */
-		minHeight?: number;
-		/**
-		 * A flag that lets the window be minimized.Default: true.
-		 */
-		minimizable?: boolean;
-		/**
-		 * The minimum width of a window.Default: 0.
-		 */
-		minWidth?: number;
-		/**
-		 * The name for the window which must be unique within the context of the invoking Application.
-		 */
-		name?: string;
-		/**
-		 * A flag that specifies how transparent the window will be.This value is clamped between 0.0 and 1.0.Default: 1.0.
-		 * Updatable
-		 */
-		opacity?: number;
-		/**
-		 * A flag to drop to allow the user to resize the window.Default: true.
-		 * Updatable
-		 */
-		resizable?: boolean;
-		/**
-		 * Defines a region in pixels that will respond to user mouse interaction for resizing a frameless window.
-		 * Updatable
-		 */
-		resizeRegion?: {
-			/**
-			 * The size in pixels (Default: 2),
-			 */
-			size?: number;
-			/**
-			 * The size in pixels of an additional
-			 * square resizable region located at the
-			 * bottom right corner of a
-			 * frameless window. (Default: 4)
-			 */
-			bottomRightCorner?: number;
-		};
-		/**
-		 * A flag to show the Window's icon in the taskbar. Default: true.
-		 */
-		showTaskbarIcon?: boolean;
-		/**
-		 * A flag to cache the location of the window or not. Default: true.
-		 */
-		saveWindowState?: boolean;
-		/**
-		 * Specify a taskbar group for the window. Default: app's uuid.
-		 */
-		taskbarIconGroup?: string;
-		/**
-		 * A string that sets the window to be "minimized", "maximized", or "normal" on creation. Default: "normal".
-		 */
-		state?: string;
-		/**
-		 * The URL of the window. Default: "about:blank".
-		 */
-		url?: string;
-		/**
-		 * When set to false, the window will render before the "load" event is fired on the content's window.
-		 * Caution, when false you will see an initial empty white window. Default: true.
-		 */
-		waitForPageLoad?: boolean;
-	}
-
-	/**
-	 * Clipboard
-	 * Clipboard API allows reading and writting to the clipboard in multiple formats.
-	 */
-	interface OpenFinClipboard {
-		/**
-		 * Reads available formats for the clipboard type
-		 */
-		availableFormats(type: string | null, callback?: (formats: string[]) => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
-		/**
-		 * Reads available formats for the clipboard type
-		 */
-		readHtml(type: string | null, callback?: (html: string) => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
-		/**
-		 * Read the content of the clipboard as Rtf
-		 */
-		readRtf(type: string | null, callback?: (rtf: string) => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
-		/**
-		 * Read the content of the clipboard as plain text
-		 */
-		readText(type: string | null, callback?: (text: string) => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
-		/**
-		 * Writes data into the clipboard
-		 */
-		write(data: any, type: string | null, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
-		/**
-		 * Writes data into the clipboard as Html
-		 */
-		writeHtml(data: string, type: string | null, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
-		/**
-		 * Writes data into the clipboard as Rtf
-		 */
-		writeRtf(data: string, type: string | null, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
-		/**
-		 * Writes data into the clipboard as plain text
-		 */
-		writeText(data: string, type: string | null, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
-	}
-
-	interface OpenFinExternalApplicationStatic {
-		/**
-		 * Returns an External Application object that represents an existing external application.
-		 */
-		wrap(uuid: string): OpenFinExternalApplication;
-	}
-	/**
-	 * ExternalApplication
-	 * An object representing an application. Allows the developer to create, execute, show and close an application, as well as listen to application events.
-	 */
-	interface OpenFinExternalApplication {
-		/**
-		 * Registers an event listener on the specified event.
-		 */
-		addEventListener(
-			type: OpenFinExternalApplicationEventType,
-			listener: () => void,
-			callback?: () => void,
-			errorCallback?: (reason: string, error: ErrorInfo) => void): void;
-		/**
-		 * Removes a previously registered event listener from the specified event.
-		 */
-		removeEventListener(
-			type: OpenFinExternalApplicationEventType,
-			listener: () => void,
-			callback?: () => void,
-			errorCallback?: (reason: string, error: ErrorInfo) => void): void;
-	}
-
-	/**
-	 * InterApplicationBus
-	 * A messaging bus that allows for pub/sub messaging between different applications.
-	 */
-	interface OpenFinInterApplicationBus {
-		/**
-		 * Adds a listener that gets called when applications subscribe to the current application's messages.
-		 */
-		addSubscribeListener(listener: (uuid: string, topic: string, name: string) => void): void;
-		/**
-		 * Adds a listener that gets called when applications unsubscribe to the current application's messages.
-		 */
-		addUnsubscribeListener(listener: (uuid: string, topic: string, name: string) => void): void;
-		/**
-		 * Removes a previously registered subscribe listener.
-		 */
-		removeSubscribeListener(listener: (uuid: string, topic: string, name: string) => void): void;
-		/**
-		 * Removes a previously registered unsubscribe listener.
-		 */
-		removeUnsubscribeListener(listener: (uuid: string, topic: string, name: string) => void): void;
-		/**
-		 * Publishes a message to all applications running on OpenFin Runtime that are subscribed to the specified topic.
-		 */
-		publish(topic: string, message: any, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Sends a message to a specific application on a specific topic.
-		 */
-		send(destinationUuid: string, name: string, topic: string, message: any, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		send(destinationUuid: string, topic: string, message: any, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Subscribes to messages from the specified application on the specified topic. If the subscription is for a uuid, [name],
-		 * topic combination that has already been published to upon subscription you will receive the last 20 missed messages in the order they were published.
-		 */
-		subscribe(
-			senderUuid: string,
-			name: string,
-			topic: string,
-			listener: (message: any, uuid: string, name: string) => void,
-			callback?: () => void,
-			errorCallback?: (reason: string) => void): void;
-		subscribe(
-			senderUuid: string,
-			topic: string,
-			listener: (message: any, uuid: string, name: string) => void,
-			callback?: () => void,
-			errorCallback?: (reason: string) => void): void;
-		/**
-		 * Unsubscribes to messages from the specified application on the specified topic.
-		 */
-		unsubscribe(
-			senderUuid: string,
-			name: string,
-			topic: string,
-			listener: (message: any, uuid: string, name: string) => void,
-			callback?: () => void,
-			errorCallback?: (reason: string) => void): void;
-		unsubscribe(
-			senderUuid: string,
-			topic: string,
-			listener: (message: any, uuid: string, name: string) => void,
-			callback?: () => void,
-			errorCallback?: (reason: string) => void): void;
-	}
-
-	interface OpenFinNotificationStatic {
-		/**
-		 * ctor
-		 */
-		new (options: NotificationOptions, callback?: () => void, errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): OpenFinNotification;
-		/**
-		 * Gets an instance of the current notification. For use within a notification window to close the window or send a message back to its parent application.
-		 */
-		getCurrent(): OpenFinNotification;
-	}
-
-	/**
-	 * Notification
-	 * Notification represents a window on OpenFin Runtime which is shown briefly to the user on the bottom-right corner of the primary monitor.
-	 * A notification is typically used to alert the user of some important event which requires his or her attention.
-	 * Notifications are a child or your application that are controlled by the runtime.
-	 */
-	interface OpenFinNotification {
-		/**
-		 * Closes the notification.
-		 */
-		close(callback?: () => void): void;
-		/**
-		 * Sends a message to the notification.
-		 */
-		sendMessage(message: any, callback?: () => void): void;
-		/**
-		 * Sends a message from the notification to the application that created the notification. The message is handled by the notification's onMessage callback.
-		 */
-		sendMessageToApplication(message: any, callback?: () => void): void;
-	}
-
-	interface NotificationOptions {
-		/**
-		 * A boolean that will force dismissal even if the mouse is hovering over the notification
-		 */
-		ignoreMouseOver?: boolean;
-		/**
-		 * A message of any primitive or composite-primitive type to be passed to the notification upon creation.
-		 */
-		message?: any;
-		/**
-		 * The timeout for displaying a notification.Can be in milliseconds or "never".
-		 */
-		duration?: number | "never";
-		/**
-		 * The url of the notification
-		 */
-		url?: string;
-		/**
-		 * A function that is called when a notification is clicked.
-		 */
-		onClick?(callback: () => void): void;
-		/**
-		 * Invoked when the notification is closed via .close() method on the created notification instance
-		 * or the by the notification itself via fin.desktop.Notification.getCurrent().close().
-		 * NOTE: this is not invoked when the notification is dismissed via a swipe. For the swipe dismissal callback see onDismiss
-		 */
-		onClose?(callback: () => void): void;
-		/**
-		 * Invoked when a the notification is dismissed by swiping it off the screen to the right. NOTE: this is no fired on a programmatic close.
-		 */
-		onDismiss?(callback: () => void): void;
-		/**
-		 * A function that is called when an error occurs.The reason for the error is passed as an argument.
-		 */
-		onError?(errorCallback: (reason: string, errorObj: NetworkErrorInfo) => void): void;
-		/**
-		 * The onMessage function will respond to messages sent from notification.sendMessageToApplication.
-		 * The function is passed the message, which can be of any primitive or composite-primitive type.
-		 */
-		onMessage?(callback: (message: any) => void): void;
-		/**
-		 * A function that is called when a notification is shown.
-		 */
-		onShow?(callback: (successObj: SuccessObj) => void): void;
-	}
-
-	/**
-	 * System
-	 * An object representing the core of OpenFin Runtime.
-	 * Allows the developer to perform system-level actions, such as accessing logs, viewing processes, clearing the cache and exiting the runtime.
-	 */
-	interface OpenFinSystem {
-		Clipboard: OpenFinClipboard;
-		/**
-		 * Registers an event listener on the specified event.
-		 */
-		addEventListener(
-			type: OpenFinSystemEventType,
-			listener: (event: SystemBaseEvent | DesktopIconClickedEvent | IdleStateChangedEvent | MonitorInfoChangedEvent | SessionChangedEvent) => void,
-			callback?: () => void,
-			errorCallback?: (reason: string) => void): void;
-		/**
-		 * Clears cached data containing window state/positions,
-		 * application resource files (images, HTML, JavaScript files), cookies, and items stored in the Local Storage.
-		 */
-		clearCache(options: CacheOptions, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Clears all cached data when OpenFin Runtime exits.
-		 */
-		deleteCacheOnExit(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Downloads the given application asset
-		 */
-		downloadAsset(
-			assetObj: AppAssetInfo,
-			progressListener?: (progress: { downloadedBytes: number, totalBytes: number }) => void,
-			callback?: (successObj: { path: string }) => void,
-			errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): void;
-		/**
-		 * Exits the Runtime.
-		 */
-		exit(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves an array of data for all applications.
-		 */
-		getAllApplications(callback?: (applicationInfoList: ApplicationInfo[]) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves an array of data for all external applications.
-		 */
-		getAllExternalApplications(callback?: (applicationInfoList: ApplicationInfo[]) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves an array of data (name, ids, bounds) for all application windows.
-		 */
-		getAllWindows(callback?: (windowInfoList: WindowDetails[]) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves the command line argument string that started OpenFin Runtime.
-		 */
-		getCommandLineArguments(callback?: (args: string) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves the configuration object that started the OpenFin Runtime.
-		 */
-		getDeviceId(callback?: (uuid: string) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Gets the value of a given environment variable on the computer on which the runtime is installed.
-		 */
-		getEnvironmentVariable(envVar: string, callback?: (variable: string) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves system information.
-		 */
-		getHostSpecs(callback?: (info: HostSpecInfo) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves the contents of the log with the specified filename.
-		 */
-		getLog(logFileName: string, callback?: (variable: string) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves an array containing information for each log file.
-		 */
-		getLogList(callback?: (logInfoList: LogInfo[]) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves an object that contains data about the about the monitor setup of the computer that the runtime is running on.
-		 */
-		getMonitorInfo(callback?: (monitorInfo: MonitorInfo) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Returns the mouse in virtual screen coordinates (left, top).
-		 */
-		getMousePosition(callback?: (mousePosition: VirtualScreenCoordinates) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves an array of all of the runtime processes that are currently running.
-		 * Each element in the array is an object containing the uuid and the name of the application to which the process belongs.
-		 */
-		getProcessList(callback?: (processInfoList: ProcessInfo[]) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves the Proxy settings.
-		 */
-		getProxySettings(callback?: (proxy: ProxyInfo) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Returns information about the running RVM in an object.
-		 */
-		getRvmInfo(callback?: (rvmInfo: RvmInfo) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Returns the version of the runtime. The version contains the major, minor, build and revision numbers.
-		 */
-		getVersion(callback?: (version: string) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Runs an executable or batch file.
-		 */
-		launchExternalProcess(options: ExternalProcessLaunchInfo, callback?: (payload: { uuid: string }) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Writes the passed message into both the log file and the console.
-		 */
-		log(level: "debug" | "info" | "warn" | "error", message: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Monitors a running process.
-		 */
-		monitorExternalProcess(options: ExternalProcessInfo, callback?: (payload: { uuid: string }) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Opens the passed URL in the default web browser.
-		 */
-		openUrlWithBrowser(url: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * This function call will register a unique id and produce a token. The token can be used to broker an external connection.
-		 */
-		registerExternalConnection(
-			uuid: string,
-			callback?: (detail: {
-				/**
-				 * this will be unique each time
-				 */
-				token: string;
-				/**
-				 * "remote-connection-uuid"
-				 */
-				uuid: string;
-			}) => void,
-			errorCallback?: (reason: string) => void): void;
-		/**
-		 * Removes the process entry for the passed UUID obtained from a prior call of fin.desktop.System.launchExternalProcess().
-		 */
-		releaseExternalProcess(processUuid: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Removes a previously registered event listener from the specified event.
-		 */
-		removeEventListener(
-			type: OpenFinSystemEventType,
-			listener: (event: SystemBaseEvent | DesktopIconClickedEvent | IdleStateChangedEvent | MonitorInfoChangedEvent | SessionChangedEvent) => void,
-			callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Shows the Chrome Developer Tools for the specified window.
-		 */
-		showDeveloperTools(uuid: string, name: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Attempt to close an external process. The process will be terminated if it has not closed after the elapsed timeout in milliseconds.
-		 */
-		terminateExternalProcess(
-			processUuid: string,
-			timeout: number,
-			killTree: boolean,
-			callback?: (info: { result: "clean" | "terminated" | "failed" }) => void,
-			errorCallback?: (reason: string) => void): void;
-		terminateExternalProcess(
-			processUuid: string,
-			timeout: number,
-			callback?: (info: { result: "clean" | "terminated" | "failed" }) => void,
-			errorCallback?: (reason: string) => void): void;
-		/**
-		 * Update the OpenFin Runtime Proxy settings.
-		 */
-		updateProxySettings(type: string, address: string, port: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
-	}
-
-	interface CacheOptions {
-		cache?: boolean;
-		cookies?: boolean;
-		localStorage?: boolean;
-		appcache?: boolean;
-		userData?: boolean;
-	}
-
-	interface AppAssetInfo {
-		src?: string;
-		alias?: string;
-		version?: string;
-		target?: string;
-		args?: string;
-	}
-
-	interface ApplicationInfo {
-		/**
-		 * true when the application is running.
-		 */
-		isRunning?: boolean;
-		/**
-		 * uuid of the application.
-		 */
-		uuid?: string;
-		/**
-		 * uuid of the application that launches this application.
-		 */
-		parentUuid?: string;
-	}
-
-	interface WindowDetails {
-		uuid?: string;
-		mainWindow?: WindowInfo;
-		childWindows?: WindowInfo[];
-	}
-
-	interface WindowInfo {
-		/**
-		 * name of the child window
-		 */
-		name?: string;
-		/**
-		 * top-most coordinate of the child window
-		 */
-		top?: number;
-		/**
-		 * right-most coordinate of the child window
-		 */
-		right?: number;
-		/**
-		 * bottom-most coordinate of the child window
-		 */
-		bottom?: number;
-		/**
-		 * left-most coordinate of the child window
-		 */
-		left?: number;
-	}
-
-	interface HostSpecInfo {
-		/**
-		 * "x86" for 32-bit or "x86_64" for 64-bit
-		 */
-		arch: string;
-		/**
-		 * Same payload as Node's os.cpus()
-		 */
-		cpus: NodeCpuInfo[];
-		gpu: {
-			/**
-			 * Graphics card name
-			 */
-			name: string;
-		};
-		/**
-		 * Same payload as Node's os.totalmem()
-		 */
-		memory: number;
-		/**
-		 * OS name and version/edition
-		 */
-		name: string;
-	}
-
-	interface NodeCpuInfo {
-		model: string;
-		/**
-		 * in MHz
-		 */
-		speed: number;
-		times: {
-			/**
-			 * The number of milliseconds the CPU has spent in user mode.
-			 */
-			user: number;
-			/**
-			 * The number of milliseconds the CPU has spent in nice mode.
-			 */
-			nice: number;
-			/**
-			 * The number of milliseconds the CPU has spent in sys mode.
-			 */
-			sys: number;
-			/**
-			 * The number of milliseconds the CPU has spent in idle mode.
-			 */
-			idle: number;
-			/**
-			 * The number of milliseconds the CPU has spent in irq mode.
-			 */
-			irq: number;
-		};
-	}
-
-	interface LogInfo {
-		/**
-		 * the filename of the log
-		 */
-		name?: string;
-		/**
-		 * the size of the log in bytes
-		 */
-		size?: number;
-		/**
-		 * the unix time at which the log was created "Thu Jan 08 2015 14:40:30 GMT-0500 (Eastern Standard Time)"
-		 */
-		date?: string;
-	}
-
-	interface ProcessInfo {
-		/**
-		 * the percentage of total CPU usage
-		 */
-		cpuUsage?: number;
-		/**
-		 * the application name
-		 */
-		name?: string;
-		/**
-		 * the current nonpaged pool usage in bytes
-		 */
-		nonPagedPoolUsage?: number;
-		/**
-		 * the number of page faults
-		 */
-		pageFaultCount?: number;
-		/**
-		 * the current paged pool usage in bytes
-		 */
-		pagedPoolUsage?: number;
-		/**
-		 * the total amount of memory in bytes that the memory manager has committed
-		 */
-		pagefileUsage?: number;
-		/**
-		 * the peak nonpaged pool usage in bytes
-		 */
-		peakNonPagedPoolUsage?: number;
-		/**
-		 * the peak paged pool usage in bytes
-		 */
-		peakPagedPoolUsage?: number;
-		/**
-		 * the peak value in bytes of pagefileUsage during the lifetime of this process
-		 */
-		peakPagefileUsage?: number;
-		/**
-		 * the peak working set size in bytes
-		 */
-		peakWorkingSetSize?: number;
-		/**
-		 * the native process identifier
-		 */
-		processId?: number;
-		/**
-		 * the application UUID
-		 */
-		uuid?: string;
-		/**
-		 * the current working set size (both shared and private data) in bytes
-		 */
-		workingSetSize?: number;
-	}
-
-	interface ProxyInfo {
-		/**
-		 * the configured Proxy Address
-		 */
-		proxyAddress?: string;
-		/**
-		 * the configured Proxy port
-		 */
-		proxyPort?: number;
-		/**
-		 * Proxy Type
-		 */
-		type?: string;
-	}
-
-	interface RvmInfo {
-		version?: string;
-		"start-time"?: string;
-	}
-
-	interface ExternalProcessLaunchInfo {
-		path?: string;
-		/**
-		 * Additionally note that the executable found in the zip file specified in appAssets
-		 * will default to the one mentioned by appAssets.target
-		 * If the the path below refers to a specific path it will override this default
-		 */
-		alias?: string;
-		/**
-		 * When using alias; if no arguments are passed then the arguments (if any)
-		 * are taken from the 'app.json' file, from the  'args' parameter
-		 * of the 'appAssets' Object with the relevant 'alias'.
-		 * If 'arguments' is passed as a parameter it takes precedence
-		 * over any 'args' set in the 'app.json'.
-		 */
-		arguments?: string;
-		listener?(result: {
-			/**
-			 * "Exited" Or "released" on a call to releaseExternalProcess
-			 */
-			topic?: string;
-			/**
-			 * The mapped UUID which identifies the launched process
-			 */
-			uuid?: string;
-			/*
-			 * Process exit code
-			 */
-			exitCode?: number;
-		}): void;
-		certificate?: CertificationInfo;
-	}
-
-	interface CertificationInfo {
-		/**
-		 * A hex string with or without spaces
-		 */
-		serial?: string;
-		/**
-		 * An internally tokenized and comma delimited string allowing partial or full checks of the subject fields
-		 */
-		subject?: string;
-		/**
-		 * A hex string with or without spaces
-		 */
-		publickey?: string;
-		/**
-		 * A hex string with or without spaces
-		 */
-		thumbprint?: string;
-		/**
-		 * A boolean indicating that the certificate is trusted and not revoked
-		 */
-		trusted?: boolean;
-	}
-
-	interface ExternalProcessInfo {
-		pid?: number;
-		listener?(result: {
-			/**
-			 * "Exited" Or "released" on a call to releaseExternalProcess
-			 */
-			topic?: string;
-			/**
-			 * The mapped UUID which identifies the launched process
-			 */
-			uuid?: string;
-			/*
-				* Process exit code
-				*/
-			exitCode?: number;
-		}): void;
-	}
-
-	interface OpenFinWindowStatic {
-		/**
-		 * Class: Window
-		 *
-		 * new Window(options, callbackopt, errorCallbackopt)
-		 *
-		 * Creates a new OpenFin Window
-		 *
-		 * A basic window that wraps a native HTML window. Provides more fine-grained control over the window state such as the ability to minimize,
-		 * maximize, restore, etc. By default a window does not show upon instantiation; instead the window's show() method must be invoked manually.
-		 * The new window appears in the same process as the parent window.
-		 * @param options - The options of the window
-		 * @param [callback] - Called if the window creation was successful
-		 * @param [callback.successObj] - httpResponseCode
-		 */
-		new (
-			options: WindowOptions,
-			callback?: (successObj: { httpResponseCode: number }) => void,
-			errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): OpenFinWindow;
-		/**
-		 * Returns an instance of the current window.
-		 * @returns Current window
-		 */
-		getCurrent(): OpenFinWindow;
-		/**
-		 * Returns a Window object that wraps an existing window.
-		 */
-		wrap(appUuid: string, windowName: string): OpenFinWindow;
-	}
-
-	/**
-	 * Window
-	 * A basic window that wraps a native HTML window. Provides more fine-grained control over the window state such as the ability to minimize,
-	 * maximize, restore, etc. By default a window does not show upon instantiation; instead the window's show() method must be invoked manually.
-	 * The new window appears in the same process as the parent window.
-	 */
-	interface OpenFinWindow {
-		/**
-		 * Name of window
-		 */
-		name: string;
-		/**
-		 * Returns the native JavaScript "window" object for the window. This method can only be used by the parent application or the window itself,
-		 * otherwise it will return undefined. The same Single-Origin-Policy (SOP) rules apply for child windows created by window.open(url) in that the
-		 * contents of the window object are only accessible if the URL has the same origin as the invoking window. See example below.
-		 * Also, will not work with fin.desktop.Window objects created with fin.desktop.Window.wrap().
-		 * @returns Native window
-		 */
-		getNativeWindow(): Window;
-		/**
-		 * Gets the parent application.
-		 * @returns Parent application
-		 */
-		getParentApplication(): OpenFinApplication;
-		/**
-		 * Gets the parent window.
-		 */
-		getParentWindow(): OpenFinWindow;
-		/**
-		 * Registers an event listener on the specified event.
-		 */
-		addEventListener(
-			type: OpenFinWindowEventType,
-			listener: (event: WindowBaseEvent
-				| WindowAuthRequestedEvent
-				| WindowBoundsEvent
-				| WindowExternalProcessStartedEvent
-				| WindowExternalProcessExited
-				| WindowGroupChangedEvent
-				| WindowHiddenEvent
-				| Window_NavigationRejectedEvent) => void,
-			callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Performs the specified window transitions
-		 */
-		animate(transitions: AnimationTransition, options: AnimationOptions, callback?: (event: any) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Provides credentials to authentication requests
-		 */
-		authenticate(userName: string, password: string, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
-		/**
-		 * Removes focus from the window.
-		 */
-		blur(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Brings the window to the front of the OpenFin window stack.
-		 */
-		bringToFront(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Closes the window.
-		 * @param Close will be prevented from closing when force is false and 'close-requested' has been subscribed to for application's main window.
-		 */
-		close(force?: boolean, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Prevents a user from changing a window's size/position when using the window's frame.
-		 * 'disabled-frame-bounds-changing' is generated at the start of and during a user move/size operation.
-		 * 'disabled-frame-bounds-changed' is generated after a user move/size operation.
-		 * The events provide the bounds that would have been applied if the frame was enabled.
-		 * 'frame-disabled' is generated when an enabled frame becomes disabled.
-		 */
-		disableFrame(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Re-enables user changes to a window's size/position when using the window's frame.
-		 * 'disabled-frame-bounds-changing' is generated at the start of and during a user move/size operation.
-		 * 'disabled-frame-bounds-changed' is generated after a user move/size operation.
-		 * The events provide the bounds that would have been applied if the frame was enabled.
-		 * 'frame-enabled' is generated when a disabled frame has becomes enabled.
-		 */
-		enableFrame(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Flashes the window's frame and taskbar icon until the window is activated.
-		 */
-		flash(options?: any, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Gives focus to the window.
-		 */
-		focus(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Gets the current bounds (top, left, width, height) of the window.
-		 */
-		getBounds(callback?: (bounds: WindowBounds) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Retrieves an array containing wrapped fin.desktop.Windows that are grouped with this window. If a window is not in a group an empty array is returned.
-		 * Please note that calling window is included in the result array.
-		 */
-		getGroup(callback?: (group: OpenFinWindow[]) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Gets the current settings of the window.
-		 */
-		getOptions(callback?: (options: WindowOptions) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Gets a base64 encoded PNG snapshot of the window.
-		 */
-		getSnapshot(callback?: (base64Snapshot: string) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Gets the current state ("minimized", "maximized", or "restored") of the window.
-		 */
-		getState(callback?: (state: "minimized" | "maximized" | "restored") => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Returns the zoom level of the window.
-		 */
-		getZoomLevel(callback?: (level: number) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Hides the window.
-		 */
-		hide(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Determines if the window is currently showing.
-		 */
-		isShowing(callback?: (showing: boolean) => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Joins the same window group as the specified window.
-		 */
-		joinGroup(target: OpenFinWindow, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Leaves the current window group so that the window can be move independently of those in the group.
-		 */
-		leaveGroup(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Maximizes the window.
-		 */
-		maximize(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Merges the instance's window group with the same window group as the specified window
-		 */
-		mergeGroups(target: OpenFinWindow, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Minimizes the window.
-		 */
-		minimize(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Moves the window by a specified amount.
-		 */
-		moveBy(deltaLeft: number, deltaTop: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Moves the window to a specified location.
-		 */
-		moveTo(left: number, top: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Removes a previously registered event listener from the specified event.
-		 */
-		removeEventListener(
-			type: OpenFinWindowEventType,
-			listener: (event: WindowBaseEvent
-				| WindowAuthRequestedEvent
-				| WindowBoundsEvent
-				| WindowExternalProcessStartedEvent
-				| WindowExternalProcessExited
-				| WindowGroupChangedEvent
-				| WindowHiddenEvent
-				| Window_NavigationRejectedEvent) => void,
-			callback?: () => void,
-			errorCallback?: (reason: string) => void): void;
-		/**
-		 * Resizes the window by a specified amount.
-		 */
-		resizeBy(deltaWidth: number, deltaHeight: number, anchor: OpenFinAnchor, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Resizes the window by a specified amount.
-		 */
-		resizeTo(width: number, height: number, anchor: OpenFinAnchor, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Restores the window to its normal state (i.e., unminimized, unmaximized).
-		 */
-		restore(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Will bring the window to the front of the entire stack and give it focus.
-		 */
-		setAsForeground(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Sets the window's size and position
-		 */
-		setBounds(left: number, top: number, width: number, height: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Sets the zoom level of the window.
-		 */
-		setZoomLevel(level: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Shows the window if it is hidden.
-		 * @param Show will be prevented from closing when force is false and 'show-requested' has been subscribed to for application's main window.
-		 */
-		show(force?: boolean, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Shows the window if it is hidden at the specified location. If the toggle parameter is set to true, the window will alternate between showing and hiding.
-		 */
-		showAt(left: number, top: number, force?: boolean, callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Stops the taskbar icon from flashing.
-		 */
-		stopFlashing(callback?: () => void, errorCallback?: (reason: string) => void): void;
-		/**
-		 * Updates the window using the passed options
-		 */
-		updateOptions(options: WindowOptions, callback?: () => void, errorCallback?: (reason: string) => void): void;
-	}
-
-	interface ApplicationBaseEvent {
-		topic: string;
-		type: OpenFinApplicationEventType;
-		uuid: string;
-	}
-
-	interface TrayIconClickedEvent extends ApplicationBaseEvent {
-		button: number; // 0 for left, 1 for middle, 2 for right
-		monitorInfo: MonitorInfo;
-		x: number; // the cursor x coordinate
-		y: number; // the cursor y coordinate
-	}
-
-	interface WindowEvent extends ApplicationBaseEvent {
-		name: string;
-	}
-
-	interface WindowAlertRequestedEvent extends WindowEvent {
-		message: string;
-		url: string;
-	}
-
-	interface WindowAuthRequested extends WindowEvent {
-		authInfo: {
-			host: string;
-			isProxy: boolean;
-			port: number;
-			realm: string;
-			scheme: string;
-		};
-	}
-
-	interface WindowNavigationRejectedEvent extends WindowEvent {
-		sourceName: string;
-		url: string;
-	}
-
-	interface WindowEndLoadEvent extends WindowEvent {
-		documentName: string;
-		isMain: boolean;
-	}
-
-	interface MonitorInfoChangedEvent extends MonitorInfo {
-		topic: "system";
-		type: "monitor-info-changed";
-	}
-
-	interface MonitorInfo {
-		nonPrimaryMonitors: MonitorInfoDetail[];
-		primaryMonitor: MonitorInfoDetail;
-		reason: string;
-		taskbar: {
-			edge: "left" | "right" | "top" | "bottom",
-			rect: MontiorCoordinates
-		};
-		topic: "system";
-		type: "monitor-info-changed";
-		virtualScreen: MontiorCoordinates;
-	}
-
-	interface MonitorInfoDetail {
-		availableRect: MontiorCoordinates;
-		deviceId: string;
-		displayDeviceActive: boolean;
-		monitorRect: MontiorCoordinates;
-		name: string;
-	}
-
-	interface MontiorCoordinates {
-		bottom: number;
-		left: number;
-		right: number;
-		top: number;
-	}
-
-	interface VirtualScreenCoordinates {
-		left: number;
-		top: number;
-	}
-
-	interface SystemBaseEvent {
-		topic: string;
-		type: OpenFinSystemEventType;
-		uuid: string;
-	}
-
-	interface DesktopIconClickedEvent {
-		mouse: {
-			/**
-			 * the left virtual screen coordinate of the mouse
-			 */
-			left: number,
-			/**
-			 * the top virtual screen coordinate of the mouse
-			 */
-			top: number
-		};
-		/**
-		 * the number of milliseconds that have elapsed since the system was started,
-		 */
-		tickCount: number;
-		topic: "system";
-		type: "desktop-icon-clicked";
-	}
-
-	interface IdleStateChangedEvent {
-		/**
-		 * How long in milliseconds since the user has been idle.
-		 */
-		elapsedTime: number;
-		/**
-		 * true when the user is idle,false when the user has returned;
-		 */
-		isIdle: boolean;
-		topic: "system";
-		type: "idle-state-changed";
-	}
-
-	interface WindowBaseEvent {
-		/**
-		 * the name of the window
-		 */
-		name: string;
-		/**
-		 * always window
-		 */
-		topic: "window";
-		/**
-		 * window event type
-		 */
-		type: OpenFinWindowEventType;
-		/**
-		 * the UUID of the application the window belongs to
-		 */
-		uuid: string;
-	}
-
-	interface WindowAuthRequestedEvent extends WindowBaseEvent {
-		authInfo: {
-			host: string;
-			isProxy: boolean;
-			port: number;
-			realm: string;
-			scheme: string;
-		};
-	}
-
-	interface WindowBoundsEvent extends WindowBaseEvent {
-		/**
-		 * describes what kind of change occurred.
-		 * 0 means a change in position.
-		 * 1 means a change in size.
-		 * 2 means a change in position and size.
-		 */
-		changeType: number;
-		/**
-		 * true when pending changes have been applied to the window.
-		 */
-		deferred: boolean;
-		/**
-		 * the new height of the window.
-		 */
-		height: number;
-		/**
-		 * the left-most coordinate of the window.
-		 */
-		left: number;
-		/**
-		 * the top-most coordinate of the window.
-		 */
-		top: number;
-
-		type: "bounds-changed" | "bounds-changing" | "disabled-frame-bounds-changed" | "disabled-frame-bounds-changing";
-		/**
-		 * the new width of the window.
-		 */
-		width: number;
-	}
-
-	interface WindowExternalProcessStartedEvent extends WindowBaseEvent {
-		/**
-		 * the process handle uuid
-		 */
-		processUuid: string;
-		type: "external-process-started";
-	}
-
-	interface WindowExternalProcessExited extends WindowBaseEvent {
-		/**
-		 * the process exit code
-		 */
-		exitCode: number;
-		/**
-		 * the process handle uuid
-		 */
-		processUuid: string;
-		type: "external-process-exited";
-	}
-
-	interface WindowGroupChangedEvent extends WindowBaseEvent {
-		/**
-		 * Which group array the window that the event listener was registered on is included in:
-		 * 'source' The window is included in sourceGroup.
-		 * 'target' The window is included in targetGroup.
-		 * 'nothing' The window is not included in sourceGroup nor targetGroup.
-		 */
-		memberOf: "source" | "target" | "nothing";
-		/**
-		 * The reason this event was triggered.
-		 * 'leave' A window has left the group due to a leave or merge with group.
-		 * 'join' A window has joined the group.
-		 * 'merge' Two groups have been merged together.
-		 * 'disband' There are no other windows in the group.
-		 */
-		reason: "leave" | "join" | "merge" | "disband";
-		/**
-		 * All the windows in the group the sourceWindow originated from.
-		 */
-		sourceGroup: WindowOfGroupInfo[];
-		/**
-		 * The UUID of the application the sourceWindow belongs to The source window is the window in which (merge/join/leave)group(s) was called.
-		 */
-		sourceWindowAppUuid: string;
-		/**
-		 * the name of the sourcewindow.The source window is the window in which(merge / join / leave) group(s) was called.
-		 */
-		sourceWindowName: string;
-		/**
-		 * All the windows in the group the targetWindow orginated from
-		 */
-		targetGroup: WindowOfGroupInfo[];
-		/**
-		 * The UUID of the application the targetWindow belongs to. The target window is the window that was passed into (merge/join) group(s).
-		 */
-		targetWindowAppUuid: string;
-		/**
-		 * The name of the targetWindow. The target window is the window that was passed into (merge/join) group(s).
-		 */
-		targetWindowName: string;
-		type: "group-changed";
-	}
-
-	interface WindowOfGroupInfo {
-		/**
-		 * The UUID of the application this window entry belongs to.
-		 */
-		appUuid: string;
-		/**
-		 * The name of this window entry.
-		 */
-		windowName: string;
-	}
-
-	interface WindowHiddenEvent extends WindowBaseEvent {
-		/**
-		 * What action prompted the close.
-		 * The reasons are: "hide", "hide-on-close"
-		 */
-		reason: "hide" | "hide-on-close";
-		type: "hidden";
-	}
-
-	interface Window_NavigationRejectedEvent {
-		name: string;
-		/**
-		 * source of navigation window name
-		 */
-		sourceName: string;
-		topic: "navigation-rejected";
-		/**
-		 * Url that was not reached "http://blocked-content.url"
-		 */
-		url: string;
-		/**
-		 * the UUID of the application the window belongs to.
-		 */
-		uuid: string;
-	}
-
-	interface AnimationTransition {
-		opacity?: {
-			/**
-			 * This value is clamped from 0.0 to 1.0
-			 */
-			opacity?: number;
-			/**
-			 * The total time in milliseconds this transition should take.
-			 */
-			duration?: number;
-			/**
-			 * Treat 'opacity' as absolute or as a delta. Defaults to false.
-			 */
-			relative?: boolean;
-		};
-		position?: {
-			/**
-			 * Defaults to the window's current left position in virtual screen coordinates.
-			 */
-			left?: number;
-			/**
-			 * Defaults to the window's current top position in virtual screen coordinates.
-			 */
-			top?: number;
-			/**
-			 * The total time in milliseconds this transition should take.
-			 */
-			duration?: number;
-			/**
-			 * Treat 'left' and 'top' as absolute or as deltas. Defaults to false.
-			 */
-			relative?: boolean;
-		};
-		size?: {
-			/**
-			 * Optional if height is present. Defaults to the window's current width.
-			 */
-			width?: number;
-			/**
-			 * Optional if width is present. Defaults to the window's current height.
-			 */
-			height?: number;
-			/**
-			 * The total time in milliseconds this transition should take.
-			 */
-			duration?: number;
-			/**
-			 * Treat 'width' and 'height' as absolute or as deltas. Defaults to false.
-			 */
-			relative?: boolean;
-		};
-	}
-
-	interface AnimationOptions {
-		/**
-		 * This option interrupts the current animation. When false it pushes this animation onto the end of the animation queue.
-		 */
-		interrupt?: boolean;
-		/**
-		 * Transition effect. Defaults to 'ease-in-out'.
-		 */
-		tween?: OpenFinTweenType;
-	}
-
-	interface WindowBounds {
-		/**
-		 * the height of the window.
-		 */
-		height?: number;
-		/**
-		 * left-most coordinate of the window.
-		 */
-		left?: number;
-		/**
-		 * top-most coordinate of the window.
-		 */
-		top?: number;
-		/**
-		 * the width of the window.
-		 */
-		width?: number;
-	}
-
-	interface SessionChangedEvent {
-		/**
-		 * the action that triggered this event:
-		 */
-		reason: "lock"
-		| "unlock"
-		| "remote-connect"
-		| "remote-disconnect"
-		| "unknown";
-		topic: "system";
-		type: "session-changed";
-	}
-
-	interface LaunchInfo {
-		launchMode: "fin-protocol"
-		| "fins-protocol"
-		| "shortcut"
-		| "command-line"
-		| "adapter"
-		| "other"
-		| string;
-	}
-
-	type OpenFinTweenType = "linear"
-		| "ease-in"
-		| "ease-out"
-		| "ease-in-out"
-		| "ease-in-quad"
-		| "ease-out-quad"
-		| "ease-in-out-quad"
-		| "ease-in-cubic"
-		| "ease-out-cubic"
-		| "ease-in-out-cubic"
-		| "ease-out-bounce"
-		| "ease-in-back"
-		| "ease-out-back"
-		| "ease-in-out-back"
-		| "ease-in-elastic"
-		| "ease-out-elastic"
-		| "ease-in-out-elastic";
-
-	type OpenFinApplicationEventType = "closed"
-		| "connected"
-		| "crashed"
-		| "initialized"
-		| "manifest-changed"
-		| "not-responding"
-		| "out-of-memory"
-		| "responding"
-		| "run-requested"
-		| "started"
-		| "tray-icon-clicked"
-		| "window-alert-requested"
-		| "window-auth-requested"
-		| "window-closed"
-		| "window-created"
-		| "window-end-load"
-		| "window-navigation-rejected"
-		| "window-show-requested"
-		| "window-start-load";
-
-	type OpenFinExternalApplicationEventType = "connected"
-		| "disconnected";
-
-	type OpenFinSystemEventType = "application-closed"
-		| "application-crashed"
-		| "application-created"
-		| "application-started"
-		| "desktop-icon-clicked"
-		| "idle-state-changed"
-		| "monitor-info-changed"
-		| "session-changed";
-
-	type OpenFinWindowEventType = "auth-requested"
-		| "blurred"
-		| "bounds-changed"
-		| "bounds-changing"
-		| "close-requested"
-		| "closed"
-		| "disabled-frame-bounds-changed"
-		| "disabled-frame-bounds-changing"
-		| "embedded"
-		| "external-process-exited"
-		| "external-process-started"
-		| "focused"
-		| "frame-disabled"
-		| "frame-enabled"
-		| "group-changed"
-		| "hidden"
-		| "initialized"
-		| "maximized"
-		| "minimized"
-		| "navigation-rejected"
-		| "restored"
-		| "show-requested"
-		| "shown";
-
-	type OpenFinAnchor = "top-left"
-		| "top-right"
-		| "bottom-left"
-		| "bottom-right";
+    const desktop: OpenFinDesktop;
+
+    interface OpenFinDesktop {
+        main(f: () => any): void;
+        Application: OpenFinApplicationStatic;
+        ExternalApp: OpenFinExternalApplicationStatic;
+        InterApplicationBus: OpenFinInterApplicationBus;
+        Notification: OpenFinNotificationStatic;
+        System: OpenFinSystem;
+        Window: OpenFinWindowStatic;
+        Frame: OpenFinFrameStatic;
+    }
+
+    interface OpenFinApplicationStatic {
+        /**
+         * Creates a new Application.
+         * An object representing an application. Allows the developer to create, execute, show/close an application as well as listen to application events.
+         */
+        new (
+            options: ApplicationOptions,
+            callback?: (successObj: { httpResponseCode: number }) => void,
+            errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): OpenFinApplication;
+        /**
+         * Launches the given Application manifest.
+         */
+        createFromManifest(manifestUrl: string, callback?: (app: OpenFinApplication) => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+        /**
+         * Returns an Application object that represents an existing application.
+         */
+        getCurrent(): OpenFinApplication;
+        /**
+         * Returns an Application object that represents an existing application.
+         */
+        wrap(uuid: string): OpenFinApplication;
+    }
+
+    /**
+     * Application
+     * An object representing an application.Allows the developer to create, execute, show / close an application as well as listen to application events.
+     */
+    interface OpenFinApplication {
+        /**
+         * Returns an instance of the main Window of the application
+         */
+        getWindow(): OpenFinWindow;
+        /**
+         * Registers an event listener on the specified event.
+         */
+        addEventListener(
+            type: OpenFinApplicationEventType,
+            listener: (event: ApplicationBaseEvent
+                | TrayIconClickedEvent
+                | WindowEvent
+                | WindowAlertRequestedEvent
+                | WindowAuthRequested
+                | WindowNavigationRejectedEvent
+                | WindowEndLoadEvent) => void,
+            callback?: () => void,
+            errorCallback?: (reason: string) => void): void;
+        /**
+         * Closes the application and any child windows created by the application.
+         */
+        close(force?: boolean, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves an array of wrapped fin.desktop.Windows for each of the application's child windows.
+         */
+        getChildWindows(callback?: (children: OpenFinWindow[]) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves an array of active window groups for all of the application's windows. Each group is represented as an array of wrapped fin.desktop.Windows.
+         */
+        getGroups(callback?: (groups: OpenFinWindow[][]) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves the JSON manifest that was used to create the application. Invokes the error callback if the application was not created from a manifest.
+         */
+        getManifest(callback?: (manifest: any) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves UUID of the application that launches this application. Invokes the error callback if the application was created from a manifest.
+         */
+        getParentUuid(callback?: (uuid: string) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves current configuration of application's shortcuts.
+         */
+        getShortcuts(callback?: (config: ShortCutConfig) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves information about the application.
+         */
+        getInfo(callback?: (info: LaunchInfo) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves information about the system tray.
+         */
+        getTrayIconInfo(callback?: (trayInfo: TrayIconInfo) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Determines if the application is currently running.
+         */
+        isRunning(callback?: (running: boolean) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Registers a username and an app name for licensing purposes.
+         */
+        registerUser(userName: string, appName: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Removes a previously registered event listener from the specified event.
+         */
+        removeEventListener(
+            type: OpenFinApplicationEventType,
+            previouslyRegisteredListener: (event: ApplicationBaseEvent
+                | TrayIconClickedEvent
+                | WindowEvent
+                | WindowAlertRequestedEvent
+                | WindowAuthRequested
+                | WindowNavigationRejectedEvent
+                | WindowEndLoadEvent) => any,
+            callback?: () => void,
+            errorCallback?: (reason: string) => void): void;
+        /**
+         * Removes the application's icon from the tray.
+         */
+        removeTrayIcon(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Restarts the application.
+         */
+        restart(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Runs the application. When the application is created, run must be called.
+         */
+        run(callback?: (successObj: SuccessObj) => void, errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): void;
+        /**
+         * Tells the rvm to relaunch the main application once upon a complete shutdown
+         */
+        scheduleRestart(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Sets new shortcut configuration for current application.
+         * Application has to be launched with a manifest and has to have shortcut configuration (icon url, name, etc.) in its manifest to
+         * be able to change shortcut states.
+         */
+        setShortcuts(config: ShortCutConfig, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Adds a customizable icon in the system tray and notifies the application when clicked.
+         */
+        setTrayIcon(iconUrl: string, listener: (clickInfo: TrayIconClickedEvent) => void, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Closes the application by terminating its process.
+         */
+        terminate(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Waits for a hanging application. This method can be called in response to an application "not-responding" to allow the application
+         * to continue and to generate another "not-responding" message after a certain period of time.
+         */
+        wait(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * The Application's uuid
+         */
+        uuid: string;
+    }
+
+    interface ShortCutConfig {
+        /**
+         * application has a shortcut on the desktop
+         */
+        desktop?: boolean;
+        /**
+         * application has no shortcut in the start menu
+         */
+        startMenu?: boolean;
+        /**
+         * application will be launched on system startup
+         */
+        systemStartup?: boolean;
+    }
+
+    interface SuccessObj {
+        httpResponseCode: number;
+    }
+
+    interface NetworkErrorInfo extends ErrorInfo {
+        networkErrorCode: number;
+    }
+
+    interface ErrorInfo {
+        stack: string;
+        message: string;
+    }
+
+    interface ApplicationOptions {
+        /**
+         * The name of the application.
+         */
+        name?: string;
+        /**
+         * The url to the application.
+         */
+        url?: string;
+        /**
+         * The UUID of the application, unique within the set of all other applications running in the OpenFin Runtime. name and uuid must match.
+         */
+        uuid?: string;
+        /**
+         * Enable Flash at the application level. Default: false.
+         */
+        plugins?: boolean;
+        /**
+         * The options of the main window of the application.
+         */
+        mainWindowOptions?: WindowOptions;
+    }
+
+    interface WindowOptions {
+        /**
+         * Enable keyboard shortcuts for devtools and zoom. Default: false for both.
+         */
+        accelerator?: {
+            devtools?: boolean,
+            zoom?: boolean,
+            reload?: boolean,
+            reloadIgnoreCache?: boolean,
+        };
+        /**
+         * A flag to always position the window at the top of the window stack. Default: false.
+         * Updatable
+         */
+        alwaysOnTop?: boolean;
+        /**
+         * A flag to automatically show the Window when it is created. Default: false.
+         */
+        autoShow?: boolean;
+        /**
+         * A flag to show the context menu when right-clicking on a window. Gives access to the Developer Console for the Window. Default: true
+         * Updatable
+         */
+        contextMenu?: boolean;
+        /**
+         * This defines and applies rounded corners for a frameless window. Default for both width and height: 0.
+         * Updatable
+         */
+        cornerRounding?: {
+            width?: number;
+            height?: number;
+        };
+        /**
+         * A field that the user can attach serializable data to to be ferried around with the window options. Default: ''.
+         */
+        customData?: any;
+        /**
+         * Specifies that the window will be positioned in the center of the primary monitor when loaded for the first time on a machine.
+         * When the window corresponding to that id is loaded again, the position from before the window was closed is used.
+         * This option overrides defaultLeft and defaultTop. Default: false.
+         */
+        defaultCentered?: boolean;
+        /**
+         * The default height of the window. Specifies the height of the window when loaded for the first time on a machine.
+         *  When the window corresponding to that id is loaded again, the height is taken to be the last height of the window before it was closed. Default: 500.
+         */
+        defaultHeight?: number;
+        /**
+         * The default left position of the window. Specifies the position of the left of the window when loaded for the first time on a machine.
+         *  When the window corresponding to that id is loaded again, the value of left is taken to be the last value before the window was closed. Default: 100.
+         */
+        defaultWidth?: number;
+        /**
+         * The default top position of the window. Specifies the position of the top of the window when loaded for the first time on a machine.
+         * When the window corresponding to that id is loaded again, the value of top is taken to be the last value before the window was closed. Default: 100.
+         */
+        defaultTop?: number;
+        /**
+         * The default width of the window. Specifies the width of the window when loaded for the first time on a machine.
+         * When the window corresponding to that id is loaded again, the width is taken to be the last width of the window before it was closed. Default: 800.
+         */
+        defaultLeft?: number;
+        /**
+         * A flag to show the frame. Default: true.
+         * Updatable
+         */
+        frame?: boolean;
+        /**
+         * A flag to allow a window to be hidden when the close button is clicked.Default: false.
+         * Updatable
+         */
+        hideOnClose?: boolean;
+        /**
+         * A URL for the icon to be shown in the window title bar and the taskbar.Default: The parent application's applicationIcon.
+         * Updatable
+         */
+        icon?: string;
+        /**
+         * The maximum height of a window.Will default to the OS defined value if set to - 1. Default: -1.
+         * Updatable
+         */
+        maxHeight?: number;
+        /**
+         * A flag that lets the window be maximized.Default: true.
+         * Updatable
+         */
+        maximizable?: boolean;
+        /**
+         * The maximum width of a window.Will default to the OS defined value if set to - 1. Default: -1.
+         * Updatable
+         */
+        maxWidth?: number;
+        /**
+         * The minimum height of a window.Default: 0.
+         * Updatable
+         */
+        minHeight?: number;
+        /**
+         * A flag that lets the window be minimized.Default: true.
+         */
+        minimizable?: boolean;
+        /**
+         * The minimum width of a window.Default: 0.
+         */
+        minWidth?: number;
+        /**
+         * The name for the window which must be unique within the context of the invoking Application.
+         */
+        name?: string;
+        /**
+         * A flag that specifies how transparent the window will be.This value is clamped between 0.0 and 1.0.Default: 1.0.
+         * Updatable
+         */
+        opacity?: number;
+        /**
+         * A flag to drop to allow the user to resize the window.Default: true.
+         * Updatable
+         */
+        resizable?: boolean;
+        /**
+         * Defines a region in pixels that will respond to user mouse interaction for resizing a frameless window.
+         * Updatable
+         */
+        resizeRegion?: {
+            /**
+             * The size in pixels (Default: 2),
+             */
+            size?: number;
+            /**
+             * The size in pixels of an additional
+             * square resizable region located at the
+             * bottom right corner of a
+             * frameless window. (Default: 4)
+             */
+            bottomRightCorner?: number;
+        };
+        /**
+         * A flag to show the Window's icon in the taskbar. Default: true.
+         */
+        showTaskbarIcon?: boolean;
+        /**
+         * A flag to cache the location of the window or not. Default: true.
+         */
+        saveWindowState?: boolean;
+        /**
+         * Specify a taskbar group for the window. Default: app's uuid.
+         */
+        taskbarIconGroup?: string;
+        /**
+         * A string that sets the window to be "minimized", "maximized", or "normal" on creation. Default: "normal".
+         */
+        state?: string;
+        /**
+         * The URL of the window. Default: "about:blank".
+         */
+        url?: string;
+        /**
+         * When set to false, the window will render before the "load" event is fired on the content's window.
+         * Caution, when false you will see an initial empty white window. Default: true.
+         */
+        waitForPageLoad?: boolean;
+    }
+
+    /**
+     * Clipboard
+     * Clipboard API allows reading and writting to the clipboard in multiple formats.
+     */
+    interface OpenFinClipboard {
+        /**
+         * Reads available formats for the clipboard type
+         */
+        availableFormats(type: string | null, callback?: (formats: string[]) => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+        /**
+         * Reads available formats for the clipboard type
+         */
+        readHtml(type: string | null, callback?: (html: string) => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+        /**
+         * Read the content of the clipboard as Rtf
+         */
+        readRtf(type: string | null, callback?: (rtf: string) => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+        /**
+         * Read the content of the clipboard as plain text
+         */
+        readText(type: string | null, callback?: (text: string) => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+        /**
+         * Writes data into the clipboard
+         */
+        write(data: any, type: string | null, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+        /**
+         * Writes data into the clipboard as Html
+         */
+        writeHtml(data: string, type: string | null, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+        /**
+         * Writes data into the clipboard as Rtf
+         */
+        writeRtf(data: string, type: string | null, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+        /**
+         * Writes data into the clipboard as plain text
+         */
+        writeText(data: string, type: string | null, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+    }
+
+    interface OpenFinExternalApplicationStatic {
+        /**
+         * Returns an External Application object that represents an existing external application.
+         */
+        wrap(uuid: string): OpenFinExternalApplication;
+    }
+    /**
+     * ExternalApplication
+     * An object representing an application. Allows the developer to create, execute, show and close an application, as well as listen to application events.
+     */
+    interface OpenFinExternalApplication {
+        /**
+         * Retrieves information about the application.
+         */
+        getInfo(callback?: (info: ExternalApplicationInfo) => void,
+                errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+        /**
+         * Registers an event listener on the specified event.
+         */
+        addEventListener(
+            type: OpenFinExternalApplicationEventType,
+            listener: () => void,
+            callback?: () => void,
+            errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+        /**
+         * Removes a previously registered event listener from the specified event.
+         */
+        removeEventListener(
+            type: OpenFinExternalApplicationEventType,
+            listener: () => void,
+            callback?: () => void,
+            errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+    }
+
+    /**
+     * InterApplicationBus
+     * A messaging bus that allows for pub/sub messaging between different applications.
+     */
+    interface OpenFinInterApplicationBus {
+        /**
+         * Adds a listener that gets called when applications subscribe to the current application's messages.
+         */
+        addSubscribeListener(listener: (uuid: string, topic: string, name: string) => void): void;
+        /**
+         * Adds a listener that gets called when applications unsubscribe to the current application's messages.
+         */
+        addUnsubscribeListener(listener: (uuid: string, topic: string, name: string) => void): void;
+        /**
+         * Removes a previously registered subscribe listener.
+         */
+        removeSubscribeListener(listener: (uuid: string, topic: string, name: string) => void): void;
+        /**
+         * Removes a previously registered unsubscribe listener.
+         */
+        removeUnsubscribeListener(listener: (uuid: string, topic: string, name: string) => void): void;
+        /**
+         * Publishes a message to all applications running on OpenFin Runtime that are subscribed to the specified topic.
+         */
+        publish(topic: string, message: any, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Sends a message to a specific application on a specific topic.
+         */
+        send(destinationUuid: string, name: string, topic: string, message: any, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        send(destinationUuid: string, topic: string, message: any, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Subscribes to messages from the specified application on the specified topic. If the subscription is for a uuid, [name],
+         * topic combination that has already been published to upon subscription you will receive the last 20 missed messages in the order they were published.
+         */
+        subscribe(
+            senderUuid: string,
+            name: string,
+            topic: string,
+            listener: (message: any, uuid: string, name: string) => void,
+            callback?: () => void,
+            errorCallback?: (reason: string) => void): void;
+        subscribe(
+            senderUuid: string,
+            topic: string,
+            listener: (message: any, uuid: string, name: string) => void,
+            callback?: () => void,
+            errorCallback?: (reason: string) => void): void;
+        /**
+         * Unsubscribes to messages from the specified application on the specified topic.
+         */
+        unsubscribe(
+            senderUuid: string,
+            name: string,
+            topic: string,
+            listener: (message: any, uuid: string, name: string) => void,
+            callback?: () => void,
+            errorCallback?: (reason: string) => void): void;
+        unsubscribe(
+            senderUuid: string,
+            topic: string,
+            listener: (message: any, uuid: string, name: string) => void,
+            callback?: () => void,
+            errorCallback?: (reason: string) => void): void;
+    }
+
+    interface OpenFinNotificationStatic {
+        /**
+         * ctor
+         */
+        new (options: NotificationOptions, callback?: () => void, errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): OpenFinNotification;
+        /**
+         * Gets an instance of the current notification. For use within a notification window to close the window or send a message back to its parent application.
+         */
+        getCurrent(): OpenFinNotification;
+    }
+
+    /**
+     * Notification
+     * Notification represents a window on OpenFin Runtime which is shown briefly to the user on the bottom-right corner of the primary monitor.
+     * A notification is typically used to alert the user of some important event which requires his or her attention.
+     * Notifications are a child or your application that are controlled by the runtime.
+     */
+    interface OpenFinNotification {
+        /**
+         * Closes the notification.
+         */
+        close(callback?: () => void): void;
+        /**
+         * Sends a message to the notification.
+         */
+        sendMessage(message: any, callback?: () => void): void;
+        /**
+         * Sends a message from the notification to the application that created the notification. The message is handled by the notification's onMessage callback.
+         */
+        sendMessageToApplication(message: any, callback?: () => void): void;
+    }
+
+    interface NotificationOptions {
+        /**
+         * A boolean that will force dismissal even if the mouse is hovering over the notification
+         */
+        ignoreMouseOver?: boolean;
+        /**
+         * A message of any primitive or composite-primitive type to be passed to the notification upon creation.
+         */
+        message?: any;
+        /**
+         * The timeout for displaying a notification.Can be in milliseconds or "never".
+         */
+        duration?: number | "never";
+        /**
+         * The url of the notification
+         */
+        url?: string;
+        /**
+         * A function that is called when a notification is clicked.
+         */
+        onClick?(callback: () => void): void;
+        /**
+         * Invoked when the notification is closed via .close() method on the created notification instance
+         * or the by the notification itself via fin.desktop.Notification.getCurrent().close().
+         * NOTE: this is not invoked when the notification is dismissed via a swipe. For the swipe dismissal callback see onDismiss
+         */
+        onClose?(callback: () => void): void;
+        /**
+         * Invoked when a the notification is dismissed by swiping it off the screen to the right. NOTE: this is no fired on a programmatic close.
+         */
+        onDismiss?(callback: () => void): void;
+        /**
+         * A function that is called when an error occurs.The reason for the error is passed as an argument.
+         */
+        onError?(errorCallback: (reason: string, errorObj: NetworkErrorInfo) => void): void;
+        /**
+         * The onMessage function will respond to messages sent from notification.sendMessageToApplication.
+         * The function is passed the message, which can be of any primitive or composite-primitive type.
+         */
+        onMessage?(callback: (message: any) => void): void;
+        /**
+         * A function that is called when a notification is shown.
+         */
+        onShow?(callback: (successObj: SuccessObj) => void): void;
+    }
+
+    /**
+     * System
+     * An object representing the core of OpenFin Runtime.
+     * Allows the developer to perform system-level actions, such as accessing logs, viewing processes, clearing the cache and exiting the runtime.
+     */
+    interface OpenFinSystem {
+        Clipboard: OpenFinClipboard;
+        /**
+         * Registers an event listener on the specified event.
+         */
+        addEventListener(
+            type: OpenFinSystemEventType,
+            listener: (event: SystemBaseEvent | DesktopIconClickedEvent | IdleStateChangedEvent | MonitorInfoChangedEvent | SessionChangedEvent) => void,
+            callback?: () => void,
+            errorCallback?: (reason: string) => void): void;
+        /**
+         * Clears cached data containing window state/positions,
+         * application resource files (images, HTML, JavaScript files), cookies, and items stored in the Local Storage.
+         */
+        clearCache(options: CacheOptions, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Clears all cached data when OpenFin Runtime exits.
+         */
+        deleteCacheOnExit(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Downloads the given application asset
+         */
+        downloadAsset(
+            assetObj: AppAssetInfo,
+            progressListener?: (progress: { downloadedBytes: number, totalBytes: number }) => void,
+            callback?: (successObj: { path: string }) => void,
+            errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): void;
+
+        /**
+         * Download preload scripts from given URLs
+         */
+        downloadPreloadScripts(scripts: Array<DownloadPreloadOption>, callback?: (downloadInfo: Array<DownloadPreloadInfo>) => void,
+                               errorCallback?:   (reason: string) => void): void;
+        /**
+         * Downloads the given OpenFin Runtime.
+         */
+        downloadRuntime(options: RuntimeDownloadOptions, onProgress?: (progress: RuntimeDownloadProgress) => void, onComplete?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Exits the Runtime.
+         */
+        exit(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Writes any unwritten cookies data to disk.
+         */
+        flushCookieStore(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves an array of data for all applications.
+         */
+        getAllApplications(callback?: (applicationInfoList: ApplicationInfo[]) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves an array of data for all external applications.
+         */
+        getAllExternalApplications(callback?: (applicationInfoList: ApplicationInfo[]) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves an array of data (name, ids, bounds) for all application windows.
+         */
+        getAllWindows(callback?: (windowInfoList: WindowDetails[]) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Returns information about the app asset.
+         */
+        getAppAssetInfo(options: AppAssetOptions, callback?: (appAssetInfo: AppAssetInfo) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Get additional info of cookies.
+         */
+        getCookies(option: CookieOption, callback?: (info: Array<CookieInfo>) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves the command line argument string that started OpenFin Runtime.
+         */
+        getCommandLineArguments(callback?: (args: string) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves the configuration object that started the OpenFin Runtime.
+         */
+        getDeviceId(callback?: (uuid: string) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Returns a hex encoded hash of the mac address and the currently logged in user name
+         */
+        getDeviceUserId(callback?: (id: string) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Returns an Entity info object relating to the entity specified by the uuid and name passed in. The possible types are 'window', 'iframe', 'external connection' or 'unknown'.
+         */
+        getEntityInfo(uuid: string, name: string, callback?: (info: EntityInfo) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Gets the value of a given environment variable on the computer on which the runtime is installed.
+         */
+        getEnvironmentVariable(envVar: string, callback?: (variable: string) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves currently focused window identity.
+         */
+        getFocusedWindow(callback?: (focusedWindowIdentity: Identity) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves system information.
+         */
+        getHostSpecs(callback?: (info: HostSpecInfo) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves the contents of the log with the specified filename.
+         */
+        getLog(logFileName: string, callback?: (variable: string) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves an array containing information for each log file.
+         */
+        getLogList(callback?: (logInfoList: LogInfo[]) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves the minimum (inclusive) logging level that is currently being written to the logs.
+         */
+        getMinLogLevel(callback?: (logLevel: string) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves an object that contains data about the about the monitor setup of the computer that the runtime is running on.
+         */
+        getMonitorInfo(callback?: (monitorInfo: MonitorInfo) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Returns the mouse in virtual screen coordinates (left, top).
+         */
+        getMousePosition(callback?: (mousePosition: VirtualScreenCoordinates) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves an array of all of the runtime processes that are currently running.
+         * Each element in the array is an object containing the uuid and the name of the application to which the process belongs.
+         */
+        getProcessList(callback?: (processInfoList: ProcessInfo[]) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves the Proxy settings.
+         */
+        getProxySettings(callback?: (proxy: ProxyInfo) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Returns information about the running RVM in an object.
+         */
+        getRvmInfo(callback?: (rvmInfo: RvmInfo) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Returns the version of the runtime. The version contains the major, minor, build and revision numbers.
+         */
+        getVersion(callback?: (version: string) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Runs an executable or batch file.
+         */
+        launchExternalProcess(options: ExternalProcessLaunchInfo, callback?: (payload: { uuid: string }) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Writes the passed message into both the log file and the console.
+         */
+        log(level: "debug" | "info" | "warn" | "error", message: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Monitors a running process.
+         */
+        monitorExternalProcess(options: ExternalProcessInfo, callback?: (payload: { uuid: string }) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Opens the passed URL in the default web browser.
+         */
+        openUrlWithBrowser(url: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Opens the passed URL in the default web browser.
+         */
+        readRegistryValue(rootKey: string, subkey: string, value: string, callback?: (info: RegistryInfo) => void,
+                          errorCallback?: (reason: string) => void): void;
+        /**
+         * This function call will register a unique id and produce a token. The token can be used to broker an external connection.
+         */
+        registerExternalConnection(
+            uuid: string,
+            callback?: (detail: {
+                /**
+                 * this will be unique each time
+                 */
+                token: string;
+                /**
+                 * "remote-connection-uuid"
+                 */
+                uuid: string;
+            }) => void,
+            errorCallback?: (reason: string) => void): void;
+        /**
+         * Removes the process entry for the passed UUID obtained from a prior call of fin.desktop.System.launchExternalProcess().
+         */
+        releaseExternalProcess(processUuid: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Removes a previously registered event listener from the specified event.
+         */
+        removeEventListener(
+            type: OpenFinSystemEventType,
+            listener: (event: SystemBaseEvent | DesktopIconClickedEvent | IdleStateChangedEvent | MonitorInfoChangedEvent | SessionChangedEvent) => void,
+            callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Set the minimum log level above which logs will be written to the OpenFin log
+         */
+        setMinLogLevel(logLevel: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Shows the Chrome Developer Tools for the specified window.
+         */
+        showDeveloperTools(uuid: string, name: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Attempt to close an external process. The process will be terminated if it has not closed after the elapsed timeout in milliseconds.
+         */
+        terminateExternalProcess(
+            processUuid: string,
+            timeout: number,
+            killTree: boolean,
+            callback?: (info: { result: "clean" | "terminated" | "failed" }) => void,
+            errorCallback?: (reason: string) => void): void;
+        terminateExternalProcess(
+            processUuid: string,
+            timeout: number,
+            callback?: (info: { result: "clean" | "terminated" | "failed" }) => void,
+            errorCallback?: (reason: string) => void): void;
+        /**
+         * Update the OpenFin Runtime Proxy settings.
+         */
+        updateProxySettings(type: string, address: string, port: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
+    }
+
+    interface CacheOptions {
+        cache?: boolean;
+        cookies?: boolean;
+        localStorage?: boolean;
+        appcache?: boolean;
+        userData?: boolean;
+    }
+
+    interface AppAssetInfo {
+        src?: string;
+        alias?: string;
+        version?: string;
+        target?: string;
+        args?: string;
+        mandatory?: boolean;
+    }
+
+    interface AppAssetOptions {
+        alias: string;
+    }
+
+    interface ApplicationInfo {
+        /**
+         * true when the application is running.
+         */
+        isRunning?: boolean;
+        /**
+         * uuid of the application.
+         */
+        uuid?: string;
+        /**
+         * uuid of the application that launches this application.
+         */
+        parentUuid?: string;
+    }
+
+    interface Identity {
+        uuid: string;
+        name: string;
+    }
+
+    interface EntityInfo {
+        name: string;
+        uuid: string;
+        parent: Identity;
+        entityType: string;
+    }
+
+    interface DownloadPreloadOption {
+        url: string;
+    }
+
+    interface DownloadPreloadInfo {
+        success: boolean;
+            url?: string;
+            error: string;
+        }
+
+
+     interface CookieInfo {
+        name: string;
+        // expirationDate: Date;
+        domain: string;
+        path: string;
+    }
+
+     interface CookieOption {
+        name: string;
+    }
+
+    interface RegistryInfo {
+        data: any;
+        rootKey: string;
+        subkey: string;
+        type: string;
+        value: string;
+    }
+
+    interface RuntimeDownloadOptions {
+        version: string;
+    }
+
+    interface RuntimeDownloadProgress {
+        downloadedBytes: number;
+        totalBytes: number;
+    }
+
+    interface WindowDetails {
+        uuid?: string;
+        mainWindow?: WindowInfo;
+        childWindows?: WindowInfo[];
+    }
+
+    interface WindowInfo {
+        /**
+         * name of the child window
+         */
+        name?: string;
+        /**
+         * top-most coordinate of the child window
+         */
+        top?: number;
+        /**
+         * right-most coordinate of the child window
+         */
+        right?: number;
+        /**
+         * bottom-most coordinate of the child window
+         */
+        bottom?: number;
+        /**
+         * left-most coordinate of the child window
+         */
+        left?: number;
+    }
+
+    interface HostSpecInfo {
+        /**
+         * "x86" for 32-bit or "x86_64" for 64-bit
+         */
+        arch: string;
+        /**
+         * Same payload as Node's os.cpus()
+         */
+        cpus: NodeCpuInfo[];
+        gpu: {
+            /**
+             * Graphics card name
+             */
+            name: string;
+        };
+        /**
+         * Same payload as Node's os.totalmem()
+         */
+        memory: number;
+        /**
+         * OS name and version/edition
+         */
+        name: string;
+    }
+
+    interface NodeCpuInfo {
+        model: string;
+        /**
+         * in MHz
+         */
+        speed: number;
+        times: {
+            /**
+             * The number of milliseconds the CPU has spent in user mode.
+             */
+            user: number;
+            /**
+             * The number of milliseconds the CPU has spent in nice mode.
+             */
+            nice: number;
+            /**
+             * The number of milliseconds the CPU has spent in sys mode.
+             */
+            sys: number;
+            /**
+             * The number of milliseconds the CPU has spent in idle mode.
+             */
+            idle: number;
+            /**
+             * The number of milliseconds the CPU has spent in irq mode.
+             */
+            irq: number;
+        };
+    }
+
+    interface LogInfo {
+        /**
+         * the filename of the log
+         */
+        name?: string;
+        /**
+         * the size of the log in bytes
+         */
+        size?: number;
+        /**
+         * the unix time at which the log was created "Thu Jan 08 2015 14:40:30 GMT-0500 (Eastern Standard Time)"
+         */
+        date?: string;
+    }
+
+    interface ProcessInfo {
+        /**
+         * the percentage of total CPU usage
+         */
+        cpuUsage?: number;
+        /**
+         * the application name
+         */
+        name?: string;
+        /**
+         * the current nonpaged pool usage in bytes
+         */
+        nonPagedPoolUsage?: number;
+        /**
+         * the number of page faults
+         */
+        pageFaultCount?: number;
+        /**
+         * the current paged pool usage in bytes
+         */
+        pagedPoolUsage?: number;
+        /**
+         * the total amount of memory in bytes that the memory manager has committed
+         */
+        pagefileUsage?: number;
+        /**
+         * the peak nonpaged pool usage in bytes
+         */
+        peakNonPagedPoolUsage?: number;
+        /**
+         * the peak paged pool usage in bytes
+         */
+        peakPagedPoolUsage?: number;
+        /**
+         * the peak value in bytes of pagefileUsage during the lifetime of this process
+         */
+        peakPagefileUsage?: number;
+        /**
+         * the peak working set size in bytes
+         */
+        peakWorkingSetSize?: number;
+        /**
+         * the native process identifier
+         */
+        processId?: number;
+        /**
+         * the application UUID
+         */
+        uuid?: string;
+        /**
+         * the current working set size (both shared and private data) in bytes
+         */
+        workingSetSize?: number;
+    }
+
+    interface ProxyInfo {
+        /**
+         * the configured Proxy Address
+         */
+        proxyAddress?: string;
+        /**
+         * the configured Proxy port
+         */
+        proxyPort?: number;
+        /**
+         * Proxy Type
+         */
+        type?: string;
+    }
+
+    interface RvmInfo {
+        version?: string;
+        "start-time"?: string;
+    }
+
+    interface ExternalProcessLaunchInfo {
+        path?: string;
+        /**
+         * Additionally note that the executable found in the zip file specified in appAssets
+         * will default to the one mentioned by appAssets.target
+         * If the the path below refers to a specific path it will override this default
+         */
+        alias?: string;
+        /**
+         * When using alias; if no arguments are passed then the arguments (if any)
+         * are taken from the 'app.json' file, from the  'args' parameter
+         * of the 'appAssets' Object with the relevant 'alias'.
+         * If 'arguments' is passed as a parameter it takes precedence
+         * over any 'args' set in the 'app.json'.
+         */
+        arguments?: string;
+        listener?(result: {
+            /**
+             * "Exited" Or "released" on a call to releaseExternalProcess
+             */
+            topic?: string;
+            /**
+             * The mapped UUID which identifies the launched process
+             */
+            uuid?: string;
+            /*
+             * Process exit code
+             */
+            exitCode?: number;
+        }): void;
+        certificate?: CertificationInfo;
+    }
+
+    interface CertificationInfo {
+        /**
+         * A hex string with or without spaces
+         */
+        serial?: string;
+        /**
+         * An internally tokenized and comma delimited string allowing partial or full checks of the subject fields
+         */
+        subject?: string;
+        /**
+         * A hex string with or without spaces
+         */
+        publickey?: string;
+        /**
+         * A hex string with or without spaces
+         */
+        thumbprint?: string;
+        /**
+         * A boolean indicating that the certificate is trusted and not revoked
+         */
+        trusted?: boolean;
+    }
+
+    interface ExternalProcessInfo {
+        pid?: number;
+        listener?(result: {
+            /**
+             * "Exited" Or "released" on a call to releaseExternalProcess
+             */
+            topic?: string;
+            /**
+             * The mapped UUID which identifies the launched process
+             */
+            uuid?: string;
+            /*
+                * Process exit code
+                */
+            exitCode?: number;
+        }): void;
+    }
+
+    interface OpenFinWindowStatic {
+        /**
+         * Class: Window
+         *
+         * new Window(options, callbackopt, errorCallbackopt)
+         *
+         * Creates a new OpenFin Window
+         *
+         * A basic window that wraps a native HTML window. Provides more fine-grained control over the window state such as the ability to minimize,
+         * maximize, restore, etc. By default a window does not show upon instantiation; instead the window's show() method must be invoked manually.
+         * The new window appears in the same process as the parent window.
+         * @param options - The options of the window
+         * @param [callback] - Called if the window creation was successful
+         * @param [callback.successObj] - httpResponseCode
+         */
+        new (
+            options: WindowOptions,
+            callback?: (successObj: { httpResponseCode: number }) => void,
+            errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): OpenFinWindow;
+        /**
+         * Returns an instance of the current window.
+         * @returns Current window
+         */
+        getCurrent(): OpenFinWindow;
+        /**
+         * Returns a Window object that wraps an existing window.
+         */
+        wrap(appUuid: string, windowName: string): OpenFinWindow;
+    }
+
+    /**
+     * Window
+     * A basic window that wraps a native HTML window. Provides more fine-grained control over the window state such as the ability to minimize,
+     * maximize, restore, etc. By default a window does not show upon instantiation; instead the window's show() method must be invoked manually.
+     * The new window appears in the same process as the parent window.
+     */
+    interface OpenFinWindow {
+        /**
+         * Name of window
+         */
+        name: string;
+        /**
+         * Returns the native JavaScript "window" object for the window. This method can only be used by the parent application or the window itself,
+         * otherwise it will return undefined. The same Single-Origin-Policy (SOP) rules apply for child windows created by window.open(url) in that the
+         * contents of the window object are only accessible if the URL has the same origin as the invoking window. See example below.
+         * Also, will not work with fin.desktop.Window objects created with fin.desktop.Window.wrap().
+         * @returns Native window
+         */
+        getNativeWindow(): Window;
+        /**
+         * Gets the parent application.
+         * @returns Parent application
+         */
+        getParentApplication(): OpenFinApplication;
+        /**
+         * Gets the parent window.
+         */
+        getParentWindow(): OpenFinWindow;
+        /**
+         * Registers an event listener on the specified event.
+         */
+        addEventListener(
+            type: OpenFinWindowEventType,
+            listener: (event: WindowBaseEvent
+                | WindowAuthRequestedEvent
+                | WindowBoundsEvent
+                | WindowExternalProcessStartedEvent
+                | WindowExternalProcessExited
+                | WindowGroupChangedEvent
+                | WindowHiddenEvent
+                | Window_NavigationRejectedEvent) => void,
+            callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Performs the specified window transitions
+         */
+        animate(transitions: AnimationTransition, options: AnimationOptions, callback?: (event: any) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Provides credentials to authentication requests
+         */
+        authenticate(userName: string, password: string, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+        /**
+         * Removes focus from the window.
+         */
+        blur(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Brings the window to the front of the OpenFin window stack.
+         */
+        bringToFront(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Closes the window.
+         * @param Close will be prevented from closing when force is false and 'close-requested' has been subscribed to for application's main window.
+         */
+        close(force?: boolean, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Prevents a user from changing a window's size/position when using the window's frame.
+         * 'disabled-frame-bounds-changing' is generated at the start of and during a user move/size operation.
+         * 'disabled-frame-bounds-changed' is generated after a user move/size operation.
+         * The events provide the bounds that would have been applied if the frame was enabled.
+         * 'frame-disabled' is generated when an enabled frame becomes disabled.
+         */
+        disableFrame(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Re-enables user changes to a window's size/position when using the window's frame.
+         * 'disabled-frame-bounds-changing' is generated at the start of and during a user move/size operation.
+         * 'disabled-frame-bounds-changed' is generated after a user move/size operation.
+         * The events provide the bounds that would have been applied if the frame was enabled.
+         * 'frame-enabled' is generated when a disabled frame has becomes enabled.
+         */
+        enableFrame(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Flashes the window's frame and taskbar icon until the window is activated.
+         */
+        flash(options?: any, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Gives focus to the window.
+         */
+        focus(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Gets the current bounds (top, left, width, height) of the window.
+         */
+        getBounds(callback?: (bounds: WindowBounds) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Retrieves an array containing wrapped fin.desktop.Windows that are grouped with this window. If a window is not in a group an empty array is returned.
+         * Please note that calling window is included in the result array.
+         */
+        getGroup(callback?: (group: OpenFinWindow[]) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Gets the current settings of the window.
+         */
+        getOptions(callback?: (options: WindowOptions) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Gets a base64 encoded PNG snapshot of the window.
+         */
+        getSnapshot(callback?: (base64Snapshot: string) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Gets the current state ("minimized", "maximized", or "restored") of the window.
+         */
+        getState(callback?: (state: "minimized" | "maximized" | "restored") => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Returns the zoom level of the window.
+         */
+        getZoomLevel(callback?: (level: number) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Hides the window.
+         */
+        hide(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Determines if the window is currently showing.
+         */
+        isShowing(callback?: (showing: boolean) => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Joins the same window group as the specified window.
+         */
+        joinGroup(target: OpenFinWindow, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Leaves the current window group so that the window can be move independently of those in the group.
+         */
+        leaveGroup(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Maximizes the window.
+         */
+        maximize(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Merges the instance's window group with the same window group as the specified window
+         */
+        mergeGroups(target: OpenFinWindow, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Minimizes the window.
+         */
+        minimize(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Moves the window by a specified amount.
+         */
+        moveBy(deltaLeft: number, deltaTop: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Moves the window to a specified location.
+         */
+        moveTo(left: number, top: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Removes a previously registered event listener from the specified event.
+         */
+        removeEventListener(
+            type: OpenFinWindowEventType,
+            listener: (event: WindowBaseEvent
+                | WindowAuthRequestedEvent
+                | WindowBoundsEvent
+                | WindowExternalProcessStartedEvent
+                | WindowExternalProcessExited
+                | WindowGroupChangedEvent
+                | WindowHiddenEvent
+                | Window_NavigationRejectedEvent) => void,
+            callback?: () => void,
+            errorCallback?: (reason: string) => void): void;
+        /**
+         * Resizes the window by a specified amount.
+         */
+        resizeBy(deltaWidth: number, deltaHeight: number, anchor: OpenFinAnchor, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Resizes the window by a specified amount.
+         */
+        resizeTo(width: number, height: number, anchor: OpenFinAnchor, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Restores the window to its normal state (i.e., unminimized, unmaximized).
+         */
+        restore(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Will bring the window to the front of the entire stack and give it focus.
+         */
+        setAsForeground(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Sets the window's size and position
+         */
+        setBounds(left: number, top: number, width: number, height: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Sets the zoom level of the window.
+         */
+        setZoomLevel(level: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Shows the window if it is hidden.
+         * @param Show will be prevented from closing when force is false and 'show-requested' has been subscribed to for application's main window.
+         */
+        show(force?: boolean, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Shows the window if it is hidden at the specified location. If the toggle parameter is set to true, the window will alternate between showing and hiding.
+         */
+        showAt(left: number, top: number, force?: boolean, callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Stops the taskbar icon from flashing.
+         */
+        stopFlashing(callback?: () => void, errorCallback?: (reason: string) => void): void;
+        /**
+         * Updates the window using the passed options
+         */
+        updateOptions(options: WindowOptions, callback?: () => void, errorCallback?: (reason: string) => void): void;
+    }
+
+    interface OpenFinFrameStatic {
+        wrap(uuid: string, name: string): OpenFinFrame;
+
+        getCurrent(): OpenFinFrame;
+    }
+
+    interface OpenFinFrame {
+        name: string;
+        uuid: string;
+
+        addEventListener(type: string, listener: () => void, callback?: () => void, errorCallback?: (reason: string) => void): void;
+
+        getParentWindow(callback?: (entityInfo: EntityInfo) => void, errorCallback?: (reason: string) => void): void;
+
+        getInfo(callback?: (entityInfo: EntityInfo) => void, errorCallback?: (reason: string) => void): void;
+
+        removeEventListener(type: string, listener: () => void, callback?: () => void, errorCallback?: (reason: string) => void): void;
+    }
+
+    interface ApplicationBaseEvent {
+        topic: string;
+        type: OpenFinApplicationEventType;
+        uuid: string;
+    }
+
+    interface TrayIconClickedEvent extends ApplicationBaseEvent {
+        button: number; // 0 for left, 1 for middle, 2 for right
+        monitorInfo: MonitorInfo;
+        x: number; // the cursor x coordinate
+        y: number; // the cursor y coordinate
+    }
+
+    interface WindowEvent extends ApplicationBaseEvent {
+        name: string;
+    }
+
+    interface WindowAlertRequestedEvent extends WindowEvent {
+        message: string;
+        url: string;
+    }
+
+    interface WindowAuthRequested extends WindowEvent {
+        authInfo: {
+            host: string;
+            isProxy: boolean;
+            port: number;
+            realm: string;
+            scheme: string;
+        };
+    }
+
+    interface WindowNavigationRejectedEvent extends WindowEvent {
+        sourceName: string;
+        url: string;
+    }
+
+    interface WindowEndLoadEvent extends WindowEvent {
+        documentName: string;
+        isMain: boolean;
+    }
+
+    interface MonitorInfoChangedEvent extends MonitorInfo {
+        topic: "system";
+        type: "monitor-info-changed";
+    }
+
+    interface MonitorInfo {
+        nonPrimaryMonitors: MonitorInfoDetail[];
+        primaryMonitor: MonitorInfoDetail;
+        reason: string;
+        taskbar: {
+            edge: "left" | "right" | "top" | "bottom",
+            rect: MontiorCoordinates
+        };
+        topic: "system";
+        type: "monitor-info-changed";
+        virtualScreen: MontiorCoordinates;
+    }
+
+   interface TrayIconInfo {
+       x: number;
+       y: number;
+       bounds: {
+           x: number;
+           y: number;
+           width: number;
+           height: number;
+       }
+       monitorInfo: MonitorInfo
+   }
+
+    interface MonitorInfoDetail {
+        availableRect: MontiorCoordinates;
+        deviceId: string;
+        displayDeviceActive: boolean;
+        monitorRect: MontiorCoordinates;
+        name: string;
+    }
+
+    interface MontiorCoordinates {
+        bottom: number;
+        left: number;
+        right: number;
+        top: number;
+    }
+
+    interface VirtualScreenCoordinates {
+        left: number;
+        top: number;
+    }
+
+    interface SystemBaseEvent {
+        topic: string;
+        type: OpenFinSystemEventType;
+        uuid: string;
+    }
+
+    interface DesktopIconClickedEvent {
+        mouse: {
+            /**
+             * the left virtual screen coordinate of the mouse
+             */
+            left: number,
+            /**
+             * the top virtual screen coordinate of the mouse
+             */
+            top: number
+        };
+        /**
+         * the number of milliseconds that have elapsed since the system was started,
+         */
+        tickCount: number;
+        topic: "system";
+        type: "desktop-icon-clicked";
+    }
+
+    interface IdleStateChangedEvent {
+        /**
+         * How long in milliseconds since the user has been idle.
+         */
+        elapsedTime: number;
+        /**
+         * true when the user is idle,false when the user has returned;
+         */
+        isIdle: boolean;
+        topic: "system";
+        type: "idle-state-changed";
+    }
+
+    interface WindowBaseEvent {
+        /**
+         * the name of the window
+         */
+        name: string;
+        /**
+         * always window
+         */
+        topic: "window";
+        /**
+         * window event type
+         */
+        type: OpenFinWindowEventType;
+        /**
+         * the UUID of the application the window belongs to
+         */
+        uuid: string;
+    }
+
+    interface WindowAuthRequestedEvent extends WindowBaseEvent {
+        authInfo: {
+            host: string;
+            isProxy: boolean;
+            port: number;
+            realm: string;
+            scheme: string;
+        };
+    }
+
+    interface WindowBoundsEvent extends WindowBaseEvent {
+        /**
+         * describes what kind of change occurred.
+         * 0 means a change in position.
+         * 1 means a change in size.
+         * 2 means a change in position and size.
+         */
+        changeType: number;
+        /**
+         * true when pending changes have been applied to the window.
+         */
+        deferred: boolean;
+        /**
+         * the new height of the window.
+         */
+        height: number;
+        /**
+         * the left-most coordinate of the window.
+         */
+        left: number;
+        /**
+         * the top-most coordinate of the window.
+         */
+        top: number;
+
+        type: "bounds-changed" | "bounds-changing" | "disabled-frame-bounds-changed" | "disabled-frame-bounds-changing";
+        /**
+         * the new width of the window.
+         */
+        width: number;
+    }
+
+    interface WindowExternalProcessStartedEvent extends WindowBaseEvent {
+        /**
+         * the process handle uuid
+         */
+        processUuid: string;
+        type: "external-process-started";
+    }
+
+    interface WindowExternalProcessExited extends WindowBaseEvent {
+        /**
+         * the process exit code
+         */
+        exitCode: number;
+        /**
+         * the process handle uuid
+         */
+        processUuid: string;
+        type: "external-process-exited";
+    }
+
+    interface WindowGroupChangedEvent extends WindowBaseEvent {
+        /**
+         * Which group array the window that the event listener was registered on is included in:
+         * 'source' The window is included in sourceGroup.
+         * 'target' The window is included in targetGroup.
+         * 'nothing' The window is not included in sourceGroup nor targetGroup.
+         */
+        memberOf: "source" | "target" | "nothing";
+        /**
+         * The reason this event was triggered.
+         * 'leave' A window has left the group due to a leave or merge with group.
+         * 'join' A window has joined the group.
+         * 'merge' Two groups have been merged together.
+         * 'disband' There are no other windows in the group.
+         */
+        reason: "leave" | "join" | "merge" | "disband";
+        /**
+         * All the windows in the group the sourceWindow originated from.
+         */
+        sourceGroup: WindowOfGroupInfo[];
+        /**
+         * The UUID of the application the sourceWindow belongs to The source window is the window in which (merge/join/leave)group(s) was called.
+         */
+        sourceWindowAppUuid: string;
+        /**
+         * the name of the sourcewindow.The source window is the window in which(merge / join / leave) group(s) was called.
+         */
+        sourceWindowName: string;
+        /**
+         * All the windows in the group the targetWindow orginated from
+         */
+        targetGroup: WindowOfGroupInfo[];
+        /**
+         * The UUID of the application the targetWindow belongs to. The target window is the window that was passed into (merge/join) group(s).
+         */
+        targetWindowAppUuid: string;
+        /**
+         * The name of the targetWindow. The target window is the window that was passed into (merge/join) group(s).
+         */
+        targetWindowName: string;
+        type: "group-changed";
+    }
+
+    interface WindowOfGroupInfo {
+        /**
+         * The UUID of the application this window entry belongs to.
+         */
+        appUuid: string;
+        /**
+         * The name of this window entry.
+         */
+        windowName: string;
+    }
+
+    interface WindowHiddenEvent extends WindowBaseEvent {
+        /**
+         * What action prompted the close.
+         * The reasons are: "hide", "hide-on-close"
+         */
+        reason: "hide" | "hide-on-close";
+        type: "hidden";
+    }
+
+    interface Window_NavigationRejectedEvent {
+        name: string;
+        /**
+         * source of navigation window name
+         */
+        sourceName: string;
+        topic: "navigation-rejected";
+        /**
+         * Url that was not reached "http://blocked-content.url"
+         */
+        url: string;
+        /**
+         * the UUID of the application the window belongs to.
+         */
+        uuid: string;
+    }
+
+    interface AnimationTransition {
+        opacity?: {
+            /**
+             * This value is clamped from 0.0 to 1.0
+             */
+            opacity?: number;
+            /**
+             * The total time in milliseconds this transition should take.
+             */
+            duration?: number;
+            /**
+             * Treat 'opacity' as absolute or as a delta. Defaults to false.
+             */
+            relative?: boolean;
+        };
+        position?: {
+            /**
+             * Defaults to the window's current left position in virtual screen coordinates.
+             */
+            left?: number;
+            /**
+             * Defaults to the window's current top position in virtual screen coordinates.
+             */
+            top?: number;
+            /**
+             * The total time in milliseconds this transition should take.
+             */
+            duration?: number;
+            /**
+             * Treat 'left' and 'top' as absolute or as deltas. Defaults to false.
+             */
+            relative?: boolean;
+        };
+        size?: {
+            /**
+             * Optional if height is present. Defaults to the window's current width.
+             */
+            width?: number;
+            /**
+             * Optional if width is present. Defaults to the window's current height.
+             */
+            height?: number;
+            /**
+             * The total time in milliseconds this transition should take.
+             */
+            duration?: number;
+            /**
+             * Treat 'width' and 'height' as absolute or as deltas. Defaults to false.
+             */
+            relative?: boolean;
+        };
+    }
+
+    interface AnimationOptions {
+        /**
+         * This option interrupts the current animation. When false it pushes this animation onto the end of the animation queue.
+         */
+        interrupt?: boolean;
+        /**
+         * Transition effect. Defaults to 'ease-in-out'.
+         */
+        tween?: OpenFinTweenType;
+    }
+
+    interface WindowBounds {
+        /**
+         * the height of the window.
+         */
+        height?: number;
+        /**
+         * left-most coordinate of the window.
+         */
+        left?: number;
+        /**
+         * top-most coordinate of the window.
+         */
+        top?: number;
+        /**
+         * the width of the window.
+         */
+        width?: number;
+    }
+
+    interface ExternalApplicationInfo {
+        parent: {
+            uuid: string;
+            name: string;
+        }
+    }
+
+    interface SessionChangedEvent {
+        /**
+         * the action that triggered this event:
+         */
+        reason: "lock"
+            | "unlock"
+            | "remote-connect"
+            | "remote-disconnect"
+            | "unknown";
+        topic: "system";
+        type: "session-changed";
+    }
+
+    interface LaunchInfo {
+        launchMode: "fin-protocol"
+            | "fins-protocol"
+            | "shortcut"
+            | "command-line"
+            | "adapter"
+            | "other"
+            | string;
+    }
+
+    type OpenFinTweenType = "linear"
+        | "ease-in"
+        | "ease-out"
+        | "ease-in-out"
+        | "ease-in-quad"
+        | "ease-out-quad"
+        | "ease-in-out-quad"
+        | "ease-in-cubic"
+        | "ease-out-cubic"
+        | "ease-in-out-cubic"
+        | "ease-out-bounce"
+        | "ease-in-back"
+        | "ease-out-back"
+        | "ease-in-out-back"
+        | "ease-in-elastic"
+        | "ease-out-elastic"
+        | "ease-in-out-elastic";
+
+    type OpenFinApplicationEventType = "closed"
+        | "connected"
+        | "crashed"
+        | "initialized"
+        | "manifest-changed"
+        | "not-responding"
+        | "out-of-memory"
+        | "responding"
+        | "run-requested"
+        | "started"
+        | "tray-icon-clicked"
+        | "window-alert-requested"
+        | "window-auth-requested"
+        | "window-closed"
+        | "window-created"
+        | "window-end-load"
+        | "window-navigation-rejected"
+        | "window-show-requested"
+        | "window-start-load";
+
+    type OpenFinExternalApplicationEventType = "connected"
+        | "disconnected";
+
+    type OpenFinSystemEventType = "application-closed"
+        | "application-crashed"
+        | "application-created"
+        | "application-started"
+        | "desktop-icon-clicked"
+        | "idle-state-changed"
+        | "monitor-info-changed"
+        | "session-changed";
+
+    type OpenFinWindowEventType = "auth-requested"
+        | "blurred"
+        | "bounds-changed"
+        | "bounds-changing"
+        | "close-requested"
+        | "closed"
+        | "disabled-frame-bounds-changed"
+        | "disabled-frame-bounds-changing"
+        | "embedded"
+        | "external-process-exited"
+        | "external-process-started"
+        | "focused"
+        | "frame-disabled"
+        | "frame-enabled"
+        | "group-changed"
+        | "hidden"
+        | "initialized"
+        | "maximized"
+        | "minimized"
+        | "navigation-rejected"
+        | "restored"
+        | "show-requested"
+        | "shown";
+
+    type OpenFinAnchor = "top-left"
+        | "top-right"
+        | "bottom-left"
+        | "bottom-right";
 }
diff --git a/types/openfin/openfin-tests.ts b/types/openfin/openfin-tests.ts
index 61b819018f..2b5237c1e8 100644
--- a/types/openfin/openfin-tests.ts
+++ b/types/openfin/openfin-tests.ts
@@ -1,721 +1,797 @@
 function test_application() {
-	let application: fin.OpenFinApplication;
-	// constructor
-	application = new fin.desktop.Application({
-		url: "application.html",
-		uuid: "74BED629-2D8E-4141-8582-73E364BDFA74",
-		name: "Application Name",
-		plugins: false,
-		mainWindowOptions: {
-			defaultHeight: 600,
-			defaultWidth: 800,
-			defaultTop: 300,
-			defaultLeft: 300,
-			autoShow: true
-		}
-	}, (successObj) => {
-		console.log("Application successfully created, HTTP response code:", successObj);
-		application.run();
-	}, (error) => {
-		console.log("Error creating application:", error);
-	});
-	// getCurrent
-	application = fin.desktop.Application.getCurrent();
-	// wrap
-	application = fin.desktop.Application.wrap("454C7F31-A915-4EA2-83F2-CFA655453C52");
-	// getWindow
-	application.getWindow();
-	// addEventListener
-	application.addEventListener("closed", (event) => {
-		console.log("The application has closed");
-	}, () => {
-		console.log("The registration was successful");
-	}, reason => {
-		console.log("failure: " + reason);
-	});
-	// close
-	application.close();
-	// getChildWindows
-	application.getChildWindows(children => {
-		children.forEach(childWindow => {
-			console.log("Showing child: " + childWindow.name);
-			childWindow.show();
-		});
-	});
-	// getGroups
-	application.getGroups(allGroups => {
-		console.log(`There are a total of ${allGroups.length} groups.`);
+    let application: fin.OpenFinApplication;
+    // constructor
+    application = new fin.desktop.Application({
+        url: "application.html",
+        uuid: "74BED629-2D8E-4141-8582-73E364BDFA74",
+        name: "Application Name",
+        plugins: false,
+        mainWindowOptions: {
+            defaultHeight: 600,
+            defaultWidth: 800,
+            defaultTop: 300,
+            defaultLeft: 300,
+            autoShow: true
+        }
+    }, (successObj) => {
+        console.log("Application successfully created, HTTP response code:", successObj);
+        application.run();
+    }, (error) => {
+        console.log("Error creating application:", error);
+    });
+        //createFromManifest
+    fin.desktop.Application.createFromManifest("http://stuf.com/app.json", (app) => {
+        console.log(app.uuid);
+    }, err => console.log(err));
+    // getCurrent
+    application = fin.desktop.Application.getCurrent();
+    // wrap
+    application = fin.desktop.Application.wrap("454C7F31-A915-4EA2-83F2-CFA655453C52");
+    // getWindow
+    application.getWindow();
+    // addEventListener
+    application.addEventListener("closed", (event) => {
+        console.log("The application has closed");
+    }, () => {
+        console.log("The registration was successful");
+    }, reason => {
+        console.log("failure: " + reason);
+    });
+    // close
+    application.close();
+    // getChildWindows
+    application.getChildWindows(children => {
+        children.forEach(childWindow => {
+            console.log("Showing child: " + childWindow.name);
+            childWindow.show();
+        });
+    });
+    // getGroups
+    application.getGroups(allGroups => {
+        console.log(`There are a total of ${allGroups.length} groups.`);
 
-		let groupCounter = 1;
-		allGroups.forEach(windowGroup => {
-			console.log(`Group ${groupCounter} contains ${windowGroup.length} windows.`);
-			++groupCounter;
-		});
-	});
-	// getManifest
-	application.getManifest(manifest => {
-		console.log("Application manifest:");
-		console.log(manifest);
-	});
-	// getParentUuid
-	application.getParentUuid(parentUuid => {
-		console.log("UUID of parent application:");
-		console.log(parentUuid);
-	});
-	// getShortcuts
-	application.getShortcuts(config => {
-		console.log("Desktop shortcut is enabled: ", config.desktop);
-		console.log("Start Menu shortcut is enabled: ", config.startMenu);
-		console.log("System Startup shortcut is enabled: ", config.systemStartup);
-	});
-	// getInfo
-	application.getInfo(info => {
-		console.log(`Launch mode: ${info.launchMode}`);
-	});
-	// isRunning
-	application.isRunning(running => {
-		console.log("the application is", running ? "running" : "not running");
-	});
-	// registerCustomData
-	application.registerCustomData({
-		someData: "this is custom"
-	}, () => {
-		console.log("You will not read this.");
-	}, err => {
-		console.log("failure:", err);
-	});
-	// removeEventListener
-	const previousCallback = (event: fin.WindowEvent) => { };
-	application.removeEventListener("closed", previousCallback, () => {
-		console.log("The unregistration was successful");
-	}, err => {
-		console.log("failure:", err);
-	});
-	// removeTrayIcon
-	application.removeTrayIcon(() => {
-		console.log("Removed the tray icon.");
-	}, err => {
-		console.log("failure:", err);
-	});
-	// restart
-	application.restart(() => {
-		console.log("You will not read this.");
-	}, err => {
-		console.log("failure:", err);
-	});
-	// schedule restart
-	application.scheduleRestart(() => {
-		console.log("You will not read this.");
-	}, err => {
-		console.log("failure:", err);
-	});
-	// setShortcuts
-	application.setShortcuts({
-		desktop: true,
-		startMenu: false,
-		systemStartup: true
-	}, () => {
-		console.log("Successfully set new shortcut states");
-	}, error => {
-		console.log("Failed to set new shortcut states. Error: ", error);
-	});
-	// setTrayIcon
-	application.setTrayIcon("https://developer.openf.in/download/openfin.png", clickInfo => {
-		console.log(`The mouse has clicked at (${clickInfo.x}, ${clickInfo.y})`);
-	});
-	// terminate
-	application.terminate();
-	// wait
-	application.addEventListener("not-responding", () => {
-		console.log("waiting for hung application");
-		application.wait();
-	});
+        let groupCounter = 1;
+        allGroups.forEach(windowGroup => {
+            console.log(`Group ${groupCounter} contains ${windowGroup.length} windows.`);
+            ++groupCounter;
+        });
+    });
+    // getManifest
+    application.getManifest(manifest => {
+        console.log("Application manifest:");
+        console.log(manifest);
+    });
+    // getParentUuid
+    application.getParentUuid(parentUuid => {
+        console.log("UUID of parent application:");
+        console.log(parentUuid);
+    });
+    // getShortcuts
+    application.getShortcuts(config => {
+        console.log("Desktop shortcut is enabled: ", config.desktop);
+        console.log("Start Menu shortcut is enabled: ", config.startMenu);
+        console.log("System Startup shortcut is enabled: ", config.systemStartup);
+    });
+    // getInfo
+    application.getInfo(info => {
+        console.log(`Launch mode: ${info.launchMode}`);
+    });
+    // getTrayIconInfo
+    application.getTrayIconInfo(info => {
+        console.log(info.x, info.y, info.bounds.x, info.bounds.y, info.bounds.height, info.bounds.width,
+                    info.monitorInfo.type, info.monitorInfo.reason);
+    });
+    // isRunning
+    application.isRunning(running => {
+        console.log("the application is", running ? "running" : "not running");
+    });
+    // registerCustomData
+    application.registerUser("a", "b", () => console.log("done"), err => console.log(err));
+    // removeEventListener
+    const previousCallback = (event: fin.WindowEvent) => { };
+    application.removeEventListener("closed", previousCallback, () => {
+        console.log("The unregistration was successful");
+    }, err => {
+        console.log("failure:", err);
+    });
+    // removeTrayIcon
+    application.removeTrayIcon(() => {
+        console.log("Removed the tray icon.");
+    }, err => {
+        console.log("failure:", err);
+    });
+    // restart
+    application.restart(() => {
+        console.log("You will not read this.");
+    }, err => {
+        console.log("failure:", err);
+    });
+    // schedule restart
+    application.scheduleRestart(() => {
+        console.log("You will not read this.");
+    }, err => {
+        console.log("failure:", err);
+    });
+    // setShortcuts
+    application.setShortcuts({
+        desktop: true,
+        startMenu: false,
+        systemStartup: true
+    }, () => {
+        console.log("Successfully set new shortcut states");
+    }, error => {
+        console.log("Failed to set new shortcut states. Error: ", error);
+    });
+    // setTrayIcon
+    application.setTrayIcon("https://developer.openf.in/download/openfin.png", clickInfo => {
+        console.log(`The mouse has clicked at (${clickInfo.x}, ${clickInfo.y})`);
+    });
+    // terminate
+    application.terminate();
+    // wait
+    application.addEventListener("not-responding", () => {
+        console.log("waiting for hung application");
+        application.wait();
+    });
+    //uuid
+    let hasUuid = application.uuid;
 }
 
 function test_external_application() {
-	let externalApp: fin.OpenFinExternalApplication;
-	// wrap
-	externalApp = fin.desktop.ExternalApp.wrap('my-uuid');
-	// addEventListener
-	externalApp.addEventListener('connected', () => {
-		console.log('external app connected');
-	}, () => {
-		console.log('The registration was successful');
-	}, (reason, err) => {
-		console.log(`Error Message: ${err.message} Error Stack: ${err.stack}`);
-	});
-	// removeEventListener
-	const previousCallback = () => { };
-	externalApp.removeEventListener('connected', previousCallback, () => {
-		console.log('The unregistration was successful');
-	}, (reason, err) => {
-		console.log(`Error Message: ${err.message} Error Stack: ${err.stack}`);
-	});
+    let externalApp: fin.OpenFinExternalApplication;
+    // wrap
+    externalApp = fin.desktop.ExternalApp.wrap('my-uuid');
+    // addEventListener
+    externalApp.addEventListener('connected', () => {
+        console.log('external app connected');
+    }, () => {
+        console.log('The registration was successful');
+    }, (reason, err) => {
+        console.log(`Error Message: ${err.message} Error Stack: ${err.stack}`);
+    });
+    // removeEventListener
+    const previousCallback = () => { };
+    externalApp.removeEventListener('connected', previousCallback, () => {
+        console.log('The unregistration was successful');
+    }, (reason, err) => {
+        console.log(`Error Message: ${err.message} Error Stack: ${err.stack}`);
+    });
+
+    // getInfo
+    externalApp.getInfo(info => {
+        console.log(info.parent.uuid, info.parent.name);
+    }, err => console.log(err));
 }
 
 function test_inter_application_bus() {
-	// addSubscribeListener
-	fin.desktop.InterApplicationBus.addSubscribeListener((uuid, topic, name) => {
-		console.log(`The application ${uuid} has subscribed to ${topic}`);
-	});
-	// addUnsubscribeListener
-	fin.desktop.InterApplicationBus.addUnsubscribeListener((uuid, topic, name) => {
-		console.log(`The application ${uuid} has unsubscribed to ${topic}`);
-	});
-	// removeSubscribeListener
-	const aRegisteredListener = (uuid: string, topic: string, name: string) => { };
-	fin.desktop.InterApplicationBus.removeSubscribeListener(aRegisteredListener);
-	// removeUnsubscribeListener
-	fin.desktop.InterApplicationBus.removeUnsubscribeListener(aRegisteredListener);
-	// publish
-	fin.desktop.InterApplicationBus.publish("a topic", {
-		field1: "value1",
-		field2: "value2"
-	});
-	// send
-	fin.desktop.InterApplicationBus.send("an application's uuid", "a topic", {
-		field1: "value1",
-		field2: "value2"
-	});
-	// subscribe
-	fin.desktop.InterApplicationBus.subscribe("*", "a topic", (message, uuid, name) => {
-		console.log(`The application ${uuid} sent this message: ${message}`);
-	});
-	// unsubscribe
-	const aRegisteredMessageListener = (message: any, senderUuid: string) => {
-		console.log(message, senderUuid);
-	};
-	fin.desktop.InterApplicationBus.unsubscribe("*", "a topic", aRegisteredMessageListener);
+    // addSubscribeListener
+    fin.desktop.InterApplicationBus.addSubscribeListener((uuid, topic, name) => {
+        console.log(`The application ${uuid} has subscribed to ${topic}`);
+    });
+    // addUnsubscribeListener
+    fin.desktop.InterApplicationBus.addUnsubscribeListener((uuid, topic, name) => {
+        console.log(`The application ${uuid} has unsubscribed to ${topic}`);
+    });
+    // removeSubscribeListener
+    const aRegisteredListener = (uuid: string, topic: string, name: string) => { };
+    fin.desktop.InterApplicationBus.removeSubscribeListener(aRegisteredListener);
+    // removeUnsubscribeListener
+    fin.desktop.InterApplicationBus.removeUnsubscribeListener(aRegisteredListener);
+    // publish
+    fin.desktop.InterApplicationBus.publish("a topic", {
+        field1: "value1",
+        field2: "value2"
+    });
+    // send
+    fin.desktop.InterApplicationBus.send("an application's uuid", "a topic", {
+        field1: "value1",
+        field2: "value2"
+    });
+    // subscribe
+    fin.desktop.InterApplicationBus.subscribe("*", "a topic", (message, uuid, name) => {
+        console.log(`The application ${uuid} sent this message: ${message}`);
+    });
+    // unsubscribe
+    const aRegisteredMessageListener = (message: any, senderUuid: string) => {
+        console.log(message, senderUuid);
+    };
+    fin.desktop.InterApplicationBus.unsubscribe("*", "a topic", aRegisteredMessageListener);
 }
 
 function test_notification() {
-	let notification: fin.OpenFinNotification;
-	// getCurrent
-	notification = fin.desktop.Notification.getCurrent();
-	// close
-	notification.close();
-	// sendMessage
-	notification = new fin.desktop.Notification({
-		duration: 10,
-		url: "http://localhost:5000/Account/Register",
-		message: "Hello",
-		onShow: () => { },
-		// onClose: () => { },
-		onDismiss: () => { },
-		// onClick: () => { },
-		onMessage: () => { },
-		onError: () => { }
-	});
-	// sendMessageToApplication
-	notification.sendMessageToApplication("some message");
+    let notification: fin.OpenFinNotification;
+    // getCurrent
+    notification = fin.desktop.Notification.getCurrent();
+    // close
+    notification.close();
+    // sendMessage
+    notification = new fin.desktop.Notification({
+        duration: 10,
+        url: "http://localhost:5000/Account/Register",
+        message: "Hello",
+        onShow: () => { },
+        // onClose: () => { },
+        onDismiss: () => { },
+        // onClick: () => { },
+        onMessage: () => { },
+        onError: () => { }
+    });
+    // sendMessageToApplication
+    notification.sendMessageToApplication("some message");
 }
 
 function test_system() {
-	// addEventListener
-	fin.desktop.System.addEventListener('monitor-info-changed', event => {
-		console.log("The monitor information has changed to: ", event);
-	}, () => {
-		console.log("The registration was successful");
-	}, err => {
-		console.log("failure: " + err);
-	});
-	// clearCache
-	fin.desktop.System.clearCache({
-		cache: true,
-		cookies: true,
-		localStorage: true,
-		appcache: true,
-		userData: true
-	});
-	// deleteCacheOnExit
-	fin.desktop.System.deleteCacheOnExit(() => {
-		console.log("successful");
-	}, err => {
-		console.log("failure: " + err);
-	});
-	// downloadAsset
-	const dirAppAsset = {
-		src: 'http://local:8000/dir.zip',
-		alias: 'dirApp',
-		version: '1.23.24',
-		target: 'dir.bat',
-		args: ''
-	};
-	fin.desktop.System.downloadAsset(dirAppAsset, progress => {
-		const downloadedPercent = Math.floor((progress.downloadedBytes / progress.totalBytes) * 100);
-		console.log(`Downloaded ${downloadedPercent}%`);
-	}, p => {
-		console.log(`Downlod complete, can be found on ${p.path}`);
-		// lets launch our application asset.
-		// launchDirApp();
-	}, (reason, err) => {
-		console.log(reason, err);
-	});
-	// exit
-	fin.desktop.System.exit(() => {
-		console.log("successful");
-	}, err => {
-		console.log("failure: " + err);
-	});
-	// getAllApplications
-	fin.desktop.System.getAllApplications(applicationInfoList => {
-		applicationInfoList.forEach(applicationInfo => {
-			console.log("Showing information for application with uuid: "
-				+ applicationInfo.uuid);
-			console.log("isRunning: ", applicationInfo.isRunning);
-		});
-	});
-	// getAllExternalApplications
-	fin.desktop.System.getAllExternalApplications(externalAppsInfoList => {
-		externalAppsInfoList.forEach(appInfo => {
-			console.log(`External app connected to the runtime with UUID ${appInfo.uuid}`);
-		});
-	});
-	// getAllWindows
-	fin.desktop.System.getAllWindows(windowInfoList => {
-		windowInfoList.forEach(windowInfo => {
-			console.log("Showing information for application with uuid: ", windowInfo.uuid);
-			console.log("Main window: ", windowInfo.mainWindow);
-			console.log("Child windows: ", windowInfo.childWindows);
-		});
-	});
-	// getCommandLineArguments
-	fin.desktop.System.getCommandLineArguments(args => {
-		console.log("The command line arguments are " + args);
-	});
-	// getDeviceId
-	fin.desktop.System.getDeviceId(id => {
-		console.log("The id of the device is: " + id);
-	});
-	// getEnvironmentVariable
-	fin.desktop.System.getEnvironmentVariable("APPDATA", variable => {
-		console.log("this is the APPDATA value", variable);
-	});
-	// getHostSpecs
-	fin.desktop.System.getHostSpecs(info => {
-		console.log(info);
-	}, error => {
-		console.log('There was an error:', error);
-	});
-	// getLog
-	fin.desktop.System.getLog('debug-2015-01-08-22-27-53.log', log => {
-		console.log(log);
-	});
-	// getLogList
-	fin.desktop.System.getLogList(logList => {
-		logList.forEach(logInfo => {
-			console.log(`The filename of the log is ${logInfo.name}, the size is ${logInfo.size}, and the date of creation is ${logInfo.date}`);
-		});
-	});
-	// getMonitorInfo
-	fin.desktop.System.getMonitorInfo(monitorInfo => {
-		console.log("This object contains information about all monitors: ", monitorInfo);
-	});
-	// getMousePosition
-	fin.desktop.System.getMousePosition(mousePosition => {
-		console.log(`The mouse is located at left: ${mousePosition.left}, top: ${mousePosition.top}`);
-	});
-	// getProcessList
-	fin.desktop.System.getProcessList(list => {
-		list.forEach(process => {
-			console.log(`UUID: ${process.uuid}, Application Name: ${process.name}`);
-		});
-	});
-	// getProxySettings
-	fin.desktop.System.getProxySettings(proxy => {
-		console.log(proxy);
-	});
-	// getRvmInfo
-	fin.desktop.System.getRvmInfo(rvmInfoObject => {
-		console.log("RVM version:", rvmInfoObject.version);
-		console.log("RVM has been running since:", rvmInfoObject["start-time"]);
-	}, err => {
-		console.log("Failed to get rvm info, error message:", err);
-	});
-	// getVersion
-	fin.desktop.System.getVersion(version => {
-		console.log("The version is " + version);
-	});
-	// launchExternalProcess
-	fin.desktop.System.launchExternalProcess({
-		path: "notepad",
-		arguments: "",
-		listener(result) {
-			console.log('the exit code', result.exitCode);
-		}
-	}, payload => {
-		console.log('Success:', payload.uuid);
-	}, error => {
-		console.log('Error:', error);
-	});
-	//
-	fin.desktop.System.launchExternalProcess({
-		// Additionally note that the executable found in the zip file specified in appAssets
-		// will default to the one mentioned by appAssets.target
-		// If the the path below refers to a specific path it will override this default
-		alias: "myApp",
-		listener(result) {
-			console.log('the exit code', result.exitCode);
-		}
-	}, payload => {
-		console.log('Success:', payload.uuid);
-	}, error => {
-		console.log('Error:', error);
-	});
-	//
-	fin.desktop.System.launchExternalProcess({
-		alias: "myApp",
-		arguments: "e f g",
-		listener(result) {
-			console.log('the exit code', result.exitCode);
-		}
-	}, payload => {
-		console.log('Success:', payload.uuid);
-	}, error => {
-		console.log('Error:', error);
-	});
-	//
-	fin.desktop.System.launchExternalProcess({
-		path: "C:\Users\ExampleUser\AppData\Local\OpenFin\OpenFinRVM.exe",
-		arguments: "--version",
-		certificate: {
-			trusted: true,
-			subject: 'O=OpenFin INC., L=New York, S=NY, C=US',
-			thumbprint: '3c a5 28 19 83 05 fe 69 88 e6 8f 4b 3a af c5 c5 1b 07 80 5b'
-		},
-		listener(result) {
-			console.log('the exit code', result.exitCode);
-		}
-	}, payload => {
-		console.log('Success:', payload.uuid);
-	}, error => {
-		console.log('Error:', error);
-	});
-	// log
-	fin.desktop.System.log("info", "An example log message", () => {
-		console.log("message successfully logged");
-	}, err => {
-		console.log(err);
-	});
-	// monitorExternalProcess
-	fin.desktop.System.monitorExternalProcess({
-		pid: 2508,
-		listener(result) {
-			console.log('the exit code', result.exitCode);
-		}
-	}, payload => {
-		console.log("The process is now being monitored: ", payload.uuid);
-	}, error => {
-		console.log("Error:", error);
-	});
-	// openUrlWithBrowser
-	fin.desktop.System.openUrlWithBrowser("https://developer.openf.in/", () => {
-		console.log("successful");
-	}, err => {
-		console.log("failure: " + err);
-	});
-	// registerExternalConnection
-	fin.desktop.System.registerExternalConnection("remote-connection-uuid", (...args: any[]) => {
-		console.log(args);
-	});
-	// releaseExternalProcess
-	fin.desktop.System.launchExternalProcess({
-		path: "notepad",
-		arguments: "",
-		listener(result) {
-			console.log("The exit code", result.exitCode);
-		}
-	}, result => {
-		console.log("Result UUID is " + result.uuid);
+    // addEventListener
+    fin.desktop.System.addEventListener('monitor-info-changed', event => {
+        console.log("The monitor information has changed to: ", event);
+    }, () => {
+        console.log("The registration was successful");
+    }, err => {
+        console.log("failure: " + err);
+    });
+    // clearCache
+    fin.desktop.System.clearCache({
+        cache: true,
+        cookies: true,
+        localStorage: true,
+        appcache: true,
+        userData: true
+    });
+    // deleteCacheOnExit
+    fin.desktop.System.deleteCacheOnExit(() => {
+        console.log("successful");
+    }, err => {
+        console.log("failure: " + err);
+    });
+    // downloadAsset
+    const dirAppAsset = {
+        src: 'http://local:8000/dir.zip',
+        alias: 'dirApp',
+        version: '1.23.24',
+        target: 'dir.bat',
+        args: ''
+    };
+    fin.desktop.System.downloadAsset(dirAppAsset, progress => {
+        const downloadedPercent = Math.floor((progress.downloadedBytes / progress.totalBytes) * 100);
+        console.log(`Downloaded ${downloadedPercent}%`);
+    }, p => {
+        console.log(`Downlod complete, can be found on ${p.path}`);
+        // lets launch our application asset.
+        // launchDirApp();
+    }, (reason, err) => {
+        console.log(reason, err);
+    });
+    // downloadRuntime
+    fin.desktop.System.downloadRuntime({ version: '9.61.31.56' }, progress => {
+        console.log(progress.downloadedBytes, progress.downloadedBytes);
+    }, () => console.log('download complete'), err => console.error(err));
+    // downloadPreloadScript
+    const preloadScripts = [
+        { url: 'http://whatever.com/script.js' }
+    ];
+    fin.desktop.System.downloadPreloadScripts(preloadScripts, info => {
+        const downloadInfo = info[0];
+        console.log(downloadInfo.success, downloadInfo.url, downloadInfo.error);
+    }, err => {
+        console.log(err);
+    });
+    // exit
+    fin.desktop.System.exit(() => {
+        console.log("successful");
+    }, err => {
+        console.log("failure: " + err);
+    });
+    //flushCookieStore
+    fin.desktop.System.flushCookieStore(() => {
+        console.log('successful');
+    }, err => {
+        console.log('failure', err);
+    });
+    // getAllApplications
+    fin.desktop.System.getAllApplications(applicationInfoList => {
+        applicationInfoList.forEach(applicationInfo => {
+            console.log("Showing information for application with uuid: "
+                + applicationInfo.uuid);
+            console.log("isRunning: ", applicationInfo.isRunning);
+        });
+    });
+    // getAllExternalApplications
+    fin.desktop.System.getAllExternalApplications(externalAppsInfoList => {
+        externalAppsInfoList.forEach(appInfo => {
+            console.log(`External app connected to the runtime with UUID ${appInfo.uuid}`);
+        });
+    });
+    // getAllWindows
+    fin.desktop.System.getAllWindows(windowInfoList => {
+        windowInfoList.forEach(windowInfo => {
+            console.log("Showing information for application with uuid: ", windowInfo.uuid);
+            console.log("Main window: ", windowInfo.mainWindow);
+            console.log("Child windows: ", windowInfo.childWindows);
+        });
+    });
+    // getAppAssetInfo
+    fin.desktop.System.getAppAssetInfo({ alias: 'myAppAsset' }, info => {
+        console.log(info.alias, info.args, info.mandatory, info.src, info.target, info.version);
+    }, err => console.log(err));
+    // getCommandLineArguments
+    fin.desktop.System.getCommandLineArguments(args => {
+        console.log("The command line arguments are " + args);
+    });
+    //getCookieInfo
+    fin.desktop.System.getCookies({ name: 'myCookie1'}, cookies => {
+        const cookie1 = cookies[0];
+        console.log(cookie1.name, cookie1.domain, cookie1.path);
+    }, err => console.log(err));
+    // getDeviceId
+    fin.desktop.System.getDeviceId(id => {
+        console.log("The id of the device is: " + id);
+    });
+    // getDeviceUserId
+    fin.desktop.System.getDeviceUserId(id => console.log(id), err => console.error(err));
+    // getEntityInfo
+    fin.desktop.System.getEntityInfo('uuid', 'name', info => {
+        console.log(info.entityType, info.name, info.uuid, info.parent.name, info.parent.uuid);
+    }, err => console.log(err));
+    // getEnvironmentVariable
+    fin.desktop.System.getEnvironmentVariable("APPDATA", variable => {
+        console.log("this is the APPDATA value", variable);
+    });
+    // getFocusedWindow
+    fin.desktop.System.getFocusedWindow(win => {
+        console.log(win.uuid, win.name);
+    }, err => console.log(err));
+    // getHostSpecs
+    fin.desktop.System.getHostSpecs(info => {
+        console.log(info);
+    }, error => {
+        console.log('There was an error:', error);
+    });
+    // getLog
+    fin.desktop.System.getLog('debug-2015-01-08-22-27-53.log', log => {
+        console.log(log);
+    });
+    // getLogList
+    fin.desktop.System.getLogList(logList => {
+        logList.forEach(logInfo => {
+            console.log(`The filename of the log is ${logInfo.name}, the size is ${logInfo.size}, and the date of creation is ${logInfo.date}`);
+        });
+    });
+    //getMinLogLevel
+    fin.desktop.System.getMinLogLevel(level => console.log(level), err => console.log(err));
+    // getMonitorInfo
+    fin.desktop.System.getMonitorInfo(monitorInfo => {
+        console.log("This object contains information about all monitors: ", monitorInfo);
+    });
+    // getMousePosition
+    fin.desktop.System.getMousePosition(mousePosition => {
+        console.log(`The mouse is located at left: ${mousePosition.left}, top: ${mousePosition.top}`);
+    });
+    // getProcessList
+    fin.desktop.System.getProcessList(list => {
+        list.forEach(process => {
+            console.log(`UUID: ${process.uuid}, Application Name: ${process.name}`);
+        });
+    });
+    // getProxySettings
+    fin.desktop.System.getProxySettings(proxy => {
+        console.log(proxy);
+    });
+    // getRvmInfo
+    fin.desktop.System.getRvmInfo(rvmInfoObject => {
+        console.log("RVM version:", rvmInfoObject.version);
+        console.log("RVM has been running since:", rvmInfoObject["start-time"]);
+    }, err => {
+        console.log("Failed to get rvm info, error message:", err);
+    });
+    // getVersion
+    fin.desktop.System.getVersion(version => {
+        console.log("The version is " + version);
+    });
+    // launchExternalProcess
+    fin.desktop.System.launchExternalProcess({
+        path: "notepad",
+        arguments: "",
+        listener(result) {
+            console.log('the exit code', result.exitCode);
+        }
+    }, payload => {
+        console.log('Success:', payload.uuid);
+    }, error => {
+        console.log('Error:', error);
+    });
+    //
+    fin.desktop.System.launchExternalProcess({
+        // Additionally note that the executable found in the zip file specified in appAssets
+        // will default to the one mentioned by appAssets.target
+        // If the the path below refers to a specific path it will override this default
+        alias: "myApp",
+        listener(result) {
+            console.log('the exit code', result.exitCode);
+        }
+    }, payload => {
+        console.log('Success:', payload.uuid);
+    }, error => {
+        console.log('Error:', error);
+    });
+    //
+    fin.desktop.System.launchExternalProcess({
+        alias: "myApp",
+        arguments: "e f g",
+        listener(result) {
+            console.log('the exit code', result.exitCode);
+        }
+    }, payload => {
+        console.log('Success:', payload.uuid);
+    }, error => {
+        console.log('Error:', error);
+    });
+    //
+    fin.desktop.System.launchExternalProcess({
+        path: "C:\Users\ExampleUser\AppData\Local\OpenFin\OpenFinRVM.exe",
+        arguments: "--version",
+        certificate: {
+            trusted: true,
+            subject: 'O=OpenFin INC., L=New York, S=NY, C=US',
+            thumbprint: '3c a5 28 19 83 05 fe 69 88 e6 8f 4b 3a af c5 c5 1b 07 80 5b'
+        },
+        listener(result) {
+            console.log('the exit code', result.exitCode);
+        }
+    }, payload => {
+        console.log('Success:', payload.uuid);
+    }, error => {
+        console.log('Error:', error);
+    });
+    // log
+    fin.desktop.System.log("info", "An example log message", () => {
+        console.log("message successfully logged");
+    }, err => {
+        console.log(err);
+    });
+    // monitorExternalProcess
+    fin.desktop.System.monitorExternalProcess({
+        pid: 2508,
+        listener(result) {
+            console.log('the exit code', result.exitCode);
+        }
+    }, payload => {
+        console.log("The process is now being monitored: ", payload.uuid);
+    }, error => {
+        console.log("Error:", error);
+    });
+    // openUrlWithBrowser
+    fin.desktop.System.openUrlWithBrowser("https://developer.openf.in/", () => {
+        console.log("successful");
+    }, err => {
+        console.log("failure: " + err);
+    });
+    // readRegistryValue
+    fin.desktop.System.readRegistryValue('HKEY_SOMETHING', 'HARDWARE\\SOMETHING', 'BootSomething', info => {
+        console.log(info.data, info.rootKey, info.subkey, info.type, info.value);
+    }, err => console.log(err));
+    // registerExternalConnection
+    fin.desktop.System.registerExternalConnection("remote-connection-uuid", (...args: any[]) => {
+        console.log(args);
+    });
+    // releaseExternalProcess
+    fin.desktop.System.launchExternalProcess({
+        path: "notepad",
+        arguments: "",
+        listener(result) {
+            console.log("The exit code", result.exitCode);
+        }
+    }, result => {
+        console.log("Result UUID is " + result.uuid);
 
-		// release it.
-		fin.desktop.System.releaseExternalProcess(result.uuid, () => {
-			console.log("Process has been unmapped!");
-		}, reason => {
-			console.log("failure: " + reason);
-		});
-	});
-	// removeEventListener
-	const aRegisteredListener = (event: fin.SystemBaseEvent) => { };
-	fin.desktop.System.removeEventListener("monitor-info-changed", aRegisteredListener, () => {
-		console.log("successful");
-	}, err => {
-		console.log("failure: " + err);
-	});
-	// showDeveloperTools
-	fin.desktop.System.showDeveloperTools("uuid", "name", () => {
-		console.log("successful");
-	}, err => {
-		console.log("failure: " + err);
-	});
-	// terminateExternalProcess
-	fin.desktop.System.launchExternalProcess({
-		// notepad is in the system's PATH
-		path: "notepad",
-		arguments: "",
-		listener(result) {
-			console.log("The exit code", result.exitCode);
-		}
-	}, result => {
-		console.log("Result UUID is " + result.uuid);
+        // release it.
+        fin.desktop.System.releaseExternalProcess(result.uuid, () => {
+            console.log("Process has been unmapped!");
+        }, reason => {
+            console.log("failure: " + reason);
+        });
+    });
+    // removeEventListener
+    const aRegisteredListener = (event: fin.SystemBaseEvent) => { };
+    fin.desktop.System.removeEventListener("monitor-info-changed", aRegisteredListener, () => {
+        console.log("successful");
+    }, err => {
+        console.log("failure: " + err);
+    });
+    //setMinLogLevel
+    fin.desktop.System.setMinLogLevel("log level", () => console.log('Success'), err => console.error(err));
+    // showDeveloperTools
+    fin.desktop.System.showDeveloperTools("uuid", "name", () => {
+        console.log("successful");
+    }, err => {
+        console.log("failure: " + err);
+    });
+    // terminateExternalProcess
+    fin.desktop.System.launchExternalProcess({
+        // notepad is in the system's PATH
+        path: "notepad",
+        arguments: "",
+        listener(result) {
+            console.log("The exit code", result.exitCode);
+        }
+    }, result => {
+        console.log("Result UUID is " + result.uuid);
 
-		// Attempt to close the process. Terminate after 4 seconds if it
-		// has not done so.
-		fin.desktop.System.terminateExternalProcess(result.uuid, 4000, info => {
-			console.log("Termination result " + info.result);
-		}, reason => {
-			console.log("failure: " + reason);
-		});
-	});
-	// updateProxySettings
-	fin.desktop.System.updateProxySettings("type", "proxyAddress", 8080, () => {
-		console.log('success');
-	}, err => {
-		console.log(err);
-	});
+        // Attempt to close the process. Terminate after 4 seconds if it
+        // has not done so.
+        fin.desktop.System.terminateExternalProcess(result.uuid, 4000, info => {
+            console.log("Termination result " + info.result);
+        }, reason => {
+            console.log("failure: " + reason);
+        });
+    });
+    // updateProxySettings
+    fin.desktop.System.updateProxySettings("type", "proxyAddress", 8080, () => {
+        console.log('success');
+    }, err => {
+        console.log(err);
+    });
 }
 
 function test_system_clipboard() {
-	// availableFormats
-	fin.desktop.System.Clipboard.availableFormats(null, formats => {
-		formats.forEach(format => console.log(`The format ${format} is available to read`));
-	}, (reason, err) => {
-		console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
-	});
-	// readHtml
-	fin.desktop.System.Clipboard.readHtml(null, html => {
-		console.log(`This is the html from the clipboard: ${html}`);
-	}, (reason, err) => {
-		console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
-	});
-	// readRtf
-	fin.desktop.System.Clipboard.readRtf(null, rtf => {
-		console.log(`This is the rtf from the clipboard: ${rtf}`);
-	}, (reason, err) => {
-		console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
-	});
-	// readText
-	fin.desktop.System.Clipboard.readText(null, text => {
-		console.log(`This is the text from the clipboard: ${text}`);
-	}, (reason, err) => {
-		console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
-	});
-	// write
-	fin.desktop.System.Clipboard.write({
-		text: 'Hello Text!',
-		html: '<h1>Hello Html</h1>',
-		rtf: 'Hello Rtf'
-	}, null, () => {
-		console.log('Success!!');
-	}, (reason, err) => {
-		console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
-	});
-	// writeHtml
-	fin.desktop.System.Clipboard.writeHtml('<h1>Hello World</h1>', null, () => {
-		console.log('Success!!');
-	}, (reason, err) => {
-		console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
-	});
-	// writeRtf
-	fin.desktop.System.Clipboard.writeRtf('Hello World!', null, () => {
-		console.log('Success!!');
-	}, (reason, err) => {
-		console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
-	});
-	// writeText
-	fin.desktop.System.Clipboard.writeText('Hello World', null, () => {
-		console.log('Success!!');
-	}, (reason, err) => {
-		console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
-	});
+    // availableFormats
+    fin.desktop.System.Clipboard.availableFormats(null, formats => {
+        formats.forEach(format => console.log(`The format ${format} is available to read`));
+    }, (reason, err) => {
+        console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
+    });
+    // readHtml
+    fin.desktop.System.Clipboard.readHtml(null, html => {
+        console.log(`This is the html from the clipboard: ${html}`);
+    }, (reason, err) => {
+        console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
+    });
+    // readRtf
+    fin.desktop.System.Clipboard.readRtf(null, rtf => {
+        console.log(`This is the rtf from the clipboard: ${rtf}`);
+    }, (reason, err) => {
+        console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
+    });
+    // readText
+    fin.desktop.System.Clipboard.readText(null, text => {
+        console.log(`This is the text from the clipboard: ${text}`);
+    }, (reason, err) => {
+        console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
+    });
+    // write
+    fin.desktop.System.Clipboard.write({
+        text: 'Hello Text!',
+        html: '<h1>Hello Html</h1>',
+        rtf: 'Hello Rtf'
+    }, null, () => {
+        console.log('Success!!');
+    }, (reason, err) => {
+        console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
+    });
+    // writeHtml
+    fin.desktop.System.Clipboard.writeHtml('<h1>Hello World</h1>', null, () => {
+        console.log('Success!!');
+    }, (reason, err) => {
+        console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
+    });
+    // writeRtf
+    fin.desktop.System.Clipboard.writeRtf('Hello World!', null, () => {
+        console.log('Success!!');
+    }, (reason, err) => {
+        console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
+    });
+    // writeText
+    fin.desktop.System.Clipboard.writeText('Hello World', null, () => {
+        console.log('Success!!');
+    }, (reason, err) => {
+        console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
+    });
 }
 
 function test_window() {
-	let finWindow: fin.OpenFinWindow;
-	// constructor
-	finWindow = new fin.desktop.Window({
-		name: "childWindow",
-		url: "child.html",
-		defaultWidth: 320,
-		defaultHeight: 320,
-		defaultTop: 10,
-		defaultLeft: 300,
-		frame: false,
-		resizable: false,
-		state: "normal"
-	}, () => {
-		const _win = finWindow.getNativeWindow();
-		_win.addEventListener("DOMContentLoaded", () => { finWindow.show(); });
-	}, error => {
-		console.log("Error creating window:", error);
-	});
-	// getCurrent
-	finWindow = fin.desktop.Window.getCurrent();
-	// getNativeWindow
-	let nativeWindow: Window;
-	nativeWindow = finWindow.getNativeWindow();
-	// getParentApplication
-	let parentApp: fin.OpenFinApplication;
-	parentApp = finWindow.getParentApplication();
-	// getParentWindow
-	let parentFinWindow: fin.OpenFinWindow;
-	parentFinWindow = finWindow.getParentWindow();
-	// wrap
-	finWindow = fin.desktop.Window.wrap("uuid", "name");
-	// addEventListener
-	finWindow.addEventListener("bounds-changed", event => {
-		console.log("The window has been moved or resized");
-	}, () => {
-		console.log("The registration was successful");
-	}, reason => {
-		console.log("failure:" + reason);
-	});
-	// animate
-	finWindow.animate({
-		opacity: {
-			opacity: 0.15,
-			duration: 1000
-		},
-		position: {
-			left: 10,
-			top: 10,
-			duration: 3000
-		}
-	}, {
-			interrupt: false
-		}, evt => {
-			// Callback will only fire after both "opacity" and "position" have finished animating.
-		});
-	// authenticate
-	finWindow.addEventListener('auth-requested', evt => {
-		finWindow.authenticate('userName', 'P@assw0rd', () => { }, (reason, err) => {
-			console.log("failure:", err);
-		});
-	});
-	// blur
-	finWindow.blur();
-	// bringToFront
-	finWindow.bringToFront();
-	// close
-	finWindow.close();
-	// disableFrame
-	finWindow.disableFrame();
-	// enableFrame
-	finWindow.enableFrame();
-	// flash
-	finWindow.flash();
-	// focus
-	finWindow.focus();
-	// getBounds
-	finWindow.getBounds(bounds => {
-		console.log(`top: ${bounds.top} left: ${bounds.left} height: ${bounds.height} width: ${bounds.width}`);
-	});
-	// getOptions
-	finWindow.getOptions(options => {
-		console.log(options);
-	});
-	// getSnapshot
-	finWindow.getSnapshot(base64Snapshot => {
-		console.log("data:image/png;base64," + base64Snapshot);
-	});
-	// getState
-	finWindow.getState(state => {
-		console.log("state: " + state);
-	});
-	// getZoomLevel
-	finWindow.getZoomLevel(level => {
-		console.log("zoom level: " + level);
-	}, error => {
-		console.log('error:', error);
-	});
-	// hide
-	finWindow.hide();
-	// isShowing
-	finWindow.isShowing(showing => {
-		console.log("the window is " + (showing ? "showing" : "hidden"));
-	});
-	// joinGroup
-	let secondWindow = new fin.desktop.Window({
-		url: "http://www.openfin.co",
-		name: "secondWindow",
-		autoShow: true
-	}, () => {
-		// When mainWindow moves or is moved, secondWindow moves by the same amount
-		secondWindow.joinGroup(finWindow);
-	});
-	// leaveGroup
-	secondWindow = new fin.desktop.Window({
-		url: "http://www.openfin.co",
-		name: "secondWindow",
-		autoShow: true
-	}, () => {
-		// When finWindow moves or is moved, secondWindow moves by the same amount
-		secondWindow.joinGroup(finWindow, () => {
-			// once we are in the group, lets leave it.
-			secondWindow.leaveGroup();
-		});
-	});
-	// maximize
-	finWindow.maximize();
-	// mergeGroups
-	{
-		const finWindowOne = new fin.desktop.Window({
-			url: "http://www.openfin.co",
-			name: "finWindowOne",
-			autoShow: true
-		});
-		const finWindowTwo = new fin.desktop.Window({
-			url: "http://www.openfin.co",
-			name: "finWindowTwo",
-			autoShow: true
-		});
-		const finWindowThree = new fin.desktop.Window({
-			url: "http://www.openfin.co",
-			name: "finWindowThree",
-			autoShow: true
-		});
-		const finWindowFour = new fin.desktop.Window({
-			url: "http://www.openfin.co",
-			name: "finWindowFour",
-			autoShow: true
-		});
-		// When finWindowOne moves or is moved, finWindowTwo moves by the same amount
-		finWindowOne.joinGroup(finWindowTwo);
-		// When finWindowThree moves or is moved, finWindowFour moves by the same amount
-		finWindowThree.joinGroup(finWindowFour);
-		// finWindowOne, finWindowTwo, finWindowThree, and finWindowFour now move together in the same group
-		finWindowOne.mergeGroups(finWindowThree);
-	}
-	// minimize
-	finWindow.minimize();
-	// moveBy
-	finWindow.moveBy(10, 10);
-	// moveTo
-	finWindow.moveTo(100, 200);
-	// removeEventListener
-	const aRegisteredListener = (event: fin.WindowBaseEvent) => { };
-	finWindow.removeEventListener("bounds-changed", aRegisteredListener);
-	// resizeBy
-	finWindow.resizeBy(10, 10, "top-right");
-	// resizeTo
-	finWindow.resizeTo(10, 10, "top-right");
-	// restore
-	finWindow.restore();
-	// setAsForeground
-	finWindow.setAsForeground();
-	// setBounds
-	finWindow.setBounds(100, 200, 400, 400);
-	// setZoomLevel
-	finWindow.setZoomLevel(10);
-	// show
-	finWindow.show();
-	// showAt
-	finWindow.showAt(10, 10, false);
-	// stopFlashing
-	finWindow.stopFlashing();
-	// updateOptions
-	finWindow.updateOptions({
-		frame: false,
-		maxWidth: 500
-	});
+    let finWindow: fin.OpenFinWindow;
+    // constructor
+    finWindow = new fin.desktop.Window({
+        name: "childWindow",
+        url: "child.html",
+        defaultWidth: 320,
+        defaultHeight: 320,
+        defaultTop: 10,
+        defaultLeft: 300,
+        frame: false,
+        resizable: false,
+        state: "normal"
+    }, () => {
+        const _win = finWindow.getNativeWindow();
+        _win.addEventListener("DOMContentLoaded", () => { finWindow.show(); });
+    }, error => {
+        console.log("Error creating window:", error);
+    });
+    // getCurrent
+    finWindow = fin.desktop.Window.getCurrent();
+    // getNativeWindow
+    let nativeWindow: Window;
+    nativeWindow = finWindow.getNativeWindow();
+    // getParentApplication
+    let parentApp: fin.OpenFinApplication;
+    parentApp = finWindow.getParentApplication();
+    // getParentWindow
+    let parentFinWindow: fin.OpenFinWindow;
+    parentFinWindow = finWindow.getParentWindow();
+    // wrap
+    finWindow = fin.desktop.Window.wrap("uuid", "name");
+    // addEventListener
+    finWindow.addEventListener("bounds-changed", event => {
+        console.log("The window has been moved or resized");
+    }, () => {
+        console.log("The registration was successful");
+    }, reason => {
+        console.log("failure:" + reason);
+    });
+    // animate
+    finWindow.animate({
+        opacity: {
+            opacity: 0.15,
+            duration: 1000
+        },
+        position: {
+            left: 10,
+            top: 10,
+            duration: 3000
+        }
+    }, {
+            interrupt: false
+        }, evt => {
+            // Callback will only fire after both "opacity" and "position" have finished animating.
+        });
+    // authenticate
+    finWindow.addEventListener('auth-requested', evt => {
+        finWindow.authenticate('userName', 'P@assw0rd', () => { }, (reason, err) => {
+            console.log("failure:", err);
+        });
+    });
+    // blur
+    finWindow.blur();
+    // bringToFront
+    finWindow.bringToFront();
+    // close
+    finWindow.close();
+    // disableFrame
+    finWindow.disableFrame();
+    // enableFrame
+    finWindow.enableFrame();
+    // flash
+    finWindow.flash();
+    // focus
+    finWindow.focus();
+    // getBounds
+    finWindow.getBounds(bounds => {
+        console.log(`top: ${bounds.top} left: ${bounds.left} height: ${bounds.height} width: ${bounds.width}`);
+    });
+    // getOptions
+    finWindow.getOptions(options => {
+        console.log(options);
+    });
+    // getSnapshot
+    finWindow.getSnapshot(base64Snapshot => {
+        console.log("data:image/png;base64," + base64Snapshot);
+    });
+    // getState
+    finWindow.getState(state => {
+        console.log("state: " + state);
+    });
+    // getZoomLevel
+    finWindow.getZoomLevel(level => {
+        console.log("zoom level: " + level);
+    }, error => {
+        console.log('error:', error);
+    });
+    // hide
+    finWindow.hide();
+    // isShowing
+    finWindow.isShowing(showing => {
+        console.log("the window is " + (showing ? "showing" : "hidden"));
+    });
+    // joinGroup
+    let secondWindow = new fin.desktop.Window({
+        url: "http://www.openfin.co",
+        name: "secondWindow",
+        autoShow: true
+    }, () => {
+        // When mainWindow moves or is moved, secondWindow moves by the same amount
+        secondWindow.joinGroup(finWindow);
+    });
+    // leaveGroup
+    secondWindow = new fin.desktop.Window({
+        url: "http://www.openfin.co",
+        name: "secondWindow",
+        autoShow: true
+    }, () => {
+        // When finWindow moves or is moved, secondWindow moves by the same amount
+        secondWindow.joinGroup(finWindow, () => {
+            // once we are in the group, lets leave it.
+            secondWindow.leaveGroup();
+        });
+    });
+    // maximize
+    finWindow.maximize();
+    // mergeGroups
+    {
+        const finWindowOne = new fin.desktop.Window({
+            url: "http://www.openfin.co",
+            name: "finWindowOne",
+            autoShow: true
+        });
+        const finWindowTwo = new fin.desktop.Window({
+            url: "http://www.openfin.co",
+            name: "finWindowTwo",
+            autoShow: true
+        });
+        const finWindowThree = new fin.desktop.Window({
+            url: "http://www.openfin.co",
+            name: "finWindowThree",
+            autoShow: true
+        });
+        const finWindowFour = new fin.desktop.Window({
+            url: "http://www.openfin.co",
+            name: "finWindowFour",
+            autoShow: true
+        });
+        // When finWindowOne moves or is moved, finWindowTwo moves by the same amount
+        finWindowOne.joinGroup(finWindowTwo);
+        // When finWindowThree moves or is moved, finWindowFour moves by the same amount
+        finWindowThree.joinGroup(finWindowFour);
+        // finWindowOne, finWindowTwo, finWindowThree, and finWindowFour now move together in the same group
+        finWindowOne.mergeGroups(finWindowThree);
+    }
+    // minimize
+    finWindow.minimize();
+    // moveBy
+    finWindow.moveBy(10, 10);
+    // moveTo
+    finWindow.moveTo(100, 200);
+    // removeEventListener
+    const aRegisteredListener = (event: fin.WindowBaseEvent) => { };
+    finWindow.removeEventListener("bounds-changed", aRegisteredListener);
+    // resizeBy
+    finWindow.resizeBy(10, 10, "top-right");
+    // resizeTo
+    finWindow.resizeTo(10, 10, "top-right");
+    // restore
+    finWindow.restore();
+    // setAsForeground
+    finWindow.setAsForeground();
+    // setBounds
+    finWindow.setBounds(100, 200, 400, 400);
+    // setZoomLevel
+    finWindow.setZoomLevel(10);
+    // show
+    finWindow.show();
+    // showAt
+    finWindow.showAt(10, 10, false);
+    // stopFlashing
+    finWindow.stopFlashing();
+    // updateOptions
+    finWindow.updateOptions({
+        frame: false,
+        maxWidth: 500
+    });
+}
+
+function test_frame() {
+    //wrap
+    const frame = fin.desktop.Frame.wrap('uuid', 'name');
+    //getCurrent
+    const currentFrame = fin.desktop.Frame.getCurrent();
+    // addEventlistener
+    frame.addEventListener('event', () => console.log('on event'), () => console.log('success'), err => console.error(err));
+    //removeEventListener
+    frame.removeEventListener('event', () => console.log('on event'), () => console.log('success'), err => console.error(err));
+    // getInfo
+    frame.getInfo(info => {
+        console.log(info.uuid, info.name, info.entityType, info.parent.uuid, info.parent.name);
+    }, err => console.error(err));
+    // getParentWindow
+    frame.getParentWindow(parent => {
+        console.log(parent.uuid, parent.name, parent.entityType, parent.parent.uuid, parent.parent.name);
+    }, err => console.error(err));
 }
diff --git a/types/openfin/tsconfig.json b/types/openfin/tsconfig.json
index fd3199ceb7..df2dae8b79 100644
--- a/types/openfin/tsconfig.json
+++ b/types/openfin/tsconfig.json
@@ -8,12 +8,17 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
-        "strictFunctionTypes": false,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
         ],
         "types": [],
+        "paths": {
+            "openfin": [
+                "openfin/v29"
+            ]
+        },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
@@ -21,4 +26,4 @@
         "index.d.ts",
         "openfin-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/openfin/tslint.json b/types/openfin/tslint.json
index 64aace11d6..f93cf8562a 100644
--- a/types/openfin/tslint.json
+++ b/types/openfin/tslint.json
@@ -1,6 +1,3 @@
 {
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "max-line-length": false
-    }
+    "extends": "dtslint/dt.json"
 }
diff --git a/types/openfin/v17/index.d.ts b/types/openfin/v17/index.d.ts
new file mode 100644
index 0000000000..30afded19b
--- /dev/null
+++ b/types/openfin/v17/index.d.ts
@@ -0,0 +1,1732 @@
+// Type definitions for OpenFin API 17.0
+// Project: https://openfin.co/
+// Definitions by: Chris Barker <https://github.com/chrisbarker>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// based on v6.49.17.14
+// see https://openfin.co/support/technical-faq/#what-do-the-numbers-in-the-runtime-version-mean
+
+/**
+ * JavaScript API
+ * The JavaScript API allows you to create an HTML/JavaScript application that has access to the native windowing environment,
+ * can communicate with other applications and has access to sandboxed system-level features.
+ *
+ * API Ready
+ * When using the OpenFin API, it is important to ensure that it has been fully loaded before making any API calls. To verify
+ * that the API is in fact ready, be sure to make any API calls either from within the fin.desktop.main() method or explicitly
+ * after it has returned. This avoids the situation of trying to access methods that are not yet fully injected.
+ *
+ * Overview
+ * When running within the OpenFin Runtime your web applications have access to the "fin" namespace and all the modules within the API
+ * without the need to include additional source files. You can treat the "fin" namespace as you would the "window", "navigator" or "document" objects.
+ */
+declare namespace fin {
+	const desktop: OpenFinDesktop;
+
+	interface OpenFinDesktop {
+		main(f: () => any): void;
+		Application: OpenFinApplicationStatic;
+		ExternalApp: OpenFinExternalApplicationStatic;
+		InterApplicationBus: OpenFinInterApplicationBus;
+		Notification: OpenFinNotificationStatic;
+		System: OpenFinSystem;
+		Window: OpenFinWindowStatic;
+	}
+
+	interface OpenFinApplicationStatic {
+		/**
+		 * Creates a new Application.
+		 * An object representing an application. Allows the developer to create, execute, show/close an application as well as listen to application events.
+		 */
+		new (
+			options: ApplicationOptions,
+			callback?: (successObj: { httpResponseCode: number }) => void,
+			errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): OpenFinApplication;
+		/**
+		 * Returns an Application object that represents an existing application.
+		 */
+		getCurrent(): OpenFinApplication;
+		/**
+		 * Returns an Application object that represents an existing application.
+		 */
+		wrap(uuid: string): OpenFinApplication;
+	}
+
+	/**
+	 * Application
+	 * An object representing an application.Allows the developer to create, execute, show / close an application as well as listen to application events.
+	 */
+	interface OpenFinApplication {
+		/**
+		 * Returns an instance of the main Window of the application
+		 */
+		getWindow(): OpenFinWindow;
+		/**
+		 * Registers an event listener on the specified event.
+		 */
+		addEventListener(
+			type: OpenFinApplicationEventType,
+			listener: (event: ApplicationBaseEvent
+				| TrayIconClickedEvent
+				| WindowEvent
+				| WindowAlertRequestedEvent
+				| WindowAuthRequested
+				| WindowNavigationRejectedEvent
+				| WindowEndLoadEvent) => void,
+			callback?: () => void,
+			errorCallback?: (reason: string) => void): void;
+		/**
+		 * Closes the application and any child windows created by the application.
+		 */
+		close(force?: boolean, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves an array of wrapped fin.desktop.Windows for each of the application's child windows.
+		 */
+		getChildWindows(callback?: (children: OpenFinWindow[]) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves an array of active window groups for all of the application's windows. Each group is represented as an array of wrapped fin.desktop.Windows.
+		 */
+		getGroups(callback?: (groups: OpenFinWindow[][]) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves the JSON manifest that was used to create the application. Invokes the error callback if the application was not created from a manifest.
+		 */
+		getManifest(callback?: (manifest: any) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves UUID of the application that launches this application. Invokes the error callback if the application was created from a manifest.
+		 */
+		getParentUuid(callback?: (uuid: string) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves current configuration of application's shortcuts.
+		 */
+		getShortcuts(callback?: (config: ShortCutConfig) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves information about the application.
+		 */
+		getInfo(callback?: (info: LaunchInfo) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Determines if the application is currently running.
+		 */
+		isRunning(callback?: (running: boolean) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Passes in custom data that will be relayed to the RVM
+		 */
+		registerCustomData(data: any, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Removes a previously registered event listener from the specified event.
+		 */
+		removeEventListener(
+			type: OpenFinApplicationEventType,
+			previouslyRegisteredListener: (event: ApplicationBaseEvent
+				| TrayIconClickedEvent
+				| WindowEvent
+				| WindowAlertRequestedEvent
+				| WindowAuthRequested
+				| WindowNavigationRejectedEvent
+				| WindowEndLoadEvent) => any,
+			callback?: () => void,
+			errorCallback?: (reason: string) => void): void;
+		/**
+		 * Removes the application's icon from the tray.
+		 */
+		removeTrayIcon(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Restarts the application.
+		 */
+		restart(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Runs the application. When the application is created, run must be called.
+		 */
+		run(callback?: (successObj: SuccessObj) => void, errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): void;
+		/**
+		 * Tells the rvm to relaunch the main application once upon a complete shutdown
+		 */
+		scheduleRestart(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Sets new shortcut configuration for current application.
+		 * Application has to be launched with a manifest and has to have shortcut configuration (icon url, name, etc.) in its manifest to
+		 * be able to change shortcut states.
+		 */
+		setShortcuts(config: ShortCutConfig, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Adds a customizable icon in the system tray and notifies the application when clicked.
+		 */
+		setTrayIcon(iconUrl: string, listener: (clickInfo: TrayIconClickedEvent) => void, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Closes the application by terminating its process.
+		 */
+		terminate(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Waits for a hanging application. This method can be called in response to an application "not-responding" to allow the application
+		 * to continue and to generate another "not-responding" message after a certain period of time.
+		 */
+		wait(callback?: () => void, errorCallback?: (reason: string) => void): void;
+	}
+
+	interface ShortCutConfig {
+		/**
+		 * application has a shortcut on the desktop
+		 */
+		desktop?: boolean;
+		/**
+		 * application has no shortcut in the start menu
+		 */
+		startMenu?: boolean;
+		/**
+		 * application will be launched on system startup
+		 */
+		systemStartup?: boolean;
+	}
+
+	interface SuccessObj {
+		httpResponseCode: number;
+	}
+
+	interface NetworkErrorInfo extends ErrorInfo {
+		networkErrorCode: number;
+	}
+
+	interface ErrorInfo {
+		stack: string;
+		message: string;
+	}
+
+	interface ApplicationOptions {
+		/**
+		 * The name of the application.
+		 */
+		name?: string;
+		/**
+		 * The url to the application.
+		 */
+		url?: string;
+		/**
+		 * The UUID of the application, unique within the set of all other applications running in the OpenFin Runtime. name and uuid must match.
+		 */
+		uuid?: string;
+		/**
+		 * Enable Flash at the application level. Default: false.
+		 */
+		plugins?: boolean;
+		/**
+		 * The options of the main window of the application.
+		 */
+		mainWindowOptions?: WindowOptions;
+	}
+
+	interface WindowOptions {
+		/**
+		 * Enable keyboard shortcuts for devtools and zoom. Default: false for both.
+		 */
+		accelerator?: {
+			devtools?: boolean,
+			zoom?: boolean,
+			reload?: boolean,
+			reloadIgnoreCache?: boolean,
+		};
+		/**
+		 * A flag to always position the window at the top of the window stack. Default: false.
+		 * Updatable
+		 */
+		alwaysOnTop?: boolean;
+		/**
+		 * A flag to automatically show the Window when it is created. Default: false.
+		 */
+		autoShow?: boolean;
+		/**
+		 * A flag to show the context menu when right-clicking on a window. Gives access to the Developer Console for the Window. Default: true
+		 * Updatable
+		 */
+		contextMenu?: boolean;
+		/**
+		 * This defines and applies rounded corners for a frameless window. Default for both width and height: 0.
+		 * Updatable
+		 */
+		cornerRounding?: {
+			width?: number;
+			height?: number;
+		};
+		/**
+		 * A field that the user can attach serializable data to to be ferried around with the window options. Default: ''.
+		 */
+		customData?: any;
+		/**
+		 * Specifies that the window will be positioned in the center of the primary monitor when loaded for the first time on a machine.
+		 * When the window corresponding to that id is loaded again, the position from before the window was closed is used.
+		 * This option overrides defaultLeft and defaultTop. Default: false.
+		 */
+		defaultCentered?: boolean;
+		/**
+		 * The default height of the window. Specifies the height of the window when loaded for the first time on a machine.
+		 *  When the window corresponding to that id is loaded again, the height is taken to be the last height of the window before it was closed. Default: 500.
+		 */
+		defaultHeight?: number;
+		/**
+		 * The default left position of the window. Specifies the position of the left of the window when loaded for the first time on a machine.
+		 *  When the window corresponding to that id is loaded again, the value of left is taken to be the last value before the window was closed. Default: 100.
+		 */
+		defaultWidth?: number;
+		/**
+		 * The default top position of the window. Specifies the position of the top of the window when loaded for the first time on a machine.
+		 * When the window corresponding to that id is loaded again, the value of top is taken to be the last value before the window was closed. Default: 100.
+		 */
+		defaultTop?: number;
+		/**
+		 * The default width of the window. Specifies the width of the window when loaded for the first time on a machine.
+		 * When the window corresponding to that id is loaded again, the width is taken to be the last width of the window before it was closed. Default: 800.
+		 */
+		defaultLeft?: number;
+		/**
+		 * A flag to show the frame. Default: true.
+		 * Updatable
+		 */
+		frame?: boolean;
+		/**
+		 * A flag to allow a window to be hidden when the close button is clicked.Default: false.
+		 * Updatable
+		 */
+		hideOnClose?: boolean;
+		/**
+		 * A URL for the icon to be shown in the window title bar and the taskbar.Default: The parent application's applicationIcon.
+		 * Updatable
+		 */
+		icon?: string;
+		/**
+		 * The maximum height of a window.Will default to the OS defined value if set to - 1. Default: -1.
+		 * Updatable
+		 */
+		maxHeight?: number;
+		/**
+		 * A flag that lets the window be maximized.Default: true.
+		 * Updatable
+		 */
+		maximizable?: boolean;
+		/**
+		 * The maximum width of a window.Will default to the OS defined value if set to - 1. Default: -1.
+		 * Updatable
+		 */
+		maxWidth?: number;
+		/**
+		 * The minimum height of a window.Default: 0.
+		 * Updatable
+		 */
+		minHeight?: number;
+		/**
+		 * A flag that lets the window be minimized.Default: true.
+		 */
+		minimizable?: boolean;
+		/**
+		 * The minimum width of a window.Default: 0.
+		 */
+		minWidth?: number;
+		/**
+		 * The name for the window which must be unique within the context of the invoking Application.
+		 */
+		name?: string;
+		/**
+		 * A flag that specifies how transparent the window will be.This value is clamped between 0.0 and 1.0.Default: 1.0.
+		 * Updatable
+		 */
+		opacity?: number;
+		/**
+		 * A flag to drop to allow the user to resize the window.Default: true.
+		 * Updatable
+		 */
+		resizable?: boolean;
+		/**
+		 * Defines a region in pixels that will respond to user mouse interaction for resizing a frameless window.
+		 * Updatable
+		 */
+		resizeRegion?: {
+			/**
+			 * The size in pixels (Default: 2),
+			 */
+			size?: number;
+			/**
+			 * The size in pixels of an additional
+			 * square resizable region located at the
+			 * bottom right corner of a
+			 * frameless window. (Default: 4)
+			 */
+			bottomRightCorner?: number;
+		};
+		/**
+		 * A flag to show the Window's icon in the taskbar. Default: true.
+		 */
+		showTaskbarIcon?: boolean;
+		/**
+		 * A flag to cache the location of the window or not. Default: true.
+		 */
+		saveWindowState?: boolean;
+		/**
+		 * Specify a taskbar group for the window. Default: app's uuid.
+		 */
+		taskbarIconGroup?: string;
+		/**
+		 * A string that sets the window to be "minimized", "maximized", or "normal" on creation. Default: "normal".
+		 */
+		state?: string;
+		/**
+		 * The URL of the window. Default: "about:blank".
+		 */
+		url?: string;
+		/**
+		 * When set to false, the window will render before the "load" event is fired on the content's window.
+		 * Caution, when false you will see an initial empty white window. Default: true.
+		 */
+		waitForPageLoad?: boolean;
+	}
+
+	/**
+	 * Clipboard
+	 * Clipboard API allows reading and writting to the clipboard in multiple formats.
+	 */
+	interface OpenFinClipboard {
+		/**
+		 * Reads available formats for the clipboard type
+		 */
+		availableFormats(type: string | null, callback?: (formats: string[]) => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+		/**
+		 * Reads available formats for the clipboard type
+		 */
+		readHtml(type: string | null, callback?: (html: string) => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+		/**
+		 * Read the content of the clipboard as Rtf
+		 */
+		readRtf(type: string | null, callback?: (rtf: string) => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+		/**
+		 * Read the content of the clipboard as plain text
+		 */
+		readText(type: string | null, callback?: (text: string) => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+		/**
+		 * Writes data into the clipboard
+		 */
+		write(data: any, type: string | null, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+		/**
+		 * Writes data into the clipboard as Html
+		 */
+		writeHtml(data: string, type: string | null, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+		/**
+		 * Writes data into the clipboard as Rtf
+		 */
+		writeRtf(data: string, type: string | null, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+		/**
+		 * Writes data into the clipboard as plain text
+		 */
+		writeText(data: string, type: string | null, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+	}
+
+	interface OpenFinExternalApplicationStatic {
+		/**
+		 * Returns an External Application object that represents an existing external application.
+		 */
+		wrap(uuid: string): OpenFinExternalApplication;
+	}
+	/**
+	 * ExternalApplication
+	 * An object representing an application. Allows the developer to create, execute, show and close an application, as well as listen to application events.
+	 */
+	interface OpenFinExternalApplication {
+		/**
+		 * Registers an event listener on the specified event.
+		 */
+		addEventListener(
+			type: OpenFinExternalApplicationEventType,
+			listener: () => void,
+			callback?: () => void,
+			errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+		/**
+		 * Removes a previously registered event listener from the specified event.
+		 */
+		removeEventListener(
+			type: OpenFinExternalApplicationEventType,
+			listener: () => void,
+			callback?: () => void,
+			errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+	}
+
+	/**
+	 * InterApplicationBus
+	 * A messaging bus that allows for pub/sub messaging between different applications.
+	 */
+	interface OpenFinInterApplicationBus {
+		/**
+		 * Adds a listener that gets called when applications subscribe to the current application's messages.
+		 */
+		addSubscribeListener(listener: (uuid: string, topic: string, name: string) => void): void;
+		/**
+		 * Adds a listener that gets called when applications unsubscribe to the current application's messages.
+		 */
+		addUnsubscribeListener(listener: (uuid: string, topic: string, name: string) => void): void;
+		/**
+		 * Removes a previously registered subscribe listener.
+		 */
+		removeSubscribeListener(listener: (uuid: string, topic: string, name: string) => void): void;
+		/**
+		 * Removes a previously registered unsubscribe listener.
+		 */
+		removeUnsubscribeListener(listener: (uuid: string, topic: string, name: string) => void): void;
+		/**
+		 * Publishes a message to all applications running on OpenFin Runtime that are subscribed to the specified topic.
+		 */
+		publish(topic: string, message: any, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Sends a message to a specific application on a specific topic.
+		 */
+		send(destinationUuid: string, name: string, topic: string, message: any, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		send(destinationUuid: string, topic: string, message: any, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Subscribes to messages from the specified application on the specified topic. If the subscription is for a uuid, [name],
+		 * topic combination that has already been published to upon subscription you will receive the last 20 missed messages in the order they were published.
+		 */
+		subscribe(
+			senderUuid: string,
+			name: string,
+			topic: string,
+			listener: (message: any, uuid: string, name: string) => void,
+			callback?: () => void,
+			errorCallback?: (reason: string) => void): void;
+		subscribe(
+			senderUuid: string,
+			topic: string,
+			listener: (message: any, uuid: string, name: string) => void,
+			callback?: () => void,
+			errorCallback?: (reason: string) => void): void;
+		/**
+		 * Unsubscribes to messages from the specified application on the specified topic.
+		 */
+		unsubscribe(
+			senderUuid: string,
+			name: string,
+			topic: string,
+			listener: (message: any, uuid: string, name: string) => void,
+			callback?: () => void,
+			errorCallback?: (reason: string) => void): void;
+		unsubscribe(
+			senderUuid: string,
+			topic: string,
+			listener: (message: any, uuid: string, name: string) => void,
+			callback?: () => void,
+			errorCallback?: (reason: string) => void): void;
+	}
+
+	interface OpenFinNotificationStatic {
+		/**
+		 * ctor
+		 */
+		new (options: NotificationOptions, callback?: () => void, errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): OpenFinNotification;
+		/**
+		 * Gets an instance of the current notification. For use within a notification window to close the window or send a message back to its parent application.
+		 */
+		getCurrent(): OpenFinNotification;
+	}
+
+	/**
+	 * Notification
+	 * Notification represents a window on OpenFin Runtime which is shown briefly to the user on the bottom-right corner of the primary monitor.
+	 * A notification is typically used to alert the user of some important event which requires his or her attention.
+	 * Notifications are a child or your application that are controlled by the runtime.
+	 */
+	interface OpenFinNotification {
+		/**
+		 * Closes the notification.
+		 */
+		close(callback?: () => void): void;
+		/**
+		 * Sends a message to the notification.
+		 */
+		sendMessage(message: any, callback?: () => void): void;
+		/**
+		 * Sends a message from the notification to the application that created the notification. The message is handled by the notification's onMessage callback.
+		 */
+		sendMessageToApplication(message: any, callback?: () => void): void;
+	}
+
+	interface NotificationOptions {
+		/**
+		 * A boolean that will force dismissal even if the mouse is hovering over the notification
+		 */
+		ignoreMouseOver?: boolean;
+		/**
+		 * A message of any primitive or composite-primitive type to be passed to the notification upon creation.
+		 */
+		message?: any;
+		/**
+		 * The timeout for displaying a notification.Can be in milliseconds or "never".
+		 */
+		duration?: number | "never";
+		/**
+		 * The url of the notification
+		 */
+		url?: string;
+		/**
+		 * A function that is called when a notification is clicked.
+		 */
+		onClick?(callback: () => void): void;
+		/**
+		 * Invoked when the notification is closed via .close() method on the created notification instance
+		 * or the by the notification itself via fin.desktop.Notification.getCurrent().close().
+		 * NOTE: this is not invoked when the notification is dismissed via a swipe. For the swipe dismissal callback see onDismiss
+		 */
+		onClose?(callback: () => void): void;
+		/**
+		 * Invoked when a the notification is dismissed by swiping it off the screen to the right. NOTE: this is no fired on a programmatic close.
+		 */
+		onDismiss?(callback: () => void): void;
+		/**
+		 * A function that is called when an error occurs.The reason for the error is passed as an argument.
+		 */
+		onError?(errorCallback: (reason: string, errorObj: NetworkErrorInfo) => void): void;
+		/**
+		 * The onMessage function will respond to messages sent from notification.sendMessageToApplication.
+		 * The function is passed the message, which can be of any primitive or composite-primitive type.
+		 */
+		onMessage?(callback: (message: any) => void): void;
+		/**
+		 * A function that is called when a notification is shown.
+		 */
+		onShow?(callback: (successObj: SuccessObj) => void): void;
+	}
+
+	/**
+	 * System
+	 * An object representing the core of OpenFin Runtime.
+	 * Allows the developer to perform system-level actions, such as accessing logs, viewing processes, clearing the cache and exiting the runtime.
+	 */
+	interface OpenFinSystem {
+		Clipboard: OpenFinClipboard;
+		/**
+		 * Registers an event listener on the specified event.
+		 */
+		addEventListener(
+			type: OpenFinSystemEventType,
+			listener: (event: SystemBaseEvent | DesktopIconClickedEvent | IdleStateChangedEvent | MonitorInfoChangedEvent | SessionChangedEvent) => void,
+			callback?: () => void,
+			errorCallback?: (reason: string) => void): void;
+		/**
+		 * Clears cached data containing window state/positions,
+		 * application resource files (images, HTML, JavaScript files), cookies, and items stored in the Local Storage.
+		 */
+		clearCache(options: CacheOptions, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Clears all cached data when OpenFin Runtime exits.
+		 */
+		deleteCacheOnExit(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Downloads the given application asset
+		 */
+		downloadAsset(
+			assetObj: AppAssetInfo,
+			progressListener?: (progress: { downloadedBytes: number, totalBytes: number }) => void,
+			callback?: (successObj: { path: string }) => void,
+			errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): void;
+		/**
+		 * Exits the Runtime.
+		 */
+		exit(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves an array of data for all applications.
+		 */
+		getAllApplications(callback?: (applicationInfoList: ApplicationInfo[]) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves an array of data for all external applications.
+		 */
+		getAllExternalApplications(callback?: (applicationInfoList: ApplicationInfo[]) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves an array of data (name, ids, bounds) for all application windows.
+		 */
+		getAllWindows(callback?: (windowInfoList: WindowDetails[]) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves the command line argument string that started OpenFin Runtime.
+		 */
+		getCommandLineArguments(callback?: (args: string) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves the configuration object that started the OpenFin Runtime.
+		 */
+		getDeviceId(callback?: (uuid: string) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Gets the value of a given environment variable on the computer on which the runtime is installed.
+		 */
+		getEnvironmentVariable(envVar: string, callback?: (variable: string) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves system information.
+		 */
+		getHostSpecs(callback?: (info: HostSpecInfo) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves the contents of the log with the specified filename.
+		 */
+		getLog(logFileName: string, callback?: (variable: string) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves an array containing information for each log file.
+		 */
+		getLogList(callback?: (logInfoList: LogInfo[]) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves an object that contains data about the about the monitor setup of the computer that the runtime is running on.
+		 */
+		getMonitorInfo(callback?: (monitorInfo: MonitorInfo) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Returns the mouse in virtual screen coordinates (left, top).
+		 */
+		getMousePosition(callback?: (mousePosition: VirtualScreenCoordinates) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves an array of all of the runtime processes that are currently running.
+		 * Each element in the array is an object containing the uuid and the name of the application to which the process belongs.
+		 */
+		getProcessList(callback?: (processInfoList: ProcessInfo[]) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves the Proxy settings.
+		 */
+		getProxySettings(callback?: (proxy: ProxyInfo) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Returns information about the running RVM in an object.
+		 */
+		getRvmInfo(callback?: (rvmInfo: RvmInfo) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Returns the version of the runtime. The version contains the major, minor, build and revision numbers.
+		 */
+		getVersion(callback?: (version: string) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Runs an executable or batch file.
+		 */
+		launchExternalProcess(options: ExternalProcessLaunchInfo, callback?: (payload: { uuid: string }) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Writes the passed message into both the log file and the console.
+		 */
+		log(level: "debug" | "info" | "warn" | "error", message: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Monitors a running process.
+		 */
+		monitorExternalProcess(options: ExternalProcessInfo, callback?: (payload: { uuid: string }) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Opens the passed URL in the default web browser.
+		 */
+		openUrlWithBrowser(url: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * This function call will register a unique id and produce a token. The token can be used to broker an external connection.
+		 */
+		registerExternalConnection(
+			uuid: string,
+			callback?: (detail: {
+				/**
+				 * this will be unique each time
+				 */
+				token: string;
+				/**
+				 * "remote-connection-uuid"
+				 */
+				uuid: string;
+			}) => void,
+			errorCallback?: (reason: string) => void): void;
+		/**
+		 * Removes the process entry for the passed UUID obtained from a prior call of fin.desktop.System.launchExternalProcess().
+		 */
+		releaseExternalProcess(processUuid: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Removes a previously registered event listener from the specified event.
+		 */
+		removeEventListener(
+			type: OpenFinSystemEventType,
+			listener: (event: SystemBaseEvent | DesktopIconClickedEvent | IdleStateChangedEvent | MonitorInfoChangedEvent | SessionChangedEvent) => void,
+			callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Shows the Chrome Developer Tools for the specified window.
+		 */
+		showDeveloperTools(uuid: string, name: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Attempt to close an external process. The process will be terminated if it has not closed after the elapsed timeout in milliseconds.
+		 */
+		terminateExternalProcess(
+			processUuid: string,
+			timeout: number,
+			killTree: boolean,
+			callback?: (info: { result: "clean" | "terminated" | "failed" }) => void,
+			errorCallback?: (reason: string) => void): void;
+		terminateExternalProcess(
+			processUuid: string,
+			timeout: number,
+			callback?: (info: { result: "clean" | "terminated" | "failed" }) => void,
+			errorCallback?: (reason: string) => void): void;
+		/**
+		 * Update the OpenFin Runtime Proxy settings.
+		 */
+		updateProxySettings(type: string, address: string, port: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
+	}
+
+	interface CacheOptions {
+		cache?: boolean;
+		cookies?: boolean;
+		localStorage?: boolean;
+		appcache?: boolean;
+		userData?: boolean;
+	}
+
+	interface AppAssetInfo {
+		src?: string;
+		alias?: string;
+		version?: string;
+		target?: string;
+		args?: string;
+	}
+
+	interface ApplicationInfo {
+		/**
+		 * true when the application is running.
+		 */
+		isRunning?: boolean;
+		/**
+		 * uuid of the application.
+		 */
+		uuid?: string;
+		/**
+		 * uuid of the application that launches this application.
+		 */
+		parentUuid?: string;
+	}
+
+	interface WindowDetails {
+		uuid?: string;
+		mainWindow?: WindowInfo;
+		childWindows?: WindowInfo[];
+	}
+
+	interface WindowInfo {
+		/**
+		 * name of the child window
+		 */
+		name?: string;
+		/**
+		 * top-most coordinate of the child window
+		 */
+		top?: number;
+		/**
+		 * right-most coordinate of the child window
+		 */
+		right?: number;
+		/**
+		 * bottom-most coordinate of the child window
+		 */
+		bottom?: number;
+		/**
+		 * left-most coordinate of the child window
+		 */
+		left?: number;
+	}
+
+	interface HostSpecInfo {
+		/**
+		 * "x86" for 32-bit or "x86_64" for 64-bit
+		 */
+		arch: string;
+		/**
+		 * Same payload as Node's os.cpus()
+		 */
+		cpus: NodeCpuInfo[];
+		gpu: {
+			/**
+			 * Graphics card name
+			 */
+			name: string;
+		};
+		/**
+		 * Same payload as Node's os.totalmem()
+		 */
+		memory: number;
+		/**
+		 * OS name and version/edition
+		 */
+		name: string;
+	}
+
+	interface NodeCpuInfo {
+		model: string;
+		/**
+		 * in MHz
+		 */
+		speed: number;
+		times: {
+			/**
+			 * The number of milliseconds the CPU has spent in user mode.
+			 */
+			user: number;
+			/**
+			 * The number of milliseconds the CPU has spent in nice mode.
+			 */
+			nice: number;
+			/**
+			 * The number of milliseconds the CPU has spent in sys mode.
+			 */
+			sys: number;
+			/**
+			 * The number of milliseconds the CPU has spent in idle mode.
+			 */
+			idle: number;
+			/**
+			 * The number of milliseconds the CPU has spent in irq mode.
+			 */
+			irq: number;
+		};
+	}
+
+	interface LogInfo {
+		/**
+		 * the filename of the log
+		 */
+		name?: string;
+		/**
+		 * the size of the log in bytes
+		 */
+		size?: number;
+		/**
+		 * the unix time at which the log was created "Thu Jan 08 2015 14:40:30 GMT-0500 (Eastern Standard Time)"
+		 */
+		date?: string;
+	}
+
+	interface ProcessInfo {
+		/**
+		 * the percentage of total CPU usage
+		 */
+		cpuUsage?: number;
+		/**
+		 * the application name
+		 */
+		name?: string;
+		/**
+		 * the current nonpaged pool usage in bytes
+		 */
+		nonPagedPoolUsage?: number;
+		/**
+		 * the number of page faults
+		 */
+		pageFaultCount?: number;
+		/**
+		 * the current paged pool usage in bytes
+		 */
+		pagedPoolUsage?: number;
+		/**
+		 * the total amount of memory in bytes that the memory manager has committed
+		 */
+		pagefileUsage?: number;
+		/**
+		 * the peak nonpaged pool usage in bytes
+		 */
+		peakNonPagedPoolUsage?: number;
+		/**
+		 * the peak paged pool usage in bytes
+		 */
+		peakPagedPoolUsage?: number;
+		/**
+		 * the peak value in bytes of pagefileUsage during the lifetime of this process
+		 */
+		peakPagefileUsage?: number;
+		/**
+		 * the peak working set size in bytes
+		 */
+		peakWorkingSetSize?: number;
+		/**
+		 * the native process identifier
+		 */
+		processId?: number;
+		/**
+		 * the application UUID
+		 */
+		uuid?: string;
+		/**
+		 * the current working set size (both shared and private data) in bytes
+		 */
+		workingSetSize?: number;
+	}
+
+	interface ProxyInfo {
+		/**
+		 * the configured Proxy Address
+		 */
+		proxyAddress?: string;
+		/**
+		 * the configured Proxy port
+		 */
+		proxyPort?: number;
+		/**
+		 * Proxy Type
+		 */
+		type?: string;
+	}
+
+	interface RvmInfo {
+		version?: string;
+		"start-time"?: string;
+	}
+
+	interface ExternalProcessLaunchInfo {
+		path?: string;
+		/**
+		 * Additionally note that the executable found in the zip file specified in appAssets
+		 * will default to the one mentioned by appAssets.target
+		 * If the the path below refers to a specific path it will override this default
+		 */
+		alias?: string;
+		/**
+		 * When using alias; if no arguments are passed then the arguments (if any)
+		 * are taken from the 'app.json' file, from the  'args' parameter
+		 * of the 'appAssets' Object with the relevant 'alias'.
+		 * If 'arguments' is passed as a parameter it takes precedence
+		 * over any 'args' set in the 'app.json'.
+		 */
+		arguments?: string;
+		listener?(result: {
+			/**
+			 * "Exited" Or "released" on a call to releaseExternalProcess
+			 */
+			topic?: string;
+			/**
+			 * The mapped UUID which identifies the launched process
+			 */
+			uuid?: string;
+			/*
+			 * Process exit code
+			 */
+			exitCode?: number;
+		}): void;
+		certificate?: CertificationInfo;
+	}
+
+	interface CertificationInfo {
+		/**
+		 * A hex string with or without spaces
+		 */
+		serial?: string;
+		/**
+		 * An internally tokenized and comma delimited string allowing partial or full checks of the subject fields
+		 */
+		subject?: string;
+		/**
+		 * A hex string with or without spaces
+		 */
+		publickey?: string;
+		/**
+		 * A hex string with or without spaces
+		 */
+		thumbprint?: string;
+		/**
+		 * A boolean indicating that the certificate is trusted and not revoked
+		 */
+		trusted?: boolean;
+	}
+
+	interface ExternalProcessInfo {
+		pid?: number;
+		listener?(result: {
+			/**
+			 * "Exited" Or "released" on a call to releaseExternalProcess
+			 */
+			topic?: string;
+			/**
+			 * The mapped UUID which identifies the launched process
+			 */
+			uuid?: string;
+			/*
+				* Process exit code
+				*/
+			exitCode?: number;
+		}): void;
+	}
+
+	interface OpenFinWindowStatic {
+		/**
+		 * Class: Window
+		 *
+		 * new Window(options, callbackopt, errorCallbackopt)
+		 *
+		 * Creates a new OpenFin Window
+		 *
+		 * A basic window that wraps a native HTML window. Provides more fine-grained control over the window state such as the ability to minimize,
+		 * maximize, restore, etc. By default a window does not show upon instantiation; instead the window's show() method must be invoked manually.
+		 * The new window appears in the same process as the parent window.
+		 * @param options - The options of the window
+		 * @param [callback] - Called if the window creation was successful
+		 * @param [callback.successObj] - httpResponseCode
+		 */
+		new (
+			options: WindowOptions,
+			callback?: (successObj: { httpResponseCode: number }) => void,
+			errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): OpenFinWindow;
+		/**
+		 * Returns an instance of the current window.
+		 * @returns Current window
+		 */
+		getCurrent(): OpenFinWindow;
+		/**
+		 * Returns a Window object that wraps an existing window.
+		 */
+		wrap(appUuid: string, windowName: string): OpenFinWindow;
+	}
+
+	/**
+	 * Window
+	 * A basic window that wraps a native HTML window. Provides more fine-grained control over the window state such as the ability to minimize,
+	 * maximize, restore, etc. By default a window does not show upon instantiation; instead the window's show() method must be invoked manually.
+	 * The new window appears in the same process as the parent window.
+	 */
+	interface OpenFinWindow {
+		/**
+		 * Name of window
+		 */
+		name: string;
+		/**
+		 * Returns the native JavaScript "window" object for the window. This method can only be used by the parent application or the window itself,
+		 * otherwise it will return undefined. The same Single-Origin-Policy (SOP) rules apply for child windows created by window.open(url) in that the
+		 * contents of the window object are only accessible if the URL has the same origin as the invoking window. See example below.
+		 * Also, will not work with fin.desktop.Window objects created with fin.desktop.Window.wrap().
+		 * @returns Native window
+		 */
+		getNativeWindow(): Window;
+		/**
+		 * Gets the parent application.
+		 * @returns Parent application
+		 */
+		getParentApplication(): OpenFinApplication;
+		/**
+		 * Gets the parent window.
+		 */
+		getParentWindow(): OpenFinWindow;
+		/**
+		 * Registers an event listener on the specified event.
+		 */
+		addEventListener(
+			type: OpenFinWindowEventType,
+			listener: (event: WindowBaseEvent
+				| WindowAuthRequestedEvent
+				| WindowBoundsEvent
+				| WindowExternalProcessStartedEvent
+				| WindowExternalProcessExited
+				| WindowGroupChangedEvent
+				| WindowHiddenEvent
+				| Window_NavigationRejectedEvent) => void,
+			callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Performs the specified window transitions
+		 */
+		animate(transitions: AnimationTransition, options: AnimationOptions, callback?: (event: any) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Provides credentials to authentication requests
+		 */
+		authenticate(userName: string, password: string, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
+		/**
+		 * Removes focus from the window.
+		 */
+		blur(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Brings the window to the front of the OpenFin window stack.
+		 */
+		bringToFront(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Closes the window.
+		 * @param Close will be prevented from closing when force is false and 'close-requested' has been subscribed to for application's main window.
+		 */
+		close(force?: boolean, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Prevents a user from changing a window's size/position when using the window's frame.
+		 * 'disabled-frame-bounds-changing' is generated at the start of and during a user move/size operation.
+		 * 'disabled-frame-bounds-changed' is generated after a user move/size operation.
+		 * The events provide the bounds that would have been applied if the frame was enabled.
+		 * 'frame-disabled' is generated when an enabled frame becomes disabled.
+		 */
+		disableFrame(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Re-enables user changes to a window's size/position when using the window's frame.
+		 * 'disabled-frame-bounds-changing' is generated at the start of and during a user move/size operation.
+		 * 'disabled-frame-bounds-changed' is generated after a user move/size operation.
+		 * The events provide the bounds that would have been applied if the frame was enabled.
+		 * 'frame-enabled' is generated when a disabled frame has becomes enabled.
+		 */
+		enableFrame(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Flashes the window's frame and taskbar icon until the window is activated.
+		 */
+		flash(options?: any, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Gives focus to the window.
+		 */
+		focus(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Gets the current bounds (top, left, width, height) of the window.
+		 */
+		getBounds(callback?: (bounds: WindowBounds) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Retrieves an array containing wrapped fin.desktop.Windows that are grouped with this window. If a window is not in a group an empty array is returned.
+		 * Please note that calling window is included in the result array.
+		 */
+		getGroup(callback?: (group: OpenFinWindow[]) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Gets the current settings of the window.
+		 */
+		getOptions(callback?: (options: WindowOptions) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Gets a base64 encoded PNG snapshot of the window.
+		 */
+		getSnapshot(callback?: (base64Snapshot: string) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Gets the current state ("minimized", "maximized", or "restored") of the window.
+		 */
+		getState(callback?: (state: "minimized" | "maximized" | "restored") => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Returns the zoom level of the window.
+		 */
+		getZoomLevel(callback?: (level: number) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Hides the window.
+		 */
+		hide(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Determines if the window is currently showing.
+		 */
+		isShowing(callback?: (showing: boolean) => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Joins the same window group as the specified window.
+		 */
+		joinGroup(target: OpenFinWindow, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Leaves the current window group so that the window can be move independently of those in the group.
+		 */
+		leaveGroup(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Maximizes the window.
+		 */
+		maximize(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Merges the instance's window group with the same window group as the specified window
+		 */
+		mergeGroups(target: OpenFinWindow, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Minimizes the window.
+		 */
+		minimize(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Moves the window by a specified amount.
+		 */
+		moveBy(deltaLeft: number, deltaTop: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Moves the window to a specified location.
+		 */
+		moveTo(left: number, top: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Removes a previously registered event listener from the specified event.
+		 */
+		removeEventListener(
+			type: OpenFinWindowEventType,
+			listener: (event: WindowBaseEvent
+				| WindowAuthRequestedEvent
+				| WindowBoundsEvent
+				| WindowExternalProcessStartedEvent
+				| WindowExternalProcessExited
+				| WindowGroupChangedEvent
+				| WindowHiddenEvent
+				| Window_NavigationRejectedEvent) => void,
+			callback?: () => void,
+			errorCallback?: (reason: string) => void): void;
+		/**
+		 * Resizes the window by a specified amount.
+		 */
+		resizeBy(deltaWidth: number, deltaHeight: number, anchor: OpenFinAnchor, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Resizes the window by a specified amount.
+		 */
+		resizeTo(width: number, height: number, anchor: OpenFinAnchor, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Restores the window to its normal state (i.e., unminimized, unmaximized).
+		 */
+		restore(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Will bring the window to the front of the entire stack and give it focus.
+		 */
+		setAsForeground(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Sets the window's size and position
+		 */
+		setBounds(left: number, top: number, width: number, height: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Sets the zoom level of the window.
+		 */
+		setZoomLevel(level: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Shows the window if it is hidden.
+		 * @param Show will be prevented from closing when force is false and 'show-requested' has been subscribed to for application's main window.
+		 */
+		show(force?: boolean, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Shows the window if it is hidden at the specified location. If the toggle parameter is set to true, the window will alternate between showing and hiding.
+		 */
+		showAt(left: number, top: number, force?: boolean, callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Stops the taskbar icon from flashing.
+		 */
+		stopFlashing(callback?: () => void, errorCallback?: (reason: string) => void): void;
+		/**
+		 * Updates the window using the passed options
+		 */
+		updateOptions(options: WindowOptions, callback?: () => void, errorCallback?: (reason: string) => void): void;
+	}
+
+	interface ApplicationBaseEvent {
+		topic: string;
+		type: OpenFinApplicationEventType;
+		uuid: string;
+	}
+
+	interface TrayIconClickedEvent extends ApplicationBaseEvent {
+		button: number; // 0 for left, 1 for middle, 2 for right
+		monitorInfo: MonitorInfo;
+		x: number; // the cursor x coordinate
+		y: number; // the cursor y coordinate
+	}
+
+	interface WindowEvent extends ApplicationBaseEvent {
+		name: string;
+	}
+
+	interface WindowAlertRequestedEvent extends WindowEvent {
+		message: string;
+		url: string;
+	}
+
+	interface WindowAuthRequested extends WindowEvent {
+		authInfo: {
+			host: string;
+			isProxy: boolean;
+			port: number;
+			realm: string;
+			scheme: string;
+		};
+	}
+
+	interface WindowNavigationRejectedEvent extends WindowEvent {
+		sourceName: string;
+		url: string;
+	}
+
+	interface WindowEndLoadEvent extends WindowEvent {
+		documentName: string;
+		isMain: boolean;
+	}
+
+	interface MonitorInfoChangedEvent extends MonitorInfo {
+		topic: "system";
+		type: "monitor-info-changed";
+	}
+
+	interface MonitorInfo {
+		nonPrimaryMonitors: MonitorInfoDetail[];
+		primaryMonitor: MonitorInfoDetail;
+		reason: string;
+		taskbar: {
+			edge: "left" | "right" | "top" | "bottom",
+			rect: MontiorCoordinates
+		};
+		topic: "system";
+		type: "monitor-info-changed";
+		virtualScreen: MontiorCoordinates;
+	}
+
+	interface MonitorInfoDetail {
+		availableRect: MontiorCoordinates;
+		deviceId: string;
+		displayDeviceActive: boolean;
+		monitorRect: MontiorCoordinates;
+		name: string;
+	}
+
+	interface MontiorCoordinates {
+		bottom: number;
+		left: number;
+		right: number;
+		top: number;
+	}
+
+	interface VirtualScreenCoordinates {
+		left: number;
+		top: number;
+	}
+
+	interface SystemBaseEvent {
+		topic: string;
+		type: OpenFinSystemEventType;
+		uuid: string;
+	}
+
+	interface DesktopIconClickedEvent {
+		mouse: {
+			/**
+			 * the left virtual screen coordinate of the mouse
+			 */
+			left: number,
+			/**
+			 * the top virtual screen coordinate of the mouse
+			 */
+			top: number
+		};
+		/**
+		 * the number of milliseconds that have elapsed since the system was started,
+		 */
+		tickCount: number;
+		topic: "system";
+		type: "desktop-icon-clicked";
+	}
+
+	interface IdleStateChangedEvent {
+		/**
+		 * How long in milliseconds since the user has been idle.
+		 */
+		elapsedTime: number;
+		/**
+		 * true when the user is idle,false when the user has returned;
+		 */
+		isIdle: boolean;
+		topic: "system";
+		type: "idle-state-changed";
+	}
+
+	interface WindowBaseEvent {
+		/**
+		 * the name of the window
+		 */
+		name: string;
+		/**
+		 * always window
+		 */
+		topic: "window";
+		/**
+		 * window event type
+		 */
+		type: OpenFinWindowEventType;
+		/**
+		 * the UUID of the application the window belongs to
+		 */
+		uuid: string;
+	}
+
+	interface WindowAuthRequestedEvent extends WindowBaseEvent {
+		authInfo: {
+			host: string;
+			isProxy: boolean;
+			port: number;
+			realm: string;
+			scheme: string;
+		};
+	}
+
+	interface WindowBoundsEvent extends WindowBaseEvent {
+		/**
+		 * describes what kind of change occurred.
+		 * 0 means a change in position.
+		 * 1 means a change in size.
+		 * 2 means a change in position and size.
+		 */
+		changeType: number;
+		/**
+		 * true when pending changes have been applied to the window.
+		 */
+		deferred: boolean;
+		/**
+		 * the new height of the window.
+		 */
+		height: number;
+		/**
+		 * the left-most coordinate of the window.
+		 */
+		left: number;
+		/**
+		 * the top-most coordinate of the window.
+		 */
+		top: number;
+
+		type: "bounds-changed" | "bounds-changing" | "disabled-frame-bounds-changed" | "disabled-frame-bounds-changing";
+		/**
+		 * the new width of the window.
+		 */
+		width: number;
+	}
+
+	interface WindowExternalProcessStartedEvent extends WindowBaseEvent {
+		/**
+		 * the process handle uuid
+		 */
+		processUuid: string;
+		type: "external-process-started";
+	}
+
+	interface WindowExternalProcessExited extends WindowBaseEvent {
+		/**
+		 * the process exit code
+		 */
+		exitCode: number;
+		/**
+		 * the process handle uuid
+		 */
+		processUuid: string;
+		type: "external-process-exited";
+	}
+
+	interface WindowGroupChangedEvent extends WindowBaseEvent {
+		/**
+		 * Which group array the window that the event listener was registered on is included in:
+		 * 'source' The window is included in sourceGroup.
+		 * 'target' The window is included in targetGroup.
+		 * 'nothing' The window is not included in sourceGroup nor targetGroup.
+		 */
+		memberOf: "source" | "target" | "nothing";
+		/**
+		 * The reason this event was triggered.
+		 * 'leave' A window has left the group due to a leave or merge with group.
+		 * 'join' A window has joined the group.
+		 * 'merge' Two groups have been merged together.
+		 * 'disband' There are no other windows in the group.
+		 */
+		reason: "leave" | "join" | "merge" | "disband";
+		/**
+		 * All the windows in the group the sourceWindow originated from.
+		 */
+		sourceGroup: WindowOfGroupInfo[];
+		/**
+		 * The UUID of the application the sourceWindow belongs to The source window is the window in which (merge/join/leave)group(s) was called.
+		 */
+		sourceWindowAppUuid: string;
+		/**
+		 * the name of the sourcewindow.The source window is the window in which(merge / join / leave) group(s) was called.
+		 */
+		sourceWindowName: string;
+		/**
+		 * All the windows in the group the targetWindow orginated from
+		 */
+		targetGroup: WindowOfGroupInfo[];
+		/**
+		 * The UUID of the application the targetWindow belongs to. The target window is the window that was passed into (merge/join) group(s).
+		 */
+		targetWindowAppUuid: string;
+		/**
+		 * The name of the targetWindow. The target window is the window that was passed into (merge/join) group(s).
+		 */
+		targetWindowName: string;
+		type: "group-changed";
+	}
+
+	interface WindowOfGroupInfo {
+		/**
+		 * The UUID of the application this window entry belongs to.
+		 */
+		appUuid: string;
+		/**
+		 * The name of this window entry.
+		 */
+		windowName: string;
+	}
+
+	interface WindowHiddenEvent extends WindowBaseEvent {
+		/**
+		 * What action prompted the close.
+		 * The reasons are: "hide", "hide-on-close"
+		 */
+		reason: "hide" | "hide-on-close";
+		type: "hidden";
+	}
+
+	interface Window_NavigationRejectedEvent {
+		name: string;
+		/**
+		 * source of navigation window name
+		 */
+		sourceName: string;
+		topic: "navigation-rejected";
+		/**
+		 * Url that was not reached "http://blocked-content.url"
+		 */
+		url: string;
+		/**
+		 * the UUID of the application the window belongs to.
+		 */
+		uuid: string;
+	}
+
+	interface AnimationTransition {
+		opacity?: {
+			/**
+			 * This value is clamped from 0.0 to 1.0
+			 */
+			opacity?: number;
+			/**
+			 * The total time in milliseconds this transition should take.
+			 */
+			duration?: number;
+			/**
+			 * Treat 'opacity' as absolute or as a delta. Defaults to false.
+			 */
+			relative?: boolean;
+		};
+		position?: {
+			/**
+			 * Defaults to the window's current left position in virtual screen coordinates.
+			 */
+			left?: number;
+			/**
+			 * Defaults to the window's current top position in virtual screen coordinates.
+			 */
+			top?: number;
+			/**
+			 * The total time in milliseconds this transition should take.
+			 */
+			duration?: number;
+			/**
+			 * Treat 'left' and 'top' as absolute or as deltas. Defaults to false.
+			 */
+			relative?: boolean;
+		};
+		size?: {
+			/**
+			 * Optional if height is present. Defaults to the window's current width.
+			 */
+			width?: number;
+			/**
+			 * Optional if width is present. Defaults to the window's current height.
+			 */
+			height?: number;
+			/**
+			 * The total time in milliseconds this transition should take.
+			 */
+			duration?: number;
+			/**
+			 * Treat 'width' and 'height' as absolute or as deltas. Defaults to false.
+			 */
+			relative?: boolean;
+		};
+	}
+
+	interface AnimationOptions {
+		/**
+		 * This option interrupts the current animation. When false it pushes this animation onto the end of the animation queue.
+		 */
+		interrupt?: boolean;
+		/**
+		 * Transition effect. Defaults to 'ease-in-out'.
+		 */
+		tween?: OpenFinTweenType;
+	}
+
+	interface WindowBounds {
+		/**
+		 * the height of the window.
+		 */
+		height?: number;
+		/**
+		 * left-most coordinate of the window.
+		 */
+		left?: number;
+		/**
+		 * top-most coordinate of the window.
+		 */
+		top?: number;
+		/**
+		 * the width of the window.
+		 */
+		width?: number;
+	}
+
+	interface SessionChangedEvent {
+		/**
+		 * the action that triggered this event:
+		 */
+		reason: "lock"
+		| "unlock"
+		| "remote-connect"
+		| "remote-disconnect"
+		| "unknown";
+		topic: "system";
+		type: "session-changed";
+	}
+
+	interface LaunchInfo {
+		launchMode: "fin-protocol"
+		| "fins-protocol"
+		| "shortcut"
+		| "command-line"
+		| "adapter"
+		| "other"
+		| string;
+	}
+
+	type OpenFinTweenType = "linear"
+		| "ease-in"
+		| "ease-out"
+		| "ease-in-out"
+		| "ease-in-quad"
+		| "ease-out-quad"
+		| "ease-in-out-quad"
+		| "ease-in-cubic"
+		| "ease-out-cubic"
+		| "ease-in-out-cubic"
+		| "ease-out-bounce"
+		| "ease-in-back"
+		| "ease-out-back"
+		| "ease-in-out-back"
+		| "ease-in-elastic"
+		| "ease-out-elastic"
+		| "ease-in-out-elastic";
+
+	type OpenFinApplicationEventType = "closed"
+		| "connected"
+		| "crashed"
+		| "initialized"
+		| "manifest-changed"
+		| "not-responding"
+		| "out-of-memory"
+		| "responding"
+		| "run-requested"
+		| "started"
+		| "tray-icon-clicked"
+		| "window-alert-requested"
+		| "window-auth-requested"
+		| "window-closed"
+		| "window-created"
+		| "window-end-load"
+		| "window-navigation-rejected"
+		| "window-show-requested"
+		| "window-start-load";
+
+	type OpenFinExternalApplicationEventType = "connected"
+		| "disconnected";
+
+	type OpenFinSystemEventType = "application-closed"
+		| "application-crashed"
+		| "application-created"
+		| "application-started"
+		| "desktop-icon-clicked"
+		| "idle-state-changed"
+		| "monitor-info-changed"
+		| "session-changed";
+
+	type OpenFinWindowEventType = "auth-requested"
+		| "blurred"
+		| "bounds-changed"
+		| "bounds-changing"
+		| "close-requested"
+		| "closed"
+		| "disabled-frame-bounds-changed"
+		| "disabled-frame-bounds-changing"
+		| "embedded"
+		| "external-process-exited"
+		| "external-process-started"
+		| "focused"
+		| "frame-disabled"
+		| "frame-enabled"
+		| "group-changed"
+		| "hidden"
+		| "initialized"
+		| "maximized"
+		| "minimized"
+		| "navigation-rejected"
+		| "restored"
+		| "show-requested"
+		| "shown";
+
+	type OpenFinAnchor = "top-left"
+		| "top-right"
+		| "bottom-left"
+		| "bottom-right";
+}
diff --git a/types/openfin/v17/openfin-tests.ts b/types/openfin/v17/openfin-tests.ts
new file mode 100644
index 0000000000..61b819018f
--- /dev/null
+++ b/types/openfin/v17/openfin-tests.ts
@@ -0,0 +1,721 @@
+function test_application() {
+	let application: fin.OpenFinApplication;
+	// constructor
+	application = new fin.desktop.Application({
+		url: "application.html",
+		uuid: "74BED629-2D8E-4141-8582-73E364BDFA74",
+		name: "Application Name",
+		plugins: false,
+		mainWindowOptions: {
+			defaultHeight: 600,
+			defaultWidth: 800,
+			defaultTop: 300,
+			defaultLeft: 300,
+			autoShow: true
+		}
+	}, (successObj) => {
+		console.log("Application successfully created, HTTP response code:", successObj);
+		application.run();
+	}, (error) => {
+		console.log("Error creating application:", error);
+	});
+	// getCurrent
+	application = fin.desktop.Application.getCurrent();
+	// wrap
+	application = fin.desktop.Application.wrap("454C7F31-A915-4EA2-83F2-CFA655453C52");
+	// getWindow
+	application.getWindow();
+	// addEventListener
+	application.addEventListener("closed", (event) => {
+		console.log("The application has closed");
+	}, () => {
+		console.log("The registration was successful");
+	}, reason => {
+		console.log("failure: " + reason);
+	});
+	// close
+	application.close();
+	// getChildWindows
+	application.getChildWindows(children => {
+		children.forEach(childWindow => {
+			console.log("Showing child: " + childWindow.name);
+			childWindow.show();
+		});
+	});
+	// getGroups
+	application.getGroups(allGroups => {
+		console.log(`There are a total of ${allGroups.length} groups.`);
+
+		let groupCounter = 1;
+		allGroups.forEach(windowGroup => {
+			console.log(`Group ${groupCounter} contains ${windowGroup.length} windows.`);
+			++groupCounter;
+		});
+	});
+	// getManifest
+	application.getManifest(manifest => {
+		console.log("Application manifest:");
+		console.log(manifest);
+	});
+	// getParentUuid
+	application.getParentUuid(parentUuid => {
+		console.log("UUID of parent application:");
+		console.log(parentUuid);
+	});
+	// getShortcuts
+	application.getShortcuts(config => {
+		console.log("Desktop shortcut is enabled: ", config.desktop);
+		console.log("Start Menu shortcut is enabled: ", config.startMenu);
+		console.log("System Startup shortcut is enabled: ", config.systemStartup);
+	});
+	// getInfo
+	application.getInfo(info => {
+		console.log(`Launch mode: ${info.launchMode}`);
+	});
+	// isRunning
+	application.isRunning(running => {
+		console.log("the application is", running ? "running" : "not running");
+	});
+	// registerCustomData
+	application.registerCustomData({
+		someData: "this is custom"
+	}, () => {
+		console.log("You will not read this.");
+	}, err => {
+		console.log("failure:", err);
+	});
+	// removeEventListener
+	const previousCallback = (event: fin.WindowEvent) => { };
+	application.removeEventListener("closed", previousCallback, () => {
+		console.log("The unregistration was successful");
+	}, err => {
+		console.log("failure:", err);
+	});
+	// removeTrayIcon
+	application.removeTrayIcon(() => {
+		console.log("Removed the tray icon.");
+	}, err => {
+		console.log("failure:", err);
+	});
+	// restart
+	application.restart(() => {
+		console.log("You will not read this.");
+	}, err => {
+		console.log("failure:", err);
+	});
+	// schedule restart
+	application.scheduleRestart(() => {
+		console.log("You will not read this.");
+	}, err => {
+		console.log("failure:", err);
+	});
+	// setShortcuts
+	application.setShortcuts({
+		desktop: true,
+		startMenu: false,
+		systemStartup: true
+	}, () => {
+		console.log("Successfully set new shortcut states");
+	}, error => {
+		console.log("Failed to set new shortcut states. Error: ", error);
+	});
+	// setTrayIcon
+	application.setTrayIcon("https://developer.openf.in/download/openfin.png", clickInfo => {
+		console.log(`The mouse has clicked at (${clickInfo.x}, ${clickInfo.y})`);
+	});
+	// terminate
+	application.terminate();
+	// wait
+	application.addEventListener("not-responding", () => {
+		console.log("waiting for hung application");
+		application.wait();
+	});
+}
+
+function test_external_application() {
+	let externalApp: fin.OpenFinExternalApplication;
+	// wrap
+	externalApp = fin.desktop.ExternalApp.wrap('my-uuid');
+	// addEventListener
+	externalApp.addEventListener('connected', () => {
+		console.log('external app connected');
+	}, () => {
+		console.log('The registration was successful');
+	}, (reason, err) => {
+		console.log(`Error Message: ${err.message} Error Stack: ${err.stack}`);
+	});
+	// removeEventListener
+	const previousCallback = () => { };
+	externalApp.removeEventListener('connected', previousCallback, () => {
+		console.log('The unregistration was successful');
+	}, (reason, err) => {
+		console.log(`Error Message: ${err.message} Error Stack: ${err.stack}`);
+	});
+}
+
+function test_inter_application_bus() {
+	// addSubscribeListener
+	fin.desktop.InterApplicationBus.addSubscribeListener((uuid, topic, name) => {
+		console.log(`The application ${uuid} has subscribed to ${topic}`);
+	});
+	// addUnsubscribeListener
+	fin.desktop.InterApplicationBus.addUnsubscribeListener((uuid, topic, name) => {
+		console.log(`The application ${uuid} has unsubscribed to ${topic}`);
+	});
+	// removeSubscribeListener
+	const aRegisteredListener = (uuid: string, topic: string, name: string) => { };
+	fin.desktop.InterApplicationBus.removeSubscribeListener(aRegisteredListener);
+	// removeUnsubscribeListener
+	fin.desktop.InterApplicationBus.removeUnsubscribeListener(aRegisteredListener);
+	// publish
+	fin.desktop.InterApplicationBus.publish("a topic", {
+		field1: "value1",
+		field2: "value2"
+	});
+	// send
+	fin.desktop.InterApplicationBus.send("an application's uuid", "a topic", {
+		field1: "value1",
+		field2: "value2"
+	});
+	// subscribe
+	fin.desktop.InterApplicationBus.subscribe("*", "a topic", (message, uuid, name) => {
+		console.log(`The application ${uuid} sent this message: ${message}`);
+	});
+	// unsubscribe
+	const aRegisteredMessageListener = (message: any, senderUuid: string) => {
+		console.log(message, senderUuid);
+	};
+	fin.desktop.InterApplicationBus.unsubscribe("*", "a topic", aRegisteredMessageListener);
+}
+
+function test_notification() {
+	let notification: fin.OpenFinNotification;
+	// getCurrent
+	notification = fin.desktop.Notification.getCurrent();
+	// close
+	notification.close();
+	// sendMessage
+	notification = new fin.desktop.Notification({
+		duration: 10,
+		url: "http://localhost:5000/Account/Register",
+		message: "Hello",
+		onShow: () => { },
+		// onClose: () => { },
+		onDismiss: () => { },
+		// onClick: () => { },
+		onMessage: () => { },
+		onError: () => { }
+	});
+	// sendMessageToApplication
+	notification.sendMessageToApplication("some message");
+}
+
+function test_system() {
+	// addEventListener
+	fin.desktop.System.addEventListener('monitor-info-changed', event => {
+		console.log("The monitor information has changed to: ", event);
+	}, () => {
+		console.log("The registration was successful");
+	}, err => {
+		console.log("failure: " + err);
+	});
+	// clearCache
+	fin.desktop.System.clearCache({
+		cache: true,
+		cookies: true,
+		localStorage: true,
+		appcache: true,
+		userData: true
+	});
+	// deleteCacheOnExit
+	fin.desktop.System.deleteCacheOnExit(() => {
+		console.log("successful");
+	}, err => {
+		console.log("failure: " + err);
+	});
+	// downloadAsset
+	const dirAppAsset = {
+		src: 'http://local:8000/dir.zip',
+		alias: 'dirApp',
+		version: '1.23.24',
+		target: 'dir.bat',
+		args: ''
+	};
+	fin.desktop.System.downloadAsset(dirAppAsset, progress => {
+		const downloadedPercent = Math.floor((progress.downloadedBytes / progress.totalBytes) * 100);
+		console.log(`Downloaded ${downloadedPercent}%`);
+	}, p => {
+		console.log(`Downlod complete, can be found on ${p.path}`);
+		// lets launch our application asset.
+		// launchDirApp();
+	}, (reason, err) => {
+		console.log(reason, err);
+	});
+	// exit
+	fin.desktop.System.exit(() => {
+		console.log("successful");
+	}, err => {
+		console.log("failure: " + err);
+	});
+	// getAllApplications
+	fin.desktop.System.getAllApplications(applicationInfoList => {
+		applicationInfoList.forEach(applicationInfo => {
+			console.log("Showing information for application with uuid: "
+				+ applicationInfo.uuid);
+			console.log("isRunning: ", applicationInfo.isRunning);
+		});
+	});
+	// getAllExternalApplications
+	fin.desktop.System.getAllExternalApplications(externalAppsInfoList => {
+		externalAppsInfoList.forEach(appInfo => {
+			console.log(`External app connected to the runtime with UUID ${appInfo.uuid}`);
+		});
+	});
+	// getAllWindows
+	fin.desktop.System.getAllWindows(windowInfoList => {
+		windowInfoList.forEach(windowInfo => {
+			console.log("Showing information for application with uuid: ", windowInfo.uuid);
+			console.log("Main window: ", windowInfo.mainWindow);
+			console.log("Child windows: ", windowInfo.childWindows);
+		});
+	});
+	// getCommandLineArguments
+	fin.desktop.System.getCommandLineArguments(args => {
+		console.log("The command line arguments are " + args);
+	});
+	// getDeviceId
+	fin.desktop.System.getDeviceId(id => {
+		console.log("The id of the device is: " + id);
+	});
+	// getEnvironmentVariable
+	fin.desktop.System.getEnvironmentVariable("APPDATA", variable => {
+		console.log("this is the APPDATA value", variable);
+	});
+	// getHostSpecs
+	fin.desktop.System.getHostSpecs(info => {
+		console.log(info);
+	}, error => {
+		console.log('There was an error:', error);
+	});
+	// getLog
+	fin.desktop.System.getLog('debug-2015-01-08-22-27-53.log', log => {
+		console.log(log);
+	});
+	// getLogList
+	fin.desktop.System.getLogList(logList => {
+		logList.forEach(logInfo => {
+			console.log(`The filename of the log is ${logInfo.name}, the size is ${logInfo.size}, and the date of creation is ${logInfo.date}`);
+		});
+	});
+	// getMonitorInfo
+	fin.desktop.System.getMonitorInfo(monitorInfo => {
+		console.log("This object contains information about all monitors: ", monitorInfo);
+	});
+	// getMousePosition
+	fin.desktop.System.getMousePosition(mousePosition => {
+		console.log(`The mouse is located at left: ${mousePosition.left}, top: ${mousePosition.top}`);
+	});
+	// getProcessList
+	fin.desktop.System.getProcessList(list => {
+		list.forEach(process => {
+			console.log(`UUID: ${process.uuid}, Application Name: ${process.name}`);
+		});
+	});
+	// getProxySettings
+	fin.desktop.System.getProxySettings(proxy => {
+		console.log(proxy);
+	});
+	// getRvmInfo
+	fin.desktop.System.getRvmInfo(rvmInfoObject => {
+		console.log("RVM version:", rvmInfoObject.version);
+		console.log("RVM has been running since:", rvmInfoObject["start-time"]);
+	}, err => {
+		console.log("Failed to get rvm info, error message:", err);
+	});
+	// getVersion
+	fin.desktop.System.getVersion(version => {
+		console.log("The version is " + version);
+	});
+	// launchExternalProcess
+	fin.desktop.System.launchExternalProcess({
+		path: "notepad",
+		arguments: "",
+		listener(result) {
+			console.log('the exit code', result.exitCode);
+		}
+	}, payload => {
+		console.log('Success:', payload.uuid);
+	}, error => {
+		console.log('Error:', error);
+	});
+	//
+	fin.desktop.System.launchExternalProcess({
+		// Additionally note that the executable found in the zip file specified in appAssets
+		// will default to the one mentioned by appAssets.target
+		// If the the path below refers to a specific path it will override this default
+		alias: "myApp",
+		listener(result) {
+			console.log('the exit code', result.exitCode);
+		}
+	}, payload => {
+		console.log('Success:', payload.uuid);
+	}, error => {
+		console.log('Error:', error);
+	});
+	//
+	fin.desktop.System.launchExternalProcess({
+		alias: "myApp",
+		arguments: "e f g",
+		listener(result) {
+			console.log('the exit code', result.exitCode);
+		}
+	}, payload => {
+		console.log('Success:', payload.uuid);
+	}, error => {
+		console.log('Error:', error);
+	});
+	//
+	fin.desktop.System.launchExternalProcess({
+		path: "C:\Users\ExampleUser\AppData\Local\OpenFin\OpenFinRVM.exe",
+		arguments: "--version",
+		certificate: {
+			trusted: true,
+			subject: 'O=OpenFin INC., L=New York, S=NY, C=US',
+			thumbprint: '3c a5 28 19 83 05 fe 69 88 e6 8f 4b 3a af c5 c5 1b 07 80 5b'
+		},
+		listener(result) {
+			console.log('the exit code', result.exitCode);
+		}
+	}, payload => {
+		console.log('Success:', payload.uuid);
+	}, error => {
+		console.log('Error:', error);
+	});
+	// log
+	fin.desktop.System.log("info", "An example log message", () => {
+		console.log("message successfully logged");
+	}, err => {
+		console.log(err);
+	});
+	// monitorExternalProcess
+	fin.desktop.System.monitorExternalProcess({
+		pid: 2508,
+		listener(result) {
+			console.log('the exit code', result.exitCode);
+		}
+	}, payload => {
+		console.log("The process is now being monitored: ", payload.uuid);
+	}, error => {
+		console.log("Error:", error);
+	});
+	// openUrlWithBrowser
+	fin.desktop.System.openUrlWithBrowser("https://developer.openf.in/", () => {
+		console.log("successful");
+	}, err => {
+		console.log("failure: " + err);
+	});
+	// registerExternalConnection
+	fin.desktop.System.registerExternalConnection("remote-connection-uuid", (...args: any[]) => {
+		console.log(args);
+	});
+	// releaseExternalProcess
+	fin.desktop.System.launchExternalProcess({
+		path: "notepad",
+		arguments: "",
+		listener(result) {
+			console.log("The exit code", result.exitCode);
+		}
+	}, result => {
+		console.log("Result UUID is " + result.uuid);
+
+		// release it.
+		fin.desktop.System.releaseExternalProcess(result.uuid, () => {
+			console.log("Process has been unmapped!");
+		}, reason => {
+			console.log("failure: " + reason);
+		});
+	});
+	// removeEventListener
+	const aRegisteredListener = (event: fin.SystemBaseEvent) => { };
+	fin.desktop.System.removeEventListener("monitor-info-changed", aRegisteredListener, () => {
+		console.log("successful");
+	}, err => {
+		console.log("failure: " + err);
+	});
+	// showDeveloperTools
+	fin.desktop.System.showDeveloperTools("uuid", "name", () => {
+		console.log("successful");
+	}, err => {
+		console.log("failure: " + err);
+	});
+	// terminateExternalProcess
+	fin.desktop.System.launchExternalProcess({
+		// notepad is in the system's PATH
+		path: "notepad",
+		arguments: "",
+		listener(result) {
+			console.log("The exit code", result.exitCode);
+		}
+	}, result => {
+		console.log("Result UUID is " + result.uuid);
+
+		// Attempt to close the process. Terminate after 4 seconds if it
+		// has not done so.
+		fin.desktop.System.terminateExternalProcess(result.uuid, 4000, info => {
+			console.log("Termination result " + info.result);
+		}, reason => {
+			console.log("failure: " + reason);
+		});
+	});
+	// updateProxySettings
+	fin.desktop.System.updateProxySettings("type", "proxyAddress", 8080, () => {
+		console.log('success');
+	}, err => {
+		console.log(err);
+	});
+}
+
+function test_system_clipboard() {
+	// availableFormats
+	fin.desktop.System.Clipboard.availableFormats(null, formats => {
+		formats.forEach(format => console.log(`The format ${format} is available to read`));
+	}, (reason, err) => {
+		console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
+	});
+	// readHtml
+	fin.desktop.System.Clipboard.readHtml(null, html => {
+		console.log(`This is the html from the clipboard: ${html}`);
+	}, (reason, err) => {
+		console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
+	});
+	// readRtf
+	fin.desktop.System.Clipboard.readRtf(null, rtf => {
+		console.log(`This is the rtf from the clipboard: ${rtf}`);
+	}, (reason, err) => {
+		console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
+	});
+	// readText
+	fin.desktop.System.Clipboard.readText(null, text => {
+		console.log(`This is the text from the clipboard: ${text}`);
+	}, (reason, err) => {
+		console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
+	});
+	// write
+	fin.desktop.System.Clipboard.write({
+		text: 'Hello Text!',
+		html: '<h1>Hello Html</h1>',
+		rtf: 'Hello Rtf'
+	}, null, () => {
+		console.log('Success!!');
+	}, (reason, err) => {
+		console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
+	});
+	// writeHtml
+	fin.desktop.System.Clipboard.writeHtml('<h1>Hello World</h1>', null, () => {
+		console.log('Success!!');
+	}, (reason, err) => {
+		console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
+	});
+	// writeRtf
+	fin.desktop.System.Clipboard.writeRtf('Hello World!', null, () => {
+		console.log('Success!!');
+	}, (reason, err) => {
+		console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
+	});
+	// writeText
+	fin.desktop.System.Clipboard.writeText('Hello World', null, () => {
+		console.log('Success!!');
+	}, (reason, err) => {
+		console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
+	});
+}
+
+function test_window() {
+	let finWindow: fin.OpenFinWindow;
+	// constructor
+	finWindow = new fin.desktop.Window({
+		name: "childWindow",
+		url: "child.html",
+		defaultWidth: 320,
+		defaultHeight: 320,
+		defaultTop: 10,
+		defaultLeft: 300,
+		frame: false,
+		resizable: false,
+		state: "normal"
+	}, () => {
+		const _win = finWindow.getNativeWindow();
+		_win.addEventListener("DOMContentLoaded", () => { finWindow.show(); });
+	}, error => {
+		console.log("Error creating window:", error);
+	});
+	// getCurrent
+	finWindow = fin.desktop.Window.getCurrent();
+	// getNativeWindow
+	let nativeWindow: Window;
+	nativeWindow = finWindow.getNativeWindow();
+	// getParentApplication
+	let parentApp: fin.OpenFinApplication;
+	parentApp = finWindow.getParentApplication();
+	// getParentWindow
+	let parentFinWindow: fin.OpenFinWindow;
+	parentFinWindow = finWindow.getParentWindow();
+	// wrap
+	finWindow = fin.desktop.Window.wrap("uuid", "name");
+	// addEventListener
+	finWindow.addEventListener("bounds-changed", event => {
+		console.log("The window has been moved or resized");
+	}, () => {
+		console.log("The registration was successful");
+	}, reason => {
+		console.log("failure:" + reason);
+	});
+	// animate
+	finWindow.animate({
+		opacity: {
+			opacity: 0.15,
+			duration: 1000
+		},
+		position: {
+			left: 10,
+			top: 10,
+			duration: 3000
+		}
+	}, {
+			interrupt: false
+		}, evt => {
+			// Callback will only fire after both "opacity" and "position" have finished animating.
+		});
+	// authenticate
+	finWindow.addEventListener('auth-requested', evt => {
+		finWindow.authenticate('userName', 'P@assw0rd', () => { }, (reason, err) => {
+			console.log("failure:", err);
+		});
+	});
+	// blur
+	finWindow.blur();
+	// bringToFront
+	finWindow.bringToFront();
+	// close
+	finWindow.close();
+	// disableFrame
+	finWindow.disableFrame();
+	// enableFrame
+	finWindow.enableFrame();
+	// flash
+	finWindow.flash();
+	// focus
+	finWindow.focus();
+	// getBounds
+	finWindow.getBounds(bounds => {
+		console.log(`top: ${bounds.top} left: ${bounds.left} height: ${bounds.height} width: ${bounds.width}`);
+	});
+	// getOptions
+	finWindow.getOptions(options => {
+		console.log(options);
+	});
+	// getSnapshot
+	finWindow.getSnapshot(base64Snapshot => {
+		console.log("data:image/png;base64," + base64Snapshot);
+	});
+	// getState
+	finWindow.getState(state => {
+		console.log("state: " + state);
+	});
+	// getZoomLevel
+	finWindow.getZoomLevel(level => {
+		console.log("zoom level: " + level);
+	}, error => {
+		console.log('error:', error);
+	});
+	// hide
+	finWindow.hide();
+	// isShowing
+	finWindow.isShowing(showing => {
+		console.log("the window is " + (showing ? "showing" : "hidden"));
+	});
+	// joinGroup
+	let secondWindow = new fin.desktop.Window({
+		url: "http://www.openfin.co",
+		name: "secondWindow",
+		autoShow: true
+	}, () => {
+		// When mainWindow moves or is moved, secondWindow moves by the same amount
+		secondWindow.joinGroup(finWindow);
+	});
+	// leaveGroup
+	secondWindow = new fin.desktop.Window({
+		url: "http://www.openfin.co",
+		name: "secondWindow",
+		autoShow: true
+	}, () => {
+		// When finWindow moves or is moved, secondWindow moves by the same amount
+		secondWindow.joinGroup(finWindow, () => {
+			// once we are in the group, lets leave it.
+			secondWindow.leaveGroup();
+		});
+	});
+	// maximize
+	finWindow.maximize();
+	// mergeGroups
+	{
+		const finWindowOne = new fin.desktop.Window({
+			url: "http://www.openfin.co",
+			name: "finWindowOne",
+			autoShow: true
+		});
+		const finWindowTwo = new fin.desktop.Window({
+			url: "http://www.openfin.co",
+			name: "finWindowTwo",
+			autoShow: true
+		});
+		const finWindowThree = new fin.desktop.Window({
+			url: "http://www.openfin.co",
+			name: "finWindowThree",
+			autoShow: true
+		});
+		const finWindowFour = new fin.desktop.Window({
+			url: "http://www.openfin.co",
+			name: "finWindowFour",
+			autoShow: true
+		});
+		// When finWindowOne moves or is moved, finWindowTwo moves by the same amount
+		finWindowOne.joinGroup(finWindowTwo);
+		// When finWindowThree moves or is moved, finWindowFour moves by the same amount
+		finWindowThree.joinGroup(finWindowFour);
+		// finWindowOne, finWindowTwo, finWindowThree, and finWindowFour now move together in the same group
+		finWindowOne.mergeGroups(finWindowThree);
+	}
+	// minimize
+	finWindow.minimize();
+	// moveBy
+	finWindow.moveBy(10, 10);
+	// moveTo
+	finWindow.moveTo(100, 200);
+	// removeEventListener
+	const aRegisteredListener = (event: fin.WindowBaseEvent) => { };
+	finWindow.removeEventListener("bounds-changed", aRegisteredListener);
+	// resizeBy
+	finWindow.resizeBy(10, 10, "top-right");
+	// resizeTo
+	finWindow.resizeTo(10, 10, "top-right");
+	// restore
+	finWindow.restore();
+	// setAsForeground
+	finWindow.setAsForeground();
+	// setBounds
+	finWindow.setBounds(100, 200, 400, 400);
+	// setZoomLevel
+	finWindow.setZoomLevel(10);
+	// show
+	finWindow.show();
+	// showAt
+	finWindow.showAt(10, 10, false);
+	// stopFlashing
+	finWindow.stopFlashing();
+	// updateOptions
+	finWindow.updateOptions({
+		frame: false,
+		maxWidth: 500
+	});
+}
diff --git a/types/openfin/v29/tsconfig.json b/types/openfin/v17/tsconfig.json
similarity index 77%
rename from types/openfin/v29/tsconfig.json
rename to types/openfin/v17/tsconfig.json
index df2dae8b79..fd3199ceb7 100644
--- a/types/openfin/v29/tsconfig.json
+++ b/types/openfin/v17/tsconfig.json
@@ -8,17 +8,12 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
-        "strictFunctionTypes": true,
+        "strictFunctionTypes": false,
         "baseUrl": "../",
         "typeRoots": [
             "../"
         ],
         "types": [],
-        "paths": {
-            "openfin": [
-                "openfin/v29"
-            ]
-        },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
@@ -26,4 +21,4 @@
         "index.d.ts",
         "openfin-tests.ts"
     ]
-}
+}
\ No newline at end of file
diff --git a/types/openfin/v17/tslint.json b/types/openfin/v17/tslint.json
new file mode 100644
index 0000000000..64aace11d6
--- /dev/null
+++ b/types/openfin/v17/tslint.json
@@ -0,0 +1,6 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "max-line-length": false
+    }
+}
diff --git a/types/openfin/v29/index.d.ts b/types/openfin/v29/index.d.ts
deleted file mode 100644
index 3ddbdf2edd..0000000000
--- a/types/openfin/v29/index.d.ts
+++ /dev/null
@@ -1,1891 +0,0 @@
-// Type definitions for OpenFin API 29.0
-// Project: https://openfin.co/
-// Definitions by: Chris Barker <https://github.com/chrisbarker>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// based on v8.56.29.51
-// see https://openfin.co/support/technical-faq/#what-do-the-numbers-in-the-runtime-version-mean
-
-/**
- * JavaScript API
- * The JavaScript API allows you to create an HTML/JavaScript application that has access to the native windowing environment,
- * can communicate with other applications and has access to sandboxed system-level features.
- *
- * API Ready
- * When using the OpenFin API, it is important to ensure that it has been fully loaded before making any API calls. To verify
- * that the API is in fact ready, be sure to make any API calls either from within the fin.desktop.main() method or explicitly
- * after it has returned. This avoids the situation of trying to access methods that are not yet fully injected.
- *
- * Overview
- * When running within the OpenFin Runtime your web applications have access to the "fin" namespace and all the modules within the API
- * without the need to include additional source files. You can treat the "fin" namespace as you would the "window", "navigator" or "documennt" objects.
- */
-declare namespace fin {
-    const desktop: OpenFinDesktop;
-
-    interface OpenFinDesktop {
-        main(f: () => any): void;
-        Application: OpenFinApplicationStatic;
-        ExternalApp: OpenFinExternalApplicationStatic;
-        InterApplicationBus: OpenFinInterApplicationBus;
-        Notification: OpenFinNotificationStatic;
-        System: OpenFinSystem;
-        Window: OpenFinWindowStatic;
-        Frame: OpenFinFrameStatic;
-    }
-
-    interface OpenFinApplicationStatic {
-        /**
-         * Creates a new Application.
-         * An object representing an application. Allows the developer to create, execute, show/close an application as well as listen to application events.
-         */
-        new (
-            options: ApplicationOptions,
-            callback?: (successObj: { httpResponseCode: number }) => void,
-            errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): OpenFinApplication;
-        /**
-         * Launches the given Application manifest.
-         */
-        createFromManifest(manifestUrl: string, callback?: (app: OpenFinApplication) => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
-        /**
-         * Returns an Application object that represents an existing application.
-         */
-        getCurrent(): OpenFinApplication;
-        /**
-         * Returns an Application object that represents an existing application.
-         */
-        wrap(uuid: string): OpenFinApplication;
-    }
-
-    /**
-     * Application
-     * An object representing an application.Allows the developer to create, execute, show / close an application as well as listen to application events.
-     */
-    interface OpenFinApplication {
-        /**
-         * Returns an instance of the main Window of the application
-         */
-        getWindow(): OpenFinWindow;
-        /**
-         * Registers an event listener on the specified event.
-         */
-        addEventListener(
-            type: OpenFinApplicationEventType,
-            listener: (event: ApplicationBaseEvent
-                | TrayIconClickedEvent
-                | WindowEvent
-                | WindowAlertRequestedEvent
-                | WindowAuthRequested
-                | WindowNavigationRejectedEvent
-                | WindowEndLoadEvent) => void,
-            callback?: () => void,
-            errorCallback?: (reason: string) => void): void;
-        /**
-         * Closes the application and any child windows created by the application.
-         */
-        close(force?: boolean, callback?: () => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Retrieves an array of wrapped fin.desktop.Windows for each of the application's child windows.
-         */
-        getChildWindows(callback?: (children: OpenFinWindow[]) => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Retrieves an array of active window groups for all of the application's windows. Each group is represented as an array of wrapped fin.desktop.Windows.
-         */
-        getGroups(callback?: (groups: OpenFinWindow[][]) => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Retrieves the JSON manifest that was used to create the application. Invokes the error callback if the application was not created from a manifest.
-         */
-        getManifest(callback?: (manifest: any) => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Retrieves UUID of the application that launches this application. Invokes the error callback if the application was created from a manifest.
-         */
-        getParentUuid(callback?: (uuid: string) => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Retrieves current configuration of application's shortcuts.
-         */
-        getShortcuts(callback?: (config: ShortCutConfig) => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Retrieves information about the application.
-         */
-        getInfo(callback?: (info: LaunchInfo) => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Retrieves information about the system tray.
-         */
-        getTrayIconInfo(callback?: (trayInfo: TrayIconInfo) => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Determines if the application is currently running.
-         */
-        isRunning(callback?: (running: boolean) => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Registers a username and an app name for licensing purposes.
-         */
-        registerUser(userName: string, appName: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Removes a previously registered event listener from the specified event.
-         */
-        removeEventListener(
-            type: OpenFinApplicationEventType,
-            previouslyRegisteredListener: (event: ApplicationBaseEvent
-                | TrayIconClickedEvent
-                | WindowEvent
-                | WindowAlertRequestedEvent
-                | WindowAuthRequested
-                | WindowNavigationRejectedEvent
-                | WindowEndLoadEvent) => any,
-            callback?: () => void,
-            errorCallback?: (reason: string) => void): void;
-        /**
-         * Removes the application's icon from the tray.
-         */
-        removeTrayIcon(callback?: () => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Restarts the application.
-         */
-        restart(callback?: () => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Runs the application. When the application is created, run must be called.
-         */
-        run(callback?: (successObj: SuccessObj) => void, errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): void;
-        /**
-         * Tells the rvm to relaunch the main application once upon a complete shutdown
-         */
-        scheduleRestart(callback?: () => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Sets new shortcut configuration for current application.
-         * Application has to be launched with a manifest and has to have shortcut configuration (icon url, name, etc.) in its manifest to
-         * be able to change shortcut states.
-         */
-        setShortcuts(config: ShortCutConfig, callback?: () => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Adds a customizable icon in the system tray and notifies the application when clicked.
-         */
-        setTrayIcon(iconUrl: string, listener: (clickInfo: TrayIconClickedEvent) => void, callback?: () => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Closes the application by terminating its process.
-         */
-        terminate(callback?: () => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Waits for a hanging application. This method can be called in response to an application "not-responding" to allow the application
-         * to continue and to generate another "not-responding" message after a certain period of time.
-         */
-        wait(callback?: () => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * The Application's uuid
-         */
-        uuid: string;
-    }
-
-    interface ShortCutConfig {
-        /**
-         * application has a shortcut on the desktop
-         */
-        desktop?: boolean;
-        /**
-         * application has no shortcut in the start menu
-         */
-        startMenu?: boolean;
-        /**
-         * application will be launched on system startup
-         */
-        systemStartup?: boolean;
-    }
-
-    interface SuccessObj {
-        httpResponseCode: number;
-    }
-
-    interface NetworkErrorInfo extends ErrorInfo {
-        networkErrorCode: number;
-    }
-
-    interface ErrorInfo {
-        stack: string;
-        message: string;
-    }
-
-    interface ApplicationOptions {
-        /**
-         * The name of the application.
-         */
-        name?: string;
-        /**
-         * The url to the application.
-         */
-        url?: string;
-        /**
-         * The UUID of the application, unique within the set of all other applications running in the OpenFin Runtime. name and uuid must match.
-         */
-        uuid?: string;
-        /**
-         * Enable Flash at the application level. Default: false.
-         */
-        plugins?: boolean;
-        /**
-         * The options of the main window of the application.
-         */
-        mainWindowOptions?: WindowOptions;
-    }
-
-    interface WindowOptions {
-        /**
-         * Enable keyboard shortcuts for devtools and zoom. Default: false for both.
-         */
-        accelerator?: {
-            devtools?: boolean,
-            zoom?: boolean,
-            reload?: boolean,
-            reloadIgnoreCache?: boolean,
-        };
-        /**
-         * A flag to always position the window at the top of the window stack. Default: false.
-         * Updatable
-         */
-        alwaysOnTop?: boolean;
-        /**
-         * A flag to automatically show the Window when it is created. Default: false.
-         */
-        autoShow?: boolean;
-        /**
-         * A flag to show the context menu when right-clicking on a window. Gives access to the Developer Console for the Window. Default: true
-         * Updatable
-         */
-        contextMenu?: boolean;
-        /**
-         * This defines and applies rounded corners for a frameless window. Default for both width and height: 0.
-         * Updatable
-         */
-        cornerRounding?: {
-            width?: number;
-            height?: number;
-        };
-        /**
-         * A field that the user can attach serializable data to to be ferried around with the window options. Default: ''.
-         */
-        customData?: any;
-        /**
-         * Specifies that the window will be positioned in the center of the primary monitor when loaded for the first time on a machine.
-         * When the window corresponding to that id is loaded again, the position from before the window was closed is used.
-         * This option overrides defaultLeft and defaultTop. Default: false.
-         */
-        defaultCentered?: boolean;
-        /**
-         * The default height of the window. Specifies the height of the window when loaded for the first time on a machine.
-         *  When the window corresponding to that id is loaded again, the height is taken to be the last height of the window before it was closed. Default: 500.
-         */
-        defaultHeight?: number;
-        /**
-         * The default left position of the window. Specifies the position of the left of the window when loaded for the first time on a machine.
-         *  When the window corresponding to that id is loaded again, the value of left is taken to be the last value before the window was closed. Default: 100.
-         */
-        defaultWidth?: number;
-        /**
-         * The default top position of the window. Specifies the position of the top of the window when loaded for the first time on a machine.
-         * When the window corresponding to that id is loaded again, the value of top is taken to be the last value before the window was closed. Default: 100.
-         */
-        defaultTop?: number;
-        /**
-         * The default width of the window. Specifies the width of the window when loaded for the first time on a machine.
-         * When the window corresponding to that id is loaded again, the width is taken to be the last width of the window before it was closed. Default: 800.
-         */
-        defaultLeft?: number;
-        /**
-         * A flag to show the frame. Default: true.
-         * Updatable
-         */
-        frame?: boolean;
-        /**
-         * A flag to allow a window to be hidden when the close button is clicked.Default: false.
-         * Updatable
-         */
-        hideOnClose?: boolean;
-        /**
-         * A URL for the icon to be shown in the window title bar and the taskbar.Default: The parent application's applicationIcon.
-         * Updatable
-         */
-        icon?: string;
-        /**
-         * The maximum height of a window.Will default to the OS defined value if set to - 1. Default: -1.
-         * Updatable
-         */
-        maxHeight?: number;
-        /**
-         * A flag that lets the window be maximized.Default: true.
-         * Updatable
-         */
-        maximizable?: boolean;
-        /**
-         * The maximum width of a window.Will default to the OS defined value if set to - 1. Default: -1.
-         * Updatable
-         */
-        maxWidth?: number;
-        /**
-         * The minimum height of a window.Default: 0.
-         * Updatable
-         */
-        minHeight?: number;
-        /**
-         * A flag that lets the window be minimized.Default: true.
-         */
-        minimizable?: boolean;
-        /**
-         * The minimum width of a window.Default: 0.
-         */
-        minWidth?: number;
-        /**
-         * The name for the window which must be unique within the context of the invoking Application.
-         */
-        name?: string;
-        /**
-         * A flag that specifies how transparent the window will be.This value is clamped between 0.0 and 1.0.Default: 1.0.
-         * Updatable
-         */
-        opacity?: number;
-        /**
-         * A flag to drop to allow the user to resize the window.Default: true.
-         * Updatable
-         */
-        resizable?: boolean;
-        /**
-         * Defines a region in pixels that will respond to user mouse interaction for resizing a frameless window.
-         * Updatable
-         */
-        resizeRegion?: {
-            /**
-             * The size in pixels (Default: 2),
-             */
-            size?: number;
-            /**
-             * The size in pixels of an additional
-             * square resizable region located at the
-             * bottom right corner of a
-             * frameless window. (Default: 4)
-             */
-            bottomRightCorner?: number;
-        };
-        /**
-         * A flag to show the Window's icon in the taskbar. Default: true.
-         */
-        showTaskbarIcon?: boolean;
-        /**
-         * A flag to cache the location of the window or not. Default: true.
-         */
-        saveWindowState?: boolean;
-        /**
-         * Specify a taskbar group for the window. Default: app's uuid.
-         */
-        taskbarIconGroup?: string;
-        /**
-         * A string that sets the window to be "minimized", "maximized", or "normal" on creation. Default: "normal".
-         */
-        state?: string;
-        /**
-         * The URL of the window. Default: "about:blank".
-         */
-        url?: string;
-        /**
-         * When set to false, the window will render before the "load" event is fired on the content's window.
-         * Caution, when false you will see an initial empty white window. Default: true.
-         */
-        waitForPageLoad?: boolean;
-    }
-
-    /**
-     * Clipboard
-     * Clipboard API allows reading and writting to the clipboard in multiple formats.
-     */
-    interface OpenFinClipboard {
-        /**
-         * Reads available formats for the clipboard type
-         */
-        availableFormats(type: string | null, callback?: (formats: string[]) => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
-        /**
-         * Reads available formats for the clipboard type
-         */
-        readHtml(type: string | null, callback?: (html: string) => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
-        /**
-         * Read the content of the clipboard as Rtf
-         */
-        readRtf(type: string | null, callback?: (rtf: string) => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
-        /**
-         * Read the content of the clipboard as plain text
-         */
-        readText(type: string | null, callback?: (text: string) => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
-        /**
-         * Writes data into the clipboard
-         */
-        write(data: any, type: string | null, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
-        /**
-         * Writes data into the clipboard as Html
-         */
-        writeHtml(data: string, type: string | null, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
-        /**
-         * Writes data into the clipboard as Rtf
-         */
-        writeRtf(data: string, type: string | null, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
-        /**
-         * Writes data into the clipboard as plain text
-         */
-        writeText(data: string, type: string | null, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
-    }
-
-    interface OpenFinExternalApplicationStatic {
-        /**
-         * Returns an External Application object that represents an existing external application.
-         */
-        wrap(uuid: string): OpenFinExternalApplication;
-    }
-    /**
-     * ExternalApplication
-     * An object representing an application. Allows the developer to create, execute, show and close an application, as well as listen to application events.
-     */
-    interface OpenFinExternalApplication {
-        /**
-         * Retrieves information about the application.
-         */
-        getInfo(callback?: (info: ExternalApplicationInfo) => void,
-                errorCallback?: (reason: string, error: ErrorInfo) => void): void;
-        /**
-         * Registers an event listener on the specified event.
-         */
-        addEventListener(
-            type: OpenFinExternalApplicationEventType,
-            listener: () => void,
-            callback?: () => void,
-            errorCallback?: (reason: string, error: ErrorInfo) => void): void;
-        /**
-         * Removes a previously registered event listener from the specified event.
-         */
-        removeEventListener(
-            type: OpenFinExternalApplicationEventType,
-            listener: () => void,
-            callback?: () => void,
-            errorCallback?: (reason: string, error: ErrorInfo) => void): void;
-    }
-
-    /**
-     * InterApplicationBus
-     * A messaging bus that allows for pub/sub messaging between different applications.
-     */
-    interface OpenFinInterApplicationBus {
-        /**
-         * Adds a listener that gets called when applications subscribe to the current application's messages.
-         */
-        addSubscribeListener(listener: (uuid: string, topic: string, name: string) => void): void;
-        /**
-         * Adds a listener that gets called when applications unsubscribe to the current application's messages.
-         */
-        addUnsubscribeListener(listener: (uuid: string, topic: string, name: string) => void): void;
-        /**
-         * Removes a previously registered subscribe listener.
-         */
-        removeSubscribeListener(listener: (uuid: string, topic: string, name: string) => void): void;
-        /**
-         * Removes a previously registered unsubscribe listener.
-         */
-        removeUnsubscribeListener(listener: (uuid: string, topic: string, name: string) => void): void;
-        /**
-         * Publishes a message to all applications running on OpenFin Runtime that are subscribed to the specified topic.
-         */
-        publish(topic: string, message: any, callback?: () => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Sends a message to a specific application on a specific topic.
-         */
-        send(destinationUuid: string, name: string, topic: string, message: any, callback?: () => void, errorCallback?: (reason: string) => void): void;
-        send(destinationUuid: string, topic: string, message: any, callback?: () => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Subscribes to messages from the specified application on the specified topic. If the subscription is for a uuid, [name],
-         * topic combination that has already been published to upon subscription you will receive the last 20 missed messages in the order they were published.
-         */
-        subscribe(
-            senderUuid: string,
-            name: string,
-            topic: string,
-            listener: (message: any, uuid: string, name: string) => void,
-            callback?: () => void,
-            errorCallback?: (reason: string) => void): void;
-        subscribe(
-            senderUuid: string,
-            topic: string,
-            listener: (message: any, uuid: string, name: string) => void,
-            callback?: () => void,
-            errorCallback?: (reason: string) => void): void;
-        /**
-         * Unsubscribes to messages from the specified application on the specified topic.
-         */
-        unsubscribe(
-            senderUuid: string,
-            name: string,
-            topic: string,
-            listener: (message: any, uuid: string, name: string) => void,
-            callback?: () => void,
-            errorCallback?: (reason: string) => void): void;
-        unsubscribe(
-            senderUuid: string,
-            topic: string,
-            listener: (message: any, uuid: string, name: string) => void,
-            callback?: () => void,
-            errorCallback?: (reason: string) => void): void;
-    }
-
-    interface OpenFinNotificationStatic {
-        /**
-         * ctor
-         */
-        new (options: NotificationOptions, callback?: () => void, errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): OpenFinNotification;
-        /**
-         * Gets an instance of the current notification. For use within a notification window to close the window or send a message back to its parent application.
-         */
-        getCurrent(): OpenFinNotification;
-    }
-
-    /**
-     * Notification
-     * Notification represents a window on OpenFin Runtime which is shown briefly to the user on the bottom-right corner of the primary monitor.
-     * A notification is typically used to alert the user of some important event which requires his or her attention.
-     * Notifications are a child or your application that are controlled by the runtime.
-     */
-    interface OpenFinNotification {
-        /**
-         * Closes the notification.
-         */
-        close(callback?: () => void): void;
-        /**
-         * Sends a message to the notification.
-         */
-        sendMessage(message: any, callback?: () => void): void;
-        /**
-         * Sends a message from the notification to the application that created the notification. The message is handled by the notification's onMessage callback.
-         */
-        sendMessageToApplication(message: any, callback?: () => void): void;
-    }
-
-    interface NotificationOptions {
-        /**
-         * A boolean that will force dismissal even if the mouse is hovering over the notification
-         */
-        ignoreMouseOver?: boolean;
-        /**
-         * A message of any primitive or composite-primitive type to be passed to the notification upon creation.
-         */
-        message?: any;
-        /**
-         * The timeout for displaying a notification.Can be in milliseconds or "never".
-         */
-        duration?: number | "never";
-        /**
-         * The url of the notification
-         */
-        url?: string;
-        /**
-         * A function that is called when a notification is clicked.
-         */
-        onClick?(callback: () => void): void;
-        /**
-         * Invoked when the notification is closed via .close() method on the created notification instance
-         * or the by the notification itself via fin.desktop.Notification.getCurrent().close().
-         * NOTE: this is not invoked when the notification is dismissed via a swipe. For the swipe dismissal callback see onDismiss
-         */
-        onClose?(callback: () => void): void;
-        /**
-         * Invoked when a the notification is dismissed by swiping it off the screen to the right. NOTE: this is no fired on a programmatic close.
-         */
-        onDismiss?(callback: () => void): void;
-        /**
-         * A function that is called when an error occurs.The reason for the error is passed as an argument.
-         */
-        onError?(errorCallback: (reason: string, errorObj: NetworkErrorInfo) => void): void;
-        /**
-         * The onMessage function will respond to messages sent from notification.sendMessageToApplication.
-         * The function is passed the message, which can be of any primitive or composite-primitive type.
-         */
-        onMessage?(callback: (message: any) => void): void;
-        /**
-         * A function that is called when a notification is shown.
-         */
-        onShow?(callback: (successObj: SuccessObj) => void): void;
-    }
-
-    /**
-     * System
-     * An object representing the core of OpenFin Runtime.
-     * Allows the developer to perform system-level actions, such as accessing logs, viewing processes, clearing the cache and exiting the runtime.
-     */
-    interface OpenFinSystem {
-        Clipboard: OpenFinClipboard;
-        /**
-         * Registers an event listener on the specified event.
-         */
-        addEventListener(
-            type: OpenFinSystemEventType,
-            listener: (event: SystemBaseEvent | DesktopIconClickedEvent | IdleStateChangedEvent | MonitorInfoChangedEvent | SessionChangedEvent) => void,
-            callback?: () => void,
-            errorCallback?: (reason: string) => void): void;
-        /**
-         * Clears cached data containing window state/positions,
-         * application resource files (images, HTML, JavaScript files), cookies, and items stored in the Local Storage.
-         */
-        clearCache(options: CacheOptions, callback?: () => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Clears all cached data when OpenFin Runtime exits.
-         */
-        deleteCacheOnExit(callback?: () => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Downloads the given application asset
-         */
-        downloadAsset(
-            assetObj: AppAssetInfo,
-            progressListener?: (progress: { downloadedBytes: number, totalBytes: number }) => void,
-            callback?: (successObj: { path: string }) => void,
-            errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): void;
-
-        /**
-         * Download preload scripts from given URLs
-         */
-        downloadPreloadScripts(scripts: Array<DownloadPreloadOption>, callback?: (downloadInfo: Array<DownloadPreloadInfo>) => void,
-                               errorCallback?:   (reason: string) => void): void;
-        /**
-         * Downloads the given OpenFin Runtime.
-         */
-        downloadRuntime(options: RuntimeDownloadOptions, onProgress?: (progress: RuntimeDownloadProgress) => void, onComplete?: () => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Exits the Runtime.
-         */
-        exit(callback?: () => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Writes any unwritten cookies data to disk.
-         */
-        flushCookieStore(callback?: () => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Retrieves an array of data for all applications.
-         */
-        getAllApplications(callback?: (applicationInfoList: ApplicationInfo[]) => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Retrieves an array of data for all external applications.
-         */
-        getAllExternalApplications(callback?: (applicationInfoList: ApplicationInfo[]) => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Retrieves an array of data (name, ids, bounds) for all application windows.
-         */
-        getAllWindows(callback?: (windowInfoList: WindowDetails[]) => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Returns information about the app asset.
-         */
-        getAppAssetInfo(options: AppAssetOptions, callback?: (appAssetInfo: AppAssetInfo) => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Get additional info of cookies.
-         */
-        getCookies(option: CookieOption, callback?: (info: Array<CookieInfo>) => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Retrieves the command line argument string that started OpenFin Runtime.
-         */
-        getCommandLineArguments(callback?: (args: string) => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Retrieves the configuration object that started the OpenFin Runtime.
-         */
-        getDeviceId(callback?: (uuid: string) => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Returns a hex encoded hash of the mac address and the currently logged in user name
-         */
-        getDeviceUserId(callback?: (id: string) => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Returns an Entity info object relating to the entity specified by the uuid and name passed in. The possible types are 'window', 'iframe', 'external connection' or 'unknown'.
-         */
-        getEntityInfo(uuid: string, name: string, callback?: (info: EntityInfo) => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Gets the value of a given environment variable on the computer on which the runtime is installed.
-         */
-        getEnvironmentVariable(envVar: string, callback?: (variable: string) => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Retrieves currently focused window identity.
-         */
-        getFocusedWindow(callback?: (focusedWindowIdentity: Identity) => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Retrieves system information.
-         */
-        getHostSpecs(callback?: (info: HostSpecInfo) => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Retrieves the contents of the log with the specified filename.
-         */
-        getLog(logFileName: string, callback?: (variable: string) => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Retrieves an array containing information for each log file.
-         */
-        getLogList(callback?: (logInfoList: LogInfo[]) => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Retrieves the minimum (inclusive) logging level that is currently being written to the logs.
-         */
-        getMinLogLevel(callback?: (logLevel: string) => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Retrieves an object that contains data about the about the monitor setup of the computer that the runtime is running on.
-         */
-        getMonitorInfo(callback?: (monitorInfo: MonitorInfo) => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Returns the mouse in virtual screen coordinates (left, top).
-         */
-        getMousePosition(callback?: (mousePosition: VirtualScreenCoordinates) => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Retrieves an array of all of the runtime processes that are currently running.
-         * Each element in the array is an object containing the uuid and the name of the application to which the process belongs.
-         */
-        getProcessList(callback?: (processInfoList: ProcessInfo[]) => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Retrieves the Proxy settings.
-         */
-        getProxySettings(callback?: (proxy: ProxyInfo) => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Returns information about the running RVM in an object.
-         */
-        getRvmInfo(callback?: (rvmInfo: RvmInfo) => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Returns the version of the runtime. The version contains the major, minor, build and revision numbers.
-         */
-        getVersion(callback?: (version: string) => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Runs an executable or batch file.
-         */
-        launchExternalProcess(options: ExternalProcessLaunchInfo, callback?: (payload: { uuid: string }) => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Writes the passed message into both the log file and the console.
-         */
-        log(level: "debug" | "info" | "warn" | "error", message: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Monitors a running process.
-         */
-        monitorExternalProcess(options: ExternalProcessInfo, callback?: (payload: { uuid: string }) => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Opens the passed URL in the default web browser.
-         */
-        openUrlWithBrowser(url: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Opens the passed URL in the default web browser.
-         */
-        readRegistryValue(rootKey: string, subkey: string, value: string, callback?: (info: RegistryInfo) => void,
-                          errorCallback?: (reason: string) => void): void;
-        /**
-         * This function call will register a unique id and produce a token. The token can be used to broker an external connection.
-         */
-        registerExternalConnection(
-            uuid: string,
-            callback?: (detail: {
-                /**
-                 * this will be unique each time
-                 */
-                token: string;
-                /**
-                 * "remote-connection-uuid"
-                 */
-                uuid: string;
-            }) => void,
-            errorCallback?: (reason: string) => void): void;
-        /**
-         * Removes the process entry for the passed UUID obtained from a prior call of fin.desktop.System.launchExternalProcess().
-         */
-        releaseExternalProcess(processUuid: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Removes a previously registered event listener from the specified event.
-         */
-        removeEventListener(
-            type: OpenFinSystemEventType,
-            listener: (event: SystemBaseEvent | DesktopIconClickedEvent | IdleStateChangedEvent | MonitorInfoChangedEvent | SessionChangedEvent) => void,
-            callback?: () => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Set the minimum log level above which logs will be written to the OpenFin log
-         */
-        setMinLogLevel(logLevel: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Shows the Chrome Developer Tools for the specified window.
-         */
-        showDeveloperTools(uuid: string, name: string, callback?: () => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Attempt to close an external process. The process will be terminated if it has not closed after the elapsed timeout in milliseconds.
-         */
-        terminateExternalProcess(
-            processUuid: string,
-            timeout: number,
-            killTree: boolean,
-            callback?: (info: { result: "clean" | "terminated" | "failed" }) => void,
-            errorCallback?: (reason: string) => void): void;
-        terminateExternalProcess(
-            processUuid: string,
-            timeout: number,
-            callback?: (info: { result: "clean" | "terminated" | "failed" }) => void,
-            errorCallback?: (reason: string) => void): void;
-        /**
-         * Update the OpenFin Runtime Proxy settings.
-         */
-        updateProxySettings(type: string, address: string, port: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
-    }
-
-    interface CacheOptions {
-        cache?: boolean;
-        cookies?: boolean;
-        localStorage?: boolean;
-        appcache?: boolean;
-        userData?: boolean;
-    }
-
-    interface AppAssetInfo {
-        src?: string;
-        alias?: string;
-        version?: string;
-        target?: string;
-        args?: string;
-        mandatory?: boolean;
-    }
-
-    interface AppAssetOptions {
-        alias: string;
-    }
-
-    interface ApplicationInfo {
-        /**
-         * true when the application is running.
-         */
-        isRunning?: boolean;
-        /**
-         * uuid of the application.
-         */
-        uuid?: string;
-        /**
-         * uuid of the application that launches this application.
-         */
-        parentUuid?: string;
-    }
-
-    interface Identity {
-        uuid: string;
-        name: string;
-    }
-
-    interface EntityInfo {
-        name: string;
-        uuid: string;
-        parent: Identity;
-        entityType: string;
-    }
-
-    interface DownloadPreloadOption {
-        url: string;
-    }
-
-    interface DownloadPreloadInfo {
-        success: boolean;
-            url?: string;
-            error: string;
-        }
-
-
-     interface CookieInfo {
-        name: string;
-        // expirationDate: Date;
-        domain: string;
-        path: string;
-    }
-
-     interface CookieOption {
-        name: string;
-    }
-
-    interface RegistryInfo {
-        data: any;
-        rootKey: string;
-        subkey: string;
-        type: string;
-        value: string;
-    }
-
-    interface RuntimeDownloadOptions {
-        version: string;
-    }
-
-    interface RuntimeDownloadProgress {
-        downloadedBytes: number;
-        totalBytes: number;
-    }
-
-    interface WindowDetails {
-        uuid?: string;
-        mainWindow?: WindowInfo;
-        childWindows?: WindowInfo[];
-    }
-
-    interface WindowInfo {
-        /**
-         * name of the child window
-         */
-        name?: string;
-        /**
-         * top-most coordinate of the child window
-         */
-        top?: number;
-        /**
-         * right-most coordinate of the child window
-         */
-        right?: number;
-        /**
-         * bottom-most coordinate of the child window
-         */
-        bottom?: number;
-        /**
-         * left-most coordinate of the child window
-         */
-        left?: number;
-    }
-
-    interface HostSpecInfo {
-        /**
-         * "x86" for 32-bit or "x86_64" for 64-bit
-         */
-        arch: string;
-        /**
-         * Same payload as Node's os.cpus()
-         */
-        cpus: NodeCpuInfo[];
-        gpu: {
-            /**
-             * Graphics card name
-             */
-            name: string;
-        };
-        /**
-         * Same payload as Node's os.totalmem()
-         */
-        memory: number;
-        /**
-         * OS name and version/edition
-         */
-        name: string;
-    }
-
-    interface NodeCpuInfo {
-        model: string;
-        /**
-         * in MHz
-         */
-        speed: number;
-        times: {
-            /**
-             * The number of milliseconds the CPU has spent in user mode.
-             */
-            user: number;
-            /**
-             * The number of milliseconds the CPU has spent in nice mode.
-             */
-            nice: number;
-            /**
-             * The number of milliseconds the CPU has spent in sys mode.
-             */
-            sys: number;
-            /**
-             * The number of milliseconds the CPU has spent in idle mode.
-             */
-            idle: number;
-            /**
-             * The number of milliseconds the CPU has spent in irq mode.
-             */
-            irq: number;
-        };
-    }
-
-    interface LogInfo {
-        /**
-         * the filename of the log
-         */
-        name?: string;
-        /**
-         * the size of the log in bytes
-         */
-        size?: number;
-        /**
-         * the unix time at which the log was created "Thu Jan 08 2015 14:40:30 GMT-0500 (Eastern Standard Time)"
-         */
-        date?: string;
-    }
-
-    interface ProcessInfo {
-        /**
-         * the percentage of total CPU usage
-         */
-        cpuUsage?: number;
-        /**
-         * the application name
-         */
-        name?: string;
-        /**
-         * the current nonpaged pool usage in bytes
-         */
-        nonPagedPoolUsage?: number;
-        /**
-         * the number of page faults
-         */
-        pageFaultCount?: number;
-        /**
-         * the current paged pool usage in bytes
-         */
-        pagedPoolUsage?: number;
-        /**
-         * the total amount of memory in bytes that the memory manager has committed
-         */
-        pagefileUsage?: number;
-        /**
-         * the peak nonpaged pool usage in bytes
-         */
-        peakNonPagedPoolUsage?: number;
-        /**
-         * the peak paged pool usage in bytes
-         */
-        peakPagedPoolUsage?: number;
-        /**
-         * the peak value in bytes of pagefileUsage during the lifetime of this process
-         */
-        peakPagefileUsage?: number;
-        /**
-         * the peak working set size in bytes
-         */
-        peakWorkingSetSize?: number;
-        /**
-         * the native process identifier
-         */
-        processId?: number;
-        /**
-         * the application UUID
-         */
-        uuid?: string;
-        /**
-         * the current working set size (both shared and private data) in bytes
-         */
-        workingSetSize?: number;
-    }
-
-    interface ProxyInfo {
-        /**
-         * the configured Proxy Address
-         */
-        proxyAddress?: string;
-        /**
-         * the configured Proxy port
-         */
-        proxyPort?: number;
-        /**
-         * Proxy Type
-         */
-        type?: string;
-    }
-
-    interface RvmInfo {
-        version?: string;
-        "start-time"?: string;
-    }
-
-    interface ExternalProcessLaunchInfo {
-        path?: string;
-        /**
-         * Additionally note that the executable found in the zip file specified in appAssets
-         * will default to the one mentioned by appAssets.target
-         * If the the path below refers to a specific path it will override this default
-         */
-        alias?: string;
-        /**
-         * When using alias; if no arguments are passed then the arguments (if any)
-         * are taken from the 'app.json' file, from the  'args' parameter
-         * of the 'appAssets' Object with the relevant 'alias'.
-         * If 'arguments' is passed as a parameter it takes precedence
-         * over any 'args' set in the 'app.json'.
-         */
-        arguments?: string;
-        listener?(result: {
-            /**
-             * "Exited" Or "released" on a call to releaseExternalProcess
-             */
-            topic?: string;
-            /**
-             * The mapped UUID which identifies the launched process
-             */
-            uuid?: string;
-            /*
-             * Process exit code
-             */
-            exitCode?: number;
-        }): void;
-        certificate?: CertificationInfo;
-    }
-
-    interface CertificationInfo {
-        /**
-         * A hex string with or without spaces
-         */
-        serial?: string;
-        /**
-         * An internally tokenized and comma delimited string allowing partial or full checks of the subject fields
-         */
-        subject?: string;
-        /**
-         * A hex string with or without spaces
-         */
-        publickey?: string;
-        /**
-         * A hex string with or without spaces
-         */
-        thumbprint?: string;
-        /**
-         * A boolean indicating that the certificate is trusted and not revoked
-         */
-        trusted?: boolean;
-    }
-
-    interface ExternalProcessInfo {
-        pid?: number;
-        listener?(result: {
-            /**
-             * "Exited" Or "released" on a call to releaseExternalProcess
-             */
-            topic?: string;
-            /**
-             * The mapped UUID which identifies the launched process
-             */
-            uuid?: string;
-            /*
-                * Process exit code
-                */
-            exitCode?: number;
-        }): void;
-    }
-
-    interface OpenFinWindowStatic {
-        /**
-         * Class: Window
-         *
-         * new Window(options, callbackopt, errorCallbackopt)
-         *
-         * Creates a new OpenFin Window
-         *
-         * A basic window that wraps a native HTML window. Provides more fine-grained control over the window state such as the ability to minimize,
-         * maximize, restore, etc. By default a window does not show upon instantiation; instead the window's show() method must be invoked manually.
-         * The new window appears in the same process as the parent window.
-         * @param options - The options of the window
-         * @param [callback] - Called if the window creation was successful
-         * @param [callback.successObj] - httpResponseCode
-         */
-        new (
-            options: WindowOptions,
-            callback?: (successObj: { httpResponseCode: number }) => void,
-            errorCallback?: (reason: string, errorObj: NetworkErrorInfo) => void): OpenFinWindow;
-        /**
-         * Returns an instance of the current window.
-         * @returns Current window
-         */
-        getCurrent(): OpenFinWindow;
-        /**
-         * Returns a Window object that wraps an existing window.
-         */
-        wrap(appUuid: string, windowName: string): OpenFinWindow;
-    }
-
-    /**
-     * Window
-     * A basic window that wraps a native HTML window. Provides more fine-grained control over the window state such as the ability to minimize,
-     * maximize, restore, etc. By default a window does not show upon instantiation; instead the window's show() method must be invoked manually.
-     * The new window appears in the same process as the parent window.
-     */
-    interface OpenFinWindow {
-        /**
-         * Name of window
-         */
-        name: string;
-        /**
-         * Returns the native JavaScript "window" object for the window. This method can only be used by the parent application or the window itself,
-         * otherwise it will return undefined. The same Single-Origin-Policy (SOP) rules apply for child windows created by window.open(url) in that the
-         * contents of the window object are only accessible if the URL has the same origin as the invoking window. See example below.
-         * Also, will not work with fin.desktop.Window objects created with fin.desktop.Window.wrap().
-         * @returns Native window
-         */
-        getNativeWindow(): Window;
-        /**
-         * Gets the parent application.
-         * @returns Parent application
-         */
-        getParentApplication(): OpenFinApplication;
-        /**
-         * Gets the parent window.
-         */
-        getParentWindow(): OpenFinWindow;
-        /**
-         * Registers an event listener on the specified event.
-         */
-        addEventListener(
-            type: OpenFinWindowEventType,
-            listener: (event: WindowBaseEvent
-                | WindowAuthRequestedEvent
-                | WindowBoundsEvent
-                | WindowExternalProcessStartedEvent
-                | WindowExternalProcessExited
-                | WindowGroupChangedEvent
-                | WindowHiddenEvent
-                | Window_NavigationRejectedEvent) => void,
-            callback?: () => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Performs the specified window transitions
-         */
-        animate(transitions: AnimationTransition, options: AnimationOptions, callback?: (event: any) => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Provides credentials to authentication requests
-         */
-        authenticate(userName: string, password: string, callback?: () => void, errorCallback?: (reason: string, error: ErrorInfo) => void): void;
-        /**
-         * Removes focus from the window.
-         */
-        blur(callback?: () => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Brings the window to the front of the OpenFin window stack.
-         */
-        bringToFront(callback?: () => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Closes the window.
-         * @param Close will be prevented from closing when force is false and 'close-requested' has been subscribed to for application's main window.
-         */
-        close(force?: boolean, callback?: () => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Prevents a user from changing a window's size/position when using the window's frame.
-         * 'disabled-frame-bounds-changing' is generated at the start of and during a user move/size operation.
-         * 'disabled-frame-bounds-changed' is generated after a user move/size operation.
-         * The events provide the bounds that would have been applied if the frame was enabled.
-         * 'frame-disabled' is generated when an enabled frame becomes disabled.
-         */
-        disableFrame(callback?: () => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Re-enables user changes to a window's size/position when using the window's frame.
-         * 'disabled-frame-bounds-changing' is generated at the start of and during a user move/size operation.
-         * 'disabled-frame-bounds-changed' is generated after a user move/size operation.
-         * The events provide the bounds that would have been applied if the frame was enabled.
-         * 'frame-enabled' is generated when a disabled frame has becomes enabled.
-         */
-        enableFrame(callback?: () => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Flashes the window's frame and taskbar icon until the window is activated.
-         */
-        flash(options?: any, callback?: () => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Gives focus to the window.
-         */
-        focus(callback?: () => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Gets the current bounds (top, left, width, height) of the window.
-         */
-        getBounds(callback?: (bounds: WindowBounds) => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Retrieves an array containing wrapped fin.desktop.Windows that are grouped with this window. If a window is not in a group an empty array is returned.
-         * Please note that calling window is included in the result array.
-         */
-        getGroup(callback?: (group: OpenFinWindow[]) => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Gets the current settings of the window.
-         */
-        getOptions(callback?: (options: WindowOptions) => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Gets a base64 encoded PNG snapshot of the window.
-         */
-        getSnapshot(callback?: (base64Snapshot: string) => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Gets the current state ("minimized", "maximized", or "restored") of the window.
-         */
-        getState(callback?: (state: "minimized" | "maximized" | "restored") => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Returns the zoom level of the window.
-         */
-        getZoomLevel(callback?: (level: number) => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Hides the window.
-         */
-        hide(callback?: () => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Determines if the window is currently showing.
-         */
-        isShowing(callback?: (showing: boolean) => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Joins the same window group as the specified window.
-         */
-        joinGroup(target: OpenFinWindow, callback?: () => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Leaves the current window group so that the window can be move independently of those in the group.
-         */
-        leaveGroup(callback?: () => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Maximizes the window.
-         */
-        maximize(callback?: () => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Merges the instance's window group with the same window group as the specified window
-         */
-        mergeGroups(target: OpenFinWindow, callback?: () => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Minimizes the window.
-         */
-        minimize(callback?: () => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Moves the window by a specified amount.
-         */
-        moveBy(deltaLeft: number, deltaTop: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Moves the window to a specified location.
-         */
-        moveTo(left: number, top: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Removes a previously registered event listener from the specified event.
-         */
-        removeEventListener(
-            type: OpenFinWindowEventType,
-            listener: (event: WindowBaseEvent
-                | WindowAuthRequestedEvent
-                | WindowBoundsEvent
-                | WindowExternalProcessStartedEvent
-                | WindowExternalProcessExited
-                | WindowGroupChangedEvent
-                | WindowHiddenEvent
-                | Window_NavigationRejectedEvent) => void,
-            callback?: () => void,
-            errorCallback?: (reason: string) => void): void;
-        /**
-         * Resizes the window by a specified amount.
-         */
-        resizeBy(deltaWidth: number, deltaHeight: number, anchor: OpenFinAnchor, callback?: () => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Resizes the window by a specified amount.
-         */
-        resizeTo(width: number, height: number, anchor: OpenFinAnchor, callback?: () => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Restores the window to its normal state (i.e., unminimized, unmaximized).
-         */
-        restore(callback?: () => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Will bring the window to the front of the entire stack and give it focus.
-         */
-        setAsForeground(callback?: () => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Sets the window's size and position
-         */
-        setBounds(left: number, top: number, width: number, height: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Sets the zoom level of the window.
-         */
-        setZoomLevel(level: number, callback?: () => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Shows the window if it is hidden.
-         * @param Show will be prevented from closing when force is false and 'show-requested' has been subscribed to for application's main window.
-         */
-        show(force?: boolean, callback?: () => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Shows the window if it is hidden at the specified location. If the toggle parameter is set to true, the window will alternate between showing and hiding.
-         */
-        showAt(left: number, top: number, force?: boolean, callback?: () => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Stops the taskbar icon from flashing.
-         */
-        stopFlashing(callback?: () => void, errorCallback?: (reason: string) => void): void;
-        /**
-         * Updates the window using the passed options
-         */
-        updateOptions(options: WindowOptions, callback?: () => void, errorCallback?: (reason: string) => void): void;
-    }
-
-    interface OpenFinFrameStatic {
-        wrap(uuid: string, name: string): OpenFinFrame;
-
-        getCurrent(): OpenFinFrame;
-    }
-
-    interface OpenFinFrame {
-        name: string;
-        uuid: string;
-
-        addEventListener(type: string, listener: () => void, callback?: () => void, errorCallback?: (reason: string) => void): void;
-
-        getParentWindow(callback?: (entityInfo: EntityInfo) => void, errorCallback?: (reason: string) => void): void;
-
-        getInfo(callback?: (entityInfo: EntityInfo) => void, errorCallback?: (reason: string) => void): void;
-
-        removeEventListener(type: string, listener: () => void, callback?: () => void, errorCallback?: (reason: string) => void): void;
-    }
-
-    interface ApplicationBaseEvent {
-        topic: string;
-        type: OpenFinApplicationEventType;
-        uuid: string;
-    }
-
-    interface TrayIconClickedEvent extends ApplicationBaseEvent {
-        button: number; // 0 for left, 1 for middle, 2 for right
-        monitorInfo: MonitorInfo;
-        x: number; // the cursor x coordinate
-        y: number; // the cursor y coordinate
-    }
-
-    interface WindowEvent extends ApplicationBaseEvent {
-        name: string;
-    }
-
-    interface WindowAlertRequestedEvent extends WindowEvent {
-        message: string;
-        url: string;
-    }
-
-    interface WindowAuthRequested extends WindowEvent {
-        authInfo: {
-            host: string;
-            isProxy: boolean;
-            port: number;
-            realm: string;
-            scheme: string;
-        };
-    }
-
-    interface WindowNavigationRejectedEvent extends WindowEvent {
-        sourceName: string;
-        url: string;
-    }
-
-    interface WindowEndLoadEvent extends WindowEvent {
-        documentName: string;
-        isMain: boolean;
-    }
-
-    interface MonitorInfoChangedEvent extends MonitorInfo {
-        topic: "system";
-        type: "monitor-info-changed";
-    }
-
-    interface MonitorInfo {
-        nonPrimaryMonitors: MonitorInfoDetail[];
-        primaryMonitor: MonitorInfoDetail;
-        reason: string;
-        taskbar: {
-            edge: "left" | "right" | "top" | "bottom",
-            rect: MontiorCoordinates
-        };
-        topic: "system";
-        type: "monitor-info-changed";
-        virtualScreen: MontiorCoordinates;
-    }
-
-   interface TrayIconInfo {
-       x: number;
-       y: number;
-       bounds: {
-           x: number;
-           y: number;
-           width: number;
-           height: number;
-       }
-       monitorInfo: MonitorInfo
-   }
-
-    interface MonitorInfoDetail {
-        availableRect: MontiorCoordinates;
-        deviceId: string;
-        displayDeviceActive: boolean;
-        monitorRect: MontiorCoordinates;
-        name: string;
-    }
-
-    interface MontiorCoordinates {
-        bottom: number;
-        left: number;
-        right: number;
-        top: number;
-    }
-
-    interface VirtualScreenCoordinates {
-        left: number;
-        top: number;
-    }
-
-    interface SystemBaseEvent {
-        topic: string;
-        type: OpenFinSystemEventType;
-        uuid: string;
-    }
-
-    interface DesktopIconClickedEvent {
-        mouse: {
-            /**
-             * the left virtual screen coordinate of the mouse
-             */
-            left: number,
-            /**
-             * the top virtual screen coordinate of the mouse
-             */
-            top: number
-        };
-        /**
-         * the number of milliseconds that have elapsed since the system was started,
-         */
-        tickCount: number;
-        topic: "system";
-        type: "desktop-icon-clicked";
-    }
-
-    interface IdleStateChangedEvent {
-        /**
-         * How long in milliseconds since the user has been idle.
-         */
-        elapsedTime: number;
-        /**
-         * true when the user is idle,false when the user has returned;
-         */
-        isIdle: boolean;
-        topic: "system";
-        type: "idle-state-changed";
-    }
-
-    interface WindowBaseEvent {
-        /**
-         * the name of the window
-         */
-        name: string;
-        /**
-         * always window
-         */
-        topic: "window";
-        /**
-         * window event type
-         */
-        type: OpenFinWindowEventType;
-        /**
-         * the UUID of the application the window belongs to
-         */
-        uuid: string;
-    }
-
-    interface WindowAuthRequestedEvent extends WindowBaseEvent {
-        authInfo: {
-            host: string;
-            isProxy: boolean;
-            port: number;
-            realm: string;
-            scheme: string;
-        };
-    }
-
-    interface WindowBoundsEvent extends WindowBaseEvent {
-        /**
-         * describes what kind of change occurred.
-         * 0 means a change in position.
-         * 1 means a change in size.
-         * 2 means a change in position and size.
-         */
-        changeType: number;
-        /**
-         * true when pending changes have been applied to the window.
-         */
-        deferred: boolean;
-        /**
-         * the new height of the window.
-         */
-        height: number;
-        /**
-         * the left-most coordinate of the window.
-         */
-        left: number;
-        /**
-         * the top-most coordinate of the window.
-         */
-        top: number;
-
-        type: "bounds-changed" | "bounds-changing" | "disabled-frame-bounds-changed" | "disabled-frame-bounds-changing";
-        /**
-         * the new width of the window.
-         */
-        width: number;
-    }
-
-    interface WindowExternalProcessStartedEvent extends WindowBaseEvent {
-        /**
-         * the process handle uuid
-         */
-        processUuid: string;
-        type: "external-process-started";
-    }
-
-    interface WindowExternalProcessExited extends WindowBaseEvent {
-        /**
-         * the process exit code
-         */
-        exitCode: number;
-        /**
-         * the process handle uuid
-         */
-        processUuid: string;
-        type: "external-process-exited";
-    }
-
-    interface WindowGroupChangedEvent extends WindowBaseEvent {
-        /**
-         * Which group array the window that the event listener was registered on is included in:
-         * 'source' The window is included in sourceGroup.
-         * 'target' The window is included in targetGroup.
-         * 'nothing' The window is not included in sourceGroup nor targetGroup.
-         */
-        memberOf: "source" | "target" | "nothing";
-        /**
-         * The reason this event was triggered.
-         * 'leave' A window has left the group due to a leave or merge with group.
-         * 'join' A window has joined the group.
-         * 'merge' Two groups have been merged together.
-         * 'disband' There are no other windows in the group.
-         */
-        reason: "leave" | "join" | "merge" | "disband";
-        /**
-         * All the windows in the group the sourceWindow originated from.
-         */
-        sourceGroup: WindowOfGroupInfo[];
-        /**
-         * The UUID of the application the sourceWindow belongs to The source window is the window in which (merge/join/leave)group(s) was called.
-         */
-        sourceWindowAppUuid: string;
-        /**
-         * the name of the sourcewindow.The source window is the window in which(merge / join / leave) group(s) was called.
-         */
-        sourceWindowName: string;
-        /**
-         * All the windows in the group the targetWindow orginated from
-         */
-        targetGroup: WindowOfGroupInfo[];
-        /**
-         * The UUID of the application the targetWindow belongs to. The target window is the window that was passed into (merge/join) group(s).
-         */
-        targetWindowAppUuid: string;
-        /**
-         * The name of the targetWindow. The target window is the window that was passed into (merge/join) group(s).
-         */
-        targetWindowName: string;
-        type: "group-changed";
-    }
-
-    interface WindowOfGroupInfo {
-        /**
-         * The UUID of the application this window entry belongs to.
-         */
-        appUuid: string;
-        /**
-         * The name of this window entry.
-         */
-        windowName: string;
-    }
-
-    interface WindowHiddenEvent extends WindowBaseEvent {
-        /**
-         * What action prompted the close.
-         * The reasons are: "hide", "hide-on-close"
-         */
-        reason: "hide" | "hide-on-close";
-        type: "hidden";
-    }
-
-    interface Window_NavigationRejectedEvent {
-        name: string;
-        /**
-         * source of navigation window name
-         */
-        sourceName: string;
-        topic: "navigation-rejected";
-        /**
-         * Url that was not reached "http://blocked-content.url"
-         */
-        url: string;
-        /**
-         * the UUID of the application the window belongs to.
-         */
-        uuid: string;
-    }
-
-    interface AnimationTransition {
-        opacity?: {
-            /**
-             * This value is clamped from 0.0 to 1.0
-             */
-            opacity?: number;
-            /**
-             * The total time in milliseconds this transition should take.
-             */
-            duration?: number;
-            /**
-             * Treat 'opacity' as absolute or as a delta. Defaults to false.
-             */
-            relative?: boolean;
-        };
-        position?: {
-            /**
-             * Defaults to the window's current left position in virtual screen coordinates.
-             */
-            left?: number;
-            /**
-             * Defaults to the window's current top position in virtual screen coordinates.
-             */
-            top?: number;
-            /**
-             * The total time in milliseconds this transition should take.
-             */
-            duration?: number;
-            /**
-             * Treat 'left' and 'top' as absolute or as deltas. Defaults to false.
-             */
-            relative?: boolean;
-        };
-        size?: {
-            /**
-             * Optional if height is present. Defaults to the window's current width.
-             */
-            width?: number;
-            /**
-             * Optional if width is present. Defaults to the window's current height.
-             */
-            height?: number;
-            /**
-             * The total time in milliseconds this transition should take.
-             */
-            duration?: number;
-            /**
-             * Treat 'width' and 'height' as absolute or as deltas. Defaults to false.
-             */
-            relative?: boolean;
-        };
-    }
-
-    interface AnimationOptions {
-        /**
-         * This option interrupts the current animation. When false it pushes this animation onto the end of the animation queue.
-         */
-        interrupt?: boolean;
-        /**
-         * Transition effect. Defaults to 'ease-in-out'.
-         */
-        tween?: OpenFinTweenType;
-    }
-
-    interface WindowBounds {
-        /**
-         * the height of the window.
-         */
-        height?: number;
-        /**
-         * left-most coordinate of the window.
-         */
-        left?: number;
-        /**
-         * top-most coordinate of the window.
-         */
-        top?: number;
-        /**
-         * the width of the window.
-         */
-        width?: number;
-    }
-
-    interface ExternalApplicationInfo {
-        parent: {
-            uuid: string;
-            name: string;
-        }
-    }
-
-    interface SessionChangedEvent {
-        /**
-         * the action that triggered this event:
-         */
-        reason: "lock"
-            | "unlock"
-            | "remote-connect"
-            | "remote-disconnect"
-            | "unknown";
-        topic: "system";
-        type: "session-changed";
-    }
-
-    interface LaunchInfo {
-        launchMode: "fin-protocol"
-            | "fins-protocol"
-            | "shortcut"
-            | "command-line"
-            | "adapter"
-            | "other"
-            | string;
-    }
-
-    type OpenFinTweenType = "linear"
-        | "ease-in"
-        | "ease-out"
-        | "ease-in-out"
-        | "ease-in-quad"
-        | "ease-out-quad"
-        | "ease-in-out-quad"
-        | "ease-in-cubic"
-        | "ease-out-cubic"
-        | "ease-in-out-cubic"
-        | "ease-out-bounce"
-        | "ease-in-back"
-        | "ease-out-back"
-        | "ease-in-out-back"
-        | "ease-in-elastic"
-        | "ease-out-elastic"
-        | "ease-in-out-elastic";
-
-    type OpenFinApplicationEventType = "closed"
-        | "connected"
-        | "crashed"
-        | "initialized"
-        | "manifest-changed"
-        | "not-responding"
-        | "out-of-memory"
-        | "responding"
-        | "run-requested"
-        | "started"
-        | "tray-icon-clicked"
-        | "window-alert-requested"
-        | "window-auth-requested"
-        | "window-closed"
-        | "window-created"
-        | "window-end-load"
-        | "window-navigation-rejected"
-        | "window-show-requested"
-        | "window-start-load";
-
-    type OpenFinExternalApplicationEventType = "connected"
-        | "disconnected";
-
-    type OpenFinSystemEventType = "application-closed"
-        | "application-crashed"
-        | "application-created"
-        | "application-started"
-        | "desktop-icon-clicked"
-        | "idle-state-changed"
-        | "monitor-info-changed"
-        | "session-changed";
-
-    type OpenFinWindowEventType = "auth-requested"
-        | "blurred"
-        | "bounds-changed"
-        | "bounds-changing"
-        | "close-requested"
-        | "closed"
-        | "disabled-frame-bounds-changed"
-        | "disabled-frame-bounds-changing"
-        | "embedded"
-        | "external-process-exited"
-        | "external-process-started"
-        | "focused"
-        | "frame-disabled"
-        | "frame-enabled"
-        | "group-changed"
-        | "hidden"
-        | "initialized"
-        | "maximized"
-        | "minimized"
-        | "navigation-rejected"
-        | "restored"
-        | "show-requested"
-        | "shown";
-
-    type OpenFinAnchor = "top-left"
-        | "top-right"
-        | "bottom-left"
-        | "bottom-right";
-}
diff --git a/types/openfin/v29/openfin-tests.ts b/types/openfin/v29/openfin-tests.ts
deleted file mode 100644
index 2b5237c1e8..0000000000
--- a/types/openfin/v29/openfin-tests.ts
+++ /dev/null
@@ -1,797 +0,0 @@
-function test_application() {
-    let application: fin.OpenFinApplication;
-    // constructor
-    application = new fin.desktop.Application({
-        url: "application.html",
-        uuid: "74BED629-2D8E-4141-8582-73E364BDFA74",
-        name: "Application Name",
-        plugins: false,
-        mainWindowOptions: {
-            defaultHeight: 600,
-            defaultWidth: 800,
-            defaultTop: 300,
-            defaultLeft: 300,
-            autoShow: true
-        }
-    }, (successObj) => {
-        console.log("Application successfully created, HTTP response code:", successObj);
-        application.run();
-    }, (error) => {
-        console.log("Error creating application:", error);
-    });
-        //createFromManifest
-    fin.desktop.Application.createFromManifest("http://stuf.com/app.json", (app) => {
-        console.log(app.uuid);
-    }, err => console.log(err));
-    // getCurrent
-    application = fin.desktop.Application.getCurrent();
-    // wrap
-    application = fin.desktop.Application.wrap("454C7F31-A915-4EA2-83F2-CFA655453C52");
-    // getWindow
-    application.getWindow();
-    // addEventListener
-    application.addEventListener("closed", (event) => {
-        console.log("The application has closed");
-    }, () => {
-        console.log("The registration was successful");
-    }, reason => {
-        console.log("failure: " + reason);
-    });
-    // close
-    application.close();
-    // getChildWindows
-    application.getChildWindows(children => {
-        children.forEach(childWindow => {
-            console.log("Showing child: " + childWindow.name);
-            childWindow.show();
-        });
-    });
-    // getGroups
-    application.getGroups(allGroups => {
-        console.log(`There are a total of ${allGroups.length} groups.`);
-
-        let groupCounter = 1;
-        allGroups.forEach(windowGroup => {
-            console.log(`Group ${groupCounter} contains ${windowGroup.length} windows.`);
-            ++groupCounter;
-        });
-    });
-    // getManifest
-    application.getManifest(manifest => {
-        console.log("Application manifest:");
-        console.log(manifest);
-    });
-    // getParentUuid
-    application.getParentUuid(parentUuid => {
-        console.log("UUID of parent application:");
-        console.log(parentUuid);
-    });
-    // getShortcuts
-    application.getShortcuts(config => {
-        console.log("Desktop shortcut is enabled: ", config.desktop);
-        console.log("Start Menu shortcut is enabled: ", config.startMenu);
-        console.log("System Startup shortcut is enabled: ", config.systemStartup);
-    });
-    // getInfo
-    application.getInfo(info => {
-        console.log(`Launch mode: ${info.launchMode}`);
-    });
-    // getTrayIconInfo
-    application.getTrayIconInfo(info => {
-        console.log(info.x, info.y, info.bounds.x, info.bounds.y, info.bounds.height, info.bounds.width,
-                    info.monitorInfo.type, info.monitorInfo.reason);
-    });
-    // isRunning
-    application.isRunning(running => {
-        console.log("the application is", running ? "running" : "not running");
-    });
-    // registerCustomData
-    application.registerUser("a", "b", () => console.log("done"), err => console.log(err));
-    // removeEventListener
-    const previousCallback = (event: fin.WindowEvent) => { };
-    application.removeEventListener("closed", previousCallback, () => {
-        console.log("The unregistration was successful");
-    }, err => {
-        console.log("failure:", err);
-    });
-    // removeTrayIcon
-    application.removeTrayIcon(() => {
-        console.log("Removed the tray icon.");
-    }, err => {
-        console.log("failure:", err);
-    });
-    // restart
-    application.restart(() => {
-        console.log("You will not read this.");
-    }, err => {
-        console.log("failure:", err);
-    });
-    // schedule restart
-    application.scheduleRestart(() => {
-        console.log("You will not read this.");
-    }, err => {
-        console.log("failure:", err);
-    });
-    // setShortcuts
-    application.setShortcuts({
-        desktop: true,
-        startMenu: false,
-        systemStartup: true
-    }, () => {
-        console.log("Successfully set new shortcut states");
-    }, error => {
-        console.log("Failed to set new shortcut states. Error: ", error);
-    });
-    // setTrayIcon
-    application.setTrayIcon("https://developer.openf.in/download/openfin.png", clickInfo => {
-        console.log(`The mouse has clicked at (${clickInfo.x}, ${clickInfo.y})`);
-    });
-    // terminate
-    application.terminate();
-    // wait
-    application.addEventListener("not-responding", () => {
-        console.log("waiting for hung application");
-        application.wait();
-    });
-    //uuid
-    let hasUuid = application.uuid;
-}
-
-function test_external_application() {
-    let externalApp: fin.OpenFinExternalApplication;
-    // wrap
-    externalApp = fin.desktop.ExternalApp.wrap('my-uuid');
-    // addEventListener
-    externalApp.addEventListener('connected', () => {
-        console.log('external app connected');
-    }, () => {
-        console.log('The registration was successful');
-    }, (reason, err) => {
-        console.log(`Error Message: ${err.message} Error Stack: ${err.stack}`);
-    });
-    // removeEventListener
-    const previousCallback = () => { };
-    externalApp.removeEventListener('connected', previousCallback, () => {
-        console.log('The unregistration was successful');
-    }, (reason, err) => {
-        console.log(`Error Message: ${err.message} Error Stack: ${err.stack}`);
-    });
-
-    // getInfo
-    externalApp.getInfo(info => {
-        console.log(info.parent.uuid, info.parent.name);
-    }, err => console.log(err));
-}
-
-function test_inter_application_bus() {
-    // addSubscribeListener
-    fin.desktop.InterApplicationBus.addSubscribeListener((uuid, topic, name) => {
-        console.log(`The application ${uuid} has subscribed to ${topic}`);
-    });
-    // addUnsubscribeListener
-    fin.desktop.InterApplicationBus.addUnsubscribeListener((uuid, topic, name) => {
-        console.log(`The application ${uuid} has unsubscribed to ${topic}`);
-    });
-    // removeSubscribeListener
-    const aRegisteredListener = (uuid: string, topic: string, name: string) => { };
-    fin.desktop.InterApplicationBus.removeSubscribeListener(aRegisteredListener);
-    // removeUnsubscribeListener
-    fin.desktop.InterApplicationBus.removeUnsubscribeListener(aRegisteredListener);
-    // publish
-    fin.desktop.InterApplicationBus.publish("a topic", {
-        field1: "value1",
-        field2: "value2"
-    });
-    // send
-    fin.desktop.InterApplicationBus.send("an application's uuid", "a topic", {
-        field1: "value1",
-        field2: "value2"
-    });
-    // subscribe
-    fin.desktop.InterApplicationBus.subscribe("*", "a topic", (message, uuid, name) => {
-        console.log(`The application ${uuid} sent this message: ${message}`);
-    });
-    // unsubscribe
-    const aRegisteredMessageListener = (message: any, senderUuid: string) => {
-        console.log(message, senderUuid);
-    };
-    fin.desktop.InterApplicationBus.unsubscribe("*", "a topic", aRegisteredMessageListener);
-}
-
-function test_notification() {
-    let notification: fin.OpenFinNotification;
-    // getCurrent
-    notification = fin.desktop.Notification.getCurrent();
-    // close
-    notification.close();
-    // sendMessage
-    notification = new fin.desktop.Notification({
-        duration: 10,
-        url: "http://localhost:5000/Account/Register",
-        message: "Hello",
-        onShow: () => { },
-        // onClose: () => { },
-        onDismiss: () => { },
-        // onClick: () => { },
-        onMessage: () => { },
-        onError: () => { }
-    });
-    // sendMessageToApplication
-    notification.sendMessageToApplication("some message");
-}
-
-function test_system() {
-    // addEventListener
-    fin.desktop.System.addEventListener('monitor-info-changed', event => {
-        console.log("The monitor information has changed to: ", event);
-    }, () => {
-        console.log("The registration was successful");
-    }, err => {
-        console.log("failure: " + err);
-    });
-    // clearCache
-    fin.desktop.System.clearCache({
-        cache: true,
-        cookies: true,
-        localStorage: true,
-        appcache: true,
-        userData: true
-    });
-    // deleteCacheOnExit
-    fin.desktop.System.deleteCacheOnExit(() => {
-        console.log("successful");
-    }, err => {
-        console.log("failure: " + err);
-    });
-    // downloadAsset
-    const dirAppAsset = {
-        src: 'http://local:8000/dir.zip',
-        alias: 'dirApp',
-        version: '1.23.24',
-        target: 'dir.bat',
-        args: ''
-    };
-    fin.desktop.System.downloadAsset(dirAppAsset, progress => {
-        const downloadedPercent = Math.floor((progress.downloadedBytes / progress.totalBytes) * 100);
-        console.log(`Downloaded ${downloadedPercent}%`);
-    }, p => {
-        console.log(`Downlod complete, can be found on ${p.path}`);
-        // lets launch our application asset.
-        // launchDirApp();
-    }, (reason, err) => {
-        console.log(reason, err);
-    });
-    // downloadRuntime
-    fin.desktop.System.downloadRuntime({ version: '9.61.31.56' }, progress => {
-        console.log(progress.downloadedBytes, progress.downloadedBytes);
-    }, () => console.log('download complete'), err => console.error(err));
-    // downloadPreloadScript
-    const preloadScripts = [
-        { url: 'http://whatever.com/script.js' }
-    ];
-    fin.desktop.System.downloadPreloadScripts(preloadScripts, info => {
-        const downloadInfo = info[0];
-        console.log(downloadInfo.success, downloadInfo.url, downloadInfo.error);
-    }, err => {
-        console.log(err);
-    });
-    // exit
-    fin.desktop.System.exit(() => {
-        console.log("successful");
-    }, err => {
-        console.log("failure: " + err);
-    });
-    //flushCookieStore
-    fin.desktop.System.flushCookieStore(() => {
-        console.log('successful');
-    }, err => {
-        console.log('failure', err);
-    });
-    // getAllApplications
-    fin.desktop.System.getAllApplications(applicationInfoList => {
-        applicationInfoList.forEach(applicationInfo => {
-            console.log("Showing information for application with uuid: "
-                + applicationInfo.uuid);
-            console.log("isRunning: ", applicationInfo.isRunning);
-        });
-    });
-    // getAllExternalApplications
-    fin.desktop.System.getAllExternalApplications(externalAppsInfoList => {
-        externalAppsInfoList.forEach(appInfo => {
-            console.log(`External app connected to the runtime with UUID ${appInfo.uuid}`);
-        });
-    });
-    // getAllWindows
-    fin.desktop.System.getAllWindows(windowInfoList => {
-        windowInfoList.forEach(windowInfo => {
-            console.log("Showing information for application with uuid: ", windowInfo.uuid);
-            console.log("Main window: ", windowInfo.mainWindow);
-            console.log("Child windows: ", windowInfo.childWindows);
-        });
-    });
-    // getAppAssetInfo
-    fin.desktop.System.getAppAssetInfo({ alias: 'myAppAsset' }, info => {
-        console.log(info.alias, info.args, info.mandatory, info.src, info.target, info.version);
-    }, err => console.log(err));
-    // getCommandLineArguments
-    fin.desktop.System.getCommandLineArguments(args => {
-        console.log("The command line arguments are " + args);
-    });
-    //getCookieInfo
-    fin.desktop.System.getCookies({ name: 'myCookie1'}, cookies => {
-        const cookie1 = cookies[0];
-        console.log(cookie1.name, cookie1.domain, cookie1.path);
-    }, err => console.log(err));
-    // getDeviceId
-    fin.desktop.System.getDeviceId(id => {
-        console.log("The id of the device is: " + id);
-    });
-    // getDeviceUserId
-    fin.desktop.System.getDeviceUserId(id => console.log(id), err => console.error(err));
-    // getEntityInfo
-    fin.desktop.System.getEntityInfo('uuid', 'name', info => {
-        console.log(info.entityType, info.name, info.uuid, info.parent.name, info.parent.uuid);
-    }, err => console.log(err));
-    // getEnvironmentVariable
-    fin.desktop.System.getEnvironmentVariable("APPDATA", variable => {
-        console.log("this is the APPDATA value", variable);
-    });
-    // getFocusedWindow
-    fin.desktop.System.getFocusedWindow(win => {
-        console.log(win.uuid, win.name);
-    }, err => console.log(err));
-    // getHostSpecs
-    fin.desktop.System.getHostSpecs(info => {
-        console.log(info);
-    }, error => {
-        console.log('There was an error:', error);
-    });
-    // getLog
-    fin.desktop.System.getLog('debug-2015-01-08-22-27-53.log', log => {
-        console.log(log);
-    });
-    // getLogList
-    fin.desktop.System.getLogList(logList => {
-        logList.forEach(logInfo => {
-            console.log(`The filename of the log is ${logInfo.name}, the size is ${logInfo.size}, and the date of creation is ${logInfo.date}`);
-        });
-    });
-    //getMinLogLevel
-    fin.desktop.System.getMinLogLevel(level => console.log(level), err => console.log(err));
-    // getMonitorInfo
-    fin.desktop.System.getMonitorInfo(monitorInfo => {
-        console.log("This object contains information about all monitors: ", monitorInfo);
-    });
-    // getMousePosition
-    fin.desktop.System.getMousePosition(mousePosition => {
-        console.log(`The mouse is located at left: ${mousePosition.left}, top: ${mousePosition.top}`);
-    });
-    // getProcessList
-    fin.desktop.System.getProcessList(list => {
-        list.forEach(process => {
-            console.log(`UUID: ${process.uuid}, Application Name: ${process.name}`);
-        });
-    });
-    // getProxySettings
-    fin.desktop.System.getProxySettings(proxy => {
-        console.log(proxy);
-    });
-    // getRvmInfo
-    fin.desktop.System.getRvmInfo(rvmInfoObject => {
-        console.log("RVM version:", rvmInfoObject.version);
-        console.log("RVM has been running since:", rvmInfoObject["start-time"]);
-    }, err => {
-        console.log("Failed to get rvm info, error message:", err);
-    });
-    // getVersion
-    fin.desktop.System.getVersion(version => {
-        console.log("The version is " + version);
-    });
-    // launchExternalProcess
-    fin.desktop.System.launchExternalProcess({
-        path: "notepad",
-        arguments: "",
-        listener(result) {
-            console.log('the exit code', result.exitCode);
-        }
-    }, payload => {
-        console.log('Success:', payload.uuid);
-    }, error => {
-        console.log('Error:', error);
-    });
-    //
-    fin.desktop.System.launchExternalProcess({
-        // Additionally note that the executable found in the zip file specified in appAssets
-        // will default to the one mentioned by appAssets.target
-        // If the the path below refers to a specific path it will override this default
-        alias: "myApp",
-        listener(result) {
-            console.log('the exit code', result.exitCode);
-        }
-    }, payload => {
-        console.log('Success:', payload.uuid);
-    }, error => {
-        console.log('Error:', error);
-    });
-    //
-    fin.desktop.System.launchExternalProcess({
-        alias: "myApp",
-        arguments: "e f g",
-        listener(result) {
-            console.log('the exit code', result.exitCode);
-        }
-    }, payload => {
-        console.log('Success:', payload.uuid);
-    }, error => {
-        console.log('Error:', error);
-    });
-    //
-    fin.desktop.System.launchExternalProcess({
-        path: "C:\Users\ExampleUser\AppData\Local\OpenFin\OpenFinRVM.exe",
-        arguments: "--version",
-        certificate: {
-            trusted: true,
-            subject: 'O=OpenFin INC., L=New York, S=NY, C=US',
-            thumbprint: '3c a5 28 19 83 05 fe 69 88 e6 8f 4b 3a af c5 c5 1b 07 80 5b'
-        },
-        listener(result) {
-            console.log('the exit code', result.exitCode);
-        }
-    }, payload => {
-        console.log('Success:', payload.uuid);
-    }, error => {
-        console.log('Error:', error);
-    });
-    // log
-    fin.desktop.System.log("info", "An example log message", () => {
-        console.log("message successfully logged");
-    }, err => {
-        console.log(err);
-    });
-    // monitorExternalProcess
-    fin.desktop.System.monitorExternalProcess({
-        pid: 2508,
-        listener(result) {
-            console.log('the exit code', result.exitCode);
-        }
-    }, payload => {
-        console.log("The process is now being monitored: ", payload.uuid);
-    }, error => {
-        console.log("Error:", error);
-    });
-    // openUrlWithBrowser
-    fin.desktop.System.openUrlWithBrowser("https://developer.openf.in/", () => {
-        console.log("successful");
-    }, err => {
-        console.log("failure: " + err);
-    });
-    // readRegistryValue
-    fin.desktop.System.readRegistryValue('HKEY_SOMETHING', 'HARDWARE\\SOMETHING', 'BootSomething', info => {
-        console.log(info.data, info.rootKey, info.subkey, info.type, info.value);
-    }, err => console.log(err));
-    // registerExternalConnection
-    fin.desktop.System.registerExternalConnection("remote-connection-uuid", (...args: any[]) => {
-        console.log(args);
-    });
-    // releaseExternalProcess
-    fin.desktop.System.launchExternalProcess({
-        path: "notepad",
-        arguments: "",
-        listener(result) {
-            console.log("The exit code", result.exitCode);
-        }
-    }, result => {
-        console.log("Result UUID is " + result.uuid);
-
-        // release it.
-        fin.desktop.System.releaseExternalProcess(result.uuid, () => {
-            console.log("Process has been unmapped!");
-        }, reason => {
-            console.log("failure: " + reason);
-        });
-    });
-    // removeEventListener
-    const aRegisteredListener = (event: fin.SystemBaseEvent) => { };
-    fin.desktop.System.removeEventListener("monitor-info-changed", aRegisteredListener, () => {
-        console.log("successful");
-    }, err => {
-        console.log("failure: " + err);
-    });
-    //setMinLogLevel
-    fin.desktop.System.setMinLogLevel("log level", () => console.log('Success'), err => console.error(err));
-    // showDeveloperTools
-    fin.desktop.System.showDeveloperTools("uuid", "name", () => {
-        console.log("successful");
-    }, err => {
-        console.log("failure: " + err);
-    });
-    // terminateExternalProcess
-    fin.desktop.System.launchExternalProcess({
-        // notepad is in the system's PATH
-        path: "notepad",
-        arguments: "",
-        listener(result) {
-            console.log("The exit code", result.exitCode);
-        }
-    }, result => {
-        console.log("Result UUID is " + result.uuid);
-
-        // Attempt to close the process. Terminate after 4 seconds if it
-        // has not done so.
-        fin.desktop.System.terminateExternalProcess(result.uuid, 4000, info => {
-            console.log("Termination result " + info.result);
-        }, reason => {
-            console.log("failure: " + reason);
-        });
-    });
-    // updateProxySettings
-    fin.desktop.System.updateProxySettings("type", "proxyAddress", 8080, () => {
-        console.log('success');
-    }, err => {
-        console.log(err);
-    });
-}
-
-function test_system_clipboard() {
-    // availableFormats
-    fin.desktop.System.Clipboard.availableFormats(null, formats => {
-        formats.forEach(format => console.log(`The format ${format} is available to read`));
-    }, (reason, err) => {
-        console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
-    });
-    // readHtml
-    fin.desktop.System.Clipboard.readHtml(null, html => {
-        console.log(`This is the html from the clipboard: ${html}`);
-    }, (reason, err) => {
-        console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
-    });
-    // readRtf
-    fin.desktop.System.Clipboard.readRtf(null, rtf => {
-        console.log(`This is the rtf from the clipboard: ${rtf}`);
-    }, (reason, err) => {
-        console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
-    });
-    // readText
-    fin.desktop.System.Clipboard.readText(null, text => {
-        console.log(`This is the text from the clipboard: ${text}`);
-    }, (reason, err) => {
-        console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
-    });
-    // write
-    fin.desktop.System.Clipboard.write({
-        text: 'Hello Text!',
-        html: '<h1>Hello Html</h1>',
-        rtf: 'Hello Rtf'
-    }, null, () => {
-        console.log('Success!!');
-    }, (reason, err) => {
-        console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
-    });
-    // writeHtml
-    fin.desktop.System.Clipboard.writeHtml('<h1>Hello World</h1>', null, () => {
-        console.log('Success!!');
-    }, (reason, err) => {
-        console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
-    });
-    // writeRtf
-    fin.desktop.System.Clipboard.writeRtf('Hello World!', null, () => {
-        console.log('Success!!');
-    }, (reason, err) => {
-        console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
-    });
-    // writeText
-    fin.desktop.System.Clipboard.writeText('Hello World', null, () => {
-        console.log('Success!!');
-    }, (reason, err) => {
-        console.log(`Error while reading the clipboard Message: ${err.message}, Stack: ${err.stack}`);
-    });
-}
-
-function test_window() {
-    let finWindow: fin.OpenFinWindow;
-    // constructor
-    finWindow = new fin.desktop.Window({
-        name: "childWindow",
-        url: "child.html",
-        defaultWidth: 320,
-        defaultHeight: 320,
-        defaultTop: 10,
-        defaultLeft: 300,
-        frame: false,
-        resizable: false,
-        state: "normal"
-    }, () => {
-        const _win = finWindow.getNativeWindow();
-        _win.addEventListener("DOMContentLoaded", () => { finWindow.show(); });
-    }, error => {
-        console.log("Error creating window:", error);
-    });
-    // getCurrent
-    finWindow = fin.desktop.Window.getCurrent();
-    // getNativeWindow
-    let nativeWindow: Window;
-    nativeWindow = finWindow.getNativeWindow();
-    // getParentApplication
-    let parentApp: fin.OpenFinApplication;
-    parentApp = finWindow.getParentApplication();
-    // getParentWindow
-    let parentFinWindow: fin.OpenFinWindow;
-    parentFinWindow = finWindow.getParentWindow();
-    // wrap
-    finWindow = fin.desktop.Window.wrap("uuid", "name");
-    // addEventListener
-    finWindow.addEventListener("bounds-changed", event => {
-        console.log("The window has been moved or resized");
-    }, () => {
-        console.log("The registration was successful");
-    }, reason => {
-        console.log("failure:" + reason);
-    });
-    // animate
-    finWindow.animate({
-        opacity: {
-            opacity: 0.15,
-            duration: 1000
-        },
-        position: {
-            left: 10,
-            top: 10,
-            duration: 3000
-        }
-    }, {
-            interrupt: false
-        }, evt => {
-            // Callback will only fire after both "opacity" and "position" have finished animating.
-        });
-    // authenticate
-    finWindow.addEventListener('auth-requested', evt => {
-        finWindow.authenticate('userName', 'P@assw0rd', () => { }, (reason, err) => {
-            console.log("failure:", err);
-        });
-    });
-    // blur
-    finWindow.blur();
-    // bringToFront
-    finWindow.bringToFront();
-    // close
-    finWindow.close();
-    // disableFrame
-    finWindow.disableFrame();
-    // enableFrame
-    finWindow.enableFrame();
-    // flash
-    finWindow.flash();
-    // focus
-    finWindow.focus();
-    // getBounds
-    finWindow.getBounds(bounds => {
-        console.log(`top: ${bounds.top} left: ${bounds.left} height: ${bounds.height} width: ${bounds.width}`);
-    });
-    // getOptions
-    finWindow.getOptions(options => {
-        console.log(options);
-    });
-    // getSnapshot
-    finWindow.getSnapshot(base64Snapshot => {
-        console.log("data:image/png;base64," + base64Snapshot);
-    });
-    // getState
-    finWindow.getState(state => {
-        console.log("state: " + state);
-    });
-    // getZoomLevel
-    finWindow.getZoomLevel(level => {
-        console.log("zoom level: " + level);
-    }, error => {
-        console.log('error:', error);
-    });
-    // hide
-    finWindow.hide();
-    // isShowing
-    finWindow.isShowing(showing => {
-        console.log("the window is " + (showing ? "showing" : "hidden"));
-    });
-    // joinGroup
-    let secondWindow = new fin.desktop.Window({
-        url: "http://www.openfin.co",
-        name: "secondWindow",
-        autoShow: true
-    }, () => {
-        // When mainWindow moves or is moved, secondWindow moves by the same amount
-        secondWindow.joinGroup(finWindow);
-    });
-    // leaveGroup
-    secondWindow = new fin.desktop.Window({
-        url: "http://www.openfin.co",
-        name: "secondWindow",
-        autoShow: true
-    }, () => {
-        // When finWindow moves or is moved, secondWindow moves by the same amount
-        secondWindow.joinGroup(finWindow, () => {
-            // once we are in the group, lets leave it.
-            secondWindow.leaveGroup();
-        });
-    });
-    // maximize
-    finWindow.maximize();
-    // mergeGroups
-    {
-        const finWindowOne = new fin.desktop.Window({
-            url: "http://www.openfin.co",
-            name: "finWindowOne",
-            autoShow: true
-        });
-        const finWindowTwo = new fin.desktop.Window({
-            url: "http://www.openfin.co",
-            name: "finWindowTwo",
-            autoShow: true
-        });
-        const finWindowThree = new fin.desktop.Window({
-            url: "http://www.openfin.co",
-            name: "finWindowThree",
-            autoShow: true
-        });
-        const finWindowFour = new fin.desktop.Window({
-            url: "http://www.openfin.co",
-            name: "finWindowFour",
-            autoShow: true
-        });
-        // When finWindowOne moves or is moved, finWindowTwo moves by the same amount
-        finWindowOne.joinGroup(finWindowTwo);
-        // When finWindowThree moves or is moved, finWindowFour moves by the same amount
-        finWindowThree.joinGroup(finWindowFour);
-        // finWindowOne, finWindowTwo, finWindowThree, and finWindowFour now move together in the same group
-        finWindowOne.mergeGroups(finWindowThree);
-    }
-    // minimize
-    finWindow.minimize();
-    // moveBy
-    finWindow.moveBy(10, 10);
-    // moveTo
-    finWindow.moveTo(100, 200);
-    // removeEventListener
-    const aRegisteredListener = (event: fin.WindowBaseEvent) => { };
-    finWindow.removeEventListener("bounds-changed", aRegisteredListener);
-    // resizeBy
-    finWindow.resizeBy(10, 10, "top-right");
-    // resizeTo
-    finWindow.resizeTo(10, 10, "top-right");
-    // restore
-    finWindow.restore();
-    // setAsForeground
-    finWindow.setAsForeground();
-    // setBounds
-    finWindow.setBounds(100, 200, 400, 400);
-    // setZoomLevel
-    finWindow.setZoomLevel(10);
-    // show
-    finWindow.show();
-    // showAt
-    finWindow.showAt(10, 10, false);
-    // stopFlashing
-    finWindow.stopFlashing();
-    // updateOptions
-    finWindow.updateOptions({
-        frame: false,
-        maxWidth: 500
-    });
-}
-
-function test_frame() {
-    //wrap
-    const frame = fin.desktop.Frame.wrap('uuid', 'name');
-    //getCurrent
-    const currentFrame = fin.desktop.Frame.getCurrent();
-    // addEventlistener
-    frame.addEventListener('event', () => console.log('on event'), () => console.log('success'), err => console.error(err));
-    //removeEventListener
-    frame.removeEventListener('event', () => console.log('on event'), () => console.log('success'), err => console.error(err));
-    // getInfo
-    frame.getInfo(info => {
-        console.log(info.uuid, info.name, info.entityType, info.parent.uuid, info.parent.name);
-    }, err => console.error(err));
-    // getParentWindow
-    frame.getParentWindow(parent => {
-        console.log(parent.uuid, parent.name, parent.entityType, parent.parent.uuid, parent.parent.name);
-    }, err => console.error(err));
-}
diff --git a/types/openfin/v29/tslint.json b/types/openfin/v29/tslint.json
deleted file mode 100644
index f93cf8562a..0000000000
--- a/types/openfin/v29/tslint.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "extends": "dtslint/dt.json"
-}

From 6983d94a0e080404939e4803cef68ccd5b116425 Mon Sep 17 00:00:00 2001
From: Derek Wickern <dwickern@gmail.com>
Date: Sun, 25 Mar 2018 19:18:43 -0700
Subject: [PATCH 0839/1382] ember: mismatched get/set

---
 types/ember-data/index.d.ts         |  4 +--
 types/ember-data/test/belongs-to.ts |  7 +++++
 types/ember-data/test/has-many.ts   |  5 ++++
 types/ember/index.d.ts              | 41 +++++++++++++++--------------
 4 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/types/ember-data/index.d.ts b/types/ember-data/index.d.ts
index 9eec5ed467..ea3de94436 100644
--- a/types/ember-data/index.d.ts
+++ b/types/ember-data/index.d.ts
@@ -71,7 +71,7 @@ declare module 'ember-data' {
                 inverse?: string | null;
                 polymorphic?: boolean;
             }
-        ): Ember.ComputedProperty<ModelRegistry[K] & PromiseObject<ModelRegistry[K]>>;
+        ): Ember.ComputedProperty<ModelRegistry[K] & PromiseObject<ModelRegistry[K]>, ModelRegistry[K]>;
         /**
          * `DS.hasMany` is used to define One-To-Many and Many-To-Many
          * relationships on a [DS.Model](/api/data/classes/DS.Model.html).
@@ -91,7 +91,7 @@ declare module 'ember-data' {
                 inverse?: string | null;
                 polymorphic?: boolean;
             }
-        ): Ember.ComputedProperty<PromiseManyArray<ModelRegistry[K]>>;
+        ): Ember.ComputedProperty<PromiseManyArray<ModelRegistry[K]>, Ember.Array<ModelRegistry[K]>>;
         /**
          * This method normalizes a modelName into the format Ember Data uses
          * internally.
diff --git a/types/ember-data/test/belongs-to.ts b/types/ember-data/test/belongs-to.ts
index bd1037a65e..31977c148c 100644
--- a/types/ember-data/test/belongs-to.ts
+++ b/types/ember-data/test/belongs-to.ts
@@ -1,6 +1,8 @@
 import DS from 'ember-data';
 import { assertType } from './lib/assert';
 
+declare const store: DS.Store;
+
 class Folder extends DS.Model {
     name = DS.attr('string');
     children = DS.hasMany('folder', { inverse: 'parent' });
@@ -19,4 +21,9 @@ assertType<string>(folder.get('parent').get('name'));
 folder.get('parent').then(parent => {
     assertType<Folder>(parent);
     assertType<string>(parent.get('name'));
+    folder.set('parent', parent);
 });
+
+folder.set('parent', folder);
+folder.set('parent', folder.get('parent'));
+folder.set('parent', store.findRecord('folder', 3));
diff --git a/types/ember-data/test/has-many.ts b/types/ember-data/test/has-many.ts
index e24fb1b814..480a6bd56d 100644
--- a/types/ember-data/test/has-many.ts
+++ b/types/ember-data/test/has-many.ts
@@ -1,3 +1,4 @@
+import Ember from 'ember';
 import DS from 'ember-data';
 import { assertType } from './lib/assert';
 
@@ -44,6 +45,10 @@ blogPost.get('commentsAsync').then(comments => {
     assertType<string>(comments.get('firstObject')!.get('text'));
 });
 
+blogPost.set('commentsAsync', blogPost.get('commentsAsync'));
+blogPost.set('commentsAsync', Ember.A());
+blogPost.set('commentsAsync', Ember.A([ comment! ]));
+
 class PaymentMethod extends DS.Model {}
 declare module 'ember-data' {
     interface ModelRegistry {
diff --git a/types/ember/index.d.ts b/types/ember/index.d.ts
index dd3ed1ec64..3e776bd665 100755
--- a/types/ember/index.d.ts
+++ b/types/ember/index.d.ts
@@ -28,7 +28,8 @@ declare module 'ember' {
     /**
      * Deconstructs computed properties into the types which would be returned by `.get()`.
      */
-    type ComputedProperties<T> = { [K in keyof T]: Ember.ComputedProperty<T[K]> | ModuleComputed<T[K]> | T[K] };
+    type ComputedPropertyGetters<T> = { [K in keyof T]: Ember.ComputedProperty<T[K], any> | ModuleComputed<T[K], any> | T[K] };
+    type ComputedPropertySetters<T> = { [K in keyof T]: Ember.ComputedProperty<any, T[K]> | ModuleComputed<any, T[K]> | T[K] };
 
     /**
      * Check that any arguments to `create()` match the type's properties.
@@ -683,7 +684,7 @@ declare module 'ember' {
         will be cached. You can specify various properties that your computed property is dependent on.
         This will force the cached result to be recomputed if the dependencies are modified.
         **/
-        class ComputedProperty<T> {
+        class ComputedProperty<Get, Set = Get> {
             /**
              * Call on a computed property to set it into non-cached mode. When in this
              * mode the computed property will not automatically cache the return value.
@@ -812,7 +813,7 @@ declare module 'ember' {
             static create<Instance>(this: EmberClassConstructor<Instance>): Fix<Instance>;
 
             static create<Instance, Args, T1 extends EmberInstanceArguments<Args>>(
-                this: EmberClassConstructor<Instance & ComputedProperties<Args>>,
+                this: EmberClassConstructor<Instance & ComputedPropertyGetters<Args>>,
                 arg1: T1 & ThisType<Fix<T1 & Instance>>
             ): Fix<Instance & T1>;
 
@@ -822,7 +823,7 @@ declare module 'ember' {
                 T1 extends EmberInstanceArguments<Args>,
                 T2 extends EmberInstanceArguments<Args>
             >(
-                this: EmberClassConstructor<Instance & ComputedProperties<Args>>,
+                this: EmberClassConstructor<Instance & ComputedPropertyGetters<Args>>,
                 arg1: T1 & ThisType<Fix<Instance & T1>>,
                 arg2: T2 & ThisType<Fix<Instance & T1 & T2>>
             ): Fix<Instance & T1 & T2>;
@@ -834,7 +835,7 @@ declare module 'ember' {
                 T2 extends EmberInstanceArguments<Args>,
                 T3 extends EmberInstanceArguments<Args>
             >(
-                this: EmberClassConstructor<Instance & ComputedProperties<Args>>,
+                this: EmberClassConstructor<Instance & ComputedPropertyGetters<Args>>,
                 arg1: T1 & ThisType<Fix<Instance & T1>>,
                 arg2: T2 & ThisType<Fix<Instance & T1 & T2>>,
                 arg3: T3 & ThisType<Fix<Instance & T1 & T2 & T3>>
@@ -1641,27 +1642,27 @@ declare module 'ember' {
             /**
              * Retrieves the value of a property from the object.
              */
-            get<T, K extends keyof T>(this: ComputedProperties<T>, key: K): T[K];
+            get<T, K extends keyof T>(this: ComputedPropertyGetters<T>, key: K): T[K];
             /**
              * To get the values of multiple properties at once, call `getProperties`
              * with a list of strings or an array:
              */
-            getProperties<T, K extends keyof T>(this: ComputedProperties<T>, list: K[]): Pick<T, K>;
+            getProperties<T, K extends keyof T>(this: ComputedPropertyGetters<T>, list: K[]): Pick<T, K>;
             getProperties<T, K extends keyof T>(
-                this: ComputedProperties<T>,
+                this: ComputedPropertyGetters<T>,
                 ...list: K[]
             ): Pick<T, K>;
             /**
              * Sets the provided key or path to the value.
              */
-            set<T, K extends keyof T>(this: ComputedProperties<T>, key: K, value: T[K]): T[K];
+            set<T, K extends keyof T>(this: ComputedPropertySetters<T>, key: K, value: T[K]): T[K];
             /**
              * Sets a list of properties at once. These properties are set inside
              * a single `beginPropertyChanges` and `endPropertyChanges` batch, so
              * observers will be buffered.
              */
             setProperties<T, K extends keyof T>(
-                this: ComputedProperties<T>,
+                this: ComputedPropertySetters<T>,
                 hash: Pick<T, K>
             ): Pick<T, K>;
             /**
@@ -1692,7 +1693,7 @@ declare module 'ember' {
              * property returns `undefined`.
              */
             getWithDefault<T, K extends keyof T>(
-                this: ComputedProperties<T>,
+                this: ComputedPropertyGetters<T>,
                 key: K,
                 defaultValue: T[K]
             ): T[K];
@@ -1715,7 +1716,7 @@ declare module 'ember' {
              * without accidentally invoking it if it is intended to be
              * generated lazily.
              */
-            cacheFor<T, K extends keyof T>(this: ComputedProperties<T>, key: K): T[K] | undefined;
+            cacheFor<T, K extends keyof T>(this: ComputedPropertyGetters<T>, key: K): T[K] | undefined;
         }
         const Observable: Mixin<Observable, Ember.CoreObject>;
         /**
@@ -2989,7 +2990,7 @@ declare module 'ember' {
          * it to be created.
          */
         function cacheFor<T, K extends keyof T>(
-            obj: ComputedProperties<T>,
+            obj: ComputedPropertyGetters<T>,
             key: K
         ): T[K] | undefined;
         /**
@@ -3028,12 +3029,12 @@ declare module 'ember' {
          * with an object followed by a list of strings or an array:
          */
         function getProperties<T, K extends keyof T>(
-            obj: ComputedProperties<T>,
+            obj: ComputedPropertyGetters<T>,
             list: K[]
         ): Pick<T, K>;
         function getProperties<T, K extends keyof T>(obj: T, list: K[]): Pick<T, K>; // for dynamic K
         function getProperties<T, K extends keyof T>(
-            obj: ComputedProperties<T>,
+            obj: ComputedPropertyGetters<T>,
             ...list: K[]
         ): Pick<T, K>;
         function getProperties<T, K extends keyof T>(obj: T, ...list: K[]): Pick<T, K>; // for dynamic K
@@ -3120,14 +3121,14 @@ declare module 'ember' {
          * the function will be invoked. If the property is not defined but the
          * object implements the `unknownProperty` method then that will be invoked.
          */
-        function get<T, K extends keyof T>(obj: ComputedProperties<T>, key: K): T[K];
+        function get<T, K extends keyof T>(obj: ComputedPropertyGetters<T>, key: K): T[K];
         function get<T, K extends keyof T>(obj: T, key: K): T[K]; // for dynamic K
         /**
          * Retrieves the value of a property from an Object, or a default value in the
          * case that the property returns `undefined`.
          */
         function getWithDefault<T, K extends keyof T>(
-            obj: ComputedProperties<T>,
+            obj: ComputedPropertyGetters<T>,
             key: K,
             defaultValue: T[K]
         ): T[K];
@@ -3139,7 +3140,7 @@ declare module 'ember' {
          * method then that will be invoked as well.
          */
         function set<T, K extends keyof T, V extends T[K]>(
-            obj: ComputedProperties<T>,
+            obj: ComputedPropertySetters<T>,
             key: K,
             value: V
         ): V;
@@ -3155,7 +3156,7 @@ declare module 'ember' {
          * observers will be buffered.
          */
         function setProperties<T, K extends keyof T>(
-            obj: ComputedProperties<T>,
+            obj: ComputedPropertySetters<T>,
             hash: Pick<T, K>
         ): Pick<T, K>;
         function setProperties<T, K extends keyof T>(obj: T, hash: Pick<T, K>): Pick<T, K>; // for dynamic K
@@ -3534,7 +3535,7 @@ declare module '@ember/object' {
 
 declare module '@ember/object/computed' {
     import Ember from 'ember';
-    export default class ComputedProperty<T> extends Ember.ComputedProperty<T> { }
+    export default class ComputedProperty<Get, Set = Get> extends Ember.ComputedProperty<Get, Set> { }
     export const alias: typeof Ember.computed.alias;
     export const and: typeof Ember.computed.and;
     export const bool: typeof Ember.computed.bool;

From ebf695c819b0126efb0f91c9197a85335d0bac1f Mon Sep 17 00:00:00 2001
From: Tim Wang <tim@thenetcircle.com>
Date: Mon, 26 Mar 2018 10:41:58 +0800
Subject: [PATCH 0840/1382] Remove any union type

---
 types/react-navigation/index.d.ts  | 3 +--
 types/react-navigation/tslint.json | 7 +------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index 3c6bffe130..cb27a40d71 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -175,7 +175,6 @@ export type NavigationScreenConfig<Options> =
 export type NavigationComponent =
   NavigationScreenComponent<any, any>
   | NavigationNavigator<any, any, any>
-  | any;
 
 export type NavigationScreenComponent<
     Options = {},
@@ -189,7 +188,7 @@ export type NavigationNavigator<
     Props = {}
 > = React.ComponentType<NavigationNavigatorProps<Options, State> & Props> & {
     router: NavigationRouter<State, Options>,
-    navigationOptions?: NavigationScreenConfig<Options> | any,
+    navigationOptions?: NavigationScreenConfig<Options>,
 };
 
 export interface NavigationParams {
diff --git a/types/react-navigation/tslint.json b/types/react-navigation/tslint.json
index d9d49e375e..3db14f85ea 100644
--- a/types/react-navigation/tslint.json
+++ b/types/react-navigation/tslint.json
@@ -1,6 +1 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "no-any-union": false
-    }
-}
+{ "extends": "dtslint/dt.json" }

From 40f7502a236e5de5d0242e891f274a697bf37ad4 Mon Sep 17 00:00:00 2001
From: Tim Wang <tim@thenetcircle.com>
Date: Mon, 26 Mar 2018 10:50:07 +0800
Subject: [PATCH 0841/1382] Fix linter issues

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

diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index cb27a40d71..9ec404a6fb 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -174,7 +174,7 @@ export type NavigationScreenConfig<Options> =
 
 export type NavigationComponent =
   NavigationScreenComponent<any, any>
-  | NavigationNavigator<any, any, any>
+  | NavigationNavigator<any, any, any>;
 
 export type NavigationScreenComponent<
     Options = {},

From ca5143816548211a809c714caeb6f1df32f4cf0d Mon Sep 17 00:00:00 2001
From: Edo Rivai <edo.rivai@gmail.com>
Date: Mon, 26 Mar 2018 11:54:23 +0200
Subject: [PATCH 0842/1382] Add renew parameter to config

---
 types/koa-session/index.d.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/types/koa-session/index.d.ts b/types/koa-session/index.d.ts
index 8650a07d91..d2561d61e2 100644
--- a/types/koa-session/index.d.ts
+++ b/types/koa-session/index.d.ts
@@ -156,6 +156,11 @@ declare namespace session {
          */
         rolling?: boolean;
 
+        /**
+         * Renew session when session is nearly expired, so we can always keep user logged in. (default is false)
+         */
+        renew?: boolean;
+
         /**
          * You can store the session content in external stores(redis, mongodb or other DBs)
          */

From 26ff8e3b857cbe1e26699d527ae467f4de739348 Mon Sep 17 00:00:00 2001
From: Remko <Remko.Boschker@topicus.nl>
Date: Mon, 26 Mar 2018 11:54:43 +0200
Subject: [PATCH 0843/1382] updates c3 to use d3 v4

---
 types/c3/index.d.ts    | 71 +++++++++++++++++++++++++-----------------
 types/c3/tsconfig.json | 20 +++---------
 2 files changed, 47 insertions(+), 44 deletions(-)

diff --git a/types/c3/index.d.ts b/types/c3/index.d.ts
index 28f301237c..6b3968eeec 100644
--- a/types/c3/index.d.ts
+++ b/types/c3/index.d.ts
@@ -28,7 +28,7 @@ export interface ChartConfiguration {
      * Note: When chart is not binded, c3 starts observing if chart.element is binded by MutationObserver. In this case, polyfill is required in IE9 and IE10 becuase they do not support
      * MutationObserver. On the other hand, if chart always will be binded, polyfill will not be required because MutationObserver will never be called.
      */
-    bindto?: string | HTMLElement | d3.Selection<any> | null;
+    bindto?: string | HTMLElement | d3.Selection<any, any, any, any> | null;
     size?: {
         /**
          * The desired width of the chart element.
@@ -172,16 +172,18 @@ export interface ChartConfiguration {
         /**
          * Change the width of bar chart. If ratio is specified, change the width of bar chart by ratio.
          */
-        width?: number | {
-            /**
-             * Set the width of each bar by ratio
-             */
-            ratio: number,
-            /**
-             * Set max width of each bar
-             */
-            max?: number
-        };
+        width?:
+            | number
+            | {
+                  /**
+                   * Set the width of each bar by ratio
+                   */
+                  ratio: number;
+                  /**
+                   * Set max width of each bar
+                   */
+                  max?: number;
+              };
         /**
          * Set if min or max value will be 0 on bar chart.
          */
@@ -205,7 +207,7 @@ export interface ChartConfiguration {
             /**
              * Set threshold to show/hide labels.
              */
-            threshold?: number
+            threshold?: number;
         };
         /**
          * Enable or disable expanding pie pieces.
@@ -226,7 +228,7 @@ export interface ChartConfiguration {
             /**
              * Set threshold to show/hide labels.
              */
-            threshold?: number
+            threshold?: number;
         };
         /**
          * Enable or disable expanding pie pieces.
@@ -280,7 +282,17 @@ export interface ChartConfiguration {
             /**
              * Set custom spline interpolation
              */
-            type?: 'linear' | 'linear-closed' | 'basis' | 'basis-open' | 'basis-closed' | 'bundle' | 'cardinal' | 'cardinal-open' | 'cardinal-closed' | 'monotone';
+            type?:
+                | "linear"
+                | "linear-closed"
+                | "basis"
+                | "basis-open"
+                | "basis-closed"
+                | "bundle"
+                | "cardinal"
+                | "cardinal-open"
+                | "cardinal-closed"
+                | "monotone";
         };
     };
 }
@@ -309,7 +321,7 @@ export interface Data {
     /**
      * Choose which JSON object keys correspond to desired data.
      */
-    keys?: { x?: string; value: string[]; };
+    keys?: { x?: string; value: string[] };
     /**
      * Specify the key of x values in the data.
      * We can show the data with non-index x values by this option. This option is required when the type of x axis is timeseries. If this option is set on category axis, the values of the data
@@ -365,9 +377,7 @@ export interface Data {
      * - j is the sub index of the data point where the label is shown.
      * Formatter function can be defined for each data by specifying as an object and D3 formatter function can be set (e.g. d3.format('$'))
      */
-    labels?: boolean |
-    { format: FormatFunction } |
-    { format: { [key: string]: FormatFunction } };
+    labels?: boolean | { format: FormatFunction } | { format: { [key: string]: FormatFunction } };
     /**
      * Define the order of the data.
      * This option changes the order of stacking the data and pieces of pie/donut. If null specified, it will be the order the data loaded. If function specified, it will be used to sort the data
@@ -387,11 +397,11 @@ export interface Data {
      * This option should a function and the specified function receives color (e.g. '#ff0000') and d that has data parameters like id, value, index, etc. And it must return a string that
      * represents color (e.g. '#00ff00').
      */
-    color?(color: string, d: any): string | d3.Rgb;
+    color?(color: string, d: any): string | d3.RGBColor;
     /**
      * Set color for each data.
      */
-    colors?: { [key: string]: string | d3.Rgb | ((d: any) => string | d3.Rgb) };
+    colors?: { [key: string]: string | d3.RGBColor | ((d: any) => string | d3.RGBColor) };
     /**
      * Hide each data when the chart appears.
      * If true specified, all of data will be hidden. If multiple ids specified as an array, those will be hidden.
@@ -813,7 +823,7 @@ export interface PointOptions {
             /**
              * The radius size of each point on focus.
              */
-            r?: number
+            r?: number;
         };
     };
 
@@ -877,7 +887,7 @@ export interface ChartAPI {
     load(args: {
         url?: string;
         json?: {};
-        keys?: { x?: string; value: string[]; }
+        keys?: { x?: string; value: string[] };
         rows?: PrimitiveArray[];
         columns?: PrimitiveArray[];
         xs?: { [key: string]: string };
@@ -885,7 +895,7 @@ export interface ChartAPI {
         classes?: { [key: string]: string };
         categories?: string[];
         axes?: { [key: string]: string };
-        colors?: { [key: string]: string | d3.Rgb };
+        colors?: { [key: string]: string | d3.RGBColor };
         type?: string;
         types?: { [key: string]: string };
         unload?: boolean | ArrayOrString;
@@ -911,7 +921,7 @@ export interface ChartAPI {
      */
     flow(args: {
         json?: {};
-        keys?: { x?: string; value: string[]; }
+        keys?: { x?: string; value: string[] };
         rows?: PrimitiveArray[];
         columns?: PrimitiveArray[];
         to?: any;
@@ -997,7 +1007,7 @@ export interface ChartAPI {
          * Get and set colors of the data loaded in the chart.
          * @param colors If this argument is given, the colors of data will be updated. If not given, the current colors will be returned. The format of this argument is the same as data.colors.
          */
-        colors(colors?: { [key: string]: string | d3.Rgb }): { [key: string]: string };
+        colors(colors?: { [key: string]: string | d3.RGBColor }): { [key: string]: string };
         /**
          * Get and set axes of the data loaded in the chart.
          * @param axes If this argument is given, the axes of data will be updated. If not given, the current axes will be returned. The format of this argument is the same as data.axes.
@@ -1040,22 +1050,25 @@ export interface ChartAPI {
          * Get and set axis labels.
          * @param labels If labels is given, specified axis' label will be updated.
          */
-        labels(labels?: { [key: string]: string }): { [key: string]: string }
+        labels(labels?: { [key: string]: string }): { [key: string]: string };
         /**
          * Get and set axis min value.
          * @param min If min is given, specified axis' min value will be updated. If no argument is given, the current min values for each axis will be returned.
          */
-        min(min?: number | { [key: string]: number }): number | { [key: string]: number }
+        min(min?: number | { [key: string]: number }): number | { [key: string]: number };
         /**
          * Get and set axis max value.
          * @param max If max is given, specified axis' max value will be updated. If no argument is given, the current max values for each axis will be returned.
          */
-        max(max?: number | { [key: string]: number }): number | { [key: string]: number }
+        max(max?: number | { [key: string]: number }): number | { [key: string]: number };
         /**
          * Get and set axis min and max value.
          * @param range If range is given, specified axis' min and max value will be updated. If no argument is given, the current min and max values for each axis will be returned.
          */
-        range(range?: { min?: number | { [key: string]: number }; max?: number | { [key: string]: number } }): { min: number | { [key: string]: number }; max: number | { [key: string]: number } }
+        range(range?: {
+            min?: number | { [key: string]: number };
+            max?: number | { [key: string]: number };
+        }): { min: number | { [key: string]: number }; max: number | { [key: string]: number } };
     };
 
     legend: {
diff --git a/types/c3/tsconfig.json b/types/c3/tsconfig.json
index fe3b00c503..6576ec1ed6 100644
--- a/types/c3/tsconfig.json
+++ b/types/c3/tsconfig.json
@@ -1,29 +1,19 @@
 {
     "compilerOptions": {
         "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
+        "lib": ["es6", "dom"],
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
         "strictFunctionTypes": false,
         "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
+        "typeRoots": ["../"],
         "types": [],
         "paths": {
-            "d3": [
-                "d3/v3"
-            ]
+            "d3": ["d3/v4"]
         },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
-    "files": [
-        "index.d.ts",
-        "c3-tests.ts"
-    ]
-}
\ No newline at end of file
+    "files": ["index.d.ts", "c3-tests.ts"]
+}

From f4b0597fd67f8c404ab1c40d2ef9b2c2fb625687 Mon Sep 17 00:00:00 2001
From: Remko <Remko.Boschker@topicus.nl>
Date: Mon, 26 Mar 2018 12:02:14 +0200
Subject: [PATCH 0844/1382] updates dependencies

---
 types/c3/index.d.ts    | 4 ++--
 types/c3/tsconfig.json | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/types/c3/index.d.ts b/types/c3/index.d.ts
index 6b3968eeec..a1dfaaf8f0 100644
--- a/types/c3/index.d.ts
+++ b/types/c3/index.d.ts
@@ -1,11 +1,11 @@
-// Type definitions for C3js 0.4
+// Type definitions for C3js 0.5
 // Project: http://c3js.org/
 // Definitions by: Marc Climent <https://github.com/mcliment>
 //                 Gerin Jacob <https://github.com/gerinjacob>
 //                 Bernd Hacker <https://github.com/denyo>
 //                 Dzmitry Shyndzin <https://github.com/dmitryshindin>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.1
+// TypeScript Version: 2.3
 
 import * as d3 from "d3";
 
diff --git a/types/c3/tsconfig.json b/types/c3/tsconfig.json
index 6576ec1ed6..aa923e91c0 100644
--- a/types/c3/tsconfig.json
+++ b/types/c3/tsconfig.json
@@ -10,6 +10,7 @@
         "typeRoots": ["../"],
         "types": [],
         "paths": {
+            "d3-scale": ["d3-scale/v1"],
             "d3": ["d3/v4"]
         },
         "noEmit": true,

From 20981072a3c2c15367c4e56f52ac69c3032f2eab Mon Sep 17 00:00:00 2001
From: Jackson Delahunt <jackson@jacksondelahunt.com>
Date: Mon, 26 Mar 2018 21:42:12 +1000
Subject: [PATCH 0845/1382] update tests

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

diff --git a/types/archiver/archiver-tests.ts b/types/archiver/archiver-tests.ts
index 752d9cc944..dbb1df1de7 100644
--- a/types/archiver/archiver-tests.ts
+++ b/types/archiver/archiver-tests.ts
@@ -64,6 +64,6 @@ archiver.setModule(() => {});
 archiver.pointer();
 archiver.use(() => {});
 
-archiver.finalize().then();
+archiver.finalize();
 
 archiver.symlink('./path', './target');

From 950988652bdeac071a88dbf383742564ea2808b1 Mon Sep 17 00:00:00 2001
From: ohbarye <over.rye@gmail.com>
Date: Mon, 26 Mar 2018 20:10:12 +0900
Subject: [PATCH 0846/1382] yup: Fix TestOptions to accept Promise<boolean>

https://github.com/jquense/yup/issues/7#issuecomment-100676450
---
 types/yup/index.d.ts   | 4 ++--
 types/yup/yup-tests.ts | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/types/yup/index.d.ts b/types/yup/index.d.ts
index c8c3f2dda4..93a60450e7 100644
--- a/types/yup/index.d.ts
+++ b/types/yup/index.d.ts
@@ -51,7 +51,7 @@ export interface Schema<T> {
     oneOf(arrayOfValues: any[], message?: string): this;
     notOneOf(arrayOfValues: any[], message?: string): this;
     when(keys: string | any[], builder: WhenOptions<this>): this;
-    test(name: string, message: string, test: (value?: any) => boolean, callbackStyleAsync?: boolean): this;
+    test(name: string, message: string, test: (value?: any) => boolean | Promise<boolean>, callbackStyleAsync?: boolean): this;
     test(options: TestOptions): this;
     transform(fn: TransformFunction<this>): this;
 }
@@ -190,7 +190,7 @@ export interface TestOptions {
     /**
      * Test function, determines schema validity
      */
-    test: (value: any) => boolean;
+    test: (value: any) => boolean | Promise<boolean>;
 
     /**
      * The validation error message
diff --git a/types/yup/yup-tests.ts b/types/yup/yup-tests.ts
index 0c0aa04c47..83e17abe3e 100644
--- a/types/yup/yup-tests.ts
+++ b/types/yup/yup-tests.ts
@@ -123,6 +123,7 @@ mixed.test({
     message: '${path} must be less than 5 characters',
     test: value => value == null || value.length <= 5
 });
+mixed.test('with-promise', 'It contains invalid value', value => new Promise(resolve => true));
 
 yup.string().transform(function(this, value: any, originalvalue: any) {
     return this.isType(value) && value !== null ? value.toUpperCase() : value;
@@ -252,6 +253,14 @@ const testOptions: TestOptions = {
     exclusive: true
 };
 
+const testOptionsWithPromise: TestOptions = {
+    name: 'name',
+    test: value => new Promise(resolve => true),
+    message: 'validation error message',
+    params: { param1: 'value'},
+    exclusive: true
+};
+
 const validateOptions: ValidateOptions = {
     strict: true,
     abortEarly: true,

From 6b2795e39eac4c2cd15fe184201d8bbbe2bdb39b Mon Sep 17 00:00:00 2001
From: Menushka Weeratunga <tmweeratunga@gmail.com>
Date: Mon, 26 Mar 2018 08:28:03 -0400
Subject: [PATCH 0847/1382] Made proposed changes

---
 .../fbinstant-tests.ts                        |  4 +-
 .../index.d.ts                                | 80 +++++++++----------
 .../tsconfig.json                             |  0
 types/facebook-instant-games/tslint.json      |  1 +
 types/fbinstant/tslint.json                   |  8 --
 5 files changed, 41 insertions(+), 52 deletions(-)
 rename types/{fbinstant => facebook-instant-games}/fbinstant-tests.ts (95%)
 rename types/{fbinstant => facebook-instant-games}/index.d.ts (76%)
 rename types/{fbinstant => facebook-instant-games}/tsconfig.json (100%)
 create mode 100644 types/facebook-instant-games/tslint.json
 delete mode 100644 types/fbinstant/tslint.json

diff --git a/types/fbinstant/fbinstant-tests.ts b/types/facebook-instant-games/fbinstant-tests.ts
similarity index 95%
rename from types/fbinstant/fbinstant-tests.ts
rename to types/facebook-instant-games/fbinstant-tests.ts
index f4a72ea70e..8d33e2c970 100644
--- a/types/fbinstant/fbinstant-tests.ts
+++ b/types/facebook-instant-games/fbinstant-tests.ts
@@ -1,6 +1,4 @@
-declare const FBInstant: FBInstant;
-
-export class FBInstantTest {
+class FBInstantTest {
     winStreak: number;
 
     init() {
diff --git a/types/fbinstant/index.d.ts b/types/facebook-instant-games/index.d.ts
similarity index 76%
rename from types/fbinstant/index.d.ts
rename to types/facebook-instant-games/index.d.ts
index 9b337bbc5e..4239c134fb 100644
--- a/types/fbinstant/index.d.ts
+++ b/types/facebook-instant-games/index.d.ts
@@ -1,40 +1,38 @@
-// Type definitions for FBInstant 6.1
+// Type definitions for facebook-instant-games 6.1
 // Project: https://developers.facebook.com/docs/games/instant-games
 // Definitions by: Menushka Weeratunga <https://github.com/menushka>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare class FBInstant {
-    player: FBInstant.Player;
-    context: FBInstant.Context;
-    payments: FBInstant.Payments;
-
-    getLocale(): string;
-    getPlatform(): string;
-    getSDKVersion(): string;
-    initializeAsync(): Promise<any>;
-    setLoadingProgress(progress: number): void;
-    getSupportedAPIs(): string[];
-    getEntryPointData(): any;
-    getEntryPointAsync(): Promise<string>;
-    setSessionData(sessionData: any): void;
-    startGameAsync(): Promise<any>;
-    shareAsync(payload: FBInstant.SharePayload): Promise<void>;
-    updateAsync(payload: FBInstant.UpdatePayload): Promise<void>;
-    switchGameAsync(appID: string, data: string): Promise<void>;
-    canCreateShortcutAsync(): Promise<boolean>;
-    createShortcutAsync(): Promise<void>;
-    quit(): void;
-    logEvent(eventName: string, valueToSum?: number, parameter?: any): FBInstant.APIError;
-    onPause(func: () => void): void;
-    getInterstitialAdAsync(placementID: string): Promise<FBInstant.AdInstance>;
-    getRewardedVideoAsync(placementID: string): Promise<FBInstant.AdInstance>;
-    matchPlayerAsync(matchTag: string, switchContextWhenMatched?: boolean): Promise<void>;
-    checkCanPlayerMatchAsync(): Promise<boolean>;
-    getLeaderboardAsync(name: string): Promise<FBInstant.Leaderboard>;
-}
-
 declare namespace FBInstant {
-    class Player {
+    let player: Player;
+    let context: Context;
+    let payments: Payments;
+
+    function getLocale(): string;
+    function getPlatform(): string;
+    function getSDKVersion(): string;
+    function initializeAsync(): Promise<any>;
+    function setLoadingProgress(progress: number): void;
+    function getSupportedAPIs(): string[];
+    function getEntryPointData(): any;
+    function getEntryPointAsync(): Promise<string>;
+    function setSessionData(sessionData: any): void;
+    function startGameAsync(): Promise<any>;
+    function shareAsync(payload: SharePayload): Promise<void>;
+    function updateAsync(payload: UpdatePayload): Promise<void>;
+    function switchGameAsync(appID: string, data: string): Promise<void>;
+    function canCreateShortcutAsync(): Promise<boolean>;
+    function createShortcutAsync(): Promise<void>;
+    function quit(): void;
+    function logEvent(eventName: string, valueToSum?: number, parameter?: any): APIError;
+    function onPause(func: () => void): void;
+    function getInterstitialAdAsync(placementID: string): Promise<AdInstance>;
+    function getRewardedVideoAsync(placementID: string): Promise<AdInstance>;
+    function matchPlayerAsync(matchTag: string, switchContextWhenMatched?: boolean): Promise<void>;
+    function checkCanPlayerMatchAsync(): Promise<boolean>;
+    function getLeaderboardAsync(name: string): Promise<Leaderboard>;
+
+    interface Player {
         getID(): string;
         getSignedPlayerInfoAsync(requestPayload: string): Promise<SignedPlayerInfo>;
         canSubscribeBotAsync(): Promise<boolean>;
@@ -50,7 +48,7 @@ declare namespace FBInstant {
         getConnectedPlayersAsync(): Promise<ConnectedPlayer[]>;
     }
 
-    class Context {
+    interface Context {
         getID(): string;
         getType(): Type;
         isSizeBetween(minSize: number, maxSize: number): ContextSizeResponse;
@@ -60,7 +58,7 @@ declare namespace FBInstant {
         getPlayersAsync(): Promise<ContextPlayer[]>;
     }
 
-    class Leaderboard {
+    interface Leaderboard {
         getName(): string;
         getContextID(): string;
         getEntryCountAsync(): Promise<number>;
@@ -69,7 +67,7 @@ declare namespace FBInstant {
         getEntriesAsync(count: number, offset: number): Promise<LeaderboardEntry[]>;
     }
 
-    class LeaderboardEntry {
+    interface LeaderboardEntry {
         getScore(): number;
         getFormattedScore(): string;
         getTimestamp(): number;
@@ -78,36 +76,36 @@ declare namespace FBInstant {
         getPlayer(): LeaderboardPlayer;
     }
 
-    class LeaderboardPlayer {
+    interface LeaderboardPlayer {
         getName(): string;
         getPhoto(): string;
         getID(): string;
     }
 
-    class ConnectedPlayer {
+    interface ConnectedPlayer {
         getID(): string;
         getName(): string;
         getPhoto(): string;
     }
 
-    class SignedPlayerInfo {
+    interface SignedPlayerInfo {
         getPlayerID(): string;
         getSignature(): string;
     }
 
-    class ContextPlayer {
+    interface ContextPlayer {
         getID(): string;
         getName(): string;
         getPhoto(): string;
     }
 
-    class AdInstance {
+    interface AdInstance {
         getPlacementID(): string;
         loadAsync(): Promise<void>;
         showAsync(): Promise<void>;
     }
 
-    class Payments {
+    interface Payments {
         purchaseAsync(purchaseConfig: PurchaseConfig): Promise<Purchase>;
         getPurchasesAsync(): Promise<Purchase[]>;
         consumePurchaseAsync(purchaseToken: string): Promise<void>;
diff --git a/types/fbinstant/tsconfig.json b/types/facebook-instant-games/tsconfig.json
similarity index 100%
rename from types/fbinstant/tsconfig.json
rename to types/facebook-instant-games/tsconfig.json
diff --git a/types/facebook-instant-games/tslint.json b/types/facebook-instant-games/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/facebook-instant-games/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/fbinstant/tslint.json b/types/fbinstant/tslint.json
deleted file mode 100644
index 71918edac3..0000000000
--- a/types/fbinstant/tslint.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-        // Needs to be declares as it cannot be imported in typescript
-        // using the standard import statement
-        "strict-export-declare-modifiers": false
-    }
-}

From 5e0d0d49a3573bc0aab9b245b30fe6c431f147c4 Mon Sep 17 00:00:00 2001
From: Firede <firede@firede.us>
Date: Mon, 26 Mar 2018 21:35:59 +0800
Subject: [PATCH 0848/1382] info.fieldName is readonly, see
 https://github.com/graphql/graphql-js/blob/v0.13.2/src/type/definition.js#L808

---
 types/graphql-relay/graphql-relay-tests.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/types/graphql-relay/graphql-relay-tests.ts b/types/graphql-relay/graphql-relay-tests.ts
index 6cc1f0f5ce..cebc90e2ca 100644
--- a/types/graphql-relay/graphql-relay-tests.ts
+++ b/types/graphql-relay/graphql-relay-tests.ts
@@ -44,7 +44,7 @@ backwardConnectionArgs.before = "b";
 backwardConnectionArgs.last = 10;
 // connectionDefinitions returns a connectionType and its associated edgeType, given a node type.
 const resolve: GraphQLFieldResolver<any, any> = (source, args, context, info) => {
-    info.fieldName = "f";
+    context.flag = "f";
 };
 const fields: GraphQLFieldConfigMap<any, any> = {};
 let t: GraphQLObjectType;
@@ -118,10 +118,10 @@ const resolver: GraphQLTypeResolver<any, any> = () => {
         fields: {},
     });
 };
-const idFetcher = (id: string, context: number, info: GraphQLResolveInfo) => {
-    info.fieldName = "f";
+const idFetcher = (id: string, context: any, info: GraphQLResolveInfo) => {
+    context.flag = "f";
 };
-const nodeDef = nodeDefinitions<number>(idFetcher, resolver);
+const nodeDef = nodeDefinitions<any>(idFetcher, resolver);
 const nodeFieldConfig: GraphQLFieldConfig<any, any> = nodeDef.nodeField;
 const nodesFieldConfig: GraphQLFieldConfig<any, any> = nodeDef.nodesField;
 const interfaceType: GraphQLInterfaceType = nodeDef.nodeInterface;
@@ -183,10 +183,10 @@ mutationWithClientMutationId({
     inputFields: gifcm,
     mutateAndGetPayload: (
         object: any,
-        ctx: any,
+        context: any,
         info: GraphQLResolveInfo) => {
         return new Promise<string>((resolve) => {
-            resolve(info.fieldName);
+            resolve(context.flag);
         });
     },
     outputFields: gfcm,

From 7b6d712a235710822a0c1f15be2e36cee7fc53c5 Mon Sep 17 00:00:00 2001
From: Menushka Weeratunga <tmweeratunga@gmail.com>
Date: Mon, 26 Mar 2018 09:38:39 -0400
Subject: [PATCH 0849/1382] Renamed test file

---
 .../{fbinstant-tests.ts => facebook-instant-games-tests.ts}     | 0
 types/facebook-instant-games/tsconfig.json                      | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename types/facebook-instant-games/{fbinstant-tests.ts => facebook-instant-games-tests.ts} (100%)

diff --git a/types/facebook-instant-games/fbinstant-tests.ts b/types/facebook-instant-games/facebook-instant-games-tests.ts
similarity index 100%
rename from types/facebook-instant-games/fbinstant-tests.ts
rename to types/facebook-instant-games/facebook-instant-games-tests.ts
diff --git a/types/facebook-instant-games/tsconfig.json b/types/facebook-instant-games/tsconfig.json
index 7cb5ffc8ae..5f1b7e6ccd 100644
--- a/types/facebook-instant-games/tsconfig.json
+++ b/types/facebook-instant-games/tsconfig.json
@@ -18,6 +18,6 @@
     },
     "files": [
         "index.d.ts",
-        "fbinstant-tests.ts"
+        "facebook-instant-games-tests.ts"
     ]
 }

From b34df70d54055f068afe1adad360674b7d4fb6c0 Mon Sep 17 00:00:00 2001
From: Firede <firede@firede.us>
Date: Mon, 26 Mar 2018 22:02:02 +0800
Subject: [PATCH 0850/1382] `parentType: GraphQLObjectType`, see
 https://github.com/graphql/graphql-js/pull/1033

---
 types/graphql-list-fields/graphql-list-fields-tests.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/types/graphql-list-fields/graphql-list-fields-tests.ts b/types/graphql-list-fields/graphql-list-fields-tests.ts
index 7624a3cbd8..ee9bcc6851 100644
--- a/types/graphql-list-fields/graphql-list-fields-tests.ts
+++ b/types/graphql-list-fields/graphql-list-fields-tests.ts
@@ -2,7 +2,6 @@ import getFieldNames = require("graphql-list-fields");
 
 import {
     GraphQLID,
-    GraphQLInterfaceType,
     GraphQLObjectType,
     GraphQLResolveInfo,
     GraphQLSchema,
@@ -13,7 +12,7 @@ const sampleGraphQLResolveInfo: GraphQLResolveInfo = {
     fieldName: "",
     fieldNodes: [],
     returnType: GraphQLString,
-    parentType: new GraphQLInterfaceType({
+    parentType: new GraphQLObjectType({
         name: "Sample",
         fields: {
             name: { type: GraphQLString }

From b1b96d8190db1382f29db9593da1a494010bfe2e Mon Sep 17 00:00:00 2001
From: Menushka Weeratunga <tmweeratunga@gmail.com>
Date: Mon, 26 Mar 2018 10:32:39 -0400
Subject: [PATCH 0851/1382] Added missing optional tags

---
 types/facebook-instant-games/index.d.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/types/facebook-instant-games/index.d.ts b/types/facebook-instant-games/index.d.ts
index 4239c134fb..82ea96e1f6 100644
--- a/types/facebook-instant-games/index.d.ts
+++ b/types/facebook-instant-games/index.d.ts
@@ -20,7 +20,7 @@ declare namespace FBInstant {
     function startGameAsync(): Promise<any>;
     function shareAsync(payload: SharePayload): Promise<void>;
     function updateAsync(payload: UpdatePayload): Promise<void>;
-    function switchGameAsync(appID: string, data: string): Promise<void>;
+    function switchGameAsync(appID: string, data?: string): Promise<void>;
     function canCreateShortcutAsync(): Promise<boolean>;
     function createShortcutAsync(): Promise<void>;
     function quit(): void;
@@ -28,7 +28,7 @@ declare namespace FBInstant {
     function onPause(func: () => void): void;
     function getInterstitialAdAsync(placementID: string): Promise<AdInstance>;
     function getRewardedVideoAsync(placementID: string): Promise<AdInstance>;
-    function matchPlayerAsync(matchTag: string, switchContextWhenMatched?: boolean): Promise<void>;
+    function matchPlayerAsync(matchTag?: string, switchContextWhenMatched?: boolean): Promise<void>;
     function checkCanPlayerMatchAsync(): Promise<boolean>;
     function getLeaderboardAsync(name: string): Promise<Leaderboard>;
 
@@ -39,10 +39,10 @@ declare namespace FBInstant {
         subscribeBotAsync(): Promise<void>;
         getName(): string;
         getPhoto(): string;
-        getDataAsync(keys: string[]): Promise<DataObject>;
+        getDataAsync(keys?: string[]): Promise<DataObject>;
         setDataAsync(data: DataObject): Promise<void>;
         flushDataAsync(): Promise<void>;
-        getStatsAsync(keys: string[]): Promise<StatsObject>;
+        getStatsAsync(keys?: string[]): Promise<StatsObject>;
         setStatsAsync(stats: StatsObject): Promise<void>;
         incrementStatsAsync(increments: IncrementObject): Promise<StatsObject>;
         getConnectedPlayersAsync(): Promise<ConnectedPlayer[]>;

From a9c9972d1e7be73f60b9d6095d6986d5b0274d15 Mon Sep 17 00:00:00 2001
From: Jovica Zoric <zoricjovica@gmail.com>
Date: Mon, 26 Mar 2018 16:44:37 +0200
Subject: [PATCH 0852/1382] Fix typo

---
 types/react-sortable-tree/index.d.ts                    | 4 ++--
 types/react-sortable-tree/react-sortable-tree-tests.tsx | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/types/react-sortable-tree/index.d.ts b/types/react-sortable-tree/index.d.ts
index 345bd3c601..0a0efc7f31 100644
--- a/types/react-sortable-tree/index.d.ts
+++ b/types/react-sortable-tree/index.d.ts
@@ -51,7 +51,7 @@ export interface ExtendedNodeData extends NodeData {
 export interface OnVisibilityToggleData extends FullTree, TreeNode {
     expanded: boolean;
 }
-export interface PreviousAnNextLocation {
+export interface PreviousAndNextLocation {
     prevTreeIndex: number;
     prevPath: number[];
     nextTreeIndex: number;
@@ -112,7 +112,7 @@ export interface ReactSortableTreeProps {
     onMoveNode?(data: NodeData & FullTree): void;
     onVisibilityToggle?(data: OnVisibilityToggleData): void;
     canDrag?: ((data: ExtendedNodeData) => boolean) | boolean;
-    canDrop?(data: PreviousAnNextLocation & NodeData): boolean;
+    canDrop?(data: PreviousAndNextLocation & NodeData): boolean;
     reactVirtualizedListProps?: ListProps;
     rowHeight?: ((info: Index) => number) | number;
     slideRegionSize?: number;
diff --git a/types/react-sortable-tree/react-sortable-tree-tests.tsx b/types/react-sortable-tree/react-sortable-tree-tests.tsx
index 154a7284c6..d67e6ad123 100644
--- a/types/react-sortable-tree/react-sortable-tree-tests.tsx
+++ b/types/react-sortable-tree/react-sortable-tree-tests.tsx
@@ -11,7 +11,7 @@ import SortableTree,
         ExtendedNodeData,
         FullTree,
         OnVisibilityToggleData,
-        PreviousAnNextLocation,
+        PreviousAndNextLocation,
         PlaceholderRendererProps
     } from "react-sortable-tree";
 import { ListProps, ListRowRenderer } from "react-virtualized";
@@ -55,7 +55,7 @@ class Test extends React.Component {
                     onMoveNode={(data: NodeData & FullTree) => {}}
                     onVisibilityToggle={(data: OnVisibilityToggleData) => {}}
                     canDrag={true}
-                    canDrop={(data: PreviousAnNextLocation & NodeData) => true}
+                    canDrop={(data: PreviousAndNextLocation & NodeData) => true}
                     reactVirtualizedListProps={reactVirtualizedListProps}
                     rowHeight={62}
                     slideRegionSize={100}

From 4f8a5c46b7e003f5a694c4817f23c0c50f897e0a Mon Sep 17 00:00:00 2001
From: Menushka Weeratunga <tmweeratunga@gmail.com>
Date: Mon, 26 Mar 2018 11:46:11 -0400
Subject: [PATCH 0853/1382] Minor fixes

---
 types/facebook-instant-games/index.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/facebook-instant-games/index.d.ts b/types/facebook-instant-games/index.d.ts
index 82ea96e1f6..1e8a8d76fd 100644
--- a/types/facebook-instant-games/index.d.ts
+++ b/types/facebook-instant-games/index.d.ts
@@ -19,7 +19,7 @@ declare namespace FBInstant {
     function setSessionData(sessionData: any): void;
     function startGameAsync(): Promise<any>;
     function shareAsync(payload: SharePayload): Promise<void>;
-    function updateAsync(payload: UpdatePayload): Promise<void>;
+    function updateAsync(payload: UpdatePayload | LeaderboardUpdatePayload): Promise<void>;
     function switchGameAsync(appID: string, data?: string): Promise<void>;
     function canCreateShortcutAsync(): Promise<boolean>;
     function createShortcutAsync(): Promise<void>;
@@ -183,7 +183,7 @@ declare namespace FBInstant {
 
     interface DataObject { [ key: string ]: string | number; }
 
-    interface StatsObject { [ key: string ]: string | number; }
+    interface StatsObject { [ key: string ]: number; }
 
     interface IncrementObject { [ key: string ]: number; }
 

From 68c613f2f5ec4c105c66199ab340f72bcd9c36c0 Mon Sep 17 00:00:00 2001
From: Pedro Antonio Souza Viegas <pedroasv@gmail.com>
Date: Mon, 26 Mar 2018 14:12:24 -0300
Subject: [PATCH 0854/1382] Adding Payments Lite Dialog params

Hi! I am adding the dialog params for payments lite as it is different from normal payment ui params.
---
 types/facebook-js-sdk/index.d.ts | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/types/facebook-js-sdk/index.d.ts b/types/facebook-js-sdk/index.d.ts
index c380ee004d..4676cbf0fc 100644
--- a/types/facebook-js-sdk/index.d.ts
+++ b/types/facebook-js-sdk/index.d.ts
@@ -66,6 +66,11 @@ declare namespace facebook {
          */
         ui(params: PayDialogParams, callback: (response: PayDialogResponse) => void): void;
 
+		/**
+         * @see https://developers.facebook.com/docs/games_payments/payments_lite
+         */
+        ui(params: PaymentsLiteDialogParams, callback: (response: PaymentsLiteDialogResponse) => void): void;
+		
         /**
          * @see https://developers.facebook.com/docs/videos/live-video/exploring-live
          */
@@ -154,6 +159,14 @@ declare namespace facebook {
         request_id?: string;
         test_currency?: string;
     }
+	
+	interface PaymentsLiteDialogParams extends DialogParams {
+        method: 'pay';
+        action: 'purchaseiap';
+        product_id: string;
+        developer_payload?: string;
+		quantity?: number;
+    }
 
     interface LiveDialogParams extends DialogParams {
         method: 'live_broadcast';
@@ -199,6 +212,17 @@ declare namespace facebook {
         signed_request: string;
     }
 
+	interface PaymentsLiteDialogResponse {
+        developer_payload?: string;
+        payment_id: number;
+        product_id?: string;
+        purchase_time?: number;
+        purchase_token?: string;
+        signed_request?: string;
+		error_code?: number; 
+		error_message?: string;
+    }
+	
     interface LiveDialogResponse {
         id: string;
         stream_url: string;

From 5177c3bf93bf60ce3df9e6534b2e265dc50bee71 Mon Sep 17 00:00:00 2001
From: Justin Beckwith <justin.beckwith@gmail.com>
Date: Mon, 26 Mar 2018 11:16:08 -0700
Subject: [PATCH 0855/1382] Add `fn` to `is`

---
 types/is/index.d.ts  | 21 ++++++++++++++++++---
 types/is/is-tests.ts |  6 ++++++
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/types/is/index.d.ts b/types/is/index.d.ts
index b61bd6deee..3b70472d65 100644
--- a/types/is/index.d.ts
+++ b/types/is/index.d.ts
@@ -32,6 +32,11 @@ interface IsStatic {
      */
     error(value: any): boolean;
 
+    /**
+     * Checks if the given value type is function.
+     */
+    fn(value: any): boolean;
+
     /**
      * Checks if the given value type is function.
      */
@@ -587,7 +592,7 @@ interface IsStaticApi {
      * Checks if the given value type is arguments.
      */
     arguments(...value: any[]): boolean;
-    
+
     /**
      * Checks if the given value type is arguments.
      */
@@ -633,6 +638,16 @@ interface IsStaticApi {
      */
     error(value: any[]): boolean;
 
+    /**
+     * Checks if the given value type is function.
+     */
+    fn(...value: any[]): boolean;
+
+    /**
+     * Checks if the given value type is function.
+     */
+    fn(value: any[]): boolean;
+
     /**
      * Checks if the given value type is function.
      */
@@ -1234,12 +1249,12 @@ interface Is extends IsStatic {
      * Override RegExps if you think they suck.
      */
     setRegexp(value: RegExp, regexp: 'url'): boolean;
-    
+
     /**
      * Override RegExps if you think they suck.
      */
     setRegexp(value: RegExp, regexp: 'email'): boolean;
-    
+
     /**
      * Override RegExps if you think they suck.
      */
diff --git a/types/is/is-tests.ts b/types/is/is-tests.ts
index 674d5ff761..0084de8990 100644
--- a/types/is/is-tests.ts
+++ b/types/is/is-tests.ts
@@ -36,6 +36,12 @@ is.all.error(new Error(), 'bar');
 is.any.error(new Error(), 'bar');
 is.all.error([new Error(), 'foo', 'bar']);
 
+is.fn(toString);
+is.not.fn({ foo: 'bar' });
+is.all.fn(toString, 'bar');
+is.any.fn(toString, 'bar');
+is.all.fn([toString, 'foo', 'bar']);
+
 is.function(toString);
 is.not.function({ foo: 'bar' });
 is.all.function(toString, 'bar');

From f41730728dd0fd4b0dac956c15553bec442073b8 Mon Sep 17 00:00:00 2001
From: Daniel Almaguer <daniel.almaguer@bigcommerce.com>
Date: Mon, 26 Mar 2018 14:25:03 -0500
Subject: [PATCH 0856/1382] navigo: update lastRouteResolved

---
 types/navigo/index.d.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/navigo/index.d.ts b/types/navigo/index.d.ts
index ebc0ecb8c5..30fb656d45 100644
--- a/types/navigo/index.d.ts
+++ b/types/navigo/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/krasimir/navigo
 // Definitions by: Adrian Ehrsam <https://github.com/aersamkull>
 //                 Dancespiele <https://github.com/dancespiele>
+//                 Daniel Almaguer <https://github.com/deini>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
@@ -53,7 +54,7 @@ declare class Navigo {
 
     link(path: string): string;
 
-    lastRouteResolved(): {url: string, query: string};
+    lastRouteResolved(): {url: string, query: string, hooks: NavigoHooks, params?: Params, name?: string};
 
     disableIfAPINotAvailable(): void;
 

From 2224db8ee54ee35869eb714f18bdc6959e710712 Mon Sep 17 00:00:00 2001
From: Pedro Antonio Souza Viegas <pedroasv@gmail.com>
Date: Mon, 26 Mar 2018 18:24:41 -0300
Subject: [PATCH 0857/1382] adding payment lite dialog example

---
 types/facebook-js-sdk/facebook-js-sdk-tests.ts | 9 +++++++++
 types/facebook-js-sdk/index.d.ts               | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/types/facebook-js-sdk/facebook-js-sdk-tests.ts b/types/facebook-js-sdk/facebook-js-sdk-tests.ts
index f919e3290f..9652dbb86f 100644
--- a/types/facebook-js-sdk/facebook-js-sdk-tests.ts
+++ b/types/facebook-js-sdk/facebook-js-sdk-tests.ts
@@ -72,6 +72,15 @@ FB.ui({
     console.log(data.payment_id);
 });
 
+FB.ui({
+    method: 'pay',
+    action: 'purchaseiap',
+    product_id: 'com.fb.friendsmash.coins.10',
+    developer_payload: 'this_is_a_test_payload'
+}, response => {
+    console.log(response);
+});
+
 FB.ui({
     method: 'pagetab',
     redirect_uri: 'YOUR_URL'
diff --git a/types/facebook-js-sdk/index.d.ts b/types/facebook-js-sdk/index.d.ts
index 4676cbf0fc..be9f71f6c9 100644
--- a/types/facebook-js-sdk/index.d.ts
+++ b/types/facebook-js-sdk/index.d.ts
@@ -186,7 +186,7 @@ declare namespace facebook {
         authResponse: {
             accessToken: string;
             expiresIn: number;
-	    grantedScopes: string;
+	        grantedScopes: string;
             signedRequest: string;
             userID: string;
         };
@@ -219,7 +219,7 @@ declare namespace facebook {
         purchase_time?: number;
         purchase_token?: string;
         signed_request?: string;
-		error_code?: number; 
+		error_code?: number;
 		error_message?: string;
     }
 	

From 386695a0cc5346b7ae76961b927e5bc2d021f381 Mon Sep 17 00:00:00 2001
From: Noah Santschi-Cooney <noah@santschi-cooney.ch>
Date: Mon, 26 Mar 2018 23:05:20 +0100
Subject: [PATCH 0858/1382] Removed userAgent()

---
 types/nightmare/index.d.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/types/nightmare/index.d.ts b/types/nightmare/index.d.ts
index e848ce3fdd..923bcb6a37 100644
--- a/types/nightmare/index.d.ts
+++ b/types/nightmare/index.d.ts
@@ -12,7 +12,6 @@ declare class Nightmare {
     constructor(options?: Nightmare.IConstructorOptions);
 
     // Interact
-    // userAgent(agent: string): Nightmare;
     end(): Nightmare;
     then<T, R>(fn: (value: T) => R): Promise<R>;
     halt(error: string, cb: () => void): Nightmare;

From d111b8e278658bc2772931bca46f345daea2e7e4 Mon Sep 17 00:00:00 2001
From: Andyma <66229754@qq.com>
Date: Tue, 27 Mar 2018 09:08:59 +0800
Subject: [PATCH 0859/1382] Update index.d.ts

Not all events have the same args.
---
 types/datatables.net/index.d.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/types/datatables.net/index.d.ts b/types/datatables.net/index.d.ts
index 7941d0586f..f0d1b123fe 100644
--- a/types/datatables.net/index.d.ts
+++ b/types/datatables.net/index.d.ts
@@ -221,7 +221,7 @@ declare namespace DataTables {
          * @param event Event name to remove.
          * @param callback Specific callback function to remove if you want to unbind a single event listener.
          */
-        off(event: string, callback?: ((e: Event, settings: Settings, json: any) => void)): Api;
+        off(event: string, callback?: ((e: Event, ...args: any[]) => void)): Api;
 
         /**
          * Table events listener.
@@ -229,7 +229,7 @@ declare namespace DataTables {
          * @param event Event to listen for.
          * @param callback Specific callback function to remove if you want to unbind a single event listener.
          */
-        on(event: string, callback: ((e: Event, settings: Settings, json: any) => void)): Api;
+        on(event: string, callback: ((e: Event, ...args: any[]) => void)): Api;
 
         /**
          * Listen for a table event once and then remove the listener.
@@ -237,7 +237,7 @@ declare namespace DataTables {
          * @param event Event to listen for.
          * @param callback Specific callback function to remove if you want to unbind a single event listener.
          */
-        one(event: string, callback: ((e: Event, settings: Settings, json: any) => void)): Api;
+        one(event: string, callback: ((e: Event, ...args: any[]) => void)): Api;
 
         /**
          * Page Methods / object

From 934a9f1ba2f17bf20322feb0bfb5d70b49bd2851 Mon Sep 17 00:00:00 2001
From: Andyma <66229754@qq.com>
Date: Tue, 27 Mar 2018 09:12:08 +0800
Subject: [PATCH 0860/1382] Update index.d.ts

Add api interface for select extension
---
 types/datatables.net-select/index.d.ts | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/types/datatables.net-select/index.d.ts b/types/datatables.net-select/index.d.ts
index aa68f64969..c242027069 100644
--- a/types/datatables.net-select/index.d.ts
+++ b/types/datatables.net-select/index.d.ts
@@ -59,4 +59,26 @@ declare namespace DataTables {
           style(s: "api" | "single" | "multi" | "os"): Api;
         }
     }
+    
+    interface RowMethods {
+      /**
+       * Select a row
+       */
+      select(): Api;
+      /**
+      * Deselect a row
+      */
+      deselect: Api;
+    }
+
+    interface RowsMethods {
+      /**
+       * Select multiple rows
+       */
+      select(): Api;
+      /**
+      * Deselect a row
+      */
+      deselect(): Api;
+    }
 }

From d1cff7a8ff8a8dc30249d50163c8739fe696bd93 Mon Sep 17 00:00:00 2001
From: Andyma <66229754@qq.com>
Date: Tue, 27 Mar 2018 09:16:54 +0800
Subject: [PATCH 0861/1382] Update index.d.ts

---
 types/datatables.net-select/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/datatables.net-select/index.d.ts b/types/datatables.net-select/index.d.ts
index c242027069..a48cfe989b 100644
--- a/types/datatables.net-select/index.d.ts
+++ b/types/datatables.net-select/index.d.ts
@@ -68,7 +68,7 @@ declare namespace DataTables {
       /**
       * Deselect a row
       */
-      deselect: Api;
+      deselect(): Api;
     }
 
     interface RowsMethods {

From 8ea26416e7bb32cefa8a5f134f0f84d03b0764d9 Mon Sep 17 00:00:00 2001
From: Chris Krycho <chris@chriskrycho.com>
Date: Mon, 26 Mar 2018 20:40:10 -0600
Subject: [PATCH 0862/1382] Ember: Add `@ember/error` module export.

---
 types/ember/index.d.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/types/ember/index.d.ts b/types/ember/index.d.ts
index 3e776bd665..6d8adebae2 100755
--- a/types/ember/index.d.ts
+++ b/types/ember/index.d.ts
@@ -3500,6 +3500,12 @@ declare module '@ember/enumerable' {
     export default Enumerable;
 }
 
+declare module '@ember/error' {
+    import Ember from 'ember';
+    const Error: typeof Ember.Error;
+    export default Error;
+}
+
 declare module '@ember/instrumentation' {
     import Ember from 'ember';
     export const instrument: typeof Ember.instrument;

From 7fd7362840a0a70781c205e97ce73d01b61a543d Mon Sep 17 00:00:00 2001
From: Chris Krycho <chris@chriskrycho.com>
Date: Mon, 26 Mar 2018 20:49:55 -0600
Subject: [PATCH 0863/1382] Ember: Add test of import from '@ember/error'.

---
 types/ember/test/error.ts | 6 ++++++
 types/ember/tsconfig.json | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 types/ember/test/error.ts

diff --git a/types/ember/test/error.ts b/types/ember/test/error.ts
new file mode 100644
index 0000000000..ad3c2ee8c3
--- /dev/null
+++ b/types/ember/test/error.ts
@@ -0,0 +1,6 @@
+import { assertType } from "./lib/assert";
+
+import Ember from "ember";
+import EmberError from "@ember/error";
+
+assertType<typeof Ember.Error>(EmberError);
diff --git a/types/ember/tsconfig.json b/types/ember/tsconfig.json
index 19c8cf4b50..cbdb6b6afc 100755
--- a/types/ember/tsconfig.json
+++ b/types/ember/tsconfig.json
@@ -23,6 +23,7 @@
         "test/lib/assert.ts",
         "test/application.ts",
         "test/ember-tests.ts",
+        "test/error.ts",
         "test/event.ts",
         "test/extend.ts",
         "test/create.ts",
@@ -49,4 +50,4 @@
         "test/route.ts",
         "test/view-utils.ts"
     ]
-}
\ No newline at end of file
+}

From 0925c2e41e5f9040e345141336adc3f3bd0bbb4b Mon Sep 17 00:00:00 2001
From: Vitor Cavalcanti <vitorluizc@outlook.com>
Date: Tue, 27 Mar 2018 00:07:04 -0300
Subject: [PATCH 0864/1382] Add definition for is-color

---
 types/is-color/index.d.ts        | 20 ++++++++++++++++++++
 types/is-color/is-color-tests.ts | 23 +++++++++++++++++++++++
 types/is-color/tsconfig.json     | 23 +++++++++++++++++++++++
 types/is-color/tslint.json       |  1 +
 4 files changed, 67 insertions(+)
 create mode 100644 types/is-color/index.d.ts
 create mode 100644 types/is-color/is-color-tests.ts
 create mode 100644 types/is-color/tsconfig.json
 create mode 100644 types/is-color/tslint.json

diff --git a/types/is-color/index.d.ts b/types/is-color/index.d.ts
new file mode 100644
index 0000000000..f6c545246f
--- /dev/null
+++ b/types/is-color/index.d.ts
@@ -0,0 +1,20 @@
+// Type definitions for is-color 1.0
+// Project: https://github.com/morishitter/is-color
+// Definitions by: Vitor Luiz Cavalcanti <https://github.com/VitorLuizC>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function isColor(str: string): boolean;
+
+declare namespace isColor {
+    function isRgb(str: string): boolean;
+    function isRgba(str: string): boolean;
+    function isHsl(str: string): boolean;
+    function isHsla(str: string): boolean;
+    function isHex(str: string): boolean;
+    function isKeyword(str: string): boolean;
+    function isInherit(str: string): str is 'inherit';
+    function isCurrentColor(str: string): str is ('currentColor' | 'currentcolor');
+    function isTransparent(str: string): str is 'transparent';
+}
+
+export = isColor;
diff --git a/types/is-color/is-color-tests.ts b/types/is-color/is-color-tests.ts
new file mode 100644
index 0000000000..a17ffc7b08
--- /dev/null
+++ b/types/is-color/is-color-tests.ts
@@ -0,0 +1,23 @@
+import isColor = require('is-color');
+
+isColor('#000');
+// => boolean
+
+isColor.isHex('#000');
+// => boolean
+isColor.isHsl('#000');
+// => boolean
+isColor.isHsla('#000');
+// => boolean
+isColor.isRgb('rgb(0, 0, 0)');
+// => boolean
+isColor.isRgba('rgba(0,0,0, 0)');
+// => boolean
+isColor.isKeyword('red');
+// => boolean
+isColor.isInherit('inherit');
+// => is 'inherit'
+isColor.isTransparent('transparent');
+// => is 'transparent'
+isColor.isCurrentColor('currentColor');
+// => is 'currentColor'|'currentcolor'
diff --git a/types/is-color/tsconfig.json b/types/is-color/tsconfig.json
new file mode 100644
index 0000000000..41488170d8
--- /dev/null
+++ b/types/is-color/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "is-color-tests.ts"
+    ]
+}
diff --git a/types/is-color/tslint.json b/types/is-color/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/is-color/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 357df72d924b2e3fdc76bb125c61b24eaeb682f2 Mon Sep 17 00:00:00 2001
From: Andyma <66229754@qq.com>
Date: Tue, 27 Mar 2018 11:12:01 +0800
Subject: [PATCH 0865/1382] Update index.d.ts

Datatables api should be array-like, and accessable with index like array
---
 types/datatables.net/index.d.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/types/datatables.net/index.d.ts b/types/datatables.net/index.d.ts
index f0d1b123fe..6bbc2e1137 100644
--- a/types/datatables.net/index.d.ts
+++ b/types/datatables.net/index.d.ts
@@ -28,6 +28,10 @@ declare namespace DataTables {
     }
 
     interface Api extends CoreMethods {
+        /**
+         * API should be array-like
+         */
+        [key: number]: any;
         /**
          * Returns DataTables API instance
          *

From 59685b6f85c3e0cffe9aafe7692360226683e74f Mon Sep 17 00:00:00 2001
From: Mike Cook <mike@travelnest.com>
Date: Tue, 27 Mar 2018 08:04:13 +0100
Subject: [PATCH 0866/1382] Remove readme anchor from project link

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

diff --git a/types/nodecredstash/index.d.ts b/types/nodecredstash/index.d.ts
index 76375aac21..9b2fed47c8 100644
--- a/types/nodecredstash/index.d.ts
+++ b/types/nodecredstash/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for nodecredstash 2.0
-// Project: https://github.com/DavidTanner/nodecredstash#readme
+// Project: https://github.com/DavidTanner/nodecredstash
 // Definitions by: Mike Cook <https://github.com/migstopheles>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 

From 9f893b8e9e99a56f97cbaae0102fceeddff5f3cf Mon Sep 17 00:00:00 2001
From: Rafal2228 <rafal2228@gmail.com>
Date: Tue, 27 Mar 2018 10:15:32 +0200
Subject: [PATCH 0867/1382] fix(zapier-platform-core): add missing HTTP verb

---
 types/zapier-platform-core/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/zapier-platform-core/index.d.ts b/types/zapier-platform-core/index.d.ts
index 525421abbf..474de4f0fd 100644
--- a/types/zapier-platform-core/index.d.ts
+++ b/types/zapier-platform-core/index.d.ts
@@ -15,7 +15,7 @@ export const version: string;
 
 export interface HttpRequestOptions {
     url?: string;
-    method?: "POST" | "GET" | "OPTIONS" | "HEAD" | "DELETE" | "PATCH";
+    method?: "POST" | "GET" | "OPTIONS" | "HEAD" | "DELETE" | "PATCH" | "PUT";
     body?: string | Buffer | NodeJS.ReadableStream | object | null;
     headers?: { [name: string]: string };
     json?: object | any[] | null;

From f0c93f3a89e7670953d927660c5d1f1d304df0f3 Mon Sep 17 00:00:00 2001
From: Andy Ma <ama@tomtec.org>
Date: Tue, 27 Mar 2018 17:59:11 +0800
Subject: [PATCH 0868/1382] Add typing for ColReorder extension

---
 .../datatables.net-colreorder-tests.ts        | 12 ++++
 types/datatables.net-colreorder/index.d.ts    | 64 +++++++++++++++++++
 types/datatables.net-colreorder/tsconfig.json | 24 +++++++
 types/datatables.net-colreorder/tslint.json   |  1 +
 4 files changed, 101 insertions(+)
 create mode 100644 types/datatables.net-colreorder/datatables.net-colreorder-tests.ts
 create mode 100644 types/datatables.net-colreorder/index.d.ts
 create mode 100644 types/datatables.net-colreorder/tsconfig.json
 create mode 100644 types/datatables.net-colreorder/tslint.json

diff --git a/types/datatables.net-colreorder/datatables.net-colreorder-tests.ts b/types/datatables.net-colreorder/datatables.net-colreorder-tests.ts
new file mode 100644
index 0000000000..9b73f3f0e0
--- /dev/null
+++ b/types/datatables.net-colreorder/datatables.net-colreorder-tests.ts
@@ -0,0 +1,12 @@
+$(document).ready(() => {
+    const config: DataTables.Settings = {
+        // ColReorder extension options
+        colReorder: {
+            fixedColumnsLeft: 0,
+            fixedColumnsRight: 0,
+            order: [1,2,3],
+            realtime: true,
+            reorderCallback: ()=>{},
+        }
+    };
+});
diff --git a/types/datatables.net-colreorder/index.d.ts b/types/datatables.net-colreorder/index.d.ts
new file mode 100644
index 0000000000..80a9fa4e41
--- /dev/null
+++ b/types/datatables.net-colreorder/index.d.ts
@@ -0,0 +1,64 @@
+// Type definitions for datatables.net-colReorder 1.4
+// Project: https://datatables.net/extensions/colreorder/
+// Definitions by: Andy Ma <https://github.com/andy-maca>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+/// <reference types="jquery" />
+/// <reference types="datatables.net"/>
+
+declare namespace DataTables {
+  interface Settings {
+    /*
+     * colReorder extension options
+     */
+    colReorder?: boolean | ColReorderSettings;
+  }
+
+  interface ColReorderSettings {
+    /*
+     * Number of columns (counting from the left) to disallow reordering of, '0' in default
+     */
+    fixedColumnsLeft?: number;
+
+    /*
+     * Number of columns (counting from the right) to disallow reordering of, '0' in default
+     */
+    fixedColumnsRight?: number;
+
+    /*
+     * Set a default order for the columns in the table
+     */
+    order?: number[];
+
+    /*
+     * Enable / disable live reordering of columns during a drag, 'true' in default
+     */
+    realtime?: boolean;
+    /*
+     * Callback after reorder
+     */
+    reorderCallback: Function;
+  }
+
+  interface Api {
+    colReorder: {
+      /*
+      * Programmatically reorder columns
+      */
+      move(from: number, to: number, drop: boolean, invalidate: boolean): Api;
+      /*
+      * Get / set column order
+      */
+      order(newOrder?: number[], originalIndexes?: boolean): Api;
+      /*
+      * Restore the loaded column order
+      */
+      reset(): Api;
+      /*
+      * Convert one or more column indexes to and from current and original indexes
+      */
+      transpose(idx?: number | number[], direction?: "toCurrent" | "toOriginal" | "fromOriginal" | "fromCurrent"): Api;
+    }
+  }
+}
\ No newline at end of file
diff --git a/types/datatables.net-colreorder/tsconfig.json b/types/datatables.net-colreorder/tsconfig.json
new file mode 100644
index 0000000000..97ef7b2fc0
--- /dev/null
+++ b/types/datatables.net-colreorder/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "datatables.net-colreorder-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/datatables.net-colreorder/tslint.json b/types/datatables.net-colreorder/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/datatables.net-colreorder/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From be3c84327f3727492c6e513945d4e7d13170d8c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20Morch=C3=B3n=20Poveda?= <smorchon@tuenti.com>
Date: Tue, 27 Mar 2018 13:03:46 +0200
Subject: [PATCH 0869/1382] Update use with varargs

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

diff --git a/types/jss/index.d.ts b/types/jss/index.d.ts
index 0f77605b2c..37d2443e4a 100644
--- a/types/jss/index.d.ts
+++ b/types/jss/index.d.ts
@@ -125,7 +125,7 @@ declare class JSS {
 	): StyleSheet<T>;
 	removeStyleSheet(sheet: StyleSheet<any>): this;
 	setup(options?: Partial<JSSOptions>): this;
-	use(plugin: JSSPlugin): this;
+	use(...plugins: JSSPlugin[]): this;
 	createRule(style: Style, options?: Partial<RuleFactoryOptions>): Rule;
 	createRule(name: string, style: Style, options?: Partial<RuleFactoryOptions>): Rule;
 }
diff --git a/types/jss/jss-tests.ts b/types/jss/jss-tests.ts
index a5c6f34126..0211df99a8 100644
--- a/types/jss/jss-tests.ts
+++ b/types/jss/jss-tests.ts
@@ -7,6 +7,7 @@ import {
 } from 'jss';
 
 const jss = createJSS().setup({});
+jss.use({}, {}); // $ExpectType JSS
 
 const styleSheet = jss.createStyleSheet(
 	{

From 3327220ff8a99ef392089105e9d6908c6747a588 Mon Sep 17 00:00:00 2001
From: Firede <firede@firede.us>
Date: Tue, 27 Mar 2018 19:48:25 +0800
Subject: [PATCH 0870/1382] Reformat all files using prettier.

prettier --parser typescript --tab-width 4 --semi --trailing-comma es5 \
         --write --print-width 120 \
         types/graphql/**/*.d.ts
related: #23142 #24532
---
 types/graphql/error/GraphQLError.d.ts         | 116 +--
 types/graphql/error/formatError.d.ts          |  12 +-
 types/graphql/error/index.d.ts                |  12 +-
 types/graphql/error/locatedError.d.ts         |   8 +-
 types/graphql/error/syntaxError.d.ts          |  10 +-
 types/graphql/execution/execute.d.ts          |  78 +-
 types/graphql/execution/index.d.ts            |  10 +-
 types/graphql/execution/values.d.ts           |  34 +-
 types/graphql/graphql.d.ts                    |  26 +-
 types/graphql/index.d.ts                      |  47 +-
 types/graphql/language/ast.d.ts               | 758 +++++++++---------
 types/graphql/language/index.d.ts             |  22 +-
 types/graphql/language/kinds.d.ts             |  86 +-
 types/graphql/language/lexer.d.ts             |  95 ++-
 types/graphql/language/location.d.ts          |   6 +-
 types/graphql/language/parser.d.ts            | 104 ++-
 types/graphql/language/source.d.ts            |   6 +-
 types/graphql/language/visitor.d.ts           |  68 +-
 types/graphql/subscription/index.d.ts         |   2 +-
 types/graphql/subscription/subscribe.d.ts     |  46 +-
 types/graphql/type/definition.d.ts            | 488 ++++++-----
 types/graphql/type/directives.d.ts            |  68 +-
 types/graphql/type/index.d.ts                 |  70 +-
 types/graphql/type/introspection.d.ts         |  36 +-
 types/graphql/type/scalars.d.ts               |   2 +-
 types/graphql/type/schema.d.ts                |  97 ++-
 types/graphql/utilities/TypeInfo.d.ts         |  60 +-
 types/graphql/utilities/astFromValue.d.ts     |   8 +-
 types/graphql/utilities/buildASTSchema.d.ts   |  26 +-
 .../graphql/utilities/buildClientSchema.d.ts  |   9 +-
 types/graphql/utilities/concatAST.d.ts        |   2 +-
 types/graphql/utilities/extendSchema.d.ts     |   9 +-
 .../utilities/findBreakingChanges.d.ts        |  78 +-
 .../utilities/findDeprecatedUsages.d.ts       |  11 +-
 types/graphql/utilities/getOperationAST.d.ts  |   7 +-
 types/graphql/utilities/index.d.ts            |  82 +-
 .../graphql/utilities/introspectionQuery.d.ts | 129 ++-
 types/graphql/utilities/isValidJSValue.d.ts   |   2 +-
 .../utilities/isValidLiteralValue.d.ts        |   9 +-
 types/graphql/utilities/schemaPrinter.d.ts    |   6 +-
 .../graphql/utilities/separateOperations.d.ts |   6 +-
 types/graphql/utilities/typeComparators.d.ts  |  20 +-
 types/graphql/utilities/typeFromAST.d.ts      |  11 +-
 types/graphql/utilities/valueFromAST.d.ts     |  19 +-
 types/graphql/validation/index.d.ts           | 104 +--
 .../rules/ArgumentsOfCorrectType.d.ts         |   2 +-
 .../rules/DefaultValuesOfCorrectType.d.ts     |   2 +-
 .../validation/rules/FieldsOnCorrectType.d.ts |   2 +-
 .../rules/FragmentsOnCompositeTypes.d.ts      |   2 +-
 .../validation/rules/KnownArgumentNames.d.ts  |   2 +-
 .../validation/rules/KnownDirectives.d.ts     |   2 +-
 .../validation/rules/KnownFragmentNames.d.ts  |   2 +-
 .../validation/rules/KnownTypeNames.d.ts      |   2 +-
 .../rules/LoneAnonymousOperation.d.ts         |   2 +-
 .../validation/rules/NoFragmentCycles.d.ts    |   2 +-
 .../rules/NoUndefinedVariables.d.ts           |   2 +-
 .../validation/rules/NoUnusedFragments.d.ts   |   2 +-
 .../validation/rules/NoUnusedVariables.d.ts   |   2 +-
 .../rules/OverlappingFieldsCanBeMerged.d.ts   |   2 +-
 .../rules/PossibleFragmentSpreads.d.ts        |   2 +-
 .../rules/ProvidedNonNullArguments.d.ts       |   2 +-
 .../graphql/validation/rules/ScalarLeafs.d.ts |   2 +-
 .../rules/SingleFieldSubscriptions.d.ts       |   2 +-
 .../validation/rules/UniqueArgumentNames.d.ts |   2 +-
 .../rules/UniqueDirectivesPerLocation.d.ts    |   2 +-
 .../validation/rules/UniqueFragmentNames.d.ts |   2 +-
 .../rules/UniqueInputFieldNames.d.ts          |   2 +-
 .../rules/UniqueOperationNames.d.ts           |   2 +-
 .../validation/rules/UniqueVariableNames.d.ts |   2 +-
 .../rules/VariablesAreInputTypes.d.ts         |   2 +-
 .../rules/VariablesInAllowedPosition.d.ts     |   2 +-
 types/graphql/validation/specifiedRules.d.ts  |   2 +-
 types/graphql/validation/validate.d.ts        |  94 +--
 73 files changed, 1405 insertions(+), 1648 deletions(-)

diff --git a/types/graphql/error/GraphQLError.d.ts b/types/graphql/error/GraphQLError.d.ts
index abcc6be5b9..a4aa3f17c6 100644
--- a/types/graphql/error/GraphQLError.d.ts
+++ b/types/graphql/error/GraphQLError.d.ts
@@ -1,6 +1,6 @@
-import { getLocation } from '../language';
-import { ASTNode } from '../language/ast';
-import { Source } from '../language/source';
+import { getLocation } from "../language";
+import { ASTNode } from "../language/ast";
+import { Source } from "../language/source";
 
 /**
  * A GraphQLError describes an Error found during the parse, validate, or
@@ -9,66 +9,66 @@ import { Source } from '../language/source';
  * GraphQL document and/or execution result that correspond to the Error.
  */
 export class GraphQLError extends Error {
-  /**
-   * A message describing the Error for debugging purposes.
-   *
-   * Enumerable, and appears in the result of JSON.stringify().
-   */
-  message: string;
+    /**
+     * A message describing the Error for debugging purposes.
+     *
+     * Enumerable, and appears in the result of JSON.stringify().
+     */
+    message: string;
 
-  /**
-   * An array of { line, column } locations within the source GraphQL document
-   * which correspond to this error.
-   *
-   * Errors during validation often contain multiple locations, for example to
-   * point out two things with the same name. Errors during execution include a
-   * single location, the field which produced the error.
-   *
-   * Enumerable, and appears in the result of JSON.stringify().
-   */
-  locations?: Array<{ line: number; column: number }> | undefined;
+    /**
+     * An array of { line, column } locations within the source GraphQL document
+     * which correspond to this error.
+     *
+     * Errors during validation often contain multiple locations, for example to
+     * point out two things with the same name. Errors during execution include a
+     * single location, the field which produced the error.
+     *
+     * Enumerable, and appears in the result of JSON.stringify().
+     */
+    locations?: Array<{ line: number; column: number }> | undefined;
 
-  /**
-   * An array describing the JSON-path into the execution response which
-   * corresponds to this error. Only included for errors during execution.
-   *
-   * Enumerable, and appears in the result of JSON.stringify().
-   */
-  path?: Array<string | number> | undefined;
+    /**
+     * An array describing the JSON-path into the execution response which
+     * corresponds to this error. Only included for errors during execution.
+     *
+     * Enumerable, and appears in the result of JSON.stringify().
+     */
+    path?: Array<string | number> | undefined;
 
-  /**
-   * An array of GraphQL AST Nodes corresponding to this error.
-   */
-  nodes?: ASTNode[] | undefined;
+    /**
+     * An array of GraphQL AST Nodes corresponding to this error.
+     */
+    nodes?: ASTNode[] | undefined;
 
-  /**
-   * The source GraphQL document corresponding to this error.
-   */
-  source?: Source | undefined;
+    /**
+     * The source GraphQL document corresponding to this error.
+     */
+    source?: Source | undefined;
 
-  /**
-   * An array of character offsets within the source GraphQL document
-   * which correspond to this error.
-   */
-  positions?: number[] | undefined;
+    /**
+     * An array of character offsets within the source GraphQL document
+     * which correspond to this error.
+     */
+    positions?: number[] | undefined;
 
-  /**
-   * The original error thrown from a field resolver during execution.
-   */
-  originalError?: Error;
-    
-  /**
-   * Extension fields to add to the formatted error.
-   */
-  extensions?: { [key: string]: any } | undefined;
+    /**
+     * The original error thrown from a field resolver during execution.
+     */
+    originalError?: Error;
 
-  constructor(
-    message: string,
-    nodes?: any[],
-    source?: Source,
-    positions?: number[],
-    path?: Array<string | number>,
-    originalError?: Error,
-    extensions?: { [key: string]: any },
-  );
+    /**
+     * Extension fields to add to the formatted error.
+     */
+    extensions?: { [key: string]: any } | undefined;
+
+    constructor(
+        message: string,
+        nodes?: any[],
+        source?: Source,
+        positions?: number[],
+        path?: Array<string | number>,
+        originalError?: Error,
+        extensions?: { [key: string]: any }
+    );
 }
diff --git a/types/graphql/error/formatError.d.ts b/types/graphql/error/formatError.d.ts
index 26dbe0f743..a683da0375 100644
--- a/types/graphql/error/formatError.d.ts
+++ b/types/graphql/error/formatError.d.ts
@@ -1,4 +1,4 @@
-import { GraphQLError } from './GraphQLError';
+import { GraphQLError } from "./GraphQLError";
 
 /**
  * Given a GraphQLError, format it according to the rules described by the
@@ -7,12 +7,12 @@ import { GraphQLError } from './GraphQLError';
 export function formatError(error: GraphQLError): GraphQLFormattedError;
 
 export interface GraphQLFormattedError {
-  message: string;
-  locations?: GraphQLErrorLocation[];
-  path?: Array<string | number>;
+    message: string;
+    locations?: GraphQLErrorLocation[];
+    path?: Array<string | number>;
 }
 
 export interface GraphQLErrorLocation {
-  line: number;
-  column: number;
+    line: number;
+    column: number;
 }
diff --git a/types/graphql/error/index.d.ts b/types/graphql/error/index.d.ts
index 0e9a557794..8d81175bcc 100644
--- a/types/graphql/error/index.d.ts
+++ b/types/graphql/error/index.d.ts
@@ -1,8 +1,4 @@
-export { GraphQLError } from './GraphQLError';
-export { syntaxError } from './syntaxError';
-export { locatedError } from './locatedError';
-export {
-  formatError,
-  GraphQLFormattedError,
-  GraphQLErrorLocation,
-} from './formatError';
+export { GraphQLError } from "./GraphQLError";
+export { syntaxError } from "./syntaxError";
+export { locatedError } from "./locatedError";
+export { formatError, GraphQLFormattedError, GraphQLErrorLocation } from "./formatError";
diff --git a/types/graphql/error/locatedError.d.ts b/types/graphql/error/locatedError.d.ts
index 64fadf49f4..c41fd0df50 100644
--- a/types/graphql/error/locatedError.d.ts
+++ b/types/graphql/error/locatedError.d.ts
@@ -1,12 +1,8 @@
-import { GraphQLError } from './GraphQLError';
+import { GraphQLError } from "./GraphQLError";
 
 /**
  * Given an arbitrary Error, presumably thrown while attempting to execute a
  * GraphQL operation, produce a new GraphQLError aware of the location in the
  * document responsible for the original Error.
  */
-export function locatedError<T>(
-  originalError: Error,
-  nodes: T[],
-  path: Array<string | number>,
-): GraphQLError;
+export function locatedError<T>(originalError: Error, nodes: T[], path: Array<string | number>): GraphQLError;
diff --git a/types/graphql/error/syntaxError.d.ts b/types/graphql/error/syntaxError.d.ts
index ccf84044ca..bc33cd8107 100644
--- a/types/graphql/error/syntaxError.d.ts
+++ b/types/graphql/error/syntaxError.d.ts
@@ -1,12 +1,8 @@
-import { Source } from '../language/source';
-import { GraphQLError } from './GraphQLError';
+import { Source } from "../language/source";
+import { GraphQLError } from "./GraphQLError";
 
 /**
  * Produces a GraphQLError representing a syntax error, containing useful
  * descriptive information about the syntax error's position in the source.
  */
-export function syntaxError(
-  source: Source,
-  position: number,
-  description: string,
-): GraphQLError;
+export function syntaxError(source: Source, position: number, description: string): GraphQLError;
diff --git a/types/graphql/execution/execute.d.ts b/types/graphql/execution/execute.d.ts
index ea6ab8ed39..387a3d4d73 100644
--- a/types/graphql/execution/execute.d.ts
+++ b/types/graphql/execution/execute.d.ts
@@ -1,19 +1,15 @@
-import { GraphQLError, locatedError } from '../error';
-import { GraphQLSchema } from '../type/schema';
+import { GraphQLError, locatedError } from "../error";
+import { GraphQLSchema } from "../type/schema";
+import { GraphQLField, GraphQLFieldResolver, ResponsePath } from "../type/definition";
 import {
-  GraphQLField,
-  GraphQLFieldResolver,
-  ResponsePath,
-} from '../type/definition';
-import {
-  DirectiveNode,
-  DocumentNode,
-  OperationDefinitionNode,
-  SelectionSetNode,
-  FieldNode,
-  InlineFragmentNode,
-  FragmentDefinitionNode,
-} from '../language/ast';
+    DirectiveNode,
+    DocumentNode,
+    OperationDefinitionNode,
+    SelectionSetNode,
+    FieldNode,
+    InlineFragmentNode,
+    FragmentDefinitionNode,
+} from "../language/ast";
 /**
  * Data that must be available at all points during query execution.
  *
@@ -21,13 +17,13 @@ import {
  * and the fragments defined in the query document
  */
 export interface ExecutionContext {
-  schema: GraphQLSchema;
-  fragments: { [key: string]: FragmentDefinitionNode };
-  rootValue: any;
-  operation: OperationDefinitionNode;
-  variableValues: { [key: string]: any };
-  fieldResolver: GraphQLFieldResolver<any, any>;
-  errors: GraphQLError[];
+    schema: GraphQLSchema;
+    fragments: { [key: string]: FragmentDefinitionNode };
+    rootValue: any;
+    operation: OperationDefinitionNode;
+    variableValues: { [key: string]: any };
+    fieldResolver: GraphQLFieldResolver<any, any>;
+    errors: GraphQLError[];
 }
 
 /**
@@ -37,19 +33,19 @@ export interface ExecutionContext {
  * non-empty array if an error occurred.
  */
 export interface ExecutionResult {
-  data?: { [key: string]: any };
-  extensions?: { [key: string]: any };
-  errors?: GraphQLError[];
+    data?: { [key: string]: any };
+    extensions?: { [key: string]: any };
+    errors?: GraphQLError[];
 }
 
 export type ExecutionArgs = {
-  schema: GraphQLSchema;
-  document: DocumentNode;
-  rootValue?: any;
-  contextValue?: any;
-  variableValues?: { [key: string]: any };
-  operationName?: string;
-  fieldResolver?: GraphQLFieldResolver<any, any>;
+    schema: GraphQLSchema;
+    document: DocumentNode;
+    rootValue?: any;
+    contextValue?: any;
+    variableValues?: { [key: string]: any };
+    operationName?: string;
+    fieldResolver?: GraphQLFieldResolver<any, any>;
 };
 
 /**
@@ -64,15 +60,15 @@ export type ExecutionArgs = {
  */
 export function execute(args: ExecutionArgs): Promise<ExecutionResult>;
 export function execute(
-  schema: GraphQLSchema,
-  document: DocumentNode,
-  rootValue?: any,
-  contextValue?: any,
-  variableValues?: {
-    [key: string]: any;
-  },
-  operationName?: string,
-  fieldResolver?: GraphQLFieldResolver<any, any>,
+    schema: GraphQLSchema,
+    document: DocumentNode,
+    rootValue?: any,
+    contextValue?: any,
+    variableValues?: {
+        [key: string]: any;
+    },
+    operationName?: string,
+    fieldResolver?: GraphQLFieldResolver<any, any>
 ): Promise<ExecutionResult>;
 
 /**
diff --git a/types/graphql/execution/index.d.ts b/types/graphql/execution/index.d.ts
index a5c4980c0a..74aef224ce 100644
--- a/types/graphql/execution/index.d.ts
+++ b/types/graphql/execution/index.d.ts
@@ -1,9 +1,3 @@
-export {
-  execute,
-  defaultFieldResolver,
-  responsePathAsArray,
-  ExecutionArgs,
-  ExecutionResult,
-} from './execute';
+export { execute, defaultFieldResolver, responsePathAsArray, ExecutionArgs, ExecutionResult } from "./execute";
 
-export { getDirectiveValues } from './values';
+export { getDirectiveValues } from "./values";
diff --git a/types/graphql/execution/values.d.ts b/types/graphql/execution/values.d.ts
index 08e6041aa2..d8e1ec2e7e 100644
--- a/types/graphql/execution/values.d.ts
+++ b/types/graphql/execution/values.d.ts
@@ -1,15 +1,7 @@
-import {
-  GraphQLInputType,
-  GraphQLField,
-  GraphQLArgument,
-} from '../type/definition';
-import { GraphQLDirective } from '../type/directives';
-import { GraphQLSchema } from '../type/schema';
-import {
-  FieldNode,
-  DirectiveNode,
-  VariableDefinitionNode,
-} from '../language/ast';
+import { GraphQLInputType, GraphQLField, GraphQLArgument } from "../type/definition";
+import { GraphQLDirective } from "../type/directives";
+import { GraphQLSchema } from "../type/schema";
+import { FieldNode, DirectiveNode, VariableDefinitionNode } from "../language/ast";
 
 /**
  * Prepares an object map of variableValues of the correct type based on the
@@ -17,9 +9,9 @@ import {
  * parsed to match the variable definitions, a GraphQLError will be thrown.
  */
 export function getVariableValues(
-  schema: GraphQLSchema,
-  varDefNodes: VariableDefinitionNode[],
-  inputs: { [key: string]: any },
+    schema: GraphQLSchema,
+    varDefNodes: VariableDefinitionNode[],
+    inputs: { [key: string]: any }
 ): { [key: string]: any };
 
 /**
@@ -27,9 +19,9 @@ export function getVariableValues(
  * definitions and list of argument AST nodes.
  */
 export function getArgumentValues(
-  def: GraphQLField<any, any> | GraphQLDirective,
-  node: FieldNode | DirectiveNode,
-  variableValues?: { [key: string]: any },
+    def: GraphQLField<any, any> | GraphQLDirective,
+    node: FieldNode | DirectiveNode,
+    variableValues?: { [key: string]: any }
 ): { [key: string]: any };
 
 /**
@@ -40,7 +32,7 @@ export function getArgumentValues(
  * If the directive does not exist on the node, returns undefined.
  */
 export function getDirectiveValues(
-  directiveDef: GraphQLDirective,
-  node: { directives?: Array<DirectiveNode> },
-  variableValues?: { [key: string]: any },
+    directiveDef: GraphQLDirective,
+    node: { directives?: Array<DirectiveNode> },
+    variableValues?: { [key: string]: any }
 ): void | { [key: string]: any };
diff --git a/types/graphql/graphql.d.ts b/types/graphql/graphql.d.ts
index f5469d7d8c..386cdd9e1b 100644
--- a/types/graphql/graphql.d.ts
+++ b/types/graphql/graphql.d.ts
@@ -1,7 +1,7 @@
-import { Source } from './language/source';
-import { GraphQLFieldResolver } from './type/definition';
-import { GraphQLSchema } from './type/schema';
-import { ExecutionResult } from './execution/execute';
+import { Source } from "./language/source";
+import { GraphQLFieldResolver } from "./type/definition";
+import { GraphQLSchema } from "./type/schema";
+import { ExecutionResult } from "./execution/execute";
 
 /**
  * This is the primary entry point function for fulfilling GraphQL operations
@@ -34,15 +34,15 @@ import { ExecutionResult } from './execution/execute';
  *    value or method on the source value with the field's name).
  */
 export function graphql(args: {
-    schema: GraphQLSchema,
-    source: string | Source,
-    rootValue?: any,
-    contextValue?: any,
+    schema: GraphQLSchema;
+    source: string | Source;
+    rootValue?: any;
+    contextValue?: any;
     variableValues?: {
-        [key: string]: any
-    },
-    operationName?: string,
-    fieldResolver?: GraphQLFieldResolver<any, any>
+        [key: string]: any;
+    };
+    operationName?: string;
+    fieldResolver?: GraphQLFieldResolver<any, any>;
 }): Promise<ExecutionResult>;
 export function graphql(
     schema: GraphQLSchema,
@@ -50,7 +50,7 @@ export function graphql(
     rootValue?: any,
     contextValue?: any,
     variableValues?: {
-        [key: string]: any
+        [key: string]: any;
     },
     operationName?: string,
     fieldResolver?: GraphQLFieldResolver<any, any>
diff --git a/types/graphql/index.d.ts b/types/graphql/index.d.ts
index 49185e11a1..017f006787 100644
--- a/types/graphql/index.d.ts
+++ b/types/graphql/index.d.ts
@@ -17,17 +17,15 @@
 // TypeScript Version: 2.3
 
 // The primary entry point into fulfilling a GraphQL request.
-export {
-    graphql
-} from './graphql';
+export { graphql } from "./graphql";
 
 // Create and operate on GraphQL type definitions and schema.
-export * from './type';
+export * from "./type";
 
 // Parse and operate on GraphQL language source files.
-export * from './language';
+export * from "./language";
 
-export * from './subscription';
+export * from "./subscription";
 
 // Execute GraphQL queries.
 export {
@@ -37,16 +35,14 @@ export {
     getDirectiveValues,
     ExecutionArgs,
     ExecutionResult,
-} from './execution';
+} from "./execution";
 
 // Validate GraphQL queries.
 export {
     validate,
     ValidationContext,
-
     // All validation rules in the GraphQL Specification.
     specifiedRules,
-
     // Individual validation rules.
     ArgumentsOfCorrectTypeRule,
     DefaultValuesOfCorrectTypeRule,
@@ -74,87 +70,60 @@ export {
     UniqueVariableNamesRule,
     VariablesAreInputTypesRule,
     VariablesInAllowedPositionRule,
-} from './validation';
+} from "./validation";
 
 // Create and format GraphQL errors.
-export {
-    GraphQLError,
-    formatError,
-    GraphQLFormattedError,
-    GraphQLErrorLocation,
-} from './error';
+export { GraphQLError, formatError, GraphQLFormattedError, GraphQLErrorLocation } from "./error";
 
 // Utilities for operating on GraphQL type schema and parsed sources.
 export {
     // The GraphQL query recommended for a full schema introspection.
     introspectionQuery,
-
     // Gets the target Operation from a Document
     getOperationAST,
-
     // Build a GraphQLSchema from an introspection result.
     buildClientSchema,
-
     // Build a GraphQLSchema from a parsed GraphQL Schema language AST.
     buildASTSchema,
-
     // Build a GraphQLSchema from a GraphQL schema language document.
     buildSchema,
-
     // Get the description of an AST node
     getDescription,
-
     // Extends an existing GraphQLSchema from a parsed GraphQL Schema
     // language AST.
     extendSchema,
-
     // 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,
-
     // Create a JavaScript value from a GraphQL language AST.
     valueFromAST,
-
     // Create a GraphQL language AST from a JavaScript value.
     astFromValue,
-
     // A helper to use within recursive-descent visitors which need to be aware of
     // the GraphQL type system.
     TypeInfo,
-
     // Determine if JavaScript values adhere to a GraphQL type.
     isValidJSValue,
-
     // Determine if AST values adhere to a GraphQL type.
     isValidLiteralValue,
-
     // Concatenates multiple AST together.
     concatAST,
-
     // Separates an AST into an AST per Operation.
     separateOperations,
-
     // Comparators for types
     isEqualType,
     isTypeSubTypeOf,
     doTypesOverlap,
-
     // Asserts a string is a valid GraphQL name.
     assertValidName,
-
     // Compares two GraphQLSchemas and detects breaking changes.
     findBreakingChanges,
-
     // Report all deprecated usage within a GraphQL document.
     findDeprecatedUsages,
-
     BreakingChange,
-
     IntrospectionDirective,
     IntrospectionEnumType,
     IntrospectionEnumValue,
@@ -172,4 +141,4 @@ export {
     IntrospectionType,
     IntrospectionTypeRef,
     IntrospectionUnionType,
-} from './utilities';
+} from "./utilities";
diff --git a/types/graphql/language/ast.d.ts b/types/graphql/language/ast.d.ts
index 1873caeb1f..21dbe83361 100644
--- a/types/graphql/language/ast.d.ts
+++ b/types/graphql/language/ast.d.ts
@@ -1,34 +1,34 @@
-import { Source } from './source';
+import { Source } from "./source";
 
 /**
  * Contains a range of UTF-8 character offsets and token references that
  * identify the region of the source from which the AST derived.
  */
 export interface Location {
-  /**
-   * The character offset at which this Node begins.
-   */
-  start: number;
+    /**
+     * The character offset at which this Node begins.
+     */
+    start: number;
 
-  /**
-   * The character offset at which this Node ends.
-   */
-  end: number;
+    /**
+     * The character offset at which this Node ends.
+     */
+    end: number;
 
-  /**
-   * The Token at which this Node begins.
-   */
-  startToken: Token;
+    /**
+     * The Token at which this Node begins.
+     */
+    startToken: Token;
 
-  /**
-   * The Token at which this Node ends.
-   */
-  endToken: Token;
+    /**
+     * The Token at which this Node ends.
+     */
+    endToken: Token;
 
-  /**
-   * The Source document the AST represents.
-   */
-  source: Source;
+    /**
+     * The Source document the AST represents.
+     */
+    source: Source;
 }
 
 /**
@@ -37,346 +37,342 @@ export interface Location {
  * *only*.
  */
 type TokenKind =
-  | '<SOF>'
-  | '<EOF>'
-  | '!'
-  | '$'
-  | '('
-  | ')'
-  | '...'
-  | ':'
-  | '='
-  | '@'
-  | '['
-  | ']'
-  | '{'
-  | '|'
-  | '}'
-  | 'Name'
-  | 'Int'
-  | 'Float'
-  | 'String'
-  | 'BlockString'
-  | 'Comment';
+    | "<SOF>"
+    | "<EOF>"
+    | "!"
+    | "$"
+    | "("
+    | ")"
+    | "..."
+    | ":"
+    | "="
+    | "@"
+    | "["
+    | "]"
+    | "{"
+    | "|"
+    | "}"
+    | "Name"
+    | "Int"
+    | "Float"
+    | "String"
+    | "BlockString"
+    | "Comment";
 
 /**
  * Represents a range of characters represented by a lexical token
  * within a Source.
  */
 export interface Token {
-  /**
-   * The kind of Token.
-   */
-  kind: TokenKind;
+    /**
+     * The kind of Token.
+     */
+    kind: TokenKind;
 
-  /**
-   * The character offset at which this Node begins.
-   */
-  start: number;
+    /**
+     * The character offset at which this Node begins.
+     */
+    start: number;
 
-  /**
-   * The character offset at which this Node ends.
-   */
-  end: number;
+    /**
+     * The character offset at which this Node ends.
+     */
+    end: number;
 
-  /**
-   * The 1-indexed line number on which this Token appears.
-   */
-  line: number;
+    /**
+     * The 1-indexed line number on which this Token appears.
+     */
+    line: number;
 
-  /**
-   * The 1-indexed column number at which this Token begins.
-   */
-  column: number;
+    /**
+     * The 1-indexed column number at which this Token begins.
+     */
+    column: number;
 
-  /**
-   * For non-punctuation tokens, represents the interpreted value of the token.
-   */
-  value: string | undefined;
+    /**
+     * For non-punctuation tokens, represents the interpreted value of the token.
+     */
+    value: string | undefined;
 
-  /**
-   * Tokens exist as nodes in a double-linked-list amongst all tokens
-   * including ignored tokens. <SOF> is always the first node and <EOF>
-   * the last.
-   */
-  prev?: Token;
-  next?: Token;
+    /**
+     * Tokens exist as nodes in a double-linked-list amongst all tokens
+     * including ignored tokens. <SOF> is always the first node and <EOF>
+     * the last.
+     */
+    prev?: Token;
+    next?: Token;
 }
 
 /**
  * The list of all possible AST node types.
  */
 export type ASTNode =
-  | NameNode
-  | DocumentNode
-  | OperationDefinitionNode
-  | VariableDefinitionNode
-  | VariableNode
-  | SelectionSetNode
-  | FieldNode
-  | ArgumentNode
-  | FragmentSpreadNode
-  | InlineFragmentNode
-  | FragmentDefinitionNode
-  | IntValueNode
-  | FloatValueNode
-  | StringValueNode
-  | BooleanValueNode
-  | NullValueNode
-  | EnumValueNode
-  | ListValueNode
-  | ObjectValueNode
-  | ObjectFieldNode
-  | DirectiveNode
-  | NamedTypeNode
-  | ListTypeNode
-  | NonNullTypeNode
-  | SchemaDefinitionNode
-  | OperationTypeDefinitionNode
-  | ScalarTypeDefinitionNode
-  | ObjectTypeDefinitionNode
-  | FieldDefinitionNode
-  | InputValueDefinitionNode
-  | InterfaceTypeDefinitionNode
-  | UnionTypeDefinitionNode
-  | EnumTypeDefinitionNode
-  | EnumValueDefinitionNode
-  | InputObjectTypeDefinitionNode
-  | ScalarTypeExtensionNode
-  | ObjectTypeExtensionNode
-  | InterfaceTypeExtensionNode
-  | UnionTypeExtensionNode
-  | EnumTypeExtensionNode
-  | InputObjectTypeExtensionNode
-  | DirectiveDefinitionNode;
+    | NameNode
+    | DocumentNode
+    | OperationDefinitionNode
+    | VariableDefinitionNode
+    | VariableNode
+    | SelectionSetNode
+    | FieldNode
+    | ArgumentNode
+    | FragmentSpreadNode
+    | InlineFragmentNode
+    | FragmentDefinitionNode
+    | IntValueNode
+    | FloatValueNode
+    | StringValueNode
+    | BooleanValueNode
+    | NullValueNode
+    | EnumValueNode
+    | ListValueNode
+    | ObjectValueNode
+    | ObjectFieldNode
+    | DirectiveNode
+    | NamedTypeNode
+    | ListTypeNode
+    | NonNullTypeNode
+    | SchemaDefinitionNode
+    | OperationTypeDefinitionNode
+    | ScalarTypeDefinitionNode
+    | ObjectTypeDefinitionNode
+    | FieldDefinitionNode
+    | InputValueDefinitionNode
+    | InterfaceTypeDefinitionNode
+    | UnionTypeDefinitionNode
+    | EnumTypeDefinitionNode
+    | EnumValueDefinitionNode
+    | InputObjectTypeDefinitionNode
+    | ScalarTypeExtensionNode
+    | ObjectTypeExtensionNode
+    | InterfaceTypeExtensionNode
+    | UnionTypeExtensionNode
+    | EnumTypeExtensionNode
+    | InputObjectTypeExtensionNode
+    | DirectiveDefinitionNode;
 
 /**
  * Utility type listing all nodes indexed by their kind.
  */
 export interface ASTKindToNode {
-  Name: NameNode;
-  Document: DocumentNode;
-  OperationDefinition: OperationDefinitionNode;
-  VariableDefinition: VariableDefinitionNode;
-  Variable: VariableNode;
-  SelectionSet: SelectionSetNode;
-  Field: FieldNode;
-  Argument: ArgumentNode;
-  FragmentSpread: FragmentSpreadNode;
-  InlineFragment: InlineFragmentNode;
-  FragmentDefinition: FragmentDefinitionNode;
-  IntValue: IntValueNode;
-  FloatValue: FloatValueNode;
-  StringValue: StringValueNode;
-  BooleanValue: BooleanValueNode;
-  NullValue: NullValueNode;
-  EnumValue: EnumValueNode;
-  ListValue: ListValueNode;
-  ObjectValue: ObjectValueNode;
-  ObjectField: ObjectFieldNode;
-  Directive: DirectiveNode;
-  NamedType: NamedTypeNode;
-  ListType: ListTypeNode;
-  NonNullType: NonNullTypeNode;
-  SchemaDefinition: SchemaDefinitionNode;
-  OperationTypeDefinition: OperationTypeDefinitionNode;
-  ScalarTypeDefinition: ScalarTypeDefinitionNode;
-  ObjectTypeDefinition: ObjectTypeDefinitionNode;
-  FieldDefinition: FieldDefinitionNode;
-  InputValueDefinition: InputValueDefinitionNode;
-  InterfaceTypeDefinition: InterfaceTypeDefinitionNode;
-  UnionTypeDefinition: UnionTypeDefinitionNode;
-  EnumTypeDefinition: EnumTypeDefinitionNode;
-  EnumValueDefinition: EnumValueDefinitionNode;
-  InputObjectTypeDefinition: InputObjectTypeDefinitionNode;
-  ScalarTypeExtension: ScalarTypeExtensionNode;
-  ObjectTypeExtension: ObjectTypeExtensionNode;
-  InterfaceTypeExtension: InterfaceTypeExtensionNode;
-  UnionTypeExtension: UnionTypeExtensionNode;
-  EnumTypeExtension: EnumTypeExtensionNode;
-  InputObjectTypeExtension: InputObjectTypeExtensionNode;
-  DirectiveDefinition: DirectiveDefinitionNode;
+    Name: NameNode;
+    Document: DocumentNode;
+    OperationDefinition: OperationDefinitionNode;
+    VariableDefinition: VariableDefinitionNode;
+    Variable: VariableNode;
+    SelectionSet: SelectionSetNode;
+    Field: FieldNode;
+    Argument: ArgumentNode;
+    FragmentSpread: FragmentSpreadNode;
+    InlineFragment: InlineFragmentNode;
+    FragmentDefinition: FragmentDefinitionNode;
+    IntValue: IntValueNode;
+    FloatValue: FloatValueNode;
+    StringValue: StringValueNode;
+    BooleanValue: BooleanValueNode;
+    NullValue: NullValueNode;
+    EnumValue: EnumValueNode;
+    ListValue: ListValueNode;
+    ObjectValue: ObjectValueNode;
+    ObjectField: ObjectFieldNode;
+    Directive: DirectiveNode;
+    NamedType: NamedTypeNode;
+    ListType: ListTypeNode;
+    NonNullType: NonNullTypeNode;
+    SchemaDefinition: SchemaDefinitionNode;
+    OperationTypeDefinition: OperationTypeDefinitionNode;
+    ScalarTypeDefinition: ScalarTypeDefinitionNode;
+    ObjectTypeDefinition: ObjectTypeDefinitionNode;
+    FieldDefinition: FieldDefinitionNode;
+    InputValueDefinition: InputValueDefinitionNode;
+    InterfaceTypeDefinition: InterfaceTypeDefinitionNode;
+    UnionTypeDefinition: UnionTypeDefinitionNode;
+    EnumTypeDefinition: EnumTypeDefinitionNode;
+    EnumValueDefinition: EnumValueDefinitionNode;
+    InputObjectTypeDefinition: InputObjectTypeDefinitionNode;
+    ScalarTypeExtension: ScalarTypeExtensionNode;
+    ObjectTypeExtension: ObjectTypeExtensionNode;
+    InterfaceTypeExtension: InterfaceTypeExtensionNode;
+    UnionTypeExtension: UnionTypeExtensionNode;
+    EnumTypeExtension: EnumTypeExtensionNode;
+    InputObjectTypeExtension: InputObjectTypeExtensionNode;
+    DirectiveDefinition: DirectiveDefinitionNode;
 }
 
 // Name
 
 export interface NameNode {
-  kind: 'Name';
-  loc?: Location;
-  value: string;
+    kind: "Name";
+    loc?: Location;
+    value: string;
 }
 
 // Document
 
 export interface DocumentNode {
-  kind: 'Document';
-  loc?: Location;
-  definitions: DefinitionNode[];
+    kind: "Document";
+    loc?: Location;
+    definitions: DefinitionNode[];
 }
 
-export type DefinitionNode =
-  | ExecutableDefinitionNode
-  | TypeSystemDefinitionNode; // experimental non-spec addition.
+export type DefinitionNode = ExecutableDefinitionNode | TypeSystemDefinitionNode; // experimental non-spec addition.
 
-export type ExecutableDefinitionNode =
-  | OperationDefinitionNode
-  | FragmentDefinitionNode;
+export type ExecutableDefinitionNode = OperationDefinitionNode | FragmentDefinitionNode;
 
 export interface OperationDefinitionNode {
-  kind: 'OperationDefinition';
-  loc?: Location;
-  operation: OperationTypeNode;
-  name?: NameNode;
-  variableDefinitions?: VariableDefinitionNode[];
-  directives?: DirectiveNode[];
-  selectionSet: SelectionSetNode;
+    kind: "OperationDefinition";
+    loc?: Location;
+    operation: OperationTypeNode;
+    name?: NameNode;
+    variableDefinitions?: VariableDefinitionNode[];
+    directives?: DirectiveNode[];
+    selectionSet: SelectionSetNode;
 }
 
 // Note: subscription is an experimental non-spec addition.
-export type OperationTypeNode = 'query' | 'mutation' | 'subscription';
+export type OperationTypeNode = "query" | "mutation" | "subscription";
 
 export interface VariableDefinitionNode {
-  kind: 'VariableDefinition';
-  loc?: Location;
-  variable: VariableNode;
-  type: TypeNode;
-  defaultValue?: ValueNode;
+    kind: "VariableDefinition";
+    loc?: Location;
+    variable: VariableNode;
+    type: TypeNode;
+    defaultValue?: ValueNode;
 }
 
 export interface VariableNode {
-  kind: 'Variable';
-  loc?: Location;
-  name: NameNode;
+    kind: "Variable";
+    loc?: Location;
+    name: NameNode;
 }
 
 export interface SelectionSetNode {
-  kind: 'SelectionSet';
-  loc?: Location;
-  selections: SelectionNode[];
+    kind: "SelectionSet";
+    loc?: Location;
+    selections: SelectionNode[];
 }
 
 export type SelectionNode = FieldNode | FragmentSpreadNode | InlineFragmentNode;
 
 export interface FieldNode {
-  kind: 'Field';
-  loc?: Location;
-  alias?: NameNode;
-  name: NameNode;
-  arguments?: ArgumentNode[];
-  directives?: DirectiveNode[];
-  selectionSet?: SelectionSetNode;
+    kind: "Field";
+    loc?: Location;
+    alias?: NameNode;
+    name: NameNode;
+    arguments?: ArgumentNode[];
+    directives?: DirectiveNode[];
+    selectionSet?: SelectionSetNode;
 }
 
 export interface ArgumentNode {
-  kind: 'Argument';
-  loc?: Location;
-  name: NameNode;
-  value: ValueNode;
+    kind: "Argument";
+    loc?: Location;
+    name: NameNode;
+    value: ValueNode;
 }
 
 // Fragments
 
 export interface FragmentSpreadNode {
-  kind: 'FragmentSpread';
-  loc?: Location;
-  name: NameNode;
-  directives?: DirectiveNode[];
+    kind: "FragmentSpread";
+    loc?: Location;
+    name: NameNode;
+    directives?: DirectiveNode[];
 }
 
 export interface InlineFragmentNode {
-  kind: 'InlineFragment';
-  loc?: Location;
-  typeCondition?: NamedTypeNode;
-  directives?: DirectiveNode[];
-  selectionSet: SelectionSetNode;
+    kind: "InlineFragment";
+    loc?: Location;
+    typeCondition?: NamedTypeNode;
+    directives?: DirectiveNode[];
+    selectionSet: SelectionSetNode;
 }
 
 export interface FragmentDefinitionNode {
-  kind: 'FragmentDefinition';
-  loc?: Location;
-  name: NameNode;
-  // Note: fragment variable definitions are experimental and may be changed
-  // or removed in the future.
-  variableDefinitions?: VariableDefinitionNode[];
-  typeCondition: NamedTypeNode;
-  directives?: DirectiveNode[];
-  selectionSet: SelectionSetNode;
+    kind: "FragmentDefinition";
+    loc?: Location;
+    name: NameNode;
+    // Note: fragment variable definitions are experimental and may be changed
+    // or removed in the future.
+    variableDefinitions?: VariableDefinitionNode[];
+    typeCondition: NamedTypeNode;
+    directives?: DirectiveNode[];
+    selectionSet: SelectionSetNode;
 }
 
 // Values
 
 export type ValueNode =
-  | VariableNode
-  | IntValueNode
-  | FloatValueNode
-  | StringValueNode
-  | BooleanValueNode
-  | NullValueNode
-  | EnumValueNode
-  | ListValueNode
-  | ObjectValueNode;
+    | VariableNode
+    | IntValueNode
+    | FloatValueNode
+    | StringValueNode
+    | BooleanValueNode
+    | NullValueNode
+    | EnumValueNode
+    | ListValueNode
+    | ObjectValueNode;
 
 export interface IntValueNode {
-  kind: 'IntValue';
-  loc?: Location;
-  value: string;
+    kind: "IntValue";
+    loc?: Location;
+    value: string;
 }
 
 export interface FloatValueNode {
-  kind: 'FloatValue';
-  loc?: Location;
-  value: string;
+    kind: "FloatValue";
+    loc?: Location;
+    value: string;
 }
 
 export interface StringValueNode {
-  kind: 'StringValue';
-  loc?: Location;
-  value: string;
+    kind: "StringValue";
+    loc?: Location;
+    value: string;
 }
 
 export interface BooleanValueNode {
-  kind: 'BooleanValue';
-  loc?: Location;
-  value: boolean;
+    kind: "BooleanValue";
+    loc?: Location;
+    value: boolean;
 }
 
 export interface NullValueNode {
-  kind: 'NullValue';
-  loc?: Location;
+    kind: "NullValue";
+    loc?: Location;
 }
 
 export interface EnumValueNode {
-  kind: 'EnumValue';
-  loc?: Location;
-  value: string;
+    kind: "EnumValue";
+    loc?: Location;
+    value: string;
 }
 
 export interface ListValueNode {
-  kind: 'ListValue';
-  loc?: Location;
-  values: ValueNode[];
+    kind: "ListValue";
+    loc?: Location;
+    values: ValueNode[];
 }
 
 export interface ObjectValueNode {
-  kind: 'ObjectValue';
-  loc?: Location;
-  fields: ObjectFieldNode[];
+    kind: "ObjectValue";
+    loc?: Location;
+    fields: ObjectFieldNode[];
 }
 
 export interface ObjectFieldNode {
-  kind: 'ObjectField';
-  loc?: Location;
-  name: NameNode;
-  value: ValueNode;
+    kind: "ObjectField";
+    loc?: Location;
+    name: NameNode;
+    value: ValueNode;
 }
 
 // Directives
 
 export interface DirectiveNode {
-  kind: 'Directive';
-  loc?: Location;
-  name: NameNode;
-  arguments?: ArgumentNode[];
+    kind: "Directive";
+    loc?: Location;
+    name: NameNode;
+    arguments?: ArgumentNode[];
 }
 
 // Type Reference
@@ -384,198 +380,198 @@ export interface DirectiveNode {
 export type TypeNode = NamedTypeNode | ListTypeNode | NonNullTypeNode;
 
 export interface NamedTypeNode {
-  kind: 'NamedType';
-  loc?: Location;
-  name: NameNode;
+    kind: "NamedType";
+    loc?: Location;
+    name: NameNode;
 }
 
 export interface ListTypeNode {
-  kind: 'ListType';
-  loc?: Location;
-  type: TypeNode;
+    kind: "ListType";
+    loc?: Location;
+    type: TypeNode;
 }
 
 export interface NonNullTypeNode {
-  kind: 'NonNullType';
-  loc?: Location;
-  type: NamedTypeNode | ListTypeNode;
+    kind: "NonNullType";
+    loc?: Location;
+    type: NamedTypeNode | ListTypeNode;
 }
 
 // Type System Definition
 
 export type TypeSystemDefinitionNode =
-  | SchemaDefinitionNode
-  | TypeDefinitionNode
-  | TypeExtensionNode
-  | DirectiveDefinitionNode;
+    | SchemaDefinitionNode
+    | TypeDefinitionNode
+    | TypeExtensionNode
+    | DirectiveDefinitionNode;
 
 export interface SchemaDefinitionNode {
-  kind: 'SchemaDefinition';
-  loc?: Location;
-  directives: DirectiveNode[];
-  operationTypes: OperationTypeDefinitionNode[];
+    kind: "SchemaDefinition";
+    loc?: Location;
+    directives: DirectiveNode[];
+    operationTypes: OperationTypeDefinitionNode[];
 }
 
 export interface OperationTypeDefinitionNode {
-  kind: 'OperationTypeDefinition';
-  loc?: Location;
-  operation: OperationTypeNode;
-  type: NamedTypeNode;
+    kind: "OperationTypeDefinition";
+    loc?: Location;
+    operation: OperationTypeNode;
+    type: NamedTypeNode;
 }
 
 export type TypeDefinitionNode =
-  | ScalarTypeDefinitionNode
-  | ObjectTypeDefinitionNode
-  | InterfaceTypeDefinitionNode
-  | UnionTypeDefinitionNode
-  | EnumTypeDefinitionNode
-  | InputObjectTypeDefinitionNode;
+    | ScalarTypeDefinitionNode
+    | ObjectTypeDefinitionNode
+    | InterfaceTypeDefinitionNode
+    | UnionTypeDefinitionNode
+    | EnumTypeDefinitionNode
+    | InputObjectTypeDefinitionNode;
 
 export interface ScalarTypeDefinitionNode {
-  kind: 'ScalarTypeDefinition';
-  loc?: Location;
-  description?: StringValueNode;
-  name: NameNode;
-  directives?: DirectiveNode[];
+    kind: "ScalarTypeDefinition";
+    loc?: Location;
+    description?: StringValueNode;
+    name: NameNode;
+    directives?: DirectiveNode[];
 }
 
 export interface ObjectTypeDefinitionNode {
-  kind: 'ObjectTypeDefinition';
-  loc?: Location;
-  description?: StringValueNode;
-  name: NameNode;
-  interfaces?: NamedTypeNode[];
-  directives?: DirectiveNode[];
-  fields: FieldDefinitionNode[];
+    kind: "ObjectTypeDefinition";
+    loc?: Location;
+    description?: StringValueNode;
+    name: NameNode;
+    interfaces?: NamedTypeNode[];
+    directives?: DirectiveNode[];
+    fields: FieldDefinitionNode[];
 }
 
 export interface FieldDefinitionNode {
-  kind: 'FieldDefinition';
-  loc?: Location;
-  description?: StringValueNode;
-  name: NameNode;
-  arguments: InputValueDefinitionNode[];
-  type: TypeNode;
-  directives?: DirectiveNode[];
+    kind: "FieldDefinition";
+    loc?: Location;
+    description?: StringValueNode;
+    name: NameNode;
+    arguments: InputValueDefinitionNode[];
+    type: TypeNode;
+    directives?: DirectiveNode[];
 }
 
 export interface InputValueDefinitionNode {
-  kind: 'InputValueDefinition';
-  loc?: Location;
-  description?: StringValueNode;
-  name: NameNode;
-  type: TypeNode;
-  defaultValue?: ValueNode;
-  directives?: DirectiveNode[];
+    kind: "InputValueDefinition";
+    loc?: Location;
+    description?: StringValueNode;
+    name: NameNode;
+    type: TypeNode;
+    defaultValue?: ValueNode;
+    directives?: DirectiveNode[];
 }
 
 export interface InterfaceTypeDefinitionNode {
-  kind: 'InterfaceTypeDefinition';
-  loc?: Location;
-  description?: StringValueNode;
-  name: NameNode;
-  directives?: DirectiveNode[];
-  fields: FieldDefinitionNode[];
+    kind: "InterfaceTypeDefinition";
+    loc?: Location;
+    description?: StringValueNode;
+    name: NameNode;
+    directives?: DirectiveNode[];
+    fields: FieldDefinitionNode[];
 }
 
 export interface UnionTypeDefinitionNode {
-  kind: 'UnionTypeDefinition';
-  loc?: Location;
-  description?: StringValueNode;
-  name: NameNode;
-  directives?: DirectiveNode[];
-  types: NamedTypeNode[];
+    kind: "UnionTypeDefinition";
+    loc?: Location;
+    description?: StringValueNode;
+    name: NameNode;
+    directives?: DirectiveNode[];
+    types: NamedTypeNode[];
 }
 
 export interface EnumTypeDefinitionNode {
-  kind: 'EnumTypeDefinition';
-  loc?: Location;
-  description?: StringValueNode;
-  name: NameNode;
-  directives?: DirectiveNode[];
-  values: EnumValueDefinitionNode[];
+    kind: "EnumTypeDefinition";
+    loc?: Location;
+    description?: StringValueNode;
+    name: NameNode;
+    directives?: DirectiveNode[];
+    values: EnumValueDefinitionNode[];
 }
 
 export interface EnumValueDefinitionNode {
-  kind: 'EnumValueDefinition';
-  loc?: Location;
-  description?: StringValueNode;
-  name: NameNode;
-  directives?: DirectiveNode[];
+    kind: "EnumValueDefinition";
+    loc?: Location;
+    description?: StringValueNode;
+    name: NameNode;
+    directives?: DirectiveNode[];
 }
 
 export interface InputObjectTypeDefinitionNode {
-  kind: 'InputObjectTypeDefinition';
-  loc?: Location;
-  description?: StringValueNode;
-  name: NameNode;
-  directives?: DirectiveNode[];
-  fields: InputValueDefinitionNode[];
+    kind: "InputObjectTypeDefinition";
+    loc?: Location;
+    description?: StringValueNode;
+    name: NameNode;
+    directives?: DirectiveNode[];
+    fields: InputValueDefinitionNode[];
 }
 
 export type TypeExtensionNode =
-  | ScalarTypeExtensionNode
-  | ObjectTypeExtensionNode
-  | InterfaceTypeExtensionNode
-  | UnionTypeExtensionNode
-  | EnumTypeExtensionNode
-  | InputObjectTypeExtensionNode;
+    | ScalarTypeExtensionNode
+    | ObjectTypeExtensionNode
+    | InterfaceTypeExtensionNode
+    | UnionTypeExtensionNode
+    | EnumTypeExtensionNode
+    | InputObjectTypeExtensionNode;
 
 export type ScalarTypeExtensionNode = {
-  kind: 'ScalarTypeExtension';
-  loc?: Location;
-  name: NameNode;
-  directives?: DirectiveNode[];
+    kind: "ScalarTypeExtension";
+    loc?: Location;
+    name: NameNode;
+    directives?: DirectiveNode[];
 };
 
 export type ObjectTypeExtensionNode = {
-  kind: 'ObjectTypeExtension';
-  loc?: Location;
-  name: NameNode;
-  interfaces?: NamedTypeNode[];
-  directives?: DirectiveNode[];
-  fields?: FieldDefinitionNode[];
+    kind: "ObjectTypeExtension";
+    loc?: Location;
+    name: NameNode;
+    interfaces?: NamedTypeNode[];
+    directives?: DirectiveNode[];
+    fields?: FieldDefinitionNode[];
 };
 
 export type InterfaceTypeExtensionNode = {
-  kind: 'InterfaceTypeExtension';
-  loc?: Location;
-  name: NameNode;
-  directives?: DirectiveNode[];
-  fields?: FieldDefinitionNode[];
+    kind: "InterfaceTypeExtension";
+    loc?: Location;
+    name: NameNode;
+    directives?: DirectiveNode[];
+    fields?: FieldDefinitionNode[];
 };
 
 export type UnionTypeExtensionNode = {
-  kind: 'UnionTypeExtension';
-  loc?: Location;
-  name: NameNode;
-  directives?: DirectiveNode[];
-  types?: NamedTypeNode[];
+    kind: "UnionTypeExtension";
+    loc?: Location;
+    name: NameNode;
+    directives?: DirectiveNode[];
+    types?: NamedTypeNode[];
 };
 
 export type EnumTypeExtensionNode = {
-  kind: 'EnumTypeExtension';
-  loc?: Location;
-  name: NameNode;
-  directives?: DirectiveNode[];
-  values?: EnumValueDefinitionNode[];
+    kind: "EnumTypeExtension";
+    loc?: Location;
+    name: NameNode;
+    directives?: DirectiveNode[];
+    values?: EnumValueDefinitionNode[];
 };
 
 export type InputObjectTypeExtensionNode = {
-  kind: 'InputObjectTypeExtension';
-  loc?: Location;
-  name: NameNode;
-  directives?: DirectiveNode[];
-  fields?: InputValueDefinitionNode[];
+    kind: "InputObjectTypeExtension";
+    loc?: Location;
+    name: NameNode;
+    directives?: DirectiveNode[];
+    fields?: InputValueDefinitionNode[];
 };
 
 // Directive Definitions
 
 export interface DirectiveDefinitionNode {
-  kind: 'DirectiveDefinition';
-  loc?: Location;
-  description?: StringValueNode;
-  name: NameNode;
-  arguments?: InputValueDefinitionNode[];
-  locations: NameNode[];
+    kind: "DirectiveDefinition";
+    loc?: Location;
+    description?: StringValueNode;
+    name: NameNode;
+    arguments?: InputValueDefinitionNode[];
+    locations: NameNode[];
 }
diff --git a/types/graphql/language/index.d.ts b/types/graphql/language/index.d.ts
index c8fe4b13ec..db088e6925 100644
--- a/types/graphql/language/index.d.ts
+++ b/types/graphql/language/index.d.ts
@@ -1,15 +1,9 @@
-export * from './ast';
-export { getLocation } from './location';
-import * as Kind from './kinds';
+export * from "./ast";
+export { getLocation } from "./location";
+import * as Kind from "./kinds";
 export { Kind };
-export { createLexer, TokenKind, Lexer } from './lexer';
-export { parse, parseValue, parseType, ParseOptions } from './parser';
-export { print } from './printer';
-export { Source } from './source';
-export {
-  visit,
-  visitInParallel,
-  visitWithTypeInfo,
-  getVisitFn,
-  BREAK,
-} from './visitor';
+export { createLexer, TokenKind, Lexer } from "./lexer";
+export { parse, parseValue, parseType, ParseOptions } from "./parser";
+export { print } from "./printer";
+export { Source } from "./source";
+export { visit, visitInParallel, visitWithTypeInfo, getVisitFn, BREAK } from "./visitor";
diff --git a/types/graphql/language/kinds.d.ts b/types/graphql/language/kinds.d.ts
index f92826f891..2e7db3ad87 100644
--- a/types/graphql/language/kinds.d.ts
+++ b/types/graphql/language/kinds.d.ts
@@ -1,72 +1,72 @@
 // Name
 
-export const NAME: 'Name';
+export const NAME: "Name";
 
 // Document
 
-export const DOCUMENT: 'Document';
-export const OPERATION_DEFINITION: 'OperationDefinition';
-export const VARIABLE_DEFINITION: 'VariableDefinition';
-export const VARIABLE: 'Variable';
-export const SELECTION_SET: 'SelectionSet';
-export const FIELD: 'Field';
-export const ARGUMENT: 'Argument';
+export const DOCUMENT: "Document";
+export const OPERATION_DEFINITION: "OperationDefinition";
+export const VARIABLE_DEFINITION: "VariableDefinition";
+export const VARIABLE: "Variable";
+export const SELECTION_SET: "SelectionSet";
+export const FIELD: "Field";
+export const ARGUMENT: "Argument";
 
 // Fragments
 
-export const FRAGMENT_SPREAD: 'FragmentSpread';
-export const INLINE_FRAGMENT: 'InlineFragment';
-export const FRAGMENT_DEFINITION: 'FragmentDefinition';
+export const FRAGMENT_SPREAD: "FragmentSpread";
+export const INLINE_FRAGMENT: "InlineFragment";
+export const FRAGMENT_DEFINITION: "FragmentDefinition";
 
 // Values
 
-export const INT: 'IntValue';
-export const FLOAT: 'FloatValue';
-export const STRING: 'StringValue';
-export const BOOLEAN: 'BooleanValue';
-export const NULL: 'NullValue';
-export const ENUM: 'EnumValue';
-export const LIST: 'ListValue';
-export const OBJECT: 'ObjectValue';
-export const OBJECT_FIELD: 'ObjectField';
+export const INT: "IntValue";
+export const FLOAT: "FloatValue";
+export const STRING: "StringValue";
+export const BOOLEAN: "BooleanValue";
+export const NULL: "NullValue";
+export const ENUM: "EnumValue";
+export const LIST: "ListValue";
+export const OBJECT: "ObjectValue";
+export const OBJECT_FIELD: "ObjectField";
 
 // Directives
 
-export const DIRECTIVE: 'Directive';
+export const DIRECTIVE: "Directive";
 
 // Types
 
-export const NAMED_TYPE: 'NamedType';
-export const LIST_TYPE: 'ListType';
-export const NON_NULL_TYPE: 'NonNullType';
+export const NAMED_TYPE: "NamedType";
+export const LIST_TYPE: "ListType";
+export const NON_NULL_TYPE: "NonNullType";
 
 // Type System Definitions
 
-export const SCHEMA_DEFINITION: 'SchemaDefinition';
-export const OPERATION_TYPE_DEFINITION: 'OperationTypeDefinition';
+export const SCHEMA_DEFINITION: "SchemaDefinition";
+export const OPERATION_TYPE_DEFINITION: "OperationTypeDefinition";
 
 // Type Definitions
 
-export const SCALAR_TYPE_DEFINITION: 'ScalarTypeDefinition';
-export const OBJECT_TYPE_DEFINITION: 'ObjectTypeDefinition';
-export const FIELD_DEFINITION: 'FieldDefinition';
-export const INPUT_VALUE_DEFINITION: 'InputValueDefinition';
-export const INTERFACE_TYPE_DEFINITION: 'InterfaceTypeDefinition';
-export const UNION_TYPE_DEFINITION: 'UnionTypeDefinition';
-export const ENUM_TYPE_DEFINITION: 'EnumTypeDefinition';
-export const ENUM_VALUE_DEFINITION: 'EnumValueDefinition';
-export const INPUT_OBJECT_TYPE_DEFINITION: 'InputObjectTypeDefinition';
+export const SCALAR_TYPE_DEFINITION: "ScalarTypeDefinition";
+export const OBJECT_TYPE_DEFINITION: "ObjectTypeDefinition";
+export const FIELD_DEFINITION: "FieldDefinition";
+export const INPUT_VALUE_DEFINITION: "InputValueDefinition";
+export const INTERFACE_TYPE_DEFINITION: "InterfaceTypeDefinition";
+export const UNION_TYPE_DEFINITION: "UnionTypeDefinition";
+export const ENUM_TYPE_DEFINITION: "EnumTypeDefinition";
+export const ENUM_VALUE_DEFINITION: "EnumValueDefinition";
+export const INPUT_OBJECT_TYPE_DEFINITION: "InputObjectTypeDefinition";
 
 // Type Extensions
 
-export const TYPE_EXTENSION_DEFINITION: 'TypeExtensionDefinition';
-export const SCALAR_TYPE_EXTENSION: 'ScalarTypeExtension';
-export const OBJECT_TYPE_EXTENSION: 'ObjectTypeExtension';
-export const INTERFACE_TYPE_EXTENSION: 'InterfaceTypeExtension';
-export const UNION_TYPE_EXTENSION: 'UnionTypeExtension';
-export const ENUM_TYPE_EXTENSION: 'EnumTypeExtension';
-export const INPUT_OBJECT_TYPE_EXTENSION: 'InputObjectTypeExtension';
+export const TYPE_EXTENSION_DEFINITION: "TypeExtensionDefinition";
+export const SCALAR_TYPE_EXTENSION: "ScalarTypeExtension";
+export const OBJECT_TYPE_EXTENSION: "ObjectTypeExtension";
+export const INTERFACE_TYPE_EXTENSION: "InterfaceTypeExtension";
+export const UNION_TYPE_EXTENSION: "UnionTypeExtension";
+export const ENUM_TYPE_EXTENSION: "EnumTypeExtension";
+export const INPUT_OBJECT_TYPE_EXTENSION: "InputObjectTypeExtension";
 
 // Directive Definitions
 
-export const DIRECTIVE_DEFINITION: 'DirectiveDefinition';
+export const DIRECTIVE_DEFINITION: "DirectiveDefinition";
diff --git a/types/graphql/language/lexer.d.ts b/types/graphql/language/lexer.d.ts
index 0db85434e2..27db5b04cc 100644
--- a/types/graphql/language/lexer.d.ts
+++ b/types/graphql/language/lexer.d.ts
@@ -1,6 +1,6 @@
-import { Token } from './ast';
-import { Source } from './source';
-import { syntaxError } from '../error';
+import { Token } from "./ast";
+import { Source } from "./source";
+import { syntaxError } from "../error";
 
 /**
  * Given a Source object, this returns a Lexer for that source.
@@ -10,42 +10,39 @@ import { syntaxError } from '../error';
  * EOF, after which the lexer will repeatedly return the same EOF token
  * whenever called.
  */
-export function createLexer<TOptions>(
-  source: Source,
-  options: TOptions,
-): Lexer<TOptions>;
+export function createLexer<TOptions>(source: Source, options: TOptions): Lexer<TOptions>;
 
 /**
  * The return type of createLexer.
  */
 export interface Lexer<TOptions> {
-  source: Source;
-  options: TOptions;
+    source: Source;
+    options: TOptions;
 
-  /**
-   * The previously focused non-ignored token.
-   */
-  lastToken: Token;
+    /**
+     * The previously focused non-ignored token.
+     */
+    lastToken: Token;
 
-  /**
-   * The currently focused non-ignored token.
-   */
-  token: Token;
+    /**
+     * The currently focused non-ignored token.
+     */
+    token: Token;
 
-  /**
-   * The (1-indexed) line containing the current token.
-   */
-  line: number;
+    /**
+     * The (1-indexed) line containing the current token.
+     */
+    line: number;
 
-  /**
-   * The character offset at which the current line begins.
-   */
-  lineStart: number;
+    /**
+     * The character offset at which the current line begins.
+     */
+    lineStart: number;
 
-  /**
-   * Advances the token stream to the next non-ignored token.
-   */
-  advance(): Token;
+    /**
+     * Advances the token stream to the next non-ignored token.
+     */
+    advance(): Token;
 }
 
 /**
@@ -53,26 +50,26 @@ export interface Lexer<TOptions> {
  * lexer emits.
  */
 export const TokenKind: {
-  SOF: '<SOF>';
-  EOF: '<EOF>';
-  BANG: '!';
-  DOLLAR: '$';
-  PAREN_L: '(';
-  PAREN_R: ')';
-  SPREAD: '...';
-  COLON: ':';
-  EQUALS: '=';
-  AT: '@';
-  BRACKET_L: '[';
-  BRACKET_R: ']';
-  BRACE_L: '{';
-  PIPE: '|';
-  BRACE_R: '}';
-  NAME: 'Name';
-  INT: 'Int';
-  FLOAT: 'Float';
-  STRING: 'String';
-  COMMENT: 'Comment';
+    SOF: "<SOF>";
+    EOF: "<EOF>";
+    BANG: "!";
+    DOLLAR: "$";
+    PAREN_L: "(";
+    PAREN_R: ")";
+    SPREAD: "...";
+    COLON: ":";
+    EQUALS: "=";
+    AT: "@";
+    BRACKET_L: "[";
+    BRACKET_R: "]";
+    BRACE_L: "{";
+    PIPE: "|";
+    BRACE_R: "}";
+    NAME: "Name";
+    INT: "Int";
+    FLOAT: "Float";
+    STRING: "String";
+    COMMENT: "Comment";
 };
 
 /**
diff --git a/types/graphql/language/location.d.ts b/types/graphql/language/location.d.ts
index cb9744e0d5..4d7a13e314 100644
--- a/types/graphql/language/location.d.ts
+++ b/types/graphql/language/location.d.ts
@@ -1,8 +1,8 @@
-import { Source } from './source';
+import { Source } from "./source";
 
 export interface SourceLocation {
-  line: number;
-  column: number;
+    line: number;
+    column: number;
 }
 
 export function getLocation(source: Source, position: number): SourceLocation;
diff --git a/types/graphql/language/parser.d.ts b/types/graphql/language/parser.d.ts
index ffafaae7fb..3cdb3462ae 100644
--- a/types/graphql/language/parser.d.ts
+++ b/types/graphql/language/parser.d.ts
@@ -1,66 +1,62 @@
-import { NamedTypeNode, TypeNode, ValueNode, DocumentNode } from './ast';
-import { Source } from './source';
-import { Lexer } from './lexer';
+import { NamedTypeNode, TypeNode, ValueNode, DocumentNode } from "./ast";
+import { Source } from "./source";
+import { Lexer } from "./lexer";
 
 /**
  * Configuration options to control parser behavior
  */
 export interface ParseOptions {
+    /**
+     * By default, the parser creates AST nodes that know the location
+     * in the source that they correspond to. This configuration flag
+     * disables that behavior for performance or testing.
+     */
+    noLocation?: boolean;
 
-  /**
-   * By default, the parser creates AST nodes that know the location
-   * in the source that they correspond to. This configuration flag
-   * disables that behavior for performance or testing.
-   */
-  noLocation?: boolean,
+    /**
+     * If enabled, the parser will parse empty fields sets in the Schema
+     * Definition Language. Otherwise, the parser will follow the current
+     * specification.
+     *
+     * This option is provided to ease adoption of the final SDL specification
+     * and will be removed in a future major release.
+     */
+    allowLegacySDLEmptyFields?: boolean;
 
-  /**
-   * If enabled, the parser will parse empty fields sets in the Schema
-   * Definition Language. Otherwise, the parser will follow the current
-   * specification.
-   *
-   * This option is provided to ease adoption of the final SDL specification
-   * and will be removed in a future major release.
-   */
-  allowLegacySDLEmptyFields?: boolean,
+    /**
+     * If enabled, the parser will parse implemented interfaces with no `&`
+     * character between each interface. Otherwise, the parser will follow the
+     * current specification.
+     *
+     * This option is provided to ease adoption of the final SDL specification
+     * and will be removed in a future major release.
+     */
+    allowLegacySDLImplementsInterfaces?: boolean;
 
-  /**
-   * If enabled, the parser will parse implemented interfaces with no `&`
-   * character between each interface. Otherwise, the parser will follow the
-   * current specification.
-   *
-   * This option is provided to ease adoption of the final SDL specification
-   * and will be removed in a future major release.
-   */
-  allowLegacySDLImplementsInterfaces?: boolean,
-
-  /**
-   * EXPERIMENTAL:
-   *
-   * If enabled, the parser will understand and parse variable definitions
-   * contained in a fragment definition. They'll be represented in the
-   * `variableDefinitions` field of the FragmentDefinitionNode.
-   *
-   * The syntax is identical to normal, query-defined variables. For example:
-   *
-   *   fragment A($var: Boolean = false) on T  {
-   *     ...
-   *   }
-   *
-   * Note: this feature is experimental and may change or be removed in the
-   * future.
-   */
-  experimentalFragmentVariables?: boolean,
+    /**
+     * EXPERIMENTAL:
+     *
+     * If enabled, the parser will understand and parse variable definitions
+     * contained in a fragment definition. They'll be represented in the
+     * `variableDefinitions` field of the FragmentDefinitionNode.
+     *
+     * The syntax is identical to normal, query-defined variables. For example:
+     *
+     *   fragment A($var: Boolean = false) on T  {
+     *     ...
+     *   }
+     *
+     * Note: this feature is experimental and may change or be removed in the
+     * future.
+     */
+    experimentalFragmentVariables?: boolean;
 }
 
 /**
  * Given a GraphQL source, parses it into a Document.
  * Throws GraphQLError if a syntax error is encountered.
  */
-export function parse(
-  source: string | Source,
-  options?: ParseOptions,
-): DocumentNode;
+export function parse(source: string | Source, options?: ParseOptions): DocumentNode;
 
 /**
  * Given a string containing a GraphQL value, parse the AST for that value.
@@ -69,10 +65,7 @@ export function parse(
  * This is useful within tools that operate upon GraphQL Values directly and
  * in isolation of complete GraphQL documents.
  */
-export function parseValue(
-  source: Source | string,
-  options?: ParseOptions,
-): ValueNode;
+export function parseValue(source: Source | string, options?: ParseOptions): ValueNode;
 
 /**
  * Given a string containing a GraphQL Type (ex. `[Int!]`), parse the AST for
@@ -84,10 +77,7 @@ export function parseValue(
  *
  * Consider providing the results to the utility function: typeFromAST().
  */
-export function parseType(
-    source: Source | string,
-    options?: ParseOptions,
-): TypeNode;
+export function parseType(source: Source | string, options?: ParseOptions): TypeNode;
 
 export function parseConstValue<TOptions>(lexer: Lexer<TOptions>): ValueNode;
 
diff --git a/types/graphql/language/source.d.ts b/types/graphql/language/source.d.ts
index 236028b7df..80e68f5557 100644
--- a/types/graphql/language/source.d.ts
+++ b/types/graphql/language/source.d.ts
@@ -1,5 +1,5 @@
 export class Source {
-  body: string;
-  name: string;
-  constructor(body: string, name?: string);
+    body: string;
+    name: string;
+    constructor(body: string, name?: string);
 }
diff --git a/types/graphql/language/visitor.d.ts b/types/graphql/language/visitor.d.ts
index e7e9d67da0..320d181e4a 100644
--- a/types/graphql/language/visitor.d.ts
+++ b/types/graphql/language/visitor.d.ts
@@ -1,43 +1,43 @@
 export const QueryDocumentKeys: {
-  Name: any[];
-  Document: string[];
-  OperationDefinition: string[];
-  VariableDefinition: string[];
-  Variable: string[];
-  SelectionSet: string[];
-  Field: string[];
-  Argument: string[];
+    Name: any[];
+    Document: string[];
+    OperationDefinition: string[];
+    VariableDefinition: string[];
+    Variable: string[];
+    SelectionSet: string[];
+    Field: string[];
+    Argument: string[];
 
-  FragmentSpread: string[];
-  InlineFragment: string[];
-  FragmentDefinition: string[];
+    FragmentSpread: string[];
+    InlineFragment: string[];
+    FragmentDefinition: string[];
 
-  IntValue: number[];
-  FloatValue: number[];
-  StringValue: string[];
-  BooleanValue: boolean[];
-  NullValue: null[];
-  EnumValue: any[];
-  ListValue: string[];
-  ObjectValue: string[];
-  ObjectField: string[];
+    IntValue: number[];
+    FloatValue: number[];
+    StringValue: string[];
+    BooleanValue: boolean[];
+    NullValue: null[];
+    EnumValue: any[];
+    ListValue: string[];
+    ObjectValue: string[];
+    ObjectField: string[];
 
-  Directive: string[];
+    Directive: string[];
 
-  NamedType: string[];
-  ListType: string[];
-  NonNullType: string[];
+    NamedType: string[];
+    ListType: string[];
+    NonNullType: string[];
 
-  ObjectTypeDefinition: string[];
-  FieldDefinition: string[];
-  InputValueDefinition: string[];
-  InterfaceTypeDefinition: string[];
-  UnionTypeDefinition: string[];
-  ScalarTypeDefinition: string[];
-  EnumTypeDefinition: string[];
-  EnumValueDefinition: string[];
-  InputObjectTypeDefinition: string[];
-  TypeExtensionDefinition: string[];
+    ObjectTypeDefinition: string[];
+    FieldDefinition: string[];
+    InputValueDefinition: string[];
+    InterfaceTypeDefinition: string[];
+    UnionTypeDefinition: string[];
+    ScalarTypeDefinition: string[];
+    EnumTypeDefinition: string[];
+    EnumValueDefinition: string[];
+    InputObjectTypeDefinition: string[];
+    TypeExtensionDefinition: string[];
 };
 
 export const BREAK: any;
diff --git a/types/graphql/subscription/index.d.ts b/types/graphql/subscription/index.d.ts
index 11b0a7f26d..71583e7ff3 100644
--- a/types/graphql/subscription/index.d.ts
+++ b/types/graphql/subscription/index.d.ts
@@ -1 +1 @@
-export { subscribe, createSourceEventStream } from './subscribe';
+export { subscribe, createSourceEventStream } from "./subscribe";
diff --git a/types/graphql/subscription/subscribe.d.ts b/types/graphql/subscription/subscribe.d.ts
index dc2c096b86..c4eec87ac9 100644
--- a/types/graphql/subscription/subscribe.d.ts
+++ b/types/graphql/subscription/subscribe.d.ts
@@ -1,29 +1,29 @@
-import { GraphQLSchema } from '../type/schema';
-import { DocumentNode } from '../language/ast';
-import { GraphQLFieldResolver } from '../type/definition';
-import { ExecutionResult } from '../execution/execute';
+import { GraphQLSchema } from "../type/schema";
+import { DocumentNode } from "../language/ast";
+import { GraphQLFieldResolver } from "../type/definition";
+import { ExecutionResult } from "../execution/execute";
 
 export function subscribe(
-  schema: GraphQLSchema,
-  document: DocumentNode,
-  rootValue?: any,
-  contextValue?: any,
-  variableValues?: {
-    [key: string]: any;
-  },
-  operationName?: string,
-  fieldResolver?: GraphQLFieldResolver<any, any>,
-  subscribeFieldResolver?: GraphQLFieldResolver<any, any>,
+    schema: GraphQLSchema,
+    document: DocumentNode,
+    rootValue?: any,
+    contextValue?: any,
+    variableValues?: {
+        [key: string]: any;
+    },
+    operationName?: string,
+    fieldResolver?: GraphQLFieldResolver<any, any>,
+    subscribeFieldResolver?: GraphQLFieldResolver<any, any>
 ): Promise<AsyncIterator<ExecutionResult> | ExecutionResult>;
 
 export function createSourceEventStream(
-  schema: GraphQLSchema,
-  document: DocumentNode,
-  rootValue?: any,
-  contextValue?: any,
-  variableValues?: {
-    [key: string]: any;
-  },
-  operationName?: string,
-  fieldResolver?: GraphQLFieldResolver<any, any>,
+    schema: GraphQLSchema,
+    document: DocumentNode,
+    rootValue?: any,
+    contextValue?: any,
+    variableValues?: {
+        [key: string]: any;
+    },
+    operationName?: string,
+    fieldResolver?: GraphQLFieldResolver<any, any>
 ): Promise<AsyncIterable<any>>;
diff --git a/types/graphql/type/definition.d.ts b/types/graphql/type/definition.d.ts
index 098f7376ef..b31ac6bbed 100644
--- a/types/graphql/type/definition.d.ts
+++ b/types/graphql/type/definition.d.ts
@@ -1,33 +1,33 @@
 import {
-  ScalarTypeDefinitionNode,
-  ObjectTypeDefinitionNode,
-  FieldDefinitionNode,
-  InputValueDefinitionNode,
-  InterfaceTypeDefinitionNode,
-  UnionTypeDefinitionNode,
-  EnumTypeDefinitionNode,
-  EnumValueDefinitionNode,
-  InputObjectTypeDefinitionNode,
-  TypeExtensionNode,
-  OperationDefinitionNode,
-  FieldNode,
-  FragmentDefinitionNode,
-  ValueNode,
-} from '../language/ast';
-import { GraphQLSchema } from './schema';
+    ScalarTypeDefinitionNode,
+    ObjectTypeDefinitionNode,
+    FieldDefinitionNode,
+    InputValueDefinitionNode,
+    InterfaceTypeDefinitionNode,
+    UnionTypeDefinitionNode,
+    EnumTypeDefinitionNode,
+    EnumValueDefinitionNode,
+    InputObjectTypeDefinitionNode,
+    TypeExtensionNode,
+    OperationDefinitionNode,
+    FieldNode,
+    FragmentDefinitionNode,
+    ValueNode,
+} from "../language/ast";
+import { GraphQLSchema } from "./schema";
 
 /**
  * These are all of the possible kinds of types.
  */
 export type GraphQLType =
-  | GraphQLScalarType
-  | GraphQLObjectType
-  | GraphQLInterfaceType
-  | GraphQLUnionType
-  | GraphQLEnumType
-  | GraphQLInputObjectType
-  | GraphQLList<any>
-  | GraphQLNonNull<any>;
+    | GraphQLScalarType
+    | GraphQLObjectType
+    | GraphQLInterfaceType
+    | GraphQLUnionType
+    | GraphQLEnumType
+    | GraphQLInputObjectType
+    | GraphQLList<any>
+    | GraphQLNonNull<any>;
 
 export function isType(type: any): type is GraphQLType;
 
@@ -37,16 +37,11 @@ export function assertType(type: any): GraphQLType;
  * These types may be used as input types for arguments and directives.
  */
 export type GraphQLInputType =
-  | GraphQLScalarType
-  | GraphQLEnumType
-  | GraphQLInputObjectType
-  | GraphQLList<any>
-  | GraphQLNonNull<
-      | GraphQLScalarType
-      | GraphQLEnumType
-      | GraphQLInputObjectType
-      | GraphQLList<any>
-    >;
+    | GraphQLScalarType
+    | GraphQLEnumType
+    | GraphQLInputObjectType
+    | GraphQLList<any>
+    | GraphQLNonNull<GraphQLScalarType | GraphQLEnumType | GraphQLInputObjectType | GraphQLList<any>>;
 
 export function isInputType(type: GraphQLType): type is GraphQLInputType;
 
@@ -56,20 +51,20 @@ export function assertInputType(type: GraphQLType): GraphQLInputType;
  * These types may be used as output types as the result of fields.
  */
 export type GraphQLOutputType =
-  | GraphQLScalarType
-  | GraphQLObjectType
-  | GraphQLInterfaceType
-  | GraphQLUnionType
-  | GraphQLEnumType
-  | GraphQLList<any>
-  | GraphQLNonNull<
-      | GraphQLScalarType
-      | GraphQLObjectType
-      | GraphQLInterfaceType
-      | GraphQLUnionType
-      | GraphQLEnumType
-      | GraphQLList<any>
-    >;
+    | GraphQLScalarType
+    | GraphQLObjectType
+    | GraphQLInterfaceType
+    | GraphQLUnionType
+    | GraphQLEnumType
+    | GraphQLList<any>
+    | GraphQLNonNull<
+          | GraphQLScalarType
+          | GraphQLObjectType
+          | GraphQLInterfaceType
+          | GraphQLUnionType
+          | GraphQLEnumType
+          | GraphQLList<any>
+      >;
 
 export function isOutputType(type: GraphQLType): type is GraphQLOutputType;
 
@@ -87,14 +82,9 @@ export function assertLeafType(type: GraphQLType): GraphQLLeafType;
 /**
  * These types may describe the parent context of a selection set.
  */
-export type GraphQLCompositeType =
-  | GraphQLObjectType
-  | GraphQLInterfaceType
-  | GraphQLUnionType;
+export type GraphQLCompositeType = GraphQLObjectType | GraphQLInterfaceType | GraphQLUnionType;
 
-export function isCompositeType(
-  type: GraphQLType,
-): type is GraphQLCompositeType;
+export function isCompositeType(type: GraphQLType): type is GraphQLCompositeType;
 
 export function assertCompositeType(type: GraphQLType): GraphQLCompositeType;
 
@@ -111,28 +101,26 @@ export function assertAbstractType(type: GraphQLType): GraphQLAbstractType;
  * These types can all accept null as a value.
  */
 export type GraphQLNullableType =
-  | GraphQLScalarType
-  | GraphQLObjectType
-  | GraphQLInterfaceType
-  | GraphQLUnionType
-  | GraphQLEnumType
-  | GraphQLInputObjectType
-  | GraphQLList<any>;
+    | GraphQLScalarType
+    | GraphQLObjectType
+    | GraphQLInterfaceType
+    | GraphQLUnionType
+    | GraphQLEnumType
+    | GraphQLInputObjectType
+    | GraphQLList<any>;
 
-export function getNullableType<T extends GraphQLType>(
-  type: T,
-): T & GraphQLNullableType;
+export function getNullableType<T extends GraphQLType>(type: T): T & GraphQLNullableType;
 
 /**
  * These named types do not include modifiers like List or NonNull.
  */
 export type GraphQLNamedType =
-  | GraphQLScalarType
-  | GraphQLObjectType
-  | GraphQLInterfaceType
-  | GraphQLUnionType
-  | GraphQLEnumType
-  | GraphQLInputObjectType;
+    | GraphQLScalarType
+    | GraphQLObjectType
+    | GraphQLInterfaceType
+    | GraphQLUnionType
+    | GraphQLEnumType
+    | GraphQLInputObjectType;
 
 export function isNamedType(type: GraphQLType): boolean;
 
@@ -164,30 +152,30 @@ export type Thunk<T> = (() => T) | T;
  *
  */
 export class GraphQLScalarType {
-  name: string;
-  description: string;
-  astNode?: ScalarTypeDefinitionNode;
-  constructor(config: GraphQLScalarTypeConfig<any, any>);
+    name: string;
+    description: string;
+    astNode?: ScalarTypeDefinitionNode;
+    constructor(config: GraphQLScalarTypeConfig<any, any>);
 
-  // Serializes an internal value to include in a response.
-  serialize(value: any): any;
+    // Serializes an internal value to include in a response.
+    serialize(value: any): any;
 
-  // Parses an externally provided value to use as an input.
-  parseValue(value: any): any;
+    // Parses an externally provided value to use as an input.
+    parseValue(value: any): any;
 
-  // Parses an externally provided literal value to use as an input.
-  parseLiteral(valueNode: ValueNode): any;
+    // Parses an externally provided literal value to use as an input.
+    parseLiteral(valueNode: ValueNode): any;
 
-  toString(): string;
+    toString(): string;
 }
 
 export interface GraphQLScalarTypeConfig<TInternal, TExternal> {
-  name: string;
-  description?: string;
-  astNode?: ScalarTypeDefinitionNode;
-  serialize(value: any): TExternal | null | undefined;
-  parseValue?(value: any): TInternal | null | undefined;
-  parseLiteral?(valueNode: ValueNode): TInternal | null | undefined;
+    name: string;
+    description?: string;
+    astNode?: ScalarTypeDefinitionNode;
+    serialize(value: any): TExternal | null | undefined;
+    parseValue?(value: any): TInternal | null | undefined;
+    parseLiteral?(valueNode: ValueNode): TInternal | null | undefined;
 }
 
 /**
@@ -228,123 +216,109 @@ export interface GraphQLScalarTypeConfig<TInternal, TExternal> {
  *
  */
 export class GraphQLObjectType {
-  name: string;
-  description: string;
-  astNode?: ObjectTypeDefinitionNode;
-  extensionASTNodes: Array<TypeExtensionNode>;
-  isTypeOf: GraphQLIsTypeOfFn<any, any>;
+    name: string;
+    description: string;
+    astNode?: ObjectTypeDefinitionNode;
+    extensionASTNodes: Array<TypeExtensionNode>;
+    isTypeOf: GraphQLIsTypeOfFn<any, any>;
 
-  constructor(config: GraphQLObjectTypeConfig<any, any>);
-  getFields(): GraphQLFieldMap<any, any>;
-  getInterfaces(): GraphQLInterfaceType[];
-  toString(): string;
+    constructor(config: GraphQLObjectTypeConfig<any, any>);
+    getFields(): GraphQLFieldMap<any, any>;
+    getInterfaces(): GraphQLInterfaceType[];
+    toString(): string;
 }
 
 export interface GraphQLObjectTypeConfig<TSource, TContext> {
-  name: string;
-  interfaces?: Thunk<GraphQLInterfaceType[]>;
-  fields: Thunk<GraphQLFieldConfigMap<TSource, TContext>>;
-  isTypeOf?: GraphQLIsTypeOfFn<TSource, TContext>;
-  description?: string;
-  astNode?: ObjectTypeDefinitionNode;
-  extensionASTNodes?: Array<TypeExtensionNode>;
+    name: string;
+    interfaces?: Thunk<GraphQLInterfaceType[]>;
+    fields: Thunk<GraphQLFieldConfigMap<TSource, TContext>>;
+    isTypeOf?: GraphQLIsTypeOfFn<TSource, TContext>;
+    description?: string;
+    astNode?: ObjectTypeDefinitionNode;
+    extensionASTNodes?: Array<TypeExtensionNode>;
 }
 
 export type GraphQLTypeResolver<TSource, TContext> = (
-  value: TSource,
-  context: TContext,
-  info: GraphQLResolveInfo,
+    value: TSource,
+    context: TContext,
+    info: GraphQLResolveInfo
 ) => GraphQLObjectType | string | Promise<GraphQLObjectType | string>;
 
 export type GraphQLIsTypeOfFn<TSource, TContext> = (
-  source: TSource,
-  context: TContext,
-  info: GraphQLResolveInfo,
+    source: TSource,
+    context: TContext,
+    info: GraphQLResolveInfo
 ) => boolean | Promise<boolean>;
 
-export type GraphQLFieldResolver<
-  TSource,
-  TContext,
-  TArgs = { [argName: string]: any }
-> = (
-  source: TSource,
-  args: TArgs,
-  context: TContext,
-  info: GraphQLResolveInfo,
+export type GraphQLFieldResolver<TSource, TContext, TArgs = { [argName: string]: any }> = (
+    source: TSource,
+    args: TArgs,
+    context: TContext,
+    info: GraphQLResolveInfo
 ) => any;
 
 export interface GraphQLResolveInfo {
-  fieldName: string;
-  fieldNodes: FieldNode[];
-  returnType: GraphQLOutputType;
-  parentType: GraphQLCompositeType;
-  path: ResponsePath;
-  schema: GraphQLSchema;
-  fragments: { [fragmentName: string]: FragmentDefinitionNode };
-  rootValue: any;
-  operation: OperationDefinitionNode;
-  variableValues: { [variableName: string]: any };
+    fieldName: string;
+    fieldNodes: FieldNode[];
+    returnType: GraphQLOutputType;
+    parentType: GraphQLCompositeType;
+    path: ResponsePath;
+    schema: GraphQLSchema;
+    fragments: { [fragmentName: string]: FragmentDefinitionNode };
+    rootValue: any;
+    operation: OperationDefinitionNode;
+    variableValues: { [variableName: string]: any };
 }
 
-export type ResponsePath =
-  | { prev: ResponsePath; key: string | number }
-  | undefined;
+export type ResponsePath = { prev: ResponsePath; key: string | number } | undefined;
 
-export interface GraphQLFieldConfig<
-  TSource,
-  TContext,
-  TArgs = { [argName: string]: any }
-> {
-  type: GraphQLOutputType;
-  args?: GraphQLFieldConfigArgumentMap;
-  resolve?: GraphQLFieldResolver<TSource, TContext, TArgs>;
-  subscribe?: GraphQLFieldResolver<TSource, TContext, TArgs>;
-  deprecationReason?: string;
-  description?: string;
-  astNode?: FieldDefinitionNode;
+export interface GraphQLFieldConfig<TSource, TContext, TArgs = { [argName: string]: any }> {
+    type: GraphQLOutputType;
+    args?: GraphQLFieldConfigArgumentMap;
+    resolve?: GraphQLFieldResolver<TSource, TContext, TArgs>;
+    subscribe?: GraphQLFieldResolver<TSource, TContext, TArgs>;
+    deprecationReason?: string;
+    description?: string;
+    astNode?: FieldDefinitionNode;
 }
 
 export interface GraphQLFieldConfigArgumentMap {
-  [argName: string]: GraphQLArgumentConfig;
+    [argName: string]: GraphQLArgumentConfig;
 }
 
 export interface GraphQLArgumentConfig {
-  type: GraphQLInputType;
-  defaultValue?: any;
-  description?: string;
-  astNode?: InputValueDefinitionNode;
+    type: GraphQLInputType;
+    defaultValue?: any;
+    description?: string;
+    astNode?: InputValueDefinitionNode;
 }
 
 export interface GraphQLFieldConfigMap<TSource, TContext> {
-  [fieldName: string]: GraphQLFieldConfig<TSource, TContext>;
+    [fieldName: string]: GraphQLFieldConfig<TSource, TContext>;
 }
 
-export interface GraphQLField<
-  TSource,
-  TContext,
-  TArgs = { [argName: string]: any }
-> {
-  name: string;
-  description: string;
-  type: GraphQLOutputType;
-  args: GraphQLArgument[];
-  resolve?: GraphQLFieldResolver<TSource, TContext, TArgs>;
-  subscribe?: GraphQLFieldResolver<TSource, TContext, TArgs>;
-  isDeprecated?: boolean;
-  deprecationReason?: string;
-  astNode?: FieldDefinitionNode;
+export interface GraphQLField<TSource, TContext, TArgs = { [argName: string]: any }> {
+    name: string;
+    description: string;
+    type: GraphQLOutputType;
+    args: GraphQLArgument[];
+    resolve?: GraphQLFieldResolver<TSource, TContext, TArgs>;
+    subscribe?: GraphQLFieldResolver<TSource, TContext, TArgs>;
+    isDeprecated?: boolean;
+    deprecationReason?: string;
+    astNode?: FieldDefinitionNode;
 }
 
 export interface GraphQLArgument {
-  name: string;
-  type: GraphQLInputType;
-  defaultValue?: any;
-  description?: string;
-  astNode?: InputValueDefinitionNode;
+    name: string;
+    type: GraphQLInputType;
+    defaultValue?: any;
+    description?: string;
+    astNode?: InputValueDefinitionNode;
 }
 
 export interface GraphQLFieldMap<TSource, TContext> {
-  [fieldName: string]: GraphQLField<TSource, TContext>;
+    [fieldName: string]: GraphQLField<TSource, TContext>;
 }
 
 /**
@@ -366,29 +340,29 @@ export interface GraphQLFieldMap<TSource, TContext> {
  *
  */
 export class GraphQLInterfaceType {
-  name: string;
-  description: string;
-  astNode?: InterfaceTypeDefinitionNode;
-  resolveType: GraphQLTypeResolver<any, any>;
+    name: string;
+    description: string;
+    astNode?: InterfaceTypeDefinitionNode;
+    resolveType: GraphQLTypeResolver<any, any>;
 
-  constructor(config: GraphQLInterfaceTypeConfig<any, any>);
+    constructor(config: GraphQLInterfaceTypeConfig<any, any>);
 
-  getFields(): GraphQLFieldMap<any, any>;
+    getFields(): GraphQLFieldMap<any, any>;
 
-  toString(): string;
+    toString(): string;
 }
 
 export interface GraphQLInterfaceTypeConfig<TSource, TContext> {
-  name: string;
-  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<TSource, TContext>;
-  description?: string;
-  astNode?: InterfaceTypeDefinitionNode;
+    name: string;
+    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<TSource, TContext>;
+    description?: string;
+    astNode?: InterfaceTypeDefinitionNode;
 }
 
 /**
@@ -415,29 +389,29 @@ export interface GraphQLInterfaceTypeConfig<TSource, TContext> {
  *
  */
 export class GraphQLUnionType {
-  name: string;
-  description: string;
-  astNode?: UnionTypeDefinitionNode;
-  resolveType: GraphQLTypeResolver<any, any>;
+    name: string;
+    description: string;
+    astNode?: UnionTypeDefinitionNode;
+    resolveType: GraphQLTypeResolver<any, any>;
 
-  constructor(config: GraphQLUnionTypeConfig<any, any>);
+    constructor(config: GraphQLUnionTypeConfig<any, any>);
 
-  getTypes(): GraphQLObjectType[];
+    getTypes(): GraphQLObjectType[];
 
-  toString(): string;
+    toString(): string;
 }
 
 export interface GraphQLUnionTypeConfig<TSource, TContext> {
-  name: string;
-  types: Thunk<GraphQLObjectType[]>;
-  /**
-   * 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<TSource, TContext>;
-  description?: string;
-  astNode?: UnionTypeDefinitionNode;
+    name: string;
+    types: Thunk<GraphQLObjectType[]>;
+    /**
+     * 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<TSource, TContext>;
+    description?: string;
+    astNode?: UnionTypeDefinitionNode;
 }
 
 /**
@@ -462,45 +436,45 @@ export interface GraphQLUnionTypeConfig<TSource, TContext> {
  * will be used as its internal value.
  */
 export class GraphQLEnumType {
-  name: string;
-  description: string;
-  astNode?: EnumTypeDefinitionNode;
+    name: string;
+    description: string;
+    astNode?: EnumTypeDefinitionNode;
 
-  constructor(config: GraphQLEnumTypeConfig);
-  getValues(): GraphQLEnumValue[];
-  getValue(name: string): GraphQLEnumValue;
-  isValidValue(value: any): boolean;
-  serialize(value: any): string;
-  parseValue(value: any): any;
-  parseLiteral(valueNode: ValueNode): any;
-  toString(): string;
+    constructor(config: GraphQLEnumTypeConfig);
+    getValues(): GraphQLEnumValue[];
+    getValue(name: string): GraphQLEnumValue;
+    isValidValue(value: any): boolean;
+    serialize(value: any): string;
+    parseValue(value: any): any;
+    parseLiteral(valueNode: ValueNode): any;
+    toString(): string;
 }
 
 export interface GraphQLEnumTypeConfig {
-  name: string;
-  values: GraphQLEnumValueConfigMap;
-  description?: string;
-  astNode?: EnumTypeDefinitionNode;
+    name: string;
+    values: GraphQLEnumValueConfigMap;
+    description?: string;
+    astNode?: EnumTypeDefinitionNode;
 }
 
 export interface GraphQLEnumValueConfigMap {
-  [valueName: string]: GraphQLEnumValueConfig;
+    [valueName: string]: GraphQLEnumValueConfig;
 }
 
 export interface GraphQLEnumValueConfig {
-  value?: any;
-  deprecationReason?: string;
-  description?: string;
-  astNode?: EnumValueDefinitionNode;
+    value?: any;
+    deprecationReason?: string;
+    description?: string;
+    astNode?: EnumValueDefinitionNode;
 }
 
 export interface GraphQLEnumValue {
-  name: string;
-  description: string;
-  isDeprecated?: boolean;
-  deprecationReason: string;
-  astNode?: EnumValueDefinitionNode;
-  value: any;
+    name: string;
+    description: string;
+    isDeprecated?: boolean;
+    deprecationReason: string;
+    astNode?: EnumValueDefinitionNode;
+    value: any;
 }
 
 /**
@@ -524,42 +498,42 @@ export interface GraphQLEnumValue {
  *
  */
 export class GraphQLInputObjectType {
-  name: string;
-  description: string;
-  astNode?: InputObjectTypeDefinitionNode;
-  constructor(config: GraphQLInputObjectTypeConfig);
-  getFields(): GraphQLInputFieldMap;
-  toString(): string;
+    name: string;
+    description: string;
+    astNode?: InputObjectTypeDefinitionNode;
+    constructor(config: GraphQLInputObjectTypeConfig);
+    getFields(): GraphQLInputFieldMap;
+    toString(): string;
 }
 
 export interface GraphQLInputObjectTypeConfig {
-  name: string;
-  fields: Thunk<GraphQLInputFieldConfigMap>;
-  description?: string;
-  astNode?: InputObjectTypeDefinitionNode;
+    name: string;
+    fields: Thunk<GraphQLInputFieldConfigMap>;
+    description?: string;
+    astNode?: InputObjectTypeDefinitionNode;
 }
 
 export interface GraphQLInputFieldConfig {
-  type: GraphQLInputType;
-  defaultValue?: any;
-  description?: string;
-  astNode?: InputValueDefinitionNode;
+    type: GraphQLInputType;
+    defaultValue?: any;
+    description?: string;
+    astNode?: InputValueDefinitionNode;
 }
 
 export interface GraphQLInputFieldConfigMap {
-  [fieldName: string]: GraphQLInputFieldConfig;
+    [fieldName: string]: GraphQLInputFieldConfig;
 }
 
 export interface GraphQLInputField {
-  name: string;
-  type: GraphQLInputType;
-  defaultValue?: any;
-  description?: string;
-  astNode?: InputValueDefinitionNode;
+    name: string;
+    type: GraphQLInputType;
+    defaultValue?: any;
+    description?: string;
+    astNode?: InputValueDefinitionNode;
 }
 
 export interface GraphQLInputFieldMap {
-  [fieldName: string]: GraphQLInputField;
+    [fieldName: string]: GraphQLInputField;
 }
 
 /**
@@ -581,9 +555,9 @@ export interface GraphQLInputFieldMap {
  *
  */
 export class GraphQLList<T extends GraphQLType> {
-  ofType: T;
-  constructor(type: T);
-  toString(): string;
+    ofType: T;
+    constructor(type: T);
+    toString(): string;
 }
 
 /**
@@ -607,9 +581,9 @@ export class GraphQLList<T extends GraphQLType> {
  * Note: the enforcement of non-nullability occurs within the executor.
  */
 export class GraphQLNonNull<T extends GraphQLNullableType> {
-  ofType: T;
+    ofType: T;
 
-  constructor(type: T);
+    constructor(type: T);
 
-  toString(): string;
+    toString(): string;
 }
diff --git a/types/graphql/type/directives.d.ts b/types/graphql/type/directives.d.ts
index b6962bc4ae..bf1fc8df16 100644
--- a/types/graphql/type/directives.d.ts
+++ b/types/graphql/type/directives.d.ts
@@ -1,27 +1,27 @@
-import { GraphQLFieldConfigArgumentMap, GraphQLArgument } from './definition';
-import { DirectiveDefinitionNode } from '../language/ast';
+import { GraphQLFieldConfigArgumentMap, GraphQLArgument } from "./definition";
+import { DirectiveDefinitionNode } from "../language/ast";
 
 export const DirectiveLocation: {
-  // Operations
-  QUERY: 'QUERY';
-  MUTATION: 'MUTATION';
-  SUBSCRIPTION: 'SUBSCRIPTION';
-  FIELD: 'FIELD';
-  FRAGMENT_DEFINITION: 'FRAGMENT_DEFINITION';
-  FRAGMENT_SPREAD: 'FRAGMENT_SPREAD';
-  INLINE_FRAGMENT: 'INLINE_FRAGMENT';
-  // Schema Definitions
-  SCHEMA: 'SCHEMA';
-  SCALAR: 'SCALAR';
-  OBJECT: 'OBJECT';
-  FIELD_DEFINITION: 'FIELD_DEFINITION';
-  ARGUMENT_DEFINITION: 'ARGUMENT_DEFINITION';
-  INTERFACE: 'INTERFACE';
-  UNION: 'UNION';
-  ENUM: 'ENUM';
-  ENUM_VALUE: 'ENUM_VALUE';
-  INPUT_OBJECT: 'INPUT_OBJECT';
-  INPUT_FIELD_DEFINITION: 'INPUT_FIELD_DEFINITION';
+    // Operations
+    QUERY: "QUERY";
+    MUTATION: "MUTATION";
+    SUBSCRIPTION: "SUBSCRIPTION";
+    FIELD: "FIELD";
+    FRAGMENT_DEFINITION: "FRAGMENT_DEFINITION";
+    FRAGMENT_SPREAD: "FRAGMENT_SPREAD";
+    INLINE_FRAGMENT: "INLINE_FRAGMENT";
+    // Schema Definitions
+    SCHEMA: "SCHEMA";
+    SCALAR: "SCALAR";
+    OBJECT: "OBJECT";
+    FIELD_DEFINITION: "FIELD_DEFINITION";
+    ARGUMENT_DEFINITION: "ARGUMENT_DEFINITION";
+    INTERFACE: "INTERFACE";
+    UNION: "UNION";
+    ENUM: "ENUM";
+    ENUM_VALUE: "ENUM_VALUE";
+    INPUT_OBJECT: "INPUT_OBJECT";
+    INPUT_FIELD_DEFINITION: "INPUT_FIELD_DEFINITION";
 };
 
 export type DirectiveLocationEnum = keyof typeof DirectiveLocation;
@@ -31,21 +31,21 @@ export type DirectiveLocationEnum = keyof typeof DirectiveLocation;
  * behavior. Type system creators will usually not create these directly.
  */
 export class GraphQLDirective {
-  name: string;
-  description?: string;
-  locations: DirectiveLocationEnum[];
-  args: GraphQLArgument[];
-  astNode?: DirectiveDefinitionNode;
+    name: string;
+    description?: string;
+    locations: DirectiveLocationEnum[];
+    args: GraphQLArgument[];
+    astNode?: DirectiveDefinitionNode;
 
-  constructor(config: GraphQLDirectiveConfig);
+    constructor(config: GraphQLDirectiveConfig);
 }
 
 export interface GraphQLDirectiveConfig {
-  name: string;
-  description?: string;
-  locations: DirectiveLocationEnum[];
-  args?: GraphQLFieldConfigArgumentMap;
-  astNode?: DirectiveDefinitionNode;
+    name: string;
+    description?: string;
+    locations: DirectiveLocationEnum[];
+    args?: GraphQLFieldConfigArgumentMap;
+    astNode?: DirectiveDefinitionNode;
 }
 
 /**
@@ -61,7 +61,7 @@ export const GraphQLSkipDirective: GraphQLDirective;
 /**
  * Constant string used for default reason for a deprecation.
  */
-export const DEFAULT_DEPRECATION_REASON: 'No longer supported';
+export const DEFAULT_DEPRECATION_REASON: "No longer supported";
 
 /**
  * Used to declare element of a GraphQL schema as deprecated.
diff --git a/types/graphql/type/index.d.ts b/types/graphql/type/index.d.ts
index 5fdfb1190a..551ade35e7 100644
--- a/types/graphql/type/index.d.ts
+++ b/types/graphql/type/index.d.ts
@@ -1,47 +1,41 @@
 // GraphQL Schema definition
-export { GraphQLSchema } from './schema';
+export { GraphQLSchema } from "./schema";
 
-export * from './definition';
+export * from "./definition";
 
 export {
-  // "Enum" of Directive Locations
-  DirectiveLocation,
-  // Directives Definition
-  GraphQLDirective,
-  // Built-in Directives defined by the Spec
-  specifiedDirectives,
-  GraphQLIncludeDirective,
-  GraphQLSkipDirective,
-  GraphQLDeprecatedDirective,
-  // Constant Deprecation Reason
-  DEFAULT_DEPRECATION_REASON,
-} from './directives';
+    // "Enum" of Directive Locations
+    DirectiveLocation,
+    // Directives Definition
+    GraphQLDirective,
+    // Built-in Directives defined by the Spec
+    specifiedDirectives,
+    GraphQLIncludeDirective,
+    GraphQLSkipDirective,
+    GraphQLDeprecatedDirective,
+    // Constant Deprecation Reason
+    DEFAULT_DEPRECATION_REASON,
+} from "./directives";
 
 // Common built-in scalar instances.
-export {
-  GraphQLInt,
-  GraphQLFloat,
-  GraphQLString,
-  GraphQLBoolean,
-  GraphQLID,
-} from './scalars';
+export { GraphQLInt, GraphQLFloat, GraphQLString, GraphQLBoolean, GraphQLID } from "./scalars";
 
 export {
-  // "Enum" of Type Kinds
-  TypeKind,
-  // GraphQL Types for introspection.
-  __Schema,
-  __Directive,
-  __DirectiveLocation,
-  __Type,
-  __Field,
-  __InputValue,
-  __EnumValue,
-  __TypeKind,
-  // Meta-field definitions.
-  SchemaMetaFieldDef,
-  TypeMetaFieldDef,
-  TypeNameMetaFieldDef,
-} from './introspection';
+    // "Enum" of Type Kinds
+    TypeKind,
+    // GraphQL Types for introspection.
+    __Schema,
+    __Directive,
+    __DirectiveLocation,
+    __Type,
+    __Field,
+    __InputValue,
+    __EnumValue,
+    __TypeKind,
+    // Meta-field definitions.
+    SchemaMetaFieldDef,
+    TypeMetaFieldDef,
+    TypeNameMetaFieldDef,
+} from "./introspection";
 
-export { DirectiveLocationEnum } from './directives';
+export { DirectiveLocationEnum } from "./directives";
diff --git a/types/graphql/type/introspection.d.ts b/types/graphql/type/introspection.d.ts
index 48ac468ed0..042c3e2b6b 100644
--- a/types/graphql/type/introspection.d.ts
+++ b/types/graphql/type/introspection.d.ts
@@ -1,14 +1,14 @@
 import {
-  GraphQLScalarType,
-  GraphQLObjectType,
-  GraphQLInterfaceType,
-  GraphQLUnionType,
-  GraphQLEnumType,
-  GraphQLInputObjectType,
-  GraphQLList,
-  GraphQLNonNull,
-} from './definition';
-import { GraphQLField } from './definition';
+    GraphQLScalarType,
+    GraphQLObjectType,
+    GraphQLInterfaceType,
+    GraphQLUnionType,
+    GraphQLEnumType,
+    GraphQLInputObjectType,
+    GraphQLList,
+    GraphQLNonNull,
+} from "./definition";
+import { GraphQLField } from "./definition";
 
 export const __Schema: GraphQLObjectType;
 export const __Directive: GraphQLObjectType;
@@ -19,14 +19,14 @@ export const __InputValue: GraphQLObjectType;
 export const __EnumValue: GraphQLObjectType;
 
 export const TypeKind: {
-  SCALAR: 'SCALAR';
-  OBJECT: 'OBJECT';
-  INTERFACE: 'INTERFACE';
-  UNION: 'UNION';
-  ENUM: 'ENUM';
-  INPUT_OBJECT: 'INPUT_OBJECT';
-  LIST: 'LIST';
-  NON_NULL: 'NON_NULL';
+    SCALAR: "SCALAR";
+    OBJECT: "OBJECT";
+    INTERFACE: "INTERFACE";
+    UNION: "UNION";
+    ENUM: "ENUM";
+    INPUT_OBJECT: "INPUT_OBJECT";
+    LIST: "LIST";
+    NON_NULL: "NON_NULL";
 };
 
 export const __TypeKind: GraphQLEnumType;
diff --git a/types/graphql/type/scalars.d.ts b/types/graphql/type/scalars.d.ts
index 31a33aafad..287d99602a 100644
--- a/types/graphql/type/scalars.d.ts
+++ b/types/graphql/type/scalars.d.ts
@@ -1,4 +1,4 @@
-import { GraphQLScalarType } from './definition';
+import { GraphQLScalarType } from "./definition";
 
 export const GraphQLInt: GraphQLScalarType;
 export const GraphQLFloat: GraphQLScalarType;
diff --git a/types/graphql/type/schema.d.ts b/types/graphql/type/schema.d.ts
index 26500c6ed3..bdd1089756 100644
--- a/types/graphql/type/schema.d.ts
+++ b/types/graphql/type/schema.d.ts
@@ -1,11 +1,7 @@
-import { GraphQLObjectType } from './definition';
-import {
-  GraphQLType,
-  GraphQLNamedType,
-  GraphQLAbstractType,
-} from './definition';
-import { SchemaDefinitionNode } from '../language/ast';
-import { GraphQLDirective } from './directives';
+import { GraphQLObjectType } from "./definition";
+import { GraphQLType, GraphQLNamedType, GraphQLAbstractType } from "./definition";
+import { SchemaDefinitionNode } from "../language/ast";
+import { GraphQLDirective } from "./directives";
 
 /**
  * Schema Definition
@@ -34,59 +30,56 @@ import { GraphQLDirective } from './directives';
  *
  */
 export class GraphQLSchema {
-  astNode?: SchemaDefinitionNode;
-  // private _queryType: GraphQLObjectType;
-  // private _mutationType: GraphQLObjectType;
-  // private _subscriptionType: GraphQLObjectType;
-  // private _directives: Array<GraphQLDirective>;
-  // private _typeMap: TypeMap;
-  // private _implementations: { [interfaceName: string]: Array<GraphQLObjectType> };
-  // private _possibleTypeMap: { [abstractName: string]: { [possibleName: string]: boolean } };
+    astNode?: SchemaDefinitionNode;
+    // private _queryType: GraphQLObjectType;
+    // private _mutationType: GraphQLObjectType;
+    // private _subscriptionType: GraphQLObjectType;
+    // private _directives: Array<GraphQLDirective>;
+    // private _typeMap: TypeMap;
+    // private _implementations: { [interfaceName: string]: Array<GraphQLObjectType> };
+    // private _possibleTypeMap: { [abstractName: string]: { [possibleName: string]: boolean } };
 
-  constructor(config: GraphQLSchemaConfig);
+    constructor(config: GraphQLSchemaConfig);
 
-  getQueryType(): GraphQLObjectType;
-  getMutationType(): GraphQLObjectType | null | undefined;
-  getSubscriptionType(): GraphQLObjectType | null | undefined;
-  getTypeMap(): { [typeName: string]: GraphQLNamedType };
-  getType(name: string): GraphQLNamedType;
-  getPossibleTypes(abstractType: GraphQLAbstractType): GraphQLObjectType[];
+    getQueryType(): GraphQLObjectType;
+    getMutationType(): GraphQLObjectType | null | undefined;
+    getSubscriptionType(): GraphQLObjectType | null | undefined;
+    getTypeMap(): { [typeName: string]: GraphQLNamedType };
+    getType(name: string): GraphQLNamedType;
+    getPossibleTypes(abstractType: GraphQLAbstractType): GraphQLObjectType[];
 
-  isPossibleType(
-    abstractType: GraphQLAbstractType,
-    possibleType: GraphQLObjectType,
-  ): boolean;
+    isPossibleType(abstractType: GraphQLAbstractType, possibleType: GraphQLObjectType): boolean;
 
-  getDirectives(): GraphQLDirective[];
-  getDirective(name: string): GraphQLDirective;
+    getDirectives(): GraphQLDirective[];
+    getDirective(name: string): GraphQLDirective;
 }
 
 export type GraphQLSchemaValidationOptions = {
-  /**
-   * When building a schema from a GraphQL service's introspection result, it
-   * might be safe to assume the schema is valid. Set to true to assume the
-   * produced schema is valid.
-   *
-   * Default: false
-   */
-  assumeValid?: boolean;
+    /**
+     * When building a schema from a GraphQL service's introspection result, it
+     * might be safe to assume the schema is valid. Set to true to assume the
+     * produced schema is valid.
+     *
+     * Default: false
+     */
+    assumeValid?: boolean;
 
-  /**
-   * If provided, the schema will consider fields or types with names included
-   * in this list valid, even if they do not adhere to the specification's
-   * schema validation rules.
-   *
-   * This option is provided to ease adoption and may be removed in a future
-   * major release.
-   */
-  allowedLegacyNames?: ReadonlyArray<string>;
+    /**
+     * If provided, the schema will consider fields or types with names included
+     * in this list valid, even if they do not adhere to the specification's
+     * schema validation rules.
+     *
+     * This option is provided to ease adoption and may be removed in a future
+     * major release.
+     */
+    allowedLegacyNames?: ReadonlyArray<string>;
 };
 
 export interface GraphQLSchemaConfig {
-  query: GraphQLObjectType;
-  mutation?: GraphQLObjectType;
-  subscription?: GraphQLObjectType;
-  types?: GraphQLNamedType[];
-  directives?: GraphQLDirective[];
-  astNode?: SchemaDefinitionNode;
+    query: GraphQLObjectType;
+    mutation?: GraphQLObjectType;
+    subscription?: GraphQLObjectType;
+    types?: GraphQLNamedType[];
+    directives?: GraphQLDirective[];
+    astNode?: SchemaDefinitionNode;
 }
diff --git a/types/graphql/utilities/TypeInfo.d.ts b/types/graphql/utilities/TypeInfo.d.ts
index a04a24a1a7..8b1ddc6206 100644
--- a/types/graphql/utilities/TypeInfo.d.ts
+++ b/types/graphql/utilities/TypeInfo.d.ts
@@ -1,15 +1,15 @@
-import { GraphQLSchema } from '../type/schema';
+import { GraphQLSchema } from "../type/schema";
 import {
-  GraphQLOutputType,
-  GraphQLCompositeType,
-  GraphQLInputType,
-  GraphQLField,
-  GraphQLArgument,
-  GraphQLEnumValue,
-  GraphQLType,
-} from '../type/definition';
-import { GraphQLDirective } from '../type/directives';
-import { ASTNode, FieldNode } from '../language/ast';
+    GraphQLOutputType,
+    GraphQLCompositeType,
+    GraphQLInputType,
+    GraphQLField,
+    GraphQLArgument,
+    GraphQLEnumValue,
+    GraphQLType,
+} from "../type/definition";
+import { GraphQLDirective } from "../type/directives";
+import { ASTNode, FieldNode } from "../language/ast";
 
 /**
  * TypeInfo is a utility class which, given a GraphQL schema, can keep track
@@ -17,27 +17,27 @@ import { ASTNode, FieldNode } from '../language/ast';
  * AST during a recursive descent by calling `enter(node)` and `leave(node)`.
  */
 export 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,
-  );
+    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;
-  getEnumValue(): GraphQLEnumValue;
-  enter(node: ASTNode): any;
-  leave(node: ASTNode): any;
+    getType(): GraphQLOutputType;
+    getParentType(): GraphQLCompositeType;
+    getInputType(): GraphQLInputType;
+    getFieldDef(): GraphQLField<any, any>;
+    getDirective(): GraphQLDirective;
+    getArgument(): GraphQLArgument;
+    getEnumValue(): GraphQLEnumValue;
+    enter(node: ASTNode): any;
+    leave(node: ASTNode): any;
 }
 
 export type getFieldDef = (
-  schema: GraphQLSchema,
-  parentType: GraphQLType,
-  fieldNode: FieldNode,
+    schema: GraphQLSchema,
+    parentType: GraphQLType,
+    fieldNode: FieldNode
 ) => GraphQLField<any, any>;
diff --git a/types/graphql/utilities/astFromValue.d.ts b/types/graphql/utilities/astFromValue.d.ts
index 557a07dd9d..57f7f977ad 100644
--- a/types/graphql/utilities/astFromValue.d.ts
+++ b/types/graphql/utilities/astFromValue.d.ts
@@ -1,6 +1,6 @@
 import {
-  ValueNode,
-  /*
+    ValueNode,
+    /*
     TODO:
     IntValueNode,
     FloatValueNode,
@@ -10,8 +10,8 @@ import {
     ListValueNode,
     ObjectValueNode,
     */
-} from '../language/ast';
-import { GraphQLInputType } from '../type/definition';
+} from "../language/ast";
+import { GraphQLInputType } from "../type/definition";
 
 /**
  * Produces a GraphQL Value AST given a JavaScript value.
diff --git a/types/graphql/utilities/buildASTSchema.d.ts b/types/graphql/utilities/buildASTSchema.d.ts
index 6b8aa56327..4d256fe180 100644
--- a/types/graphql/utilities/buildASTSchema.d.ts
+++ b/types/graphql/utilities/buildASTSchema.d.ts
@@ -1,16 +1,16 @@
-import { DocumentNode, Location, StringValueNode } from '../language/ast';
-import { Source } from '../language/source';
-import { GraphQLSchema, GraphQLSchemaValidationOptions } from '../type/schema';
+import { DocumentNode, Location, StringValueNode } from "../language/ast";
+import { Source } from "../language/source";
+import { GraphQLSchema, GraphQLSchemaValidationOptions } from "../type/schema";
 
 interface BuildSchemaOptions extends GraphQLSchemaValidationOptions {
-  /**
-   * Descriptions are defined as preceding string literals, however an older
-   * experimental version of the SDL supported preceding comments as
-   * descriptions. Set to true to enable this deprecated behavior.
-   *
-   * Default: false
-   */
-  commentDescriptions?: boolean;
+    /**
+     * Descriptions are defined as preceding string literals, however an older
+     * experimental version of the SDL supported preceding comments as
+     * descriptions. Set to true to enable this deprecated behavior.
+     *
+     * Default: false
+     */
+    commentDescriptions?: boolean;
 }
 
 /**
@@ -35,8 +35,8 @@ export function buildASTSchema(ast: DocumentNode): GraphQLSchema;
  *
  */
 export function getDescription(
-  node: { description?: StringValueNode; loc?: Location },
-  options: BuildSchemaOptions
+    node: { description?: StringValueNode; loc?: Location },
+    options: BuildSchemaOptions
 ): string;
 
 /**
diff --git a/types/graphql/utilities/buildClientSchema.d.ts b/types/graphql/utilities/buildClientSchema.d.ts
index 26b0b3cdd5..80516c2111 100644
--- a/types/graphql/utilities/buildClientSchema.d.ts
+++ b/types/graphql/utilities/buildClientSchema.d.ts
@@ -1,5 +1,5 @@
-import { IntrospectionQuery } from './introspectionQuery';
-import { GraphQLSchema, GraphQLSchemaValidationOptions } from '../type/schema';
+import { IntrospectionQuery } from "./introspectionQuery";
+import { GraphQLSchema, GraphQLSchemaValidationOptions } from "../type/schema";
 
 interface Options extends GraphQLSchemaValidationOptions {}
 
@@ -12,7 +12,4 @@ interface Options extends GraphQLSchemaValidationOptions {}
  * represent the "resolver", "parse" or "serialize" functions or any other
  * server-internal mechanisms.
  */
-export function buildClientSchema(
-  introspection: IntrospectionQuery,
-  options?: Options,
-): GraphQLSchema;
+export function buildClientSchema(introspection: IntrospectionQuery, options?: Options): GraphQLSchema;
diff --git a/types/graphql/utilities/concatAST.d.ts b/types/graphql/utilities/concatAST.d.ts
index 405ac69936..6e4c33aed5 100644
--- a/types/graphql/utilities/concatAST.d.ts
+++ b/types/graphql/utilities/concatAST.d.ts
@@ -1,4 +1,4 @@
-import { DocumentNode } from '../language/ast';
+import { DocumentNode } from "../language/ast";
 
 /**
  * Provided a collection of ASTs, presumably each from different files,
diff --git a/types/graphql/utilities/extendSchema.d.ts b/types/graphql/utilities/extendSchema.d.ts
index 389bd02d8b..027c4d5745 100644
--- a/types/graphql/utilities/extendSchema.d.ts
+++ b/types/graphql/utilities/extendSchema.d.ts
@@ -1,5 +1,5 @@
-import { DocumentNode } from '../language/ast';
-import { GraphQLSchema } from '../type/schema';
+import { DocumentNode } from "../language/ast";
+import { GraphQLSchema } from "../type/schema";
 
 /**
  * Produces a new schema given an existing schema and a document which may
@@ -13,7 +13,4 @@ import { GraphQLSchema } from '../type/schema';
  * This algorithm copies the provided schema, applying extensions while
  * producing the copy. The original schema remains unaltered.
  */
-export function extendSchema(
-  schema: GraphQLSchema,
-  documentAST: DocumentNode,
-): GraphQLSchema;
+export function extendSchema(schema: GraphQLSchema, documentAST: DocumentNode): GraphQLSchema;
diff --git a/types/graphql/utilities/findBreakingChanges.d.ts b/types/graphql/utilities/findBreakingChanges.d.ts
index 0d5fc0041a..37b98dae34 100644
--- a/types/graphql/utilities/findBreakingChanges.d.ts
+++ b/types/graphql/utilities/findBreakingChanges.d.ts
@@ -1,88 +1,70 @@
 import {
-  getNamedType,
-  GraphQLScalarType,
-  GraphQLEnumType,
-  GraphQLInputObjectType,
-  GraphQLInterfaceType,
-  GraphQLObjectType,
-  GraphQLUnionType,
-  GraphQLNamedType,
-} from '../type/definition';
-import { GraphQLSchema } from '../type/schema';
+    getNamedType,
+    GraphQLScalarType,
+    GraphQLEnumType,
+    GraphQLInputObjectType,
+    GraphQLInterfaceType,
+    GraphQLObjectType,
+    GraphQLUnionType,
+    GraphQLNamedType,
+} from "../type/definition";
+import { GraphQLSchema } from "../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';
+    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";
 };
 
 export type BreakingChangeKey =
-  | 'FIELD_CHANGED_KIND'
-  | 'FIELD_REMOVED'
-  | 'TYPE_CHANGED_KIND'
-  | 'TYPE_REMOVED'
-  | 'TYPE_REMOVED_FROM_UNION'
-  | 'VALUE_REMOVED_FROM_ENUM';
+    | "FIELD_CHANGED_KIND"
+    | "FIELD_REMOVED"
+    | "TYPE_CHANGED_KIND"
+    | "TYPE_REMOVED"
+    | "TYPE_REMOVED_FROM_UNION"
+    | "VALUE_REMOVED_FROM_ENUM";
 
 export interface BreakingChange {
-  type: BreakingChangeKey;
-  description: string;
+    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,
-): BreakingChange[];
+export function findBreakingChanges(oldSchema: GraphQLSchema, newSchema: GraphQLSchema): 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,
-): BreakingChange[];
+export function findRemovedTypes(oldSchema: GraphQLSchema, newSchema: GraphQLSchema): BreakingChange[];
 
 /**
  * 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,
-): BreakingChange[];
+export function findTypesThatChangedKind(oldSchema: GraphQLSchema, newSchema: GraphQLSchema): BreakingChange[];
 
 /**
  * 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,
-): BreakingChange[];
+export function findFieldsThatChangedType(oldSchema: GraphQLSchema, newSchema: GraphQLSchema): 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,
-): BreakingChange[];
+export function findTypesRemovedFromUnions(oldSchema: GraphQLSchema, newSchema: GraphQLSchema): 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,
-): BreakingChange[];
+export function findValuesRemovedFromEnums(oldSchema: GraphQLSchema, newSchema: GraphQLSchema): BreakingChange[];
diff --git a/types/graphql/utilities/findDeprecatedUsages.d.ts b/types/graphql/utilities/findDeprecatedUsages.d.ts
index 8cd844e15f..da99c98269 100644
--- a/types/graphql/utilities/findDeprecatedUsages.d.ts
+++ b/types/graphql/utilities/findDeprecatedUsages.d.ts
@@ -1,13 +1,10 @@
-import { GraphQLSchema } from '../type/schema';
-import { DocumentNode } from '../language/ast';
-import { GraphQLError } from '../error/GraphQLError';
+import { GraphQLSchema } from "../type/schema";
+import { DocumentNode } from "../language/ast";
+import { GraphQLError } from "../error/GraphQLError";
 
 /**
  * A validation rule which reports deprecated usages.
  *
  * Returns a list of GraphQLError instances describing each deprecated use.
  */
-export function findDeprecatedUsages(
-  schema: GraphQLSchema,
-  ast: DocumentNode,
-): GraphQLError[];
+export function findDeprecatedUsages(schema: GraphQLSchema, ast: DocumentNode): GraphQLError[];
diff --git a/types/graphql/utilities/getOperationAST.d.ts b/types/graphql/utilities/getOperationAST.d.ts
index 0d5064d48d..5a1e0dc7a7 100644
--- a/types/graphql/utilities/getOperationAST.d.ts
+++ b/types/graphql/utilities/getOperationAST.d.ts
@@ -1,11 +1,8 @@
-import { DocumentNode, OperationDefinitionNode } from '../language/ast';
+import { DocumentNode, OperationDefinitionNode } from "../language/ast";
 
 /**
  * Returns an operation AST given a document AST and optionally an operation
  * name. If a name is not provided, an operation is only returned if only one is
  * provided in the document.
  */
-export function getOperationAST(
-  documentAST: DocumentNode,
-  operationName?: string,
-): OperationDefinitionNode;
+export function getOperationAST(documentAST: DocumentNode, operationName?: string): OperationDefinitionNode;
diff --git a/types/graphql/utilities/index.d.ts b/types/graphql/utilities/index.d.ts
index c2b2c182ff..91777235d1 100644
--- a/types/graphql/utilities/index.d.ts
+++ b/types/graphql/utilities/index.d.ts
@@ -1,82 +1,74 @@
 // The GraphQL query recommended for a full schema introspection.
-export { introspectionQuery } from './introspectionQuery';
+export { introspectionQuery } from "./introspectionQuery";
 export {
-  IntrospectionQuery,
-  IntrospectionSchema,
-  IntrospectionType,
-  IntrospectionScalarType,
-  IntrospectionObjectType,
-  IntrospectionInterfaceType,
-  IntrospectionUnionType,
-  IntrospectionEnumType,
-  IntrospectionInputObjectType,
-  IntrospectionTypeRef,
-  IntrospectionNamedTypeRef,
-  IntrospectionListTypeRef,
-  IntrospectionNonNullTypeRef,
-  IntrospectionField,
-  IntrospectionInputValue,
-  IntrospectionEnumValue,
-  IntrospectionDirective,
-} from './introspectionQuery';
+    IntrospectionQuery,
+    IntrospectionSchema,
+    IntrospectionType,
+    IntrospectionScalarType,
+    IntrospectionObjectType,
+    IntrospectionInterfaceType,
+    IntrospectionUnionType,
+    IntrospectionEnumType,
+    IntrospectionInputObjectType,
+    IntrospectionTypeRef,
+    IntrospectionNamedTypeRef,
+    IntrospectionListTypeRef,
+    IntrospectionNonNullTypeRef,
+    IntrospectionField,
+    IntrospectionInputValue,
+    IntrospectionEnumValue,
+    IntrospectionDirective,
+} from "./introspectionQuery";
 
 // Gets the target Operation from a Document
-export { getOperationAST } from './getOperationAST';
+export { getOperationAST } from "./getOperationAST";
 
 // Build a GraphQLSchema from an introspection result.
-export { buildClientSchema } from './buildClientSchema';
+export { buildClientSchema } from "./buildClientSchema";
 
 // Build a GraphQLSchema from GraphQL Schema language.
-export { buildASTSchema, buildSchema, getDescription } from './buildASTSchema';
+export { buildASTSchema, buildSchema, getDescription } from "./buildASTSchema";
 
 // Extends an existing GraphQLSchema from a parsed GraphQL Schema language AST.
-export { extendSchema } from './extendSchema';
+export { extendSchema } from "./extendSchema";
 
 // Print a GraphQLSchema to GraphQL Schema language.
-export {
-  printSchema,
-  printType,
-  printIntrospectionSchema,
-} from './schemaPrinter';
+export { printSchema, printType, printIntrospectionSchema } from "./schemaPrinter";
 
 // Create a GraphQLType from a GraphQL language AST.
-export { typeFromAST } from './typeFromAST';
+export { typeFromAST } from "./typeFromAST";
 
 // Create a JavaScript value from a GraphQL language AST.
-export { valueFromAST } from './valueFromAST';
+export { valueFromAST } from "./valueFromAST";
 
 // Create a GraphQL language AST from a JavaScript value.
-export { astFromValue } from './astFromValue';
+export { astFromValue } from "./astFromValue";
 
 // A helper to use within recursive-descent visitors which need to be aware of
 // the GraphQL type system.
-export { TypeInfo } from './TypeInfo';
+export { TypeInfo } from "./TypeInfo";
 
 // Determine if JavaScript values adhere to a GraphQL type.
-export { isValidJSValue } from './isValidJSValue';
+export { isValidJSValue } from "./isValidJSValue";
 
 // Determine if AST values adhere to a GraphQL type.
-export { isValidLiteralValue } from './isValidLiteralValue';
+export { isValidLiteralValue } from "./isValidLiteralValue";
 
 // Concatenates multiple AST together.
-export { concatAST } from './concatAST';
+export { concatAST } from "./concatAST";
 
 // Separates an AST into an AST per Operation.
-export { separateOperations } from './separateOperations';
+export { separateOperations } from "./separateOperations";
 
 // Comparators for types
-export {
-  isEqualType,
-  isTypeSubTypeOf,
-  doTypesOverlap,
-} from './typeComparators';
+export { isEqualType, isTypeSubTypeOf, doTypesOverlap } from "./typeComparators";
 
 // Asserts that a string is a valid GraphQL name
-export { assertValidName } from './assertValidName';
+export { assertValidName } from "./assertValidName";
 
 // Compares two GraphQLSchemas and detects breaking changes.
-export { findBreakingChanges } from './findBreakingChanges';
-export { BreakingChange } from './findBreakingChanges';
+export { findBreakingChanges } from "./findBreakingChanges";
+export { BreakingChange } from "./findBreakingChanges";
 
 // Report all deprecated usage within a GraphQL document.
-export { findDeprecatedUsages } from './findDeprecatedUsages';
+export { findDeprecatedUsages } from "./findDeprecatedUsages";
diff --git a/types/graphql/utilities/introspectionQuery.d.ts b/types/graphql/utilities/introspectionQuery.d.ts
index f16b873a3a..10c3b0a200 100644
--- a/types/graphql/utilities/introspectionQuery.d.ts
+++ b/types/graphql/utilities/introspectionQuery.d.ts
@@ -1,4 +1,4 @@
-import { DirectiveLocationEnum } from '../type/directives';
+import { DirectiveLocationEnum } from "../type/directives";
 
 /*
 query IntrospectionQuery {
@@ -96,114 +96,111 @@ fragment TypeRef on __Type {
 export const introspectionQuery: string;
 
 export interface IntrospectionQuery {
-  __schema: IntrospectionSchema;
+    __schema: IntrospectionSchema;
 }
 
 export interface IntrospectionSchema {
-  queryType: IntrospectionNamedTypeRef;
-  mutationType?: IntrospectionNamedTypeRef;
-  subscriptionType?: IntrospectionNamedTypeRef;
-  types: IntrospectionType[];
-  directives: IntrospectionDirective[];
+    queryType: IntrospectionNamedTypeRef;
+    mutationType?: IntrospectionNamedTypeRef;
+    subscriptionType?: IntrospectionNamedTypeRef;
+    types: IntrospectionType[];
+    directives: IntrospectionDirective[];
 }
 
 export type IntrospectionType =
-  | IntrospectionScalarType
-  | IntrospectionObjectType
-  | IntrospectionInterfaceType
-  | IntrospectionUnionType
-  | IntrospectionEnumType
-  | IntrospectionInputObjectType;
+    | IntrospectionScalarType
+    | IntrospectionObjectType
+    | IntrospectionInterfaceType
+    | IntrospectionUnionType
+    | IntrospectionEnumType
+    | IntrospectionInputObjectType;
 
 export interface IntrospectionScalarType {
-  kind: 'SCALAR';
-  name: string;
-  description?: string;
+    kind: "SCALAR";
+    name: string;
+    description?: string;
 }
 
 export interface IntrospectionObjectType {
-  kind: 'OBJECT';
-  name: string;
-  description?: string;
-  fields: IntrospectionField[];
-  interfaces: IntrospectionNamedTypeRef[];
+    kind: "OBJECT";
+    name: string;
+    description?: string;
+    fields: IntrospectionField[];
+    interfaces: IntrospectionNamedTypeRef[];
 }
 
 export interface IntrospectionInterfaceType {
-  kind: 'INTERFACE';
-  name: string;
-  description?: string;
-  fields: IntrospectionField[];
-  possibleTypes: IntrospectionNamedTypeRef[];
+    kind: "INTERFACE";
+    name: string;
+    description?: string;
+    fields: IntrospectionField[];
+    possibleTypes: IntrospectionNamedTypeRef[];
 }
 
 export interface IntrospectionUnionType {
-  kind: 'UNION';
-  name: string;
-  description?: string;
-  possibleTypes: IntrospectionNamedTypeRef[];
+    kind: "UNION";
+    name: string;
+    description?: string;
+    possibleTypes: IntrospectionNamedTypeRef[];
 }
 
 export interface IntrospectionEnumType {
-  kind: 'ENUM';
-  name: string;
-  description?: string;
-  enumValues: IntrospectionEnumValue[];
+    kind: "ENUM";
+    name: string;
+    description?: string;
+    enumValues: IntrospectionEnumValue[];
 }
 
 export interface IntrospectionInputObjectType {
-  kind: 'INPUT_OBJECT';
-  name: string;
-  description?: string;
-  inputFields: IntrospectionInputValue[];
+    kind: "INPUT_OBJECT";
+    name: string;
+    description?: string;
+    inputFields: IntrospectionInputValue[];
 }
 
-export type IntrospectionTypeRef =
-  | IntrospectionNamedTypeRef
-  | IntrospectionListTypeRef
-  | IntrospectionNonNullTypeRef;
+export type IntrospectionTypeRef = IntrospectionNamedTypeRef | IntrospectionListTypeRef | IntrospectionNonNullTypeRef;
 
 export interface IntrospectionNamedTypeRef {
-  kind: string;
-  name: string;
+    kind: string;
+    name: string;
 }
 
 export interface IntrospectionListTypeRef {
-  kind: 'LIST';
-  ofType?: IntrospectionTypeRef;
+    kind: "LIST";
+    ofType?: IntrospectionTypeRef;
 }
 
 export interface IntrospectionNonNullTypeRef {
-  kind: 'NON_NULL';
-  ofType?: IntrospectionTypeRef;
+    kind: "NON_NULL";
+    ofType?: IntrospectionTypeRef;
 }
 
 export interface IntrospectionField {
-  name: string;
-  description?: string;
-  args: IntrospectionInputValue[];
-  type: IntrospectionTypeRef;
-  isDeprecated: boolean;
-  deprecationReason?: string;
+    name: string;
+    description?: string;
+    args: IntrospectionInputValue[];
+    type: IntrospectionTypeRef;
+    isDeprecated: boolean;
+    deprecationReason?: string;
 }
 
 export interface IntrospectionInputValue {
-  name: string;
-  description?: string;
-  type: IntrospectionTypeRef;
-  defaultValue?: string;
+    name: string;
+    description?: string;
+    type: IntrospectionTypeRef;
+    defaultValue?: string;
 }
 
 export interface IntrospectionEnumValue {
-  name: string;
-  description?: string;
-  isDeprecated: boolean;
-  deprecationReason?: string;
+    name: string;
+    description?: string;
+    isDeprecated: boolean;
+    deprecationReason?: string;
 }
 
 export interface IntrospectionDirective {
-  name: string;
-  description?: string;
-  locations: DirectiveLocationEnum[];
-  args: IntrospectionInputValue[];
+    name: string;
+    description?: string;
+    locations: DirectiveLocationEnum[];
+    args: IntrospectionInputValue[];
 }
diff --git a/types/graphql/utilities/isValidJSValue.d.ts b/types/graphql/utilities/isValidJSValue.d.ts
index 911d8fea67..557429c7f4 100644
--- a/types/graphql/utilities/isValidJSValue.d.ts
+++ b/types/graphql/utilities/isValidJSValue.d.ts
@@ -1,4 +1,4 @@
-import { GraphQLInputType } from '../type/definition';
+import { GraphQLInputType } from "../type/definition";
 
 /**
  * Given a JavaScript value and a GraphQL type, determine if the value will be
diff --git a/types/graphql/utilities/isValidLiteralValue.d.ts b/types/graphql/utilities/isValidLiteralValue.d.ts
index 4ad03d1013..bf54f6bb22 100644
--- a/types/graphql/utilities/isValidLiteralValue.d.ts
+++ b/types/graphql/utilities/isValidLiteralValue.d.ts
@@ -1,5 +1,5 @@
-import { ValueNode } from '../language/ast';
-import { GraphQLInputType } from '../type/definition';
+import { ValueNode } from "../language/ast";
+import { GraphQLInputType } from "../type/definition";
 
 /**
  * Utility for validators which determines if a value literal AST is valid given
@@ -8,7 +8,4 @@ import { GraphQLInputType } from '../type/definition';
  * Note that this only validates literal values, variables are assumed to
  * provide values of the correct type.
  */
-export function isValidLiteralValue(
-  type: GraphQLInputType,
-  valueNode: ValueNode,
-): string[];
+export function isValidLiteralValue(type: GraphQLInputType, valueNode: ValueNode): string[];
diff --git a/types/graphql/utilities/schemaPrinter.d.ts b/types/graphql/utilities/schemaPrinter.d.ts
index f9cf9ad209..d49e6aee58 100644
--- a/types/graphql/utilities/schemaPrinter.d.ts
+++ b/types/graphql/utilities/schemaPrinter.d.ts
@@ -1,8 +1,8 @@
-import { GraphQLSchema } from '../type/schema';
-import { GraphQLType } from '../type/definition';
+import { GraphQLSchema } from "../type/schema";
+import { GraphQLType } from "../type/definition";
 
 export interface PrinterOptions {
-  commentDescriptions?: boolean;
+    commentDescriptions?: boolean;
 }
 
 export function printSchema(schema: GraphQLSchema, options?: PrinterOptions): string;
diff --git a/types/graphql/utilities/separateOperations.d.ts b/types/graphql/utilities/separateOperations.d.ts
index a10ad0a29e..8269b22d75 100644
--- a/types/graphql/utilities/separateOperations.d.ts
+++ b/types/graphql/utilities/separateOperations.d.ts
@@ -1,5 +1,3 @@
-import { DocumentNode, OperationDefinitionNode } from '../language/ast';
+import { DocumentNode, OperationDefinitionNode } from "../language/ast";
 
-export function separateOperations(
-  documentAST: DocumentNode,
-): { [operationName: string]: DocumentNode };
+export function separateOperations(documentAST: DocumentNode): { [operationName: string]: DocumentNode };
diff --git a/types/graphql/utilities/typeComparators.d.ts b/types/graphql/utilities/typeComparators.d.ts
index ca0cdaf6c2..7bf0b9ebdf 100644
--- a/types/graphql/utilities/typeComparators.d.ts
+++ b/types/graphql/utilities/typeComparators.d.ts
@@ -1,9 +1,5 @@
-import {
-  GraphQLType,
-  GraphQLCompositeType,
-  GraphQLAbstractType,
-} from '../type/definition';
-import { GraphQLSchema } from '../type/schema';
+import { GraphQLType, GraphQLCompositeType, GraphQLAbstractType } from "../type/definition";
+import { GraphQLSchema } from "../type/schema";
 
 /**
  * Provided two types, return true if the types are equal (invariant).
@@ -14,11 +10,7 @@ export function isEqualType(typeA: GraphQLType, typeB: GraphQLType): boolean;
  * Provided a type and a super type, return true if the first type is either
  * equal or a subset of the second super type (covariant).
  */
-export function isTypeSubTypeOf(
-  schema: GraphQLSchema,
-  maybeSubType: GraphQLType,
-  superType: GraphQLType,
-): boolean;
+export function isTypeSubTypeOf(schema: GraphQLSchema, maybeSubType: GraphQLType, superType: GraphQLType): boolean;
 
 /**
  * Provided two composite types, determine if they "overlap". Two composite
@@ -30,7 +22,7 @@ export function isTypeSubTypeOf(
  * This function is commutative.
  */
 export function doTypesOverlap(
-  schema: GraphQLSchema,
-  typeA: GraphQLCompositeType,
-  typeB: GraphQLCompositeType,
+    schema: GraphQLSchema,
+    typeA: GraphQLCompositeType,
+    typeB: GraphQLCompositeType
 ): boolean;
diff --git a/types/graphql/utilities/typeFromAST.d.ts b/types/graphql/utilities/typeFromAST.d.ts
index 415cbd2636..79b7b24a38 100644
--- a/types/graphql/utilities/typeFromAST.d.ts
+++ b/types/graphql/utilities/typeFromAST.d.ts
@@ -1,8 +1,5 @@
-import { TypeNode } from '../language/ast';
-import { GraphQLType, GraphQLNullableType } from '../type/definition';
-import { GraphQLSchema } from '../type/schema';
+import { TypeNode } from "../language/ast";
+import { GraphQLType, GraphQLNullableType } from "../type/definition";
+import { GraphQLSchema } from "../type/schema";
 
-export function typeFromAST(
-  schema: GraphQLSchema,
-  typeNode: TypeNode,
-): GraphQLType;
+export function typeFromAST(schema: GraphQLSchema, typeNode: TypeNode): GraphQLType;
diff --git a/types/graphql/utilities/valueFromAST.d.ts b/types/graphql/utilities/valueFromAST.d.ts
index 0bfbf04981..e0b06b0506 100644
--- a/types/graphql/utilities/valueFromAST.d.ts
+++ b/types/graphql/utilities/valueFromAST.d.ts
@@ -1,15 +1,10 @@
-import { GraphQLInputType } from '../type/definition';
-import {
-  ValueNode,
-  VariableNode,
-  ListValueNode,
-  ObjectValueNode,
-} from '../language/ast';
+import { GraphQLInputType } from "../type/definition";
+import { ValueNode, VariableNode, ListValueNode, ObjectValueNode } from "../language/ast";
 
 export function valueFromAST(
-  valueNode: ValueNode,
-  type: GraphQLInputType,
-  variables?: {
-    [key: string]: any;
-  },
+    valueNode: ValueNode,
+    type: GraphQLInputType,
+    variables?: {
+        [key: string]: any;
+    }
 ): any;
diff --git a/types/graphql/validation/index.d.ts b/types/graphql/validation/index.d.ts
index b8cb9ddd00..4353da53fa 100644
--- a/types/graphql/validation/index.d.ts
+++ b/types/graphql/validation/index.d.ts
@@ -1,128 +1,80 @@
-export { validate, ValidationContext } from './validate';
-export { specifiedRules } from './specifiedRules';
+export { validate, ValidationContext } from "./validate";
+export { specifiedRules } from "./specifiedRules";
 
 // Spec Section: "Argument Values Type Correctness"
-export {
-  ArgumentsOfCorrectType as ArgumentsOfCorrectTypeRule,
-} from './rules/ArgumentsOfCorrectType';
+export { ArgumentsOfCorrectType as ArgumentsOfCorrectTypeRule } from "./rules/ArgumentsOfCorrectType";
 
 // Spec Section: "Variable Default Values Are Correctly Typed"
-export {
-  DefaultValuesOfCorrectType as DefaultValuesOfCorrectTypeRule,
-} from './rules/DefaultValuesOfCorrectType';
+export { DefaultValuesOfCorrectType as DefaultValuesOfCorrectTypeRule } from "./rules/DefaultValuesOfCorrectType";
 
 // Spec Section: "Field Selections on Objects, Interfaces, and Unions Types"
-export {
-  FieldsOnCorrectType as FieldsOnCorrectTypeRule,
-} from './rules/FieldsOnCorrectType';
+export { FieldsOnCorrectType as FieldsOnCorrectTypeRule } from "./rules/FieldsOnCorrectType";
 
 // Spec Section: "Fragments on Composite Types"
-export {
-  FragmentsOnCompositeTypes as FragmentsOnCompositeTypesRule,
-} from './rules/FragmentsOnCompositeTypes';
+export { FragmentsOnCompositeTypes as FragmentsOnCompositeTypesRule } from "./rules/FragmentsOnCompositeTypes";
 
 // Spec Section: "Argument Names"
-export {
-  KnownArgumentNames as KnownArgumentNamesRule,
-} from './rules/KnownArgumentNames';
+export { KnownArgumentNames as KnownArgumentNamesRule } from "./rules/KnownArgumentNames";
 
 // Spec Section: "Directives Are Defined"
-export {
-  KnownDirectives as KnownDirectivesRule,
-} from './rules/KnownDirectives';
+export { KnownDirectives as KnownDirectivesRule } from "./rules/KnownDirectives";
 
 // Spec Section: "Fragment spread target defined"
-export {
-  KnownFragmentNames as KnownFragmentNamesRule,
-} from './rules/KnownFragmentNames';
+export { KnownFragmentNames as KnownFragmentNamesRule } from "./rules/KnownFragmentNames";
 
 // Spec Section: "Fragment Spread Type Existence"
-export { KnownTypeNames as KnownTypeNamesRule } from './rules/KnownTypeNames';
+export { KnownTypeNames as KnownTypeNamesRule } from "./rules/KnownTypeNames";
 
 // Spec Section: "Lone Anonymous Operation"
-export {
-  LoneAnonymousOperation as LoneAnonymousOperationRule,
-} from './rules/LoneAnonymousOperation';
+export { LoneAnonymousOperation as LoneAnonymousOperationRule } from "./rules/LoneAnonymousOperation";
 
 // Spec Section: "Fragments must not form cycles"
-export {
-  NoFragmentCycles as NoFragmentCyclesRule,
-} from './rules/NoFragmentCycles';
+export { NoFragmentCycles as NoFragmentCyclesRule } from "./rules/NoFragmentCycles";
 
 // Spec Section: "All Variable Used Defined"
-export {
-  NoUndefinedVariables as NoUndefinedVariablesRule,
-} from './rules/NoUndefinedVariables';
+export { NoUndefinedVariables as NoUndefinedVariablesRule } from "./rules/NoUndefinedVariables";
 
 // Spec Section: "Fragments must be used"
-export {
-  NoUnusedFragments as NoUnusedFragmentsRule,
-} from './rules/NoUnusedFragments';
+export { NoUnusedFragments as NoUnusedFragmentsRule } from "./rules/NoUnusedFragments";
 
 // Spec Section: "All Variables Used"
-export {
-  NoUnusedVariables as NoUnusedVariablesRule,
-} from './rules/NoUnusedVariables';
+export { NoUnusedVariables as NoUnusedVariablesRule } from "./rules/NoUnusedVariables";
 
 // Spec Section: "Field Selection Merging"
-export {
-  OverlappingFieldsCanBeMerged as OverlappingFieldsCanBeMergedRule,
-} from './rules/OverlappingFieldsCanBeMerged';
+export { OverlappingFieldsCanBeMerged as OverlappingFieldsCanBeMergedRule } from "./rules/OverlappingFieldsCanBeMerged";
 
 // Spec Section: "Fragment spread is possible"
-export {
-  PossibleFragmentSpreads as PossibleFragmentSpreadsRule,
-} from './rules/PossibleFragmentSpreads';
+export { PossibleFragmentSpreads as PossibleFragmentSpreadsRule } from "./rules/PossibleFragmentSpreads";
 
 // Spec Section: "Argument Optionality"
-export {
-  ProvidedNonNullArguments as ProvidedNonNullArgumentsRule,
-} from './rules/ProvidedNonNullArguments';
+export { ProvidedNonNullArguments as ProvidedNonNullArgumentsRule } from "./rules/ProvidedNonNullArguments";
 
 // Spec Section: "Leaf Field Selections"
-export { ScalarLeafs as ScalarLeafsRule } from './rules/ScalarLeafs';
+export { ScalarLeafs as ScalarLeafsRule } from "./rules/ScalarLeafs";
 
 // Spec Section: "Subscriptions with Single Root Field"
-export {
-  SingleFieldSubscriptions as SingleFieldSubscriptionsRule,
-} from './rules/SingleFieldSubscriptions';
+export { SingleFieldSubscriptions as SingleFieldSubscriptionsRule } from "./rules/SingleFieldSubscriptions";
 
 // Spec Section: "Argument Uniqueness"
-export {
-  UniqueArgumentNames as UniqueArgumentNamesRule,
-} from './rules/UniqueArgumentNames';
+export { UniqueArgumentNames as UniqueArgumentNamesRule } from "./rules/UniqueArgumentNames";
 
 // Spec Section: "Directives Are Unique Per Location"
-export {
-  UniqueDirectivesPerLocation as UniqueDirectivesPerLocationRule,
-} from './rules/UniqueDirectivesPerLocation';
+export { UniqueDirectivesPerLocation as UniqueDirectivesPerLocationRule } from "./rules/UniqueDirectivesPerLocation";
 
 // Spec Section: "Fragment Name Uniqueness"
-export {
-  UniqueFragmentNames as UniqueFragmentNamesRule,
-} from './rules/UniqueFragmentNames';
+export { UniqueFragmentNames as UniqueFragmentNamesRule } from "./rules/UniqueFragmentNames";
 
 // Spec Section: "Input Object Field Uniqueness"
-export {
-  UniqueInputFieldNames as UniqueInputFieldNamesRule,
-} from './rules/UniqueInputFieldNames';
+export { UniqueInputFieldNames as UniqueInputFieldNamesRule } from "./rules/UniqueInputFieldNames";
 
 // Spec Section: "Operation Name Uniqueness"
-export {
-  UniqueOperationNames as UniqueOperationNamesRule,
-} from './rules/UniqueOperationNames';
+export { UniqueOperationNames as UniqueOperationNamesRule } from "./rules/UniqueOperationNames";
 
 // Spec Section: "Variable Uniqueness"
-export {
-  UniqueVariableNames as UniqueVariableNamesRule,
-} from './rules/UniqueVariableNames';
+export { UniqueVariableNames as UniqueVariableNamesRule } from "./rules/UniqueVariableNames";
 
 // Spec Section: "Variables are Input Types"
-export {
-  VariablesAreInputTypes as VariablesAreInputTypesRule,
-} from './rules/VariablesAreInputTypes';
+export { VariablesAreInputTypes as VariablesAreInputTypesRule } from "./rules/VariablesAreInputTypes";
 
 // Spec Section: "All Variable Usages Are Allowed"
-export {
-  VariablesInAllowedPosition as VariablesInAllowedPositionRule,
-} from './rules/VariablesInAllowedPosition';
+export { VariablesInAllowedPosition as VariablesInAllowedPositionRule } from "./rules/VariablesInAllowedPosition";
diff --git a/types/graphql/validation/rules/ArgumentsOfCorrectType.d.ts b/types/graphql/validation/rules/ArgumentsOfCorrectType.d.ts
index f7247d0a9c..235db84162 100644
--- a/types/graphql/validation/rules/ArgumentsOfCorrectType.d.ts
+++ b/types/graphql/validation/rules/ArgumentsOfCorrectType.d.ts
@@ -1,4 +1,4 @@
-import { ValidationContext } from '../index';
+import { ValidationContext } from "../index";
 
 /**
  * Argument values of correct type
diff --git a/types/graphql/validation/rules/DefaultValuesOfCorrectType.d.ts b/types/graphql/validation/rules/DefaultValuesOfCorrectType.d.ts
index 88b3a824f2..b617538a74 100644
--- a/types/graphql/validation/rules/DefaultValuesOfCorrectType.d.ts
+++ b/types/graphql/validation/rules/DefaultValuesOfCorrectType.d.ts
@@ -1,4 +1,4 @@
-import { ValidationContext } from '../index';
+import { ValidationContext } from "../index";
 
 /**
  * Variable default values of correct type
diff --git a/types/graphql/validation/rules/FieldsOnCorrectType.d.ts b/types/graphql/validation/rules/FieldsOnCorrectType.d.ts
index 19609b2b65..247de1298c 100644
--- a/types/graphql/validation/rules/FieldsOnCorrectType.d.ts
+++ b/types/graphql/validation/rules/FieldsOnCorrectType.d.ts
@@ -1,4 +1,4 @@
-import { ValidationContext } from '../index';
+import { ValidationContext } from "../index";
 
 /**
  * Fields on correct type
diff --git a/types/graphql/validation/rules/FragmentsOnCompositeTypes.d.ts b/types/graphql/validation/rules/FragmentsOnCompositeTypes.d.ts
index d6fffd4337..384f43beb3 100644
--- a/types/graphql/validation/rules/FragmentsOnCompositeTypes.d.ts
+++ b/types/graphql/validation/rules/FragmentsOnCompositeTypes.d.ts
@@ -1,4 +1,4 @@
-import { ValidationContext } from '../index';
+import { ValidationContext } from "../index";
 
 /**
  * Fragments on composite type
diff --git a/types/graphql/validation/rules/KnownArgumentNames.d.ts b/types/graphql/validation/rules/KnownArgumentNames.d.ts
index 4477b62a75..bd56137311 100644
--- a/types/graphql/validation/rules/KnownArgumentNames.d.ts
+++ b/types/graphql/validation/rules/KnownArgumentNames.d.ts
@@ -1,4 +1,4 @@
-import { ValidationContext } from '../index';
+import { ValidationContext } from "../index";
 
 /**
  * Known argument names
diff --git a/types/graphql/validation/rules/KnownDirectives.d.ts b/types/graphql/validation/rules/KnownDirectives.d.ts
index 68c6acf549..40e58ce0c3 100644
--- a/types/graphql/validation/rules/KnownDirectives.d.ts
+++ b/types/graphql/validation/rules/KnownDirectives.d.ts
@@ -1,4 +1,4 @@
-import { ValidationContext } from '../index';
+import { ValidationContext } from "../index";
 
 /**
  * Known directives
diff --git a/types/graphql/validation/rules/KnownFragmentNames.d.ts b/types/graphql/validation/rules/KnownFragmentNames.d.ts
index b904f22d89..c5fa899995 100644
--- a/types/graphql/validation/rules/KnownFragmentNames.d.ts
+++ b/types/graphql/validation/rules/KnownFragmentNames.d.ts
@@ -1,4 +1,4 @@
-import { ValidationContext } from '../index';
+import { ValidationContext } from "../index";
 
 /**
  * Known fragment names
diff --git a/types/graphql/validation/rules/KnownTypeNames.d.ts b/types/graphql/validation/rules/KnownTypeNames.d.ts
index 48b15318da..ab8abce9d5 100644
--- a/types/graphql/validation/rules/KnownTypeNames.d.ts
+++ b/types/graphql/validation/rules/KnownTypeNames.d.ts
@@ -1,4 +1,4 @@
-import { ValidationContext } from '../index';
+import { ValidationContext } from "../index";
 
 /**
  * Known type names
diff --git a/types/graphql/validation/rules/LoneAnonymousOperation.d.ts b/types/graphql/validation/rules/LoneAnonymousOperation.d.ts
index 4ce6abcba9..f281df2bce 100644
--- a/types/graphql/validation/rules/LoneAnonymousOperation.d.ts
+++ b/types/graphql/validation/rules/LoneAnonymousOperation.d.ts
@@ -1,4 +1,4 @@
-import { ValidationContext } from '../index';
+import { ValidationContext } from "../index";
 
 /**
  * Lone anonymous operation
diff --git a/types/graphql/validation/rules/NoFragmentCycles.d.ts b/types/graphql/validation/rules/NoFragmentCycles.d.ts
index fed5982fc8..4cce233cd5 100644
--- a/types/graphql/validation/rules/NoFragmentCycles.d.ts
+++ b/types/graphql/validation/rules/NoFragmentCycles.d.ts
@@ -1,3 +1,3 @@
-import { ValidationContext } from '../index';
+import { ValidationContext } from "../index";
 
 export function NoFragmentCycles(context: ValidationContext): any;
diff --git a/types/graphql/validation/rules/NoUndefinedVariables.d.ts b/types/graphql/validation/rules/NoUndefinedVariables.d.ts
index 51d30b8fd1..418e3cf2b5 100644
--- a/types/graphql/validation/rules/NoUndefinedVariables.d.ts
+++ b/types/graphql/validation/rules/NoUndefinedVariables.d.ts
@@ -1,4 +1,4 @@
-import { ValidationContext } from '../index';
+import { ValidationContext } from "../index";
 
 /**
  * No undefined variables
diff --git a/types/graphql/validation/rules/NoUnusedFragments.d.ts b/types/graphql/validation/rules/NoUnusedFragments.d.ts
index 7f4d431299..7a099e66be 100644
--- a/types/graphql/validation/rules/NoUnusedFragments.d.ts
+++ b/types/graphql/validation/rules/NoUnusedFragments.d.ts
@@ -1,4 +1,4 @@
-import { ValidationContext } from '../index';
+import { ValidationContext } from "../index";
 
 /**
  * No unused fragments
diff --git a/types/graphql/validation/rules/NoUnusedVariables.d.ts b/types/graphql/validation/rules/NoUnusedVariables.d.ts
index 6eb2d984aa..53692ed494 100644
--- a/types/graphql/validation/rules/NoUnusedVariables.d.ts
+++ b/types/graphql/validation/rules/NoUnusedVariables.d.ts
@@ -1,4 +1,4 @@
-import { ValidationContext } from '../index';
+import { ValidationContext } from "../index";
 
 /**
  * No unused variables
diff --git a/types/graphql/validation/rules/OverlappingFieldsCanBeMerged.d.ts b/types/graphql/validation/rules/OverlappingFieldsCanBeMerged.d.ts
index f21edbd2cb..302617386b 100644
--- a/types/graphql/validation/rules/OverlappingFieldsCanBeMerged.d.ts
+++ b/types/graphql/validation/rules/OverlappingFieldsCanBeMerged.d.ts
@@ -1,4 +1,4 @@
-import { ValidationContext } from '../index';
+import { ValidationContext } from "../index";
 
 /**
  * Overlapping fields can be merged
diff --git a/types/graphql/validation/rules/PossibleFragmentSpreads.d.ts b/types/graphql/validation/rules/PossibleFragmentSpreads.d.ts
index 8defb47721..e9e10aca14 100644
--- a/types/graphql/validation/rules/PossibleFragmentSpreads.d.ts
+++ b/types/graphql/validation/rules/PossibleFragmentSpreads.d.ts
@@ -1,4 +1,4 @@
-import { ValidationContext } from '../index';
+import { ValidationContext } from "../index";
 
 /**
  * Possible fragment spread
diff --git a/types/graphql/validation/rules/ProvidedNonNullArguments.d.ts b/types/graphql/validation/rules/ProvidedNonNullArguments.d.ts
index 4d5334b9fb..291a3ab5bc 100644
--- a/types/graphql/validation/rules/ProvidedNonNullArguments.d.ts
+++ b/types/graphql/validation/rules/ProvidedNonNullArguments.d.ts
@@ -1,4 +1,4 @@
-import { ValidationContext } from '../index';
+import { ValidationContext } from "../index";
 
 /**
  * Provided required arguments
diff --git a/types/graphql/validation/rules/ScalarLeafs.d.ts b/types/graphql/validation/rules/ScalarLeafs.d.ts
index afdc575671..8505cc2512 100644
--- a/types/graphql/validation/rules/ScalarLeafs.d.ts
+++ b/types/graphql/validation/rules/ScalarLeafs.d.ts
@@ -1,4 +1,4 @@
-import { ValidationContext } from '../index';
+import { ValidationContext } from "../index";
 
 /**
  * Scalar leafs
diff --git a/types/graphql/validation/rules/SingleFieldSubscriptions.d.ts b/types/graphql/validation/rules/SingleFieldSubscriptions.d.ts
index 01a2654a16..d6f8fa2c6b 100644
--- a/types/graphql/validation/rules/SingleFieldSubscriptions.d.ts
+++ b/types/graphql/validation/rules/SingleFieldSubscriptions.d.ts
@@ -1,4 +1,4 @@
-import { ValidationContext } from '../index';
+import { ValidationContext } from "../index";
 
 /**
  * Subscriptions must only include one field.
diff --git a/types/graphql/validation/rules/UniqueArgumentNames.d.ts b/types/graphql/validation/rules/UniqueArgumentNames.d.ts
index 8cc166d07a..f4cc750b86 100644
--- a/types/graphql/validation/rules/UniqueArgumentNames.d.ts
+++ b/types/graphql/validation/rules/UniqueArgumentNames.d.ts
@@ -1,4 +1,4 @@
-import { ValidationContext } from '../index';
+import { ValidationContext } from "../index";
 
 /**
  * Unique argument names
diff --git a/types/graphql/validation/rules/UniqueDirectivesPerLocation.d.ts b/types/graphql/validation/rules/UniqueDirectivesPerLocation.d.ts
index 70ea02cd9c..80d4a252c6 100644
--- a/types/graphql/validation/rules/UniqueDirectivesPerLocation.d.ts
+++ b/types/graphql/validation/rules/UniqueDirectivesPerLocation.d.ts
@@ -1,4 +1,4 @@
-import { ValidationContext } from '../index';
+import { ValidationContext } from "../index";
 
 /**
  * Unique directive names per location
diff --git a/types/graphql/validation/rules/UniqueFragmentNames.d.ts b/types/graphql/validation/rules/UniqueFragmentNames.d.ts
index c505968f6a..525befc0a9 100644
--- a/types/graphql/validation/rules/UniqueFragmentNames.d.ts
+++ b/types/graphql/validation/rules/UniqueFragmentNames.d.ts
@@ -1,4 +1,4 @@
-import { ValidationContext } from '../index';
+import { ValidationContext } from "../index";
 
 /**
  * Unique fragment names
diff --git a/types/graphql/validation/rules/UniqueInputFieldNames.d.ts b/types/graphql/validation/rules/UniqueInputFieldNames.d.ts
index cebd71b79b..f81fb25e5c 100644
--- a/types/graphql/validation/rules/UniqueInputFieldNames.d.ts
+++ b/types/graphql/validation/rules/UniqueInputFieldNames.d.ts
@@ -1,4 +1,4 @@
-import { ValidationContext } from '../index';
+import { ValidationContext } from "../index";
 
 /**
  * Unique input field names
diff --git a/types/graphql/validation/rules/UniqueOperationNames.d.ts b/types/graphql/validation/rules/UniqueOperationNames.d.ts
index 5b12cc0eed..5080307d4b 100644
--- a/types/graphql/validation/rules/UniqueOperationNames.d.ts
+++ b/types/graphql/validation/rules/UniqueOperationNames.d.ts
@@ -1,4 +1,4 @@
-import { ValidationContext } from '../index';
+import { ValidationContext } from "../index";
 
 /**
  * Unique operation names
diff --git a/types/graphql/validation/rules/UniqueVariableNames.d.ts b/types/graphql/validation/rules/UniqueVariableNames.d.ts
index ef8712fbc1..a0a029d165 100644
--- a/types/graphql/validation/rules/UniqueVariableNames.d.ts
+++ b/types/graphql/validation/rules/UniqueVariableNames.d.ts
@@ -1,4 +1,4 @@
-import { ValidationContext } from '../index';
+import { ValidationContext } from "../index";
 
 /**
  * Unique variable names
diff --git a/types/graphql/validation/rules/VariablesAreInputTypes.d.ts b/types/graphql/validation/rules/VariablesAreInputTypes.d.ts
index df079e52f9..79846a3073 100644
--- a/types/graphql/validation/rules/VariablesAreInputTypes.d.ts
+++ b/types/graphql/validation/rules/VariablesAreInputTypes.d.ts
@@ -1,4 +1,4 @@
-import { ValidationContext } from '../index';
+import { ValidationContext } from "../index";
 
 /**
  * Variables are input types
diff --git a/types/graphql/validation/rules/VariablesInAllowedPosition.d.ts b/types/graphql/validation/rules/VariablesInAllowedPosition.d.ts
index 6d3e513876..bd302a73b4 100644
--- a/types/graphql/validation/rules/VariablesInAllowedPosition.d.ts
+++ b/types/graphql/validation/rules/VariablesInAllowedPosition.d.ts
@@ -1,4 +1,4 @@
-import { ValidationContext } from '../index';
+import { ValidationContext } from "../index";
 
 /**
  * Variables passed to field arguments conform to type
diff --git a/types/graphql/validation/specifiedRules.d.ts b/types/graphql/validation/specifiedRules.d.ts
index c09c358cb1..5afc1a09e5 100644
--- a/types/graphql/validation/specifiedRules.d.ts
+++ b/types/graphql/validation/specifiedRules.d.ts
@@ -1,4 +1,4 @@
-import { ValidationContext } from './validate'; // It needs to check.
+import { ValidationContext } from "./validate"; // It needs to check.
 
 /**
  * This set includes all validation rules defined by the GraphQL spec.
diff --git a/types/graphql/validation/validate.d.ts b/types/graphql/validation/validate.d.ts
index 9e2fd479f1..c60c3bf072 100644
--- a/types/graphql/validation/validate.d.ts
+++ b/types/graphql/validation/validate.d.ts
@@ -1,23 +1,23 @@
-import { GraphQLError } from '../error';
+import { GraphQLError } from "../error";
 import {
-  DocumentNode,
-  OperationDefinitionNode,
-  VariableNode,
-  SelectionSetNode,
-  FragmentSpreadNode,
-  FragmentDefinitionNode,
-} from '../language/ast';
-import { GraphQLSchema } from '../type/schema';
+    DocumentNode,
+    OperationDefinitionNode,
+    VariableNode,
+    SelectionSetNode,
+    FragmentSpreadNode,
+    FragmentDefinitionNode,
+} from "../language/ast";
+import { GraphQLSchema } from "../type/schema";
 import {
-  GraphQLInputType,
-  GraphQLOutputType,
-  GraphQLCompositeType,
-  GraphQLField,
-  GraphQLArgument,
-} from '../type/definition';
-import { GraphQLDirective } from '../type/directives';
-import { TypeInfo } from '../utilities/TypeInfo';
-import { specifiedRules } from './specifiedRules';
+    GraphQLInputType,
+    GraphQLOutputType,
+    GraphQLCompositeType,
+    GraphQLField,
+    GraphQLArgument,
+} from "../type/definition";
+import { GraphQLDirective } from "../type/directives";
+import { TypeInfo } from "../utilities/TypeInfo";
+import { specifiedRules } from "./specifiedRules";
 
 /**
  * Implements the "Validation" section of the spec.
@@ -32,11 +32,7 @@ import { specifiedRules } from './specifiedRules';
  * (see the language/visitor API). Visitor methods are expected to return
  * GraphQLErrors, or Arrays of GraphQLErrors when invalid.
  */
-export function validate(
-  schema: GraphQLSchema,
-  ast: DocumentNode,
-  rules?: any[],
-): GraphQLError[];
+export function validate(schema: GraphQLSchema, ast: DocumentNode, rules?: any[]): GraphQLError[];
 
 /**
  * This uses a specialized visitor which runs multiple visitors in parallel,
@@ -45,18 +41,16 @@ export function validate(
  * @internal
  */
 export function visitUsingRules(
-  schema: GraphQLSchema,
-  typeInfo: TypeInfo,
-  documentAST: DocumentNode,
-  rules: any[],
+    schema: GraphQLSchema,
+    typeInfo: TypeInfo,
+    documentAST: DocumentNode,
+    rules: any[]
 ): GraphQLError[];
 
-export type NodeWithSelectionSet =
-  | OperationDefinitionNode
-  | FragmentDefinitionNode;
+export type NodeWithSelectionSet = OperationDefinitionNode | FragmentDefinitionNode;
 export interface VariableUsage {
-  node: VariableNode;
-  type: GraphQLInputType;
+    node: VariableNode;
+    type: GraphQLInputType;
 }
 
 /**
@@ -65,38 +59,34 @@ export interface VariableUsage {
  * validation rule.
  */
 export class ValidationContext {
-  constructor(schema: GraphQLSchema, ast: DocumentNode, typeInfo: TypeInfo);
-  reportError(error: GraphQLError): void;
+    constructor(schema: GraphQLSchema, ast: DocumentNode, typeInfo: TypeInfo);
+    reportError(error: GraphQLError): void;
 
-  getErrors(): GraphQLError[];
+    getErrors(): GraphQLError[];
 
-  getSchema(): GraphQLSchema;
+    getSchema(): GraphQLSchema;
 
-  getDocument(): DocumentNode;
+    getDocument(): DocumentNode;
 
-  getFragment(name: string): FragmentDefinitionNode;
+    getFragment(name: string): FragmentDefinitionNode;
 
-  getFragmentSpreads(node: SelectionSetNode): FragmentSpreadNode[];
+    getFragmentSpreads(node: SelectionSetNode): FragmentSpreadNode[];
 
-  getRecursivelyReferencedFragments(
-    operation: OperationDefinitionNode,
-  ): FragmentDefinitionNode[];
+    getRecursivelyReferencedFragments(operation: OperationDefinitionNode): FragmentDefinitionNode[];
 
-  getVariableUsages(node: NodeWithSelectionSet): VariableUsage[];
+    getVariableUsages(node: NodeWithSelectionSet): VariableUsage[];
 
-  getRecursiveVariableUsages(
-    operation: OperationDefinitionNode,
-  ): VariableUsage[];
+    getRecursiveVariableUsages(operation: OperationDefinitionNode): VariableUsage[];
 
-  getType(): GraphQLOutputType;
+    getType(): GraphQLOutputType;
 
-  getParentType(): GraphQLCompositeType;
+    getParentType(): GraphQLCompositeType;
 
-  getInputType(): GraphQLInputType;
+    getInputType(): GraphQLInputType;
 
-  getFieldDef(): GraphQLField<any, any>;
+    getFieldDef(): GraphQLField<any, any>;
 
-  getDirective(): GraphQLDirective;
+    getDirective(): GraphQLDirective;
 
-  getArgument(): GraphQLArgument;
+    getArgument(): GraphQLArgument;
 }

From a36ed3e3f1e9b078d734f367d36cd7d83d0eaa26 Mon Sep 17 00:00:00 2001
From: Andyma <66229754@qq.com>
Date: Tue, 27 Mar 2018 21:35:01 +0800
Subject: [PATCH 0871/1382] Update index.d.ts

Add new line at the end of file
---
 types/datatables.net-colreorder/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/datatables.net-colreorder/index.d.ts b/types/datatables.net-colreorder/index.d.ts
index 80a9fa4e41..3aad7a3050 100644
--- a/types/datatables.net-colreorder/index.d.ts
+++ b/types/datatables.net-colreorder/index.d.ts
@@ -61,4 +61,4 @@ declare namespace DataTables {
       transpose(idx?: number | number[], direction?: "toCurrent" | "toOriginal" | "fromOriginal" | "fromCurrent"): Api;
     }
   }
-}
\ No newline at end of file
+}

From f15c95af975405503bc17137a3c7ad78e701da0c Mon Sep 17 00:00:00 2001
From: Andyma <66229754@qq.com>
Date: Tue, 27 Mar 2018 21:35:30 +0800
Subject: [PATCH 0872/1382] Update tsconfig.json

Add new line at the end of file
---
 types/datatables.net-colreorder/tsconfig.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/datatables.net-colreorder/tsconfig.json b/types/datatables.net-colreorder/tsconfig.json
index 97ef7b2fc0..ec5e47bb49 100644
--- a/types/datatables.net-colreorder/tsconfig.json
+++ b/types/datatables.net-colreorder/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "datatables.net-colreorder-tests.ts"
     ]
-}
\ No newline at end of file
+}

From 674904267086c4d9da061a888805901bfaceb95d Mon Sep 17 00:00:00 2001
From: Alex Dunne <alex@codevate.com>
Date: Tue, 27 Mar 2018 14:46:53 +0100
Subject: [PATCH 0873/1382] [react-native] Added missing ReactART types

---
 types/react-native/index.d.ts | 56 +++++++++++++++++++++++++++++++----
 1 file changed, 51 insertions(+), 5 deletions(-)

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index ee2ad9adc1..934b738293 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -6,6 +6,7 @@
 //                 Tim Wang <https://github.com/timwangdev>
 //                 Kamal Mahyuddin <https://github.com/kamal>
 //                 Naoufal El Yousfi <https://github.com/nelyousfi>
+//                 Alex Dunne <https://github.com/alexdunne>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -8258,26 +8259,71 @@ interface ImageEditorStatic {
     ): void;
 }
 
-export interface ARTShapeProps {
-    d: string;
-    strokeWidth: number;
+export interface ARTNodeMixin {
+    opacity?: number;
+    originX?: number;
+    originY?: number;
+    scaleX?: number;
+    scaleY?: number;
+    scale?: number;
+    title?: string;
+    x?: number;
+    y?: number;
+    visible?: boolean;
+}
+
+export interface ARTGroupProps extends ARTNodeMixin {
+    width?: number;
+    height?: number;
+}
+
+export interface ARTClippingRectangleProps extends ARTNodeMixin {
+    width?: number;
+    height?: number;
+}
+
+export interface ARTRenderableMixin extends ARTNodeMixin {
+    fill?: string;
+    stroke?: string;
+    strokeCap?: "butt" | "square" | "round";
     strokeDash?: number[];
-    stroke: string;
+    strokeJoin?: "bevel" | "miter" | "round";
+    strokeWidth?: number;
+}
+
+export interface ARTShapeProps extends ARTRenderableMixin {
+    d: string;
+    width?: number;
+    height?: number;
+}
+
+export interface ARTTextProps extends ARTRenderableMixin {
+    font?: string;
+    alignment?: string;
 }
 
 export interface ARTSurfaceProps {
-    style: StyleProp<ViewStyle>;
+    style?: StyleProp<ViewStyle>;
     width: number;
     height: number;
 }
 
+export interface ClippingRectangleStatic extends React.ComponentClass<ARTClippingRectangleProps> {}
+
+export interface GroupStatic extends React.ComponentClass<ARTGroupProps> {}
+
 export interface ShapeStatic extends React.ComponentClass<ARTShapeProps> {}
 
 export interface SurfaceStatic extends React.ComponentClass<ARTSurfaceProps> {}
 
+export interface ARTTextStatic extends React.ComponentClass<ARTTextProps> {}
+
 export interface ARTStatic {
+    ClippingRectangle: ClippingRectangleStatic;
+    Group: GroupStatic;
     Shape: ShapeStatic;
     Surface: SurfaceStatic;
+    Text: ARTTextStatic;
 }
 
 export interface KeyboardStatic extends NativeEventEmitter {

From ecd09a22a92ecba606f474b9ec504ca72d12c9af Mon Sep 17 00:00:00 2001
From: Alex Cason <alex@cason.co.uk>
Date: Tue, 27 Mar 2018 14:52:06 +0100
Subject: [PATCH 0874/1382] Update google drive API typing

---
 .../gapi.client.drive-tests.ts                | 86 ++++++++++---------
 types/gapi.client.drive/index.d.ts            | 84 +++++++++++++-----
 types/gapi.client.drive/tsconfig.json         |  2 +-
 3 files changed, 111 insertions(+), 61 deletions(-)

diff --git a/types/gapi.client.drive/gapi.client.drive-tests.ts b/types/gapi.client.drive/gapi.client.drive-tests.ts
index f9fa0ce332..002b5e7eb6 100644
--- a/types/gapi.client.drive/gapi.client.drive-tests.ts
+++ b/types/gapi.client.drive/gapi.client.drive-tests.ts
@@ -43,15 +43,15 @@ gapi.load('client', () => {
 
     async function run() {
         /** Gets information about the user, the user's Drive, and system capabilities. */
-        await gapi.client.about.get({
+        await gapi.client.drive.about.get({
         });
         /** Gets the starting pageToken for listing future changes. */
-        await gapi.client.changes.getStartPageToken({
+        await gapi.client.drive.changes.getStartPageToken({
             supportsTeamDrives: true,
             teamDriveId: "teamDriveId",
         });
         /** Lists the changes for a user or Team Drive. */
-        await gapi.client.changes.list({
+        await gapi.client.drive.changes.list({
             includeCorpusRemovals: true,
             includeRemoved: true,
             includeTeamDriveItems: true,
@@ -63,7 +63,7 @@ gapi.load('client', () => {
             teamDriveId: "teamDriveId",
         });
         /** Subscribes to changes for a user. */
-        await gapi.client.changes.watch({
+        await gapi.client.drive.changes.watch({
             includeCorpusRemovals: true,
             includeRemoved: true,
             includeTeamDriveItems: true,
@@ -75,25 +75,25 @@ gapi.load('client', () => {
             teamDriveId: "teamDriveId",
         });
         /** Stop watching resources through this channel */
-        await gapi.client.channels.stop({
+        await gapi.client.drive.channels.stop({
         });
         /** Creates a new comment on a file. */
-        await gapi.client.comments.create({
+        await gapi.client.drive.comments.create({
             fileId: "fileId",
         });
         /** Deletes a comment. */
-        await gapi.client.comments.delete({
+        await gapi.client.drive.comments.delete({
             commentId: "commentId",
             fileId: "fileId",
         });
         /** Gets a comment by ID. */
-        await gapi.client.comments.get({
+        await gapi.client.drive.comments.get({
             commentId: "commentId",
             fileId: "fileId",
             includeDeleted: true,
         });
         /** Lists a file's comments. */
-        await gapi.client.comments.list({
+        await gapi.client.drive.comments.list({
             fileId: "fileId",
             includeDeleted: true,
             pageSize: 3,
@@ -101,12 +101,12 @@ gapi.load('client', () => {
             startModifiedTime: "startModifiedTime",
         });
         /** Updates a comment with patch semantics. */
-        await gapi.client.comments.update({
+        await gapi.client.drive.comments.update({
             commentId: "commentId",
             fileId: "fileId",
         });
         /** Creates a copy of a file and applies any requested updates with patch semantics. */
-        await gapi.client.files.copy({
+        await gapi.client.drive.files.copy({
             fileId: "fileId",
             ignoreDefaultVisibility: true,
             keepRevisionForever: true,
@@ -114,7 +114,7 @@ gapi.load('client', () => {
             supportsTeamDrives: true,
         });
         /** Creates a new file. */
-        await gapi.client.files.create({
+        await gapi.client.drive.files.create({
             ignoreDefaultVisibility: true,
             keepRevisionForever: true,
             ocrLanguage: "ocrLanguage",
@@ -125,31 +125,31 @@ gapi.load('client', () => {
          * Permanently deletes a file owned by the user without moving it to the trash. If the file belongs to a Team Drive the user must be an organizer on the
          * parent. If the target is a folder, all descendants owned by the user are also deleted.
          */
-        await gapi.client.files.delete({
+        await gapi.client.drive.files.delete({
             fileId: "fileId",
             supportsTeamDrives: true,
         });
         /** Permanently deletes all of the user's trashed files. */
-        await gapi.client.files.emptyTrash({
+        await gapi.client.drive.files.emptyTrash({
         });
         /** Exports a Google Doc to the requested MIME type and returns the exported content. Please note that the exported content is limited to 10MB. */
-        await gapi.client.files.export({
+        await gapi.client.drive.files.export({
             fileId: "fileId",
             mimeType: "mimeType",
         });
         /** Generates a set of file IDs which can be provided in create requests. */
-        await gapi.client.files.generateIds({
+        await gapi.client.drive.files.generateIds({
             count: 1,
             space: "space",
         });
         /** Gets a file's metadata or content by ID. */
-        await gapi.client.files.get({
+        await gapi.client.drive.files.get({
             acknowledgeAbuse: true,
             fileId: "fileId",
             supportsTeamDrives: true,
         });
         /** Lists or searches files. */
-        await gapi.client.files.list({
+        await gapi.client.drive.files.list({
             corpora: "corpora",
             corpus: "corpus",
             includeTeamDriveItems: true,
@@ -162,7 +162,7 @@ gapi.load('client', () => {
             teamDriveId: "teamDriveId",
         });
         /** Updates a file's metadata and/or content with patch semantics. */
-        await gapi.client.files.update({
+        await gapi.client.drive.files.update({
             addParents: "addParents",
             fileId: "fileId",
             keepRevisionForever: true,
@@ -172,66 +172,71 @@ gapi.load('client', () => {
             useContentAsIndexableText: true,
         });
         /** Subscribes to changes to a file */
-        await gapi.client.files.watch({
+        await gapi.client.drive.files.watch({
             acknowledgeAbuse: true,
             fileId: "fileId",
             supportsTeamDrives: true,
         });
         /** Creates a permission for a file or Team Drive. */
-        await gapi.client.permissions.create({
+        await gapi.client.drive.permissions.create({
             emailMessage: "emailMessage",
             fileId: "fileId",
             sendNotificationEmail: true,
             supportsTeamDrives: true,
             transferOwnership: true,
+            useDomainAdminAccess: true,
         });
         /** Deletes a permission. */
-        await gapi.client.permissions.delete({
+        await gapi.client.drive.permissions.delete({
             fileId: "fileId",
             permissionId: "permissionId",
             supportsTeamDrives: true,
+            useDomainAdminAccess: true,
         });
         /** Gets a permission by ID. */
-        await gapi.client.permissions.get({
+        await gapi.client.drive.permissions.get({
             fileId: "fileId",
             permissionId: "permissionId",
             supportsTeamDrives: true,
+            useDomainAdminAccess: true,
         });
         /** Lists a file's or Team Drive's permissions. */
-        await gapi.client.permissions.list({
+        await gapi.client.drive.permissions.list({
             fileId: "fileId",
             pageSize: 2,
             pageToken: "pageToken",
             supportsTeamDrives: true,
+            useDomainAdminAccess: true,
         });
         /** Updates a permission with patch semantics. */
-        await gapi.client.permissions.update({
+        await gapi.client.drive.permissions.update({
             fileId: "fileId",
             permissionId: "permissionId",
             removeExpiration: true,
             supportsTeamDrives: true,
             transferOwnership: true,
+            useDomainAdminAccess: true,
         });
         /** Creates a new reply to a comment. */
-        await gapi.client.replies.create({
+        await gapi.client.drive.replies.create({
             commentId: "commentId",
             fileId: "fileId",
         });
         /** Deletes a reply. */
-        await gapi.client.replies.delete({
+        await gapi.client.drive.replies.delete({
             commentId: "commentId",
             fileId: "fileId",
             replyId: "replyId",
         });
         /** Gets a reply by ID. */
-        await gapi.client.replies.get({
+        await gapi.client.drive.replies.get({
             commentId: "commentId",
             fileId: "fileId",
             includeDeleted: true,
             replyId: "replyId",
         });
         /** Lists a comment's replies. */
-        await gapi.client.replies.list({
+        await gapi.client.drive.replies.list({
             commentId: "commentId",
             fileId: "fileId",
             includeDeleted: true,
@@ -239,52 +244,55 @@ gapi.load('client', () => {
             pageToken: "pageToken",
         });
         /** Updates a reply with patch semantics. */
-        await gapi.client.replies.update({
+        await gapi.client.drive.replies.update({
             commentId: "commentId",
             fileId: "fileId",
             replyId: "replyId",
         });
         /** Permanently deletes a revision. This method is only applicable to files with binary content in Drive. */
-        await gapi.client.revisions.delete({
+        await gapi.client.drive.revisions.delete({
             fileId: "fileId",
             revisionId: "revisionId",
         });
         /** Gets a revision's metadata or content by ID. */
-        await gapi.client.revisions.get({
+        await gapi.client.drive.revisions.get({
             acknowledgeAbuse: true,
             fileId: "fileId",
             revisionId: "revisionId",
         });
         /** Lists a file's revisions. */
-        await gapi.client.revisions.list({
+        await gapi.client.drive.revisions.list({
             fileId: "fileId",
             pageSize: 2,
             pageToken: "pageToken",
         });
         /** Updates a revision with patch semantics. */
-        await gapi.client.revisions.update({
+        await gapi.client.drive.revisions.update({
             fileId: "fileId",
             revisionId: "revisionId",
         });
         /** Creates a new Team Drive. */
-        await gapi.client.teamdrives.create({
+        await gapi.client.drive.teamdrives.create({
             requestId: "requestId",
         });
         /** Permanently deletes a Team Drive for which the user is an organizer. The Team Drive cannot contain any untrashed items. */
-        await gapi.client.teamdrives.delete({
+        await gapi.client.drive.teamdrives.delete({
             teamDriveId: "teamDriveId",
         });
         /** Gets a Team Drive's metadata by ID. */
-        await gapi.client.teamdrives.get({
+        await gapi.client.drive.teamdrives.get({
             teamDriveId: "teamDriveId",
+            useDomainAdminAccess: true,
         });
         /** Lists the user's Team Drives. */
-        await gapi.client.teamdrives.list({
+        await gapi.client.drive.teamdrives.list({
             pageSize: 1,
             pageToken: "pageToken",
+            q: "q",
+            useDomainAdminAccess: true,
         });
         /** Updates a Team Drive's metadata */
-        await gapi.client.teamdrives.update({
+        await gapi.client.drive.teamdrives.update({
             teamDriveId: "teamDriveId",
         });
     }
diff --git a/types/gapi.client.drive/index.d.ts b/types/gapi.client.drive/index.d.ts
index 7004e2c0bb..a2fbec1a34 100644
--- a/types/gapi.client.drive/index.d.ts
+++ b/types/gapi.client.drive/index.d.ts
@@ -16,28 +16,12 @@ declare namespace gapi.client {
     function load(name: "drive", version: "v3"): PromiseLike<void>;
     function load(name: "drive", version: "v3", callback: () => any): void;
 
-    const about: drive.AboutResource;
-
-    const changes: drive.ChangesResource;
-
-    const channels: drive.ChannelsResource;
-
-    const comments: drive.CommentsResource;
-
-    const files: drive.FilesResource;
-
-    const permissions: drive.PermissionsResource;
-
-    const replies: drive.RepliesResource;
-
-    const revisions: drive.RevisionsResource;
-
-    const teamdrives: drive.TeamdrivesResource;
-
     namespace drive {
         interface About {
             /** Whether the user has installed the requesting app. */
             appInstalled?: boolean;
+            /** Whether the user can create Team Drives. */
+            canCreateTeamDrives?: boolean;
             /** A map of source MIME type to possible targets for all supported exports. */
             exportFormats?: Record<string, string[]>;
             /** The currently supported folder colors as RGB hex strings. */
@@ -363,8 +347,9 @@ declare namespace gapi.client {
             owners?: User[];
             /**
              * The IDs of the parent folders which contain the file.
-             * If not specified as part of a create request, the file will be placed directly in the My Drive folder. Update requests must use the addParents and
-             * removeParents parameters to modify the values.
+             * If not specified as part of a create request, the file will be placed directly in the user's My Drive folder. If not specified as part of a copy
+             * request, the file will inherit any discoverable parents of the source file. Update requests must use the addParents and removeParents parameters to
+             * modify the parents list.
              */
             parents?: string[];
             /** List of permission IDs for users with access to this file. */
@@ -683,6 +668,8 @@ declare namespace gapi.client {
             };
             /** The color of this Team Drive as an RGB hex string. It can only be set on a drive.teamdrives.update request that does not set themeId. */
             colorRgb?: string;
+            /** The time at which the Team Drive was created (RFC 3339 date-time). */
+            createdTime?: string;
             /** The ID of this Team Drive which is also the ID of the top level folder for this Team Drive. */
             id?: string;
             /** Identifies what kind of resource this is. Value: the fixed string "drive#teamDrive". */
@@ -1322,7 +1309,7 @@ declare namespace gapi.client {
             create(request: {
                 /** Data format for the response. */
                 alt?: string;
-                /** A custom message to include in the notification email. */
+                /** A plain text custom message to include in the notification email. */
                 emailMessage?: string;
                 /** Selector specifying which fields to include in a partial response. */
                 fields?: string;
@@ -1351,6 +1338,11 @@ declare namespace gapi.client {
                  * the side effect.
                  */
                 transferOwnership?: boolean;
+                /**
+                 * Whether the request should be treated as if it was issued by a domain administrator; if set to true, then the requester will be granted access if they
+                 * are an administrator of the domain to which the item belongs.
+                 */
+                useDomainAdminAccess?: boolean;
                 /** IP address of the site where the request originates. Use this if you want to enforce per-user limits. */
                 userIp?: string;
             }): Request<Permission>;
@@ -1377,6 +1369,11 @@ declare namespace gapi.client {
                 quotaUser?: string;
                 /** Whether the requesting application supports Team Drives. */
                 supportsTeamDrives?: boolean;
+                /**
+                 * Whether the request should be treated as if it was issued by a domain administrator; if set to true, then the requester will be granted access if they
+                 * are an administrator of the domain to which the item belongs.
+                 */
+                useDomainAdminAccess?: boolean;
                 /** IP address of the site where the request originates. Use this if you want to enforce per-user limits. */
                 userIp?: string;
             }): Request<void>;
@@ -1403,6 +1400,11 @@ declare namespace gapi.client {
                 quotaUser?: string;
                 /** Whether the requesting application supports Team Drives. */
                 supportsTeamDrives?: boolean;
+                /**
+                 * Whether the request should be treated as if it was issued by a domain administrator; if set to true, then the requester will be granted access if they
+                 * are an administrator of the domain to which the item belongs.
+                 */
+                useDomainAdminAccess?: boolean;
                 /** IP address of the site where the request originates. Use this if you want to enforce per-user limits. */
                 userIp?: string;
             }): Request<Permission>;
@@ -1434,6 +1436,11 @@ declare namespace gapi.client {
                 quotaUser?: string;
                 /** Whether the requesting application supports Team Drives. */
                 supportsTeamDrives?: boolean;
+                /**
+                 * Whether the request should be treated as if it was issued by a domain administrator; if set to true, then the requester will be granted access if they
+                 * are an administrator of the domain to which the item belongs.
+                 */
+                useDomainAdminAccess?: boolean;
                 /** IP address of the site where the request originates. Use this if you want to enforce per-user limits. */
                 userIp?: string;
             }): Request<PermissionList>;
@@ -1467,6 +1474,11 @@ declare namespace gapi.client {
                  * the side effect.
                  */
                 transferOwnership?: boolean;
+                /**
+                 * Whether the request should be treated as if it was issued by a domain administrator; if set to true, then the requester will be granted access if they
+                 * are an administrator of the domain to which the item belongs.
+                 */
+                useDomainAdminAccess?: boolean;
                 /** IP address of the site where the request originates. Use this if you want to enforce per-user limits. */
                 userIp?: string;
             }): Request<Permission>;
@@ -1777,6 +1789,11 @@ declare namespace gapi.client {
                 quotaUser?: string;
                 /** The ID of the Team Drive */
                 teamDriveId: string;
+                /**
+                 * Whether the request should be treated as if it was issued by a domain administrator; if set to true, then the requester will be granted access if they
+                 * are an administrator of the domain to which the Team Drive belongs.
+                 */
+                useDomainAdminAccess?: boolean;
                 /** IP address of the site where the request originates. Use this if you want to enforce per-user limits. */
                 userIp?: string;
             }): Request<TeamDrive>;
@@ -1796,11 +1813,18 @@ declare namespace gapi.client {
                 pageToken?: string;
                 /** Returns response with indentations and line breaks. */
                 prettyPrint?: boolean;
+                /** Query string for searching Team Drives. */
+                q?: string;
                 /**
                  * Available to use for quota purposes for server-side applications. Can be any arbitrary string assigned to a user, but should not exceed 40 characters.
                  * Overrides userIp if both are provided.
                  */
                 quotaUser?: string;
+                /**
+                 * Whether the request should be treated as if it was issued by a domain administrator; if set to true, then all Team Drives of the domain in which the
+                 * requester is an administrator are returned.
+                 */
+                useDomainAdminAccess?: boolean;
                 /** IP address of the site where the request originates. Use this if you want to enforce per-user limits. */
                 userIp?: string;
             }): Request<TeamDriveList>;
@@ -1827,5 +1851,23 @@ declare namespace gapi.client {
                 userIp?: string;
             }): Request<TeamDrive>;
         }
+
+        const about: drive.AboutResource;
+
+        const changes: drive.ChangesResource;
+
+        const channels: drive.ChannelsResource;
+
+        const comments: drive.CommentsResource;
+
+        const files: drive.FilesResource;
+
+        const permissions: drive.PermissionsResource;
+
+        const replies: drive.RepliesResource;
+
+        const revisions: drive.RevisionsResource;
+
+        const teamdrives: drive.TeamdrivesResource;
     }
 }
diff --git a/types/gapi.client.drive/tsconfig.json b/types/gapi.client.drive/tsconfig.json
index 0cdc6f7fab..6d5901b410 100644
--- a/types/gapi.client.drive/tsconfig.json
+++ b/types/gapi.client.drive/tsconfig.json
@@ -14,7 +14,7 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true,
+        "forceConsistentCasingInFileNames": true,        
         "strictFunctionTypes": true
     },
     "files": [

From 514ac95272fc18a82cd7f2795b2f75e69470c850 Mon Sep 17 00:00:00 2001
From: Fathy Boundjadj <fathy.boundjadj@ubleam.com>
Date: Tue, 27 Mar 2018 15:53:10 +0200
Subject: [PATCH 0875/1382] Add Parcel environment typings

---
 types/parcel-env/index.d.ts          | 177 +++++++++++++++++++++++++++
 types/parcel-env/parcel-env-tests.ts |  76 ++++++++++++
 types/parcel-env/tsconfig.json       |  23 ++++
 types/parcel-env/tslint.json         |  79 ++++++++++++
 4 files changed, 355 insertions(+)
 create mode 100644 types/parcel-env/index.d.ts
 create mode 100644 types/parcel-env/parcel-env-tests.ts
 create mode 100644 types/parcel-env/tsconfig.json
 create mode 100644 types/parcel-env/tslint.json

diff --git a/types/parcel-env/index.d.ts b/types/parcel-env/index.d.ts
new file mode 100644
index 0000000000..3de90c93bf
--- /dev/null
+++ b/types/parcel-env/index.d.ts
@@ -0,0 +1,177 @@
+// Type definitions for Parcel (module API)
+// Project: https://github.com/parcel/parcel-bundler
+// Definitions by: Fathy Boundjadj <https://github.com/fathyb>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// Based on @types/webpack-env
+
+/**
+ * Parcel module API - variables and global functions available inside modules
+ */
+
+declare namespace __ParcelModuleApi {
+    interface RequireFunction {
+        /**
+         * Returns the exports from a dependency. The call is sync. No request to the server is fired. The compiler ensures that the dependency is available.
+         */
+        (path: string): any;
+        <T>(path: string): T;
+    }
+
+    interface Module {
+        exports: any;
+        require(id: string): any;
+        require<T>(id: string): T;
+        id: string;
+        filename: string;
+        loaded: boolean;
+        parent: any;
+        children: any[];
+        hot?: Hot;
+    }
+    type ModuleId = string|number;
+
+    interface Hot {
+        /**
+         * Accept code updates for the specified dependencies. The callback is called when dependencies were replaced.
+         * @param dependencies
+         * @param callback
+         */
+        accept(dependencies: string[], callback: (updatedDependencies: ModuleId[]) => void): void;
+        /**
+         * Accept code updates for the specified dependencies. The callback is called when dependencies were replaced.
+         * @param dependency
+         * @param callback
+         */
+        accept(dependency: string, callback: () => void): void;
+        /**
+         * Accept code updates for this module without notification of parents.
+         * This should only be used if the module doesn’t export anything.
+         * The errHandler can be used to handle errors that occur while loading the updated module.
+         * @param errHandler
+         */
+        accept(errHandler?: (err: Error) => void): void;
+        /**
+         * Do not accept updates for the specified dependencies. If any dependencies is updated, the code update fails with code "decline".
+         */
+        decline(dependencies: string[]): void;
+        /**
+         * Do not accept updates for the specified dependencies. If any dependencies is updated, the code update fails with code "decline".
+         */
+        decline(dependency: string): void;
+        /**
+         * Flag the current module as not update-able. If updated the update code would fail with code "decline".
+         */
+        decline(): void;
+        /**
+         * Add a one time handler, which is executed when the current module code is replaced.
+         * Here you should destroy/remove any persistent resource you have claimed/created.
+         * If you want to transfer state to the new module, add it to data object.
+         * The data will be available at module.hot.data on the new module.
+         * @param callback
+         */
+        dispose(callback: (data: any) => void): void;
+        dispose(callback: <T>(data: T) => void): void;
+        /**
+         * Add a one time handler, which is executed when the current module code is replaced.
+         * Here you should destroy/remove any persistent resource you have claimed/created.
+         * If you want to transfer state to the new module, add it to data object.
+         * The data will be available at module.hot.data on the new module.
+         * @param callback
+         */
+        addDisposeHandler(callback: (data: any) => void): void;
+        addDisposeHandler<T>(callback: (data: T) => void): void;
+        /**
+         * Remove a handler.
+         * This can useful to add a temporary dispose handler. You could i. e. replace code while in the middle of a multi-step async function.
+         * @param callback
+         */
+        removeDisposeHandler(callback: (data: any) => void): void;
+        removeDisposeHandler<T>(callback: (data: T) => void): void;
+        /**
+         * Throws an exceptions if status() is not idle.
+         * Check all currently loaded modules for updates and apply updates if found.
+         * If no update was found, the callback is called with null.
+         * If autoApply is truthy the callback will be called with all modules that were disposed.
+         * apply() is automatically called with autoApply as options parameter.
+         * If autoApply is not set the callback will be called with all modules that will be disposed on apply().
+         * @param autoApply
+         * @param callback
+         */
+        check(autoApply: boolean, callback: (err: Error, outdatedModules: ModuleId[]) => void): void;
+        /**
+         * Throws an exceptions if status() is not idle.
+         * Check all currently loaded modules for updates and apply updates if found.
+         * If no update was found, the callback is called with null.
+         * The callback will be called with all modules that will be disposed on apply().
+         * @param callback
+         */
+        check(callback: (err: Error, outdatedModules: ModuleId[]) => void): void;
+        /**
+         * If status() != "ready" it throws an error.
+         * Continue the update process.
+         * @param options
+         * @param callback
+         */
+        apply(options: AcceptOptions, callback: (err: Error, outdatedModules: ModuleId[]) => void): void;
+        /**
+         * If status() != "ready" it throws an error.
+         * Continue the update process.
+         * @param callback
+         */
+        apply(callback: (err: Error, outdatedModules: ModuleId[]) => void): void;
+        /**
+         * Return one of idle, check, watch, watch-delay, prepare, ready, dispose, apply, abort or fail.
+         */
+        status(): string;
+        /** Register a callback on status change. */
+        status(callback: (status: string) => void): void;
+        /** Register a callback on status change. */
+        addStatusHandler(callback: (status: string) => void): void;
+        /**
+         * Remove a registered status change handler.
+         * @param callback
+         */
+        removeStatusHandler(callback: (status: string) => void): void;
+
+        active: boolean;
+        data: any;
+    }
+
+    interface AcceptOptions {
+        /**
+         * If true the update process continues even if some modules are not accepted (and would bubble to the entry point).
+         */
+        ignoreUnaccepted?: boolean;
+        /**
+         * Indicates that apply() is automatically called by check function
+         */
+        autoApply?: boolean;
+    }
+    /**
+    * Inside env you can pass any variable
+    */
+    interface NodeProcess {
+        env?: any;
+    }
+
+    type __Require1 = (id: string) => any;
+    type __Require2 = <T>(id: string) => T;
+    type RequireLambda = __Require1 & __Require2;
+}
+
+interface NodeRequire extends __ParcelModuleApi.RequireFunction {
+}
+
+declare var require: NodeRequire;
+
+interface NodeModule extends __ParcelModuleApi.Module {}
+
+declare var module: NodeModule;
+
+/**
+* Declare process variable
+*/
+declare namespace NodeJS {
+    interface Process extends __ParcelModuleApi.NodeProcess {}
+}
+declare var process: NodeJS.Process;
diff --git a/types/parcel-env/parcel-env-tests.ts b/types/parcel-env/parcel-env-tests.ts
new file mode 100644
index 0000000000..9c17be0748
--- /dev/null
+++ b/types/parcel-env/parcel-env-tests.ts
@@ -0,0 +1,76 @@
+
+
+interface SomeModule {
+    someMethod(): void;
+}
+
+let someModule = require<SomeModule>('./someModule');
+someModule.someMethod();
+
+let otherModule = require('./otherModule');
+otherModule.otherMethod();
+
+// check if HMR is enabled
+if(module.hot) {
+    // accept update of dependency
+    module.hot.accept("./handler.js", function() {
+        //...
+    });
+}
+
+module.exports = null;
+
+// check if HMR is enabled
+if(module.hot) {
+
+    // accept itself
+    module.hot.accept();
+
+    // dispose handler
+    module.hot.dispose(function() {
+        // revoke the side effect
+        //...
+    });
+}
+
+class ModuleData {
+    updated: boolean;
+}
+
+if (module.hot) {
+    module.hot.accept((err: Error) => {
+       //...
+    });
+
+    module.hot.decline("./someModule");
+
+    module.hot.dispose((data: ModuleData) => {
+        data.updated = true;
+        // ...
+    });
+
+    let disposeHandler: ((data: ModuleData) => void) = data => {
+        // ...
+    };
+    module.hot.addDisposeHandler(disposeHandler);
+    module.hot.removeDisposeHandler(disposeHandler);
+
+    module.hot.check(true, (err: Error, outdatedModules: (string|number)[]) => {
+       // ...
+    });
+
+    module.hot.apply({ ignoreUnaccepted: true }, (err: Error, outdatedModules: (string|number)[]) => {
+        // ...
+    });
+
+    var status: string = module.hot.status();
+    let statusHandler: ((status: string) => void) = status => {
+        // ...
+    };
+    module.hot.status(statusHandler);
+    module.hot.addStatusHandler(statusHandler);
+    module.hot.removeStatusHandler(statusHandler);
+}
+
+
+
diff --git a/types/parcel-env/tsconfig.json b/types/parcel-env/tsconfig.json
new file mode 100644
index 0000000000..bf765d8bae
--- /dev/null
+++ b/types/parcel-env/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "parcel-env-tests.ts"
+    ]
+}
diff --git a/types/parcel-env/tslint.json b/types/parcel-env/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/parcel-env/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}

From 6e7636d31b361fa1c596875a3c83faf5ecd8b709 Mon Sep 17 00:00:00 2001
From: Alex Cason <alex@cason.co.uk>
Date: Tue, 27 Mar 2018 15:09:08 +0100
Subject: [PATCH 0876/1382] Resolve linting errors

---
 types/gapi.client.drive/index.d.ts | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/types/gapi.client.drive/index.d.ts b/types/gapi.client.drive/index.d.ts
index a2fbec1a34..1b2a939a7d 100644
--- a/types/gapi.client.drive/index.d.ts
+++ b/types/gapi.client.drive/index.d.ts
@@ -1852,22 +1852,22 @@ declare namespace gapi.client {
             }): Request<TeamDrive>;
         }
 
-        const about: drive.AboutResource;
+        const about: AboutResource;
 
-        const changes: drive.ChangesResource;
+        const changes: ChangesResource;
 
-        const channels: drive.ChannelsResource;
+        const channels: ChannelsResource;
 
-        const comments: drive.CommentsResource;
+        const comments: CommentsResource;
 
-        const files: drive.FilesResource;
+        const files: FilesResource;
 
-        const permissions: drive.PermissionsResource;
+        const permissions: PermissionsResource;
 
-        const replies: drive.RepliesResource;
+        const replies: RepliesResource;
 
-        const revisions: drive.RevisionsResource;
+        const revisions: RevisionsResource;
 
-        const teamdrives: drive.TeamdrivesResource;
+        const teamdrives: TeamdrivesResource;
     }
 }

From 5a64d54d733c4ae65806980bd0d36c68aadc260f Mon Sep 17 00:00:00 2001
From: ikokostya <ikokostya@gmail.com>
Date: Tue, 27 Mar 2018 17:54:26 +0300
Subject: [PATCH 0877/1382] @types/node: Add url.domainToASCII,
 url.domainToUnicode

---
 types/node/index.d.ts       | 3 +++
 types/node/node-tests.ts    | 5 +++++
 types/node/v7/index.d.ts    | 3 +++
 types/node/v7/node-tests.ts | 5 +++++
 types/node/v8/index.d.ts    | 3 +++
 types/node/v8/node-tests.ts | 5 +++++
 6 files changed, 24 insertions(+)

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index 0994982b41..2e31fff6e6 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -2361,6 +2361,9 @@ declare module "url" {
     export function format(urlObject: UrlObject | string): string;
     export function resolve(from: string, to: string): string;
 
+    export function domainToASCII(domain: string): string;
+    export function domainToUnicode(domain: string): string;
+
     export interface URLFormatOptions {
         auth?: boolean;
         fragment?: boolean;
diff --git a/types/node/node-tests.ts b/types/node/node-tests.ts
index 08dbb68b8a..89d87578d9 100644
--- a/types/node/node-tests.ts
+++ b/types/node/node-tests.ts
@@ -635,6 +635,11 @@ namespace url_tests {
         }
     }
 
+    {
+        const ascii: string = url.domainToASCII('español.com');
+        const unicode: string = url.domainToUnicode('xn--espaol-zwa.com');
+    }
+
     {
         let myURL = new url.URL('https://theuser:thepwd@example.org:81/foo/path?query=string#bar');
         assert.equal(myURL.hash, '#bar');
diff --git a/types/node/v7/index.d.ts b/types/node/v7/index.d.ts
index 748f932d80..62e30f0f09 100644
--- a/types/node/v7/index.d.ts
+++ b/types/node/v7/index.d.ts
@@ -2024,6 +2024,9 @@ declare module "url" {
     export function format(urlObject: UrlObject | string): string;
     export function resolve(from: string, to: string): string;
 
+    export function domainToASCII(domain: string): string;
+    export function domainToUnicode(domain: string): string;
+
     export interface URLFormatOptions {
         auth?: boolean;
         fragment?: boolean;
diff --git a/types/node/v7/node-tests.ts b/types/node/v7/node-tests.ts
index eb25e01f10..cc46b1f8e4 100644
--- a/types/node/v7/node-tests.ts
+++ b/types/node/v7/node-tests.ts
@@ -475,6 +475,11 @@ namespace url_tests {
         assert.equal(helloUrl.query.hello, 'world');
     }
 
+    {
+        const ascii: string = url.domainToASCII('español.com');
+        const unicode: string = url.domainToUnicode('xn--espaol-zwa.com');
+    }
+
     {
         let myURL = new url.URL('https://theuser:thepwd@example.org:81/foo/path?query=string#bar');
         assert.equal(myURL.hash, '#bar');
diff --git a/types/node/v8/index.d.ts b/types/node/v8/index.d.ts
index 1697093de7..fd1f5cafae 100644
--- a/types/node/v8/index.d.ts
+++ b/types/node/v8/index.d.ts
@@ -2350,6 +2350,9 @@ declare module "url" {
     export function format(urlObject: UrlObject | string): string;
     export function resolve(from: string, to: string): string;
 
+    export function domainToASCII(domain: string): string;
+    export function domainToUnicode(domain: string): string;
+
     export interface URLFormatOptions {
         auth?: boolean;
         fragment?: boolean;
diff --git a/types/node/v8/node-tests.ts b/types/node/v8/node-tests.ts
index b63d494fbd..58c1319261 100644
--- a/types/node/v8/node-tests.ts
+++ b/types/node/v8/node-tests.ts
@@ -609,6 +609,11 @@ namespace url_tests {
         }
     }
 
+    {
+        const ascii: string = url.domainToASCII('español.com');
+        const unicode: string = url.domainToUnicode('xn--espaol-zwa.com');
+    }
+
     {
         let myURL = new url.URL('https://theuser:thepwd@example.org:81/foo/path?query=string#bar');
         assert.equal(myURL.hash, '#bar');

From b4dd9f41919bbe7efe99a7d6b9d1a1322a61037f Mon Sep 17 00:00:00 2001
From: Tom Wanzek <tomwanzek@gmail.com>
Date: Tue, 27 Mar 2018 11:12:31 -0400
Subject: [PATCH 0878/1382] feat(d3-fetch):  update to minor version 1.1

* Update d3-fetch to minor version 1.1.
* Add `html(...)`
* Add `svg(...)`
* Add `xml(...)`

Closes #24516
---
 types/d3-fetch/d3-fetch-tests.ts | 11 +++++++++++
 types/d3-fetch/index.d.ts        | 34 ++++++++++++++++++++++++++++++--
 2 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/types/d3-fetch/d3-fetch-tests.ts b/types/d3-fetch/d3-fetch-tests.ts
index 941955c996..3cffde0c9e 100644
--- a/types/d3-fetch/d3-fetch-tests.ts
+++ b/types/d3-fetch/d3-fetch-tests.ts
@@ -49,3 +49,14 @@ promise1 = d3Fetch.tsv(url);
 promise1 = d3Fetch.tsv(url, init);
 promise2 = d3Fetch.tsv<MyType>(url, parseRow);
 promise2 = d3Fetch.tsv<MyType>(url, init, parseRow);
+
+let docPromise: Promise<Document>;
+docPromise = d3Fetch.hmtl(url);
+docPromise = d3Fetch.hmtl(url, init);
+
+docPromise = d3Fetch.svg(url);
+docPromise = d3Fetch.svg(url, init);
+
+let xmlDocPromise: Promise<XMLDocument>;
+xmlDocPromise = d3Fetch.xml(url);
+xmlDocPromise = d3Fetch.xml(url, init);
diff --git a/types/d3-fetch/index.d.ts b/types/d3-fetch/index.d.ts
index 3eb11ce48a..fc0d5e0e66 100644
--- a/types/d3-fetch/index.d.ts
+++ b/types/d3-fetch/index.d.ts
@@ -1,10 +1,10 @@
-// Type definitions for d3-fetch 1.0
+// Type definitions for d3-fetch 1.1
 // Project: https://d3js.org/d3-fetch/
 // Definitions by: Hugues Stefanski <https://github.com/ledragon>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
-// Last module patch version validated against: 1.0.1
+// Last module patch version validated against: 1.1.0
 
 import { DSVParsedArray, DSVRowString, DSVRowAny } from 'd3-dsv';
 
@@ -146,6 +146,16 @@ export function dsv<ParsedRow extends DSVRowAny>(
     row: (rawRow: DSVRowString, index: number, columns: string[]) => ParsedRow | undefined | null
 ): Promise<DSVParsedArray<ParsedRow>>;
 
+/**
+ * Fetches the file at the specified input URL as text, parses it as HTML and returns a Promise of an HTML DOM Document.
+ *
+ * If init is specified, it is passed along to the underlying call to fetch.
+ *
+ * @param url A valid URL string.
+ * @param init An optional request initialization object.
+ */
+export function hmtl(url: string, init?: RequestInit): Promise<Document>;
+
 /**
  * Fetches the image at the specified input URL and returns a promise of an HTML image element.
  *
@@ -168,6 +178,16 @@ export function image(url: string, init?: {[key: string]: any}): Promise<HTMLIma
  */
 export function json<ParsedJSONObject extends any>(url: string, init?: RequestInit): Promise<ParsedJSONObject>;
 
+/**
+ * Fetches the file at the specified input URL as text, parses it as SVG and returns a Promise of an SVG Document.
+ *
+ * If init is specified, it is passed along to the underlying call to fetch.
+ *
+ * @param url A valid URL string.
+ * @param init An optional request initialization object.
+ */
+export function svg(url: string, init?: RequestInit): Promise<Document>;
+
 /**
  * Fetches the text file at the specified input URL and returns it as a Promise of a string.
  *
@@ -234,3 +254,13 @@ export function tsv<ParsedRow extends DSVRowAny>(
     init: RequestInit,
     row: (rawRow: DSVRowString, index: number, columns: string[]) => ParsedRow | undefined | null
 ): Promise<DSVParsedArray<ParsedRow>>;
+
+/**
+ * Fetches the file at the specified input URL as text, parses it as XML and returns a Promise of an XML Document.
+ *
+ * If init is specified, it is passed along to the underlying call to fetch.
+ *
+ * @param url A valid URL string.
+ * @param init An optional request initialization object.
+ */
+export function xml(url: string, init?: RequestInit): Promise<XMLDocument>;

From c4d02fc9c96e7149d79fd73435384a81f913fc3d Mon Sep 17 00:00:00 2001
From: Firede <firede@firede.us>
Date: Tue, 27 Mar 2018 23:52:58 +0800
Subject: [PATCH 0879/1382] update `graphql/error/*` -> `v0.13.2`.

https://github.com/graphql/graphql-js/tree/v0.13.2/src/error
---
 types/graphql/error/GraphQLError.d.ts | 29 +++++++++++++++------------
 types/graphql/error/formatError.d.ts  | 14 ++++++-------
 types/graphql/error/index.d.ts        |  3 ++-
 types/graphql/error/locatedError.d.ts |  7 ++++++-
 types/graphql/error/printError.d.ts   |  7 +++++++
 5 files changed, 37 insertions(+), 23 deletions(-)
 create mode 100644 types/graphql/error/printError.d.ts

diff --git a/types/graphql/error/GraphQLError.d.ts b/types/graphql/error/GraphQLError.d.ts
index a4aa3f17c6..0be931bee0 100644
--- a/types/graphql/error/GraphQLError.d.ts
+++ b/types/graphql/error/GraphQLError.d.ts
@@ -1,6 +1,7 @@
 import { getLocation } from "../language";
 import { ASTNode } from "../language/ast";
 import { Source } from "../language/source";
+import { SourceLocation } from "../language/location";
 
 /**
  * A GraphQLError describes an Error found during the parse, validate, or
@@ -13,6 +14,8 @@ export class GraphQLError extends Error {
      * A message describing the Error for debugging purposes.
      *
      * Enumerable, and appears in the result of JSON.stringify().
+     *
+     * Note: should be treated as readonly, despite invariant usage.
      */
     message: string;
 
@@ -26,7 +29,7 @@ export class GraphQLError extends Error {
      *
      * Enumerable, and appears in the result of JSON.stringify().
      */
-    locations?: Array<{ line: number; column: number }> | undefined;
+    readonly locations: ReadonlyArray<SourceLocation> | undefined;
 
     /**
      * An array describing the JSON-path into the execution response which
@@ -34,41 +37,41 @@ export class GraphQLError extends Error {
      *
      * Enumerable, and appears in the result of JSON.stringify().
      */
-    path?: Array<string | number> | undefined;
+    readonly path: ReadonlyArray<string | number> | undefined;
 
     /**
      * An array of GraphQL AST Nodes corresponding to this error.
      */
-    nodes?: ASTNode[] | undefined;
+    readonly nodes: ReadonlyArray<ASTNode> | undefined;
 
     /**
      * The source GraphQL document corresponding to this error.
      */
-    source?: Source | undefined;
+    readonly source: Source | undefined;
 
     /**
      * An array of character offsets within the source GraphQL document
      * which correspond to this error.
      */
-    positions?: number[] | undefined;
+    readonly positions: ReadonlyArray<number> | undefined;
 
     /**
      * The original error thrown from a field resolver during execution.
      */
-    originalError?: Error;
+    readonly originalError: Error | void;
 
     /**
      * Extension fields to add to the formatted error.
      */
-    extensions?: { [key: string]: any } | undefined;
+    readonly extensions: { [key: string]: any } | void;
 
     constructor(
         message: string,
-        nodes?: any[],
-        source?: Source,
-        positions?: number[],
-        path?: Array<string | number>,
-        originalError?: Error,
-        extensions?: { [key: string]: any }
+        nodes?: ReadonlyArray<ASTNode> | ASTNode | undefined,
+        source?: Source | void,
+        positions?: ReadonlyArray<number> | void,
+        path?: ReadonlyArray<string | number> | void,
+        originalError?: Error | void,
+        extensions?: { [key: string]: any } | void
     );
 }
diff --git a/types/graphql/error/formatError.d.ts b/types/graphql/error/formatError.d.ts
index a683da0375..7f13117cf0 100644
--- a/types/graphql/error/formatError.d.ts
+++ b/types/graphql/error/formatError.d.ts
@@ -1,4 +1,5 @@
 import { GraphQLError } from "./GraphQLError";
+import { SourceLocation } from "../language/location";
 
 /**
  * Given a GraphQLError, format it according to the rules described by the
@@ -7,12 +8,9 @@ import { GraphQLError } from "./GraphQLError";
 export function formatError(error: GraphQLError): GraphQLFormattedError;
 
 export interface GraphQLFormattedError {
-    message: string;
-    locations?: GraphQLErrorLocation[];
-    path?: Array<string | number>;
-}
-
-export interface GraphQLErrorLocation {
-    line: number;
-    column: number;
+    readonly message: string;
+    readonly locations: ReadonlyArray<SourceLocation> | undefined;
+    readonly path: ReadonlyArray<string | number> | undefined;
+    // Extensions
+    readonly [key: string]: any;
 }
diff --git a/types/graphql/error/index.d.ts b/types/graphql/error/index.d.ts
index 8d81175bcc..bed0763ed3 100644
--- a/types/graphql/error/index.d.ts
+++ b/types/graphql/error/index.d.ts
@@ -1,4 +1,5 @@
 export { GraphQLError } from "./GraphQLError";
 export { syntaxError } from "./syntaxError";
 export { locatedError } from "./locatedError";
-export { formatError, GraphQLFormattedError, GraphQLErrorLocation } from "./formatError";
+export { printError } from "./printError";
+export { formatError, GraphQLFormattedError } from "./formatError";
diff --git a/types/graphql/error/locatedError.d.ts b/types/graphql/error/locatedError.d.ts
index c41fd0df50..77dd470c63 100644
--- a/types/graphql/error/locatedError.d.ts
+++ b/types/graphql/error/locatedError.d.ts
@@ -1,8 +1,13 @@
 import { GraphQLError } from "./GraphQLError";
+import { ASTNode } from "../language/ast";
 
 /**
  * Given an arbitrary Error, presumably thrown while attempting to execute a
  * GraphQL operation, produce a new GraphQLError aware of the location in the
  * document responsible for the original Error.
  */
-export function locatedError<T>(originalError: Error, nodes: T[], path: Array<string | number>): GraphQLError;
+export function locatedError(
+    originalError: Error,
+    nodes: ReadonlyArray<ASTNode>,
+    path: ReadonlyArray<string | number>
+): GraphQLError;
diff --git a/types/graphql/error/printError.d.ts b/types/graphql/error/printError.d.ts
new file mode 100644
index 0000000000..924682f471
--- /dev/null
+++ b/types/graphql/error/printError.d.ts
@@ -0,0 +1,7 @@
+import { GraphQLError } from "./GraphQLError";
+
+/**
+ * Prints a GraphQLError to a string, representing useful location information
+ * about the error's position in the source.
+ */
+export function printError(error: GraphQLError): string;

From 85fe43f771d1f7564863890cb10043f964e15da9 Mon Sep 17 00:00:00 2001
From: WinUP <l.gholoi@outlook.com>
Date: Tue, 27 Mar 2018 11:54:12 -0400
Subject: [PATCH 0880/1382] Update cron to 1.3.0

---
 types/cron/cron-tests.ts |   5 ++
 types/cron/index.d.ts    | 125 ++++++++++++++++++++++++++++++++++-----
 2 files changed, 114 insertions(+), 16 deletions(-)

diff --git a/types/cron/cron-tests.ts b/types/cron/cron-tests.ts
index 7eea73eeed..21e28f9c0f 100644
--- a/types/cron/cron-tests.ts
+++ b/types/cron/cron-tests.ts
@@ -47,7 +47,12 @@ var job = new CronJob({
   start: false,
   timeZone: 'America/Los_Angeles'
 });
+console.log(job.lastDate());
+console.log(job.nextDates(1));
+console.log(job.running);
+job.setTime(new CronTime('00 30 11 * * 1-2'));
 job.start();
+job.stop();
 
 // How to check if a cron pattern is valid:
 try {
diff --git a/types/cron/index.d.ts b/types/cron/index.d.ts
index 780890c014..b27bfdf90c 100644
--- a/types/cron/index.d.ts
+++ b/types/cron/index.d.ts
@@ -1,25 +1,118 @@
-// Type definitions for cron 1.2
+// Type definitions for cron 1.3
 // Project: https://www.npmjs.com/package/cron
 // Definitions by: Hiroki Horiuchi <https://github.com/horiuchi>
+//                 Lundarl Gholoi <https://github.com/winup>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+export declare class CronTime {
+    /**
+     * Create a new ```CronTime```.
+     * @param source The time to fire off your job. This can be in the form of cron syntax or a JS ```Date``` object.
+     * @param zone Timezone name. You can check all timezones available at [Moment Timezone Website](http://momentjs.com/timezone/).
+     */
+    constructor(source: string | Date, zone?: string);
 
+    /**
+     * Tells you when ```CronTime``` will be run.
+     * @param i Indicate which turn of run after now. If not given return next run time.
+     */
+    public sendAt(i?: number): Date;
+    /**
+     * Get the number of milliseconds in the future at which to fire our callbacks.
+     */
+    public getTimeout(): number;
+}
 
-interface CronJobStatic {
-    new (cronTime: string | Date, onTick: () => void, onComplete?: () => void, start?: boolean, timeZone?: string, context?: any, runOnInit?: boolean): CronJob;
-    new (options: {
-        cronTime: string | Date; onTick: () => void; onComplete?: () => void; start?: boolean; timeZone?: string; context?: any; runOnInit?: boolean
-    }): CronJob;
+export declare interface CronJobParameters {
+    /**
+     * The time to fire off your job. This can be in the form of cron syntax or a JS ```Date``` object.
+     */
+    cronTime: string | Date;
+    /**
+     * The function to fire at the specified time.
+     */
+    onTick: () => void;
+    /**
+     * A function that will fire when the job is complete, when it is stopped.
+     */
+    onComplete?: () => void;
+    /**
+     * Specifies whether to start the job just before exiting the constructor. By default this is set to false. If left at default you will need to call ```job.start()``` in order to start the job (assuming ```job``` is the variable you set the cronjob to). This does not immediately fire your onTick function, it just gives you more control over the behavior of your jobs.
+     */
+    start?: boolean;
+    /**
+     * Specify the timezone for the execution. This will modify the actual time relative to your timezone. If the timezone is invalid, an error is thrown. You can check all timezones available at [Moment Timezone Website](http://momentjs.com/timezone/).
+     */
+    timeZone?: string;
+    /**
+     * The context within which to execute the onTick method. This defaults to the cronjob itself allowing you to call ```this.stop()```. However, if you change this you'll have access to the functions and values within your context object.
+     */
+    context?: any;
+    /**
+     * This will immediately fire your ```onTick``` function as soon as the requisit initialization has happened. This option is set to ```false``` by default for backwards compatibility.
+     */
+    runOnInit?: boolean;
 }
-interface CronJob {
-    start(): void;
-    stop(): void;
-    running: boolean | undefined;
-}
-export declare var CronJob: CronJobStatic;
 
-interface CronTimeStatic {
-    new (time: string | Date): CronTime;
+export declare class CronJob {
+    /**
+     * Return ```true``` if job is running.
+     */
+    public running: boolean | undefined;
+    /**
+     * Function using to fire ```onTick```, default set to an inner private function. Overwrite this only if you have a really good reason to do so.
+     */
+    public fireOnTick: Function;
+
+    /**
+     * Create a new ```CronJob```.
+     * @param cronTime The time to fire off your job. This can be in the form of cron syntax or a JS ```Date``` object.
+     * @param onTick The function to fire at the specified time.
+     * @param onComplete A function that will fire when the job is complete, when it is stopped.
+     * @param start Specifies whether to start the job just before exiting the constructor. By default this is set to false. If left at default you will need to call ```job.start()``` in order to start the job (assuming ```job``` is the variable you set the cronjob to). This does not immediately fire your onTick function, it just gives you more control over the behavior of your jobs.
+     * @param timeZone Specify the timezone for the execution. This will modify the actual time relative to your timezone. If the timezone is invalid, an error is thrown. You can check all timezones available at [Moment Timezone Website](http://momentjs.com/timezone/).
+     * @param context The context within which to execute the onTick method. This defaults to the cronjob itself allowing you to call ```this.stop()```. However, if you change this you'll have access to the functions and values within your context object.
+     * @param runOnInit This will immediately fire your ```onTick``` function as soon as the requisit initialization has happened. This option is set to ```false``` by default for backwards compatibility.
+     */
+    constructor(cronTime: string | Date, onTick: () => void, onComplete?: () => void, start?: boolean, timeZone?: string, context?: any, runOnInit?: boolean);
+    /**
+     * Create a new ```CronJob```.
+     * @param options Job parameters.
+     */
+    constructor(options: CronJobParameters);
+
+    /**
+     * Runs your job.
+     */
+    public start(): void;
+    /**
+     * Stops your job.
+     */
+    public stop(): void;
+    /**
+     * Change the time for the ```CronJob```.
+     * @param time Target time.
+     */
+    public setTime(time: CronTime): void;
+    /**
+     * Tells you the last execution date.
+     */
+    public lastDate(): Date;
+    /**
+     * Tells you when a ```CronTime``` will be run.
+     * @param i Indicate which turn of run after now. If not given return next run time.
+     */
+    public nextDates(i?: number): Date;
+    /**
+     * Add another ```onTick``` function.
+     * @param callback Target function.
+     */
+    public addCallback(callback: Function): void;
 }
-interface CronTime { }
-export declare var CronTime: CronTimeStatic;
+
+export declare var job:
+    ((cronTime: string | Date, onTick: () => void, onComplete?: () => void, start?: boolean, timeZone?: string, context?: any, runOnInit?: boolean) => CronJob)
+    | ((options: CronJobParameters) => CronJob);
+export declare var time: (source: string | Date, zone?: string) => CronTime;
+export declare var sendAt: (cronTime: CronTime) => Date;
+export declare var timeout: (cronTime: CronTime) => number;

From 9e573562f8ee3abc86ff6cfed0ae832b3708523e Mon Sep 17 00:00:00 2001
From: Firede <firede@firede.us>
Date: Tue, 27 Mar 2018 23:58:24 +0800
Subject: [PATCH 0881/1382] add `graphql/jsutils/MaybePromise`.

https://github.com/graphql/graphql-js/blob/v0.13.2/src/jsutils/MaybePromise.js
---
 types/graphql/jsutils/MaybePromise.d.ts | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 types/graphql/jsutils/MaybePromise.d.ts

diff --git a/types/graphql/jsutils/MaybePromise.d.ts b/types/graphql/jsutils/MaybePromise.d.ts
new file mode 100644
index 0000000000..5eb85a3f92
--- /dev/null
+++ b/types/graphql/jsutils/MaybePromise.d.ts
@@ -0,0 +1 @@
+export type MaybePromise<T> = Promise<T> | T;

From 323e993b8f062d7fbe7e96e335d83373f7847135 Mon Sep 17 00:00:00 2001
From: Firede <firede@firede.us>
Date: Wed, 28 Mar 2018 00:13:02 +0800
Subject: [PATCH 0882/1382] update `graphql/execution/*` -> `v0.13.2`.

https://github.com/graphql/graphql-js/tree/v0.13.2/src/execution
---
 types/graphql/execution/execute.d.ts | 136 +++++++++++++++++++++++----
 types/graphql/execution/values.d.ts  |  30 +++++-
 2 files changed, 141 insertions(+), 25 deletions(-)

diff --git a/types/graphql/execution/execute.d.ts b/types/graphql/execution/execute.d.ts
index 387a3d4d73..424bb62b5a 100644
--- a/types/graphql/execution/execute.d.ts
+++ b/types/graphql/execution/execute.d.ts
@@ -1,6 +1,12 @@
 import { GraphQLError, locatedError } from "../error";
 import { GraphQLSchema } from "../type/schema";
-import { GraphQLField, GraphQLFieldResolver, ResponsePath } from "../type/definition";
+import {
+    GraphQLField,
+    GraphQLFieldResolver,
+    ResponsePath,
+    GraphQLObjectType,
+    GraphQLResolveInfo,
+} from "../type/definition";
 import {
     DirectiveNode,
     DocumentNode,
@@ -10,6 +16,8 @@ import {
     InlineFragmentNode,
     FragmentDefinitionNode,
 } from "../language/ast";
+import { MaybePromise } from "../jsutils/MaybePromise";
+
 /**
  * Data that must be available at all points during query execution.
  *
@@ -20,6 +28,7 @@ export interface ExecutionContext {
     schema: GraphQLSchema;
     fragments: { [key: string]: FragmentDefinitionNode };
     rootValue: any;
+    contextValue: any;
     operation: OperationDefinitionNode;
     variableValues: { [key: string]: any };
     fieldResolver: GraphQLFieldResolver<any, any>;
@@ -27,15 +36,14 @@ export interface ExecutionContext {
 }
 
 /**
- * The result of execution. `data` is the result of executing the
- * query, `extensions` represents additional metadata, `errors` is
- * null if no errors occurred, and is a
- * non-empty array if an error occurred.
+ * The result of GraphQL execution.
+ *
+ *   - `errors` is included when any errors occurred as a non-empty array.
+ *   - `data` is the result of a successful execution of the query.
  */
 export interface ExecutionResult {
+    errors?: ReadonlyArray<GraphQLError>;
     data?: { [key: string]: any };
-    extensions?: { [key: string]: any };
-    errors?: GraphQLError[];
 }
 
 export type ExecutionArgs = {
@@ -43,41 +51,114 @@ export type ExecutionArgs = {
     document: DocumentNode;
     rootValue?: any;
     contextValue?: any;
-    variableValues?: { [key: string]: any };
-    operationName?: string;
-    fieldResolver?: GraphQLFieldResolver<any, any>;
+    variableValues?: { [key: string]: any } | void;
+    operationName?: string | void;
+    fieldResolver?: GraphQLFieldResolver<any, any> | void;
 };
 
 /**
  * Implements the "Evaluating requests" section of the GraphQL specification.
  *
- * Returns a Promise that will eventually be resolved and never rejected.
+ * Returns either a synchronous ExecutionResult (if all encountered resolvers
+ * are synchronous), or a Promise of an ExecutionResult that will eventually be
+ * resolved and never rejected.
  *
  * If the arguments to this function do not result in a legal execution context,
  * a GraphQLError will be thrown immediately explaining the invalid input.
  *
  * Accepts either an object with named arguments, or individual arguments.
  */
-export function execute(args: ExecutionArgs): Promise<ExecutionResult>;
+export function execute(args: ExecutionArgs): MaybePromise<ExecutionResult>;
 export function execute(
     schema: GraphQLSchema,
     document: DocumentNode,
     rootValue?: any,
     contextValue?: any,
-    variableValues?: {
-        [key: string]: any;
-    },
-    operationName?: string,
-    fieldResolver?: GraphQLFieldResolver<any, any>
-): Promise<ExecutionResult>;
+    variableValues?: { [key: string]: any } | void,
+    operationName?: string | void,
+    fieldResolver?: GraphQLFieldResolver<any, any> | void
+): MaybePromise<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>;
+export function responsePathAsArray(path: ResponsePath): ReadonlyArray<string | number>;
 
-export function addPath(prev: ResponsePath, key: string | number): any;
+/**
+ * Given a ResponsePath and a key, return a new ResponsePath containing the
+ * new key.
+ */
+export function addPath(
+    prev: ResponsePath | undefined,
+    key: string | number
+): { prev: ResponsePath | undefined; key: string | number };
+
+/**
+ * Essential assertions before executing to provide developer feedback for
+ * improper use of the GraphQL library.
+ */
+export function assertValidExecutionArguments(
+    schema: GraphQLSchema,
+    document: DocumentNode,
+    rawVariableValues: { [key: string]: any } | void
+): void;
+
+/**
+ * Constructs a ExecutionContext object from the arguments passed to
+ * execute, which we will pass throughout the other execution methods.
+ *
+ * Throws a GraphQLError if a valid execution context cannot be created.
+ */
+export function buildExecutionContext(
+    schema: GraphQLSchema,
+    document: DocumentNode,
+    rootValue: any,
+    contextValue: any,
+    rawVariableValues: { [key: string]: any } | void,
+    operationName: string | void,
+    fieldResolver: GraphQLFieldResolver<any, any> | void
+): ReadonlyArray<GraphQLError> | ExecutionContext;
+
+/**
+ * Extracts the root type of the operation from the schema.
+ */
+export function getOperationRootType(schema: GraphQLSchema, operation: OperationDefinitionNode): GraphQLObjectType;
+
+/**
+ * Given a selectionSet, adds all of the fields in that selection to
+ * the passed in map of fields, and returns it at the end.
+ *
+ * CollectFields requires the "runtime type" of an object. For a field which
+ * returns an Interface or Union type, the "runtime type" will be the actual
+ * Object type returned by that field.
+ */
+export function collectFields(
+    exeContext: ExecutionContext,
+    runtimeType: GraphQLObjectType,
+    selectionSet: SelectionSetNode,
+    fields: { [key: string]: Array<FieldNode> },
+    visitedFragmentNames: { [key: string]: boolean }
+): { [key: string]: Array<FieldNode> };
+
+export function buildResolveInfo(
+    exeContext: ExecutionContext,
+    fieldDef: GraphQLField<any, any>,
+    fieldNodes: ReadonlyArray<FieldNode>,
+    parentType: GraphQLObjectType,
+    path: ResponsePath
+): GraphQLResolveInfo;
+
+// Isolates the "ReturnOrAbrupt" behavior to not de-opt the `resolveField`
+// function. Returns the result of resolveFn or the abrupt-return Error object.
+export function resolveFieldValueOrError<TSource>(
+    exeContext: ExecutionContext,
+    fieldDef: GraphQLField<TSource, any>,
+    fieldNodes: ReadonlyArray<FieldNode>,
+    resolveFn: GraphQLFieldResolver<TSource, any>,
+    source: TSource,
+    info: GraphQLResolveInfo
+): Error | any;
 
 /**
  * If a resolve function is not given, then a default resolve behavior is used
@@ -86,3 +167,18 @@ export function addPath(prev: ResponsePath, key: string | number): any;
  * of calling that function while passing along args and context.
  */
 export const defaultFieldResolver: GraphQLFieldResolver<any, any>;
+
+/**
+ * This method looks up the field on the given type defintion.
+ * It has special casing for the two introspection fields, __schema
+ * and __typename. __typename is special because it can always be
+ * queried as a field, even in situations where no other fields
+ * are allowed, like on a Union. __schema could get automatically
+ * added to the query type, but that would require mutating type
+ * definitions, which would cause issues.
+ */
+export function getFieldDef(
+    schema: GraphQLSchema,
+    parentType: GraphQLObjectType,
+    fieldName: string
+): GraphQLField<any, any> | void;
diff --git a/types/graphql/execution/values.d.ts b/types/graphql/execution/values.d.ts
index d8e1ec2e7e..fb629325e8 100644
--- a/types/graphql/execution/values.d.ts
+++ b/types/graphql/execution/values.d.ts
@@ -1,27 +1,41 @@
+import { GraphQLError } from "../error";
 import { GraphQLInputType, GraphQLField, GraphQLArgument } from "../type/definition";
 import { GraphQLDirective } from "../type/directives";
 import { GraphQLSchema } from "../type/schema";
 import { FieldNode, DirectiveNode, VariableDefinitionNode } from "../language/ast";
 
+interface CoercedVariableValues {
+    errors: ReadonlyArray<GraphQLError> | undefined;
+    coerced: { [key: string]: any } | undefined;
+}
+
 /**
  * Prepares an object map of variableValues of the correct type based on the
  * provided variable definitions and arbitrary input. If the input cannot be
  * parsed to match the variable definitions, a GraphQLError will be thrown.
+ *
+ * Note: The returned value is a plain Object with a prototype, since it is
+ * exposed to user code. Care should be taken to not pull values from the
+ * Object prototype.
  */
 export function getVariableValues(
     schema: GraphQLSchema,
     varDefNodes: VariableDefinitionNode[],
     inputs: { [key: string]: any }
-): { [key: string]: any };
+): CoercedVariableValues;
 
 /**
  * Prepares an object map of argument values given a list of argument
  * definitions and list of argument AST nodes.
+ *
+ * Note: The returned value is a plain Object with a prototype, since it is
+ * exposed to user code. Care should be taken to not pull values from the
+ * Object prototype.
  */
 export function getArgumentValues(
     def: GraphQLField<any, any> | GraphQLDirective,
     node: FieldNode | DirectiveNode,
-    variableValues?: { [key: string]: any }
+    variableValues?: { [key: string]: any } | void
 ): { [key: string]: any };
 
 /**
@@ -30,9 +44,15 @@ export function getArgumentValues(
  * of variable values.
  *
  * If the directive does not exist on the node, returns undefined.
+ *
+ * Note: The returned value is a plain Object with a prototype, since it is
+ * exposed to user code. Care should be taken to not pull values from the
+ * Object prototype.
  */
 export function getDirectiveValues(
     directiveDef: GraphQLDirective,
-    node: { directives?: Array<DirectiveNode> },
-    variableValues?: { [key: string]: any }
-): void | { [key: string]: any };
+    node: {
+        readonly directives?: ReadonlyArray<DirectiveNode>;
+    },
+    variableValues?: { [key: string]: any } | void
+): undefined | { [key: string]: any };

From 6729aab7a6c850df947b95708a1244552c4d7630 Mon Sep 17 00:00:00 2001
From: Firede <firede@firede.us>
Date: Wed, 28 Mar 2018 00:33:01 +0800
Subject: [PATCH 0883/1382] update `graphql/language/*` -> `v0.13.2`.

https://github.com/graphql/graphql-js/tree/v0.13.2/src/language
---
 types/graphql/language/ast.d.ts               | 461 +++++++++---------
 types/graphql/language/blockStringValue.d.ts  |   7 +
 types/graphql/language/directiveLocation.d.ts |  31 ++
 types/graphql/language/index.d.ts             |  16 +-
 types/graphql/language/kinds.d.ts             | 123 +++--
 types/graphql/language/lexer.d.ts             |  15 +-
 types/graphql/language/location.d.ts          |  11 +-
 types/graphql/language/parser.d.ts            |   4 +-
 types/graphql/language/source.d.ts            |  16 +-
 types/graphql/language/visitor.d.ts           | 187 +++++--
 10 files changed, 517 insertions(+), 354 deletions(-)
 create mode 100644 types/graphql/language/blockStringValue.d.ts
 create mode 100644 types/graphql/language/directiveLocation.d.ts

diff --git a/types/graphql/language/ast.d.ts b/types/graphql/language/ast.d.ts
index 21dbe83361..21601385ff 100644
--- a/types/graphql/language/ast.d.ts
+++ b/types/graphql/language/ast.d.ts
@@ -1,4 +1,5 @@
 import { Source } from "./source";
+import { TokenKindEnum } from "./lexer";
 
 /**
  * Contains a range of UTF-8 character offsets and token references that
@@ -8,57 +9,29 @@ export interface Location {
     /**
      * The character offset at which this Node begins.
      */
-    start: number;
+    readonly start: number;
 
     /**
      * The character offset at which this Node ends.
      */
-    end: number;
+    readonly end: number;
 
     /**
      * The Token at which this Node begins.
      */
-    startToken: Token;
+    readonly startToken: Token;
 
     /**
      * The Token at which this Node ends.
      */
-    endToken: Token;
+    readonly endToken: Token;
 
     /**
      * The Source document the AST represents.
      */
-    source: Source;
+    readonly source: Source;
 }
 
-/**
- * Represents the different kinds of tokens in a GraphQL document.
- * This type is not inlined in `Token` to fix syntax highlighting on GitHub
- * *only*.
- */
-type TokenKind =
-    | "<SOF>"
-    | "<EOF>"
-    | "!"
-    | "$"
-    | "("
-    | ")"
-    | "..."
-    | ":"
-    | "="
-    | "@"
-    | "["
-    | "]"
-    | "{"
-    | "|"
-    | "}"
-    | "Name"
-    | "Int"
-    | "Float"
-    | "String"
-    | "BlockString"
-    | "Comment";
-
 /**
  * Represents a range of characters represented by a lexical token
  * within a Source.
@@ -67,40 +40,40 @@ export interface Token {
     /**
      * The kind of Token.
      */
-    kind: TokenKind;
+    readonly kind: TokenKindEnum;
 
     /**
      * The character offset at which this Node begins.
      */
-    start: number;
+    readonly start: number;
 
     /**
      * The character offset at which this Node ends.
      */
-    end: number;
+    readonly end: number;
 
     /**
      * The 1-indexed line number on which this Token appears.
      */
-    line: number;
+    readonly line: number;
 
     /**
      * The 1-indexed column number at which this Token begins.
      */
-    column: number;
+    readonly column: number;
 
     /**
      * For non-punctuation tokens, represents the interpreted value of the token.
      */
-    value: string | undefined;
+    readonly value: string | undefined;
 
     /**
      * Tokens exist as nodes in a double-linked-list amongst all tokens
      * including ignored tokens. <SOF> is always the first node and <EOF>
      * the last.
      */
-    prev?: Token;
-    next?: Token;
+    readonly prev: Token | null;
+    readonly next: Token | null;
 }
 
 /**
@@ -201,17 +174,17 @@ export interface ASTKindToNode {
 // Name
 
 export interface NameNode {
-    kind: "Name";
-    loc?: Location;
-    value: string;
+    readonly kind: "Name";
+    readonly loc?: Location;
+    readonly value: string;
 }
 
 // Document
 
 export interface DocumentNode {
-    kind: "Document";
-    loc?: Location;
-    definitions: DefinitionNode[];
+    readonly kind: "Document";
+    readonly loc?: Location;
+    readonly definitions: ReadonlyArray<DefinitionNode>;
 }
 
 export type DefinitionNode = ExecutableDefinitionNode | TypeSystemDefinitionNode; // experimental non-spec addition.
@@ -219,84 +192,83 @@ export type DefinitionNode = ExecutableDefinitionNode | TypeSystemDefinitionNode
 export type ExecutableDefinitionNode = OperationDefinitionNode | FragmentDefinitionNode;
 
 export interface OperationDefinitionNode {
-    kind: "OperationDefinition";
-    loc?: Location;
-    operation: OperationTypeNode;
-    name?: NameNode;
-    variableDefinitions?: VariableDefinitionNode[];
-    directives?: DirectiveNode[];
-    selectionSet: SelectionSetNode;
+    readonly kind: "OperationDefinition";
+    readonly loc?: Location;
+    readonly operation: OperationTypeNode;
+    readonly name?: NameNode;
+    readonly variableDefinitions?: ReadonlyArray<VariableDefinitionNode>;
+    readonly directives?: ReadonlyArray<DirectiveNode>;
+    readonly selectionSet: SelectionSetNode;
 }
 
-// Note: subscription is an experimental non-spec addition.
 export type OperationTypeNode = "query" | "mutation" | "subscription";
 
 export interface VariableDefinitionNode {
-    kind: "VariableDefinition";
-    loc?: Location;
-    variable: VariableNode;
-    type: TypeNode;
-    defaultValue?: ValueNode;
+    readonly kind: "VariableDefinition";
+    readonly loc?: Location;
+    readonly variable: VariableNode;
+    readonly type: TypeNode;
+    readonly defaultValue?: ValueNode;
 }
 
 export interface VariableNode {
-    kind: "Variable";
-    loc?: Location;
-    name: NameNode;
+    readonly kind: "Variable";
+    readonly loc?: Location;
+    readonly name: NameNode;
 }
 
 export interface SelectionSetNode {
     kind: "SelectionSet";
     loc?: Location;
-    selections: SelectionNode[];
+    selections: ReadonlyArray<SelectionNode>;
 }
 
 export type SelectionNode = FieldNode | FragmentSpreadNode | InlineFragmentNode;
 
 export interface FieldNode {
-    kind: "Field";
-    loc?: Location;
-    alias?: NameNode;
-    name: NameNode;
-    arguments?: ArgumentNode[];
-    directives?: DirectiveNode[];
-    selectionSet?: SelectionSetNode;
+    readonly kind: "Field";
+    readonly loc?: Location;
+    readonly alias?: NameNode;
+    readonly name: NameNode;
+    readonly arguments?: ReadonlyArray<ArgumentNode>;
+    readonly directives?: ReadonlyArray<DirectiveNode>;
+    readonly selectionSet?: SelectionSetNode;
 }
 
 export interface ArgumentNode {
-    kind: "Argument";
-    loc?: Location;
-    name: NameNode;
-    value: ValueNode;
+    readonly kind: "Argument";
+    readonly loc?: Location;
+    readonly name: NameNode;
+    readonly value: ValueNode;
 }
 
 // Fragments
 
 export interface FragmentSpreadNode {
-    kind: "FragmentSpread";
-    loc?: Location;
-    name: NameNode;
-    directives?: DirectiveNode[];
+    readonly kind: "FragmentSpread";
+    readonly loc?: Location;
+    readonly name: NameNode;
+    readonly directives?: ReadonlyArray<DirectiveNode>;
 }
 
 export interface InlineFragmentNode {
-    kind: "InlineFragment";
-    loc?: Location;
-    typeCondition?: NamedTypeNode;
-    directives?: DirectiveNode[];
-    selectionSet: SelectionSetNode;
+    readonly kind: "InlineFragment";
+    readonly loc?: Location;
+    readonly typeCondition?: NamedTypeNode;
+    readonly directives?: ReadonlyArray<DirectiveNode>;
+    readonly selectionSet: SelectionSetNode;
 }
 
 export interface FragmentDefinitionNode {
-    kind: "FragmentDefinition";
-    loc?: Location;
-    name: NameNode;
+    readonly kind: "FragmentDefinition";
+    readonly loc?: Location;
+    readonly name: NameNode;
     // Note: fragment variable definitions are experimental and may be changed
     // or removed in the future.
-    variableDefinitions?: VariableDefinitionNode[];
-    typeCondition: NamedTypeNode;
-    directives?: DirectiveNode[];
-    selectionSet: SelectionSetNode;
+    readonly variableDefinitions?: ReadonlyArray<VariableDefinitionNode>;
+    readonly typeCondition: NamedTypeNode;
+    readonly directives?: ReadonlyArray<DirectiveNode>;
+    readonly selectionSet: SelectionSetNode;
 }
 
 // Values
@@ -313,66 +285,67 @@ export type ValueNode =
     | ObjectValueNode;
 
 export interface IntValueNode {
-    kind: "IntValue";
-    loc?: Location;
-    value: string;
+    readonly kind: "IntValue";
+    readonly loc?: Location;
+    readonly value: string;
 }
 
 export interface FloatValueNode {
-    kind: "FloatValue";
-    loc?: Location;
-    value: string;
+    readonly kind: "FloatValue";
+    readonly loc?: Location;
+    readonly value: string;
 }
 
 export interface StringValueNode {
-    kind: "StringValue";
-    loc?: Location;
-    value: string;
+    readonly kind: "StringValue";
+    readonly loc?: Location;
+    readonly value: string;
+    readonly block?: boolean;
 }
 
 export interface BooleanValueNode {
-    kind: "BooleanValue";
-    loc?: Location;
-    value: boolean;
+    readonly kind: "BooleanValue";
+    readonly loc?: Location;
+    readonly value: boolean;
 }
 
 export interface NullValueNode {
-    kind: "NullValue";
-    loc?: Location;
+    readonly kind: "NullValue";
+    readonly loc?: Location;
 }
 
 export interface EnumValueNode {
-    kind: "EnumValue";
-    loc?: Location;
-    value: string;
+    readonly kind: "EnumValue";
+    readonly loc?: Location;
+    readonly value: string;
 }
 
 export interface ListValueNode {
-    kind: "ListValue";
-    loc?: Location;
-    values: ValueNode[];
+    readonly kind: "ListValue";
+    readonly loc?: Location;
+    readonly values: ReadonlyArray<ValueNode>;
 }
 
 export interface ObjectValueNode {
-    kind: "ObjectValue";
-    loc?: Location;
-    fields: ObjectFieldNode[];
+    readonly kind: "ObjectValue";
+    readonly loc?: Location;
+    readonly fields: ReadonlyArray<ObjectFieldNode>;
 }
 
 export interface ObjectFieldNode {
-    kind: "ObjectField";
-    loc?: Location;
-    name: NameNode;
-    value: ValueNode;
+    readonly kind: "ObjectField";
+    readonly loc?: Location;
+    readonly name: NameNode;
+    readonly value: ValueNode;
 }
 
 // Directives
 
 export interface DirectiveNode {
-    kind: "Directive";
-    loc?: Location;
-    name: NameNode;
-    arguments?: ArgumentNode[];
+    readonly kind: "Directive";
+    readonly loc?: Location;
+    readonly name: NameNode;
+    readonly arguments?: ReadonlyArray<ArgumentNode>;
 }
 
 // Type Reference
@@ -380,21 +353,21 @@ export interface DirectiveNode {
 export type TypeNode = NamedTypeNode | ListTypeNode | NonNullTypeNode;
 
 export interface NamedTypeNode {
-    kind: "NamedType";
-    loc?: Location;
-    name: NameNode;
+    readonly kind: "NamedType";
+    readonly loc?: Location;
+    readonly name: NameNode;
 }
 
 export interface ListTypeNode {
-    kind: "ListType";
-    loc?: Location;
-    type: TypeNode;
+    readonly kind: "ListType";
+    readonly loc?: Location;
+    readonly type: TypeNode;
 }
 
 export interface NonNullTypeNode {
-    kind: "NonNullType";
-    loc?: Location;
-    type: NamedTypeNode | ListTypeNode;
+    readonly kind: "NonNullType";
+    readonly loc?: Location;
+    readonly type: NamedTypeNode | ListTypeNode;
 }
 
 // Type System Definition
@@ -406,19 +379,21 @@ export type TypeSystemDefinitionNode =
     | DirectiveDefinitionNode;
 
 export interface SchemaDefinitionNode {
-    kind: "SchemaDefinition";
-    loc?: Location;
-    directives: DirectiveNode[];
-    operationTypes: OperationTypeDefinitionNode[];
+    readonly kind: "SchemaDefinition";
+    readonly loc?: Location;
+    readonly directives: ReadonlyArray<DirectiveNode>;
+    readonly operationTypes: ReadonlyArray<OperationTypeDefinitionNode>;
 }
 
 export interface OperationTypeDefinitionNode {
-    kind: "OperationTypeDefinition";
-    loc?: Location;
-    operation: OperationTypeNode;
-    type: NamedTypeNode;
+    readonly kind: "OperationTypeDefinition";
+    readonly loc?: Location;
+    readonly operation: OperationTypeNode;
+    readonly type: NamedTypeNode;
 }
 
+// Type Definition
+
 export type TypeDefinitionNode =
     | ScalarTypeDefinitionNode
     | ObjectTypeDefinitionNode
@@ -428,87 +403,89 @@ export type TypeDefinitionNode =
     | InputObjectTypeDefinitionNode;
 
 export interface ScalarTypeDefinitionNode {
-    kind: "ScalarTypeDefinition";
-    loc?: Location;
-    description?: StringValueNode;
-    name: NameNode;
-    directives?: DirectiveNode[];
+    readonly kind: "ScalarTypeDefinition";
+    readonly loc?: Location;
+    readonly description?: StringValueNode;
+    readonly name: NameNode;
+    readonly directives?: ReadonlyArray<DirectiveNode>;
 }
 
 export interface ObjectTypeDefinitionNode {
-    kind: "ObjectTypeDefinition";
-    loc?: Location;
-    description?: StringValueNode;
-    name: NameNode;
-    interfaces?: NamedTypeNode[];
-    directives?: DirectiveNode[];
-    fields: FieldDefinitionNode[];
+    readonly kind: "ObjectTypeDefinition";
+    readonly loc?: Location;
+    readonly description?: StringValueNode;
+    readonly name: NameNode;
+    readonly interfaces?: ReadonlyArray<NamedTypeNode>;
+    readonly directives?: ReadonlyArray<DirectiveNode>;
+    readonly fields?: ReadonlyArray<FieldDefinitionNode>;
 }
 
 export interface FieldDefinitionNode {
-    kind: "FieldDefinition";
-    loc?: Location;
-    description?: StringValueNode;
-    name: NameNode;
-    arguments: InputValueDefinitionNode[];
-    type: TypeNode;
-    directives?: DirectiveNode[];
+    readonly kind: "FieldDefinition";
+    readonly loc?: Location;
+    readonly description?: StringValueNode;
+    readonly name: NameNode;
+    readonly arguments?: ReadonlyArray<InputValueDefinitionNode>;
+    readonly type: TypeNode;
+    readonly directives?: ReadonlyArray<DirectiveNode>;
 }
 
 export interface InputValueDefinitionNode {
-    kind: "InputValueDefinition";
-    loc?: Location;
-    description?: StringValueNode;
-    name: NameNode;
-    type: TypeNode;
-    defaultValue?: ValueNode;
-    directives?: DirectiveNode[];
+    readonly kind: "InputValueDefinition";
+    readonly loc?: Location;
+    readonly description?: StringValueNode;
+    readonly name: NameNode;
+    readonly type: TypeNode;
+    readonly defaultValue?: ValueNode;
+    readonly directives?: ReadonlyArray<DirectiveNode>;
 }
 
 export interface InterfaceTypeDefinitionNode {
-    kind: "InterfaceTypeDefinition";
-    loc?: Location;
-    description?: StringValueNode;
-    name: NameNode;
-    directives?: DirectiveNode[];
-    fields: FieldDefinitionNode[];
+    readonly kind: "InterfaceTypeDefinition";
+    readonly loc?: Location;
+    readonly description?: StringValueNode;
+    readonly name: NameNode;
+    readonly directives?: ReadonlyArray<DirectiveNode>;
+    readonly fields?: ReadonlyArray<FieldDefinitionNode>;
 }
 
 export interface UnionTypeDefinitionNode {
-    kind: "UnionTypeDefinition";
-    loc?: Location;
-    description?: StringValueNode;
-    name: NameNode;
-    directives?: DirectiveNode[];
-    types: NamedTypeNode[];
+    readonly kind: "UnionTypeDefinition";
+    readonly loc?: Location;
+    readonly description?: StringValueNode;
+    readonly name: NameNode;
+    readonly directives?: ReadonlyArray<DirectiveNode>;
+    readonly types?: ReadonlyArray<NamedTypeNode>;
 }
 
 export interface EnumTypeDefinitionNode {
-    kind: "EnumTypeDefinition";
-    loc?: Location;
-    description?: StringValueNode;
-    name: NameNode;
-    directives?: DirectiveNode[];
-    values: EnumValueDefinitionNode[];
+    readonly kind: "EnumTypeDefinition";
+    readonly loc?: Location;
+    readonly description?: StringValueNode;
+    readonly name: NameNode;
+    readonly directives?: ReadonlyArray<DirectiveNode>;
+    readonly values?: ReadonlyArray<EnumValueDefinitionNode>;
 }
 
 export interface EnumValueDefinitionNode {
-    kind: "EnumValueDefinition";
-    loc?: Location;
-    description?: StringValueNode;
-    name: NameNode;
-    directives?: DirectiveNode[];
+    readonly kind: "EnumValueDefinition";
+    readonly loc?: Location;
+    readonly description?: StringValueNode;
+    readonly name: NameNode;
+    readonly directives?: ReadonlyArray<DirectiveNode>;
 }
 
 export interface InputObjectTypeDefinitionNode {
-    kind: "InputObjectTypeDefinition";
-    loc?: Location;
-    description?: StringValueNode;
-    name: NameNode;
-    directives?: DirectiveNode[];
-    fields: InputValueDefinitionNode[];
+    readonly kind: "InputObjectTypeDefinition";
+    readonly loc?: Location;
+    readonly description?: StringValueNode;
+    readonly name: NameNode;
+    readonly directives?: ReadonlyArray<DirectiveNode>;
+    readonly fields?: ReadonlyArray<InputValueDefinitionNode>;
 }
 
+// Type Extensions
+
 export type TypeExtensionNode =
     | ScalarTypeExtensionNode
     | ObjectTypeExtensionNode
@@ -517,61 +494,61 @@ export type TypeExtensionNode =
     | EnumTypeExtensionNode
     | InputObjectTypeExtensionNode;
 
-export type ScalarTypeExtensionNode = {
-    kind: "ScalarTypeExtension";
-    loc?: Location;
-    name: NameNode;
-    directives?: DirectiveNode[];
-};
+export interface ScalarTypeExtensionNode {
+    readonly kind: "ScalarTypeExtension";
+    readonly loc?: Location;
+    readonly name: NameNode;
+    readonly directives?: ReadonlyArray<DirectiveNode>;
+}
 
-export type ObjectTypeExtensionNode = {
-    kind: "ObjectTypeExtension";
-    loc?: Location;
-    name: NameNode;
-    interfaces?: NamedTypeNode[];
-    directives?: DirectiveNode[];
-    fields?: FieldDefinitionNode[];
-};
+export interface ObjectTypeExtensionNode {
+    readonly kind: "ObjectTypeExtension";
+    readonly loc?: Location;
+    readonly name: NameNode;
+    readonly interfaces?: ReadonlyArray<NamedTypeNode>;
+    readonly directives?: ReadonlyArray<DirectiveNode>;
+    readonly fields?: ReadonlyArray<FieldDefinitionNode>;
+}
 
-export type InterfaceTypeExtensionNode = {
-    kind: "InterfaceTypeExtension";
-    loc?: Location;
-    name: NameNode;
-    directives?: DirectiveNode[];
-    fields?: FieldDefinitionNode[];
-};
+export interface InterfaceTypeExtensionNode {
+    readonly kind: "InterfaceTypeExtension";
+    readonly loc?: Location;
+    readonly name: NameNode;
+    readonly directives?: ReadonlyArray<DirectiveNode>;
+    readonly fields?: ReadonlyArray<FieldDefinitionNode>;
+}
 
-export type UnionTypeExtensionNode = {
-    kind: "UnionTypeExtension";
-    loc?: Location;
-    name: NameNode;
-    directives?: DirectiveNode[];
-    types?: NamedTypeNode[];
-};
+export interface UnionTypeExtensionNode {
+    readonly kind: "UnionTypeExtension";
+    readonly loc?: Location;
+    readonly name: NameNode;
+    readonly directives?: ReadonlyArray<DirectiveNode>;
+    readonly types?: ReadonlyArray<NamedTypeNode>;
+}
 
-export type EnumTypeExtensionNode = {
-    kind: "EnumTypeExtension";
-    loc?: Location;
-    name: NameNode;
-    directives?: DirectiveNode[];
-    values?: EnumValueDefinitionNode[];
-};
+export interface EnumTypeExtensionNode {
+    readonly kind: "EnumTypeExtension";
+    readonly loc?: Location;
+    readonly name: NameNode;
+    readonly directives?: ReadonlyArray<DirectiveNode>;
+    readonly values?: ReadonlyArray<EnumValueDefinitionNode>;
+}
 
-export type InputObjectTypeExtensionNode = {
-    kind: "InputObjectTypeExtension";
-    loc?: Location;
-    name: NameNode;
-    directives?: DirectiveNode[];
-    fields?: InputValueDefinitionNode[];
-};
+export interface InputObjectTypeExtensionNode {
+    readonly kind: "InputObjectTypeExtension";
+    readonly loc?: Location;
+    readonly name: NameNode;
+    readonly directives?: ReadonlyArray<DirectiveNode>;
+    readonly fields?: ReadonlyArray<InputValueDefinitionNode>;
+}
 
 // Directive Definitions
 
 export interface DirectiveDefinitionNode {
-    kind: "DirectiveDefinition";
-    loc?: Location;
-    description?: StringValueNode;
-    name: NameNode;
-    arguments?: InputValueDefinitionNode[];
-    locations: NameNode[];
+    readonly kind: "DirectiveDefinition";
+    readonly loc?: Location;
+    readonly description?: StringValueNode;
+    readonly name: NameNode;
+    readonly arguments?: ReadonlyArray<InputValueDefinitionNode>;
+    readonly locations: ReadonlyArray<NameNode>;
 }
diff --git a/types/graphql/language/blockStringValue.d.ts b/types/graphql/language/blockStringValue.d.ts
new file mode 100644
index 0000000000..64fb87dafd
--- /dev/null
+++ b/types/graphql/language/blockStringValue.d.ts
@@ -0,0 +1,7 @@
+/**
+ * Produces the value of a block string from its parsed raw value, similar to
+ * Coffeescript's block string, Python's docstring trim or Ruby's strip_heredoc.
+ *
+ * This implements the GraphQL spec's BlockStringValue() static algorithm.
+ */
+export default function blockStringValue(rawString: string): string;
diff --git a/types/graphql/language/directiveLocation.d.ts b/types/graphql/language/directiveLocation.d.ts
new file mode 100644
index 0000000000..412e3ad32a
--- /dev/null
+++ b/types/graphql/language/directiveLocation.d.ts
@@ -0,0 +1,31 @@
+/**
+ * The set of allowed directive location values.
+ */
+export type DirectiveLocation = {
+    // Request Definitions
+    QUERY: "QUERY";
+    MUTATION: "MUTATION";
+    SUBSCRIPTION: "SUBSCRIPTION";
+    FIELD: "FIELD";
+    FRAGMENT_DEFINITION: "FRAGMENT_DEFINITION";
+    FRAGMENT_SPREAD: "FRAGMENT_SPREAD";
+    INLINE_FRAGMENT: "INLINE_FRAGMENT";
+
+    // Type System Definitions
+    SCHEMA: "SCHEMA";
+    SCALAR: "SCALAR";
+    OBJECT: "OBJECT";
+    FIELD_DEFINITION: "FIELD_DEFINITION";
+    ARGUMENT_DEFINITION: "ARGUMENT_DEFINITION";
+    INTERFACE: "INTERFACE";
+    UNION: "UNION";
+    ENUM: "ENUM";
+    ENUM_VALUE: "ENUM_VALUE";
+    INPUT_OBJECT: "INPUT_OBJECT";
+    INPUT_FIELD_DEFINITION: "INPUT_FIELD_DEFINITION";
+};
+
+/**
+ * The enum type representing the directive location values.
+ */
+export type DirectiveLocationEnum = DirectiveLocation[keyof DirectiveLocation];
diff --git a/types/graphql/language/index.d.ts b/types/graphql/language/index.d.ts
index db088e6925..d5e8f8004e 100644
--- a/types/graphql/language/index.d.ts
+++ b/types/graphql/language/index.d.ts
@@ -1,9 +1,19 @@
 export * from "./ast";
 export { getLocation } from "./location";
-import * as Kind from "./kinds";
-export { Kind };
+export { Kind, KindEnum } from "./kinds";
 export { createLexer, TokenKind, Lexer } from "./lexer";
 export { parse, parseValue, parseType, ParseOptions } from "./parser";
 export { print } from "./printer";
 export { Source } from "./source";
-export { visit, visitInParallel, visitWithTypeInfo, getVisitFn, BREAK } from "./visitor";
+export {
+    visit,
+    visitInParallel,
+    visitWithTypeInfo,
+    getVisitFn,
+    BREAK,
+    ASTVisitor,
+    Visitor,
+    VisitFn,
+    VisitorKeyMap,
+} from "./visitor";
+export { DirectiveLocation, DirectiveLocationEnum } from "./directiveLocation";
diff --git a/types/graphql/language/kinds.d.ts b/types/graphql/language/kinds.d.ts
index 2e7db3ad87..6e497cbc68 100644
--- a/types/graphql/language/kinds.d.ts
+++ b/types/graphql/language/kinds.d.ts
@@ -1,72 +1,71 @@
-// Name
+/**
+ * The set of allowed kind values for AST nodes.
+ */
+export type Kind = {
+    // Name
+    NAME: "Name";
 
-export const NAME: "Name";
+    // Document
+    DOCUMENT: "Document";
+    OPERATION_DEFINITION: "OperationDefinition";
+    VARIABLE_DEFINITION: "VariableDefinition";
+    VARIABLE: "Variable";
+    SELECTION_SET: "SelectionSet";
+    FIELD: "Field";
+    ARGUMENT: "Argument";
 
-// Document
+    // Fragments
+    FRAGMENT_SPREAD: "FragmentSpread";
+    INLINE_FRAGMENT: "InlineFragment";
+    FRAGMENT_DEFINITION: "FragmentDefinition";
 
-export const DOCUMENT: "Document";
-export const OPERATION_DEFINITION: "OperationDefinition";
-export const VARIABLE_DEFINITION: "VariableDefinition";
-export const VARIABLE: "Variable";
-export const SELECTION_SET: "SelectionSet";
-export const FIELD: "Field";
-export const ARGUMENT: "Argument";
+    // Values
+    INT: "IntValue";
+    FLOAT: "FloatValue";
+    STRING: "StringValue";
+    BOOLEAN: "BooleanValue";
+    NULL: "NullValue";
+    ENUM: "EnumValue";
+    LIST: "ListValue";
+    OBJECT: "ObjectValue";
+    OBJECT_FIELD: "ObjectField";
 
-// Fragments
+    // Directives
+    DIRECTIVE: "Directive";
 
-export const FRAGMENT_SPREAD: "FragmentSpread";
-export const INLINE_FRAGMENT: "InlineFragment";
-export const FRAGMENT_DEFINITION: "FragmentDefinition";
+    // Types
+    NAMED_TYPE: "NamedType";
+    LIST_TYPE: "ListType";
+    NON_NULL_TYPE: "NonNullType";
 
-// Values
+    // Type System Definitions
+    SCHEMA_DEFINITION: "SchemaDefinition";
+    OPERATION_TYPE_DEFINITION: "OperationTypeDefinition";
 
-export const INT: "IntValue";
-export const FLOAT: "FloatValue";
-export const STRING: "StringValue";
-export const BOOLEAN: "BooleanValue";
-export const NULL: "NullValue";
-export const ENUM: "EnumValue";
-export const LIST: "ListValue";
-export const OBJECT: "ObjectValue";
-export const OBJECT_FIELD: "ObjectField";
+    // Type Definitions
+    SCALAR_TYPE_DEFINITION: "ScalarTypeDefinition";
+    OBJECT_TYPE_DEFINITION: "ObjectTypeDefinition";
+    FIELD_DEFINITION: "FieldDefinition";
+    INPUT_VALUE_DEFINITION: "InputValueDefinition";
+    INTERFACE_TYPE_DEFINITION: "InterfaceTypeDefinition";
+    UNION_TYPE_DEFINITION: "UnionTypeDefinition";
+    ENUM_TYPE_DEFINITION: "EnumTypeDefinition";
+    ENUM_VALUE_DEFINITION: "EnumValueDefinition";
+    INPUT_OBJECT_TYPE_DEFINITION: "InputObjectTypeDefinition";
 
-// Directives
+    // Type Extensions
+    SCALAR_TYPE_EXTENSION: "ScalarTypeExtension";
+    OBJECT_TYPE_EXTENSION: "ObjectTypeExtension";
+    INTERFACE_TYPE_EXTENSION: "InterfaceTypeExtension";
+    UNION_TYPE_EXTENSION: "UnionTypeExtension";
+    ENUM_TYPE_EXTENSION: "EnumTypeExtension";
+    INPUT_OBJECT_TYPE_EXTENSION: "InputObjectTypeExtension";
 
-export const DIRECTIVE: "Directive";
+    // Directive Definitions
+    DIRECTIVE_DEFINITION: "DirectiveDefinition";
+};
 
-// Types
-
-export const NAMED_TYPE: "NamedType";
-export const LIST_TYPE: "ListType";
-export const NON_NULL_TYPE: "NonNullType";
-
-// Type System Definitions
-
-export const SCHEMA_DEFINITION: "SchemaDefinition";
-export const OPERATION_TYPE_DEFINITION: "OperationTypeDefinition";
-
-// Type Definitions
-
-export const SCALAR_TYPE_DEFINITION: "ScalarTypeDefinition";
-export const OBJECT_TYPE_DEFINITION: "ObjectTypeDefinition";
-export const FIELD_DEFINITION: "FieldDefinition";
-export const INPUT_VALUE_DEFINITION: "InputValueDefinition";
-export const INTERFACE_TYPE_DEFINITION: "InterfaceTypeDefinition";
-export const UNION_TYPE_DEFINITION: "UnionTypeDefinition";
-export const ENUM_TYPE_DEFINITION: "EnumTypeDefinition";
-export const ENUM_VALUE_DEFINITION: "EnumValueDefinition";
-export const INPUT_OBJECT_TYPE_DEFINITION: "InputObjectTypeDefinition";
-
-// Type Extensions
-
-export const TYPE_EXTENSION_DEFINITION: "TypeExtensionDefinition";
-export const SCALAR_TYPE_EXTENSION: "ScalarTypeExtension";
-export const OBJECT_TYPE_EXTENSION: "ObjectTypeExtension";
-export const INTERFACE_TYPE_EXTENSION: "InterfaceTypeExtension";
-export const UNION_TYPE_EXTENSION: "UnionTypeExtension";
-export const ENUM_TYPE_EXTENSION: "EnumTypeExtension";
-export const INPUT_OBJECT_TYPE_EXTENSION: "InputObjectTypeExtension";
-
-// Directive Definitions
-
-export const DIRECTIVE_DEFINITION: "DirectiveDefinition";
+/**
+ * The enum type representing the possible kind values of AST nodes.
+ */
+export type KindEnum = Kind[keyof Kind];
diff --git a/types/graphql/language/lexer.d.ts b/types/graphql/language/lexer.d.ts
index 27db5b04cc..69fa3df460 100644
--- a/types/graphql/language/lexer.d.ts
+++ b/types/graphql/language/lexer.d.ts
@@ -43,17 +43,24 @@ export interface Lexer<TOptions> {
      * Advances the token stream to the next non-ignored token.
      */
     advance(): Token;
+
+    /**
+     * Looks ahead and returns the next non-ignored token, but does not change
+     * the Lexer's state.
+     */
+    lookahead(): Token;
 }
 
 /**
  * An exported enum describing the different kinds of tokens that the
  * lexer emits.
  */
-export const TokenKind: {
+export type TokenKind = {
     SOF: "<SOF>";
     EOF: "<EOF>";
     BANG: "!";
     DOLLAR: "$";
+    AMP: "&";
     PAREN_L: "(";
     PAREN_R: ")";
     SPREAD: "...";
@@ -69,9 +76,15 @@ export const TokenKind: {
     INT: "Int";
     FLOAT: "Float";
     STRING: "String";
+    BLOCK_STRING: "BlockString";
     COMMENT: "Comment";
 };
 
+/**
+ * The enum type representing the token kinds values.
+ */
+export type TokenKindEnum = TokenKind[keyof TokenKind];
+
 /**
  * A helper function to describe a token as a string for debugging
  */
diff --git a/types/graphql/language/location.d.ts b/types/graphql/language/location.d.ts
index 4d7a13e314..6090531718 100644
--- a/types/graphql/language/location.d.ts
+++ b/types/graphql/language/location.d.ts
@@ -1,8 +1,15 @@
 import { Source } from "./source";
 
+/**
+ * Represents a location in a Source.
+ */
 export interface SourceLocation {
-    line: number;
-    column: number;
+    readonly line: number;
+    readonly column: number;
 }
 
+/**
+ * Takes a Source and a UTF-8 character offset, and returns the corresponding
+ * line and column as a SourceLocation.
+ */
 export function getLocation(source: Source, position: number): SourceLocation;
diff --git a/types/graphql/language/parser.d.ts b/types/graphql/language/parser.d.ts
index 3cdb3462ae..b07db1ff38 100644
--- a/types/graphql/language/parser.d.ts
+++ b/types/graphql/language/parser.d.ts
@@ -65,7 +65,7 @@ export function parse(source: string | Source, options?: ParseOptions): Document
  * This is useful within tools that operate upon GraphQL Values directly and
  * in isolation of complete GraphQL documents.
  */
-export function parseValue(source: Source | string, options?: ParseOptions): ValueNode;
+export function parseValue(source: string | Source, options?: ParseOptions): ValueNode;
 
 /**
  * Given a string containing a GraphQL Type (ex. `[Int!]`), parse the AST for
@@ -77,7 +77,7 @@ export function parseValue(source: Source | string, options?: ParseOptions): Val
  *
  * Consider providing the results to the utility function: typeFromAST().
  */
-export function parseType(source: Source | string, options?: ParseOptions): TypeNode;
+export function parseType(source: string | Source, options?: ParseOptions): TypeNode;
 
 export function parseConstValue<TOptions>(lexer: Lexer<TOptions>): ValueNode;
 
diff --git a/types/graphql/language/source.d.ts b/types/graphql/language/source.d.ts
index 80e68f5557..26d89640c3 100644
--- a/types/graphql/language/source.d.ts
+++ b/types/graphql/language/source.d.ts
@@ -1,5 +1,19 @@
+interface Location {
+    line: number;
+    column: number;
+}
+
+/**
+ * A representation of source input to GraphQL.
+ * `name` and `locationOffset` are optional. They are useful for clients who
+ * store GraphQL documents in source files; for example, if the GraphQL input
+ * starts at line 40 in a file named Foo.graphql, it might be useful for name to
+ * be "Foo.graphql" and location to be `{ line: 40, column: 0 }`.
+ * line and column in locationOffset are 1-indexed
+ */
 export class Source {
     body: string;
     name: string;
-    constructor(body: string, name?: string);
+    locationOffset: Location;
+    constructor(body: string, name?: string, locationOffset?: Location);
 }
diff --git a/types/graphql/language/visitor.d.ts b/types/graphql/language/visitor.d.ts
index 320d181e4a..a137fa318e 100644
--- a/types/graphql/language/visitor.d.ts
+++ b/types/graphql/language/visitor.d.ts
@@ -1,55 +1,160 @@
-export const QueryDocumentKeys: {
-    Name: any[];
-    Document: string[];
-    OperationDefinition: string[];
-    VariableDefinition: string[];
-    Variable: string[];
-    SelectionSet: string[];
-    Field: string[];
-    Argument: string[];
+import { ASTNode, ASTKindToNode } from "./ast";
+import { TypeInfo } from "../utilities/TypeInfo";
 
-    FragmentSpread: string[];
-    InlineFragment: string[];
-    FragmentDefinition: string[];
+interface EnterLeave<T> {
+    readonly enter?: T;
+    readonly leave?: T;
+}
 
-    IntValue: number[];
-    FloatValue: number[];
-    StringValue: string[];
-    BooleanValue: boolean[];
-    NullValue: null[];
-    EnumValue: any[];
-    ListValue: string[];
-    ObjectValue: string[];
-    ObjectField: string[];
+type EnterLeaveVisitor<KindToNode, Nodes> = EnterLeave<
+    VisitFn<Nodes> | { [K in keyof KindToNode]?: VisitFn<Nodes, KindToNode[K]> }
+>;
 
-    Directive: string[];
-
-    NamedType: string[];
-    ListType: string[];
-    NonNullType: string[];
-
-    ObjectTypeDefinition: string[];
-    FieldDefinition: string[];
-    InputValueDefinition: string[];
-    InterfaceTypeDefinition: string[];
-    UnionTypeDefinition: string[];
-    ScalarTypeDefinition: string[];
-    EnumTypeDefinition: string[];
-    EnumValueDefinition: string[];
-    InputObjectTypeDefinition: string[];
-    TypeExtensionDefinition: string[];
+type ShapeMapVisitor<KindToNode, Nodes> = {
+    [K in keyof KindToNode]?: VisitFn<Nodes, KindToNode[K]> | EnterLeave<VisitFn<Nodes, KindToNode[K]>>
 };
 
+export type ASTVisitor = Visitor<ASTKindToNode>;
+export type Visitor<KindToNode, Nodes = KindToNode[keyof KindToNode]> =
+    | EnterLeaveVisitor<KindToNode, Nodes>
+    | ShapeMapVisitor<KindToNode, Nodes>;
+
+/**
+ * A visitor is comprised of visit functions, which are called on each node
+ * during the visitor's traversal.
+ */
+export type VisitFn<TAnyNode, TVisitedNode = TAnyNode> = (
+    // The current node being visiting.
+    node: TVisitedNode,
+    // The index or key to this node from the parent node or Array.
+    key: string | number | undefined,
+    // The parent immediately above this node, which may be an Array.
+    parent: TAnyNode | ReadonlyArray<TAnyNode> | undefined,
+    // The key path to get to this node from the root node.
+    path: ReadonlyArray<string | number>,
+    // All nodes and Arrays visited before reaching this node.
+    // These correspond to array indices in `path`.
+    // Note: ancestors includes arrays which contain the visited node.
+    ancestors: ReadonlyArray<TAnyNode | ReadonlyArray<TAnyNode>>
+) => any;
+
+/**
+ * A KeyMap describes each the traversable properties of each kind of node.
+ */
+export type VisitorKeyMap<T> = { [P in keyof T]: ReadonlyArray<keyof T[P]> };
+
+export const QueryDocumentKeys: { [key: string]: string[] };
+
 export const BREAK: any;
 
-export function visit(root: any, visitor: any, keyMap?: any): any;
+/**
+ * visit() will walk through an AST using a depth first traversal, calling
+ * the visitor's enter function at each node in the traversal, and calling the
+ * leave function after visiting that node and all of its child nodes.
+ *
+ * By returning different values from the enter and leave functions, the
+ * behavior of the visitor can be altered, including skipping over a sub-tree of
+ * the AST (by returning false), editing the AST by returning a value or null
+ * to remove the value, or to stop the whole traversal by returning BREAK.
+ *
+ * When using visit() to edit an AST, the original AST will not be modified, and
+ * a new version of the AST with the changes applied will be returned from the
+ * visit function.
+ *
+ *     const editedAST = visit(ast, {
+ *       enter(node, key, parent, path, ancestors) {
+ *         // @return
+ *         //   undefined: no action
+ *         //   false: skip visiting this node
+ *         //   visitor.BREAK: stop visiting altogether
+ *         //   null: delete this node
+ *         //   any value: replace this node with the returned value
+ *       },
+ *       leave(node, key, parent, path, ancestors) {
+ *         // @return
+ *         //   undefined: no action
+ *         //   false: no action
+ *         //   visitor.BREAK: stop visiting altogether
+ *         //   null: delete this node
+ *         //   any value: replace this node with the returned value
+ *       }
+ *     });
+ *
+ * Alternatively to providing enter() and leave() functions, a visitor can
+ * instead provide functions named the same as the kinds of AST nodes, or
+ * enter/leave visitors at a named key, leading to four permutations of
+ * visitor API:
+ *
+ * 1) Named visitors triggered when entering a node a specific kind.
+ *
+ *     visit(ast, {
+ *       Kind(node) {
+ *         // enter the "Kind" node
+ *       }
+ *     })
+ *
+ * 2) Named visitors that trigger upon entering and leaving a node of
+ *    a specific kind.
+ *
+ *     visit(ast, {
+ *       Kind: {
+ *         enter(node) {
+ *           // enter the "Kind" node
+ *         }
+ *         leave(node) {
+ *           // leave the "Kind" node
+ *         }
+ *       }
+ *     })
+ *
+ * 3) Generic visitors that trigger upon entering and leaving any node.
+ *
+ *     visit(ast, {
+ *       enter(node) {
+ *         // enter any node
+ *       },
+ *       leave(node) {
+ *         // leave any node
+ *       }
+ *     })
+ *
+ * 4) Parallel visitors for entering and leaving nodes of a specific kind.
+ *
+ *     visit(ast, {
+ *       enter: {
+ *         Kind(node) {
+ *           // enter the "Kind" node
+ *         }
+ *       },
+ *       leave: {
+ *         Kind(node) {
+ *           // leave the "Kind" node
+ *         }
+ *       }
+ *     })
+ */
+export function visit(
+    root: ASTNode,
+    visitor: Visitor<ASTKindToNode>,
+    visitorKeys?: VisitorKeyMap<ASTKindToNode> // default: QueryDocumentKeys
+): any;
 
-export function visitInParallel(visitors: any): any;
+/**
+ * Creates a new visitor instance which delegates to many visitors to run in
+ * parallel. Each visitor will be visited for each node before moving on.
+ *
+ * If a prior visitor edits a node, no following visitors will see that node.
+ */
+export function visitInParallel(visitors: Array<Visitor<ASTKindToNode>>): Visitor<ASTKindToNode>;
 
-export function visitWithTypeInfo(typeInfo: any, visitor: any): any;
+/**
+ * Creates a new visitor instance which maintains a provided TypeInfo instance
+ * along with visiting visitor.
+ */
+export function visitWithTypeInfo(typeInfo: TypeInfo, visitor: Visitor<ASTKindToNode>): Visitor<ASTKindToNode>;
 
 /**
  * Given a visitor instance, if it is leaving or not, and a node kind, return
  * the function the visitor runtime should call.
  */
-export function getVisitFn(visitor: any, kind: any, isLeaving: any): any;
+export function getVisitFn(visitor: Visitor<any>, kind: string, isLeaving: boolean): VisitFn<any> | void;

From e0a99292454f4fe037fd78bebe22ca861af4208b Mon Sep 17 00:00:00 2001
From: Firede <firede@firede.us>
Date: Wed, 28 Mar 2018 00:36:53 +0800
Subject: [PATCH 0884/1382] update `graphql/subscription` -> `v0.13.2`.

https://github.com/graphql/graphql-js/blob/v0.13.2/src/subscription/subscribe.js
---
 types/graphql/subscription/subscribe.d.ts | 69 +++++++++++++++++++----
 1 file changed, 57 insertions(+), 12 deletions(-)

diff --git a/types/graphql/subscription/subscribe.d.ts b/types/graphql/subscription/subscribe.d.ts
index c4eec87ac9..a9fe6b565e 100644
--- a/types/graphql/subscription/subscribe.d.ts
+++ b/types/graphql/subscription/subscribe.d.ts
@@ -3,27 +3,72 @@ import { DocumentNode } from "../language/ast";
 import { GraphQLFieldResolver } from "../type/definition";
 import { ExecutionResult } from "../execution/execute";
 
+/**
+ * Implements the "Subscribe" algorithm described in the GraphQL specification.
+ *
+ * Returns a Promise which resolves to either an AsyncIterator (if successful)
+ * or an ExecutionResult (client error). The promise will be rejected if a
+ * server error occurs.
+ *
+ * If the client-provided arguments to this function do not result in a
+ * compliant subscription, a GraphQL Response (ExecutionResult) with
+ * descriptive errors and no data will be returned.
+ *
+ * If the the source stream could not be created due to faulty subscription
+ * resolver logic or underlying systems, the promise will resolve to a single
+ * ExecutionResult containing `errors` and no `data`.
+ *
+ * If the operation succeeded, the promise resolves to an AsyncIterator, which
+ * yields a stream of ExecutionResults representing the response stream.
+ *
+ * Accepts either an object with named arguments, or individual arguments.
+ */
+export function subscribe(args: {
+    schema: GraphQLSchema;
+    document: DocumentNode;
+    rootValue?: any;
+    contextValue?: any;
+    variableValues?: { [key: string]: any } | void;
+    operationName?: string | void;
+    fieldResolver?: GraphQLFieldResolver<any, any> | void;
+    subscribeFieldResolver?: GraphQLFieldResolver<any, any> | void;
+}): Promise<AsyncIterator<ExecutionResult> | ExecutionResult>;
+
 export function subscribe(
     schema: GraphQLSchema,
     document: DocumentNode,
     rootValue?: any,
     contextValue?: any,
-    variableValues?: {
-        [key: string]: any;
-    },
-    operationName?: string,
-    fieldResolver?: GraphQLFieldResolver<any, any>,
-    subscribeFieldResolver?: GraphQLFieldResolver<any, any>
+    variableValues?: { [key: string]: any } | void,
+    operationName?: string | void,
+    fieldResolver?: GraphQLFieldResolver<any, any> | void,
+    subscribeFieldResolver?: GraphQLFieldResolver<any, any> | void
 ): Promise<AsyncIterator<ExecutionResult> | ExecutionResult>;
 
+/**
+ * Implements the "CreateSourceEventStream" algorithm described in the
+ * GraphQL specification, resolving the subscription source event stream.
+ *
+ * Returns a Promise<AsyncIterable>.
+ *
+ * If the client-provided invalid arguments, the source stream could not be
+ * created, or the resolver did not return an AsyncIterable, this function will
+ * will throw an error, which should be caught and handled by the caller.
+ *
+ * A Source Event Stream represents a sequence of events, each of which triggers
+ * a GraphQL execution for that event.
+ *
+ * This may be useful when hosting the stateful subscription service in a
+ * different process or machine than the stateless GraphQL execution engine,
+ * or otherwise separating these two steps. For more on this, see the
+ * "Supporting Subscriptions at Scale" information in the GraphQL specification.
+ */
 export function createSourceEventStream(
     schema: GraphQLSchema,
     document: DocumentNode,
     rootValue?: any,
     contextValue?: any,
-    variableValues?: {
-        [key: string]: any;
-    },
-    operationName?: string,
-    fieldResolver?: GraphQLFieldResolver<any, any>
-): Promise<AsyncIterable<any>>;
+    variableValues?: { [key: string]: any },
+    operationName?: string | void,
+    fieldResolver?: GraphQLFieldResolver<any, any> | void
+): Promise<AsyncIterable<any> | ExecutionResult>;

From b1a1e3f9f199586a4a2de7640d962ce7f446c87c Mon Sep 17 00:00:00 2001
From: Firede <firede@firede.us>
Date: Wed, 28 Mar 2018 00:39:46 +0800
Subject: [PATCH 0885/1382] update `graphql/type/*` -> `v0.13.2`.

https://github.com/graphql/graphql-js/tree/v0.13.2/src/type
---
 types/graphql/type/definition.d.ts    | 355 +++++++++++++++-----------
 types/graphql/type/directives.d.ts    |  43 +---
 types/graphql/type/index.d.ts         |  29 ++-
 types/graphql/type/introspection.d.ts |   5 +
 types/graphql/type/scalars.d.ts       |   4 +
 types/graphql/type/schema.d.ts        |  52 ++--
 types/graphql/type/validate.d.ts      |  17 ++
 7 files changed, 295 insertions(+), 210 deletions(-)
 create mode 100644 types/graphql/type/validate.d.ts

diff --git a/types/graphql/type/definition.d.ts b/types/graphql/type/definition.d.ts
index b31ac6bbed..ed87af50ad 100644
--- a/types/graphql/type/definition.d.ts
+++ b/types/graphql/type/definition.d.ts
@@ -1,3 +1,4 @@
+import { MaybePromise } from "../jsutils/MaybePromise";
 import {
     ScalarTypeDefinitionNode,
     ObjectTypeDefinitionNode,
@@ -8,7 +9,8 @@ import {
     EnumTypeDefinitionNode,
     EnumValueDefinitionNode,
     InputObjectTypeDefinitionNode,
-    TypeExtensionNode,
+    ObjectTypeExtensionNode,
+    InterfaceTypeExtensionNode,
     OperationDefinitionNode,
     FieldNode,
     FragmentDefinitionNode,
@@ -33,6 +35,38 @@ export function isType(type: any): type is GraphQLType;
 
 export function assertType(type: any): GraphQLType;
 
+export function isScalarType(type: GraphQLType): type is GraphQLScalarType;
+
+export function assertScalarType(type: GraphQLType): GraphQLScalarType;
+
+export function isObjectType(type: GraphQLType): type is GraphQLObjectType;
+
+export function assertObjectType(type: GraphQLType): GraphQLObjectType;
+
+export function isInterfaceType(type: GraphQLType): type is GraphQLInterfaceType;
+
+export function assertInterfaceType(type: GraphQLType): GraphQLInterfaceType;
+
+export function isUnionType(type: GraphQLType): type is GraphQLUnionType;
+
+export function assertUnionType(type: GraphQLType): GraphQLUnionType;
+
+export function isEnumType(type: GraphQLType): type is GraphQLEnumType;
+
+export function assertEnumType(type: GraphQLType): GraphQLEnumType;
+
+export function isInputObjectType(type: GraphQLType): type is GraphQLInputObjectType;
+
+export function assertInputObjectType(type: GraphQLType): GraphQLInputObjectType;
+
+export function isListType(type: GraphQLType): type is GraphQLList<any>;
+
+export function assertListType(type: GraphQLType): GraphQLList<any>;
+
+export function isNonNullType(type: GraphQLType): type is GraphQLNonNull<any>;
+
+export function assertNonNullType(type: GraphQLType): GraphQLNonNull<any>;
+
 /**
  * These types may be used as input types for arguments and directives.
  */
@@ -97,6 +131,66 @@ export function isAbstractType(type: GraphQLType): type is GraphQLAbstractType;
 
 export function assertAbstractType(type: GraphQLType): GraphQLAbstractType;
 
+/**
+ * List Modifier
+ *
+ * A list is a kind of type marker, a wrapping type which points to another
+ * type. Lists are often created within the context of defining the fields of
+ * an object type.
+ *
+ * Example:
+ *
+ *     const PersonType = new GraphQLObjectType({
+ *       name: 'Person',
+ *       fields: () => ({
+ *         parents: { type: new GraphQLList(Person) },
+ *         children: { type: new GraphQLList(Person) },
+ *       })
+ *     })
+ *
+ */
+export class GraphQLList<T extends GraphQLType> {
+    readonly ofType: T;
+    constructor(type: T);
+    toString(): string;
+    toJSON(): string;
+    inspect(): string;
+}
+
+/**
+ * Non-Null Modifier
+ *
+ * A non-null is a kind of type marker, a wrapping type which points to another
+ * type. Non-null types enforce that their values are never null and can ensure
+ * an error is raised if this ever occurs during a request. It is useful for
+ * fields which you can make a strong guarantee on non-nullability, for example
+ * usually the id field of a database row will never be null.
+ *
+ * Example:
+ *
+ *     const RowType = new GraphQLObjectType({
+ *       name: 'Row',
+ *       fields: () => ({
+ *         id: { type: new GraphQLNonNull(GraphQLString) },
+ *       })
+ *     })
+ *
+ * Note: the enforcement of non-nullability occurs within the executor.
+ */
+export class GraphQLNonNull<T extends GraphQLNullableType> {
+    readonly ofType: T;
+    constructor(type: T);
+    toString(): string;
+    toJSON(): string;
+    inspect(): string;
+}
+
+export type GraphQLWrappingType = GraphQLList<any> | GraphQLNonNull<any>;
+
+export function isWrappingType(type: GraphQLType): type is GraphQLWrappingType;
+
+export function assertWrappingType(type: GraphQLType): GraphQLWrappingType;
+
 /**
  * These types can all accept null as a value.
  */
@@ -109,7 +203,13 @@ export type GraphQLNullableType =
     | GraphQLInputObjectType
     | GraphQLList<any>;
 
-export function getNullableType<T extends GraphQLType>(type: T): T & GraphQLNullableType;
+export function isNullableType(type: GraphQLType): type is GraphQLNullableType;
+
+export function assertNullableType(type: GraphQLType): GraphQLNullableType;
+
+export function getNullableType(type: void): undefined;
+export function getNullableType<T extends GraphQLNullableType>(type: T): T;
+export function getNullableType<T extends GraphQLNullableType>(type: GraphQLNonNull<T>): T;
 
 /**
  * These named types do not include modifiers like List or NonNull.
@@ -122,10 +222,11 @@ export type GraphQLNamedType =
     | GraphQLEnumType
     | GraphQLInputObjectType;
 
-export function isNamedType(type: GraphQLType): boolean;
+export function isNamedType(type: GraphQLType): type is GraphQLNamedType;
 
 export function assertNamedType(type: GraphQLType): GraphQLNamedType;
 
+export function getNamedType(type: void): undefined;
 export function getNamedType(type: GraphQLType): GraphQLNamedType;
 
 /**
@@ -153,8 +254,8 @@ export type Thunk<T> = (() => T) | T;
  */
 export class GraphQLScalarType {
     name: string;
-    description: string;
-    astNode?: ScalarTypeDefinitionNode;
+    description: string | void;
+    astNode?: ScalarTypeDefinitionNode | void;
     constructor(config: GraphQLScalarTypeConfig<any, any>);
 
     // Serializes an internal value to include in a response.
@@ -164,18 +265,20 @@ export class GraphQLScalarType {
     parseValue(value: any): any;
 
     // Parses an externally provided literal value to use as an input.
-    parseLiteral(valueNode: ValueNode): any;
+    parseLiteral(valueNode: ValueNode, variables?: { [key: string]: any } | void): any;
 
     toString(): string;
+    toJSON(): string;
+    inspect(): string;
 }
 
 export interface GraphQLScalarTypeConfig<TInternal, TExternal> {
     name: string;
-    description?: string;
-    astNode?: ScalarTypeDefinitionNode;
-    serialize(value: any): TExternal | null | undefined;
-    parseValue?(value: any): TInternal | null | undefined;
-    parseLiteral?(valueNode: ValueNode): TInternal | null | undefined;
+    description?: string | void;
+    astNode?: ScalarTypeDefinitionNode | void;
+    serialize(value: any): TExternal | void;
+    parseValue?(value: any): TInternal | void;
+    parseLiteral?(valueNode: ValueNode, variables: { [key: string]: any } | void): TInternal | void;
 }
 
 /**
@@ -217,38 +320,40 @@ export interface GraphQLScalarTypeConfig<TInternal, TExternal> {
  */
 export class GraphQLObjectType {
     name: string;
-    description: string;
-    astNode?: ObjectTypeDefinitionNode;
-    extensionASTNodes: Array<TypeExtensionNode>;
-    isTypeOf: GraphQLIsTypeOfFn<any, any>;
+    description: string | void;
+    astNode: ObjectTypeDefinitionNode | void;
+    extensionASTNodes: ReadonlyArray<ObjectTypeExtensionNode> | void;
+    isTypeOf: GraphQLIsTypeOfFn<any, any> | void;
 
     constructor(config: GraphQLObjectTypeConfig<any, any>);
     getFields(): GraphQLFieldMap<any, any>;
     getInterfaces(): GraphQLInterfaceType[];
     toString(): string;
+    toJSON(): string;
+    inspect(): string;
 }
 
 export interface GraphQLObjectTypeConfig<TSource, TContext> {
     name: string;
-    interfaces?: Thunk<GraphQLInterfaceType[]>;
+    interfaces?: Thunk<GraphQLInterfaceType[] | void>;
     fields: Thunk<GraphQLFieldConfigMap<TSource, TContext>>;
-    isTypeOf?: GraphQLIsTypeOfFn<TSource, TContext>;
-    description?: string;
-    astNode?: ObjectTypeDefinitionNode;
-    extensionASTNodes?: Array<TypeExtensionNode>;
+    isTypeOf?: GraphQLIsTypeOfFn<TSource, TContext> | void;
+    description?: string | void;
+    astNode?: ObjectTypeDefinitionNode | void;
+    extensionASTNodes?: ReadonlyArray<ObjectTypeExtensionNode> | void;
 }
 
 export type GraphQLTypeResolver<TSource, TContext> = (
     value: TSource,
     context: TContext,
     info: GraphQLResolveInfo
-) => GraphQLObjectType | string | Promise<GraphQLObjectType | string>;
+) => MaybePromise<GraphQLObjectType | string | void>;
 
 export type GraphQLIsTypeOfFn<TSource, TContext> = (
     source: TSource,
     context: TContext,
     info: GraphQLResolveInfo
-) => boolean | Promise<boolean>;
+) => MaybePromise<boolean>;
 
 export type GraphQLFieldResolver<TSource, TContext, TArgs = { [argName: string]: any }> = (
     source: TSource,
@@ -258,68 +363,69 @@ export type GraphQLFieldResolver<TSource, TContext, TArgs = { [argName: string]:
 ) => any;
 
 export interface GraphQLResolveInfo {
-    fieldName: string;
-    fieldNodes: FieldNode[];
-    returnType: GraphQLOutputType;
-    parentType: GraphQLCompositeType;
-    path: ResponsePath;
-    schema: GraphQLSchema;
-    fragments: { [fragmentName: string]: FragmentDefinitionNode };
-    rootValue: any;
-    operation: OperationDefinitionNode;
-    variableValues: { [variableName: string]: any };
+    readonly fieldName: string;
+    readonly fieldNodes: ReadonlyArray<FieldNode>;
+    readonly returnType: GraphQLOutputType;
+    readonly parentType: GraphQLObjectType;
+    readonly path: ResponsePath;
+    readonly schema: GraphQLSchema;
+    readonly fragments: { [key: string]: FragmentDefinitionNode };
+    readonly rootValue: any;
+    readonly operation: OperationDefinitionNode;
+    readonly variableValues: { [variableName: string]: any };
 }
 
-export type ResponsePath = { prev: ResponsePath; key: string | number } | undefined;
+export type ResponsePath = {
+    readonly prev: ResponsePath | undefined;
+    readonly key: string | number;
+};
 
 export interface GraphQLFieldConfig<TSource, TContext, TArgs = { [argName: string]: any }> {
     type: GraphQLOutputType;
     args?: GraphQLFieldConfigArgumentMap;
     resolve?: GraphQLFieldResolver<TSource, TContext, TArgs>;
     subscribe?: GraphQLFieldResolver<TSource, TContext, TArgs>;
-    deprecationReason?: string;
-    description?: string;
-    astNode?: FieldDefinitionNode;
+    deprecationReason?: string | void;
+    description?: string | void;
+    astNode?: FieldDefinitionNode | void;
 }
 
-export interface GraphQLFieldConfigArgumentMap {
-    [argName: string]: GraphQLArgumentConfig;
-}
+export type GraphQLFieldConfigArgumentMap = { [key: string]: GraphQLArgumentConfig };
 
 export interface GraphQLArgumentConfig {
     type: GraphQLInputType;
     defaultValue?: any;
-    description?: string;
-    astNode?: InputValueDefinitionNode;
+    description?: string | void;
+    astNode?: InputValueDefinitionNode | void;
 }
 
-export interface GraphQLFieldConfigMap<TSource, TContext> {
-    [fieldName: string]: GraphQLFieldConfig<TSource, TContext>;
-}
+export type GraphQLFieldConfigMap<TSource, TContext> = {
+    [key: string]: GraphQLFieldConfig<TSource, TContext>;
+};
 
-export interface GraphQLField<TSource, TContext, TArgs = { [argName: string]: any }> {
+export interface GraphQLField<TSource, TContext, TArgs = { [key: string]: any }> {
     name: string;
-    description: string;
+    description: string | void;
     type: GraphQLOutputType;
     args: GraphQLArgument[];
     resolve?: GraphQLFieldResolver<TSource, TContext, TArgs>;
     subscribe?: GraphQLFieldResolver<TSource, TContext, TArgs>;
     isDeprecated?: boolean;
-    deprecationReason?: string;
-    astNode?: FieldDefinitionNode;
+    deprecationReason?: string | void;
+    astNode?: FieldDefinitionNode | void;
 }
 
 export interface GraphQLArgument {
     name: string;
     type: GraphQLInputType;
     defaultValue?: any;
-    description?: string;
-    astNode?: InputValueDefinitionNode;
+    description?: string | void;
+    astNode?: InputValueDefinitionNode | void;
 }
 
-export interface GraphQLFieldMap<TSource, TContext> {
-    [fieldName: string]: GraphQLField<TSource, TContext>;
-}
+export type GraphQLFieldMap<TSource, TContext> = {
+    [key: string]: GraphQLField<TSource, TContext>;
+};
 
 /**
  * Interface Type Definition
@@ -341,15 +447,18 @@ export interface GraphQLFieldMap<TSource, TContext> {
  */
 export class GraphQLInterfaceType {
     name: string;
-    description: string;
-    astNode?: InterfaceTypeDefinitionNode;
-    resolveType: GraphQLTypeResolver<any, any>;
+    description: string | void;
+    astNode?: InterfaceTypeDefinitionNode | void;
+    extensionASTNodes: ReadonlyArray<InterfaceTypeExtensionNode> | void;
+    resolveType: GraphQLTypeResolver<any, any> | void;
 
     constructor(config: GraphQLInterfaceTypeConfig<any, any>);
 
     getFields(): GraphQLFieldMap<any, any>;
 
     toString(): string;
+    toJSON(): string;
+    inspect(): string;
 }
 
 export interface GraphQLInterfaceTypeConfig<TSource, TContext> {
@@ -360,9 +469,10 @@ export interface GraphQLInterfaceTypeConfig<TSource, TContext> {
      * the default implementation will call `isTypeOf` on each implementing
      * Object type.
      */
-    resolveType?: GraphQLTypeResolver<TSource, TContext>;
-    description?: string;
-    astNode?: InterfaceTypeDefinitionNode;
+    resolveType?: GraphQLTypeResolver<TSource, TContext> | void;
+    description?: string | void;
+    astNode?: InterfaceTypeDefinitionNode | void;
+    extensionASTNodes?: ReadonlyArray<InterfaceTypeExtensionNode> | void;
 }
 
 /**
@@ -390,15 +500,17 @@ export interface GraphQLInterfaceTypeConfig<TSource, TContext> {
  */
 export class GraphQLUnionType {
     name: string;
-    description: string;
-    astNode?: UnionTypeDefinitionNode;
-    resolveType: GraphQLTypeResolver<any, any>;
+    description: string | void;
+    astNode?: UnionTypeDefinitionNode | void;
+    resolveType: GraphQLTypeResolver<any, any> | void;
 
     constructor(config: GraphQLUnionTypeConfig<any, any>);
 
     getTypes(): GraphQLObjectType[];
 
     toString(): string;
+    toJSON(): string;
+    inspect(): string;
 }
 
 export interface GraphQLUnionTypeConfig<TSource, TContext> {
@@ -409,9 +521,9 @@ export interface GraphQLUnionTypeConfig<TSource, TContext> {
      * the default implementation will call `isTypeOf` on each implementing
      * Object type.
      */
-    resolveType?: GraphQLTypeResolver<TSource, TContext>;
-    description?: string;
-    astNode?: UnionTypeDefinitionNode;
+    resolveType?: GraphQLTypeResolver<TSource, TContext> | void;
+    description?: string | void;
+    astNode?: UnionTypeDefinitionNode | void;
 }
 
 /**
@@ -437,43 +549,42 @@ export interface GraphQLUnionTypeConfig<TSource, TContext> {
  */
 export class GraphQLEnumType {
     name: string;
-    description: string;
-    astNode?: EnumTypeDefinitionNode;
+    description: string | void;
+    astNode: EnumTypeDefinitionNode | void;
 
     constructor(config: GraphQLEnumTypeConfig);
     getValues(): GraphQLEnumValue[];
-    getValue(name: string): GraphQLEnumValue;
-    isValidValue(value: any): boolean;
-    serialize(value: any): string;
+    getValue(name: string): GraphQLEnumValue | void;
+    serialize(value: any): string | void;
     parseValue(value: any): any;
-    parseLiteral(valueNode: ValueNode): any;
+    parseLiteral(valueNode: ValueNode, _variables: { [key: string]: any } | void): any;
     toString(): string;
+    toJSON(): string;
+    inspect(): string;
 }
 
 export interface GraphQLEnumTypeConfig {
     name: string;
     values: GraphQLEnumValueConfigMap;
-    description?: string;
-    astNode?: EnumTypeDefinitionNode;
+    description?: string | void;
+    astNode?: EnumTypeDefinitionNode | void;
 }
 
-export interface GraphQLEnumValueConfigMap {
-    [valueName: string]: GraphQLEnumValueConfig;
-}
+export type GraphQLEnumValueConfigMap = { [key: string]: GraphQLEnumValueConfig };
 
 export interface GraphQLEnumValueConfig {
     value?: any;
-    deprecationReason?: string;
-    description?: string;
-    astNode?: EnumValueDefinitionNode;
+    deprecationReason?: string | void;
+    description?: string | void;
+    astNode?: EnumValueDefinitionNode | void;
 }
 
 export interface GraphQLEnumValue {
     name: string;
-    description: string;
+    description: string | void;
     isDeprecated?: boolean;
-    deprecationReason: string;
-    astNode?: EnumValueDefinitionNode;
+    deprecationReason: string | void;
+    astNode?: EnumValueDefinitionNode | void;
     value: any;
 }
 
@@ -499,91 +610,39 @@ export interface GraphQLEnumValue {
  */
 export class GraphQLInputObjectType {
     name: string;
-    description: string;
-    astNode?: InputObjectTypeDefinitionNode;
+    description: string | void;
+    astNode: InputObjectTypeDefinitionNode | void;
     constructor(config: GraphQLInputObjectTypeConfig);
     getFields(): GraphQLInputFieldMap;
     toString(): string;
+    toJSON(): string;
+    inspect(): string;
 }
 
 export interface GraphQLInputObjectTypeConfig {
     name: string;
     fields: Thunk<GraphQLInputFieldConfigMap>;
-    description?: string;
-    astNode?: InputObjectTypeDefinitionNode;
+    description?: string | void;
+    astNode?: InputObjectTypeDefinitionNode | void;
 }
 
 export interface GraphQLInputFieldConfig {
     type: GraphQLInputType;
     defaultValue?: any;
-    description?: string;
-    astNode?: InputValueDefinitionNode;
+    description?: string | void;
+    astNode?: InputValueDefinitionNode | void;
 }
 
-export interface GraphQLInputFieldConfigMap {
-    [fieldName: string]: GraphQLInputFieldConfig;
-}
+export type GraphQLInputFieldConfigMap = {
+    [key: string]: GraphQLInputFieldConfig;
+};
 
 export interface GraphQLInputField {
     name: string;
     type: GraphQLInputType;
     defaultValue?: any;
-    description?: string;
-    astNode?: InputValueDefinitionNode;
+    description?: string | void;
+    astNode?: InputValueDefinitionNode | void;
 }
 
-export interface GraphQLInputFieldMap {
-    [fieldName: string]: GraphQLInputField;
-}
-
-/**
- * List Modifier
- *
- * A list is a kind of type marker, a wrapping type which points to another
- * type. Lists are often created within the context of defining the fields of
- * an object type.
- *
- * Example:
- *
- *     const PersonType = new GraphQLObjectType({
- *       name: 'Person',
- *       fields: () => ({
- *         parents: { type: new GraphQLList(Person) },
- *         children: { type: new GraphQLList(Person) },
- *       })
- *     })
- *
- */
-export class GraphQLList<T extends GraphQLType> {
-    ofType: T;
-    constructor(type: T);
-    toString(): string;
-}
-
-/**
- * Non-Null Modifier
- *
- * A non-null is a kind of type marker, a wrapping type which points to another
- * type. Non-null types enforce that their values are never null and can ensure
- * an error is raised if this ever occurs during a request. It is useful for
- * fields which you can make a strong guarantee on non-nullability, for example
- * usually the id field of a database row will never be null.
- *
- * Example:
- *
- *     const RowType = new GraphQLObjectType({
- *       name: 'Row',
- *       fields: () => ({
- *         id: { type: new GraphQLNonNull(GraphQLString) },
- *       })
- *     })
- *
- * Note: the enforcement of non-nullability occurs within the executor.
- */
-export class GraphQLNonNull<T extends GraphQLNullableType> {
-    ofType: T;
-
-    constructor(type: T);
-
-    toString(): string;
-}
+export type GraphQLInputFieldMap = { [key: string]: GraphQLInputField };
diff --git a/types/graphql/type/directives.d.ts b/types/graphql/type/directives.d.ts
index bf1fc8df16..f6e19f674d 100644
--- a/types/graphql/type/directives.d.ts
+++ b/types/graphql/type/directives.d.ts
@@ -1,30 +1,11 @@
 import { GraphQLFieldConfigArgumentMap, GraphQLArgument } from "./definition";
 import { DirectiveDefinitionNode } from "../language/ast";
+import { DirectiveLocationEnum } from "../language/directiveLocation";
 
-export const DirectiveLocation: {
-    // Operations
-    QUERY: "QUERY";
-    MUTATION: "MUTATION";
-    SUBSCRIPTION: "SUBSCRIPTION";
-    FIELD: "FIELD";
-    FRAGMENT_DEFINITION: "FRAGMENT_DEFINITION";
-    FRAGMENT_SPREAD: "FRAGMENT_SPREAD";
-    INLINE_FRAGMENT: "INLINE_FRAGMENT";
-    // Schema Definitions
-    SCHEMA: "SCHEMA";
-    SCALAR: "SCALAR";
-    OBJECT: "OBJECT";
-    FIELD_DEFINITION: "FIELD_DEFINITION";
-    ARGUMENT_DEFINITION: "ARGUMENT_DEFINITION";
-    INTERFACE: "INTERFACE";
-    UNION: "UNION";
-    ENUM: "ENUM";
-    ENUM_VALUE: "ENUM_VALUE";
-    INPUT_OBJECT: "INPUT_OBJECT";
-    INPUT_FIELD_DEFINITION: "INPUT_FIELD_DEFINITION";
-};
-
-export type DirectiveLocationEnum = keyof typeof DirectiveLocation;
+/**
+ * Test if the given value is a GraphQL directive.
+ */
+export function isDirective(directive: any): directive is GraphQLDirective;
 
 /**
  * Directives are used by the GraphQL runtime as a way of modifying execution
@@ -32,20 +13,20 @@ export type DirectiveLocationEnum = keyof typeof DirectiveLocation;
  */
 export class GraphQLDirective {
     name: string;
-    description?: string;
+    description: string | void;
     locations: DirectiveLocationEnum[];
     args: GraphQLArgument[];
-    astNode?: DirectiveDefinitionNode;
+    astNode: DirectiveDefinitionNode | void;
 
     constructor(config: GraphQLDirectiveConfig);
 }
 
 export interface GraphQLDirectiveConfig {
     name: string;
-    description?: string;
+    description?: string | void;
     locations: DirectiveLocationEnum[];
-    args?: GraphQLFieldConfigArgumentMap;
-    astNode?: DirectiveDefinitionNode;
+    args?: GraphQLFieldConfigArgumentMap | void;
+    astNode?: DirectiveDefinitionNode | void;
 }
 
 /**
@@ -71,4 +52,6 @@ export const GraphQLDeprecatedDirective: GraphQLDirective;
 /**
  * The full list of specified directives.
  */
-export const specifiedDirectives: GraphQLDirective[];
+export const specifiedDirectives: ReadonlyArray<GraphQLDirective>;
+
+export function isSpecifiedDirective(directive: GraphQLDirective): boolean;
diff --git a/types/graphql/type/index.d.ts b/types/graphql/type/index.d.ts
index 551ade35e7..39c510fc95 100644
--- a/types/graphql/type/index.d.ts
+++ b/types/graphql/type/index.d.ts
@@ -1,29 +1,46 @@
-// GraphQL Schema definition
-export { GraphQLSchema } from "./schema";
+export {
+    // Predicate
+    isSchema,
+    // GraphQL Schema definition
+    GraphQLSchema,
+    GraphQLSchemaConfig,
+} from "./schema";
 
 export * from "./definition";
 
 export {
-    // "Enum" of Directive Locations
-    DirectiveLocation,
+    // Predicate
+    isDirective,
     // Directives Definition
     GraphQLDirective,
     // Built-in Directives defined by the Spec
+    isSpecifiedDirective,
     specifiedDirectives,
     GraphQLIncludeDirective,
     GraphQLSkipDirective,
     GraphQLDeprecatedDirective,
     // Constant Deprecation Reason
     DEFAULT_DEPRECATION_REASON,
+    GraphQLDirectiveConfig,
 } from "./directives";
 
 // Common built-in scalar instances.
-export { GraphQLInt, GraphQLFloat, GraphQLString, GraphQLBoolean, GraphQLID } from "./scalars";
+export {
+    isSpecifiedScalarType,
+    specifiedScalarTypes,
+    GraphQLInt,
+    GraphQLFloat,
+    GraphQLString,
+    GraphQLBoolean,
+    GraphQLID,
+} from "./scalars";
 
 export {
     // "Enum" of Type Kinds
     TypeKind,
     // GraphQL Types for introspection.
+    isIntrospectionType,
+    introspectionTypes,
     __Schema,
     __Directive,
     __DirectiveLocation,
@@ -38,4 +55,4 @@ export {
     TypeNameMetaFieldDef,
 } from "./introspection";
 
-export { DirectiveLocationEnum } from "./directives";
+export { validateSchema, assertValidSchema } from "./validate";
diff --git a/types/graphql/type/introspection.d.ts b/types/graphql/type/introspection.d.ts
index 042c3e2b6b..beed0ebeb2 100644
--- a/types/graphql/type/introspection.d.ts
+++ b/types/graphql/type/introspection.d.ts
@@ -35,6 +35,11 @@ export const __TypeKind: GraphQLEnumType;
  * Note that these are GraphQLField and not GraphQLFieldConfig,
  * so the format for args is different.
  */
+
 export const SchemaMetaFieldDef: GraphQLField<any, any>;
 export const TypeMetaFieldDef: GraphQLField<any, any>;
 export const TypeNameMetaFieldDef: GraphQLField<any, any>;
+
+export const introspectionTypes: ReadonlyArray<any>;
+
+export function isIntrospectionType(type: any): boolean;
diff --git a/types/graphql/type/scalars.d.ts b/types/graphql/type/scalars.d.ts
index 287d99602a..1476bf7ab8 100644
--- a/types/graphql/type/scalars.d.ts
+++ b/types/graphql/type/scalars.d.ts
@@ -5,3 +5,7 @@ export const GraphQLFloat: GraphQLScalarType;
 export const GraphQLString: GraphQLScalarType;
 export const GraphQLBoolean: GraphQLScalarType;
 export const GraphQLID: GraphQLScalarType;
+
+export const specifiedScalarTypes: ReadonlyArray<GraphQLScalarType>;
+
+export function isSpecifiedScalarType(type: GraphQLScalarType): boolean;
diff --git a/types/graphql/type/schema.d.ts b/types/graphql/type/schema.d.ts
index bdd1089756..a7bb94f5c5 100644
--- a/types/graphql/type/schema.d.ts
+++ b/types/graphql/type/schema.d.ts
@@ -3,6 +3,11 @@ import { GraphQLType, GraphQLNamedType, GraphQLAbstractType } from "./definition
 import { SchemaDefinitionNode } from "../language/ast";
 import { GraphQLDirective } from "./directives";
 
+/**
+ * Test if the given value is a GraphQL schema.
+ */
+export function isSchema(schema: any): schema is GraphQLSchema;
+
 /**
  * Schema Definition
  *
@@ -30,31 +35,26 @@ import { GraphQLDirective } from "./directives";
  *
  */
 export class GraphQLSchema {
-    astNode?: SchemaDefinitionNode;
-    // private _queryType: GraphQLObjectType;
-    // private _mutationType: GraphQLObjectType;
-    // private _subscriptionType: GraphQLObjectType;
-    // private _directives: Array<GraphQLDirective>;
-    // private _typeMap: TypeMap;
-    // private _implementations: { [interfaceName: string]: Array<GraphQLObjectType> };
-    // private _possibleTypeMap: { [abstractName: string]: { [possibleName: string]: boolean } };
+    astNode: SchemaDefinitionNode | void;
 
     constructor(config: GraphQLSchemaConfig);
 
-    getQueryType(): GraphQLObjectType;
-    getMutationType(): GraphQLObjectType | null | undefined;
-    getSubscriptionType(): GraphQLObjectType | null | undefined;
-    getTypeMap(): { [typeName: string]: GraphQLNamedType };
-    getType(name: string): GraphQLNamedType;
-    getPossibleTypes(abstractType: GraphQLAbstractType): GraphQLObjectType[];
+    getQueryType(): GraphQLObjectType | void;
+    getMutationType(): GraphQLObjectType | void;
+    getSubscriptionType(): GraphQLObjectType | void;
+    getTypeMap(): TypeMap;
+    getType(name: string): GraphQLNamedType | void;
+    getPossibleTypes(abstractType: GraphQLAbstractType): ReadonlyArray<GraphQLObjectType>;
 
     isPossibleType(abstractType: GraphQLAbstractType, possibleType: GraphQLObjectType): boolean;
 
-    getDirectives(): GraphQLDirective[];
-    getDirective(name: string): GraphQLDirective;
+    getDirectives(): ReadonlyArray<GraphQLDirective>;
+    getDirective(name: string): GraphQLDirective | void;
 }
 
-export type GraphQLSchemaValidationOptions = {
+type TypeMap = { [key: string]: GraphQLNamedType };
+
+export interface GraphQLSchemaValidationOptions {
     /**
      * When building a schema from a GraphQL service's introspection result, it
      * might be safe to assume the schema is valid. Set to true to assume the
@@ -72,14 +72,14 @@ export type GraphQLSchemaValidationOptions = {
      * This option is provided to ease adoption and may be removed in a future
      * major release.
      */
-    allowedLegacyNames?: ReadonlyArray<string>;
-};
+    allowedLegacyNames?: ReadonlyArray<string> | void;
+}
 
-export interface GraphQLSchemaConfig {
-    query: GraphQLObjectType;
-    mutation?: GraphQLObjectType;
-    subscription?: GraphQLObjectType;
-    types?: GraphQLNamedType[];
-    directives?: GraphQLDirective[];
-    astNode?: SchemaDefinitionNode;
+export interface GraphQLSchemaConfig extends GraphQLSchemaValidationOptions {
+    query: GraphQLObjectType | void;
+    mutation?: GraphQLObjectType | void;
+    subscription?: GraphQLObjectType | void;
+    types?: GraphQLNamedType[] | void;
+    directives?: GraphQLDirective[] | void;
+    astNode?: SchemaDefinitionNode | void;
 }
diff --git a/types/graphql/type/validate.d.ts b/types/graphql/type/validate.d.ts
new file mode 100644
index 0000000000..e23f9e6386
--- /dev/null
+++ b/types/graphql/type/validate.d.ts
@@ -0,0 +1,17 @@
+import { GraphQLSchema } from "./schema";
+import { GraphQLError } from "../error/GraphQLError";
+
+/**
+ * Implements the "Type Validation" sub-sections of the specification's
+ * "Type System" section.
+ *
+ * Validation runs synchronously, returning an array of encountered errors, or
+ * an empty array if no errors were encountered and the Schema is valid.
+ */
+export function validateSchema(schema: GraphQLSchema): ReadonlyArray<GraphQLError>;
+
+/**
+ * Utility function which asserts a schema is valid by throwing an error if
+ * it is invalid.
+ */
+export function assertValidSchema(schema: GraphQLSchema): void;

From 107916a7eb10ceb150f4db68cd1c935649c42b06 Mon Sep 17 00:00:00 2001
From: Firede <firede@firede.us>
Date: Wed, 28 Mar 2018 00:49:50 +0800
Subject: [PATCH 0886/1382] update `graphql/utilities/*` -> `v0.13.2`.

https://github.com/graphql/graphql-js/tree/v0.13.2/src/utilities
---
 types/graphql/utilities/TypeInfo.d.ts         |  24 +-
 types/graphql/utilities/assertValidName.d.ts  |  14 +-
 types/graphql/utilities/astFromValue.d.ts     |  18 +-
 types/graphql/utilities/buildASTSchema.d.ts   |  45 +++-
 .../graphql/utilities/buildClientSchema.d.ts  |   3 +
 types/graphql/utilities/coerceValue.d.ts      |  22 ++
 types/graphql/utilities/concatAST.d.ts        |   2 +-
 types/graphql/utilities/extendSchema.d.ts     |  20 +-
 .../utilities/findBreakingChanges.d.ts        | 120 +++++++--
 types/graphql/utilities/getOperationAST.d.ts  |   5 +-
 types/graphql/utilities/index.d.ts            |  42 ++-
 .../utilities/introspectionFromSchema.d.ts    |  13 +
 .../graphql/utilities/introspectionQuery.d.ts | 239 +++++++-----------
 types/graphql/utilities/isValidJSValue.d.ts   |   4 +-
 .../utilities/isValidLiteralValue.d.ts        |   9 +-
 .../utilities/lexicographicSortSchema.d.ts    |   6 +
 types/graphql/utilities/schemaPrinter.d.ts    |  17 +-
 .../graphql/utilities/separateOperations.d.ts |   8 +-
 types/graphql/utilities/typeFromAST.d.ts      |  17 +-
 types/graphql/utilities/valueFromAST.d.ts     |  26 +-
 .../utilities/valueFromASTUntyped.d.ts        |  19 ++
 21 files changed, 440 insertions(+), 233 deletions(-)
 create mode 100644 types/graphql/utilities/coerceValue.d.ts
 create mode 100644 types/graphql/utilities/introspectionFromSchema.d.ts
 create mode 100644 types/graphql/utilities/lexicographicSortSchema.d.ts
 create mode 100644 types/graphql/utilities/valueFromASTUntyped.d.ts

diff --git a/types/graphql/utilities/TypeInfo.d.ts b/types/graphql/utilities/TypeInfo.d.ts
index 8b1ddc6206..1c2f139642 100644
--- a/types/graphql/utilities/TypeInfo.d.ts
+++ b/types/graphql/utilities/TypeInfo.d.ts
@@ -22,22 +22,26 @@ export class TypeInfo {
         // 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
+        getFieldDefFn?: getFieldDef,
+        // Initial type may be provided in rare cases to facilitate traversals
+        // beginning somewhere other than documents.
+        initialType?: GraphQLType
     );
 
-    getType(): GraphQLOutputType;
-    getParentType(): GraphQLCompositeType;
-    getInputType(): GraphQLInputType;
-    getFieldDef(): GraphQLField<any, any>;
-    getDirective(): GraphQLDirective;
-    getArgument(): GraphQLArgument;
-    getEnumValue(): GraphQLEnumValue;
+    getType(): GraphQLOutputType | void;
+    getParentType(): GraphQLCompositeType | void;
+    getInputType(): GraphQLInputType | void;
+    getParentInputType(): GraphQLInputType | void;
+    getFieldDef(): GraphQLField<any, any> | void;
+    getDirective(): GraphQLDirective | void;
+    getArgument(): GraphQLArgument | void;
+    getEnumValue(): GraphQLEnumValue | void;
     enter(node: ASTNode): any;
     leave(node: ASTNode): any;
 }
 
-export type getFieldDef = (
+type getFieldDef = (
     schema: GraphQLSchema,
     parentType: GraphQLType,
     fieldNode: FieldNode
-) => GraphQLField<any, any>;
+) => GraphQLField<any, any> | void;
diff --git a/types/graphql/utilities/assertValidName.d.ts b/types/graphql/utilities/assertValidName.d.ts
index 5ca2310a26..19f81e3991 100644
--- a/types/graphql/utilities/assertValidName.d.ts
+++ b/types/graphql/utilities/assertValidName.d.ts
@@ -1,2 +1,12 @@
-// Helper to assert that provided names are valid.
-export function assertValidName(name: string): void;
+import { GraphQLError } from "../error/GraphQLError";
+import { ASTNode } from "../language/ast";
+
+/**
+ * Upholds the spec rules about naming.
+ */
+export function assertValidName(name: string): string;
+
+/**
+ * Returns an Error if a name is invalid.
+ */
+export function isValidNameError(name: string, node?: ASTNode | undefined): GraphQLError | undefined;
diff --git a/types/graphql/utilities/astFromValue.d.ts b/types/graphql/utilities/astFromValue.d.ts
index 57f7f977ad..9c2198e6d6 100644
--- a/types/graphql/utilities/astFromValue.d.ts
+++ b/types/graphql/utilities/astFromValue.d.ts
@@ -1,16 +1,4 @@
-import {
-    ValueNode,
-    /*
-    TODO:
-    IntValueNode,
-    FloatValueNode,
-    StringValueNode,
-    BooleanValueNode,
-    EnumValueNode,
-    ListValueNode,
-    ObjectValueNode,
-    */
-} from "../language/ast";
+import { ValueNode } from "../language/ast";
 import { GraphQLInputType } from "../type/definition";
 
 /**
@@ -27,7 +15,7 @@ import { GraphQLInputType } from "../type/definition";
  * | String        | String / Enum Value  |
  * | Number        | Int / Float          |
  * | Mixed         | Enum Value           |
+ * | null          | NullValue            |
  *
  */
-// TODO: this should set overloads according to above the table
-export function astFromValue(value: any, type: GraphQLInputType): ValueNode; // Warning: there is a code in bottom: throw new TypeError
+export function astFromValue(value: any, type: GraphQLInputType): ValueNode | void;
diff --git a/types/graphql/utilities/buildASTSchema.d.ts b/types/graphql/utilities/buildASTSchema.d.ts
index 4d256fe180..ebff50b4f7 100644
--- a/types/graphql/utilities/buildASTSchema.d.ts
+++ b/types/graphql/utilities/buildASTSchema.d.ts
@@ -1,6 +1,18 @@
-import { DocumentNode, Location, StringValueNode } from "../language/ast";
+import {
+    DocumentNode,
+    Location,
+    StringValueNode,
+    TypeDefinitionNode,
+    NamedTypeNode,
+    DirectiveDefinitionNode,
+    FieldDefinitionNode,
+} from "../language/ast";
+import { GraphQLNamedType, GraphQLFieldConfig } from "../type/definition";
+import { GraphQLDirective } from "../type/directives";
 import { Source } from "../language/source";
 import { GraphQLSchema, GraphQLSchemaValidationOptions } from "../type/schema";
+import { ParseOptions } from "../language/parser";
+import blockStringValue from "../language/blockStringValue";
 
 interface BuildSchemaOptions extends GraphQLSchemaValidationOptions {
     /**
@@ -22,8 +34,29 @@ interface BuildSchemaOptions extends GraphQLSchemaValidationOptions {
  *
  * Given that AST it constructs a GraphQLSchema. The resulting schema
  * has no resolve methods, so execution will use default resolvers.
+ *
+ * Accepts options as a second argument:
+ *
+ *    - commentDescriptions:
+ *        Provide true to use preceding comments as the description.
+ *
  */
-export function buildASTSchema(ast: DocumentNode): GraphQLSchema;
+export function buildASTSchema(ast: DocumentNode, options?: BuildSchemaOptions): GraphQLSchema;
+
+type TypeDefinitionsMap = { [key: string]: TypeDefinitionNode };
+type TypeResolver = (typeRef: NamedTypeNode) => GraphQLNamedType;
+
+export class ASTDefinitionBuilder {
+    constructor(typeDefinitionsMap: TypeDefinitionsMap, options: BuildSchemaOptions | void, resolveType: TypeResolver);
+
+    buildTypes(nodes: ReadonlyArray<NamedTypeNode | TypeDefinitionNode>): Array<GraphQLNamedType>;
+
+    buildType(node: NamedTypeNode | TypeDefinitionNode): GraphQLNamedType;
+
+    buildDirective(directiveNode: DirectiveDefinitionNode): GraphQLDirective;
+
+    buildField(field: FieldDefinitionNode): GraphQLFieldConfig<any, any>;
+}
 
 /**
  * Given an ast node, returns its string description.
@@ -35,12 +68,12 @@ export function buildASTSchema(ast: DocumentNode): GraphQLSchema;
  *
  */
 export function getDescription(
-    node: { description?: StringValueNode; loc?: Location },
-    options: BuildSchemaOptions
-): string;
+    node: { readonly description?: StringValueNode; readonly loc?: Location },
+    options: BuildSchemaOptions | void
+): string | undefined;
 
 /**
  * A helper function to build a GraphQLSchema directly from a source
  * document.
  */
-export function buildSchema(source: string | Source): GraphQLSchema;
+export function buildSchema(source: string | Source, options?: BuildSchemaOptions & ParseOptions): GraphQLSchema;
diff --git a/types/graphql/utilities/buildClientSchema.d.ts b/types/graphql/utilities/buildClientSchema.d.ts
index 80516c2111..128c34ca48 100644
--- a/types/graphql/utilities/buildClientSchema.d.ts
+++ b/types/graphql/utilities/buildClientSchema.d.ts
@@ -11,5 +11,8 @@ interface Options extends GraphQLSchemaValidationOptions {}
  * tools, but cannot be used to execute a query, as introspection does not
  * represent the "resolver", "parse" or "serialize" functions or any other
  * server-internal mechanisms.
+ *
+ * This function expects a complete introspection result. Don't forget to check
+ * the "errors" field of a server response before calling this function.
  */
 export function buildClientSchema(introspection: IntrospectionQuery, options?: Options): GraphQLSchema;
diff --git a/types/graphql/utilities/coerceValue.d.ts b/types/graphql/utilities/coerceValue.d.ts
new file mode 100644
index 0000000000..081eea4a32
--- /dev/null
+++ b/types/graphql/utilities/coerceValue.d.ts
@@ -0,0 +1,22 @@
+import { GraphQLError } from "../error";
+import { ASTNode } from "../language/ast";
+import { GraphQLInputType } from "../type/definition";
+
+interface CoercedValue {
+    readonly errors: ReadonlyArray<GraphQLError> | undefined;
+    readonly value: any;
+}
+
+interface Path {
+    readonly prev: Path | undefined;
+    readonly key: string | number;
+}
+
+/**
+ * Coerces a JavaScript value given a GraphQL Type.
+ *
+ * Returns either a value which is valid for the provided type or a list of
+ * encountered coercion errors.
+ *
+ */
+export function coerceValue(value: any, type: GraphQLInputType, blameNode?: ASTNode, path?: Path): CoercedValue;
diff --git a/types/graphql/utilities/concatAST.d.ts b/types/graphql/utilities/concatAST.d.ts
index 6e4c33aed5..08c5104076 100644
--- a/types/graphql/utilities/concatAST.d.ts
+++ b/types/graphql/utilities/concatAST.d.ts
@@ -5,4 +5,4 @@ import { DocumentNode } from "../language/ast";
  * concatenate the ASTs together into batched AST, useful for validating many
  * GraphQL source files which together represent one conceptual application.
  */
-export function concatAST(asts: DocumentNode[]): DocumentNode;
+export function concatAST(asts: ReadonlyArray<DocumentNode>): DocumentNode;
diff --git a/types/graphql/utilities/extendSchema.d.ts b/types/graphql/utilities/extendSchema.d.ts
index 027c4d5745..7cde767ed7 100644
--- a/types/graphql/utilities/extendSchema.d.ts
+++ b/types/graphql/utilities/extendSchema.d.ts
@@ -1,5 +1,17 @@
 import { DocumentNode } from "../language/ast";
 import { GraphQLSchema } from "../type/schema";
+import { GraphQLSchemaValidationOptions } from "../type/schema";
+
+interface Options extends GraphQLSchemaValidationOptions {
+    /**
+     * Descriptions are defined as preceding string literals, however an older
+     * experimental version of the SDL supported preceding comments as
+     * descriptions. Set to true to enable this deprecated behavior.
+     *
+     * Default: false
+     */
+    commentDescriptions?: boolean;
+}
 
 /**
  * Produces a new schema given an existing schema and a document which may
@@ -12,5 +24,11 @@ import { GraphQLSchema } from "../type/schema";
  *
  * This algorithm copies the provided schema, applying extensions while
  * producing the copy. The original schema remains unaltered.
+ *
+ * Accepts options as a third argument:
+ *
+ *    - commentDescriptions:
+ *        Provide true to use preceding comments as the description.
+ *
  */
-export function extendSchema(schema: GraphQLSchema, documentAST: DocumentNode): GraphQLSchema;
+export function extendSchema(schema: GraphQLSchema, documentAST: DocumentNode, options?: Options): GraphQLSchema;
diff --git a/types/graphql/utilities/findBreakingChanges.d.ts b/types/graphql/utilities/findBreakingChanges.d.ts
index 37b98dae34..77f98f848a 100644
--- a/types/graphql/utilities/findBreakingChanges.d.ts
+++ b/types/graphql/utilities/findBreakingChanges.d.ts
@@ -8,27 +8,44 @@ import {
     GraphQLUnionType,
     GraphQLNamedType,
 } from "../type/definition";
+import { GraphQLDirective } from "../type/directives";
 import { GraphQLSchema } from "../type/schema";
+import { DirectiveLocationEnum } from "../language/directiveLocation";
 
-export const BreakingChangeType: {
+export type 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";
+    ARG_REMOVED: "ARG_REMOVED";
+    ARG_CHANGED_KIND: "ARG_CHANGED_KIND";
+    NON_NULL_ARG_ADDED: "NON_NULL_ARG_ADDED";
+    NON_NULL_INPUT_FIELD_ADDED: "NON_NULL_INPUT_FIELD_ADDED";
+    INTERFACE_REMOVED_FROM_OBJECT: "INTERFACE_REMOVED_FROM_OBJECT";
+    DIRECTIVE_REMOVED: "DIRECTIVE_REMOVED";
+    DIRECTIVE_ARG_REMOVED: "DIRECTIVE_ARG_REMOVED";
+    DIRECTIVE_LOCATION_REMOVED: "DIRECTIVE_LOCATION_REMOVED";
+    NON_NULL_DIRECTIVE_ARG_ADDED: "NON_NULL_DIRECTIVE_ARG_ADDED";
 };
 
-export type BreakingChangeKey =
-    | "FIELD_CHANGED_KIND"
-    | "FIELD_REMOVED"
-    | "TYPE_CHANGED_KIND"
-    | "TYPE_REMOVED"
-    | "TYPE_REMOVED_FROM_UNION"
-    | "VALUE_REMOVED_FROM_ENUM";
+export type DangerousChangeType = {
+    ARG_DEFAULT_VALUE_CHANGE: "ARG_DEFAULT_VALUE_CHANGE";
+    VALUE_ADDED_TO_ENUM: "VALUE_ADDED_TO_ENUM";
+    INTERFACE_ADDED_TO_OBJECT: "INTERFACE_ADDED_TO_OBJECT";
+    TYPE_ADDED_TO_UNION: "TYPE_ADDED_TO_UNION";
+    NULLABLE_INPUT_FIELD_ADDED: "NULLABLE_INPUT_FIELD_ADDED";
+    NULLABLE_ARG_ADDED: "NULLABLE_ARG_ADDED";
+};
 
 export interface BreakingChange {
-    type: BreakingChangeKey;
+    type: keyof BreakingChangeType;
+    description: string;
+}
+
+export interface DangerousChange {
+    type: keyof DangerousChangeType;
     description: string;
 }
 
@@ -36,35 +53,102 @@ export interface BreakingChange {
  * 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): BreakingChange[];
+export function findBreakingChanges(oldSchema: GraphQLSchema, newSchema: GraphQLSchema): Array<BreakingChange>;
+
+/**
+ * Given two schemas, returns an Array containing descriptions of all the types
+ * of potentially dangerous changes covered by the other functions down below.
+ */
+export function findDangerousChanges(oldSchema: GraphQLSchema, newSchema: GraphQLSchema): Array<DangerousChange>;
 
 /**
  * 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): BreakingChange[];
+export function findRemovedTypes(oldSchema: GraphQLSchema, newSchema: GraphQLSchema): Array<BreakingChange>;
 
 /**
  * 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): BreakingChange[];
+export function findTypesThatChangedKind(oldSchema: GraphQLSchema, newSchema: GraphQLSchema): Array<BreakingChange>;
 
 /**
- * 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.
+ * Given two schemas, returns an Array containing descriptions of any
+ * breaking or dangerous changes in the newSchema related to arguments
+ * (such as removal or change of type of an argument, or a change in an
+ * argument's default value).
  */
-export function findFieldsThatChangedType(oldSchema: GraphQLSchema, newSchema: GraphQLSchema): BreakingChange[];
+export function findArgChanges(
+    oldSchema: GraphQLSchema,
+    newSchema: GraphQLSchema
+): {
+    breakingChanges: Array<BreakingChange>;
+    dangerousChanges: Array<DangerousChange>;
+};
+
+export function findFieldsThatChangedTypeOnObjectOrInterfaceTypes(
+    oldSchema: GraphQLSchema,
+    newSchema: GraphQLSchema
+): Array<BreakingChange>;
+
+export function findFieldsThatChangedTypeOnInputObjectTypes(
+    oldSchema: GraphQLSchema,
+    newSchema: GraphQLSchema
+): {
+    breakingChanges: Array<BreakingChange>;
+    dangerousChanges: Array<DangerousChange>;
+};
 
 /**
  * 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): BreakingChange[];
+export function findTypesRemovedFromUnions(oldSchema: GraphQLSchema, newSchema: GraphQLSchema): Array<BreakingChange>;
+
+/**
+ * Given two schemas, returns an Array containing descriptions of any dangerous
+ * changes in the newSchema related to adding types to a union type.
+ */
+export function findTypesAddedToUnions(oldSchema: GraphQLSchema, newSchema: GraphQLSchema): Array<DangerousChange>;
 
 /**
  * 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): BreakingChange[];
+export function findValuesRemovedFromEnums(oldSchema: GraphQLSchema, newSchema: GraphQLSchema): Array<BreakingChange>;
+
+/**
+ * Given two schemas, returns an Array containing descriptions of any dangerous
+ * changes in the newSchema related to adding values to an enum type.
+ */
+export function findValuesAddedToEnums(oldSchema: GraphQLSchema, newSchema: GraphQLSchema): Array<DangerousChange>;
+
+export function findInterfacesRemovedFromObjectTypes(
+    oldSchema: GraphQLSchema,
+    newSchema: GraphQLSchema
+): Array<BreakingChange>;
+
+export function findInterfacesAddedToObjectTypes(
+    oldSchema: GraphQLSchema,
+    newSchema: GraphQLSchema
+): Array<DangerousChange>;
+
+export function findRemovedDirectives(oldSchema: GraphQLSchema, newSchema: GraphQLSchema): Array<BreakingChange>;
+
+export function findRemovedDirectiveArgs(oldSchema: GraphQLSchema, newSchema: GraphQLSchema): Array<BreakingChange>;
+
+export function findAddedNonNullDirectiveArgs(
+    oldSchema: GraphQLSchema,
+    newSchema: GraphQLSchema
+): Array<BreakingChange>;
+
+export function findRemovedLocationsForDirective(
+    oldDirective: GraphQLDirective,
+    newDirective: GraphQLDirective
+): Array<DirectiveLocationEnum>;
+
+export function findRemovedDirectiveLocations(
+    oldSchema: GraphQLSchema,
+    newSchema: GraphQLSchema
+): Array<BreakingChange>;
diff --git a/types/graphql/utilities/getOperationAST.d.ts b/types/graphql/utilities/getOperationAST.d.ts
index 5a1e0dc7a7..81e9bd4cbe 100644
--- a/types/graphql/utilities/getOperationAST.d.ts
+++ b/types/graphql/utilities/getOperationAST.d.ts
@@ -5,4 +5,7 @@ import { DocumentNode, OperationDefinitionNode } from "../language/ast";
  * name. If a name is not provided, an operation is only returned if only one is
  * provided in the document.
  */
-export function getOperationAST(documentAST: DocumentNode, operationName?: string): OperationDefinitionNode;
+export function getOperationAST(
+    documentAST: DocumentNode,
+    operationName: string | void
+): OperationDefinitionNode | void;
diff --git a/types/graphql/utilities/index.d.ts b/types/graphql/utilities/index.d.ts
index 91777235d1..f571c3ab76 100644
--- a/types/graphql/utilities/index.d.ts
+++ b/types/graphql/utilities/index.d.ts
@@ -1,9 +1,17 @@
 // The GraphQL query recommended for a full schema introspection.
-export { introspectionQuery } from "./introspectionQuery";
 export {
+    getIntrospectionQuery,
+    // Deprecated, use getIntrospectionQuery()
+    introspectionQuery,
+} from "./introspectionQuery";
+
+export {
+    IntrospectionOptions,
     IntrospectionQuery,
     IntrospectionSchema,
     IntrospectionType,
+    IntrospectionInputType,
+    IntrospectionOutputType,
     IntrospectionScalarType,
     IntrospectionObjectType,
     IntrospectionInterfaceType,
@@ -11,6 +19,8 @@ export {
     IntrospectionEnumType,
     IntrospectionInputObjectType,
     IntrospectionTypeRef,
+    IntrospectionInputTypeRef,
+    IntrospectionOutputTypeRef,
     IntrospectionNamedTypeRef,
     IntrospectionListTypeRef,
     IntrospectionNonNullTypeRef,
@@ -23,24 +33,33 @@ export {
 // Gets the target Operation from a Document
 export { getOperationAST } from "./getOperationAST";
 
+// Convert a GraphQLSchema to an IntrospectionQuery
+export { introspectionFromSchema } from "./introspectionFromSchema";
+
 // Build a GraphQLSchema from an introspection result.
 export { buildClientSchema } from "./buildClientSchema";
 
 // Build a GraphQLSchema from GraphQL Schema language.
-export { buildASTSchema, buildSchema, getDescription } from "./buildASTSchema";
+export { buildASTSchema, buildSchema, getDescription, BuildSchemaOptions } from "./buildASTSchema";
 
 // Extends an existing GraphQLSchema from a parsed GraphQL Schema language AST.
 export { extendSchema } from "./extendSchema";
 
+// Sort a GraphQLSchema.
+export { lexicographicSortSchema } from "./lexicographicSortSchema";
+
 // Print a GraphQLSchema to GraphQL Schema language.
 export { printSchema, printType, printIntrospectionSchema } from "./schemaPrinter";
 
 // Create a GraphQLType from a GraphQL language AST.
 export { typeFromAST } from "./typeFromAST";
 
-// Create a JavaScript value from a GraphQL language AST.
+// Create a JavaScript value from a GraphQL language AST with a type.
 export { valueFromAST } from "./valueFromAST";
 
+// Create a JavaScript value from a GraphQL language AST without a type.
+export { valueFromASTUntyped } from "./valueFromASTUntyped";
+
 // Create a GraphQL language AST from a JavaScript value.
 export { astFromValue } from "./astFromValue";
 
@@ -48,7 +67,10 @@ export { astFromValue } from "./astFromValue";
 // the GraphQL type system.
 export { TypeInfo } from "./TypeInfo";
 
-// Determine if JavaScript values adhere to a GraphQL type.
+// Coerces a JavaScript value to a GraphQL type, or produces errors.
+export { coerceValue } from "./coerceValue";
+
+// @deprecated use coerceValue
 export { isValidJSValue } from "./isValidJSValue";
 
 // Determine if AST values adhere to a GraphQL type.
@@ -64,11 +86,17 @@ export { separateOperations } from "./separateOperations";
 export { isEqualType, isTypeSubTypeOf, doTypesOverlap } from "./typeComparators";
 
 // Asserts that a string is a valid GraphQL name
-export { assertValidName } from "./assertValidName";
+export { assertValidName, isValidNameError } from "./assertValidName";
 
 // Compares two GraphQLSchemas and detects breaking changes.
-export { findBreakingChanges } from "./findBreakingChanges";
-export { BreakingChange } from "./findBreakingChanges";
+export {
+    BreakingChangeType,
+    DangerousChangeType,
+    findBreakingChanges,
+    findDangerousChanges,
+    BreakingChange,
+    DangerousChange,
+} from "./findBreakingChanges";
 
 // Report all deprecated usage within a GraphQL document.
 export { findDeprecatedUsages } from "./findDeprecatedUsages";
diff --git a/types/graphql/utilities/introspectionFromSchema.d.ts b/types/graphql/utilities/introspectionFromSchema.d.ts
new file mode 100644
index 0000000000..8733a35087
--- /dev/null
+++ b/types/graphql/utilities/introspectionFromSchema.d.ts
@@ -0,0 +1,13 @@
+import { GraphQLSchema } from "../type/schema";
+import { IntrospectionQuery, IntrospectionOptions } from "./introspectionQuery";
+
+/**
+ * Build an IntrospectionQuery from a GraphQLSchema
+ *
+ * IntrospectionQuery is useful for utilities that care about type and field
+ * relationships, but do not need to traverse through those relationships.
+ *
+ * This is the inverse of buildClientSchema. The primary use case is outside
+ * of the server context, for instance when doing schema comparisons.
+ */
+export function introspectionFromSchema(schema: GraphQLSchema, options: IntrospectionOptions): IntrospectionQuery;
diff --git a/types/graphql/utilities/introspectionQuery.d.ts b/types/graphql/utilities/introspectionQuery.d.ts
index 10c3b0a200..750fe0d99c 100644
--- a/types/graphql/utilities/introspectionQuery.d.ts
+++ b/types/graphql/utilities/introspectionQuery.d.ts
@@ -1,110 +1,25 @@
-import { DirectiveLocationEnum } from "../type/directives";
+import { DirectiveLocationEnum } from "../language/directiveLocation";
 
-/*
-query IntrospectionQuery {
-    __schema {
-    queryType { name }
-    mutationType { name }
-    subscriptionType { name }
-    types {
-        ...FullType
-    }
-    directives {
-        name
-        description
-        locations
-        args {
-        ...InputValue
-        }
-    }
-    }
+export interface IntrospectionOptions {
+    // Whether to include descriptions in the introspection result.
+    // Default: true
+    descriptions: boolean;
 }
 
-fragment FullType on __Type {
-    kind
-    name
-    description
-    fields(includeDeprecated: true) {
-    name
-    description
-    args {
-        ...InputValue
-    }
-    type {
-        ...TypeRef
-    }
-    isDeprecated
-    deprecationReason
-    }
-    inputFields {
-    ...InputValue
-    }
-    interfaces {
-    ...TypeRef
-    }
-    enumValues(includeDeprecated: true) {
-    name
-    description
-    isDeprecated
-    deprecationReason
-    }
-    possibleTypes {
-    ...TypeRef
-    }
-}
+export function getIntrospectionQuery(options?: IntrospectionOptions): string;
 
-fragment InputValue on __InputValue {
-    name
-    description
-    type { ...TypeRef }
-    defaultValue
-}
-
-fragment TypeRef on __Type {
-    kind
-    name
-    ofType {
-    kind
-    name
-    ofType {
-        kind
-        name
-        ofType {
-        kind
-        name
-        ofType {
-            kind
-            name
-            ofType {
-            kind
-            name
-            ofType {
-                kind
-                name
-                ofType {
-                kind
-                name
-                }
-            }
-            }
-        }
-        }
-    }
-    }
-}
-*/
 export const introspectionQuery: string;
 
 export interface IntrospectionQuery {
-    __schema: IntrospectionSchema;
+    readonly __schema: IntrospectionSchema;
 }
 
 export interface IntrospectionSchema {
-    queryType: IntrospectionNamedTypeRef;
-    mutationType?: IntrospectionNamedTypeRef;
-    subscriptionType?: IntrospectionNamedTypeRef;
-    types: IntrospectionType[];
-    directives: IntrospectionDirective[];
+    readonly queryType: IntrospectionNamedTypeRef<IntrospectionObjectType>;
+    readonly mutationType: IntrospectionNamedTypeRef<IntrospectionObjectType> | void;
+    readonly subscriptionType: IntrospectionNamedTypeRef<IntrospectionObjectType> | void;
+    readonly types: ReadonlyArray<IntrospectionType>;
+    readonly directives: ReadonlyArray<IntrospectionDirective>;
 }
 
 export type IntrospectionType =
@@ -115,92 +30,114 @@ export type IntrospectionType =
     | IntrospectionEnumType
     | IntrospectionInputObjectType;
 
+export type IntrospectionOutputType =
+    | IntrospectionScalarType
+    | IntrospectionObjectType
+    | IntrospectionInterfaceType
+    | IntrospectionUnionType
+    | IntrospectionEnumType;
+
+export type IntrospectionInputType = IntrospectionScalarType | IntrospectionEnumType | IntrospectionInputObjectType;
+
 export interface IntrospectionScalarType {
-    kind: "SCALAR";
-    name: string;
-    description?: string;
+    readonly kind: "SCALAR";
+    readonly name: string;
+    readonly description?: string | void;
 }
 
 export interface IntrospectionObjectType {
-    kind: "OBJECT";
-    name: string;
-    description?: string;
-    fields: IntrospectionField[];
-    interfaces: IntrospectionNamedTypeRef[];
+    readonly kind: "OBJECT";
+    readonly name: string;
+    readonly description?: string | void;
+    readonly fields: ReadonlyArray<IntrospectionField>;
+    readonly interfaces: ReadonlyArray<IntrospectionNamedTypeRef<IntrospectionInterfaceType>>;
 }
 
 export interface IntrospectionInterfaceType {
-    kind: "INTERFACE";
-    name: string;
-    description?: string;
-    fields: IntrospectionField[];
-    possibleTypes: IntrospectionNamedTypeRef[];
+    readonly kind: "INTERFACE";
+    readonly name: string;
+    readonly description?: string | void;
+    readonly fields: ReadonlyArray<IntrospectionField>;
+    readonly possibleTypes: ReadonlyArray<IntrospectionNamedTypeRef<IntrospectionObjectType>>;
 }
 
 export interface IntrospectionUnionType {
-    kind: "UNION";
-    name: string;
-    description?: string;
-    possibleTypes: IntrospectionNamedTypeRef[];
+    readonly kind: "UNION";
+    readonly name: string;
+    readonly description?: string | void;
+    readonly possibleTypes: ReadonlyArray<IntrospectionNamedTypeRef<IntrospectionObjectType>>;
 }
 
 export interface IntrospectionEnumType {
-    kind: "ENUM";
-    name: string;
-    description?: string;
-    enumValues: IntrospectionEnumValue[];
+    readonly kind: "ENUM";
+    readonly name: string;
+    readonly description?: string | void;
+    readonly enumValues: ReadonlyArray<IntrospectionEnumValue>;
 }
 
 export interface IntrospectionInputObjectType {
-    kind: "INPUT_OBJECT";
-    name: string;
-    description?: string;
-    inputFields: IntrospectionInputValue[];
+    readonly kind: "INPUT_OBJECT";
+    readonly name: string;
+    readonly description?: string | void;
+    readonly inputFields: ReadonlyArray<IntrospectionInputValue>;
 }
 
-export type IntrospectionTypeRef = IntrospectionNamedTypeRef | IntrospectionListTypeRef | IntrospectionNonNullTypeRef;
-
-export interface IntrospectionNamedTypeRef {
-    kind: string;
-    name: string;
+export interface IntrospectionListTypeRef<T extends IntrospectionTypeRef = IntrospectionTypeRef> {
+    readonly kind: "LIST";
+    readonly ofType: T;
 }
 
-export interface IntrospectionListTypeRef {
-    kind: "LIST";
-    ofType?: IntrospectionTypeRef;
+export interface IntrospectionNonNullTypeRef<T extends IntrospectionTypeRef = IntrospectionTypeRef> {
+    readonly kind: "NON_NULL";
+    readonly ofType: T;
 }
 
-export interface IntrospectionNonNullTypeRef {
-    kind: "NON_NULL";
-    ofType?: IntrospectionTypeRef;
+export type IntrospectionTypeRef =
+    | IntrospectionNamedTypeRef<IntrospectionType>
+    | IntrospectionListTypeRef<any>
+    | IntrospectionNonNullTypeRef<IntrospectionNamedTypeRef<IntrospectionType> | IntrospectionListTypeRef<any>>;
+
+export type IntrospectionOutputTypeRef =
+    | IntrospectionNamedTypeRef<IntrospectionOutputType>
+    | IntrospectionListTypeRef<any>
+    | IntrospectionNonNullTypeRef<IntrospectionNamedTypeRef<IntrospectionOutputType> | IntrospectionListTypeRef<any>>;
+
+export type IntrospectionInputTypeRef =
+    | IntrospectionNamedTypeRef<IntrospectionInputType>
+    | IntrospectionListTypeRef<any>
+    | IntrospectionNonNullTypeRef<IntrospectionNamedTypeRef<IntrospectionInputType> | IntrospectionListTypeRef<any>>;
+
+export interface IntrospectionNamedTypeRef<T extends IntrospectionType = IntrospectionType> {
+    readonly kind: T["kind"];
+    readonly name: string;
 }
 
 export interface IntrospectionField {
-    name: string;
-    description?: string;
-    args: IntrospectionInputValue[];
-    type: IntrospectionTypeRef;
-    isDeprecated: boolean;
-    deprecationReason?: string;
+    readonly name: string;
+    readonly description?: string | void;
+    readonly args: ReadonlyArray<IntrospectionInputValue>;
+    readonly type: IntrospectionOutputTypeRef;
+    readonly isDeprecated: boolean;
+    readonly deprecationReason?: string | void;
 }
 
 export interface IntrospectionInputValue {
-    name: string;
-    description?: string;
-    type: IntrospectionTypeRef;
-    defaultValue?: string;
+    readonly name: string;
+    readonly description?: string | void;
+    readonly type: IntrospectionInputTypeRef;
+    readonly defaultValue?: string | void;
 }
 
 export interface IntrospectionEnumValue {
-    name: string;
-    description?: string;
-    isDeprecated: boolean;
-    deprecationReason?: string;
+    readonly name: string;
+    readonly description?: string | void;
+    readonly isDeprecated: boolean;
+    readonly deprecationReason?: string | void;
 }
 
 export interface IntrospectionDirective {
-    name: string;
-    description?: string;
-    locations: DirectiveLocationEnum[];
-    args: IntrospectionInputValue[];
+    readonly name: string;
+    readonly description?: string | void;
+    readonly locations: ReadonlyArray<DirectiveLocationEnum>;
+    readonly args: ReadonlyArray<IntrospectionInputValue>;
 }
diff --git a/types/graphql/utilities/isValidJSValue.d.ts b/types/graphql/utilities/isValidJSValue.d.ts
index 557429c7f4..d45d104ffd 100644
--- a/types/graphql/utilities/isValidJSValue.d.ts
+++ b/types/graphql/utilities/isValidJSValue.d.ts
@@ -1,8 +1,6 @@
 import { GraphQLInputType } from "../type/definition";
 
 /**
- * Given a JavaScript value and a GraphQL type, determine if the value will be
- * accepted for that type. This is primarily useful for validating the
- * runtime values of query variables.
+ * Deprecated. Use coerceValue() directly for richer information.
  */
 export function isValidJSValue(value: any, type: GraphQLInputType): string[];
diff --git a/types/graphql/utilities/isValidLiteralValue.d.ts b/types/graphql/utilities/isValidLiteralValue.d.ts
index bf54f6bb22..6a9275bce9 100644
--- a/types/graphql/utilities/isValidLiteralValue.d.ts
+++ b/types/graphql/utilities/isValidLiteralValue.d.ts
@@ -1,11 +1,10 @@
+import { GraphQLError } from "../error/GraphQLError";
 import { ValueNode } from "../language/ast";
 import { GraphQLInputType } from "../type/definition";
 
 /**
- * Utility for validators which determines if a value literal AST is valid given
- * an input type.
+ * Utility which determines if a value literal node is valid for an input type.
  *
- * Note that this only validates literal values, variables are assumed to
- * provide values of the correct type.
+ * Deprecated. Rely on validation for documents containing literal values.
  */
-export function isValidLiteralValue(type: GraphQLInputType, valueNode: ValueNode): string[];
+export function isValidLiteralValue(type: GraphQLInputType, valueNode: ValueNode): ReadonlyArray<GraphQLError>;
diff --git a/types/graphql/utilities/lexicographicSortSchema.d.ts b/types/graphql/utilities/lexicographicSortSchema.d.ts
new file mode 100644
index 0000000000..24ec208bba
--- /dev/null
+++ b/types/graphql/utilities/lexicographicSortSchema.d.ts
@@ -0,0 +1,6 @@
+import { GraphQLSchema } from "../type/schema";
+
+/**
+ * Sort GraphQLSchema.
+ */
+export function lexicographicSortSchema(schema: GraphQLSchema): GraphQLSchema;
diff --git a/types/graphql/utilities/schemaPrinter.d.ts b/types/graphql/utilities/schemaPrinter.d.ts
index d49e6aee58..8e3aefe7fc 100644
--- a/types/graphql/utilities/schemaPrinter.d.ts
+++ b/types/graphql/utilities/schemaPrinter.d.ts
@@ -1,12 +1,19 @@
 import { GraphQLSchema } from "../type/schema";
-import { GraphQLType } from "../type/definition";
+import { GraphQLType, GraphQLNamedType } from "../type/definition";
 
-export interface PrinterOptions {
+export interface Options {
     commentDescriptions?: boolean;
 }
 
-export function printSchema(schema: GraphQLSchema, options?: PrinterOptions): string;
+/**
+ * Accepts options as a second argument:
+ *
+ *    - commentDescriptions:
+ *        Provide true to use preceding comments as the description.
+ *
+ */
+export function printSchema(schema: GraphQLSchema, options?: Options): string;
 
-export function printIntrospectionSchema(schema: GraphQLSchema, options?: PrinterOptions): string;
+export function printIntrospectionSchema(schema: GraphQLSchema, options?: Options): string;
 
-export function printType(type: GraphQLType, options?: PrinterOptions): string;
+export function printType(type: GraphQLNamedType, options?: Options): string;
diff --git a/types/graphql/utilities/separateOperations.d.ts b/types/graphql/utilities/separateOperations.d.ts
index 8269b22d75..6035084860 100644
--- a/types/graphql/utilities/separateOperations.d.ts
+++ b/types/graphql/utilities/separateOperations.d.ts
@@ -1,3 +1,9 @@
 import { DocumentNode, OperationDefinitionNode } from "../language/ast";
 
-export function separateOperations(documentAST: DocumentNode): { [operationName: string]: DocumentNode };
+/**
+ * separateOperations accepts a single AST document which may contain many
+ * operations and fragments and returns a collection of AST documents each of
+ * which contains a single operation as well the fragment definitions it
+ * refers to.
+ */
+export function separateOperations(documentAST: DocumentNode): { [key: string]: DocumentNode };
diff --git a/types/graphql/utilities/typeFromAST.d.ts b/types/graphql/utilities/typeFromAST.d.ts
index 79b7b24a38..f2adaa7762 100644
--- a/types/graphql/utilities/typeFromAST.d.ts
+++ b/types/graphql/utilities/typeFromAST.d.ts
@@ -1,5 +1,16 @@
-import { TypeNode } from "../language/ast";
-import { GraphQLType, GraphQLNullableType } from "../type/definition";
+import { TypeNode, NamedTypeNode, ListTypeNode, NonNullTypeNode } from "../language/ast";
+import { GraphQLType, GraphQLNullableType, GraphQLNamedType, GraphQLList, GraphQLNonNull } from "../type/definition";
 import { GraphQLSchema } from "../type/schema";
 
-export function typeFromAST(schema: GraphQLSchema, typeNode: TypeNode): GraphQLType;
+/**
+ * Given a Schema and an AST node describing a type, return a GraphQLType
+ * definition which applies to that type. For example, if provided the parsed
+ * AST node for `[User]`, a GraphQLList instance will be returned, containing
+ * the type called "User" found in the schema. If a type called "User" is not
+ * found in the schema, then undefined will be returned.
+ */
+export function typeFromAST(schema: GraphQLSchema, typeNode: NamedTypeNode): GraphQLNamedType | undefined;
+
+export function typeFromAST(schema: GraphQLSchema, typeNode: ListTypeNode): GraphQLList<any> | undefined;
+
+export function typeFromAST(schema: GraphQLSchema, typeNode: NonNullTypeNode): GraphQLNonNull<any> | undefined;
diff --git a/types/graphql/utilities/valueFromAST.d.ts b/types/graphql/utilities/valueFromAST.d.ts
index e0b06b0506..cd67108aad 100644
--- a/types/graphql/utilities/valueFromAST.d.ts
+++ b/types/graphql/utilities/valueFromAST.d.ts
@@ -1,10 +1,28 @@
 import { GraphQLInputType } from "../type/definition";
 import { ValueNode, VariableNode, ListValueNode, ObjectValueNode } from "../language/ast";
 
+/**
+ * Produces a JavaScript value given a GraphQL Value AST.
+ *
+ * A GraphQL type must be provided, which will be used to interpret different
+ * GraphQL Value literals.
+ *
+ * Returns `undefined` when the value could not be validly coerced according to
+ * the provided type.
+ *
+ * | GraphQL Value        | JSON Value    |
+ * | -------------------- | ------------- |
+ * | Input Object         | Object        |
+ * | List                 | Array         |
+ * | Boolean              | Boolean       |
+ * | String               | String        |
+ * | Int / Float          | Number        |
+ * | Enum Value           | Mixed         |
+ * | NullValue            | null          |
+ *
+ */
 export function valueFromAST(
-    valueNode: ValueNode,
+    valueNode: ValueNode | void,
     type: GraphQLInputType,
-    variables?: {
-        [key: string]: any;
-    }
+    variables?: { [key: string]: any } | void
 ): any;
diff --git a/types/graphql/utilities/valueFromASTUntyped.d.ts b/types/graphql/utilities/valueFromASTUntyped.d.ts
new file mode 100644
index 0000000000..98d3137694
--- /dev/null
+++ b/types/graphql/utilities/valueFromASTUntyped.d.ts
@@ -0,0 +1,19 @@
+import { ValueNode } from "../language/ast";
+
+/**
+ * Produces a JavaScript value given a GraphQL Value AST.
+ *
+ * Unlike `valueFromAST()`, no type is provided. The resulting JavaScript value
+ * will reflect the provided GraphQL value AST.
+ *
+ * | GraphQL Value        | JavaScript Value |
+ * | -------------------- | ---------------- |
+ * | Input Object         | Object           |
+ * | List                 | Array            |
+ * | Boolean              | Boolean          |
+ * | String / Enum        | String           |
+ * | Int / Float          | Number           |
+ * | Null                 | null             |
+ *
+ */
+export function valueFromASTUntyped(valueNode: ValueNode, variables?: { [key: string]: any } | void): any;

From 2a02f2f7eeeb78a7131cd674902d20d4dde3fca6 Mon Sep 17 00:00:00 2001
From: Firede <firede@firede.us>
Date: Wed, 28 Mar 2018 00:52:32 +0800
Subject: [PATCH 0887/1382] update `graphql/graphql` -> `v0.13.2`.

https://github.com/graphql/graphql-js/blob/v0.13.2/src/graphql.js
---
 types/graphql/graphql.d.ts | 43 +++++++++++++++++++++++++-------------
 1 file changed, 29 insertions(+), 14 deletions(-)

diff --git a/types/graphql/graphql.d.ts b/types/graphql/graphql.d.ts
index 386cdd9e1b..7282ea80f2 100644
--- a/types/graphql/graphql.d.ts
+++ b/types/graphql/graphql.d.ts
@@ -33,25 +33,40 @@ import { ExecutionResult } from "./execution/execute";
  *    If not provided, the default field resolver is used (which looks for a
  *    value or method on the source value with the field's name).
  */
-export function graphql(args: {
+export interface GraphQLArgs {
     schema: GraphQLSchema;
-    source: string | Source;
+    source: Source | string;
     rootValue?: any;
     contextValue?: any;
-    variableValues?: {
-        [key: string]: any;
-    };
-    operationName?: string;
-    fieldResolver?: GraphQLFieldResolver<any, any>;
-}): Promise<ExecutionResult>;
+    variableValues?: { [key: string]: any } | void;
+    operationName?: string | void;
+    fieldResolver?: GraphQLFieldResolver<any, any> | void;
+}
+
+export function graphql(args: GraphQLArgs): Promise<ExecutionResult>;
 export function graphql(
     schema: GraphQLSchema,
-    source: string | Source,
+    source: Source | string,
     rootValue?: any,
     contextValue?: any,
-    variableValues?: {
-        [key: string]: any;
-    },
-    operationName?: string,
-    fieldResolver?: GraphQLFieldResolver<any, any>
+    variableValues?: { [key: string]: any } | void,
+    operationName?: string | void,
+    fieldResolver?: GraphQLFieldResolver<any, any> | void
 ): Promise<ExecutionResult>;
+
+/**
+ * The graphqlSync function also fulfills GraphQL operations by parsing,
+ * validating, and executing a GraphQL document along side a GraphQL schema.
+ * However, it guarantees to complete synchronously (or throw an error) assuming
+ * that all field resolvers are also synchronous.
+ */
+export function graphqlSync(args: GraphQLArgs): ExecutionResult;
+export function graphqlSync(
+    schema: GraphQLSchema,
+    source: Source | string,
+    rootValue?: any,
+    contextValue?: any,
+    variableValues?: { [key: string]: any } | void,
+    operationName?: string | void,
+    fieldResolver?: GraphQLFieldResolver<any, any> | void
+): ExecutionResult;

From 20b6406514e34d59f0b913973ef7725613d3224b Mon Sep 17 00:00:00 2001
From: nickp10 <nickp10@hotmail.com>
Date: Tue, 27 Mar 2018 11:23:23 -0600
Subject: [PATCH 0888/1382] Add types for the jwt-express package

---
 types/jwt-express/index.d.ts           | 221 +++++++++++++++++++++++++
 types/jwt-express/jwt-express-tests.ts |  54 ++++++
 types/jwt-express/tsconfig.json        |  24 +++
 types/jwt-express/tslint.json          |   1 +
 4 files changed, 300 insertions(+)
 create mode 100644 types/jwt-express/index.d.ts
 create mode 100644 types/jwt-express/jwt-express-tests.ts
 create mode 100644 types/jwt-express/tsconfig.json
 create mode 100644 types/jwt-express/tslint.json

diff --git a/types/jwt-express/index.d.ts b/types/jwt-express/index.d.ts
new file mode 100644
index 0000000000..78e69c8a28
--- /dev/null
+++ b/types/jwt-express/index.d.ts
@@ -0,0 +1,221 @@
+// Type definitions for jwt-express 1.1
+// Project: https://github.com/AustP/jwt-express#readme
+// Definitions by: Nick Paddock <https://github.com/nickp10>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import express = require("express");
+import jsonwebtoken = require("jsonwebtoken");
+
+declare global {
+    namespace Express {
+        interface Request {
+            jwt: JWT;
+        }
+
+        interface JWT {
+            /**
+             * Indicates if the JWT is expired. valid will always be false if this is true.
+             */
+            expired: boolean;
+
+            /**
+             * The jwt-express options.
+             */
+            options: JWTExpressOptions;
+
+            /**
+             * The payload of the JWT (must be an object). jwt-express will add a stales key-value pair to the payload for stale.
+             */
+            payload: any;
+
+            /**
+             * The secret used to sign /verify the JWT.
+             */
+            secret: string;
+
+            /**
+             * Indicates if the JWT is stale. The default timeout before a JWT is considered stale is 15 minutes.
+             */
+            stale: boolean;
+
+            /**
+             * The signed token of the JWT.
+             */
+            token: string;
+
+            /**
+             * Indicates if this JWT is valid. This means that the payload hasn't been tampered with and that the JWT hasn't expired yet.
+             */
+            valid: boolean;
+
+            /**
+             * Resigns this JWT Objects's payload.
+             *
+             * @return this
+             */
+            resign(): JWT;
+
+            /**
+             * Calls the revoke function defined in the jwt.init() options with this JWT Object as the first parameter.
+             *
+             * @return this
+             */
+            revoke(): JWT;
+
+            /**
+             * Generates a signed token from the payload.
+             *
+             * @param payload The payload of the JWT (must be an object).
+             * @return this
+             */
+            sign(payload: any): JWT;
+
+            /**
+             * Stores this JWT in the cookie (if configured to use cookies).
+             *
+             * @param res The response in which to store the JWT.
+             * @return this
+             */
+            store(res: express.Response): JWT;
+
+            /**
+             * This function is called when the jwt is passed through JSON.stringify.
+             * We don't want the secret or options to be stringified.
+             *
+             * @return The JSON form of the object.
+             */
+            toJSON(): any;
+
+            /**
+             * Verify the token and load the info into this JWT.
+             *
+             * @param token The signed token to verify.
+             * @return this
+             */
+            verify(token: string): JWT;
+        }
+
+        interface JWTExpressOptions {
+            /**
+             * The name of the cookie (default: 'jwt-express')
+             */
+            cookie?: string;
+
+            /**
+             * Options to use when storing the cookie (default: {httpOnly: true})
+             */
+            cookieOptions?: express.CookieOptions;
+
+            /**
+             * If true, will use cookies, otherwise will use the Authorization header (default: true)
+             */
+            cookies?: boolean;
+
+            /**
+             * Indicates if the JWT should be refreshed and stored every request (default: true)
+             */
+            refresh?: boolean;
+
+            /**
+             * The property of req to populate (default: 'jwt')
+             */
+            reqProperty?: string;
+
+            /**
+             * jwt.revoke() will call this function (default: function(jwt) {})
+             */
+            revoke?: (jwt: JWT) => void;
+
+            /**
+             * Options to use when signing the JWT (default: {})
+             */
+            signOptions?: jsonwebtoken.SignOptions;
+
+            /**
+             * Milliseconds when the jwt will go stale (default: 900000 (15 minutes))
+             */
+            stales?: number;
+
+            /**
+             * Additional verification. Must return a boolean (default: function(jwt) {return true})
+             */
+            verify?: (jwt: JWT) => boolean;
+
+            /**
+             * Options to use when verifying the JWT (default: {})
+             */
+            verifyOptions?: jsonwebtoken.VerifyOptions;
+        }
+    }
+}
+
+export let options: Express.JWTExpressOptions;
+
+/**
+ * Returns a middleware function that ensures a JWT is valid and fresh. Useful to protect
+ * sensitive actions from CSRF. This method will trigger error handling if the JWT is not active.
+ *
+ * @return Express middleware
+ */
+export function active(): express.RequestHandler;
+
+/**
+ * If using cookies, this method will clear the current JWT out of the cookie.
+ *
+ * @return Express middleware
+ */
+export function clear(): express.RequestHandler;
+
+/**
+ * Returns a newly created / signed JWT Object from the payload.
+ *
+ * @param secret
+ * If secret is a string, that string will be used to verify / sign with.
+ * If secret is a function, that function will be called with the payload as its first parameter,
+ * and must return a string which will be used to verify / sign with.
+ * @param payload The payload of the JWT.
+ * @return JWT
+ */
+export function create(secret: string | ((payload: any) => string), payload: any): Express.JWT;
+
+/**
+ * The jwt.init() function returns a middleware function for Express so it must be called inside app.use().
+ * It will automatically read in the JWT from either the cookie or the Authorization header (configured by you)
+ * and add a JWT object to the Request object (req). It will also add the jwt() method to the Response object (res)
+ * to create / store JWTs. jwt.init() must be called before any other jwt method.
+ *
+ * @param secret
+ * If secret is a string, that string will be used to verify / sign with.
+ * If secret is a function, that function will be called with the Express HTTP Request as its first parameter,
+ * and must return a string which will be used to verify / sign with.
+ * @param options The options of jwt-express.
+ * @return Express middleware
+ */
+export function init(secret: string | ((req: express.Request) => string), options?: Express.JWTExpressOptions): express.RequestHandler;
+
+/**
+ * Returns a middleware function that requires the payload to contain / match certain data.
+ * This method will trigger error handling if the JWT fails the requirement.
+ *
+ * @param key
+ * This is they key used to look up the value in the payload.
+ * If only this value is passed to jwt.require(), then the middleware function will check that the value is truthy.
+ * @param operator The operator to compare the information
+ * @param value The value to compare the payload data against
+ * @return Express middleware
+ */
+export function require(key: string, operator?: string, value?: any): express.RequestHandler;
+
+/**
+ * Returns a middleware function that ensures a JWT is valid. This method will trigger error handling if the JWT is not valid.
+ *
+ * @return Express middleware
+ */
+export function valid(): express.RequestHandler;
+
+export interface JWTExpressError extends Error {
+    name: string;
+    message: string;
+}
diff --git a/types/jwt-express/jwt-express-tests.ts b/types/jwt-express/jwt-express-tests.ts
new file mode 100644
index 0000000000..c604dde550
--- /dev/null
+++ b/types/jwt-express/jwt-express-tests.ts
@@ -0,0 +1,54 @@
+import express = require("express");
+import jwt = require("jwt-express");
+
+const app = express();
+
+app.use(jwt.active());
+app.use(jwt.clear());
+let jwtObj = jwt.create("Secret", { });
+jwtObj = jwt.create((p) => "Secret", { });
+app.use(jwt.init("Secret"));
+app.use(jwt.init(req => "Secret"));
+app.use(jwt.init("Secret", {
+    cookie: "jwt-express",
+    cookieOptions: {
+        httpOnly: true
+    },
+    cookies: true,
+    refresh: true,
+    reqProperty: "jwt",
+    revoke: (revokeJWT) => { jwtObj = revokeJWT; },
+    signOptions: {
+        expiresIn: "1h"
+    },
+    stales: 1000,
+    verify: (verifyJWT) => { jwtObj = verifyJWT; return true; },
+    verifyOptions: {
+        ignoreExpiration: true
+    }
+}));
+app.use(jwt.require("key"));
+app.use(jwt.require("key", "==", "value"));
+app.use(jwt.valid());
+
+let resObj: express.Response = <any> {};
+app.use((err: jwt.JWTExpressError, req: express.Request, res: express.Response, next: express.NextFunction) => {
+    err.message.startsWith("");
+    err.name.startsWith("");
+    resObj = res;
+});
+
+jwtObj.expired.valueOf();
+app.use(jwt.init(req => "Secret", jwtObj.options));
+jwtObj.payload;
+jwtObj.secret.startsWith("");
+jwtObj.stale.valueOf();
+jwtObj.token.startsWith("");
+jwtObj.valid.valueOf();
+
+jwtObj = jwtObj.resign();
+jwtObj = jwtObj.revoke();
+jwtObj = jwtObj.sign(jwtObj.payload);
+jwtObj = jwtObj.store(resObj);
+jwtObj = jwtObj.verify(jwtObj.token);
+jwtObj.toJSON();
diff --git a/types/jwt-express/tsconfig.json b/types/jwt-express/tsconfig.json
new file mode 100644
index 0000000000..293e5e4548
--- /dev/null
+++ b/types/jwt-express/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "target": "es6",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "jwt-express-tests.ts"
+    ]
+}
diff --git a/types/jwt-express/tslint.json b/types/jwt-express/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/jwt-express/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 06163d88898bbed112af9d288806a1486230ba42 Mon Sep 17 00:00:00 2001
From: nickp10 <nickp10@hotmail.com>
Date: Tue, 27 Mar 2018 11:34:37 -0600
Subject: [PATCH 0889/1382] Fix the TypeScript version to match express

---
 types/jwt-express/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/jwt-express/index.d.ts b/types/jwt-express/index.d.ts
index 78e69c8a28..dcb579e804 100644
--- a/types/jwt-express/index.d.ts
+++ b/types/jwt-express/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/AustP/jwt-express#readme
 // Definitions by: Nick Paddock <https://github.com/nickp10>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 /// <reference types="node" />
 

From ac7ab1c5c357cfd4c20d7450ebc637dc0ee896dd Mon Sep 17 00:00:00 2001
From: Scott Davis <scottd@collegenet.com>
Date: Tue, 27 Mar 2018 10:49:50 -0700
Subject: [PATCH 0890/1382] Types for eventsource

---
 types/eventsource/eventsource-tests.ts        | 15 ++++++++
 types/eventsource/index.d.ts                  | 35 +++++++++++++++++++
 .../lib/eventsource-polyfill/index.d.ts       | 29 +++++++++++++++
 types/eventsource/tsconfig.json               | 25 +++++++++++++
 types/eventsource/tslint.json                 |  1 +
 5 files changed, 105 insertions(+)
 create mode 100644 types/eventsource/eventsource-tests.ts
 create mode 100644 types/eventsource/index.d.ts
 create mode 100644 types/eventsource/lib/eventsource-polyfill/index.d.ts
 create mode 100644 types/eventsource/tsconfig.json
 create mode 100644 types/eventsource/tslint.json

diff --git a/types/eventsource/eventsource-tests.ts b/types/eventsource/eventsource-tests.ts
new file mode 100644
index 0000000000..b476e112a8
--- /dev/null
+++ b/types/eventsource/eventsource-tests.ts
@@ -0,0 +1,15 @@
+import * as EventSource from "eventsource";
+
+const eventSource = new EventSource("http://foobar");
+eventSource.onmessage = (x: any) => {};
+eventSource.onerror = (x: any) => {};
+eventSource.onopen = (x: any) => {};
+eventSource.close();
+
+import * as EventSourcePolyfill from "eventsource/lib/eventsource-polyfill";
+
+const eventSourcePolyfill = new EventSourcePolyfill("http://foobar");
+eventSourcePolyfill.onmessage = (x: any) => {};
+eventSourcePolyfill.onerror = (x: any) => {};
+eventSourcePolyfill.onopen = (x: any) => {};
+eventSourcePolyfill.close();
diff --git a/types/eventsource/index.d.ts b/types/eventsource/index.d.ts
new file mode 100644
index 0000000000..3620b6116f
--- /dev/null
+++ b/types/eventsource/index.d.ts
@@ -0,0 +1,35 @@
+// Type definitions for eventsource 1.0
+// Project: http://github.com/EventSource/eventsource
+// Definitions by: Scott Lee Davis <https://github.com/scottleedavis>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+declare class EventSource {
+  constructor(url: string, eventSourceInitDict?: EventSource.EventSourceInitDict);
+
+  static CLOSED: EventSource.ReadyState;
+  static CONNECTING: EventSource.ReadyState;
+  static OPEN: EventSource.ReadyState;
+
+  url: string;
+  readyState: EventSource.ReadyState;
+  onopen: EventListener;
+  onmessage: EventListener;
+  onerror: EventListener;
+  close(): void;
+}
+
+declare namespace EventSource {
+  enum ReadyState {CONNECTING = 0, OPEN = 1, CLOSED = 2}
+
+  interface EventSourceInitDict {
+    withCredentials?: boolean;
+    headers?: object;
+    proxy?: string;
+    https?: object;
+    rejectUnauthorized?: boolean;
+  }
+}
+
+export = EventSource;
+export as namespace EventSource;
diff --git a/types/eventsource/lib/eventsource-polyfill/index.d.ts b/types/eventsource/lib/eventsource-polyfill/index.d.ts
new file mode 100644
index 0000000000..6246355dfe
--- /dev/null
+++ b/types/eventsource/lib/eventsource-polyfill/index.d.ts
@@ -0,0 +1,29 @@
+declare class EventSource {
+  constructor(url: string, eventSourceInitDict?: EventSource.EventSourceInitDict);
+
+  static CLOSED: EventSource.ReadyState;
+  static CONNECTING: EventSource.ReadyState;
+  static OPEN: EventSource.ReadyState;
+
+  url: string;
+  readyState: EventSource.ReadyState;
+  onopen: EventListener;
+  onmessage: EventListener;
+  onerror: EventListener;
+  close(): void;
+}
+
+declare namespace EventSource {
+  enum ReadyState {CONNECTING = 0, OPEN = 1, CLOSED = 2}
+
+  interface EventSourceInitDict {
+    withCredentials?: boolean;
+    headers?: object;
+    proxy?: string;
+    https?: object;
+    rejectUnauthorized?: boolean;
+  }
+}
+
+export = EventSource;
+export as namespace EventSource;
diff --git a/types/eventsource/tsconfig.json b/types/eventsource/tsconfig.json
new file mode 100644
index 0000000000..440f5427c3
--- /dev/null
+++ b/types/eventsource/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": false,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "eventsource-tests.ts",
+        "lib/eventsource-polyfill/index.d.ts"
+    ]
+}
diff --git a/types/eventsource/tslint.json b/types/eventsource/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/eventsource/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From f8543da289e25dc8568714f9e8c6c747bb539157 Mon Sep 17 00:00:00 2001
From: Michael Zlatkovsky <Zlatkovsky@users.noreply.github.com>
Date: Tue, 27 Mar 2018 10:58:20 -0700
Subject: [PATCH 0891/1382] Add placeholder comment markers for ease of tooling

---
 types/office-js/index.d.ts | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 3b1173505d..3e8fa0d012 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -8,6 +8,11 @@ office-js
 Copyright (c) Microsoft Corporation
 */
 
+
+////////////////////////////////////////////////////////////////
+//////////////////// Begin Office namespace ////////////////////
+////////////////////////////////////////////////////////////////
+
 declare namespace Office {
     export var context: Context;
     /**
@@ -1548,6 +1553,12 @@ declare namespace Office {
 }
 
 
+////////////////////////////////////////////////////////////////
+///////////////////// End Office namespace /////////////////////
+////////////////////////////////////////////////////////////////
+
+
+////////////////////////////////////////////////////////////////
 
 
 ////////////////////////////////////////////////////////////////
@@ -2886,6 +2897,18 @@ declare namespace OfficeExtension {
 }
 
 
+////////////////////////////////////////////////////////////////
+///////////////// End OfficeExtension runtime //////////////////
+////////////////////////////////////////////////////////////////
+
+
+////////////////////////////////////////////////////////////////
+
+
+////////////////////////////////////////////////////////////////
+////////////////////// Begin OfficeCore ////////////////////////
+////////////////////////////////////////////////////////////////
+
 
 declare namespace OfficeCore {
     /**
@@ -2960,7 +2983,7 @@ declare namespace OfficeCore {
 
 
 ////////////////////////////////////////////////////////////////
-///////////////// End OfficeExtension runtime //////////////////
+/////////////////////// End OfficeCore /////////////////////////
 ////////////////////////////////////////////////////////////////
 
 
@@ -22317,6 +22340,10 @@ declare namespace OneNote {
 
 
 
+////////////////////////////////////////////////////////////////
+
+
+
 ////////////////////////////////////////////////////////////////
 /////////////////////// Begin Visio APIs ///////////////////////
 ////////////////////////////////////////////////////////////////

From 30bb434d2f8d2e13631d7f9b044b9de26b9e55d2 Mon Sep 17 00:00:00 2001
From: Scott Davis <scottd@collegenet.com>
Date: Tue, 27 Mar 2018 11:00:49 -0700
Subject: [PATCH 0892/1382] configured tslint up to spec.

---
 types/eventsource/tsconfig.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/eventsource/tsconfig.json b/types/eventsource/tsconfig.json
index 440f5427c3..4a714cf00a 100644
--- a/types/eventsource/tsconfig.json
+++ b/types/eventsource/tsconfig.json
@@ -6,8 +6,8 @@
             "dom"
         ],
         "noImplicitAny": true,
-        "noImplicitThis": false,
-        "strictNullChecks": false,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [

From a3021f80409f7f797bb32fa6f613e9da81dfd9f5 Mon Sep 17 00:00:00 2001
From: Firede <firede@firede.us>
Date: Wed, 28 Mar 2018 02:01:32 +0800
Subject: [PATCH 0893/1382] update `graphql/validation/*` -> `v0.13.2`.

https://github.com/graphql/graphql-js/tree/v0.13.2/src/validation
---
 .../graphql/validation/ValidationContext.d.ts | 63 +++++++++++++++
 types/graphql/validation/index.d.ts           | 18 +++--
 .../rules/ArgumentsOfCorrectType.d.ts         |  9 ---
 .../rules/DefaultValuesOfCorrectType.d.ts     |  9 ---
 .../rules/ExecutableDefinitions.d.ts          | 12 +++
 .../validation/rules/FieldsOnCorrectType.d.ts |  5 +-
 .../rules/FragmentsOnCompositeTypes.d.ts      | 10 ++-
 .../validation/rules/KnownArgumentNames.d.ts  | 18 ++++-
 .../validation/rules/KnownDirectives.d.ts     |  9 ++-
 .../validation/rules/KnownFragmentNames.d.ts  |  7 +-
 .../validation/rules/KnownTypeNames.d.ts      |  7 +-
 .../rules/LoneAnonymousOperation.d.ts         |  7 +-
 .../validation/rules/NoFragmentCycles.d.ts    |  7 +-
 .../rules/NoUndefinedVariables.d.ts           |  7 +-
 .../validation/rules/NoUnusedFragments.d.ts   |  7 +-
 .../validation/rules/NoUnusedVariables.d.ts   |  7 +-
 .../rules/OverlappingFieldsCanBeMerged.d.ts   | 13 ++-
 .../rules/PossibleFragmentSpreads.d.ts        | 10 ++-
 .../rules/ProvidedNonNullArguments.d.ts       | 10 ++-
 .../graphql/validation/rules/ScalarLeafs.d.ts | 10 ++-
 .../rules/SingleFieldSubscriptions.d.ts       |  7 +-
 .../validation/rules/UniqueArgumentNames.d.ts |  7 +-
 .../rules/UniqueDirectivesPerLocation.d.ts    |  7 +-
 .../validation/rules/UniqueFragmentNames.d.ts |  7 +-
 .../rules/UniqueInputFieldNames.d.ts          |  7 +-
 .../rules/UniqueOperationNames.d.ts           |  7 +-
 .../validation/rules/UniqueVariableNames.d.ts |  7 +-
 .../validation/rules/ValuesOfCorrectType.d.ts | 16 ++++
 .../rules/VariablesAreInputTypes.d.ts         |  7 +-
 .../rules/VariablesDefaultValueAllowed.d.ts   | 13 +++
 .../rules/VariablesInAllowedPosition.d.ts     |  8 +-
 types/graphql/validation/specifiedRules.d.ts  |  5 +-
 types/graphql/validation/validate.d.ts        | 81 ++-----------------
 33 files changed, 277 insertions(+), 147 deletions(-)
 create mode 100644 types/graphql/validation/ValidationContext.d.ts
 delete mode 100644 types/graphql/validation/rules/ArgumentsOfCorrectType.d.ts
 delete mode 100644 types/graphql/validation/rules/DefaultValuesOfCorrectType.d.ts
 create mode 100644 types/graphql/validation/rules/ExecutableDefinitions.d.ts
 create mode 100644 types/graphql/validation/rules/ValuesOfCorrectType.d.ts
 create mode 100644 types/graphql/validation/rules/VariablesDefaultValueAllowed.d.ts

diff --git a/types/graphql/validation/ValidationContext.d.ts b/types/graphql/validation/ValidationContext.d.ts
new file mode 100644
index 0000000000..0f8a4ea8f7
--- /dev/null
+++ b/types/graphql/validation/ValidationContext.d.ts
@@ -0,0 +1,63 @@
+import { GraphQLError } from "../error";
+import {
+    DocumentNode,
+    OperationDefinitionNode,
+    VariableNode,
+    SelectionSetNode,
+    FragmentSpreadNode,
+    FragmentDefinitionNode,
+} from "../language/ast";
+import { GraphQLSchema } from "../type/schema";
+import {
+    GraphQLInputType,
+    GraphQLOutputType,
+    GraphQLCompositeType,
+    GraphQLField,
+    GraphQLArgument,
+} from "../type/definition";
+import { GraphQLDirective } from "../type/directives";
+import { TypeInfo } from "../utilities/TypeInfo";
+
+type NodeWithSelectionSet = OperationDefinitionNode | FragmentDefinitionNode;
+type VariableUsage = { node: VariableNode; type: GraphQLInputType | void };
+
+/**
+ * An instance of this class is passed as the "this" context to all validators,
+ * allowing access to commonly useful contextual information from within a
+ * validation rule.
+ */
+export default class ValidationContext {
+    constructor(schema: GraphQLSchema, ast: DocumentNode, typeInfo: TypeInfo);
+
+    reportError(error: GraphQLError): undefined;
+
+    getErrors(): ReadonlyArray<GraphQLError>;
+
+    getSchema(): GraphQLSchema;
+
+    getDocument(): DocumentNode;
+
+    getFragment(name: string): FragmentDefinitionNode | void;
+
+    getFragmentSpreads(node: SelectionSetNode): ReadonlyArray<FragmentSpreadNode>;
+
+    getRecursivelyReferencedFragments(operation: OperationDefinitionNode): ReadonlyArray<FragmentDefinitionNode>;
+
+    getVariableUsages(node: NodeWithSelectionSet): ReadonlyArray<VariableUsage>;
+
+    getRecursiveVariableUsages(operation: OperationDefinitionNode): ReadonlyArray<VariableUsage>;
+
+    getType(): GraphQLOutputType | void;
+
+    getParentType(): GraphQLCompositeType | void;
+
+    getInputType(): GraphQLInputType | void;
+
+    getParentInputType(): GraphQLInputType | void;
+
+    getFieldDef(): GraphQLField<any, any> | void;
+
+    getDirective(): GraphQLDirective | void;
+
+    getArgument(): GraphQLArgument | void;
+}
diff --git a/types/graphql/validation/index.d.ts b/types/graphql/validation/index.d.ts
index 4353da53fa..911c592432 100644
--- a/types/graphql/validation/index.d.ts
+++ b/types/graphql/validation/index.d.ts
@@ -1,12 +1,10 @@
-export { validate, ValidationContext } from "./validate";
+export { validate } from "./validate";
+
+import ValidationContext from "./ValidationContext";
+export { ValidationContext };
+
 export { specifiedRules } from "./specifiedRules";
 
-// Spec Section: "Argument Values Type Correctness"
-export { ArgumentsOfCorrectType as ArgumentsOfCorrectTypeRule } from "./rules/ArgumentsOfCorrectType";
-
-// Spec Section: "Variable Default Values Are Correctly Typed"
-export { DefaultValuesOfCorrectType as DefaultValuesOfCorrectTypeRule } from "./rules/DefaultValuesOfCorrectType";
-
 // Spec Section: "Field Selections on Objects, Interfaces, and Unions Types"
 export { FieldsOnCorrectType as FieldsOnCorrectTypeRule } from "./rules/FieldsOnCorrectType";
 
@@ -73,8 +71,14 @@ export { UniqueOperationNames as UniqueOperationNamesRule } from "./rules/Unique
 // Spec Section: "Variable Uniqueness"
 export { UniqueVariableNames as UniqueVariableNamesRule } from "./rules/UniqueVariableNames";
 
+// Spec Section: "Values Type Correctness"
+export { ValuesOfCorrectType as ValuesOfCorrectTypeRule } from "./rules/ValuesOfCorrectType";
+
 // Spec Section: "Variables are Input Types"
 export { VariablesAreInputTypes as VariablesAreInputTypesRule } from "./rules/VariablesAreInputTypes";
 
+// Spec Section: "Variables Default Value Is Allowed"
+export { VariablesDefaultValueAllowed as VariablesDefaultValueAllowedRule } from "./rules/VariablesDefaultValueAllowed";
+
 // Spec Section: "All Variable Usages Are Allowed"
 export { VariablesInAllowedPosition as VariablesInAllowedPositionRule } from "./rules/VariablesInAllowedPosition";
diff --git a/types/graphql/validation/rules/ArgumentsOfCorrectType.d.ts b/types/graphql/validation/rules/ArgumentsOfCorrectType.d.ts
deleted file mode 100644
index 235db84162..0000000000
--- a/types/graphql/validation/rules/ArgumentsOfCorrectType.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { ValidationContext } from "../index";
-
-/**
- * Argument values of correct type
- *
- * A GraphQL document is only valid if all field argument literal values are
- * of the type expected by their position.
- */
-export function ArgumentsOfCorrectType(context: ValidationContext): any;
diff --git a/types/graphql/validation/rules/DefaultValuesOfCorrectType.d.ts b/types/graphql/validation/rules/DefaultValuesOfCorrectType.d.ts
deleted file mode 100644
index b617538a74..0000000000
--- a/types/graphql/validation/rules/DefaultValuesOfCorrectType.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { ValidationContext } from "../index";
-
-/**
- * Variable default values of correct type
- *
- * A GraphQL document is only valid if all variable default values are of the
- * type expected by their definition.
- */
-export function DefaultValuesOfCorrectType(context: ValidationContext): any;
diff --git a/types/graphql/validation/rules/ExecutableDefinitions.d.ts b/types/graphql/validation/rules/ExecutableDefinitions.d.ts
new file mode 100644
index 0000000000..423e0dcad2
--- /dev/null
+++ b/types/graphql/validation/rules/ExecutableDefinitions.d.ts
@@ -0,0 +1,12 @@
+import ValidationContext from "../ValidationContext";
+import { ASTVisitor } from "../../language/visitor";
+
+export function nonExecutableDefinitionMessage(defName: string): string;
+
+/**
+ * Executable definitions
+ *
+ * A GraphQL document is only valid for execution if all definitions are either
+ * operation or fragment definitions.
+ */
+export function ExecutableDefinitions(context: ValidationContext): ASTVisitor;
diff --git a/types/graphql/validation/rules/FieldsOnCorrectType.d.ts b/types/graphql/validation/rules/FieldsOnCorrectType.d.ts
index 247de1298c..c5c7f053c2 100644
--- a/types/graphql/validation/rules/FieldsOnCorrectType.d.ts
+++ b/types/graphql/validation/rules/FieldsOnCorrectType.d.ts
@@ -1,4 +1,5 @@
-import { ValidationContext } from "../index";
+import ValidationContext from "../ValidationContext";
+import { ASTVisitor } from "../../language/visitor";
 
 /**
  * Fields on correct type
@@ -6,4 +7,4 @@ import { ValidationContext } from "../index";
  * A GraphQL document is only valid if all fields selected are defined by the
  * parent type, or are an allowed meta field such as __typename.
  */
-export function FieldsOnCorrectType(context: ValidationContext): any;
+export function FieldsOnCorrectType(context: ValidationContext): ASTVisitor;
diff --git a/types/graphql/validation/rules/FragmentsOnCompositeTypes.d.ts b/types/graphql/validation/rules/FragmentsOnCompositeTypes.d.ts
index 384f43beb3..7c760e331f 100644
--- a/types/graphql/validation/rules/FragmentsOnCompositeTypes.d.ts
+++ b/types/graphql/validation/rules/FragmentsOnCompositeTypes.d.ts
@@ -1,4 +1,10 @@
-import { ValidationContext } from "../index";
+import ValidationContext from "../ValidationContext";
+import { ASTVisitor } from "../../language/visitor";
+import { GraphQLType } from "../../type/definition";
+
+export function inlineFragmentOnNonCompositeErrorMessage(type: GraphQLType): string;
+
+export function fragmentOnNonCompositeErrorMessage(fragName: string, type: GraphQLType): string;
 
 /**
  * Fragments on composite type
@@ -7,4 +13,4 @@ import { ValidationContext } from "../index";
  * can only be spread into a composite type (object, interface, or union), the
  * type condition must also be a composite type.
  */
-export function FragmentsOnCompositeTypes(context: ValidationContext): any;
+export function FragmentsOnCompositeTypes(context: ValidationContext): ASTVisitor;
diff --git a/types/graphql/validation/rules/KnownArgumentNames.d.ts b/types/graphql/validation/rules/KnownArgumentNames.d.ts
index bd56137311..9602c34c43 100644
--- a/types/graphql/validation/rules/KnownArgumentNames.d.ts
+++ b/types/graphql/validation/rules/KnownArgumentNames.d.ts
@@ -1,4 +1,18 @@
-import { ValidationContext } from "../index";
+import ValidationContext from "../ValidationContext";
+import { ASTVisitor } from "../../language/visitor";
+
+export function unknownArgMessage(
+    argName: string,
+    fieldName: string,
+    typeName: string,
+    suggestedArgs: Array<string>
+): string;
+
+export function unknownDirectiveArgMessage(
+    argName: string,
+    directiveName: string,
+    suggestedArgs: Array<string>
+): string;
 
 /**
  * Known argument names
@@ -6,4 +20,4 @@ import { ValidationContext } from "../index";
  * A GraphQL field is only valid if all supplied arguments are defined by
  * that field.
  */
-export function KnownArgumentNames(context: ValidationContext): any;
+export function KnownArgumentNames(context: ValidationContext): ASTVisitor;
diff --git a/types/graphql/validation/rules/KnownDirectives.d.ts b/types/graphql/validation/rules/KnownDirectives.d.ts
index 40e58ce0c3..179e65b9f7 100644
--- a/types/graphql/validation/rules/KnownDirectives.d.ts
+++ b/types/graphql/validation/rules/KnownDirectives.d.ts
@@ -1,4 +1,9 @@
-import { ValidationContext } from "../index";
+import ValidationContext from "../ValidationContext";
+import { ASTVisitor } from "../../language/visitor";
+
+export function unknownDirectiveMessage(directiveName: string): string;
+
+export function misplacedDirectiveMessage(directiveName: string, location: string): string;
 
 /**
  * Known directives
@@ -6,4 +11,4 @@ import { ValidationContext } from "../index";
  * A GraphQL document is only valid if all `@directives` are known by the
  * schema and legally positioned.
  */
-export function KnownDirectives(context: ValidationContext): any;
+export function KnownDirectives(context: ValidationContext): ASTVisitor;
diff --git a/types/graphql/validation/rules/KnownFragmentNames.d.ts b/types/graphql/validation/rules/KnownFragmentNames.d.ts
index c5fa899995..40405f67dd 100644
--- a/types/graphql/validation/rules/KnownFragmentNames.d.ts
+++ b/types/graphql/validation/rules/KnownFragmentNames.d.ts
@@ -1,4 +1,7 @@
-import { ValidationContext } from "../index";
+import ValidationContext from "../ValidationContext";
+import { ASTVisitor } from "../../language/visitor";
+
+export function unknownFragmentMessage(fragName: string): string;
 
 /**
  * Known fragment names
@@ -6,4 +9,4 @@ import { ValidationContext } from "../index";
  * A GraphQL document is only valid if all `...Fragment` fragment spreads refer
  * to fragments defined in the same document.
  */
-export function KnownFragmentNames(context: ValidationContext): any;
+export function KnownFragmentNames(context: ValidationContext): ASTVisitor;
diff --git a/types/graphql/validation/rules/KnownTypeNames.d.ts b/types/graphql/validation/rules/KnownTypeNames.d.ts
index ab8abce9d5..6bef3661f9 100644
--- a/types/graphql/validation/rules/KnownTypeNames.d.ts
+++ b/types/graphql/validation/rules/KnownTypeNames.d.ts
@@ -1,4 +1,7 @@
-import { ValidationContext } from "../index";
+import ValidationContext from "../ValidationContext";
+import { ASTVisitor } from "../../language/visitor";
+
+export function unknownTypeMessage(typeName: string, suggestedTypes: Array<string>): string;
 
 /**
  * Known type names
@@ -6,4 +9,4 @@ import { ValidationContext } from "../index";
  * A GraphQL document is only valid if referenced types (specifically
  * variable definitions and fragment conditions) are defined by the type schema.
  */
-export function KnownTypeNames(context: ValidationContext): any;
+export function KnownTypeNames(context: ValidationContext): ASTVisitor;
diff --git a/types/graphql/validation/rules/LoneAnonymousOperation.d.ts b/types/graphql/validation/rules/LoneAnonymousOperation.d.ts
index f281df2bce..881814c4d2 100644
--- a/types/graphql/validation/rules/LoneAnonymousOperation.d.ts
+++ b/types/graphql/validation/rules/LoneAnonymousOperation.d.ts
@@ -1,4 +1,7 @@
-import { ValidationContext } from "../index";
+import ValidationContext from "../ValidationContext";
+import { ASTVisitor } from "../../language/visitor";
+
+export function anonOperationNotAloneMessage(): string;
 
 /**
  * Lone anonymous operation
@@ -6,4 +9,4 @@ import { ValidationContext } from "../index";
  * A GraphQL document is only valid if when it contains an anonymous operation
  * (the query short-hand) that it contains only that one operation definition.
  */
-export function LoneAnonymousOperation(context: ValidationContext): any;
+export function LoneAnonymousOperation(context: ValidationContext): ASTVisitor;
diff --git a/types/graphql/validation/rules/NoFragmentCycles.d.ts b/types/graphql/validation/rules/NoFragmentCycles.d.ts
index 4cce233cd5..f119c5a487 100644
--- a/types/graphql/validation/rules/NoFragmentCycles.d.ts
+++ b/types/graphql/validation/rules/NoFragmentCycles.d.ts
@@ -1,3 +1,6 @@
-import { ValidationContext } from "../index";
+import ValidationContext from "../ValidationContext";
+import { ASTVisitor } from "../../language/visitor";
 
-export function NoFragmentCycles(context: ValidationContext): any;
+export function cycleErrorMessage(fragName: string, spreadNames: Array<string>): string;
+
+export function NoFragmentCycles(context: ValidationContext): ASTVisitor;
diff --git a/types/graphql/validation/rules/NoUndefinedVariables.d.ts b/types/graphql/validation/rules/NoUndefinedVariables.d.ts
index 418e3cf2b5..611ad01a9b 100644
--- a/types/graphql/validation/rules/NoUndefinedVariables.d.ts
+++ b/types/graphql/validation/rules/NoUndefinedVariables.d.ts
@@ -1,4 +1,7 @@
-import { ValidationContext } from "../index";
+import ValidationContext from "../ValidationContext";
+import { ASTVisitor } from "../../language/visitor";
+
+export function undefinedVarMessage(varName: string, opName: string | void): string;
 
 /**
  * No undefined variables
@@ -6,4 +9,4 @@ import { ValidationContext } from "../index";
  * A GraphQL operation is only valid if all variables encountered, both directly
  * and via fragment spreads, are defined by that operation.
  */
-export function NoUndefinedVariables(context: ValidationContext): any;
+export function NoUndefinedVariables(context: ValidationContext): ASTVisitor;
diff --git a/types/graphql/validation/rules/NoUnusedFragments.d.ts b/types/graphql/validation/rules/NoUnusedFragments.d.ts
index 7a099e66be..6f757c16c2 100644
--- a/types/graphql/validation/rules/NoUnusedFragments.d.ts
+++ b/types/graphql/validation/rules/NoUnusedFragments.d.ts
@@ -1,4 +1,7 @@
-import { ValidationContext } from "../index";
+import ValidationContext from "../ValidationContext";
+import { ASTVisitor } from "../../language/visitor";
+
+export function unusedFragMessage(fragName: string): string;
 
 /**
  * No unused fragments
@@ -6,4 +9,4 @@ import { ValidationContext } from "../index";
  * A GraphQL document is only valid if all fragment definitions are spread
  * within operations, or spread within other fragments spread within operations.
  */
-export function NoUnusedFragments(context: ValidationContext): any;
+export function NoUnusedFragments(context: ValidationContext): ASTVisitor;
diff --git a/types/graphql/validation/rules/NoUnusedVariables.d.ts b/types/graphql/validation/rules/NoUnusedVariables.d.ts
index 53692ed494..10282cdacd 100644
--- a/types/graphql/validation/rules/NoUnusedVariables.d.ts
+++ b/types/graphql/validation/rules/NoUnusedVariables.d.ts
@@ -1,4 +1,7 @@
-import { ValidationContext } from "../index";
+import ValidationContext from "../ValidationContext";
+import { ASTVisitor } from "../../language/visitor";
+
+export function unusedVariableMessage(varName: string, opName: string | void): string;
 
 /**
  * No unused variables
@@ -6,4 +9,4 @@ import { ValidationContext } from "../index";
  * A GraphQL operation is only valid if all variables defined by an operation
  * are used, either directly or within a spread fragment.
  */
-export function NoUnusedVariables(context: ValidationContext): any;
+export function NoUnusedVariables(context: ValidationContext): ASTVisitor;
diff --git a/types/graphql/validation/rules/OverlappingFieldsCanBeMerged.d.ts b/types/graphql/validation/rules/OverlappingFieldsCanBeMerged.d.ts
index 302617386b..1dfa62a089 100644
--- a/types/graphql/validation/rules/OverlappingFieldsCanBeMerged.d.ts
+++ b/types/graphql/validation/rules/OverlappingFieldsCanBeMerged.d.ts
@@ -1,4 +1,7 @@
-import { ValidationContext } from "../index";
+import ValidationContext from "../ValidationContext";
+import { ASTVisitor } from "../../language/visitor";
+
+export function fieldsConflictMessage(responseName: string, reason: ConflictReasonMessage): string;
 
 /**
  * Overlapping fields can be merged
@@ -7,4 +10,10 @@ import { ValidationContext } from "../index";
  * fragments) either correspond to distinct response names or can be merged
  * without ambiguity.
  */
-export function OverlappingFieldsCanBeMerged(context: ValidationContext): any;
+export function OverlappingFieldsCanBeMerged(context: ValidationContext): ASTVisitor;
+
+// Field name and reason.
+type ConflictReason = [string, string];
+
+// Reason is a string, or a nested list of conflicts.
+type ConflictReasonMessage = string | Array<ConflictReason>;
diff --git a/types/graphql/validation/rules/PossibleFragmentSpreads.d.ts b/types/graphql/validation/rules/PossibleFragmentSpreads.d.ts
index e9e10aca14..f318cb189e 100644
--- a/types/graphql/validation/rules/PossibleFragmentSpreads.d.ts
+++ b/types/graphql/validation/rules/PossibleFragmentSpreads.d.ts
@@ -1,4 +1,10 @@
-import { ValidationContext } from "../index";
+import ValidationContext from "../ValidationContext";
+import { ASTVisitor } from "../../language/visitor";
+import { GraphQLType } from "../../type/definition";
+
+export function typeIncompatibleSpreadMessage(fragName: string, parentType: GraphQLType, fragType: GraphQLType): string;
+
+export function typeIncompatibleAnonSpreadMessage(parentType: GraphQLType, fragType: GraphQLType): string;
 
 /**
  * Possible fragment spread
@@ -7,4 +13,4 @@ import { ValidationContext } from "../index";
  * be true: if there is a non-empty intersection of the possible parent types,
  * and possible types which pass the type condition.
  */
-export function PossibleFragmentSpreads(context: ValidationContext): any;
+export function PossibleFragmentSpreads(context: ValidationContext): ASTVisitor;
diff --git a/types/graphql/validation/rules/ProvidedNonNullArguments.d.ts b/types/graphql/validation/rules/ProvidedNonNullArguments.d.ts
index 291a3ab5bc..e442b47f83 100644
--- a/types/graphql/validation/rules/ProvidedNonNullArguments.d.ts
+++ b/types/graphql/validation/rules/ProvidedNonNullArguments.d.ts
@@ -1,4 +1,10 @@
-import { ValidationContext } from "../index";
+import ValidationContext from "../ValidationContext";
+import { ASTVisitor } from "../../language/visitor";
+import { GraphQLType } from "../../type/definition";
+
+export function missingFieldArgMessage(fieldName: string, argName: string, type: GraphQLType): string;
+
+export function missingDirectiveArgMessage(directiveName: string, argName: string, type: GraphQLType): string;
 
 /**
  * Provided required arguments
@@ -6,4 +12,4 @@ import { ValidationContext } from "../index";
  * A field or directive is only valid if all required (non-null) field arguments
  * have been provided.
  */
-export function ProvidedNonNullArguments(context: ValidationContext): any;
+export function ProvidedNonNullArguments(context: ValidationContext): ASTVisitor;
diff --git a/types/graphql/validation/rules/ScalarLeafs.d.ts b/types/graphql/validation/rules/ScalarLeafs.d.ts
index 8505cc2512..5bbf85043a 100644
--- a/types/graphql/validation/rules/ScalarLeafs.d.ts
+++ b/types/graphql/validation/rules/ScalarLeafs.d.ts
@@ -1,4 +1,10 @@
-import { ValidationContext } from "../index";
+import ValidationContext from "../ValidationContext";
+import { ASTVisitor } from "../../language/visitor";
+import { GraphQLType } from "../../type/definition";
+
+export function noSubselectionAllowedMessage(fieldName: string, type: GraphQLType): string;
+
+export function requiredSubselectionMessage(fieldName: string, type: GraphQLType): string;
 
 /**
  * Scalar leafs
@@ -6,4 +12,4 @@ import { ValidationContext } from "../index";
  * A GraphQL document is valid only if all leaf fields (fields without
  * sub selections) are of scalar or enum types.
  */
-export function ScalarLeafs(context: ValidationContext): any;
+export function ScalarLeafs(context: ValidationContext): ASTVisitor;
diff --git a/types/graphql/validation/rules/SingleFieldSubscriptions.d.ts b/types/graphql/validation/rules/SingleFieldSubscriptions.d.ts
index d6f8fa2c6b..fef0869710 100644
--- a/types/graphql/validation/rules/SingleFieldSubscriptions.d.ts
+++ b/types/graphql/validation/rules/SingleFieldSubscriptions.d.ts
@@ -1,8 +1,11 @@
-import { ValidationContext } from "../index";
+import ValidationContext from "../ValidationContext";
+import { ASTVisitor } from "../../language/visitor";
+
+export function singleFieldOnlyMessage(name: string | void): string;
 
 /**
  * Subscriptions must only include one field.
  *
  * A GraphQL subscription is valid only if it contains a single root field.
  */
-export function SingleFieldSubscriptions(context: ValidationContext): any;
+export function SingleFieldSubscriptions(context: ValidationContext): ASTVisitor;
diff --git a/types/graphql/validation/rules/UniqueArgumentNames.d.ts b/types/graphql/validation/rules/UniqueArgumentNames.d.ts
index f4cc750b86..47a59c3362 100644
--- a/types/graphql/validation/rules/UniqueArgumentNames.d.ts
+++ b/types/graphql/validation/rules/UniqueArgumentNames.d.ts
@@ -1,4 +1,7 @@
-import { ValidationContext } from "../index";
+import ValidationContext from "../ValidationContext";
+import { ASTVisitor } from "../../language/visitor";
+
+export function duplicateArgMessage(argName: string): string;
 
 /**
  * Unique argument names
@@ -6,4 +9,4 @@ import { ValidationContext } from "../index";
  * A GraphQL field or directive is only valid if all supplied arguments are
  * uniquely named.
  */
-export function UniqueArgumentNames(context: ValidationContext): any;
+export function UniqueArgumentNames(context: ValidationContext): ASTVisitor;
diff --git a/types/graphql/validation/rules/UniqueDirectivesPerLocation.d.ts b/types/graphql/validation/rules/UniqueDirectivesPerLocation.d.ts
index 80d4a252c6..f3d6327c23 100644
--- a/types/graphql/validation/rules/UniqueDirectivesPerLocation.d.ts
+++ b/types/graphql/validation/rules/UniqueDirectivesPerLocation.d.ts
@@ -1,4 +1,7 @@
-import { ValidationContext } from "../index";
+import ValidationContext from "../ValidationContext";
+import { ASTVisitor } from "../../language/visitor";
+
+export function duplicateDirectiveMessage(directiveName: string): string;
 
 /**
  * Unique directive names per location
@@ -6,4 +9,4 @@ import { ValidationContext } from "../index";
  * A GraphQL document is only valid if all directives at a given location
  * are uniquely named.
  */
-export function UniqueDirectivesPerLocation(context: ValidationContext): any;
+export function UniqueDirectivesPerLocation(context: ValidationContext): ASTVisitor;
diff --git a/types/graphql/validation/rules/UniqueFragmentNames.d.ts b/types/graphql/validation/rules/UniqueFragmentNames.d.ts
index 525befc0a9..9a2554200c 100644
--- a/types/graphql/validation/rules/UniqueFragmentNames.d.ts
+++ b/types/graphql/validation/rules/UniqueFragmentNames.d.ts
@@ -1,8 +1,11 @@
-import { ValidationContext } from "../index";
+import ValidationContext from "../ValidationContext";
+import { ASTVisitor } from "../../language/visitor";
+
+export function duplicateFragmentNameMessage(fragName: string): string;
 
 /**
  * Unique fragment names
  *
  * A GraphQL document is only valid if all defined fragments have unique names.
  */
-export function UniqueFragmentNames(context: ValidationContext): any;
+export function UniqueFragmentNames(context: ValidationContext): ASTVisitor;
diff --git a/types/graphql/validation/rules/UniqueInputFieldNames.d.ts b/types/graphql/validation/rules/UniqueInputFieldNames.d.ts
index f81fb25e5c..34d5b9845a 100644
--- a/types/graphql/validation/rules/UniqueInputFieldNames.d.ts
+++ b/types/graphql/validation/rules/UniqueInputFieldNames.d.ts
@@ -1,4 +1,7 @@
-import { ValidationContext } from "../index";
+import ValidationContext from "../ValidationContext";
+import { ASTVisitor } from "../../language/visitor";
+
+export function duplicateInputFieldMessage(fieldName: string): string;
 
 /**
  * Unique input field names
@@ -6,4 +9,4 @@ import { ValidationContext } from "../index";
  * A GraphQL input object value is only valid if all supplied fields are
  * uniquely named.
  */
-export function UniqueInputFieldNames(context: ValidationContext): any;
+export function UniqueInputFieldNames(context: ValidationContext): ASTVisitor;
diff --git a/types/graphql/validation/rules/UniqueOperationNames.d.ts b/types/graphql/validation/rules/UniqueOperationNames.d.ts
index 5080307d4b..221b1187c2 100644
--- a/types/graphql/validation/rules/UniqueOperationNames.d.ts
+++ b/types/graphql/validation/rules/UniqueOperationNames.d.ts
@@ -1,8 +1,11 @@
-import { ValidationContext } from "../index";
+import ValidationContext from "../ValidationContext";
+import { ASTVisitor } from "../../language/visitor";
+
+export function duplicateOperationNameMessage(operationName: string): string;
 
 /**
  * Unique operation names
  *
  * A GraphQL document is only valid if all defined operations have unique names.
  */
-export function UniqueOperationNames(context: ValidationContext): any;
+export function UniqueOperationNames(context: ValidationContext): ASTVisitor;
diff --git a/types/graphql/validation/rules/UniqueVariableNames.d.ts b/types/graphql/validation/rules/UniqueVariableNames.d.ts
index a0a029d165..d0aaf0404e 100644
--- a/types/graphql/validation/rules/UniqueVariableNames.d.ts
+++ b/types/graphql/validation/rules/UniqueVariableNames.d.ts
@@ -1,8 +1,11 @@
-import { ValidationContext } from "../index";
+import ValidationContext from "../ValidationContext";
+import { ASTVisitor } from "../../language/visitor";
+
+export function duplicateVariableMessage(variableName: string): string;
 
 /**
  * Unique variable names
  *
  * A GraphQL operation is only valid if all its variables are uniquely named.
  */
-export function UniqueVariableNames(context: ValidationContext): any;
+export function UniqueVariableNames(context: ValidationContext): ASTVisitor;
diff --git a/types/graphql/validation/rules/ValuesOfCorrectType.d.ts b/types/graphql/validation/rules/ValuesOfCorrectType.d.ts
new file mode 100644
index 0000000000..09314835ad
--- /dev/null
+++ b/types/graphql/validation/rules/ValuesOfCorrectType.d.ts
@@ -0,0 +1,16 @@
+import ValidationContext from "../ValidationContext";
+import { ASTVisitor } from "../../language/visitor";
+
+export function badValueMessage(typeName: string, valueName: string, message?: string): string;
+
+export function requiredFieldMessage(typeName: string, fieldName: string, fieldTypeName: string): string;
+
+export function unknownFieldMessage(typeName: string, fieldName: string, message?: string): string;
+
+/**
+ * Value literals of correct type
+ *
+ * A GraphQL document is only valid if all value literals are of the type
+ * expected at their position.
+ */
+export function ValuesOfCorrectType(context: ValidationContext): ASTVisitor;
diff --git a/types/graphql/validation/rules/VariablesAreInputTypes.d.ts b/types/graphql/validation/rules/VariablesAreInputTypes.d.ts
index 79846a3073..32472e15fd 100644
--- a/types/graphql/validation/rules/VariablesAreInputTypes.d.ts
+++ b/types/graphql/validation/rules/VariablesAreInputTypes.d.ts
@@ -1,4 +1,7 @@
-import { ValidationContext } from "../index";
+import ValidationContext from "../ValidationContext";
+import { ASTVisitor } from "../../language/visitor";
+
+export function nonInputTypeOnVarMessage(variableName: string, typeName: string): string;
 
 /**
  * Variables are input types
@@ -6,4 +9,4 @@ import { ValidationContext } from "../index";
  * A GraphQL operation is only valid if all the variables it defines are of
  * input types (scalar, enum, or input object).
  */
-export function VariablesAreInputTypes(context: ValidationContext): any;
+export function VariablesAreInputTypes(context: ValidationContext): ASTVisitor;
diff --git a/types/graphql/validation/rules/VariablesDefaultValueAllowed.d.ts b/types/graphql/validation/rules/VariablesDefaultValueAllowed.d.ts
new file mode 100644
index 0000000000..1961eb645e
--- /dev/null
+++ b/types/graphql/validation/rules/VariablesDefaultValueAllowed.d.ts
@@ -0,0 +1,13 @@
+import ValidationContext from "../ValidationContext";
+import { ASTVisitor } from "../../language/visitor";
+import { GraphQLType } from "../../type/definition";
+
+export function defaultForRequiredVarMessage(varName: string, type: GraphQLType, guessType: GraphQLType): string;
+
+/**
+ * Variable's default value is allowed
+ *
+ * A GraphQL document is only valid if all variable default values are allowed
+ * due to a variable not being required.
+ */
+export function VariablesDefaultValueAllowed(context: ValidationContext): ASTVisitor;
diff --git a/types/graphql/validation/rules/VariablesInAllowedPosition.d.ts b/types/graphql/validation/rules/VariablesInAllowedPosition.d.ts
index bd302a73b4..f21ed5c7fb 100644
--- a/types/graphql/validation/rules/VariablesInAllowedPosition.d.ts
+++ b/types/graphql/validation/rules/VariablesInAllowedPosition.d.ts
@@ -1,6 +1,10 @@
-import { ValidationContext } from "../index";
+import ValidationContext from "../ValidationContext";
+import { ASTVisitor } from "../../language/visitor";
+import { GraphQLType } from "../../type/definition";
+
+export function badVarPosMessage(varName: string, varType: GraphQLType, expectedType: GraphQLType): string;
 
 /**
  * Variables passed to field arguments conform to type
  */
-export function VariablesInAllowedPosition(context: ValidationContext): any;
+export function VariablesInAllowedPosition(context: ValidationContext): ASTVisitor;
diff --git a/types/graphql/validation/specifiedRules.d.ts b/types/graphql/validation/specifiedRules.d.ts
index 5afc1a09e5..eb69dc1b08 100644
--- a/types/graphql/validation/specifiedRules.d.ts
+++ b/types/graphql/validation/specifiedRules.d.ts
@@ -1,6 +1,9 @@
-import { ValidationContext } from "./validate"; // It needs to check.
+import ValidationContext from "./ValidationContext";
 
 /**
  * This set includes all validation rules defined by the GraphQL spec.
+ *
+ * The order of the rules in this list has been adjusted to lead to the
+ * most clear output when encountering multiple validation errors.
  */
 export const specifiedRules: Array<(context: ValidationContext) => any>;
diff --git a/types/graphql/validation/validate.d.ts b/types/graphql/validation/validate.d.ts
index c60c3bf072..9a5092d258 100644
--- a/types/graphql/validation/validate.d.ts
+++ b/types/graphql/validation/validate.d.ts
@@ -1,23 +1,7 @@
 import { GraphQLError } from "../error";
-import {
-    DocumentNode,
-    OperationDefinitionNode,
-    VariableNode,
-    SelectionSetNode,
-    FragmentSpreadNode,
-    FragmentDefinitionNode,
-} from "../language/ast";
+import { DocumentNode } from "../language/ast";
 import { GraphQLSchema } from "../type/schema";
-import {
-    GraphQLInputType,
-    GraphQLOutputType,
-    GraphQLCompositeType,
-    GraphQLField,
-    GraphQLArgument,
-} from "../type/definition";
-import { GraphQLDirective } from "../type/directives";
 import { TypeInfo } from "../utilities/TypeInfo";
-import { specifiedRules } from "./specifiedRules";
 
 /**
  * Implements the "Validation" section of the spec.
@@ -31,62 +15,13 @@ import { specifiedRules } from "./specifiedRules";
  * Each validation rules is a function which returns a visitor
  * (see the language/visitor API). Visitor methods are expected to return
  * GraphQLErrors, or Arrays of GraphQLErrors when invalid.
- */
-export function validate(schema: GraphQLSchema, ast: DocumentNode, rules?: any[]): GraphQLError[];
-
-/**
- * This uses a specialized visitor which runs multiple visitors in parallel,
- * while maintaining the visitor skip and break API.
  *
- * @internal
+ * Optionally a custom TypeInfo instance may be provided. If not provided, one
+ * will be created from the provided schema.
  */
-export function visitUsingRules(
+export function validate(
     schema: GraphQLSchema,
-    typeInfo: TypeInfo,
-    documentAST: DocumentNode,
-    rules: any[]
-): GraphQLError[];
-
-export type NodeWithSelectionSet = OperationDefinitionNode | FragmentDefinitionNode;
-export interface VariableUsage {
-    node: VariableNode;
-    type: GraphQLInputType;
-}
-
-/**
- * An instance of this class is passed as the "this" context to all validators,
- * allowing access to commonly useful contextual information from within a
- * validation rule.
- */
-export class ValidationContext {
-    constructor(schema: GraphQLSchema, ast: DocumentNode, typeInfo: TypeInfo);
-    reportError(error: GraphQLError): void;
-
-    getErrors(): GraphQLError[];
-
-    getSchema(): GraphQLSchema;
-
-    getDocument(): DocumentNode;
-
-    getFragment(name: string): FragmentDefinitionNode;
-
-    getFragmentSpreads(node: SelectionSetNode): FragmentSpreadNode[];
-
-    getRecursivelyReferencedFragments(operation: OperationDefinitionNode): FragmentDefinitionNode[];
-
-    getVariableUsages(node: NodeWithSelectionSet): VariableUsage[];
-
-    getRecursiveVariableUsages(operation: OperationDefinitionNode): VariableUsage[];
-
-    getType(): GraphQLOutputType;
-
-    getParentType(): GraphQLCompositeType;
-
-    getInputType(): GraphQLInputType;
-
-    getFieldDef(): GraphQLField<any, any>;
-
-    getDirective(): GraphQLDirective;
-
-    getArgument(): GraphQLArgument;
-}
+    ast: DocumentNode,
+    rules?: ReadonlyArray<any>,
+    typeInfo?: TypeInfo
+): ReadonlyArray<GraphQLError>;

From fe4997e85f0369a748f9474807bcdbf35656cb26 Mon Sep 17 00:00:00 2001
From: Firede <firede@firede.us>
Date: Wed, 28 Mar 2018 02:26:25 +0800
Subject: [PATCH 0894/1382] update exports, bump version: 0.12 -> 0.13

---
 types/graphql/index.d.ts                     | 262 ++++++++++++++++++-
 types/graphql/language/index.d.ts            |  61 ++++-
 types/graphql/type/index.d.ts                |  89 ++++++-
 types/graphql/validation/specifiedRules.d.ts |  81 ++++++
 4 files changed, 476 insertions(+), 17 deletions(-)

diff --git a/types/graphql/index.d.ts b/types/graphql/index.d.ts
index 017f006787..68e04d104d 100644
--- a/types/graphql/index.d.ts
+++ b/types/graphql/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for graphql 0.12
+// Type definitions for graphql 0.13
 // Project: https://www.npmjs.com/package/graphql
 // Definitions by: TonyYang <https://github.com/TonyPythoneer>
 //                 Caleb Meredith <https://github.com/calebmer>
@@ -17,15 +17,221 @@
 // TypeScript Version: 2.3
 
 // The primary entry point into fulfilling a GraphQL request.
-export { graphql } from "./graphql";
+export { graphql, graphqlSync, GraphQLArgs } from "./graphql";
 
 // Create and operate on GraphQL type definitions and schema.
-export * from "./type";
+export {
+    GraphQLSchema,
+    // Definitions
+    GraphQLScalarType,
+    GraphQLObjectType,
+    GraphQLInterfaceType,
+    GraphQLUnionType,
+    GraphQLEnumType,
+    GraphQLInputObjectType,
+    GraphQLList,
+    GraphQLNonNull,
+    GraphQLDirective,
+    // "Enum" of Type Kinds
+    TypeKind,
+    // Scalars
+    specifiedScalarTypes,
+    GraphQLInt,
+    GraphQLFloat,
+    GraphQLString,
+    GraphQLBoolean,
+    GraphQLID,
+    // Built-in Directives defined by the Spec
+    specifiedDirectives,
+    GraphQLIncludeDirective,
+    GraphQLSkipDirective,
+    GraphQLDeprecatedDirective,
+    // Constant Deprecation Reason
+    DEFAULT_DEPRECATION_REASON,
+    // Meta-field definitions.
+    SchemaMetaFieldDef,
+    TypeMetaFieldDef,
+    TypeNameMetaFieldDef,
+    // GraphQL Types for introspection.
+    introspectionTypes,
+    __Schema,
+    __Directive,
+    __DirectiveLocation,
+    __Type,
+    __Field,
+    __InputValue,
+    __EnumValue,
+    __TypeKind,
+    // Predicates
+    isSchema,
+    isDirective,
+    isType,
+    isScalarType,
+    isObjectType,
+    isInterfaceType,
+    isUnionType,
+    isEnumType,
+    isInputObjectType,
+    isListType,
+    isNonNullType,
+    isInputType,
+    isOutputType,
+    isLeafType,
+    isCompositeType,
+    isAbstractType,
+    isWrappingType,
+    isNullableType,
+    isNamedType,
+    isSpecifiedScalarType,
+    isIntrospectionType,
+    isSpecifiedDirective,
+    // Assertions
+    assertType,
+    assertScalarType,
+    assertObjectType,
+    assertInterfaceType,
+    assertUnionType,
+    assertEnumType,
+    assertInputObjectType,
+    assertListType,
+    assertNonNullType,
+    assertInputType,
+    assertOutputType,
+    assertLeafType,
+    assertCompositeType,
+    assertAbstractType,
+    assertWrappingType,
+    assertNullableType,
+    assertNamedType,
+    // Un-modifiers
+    getNullableType,
+    getNamedType,
+    // Validate GraphQL schema.
+    validateSchema,
+    assertValidSchema,
+    // type
+    GraphQLType,
+    GraphQLInputType,
+    GraphQLOutputType,
+    GraphQLLeafType,
+    GraphQLCompositeType,
+    GraphQLAbstractType,
+    GraphQLWrappingType,
+    GraphQLNullableType,
+    GraphQLNamedType,
+    Thunk,
+    GraphQLSchemaConfig,
+    GraphQLArgument,
+    GraphQLArgumentConfig,
+    GraphQLEnumTypeConfig,
+    GraphQLEnumValue,
+    GraphQLEnumValueConfig,
+    GraphQLEnumValueConfigMap,
+    GraphQLField,
+    GraphQLFieldConfig,
+    GraphQLFieldConfigArgumentMap,
+    GraphQLFieldConfigMap,
+    GraphQLFieldMap,
+    GraphQLFieldResolver,
+    GraphQLInputField,
+    GraphQLInputFieldConfig,
+    GraphQLInputFieldConfigMap,
+    GraphQLInputFieldMap,
+    GraphQLInputObjectTypeConfig,
+    GraphQLInterfaceTypeConfig,
+    GraphQLIsTypeOfFn,
+    GraphQLObjectTypeConfig,
+    GraphQLResolveInfo,
+    ResponsePath,
+    GraphQLScalarTypeConfig,
+    GraphQLTypeResolver,
+    GraphQLUnionTypeConfig,
+    GraphQLDirectiveConfig,
+} from "./type";
 
 // Parse and operate on GraphQL language source files.
-export * from "./language";
-
-export * from "./subscription";
+export {
+    Source,
+    getLocation,
+    // Parse
+    parse,
+    parseValue,
+    parseType,
+    // Print
+    print,
+    // Visit
+    visit,
+    visitInParallel,
+    visitWithTypeInfo,
+    getVisitFn,
+    Kind,
+    TokenKind,
+    DirectiveLocation,
+    BREAK,
+    // type
+    Lexer,
+    ParseOptions,
+    SourceLocation,
+    // Visitor utilities
+    ASTVisitor,
+    Visitor,
+    VisitFn,
+    VisitorKeyMap,
+    // AST nodes
+    Location,
+    Token,
+    ASTNode,
+    ASTKindToNode,
+    NameNode,
+    DocumentNode,
+    DefinitionNode,
+    ExecutableDefinitionNode,
+    OperationDefinitionNode,
+    OperationTypeNode,
+    VariableDefinitionNode,
+    VariableNode,
+    SelectionSetNode,
+    SelectionNode,
+    FieldNode,
+    ArgumentNode,
+    FragmentSpreadNode,
+    InlineFragmentNode,
+    FragmentDefinitionNode,
+    ValueNode,
+    IntValueNode,
+    FloatValueNode,
+    StringValueNode,
+    BooleanValueNode,
+    NullValueNode,
+    EnumValueNode,
+    ListValueNode,
+    ObjectValueNode,
+    ObjectFieldNode,
+    DirectiveNode,
+    TypeNode,
+    NamedTypeNode,
+    ListTypeNode,
+    NonNullTypeNode,
+    TypeSystemDefinitionNode,
+    SchemaDefinitionNode,
+    OperationTypeDefinitionNode,
+    TypeDefinitionNode,
+    ScalarTypeDefinitionNode,
+    ObjectTypeDefinitionNode,
+    FieldDefinitionNode,
+    InputValueDefinitionNode,
+    InterfaceTypeDefinitionNode,
+    UnionTypeDefinitionNode,
+    EnumTypeDefinitionNode,
+    EnumValueDefinitionNode,
+    InputObjectTypeDefinitionNode,
+    TypeExtensionNode,
+    ObjectTypeExtensionNode,
+    DirectiveDefinitionNode,
+    KindEnum,
+    TokenKindEnum,
+    DirectiveLocationEnum,
+} from "./language";
 
 // Execute GraphQL queries.
 export {
@@ -33,10 +239,13 @@ export {
     defaultFieldResolver,
     responsePathAsArray,
     getDirectiveValues,
+    // type
     ExecutionArgs,
     ExecutionResult,
 } from "./execution";
 
+export { subscribe, createSourceEventStream } from "./subscription";
+
 // Validate GraphQL queries.
 export {
     validate,
@@ -44,8 +253,6 @@ export {
     // All validation rules in the GraphQL Specification.
     specifiedRules,
     // Individual validation rules.
-    ArgumentsOfCorrectTypeRule,
-    DefaultValuesOfCorrectTypeRule,
     FieldsOnCorrectTypeRule,
     FragmentsOnCompositeTypesRule,
     KnownArgumentNamesRule,
@@ -68,44 +275,60 @@ export {
     UniqueInputFieldNamesRule,
     UniqueOperationNamesRule,
     UniqueVariableNamesRule,
+    ValuesOfCorrectTypeRule,
     VariablesAreInputTypesRule,
+    VariablesDefaultValueAllowedRule,
     VariablesInAllowedPositionRule,
 } from "./validation";
 
 // Create and format GraphQL errors.
-export { GraphQLError, formatError, GraphQLFormattedError, GraphQLErrorLocation } from "./error";
+export { GraphQLError, formatError, printError, GraphQLFormattedError } from "./error";
 
 // Utilities for operating on GraphQL type schema and parsed sources.
 export {
-    // The GraphQL query recommended for a full schema introspection.
+    // Produce the GraphQL query recommended for a full schema introspection.
+    // Accepts optional IntrospectionOptions.
+    getIntrospectionQuery,
+    // Deprecated: use getIntrospectionQuery
     introspectionQuery,
     // Gets the target Operation from a Document
     getOperationAST,
+    // Convert a GraphQLSchema to an IntrospectionQuery
+    introspectionFromSchema,
     // Build a GraphQLSchema from an introspection result.
     buildClientSchema,
     // Build a GraphQLSchema from a parsed GraphQL Schema language AST.
     buildASTSchema,
     // Build a GraphQLSchema from a GraphQL schema language document.
     buildSchema,
-    // Get the description of an AST node
+    // Get the description from a schema AST node.
     getDescription,
     // Extends an existing GraphQLSchema from a parsed GraphQL Schema
     // language AST.
     extendSchema,
+    // Sort a GraphQLSchema.
+    lexicographicSortSchema,
     // Print a GraphQLSchema to GraphQL Schema language.
     printSchema,
+    // Prints the built-in introspection schema in the Schema Language
+    // format.
+    printIntrospectionSchema,
     // Print a GraphQLType to GraphQL Schema language.
     printType,
     // Create a GraphQLType from a GraphQL language AST.
     typeFromAST,
-    // Create a JavaScript value from a GraphQL language AST.
+    // Create a JavaScript value from a GraphQL language AST with a Type.
     valueFromAST,
+    // Create a JavaScript value from a GraphQL language AST without a Type.
+    valueFromASTUntyped,
     // Create a GraphQL language AST from a JavaScript value.
     astFromValue,
     // A helper to use within recursive-descent visitors which need to be aware of
     // the GraphQL type system.
     TypeInfo,
-    // Determine if JavaScript values adhere to a GraphQL type.
+    // Coerces a JavaScript value to a GraphQL type, or produces errors.
+    coerceValue,
+    // @deprecated use coerceValue
     isValidJSValue,
     // Determine if AST values adhere to a GraphQL type.
     isValidLiteralValue,
@@ -119,22 +342,35 @@ export {
     doTypesOverlap,
     // Asserts a string is a valid GraphQL name.
     assertValidName,
+    // Determine if a string is a valid GraphQL name.
+    isValidNameError,
     // Compares two GraphQLSchemas and detects breaking changes.
     findBreakingChanges,
+    findDangerousChanges,
+    BreakingChangeType,
+    DangerousChangeType,
     // Report all deprecated usage within a GraphQL document.
     findDeprecatedUsages,
+    // type
+    BuildSchemaOptions,
     BreakingChange,
+    DangerousChange,
+    IntrospectionOptions,
     IntrospectionDirective,
     IntrospectionEnumType,
     IntrospectionEnumValue,
     IntrospectionField,
     IntrospectionInputObjectType,
+    IntrospectionInputType,
+    IntrospectionInputTypeRef,
     IntrospectionInputValue,
     IntrospectionInterfaceType,
     IntrospectionListTypeRef,
     IntrospectionNamedTypeRef,
     IntrospectionNonNullTypeRef,
     IntrospectionObjectType,
+    IntrospectionOutputType,
+    IntrospectionOutputTypeRef,
     IntrospectionQuery,
     IntrospectionScalarType,
     IntrospectionSchema,
diff --git a/types/graphql/language/index.d.ts b/types/graphql/language/index.d.ts
index d5e8f8004e..e36dcbbb91 100644
--- a/types/graphql/language/index.d.ts
+++ b/types/graphql/language/index.d.ts
@@ -1,7 +1,6 @@
-export * from "./ast";
-export { getLocation } from "./location";
+export { getLocation, SourceLocation } from "./location";
 export { Kind, KindEnum } from "./kinds";
-export { createLexer, TokenKind, Lexer } from "./lexer";
+export { createLexer, TokenKind, Lexer, TokenKindEnum } from "./lexer";
 export { parse, parseValue, parseType, ParseOptions } from "./parser";
 export { print } from "./printer";
 export { Source } from "./source";
@@ -11,9 +10,65 @@ export {
     visitWithTypeInfo,
     getVisitFn,
     BREAK,
+    // type
     ASTVisitor,
     Visitor,
     VisitFn,
     VisitorKeyMap,
 } from "./visitor";
+
+export {
+    Location,
+    Token,
+    ASTNode,
+    ASTKindToNode,
+    // Each kind of AST node
+    NameNode,
+    DocumentNode,
+    DefinitionNode,
+    ExecutableDefinitionNode,
+    OperationDefinitionNode,
+    OperationTypeNode,
+    VariableDefinitionNode,
+    VariableNode,
+    SelectionSetNode,
+    SelectionNode,
+    FieldNode,
+    ArgumentNode,
+    FragmentSpreadNode,
+    InlineFragmentNode,
+    FragmentDefinitionNode,
+    ValueNode,
+    IntValueNode,
+    FloatValueNode,
+    StringValueNode,
+    BooleanValueNode,
+    NullValueNode,
+    EnumValueNode,
+    ListValueNode,
+    ObjectValueNode,
+    ObjectFieldNode,
+    DirectiveNode,
+    TypeNode,
+    NamedTypeNode,
+    ListTypeNode,
+    NonNullTypeNode,
+    TypeSystemDefinitionNode,
+    SchemaDefinitionNode,
+    OperationTypeDefinitionNode,
+    TypeDefinitionNode,
+    ScalarTypeDefinitionNode,
+    ObjectTypeDefinitionNode,
+    FieldDefinitionNode,
+    InputValueDefinitionNode,
+    InterfaceTypeDefinitionNode,
+    UnionTypeDefinitionNode,
+    EnumTypeDefinitionNode,
+    EnumValueDefinitionNode,
+    InputObjectTypeDefinitionNode,
+    TypeExtensionNode,
+    ObjectTypeExtensionNode,
+    DirectiveDefinitionNode,
+} from "./ast";
+
 export { DirectiveLocation, DirectiveLocationEnum } from "./directiveLocation";
diff --git a/types/graphql/type/index.d.ts b/types/graphql/type/index.d.ts
index 39c510fc95..c498f648e4 100644
--- a/types/graphql/type/index.d.ts
+++ b/types/graphql/type/index.d.ts
@@ -6,7 +6,93 @@ export {
     GraphQLSchemaConfig,
 } from "./schema";
 
-export * from "./definition";
+export {
+    // Predicates
+    isType,
+    isScalarType,
+    isObjectType,
+    isInterfaceType,
+    isUnionType,
+    isEnumType,
+    isInputObjectType,
+    isListType,
+    isNonNullType,
+    isInputType,
+    isOutputType,
+    isLeafType,
+    isCompositeType,
+    isAbstractType,
+    isWrappingType,
+    isNullableType,
+    isNamedType,
+    // Assertions
+    assertType,
+    assertScalarType,
+    assertObjectType,
+    assertInterfaceType,
+    assertUnionType,
+    assertEnumType,
+    assertInputObjectType,
+    assertListType,
+    assertNonNullType,
+    assertInputType,
+    assertOutputType,
+    assertLeafType,
+    assertCompositeType,
+    assertAbstractType,
+    assertWrappingType,
+    assertNullableType,
+    assertNamedType,
+    // Un-modifiers
+    getNullableType,
+    getNamedType,
+    // Definitions
+    GraphQLScalarType,
+    GraphQLObjectType,
+    GraphQLInterfaceType,
+    GraphQLUnionType,
+    GraphQLEnumType,
+    GraphQLInputObjectType,
+    // Type Wrappers
+    GraphQLList,
+    GraphQLNonNull,
+    // type
+    GraphQLType,
+    GraphQLInputType,
+    GraphQLOutputType,
+    GraphQLLeafType,
+    GraphQLCompositeType,
+    GraphQLAbstractType,
+    GraphQLWrappingType,
+    GraphQLNullableType,
+    GraphQLNamedType,
+    Thunk,
+    GraphQLArgument,
+    GraphQLArgumentConfig,
+    GraphQLEnumTypeConfig,
+    GraphQLEnumValue,
+    GraphQLEnumValueConfig,
+    GraphQLEnumValueConfigMap,
+    GraphQLField,
+    GraphQLFieldConfig,
+    GraphQLFieldConfigArgumentMap,
+    GraphQLFieldConfigMap,
+    GraphQLFieldMap,
+    GraphQLFieldResolver,
+    GraphQLInputField,
+    GraphQLInputFieldConfig,
+    GraphQLInputFieldConfigMap,
+    GraphQLInputFieldMap,
+    GraphQLInputObjectTypeConfig,
+    GraphQLInterfaceTypeConfig,
+    GraphQLIsTypeOfFn,
+    GraphQLObjectTypeConfig,
+    GraphQLResolveInfo,
+    ResponsePath,
+    GraphQLScalarTypeConfig,
+    GraphQLTypeResolver,
+    GraphQLUnionTypeConfig,
+} from "./definition";
 
 export {
     // Predicate
@@ -21,6 +107,7 @@ export {
     GraphQLDeprecatedDirective,
     // Constant Deprecation Reason
     DEFAULT_DEPRECATION_REASON,
+    // type
     GraphQLDirectiveConfig,
 } from "./directives";
 
diff --git a/types/graphql/validation/specifiedRules.d.ts b/types/graphql/validation/specifiedRules.d.ts
index eb69dc1b08..8e9815377f 100644
--- a/types/graphql/validation/specifiedRules.d.ts
+++ b/types/graphql/validation/specifiedRules.d.ts
@@ -1,3 +1,84 @@
+// Spec Section: "Executable Definitions"
+import { ExecutableDefinitions } from "./rules/ExecutableDefinitions";
+
+// Spec Section: "Operation Name Uniqueness"
+import { UniqueOperationNames } from "./rules/UniqueOperationNames";
+
+// Spec Section: "Lone Anonymous Operation"
+import { LoneAnonymousOperation } from "./rules/LoneAnonymousOperation";
+
+// Spec Section: "Subscriptions with Single Root Field"
+import { SingleFieldSubscriptions } from "./rules/SingleFieldSubscriptions";
+
+// Spec Section: "Fragment Spread Type Existence"
+import { KnownTypeNames } from "./rules/KnownTypeNames";
+
+// Spec Section: "Fragments on Composite Types"
+import { FragmentsOnCompositeTypes } from "./rules/FragmentsOnCompositeTypes";
+
+// Spec Section: "Variables are Input Types"
+import { VariablesAreInputTypes } from "./rules/VariablesAreInputTypes";
+
+// Spec Section: "Leaf Field Selections"
+import { ScalarLeafs } from "./rules/ScalarLeafs";
+
+// Spec Section: "Field Selections on Objects, Interfaces, and Unions Types"
+import { FieldsOnCorrectType } from "./rules/FieldsOnCorrectType";
+
+// Spec Section: "Fragment Name Uniqueness"
+import { UniqueFragmentNames } from "./rules/UniqueFragmentNames";
+
+// Spec Section: "Fragment spread target defined"
+import { KnownFragmentNames } from "./rules/KnownFragmentNames";
+
+// Spec Section: "Fragments must be used"
+import { NoUnusedFragments } from "./rules/NoUnusedFragments";
+
+// Spec Section: "Fragment spread is possible"
+import { PossibleFragmentSpreads } from "./rules/PossibleFragmentSpreads";
+
+// Spec Section: "Fragments must not form cycles"
+import { NoFragmentCycles } from "./rules/NoFragmentCycles";
+
+// Spec Section: "Variable Uniqueness"
+import { UniqueVariableNames } from "./rules/UniqueVariableNames";
+
+// Spec Section: "All Variable Used Defined"
+import { NoUndefinedVariables } from "./rules/NoUndefinedVariables";
+
+// Spec Section: "All Variables Used"
+import { NoUnusedVariables } from "./rules/NoUnusedVariables";
+
+// Spec Section: "Directives Are Defined"
+import { KnownDirectives } from "./rules/KnownDirectives";
+
+// Spec Section: "Directives Are Unique Per Location"
+import { UniqueDirectivesPerLocation } from "./rules/UniqueDirectivesPerLocation";
+
+// Spec Section: "Argument Names"
+import { KnownArgumentNames } from "./rules/KnownArgumentNames";
+
+// Spec Section: "Argument Uniqueness"
+import { UniqueArgumentNames } from "./rules/UniqueArgumentNames";
+
+// Spec Section: "Value Type Correctness"
+import { ValuesOfCorrectType } from "./rules/ValuesOfCorrectType";
+
+// Spec Section: "Argument Optionality"
+import { ProvidedNonNullArguments } from "./rules/ProvidedNonNullArguments";
+
+// Spec Section: "Variables Default Value Is Allowed"
+import { VariablesDefaultValueAllowed } from "./rules/VariablesDefaultValueAllowed";
+
+// Spec Section: "All Variable Usages Are Allowed"
+import { VariablesInAllowedPosition } from "./rules/VariablesInAllowedPosition";
+
+// Spec Section: "Field Selection Merging"
+import { OverlappingFieldsCanBeMerged } from "./rules/OverlappingFieldsCanBeMerged";
+
+// Spec Section: "Input Object Field Uniqueness"
+import { UniqueInputFieldNames } from "./rules/UniqueInputFieldNames";
+
 import ValidationContext from "./ValidationContext";
 
 /**

From d5cbb8d3cb0ac96269fff70c9174b820339e46e8 Mon Sep 17 00:00:00 2001
From: Mohsen Azimi <me@azimi.me>
Date: Tue, 27 Mar 2018 11:32:31 -0700
Subject: [PATCH 0895/1382] Add MultiHook and _pluginCompat  to Tapable 
 (#24527)

* Fix Tapable types

* ..

* Clean up

* Undo instance member change

* Add constructor to Hookmap
---
 types/tapable/index.d.ts       | 18 ++++++++++++++++++
 types/tapable/tapable-tests.ts |  4 +++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/types/tapable/index.d.ts b/types/tapable/index.d.ts
index c044a245ce..502b408e9e 100644
--- a/types/tapable/index.d.ts
+++ b/types/tapable/index.d.ts
@@ -9,6 +9,9 @@ export declare abstract class Tapable {
         [propName: string]: Tapable.Handler[]
     }
 
+    /** @deprecated Private internals. Do not use directly */
+    _pluginCompat: Hook;
+
     /**
      * @deprecated Tapable.plugin is deprecated. Use new API on `.hooks` instead
      * Register plugin(s)
@@ -275,7 +278,9 @@ export class HookInterceptor {
     context: boolean;
 }
 
+/** A HookMap is a helper class for a Map with Hooks */
 export class HookMap<T1 = any, T2 = any, T3 = any> {
+    constructor(fn: () => Hook);
     get: (key: any) => Hook<T1, T2, T3> | undefined;
     for: (key: any) => Hook<T1, T2, T3>;
     tap: (key: any, name: string | Tap, fn: (arg1: T1, arg2: T2, arg3: T3, ...args: any[]) => any) => void;
@@ -287,3 +292,16 @@ export class HookMap<T1 = any, T2 = any, T3 = any> {
 export class HookMapInterceptor<T1 = any, T2 = any, T3 = any> {
     factory: (key: any, hook: Hook<T1, T2, T3>) => Hook<T1, T2, T3>;
 }
+
+/**
+ *  A helper Hook-like class to redirect taps to multiple other hooks
+ *
+ * ```
+ * const { MultiHook } = require("tapable");
+ *
+ * this.hooks.allHooks = new MultiHook([this.hooks.hookA, this.hooks.hookB]);
+ * ```
+ */
+export class MultiHook {
+    constructor(hooks: Hook[])
+}
diff --git a/types/tapable/tapable-tests.ts b/types/tapable/tapable-tests.ts
index 4d82e60a66..c78196c194 100644
--- a/types/tapable/tapable-tests.ts
+++ b/types/tapable/tapable-tests.ts
@@ -1,4 +1,4 @@
-import {Tapable} from "tapable";
+import {Tapable, MultiHook, SyncHook} from "tapable";
 
 class DllPlugin {
     apply(compiler: Compiler) {
@@ -43,3 +43,5 @@ compiler.applyPluginsAsyncWaterfall('doSomething', 'a', callback);
 compiler.applyPluginsParallel('doSomething', 'a', 'b');
 compiler.applyPluginsParallelBailResult('doSomething', 'a', 'b');
 compiler.applyPluginsParallelBailResult1('doSomething', 'a', callback);
+
+const multi = new MultiHook([new SyncHook(['hi'])]);

From a5e131585fcf0439e55077703a957e026551d32e Mon Sep 17 00:00:00 2001
From: Scott Davis <scottd@collegenet.com>
Date: Tue, 27 Mar 2018 12:40:49 -0700
Subject: [PATCH 0896/1382] Made changes as requested by sandersn

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

diff --git a/types/eventsource/eventsource-tests.ts b/types/eventsource/eventsource-tests.ts
index b476e112a8..d081e87e42 100644
--- a/types/eventsource/eventsource-tests.ts
+++ b/types/eventsource/eventsource-tests.ts
@@ -1,4 +1,4 @@
-import * as EventSource from "eventsource";
+import EventSource = require("eventsource");
 
 const eventSource = new EventSource("http://foobar");
 eventSource.onmessage = (x: any) => {};
@@ -6,7 +6,7 @@ eventSource.onerror = (x: any) => {};
 eventSource.onopen = (x: any) => {};
 eventSource.close();
 
-import * as EventSourcePolyfill from "eventsource/lib/eventsource-polyfill";
+import EventSourcePolyfill = require("eventsource/lib/eventsource-polyfill");
 
 const eventSourcePolyfill = new EventSourcePolyfill("http://foobar");
 eventSourcePolyfill.onmessage = (x: any) => {};

From 7c9424cf2433f8ac16a4031b270f1754cfcf2e52 Mon Sep 17 00:00:00 2001
From: Timur Amirov <timur.amirov@zalando.de>
Date: Tue, 27 Mar 2018 22:20:29 +0200
Subject: [PATCH 0897/1382] curcuit-breaker-js: introduce
 @types/curcuit-breaker-js

---
 .../circuit-breaker-js-tests.ts               | 12 ++++++
 types/circuit-breaker-js/index.d.ts           | 38 +++++++++++++++++++
 types/circuit-breaker-js/tsconfig.json        | 23 +++++++++++
 types/circuit-breaker-js/tslint.json          |  1 +
 4 files changed, 74 insertions(+)
 create mode 100644 types/circuit-breaker-js/circuit-breaker-js-tests.ts
 create mode 100644 types/circuit-breaker-js/index.d.ts
 create mode 100644 types/circuit-breaker-js/tsconfig.json
 create mode 100644 types/circuit-breaker-js/tslint.json

diff --git a/types/circuit-breaker-js/circuit-breaker-js-tests.ts b/types/circuit-breaker-js/circuit-breaker-js-tests.ts
new file mode 100644
index 0000000000..1436e13e90
--- /dev/null
+++ b/types/circuit-breaker-js/circuit-breaker-js-tests.ts
@@ -0,0 +1,12 @@
+import CircuitBreaker = require('circuit-breaker-js');
+
+const breaker = new CircuitBreaker();
+breaker.isOpen();
+
+const options: CircuitBreaker.Options = {};
+
+let status: number = CircuitBreaker.CLOSED;
+status = CircuitBreaker.OPEN;
+
+breaker.forceOpen();
+breaker.forceClose();
diff --git a/types/circuit-breaker-js/index.d.ts b/types/circuit-breaker-js/index.d.ts
new file mode 100644
index 0000000000..6fc58bd40d
--- /dev/null
+++ b/types/circuit-breaker-js/index.d.ts
@@ -0,0 +1,38 @@
+// Type definitions for circuit-breaker-js 0.0
+// Project: http://yammer.github.io/circuit-breaker-js/
+// Definitions by: Timur Amirov <https://github.com/DeTeam>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = CircuitBreaker;
+
+declare namespace CircuitBreaker {
+    interface Options {
+        windowDuration?: number;
+        numBuckets?: number;
+        timeoutDuration?: number;
+        errorThreshold?: number;
+        volumeThreshold?: number;
+
+        onCircuitOpen?: (m: Metrics) => void;
+        onCircuitClose?: (m: Metrics) => void;
+    }
+
+    interface Metrics {
+        totalCount: number;
+        errorCount: number;
+        errorPercentage: number;
+    }
+}
+
+declare class CircuitBreaker {
+    static OPEN: 0;
+    static HALF_OPEN: 1;
+    static CLOSED: 2;
+
+    constructor(options?: CircuitBreaker.Options);
+    run(command: () => void, fallback?: () => void): void;
+    forceClose(): void;
+    forceOpen(): void;
+    unforce(): void;
+    isOpen(): boolean;
+}
diff --git a/types/circuit-breaker-js/tsconfig.json b/types/circuit-breaker-js/tsconfig.json
new file mode 100644
index 0000000000..67d9c57cc0
--- /dev/null
+++ b/types/circuit-breaker-js/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "circuit-breaker-js-tests.ts"
+    ]
+}
diff --git a/types/circuit-breaker-js/tslint.json b/types/circuit-breaker-js/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/circuit-breaker-js/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 9ca4a519d10ec6ae6c48f6059e66bbdddd904bea Mon Sep 17 00:00:00 2001
From: Andy <anhans@microsoft.com>
Date: Tue, 27 Mar 2018 13:43:37 -0700
Subject: [PATCH 0898/1382] yeoman-generator: Update required TypeScript
 version (#24567)

---
 types/yeoman-generator/index.d.ts | 2 +-
 types/yeoman-test/index.d.ts      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/yeoman-generator/index.d.ts b/types/yeoman-generator/index.d.ts
index fb5c1b881c..9db6a70946 100644
--- a/types/yeoman-generator/index.d.ts
+++ b/types/yeoman-generator/index.d.ts
@@ -4,7 +4,7 @@
 //                 Jay Anslow <https://github.com/janslow>
 //                 Ika <https://github.com/ikatyang>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import { EventEmitter } from 'events';
 import * as inquirer from 'inquirer';
diff --git a/types/yeoman-test/index.d.ts b/types/yeoman-test/index.d.ts
index 7602d94a87..d6b2d50a09 100644
--- a/types/yeoman-test/index.d.ts
+++ b/types/yeoman-test/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/yeoman/yeoman-test
 // Definitions by: Ika <https://github.com/ikatyang>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 import { EventEmitter } from 'events';
 import Generator = require('yeoman-generator');

From a34abe5ba3a828d6e95d0c2d5a0b4f01d84bb10b Mon Sep 17 00:00:00 2001
From: nickp10 <nickp10@hotmail.com>
Date: Tue, 27 Mar 2018 14:46:19 -0600
Subject: [PATCH 0899/1382] Fix interface exports and add more tests

---
 types/jwt-express/index.d.ts           | 270 ++++++++++++-------------
 types/jwt-express/jwt-express-tests.ts |  21 +-
 2 files changed, 150 insertions(+), 141 deletions(-)

diff --git a/types/jwt-express/index.d.ts b/types/jwt-express/index.d.ts
index dcb579e804..7e33cc7e6b 100644
--- a/types/jwt-express/index.d.ts
+++ b/types/jwt-express/index.d.ts
@@ -9,150 +9,147 @@
 import express = require("express");
 import jsonwebtoken = require("jsonwebtoken");
 
-declare global {
-    namespace Express {
-        interface Request {
-            jwt: JWT;
-        }
+export interface JWT {
+    /**
+     * Indicates if the JWT is expired. valid will always be false if this is true.
+     */
+    expired: boolean;
 
-        interface JWT {
-            /**
-             * Indicates if the JWT is expired. valid will always be false if this is true.
-             */
-            expired: boolean;
+    /**
+     * The jwt-express options.
+     */
+    options: JWTExpressOptions;
 
-            /**
-             * The jwt-express options.
-             */
-            options: JWTExpressOptions;
+    /**
+     * The payload of the JWT (must be an object). jwt-express will add a stales key-value pair to the payload for stale.
+     */
+    payload: any;
 
-            /**
-             * The payload of the JWT (must be an object). jwt-express will add a stales key-value pair to the payload for stale.
-             */
-            payload: any;
+    /**
+     * The secret used to sign /verify the JWT.
+     */
+    secret: string;
 
-            /**
-             * The secret used to sign /verify the JWT.
-             */
-            secret: string;
+    /**
+     * Indicates if the JWT is stale. The default timeout before a JWT is considered stale is 15 minutes.
+     */
+    stale: boolean;
 
-            /**
-             * Indicates if the JWT is stale. The default timeout before a JWT is considered stale is 15 minutes.
-             */
-            stale: boolean;
+    /**
+     * The signed token of the JWT.
+     */
+    token: string;
 
-            /**
-             * The signed token of the JWT.
-             */
-            token: string;
+    /**
+     * Indicates if this JWT is valid. This means that the payload hasn't been tampered with and that the JWT hasn't expired yet.
+     */
+    valid: boolean;
 
-            /**
-             * Indicates if this JWT is valid. This means that the payload hasn't been tampered with and that the JWT hasn't expired yet.
-             */
-            valid: boolean;
+    /**
+     * Resigns this JWT Objects's payload.
+     *
+     * @return this
+     */
+    resign(): JWT;
 
-            /**
-             * Resigns this JWT Objects's payload.
-             *
-             * @return this
-             */
-            resign(): JWT;
+    /**
+     * Calls the revoke function defined in the jwt.init() options with this JWT Object as the first parameter.
+     *
+     * @return this
+     */
+    revoke(): JWT;
 
-            /**
-             * Calls the revoke function defined in the jwt.init() options with this JWT Object as the first parameter.
-             *
-             * @return this
-             */
-            revoke(): JWT;
+    /**
+     * Generates a signed token from the payload.
+     *
+     * @param payload The payload of the JWT (must be an object).
+     * @return this
+     */
+    sign(payload: any): JWT;
 
-            /**
-             * Generates a signed token from the payload.
-             *
-             * @param payload The payload of the JWT (must be an object).
-             * @return this
-             */
-            sign(payload: any): JWT;
+    /**
+     * Stores this JWT in the cookie (if configured to use cookies).
+     *
+     * @param res The response in which to store the JWT.
+     * @return this
+     */
+    store(res: express.Response): JWT;
 
-            /**
-             * Stores this JWT in the cookie (if configured to use cookies).
-             *
-             * @param res The response in which to store the JWT.
-             * @return this
-             */
-            store(res: express.Response): JWT;
+    /**
+     * This function is called when the jwt is passed through JSON.stringify.
+     * We don't want the secret or options to be stringified.
+     *
+     * @return The JSON form of the object.
+     */
+    toJSON(): any;
 
-            /**
-             * This function is called when the jwt is passed through JSON.stringify.
-             * We don't want the secret or options to be stringified.
-             *
-             * @return The JSON form of the object.
-             */
-            toJSON(): any;
-
-            /**
-             * Verify the token and load the info into this JWT.
-             *
-             * @param token The signed token to verify.
-             * @return this
-             */
-            verify(token: string): JWT;
-        }
-
-        interface JWTExpressOptions {
-            /**
-             * The name of the cookie (default: 'jwt-express')
-             */
-            cookie?: string;
-
-            /**
-             * Options to use when storing the cookie (default: {httpOnly: true})
-             */
-            cookieOptions?: express.CookieOptions;
-
-            /**
-             * If true, will use cookies, otherwise will use the Authorization header (default: true)
-             */
-            cookies?: boolean;
-
-            /**
-             * Indicates if the JWT should be refreshed and stored every request (default: true)
-             */
-            refresh?: boolean;
-
-            /**
-             * The property of req to populate (default: 'jwt')
-             */
-            reqProperty?: string;
-
-            /**
-             * jwt.revoke() will call this function (default: function(jwt) {})
-             */
-            revoke?: (jwt: JWT) => void;
-
-            /**
-             * Options to use when signing the JWT (default: {})
-             */
-            signOptions?: jsonwebtoken.SignOptions;
-
-            /**
-             * Milliseconds when the jwt will go stale (default: 900000 (15 minutes))
-             */
-            stales?: number;
-
-            /**
-             * Additional verification. Must return a boolean (default: function(jwt) {return true})
-             */
-            verify?: (jwt: JWT) => boolean;
-
-            /**
-             * Options to use when verifying the JWT (default: {})
-             */
-            verifyOptions?: jsonwebtoken.VerifyOptions;
-        }
-    }
+    /**
+     * Verify the token and load the info into this JWT.
+     *
+     * @param token The signed token to verify.
+     * @return this
+     */
+    verify(token: string): JWT;
 }
 
-export let options: Express.JWTExpressOptions;
+export interface JWTExpressOptions {
+    /**
+     * The name of the cookie (default: 'jwt-express')
+     */
+    cookie?: string;
+
+    /**
+     * Options to use when storing the cookie (default: {httpOnly: true})
+     */
+    cookieOptions?: express.CookieOptions;
+
+    /**
+     * If true, will use cookies, otherwise will use the Authorization header (default: true)
+     */
+    cookies?: boolean;
+
+    /**
+     * Indicates if the JWT should be refreshed and stored every request (default: true)
+     */
+    refresh?: boolean;
+
+    /**
+     * The property of req to populate (default: 'jwt')
+     */
+    reqProperty?: string;
+
+    /**
+     * jwt.revoke() will call this function (default: function(jwt) {})
+     */
+    revoke?: (jwt: JWT) => void;
+
+    /**
+     * Options to use when signing the JWT (default: {})
+     */
+    signOptions?: jsonwebtoken.SignOptions;
+
+    /**
+     * Milliseconds when the jwt will go stale (default: 900000 (15 minutes))
+     */
+    stales?: number;
+
+    /**
+     * Additional verification. Must return a boolean (default: function(jwt) {return true})
+     */
+    verify?: (jwt: JWT) => boolean;
+
+    /**
+     * Options to use when verifying the JWT (default: {})
+     */
+    verifyOptions?: jsonwebtoken.VerifyOptions;
+}
+
+export interface JWTExpressError extends Error {
+    name: string;
+    message: string;
+}
+
+export let options: JWTExpressOptions;
 
 /**
  * Returns a middleware function that ensures a JWT is valid and fresh. Useful to protect
@@ -179,7 +176,7 @@ export function clear(): express.RequestHandler;
  * @param payload The payload of the JWT.
  * @return JWT
  */
-export function create(secret: string | ((payload: any) => string), payload: any): Express.JWT;
+export function create(secret: string | ((payload: any) => string), payload: any): JWT;
 
 /**
  * The jwt.init() function returns a middleware function for Express so it must be called inside app.use().
@@ -194,7 +191,7 @@ export function create(secret: string | ((payload: any) => string), payload: any
  * @param options The options of jwt-express.
  * @return Express middleware
  */
-export function init(secret: string | ((req: express.Request) => string), options?: Express.JWTExpressOptions): express.RequestHandler;
+export function init(secret: string | ((req: express.Request) => string), options?: JWTExpressOptions): express.RequestHandler;
 
 /**
  * Returns a middleware function that requires the payload to contain / match certain data.
@@ -216,7 +213,10 @@ export function require(key: string, operator?: string, value?: any): express.Re
  */
 export function valid(): express.RequestHandler;
 
-export interface JWTExpressError extends Error {
-    name: string;
-    message: string;
+declare global {
+    namespace Express {
+        interface Request {
+            jwt: JWT;
+        }
+    }
 }
diff --git a/types/jwt-express/jwt-express-tests.ts b/types/jwt-express/jwt-express-tests.ts
index c604dde550..450f835ded 100644
--- a/types/jwt-express/jwt-express-tests.ts
+++ b/types/jwt-express/jwt-express-tests.ts
@@ -1,7 +1,7 @@
-import express = require("express");
+import exp = require("express");
 import jwt = require("jwt-express");
 
-const app = express();
+const app = exp();
 
 app.use(jwt.active());
 app.use(jwt.clear());
@@ -17,12 +17,12 @@ app.use(jwt.init("Secret", {
     cookies: true,
     refresh: true,
     reqProperty: "jwt",
-    revoke: (revokeJWT) => { jwtObj = revokeJWT; },
+    revoke: (revokeJWT: jwt.JWT) => { jwtObj = revokeJWT; },
     signOptions: {
         expiresIn: "1h"
     },
     stales: 1000,
-    verify: (verifyJWT) => { jwtObj = verifyJWT; return true; },
+    verify: (verifyJWT: jwt.JWT) => { jwtObj = verifyJWT; return true; },
     verifyOptions: {
         ignoreExpiration: true
     }
@@ -31,11 +31,14 @@ app.use(jwt.require("key"));
 app.use(jwt.require("key", "==", "value"));
 app.use(jwt.valid());
 
-let resObj: express.Response = <any> {};
-app.use((err: jwt.JWTExpressError, req: express.Request, res: express.Response, next: express.NextFunction) => {
+let resObj: exp.Response = <any> {};
+app.use((err: jwt.JWTExpressError, req: exp.Request, res: exp.Response, next: exp.NextFunction) => {
     err.message.startsWith("");
     err.name.startsWith("");
     resObj = res;
+    jwtObj = req.jwt;
+    req.jwt.payload;
+    req.hostname.startsWith("");
 });
 
 jwtObj.expired.valueOf();
@@ -52,3 +55,9 @@ jwtObj = jwtObj.sign(jwtObj.payload);
 jwtObj = jwtObj.store(resObj);
 jwtObj = jwtObj.verify(jwtObj.token);
 jwtObj.toJSON();
+
+app.get("", (req: exp.Request, res: exp.Response, next: exp.NextFunction) => {
+    jwtObj = req.jwt;
+    req.jwt.payload;
+    req.hostname.startsWith("");
+});

From 853933598ab468fca5a6b508ddf6a3741d8e1d26 Mon Sep 17 00:00:00 2001
From: nickp10 <nickp10@hotmail.com>
Date: Tue, 27 Mar 2018 15:33:40 -0600
Subject: [PATCH 0900/1382] Add missing jwt function on the express response
 object

---
 types/jwt-express/index.d.ts           | 11 +++++++++++
 types/jwt-express/jwt-express-tests.ts |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/types/jwt-express/index.d.ts b/types/jwt-express/index.d.ts
index 7e33cc7e6b..cbae9f5b8a 100644
--- a/types/jwt-express/index.d.ts
+++ b/types/jwt-express/index.d.ts
@@ -218,5 +218,16 @@ declare global {
         interface Request {
             jwt: JWT;
         }
+
+        interface Response {
+            /**
+             * Returns a newly created / signed JWT Object from the payload. If you are using cookies,
+             * it will automatically store the JWT in the cookie as well.
+             *
+             * @param payload The payload of the JWT
+             * @return The newly created JWT
+             */
+            jwt(payload: any): JWT;
+        }
     }
 }
diff --git a/types/jwt-express/jwt-express-tests.ts b/types/jwt-express/jwt-express-tests.ts
index 450f835ded..fedf8137b3 100644
--- a/types/jwt-express/jwt-express-tests.ts
+++ b/types/jwt-express/jwt-express-tests.ts
@@ -39,6 +39,7 @@ app.use((err: jwt.JWTExpressError, req: exp.Request, res: exp.Response, next: ex
     jwtObj = req.jwt;
     req.jwt.payload;
     req.hostname.startsWith("");
+    jwtObj = res.jwt({ });
 });
 
 jwtObj.expired.valueOf();
@@ -60,4 +61,5 @@ app.get("", (req: exp.Request, res: exp.Response, next: exp.NextFunction) => {
     jwtObj = req.jwt;
     req.jwt.payload;
     req.hostname.startsWith("");
+    jwtObj = res.jwt({ });
 });

From 6eb449c46ddc7499c8394ba443265eb1bfeb4061 Mon Sep 17 00:00:00 2001
From: krauseStefan <stefan.krausekjaer@gmail.com>
Date: Tue, 27 Mar 2018 23:23:55 +0200
Subject: [PATCH 0901/1382] Added uiGridConstants.scrollbars.WHEN_NEEDED

The option is documented here:
http://ui-grid.info/docs/#!/api/ui.grid.service:uiGridConstants#properties_scrollbars
---
 types/ui-grid/index.d.ts       | 7 ++++---
 types/ui-grid/ui-grid-tests.ts | 9 ++++++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/types/ui-grid/index.d.ts b/types/ui-grid/index.d.ts
index 748dda3bf9..683c906087 100644
--- a/types/ui-grid/index.d.ts
+++ b/types/ui-grid/index.d.ts
@@ -127,6 +127,7 @@ declare namespace uiGrid {
         scrollbars: {
             NEVER: number;
             ALWAYS: number;
+            WHEN_NEEDED: number;
         };
     }
     export type IGridInstance = IGridInstanceOf<any>;
@@ -627,7 +628,7 @@ declare namespace uiGrid {
         enableGridMenu?: boolean;
         /**
          * uiGridConstants.scrollbars.ALWAYS by default. This settings controls the horizontal scrollbar for the grid.
-         * Supported values: uiGridConstants.scrollbars.ALWAYS, uiGridConstants.scrollbars.NEVER
+         * Supported values: uiGridConstants.scrollbars.ALWAYS, uiGridConstants.scrollbars.NEVER, uiGridConstants.scrollbars.WHEN_NEEDED
          * @default 1
          */
         enableHorizontalScrollbar?: boolean | number;
@@ -660,7 +661,7 @@ declare namespace uiGrid {
         enableSorting?: boolean;
         /**
          * uiGridConstants.scrollbars.ALWAYS by default. This settings controls the vertical scrollbar for the grid.
-         * Supported values: uiGridConstants.scrollbars.ALWAYS, uiGridConstants.scrollbars.NEVER
+         * Supported values: uiGridConstants.scrollbars.ALWAYS, uiGridConstants.scrollbars.NEVER, uiGridConstants.scrollbars.WHEN_NEEDED
          * @default 1
          */
         enableVerticalScrollbar?: boolean | number;
@@ -897,7 +898,7 @@ declare namespace uiGrid {
          * which is provided when you want to remove an item.  The id should be unique.
 
          */
-        addToGridMenu(grid: IGridInstanceOf<TEntity>, items: Array<IMenuItem>):  void;
+        addToGridMenu(grid: IGridInstanceOf<TEntity>, items: Array<IMenuItem>): void;
         /**
          * Clears all filters and optionally refreshes the visible rows.
          * @param {boolean} [refreshRows=true] Defaults to true.
diff --git a/types/ui-grid/ui-grid-tests.ts b/types/ui-grid/ui-grid-tests.ts
index e1d49a481d..1e424985fb 100644
--- a/types/ui-grid/ui-grid-tests.ts
+++ b/types/ui-grid/ui-grid-tests.ts
@@ -98,7 +98,7 @@ columnDef.sort = {
     priority: 1
 };
 columnDef.sortCellFiltered = false;
-columnDef.sortDirectionCycle = [null, 'asc' , 'desc'];
+columnDef.sortDirectionCycle = [null, 'asc', 'desc'];
 columnDef.sortingAlgorithm = (a: any, b: any, rowA: uiGrid.IGridRowOf<IMyEntity>, rowB: uiGrid.IGridRowOf<IMyEntity>, direction: string) => {
     return -1;
 };
@@ -113,6 +113,7 @@ var gridApi: uiGrid.IGridApiOf<IMyEntity>;
 var gridInstance: uiGrid.IGridInstanceOf<IMyEntity>;
 var menuItem: uiGrid.IMenuItem;
 var colProcessor: uiGrid.IColumnProcessor<IMyEntity>;
+var uiGridConstants: uiGrid.IUiGridConstants;
 
 gridApi.core.clearAllFilters(true);
 gridApi.core.addToGridMenu(gridInstance, [menuItem]);
@@ -131,6 +132,12 @@ var gridOptions: uiGrid.IGridOptionsOf<IMyEntity> = {
     }
 };
 gridOptions.isRowSelectable = () => true;
+gridOptions.enableVerticalScrollbar = uiGridConstants.scrollbars.ALWAYS;
+gridOptions.enableVerticalScrollbar = uiGridConstants.scrollbars.WHEN_NEEDED;
+gridOptions.enableVerticalScrollbar = uiGridConstants.scrollbars.NEVER;
+gridOptions.enableHorizontalScrollbar = uiGridConstants.scrollbars.ALWAYS;
+gridOptions.enableHorizontalScrollbar = uiGridConstants.scrollbars.WHEN_NEEDED;
+gridOptions.enableHorizontalScrollbar = uiGridConstants.scrollbars.NEVER;
 
 interface IAnotherEntity {
     anObject: string

From 1539c6a98b9a343b8c2bcf003c0f06da16fd019f Mon Sep 17 00:00:00 2001
From: Andy Ma <ama@tomtec.org>
Date: Wed, 28 Mar 2018 09:43:46 +0800
Subject: [PATCH 0902/1382] Fix build errors.

---
 .../datatables.net-colreorder-tests.ts             |  4 ++--
 types/datatables.net-colreorder/index.d.ts         |  4 ++--
 types/datatables.net-select/index.d.ts             | 14 +++++++-------
 types/datatables.net/datatables.net-tests.ts       |  2 +-
 types/datatables.net/index.d.ts                    |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/types/datatables.net-colreorder/datatables.net-colreorder-tests.ts b/types/datatables.net-colreorder/datatables.net-colreorder-tests.ts
index 9b73f3f0e0..a6126baf44 100644
--- a/types/datatables.net-colreorder/datatables.net-colreorder-tests.ts
+++ b/types/datatables.net-colreorder/datatables.net-colreorder-tests.ts
@@ -4,9 +4,9 @@ $(document).ready(() => {
         colReorder: {
             fixedColumnsLeft: 0,
             fixedColumnsRight: 0,
-            order: [1,2,3],
+            order: [1, 2, 3],
             realtime: true,
-            reorderCallback: ()=>{},
+            reorderCallback: () => {},
         }
     };
 });
diff --git a/types/datatables.net-colreorder/index.d.ts b/types/datatables.net-colreorder/index.d.ts
index 3aad7a3050..8254cd71dc 100644
--- a/types/datatables.net-colreorder/index.d.ts
+++ b/types/datatables.net-colreorder/index.d.ts
@@ -38,7 +38,7 @@ declare namespace DataTables {
     /*
      * Callback after reorder
      */
-    reorderCallback: Function;
+    reorderCallback: () => void;
   }
 
   interface Api {
@@ -59,6 +59,6 @@ declare namespace DataTables {
       * Convert one or more column indexes to and from current and original indexes
       */
       transpose(idx?: number | number[], direction?: "toCurrent" | "toOriginal" | "fromOriginal" | "fromCurrent"): Api;
-    }
+    };
   }
 }
diff --git a/types/datatables.net-select/index.d.ts b/types/datatables.net-select/index.d.ts
index a48cfe989b..563a51fc25 100644
--- a/types/datatables.net-select/index.d.ts
+++ b/types/datatables.net-select/index.d.ts
@@ -46,7 +46,7 @@ declare namespace DataTables {
          */
         style?: "api" | "single" | "multi" | "os" | "multi+shift";
     }
-    
+
     interface Api {
         select: {
           /*
@@ -57,17 +57,17 @@ declare namespace DataTables {
           * Set the table's selection style
           */
           style(s: "api" | "single" | "multi" | "os"): Api;
-        }
+        };
     }
-    
+
     interface RowMethods {
       /**
        * Select a row
        */
       select(): Api;
       /**
-      * Deselect a row
-      */
+       * Deselect a row
+       */
       deselect(): Api;
     }
 
@@ -77,8 +77,8 @@ declare namespace DataTables {
        */
       select(): Api;
       /**
-      * Deselect a row
-      */
+       * Deselect a row
+       */
       deselect(): Api;
     }
 }
diff --git a/types/datatables.net/datatables.net-tests.ts b/types/datatables.net/datatables.net-tests.ts
index e5cb5184fd..0c9f3db3cc 100644
--- a/types/datatables.net/datatables.net-tests.ts
+++ b/types/datatables.net/datatables.net-tests.ts
@@ -225,7 +225,7 @@ let config: DataTables.Settings = {
         ],
         // Data
         ajax: "url",
-        data: {},
+        data: [],
         // Features
         autoWidth: true,
         deferRender: true,
diff --git a/types/datatables.net/index.d.ts b/types/datatables.net/index.d.ts
index 6bbc2e1137..c0a37145ab 100644
--- a/types/datatables.net/index.d.ts
+++ b/types/datatables.net/index.d.ts
@@ -1301,7 +1301,7 @@ declare namespace DataTables {
         /**
          * Data to use as the display data for the table. Since: 1.10
          */
-        data?: Object[];
+        data?: any[];
 
         //#endregion "Data"
 

From be1c86fffe1cf5e375f939795b9288f57d28c872 Mon Sep 17 00:00:00 2001
From: ckboyjiy <ckboyjiy@nate.com>
Date: Wed, 28 Mar 2018 11:08:51 +0900
Subject: [PATCH 0903/1382] Modified submodules

---
 types/navermaps/index.d.ts | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/types/navermaps/index.d.ts b/types/navermaps/index.d.ts
index 92409a44b0..aa36578e63 100644
--- a/types/navermaps/index.d.ts
+++ b/types/navermaps/index.d.ts
@@ -1082,6 +1082,7 @@ declare namespace naver.maps {
   }
 
   // Sub module: drawing
+  function drawing(): void;
   namespace drawing {
     interface DrawingOptions {
       map?: Map;
@@ -1149,6 +1150,7 @@ declare namespace naver.maps {
   }
 
   // Sub module: visualization
+  function visualization(): void;
   namespace visualization {
     interface DotMapOptions {
       map: Map;
@@ -1218,6 +1220,7 @@ declare namespace naver.maps {
   }
 
   // Sub module: geocoder
+  function Service(): void;
   namespace Service {
     interface ServiceOptions {
       encoding?: any;
@@ -1274,6 +1277,7 @@ declare namespace naver.maps {
                             callback?: (status: Status, response: ReverseGeocodeResponse) => void): void;
   }
 
+  function TransCoord(): void;
   namespace TransCoord {
     function fromEPSG3857ToLatLng(coord: Point): LatLng;
     function fromEPSG3857ToNaver(coord: Point): Point;
@@ -1297,6 +1301,7 @@ declare namespace naver.maps {
     function fromUTMKToTM128(utmk: Point): Point;
   }
 
+  function Event(): void;
   namespace Event {
     function addDOMListener(element: HTMLElement, eventName: string, listener: () => any): void;
     function addListener(target: any, eventName: string, listener: () => any): MapEventListener;
@@ -1314,6 +1319,7 @@ declare namespace naver.maps {
   }
 
   // Projection
+  function EPSG3857(): void;
   namespace EPSG3857 { // implements Projection
     function fromCoordToPoint(coord: Coord): Point;
     function fromLatLngToPoint(latlng: LatLng): Point;
@@ -1322,6 +1328,8 @@ declare namespace naver.maps {
     function getDestinationCoord(fromLatLng: LatLng, angle: number, meter: number): LatLng;
     function getDistance(latlng1: LatLng, latlng2: LatLng): number;
   }
+
+  function UTMK(): void;
   namespace UTMK {
     let name: string;
     let pointPerMeter: number;
@@ -1338,6 +1346,8 @@ declare namespace naver.maps {
     function getDestinationCoord(fromLatLng: LatLng, angle: number, meter: number): LatLng;
     function getDistance(latlng1: LatLng, latlng2: LatLng): number;
   }
+
+  function UTMK_NAVER(): void;
   namespace UTMK_NAVER { // extends UTMK
     let name: string;
     let pointPerMeter: number;
@@ -1350,6 +1360,8 @@ declare namespace naver.maps {
     function fromPointToNaver(point: Point): Point;
     function fromUTMKToNaver(utmk: Point): Point;
   }
+
+  function EPSG3857Coord(): void;
   namespace EPSG3857Coord {
     function fromCoordToLatLng(coord: Point): LatLng;
     function fromCoordToPoint(coord: Point): Point;
@@ -1360,10 +1372,14 @@ declare namespace naver.maps {
     function fromPointToCoord(point: Point): Point;
     function fromPointToEPSG3857(point: Point): Point;
   }
+
+  function TM128(): void;
   namespace TM128 { // extends TM128Coord
     function fromCoordToPoint(latlng: Coord): Point;
     function fromPointToCoord(point: Point): LatLng;
   }
+
+  function TM128Coord(): void;
   namespace TM128Coord { // extends UTMK
     function fromCoordToLatLng(tm128: Point): LatLng;
     function fromCoordToPoint(tm128: Point): Point;
@@ -1376,12 +1392,16 @@ declare namespace naver.maps {
     function fromTM128ToUTMK(tm128: Point): Point;
     function fromUTMKToTM128(utmk: Point): Point;
   }
+
+  function UTMK_NAVERCoord(): void;
   namespace UTMK_NAVERCoord { // extends UTMK_NAVER
     function fromCoordToLatLng(n: Point): LatLng;
     function fromCoordToPoint(n: Point): Point;
     function fromLatLngToCoord(latlng: Coord): Point;
     function fromPointToCoord(point: Point): Point;
   }
+
+  function UTMKCoord(): void;
   namespace UTMKCoord { // extends UTMK
     function fromCoordToLatLng(utmk: Point): LatLng;
     function fromCoordToPoint(utmk: Point): Point;

From 353076277e69d0b2f98fdcd2e3d0738b46b32aed Mon Sep 17 00:00:00 2001
From: Andy Ma <ama@tomtec.org>
Date: Wed, 28 Mar 2018 11:01:17 +0800
Subject: [PATCH 0904/1382] Add types for AutoFill extension

---
 .../datatables.net-autofill-tests.ts          |  7 +++++
 types/datatables.net-autofill/index.d.ts      | 30 +++++++++++++++++++
 types/datatables.net-autofill/tsconfig.json   | 23 ++++++++++++++
 types/datatables.net-autofill/tslint.json     |  1 +
 4 files changed, 61 insertions(+)
 create mode 100644 types/datatables.net-autofill/datatables.net-autofill-tests.ts
 create mode 100644 types/datatables.net-autofill/index.d.ts
 create mode 100644 types/datatables.net-autofill/tsconfig.json
 create mode 100644 types/datatables.net-autofill/tslint.json

diff --git a/types/datatables.net-autofill/datatables.net-autofill-tests.ts b/types/datatables.net-autofill/datatables.net-autofill-tests.ts
new file mode 100644
index 0000000000..50c178c6c5
--- /dev/null
+++ b/types/datatables.net-autofill/datatables.net-autofill-tests.ts
@@ -0,0 +1,7 @@
+const config: DataTables.Settings = {
+    // AutoFill extension options
+    autoFill: {
+        alwaysAsk: true,
+        enable: true
+    }
+};
diff --git a/types/datatables.net-autofill/index.d.ts b/types/datatables.net-autofill/index.d.ts
new file mode 100644
index 0000000000..e037c8dc47
--- /dev/null
+++ b/types/datatables.net-autofill/index.d.ts
@@ -0,0 +1,30 @@
+// Type definitions for datatables.net-autofill 2.2
+// Project: https://datatables.net
+// Definitions by: Andy Ma <https://github.com/andy-maca>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+/// <reference types="jquery" />
+/// <reference types="datatables.net"/>
+
+declare namespace DataTables {
+  interface Settings {
+    /*
+     * autoFill extension options
+     */
+    autoFill?: boolean | AutoFillSettings;
+  }
+
+  interface AutoFillSettings {
+    /*
+     * Always ask the end user if an action should be taken or not
+     */
+    alwaysAsk?: boolean;
+
+    /*
+     *
+     * Initial enablement state of AutoFill
+     */
+    enable?: boolean;
+  }
+}
diff --git a/types/datatables.net-autofill/tsconfig.json b/types/datatables.net-autofill/tsconfig.json
new file mode 100644
index 0000000000..e17d5de5da
--- /dev/null
+++ b/types/datatables.net-autofill/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "datatables.net-autofill-tests.ts"
+    ]
+}
diff --git a/types/datatables.net-autofill/tslint.json b/types/datatables.net-autofill/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/datatables.net-autofill/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From d1b4a4aa93ca5ddfe329bfd146613945e1ff5b10 Mon Sep 17 00:00:00 2001
From: andy-maca <66229754@qq.com>
Date: Wed, 28 Mar 2018 11:09:31 +0800
Subject: [PATCH 0905/1382] Add new property

---
 .../datatables.net-autofill/datatables.net-autofill-tests.ts | 3 ++-
 types/datatables.net-autofill/index.d.ts                     | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/types/datatables.net-autofill/datatables.net-autofill-tests.ts b/types/datatables.net-autofill/datatables.net-autofill-tests.ts
index 50c178c6c5..0ad00b4395 100644
--- a/types/datatables.net-autofill/datatables.net-autofill-tests.ts
+++ b/types/datatables.net-autofill/datatables.net-autofill-tests.ts
@@ -2,6 +2,7 @@ const config: DataTables.Settings = {
     // AutoFill extension options
     autoFill: {
         alwaysAsk: true,
-        enable: true
+        enable: true,
+        columns: [1, 2]
     }
 };
diff --git a/types/datatables.net-autofill/index.d.ts b/types/datatables.net-autofill/index.d.ts
index e037c8dc47..2d7eb0d856 100644
--- a/types/datatables.net-autofill/index.d.ts
+++ b/types/datatables.net-autofill/index.d.ts
@@ -20,7 +20,10 @@ declare namespace DataTables {
      * Always ask the end user if an action should be taken or not
      */
     alwaysAsk?: boolean;
-
+    /*
+     * Always ask the end user if an action should be taken or not
+     */
+    columns: string | number[];
     /*
      *
      * Initial enablement state of AutoFill

From 4794a91ac5a35d67616d2a2426a8d3429c3ad5f4 Mon Sep 17 00:00:00 2001
From: andy-maca <66229754@qq.com>
Date: Wed, 28 Mar 2018 11:28:11 +0800
Subject: [PATCH 0906/1382] Add property 'editor'

---
 types/datatables.net-autofill/index.d.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/types/datatables.net-autofill/index.d.ts b/types/datatables.net-autofill/index.d.ts
index 2d7eb0d856..68075be5ca 100644
--- a/types/datatables.net-autofill/index.d.ts
+++ b/types/datatables.net-autofill/index.d.ts
@@ -21,9 +21,13 @@ declare namespace DataTables {
      */
     alwaysAsk?: boolean;
     /*
-     * Always ask the end user if an action should be taken or not
+     * Select the columns that can be auto filled
      */
     columns: string | number[];
+    /*
+     * Attach an Editor instance for database updating
+     */
+    editor: Object;
     /*
      *
      * Initial enablement state of AutoFill

From 6ed5c800004cd6a5275056e137dcbb13a683edee Mon Sep 17 00:00:00 2001
From: Ke Zhang <plutino@users.noreply.github.com>
Date: Tue, 27 Mar 2018 21:06:48 -0700
Subject: [PATCH 0907/1382] Add proper type for AccessToken.token.

---
 types/simple-oauth2/index.d.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/types/simple-oauth2/index.d.ts b/types/simple-oauth2/index.d.ts
index 499f39e56e..c1eb324348 100644
--- a/types/simple-oauth2/index.d.ts
+++ b/types/simple-oauth2/index.d.ts
@@ -44,8 +44,12 @@ export interface ModuleOptions {
 
 export type TokenType = "access_token" | "refresh_token";
 
+export interface Token {
+    [x: string]: any;
+}
+
 export interface AccessToken {
-    token: {};
+    token: Token;
 
     /** Check if the access token is expired or not */
     expired(): boolean;
@@ -56,9 +60,6 @@ export interface AccessToken {
     revoke(tokenType: TokenType, callback?: (error: any) => void): Bluebird<void>;
 }
 
-export interface Token {
-    [x: string]: any;
-}
 export type AuthorizationCode = string;
 export interface AuthorizationTokenConfig {
     code: AuthorizationCode;

From 454e0ecd2826835f90963ccc24168fb15fe35eff Mon Sep 17 00:00:00 2001
From: Ke Zhang <plutino@users.noreply.github.com>
Date: Tue, 27 Mar 2018 21:29:18 -0700
Subject: [PATCH 0908/1382] Update package version of @type/simple-oauth2

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

diff --git a/types/simple-oauth2/index.d.ts b/types/simple-oauth2/index.d.ts
index c1eb324348..b93bbc229f 100644
--- a/types/simple-oauth2/index.d.ts
+++ b/types/simple-oauth2/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for simple-oauth2 1.0
+// Type definitions for simple-oauth2 1.1
 // Project: https://github.com/lelylan/simple-oauth2
 // Definitions by: [Michael Müller] <https://github.com/mad-mike>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From 8988aee224efd4df06a9a70b543e6938a68f4302 Mon Sep 17 00:00:00 2001
From: Firede <firede@firede.us>
Date: Wed, 28 Mar 2018 14:39:26 +0800
Subject: [PATCH 0909/1382] Reformat all files using prettier.

prettier --parser typescript --tab-width 4 --semi --trailing-comma es5 \
         --write --print-width 120 \
         types/express-graphql/*.ts
related: #24552
---
 .../express-graphql/express-graphql-tests.ts  | 22 +++++++++----------
 types/express-graphql/index.d.ts              |  8 +++----
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/types/express-graphql/express-graphql-tests.ts b/types/express-graphql/express-graphql-tests.ts
index 1557c4c0ac..958be4f5ff 100644
--- a/types/express-graphql/express-graphql-tests.ts
+++ b/types/express-graphql/express-graphql-tests.ts
@@ -1,7 +1,7 @@
-import express = require('express');
-import 'express-session';
-import graphqlHTTP = require('express-graphql');
-import { GraphQLSchema } from 'graphql/type/schema';
+import express = require("express");
+import "express-session";
+import graphqlHTTP = require("express-graphql");
+import { GraphQLSchema } from "graphql/type/schema";
 
 const app = express();
 const schema: GraphQLSchema = {
@@ -20,10 +20,10 @@ const graphqlOption: graphqlHTTP.OptionsData = {
     graphiql: true,
     schema,
     formatError: (error: Error) => ({
-        message: error.message
+        message: error.message,
     }),
     validationRules: [() => false, () => true],
-    extensions: ({ document, variables, operationName, result }) => ({ key: "value", key2: "value"}),
+    extensions: ({ document, variables, operationName, result }) => ({ key: "value", key2: "value" }),
 };
 
 const graphqlOptionRequest = (request: express.Request): graphqlHTTP.OptionsData => ({
@@ -38,15 +38,15 @@ const graphqlOptionRequestAsync = async (request: express.Request): Promise<grap
         graphiql: true,
         schema: await Promise.resolve(schema),
         context: request.session,
-        extensions: async (args) => { },
+        extensions: async args => {},
         validationRules: [() => false, () => true],
     };
 };
 
-app.use('/graphql1', graphqlHTTP(graphqlOption));
+app.use("/graphql1", graphqlHTTP(graphqlOption));
 
-app.use('/graphql2', graphqlHTTP(graphqlOptionRequest));
+app.use("/graphql2", graphqlHTTP(graphqlOptionRequest));
 
-app.use('/graphqlasync', graphqlHTTP(graphqlOptionRequestAsync));
+app.use("/graphqlasync", graphqlHTTP(graphqlOptionRequestAsync));
 
-app.listen(8080, () => console.log('GraphQL Server running on localhost:8080'));
+app.listen(8080, () => console.log("GraphQL Server running on localhost:8080"));
diff --git a/types/express-graphql/index.d.ts b/types/express-graphql/index.d.ts
index 4b2d10c99b..b00259e158 100644
--- a/types/express-graphql/index.d.ts
+++ b/types/express-graphql/index.d.ts
@@ -9,7 +9,7 @@
 // TypeScript Version: 2.3
 
 import { Request, Response } from "express";
-import { DocumentNode, GraphQLSchema, GraphQLError } from 'graphql';
+import { DocumentNode, GraphQLSchema, GraphQLError } from "graphql";
 export = graphqlHTTP;
 
 declare namespace graphqlHTTP {
@@ -17,9 +17,9 @@ declare namespace graphqlHTTP {
      * Used to configure the graphQLHTTP middleware by providing a schema
      * and other configuration options.
      */
-    export type Options = ((request: Request,
-        response: Response,
-        params?: GraphQLParams) => OptionsResult) | OptionsResult;
+    export type Options =
+        | ((request: Request, response: Response, params?: GraphQLParams) => OptionsResult)
+        | OptionsResult;
     export type OptionsResult = OptionsData | Promise<OptionsData>;
     export interface OptionsData {
         /**

From 08716e9683a4c86ad8ea0bd9143d8387337156a7 Mon Sep 17 00:00:00 2001
From: Zev Spitz <shivisi@hotmail.com>
Date: Wed, 28 Mar 2018 08:47:59 +0200
Subject: [PATCH 0910/1382] Replace forEach with for...of in tests

---
 types/activex-wia/activex-wia-tests.ts | 39 ++++++++++++++------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/types/activex-wia/activex-wia-tests.ts b/types/activex-wia/activex-wia-tests.ts
index c33385af14..8fc7dcfd2e 100644
--- a/types/activex-wia/activex-wia-tests.ts
+++ b/types/activex-wia/activex-wia-tests.ts
@@ -11,6 +11,9 @@ const collectionToArray = <T>(col: { Item(key: any): T }): T[] => {
     return results;
 };
 
+WScript.Echo('Hello, world');
+WScript.Quit();
+
 // source -- https://msdn.microsoft.com/en-us/library/windows/desktop/ms630826(v=vs.85).aspx
 {
     const cd = new ActiveXObject('WIA.CommonDialog');
@@ -51,7 +54,7 @@ const collectionToArray = <T>(col: { Item(key: any): T }): T[] => {
     {
         const dev = cd.ShowSelectDevice();
         if (dev) {
-            collectionToArray(dev.Properties).forEach(p => {
+            for (const p of collectionToArray(dev.Properties)) {
                 let s = `${p.Name} (${p.PropertyID}) = `;
                 if (p.IsVector) {
                     s += '[vector of data]';
@@ -84,7 +87,7 @@ const collectionToArray = <T>(col: { Item(key: any): T }): T[] => {
                 }
 
                 WScript.Echo(s);
-            });
+            }
         }
     }
 
@@ -112,7 +115,7 @@ const collectionToArray = <T>(col: { Item(key: any): T }): T[] => {
     {
         const img = cd.ShowAcquireImage();
         if (img) {
-            collectionToArray(img.Properties).forEach(p => {
+            for (const p of collectionToArray(img.Properties)) {
                 let contents = '';
                 if (p.IsVector) {
                     contents = '[vector data not emitted]';
@@ -124,7 +127,7 @@ const collectionToArray = <T>(col: { Item(key: any): T }): T[] => {
                     contents = p.Value;
                 }
                 WScript.Echo(`${p.Name} (${p.PropertyID}) = ${contents}`);
-            });
+            }
         }
     }
 
@@ -133,12 +136,12 @@ const collectionToArray = <T>(col: { Item(key: any): T }): T[] => {
         const dev = cd.ShowSelectDevice();
         if (dev) {
             const actionEvent = WIA.WiaEventFlag.ActionEvent;
-            collectionToArray(dev.Events).forEach(e => {
+            for (const e of collectionToArray(dev.Events)) {
                 const msg = (e.Type & actionEvent) === actionEvent ?
                     `${e.Name} is an Action event` :
                     `${e.Name} is not an Action event`;
                 WScript.Echo(msg);
-            });
+            }
         }
     }
 
@@ -208,14 +211,14 @@ Frame count = ${img.FrameCount}}
     // Create an imageprocess object and enumerate filters
     {
         const ip = new ActiveXObject('WIA.ImageProcess');
-        collectionToArray(ip.FilterInfos).forEach(fi => {
+        for (const fi of collectionToArray(ip.FilterInfos)) {
             const s = [
                 fi.Name,
                 new Array(51).join('='),
                 fi.Description
             ].join('\n');
             WScript.Echo(s);
-        });
+        }
     }
 
     // Create an imageprocess object and create one of each available filter
@@ -269,11 +272,11 @@ Frame count = ${img.FrameCount}}
             WScript.Echo(s);
         };
 
-        collectionToArray(ip.FilterInfos).forEach(fi => {
+        for (const fi of collectionToArray(ip.FilterInfos)) {
             ip.Filters.Add(fi.FilterID);
             listProperties(ip.Filters(1));
             ip.Filters.Remove(1);
-        });
+        }
     }
 
     // List the supported transfer formats
@@ -308,14 +311,14 @@ Frame count = ${img.FrameCount}}
     {
         const dev = cd.ShowSelectDevice();
         if (dev) {
-            collectionToArray(dev.Items).forEach(item => {
+            for (const item of collectionToArray(dev.Items)) {
                 let s: string = item.Properties("Item Name").Value;
                 if (item.Properties.Exists("Item Time Stamp")) {
                     const v: WIA.Vector = item.Properties("Item Time Stamp").Value;
                     if (v.Count === 8) { s += ` (${v.Date})`; }
                 }
                 WScript.Echo(s);
-            });
+            }
         }
     }
 
@@ -340,16 +343,16 @@ Frame count = ${img.FrameCount}}
     }
 
     // List all available devices by name and deviceid
-    collectionToArray(dm.DeviceInfos).forEach(di => {
+    for (const di of collectionToArray(dm.DeviceInfos)) {
         const name: string = di.Properties("Name").Value;
         WScript.Echo(`${name} (${di.DeviceID})`);
-    });
+    }
 
     // Display all the properties for the selected device
     {
         const dev = cd.ShowSelectDevice();
         if (dev) {
-            collectionToArray(dev.Properties).forEach(p => {
+            for (const p of collectionToArray(dev.Properties)) {
                 const name = `${p.Name} (${p.PropertyID})`;
                 let contents: string;
                 if (p.IsVector) {
@@ -360,7 +363,7 @@ Frame count = ${img.FrameCount}}
                     contents = p.Value;
                 }
                 WScript.Echo(`${name} = ${contents}`);
-            });
+            }
         }
     }
 
@@ -430,7 +433,7 @@ Frame count = ${img.FrameCount}}
                 if (args[0] === 'connect') {
                     const deviceID = args[1].substr(12);
                     const device = dm.DeviceInfos(deviceID).Connect();
-                    collectionToArray(device.Items).forEach(item => {
+                    for (const item of collectionToArray(device.Items)) {
                         const img = item.Transfer();
                         img.SaveFile(`C:\\${item.Properties('Item Name').Value}.${img.FileExtension}`);
 
@@ -445,7 +448,7 @@ Frame count = ${img.FrameCount}}
                                 WScript.Echo(error);
                             }
                         }
-                    });
+                    }
                     WScript.Quit();
                 }
                 break;

From 73c777a74a44cb85e5be44e19d0afde8a94c44d8 Mon Sep 17 00:00:00 2001
From: Firede <firede@firede.us>
Date: Wed, 28 Mar 2018 14:49:05 +0800
Subject: [PATCH 0911/1382] Fixed the definition of some optional fields.

`express-graphql` version: 0.6.12
---
 types/express-graphql/index.d.ts | 34 ++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/types/express-graphql/index.d.ts b/types/express-graphql/index.d.ts
index b00259e158..78c988204f 100644
--- a/types/express-graphql/index.d.ts
+++ b/types/express-graphql/index.d.ts
@@ -5,6 +5,7 @@
 //                 Daniel Fader <https://github.com/hubel>
 //                 Ehsan Ziya <https://github.com/zya>
 //                 Margus Lamp <https://github.com/mlamp>
+//                 Firede <https://github.com/firede>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -14,8 +15,11 @@ export = graphqlHTTP;
 
 declare namespace graphqlHTTP {
     /**
-     * Used to configure the graphQLHTTP middleware by providing a schema
+     * Used to configure the graphqlHTTP middleware by providing a schema
      * and other configuration options.
+     *
+     * Options can be provided as an Object, a Promise for an Object, or a Function
+     * that returns an Object or a Promise for an Object.
      */
     export type Options =
         | ((request: Request, response: Response, params?: GraphQLParams) => OptionsResult)
@@ -40,20 +44,20 @@ declare namespace graphqlHTTP {
         /**
          * A boolean to configure whether the output should be pretty-printed.
          */
-        pretty?: boolean;
+        pretty?: boolean | null;
 
         /**
          * An optional function which will be used to format any errors produced by
          * fulfilling a GraphQL operation. If no function is provided, GraphQL's
          * default spec-compliant `formatError` function will be used.
          */
-        formatError?: (error: GraphQLError) => any;
+        formatError?: ((error: GraphQLError) => any) | null;
 
         /**
          * An optional array of validation rules that will be applied on the document
          * in additional to those defined by the GraphQL spec.
          */
-        validationRules?: any[];
+        validationRules?: any[] | null;
 
         /**
          * An optional function for adding additional metadata to the GraphQL response
@@ -65,12 +69,12 @@ declare namespace graphqlHTTP {
          *
          * This function may be async.
          */
-        extensions?: (info: RequestInfo) => { [key: string]: any };
+        extensions?: ((info: RequestInfo) => { [key: string]: any }) | null;
 
         /**
          * A boolean to optionally enable GraphiQL mode.
          */
-        graphiql?: boolean;
+        graphiql?: boolean | null;
     }
 
     /**
@@ -80,32 +84,32 @@ declare namespace graphqlHTTP {
         /**
          * The parsed GraphQL document.
          */
-        document?: DocumentNode;
+        document: DocumentNode | null | undefined;
 
         /**
          * The variable values used at runtime.
          */
-        variables?: { [name: string]: any };
+        variables: { [name: string]: any } | null | undefined;
 
         /**
          * The (optional) operation name requested.
          */
-        operationName?: string;
+        operationName: string | null | undefined;
 
         /**
          * The result of executing the operation.
          */
-        result?: any;
+        result: any;
     }
 
     export interface GraphQLParams {
-        query?: string;
-        variables?: { [name: string]: any };
-        operationName?: string;
-        raw?: boolean;
+        query: string | null | undefined;
+        variables: { [name: string]: any } | null | undefined;
+        operationName: string | null | undefined;
+        raw: boolean | null | undefined;
     }
 
-    type Middleware = (request: Request, response: Response) => void;
+    type Middleware = (request: Request, response: Response) => Promise<undefined>;
 }
 
 /**

From 3e6f8de9dc2724547d1e938787051a4d000ff8c7 Mon Sep 17 00:00:00 2001
From: Zev Spitz <shivisi@hotmail.com>
Date: Wed, 28 Mar 2018 09:04:28 +0200
Subject: [PATCH 0912/1382] Use ReadonlyArray

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

diff --git a/types/activex-wia/activex-wia-tests.ts b/types/activex-wia/activex-wia-tests.ts
index 8fc7dcfd2e..1effbe99ee 100644
--- a/types/activex-wia/activex-wia-tests.ts
+++ b/types/activex-wia/activex-wia-tests.ts
@@ -1,6 +1,6 @@
 // Note -- running these tests under cscript requires some ES5 polyfills
 
-const collectionToArray = <T>(col: { Item(key: any): T }): T[] => {
+const collectionToArray = <T>(col: { Item(key: any): T }): ReadonlyArray<T> => {
     const results: T[] = [];
     const enumerator = new Enumerator<T>(col);
     enumerator.moveFirst();

From f7255883d0126c51a61a1bc874bf5de4b437c396 Mon Sep 17 00:00:00 2001
From: Zev Spitz <shivisi@hotmail.com>
Date: Wed, 28 Mar 2018 09:05:30 +0200
Subject: [PATCH 0913/1382] Undo ReadonlyArray

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

diff --git a/types/activex-wia/activex-wia-tests.ts b/types/activex-wia/activex-wia-tests.ts
index 1effbe99ee..8fc7dcfd2e 100644
--- a/types/activex-wia/activex-wia-tests.ts
+++ b/types/activex-wia/activex-wia-tests.ts
@@ -1,6 +1,6 @@
 // Note -- running these tests under cscript requires some ES5 polyfills
 
-const collectionToArray = <T>(col: { Item(key: any): T }): ReadonlyArray<T> => {
+const collectionToArray = <T>(col: { Item(key: any): T }): T[] => {
     const results: T[] = [];
     const enumerator = new Enumerator<T>(col);
     enumerator.moveFirst();

From ac6eb13e40e93553c1d9743924a5aa408d548cf0 Mon Sep 17 00:00:00 2001
From: Firede <firede@firede.us>
Date: Wed, 28 Mar 2018 15:25:04 +0800
Subject: [PATCH 0914/1382] Defining `schema` the right way.

Otherwise, it will cause the new version `@types/graphql` test to fail.
Related: #24566
---
 types/express-graphql/express-graphql-tests.ts | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/types/express-graphql/express-graphql-tests.ts b/types/express-graphql/express-graphql-tests.ts
index 958be4f5ff..52071cea07 100644
--- a/types/express-graphql/express-graphql-tests.ts
+++ b/types/express-graphql/express-graphql-tests.ts
@@ -1,20 +1,10 @@
 import express = require("express");
 import "express-session";
 import graphqlHTTP = require("express-graphql");
-import { GraphQLSchema } from "graphql/type/schema";
+import { buildSchema } from "graphql";
 
 const app = express();
-const schema: GraphQLSchema = {
-    getQueryType: null,
-    getMutationType: null,
-    getSubscriptionType: null,
-    getTypeMap: null,
-    getType: null,
-    getPossibleTypes: null,
-    isPossibleType: null,
-    getDirective: null,
-    getDirectives: null,
-};
+const schema = buildSchema(`type Query { hello: String }`);
 
 const graphqlOption: graphqlHTTP.OptionsData = {
     graphiql: true,

From cd800800a9ef8c060ac209ae6b88604fc1d5d6f2 Mon Sep 17 00:00:00 2001
From: Firede <firede@firede.us>
Date: Wed, 28 Mar 2018 16:05:34 +0800
Subject: [PATCH 0915/1382] Rewrite tests.

`GraphQLResolveInfo` is usually generated internally by graphql.
---
 .../graphql-list-fields-tests.ts              | 62 ++++++++-----------
 1 file changed, 26 insertions(+), 36 deletions(-)

diff --git a/types/graphql-list-fields/graphql-list-fields-tests.ts b/types/graphql-list-fields/graphql-list-fields-tests.ts
index ee9bcc6851..e90d609f1d 100644
--- a/types/graphql-list-fields/graphql-list-fields-tests.ts
+++ b/types/graphql-list-fields/graphql-list-fields-tests.ts
@@ -1,41 +1,31 @@
 import getFieldNames = require("graphql-list-fields");
 
-import {
-    GraphQLID,
-    GraphQLObjectType,
-    GraphQLResolveInfo,
-    GraphQLSchema,
-    GraphQLString
-} from "graphql";
+import { GraphQLID, GraphQLObjectType, GraphQLSchema, GraphQLString } from "graphql";
 
-const sampleGraphQLResolveInfo: GraphQLResolveInfo = {
-    fieldName: "",
-    fieldNodes: [],
-    returnType: GraphQLString,
-    parentType: new GraphQLObjectType({
-        name: "Sample",
+const schema = new GraphQLSchema({
+    query: new GraphQLObjectType({
+        name: "SampleType",
         fields: {
-            name: { type: GraphQLString }
-        }
+            scalarField: {
+                type: GraphQLString,
+                resolve(source, args, context, info) {
+                    const fieldNames: string[] = getFieldNames(info);
+                },
+            },
+            someType: {
+                type: new GraphQLObjectType({
+                    name: "SomeType",
+                    fields: {
+                        a: { type: GraphQLID },
+                        b: { type: GraphQLString },
+                        c: { type: GraphQLString },
+                        d: { type: GraphQLString },
+                    },
+                }),
+                resolve(source, args, context, info) {
+                    const fieldNames: string[] = getFieldNames(info);
+                },
+            },
+        },
     }),
-    path: undefined,
-    schema: new GraphQLSchema({
-        query: new GraphQLObjectType({
-            name: "SampleType",
-            fields: {}
-        })
-    }),
-    fragments: {},
-    rootValue: null,
-    operation: {
-        kind: "OperationDefinition",
-        operation: "query",
-        selectionSet: {
-            kind: "SelectionSet",
-            selections: []
-        }
-    },
-    variableValues: {}
-};
-
-const fieldNames: string[] = getFieldNames(sampleGraphQLResolveInfo);
+});

From 026dc969c2cf6077a21271d37cc3c912fa43be89 Mon Sep 17 00:00:00 2001
From: Mykolas Kairys <m.kairys@adform.com>
Date: Wed, 28 Mar 2018 11:24:08 +0300
Subject: [PATCH 0916/1382] updated react-router-redux createMatchSelector
 definition to not have generic

---
 types/react-router-redux/index.d.ts  | 2 +-
 types/react-router-redux/tslint.json | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/types/react-router-redux/index.d.ts b/types/react-router-redux/index.d.ts
index 89ef136014..7c8d78ccc9 100644
--- a/types/react-router-redux/index.d.ts
+++ b/types/react-router-redux/index.d.ts
@@ -80,4 +80,4 @@ export interface LocationChangeAction {
 
 export function routerMiddleware(history: History): Middleware;
 
-export function createMatchSelector<State extends { router: RouterState }, Params>(path: string): (state: State) => match<Params> | null;
+export function createMatchSelector(path: string): (state: { router: RouterState }) => match<{}> | null;
diff --git a/types/react-router-redux/tslint.json b/types/react-router-redux/tslint.json
index 71ee04c4e1..f93cf8562a 100644
--- a/types/react-router-redux/tslint.json
+++ b/types/react-router-redux/tslint.json
@@ -1,6 +1,3 @@
 {
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "no-unnecessary-generics": false
-    }
+    "extends": "dtslint/dt.json"
 }

From 6fcf793f2aae2d70e737d08f0b42fb4f56d5846b Mon Sep 17 00:00:00 2001
From: bang <sqibang@gmail.com>
Date: Wed, 28 Mar 2018 16:48:29 +0800
Subject: [PATCH 0917/1382] fix: optional T

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

diff --git a/types/inquirer/index.d.ts b/types/inquirer/index.d.ts
index b793673215..d9258f7a48 100644
--- a/types/inquirer/index.d.ts
+++ b/types/inquirer/index.d.ts
@@ -17,7 +17,7 @@ import through = require('through');
 declare namespace inquirer {
     type Prompts = { [name: string]: PromptModule };
     type ChoiceType = string | objects.ChoiceOption | objects.Separator;
-    type Questions<T> =
+    type Questions<T = Answers> =
         | Question<T>
         | ReadonlyArray<Question<T>>
         | Rx.Observable<Question<T>>;

From cd12005ec0bd6bd4fb06aeb69b9b58aa1db259f7 Mon Sep 17 00:00:00 2001
From: Juan Jimenez-Anca <juan@j3a.solutions>
Date: Wed, 28 Mar 2018 10:14:40 +0100
Subject: [PATCH 0918/1382] add Uint8Array for browsers

---
 types/ethereumjs-util/index.d.ts | 54 ++++++++++++++++----------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/types/ethereumjs-util/index.d.ts b/types/ethereumjs-util/index.d.ts
index 7a29b38ff5..eb47d3a6a9 100644
--- a/types/ethereumjs-util/index.d.ts
+++ b/types/ethereumjs-util/index.d.ts
@@ -20,64 +20,64 @@ export function addHexPrefix(str: string): string;
 
 export function arrayContainsArray(superset: any, subset: any, some: any): any;
 
-export function baToJSON(ba: Buffer | string[]): Buffer | string[];
+export function baToJSON(ba: Buffer | Uint8Array | string[]): Buffer | Uint8Array | string[];
 
-export function bufferToHex(buf: Buffer): string;
+export function bufferToHex(buf: Buffer | Uint8Array): string;
 
-export function bufferToInt(buf: Buffer): string;
+export function bufferToInt(buf: Buffer | Uint8Array): string;
 
 export function defineProperties(self: {[k: string]: any}, fields: string[], data: {[k: string]: any}): {[k: string]: any};
 
-export function ecrecover(msgHash: Buffer, v: number, r: Buffer, s: Buffer): Buffer;
+export function ecrecover(msgHash: Buffer | Uint8Array, v: number, r: Buffer | Uint8Array, s: Buffer | Uint8Array): Buffer | Uint8Array;
 
-export function ecsign(msgHash: Buffer, privateKey: Buffer): {[k: string]: any};
+export function ecsign(msgHash: Buffer | Uint8Array, privateKey: Buffer | Uint8Array): {[k: string]: any};
 
 export function fromRpcSig(sig: string): {[k: string]: any};
 
-export function fromSigned(num: Buffer): any;
+export function fromSigned(num: Buffer | Uint8Array): any;
 
-export function generateAddress(from: Buffer, nonce: Buffer): Buffer;
+export function generateAddress(from: Buffer | Uint8Array, nonce: Buffer | Uint8Array): Buffer | Uint8Array;
 
-export function hashPersonalMessage(message: string): Buffer;
+export function hashPersonalMessage(message: string): Buffer | Uint8Array;
 
-export function importPublic(publicKey: Buffer): Buffer;
+export function importPublic(publicKey: Buffer | Uint8Array): Buffer | Uint8Array;
 
 export function isValidAddress(address: string): boolean;
 
-export function isValidChecksumAddress(address: Buffer): boolean;
+export function isValidChecksumAddress(address: Buffer | Uint8Array): boolean;
 
-export function isValidPrivate(privateKey: Buffer): boolean;
+export function isValidPrivate(privateKey: Buffer | Uint8Array): boolean;
 
-export function isValidPublic(publicKey: Buffer, sanitize?: boolean): any;
+export function isValidPublic(publicKey: Buffer | Uint8Array, sanitize?: boolean): any;
 
-export function isValidSignature(v: Buffer, r: Buffer, s: Buffer, homestead?: boolean): boolean;
+export function isValidSignature(v: Buffer | Uint8Array, r: Buffer | Uint8Array, s: Buffer | Uint8Array, homestead?: boolean): boolean;
 
-export function privateToAddress(privateKey: Buffer): Buffer;
+export function privateToAddress(privateKey: Buffer | Uint8Array): Buffer | Uint8Array;
 
-export function privateToPublic(privateKey: Buffer): Buffer;
+export function privateToPublic(privateKey: Buffer | Uint8Array): Buffer | Uint8Array;
 
-export function pubToAddress(pubKey: Buffer, sanitize: boolean): Buffer;
+export function pubToAddress(pubKey: Buffer | Uint8Array, sanitize: boolean): Buffer | Uint8Array;
 
-export function ripemd160(a: Buffer | any[] | string | number, padded: boolean): Buffer;
+export function ripemd160(a: Buffer | Uint8Array | any[] | string | number, padded: boolean): Buffer | Uint8Array;
 
-export function rlphash(a: Buffer | any[] | string | number): Buffer;
+export function rlphash(a: Buffer | Uint8Array | any[] | string | number): Buffer | Uint8Array;
 
-export function setLengthLeft(msg: Buffer | any[], length: number, right?: boolean): Buffer | any[];
+export function setLengthLeft(msg: Buffer | Uint8Array | any[], length: number, right?: boolean): Buffer | Uint8Array | any[];
 
-export function setLengthRight(msg: Buffer | any[], length: number): Buffer | any[];
+export function setLengthRight(msg: Buffer | Uint8Array | any[], length: number): Buffer | Uint8Array | any[];
 
-export function sha256(a: Buffer | any[] | string | number): Buffer;
+export function sha256(a: Buffer | Uint8Array | any[] | string | number): Buffer | Uint8Array;
 
-export function sha3(a: Buffer | any[] | string | number, bits?: number): Buffer;
+export function sha3(a: Buffer | Uint8Array | any[] | string | number, bits?: number): Buffer | Uint8Array;
 
-export function toBuffer(v: any): Buffer;
+export function toBuffer(v: any): Buffer | Uint8Array;
 
 export function toChecksumAddress(address: string): string;
 
-export function toRpcSig(v: number, r: Buffer, s: Buffer): string;
+export function toRpcSig(v: number, r: Buffer | Uint8Array, s: Buffer | Uint8Array): string;
 
-export function toUnsigned(num: any): Buffer;
+export function toUnsigned(num: any): Buffer | Uint8Array;
 
-export function unpad<T extends Buffer | any[] | string>(a: T): T;
+export function unpad<T extends Buffer | Uint8Array | any[] | string>(a: T): T;
 
-export function zeros(bytes: number): Buffer;
+export function zeros(bytes: number): Buffer | Uint8Array;

From 3ccca87866a0517cfb9ba67381430461d37efcca Mon Sep 17 00:00:00 2001
From: Firede <firede@firede.us>
Date: Wed, 28 Mar 2018 17:49:44 +0800
Subject: [PATCH 0919/1382] Fixed types.

---
 types/graphql/language/directiveLocation.d.ts    |  7 +++++--
 types/graphql/language/kinds.d.ts                |  7 +++++--
 types/graphql/language/lexer.d.ts                |  7 +++++--
 types/graphql/utilities/findBreakingChanges.d.ts | 14 ++++++++++----
 4 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/types/graphql/language/directiveLocation.d.ts b/types/graphql/language/directiveLocation.d.ts
index 412e3ad32a..16c42d7877 100644
--- a/types/graphql/language/directiveLocation.d.ts
+++ b/types/graphql/language/directiveLocation.d.ts
@@ -1,7 +1,10 @@
 /**
  * The set of allowed directive location values.
  */
-export type DirectiveLocation = {
+export const DirectiveLocation: _DirectiveLocation;
+
+// @internal
+type _DirectiveLocation = {
     // Request Definitions
     QUERY: "QUERY";
     MUTATION: "MUTATION";
@@ -28,4 +31,4 @@ export type DirectiveLocation = {
 /**
  * The enum type representing the directive location values.
  */
-export type DirectiveLocationEnum = DirectiveLocation[keyof DirectiveLocation];
+export type DirectiveLocationEnum = _DirectiveLocation[keyof _DirectiveLocation];
diff --git a/types/graphql/language/kinds.d.ts b/types/graphql/language/kinds.d.ts
index 6e497cbc68..768f00addd 100644
--- a/types/graphql/language/kinds.d.ts
+++ b/types/graphql/language/kinds.d.ts
@@ -1,7 +1,10 @@
 /**
  * The set of allowed kind values for AST nodes.
  */
-export type Kind = {
+export const Kind: _Kind;
+
+// @internal
+type _Kind = {
     // Name
     NAME: "Name";
 
@@ -68,4 +71,4 @@ export type Kind = {
 /**
  * The enum type representing the possible kind values of AST nodes.
  */
-export type KindEnum = Kind[keyof Kind];
+export type KindEnum = _Kind[keyof _Kind];
diff --git a/types/graphql/language/lexer.d.ts b/types/graphql/language/lexer.d.ts
index 69fa3df460..19a57d3a11 100644
--- a/types/graphql/language/lexer.d.ts
+++ b/types/graphql/language/lexer.d.ts
@@ -55,7 +55,10 @@ export interface Lexer<TOptions> {
  * An exported enum describing the different kinds of tokens that the
  * lexer emits.
  */
-export type TokenKind = {
+export const TokenKind: _TokenKind;
+
+// @internal
+type _TokenKind = {
     SOF: "<SOF>";
     EOF: "<EOF>";
     BANG: "!";
@@ -83,7 +86,7 @@ export type TokenKind = {
 /**
  * The enum type representing the token kinds values.
  */
-export type TokenKindEnum = TokenKind[keyof TokenKind];
+export type TokenKindEnum = _TokenKind[keyof _TokenKind];
 
 /**
  * A helper function to describe a token as a string for debugging
diff --git a/types/graphql/utilities/findBreakingChanges.d.ts b/types/graphql/utilities/findBreakingChanges.d.ts
index 77f98f848a..84f1bea158 100644
--- a/types/graphql/utilities/findBreakingChanges.d.ts
+++ b/types/graphql/utilities/findBreakingChanges.d.ts
@@ -12,7 +12,10 @@ import { GraphQLDirective } from "../type/directives";
 import { GraphQLSchema } from "../type/schema";
 import { DirectiveLocationEnum } from "../language/directiveLocation";
 
-export type BreakingChangeType = {
+export const BreakingChangeType : _BreakingChangeType;
+
+// @internal
+type _BreakingChangeType = {
     FIELD_CHANGED_KIND: "FIELD_CHANGED_KIND";
     FIELD_REMOVED: "FIELD_REMOVED";
     TYPE_CHANGED_KIND: "TYPE_CHANGED_KIND";
@@ -30,7 +33,10 @@ export type BreakingChangeType = {
     NON_NULL_DIRECTIVE_ARG_ADDED: "NON_NULL_DIRECTIVE_ARG_ADDED";
 };
 
-export type DangerousChangeType = {
+export const DangerousChangeType: _DangerousChangeType;
+
+// @internal
+type _DangerousChangeType = {
     ARG_DEFAULT_VALUE_CHANGE: "ARG_DEFAULT_VALUE_CHANGE";
     VALUE_ADDED_TO_ENUM: "VALUE_ADDED_TO_ENUM";
     INTERFACE_ADDED_TO_OBJECT: "INTERFACE_ADDED_TO_OBJECT";
@@ -40,12 +46,12 @@ export type DangerousChangeType = {
 };
 
 export interface BreakingChange {
-    type: keyof BreakingChangeType;
+    type: keyof _BreakingChangeType;
     description: string;
 }
 
 export interface DangerousChange {
-    type: keyof DangerousChangeType;
+    type: keyof _DangerousChangeType;
     description: string;
 }
 

From 7addf7ae18cfc3f62fe74dd3a8a813606eb05029 Mon Sep 17 00:00:00 2001
From: Timur Amirov <timur.amirov@zalando.de>
Date: Wed, 28 Mar 2018 13:14:26 +0200
Subject: [PATCH 0920/1382] Update typing for circuit-breaker-js

---
 types/circuit-breaker-js/circuit-breaker-js-tests.ts | 8 ++++++++
 types/circuit-breaker-js/index.d.ts                  | 8 +++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/types/circuit-breaker-js/circuit-breaker-js-tests.ts b/types/circuit-breaker-js/circuit-breaker-js-tests.ts
index 1436e13e90..b9a3c70a63 100644
--- a/types/circuit-breaker-js/circuit-breaker-js-tests.ts
+++ b/types/circuit-breaker-js/circuit-breaker-js-tests.ts
@@ -10,3 +10,11 @@ status = CircuitBreaker.OPEN;
 
 breaker.forceOpen();
 breaker.forceClose();
+
+breaker.run((success, failure) => {
+    if (Math.random() > 0.5) {
+        success();
+    } else {
+        failure();
+    }
+});
diff --git a/types/circuit-breaker-js/index.d.ts b/types/circuit-breaker-js/index.d.ts
index 6fc58bd40d..7b6854e61f 100644
--- a/types/circuit-breaker-js/index.d.ts
+++ b/types/circuit-breaker-js/index.d.ts
@@ -30,7 +30,13 @@ declare class CircuitBreaker {
     static CLOSED: 2;
 
     constructor(options?: CircuitBreaker.Options);
-    run(command: () => void, fallback?: () => void): void;
+    run(
+        command: (
+            success: () => void,
+            failure: () => void,
+        ) => void,
+        fallback?: () => void
+    ): void;
     forceClose(): void;
     forceOpen(): void;
     unforce(): void;

From 19341e612be15bc974a94371d51f4b3e312e675c Mon Sep 17 00:00:00 2001
From: Andrija Dvorski <dvorsky.andrija@gmail.com>
Date: Wed, 28 Mar 2018 15:00:03 +0200
Subject: [PATCH 0921/1382] Added types for command-line-usage package

---
 .../command-line-usage-tests.ts               | 24 ++++++++++
 types/command-line-usage/index.d.ts           | 48 +++++++++++++++++++
 types/command-line-usage/tsconfig.json        | 23 +++++++++
 types/command-line-usage/tslint.json          |  1 +
 4 files changed, 96 insertions(+)
 create mode 100644 types/command-line-usage/command-line-usage-tests.ts
 create mode 100644 types/command-line-usage/index.d.ts
 create mode 100644 types/command-line-usage/tsconfig.json
 create mode 100644 types/command-line-usage/tslint.json

diff --git a/types/command-line-usage/command-line-usage-tests.ts b/types/command-line-usage/command-line-usage-tests.ts
new file mode 100644
index 0000000000..c4dd127cea
--- /dev/null
+++ b/types/command-line-usage/command-line-usage-tests.ts
@@ -0,0 +1,24 @@
+import * as commandLineUsage from "command-line-usage";
+
+const sections = [
+    {
+        header: 'A typical app',
+        content: 'Generates something {italic very} important.'
+    },
+    {
+        header: 'Options',
+        optionList: [
+            {
+                name: 'input',
+                typeLabel: '{underline file}',
+                description: 'The input to process.'
+            },
+            {
+                name: 'help',
+                description: 'Print this usage guide.'
+            }
+        ]
+    }
+];
+
+const usage = commandLineUsage(sections);
diff --git a/types/command-line-usage/index.d.ts b/types/command-line-usage/index.d.ts
new file mode 100644
index 0000000000..ac4f1d7606
--- /dev/null
+++ b/types/command-line-usage/index.d.ts
@@ -0,0 +1,48 @@
+// Type definitions for command-line-usage 5.0
+// Project: https://github.com/75lb/command-line-usage#readme
+// Definitions by: Andrija Dvorski <https://github.com/Dvorsky>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+declare namespace commandLineUsage {
+    interface Section {
+        list: string[];
+
+        add(content: object): void;
+        emptyLine(): void;
+        header(text: string): void;
+        toString(): string;
+    }
+
+    interface SectionData {
+        optionList?: OptionListData[];
+        hide?: string[];
+        group?: string[];
+        header?: string;
+        reverseNameOrder?: boolean;
+        tableOptions?: any;
+    }
+
+    interface OptionListData extends SectionData {
+        name: string;
+        typeLabel?: string;
+        description?: string;
+    }
+
+    interface ContentSectionData extends SectionData {
+        content: string;
+        raw?: boolean;
+    }
+
+    type CommandLineUsageInput =
+        SectionData
+        | SectionData[]
+        | OptionListData
+        | OptionListData[]
+        | ContentSectionData
+        | ContentSectionData[];
+}
+
+declare function commandLineUsage(sections: commandLineUsage.CommandLineUsageInput): string | undefined | commandLineUsage.Section;
+
+export = commandLineUsage;
diff --git a/types/command-line-usage/tsconfig.json b/types/command-line-usage/tsconfig.json
new file mode 100644
index 0000000000..9deee9ab63
--- /dev/null
+++ b/types/command-line-usage/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "command-line-usage-tests.ts"
+    ]
+}
diff --git a/types/command-line-usage/tslint.json b/types/command-line-usage/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/command-line-usage/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 6623a7ee2549759ee82486e6f15159ed94bdcd00 Mon Sep 17 00:00:00 2001
From: Simon Schick <demwizzy@gmail.com>
Date: Wed, 28 Mar 2018 15:16:59 +0200
Subject: [PATCH 0922/1382] feat(types): add typings for bell

---
 types/bell/bell-tests.ts | 110 ++++++++++++++++
 types/bell/index.d.ts    | 273 +++++++++++++++++++++++++++++++++++++++
 types/bell/tsconfig.json |  23 ++++
 types/bell/tslint.json   |   6 +
 4 files changed, 412 insertions(+)
 create mode 100644 types/bell/bell-tests.ts
 create mode 100644 types/bell/index.d.ts
 create mode 100644 types/bell/tsconfig.json
 create mode 100644 types/bell/tslint.json

diff --git a/types/bell/bell-tests.ts b/types/bell/bell-tests.ts
new file mode 100644
index 0000000000..f8821f22ad
--- /dev/null
+++ b/types/bell/bell-tests.ts
@@ -0,0 +1,110 @@
+import { RequestQuery, Server } from 'hapi';
+import * as bell from 'bell';
+
+async function run() {
+    const server = new Server({ port: 8000 });
+    await server.register(bell);
+
+    // You'll need to go to https://developers.arcgis.com/en/applications and set up an application to get started
+    // Once you create your app you will get your ClientID and Client Secret.
+    // Also be sure to set redirect URL as well at the bottom of the screen in Redirect URIs section.
+
+    server.auth.strategy('arcgisonline', 'bell', {
+        provider: 'twitter',
+        password: 'some cookie password',
+        location: 'http://example.com/oauth',
+        clientId: '',
+        clientSecret: '',
+        scope(request) {
+            const scopes = ['public_profile', 'email'];
+            if ((<RequestQuery> request.query).wantsSharePermission) {
+              scopes.push('publish_actions');
+            }
+            return scopes;
+        }
+    });
+
+    const providers: bell.BellOptions[] = [{
+        provider: 'discord',
+        password: 'cookie_encryption_password_secure',
+        isSecure: false,
+        clientId: '',
+        clientSecret: '',
+        location: () => '',
+    },
+    {
+        provider: 'facebook',
+        password: 'cookie_encryption_password_secure',
+        isSecure: false,
+        clientId: '',
+        clientSecret: '',
+        location: server.info.uri
+    },
+    {
+        provider: 'google',
+        password: 'cookie_encryption_password_secure',
+        isSecure: false,
+        clientId: '',
+        clientSecret: '',
+        location: server.info.uri
+    },
+    {
+        provider: 'linkedin',
+        password: 'cookie_encryption_password_secure',
+        isSecure: false,
+        clientId: '',
+        clientSecret: '',
+        providerParams: {
+            redirect_uri: server.info.uri + '/bell/door'
+        }
+    },
+    {
+        provider: 'meetup',
+        password: 'cookie_encryption_password_secure',
+        isSecure: false,
+        clientId: '',
+        clientSecret: '',
+        scope: ['basic', 'ageless', 'group_edit', 'reporting'],
+    },
+    {
+        provider: 'nest',
+        password: 'cookie_encryption_password_secure',
+        isSecure: false,
+        clientId: '',
+        clientSecret: ''
+    },
+    {
+        provider: 'office365',
+        clientId: '',
+        clientSecret: '',
+        password: 'cookie_encryption_password_secure',
+        providerParams: {
+            response_type: 'code'
+        },
+        scope: ['openid', 'offline_access', 'profile']
+    },
+    {
+        provider: 'okta',
+        config: { uri: 'https://your-organization.okta.com' },
+        password: 'cookie_encryption_password_secure',
+        isSecure: false,
+        location: 'http://127.0.0.1:8000',
+        clientId: '',
+        clientSecret: ''
+    },
+    {
+        provider: 'slack',
+        password: 'cookie_encryption_password_secure',
+        isSecure: false,
+        clientId: '',
+        clientSecret: ''
+    },
+    {
+        provider: 'twitch',
+        password: 'cookie_encryption_password_secure',
+        isSecure: false,
+        clientId: '',
+        clientSecret: '',
+        scope: ['user_read', 'channel_read']
+    }];
+}
diff --git a/types/bell/index.d.ts b/types/bell/index.d.ts
new file mode 100644
index 0000000000..2af331b2b9
--- /dev/null
+++ b/types/bell/index.d.ts
@@ -0,0 +1,273 @@
+// Type definitions for bell 9.1
+// Project: https://github.com/hapijs/bell
+// Definitions by: Simon Schick <https://github.com/SimonSchick>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.7
+
+import { Server, Request, Plugin, AuthCredentials } from 'hapi';
+
+declare module 'hapi' {
+  interface ServerAuth {
+    strategy(name: string, scheme: 'bell', options: BellOptions): void;
+    strategy(
+      name: string,
+      scheme: 'bell',
+      mode: boolean | 'required' | 'optional' | 'try',
+      options: BellOptions,
+    ): void;
+  }
+}
+
+export interface StringLikeMap {
+    [key: string]: string | number;
+}
+export type Provider =
+    'arcgisonline' |
+    'auth0' |
+    'azuread' |
+    'bitbucket' |
+    'digitalocean' |
+    'discord' |
+    'dropbox' |
+    'dropboxV2' |
+    'facebook' |
+    'fitbit' |
+    'foursquare' |
+    'github' |
+    'gitlab' |
+    'google' |
+    'googleplus' |
+    'instagram' |
+    'linkedin' |
+    'live' |
+    'medium' |
+    'meetup' |
+    'mixer' |
+    'nest' |
+    'office365' |
+    'okta' |
+    'phabricator' |
+    'pingfed' |
+    'pinterest' |
+    'reddit' |
+    'salesforce' |
+    'slack' |
+    'spotify' |
+    'stripe' |
+    'trakt' |
+    'tumblr' |
+    'twitch' |
+    'twitter' |
+    'vk' |
+    'wordpress' |
+    'yahoo';
+
+export type RequestPassThrough = (
+  request: Request,
+  next: (err: Error | null, credentials: AuthCredentials) => void,
+) => void;
+
+export interface OptionalOptions {
+  /**
+   * the name of the cookie used to manage the temporary state.
+   * Defaults to 'bell-provider' where 'provider' is the provider name (or 'custom' for custom providers).
+   * For example, the Twitter cookie name defaults to 'bell-twitter'.
+   */
+  cookie?: string;
+  /**
+   * sets the cookie secure flag.
+   * Defaults to true.
+   */
+  isSecure?: boolean;
+  /**
+   * sets the cookie HTTP only flag.
+   * Defaults to true.
+   */
+  isHttpOnly?: boolean;
+  /**
+   * cookie time-to-live in milliseconds.
+   * Defaults to null (session time-life - cookies are deleted when the browser is closed).
+   */
+  ttl?: number;
+  /**
+   * the domain scope.
+   * Defaults to null (no domain).
+   */
+  domain?: string;
+  /**
+   * provider-specific query parameters for the authentication endpoint.
+   * It may be passed either as an object to merge into the query string,
+   * or a function which takes the client's request and returns an object.
+   * Each provider supports its own set of parameters which customize the user's login experience.
+   * For example:
+   * * Facebook supports `display` ('page', 'popup', or 'touch'), `auth_type`, `auth_nonce`.
+   * * Google supports `access_type`, `approval_prompt`, `prompt`, `login_hint`, `user_id`, `hd`.
+   * * Twitter supports `force_login`, `screen_name`.
+   * * Linkedin supports `fields`.
+   */
+  providerParams?: StringLikeMap | ((request: Request) => StringLikeMap);
+  /**
+   * allows passing query parameters from a bell protected endpoint to the auth request.
+   * It will merge the query params you pass along with the providerParams and any other predefined ones.
+   * Be aware that this will override predefined query parameters!
+   * Default to false.
+   */
+  allowRuntimeProviderParams?: StringLikeMap | boolean;
+  /**
+   * Each built-in vendor comes with the required scope for basic profile information.
+   * Use scope to specify a different scope as required by your application.
+   * It may be passed either as an object to merge into the query string,
+   * or a function which takes the client's request and returns an object.
+   * Consult the provider for their specific supported scopes.
+   */
+  scope?: string[] | ((request: Request) => string[]);
+  /**
+   * skips obtaining a user profile from the provider.
+   * Useful if you need specific scopes,
+   * but not the user profile.
+   * Defaults to false.
+   */
+  skipProfile?: boolean;
+  /**
+   * a configuration object used to customize the provider settings.
+   * The built-in 'twitter' provider accepts the `extendedProfile` & `getMethod` options.
+   * option which allows disabling the extra profile request when the provider
+   * returns the user information in the callback (defaults to true).
+   * The built-in 'github' and 'phabricator' providers accept the uri
+   * option which allows pointing to a private enterprise installation (e.g. 'https://vpn.example.com').
+   * See Providers documentation for more information.
+   */
+  config?: { extendedProfile?: boolean; getMethod?: string } | { uri?: string };
+  /**
+   * an object of key-value pairs that specify additional
+   * URL query parameters to send with the profile request to the provider.
+   * The built-in facebook provider,
+   * for example, could have fields specified to determine the fields returned from the user's graph,
+   * which would then be available to you in the auth.credentials.profile.raw object.
+   */
+  profileParams?: StringLikeMap;
+  /**
+   * allows passing additional OAuth state from initial request.
+   * This must be a function returning a string,
+   * which will be appended to the bell internal state parameter for OAuth code flow.
+   */
+  runtimeStateCallback?(req: Request): string;
+
+  // THESE ARE IN THE *REQUIRED* section but are actually not...
+  /**
+   * A boolean indicating whether or not you want the redirect_uri to be forced to https.
+   * Useful if your hapi application runs as http, but is accessed through https.
+   */
+  forceHttps?: boolean;
+  /**
+   * Set the base redirect_uri manually if it cannot be inferred properly from server settings.
+   * Useful to override port, protocol, and host if proxied or forwarded.
+   */
+  location?: string | ((req: Request) => string);
+}
+
+export interface RequiredProviderOptions {
+  /**
+   * the cookie encryption password.
+   * Used to encrypt the temporary state cookie used by the module in
+   * between the authorization protocol steps.
+   */
+  password: string;
+  /**
+   * the OAuth client identifier (consumer key).
+   */
+  clientId: string;
+  /**
+   * the OAuth client secret (consumer secret)
+   */
+  clientSecret: string;
+}
+
+export interface KnownProviderOptions extends RequiredProviderOptions, OptionalOptions {
+  provider: Provider;
+}
+
+/**
+ * @param uri the requested resource URI (bell will add the token or authentication header as needed).
+ * @param params any URI query parameters (cannot include them in the URI due to signature requirements).
+ */
+export type AuthedRequest = (uri: string, params: { [key: string]: string } | null) => Promise<any>;
+
+export interface CustomProtocol {
+  /**
+   * the authorization protocol used.
+   */
+  protocol: 'oauth' | 'oauth2';
+  /**
+   * the OAuth signature method (OAuth 1.0a only). Must be one of:
+   * * 'HMAC-SHA1' - default
+   * * 'RSA-SHA1' - in that case, the clientSecret is your RSA private key
+   */
+  signatureMethod?: 'HMAC-SHA1' | 'RSA-SHA1';
+  /**
+   * the temporary credentials (request token) endpoint (OAuth 1.0a only).
+   */
+  temporary?: string;
+  /**
+   * boolean that determines if OAuth client id and client secret will be sent
+   * as parameters as opposed to an Authorization header (OAuth 2.0 only).
+   * Defaults to false.
+   */
+  useParamsAuth?: boolean;
+  /**
+   * the authorization endpoint URI.
+   */
+  auth: string;
+  /**
+   * the access token endpoint URI.
+   */
+  token: string;
+  /**
+   * the OAuth version.
+   */
+  version?: string;
+  /**
+   * an array of scope strings (OAuth 2.0 only).
+   */
+  scope?: string[] | ((query: StringLikeMap) => string[]);
+  /**
+   * the scope separator character (OAuth 2.0 only). Only required when a provider has a broken OAuth 2.0 implementation. Defaults to space (Facebook and GitHub default to comma).
+   */
+  scopeSeparator?: string;
+  /**
+   * a headers object with additional headers required by the provider
+   * (e.g. GitHub required the 'User-Agent' header which is set by default).
+   */
+  headers?: {
+    [key: string]: string;
+  };
+  /**
+   * a function used to obtain user profile information and normalize it.
+   * @param credentials the credentials object.
+   * Change the object directly within the function (profile information is typically stored under credentials.profile).
+   * @param params the parsed information received from the provider (e.g. token, secret, and other custom fields).
+   * @param get an OAuth helper function to make authenticated requests using the credentials received.
+   */
+  profile(credentials: any, params: { [key: string]: string }, get: AuthedRequest): Promise<void>;
+}
+
+export interface CustomProviderOptions extends RequiredProviderOptions, OptionalOptions {
+  provider: CustomProtocol;
+}
+
+export type BellOptions = CustomProviderOptions | KnownProviderOptions;
+
+export const plugin: Plugin<CustomProviderOptions | KnownProviderOptions>;
+/*
+   * [See docs](https://github.com/hapijs/bell/blob/master/API.md#simulated-authentication)
+   */
+
+/**
+ * Enables simulation mode.
+ */
+export function simulate(credentialsFunc: RequestPassThrough): void;
+/**
+ * [See docs](https://github.com/hapijs/bell/blob/master/API.md#simulated-authentication)
+ * Disables simulation mode
+ */
+export function simulate(state: false): void;
diff --git a/types/bell/tsconfig.json b/types/bell/tsconfig.json
new file mode 100644
index 0000000000..4db30822b8
--- /dev/null
+++ b/types/bell/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "bell-tests.ts"
+    ]
+}
diff --git a/types/bell/tslint.json b/types/bell/tslint.json
new file mode 100644
index 0000000000..843d627f89
--- /dev/null
+++ b/types/bell/tslint.json
@@ -0,0 +1,6 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "unified-signatures": false // Disabling as it prevents me from using overloaded doctags
+    }
+}

From 17120c6111c99836e4a18b90f4c8c94817812117 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20L=C3=B3pez?= <rubenlg@users.noreply.github.com>
Date: Wed, 28 Mar 2018 15:20:43 +0200
Subject: [PATCH 0923/1382] Add PolymerSplice and ArraySplice to the Polymer
 typings

---
 types/polymer/index.d.ts | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/types/polymer/index.d.ts b/types/polymer/index.d.ts
index eee6a6250f..936d3362f4 100644
--- a/types/polymer/index.d.ts
+++ b/types/polymer/index.d.ts
@@ -312,6 +312,18 @@ declare global {
       whenReady(cb: Function): void;
     }
 
+    interface PolymerSplice {
+      index: number;
+      removed: Array<{}>;
+      addedCount: number;
+      object: Array<{}>;
+      type: string;
+    }
+
+    interface ArraySplice {
+      calculateSplices<T>(current: ReadonlyArray<T>, previous: ReadonlyArray<T>): PolymerSplice[];
+    }
+
     interface ImportStatus extends RenderStatus {
       whenLoaded(cb: Function): void;
     }

From 73f9ae00860eba66bcccae3a0a692eb2ec16d637 Mon Sep 17 00:00:00 2001
From: Ruben <ryu@google.com>
Date: Wed, 28 Mar 2018 15:24:51 +0200
Subject: [PATCH 0924/1382] Added ArraySplice to PolymerStatic, so it's
 available under Polymer.ArraySplice at runtime.

---
 types/polymer/index.d.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/types/polymer/index.d.ts b/types/polymer/index.d.ts
index 936d3362f4..c206c08927 100644
--- a/types/polymer/index.d.ts
+++ b/types/polymer/index.d.ts
@@ -341,6 +341,8 @@ declare global {
 
       RenderStatus: RenderStatus
 
+      ArraySplice: ArraySplice;
+
       /** @deprecated */
       ImportStatus: ImportStatus
     }

From c1fa2b114c40bcc7c84b0209cd18709694897950 Mon Sep 17 00:00:00 2001
From: Simon Schick <demwizzy@gmail.com>
Date: Wed, 28 Mar 2018 15:28:45 +0200
Subject: [PATCH 0925/1382] fixup! feat(types): add typings for bell

---
 types/bell/bell-tests.ts | 4 ----
 types/bell/index.d.ts    | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/types/bell/bell-tests.ts b/types/bell/bell-tests.ts
index f8821f22ad..65b3e5f4d5 100644
--- a/types/bell/bell-tests.ts
+++ b/types/bell/bell-tests.ts
@@ -5,10 +5,6 @@ async function run() {
     const server = new Server({ port: 8000 });
     await server.register(bell);
 
-    // You'll need to go to https://developers.arcgis.com/en/applications and set up an application to get started
-    // Once you create your app you will get your ClientID and Client Secret.
-    // Also be sure to set redirect URL as well at the bottom of the screen in Redirect URIs section.
-
     server.auth.strategy('arcgisonline', 'bell', {
         provider: 'twitter',
         password: 'some cookie password',
diff --git a/types/bell/index.d.ts b/types/bell/index.d.ts
index 2af331b2b9..14cdc65cb9 100644
--- a/types/bell/index.d.ts
+++ b/types/bell/index.d.ts
@@ -258,10 +258,6 @@ export interface CustomProviderOptions extends RequiredProviderOptions, Optional
 export type BellOptions = CustomProviderOptions | KnownProviderOptions;
 
 export const plugin: Plugin<CustomProviderOptions | KnownProviderOptions>;
-/*
-   * [See docs](https://github.com/hapijs/bell/blob/master/API.md#simulated-authentication)
-   */
-
 /**
  * Enables simulation mode.
  */

From d87aadbf306bb63f210d4e33c99d11bab45f567b Mon Sep 17 00:00:00 2001
From: Christian Rackerseder <git@echooff.de>
Date: Wed, 28 Mar 2018 15:37:13 +0200
Subject: [PATCH 0926/1382] Added types for enquire.js

---
 types/enquire.js/enquire.js-tests.ts | 17 +++++++++++
 types/enquire.js/index.d.ts          | 43 ++++++++++++++++++++++++++++
 types/enquire.js/tsconfig.json       | 23 +++++++++++++++
 types/enquire.js/tslint.json         |  1 +
 4 files changed, 84 insertions(+)
 create mode 100644 types/enquire.js/enquire.js-tests.ts
 create mode 100644 types/enquire.js/index.d.ts
 create mode 100644 types/enquire.js/tsconfig.json
 create mode 100644 types/enquire.js/tslint.json

diff --git a/types/enquire.js/enquire.js-tests.ts b/types/enquire.js/enquire.js-tests.ts
new file mode 100644
index 0000000000..7fce0dd571
--- /dev/null
+++ b/types/enquire.js/enquire.js-tests.ts
@@ -0,0 +1,17 @@
+import * as enquire from 'enquire.js';
+
+enquire
+    .register('(min-width: 300px) and (max-width: 600px)', {
+      deferSetup: true,
+      match: () => {},
+      unmatch: () => {},
+      setup: () => {},
+      destroy: () => {}
+    })
+    .register('(min-width: 300px) and (max-width: 600px)', {});
+
+enquire.register('(min-width: 300px) and (max-width: 600px)', [{}, {}], true);
+
+enquire.register('(min-width: 300px) and (max-width: 600px)', () => {}, true);
+
+enquire.unregister('(min-width: 300px) and (max-width: 600px)');
diff --git a/types/enquire.js/index.d.ts b/types/enquire.js/index.d.ts
new file mode 100644
index 0000000000..d7dcafdc30
--- /dev/null
+++ b/types/enquire.js/index.d.ts
@@ -0,0 +1,43 @@
+// Type definitions for enquire.js 2.1
+// Project: https://github.com/WickyNilliams/enquire.js/
+// Definitions by: Christian Rackerseder <https://github.com/screendriver>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+interface Options {
+    /**
+     * If set to true, defers execution of the setup function until the first time the media query is matched
+     */
+    deferSetup?: boolean;
+    /**
+     * If supplied, triggered when a media query matches.
+     */
+    match?(): void;
+    /**
+     * If supplied, triggered when the media query transitions from a matched state to an unmatched state.
+     */
+    unmatch?(): void;
+    /**
+     * If supplied, triggered once, when the handler is registered.
+     */
+    setup?(): void;
+
+    /**
+     * If supplied, triggered when handler is unregistered. Place cleanup code here
+     */
+    destroy?(): void;
+}
+
+type Callback = () => void;
+
+interface EnquireJs {
+    register(
+        mediaQuery: string,
+        options: Options | Options[] | Callback,
+        shouldDegrade?: boolean,
+    ): EnquireJs;
+    unregister(mediaQuery: string, handler?: Callback | Options): void;
+}
+
+declare const enquire: EnquireJs;
+export = enquire;
diff --git a/types/enquire.js/tsconfig.json b/types/enquire.js/tsconfig.json
new file mode 100644
index 0000000000..ffbd13d6e2
--- /dev/null
+++ b/types/enquire.js/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "enquire.js-tests.ts"
+    ]
+}
diff --git a/types/enquire.js/tslint.json b/types/enquire.js/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/enquire.js/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From c8b901e452b99fbba8ba3dca6801634e6ac3e64b Mon Sep 17 00:00:00 2001
From: Ruben <ryu@google.com>
Date: Wed, 28 Mar 2018 15:51:09 +0200
Subject: [PATCH 0927/1382] Include the notifySplices method, and also add a
 trivial test for the ArraySplice function with mutable and immutable arrays.

---
 types/polymer/index.d.ts       | 2 ++
 types/polymer/polymer-tests.ts | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/types/polymer/index.d.ts b/types/polymer/index.d.ts
index c206c08927..a4eca3e70b 100644
--- a/types/polymer/index.d.ts
+++ b/types/polymer/index.d.ts
@@ -139,6 +139,8 @@ declare global {
 
       unshift?(path: string, ...item: any[]): number;
 
+      notifySplices?(path: string, splices: ReadonlyArray<polymer.PolymerSplice>): void;
+
       // ResolveUrl
 
       resolveUrl?(url: string): string;
diff --git a/types/polymer/polymer-tests.ts b/types/polymer/polymer-tests.ts
index dcad66f871..2b6631ffb7 100644
--- a/types/polymer/polymer-tests.ts
+++ b/types/polymer/polymer-tests.ts
@@ -82,3 +82,11 @@ class MyElement3 implements polymer.Base {
 }
 
 Polymer(MyElement3);
+
+// Test splice computation
+const splices: polymer.PolymerSplice[] = Polymer.ArraySplice.calculateSplices(
+  [1,2,3], [1,2]);
+
+// Test that readonly arrays also work.
+const splices2: polymer.PolymerSplice[] = Polymer.ArraySplice.calculateSplices(
+  Object.freeze([1,2,3]), Object.freeze([1,2]));

From bf57bd768bcc45f01356c4f5816a4ab5a2a6f06c Mon Sep 17 00:00:00 2001
From: Feirell <Feirell@users.noreply.github.com>
Date: Wed, 28 Mar 2018 17:03:24 +0200
Subject: [PATCH 0928/1382] Added PlaneHelper in three-core.d.ts

---
 types/three/three-core.d.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/types/three/three-core.d.ts b/types/three/three-core.d.ts
index 5317e38396..8d153a65bc 100644
--- a/types/three/three-core.d.ts
+++ b/types/three/three-core.d.ts
@@ -7442,6 +7442,15 @@ export class VertexNormalsHelper extends LineSegments {
     update(object?: Object3D): void;
 }
 
+export class PlaneHelper extends LineSegments {
+    constructor(plane: Plane, size?: number, hex?: number);
+
+    plane: Plane;
+    size: number;
+
+    updateMatrixWorld(force: boolean): void;
+}
+
 /**
  * @deprecated Use {@link WireframeGeometry THREE.WireframeGeometry} instead.
  */

From f5da07c596079918095a5b3af7d104488fe05f81 Mon Sep 17 00:00:00 2001
From: Christian Rackerseder <git@echooff.de>
Date: Wed, 28 Mar 2018 19:49:44 +0200
Subject: [PATCH 0929/1382] Fixed import in test

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

diff --git a/types/enquire.js/enquire.js-tests.ts b/types/enquire.js/enquire.js-tests.ts
index 7fce0dd571..a11ba053c2 100644
--- a/types/enquire.js/enquire.js-tests.ts
+++ b/types/enquire.js/enquire.js-tests.ts
@@ -1,4 +1,4 @@
-import * as enquire from 'enquire.js';
+import enquire = require('enquire.js');
 
 enquire
     .register('(min-width: 300px) and (max-width: 600px)', {

From cc06c0bd237623a251bbd41fe4696321533e7a3b Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Wed, 28 Mar 2018 11:13:16 -0700
Subject: [PATCH 0930/1382] Update react-flatpickr with flatpickr's new exports

It switched to a default export that contains nested-nested types.
---
 types/react-flatpickr/index.d.ts                | 6 +++---
 types/react-flatpickr/react-flatpickr-tests.tsx | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/types/react-flatpickr/index.d.ts b/types/react-flatpickr/index.d.ts
index 68d79a2b6c..9683835e32 100644
--- a/types/react-flatpickr/index.d.ts
+++ b/types/react-flatpickr/index.d.ts
@@ -5,12 +5,12 @@
 // TypeScript Version: 2.6
 
 import { Component } from 'react';
-import { Options } from 'flatpickr';
+import flatpickr from 'flatpickr';
 
 export interface DateTimePickerProps {
     defaultValue?: string;
-    options?: Options.Options;
-    onChange?: Options.Hook;
+    options?: flatpickr.Options.Options;
+    onChange?: flatpickr.Options.Hook;
     value?: string;
 }
 
diff --git a/types/react-flatpickr/react-flatpickr-tests.tsx b/types/react-flatpickr/react-flatpickr-tests.tsx
index c3dc0f4adc..fbbb6f45a7 100644
--- a/types/react-flatpickr/react-flatpickr-tests.tsx
+++ b/types/react-flatpickr/react-flatpickr-tests.tsx
@@ -1,4 +1,4 @@
-import { Instance } from 'flatpickr';
+import flatpickr from 'flatpickr';
 import * as React from 'react';
 import DatePicker from 'react-flatpickr';
 
@@ -12,7 +12,7 @@ const options = {
 const optionsElement = <DatePicker options={ options }/>;
 
 const onChange = (
-    selectedDates: Date[], dateStr: string, instance: Instance,
+    selectedDates: Date[], dateStr: string, instance: flatpickr.Instance,
     elem: HTMLElement
 ) => null;
 const onChangeElement = <DatePicker onChange={ onChange }/>;

From 6cbc3a5006231ed33094cec162bf1e783f9cf51e Mon Sep 17 00:00:00 2001
From: emzeroit <eperez@emzeroit.com>
Date: Wed, 28 Mar 2018 15:40:28 -0300
Subject: [PATCH 0931/1382] Added session property to strategy options

---
 types/passport-local/index.d.ts | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/types/passport-local/index.d.ts b/types/passport-local/index.d.ts
index 2fe5bde949..9555046fed 100644
--- a/types/passport-local/index.d.ts
+++ b/types/passport-local/index.d.ts
@@ -6,20 +6,20 @@
 
 /// <reference types="passport"/>
 
-
-
-import { Strategy as PassportStrategy } from 'passport-strategy';
-import express = require('express');
+import { Strategy as PassportStrategy } from "passport-strategy";
+import express = require("express");
 
 interface IStrategyOptions {
     usernameField?: string;
     passwordField?: string;
+    session?: boolean;
     passReqToCallback?: false;
 }
 
 interface IStrategyOptionsWithRequest {
     usernameField?: string;
     passwordField?: string;
+    session?: boolean;
     passReqToCallback: true;
 }
 
@@ -28,15 +28,27 @@ interface IVerifyOptions {
 }
 
 interface VerifyFunctionWithRequest {
-    (req: express.Request, username: string, password: string, done: (error: any, user?: any, options?: IVerifyOptions) => void): void;
+    (
+        req: express.Request,
+        username: string,
+        password: string,
+        done: (error: any, user?: any, options?: IVerifyOptions) => void
+    ): void;
 }
 
 interface VerifyFunction {
-    (username: string, password: string, done: (error: any, user?: any, options?: IVerifyOptions) => void): void;
+    (
+        username: string,
+        password: string,
+        done: (error: any, user?: any, options?: IVerifyOptions) => void
+    ): void;
 }
 
 declare class Strategy extends PassportStrategy {
-    constructor(options: IStrategyOptionsWithRequest, verify: VerifyFunctionWithRequest);
+    constructor(
+        options: IStrategyOptionsWithRequest,
+        verify: VerifyFunctionWithRequest
+    );
     constructor(options: IStrategyOptions, verify: VerifyFunction);
     constructor(verify: VerifyFunction);
 

From 5c35553087fe172fbef3c1c5b10378c731e14d41 Mon Sep 17 00:00:00 2001
From: bmartinson <brian@brianmartinson.com>
Date: Wed, 28 Mar 2018 12:36:52 -0700
Subject: [PATCH 0932/1382] Add getActiveObjects Definition for fabric.Canvas

---
 types/fabric/fabric-impl.d.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/types/fabric/fabric-impl.d.ts b/types/fabric/fabric-impl.d.ts
index 397ea8984a..31509435a5 100644
--- a/types/fabric/fabric-impl.d.ts
+++ b/types/fabric/fabric-impl.d.ts
@@ -1427,6 +1427,11 @@ export class Canvas {
 	 * @return active object
 	 */
 	getActiveObject(): Object;
+	/**
+	 * Returns an array with the current selected objects
+	 * @return {Object[]} array of active objects
+	 */
+	getActiveObjects(): Object[];
 	/**
 	 * Returns pointer coordinates relative to canvas.
 	 * @return object with "x" and "y" number values

From 083f4fcee8e23b6f3c692ea21490a75aedd0c400 Mon Sep 17 00:00:00 2001
From: Ricardo de pena <ricardo@isnull.co>
Date: Wed, 28 Mar 2018 15:52:15 -0400
Subject: [PATCH 0933/1382] Fixed lint issues

---
 types/openfin/index.d.ts        | 74 ++++++++++++++++-----------------
 types/openfin/openfin-tests.ts  | 41 +++++++++---------
 types/openfin/tsconfig.json     |  5 ---
 types/openfin/v17/tsconfig.json |  7 +++-
 4 files changed, 65 insertions(+), 62 deletions(-)

diff --git a/types/openfin/index.d.ts b/types/openfin/index.d.ts
index 3ddbdf2edd..9428247938 100644
--- a/types/openfin/index.d.ts
+++ b/types/openfin/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for OpenFin API 29.0
 // Project: https://openfin.co/
 // Definitions by: Chris Barker <https://github.com/chrisbarker>
+//                 Ricardo de Pena <https://github.com/rdepena>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 // based on v8.56.29.51
@@ -641,8 +642,8 @@ declare namespace fin {
         /**
          * Download preload scripts from given URLs
          */
-        downloadPreloadScripts(scripts: Array<DownloadPreloadOption>, callback?: (downloadInfo: Array<DownloadPreloadInfo>) => void,
-                               errorCallback?:   (reason: string) => void): void;
+        downloadPreloadScripts(scripts: DownloadPreloadOption[], callback?: (downloadInfo: DownloadPreloadInfo[]) => void,
+                               errorCallback?: (reason: string) => void): void;
         /**
          * Downloads the given OpenFin Runtime.
          */
@@ -674,7 +675,7 @@ declare namespace fin {
         /**
          * Get additional info of cookies.
          */
-        getCookies(option: CookieOption, callback?: (info: Array<CookieInfo>) => void, errorCallback?: (reason: string) => void): void;
+        getCookies(option: CookieOption, callback?: (info: CookieInfo[]) => void, errorCallback?: (reason: string) => void): void;
         /**
          * Retrieves the command line argument string that started OpenFin Runtime.
          */
@@ -870,19 +871,18 @@ declare namespace fin {
 
     interface DownloadPreloadInfo {
         success: boolean;
-            url?: string;
-            error: string;
-        }
+        url?: string;
+        error: string;
+    }
 
-
-     interface CookieInfo {
+    interface CookieInfo {
         name: string;
         // expirationDate: Date;
         domain: string;
         path: string;
     }
 
-     interface CookieOption {
+    interface CookieOption {
         name: string;
     }
 
@@ -1145,8 +1145,8 @@ declare namespace fin {
              */
             uuid?: string;
             /*
-                * Process exit code
-                */
+             * Process exit code
+             */
             exitCode?: number;
         }): void;
     }
@@ -1215,13 +1215,13 @@ declare namespace fin {
         addEventListener(
             type: OpenFinWindowEventType,
             listener: (event: WindowBaseEvent
-                | WindowAuthRequestedEvent
-                | WindowBoundsEvent
-                | WindowExternalProcessStartedEvent
-                | WindowExternalProcessExited
-                | WindowGroupChangedEvent
-                | WindowHiddenEvent
-                | Window_NavigationRejectedEvent) => void,
+					   | WindowAuthRequestedEvent
+					   | WindowBoundsEvent
+					   | WindowExternalProcessStartedEvent
+					   | WindowExternalProcessExited
+					   | WindowGroupChangedEvent
+					   | WindowHiddenEvent
+					   | Window_NavigationRejectedEvent) => void,
             callback?: () => void, errorCallback?: (reason: string) => void): void;
         /**
          * Performs the specified window transitions
@@ -1335,13 +1335,13 @@ declare namespace fin {
         removeEventListener(
             type: OpenFinWindowEventType,
             listener: (event: WindowBaseEvent
-                | WindowAuthRequestedEvent
-                | WindowBoundsEvent
-                | WindowExternalProcessStartedEvent
-                | WindowExternalProcessExited
-                | WindowGroupChangedEvent
-                | WindowHiddenEvent
-                | Window_NavigationRejectedEvent) => void,
+					   | WindowAuthRequestedEvent
+					   | WindowBoundsEvent
+					   | WindowExternalProcessStartedEvent
+					   | WindowExternalProcessExited
+					   | WindowGroupChangedEvent
+					   | WindowHiddenEvent
+					   | Window_NavigationRejectedEvent) => void,
             callback?: () => void,
             errorCallback?: (reason: string) => void): void;
         /**
@@ -1466,17 +1466,17 @@ declare namespace fin {
         virtualScreen: MontiorCoordinates;
     }
 
-   interface TrayIconInfo {
-       x: number;
-       y: number;
-       bounds: {
-           x: number;
-           y: number;
-           width: number;
-           height: number;
-       }
-       monitorInfo: MonitorInfo
-   }
+	interface TrayIconInfo {
+		x: number;
+		y: number;
+		bounds: {
+			x: number;
+			y: number;
+			width: number;
+			height: number;
+		};
+		monitorInfo: MonitorInfo;
+	}
 
     interface MonitorInfoDetail {
         availableRect: MontiorCoordinates;
@@ -1784,7 +1784,7 @@ declare namespace fin {
         parent: {
             uuid: string;
             name: string;
-        }
+        };
     }
 
     interface SessionChangedEvent {
diff --git a/types/openfin/openfin-tests.ts b/types/openfin/openfin-tests.ts
index 2b5237c1e8..6059f54de7 100644
--- a/types/openfin/openfin-tests.ts
+++ b/types/openfin/openfin-tests.ts
@@ -19,7 +19,7 @@ function test_application() {
     }, (error) => {
         console.log("Error creating application:", error);
     });
-        //createFromManifest
+	// createFromManifest
     fin.desktop.Application.createFromManifest("http://stuf.com/app.json", (app) => {
         console.log(app.uuid);
     }, err => console.log(err));
@@ -88,8 +88,9 @@ function test_application() {
     // registerCustomData
     application.registerUser("a", "b", () => console.log("done"), err => console.log(err));
     // removeEventListener
-    const previousCallback = (event: fin.WindowEvent) => { };
-    application.removeEventListener("closed", previousCallback, () => {
+    application.removeEventListener("closed", (event: any) => {
+		console.log(event);
+	}, () => {
         console.log("The unregistration was successful");
     }, err => {
         console.log("failure:", err);
@@ -133,8 +134,8 @@ function test_application() {
         console.log("waiting for hung application");
         application.wait();
     });
-    //uuid
-    let hasUuid = application.uuid;
+    // uuid
+    const hasUuid = application.uuid;
 }
 
 function test_external_application() {
@@ -281,7 +282,7 @@ function test_system() {
     }, err => {
         console.log("failure: " + err);
     });
-    //flushCookieStore
+    // flushCookieStore
     fin.desktop.System.flushCookieStore(() => {
         console.log('successful');
     }, err => {
@@ -317,7 +318,7 @@ function test_system() {
     fin.desktop.System.getCommandLineArguments(args => {
         console.log("The command line arguments are " + args);
     });
-    //getCookieInfo
+    // getCookieInfo
     fin.desktop.System.getCookies({ name: 'myCookie1'}, cookies => {
         const cookie1 = cookies[0];
         console.log(cookie1.name, cookie1.domain, cookie1.path);
@@ -356,7 +357,7 @@ function test_system() {
             console.log(`The filename of the log is ${logInfo.name}, the size is ${logInfo.size}, and the date of creation is ${logInfo.date}`);
         });
     });
-    //getMinLogLevel
+    // getMinLogLevel
     fin.desktop.System.getMinLogLevel(level => console.log(level), err => console.log(err));
     // getMonitorInfo
     fin.desktop.System.getMonitorInfo(monitorInfo => {
@@ -399,7 +400,7 @@ function test_system() {
     }, error => {
         console.log('Error:', error);
     });
-    //
+    // launch external process with an alias
     fin.desktop.System.launchExternalProcess({
         // Additionally note that the executable found in the zip file specified in appAssets
         // will default to the one mentioned by appAssets.target
@@ -491,14 +492,15 @@ function test_system() {
         });
     });
     // removeEventListener
-    const aRegisteredListener = (event: fin.SystemBaseEvent) => { };
-    fin.desktop.System.removeEventListener("monitor-info-changed", aRegisteredListener, () => {
+    fin.desktop.System.removeEventListener("monitor-info-changed", (event) => {
+		console.log(event);
+	}, () => {
         console.log("successful");
-    }, err => {
+    }, (err: any) => {
         console.log("failure: " + err);
     });
-    //setMinLogLevel
-    fin.desktop.System.setMinLogLevel("log level", () => console.log('Success'), err => console.error(err));
+    // setMinLogLevel
+    fin.desktop.System.setMinLogLevel("log level", () => console.log('Success'), (err: any) => console.error(err));
     // showDeveloperTools
     fin.desktop.System.showDeveloperTools("uuid", "name", () => {
         console.log("successful");
@@ -750,8 +752,9 @@ function test_window() {
     // moveTo
     finWindow.moveTo(100, 200);
     // removeEventListener
-    const aRegisteredListener = (event: fin.WindowBaseEvent) => { };
-    finWindow.removeEventListener("bounds-changed", aRegisteredListener);
+    finWindow.removeEventListener("bounds-changed", event => {
+		console.log(event);
+	});
     // resizeBy
     finWindow.resizeBy(10, 10, "top-right");
     // resizeTo
@@ -778,13 +781,13 @@ function test_window() {
 }
 
 function test_frame() {
-    //wrap
+    // wrap
     const frame = fin.desktop.Frame.wrap('uuid', 'name');
-    //getCurrent
+    // getCurrent
     const currentFrame = fin.desktop.Frame.getCurrent();
     // addEventlistener
     frame.addEventListener('event', () => console.log('on event'), () => console.log('success'), err => console.error(err));
-    //removeEventListener
+    // removeEventListener
     frame.removeEventListener('event', () => console.log('on event'), () => console.log('success'), err => console.error(err));
     // getInfo
     frame.getInfo(info => {
diff --git a/types/openfin/tsconfig.json b/types/openfin/tsconfig.json
index df2dae8b79..5299a11917 100644
--- a/types/openfin/tsconfig.json
+++ b/types/openfin/tsconfig.json
@@ -14,11 +14,6 @@
             "../"
         ],
         "types": [],
-        "paths": {
-            "openfin": [
-                "openfin/v29"
-            ]
-        },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
diff --git a/types/openfin/v17/tsconfig.json b/types/openfin/v17/tsconfig.json
index fd3199ceb7..f2ec7a21dc 100644
--- a/types/openfin/v17/tsconfig.json
+++ b/types/openfin/v17/tsconfig.json
@@ -14,6 +14,11 @@
             "../"
         ],
         "types": [],
+        "paths": {
+            "openfin": [
+                "openfin/v17"
+            ]
+        },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
@@ -21,4 +26,4 @@
         "index.d.ts",
         "openfin-tests.ts"
     ]
-}
\ No newline at end of file
+}

From 27c85093ade7cf97873fa40e5d03d176ee8e3aea Mon Sep 17 00:00:00 2001
From: CodeAnimal <codeanimal@outlook.com>
Date: Wed, 28 Mar 2018 20:54:12 +0100
Subject: [PATCH 0934/1382] Add prorate option to subscription creation options

with tests
---
 types/stripe/index.d.ts      | 6 ++++++
 types/stripe/stripe-tests.ts | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/types/stripe/index.d.ts b/types/stripe/index.d.ts
index 361ee4c86b..71396c0183 100644
--- a/types/stripe/index.d.ts
+++ b/types/stripe/index.d.ts
@@ -4470,6 +4470,12 @@ declare namespace Stripe {
              * with month or year intervals, the day of the month for subsequent invoices.
              */
             billing_cycle_anchor?: number;
+
+            /**
+             * Boolean (default true). Use with a billing_cycle_anchor timestamp to determine whether the customer will be invoiced a prorated amount until
+             * the anchor date. If false, the anchor period will be free (similar to a trial).
+             */
+            prorate?: boolean;
         }
 
         interface ISubscriptionCreationOptions extends ISubscriptionCustCreationOptions {
diff --git a/types/stripe/stripe-tests.ts b/types/stripe/stripe-tests.ts
index 1e7b47a3c7..3642645118 100644
--- a/types/stripe/stripe-tests.ts
+++ b/types/stripe/stripe-tests.ts
@@ -252,7 +252,7 @@ stripe.customers.create({
     customer.cards.del("card_17xMvXBoqMA9o2xkq6W5gamx").then(function (confirmation) {});
 
     customer.subscriptions.create({ items: [{ plan: "gold" }], trial_period_days: 7 }).then(function (subscription) { });
-    customer.subscriptions.create({ items: [{ plan: "gold" }], trial_end: "now", billing_cycle_anchor: 1516881177 }).then(function (subscription) { });
+    customer.subscriptions.create({ items: [{ plan: "gold" }], trial_end: "now", billing_cycle_anchor: 1516881177, prorate: true }).then(function (subscription) { });
     customer.subscriptions.create({ items: [{ plan: "gold" }], trial_end: 1516881177, billing: "send_invoice", days_until_due: 7 }).then(function (subscription) { });
     customer.subscriptions.create({ items: [{ plan: "gold" }], billing: "charge_automatically" }).then(function (subscription) { });
     customer.subscriptions.retrieve("sub_8Eluur5KoIKxuy").then(function (subscription) {

From 47c0bffc9a7f6346bcc4b2dcd70b31e14935cb72 Mon Sep 17 00:00:00 2001
From: bmartinson <brian@brianmartinson.com>
Date: Wed, 28 Mar 2018 13:00:29 -0700
Subject: [PATCH 0935/1382] Update Tests and Documentation

---
 types/fabric/index.d.ts    |  1 +
 types/fabric/test/index.ts | 29 +++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/types/fabric/index.d.ts b/types/fabric/index.d.ts
index a0fa06629e..38277c5708 100644
--- a/types/fabric/index.d.ts
+++ b/types/fabric/index.d.ts
@@ -4,6 +4,7 @@
 //                 Joseph Livecchi <https://github.com/joewashear007>
 //                 Michael Randolph <https://github.com/mrand01>
 //                 Tiger Oakes <https://github.com/NotWoods>
+//                 Brian Martinson <https://github.com/bmartinson>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 export import fabric = require("./fabric-impl");
diff --git a/types/fabric/test/index.ts b/types/fabric/test/index.ts
index 0f51499c0b..dfdaafce06 100644
--- a/types/fabric/test/index.ts
+++ b/types/fabric/test/index.ts
@@ -1032,3 +1032,32 @@ function sample9() {
   canvas.setBackgroundImage('yolo.jpg', () => { "a"; }, { opacity: 45 });
   canvas.setBackgroundImage('yolo.jpg', () => { "a"; });
 }
+
+function sample10() {
+  const canvas = new fabric.Canvas('c');
+  const objR = new fabric.Rect({
+    top: 10,
+    left: 10,
+    width: 10,
+    height: 10,
+    fill: "#FF0000",
+  });
+  const objG = new fabric.Rect({
+    top: 15,
+    left: 15,
+    width: 10,
+    height: 10,
+    fill: "#00FF00",
+  });
+  const objB = new fabric.Rect({
+    top: 20,
+    left: 20,
+    width: 10,
+    height: 10,
+    fill: "#0000FF",
+  });
+  canvas.add(objR);
+  canvas.add(objG);
+  canvas.add(objB);
+  const objArray = canvas.getActiveObjects();
+}

From 5bfc432d9643d487a95addf4627d42bcdb3752e7 Mon Sep 17 00:00:00 2001
From: Ricardo de pena <ricardo@isnull.co>
Date: Wed, 28 Mar 2018 16:18:46 -0400
Subject: [PATCH 0936/1382] Fixed base url for .17

---
 types/openfin/v17/tsconfig.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/openfin/v17/tsconfig.json b/types/openfin/v17/tsconfig.json
index f2ec7a21dc..5f07a9e025 100644
--- a/types/openfin/v17/tsconfig.json
+++ b/types/openfin/v17/tsconfig.json
@@ -9,9 +9,9 @@
         "noImplicitThis": true,
         "strictNullChecks": true,
         "strictFunctionTypes": false,
-        "baseUrl": "../",
+        "baseUrl": "../../",
         "typeRoots": [
-            "../"
+            "../../"
         ],
         "types": [],
         "paths": {

From f52ee65b221bfefeb5f209a4e8e4f6cd9444348e Mon Sep 17 00:00:00 2001
From: CodeAnimal <codeanimal@outlook.com>
Date: Thu, 29 Mar 2018 00:56:19 +0100
Subject: [PATCH 0937/1382] Add `cancel_at_period_end` option to sub update

https://stripe.com/docs/api#update_subscription-cancel_at_period_end
---
 types/stripe/index.d.ts      | 5 +++++
 types/stripe/stripe-tests.ts | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/types/stripe/index.d.ts b/types/stripe/index.d.ts
index 71396c0183..c43e3357a5 100644
--- a/types/stripe/index.d.ts
+++ b/types/stripe/index.d.ts
@@ -4562,6 +4562,11 @@ declare namespace Stripe {
              * String, unchanged (default) or now. This allows you to reset the billing cycle of a subscription.
              */
             billing_cycle_anchor?: "unchanged" | "now";
+
+            /**
+             * Boolean indicating whether this subscription should cancel at the end of the current period.
+             */
+            cancel_at_period_end?: boolean;
         }
 
         interface ISubscriptionCancellationOptions extends IDataOptions {
diff --git a/types/stripe/stripe-tests.ts b/types/stripe/stripe-tests.ts
index 3642645118..7a45ee9fca 100644
--- a/types/stripe/stripe-tests.ts
+++ b/types/stripe/stripe-tests.ts
@@ -259,7 +259,7 @@ stripe.customers.create({
         customer.subscriptions.update("sub_8Eluur5KoIKxuy", { items: [{ id: subscription.items.data[0].id, plan: "silver" }] }).then(function (subscription) { });
      });
     customer.subscriptions.update("sub_8Eluur5KoIKxuy", { trial_end: "now", billing_cycle_anchor: "now" });
-    customer.subscriptions.update("sub_8Eluur5KoIKxuy", { trial_end: 1516881177, billing: "send_invoice", days_until_due: 7, billing_cycle_anchor: "unchanged" });
+    customer.subscriptions.update("sub_8Eluur5KoIKxuy", { trial_end: 1516881177, billing: "send_invoice", days_until_due: 7, billing_cycle_anchor: "unchanged", cancel_at_period_end: false });
     customer.subscriptions.list().then(function (subscriptions) { });
     customer.subscriptions.del("sub_8Eluur5KoIKxuy").then(function (subscription) { });
     customer.subscriptions.deleteDiscount("sub_8Eluur5KoIKxuy").then(function (confirmation) { });

From a5d79c1ec641d288cd457f074a0ff5fca1ef3d3c Mon Sep 17 00:00:00 2001
From: Andrija Dvorski <dvorsky.andrija@gmail.com>
Date: Thu, 29 Mar 2018 08:09:24 +0200
Subject: [PATCH 0938/1382] Fixed import in tests

---
 types/command-line-usage/command-line-usage-tests.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/command-line-usage/command-line-usage-tests.ts b/types/command-line-usage/command-line-usage-tests.ts
index c4dd127cea..05dfadc7f3 100644
--- a/types/command-line-usage/command-line-usage-tests.ts
+++ b/types/command-line-usage/command-line-usage-tests.ts
@@ -1,4 +1,4 @@
-import * as commandLineUsage from "command-line-usage";
+import commandLineUsage = require("command-line-usage");
 
 const sections = [
     {

From 81d759c7e84ebc5ff01057536adc4f67823ad356 Mon Sep 17 00:00:00 2001
From: andy-maca <66229754@qq.com>
Date: Thu, 29 Mar 2018 15:04:56 +0800
Subject: [PATCH 0939/1382] Fix build errors

---
 types/datatables.net-autofill/index.d.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/types/datatables.net-autofill/index.d.ts b/types/datatables.net-autofill/index.d.ts
index 68075be5ca..2f05d608be 100644
--- a/types/datatables.net-autofill/index.d.ts
+++ b/types/datatables.net-autofill/index.d.ts
@@ -24,10 +24,6 @@ declare namespace DataTables {
      * Select the columns that can be auto filled
      */
     columns: string | number[];
-    /*
-     * Attach an Editor instance for database updating
-     */
-    editor: Object;
     /*
      *
      * Initial enablement state of AutoFill

From 1824aef19428d49c2be91bc746f3c79384d1b6fc Mon Sep 17 00:00:00 2001
From: lincoln <lincoln@dynamsoft.com>
Date: Thu, 29 Mar 2018 15:20:04 +0800
Subject: [PATCH 0940/1382] update Upload interfaces

---
 types/dwt/addon.pdf.d.ts |  9 ++--
 types/dwt/index.d.ts     | 94 ++++++++++++++++++++++++----------------
 2 files changed, 62 insertions(+), 41 deletions(-)

diff --git a/types/dwt/addon.pdf.d.ts b/types/dwt/addon.pdf.d.ts
index 856291a647..87097471b0 100644
--- a/types/dwt/addon.pdf.d.ts
+++ b/types/dwt/addon.pdf.d.ts
@@ -1,4 +1,5 @@
 /*!
+* Dynamsoft WebTwain PDF Addon
 * Based on Dynamsoft WebTwain JavaScript Intellisense
 * Product: Dynamsoft Web Twain
 * Web Site: http://www.dynamsoft.com
@@ -8,9 +9,9 @@
 * Version: 13.4
 */
 
-declare enum EnumDWT_ConverMode {
+declare enum EnumDWT_ConvertMode {
     CM_DEFAULT = 0,
-    TWPT_CM_RENDERALLGRAY = 1
+    CM_RENDERALL = 1
 }
 
 /**
@@ -42,10 +43,10 @@ interface PDF {
     /**
      *  Set the image convert mode for PDF Rasterizer in Dynamic Web TWAIN.
      * @method Dynamsoft.WebTwain#SetConvertMode
-     * @param {EnumDWT_ConverMode} convertMode Specifies the image convert mode.
+     * @param {EnumDWT_ConvertMode} convertMode Specifies the image convert mode.
      * @return {boolean}
      */
-    SetConvertMode(convertMode: EnumDWT_ConverMode): boolean;
+    SetConvertMode(convertMode: EnumDWT_ConvertMode): boolean;
 
     /**
      *  Set the output resolution for the PDF Rasterizer in Dynamic Web TWAIN.
diff --git a/types/dwt/index.d.ts b/types/dwt/index.d.ts
index 69bd65bb9f..be362e680b 100644
--- a/types/dwt/index.d.ts
+++ b/types/dwt/index.d.ts
@@ -27,7 +27,19 @@ declare namespace Dynamsoft {
         Errors  Events  IntToColorStr  LS  OnGetImageByURL  OnGetImageFromServer  Path  ProgressBar  UI  Uri
         addEventListener  ajax  all  appendMessage  appendRichMessage  aryControlLoadImage  attachAddon  attachProperty
         base64  bio  cancelFrome  clearMessage  closeAll  closeProgress  colorStrToInt  config  css  currentStyle
-        debug  detect  detectButton  dialog  dialogShowStatus  dlgProgress  dlgRef  drawBoxBorder  drawImageWithHermite
+        debug*/
+
+        let detect: {
+            /*ignored
+            OnCreatWS  OnDetectNext  OnWebTwainPostExecute  OnWebTwainPreExecute  StartWSByIPTimeoutId  StartWSTimeoutId
+            aryReconnectSTwains  arySTwains  arySTwainsByIP  bFirst  bNeedUpgradeEvent  bNoControlEvent  bOK  bPromptJSOrServerOutdated
+            cUrlIndex  dcpCallbackType  dcpStatus  detectType  getVersionArray  global_dlg  hideMask  isDWTVersionLatest  onNoControl
+            onNotAllowedForChrome  ports  scriptLoaded  showMask  starting  tryTimes*/
+            ssl: boolean;
+        };
+
+        /*ignored
+        detectButton  dialog  dialogShowStatus  dlgProgress  dlgRef  drawBoxBorder  drawImageWithHermite
         each  empty  endsWith
         */
 
@@ -53,44 +65,47 @@ declare namespace Dynamsoft {
         */
     }
     namespace WebTwainEnv {
-        let JSVersion: string;
-        let PluginVersion: string;
-        let ActiveXVersion: string;
-        let ServerVersionInfo: string;
-
-        let Trial: boolean;
-        let AutoLoad: boolean;
-        let ProductKey: string;
-        let ResourcesPath: string;
-
-        let IfUpdateService: boolean;
-        let IfUseActiveXForIE10Plus: boolean;
-        let UseDefaultInstallUI: string;
         let ActiveXInstallWithCAB: boolean;
-        let Debug: boolean;
-
+        let ActiveXVersion: string;
+        let AutoLoad: boolean;
+        function CloseDialog(): void;
         let ContainerMap: {};
         let Containers: Container[];
+        function CreateDWTObject(newObjID: string, successFn: (dwtObject: WebTwain) => void, failurefn: (...args: any[]) => void): void;
+        function CreateDWTObject(newObjID: string, ip: number | string, port: number | string, portSSL: number | string, successFn: (dwtObject: WebTwain) => void, failurefn: (...args: any[]) => void): void;
+        let Debug: boolean;
+        function DeleteDWTObject(objID: string): void;
         let DynamicContainers: string[];
         let DynamicDWTMap: {};
-        
-        function CreateDWTObject(newObjID: string, successFn: (dwtObject: WebTwain) => void, failurefn: (...args: any[]) => void): void;
         function GetWebTwain(cid: string): WebTwain;
-        function DeleteDWTObject(objID: string): void;
+        let IfUpdateService: boolean;
+        let IfUseActiveXForIE10Plus: boolean;
+        let JSVersion: string;
         function Load(): void;
-        function Unload(): void;
-        function RegisterEvent(event: string, fn: (...args: any[]) => void): void;
 
         /*ignored
-        initQueue inited UseDefaultInstallUI
-        OnWebTwainInitMessage  OnWebTwainNeedUpgrade  OnWebTwainNeedUpgradeWebJavascript  OnWebTwainNotFound  OnWebTwainOldPluginNotAllowed OnWebTwainReady
+        OnWebTwainInitMessage  OnWebTwainNeedUpgrade  OnWebTwainNeedUpgradeWebJavascript  OnWebTwainNotFound  OnWebTwainOldPluginNotAllowed
         */
+
         function OnWebTwainPostExecute(): void;
         function OnWebTwainPreExecute(): void;
 
+        /*ignored
+        OnWebTwainReady
+        */
+
+        let PluginVersion: string;
+        let ProductKey: string;
+        function RegisterEvent(event: string, fn: (...args: any[]) => void): void;
         function RemoveAllAuthorizations(): void;
+        let ResourcesPath: string;
+        let ServerVersionInfo: string;
         function ShowDialog(_dialogWidth: number, _dialogHeight: number, _strDialogMessageWithHtmlFormat: string, _bChangeImage: boolean, bHideCloseButton: boolean): void;
-        function CloseDialog(): void;
+        let Trial: boolean;
+        function Unload(): void;
+        let UseDefaultInstallUI: string;
+        let initQueue: number[];
+        let inited: boolean;
     }
 }
 
@@ -2244,10 +2259,15 @@ interface WebTwain {
      */
     Zoom: number;
 
-    /** ignored 
+    /* ignored 
     style
     _AutoCropMethod
     */
+
+    /*
+    *Methods
+    */
+
     /**
      * Displays the source's built-in interface to acquire image.
      * @method WebTwain#AcquireImage
@@ -2916,7 +2936,7 @@ interface WebTwain {
      * @param {function} optionalAsyncFailureFunc optional. The function to call when the download fails. Please refer to the function prototype OnFailure.
      * @return {boolean}
      */
-    HTTPDownloadThroughPost(HTTPServer: string, HTTPRemoteFile: string, lImageType: EnumDWT_ImageType, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
+    HTTPDownloadThroughPost(HTTPServer: string, HTTPRemoteFile: string, lImageType: EnumDWT_ImageType, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string, httppostresponsestring: string) => void): boolean;
 
     /**
      * Uploads the images specified by the indices to the HTTP server.
@@ -2929,7 +2949,7 @@ interface WebTwain {
      * @param {function} asyncFailureFunc the function to call when the upload fails. Please refer to the function prototype OnFailure.
      * @return {boolean}
      */
-    HTTPUpload(url: string, indices: number[], enumImageType: EnumDWT_ImageType, dataFormat: EnumDWT_UploadDataFormat, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
+    HTTPUpload(url: string, indices: number[], enumImageType: EnumDWT_ImageType, dataFormat: EnumDWT_UploadDataFormat, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string, httppostresponsestring: string) => void): boolean;
 
     /**
      * Uploads all images in the buffer to the HTTP server through the HTTP Post method as a Multi-Page TIFF.
@@ -2941,7 +2961,7 @@ interface WebTwain {
      * @param {function} optionalAsyncFailureFunc optional. The function to call when the upload fails. Please refer to the function prototype OnHttpUploadFailure.
      * @return {boolean}
      */
-    HTTPUploadAllThroughPostAsMultiPageTIFF(HTTPServer: string, ActionPage: string, fileName: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
+    HTTPUploadAllThroughPostAsMultiPageTIFF(HTTPServer: string, ActionPage: string, fileName: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string, httppostresponsestring: string) => void): boolean;
 
     /**
      * Uploads all images in the buffer to the HTTP server through HTTP Post method as a Multi-Page PDF.
@@ -2953,7 +2973,7 @@ interface WebTwain {
      * @param {function} optionalAsyncFailureFunc optional. The function to call when the upload fails. Please refer to the function prototype OnHttpUploadFailure.
      * @return {boolean}
      */
-    HTTPUploadAllThroughPostAsPDF(HTTPServer: string, ActionPage: string, fileName: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
+    HTTPUploadAllThroughPostAsPDF(HTTPServer: string, ActionPage: string, fileName: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string, httppostresponsestring: string) => void): boolean;
 
     /**
      * [Deprecated.] Uploads all images in the buffer to the HTTP server through the HTTP Put method as a Multi-Page TIFF.
@@ -2992,7 +3012,7 @@ interface WebTwain {
      * @param {function} optionalAsyncFailureFunc optional. The function to call when the upload fails. Please refer to the function prototype OnHttpUploadFailure.
      * @return {boolean}
      */
-    HTTPUploadThroughPost(HTTPServer: string, sImageIndex: number, ActionPage: string, fileName: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
+    HTTPUploadThroughPost(HTTPServer: string, sImageIndex: number, ActionPage: string, fileName: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string, httppostresponsestring: string) => void): boolean;
 
     /**
      * Uploads the selected images in the buffer to the HTTP server through the HTTP Post method as a Multi-Page TIFF.
@@ -3004,7 +3024,7 @@ interface WebTwain {
      * @param {function} optionalAsyncFailureFunc optional. The function to call when the upload fails. Please refer to the function prototype OnHttpUploadFailure.
      * @return {boolean}
      */
-    HTTPUploadThroughPostAsMultiPageTIFF(HTTPServer: string, ActionPage: string, fileName: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
+    HTTPUploadThroughPostAsMultiPageTIFF(HTTPServer: string, ActionPage: string, fileName: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string, httppostresponsestring: string) => void): boolean;
 
     /**
      * Uploads the selected images in the buffer to the HTTP server through the HTTP Post method as a Multi-Page PDF.
@@ -3016,7 +3036,7 @@ interface WebTwain {
      * @param {function} optionalAsyncFailureFunc optional. The function to call when the upload fails. Please refer to the function prototype OnHttpUploadFailure.
      * @return {boolean}
      */
-    HTTPUploadThroughPostAsMultiPagePDF(HTTPServer: string, ActionPage: string, fileName: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
+    HTTPUploadThroughPostAsMultiPagePDF(HTTPServer: string, ActionPage: string, fileName: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string, httppostresponsestring: string) => void): boolean;
 
     /**
      * Directly upload a specific local file to the HTTP server through the HTTP POST method without loading it into Dynamic Web TWAIN.
@@ -3029,7 +3049,7 @@ interface WebTwain {
      * @param {function} optionalAsyncFailureFunc optional. The function to call when the upload fails. Please refer to the function prototype OnHttpUploadFailure.
      * @return {boolean}
      */
-    HTTPUploadThroughPostDirectly(HTTPServer: string, localFile: string, ActionPage: string, fileName: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
+    HTTPUploadThroughPostDirectly(HTTPServer: string, localFile: string, ActionPage: string, fileName: string, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string, httppostresponsestring: string) => void): boolean;
 
     /**
      * Uploads the image of a specified index in the buffer to the HTTP server as a specified image format through the HTTP POST method.
@@ -3043,7 +3063,7 @@ interface WebTwain {
      * @param {function} optionalAsyncFailureFunc optional. The function to call when the upload succeeds. Please refer to the function prototype OnHttpUploadFailure.
      * @return {boolean}
      */
-    HTTPUploadThroughPostEx(HTTPServer: string, sImageIndex: number, ActionPage: string, fileName: string, lImageType: EnumDWT_ImageType, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
+    HTTPUploadThroughPostEx(HTTPServer: string, sImageIndex: number, ActionPage: string, fileName: string, lImageType: EnumDWT_ImageType, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string, httppostresponsestring: string) => void): boolean;
 
     /**
      * [Deprecated.] Uploads the image of a specified index in the buffer to the HTTP server through the HTTP PUT method.
@@ -3244,10 +3264,10 @@ interface WebTwain {
      * Binds a specified function to an event, so that the function gets called whenever the event fires.
      * @method WebTwain#RegisterEvent
      * @param {string} name the name of the event that the function is bound to.
-     * @param {object} evt specifies the function to call when event fires.
+     * @param {any} evt specifies the function to call when event fires.
      * @return {boolean}
      */
-    RegisterEvent(name: string, evt: object): boolean;
+    RegisterEvent(name: string, evt: any): boolean;
 
     /**
      * Removes all images in buffer.
@@ -3415,7 +3435,7 @@ interface WebTwain {
     /**
      * Saves the selected images in buffer to base64 string.
      * @method WebTwain#SaveSelectedImagesToBase64Binary
-     * @return {string|bool}
+     * @return {string|boolean}
      */
     SaveSelectedImagesToBase64Binary(optionalAsyncSuccessFunc?: (result: string[]) => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): string | boolean;
 

From 72fcbb0d13eea8e0c5d64ebc699f4f8b1ee4e701 Mon Sep 17 00:00:00 2001
From: Alexander Marks <aomarks@google.com>
Date: Thu, 29 Mar 2018 00:19:26 -0700
Subject: [PATCH 0941/1382] Add types for path-is-inside

---
 types/path-is-inside/index.d.ts              |  8 +++++++
 types/path-is-inside/path-is-inside-tests.ts |  3 +++
 types/path-is-inside/tsconfig.json           | 23 ++++++++++++++++++++
 types/path-is-inside/tslint.json             |  1 +
 4 files changed, 35 insertions(+)
 create mode 100644 types/path-is-inside/index.d.ts
 create mode 100644 types/path-is-inside/path-is-inside-tests.ts
 create mode 100644 types/path-is-inside/tsconfig.json
 create mode 100644 types/path-is-inside/tslint.json

diff --git a/types/path-is-inside/index.d.ts b/types/path-is-inside/index.d.ts
new file mode 100644
index 0000000000..26a28e5db4
--- /dev/null
+++ b/types/path-is-inside/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for path-is-inside 1.0
+// Project: https://github.com/domenic/path-is-inside#readme
+// Definitions by: Alexander Marks <https://github.com/aomarks>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function pathIsInside(thePath: string,
+                              potentialParent: string): boolean;
+export = pathIsInside;
diff --git a/types/path-is-inside/path-is-inside-tests.ts b/types/path-is-inside/path-is-inside-tests.ts
new file mode 100644
index 0000000000..723947124a
--- /dev/null
+++ b/types/path-is-inside/path-is-inside-tests.ts
@@ -0,0 +1,3 @@
+import pathIsInside = require('path-is-inside');
+
+pathIsInside('path', 'parent'); // $ExpectType boolean
diff --git a/types/path-is-inside/tsconfig.json b/types/path-is-inside/tsconfig.json
new file mode 100644
index 0000000000..50af237e9a
--- /dev/null
+++ b/types/path-is-inside/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "path-is-inside-tests.ts"
+    ]
+}
diff --git a/types/path-is-inside/tslint.json b/types/path-is-inside/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/path-is-inside/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 2007d0ea35b7918a407cae48fd57feaebbfa19d1 Mon Sep 17 00:00:00 2001
From: Sergey Solomentsev <serg.solomentsev@ya.ru>
Date: Thu, 29 Mar 2018 11:37:34 +0300
Subject: [PATCH 0942/1382] Renamed Base class to Generator so to follow latest
 yeoman API.

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

diff --git a/types/yeoman-generator/index.d.ts b/types/yeoman-generator/index.d.ts
index 9db6a70946..a996185516 100644
--- a/types/yeoman-generator/index.d.ts
+++ b/types/yeoman-generator/index.d.ts
@@ -11,7 +11,7 @@ import * as inquirer from 'inquirer';
 
 type Callback = (err: any) => void;
 
-declare namespace Base {
+declare namespace Generator {
     interface Question extends inquirer.Question {
         /**
          * whether to store the user's previous answer
@@ -79,7 +79,7 @@ declare namespace Base {
     }
 }
 
-declare class Base extends EventEmitter {
+declare class Generator extends EventEmitter {
     constructor(args: string|string[], options: {});
 
     env: {
@@ -89,18 +89,18 @@ declare class Base extends EventEmitter {
     resolved: string;
     description: string;
     appname: string;
-    config: Base.Storage;
-    fs: Base.MemFsEditor;
+    config: Generator.Storage;
+    fs: Generator.MemFsEditor;
     options: {};
     log(message?: string, context?: any): void;
 
-    argument(name: string, config: Base.ArgumentConfig): this;
+    argument(name: string, config: Generator.ArgumentConfig): this;
     composeWith(namespace: string, options: { [name: string]: any }, settings?: { local: string, link: 'weak'|'strong' }): this;
     destinationPath(...path: string[]): string;
     destinationRoot(rootPath?: string): string;
     determineAppname(): string;
-    option(name: string, config: Base.OptionConfig): this;
-    prompt(questions: Base.Questions): Promise<Base.Answers>;
+    option(name: string, config: Generator.OptionConfig): this;
+    prompt(questions: Generator.Questions): Promise<Generator.Answers>;
     registerTransformStream(stream: {}|Array<{}>): this;
     rootGeneratorName(): string;
     rootGeneratorVersion(): string;
@@ -149,7 +149,7 @@ declare class Base extends EventEmitter {
      *
      * @return Resolved if install successful, rejected otherwise
      */
-    installDependencies(options?: Base.InstallOptions): Promise<void>;
+    installDependencies(options?: Generator.InstallOptions): Promise<void>;
     /**
      * Receives a list of `packages` and an `options` object to install through npm.
      *
@@ -214,4 +214,4 @@ declare class Base extends EventEmitter {
         }
     };
 }
-export = Base;
+export = Generator;
\ No newline at end of file

From 95deea0a8f70ee3f00c7263c2b1b939cbd9cc216 Mon Sep 17 00:00:00 2001
From: Jack Leigh <jack.leigh@candide.eu>
Date: Thu, 29 Mar 2018 11:06:30 +0100
Subject: [PATCH 0943/1382] react-native: Export some useful union types

---
 types/react-native/index.d.ts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index 934b738293..2a08edcdb1 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -1044,10 +1044,12 @@ export type KeyboardTypeIOS =
     | "twitter"
     | "web-search";
 export type KeyboardTypeAndroid = "visible-password";
+export type KeyboardTypeOptions = KeyboardType | KeyboardTypeAndroid | KeyboardTypeIOS
 
 export type ReturnKeyType = "done" | "go" | "next" | "search" | "send";
 export type ReturnKeyTypeAndroid = "none" | "previous";
 export type ReturnKeyTypeIOS = "default" | "google" | "join" | "route" | "yahoo" | "emergency-call";
+export type ReturnKeyTypeOptions = ReturnKeyType | ReturnKeyTypeAndroid | ReturnKeyTypeIOS
 
 /**
  * @see https://facebook.github.io/react-native/docs/textinput.html#props
@@ -1103,7 +1105,7 @@ export interface TextInputProperties
      * The following values work on iOS: - ascii-capable - numbers-and-punctuation - url - number-pad - name-phone-pad - decimal-pad - twitter - web-search
      * The following values work on Android: - visible-password
      */
-    keyboardType?: KeyboardType | KeyboardTypeIOS | KeyboardTypeAndroid;
+    keyboardType?: KeyboardTypeOptions;
 
     /**
      * Limits the maximum number of characters that can be entered.
@@ -1184,7 +1186,7 @@ export interface TextInputProperties
      * enum('default', 'go', 'google', 'join', 'next', 'route', 'search', 'send', 'yahoo', 'done', 'emergency-call')
      * Determines how the return key should look.
      */
-    returnKeyType?: ReturnKeyType | ReturnKeyTypeAndroid | ReturnKeyTypeIOS;
+    returnKeyType?: ReturnKeyTypeOptions;
 
     /**
      * If true, the text input obscures the text entered so that sensitive text like passwords stay secure.
@@ -3292,6 +3294,7 @@ interface ImagePropertiesAndroid {
 /**
  * @see https://facebook.github.io/react-native/docs/image.html
  */
+export type ImagePropertiesSourceOptions = ImageURISource | ImageURISource[] | ImageRequireSource;
 export interface ImageProperties extends ImagePropertiesIOS, ImagePropertiesAndroid, AccessibilityProperties {
     /**
      * onLayout function
@@ -3387,7 +3390,7 @@ export interface ImageProperties extends ImagePropertiesIOS, ImagePropertiesAndr
      * their width and height. The native side will then choose the best `uri` to display
      * based on the measured size of the image container.
      */
-    source: ImageURISource | ImageURISource[] | ImageRequireSource;
+    source: ImagePropertiesSourceOptions;
 
     /**
      * similarly to `source`, this property represents the resource used to render

From 799bd0516ba14333958385034f79d7eb182dd0b1 Mon Sep 17 00:00:00 2001
From: Richard Hinkamp <richard@hinkamp.nl>
Date: Thu, 29 Mar 2018 12:13:05 +0200
Subject: [PATCH 0944/1382] Marker option icon same as leaflet marker

---
 types/leaflet-draw/index.d.ts            |  2 +-
 types/leaflet-draw/leaflet-draw-tests.ts | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/types/leaflet-draw/index.d.ts b/types/leaflet-draw/index.d.ts
index 7fd33f2152..62025a7c46 100644
--- a/types/leaflet-draw/index.d.ts
+++ b/types/leaflet-draw/index.d.ts
@@ -279,7 +279,7 @@ declare module 'leaflet' {
 			 *
 			 * Default value: L.Icon.Default()
 			 */
-			icon?: Icon;
+			icon?: Icon | DivIcon;
 
 			/**
 			 * This should be a high number to ensure that you can draw over all other layers on the map.
diff --git a/types/leaflet-draw/leaflet-draw-tests.ts b/types/leaflet-draw/leaflet-draw-tests.ts
index 54015fa404..7a51fe401f 100644
--- a/types/leaflet-draw/leaflet-draw-tests.ts
+++ b/types/leaflet-draw/leaflet-draw-tests.ts
@@ -121,3 +121,18 @@ function testExampleControlOptions() {
         }
     });
 }
+
+function testMarkerOptionsIcon() {
+    const markerIcon = new L.Draw.Marker(map, {
+        icon: new L.Icon({
+            iconUrl: 'my-icon.png',
+            iconSize: new L.Point(32, 32),
+        }),
+    });
+    const markerDivIcon = new L.Draw.Marker(map, {
+        icon: new L.DivIcon({
+            className: "marker-icon",
+            iconSize: new L.Point(32, 32),
+        }),
+    });
+}

From 9f06b22b1f897ae39161c128a0c5b76e89eed8f3 Mon Sep 17 00:00:00 2001
From: Alexander Marks <aomarks@google.com>
Date: Thu, 29 Mar 2018 03:22:37 -0700
Subject: [PATCH 0945/1382] Add types for whatwg-url

---
 types/whatwg-url/index.d.ts          | 105 +++++++++++++++++++++++++++
 types/whatwg-url/tsconfig.json       |  23 ++++++
 types/whatwg-url/tslint.json         |   1 +
 types/whatwg-url/whatwg-url-tests.ts |  45 ++++++++++++
 4 files changed, 174 insertions(+)
 create mode 100644 types/whatwg-url/index.d.ts
 create mode 100644 types/whatwg-url/tsconfig.json
 create mode 100644 types/whatwg-url/tslint.json
 create mode 100644 types/whatwg-url/whatwg-url-tests.ts

diff --git a/types/whatwg-url/index.d.ts b/types/whatwg-url/index.d.ts
new file mode 100644
index 0000000000..8bbc271b9a
--- /dev/null
+++ b/types/whatwg-url/index.d.ts
@@ -0,0 +1,105 @@
+// Type definitions for whatwg-url 6.4
+// Project: https://github.com/jsdom/whatwg-url#readme
+// Definitions by: Alexander Marks <https://github.com/aomarks>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+/** https://url.spec.whatwg.org/#url-representation */
+export interface URLRecord {
+    scheme: string;
+    username: string;
+    password: string;
+    host: string|number|IPv6Address|null;
+    port: number|null;
+    path: string[];
+    query: string|null;
+    fragment: string|null;
+    cannotBeABaseURL?: boolean;
+}
+
+/** https://url.spec.whatwg.org/#concept-ipv6 */
+export type IPv6Address =
+    [number, number, number, number, number, number, number, number];
+
+/** https://url.spec.whatwg.org/#url-class */
+export class URL {
+    constructor(url: string, base?: string);
+
+    href: string;
+    readonly origin: string;
+    protocol: string;
+    username: string;
+    password: string;
+    host: string;
+    hostname: string;
+    port: string;
+    pathname: string;
+    search: string;
+    readonly searchParams: URLSearchParams;
+    hash: string;
+
+    toJSON(): string;
+}
+
+/** https://url.spec.whatwg.org/#interface-urlsearchparams */
+export class URLSearchParams {
+    constructor(init: (Array<[string, string]>|Iterable<[string, string]>|
+                       {[name: string]: string}|string));
+
+    append(name: string, value: string): void;
+    delete(name: string): void;
+    get(name: string): string|null;
+    getAll(name: string): string[];
+    has(name: string): boolean;
+    set(name: string, value: string): void;
+    sort(): void;
+
+    [Symbol.iterator](): IterableIterator<[string, string]>;
+}
+
+/** https://url.spec.whatwg.org/#concept-url-parser */
+export function parseURL(
+    input: string,
+    options?: {baseURL?: string, encodingOverride?: string}): URLRecord|null;
+
+/** https://url.spec.whatwg.org/#concept-basic-url-parser */
+export function basicURLParse(input: string, options?: {
+    baseURL?: string,
+    encodingOverride?: string,
+    url?: URLRecord,
+    stateOverride?: StateOverride
+}): URLRecord|null;
+
+/** https://url.spec.whatwg.org/#scheme-start-state */
+export type StateOverride =
+    'scheme start'|'scheme'|'no scheme'|'special relative or authority'|
+    'path or authority'|'relative'|'relative slash'|'special authority slashes'|
+    'special authority ignore slashes'|'authority'|'host'|'hostname'|'port'|
+    'file'|'file slash'|'file host'|'path start'|'path'|
+    'cannot-be-a-base-URL path'|'query'|'fragment';
+
+/** https://url.spec.whatwg.org/#concept-url-serializer */
+export function serializeURL(
+    urlRecord: URLRecord, excludeFragment?: boolean): string;
+
+/** https://url.spec.whatwg.org/#concept-host-serializer */
+export function serializeHost(host: string|number|IPv6Address): string;
+
+/** https://url.spec.whatwg.org/#serialize-an-integer */
+export function serializeInteger(number: number): string;
+
+/** https://html.spec.whatwg.org#ascii-serialisation-of-an-origin */
+export function serializeURLOrigin(urlRecord: URLRecord): string;
+
+/** https://url.spec.whatwg.org/#set-the-username */
+export function setTheUsername(urlRecord: URLRecord, username: string): void;
+
+/** https://url.spec.whatwg.org/#set-the-password */
+export function setThePassword(urlRecord: URLRecord, password: string): void;
+
+/** https://url.spec.whatwg.org/#cannot-have-a-username-password-port */
+export function cannotHaveAUsernamePasswordPort(urlRecord: URLRecord): boolean;
+
+/** https://url.spec.whatwg.org/#percent-decode */
+export function percentDecode(buffer: Buffer): Buffer;
diff --git a/types/whatwg-url/tsconfig.json b/types/whatwg-url/tsconfig.json
new file mode 100644
index 0000000000..9b32093c23
--- /dev/null
+++ b/types/whatwg-url/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "whatwg-url-tests.ts"
+    ]
+}
diff --git a/types/whatwg-url/tslint.json b/types/whatwg-url/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/whatwg-url/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/whatwg-url/whatwg-url-tests.ts b/types/whatwg-url/whatwg-url-tests.ts
new file mode 100644
index 0000000000..6aae6315eb
--- /dev/null
+++ b/types/whatwg-url/whatwg-url-tests.ts
@@ -0,0 +1,45 @@
+import * as whatwgUrl from 'whatwg-url';
+
+// $ExpectType URL
+new whatwgUrl.URL('http://example.com');
+
+// $ExpectType URL
+new whatwgUrl.URL('foo', 'http://example.com');
+
+// $ExpectType URLRecord | null
+const urlRecord = whatwgUrl.parseURL('http://example.com');
+
+if (urlRecord !== null) {
+    // $ExpectType URLRecord | null
+    whatwgUrl.basicURLParse('http://example.com', {url: urlRecord});
+
+    // $ExpectType string
+    whatwgUrl.serializeURL(urlRecord);
+    //
+    // $ExpectType string
+    whatwgUrl.serializeURLOrigin(urlRecord);
+    //
+    // $ExpectType void
+    whatwgUrl.setTheUsername(urlRecord, 'user');
+    //
+    // $ExpectType void
+    whatwgUrl.setThePassword(urlRecord, 'secret');
+    //
+    // $ExpectType boolean
+    whatwgUrl.cannotHaveAUsernamePasswordPort(urlRecord);
+}
+
+// $ExpectType string
+whatwgUrl.serializeHost('http://example.com');
+
+// $ExpectType string
+whatwgUrl.serializeHost(42);
+
+// $ExpectType string
+whatwgUrl.serializeHost([0, 0, 0, 0, 0, 0, 0, 0]);
+
+// $ExpectType string
+whatwgUrl.serializeInteger(42);
+
+// $ExpectType Buffer
+whatwgUrl.percentDecode(Buffer.from('foo'));

From 1fbf734a2c3887c3f3226924cd334cbf05462577 Mon Sep 17 00:00:00 2001
From: Po Chen <chenpaul914@gmail.com>
Date: Thu, 29 Mar 2018 22:27:54 +1100
Subject: [PATCH 0946/1382] Update index.d.ts

---
 types/dagre/index.d.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/types/dagre/index.d.ts b/types/dagre/index.d.ts
index 6c5e5e00ec..774fbf8f80 100644
--- a/types/dagre/index.d.ts
+++ b/types/dagre/index.d.ts
@@ -95,15 +95,15 @@ export interface NodeConfig {
 }
 
 export interface EdgeConfig {
-    minlen: number;
-    weight: number;
-    width: number;
-    height: number;
-    lablepos: 'l'|'c'|'r';
-    labeloffest: number;
+    minlen?: number;
+    weight?: number;
+    width?: number;
+    height?: number;
+    lablepos?: 'l'|'c'|'r';
+    labeloffest?: number;
 }
 
-export function layout(graph: graphlib.Graph, layout?: GraphLabel&NodeConfig&EdgeConfig): void;
+export function layout(graph: graphlib.Graph, layout?: GraphLabel & NodeConfig & EdgeConfig): void;
 
 export interface Edge {
     v: string;

From 0d32bce4c3f7ed0606871f51968b9ac52e6f220d Mon Sep 17 00:00:00 2001
From: Sergey Solomentsev <serg.solomentsev@ya.ru>
Date: Thu, 29 Mar 2018 15:14:22 +0300
Subject: [PATCH 0947/1382] Added new line to the end of the yeoman-generator
 definition file.

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

diff --git a/types/yeoman-generator/index.d.ts b/types/yeoman-generator/index.d.ts
index a996185516..c4a13695fb 100644
--- a/types/yeoman-generator/index.d.ts
+++ b/types/yeoman-generator/index.d.ts
@@ -214,4 +214,4 @@ declare class Generator extends EventEmitter {
         }
     };
 }
-export = Generator;
\ No newline at end of file
+export = Generator;

From 06cf5d0caf42c49345eb2dafdca37d99dea23448 Mon Sep 17 00:00:00 2001
From: Eugene Arshinov <earshinov@gmail.com>
Date: Thu, 29 Mar 2018 15:04:49 +0300
Subject: [PATCH 0948/1382] [ckeditor] Added typings for CKEDITOR.dtd

Reference to CKEDITOR API documentation:
https://docs.ckeditor.com/ckeditor4/docs/#!/api/CKEDITOR.dtd

Added new `function test_dtd()` to `ckeditor-tests.ts`.
---
 types/ckeditor/ckeditor-tests.ts |  6 +++
 types/ckeditor/index.d.ts        | 82 +++++++++++++++++++-------------
 2 files changed, 56 insertions(+), 32 deletions(-)

diff --git a/types/ckeditor/ckeditor-tests.ts b/types/ckeditor/ckeditor-tests.ts
index dd0ec92164..515996e90a 100644
--- a/types/ckeditor/ckeditor-tests.ts
+++ b/types/ckeditor/ckeditor-tests.ts
@@ -506,3 +506,9 @@ function test_editor_instance_event() {
         }
     });
 }
+
+function test_dtd() {
+    var brConsideredEmptyTag = CKEDITOR.dtd.$empty["br"];
+    var spanCanContainText = CKEDITOR.dtd["span"]["#"];
+    var divCanContainSpan = CKEDITOR.dtd["div"]["span"];
+}
diff --git a/types/ckeditor/index.d.ts b/types/ckeditor/index.d.ts
index cf7cd0cc27..49ffce2fd9 100644
--- a/types/ckeditor/index.d.ts
+++ b/types/ckeditor/index.d.ts
@@ -24,8 +24,8 @@ declare namespace CKEDITOR {
     var DIALOG_RESIZE_HEIGHT: number;
     var DIALOG_RESIZE_NONE: number;
     var DIALOG_RESIZE_WIDTH: number;
-	var DIALOG_STATE_IDLE: number;
-	var DIALOG_STATE_BUSY: number;
+    var DIALOG_STATE_IDLE: number;
+    var DIALOG_STATE_BUSY: number;
     var ELEMENT_MODE_APPENDTO: number;
     var ELEMENT_MODE_INLINE: number;
     var ELEMENT_MODE_NONE: number;
@@ -44,10 +44,10 @@ declare namespace CKEDITOR {
     var NODE_DOCUMENT_FRAGMENT: number;
     var NODE_ELEMENT: number;
     var NODE_TEXT: number;
-	var POSITION_BEFORE_START: number;
-	var POSITION_BEFORE_END: number;
-	var POSITION_AFTER_START: number;
-	var POSITION_AFTER_END: number;
+    var POSITION_BEFORE_START: number;
+    var POSITION_BEFORE_END: number;
+    var POSITION_AFTER_START: number;
+    var POSITION_AFTER_END: number;
     var SELECTION_ELEMENT: number;
     var SELECTION_NONE: number;
     var SELECTION_TEXT: number;
@@ -55,9 +55,9 @@ declare namespace CKEDITOR {
     var SHRINK_ELEMENT: number;
     var SHRINK_TEXT: number;
     var START: number;
-	var STYLE_BLOCK: string;
-	var STYLE_INLINE: string;
-	var STYLE_OBJECT: string;
+    var STYLE_BLOCK: string;
+    var STYLE_INLINE: string;
+    var STYLE_OBJECT: string;
     var TRISTATE_DISABLED: number;
     var TRISTATE_OFF: number;
     var TRISTATE_ON: number;
@@ -288,7 +288,7 @@ declare namespace CKEDITOR {
 
         class elementPath {
             constructor(startNode: element, root: element);
-			constructor(startNode: element);
+            constructor(startNode: element);
             block: element;
             blockLimit: element;
             root: element;
@@ -342,7 +342,7 @@ declare namespace CKEDITOR {
             setStartAt(node: node, position: number): void;
             setEndAt(node: node, position: number): void;
             fixBlock(isStart: boolean, blockTag: Object): Object;
-			select(): selection;
+            select(): selection;
             splitBlock(blockTag: Object): Object;
             splitElement(toSplit: element): element;
             removeEmptyBlocksAtEnd(atEnd: boolean): void;
@@ -836,7 +836,7 @@ declare namespace CKEDITOR {
         templates_files?: Object;
         templates_replaceContent?: boolean;
         title?: string | boolean;
-		toolbar?: string | (string | string[] | { name: string, items?: string[], groups?: string[] })[] | null;
+        toolbar?: string | (string | string[] | { name: string, items?: string[], groups?: string[] })[] | null;
         toolbarCanCollapse?: boolean;
         toolbarGroupCycling?: boolean;
         toolbarGroups?: (toolbarGroups | string)[];
@@ -869,19 +869,19 @@ declare namespace CKEDITOR {
     }
 
     module skin {
-		var icons: { [name: string]: { path: string } };
-		function addIcon(name: string, path: string, offset?: number, bgsize?: string): void;
-	}
+        var icons: { [name: string]: { path: string } };
+        function addIcon(name: string, path: string, offset?: number, bgsize?: string): void;
+    }
 
     class style {
-		constructor(something: { element: string, attributes: { [att: string]: string } });
-		applyToRange(range: Range, editor: editor): void;
-	}
+        constructor(something: { element: string, attributes: { [att: string]: string } });
+        applyToRange(range: Range, editor: editor): void;
+    }
 
     interface editable extends dom.element {
-		hasFocus: boolean;
-		attachListener(obj: event | editable, eventName: string, listenerFunction: (ei: eventInfo) => void,
-			scopeobj?: {}, listenerData?: any, priority?: number): listenerRegistration;
+        hasFocus: boolean;
+        attachListener(obj: event | editable, eventName: string, listenerFunction: (ei: eventInfo) => void,
+            scopeobj?: {}, listenerData?: any, priority?: number): listenerRegistration;
     }
 
 
@@ -978,7 +978,7 @@ declare namespace CKEDITOR {
                 destroy(widget: CKEDITOR.plugins.widget, offline?: boolean): void;
                 destroyAll(offline?: boolean): void;
                 finalizeCreation(container: any): void;
-				focused: widget;
+                focused: widget;
                 fire(eventName: string, data: Object, editor: editor): any; // should be boolean | Object
                 getByElement(element: any, checkWrapperOnly: boolean): CKEDITOR.plugins.widget;
                 hasListeners(eventName: string): boolean;
@@ -1089,7 +1089,7 @@ declare namespace CKEDITOR {
     interface IMenuItemDefinition {
         label:string,
         command:string,
-		icon: string
+        icon: string
         group:string,
         order:number
     }
@@ -1142,7 +1142,7 @@ declare namespace CKEDITOR {
         createFakeParserElement(realElement: Object, className: Object, realElementType: Object, isResizable: Object): void;
         createRange(): dom.range;
         destroy(noUpdate?: boolean): void;
-		editable(): editable | null;
+        editable(): editable | null;
         editable(elementOrEditable: dom.element): void;
         editable(elementOrEditable: editable): void;
         elementPath(startNode?: dom.node): dom.elementPath;
@@ -1300,14 +1300,14 @@ declare namespace CKEDITOR {
         stop(): void;
     }
 
-	module filter {
-		interface allowedContentRules {
+    module filter {
+        interface allowedContentRules {
 
-		}
-	}
+        }
+    }
 
     class filter {
-		allow(newRules: CKEDITOR.filter.allowedContentRules, featureName?: string, overrideCustom?: boolean): boolean;
+        allow(newRules: CKEDITOR.filter.allowedContentRules, featureName?: string, overrideCustom?: boolean): boolean;
 
     }
 
@@ -1370,10 +1370,28 @@ declare namespace CKEDITOR {
     }
 
 
-    class dtd {
-
+    interface dtdDefinition {
+        [outerTagName: string]: {[innerTagName: string]: 1};
+        $block:          {[tagName: string]: 1};
+        $blockLimit:     {[tagName: string]: 1};
+        $cdata:          {[tagName: string]: 1};
+        $editable:       {[tagName: string]: 1};
+        $empty:          {[tagName: string]: 1};
+        $inline:         {[tagName: string]: 1};
+        $intermediate:   {[tagName: string]: 1};
+        $list:           {[tagName: string]: 1};
+        $listItem:       {[tagName: string]: 1};
+        $nonBodyContent: {[tagName: string]: 1};
+        $nonEditable:    {[tagName: string]: 1};
+        $object:         {[tagName: string]: 1};
+        $removeEmpty:    {[tagName: string]: 1};
+        $tabIndex:       {[tagName: string]: 1};
+        $tableContent:   {[tagName: string]: 1};
+        $transparent:    {[tagName: string]: 1};
     }
 
+    var dtd: dtdDefinition;
+
 
     class ui extends event {
         constructor(editor: editor);
@@ -1819,7 +1837,7 @@ declare namespace CKEDITOR {
             children: any[];
             type: number;
             add(node: node): number;
-			add(node: node, index: number): void;
+            add(node: node, index: number): void;
             clone(): element;
             filter(filter: filter): boolean;
             filterChildren(filter: filter): void;

From 8f4585a0df5142369a6c29f7de22a8a0c3ada0f7 Mon Sep 17 00:00:00 2001
From: Syncfusion-JavaScript <packages@syncfusion.com>
Date: Thu, 29 Mar 2018 18:13:07 +0530
Subject: [PATCH 0949/1382] 16.1.32 added

---
 types/ej.web.all/ej.web.all-tests.ts | 1344 +++++++++++++-------------
 types/ej.web.all/index.d.ts          |  164 +++-
 2 files changed, 802 insertions(+), 706 deletions(-)

diff --git a/types/ej.web.all/ej.web.all-tests.ts b/types/ej.web.all/ej.web.all-tests.ts
index 83ed128742..ddfdc39876 100644
--- a/types/ej.web.all/ej.web.all-tests.ts
+++ b/types/ej.web.all/ej.web.all-tests.ts
@@ -1,3 +1,7 @@
+/* tslint:disable */
+
+ 
+
 module AccordionComponent {
     $(function () {
         var sample = new ej.Accordion($("#basicAccordion"), {
@@ -18,39 +22,39 @@ module AccordionComponent {
     });
 }
 
+ 
 
-
-module AutocompleteComponent {
+module AutocompleteComponent{
     var carList = [
-        "Audi S6", "Austin-Healey", "Alfa Romeo", "Aston Martin",
-        "BMW 7", "Bentley Mulsanne", "Bugatti Veyron",
-        "Chevrolet Camaro", "Cadillac",
-        "Duesenberg J", "Dodge Sprinter",
-        "Elantra", "Excavator",
-        "Ford Boss 302", "Ferrari 360", "Ford Thunderbird",
-        "GAZ Siber",
-        "Honda S2000", "Hyundai Santro",
-        "Isuzu Swift", "Infiniti Skyline",
-        "Jaguar XJS",
-        "Kia Sedona EX", "Koenigsegg Agera",
-        "Lotus Esprit", "Lamborghini Diablo",
-        "Mercedes-Benz", "Mercury Coupe", "Maruti Alto 800",
-        "Nissan Qashqai",
-        "Oldsmobile S98", "Opel Superboss",
-        "Porsche 356", "Pontiac Sunbird",
-        "Scion SRS/SC/SD", "Saab Sportcombi", "Subaru Sambar", "Suzuki Swift",
-        "Triumph Spitfire", "Toyota 2000GT",
-        "Volvo P1800", "Volkswagen Shirako"
-    ];
-    $(function () {
-        var autocompleteInstance = new ej.Autocomplete($("#selectCar"), {
+                "Audi S6", "Austin-Healey", "Alfa Romeo", "Aston Martin",
+                "BMW 7", "Bentley Mulsanne", "Bugatti Veyron",
+                "Chevrolet Camaro", "Cadillac",
+                "Duesenberg J", "Dodge Sprinter",
+                "Elantra", "Excavator",
+                "Ford Boss 302", "Ferrari 360", "Ford Thunderbird",
+                "GAZ Siber",
+                "Honda S2000", "Hyundai Santro",
+                "Isuzu Swift", "Infiniti Skyline",
+                "Jaguar XJS",
+                "Kia Sedona EX", "Koenigsegg Agera",
+                "Lotus Esprit", "Lamborghini Diablo",
+                "Mercedes-Benz", "Mercury Coupe", "Maruti Alto 800",
+                "Nissan Qashqai",
+                "Oldsmobile S98", "Opel Superboss",
+                "Porsche 356", "Pontiac Sunbird",
+                "Scion SRS/SC/SD", "Saab Sportcombi", "Subaru Sambar", "Suzuki Swift",
+                "Triumph Spitfire", "Toyota 2000GT",
+                "Volvo P1800", "Volkswagen Shirako"
+            ];
+    $(function () {        
+        var autocompleteInstance =new ej.Autocomplete($("#selectCar"), {        
             width: "100%",
             watermarkText: "Select a car",
             dataSource: carList,
             enableAutoFill: true,
             showPopupButton: true,
             multiSelectMode: "delimiter"
-        });
+        });  
     });
 }
 
@@ -193,12 +197,12 @@ module ChartComponent {
                 range: { min: 25, max: 50, interval: 5 },
                 labelFormat: "{value}%",
                 title: { text: "Efficiency" },
-
+                
             },
             commonSeriesOptions:
-            {
+			{
                 type: 'line', enableAnimation: true,
-                tooltip: { visible: true, template: 'Tooltip' },
+				tooltip:{ visible :true, template:'Tooltip'},
                 marker:
                 {
                     shape: 'circle',
@@ -208,30 +212,30 @@ module ChartComponent {
                     },
                     visible: true
                 },
-                border: { width: 2 }
-            },
-            series:
-            [
+                 border : {width: 2}                             
+            },	
+            series: 
+			[
+			    {
+                points: [{ x: 2005, y: 28 }, { x: 2006, y: 25 },{ x: 2007, y: 26 }, { x: 2008, y: 27 }, 
+						 { x: 2009, y: 32 }, { x: 2010, y: 35 }, { x: 2011, y: 30 }],						 
+                name: 'India'
+                },						
                 {
-                    points: [{ x: 2005, y: 28 }, { x: 2006, y: 25 }, { x: 2007, y: 26 }, { x: 2008, y: 27 },
-                        { x: 2009, y: 32 }, { x: 2010, y: 35 }, { x: 2011, y: 30 }],
-                    name: 'India'
+                points: [{ x: 2005, y: 31 }, { x: 2006, y: 28 },{ x: 2007, y: 30 }, { x: 2008, y: 36 }, 
+						 { x: 2009, y: 36 }, { x: 2010, y: 39 }, { x: 2011, y: 37 }],						 
+                name: 'Germany'
                 },
+				{
+                points: [{ x: 2005, y: 36 }, { x: 2006, y: 32 },{ x: 2007, y: 34 }, { x: 2008, y: 41 }, 
+						 { x: 2009, y: 42 }, { x: 2010, y: 42 }, { x: 2011, y: 43 }],						 
+                name: 'England'
+                },					
                 {
-                    points: [{ x: 2005, y: 31 }, { x: 2006, y: 28 }, { x: 2007, y: 30 }, { x: 2008, y: 36 },
-                        { x: 2009, y: 36 }, { x: 2010, y: 39 }, { x: 2011, y: 37 }],
-                    name: 'Germany'
-                },
-                {
-                    points: [{ x: 2005, y: 36 }, { x: 2006, y: 32 }, { x: 2007, y: 34 }, { x: 2008, y: 41 },
-                        { x: 2009, y: 42 }, { x: 2010, y: 42 }, { x: 2011, y: 43 }],
-                    name: 'England'
-                },
-                {
-                    points: [{ x: 2005, y: 39 }, { x: 2006, y: 36 }, { x: 2007, y: 40 }, { x: 2008, y: 44 },
-                        { x: 2009, y: 45 }, { x: 2010, y: 48 }, { x: 2011, y: 46 }],
-                    name: 'France'
-                }
+                points: [{ x: 2005, y: 39 }, { x: 2006, y: 36 },{ x: 2007, y: 40 }, { x: 2008, y: 44 }, 
+						 { x: 2009, y: 45 }, { x: 2010, y: 48 }, { x: 2011, y: 46 }],						 
+                name: 'France'
+				}
             ],
             isResponsive: true,
             load: function () {
@@ -296,14 +300,14 @@ module ChartComponent {
                             theme = "flatlight";
                             break;
                     }
-                    sender.model.theme = theme;
+                    sender.model.theme = theme;                    
                 }
             },
             title: { text: 'Efficiency of oil-fired power production' },
             size: { height: "600" },
-            legend: { visible: true },
+            legend: { visible: true},	
         });
-        //    chartsample.model.load="loadTheme";
+    //    chartsample.model.load="loadTheme";
     });
 }
 
@@ -357,7 +361,7 @@ module circulargaugecomponent {
                         backgroundColor: "#f5b43f",
                         border: { color: "#f5b43f" }
                     }]
-            }]
+            }]	
         });
     });
 }
@@ -376,21 +380,21 @@ module ColorPickerComponent {
 
 
 
-module ComboBoxComponent {
+module ComboBoxComponent{
     var BikeList = [
         { empid: "bk1", text: "Apache RTR" }, { empid: "bk2", text: "CBR 150-R" }, { empid: "bk3", text: "CBZ Xtreme" },
         { empid: "bk4", text: "Discover" }, { empid: "bk5", text: "Dazzler" }, { empid: "bk6", text: "Flame" },
         { empid: "bk7", text: "Fazzer" }, { empid: "bk8", text: "FZ-S" }, { empid: "bk9", text: "Pulsar" },
         { empid: "bk10", text: "Shine" }, { empid: "bk11", text: "R15" }, { empid: "bk12", text: "Unicorn" }
     ];
-    $(function () {
-        var comboboxInstance = new ej.ComboBox($("#selectCar"), {
+    $(function () {        
+        var comboboxInstance =new ej.ComboBox($("#selectCar"), {        
             width: "100%",
             placeholder: "Select a Bike",
-            fields: { text: "text", value: "empid" },
+			fields: { text: "text", value: "empid" },
             dataSource: BikeList,
             autofill: true
-        });
+        });  
     });
 }
 
@@ -462,8 +466,7 @@ $(function () {
             }),
             createNode({ name: "Project", width: 150, height: 100, offsetX: 300, offsetY: 430, labels: [createLabel({ "text": "Find Project \nmanager" })], type: "flow", shape: ej.datavisualization.Diagram.FlowShapes.Decision }),
             createNode({
-                name: "End", width: 150, height: 60, offsetX: 300, offsetY: 555, labels: [createLabel({ "text": "Implement and Deliver" })], type: "flow", shape: ej.datavisualization.Diagram.FlowShapes.Process
-            }),
+                name: "End", width: 150, height: 60, offsetX: 300, offsetY: 555, labels: [createLabel({ "text": "Implement and Deliver" })], type: "flow", shape: ej.datavisualization.Diagram.FlowShapes.Process }),
             createNode({ name: "Decision", width: 250, height: 60, offsetX: 550, offsetY: 60, labels: [createLabel({ "text": "Decision Process for new software ideas" })], type: "flow", shape: ej.datavisualization.Diagram.FlowShapes.Card, fillColor: "#858585", borderColor: "#858585" }),
             createNode({ name: "Reject", width: 150, height: 60, offsetX: 550, offsetY: 285, labels: [createLabel({ "text": "Reject and write report" })], type: "flow", shape: ej.datavisualization.Diagram.FlowShapes.Process }),
             createNode({ name: "Resources", width: 150, height: 60, offsetX: 550, offsetY: 430, labels: [createLabel({ "text": "Hire new resources" })], type: "flow", shape: ej.datavisualization.Diagram.FlowShapes.Process })
@@ -477,7 +480,7 @@ $(function () {
             createConnector({ name: "connector6", sourceNode: "Project", targetNode: "Resources", labels: [createLabel({ "text": "No" })] })
         ]
     });
-
+    
 });
 
 function createNode(option: ej.datavisualization.Diagram.Node) {
@@ -498,11 +501,11 @@ function createConnector(option: ej.datavisualization.Diagram.Connector) {
     return option;
 }
 
-function createLabel(options: any) {
+function createLabel(options : any) {
     return options;
 }
 
-
+ 
 
 module DialogComponent {
     $(function () {
@@ -510,17 +513,15 @@ module DialogComponent {
             width: 550,
             minWidth: 310,
             minHeight: 215,
-            target: ".control",
-            close: () => {
-                $("#btnOpen").show();
-            }
+			target:".control",
+            close:()=>{
+			$("#btnOpen").show();}
         });
         var btnInstance = new ej.Button($("#btnOpen"), {
             size: "medium",
-            click: () => {
-                $("#btnOpen").hide();
-                $("#basicDialog").ejDialog("open");
-            },
+            click: ()=>{
+			$("#btnOpen").hide();
+        $("#basicDialog").ejDialog("open");},
             type: "button",
             height: 30,
             width: 150
@@ -554,7 +555,7 @@ module digitalgaugecomponent {
 }
 
 
-
+		
 
 
 
@@ -566,7 +567,7 @@ module DropDownListComponent {
         { empid: "bk10", text: "Shine" }, { empid: "bk11", text: "R15" }, { empid: "bk12", text: "Unicorn" }
     ];
     $(function () {
-        var sample = new ej.DropDownList($("#bikeList"), {
+        var sample = new ej.DropDownList($("#bikeList"),{
             dataSource: BikeList,
             width: "100%",
             watermarkText: "Select a bike",
@@ -574,12 +575,12 @@ module DropDownListComponent {
             enableFilterSearch: true,
             caseSensitiveSearch: true,
             enableIncrementalSearch: true,
-            enablePopupResize: true,
+            enablePopupResize: true, 
             delimiterChar: ";",
             multiSelectMode: ej.MultiSelectMode.Delimiter,
             maxPopupHeight: "300px",
-            minPopupHeight: "150px",
-            maxPopupWidth: "500px",
+            minPopupHeight: "150px", 
+            maxPopupWidth: "500px", 
             minPopupWidth: "350px",
             showCheckbox: true,
             showRoundedCorner: true
@@ -610,53 +611,53 @@ module ExplorerComponent {
 
 
 module GanttComponent {
-    $(function () {
-        var ganttInstance = new ej.Gantt($("#GanttContainer"), {
-            dataSource: (<any>window).projectData,
-            allowColumnResize: true,
-            allowSorting: true,
-            allowSelection: true,
-            enableContextMenu: true,
-            taskIdMapping: "taskID",
-            allowDragAndDrop: true,
-            taskNameMapping: "taskName",
-            startDateMapping: "startDate",
-            showColumnChooser: true,
-            showColumnOptions: true,
-            progressMapping: "progress",
-            durationMapping: "duration",
-            endDateMapping: "endDate",
-            childMapping: "subtasks",
-            scheduleStartDate: "02/01/2017",
-            scheduleEndDate: "04/09/2017",
-            //Resources mapping
-            resourceInfoMapping: "resourceId",
-            resourceNameMapping: "resourceName",
-            resourceIdMapping: "resourceId",
-            resources: (<any>window).projectResources,
-            predecessorMapping: "predecessor",
-            showResourceNames: true,
-            toolbarSettings: {
-                showToolbar: true,
-                toolbarItems: ["add", "edit", "delete", "update", "cancel", "indent", "outdent", "expandAll", "collapseAll", "search"]
-            },
-            editSettings: {
-                allowEditing: true,
-                allowAdding: true,
-                allowDeleting: true,
-                allowIndent: true,
-                editMode: "cellEditing"
-            },
-            sizeSettings: {
-                width: "100%",
-                height: "100%"
-            },
-            dragTooltip: { showTooltip: true },
-            showGridCellTooltip: true,
-            treeColumnIndex: 1,
-            isResponsive: true,
-        });
+     $(function () {
+         var ganttInstance = new ej.Gantt($("#GanttContainer"), {
+        dataSource: (<any>window).projectData,
+        allowColumnResize: true,
+        allowSorting: true,
+        allowSelection: true,       
+        enableContextMenu: true,
+        taskIdMapping: "taskID",
+        allowDragAndDrop: true,
+        taskNameMapping: "taskName",
+        startDateMapping: "startDate",
+        showColumnChooser: true,
+        showColumnOptions: true,
+        progressMapping: "progress",
+        durationMapping: "duration",
+        endDateMapping: "endDate",
+        childMapping: "subtasks",
+        scheduleStartDate: "02/01/2017",
+        scheduleEndDate: "04/09/2017",
+        //Resources mapping
+        resourceInfoMapping: "resourceId",
+        resourceNameMapping: "resourceName",
+        resourceIdMapping: "resourceId",
+        resources: (<any>window).projectResources,
+        predecessorMapping: "predecessor",
+        showResourceNames: true,
+        toolbarSettings: {
+            showToolbar: true,
+            toolbarItems: ["add","edit","delete","update","cancel","indent","outdent","expandAll","collapseAll","search"]
+        },
+        editSettings: {
+            allowEditing: true,
+            allowAdding: true,
+            allowDeleting: true,
+            allowIndent: true,
+            editMode: "cellEditing"
+        },
+        sizeSettings: {
+            width: "100%",
+            height: "100%"
+        },
+        dragTooltip: { showTooltip: true },
+        showGridCellTooltip: true,
+        treeColumnIndex: 1,
+        isResponsive: true,
     });
+}); 
 }
 
 
@@ -749,7 +750,7 @@ $(function () {
 module KanbanComponent {
     $(function () {
         var sample = new ej.Kanban($("#Kanban"), {
-            dataSource: new ej.DataManager((<any>window).kanbanData).executeLocal(new ej.Query().take(20)),
+           dataSource: new ej.DataManager((<any>window).kanbanData).executeLocal(new ej.Query().take(20)),
             columns: [
                 { headerText: "Backlog", key: "Open" },
                 { headerText: "In Progress", key: "InProgress" },
@@ -768,7 +769,7 @@ module KanbanComponent {
     });
 }
 
-
+ 
 
 
 module lineargaugecomponent {
@@ -794,14 +795,14 @@ module lineargaugecomponent {
                         backgroundColor: "#E94649",
                         border: { color: "#E94649" }, startWidth: 4, endWidth: 4
                     }]
-            }]
+            }]		
         });
     });
 }
 
+	
 
-
-
+ 
 
 module ListBoxComponent {
     $(function () {
@@ -811,13 +812,13 @@ module ListBoxComponent {
     });
 }
 
-
+ 
 
 module ListviewComponent {
     $(function () {
         var listviewInstance = new ej.ListView($("#defaultlistview"), {
-            enableCheckMark: true,
-            width: 400
+            enableCheckMark: true, 
+		    width: 400
         });
     });
 }
@@ -1056,7 +1057,7 @@ module mapcomponenet {
 
 module MenuComponent {
     $(function () {
-        var sample = new ej.Menu($("#syncfusionProducts"), {
+        var sample = new ej.Menu($("#syncfusionProducts"),{
             width: "100%",
             animationType: ej.AnimationType.Default,
             cssClass: 'gradient-lime ',
@@ -1081,12 +1082,12 @@ module MenuComponent {
 
 
 
-
+ 
 
 module NavigationDrawerComponent {
     $(function () {
         var navigationdrawerInstance = new ej.NavigationDrawer($("#navpane"), {
-            targetId: "butdrawer",
+           targetId: "butdrawer",
             contentId: "content_container",
             type: "overlay",
             direction: "left",
@@ -1097,8 +1098,8 @@ module NavigationDrawerComponent {
             },
             position: "normal"
         });
-        $("#navpane_listview").click(function (e: any) {
-            var text = e.target["text"] || $(e.target).closest("li.e-list").text();
+		$("#navpane_listview").click(function(e: any) {
+            var text=e.target["text"]||$(e.target).closest("li.e-list").text();
             $("#butdrawer").parent().children("h2").text(text);
         });
     });
@@ -1109,7 +1110,7 @@ module NavigationDrawerComponent {
 module PDFViewerComponent {
     $(function () {
         var pdfviewerControl = new ej.PdfViewer($("#pdfviewer"), {
-            serviceUrl: (<any>window).baseurl + "api/PdfViewer",
+            serviceUrl:(<any>window).baseurl+ "api/PdfViewer",
             isResponsive: true
         });
     });
@@ -1119,42 +1120,42 @@ module PDFViewerComponent {
 
 module PivotChartOlap {
     $(function () {
-        var sample = new ej.PivotChart($("#PivotChart"), {
+        var sample = new ej.PivotChart($("#PivotChart"),{
             dataSource: {
-                data: "//bi.syncfusion.com/olap/msmdpump.dll",
-                catalog: "Adventure Works DW 2008 SE",
-                cube: "Adventure Works",
-                rows: [
-                    {
-                        fieldName: "[Date].[Fiscal]"
-                    }
-                ],
-                columns: [
-                    {
-                        fieldName: "[Customer].[Customer Geography]"
-                    }
-                ],
-                values: [
-                    {
-                        measures: [
-                            {
-                                fieldName: "[Measures].[Internet Sales Amount]"
-                            }
-                        ],
-                        axis: "columns"
-                    }
-                ],
-                filters: []
-            },
-            isResponsive: true, zooming: { enableScrollbar: true },
-            commonSeriesOptions: {
-                type: "column"
-            },
-            size: { height: "460px", width: "100%" },
-            primaryXAxis: { title: { text: "Date - Fiscal" }, labelRotation: 0 },
-            primaryYAxis: { title: { text: "Internet Sales Amount" } },
-            legend: { visible: true, rowCount: 2 }
-            // load:"loadTheme"
+			data: "//bi.syncfusion.com/olap/msmdpump.dll", 
+			catalog: "Adventure Works DW 2008 SE",
+			cube: "Adventure Works",
+			rows: [
+				{
+					fieldName: "[Date].[Fiscal]"
+				}
+			],
+			columns: [
+				{
+					fieldName: "[Customer].[Customer Geography]"
+				}
+			],
+			values: [
+				{
+					measures: [
+						{
+							fieldName: "[Measures].[Internet Sales Amount]"
+						}
+                    ],
+					axis: "columns"
+				}
+            ],
+			filters:[]
+        },
+		isResponsive: true,zooming:{enableScrollbar: true},
+        commonSeriesOptions: {
+			type: "column"
+		},
+		size: { height: "460px", width: "100%" },
+		primaryXAxis: { title: { text: "Date - Fiscal" }, labelRotation: 0 },
+		primaryYAxis: { title: { text: "Internet Sales Amount" } },
+		legend: { visible: true, rowCount: 2 }
+		// load:"loadTheme"
         });
     });
 }
@@ -1191,45 +1192,45 @@ var pivot_dataset = [
 module PivotChartRelational {
 
     $(function () {
-        var sample = new ej.PivotChart($("#PivotChart"), {
+        var sample = new ej.PivotChart($("#PivotChart"),{
             dataSource: {
-                data: pivot_dataset,
-                rows: [
-                    {
-                        fieldName: "Country",
-                        fieldCaption: "Country"
-                    },
-                    {
-                        fieldName: "State",
-                        fieldCaption: "State"
-                    },
-                    {
-                        fieldName: "Date",
-                        fieldCaption: "Date"
-                    }
-                ],
-                columns: [
-                    {
-                        fieldName: "Product",
-                        fieldCaption: "Product"
-                    }
-                ],
-                values: [
-                    {
-                        fieldName: "Amount",
-                        fieldCaption: "Amount"
-                    }
-                ],
-                filters: []
-            },
-            isResponsive: true, zooming: { enableScrollbar: true },
-            commonSeriesOptions: {
-                type: "column"
-            },
-            size: { height: "460px", width: "100%" },
-            primaryYAxis: { title: { text: "Amount" } },
-            legend: { visible: true }
-            // load:"loadTheme"
+			data: pivot_dataset,
+			rows: [
+				{
+					fieldName: "Country",
+					fieldCaption: "Country"
+				},
+				{
+					fieldName: "State",
+					fieldCaption: "State"
+				},
+				{
+					fieldName: "Date",
+					fieldCaption: "Date"
+				}
+			],
+			columns: [
+				{
+					fieldName: "Product",
+					fieldCaption: "Product"
+				}
+			],
+			values: [
+				{
+					fieldName: "Amount",
+					fieldCaption: "Amount"
+				}
+			],
+			filters:[]
+		},
+		isResponsive: true,zooming:{enableScrollbar: true},
+		commonSeriesOptions: {
+			type: "column"
+		},
+		size: { height: "460px", width: "100%" },
+		primaryYAxis: { title: { text: "Amount" } },
+		legend: { visible: true }
+		// load:"loadTheme"
         });
     });
 }
@@ -1239,106 +1240,106 @@ module PivotChartRelational {
 module PivotGaugeOlap {
 
     $(function () {
-        var sample = new ej.PivotGauge($("#PivotGauge"), {
+        var sample = new ej.PivotGauge($("#PivotGauge"),{
             dataSource: {
-                data: "//bi.syncfusion.com/olap/msmdpump.dll",
-                catalog: "Adventure Works DW 2008 SE",
-                cube: "Adventure Works",
-                rows: [
-                    {
-                        fieldName: "[Date].[Fiscal]",
-                        filterItems: { filterType: "include", values: ["[Date].[Fiscal].[Fiscal Year].&amp;[2004]"] }
-                    },
-                ],
-                columns: [
-                    {
-                        fieldName: "[Customer].[Customer Geography]"
-                    }
-                ],
-                values: [
-                    {
-                        measures: [
-                            {
-                                fieldName: "[Measures].[Internet Sales Amount]"
-                            },
-                            {
-                                fieldName: "[Measures].[Internet Revenue Status]"
-                            },
-                            {
-                                fieldName: "[Measures].[Internet Revenue Trend]"
-                            },
-                            {
-                                fieldName: "[Measures].[Internet Revenue Goal]"
-                            },
-                        ],
-                        axis: "columns"
-                    }
-                ],
-                filters: []
-            },
+				data: "//bi.syncfusion.com/olap/msmdpump.dll",
+				catalog: "Adventure Works DW 2008 SE",
+				cube: "Adventure Works",
+				rows: [
+					{
+						fieldName: "[Date].[Fiscal]",
+						filterItems: { filterType: "include", values: ["[Date].[Fiscal].[Fiscal Year].&amp;[2004]"] }
+					},
+				],
+				columns: [
+					{
+						fieldName: "[Customer].[Customer Geography]"
+					}
+				],
+				values: [
+					{
+						measures: [
+							{
+								fieldName: "[Measures].[Internet Sales Amount]"
+							},
+							{
+								fieldName: "[Measures].[Internet Revenue Status]"
+							},
+							{
+								fieldName: "[Measures].[Internet Revenue Trend]"
+							},
+							{
+								fieldName: "[Measures].[Internet Revenue Goal]"
+							},
+						],
+						axis: "columns"
+					}
+				],
+				filters:[]
+			},
             enableTooltip: true, isResponsive: true,
             labelFormatSettings: { decimalPlaces: 2 },
-            scales: [{
-                showRanges: true,
-                radius: 150, showScaleBar: true, size: 1,
+			scales: [{
+				showRanges: true,
+				radius: 150, showScaleBar: true, size: 1,
                 border: {
-                    width: 0.5
-                },
-                showIndicators: true, showLabels: true,
+					width: 0.5
+				},
+				showIndicators: true, showLabels: true,
                 pointers: [{
-                    showBackNeedle: true,
-                    backNeedleLength: 20,
-                    length: 120,
-                    width: 7
+					showBackNeedle: true,
+					backNeedleLength: 20,
+					length: 120,
+					width: 7
                 },
-                    {
-                        type: "marker",
-                        markerType: "diamond",
-                        distanceFromScale: 5,
-                        placement: "center",
-                        backgroundColor: "#29A4D9",
-                        length: 25,
-                        width: 15
-                    }],
+				{		
+					type: "marker",
+					markerType: "diamond",
+					distanceFromScale: 5,
+					placement: "center",
+					backgroundColor: "#29A4D9",
+					length: 25,
+					width: 15
+				}],
                 ticks: [{
-                    type: "major",
+					type: "major",
                     distanceFromScale: 2,
-                    height: 16,
-                    width: 1, color: "#8c8c8c"
-                },
-                    {
-                        type: "minor",
-                        height: 6,
-                        width: 1,
-                        distanceFromScale: 2,
-                        color: "#8c8c8c"
-                    }],
-                labels: [{
+					height: 16,
+					width: 1, color: "#8c8c8c"
+				},
+                {
+					type: "minor",
+					height: 6,
+					width: 1,
+					distanceFromScale: 2,
                     color: "#8c8c8c"
                 }],
+                labels: [{
+                    color: "#8c8c8c"
+				}],
                 ranges: [{
-                    distanceFromScale: -5,
+					distanceFromScale: -5,
                     backgroundColor: "#fc0606",
-                    border: { color: "#fc0606" }
+					border: { color: "#fc0606" }
+                }, 
+				{
+					distanceFromScale: -5
+                }],
+				customLabels: [{
+					position: { x: 180, y: 290 },
+					font: { size: "10px", fontFamily: "Segoe UI", fontStyle: "Normal" }, color: "#666666"
                 },
-                    {
-                        distanceFromScale: -5
-                    }],
-                customLabels: [{
-                    position: { x: 180, y: 290 },
-                    font: { size: "10px", fontFamily: "Segoe UI", fontStyle: "Normal" }, color: "#666666"
+				{
+					position: { x: 180, y: 320 },
+					font: { size: "10px", fontFamily: "Segoe UI", fontStyle: "Normal" }, color: "#666666"
                 },
-                    {
-                        position: { x: 180, y: 320 },
-                        font: { size: "10px", fontFamily: "Segoe UI", fontStyle: "Normal" }, color: "#666666"
-                    },
-                    {
-                        position: { x: 180, y: 150 },
-                        font: { size: "12px", fontFamily: "Segoe UI", fontStyle: "Normal" }, color: "#666666"
-                    }]
+				{
+                    position: { x: 180, y: 150 },
+                    font: { size: "12px", fontFamily: "Segoe UI", fontStyle: "Normal" }, color: "#666666"
+                }]
             }]
         });
-    });
+    });	
 }
 
 
@@ -1372,94 +1373,94 @@ var pivot_dataset = [
 
 module PivotGaugeRelational {
     $(function () {
-        var sample = new ej.PivotGauge($("#PivotGauge"), {
+        var sample = new ej.PivotGauge($("#PivotGauge"),{
             dataSource: {
-                data: pivot_dataset,
-                rows: [
-                    {
-                        fieldName: "Country",
-                    },
-                    {
-                        fieldName: "State",
-                    }
-                ],
-                columns: [
-                    {
-                        fieldName: "Product",
-                    }
-                ],
+				data: pivot_dataset,
+				rows: [
+					{
+						fieldName: "Country",
+					},
+					{
+						fieldName: "State",
+					}
+				],
+				columns: [
+					{
+						fieldName: "Product",
+					}
+				],
                 values: [
-                    {
-                        fieldName: "Amount",
-                    },
-                    {
-                        fieldName: "Quantity",
-                    }
-                ]
-            },
+					{
+						fieldName: "Amount",
+					},
+					{
+						fieldName: "Quantity",
+					}
+				]
+			},
             enableTooltip: true, isResponsive: true,
             labelFormatSettings: { decimalPlaces: 2 },
-            scales: [{
-                showRanges: true,
-                radius: 150, showScaleBar: true, size: 1,
+			scales: [{
+				showRanges: true,
+				radius: 150, showScaleBar: true, size: 1,
                 border: {
-                    width: 0.5
-                },
-                showIndicators: true, showLabels: true,
+					width: 0.5
+				},
+				showIndicators: true, showLabels: true,
                 pointers: [{
-                    showBackNeedle: true,
-                    backNeedleLength: 20,
-                    length: 120,
-                    width: 7
+					showBackNeedle: true,
+					backNeedleLength: 20,
+					length: 120,
+					width: 7
                 },
-                    {
-                        type: "marker",
-                        markerType: "diamond",
-                        distanceFromScale: 5,
-                        placement: "center",
-                        backgroundColor: "#29A4D9",
-                        length: 25,
-                        width: 15
-                    }],
+				{		
+					type: "marker",
+					markerType: "diamond",
+					distanceFromScale: 5,
+					placement: "center",
+					backgroundColor: "#29A4D9",
+					length: 25,
+					width: 15
+				}],
                 ticks: [{
-                    type: "major",
+					type: "major",
                     distanceFromScale: 2,
-                    height: 16,
-                    width: 1, color: "#8c8c8c"
-                },
-                    {
-                        type: "minor",
-                        height: 6,
-                        width: 1,
-                        distanceFromScale: 2,
-                        color: "#8c8c8c"
-                    }],
-                labels: [{
+					height: 16,
+					width: 1, color: "#8c8c8c"
+				},
+                {
+					type: "minor",
+					height: 6,
+					width: 1,
+					distanceFromScale: 2,
                     color: "#8c8c8c"
                 }],
+                labels: [{
+                    color: "#8c8c8c"
+				}],
                 ranges: [{
-                    distanceFromScale: -5,
+					distanceFromScale: -5,
                     backgroundColor: "#fc0606",
-                    border: { color: "#fc0606" }
+					border: { color: "#fc0606" }
+                }, 
+				{
+					distanceFromScale: -5
+                }],
+				customLabels: [{
+					position: { x: 180, y: 290 },
+					font: { size: "10px", fontFamily: "Segoe UI", fontStyle: "Normal" }, color: "#666666"
                 },
-                    {
-                        distanceFromScale: -5
-                    }],
-                customLabels: [{
-                    position: { x: 180, y: 290 },
-                    font: { size: "10px", fontFamily: "Segoe UI", fontStyle: "Normal" }, color: "#666666"
+				{
+					position: { x: 180, y: 320 },
+					font: { size: "10px", fontFamily: "Segoe UI", fontStyle: "Normal" }, color: "#666666"
                 },
-                    {
-                        position: { x: 180, y: 320 },
-                        font: { size: "10px", fontFamily: "Segoe UI", fontStyle: "Normal" }, color: "#666666"
-                    },
-                    {
-                        position: { x: 180, y: 150 },
-                        font: { size: "12px", fontFamily: "Segoe UI", fontStyle: "Normal" }, color: "#666666"
-                    }]
+				{
+                    position: { x: 180, y: 150 },
+                    font: { size: "12px", fontFamily: "Segoe UI", fontStyle: "Normal" }, color: "#666666"
+                }]
             }]
         });
-    });
+    });	
 }
 
 
@@ -1467,35 +1468,35 @@ module PivotGaugeRelational {
 module PivotGridOlap {
 
     $(function () {
-        var sample = new ej.PivotGrid($("#PivotGrid"), {
+        var sample = new ej.PivotGrid($("#PivotGrid"),{
             dataSource: {
-                data: "//bi.syncfusion.com/olap/msmdpump.dll",
-                catalog: "Adventure Works DW 2008 SE",
-                cube: "Adventure Works",
-                rows: [
-                    {
-                        fieldName: "[Date].[Fiscal]"
-                    }
-                ],
-                columns: [
-                    {
-                        fieldName: "[Customer].[Customer Geography]"
-                    }
-                ],
-                values: [
-                    {
-                        measures: [
-                            {
-                                fieldName: "[Measures].[Internet Sales Amount]",
-                            }
-                        ],
-                        axis: "columns"
-                    }
-                ],
-                filters: []
-            },
-            enableGroupingBar: true,
-            pivotTableFieldListID: "PivotSchemaDesigner"
+			data: "//bi.syncfusion.com/olap/msmdpump.dll",
+			catalog: "Adventure Works DW 2008 SE",
+			cube: "Adventure Works",
+			rows: [
+				{
+					fieldName: "[Date].[Fiscal]"
+				}
+			],
+			columns: [
+				{
+					fieldName: "[Customer].[Customer Geography]"
+				}
+			],
+            values: [
+				{
+					measures: [
+						{
+							fieldName: "[Measures].[Internet Sales Amount]",
+						}
+                    ],
+					axis: "columns"
+				}
+			],
+			filters:[]
+		},
+        enableGroupingBar: true, 
+        pivotTableFieldListID:"PivotSchemaDesigner"
         });
         $("#PivotSchemaDesigner").ejPivotSchemaDesigner();
     });
@@ -1532,41 +1533,41 @@ var pivot_dataset = [
 
 module PivotGridRelational {
     $(function () {
-        var sample = new ej.PivotGrid($("#PivotGrid"), {
+        var sample = new ej.PivotGrid($("#PivotGrid"),{
             dataSource: {
-                data: pivot_dataset,
-                rows: [
-                    {
-                        fieldName: "Country",
-                        fieldCaption: "Country"
-                    },
-                    {
-                        fieldName: "State",
-                        fieldCaption: "State"
-                    }
-                ],
-                columns:
-                [{
-                    fieldName: "Product",
-                    fieldCaption: "Product"
-                }
-                ],
-                values: [
-                    {
-                        fieldName: "Amount",
-                        fieldCaption: "Amount"
-                    },
-                    {
-                        fieldName: "Quantity",
-                        fieldCaption: "Quantity"
-                    }
-                ],
-                filters: []
-            },
-            enableGroupingBar: true,
-            pivotTableFieldListID: "PivotSchemaDesigner"
+			data: pivot_dataset,
+			rows: [
+				{
+					fieldName: "Country",
+					fieldCaption: "Country"
+				},
+				{
+					fieldName: "State",
+					fieldCaption: "State"
+				}
+			],
+			columns:                     
+				[{
+					fieldName: "Product",
+					fieldCaption: "Product"
+				}
+			],
+			values: [
+				{
+					fieldName: "Amount",
+                    fieldCaption: "Amount"
+				},
+				{
+					fieldName: "Quantity",
+					fieldCaption: "Quantity"
+				}
+            ],
+			filters:[]
+		},
+        enableGroupingBar: true, 
+        pivotTableFieldListID:"PivotSchemaDesigner"
         });
-        $("#PivotSchemaDesigner").ejPivotSchemaDesigner();
+       $("#PivotSchemaDesigner").ejPivotSchemaDesigner(); 
 
     });
 }
@@ -1575,33 +1576,33 @@ module PivotGridRelational {
 
 module PivotTreeMap {
     $(function () {
-        var sample = new ej.PivotTreeMap($("#PivotTreeMap"), {
+        var sample = new ej.PivotTreeMap($("#PivotTreeMap"),{
             dataSource: {
-                data: "//bi.syncfusion.com/olap/msmdpump.dll;Locale Identifier=1033;",
-                catalog: "Adventure Works DW 2008 SE",
-                cube: "Adventure Works",
-                rows: [
-                    {
-                        fieldName: "[Customer].[Customer Geography]"
-                    }
-                ],
-                columns: [
-                    {
-                        fieldName: "[Date].[Fiscal]"
-                    }
-                ],
-                values: [
-                    {
-                        measures: [
-                            {
-                                fieldName: "[Measures].[Customer Count]",
-                            }
-                        ],
-                        axis: "columns"
-                    }
-                ],
-                filters: []
-            }
+			data: "//bi.syncfusion.com/olap/msmdpump.dll;Locale Identifier=1033;",
+			catalog: "Adventure Works DW 2008 SE",
+			cube: "Adventure Works",
+			rows: [
+				{
+					fieldName: "[Customer].[Customer Geography]"
+				}
+			],
+			columns: [
+				{
+					fieldName: "[Date].[Fiscal]"
+				}
+			],
+            values: [
+				{
+					measures: [
+						{
+							fieldName: "[Measures].[Customer Count]",
+						}
+					],
+					axis: "columns"
+				}
+			],
+			filters:[]
+		}
         });
     });
 }
@@ -1610,7 +1611,7 @@ module PivotTreeMap {
 
 module ProgressBarComponent {
     $(function () {
-        var sample = new ej.ProgressBar($("#progressBar"), {
+        var sample = new ej.ProgressBar($("#progressBar"),{
             width: 200,
             value: 45,
             height: 20,
@@ -1640,7 +1641,7 @@ module RadialMenuComponent {
                 backImageClass: "backimageclass",
                 targetElementId: "radialtarget1"
             });
-            $("#radialtarget1").parent().css("position", "relative");
+			$("#radialtarget1").parent().css("position", "relative");
         }
         else {
             $("#contentDiv").html("Radial Menu is only supported from Internet Explorer Versioned 9 and above.").css({ "font-size": "20px", "color": "red" });
@@ -1707,12 +1708,12 @@ function redo(e: any) {
 }
 
 
-
+ 
 
 module RadialSliderComponent {
     $(function () {
         var radialsliderInstance = new ej.RadialSlider($("#radialSlider"), {
-            innerCircleImageUrl: "images/radialslider/chevron-right.png"
+           innerCircleImageUrl: "images/radialslider/chevron-right.png"
         });
     });
 }
@@ -1809,8 +1810,8 @@ var data;
 data = GetData();
 
 function GetData() {
-    var series1: any[] = [];
-    var series2: any[] = [];
+    var series1:any[]=[];
+    var series2:any[]= [];
     var value = 100;
     var value1 = 120;
     for (var i = 1; i < 730; i++) {
@@ -1837,7 +1838,7 @@ function GetData() {
 module RatingComponent {
     $(function () {
 
-        var sample1 = new ej.Rating($("#fullRating"), {
+        var sample1 = new ej.Rating($("#fullRating"),{
             value: 4,
             precision: ej.Rating.Precision.Full,
             allowReset: true,
@@ -1852,8 +1853,8 @@ module RatingComponent {
             shapeWidth: 25,
             showTooltip: true
         });
-
-        var sample2 = new ej.Rating($("#halfRating"), {
+		
+        var sample2 = new ej.Rating($("#halfRating"),{
             precision: ej.Rating.Precision.Half,
             value: 3.5,
             allowReset: true,
@@ -1869,7 +1870,7 @@ module RatingComponent {
             showTooltip: true
         });
 
-        var sample3 = new ej.Rating($("#exactRating"), {
+        var sample3 = new ej.Rating($("#exactRating"),{
             precision: ej.Rating.Precision.Exact,
             value: 3.7,
             allowReset: true,
@@ -1883,7 +1884,7 @@ module RatingComponent {
             shapeHeight: 25,
             shapeWidth: 25,
             showTooltip: true
-        });
+        }); 
     });
 
 }
@@ -1891,15 +1892,15 @@ module RatingComponent {
 
 
 module ReportViewerComponent {
-    $(function () {
-        var report = new ej.ReportViewer($("#territoryReportViewer"), {
-            reportServiceUrl: (<any>window).baseurl + 'api/ReportViewer',
-            reportServerUrl: 'http://104.207.134.201/reportserver',
-            processingMode: ej.ReportViewer.ProcessingMode.Remote,
-            reportPath: "/SSRSSamples2/Territory Sales new",
-            isResponsive: true
-        });
-    });
+	$(function () {
+		var report = new ej.ReportViewer($("#territoryReportViewer"), {
+			reportServiceUrl: (<any>window).baseurl + 'api/ReportViewer',
+			reportServerUrl: 'http://104.207.134.201/reportserver',
+			processingMode: ej.ReportViewer.ProcessingMode.Remote,
+			reportPath: "/SSRSSamples2/Territory Sales new",
+			isResponsive: true
+		});
+	});
 }
 
 
@@ -1916,7 +1917,7 @@ module RibbonComponent {
                 toolTip: "Pin the Ribbon"
             },
             applicationTab: {
-                type: ej.Ribbon.ApplicationTabType.Menu, menuItemID: "ribbonmenu", menuSettings: { openOnClick: false }
+                 type: ej.Ribbon.ApplicationTabType.Menu, menuItemID: "ribbonmenu", menuSettings: { openOnClick: false } 
             },
             tabs: [{
                 id: "home", text: "HOME", groups: [{
@@ -1940,7 +1941,7 @@ module RibbonComponent {
                         }
                     }]
                 },
-                    {
+                {
                         text: "Clipboard", alignType: ej.Ribbon.AlignType.Columns, content: [{
                             groups: [{
                                 id: "paste",
@@ -1962,8 +1963,8 @@ module RibbonComponent {
                                 height: 70
                             }
                         },
-                            {
-                                groups: [{
+                        {
+                             groups: [{
                                     id: "cut",
                                     text: "Cut",
                                     toolTip: "Cut",
@@ -1993,14 +1994,14 @@ module RibbonComponent {
                                             prefixIcon: "e-icon e-ribbon clearAll"
                                         }
                                     }],
-                                defaults: {
+                                     defaults: {
                                     type: "button",
                                     width: 60,
                                     isBig: false
                                 }
-                            }]
-                    },
-                    {
+                            }] 
+                },
+                {
                         text: "Font", alignType: "rows", content: [{
                             groups: [{
                                 id: "fontfamily",
@@ -2299,7 +2300,7 @@ module RibbonComponent {
                             groups: [{
                                 id: "zoomin",
                                 text: "Zoom In",
-                                toolTip: "Zoom In",
+                                toolTip: "Zoom In",                                
                                 buttonSettings: {
                                     width: 58,
                                     click: "onClick",
@@ -2311,7 +2312,7 @@ module RibbonComponent {
                                 {
                                     id: "zoomout",
                                     text: "Zoom Out",
-                                    toolTip: "Zoom Out",
+                                    toolTip: "Zoom Out",                                    
                                     buttonSettings: {
                                         width: 70,
                                         click: "onClick",
@@ -2323,7 +2324,7 @@ module RibbonComponent {
                                 {
                                     id: "fullscreen",
                                     text: "Full Screen",
-                                    toolTip: "Full Screen",
+                                    toolTip: "Full Screen",                                    
                                     buttonSettings: {
                                         width: 73,
                                         click: "onClick",
@@ -2339,7 +2340,7 @@ module RibbonComponent {
                             }
                         }]
                     }]
-            }, {
+            },{
                     id: "insert", text: "INSERT", groups: [{
                         text: "Tables", alignType: ej.Ribbon.AlignType.Columns, content: [{
                             groups: [{
@@ -2484,7 +2485,7 @@ module RibbonComponent {
                                 }
                                 ],
                                 defaults: {
-                                    type: "button",
+                                   type: "button",
                                     width: 70,
                                     height: 70
                                 }
@@ -2566,7 +2567,7 @@ module RibbonComponent {
                         }
                     ]
                 }
-            ],
+            ],   
             create: function createControl(args) {
                 var ribbon = $("#defaultRibbon").data("ejRibbon");
                 $("#fontcolor").ejColorPicker({ value: "#FFFF00", modelType: "palette", cssClass: "e-ribbon", toolIcon: "e-fontcoloricon", select: colorHandler });
@@ -2578,7 +2579,7 @@ module RibbonComponent {
 function colorHandler(args:any) {
     (this._id.indexOf("fillcolor") != -1) ? $("#contenteditor").css('background-color', args.value) : document.execCommand('forecolor', false, args.value);
 }
-function onClick(args: any) {
+function onClick(args:any) {
     var val, prop = args.text;
     val = (ej.isNullOrUndefined(args.model.text)) ? args.model.activeText : args.model.text;
     if (action1.indexOf(val) != -1)
@@ -2596,7 +2597,7 @@ function onClick(args: any) {
 
 
 
-
+ 
 
 module RotatorComponent {
     $(function () {
@@ -2606,14 +2607,14 @@ module RotatorComponent {
             slideHeight: "auto",
             displayItemsCount: "1",
             navigateSteps: "1",
-            pagerPosition: "outside",
+            pagerPosition:"outside",
             orientation: "horizontal",
             showPager: true,
             enabled: true,
             showCaption: true,
             allowKeyboardNavigation: true,
             showPlayButton: true,
-            isResponsive: true,
+            isResponsive:true,
             animationType: "slide",
         });
     });
@@ -2623,7 +2624,7 @@ module RotatorComponent {
 
 module RTEComponent {
     $(function () {
-        var sample = new ej.RTE($("#rteSample"), {
+        var sample = new ej.RTE($("#rteSample"),{
             width: "100%",
             minWidth: "150px",
             showFooter: true,
@@ -2759,7 +2760,7 @@ module ScheduleComponent {
             }
         });
     });
-}
+}   
 
 
 
@@ -2819,10 +2820,10 @@ module linesparkline {
             dataSource: [12, 14, 11, 12, 11, 15, 12, 10, 11, 12, 15, 13, 12, 11, 10, 13, 15, 12, 14, 16, 14, 12, 11],
             tooltip: {
                 visible: true,
-                font: { size: "12px" }
+                font: { size:"12px" }
             },
             type: "line",
-            size: { height: "40", width: "170" },
+            size: { height: "40", width:"170" },
         });
     });
 }
@@ -2830,7 +2831,7 @@ module linesparkline {
 module columnsparkline {
     $(function () {
         var sparkcolumnsample = new ej.Sparkline($("#column"), {
-            dataSource: [2, 6, -1, 1, 12, 5, -2, 7, -3, 5, 8, 10, ],
+            dataSource: [2, 6, -1, 1, 12, 5, -2, 7, -3, 5, 8, 10,],
             negativePointColor: "red",
             highPointColor: "blue",
             tooltip: {
@@ -2848,7 +2849,7 @@ module columnsparkline {
 module areasparkline {
     $(function () {
         var sparkareasample = new ej.Sparkline($("#area"), {
-            dataSource: [12, -10, 11, 8, 17, 6, 2, -17, 13, -6, 8, 10, ],
+            dataSource: [12, -10, 11, 8, 17, 6, 2, -17, 13, -6, 8, 10,],
             markerSettings: { visible: true },
             highPointColor: "blue",
             lowPointColor: "orange",
@@ -2868,7 +2869,7 @@ module areasparkline {
 module windlosssparkline {
     $(function () {
         var sparkwinlosssample = new ej.Sparkline($("#winloss"), {
-            dataSource: [12, 15, -11, 13, 17, 0, -12, 17, 13, -15, 8, 10, ],
+            dataSource: [12, 15, -11, 13, 17, 0, -12, 17, 13, -15, 8, 10,],
             type: "winloss",
             size: { height: "100", width: "150" },
         });
@@ -2894,7 +2895,7 @@ module piesparkline1 {
 module piesparkline2 {
     $(function () {
         var sparkpiesample2 = new ej.Sparkline($("#pie2"), {
-            dataSource: [8, 9, 1, ],
+            dataSource: [8, 9, 1,],
             type: "pie",
             tooltip: {
                 visible: true,
@@ -2939,9 +2940,9 @@ module piesparkline4 {
     });
 }
 
+	
 
-
-
+ 
 
 
 module SplitterComponent {
@@ -2951,10 +2952,10 @@ module SplitterComponent {
             width: "50%",
             orientation: ej.Orientation.Vertical,
             properties: [{}, { paneSize: 80 }],
-            isResponsive: true
+            isResponsive:true
         });
         var splitterInstance1 = new ej.Splitter($("#innerSpliter"), {
-            isResponsive: true,
+            isResponsive:true,
         });
     });
 }
@@ -2962,7 +2963,7 @@ module SplitterComponent {
 
 
 module SpreadsheetComponent {
-    $(function () {
+$(function () {
         var sample = new ej.Spreadsheet($("#basicSpreadsheet"), {
             scrollSettings: {
                 height: 550,
@@ -2976,15 +2977,14 @@ module SpreadsheetComponent {
                 pdfUrl: (<any>window).baseurl + "api/Spreadsheet/PdfExport"
             },
             sheets: [{ rangeSettings: [{ dataSource: (<any>window).defaultData, startCell: "A1" }] }],
-            loadComplete: () => {
-                var spreadsheet = $("#basicSpreadsheet").data("ejSpreadsheet"), xlFormat = spreadsheet.XLFormat;
-                if (!(<any>spreadsheet).isImport) {
-                    spreadsheet.setWidthToColumns([140, 128, 105, 100, 100, 110, 120, 120, 100]);
-                    xlFormat.format({ "style": { "font-weight": "bold" } }, "A1:H1");
-                    xlFormat.format({ "type": "currency" }, "E2:H11");
-                    spreadsheet.XLRibbon.updateRibbonIcons();
-                }
-            }
+			loadComplete: () => {  
+			var spreadsheet = $("#basicSpreadsheet").data("ejSpreadsheet"), xlFormat = spreadsheet.XLFormat;
+			if (!(<any>spreadsheet).isImport) {
+        spreadsheet.setWidthToColumns([140, 128, 105, 100, 100, 110, 120, 120, 100]);
+        xlFormat.format({ "style": { "font-weight": "bold" } }, "A1:H1");
+        xlFormat.format({ "type": "currency" }, "E2:H11");
+        spreadsheet.XLRibbon.updateRibbonIcons();
+    }}
         });
     });
 }
@@ -2993,58 +2993,58 @@ module SpreadsheetComponent {
 
 
 var default_data: Array<Object> = [
-    { Category: "Employees", Country: "USA", JobDescription: "Sales", JobGroup: "Executive", EmployeesCount: 50 },
-    { Category: "Employees", Country: "USA", JobDescription: "Sales", JobGroup: "Analyst", EmployeesCount: 40 },
-    { Category: "Employees", Country: "USA", JobDescription: "Marketing", EmployeesCount: 40 },
-    { Category: "Employees", Country: "USA", JobDescription: "Technical", JobGroup: "Testers", EmployeesCount: 55 },
-    { Category: "Employees", Country: "USA", JobDescription: "Technical", JobGroup: "Developers", JobRole: "Windows", EmployeesCount: 175 },
-    { Category: "Employees", Country: "USA", JobDescription: "Technical", JobGroup: "Developers", JobRole: "Web", EmployeesCount: 70 },
-    { Category: "Employees", Country: "USA", JobDescription: "Management", EmployeesCount: 40 },
-    { Category: "Employees", Country: "USA", JobDescription: "Accounts", EmployeesCount: 60 },
-
-    { Category: "Employees", Country: "India", JobDescription: "Technical", JobGroup: "Testers", EmployeesCount: 43 },
-    { Category: "Employees", Country: "India", JobDescription: "Technical", JobGroup: "Developers", JobRole: "Windows", EmployeesCount: 125 },
-    { Category: "Employees", Country: "India", JobDescription: "Technical", JobGroup: "Developers", JobRole: "Web", EmployeesCount: 60 },
-    { Category: "Employees", Country: "India", JobDescription: "HR Executives", EmployeesCount: 70 },
-    { Category: "Employees", Country: "India", JobDescription: "Accounts", EmployeesCount: 45 },
-
-    { Category: "Employees", Country: "Germany", JobDescription: "Sales", JobGroup: "Executive", EmployeesCount: 30 },
-    { Category: "Employees", Country: "Germany", JobDescription: "Sales", JobGroup: "Analyst", EmployeesCount: 40 },
-    { Category: "Employees", Country: "Germany", JobDescription: "Marketing", EmployeesCount: 50 },
-    { Category: "Employees", Country: "Germany", JobDescription: "Technical", JobGroup: "Testers", EmployeesCount: 40 },
-    { Category: "Employees", Country: "Germany", JobDescription: "Technical", JobGroup: "Developers", JobRole: "Windows", EmployeesCount: 65 },
-    { Category: "Employees", Country: "Germany", JobDescription: "Technical", JobGroup: "Developers", JobRole: "Web", EmployeesCount: 27 },
-    { Category: "Employees", Country: "Germany", JobDescription: "Management", EmployeesCount: 33 },
-    { Category: "Employees", Country: "Germany", JobDescription: "Accounts", EmployeesCount: 55 },
-
-    { Category: "Employees", Country: "UK", JobDescription: "Technical", JobGroup: "Testers", EmployeesCount: 45 },
-    { Category: "Employees", Country: "UK", JobDescription: "Technical", JobGroup: "Developers", JobRole: "Windows", EmployeesCount: 96 },
-    { Category: "Employees", Country: "UK", JobDescription: "Technical", JobGroup: "Developers", JobRole: "Web", EmployeesCount: 55 },
-    { Category: "Employees", Country: "UK", JobDescription: "HR Executives", EmployeesCount: 60 },
-    { Category: "Employees", Country: "UK", JobDescription: "Accounts", EmployeesCount: 30 },
-
-    { Category: "Employees", Country: "France", JobDescription: "Technical", JobGroup: "Testers", EmployeesCount: 40 },
-    { Category: "Employees", Country: "France", JobDescription: "Technical", JobGroup: "Developers", JobRole: "Windows", EmployeesCount: 65 },
-    { Category: "Employees", Country: "France", JobDescription: "Technical", JobGroup: "Developers", JobRole: "Web", EmployeesCount: 27 },
-	{ Category: "Employees", Country: "France", JobDescription: "Marketing", EmployeesCount: 50  }
+    { Category : "Employees", Country : "USA", JobDescription : "Sales",         JobGroup:"Executive",                         EmployeesCount : 50 },
+	{ Category : "Employees", Country : "USA", JobDescription : "Sales",         JobGroup : "Analyst",                         EmployeesCount : 40 },
+	{ Category : "Employees", Country : "USA", JobDescription : "Marketing",                                                   EmployeesCount : 40 },
+	{ Category : "Employees", Country : "USA", JobDescription : "Technical",     JobGroup : "Testers",                         EmployeesCount : 55 },
+	{ Category : "Employees", Country : "USA", JobDescription : "Technical",     JobGroup : "Developers", JobRole : "Windows", EmployeesCount : 175},
+	{ Category : "Employees", Country : "USA", JobDescription : "Technical",     JobGroup : "Developers", JobRole : "Web",     EmployeesCount : 70 },
+	{ Category : "Employees", Country : "USA", JobDescription : "Management",                                                  EmployeesCount : 40 },
+	{ Category : "Employees", Country : "USA", JobDescription : "Accounts",                                                    EmployeesCount : 60 },
+	
+	{ Category : "Employees", Country : "India",   JobDescription : "Technical",     JobGroup : "Testers",                         EmployeesCount : 43 },
+	{ Category : "Employees", Country : "India",   JobDescription : "Technical",     JobGroup : "Developers", JobRole : "Windows", EmployeesCount : 125},
+	{ Category : "Employees", Country : "India",   JobDescription : "Technical",     JobGroup : "Developers", JobRole : "Web",     EmployeesCount : 60 },
+	{ Category : "Employees", Country : "India",   JobDescription : "HR Executives",                                               EmployeesCount : 70 },
+	{ Category : "Employees", Country : "India",   JobDescription : "Accounts",                                                    EmployeesCount : 45 },
+	
+	{ Category : "Employees", Country : "Germany", JobDescription : "Sales",         JobGroup : "Executive",                       EmployeesCount : 30 },
+	{ Category : "Employees", Country : "Germany", JobDescription : "Sales",         JobGroup : "Analyst",                         EmployeesCount : 40 },
+	{ Category : "Employees", Country : "Germany", JobDescription : "Marketing",                                                   EmployeesCount : 50 },
+	{ Category : "Employees", Country : "Germany", JobDescription : "Technical",     JobGroup : "Testers",                         EmployeesCount : 40 },
+	{ Category : "Employees", Country : "Germany", JobDescription : "Technical",     JobGroup : "Developers", JobRole : "Windows", EmployeesCount : 65 },
+	{ Category : "Employees", Country : "Germany", JobDescription : "Technical",     JobGroup : "Developers", JobRole : "Web",     EmployeesCount : 27 },
+	{ Category : "Employees", Country : "Germany", JobDescription : "Management",                                                  EmployeesCount : 33 },
+	{ Category : "Employees", Country : "Germany", JobDescription : "Accounts",                                                    EmployeesCount : 55 },
+	
+	{ Category : "Employees", Country : "UK",      JobDescription : "Technical",     JobGroup : "Testers",                         EmployeesCount : 45 },
+	{ Category : "Employees", Country : "UK",      JobDescription : "Technical",     JobGroup : "Developers", JobRole : "Windows", EmployeesCount : 96 },
+	{ Category : "Employees", Country : "UK",      JobDescription : "Technical",     JobGroup : "Developers", JobRole : "Web",     EmployeesCount : 55 },
+	{ Category : "Employees", Country : "UK",      JobDescription : "HR Executives",                                               EmployeesCount : 60 },
+	{ Category : "Employees", Country : "UK",      JobDescription: "Accounts",                                                     EmployeesCount: 30  },
+	
+	{ Category : "Employees", Country : "France", JobDescription : "Technical",     JobGroup : "Testers",                         EmployeesCount : 40 },
+	{ Category : "Employees", Country : "France", JobDescription : "Technical",     JobGroup : "Developers", JobRole : "Windows", EmployeesCount : 65 },
+	{ Category : "Employees", Country : "France", JobDescription : "Technical",     JobGroup : "Developers", JobRole : "Web",     EmployeesCount : 27 },
+	{ Category : "Employees", Country : "France", JobDescription: "Marketing",                                                     EmployeesCount: 50  }
 ];
 
 module sunburstcomponent {
     $(function () {
         var sunburstsample = new ej.SunburstChart($("#Sunburst"), {
-            valueMemberPath: "EmployeesCount",
+            valueMemberPath: "EmployeesCount",           
             levels: [
-                { groupMemberPath: "Country" },
-                { groupMemberPath: "JobDescription" },
-                { groupMemberPath: "JobGroup" },
-                { groupMemberPath: "JobRole" }
+                {groupMemberPath: "Country"},
+				{groupMemberPath: "JobDescription"},
+				{groupMemberPath: "JobGroup"},
+				{groupMemberPath: "JobRole"}
             ],
             dataSource: default_data,
-            dataLabelSettings: { visible: true },
-            tooltip: { visible: false },
-            enableAnimation: false,
-            size: { height: "600" },
-            innerRadius: 0.2,
+            dataLabelSettings:{visible:true},
+			tooltip:{visible:false},
+			enableAnimation:false,
+			size:{height:"600"},
+			innerRadius:0.2,
             load: function () {
                 var sender = $("#Sunburst").data("ejSunburstChart");
                 var SunBurstTheme = (<any>window).themeStyle + (<any>window).themeColor + (<any>window).themeVarient;
@@ -3055,10 +3055,10 @@ module sunburstcomponent {
                     SunBurstTheme = "flatlight";
                 sender.model.theme = SunBurstTheme;
             },
-            title: { text: "Employees Count" },
-            zoomSettings: { enable: false },
-            legend: { visible: true, position: 'top' }
-            // load:"loadTheme"
+			title:{text:"Employees Count"},
+			zoomSettings:{enable:false},
+			legend:{visible:true,position:'top'}
+			// load:"loadTheme"
         });
     });
 }
@@ -3068,7 +3068,7 @@ module sunburstcomponent {
 
 module TabComponent {
     $(function () {
-        var sample = new ej.Tab($("#defaultTab"), {
+        var sample = new ej.Tab($("#defaultTab"),{
             width: "500px",
             collapsible: true,
             events: "click",
@@ -3082,8 +3082,8 @@ module TabComponent {
 
 
 module TagCloudComponent {
-
-
+    
+    
     var websiteCollection = [
         { text: "Google", url: "http://www.google.com", frequency: 12 },
         { text: "All Things Digital", url: "http://allthingsd.com/", frequency: 3 },
@@ -3114,7 +3114,7 @@ module TagCloudComponent {
                 text: "text", url: "url", frequency: "frequency"
             }
         });
-
+            
     });
 }
 
@@ -3154,82 +3154,82 @@ module EditorComponent {
 
 
 
-
+ 
 
 module TileViewComponent {
     $(function () {
         var tile1 = new ej.Tile($("#tile1"), {
-            imagePosition: "fill",
-            caption: { text: "People" },
-            tileSize: "medium",
-            imageUrl: 'content/images/tile/windows/people_1.png'
+            imagePosition:"fill",
+			caption:{text:"People"},
+			tileSize:"medium",
+			imageUrl:'content/images/tile/windows/people_1.png'
         });
-        var tile2 = new ej.Tile($("#tile2"), {
-            imagePosition: "center",
-            tileSize: "small",
-            imageUrl: 'content/images/tile/windows/alerts.png',
-
+		var tile2 = new ej.Tile($("#tile2"), {
+            imagePosition:"center",		
+			tileSize:"small",
+			imageUrl:'content/images/tile/windows/alerts.png',		 
+	
         });
-        var tile3 = new ej.Tile($("#tile3"), {
-            imagePosition: "center",
-            tileSize: "small",
-            imageUrl: 'content/images/tile/windows/bing.png',
+		var tile3 = new ej.Tile($("#tile3"), {
+            imagePosition:"center",		 
+			tileSize:"small",
+			imageUrl:'content/images/tile/windows/bing.png',		 
         });
-        var tile4 = new ej.Tile($("#tile4"), {
-            tileSize: "small",
-            imageUrl: 'content/images/tile/windows/camera.png',
+		var tile4 = new ej.Tile($("#tile4"), {
+            tileSize:"small",
+		 	imageUrl:'content/images/tile/windows/camera.png',		 
         });
-        var tile5 = new ej.Tile($("#tile5"), {
-            imagePosition: "center",
-            tileSize: "small",
-            imageUrl: 'content/images/tile/windows/messages.png',
+		var tile5 = new ej.Tile($("#tile5"), {
+            imagePosition:"center",		 
+			tileSize:"small",
+			imageUrl:'content/images/tile/windows/messages.png',		 
         });
-        var tile6 = new ej.Tile($("#tile6"), {
-            imagePosition: "center",
-            tileSize: "medium",
-            imageUrl: 'content/images/tile/windows/games.png',
-            caption: { text: "Play" }
+		var tile6 = new ej.Tile($("#tile6"), {
+            imagePosition:"center",		 
+			tileSize:"medium",
+			imageUrl:'content/images/tile/windows/games.png',	
+			caption:{text:"Play"}
         });
-        var tile7 = new ej.Tile($("#tile7"), {
-            tileSize: "medium",
-            imageUrl: 'content/images/tile/windows/map.png',
-            caption: { text: "Maps" }
+		var tile7 = new ej.Tile($("#tile7"), {	 
+			tileSize:"medium",
+			imageUrl:'content/images/tile/windows/map.png',
+			caption:{text:"Maps"}
         });
-        var tile8 = new ej.Tile($("#tile8"), {
-            imagePosition: "fill",
-            tileSize: "wide",
-            imageUrl: 'content/images/tile/windows/sports.png',
-            caption: { text: "Sports" }
+		var tile8 = new ej.Tile($("#tile8"), {
+            imagePosition:"fill",		 
+			tileSize:"wide",
+			imageUrl:'content/images/tile/windows/sports.png',
+			caption:{text:"Sports"}
         });
-        var tile9 = new ej.Tile($("#tile9"), {
-            imagePosition: "fill",
-            tileSize: "medium",
-            imageUrl: 'content/images/tile/windows/people_2.png',
-            caption: { text: "People" }
+		var tile9 = new ej.Tile($("#tile9"), {
+            imagePosition:"fill",
+			tileSize:"medium",
+			imageUrl:'content/images/tile/windows/people_2.png',
+			caption:{text:"People"}
         });
-        var tile10 = new ej.Tile($("#tile10"), {
-            imagePosition: "center",
-            tileSize: "medium",
-            imageUrl: 'content/images/tile/windows/pictures.png',
-            caption: { text: "Photo" }
+		var tile10 = new ej.Tile($("#tile10"), {
+            imagePosition:"center",
+			tileSize:"medium",
+			imageUrl:'content/images/tile/windows/pictures.png',
+			caption:{text:"Photo"}
         });
-        var tile11 = new ej.Tile($("#tile11"), {
-            imagePosition: "center",
-            tileSize: "wide",
-            imageUrl: 'content/images/tile/windows/weather.png',
-            caption: { text: "Weather" }
+		var tile11 = new ej.Tile($("#tile11"), {
+            imagePosition:"center",
+			tileSize:"wide",
+			imageUrl:'content/images/tile/windows/weather.png',
+			caption:{text:"Weather"}
         });
-        var tile12 = new ej.Tile($("#tile12"), {
-            imagePosition: "center",
-            tileSize: "medium",
-            imageUrl: 'content/images/tile/windows/music.png',
-            caption: { text: "Music" }
+		var tile12 = new ej.Tile($("#tile12"), {
+            imagePosition:"center",
+			tileSize:"medium",
+			imageUrl:'content/images/tile/windows/music.png',
+			caption:{text:"Music"}
         });
-        var tile13 = new ej.Tile($("#tile13"), {
-            imagePosition: "center",
-            tileSize: "medium",
-            imageUrl: 'content/images/tile/windows/favs.png',
-            caption: { text: "Favorites" }
+		var tile13 = new ej.Tile($("#tile13"), {
+            imagePosition:"center",
+			tileSize:"medium",
+			imageUrl:'content/images/tile/windows/favs.png',
+			caption:{text:"Favorites"}
         });
     });
 }
@@ -3248,13 +3248,13 @@ module TimePickerComponent {
 
 
 module ToolbarComponent {
-
+    
     $(function () {
-        var sample = new ej.Toolbar($("#editingToolbar"), {
+        var sample = new ej.Toolbar($("#editingToolbar"),{
             width: "100%",
             cssClass: "gradient-lime",
             enableSeparator: true,
-
+            
             isResponsive: true,
             orientation: ej.Orientation.Horizontal,
             showRoundedCorner: true
@@ -3267,10 +3267,10 @@ module ToolbarComponent {
 
 
 module TooltipComponent {
-
+    
     $(function () {
 
-        var sample1 = new ej.Tooltip($("#link1"), {
+        var sample1 = new ej.Tooltip($("#link1"),{
             content: "ECMAScript (or ES) is a trademarked scripting-language specification standardized by Ecma International in ECMA-262 and ISO/IEC 16262.",
             associate: "mousefollow",
             autoCloseTimeout: 5000,
@@ -3280,7 +3280,7 @@ module TooltipComponent {
             showShadow: true
         });
 
-        var sample2 = new ej.Tooltip($("#link2"), {
+        var sample2 = new ej.Tooltip($("#link2"),{
             content: "The World Wide Web (WWW) is an information space where documents and other web resources are identified by URLs, interlinked by hypertext links, and can be accessed via the Internet.",
             position: {
                 stem: {
@@ -3299,7 +3299,7 @@ module TooltipComponent {
             showShadow: true
         });
 
-        var sample3 = new ej.Tooltip($("#link3"), {
+        var sample3 = new ej.Tooltip($("#link3"),{
             content: 'Object-oriented programming (OOP) is a programming language model organized around objects rather than "actions" and data rather than logic.',
             position: {
                 stem: {
@@ -3326,43 +3326,43 @@ module TooltipComponent {
 module TreeGridComponent {
     $(function () {
         var treegridInstance = new ej.TreeGrid($("#TreeGridContainer"), {
-            dataSource: (<any>window).treeGridData,
-            childMapping: "subtasks",
-            allowSorting: true,
-            allowMultiSorting: true,
-            enableAltRow: true,
-            allowFiltering: true,
-            treeColumnIndex: 1,
-            allowKeyboardNavigation: true,
-            showColumnChooser: true,
-            showColumnOptions: true,
-            contextMenuSettings: {
-                showContextMenu: true,
-                contextMenuItems: ["add", "edit", "delete"]
-            },
-            columnDialogFields: ["field", "headerText", "editType", "width", "visible", "allowSorting", "textAlign", "headerTextAlign"],
-            editSettings: {
-                allowAdding: true,
-                allowEditing: true,
-                allowDeleting: true,
-                editMode: "cellEditing",
-                rowPosition: "belowSelectedRow"
-            },
-            toolbarSettings: {
-                showToolbar: true,
-                toolbarItems: ["add", "edit", "delete", "update", "cancel", "expandAll", "collapseAll"]
-            },
-            columns: [
-                { field: "taskID", headerText: "Task Id", allowFiltering: false, editType: "numericedit", filterEditType: "numericedit" },
-                { field: "taskName", headerText: "Task Name", editType: "stringedit", filterEditType: "stringedit" },
-                { field: "startDate", headerText: "Start Date", editType: "datepicker", filterEditType: "datepicker", format: "{0:MM/dd/yyyy}" },
-                { field: "endDate", headerText: "End Date", editType: "datepicker", filterEditType: "datepicker", format: "{0:MM/dd/yyyy}" },
-                { field: "progress", headerText: "Progress", editType: "numericedit", filterEditType: "numericedit" }
-            ],
-            isResponsive: true,
-        });
+        dataSource: (<any>window).treeGridData,
+        childMapping: "subtasks",
+        allowSorting: true,
+        allowMultiSorting: true,
+        enableAltRow: true,
+        allowFiltering: true,
+        treeColumnIndex: 1,
+        allowKeyboardNavigation: true,
+        showColumnChooser: true,
+        showColumnOptions: true,
+        contextMenuSettings: {
+            showContextMenu: true,
+            contextMenuItems: ["add", "edit", "delete"]
+        },
+        columnDialogFields: ["field", "headerText", "editType", "width", "visible", "allowSorting", "textAlign", "headerTextAlign"],
+        editSettings: {
+            allowAdding: true,
+            allowEditing: true,
+            allowDeleting: true,
+            editMode: "cellEditing",
+            rowPosition: "belowSelectedRow"
+        },
+        toolbarSettings: {
+            showToolbar: true,
+            toolbarItems: ["add","edit","delete","update","cancel","expandAll","collapseAll"]
+        },
+        columns: [
+            { field: "taskID", headerText: "Task Id", allowFiltering: false, editType: "numericedit", filterEditType: "numericedit" },
+            { field: "taskName", headerText: "Task Name", editType: "stringedit", filterEditType: "stringedit" },
+            { field: "startDate", headerText: "Start Date", editType: "datepicker", filterEditType: "datepicker", format:"{0:MM/dd/yyyy}" },
+            { field: "endDate", headerText: "End Date", editType: "datepicker", filterEditType: "datepicker", format:"{0:MM/dd/yyyy}" },
+            { field: "progress", headerText: "Progress", editType: "numericedit", filterEditType: "numericedit" }
+        ],
+        isResponsive: true,
     });
-}
+});
+} 
 
 
 
@@ -3407,7 +3407,7 @@ module treemapcomponent {
 
 
 
-
+ 
 
 module TreeViewComponent {
     $(function () {
@@ -3424,9 +3424,9 @@ module TreeViewComponent {
 
 
 module UploadboxComponent {
-
+    
     $(function () {
-        var sample = new ej.Uploadbox($("#UploadDefault"), {
+        var sample = new ej.Uploadbox($("#UploadDefault"),{
             saveUrl: (<any>window).baseurl + "api/uploadbox/Save",
             removeUrl: (<any>window).baseurl + "api/uploadbox/Remove",
             buttonText: {
@@ -3449,12 +3449,12 @@ module UploadboxComponent {
 
 module WaitingPopupComponent {
     $(function () {
-        var sample = new ej.WaitingPopup($("#target"), {
+        var sample = new ej.WaitingPopup($("#target"),{
             showOnInit: true,
             showImage: true,
             text: 'waiting&hellip;',
-            target: "#target",
-            appendTo: "#waiting"
+			target: "#target",
+			appendTo: "#waiting"
         });
     });
 
diff --git a/types/ej.web.all/index.d.ts b/types/ej.web.all/index.d.ts
index 03f6b12c24..2342262ca6 100644
--- a/types/ej.web.all/index.d.ts
+++ b/types/ej.web.all/index.d.ts
@@ -2,13 +2,13 @@
 // Project: http://help.syncfusion.com/js/typescript
 // Definitions by: Syncfusion <https://github.com/syncfusion>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version:2.3
 
 /// <reference types="jquery" />
 
 /*!
 *  filename: ej.web.all.d.ts
-*  version : 16.1.0.24
+*  version : 16.1.0.32
 *  Copyright Syncfusion Inc. 2001 - 2018. All rights reserved.
 *  Use of this code is subject to the terms of our license.
 *  A copy of the current license can be obtained at any time by e-mailing
@@ -378,7 +378,7 @@ declare namespace ej {
         update(dm: ej.DataManager, keyField: string, value: any, tableName: string): any;
     }
     class ForeignKeyAdaptor extends ej.JsonAdaptor {
-        constructor();
+        constructor(data: any, type: string);
         processQuery(ds: any, query: ej.Query): any;
         insert(dm: ej.DataManager, data: any, tableName: string): { url: string; data: any };
         update(dm: ej.DataManager, keyField: string, value: any, tableName: string): { url: string; type: string; data: any };
@@ -9567,8 +9567,8 @@ declare namespace ej {
              */
             cssClass?: string;
 
-            /** Sets the separator when the multiSelectMode with delimiter option or checkbox is enabled.When you enter the delimiter value, the text after the delimiter is considered as a
-             * separateword or query. The delimiter string is a single character and must be a symbol. Mostly,the delimiter symbol is used as comma (,), semi-colon (;), or any other special
+            /** Sets the separator when the multiSelectMode with delimiter option or checkbox is enabled. When you enter the delimiter value, the text after the delimiter is considered as a
+             * separate word or query. The delimiter string is a single character and must be a symbol. Mostly, the delimiter symbol is used as comma (,), semi-colon (;), or any other special
              * character.
              * @Default {,}
              */
@@ -9628,12 +9628,12 @@ declare namespace ej {
              */
             readOnly?: boolean;
 
-            /** The DropDownTree’s textbox is displayed with rounded corner style.
+            /** The DropDownTree's textbox is displayed with rounded corner style.
              * @Default {false}
              */
             showRoundedCorner?: boolean;
 
-            /** Specifies the targetID for the DropDownTree’s items.
+            /** Specifies the targetID for the DropDownTree's items.
              * @Default {null}
              */
             targetID?: string;
@@ -9653,8 +9653,8 @@ declare namespace ej {
              */
             validationRules?: any;
 
-            /** Specifies the value (text content) for the DropDownTree control. For the single selection mode, the selected item’s value will be returned in its data type, and for
-             * MultiSelectMode, returns the selected items’ values separated by delimiter in string type.
+            /** Specifies the value (text content) for the DropDownTree control. For the single selection mode, the selected item's value will be returned in its data type, and for
+             * MultiSelectMode, returns the selected items values separated by delimiter in string type.
              * @Default {null}
              */
             value?: string;
@@ -9678,7 +9678,7 @@ declare namespace ej {
              */
             blur?(e: BlurEventArgs): void;
 
-            /** Fires the action when the DropDownTree control’s value is changed.
+            /** Fires the action when the DropDownTree control's value is changed.
              */
             change?(e: ChangeEventArgs): void;
 
@@ -9744,15 +9744,15 @@ declare namespace ej {
              */
             model?: any;
 
-            /** Selected item’s text.
+            /** Selected item's text.
              */
             selectedText?: string;
 
-            /** Selected item’s text.
+            /** Selected item's text.
              */
             text?: string;
 
-            /** Selected item’s value.
+            /** Selected item's value.
              */
             value?: string;
 
@@ -9779,11 +9779,11 @@ declare namespace ej {
              */
             model?: any;
 
-            /** Selected item’s text.
+            /** Selected item's text.
              */
             text?: string;
 
-            /** Selected item’s value.
+            /** Selected item's value.
              */
             value?: string;
 
@@ -9810,11 +9810,11 @@ declare namespace ej {
              */
             model?: any;
 
-            /** Selected item’s text.
+            /** Selected item's text.
              */
             text?: string;
 
-            /** Selected item’s value.
+            /** Selected item's value.
              */
             value?: string;
         }
@@ -9863,7 +9863,7 @@ declare namespace ej {
              */
             model?: any;
 
-            /** Selected item’s text.
+            /** Selected item's text.
              */
             selectedText?: string;
 
@@ -9905,11 +9905,11 @@ declare namespace ej {
              */
             model?: any;
 
-            /** Selected item’s text.
+            /** Selected item's text.
              */
             text?: string;
 
-            /** Selected item’s value.
+            /** Selected item's value.
              */
             value?: string;
         }
@@ -9928,11 +9928,11 @@ declare namespace ej {
              */
             model?: any;
 
-            /** Selected item’s text.
+            /** Selected item's text.
              */
             text?: string;
 
-            /** Selected item’s value.
+            /** Selected item's value.
              */
             value?: string;
 
@@ -9961,7 +9961,7 @@ declare namespace ej {
         }
     }
     enum Textmode {
-        //When TextMode property is set to none, only selected/checked node’s text is presented.
+        //When TextMode property is set to none, only selected/checked node's text is presented.
         None,
         //When FullPath option is selected, the full path of the selected node is shown in the control.
         FullPath,
@@ -19622,6 +19622,11 @@ declare namespace ej {
              */
             value?: string|Date;
 
+            /** Specifies the water mark text to be displayed in input text.
+             * @Default {select a time}
+             */
+            watermarkText?: string;
+
             /** Defines the width of the TimePicker textbox.
              */
             width?: string|number;
@@ -30758,6 +30763,11 @@ declare namespace ej {
              */
             operationalMode?: ej.Pivot.OperationalMode|string;
 
+            /** To override x axis for particular series, create an axis object by providing unique name by using name property and add it to axes array.
+             * @Default {[]}
+             */
+            axes?: any[];
+
             /** This is a horizontal axis that contains options to configure the axis and it is the primary x-axis for all series in the series array. To override x-axis for particular series,
              * create an axis object by providing a unique name by using the name property and add it to the axes array. Then, assign the name to the series’s xAxisName property to link both
              * the axis and the series.
@@ -30818,10 +30828,6 @@ declare namespace ej {
              */
             beforeServiceInvoke?(e: BeforeServiceInvokeEventArgs): void;
 
-            /** Triggers before the pivot engine starts to populate.
-             */
-            beforePivotEnginePopulate?(e: BeforePivotEnginePopulateEventArgs): void;
-
             /** Triggers when performing drill up/down operation in the pivot chart control.
              */
             drillSuccess?(e: DrillSuccessEventArgs): void;
@@ -30888,13 +30894,6 @@ declare namespace ej {
             element?: any;
         }
 
-        export interface BeforePivotEnginePopulateEventArgs {
-
-            /** returns the current instance of PivotChart.
-             */
-            chartObj?: any;
-        }
-
         export interface DrillSuccessEventArgs {
 
             /** returns the current instance of PivotChart.
@@ -33505,6 +33504,11 @@ declare namespace ej {
              */
             allowInline?: boolean;
 
+            /** When set to false, disables the appointment delete option on the Scheduler.
+             * @Default {true}
+             */
+            allowDelete?: boolean;
+
             /** When set to true, Scheduler allows interaction through keyboard shortcut keys.
              * @Default {true}
              */
@@ -37077,6 +37081,11 @@ declare namespace ej {
              * @Default {0}
              */
             weekStartDay?: number;
+
+            /** Enable or disable the automatic timescale update on cell editing, dialog editing and taskbar editing.
+             * @Default {true}
+             */
+            updateTimescaleView?: boolean;
         }
 
         export interface SelectedCellIndex {
@@ -38114,6 +38123,14 @@ declare namespace ej {
          */
         sortColumn(fieldName: string, columnSortDirection: string): void;
 
+        /** To move the TreeGrid rows programmatically with from index ,to index and position.
+         * @param {number} you can pass drag Index of the row
+         * @param {number} you can pass target Index of the row.
+         * @param {string} you can pass the drop position as above,below,child
+         * @returns {void}
+         */
+        moveRow(fromIndex: number, toIndex: number, position: string): void;
+
         /** To reorder the column with field name and target index values
          * @param {string} you can pass a name of column to reorder.
          * @param {string} you can pass a target column index to be inserted.
@@ -38651,6 +38668,10 @@ declare namespace ej {
              */
             rowDragStop?(e: RowDragStopEventArgs): void;
 
+            /** Triggered before row drop action begins.
+             */
+            rowDropActionBegin?(e: RowDropActionBeginEventArgs): void;
+
             /** Triggered before selecting a cell
              */
             cellSelecting?(e: CellSelectingEventArgs): void;
@@ -39378,6 +39399,45 @@ declare namespace ej {
             type?: string;
         }
 
+        export interface RowDropActionBeginEventArgs {
+
+            /** Returns the cancel option value.
+             */
+            cancel?: boolean;
+
+            /** Returns the row which we start to drag.
+             */
+            draggedRow?: any;
+
+            /** Returns the row index which we start to drag.
+             */
+            draggedRowIndex?: number;
+
+            /** Returns the multiple dragged row collection for multiple reorder
+             */
+            draggedRecords?: any[];
+
+            /** Returns the drop position.
+             */
+            dropPosition?: string;
+
+            /** Returns the row which we are dropped to row.
+             */
+            targetRow?: any;
+
+            /** Returns the row index which we are dropped to row.
+             */
+            targetRowIndex?: number;
+
+            /** Returns the TreeGrid model.
+             */
+            model?: any;
+
+            /** Returns the name of the event.
+             */
+            type?: string;
+        }
+
         export interface CellSelectingEventArgs {
 
             /** Returns the cancel option value.
@@ -42693,6 +42753,8 @@ declare namespace ej {
 
         XLSort: Spreadsheet.XLSort;
 
+        XLSparkline: Spreadsheet.XLSparkline;
+
         XLValidate: Spreadsheet.XLValidate;
     }
     export namespace Spreadsheet {
@@ -43547,6 +43609,35 @@ declare namespace ej {
             sortByRange(range: any[]|string, columnName: string, direction: any): boolean;
         }
 
+        export interface XLSparkline {
+
+            /** This method used for creating the sparkline chart for specified range in spreadsheet.
+             * @param {string} Pass the data range
+             * @param {string} Pass the location range
+             * @param {string} Pass the sparkline chart type
+             * @param {any} Pass the sparkline chart options
+             * @param {number} Pass the sheetIndex
+             * @returns {void}
+             */
+            createSparkline(dataRange: string, locationRange: string, type: string, options: any, sheetIndex: number): void;
+
+            /** This method used to change the sparkline color and marker point color in the spreadsheet.
+             * @param {string} Pass the sparkline ID
+             * @param {any} Pass the sparkline options
+             * @param {number} Optional. Pass the sheet index
+             * @returns {void}
+             */
+            changePointColor(sparklineId: string, option: any, sheetIdx: number): void;
+
+            /** This method used to change the sparkline type in the spreadsheet.
+             * @param {string} Pass the sparkline ID
+             * @param {string} Pass the sparkline type
+             * @param {number} Optional. Pass the sheet index
+             * @returns {void}
+             */
+            changeType(sparklineId: string, type: string, sheetIdx: number): void;
+        }
+
         export interface XLValidate {
 
             /** This method is used to apply data validation rules in a selected range of cells based on the defined condition in the Spreadsheet.
@@ -43737,6 +43828,11 @@ declare namespace ej {
              */
             allowSorting?: boolean;
 
+            /** Gets or sets a value that indicates whether to enable the sparkline feature in the Spreadsheet.
+             * @Default {false}
+             */
+            allowSparkline?: boolean;
+
             /** Gets or sets a value that indicates whether to enable or disable undo and redo feature in the Spreadsheet.
              * @Default {true}
              */

From d4a82fd0a56ba06d666663d0c9965bf8bd1acaf1 Mon Sep 17 00:00:00 2001
From: PG Herveou <pgherveou@lyft.com>
Date: Thu, 29 Mar 2018 09:03:00 -0700
Subject: [PATCH 0950/1382] Ora definition update - Add hideCursor option

Add the `hideCursor` option to Ora
See https://github.com/sindresorhus/ora#hidecursor
---
 types/ora/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/ora/index.d.ts b/types/ora/index.d.ts
index d43a01c7cf..a3099f6cd9 100644
--- a/types/ora/index.d.ts
+++ b/types/ora/index.d.ts
@@ -83,6 +83,7 @@ interface Options {
     interval?: number;
     stream?: NodeJS.WritableStream;
     enabled?: boolean;
+    hideCursor?: boolean;
 }
 
 interface PersistOptions {

From 729ee74fc57d40d9c3322eacd8fadb4e02e820cb Mon Sep 17 00:00:00 2001
From: "Narcisse D. ASSOGBA" <narcisse.adn93@gmail.com>
Date: Thu, 29 Mar 2018 17:44:35 +0100
Subject: [PATCH 0951/1382] Add definitions for sql-bricks package

---
 types/sql-bricks/index.d.ts          | 404 ++++++++++++
 types/sql-bricks/sql-bricks-tests.ts | 935 +++++++++++++++++++++++++++
 types/sql-bricks/tsconfig.json       |  23 +
 types/sql-bricks/tslint.json         |  10 +
 4 files changed, 1372 insertions(+)
 create mode 100644 types/sql-bricks/index.d.ts
 create mode 100644 types/sql-bricks/sql-bricks-tests.ts
 create mode 100644 types/sql-bricks/tsconfig.json
 create mode 100644 types/sql-bricks/tslint.json

diff --git a/types/sql-bricks/index.d.ts b/types/sql-bricks/index.d.ts
new file mode 100644
index 0000000000..d09bfee715
--- /dev/null
+++ b/types/sql-bricks/index.d.ts
@@ -0,0 +1,404 @@
+// Type definitions for sql-bricks 2.0
+// Project: http://csnw.github.io/sql-bricks
+// Definitions by: Narcisse Assogba <https://github.com/adn05>
+//                 Paleo <https://github.com/paleo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace SqlBricks {
+  /**
+   * Statement is an abstract base class for all statements (SELECT, INSERT, UPDATE, DELETE)
+   * and should never be instantiated directly. It is exposed because it can be used with the
+   * instanceof operator to easily determine whether something is a SQL Bricks statement: my_var instanceof Statement.
+   */
+  interface Statement {
+    /**
+     * Clones a statement so that subsequent modifications do not affect the original statement.
+     */
+    clone(): this
+
+    /**
+     * Returns the non-parameterized SQL for the statement. This is called implicitly by Javascript when using a Statement anywhere that a string is expected (string concatenation, Array.join(), etc).
+     * While toString() is easy to use, it is not recommended in most cases because:
+     *    It doesn't provide robust protection against SQL injection attacks (it just does basic escaping)
+     *    It doesn't provide as much support for complex data types (objects, arrays, etc, are "stringified" before being passed to your database driver, which then has to interpret them correctly)
+     *    It does not provide the same level of detail in error messages (see this issue)
+     * For the above reasons, it is usually better to use toParams().
+     */
+    toString(): string
+
+    /**
+     * Returns an object with two properties: a parameterized text string and a values array. The values are populated with anything on the right-hand side
+     * of a WHERE criteria,as well as any values passed into an insert() or update() (they can be passed explicitly with val() or opted out of with sql())
+     * @param options A placeholder option of '?%d' can be passed to generate placeholders compatible with node-sqlite3 (%d is replaced with the parameter #):
+     * @example
+     * update('person', {'first_name': 'Fred'}).where({'last_name': 'Flintstone'}).toParams({placeholder: '?%d'});
+     *    // {"text": "UPDATE person SET first_name = ?1 WHERE last_name = ?2", "values": ["Fred", "Flintstone"]}
+     */
+    toParams(options?: { placeholder: string }): SqlBricksParam
+  }
+
+  interface SqlBricksParam {
+    text: string
+    values: any[]
+  }
+
+  type TableName = string | SelectStatement
+
+  interface OnCriteria {
+    [column: string]: string
+  }
+
+  interface WhereObject {
+    [column: string]: any
+  }
+
+  interface WhereGroup {
+    op?: string
+    expressions: WhereExpression[]
+  }
+
+  interface WhereBinary {
+    op: string
+    col: string | SelectStatement
+    val: any
+    quantifier: string
+  }
+
+  /**
+   * When a non-expression object is passed somewhere a whereExpression is expected,
+   * each key/value pair will be ANDed together:
+   */
+  type WhereExpression = WhereGroup | WhereBinary | WhereObject | string
+
+  /**
+   * A SELECT statement
+   */
+  interface SelectStatement extends Statement {
+    /**
+     * Appends additional columns to an existing query.
+     * @param columns can be passed as multiple arguments, a comma-delimited string or an array.
+     */
+    select(...columns: string[]): SelectStatement
+    /**
+     * Appends additional columns to an existing query.
+     * @param columns can be passed as multiple arguments, a comma-delimited string or an array.
+     */
+    select(columns: string[]): SelectStatement
+    select(...params): SelectStatement
+    as(alias: string): SelectStatement
+
+    distinct(...columns): SelectStatement
+
+    /**
+     * Makes the query a SELECT ... INTO query (which creates a new table with the results of the query).
+     * @alias intoTable
+     * @param tbl new table to create
+     */
+    into(tbl: TableName): SelectStatement
+    /**
+     * Makes the query a SELECT ... INTO query (which creates a new table with the results of the query).
+     * @alias into
+     * @param tbl new table to create
+     */
+    intoTable(tbl: TableName): SelectStatement
+
+    intoTemp(tbl: TableName): SelectStatement,
+    intoTempTable(tbl: TableName): SelectStatement,
+
+    /**
+     * Table names can be passed in as multiple string arguments, a comma-delimited string or an array.
+     * @param tbls table names
+     */
+    from(...tbls: TableName[]): SelectStatement
+    /**
+     * Table names can be passed in as multiple string arguments, a comma-delimited string or an array.
+     * @param tbls array of table names
+     */
+    from(tbls: TableName[]): SelectStatement
+
+    /**
+     * Adds the specified join to the query.
+     * @alias innerJoin
+     * @param tbl can include an alias after a space or after the 'AS' keyword ('my_table my_alias').
+     * @param onCriteria is optional if a joinCriteria function has been supplied.
+     */
+    join(tbl: string, criteria?: OnCriteria | string[] | WhereExpression): SelectStatement
+    join(tbl: string, onCol1: string, onCol2: string): SelectStatement
+    join(firstTbl: string, ...otherTbls: string[]): SelectStatement
+
+    leftJoin(tbl: string, criteria?: OnCriteria | string[] | WhereExpression): SelectStatement
+    leftJoin(tbl: string, onCol1: string, onCol2: string): SelectStatement
+    leftJoin(firstTbl: string, ...otherTbls: string[]): SelectStatement
+    rightJoin(tbl: string, criteria?: OnCriteria | string[] | WhereExpression): SelectStatement
+    rightJoin(tbl: string, onCol1: string, onCol2: string): SelectStatement
+    rightJoin(firstTbl: string, ...otherTbls: string[]): SelectStatement
+    fullJoin(tbl: string, criteria?: OnCriteria | string[] | WhereExpression): SelectStatement
+    fullJoin(tbl: string, onCol1: string, onCol2: string): SelectStatement
+    fullJoin(firstTbl: string, ...otherTbls: string[]): SelectStatement
+    crossJoin(tbl: string, criteria?: OnCriteria | string[] | WhereExpression): SelectStatement
+    crossJoin(tbl: string, onCol1: string, onCol2: string): SelectStatement
+    crossJoin(firstTbl: string, ...otherTbls: string[]): SelectStatement
+    innerJoin(tbl: string, criteria?: OnCriteria | string[] | WhereExpression): SelectStatement
+    innerJoin(tbl: string, onCol1: string, onCol2: string): SelectStatement
+    innerJoin(firstTbl: string, ...otherTbls: string[]): SelectStatement
+    leftOuterJoin(tbl: string, criteria?: OnCriteria | string[] | WhereExpression): SelectStatement
+    leftOuterJoin(tbl: string, onCol1: string, onCol2: string): SelectStatement
+    leftOuterJoin(firstTbl: string, ...otherTbls: string[]): SelectStatement
+    rightOuterJoin(tbl: string, criteria?: OnCriteria | string[] | WhereExpression): SelectStatement
+    rightOuterJoin(tbl: string, onCol1: string, onCol2: string): SelectStatement
+    rightOuterJoin(firstTbl: string, ...otherTbls: string[]): SelectStatement
+    fullOuterJoin(tbl: string, criteria?: OnCriteria | string[] | WhereExpression): SelectStatement
+    fullOuterJoin(tbl: string, onCol1: string, onCol2: string): SelectStatement
+    fullOuterJoin(firstTbl: string, ...otherTbls: string[]): SelectStatement
+
+    on(onCriteria: OnCriteria | WhereExpression): SelectStatement,
+    on(onCol1: string, onCol2: string): SelectStatement,
+
+    /**
+     * Joins using USING instead of ON.
+     * @param columnList columnList can be passed in as one or more string arguments, a comma-delimited string, or an array.
+     * @example
+     * select('*').from('person').join('address').using('address_id', 'country_id');
+     * // SELECT * FROM person INNER JOIN address USING (address_id, country_id)
+     */
+    using(...columnList: string[]): SelectStatement
+    using(columnList: string[]): SelectStatement
+
+    /**
+     * Adds the specified natural join to the query.
+     * @param tbl can include an alias after a space or after the 'AS' keyword ('my_table my_alias').
+     */
+    naturalJoin(tbl: string): SelectStatement
+    naturalLeftJoin(tbl: string): SelectStatement
+    naturalRightJoin(tbl: string): SelectStatement
+    naturalFullJoin(tbl: string): SelectStatement
+
+    naturalInnerJoin(tbl: string): SelectStatement
+    naturalLeftOuterJoin(tbl: string): SelectStatement
+    naturalRightOuterJoin(tbl: string): SelectStatement
+    naturalFullOuterJoin(tbl: string): SelectStatement
+
+    where(column: string, value?: string): SelectStatement
+    where(whereExpr: WhereExpression): SelectStatement
+    where(...options): SelectStatement
+
+    and(...options): SelectStatement
+
+    /**
+     * Sets or extends the GROUP BY columns.
+     * @param columns can take multiple arguments, a single comma-delimited string or an array.
+     */
+    groupBy(...columns: string[]): SelectStatement
+    groupBy(columns: string[]): SelectStatement
+
+    having(column: string, value: string): SelectStatement
+    having(whereExpr: WhereExpression): SelectStatement
+
+    /**
+     * Sets or extends the list of columns in the ORDER BY clause.
+     * @param columns can be passed as multiple arguments, a single comma-delimited string or an array.
+     */
+    orderBy(...columns: string[]): SelectStatement
+    orderBy(columns: string[]): SelectStatement
+    order(...columns: string[]): SelectStatement
+    order(columns: string[]): SelectStatement
+
+    forUpdate(...tbls: string[]): SelectStatement
+    of(tlb: string): SelectStatement
+    noWait(): SelectStatement
+
+    union(...stmt: Statement[]): SelectStatement
+    intersect(...stmt: Statement[]): SelectStatement
+    minus(...stmt: Statement[]): SelectStatement
+    except(...stmt: Statement[]): SelectStatement
+  }
+
+  /**
+   * An INSERT statement
+   */
+  interface InsertStatement extends Statement {
+    into(tbl: TableName, ...columns: any[]): InsertStatement
+    intoTable(tbl: TableName, ...columns: any[]): InsertStatement
+    select(...params): SelectStatement,
+    values(...values): InsertStatement
+  }
+
+  /**
+   * An UPDATE statement
+   */
+  interface UpdateStatement extends Statement {
+    values(...values): UpdateStatement
+    set(...values): UpdateStatement,
+    where(...options): UpdateStatement,
+    and(...options): UpdateStatement,
+  }
+
+  /**
+   * A DELETE statement
+   */
+  interface DeleteStatement extends Statement {
+    from(...tbls: string[]): DeleteStatement,
+    using(...columnList): DeleteStatement,
+    where(...options): DeleteStatement,
+    and(...options): DeleteStatement,
+  }
+}
+
+interface SqlBricksFn {
+  (...params: any[]): any
+  /**
+   * Wraps a value (user-supplied string, number, boolean, etc) so that it can be passed into SQL Bricks
+   * anywhere that a column is expected (the left-hand side of WHERE criteria and many other SQL Bricks APIs)
+   * @param value value to be wraped
+   */
+  val(value): any
+
+  /**
+   * Returns a new INSERT statement. It can be used with or without the new operator.
+   * @alias insertInto
+   * @param tbl table name
+   * @param values a values object or a columns list. Passing a set of columns (as multiple arguments, a comma-delimited string or an array)
+   * will put the statement into split keys/values mode, where a matching array of values is expected in values()
+   * @example
+   * insert('person', {'first_name': 'Fred', 'last_name': 'Flintstone'});
+   * // INSERT INTO person (first_name, last_name) VALUES ('Fred', 'Flintstone')
+   */
+  insert(tbl?: string, ...values): SqlBricks.InsertStatement
+
+  /**
+   * Returns a new INSERT statement. It can be used with or without the new operator.
+   * @alias insert
+   * @param tbl table name
+   * @param values a values object or a columns list. Passing a set of columns (as multiple arguments, a comma-delimited string or an array)
+   * will put the statement into split keys/values mode, where a matching array of values is expected in values()
+   * @example
+   * insert('person', {'first_name': 'Fred', 'last_name': 'Flintstone'});
+   * // INSERT INTO person (first_name, last_name) VALUES ('Fred', 'Flintstone')
+   */
+  insertInto(tbl?: string, ...values): SqlBricks.InsertStatement
+
+  /**
+   * Returns a new select statement, seeded with a set of columns. It can be used with or without the new keyword.
+   * @param columns it can be passed in here (or appended later via sel.select() or sel.distinct()) via multiple arguments
+   * or a comma-delimited string or an array. If no columns are specified, toString() will default to SELECT *.
+   */
+  select(...columns: string[]): SqlBricks.SelectStatement
+  select(columns: string[] | SqlBricks.SelectStatement[]): SqlBricks.SelectStatement
+  select(...params): SqlBricks.SelectStatement
+
+  /**
+   * Returns a new UPDATE statement. It can be used with or without the new operator.
+   * @param tbl table name
+   * @param values
+   */
+  update(tbl: string, ...values): SqlBricks.UpdateStatement
+
+  /**
+   * Returns a new DELETE statement. It can be used with or without the new operator.
+   * @alias deleteFrom
+   * @param tbl table name
+   */
+  delete(tbl?: string): SqlBricks.DeleteStatement
+  /**
+   * Returns a new DELETE statement. It can be used with or without the new operator.
+   * @alias delete
+   * @param tbl table name
+   */
+  deleteFrom(tbl?: string): SqlBricks.DeleteStatement
+
+  /**
+   * Registers a set of frequently-used table aliases with SQL Bricks.
+   * These table aliases can then be used by themselves in from(), join(), etc
+   * and SQL Bricks will automatically expand them to include the table name as well as the alias.
+   * @param expansions
+   * @example
+   * sql.aliasExpansions({'psn': 'person', 'addr': 'address', 'zip': 'zipcode', 'usr': 'user'});
+   * select().from('psn').join('addr', {'psn.addr_id': 'addr.id'});
+   * // SELECT * FROM person psn INNER JOIN address addr ON psn.addr_id = addr.id
+   */
+  aliasExpansions(expansions: { [tbl: string]: string }): void
+
+  /**
+   * Sets a user-supplied function to automatically generate the .on() criteria for joins whenever it is not supplied explicitly.
+   * @param func
+   */
+  joinCriteria(func?: (...args) => SqlBricks.OnCriteria): any
+
+  _extension(): any
+  prop: number
+  conversions: any
+
+  //////////////////////////////////////////
+  //////  Where Expression functions  //////
+  //////////////////////////////////////////
+
+  /**
+   * Joins the passed expressions with AND
+   * @param whereExprs
+   */
+  and(...whereExprs: SqlBricks.WhereExpression[]): SqlBricks.WhereGroup
+
+  /**
+   * Joins the passed expressions with OR:
+   * @param whereExprs
+   */
+  or(...whereExprs: SqlBricks.WhereExpression[]): SqlBricks.WhereGroup
+
+  /**
+   * Negates the expression by wrapping it in NOT (...)
+   * (if it is at the top level, the parentheses are unnecessary and will be omitted)
+   * @param whereExpr
+   */
+  not(whereExpr: SqlBricks.WhereExpression): SqlBricks.WhereGroup
+
+  /**
+   * Generates a BETWEEN
+   * @param column
+   * @param value1
+   * @param value2
+   */
+  between(column: string, value1, value2): SqlBricks.WhereExpression
+  isNull(column: string): SqlBricks.WhereExpression
+  isNotNull(column: string): SqlBricks.WhereExpression
+  like(column: string, value, escapeStr?: string): SqlBricks.WhereExpression
+  exists(stmt): SqlBricks.WhereExpression
+  in(column: string, stmt: SqlBricks.SelectStatement): SqlBricks.WhereExpression
+  in(column: string, ...values): SqlBricks.WhereExpression
+
+  /**
+   * Generates the appropriate relational operator (=, <>, <, <=, > or >=).
+   * @param column column name or query result
+   * @param value column value
+   */
+  eq(column: string | SqlBricks.SelectStatement, value?): SqlBricks.WhereBinary
+  equal(column: string | SqlBricks.SelectStatement, value?): SqlBricks.WhereBinary
+  notEq(column: string | SqlBricks.SelectStatement, value?): SqlBricks.WhereBinary
+  lt(column: string | SqlBricks.SelectStatement, value?): SqlBricks.WhereBinary
+  lte(column: string | SqlBricks.SelectStatement, value?): SqlBricks.WhereBinary
+  gt(column: string | SqlBricks.SelectStatement, value?): SqlBricks.WhereBinary
+  gte(column: string | SqlBricks.SelectStatement, value?): SqlBricks.WhereBinary
+
+  eqAll(column: string | SqlBricks.SelectStatement, value?): SqlBricks.WhereBinary
+  notEqAll(column: string | SqlBricks.SelectStatement, value?): SqlBricks.WhereBinary
+  ltAll(column: string | SqlBricks.SelectStatement, value?): SqlBricks.WhereBinary
+  lteAll(column: string | SqlBricks.SelectStatement, value?): SqlBricks.WhereBinary
+  gtAll(column: string | SqlBricks.SelectStatement, value?): SqlBricks.WhereBinary
+  gteAll(column: string | SqlBricks.SelectStatement, value?): SqlBricks.WhereBinary
+
+  eqAny(column: string | SqlBricks.SelectStatement, value?): SqlBricks.WhereBinary
+  notEqAny(column: string | SqlBricks.SelectStatement, value?): SqlBricks.WhereBinary
+  ltAny(column: string | SqlBricks.SelectStatement, value?): SqlBricks.WhereBinary
+  lteAny(column: string | SqlBricks.SelectStatement, value?): SqlBricks.WhereBinary
+  gtAny(column: string | SqlBricks.SelectStatement, value?): SqlBricks.WhereBinary
+  gteAny(column: string | SqlBricks.SelectStatement, value?): SqlBricks.WhereBinary
+
+  eqSome(column: string | SqlBricks.SelectStatement, value?): SqlBricks.WhereBinary
+  notEqSome(column: string | SqlBricks.SelectStatement, value?): SqlBricks.WhereBinary
+  ltSome(column: string | SqlBricks.SelectStatement, value?): SqlBricks.WhereBinary
+  lteSome(column: string | SqlBricks.SelectStatement, value?): SqlBricks.WhereBinary
+  gtSome(column: string | SqlBricks.SelectStatement, value?): SqlBricks.WhereBinary
+  gteSome(column: string | SqlBricks.SelectStatement, value?): SqlBricks.WhereBinary
+}
+
+declare const SqlBricks: SqlBricksFn
+export = SqlBricks
diff --git a/types/sql-bricks/sql-bricks-tests.ts b/types/sql-bricks/sql-bricks-tests.ts
new file mode 100644
index 0000000000..94014d913d
--- /dev/null
+++ b/types/sql-bricks/sql-bricks-tests.ts
@@ -0,0 +1,935 @@
+// Test file from sql-briks package tests
+// https://github.com/CSNW/sql-bricks/blob/master/tests/tests.js
+// taked the 03/29/2018. Some dtslint rules has been deabled to be
+// close as possible of the original js file.
+
+import * as sql from "sql-bricks";
+
+// tslint:disable-next-line:prefer-const
+let assert;
+const select = sql.select;
+const insertInto = sql.insertInto, insert = sql.insert,
+  update = sql.update, del = sql.delete;
+const and = sql.and, or = sql.or, like = sql.like, not = sql.not, $in = sql.in,
+  isNull = sql.isNull, isNotNull = sql.isNotNull, equal = sql.equal, eq = sql.eq,
+  notEq = sql.notEq, lt = sql.lt, lte = sql.lte, gt = sql.gt, gte = sql.gte,
+  between = sql.between, exists = sql.exists, eqAny = sql.eqAny, notEqAny = sql.notEqAny;
+
+const alias_expansions = { usr: 'user', psn: 'person', addr: 'address' };
+const table_to_alias = alias_expansions;
+sql.aliasExpansions(alias_expansions);
+
+sql.joinCriteria(function(left_tbl, left_alias, right_tbl, right_alias) {
+  const criteria = {};
+  criteria[left_alias + '.' + table_to_alias[right_tbl] + '_fk'] = right_alias + '.pk';
+  return criteria;
+});
+
+describe('SQL Bricks', function() {
+  describe('parameterized sql', function() {
+    it('should generate for insert statements', function() {
+      const values = { first_name: 'Fred', last_name: 'Flintstone' };
+      checkParams(insert('user', values),
+        'INSERT INTO "user" (first_name, last_name) VALUES ($1, $2)',
+        ['Fred', 'Flintstone']);
+    });
+    it('should generate for UPDATEs', function() {
+      const values = { first_name: 'Fred', last_name: 'Flintstone' };
+      checkParams(update('user', values),
+        'UPDATE "user" SET first_name = $1, last_name = $2',
+        ['Fred', 'Flintstone']);
+    });
+    it('should generate for WHERE clauses', function() {
+      checkParams(select().from('user').where({
+        removed: 0,
+        name: 'Fred Flintstone'
+      }), 'SELECT * FROM "user" WHERE removed = $1 AND name = $2',
+        [0, 'Fred Flintstone']);
+    });
+    it('should generate WHERE clauses with arbitrary SQL', function() {
+      const stmt = select().from('time_limits');
+      stmt.where(sql(
+        "tsrange(start_date_time, end_date_time, '[]') @> tsrange($1, $2, '[]')"));
+      check(stmt,
+        "SELECT * FROM time_limits WHERE tsrange(start_date_time, end_date_time, '[]') @> tsrange($1, $2, '[]')");
+    });
+    it('should generate WHERE clauses with arbitrary SQL and parameters', function() {
+      const stmt = select().from('time_limits');
+      const time1 = '2014-12-06T22:35:00';
+      const time2 = '2014-12-06T22:36:00';
+      stmt.where(sql(
+        "tsrange(start_date_time, end_date_time, '[]') @> tsrange($, $, '[]')", time1, time2));
+      checkParams(stmt,
+        "SELECT * FROM time_limits WHERE tsrange(start_date_time, end_date_time, '[]') @> tsrange($1, $2, '[]')",
+        ['2014-12-06T22:35:00', '2014-12-06T22:36:00']);
+    });
+    it('should handle WHERE clauses with sql() and a null check', function() {
+      check(select().from('test').where(sql('my_col_val()'), null),
+        "SELECT * FROM test WHERE my_col_val() IS NULL");
+    });
+    it('should not escape single quotes in the values returned by toParams()', function() {
+      checkParams(update('user', { name: "Muad'Dib" }),
+        'UPDATE "user" SET name = $1',
+        ["Muad'Dib"]);
+    });
+    it('should not attempt to serialize arrays (should be done by subsequent layer)', function() {
+      checkParams(update('user', { name: ["Paul", "Muad'Dib"] }),
+        'UPDATE "user" SET name = $1',
+        [["Paul", "Muad'Dib"]]);
+    });
+    it('should not attempt to serialize dates', function() {
+      const dt = new Date();
+      checkParams(update('user', { birthdate: dt }),
+        'UPDATE "user" SET birthdate = $1',
+        [dt]);
+    });
+    it('should generate node-sqlite3 style params', function() {
+      const values = { first_name: 'Fred', last_name: 'Flintstone' };
+      const result = insert('user', values).toParams({ placeholder: '?%d' });
+      assert.equal(result.text, 'INSERT INTO "user" (first_name, last_name) VALUES (?1, ?2)');
+      assert.deepEqual(result.values, ['Fred', 'Flintstone']);
+    });
+    it('should generate node-mysql style params', function() {
+      const values = { first_name: 'Fred', last_name: 'Flintstone' };
+      const result = insert('user', values).toParams({ placeholder: '?' });
+      assert.equal(result.text, 'INSERT INTO "user" (first_name, last_name) VALUES (?, ?)');
+      assert.deepEqual(result.values, ['Fred', 'Flintstone']);
+    });
+    it('should output non-numeric params in SQL order', function() {
+      const result = select().from('user').where($in(sql.val(5), [3, 5, 10])).toParams({ placeholder: '?' });
+      assert.equal(result.text, 'SELECT * FROM "user" WHERE ? IN (?, ?, ?)');
+      assert.deepEqual(result.values, [5, 3, 5, 10]);
+    });
+    it('should properly parameterize subqueries', function() {
+      const values = { first_name: 'Fred' };
+      checkParams(select(select('last_name').from('user').where(values)),
+        'SELECT (SELECT last_name FROM "user" WHERE first_name = $1)',
+        ['Fred']);
+    });
+    it('should properly parameterize subqueries with a join', function() {
+      const values = { first_name: 'Fred' };
+      const query = select().from(select().from('user').where(values).as('subuser'))
+        .join('other_table', { 'other_table.id': 'subuser.id' });
+      checkParams(query,
+        'SELECT * FROM (SELECT * FROM "user" WHERE first_name = $1) subuser INNER JOIN other_table ON other_table.id = subuser.id',
+        ['Fred']);
+    });
+    it('should properly parameterize subqueries in updates', function() {
+      const addr_id_for_usr = select('id').from('address').where('usr_id', sql('"user".id')).and('active', true);
+      checkParams(update('user').set('addr_id', addr_id_for_usr),
+        'UPDATE "user" SET addr_id = (SELECT id FROM address WHERE usr_id = "user".id AND active = $1)',
+        [true]);
+    });
+    it('should properly merge parameterized sub-expressions with $%d placeholders', function() {
+      checkParams(select().from('tbl').where(or(sql('a = $1', 444), sql('b = $1', 555), sql('c = $1', 666))),
+        'SELECT * FROM tbl WHERE a = $1 OR b = $2 OR c = $3',
+        [444, 555, 666]);
+    });
+  });
+
+  describe('value handling', function() {
+    it('should escape single quotes when toString() is used', function() {
+      check(update('user', { name: "Muad'Dib" }),
+        "UPDATE \"user\" SET name = 'Muad''Dib'");
+    });
+    it('should escape multiple single quotes in the same string', function() {
+      check(update('address', { city: "Liu'e, Hawai'i" }),
+        "UPDATE address SET city = 'Liu''e, Hawai''i'");
+    });
+    it('should support sql.val() to pass in values where columns are expected', function() {
+      check(select().from('user').where(sql.val('Fred'), sql('first_name')),
+        "SELECT * FROM \"user\" WHERE 'Fred' = first_name");
+    });
+    it('should support value objects with differing field orders', function() {
+      check(insert('user').values([{ id: 1, name: 'Fred' }, { name: 'Barney', id: 2 }]),
+        "INSERT INTO \"user\" (id, name) VALUES (1, 'Fred'), (2, 'Barney')");
+    });
+
+    describe('.toString() value conversions', function() {
+      it('should, by default, convert dates to SQL TIMESTAMP WITH TIME ZONE format', function() {
+        check(update('user', { birthdate: new Date('1980-01-01T00:00:00Z') }),
+          "UPDATE \"user\" SET birthdate = TIMESTAMP WITH TIME ZONE '1980-01-01 00:00:00.000+00:00'");
+      });
+      it('should work with sql() SQL literal strings', function() {
+        check(select().from('person').where(sql('some_func($, $)', ['a', 'b'])),
+          "SELECT * FROM person WHERE some_func('a', 'b')");
+      });
+      it('should escape single quotes when sql() SQL literal strings are used', function() {
+        check(select().from('person').where(sql('some_func($)', ["Muad'Dib"])),
+          "SELECT * FROM person WHERE some_func('Muad''Dib')");
+      });
+      it('should support user-supplied conversions', function() {
+        const orig_bool = sql.conversions.Boolean;
+        sql.conversions.Boolean = function(bool) { return bool ? '1' : '0'; };
+        const str = del('user').where('active', false).toString();
+        sql.conversions.Boolean = orig_bool;
+        assert.equal(str, 'DELETE FROM "user" WHERE active = 0');
+      });
+    });
+  });
+
+  it('should expand abbreviations in FROM and JOINs', function() {
+    check(select().from('usr').join('psn', { 'usr.psn_fk': 'psn.pk' }),
+      'SELECT * FROM "user" usr INNER JOIN person psn ON usr.psn_fk = psn.pk');
+  });
+
+  it('should expand left_tbl on all joins', function() {
+    const left_tbls: any[] = [];
+    const orig = sql.joinCriteria();
+    sql.joinCriteria(function(left_tbl) {
+      left_tbls.push(left_tbl);
+      // return orig.apply(this, arguments);
+      return orig.apply();
+    });
+
+    select().from('test').join('psn').join('usr').toString();
+    sql.joinCriteria(orig);
+    assert(left_tbls.indexOf('person') > -1 && left_tbls.indexOf('psn') === -1, 'left_tbl is not expanded: [' + left_tbls.join(',') + ']');
+  });
+
+  it('should support aliases', function() {
+    check(select().from('user usr2').join('address addr2'),
+      'SELECT * FROM "user" usr2 INNER JOIN address addr2 ON usr2.addr_fk = addr2.pk');
+  });
+
+  it('should auto-generate join criteria using supplied joinCriteria() function', function() {
+    check(select().from('usr').join('psn'),
+      'SELECT * FROM "user" usr INNER JOIN person psn ON usr.psn_fk = psn.pk');
+  });
+  it('should auto-generate join criteria to multiple tables', function() {
+    check(select().from('usr').join('psn').join('addr'),
+      'SELECT * FROM "user" usr ' +
+      'INNER JOIN person psn ON usr.psn_fk = psn.pk ' +
+      'INNER JOIN address addr ON psn.addr_fk = addr.pk');
+  });
+  it('should auto-generate join criteria from a single table to multiple tables', function() {
+    check(select().from('usr').join('psn', 'addr'),
+      'SELECT * FROM "user" usr ' +
+      'INNER JOIN person psn ON usr.psn_fk = psn.pk ' +
+      'INNER JOIN address addr ON usr.addr_fk = addr.pk');
+  });
+  it('should handle unions', function() {
+    check(select().from('usr').where({ name: 'Roy' })
+      .union(select().from('usr').where({ name: 'Moss' }))
+      .union(select().from('usr').where({ name: 'The elders of the internet' })),
+      "SELECT * FROM \"user\" usr WHERE name = 'Roy'" +
+      " UNION SELECT * FROM \"user\" usr WHERE name = 'Moss'" +
+      " UNION SELECT * FROM \"user\" usr WHERE name = 'The elders of the internet'");
+  });
+  it('should handle chained unions', function() {
+    check(select().from('usr').where({ name: 'Roy' })
+      .union().select().from('usr').where({ name: 'blurns' }),
+      "SELECT * FROM \"user\" usr WHERE name = 'Roy'" +
+      " UNION SELECT * FROM \"user\" usr WHERE name = 'blurns'");
+  });
+  it('should handle chained unions with params', function() {
+    checkParams(select().from('usr').where({ name: 'Roy' })
+      .union().select().from('usr').where({ name: 'Moss' }),
+      "SELECT * FROM \"user\" usr WHERE name = $1" +
+      " UNION SELECT * FROM \"user\" usr WHERE name = $2", ['Roy', 'Moss']);
+  });
+  it('should handle unions with params', function() {
+    checkParams(select().from('usr').where({ name: 'Roy' })
+      .union(select().from('usr').where({ name: 'Moss' }))
+      .union(select().from('usr').where({ name: 'The elders of the internet' })),
+      'SELECT * FROM "user" usr WHERE name = $1' +
+      ' UNION SELECT * FROM "user" usr WHERE name = $2' +
+      ' UNION SELECT * FROM "user" usr WHERE name = $3',
+      ['Roy', 'Moss', 'The elders of the internet']);
+  });
+
+  describe('UPDATE statements', function() {
+    it('should handle .set() with (key, value)', function() {
+      check(update('user').set('name', 'Fred'),
+        "UPDATE \"user\" SET name = 'Fred'");
+    });
+    it('should handle .values() with an object literal', function() {
+      check(update('user').values({ name: 'Fred' }),
+        "UPDATE \"user\" SET name = 'Fred'");
+    });
+    it('should handle multiple .set()s with object literals', function() {
+      check(update('user').set({ name: 'Fred' }).set({ last_name: 'Flintstone' }),
+        "UPDATE \"user\" SET name = 'Fred', last_name = 'Flintstone'");
+    });
+    it('should handle multiple .values() with (key, value)', function() {
+      check(update('user').values('name', 'Fred').values('last_name', 'Flintstone'),
+        "UPDATE \"user\" SET name = 'Fred', last_name = 'Flintstone'");
+    });
+    it('should handle values argument', function() {
+      check(update('user', { name: 'Fred' }),
+        "UPDATE \"user\" SET name = 'Fred'");
+    });
+  });
+
+  describe('INSERT statements', function() {
+    it('should take an object of column/value pairs', function() {
+      check(insert('user', { id: 33, name: 'Fred' }),
+        "INSERT INTO \"user\" (id, name) VALUES (33, 'Fred')");
+    });
+    it('should insert a null for undefined', function() {
+      check(insert('user', { id: 33, name: undefined }),
+        "INSERT INTO \"user\" (id, name) VALUES (33, null)");
+    });
+    it('should insert a null for null', function() {
+      check(insert('user', { id: 33, name: null }),
+        "INSERT INTO \"user\" (id, name) VALUES (33, null)");
+    });
+    it('should take an array of columns & values', function() {
+      check(insert('user', ['id', 'name']).values([33, 'Fred']),
+        "INSERT INTO \"user\" (id, name) VALUES (33, 'Fred')");
+    });
+    it('should take multiple parameters of columns & values', function() {
+      check(insert('user', 'id', 'name').values(33, 'Fred'),
+        "INSERT INTO \"user\" (id, name) VALUES (33, 'Fred')");
+    });
+    it('should take an array of objects', function() {
+      check(insert('user', [{ id: 33, name: 'Fred' }, { id: 34, name: 'Wilma' }]),
+        "INSERT INTO \"user\" (id, name) VALUES (33, 'Fred'), (34, 'Wilma')");
+    });
+
+    describe('.values()', function() {
+      it('should take an array of arrays', function() {
+        check(insert('user', ['id', 'name']).values([[33, 'Fred'], [34, 'Wilma']]),
+          "INSERT INTO \"user\" (id, name) VALUES (33, 'Fred'), (34, 'Wilma')");
+      });
+    });
+
+    describe('.into()', function() {
+      it('should take an object of column/value pairs', function() {
+        check(insert().into('user', { id: 33, name: 'Fred' }),
+          "INSERT INTO \"user\" (id, name) VALUES (33, 'Fred')");
+      });
+      it('should take an array of columns & values', function() {
+        check(insert().into('user', ['id', 'name']).values([33, 'Fred']),
+          "INSERT INTO \"user\" (id, name) VALUES (33, 'Fred')");
+      });
+      it('should take multiple parameters of columns & values', function() {
+        check(insert().into('user', 'id', 'name').values(33, 'Fred'),
+          "INSERT INTO \"user\" (id, name) VALUES (33, 'Fred')");
+      });
+    });
+  });
+
+  describe('SELECT clause', function() {
+    it('should handle an array', function() {
+      check(select(['one', 'order']).from('user'),
+        'SELECT one, "order" FROM "user"');
+    });
+    it('should handle multiple args', function() {
+      check(select('one', 'order').from('user'),
+        'SELECT one, "order" FROM "user"');
+    });
+    it('should default to *', function() {
+      check(select().from('user'),
+        'SELECT * FROM "user"');
+    });
+    it('should handle a comma-delimited str', function() {
+      check(select('one, order').from('user'),
+        'SELECT one, "order" FROM "user"');
+    });
+    it('should handle being called multiple times', function() {
+      check(select('one, order').select(['two', 'desc']).select('three', 'four').from('user'),
+        'SELECT one, "order", two, "desc", three, four FROM "user"');
+    });
+    it('should support DISTINCT', function() {
+      check(select('one, order').distinct('two, desc').from('user'),
+        'SELECT DISTINCT one, "order", two, "desc" FROM "user"');
+    });
+    it('should support FOR UPDATE', function() {
+      check(select().from('user').forUpdate(),
+        'SELECT * FROM "user" FOR UPDATE');
+    });
+    it('should support FOR UPDATE w/ col list', function() {
+      check(select().from('user').forUpdate().of('user'),
+        'SELECT * FROM "user" FOR UPDATE OF "user"');
+    });
+    it('should support FOR UPDATE OF ... NO WAIT', function() {
+      check(select().from('user').forUpdate().of('user').noWait(),
+        'SELECT * FROM "user" FOR UPDATE OF "user" NO WAIT');
+    });
+  });
+
+  describe('.from()', function() {
+    it('should handle an array', function() {
+      check(select().from(['one', 'two', 'usr']),
+        'SELECT * FROM one, two, "user" usr');
+    });
+    it('should handle multiple args', function() {
+      check(select().from('one', 'two', 'usr'),
+        'SELECT * FROM one, two, "user" usr');
+    });
+    it('should handle a comma-delimited string', function() {
+      check(select().from('one, two, usr'),
+        'SELECT * FROM one, two, "user" usr');
+    });
+    it('should handle being called multiple times', function() {
+      check(select().from('one', 'usr').from(['two', 'psn']).from('three, addr'),
+        'SELECT * FROM one, "user" usr, two, person psn, three, address addr');
+    });
+    it('should handle subquery object', function() {
+      check(select().from(select().from('user').as('subq')),
+        'SELECT * FROM (SELECT * FROM "user") subq');
+    });
+    it('should handle subquery string', function() {
+      check(select().from('(SELECT * FROM "user") subq'),
+        'SELECT * FROM (SELECT * FROM "user") subq');
+    });
+  });
+
+  describe('select().into() should insert into a new table', function() {
+    it('.into()', function() {
+      check(select().into('new_user').from('user'),
+        'SELECT * INTO new_user FROM "user"');
+    });
+    it('.intoTable()', function() {
+      check(select().intoTable('new_user').from('user'),
+        'SELECT * INTO new_user FROM "user"');
+    });
+    it('intoTemp()', function() {
+      check(select().intoTemp('new_user').from('user'),
+        'SELECT * INTO TEMP new_user FROM "user"');
+    });
+    it('intoTempTable()', function() {
+      check(select().intoTempTable('new_user').from('user'),
+        'SELECT * INTO TEMP new_user FROM "user"');
+    });
+  });
+
+  describe('insert().into() should insert into a preexisting table', function() {
+    it('insert().into().select()', function() {
+      check(insert().into('new_user', 'id', 'addr_id')
+        .select('id', 'addr_id').from('user'),
+        'INSERT INTO new_user (id, addr_id) SELECT id, addr_id FROM "user"');
+    });
+    it('insert().into().select() with no columns', function() {
+      check(insert().into('new_user')
+        .select('id', 'addr_id').from('user'),
+        'INSERT INTO new_user SELECT id, addr_id FROM "user"');
+    });
+    it('insert().select()', function() {
+      check(insert('new_user', 'id', 'addr_id')
+        .select('id', 'addr_id').from('user'),
+        'INSERT INTO new_user (id, addr_id) SELECT id, addr_id FROM "user"');
+    });
+    it('insert().select() with params', function() {
+      check(insert('new_user', 'id', 'addr_id')
+        .select('id', 'addr_id').from('user').where({ active: true }).toParams().text,
+        'INSERT INTO new_user (id, addr_id) SELECT id, addr_id FROM "user" WHERE active = $1');
+    });
+  });
+
+  describe('GROUP BY clause', function() {
+    it('should support single group by', function() {
+      check(select().from('user').groupBy('last_name'),
+        'SELECT * FROM "user" GROUP BY last_name');
+    });
+    it('should support multiple groupBy() args w/ reserved words quoted', function() {
+      check(select().from('user').groupBy('last_name', 'order'),
+        'SELECT * FROM "user" GROUP BY last_name, "order"');
+    });
+    it('should support .groupBy().groupBy()', function() {
+      check(select().from('user').groupBy('last_name').groupBy('order'),
+        'SELECT * FROM "user" GROUP BY last_name, "order"');
+    });
+    it('should support an array', function() {
+      check(select().from('user').groupBy(['last_name', 'order']),
+        'SELECT * FROM "user" GROUP BY last_name, "order"');
+    });
+  });
+
+  describe('.order() / .orderBy()', function() {
+    it('should support .orderBy(arg1, arg2)', function() {
+      check(select().from('user').orderBy('last_name', 'order'),
+        'SELECT * FROM "user" ORDER BY last_name, "order"');
+    });
+    it('should support an array', function() {
+      check(select().from('user').orderBy(['last_name', 'order']),
+        'SELECT * FROM "user" ORDER BY last_name, "order"');
+    });
+    it('should support being called multiple times', function() {
+      check(select().from('user').orderBy('last_name').orderBy('order'),
+        'SELECT * FROM "user" ORDER BY last_name, "order"');
+    });
+  });
+
+  describe('joins', function() {
+    it('.join() should accept a comma-delimited string', function() {
+      check(select().from('usr').join('psn, addr'),
+        'SELECT * FROM "user" usr ' +
+        'INNER JOIN person psn ON usr.psn_fk = psn.pk ' +
+        'INNER JOIN address addr ON usr.addr_fk = addr.pk');
+    });
+    it('.leftJoin() should generate a left join', function() {
+      check(select().from('usr').leftJoin('addr'),
+        'SELECT * FROM "user" usr ' +
+        'LEFT JOIN address addr ON usr.addr_fk = addr.pk');
+    });
+    it('.leftOuterJoin() should generate a left join', function() {
+      check(select().from('usr').leftOuterJoin('addr'),
+        'SELECT * FROM "user" usr ' +
+        'LEFT JOIN address addr ON usr.addr_fk = addr.pk');
+    });
+    it('.rightJoin() should generate a right join', function() {
+      check(select().from('usr').rightJoin('addr'),
+        'SELECT * FROM "user" usr ' +
+        'RIGHT JOIN address addr ON usr.addr_fk = addr.pk');
+    });
+    it('.rightOuterJoin() should generate a right join', function() {
+      check(select().from('usr').rightOuterJoin('addr'),
+        'SELECT * FROM "user" usr ' +
+        'RIGHT JOIN address addr ON usr.addr_fk = addr.pk');
+    });
+    it('.fullJoin() should generate a full join', function() {
+      check(select().from('usr').fullJoin('addr'),
+        'SELECT * FROM "user" usr ' +
+        'FULL JOIN address addr ON usr.addr_fk = addr.pk');
+    });
+    it('.fullOuterJoin() should generate a full join', function() {
+      check(select().from('usr').fullOuterJoin('addr'),
+        'SELECT * FROM "user" usr ' +
+        'FULL JOIN address addr ON usr.addr_fk = addr.pk');
+    });
+    it('.crossJoin() should generate a cross join', function() {
+      check(select().from('usr').crossJoin('addr'),
+        'SELECT * FROM "user" usr ' +
+        'CROSS JOIN address addr');
+    });
+    it('join() should accept an expression for the on argument', function() {
+      check(select().from('usr').join('addr', eq('usr.addr_id', sql('addr.id'))),
+        'SELECT * FROM "user" usr INNER JOIN address addr ON usr.addr_id = addr.id');
+    });
+    it('join() should accept an array for the on argument (for JOIN USING)', function() {
+      check(select().from('usr').join('addr', ['addr_id', 'country_id']),
+        'SELECT * FROM "user" usr INNER JOIN address addr USING (addr_id, country_id)');
+    });
+  });
+
+  describe('.on()', function() {
+    it('should accept an object literal', function() {
+      check(select().from('usr').join('addr').on({ 'usr.addr_id': 'addr.id' }),
+        'SELECT * FROM "user" usr ' +
+        'INNER JOIN address addr ON usr.addr_id = addr.id');
+    });
+    it('should accept a (key, value) pair', function() {
+      check(select().from('usr').join('addr').on('usr.addr_id', 'addr.id'),
+        'SELECT * FROM "user" usr ' +
+        'INNER JOIN address addr ON usr.addr_id = addr.id');
+    });
+    it('can be called multiple times', function() {
+      check(select().from('usr', 'psn').join('addr').on({ 'usr.addr_id': 'addr.id' })
+        .on('psn.addr_id', 'addr.id'),
+        'SELECT * FROM "user" usr, person psn ' +
+        'INNER JOIN address addr ON usr.addr_id = addr.id AND psn.addr_id = addr.id');
+    });
+    it('can be called multiple times w/ an object literal', function() {
+      check(select().from('usr', 'psn').join('addr').on({ 'usr.addr_id': 'addr.id' })
+        .on({ 'psn.addr_id': 'addr.id' }),
+        'SELECT * FROM "user" usr, person psn ' +
+        'INNER JOIN address addr ON usr.addr_id = addr.id AND psn.addr_id = addr.id');
+    });
+    it('should accept an expression', function() {
+      check(select().from('usr').join('addr').on(eq('usr.addr_id', sql('addr.id'))),
+        'SELECT * FROM "user" usr INNER JOIN address addr ON usr.addr_id = addr.id');
+    });
+    it('should not proceed if .using() has already been used', function() {
+      assert.throws(function() {
+        select().from('t1').join('t2').using('id').on({ 't1.t2_id': 't2.id' });
+      });
+    });
+  });
+
+  describe('.using()', function() {
+    it('should accept a comma-delimited string', function() {
+      check(select().from('usr').join('addr').using('addr_id, contrived_id'),
+        'SELECT * FROM "user" usr ' +
+        'INNER JOIN address addr USING (addr_id, contrived_id)');
+    });
+    it('should accept multiple arguments', function() {
+      check(select().from('usr').join('addr').using('addr_id', 'contrived_id'),
+        'SELECT * FROM "user" usr ' +
+        'INNER JOIN address addr USING (addr_id, contrived_id)');
+    });
+    it('should accept an array literal', function() {
+      check(select().from('usr').join('addr').using(['addr_id', 'contrived_id']),
+        'SELECT * FROM "user" usr ' +
+        'INNER JOIN address addr USING (addr_id, contrived_id)');
+    });
+    it('should not proceed if .on() has already been used', function() {
+      assert.throws(function() {
+        select().from('t1').join('t2').on({ 't1.t2_id': 't2.id' }).using('id');
+      });
+    });
+  });
+
+  describe('natural joins', function() {
+    it('.naturalJoin() should accept a comma-delimited string', function() {
+      check(select().from('usr').naturalJoin('psn, addr'),
+        'SELECT * FROM "user" usr ' +
+        'NATURAL INNER JOIN person psn ' +
+        'NATURAL INNER JOIN address addr');
+    });
+    it('.naturalLeftJoin() should generate a natural left join', function() {
+      check(select().from('usr').naturalLeftJoin('addr'),
+        'SELECT * FROM "user" usr ' +
+        'NATURAL LEFT JOIN address addr');
+    });
+    it('.naturalLeftOuterJoin() should generate a natural left join', function() {
+      check(select().from('usr').naturalLeftOuterJoin('addr'),
+        'SELECT * FROM "user" usr ' +
+        'NATURAL LEFT JOIN address addr');
+    });
+    it('.naturalRightJoin() should generate a natural right join', function() {
+      check(select().from('usr').naturalRightJoin('addr'),
+        'SELECT * FROM "user" usr ' +
+        'NATURAL RIGHT JOIN address addr');
+    });
+    it('.naturalRightOuterJoin() should generate a natural right join', function() {
+      check(select().from('usr').naturalRightOuterJoin('addr'),
+        'SELECT * FROM "user" usr ' +
+        'NATURAL RIGHT JOIN address addr');
+    });
+    it('.naturalFullJoin() should generate a natural full join', function() {
+      check(select().from('usr').naturalFullJoin('addr'),
+        'SELECT * FROM "user" usr ' +
+        'NATURAL FULL JOIN address addr');
+    });
+    it('.naturalFullOuterJoin() should generate a natural full join', function() {
+      check(select().from('usr').naturalFullOuterJoin('addr'),
+        'SELECT * FROM "user" usr ' +
+        'NATURAL FULL JOIN address addr');
+    });
+  });
+
+  describe('WHERE clauses', function() {
+    it('should AND multiple where() criteria by default', function() {
+      check(select().from('user').where({
+        first_name: 'Fred',
+        last_name: 'Flintstone'
+      }),
+        "SELECT * FROM \"user\" WHERE first_name = 'Fred' AND last_name = 'Flintstone'");
+    });
+    it('should AND multiple where()s by default', function() {
+      check(select().from('user').where({ first_name: 'Fred' })
+        .where({ last_name: 'Flintstone' }),
+        "SELECT * FROM \"user\" WHERE first_name = 'Fred' AND last_name = 'Flintstone'");
+    });
+    it('should handle explicit .and() with (key, value) args', function() {
+      check(select().from('user').where('first_name', 'Fred')
+        .and('last_name', 'Flintstone'),
+        "SELECT * FROM \"user\" WHERE first_name = 'Fred' AND last_name = 'Flintstone'");
+    });
+    it('should handle nested and(or())', function() {
+      check(select().from('user').where(and({ last_name: 'Flintstone' }, or({ first_name: 'Fred' }, { first_name: 'Wilma' }))),
+        "SELECT * FROM \"user\" WHERE last_name = 'Flintstone' AND (first_name = 'Fred' OR first_name = 'Wilma')");
+    });
+    it('should handle or([...])', function() {
+      check(select().from('table').where({ this: 'test' }).and(or(['test1', 'test2'].map(function(val) { return eq('that', val); }))),
+        "SELECT * FROM \"table\" WHERE this = 'test' AND (that = 'test1' OR that = 'test2')");
+    });
+    it('and() should be implicit', function() {
+      check(select().from('user').where({ last_name: 'Flintstone' }, or({ first_name: 'Fred' }, { first_name: 'Wilma' })),
+        "SELECT * FROM \"user\" WHERE last_name = 'Flintstone' AND (first_name = 'Fred' OR first_name = 'Wilma')");
+    });
+    it('should handle like()', function() {
+      check(select().from('user').where(like('last_name', 'Flint%')),
+        "SELECT * FROM \"user\" WHERE last_name LIKE 'Flint%'");
+    });
+    it('should accept a 3rd escape param to like()', function() {
+      check(select().from('user').where(like('percent', '100\\%', '\\')),
+        "SELECT * FROM \"user\" WHERE percent LIKE '100\\%' ESCAPE '\\'");
+    });
+    it('should handle not()', function() {
+      check(select().from('user').where(not({ first_name: 'Fred' })),
+        "SELECT * FROM \"user\" WHERE NOT first_name = 'Fred'");
+    });
+    it('should handle in()', function() {
+      check(select().from('user').where($in('first_name', ['Fred', 'Wilma'])),
+        "SELECT * FROM \"user\" WHERE first_name IN ('Fred', 'Wilma')");
+    });
+    it('should handle .in() with multiple args', function() {
+      check(select().from('user').where($in('name', 'Jimmy', 'Owen')),
+        "SELECT * FROM \"user\" WHERE name IN ('Jimmy', 'Owen')");
+    });
+    it('should handle .in() with a subquery', function() {
+      check(select().from('user').where($in('addr_id', select('id').from('address'))),
+        'SELECT * FROM "user" WHERE addr_id IN (SELECT id FROM address)');
+    });
+    it('should handle exists() with a subquery', function() {
+      check(select().from('user').where(exists(select().from('address').where({ 'user.addr_id': sql('address.id') }))),
+        'SELECT * FROM "user" WHERE EXISTS (SELECT * FROM address WHERE "user".addr_id = address.id)');
+    });
+    it('should handle exists() with a subquery, parameterized', function() {
+      checkParams(select().from('user').where('active', true).where(exists(select().from('address').where({ 'user.addr_id': 37 }))),
+        'SELECT * FROM "user" WHERE active = $1 AND EXISTS (SELECT * FROM address WHERE "user".addr_id = $2)',
+        [true, 37]);
+    });
+    it('should handle isNull()', function() {
+      check(select().from('user').where(isNull('first_name')),
+        'SELECT * FROM "user" WHERE first_name IS NULL');
+    });
+    it('should handle isNotNull()', function() {
+      check(select().from('user').where(isNotNull('first_name')),
+        'SELECT * FROM "user" WHERE first_name IS NOT NULL');
+    });
+    it('should automatically generate IS NULL', function() {
+      check(select().from('user').where({ first_name: null }),
+        'SELECT * FROM "user" WHERE first_name IS NULL');
+    });
+    it('should handle explicit equal()', function() {
+      check(select().from('user').where(equal('first_name', 'Fred')),
+        "SELECT * FROM \"user\" WHERE first_name = 'Fred'");
+    });
+    it('should automatically generate IS NOT NULL', function() {
+      check(select().from('user').where(notEq('first_name', null)),
+        "SELECT * FROM \"user\" WHERE first_name IS NOT NULL");
+    });
+    it('should handle lt()', function() {
+      check(select().from('user').where(lt('order', 5)),
+        'SELECT * FROM "user" WHERE "order" < 5');
+    });
+    it('should handle lte()', function() {
+      check(select().from('user').where(lte('order', 5)),
+        'SELECT * FROM "user" WHERE "order" <= 5');
+    });
+    it('should handle gt()', function() {
+      check(select().from('user').where(gt('order', 5)),
+        'SELECT * FROM "user" WHERE "order" > 5');
+    });
+    it('should handle gte()', function() {
+      check(select().from('user').where(gte('order', 5)),
+        'SELECT * FROM "user" WHERE "order" >= 5');
+    });
+    it('should handle between()', function() {
+      check(select().from('user').where(between('name', 'Frank', 'Fred')),
+        "SELECT * FROM \"user\" WHERE name BETWEEN 'Frank' AND 'Fred'");
+    });
+    it('should do nothing for null, undefined, {}', function() {
+      check(select().from('user').where(),
+        "SELECT * FROM \"user\"");
+      check(select().from('user').where(null),
+        "SELECT * FROM \"user\"");
+      check(select().from('user').where({}),
+        "SELECT * FROM \"user\"");
+      check(select().from('user').where(undefined),
+        "SELECT * FROM \"user\"");
+    });
+    it('should not ignore the 2nd arg if the first is {}', function() {
+      check(select().from('user').where({}, { name: 'Fred' }),
+        "SELECT * FROM \"user\" WHERE name = 'Fred'");
+    });
+
+    describe('customizations', function() {
+      it('should support customized criteria', function() {
+        check(select().from('table').where(arraysToOrs({ this: 'test', that: ['test1', 'test2'] })),
+          "SELECT * FROM \"table\" WHERE this = 'test' AND (that = 'test1' OR that = 'test2')");
+      });
+
+      it('should support changing the default array handling', function() {
+        const proto = sql.select.prototype;
+        const orig = proto.where;
+        proto.where = function(criteria) {
+          // return orig.call(this, arraysToOrs(criteria));
+          return orig.call()
+        };
+
+        check(select().from('table').where({ this: 'test', that: ['test1', 'test2'] }),
+          "SELECT * FROM \"table\" WHERE this = 'test' AND (that = 'test1' OR that = 'test2')");
+
+        proto.where = orig;
+      });
+
+      function arraysToOrs(criteria) {
+        const where = and();
+        for (const col in criteria) {
+          const val = criteria[col];
+          let expr;
+          if (Array.isArray(val))
+            expr = or(val.map(function(val) { return eq(col, val); }));
+          else
+            expr = eq(col, val);
+          where.expressions.push(expr);
+        }
+        return where;
+      }
+
+      it('should support converting expressions to string', function() {
+        check(and({ this: 'test' }, $in('that', ['v1', 'v2'])),
+          "(this = 'test' AND that IN ('v1', 'v2'))");
+      });
+
+      it('should support raw sql blocks in expressions', function() {
+        check(and({ this: 'test' }, sql('field is null')),
+          "(this = 'test' AND field is null)");
+      });
+
+      it('should support converting ?-parameterized sql blocks to string', function() {
+        check(sql('field = ?', 123).toString({ placeholder: '?' }),
+          "field = 123");
+      });
+
+      it('should support converting default-parameterized sql blocks to string', function() {
+        check(sql('field = $1', 123),
+          "field = 123");
+      });
+    });
+  });
+
+  describe('should quote column names with capitals in them', function() {
+    it('in SELECT', function() {
+      check(select('Name').from('user'),
+        'SELECT "Name" FROM "user"');
+    });
+    it('in SELECT, after tbl prefix, before AS suffix', function() {
+      check(select('user.Name AS UserName').from('user'),
+        'SELECT "user"."Name" AS UserName FROM "user"');
+    });
+    it('in SELECT, after tbl prefix, with the optional "AS" omitted', function() {
+      check(select('user.Name UserName').from('user'),
+        'SELECT "user"."Name" UserName FROM "user"');
+    });
+    it('in SELECT, with the optional "AS" omitted', function() {
+      check(select('Name UserName').from('user'),
+        'SELECT "Name" UserName FROM "user"');
+    });
+  });
+
+  describe('should quote table names that are reserved words or have capitals', function() {
+    it('in joins', function() {
+      check(select('Name UserName').from('person').join('user', { 'person.usr_id': 'user.id' }),
+        'SELECT "Name" UserName FROM person INNER JOIN "user" ON person.usr_id = "user".id');
+    });
+    it('unless they are wrapped in sql() literals (to query reserved system tables)', function() {
+      check(select(sql('user.id')).from(sql('user')),
+        'SELECT user.id FROM user');
+    });
+  });
+
+  describe('should quote reserved words in column names', function() {
+    it('in ORDER BY', function() {
+      check(select().from('usr').orderBy('order'),
+        'SELECT * FROM "user" usr ORDER BY "order"');
+    });
+    it('in SELECT', function() {
+      check(select('desc').from('usr'),
+        'SELECT "desc" FROM "user" usr');
+    });
+    it('in JOIN ONs', function() {
+      check(select().from('usr').join('psn', { 'usr.order': 'psn.order' }),
+        'SELECT * FROM "user" usr INNER JOIN person psn ON usr."order" = psn."order"');
+    });
+    it('in JOIN USINGs', function() {
+      check(select().from('usr').join('psn').using('order'),
+        'SELECT * FROM "user" usr INNER JOIN person psn USING ("order")');
+    });
+    it('in INSERT', function() {
+      check(insert('user').values({ order: 1 }),
+        'INSERT INTO "user" ("order") VALUES (1)');
+    });
+    it('in alternative insert() API', function() {
+      check(insert('user', 'order').values(1),
+        'INSERT INTO "user" ("order") VALUES (1)');
+    });
+    it('with a db and table prefix and a suffix', function() {
+      check(select('db.person.desc AS psn_desc').from('person'),
+        'SELECT db.person."desc" AS psn_desc FROM person');
+    });
+    it('should quote sqlite reserved words', function() {
+      check(select('action').from('user'),
+        'SELECT "action" FROM "user"');
+    });
+    it('should not quote reserved words in SELECT expressions', function() {
+      check(select("CASE WHEN name = 'Fred' THEN 1 ELSE 0 AS security_level").from('user'),
+        "SELECT CASE WHEN name = 'Fred' THEN 1 ELSE 0 AS security_level FROM \"user\"");
+    });
+  });
+
+  describe('subqueries in <, >, etc', function() {
+    it('should support a subquery in >', function() {
+      const count_addrs_for_usr = select('count(*)').from('address').where({ 'user.addr_id': sql('address.id') });
+      check(select().from('user').where(gt(count_addrs_for_usr, 5)),
+        'SELECT * FROM "user" WHERE (SELECT count(*) FROM address WHERE "user".addr_id = address.id) > 5');
+    });
+    it('should support a subquery in <=', function() {
+      const count_addrs_for_usr = select('count(*)').from('address').where({ 'user.addr_id': sql('address.id') });
+      check(select().from('user').where(lte(count_addrs_for_usr, 5)),
+        'SELECT * FROM "user" WHERE (SELECT count(*) FROM address WHERE "user".addr_id = address.id) <= 5');
+    });
+    it('should support = ANY (subquery) quantifier', function() {
+      check(select().from('user').where(eqAny('user.id', select('user_id').from('address'))),
+        'SELECT * FROM "user" WHERE "user".id = ANY (SELECT user_id FROM address)');
+    });
+    it('should support <> ANY (subquery) quantifier', function() {
+      check(select().from('user').where(notEqAny('user.id', select('user_id').from('address'))),
+        'SELECT * FROM "user" WHERE "user".id <> ANY (SELECT user_id FROM address)');
+    });
+  });
+
+  describe('deep Statement.clone()', function() {
+    it('should deep clone WHERE expressions', function() {
+      const sel = select().from('user').where({ first_name: 'Fred' });
+      sel.clone().where({ last_name: 'Flintstone' });
+      check(sel, "SELECT * FROM \"user\" WHERE first_name = 'Fred'");
+    });
+    it('should deep clone .order()', function() {
+      const sel = select().from('user').order('name');
+      sel.clone().order('last_name');
+      check(sel, 'SELECT * FROM "user" ORDER BY name');
+    });
+    it('should deep clone .join()', function() {
+      const sel = select().from('user').join('addr');
+      sel.clone().join('psn');
+      check(sel, 'SELECT * FROM "user" INNER JOIN address addr ON "user".addr_fk = addr.pk');
+    });
+    it('should clone values', function() {
+      const ins = insert('user', { first_name: 'Fred' });
+      ins.clone().values({ last_name: 'Flintstone' });
+      check(ins, "INSERT INTO \"user\" (first_name) VALUES ('Fred')");
+    });
+    it('should clone $in subqueries', function() {
+      const sel = select().from('user').where($in('first_name', select('first_name').from('user')));
+      sel.clone().where('last_name', 'Flintstone');
+      check(sel, "SELECT * FROM \"user\" WHERE first_name IN (SELECT first_name FROM \"user\")");
+    });
+  });
+
+  describe('the AS keyword', function() {
+    it('should not generate invalid SQL', function() {
+      check(select().from('user AS usr').join('addr'),
+        'SELECT * FROM "user" AS usr INNER JOIN address addr ON usr.addr_fk = addr.pk');
+    });
+  });
+
+  describe('delete()', function() {
+    it('should generate a DELETE statement', function() {
+      check(del('user'),
+        'DELETE FROM "user"');
+    });
+    it('should support .from()', function() {
+      check(del().from('user'),
+        'DELETE FROM "user"');
+    });
+    it('should generate a DELETE statement with a WHERE clause', function() {
+      check(del('user').where('first_name', 'Fred'),
+        "DELETE FROM \"user\" WHERE first_name = 'Fred'");
+    });
+  });
+
+  describe('_extension()', function() {
+    it('should shield base', function() {
+      const ext = sql._extension();
+
+      ext.prop = 1;
+      assert.equal(sql.prop, undefined);
+
+      ext.select.prop = 1;
+      // assert.equal(sql.select.returning, undefined);
+
+      assert(ext.select.prototype.clauses !== sql.select.prototype.clauses);
+    });
+  });
+});
+
+function describe(...param) { }
+function it(...param) { }
+function check(...param) { }
+function checkParams(...param) { }
diff --git a/types/sql-bricks/tsconfig.json b/types/sql-bricks/tsconfig.json
new file mode 100644
index 0000000000..3c5db90a4f
--- /dev/null
+++ b/types/sql-bricks/tsconfig.json
@@ -0,0 +1,23 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": [
+      "es6"
+    ],
+    "noImplicitAny": false,
+    "noImplicitThis": true,
+    "strictNullChecks": true,
+    "strictFunctionTypes": true,
+    "baseUrl": "../",
+    "typeRoots": [
+      "../"
+    ],
+    "types": [],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "files": [
+    "index.d.ts",
+    "sql-bricks-tests.ts"
+  ]
+}
\ No newline at end of file
diff --git a/types/sql-bricks/tslint.json b/types/sql-bricks/tslint.json
new file mode 100644
index 0000000000..1e7260a20f
--- /dev/null
+++ b/types/sql-bricks/tslint.json
@@ -0,0 +1,10 @@
+{
+  "extends": "dtslint/dt.json",
+  "rules": {
+    "only-arrow-functions": false,
+    "prefer-template": false,
+    "prefer-conditional-expression": false,
+    "one-variable-per-declaration": false,
+    "semicolon":false
+  }
+}
\ No newline at end of file

From 6095ef105d0156ec9ad3a03621edf7f8df60cea4 Mon Sep 17 00:00:00 2001
From: Reid Weber <reid@meshstudio.io>
Date: Thu, 29 Mar 2018 10:55:29 -0700
Subject: [PATCH 0952/1382] Added calendar to Expo Permissions

---
 types/expo/index.d.ts         | 3 ++-
 types/expo/v24/expo-tests.tsx | 1 +
 types/expo/v24/index.d.ts     | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/types/expo/index.d.ts b/types/expo/index.d.ts
index 8661cac727..2cde351dbe 100644
--- a/types/expo/index.d.ts
+++ b/types/expo/index.d.ts
@@ -1701,7 +1701,7 @@ export namespace Pedometer {
  */
 export namespace Permissions {
     type PermissionType = 'remoteNotifications' | 'location' |
-        'camera' | 'contacts' | 'audioRecording';
+        'camera' | 'contacts' | 'audioRecording' | 'calendar';
     type PermissionStatus = 'undetermined' | 'granted' | 'denied';
     type PermissionExpires = 'never';
 
@@ -1733,6 +1733,7 @@ export namespace Permissions {
     const NOTIFICATIONS: RemoteNotificationPermission;
     const CONTACTS: 'contacts';
     const SYSTEM_BRIGHTNESS: 'systemBrightness';
+    const CALENDAR: 'calendar';
 }
 
 /**
diff --git a/types/expo/v24/expo-tests.tsx b/types/expo/v24/expo-tests.tsx
index 8749a5993c..5ea1758270 100644
--- a/types/expo/v24/expo-tests.tsx
+++ b/types/expo/v24/expo-tests.tsx
@@ -528,6 +528,7 @@ Permissions.CONTACTS === 'contacts';
 Permissions.NOTIFICATIONS === 'remoteNotifications';
 Permissions.REMOTE_NOTIFICATIONS === 'remoteNotifications';
 Permissions.SYSTEM_BRIGHTNESS === 'systemBrightness';
+Permissions.CALENDAR === 'calendar';
 async () => {
     const result = await Permissions.askAsync(Permissions.CAMERA);
 
diff --git a/types/expo/v24/index.d.ts b/types/expo/v24/index.d.ts
index 829e9730a7..376f885073 100644
--- a/types/expo/v24/index.d.ts
+++ b/types/expo/v24/index.d.ts
@@ -1681,7 +1681,7 @@ export namespace Pedometer {
  */
 export namespace Permissions {
     type PermissionType = 'remoteNotifications' | 'location' |
-        'camera' | 'contacts' | 'audioRecording';
+        'camera' | 'contacts' | 'audioRecording' | 'calendar';
     type PermissionStatus = 'undetermined' | 'granted' | 'denied';
     type PermissionExpires = 'never';
 
@@ -1713,6 +1713,7 @@ export namespace Permissions {
     const NOTIFICATIONS: RemoteNotificationPermission;
     const CONTACTS: 'contacts';
     const SYSTEM_BRIGHTNESS: 'systemBrightness';
+    const CALENDAR: 'calendar';
 }
 
 /**

From 600231c52fc6fa43e605ef19ffb20b20b56fa752 Mon Sep 17 00:00:00 2001
From: "Narcisse D. ASSOGBA" <narcisse.adn93@gmail.com>
Date: Thu, 29 Mar 2018 19:03:17 +0100
Subject: [PATCH 0953/1382] Add "noImplicitAny" constraint and other tslint
 constraints

---
 types/sql-bricks/index.d.ts          | 121 ++++++++++++++-------------
 types/sql-bricks/sql-bricks-tests.ts |  64 ++++++++------
 types/sql-bricks/tsconfig.json       |   2 +-
 types/sql-bricks/tslint.json         |   3 -
 4 files changed, 103 insertions(+), 87 deletions(-)

diff --git a/types/sql-bricks/index.d.ts b/types/sql-bricks/index.d.ts
index d09bfee715..ccc7e523a7 100644
--- a/types/sql-bricks/index.d.ts
+++ b/types/sql-bricks/index.d.ts
@@ -78,16 +78,17 @@ declare namespace SqlBricks {
      * Appends additional columns to an existing query.
      * @param columns can be passed as multiple arguments, a comma-delimited string or an array.
      */
-    select(...columns: string[]): SelectStatement
+    select(...columns: Array<string | SelectStatement>): SelectStatement
     /**
      * Appends additional columns to an existing query.
      * @param columns can be passed as multiple arguments, a comma-delimited string or an array.
      */
-    select(columns: string[]): SelectStatement
-    select(...params): SelectStatement
+    select(columns: string[] | SelectStatement[]): SelectStatement
+
     as(alias: string): SelectStatement
 
-    distinct(...columns): SelectStatement
+    distinct(...columns: Array<string | SelectStatement>): SelectStatement
+    distinct(columns: string[] | SelectStatement[]): SelectStatement
 
     /**
      * Makes the query a SELECT ... INTO query (which creates a new table with the results of the query).
@@ -102,8 +103,8 @@ declare namespace SqlBricks {
      */
     intoTable(tbl: TableName): SelectStatement
 
-    intoTemp(tbl: TableName): SelectStatement,
-    intoTempTable(tbl: TableName): SelectStatement,
+    intoTemp(tbl: TableName): SelectStatement
+    intoTempTable(tbl: TableName): SelectStatement
 
     /**
      * Table names can be passed in as multiple string arguments, a comma-delimited string or an array.
@@ -151,8 +152,8 @@ declare namespace SqlBricks {
     fullOuterJoin(tbl: string, onCol1: string, onCol2: string): SelectStatement
     fullOuterJoin(firstTbl: string, ...otherTbls: string[]): SelectStatement
 
-    on(onCriteria: OnCriteria | WhereExpression): SelectStatement,
-    on(onCol1: string, onCol2: string): SelectStatement,
+    on(onCriteria: OnCriteria | WhereExpression): SelectStatement
+    on(onCol1: string, onCol2: string): SelectStatement
 
     /**
      * Joins using USING instead of ON.
@@ -178,11 +179,10 @@ declare namespace SqlBricks {
     naturalRightOuterJoin(tbl: string): SelectStatement
     naturalFullOuterJoin(tbl: string): SelectStatement
 
-    where(column: string, value?: string): SelectStatement
-    where(whereExpr: WhereExpression): SelectStatement
-    where(...options): SelectStatement
+    where(column?: string | null, value?: any): SelectStatement
+    where(...whereExpr: WhereExpression[]): SelectStatement
 
-    and(...options): SelectStatement
+    and(...options: any[]): SelectStatement
 
     /**
      * Sets or extends the GROUP BY columns.
@@ -219,28 +219,34 @@ declare namespace SqlBricks {
   interface InsertStatement extends Statement {
     into(tbl: TableName, ...columns: any[]): InsertStatement
     intoTable(tbl: TableName, ...columns: any[]): InsertStatement
-    select(...params): SelectStatement,
-    values(...values): InsertStatement
+    select(...columns: Array<string | SelectStatement>): SelectStatement
+    select(columns: string[] | SelectStatement[]): SelectStatement
+    values(...values: any[]): InsertStatement
   }
 
   /**
    * An UPDATE statement
    */
   interface UpdateStatement extends Statement {
-    values(...values): UpdateStatement
-    set(...values): UpdateStatement,
-    where(...options): UpdateStatement,
-    and(...options): UpdateStatement,
+    values(...values: any[]): UpdateStatement
+    set(...values: any[]): UpdateStatement
+    where(column?: string | null, value?: any): SelectStatement
+    where(...whereExpr: WhereExpression[]): SelectStatement
+    and(column?: string | null, value?: any): SelectStatement
+    and(...whereExpr: WhereExpression[]): SelectStatement
   }
 
   /**
    * A DELETE statement
    */
   interface DeleteStatement extends Statement {
-    from(...tbls: string[]): DeleteStatement,
-    using(...columnList): DeleteStatement,
-    where(...options): DeleteStatement,
-    and(...options): DeleteStatement,
+    from(...tbls: string[]): DeleteStatement
+    using(...columnList: string[]): SelectStatement
+    using(columnList: string[]): SelectStatement
+    where(column?: string | null, value?: any): SelectStatement
+    where(...whereExpr: WhereExpression[]): SelectStatement
+    and(column?: string | null, value?: any): SelectStatement
+    and(...whereExpr: WhereExpression[]): SelectStatement
   }
 }
 
@@ -251,7 +257,7 @@ interface SqlBricksFn {
    * anywhere that a column is expected (the left-hand side of WHERE criteria and many other SQL Bricks APIs)
    * @param value value to be wraped
    */
-  val(value): any
+  val(value: any): any
 
   /**
    * Returns a new INSERT statement. It can be used with or without the new operator.
@@ -263,7 +269,7 @@ interface SqlBricksFn {
    * insert('person', {'first_name': 'Fred', 'last_name': 'Flintstone'});
    * // INSERT INTO person (first_name, last_name) VALUES ('Fred', 'Flintstone')
    */
-  insert(tbl?: string, ...values): SqlBricks.InsertStatement
+  insert(tbl?: string, ...values: any[]): SqlBricks.InsertStatement
 
   /**
    * Returns a new INSERT statement. It can be used with or without the new operator.
@@ -275,23 +281,22 @@ interface SqlBricksFn {
    * insert('person', {'first_name': 'Fred', 'last_name': 'Flintstone'});
    * // INSERT INTO person (first_name, last_name) VALUES ('Fred', 'Flintstone')
    */
-  insertInto(tbl?: string, ...values): SqlBricks.InsertStatement
+  insertInto(tbl?: string, ...values: any[]): SqlBricks.InsertStatement
 
   /**
    * Returns a new select statement, seeded with a set of columns. It can be used with or without the new keyword.
    * @param columns it can be passed in here (or appended later via sel.select() or sel.distinct()) via multiple arguments
    * or a comma-delimited string or an array. If no columns are specified, toString() will default to SELECT *.
    */
-  select(...columns: string[]): SqlBricks.SelectStatement
+  select(...columns: Array<string | SqlBricks.SelectStatement>): SqlBricks.SelectStatement
   select(columns: string[] | SqlBricks.SelectStatement[]): SqlBricks.SelectStatement
-  select(...params): SqlBricks.SelectStatement
 
   /**
    * Returns a new UPDATE statement. It can be used with or without the new operator.
    * @param tbl table name
    * @param values
    */
-  update(tbl: string, ...values): SqlBricks.UpdateStatement
+  update(tbl: string, ...values: any[]): SqlBricks.UpdateStatement
 
   /**
    * Returns a new DELETE statement. It can be used with or without the new operator.
@@ -322,7 +327,7 @@ interface SqlBricksFn {
    * Sets a user-supplied function to automatically generate the .on() criteria for joins whenever it is not supplied explicitly.
    * @param func
    */
-  joinCriteria(func?: (...args) => SqlBricks.OnCriteria): any
+  joinCriteria(func?: (...args: any[]) => SqlBricks.OnCriteria): any
 
   _extension(): any
   prop: number
@@ -357,47 +362,47 @@ interface SqlBricksFn {
    * @param value1
    * @param value2
    */
-  between(column: string, value1, value2): SqlBricks.WhereExpression
+  between(column: string, value1: any, value2: any): SqlBricks.WhereExpression
   isNull(column: string): SqlBricks.WhereExpression
   isNotNull(column: string): SqlBricks.WhereExpression
-  like(column: string, value, escapeStr?: string): SqlBricks.WhereExpression
-  exists(stmt): SqlBricks.WhereExpression
+  like(column: string, value: any, escapeStr?: string): SqlBricks.WhereExpression
+  exists(stmt: any): SqlBricks.WhereExpression
   in(column: string, stmt: SqlBricks.SelectStatement): SqlBricks.WhereExpression
-  in(column: string, ...values): SqlBricks.WhereExpression
+  in(column: string, ...values: any[]): SqlBricks.WhereExpression
 
   /**
    * Generates the appropriate relational operator (=, <>, <, <=, > or >=).
    * @param column column name or query result
    * @param value column value
    */
-  eq(column: string | SqlBricks.SelectStatement, value?): SqlBricks.WhereBinary
-  equal(column: string | SqlBricks.SelectStatement, value?): SqlBricks.WhereBinary
-  notEq(column: string | SqlBricks.SelectStatement, value?): SqlBricks.WhereBinary
-  lt(column: string | SqlBricks.SelectStatement, value?): SqlBricks.WhereBinary
-  lte(column: string | SqlBricks.SelectStatement, value?): SqlBricks.WhereBinary
-  gt(column: string | SqlBricks.SelectStatement, value?): SqlBricks.WhereBinary
-  gte(column: string | SqlBricks.SelectStatement, value?): SqlBricks.WhereBinary
+  eq(column: string | SqlBricks.SelectStatement, value?: any): SqlBricks.WhereBinary
+  equal(column: string | SqlBricks.SelectStatement, value?: any): SqlBricks.WhereBinary
+  notEq(column: string | SqlBricks.SelectStatement, value?: any): SqlBricks.WhereBinary
+  lt(column: string | SqlBricks.SelectStatement, value?: any): SqlBricks.WhereBinary
+  lte(column: string | SqlBricks.SelectStatement, value?: any): SqlBricks.WhereBinary
+  gt(column: string | SqlBricks.SelectStatement, value?: any): SqlBricks.WhereBinary
+  gte(column: string | SqlBricks.SelectStatement, value?: any): SqlBricks.WhereBinary
 
-  eqAll(column: string | SqlBricks.SelectStatement, value?): SqlBricks.WhereBinary
-  notEqAll(column: string | SqlBricks.SelectStatement, value?): SqlBricks.WhereBinary
-  ltAll(column: string | SqlBricks.SelectStatement, value?): SqlBricks.WhereBinary
-  lteAll(column: string | SqlBricks.SelectStatement, value?): SqlBricks.WhereBinary
-  gtAll(column: string | SqlBricks.SelectStatement, value?): SqlBricks.WhereBinary
-  gteAll(column: string | SqlBricks.SelectStatement, value?): SqlBricks.WhereBinary
+  eqAll(column: string | SqlBricks.SelectStatement, value?: any): SqlBricks.WhereBinary
+  notEqAll(column: string | SqlBricks.SelectStatement, value?: any): SqlBricks.WhereBinary
+  ltAll(column: string | SqlBricks.SelectStatement, value?: any): SqlBricks.WhereBinary
+  lteAll(column: string | SqlBricks.SelectStatement, value?: any): SqlBricks.WhereBinary
+  gtAll(column: string | SqlBricks.SelectStatement, value?: any): SqlBricks.WhereBinary
+  gteAll(column: string | SqlBricks.SelectStatement, value?: any): SqlBricks.WhereBinary
 
-  eqAny(column: string | SqlBricks.SelectStatement, value?): SqlBricks.WhereBinary
-  notEqAny(column: string | SqlBricks.SelectStatement, value?): SqlBricks.WhereBinary
-  ltAny(column: string | SqlBricks.SelectStatement, value?): SqlBricks.WhereBinary
-  lteAny(column: string | SqlBricks.SelectStatement, value?): SqlBricks.WhereBinary
-  gtAny(column: string | SqlBricks.SelectStatement, value?): SqlBricks.WhereBinary
-  gteAny(column: string | SqlBricks.SelectStatement, value?): SqlBricks.WhereBinary
+  eqAny(column: string | SqlBricks.SelectStatement, value?: any): SqlBricks.WhereBinary
+  notEqAny(column: string | SqlBricks.SelectStatement, value?: any): SqlBricks.WhereBinary
+  ltAny(column: string | SqlBricks.SelectStatement, value?: any): SqlBricks.WhereBinary
+  lteAny(column: string | SqlBricks.SelectStatement, value?: any): SqlBricks.WhereBinary
+  gtAny(column: string | SqlBricks.SelectStatement, value?: any): SqlBricks.WhereBinary
+  gteAny(column: string | SqlBricks.SelectStatement, value?: any): SqlBricks.WhereBinary
 
-  eqSome(column: string | SqlBricks.SelectStatement, value?): SqlBricks.WhereBinary
-  notEqSome(column: string | SqlBricks.SelectStatement, value?): SqlBricks.WhereBinary
-  ltSome(column: string | SqlBricks.SelectStatement, value?): SqlBricks.WhereBinary
-  lteSome(column: string | SqlBricks.SelectStatement, value?): SqlBricks.WhereBinary
-  gtSome(column: string | SqlBricks.SelectStatement, value?): SqlBricks.WhereBinary
-  gteSome(column: string | SqlBricks.SelectStatement, value?): SqlBricks.WhereBinary
+  eqSome(column: string | SqlBricks.SelectStatement, value?: any): SqlBricks.WhereBinary
+  notEqSome(column: string | SqlBricks.SelectStatement, value?: any): SqlBricks.WhereBinary
+  ltSome(column: string | SqlBricks.SelectStatement, value?: any): SqlBricks.WhereBinary
+  lteSome(column: string | SqlBricks.SelectStatement, value?: any): SqlBricks.WhereBinary
+  gtSome(column: string | SqlBricks.SelectStatement, value?: any): SqlBricks.WhereBinary
+  gteSome(column: string | SqlBricks.SelectStatement, value?: any): SqlBricks.WhereBinary
 }
 
 declare const SqlBricks: SqlBricksFn
diff --git a/types/sql-bricks/sql-bricks-tests.ts b/types/sql-bricks/sql-bricks-tests.ts
index 94014d913d..8a5c7de5d7 100644
--- a/types/sql-bricks/sql-bricks-tests.ts
+++ b/types/sql-bricks/sql-bricks-tests.ts
@@ -6,22 +6,38 @@
 import * as sql from "sql-bricks";
 
 // tslint:disable-next-line:prefer-const
-let assert;
+let assert: any;
 const select = sql.select;
-const insertInto = sql.insertInto, insert = sql.insert,
-  update = sql.update, del = sql.delete;
-const and = sql.and, or = sql.or, like = sql.like, not = sql.not, $in = sql.in,
-  isNull = sql.isNull, isNotNull = sql.isNotNull, equal = sql.equal, eq = sql.eq,
-  notEq = sql.notEq, lt = sql.lt, lte = sql.lte, gt = sql.gt, gte = sql.gte,
-  between = sql.between, exists = sql.exists, eqAny = sql.eqAny, notEqAny = sql.notEqAny;
+const insertInto = sql.insertInto;
+const insert = sql.insert;
+const update = sql.update;
+const del = sql.delete;
+const and = sql.and;
+const or = sql.or;
+const like = sql.like;
+const not = sql.not;
+const $in = sql.in;
+const isNull = sql.isNull;
+const isNotNull = sql.isNotNull;
+const equal = sql.equal;
+const eq = sql.eq;
+const notEq = sql.notEq;
+const lt = sql.lt;
+const lte = sql.lte;
+const gt = sql.gt;
+const gte = sql.gte;
+const between = sql.between;
+const exists = sql.exists;
+const eqAny = sql.eqAny;
+const notEqAny = sql.notEqAny;
 
 const alias_expansions = { usr: 'user', psn: 'person', addr: 'address' };
-const table_to_alias = alias_expansions;
+const table_to_alias: sql.OnCriteria = alias_expansions;
 sql.aliasExpansions(alias_expansions);
 
-sql.joinCriteria(function(left_tbl, left_alias, right_tbl, right_alias) {
-  const criteria = {};
-  criteria[left_alias + '.' + table_to_alias[right_tbl] + '_fk'] = right_alias + '.pk';
+sql.joinCriteria(function(left_tbl: string, left_alias: string, right_tbl: string, right_alias: string) {
+  const criteria: sql.OnCriteria = {};
+  criteria[`${left_alias}.${table_to_alias[right_tbl]}_fk`] = right_alias + '.pk';
   return criteria;
 });
 
@@ -160,7 +176,7 @@ describe('SQL Bricks', function() {
       });
       it('should support user-supplied conversions', function() {
         const orig_bool = sql.conversions.Boolean;
-        sql.conversions.Boolean = function(bool) { return bool ? '1' : '0'; };
+        sql.conversions.Boolean = function(bool: boolean) { return bool ? '1' : '0'; };
         const str = del('user').where('active', false).toString();
         sql.conversions.Boolean = orig_bool;
         assert.equal(str, 'DELETE FROM "user" WHERE active = 0');
@@ -184,7 +200,7 @@ describe('SQL Bricks', function() {
 
     select().from('test').join('psn').join('usr').toString();
     sql.joinCriteria(orig);
-    assert(left_tbls.indexOf('person') > -1 && left_tbls.indexOf('psn') === -1, 'left_tbl is not expanded: [' + left_tbls.join(',') + ']');
+    assert(left_tbls.indexOf('person') > -1 && left_tbls.indexOf('psn') === -1, `left_tbl is not expanded: [ ${left_tbls.join(',')} ]`);
   });
 
   it('should support aliases', function() {
@@ -727,9 +743,9 @@ describe('SQL Bricks', function() {
       it('should support changing the default array handling', function() {
         const proto = sql.select.prototype;
         const orig = proto.where;
-        proto.where = function(criteria) {
+        proto.where = function(criteria: sql.OnCriteria) {
           // return orig.call(this, arraysToOrs(criteria));
-          return orig.call()
+          return orig.call();
         };
 
         check(select().from('table').where({ this: 'test', that: ['test1', 'test2'] }),
@@ -738,15 +754,13 @@ describe('SQL Bricks', function() {
         proto.where = orig;
       });
 
-      function arraysToOrs(criteria) {
+      function arraysToOrs(criteria: sql.WhereObject) {
         const where = and();
         for (const col in criteria) {
           const val = criteria[col];
-          let expr;
-          if (Array.isArray(val))
-            expr = or(val.map(function(val) { return eq(col, val); }));
-          else
-            expr = eq(col, val);
+          let expr: sql.WhereExpression;
+            expr = Array.isArray(val) ? or(val.map(function(val) { return eq(col, val); }))
+              : expr = eq(col, val);
           where.expressions.push(expr);
         }
         return where;
@@ -929,7 +943,7 @@ describe('SQL Bricks', function() {
   });
 });
 
-function describe(...param) { }
-function it(...param) { }
-function check(...param) { }
-function checkParams(...param) { }
+function describe(...param: any[]) { }
+function it(...param: any[]) { }
+function check(...param: any[]) { }
+function checkParams(...param: any[]) { }
diff --git a/types/sql-bricks/tsconfig.json b/types/sql-bricks/tsconfig.json
index 3c5db90a4f..4b321fc911 100644
--- a/types/sql-bricks/tsconfig.json
+++ b/types/sql-bricks/tsconfig.json
@@ -4,7 +4,7 @@
     "lib": [
       "es6"
     ],
-    "noImplicitAny": false,
+    "noImplicitAny": true,
     "noImplicitThis": true,
     "strictNullChecks": true,
     "strictFunctionTypes": true,
diff --git a/types/sql-bricks/tslint.json b/types/sql-bricks/tslint.json
index 1e7260a20f..4ddaadda1f 100644
--- a/types/sql-bricks/tslint.json
+++ b/types/sql-bricks/tslint.json
@@ -2,9 +2,6 @@
   "extends": "dtslint/dt.json",
   "rules": {
     "only-arrow-functions": false,
-    "prefer-template": false,
-    "prefer-conditional-expression": false,
-    "one-variable-per-declaration": false,
     "semicolon":false
   }
 }
\ No newline at end of file

From c6db43bf5edd247e458229e27e75d87ecfcd43e0 Mon Sep 17 00:00:00 2001
From: jphamilton <instantjp@gmail.com>
Date: Thu, 29 Mar 2018 13:19:42 -0500
Subject: [PATCH 0954/1382] Adding xaxis/yaxis options

---
 types/highcharts/highstock.d.ts | 33 ++++++++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/types/highcharts/highstock.d.ts b/types/highcharts/highstock.d.ts
index d2d81af469..5af463d0a2 100644
--- a/types/highcharts/highstock.d.ts
+++ b/types/highcharts/highstock.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Highstock 2.1.5
+// Type definitions for Highstock 2.1.6
 // Project: http://www.highcharts.com/
 
 // Definitions by: David Deutsch <http://github.com/DavidKDeutsch>
@@ -87,12 +87,39 @@ declare namespace Highstock {
         scrollbar?: ScrollbarOptions;
     }
 
+    interface XAxisOptions extends AxisOptions {
+        ordinal?: boolean;  
+        overscroll?: number;  
+    }
+
+    interface YAxisOptions extends AxisOptions {
+        height?: number | string;
+        maxLength?: number | string;
+        minLength?: number | string;
+        resize?: {
+            controlledAxis?: {
+                next?: Array<number | string>;
+                prev?: Array<number | string>;
+            },
+            cursor?: string;
+            enabled?: boolean;
+            lineColor?: string;
+            lineDashStyle?: string;
+            lineWidth?: number;
+            x?: number;
+            y?: number;
+        };
+        reversedStacks?: boolean;
+        tooltipValueFormat?: string;
+        top?: number | string;
+    }
+
     interface Options extends Highcharts.Options {
         navigator?: NavigatorOptions;
         rangeSelector?: RangeSelectorOptions;
         scrollbar?: ScrollbarOptions;
-        xAxis?: AxisOptions[] | AxisOptions;
-        yAxis?: AxisOptions[] | AxisOptions;
+        xAxis?: XAxisOptions[] |XAxisOptions;
+        yAxis?: YAxisOptions[] | YAxisOptions;
     }
 
     interface Chart {

From 4f0d4b66231ff3199b7331f623f23cdc26b727ef Mon Sep 17 00:00:00 2001
From: jphamilton <instantjp@gmail.com>
Date: Thu, 29 Mar 2018 13:30:55 -0500
Subject: [PATCH 0955/1382] fixed lint errors

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

diff --git a/types/highcharts/highstock.d.ts b/types/highcharts/highstock.d.ts
index 5af463d0a2..a97ae9effa 100644
--- a/types/highcharts/highstock.d.ts
+++ b/types/highcharts/highstock.d.ts
@@ -88,8 +88,8 @@ declare namespace Highstock {
     }
 
     interface XAxisOptions extends AxisOptions {
-        ordinal?: boolean;  
-        overscroll?: number;  
+        ordinal?: boolean;
+        overscroll?: number;
     }
 
     interface YAxisOptions extends AxisOptions {

From 95cb5756a15d82ba8c729c3582a63588934deec7 Mon Sep 17 00:00:00 2001
From: Reid Weber <reid@meshstudio.io>
Date: Thu, 29 Mar 2018 12:34:16 -0700
Subject: [PATCH 0956/1382] Removed v24 changes

---
 types/expo/v24/expo-tests.tsx | 1 -
 types/expo/v24/index.d.ts     | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/types/expo/v24/expo-tests.tsx b/types/expo/v24/expo-tests.tsx
index 5ea1758270..8749a5993c 100644
--- a/types/expo/v24/expo-tests.tsx
+++ b/types/expo/v24/expo-tests.tsx
@@ -528,7 +528,6 @@ Permissions.CONTACTS === 'contacts';
 Permissions.NOTIFICATIONS === 'remoteNotifications';
 Permissions.REMOTE_NOTIFICATIONS === 'remoteNotifications';
 Permissions.SYSTEM_BRIGHTNESS === 'systemBrightness';
-Permissions.CALENDAR === 'calendar';
 async () => {
     const result = await Permissions.askAsync(Permissions.CAMERA);
 
diff --git a/types/expo/v24/index.d.ts b/types/expo/v24/index.d.ts
index 376f885073..829e9730a7 100644
--- a/types/expo/v24/index.d.ts
+++ b/types/expo/v24/index.d.ts
@@ -1681,7 +1681,7 @@ export namespace Pedometer {
  */
 export namespace Permissions {
     type PermissionType = 'remoteNotifications' | 'location' |
-        'camera' | 'contacts' | 'audioRecording' | 'calendar';
+        'camera' | 'contacts' | 'audioRecording';
     type PermissionStatus = 'undetermined' | 'granted' | 'denied';
     type PermissionExpires = 'never';
 
@@ -1713,7 +1713,6 @@ export namespace Permissions {
     const NOTIFICATIONS: RemoteNotificationPermission;
     const CONTACTS: 'contacts';
     const SYSTEM_BRIGHTNESS: 'systemBrightness';
-    const CALENDAR: 'calendar';
 }
 
 /**

From 9dbca95dbdf4d9b2ba4b0a5e603d9373eeba1642 Mon Sep 17 00:00:00 2001
From: daniel <daniel.bisch@gmx.de>
Date: Thu, 29 Mar 2018 21:59:19 +0200
Subject: [PATCH 0957/1382] Node-Polyglot: Added method has to interface

---
 types/node-polyglot/index.d.ts             | 2 ++
 types/node-polyglot/node-polyglot-tests.ts | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/types/node-polyglot/index.d.ts b/types/node-polyglot/index.d.ts
index 7587f77640..dac678b7c6 100644
--- a/types/node-polyglot/index.d.ts
+++ b/types/node-polyglot/index.d.ts
@@ -38,6 +38,8 @@ declare class Polyglot {
     locale(): string;
 
     locale(locale: string): void;
+
+    has(phrase: string): boolean;
 }
 
 export = Polyglot;
diff --git a/types/node-polyglot/node-polyglot-tests.ts b/types/node-polyglot/node-polyglot-tests.ts
index bfb18339c0..0c84a3dea1 100644
--- a/types/node-polyglot/node-polyglot-tests.ts
+++ b/types/node-polyglot/node-polyglot-tests.ts
@@ -46,7 +46,10 @@ function translate(): void {
 	polyglot.t("i_like_to_write_in_language", {
 		_: "I like to write in %{language}.",
 		language: "Javascript"
-	});
+  });
+  
+  polyglot.has("hello");
+  polyglot.has("world");
 
 	polyglot.replace({
 		"hello": "hey",

From 7a85f1ee36d7fad06041c1f83a8f57e40bc789fd Mon Sep 17 00:00:00 2001
From: daniel <daniel.bisch@gmx.de>
Date: Thu, 29 Mar 2018 22:02:39 +0200
Subject: [PATCH 0958/1382] Bumped version

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

diff --git a/types/node-polyglot/index.d.ts b/types/node-polyglot/index.d.ts
index dac678b7c6..3133def496 100644
--- a/types/node-polyglot/index.d.ts
+++ b/types/node-polyglot/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for node-polyglot v0.4.1
+// Type definitions for node-polyglot v0.4.2
 // Project: https://github.com/airbnb/polyglot.js
 // Definitions by: Tim Jackson-Kiely <https://github.com/timjk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From 0ebbe5bd157a8aeffdd10eb1dd45cdf796d28060 Mon Sep 17 00:00:00 2001
From: daniel <daniel.bisch@gmx.de>
Date: Thu, 29 Mar 2018 22:13:15 +0200
Subject: [PATCH 0959/1382] Added tabs again

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

diff --git a/types/node-polyglot/node-polyglot-tests.ts b/types/node-polyglot/node-polyglot-tests.ts
index 0c84a3dea1..14efa8ad30 100644
--- a/types/node-polyglot/node-polyglot-tests.ts
+++ b/types/node-polyglot/node-polyglot-tests.ts
@@ -46,10 +46,10 @@ function translate(): void {
 	polyglot.t("i_like_to_write_in_language", {
 		_: "I like to write in %{language}.",
 		language: "Javascript"
-  });
+	});
   
-  polyglot.has("hello");
-  polyglot.has("world");
+	polyglot.has("hello");
+	polyglot.has("world");
 
 	polyglot.replace({
 		"hello": "hey",

From e2d2716e8ca75ef7d17bd1cddc355ab666d47849 Mon Sep 17 00:00:00 2001
From: Feirell <Feirell@users.noreply.github.com>
Date: Thu, 29 Mar 2018 23:07:15 +0200
Subject: [PATCH 0960/1382] [three] added test for PlaneHelper

---
 types/three/test/webgl/webgl_helpers.ts | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/types/three/test/webgl/webgl_helpers.ts b/types/three/test/webgl/webgl_helpers.ts
index 6b955968f4..9033ed5279 100644
--- a/types/three/test/webgl/webgl_helpers.ts
+++ b/types/three/test/webgl/webgl_helpers.ts
@@ -1,3 +1,4 @@
+
 // https://github.com/mrdoob/three.js/blob/master/examples/webgl_helpers.html
 
 () => {
@@ -27,10 +28,14 @@
 
         scene.add(new THREE.PointLightHelper(light, 5));
 
-        var helper = new THREE.GridHelper(200, 10);
-        helper.setColors(0x0000ff, 0x808080);
-        helper.position.y = - 150;
-        scene.add(helper);
+        var gridHelper = new THREE.GridHelper(200, 10);
+        gridHelper.setColors(0x0000ff, 0x808080);
+        gridHelper.position.y = - 150;
+        scene.add(gridHelper);
+
+        var plane = new THREE.Plane(new THREE.Vector3(1, 1, 0.2), 3);
+        var planeHelper = new THREE.PlaneHelper(plane, 1, 0xffff00);
+        scene.add(planeHelper);
 
         var loader = new THREE.JSONLoader();
         loader.load('obj/leeperrysmith/LeePerrySmith.js', function (geometry, materials) {

From cee5dc61ed0e84db7df24130c77b37793b43f338 Mon Sep 17 00:00:00 2001
From: "Matt R. Wilson" <mwilson@shutterstock.com>
Date: Thu, 29 Mar 2018 15:48:36 -0600
Subject: [PATCH 0961/1382] [@types/newrelic] Add startSegment.

---
 types/newrelic/index.d.ts        | 22 +++++++++++++++++++++-
 types/newrelic/newrelic-tests.ts |  6 ++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/types/newrelic/index.d.ts b/types/newrelic/index.d.ts
index 83b6e409dc..f6c54f5a4b 100644
--- a/types/newrelic/index.d.ts
+++ b/types/newrelic/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for newrelic 2.7
+// Type definitions for newrelic 3.3
 // Project: http://github.com/newrelic/node-newrelic
 // Definitions by: Matt R. Wilson <https://github.com/mastermatt>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -147,6 +147,23 @@ declare namespace newrelic {
          */
         getBrowserTimingHeader(): string;
 
+        /**
+         * Instrument a particular method to improve visibility into a transaction,
+         * or optionally turn it into a metric.
+         *
+         * The name defines a name for the segment. This name will be visible in transaction traces and
+         * as a new metric in the New Relic UI.
+         * The record flag defines whether the segment should be recorded as a metric.
+         * The handler is the function you want to track as a segment.
+         * The optional callback is a function passed to the handler to fire after its work is done.
+         *
+         * The agent begins timing the segment when startSegment is called.
+         * The segment is ended when either the handler finishes executing, or callback is fired, if it is provided.
+         * If a promise is returned from the handler, the segment's ending will be tied to that promise resolving or rejecting.
+         */
+        startSegment<T extends PromiseLike<any>>(name: string, record: boolean, handler: T): T;
+        startSegment<T, C extends (...args: any[]) => any>(name: string, record: boolean, handler: (cb?: C) => T, callback?: C): T;
+
         /**
          * Instrument a particular callback to improve visibility into a transaction.
          *
@@ -157,6 +174,9 @@ declare namespace newrelic {
          *
          * The agent begins timing the segment when createTracer is called, and ends the segment when the callback
          * defined by the callback argument finishes executing.
+         *
+         * @deprecated
+         * This method has been deprecated in favor of newrelic.startSegment()
          */
         createTracer<T extends (...args: any[]) => any>(name: string, handle: T): T;
 
diff --git a/types/newrelic/newrelic-tests.ts b/types/newrelic/newrelic-tests.ts
index 73cd53cc78..3f99152c66 100644
--- a/types/newrelic/newrelic-tests.ts
+++ b/types/newrelic/newrelic-tests.ts
@@ -29,6 +29,12 @@ newrelic.addIgnoringRule(/^[0-9]+$/); // $ExpectType void
 
 newrelic.getBrowserTimingHeader(); // $ExpectType string
 
+newrelic.startSegment('foo', false, () => "bar"); // $ExpectType string
+newrelic.startSegment('foo', false, () => "bar", () => "baz"); // $ExpectType string
+newrelic.startSegment('foo', false, Promise.all([5, 7])).then(([a, b]: [number, number]) => {
+    console.log(a, b);
+});
+
 const wrappedFn = newrelic.createTracer("foo", (x: number) => {
     return x * x;
 });

From 646191d20b2f1dc6949752d5d8d1ba67e8e5bf94 Mon Sep 17 00:00:00 2001
From: "Narcisse D. ASSOGBA" <narcisse.adn93@gmail.com>
Date: Thu, 29 Mar 2018 23:04:14 +0100
Subject: [PATCH 0962/1382] Use import sql = require("sql-bricks") syntax for
 the module import

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

diff --git a/types/sql-bricks/sql-bricks-tests.ts b/types/sql-bricks/sql-bricks-tests.ts
index 8a5c7de5d7..effc01eca3 100644
--- a/types/sql-bricks/sql-bricks-tests.ts
+++ b/types/sql-bricks/sql-bricks-tests.ts
@@ -3,7 +3,7 @@
 // taked the 03/29/2018. Some dtslint rules has been deabled to be
 // close as possible of the original js file.
 
-import * as sql from "sql-bricks";
+import sql = require("sql-bricks");
 
 // tslint:disable-next-line:prefer-const
 let assert: any;

From 204e0d396a0bb36c0f1b4b34ad0c939f94bbc273 Mon Sep 17 00:00:00 2001
From: dcharbonnier <d.charbonnier@oxys.net>
Date: Fri, 30 Mar 2018 08:46:12 +0200
Subject: [PATCH 0963/1382] ServerInjectOptions.app is optional

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

diff --git a/types/hapi/index.d.ts b/types/hapi/index.d.ts
index 3628a7a931..25d44b2732 100644
--- a/types/hapi/index.d.ts
+++ b/types/hapi/index.d.ts
@@ -2586,7 +2586,7 @@ export interface ServerInjectOptions extends Shot.RequestOptions {
     /**
      * sets the initial value of request.app, defaults to {}.
      */
-    app: ApplicationState;
+    app?: ApplicationState;
     /**
      * sets the initial value of request.plugins, defaults to {}.
      */

From 7c35bcd4228ca48362b5fcaedf49ec9fd07800a6 Mon Sep 17 00:00:00 2001
From: doomsower <K.Kuznetcov@gmail.com>
Date: Fri, 30 Mar 2018 11:18:04 +0300
Subject: [PATCH 0964/1382] Stronger params for screen

---
 types/react-navigation/index.d.ts             | 91 ++++++++++---------
 .../react-navigation-tests.tsx                |  7 +-
 2 files changed, 52 insertions(+), 46 deletions(-)

diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index 241232227e..88d510134d 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -46,10 +46,10 @@ export interface HeaderProps extends NavigationSceneRendererProps {
   router: NavigationRouter<
     NavigationState,
     NavigationStackScreenOptions
-  >;
+    >;
   getScreenDetails: (navigationScene: NavigationScene) => NavigationScreenDetails<
     NavigationStackScreenOptions
-  >;
+    >;
   style: StyleProp<ViewStyle>;
 }
 
@@ -147,9 +147,9 @@ export interface NavigationRouter<State = NavigationState, Options = {}> {
 export type NavigationScreenOption<T> =
   T
   | ((
-    navigation: NavigationScreenProp<NavigationRoute>,
-    config: T
-  ) => T);
+  navigation: NavigationScreenProp<NavigationRoute>,
+  config: T
+) => T);
 
 export interface NavigationScreenDetails<T> {
   options: T;
@@ -169,26 +169,27 @@ export interface NavigationScreenConfigProps {
 export type NavigationScreenConfig<Options> =
   Options
   | ((navigationOptionsContainer: NavigationScreenConfigProps & {
-      navigationOptions: NavigationScreenProp<NavigationRoute>,
-    }) => Options);
+  navigationOptions: NavigationScreenProp<NavigationRoute>,
+}) => Options);
 
 export type NavigationComponent =
-  NavigationScreenComponent<any, any>
+  NavigationScreenComponent<any, any, any>
   | NavigationNavigator<any, any, any>;
 
 export type NavigationScreenComponent<
-    Options = {},
-    Props = {}
-> = React.ComponentType<NavigationNavigatorProps<Options, NavigationState> & Props> &
-{ navigationOptions?: NavigationScreenConfig<Options> };
+  Params = NavigationParams,
+  Options = {},
+  Props = {}
+  > = React.ComponentType<NavigationScreenProps<Params, Options> & Props> &
+  { navigationOptions?: NavigationScreenConfig<Options> };
 
 export type NavigationNavigator<
-    State = NavigationState,
-    Options = {},
-    Props = {}
-> = React.ComponentType<NavigationNavigatorProps<Options, State> & Props> & {
-    router: NavigationRouter<State, Options>,
-    navigationOptions?: NavigationScreenConfig<Options>,
+  State = NavigationState,
+  Options = {},
+  Props = {}
+  > = React.ComponentType<NavigationNavigatorProps<Options, State> & Props> & {
+  router: NavigationRouter<State, Options>,
+  navigationOptions?: NavigationScreenConfig<Options>,
 };
 
 export interface NavigationParams {
@@ -332,9 +333,9 @@ export type NavigationRouteConfig = NavigationComponent | ({
 } & NavigationScreenRouteConfig);
 
 export type NavigationScreenRouteConfig = NavigationComponent | {
-    screen: NavigationComponent,
+  screen: NavigationComponent,
 } | {
-    getScreen: () => NavigationComponent,
+  getScreen: () => NavigationComponent,
 };
 
 export interface NavigationPathsConfig {
@@ -351,22 +352,22 @@ export interface NavigationTabRouterConfig {
   backBehavior?: 'none' | 'initialRoute'; // defaults `initialRoute`
 }
 export interface TabScene {
-    route: NavigationRoute;
-    focused: boolean;
-    index: number;
-    tintColor?: string;
+  route: NavigationRoute;
+  focused: boolean;
+  index: number;
+  tintColor?: string;
 }
 export interface NavigationTabScreenOptions extends NavigationScreenOptions {
   tabBarIcon?:
     React.ReactElement<any>
     | ((options: { tintColor: (string | null), focused: boolean }) => (React.ReactElement<
-      any
+    any
     > | null));
   tabBarLabel?:
     string
     | React.ReactElement<any>
     | ((options: { tintColor: (string | null), focused: boolean }) => (React.ReactElement<
-      any
+    any
     > | string | null));
   tabBarVisible?: boolean;
   tabBarTestIDProps?: { testID?: string, accessibilityLabel?: string };
@@ -380,13 +381,13 @@ export interface NavigationDrawerScreenOptions extends NavigationScreenOptions {
   drawerIcon?:
     React.ReactElement<any>
     | ((options: { tintColor: (string | null), focused: boolean }) => (React.ReactElement<
-      any
+    any
     > | null));
   drawerLabel?:
     string
     | React.ReactElement<any>
     | ((options: { tintColor: (string | null), focused: boolean }) => (React.ReactElement<
-      any
+    any
     > | null));
 }
 
@@ -402,11 +403,11 @@ export interface NavigationProp<S> {
 }
 
 export type EventType =
-| 'willFocus'
-| 'didFocus'
-| 'willBlur'
-| 'didBlur'
-| 'action';
+  | 'willFocus'
+  | 'didFocus'
+  | 'willBlur'
+  | 'didBlur'
+  | 'action';
 
 export interface NavigationEventPayload {
   type: EventType;
@@ -429,17 +430,17 @@ export interface NavigationScreenProp<S, P = NavigationParams> {
   goBack: (routeKey?: string | null) => boolean;
   navigate(options: {
     routeName: string;
-    params?: P;
+    params?: NavigationParams;
     action?: NavigationAction;
     key?: string;
   }): boolean;
   navigate(
     routeNameOrOptions: string,
-    params?: P,
+    params?: NavigationParams,
     action?: NavigationAction,
   ): boolean;
   getParam: <T extends keyof P>(param: T, fallback?: P[T]) => P[T];
-  setParams: (newParams: NavigationParams) => boolean;
+  setParams: (newParams: P) => boolean;
   addListener: (
     eventName: string,
     callback: NavigationEventCallback
@@ -565,9 +566,9 @@ export interface LayoutEvent {
 }
 
 export type NavigatorType =
-| 'react-navigation/STACK'
-| 'react-navigation/TABS'
-| 'react-navigation/DRAWER';
+  | 'react-navigation/STACK'
+  | 'react-navigation/TABS'
+  | 'react-navigation/DRAWER';
 
 export function addNavigationHelpers<S = {}>(
   navigation: {
@@ -592,7 +593,7 @@ export interface NavigationContainerProps {
 
 export interface NavigationContainer extends React.ComponentClass<
   NavigationContainerProps & NavigationNavigatorProps<any>
-> {
+  > {
   router: NavigationRouter<any, any>;
   screenProps: { [key: string]: any };
   navigationOptions: any;
@@ -657,7 +658,7 @@ export function DrawerNavigator(
  * Tab Navigator
  */
 
-// From views/TabView/TabView.js
+  // From views/TabView/TabView.js
 export interface TabViewConfig {
   tabBarComponent?: React.ReactType;
   tabBarPosition?: 'top' | 'bottom';
@@ -806,7 +807,7 @@ export interface TransitionerState {
 export class Transitioner extends React.Component<
   TransitionerProps,
   TransitionerState
-> { }
+  > { }
 
 /**
  * Tab Router
@@ -859,10 +860,10 @@ export function createNavigationContainer(
  * BEGIN CUSTOM CONVENIENCE INTERFACES
  */
 
-export interface NavigationScreenProps<Params = NavigationParams> {
-  navigation: NavigationScreenProp<NavigationRoute<Params>>;
+export interface NavigationScreenProps<Params = NavigationParams, Options = any> {
+  navigation: NavigationScreenProp<NavigationRoute<Params>, Params>;
   screenProps?: { [key: string]: any };
-  navigationOptions?: NavigationScreenConfig<any>;
+  navigationOptions?: NavigationScreenConfig<Options>;
 }
 
 /**
diff --git a/types/react-navigation/react-navigation-tests.tsx b/types/react-navigation/react-navigation-tests.tsx
index d70bca3ecd..7e956d2c1a 100644
--- a/types/react-navigation/react-navigation-tests.tsx
+++ b/types/react-navigation/react-navigation-tests.tsx
@@ -134,7 +134,12 @@ export const AppNavigator = StackNavigator(
     },
 );
 
-const StatelessScreen: NavigationScreenComponent = () => <View />;
+interface StatelessScreenParams {
+    testID: string;
+}
+
+const StatelessScreen: NavigationScreenComponent<StatelessScreenParams> = (props) =>
+    <View testID={props.navigation.getParam('testID', 'fallback')}/>;
 
 StatelessScreen.navigationOptions = { title: 'Stateless' };
 

From 405c4937e623259c7093a193d4ae997a04363873 Mon Sep 17 00:00:00 2001
From: Christian Johansen <Christian.Johansen@ucr.uu.se>
Date: Fri, 30 Mar 2018 10:20:06 +0200
Subject: [PATCH 0965/1382] Changed react-beautiful-dnd ZIndex type to
 React.CSSProperties['z-Index'] instead of number | String

---
 types/react-beautiful-dnd/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/react-beautiful-dnd/index.d.ts b/types/react-beautiful-dnd/index.d.ts
index d02c86bbcf..9f49eb5e96 100644
--- a/types/react-beautiful-dnd/index.d.ts
+++ b/types/react-beautiful-dnd/index.d.ts
@@ -12,7 +12,7 @@ export type Id = string;
 export type DraggableId = Id;
 export type DroppableId = Id;
 export type TypeId = Id;
-export type ZIndex = number | string;
+export type ZIndex = React.CSSProperties['z-Index'];
 export type DropReason = 'DROP' | 'CANCEL';
 export type Announce = (message: string) => void;
 

From 5575ff4dc1776255b373258b777489e455993475 Mon Sep 17 00:00:00 2001
From: doomsower <K.Kuznetcov@gmail.com>
Date: Fri, 30 Mar 2018 11:34:29 +0300
Subject: [PATCH 0966/1382] Fix whitespaces

---
 types/react-navigation/index.d.ts | 78 +++++++++++++++----------------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index 88d510134d..f86a47ccf5 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -46,10 +46,10 @@ export interface HeaderProps extends NavigationSceneRendererProps {
   router: NavigationRouter<
     NavigationState,
     NavigationStackScreenOptions
-    >;
+  >;
   getScreenDetails: (navigationScene: NavigationScene) => NavigationScreenDetails<
     NavigationStackScreenOptions
-    >;
+  >;
   style: StyleProp<ViewStyle>;
 }
 
@@ -147,9 +147,9 @@ export interface NavigationRouter<State = NavigationState, Options = {}> {
 export type NavigationScreenOption<T> =
   T
   | ((
-  navigation: NavigationScreenProp<NavigationRoute>,
-  config: T
-) => T);
+    navigation: NavigationScreenProp<NavigationRoute>,
+    config: T
+  ) => T);
 
 export interface NavigationScreenDetails<T> {
   options: T;
@@ -169,27 +169,27 @@ export interface NavigationScreenConfigProps {
 export type NavigationScreenConfig<Options> =
   Options
   | ((navigationOptionsContainer: NavigationScreenConfigProps & {
-  navigationOptions: NavigationScreenProp<NavigationRoute>,
-}) => Options);
+      navigationOptions: NavigationScreenProp<NavigationRoute>,
+    }) => Options);
 
 export type NavigationComponent =
   NavigationScreenComponent<any, any, any>
   | NavigationNavigator<any, any, any>;
 
 export type NavigationScreenComponent<
-  Params = NavigationParams,
-  Options = {},
-  Props = {}
-  > = React.ComponentType<NavigationScreenProps<Params, Options> & Props> &
-  { navigationOptions?: NavigationScreenConfig<Options> };
+    Params = NavigationParams,
+    Options = {},
+    Props = {}
+> = React.ComponentType<NavigationScreenProps<Params, Options> & Props> &
+{ navigationOptions?: NavigationScreenConfig<Options> };
 
 export type NavigationNavigator<
-  State = NavigationState,
-  Options = {},
-  Props = {}
-  > = React.ComponentType<NavigationNavigatorProps<Options, State> & Props> & {
-  router: NavigationRouter<State, Options>,
-  navigationOptions?: NavigationScreenConfig<Options>,
+    State = NavigationState,
+    Options = {},
+    Props = {}
+> = React.ComponentType<NavigationNavigatorProps<Options, State> & Props> & {
+    router: NavigationRouter<State, Options>,
+    navigationOptions?: NavigationScreenConfig<Options>,
 };
 
 export interface NavigationParams {
@@ -333,9 +333,9 @@ export type NavigationRouteConfig = NavigationComponent | ({
 } & NavigationScreenRouteConfig);
 
 export type NavigationScreenRouteConfig = NavigationComponent | {
-  screen: NavigationComponent,
+    screen: NavigationComponent,
 } | {
-  getScreen: () => NavigationComponent,
+    getScreen: () => NavigationComponent,
 };
 
 export interface NavigationPathsConfig {
@@ -352,22 +352,22 @@ export interface NavigationTabRouterConfig {
   backBehavior?: 'none' | 'initialRoute'; // defaults `initialRoute`
 }
 export interface TabScene {
-  route: NavigationRoute;
-  focused: boolean;
-  index: number;
-  tintColor?: string;
+    route: NavigationRoute;
+    focused: boolean;
+    index: number;
+    tintColor?: string;
 }
 export interface NavigationTabScreenOptions extends NavigationScreenOptions {
   tabBarIcon?:
     React.ReactElement<any>
     | ((options: { tintColor: (string | null), focused: boolean }) => (React.ReactElement<
-    any
+      any
     > | null));
   tabBarLabel?:
     string
     | React.ReactElement<any>
     | ((options: { tintColor: (string | null), focused: boolean }) => (React.ReactElement<
-    any
+      any
     > | string | null));
   tabBarVisible?: boolean;
   tabBarTestIDProps?: { testID?: string, accessibilityLabel?: string };
@@ -381,13 +381,13 @@ export interface NavigationDrawerScreenOptions extends NavigationScreenOptions {
   drawerIcon?:
     React.ReactElement<any>
     | ((options: { tintColor: (string | null), focused: boolean }) => (React.ReactElement<
-    any
+      any
     > | null));
   drawerLabel?:
     string
     | React.ReactElement<any>
     | ((options: { tintColor: (string | null), focused: boolean }) => (React.ReactElement<
-    any
+      any
     > | null));
 }
 
@@ -403,11 +403,11 @@ export interface NavigationProp<S> {
 }
 
 export type EventType =
-  | 'willFocus'
-  | 'didFocus'
-  | 'willBlur'
-  | 'didBlur'
-  | 'action';
+| 'willFocus'
+| 'didFocus'
+| 'willBlur'
+| 'didBlur'
+| 'action';
 
 export interface NavigationEventPayload {
   type: EventType;
@@ -566,9 +566,9 @@ export interface LayoutEvent {
 }
 
 export type NavigatorType =
-  | 'react-navigation/STACK'
-  | 'react-navigation/TABS'
-  | 'react-navigation/DRAWER';
+| 'react-navigation/STACK'
+| 'react-navigation/TABS'
+| 'react-navigation/DRAWER';
 
 export function addNavigationHelpers<S = {}>(
   navigation: {
@@ -593,7 +593,7 @@ export interface NavigationContainerProps {
 
 export interface NavigationContainer extends React.ComponentClass<
   NavigationContainerProps & NavigationNavigatorProps<any>
-  > {
+> {
   router: NavigationRouter<any, any>;
   screenProps: { [key: string]: any };
   navigationOptions: any;
@@ -658,7 +658,7 @@ export function DrawerNavigator(
  * Tab Navigator
  */
 
-  // From views/TabView/TabView.js
+// From views/TabView/TabView.js
 export interface TabViewConfig {
   tabBarComponent?: React.ReactType;
   tabBarPosition?: 'top' | 'bottom';
@@ -807,7 +807,7 @@ export interface TransitionerState {
 export class Transitioner extends React.Component<
   TransitionerProps,
   TransitionerState
-  > { }
+> { }
 
 /**
  * Tab Router

From 8444f10ce33c5f982349a2a4dbfa425d251e10d2 Mon Sep 17 00:00:00 2001
From: Kagami Sascha Rosylight <saschanaz@outlook.com>
Date: Fri, 30 Mar 2018 17:36:01 +0900
Subject: [PATCH 0967/1382] export as namespace jsyaml

---
 types/js-yaml/index.d.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/types/js-yaml/index.d.ts b/types/js-yaml/index.d.ts
index 5cd852ab3f..da2d2a36c8 100644
--- a/types/js-yaml/index.d.ts
+++ b/types/js-yaml/index.d.ts
@@ -4,6 +4,8 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
+export as namespace jsyaml;
+
 export type DocumentLoadResult = object | undefined;
 
 export function safeLoad(str: string, opts?: LoadOptions): DocumentLoadResult;

From 9b625f89758eedb929d149d4b3b626d37b65d5f9 Mon Sep 17 00:00:00 2001
From: JeyongOh <jeyong.oh@oshare.kr>
Date: Fri, 30 Mar 2018 19:16:54 +0900
Subject: [PATCH 0968/1382] Change 'promiseTypeSeparator' to
 'promiseTypeDelimiter'

---
 types/redux-promise-middleware/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/redux-promise-middleware/index.d.ts b/types/redux-promise-middleware/index.d.ts
index 1317f65ae2..70eea32baa 100644
--- a/types/redux-promise-middleware/index.d.ts
+++ b/types/redux-promise-middleware/index.d.ts
@@ -5,4 +5,4 @@
 
 import { Middleware } from 'redux';
 
-export default function promiseMiddleware(config?: { promiseTypeSuffixes?: string[], promiseTypeSeparator?: string }): Middleware;
+export default function promiseMiddleware(config?: { promiseTypeSuffixes?: string[], promiseTypeDelimiter?: string }): Middleware;

From 5c53d6ce4e7b32f0a524826904f11bdfee52832b Mon Sep 17 00:00:00 2001
From: Egor Shulga <egorshulga@outlook.com>
Date: Fri, 30 Mar 2018 16:15:53 +0300
Subject: [PATCH 0969/1382] Remove rrule package

---
 notNeededPackages.json       |   6 ++
 types/rrule/index.d.ts       | 185 -----------------------------------
 types/rrule/test/commonJs.ts |   2 -
 types/rrule/test/global.ts   |   1 -
 types/rrule/test/rrule.ts    |  62 ------------
 types/rrule/tsconfig.json    |  25 -----
 types/rrule/tslint.json      |   9 --
 7 files changed, 6 insertions(+), 284 deletions(-)
 delete mode 100644 types/rrule/index.d.ts
 delete mode 100644 types/rrule/test/commonJs.ts
 delete mode 100644 types/rrule/test/global.ts
 delete mode 100644 types/rrule/test/rrule.ts
 delete mode 100644 types/rrule/tsconfig.json
 delete mode 100644 types/rrule/tslint.json

diff --git a/notNeededPackages.json b/notNeededPackages.json
index 5c649d2368..cbfcc651a1 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -1272,6 +1272,12 @@
             "sourceRepoURL": "https://github.com/router5/router5",
             "asOfVersion": "5.0.0"
         },
+        {
+            "libraryName": "rrule",
+            "typingsPackageName": "rrule",
+            "sourceRepoURL": "https://github.com/jakubroztocil/rrule",
+            "asOfVersion": "2.2.9"
+        },
         {
             "libraryName": "rvo2",
             "typingsPackageName": "rvo2",
diff --git a/types/rrule/index.d.ts b/types/rrule/index.d.ts
deleted file mode 100644
index f13aefb9c9..0000000000
--- a/types/rrule/index.d.ts
+++ /dev/null
@@ -1,185 +0,0 @@
-// Type definitions for rrule 2.1
-// Project: https://github.com/jkbrzt/rrule
-// Definitions by: James Bracy <https://github.com/waratuman>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export as namespace RRule;
-
-/**
- * Use `import rrule = require("rrule")` for AMD and `import { RRule } from "rrule"` for CommonJS loading.
- */
-export = RRule;
-
-// For CommonJS it must be imported as `require("rrule").RRule`.
-import RRuleAlias = RRule;
-declare module "rrule" {
-    type RRule = RRuleAlias;
-    const RRule: typeof RRuleAlias;
-}
-
-declare namespace RRule {
-    /**
-     * see <http://labix.org/python-dateutil/#head-cf004ee9a75592797e076752b2a889c10f445418>
-     * The only required option is `freq`, one of RRule.YEARLY, RRule.MONTHLY, ...
-     */
-    interface Options {
-        freq: RRule.Frequency;
-        dtstart?: Date;
-        interval?: number;
-        wkst?: number | Weekday;
-        count?: number;
-        until?: Date;
-        bysetpos?: number | number[];
-        bymonth?: number | number[];
-        bymonthday?: number | number[];
-        byyearday?: number | number[];
-        byweekno?: number | number[];
-        byweekday?: Weekday | Weekday[] | number | number[];
-        byhour?: number | number[];
-        byminute?: number | number[];
-        bysecond?: number | number[];
-    }
-
-    class Weekday {
-        constructor(weekday: number, n: number);
-
-        nth(n: number): Weekday;
-
-        equals(other: Weekday): boolean;
-
-        toString(): string;
-
-        getJsWeekday(): number;
-    }
-}
-
-declare class RRule {
-    /**
-     * @param options - see <http://labix.org/python-dateutil/#head-cf004ee9a75592797e076752b2a889c10f445418>
-     *        The only required option is `freq`, one of RRule.YEARLY, RRule.MONTHLY, ...
-     */
-    constructor(options: RRule.Options, noCache?: boolean);
-
-    options: RRule.Options;
-
-    origOptions: RRule.Options;
-
-    /**
-     * Returns the first recurrence after the given datetime instance.
-     * The inc keyword defines what happens if dt is an occurrence.
-     * With inc == True, if dt itself is an occurrence, it will be returned.
-     * @return Date or null
-     */
-    after(dt: Date, inc?: boolean): Date;
-
-    /**
-     * @param iterator - optional function that will be called
-     *                   on each date that is added. It can return false
-     *                   to stop the iteration.
-     * @return Array containing all recurrences.
-     */
-    all(iterator?: (date: Date, index?: number) => void): Date[];
-
-    /**
-     * Returns all the occurrences of the rrule between after and before.
-     * The inc keyword defines what happens if after and/or before are
-     * themselves occurrences. With inc == True, they will be included in the
-     * list, if they are found in the recurrence set.
-     * @return Array
-     */
-    between(a: Date, b: Date, inc?: boolean, iterator?: (date: Date, index: number) => void): Date[];
-
-    /**
-     * Returns the last recurrence before the given datetime instance.
-     * The inc keyword defines what happens if dt is an occurrence.
-     * With inc == True, if dt itself is an occurrence, it will be returned.
-     * @return Date or null
-     */
-    before(dt: Date, inc?: boolean): Date;
-
-    /**
-     * Returns the number of recurrences in this set. It will have go trough
-     * the whole recurrence, if this hasn't been done before.
-     */
-    count(): number;
-
-    /**
-     * Converts the rrule into its string representation
-     * @see <http://www.ietf.org/rfc/rfc2445.txt>
-     * @return String
-     */
-    toString(): string;
-
-    /**
-     * Will convert all rules described in nlp:ToText
-     * to text.
-     */
-    toText(gettext?: (str: string) => string, language?: any): string;
-
-    isFullyConvertibleToText(): boolean;
-
-    clone(): RRule;
-}
-
-declare namespace RRule {
-    const FREQUENCIES: "YEARLY" | "MONTHLY" | "WEEKLY" | "DAILY" | "HOURLY" | "MINUTELY" | "SECONDLY";
-
-    enum Frequency {
-        YEARLY      = 0,
-        MONTHLY     = 1,
-        WEEKLY      = 2,
-        DAILY       = 3,
-        HOURLY      = 4,
-        MINUTELY    = 5,
-        SECONDLY    = 6
-    }
-
-    const YEARLY: Frequency;
-    const MONTHLY: Frequency;
-    const WEEKLY: Frequency;
-    const DAILY: Frequency;
-    const HOURLY: Frequency;
-    const MINUTELY: Frequency;
-    const SECONDLY: Frequency;
-
-    const MO: Weekday;
-    const TU: Weekday;
-    const WE: Weekday;
-    const TH: Weekday;
-    const FR: Weekday;
-    const SA: Weekday;
-    const SU: Weekday;
-
-    const DEFAULT_OPTIONS: RRule.Options;
-
-    function parseText(text: string, language?: any): RRule.Options;
-
-    function fromText(text: string, language?: any): RRule;
-
-    function optionsToString(options: RRule.Options): string;
-
-    function parseString(rfcString: string): RRule.Options;
-
-    function fromString(value: string): RRule;
-
-    class RRuleSet extends RRule {
-      /**
-       * @param noCache  The same stratagy as RRule on cache, default to false
-       */
-      constructor(noCache?: boolean);
-      rrule(rrule: RRule): void;
-      rdate(date: Date): void;
-      exrule(rrule: RRule): void;
-      exdate(date: Date): void;
-      valueOf(): string[];
-      /**
-       * to generate recurrence field sush as:
-       *   ["RRULE:FREQ=YEARLY;COUNT=2;BYDAY=TU;DTSTART=19970902T010000Z","RRULE:FREQ=YEARLY;COUNT=1;BYDAY=TH;DTSTART=19970902T010000Z"]
-       */
-      toString(): string;
-      /**
-       * Create a new RRuleSet Object completely base on current instance
-       */
-      clone(): RRuleSet;
-    }
-}
diff --git a/types/rrule/test/commonJs.ts b/types/rrule/test/commonJs.ts
deleted file mode 100644
index f193febe91..0000000000
--- a/types/rrule/test/commonJs.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import { RRule } from "rrule";
-const rule: RRule = new RRule({ freq: RRule.WEEKLY });
diff --git a/types/rrule/test/global.ts b/types/rrule/test/global.ts
deleted file mode 100644
index 869d407e98..0000000000
--- a/types/rrule/test/global.ts
+++ /dev/null
@@ -1 +0,0 @@
-let rule: RRule = new RRule({ freq: RRule.WEEKLY });
diff --git a/types/rrule/test/rrule.ts b/types/rrule/test/rrule.ts
deleted file mode 100644
index c455fa40d1..0000000000
--- a/types/rrule/test/rrule.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import RRule = require('rrule');
-
-// Create a rule:
-let rule: RRule = new RRule({
-    freq: RRule.WEEKLY,
-    interval: 5,
-    byweekday: [RRule.MO, RRule.FR],
-    dtstart: new Date(2012, 1, 1, 10, 30),
-    until: new Date(2012, 12, 31)
-});
-
-let x: Date[];
-const y: string[] = [];
-
-// Get all occurrence dates (Date instances):
-x = rule.all();
-
-// Get a slice:
-x = rule.between(new Date(2012, 7, 1), new Date(2012, 8, 1));
-
-// Get an iCalendar RRULE string representation:
-// The output can be used with RRule.fromString().
-y.push(rule.toString());
-
-// Get a human-friendly text representation:
-// The output can be used with RRule.fromText().
-y.push(rule.toText());
-
-// Get full a string representation of all options,
-// including the default and inferred ones.
-y.push(RRule.optionsToString(rule.options));
-
-// Cherry-pick only some options from an rrule:
-y.push(RRule.optionsToString({
-    freq: rule.options.freq,
-    dtstart: rule.options.dtstart,
-}));
-
-rule = RRule.fromString("FREQ=WEEKLY;DTSTART=20120201T093000Z");
-
-// This is equivalent
-rule = new RRule(RRule.parseString("FREQ=WEEKLY;DTSTART=20120201T093000Z"));
-
-let options = RRule.parseString('FREQ=DAILY;INTERVAL=6');
-options.dtstart = new Date(2000, 1, 1);
-rule = new RRule(options);
-
-rule = new RRule({
-  freq: RRule.WEEKLY,
-  count: 23
-});
-y.push(rule.toText());
-
-rule = RRule.fromText('every day for 3 times');
-
-options = RRule.parseText('every day for 3 times');
-// {freq: 3, count: "3"}
-options.dtstart = new Date(2000, 1, 1);
-rule = new RRule(options);
-
-// Test arrays
-const multipleInstance = new RRule({freq: 3, byhour: [6, 12, 18]});
diff --git a/types/rrule/tsconfig.json b/types/rrule/tsconfig.json
deleted file mode 100644
index 3e64a1d17a..0000000000
--- a/types/rrule/tsconfig.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "test/rrule.ts",
-        "test/commonJs.ts",
-        "test/global.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/rrule/tslint.json b/types/rrule/tslint.json
deleted file mode 100644
index 96de5e929b..0000000000
--- a/types/rrule/tslint.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"extends": "dtslint/dt.json",
-	"rules": {
-		// TODOs
-        "no-declare-current-package": false,
-		"no-mergeable-namespace": false,
-		"no-unnecessary-qualifier": false
-	}
-}

From d10703cbcad006706a75d8f26c0a4dcca7241e22 Mon Sep 17 00:00:00 2001
From: Matt Gibbs <matt.gibbs@microfocus.com>
Date: Fri, 30 Mar 2018 09:41:29 -0400
Subject: [PATCH 0970/1382] Add dom lib to tsconfig

Some examples are using `document`
---
 types/plupload/tsconfig.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/plupload/tsconfig.json b/types/plupload/tsconfig.json
index fc46738339..d7dc70a3bd 100644
--- a/types/plupload/tsconfig.json
+++ b/types/plupload/tsconfig.json
@@ -2,7 +2,8 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es6"
+            "es6",
+            "dom"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,

From fe9fd3e5ec1f018b0b24c250bd0fef1b7bfcd695 Mon Sep 17 00:00:00 2001
From: Matt Gibbs <matt.gibbs@microfocus.com>
Date: Fri, 30 Mar 2018 09:42:43 -0400
Subject: [PATCH 0971/1382] Disable "noImplicitAny" on plupload tests

Defining the uploader constructor:

static Uploader(settings: plupload_settings): void;

makes it always return an "any" type.  Unless this is expanded out, you
can't use the noImplicitAny option.
---
 types/plupload/tsconfig.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/plupload/tsconfig.json b/types/plupload/tsconfig.json
index d7dc70a3bd..ae69b36956 100644
--- a/types/plupload/tsconfig.json
+++ b/types/plupload/tsconfig.json
@@ -5,7 +5,7 @@
             "es6",
             "dom"
         ],
-        "noImplicitAny": true,
+        "noImplicitAny": false,
         "noImplicitThis": true,
         "strictNullChecks": false,
         "strictFunctionTypes": true,

From 0296b85f4d4f8c23b3f2fa23d91af74be9f0d47a Mon Sep 17 00:00:00 2001
From: Matt Gibbs <matt.gibbs@microfocus.com>
Date: Fri, 30 Mar 2018 09:43:26 -0400
Subject: [PATCH 0972/1382] Adding test case from plupload README

---
 types/plupload/plupload-tests.ts | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/types/plupload/plupload-tests.ts b/types/plupload/plupload-tests.ts
index e69de29bb2..54f8b27a70 100644
--- a/types/plupload/plupload-tests.ts
+++ b/types/plupload/plupload-tests.ts
@@ -0,0 +1,26 @@
+import 'plupload';
+
+{
+    const uploader = new plupload.Uploader({
+        browse_button: 'browse', // this can be an id of a DOM element or the DOM element itself
+        url: 'upload.php'
+    });
+
+    uploader.init();
+    uploader.start();
+
+
+    uploader.bind('FilesAdded', function (up: any, files: any) {
+        var html = '';
+        plupload.each(files, function (file: any) {
+            html += '<li id="' + file.id + '">' + file.name + ' (' + plupload.formatSize(file.size) + ') <b></b></li>';
+        });
+        document.getElementById('filelist').innerHTML += html;
+    });
+
+    uploader.bind('Error', function (up: any, err: any) {
+        document.getElementById('console').innerHTML += "\nError #" + err.code + ": " + err.message;
+    });
+
+}
+

From 83256df922861d309f0b25644397dd5af427c14f Mon Sep 17 00:00:00 2001
From: Matt Gibbs <matt.gibbs@microfocus.com>
Date: Fri, 30 Mar 2018 09:44:17 -0400
Subject: [PATCH 0973/1382] Add settings test

---
 types/plupload/plupload-tests.ts | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/types/plupload/plupload-tests.ts b/types/plupload/plupload-tests.ts
index 54f8b27a70..b03cc458ff 100644
--- a/types/plupload/plupload-tests.ts
+++ b/types/plupload/plupload-tests.ts
@@ -24,3 +24,26 @@ import 'plupload';
 
 }
 
+{
+    const settings: plupload_settings = {
+        runtimes: 'html5',
+        browse_button: '#button',
+        container: '#container',
+        chunk_size: '1mb',
+        url: 'https://fakesite.com/upload',
+        flash_swf_url: './plupload.flash.swf',
+        silverlight_xap_url: '/Scripts/plupload/js/plupload.silverlight.xap',
+        filters:
+            {
+                max_file_size: '50mb',
+                mime_types: [{ title: 'title', extensions: '*' }]
+            },
+        init: {
+            Error: function (up, args) {
+            }
+        }
+    };
+
+    const uploader = new plupload.Uploader(settings);
+    uploader.init();
+}

From 3c89c85cdf0c54daeca57784e47b28e7de3123af Mon Sep 17 00:00:00 2001
From: Matt Gibbs <matt.gibbs@microfocus.com>
Date: Fri, 30 Mar 2018 09:44:45 -0400
Subject: [PATCH 0974/1382] Add typings for plupload static utility methods

---
 types/plupload/index.d.ts | 269 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 264 insertions(+), 5 deletions(-)

diff --git a/types/plupload/index.d.ts b/types/plupload/index.d.ts
index 614ba27261..a70423533d 100644
--- a/types/plupload/index.d.ts
+++ b/types/plupload/index.d.ts
@@ -18,7 +18,7 @@ interface plupload_settings {
     multipart_params?: any;
 
     /** Chunk */
-    chunk_size?: number|string;
+    chunk_size?: number | string;
 
     /** Client-Side Image Resize */
     resize?: plupload_resize;
@@ -28,7 +28,7 @@ interface plupload_settings {
 
     /** Useful Options */
     multi_selection?: boolean;
-    required_features?: string|any;
+    required_features?: string | any;
     unique_names?: boolean;
 
     /** Optional */
@@ -44,7 +44,7 @@ interface plupload_settings {
 
 interface plupload_filters {
     mime_types?: plupload_filters_mime_types[];
-    max_file_size?: number|string;
+    max_file_size?: number | string;
     prevent_duplicates?: boolean;
 }
 
@@ -138,7 +138,7 @@ interface plupload_error extends plupload_response {
 }
 
 declare class plupload {
-    static Uploader(settings: plupload_settings):void;
+    static Uploader(settings: plupload_settings): void;
 
     static VERSION: string;
 
@@ -178,7 +178,7 @@ declare class plupload {
 
     /** Methods */
     init(): any;
-    setOption(option: string|any, value?: any): any;
+    setOption(option: string | any, value?: any): any;
     getOption(option?: string): any;
     refresh(): any;
     start(): any;
@@ -194,4 +194,263 @@ declare class plupload {
     unbind(name: string, func: any): any;
     unbindAll(): any;
     destroy(): any;
+
+    /** Utility methods **/
+
+    /**
+     * Executes the callback function for each item in array/object. If you return false in the
+     * callback it will break the loop.
+     *
+     * @method each
+     * @static
+     * @param {Object} obj Object to iterate.
+     * @param {function} callback Callback function to execute for each item.
+     */
+    static each(obj: Object, callback: Function): void;
+
+    /**
+     * Returns the absolute x, y position of an Element. The position will be returned in a object with x, y fields.
+     *
+     * @method getPos
+     * @static
+     * @param {Element} node HTML element or element id to get x, y position from.
+     * @param {Element} root Optional root element to stop calculations at.
+     * @return {object} Absolute position of the specified element object with x, y fields.
+     */
+    static getPos(node: Element, root: Element): Object;
+
+    /**
+     * Returns the size of the specified node in pixels.
+     *
+     * @method getSize
+     * @static
+     * @param {Node} node Node to get the size of.
+     * @return {Object} Object with a w and h property.
+     */
+    static getSize(node: Node): Object;
+
+    /**
+     * Encodes the specified string.
+     *
+     * @method xmlEncode
+     * @static
+     * @param {String} s String to encode.
+     * @return {String} Encoded string.
+     */
+    static xmlEncode(str: string): string;
+
+    /**
+     * Forces anything into an array.
+     *
+     * @method toArray
+     * @static
+     * @param {Object} obj Object with length field.
+     * @return {Array} Array object containing all items.
+     */
+    static toArray(obj: Object): Array<any>;
+
+    /**
+     * Find an element in array and return its index if present, otherwise return -1.
+     *
+     * @method inArray
+     * @static
+     * @param {mixed} needle Element to find
+     * @param {Array} array
+     * @return {Int} Index of the element, or -1 if not found
+     */
+    static inArray(needle: any, array: Array<any>): number;
+
+    /**
+    Recieve an array of functions (usually async) to call in sequence, each  function
+    receives a callback as first argument that it should call, when it completes. Finally,
+    after everything is complete, main callback is called. Passing truthy value to the
+    callback as a first argument will interrupt the sequence and invoke main callback
+    immediately.
+    @method inSeries
+    @static
+    @param {Array} queue Array of functions to call in sequence
+    @param {Function} cb Main callback that is called in the end, or in case of error
+    */
+    static inSeries(queue: Array<any>, callback: Function): void;
+
+    /**
+     * Extends the language pack object with new items.
+     *
+     * @method addI18n
+     * @static
+     * @param {Object} pack Language pack items to add.
+     * @return {Object} Extended language pack object.
+     */
+    static addI18n(pack: Object): Object;
+
+    /**
+     * Translates the specified string by checking for the english string in the language pack lookup.
+     *
+     * @method translate
+     * @static
+     * @param {String} str String to look for.
+     * @return {String} Translated string or the input string if it wasn't found.
+     */
+    static translate(str: string): string;
+
+    /**
+     * Pseudo sprintf implementation - simple way to replace tokens with specified values.
+     *
+     * @param {String} str String with tokens
+     * @return {String} String with replaced tokens
+     */
+    static sprintf(str: string): string;
+
+    /**
+     * Checks if object is empty.
+     *
+     * @method isEmptyObj
+     * @static
+     * @param {Object} obj Object to check.
+     * @return {Boolean}
+     */
+    static isEmptyObj(obj: Object): boolean;
+
+    /**
+     * Checks if specified DOM element has specified class.
+     *
+     * @method hasClass
+     * @static
+     * @param {Object} obj DOM element like object to add handler to.
+     * @param {String} name Class name
+     */
+    static hasClass(obj: Object, name: string): any;
+
+    /**
+     * Adds specified className to specified DOM element.
+     *
+     * @method addClass
+     * @static
+     * @param {Object} obj DOM element like object to add handler to.
+     * @param {String} name Class name
+     */
+    static addClass(obj: Object, name: string): any;
+
+    /**
+     * Removes specified className from specified DOM element.
+     *
+     * @method removeClass
+     * @static
+     * @param {Object} obj DOM element like object to add handler to.
+     * @param {String} name Class name
+     */
+    static removeClass(obj: Object, name: string): any;
+
+    /**
+     * Returns a given computed style of a DOM element.
+     *
+     * @method getStyle
+     * @static
+     * @param {Object} obj DOM element like object.
+     * @param {String} name Style you want to get from the DOM element
+     */
+    static getStyle(obj: Object, name: string): any;
+
+    /**
+     * Adds an event handler to the specified object and store reference to the handler
+     * in objects internal Plupload registry (@see removeEvent).
+     *
+     * @method addEvent
+     * @static
+     * @param {Object} obj DOM element like object to add handler to.
+     * @param {String} name Name to add event listener to.
+     * @param {Function} callback Function to call when event occurs.
+     * @param {String} (optional) key that might be used to add specifity to the event record.
+     */
+    static addEvent(obj: Object, name: string, callback: Function, key?: string);
+
+    /**
+     * Remove event handler from the specified object. If third argument (callback)
+     * is not specified remove all events with the specified name.
+     *
+     * @method removeEvent
+     * @static
+     * @param {Object} obj DOM element to remove event listener(s) from.
+     * @param {String} name Name of event listener to remove.
+     * @param {Function|String} (optional) might be a callback or unique key to match.
+     */
+    static removeEvent(obj: Object, name: string, optional?: Function | string);
+
+    /**
+     * Remove all kind of events from the specified object
+     *
+     * @method removeAllEvents
+     * @static
+     * @param {Object} obj DOM element to remove event listeners from.
+     * @param {String} (optional) unique key to match, when removing events.
+     */
+    static removeAllEvents(obj: Object, key?: string);
+
+    /**
+     * Cleans the specified name from national characters (diacritics). The result will be a name with only a-z, 0-9 and _.
+     *
+     * @method cleanName
+     * @static
+     * @param {String} s String to clean up.
+     * @return {String} Cleaned string.
+     */
+    static cleanName(name: string): string;
+
+    /**
+     * Builds a full url out of a base URL and an object with items to append as query string items.
+     *
+     * @method buildUrl
+     * @static
+     * @param {String} url Base URL to append query string items to.
+     * @param {Object} items Name/value object to serialize as a querystring.
+     * @return {String} String with url + serialized query string items.
+     */
+    static buildUrl(url, items): string;
+
+    /**
+     * Formats the specified number as a size string for example 1024 becomes 1 KB.
+     *
+     * @method formatSize
+     * @static
+     * @param {Number} size Size to format as string.
+     * @return {String} Formatted size string.
+     */
+    static formatSize(size: number): string;
+
+    /**
+     * Parses the specified size string into a byte value. For example 10kb becomes 10240.
+     *
+     * @method parseSize
+     * @static
+     * @param {String|Number} size String to parse or number to just pass through.
+     * @return {Number} Size in bytes.
+     */
+    static parseSize(size: number | string): number;
+
+
+    /**
+     * A way to predict what runtime will be choosen in the current environment with the
+     * specified settings.
+     *
+     * @method predictRuntime
+     * @static
+     * @param {Object|String} config Plupload settings to check
+     * @param {String} [runtimes] Comma-separated list of runtimes to check against
+     * @return {String} Type of compatible runtime
+     */
+    static predictRuntime(config: Object | string, runtimes: string): string;
+
+    /**
+     * Registers a filter that will be executed for each file added to the queue.
+     * If callback returns false, file will not be added.
+     *
+     * Callback receives two arguments: a value for the filter as it was specified in settings.filters
+     * and a file to be filtered. Callback is executed in the context of uploader instance.
+     *
+     * @method addFileFilter
+     * @static
+     * @param {String} name Name of the filter by which it can be referenced in settings.filters
+     * @param {String} cb Callback - the actual routine that every added file must pass
+     */
+    static addFileFilter(name: string, cb: Function): void;
 }

From 23e98c3d656f73d5b7b4f7ef6b3714d685c56a72 Mon Sep 17 00:00:00 2001
From: Andy <anhans@microsoft.com>
Date: Fri, 30 Mar 2018 07:29:20 -0700
Subject: [PATCH 0975/1382] socket.io: Expose as a global for
 backwards-compatibility (#24619)

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

diff --git a/types/socket.io/index.d.ts b/types/socket.io/index.d.ts
index 1583eac66b..d63effe544 100644
--- a/types/socket.io/index.d.ts
+++ b/types/socket.io/index.d.ts
@@ -7,6 +7,8 @@
 
 declare const SocketIO: SocketIOStatic;
 export = SocketIO;
+/** @deprecated Available as a global for backwards-compatibility. */
+export as namespace SocketIO;
 
 interface SocketIOStatic {
 	/**

From 02230c95f483d325487efc428fdc4c6d6af1da58 Mon Sep 17 00:00:00 2001
From: Matt Gibbs <matt.gibbs@microfocus.com>
Date: Fri, 30 Mar 2018 10:32:18 -0400
Subject: [PATCH 0976/1382] Update "Object" type to "object"

Follow guidelines based on "Common Mistakes" documentation
---
 types/plupload/index.d.ts | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/types/plupload/index.d.ts b/types/plupload/index.d.ts
index a70423533d..162898b928 100644
--- a/types/plupload/index.d.ts
+++ b/types/plupload/index.d.ts
@@ -206,7 +206,7 @@ declare class plupload {
      * @param {Object} obj Object to iterate.
      * @param {function} callback Callback function to execute for each item.
      */
-    static each(obj: Object, callback: Function): void;
+    static each(obj: object, callback: Function): void;
 
     /**
      * Returns the absolute x, y position of an Element. The position will be returned in a object with x, y fields.
@@ -217,7 +217,7 @@ declare class plupload {
      * @param {Element} root Optional root element to stop calculations at.
      * @return {object} Absolute position of the specified element object with x, y fields.
      */
-    static getPos(node: Element, root: Element): Object;
+    static getPos(node: Element, root: Element): object;
 
     /**
      * Returns the size of the specified node in pixels.
@@ -227,7 +227,7 @@ declare class plupload {
      * @param {Node} node Node to get the size of.
      * @return {Object} Object with a w and h property.
      */
-    static getSize(node: Node): Object;
+    static getSize(node: Node): object;
 
     /**
      * Encodes the specified string.
@@ -247,7 +247,7 @@ declare class plupload {
      * @param {Object} obj Object with length field.
      * @return {Array} Array object containing all items.
      */
-    static toArray(obj: Object): Array<any>;
+    static toArray(obj: object): Array<any>;
 
     /**
      * Find an element in array and return its index if present, otherwise return -1.
@@ -281,7 +281,7 @@ declare class plupload {
      * @param {Object} pack Language pack items to add.
      * @return {Object} Extended language pack object.
      */
-    static addI18n(pack: Object): Object;
+    static addI18n(pack: object): object;
 
     /**
      * Translates the specified string by checking for the english string in the language pack lookup.
@@ -309,7 +309,7 @@ declare class plupload {
      * @param {Object} obj Object to check.
      * @return {Boolean}
      */
-    static isEmptyObj(obj: Object): boolean;
+    static isEmptyObj(obj: object): boolean;
 
     /**
      * Checks if specified DOM element has specified class.
@@ -319,7 +319,7 @@ declare class plupload {
      * @param {Object} obj DOM element like object to add handler to.
      * @param {String} name Class name
      */
-    static hasClass(obj: Object, name: string): any;
+    static hasClass(obj: object, name: string): any;
 
     /**
      * Adds specified className to specified DOM element.
@@ -329,7 +329,7 @@ declare class plupload {
      * @param {Object} obj DOM element like object to add handler to.
      * @param {String} name Class name
      */
-    static addClass(obj: Object, name: string): any;
+    static addClass(obj: object, name: string): any;
 
     /**
      * Removes specified className from specified DOM element.
@@ -339,7 +339,7 @@ declare class plupload {
      * @param {Object} obj DOM element like object to add handler to.
      * @param {String} name Class name
      */
-    static removeClass(obj: Object, name: string): any;
+    static removeClass(obj: object, name: string): any;
 
     /**
      * Returns a given computed style of a DOM element.
@@ -349,7 +349,7 @@ declare class plupload {
      * @param {Object} obj DOM element like object.
      * @param {String} name Style you want to get from the DOM element
      */
-    static getStyle(obj: Object, name: string): any;
+    static getStyle(obj: object, name: string): any;
 
     /**
      * Adds an event handler to the specified object and store reference to the handler
@@ -362,7 +362,7 @@ declare class plupload {
      * @param {Function} callback Function to call when event occurs.
      * @param {String} (optional) key that might be used to add specifity to the event record.
      */
-    static addEvent(obj: Object, name: string, callback: Function, key?: string);
+    static addEvent(obj: object, name: string, callback: Function, key?: string);
 
     /**
      * Remove event handler from the specified object. If third argument (callback)
@@ -374,7 +374,7 @@ declare class plupload {
      * @param {String} name Name of event listener to remove.
      * @param {Function|String} (optional) might be a callback or unique key to match.
      */
-    static removeEvent(obj: Object, name: string, optional?: Function | string);
+    static removeEvent(obj: object, name: string, optional?: Function | string);
 
     /**
      * Remove all kind of events from the specified object
@@ -384,7 +384,7 @@ declare class plupload {
      * @param {Object} obj DOM element to remove event listeners from.
      * @param {String} (optional) unique key to match, when removing events.
      */
-    static removeAllEvents(obj: Object, key?: string);
+    static removeAllEvents(obj: object, key?: string);
 
     /**
      * Cleans the specified name from national characters (diacritics). The result will be a name with only a-z, 0-9 and _.
@@ -438,7 +438,7 @@ declare class plupload {
      * @param {String} [runtimes] Comma-separated list of runtimes to check against
      * @return {String} Type of compatible runtime
      */
-    static predictRuntime(config: Object | string, runtimes: string): string;
+    static predictRuntime(config: object | string, runtimes: string): string;
 
     /**
      * Registers a filter that will be executed for each file added to the queue.

From fa874deb3d439bfef5a105a41a2e9172c439b584 Mon Sep 17 00:00:00 2001
From: Matt Gibbs <matt.gibbs@microfocus.com>
Date: Fri, 30 Mar 2018 10:39:34 -0400
Subject: [PATCH 0977/1382] Change "object" type to "any"

For backward compatibility with less than 2.2 TS.
---
 types/plupload/index.d.ts | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/types/plupload/index.d.ts b/types/plupload/index.d.ts
index 162898b928..aef17313f8 100644
--- a/types/plupload/index.d.ts
+++ b/types/plupload/index.d.ts
@@ -217,7 +217,7 @@ declare class plupload {
      * @param {Element} root Optional root element to stop calculations at.
      * @return {object} Absolute position of the specified element object with x, y fields.
      */
-    static getPos(node: Element, root: Element): object;
+    static getPos(node: Element, root: Element): any;
 
     /**
      * Returns the size of the specified node in pixels.
@@ -227,7 +227,7 @@ declare class plupload {
      * @param {Node} node Node to get the size of.
      * @return {Object} Object with a w and h property.
      */
-    static getSize(node: Node): object;
+    static getSize(node: Node): any;
 
     /**
      * Encodes the specified string.
@@ -247,7 +247,7 @@ declare class plupload {
      * @param {Object} obj Object with length field.
      * @return {Array} Array object containing all items.
      */
-    static toArray(obj: object): Array<any>;
+    static toArray(obj: any): Array<any>;
 
     /**
      * Find an element in array and return its index if present, otherwise return -1.
@@ -281,7 +281,7 @@ declare class plupload {
      * @param {Object} pack Language pack items to add.
      * @return {Object} Extended language pack object.
      */
-    static addI18n(pack: object): object;
+    static addI18n(pack: any): any;
 
     /**
      * Translates the specified string by checking for the english string in the language pack lookup.
@@ -309,7 +309,7 @@ declare class plupload {
      * @param {Object} obj Object to check.
      * @return {Boolean}
      */
-    static isEmptyObj(obj: object): boolean;
+    static isEmptyObj(obj: any): boolean;
 
     /**
      * Checks if specified DOM element has specified class.
@@ -319,7 +319,7 @@ declare class plupload {
      * @param {Object} obj DOM element like object to add handler to.
      * @param {String} name Class name
      */
-    static hasClass(obj: object, name: string): any;
+    static hasClass(obj: any, name: string): any;
 
     /**
      * Adds specified className to specified DOM element.
@@ -329,7 +329,7 @@ declare class plupload {
      * @param {Object} obj DOM element like object to add handler to.
      * @param {String} name Class name
      */
-    static addClass(obj: object, name: string): any;
+    static addClass(obj: any, name: string): any;
 
     /**
      * Removes specified className from specified DOM element.
@@ -339,7 +339,7 @@ declare class plupload {
      * @param {Object} obj DOM element like object to add handler to.
      * @param {String} name Class name
      */
-    static removeClass(obj: object, name: string): any;
+    static removeClass(obj: any, name: string): any;
 
     /**
      * Returns a given computed style of a DOM element.
@@ -349,7 +349,7 @@ declare class plupload {
      * @param {Object} obj DOM element like object.
      * @param {String} name Style you want to get from the DOM element
      */
-    static getStyle(obj: object, name: string): any;
+    static getStyle(obj: any, name: string): any;
 
     /**
      * Adds an event handler to the specified object and store reference to the handler
@@ -362,7 +362,7 @@ declare class plupload {
      * @param {Function} callback Function to call when event occurs.
      * @param {String} (optional) key that might be used to add specifity to the event record.
      */
-    static addEvent(obj: object, name: string, callback: Function, key?: string);
+    static addEvent(obj: any, name: string, callback: Function, key?: string);
 
     /**
      * Remove event handler from the specified object. If third argument (callback)
@@ -374,7 +374,7 @@ declare class plupload {
      * @param {String} name Name of event listener to remove.
      * @param {Function|String} (optional) might be a callback or unique key to match.
      */
-    static removeEvent(obj: object, name: string, optional?: Function | string);
+    static removeEvent(obj: any, name: string, optional?: Function | string);
 
     /**
      * Remove all kind of events from the specified object
@@ -384,7 +384,7 @@ declare class plupload {
      * @param {Object} obj DOM element to remove event listeners from.
      * @param {String} (optional) unique key to match, when removing events.
      */
-    static removeAllEvents(obj: object, key?: string);
+    static removeAllEvents(obj: any, key?: string);
 
     /**
      * Cleans the specified name from national characters (diacritics). The result will be a name with only a-z, 0-9 and _.
@@ -438,7 +438,7 @@ declare class plupload {
      * @param {String} [runtimes] Comma-separated list of runtimes to check against
      * @return {String} Type of compatible runtime
      */
-    static predictRuntime(config: object | string, runtimes: string): string;
+    static predictRuntime(config: any, runtimes: string): string;
 
     /**
      * Registers a filter that will be executed for each file added to the queue.

From 6ee9b39f1f85ebfad93d62a47354e84232fc6497 Mon Sep 17 00:00:00 2001
From: Matt Gibbs <matt.gibbs@microfocus.com>
Date: Fri, 30 Mar 2018 10:43:07 -0400
Subject: [PATCH 0978/1382] Fix a missing "object" to "any"

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

diff --git a/types/plupload/index.d.ts b/types/plupload/index.d.ts
index aef17313f8..00dd6c7d0b 100644
--- a/types/plupload/index.d.ts
+++ b/types/plupload/index.d.ts
@@ -206,7 +206,7 @@ declare class plupload {
      * @param {Object} obj Object to iterate.
      * @param {function} callback Callback function to execute for each item.
      */
-    static each(obj: object, callback: Function): void;
+    static each(obj: any, callback: Function): void;
 
     /**
      * Returns the absolute x, y position of an Element. The position will be returned in a object with x, y fields.

From 1ed52bceabec52ee4ebcf6fed9bf2e6a1bb1f4c3 Mon Sep 17 00:00:00 2001
From: Andrew Goodale <andrewgoodale@upserve.com>
Date: Fri, 30 Mar 2018 11:10:33 -0400
Subject: [PATCH 0979/1382] Fix declaration of
 `onMoveShouldSetResponderCapture`

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

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index 2a08edcdb1..b881476782 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -1526,7 +1526,7 @@ export interface GestureResponderHandlers {
      * So if a parent View wants to prevent the child from becoming responder on a touch start,
      * it should have a onStartShouldSetResponderCapture handler which returns true.
      */
-    onMoveShouldSetResponderCapture?: () => void;
+    onMoveShouldSetResponderCapture?: (event: GestureResponderEvent) => boolean;
 }
 
 // @see https://facebook.github.io/react-native/docs/view.html#style

From 0801530e9dfe4a7a130aa60dadb31dd6bbc7eedb Mon Sep 17 00:00:00 2001
From: "andy.patterson" <andy.patterson@genesys.com>
Date: Fri, 30 Mar 2018 13:15:05 -0400
Subject: [PATCH 0980/1382] [@types/mathjs] fill out BigNumber and Fraction
 interfaces

---
 types/mathjs/index.d.ts   | 19 ++++++++++---------
 types/mathjs/package.json |  6 ++++++
 2 files changed, 16 insertions(+), 9 deletions(-)
 create mode 100644 types/mathjs/package.json

diff --git a/types/mathjs/index.d.ts b/types/mathjs/index.d.ts
index ad3dec6d75..751f602a2a 100644
--- a/types/mathjs/index.d.ts
+++ b/types/mathjs/index.d.ts
@@ -1,9 +1,12 @@
+import { Decimal } from 'decimal.js';
 // Type definitions for mathjs
 // Project: http://mathjs.org/
 // Definitions by: Ilya Shestakov <https://github.com/siavol>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare var math: mathjs.IMathJsStatic;
+export as namespace math;
+export = math;
 
 declare namespace mathjs {
 
@@ -304,7 +307,7 @@ declare namespace mathjs {
 		 * @param x The base
 		 * @param y The exponent
 		 */
-		pow(x: number|BigNumber|Complex|MathArray|Matrix, y: number|BigNumber|Complex): number|BigNumber|Complex|MathArray|Matrix;
+		pow(x: MathType, y: number|BigNumber|Complex): MathType;
 
 		/**
 		 * Round a value towards the nearest integer. For matrices, the function is evaluated element wise.
@@ -1333,12 +1336,14 @@ declare namespace mathjs {
 		swapRows(i: number, j: number): Matrix;
 	}
 
-	export interface BigNumber {
+	export interface BigNumber extends Decimal {
 
 	}
 
 	export interface Fraction {
-
+		s: number;
+		n: number;
+		d: number;
 	}
 
 	export interface Complex {
@@ -1349,9 +1354,9 @@ declare namespace mathjs {
 	}
 
 	export interface IPolarCoordinates {
-                r: number;
+        r: number;
 		phi: number;
-        }
+    }
 
 	export interface Unit {
 		to(unit: string): Unit;
@@ -2309,7 +2314,3 @@ declare namespace mathjs {
 		toString(): string;
 	}
 }
-
-declare module 'mathjs'{
-	export = math;
-}
diff --git a/types/mathjs/package.json b/types/mathjs/package.json
new file mode 100644
index 0000000000..23474e431e
--- /dev/null
+++ b/types/mathjs/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "decimal.js": "^10.0.0"
+    }
+}

From 30d6b3445bba07d627edc20c77eee17fb530c3ee Mon Sep 17 00:00:00 2001
From: "andy.patterson" <andy.patterson@genesys.com>
Date: Fri, 30 Mar 2018 13:28:49 -0400
Subject: [PATCH 0981/1382] [@types/mathjs] import statement needs to come
 _after_ comment header

---
 types/mathjs/index.d.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/mathjs/index.d.ts b/types/mathjs/index.d.ts
index 751f602a2a..0341d80c6b 100644
--- a/types/mathjs/index.d.ts
+++ b/types/mathjs/index.d.ts
@@ -1,9 +1,10 @@
-import { Decimal } from 'decimal.js';
 // Type definitions for mathjs
 // Project: http://mathjs.org/
 // Definitions by: Ilya Shestakov <https://github.com/siavol>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+import { Decimal } from 'decimal.js';
+
 declare var math: mathjs.IMathJsStatic;
 export as namespace math;
 export = math;

From 9c3030d32d6e9b9a5338dade566ba2217a244bb1 Mon Sep 17 00:00:00 2001
From: jewbre <jewbre18@gmail.com>
Date: Fri, 30 Mar 2018 19:36:32 +0200
Subject: [PATCH 0982/1382] types for named regexp group

---
 types/named-regexp-groups/index.d.ts          | 38 +++++++++++++++++++
 .../named-regexp-groups-tests.ts              | 19 ++++++++++
 types/named-regexp-groups/tsconfig.json       | 23 +++++++++++
 types/named-regexp-groups/tslint.json         |  1 +
 4 files changed, 81 insertions(+)
 create mode 100644 types/named-regexp-groups/index.d.ts
 create mode 100644 types/named-regexp-groups/named-regexp-groups-tests.ts
 create mode 100644 types/named-regexp-groups/tsconfig.json
 create mode 100644 types/named-regexp-groups/tslint.json

diff --git a/types/named-regexp-groups/index.d.ts b/types/named-regexp-groups/index.d.ts
new file mode 100644
index 0000000000..19426c352e
--- /dev/null
+++ b/types/named-regexp-groups/index.d.ts
@@ -0,0 +1,38 @@
+// Type definitions for named-regexp-groups 1.0
+// Project: https://github.com/commenthol/named-regexp-groups/
+// Definitions by: Vilim Stubičan <https://github.com/jewbre>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+interface NamedRegExpExecArray extends RegExpExecArray {
+    groups: { [propName: string]: string };
+}
+
+declare class NamedRegExp {
+    constructor(pattern?: string | RegExp, flags?: string);
+
+    /**
+     * Executes a search on a string using a regular expression pattern, and returns an array containing the results of that search.
+     * @param string The String object or string literal on which to perform the search.
+     */
+    exec(string: string): NamedRegExpExecArray | null;
+
+    /**
+     * Returns a Boolean value that indicates whether or not a pattern exists in a searched string.
+     * @param string String on which to perform the search.
+     */
+    test(string: string): boolean;
+
+    // Non-standard extensions
+    toString(): string;
+
+    [Symbol.replace](str: string, replacement: string | ((match: string, ...capturedGroups: string[]) => string)): string;
+
+    [Symbol.match](str: string): NamedRegExpExecArray;
+
+    [Symbol.split](str: string): string[];
+
+    [Symbol.search](str: string): number;
+}
+
+export = NamedRegExp;
diff --git a/types/named-regexp-groups/named-regexp-groups-tests.ts b/types/named-regexp-groups/named-regexp-groups-tests.ts
new file mode 100644
index 0000000000..cff4cc057e
--- /dev/null
+++ b/types/named-regexp-groups/named-regexp-groups-tests.ts
@@ -0,0 +1,19 @@
+import NamedRegExp = require("named-regexp-groups");
+
+// $ExpectType NamedRegExp
+new NamedRegExp('aaa', 'gi');
+
+// $ExpectType NamedRegExp
+new NamedRegExp(/aaa/gi);
+
+// $ExpectType NamedRegExp
+new NamedRegExp();
+
+// $ExpectError
+new NamedRegExp(1);
+
+// $ExpectError
+new NamedRegExp({});
+
+// $ExpectError
+new NamedRegExp([]);
diff --git a/types/named-regexp-groups/tsconfig.json b/types/named-regexp-groups/tsconfig.json
new file mode 100644
index 0000000000..9ce09a5d74
--- /dev/null
+++ b/types/named-regexp-groups/tsconfig.json
@@ -0,0 +1,23 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": [
+      "es6"
+    ],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": true,
+    "strictFunctionTypes": true,
+    "baseUrl": "../",
+    "typeRoots": [
+      "../"
+    ],
+    "types": [],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "files": [
+    "index.d.ts",
+    "named-regexp-groups-tests.ts"
+  ]
+}
diff --git a/types/named-regexp-groups/tslint.json b/types/named-regexp-groups/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/named-regexp-groups/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 635dd53a9dba92ccc457922293321d4e114f50e6 Mon Sep 17 00:00:00 2001
From: jewbre <jewbre18@gmail.com>
Date: Fri, 30 Mar 2018 21:19:44 +0200
Subject: [PATCH 0983/1382] types for amp 0.3

---
 types/amp/amp-tests.ts  | 44 +++++++++++++++++++++++++++++++++++++++++
 types/amp/index.d.ts    | 19 ++++++++++++++++++
 types/amp/tsconfig.json | 23 +++++++++++++++++++++
 types/amp/tslint.json   |  1 +
 4 files changed, 87 insertions(+)
 create mode 100644 types/amp/amp-tests.ts
 create mode 100644 types/amp/index.d.ts
 create mode 100644 types/amp/tsconfig.json
 create mode 100644 types/amp/tslint.json

diff --git a/types/amp/amp-tests.ts b/types/amp/amp-tests.ts
new file mode 100644
index 0000000000..1e17bc8507
--- /dev/null
+++ b/types/amp/amp-tests.ts
@@ -0,0 +1,44 @@
+import { decode, encode, Stream } from 'amp';
+
+// $ExpectType Buffer[]
+decode(new Buffer('something'));
+
+// $ExpectType Buffer
+encode([new Buffer('something'), new Buffer('something')]);
+
+// $ExpectError
+decode('');
+
+// $ExpectError
+decode(1);
+
+// $ExpectError
+decode();
+
+// $ExpectError
+encode('');
+
+// $ExpectError
+encode(1);
+
+// $ExpectError
+encode();
+
+// $ExpectType Stream
+new Stream({});
+
+// $ExpectType Stream
+new Stream({
+    highWaterMark: 1,
+    decodeStrings: true,
+    objectMode: true,
+    destroy: (error?: Error) => {
+        return 'handle error';
+    },
+    final: (callback: (error?: Error) => void) => {
+        // do nothing
+    }
+});
+
+// $ExpectError
+new Stream({somethingNoneExisting: true});
diff --git a/types/amp/index.d.ts b/types/amp/index.d.ts
new file mode 100644
index 0000000000..99b9fc7f45
--- /dev/null
+++ b/types/amp/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for amp 0.3
+// Project: https://github.com/visionmedia/node-amp
+// Definitions by: Vilim Stubičan <https://github.com/jewbre>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+/// <reference types="node" />
+
+import * as stream from 'stream';
+
+export function decode(buf: Buffer): Buffer[];
+
+export function encode(args: Buffer[]): Buffer;
+
+export class Stream extends stream.Writable {
+    constructor(opts: stream.WritableOptions);
+
+    _write(chunk: any, encoding: string, fn: () => void): void;
+}
diff --git a/types/amp/tsconfig.json b/types/amp/tsconfig.json
new file mode 100644
index 0000000000..4bb6a171ad
--- /dev/null
+++ b/types/amp/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "amp-tests.ts"
+    ]
+}
diff --git a/types/amp/tslint.json b/types/amp/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/amp/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From d26a8158cfdf94db3a6442d12c1633b2a7e20f38 Mon Sep 17 00:00:00 2001
From: Jeff Principe <jepri@microsoft.com>
Date: Fri, 30 Mar 2018 11:54:40 -0700
Subject: [PATCH 0984/1382] [agenda] Support custom job.attrs.data types

---
 types/agenda/agenda-tests.ts |  6 ++--
 types/agenda/index.d.ts      | 57 ++++++++++++++++++++----------------
 2 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/types/agenda/agenda-tests.ts b/types/agenda/agenda-tests.ts
index bbf945bd62..a7031d2ef8 100644
--- a/types/agenda/agenda-tests.ts
+++ b/types/agenda/agenda-tests.ts
@@ -5,8 +5,8 @@ var mongoConnectionString = "mongodb://127.0.0.1/agenda";
 
 var agenda = new Agenda({ db: { address: mongoConnectionString } });
 
-agenda.define('delete old users', (job, done) => {
-
+agenda.define<{ foo: Error }>('delete old users', (job, done) => {
+    done(job.attrs.data.foo)
 });
 
 agenda.on('ready', () => {
@@ -62,7 +62,7 @@ agenda.schedule('tomorrow at noon', ['printAnalyticsReport', 'sendNotifications'
 
 agenda.now('do the hokey pokey');
 
-var job = agenda.create('printAnalyticsReport', { userCount: 100 });
+var job = agenda.create<{ userCount: number }>('printAnalyticsReport', { userCount: 100 });
 job.save(function(err) {
     console.log("Job successfully saved");
 });
diff --git a/types/agenda/index.d.ts b/types/agenda/index.d.ts
index 12b0b76c38..b29158983d 100644
--- a/types/agenda/index.d.ts
+++ b/types/agenda/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for Agenda v1.0.0
-// Project: https://github.com/rschmukler/agenda
+// Type definitions for Agenda v1.0.3
+// Project: https://github.com/agenda/agenda
 // Definitions by: Meir Gottlieb <https://github.com/meirgottlieb>
+//                 Jeff Principe <https://github.com/princjef>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -89,14 +90,14 @@ declare class Agenda extends EventEmitter {
      * @param name The name of the job.
      * @param data Data to associated with the job.
      */
-    create(name: string, data?: any): Agenda.Job;
+    create<T extends Agenda.JobAttributesData = Agenda.JobAttributesData>(name: string, data?: T): Agenda.Job<T>;
 
     /**
      * Find all Jobs matching `query` and pass same back in cb().
      * @param query
      * @param cb
      */
-    jobs(query: any, cb: ResultCallback<Agenda.Job[]>): void;
+    jobs<T extends Agenda.JobAttributesData = Agenda.JobAttributesData>(query: any, cb: ResultCallback<Agenda.Job<T>[]>): void;
 
     /**
      * Removes all jobs in the database without defined behaviors. Useful if you change a definition name and want
@@ -113,8 +114,8 @@ declare class Agenda extends EventEmitter {
      * @param options The options for the job.
      * @param handler The handler to execute.
      */
-    define(name: string, handler: (job: Agenda.Job, done: (err?: Error) => void) => void): void;
-    define(name: string, options: Agenda.JobOptions, handler: (job: Agenda.Job, done: (err?: Error) => void) => void): void;
+    define<T extends Agenda.JobAttributesData = Agenda.JobAttributesData>(name: string, handler: (job: Agenda.Job<T>, done: (err?: Error) => void) => void): void;
+    define<T extends Agenda.JobAttributesData = Agenda.JobAttributesData>(name: string, options: Agenda.JobOptions, handler: (job: Agenda.Job<T>, done: (err?: Error) => void) => void): void;
 
     /**
      * Runs job name at the given interval. Optionally, data and options can be passed in.
@@ -124,8 +125,8 @@ declare class Agenda extends EventEmitter {
      * @param options An optional argument that will be passed to job.repeatEvery.
      * @param cb An optional callback function which will be called when the job has been persisted in the database.
      */
-    every(interval: number | string, names: string, data?: any, options?: any, cb?: ResultCallback<Agenda.Job>): Agenda.Job;
-    every(interval: number | string, names: string[], data?: any, options?: any, cb?: ResultCallback<Agenda.Job[]>): Agenda.Job[];
+    every<T extends Agenda.JobAttributesData = Agenda.JobAttributesData>(interval: number | string, names: string, data?: T, options?: any, cb?: ResultCallback<Agenda.Job<T>>): Agenda.Job<T>;
+    every<T extends Agenda.JobAttributesData = Agenda.JobAttributesData>(interval: number | string, names: string[], data?: T, options?: any, cb?: ResultCallback<Agenda.Job<T>[]>): Agenda.Job<T>[];
 
     /**
      * Schedules a job to run name once at a given time.
@@ -134,8 +135,8 @@ declare class Agenda extends EventEmitter {
      * @param data An optional argument that will be passed to the processing function under job.attrs.data.
      * @param cb An optional callback function which will be called when the job has been persisted in the database.
      */
-    schedule(when: Date | string, names: string, data?: any, cb?: ResultCallback<Agenda.Job>): Agenda.Job;
-    schedule(when: Date | string, names: string[], data?: any, cb?: ResultCallback<Agenda.Job[]>): Agenda.Job[];
+    schedule<T extends Agenda.JobAttributesData = Agenda.JobAttributesData>(when: Date | string, names: string, data?: T, cb?: ResultCallback<Agenda.Job<T>>): Agenda.Job<T>;
+    schedule<T extends Agenda.JobAttributesData = Agenda.JobAttributesData>(when: Date | string, names: string[], data?: T, cb?: ResultCallback<Agenda.Job<T>[]>): Agenda.Job<T>[];
 
     /**
      * Schedules a job to run name once immediately.
@@ -143,7 +144,7 @@ declare class Agenda extends EventEmitter {
      * @param data An optional argument that will be passed to the processing function under job.attrs.data.
      * @param cb An optional callback function which will be called when the job has been persisted in the database.
      */
-    now(name: string, data?: any, cb?: ResultCallback<Agenda.Job>): Agenda.Job;
+    now<T extends Agenda.JobAttributesData = Agenda.JobAttributesData>(name: string, data?: T, cb?: ResultCallback<Agenda.Job<T>>): Agenda.Job<T>;
 
     /**
      * Cancels any jobs matching the passed mongodb-native query, and removes them from the database.
@@ -242,10 +243,14 @@ declare namespace Agenda {
         }
     }
 
+    interface JobAttributesData {
+        [key: string]: any;
+    }
+
     /**
      * The database record associated with a job.
      */
-    interface JobAttributes {
+    interface JobAttributes<T extends JobAttributesData = JobAttributesData> {
         /**
          * The record identity.
          */
@@ -264,7 +269,7 @@ declare namespace Agenda {
         /**
          * The job details.
          */
-        data: { [name: string]: any };
+        data: T;
 
         /**
          * The priority of the job.
@@ -330,12 +335,12 @@ declare namespace Agenda {
     /**
      * A scheduled job.
      */
-    interface Job {
+    interface Job<T extends JobAttributesData = JobAttributesData> {
 
         /**
          * The database record associated with the job.
          */
-        attrs: JobAttributes;
+        attrs: JobAttributes<T>;
 
         /**
          * The agenda that created the job.
@@ -348,54 +353,54 @@ declare namespace Agenda {
          * @param options An optional argument that can include a timezone field. The timezone should be a string as
          * accepted by moment-timezone and is considered when using an interval in the cron string format.
          */
-        repeatEvery(interval: string | number, options?: { timezone?: string }): Job
+        repeatEvery(interval: string | number, options?: { timezone?: string }): Job<T>
 
         /**
          * Specifies a time when the job should repeat. [Possible values](https://github.com/matthewmueller/date#examples).
          * @param time
          */
-        repeatAt(time: string): Job
+        repeatAt(time: string): Job<T>
 
         /**
          * Disables the job.
          */
-        disable(): Job;
+        disable(): Job<T>;
 
         /**
          * Enables the job.
          */
-        enable(): Job;
+        enable(): Job<T>;
 
         /**
          * Ensure that only one instance of this job exists with the specified properties
          * @param value The properties associated with the job that must be unqiue.
          * @param opts
          */
-        unique(value: any, opts?: { insertOnly?: boolean }): Job;
+        unique(value: any, opts?: { insertOnly?: boolean }): Job<T>;
 
         /**
          * Specifies the next time at which the job should run.
          * @param time The next time at which the job should run.
          */
-        schedule(time: string | Date): Job;
+        schedule(time: string | Date): Job<T>;
 
         /**
          * Specifies the priority weighting of the job.
          * @param value The priority of the job (lowest|low|normal|high|highest|number).
          */
-        priority(value: string | number): Job;
+        priority(value: string | number): Job<T>;
 
         /**
          * Sets job.attrs.failedAt to now, and sets job.attrs.failReason to reason.
          * @param reason A message or Error object that indicates why the job failed.
          */
-        fail(reason: string | Error): Job;
+        fail(reason: string | Error): Job<T>;
 
         /**
          * Runs the given job and calls callback(err, job) upon completion. Normally you never need to call this manually
          * @param cb Called when the job is completed.
          */
-        run(cb?: ResultCallback<Job>): Job;
+        run(cb?: ResultCallback<Job<T>>): Job<T>;
 
         /**
          * Returns true if the job is running; otherwise, returns false.
@@ -406,7 +411,7 @@ declare namespace Agenda {
          * Saves the job into the database.
          * @param cb  Called when the job is saved.
          */
-        save(cb?: ResultCallback<Job>): Job;
+        save(cb?: ResultCallback<Job<T>>): Job<T>;
 
         /**
          * Removes the job from the database and cancels the job.
@@ -424,7 +429,7 @@ declare namespace Agenda {
         /**
          * Calculates next time the job should run
          */
-        computeNextRunAt(): Job;
+        computeNextRunAt(): Job<T>;
     }
 
     interface JobOptions {

From e4ec5a882157b97efd386b12cd27b2fb6c0c0012 Mon Sep 17 00:00:00 2001
From: Tim Chen <timchen1@gmail.com>
Date: Fri, 30 Mar 2018 16:27:13 -0400
Subject: [PATCH 0985/1382] add destroy method to Player

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

diff --git a/types/vimeo__player/index.d.ts b/types/vimeo__player/index.d.ts
index c2699d15d2..5709daa11b 100755
--- a/types/vimeo__player/index.d.ts
+++ b/types/vimeo__player/index.d.ts
@@ -60,6 +60,7 @@ export default class Player {
     getVideoUrl(): VimeoPromise<string, PrivacyError | Error>;
     getVolume(): VimeoPromise<number, Error>;
     setVolume(volume: number): VimeoPromise<number, RangeError | Error>;
+    destroy(): VimeoPromise<void, Error>;
 }
 
 export interface VimeoCuePoint {

From 4c936956ecf063d75a3c653c4bcd3d4d1f81f65a Mon Sep 17 00:00:00 2001
From: Tim Chen <timchen1@gmail.com>
Date: Fri, 30 Mar 2018 16:29:03 -0400
Subject: [PATCH 0986/1382] export Player separately from export default

to allow for module augmentation to work on the Player class
---
 types/vimeo__player/index.d.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/vimeo__player/index.d.ts b/types/vimeo__player/index.d.ts
index 5709daa11b..d5f224975e 100755
--- a/types/vimeo__player/index.d.ts
+++ b/types/vimeo__player/index.d.ts
@@ -25,7 +25,7 @@ export interface TypeError extends Error {name: "TypeError"; message: string; me
 export type EventName = "play" | "pause" | "ended" | "timeupdate" | "progress" | "seeked" | "texttrackchange" | "cuechange" | "cuepoint" | "volumechange" | "error" | "loaded" |  string;
 export type EventCallback = (data: any) => any;
 
-export default class Player {
+export class Player {
     constructor(element: HTMLIFrameElement|HTMLElement|string, options: Options);
 
     on(event: EventName, callback: EventCallback): void;
@@ -106,3 +106,4 @@ export interface VimeoPromise<Result, Reason> extends Promise<Result> {
 /*~ You can declare properties of the module using const, let, or var */
 export const playerMap: WeakMap<any, any>;
 export const readyMap: WeakMap<any, any>;
+export default Player;

From d5ece63fb1ce09ee57df6dff8c951dfa21ded327 Mon Sep 17 00:00:00 2001
From: Jordan Miller <jmiller@mobiquityinc.com>
Date: Fri, 30 Mar 2018 16:34:17 -0400
Subject: [PATCH 0987/1382] [react-navigation] Add optional `key` property to
 NavigationNavigateActionPayload

---
 types/react-navigation/index.d.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index f86a47ccf5..9d86c33ad4 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -202,6 +202,8 @@ export interface NavigationNavigateActionPayload {
 
   // The action to run inside the sub-router
   action?: NavigationNavigateAction;
+
+  key?: string;
 }
 
 export interface NavigationNavigateAction extends NavigationNavigateActionPayload {

From e050b6aa650a33a0f176d6ee4c5d0bb066ece325 Mon Sep 17 00:00:00 2001
From: Tim Chen <timchen1@gmail.com>
Date: Fri, 30 Mar 2018 17:47:15 -0400
Subject: [PATCH 0988/1382] Revert "Merge pull request #24279 from
 eakarpov/patch-1"

This reverts commit e35d00d7f5d0264c2dd1e2c926e8aced03237041, reversing
changes made to 3ecef66f942b23ef4dc037f4791955b8563d81c2.
---
 types/react-table/index.d.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/types/react-table/index.d.ts b/types/react-table/index.d.ts
index b463807003..503b5f4e02 100644
--- a/types/react-table/index.d.ts
+++ b/types/react-table/index.d.ts
@@ -642,6 +642,9 @@ export interface RowInfo {
 
     /** An array of any expandable sub-rows contained in this row */
     subRows: any[];
+
+    /** Original object passed to row */
+    original: any;
 }
 
 export interface FinalState extends TableProps {

From 6e793449ca80f28060470a483538b865e73b6330 Mon Sep 17 00:00:00 2001
From: Abdallah Gamal <abdoolly@gmail.com>
Date: Sat, 31 Mar 2018 03:20:13 +0200
Subject: [PATCH 0989/1382] adding unique attribute in
 AssociationForeignKeyOptions

adding the unique attribute in AssociationForeignKeyOptions
this unique could be boolean or a string for composite unique indexes
---
 types/sequelize/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/sequelize/index.d.ts b/types/sequelize/index.d.ts
index 09af63c2ec..33ebcbe15f 100644
--- a/types/sequelize/index.d.ts
+++ b/types/sequelize/index.d.ts
@@ -1200,7 +1200,7 @@ declare namespace sequelize {
          *  Attribute name for the relation
          */
         name?: string;
-
+        unique?: boolean | string;
     }
 
     /**

From 6116dcfbdea4514b80829dcb1d0d280fb8f57e16 Mon Sep 17 00:00:00 2001
From: Justin Beckwith <beckwith@google.com>
Date: Fri, 30 Mar 2018 19:36:48 -0700
Subject: [PATCH 0990/1382] fix: update es modules in arrify

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

diff --git a/types/arrify/arrify-tests.ts b/types/arrify/arrify-tests.ts
index 319e86897a..12995781bf 100644
--- a/types/arrify/arrify-tests.ts
+++ b/types/arrify/arrify-tests.ts
@@ -1,4 +1,4 @@
-import arrify = require("arrify");
+import * as arrify from 'arrify';
 
 arrify(null);
 arrify<number>(null);
diff --git a/types/arrify/index.d.ts b/types/arrify/index.d.ts
index a1dda1b9ec..43c06af05f 100644
--- a/types/arrify/index.d.ts
+++ b/types/arrify/index.d.ts
@@ -14,4 +14,5 @@
  * arrify([2, 3])    // returns [2, 3]
  */
 declare function arrify<T>(val: undefined | null | T | T[]): T[];
+declare namespace arrify {}
 export = arrify;

From 3cd68af4a069513076f046c577a9058f1a991700 Mon Sep 17 00:00:00 2001
From: Elwyn <elwynelwyn@users.noreply.github.com>
Date: Sat, 31 Mar 2018 16:01:09 +1300
Subject: [PATCH 0991/1382] Add http2 types for "callback"

Currently is typed against IncomingMessage / ServerResponse, changing to be a union type including the new Http2ServerRequest & Http2ServerResponse
---
 types/koa/index.d.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/types/koa/index.d.ts b/types/koa/index.d.ts
index 2a5c49f110..07ddadc0c8 100644
--- a/types/koa/index.d.ts
+++ b/types/koa/index.d.ts
@@ -21,6 +21,7 @@ import * as accepts from "accepts";
 import * as Cookies from "cookies";
 import { EventEmitter } from "events";
 import { IncomingMessage, ServerResponse, Server } from "http";
+import { Http2ServerRequest, Http2ServerResponse } from 'http2';
 import httpAssert = require("http-assert");
 import * as Keygrip from "keygrip";
 import * as compose from "koa-compose";
@@ -500,9 +501,9 @@ declare class Application extends EventEmitter {
 
     /**
      * Return a request handler callback
-     * for node's native http server.
+     * for node's native http/http2 server.
      */
-    callback(): (req: IncomingMessage, res: ServerResponse) => void;
+    callback(): (req: IncomingMessage | Http2ServerRequest, res: ServerResponse | Http2ServerResponse) => void;
 
     /**
      * Initialize a new context.

From b4e6e495f88fae0937aeb1b48524220a1a1dc61e Mon Sep 17 00:00:00 2001
From: AndersonFriaca <afriacaxd@gmail.com>
Date: Sat, 31 Mar 2018 01:28:40 -0400
Subject: [PATCH 0992/1382] Types for JQuery CountTo

---
 types/jquery-countto/index.d.ts              | 57 ++++++++++++++++++++
 types/jquery-countto/jquery.countto-tests.ts | 29 ++++++++++
 types/jquery-countto/tsconfig.json           | 25 +++++++++
 types/jquery-countto/tslint.json             |  1 +
 4 files changed, 112 insertions(+)
 create mode 100644 types/jquery-countto/index.d.ts
 create mode 100644 types/jquery-countto/jquery.countto-tests.ts
 create mode 100644 types/jquery-countto/tsconfig.json
 create mode 100644 types/jquery-countto/tslint.json

diff --git a/types/jquery-countto/index.d.ts b/types/jquery-countto/index.d.ts
new file mode 100644
index 0000000000..a215abb7d4
--- /dev/null
+++ b/types/jquery-countto/index.d.ts
@@ -0,0 +1,57 @@
+// Type definitions for JQuery CountTo 1.2
+// Project: https://github.com/mhuggins/jquery-countTo
+// Definitions by: Anderson Friaça <https://github.com/AndersonFriaca>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="jquery" />
+
+export interface Options {
+    /**
+     * The number to start counting from
+     */
+    from?: number;
+
+    /**
+     * The number to stop counting at
+     */
+    to?: number;
+
+    /**
+     * The number of milliseconds it should take to finish counting
+     */
+    speed?: number;
+
+    /**
+     * he number of milliseconds to wait between refreshing the counter
+     */
+    refreshInterval?: number;
+
+    /**
+     * The number of decimal places to show when using the default formatter
+     */
+    decimals?: number;
+
+    /**
+     * A handler that is used to format the current value before rendering to the DOM
+     */
+    formatter: (value: number, options: Options) => string;
+
+    /**
+     * A callback function that is triggered for every iteration that the counter updates
+     */
+    onUpdate?: (value: number) => void;
+
+    /**
+     * A callback function that is triggered when counting finishes
+     */
+    onComplete?: (value: number) => void;
+}
+
+export type Method = 'start' | 'stop' | 'toggle' | 'restart';
+
+declare global {
+    interface JQuery {
+        countTo(methodOrOptions?: Method | Options): JQuery;
+    }
+}
diff --git a/types/jquery-countto/jquery.countto-tests.ts b/types/jquery-countto/jquery.countto-tests.ts
new file mode 100644
index 0000000000..0bc7998f56
--- /dev/null
+++ b/types/jquery-countto/jquery.countto-tests.ts
@@ -0,0 +1,29 @@
+import { Options } from "jquery-countto";
+
+// Basic usage
+$('.timer').countTo();
+
+// With options
+const options: Options = {
+    from: 50,
+    to: 2500,
+    speed: 1000,
+    refreshInterval: 50,
+    formatter: (value: number, options: Options) => {
+      return value.toFixed(options.decimals);
+    },
+    onUpdate: (value: number) => {
+      console.log(value);
+    },
+    onComplete: (value: number) => {
+      console.log(value);
+    }
+  };
+
+$('.timer').countTo(options);
+
+// Controls
+$('.timer').countTo('start');
+$('.timer').countTo('stop');
+$('.timer').countTo('restart');
+$('.timer').countTo('toggle');
diff --git a/types/jquery-countto/tsconfig.json b/types/jquery-countto/tsconfig.json
new file mode 100644
index 0000000000..855047ba62
--- /dev/null
+++ b/types/jquery-countto/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "esModuleInterop": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery.countto-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/jquery-countto/tslint.json b/types/jquery-countto/tslint.json
new file mode 100644
index 0000000000..d04fe2e1fa
--- /dev/null
+++ b/types/jquery-countto/tslint.json
@@ -0,0 +1 @@
+{"extends": "dtslint/dt.json"}
\ No newline at end of file

From 4fab9de846d523cebe95f91e0c2b65837e0a981a Mon Sep 17 00:00:00 2001
From: AndersonFriaca <afriacaxd@gmail.com>
Date: Sat, 31 Mar 2018 01:40:25 -0400
Subject: [PATCH 0993/1382] Adjustments

---
 .../{jquery.countto-tests.ts => jquery-countto-tests.ts}          | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename types/jquery-countto/{jquery.countto-tests.ts => jquery-countto-tests.ts} (100%)

diff --git a/types/jquery-countto/jquery.countto-tests.ts b/types/jquery-countto/jquery-countto-tests.ts
similarity index 100%
rename from types/jquery-countto/jquery.countto-tests.ts
rename to types/jquery-countto/jquery-countto-tests.ts

From cd5f204c1143c8dc63055ca32e596f5544fe35b1 Mon Sep 17 00:00:00 2001
From: AndersonFriaca <afriacaxd@gmail.com>
Date: Sat, 31 Mar 2018 01:49:26 -0400
Subject: [PATCH 0994/1382] Adjustments

---
 types/jquery-countto/tsconfig.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/jquery-countto/tsconfig.json b/types/jquery-countto/tsconfig.json
index 855047ba62..3d5cf520dd 100644
--- a/types/jquery-countto/tsconfig.json
+++ b/types/jquery-countto/tsconfig.json
@@ -20,6 +20,6 @@
     },
     "files": [
         "index.d.ts",
-        "jquery.countto-tests.ts"
+        "jquery-countto-tests.ts"
     ]
 }
\ No newline at end of file

From 4bcf0f686635e86107f5841812b5c632e0eadba2 Mon Sep 17 00:00:00 2001
From: Blair Zajac <blair@orcaware.com>
Date: Fri, 30 Mar 2018 23:47:08 -0700
Subject: [PATCH 0995/1382] node: assert.fail() has never return type.

---
 types/node/index.d.ts    | 4 ++--
 types/node/v0/index.d.ts | 2 +-
 types/node/v4/index.d.ts | 2 +-
 types/node/v6/index.d.ts | 2 +-
 types/node/v7/index.d.ts | 2 +-
 types/node/v8/index.d.ts | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index 2e31fff6e6..3404e37d46 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -5615,8 +5615,8 @@ declare module "assert" {
             });
         }
 
-        export function fail(message: string): void;
-        export function fail(actual: any, expected: any, message?: string, operator?: string): void;
+        export function fail(message: string): never;
+        export function fail(actual: any, expected: any, message?: string, operator?: string): never;
         export function ok(value: any, message?: string): void;
         export function equal(actual: any, expected: any, message?: string): void;
         export function notEqual(actual: any, expected: any, message?: string): void;
diff --git a/types/node/v0/index.d.ts b/types/node/v0/index.d.ts
index 800a909c49..ef1c485d2d 100644
--- a/types/node/v0/index.d.ts
+++ b/types/node/v0/index.d.ts
@@ -1870,7 +1870,7 @@ declare module "assert" {
                                   operator?: string; stackStartFunction?: Function});
         }
 
-        export function fail(actual?: any, expected?: any, message?: string, operator?: string): void;
+        export function fail(actual?: any, expected?: any, message?: string, operator?: string): never;
         export function ok(value: any, message?: string): void;
         export function equal(actual: any, expected: any, message?: string): void;
         export function notEqual(actual: any, expected: any, message?: string): void;
diff --git a/types/node/v4/index.d.ts b/types/node/v4/index.d.ts
index 16e54d002d..ada62b683e 100644
--- a/types/node/v4/index.d.ts
+++ b/types/node/v4/index.d.ts
@@ -2448,7 +2448,7 @@ declare module "assert" {
                                   operator?: string; stackStartFunction?: Function});
         }
 
-        export function fail(actual: any, expected: any, message?: string, operator?: string): void;
+        export function fail(actual: any, expected: any, message?: string, operator?: string): never;
         export function ok(value: any, message?: string): void;
         export function equal(actual: any, expected: any, message?: string): void;
         export function notEqual(actual: any, expected: any, message?: string): void;
diff --git a/types/node/v6/index.d.ts b/types/node/v6/index.d.ts
index 3ca66a2df5..f38cdf01dd 100644
--- a/types/node/v6/index.d.ts
+++ b/types/node/v6/index.d.ts
@@ -3876,7 +3876,7 @@ declare module "assert" {
             });
         }
 
-        export function fail(actual: any, expected: any, message?: string, operator?: string): void;
+        export function fail(actual: any, expected: any, message?: string, operator?: string): never;
         export function ok(value: any, message?: string): void;
         export function equal(actual: any, expected: any, message?: string): void;
         export function notEqual(actual: any, expected: any, message?: string): void;
diff --git a/types/node/v7/index.d.ts b/types/node/v7/index.d.ts
index 62e30f0f09..896b5a887f 100644
--- a/types/node/v7/index.d.ts
+++ b/types/node/v7/index.d.ts
@@ -3984,7 +3984,7 @@ declare module "assert" {
             });
         }
 
-        export function fail(actual: any, expected: any, message?: string, operator?: string): void;
+        export function fail(actual: any, expected: any, message?: string, operator?: string): never;
         export function ok(value: any, message?: string): void;
         export function equal(actual: any, expected: any, message?: string): void;
         export function notEqual(actual: any, expected: any, message?: string): void;
diff --git a/types/node/v8/index.d.ts b/types/node/v8/index.d.ts
index fd1f5cafae..4bd4977d5f 100644
--- a/types/node/v8/index.d.ts
+++ b/types/node/v8/index.d.ts
@@ -5585,8 +5585,8 @@ declare module "assert" {
             });
         }
 
-        export function fail(message: string): void;
-        export function fail(actual: any, expected: any, message?: string, operator?: string): void;
+        export function fail(message: string): never;
+        export function fail(actual: any, expected: any, message?: string, operator?: string): never;
         export function ok(value: any, message?: string): void;
         export function equal(actual: any, expected: any, message?: string): void;
         export function notEqual(actual: any, expected: any, message?: string): void;

From 9d25183a8673d4797a60c93414efb9109eb31b04 Mon Sep 17 00:00:00 2001
From: Christian Johansen <Christian.Johansen@ucr.uu.se>
Date: Sat, 31 Mar 2018 11:27:00 +0200
Subject: [PATCH 0996/1382] Updated react-beautiful-dnd zIndex as per kingdaros
 review

---
 types/react-beautiful-dnd/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/react-beautiful-dnd/index.d.ts b/types/react-beautiful-dnd/index.d.ts
index 9f49eb5e96..8d25e79407 100644
--- a/types/react-beautiful-dnd/index.d.ts
+++ b/types/react-beautiful-dnd/index.d.ts
@@ -12,7 +12,7 @@ export type Id = string;
 export type DraggableId = Id;
 export type DroppableId = Id;
 export type TypeId = Id;
-export type ZIndex = React.CSSProperties['z-Index'];
+export type ZIndex = React.CSSProperties['zIndex'];
 export type DropReason = 'DROP' | 'CANCEL';
 export type Announce = (message: string) => void;
 

From e22541686c4c15ad5ed82619719a8904c3d30ee0 Mon Sep 17 00:00:00 2001
From: naronA <otherthan.new@gmail.com>
Date: Sat, 31 Mar 2018 18:39:52 +0900
Subject: [PATCH 0997/1382] puppeteer: add missing function setCacheEnable on
 Page class

Page.setCacheEnable: https://github.com/GoogleChrome/puppeteer/blob/master/docs/api.md#pagesetcacheenabledenabled
---
 types/puppeteer/index.d.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/types/puppeteer/index.d.ts b/types/puppeteer/index.d.ts
index 2afb026648..9298d6c631 100644
--- a/types/puppeteer/index.d.ts
+++ b/types/puppeteer/index.d.ts
@@ -1041,6 +1041,12 @@ export interface Page extends EventEmitter, FrameBase {
    */
   select(selector: string, ...values: string[]): Promise<string[]>;
 
+  /**
+   * Determines whether cache is enabled on the page.
+   * @param enabled Whether or not to enable cache on the page.
+   */
+  setCacheEnabled(enabled: boolean): Promise<void>;
+
   /**
    * Sets the cookies on the page.
    * @param cookies The cookies to set.

From d7c6430b9d82e9b9029912529feb337d93c15f05 Mon Sep 17 00:00:00 2001
From: jewbre <jewbre18@gmail.com>
Date: Sat, 31 Mar 2018 12:03:15 +0200
Subject: [PATCH 0998/1382] types for amp message 0.1

---
 types/amp-message/amp-message-tests.ts | 57 ++++++++++++++++++++++++++
 types/amp-message/index.d.ts           | 25 +++++++++++
 types/amp-message/tsconfig.json        | 23 +++++++++++
 types/amp-message/tslint.json          |  1 +
 4 files changed, 106 insertions(+)
 create mode 100644 types/amp-message/amp-message-tests.ts
 create mode 100644 types/amp-message/index.d.ts
 create mode 100644 types/amp-message/tsconfig.json
 create mode 100644 types/amp-message/tslint.json

diff --git a/types/amp-message/amp-message-tests.ts b/types/amp-message/amp-message-tests.ts
new file mode 100644
index 0000000000..003949f3b7
--- /dev/null
+++ b/types/amp-message/amp-message-tests.ts
@@ -0,0 +1,57 @@
+import Message = require('amp-message');
+
+// $ExpectType Message
+new Message(new Buffer('aaa'));
+
+// $ExpectType Message
+new Message([new Buffer('aaa'), new Buffer('bbb')]);
+
+const message = new Message([new Buffer('aaa'), new Buffer('bbb')]);
+
+// $ExpectType string
+message.inspect();
+
+// $ExpectType Buffer
+message.toBuffer();
+
+// $ExpectType number
+message.push(new Buffer('ccc'));
+
+// $ExpectType Buffer | undefined
+message.pop();
+
+// $ExpectType Buffer | undefined
+message.shift();
+
+// $ExpectType number
+message.unshift(new Buffer('ddd'));
+
+// $ExpectError
+new Message();
+
+// $ExpectError
+new Message(1);
+
+// $ExpectError
+new Message({});
+
+// $ExpectError
+new Message('aaa');
+
+// $ExpectError
+message.push(1);
+
+// $ExpectError
+message.push({});
+
+// $ExpectError
+message.push('aaa');
+
+// $ExpectError
+message.unshift(1);
+
+// $ExpectError
+message.unshift({});
+
+// $ExpectError
+message.unshift('aaa');
diff --git a/types/amp-message/index.d.ts b/types/amp-message/index.d.ts
new file mode 100644
index 0000000000..f1ca520ae7
--- /dev/null
+++ b/types/amp-message/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for amp-message 0.1
+// Project: https://github.com/visionmedia/node-amp-message
+// Definitions by: Vilim Stubičan <https://github.com/jewbre>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+/// <reference types="node" />
+
+declare class Message {
+    constructor(args: Buffer | Buffer[]);
+
+    inspect(): string;
+
+    toBuffer(): Buffer;
+
+    push(...items: Buffer[]): number;
+
+    pop(): Buffer | undefined;
+
+    shift(): Buffer | undefined;
+
+    unshift(...items: Buffer[]): number;
+}
+
+export = Message;
diff --git a/types/amp-message/tsconfig.json b/types/amp-message/tsconfig.json
new file mode 100644
index 0000000000..7b1826a6d8
--- /dev/null
+++ b/types/amp-message/tsconfig.json
@@ -0,0 +1,23 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": [
+      "es6"
+    ],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": true,
+    "strictFunctionTypes": true,
+    "baseUrl": "../",
+    "typeRoots": [
+      "../"
+    ],
+    "types": [],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "files": [
+    "index.d.ts",
+    "amp-message-tests.ts"
+  ]
+}
diff --git a/types/amp-message/tslint.json b/types/amp-message/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/amp-message/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 93d5d645d3c2dcf32f2d199d14e0208e9d85a889 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Rodr=C3=ADguez?= <pabloviolin8@gmail.com>
Date: Sat, 31 Mar 2018 13:37:43 +0200
Subject: [PATCH 0999/1382] Remove retry from the AsyncRetry namespace

---
 types/async-retry/index.d.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/types/async-retry/index.d.ts b/types/async-retry/index.d.ts
index fdbc9ecf24..a2f65e00a4 100644
--- a/types/async-retry/index.d.ts
+++ b/types/async-retry/index.d.ts
@@ -10,8 +10,6 @@ declare function AsyncRetry<A>(
 ): Promise<A>;
 
 declare namespace AsyncRetry {
-	function retry<A>(fn: RetryFunction<A>, opts: Options): Promise<A>;
-
 	interface Options {
 		retries?: number;
 		factor?: number;

From c04fe2193edf7ce479904cb8ea087d3b90330564 Mon Sep 17 00:00:00 2001
From: jewbre <jewbre18@gmail.com>
Date: Sat, 31 Mar 2018 14:56:58 +0200
Subject: [PATCH 1000/1382] types for escape-regexp 0.0

---
 types/escape-regexp/escape-regexp-tests.ts | 22 +++++++++++++++++++++
 types/escape-regexp/index.d.ts             |  9 +++++++++
 types/escape-regexp/tsconfig.json          | 23 ++++++++++++++++++++++
 types/escape-regexp/tslint.json            |  1 +
 4 files changed, 55 insertions(+)
 create mode 100644 types/escape-regexp/escape-regexp-tests.ts
 create mode 100644 types/escape-regexp/index.d.ts
 create mode 100644 types/escape-regexp/tsconfig.json
 create mode 100644 types/escape-regexp/tslint.json

diff --git a/types/escape-regexp/escape-regexp-tests.ts b/types/escape-regexp/escape-regexp-tests.ts
new file mode 100644
index 0000000000..086ff36348
--- /dev/null
+++ b/types/escape-regexp/escape-regexp-tests.ts
@@ -0,0 +1,22 @@
+import escapeRegExp = require('escape-regexp');
+
+// $ExpectType string
+escapeRegExp('aaa');
+
+// $ExpectError
+escapeRegExp();
+
+// $ExpectError
+escapeRegExp({});
+
+// $ExpectError
+escapeRegExp(1);
+
+// $ExpectError
+escapeRegExp([]);
+
+// $ExpectError
+escapeRegExp(null);
+
+// $ExpectError
+escapeRegExp(undefined);
diff --git a/types/escape-regexp/index.d.ts b/types/escape-regexp/index.d.ts
new file mode 100644
index 0000000000..ac5d20064c
--- /dev/null
+++ b/types/escape-regexp/index.d.ts
@@ -0,0 +1,9 @@
+// Type definitions for escape-regexp 0.0
+// 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.)
+// Definitions by: Vilim Stubičan <https://github.com/jewbre>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+declare function escapeRegExp(str: string): string;
+
+export = escapeRegExp;
diff --git a/types/escape-regexp/tsconfig.json b/types/escape-regexp/tsconfig.json
new file mode 100644
index 0000000000..1037db1961
--- /dev/null
+++ b/types/escape-regexp/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "escape-regexp-tests.ts"
+    ]
+}
diff --git a/types/escape-regexp/tslint.json b/types/escape-regexp/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/escape-regexp/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 9ee1f10be8d96866bcc68bb5c42a870031d8164a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20D=C3=BCfel?= <christian@duefel.de>
Date: Sat, 31 Mar 2018 17:51:55 +0200
Subject: [PATCH 1001/1382] cassandra-driver: update to 3.4.1

---
 types/cassandra-driver/index.d.ts | 153 +++++++++++++++++++++++++-----
 1 file changed, 128 insertions(+), 25 deletions(-)

diff --git a/types/cassandra-driver/index.d.ts b/types/cassandra-driver/index.d.ts
index 5c0578ccf2..33a9f5988f 100644
--- a/types/cassandra-driver/index.d.ts
+++ b/types/cassandra-driver/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for cassandra-driver v3.2.2
+// Type definitions for cassandra-driver v3.4.1
 // Project: https://github.com/datastax/nodejs-driver
 // Definitions by: Marc Fisher <https://github.com/Svjard>
+//                 Christian D <https://github.com/pc-jedi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -115,7 +116,11 @@ export namespace policies {
     interface RetryPolicyStatic {
       new (): RetryPolicy;
 
-      retryDecision: any;
+      retryDecision: {
+        rethrow: number,
+        retry: number,
+        ignore: number
+      };
     }
 
     interface RetryPolicy {
@@ -126,15 +131,55 @@ export namespace policies {
       retryResult(): { decision: retryDecision, consistency: types.consistencies, useCurrentHost: boolean };
     }
   }
+
+  namespace speculativeExecution {
+    let NoSpeculativeExecutionPolicy: NoSpeculativeExecutionPolicyStatic
+
+    interface SpeculativeExecutionPolicy {
+      init(client: Client): void;
+      newPlan(keyspace: string, queryInfo: string | Array<string>): {
+          nextExecution: Function
+      }
+    }
+
+    interface NoSpeculativeExecutionPolicyStatic {
+      new (): NoSpeculativeExecutionPolicy
+    }
+
+    interface NoSpeculativeExecutionPolicy extends SpeculativeExecutionPolicy { }
+    
+    interface ConstantSpeculativeExecutionPolicyStatic {
+      new (delay: number, maxSpeculativeExecutions: number): ConstantSpeculativeExecutionPolicy
+    }
+
+    interface ConstantSpeculativeExecutionPolicy extends SpeculativeExecutionPolicy { }
+  }
+
+  namespace timestampGeneration {
+      let MonotonicTimestampGenerator: MonotonicTimestampGeneratorStatic
+
+      interface TimestampGenerator {
+        next(client: Client): null | number | _Long
+      }
+
+      interface MonotonicTimestampGeneratorStatic {
+        new (warningThreshold?: number, minLogInterval?: number): MonotonicTimestampGeneratorStatic
+      }
+
+      interface MonotonicTimestampGenerator extends TimestampGenerator {
+        getDate(): number
+      }
+  }
 }
 
 export namespace types {
   let BigDecimal: BigDecimalStatic;
+  let Duration: DurationStatic;
+  let Long: _Long;
   let InetAddress: InetAddressStatic;
   let Integer: IntegerStatic;
   let LocalDate: LocalDateStatic;
   let LocalTime: LocalTimeStatic;
-  let Long: _Long;
   let ResultSet: ResultSetStatic;
   // let ResultStream: ResultStreamStatic;
   let Row: RowStatic;
@@ -221,6 +266,19 @@ export namespace types {
     toJSON(): string;
   }
 
+  interface DurationStatic {
+    new (month: number, days: number, nanoseconds: number | _Long): Duration;
+
+    fromBuffer(buffer: Buffer): Duration;
+    fromString(input: string): Duration;
+  }
+
+  interface Duration {
+    equals(other: Duration): boolean;
+    toBuffer(): Buffer;
+    toString(): string;
+  }
+
   interface InetAddressStatic {
     new (buffer: Buffer): InetAddress;
 
@@ -336,13 +394,14 @@ export namespace types {
   }
 
   interface ResultSetStatic {
-    new (response: any, host: string, triedHost: { [key: string]: any }, consistency: consistencies): ResultSet;
+    new (response: any, host: string, triedHost: { [key: string]: any }, speculativeExecutions: number, consistency: consistencies): ResultSet;
   }
 
   interface ResultSet {
     info: {
       queriedHost: Host,
       triedHosts: { [key: string]: string; },
+      speculativeExecutions: number,
       achievedConsistency: consistencies,
       traceId: Uuid,
       warnings: Array<string>,
@@ -352,11 +411,13 @@ export namespace types {
     rowLength: number;
     columns: Array<{ [key: string]: string; }>;
     pageState: string;
-    nextPage: any; // function
+    nextPage: Function;
 
     first(): Row;
     getPageState(): string;
     getColumns(): Array<{ [key: string]: string; }>;
+    wasApplied(): boolean;
+    [Symbol.iterator](): Iterator<Row>;
   }
 
   interface ResultStreamStatic {
@@ -442,40 +503,50 @@ export let Encoder: EncoderStatic;
 export interface ClientOptions {
   contactPoints: Array<string>,
   keyspace?: string,
+  refreshSchemaDelay?: number,
+  isMetadataSyncEnabled?: boolean,
+  prepareOnAllHosts?: boolean,
+  rePrepareOnUp?: boolean,
+  maxPrepared?: number,
   policies?: {
-    addressResolution?: policies.addressResolution.AddressTranslator,
     loadBalancing?: policies.loadBalancing.LoadBalancingPolicy,
+    retry?: policies.retry.RetryPolicy,
     reconnection?: policies.reconnection.ReconnectionPolicy,
-    retry?: policies.retry.RetryPolicy
+    addressResolution?: policies.addressResolution.AddressTranslator,
+    speculativeExecution?: policies.speculativeExecution.SpeculativeExecutionPolicy,
+    timestampGeneration?: policies.timestampGeneration.TimestampGenerator,
   },
   queryOptions?: QueryOptions,
   pooling?: {
-    heartBeatInterval: number,
-    coreConnectionsPerHost: { [key: number]: number; },
-    warmup: boolean;
+    heartBeatInterval?: number,
+    coreConnectionsPerHost?: { [key: number]: number; },
+    maxRequestsPerConnection?: number,
+    warmup?: boolean;
   },
   protocolOptions?: {
-    port: number,
-    maxSchemaAgreementWaitSeconds: number,
-    maxVersion: number
+    port?: number,
+    maxSchemaAgreementWaitSeconds?: number,
+    maxVersion?: number
   },
   socketOptions?: {
-    connectTimeout: number,
-    defunctReadTimeoutThreshold: number,
-    keepAlive: boolean,
-    keepAliveDelay: number,
-    readTimeout: number,
-    tcpNoDelay: boolean,
-    coalescingThreshold: number
+    connectTimeout?: number,
+    defunctReadTimeoutThreshold?: number,
+    keepAlive?: boolean,
+    keepAliveDelay?: number,
+    readTimeout?: number,
+    tcpNoDelay?: boolean,
+    coalescingThreshold?: number
   },
   authProvider?: auth.AuthProvider,
   sslOptions?: tls.ConnectionOptions,
   encoding?: {
-    map: Function,
-    set: Function,
-    copyBuffer: boolean,
-    useUndefinedAsUnset: boolean
-  }
+    map?: Function,
+    set?: Function,
+    copyBuffer?: boolean,
+    useUndefinedAsUnset?: boolean
+  },
+  profiles?: Array<ExecutionProfile>,
+  promiseFactory?: Function,
 }
 
 export interface QueryOptions {
@@ -483,8 +554,11 @@ export interface QueryOptions {
   captureStackTrace?: boolean;
   consistency?: number;
   customPayload?: any;
+  executionProfile?: string | ExecutionProfile;
   fetchSize?: number;
   hints?: Array<string> | Array<Array<string>>;
+  isIdempotent?: boolean;
+  keyspace?: string;
   logged?: boolean;
   pageState?: Buffer | string;
   prepare?: boolean;
@@ -520,6 +594,7 @@ export interface Client extends events.EventEmitter {
   execute(query: string, callback: ResultCallback): void;
   execute(query: string, params?: any, options?: QueryOptions): Promise<types.ResultSet>;
   getReplicas(keyspace: string, token: Buffer): Array<any>; // TODO: Should this be a more explicit return?
+  getState(): metadata.ClientState;
   shutdown(callback?: Callback): void;
   shutdown(): Promise<void>;
   stream(query: string, params?: any, options?: QueryOptions, callback?: Callback): NodeJS.ReadableStream;
@@ -548,6 +623,7 @@ export interface HostMapStatic {
 export interface HostMap extends events.EventEmitter {
   length: number;
 
+  clear(): Array<Host>;
   forEach(callback: Callback): void;
   get(key: string): Host;
   keys(): Array<string>;
@@ -566,6 +642,22 @@ export interface Encoder {
   encode(value: any, typeInfo?: string | number | { code: number, info?: any }): Buffer;
 }
 
+interface ExecutionProfileOptions {
+  consistency: number,
+    loadBalancing: policies.loadBalancing.LoadBalancingPolicy,
+    name: string,
+    readTimeout: number,
+    retry: policies.retry.RetryPolicy,
+    serialConsistency: number
+}
+
+export interface ExecutionProfileStatic {
+  new (name: string, options: ExecutionProfileOptions): ExecutionProfile
+}
+
+export interface ExecutionProfile extends ExecutionProfileOptions {
+}
+
 export namespace auth {
   let Authenticator: AuthenticatorStatic;
   let PlainTextAuthProvider: PlainTextAuthProviderStatic;
@@ -649,6 +741,17 @@ export namespace metadata {
     stateFunction: string;
     stateType: string;
   }
+  
+  interface ClientStateStatic {
+    new (): ClientState;
+  }
+  
+  interface ClientState {
+    getConnectedHosts(): Array<Host>;
+    getInFlightQueries(host: Host): number;
+    getOpenConnections(host: Host): number;
+    toString(): string;
+  }
 
   interface DataTypeInfo {
     code: number,

From 21ed509e3e5446251b226585bd968272c48e6010 Mon Sep 17 00:00:00 2001
From: richseviora <richard.seviora@gmail.com>
Date: Sat, 31 Mar 2018 13:21:28 -0700
Subject: [PATCH 1002/1382] Remove Rich Seviora from Authors List

---
 types/react/index.d.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index c38f57b0a7..0a2cdd403c 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -12,7 +12,6 @@
 //                 Tanguy Krotoff <https://github.com/tkrotoff>
 //                 Dovydas Navickas <https://github.com/DovydasNavickas>
 //                 Stéphane Goetz <https://github.com/onigoetz>
-//                 Rich Seviora <https://github.com/richseviora>
 //                 Josh Rutherford <https://github.com/theruther4d>
 //                 Guilherme Hübner <https://github.com/guilhermehubner>
 //                 Josh Goldberg <https://github.com/joshuakgoldberg>

From a731287c7648df60442ace11b7b7f3ec3894dfba Mon Sep 17 00:00:00 2001
From: jewbre <jewbre18@gmail.com>
Date: Sun, 1 Apr 2018 01:36:19 +0200
Subject: [PATCH 1003/1382] Project defintion for npmjs

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

diff --git a/types/escape-regexp/index.d.ts b/types/escape-regexp/index.d.ts
index ac5d20064c..b1a0ff1edf 100644
--- a/types/escape-regexp/index.d.ts
+++ b/types/escape-regexp/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for escape-regexp 0.0
-// 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.)
+// Project: https://www.npmjs.com/package/escape-regexp
 // Definitions by: Vilim Stubičan <https://github.com/jewbre>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4

From 3369e2e196cbba76a57aedcd2678ae77de1d46b3 Mon Sep 17 00:00:00 2001
From: Blair Zajac <blair@orcaware.com>
Date: Sat, 31 Mar 2018 19:22:11 -0700
Subject: [PATCH 1004/1382] winston: add 'all', 'level' and 'message' as valid
 colorize values.

Supports https://github.com/winstonjs/winston/commit/72273b1 .
---
 types/winston/index.d.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/types/winston/index.d.ts b/types/winston/index.d.ts
index df360f1e01..dd6ab0e1aa 100644
--- a/types/winston/index.d.ts
+++ b/types/winston/index.d.ts
@@ -272,7 +272,7 @@ declare namespace winston {
 
     interface ConsoleTransportInstance extends TransportInstance {
         json: boolean;
-        colorize: boolean;
+        colorize: boolean | 'all' | 'level' | 'message';
         prettyPrint: boolean;
         timestamp: boolean | (() => string | boolean);
         showLevel: boolean;
@@ -294,7 +294,7 @@ declare namespace winston {
     interface FileTransportInstance extends TransportInstance {
         json: boolean;
         logstash: boolean;
-        colorize: boolean;
+        colorize: boolean | 'all' | 'level' | 'message';
         maxsize: number|null;
         rotationFormat: boolean;
         zippedArchive: boolean;
@@ -330,7 +330,7 @@ declare namespace winston {
         writeOutput: GenericTextTransportOptions[];
 
         json: boolean;
-        colorize: boolean;
+        colorize: boolean | 'all' | 'level' | 'message';
         prettyPrint: boolean;
         timestamp: boolean | (() => string | boolean);
         showLevel: boolean;
@@ -390,7 +390,7 @@ declare namespace winston {
 
     interface GenericTextTransportOptions {
         json?: boolean;
-        colorize?: boolean;
+        colorize?: boolean | 'all' | 'level' | 'message';
         colors?: any;
         prettyPrint?: boolean;
         showLevel?: boolean;

From 6ab9f281fd54c6e6b235d340db1ffc770eb0f665 Mon Sep 17 00:00:00 2001
From: Bruno Lemos <brunolemos@users.noreply.github.com>
Date: Sat, 31 Mar 2018 23:22:57 -0300
Subject: [PATCH 1005/1382] [react-navigation] Add SafeAreaView export

---
 types/react-navigation/index.d.ts | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index f86a47ccf5..c5fc09f62d 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -31,6 +31,7 @@ import * as React from 'react';
 import {
   Animated,
   TextStyle,
+  ViewProperties,
   ViewStyle,
   StyleProp,
 } from 'react-native';
@@ -903,3 +904,20 @@ export function withNavigation<T = {}>(
 export function withNavigationFocus<T = {}>(
   Component: React.ComponentType<T & NavigationInjectedProps>
 ): React.ComponentType<T>;
+
+/**
+ * SafeAreaView Component
+ */
+export type SafeAreaViewForceInsetValue = 'always' | 'never';
+export interface SafeAreaViewProps extends ViewProperties {
+  forceInset?: {
+    top?: SafeAreaViewForceInsetValue;
+    bottom?: SafeAreaViewForceInsetValue;
+    left?: SafeAreaViewForceInsetValue;
+    right?: SafeAreaViewForceInsetValue;
+    horizontal?: SafeAreaViewForceInsetValue;
+    vertical?: SafeAreaViewForceInsetValue;
+  };
+}
+
+export const SafeAreaView: React.ComponentClass<SafeAreaViewProps>;

From d01a5c6b1bd0dfd28bf2c30d3e78c738c3826c25 Mon Sep 17 00:00:00 2001
From: ataru <>
Date: Sun, 1 Apr 2018 14:11:40 +0900
Subject: [PATCH 1006/1382] fix sequelize update incorrect typings

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

diff --git a/types/sequelize/index.d.ts b/types/sequelize/index.d.ts
index 09af63c2ec..d0ed8efc50 100644
--- a/types/sequelize/index.d.ts
+++ b/types/sequelize/index.d.ts
@@ -4046,7 +4046,7 @@ declare namespace sequelize {
          * elements. The first element is always the number of affected rows, while the second element is the actual
          * affected rows (only supported in postgres with `options.returning` true.)
          */
-        update(values: TAttributes, options: UpdateOptions): Promise<[number, TInstance[]]>;
+        update(values: TAttributes, options?: UpdateOptions): Promise<[number, TInstance[]]>;
 
         /**
          * Run a describe query on the table. The result will be return to the listener as a hash of attributes and

From 90685eb26a801905ad6a4c44228a3a1d7636a28e Mon Sep 17 00:00:00 2001
From: Bruno Lemos <brunolemos@users.noreply.github.com>
Date: Sat, 31 Mar 2018 23:04:55 -0300
Subject: [PATCH 1007/1382] [react-navigation] Add indicatorStyle to
 TabBarTopProps

https://reactnavigation.org/docs/tab-navigator.html#tabbaroptions-for-tabbartop-default-tab-bar-on-android
---
 types/react-navigation/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index f86a47ccf5..0a131dc098 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -702,6 +702,7 @@ export function TabNavigator(
 export interface TabBarTopProps {
   activeTintColor: string;
   inactiveTintColor: string;
+  indicatorStyle: StyleProp<ViewStyle>;
   showIcon: boolean;
   showLabel: boolean;
   upperCaseLabel: boolean;

From 73cde47eb12ea09e02d8cd05902dc6e9693ddb79 Mon Sep 17 00:00:00 2001
From: Yonggang Luo <luoyonggang@gmail.com>
Date: Mon, 2 Apr 2018 00:07:31 +0800
Subject: [PATCH 1008/1382] On newest node-fetch, arrayBuffer are supported.

---
 types/node-fetch/index.d.ts          |  1 +
 types/node-fetch/node-fetch-tests.ts | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/types/node-fetch/index.d.ts b/types/node-fetch/index.d.ts
index d39b6db22e..aaaf30a5e3 100644
--- a/types/node-fetch/index.d.ts
+++ b/types/node-fetch/index.d.ts
@@ -77,6 +77,7 @@ export class Body {
 	json<T>(): Promise<T>;
 	text(): Promise<string>;
 	buffer(): Promise<Buffer>;
+	arrayBuffer(): Promise<ArrayBuffer>;
 }
 
 export class Response extends Body {
diff --git a/types/node-fetch/node-fetch-tests.ts b/types/node-fetch/node-fetch-tests.ts
index dbf140225f..564a31fe79 100644
--- a/types/node-fetch/node-fetch-tests.ts
+++ b/types/node-fetch/node-fetch-tests.ts
@@ -30,6 +30,10 @@ function test_fetchUrl() {
 	handlePromise(fetch("http://www.andlabs.net/html5/uCOR.php"));
 }
 
+function test_fetchUrlArrayBuffer() {
+	handlePromise(fetch("http://www.andlabs.net/html5/uCOR.php"), true);
+}
+
 function test_fetchUrlWithRequestObject() {
 	var requestOptions: RequestInit = {
 		method: "POST",
@@ -53,13 +57,17 @@ function test_globalFetchVar() {
 		});
 }
 
-function handlePromise(promise: Promise<Response>) {
-	promise.then((response) => {
+function handlePromise(promise: Promise<Response>, isArrayBuffer: boolean = false) {
+	promise.then((response):Promise<string | ArrayBuffer> => {
 		if (response.type === 'basic') {
 			// for test only
 		}
-		return response.text();
-	}).then((text) => {
+		if (isArrayBuffer) {
+			return response.arrayBuffer();
+		} else {
+			return response.text();
+		}
+	}).then((text:string | ArrayBuffer) => {
 		console.log(text);
 	});
 }

From 0dc7228f220436b37baa975358d5cf5ae2cc3a96 Mon Sep 17 00:00:00 2001
From: elvis <elvis.adomnica@gmail.com>
Date: Sun, 1 Apr 2018 22:08:47 +0200
Subject: [PATCH 1009/1382] Types for jackrabbit 4.3.0

---
 types/jackrabbit/index.d.ts          | 66 ++++++++++++++++++++++++++++
 types/jackrabbit/jackrabbit-tests.ts | 62 ++++++++++++++++++++++++++
 types/jackrabbit/tsconfig.json       | 16 +++++++
 types/jackrabbit/tslint.json         |  1 +
 4 files changed, 145 insertions(+)
 create mode 100644 types/jackrabbit/index.d.ts
 create mode 100644 types/jackrabbit/jackrabbit-tests.ts
 create mode 100644 types/jackrabbit/tsconfig.json
 create mode 100644 types/jackrabbit/tslint.json

diff --git a/types/jackrabbit/index.d.ts b/types/jackrabbit/index.d.ts
new file mode 100644
index 0000000000..ec0ff27fa9
--- /dev/null
+++ b/types/jackrabbit/index.d.ts
@@ -0,0 +1,66 @@
+// Type definitions for jackrabbit 4.3
+// Project: https://github.com/hunterloftis/jackrabbit
+// Definitions by: Elvis Adomnica <https://github.com/elvisvoer>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+import { Connection, Options, Message } from 'amqplib';
+
+declare namespace jackrabbit {
+    function jackrabbit(url: string): JackRabbit;
+
+    interface JackRabbit extends NodeJS.EventEmitter {
+        default(): Exchange;
+        direct(name?: string): Exchange;
+        fanout(name?: string): Exchange;
+        topic(name?: string): Exchange;
+        close(callback: (e: Error) => any): void;
+        getInternals: () => {
+            amqp: any;
+            connection: Connection;
+        };
+    }
+
+    enum exchangeType {
+        direct = 'direct',
+        fanout = 'fanout',
+        topic = 'topic',
+    }
+
+    interface Exchange extends NodeJS.EventEmitter {
+        name: string;
+        type: exchangeType;
+        options: Options.AssertExchange;
+        queue(options: QueueOptions): Queue;
+        connect(con: Connection): Exchange;
+        publish(message: any, options?: PublishOptions): Exchange;
+    }
+
+    type PublishOptions = Options.Publish & {
+        key: string;
+        reply?: AckCallback;
+    };
+
+    type QueueOptions = Options.AssertQueue & {
+        name?: string;
+        key?: string;
+        keys?: ReadonlyArray<string>;
+        prefetch?: number;
+    };
+
+    type AckCallback = (data?: any) => void;
+
+    interface Queue extends NodeJS.EventEmitter {
+        name: string;
+        options: QueueOptions;
+        connect(con: Connection): void;
+        consume: (
+            callback: (data: any, ack: AckCallback, nack: () => void, msg: Message) => void,
+            options?: Options.Consume
+        ) => void;
+        cancel(done: any): void;
+        purge(done: any): void;
+    }
+}
+
+export default jackrabbit.jackrabbit;
diff --git a/types/jackrabbit/jackrabbit-tests.ts b/types/jackrabbit/jackrabbit-tests.ts
new file mode 100644
index 0000000000..57bd961259
--- /dev/null
+++ b/types/jackrabbit/jackrabbit-tests.ts
@@ -0,0 +1,62 @@
+import jackrabbit from 'jackrabbit';
+
+const RABBIT_URL = 'amqp://localhost';
+
+function onMessage(data: any) {}
+function ack() {}
+
+// $ExpectError
+jackrabbit();
+// $ExpectError
+jackrabbit(1);
+
+const rabbit = jackrabbit(RABBIT_URL);
+
+// test default exchange based on '1-hello-world' example
+const defaultExchange = rabbit.default();
+const hello = defaultExchange.queue({ name: 'hello' });
+
+defaultExchange.publish('Hello World!', { key: 'hello' });
+
+hello.consume(onMessage, { noAck: true });
+
+// test fanout exchange based on '3-pubsub' example
+const fanoutExchange = rabbit.fanout();
+
+fanoutExchange.publish('this is a log');
+
+const fanoutQueue = fanoutExchange.queue({ exclusive: true });
+fanoutQueue.consume(onMessage, { noAck: true });
+
+// test direct exchange based on '4-routing' example
+const directExchange = rabbit.direct('direct_logs');
+
+directExchange.publish({ text: 'this is a harmless log' }, { key: 'info' });
+directExchange.publish({ text: 'this one is more important' }, { key: 'warning' });
+directExchange.publish({ text: 'pay attention to me!' }, { key: 'error' });
+
+const errorsQueue = directExchange.queue({ exclusive: true, key: 'error' });
+const logsQueue = directExchange.queue({ exclusive: true, keys: ['info', 'warning'] });
+
+errorsQueue.consume((onMessage, ack) => {});
+logsQueue.consume((onMessage, ack) => {});
+
+// test reply based on '6-rpc' example
+const exchange = rabbit.default();
+const rpc = exchange.queue({ name: 'rpc_queue', prefetch: 1, durable: false });
+
+exchange.publish(
+    { n: 40 },
+    {
+        key: 'rpc_queue',
+        reply: onReply,
+    }
+);
+
+function onReply(data: any) {}
+
+rpc.consume(onRequest);
+
+function onRequest(data: any, reply: (data: any) => void) {
+    reply({ field: 'value' });
+}
diff --git a/types/jackrabbit/tsconfig.json b/types/jackrabbit/tsconfig.json
new file mode 100644
index 0000000000..3d053557b2
--- /dev/null
+++ b/types/jackrabbit/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": ["index.d.ts", "jackrabbit-tests.ts"]
+}
diff --git a/types/jackrabbit/tslint.json b/types/jackrabbit/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/jackrabbit/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 803aa84d97c02fcbac4ad8f78d4067c717094b3d Mon Sep 17 00:00:00 2001
From: Mikko Vuorinen <vuorinem@users.noreply.github.com>
Date: Sun, 1 Apr 2018 21:35:01 +0100
Subject: [PATCH 1010/1382] [hellojs] fix response type parameter type

Add all valid response type values to the type HelloJSDisplayType as per OAuth 2.0 specification (https://www.iana.org/assignments/oauth-parameters/oauth-parameters.xhtml#endpoint)
---
 types/hellojs/index.d.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/types/hellojs/index.d.ts b/types/hellojs/index.d.ts
index e8efdaf19c..5b23b29e07 100644
--- a/types/hellojs/index.d.ts
+++ b/types/hellojs/index.d.ts
@@ -53,7 +53,15 @@ declare namespace hello {
 
     type HelloJSResponseCallback = (r: any, headers: any) => void;
 
-    type HelloJSTokenResponseType = "token" | "code";
+    type HelloJSTokenResponseType =
+        "code"
+        | "code id_token"
+        | "code id_token token"
+        | "code token"
+        | "id_token"
+        | "id_token token"
+        | "none"
+        | "token";
 
     type HelloJSDisplayType = "popup" | "page" | "none";
 

From b6e18405ce0ddfe8e72ede6519b3315a1847a396 Mon Sep 17 00:00:00 2001
From: Mikko Vuorinen <vuorinem@gmail.com>
Date: Sun, 1 Apr 2018 21:48:11 +0100
Subject: [PATCH 1011/1382] [hellojs] add test for response_type parameter

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

diff --git a/types/hellojs/hellojs-tests.ts b/types/hellojs/hellojs-tests.ts
index 4a4e068379..8cf42d11e4 100644
--- a/types/hellojs/hellojs-tests.ts
+++ b/types/hellojs/hellojs-tests.ts
@@ -4,7 +4,8 @@ hello.init({
         oauth: {
             version: 2,
             auth: '',
-            grant: ''
+            grant: '',
+            response_type: 'id_token token'
         },
         refresh: true,
         scope_delim: ' ',

From 2af878bd6b2dfaa7258498253421d7ddc5696c83 Mon Sep 17 00:00:00 2001
From: Ian Mobley <ianmobley@gmail.com>
Date: Sun, 1 Apr 2018 14:48:32 -0700
Subject: [PATCH 1012/1382] Add types for ReactLoadablePlugin, getBundles

---
 types/react-loadable/index.d.ts      |  1 +
 types/react-loadable/test/webpack.ts | 25 +++++++++++++++++++++++++
 types/react-loadable/tsconfig.json   |  4 +++-
 types/react-loadable/webpack.d.ts    | 23 +++++++++++++++++++++++
 4 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 types/react-loadable/test/webpack.ts
 create mode 100644 types/react-loadable/webpack.d.ts

diff --git a/types/react-loadable/index.d.ts b/types/react-loadable/index.d.ts
index d2229d4bf6..beeb569d4c 100644
--- a/types/react-loadable/index.d.ts
+++ b/types/react-loadable/index.d.ts
@@ -4,6 +4,7 @@
 //                 Oden S. <https://github.com/odensc>
 //                 Ian Ker-Seymer <https://github.com/ianks>
 //                 Tomek Łaziuk <https://github.com/tlaziuk>
+//                 Ian Mobley <https://github.com/iMobs>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
diff --git a/types/react-loadable/test/webpack.ts b/types/react-loadable/test/webpack.ts
new file mode 100644
index 0000000000..089994a23d
--- /dev/null
+++ b/types/react-loadable/test/webpack.ts
@@ -0,0 +1,25 @@
+import * as webpack from 'webpack';
+import { ReactLoadablePlugin, getBundles, Manifest } from 'react-loadable/webpack';
+
+const config: webpack.Configuration = {
+  plugins: [
+    new ReactLoadablePlugin(),
+    new ReactLoadablePlugin({
+      filename: 'react-loadable.json'
+    })
+  ]
+};
+
+const manifest: Manifest = {
+  react: [
+    {
+      id: 0,
+      name: "./node_modules/react/index.js",
+      file: "main.js"
+    }
+  ]
+};
+
+const manifestIds = ['react'];
+
+const bundles = getBundles(manifest, manifestIds);
diff --git a/types/react-loadable/tsconfig.json b/types/react-loadable/tsconfig.json
index 9d46ae0de9..a2ad20875b 100644
--- a/types/react-loadable/tsconfig.json
+++ b/types/react-loadable/tsconfig.json
@@ -19,8 +19,10 @@
     },
     "files": [
         "index.d.ts",
+        "webpack.d.ts",
         "test/index.tsx",
+        "test/webpack.ts",
         "test/imports/no-default.tsx",
         "test/imports/with-default.tsx"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/react-loadable/webpack.d.ts b/types/react-loadable/webpack.d.ts
new file mode 100644
index 0000000000..0e67a1a0bd
--- /dev/null
+++ b/types/react-loadable/webpack.d.ts
@@ -0,0 +1,23 @@
+import * as webpack from 'webpack';
+
+export namespace ReactLoadablePlugin {
+  interface Options {
+    filename: string;
+  }
+}
+
+export class ReactLoadablePlugin extends webpack.Plugin {
+  constructor(opts?: ReactLoadablePlugin.Options);
+}
+
+export interface Bundle {
+  id: number;
+  name: string;
+  file: string;
+}
+
+export interface Manifest {
+  [moduleId: string]: Bundle[];
+}
+
+export function getBundles(manifest: Manifest, moduleIds: string[]): Bundle[];

From 000e4a6c0fe2a9f5ce0cdd4bc5497fe0190edbd7 Mon Sep 17 00:00:00 2001
From: Syncfusion-JavaScript <packages@syncfusion.com>
Date: Mon, 2 Apr 2018 10:45:50 +0530
Subject: [PATCH 1013/1382] typescript file changed

---
 types/ej.web.all/index.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/ej.web.all/index.d.ts b/types/ej.web.all/index.d.ts
index 2342262ca6..837a7393cc 100644
--- a/types/ej.web.all/index.d.ts
+++ b/types/ej.web.all/index.d.ts
@@ -1,8 +1,8 @@
-// Type definitions for ej.web.all 16.1
+// Type definitions for ej.web.all 16.1
 // Project: http://help.syncfusion.com/js/typescript
 // Definitions by: Syncfusion <https://github.com/syncfusion>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version:2.3
+// TypeScript Version: 2.3
 
 /// <reference types="jquery" />
 

From 9427fe3dc5160e939807ae2465c64fa227aac335 Mon Sep 17 00:00:00 2001
From: Josh Goldberg <josh@fullscreenmario.com>
Date: Mon, 2 Apr 2018 00:08:52 -0700
Subject: [PATCH 1014/1382] Lint fixups

---
 types/jsoneditor-for-react/index.d.ts | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/types/jsoneditor-for-react/index.d.ts b/types/jsoneditor-for-react/index.d.ts
index 731820af30..707f03c63e 100644
--- a/types/jsoneditor-for-react/index.d.ts
+++ b/types/jsoneditor-for-react/index.d.ts
@@ -1,17 +1,17 @@
-// Type definitions for jsoneditor-for-react 0.0.1
+// Type definitions for jsoneditor-for-react 0.0
 // Project: https://github.com/mixj93/jsoneditor-for-react#readme
 // Definitions by: JoshGoldberg <https://github.com/joshuakgoldberg>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
-import * as React from "react"
-import JSONEditor, { JSONEditorOptions } from "jsoneditor"
+import * as React from "react";
+import JSONEditor, { JSONEditorOptions } from "jsoneditor";
 
-export interface IReactJsoneditorProps {
-    values: Object
+export interface ReactJsonEditorProps {
+    values: {};
 }
 
-export default class ReactJsoneditor extends React.Component<IReactJsoneditorProps> {
-    private editor?: JSONEditor
-    private options?: JSONEditorOptions
+export default class ReactJsoneditor extends React.Component<ReactJsonEditorProps> {
+    private editor?: JSONEditor;
+    private options?: JSONEditorOptions;
 }

From d9669207882e61a6092f374963899f79406642e7 Mon Sep 17 00:00:00 2001
From: Unknown <sampsonjoliver@outlook.com>
Date: Mon, 2 Apr 2018 18:24:03 +1000
Subject: [PATCH 1015/1382] Added mailgun js types

Add tslint and fix tsconfig


Add strictFunctionTypes


Fix lint errors and other misc


Mo fixes


Trigger the build again :/


Fix typescript version placement


Trying a ting


declare and export MailgunExport from types


Remove whitespace, add comma
---
 types/mailgun-js/index.d.ts          | 167 +++++++++++++++++++++++++++
 types/mailgun-js/mailgun-js-tests.ts |  32 +++++
 types/mailgun-js/tsconfig.json       |  16 +++
 types/mailgun-js/tslint.json         |   1 +
 4 files changed, 216 insertions(+)
 create mode 100644 types/mailgun-js/index.d.ts
 create mode 100644 types/mailgun-js/mailgun-js-tests.ts
 create mode 100644 types/mailgun-js/tsconfig.json
 create mode 100644 types/mailgun-js/tslint.json

diff --git a/types/mailgun-js/index.d.ts b/types/mailgun-js/index.d.ts
new file mode 100644
index 0000000000..0ab5efcf45
--- /dev/null
+++ b/types/mailgun-js/index.d.ts
@@ -0,0 +1,167 @@
+// Type definitions for mailgun-js 0.16
+// Project: https://github.com/bojand/mailgun-js
+// Definitions by: Sampson Oliver <https://github.com/sampsonjoliver>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/// <reference types="node" />
+
+declare const out: Mailgun.MailgunExport;
+export = out;
+
+declare namespace Mailgun {
+    interface ConstructorParams {
+        apiKey: string;
+        publicApiKey?: string;
+        domain: string;
+        mute?: boolean;
+        timeout?: number;
+        host?: string;
+        endpoint?: string;
+        protocol?: string;
+        port?: number;
+        retry?:
+            | number
+            | {
+                  times: number;
+                  interval: number;
+              };
+        proxy?: string;
+    }
+
+    interface Error {
+        statusCode: number;
+        message: string;
+    }
+
+    interface AttachmentParams {
+        data: string | Buffer | NodeJS.ReadWriteStream;
+        filename?: string;
+        knownLength?: number;
+        contentType?: string;
+    }
+
+    class Attachment {
+        constructor(params: AttachmentParams);
+        data: string | Buffer | NodeJS.ReadWriteStream;
+        filename?: string;
+        knownLength?: number;
+        contentType?: string;
+        getType(): string;
+    }
+
+    interface MailgunExport {
+        new (options: ConstructorParams): Mailgun;
+        (options: ConstructorParams): Mailgun;
+    }
+
+    namespace messages {
+        interface SendData {
+            from?: string;
+            to: string | string[];
+            cc?: string;
+            bcc?: string;
+            subject?: string;
+            text?: string;
+            html?: string;
+            attachment?: string | Buffer | NodeJS.ReadWriteStream | Attachment;
+        }
+
+        interface BatchData extends SendData {
+            "recipient-variables"?: BatchSendRecipientVars;
+        }
+
+        interface BatchSendRecipientVars {
+            [email: string]: {
+                first: string;
+                id: number;
+            };
+        }
+
+        interface SendResponse {
+            message: string;
+            id: string;
+        }
+    }
+
+    namespace lists {
+        interface MemberCreateData {
+            subscribed: boolean;
+            address: string;
+            name: string;
+            vars?: object;
+        }
+
+        interface MemberUpdateData {
+            subscribed: boolean;
+            name: string;
+            vars?: object;
+        }
+
+        interface Members {
+            create(
+                data: MemberCreateData,
+                callback?: (err: Error, data: any) => void
+            ): Promise<any>;
+
+            add(
+                data: MemberCreateData[],
+                callback?: (err: Error, data: any) => void
+            ): Promise<any>;
+
+            list(callback?: (err: Error, data: any) => void): Promise<any>;
+        }
+
+        interface Member {
+            update(
+                data: MemberUpdateData,
+                callback?: (err: Error, data: any) => void
+            ): Promise<any>;
+        }
+    }
+
+    namespace validation {
+        interface ParseResponse {
+            parsed: string[];
+            unparseable: string[];
+        }
+
+        interface ValidateResponse {
+            is_valid: boolean;
+        }
+    }
+
+    interface Mailgun {
+        messages(): Messages;
+        lists(list: string): Lists;
+        Attachment: typeof Attachment;
+        validateWebhook(
+            bodyTimestamp: number,
+            bodyToken: string,
+            bodySignature: string
+        ): boolean;
+
+        parse(
+            addressList: string[],
+            callback?: (error: Error, body: validation.ValidateResponse) => void
+        ): Promise<validation.ParseResponse>;
+
+        validate(
+            address: string,
+            callback?: (error: Error, body: validation.ValidateResponse) => void
+        ): Promise<validation.ValidateResponse>;
+    }
+
+    interface Lists {
+        info(callback?: (error: Error, data: any) => void): Promise<any>;
+        members(): lists.Members;
+        members(member: string): lists.Member;
+    }
+
+    interface Messages {
+        send(
+            data: messages.SendData | messages.BatchData,
+            callback?: (error: Error, body: messages.SendResponse) => void
+        ): Promise<messages.SendResponse>;
+    }
+}
diff --git a/types/mailgun-js/mailgun-js-tests.ts b/types/mailgun-js/mailgun-js-tests.ts
new file mode 100644
index 0000000000..dfbe8ab4a1
--- /dev/null
+++ b/types/mailgun-js/mailgun-js-tests.ts
@@ -0,0 +1,32 @@
+import * as mailgunFactory from "mailgun-js";
+import mailgunFactory2 = require('mailgun-js');
+
+const mailgun = new mailgunFactory({
+    apiKey: "auth.api_key",
+    domain: "auth.domain"
+});
+
+const mailgun2 = new mailgunFactory2({
+    apiKey: "auth.api_key",
+    domain: "auth.domain"
+});
+
+mailgun.messages().send(
+    {
+        to: "fixture.message.to"
+    },
+    err => {
+        console.log;
+    }
+);
+
+mailgun.messages().send(
+    {
+        to: "someone@email.com",
+        attachment: new mailgun.Attachment({
+            data: "filepath",
+            filename: "my_custom_name.png"
+        })
+    },
+    (err, body) => {}
+);
diff --git a/types/mailgun-js/tsconfig.json b/types/mailgun-js/tsconfig.json
new file mode 100644
index 0000000000..b6a747659c
--- /dev/null
+++ b/types/mailgun-js/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": false,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": ["index.d.ts", "mailgun-js-tests.ts"]
+}
diff --git a/types/mailgun-js/tslint.json b/types/mailgun-js/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/mailgun-js/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 5a3e0b2f34ea208b7355e75b048d159bfe5735b5 Mon Sep 17 00:00:00 2001
From: Joha2n <johann.rakotoharisoa@gmail.com>
Date: Mon, 2 Apr 2018 12:59:11 +0200
Subject: [PATCH 1016/1382] feat(react): add StrictMode definition (#24629)

---
 types/react/index.d.ts   | 4 +++-
 types/react/test/tsx.tsx | 7 +++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index c38f57b0a7..96c23cded3 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for React 16.1
+// Type definitions for React 16.3
 // Project: http://facebook.github.io/react/
 // Definitions by: Asana <https://asana.com>
 //                 AssureSign <http://www.assuresign.com>
@@ -16,6 +16,7 @@
 //                 Josh Rutherford <https://github.com/theruther4d>
 //                 Guilherme Hübner <https://github.com/guilhermehubner>
 //                 Josh Goldberg <https://github.com/joshuakgoldberg>
+//                 Johann Rakotoharisoa <https://github.com/jrakotoharisoa>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -268,6 +269,7 @@ declare namespace React {
 
     const Children: ReactChildren;
     const Fragment: ComponentType;
+    const StrictMode: ComponentType;
     const version: string;
 
     //
diff --git a/types/react/test/tsx.tsx b/types/react/test/tsx.tsx
index 7fa151fd29..a9ce5138de 100644
--- a/types/react/test/tsx.tsx
+++ b/types/react/test/tsx.tsx
@@ -89,6 +89,13 @@ const StatelessComponentWithoutProps: React.SFC = (props) => {
     </React.Fragment>
 </div>;
 
+// Strict Mode
+<div>
+    <React.StrictMode>
+        <div />
+    </React.StrictMode>
+</div>;
+
 // Below tests that setState() works properly for both regular and callback modes
 class SetStateTest extends React.Component<{}, { foo: boolean, bar: boolean }> {
     handleSomething = () => {

From 9a50625d28bc22297c4c210bd8a3dce3cbd73511 Mon Sep 17 00:00:00 2001
From: Diogo Franco <diogomfranco@gmail.com>
Date: Mon, 2 Apr 2018 22:59:49 +0900
Subject: [PATCH 1017/1382] Add new React 16.3 lifecycle events (#24577)

* Add new lifecycle events to React (16.3)

* Add tests, fix lint

* Bump version

* Improve inference of snapshot

* Improve tests

* Correctly support returning partial state from getDerivedStateFromProps

* Remove redundant type

* Fix lint error

* Write the incorrect subclassing test in a more verbose way
---
 types/react/index.d.ts   | 153 ++++++++++++++++++++++++++++++++-------
 types/react/test/tsx.tsx |  35 +++++++++
 2 files changed, 162 insertions(+), 26 deletions(-)

diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index 96c23cded3..13faef3d01 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -280,7 +280,7 @@ declare namespace React {
 
     // Base component for plain JS classes
     // tslint:disable-next-line:no-empty-interface
-    interface Component<P = {}, S = {}> extends ComponentLifecycle<P, S> { }
+    interface Component<P = {}, S = {}, SS = never> extends ComponentLifecycle<P, S, SS> { }
     class Component<P, S> {
         constructor(props: P, context?: any);
 
@@ -333,7 +333,7 @@ declare namespace React {
         displayName?: string;
     }
 
-    interface ComponentClass<P = {}> {
+    interface ComponentClass<P = {}> extends StaticLifecycle<P, any> {
         new (props: P, context?: any): Component<P, ComponentState>;
         propTypes?: ValidationMap<P>;
         contextTypes?: ValidationMap<any>;
@@ -361,24 +361,14 @@ declare namespace React {
     // Component Specs and Lifecycle
     // ----------------------------------------------------------------------
 
-    interface ComponentLifecycle<P, S> {
-        /**
-         * Called immediately before mounting occurs, and before `Component#render`.
-         * Avoid introducing any side-effects or subscriptions in this method.
-         */
-        componentWillMount?(): void;
+    // This should actually be something like `Lifecycle<P, S> | DeprecatedLifecycle<P, S>`,
+    // as React will _not_ call the deprecated lifecycle methods if any of the new lifecycle
+    // methods are present.
+    interface ComponentLifecycle<P, S, SS = never> extends NewLifecycle<P, S, SS>, DeprecatedLifecycle<P, S> {
         /**
          * Called immediately after a compoment is mounted. Setting state here will trigger re-rendering.
          */
         componentDidMount?(): void;
-        /**
-         * Called when the component may be receiving new props.
-         * React may call this even if props have not changed, so be sure to compare new and existing
-         * props if you only want to handle changes.
-         *
-         * Calling `Component#setState` generally does not trigger this method.
-         */
-        componentWillReceiveProps?(nextProps: Readonly<P>, nextContext: any): void;
         /**
          * Called to determine whether the change in props and state should trigger a re-render.
          *
@@ -390,16 +380,6 @@ declare namespace React {
          * and `componentDidUpdate` will not be called.
          */
         shouldComponentUpdate?(nextProps: Readonly<P>, nextState: Readonly<S>, nextContext: any): boolean;
-        /**
-         * Called immediately before rendering when new props or state is received. Not called for the initial render.
-         *
-         * Note: You cannot call `Component#setState` here.
-         */
-        componentWillUpdate?(nextProps: Readonly<P>, nextState: Readonly<S>, nextContext: any): void;
-        /**
-         * Called immediately after updating occurs. Not called for the initial render.
-         */
-        componentDidUpdate?(prevProps: Readonly<P>, prevState: Readonly<S>, prevContext: any): void;
         /**
          * Called immediately before a component is destroyed. Perform any necessary cleanup in this method, such as
          * cancelled network requests, or cleaning up any DOM elements created in `componentDidMount`.
@@ -412,6 +392,127 @@ declare namespace React {
         componentDidCatch?(error: Error, errorInfo: ErrorInfo): void;
     }
 
+    // Unfortunately, we have no way of declaring that the component constructor must implement this
+    interface StaticLifecycle<P, S> {
+        getDerivedStateFromProps?: GetDerivedStateFromProps<P, S>;
+    }
+
+    type GetDerivedStateFromProps<P, S> =
+        /**
+         * Returns an update to a component's state based on its new props and old state.
+         *
+         * Note: its presence prevents any of the deprecated lifecycle methods from being invoked
+         */
+        (nextProps: Readonly<P>, prevState: Readonly<S>) => Partial<S> | null;
+
+    // This should be "infer SS" but can't use it yet
+    interface NewLifecycle<P, S, SS> {
+        /**
+         * Runs before React applies the result of `render` to the document, and
+         * returns an object to be given to componentDidUpdate. Useful for saving
+         * things such as scroll position before `render` causes changes to it.
+         *
+         * Note: the presence of getSnapshotBeforeUpdate prevents any of the deprecated
+         * lifecycle events from running.
+         */
+        getSnapshotBeforeUpdate?(prevProps: Readonly<P>, prevState: Readonly<S>): SS | null;
+        /**
+         * Called immediately after updating occurs. Not called for the initial render.
+         *
+         * The snapshot is only present if getSnapshotBeforeUpdate is present and returns non-null.
+         */
+        componentDidUpdate?(prevProps: Readonly<P>, prevState: Readonly<S>, snapshot?: SS): void;
+    }
+
+    interface DeprecatedLifecycle<P, S> {
+        /**
+         * Called immediately before mounting occurs, and before `Component#render`.
+         * Avoid introducing any side-effects or subscriptions in this method.
+         *
+         * Note: the presence of getSnapshotBeforeUpdate or getDerivedStateFromProps
+         * prevents this from being invoked.
+         *
+         * @deprecated 16.3, use componentDidMount or the constructor instead; will stop working in React 17
+         * @see https://reactjs.org/blog/2018/03/27/update-on-async-rendering.html#initializing-state
+         * @see https://reactjs.org/blog/2018/03/27/update-on-async-rendering.html#gradual-migration-path
+         */
+        componentWillMount?(): void;
+        /**
+         * Called immediately before mounting occurs, and before `Component#render`.
+         * Avoid introducing any side-effects or subscriptions in this method.
+         *
+         * This method will not stop working in React 17.
+         *
+         * Note: the presence of getSnapshotBeforeUpdate or getDerivedStateFromProps
+         * prevents this from being invoked.
+         *
+         * @deprecated 16.3, use componentDidMount or the constructor instead
+         * @see https://reactjs.org/blog/2018/03/27/update-on-async-rendering.html#initializing-state
+         * @see https://reactjs.org/blog/2018/03/27/update-on-async-rendering.html#gradual-migration-path
+         */
+        UNSAFE_componentWillMount?(): void;
+        /**
+         * Called when the component may be receiving new props.
+         * React may call this even if props have not changed, so be sure to compare new and existing
+         * props if you only want to handle changes.
+         *
+         * Calling `Component#setState` generally does not trigger this method.
+         *
+         * Note: the presence of getSnapshotBeforeUpdate or getDerivedStateFromProps
+         * prevents this from being invoked.
+         *
+         * @deprecated 16.3, use static getDerivedStateFromProps instead; will stop working in React 17
+         * @see https://reactjs.org/blog/2018/03/27/update-on-async-rendering.html#updating-state-based-on-props
+         * @see https://reactjs.org/blog/2018/03/27/update-on-async-rendering.html#gradual-migration-path
+         */
+        componentWillReceiveProps?(nextProps: Readonly<P>, nextContext: any): void;
+        /**
+         * Called when the component may be receiving new props.
+         * React may call this even if props have not changed, so be sure to compare new and existing
+         * props if you only want to handle changes.
+         *
+         * Calling `Component#setState` generally does not trigger this method.
+         *
+         * This method will not stop working in React 17.
+         *
+         * Note: the presence of getSnapshotBeforeUpdate or getDerivedStateFromProps
+         * prevents this from being invoked.
+         *
+         * @deprecated 16.3, use static getDerivedStateFromProps instead
+         * @see https://reactjs.org/blog/2018/03/27/update-on-async-rendering.html#updating-state-based-on-props
+         * @see https://reactjs.org/blog/2018/03/27/update-on-async-rendering.html#gradual-migration-path
+         */
+        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<P>, nextContext: any): void;
+        /**
+         * Called immediately before rendering when new props or state is received. Not called for the initial render.
+         *
+         * Note: You cannot call `Component#setState` here.
+         *
+         * Note: the presence of getSnapshotBeforeUpdate or getDerivedStateFromProps
+         * prevents this from being invoked.
+         *
+         * @deprecated 16.3, use getSnapshotBeforeUpdate instead; will stop working in React 17
+         * @see https://reactjs.org/blog/2018/03/27/update-on-async-rendering.html#reading-dom-properties-before-an-update
+         * @see https://reactjs.org/blog/2018/03/27/update-on-async-rendering.html#gradual-migration-path
+         */
+        componentWillUpdate?(nextProps: Readonly<P>, nextState: Readonly<S>, nextContext: any): void;
+        /**
+         * Called immediately before rendering when new props or state is received. Not called for the initial render.
+         *
+         * Note: You cannot call `Component#setState` here.
+         *
+         * This method will not stop working in React 17.
+         *
+         * Note: the presence of getSnapshotBeforeUpdate or getDerivedStateFromProps
+         * prevents this from being invoked.
+         *
+         * @deprecated 16.3, use getSnapshotBeforeUpdate instead
+         * @see https://reactjs.org/blog/2018/03/27/update-on-async-rendering.html#reading-dom-properties-before-an-update
+         * @see https://reactjs.org/blog/2018/03/27/update-on-async-rendering.html#gradual-migration-path
+         */
+        UNSAFE_componentWillUpdate?(nextProps: Readonly<P>, nextState: Readonly<S>, nextContext: any): void;
+    }
+
     interface Mixin<P, S> extends ComponentLifecycle<P, S> {
         mixins?: Array<Mixin<P, S>>;
         statics?: {
diff --git a/types/react/test/tsx.tsx b/types/react/test/tsx.tsx
index a9ce5138de..b086e35f9f 100644
--- a/types/react/test/tsx.tsx
+++ b/types/react/test/tsx.tsx
@@ -129,3 +129,38 @@ export abstract class SetStateTestForAndedState<P, S> extends React.Component<P,
 		this.setState({ baseProp: 'foobar' });
 	}
 }
+
+interface NewProps { foo: string; }
+interface NewState { bar: string; }
+
+class ComponentWithNewLifecycles extends React.Component<NewProps, NewState, { baz: string }> {
+    static getDerivedStateFromProps: React.GetDerivedStateFromProps<NewProps, NewState> = (nextProps) => {
+        return { bar: `${nextProps.foo}bar` };
+    }
+
+    getSnapshotBeforeUpdate(prevProps: Readonly<NewProps>) {
+        return { baz: `${prevProps.foo}baz` };
+    }
+
+    componentDidUpdate(prevProps: Readonly<NewProps>, prevState: Readonly<NewState>, snapshot: { baz: string }) {
+        return;
+    }
+
+    render() {
+        return this.state.bar;
+    }
+}
+
+class ComponentWithLargeState extends React.Component<{}, Record<'a'|'b'|'c', string>> {
+    static getDerivedStateFromProps: React.GetDerivedStateFromProps<{}, Record<'a'|'b'|'c', string>> = () => {
+        return { a: 'a' };
+    }
+}
+
+const componentWithBadLifecycle = new (class extends React.Component<{}, {}, number> {})({});
+componentWithBadLifecycle.getSnapshotBeforeUpdate = () => { // $ExpectError
+    return 'number';
+};
+componentWithBadLifecycle.componentDidUpdate = (prevProps: {}, prevState: {}, snapshot?: string) => { // $ExpectError
+    return;
+};

From 6a93d242b93d1e31d92755dbe53d30d99f1c7ed3 Mon Sep 17 00:00:00 2001
From: doomsower <K.Kuznetcov@gmail.com>
Date: Mon, 2 Apr 2018 18:17:24 +0300
Subject: [PATCH 1018/1382] Update set/getBucketPolicy definitions

---
 types/minio/index.d.ts     | 11 +++++------
 types/minio/minio-tests.ts | 14 ++++++++++----
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/types/minio/index.d.ts b/types/minio/index.d.ts
index 7e920428ff..94d28cdd5a 100644
--- a/types/minio/index.d.ts
+++ b/types/minio/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for minio 4.0
+// Type definitions for minio 5.0
 // Project: https://github.com/minio/minio-js#readme
 // Definitions by: Barin Britva <https://github.com/barinbritva>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -11,7 +11,6 @@ import EventEmitter = NodeJS.EventEmitter;
 
 // Exports only from typings
 export type Region = 'us-east-1'|'us-west-1'|'us-west-2'|'eu-west-1'|'eu-central-1'|'ap-southeast-1'|'ap-northeast-1'|'ap-southeast-2'|'sa-east-1'|'cn-north-1'|string;
-export type PolicyValue = 'none'|'readonly'|'writeonly'|'readwrite';
 export type NoResultCallback = (error: Error|null) => void;
 export type ResultCallback<T> = (error: Error|null, result: T) => void;
 
@@ -158,11 +157,11 @@ export class Client {
     // todo #low Specify events
     listenBucketNotification(bucketName: string, prefix: string, suffix: string, events: string[]): EventEmitter;
 
-    getBucketPolicy(bucketName: string, objectPrefix: string, callback: ResultCallback<PolicyValue>): void;
-    getBucketPolicy(bucketName: string, objectPrefix: string): Promise<PolicyValue>;
+    getBucketPolicy(bucketName: string, callback: ResultCallback<string>): void;
+    getBucketPolicy(bucketName: string): Promise<string>;
 
-    setBucketPolicy(bucketName: string, objectPrefix: string, bucketPolice: PolicyValue, callback: NoResultCallback): void;
-    setBucketPolicy(bucketName: string, objectPrefix: string, bucketPolice: PolicyValue): Promise<void>;
+    setBucketPolicy(bucketName: string, bucketPolicy: string, callback: NoResultCallback): void;
+    setBucketPolicy(bucketName: string, bucketPolicy: string): Promise<void>;
 
     // Other
     newPostPolicy(): PostPolicy;
diff --git a/types/minio/minio-tests.ts b/types/minio/minio-tests.ts
index 78a7fab267..9307e68b20 100644
--- a/types/minio/minio-tests.ts
+++ b/types/minio/minio-tests.ts
@@ -106,8 +106,14 @@ minio.removeAllBucketNotification('testBucket');
 
 minio.listenBucketNotification('testBucket', 'pref_', '_suf', [ Minio.ObjectCreatedAll ]);
 
-minio.getBucketPolicy('testBucket', 'pref_', (error: Error|null, policy: Minio.PolicyValue) => { console.log(error, policy); });
-minio.getBucketPolicy('testBucket', '');
+minio.getBucketPolicy('testBucket', (error: Error|null, policy: string) => { console.log(error, policy); });
+minio.getBucketPolicy('testBucket');
 
-minio.setBucketPolicy('testBucket', '', Minio.Policy.READWRITE, (error: Error|null) => { console.log(error); });
-minio.setBucketPolicy('testBucket', 'pref_', Minio.Policy.WRITEONLY);
+const testPolicy = `{"Version":"2012-10-17","Statement":[{"Action":["s3:GetBucketLocation"],"Effect":"Allow",
+"Principal":{"AWS":["*"]},"Resource":["arn:aws:s3:::bucketName"],"Sid":""},{"Action":["s3:ListBucket"],
+"Condition":{"StringEquals":{"s3:prefix":["foo","prefix/"]}},"Effect":"Allow","Principal":{"AWS":["*"]},
+"Resource":["arn:aws:s3:::bucketName"],"Sid":""},{"Action":["s3:GetObject"],"Effect":"Allow",
+"Principal":{"AWS":["*"]},"Resource":["arn:aws:s3:::bucketName/foo*","arn:aws:s3:::bucketName/prefix/*"],"Sid":""}]}
+`;
+minio.setBucketPolicy('testBucket',  testPolicy, (error: Error|null) => { console.log(error); });
+minio.setBucketPolicy('testBucket', testPolicy);

From 86eb0fa035a3ce4529c78eda782ed9886c8b0c2f Mon Sep 17 00:00:00 2001
From: doomsower <K.Kuznetcov@gmail.com>
Date: Mon, 2 Apr 2018 18:24:55 +0300
Subject: [PATCH 1019/1382] Also update bucketExists

---
 types/minio/index.d.ts     | 4 ++--
 types/minio/minio-tests.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/types/minio/index.d.ts b/types/minio/index.d.ts
index 94d28cdd5a..2dda500396 100644
--- a/types/minio/index.d.ts
+++ b/types/minio/index.d.ts
@@ -84,8 +84,8 @@ export class Client {
     listBuckets(callback: ResultCallback<BucketItemFromList[]>): void;
     listBuckets(): Promise<BucketItemFromList>;
 
-    bucketExists(bucketName: string, callback: NoResultCallback): void;
-    bucketExists(bucketName: string): Promise<void>;
+    bucketExists(bucketName: string, callback: ResultCallback<boolean>): void;
+    bucketExists(bucketName: string): Promise<boolean>;
 
     removeBucket(bucketName: string, callback: NoResultCallback): void;
     removeBucket(bucketName: string): Promise<void>;
diff --git a/types/minio/minio-tests.ts b/types/minio/minio-tests.ts
index 9307e68b20..05f8283d32 100644
--- a/types/minio/minio-tests.ts
+++ b/types/minio/minio-tests.ts
@@ -16,7 +16,7 @@ minio.makeBucket('testBucket', 'region-not-from-list');
 minio.listBuckets((error: Error|null, bucketList: Minio.BucketItemFromList[]) => { console.log(error, bucketList); });
 minio.listBuckets();
 
-minio.bucketExists('testBucket', (error: Error|null) => { console.log(error); });
+minio.bucketExists('testBucket', (error: Error|null, exists: boolean) => { console.log(error, exists); });
 minio.bucketExists('testBucket');
 
 minio.removeBucket('testBucket', (error: Error|null) => { console.log(error); });

From 781b4af34b7d3a0f0e7847c773dc8ed72ef23170 Mon Sep 17 00:00:00 2001
From: Ian Mobley <ianmobley@gmail.com>
Date: Mon, 2 Apr 2018 09:06:19 -0700
Subject: [PATCH 1020/1382] Convert to match commonJS export syntax.

I'm not entirely sure how to get the interfaces to export as well, but
they're not really necessary beside for checking sanity of arguments.
---
 types/react-loadable/test/webpack.ts |  4 +--
 types/react-loadable/webpack.d.ts    | 39 ++++++++++++++++------------
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/types/react-loadable/test/webpack.ts b/types/react-loadable/test/webpack.ts
index 089994a23d..741d0d4733 100644
--- a/types/react-loadable/test/webpack.ts
+++ b/types/react-loadable/test/webpack.ts
@@ -1,5 +1,5 @@
 import * as webpack from 'webpack';
-import { ReactLoadablePlugin, getBundles, Manifest } from 'react-loadable/webpack';
+import { ReactLoadablePlugin, getBundles } from 'react-loadable/webpack';
 
 const config: webpack.Configuration = {
   plugins: [
@@ -10,7 +10,7 @@ const config: webpack.Configuration = {
   ]
 };
 
-const manifest: Manifest = {
+const manifest = {
   react: [
     {
       id: 0,
diff --git a/types/react-loadable/webpack.d.ts b/types/react-loadable/webpack.d.ts
index 0e67a1a0bd..54732527d8 100644
--- a/types/react-loadable/webpack.d.ts
+++ b/types/react-loadable/webpack.d.ts
@@ -1,23 +1,30 @@
-import * as webpack from 'webpack';
+import webpack = require("webpack");
 
-export namespace ReactLoadablePlugin {
+declare namespace LoadableExport {
   interface Options {
     filename: string;
   }
+
+  class ReactLoadablePlugin extends webpack.Plugin {
+    constructor(opts?: Options);
+  }
+
+  interface Bundle {
+    id: number;
+    name: string;
+    file: string;
+  }
+
+  interface Manifest {
+    [moduleId: string]: Bundle[];
+  }
+
+  function getBundles(manifest: Manifest, moduleIds: string[]): Bundle[];
 }
 
-export class ReactLoadablePlugin extends webpack.Plugin {
-  constructor(opts?: ReactLoadablePlugin.Options);
-}
+declare const exports: {
+  getBundles: typeof LoadableExport.getBundles;
+  ReactLoadablePlugin: typeof LoadableExport.ReactLoadablePlugin;
+};
 
-export interface Bundle {
-  id: number;
-  name: string;
-  file: string;
-}
-
-export interface Manifest {
-  [moduleId: string]: Bundle[];
-}
-
-export function getBundles(manifest: Manifest, moduleIds: string[]): Bundle[];
+export = exports;

From fac20c19ebeb6961ed9269371469546b44fe243d Mon Sep 17 00:00:00 2001
From: Ian Mobley <ianmobley@gmail.com>
Date: Mon, 2 Apr 2018 10:10:57 -0700
Subject: [PATCH 1021/1382] quotes consistency

---
 types/react-loadable/test/webpack.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/react-loadable/test/webpack.ts b/types/react-loadable/test/webpack.ts
index 741d0d4733..08885e418d 100644
--- a/types/react-loadable/test/webpack.ts
+++ b/types/react-loadable/test/webpack.ts
@@ -14,8 +14,8 @@ const manifest = {
   react: [
     {
       id: 0,
-      name: "./node_modules/react/index.js",
-      file: "main.js"
+      name: './node_modules/react/index.js',
+      file: 'main.js'
     }
   ]
 };

From 40c185efab5f4ced5618490ece7dcdc79c8dc9e2 Mon Sep 17 00:00:00 2001
From: Emily Marigold Klassen <forivall@gmail.com>
Date: Mon, 2 Apr 2018 10:57:37 -0700
Subject: [PATCH 1022/1382] fix(dotenv): add missing "load" alias

---
 types/dotenv/dotenv-tests.ts | 2 ++
 types/dotenv/index.d.ts      | 1 +
 2 files changed, 3 insertions(+)

diff --git a/types/dotenv/dotenv-tests.ts b/types/dotenv/dotenv-tests.ts
index df05475c17..613da3b056 100644
--- a/types/dotenv/dotenv-tests.ts
+++ b/types/dotenv/dotenv-tests.ts
@@ -11,6 +11,8 @@ dotenv.config({
     encoding: 'utf8'
 });
 
+dotenv.load();
+
 const parsed = dotenv.parse("ENVIRONMENT=production\nDEBUG=no\n");
 const debug: string = parsed['DEBUG'];
 
diff --git a/types/dotenv/index.d.ts b/types/dotenv/index.d.ts
index 831790138c..4dd67b15c0 100644
--- a/types/dotenv/index.d.ts
+++ b/types/dotenv/index.d.ts
@@ -20,6 +20,7 @@ export function parse(src: string | Buffer): {[name: string]: string};
  * Example: 'KEY=value' becomes { parsed: { KEY: 'value' } }
  */
 export function config(options?: DotenvOptions): DotenvResult;
+export const load: typeof config;
 
 export interface DotenvOptions {
     /**

From 687e0c7a6d773db323d07196cbf50e7de2190825 Mon Sep 17 00:00:00 2001
From: Kerrick Long <me@kerricklong.com>
Date: Mon, 2 Apr 2018 14:32:55 -0500
Subject: [PATCH 1023/1382] fix(react-captcha): Add missing execute method

Added in https://github.com/appleboy/react-recaptcha/pull/207
---
 types/react-recaptcha/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/react-recaptcha/index.d.ts b/types/react-recaptcha/index.d.ts
index ecfd0db003..595cc1916e 100644
--- a/types/react-recaptcha/index.d.ts
+++ b/types/react-recaptcha/index.d.ts
@@ -34,4 +34,5 @@ declare class Recaptcha extends Component<Recaptcha.RecaptchaProps> {
     static propTypes: any;
     static defaultProps: Recaptcha.RecaptchaProps;
     reset(): void;
+    execute(): void;
 }

From ce01a4e456fb0f9530d833b8626ed285478909f0 Mon Sep 17 00:00:00 2001
From: Mohsen Azimi <mazimi@lyft.com>
Date: Mon, 2 Apr 2018 17:47:15 -0700
Subject: [PATCH 1024/1382] Make stratgey an exported class

---
 types/passport/index.d.ts        | 16 ++++++++--------
 types/passport/passport-tests.ts | 12 ++++++++----
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/types/passport/index.d.ts b/types/passport/index.d.ts
index 06c7f0b9db..cee220e901 100644
--- a/types/passport/index.d.ts
+++ b/types/passport/index.d.ts
@@ -5,6 +5,7 @@
 //                 Igor Belagorudsky <https://github.com/theigor>
 //                 Tomek Łaziuk <https://github.com/tlaziuk>
 //                 Daniel Perez Alvarez <https://github.com/danielpa9708>
+//                 Mohsen Azimi <https://github.com/mohsen1>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -75,12 +76,15 @@ declare namespace passport {
         Passport: PassportStatic["Authenticator"];
     }
 
-    interface Strategy {
+    /**
+     * @param T Strategy option config
+     */
+    export abstract class Strategy<T = object> {
         name?: string;
-        authenticate(this: StrategyCreated<this>, req: express.Request, options?: any): any;
-    }
 
-    interface StrategyCreatedStatic {
+        /** This method must be implemented by the subclass */
+        abstract authenticate(req: express.Request, options?: T): any;
+
         /**
          * Authenticate `user`, with optional `info`.
          *
@@ -124,10 +128,6 @@ declare namespace passport {
         error(err: any): void;
     }
 
-    type StrategyCreated<T, O = T & StrategyCreatedStatic> = {
-        [P in keyof O]: O[P];
-    };
-
     interface Profile {
         provider: string;
         id: string;
diff --git a/types/passport/passport-tests.ts b/types/passport/passport-tests.ts
index 630091afc7..f7d988c56c 100644
--- a/types/passport/passport-tests.ts
+++ b/types/passport/passport-tests.ts
@@ -2,14 +2,18 @@ import * as passport from 'passport';
 import express = require('express');
 import 'express-session';
 
-class TestStrategy implements passport.Strategy {
+class TestStrategy extends passport.Strategy {
     name = 'test';
-    constructor() { }
-    authenticate(this: passport.StrategyCreated<this>, req: express.Request) {
+
+    authenticate(req: express.Request) {
         const user: TestUser = {
             id: 0,
         };
-        this.success(user);
+        if (Math.random() > 0.5) {
+            this.fail();
+        } else {
+            this.success(user);
+        }
     }
 }
 

From 57de6ba750615bf1d723ae45403996ec6a7f38f0 Mon Sep 17 00:00:00 2001
From: Mohsen Azimi <mazimi@lyft.com>
Date: Mon, 2 Apr 2018 18:16:51 -0700
Subject: [PATCH 1025/1382] extend

---
 types/passport-anonymous/index.d.ts    | 4 ++--
 types/passport-beam/index.d.ts         | 4 ++--
 types/passport-discord/index.d.ts      | 4 ++--
 types/passport-facebook/index.d.ts     | 4 ++--
 types/passport-github/index.d.ts       | 4 ++--
 types/passport-github2/index.d.ts      | 4 ++--
 types/passport-google-oauth/index.d.ts | 4 ++--
 types/passport-http-bearer/index.d.ts  | 4 ++--
 types/passport-http/index.d.ts         | 8 ++++----
 types/passport-kakao/index.d.ts        | 4 ++--
 types/passport-oauth2/index.d.ts       | 2 +-
 types/passport-saml/index.d.ts         | 2 +-
 types/passport-twitter/index.d.ts      | 4 ++--
 types/passport-unique-token/index.d.ts | 4 ++--
 14 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/types/passport-anonymous/index.d.ts b/types/passport-anonymous/index.d.ts
index 6e45ed3a23..969f158526 100644
--- a/types/passport-anonymous/index.d.ts
+++ b/types/passport-anonymous/index.d.ts
@@ -6,6 +6,6 @@
 
 import * as passport from "passport";
 
-export class Strategy implements passport.Strategy {
-    authenticate: () => void;
+export class Strategy extends passport.Strategy {
+    authenticate(): void;
 }
diff --git a/types/passport-beam/index.d.ts b/types/passport-beam/index.d.ts
index 6d7d1de430..65096a9bd6 100644
--- a/types/passport-beam/index.d.ts
+++ b/types/passport-beam/index.d.ts
@@ -10,10 +10,10 @@
 import * as passport from 'passport';
 import * as express from  'express';
 
-export class Strategy implements passport.Strategy {
+export class Strategy extends passport.Strategy {
 	constructor(options: Strategy.IStrategyOption, verify: (accessToken: string, refreshToken: string, profile: Strategy.Profile, done: (error: any, user?: any) => void) => void);
 	name: string;
-	authenticate: (req: express.Request, options?: Object) => void;
+	authenticate(req: express.Request, options?: Object): void;
 }
 
 export namespace Strategy {
diff --git a/types/passport-discord/index.d.ts b/types/passport-discord/index.d.ts
index 66b9474a2d..70553a25cd 100644
--- a/types/passport-discord/index.d.ts
+++ b/types/passport-discord/index.d.ts
@@ -8,10 +8,10 @@
 import * as passport from 'passport';
 import * as express from 'express';
 
-export class Strategy implements passport.Strategy {
+export class Strategy extends passport.Strategy {
     constructor(options: Strategy.StrategyOption, verify: (accessToken: string, refreshToken: string, profile: Strategy.Profile, done: (error: any, user?: any) => void) => void);
     name: string;
-    authenticate: (req: express.Request, options?: object) => void;
+    authenticate(req: express.Request, options?: object): void;
 
     authorizationParams(options: any): any;
 
diff --git a/types/passport-facebook/index.d.ts b/types/passport-facebook/index.d.ts
index 5d20f0d39c..89ce91b093 100644
--- a/types/passport-facebook/index.d.ts
+++ b/types/passport-facebook/index.d.ts
@@ -47,10 +47,10 @@ export type VerifyFunction =
 export type VerifyFunctionWithRequest =
     (req: express.Request, accessToken: string, refreshToken: string, profile: Profile, done: (error: any, user?: any, info?: any) => void) => void;
 
-export class Strategy implements passport.Strategy {
+export class Strategy extends passport.Strategy {
     constructor(options: StrategyOptionWithRequest, verify: VerifyFunctionWithRequest);
     constructor(options: StrategyOption, verify: VerifyFunction);
 
     name: string;
-    authenticate: (req: express.Request, options?: object) => void;
+    authenticate(req: express.Request, options?: object): void;
 }
diff --git a/types/passport-github/index.d.ts b/types/passport-github/index.d.ts
index c4a253016f..99c84bd391 100644
--- a/types/passport-github/index.d.ts
+++ b/types/passport-github/index.d.ts
@@ -26,10 +26,10 @@ export interface StrategyOption {
     userProfileURL?: string;
 }
 
-export class Strategy implements passport.Strategy {
+export class Strategy extends passport.Strategy {
     constructor(options: StrategyOption, verify: (accessToken: string, refreshToken: string, profile: Profile, done: (error: any, user?: any) => void) => void);
     userProfile: (accessToken: string, done?: (error: any, profile: Profile) => void) => void;
 
     name: string;
-    authenticate: (req: express.Request, options?: passport.AuthenticateOptions) => void;
+    authenticate(req: express.Request, options?: passport.AuthenticateOptions): void;
 }
diff --git a/types/passport-github2/index.d.ts b/types/passport-github2/index.d.ts
index b0310a6f3b..902bcea6e0 100644
--- a/types/passport-github2/index.d.ts
+++ b/types/passport-github2/index.d.ts
@@ -28,10 +28,10 @@ export interface StrategyOption {
     userProfileURL?: string;
 }
 
-export class Strategy implements passport.Strategy {
+export class Strategy extends passport.Strategy {
     constructor(options: StrategyOption, verify: (accessToken: string, refreshToken: string, profile: Profile, done: (error: any, user?: any) => void) => void);
     userProfile: (accessToken: string, done?: (error: any, profile: Profile) => void) => void;
 
     name: string;
-    authenticate: (req: express.Request, options?: passport.AuthenticateOptions) => void;
+    authenticate(req: express.Request, options?: passport.AuthenticateOptions): void;
 }
diff --git a/types/passport-google-oauth/index.d.ts b/types/passport-google-oauth/index.d.ts
index a56c91e73f..8b45504cb2 100644
--- a/types/passport-google-oauth/index.d.ts
+++ b/types/passport-google-oauth/index.d.ts
@@ -33,7 +33,7 @@ interface VerifyFunction {
     (error: any, user?: any, msg?: VerifyOptions): void;
 }
 
-declare class OAuthStrategy implements passport.Strategy {
+declare class OAuthStrategy extends passport.Strategy {
     constructor(
         options: IOAuthStrategyOption,
         verify: (
@@ -44,7 +44,7 @@ declare class OAuthStrategy implements passport.Strategy {
         ) => void
     );
     name: string;
-    authenticate: (req: express.Request, options?: Object) => void;
+    authenticate(req: express.Request, options?: Object): void;
 }
 
 interface IOAuth2StrategyOption {
diff --git a/types/passport-http-bearer/index.d.ts b/types/passport-http-bearer/index.d.ts
index 698b0bfed5..58da308106 100644
--- a/types/passport-http-bearer/index.d.ts
+++ b/types/passport-http-bearer/index.d.ts
@@ -28,11 +28,11 @@ interface VerifyFunctionWithRequest {
     (req: express.Request, token: string, done: (error: any, user?: any, options?: IVerifyOptions | string) => void): void;
 }
 
-declare class Strategy implements passport.Strategy {
+declare class Strategy extends passport.Strategy {
     constructor(verify: VerifyFunction);
     constructor(options: IStrategyOptions, verify: VerifyFunction);
     constructor(options: IStrategyOptions, verify: VerifyFunctionWithRequest);
 
     name: string;
-    authenticate: (req: express.Request, options?: Object) => void;
+    authenticate(req: express.Request, options?: Object): void;
 }
diff --git a/types/passport-http/index.d.ts b/types/passport-http/index.d.ts
index fa3f968e7e..63527b6225 100644
--- a/types/passport-http/index.d.ts
+++ b/types/passport-http/index.d.ts
@@ -52,19 +52,19 @@ export type DigestValidateFunction = (
     done: (error: any, valid: boolean) => void,
 ) => any;
 
-export class BasicStrategy implements passport.Strategy {
+export class BasicStrategy extends passport.Strategy {
     constructor(verify: BasicVerifyFunction);
     constructor(options: BasicStrategyOptions<false>, verify: BasicVerifyFunction);
     constructor(options: BasicStrategyOptions<true>, verify: BasicVerifyFunctionWithRequest);
 
     name: string;
-    authenticate: (req: express.Request, options?: object) => void;
+    authenticate(req: express.Request, options?: object): void;
 }
 
-export class DigestStrategy implements passport.Strategy {
+export class DigestStrategy extends passport.Strategy {
     constructor(secret: DigestSecretFunction, validate?: DigestValidateFunction);
     constructor(options: DigestStrategyOptions, secret: DigestSecretFunction, validate?: DigestValidateFunction);
 
     name: string;
-    authenticate: (req: express.Request, options?: object) => void;
+    authenticate(req: express.Request, options?: object): void;
 }
diff --git a/types/passport-kakao/index.d.ts b/types/passport-kakao/index.d.ts
index d99f608ab7..b005b45d98 100644
--- a/types/passport-kakao/index.d.ts
+++ b/types/passport-kakao/index.d.ts
@@ -27,9 +27,9 @@ export interface StrategyOption {
 export type VerifyFunction =
     (accessToken: string, refreshToken: string, profile: Profile, done: (error: any, user?: any, info?: any) => void) => void;
 
-export class Strategy implements passport.Strategy {
+export class Strategy extends passport.Strategy {
     constructor(options: StrategyOption, verify: VerifyFunction);
 
-    authenticate: (req: express.Request, options?: any) => void;
+    authenticate(req: express.Request, options?: any): void;
     userProfile: (accessToken: string, done: (error: any, user?: any) => void) => void;
 }
diff --git a/types/passport-oauth2/index.d.ts b/types/passport-oauth2/index.d.ts
index 09facb2ef7..5dd811f342 100644
--- a/types/passport-oauth2/index.d.ts
+++ b/types/passport-oauth2/index.d.ts
@@ -7,7 +7,7 @@
 import { Request } from 'express';
 import { Strategy } from 'passport';
 
-declare class OAuth2Strategy implements Strategy {
+declare class OAuth2Strategy extends Strategy {
     name: string;
 
     constructor(options: OAuth2Strategy.StrategyOptions, verify: OAuth2Strategy.VerifyFunction);
diff --git a/types/passport-saml/index.d.ts b/types/passport-saml/index.d.ts
index e93869ca87..5e24211008 100644
--- a/types/passport-saml/index.d.ts
+++ b/types/passport-saml/index.d.ts
@@ -24,7 +24,7 @@ export type VerifyWithRequest = (req: express.Request, profile: {}, done: Verifi
 
 export type VerifyWithoutRequest = (profile: {}, done: VerifiedCallback) => void;
 
-export class Strategy implements passport.Strategy {
+export class Strategy extends passport.Strategy {
     constructor(config: SamlConfig, verify: VerifyWithRequest | VerifyWithoutRequest);
     authenticate(req: express.Request, options: AuthenticateOptions | AuthorizeOptions): void;
     logout(req: express.Request, callback: (err: Error | null, url: string) => void): void;
diff --git a/types/passport-twitter/index.d.ts b/types/passport-twitter/index.d.ts
index fe341a4b5b..ae8f192d79 100644
--- a/types/passport-twitter/index.d.ts
+++ b/types/passport-twitter/index.d.ts
@@ -44,12 +44,12 @@ interface IStrategyOptionWithRequest  extends IStrategyOptionBase {
     passReqToCallback: true;
 }
 
-declare class Strategy implements passport.Strategy {
+declare class Strategy extends passport.Strategy {
     constructor(options: IStrategyOption,
         verify: (accessToken: string, refreshToken: string, profile: Profile, done: (error: any, user?: any) => void) => void);
     constructor(options: IStrategyOptionWithRequest,
         verify: (req: express.Request, accessToken: string, refreshToken: string, profile: Profile, done: (error: any, user?: any) => void) => void);
 
     name: string;
-    authenticate: (req: express.Request, options?: Object) => void;
+    authenticate(req: express.Request, options?: Object): void;
 }
diff --git a/types/passport-unique-token/index.d.ts b/types/passport-unique-token/index.d.ts
index 081a85b29d..66887cdcde 100644
--- a/types/passport-unique-token/index.d.ts
+++ b/types/passport-unique-token/index.d.ts
@@ -33,11 +33,11 @@ export interface VerifyOptions {
 export type VerifyFunctionWithRequest = (req: express.Request, token: string, done: (error: any, user?: any, options?: VerifyOptions) => void) => void;
 export type VerifyFunction = (token: string, done: (error: any, user?: any, options?: VerifyOptions) => void) => void;
 
-export class Strategy implements passport.Strategy {
+export class Strategy extends passport.Strategy {
     constructor(options: StrategyOptionsWithRequest, verify: VerifyFunctionWithRequest);
     constructor(options: StrategyOptions, verify: VerifyFunction);
     constructor(verify: VerifyFunction);
 
     name: string;
-    authenticate: (req: express.Request, options?: object) => void;
+    authenticate(req: express.Request, options?: object): void;
 }

From f57ff453de489853e8e37a644ff1fa6d0c6907e9 Mon Sep 17 00:00:00 2001
From: Michael Dombrowski <mikepi3.14@gmail.com>
Date: Mon, 2 Apr 2018 21:25:27 -0400
Subject: [PATCH 1026/1382] Allow Edge arrows from to be left out of edge
 options

network.setOptions({edges: {arrows: {to: true}}}); should be accepted since it works properly in vis, but previous @types/vis will fail type-checking.
---
 types/vis/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/vis/index.d.ts b/types/vis/index.d.ts
index c0b33b27aa..44ab171de4 100644
--- a/types/vis/index.d.ts
+++ b/types/vis/index.d.ts
@@ -1861,7 +1861,7 @@ export interface EdgeOptions {
       enabled?: boolean,
       scaleFactor?: number,
     },
-    from: boolean | {
+    from?: boolean | {
       enabled?: boolean,
       scaleFactor?: number,
     }

From d1713bc84226d2a3656e609c2c351fb04cf9b747 Mon Sep 17 00:00:00 2001
From: Ian Mobley <ianmobley@gmail.com>
Date: Mon, 2 Apr 2018 19:27:04 -0700
Subject: [PATCH 1027/1382] Convert react-loadable/webpack test to commonJS

It doesn't look like destructuring will work when using require.
---
 types/react-loadable/test/webpack.ts | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/types/react-loadable/test/webpack.ts b/types/react-loadable/test/webpack.ts
index 08885e418d..5549dfdc4e 100644
--- a/types/react-loadable/test/webpack.ts
+++ b/types/react-loadable/test/webpack.ts
@@ -1,11 +1,10 @@
-import * as webpack from 'webpack';
-import { ReactLoadablePlugin, getBundles } from 'react-loadable/webpack';
+import webpack = require('webpack');
+import Loadable = require('react-loadable/webpack');
 
 const config: webpack.Configuration = {
   plugins: [
-    new ReactLoadablePlugin(),
-    new ReactLoadablePlugin({
-      filename: 'react-loadable.json'
+    new Loadable.ReactLoadablePlugin(),
+    new Loadable.ReactLoadablePlugin({ filename: 'react-loadable.json'
     })
   ]
 };
@@ -22,4 +21,4 @@ const manifest = {
 
 const manifestIds = ['react'];
 
-const bundles = getBundles(manifest, manifestIds);
+const bundles = Loadable.getBundles(manifest, manifestIds);

From 563f5321c0e5c63a69f022884727785835762955 Mon Sep 17 00:00:00 2001
From: Tim Wang <timwangdev@users.noreply.github.com>
Date: Tue, 3 Apr 2018 10:36:12 +0800
Subject: [PATCH 1028/1382] Add hasIcon static method

---
 types/react-native-vector-icons/Icon.d.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/types/react-native-vector-icons/Icon.d.ts b/types/react-native-vector-icons/Icon.d.ts
index 98bda708b3..4b64503452 100644
--- a/types/react-native-vector-icons/Icon.d.ts
+++ b/types/react-native-vector-icons/Icon.d.ts
@@ -157,6 +157,9 @@ export class Icon extends React.Component<IconProps, any> {
   static loadFont(
     file?: string
   ): Promise<void>;
+  static hasIcon(
+    name: string,
+  ): boolean;
 }
 
 export namespace Icon {

From 1130d0942b48fea245cd8bd630b01e87c0e79442 Mon Sep 17 00:00:00 2001
From: Tim Wang <timwangdev@users.noreply.github.com>
Date: Tue, 3 Apr 2018 10:37:36 +0800
Subject: [PATCH 1029/1382] Bump version

---
 types/react-native-vector-icons/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/react-native-vector-icons/index.d.ts b/types/react-native-vector-icons/index.d.ts
index 05a140e3bb..2a2ef8fdce 100644
--- a/types/react-native-vector-icons/index.d.ts
+++ b/types/react-native-vector-icons/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-native-vector-icons 4.4
+// Type definitions for react-native-vector-icons 4.6
 // Project: https://github.com/oblador/react-native-vector-icons
 // Definitions by: Kyle Roach <https://github.com/iRoachie>
 //                 Tim Wang <https://github.com/timwangdev>

From adb4937be9078febc05980a7d96c2f81a5de2e5a Mon Sep 17 00:00:00 2001
From: Ian Mobley <ianmobley@gmail.com>
Date: Mon, 2 Apr 2018 19:42:46 -0700
Subject: [PATCH 1030/1382] move filename back to newline

---
 types/react-loadable/test/webpack.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/react-loadable/test/webpack.ts b/types/react-loadable/test/webpack.ts
index 5549dfdc4e..ecfa79cd53 100644
--- a/types/react-loadable/test/webpack.ts
+++ b/types/react-loadable/test/webpack.ts
@@ -4,7 +4,8 @@ import Loadable = require('react-loadable/webpack');
 const config: webpack.Configuration = {
   plugins: [
     new Loadable.ReactLoadablePlugin(),
-    new Loadable.ReactLoadablePlugin({ filename: 'react-loadable.json'
+    new Loadable.ReactLoadablePlugin({
+      filename: 'react-loadable.json'
     })
   ]
 };

From 2de350fc9abb352e9f840ae8797baaa2441b47a8 Mon Sep 17 00:00:00 2001
From: Syncfusion-JavaScript <packages@syncfusion.com>
Date: Tue, 3 Apr 2018 11:24:54 +0530
Subject: [PATCH 1031/1382] BOM error fixed

---
 types/ej.web.all/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/ej.web.all/index.d.ts b/types/ej.web.all/index.d.ts
index 837a7393cc..e95fb94b2b 100644
--- a/types/ej.web.all/index.d.ts
+++ b/types/ej.web.all/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for ej.web.all 16.1
+// Type definitions for ej.web.all 16.1
 // Project: http://help.syncfusion.com/js/typescript
 // Definitions by: Syncfusion <https://github.com/syncfusion>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From 50a74277a6158ca9663ffaaad42f7a264ffe9bd7 Mon Sep 17 00:00:00 2001
From: Syncfusion-JavaScript <packages@syncfusion.com>
Date: Tue, 3 Apr 2018 11:55:43 +0530
Subject: [PATCH 1032/1382] Lint Error Fixed

---
 types/ej.web.all/ej.web.all-tests.ts | 1352 +++++++++++++-------------
 1 file changed, 676 insertions(+), 676 deletions(-)

diff --git a/types/ej.web.all/ej.web.all-tests.ts b/types/ej.web.all/ej.web.all-tests.ts
index ddfdc39876..83ed128742 100644
--- a/types/ej.web.all/ej.web.all-tests.ts
+++ b/types/ej.web.all/ej.web.all-tests.ts
@@ -1,7 +1,3 @@
-/* tslint:disable */
-
- 
-
 module AccordionComponent {
     $(function () {
         var sample = new ej.Accordion($("#basicAccordion"), {
@@ -22,39 +18,39 @@ module AccordionComponent {
     });
 }
 
- 
 
-module AutocompleteComponent{
+
+module AutocompleteComponent {
     var carList = [
-                "Audi S6", "Austin-Healey", "Alfa Romeo", "Aston Martin",
-                "BMW 7", "Bentley Mulsanne", "Bugatti Veyron",
-                "Chevrolet Camaro", "Cadillac",
-                "Duesenberg J", "Dodge Sprinter",
-                "Elantra", "Excavator",
-                "Ford Boss 302", "Ferrari 360", "Ford Thunderbird",
-                "GAZ Siber",
-                "Honda S2000", "Hyundai Santro",
-                "Isuzu Swift", "Infiniti Skyline",
-                "Jaguar XJS",
-                "Kia Sedona EX", "Koenigsegg Agera",
-                "Lotus Esprit", "Lamborghini Diablo",
-                "Mercedes-Benz", "Mercury Coupe", "Maruti Alto 800",
-                "Nissan Qashqai",
-                "Oldsmobile S98", "Opel Superboss",
-                "Porsche 356", "Pontiac Sunbird",
-                "Scion SRS/SC/SD", "Saab Sportcombi", "Subaru Sambar", "Suzuki Swift",
-                "Triumph Spitfire", "Toyota 2000GT",
-                "Volvo P1800", "Volkswagen Shirako"
-            ];
-    $(function () {        
-        var autocompleteInstance =new ej.Autocomplete($("#selectCar"), {        
+        "Audi S6", "Austin-Healey", "Alfa Romeo", "Aston Martin",
+        "BMW 7", "Bentley Mulsanne", "Bugatti Veyron",
+        "Chevrolet Camaro", "Cadillac",
+        "Duesenberg J", "Dodge Sprinter",
+        "Elantra", "Excavator",
+        "Ford Boss 302", "Ferrari 360", "Ford Thunderbird",
+        "GAZ Siber",
+        "Honda S2000", "Hyundai Santro",
+        "Isuzu Swift", "Infiniti Skyline",
+        "Jaguar XJS",
+        "Kia Sedona EX", "Koenigsegg Agera",
+        "Lotus Esprit", "Lamborghini Diablo",
+        "Mercedes-Benz", "Mercury Coupe", "Maruti Alto 800",
+        "Nissan Qashqai",
+        "Oldsmobile S98", "Opel Superboss",
+        "Porsche 356", "Pontiac Sunbird",
+        "Scion SRS/SC/SD", "Saab Sportcombi", "Subaru Sambar", "Suzuki Swift",
+        "Triumph Spitfire", "Toyota 2000GT",
+        "Volvo P1800", "Volkswagen Shirako"
+    ];
+    $(function () {
+        var autocompleteInstance = new ej.Autocomplete($("#selectCar"), {
             width: "100%",
             watermarkText: "Select a car",
             dataSource: carList,
             enableAutoFill: true,
             showPopupButton: true,
             multiSelectMode: "delimiter"
-        });  
+        });
     });
 }
 
@@ -197,12 +193,12 @@ module ChartComponent {
                 range: { min: 25, max: 50, interval: 5 },
                 labelFormat: "{value}%",
                 title: { text: "Efficiency" },
-                
+
             },
             commonSeriesOptions:
-			{
+            {
                 type: 'line', enableAnimation: true,
-				tooltip:{ visible :true, template:'Tooltip'},
+                tooltip: { visible: true, template: 'Tooltip' },
                 marker:
                 {
                     shape: 'circle',
@@ -212,30 +208,30 @@ module ChartComponent {
                     },
                     visible: true
                 },
-                 border : {width: 2}                             
-            },	
-            series: 
-			[
-			    {
-                points: [{ x: 2005, y: 28 }, { x: 2006, y: 25 },{ x: 2007, y: 26 }, { x: 2008, y: 27 }, 
-						 { x: 2009, y: 32 }, { x: 2010, y: 35 }, { x: 2011, y: 30 }],						 
-                name: 'India'
-                },						
+                border: { width: 2 }
+            },
+            series:
+            [
                 {
-                points: [{ x: 2005, y: 31 }, { x: 2006, y: 28 },{ x: 2007, y: 30 }, { x: 2008, y: 36 }, 
-						 { x: 2009, y: 36 }, { x: 2010, y: 39 }, { x: 2011, y: 37 }],						 
-                name: 'Germany'
+                    points: [{ x: 2005, y: 28 }, { x: 2006, y: 25 }, { x: 2007, y: 26 }, { x: 2008, y: 27 },
+                        { x: 2009, y: 32 }, { x: 2010, y: 35 }, { x: 2011, y: 30 }],
+                    name: 'India'
                 },
-				{
-                points: [{ x: 2005, y: 36 }, { x: 2006, y: 32 },{ x: 2007, y: 34 }, { x: 2008, y: 41 }, 
-						 { x: 2009, y: 42 }, { x: 2010, y: 42 }, { x: 2011, y: 43 }],						 
-                name: 'England'
-                },					
                 {
-                points: [{ x: 2005, y: 39 }, { x: 2006, y: 36 },{ x: 2007, y: 40 }, { x: 2008, y: 44 }, 
-						 { x: 2009, y: 45 }, { x: 2010, y: 48 }, { x: 2011, y: 46 }],						 
-                name: 'France'
-				}
+                    points: [{ x: 2005, y: 31 }, { x: 2006, y: 28 }, { x: 2007, y: 30 }, { x: 2008, y: 36 },
+                        { x: 2009, y: 36 }, { x: 2010, y: 39 }, { x: 2011, y: 37 }],
+                    name: 'Germany'
+                },
+                {
+                    points: [{ x: 2005, y: 36 }, { x: 2006, y: 32 }, { x: 2007, y: 34 }, { x: 2008, y: 41 },
+                        { x: 2009, y: 42 }, { x: 2010, y: 42 }, { x: 2011, y: 43 }],
+                    name: 'England'
+                },
+                {
+                    points: [{ x: 2005, y: 39 }, { x: 2006, y: 36 }, { x: 2007, y: 40 }, { x: 2008, y: 44 },
+                        { x: 2009, y: 45 }, { x: 2010, y: 48 }, { x: 2011, y: 46 }],
+                    name: 'France'
+                }
             ],
             isResponsive: true,
             load: function () {
@@ -300,14 +296,14 @@ module ChartComponent {
                             theme = "flatlight";
                             break;
                     }
-                    sender.model.theme = theme;                    
+                    sender.model.theme = theme;
                 }
             },
             title: { text: 'Efficiency of oil-fired power production' },
             size: { height: "600" },
-            legend: { visible: true},	
+            legend: { visible: true },
         });
-    //    chartsample.model.load="loadTheme";
+        //    chartsample.model.load="loadTheme";
     });
 }
 
@@ -361,7 +357,7 @@ module circulargaugecomponent {
                         backgroundColor: "#f5b43f",
                         border: { color: "#f5b43f" }
                     }]
-            }]	
+            }]
         });
     });
 }
@@ -380,21 +376,21 @@ module ColorPickerComponent {
 
 
 
-module ComboBoxComponent{
+module ComboBoxComponent {
     var BikeList = [
         { empid: "bk1", text: "Apache RTR" }, { empid: "bk2", text: "CBR 150-R" }, { empid: "bk3", text: "CBZ Xtreme" },
         { empid: "bk4", text: "Discover" }, { empid: "bk5", text: "Dazzler" }, { empid: "bk6", text: "Flame" },
         { empid: "bk7", text: "Fazzer" }, { empid: "bk8", text: "FZ-S" }, { empid: "bk9", text: "Pulsar" },
         { empid: "bk10", text: "Shine" }, { empid: "bk11", text: "R15" }, { empid: "bk12", text: "Unicorn" }
     ];
-    $(function () {        
-        var comboboxInstance =new ej.ComboBox($("#selectCar"), {        
+    $(function () {
+        var comboboxInstance = new ej.ComboBox($("#selectCar"), {
             width: "100%",
             placeholder: "Select a Bike",
-			fields: { text: "text", value: "empid" },
+            fields: { text: "text", value: "empid" },
             dataSource: BikeList,
             autofill: true
-        });  
+        });
     });
 }
 
@@ -466,7 +462,8 @@ $(function () {
             }),
             createNode({ name: "Project", width: 150, height: 100, offsetX: 300, offsetY: 430, labels: [createLabel({ "text": "Find Project \nmanager" })], type: "flow", shape: ej.datavisualization.Diagram.FlowShapes.Decision }),
             createNode({
-                name: "End", width: 150, height: 60, offsetX: 300, offsetY: 555, labels: [createLabel({ "text": "Implement and Deliver" })], type: "flow", shape: ej.datavisualization.Diagram.FlowShapes.Process }),
+                name: "End", width: 150, height: 60, offsetX: 300, offsetY: 555, labels: [createLabel({ "text": "Implement and Deliver" })], type: "flow", shape: ej.datavisualization.Diagram.FlowShapes.Process
+            }),
             createNode({ name: "Decision", width: 250, height: 60, offsetX: 550, offsetY: 60, labels: [createLabel({ "text": "Decision Process for new software ideas" })], type: "flow", shape: ej.datavisualization.Diagram.FlowShapes.Card, fillColor: "#858585", borderColor: "#858585" }),
             createNode({ name: "Reject", width: 150, height: 60, offsetX: 550, offsetY: 285, labels: [createLabel({ "text": "Reject and write report" })], type: "flow", shape: ej.datavisualization.Diagram.FlowShapes.Process }),
             createNode({ name: "Resources", width: 150, height: 60, offsetX: 550, offsetY: 430, labels: [createLabel({ "text": "Hire new resources" })], type: "flow", shape: ej.datavisualization.Diagram.FlowShapes.Process })
@@ -480,7 +477,7 @@ $(function () {
             createConnector({ name: "connector6", sourceNode: "Project", targetNode: "Resources", labels: [createLabel({ "text": "No" })] })
         ]
     });
-    
+
 });
 
 function createNode(option: ej.datavisualization.Diagram.Node) {
@@ -501,11 +498,11 @@ function createConnector(option: ej.datavisualization.Diagram.Connector) {
     return option;
 }
 
-function createLabel(options : any) {
+function createLabel(options: any) {
     return options;
 }
 
- 
+
 
 module DialogComponent {
     $(function () {
@@ -513,15 +510,17 @@ module DialogComponent {
             width: 550,
             minWidth: 310,
             minHeight: 215,
-			target:".control",
-            close:()=>{
-			$("#btnOpen").show();}
+            target: ".control",
+            close: () => {
+                $("#btnOpen").show();
+            }
         });
         var btnInstance = new ej.Button($("#btnOpen"), {
             size: "medium",
-            click: ()=>{
-			$("#btnOpen").hide();
-        $("#basicDialog").ejDialog("open");},
+            click: () => {
+                $("#btnOpen").hide();
+                $("#basicDialog").ejDialog("open");
+            },
             type: "button",
             height: 30,
             width: 150
@@ -555,7 +554,7 @@ module digitalgaugecomponent {
 }
 
 
-		
+
 
 
 
@@ -567,7 +566,7 @@ module DropDownListComponent {
         { empid: "bk10", text: "Shine" }, { empid: "bk11", text: "R15" }, { empid: "bk12", text: "Unicorn" }
     ];
     $(function () {
-        var sample = new ej.DropDownList($("#bikeList"),{
+        var sample = new ej.DropDownList($("#bikeList"), {
             dataSource: BikeList,
             width: "100%",
             watermarkText: "Select a bike",
@@ -575,12 +574,12 @@ module DropDownListComponent {
             enableFilterSearch: true,
             caseSensitiveSearch: true,
             enableIncrementalSearch: true,
-            enablePopupResize: true, 
+            enablePopupResize: true,
             delimiterChar: ";",
             multiSelectMode: ej.MultiSelectMode.Delimiter,
             maxPopupHeight: "300px",
-            minPopupHeight: "150px", 
-            maxPopupWidth: "500px", 
+            minPopupHeight: "150px",
+            maxPopupWidth: "500px",
             minPopupWidth: "350px",
             showCheckbox: true,
             showRoundedCorner: true
@@ -611,53 +610,53 @@ module ExplorerComponent {
 
 
 module GanttComponent {
-     $(function () {
-         var ganttInstance = new ej.Gantt($("#GanttContainer"), {
-        dataSource: (<any>window).projectData,
-        allowColumnResize: true,
-        allowSorting: true,
-        allowSelection: true,       
-        enableContextMenu: true,
-        taskIdMapping: "taskID",
-        allowDragAndDrop: true,
-        taskNameMapping: "taskName",
-        startDateMapping: "startDate",
-        showColumnChooser: true,
-        showColumnOptions: true,
-        progressMapping: "progress",
-        durationMapping: "duration",
-        endDateMapping: "endDate",
-        childMapping: "subtasks",
-        scheduleStartDate: "02/01/2017",
-        scheduleEndDate: "04/09/2017",
-        //Resources mapping
-        resourceInfoMapping: "resourceId",
-        resourceNameMapping: "resourceName",
-        resourceIdMapping: "resourceId",
-        resources: (<any>window).projectResources,
-        predecessorMapping: "predecessor",
-        showResourceNames: true,
-        toolbarSettings: {
-            showToolbar: true,
-            toolbarItems: ["add","edit","delete","update","cancel","indent","outdent","expandAll","collapseAll","search"]
-        },
-        editSettings: {
-            allowEditing: true,
-            allowAdding: true,
-            allowDeleting: true,
-            allowIndent: true,
-            editMode: "cellEditing"
-        },
-        sizeSettings: {
-            width: "100%",
-            height: "100%"
-        },
-        dragTooltip: { showTooltip: true },
-        showGridCellTooltip: true,
-        treeColumnIndex: 1,
-        isResponsive: true,
+    $(function () {
+        var ganttInstance = new ej.Gantt($("#GanttContainer"), {
+            dataSource: (<any>window).projectData,
+            allowColumnResize: true,
+            allowSorting: true,
+            allowSelection: true,
+            enableContextMenu: true,
+            taskIdMapping: "taskID",
+            allowDragAndDrop: true,
+            taskNameMapping: "taskName",
+            startDateMapping: "startDate",
+            showColumnChooser: true,
+            showColumnOptions: true,
+            progressMapping: "progress",
+            durationMapping: "duration",
+            endDateMapping: "endDate",
+            childMapping: "subtasks",
+            scheduleStartDate: "02/01/2017",
+            scheduleEndDate: "04/09/2017",
+            //Resources mapping
+            resourceInfoMapping: "resourceId",
+            resourceNameMapping: "resourceName",
+            resourceIdMapping: "resourceId",
+            resources: (<any>window).projectResources,
+            predecessorMapping: "predecessor",
+            showResourceNames: true,
+            toolbarSettings: {
+                showToolbar: true,
+                toolbarItems: ["add", "edit", "delete", "update", "cancel", "indent", "outdent", "expandAll", "collapseAll", "search"]
+            },
+            editSettings: {
+                allowEditing: true,
+                allowAdding: true,
+                allowDeleting: true,
+                allowIndent: true,
+                editMode: "cellEditing"
+            },
+            sizeSettings: {
+                width: "100%",
+                height: "100%"
+            },
+            dragTooltip: { showTooltip: true },
+            showGridCellTooltip: true,
+            treeColumnIndex: 1,
+            isResponsive: true,
+        });
     });
-}); 
 }
 
 
@@ -750,7 +749,7 @@ $(function () {
 module KanbanComponent {
     $(function () {
         var sample = new ej.Kanban($("#Kanban"), {
-           dataSource: new ej.DataManager((<any>window).kanbanData).executeLocal(new ej.Query().take(20)),
+            dataSource: new ej.DataManager((<any>window).kanbanData).executeLocal(new ej.Query().take(20)),
             columns: [
                 { headerText: "Backlog", key: "Open" },
                 { headerText: "In Progress", key: "InProgress" },
@@ -769,7 +768,7 @@ module KanbanComponent {
     });
 }
 
- 
+
 
 
 module lineargaugecomponent {
@@ -795,14 +794,14 @@ module lineargaugecomponent {
                         backgroundColor: "#E94649",
                         border: { color: "#E94649" }, startWidth: 4, endWidth: 4
                     }]
-            }]		
+            }]
         });
     });
 }
 
-	
 
- 
+
+
 
 module ListBoxComponent {
     $(function () {
@@ -812,13 +811,13 @@ module ListBoxComponent {
     });
 }
 
- 
+
 
 module ListviewComponent {
     $(function () {
         var listviewInstance = new ej.ListView($("#defaultlistview"), {
-            enableCheckMark: true, 
-		    width: 400
+            enableCheckMark: true,
+            width: 400
         });
     });
 }
@@ -1057,7 +1056,7 @@ module mapcomponenet {
 
 module MenuComponent {
     $(function () {
-        var sample = new ej.Menu($("#syncfusionProducts"),{
+        var sample = new ej.Menu($("#syncfusionProducts"), {
             width: "100%",
             animationType: ej.AnimationType.Default,
             cssClass: 'gradient-lime ',
@@ -1082,12 +1081,12 @@ module MenuComponent {
 
 
 
- 
+
 
 module NavigationDrawerComponent {
     $(function () {
         var navigationdrawerInstance = new ej.NavigationDrawer($("#navpane"), {
-           targetId: "butdrawer",
+            targetId: "butdrawer",
             contentId: "content_container",
             type: "overlay",
             direction: "left",
@@ -1098,8 +1097,8 @@ module NavigationDrawerComponent {
             },
             position: "normal"
         });
-		$("#navpane_listview").click(function(e: any) {
-            var text=e.target["text"]||$(e.target).closest("li.e-list").text();
+        $("#navpane_listview").click(function (e: any) {
+            var text = e.target["text"] || $(e.target).closest("li.e-list").text();
             $("#butdrawer").parent().children("h2").text(text);
         });
     });
@@ -1110,7 +1109,7 @@ module NavigationDrawerComponent {
 module PDFViewerComponent {
     $(function () {
         var pdfviewerControl = new ej.PdfViewer($("#pdfviewer"), {
-            serviceUrl:(<any>window).baseurl+ "api/PdfViewer",
+            serviceUrl: (<any>window).baseurl + "api/PdfViewer",
             isResponsive: true
         });
     });
@@ -1120,42 +1119,42 @@ module PDFViewerComponent {
 
 module PivotChartOlap {
     $(function () {
-        var sample = new ej.PivotChart($("#PivotChart"),{
+        var sample = new ej.PivotChart($("#PivotChart"), {
             dataSource: {
-			data: "//bi.syncfusion.com/olap/msmdpump.dll", 
-			catalog: "Adventure Works DW 2008 SE",
-			cube: "Adventure Works",
-			rows: [
-				{
-					fieldName: "[Date].[Fiscal]"
-				}
-			],
-			columns: [
-				{
-					fieldName: "[Customer].[Customer Geography]"
-				}
-			],
-			values: [
-				{
-					measures: [
-						{
-							fieldName: "[Measures].[Internet Sales Amount]"
-						}
-                    ],
-					axis: "columns"
-				}
-            ],
-			filters:[]
-        },
-		isResponsive: true,zooming:{enableScrollbar: true},
-        commonSeriesOptions: {
-			type: "column"
-		},
-		size: { height: "460px", width: "100%" },
-		primaryXAxis: { title: { text: "Date - Fiscal" }, labelRotation: 0 },
-		primaryYAxis: { title: { text: "Internet Sales Amount" } },
-		legend: { visible: true, rowCount: 2 }
-		// load:"loadTheme"
+                data: "//bi.syncfusion.com/olap/msmdpump.dll",
+                catalog: "Adventure Works DW 2008 SE",
+                cube: "Adventure Works",
+                rows: [
+                    {
+                        fieldName: "[Date].[Fiscal]"
+                    }
+                ],
+                columns: [
+                    {
+                        fieldName: "[Customer].[Customer Geography]"
+                    }
+                ],
+                values: [
+                    {
+                        measures: [
+                            {
+                                fieldName: "[Measures].[Internet Sales Amount]"
+                            }
+                        ],
+                        axis: "columns"
+                    }
+                ],
+                filters: []
+            },
+            isResponsive: true, zooming: { enableScrollbar: true },
+            commonSeriesOptions: {
+                type: "column"
+            },
+            size: { height: "460px", width: "100%" },
+            primaryXAxis: { title: { text: "Date - Fiscal" }, labelRotation: 0 },
+            primaryYAxis: { title: { text: "Internet Sales Amount" } },
+            legend: { visible: true, rowCount: 2 }
+            // load:"loadTheme"
         });
     });
 }
@@ -1192,45 +1191,45 @@ var pivot_dataset = [
 module PivotChartRelational {
 
     $(function () {
-        var sample = new ej.PivotChart($("#PivotChart"),{
+        var sample = new ej.PivotChart($("#PivotChart"), {
             dataSource: {
-			data: pivot_dataset,
-			rows: [
-				{
-					fieldName: "Country",
-					fieldCaption: "Country"
-				},
-				{
-					fieldName: "State",
-					fieldCaption: "State"
-				},
-				{
-					fieldName: "Date",
-					fieldCaption: "Date"
-				}
-			],
-			columns: [
-				{
-					fieldName: "Product",
-					fieldCaption: "Product"
-				}
-			],
-			values: [
-				{
-					fieldName: "Amount",
-					fieldCaption: "Amount"
-				}
-			],
-			filters:[]
-		},
-		isResponsive: true,zooming:{enableScrollbar: true},
-		commonSeriesOptions: {
-			type: "column"
-		},
-		size: { height: "460px", width: "100%" },
-		primaryYAxis: { title: { text: "Amount" } },
-		legend: { visible: true }
-		// load:"loadTheme"
+                data: pivot_dataset,
+                rows: [
+                    {
+                        fieldName: "Country",
+                        fieldCaption: "Country"
+                    },
+                    {
+                        fieldName: "State",
+                        fieldCaption: "State"
+                    },
+                    {
+                        fieldName: "Date",
+                        fieldCaption: "Date"
+                    }
+                ],
+                columns: [
+                    {
+                        fieldName: "Product",
+                        fieldCaption: "Product"
+                    }
+                ],
+                values: [
+                    {
+                        fieldName: "Amount",
+                        fieldCaption: "Amount"
+                    }
+                ],
+                filters: []
+            },
+            isResponsive: true, zooming: { enableScrollbar: true },
+            commonSeriesOptions: {
+                type: "column"
+            },
+            size: { height: "460px", width: "100%" },
+            primaryYAxis: { title: { text: "Amount" } },
+            legend: { visible: true }
+            // load:"loadTheme"
         });
     });
 }
@@ -1240,106 +1239,106 @@ module PivotChartRelational {
 module PivotGaugeOlap {
 
     $(function () {
-        var sample = new ej.PivotGauge($("#PivotGauge"),{
+        var sample = new ej.PivotGauge($("#PivotGauge"), {
             dataSource: {
-				data: "//bi.syncfusion.com/olap/msmdpump.dll",
-				catalog: "Adventure Works DW 2008 SE",
-				cube: "Adventure Works",
-				rows: [
-					{
-						fieldName: "[Date].[Fiscal]",
-						filterItems: { filterType: "include", values: ["[Date].[Fiscal].[Fiscal Year].&amp;[2004]"] }
-					},
-				],
-				columns: [
-					{
-						fieldName: "[Customer].[Customer Geography]"
-					}
-				],
-				values: [
-					{
-						measures: [
-							{
-								fieldName: "[Measures].[Internet Sales Amount]"
-							},
-							{
-								fieldName: "[Measures].[Internet Revenue Status]"
-							},
-							{
-								fieldName: "[Measures].[Internet Revenue Trend]"
-							},
-							{
-								fieldName: "[Measures].[Internet Revenue Goal]"
-							},
-						],
-						axis: "columns"
-					}
-				],
-				filters:[]
-			},
+                data: "//bi.syncfusion.com/olap/msmdpump.dll",
+                catalog: "Adventure Works DW 2008 SE",
+                cube: "Adventure Works",
+                rows: [
+                    {
+                        fieldName: "[Date].[Fiscal]",
+                        filterItems: { filterType: "include", values: ["[Date].[Fiscal].[Fiscal Year].&amp;[2004]"] }
+                    },
+                ],
+                columns: [
+                    {
+                        fieldName: "[Customer].[Customer Geography]"
+                    }
+                ],
+                values: [
+                    {
+                        measures: [
+                            {
+                                fieldName: "[Measures].[Internet Sales Amount]"
+                            },
+                            {
+                                fieldName: "[Measures].[Internet Revenue Status]"
+                            },
+                            {
+                                fieldName: "[Measures].[Internet Revenue Trend]"
+                            },
+                            {
+                                fieldName: "[Measures].[Internet Revenue Goal]"
+                            },
+                        ],
+                        axis: "columns"
+                    }
+                ],
+                filters: []
+            },
             enableTooltip: true, isResponsive: true,
             labelFormatSettings: { decimalPlaces: 2 },
-			scales: [{
-				showRanges: true,
-				radius: 150, showScaleBar: true, size: 1,
+            scales: [{
+                showRanges: true,
+                radius: 150, showScaleBar: true, size: 1,
                 border: {
-					width: 0.5
-				},
-				showIndicators: true, showLabels: true,
-                pointers: [{
-					showBackNeedle: true,
-					backNeedleLength: 20,
-					length: 120,
-					width: 7
+                    width: 0.5
                 },
-				{		
-					type: "marker",
-					markerType: "diamond",
-					distanceFromScale: 5,
-					placement: "center",
-					backgroundColor: "#29A4D9",
-					length: 25,
-					width: 15
-				}],
+                showIndicators: true, showLabels: true,
+                pointers: [{
+                    showBackNeedle: true,
+                    backNeedleLength: 20,
+                    length: 120,
+                    width: 7
+                },
+                    {
+                        type: "marker",
+                        markerType: "diamond",
+                        distanceFromScale: 5,
+                        placement: "center",
+                        backgroundColor: "#29A4D9",
+                        length: 25,
+                        width: 15
+                    }],
                 ticks: [{
-					type: "major",
+                    type: "major",
                     distanceFromScale: 2,
-					height: 16,
-					width: 1, color: "#8c8c8c"
-				},
-                {
-					type: "minor",
-					height: 6,
-					width: 1,
-					distanceFromScale: 2,
-                    color: "#8c8c8c"
-                }],
+                    height: 16,
+                    width: 1, color: "#8c8c8c"
+                },
+                    {
+                        type: "minor",
+                        height: 6,
+                        width: 1,
+                        distanceFromScale: 2,
+                        color: "#8c8c8c"
+                    }],
                 labels: [{
                     color: "#8c8c8c"
-				}],
-                ranges: [{
-					distanceFromScale: -5,
-                    backgroundColor: "#fc0606",
-					border: { color: "#fc0606" }
-                }, 
-				{
-					distanceFromScale: -5
                 }],
-				customLabels: [{
-					position: { x: 180, y: 290 },
-					font: { size: "10px", fontFamily: "Segoe UI", fontStyle: "Normal" }, color: "#666666"
+                ranges: [{
+                    distanceFromScale: -5,
+                    backgroundColor: "#fc0606",
+                    border: { color: "#fc0606" }
                 },
-				{
-					position: { x: 180, y: 320 },
-					font: { size: "10px", fontFamily: "Segoe UI", fontStyle: "Normal" }, color: "#666666"
+                    {
+                        distanceFromScale: -5
+                    }],
+                customLabels: [{
+                    position: { x: 180, y: 290 },
+                    font: { size: "10px", fontFamily: "Segoe UI", fontStyle: "Normal" }, color: "#666666"
                 },
-				{
-                    position: { x: 180, y: 150 },
-                    font: { size: "12px", fontFamily: "Segoe UI", fontStyle: "Normal" }, color: "#666666"
-                }]
+                    {
+                        position: { x: 180, y: 320 },
+                        font: { size: "10px", fontFamily: "Segoe UI", fontStyle: "Normal" }, color: "#666666"
+                    },
+                    {
+                        position: { x: 180, y: 150 },
+                        font: { size: "12px", fontFamily: "Segoe UI", fontStyle: "Normal" }, color: "#666666"
+                    }]
             }]
         });
-    });	
+    });
 }
 
 
@@ -1373,94 +1372,94 @@ var pivot_dataset = [
 
 module PivotGaugeRelational {
     $(function () {
-        var sample = new ej.PivotGauge($("#PivotGauge"),{
+        var sample = new ej.PivotGauge($("#PivotGauge"), {
             dataSource: {
-				data: pivot_dataset,
-				rows: [
-					{
-						fieldName: "Country",
-					},
-					{
-						fieldName: "State",
-					}
-				],
-				columns: [
-					{
-						fieldName: "Product",
-					}
-				],
+                data: pivot_dataset,
+                rows: [
+                    {
+                        fieldName: "Country",
+                    },
+                    {
+                        fieldName: "State",
+                    }
+                ],
+                columns: [
+                    {
+                        fieldName: "Product",
+                    }
+                ],
                 values: [
-					{
-						fieldName: "Amount",
-					},
-					{
-						fieldName: "Quantity",
-					}
-				]
-			},
+                    {
+                        fieldName: "Amount",
+                    },
+                    {
+                        fieldName: "Quantity",
+                    }
+                ]
+            },
             enableTooltip: true, isResponsive: true,
             labelFormatSettings: { decimalPlaces: 2 },
-			scales: [{
-				showRanges: true,
-				radius: 150, showScaleBar: true, size: 1,
+            scales: [{
+                showRanges: true,
+                radius: 150, showScaleBar: true, size: 1,
                 border: {
-					width: 0.5
-				},
-				showIndicators: true, showLabels: true,
-                pointers: [{
-					showBackNeedle: true,
-					backNeedleLength: 20,
-					length: 120,
-					width: 7
+                    width: 0.5
                 },
-				{		
-					type: "marker",
-					markerType: "diamond",
-					distanceFromScale: 5,
-					placement: "center",
-					backgroundColor: "#29A4D9",
-					length: 25,
-					width: 15
-				}],
+                showIndicators: true, showLabels: true,
+                pointers: [{
+                    showBackNeedle: true,
+                    backNeedleLength: 20,
+                    length: 120,
+                    width: 7
+                },
+                    {
+                        type: "marker",
+                        markerType: "diamond",
+                        distanceFromScale: 5,
+                        placement: "center",
+                        backgroundColor: "#29A4D9",
+                        length: 25,
+                        width: 15
+                    }],
                 ticks: [{
-					type: "major",
+                    type: "major",
                     distanceFromScale: 2,
-					height: 16,
-					width: 1, color: "#8c8c8c"
-				},
-                {
-					type: "minor",
-					height: 6,
-					width: 1,
-					distanceFromScale: 2,
-                    color: "#8c8c8c"
-                }],
+                    height: 16,
+                    width: 1, color: "#8c8c8c"
+                },
+                    {
+                        type: "minor",
+                        height: 6,
+                        width: 1,
+                        distanceFromScale: 2,
+                        color: "#8c8c8c"
+                    }],
                 labels: [{
                     color: "#8c8c8c"
-				}],
-                ranges: [{
-					distanceFromScale: -5,
-                    backgroundColor: "#fc0606",
-					border: { color: "#fc0606" }
-                }, 
-				{
-					distanceFromScale: -5
                 }],
-				customLabels: [{
-					position: { x: 180, y: 290 },
-					font: { size: "10px", fontFamily: "Segoe UI", fontStyle: "Normal" }, color: "#666666"
+                ranges: [{
+                    distanceFromScale: -5,
+                    backgroundColor: "#fc0606",
+                    border: { color: "#fc0606" }
                 },
-				{
-					position: { x: 180, y: 320 },
-					font: { size: "10px", fontFamily: "Segoe UI", fontStyle: "Normal" }, color: "#666666"
+                    {
+                        distanceFromScale: -5
+                    }],
+                customLabels: [{
+                    position: { x: 180, y: 290 },
+                    font: { size: "10px", fontFamily: "Segoe UI", fontStyle: "Normal" }, color: "#666666"
                 },
-				{
-                    position: { x: 180, y: 150 },
-                    font: { size: "12px", fontFamily: "Segoe UI", fontStyle: "Normal" }, color: "#666666"
-                }]
+                    {
+                        position: { x: 180, y: 320 },
+                        font: { size: "10px", fontFamily: "Segoe UI", fontStyle: "Normal" }, color: "#666666"
+                    },
+                    {
+                        position: { x: 180, y: 150 },
+                        font: { size: "12px", fontFamily: "Segoe UI", fontStyle: "Normal" }, color: "#666666"
+                    }]
             }]
         });
-    });	
+    });
 }
 
 
@@ -1468,35 +1467,35 @@ module PivotGaugeRelational {
 module PivotGridOlap {
 
     $(function () {
-        var sample = new ej.PivotGrid($("#PivotGrid"),{
+        var sample = new ej.PivotGrid($("#PivotGrid"), {
             dataSource: {
-			data: "//bi.syncfusion.com/olap/msmdpump.dll",
-			catalog: "Adventure Works DW 2008 SE",
-			cube: "Adventure Works",
-			rows: [
-				{
-					fieldName: "[Date].[Fiscal]"
-				}
-			],
-			columns: [
-				{
-					fieldName: "[Customer].[Customer Geography]"
-				}
-			],
-            values: [
-				{
-					measures: [
-						{
-							fieldName: "[Measures].[Internet Sales Amount]",
-						}
-                    ],
-					axis: "columns"
-				}
-			],
-			filters:[]
-		},
-        enableGroupingBar: true, 
-        pivotTableFieldListID:"PivotSchemaDesigner"
+                data: "//bi.syncfusion.com/olap/msmdpump.dll",
+                catalog: "Adventure Works DW 2008 SE",
+                cube: "Adventure Works",
+                rows: [
+                    {
+                        fieldName: "[Date].[Fiscal]"
+                    }
+                ],
+                columns: [
+                    {
+                        fieldName: "[Customer].[Customer Geography]"
+                    }
+                ],
+                values: [
+                    {
+                        measures: [
+                            {
+                                fieldName: "[Measures].[Internet Sales Amount]",
+                            }
+                        ],
+                        axis: "columns"
+                    }
+                ],
+                filters: []
+            },
+            enableGroupingBar: true,
+            pivotTableFieldListID: "PivotSchemaDesigner"
         });
         $("#PivotSchemaDesigner").ejPivotSchemaDesigner();
     });
@@ -1533,41 +1532,41 @@ var pivot_dataset = [
 
 module PivotGridRelational {
     $(function () {
-        var sample = new ej.PivotGrid($("#PivotGrid"),{
+        var sample = new ej.PivotGrid($("#PivotGrid"), {
             dataSource: {
-			data: pivot_dataset,
-			rows: [
-				{
-					fieldName: "Country",
-					fieldCaption: "Country"
-				},
-				{
-					fieldName: "State",
-					fieldCaption: "State"
-				}
-			],
-			columns:                     
-				[{
-					fieldName: "Product",
-					fieldCaption: "Product"
-				}
-			],
-			values: [
-				{
-					fieldName: "Amount",
-                    fieldCaption: "Amount"
-				},
-				{
-					fieldName: "Quantity",
-					fieldCaption: "Quantity"
-				}
-            ],
-			filters:[]
-		},
-        enableGroupingBar: true, 
-        pivotTableFieldListID:"PivotSchemaDesigner"
+                data: pivot_dataset,
+                rows: [
+                    {
+                        fieldName: "Country",
+                        fieldCaption: "Country"
+                    },
+                    {
+                        fieldName: "State",
+                        fieldCaption: "State"
+                    }
+                ],
+                columns:
+                [{
+                    fieldName: "Product",
+                    fieldCaption: "Product"
+                }
+                ],
+                values: [
+                    {
+                        fieldName: "Amount",
+                        fieldCaption: "Amount"
+                    },
+                    {
+                        fieldName: "Quantity",
+                        fieldCaption: "Quantity"
+                    }
+                ],
+                filters: []
+            },
+            enableGroupingBar: true,
+            pivotTableFieldListID: "PivotSchemaDesigner"
         });
-       $("#PivotSchemaDesigner").ejPivotSchemaDesigner(); 
+        $("#PivotSchemaDesigner").ejPivotSchemaDesigner();
 
     });
 }
@@ -1576,33 +1575,33 @@ module PivotGridRelational {
 
 module PivotTreeMap {
     $(function () {
-        var sample = new ej.PivotTreeMap($("#PivotTreeMap"),{
+        var sample = new ej.PivotTreeMap($("#PivotTreeMap"), {
             dataSource: {
-			data: "//bi.syncfusion.com/olap/msmdpump.dll;Locale Identifier=1033;",
-			catalog: "Adventure Works DW 2008 SE",
-			cube: "Adventure Works",
-			rows: [
-				{
-					fieldName: "[Customer].[Customer Geography]"
-				}
-			],
-			columns: [
-				{
-					fieldName: "[Date].[Fiscal]"
-				}
-			],
-            values: [
-				{
-					measures: [
-						{
-							fieldName: "[Measures].[Customer Count]",
-						}
-					],
-					axis: "columns"
-				}
-			],
-			filters:[]
-		}
+                data: "//bi.syncfusion.com/olap/msmdpump.dll;Locale Identifier=1033;",
+                catalog: "Adventure Works DW 2008 SE",
+                cube: "Adventure Works",
+                rows: [
+                    {
+                        fieldName: "[Customer].[Customer Geography]"
+                    }
+                ],
+                columns: [
+                    {
+                        fieldName: "[Date].[Fiscal]"
+                    }
+                ],
+                values: [
+                    {
+                        measures: [
+                            {
+                                fieldName: "[Measures].[Customer Count]",
+                            }
+                        ],
+                        axis: "columns"
+                    }
+                ],
+                filters: []
+            }
         });
     });
 }
@@ -1611,7 +1610,7 @@ module PivotTreeMap {
 
 module ProgressBarComponent {
     $(function () {
-        var sample = new ej.ProgressBar($("#progressBar"),{
+        var sample = new ej.ProgressBar($("#progressBar"), {
             width: 200,
             value: 45,
             height: 20,
@@ -1641,7 +1640,7 @@ module RadialMenuComponent {
                 backImageClass: "backimageclass",
                 targetElementId: "radialtarget1"
             });
-			$("#radialtarget1").parent().css("position", "relative");
+            $("#radialtarget1").parent().css("position", "relative");
         }
         else {
             $("#contentDiv").html("Radial Menu is only supported from Internet Explorer Versioned 9 and above.").css({ "font-size": "20px", "color": "red" });
@@ -1708,12 +1707,12 @@ function redo(e: any) {
 }
 
 
- 
+
 
 module RadialSliderComponent {
     $(function () {
         var radialsliderInstance = new ej.RadialSlider($("#radialSlider"), {
-           innerCircleImageUrl: "images/radialslider/chevron-right.png"
+            innerCircleImageUrl: "images/radialslider/chevron-right.png"
         });
     });
 }
@@ -1810,8 +1809,8 @@ var data;
 data = GetData();
 
 function GetData() {
-    var series1:any[]=[];
-    var series2:any[]= [];
+    var series1: any[] = [];
+    var series2: any[] = [];
     var value = 100;
     var value1 = 120;
     for (var i = 1; i < 730; i++) {
@@ -1838,7 +1837,7 @@ function GetData() {
 module RatingComponent {
     $(function () {
 
-        var sample1 = new ej.Rating($("#fullRating"),{
+        var sample1 = new ej.Rating($("#fullRating"), {
             value: 4,
             precision: ej.Rating.Precision.Full,
             allowReset: true,
@@ -1853,8 +1852,8 @@ module RatingComponent {
             shapeWidth: 25,
             showTooltip: true
         });
-		
-        var sample2 = new ej.Rating($("#halfRating"),{
+
+        var sample2 = new ej.Rating($("#halfRating"), {
             precision: ej.Rating.Precision.Half,
             value: 3.5,
             allowReset: true,
@@ -1870,7 +1869,7 @@ module RatingComponent {
             showTooltip: true
         });
 
-        var sample3 = new ej.Rating($("#exactRating"),{
+        var sample3 = new ej.Rating($("#exactRating"), {
             precision: ej.Rating.Precision.Exact,
             value: 3.7,
             allowReset: true,
@@ -1884,7 +1883,7 @@ module RatingComponent {
             shapeHeight: 25,
             shapeWidth: 25,
             showTooltip: true
-        }); 
+        });
     });
 
 }
@@ -1892,15 +1891,15 @@ module RatingComponent {
 
 
 module ReportViewerComponent {
-	$(function () {
-		var report = new ej.ReportViewer($("#territoryReportViewer"), {
-			reportServiceUrl: (<any>window).baseurl + 'api/ReportViewer',
-			reportServerUrl: 'http://104.207.134.201/reportserver',
-			processingMode: ej.ReportViewer.ProcessingMode.Remote,
-			reportPath: "/SSRSSamples2/Territory Sales new",
-			isResponsive: true
-		});
-	});
+    $(function () {
+        var report = new ej.ReportViewer($("#territoryReportViewer"), {
+            reportServiceUrl: (<any>window).baseurl + 'api/ReportViewer',
+            reportServerUrl: 'http://104.207.134.201/reportserver',
+            processingMode: ej.ReportViewer.ProcessingMode.Remote,
+            reportPath: "/SSRSSamples2/Territory Sales new",
+            isResponsive: true
+        });
+    });
 }
 
 
@@ -1917,7 +1916,7 @@ module RibbonComponent {
                 toolTip: "Pin the Ribbon"
             },
             applicationTab: {
-                 type: ej.Ribbon.ApplicationTabType.Menu, menuItemID: "ribbonmenu", menuSettings: { openOnClick: false } 
+                type: ej.Ribbon.ApplicationTabType.Menu, menuItemID: "ribbonmenu", menuSettings: { openOnClick: false }
             },
             tabs: [{
                 id: "home", text: "HOME", groups: [{
@@ -1941,7 +1940,7 @@ module RibbonComponent {
                         }
                     }]
                 },
-                {
+                    {
                         text: "Clipboard", alignType: ej.Ribbon.AlignType.Columns, content: [{
                             groups: [{
                                 id: "paste",
@@ -1963,8 +1962,8 @@ module RibbonComponent {
                                 height: 70
                             }
                         },
-                        {
-                             groups: [{
+                            {
+                                groups: [{
                                     id: "cut",
                                     text: "Cut",
                                     toolTip: "Cut",
@@ -1994,14 +1993,14 @@ module RibbonComponent {
                                             prefixIcon: "e-icon e-ribbon clearAll"
                                         }
                                     }],
-                                     defaults: {
+                                defaults: {
                                     type: "button",
                                     width: 60,
                                     isBig: false
                                 }
-                            }] 
-                },
-                {
+                            }]
+                    },
+                    {
                         text: "Font", alignType: "rows", content: [{
                             groups: [{
                                 id: "fontfamily",
@@ -2300,7 +2299,7 @@ module RibbonComponent {
                             groups: [{
                                 id: "zoomin",
                                 text: "Zoom In",
-                                toolTip: "Zoom In",                                
+                                toolTip: "Zoom In",
                                 buttonSettings: {
                                     width: 58,
                                     click: "onClick",
@@ -2312,7 +2311,7 @@ module RibbonComponent {
                                 {
                                     id: "zoomout",
                                     text: "Zoom Out",
-                                    toolTip: "Zoom Out",                                    
+                                    toolTip: "Zoom Out",
                                     buttonSettings: {
                                         width: 70,
                                         click: "onClick",
@@ -2324,7 +2323,7 @@ module RibbonComponent {
                                 {
                                     id: "fullscreen",
                                     text: "Full Screen",
-                                    toolTip: "Full Screen",                                    
+                                    toolTip: "Full Screen",
                                     buttonSettings: {
                                         width: 73,
                                         click: "onClick",
@@ -2340,7 +2339,7 @@ module RibbonComponent {
                             }
                         }]
                     }]
-            },{
+            }, {
                     id: "insert", text: "INSERT", groups: [{
                         text: "Tables", alignType: ej.Ribbon.AlignType.Columns, content: [{
                             groups: [{
@@ -2485,7 +2484,7 @@ module RibbonComponent {
                                 }
                                 ],
                                 defaults: {
-                                   type: "button",
+                                    type: "button",
                                     width: 70,
                                     height: 70
                                 }
@@ -2567,7 +2566,7 @@ module RibbonComponent {
                         }
                     ]
                 }
-            ],   
+            ],
             create: function createControl(args) {
                 var ribbon = $("#defaultRibbon").data("ejRibbon");
                 $("#fontcolor").ejColorPicker({ value: "#FFFF00", modelType: "palette", cssClass: "e-ribbon", toolIcon: "e-fontcoloricon", select: colorHandler });
@@ -2579,7 +2578,7 @@ module RibbonComponent {
 function colorHandler(args:any) {
     (this._id.indexOf("fillcolor") != -1) ? $("#contenteditor").css('background-color', args.value) : document.execCommand('forecolor', false, args.value);
 }
-function onClick(args:any) {
+function onClick(args: any) {
     var val, prop = args.text;
     val = (ej.isNullOrUndefined(args.model.text)) ? args.model.activeText : args.model.text;
     if (action1.indexOf(val) != -1)
@@ -2597,7 +2596,7 @@ function onClick(args:any) {
 
 
 
- 
+
 
 module RotatorComponent {
     $(function () {
@@ -2607,14 +2606,14 @@ module RotatorComponent {
             slideHeight: "auto",
             displayItemsCount: "1",
             navigateSteps: "1",
-            pagerPosition:"outside",
+            pagerPosition: "outside",
             orientation: "horizontal",
             showPager: true,
             enabled: true,
             showCaption: true,
             allowKeyboardNavigation: true,
             showPlayButton: true,
-            isResponsive:true,
+            isResponsive: true,
             animationType: "slide",
         });
     });
@@ -2624,7 +2623,7 @@ module RotatorComponent {
 
 module RTEComponent {
     $(function () {
-        var sample = new ej.RTE($("#rteSample"),{
+        var sample = new ej.RTE($("#rteSample"), {
             width: "100%",
             minWidth: "150px",
             showFooter: true,
@@ -2760,7 +2759,7 @@ module ScheduleComponent {
             }
         });
     });
-}   
+}
 
 
 
@@ -2820,10 +2819,10 @@ module linesparkline {
             dataSource: [12, 14, 11, 12, 11, 15, 12, 10, 11, 12, 15, 13, 12, 11, 10, 13, 15, 12, 14, 16, 14, 12, 11],
             tooltip: {
                 visible: true,
-                font: { size:"12px" }
+                font: { size: "12px" }
             },
             type: "line",
-            size: { height: "40", width:"170" },
+            size: { height: "40", width: "170" },
         });
     });
 }
@@ -2831,7 +2830,7 @@ module linesparkline {
 module columnsparkline {
     $(function () {
         var sparkcolumnsample = new ej.Sparkline($("#column"), {
-            dataSource: [2, 6, -1, 1, 12, 5, -2, 7, -3, 5, 8, 10,],
+            dataSource: [2, 6, -1, 1, 12, 5, -2, 7, -3, 5, 8, 10, ],
             negativePointColor: "red",
             highPointColor: "blue",
             tooltip: {
@@ -2849,7 +2848,7 @@ module columnsparkline {
 module areasparkline {
     $(function () {
         var sparkareasample = new ej.Sparkline($("#area"), {
-            dataSource: [12, -10, 11, 8, 17, 6, 2, -17, 13, -6, 8, 10,],
+            dataSource: [12, -10, 11, 8, 17, 6, 2, -17, 13, -6, 8, 10, ],
             markerSettings: { visible: true },
             highPointColor: "blue",
             lowPointColor: "orange",
@@ -2869,7 +2868,7 @@ module areasparkline {
 module windlosssparkline {
     $(function () {
         var sparkwinlosssample = new ej.Sparkline($("#winloss"), {
-            dataSource: [12, 15, -11, 13, 17, 0, -12, 17, 13, -15, 8, 10,],
+            dataSource: [12, 15, -11, 13, 17, 0, -12, 17, 13, -15, 8, 10, ],
             type: "winloss",
             size: { height: "100", width: "150" },
         });
@@ -2895,7 +2894,7 @@ module piesparkline1 {
 module piesparkline2 {
     $(function () {
         var sparkpiesample2 = new ej.Sparkline($("#pie2"), {
-            dataSource: [8, 9, 1,],
+            dataSource: [8, 9, 1, ],
             type: "pie",
             tooltip: {
                 visible: true,
@@ -2940,9 +2939,9 @@ module piesparkline4 {
     });
 }
 
-	
 
- 
+
+
 
 
 module SplitterComponent {
@@ -2952,10 +2951,10 @@ module SplitterComponent {
             width: "50%",
             orientation: ej.Orientation.Vertical,
             properties: [{}, { paneSize: 80 }],
-            isResponsive:true
+            isResponsive: true
         });
         var splitterInstance1 = new ej.Splitter($("#innerSpliter"), {
-            isResponsive:true,
+            isResponsive: true,
         });
     });
 }
@@ -2963,7 +2962,7 @@ module SplitterComponent {
 
 
 module SpreadsheetComponent {
-$(function () {
+    $(function () {
         var sample = new ej.Spreadsheet($("#basicSpreadsheet"), {
             scrollSettings: {
                 height: 550,
@@ -2977,14 +2976,15 @@ $(function () {
                 pdfUrl: (<any>window).baseurl + "api/Spreadsheet/PdfExport"
             },
             sheets: [{ rangeSettings: [{ dataSource: (<any>window).defaultData, startCell: "A1" }] }],
-			loadComplete: () => {  
-			var spreadsheet = $("#basicSpreadsheet").data("ejSpreadsheet"), xlFormat = spreadsheet.XLFormat;
-			if (!(<any>spreadsheet).isImport) {
-        spreadsheet.setWidthToColumns([140, 128, 105, 100, 100, 110, 120, 120, 100]);
-        xlFormat.format({ "style": { "font-weight": "bold" } }, "A1:H1");
-        xlFormat.format({ "type": "currency" }, "E2:H11");
-        spreadsheet.XLRibbon.updateRibbonIcons();
-    }}
+            loadComplete: () => {
+                var spreadsheet = $("#basicSpreadsheet").data("ejSpreadsheet"), xlFormat = spreadsheet.XLFormat;
+                if (!(<any>spreadsheet).isImport) {
+                    spreadsheet.setWidthToColumns([140, 128, 105, 100, 100, 110, 120, 120, 100]);
+                    xlFormat.format({ "style": { "font-weight": "bold" } }, "A1:H1");
+                    xlFormat.format({ "type": "currency" }, "E2:H11");
+                    spreadsheet.XLRibbon.updateRibbonIcons();
+                }
+            }
         });
     });
 }
@@ -2993,58 +2993,58 @@ $(function () {
 
 
 var default_data: Array<Object> = [
-    { Category : "Employees", Country : "USA", JobDescription : "Sales",         JobGroup:"Executive",                         EmployeesCount : 50 },
-	{ Category : "Employees", Country : "USA", JobDescription : "Sales",         JobGroup : "Analyst",                         EmployeesCount : 40 },
-	{ Category : "Employees", Country : "USA", JobDescription : "Marketing",                                                   EmployeesCount : 40 },
-	{ Category : "Employees", Country : "USA", JobDescription : "Technical",     JobGroup : "Testers",                         EmployeesCount : 55 },
-	{ Category : "Employees", Country : "USA", JobDescription : "Technical",     JobGroup : "Developers", JobRole : "Windows", EmployeesCount : 175},
-	{ Category : "Employees", Country : "USA", JobDescription : "Technical",     JobGroup : "Developers", JobRole : "Web",     EmployeesCount : 70 },
-	{ Category : "Employees", Country : "USA", JobDescription : "Management",                                                  EmployeesCount : 40 },
-	{ Category : "Employees", Country : "USA", JobDescription : "Accounts",                                                    EmployeesCount : 60 },
-	
-	{ Category : "Employees", Country : "India",   JobDescription : "Technical",     JobGroup : "Testers",                         EmployeesCount : 43 },
-	{ Category : "Employees", Country : "India",   JobDescription : "Technical",     JobGroup : "Developers", JobRole : "Windows", EmployeesCount : 125},
-	{ Category : "Employees", Country : "India",   JobDescription : "Technical",     JobGroup : "Developers", JobRole : "Web",     EmployeesCount : 60 },
-	{ Category : "Employees", Country : "India",   JobDescription : "HR Executives",                                               EmployeesCount : 70 },
-	{ Category : "Employees", Country : "India",   JobDescription : "Accounts",                                                    EmployeesCount : 45 },
-	
-	{ Category : "Employees", Country : "Germany", JobDescription : "Sales",         JobGroup : "Executive",                       EmployeesCount : 30 },
-	{ Category : "Employees", Country : "Germany", JobDescription : "Sales",         JobGroup : "Analyst",                         EmployeesCount : 40 },
-	{ Category : "Employees", Country : "Germany", JobDescription : "Marketing",                                                   EmployeesCount : 50 },
-	{ Category : "Employees", Country : "Germany", JobDescription : "Technical",     JobGroup : "Testers",                         EmployeesCount : 40 },
-	{ Category : "Employees", Country : "Germany", JobDescription : "Technical",     JobGroup : "Developers", JobRole : "Windows", EmployeesCount : 65 },
-	{ Category : "Employees", Country : "Germany", JobDescription : "Technical",     JobGroup : "Developers", JobRole : "Web",     EmployeesCount : 27 },
-	{ Category : "Employees", Country : "Germany", JobDescription : "Management",                                                  EmployeesCount : 33 },
-	{ Category : "Employees", Country : "Germany", JobDescription : "Accounts",                                                    EmployeesCount : 55 },
-	
-	{ Category : "Employees", Country : "UK",      JobDescription : "Technical",     JobGroup : "Testers",                         EmployeesCount : 45 },
-	{ Category : "Employees", Country : "UK",      JobDescription : "Technical",     JobGroup : "Developers", JobRole : "Windows", EmployeesCount : 96 },
-	{ Category : "Employees", Country : "UK",      JobDescription : "Technical",     JobGroup : "Developers", JobRole : "Web",     EmployeesCount : 55 },
-	{ Category : "Employees", Country : "UK",      JobDescription : "HR Executives",                                               EmployeesCount : 60 },
-	{ Category : "Employees", Country : "UK",      JobDescription: "Accounts",                                                     EmployeesCount: 30  },
-	
-	{ Category : "Employees", Country : "France", JobDescription : "Technical",     JobGroup : "Testers",                         EmployeesCount : 40 },
-	{ Category : "Employees", Country : "France", JobDescription : "Technical",     JobGroup : "Developers", JobRole : "Windows", EmployeesCount : 65 },
-	{ Category : "Employees", Country : "France", JobDescription : "Technical",     JobGroup : "Developers", JobRole : "Web",     EmployeesCount : 27 },
-	{ Category : "Employees", Country : "France", JobDescription: "Marketing",                                                     EmployeesCount: 50  }
+    { Category: "Employees", Country: "USA", JobDescription: "Sales", JobGroup: "Executive", EmployeesCount: 50 },
+    { Category: "Employees", Country: "USA", JobDescription: "Sales", JobGroup: "Analyst", EmployeesCount: 40 },
+    { Category: "Employees", Country: "USA", JobDescription: "Marketing", EmployeesCount: 40 },
+    { Category: "Employees", Country: "USA", JobDescription: "Technical", JobGroup: "Testers", EmployeesCount: 55 },
+    { Category: "Employees", Country: "USA", JobDescription: "Technical", JobGroup: "Developers", JobRole: "Windows", EmployeesCount: 175 },
+    { Category: "Employees", Country: "USA", JobDescription: "Technical", JobGroup: "Developers", JobRole: "Web", EmployeesCount: 70 },
+    { Category: "Employees", Country: "USA", JobDescription: "Management", EmployeesCount: 40 },
+    { Category: "Employees", Country: "USA", JobDescription: "Accounts", EmployeesCount: 60 },
+
+    { Category: "Employees", Country: "India", JobDescription: "Technical", JobGroup: "Testers", EmployeesCount: 43 },
+    { Category: "Employees", Country: "India", JobDescription: "Technical", JobGroup: "Developers", JobRole: "Windows", EmployeesCount: 125 },
+    { Category: "Employees", Country: "India", JobDescription: "Technical", JobGroup: "Developers", JobRole: "Web", EmployeesCount: 60 },
+    { Category: "Employees", Country: "India", JobDescription: "HR Executives", EmployeesCount: 70 },
+    { Category: "Employees", Country: "India", JobDescription: "Accounts", EmployeesCount: 45 },
+
+    { Category: "Employees", Country: "Germany", JobDescription: "Sales", JobGroup: "Executive", EmployeesCount: 30 },
+    { Category: "Employees", Country: "Germany", JobDescription: "Sales", JobGroup: "Analyst", EmployeesCount: 40 },
+    { Category: "Employees", Country: "Germany", JobDescription: "Marketing", EmployeesCount: 50 },
+    { Category: "Employees", Country: "Germany", JobDescription: "Technical", JobGroup: "Testers", EmployeesCount: 40 },
+    { Category: "Employees", Country: "Germany", JobDescription: "Technical", JobGroup: "Developers", JobRole: "Windows", EmployeesCount: 65 },
+    { Category: "Employees", Country: "Germany", JobDescription: "Technical", JobGroup: "Developers", JobRole: "Web", EmployeesCount: 27 },
+    { Category: "Employees", Country: "Germany", JobDescription: "Management", EmployeesCount: 33 },
+    { Category: "Employees", Country: "Germany", JobDescription: "Accounts", EmployeesCount: 55 },
+
+    { Category: "Employees", Country: "UK", JobDescription: "Technical", JobGroup: "Testers", EmployeesCount: 45 },
+    { Category: "Employees", Country: "UK", JobDescription: "Technical", JobGroup: "Developers", JobRole: "Windows", EmployeesCount: 96 },
+    { Category: "Employees", Country: "UK", JobDescription: "Technical", JobGroup: "Developers", JobRole: "Web", EmployeesCount: 55 },
+    { Category: "Employees", Country: "UK", JobDescription: "HR Executives", EmployeesCount: 60 },
+    { Category: "Employees", Country: "UK", JobDescription: "Accounts", EmployeesCount: 30 },
+
+    { Category: "Employees", Country: "France", JobDescription: "Technical", JobGroup: "Testers", EmployeesCount: 40 },
+    { Category: "Employees", Country: "France", JobDescription: "Technical", JobGroup: "Developers", JobRole: "Windows", EmployeesCount: 65 },
+    { Category: "Employees", Country: "France", JobDescription: "Technical", JobGroup: "Developers", JobRole: "Web", EmployeesCount: 27 },
+	{ Category: "Employees", Country: "France", JobDescription: "Marketing", EmployeesCount: 50  }
 ];
 
 module sunburstcomponent {
     $(function () {
         var sunburstsample = new ej.SunburstChart($("#Sunburst"), {
-            valueMemberPath: "EmployeesCount",           
+            valueMemberPath: "EmployeesCount",
             levels: [
-                {groupMemberPath: "Country"},
-				{groupMemberPath: "JobDescription"},
-				{groupMemberPath: "JobGroup"},
-				{groupMemberPath: "JobRole"}
+                { groupMemberPath: "Country" },
+                { groupMemberPath: "JobDescription" },
+                { groupMemberPath: "JobGroup" },
+                { groupMemberPath: "JobRole" }
             ],
             dataSource: default_data,
-            dataLabelSettings:{visible:true},
-			tooltip:{visible:false},
-			enableAnimation:false,
-			size:{height:"600"},
-			innerRadius:0.2,
+            dataLabelSettings: { visible: true },
+            tooltip: { visible: false },
+            enableAnimation: false,
+            size: { height: "600" },
+            innerRadius: 0.2,
             load: function () {
                 var sender = $("#Sunburst").data("ejSunburstChart");
                 var SunBurstTheme = (<any>window).themeStyle + (<any>window).themeColor + (<any>window).themeVarient;
@@ -3055,10 +3055,10 @@ module sunburstcomponent {
                     SunBurstTheme = "flatlight";
                 sender.model.theme = SunBurstTheme;
             },
-			title:{text:"Employees Count"},
-			zoomSettings:{enable:false},
-			legend:{visible:true,position:'top'}
-			// load:"loadTheme"
+            title: { text: "Employees Count" },
+            zoomSettings: { enable: false },
+            legend: { visible: true, position: 'top' }
+            // load:"loadTheme"
         });
     });
 }
@@ -3068,7 +3068,7 @@ module sunburstcomponent {
 
 module TabComponent {
     $(function () {
-        var sample = new ej.Tab($("#defaultTab"),{
+        var sample = new ej.Tab($("#defaultTab"), {
             width: "500px",
             collapsible: true,
             events: "click",
@@ -3082,8 +3082,8 @@ module TabComponent {
 
 
 module TagCloudComponent {
-    
-    
+
+
     var websiteCollection = [
         { text: "Google", url: "http://www.google.com", frequency: 12 },
         { text: "All Things Digital", url: "http://allthingsd.com/", frequency: 3 },
@@ -3114,7 +3114,7 @@ module TagCloudComponent {
                 text: "text", url: "url", frequency: "frequency"
             }
         });
-            
+
     });
 }
 
@@ -3154,82 +3154,82 @@ module EditorComponent {
 
 
 
- 
+
 
 module TileViewComponent {
     $(function () {
         var tile1 = new ej.Tile($("#tile1"), {
-            imagePosition:"fill",
-			caption:{text:"People"},
-			tileSize:"medium",
-			imageUrl:'content/images/tile/windows/people_1.png'
+            imagePosition: "fill",
+            caption: { text: "People" },
+            tileSize: "medium",
+            imageUrl: 'content/images/tile/windows/people_1.png'
         });
-		var tile2 = new ej.Tile($("#tile2"), {
-            imagePosition:"center",		
-			tileSize:"small",
-			imageUrl:'content/images/tile/windows/alerts.png',		 
-	
+        var tile2 = new ej.Tile($("#tile2"), {
+            imagePosition: "center",
+            tileSize: "small",
+            imageUrl: 'content/images/tile/windows/alerts.png',
+
         });
-		var tile3 = new ej.Tile($("#tile3"), {
-            imagePosition:"center",		 
-			tileSize:"small",
-			imageUrl:'content/images/tile/windows/bing.png',		 
+        var tile3 = new ej.Tile($("#tile3"), {
+            imagePosition: "center",
+            tileSize: "small",
+            imageUrl: 'content/images/tile/windows/bing.png',
         });
-		var tile4 = new ej.Tile($("#tile4"), {
-            tileSize:"small",
-		 	imageUrl:'content/images/tile/windows/camera.png',		 
+        var tile4 = new ej.Tile($("#tile4"), {
+            tileSize: "small",
+            imageUrl: 'content/images/tile/windows/camera.png',
         });
-		var tile5 = new ej.Tile($("#tile5"), {
-            imagePosition:"center",		 
-			tileSize:"small",
-			imageUrl:'content/images/tile/windows/messages.png',		 
+        var tile5 = new ej.Tile($("#tile5"), {
+            imagePosition: "center",
+            tileSize: "small",
+            imageUrl: 'content/images/tile/windows/messages.png',
         });
-		var tile6 = new ej.Tile($("#tile6"), {
-            imagePosition:"center",		 
-			tileSize:"medium",
-			imageUrl:'content/images/tile/windows/games.png',	
-			caption:{text:"Play"}
+        var tile6 = new ej.Tile($("#tile6"), {
+            imagePosition: "center",
+            tileSize: "medium",
+            imageUrl: 'content/images/tile/windows/games.png',
+            caption: { text: "Play" }
         });
-		var tile7 = new ej.Tile($("#tile7"), {	 
-			tileSize:"medium",
-			imageUrl:'content/images/tile/windows/map.png',
-			caption:{text:"Maps"}
+        var tile7 = new ej.Tile($("#tile7"), {
+            tileSize: "medium",
+            imageUrl: 'content/images/tile/windows/map.png',
+            caption: { text: "Maps" }
         });
-		var tile8 = new ej.Tile($("#tile8"), {
-            imagePosition:"fill",		 
-			tileSize:"wide",
-			imageUrl:'content/images/tile/windows/sports.png',
-			caption:{text:"Sports"}
+        var tile8 = new ej.Tile($("#tile8"), {
+            imagePosition: "fill",
+            tileSize: "wide",
+            imageUrl: 'content/images/tile/windows/sports.png',
+            caption: { text: "Sports" }
         });
-		var tile9 = new ej.Tile($("#tile9"), {
-            imagePosition:"fill",
-			tileSize:"medium",
-			imageUrl:'content/images/tile/windows/people_2.png',
-			caption:{text:"People"}
+        var tile9 = new ej.Tile($("#tile9"), {
+            imagePosition: "fill",
+            tileSize: "medium",
+            imageUrl: 'content/images/tile/windows/people_2.png',
+            caption: { text: "People" }
         });
-		var tile10 = new ej.Tile($("#tile10"), {
-            imagePosition:"center",
-			tileSize:"medium",
-			imageUrl:'content/images/tile/windows/pictures.png',
-			caption:{text:"Photo"}
+        var tile10 = new ej.Tile($("#tile10"), {
+            imagePosition: "center",
+            tileSize: "medium",
+            imageUrl: 'content/images/tile/windows/pictures.png',
+            caption: { text: "Photo" }
         });
-		var tile11 = new ej.Tile($("#tile11"), {
-            imagePosition:"center",
-			tileSize:"wide",
-			imageUrl:'content/images/tile/windows/weather.png',
-			caption:{text:"Weather"}
+        var tile11 = new ej.Tile($("#tile11"), {
+            imagePosition: "center",
+            tileSize: "wide",
+            imageUrl: 'content/images/tile/windows/weather.png',
+            caption: { text: "Weather" }
         });
-		var tile12 = new ej.Tile($("#tile12"), {
-            imagePosition:"center",
-			tileSize:"medium",
-			imageUrl:'content/images/tile/windows/music.png',
-			caption:{text:"Music"}
+        var tile12 = new ej.Tile($("#tile12"), {
+            imagePosition: "center",
+            tileSize: "medium",
+            imageUrl: 'content/images/tile/windows/music.png',
+            caption: { text: "Music" }
         });
-		var tile13 = new ej.Tile($("#tile13"), {
-            imagePosition:"center",
-			tileSize:"medium",
-			imageUrl:'content/images/tile/windows/favs.png',
-			caption:{text:"Favorites"}
+        var tile13 = new ej.Tile($("#tile13"), {
+            imagePosition: "center",
+            tileSize: "medium",
+            imageUrl: 'content/images/tile/windows/favs.png',
+            caption: { text: "Favorites" }
         });
     });
 }
@@ -3248,13 +3248,13 @@ module TimePickerComponent {
 
 
 module ToolbarComponent {
-    
+
     $(function () {
-        var sample = new ej.Toolbar($("#editingToolbar"),{
+        var sample = new ej.Toolbar($("#editingToolbar"), {
             width: "100%",
             cssClass: "gradient-lime",
             enableSeparator: true,
-            
+
             isResponsive: true,
             orientation: ej.Orientation.Horizontal,
             showRoundedCorner: true
@@ -3267,10 +3267,10 @@ module ToolbarComponent {
 
 
 module TooltipComponent {
-    
+
     $(function () {
 
-        var sample1 = new ej.Tooltip($("#link1"),{
+        var sample1 = new ej.Tooltip($("#link1"), {
             content: "ECMAScript (or ES) is a trademarked scripting-language specification standardized by Ecma International in ECMA-262 and ISO/IEC 16262.",
             associate: "mousefollow",
             autoCloseTimeout: 5000,
@@ -3280,7 +3280,7 @@ module TooltipComponent {
             showShadow: true
         });
 
-        var sample2 = new ej.Tooltip($("#link2"),{
+        var sample2 = new ej.Tooltip($("#link2"), {
             content: "The World Wide Web (WWW) is an information space where documents and other web resources are identified by URLs, interlinked by hypertext links, and can be accessed via the Internet.",
             position: {
                 stem: {
@@ -3299,7 +3299,7 @@ module TooltipComponent {
             showShadow: true
         });
 
-        var sample3 = new ej.Tooltip($("#link3"),{
+        var sample3 = new ej.Tooltip($("#link3"), {
             content: 'Object-oriented programming (OOP) is a programming language model organized around objects rather than "actions" and data rather than logic.',
             position: {
                 stem: {
@@ -3326,43 +3326,43 @@ module TooltipComponent {
 module TreeGridComponent {
     $(function () {
         var treegridInstance = new ej.TreeGrid($("#TreeGridContainer"), {
-        dataSource: (<any>window).treeGridData,
-        childMapping: "subtasks",
-        allowSorting: true,
-        allowMultiSorting: true,
-        enableAltRow: true,
-        allowFiltering: true,
-        treeColumnIndex: 1,
-        allowKeyboardNavigation: true,
-        showColumnChooser: true,
-        showColumnOptions: true,
-        contextMenuSettings: {
-            showContextMenu: true,
-            contextMenuItems: ["add", "edit", "delete"]
-        },
-        columnDialogFields: ["field", "headerText", "editType", "width", "visible", "allowSorting", "textAlign", "headerTextAlign"],
-        editSettings: {
-            allowAdding: true,
-            allowEditing: true,
-            allowDeleting: true,
-            editMode: "cellEditing",
-            rowPosition: "belowSelectedRow"
-        },
-        toolbarSettings: {
-            showToolbar: true,
-            toolbarItems: ["add","edit","delete","update","cancel","expandAll","collapseAll"]
-        },
-        columns: [
-            { field: "taskID", headerText: "Task Id", allowFiltering: false, editType: "numericedit", filterEditType: "numericedit" },
-            { field: "taskName", headerText: "Task Name", editType: "stringedit", filterEditType: "stringedit" },
-            { field: "startDate", headerText: "Start Date", editType: "datepicker", filterEditType: "datepicker", format:"{0:MM/dd/yyyy}" },
-            { field: "endDate", headerText: "End Date", editType: "datepicker", filterEditType: "datepicker", format:"{0:MM/dd/yyyy}" },
-            { field: "progress", headerText: "Progress", editType: "numericedit", filterEditType: "numericedit" }
-        ],
-        isResponsive: true,
+            dataSource: (<any>window).treeGridData,
+            childMapping: "subtasks",
+            allowSorting: true,
+            allowMultiSorting: true,
+            enableAltRow: true,
+            allowFiltering: true,
+            treeColumnIndex: 1,
+            allowKeyboardNavigation: true,
+            showColumnChooser: true,
+            showColumnOptions: true,
+            contextMenuSettings: {
+                showContextMenu: true,
+                contextMenuItems: ["add", "edit", "delete"]
+            },
+            columnDialogFields: ["field", "headerText", "editType", "width", "visible", "allowSorting", "textAlign", "headerTextAlign"],
+            editSettings: {
+                allowAdding: true,
+                allowEditing: true,
+                allowDeleting: true,
+                editMode: "cellEditing",
+                rowPosition: "belowSelectedRow"
+            },
+            toolbarSettings: {
+                showToolbar: true,
+                toolbarItems: ["add", "edit", "delete", "update", "cancel", "expandAll", "collapseAll"]
+            },
+            columns: [
+                { field: "taskID", headerText: "Task Id", allowFiltering: false, editType: "numericedit", filterEditType: "numericedit" },
+                { field: "taskName", headerText: "Task Name", editType: "stringedit", filterEditType: "stringedit" },
+                { field: "startDate", headerText: "Start Date", editType: "datepicker", filterEditType: "datepicker", format: "{0:MM/dd/yyyy}" },
+                { field: "endDate", headerText: "End Date", editType: "datepicker", filterEditType: "datepicker", format: "{0:MM/dd/yyyy}" },
+                { field: "progress", headerText: "Progress", editType: "numericedit", filterEditType: "numericedit" }
+            ],
+            isResponsive: true,
+        });
     });
-});
-} 
+}
 
 
 
@@ -3407,7 +3407,7 @@ module treemapcomponent {
 
 
 
- 
+
 
 module TreeViewComponent {
     $(function () {
@@ -3424,9 +3424,9 @@ module TreeViewComponent {
 
 
 module UploadboxComponent {
-    
+
     $(function () {
-        var sample = new ej.Uploadbox($("#UploadDefault"),{
+        var sample = new ej.Uploadbox($("#UploadDefault"), {
             saveUrl: (<any>window).baseurl + "api/uploadbox/Save",
             removeUrl: (<any>window).baseurl + "api/uploadbox/Remove",
             buttonText: {
@@ -3449,12 +3449,12 @@ module UploadboxComponent {
 
 module WaitingPopupComponent {
     $(function () {
-        var sample = new ej.WaitingPopup($("#target"),{
+        var sample = new ej.WaitingPopup($("#target"), {
             showOnInit: true,
             showImage: true,
             text: 'waiting&hellip;',
-			target: "#target",
-			appendTo: "#waiting"
+            target: "#target",
+            appendTo: "#waiting"
         });
     });
 

From 935b20edf361cc60aa8d03e5ae311078024d1647 Mon Sep 17 00:00:00 2001
From: efokschaner <eddyaod@gmail.com>
Date: Mon, 2 Apr 2018 23:54:40 -0700
Subject: [PATCH 1033/1382] Make webvr-api consistent with latest lib.es6.d.ts

---
 types/webvr-api/index.d.ts | 67 +++++++++++++++++++++++++++++++++-----
 1 file changed, 58 insertions(+), 9 deletions(-)

diff --git a/types/webvr-api/index.d.ts b/types/webvr-api/index.d.ts
index 72fea2097b..cf7e3dc8b8 100644
--- a/types/webvr-api/index.d.ts
+++ b/types/webvr-api/index.d.ts
@@ -3,6 +3,13 @@
 // Definitions by: six a <https://github.com/lostfictions>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+// Typescript doesn't allow redefinition of type aliases even if they match,
+// thus the _dt_alias to signal this being an alias for the use of DefinitelyTyped
+type VRDisplayEventReason_dt_alias = "mounted" | "navigation" | "requested" | "unmounted";
+
+// Typescript doesn't allow redefinition of type aliases even if they match,
+// thus the _dt_alias to signal this being an alias for the use of DefinitelyTyped
+type VREye_dt_alias = "left" | "right";
 
 interface VRDisplay extends EventTarget {
     /**
@@ -55,7 +62,7 @@ interface VRDisplay extends EventTarget {
     exitPresent(): Promise<void>;
 
     /* Return the current VREyeParameters for the given eye. */
-    getEyeParameters(whichEye: string): VREyeParameters;
+    getEyeParameters(whichEye: VREye_dt_alias): VREyeParameters;
 
     /**
      * Populates the passed VRFrameData with the information required to render
@@ -69,6 +76,7 @@ interface VRDisplay extends EventTarget {
     getLayers(): VRLayer[];
 
     /**
+     * @deprecated
      * Return a VRPose containing the future predicted pose of the VRDisplay
      * when the current frame will be presented. The value returned will not
      * change until JavaScript has returned control to the browser.
@@ -138,6 +146,11 @@ interface VRDisplayCapabilities {
     readonly maxLayers: number;
 }
 
+declare var VRDisplayCapabilities: {
+    prototype: VRDisplayCapabilities;
+    new(): VRDisplayCapabilities;
+};
+
 interface VREyeParameters {
     /** @deprecated */
     readonly fieldOfView: VRFieldOfView;
@@ -146,6 +159,11 @@ interface VREyeParameters {
     readonly renderWidth: number;
 }
 
+declare var VREyeParameters: {
+    prototype: VREyeParameters;
+    new(): VREyeParameters;
+};
+
 interface VRFieldOfView {
     readonly downDegrees: number;
     readonly leftDegrees: number;
@@ -153,6 +171,11 @@ interface VRFieldOfView {
     readonly upDegrees: number;
 }
 
+declare var VRFieldOfView: {
+    prototype: VRFieldOfView;
+    new(): VRFieldOfView;
+};
+
 interface VRFrameData {
     readonly leftProjectionMatrix: Float32Array;
     readonly leftViewMatrix: Float32Array;
@@ -163,9 +186,9 @@ interface VRFrameData {
 }
 
 declare var VRFrameData: {
-    prototype: VRFrameData
-    new(): VRFrameData
-}
+    prototype: VRFrameData;
+    new(): VRFrameData;
+};
 
 interface VRPose {
     readonly angularAcceleration: Float32Array | null;
@@ -177,6 +200,11 @@ interface VRPose {
     readonly timestamp: number;
 }
 
+declare var VRPose: {
+    prototype: VRPose;
+    new(): VRPose;
+};
+
 interface VRStageParameters {
     sittingToStandingTransform?: Float32Array;
     sizeX?: number;
@@ -188,13 +216,34 @@ interface Navigator {
     readonly activeVRDisplays: ReadonlyArray<VRDisplay>;
 }
 
+interface VRDisplayEventInit extends EventInit {
+    display: VRDisplay;
+    reason?: VRDisplayEventReason_dt_alias;
+}
+
+interface VRDisplayEvent extends Event {
+    readonly display: VRDisplay;
+    readonly reason: VRDisplayEventReason_dt_alias | null;
+}
+
+declare var VRDisplayEvent: {
+    prototype: VRDisplayEvent;
+    new(type: string, eventInitDict: VRDisplayEventInit): VRDisplayEvent;
+};
+
 interface Window {
-    onvrdisplayconnected: ((this: Window, ev: Event) => any) | null;
-    onvrdisplaydisconnected: ((this: Window, ev: Event) => any) | null;
+    onvrdisplayactivate: ((this: Window, ev: Event) => any) | null;
+    onvrdisplayblur: ((this: Window, ev: Event) => any) | null;
+    onvrdisplayconnect: ((this: Window, ev: Event) => any) | null;
+    onvrdisplaydeactivate: ((this: Window, ev: Event) => any) | null;
+    onvrdisplaydisconnect: ((this: Window, ev: Event) => any) | null;
+    onvrdisplayfocus: ((this: Window, ev: Event) => any) | null;
+    onvrdisplaypointerrestricted: ((this: Window, ev: Event) => any) | null;
+    onvrdisplaypointerunrestricted: ((this: Window, ev: Event) => any) | null;
     onvrdisplaypresentchange: ((this: Window, ev: Event) => any) | null;
-    addEventListener(type: "vrdisplayconnected", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "vrdisplaydisconnected", listener: (ev: Event) => any, useCapture?: boolean): void;
-    addEventListener(type: "vrdisplaypresentchange", listener: (ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "vrdisplayconnect", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "vrdisplaydisconnect", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "vrdisplaypresentchange", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
 }
 
 interface Gamepad {

From 247088de36674ca370919a39fee868415bb139f0 Mon Sep 17 00:00:00 2001
From: efokschaner <eddyaod@gmail.com>
Date: Tue, 3 Apr 2018 00:10:02 -0700
Subject: [PATCH 1034/1382] Add missing addEventListener declarations

---
 types/webvr-api/index.d.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/types/webvr-api/index.d.ts b/types/webvr-api/index.d.ts
index cf7e3dc8b8..329f7fe6d8 100644
--- a/types/webvr-api/index.d.ts
+++ b/types/webvr-api/index.d.ts
@@ -241,8 +241,14 @@ interface Window {
     onvrdisplaypointerrestricted: ((this: Window, ev: Event) => any) | null;
     onvrdisplaypointerunrestricted: ((this: Window, ev: Event) => any) | null;
     onvrdisplaypresentchange: ((this: Window, ev: Event) => any) | null;
+    addEventListener(type: "vrdisplayactivate", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "vrdisplayblur", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "vrdisplayconnect", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "vrdisplaydeactivate", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "vrdisplaydisconnect", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "vrdisplayfocus", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "vrdisplaypointerrestricted", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
+    addEventListener(type: "vrdisplaypointerunrestricted", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
     addEventListener(type: "vrdisplaypresentchange", listener: (this: Window, ev: Event) => any, useCapture?: boolean): void;
 }
 

From 978c90a6a15e6bf0fe2e792d007f950071743436 Mon Sep 17 00:00:00 2001
From: Stian Didriksen <stipsan@gmail.com>
Date: Tue, 3 Apr 2018 10:53:22 +0200
Subject: [PATCH 1035/1382] Add `noModule` to React ScriptHTMLAttributes
 (#24691)

React added this in https://github.com/facebook/react/pull/11900
Which is part of the 16.3 release https://github.com/facebook/react/blob/master/CHANGELOG.md#react-dom
---
 types/react/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index 13faef3d01..3481e00760 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -3211,6 +3211,7 @@ declare namespace React {
         form?: string;
         multiple?: boolean;
         name?: string;
+        noModule?: boolean;
         required?: boolean;
         size?: number;
         value?: string | string[] | number;

From 3c4e58a28805b603ebfeb2599ff402f204668515 Mon Sep 17 00:00:00 2001
From: Alex Dunne <alex@codevate.com>
Date: Tue, 3 Apr 2018 13:20:18 +0100
Subject: [PATCH 1036/1382] [react-native] Added missing presentationStyle to
 the Modal

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

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index b881476782..321978b684 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -4399,6 +4399,10 @@ export interface ModalProperties {
      * @platform ios
      */
     onDismiss?: () => void;
+    /**
+     * The `presentationStyle` determines the style of modal to show
+     */
+    presentationStyle?: "fullScreen" | "pageSheet" | "formSheet" | "overFullScreen";
 }
 
 export interface ModalStatic extends React.ComponentClass<ModalProperties> {}

From f802a441b48afdcc0a9d3f98a014b881a8f208ed Mon Sep 17 00:00:00 2001
From: Alex Dunne <alex@codevate.com>
Date: Tue, 3 Apr 2018 13:59:40 +0100
Subject: [PATCH 1037/1382] [react-native] Added platform indicator to
 presentationStyle prop

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

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index 321978b684..8323779057 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -4401,6 +4401,7 @@ export interface ModalProperties {
     onDismiss?: () => void;
     /**
      * The `presentationStyle` determines the style of modal to show
+     * @platform ios
      */
     presentationStyle?: "fullScreen" | "pageSheet" | "formSheet" | "overFullScreen";
 }

From 64981bc0faccc7a86b3bd354d75d9f44f67bf67a Mon Sep 17 00:00:00 2001
From: Rob Moran <rob.moran@arm.com>
Date: Tue, 3 Apr 2018 15:18:48 +0100
Subject: [PATCH 1038/1382] Updated types for noble advertisement data

---
 types/noble/index.d.ts     | 6 +++++-
 types/noble/noble-tests.ts | 5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/types/noble/index.d.ts b/types/noble/index.d.ts
index 474338d383..ee4fbf1654 100644
--- a/types/noble/index.d.ts
+++ b/types/noble/index.d.ts
@@ -6,6 +6,7 @@
 //                 Luke Libraro <https://github.com/lukel99>
 //                 Dan Chao <https://github.com/bioball>
 //                 Michal Lower <https://github.com/keton>
+//                 Rob Moran <https://github.com/thegecko>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -63,7 +64,10 @@ export declare class Peripheral extends events.EventEmitter {
 
 export interface Advertisement {
     localName: string;
-    serviceData: Buffer;
+    serviceData: {
+        uuid: string,
+        data: Buffer
+    };
     txPowerLevel: number;
     manufacturerData: Buffer;
     serviceUuids: string[];
diff --git a/types/noble/noble-tests.ts b/types/noble/noble-tests.ts
index 65e13f4d43..5e00105433 100644
--- a/types/noble/noble-tests.ts
+++ b/types/noble/noble-tests.ts
@@ -39,7 +39,10 @@ var peripheral: noble.Peripheral = new noble.Peripheral();
 peripheral.uuid = "12ad4e81";
 peripheral.advertisement = {
     localName:        "device",
-    serviceData:      new Buffer(1),
+    serviceData:      {
+        uuid: "180a",
+        data: new Buffer(1)
+    },
     txPowerLevel:     1,
     manufacturerData: new Buffer(1),
     serviceUuids:     ["0x180a", "0x180d"]

From e2b46910aceabaccb64e28c493b821f021d4de99 Mon Sep 17 00:00:00 2001
From: Paul van Brenk <paul.van.brenk@microsoft.com>
Date: Tue, 3 Apr 2018 09:56:35 -0700
Subject: [PATCH 1039/1382] Fix typo in #24560

---
 types/d3-fetch/d3-fetch-tests.ts | 4 ++--
 types/d3-fetch/index.d.ts        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/types/d3-fetch/d3-fetch-tests.ts b/types/d3-fetch/d3-fetch-tests.ts
index 3cffde0c9e..9712a0da15 100644
--- a/types/d3-fetch/d3-fetch-tests.ts
+++ b/types/d3-fetch/d3-fetch-tests.ts
@@ -51,8 +51,8 @@ promise2 = d3Fetch.tsv<MyType>(url, parseRow);
 promise2 = d3Fetch.tsv<MyType>(url, init, parseRow);
 
 let docPromise: Promise<Document>;
-docPromise = d3Fetch.hmtl(url);
-docPromise = d3Fetch.hmtl(url, init);
+docPromise = d3Fetch.html(url);
+docPromise = d3Fetch.html(url, init);
 
 docPromise = d3Fetch.svg(url);
 docPromise = d3Fetch.svg(url, init);
diff --git a/types/d3-fetch/index.d.ts b/types/d3-fetch/index.d.ts
index fc0d5e0e66..6e31d70a76 100644
--- a/types/d3-fetch/index.d.ts
+++ b/types/d3-fetch/index.d.ts
@@ -154,7 +154,7 @@ export function dsv<ParsedRow extends DSVRowAny>(
  * @param url A valid URL string.
  * @param init An optional request initialization object.
  */
-export function hmtl(url: string, init?: RequestInit): Promise<Document>;
+export function html(url: string, init?: RequestInit): Promise<Document>;
 
 /**
  * Fetches the image at the specified input URL and returns a promise of an HTML image element.

From f48033fba6be70841d67a676cb9c3149e64a218e Mon Sep 17 00:00:00 2001
From: Alex LaFroscia <alex@lafroscia.com>
Date: Tue, 3 Apr 2018 10:27:19 -0700
Subject: [PATCH 1040/1382] Add `EmberArray` type export to '@ember/array'

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

diff --git a/types/ember/index.d.ts b/types/ember/index.d.ts
index 6d8adebae2..c7d344e658 100755
--- a/types/ember/index.d.ts
+++ b/types/ember/index.d.ts
@@ -3408,6 +3408,7 @@ declare module '@ember/application/resolver' {
 
 declare module '@ember/array' {
     import Ember from 'ember';
+    type EmberArray<T> = Ember.Array<T>;
     const EmberArray: typeof Ember.Array;
     export default EmberArray;
     export const A: typeof Ember.A;

From 9edfaf06695fa5ecefb217ace86bc7a856b53680 Mon Sep 17 00:00:00 2001
From: Fredrik Nicol <fredrik.nicol@gmail.com>
Date: Tue, 3 Apr 2018 20:34:36 +0200
Subject: [PATCH 1041/1382] Constrain array length of expand properties

---
 types/jss/css.d.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/types/jss/css.d.ts b/types/jss/css.d.ts
index 3e5f81c582..2da9aa04b4 100644
--- a/types/jss/css.d.ts
+++ b/types/jss/css.d.ts
@@ -36,11 +36,13 @@ export interface JssExpand {
               attachment: CSSProperties['backgroundAttachment'];
               color: CSSProperties['backgroundColor'];
               image: CSSProperties['backgroundImage'];
-              position: CSSProperties['backgroundPosition'] | number[]; // Can be written using array e.g. `[0 0]`
+              position:
+                  | CSSProperties['backgroundPosition']
+                  | [csstype.Properties['backgroundPosition'], csstype.Properties['backgroundPosition']]; // Can be written using array e.g. `[0 0]`
               repeat: CSSProperties['backgroundRepeat'];
               size:
                   | CSSProperties['backgroundSize']
-                  | Array<CSSProperties['backgroundSize']>; // Can be written using array e.g. `['center' 'center']`
+                  | [csstype.Properties['backgroundSize'], csstype.Properties['backgroundSize']]; // Can be written using array e.g. `['center' 'center']`
           }
         | CSSProperties['background'];
     border:

From 80ab453b2c5046e7a2a2e8fa492c97095f384449 Mon Sep 17 00:00:00 2001
From: Fredrik Nicol <fredrik.nicol@gmail.com>
Date: Tue, 3 Apr 2018 20:36:22 +0200
Subject: [PATCH 1042/1382] Rename generic parameter

---
 types/jss/index.d.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/types/jss/index.d.ts b/types/jss/index.d.ts
index b22ed4a240..080db10400 100644
--- a/types/jss/index.d.ts
+++ b/types/jss/index.d.ts
@@ -24,10 +24,10 @@ export interface Rule {
 	toJSON(): string;
 }
 
-export interface StyleSheet<Name extends string = any> {
+export interface StyleSheet<RuleName extends string = any> {
 	// Gives auto-completion on the rules declared in `createStyleSheet` without
 	// causing errors for rules added dynamically after creation.
-	classes: Classes<Name>;
+	classes: Classes<RuleName>;
 	options: RuleOptions;
 	linked: boolean;
 	attached: boolean;
@@ -44,21 +44,21 @@ export interface StyleSheet<Name extends string = any> {
 	 * Will insert a rule also after the stylesheet has been rendered first time.
 	 */
 	addRule(style: Style, options?: Partial<RuleOptions>): Rule;
-	addRule(name: Name, style: Style, options?: Partial<RuleOptions>): Rule;
+	addRule(name: RuleName, style: Style, options?: Partial<RuleOptions>): Rule;
 	/**
 	 * Create and add rules.
 	 * Will render also after Style Sheet was rendered the first time.
 	 */
-	addRules(styles: Partial<Styles<Name>>, options?: Partial<RuleOptions>): Rule[];
+	addRules(styles: Partial<Styles<RuleName>>, options?: Partial<RuleOptions>): Rule[];
 	/**
 	 * Get a rule by name.
 	 */
-	getRule(name: Name): Rule;
+	getRule(name: RuleName): Rule;
 	/**
 	 * Delete a rule by name.
 	 * Returns `true`: if rule has been deleted from the DOM.
 	 */
-	deleteRule(name: Name): boolean;
+	deleteRule(name: RuleName): boolean;
 	/**
 	 * Get index of a rule.
 	 */
@@ -67,7 +67,7 @@ export interface StyleSheet<Name extends string = any> {
 	 * Update the function values with a new data.
 	 */
 	update(data?: {}): this;
-	update(name: Name, data: {}): this;
+	update(name: RuleName, data: {}): this;
 	/**
 	 * Convert rules to a CSS string.
 	 */

From d8ce691b5a22aad5e0a33f198e4fd340617616ed Mon Sep 17 00:00:00 2001
From: Fredrik Nicol <fredrik.nicol@gmail.com>
Date: Tue, 3 Apr 2018 20:36:49 +0200
Subject: [PATCH 1043/1382] Upgrade csstype@2

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

diff --git a/types/jss/package.json b/types/jss/package.json
index 201f7e2d14..f3be220fbc 100644
--- a/types/jss/package.json
+++ b/types/jss/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
   "dependencies": {
-    "csstype": "^1.6.0"
+    "csstype": "^2.0.0"
   }
 }

From b4529138dd01fd9d829389b1b32a073648bb88ab Mon Sep 17 00:00:00 2001
From: Mohsen Azimi <mazimi@lyft.com>
Date: Tue, 3 Apr 2018 12:04:23 -0700
Subject: [PATCH 1044/1382] Take a less invasive path

---
 types/passport-naver/index.d.ts                 |  4 ++--
 .../passport-oauth2-client-password/index.d.ts  |  4 ++--
 types/passport-strategy/index.d.ts              |  2 +-
 types/passport/index.d.ts                       | 17 +++++++++--------
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/types/passport-naver/index.d.ts b/types/passport-naver/index.d.ts
index 75c21b76ed..8bd022cd21 100644
--- a/types/passport-naver/index.d.ts
+++ b/types/passport-naver/index.d.ts
@@ -37,10 +37,10 @@ export interface StrategyOption {
 export type VerifyFunction =
     (accessToken: string, refreshToken: string, profile: Profile, done: (error: any, user?: any, info?: any) => void) => void;
 
-export class Strategy implements passport.Strategy {
+export class Strategy extends passport.Strategy {
     constructor(options: StrategyOption, verify: VerifyFunction);
 
-    authenticate: (req: express.Request, options?: any) => void;
+    authenticate(req: express.Request, options?: any): void;
     authorizationParams: (options: any) => any;
     userProfile: (accessToken: string, done: (error: any, user?: any) => void) => void;
 }
diff --git a/types/passport-oauth2-client-password/index.d.ts b/types/passport-oauth2-client-password/index.d.ts
index 2a93a87608..faab5d59d4 100644
--- a/types/passport-oauth2-client-password/index.d.ts
+++ b/types/passport-oauth2-client-password/index.d.ts
@@ -22,10 +22,10 @@ interface VerifyFunction {
     (clientId: string, clientSecret: string, done: (error: any, client?: any, info?: any) => void): void;
 }
 
-declare class Strategy implements passport.Strategy {
+declare class Strategy extends passport.Strategy {
     constructor(options: StrategyOptionsWithRequestInterface, verify: VerifyFunctionWithRequest);
     constructor(verify: VerifyFunction);
 
     name: string;
-    authenticate: (req: express.Request, options?: {}) => void;
+    authenticate(req: express.Request, options?: {}): void;
 }
diff --git a/types/passport-strategy/index.d.ts b/types/passport-strategy/index.d.ts
index 1a0b2dd4f5..f8b227bfd6 100644
--- a/types/passport-strategy/index.d.ts
+++ b/types/passport-strategy/index.d.ts
@@ -16,7 +16,7 @@
 import passport = require('passport');
 import express = require('express');
 
-declare class Strategy implements passport.Strategy {
+declare class Strategy extends passport.Strategy {
     /**
      * Performs authentication for the request.
      * Note: Virtual function - re-implement in the strategy.
diff --git a/types/passport/index.d.ts b/types/passport/index.d.ts
index cee220e901..4a91d2b64b 100644
--- a/types/passport/index.d.ts
+++ b/types/passport/index.d.ts
@@ -5,7 +5,6 @@
 //                 Igor Belagorudsky <https://github.com/theigor>
 //                 Tomek Łaziuk <https://github.com/tlaziuk>
 //                 Daniel Perez Alvarez <https://github.com/danielpa9708>
-//                 Mohsen Azimi <https://github.com/mohsen1>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -74,17 +73,15 @@ declare namespace passport {
     interface PassportStatic extends Authenticator {
         Authenticator: { new(): Authenticator };
         Passport: PassportStatic["Authenticator"];
+        Strategy: { new(): Strategy & StrategyCreatedStatic };
     }
 
-    /**
-     * @param T Strategy option config
-     */
-    export abstract class Strategy<T = object> {
+    interface Strategy {
         name?: string;
+        authenticate(this: StrategyCreated<this>, req: express.Request, options?: any): any;
+    }
 
-        /** This method must be implemented by the subclass */
-        abstract authenticate(req: express.Request, options?: T): any;
-
+    interface StrategyCreatedStatic {
         /**
          * Authenticate `user`, with optional `info`.
          *
@@ -128,6 +125,10 @@ declare namespace passport {
         error(err: any): void;
     }
 
+    type StrategyCreated<T, O = T & StrategyCreatedStatic> = {
+        [P in keyof O]: O[P];
+    };
+
     interface Profile {
         provider: string;
         id: string;

From a85c598a91355f3331a4571de824f368d9708e52 Mon Sep 17 00:00:00 2001
From: Alex LaFroscia <alex@lafroscia.com>
Date: Tue, 3 Apr 2018 12:54:07 -0700
Subject: [PATCH 1045/1382] Add type exports for additional types

---
 types/ember/index.d.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/types/ember/index.d.ts b/types/ember/index.d.ts
index c7d344e658..740ff1308c 100755
--- a/types/ember/index.d.ts
+++ b/types/ember/index.d.ts
@@ -6,6 +6,7 @@
 //                 Chris Krycho <https://github.com/chriskrycho>
 //                 Theron Cross <https://github.com/theroncross>
 //                 Martin Feckie <https://github.com/mfeckie>
+//                 Alex LaFroscia <https://github.com/alexlafroscia>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
@@ -3418,6 +3419,7 @@ declare module '@ember/array' {
 
 declare module '@ember/array/mutable' {
     import Ember from 'ember';
+    type MutableArray<T> = Ember.MutableArray<T>;
     const MutableArray: typeof Ember.MutableArray;
     export default MutableArray;
 }
@@ -3497,6 +3499,7 @@ declare module '@ember/engine/instance' {
 
 declare module '@ember/enumerable' {
     import Ember from 'ember';
+    type Enumerable<T> = Ember.Enumerable<T>;
     const Enumerable: typeof Ember.Enumerable;
     export default Enumerable;
 }
@@ -3585,6 +3588,7 @@ declare module '@ember/object/core' {
 
 declare module '@ember/object/evented' {
     import Ember from 'ember';
+    type Evented = Ember.Evented;
     const Evented: typeof Ember.Evented;
     export default Evented;
     export const on: typeof Ember.on;
@@ -3611,6 +3615,7 @@ declare module '@ember/object/mixin' {
 
 declare module '@ember/object/observable' {
     import Ember from 'ember';
+    type Observable = Ember.Observable;
     const Observable: typeof Ember.Observable;
     export default Observable;
 }
@@ -3623,6 +3628,7 @@ declare module '@ember/object/observers' {
 
 declare module '@ember/object/promise-proxy-mixin' {
     import Ember from 'ember';
+    type PromiseProxyMixin<T> = Ember.PromiseProxyMixin<T>;
     const PromiseProxyMixin: typeof Ember.PromiseProxyMixin;
     export default PromiseProxyMixin;
 }

From 2eaf80dd729b3e5ce97d415beb359cd41aaad029 Mon Sep 17 00:00:00 2001
From: Ian Mobley <ianmobley@gmail.com>
Date: Tue, 3 Apr 2018 13:42:25 -0700
Subject: [PATCH 1046/1382] Add basic express-flash definition

express-flash just implements connenct-flash so there is no need to
define anything beside the single RequestHandler function that it
exports.
---
 types/express-flash/express-flash-tests.ts | 12 +++++++++++
 types/express-flash/index.d.ts             | 11 +++++++++++
 types/express-flash/tsconfig.json          | 23 ++++++++++++++++++++++
 types/express-flash/tslint.json            |  1 +
 4 files changed, 47 insertions(+)
 create mode 100644 types/express-flash/express-flash-tests.ts
 create mode 100644 types/express-flash/index.d.ts
 create mode 100644 types/express-flash/tsconfig.json
 create mode 100644 types/express-flash/tslint.json

diff --git a/types/express-flash/express-flash-tests.ts b/types/express-flash/express-flash-tests.ts
new file mode 100644
index 0000000000..c6212c6906
--- /dev/null
+++ b/types/express-flash/express-flash-tests.ts
@@ -0,0 +1,12 @@
+import express = require('express');
+import flash = require('express-flash');
+
+const app = express();
+
+app.use(flash());
+
+app.use((req) => {
+  req.flash();
+  req.flash('message');
+  req.flash('event', 'message');
+});
diff --git a/types/express-flash/index.d.ts b/types/express-flash/index.d.ts
new file mode 100644
index 0000000000..e0b00b8d80
--- /dev/null
+++ b/types/express-flash/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for express-flash 0.0
+// Project: https://github.com/RGBboy/express-flash
+// Definitions by: Ian Mobley <https://github.com/iMobs>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/// <reference types="connect-flash" />
+
+import express = require('express');
+declare function flash(): express.RequestHandler;
+export = flash;
diff --git a/types/express-flash/tsconfig.json b/types/express-flash/tsconfig.json
new file mode 100644
index 0000000000..5fbfc5aefd
--- /dev/null
+++ b/types/express-flash/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "express-flash-tests.ts"
+    ]
+}
diff --git a/types/express-flash/tslint.json b/types/express-flash/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/express-flash/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From b9cadc9a0f6bd2e1a3e90f0bc798959fb4b44c86 Mon Sep 17 00:00:00 2001
From: Tom Crockett <pelotom@gmail.com>
Date: Tue, 3 Apr 2018 14:11:25 -0700
Subject: [PATCH 1047/1382] [react] Use csstype for React.CSSProperties
 (#24688)

* Use csstype

* Fix victory test

* Fix aphrodite definitions

* Fix issue link in comment
---
 types/aphrodite/aphrodite-tests.tsx |    4 +-
 types/aphrodite/index.d.ts          |   16 +-
 types/react/index.d.ts              | 1641 +--------------------------
 types/react/package.json            |    6 +
 types/victory/victory-tests.tsx     |    2 +-
 5 files changed, 29 insertions(+), 1640 deletions(-)
 create mode 100644 types/react/package.json

diff --git a/types/aphrodite/aphrodite-tests.tsx b/types/aphrodite/aphrodite-tests.tsx
index 685a9a4283..feb35c8c7c 100644
--- a/types/aphrodite/aphrodite-tests.tsx
+++ b/types/aphrodite/aphrodite-tests.tsx
@@ -1,5 +1,5 @@
 import * as React from "react";
-import { StyleSheet, css, StyleSheetServer, StyleSheetTestUtils } from "aphrodite";
+import { StyleSheet, css, StyleSheetServer, StyleSheetTestUtils, FontFamily } from "aphrodite";
 
 const styles = StyleSheet.create({
     red: {
@@ -20,7 +20,7 @@ const styles = StyleSheet.create({
     }
 });
 
-const coolFont = {
+const coolFont: FontFamily = {
     fontFamily: "CoolFont",
     fontStyle: "normal",
     fontWeight: "normal",
diff --git a/types/aphrodite/index.d.ts b/types/aphrodite/index.d.ts
index 00d1908d9f..9684895588 100644
--- a/types/aphrodite/index.d.ts
+++ b/types/aphrodite/index.d.ts
@@ -6,11 +6,25 @@
 
 import * as React from "react";
 
+type FontFamily =
+    | React.CSSProperties['fontFamily']
+    | Pick<React.CSSProperties,
+        | 'fontFamily'
+        | 'fontStyle'
+        | 'fontWeight'
+        | 'src'
+    >
+
 /**
  * Aphrodite style declaration
  */
 export interface StyleDeclaration {
-    [key: string]: React.CSSProperties;
+    [key: string]: Pick<React.CSSProperties, (
+        & React.CSSProperties
+        & { fontFamily: never }
+    )[keyof React.CSSProperties]> & {
+        fontFamily?: FontFamily | FontFamily[];
+    };
 }
 
 interface StyleSheetStatic {
diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index c85b5a0036..49224d93cf 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -52,6 +52,8 @@ React.cloneElement(element, <{ isDisabled?: boolean } & React.Attributes>{
 
 /// <reference path="global.d.ts" />
 
+import * as CSS from 'csstype';
+
 type NativeAnimationEvent = AnimationEvent;
 type NativeClipboardEvent = ClipboardEvent;
 type NativeCompositionEvent = CompositionEvent;
@@ -909,1642 +911,9 @@ declare namespace React {
         onTransitionEndCapture?: TransitionEventHandler<T>;
     }
 
-    // See CSS 3 CSS-wide keywords https://www.w3.org/TR/css3-values/#common-keywords
-    // See CSS 3 Explicit Defaulting https://www.w3.org/TR/css-cascade-3/#defaulting-keywords
-    // "all CSS properties can accept these values"
-    type CSSWideKeyword = "initial" | "inherit" | "unset";
-
-    // See CSS 3 <percentage> type https://drafts.csswg.org/css-values-3/#percentages
-    type CSSPercentage = string;
-
-    // See CSS 3 <length> type https://drafts.csswg.org/css-values-3/#lengths
-    type CSSLength = number | string;
-
-    // This interface is not complete. Only properties accepting
-    // unitless numbers are listed here (see CSSProperty.js in React)
-    interface CSSProperties {
-        /**
-         * Aligns a flex container's lines within the flex container when there is extra space in the cross-axis, similar to how justify-content aligns individual items within the main-axis.
-         */
-        alignContent?: CSSWideKeyword | "flex-start" | "flex-end" | "center" | "space-between" | "space-around" | "stretch";
-
-        /**
-         * Sets the default alignment in the cross axis for all of the flex container's items, including anonymous flex items, similarly to how justify-content aligns items along the main axis.
-         */
-        alignItems?: CSSWideKeyword | "flex-start" | "flex-end" | "center" | "baseline" | "stretch";
-
-        /**
-         * Allows the default alignment to be overridden for individual flex items.
-         */
-        alignSelf?: CSSWideKeyword | "auto" | "flex-start" | "flex-end" | "center" | "baseline" | "stretch";
-
-        /**
-         * This property allows precise alignment of elements, such as graphics,
-         * that do not have a baseline-table or lack the desired baseline in their baseline-table.
-         * With the alignment-adjust property, the position of the baseline identified by the alignment-baseline
-         * can be explicitly determined. It also determines precisely the alignment point for each glyph within a textual element.
-         */
-        alignmentAdjust?: CSSWideKeyword | any;
-
-        alignmentBaseline?: CSSWideKeyword | any;
-
-        /**
-         * Defines a length of time to elapse before an animation starts, allowing an animation to begin execution some time after it is applied.
-         */
-        animationDelay?: CSSWideKeyword | any;
-
-        /**
-         * Defines whether an animation should run in reverse on some or all cycles.
-         */
-        animationDirection?: CSSWideKeyword | any;
-
-        /**
-         * Specifies how many times an animation cycle should play.
-         */
-        animationIterationCount?: CSSWideKeyword | any;
-
-        /**
-         * Defines the list of animations that apply to the element.
-         */
-        animationName?: CSSWideKeyword | any;
-
-        /**
-         * Defines whether an animation is running or paused.
-         */
-        animationPlayState?: CSSWideKeyword | any;
-
-        /**
-         * Allows changing the style of any element to platform-based interface elements or vice versa.
-         */
-        appearance?: CSSWideKeyword | any;
-
-        /**
-         * Determines whether or not the “back” side of a transformed element is visible when facing the viewer.
-         */
-        backfaceVisibility?: CSSWideKeyword | any;
-
-        /**
-         * Shorthand property to set the values for one or more of:
-         * background-clip, background-color, background-image,
-         * background-origin, background-position, background-repeat,
-         * background-size, and background-attachment.
-         */
-        background?: CSSWideKeyword | any;
-
-        /**
-         * If a background-image is specified, this property determines
-         * whether that image's position is fixed within the viewport,
-         * or scrolls along with its containing block.
-         * See CSS 3 background-attachment property https://drafts.csswg.org/css-backgrounds-3/#the-background-attachment
-         */
-        backgroundAttachment?: CSSWideKeyword | "scroll" | "fixed" | "local";
-
-        /**
-         * This property describes how the element's background images should blend with each other and the element's background color.
-         * The value is a list of blend modes that corresponds to each background image. Each element in the list will apply to the
-         * corresponding element of background-image. If a property doesn’t have enough comma-separated values to match the number of layers,
-         * the UA must calculate its used value by repeating the list of values until there are enough.
-         */
-        backgroundBlendMode?: CSSWideKeyword | any;
-
-        /**
-         * Sets the background color of an element.
-         */
-        backgroundColor?: CSSWideKeyword | any;
-
-        backgroundComposite?: CSSWideKeyword | any;
-
-        /**
-         * Applies one or more background images to an element. These can be any valid CSS image, including url() paths to image files or CSS gradients.
-         */
-        backgroundImage?: CSSWideKeyword | any;
-
-        /**
-         * Specifies what the background-position property is relative to.
-         */
-        backgroundOrigin?: CSSWideKeyword | any;
-
-        /**
-         * Sets the position of a background image.
-         */
-        backgroundPosition?: CSSWideKeyword | any;
-
-        /**
-         * Background-repeat defines if and how background images will be repeated after they have been sized and positioned
-         */
-        backgroundRepeat?: CSSWideKeyword | any;
-
-        /**
-         * Defines the size of the background images
-         */
-        backgroundSize?: CSSWideKeyword | any;
-
-        /**
-         * Obsolete - spec retired, not implemented.
-         */
-        baselineShift?: CSSWideKeyword | any;
-
-        /**
-         * Non standard. Sets or retrieves the location of the Dynamic HTML (DHTML) behavior.
-         */
-        behavior?: CSSWideKeyword | any;
-
-        /**
-         * Shorthand property that defines the different properties of all four sides of an element's border in a single declaration.
-         * It can be used to set border-width, border-style and border-color, or a subset of these.
-         */
-        border?: CSSWideKeyword | any;
-
-        /**
-         * Shorthand that sets the values of border-bottom-color,
-         * border-bottom-style, and border-bottom-width.
-         */
-        borderBottom?: CSSWideKeyword | any;
-
-        /**
-         * Sets the color of the bottom border of an element.
-         */
-        borderBottomColor?: CSSWideKeyword | any;
-
-        /**
-         * Defines the shape of the border of the bottom-left corner.
-         */
-        borderBottomLeftRadius?: CSSWideKeyword | CSSLength;
-
-        /**
-         * Defines the shape of the border of the bottom-right corner.
-         */
-        borderBottomRightRadius?: CSSWideKeyword | CSSLength;
-
-        /**
-         * Sets the line style of the bottom border of a box.
-         */
-        borderBottomStyle?: CSSWideKeyword | any;
-
-        /**
-         * Sets the width of an element's bottom border. To set all four borders,
-         * use the border-width shorthand property which sets the values simultaneously for border-top-width,
-         * border-right-width, border-bottom-width, and border-left-width.
-         */
-        borderBottomWidth?: CSSWideKeyword | any;
-
-        /**
-         * Border-collapse can be used for collapsing the borders between table cells
-         */
-        borderCollapse?: CSSWideKeyword | any;
-
-        /**
-         * The CSS border-color property sets the color of an element's four borders.
-         * This property can have from one to four values, made up of the elementary properties:
-         *      •       border-top-color
-         *      •       border-right-color
-         *      •       border-bottom-color
-         *      •       border-left-color The default color is the currentColor of each of these values.
-         * If you provide one value, it sets the color for the element. Two values set the horizontal and vertical values,
-         * respectively. Providing three values sets the top, vertical, and bottom values, in that order.
-         * Four values set all for sides: top, right, bottom, and left, in that order.
-         */
-        borderColor?: CSSWideKeyword | any;
-
-        /**
-         * Specifies different corner clipping effects, such as scoop (inner curves), bevel (straight cuts) or notch (cut-off rectangles).
-         * Works along with border-radius to specify the size of each corner effect.
-         */
-        borderCornerShape?: CSSWideKeyword | any;
-
-        /**
-         * The property border-image-source is used to set the image to be used instead of the border style.
-         * If this is set to none the border-style is used instead.
-         */
-        borderImageSource?: CSSWideKeyword | any;
-
-        /**
-         * The border-image-width CSS property defines the offset to use for dividing the border image in nine parts,
-         * the top-left corner, central top edge, top-right-corner, central right edge, bottom-right corner, central bottom edge,
-         * bottom-left corner, and central right edge. They represent inward distance from the top, right, bottom, and left edges.
-         */
-        borderImageWidth?: CSSWideKeyword | any;
-
-        /**
-         * Shorthand property that defines the border-width, border-style and border-color of an element's left border in a single declaration.
-         * Note that you can use the corresponding longhand properties to set specific individual properties of the left border — border-left-width,
-         * border-left-style and border-left-color.
-         */
-        borderLeft?: CSSWideKeyword | any;
-
-        /**
-         * The CSS border-left-color property sets the color of an element's left border. This page explains the border-left-color value,
-         * but often you will find it more convenient to fix the border's left color as part of a shorthand set, either border-left or border-color.
-         * Colors can be defined several ways. For more information, see Usage.
-         */
-        borderLeftColor?: CSSWideKeyword | any;
-
-        /**
-         * Sets the style of an element's left border. To set all four borders, use the shorthand property, border-style.
-         * Otherwise, you can set the borders individually with border-top-style, border-right-style, border-bottom-style, border-left-style.
-         */
-        borderLeftStyle?: CSSWideKeyword | any;
-
-        /**
-         * Sets the width of an element's left border. To set all four borders,
-         * use the border-width shorthand property which sets the values simultaneously for border-top-width,
-         * border-right-width, border-bottom-width, and border-left-width.
-         */
-        borderLeftWidth?: CSSWideKeyword | any;
-
-        /**
-         * Shorthand property that sets the rounding of all four corners.
-         */
-        borderRadius?: CSSWideKeyword | CSSLength;
-
-        /**
-         * Shorthand property that defines the border-width, border-style and border-color of an element's right border
-         * in a single declaration. Note that you can use the corresponding longhand properties to set specific
-         * individual properties of the right border — border-right-width, border-right-style and border-right-color.
-         */
-        borderRight?: CSSWideKeyword | any;
-
-        /**
-         * Sets the color of an element's right border. This page explains the border-right-color value,
-         * but often you will find it more convenient to fix the border's right color as part of a shorthand set,
-         * either border-right or border-color.
-         * Colors can be defined several ways. For more information, see Usage.
-         */
-        borderRightColor?: CSSWideKeyword | any;
-
-        /**
-         * Sets the style of an element's right border. To set all four borders, use the shorthand property,
-         * border-style. Otherwise, you can set the borders individually with border-top-style, border-right-style,
-         * border-bottom-style, border-left-style.
-         */
-        borderRightStyle?: CSSWideKeyword | any;
-
-        /**
-         * Sets the width of an element's right border. To set all four borders,
-         * use the border-width shorthand property which sets the values simultaneously for border-top-width,
-         * border-right-width, border-bottom-width, and border-left-width.
-         */
-        borderRightWidth?: CSSWideKeyword | any;
-
-        /**
-         * Specifies the distance between the borders of adjacent cells.
-         */
-        borderSpacing?: CSSWideKeyword | any;
-
-        /**
-         * Sets the style of an element's four borders. This property can have from one to four values.
-         * With only one value, the value will be applied to all four borders;
-         * otherwise, this works as a shorthand property for each of border-top-style, border-right-style,
-         * border-bottom-style, border-left-style, where each border style may be assigned a separate value.
-         */
-        borderStyle?: CSSWideKeyword | any;
-
-        /**
-         * Shorthand property that defines the border-width, border-style and border-color of an element's top border
-         * in a single declaration. Note that you can use the corresponding longhand properties to set specific
-         * individual properties of the top border — border-top-width, border-top-style and border-top-color.
-         */
-        borderTop?: CSSWideKeyword | any;
-
-        /**
-         * Sets the color of an element's top border. This page explains the border-top-color value,
-         * but often you will find it more convenient to fix the border's top color as part of a shorthand set,
-         * either border-top or border-color.
-         * Colors can be defined several ways. For more information, see Usage.
-         */
-        borderTopColor?: CSSWideKeyword | any;
-
-        /**
-         * Sets the rounding of the top-left corner of the element.
-         */
-        borderTopLeftRadius?: CSSWideKeyword | CSSLength;
-
-        /**
-         * Sets the rounding of the top-right corner of the element.
-         */
-        borderTopRightRadius?: CSSWideKeyword | CSSLength;
-
-        /**
-         * Sets the style of an element's top border. To set all four borders, use the shorthand property, border-style.
-         * Otherwise, you can set the borders individually with border-top-style, border-right-style, border-bottom-style, border-left-style.
-         */
-        borderTopStyle?: CSSWideKeyword | any;
-
-        /**
-         * Sets the width of an element's top border. To set all four borders,
-         * use the border-width shorthand property which sets the values simultaneously for border-top-width,
-         * border-right-width, border-bottom-width, and border-left-width.
-         */
-        borderTopWidth?: CSSWideKeyword | any;
-
-        /**
-         * Sets the width of an element's four borders. This property can have from one to four values.
-         * This is a shorthand property for setting values simultaneously for border-top-width,
-         * border-right-width, border-bottom-width, and border-left-width.
-         */
-        borderWidth?: CSSWideKeyword | any;
-
-        /**
-         * This property specifies how far an absolutely positioned box's bottom margin edge
-         * is offset above the bottom edge of the box's containing block. For relatively positioned boxes,
-         * the offset is with respect to the bottom edges of the box itself
-         * (i.e., the box is given a position in the normal flow, then offset from that position according to these properties).
-         */
-        bottom?: CSSWideKeyword | any;
-
-        /**
-         * Obsolete.
-         */
-        boxAlign?: CSSWideKeyword | any;
-
-        /**
-         * Breaks a box into fragments creating new borders,
-         * padding and repeating backgrounds or lets it stay as a continuous box on a page break,
-         * column break, or, for inline elements, at a line break.
-         */
-        boxDecorationBreak?: CSSWideKeyword | any;
-
-        /**
-         * Deprecated
-         */
-        boxDirection?: CSSWideKeyword | any;
-
-        /**
-         * Do not use. This property has been replaced by the flex-wrap property.
-         * Gets or sets a value that specifies the direction to add successive rows or columns when the value of box-lines is set to multiple.
-         */
-        boxLineProgression?: CSSWideKeyword | any;
-
-        /**
-         * Do not use. This property has been replaced by the flex-wrap property.
-         * Gets or sets a value that specifies whether child elements wrap onto multiple lines or columns based on the space available in the object.
-         */
-        boxLines?: CSSWideKeyword | any;
-
-        /**
-         * Do not use. This property has been replaced by flex-order.
-         * Specifies the ordinal group that a child element of the object belongs to.
-         * This ordinal value identifies the display order (along the axis defined by the box-orient property) for the group.
-         */
-        boxOrdinalGroup?: CSSWideKeyword | any;
-
-        /**
-         * Deprecated.
-         */
-        boxFlex?: CSSWideKeyword | number;
-
-        /**
-         * Deprecated.
-         */
-        boxFlexGroup?: CSSWideKeyword | number;
-
-        /**
-         * Cast a drop shadow from the frame of almost any element.
-         * MDN: https://developer.mozilla.org/en-US/docs/Web/CSS/box-shadow
-         */
-        boxShadow?: CSSWideKeyword | any;
-
-        /**
-         * The CSS break-after property allows you to force a break on multi-column layouts.
-         * More specifically, it allows you to force a break after an element.
-         * It allows you to determine if a break should occur, and what type of break it should be.
-         * The break-after CSS property describes how the page, column or region break behaves after the generated box.
-         * If there is no generated box, the property is ignored.
-         */
-        breakAfter?: CSSWideKeyword | any;
-
-        /**
-         * Control page/column/region breaks that fall above a block of content
-         */
-        breakBefore?: CSSWideKeyword | any;
-
-        /**
-         * Control page/column/region breaks that fall within a block of content
-         */
-        breakInside?: CSSWideKeyword | any;
-
-        /**
-         * The clear CSS property specifies if an element can be positioned next to
-         * or must be positioned below the floating elements that precede it in the markup.
-         */
-        clear?: CSSWideKeyword | any;
-
-        /**
-         * Deprecated; see clip-path.
-         * Lets you specify the dimensions of an absolutely positioned element that should be visible,
-         * and the element is clipped into this shape, and displayed.
-         */
-        clip?: CSSWideKeyword | any;
-
-        /**
-         * Clipping crops an graphic, so that only a portion of the graphic is rendered, or filled.
-         * This clip-rule property, when used with the clip-path property, defines which clip rule, or algorithm,
-         * to use when filling the different parts of a graphics.
-         */
-        clipRule?: CSSWideKeyword | any;
-
-        /**
-         * The color property sets the color of an element's foreground content (usually text),
-         * accepting any standard CSS color from keywords and hex values to RGB(a) and HSL(a).
-         */
-        color?: CSSWideKeyword | any;
-
-        /**
-         * Describes the number of columns of the element.
-         * See CSS 3 column-count property https://www.w3.org/TR/css3-multicol/#cc
-         */
-        columnCount?: CSSWideKeyword | number | "auto";
-
-        /**
-         * Specifies how to fill columns (balanced or sequential).
-         */
-        columnFill?: CSSWideKeyword | any;
-
-        /**
-         * The column-gap property controls the width of the gap between columns in multi-column elements.
-         */
-        columnGap?: CSSWideKeyword | any;
-
-        /**
-         * Sets the width, style, and color of the rule between columns.
-         */
-        columnRule?: CSSWideKeyword | any;
-
-        /**
-         * Specifies the color of the rule between columns.
-         */
-        columnRuleColor?: CSSWideKeyword | any;
-
-        /**
-         * Specifies the width of the rule between columns.
-         */
-        columnRuleWidth?: CSSWideKeyword | any;
-
-        /**
-         * The column-span CSS property makes it possible for an element to span across all columns when its value is set to all.
-         * An element that spans more than one column is called a spanning element.
-         */
-        columnSpan?: CSSWideKeyword | any;
-
-        /**
-         * Specifies the width of columns in multi-column elements.
-         */
-        columnWidth?: CSSWideKeyword | any;
-
-        /**
-         * This property is a shorthand property for setting column-width and/or column-count.
-         */
-        columns?: CSSWideKeyword | any;
-
-        /**
-         * The counter-increment property accepts one or more names of counters (identifiers),
-         * each one optionally followed by an integer which specifies the value by which the counter should be incremented
-         * (e.g. if the value is 2, the counter increases by 2 each time it is invoked).
-         */
-        counterIncrement?: CSSWideKeyword | any;
-
-        /**
-         * The counter-reset property contains a list of one or more names of counters,
-         * each one optionally followed by an integer (otherwise, the integer defaults to 0.).
-         * Each time the given element is invoked, the counters specified by the property are set to the given integer.
-         */
-        counterReset?: CSSWideKeyword | any;
-
-        /**
-         * The cue property specifies sound files (known as an "auditory icon") to be played by speech media agents
-         * before and after presenting an element's content; if only one file is specified, it is played both before and after.
-         * The volume at which the file(s) should be played, relative to the volume of the main element, may also be specified.
-         * The icon files may also be set separately with the cue-before and cue-after properties.
-         */
-        cue?: CSSWideKeyword | any;
-
-        /**
-         * The cue-after property specifies a sound file (known as an "auditory icon") to be played by speech media agents
-         * after presenting an element's content; the volume at which the file should be played may also be specified.
-         * The shorthand property cue sets cue sounds for both before and after the element is presented.
-         */
-        cueAfter?: CSSWideKeyword | any;
-
-        /**
-         * Specifies the mouse cursor displayed when the mouse pointer is over an element.
-         */
-        cursor?: CSSWideKeyword | any;
-
-        /**
-         * The direction CSS property specifies the text direction/writing direction. The rtl is used for Hebrew or Arabic text, the ltr is for other languages.
-         */
-        direction?: CSSWideKeyword | any;
-
-        /**
-         * This property specifies the type of rendering box used for an element. It is a shorthand property for many other display properties.
-         */
-        display?: CSSWideKeyword | any;
-
-        /**
-         * The ‘fill’ property paints the interior of the given graphical element.
-         * The area to be painted consists of any areas inside the outline of the shape.
-         * To determine the inside of the shape, all subpaths are considered,
-         * and the interior is determined according to the rules associated with the current value of the ‘fill-rule’ property.
-         * The zero-width geometric outline of a shape is included in the area to be painted.
-         */
-        fill?: CSSWideKeyword | any;
-
-        /**
-         * SVG: Specifies the opacity of the color or the content the current object is filled with.
-         * See SVG 1.1 https://www.w3.org/TR/SVG/painting.html#FillOpacityProperty
-         */
-        fillOpacity?: CSSWideKeyword | number;
-
-        /**
-         * The ‘fill-rule’ property indicates the algorithm which is to be used to determine what parts of the canvas are included inside the shape.
-         * For a simple, non-intersecting path, it is intuitively clear what region lies "inside";
-         * however, for a more complex path, such as a path that intersects itself or where one subpath encloses another,
-         * the interpretation of "inside" is not so obvious.
-         * The ‘fill-rule’ property provides two options for how the inside of a shape is determined:
-         */
-        fillRule?: CSSWideKeyword | any;
-
-        /**
-         * Applies various image processing effects. This property is largely unsupported. See Compatibility section for more information.
-         */
-        filter?: CSSWideKeyword | any;
-
-        /**
-         * Shorthand for `flex-grow`, `flex-shrink`, and `flex-basis`.
-         */
-        flex?: CSSWideKeyword | number | string;
-
-        /**
-         * Obsolete, do not use. This property has been renamed to align-items.
-         * Specifies the alignment (perpendicular to the layout axis defined by the flex-direction property) of child elements of the object.
-         */
-        flexAlign?: CSSWideKeyword | any;
-
-        /**
-         * The flex-basis CSS property describes the initial main size of the flex item
-         * before any free space is distributed according to the flex factors described in the flex property (flex-grow and flex-shrink).
-         */
-        flexBasis?: CSSWideKeyword | any;
-
-        /**
-         * The flex-direction CSS property describes how flex items are placed in the flex container, by setting the direction of the flex container's main axis.
-         */
-        flexDirection?: CSSWideKeyword | "row" | "row-reverse" | "column" | "column-reverse";
-
-        /**
-         * The flex-flow CSS property defines the flex container's main and cross axis. It is a shorthand property for the flex-direction and flex-wrap properties.
-         */
-        flexFlow?: CSSWideKeyword | string;
-
-        /**
-         * Specifies the flex grow factor of a flex item.
-         * See CSS flex-grow property https://drafts.csswg.org/css-flexbox-1/#flex-grow-property
-         */
-        flexGrow?: CSSWideKeyword | number;
-
-        /**
-         * Do not use. This property has been renamed to align-self
-         * Specifies the alignment (perpendicular to the layout axis defined by flex-direction) of child elements of the object.
-         */
-        flexItemAlign?: CSSWideKeyword | any;
-
-        /**
-         * Do not use. This property has been renamed to align-content.
-         * Specifies how a flexbox's lines align within the flexbox when there is extra space along the axis that is perpendicular to the axis defined by the flex-direction property.
-         */
-        flexLinePack?: CSSWideKeyword | any;
-
-        /**
-         * Gets or sets a value that specifies the ordinal group that a flexbox element belongs to. This ordinal value identifies the display order for the group.
-         */
-        flexOrder?: CSSWideKeyword | any;
-
-        /**
-         * Specifies the flex shrink factor of a flex item.
-         * See CSS flex-shrink property https://drafts.csswg.org/css-flexbox-1/#flex-shrink-property
-         */
-        flexShrink?: CSSWideKeyword | number;
-
-        /**
-         * Specifies whether flex items are forced into a single line or can be wrapped onto multiple lines.
-         * If wrapping is allowed, this property also enables you to control the direction in which lines are stacked.
-         * See CSS flex-wrap property https://drafts.csswg.org/css-flexbox-1/#flex-wrap-property
-         */
-        flexWrap?: CSSWideKeyword | "nowrap" | "wrap" | "wrap-reverse";
-
-        /**
-         * Elements which have the style float are floated horizontally.
-         * These elements can move as far to the left or right of the containing element.
-         * All elements after the floating element will flow around it, but elements before the floating element are not impacted.
-         * If several floating elements are placed after each other, they will float next to each other as long as there is room.
-         */
-        float?: CSSWideKeyword | any;
-
-        /**
-         * Flows content from a named flow (specified by a corresponding flow-into) through selected elements to form a dynamic chain of layout regions.
-         */
-        flowFrom?: CSSWideKeyword | any;
-
-        /**
-         * The font property is shorthand that allows you to do one of two things: you can either set up six of the most mature font properties in one line,
-         * or you can set one of a choice of keywords to adopt a system font setting.
-         */
-        font?: CSSWideKeyword | any;
-
-        /**
-         * The font-family property allows one or more font family names and/or generic family names to be specified for usage on the selected element(s)' text.
-         * The browser then goes through the list; for each character in the selection it applies the first font family that has an available glyph for that character.
-         */
-        fontFamily?: CSSWideKeyword | any;
-
-        /**
-         * The font-kerning property allows contextual adjustment of inter-glyph spacing, i.e. the spaces between the characters in text.
-         * This property controls <bold>metric kerning</bold> - that utilizes adjustment data contained in the font. Optical Kerning is not supported as yet.
-         */
-        fontKerning?: CSSWideKeyword | any;
-
-        /**
-         * Specifies the size of the font. Used to compute em and ex units.
-         * See CSS 3 font-size property https://www.w3.org/TR/css-fonts-3/#propdef-font-size
-         */
-        fontSize?: CSSWideKeyword |
-        "xx-small" | "x-small" | "small" | "medium" | "large" | "x-large" | "xx-large" |
-        "larger" | "smaller" |
-        CSSLength | CSSPercentage;
-
-        /**
-         * The font-size-adjust property adjusts the font-size of the fallback fonts defined with font-family,
-         * so that the x-height is the same no matter what font is used.
-         * This preserves the readability of the text when fallback happens.
-         * See CSS 3 font-size-adjust property https://www.w3.org/TR/css-fonts-3/#propdef-font-size-adjust
-         */
-        fontSizeAdjust?: CSSWideKeyword | "none" | number;
-
-        /**
-         * Allows you to expand or condense the widths for a normal, condensed, or expanded font face.
-         * See CSS 3 font-stretch property https://drafts.csswg.org/css-fonts-3/#propdef-font-stretch
-         */
-        fontStretch?: CSSWideKeyword |
-        "normal" | "ultra-condensed" | "extra-condensed" | "condensed" | "semi-condensed" |
-        "semi-expanded" | "expanded" | "extra-expanded" | "ultra-expanded";
-
-        /**
-         * The font-style property allows normal, italic, or oblique faces to be selected.
-         * Italic forms are generally cursive in nature while oblique faces are typically sloped versions of the regular face.
-         * Oblique faces can be simulated by artificially sloping the glyphs of the regular face.
-         * See CSS 3 font-style property https://www.w3.org/TR/css-fonts-3/#propdef-font-style
-         */
-        fontStyle?: CSSWideKeyword | "normal" | "italic" | "oblique";
-
-        /**
-         * This value specifies whether the user agent is allowed to synthesize bold or oblique font faces when a font family lacks bold or italic faces.
-         */
-        fontSynthesis?: CSSWideKeyword | any;
-
-        /**
-         * The font-variant property enables you to select the small-caps font within a font family.
-         */
-        fontVariant?: CSSWideKeyword | any;
-
-        /**
-         * Fonts can provide alternate glyphs in addition to default glyph for a character. This property provides control over the selection of these alternate glyphs.
-         */
-        fontVariantAlternates?: CSSWideKeyword | any;
-
-        /**
-         * Specifies the weight or boldness of the font.
-         * See CSS 3 'font-weight' property https://www.w3.org/TR/css-fonts-3/#propdef-font-weight
-         */
-        fontWeight?: CSSWideKeyword | "normal" | "bold" | "bolder" | "lighter" | 100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900;
-
-        /**
-         * Lays out one or more grid items bound by 4 grid lines. Shorthand for setting grid-column-start, grid-column-end, grid-row-start, and grid-row-end in a single declaration.
-         */
-        gridArea?: CSSWideKeyword | any;
-
-        /**
-         * Controls a grid item's placement in a grid area, particularly grid position and a grid span. Shorthand for setting grid-column-start and grid-column-end in a single declaration.
-         */
-        gridColumn?: CSSWideKeyword | any;
-
-        /**
-         * Controls a grid item's placement in a grid area as well as grid position and a grid span.
-         * The grid-column-end property (with grid-row-start, grid-row-end, and grid-column-start) determines a grid item's placement by specifying the grid lines of a grid item's grid area.
-         */
-        gridColumnEnd?: CSSWideKeyword | any;
-
-        /**
-         * Determines a grid item's placement by specifying the starting grid lines of a grid item's grid area.
-         * A grid item's placement in a grid area consists of a grid position and a grid span.
-         * See also ( grid-row-start, grid-row-end, and grid-column-end)
-         */
-        gridColumnStart?: CSSWideKeyword | any;
-
-        /**
-         * Gets or sets a value that indicates which row an element within a Grid should appear in. Shorthand for setting grid-row-start and grid-row-end in a single declaration.
-         */
-        gridRow?: CSSWideKeyword | any;
-
-        /**
-         * Determines a grid item’s placement by specifying the block-end. A grid item's placement in a grid area consists of a grid position and a grid span.
-         * The grid-row-end property (with grid-row-start, grid-column-start, and grid-column-end) determines a grid item's placement by specifying the grid lines of a grid item's grid area.
-         */
-        gridRowEnd?: CSSWideKeyword | any;
-
-        /**
-         * Specifies a row position based upon an integer location, string value, or desired row size.
-         * css/properties/grid-row is used as short-hand for grid-row-position and grid-row-position
-         */
-        gridRowPosition?: CSSWideKeyword | any;
-
-        gridRowSpan?: CSSWideKeyword | any;
-
-        /**
-         * Specifies named grid areas which are not associated with any particular grid item, but can be referenced from the grid-placement properties.
-         * The syntax of the grid-template-areas property also provides a visualization of the structure of the grid, making the overall layout of the grid container easier to understand.
-         */
-        gridTemplateAreas?: CSSWideKeyword | any;
-
-        /**
-         * Specifies (with grid-template-rows) the line names and track sizing functions of the grid.
-         * Each sizing function can be specified as a length, a percentage of the grid container’s size,
-         * a measurement of the contents occupying the column or row, or a fraction of the free space in the grid.
-         */
-        gridTemplateColumns?: CSSWideKeyword | any;
-
-        /**
-         * Specifies (with grid-template-columns) the line names and track sizing functions of the grid.
-         * Each sizing function can be specified as a length, a percentage of the grid container’s size,
-         * a measurement of the contents occupying the column or row, or a fraction of the free space in the grid.
-         */
-        gridTemplateRows?: CSSWideKeyword | any;
-
-        /**
-         * Sets the height of an element. The content area of the element height does not include the padding, border, and margin of the element.
-         */
-        height?: CSSWideKeyword | any;
-
-        /**
-         * Specifies the minimum number of characters in a hyphenated word
-         */
-        hyphenateLimitChars?: CSSWideKeyword | any;
-
-        /**
-         * Indicates the maximum number of successive hyphenated lines in an element. The ‘no-limit’ value means that there is no limit.
-         */
-        hyphenateLimitLines?: CSSWideKeyword | any;
-
-        /**
-         * Specifies the maximum amount of trailing whitespace (before justification) that may be left in a line before hyphenation is triggered
-         * to pull part of a word from the next line back up into the current one.
-         */
-        hyphenateLimitZone?: CSSWideKeyword | any;
-
-        /**
-         * Specifies whether or not words in a sentence can be split by the use of a manual or automatic hyphenation mechanism.
-         */
-        hyphens?: CSSWideKeyword | any;
-
-        imeMode?: CSSWideKeyword | any;
-
-        /**
-         * Defines how the browser distributes space between and around flex items
-         * along the main-axis of their container.
-         * See CSS justify-content property https://www.w3.org/TR/css-flexbox-1/#justify-content-property
-         */
-        justifyContent?: CSSWideKeyword | "flex-start" | "flex-end" | "center" | "space-between" | "space-around" | "space-evenly" | "stretch";
-
-        layoutGrid?: CSSWideKeyword | any;
-
-        layoutGridChar?: CSSWideKeyword | any;
-
-        layoutGridLine?: CSSWideKeyword | any;
-
-        layoutGridMode?: CSSWideKeyword | any;
-
-        layoutGridType?: CSSWideKeyword | any;
-
-        /**
-         * Sets the left edge of an element
-         */
-        left?: CSSWideKeyword | any;
-
-        /**
-         * The letter-spacing CSS property specifies the spacing behavior between text characters.
-         */
-        letterSpacing?: CSSWideKeyword | any;
-
-        /**
-         * Deprecated. Gets or sets line-breaking rules for text in selected languages such as Japanese, Chinese, and Korean.
-         */
-        lineBreak?: CSSWideKeyword | any;
-
-        lineClamp?: CSSWideKeyword | number;
-
-        /**
-         * Specifies the height of an inline block level element.
-         * See CSS 2.1 line-height property https://www.w3.org/TR/CSS21/visudet.html#propdef-line-height
-         */
-        lineHeight?: CSSWideKeyword | "normal" | number | CSSLength | CSSPercentage;
-
-        /**
-         * Shorthand property that sets the list-style-type, list-style-position and list-style-image properties in one declaration.
-         */
-        listStyle?: CSSWideKeyword | any;
-
-        /**
-         * This property sets the image that will be used as the list item marker. When the image is available,
-         * it will replace the marker set with the 'list-style-type' marker. That also means that if the image is not available,
-         * it will show the style specified by list-style-property
-         */
-        listStyleImage?: CSSWideKeyword | any;
-
-        /**
-         * Specifies if the list-item markers should appear inside or outside the content flow.
-         */
-        listStylePosition?: CSSWideKeyword | any;
-
-        /**
-         * Specifies the type of list-item marker in a list.
-         */
-        listStyleType?: CSSWideKeyword | any;
-
-        /**
-         * The margin property is shorthand to allow you to set all four margins of an element at once.
-         * Its equivalent longhand properties are margin-top, margin-right, margin-bottom and margin-left.
-         * Negative values are also allowed.
-         */
-        margin?: CSSWideKeyword | any;
-
-        /**
-         * margin-bottom sets the bottom margin of an element.
-         */
-        marginBottom?: CSSWideKeyword | any;
-
-        /**
-         * margin-left sets the left margin of an element.
-         */
-        marginLeft?: CSSWideKeyword | any;
-
-        /**
-         * margin-right sets the right margin of an element.
-         */
-        marginRight?: CSSWideKeyword | any;
-
-        /**
-         * margin-top sets the top margin of an element.
-         */
-        marginTop?: CSSWideKeyword | any;
-
-        /**
-         * The marquee-direction determines the initial direction in which the marquee content moves.
-         */
-        marqueeDirection?: CSSWideKeyword | any;
-
-        /**
-         * The 'marquee-style' property determines a marquee's scrolling behavior.
-         */
-        marqueeStyle?: CSSWideKeyword | any;
-
-        /**
-         * This property is shorthand for setting mask-image, mask-mode, mask-repeat, mask-position, mask-clip, mask-origin, mask-composite and mask-size.
-         * Omitted values are set to their original properties' initial values.
-         */
-        mask?: CSSWideKeyword | any;
-
-        /**
-         * This property is shorthand for setting mask-border-source, mask-border-slice, mask-border-width, mask-border-outset, and mask-border-repeat.
-         * Omitted values are set to their original properties' initial values.
-         */
-        maskBorder?: CSSWideKeyword | any;
-
-        /**
-         * This property specifies how the images for the sides and the middle part of the mask image are scaled and tiled.
-         * The first keyword applies to the horizontal sides, the second one applies to the vertical ones.
-         * If the second keyword is absent, it is assumed to be the same as the first, similar to the CSS border-image-repeat property.
-         */
-        maskBorderRepeat?: CSSWideKeyword | any;
-
-        /**
-         * This property specifies inward offsets from the top, right, bottom, and left edges of the mask image,
-         * dividing it into nine regions: four corners, four edges, and a middle.
-         * The middle image part is discarded and treated as fully transparent black unless the fill keyword is present.
-         * The four values set the top, right, bottom and left offsets in that order, similar to the CSS border-image-slice property.
-         */
-        maskBorderSlice?: CSSWideKeyword | any;
-
-        /**
-         * Specifies an image to be used as a mask. An image that is empty, fails to download, is non-existent, or cannot be displayed is ignored and does not mask the element.
-         */
-        maskBorderSource?: CSSWideKeyword | any;
-
-        /**
-         * This property sets the width of the mask box image, similar to the CSS border-image-width property.
-         */
-        maskBorderWidth?: CSSWideKeyword | any;
-
-        /**
-         * Determines the mask painting area, which defines the area that is affected by the mask.
-         * The painted content of an element may be restricted to this area.
-         */
-        maskClip?: CSSWideKeyword | any;
-
-        /**
-         * For elements rendered as a single box, specifies the mask positioning area.
-         * For elements rendered as multiple boxes (e.g., inline boxes on several lines, boxes on several pages)
-         * specifies which boxes box-decoration-break operates on to determine the mask positioning area(s).
-         */
-        maskOrigin?: CSSWideKeyword | any;
-
-        /**
-         * This property must not be used. It is no longer included in any standard or standard track specification,
-         * nor is it implemented in any browser. It is only used when the text-align-last property is set to size.
-         * It controls allowed adjustments of font-size to fit line content.
-         */
-        maxFontSize?: CSSWideKeyword | any;
-
-        /**
-         * Sets the maximum height for an element. It prevents the height of the element to exceed the specified value.
-         * If min-height is specified and is greater than max-height, max-height is overridden.
-         */
-        maxHeight?: CSSWideKeyword | any;
-
-        /**
-         * Sets the maximum width for an element. It limits the width property to be larger than the value specified in max-width.
-         */
-        maxWidth?: CSSWideKeyword | any;
-
-        /**
-         * Sets the minimum height for an element. It prevents the height of the element to be smaller than the specified value.
-         * The value of min-height overrides both max-height and height.
-         */
-        minHeight?: CSSWideKeyword | any;
-
-        /**
-         * Sets the minimum width of an element. It limits the width property to be not smaller than the value specified in min-width.
-         */
-        minWidth?: CSSWideKeyword | any;
-
-        /**
-         * Specifies the transparency of an element.
-         * See CSS 3 opacity property https://drafts.csswg.org/css-color-3/#opacity
-         */
-        opacity?: CSSWideKeyword | number;
-
-        /**
-         * Specifies the order used to lay out flex items in their flex container.
-         * Elements are laid out in the ascending order of the order value.
-         * See CSS order property https://drafts.csswg.org/css-flexbox-1/#order-property
-         */
-        order?: CSSWideKeyword | number;
-
-        /**
-         * In paged media, this property defines the minimum number of lines in
-         * a block container that must be left at the bottom of the page.
-         * See CSS 3 orphans, widows properties https://drafts.csswg.org/css-break-3/#widows-orphans
-         */
-        orphans?: CSSWideKeyword | number;
-
-        /**
-         * The CSS outline property is a shorthand property for setting one or more of the individual outline properties outline-style,
-         * outline-width and outline-color in a single rule. In most cases the use of this shortcut is preferable and more convenient.
-         * Outlines differ from borders in the following ways:
-         *      •       Outlines do not take up space, they are drawn above the content.
-         *      •       Outlines may be non-rectangular. They are rectangular in Gecko/Firefox.
-         *              Internet Explorer attempts to place the smallest contiguous outline around all elements or shapes that are indicated to have an outline.
-         *              Opera draws a non-rectangular shape around a construct.
-         */
-        outline?: CSSWideKeyword | any;
-
-        /**
-         * The outline-color property sets the color of the outline of an element. An outline is a line that is drawn around elements, outside the border edge, to make the element stand out.
-         */
-        outlineColor?: CSSWideKeyword | any;
-
-        /**
-         * The outline-offset property offsets the outline and draw it beyond the border edge.
-         */
-        outlineOffset?: CSSWideKeyword | any;
-
-        /**
-         * The overflow property controls how extra content exceeding the bounding box of an element is rendered.
-         * It can be used in conjunction with an element that has a fixed width and height, to eliminate text-induced page distortion.
-         */
-        overflow?: CSSWideKeyword | "auto" | "hidden" | "scroll" | "visible";
-
-        /**
-         * Specifies the preferred scrolling methods for elements that overflow.
-         */
-        overflowStyle?: CSSWideKeyword | any;
-
-        /**
-         * Controls how extra content exceeding the x-axis of the bounding box of an element is rendered.
-         */
-        overflowX?: CSSWideKeyword | "auto" | "hidden" | "scroll" | "visible";
-
-        /**
-         * Controls how extra content exceeding the y-axis of the bounding box of an element is rendered.
-         */
-        overflowY?: CSSWideKeyword | "auto" | "hidden" | "scroll" | "visible";
-
-        /**
-         * The padding optional CSS property sets the required padding space on one to four sides of an element.
-         * The padding area is the space between an element and its border. Negative values are not allowed but decimal values are permitted.
-         * The element size is treated as fixed, and the content of the element shifts toward the center as padding is increased.
-         * The padding property is a shorthand to avoid setting each side separately (padding-top, padding-right, padding-bottom, padding-left).
-         */
-        padding?: CSSWideKeyword | any;
-
-        /**
-         * The padding-bottom CSS property of an element sets the padding space required on the bottom of an element.
-         * The padding area is the space between the content of the element and its border.
-         * Contrary to margin-bottom values, negative values of padding-bottom are invalid.
-         */
-        paddingBottom?: CSSWideKeyword | any;
-
-        /**
-         * The padding-left CSS property of an element sets the padding space required on the left side of an element.
-         * The padding area is the space between the content of the element and its border.
-         * Contrary to margin-left values, negative values of padding-left are invalid.
-         */
-        paddingLeft?: CSSWideKeyword | any;
-
-        /**
-         * The padding-right CSS property of an element sets the padding space required on the right side of an element.
-         * The padding area is the space between the content of the element and its border.
-         * Contrary to margin-right values, negative values of padding-right are invalid.
-         */
-        paddingRight?: CSSWideKeyword | any;
-
-        /**
-         * The padding-top CSS property of an element sets the padding space required on the top of an element.
-         * The padding area is the space between the content of the element and its border.
-         * Contrary to margin-top values, negative values of padding-top are invalid.
-         */
-        paddingTop?: CSSWideKeyword | any;
-
-        /**
-         * The page-break-after property is supported in all major browsers. With CSS3, page-break-* properties are only aliases of the break-* properties.
-         * The CSS3 Fragmentation spec defines breaks for all CSS box fragmentation.
-         */
-        pageBreakAfter?: CSSWideKeyword | any;
-
-        /**
-         * The page-break-before property sets the page-breaking behavior before an element.
-         * With CSS3, page-break-* properties are only aliases of the break-* properties.
-         * The CSS3 Fragmentation spec defines breaks for all CSS box fragmentation.
-         */
-        pageBreakBefore?: CSSWideKeyword | any;
-
-        /**
-         * Sets the page-breaking behavior inside an element. With CSS3, page-break-* properties are only aliases of the break-* properties.
-         * The CSS3 Fragmentation spec defines breaks for all CSS box fragmentation.
-         */
-        pageBreakInside?: CSSWideKeyword | any;
-
-        /**
-         * The pause property determines how long a speech media agent should pause before and after presenting an element.
-         * It is a shorthand for the pause-before and pause-after properties.
-         */
-        pause?: CSSWideKeyword | any;
-
-        /**
-         * The pause-after property determines how long a speech media agent should pause after presenting an element.
-         * It may be replaced by the shorthand property pause, which sets pause time before and after.
-         */
-        pauseAfter?: CSSWideKeyword | any;
-
-        /**
-         * The pause-before property determines how long a speech media agent should pause before presenting an element.
-         * It may be replaced by the shorthand property pause, which sets pause time before and after.
-         */
-        pauseBefore?: CSSWideKeyword | any;
-
-        /**
-         * The perspective property defines how far an element is placed from the view on the z-axis, from the screen to the viewer.
-         * Perspective defines how an object is viewed. In graphic arts, perspective is the representation on a flat surface of what the viewer's eye would see in a 3D space.
-         * (See Wikipedia for more information about graphical perspective and for related illustrations.)
-         * The illusion of perspective on a flat surface, such as a computer screen,
-         * is created by projecting points on the flat surface as they would appear if the flat surface were a window
-         * through which the viewer was looking at the object. In discussion of virtual environments, this flat surface is called a projection plane.
-         */
-        perspective?: CSSWideKeyword | any;
-
-        /**
-         * The perspective-origin property establishes the origin for the perspective property.
-         * It effectively sets the X and Y position at which the viewer appears to be looking at the children of the element.
-         * When used with perspective, perspective-origin changes the appearance of an object,
-         * as if a viewer were looking at it from a different origin.
-         * An object appears differently if a viewer is looking directly at it versus looking at it from below, above, or from the side.
-         * Thus, the perspective-origin is like a vanishing point.
-         * The default value of perspective-origin is 50% 50%.
-         * This displays an object as if the viewer's eye were positioned directly at the center of the screen, both top-to-bottom and left-to-right.
-         * A value of 0% 0% changes the object as if the viewer was looking toward the top left angle.
-         * A value of 100% 100% changes the appearance as if viewed toward the bottom right angle.
-         */
-        perspectiveOrigin?: CSSWideKeyword | any;
-
-        /**
-         * The pointer-events property allows you to control whether an element can be the target for the pointing device (e.g, mouse, pen) events.
-         */
-        pointerEvents?: CSSWideKeyword | any;
-
-        /**
-         * The position property controls the type of positioning used by an element within its parent elements.
-         * The effect of the position property depends on a lot of factors, for example the position property of parent elements.
-         */
-        position?: CSSWideKeyword | "static" | "relative" | "absolute" | "fixed" | "sticky";
-
-        /**
-         * Obsolete: unsupported.
-         * This property determines whether or not a full-width punctuation mark character should be trimmed if it appears at the beginning of a line,
-         * so that its "ink" lines up with the first glyph in the line above and below.
-         */
-        punctuationTrim?: CSSWideKeyword | any;
-
-        /**
-         * Sets the type of quotation marks for embedded quotations.
-         */
-        quotes?: CSSWideKeyword | any;
-
-        /**
-         * Controls whether the last region in a chain displays additional 'overset' content according its default overflow property,
-         * or if it displays a fragment of content as if it were flowing into a subsequent region.
-         */
-        regionFragment?: CSSWideKeyword | any;
-
-        /**
-         * The rest-after property determines how long a speech media agent should pause after presenting an element's main content,
-         * before presenting that element's exit cue sound. It may be replaced by the shorthand property rest, which sets rest time before and after.
-         */
-        restAfter?: CSSWideKeyword | any;
-
-        /**
-         * The rest-before property determines how long a speech media agent should pause after presenting an intro cue sound for an element,
-         * before presenting that element's main content. It may be replaced by the shorthand property rest, which sets rest time before and after.
-         */
-        restBefore?: CSSWideKeyword | any;
-
-        /**
-         * Specifies the position an element in relation to the right side of the containing element.
-         */
-        right?: CSSWideKeyword | any;
-
-        rubyAlign?: CSSWideKeyword | any;
-
-        rubyPosition?: CSSWideKeyword | any;
-
-        /**
-         * Defines the alpha channel threshold used to extract a shape from an image. Can be thought of as a "minimum opacity" threshold;
-         * that is, a value of 0.5 means that the shape will enclose all the pixels that are more than 50% opaque.
-         */
-        shapeImageThreshold?: CSSWideKeyword | any;
-
-        /**
-         * A future level of CSS Shapes will define a shape-inside property, which will define a shape to wrap content within the element.
-         * See Editor's Draft <http://dev.w3.org/csswg/css-shapes/> and CSSWG wiki page on next-level plans <http://wiki.csswg.org/spec/css-shapes>
-         */
-        shapeInside?: CSSWideKeyword | any;
-
-        /**
-         * Adds a margin to a shape-outside. In effect, defines a new shape that is the smallest contour around all the points
-         * that are the shape-margin distance outward perpendicular to each point on the underlying shape.
-         * For points where a perpendicular direction is not defined (e.g., a triangle corner),
-         * takes all points on a circle centered at the point and with a radius of the shape-margin distance.
-         * This property accepts only non-negative values.
-         */
-        shapeMargin?: CSSWideKeyword | any;
-
-        /**
-         * Declares a shape around which text should be wrapped, with possible modifications from the shape-margin property.
-         * The shape defined by shape-outside and shape-margin changes the geometry of a float element's float area.
-         */
-        shapeOutside?: CSSWideKeyword | any;
-
-        /**
-         * The speak property determines whether or not a speech synthesizer will read aloud the contents of an element.
-         */
-        speak?: CSSWideKeyword | any;
-
-        /**
-         * The speak-as property determines how the speech synthesizer interprets the content: words as whole words or as a sequence of letters,
-         * numbers as a numerical value or a sequence of digits, punctuation as pauses in speech or named punctuation characters.
-         */
-        speakAs?: CSSWideKeyword | any;
-
-        /**
-         * SVG: Specifies the opacity of the outline on the current object.
-         * See SVG 1.1 https://www.w3.org/TR/SVG/painting.html#StrokeOpacityProperty
-         */
-        strokeOpacity?: CSSWideKeyword | number;
-
-        /**
-         * SVG: Specifies the width of the outline on the current object.
-         * See SVG 1.1 https://www.w3.org/TR/SVG/painting.html#StrokeWidthProperty
-         */
-        strokeWidth?: CSSWideKeyword | CSSPercentage | CSSLength;
-
-        /**
-         * The tab-size CSS property is used to customise the width of a tab (U+0009) character.
-         */
-        tabSize?: CSSWideKeyword | any;
-
-        /**
-         * The 'table-layout' property controls the algorithm used to lay out the table cells, rows, and columns.
-         */
-        tableLayout?: CSSWideKeyword | any;
-
-        /**
-         * The text-align CSS property describes how inline content like text is aligned in its parent block element.
-         * text-align does not control the alignment of block elements itself, only their inline content.
-         */
-        textAlign?: CSSWideKeyword | any;
-
-        /**
-         * The text-align-last CSS property describes how the last line of a block element or a line before line break is aligned in its parent block element.
-         */
-        textAlignLast?: CSSWideKeyword | any;
-
-        /**
-         * The text-decoration CSS property is used to set the text formatting to underline, overline, line-through or blink.
-         * underline and overline decorations are positioned under the text, line-through over it.
-         */
-        textDecoration?: CSSWideKeyword | any;
-
-        /**
-         * Sets the color of any text decoration, such as underlines, overlines, and strike throughs.
-         */
-        textDecorationColor?: CSSWideKeyword | any;
-
-        /**
-         * Sets what kind of line decorations are added to an element, such as underlines, overlines, etc.
-         */
-        textDecorationLine?: CSSWideKeyword | any;
-
-        textDecorationLineThrough?: CSSWideKeyword | any;
-
-        textDecorationNone?: CSSWideKeyword | any;
-
-        textDecorationOverline?: CSSWideKeyword | any;
-
-        /**
-         * Specifies what parts of an element’s content are skipped over when applying any text decoration.
-         */
-        textDecorationSkip?: CSSWideKeyword | any;
-
-        /**
-         * This property specifies the style of the text decoration line drawn on the specified element.
-         * The intended meaning for the values are the same as those of the border-style-properties.
-         */
-        textDecorationStyle?: CSSWideKeyword | any;
-
-        textDecorationUnderline?: CSSWideKeyword | any;
-
-        /**
-         * The text-emphasis property will apply special emphasis marks to the elements text.
-         * Slightly similar to the text-decoration property only that this property can have affect on the line-height.
-         * It also is noted that this is shorthand for text-emphasis-style and for text-emphasis-color.
-         */
-        textEmphasis?: CSSWideKeyword | any;
-
-        /**
-         * The text-emphasis-color property specifies the foreground color of the emphasis marks.
-         */
-        textEmphasisColor?: CSSWideKeyword | any;
-
-        /**
-         * The text-emphasis-style property applies special emphasis marks to an element's text.
-         */
-        textEmphasisStyle?: CSSWideKeyword | any;
-
-        /**
-         * This property helps determine an inline box's block-progression dimension,
-         * derived from the text-height and font-size properties for non-replaced elements,
-         * the height or the width for replaced elements, and the stacked block-progression dimension for inline-block elements.
-         * The block-progression dimension determines the position of the padding, border and margin for the element.
-         */
-        textHeight?: CSSWideKeyword | any;
-
-        /**
-         * Specifies the amount of space horizontally that should be left on the first line of the text of an element.
-         * This horizontal spacing is at the beginning of the first line and is in respect to the left edge of the containing block box.
-         */
-        textIndent?: CSSWideKeyword | any;
-
-        textJustifyTrim?: CSSWideKeyword | any;
-
-        textKashidaSpace?: CSSWideKeyword | any;
-
-        /**
-         * The text-line-through property is a shorthand property for text-line-through-style, text-line-through-color and text-line-through-mode.
-         * (Considered obsolete; use text-decoration instead.)
-         */
-        textLineThrough?: CSSWideKeyword | any;
-
-        /**
-         * Specifies the line colors for the line-through text decoration.
-         * (Considered obsolete; use text-decoration-color instead.)
-         */
-        textLineThroughColor?: CSSWideKeyword | any;
-
-        /**
-         * Sets the mode for the line-through text decoration, determining whether the text decoration affects the space characters or not.
-         * (Considered obsolete; use text-decoration-skip instead.)
-         */
-        textLineThroughMode?: CSSWideKeyword | any;
-
-        /**
-         * Specifies the line style for line-through text decoration.
-         * (Considered obsolete; use text-decoration-style instead.)
-         */
-        textLineThroughStyle?: CSSWideKeyword | any;
-
-        /**
-         * Specifies the line width for the line-through text decoration.
-         */
-        textLineThroughWidth?: CSSWideKeyword | any;
-
-        /**
-         * The text-overflow shorthand CSS property determines how overflowed content that is not displayed is signaled to the users.
-         * It can be clipped, display an ellipsis ('…', U+2026 HORIZONTAL ELLIPSIS) or a Web author-defined string.
-         * It covers the two long-hand properties text-overflow-mode and text-overflow-ellipsis
-         */
-        textOverflow?: CSSWideKeyword | any;
-
-        /**
-         * The text-overline property is the shorthand for the text-overline-style, text-overline-width, text-overline-color, and text-overline-mode properties.
-         */
-        textOverline?: CSSWideKeyword | any;
-
-        /**
-         * Specifies the line color for the overline text decoration.
-         */
-        textOverlineColor?: CSSWideKeyword | any;
-
-        /**
-         * Sets the mode for the overline text decoration, determining whether the text decoration affects the space characters or not.
-         */
-        textOverlineMode?: CSSWideKeyword | any;
-
-        /**
-         * Specifies the line style for overline text decoration.
-         */
-        textOverlineStyle?: CSSWideKeyword | any;
-
-        /**
-         * Specifies the line width for the overline text decoration.
-         */
-        textOverlineWidth?: CSSWideKeyword | any;
-
-        /**
-         * The text-rendering CSS property provides information to the browser about how to optimize when rendering text.
-         * Options are: legibility, speed or geometric precision.
-         */
-        textRendering?: CSSWideKeyword | any;
-
-        /**
-         * Obsolete: unsupported.
-         */
-        textScript?: CSSWideKeyword | any;
-
-        /**
-         * The CSS text-shadow property applies one or more drop shadows to the text and <text-decorations> of an element.
-         * Each shadow is specified as an offset from the text, along with optional color and blur radius values.
-         */
-        textShadow?: CSSWideKeyword | any;
-
-        /**
-         * This property transforms text for styling purposes. (It has no effect on the underlying content.)
-         */
-        textTransform?: CSSWideKeyword | any;
-
-        /**
-         * Unsupported.
-         * This property will add a underline position value to the element that has an underline defined.
-         */
-        textUnderlinePosition?: CSSWideKeyword | any;
-
-        /**
-         * After review this should be replaced by text-decoration should it not?
-         * This property will set the underline style for text with a line value for underline, overline, and line-through.
-         */
-        textUnderlineStyle?: CSSWideKeyword | any;
-
-        /**
-         * This property specifies how far an absolutely positioned box's top margin edge is offset below the top edge of the box's containing block.
-         * For relatively positioned boxes, the offset is with respect to the top edges of the box itself (i.e., the box is given a position in the normal flow,
-         * then offset from that position according to these properties).
-         */
-        top?: CSSWideKeyword | any;
-
-        /**
-         * Determines whether touch input may trigger default behavior supplied by the user agent, such as panning or zooming.
-         */
-        touchAction?: CSSWideKeyword | any;
-
-        /**
-         * CSS transforms allow elements styled with CSS to be transformed in two-dimensional or three-dimensional space.
-         * Using this property, elements can be translated, rotated, scaled, and skewed. The value list may consist of 2D and/or 3D transform values.
-         */
-        transform?: CSSWideKeyword | any;
-
-        /**
-         * This property defines the origin of the transformation axes relative to the element to which the transformation is applied.
-         */
-        transformOrigin?: CSSWideKeyword | any;
-
-        /**
-         * This property allows you to define the relative position of the origin of the transformation grid along the z-axis.
-         */
-        transformOriginZ?: CSSWideKeyword | any;
-
-        /**
-         * This property specifies how nested elements are rendered in 3D space relative to their parent.
-         */
-        transformStyle?: CSSWideKeyword | any;
-
-        /**
-         * The transition CSS property is a shorthand property for transition-property, transition-duration, transition-timing-function,
-         * and transition-delay. It allows to define the transition between two states of an element.
-         */
-        transition?: CSSWideKeyword | any;
-
-        /**
-         * Defines when the transition will start. A value of ‘0s’ means the transition will execute as soon as the property is changed.
-         * Otherwise, the value specifies an offset from the moment the property is changed, and the transition will delay execution by that offset.
-         */
-        transitionDelay?: CSSWideKeyword | any;
-
-        /**
-         * The 'transition-duration' property specifies the length of time a transition animation takes to complete.
-         */
-        transitionDuration?: CSSWideKeyword | any;
-
-        /**
-         * The 'transition-property' property specifies the name of the CSS property to which the transition is applied.
-         */
-        transitionProperty?: CSSWideKeyword | any;
-
-        /**
-         * Sets the pace of action within a transition
-         */
-        transitionTimingFunction?: CSSWideKeyword | any;
-
-        /**
-         * The unicode-bidi CSS property specifies the level of embedding with respect to the bidirectional algorithm.
-         */
-        unicodeBidi?: CSSWideKeyword | any;
-
-        /**
-         * unicode-range allows you to set a specific range of characters to be downloaded from a font (embedded using @font-face) and made available for use on the current page.
-         */
-        unicodeRange?: CSSWideKeyword | any;
-
-        /**
-         * This is for all the high level UX stuff.
-         */
-        userFocus?: CSSWideKeyword | any;
-
-        /**
-         * For inputing user content
-         */
-        userInput?: CSSWideKeyword | any;
-
-        /**
-         * The vertical-align property controls how inline elements or text are vertically aligned compared to the baseline.
-         * If this property is used on table-cells it controls the vertical alignment of content of the table cell.
-         */
-        verticalAlign?: CSSWideKeyword | any;
-
-        /**
-         * The visibility property specifies whether the boxes generated by an element are rendered.
-         */
-        visibility?: CSSWideKeyword | any;
-
-        /**
-         * The voice-balance property sets the apparent position (in stereo sound) of the synthesized voice for spoken media.
-         */
-        voiceBalance?: CSSWideKeyword | any;
-
-        /**
-         * The voice-duration property allows the author to explicitly set the amount of time it should take a speech synthesizer to read an element's content,
-         * for example to allow the speech to be synchronized with other media.
-         * With a value of auto (the default) the length of time it takes to read the content is determined by the content itself and the voice-rate property.
-         */
-        voiceDuration?: CSSWideKeyword | any;
-
-        /**
-         * The voice-family property sets the speaker's voice used by a speech media agent to read an element.
-         * The speaker may be specified as a named character (to match a voice option in the speech reading software)
-         * or as a generic description of the age and gender of the voice.
-         * Similar to the font-family property for visual media,
-         * a comma-separated list of fallback options may be given in case the speech reader does not recognize the character name
-         * or cannot synthesize the requested combination of generic properties.
-         */
-        voiceFamily?: CSSWideKeyword | any;
-
-        /**
-         * The voice-pitch property sets pitch or tone (high or low) for the synthesized speech when reading an element;
-         * the pitch may be specified absolutely or relative to the normal pitch for the voice-family used to read the text.
-         */
-        voicePitch?: CSSWideKeyword | any;
-
-        /**
-         * The voice-range property determines how much variation in pitch or tone will be created by the speech synthesize when reading an element.
-         * Emphasized text, grammatical structures and punctuation may all be rendered as changes in pitch,
-         * this property determines how strong or obvious those changes are;
-         * large ranges are associated with enthusiastic or emotional speech,
-         * while small ranges are associated with flat or mechanical speech.
-         */
-        voiceRange?: CSSWideKeyword | any;
-
-        /**
-         * The voice-rate property sets the speed at which the voice synthesized by a speech media agent will read content.
-         */
-        voiceRate?: CSSWideKeyword | any;
-
-        /**
-         * The voice-stress property sets the level of vocal emphasis to be used for synthesized speech reading the element.
-         */
-        voiceStress?: CSSWideKeyword | any;
-
-        /**
-         * The voice-volume property sets the volume for spoken content in speech media. It replaces the deprecated volume property.
-         */
-        voiceVolume?: CSSWideKeyword | any;
-
-        /**
-         * The white-space property controls whether and how white space inside the element is collapsed, and whether lines may wrap at unforced "soft wrap" opportunities.
-         */
-        whiteSpace?: CSSWideKeyword | any;
-
-        /**
-         * Obsolete: unsupported.
-         */
-        whiteSpaceTreatment?: CSSWideKeyword | any;
-
-        /**
-         * In paged media, this property defines the mimimum number of lines
-         * that must be left at the top of the second page.
-         * See CSS 3 orphans, widows properties https://drafts.csswg.org/css-break-3/#widows-orphans
-         */
-        widows?: CSSWideKeyword | number;
-
-        /**
-         * Specifies the width of the content area of an element. The content area of the element width does not include the padding, border, and margin of the element.
-         */
-        width?: CSSWideKeyword | any;
-
-        /**
-         * The word-break property is often used when there is long generated content that is strung together without and spaces or hyphens to beak apart.
-         * A common case of this is when there is a long URL that does not have any hyphens. This case could potentially cause the breaking of the layout as it could extend past the parent element.
-         */
-        wordBreak?: CSSWideKeyword | any;
-
-        /**
-         * The word-spacing CSS property specifies the spacing behavior between "words".
-         */
-        wordSpacing?: CSSWideKeyword | any;
-
-        /**
-         * An alias of css/properties/overflow-wrap, word-wrap defines whether to break words when the content exceeds the boundaries of its container.
-         */
-        wordWrap?: CSSWideKeyword | any;
-
-        /**
-         * Specifies how exclusions affect inline content within block-level elements. Elements lay out their inline content in their content area but wrap around exclusion areas.
-         */
-        wrapFlow?: CSSWideKeyword | any;
-
-        /**
-         * Set the value that is used to offset the inner wrap shape from other shapes. Inline content that intersects a shape with this property will be pushed by this shape's margin.
-         */
-        wrapMargin?: CSSWideKeyword | any;
-
-        /**
-         * Obsolete and unsupported. Do not use.
-         * This CSS property controls the text when it reaches the end of the block in which it is enclosed.
-         */
-        wrapOption?: CSSWideKeyword | any;
-
-        /**
-         * writing-mode specifies if lines of text are laid out horizontally or vertically, and the direction which lines of text and blocks progress.
-         */
-        writingMode?: CSSWideKeyword | any;
-
-        /**
-         * The z-index property specifies the z-order of an element and its descendants.
-         * When elements overlap, z-order determines which one covers the other.
-         * See CSS 2 z-index property https://www.w3.org/TR/CSS2/visuren.html#z-index
-         */
-        zIndex?: CSSWideKeyword | "auto" | number;
-
-        /**
-         * Sets the initial zoom factor of a document defined by @viewport.
-         * See CSS zoom descriptor https://drafts.csswg.org/css-device-adapt/#zoom-desc
-         */
-        zoom?: CSSWideKeyword | "auto" | number | CSSPercentage;
-
+    export interface CSSProperties extends CSS.Properties<string | number> {
+        // The string index signature fallback is needed at least until csstype
+        // provides SVG CSS properties: https://github.com/frenic/csstype/issues/4
         [propertyName: string]: any;
     }
 
diff --git a/types/react/package.json b/types/react/package.json
new file mode 100644
index 0000000000..f3be220fbc
--- /dev/null
+++ b/types/react/package.json
@@ -0,0 +1,6 @@
+{
+  "private": true,
+  "dependencies": {
+    "csstype": "^2.0.0"
+  }
+}
diff --git a/types/victory/victory-tests.tsx b/types/victory/victory-tests.tsx
index 43673d8f32..aa21609ff5 100644
--- a/types/victory/victory-tests.tsx
+++ b/types/victory/victory-tests.tsx
@@ -30,7 +30,7 @@ let test = <VictoryAnimation
     onEnd={() => {}}
 >
     {(style: AnimationStyle) =>
-        <span style={{color: style["color"]}}>Hello!</span>
+        <span style={{color: style["color"] as string}}>Hello!</span>
     }
 </VictoryAnimation>
 

From f8b253436b897755e887fe00f631ed0be8852874 Mon Sep 17 00:00:00 2001
From: efokschaner <eddyaod@gmail.com>
Date: Tue, 3 Apr 2018 18:03:28 -0700
Subject: [PATCH 1048/1382] Change maintainer of webvr-api

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

diff --git a/types/webvr-api/index.d.ts b/types/webvr-api/index.d.ts
index 329f7fe6d8..3d03a14d4b 100644
--- a/types/webvr-api/index.d.ts
+++ b/types/webvr-api/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for WebVR API
 // Project: https://w3c.github.io/webvr/
-// Definitions by: six a <https://github.com/lostfictions>
+// Definitions by: efokschaner <https://github.com/efokschaner>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 // Typescript doesn't allow redefinition of type aliases even if they match,

From ea50f76f8ec3e0419172f5373e80f03bc2592f37 Mon Sep 17 00:00:00 2001
From: Joe Andaverde <joe.andaverde@smrxt.com>
Date: Tue, 3 Apr 2018 23:33:20 -0500
Subject: [PATCH 1049/1382] Fix incorrect privacy option

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

diff --git a/types/hapi/index.d.ts b/types/hapi/index.d.ts
index 25d44b2732..d75da47e5e 100644
--- a/types/hapi/index.d.ts
+++ b/types/hapi/index.d.ts
@@ -1143,7 +1143,7 @@ export interface RouteOptionsAccess {
  * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-routeoptionscache)
  */
 export type RouteOptionsCache = {
-    privacy?: 'default' | 'public' | 'privacy';
+    privacy?: 'default' | 'public' | 'private';
     statuses?: number[];
     otherwise?: string;
 } & (

From 02ff115ce9fdf39cf1ff998c761515b9acc79d42 Mon Sep 17 00:00:00 2001
From: Diogo Franco <diogomfranco@gmail.com>
Date: Wed, 4 Apr 2018 14:10:25 +0900
Subject: [PATCH 1050/1382] [react] Workaround for --strictFunctionTypes
 (#24709)

* [react] Workaround for --strictFunctionTypes

Under --strictFunctionTypes, when assigning a class with `getDerivedStateFromProps` to `React.ComponentClass` or `React.ComponentType`, the type of the second argument was expected to be `Readonly<any>`, which is, actually, the same as `Readonly<{}>`.

This was preventing using classes that try to refer to the previous state in `getDerivedStateFromProps` from being given to HOC factories.

There are no tests as testing this change is only possible with `--strictFunctionTypes`, and the `tsconfig.json` here specifically disables it. Perhaps another PR should enable it.

* Add a test anyway

Though it wouldn't have failed unless `--strictFunctionTypes` were enabled.

* Fix lint error on the test
---
 types/react/index.d.ts   | 2 +-
 types/react/test/tsx.tsx | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index 49224d93cf..2ed2fb497c 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -404,7 +404,7 @@ declare namespace React {
          *
          * Note: its presence prevents any of the deprecated lifecycle methods from being invoked
          */
-        (nextProps: Readonly<P>, prevState: Readonly<S>) => Partial<S> | null;
+        (nextProps: Readonly<P>, prevState: S) => Partial<S> | null;
 
     // This should be "infer SS" but can't use it yet
     interface NewLifecycle<P, S, SS> {
diff --git a/types/react/test/tsx.tsx b/types/react/test/tsx.tsx
index b086e35f9f..760a625cfd 100644
--- a/types/react/test/tsx.tsx
+++ b/types/react/test/tsx.tsx
@@ -156,6 +156,7 @@ class ComponentWithLargeState extends React.Component<{}, Record<'a'|'b'|'c', st
         return { a: 'a' };
     }
 }
+const AssignedComponentWithLargeState: React.ComponentClass = ComponentWithLargeState;
 
 const componentWithBadLifecycle = new (class extends React.Component<{}, {}, number> {})({});
 componentWithBadLifecycle.getSnapshotBeforeUpdate = () => { // $ExpectError

From de655960b603d6b47f7030674f084780c76e045f Mon Sep 17 00:00:00 2001
From: Brenton Simpson <appsforartists@google.com>
Date: Tue, 3 Apr 2018 22:55:54 -0700
Subject: [PATCH 1051/1382] [jss] Use indefinite-observable for Observable
 typings

The ones in HEAD are copy-pasted from there.  Lets link to the original source.

Continuation of #24078
---
 types/jss/css.d.ts        |  2 +-
 types/jss/observable.d.ts | 17 -----------------
 types/jss/package.json    |  3 ++-
 3 files changed, 3 insertions(+), 19 deletions(-)
 delete mode 100644 types/jss/observable.d.ts

diff --git a/types/jss/css.d.ts b/types/jss/css.d.ts
index 2da9aa04b4..2d5e89139a 100644
--- a/types/jss/css.d.ts
+++ b/types/jss/css.d.ts
@@ -1,6 +1,6 @@
 // These CSS typings adapted from TypeStyle: https://github.com/typestyle/typestyle
 
-import { Observable } from './observable';
+import { Observable } from 'indefinite-observable';
 import * as csstype from 'csstype';
 
 type Length = string | number;
diff --git a/types/jss/observable.d.ts b/types/jss/observable.d.ts
deleted file mode 100644
index ff6a5f0219..0000000000
--- a/types/jss/observable.d.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copied from https://github.com/cssinjs/jss/blob/6ed7963786d5ef899075e95f81efc9530342154f/src/types.js
-
-export type Observable<T> = {
-	subscribe(observerOrNext: ObserverOrNext<T>): Subscription
-}
-
-export type Observer<T> = {
-	next: NextChannel<T>
-}
-
-export type NextChannel<T> = (value: T) => void
-export type ObserverOrNext<T> = Observer<T> | NextChannel<T>
-
-export type Unsubscribe = () => void
-export type Subscription = {
-	unsubscribe: Unsubscribe
-}
diff --git a/types/jss/package.json b/types/jss/package.json
index f3be220fbc..59a8354d7d 100644
--- a/types/jss/package.json
+++ b/types/jss/package.json
@@ -1,6 +1,7 @@
 {
   "private": true,
   "dependencies": {
-    "csstype": "^2.0.0"
+    "csstype": "^2.0.0",
+    "indefinite-observable": "^1.0.1"
   }
 }

From b0d2611519f66628adb7c265944a9870ebf07cb4 Mon Sep 17 00:00:00 2001
From: sam <liangguoxian@xcloud.cc>
Date: Wed, 4 Apr 2018 15:03:12 +0800
Subject: [PATCH 1052/1382] add Gitlab typescript lib

---
 types/gitlab/ApiBase.d.ts                     | 18 +++++++++++++
 types/gitlab/ApiBaseHTTP.d.ts                 |  9 +++++++
 types/gitlab/ApiV3.d.ts                       |  3 +++
 types/gitlab/BaseModel.d.ts                   | 14 +++++++++++
 types/gitlab/Models/Groups.d.ts               | 15 +++++++++++
 types/gitlab/Models/IssueNotes.d.ts           |  4 +++
 types/gitlab/Models/Issues.d.ts               | 10 ++++++++
 types/gitlab/Models/Labels.d.ts               |  4 +++
 types/gitlab/Models/Notes.d.ts                |  4 +++
 types/gitlab/Models/Pipelines.d.ts            |  4 +++
 types/gitlab/Models/ProjectBuilds.d.ts        |  6 +++++
 types/gitlab/Models/ProjectDeployKeys.d.ts    |  6 +++++
 types/gitlab/Models/ProjectHooks.d.ts         |  8 ++++++
 types/gitlab/Models/ProjectIssues.d.ts        |  4 +++
 types/gitlab/Models/ProjectLabels.d.ts        |  4 +++
 types/gitlab/Models/ProjectMembers.d.ts       |  8 ++++++
 types/gitlab/Models/ProjectMergeRequests.d.ts |  9 +++++++
 types/gitlab/Models/ProjectMilestones.d.ts    |  8 ++++++
 types/gitlab/Models/ProjectRepository.d.ts    | 21 ++++++++++++++++
 types/gitlab/Models/ProjectServices.d.ts      |  6 +++++
 types/gitlab/Models/Projects.d.ts             | 25 +++++++++++++++++++
 types/gitlab/Models/Runners.d.ts              | 10 ++++++++
 types/gitlab/Models/UserKeys.d.ts             |  5 ++++
 types/gitlab/Models/Users.d.ts                | 10 ++++++++
 types/gitlab/gitlab-tests.ts                  |  0
 types/gitlab/index.d.ts                       | 14 +++++++++++
 types/gitlab/tsconfig.json                    | 22 ++++++++++++++++
 types/gitlab/tslint.json                      |  1 +
 28 files changed, 252 insertions(+)
 create mode 100644 types/gitlab/ApiBase.d.ts
 create mode 100644 types/gitlab/ApiBaseHTTP.d.ts
 create mode 100644 types/gitlab/ApiV3.d.ts
 create mode 100644 types/gitlab/BaseModel.d.ts
 create mode 100644 types/gitlab/Models/Groups.d.ts
 create mode 100644 types/gitlab/Models/IssueNotes.d.ts
 create mode 100644 types/gitlab/Models/Issues.d.ts
 create mode 100644 types/gitlab/Models/Labels.d.ts
 create mode 100644 types/gitlab/Models/Notes.d.ts
 create mode 100644 types/gitlab/Models/Pipelines.d.ts
 create mode 100644 types/gitlab/Models/ProjectBuilds.d.ts
 create mode 100644 types/gitlab/Models/ProjectDeployKeys.d.ts
 create mode 100644 types/gitlab/Models/ProjectHooks.d.ts
 create mode 100644 types/gitlab/Models/ProjectIssues.d.ts
 create mode 100644 types/gitlab/Models/ProjectLabels.d.ts
 create mode 100644 types/gitlab/Models/ProjectMembers.d.ts
 create mode 100644 types/gitlab/Models/ProjectMergeRequests.d.ts
 create mode 100644 types/gitlab/Models/ProjectMilestones.d.ts
 create mode 100644 types/gitlab/Models/ProjectRepository.d.ts
 create mode 100644 types/gitlab/Models/ProjectServices.d.ts
 create mode 100644 types/gitlab/Models/Projects.d.ts
 create mode 100644 types/gitlab/Models/Runners.d.ts
 create mode 100644 types/gitlab/Models/UserKeys.d.ts
 create mode 100644 types/gitlab/Models/Users.d.ts
 create mode 100644 types/gitlab/gitlab-tests.ts
 create mode 100644 types/gitlab/index.d.ts
 create mode 100644 types/gitlab/tsconfig.json
 create mode 100644 types/gitlab/tslint.json

diff --git a/types/gitlab/ApiBase.d.ts b/types/gitlab/ApiBase.d.ts
new file mode 100644
index 0000000000..b8566f3ccb
--- /dev/null
+++ b/types/gitlab/ApiBase.d.ts
@@ -0,0 +1,18 @@
+import { Labels } from './Models/Labels.d';
+import { Users } from './Models/Users.d';
+import { Notes } from './Models/Notes.d';
+import { Issues } from './Models/Issues.d';
+import { Projects } from './Models/Projects.d';
+import { Groups } from './Models/Groups.d';
+
+export class ApiBase {
+    constructor(options: object);
+    public groups: Groups
+    public projects: Projects
+    public issues: Issues
+    public notes: Notes
+    public users: Users
+    public labels: Labels
+    public handleOptions(): void;
+    public init(): object;
+}
diff --git a/types/gitlab/ApiBaseHTTP.d.ts b/types/gitlab/ApiBaseHTTP.d.ts
new file mode 100644
index 0000000000..2de92b6c74
--- /dev/null
+++ b/types/gitlab/ApiBaseHTTP.d.ts
@@ -0,0 +1,9 @@
+export class ApiBaseHTTP {
+    public prepare_opts<T>(opts: T): T;
+    public fn_wrapper(fn: Function): Function;
+    public get(path: string, query?: object, fn?: Function): any;
+    public delete(path: string, fn?: Function): any;
+    public post(path: string, data?: object, fn?: Function): any;
+    public put(path: string, data?: object, fn?: Function): any;
+    public patch(path: string, data?: object, fn?: Function): any;
+}
diff --git a/types/gitlab/ApiV3.d.ts b/types/gitlab/ApiV3.d.ts
new file mode 100644
index 0000000000..762f8824d6
--- /dev/null
+++ b/types/gitlab/ApiV3.d.ts
@@ -0,0 +1,3 @@
+export class ApiV3 {
+
+}
diff --git a/types/gitlab/BaseModel.d.ts b/types/gitlab/BaseModel.d.ts
new file mode 100644
index 0000000000..e801ccf654
--- /dev/null
+++ b/types/gitlab/BaseModel.d.ts
@@ -0,0 +1,14 @@
+export class BaseModel {
+    public load(model: string): object;
+    public get(): any
+    public post(): any
+    public put(): any
+    public delete(): any
+    public debug(): any
+}
+export interface PageDefualtParams {
+    page?: number
+    per_page?: number
+    [key: string]: any
+}
+export type TypeNumOrStrId = number | string;
diff --git a/types/gitlab/Models/Groups.d.ts b/types/gitlab/Models/Groups.d.ts
new file mode 100644
index 0000000000..f8ad983f4a
--- /dev/null
+++ b/types/gitlab/Models/Groups.d.ts
@@ -0,0 +1,15 @@
+import { BaseModel } from "../BaseModel";
+
+export class Groups extends BaseModel {
+    public init(): object;
+    public all(params?: object, fn?: Function): any;
+    public show(groupId: number, fn?: Function): any;
+    public listProjects(groupId: number, fn?: Function): any;
+    public listMembers(groupId: number, fn?: Function): any;
+    public editMember(groupId: number, userId: number, accessLevel: number, fn?: Function): any;
+    public removeMember(groupId: number, userId: number, fn?: Function): any;
+    public create(params?: object, fn?: Function): any;
+    public addProject(groupId: number, projectId: number, fn?: Function): any;
+    public deleteGroup(groupId: number, fn?: Function): any;
+    public search(nameOrPath: string, fn?: Function): any;
+}
diff --git a/types/gitlab/Models/IssueNotes.d.ts b/types/gitlab/Models/IssueNotes.d.ts
new file mode 100644
index 0000000000..aeb7c5944b
--- /dev/null
+++ b/types/gitlab/Models/IssueNotes.d.ts
@@ -0,0 +1,4 @@
+import { BaseModel } from './../BaseModel.d';
+export class IssueNotes extends BaseModel{
+    public all(projectId: number | string, issueId: number, params?: object, fn?: Function): any
+}
diff --git a/types/gitlab/Models/Issues.d.ts b/types/gitlab/Models/Issues.d.ts
new file mode 100644
index 0000000000..9fcc585ea0
--- /dev/null
+++ b/types/gitlab/Models/Issues.d.ts
@@ -0,0 +1,10 @@
+import { BaseModel } from './../BaseModel.d';
+export class Issues extends BaseModel {
+    public all(params?: object, fn?: Function): any;
+    public show(projectId: number | string, issueId: number | string, fn?: Function): any;
+    public create(projectId: number | string, params?: object, fn?: Function): any;
+    public edit(projectId: number | string, issueId: number | string, params?: object, fn?: Function): any;
+    public remove(projectId: number | string, issueId: number | string, fn?: Function): any;
+    public subscribe(projectId: number | string, issueId: number | string, params?: object, fn?: Function): any;
+    public unsubscribe(projectId: number | string, issueId: number | string, fn?: Function): any;
+}
diff --git a/types/gitlab/Models/Labels.d.ts b/types/gitlab/Models/Labels.d.ts
new file mode 100644
index 0000000000..b7529b320c
--- /dev/null
+++ b/types/gitlab/Models/Labels.d.ts
@@ -0,0 +1,4 @@
+import { BaseModel } from './../BaseModel.d';
+export class Labels extends BaseModel {
+    public create(projectId: number | string, params?: object, fn?: Function): any;
+}
diff --git a/types/gitlab/Models/Notes.d.ts b/types/gitlab/Models/Notes.d.ts
new file mode 100644
index 0000000000..8a85dcbedc
--- /dev/null
+++ b/types/gitlab/Models/Notes.d.ts
@@ -0,0 +1,4 @@
+import { BaseModel } from './../BaseModel.d';
+export class Notes extends BaseModel {
+    public create(projectId: number | string, issueId: number, params?: object, fn?: Function): any;
+}
diff --git a/types/gitlab/Models/Pipelines.d.ts b/types/gitlab/Models/Pipelines.d.ts
new file mode 100644
index 0000000000..bfddc099f9
--- /dev/null
+++ b/types/gitlab/Models/Pipelines.d.ts
@@ -0,0 +1,4 @@
+import { BaseModel } from './../BaseModel.d';
+export class Pipelines extends BaseModel {
+    public all(projectId: number | string, fn?: Function): any;
+}
diff --git a/types/gitlab/Models/ProjectBuilds.d.ts b/types/gitlab/Models/ProjectBuilds.d.ts
new file mode 100644
index 0000000000..5bc9fbaa3d
--- /dev/null
+++ b/types/gitlab/Models/ProjectBuilds.d.ts
@@ -0,0 +1,6 @@
+import { BaseModel } from './../BaseModel.d';
+export class ProjectBuilds extends BaseModel {
+    public listBuilds(projectId: number | string, params?: { page?: number, per_page?: number, [key: string]: any }, fn?: Function): any;
+    public showBuild(projectId: number | string, buildId: string, fn?: Function): any;
+    public showBuild(params?: { projectId: number | string}, fn?: Function): any;
+}
diff --git a/types/gitlab/Models/ProjectDeployKeys.d.ts b/types/gitlab/Models/ProjectDeployKeys.d.ts
new file mode 100644
index 0000000000..be6af6a170
--- /dev/null
+++ b/types/gitlab/Models/ProjectDeployKeys.d.ts
@@ -0,0 +1,6 @@
+import { BaseModel } from './../BaseModel.d';
+export class ProjectKeys extends BaseModel {
+    public listKeys(projectId: number | string, fn?: Function): any;
+    public getKey(projectId: number | string, keyId: number, fn?: Function): any;
+    public addKey(projectId: number | string, params?: object, fn?: Function): any;
+}
diff --git a/types/gitlab/Models/ProjectHooks.d.ts b/types/gitlab/Models/ProjectHooks.d.ts
new file mode 100644
index 0000000000..399dc18e7f
--- /dev/null
+++ b/types/gitlab/Models/ProjectHooks.d.ts
@@ -0,0 +1,8 @@
+import { BaseModel } from './../BaseModel.d';
+export class ProjectHooks extends BaseModel {
+    public list(projectId: number | string, fn?: Function): any;
+    public show(projectId: number | string, hookId: number, fn?: Function): any;
+    public add(projectId: number | string, params: object|string, fn?: Function): any;
+    public update(projectId: number | string, hookId: number, url: any, fn?: Function): any;
+    public remove(projectId: number | string, hookId: number, fn?: Function): any;
+}
diff --git a/types/gitlab/Models/ProjectIssues.d.ts b/types/gitlab/Models/ProjectIssues.d.ts
new file mode 100644
index 0000000000..ee61cfca3f
--- /dev/null
+++ b/types/gitlab/Models/ProjectIssues.d.ts
@@ -0,0 +1,4 @@
+import { BaseModel } from './../BaseModel.d';
+export class ProjectIssues extends BaseModel {
+    public list(projectId: number | string, params: { page?: number, per_page?: number, [key: string]: any }, fn?: Function): any;
+}
diff --git a/types/gitlab/Models/ProjectLabels.d.ts b/types/gitlab/Models/ProjectLabels.d.ts
new file mode 100644
index 0000000000..23d12ca652
--- /dev/null
+++ b/types/gitlab/Models/ProjectLabels.d.ts
@@ -0,0 +1,4 @@
+import { BaseModel } from './../BaseModel.d';
+export class ProjectLabels extends BaseModel {
+    public all(projectId: number | string, params: { page?: number, per_page?: number, [key: string]: any }, fn?: Function): any;
+}
diff --git a/types/gitlab/Models/ProjectMembers.d.ts b/types/gitlab/Models/ProjectMembers.d.ts
new file mode 100644
index 0000000000..79b9e11b02
--- /dev/null
+++ b/types/gitlab/Models/ProjectMembers.d.ts
@@ -0,0 +1,8 @@
+import { BaseModel } from './../BaseModel.d';
+export class ProjectMembers extends BaseModel {
+    public list(projectId: number | string, fn?: Function): any;
+    public show(projectId: number | string, userId: number, fn?: Function): any;
+    public add(projectId: number | string, userId: number, accessLevel: number,fn?: Function): any;
+    public update(projectId: number | string, userId: number, accessLevel: number, fn?: Function): any;
+    public remove(projectId: number | string, userId: number, fn?: Function): any;
+}
diff --git a/types/gitlab/Models/ProjectMergeRequests.d.ts b/types/gitlab/Models/ProjectMergeRequests.d.ts
new file mode 100644
index 0000000000..f2043e79d5
--- /dev/null
+++ b/types/gitlab/Models/ProjectMergeRequests.d.ts
@@ -0,0 +1,9 @@
+import { BaseModel } from './../BaseModel.d';
+export class ProjectMergeRequests extends BaseModel {
+    public list(projectId: number | string, params: { page?: number, per_page?: number, [key: string]: any }, fn?: Function): any;
+    public show(projectId: number | string, mergerequestId: number, fn?: Function): any;
+    public add(projectId: number | string, sourceBranch: any, targetBranch: any, assigneeId: number, title: any, fn?: Function): any;
+    public update(projectId: number | string, mergerequestId: number, params: object, fn?: Function): any;
+    public comment(projectId: number | string, mergerequestId: number, note: any, fn?: Function): any;
+    public merge(projectId: number | string, mergerequestId: number, params: object, fn?: Function): any;
+}
diff --git a/types/gitlab/Models/ProjectMilestones.d.ts b/types/gitlab/Models/ProjectMilestones.d.ts
new file mode 100644
index 0000000000..9a9da7c025
--- /dev/null
+++ b/types/gitlab/Models/ProjectMilestones.d.ts
@@ -0,0 +1,8 @@
+import { BaseModel } from './../BaseModel.d';
+export class ProjectMilestones extends BaseModel {
+    public list(projectId: number | string, fn?: Function): any;
+    public all(projectId: number | string, fn?: Function): any;
+    public show(projectId: number | string, milestoneId: number, fn?: Function): any;
+    public add(projectId: number | string, title: any, description: any, due_date: any, fn?: Function): any;
+    public update(projectId: number | string, milestoneId: number, title: any, description: any, due_date: any, state_event: any, fn?: Function): any;
+}
diff --git a/types/gitlab/Models/ProjectRepository.d.ts b/types/gitlab/Models/ProjectRepository.d.ts
new file mode 100644
index 0000000000..e0421e5a7e
--- /dev/null
+++ b/types/gitlab/Models/ProjectRepository.d.ts
@@ -0,0 +1,21 @@
+import { BaseModel } from './../BaseModel.d';
+export class ProjectRepository extends BaseModel {
+    public listBranches(projectId: number | string, fn?: Function): any;
+    public showBranch(projectId: number | string, branchId: string, fn?: Function): any;
+    public protectBranch(projectId: number | string, branchId: string, params: object, fn?: Function): any;
+    public unprotectBranch(projectId: number | string, branchId: string, fn?: Function): any;
+    public createBranch(params: object, fn?: Function): any;
+    public deleteBranch(projectId: number | string, branchId: string, fn?: Function): any;
+    public addTag(params: object, fn?: Function): any;
+    public deleteTag(projectId: number | string, tagName: string, fn?: Function): any;
+    public showTag(projectId: number | string, tagName: string, fn?: Function): any;
+    public listTags(projectId: number | string, fn?: Function): any;
+    public listCommits(projectId: number | string, fn?: Function): any;
+    public showCommit(projectId: number | string, sha: string, fn?: Function): any;
+    public diffCommit(projectId: number | string, sha: string, fn?: Function): any;
+    public listTree(projectId: number | string, params?: object, fn?: Function): any;
+    public showFile(projectId: number | string, params?: object, fn?: Function): any;
+    public createFile(params?: object, fn?: Function): any;
+    public updateFile(params?: object, fn?: Function): any;
+    public compare(params?: object, fn?: Function): any;
+}
diff --git a/types/gitlab/Models/ProjectServices.d.ts b/types/gitlab/Models/ProjectServices.d.ts
new file mode 100644
index 0000000000..935e173bce
--- /dev/null
+++ b/types/gitlab/Models/ProjectServices.d.ts
@@ -0,0 +1,6 @@
+import { BaseModel } from './../BaseModel.d';
+export class ProjectServices extends BaseModel {
+    public show(projectId: number | string, serviceName: string, fn?: Function): any;
+    public update(projectId: number | string, serviceName: string, params: object, fn?: Function): any;
+    public remove(projectId: number | string, serviceName: string, fn?: Function): any;
+}
diff --git a/types/gitlab/Models/Projects.d.ts b/types/gitlab/Models/Projects.d.ts
new file mode 100644
index 0000000000..dc25e5f418
--- /dev/null
+++ b/types/gitlab/Models/Projects.d.ts
@@ -0,0 +1,25 @@
+import { BaseModel, PageDefualtParams, TypeNumOrStrId} from './../BaseModel.d';
+export class Projects extends BaseModel {
+    public all(fn?: Function): any;
+    public all(params?: PageDefualtParams, fn?: Function): any;
+    public allAdmin(fn: Function): any;
+    public allAdmin(params?: PageDefualtParams, fn?: Function): any;
+    public show(projectId: TypeNumOrStrId, fn?: Function): any;
+    public create(params: object, fn?: Function): any;
+    public create_for_user(params: object, fn?: Function): any;
+    public edit(projectId: TypeNumOrStrId, params: object, fn?: Function): any;
+    public addMember(params?: object, fn?: Function): any;
+    public editMember(params?: object, fn?: Function): any;
+    public listMembers(params?: object, fn?: Function): any;
+    public listCommits(params?: object, fn?: Function): any;
+    public listTags(params?: object, fn?: Function): any;
+    public remove(projectId: TypeNumOrStrId, fn?: Function): any;
+    public fork(params?: object, fn?: Function): any;
+    public share(params?: object, fn?: Function): any;
+    public search(projectName: string, fn?: Function): any;
+    public search(projectName: string, params?: object, fn?: Function): any;
+    public listTriggers(projectId: TypeNumOrStrId, fn?: Function): any;
+    public showTrigger(projectId: TypeNumOrStrId, token: string, fn?: Function): any;
+    public createTrigger(params?: object, fn?: Function): any;
+    public removeTrigger(projectId: TypeNumOrStrId, token: string, fn?: Function): any;
+}
diff --git a/types/gitlab/Models/Runners.d.ts b/types/gitlab/Models/Runners.d.ts
new file mode 100644
index 0000000000..c65a1e2759
--- /dev/null
+++ b/types/gitlab/Models/Runners.d.ts
@@ -0,0 +1,10 @@
+import { BaseModel, PageDefualtParams, TypeNumOrStrId} from './../BaseModel.d';
+export class Runners extends BaseModel {
+    public all(projectId?: TypeNumOrStrId, fn?: Function): any;
+    public all(projectId?: TypeNumOrStrId, params?: object, fn?: Function): any;
+    public show(runnerId: number, fn?: Function): any;
+    public update(runnerId: number, attributes: any, fn?: Function): any;
+    public remove(runnerId: number, projectId: any, enable: any, fn?: Function): any;
+    public enable(projectId: TypeNumOrStrId, runnerId: number, fn?: Function): any;
+    public disable(projectId: TypeNumOrStrId, runnerId: number, fn?: Function): any;
+}
diff --git a/types/gitlab/Models/UserKeys.d.ts b/types/gitlab/Models/UserKeys.d.ts
new file mode 100644
index 0000000000..90f1918361
--- /dev/null
+++ b/types/gitlab/Models/UserKeys.d.ts
@@ -0,0 +1,5 @@
+import { BaseModel, PageDefualtParams, TypeNumOrStrId} from './../BaseModel.d';
+export class UserKeys extends BaseModel {
+    public all(userId?: TypeNumOrStrId, fn?: Function): any;
+    public addKey(userId: string, title: any, key: any, fn?: Function): any;
+}
diff --git a/types/gitlab/Models/Users.d.ts b/types/gitlab/Models/Users.d.ts
new file mode 100644
index 0000000000..b14a67e63a
--- /dev/null
+++ b/types/gitlab/Models/Users.d.ts
@@ -0,0 +1,10 @@
+import { BaseModel, PageDefualtParams, TypeNumOrStrId} from './../BaseModel.d';
+export class Users extends BaseModel {
+    public all(fn?: Function): any;
+    public all(params?: PageDefualtParams, fn?: Function): any;
+    public current(fn?: Function): any;
+    public show(userId: number, fn?: Function): any;
+    public create(params?: PageDefualtParams, fn?: Function): any;
+    public session(email: string, password: string, fn?: Function): any;
+    public search(emailOrUsername: string, fn?: Function): any;
+}
diff --git a/types/gitlab/gitlab-tests.ts b/types/gitlab/gitlab-tests.ts
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/types/gitlab/index.d.ts b/types/gitlab/index.d.ts
new file mode 100644
index 0000000000..8a1ea57dd6
--- /dev/null
+++ b/types/gitlab/index.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for gitlab 1.8
+// Project: https://github.com/node-gitlab/node-gitlab#readme
+// Definitions by: sam <https://github.com/yanqing6628780>
+//                 AryloYeung <https://github.com/Arylo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import { ApiV3 } from "./ApiV3";
+
+declare class GitlabApi extends ApiV3 {
+
+    public static readonly ApiV3: ApiV3;
+}
+
+export = GitlabApi;
diff --git a/types/gitlab/tsconfig.json b/types/gitlab/tsconfig.json
new file mode 100644
index 0000000000..83e46736e1
--- /dev/null
+++ b/types/gitlab/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "gitlab-tests.ts"
+    ]
+}
diff --git a/types/gitlab/tslint.json b/types/gitlab/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/gitlab/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From efdd0914a62ed3ed5c02d4011a64062eb175bd6a Mon Sep 17 00:00:00 2001
From: Lubomir Kaplan <castor@castor.sk>
Date: Wed, 4 Apr 2018 12:51:42 +0200
Subject: [PATCH 1053/1382] minio: fixed .listBuckets() method signature

---
 types/minio/index.d.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/minio/index.d.ts b/types/minio/index.d.ts
index 2dda500396..31a8fd5814 100644
--- a/types/minio/index.d.ts
+++ b/types/minio/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for minio 5.0
 // Project: https://github.com/minio/minio-js#readme
 // Definitions by: Barin Britva <https://github.com/barinbritva>
+//                 Lubomir Kaplan <https://github.com/castorw>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -82,7 +83,7 @@ export class Client {
     makeBucket(bucketName: string, region: Region): Promise<void>;
 
     listBuckets(callback: ResultCallback<BucketItemFromList[]>): void;
-    listBuckets(): Promise<BucketItemFromList>;
+    listBuckets(): Promise<BucketItemFromList[]>;
 
     bucketExists(bucketName: string, callback: ResultCallback<boolean>): void;
     bucketExists(bucketName: string): Promise<boolean>;

From 9e621da0f3062d2d657654449830205f72308e5b Mon Sep 17 00:00:00 2001
From: Lubomir Kaplan <castor@castor.sk>
Date: Wed, 4 Apr 2018 12:59:38 +0200
Subject: [PATCH 1054/1382] updated minio package version

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

diff --git a/types/minio/index.d.ts b/types/minio/index.d.ts
index 31a8fd5814..9413d19943 100644
--- a/types/minio/index.d.ts
+++ b/types/minio/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for minio 5.0
+// Type definitions for minio 5.0.1
 // Project: https://github.com/minio/minio-js#readme
 // Definitions by: Barin Britva <https://github.com/barinbritva>
 //                 Lubomir Kaplan <https://github.com/castorw>

From ee5b34955b8f674c66f16aa2cb460ff04fa32949 Mon Sep 17 00:00:00 2001
From: Lubomir Kaplan <castor@castor.sk>
Date: Wed, 4 Apr 2018 13:08:29 +0200
Subject: [PATCH 1055/1382] minio: fixed package version

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

diff --git a/types/minio/index.d.ts b/types/minio/index.d.ts
index 9413d19943..fd7953dea2 100644
--- a/types/minio/index.d.ts
+++ b/types/minio/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for minio 5.0.1
+// Type definitions for minio 5.1
 // Project: https://github.com/minio/minio-js#readme
 // Definitions by: Barin Britva <https://github.com/barinbritva>
 //                 Lubomir Kaplan <https://github.com/castorw>

From 8000cbffa9aa3b10e42cb98913dc554493867884 Mon Sep 17 00:00:00 2001
From: Lubomir Kaplan <castor@castor.sk>
Date: Wed, 4 Apr 2018 13:21:46 +0200
Subject: [PATCH 1056/1382] minio: fixed signature for BucketItemStat object

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

diff --git a/types/minio/index.d.ts b/types/minio/index.d.ts
index fd7953dea2..bdbcb8032a 100644
--- a/types/minio/index.d.ts
+++ b/types/minio/index.d.ts
@@ -46,7 +46,7 @@ export interface BucketItemStat {
     size: number;
     contentType: string;
     etag: string;
-    lastModified: string;
+    lastModified: Date;
 }
 
 export interface IncompleteUploadedBucketItem {

From 7bd14e117fbe57fa11ab8d1ca3da464e6d8a639b Mon Sep 17 00:00:00 2001
From: Joel Hegg <jhegg@ebay.com>
Date: Tue, 3 Apr 2018 12:39:08 -0400
Subject: [PATCH 1057/1382] [actions-on-google] Upgrade to 1.9

---
 types/actions-on-google/assistant-app.d.ts    | 204 +++++++++++++++++-
 types/actions-on-google/index.d.ts            |   2 +-
 types/actions-on-google/response-builder.d.ts |  10 +
 3 files changed, 210 insertions(+), 6 deletions(-)

diff --git a/types/actions-on-google/assistant-app.d.ts b/types/actions-on-google/assistant-app.d.ts
index d835915259..b3608b85e8 100644
--- a/types/actions-on-google/assistant-app.d.ts
+++ b/types/actions-on-google/assistant-app.d.ts
@@ -1,6 +1,6 @@
 import * as express from 'express';
 
-import { BasicCard, Carousel, ImageDisplays, List, OptionItem, RichResponse } from './response-builder';
+import { BasicCard, Carousel, ImageDisplays, List, OptionItem, RichResponse, SimpleResponse } from './response-builder';
 import { ActionPaymentTransactionConfig, Cart, GooglePaymentTransactionConfig, LineItem,
          Location, Order, OrderUpdate, TransactionDecision, TransactionValues } from './transactions';
 
@@ -30,6 +30,8 @@ export enum StandardIntents {
     DELIVERY_ADDRESS,
     /** App fires TRANSACTION_DECISION intent when action asks for transaction decision. */
     TRANSACTION_DECISION,
+    /** App fires PLACE intent when action asks for place. */
+    PLACE,
     /** App fires CONFIRMATION intent when requesting affirmation from user. */
     CONFIRMATION,
     /** App fires DATETIME intent when requesting date/time from user. */
@@ -45,7 +47,9 @@ export enum StandardIntents {
     /** App fires REGISTER_UPDATE intent when requesting user to register for proactive updates. */
     REGISTER_UPDATE,
     /** App receives CONFIGURE_UPDATES intent to indicate a REGISTER_UPDATE intent should be sent. */
-    CONFIGURE_UPDATES
+    CONFIGURE_UPDATES,
+    /** App fires LINK intent to request user to open to link. */
+    LINK
 }
 
 /**
@@ -101,6 +105,10 @@ export enum BuiltInArgNames {
      * Transactions decision argument.
      */
     TRANSACTION_DECISION_VALUE,
+    /**
+     * Place value argument.
+     */
+    PLACE,
     /**
      * Confirmation argument.
      */
@@ -126,7 +134,9 @@ export enum BuiltInArgNames {
      */
     NEW_SURFACE,
     /** Update registration value argument. */
-    REGISTER_UPDATE
+    REGISTER_UPDATE,
+    /** Link request result argument. */
+    LINK
 }
 
 /**
@@ -173,6 +183,10 @@ export enum SurfaceCapabilities {
      * The ability to output on a screen
      */
     SCREEN_OUTPUT,
+    /**
+     * The ability to open a web URL
+     */
+    WEB_BROWSER
 }
 
 /**
@@ -259,10 +273,15 @@ export interface UserName {
     familyName: string;
 }
 
+export interface LocationCoordinates {
+    latitude: number;
+    longitude: number;
+}
+
 /**
- * User's permissioned device location.
+ * Location information.
  */
-export interface DeviceLocation {
+export interface Location {
     /** Coordinates: {latitude, longitude}. Requested with SupportedPermissions.DEVICE_PRECISE_LOCATION. */
     coordinates: Coordinates;
     /** Full, formatted street address. Requested with SupportedPermissions.DEVICE_PRECISE_LOCATION. */
@@ -273,6 +292,22 @@ export interface DeviceLocation {
     city: string;
 }
 
+/**
+ * User's permissioned device location.
+ */
+export type DeviceLocation = Location;
+
+/**
+ * Place information.
+ */
+export interface Place extends Location {
+    /**
+     * Used with Places API to fetch details of a place.
+     * See {@link https://developers.google.com/places/web-service/place-id}
+     */
+    placeId: string;
+}
+
 /**
  * Coordinates containing latitude and longitude
  */
@@ -923,6 +958,80 @@ export class AssistantApp {
      */
     askForDeliveryAddress(reason: string, dialogState?: object): express.Response | null;
 
+    /**
+     * Asks user to provide a geo-located place, possibly using contextual information,
+     * like a store near the user's location or a contact's address.
+     *
+     * Developer provides custom text prompts to tailor the request handled by Google.
+     *
+     * @example
+     * // For DialogflowApp:
+     *
+     * // Dialogflow Actions
+     * const Actions = {
+     *   WELCOME: 'input.welcome',
+     *   PLACE: 'get.place' // Create Dialogflow Action with actions_intent_PLACE event
+     * };
+     *
+     * const app = new DialogflowApp({request, response});
+     *
+     * function handleWelcome (app) {
+     *   const requestPrompt = 'Where do you want to get picked up?';
+     *   const permissionContext = 'To find a place to pick you up';
+     *   app.askForPlace(requestPrompt, permissionContext);
+     * }
+     *
+     * function handlePlace (app) {
+     *   const place = app.getPlace();
+     *   if (place) {
+     *     app.tell(`Ah, I see. You want to get picked up at ${place.address}`);
+     *   } else {
+     *     app.tell(`Sorry, I couldn't find where you want to get picked up`);
+     *   }
+     * }
+     *
+     * const actionMap = new Map();
+     * actionMap.set(Actions.WELCOME, handleWelcome);
+     * actionMap.set(Actions.PLACE, handlePlace);
+     * app.handleRequest(actionMap);
+     *
+     * // For ActionsSdkApp:
+     * const app = new ActionsSdkApp({ request, response });
+     *
+     * function handleWelcome (app) {
+     *   const requestPrompt = 'Where do you want to get picked up?';
+     *   const permissionContext = 'To find a place to pick you up';
+     *   app.askForPlace(requestPrompt, permissionContext);
+     * }
+     *
+     * function handlePlace (app) {
+     *   const place = app.getPlace();
+     *   if (place) {
+     *     app.tell(`Ah, I see. You want to get picked up at ${place.address}`);
+     *   } else {
+     *     app.tell(`Sorry, I couldn't find where you want to get picked up`);
+     *   }
+     * }
+     *
+     * const actionsMap = new Map();
+     * actionsMap.set(app.StandardIntents.MAIN, handleWelcome);
+     * actionsMap.set(app.StandardIntents.PLACE, handlePlace);
+     * app.handleRequest(actionsMap);
+     *
+     * @param requestPrompt This is the initial response by location sub-dialog.
+     *     For example: "Where do you want to get picked up?"
+     * @param permissionContext This is the context for seeking permissions.
+     *     For example: "To find a place to pick you up"
+     *     Prompt to user: "*To find a place to pick you up*, I just need to check your location.
+     *       Can I get that from Google?".
+     * @param dialogState JSON object the app uses to hold dialog state that
+     *     will be circulated back by Assistant.
+     * @return HTTP response.
+     * @actionssdk
+     * @dialogflow
+     */
+    askForPlace(requestPrompt: string, permissionContext: string, dialogState?: object): express.Response | null;
+
     /**
      * Asks user for a confirmation.
      *
@@ -1131,6 +1240,72 @@ export class AssistantApp {
      */
     askToRegisterDailyUpdate(intent: string, intentArguments: IntentArgument[], dialogState?: object): express.Response | null;
 
+    /**
+     * Requests the user to transfer to a linked out Android app intent. Using this feature
+     * requires verifying the linked app in the (Actions console)[console.actions.google.com].
+     *
+     * @example
+     * // For DialogflowApp:
+     *
+     * // Dialogflow Actions
+     * const WELCOME_ACTION = 'input.welcome';
+     * const HANDLE_LINK = 'handle.link'; // Create Dialogflow Action with actions_intent_LINK event
+     *
+     * const app = new DialogflowApp({ request, response });
+     *
+     * console.log('Request headers: ' + JSON.stringify(request.headers));
+     * console.log('Request body: ' + JSON.stringify(request.body));
+     *
+     * function requestLink (app) {
+     *   app.askToDeepLink('Great! Looks like we can do that in the app.', 'Google',
+     *     'example://gizmos', 'com.example.gizmos', 'handle this for you');
+     * }
+     *
+     * function handleLink (app) {
+     *   const linkStatus = app.getLinkStatus();
+     *   app.tell('Okay maybe we can take care of that another time.');
+     * }
+     *
+     * const actionMap = new Map();
+     * actionMap.set(WELCOME_ACTION, requestLink);
+     * actionMap.set(HANDLE_LINK, handleLink);
+     * app.handleRequest(actionMap);
+     *
+     * // For ActionsSdkApp
+     * const app = new ActionsSdkApp({ request, response });
+     *
+     * console.log('Request headers: ' + JSON.stringify(request.headers));
+     * console.log('Request body: ' + JSON.stringify(request.body));
+     *
+     * function requestLink (app) {
+     *   app.askToDeepLink('Great! Looks like we can do that in the app.', 'Google',
+     *     'example://gizmos', 'com.example.gizmos', 'handle this for you.');
+     * }
+     *
+     * function handleLink (app) {
+     *   const linkStatus = app.getLinkStatus();
+     *   app.tell('Okay maybe we can take care of that another time.');
+     * }
+     *
+     * const actionMap = new Map();
+     * actionMap.set(app.StandardIntents.MAIN, requestLink);
+     * actionMap.set(app.StandardIntents.LINK, handleLink);
+     * app.handleRequest(actionMap);
+     *
+     * @param prompt A simple response to prepend to the link request.
+     * @param destinationName The name of the link destination.
+     * @param url URL of Android deep link.
+     * @param packageName Android app package name to which to link.
+     * @param reason The reason to transfer the user. This may be appended to a
+     *     Google-specified prompt.
+     * @param dialogState JSON object the app uses to hold dialog state that
+     *     will be circulated back by Assistant. Used in {@link ActionsSdkApp}.
+     * @return HTTP response.
+     * @dialogflow
+     * @actionssdk
+     */
+    askToDeepLink(prompt: string | SimpleResponse | null, destinationName: string, url: string, packageName: string, reason?: string | null, dialogState?: object): express.Response | null;
+
     /**
      * Gets the {@link User} object.
      * The user object contains information about the user, including
@@ -1273,6 +1448,15 @@ export class AssistantApp {
      */
     getTransactionDecision(): TransactionDecision;
 
+    /**
+     * Gets the user provided place. Use after askForPlace.
+     *
+     * @return Place information given by the user. Null if no place given.
+     * @dialogflow
+     * @actionssdk
+     */
+    getPlace(): Place | null;
+
     /**
      * Gets confirmation decision. Use after askForConfirmation.
      *
@@ -1464,6 +1648,16 @@ export class AssistantApp {
      */
     isUpdateRegistered(): boolean;
 
+    /**
+     * Returns the status of a link request. Used with
+     * {@link AssistantApp#askToDeepLink}
+     *
+     * @return The status code of the request to link.
+     * @dialogflow
+     * @actionssdk
+     */
+    getLinkStatus(): number;
+
     // ---------------------------------------------------------------------------
     //                   Response Builders
     // ---------------------------------------------------------------------------
diff --git a/types/actions-on-google/index.d.ts b/types/actions-on-google/index.d.ts
index 937943e1f0..0260bc6cee 100644
--- a/types/actions-on-google/index.d.ts
+++ b/types/actions-on-google/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for actions-on-google 1.8
+// Type definitions for actions-on-google 1.9
 // Project: https://github.com/actions-on-google/actions-on-google-nodejs
 // Definitions by: Joel Hegg <https://github.com/joelhegg>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/actions-on-google/response-builder.d.ts b/types/actions-on-google/response-builder.d.ts
index 227d102958..966c881ba6 100644
--- a/types/actions-on-google/response-builder.d.ts
+++ b/types/actions-on-google/response-builder.d.ts
@@ -350,6 +350,16 @@ export class Carousel {
      * @return Returns current constructed Carousel.
      */
     addItems(optionItems: OptionItem | OptionItem[]): Carousel;
+
+    /**
+     * Sets the display options for the images in this carousel.
+     * Use one of the image display constants. If none is chosen,
+     * ImageDisplays.DEFAULT will be enforced.
+     *
+     * @param option The option for displaying the image.
+     * @return Returns current constructed Carousel.
+     */
+    setImageDisplay(option: ImageDisplays): Carousel;
 }
 
 /**

From ae57c33929ad2677fe1d0ed516e372298e60892d Mon Sep 17 00:00:00 2001
From: Joel Hegg <jhegg@ebay.com>
Date: Tue, 3 Apr 2018 16:44:32 -0400
Subject: [PATCH 1058/1382] [actions-on-google] Upgrade to 1.10

---
 types/actions-on-google/assistant-app.d.ts    | 139 ++++++++-
 types/actions-on-google/index.d.ts            |   2 +-
 types/actions-on-google/response-builder.d.ts | 288 ++++++++++++++++++
 3 files changed, 425 insertions(+), 4 deletions(-)

diff --git a/types/actions-on-google/assistant-app.d.ts b/types/actions-on-google/assistant-app.d.ts
index b3608b85e8..76a206122c 100644
--- a/types/actions-on-google/assistant-app.d.ts
+++ b/types/actions-on-google/assistant-app.d.ts
@@ -1,6 +1,7 @@
 import * as express from 'express';
 
-import { BasicCard, Carousel, ImageDisplays, List, OptionItem, RichResponse, SimpleResponse } from './response-builder';
+import { BasicCard, BrowseCarousel, BrowseItem, Carousel, ImageDisplays, List, MediaObject,
+         MediaResponse, MediaValues, OptionItem, RichResponse, SimpleResponse } from './response-builder';
 import { ActionPaymentTransactionConfig, Cart, GooglePaymentTransactionConfig, LineItem,
          Location, Order, OrderUpdate, TransactionDecision, TransactionValues } from './transactions';
 
@@ -49,7 +50,9 @@ export enum StandardIntents {
     /** App receives CONFIGURE_UPDATES intent to indicate a REGISTER_UPDATE intent should be sent. */
     CONFIGURE_UPDATES,
     /** App fires LINK intent to request user to open to link. */
-    LINK
+    LINK,
+    /** App receives MEDIA_STATUS intent when the MediaResponse status is updated from user. */
+    MEDIA_STATUS
 }
 
 /**
@@ -136,7 +139,9 @@ export enum BuiltInArgNames {
     /** Update registration value argument. */
     REGISTER_UPDATE,
     /** Link request result argument. */
-    LINK
+    LINK,
+    /** MediaStatus value argument. */
+    MEDIA_STATUS
 }
 
 /**
@@ -183,6 +188,10 @@ export enum SurfaceCapabilities {
      * The ability to output on a screen
      */
     SCREEN_OUTPUT,
+    /**
+     * The ability to output a MediaResponse
+     */
+    MEDIA_RESPONSE_AUDIO,
     /**
      * The ability to open a web URL
      */
@@ -237,6 +246,18 @@ export enum SignInStatus {
     ERROR
 }
 
+/**
+ * SKU (Stock Keeping Units) types for Play Package Entitlements.
+ */
+export enum EntitlementSkuTypes {
+    /** In app purchase */
+    IN_APP,
+    /** In app subscription */
+    SUBSCRIPTION,
+    /** Paid app. */
+    APP
+}
+
 /**
  * Possible update trigger time context frequencies.
  */
@@ -344,6 +365,33 @@ export interface User {
     userStorage: string;
 }
 
+/**
+ * Google Play Android App Package Entitlements.
+ */
+export interface PackageEntitlement {
+    /** Name of the Android app package. */
+    packageName: string;
+    /** List of entitlements for a given app. */
+    entitlements: Entitlement[];
+}
+
+/**
+ * A user's digital entitlement.
+ */
+export interface Entitlement {
+    /** Product SKU. Matches getSku() in Google Play InApp Billing API. */
+    sku: string;
+    /** The type of SKU. One of EntitlementSkuType. */
+    skuType: string;
+    /** For in app purchases/subscriptions, relevant details. */
+    inAppDetails: {
+        /** JSON data of the in app purchase. */
+        inAppPurchaseData: object;
+        /** Matches IN_APP_DATA_SIGNATURE from getPurchases() method in Play InApp Billing API. */
+        inAppDataSignature: object;
+    };
+}
+
 /**
  * Actions on Google Surface.
  */
@@ -472,6 +520,16 @@ export class AssistantApp {
      */
     readonly Transactions: typeof TransactionValues;
 
+    /**
+     * Values related to supporting {@link Media}.
+     */
+    readonly Media: typeof MediaValues;
+
+    /**
+     * SKU (Stock Keeping Units) types for Play Package Entitlements.
+     */
+    readonly EntitlementSkuTypes: typeof EntitlementSkuTypes;
+
     /**
      * Possible update trigger time context frequencies.
      */
@@ -1384,6 +1442,20 @@ export class AssistantApp {
      */
     getLastSeen(): Date | null;
 
+    /**
+     * Get the the list of all digital goods that your user purchased from
+     * your published Android apps. To enable this feature, see the instructions
+     * in the (documentation)[https://developers.google.com/actions/identity/digital-goods].
+     *
+     * @example
+     * const app = new DialogflowApp({request, response});
+     * const packageEntitlements = app.getPackageEntitlements();
+     *
+     * @return The list of digital goods purchased by the user in
+     *     any verified Android app package. Null if no Package Entitlements present in the request.
+     */
+    getPackageEntitlements(): PackageEntitlement[] | null;
+
     /**
      * If granted permission to device's location in previous intent, returns device's
      * location (see {@link AssistantApp#askForPermissions|askForPermissions}).
@@ -1488,6 +1560,31 @@ export class AssistantApp {
      */
     getSignInStatus(): string;
 
+    /**
+     * Get status of MEDIA_STATUS intent.
+     *
+     * @example
+     * const app = new DialogflowApp({request: request, response: response});
+     *
+     * function mediaStatusIntent (app) {
+     *   const status = app.getMediaStatus();
+     *   if (status === app.Media.Status.FINISHED) {
+     *     app.tell('Oh, I see you are done playing the media!');
+     *   } else {
+     *     app.tell(`I don't understand the current media status: ${status}`);
+     *   }
+     * }
+     *
+     * const actionMap = new Map();
+     * actionMap.set(app.StandardIntents.MEDIA_STATUS, mediaStatusIntent);
+     * app.handleRequest(actionMap);
+     *
+     * @return Result of media status intent.
+     * @dialogflow
+     * @actionssdk
+     */
+    getMediaStatus(): MediaValues.Status | null;
+
     /**
      * Returns true if user device has a given surface capability.
      *
@@ -1694,6 +1791,13 @@ export class AssistantApp {
      */
     buildCarousel(): Carousel;
 
+    /**
+     * Constructs a Browse Carousel with chainable property setters.
+     *
+     * @return Constructed Browse Carousel.
+     */
+    buildBrowseCarousel(): BrowseCarousel;
+
     /**
      * Constructs OptionItem with chainable property setters.
      *
@@ -1706,6 +1810,15 @@ export class AssistantApp {
      */
     buildOptionItem(key?: string, synonyms?: string | string[]): OptionItem;
 
+    /**
+     * Constructs BrowseItem for the Browse Carousel with chainable property setters.
+     *
+     * @param title The displayed title of the Browse Carousel card.
+     * @param url The URL linked to by clicking the card.
+     * @return Constructed BrowseItem.
+     */
+    buildBrowseItem(title?: string, url?: string): BrowseItem;
+
     // ---------------------------------------------------------------------------
     //                   Transaction Builders
     // ---------------------------------------------------------------------------
@@ -1746,4 +1859,24 @@ export class AssistantApp {
      * @return Constructed OrderUpdate.
      */
     buildOrderUpdate(orderId: string, isGoogleOrderId: boolean): OrderUpdate;
+
+    // ---------------------------------------------------------------------------
+    //                   Media Builders
+    // ---------------------------------------------------------------------------
+
+    /**
+     * Constructs Media Response with chainable property setters.
+     *
+     * @return Constructed Media Response.
+     */
+    buildMediaResponse(): MediaResponse;
+
+    /**
+     * Constructs MediaObject with chainable property setters.
+     *
+     * @param name Name of media file.
+     * @param contentUrl Location of media file.
+     * @return Constructed MediaObject.
+     */
+    buildMediaObject(name: string, contentUrl: string): MediaObject;
 }
diff --git a/types/actions-on-google/index.d.ts b/types/actions-on-google/index.d.ts
index 0260bc6cee..943554586f 100644
--- a/types/actions-on-google/index.d.ts
+++ b/types/actions-on-google/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for actions-on-google 1.9
+// Type definitions for actions-on-google 1.10
 // Project: https://github.com/actions-on-google/actions-on-google-nodejs
 // Definitions by: Joel Hegg <https://github.com/joelhegg>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/actions-on-google/response-builder.d.ts b/types/actions-on-google/response-builder.d.ts
index 966c881ba6..9844fe45c1 100644
--- a/types/actions-on-google/response-builder.d.ts
+++ b/types/actions-on-google/response-builder.d.ts
@@ -27,6 +27,53 @@ export enum ImageDisplays {
     CROPPED
 }
 
+/**
+ * Values related to supporting media.
+ */
+export namespace MediaValues {
+    /**
+     * Type of the media within a MediaResponse.
+     */
+    enum Type {
+        /**
+         * Unspecified.
+         */
+        MEDIA_TYPE_UNSPECIFIED,
+        /**
+         * Audio stream.
+         */
+        AUDIO
+    }
+
+    /**
+     * List of media control status' returned.
+     */
+    enum Status {
+        /**
+         * Unspecified.
+         */
+        UNSPECIFIED,
+        /**
+         * Finished.
+         */
+        FINISHED
+    }
+
+    /**
+     * List of possible item types.
+     */
+    enum ImageType {
+        /**
+         * Icon.
+         */
+        ICON,
+        /**
+         * Large image.
+         */
+        LARGE
+    }
+}
+
 /**
  * Simple Response type.
  */
@@ -155,6 +202,22 @@ export class RichResponse {
      */
     addBasicCard(basicCard: BasicCard): RichResponse;
 
+    /**
+     * Adds media to this response.
+     *
+     * @param mediaResponse MediaResponse to include in response.
+     * @return Returns current constructed RichResponse.
+     */
+    addMediaResponse(mediaResponse: MediaResponse): RichResponse;
+
+    /**
+     * Adds a Browse Carousel to list of items.
+     *
+     * @param browseCarousel Browse Carousel to present to user
+     * @return Returns current constructed RichResponse.
+     */
+    addBrowseCarousel(browseCarousel: string | BrowseCarousel): RichResponse;
+
     /**
      * Adds a single suggestion or list of suggestions to list of items.
      *
@@ -325,6 +388,43 @@ export class List {
     addItems(optionItems: OptionItem | OptionItem[]): List;
 }
 
+/**
+ * Class for initializing and constructing BrowseCarousel with chainable interface.
+ */
+export class BrowseCarousel {
+    /**
+     * Constructor for BrowseCarousel. Accepts optional BrowseCarousel to
+     * clone or list of items to copy.
+     *
+     * @param carousel Either a carousel to clone
+     *     or an array of BrowseItem to initialize a new carousel
+     */
+    constructor(carousel?: BrowseCarousel | BrowseItem[]);
+
+    /**
+     * List of 2-20 items to show in this carousel. Required.
+     */
+    items: BrowseItem[];
+
+     /**
+      * Adds a single item or list of items to the carousel.
+      *
+      * @param browseItems BrowseItems to add.
+      * @return Returns current constructed BrowseCarousel.
+      */
+    addItems(browseItems: BrowseItem | BrowseItem[]): BrowseCarousel;
+
+    /**
+     * Sets the display options for the images in this carousel.
+     * Use one of the image display constants. If none is chosen,
+     * ImageDisplays.DEFAULT will be enforced.
+     *
+     * @param option The option for displaying the image.
+     * @return Returns current constructed BrowseCarousel.
+     */
+    setImageDisplay(option: ImageDisplays): BrowseCarousel;
+}
+
 /**
  * Class for initializing and constructing Carousel with chainable interface.
  */
@@ -362,6 +462,110 @@ export class Carousel {
     setImageDisplay(option: ImageDisplays): Carousel;
 }
 
+/**
+ * Class for initializing and constructing Option Items with chainable interface.
+ */
+export class BrowseItem {
+    /**
+     * Constructor for BrowseItem. Accepts a title and URL for the Browse Item
+     * card.
+     *
+     * @param title The title of the Browse Item card.
+     * @param url The URL of the link opened by clicking the  Browse Item card.
+     */
+    constructor(title?: string, url?: string);
+
+    /**
+     * Title of the browse item. Required.
+     */
+    title: string;
+
+    /**
+     * Description text of the item. Optional.
+     */
+    description?: string;
+
+    /**
+     * Footer text of the item. Optional.
+     */
+    footer?: string;
+
+    /**
+     * Image to show on item. Optional.
+     */
+    image?: Image;
+
+    /**
+     * Url to that clicking the card opens. Optional.
+     */
+    openUrlAction?: object;
+
+    /**
+     * @return Returns the possible valid values for URL type hints
+     */
+    urlTypeHints(): object;
+
+    /**
+     * Sets the title for this Browse Item.
+     *
+     * @param title Title to show on item.
+     * @return Returns current constructed BrowseItem.
+     */
+    setTitle(title: string): BrowseItem;
+
+    /**
+     * Sets the description for this Browse Item.
+     *
+     * @param description Description to show on item.
+     * @return Returns current constructed BrowseItem.
+     */
+    setDescription(description: string): BrowseItem;
+
+    /**
+     * Sets the footer for this Browse Item.
+     *
+     * @param footerText text to show on item.
+     * @return Returns current constructed BrowseItem.
+     */
+    setFooter(footerText: string): BrowseItem;
+
+    /**
+     * Sets the image for this Browse Item.
+     *
+     * @param url Image source URL.
+     * @param accessibilityText Text to replace for image for accessibility.
+     * @param width Width of the image.
+     * @param height Height of the image.
+     * @return Returns current constructed BrowseItem.
+     */
+    setImage(url: string, accessibilityText: string, width?: number, height?: number): BrowseItem;
+
+    /**
+     * Sets the Open URL action - which includes the url and possibly the typeHint
+     *
+     * @param url Image source URL.
+     * @param urlTypeHint One of the typeHints enumerated by this.urlTypeHints()
+     * @return Returns the current constructed BrowseItem
+     */
+    setOpenUrlAction(url: string, urlTypeHint?: string): BrowseItem;
+
+    /**
+     * Sets the URL target of the BrowseItem card
+     *
+     * @param url Image source URL.
+     * @return Returns the current constructed BrowseItem
+     */
+    setUrl(url: string): BrowseItem;
+
+    /**
+     * Sets the URL type hint for the BrowseItem card
+     *
+     * @param urlTypeHint One of the typeHints enumerated by this.urlTypeHints()
+     * @return Returns the current constructed BrowseItem
+     */
+    setUrlTypeHint(urlTypeHint: string): BrowseItem;
+}
+
 /**
  * Class for initializing and constructing Option Items with chainable interface.
  */
@@ -440,6 +644,90 @@ export class OptionItem {
     addSynonyms(synonyms: string | string[]): OptionItem;
 }
 
+/**
+ * Class for initializing and constructing MediaResponse with chainable interface.
+ */
+export class MediaResponse {
+    /**
+     * Constructor for MediaResponse.
+     * @param mediaType Type of the media which defaults to MediaValues.Type.AUDIO
+     */
+    constructor(mediaType: MediaValues.Type);
+
+    /**
+     * Array of MediaObject held in the MediaResponse.
+     */
+    mediaObjects: MediaObject[];
+
+    /**
+     * Type of the media within this MediaResponse
+     */
+    mediaType: MediaValues.Type;
+
+    /**
+     * Adds a single media file or list of media files to the cart.
+     *
+     * @param items Single or Array of MediaObject to add.
+     * @return Returns current constructed MediaResponse.
+     */
+    addMediaObjects(items: MediaObject | MediaObject[]): MediaResponse;
+}
+
+/**
+ * Class for initializing and constructing MediaObject with chainable interface.
+ */
+export class MediaObject {
+    /**
+     * Constructor for MediaObject.
+     *
+     * @param name Name of the MediaObject.
+     * @param contentUrl URL of the MediaObject.
+     */
+    constructor(name: string, contentUrl: string);
+
+    /**
+     * Name of the MediaObject.
+     */
+    name: string;
+
+    /**
+     * MediaObject URL.
+     */
+    contentUrl: string;
+
+    /**
+     * Description of the MediaObject.
+     */
+    description?: string;
+
+    /**
+     * Large image.
+     */
+    largeImage?: Image;
+
+    /**
+     * Icon image.
+     */
+    icon?: Image;
+
+    /**
+     * Set the description of the item.
+     *
+     * @param description Description of the item.
+     * @return Returns current constructed MediaObject.
+     */
+    setDescription(description: string): MediaObject;
+
+    /**
+     * Sets the image for this item.
+     *
+     * @param url Image source URL.
+     * @param type Type of image (LARGE or ICON).
+     * @return Returns current constructed MediaObject.
+     */
+    setImage(url: string, type: MediaValues.ImageType): MediaObject;
+}
+
 /**
  * Check if given text contains SSML.
  * @param text Text to check.

From f87445077bf246a5a72a64fbb9749fefe1e576c2 Mon Sep 17 00:00:00 2001
From: Yoyo Zhou <yoyo@captain401.com>
Date: Wed, 4 Apr 2018 06:58:01 -0700
Subject: [PATCH 1059/1382] big.js: add aliases .add, .mul, .sub (#24708)

---
 types/big.js/index.d.ts                  | 18 ++++++++++++++++++
 types/big.js/test/big.js-global-tests.ts |  3 +++
 types/big.js/test/big.js-module-tests.ts |  3 +++
 3 files changed, 24 insertions(+)

diff --git a/types/big.js/index.d.ts b/types/big.js/index.d.ts
index 405622f7ee..8b61c73d37 100644
--- a/types/big.js/index.d.ts
+++ b/types/big.js/index.d.ts
@@ -102,6 +102,12 @@ export interface BigConstructor {
 export interface Big {
     /** Returns a Big number whose value is the absolute value, i.e. the magnitude, of this Big number. */
     abs(): Big;
+    /**
+     * Returns a Big number whose value is the value of this Big number plus n - alias for .plus().
+     *
+     * @throws `NaN` if n is invalid.
+     */
+    add(n: BigSource): Big;
     /**
      * Compare the values.
      *
@@ -162,6 +168,12 @@ export interface Big {
      * @throws `NaN` if n is negative or otherwise invalid.
      */
     mod(n: BigSource): Big;
+    /**
+     * Returns a Big number whose value is the value of this Big number times n - alias for .times().
+     *
+     * @throws `NaN` if n is invalid.
+     */
+    mul(n: BigSource): Big;
     /**
      * Returns a Big number whose value is the value of this Big number plus n.
      *
@@ -196,6 +208,12 @@ export interface Big {
      * @throws `NaN` if this Big number is negative.
      */
     sqrt(): Big;
+    /**
+     * Returns a Big number whose value is the value of this Big number minus n - alias for .minus().
+     *
+     * @throws `NaN` if n is invalid.
+     */
+    sub(n: BigSource): Big;
     /**
      * Returns a Big number whose value is the value of this Big number times n.
      *
diff --git a/types/big.js/test/big.js-global-tests.ts b/types/big.js/test/big.js-global-tests.ts
index 578391de7b..a57e748fbf 100644
--- a/types/big.js/test/big.js-global-tests.ts
+++ b/types/big.js/test/big.js-global-tests.ts
@@ -86,6 +86,7 @@ function minusTests() {
     0.3 - 0.1; // 0.19999999999999998
     const x = new Big(0.3);
     x.minus(0.1); // '0.2'
+    x.sub(0.1); // '0.2'
 }
 
 function modTests() {
@@ -99,6 +100,7 @@ function plusTests() {
     const x = new Big(0.1);
     const y = x.plus(0.2); // '0.3'
     Big(0.7).plus(x).plus(y); // '1'
+    Big(0.7).add(x).add(y); // '1'
 }
 
 function powTests() {
@@ -138,6 +140,7 @@ function timesTests() {
     const x = new Big(0.6);
     const y = x.times(3); // '1.8'
     Big('7e+500').times(y); // '1.26e+501'
+    Big('7e+500').mul(y); // '1.26e+501'
 }
 
 function toExponentialTests() {
diff --git a/types/big.js/test/big.js-module-tests.ts b/types/big.js/test/big.js-module-tests.ts
index 056d41727b..62e5ba491e 100644
--- a/types/big.js/test/big.js-module-tests.ts
+++ b/types/big.js/test/big.js-module-tests.ts
@@ -88,6 +88,7 @@ function minusTests() {
     0.3 - 0.1; // 0.19999999999999998
     const x = new Big(0.3);
     x.minus(0.1); // '0.2'
+    x.sub(0.1); // '0.2'
 }
 
 function modTests() {
@@ -101,6 +102,7 @@ function plusTests() {
     const x = new Big(0.1);
     const y = x.plus(0.2); // '0.3'
     Big(0.7).plus(x).plus(y); // '1'
+    Big(0.7).add(x).add(y); // '1'
 }
 
 function powTests() {
@@ -140,6 +142,7 @@ function timesTests() {
     const x = new Big(0.6);
     const y = x.times(3); // '1.8'
     Big('7e+500').times(y); // '1.26e+501'
+    Big('7e+500').mul(y); // '1.26e+501'
 }
 
 function toExponentialTests() {

From d6e5b0002e219eb563cf35e1fe938d3b6040625c Mon Sep 17 00:00:00 2001
From: Arylo <arylo.open@gmail.com>
Date: Thu, 5 Apr 2018 00:05:01 +0800
Subject: [PATCH 1060/1382] Add Test Unit and Fix some problems

---
 types/gitlab/ApiBase.d.ts                     |  8 ++-
 types/gitlab/ApiBaseHTTP.d.ts                 |  5 +-
 types/gitlab/ApiV3.d.ts                       |  4 +-
 types/gitlab/BaseModel.d.ts                   | 23 ++++----
 types/gitlab/Models/Groups.d.ts               | 18 +++++--
 types/gitlab/Models/IssueNotes.d.ts           |  6 ++-
 types/gitlab/Models/Issues.d.ts               | 16 +++---
 types/gitlab/Models/Labels.d.ts               |  5 +-
 types/gitlab/Models/Notes.d.ts                |  5 +-
 types/gitlab/Models/Pipelines.d.ts            |  5 +-
 types/gitlab/Models/ProjectBuilds.d.ts        | 15 ++++--
 types/gitlab/Models/ProjectDeployKeys.d.ts    |  9 ++--
 types/gitlab/Models/ProjectHooks.d.ts         | 18 ++++---
 types/gitlab/Models/ProjectIssues.d.ts        |  9 +++-
 types/gitlab/Models/ProjectLabels.d.ts        |  6 ++-
 types/gitlab/Models/ProjectMembers.d.ts       | 16 +++---
 types/gitlab/Models/ProjectMergeRequests.d.ts | 16 +++---
 types/gitlab/Models/ProjectMilestones.d.ts    | 16 +++---
 types/gitlab/Models/ProjectRepository.d.ts    | 38 +++++++++-----
 types/gitlab/Models/ProjectServices.d.ts      | 11 ++--
 types/gitlab/Models/Projects.d.ts             | 52 +++++++++++++++----
 types/gitlab/Models/Runners.d.ts              | 11 ++--
 types/gitlab/Models/UserKeys.d.ts             |  7 +--
 types/gitlab/Models/Users.d.ts                | 17 ++++--
 types/gitlab/gitlab-tests.ts                  | 20 +++++++
 types/gitlab/index.d.ts                       | 10 ++--
 types/gitlab/tsconfig.json                    |  1 +
 27 files changed, 253 insertions(+), 114 deletions(-)

diff --git a/types/gitlab/ApiBase.d.ts b/types/gitlab/ApiBase.d.ts
index b8566f3ccb..9d525be7a4 100644
--- a/types/gitlab/ApiBase.d.ts
+++ b/types/gitlab/ApiBase.d.ts
@@ -5,8 +5,14 @@ import { Issues } from './Models/Issues.d';
 import { Projects } from './Models/Projects.d';
 import { Groups } from './Models/Groups.d';
 
+export interface IApiBase {
+    url?: string;
+    token?: string;
+    [key: string]: any;
+}
+
 export class ApiBase {
-    constructor(options: object);
+    constructor(options: IApiBase);
     public groups: Groups
     public projects: Projects
     public issues: Issues
diff --git a/types/gitlab/ApiBaseHTTP.d.ts b/types/gitlab/ApiBaseHTTP.d.ts
index 2de92b6c74..41ab7a2bca 100644
--- a/types/gitlab/ApiBaseHTTP.d.ts
+++ b/types/gitlab/ApiBaseHTTP.d.ts
@@ -1,6 +1,9 @@
-export class ApiBaseHTTP {
+import { ApiBase } from './ApiBase.d';
+
+export class ApiBaseHTTP extends ApiBase {
     public prepare_opts<T>(opts: T): T;
     public fn_wrapper(fn: Function): Function;
+    public get(path: string, fn?: Function): any;
     public get(path: string, query?: object, fn?: Function): any;
     public delete(path: string, fn?: Function): any;
     public post(path: string, data?: object, fn?: Function): any;
diff --git a/types/gitlab/ApiV3.d.ts b/types/gitlab/ApiV3.d.ts
index 762f8824d6..17fe81928e 100644
--- a/types/gitlab/ApiV3.d.ts
+++ b/types/gitlab/ApiV3.d.ts
@@ -1,3 +1,5 @@
-export class ApiV3 {
+import { ApiBaseHTTP } from './ApiBaseHTTP.d';
+
+export class ApiV3 extends ApiBaseHTTP {
 
 }
diff --git a/types/gitlab/BaseModel.d.ts b/types/gitlab/BaseModel.d.ts
index e801ccf654..8f64621ac9 100644
--- a/types/gitlab/BaseModel.d.ts
+++ b/types/gitlab/BaseModel.d.ts
@@ -1,14 +1,17 @@
 export class BaseModel {
     public load(model: string): object;
-    public get(): any
-    public post(): any
-    public put(): any
-    public delete(): any
-    public debug(): any
+    public get(path: string, fn?: Function): any;
+    public get(path: string, query?: object, fn?: Function): any;
+    public delete(path: string, fn?: Function): any;
+    public post(path: string, data?: object, fn?: Function): any;
+    public put(path: string, data?: object, fn?: Function): any;
+    public patch(path: string, data?: object, fn?: Function): any;
 }
-export interface PageDefualtParams {
-    page?: number
-    per_page?: number
-    [key: string]: any
+
+export interface IDefParams {
+    page?: number;
+    per_page?: number;
+    [key: string]: any;
 }
-export type TypeNumOrStrId = number | string;
+
+export type TId = number | string;
diff --git a/types/gitlab/Models/Groups.d.ts b/types/gitlab/Models/Groups.d.ts
index f8ad983f4a..ed21ecac47 100644
--- a/types/gitlab/Models/Groups.d.ts
+++ b/types/gitlab/Models/Groups.d.ts
@@ -1,12 +1,24 @@
-import { BaseModel } from "../BaseModel";
+import { BaseModel, IDefParams } from "../BaseModel";
+
+interface IAccessLevels {
+    GUEST: number
+    REPORTER: number
+    DEVELOPER: number
+    MASTER: number
+    OWNER: number
+}
 
 export class Groups extends BaseModel {
+    public readonly access_levels: IAccessLevels;
+
     public init(): object;
-    public all(params?: object, fn?: Function): any;
+    public all(fn?: Function): any;
+    public all(params?: IDefParams, fn?: Function): any;
     public show(groupId: number, fn?: Function): any;
     public listProjects(groupId: number, fn?: Function): any;
     public listMembers(groupId: number, fn?: Function): any;
-    public editMember(groupId: number, userId: number, accessLevel: number, fn?: Function): any;
+    public addMember(groupId: number, userId: number, accessLevel: IAccessLevels[keyof IAccessLevels], fn?: Function): any;
+    public editMember(groupId: number, userId: number, accessLevel: IAccessLevels[keyof IAccessLevels], fn?: Function): any;
     public removeMember(groupId: number, userId: number, fn?: Function): any;
     public create(params?: object, fn?: Function): any;
     public addProject(groupId: number, projectId: number, fn?: Function): any;
diff --git a/types/gitlab/Models/IssueNotes.d.ts b/types/gitlab/Models/IssueNotes.d.ts
index aeb7c5944b..a40855f293 100644
--- a/types/gitlab/Models/IssueNotes.d.ts
+++ b/types/gitlab/Models/IssueNotes.d.ts
@@ -1,4 +1,6 @@
-import { BaseModel } from './../BaseModel.d';
+import { BaseModel, TId, IDefParams } from '../BaseModel.d';
+
 export class IssueNotes extends BaseModel{
-    public all(projectId: number | string, issueId: number, params?: object, fn?: Function): any
+    public all(projectId: TId, issueId: number, fn?: Function): any
+    public all(projectId: TId, issueId: number, params?: IDefParams, fn?: Function): any
 }
diff --git a/types/gitlab/Models/Issues.d.ts b/types/gitlab/Models/Issues.d.ts
index 9fcc585ea0..a0ca51c6ab 100644
--- a/types/gitlab/Models/Issues.d.ts
+++ b/types/gitlab/Models/Issues.d.ts
@@ -1,10 +1,12 @@
-import { BaseModel } from './../BaseModel.d';
+import { BaseModel, TId } from '../BaseModel.d';
+
 export class Issues extends BaseModel {
+    public all(fn?: Function): any;
     public all(params?: object, fn?: Function): any;
-    public show(projectId: number | string, issueId: number | string, fn?: Function): any;
-    public create(projectId: number | string, params?: object, fn?: Function): any;
-    public edit(projectId: number | string, issueId: number | string, params?: object, fn?: Function): any;
-    public remove(projectId: number | string, issueId: number | string, fn?: Function): any;
-    public subscribe(projectId: number | string, issueId: number | string, params?: object, fn?: Function): any;
-    public unsubscribe(projectId: number | string, issueId: number | string, fn?: Function): any;
+    public show(projectId: TId, issueId: TId, fn?: Function): any;
+    public create(projectId: TId, params?: object, fn?: Function): any;
+    public edit(projectId: TId, issueId: TId, params?: object, fn?: Function): any;
+    public remove(projectId: TId, issueId: TId, fn?: Function): any;
+    public subscribe(projectId: TId, issueId: TId, params?: object, fn?: Function): any;
+    public unsubscribe(projectId: TId, issueId: TId, fn?: Function): any;
 }
diff --git a/types/gitlab/Models/Labels.d.ts b/types/gitlab/Models/Labels.d.ts
index b7529b320c..c323b0777b 100644
--- a/types/gitlab/Models/Labels.d.ts
+++ b/types/gitlab/Models/Labels.d.ts
@@ -1,4 +1,5 @@
-import { BaseModel } from './../BaseModel.d';
+import { BaseModel, TId } from '../BaseModel.d';
+
 export class Labels extends BaseModel {
-    public create(projectId: number | string, params?: object, fn?: Function): any;
+    public create(projectId: TId, params?: object, fn?: Function): any;
 }
diff --git a/types/gitlab/Models/Notes.d.ts b/types/gitlab/Models/Notes.d.ts
index 8a85dcbedc..50fd1e4da7 100644
--- a/types/gitlab/Models/Notes.d.ts
+++ b/types/gitlab/Models/Notes.d.ts
@@ -1,4 +1,5 @@
-import { BaseModel } from './../BaseModel.d';
+import { BaseModel, TId } from '../BaseModel.d';
+
 export class Notes extends BaseModel {
-    public create(projectId: number | string, issueId: number, params?: object, fn?: Function): any;
+    public create(projectId: TId, issueId: number, params?: object, fn?: Function): any;
 }
diff --git a/types/gitlab/Models/Pipelines.d.ts b/types/gitlab/Models/Pipelines.d.ts
index bfddc099f9..8315508214 100644
--- a/types/gitlab/Models/Pipelines.d.ts
+++ b/types/gitlab/Models/Pipelines.d.ts
@@ -1,4 +1,5 @@
-import { BaseModel } from './../BaseModel.d';
+import { BaseModel, TId } from '../BaseModel.d';
+
 export class Pipelines extends BaseModel {
-    public all(projectId: number | string, fn?: Function): any;
+    public all(projectId: TId, fn?: Function): any;
 }
diff --git a/types/gitlab/Models/ProjectBuilds.d.ts b/types/gitlab/Models/ProjectBuilds.d.ts
index 5bc9fbaa3d..8714f27b1b 100644
--- a/types/gitlab/Models/ProjectBuilds.d.ts
+++ b/types/gitlab/Models/ProjectBuilds.d.ts
@@ -1,6 +1,13 @@
-import { BaseModel } from './../BaseModel.d';
+import { BaseModel, TId, IDefParams } from '../BaseModel.d';
+
+interface IShowBuildParam {
+    projectId: TId;
+    [key: string]: any;
+}
+
 export class ProjectBuilds extends BaseModel {
-    public listBuilds(projectId: number | string, params?: { page?: number, per_page?: number, [key: string]: any }, fn?: Function): any;
-    public showBuild(projectId: number | string, buildId: string, fn?: Function): any;
-    public showBuild(params?: { projectId: number | string}, fn?: Function): any;
+    public listBuilds(projectId: TId, fn?: Function): any;
+    public listBuilds(projectId: TId, params?: IDefParams, fn?: Function): any;
+    public showBuild(projectId: TId, buildId: string, fn?: Function): any;
+    public triggerBuild(params?: IShowBuildParam, fn?: Function): any;
 }
diff --git a/types/gitlab/Models/ProjectDeployKeys.d.ts b/types/gitlab/Models/ProjectDeployKeys.d.ts
index be6af6a170..8cadac8507 100644
--- a/types/gitlab/Models/ProjectDeployKeys.d.ts
+++ b/types/gitlab/Models/ProjectDeployKeys.d.ts
@@ -1,6 +1,7 @@
-import { BaseModel } from './../BaseModel.d';
+import { BaseModel, TId } from '../BaseModel.d';
+
 export class ProjectKeys extends BaseModel {
-    public listKeys(projectId: number | string, fn?: Function): any;
-    public getKey(projectId: number | string, keyId: number, fn?: Function): any;
-    public addKey(projectId: number | string, params?: object, fn?: Function): any;
+    public listKeys(projectId: TId, fn?: Function): any;
+    public getKey(projectId: TId, keyId: number, fn?: Function): any;
+    public addKey(projectId: TId, params?: object, fn?: Function): any;
 }
diff --git a/types/gitlab/Models/ProjectHooks.d.ts b/types/gitlab/Models/ProjectHooks.d.ts
index 399dc18e7f..775e1348fc 100644
--- a/types/gitlab/Models/ProjectHooks.d.ts
+++ b/types/gitlab/Models/ProjectHooks.d.ts
@@ -1,8 +1,14 @@
-import { BaseModel } from './../BaseModel.d';
+import { BaseModel, TId } from '../BaseModel.d';
+
+interface IAddParam {
+    url: string;
+    [key: string]: any;
+}
+
 export class ProjectHooks extends BaseModel {
-    public list(projectId: number | string, fn?: Function): any;
-    public show(projectId: number | string, hookId: number, fn?: Function): any;
-    public add(projectId: number | string, params: object|string, fn?: Function): any;
-    public update(projectId: number | string, hookId: number, url: any, fn?: Function): any;
-    public remove(projectId: number | string, hookId: number, fn?: Function): any;
+    public list(projectId: TId, fn?: Function): any;
+    public show(projectId: TId, hookId: number, fn?: Function): any;
+    public add(projectId: TId, params: IAddParam | string, fn?: Function): any;
+    public update(projectId: TId, hookId: number, url: any, fn?: Function): any;
+    public remove(projectId: TId, hookId: number, fn?: Function): any;
 }
diff --git a/types/gitlab/Models/ProjectIssues.d.ts b/types/gitlab/Models/ProjectIssues.d.ts
index ee61cfca3f..95bbc99bed 100644
--- a/types/gitlab/Models/ProjectIssues.d.ts
+++ b/types/gitlab/Models/ProjectIssues.d.ts
@@ -1,4 +1,9 @@
-import { BaseModel } from './../BaseModel.d';
+import { IssueNotes } from './IssueNotes.d';
+import { BaseModel, TId, IDefParams } from '../BaseModel.d';
+
 export class ProjectIssues extends BaseModel {
-    public list(projectId: number | string, params: { page?: number, per_page?: number, [key: string]: any }, fn?: Function): any;
+    public readonly notes: IssueNotes;
+
+    public list(projectId: TId, fn?: Function): any;
+    public list(projectId: TId, params?: IDefParams, fn?: Function): any;
 }
diff --git a/types/gitlab/Models/ProjectLabels.d.ts b/types/gitlab/Models/ProjectLabels.d.ts
index 23d12ca652..7fa178843c 100644
--- a/types/gitlab/Models/ProjectLabels.d.ts
+++ b/types/gitlab/Models/ProjectLabels.d.ts
@@ -1,4 +1,6 @@
-import { BaseModel } from './../BaseModel.d';
+import { BaseModel, TId, IDefParams } from '../BaseModel.d';
+
 export class ProjectLabels extends BaseModel {
-    public all(projectId: number | string, params: { page?: number, per_page?: number, [key: string]: any }, fn?: Function): any;
+    public all(projectId: TId, fn?: Function): any;
+    public all(projectId: TId, params?: IDefParams, fn?: Function): any;
 }
diff --git a/types/gitlab/Models/ProjectMembers.d.ts b/types/gitlab/Models/ProjectMembers.d.ts
index 79b9e11b02..baf92668c9 100644
--- a/types/gitlab/Models/ProjectMembers.d.ts
+++ b/types/gitlab/Models/ProjectMembers.d.ts
@@ -1,8 +1,12 @@
-import { BaseModel } from './../BaseModel.d';
+import { BaseModel, TId } from '../BaseModel.d';
+
+type MenberCb = (menber: any) => any;
+type MenbersCb = (menbers: any[]) => any;
+
 export class ProjectMembers extends BaseModel {
-    public list(projectId: number | string, fn?: Function): any;
-    public show(projectId: number | string, userId: number, fn?: Function): any;
-    public add(projectId: number | string, userId: number, accessLevel: number,fn?: Function): any;
-    public update(projectId: number | string, userId: number, accessLevel: number, fn?: Function): any;
-    public remove(projectId: number | string, userId: number, fn?: Function): any;
+    public list(projectId: TId, fn?: MenbersCb): any;
+    public show(projectId: TId, userId: number, fn?: MenberCb): any;
+    public add(projectId: TId, userId: number, accessLevel: number,fn?: Function): any;
+    public update(projectId: TId, userId: number, accessLevel: number, fn?: Function): any;
+    public remove(projectId: TId, userId: number, fn?: Function): any;
 }
diff --git a/types/gitlab/Models/ProjectMergeRequests.d.ts b/types/gitlab/Models/ProjectMergeRequests.d.ts
index f2043e79d5..b3898bfac4 100644
--- a/types/gitlab/Models/ProjectMergeRequests.d.ts
+++ b/types/gitlab/Models/ProjectMergeRequests.d.ts
@@ -1,9 +1,11 @@
-import { BaseModel } from './../BaseModel.d';
+import { BaseModel, TId, IDefParams } from '../BaseModel.d';
+
 export class ProjectMergeRequests extends BaseModel {
-    public list(projectId: number | string, params: { page?: number, per_page?: number, [key: string]: any }, fn?: Function): any;
-    public show(projectId: number | string, mergerequestId: number, fn?: Function): any;
-    public add(projectId: number | string, sourceBranch: any, targetBranch: any, assigneeId: number, title: any, fn?: Function): any;
-    public update(projectId: number | string, mergerequestId: number, params: object, fn?: Function): any;
-    public comment(projectId: number | string, mergerequestId: number, note: any, fn?: Function): any;
-    public merge(projectId: number | string, mergerequestId: number, params: object, fn?: Function): any;
+    public list(projectId: TId, fn?: Function): any;
+    public list(projectId: TId, params?: IDefParams, fn?: Function): any;
+    public show(projectId: TId, mergerequestId: number, fn?: Function): any;
+    public add(projectId: TId, sourceBranch: string, targetBranch: string, assigneeId: number, title: string, fn?: Function): any;
+    public update(projectId: TId, mergerequestId: number, params: object, fn?: Function): any;
+    public comment(projectId: TId, mergerequestId: number, note: any, fn?: Function): any;
+    public merge(projectId: TId, mergerequestId: number, params: object, fn?: Function): any;
 }
diff --git a/types/gitlab/Models/ProjectMilestones.d.ts b/types/gitlab/Models/ProjectMilestones.d.ts
index 9a9da7c025..eeccc96fbf 100644
--- a/types/gitlab/Models/ProjectMilestones.d.ts
+++ b/types/gitlab/Models/ProjectMilestones.d.ts
@@ -1,8 +1,12 @@
-import { BaseModel } from './../BaseModel.d';
+import { BaseModel, TId } from '../BaseModel.d';
+
+type MilestonesCb = (milestones: any[]) => any;
+type MilestoneCb = (milestones: any) => any;
+
 export class ProjectMilestones extends BaseModel {
-    public list(projectId: number | string, fn?: Function): any;
-    public all(projectId: number | string, fn?: Function): any;
-    public show(projectId: number | string, milestoneId: number, fn?: Function): any;
-    public add(projectId: number | string, title: any, description: any, due_date: any, fn?: Function): any;
-    public update(projectId: number | string, milestoneId: number, title: any, description: any, due_date: any, state_event: any, fn?: Function): any;
+    public list(projectId: TId, fn?: MilestonesCb): any;
+    public all(projectId: TId, fn?: MilestonesCb): any;
+    public show(projectId: TId, milestoneId: number, fn?: MilestoneCb): any;
+    public add(projectId: TId, title: string, description: string, due_date: any, fn?: Function): any;
+    public update(projectId: TId, milestoneId: number, title: string, description: string, due_date: any, state_event: any, fn?: Function): any;
 }
diff --git a/types/gitlab/Models/ProjectRepository.d.ts b/types/gitlab/Models/ProjectRepository.d.ts
index e0421e5a7e..85df8bc026 100644
--- a/types/gitlab/Models/ProjectRepository.d.ts
+++ b/types/gitlab/Models/ProjectRepository.d.ts
@@ -1,20 +1,30 @@
-import { BaseModel } from './../BaseModel.d';
+import { BaseModel, TId } from '../BaseModel.d';
+
+interface IShowFileParam {
+    file_path: string;
+    ref?: any;
+    file_id?: any;
+    [key: string]: any;
+}
+
 export class ProjectRepository extends BaseModel {
-    public listBranches(projectId: number | string, fn?: Function): any;
-    public showBranch(projectId: number | string, branchId: string, fn?: Function): any;
-    public protectBranch(projectId: number | string, branchId: string, params: object, fn?: Function): any;
-    public unprotectBranch(projectId: number | string, branchId: string, fn?: Function): any;
+    public listBranches(projectId: TId, fn?: Function): any;
+    public showBranch(projectId: TId, branchId: string, fn?: Function): any;
+    public protectBranch(projectId: TId, branchId: string, params: object, fn?: Function): any;
+    public unprotectBranch(projectId: TId, branchId: string, fn?: Function): any;
     public createBranch(params: object, fn?: Function): any;
-    public deleteBranch(projectId: number | string, branchId: string, fn?: Function): any;
+    public deleteBranch(projectId: TId, branchId: string, fn?: Function): any;
     public addTag(params: object, fn?: Function): any;
-    public deleteTag(projectId: number | string, tagName: string, fn?: Function): any;
-    public showTag(projectId: number | string, tagName: string, fn?: Function): any;
-    public listTags(projectId: number | string, fn?: Function): any;
-    public listCommits(projectId: number | string, fn?: Function): any;
-    public showCommit(projectId: number | string, sha: string, fn?: Function): any;
-    public diffCommit(projectId: number | string, sha: string, fn?: Function): any;
-    public listTree(projectId: number | string, params?: object, fn?: Function): any;
-    public showFile(projectId: number | string, params?: object, fn?: Function): any;
+    public deleteTag(projectId: TId, tagName: string, fn?: Function): any;
+    public showTag(projectId: TId, tagName: string, fn?: Function): any;
+    public listTags(projectId: TId, fn?: Function): any;
+    public listCommits(projectId: TId, fn?: Function): any;
+    public showCommit(projectId: TId, sha: string, fn?: Function): any;
+    public diffCommit(projectId: TId, sha: string, fn?: Function): any;
+    public listTree(projectId: TId, fn?: Function): any;
+    public listTree(projectId: TId, params?: object, fn?: Function): any;
+    public showFile(projectId: TId, fn?: Function): any;
+    public showFile(projectId: TId, params?: IShowFileParam, fn?: Function): any;
     public createFile(params?: object, fn?: Function): any;
     public updateFile(params?: object, fn?: Function): any;
     public compare(params?: object, fn?: Function): any;
diff --git a/types/gitlab/Models/ProjectServices.d.ts b/types/gitlab/Models/ProjectServices.d.ts
index 935e173bce..c3cbd0aee6 100644
--- a/types/gitlab/Models/ProjectServices.d.ts
+++ b/types/gitlab/Models/ProjectServices.d.ts
@@ -1,6 +1,9 @@
-import { BaseModel } from './../BaseModel.d';
+import { BaseModel, TId } from './../BaseModel.d';
+
+type ServiceCb = (service: any) => any;
+
 export class ProjectServices extends BaseModel {
-    public show(projectId: number | string, serviceName: string, fn?: Function): any;
-    public update(projectId: number | string, serviceName: string, params: object, fn?: Function): any;
-    public remove(projectId: number | string, serviceName: string, fn?: Function): any;
+    public show(projectId: TId, serviceName: string, fn?: ServiceCb): any;
+    public update(projectId: TId, serviceName: string, params: object, fn?: ServiceCb): any;
+    public remove(projectId: TId, serviceName: string, fn?: ServiceCb): any;
 }
diff --git a/types/gitlab/Models/Projects.d.ts b/types/gitlab/Models/Projects.d.ts
index dc25e5f418..9a66318a00 100644
--- a/types/gitlab/Models/Projects.d.ts
+++ b/types/gitlab/Models/Projects.d.ts
@@ -1,25 +1,55 @@
-import { BaseModel, PageDefualtParams, TypeNumOrStrId} from './../BaseModel.d';
+import { Runners } from './Runners.d';
+import { Pipelines } from './Pipelines.d';
+import { ProjectBuilds } from './ProjectBuilds.d';
+import { ProjectMergeRequests } from './ProjectMergeRequests.d';
+import { ProjectKeys } from './ProjectDeployKeys.d';
+import { ProjectMilestones } from './ProjectMilestones.d';
+import { ProjectRepository } from './ProjectRepository.d';
+import { ProjectLabels } from './ProjectLabels.d';
+import { ProjectIssues } from './ProjectIssues.d';
+import { ProjectHooks } from './ProjectHooks.d';
+import { ProjectMembers } from './ProjectMembers.d';
+import { BaseModel, IDefParams, TId} from '../BaseModel.d';
+import { ProjectServices } from './ProjectServices.d';
+
+type ProjectsCb = (projects: any[]) => any;
+
 export class Projects extends BaseModel {
-    public all(fn?: Function): any;
-    public all(params?: PageDefualtParams, fn?: Function): any;
-    public allAdmin(fn: Function): any;
-    public allAdmin(params?: PageDefualtParams, fn?: Function): any;
-    public show(projectId: TypeNumOrStrId, fn?: Function): any;
+
+    public readonly members: ProjectMembers;
+    public readonly hooks : ProjectHooks;
+    public readonly issues : ProjectIssues;
+    public readonly labels : ProjectLabels;
+    public readonly repository: ProjectRepository;
+    public readonly milestones: ProjectMilestones;
+    public readonly deploy_keys: ProjectKeys;
+    public readonly merge_requests: ProjectMergeRequests;
+    public readonly services: ProjectServices;
+    public readonly builds: ProjectBuilds;
+    public readonly pipelines: Pipelines;
+    public readonly runners: Runners;
+
+
+    public all(fn?: ProjectsCb): any;
+    public all(params?: IDefParams, fn?: ProjectsCb): any;
+    public allAdmin(fn?: Function): any;
+    public allAdmin(params?: IDefParams, fn?: Function): any;
+    public show(projectId: TId, fn?: Function): any;
     public create(params: object, fn?: Function): any;
     public create_for_user(params: object, fn?: Function): any;
-    public edit(projectId: TypeNumOrStrId, params: object, fn?: Function): any;
+    public edit(projectId: TId, params: object, fn?: Function): any;
     public addMember(params?: object, fn?: Function): any;
     public editMember(params?: object, fn?: Function): any;
     public listMembers(params?: object, fn?: Function): any;
     public listCommits(params?: object, fn?: Function): any;
     public listTags(params?: object, fn?: Function): any;
-    public remove(projectId: TypeNumOrStrId, fn?: Function): any;
+    public remove(projectId: TId, fn?: Function): any;
     public fork(params?: object, fn?: Function): any;
     public share(params?: object, fn?: Function): any;
     public search(projectName: string, fn?: Function): any;
     public search(projectName: string, params?: object, fn?: Function): any;
-    public listTriggers(projectId: TypeNumOrStrId, fn?: Function): any;
-    public showTrigger(projectId: TypeNumOrStrId, token: string, fn?: Function): any;
+    public listTriggers(projectId: TId, fn?: Function): any;
+    public showTrigger(projectId: TId, token: string, fn?: Function): any;
     public createTrigger(params?: object, fn?: Function): any;
-    public removeTrigger(projectId: TypeNumOrStrId, token: string, fn?: Function): any;
+    public removeTrigger(projectId: TId, token: string, fn?: Function): any;
 }
diff --git a/types/gitlab/Models/Runners.d.ts b/types/gitlab/Models/Runners.d.ts
index c65a1e2759..c166a44ff1 100644
--- a/types/gitlab/Models/Runners.d.ts
+++ b/types/gitlab/Models/Runners.d.ts
@@ -1,10 +1,11 @@
-import { BaseModel, PageDefualtParams, TypeNumOrStrId} from './../BaseModel.d';
+import { BaseModel, IDefParams, TId} from '../BaseModel.d';
+
 export class Runners extends BaseModel {
-    public all(projectId?: TypeNumOrStrId, fn?: Function): any;
-    public all(projectId?: TypeNumOrStrId, params?: object, fn?: Function): any;
+    public all(projectId?: TId, fn?: Function): any;
+    public all(projectId?: TId, params?: object, fn?: Function): any;
     public show(runnerId: number, fn?: Function): any;
     public update(runnerId: number, attributes: any, fn?: Function): any;
     public remove(runnerId: number, projectId: any, enable: any, fn?: Function): any;
-    public enable(projectId: TypeNumOrStrId, runnerId: number, fn?: Function): any;
-    public disable(projectId: TypeNumOrStrId, runnerId: number, fn?: Function): any;
+    public enable(projectId: TId, runnerId: number, fn?: Function): any;
+    public disable(projectId: TId, runnerId: number, fn?: Function): any;
 }
diff --git a/types/gitlab/Models/UserKeys.d.ts b/types/gitlab/Models/UserKeys.d.ts
index 90f1918361..cf6b3d71a0 100644
--- a/types/gitlab/Models/UserKeys.d.ts
+++ b/types/gitlab/Models/UserKeys.d.ts
@@ -1,5 +1,6 @@
-import { BaseModel, PageDefualtParams, TypeNumOrStrId} from './../BaseModel.d';
+import { BaseModel, IDefParams, TId } from '../BaseModel.d';
+
 export class UserKeys extends BaseModel {
-    public all(userId?: TypeNumOrStrId, fn?: Function): any;
-    public addKey(userId: string, title: any, key: any, fn?: Function): any;
+    public all(userId?: TId, fn?: Function): any;
+    public addKey(userId: string, title: string, key: any, fn?: Function): any;
 }
diff --git a/types/gitlab/Models/Users.d.ts b/types/gitlab/Models/Users.d.ts
index b14a67e63a..fc946d8237 100644
--- a/types/gitlab/Models/Users.d.ts
+++ b/types/gitlab/Models/Users.d.ts
@@ -1,10 +1,17 @@
-import { BaseModel, PageDefualtParams, TypeNumOrStrId} from './../BaseModel.d';
+import { BaseModel, IDefParams, TId} from '../BaseModel.d';
+import { UserKeys } from './UserKeys.d';
+
+type UsersCb = (users: any[]) => any;
+type UserCb = (user: any) => any;
+
 export class Users extends BaseModel {
-    public all(fn?: Function): any;
-    public all(params?: PageDefualtParams, fn?: Function): any;
+    public readonly keys: UserKeys;
+
+    public all(fn?: UsersCb): any;
+    public all(params?: IDefParams, fn?: UsersCb): any;
     public current(fn?: Function): any;
-    public show(userId: number, fn?: Function): any;
-    public create(params?: PageDefualtParams, fn?: Function): any;
+    public show(userId: number, fn?: UserCb): any;
+    public create(params?: IDefParams, fn?: Function): any;
     public session(email: string, password: string, fn?: Function): any;
     public search(emailOrUsername: string, fn?: Function): any;
 }
diff --git a/types/gitlab/gitlab-tests.ts b/types/gitlab/gitlab-tests.ts
index e69de29bb2..00ab2c761e 100644
--- a/types/gitlab/gitlab-tests.ts
+++ b/types/gitlab/gitlab-tests.ts
@@ -0,0 +1,20 @@
+import * as lib from "gitlab";
+
+const gitlab = lib({
+    url:   'http://example.com',
+    token: 'abcdefghij123456'
+});
+
+const v3 = new lib.ApiV3({ });
+
+// From README
+
+// Listing users
+gitlab.users.all((users) => { });
+
+// Listing projects
+gitlab.projects.all((projects) => { });
+
+// From examples/delet-service
+
+gitlab.projects.services.remove("pid", "name", (service) => { });
diff --git a/types/gitlab/index.d.ts b/types/gitlab/index.d.ts
index 8a1ea57dd6..d0f1f5806a 100644
--- a/types/gitlab/index.d.ts
+++ b/types/gitlab/index.d.ts
@@ -5,10 +5,12 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 import { ApiV3 } from "./ApiV3";
+import { IApiBase } from "./ApiBase";
 
-declare class GitlabApi extends ApiV3 {
-
-    public static readonly ApiV3: ApiV3;
+declare namespace Gitlib {
+    const ApiV3: new(options: IApiBase) => ApiV3;
 }
 
-export = GitlabApi;
+declare function Gitlib(options: IApiBase): ApiV3;
+
+export = Gitlib;
diff --git a/types/gitlab/tsconfig.json b/types/gitlab/tsconfig.json
index 83e46736e1..f1297faf67 100644
--- a/types/gitlab/tsconfig.json
+++ b/types/gitlab/tsconfig.json
@@ -7,6 +7,7 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"

From c4e09994449f8a6e42aabc50a32ea2adda84dedc Mon Sep 17 00:00:00 2001
From: Arylo <arylo.open@gmail.com>
Date: Thu, 5 Apr 2018 00:22:02 +0800
Subject: [PATCH 1061/1382] Update type definition files

---
 types/gitlab/ApiBase.d.ts                  | 19 +++++++++++++------
 types/gitlab/Models/ProjectHooks.d.ts      |  6 ++++--
 types/gitlab/Models/ProjectRepository.d.ts | 14 +++++++++++---
 3 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/types/gitlab/ApiBase.d.ts b/types/gitlab/ApiBase.d.ts
index 9d525be7a4..d57795c141 100644
--- a/types/gitlab/ApiBase.d.ts
+++ b/types/gitlab/ApiBase.d.ts
@@ -1,3 +1,4 @@
+import { IApiBase } from './ApiBase.d';
 import { Labels } from './Models/Labels.d';
 import { Users } from './Models/Users.d';
 import { Notes } from './Models/Notes.d';
@@ -8,17 +9,23 @@ import { Groups } from './Models/Groups.d';
 export interface IApiBase {
     url?: string;
     token?: string;
+    oauth_token?: string;
+    base_url?: string;
+    auth?: any;
     [key: string]: any;
 }
 
 export class ApiBase {
     constructor(options: IApiBase);
-    public groups: Groups
-    public projects: Projects
-    public issues: Issues
-    public notes: Notes
-    public users: Users
-    public labels: Labels
+    public readonly client: this;
+    public readonly groups: Groups
+    public readonly projects: Projects
+    public readonly issues: Issues
+    public readonly notes: Notes
+    public readonly users: Users
+    public readonly labels: Labels
+    public options: IApiBase;
+
     public handleOptions(): void;
     public init(): object;
 }
diff --git a/types/gitlab/Models/ProjectHooks.d.ts b/types/gitlab/Models/ProjectHooks.d.ts
index 775e1348fc..98d1ebf10a 100644
--- a/types/gitlab/Models/ProjectHooks.d.ts
+++ b/types/gitlab/Models/ProjectHooks.d.ts
@@ -5,10 +5,12 @@ interface IAddParam {
     [key: string]: any;
 }
 
+type HooksCb = (hooks: any[]) => any;
+
 export class ProjectHooks extends BaseModel {
-    public list(projectId: TId, fn?: Function): any;
+    public list(projectId: TId, fn?: HooksCb): any;
     public show(projectId: TId, hookId: number, fn?: Function): any;
     public add(projectId: TId, params: IAddParam | string, fn?: Function): any;
-    public update(projectId: TId, hookId: number, url: any, fn?: Function): any;
+    public update(projectId: TId, hookId: number, url: string, fn?: Function): any;
     public remove(projectId: TId, hookId: number, fn?: Function): any;
 }
diff --git a/types/gitlab/Models/ProjectRepository.d.ts b/types/gitlab/Models/ProjectRepository.d.ts
index 85df8bc026..1691db52c0 100644
--- a/types/gitlab/Models/ProjectRepository.d.ts
+++ b/types/gitlab/Models/ProjectRepository.d.ts
@@ -1,12 +1,20 @@
 import { BaseModel, TId } from '../BaseModel.d';
 
-interface IShowFileParam {
+interface IShowFileParams {
     file_path: string;
     ref?: any;
     file_id?: any;
     [key: string]: any;
 }
 
+interface IAddTagParams {
+    id: TId;
+    tag_name: string;
+    ref: string;
+    message?: string;
+    release_description?: string;
+}
+
 export class ProjectRepository extends BaseModel {
     public listBranches(projectId: TId, fn?: Function): any;
     public showBranch(projectId: TId, branchId: string, fn?: Function): any;
@@ -14,7 +22,7 @@ export class ProjectRepository extends BaseModel {
     public unprotectBranch(projectId: TId, branchId: string, fn?: Function): any;
     public createBranch(params: object, fn?: Function): any;
     public deleteBranch(projectId: TId, branchId: string, fn?: Function): any;
-    public addTag(params: object, fn?: Function): any;
+    public addTag(params: IAddTagParams, fn?: Function): any;
     public deleteTag(projectId: TId, tagName: string, fn?: Function): any;
     public showTag(projectId: TId, tagName: string, fn?: Function): any;
     public listTags(projectId: TId, fn?: Function): any;
@@ -24,7 +32,7 @@ export class ProjectRepository extends BaseModel {
     public listTree(projectId: TId, fn?: Function): any;
     public listTree(projectId: TId, params?: object, fn?: Function): any;
     public showFile(projectId: TId, fn?: Function): any;
-    public showFile(projectId: TId, params?: IShowFileParam, fn?: Function): any;
+    public showFile(projectId: TId, params?: IShowFileParams, fn?: Function): any;
     public createFile(params?: object, fn?: Function): any;
     public updateFile(params?: object, fn?: Function): any;
     public compare(params?: object, fn?: Function): any;

From 3e4f0f814a259f232437be6b096c7d48da68b072 Mon Sep 17 00:00:00 2001
From: Arylo <arylo.open@gmail.com>
Date: Thu, 5 Apr 2018 00:49:04 +0800
Subject: [PATCH 1062/1382] Fix Test Fail

---
 types/gitlab/ApiBase.d.ts                     | 38 ++++----
 types/gitlab/ApiBaseHTTP.d.ts                 | 18 ++--
 types/gitlab/ApiV3.d.ts                       |  2 +-
 types/gitlab/BaseModel.d.ts                   | 16 ++--
 types/gitlab/Models/Groups.d.ts               | 30 +++---
 types/gitlab/Models/IssueNotes.d.ts           |  6 +-
 types/gitlab/Models/Issues.d.ts               | 18 ++--
 types/gitlab/Models/Labels.d.ts               |  4 +-
 types/gitlab/Models/Notes.d.ts                |  4 +-
 types/gitlab/Models/Pipelines.d.ts            |  4 +-
 types/gitlab/Models/ProjectBuilds.d.ts        | 10 +-
 types/gitlab/Models/ProjectDeployKeys.d.ts    |  8 +-
 types/gitlab/Models/ProjectHooks.d.ts         | 12 +--
 types/gitlab/Models/ProjectIssues.d.ts        | 10 +-
 types/gitlab/Models/ProjectLabels.d.ts        |  6 +-
 types/gitlab/Models/ProjectMembers.d.ts       | 12 +--
 types/gitlab/Models/ProjectMergeRequests.d.ts | 16 ++--
 types/gitlab/Models/ProjectMilestones.d.ts    | 12 +--
 types/gitlab/Models/ProjectRepository.d.ts    | 46 ++++-----
 types/gitlab/Models/ProjectServices.d.ts      |  8 +-
 types/gitlab/Models/Projects.d.ts             | 94 +++++++++----------
 types/gitlab/Models/Runners.d.ts              | 16 ++--
 types/gitlab/Models/UserKeys.d.ts             |  6 +-
 types/gitlab/Models/Users.d.ts                | 20 ++--
 types/gitlab/index.d.ts                       |  7 +-
 25 files changed, 212 insertions(+), 211 deletions(-)

diff --git a/types/gitlab/ApiBase.d.ts b/types/gitlab/ApiBase.d.ts
index d57795c141..7187ce4352 100644
--- a/types/gitlab/ApiBase.d.ts
+++ b/types/gitlab/ApiBase.d.ts
@@ -1,12 +1,12 @@
-import { IApiBase } from './ApiBase.d';
-import { Labels } from './Models/Labels.d';
-import { Users } from './Models/Users.d';
-import { Notes } from './Models/Notes.d';
-import { Issues } from './Models/Issues.d';
-import { Projects } from './Models/Projects.d';
-import { Groups } from './Models/Groups.d';
+import { ApiBaseOptions } from './ApiBase';
+import { Labels } from './Models/Labels';
+import { Users } from './Models/Users';
+import { Notes } from './Models/Notes';
+import { Issues } from './Models/Issues';
+import { Projects } from './Models/Projects';
+import { Groups } from './Models/Groups';
 
-export interface IApiBase {
+export interface ApiBaseOptions {
     url?: string;
     token?: string;
     oauth_token?: string;
@@ -16,16 +16,16 @@ export interface IApiBase {
 }
 
 export class ApiBase {
-    constructor(options: IApiBase);
-    public readonly client: this;
-    public readonly groups: Groups
-    public readonly projects: Projects
-    public readonly issues: Issues
-    public readonly notes: Notes
-    public readonly users: Users
-    public readonly labels: Labels
-    public options: IApiBase;
+    constructor(options: ApiBaseOptions);
+    readonly client: this;
+    readonly groups: Groups
+    readonly projects: Projects
+    readonly issues: Issues
+    readonly notes: Notes
+    readonly users: Users
+    readonly labels: Labels
+    options: ApiBaseOptions;
 
-    public handleOptions(): void;
-    public init(): object;
+    handleOptions(): void;
+    init(): object;
 }
diff --git a/types/gitlab/ApiBaseHTTP.d.ts b/types/gitlab/ApiBaseHTTP.d.ts
index 41ab7a2bca..7ed5fb0d69 100644
--- a/types/gitlab/ApiBaseHTTP.d.ts
+++ b/types/gitlab/ApiBaseHTTP.d.ts
@@ -1,12 +1,12 @@
-import { ApiBase } from './ApiBase.d';
+import { ApiBase } from './ApiBase';
 
 export class ApiBaseHTTP extends ApiBase {
-    public prepare_opts<T>(opts: T): T;
-    public fn_wrapper(fn: Function): Function;
-    public get(path: string, fn?: Function): any;
-    public get(path: string, query?: object, fn?: Function): any;
-    public delete(path: string, fn?: Function): any;
-    public post(path: string, data?: object, fn?: Function): any;
-    public put(path: string, data?: object, fn?: Function): any;
-    public patch(path: string, data?: object, fn?: Function): any;
+    prepare_opts<T>(opts: T): T;
+    fn_wrapper<T extends Function>(fn: T): T;
+    get(path: string, fn?: Function): any;
+    get(path: string, query?: object, fn?: Function): any;
+    delete(path: string, fn?: Function): any;
+    post(path: string, data?: object, fn?: Function): any;
+    put(path: string, data?: object, fn?: Function): any;
+    patch(path: string, data?: object, fn?: Function): any;
 }
diff --git a/types/gitlab/ApiV3.d.ts b/types/gitlab/ApiV3.d.ts
index 17fe81928e..bd3d02557b 100644
--- a/types/gitlab/ApiV3.d.ts
+++ b/types/gitlab/ApiV3.d.ts
@@ -1,4 +1,4 @@
-import { ApiBaseHTTP } from './ApiBaseHTTP.d';
+import { ApiBaseHTTP } from './ApiBaseHTTP';
 
 export class ApiV3 extends ApiBaseHTTP {
 
diff --git a/types/gitlab/BaseModel.d.ts b/types/gitlab/BaseModel.d.ts
index 8f64621ac9..ca6eb4e7c6 100644
--- a/types/gitlab/BaseModel.d.ts
+++ b/types/gitlab/BaseModel.d.ts
@@ -1,14 +1,14 @@
 export class BaseModel {
-    public load(model: string): object;
-    public get(path: string, fn?: Function): any;
-    public get(path: string, query?: object, fn?: Function): any;
-    public delete(path: string, fn?: Function): any;
-    public post(path: string, data?: object, fn?: Function): any;
-    public put(path: string, data?: object, fn?: Function): any;
-    public patch(path: string, data?: object, fn?: Function): any;
+    load(model: string): object;
+    get(path: string, fn?: Function): any;
+    get(path: string, query?: object, fn?: Function): any;
+    delete(path: string, fn?: Function): any;
+    post(path: string, data?: object, fn?: Function): any;
+    put(path: string, data?: object, fn?: Function): any;
+    patch(path: string, data?: object, fn?: Function): any;
 }
 
-export interface IDefParams {
+export interface DefParams {
     page?: number;
     per_page?: number;
     [key: string]: any;
diff --git a/types/gitlab/Models/Groups.d.ts b/types/gitlab/Models/Groups.d.ts
index ed21ecac47..1b528039f0 100644
--- a/types/gitlab/Models/Groups.d.ts
+++ b/types/gitlab/Models/Groups.d.ts
@@ -1,4 +1,4 @@
-import { BaseModel, IDefParams } from "../BaseModel";
+import { BaseModel, DefParams } from "../BaseModel";
 
 interface IAccessLevels {
     GUEST: number
@@ -9,19 +9,19 @@ interface IAccessLevels {
 }
 
 export class Groups extends BaseModel {
-    public readonly access_levels: IAccessLevels;
+    readonly access_levels: IAccessLevels;
 
-    public init(): object;
-    public all(fn?: Function): any;
-    public all(params?: IDefParams, fn?: Function): any;
-    public show(groupId: number, fn?: Function): any;
-    public listProjects(groupId: number, fn?: Function): any;
-    public listMembers(groupId: number, fn?: Function): any;
-    public addMember(groupId: number, userId: number, accessLevel: IAccessLevels[keyof IAccessLevels], fn?: Function): any;
-    public editMember(groupId: number, userId: number, accessLevel: IAccessLevels[keyof IAccessLevels], fn?: Function): any;
-    public removeMember(groupId: number, userId: number, fn?: Function): any;
-    public create(params?: object, fn?: Function): any;
-    public addProject(groupId: number, projectId: number, fn?: Function): any;
-    public deleteGroup(groupId: number, fn?: Function): any;
-    public search(nameOrPath: string, fn?: Function): any;
+    init(): object;
+    all(fn?: Function): any;
+    all(params?: DefParams, fn?: Function): any;
+    show(groupId: number, fn?: Function): any;
+    listProjects(groupId: number, fn?: Function): any;
+    listMembers(groupId: number, fn?: Function): any;
+    addMember(groupId: number, userId: number, accessLevel: IAccessLevels[keyof IAccessLevels], fn?: Function): any;
+    editMember(groupId: number, userId: number, accessLevel: IAccessLevels[keyof IAccessLevels], fn?: Function): any;
+    removeMember(groupId: number, userId: number, fn?: Function): any;
+    create(params?: object, fn?: Function): any;
+    addProject(groupId: number, projectId: number, fn?: Function): any;
+    deleteGroup(groupId: number, fn?: Function): any;
+    search(nameOrPath: string, fn?: Function): any;
 }
diff --git a/types/gitlab/Models/IssueNotes.d.ts b/types/gitlab/Models/IssueNotes.d.ts
index a40855f293..de1821b1df 100644
--- a/types/gitlab/Models/IssueNotes.d.ts
+++ b/types/gitlab/Models/IssueNotes.d.ts
@@ -1,6 +1,6 @@
-import { BaseModel, TId, IDefParams } from '../BaseModel.d';
+import { BaseModel, TId, DefParams } from '../BaseModel';
 
 export class IssueNotes extends BaseModel{
-    public all(projectId: TId, issueId: number, fn?: Function): any
-    public all(projectId: TId, issueId: number, params?: IDefParams, fn?: Function): any
+    all(projectId: TId, issueId: number, fn?: Function): any
+    all(projectId: TId, issueId: number, params?: DefParams, fn?: Function): any
 }
diff --git a/types/gitlab/Models/Issues.d.ts b/types/gitlab/Models/Issues.d.ts
index a0ca51c6ab..e751b6a002 100644
--- a/types/gitlab/Models/Issues.d.ts
+++ b/types/gitlab/Models/Issues.d.ts
@@ -1,12 +1,12 @@
-import { BaseModel, TId } from '../BaseModel.d';
+import { BaseModel, TId } from '../BaseModel';
 
 export class Issues extends BaseModel {
-    public all(fn?: Function): any;
-    public all(params?: object, fn?: Function): any;
-    public show(projectId: TId, issueId: TId, fn?: Function): any;
-    public create(projectId: TId, params?: object, fn?: Function): any;
-    public edit(projectId: TId, issueId: TId, params?: object, fn?: Function): any;
-    public remove(projectId: TId, issueId: TId, fn?: Function): any;
-    public subscribe(projectId: TId, issueId: TId, params?: object, fn?: Function): any;
-    public unsubscribe(projectId: TId, issueId: TId, fn?: Function): any;
+    all(fn?: Function): any;
+    all(params?: object, fn?: Function): any;
+    show(projectId: TId, issueId: TId, fn?: Function): any;
+    create(projectId: TId, params?: object, fn?: Function): any;
+    edit(projectId: TId, issueId: TId, params?: object, fn?: Function): any;
+    remove(projectId: TId, issueId: TId, fn?: Function): any;
+    subscribe(projectId: TId, issueId: TId, params?: object, fn?: Function): any;
+    unsubscribe(projectId: TId, issueId: TId, fn?: Function): any;
 }
diff --git a/types/gitlab/Models/Labels.d.ts b/types/gitlab/Models/Labels.d.ts
index c323b0777b..63f1110b4d 100644
--- a/types/gitlab/Models/Labels.d.ts
+++ b/types/gitlab/Models/Labels.d.ts
@@ -1,5 +1,5 @@
-import { BaseModel, TId } from '../BaseModel.d';
+import { BaseModel, TId } from '../BaseModel';
 
 export class Labels extends BaseModel {
-    public create(projectId: TId, params?: object, fn?: Function): any;
+    create(projectId: TId, params?: object, fn?: Function): any;
 }
diff --git a/types/gitlab/Models/Notes.d.ts b/types/gitlab/Models/Notes.d.ts
index 50fd1e4da7..95b9cd623e 100644
--- a/types/gitlab/Models/Notes.d.ts
+++ b/types/gitlab/Models/Notes.d.ts
@@ -1,5 +1,5 @@
-import { BaseModel, TId } from '../BaseModel.d';
+import { BaseModel, TId } from '../BaseModel';
 
 export class Notes extends BaseModel {
-    public create(projectId: TId, issueId: number, params?: object, fn?: Function): any;
+    create(projectId: TId, issueId: number, params?: object, fn?: Function): any;
 }
diff --git a/types/gitlab/Models/Pipelines.d.ts b/types/gitlab/Models/Pipelines.d.ts
index 8315508214..f65a9e7d25 100644
--- a/types/gitlab/Models/Pipelines.d.ts
+++ b/types/gitlab/Models/Pipelines.d.ts
@@ -1,5 +1,5 @@
-import { BaseModel, TId } from '../BaseModel.d';
+import { BaseModel, TId } from '../BaseModel';
 
 export class Pipelines extends BaseModel {
-    public all(projectId: TId, fn?: Function): any;
+    all(projectId: TId, fn?: Function): any;
 }
diff --git a/types/gitlab/Models/ProjectBuilds.d.ts b/types/gitlab/Models/ProjectBuilds.d.ts
index 8714f27b1b..df7c33c32a 100644
--- a/types/gitlab/Models/ProjectBuilds.d.ts
+++ b/types/gitlab/Models/ProjectBuilds.d.ts
@@ -1,4 +1,4 @@
-import { BaseModel, TId, IDefParams } from '../BaseModel.d';
+import { BaseModel, TId, DefParams } from '../BaseModel';
 
 interface IShowBuildParam {
     projectId: TId;
@@ -6,8 +6,8 @@ interface IShowBuildParam {
 }
 
 export class ProjectBuilds extends BaseModel {
-    public listBuilds(projectId: TId, fn?: Function): any;
-    public listBuilds(projectId: TId, params?: IDefParams, fn?: Function): any;
-    public showBuild(projectId: TId, buildId: string, fn?: Function): any;
-    public triggerBuild(params?: IShowBuildParam, fn?: Function): any;
+    listBuilds(projectId: TId, fn?: Function): any;
+    listBuilds(projectId: TId, params?: DefParams, fn?: Function): any;
+    showBuild(projectId: TId, buildId: string, fn?: Function): any;
+    triggerBuild(params?: IShowBuildParam, fn?: Function): any;
 }
diff --git a/types/gitlab/Models/ProjectDeployKeys.d.ts b/types/gitlab/Models/ProjectDeployKeys.d.ts
index 8cadac8507..3be9d66bc4 100644
--- a/types/gitlab/Models/ProjectDeployKeys.d.ts
+++ b/types/gitlab/Models/ProjectDeployKeys.d.ts
@@ -1,7 +1,7 @@
-import { BaseModel, TId } from '../BaseModel.d';
+import { BaseModel, TId } from '../BaseModel';
 
 export class ProjectKeys extends BaseModel {
-    public listKeys(projectId: TId, fn?: Function): any;
-    public getKey(projectId: TId, keyId: number, fn?: Function): any;
-    public addKey(projectId: TId, params?: object, fn?: Function): any;
+    listKeys(projectId: TId, fn?: Function): any;
+    getKey(projectId: TId, keyId: number, fn?: Function): any;
+    addKey(projectId: TId, params?: object, fn?: Function): any;
 }
diff --git a/types/gitlab/Models/ProjectHooks.d.ts b/types/gitlab/Models/ProjectHooks.d.ts
index 98d1ebf10a..ce0878eec9 100644
--- a/types/gitlab/Models/ProjectHooks.d.ts
+++ b/types/gitlab/Models/ProjectHooks.d.ts
@@ -1,4 +1,4 @@
-import { BaseModel, TId } from '../BaseModel.d';
+import { BaseModel, TId } from '../BaseModel';
 
 interface IAddParam {
     url: string;
@@ -8,9 +8,9 @@ interface IAddParam {
 type HooksCb = (hooks: any[]) => any;
 
 export class ProjectHooks extends BaseModel {
-    public list(projectId: TId, fn?: HooksCb): any;
-    public show(projectId: TId, hookId: number, fn?: Function): any;
-    public add(projectId: TId, params: IAddParam | string, fn?: Function): any;
-    public update(projectId: TId, hookId: number, url: string, fn?: Function): any;
-    public remove(projectId: TId, hookId: number, fn?: Function): any;
+    list(projectId: TId, fn?: HooksCb): any;
+    show(projectId: TId, hookId: number, fn?: Function): any;
+    add(projectId: TId, params: IAddParam | string, fn?: Function): any;
+    update(projectId: TId, hookId: number, url: string, fn?: Function): any;
+    remove(projectId: TId, hookId: number, fn?: Function): any;
 }
diff --git a/types/gitlab/Models/ProjectIssues.d.ts b/types/gitlab/Models/ProjectIssues.d.ts
index 95bbc99bed..8f7fc439a6 100644
--- a/types/gitlab/Models/ProjectIssues.d.ts
+++ b/types/gitlab/Models/ProjectIssues.d.ts
@@ -1,9 +1,9 @@
-import { IssueNotes } from './IssueNotes.d';
-import { BaseModel, TId, IDefParams } from '../BaseModel.d';
+import { IssueNotes } from './IssueNotes';
+import { BaseModel, TId, DefParams } from '../BaseModel';
 
 export class ProjectIssues extends BaseModel {
-    public readonly notes: IssueNotes;
+    readonly notes: IssueNotes;
 
-    public list(projectId: TId, fn?: Function): any;
-    public list(projectId: TId, params?: IDefParams, fn?: Function): any;
+    list(projectId: TId, fn?: Function): any;
+    list(projectId: TId, params?: DefParams, fn?: Function): any;
 }
diff --git a/types/gitlab/Models/ProjectLabels.d.ts b/types/gitlab/Models/ProjectLabels.d.ts
index 7fa178843c..2f6ca1dabc 100644
--- a/types/gitlab/Models/ProjectLabels.d.ts
+++ b/types/gitlab/Models/ProjectLabels.d.ts
@@ -1,6 +1,6 @@
-import { BaseModel, TId, IDefParams } from '../BaseModel.d';
+import { BaseModel, TId, DefParams } from '../BaseModel';
 
 export class ProjectLabels extends BaseModel {
-    public all(projectId: TId, fn?: Function): any;
-    public all(projectId: TId, params?: IDefParams, fn?: Function): any;
+    all(projectId: TId, fn?: Function): any;
+    all(projectId: TId, params?: DefParams, fn?: Function): any;
 }
diff --git a/types/gitlab/Models/ProjectMembers.d.ts b/types/gitlab/Models/ProjectMembers.d.ts
index baf92668c9..25aa87332a 100644
--- a/types/gitlab/Models/ProjectMembers.d.ts
+++ b/types/gitlab/Models/ProjectMembers.d.ts
@@ -1,12 +1,12 @@
-import { BaseModel, TId } from '../BaseModel.d';
+import { BaseModel, TId } from '../BaseModel';
 
 type MenberCb = (menber: any) => any;
 type MenbersCb = (menbers: any[]) => any;
 
 export class ProjectMembers extends BaseModel {
-    public list(projectId: TId, fn?: MenbersCb): any;
-    public show(projectId: TId, userId: number, fn?: MenberCb): any;
-    public add(projectId: TId, userId: number, accessLevel: number,fn?: Function): any;
-    public update(projectId: TId, userId: number, accessLevel: number, fn?: Function): any;
-    public remove(projectId: TId, userId: number, fn?: Function): any;
+    list(projectId: TId, fn?: MenbersCb): any;
+    show(projectId: TId, userId: number, fn?: MenberCb): any;
+    add(projectId: TId, userId: number, accessLevel: number,fn?: Function): any;
+    update(projectId: TId, userId: number, accessLevel: number, fn?: Function): any;
+    remove(projectId: TId, userId: number, fn?: Function): any;
 }
diff --git a/types/gitlab/Models/ProjectMergeRequests.d.ts b/types/gitlab/Models/ProjectMergeRequests.d.ts
index b3898bfac4..37b2ab33e6 100644
--- a/types/gitlab/Models/ProjectMergeRequests.d.ts
+++ b/types/gitlab/Models/ProjectMergeRequests.d.ts
@@ -1,11 +1,11 @@
-import { BaseModel, TId, IDefParams } from '../BaseModel.d';
+import { BaseModel, TId, DefParams } from '../BaseModel';
 
 export class ProjectMergeRequests extends BaseModel {
-    public list(projectId: TId, fn?: Function): any;
-    public list(projectId: TId, params?: IDefParams, fn?: Function): any;
-    public show(projectId: TId, mergerequestId: number, fn?: Function): any;
-    public add(projectId: TId, sourceBranch: string, targetBranch: string, assigneeId: number, title: string, fn?: Function): any;
-    public update(projectId: TId, mergerequestId: number, params: object, fn?: Function): any;
-    public comment(projectId: TId, mergerequestId: number, note: any, fn?: Function): any;
-    public merge(projectId: TId, mergerequestId: number, params: object, fn?: Function): any;
+    list(projectId: TId, fn?: Function): any;
+    list(projectId: TId, params?: DefParams, fn?: Function): any;
+    show(projectId: TId, mergerequestId: number, fn?: Function): any;
+    add(projectId: TId, sourceBranch: string, targetBranch: string, assigneeId: number, title: string, fn?: Function): any;
+    update(projectId: TId, mergerequestId: number, params: object, fn?: Function): any;
+    comment(projectId: TId, mergerequestId: number, note: any, fn?: Function): any;
+    merge(projectId: TId, mergerequestId: number, params: object, fn?: Function): any;
 }
diff --git a/types/gitlab/Models/ProjectMilestones.d.ts b/types/gitlab/Models/ProjectMilestones.d.ts
index eeccc96fbf..d36d1c016a 100644
--- a/types/gitlab/Models/ProjectMilestones.d.ts
+++ b/types/gitlab/Models/ProjectMilestones.d.ts
@@ -1,12 +1,12 @@
-import { BaseModel, TId } from '../BaseModel.d';
+import { BaseModel, TId } from '../BaseModel';
 
 type MilestonesCb = (milestones: any[]) => any;
 type MilestoneCb = (milestones: any) => any;
 
 export class ProjectMilestones extends BaseModel {
-    public list(projectId: TId, fn?: MilestonesCb): any;
-    public all(projectId: TId, fn?: MilestonesCb): any;
-    public show(projectId: TId, milestoneId: number, fn?: MilestoneCb): any;
-    public add(projectId: TId, title: string, description: string, due_date: any, fn?: Function): any;
-    public update(projectId: TId, milestoneId: number, title: string, description: string, due_date: any, state_event: any, fn?: Function): any;
+    list(projectId: TId, fn?: MilestonesCb): any;
+    all(projectId: TId, fn?: MilestonesCb): any;
+    show(projectId: TId, milestoneId: number, fn?: MilestoneCb): any;
+    add(projectId: TId, title: string, description: string, due_date: any, fn?: Function): any;
+    update(projectId: TId, milestoneId: number, title: string, description: string, due_date: any, state_event: any, fn?: Function): any;
 }
diff --git a/types/gitlab/Models/ProjectRepository.d.ts b/types/gitlab/Models/ProjectRepository.d.ts
index 1691db52c0..7bef1b6212 100644
--- a/types/gitlab/Models/ProjectRepository.d.ts
+++ b/types/gitlab/Models/ProjectRepository.d.ts
@@ -1,13 +1,13 @@
-import { BaseModel, TId } from '../BaseModel.d';
+import { BaseModel, TId } from '../BaseModel';
 
-interface IShowFileParams {
+interface ShowFileParams {
     file_path: string;
     ref?: any;
     file_id?: any;
     [key: string]: any;
 }
 
-interface IAddTagParams {
+interface AddTagParams {
     id: TId;
     tag_name: string;
     ref: string;
@@ -16,24 +16,24 @@ interface IAddTagParams {
 }
 
 export class ProjectRepository extends BaseModel {
-    public listBranches(projectId: TId, fn?: Function): any;
-    public showBranch(projectId: TId, branchId: string, fn?: Function): any;
-    public protectBranch(projectId: TId, branchId: string, params: object, fn?: Function): any;
-    public unprotectBranch(projectId: TId, branchId: string, fn?: Function): any;
-    public createBranch(params: object, fn?: Function): any;
-    public deleteBranch(projectId: TId, branchId: string, fn?: Function): any;
-    public addTag(params: IAddTagParams, fn?: Function): any;
-    public deleteTag(projectId: TId, tagName: string, fn?: Function): any;
-    public showTag(projectId: TId, tagName: string, fn?: Function): any;
-    public listTags(projectId: TId, fn?: Function): any;
-    public listCommits(projectId: TId, fn?: Function): any;
-    public showCommit(projectId: TId, sha: string, fn?: Function): any;
-    public diffCommit(projectId: TId, sha: string, fn?: Function): any;
-    public listTree(projectId: TId, fn?: Function): any;
-    public listTree(projectId: TId, params?: object, fn?: Function): any;
-    public showFile(projectId: TId, fn?: Function): any;
-    public showFile(projectId: TId, params?: IShowFileParams, fn?: Function): any;
-    public createFile(params?: object, fn?: Function): any;
-    public updateFile(params?: object, fn?: Function): any;
-    public compare(params?: object, fn?: Function): any;
+    listBranches(projectId: TId, fn?: Function): any;
+    showBranch(projectId: TId, branchId: string, fn?: Function): any;
+    protectBranch(projectId: TId, branchId: string, params: object, fn?: Function): any;
+    unprotectBranch(projectId: TId, branchId: string, fn?: Function): any;
+    createBranch(params: object, fn?: Function): any;
+    deleteBranch(projectId: TId, branchId: string, fn?: Function): any;
+    addTag(params: AddTagParams, fn?: Function): any;
+    deleteTag(projectId: TId, tagName: string, fn?: Function): any;
+    showTag(projectId: TId, tagName: string, fn?: Function): any;
+    listTags(projectId: TId, fn?: Function): any;
+    listCommits(projectId: TId, fn?: Function): any;
+    showCommit(projectId: TId, sha: string, fn?: Function): any;
+    diffCommit(projectId: TId, sha: string, fn?: Function): any;
+    listTree(projectId: TId, fn?: Function): any;
+    listTree(projectId: TId, params?: object, fn?: Function): any;
+    showFile(projectId: TId, fn?: Function): any;
+    showFile(projectId: TId, params?: ShowFileParams, fn?: Function): any;
+    createFile(params?: object, fn?: Function): any;
+    updateFile(params?: object, fn?: Function): any;
+    compare(params?: object, fn?: Function): any;
 }
diff --git a/types/gitlab/Models/ProjectServices.d.ts b/types/gitlab/Models/ProjectServices.d.ts
index c3cbd0aee6..25c59ae400 100644
--- a/types/gitlab/Models/ProjectServices.d.ts
+++ b/types/gitlab/Models/ProjectServices.d.ts
@@ -1,9 +1,9 @@
-import { BaseModel, TId } from './../BaseModel.d';
+import { BaseModel, TId } from './../BaseModel';
 
 type ServiceCb = (service: any) => any;
 
 export class ProjectServices extends BaseModel {
-    public show(projectId: TId, serviceName: string, fn?: ServiceCb): any;
-    public update(projectId: TId, serviceName: string, params: object, fn?: ServiceCb): any;
-    public remove(projectId: TId, serviceName: string, fn?: ServiceCb): any;
+    show(projectId: TId, serviceName: string, fn?: ServiceCb): any;
+    update(projectId: TId, serviceName: string, params: object, fn?: ServiceCb): any;
+    remove(projectId: TId, serviceName: string, fn?: ServiceCb): any;
 }
diff --git a/types/gitlab/Models/Projects.d.ts b/types/gitlab/Models/Projects.d.ts
index 9a66318a00..9ba8faa551 100644
--- a/types/gitlab/Models/Projects.d.ts
+++ b/types/gitlab/Models/Projects.d.ts
@@ -1,55 +1,55 @@
-import { Runners } from './Runners.d';
-import { Pipelines } from './Pipelines.d';
-import { ProjectBuilds } from './ProjectBuilds.d';
-import { ProjectMergeRequests } from './ProjectMergeRequests.d';
-import { ProjectKeys } from './ProjectDeployKeys.d';
-import { ProjectMilestones } from './ProjectMilestones.d';
-import { ProjectRepository } from './ProjectRepository.d';
-import { ProjectLabels } from './ProjectLabels.d';
-import { ProjectIssues } from './ProjectIssues.d';
-import { ProjectHooks } from './ProjectHooks.d';
-import { ProjectMembers } from './ProjectMembers.d';
-import { BaseModel, IDefParams, TId} from '../BaseModel.d';
-import { ProjectServices } from './ProjectServices.d';
+import { Runners } from './Runners';
+import { Pipelines } from './Pipelines';
+import { ProjectBuilds } from './ProjectBuilds';
+import { ProjectMergeRequests } from './ProjectMergeRequests';
+import { ProjectKeys } from './ProjectDeployKeys';
+import { ProjectMilestones } from './ProjectMilestones';
+import { ProjectRepository } from './ProjectRepository';
+import { ProjectLabels } from './ProjectLabels';
+import { ProjectIssues } from './ProjectIssues';
+import { ProjectHooks } from './ProjectHooks';
+import { ProjectMembers } from './ProjectMembers';
+import { BaseModel, DefParams, TId } from '../BaseModel';
+import { ProjectServices } from './ProjectServices';
 
 type ProjectsCb = (projects: any[]) => any;
 
 export class Projects extends BaseModel {
 
-    public readonly members: ProjectMembers;
-    public readonly hooks : ProjectHooks;
-    public readonly issues : ProjectIssues;
-    public readonly labels : ProjectLabels;
-    public readonly repository: ProjectRepository;
-    public readonly milestones: ProjectMilestones;
-    public readonly deploy_keys: ProjectKeys;
-    public readonly merge_requests: ProjectMergeRequests;
-    public readonly services: ProjectServices;
-    public readonly builds: ProjectBuilds;
-    public readonly pipelines: Pipelines;
-    public readonly runners: Runners;
+    readonly members: ProjectMembers;
+    readonly hooks: ProjectHooks;
+    readonly issues: ProjectIssues;
+    readonly labels: ProjectLabels;
+    readonly repository: ProjectRepository;
+    readonly milestones: ProjectMilestones;
+    readonly deploy_keys: ProjectKeys;
+    readonly merge_requests: ProjectMergeRequests;
+    readonly services: ProjectServices;
+    readonly builds: ProjectBuilds;
+    readonly pipelines: Pipelines;
+    readonly runners: Runners;
 
 
-    public all(fn?: ProjectsCb): any;
-    public all(params?: IDefParams, fn?: ProjectsCb): any;
-    public allAdmin(fn?: Function): any;
-    public allAdmin(params?: IDefParams, fn?: Function): any;
-    public show(projectId: TId, fn?: Function): any;
-    public create(params: object, fn?: Function): any;
-    public create_for_user(params: object, fn?: Function): any;
-    public edit(projectId: TId, params: object, fn?: Function): any;
-    public addMember(params?: object, fn?: Function): any;
-    public editMember(params?: object, fn?: Function): any;
-    public listMembers(params?: object, fn?: Function): any;
-    public listCommits(params?: object, fn?: Function): any;
-    public listTags(params?: object, fn?: Function): any;
-    public remove(projectId: TId, fn?: Function): any;
-    public fork(params?: object, fn?: Function): any;
-    public share(params?: object, fn?: Function): any;
-    public search(projectName: string, fn?: Function): any;
-    public search(projectName: string, params?: object, fn?: Function): any;
-    public listTriggers(projectId: TId, fn?: Function): any;
-    public showTrigger(projectId: TId, token: string, fn?: Function): any;
-    public createTrigger(params?: object, fn?: Function): any;
-    public removeTrigger(projectId: TId, token: string, fn?: Function): any;
+    all(fn?: ProjectsCb): any;
+    all(params?: DefParams, fn?: ProjectsCb): any;
+    allAdmin(fn?: Function): any;
+    allAdmin(params?: DefParams, fn?: Function): any;
+    show(projectId: TId, fn?: Function): any;
+    create(params: object, fn?: Function): any;
+    create_for_user(params: object, fn?: Function): any;
+    edit(projectId: TId, params: object, fn?: Function): any;
+    addMember(params?: object, fn?: Function): any;
+    editMember(params?: object, fn?: Function): any;
+    listMembers(params?: object, fn?: Function): any;
+    listCommits(params?: object, fn?: Function): any;
+    listTags(params?: object, fn?: Function): any;
+    remove(projectId: TId, fn?: Function): any;
+    fork(params?: object, fn?: Function): any;
+    share(params?: object, fn?: Function): any;
+    search(projectName: string, fn?: Function): any;
+    search(projectName: string, params?: object, fn?: Function): any;
+    listTriggers(projectId: TId, fn?: Function): any;
+    showTrigger(projectId: TId, token: string, fn?: Function): any;
+    createTrigger(params?: object, fn?: Function): any;
+    removeTrigger(projectId: TId, token: string, fn?: Function): any;
 }
diff --git a/types/gitlab/Models/Runners.d.ts b/types/gitlab/Models/Runners.d.ts
index c166a44ff1..1656fe0c5d 100644
--- a/types/gitlab/Models/Runners.d.ts
+++ b/types/gitlab/Models/Runners.d.ts
@@ -1,11 +1,11 @@
-import { BaseModel, IDefParams, TId} from '../BaseModel.d';
+import { BaseModel, DefParams, TId } from '../BaseModel';
 
 export class Runners extends BaseModel {
-    public all(projectId?: TId, fn?: Function): any;
-    public all(projectId?: TId, params?: object, fn?: Function): any;
-    public show(runnerId: number, fn?: Function): any;
-    public update(runnerId: number, attributes: any, fn?: Function): any;
-    public remove(runnerId: number, projectId: any, enable: any, fn?: Function): any;
-    public enable(projectId: TId, runnerId: number, fn?: Function): any;
-    public disable(projectId: TId, runnerId: number, fn?: Function): any;
+    all(projectId?: TId, fn?: Function): any;
+    all(projectId?: TId, params?: object, fn?: Function): any;
+    show(runnerId: number, fn?: Function): any;
+    update(runnerId: number, attributes: any, fn?: Function): any;
+    remove(runnerId: number, projectId: any, enable: any, fn?: Function): any;
+    enable(projectId: TId, runnerId: number, fn?: Function): any;
+    disable(projectId: TId, runnerId: number, fn?: Function): any;
 }
diff --git a/types/gitlab/Models/UserKeys.d.ts b/types/gitlab/Models/UserKeys.d.ts
index cf6b3d71a0..5182b5a2d1 100644
--- a/types/gitlab/Models/UserKeys.d.ts
+++ b/types/gitlab/Models/UserKeys.d.ts
@@ -1,6 +1,6 @@
-import { BaseModel, IDefParams, TId } from '../BaseModel.d';
+import { BaseModel, DefParams, TId } from '../BaseModel';
 
 export class UserKeys extends BaseModel {
-    public all(userId?: TId, fn?: Function): any;
-    public addKey(userId: string, title: string, key: any, fn?: Function): any;
+    all(userId?: TId, fn?: Function): any;
+    addKey(userId: string, title: string, key: any, fn?: Function): any;
 }
diff --git a/types/gitlab/Models/Users.d.ts b/types/gitlab/Models/Users.d.ts
index fc946d8237..e4572ac659 100644
--- a/types/gitlab/Models/Users.d.ts
+++ b/types/gitlab/Models/Users.d.ts
@@ -1,17 +1,17 @@
-import { BaseModel, IDefParams, TId} from '../BaseModel.d';
-import { UserKeys } from './UserKeys.d';
+import { BaseModel, DefParams, TId } from '../BaseModel';
+import { UserKeys } from './UserKeys';
 
 type UsersCb = (users: any[]) => any;
 type UserCb = (user: any) => any;
 
 export class Users extends BaseModel {
-    public readonly keys: UserKeys;
+    readonly keys: UserKeys;
 
-    public all(fn?: UsersCb): any;
-    public all(params?: IDefParams, fn?: UsersCb): any;
-    public current(fn?: Function): any;
-    public show(userId: number, fn?: UserCb): any;
-    public create(params?: IDefParams, fn?: Function): any;
-    public session(email: string, password: string, fn?: Function): any;
-    public search(emailOrUsername: string, fn?: Function): any;
+    all(fn?: UsersCb): any;
+    all(params?: DefParams, fn?: UsersCb): any;
+    current(fn?: Function): any;
+    show(userId: number, fn?: UserCb): any;
+    create(params?: DefParams, fn?: Function): any;
+    session(email: string, password: string, fn?: Function): any;
+    search(emailOrUsername: string, fn?: Function): any;
 }
diff --git a/types/gitlab/index.d.ts b/types/gitlab/index.d.ts
index d0f1f5806a..1ff52505ee 100644
--- a/types/gitlab/index.d.ts
+++ b/types/gitlab/index.d.ts
@@ -3,14 +3,15 @@
 // Definitions by: sam <https://github.com/yanqing6628780>
 //                 AryloYeung <https://github.com/Arylo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 import { ApiV3 } from "./ApiV3";
-import { IApiBase } from "./ApiBase";
+import { ApiBaseOptions } from "./ApiBase";
 
 declare namespace Gitlib {
-    const ApiV3: new(options: IApiBase) => ApiV3;
+    const ApiV3: new(options: ApiBaseOptions) => ApiV3;
 }
 
-declare function Gitlib(options: IApiBase): ApiV3;
+declare function Gitlib(options: ApiBaseOptions): ApiV3;
 
 export = Gitlib;

From 782717d6fea6eaa3ac9567b121886f0f06959866 Mon Sep 17 00:00:00 2001
From: Kristofer Sommestad <kristofer.sommestad@springworks.se>
Date: Wed, 4 Apr 2018 21:51:54 +0200
Subject: [PATCH 1063/1382] chore(sinon): define `SinonFakeTimersConfig`
 interface

Also remove redundant no-arg declaration.
---
 types/sinon/index.d.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/types/sinon/index.d.ts b/types/sinon/index.d.ts
index 24c809a71f..08976adaec 100644
--- a/types/sinon/index.d.ts
+++ b/types/sinon/index.d.ts
@@ -232,10 +232,15 @@ declare namespace Sinon {
         setSystemTime(date: Date): void;
     }
 
+    interface SinonFakeTimersConfig {
+        now: number | Date;
+        toFake: string[];
+        shouldAdvanceTime: boolean;
+    }
+
     interface SinonFakeTimersStatic {
-        (): SinonFakeTimers;
         (now?: number | Date): SinonFakeTimers;
-        (config: { now?: number | Date, toFake?: string[], shouldAdvanceTime?: boolean }): SinonFakeTimers;
+        (config?: Partial<SinonFakeTimersConfig>): SinonFakeTimers;
     }
 
     interface SinonStatic {

From 919977b30481dcda7ef008416f56978f7017fb69 Mon Sep 17 00:00:00 2001
From: Shenghan Gao <shenghang@nvidia.com>
Date: Mon, 2 Oct 2017 18:27:21 -0700
Subject: [PATCH 1064/1382] update Model.insertMany function signature
 according to doc

reference: http://mongoosejs.com/docs/api.html#insertmany_insertMany
---
 types/mongoose/index.d.ts | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/types/mongoose/index.d.ts b/types/mongoose/index.d.ts
index 50496fc9da..4cd32a0126 100644
--- a/types/mongoose/index.d.ts
+++ b/types/mongoose/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Mongoose 5.0.1
+// Type definitions for Mongoose 5.0.12
 // Project: http://mongoosejs.com/
 // Definitions by: horiuchi <https://github.com/horiuchi>
 //                 sindrenm <https://github.com/sindrenm>
@@ -2608,10 +2608,18 @@ declare module "mongoose" {
      * because it only sends one operation to the server, rather than one for each
      * document.
      * This function does not trigger save middleware.
+     * @param docs Documents to insert.
+     * @param options Optional settings.
+     * @param options.ordered  if true, will fail fast on the first error encountered. 
+     *        If false, will insert all the documents it can and report errors later.
+     * @param options.rawResult if false, the returned promise resolves to the documents that passed mongoose document validation. 
+     *        If `false`, will return the [raw result from the MongoDB driver](http://mongodb.github.io/node-mongodb-native/2.2/api/Collection.html#~insertWriteOpCallback)
+     *        with a `mongoose` property that contains `validationErrors` if this is an unordered `insertMany`.
      */
     insertMany(docs: any[], callback?: (error: any, docs: T[]) => void): Promise<T[]>;
+    insertMany(docs: any[], options?: { ordered?: boolean, rawResult?: boolean }, callback?: (error: any, docs: T[]) => void): Promise<T[]>;
     insertMany(doc: any, callback?: (error: any, doc: T) => void): Promise<T>;
-    insertMany(...docsWithCallback: any[]): Promise<T>;
+    insertMany(doc: any, options?: { rdered?: boolean, rawResult?: boolean }, callback?: (error: any, doc: T) => void): Promise<T>;
 
     /**
      * Executes a mapReduce command.

From d252ffa70db894b5c377a611f3761cdd82945c34 Mon Sep 17 00:00:00 2001
From: Joshua Goldberg <josh@fullscreenmario.com>
Date: Wed, 4 Apr 2018 16:23:27 -0700
Subject: [PATCH 1065/1382] Added types for jest-environment-puppeteer

---
 types/jest-environment-puppeteer/index.d.ts   | 13 +++++++++++
 .../jest-environment-puppeteer-tests.ts       |  4 ++++
 .../jest-environment-puppeteer/tsconfig.json  | 23 +++++++++++++++++++
 types/jest-environment-puppeteer/tslint.json  |  1 +
 4 files changed, 41 insertions(+)
 create mode 100644 types/jest-environment-puppeteer/index.d.ts
 create mode 100644 types/jest-environment-puppeteer/jest-environment-puppeteer-tests.ts
 create mode 100644 types/jest-environment-puppeteer/tsconfig.json
 create mode 100644 types/jest-environment-puppeteer/tslint.json

diff --git a/types/jest-environment-puppeteer/index.d.ts b/types/jest-environment-puppeteer/index.d.ts
new file mode 100644
index 0000000000..88956e1869
--- /dev/null
+++ b/types/jest-environment-puppeteer/index.d.ts
@@ -0,0 +1,13 @@
+// Type definitions for jest-environment-puppeteer 2.2
+// Project: https://github.com/smooth-code/jest-puppeteer
+// Definitions by: Josh Goldberg <https://github.com/joshuakgoldberg>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import { Browser, Page } from "puppeteer";
+
+declare global {
+    const browser: Browser;
+    const page: Page;
+}
+
+export { };
diff --git a/types/jest-environment-puppeteer/jest-environment-puppeteer-tests.ts b/types/jest-environment-puppeteer/jest-environment-puppeteer-tests.ts
new file mode 100644
index 0000000000..3de8c3661a
--- /dev/null
+++ b/types/jest-environment-puppeteer/jest-environment-puppeteer-tests.ts
@@ -0,0 +1,4 @@
+import * as puppeteer from "puppeteer";
+
+const myBrowser: puppeteer.Browser = browser;
+const myPage: puppeteer.Page = page;
diff --git a/types/jest-environment-puppeteer/tsconfig.json b/types/jest-environment-puppeteer/tsconfig.json
new file mode 100644
index 0000000000..ed53d60edd
--- /dev/null
+++ b/types/jest-environment-puppeteer/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "jest-environment-puppeteer-tests.ts"
+    ]
+}
diff --git a/types/jest-environment-puppeteer/tslint.json b/types/jest-environment-puppeteer/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/jest-environment-puppeteer/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From fa290f099e7c33992aefcadbc5bc541ac7f4c064 Mon Sep 17 00:00:00 2001
From: Joshua Goldberg <josh@fullscreenmario.com>
Date: Wed, 4 Apr 2018 17:48:24 -0700
Subject: [PATCH 1066/1382] Added expect-puppeteer types

---
 .../expect-puppeteer-tests.ts                 |  0
 types/expect-puppeteer/index.d.ts             | 54 +++++++++++++++++++
 types/expect-puppeteer/tsconfig.json          | 22 ++++++++
 types/expect-puppeteer/tslint.json            |  1 +
 4 files changed, 77 insertions(+)
 create mode 100644 types/expect-puppeteer/expect-puppeteer-tests.ts
 create mode 100644 types/expect-puppeteer/index.d.ts
 create mode 100644 types/expect-puppeteer/tsconfig.json
 create mode 100644 types/expect-puppeteer/tslint.json

diff --git a/types/expect-puppeteer/expect-puppeteer-tests.ts b/types/expect-puppeteer/expect-puppeteer-tests.ts
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/types/expect-puppeteer/index.d.ts b/types/expect-puppeteer/index.d.ts
new file mode 100644
index 0000000000..5c96c4cbdf
--- /dev/null
+++ b/types/expect-puppeteer/index.d.ts
@@ -0,0 +1,54 @@
+// Type definitions for expect-puppeteer 2.2
+// Project: https://github.com/smooth-code/jest-puppeteer
+// Definitions by: Josh Goldberg <https://github.com/JoshuaKGoldberg>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="jest" />
+
+import { ElementHandle, Page } from "puppeteer";
+
+/**
+ * Interval at which pageFunctions may be executed.
+ */
+type ExpectPolling = number | "mutation" | "raf";
+
+/**
+ * Configures how to poll for an element.
+ */
+interface ExpectTimingActions {
+    /**
+     * An interval at which the pageFunction is executed. Defaults to "raf".
+     */
+    polling?: ExpectPolling;
+
+    /**
+     * Maximum time to wait for in milliseconds. Defaults to 500.
+     */
+    timeout?: number;
+}
+
+interface ExpectToClickOptions extends ExpectTimingActions {
+    /**
+     * A text or a RegExp to match in element textContent.
+     */
+    text?: string | RegExp;
+}
+
+interface ExpectPuppeteer {
+    toClick(selector: string, options?: ExpectToClickOptions): Promise<void>;
+    toDisplayDialog(block: () => Promise<void>): Promise<void>;
+    toFill(selector: string, value: string, options?: ExpectTimingActions): Promise<void>;
+    toMatch(value: string, options?: ExpectTimingActions): Promise<void>;
+    toMatchElement(selector: string, value: string, options?: ExpectTimingActions): Promise<void>;
+    toSelect(selector: string, valueOrText: string, options?: ExpectTimingActions): Promise<void>;
+    toUploadFile(selector: string, filePath: string, options?: ExpectTimingActions): Promise<void>;
+}
+
+declare global {
+    namespace jest {
+        interface Matchers<R> extends ExpectPuppeteer { }
+    }
+}
+
+export function expectPuppeteer(instance: ElementHandle | Page): ExpectPuppeteer;
diff --git a/types/expect-puppeteer/tsconfig.json b/types/expect-puppeteer/tsconfig.json
new file mode 100644
index 0000000000..4f88a5ccb3
--- /dev/null
+++ b/types/expect-puppeteer/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "expect-puppeteer-tests.ts"
+    ]
+}
diff --git a/types/expect-puppeteer/tslint.json b/types/expect-puppeteer/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/expect-puppeteer/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From d7b5a4865e11f89b5119287119cf8f4e3f6a8f62 Mon Sep 17 00:00:00 2001
From: Joshua Goldberg <josh@fullscreenmario.com>
Date: Wed, 4 Apr 2018 17:51:36 -0700
Subject: [PATCH 1067/1382] Added missing TS version

---
 types/jest-environment-puppeteer/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/jest-environment-puppeteer/index.d.ts b/types/jest-environment-puppeteer/index.d.ts
index 88956e1869..abb0ad02d1 100644
--- a/types/jest-environment-puppeteer/index.d.ts
+++ b/types/jest-environment-puppeteer/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/smooth-code/jest-puppeteer
 // Definitions by: Josh Goldberg <https://github.com/joshuakgoldberg>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import { Browser, Page } from "puppeteer";
 

From ae30d384fb5308ba2c0ed4a5fb1878363a9dd8fc Mon Sep 17 00:00:00 2001
From: Joshua Goldberg <josh@fullscreenmario.com>
Date: Wed, 4 Apr 2018 17:54:15 -0700
Subject: [PATCH 1068/1382] Added missing strictFunctionTypes

---
 types/expect-puppeteer/tsconfig.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/expect-puppeteer/tsconfig.json b/types/expect-puppeteer/tsconfig.json
index 4f88a5ccb3..7ca516e3c2 100644
--- a/types/expect-puppeteer/tsconfig.json
+++ b/types/expect-puppeteer/tsconfig.json
@@ -6,6 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
+        "strictFunctionTypes": true,
         "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [

From c64839177085c7d9a46f288a53047621c0c33877 Mon Sep 17 00:00:00 2001
From: Joshua Goldberg <josh@fullscreenmario.com>
Date: Wed, 4 Apr 2018 18:18:47 -0700
Subject: [PATCH 1069/1382] Added tests; fixed lint issues

---
 .../expect-puppeteer-tests.ts                 | 29 +++++++++++++++++++
 types/expect-puppeteer/index.d.ts             |  4 +--
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/types/expect-puppeteer/expect-puppeteer-tests.ts b/types/expect-puppeteer/expect-puppeteer-tests.ts
index e69de29bb2..979c34394d 100644
--- a/types/expect-puppeteer/expect-puppeteer-tests.ts
+++ b/types/expect-puppeteer/expect-puppeteer-tests.ts
@@ -0,0 +1,29 @@
+import { ElementHandle, Page } from "puppeteer";
+
+const testGlobal = async (instance: ElementHandle | Page) => {
+    await expect(instance).toClick("selector");
+    await expect(instance).toClick("selector", { polling: "mutation", text: "text" });
+    await expect(instance).toClick("selector", { polling: "raf", timeout: 777 });
+
+    await expect(instance).toDisplayDialog(async () => {});
+
+    await expect(instance).toFill("selector", "value");
+    await expect(instance).toFill("selector", "value", { polling: 777 });
+
+    await expect(instance).toMatchElement("selector", "value");
+    await expect(instance).toMatchElement("selector", "value", { polling: "mutation" });
+
+    await expect(instance).toSelect("selector", "valueOrText");
+    await expect(instance).toSelect("selector", "valueOrText", { polling: "raf" });
+
+    await expect(instance).toUploadFile("selector", "filePath");
+    await expect(instance).toUploadFile("selector", "filePath", { timeout: 777 });
+};
+
+const testImported = async (instance: ElementHandle | Page) => {
+    const expectPuppeteer = await import("expect-puppeteer");
+
+    await expectPuppeteer(instance).toClick("selector");
+    await expect(instance).toClick("selector", { polling: "mutation", text: "text" });
+    await expect(instance).toClick("selector", { polling: "raf", timeout: 777 });
+};
diff --git a/types/expect-puppeteer/index.d.ts b/types/expect-puppeteer/index.d.ts
index 5c96c4cbdf..ed89a0f709 100644
--- a/types/expect-puppeteer/index.d.ts
+++ b/types/expect-puppeteer/index.d.ts
@@ -39,7 +39,6 @@ interface ExpectPuppeteer {
     toClick(selector: string, options?: ExpectToClickOptions): Promise<void>;
     toDisplayDialog(block: () => Promise<void>): Promise<void>;
     toFill(selector: string, value: string, options?: ExpectTimingActions): Promise<void>;
-    toMatch(value: string, options?: ExpectTimingActions): Promise<void>;
     toMatchElement(selector: string, value: string, options?: ExpectTimingActions): Promise<void>;
     toSelect(selector: string, valueOrText: string, options?: ExpectTimingActions): Promise<void>;
     toUploadFile(selector: string, filePath: string, options?: ExpectTimingActions): Promise<void>;
@@ -51,4 +50,5 @@ declare global {
     }
 }
 
-export function expectPuppeteer(instance: ElementHandle | Page): ExpectPuppeteer;
+declare function expectPuppeteer(instance: ElementHandle | Page): ExpectPuppeteer;
+export = expectPuppeteer;

From 9616735d8e58e5f5be71b539d0602599d575a2d0 Mon Sep 17 00:00:00 2001
From: Matt Gibbs <matt@mtgibbs.xyz>
Date: Wed, 4 Apr 2018 21:21:55 -0400
Subject: [PATCH 1070/1382] Overhaul typings per feedback

This gets rid of the need to turn off the noImplicitAny check for the
plupload typings.  I've attempted to fix some remaining issues that the
existing tests had after "correcting" all of this.

@paulvanbrenk @patrickbussmann
---
 types/plupload/index.d.ts        | 199 ++++++++++++++++++-------------
 types/plupload/plupload-tests.ts |   1 -
 types/plupload/tsconfig.json     |   2 +-
 3 files changed, 118 insertions(+), 84 deletions(-)

diff --git a/types/plupload/index.d.ts b/types/plupload/index.d.ts
index 00dd6c7d0b..c83fd77740 100644
--- a/types/plupload/index.d.ts
+++ b/types/plupload/index.d.ts
@@ -73,31 +73,31 @@ interface plupload_queue_progress {
 }
 
 interface plupload_event {
-    (uploader: plupload): any;
+    (uploader: plupload.Uploader): any;
 }
 
 interface plupload_event_file {
-    (uploader: plupload, file: any): any;
+    (uploader: plupload.Uploader, file: any): any;
 }
 
 interface plupload_event_files {
-    (uploader: plupload, files: any[]): any;
+    (uploader: plupload.Uploader, files: any[]): any;
 }
 
 interface plupload_event_OptionChanged {
-    (uploader: plupload, name: string, value: any, oldValue: any): any;
+    (uploader: plupload.Uploader, name: string, value: any, oldValue: any): any;
 }
 
 interface plupload_event_FileUploaded {
-    (uploader: plupload, file: any, response: plupload_response): any;
+    (uploader: plupload.Uploader, file: any, response: plupload_response): any;
 }
 
 interface plupload_event_ChunkUploaded {
-    (uploader: plupload, file: any, response: plupload_chunk_response): any;
+    (uploader: plupload.Uploader, file: any, response: plupload_chunk_response): any;
 }
 
 interface plupload_event_Error {
-    (uploader: plupload, error: plupload_error): any;
+    (uploader: plupload.Uploader, error: plupload_error): any;
 }
 
 interface plupload_events {
@@ -137,63 +137,98 @@ interface plupload_error extends plupload_response {
     file: any;
 }
 
-declare class plupload {
-    static Uploader(settings: plupload_settings): void;
+declare namespace plupload {
 
-    static VERSION: string;
+    class Uploader {
 
-    static STOPPED: number;
-    static STARTED: number;
-    static QUEUED: number;
-    static UPLOADING: number;
-    static FAILED: number;
-    static DONE: number;
-    static GENERIC_ERROR: number;
-    static HTTP_ERROR: number;
-    static IO_ERROR: number;
-    static SECURITY_ERROR: number;
-    static INIT_ERROR: number;
-    static FILE_SIZE_ERROR: number;
-    static FILE_EXTENSION_ERROR: number;
-    static FILE_DUPLICATE_ERROR: number;
-    static IMAGE_FORMAT_ERROR: number;
-    static MEMORY_ERROR: number;
-    static IMAGE_DIMENSIONS_ERROR: number;
+        constructor(settings: plupload_settings);
 
-    static mimeTypes: any;
-    static ua: any;
+        /** Properties */
+        id: string;
+        state: number;
+        features: string;
+        runtime: string;
+        files: any;
+        settings: any;
+        total: plupload_queue_progress;
 
-    static typeOf(o: any): string;
-    static extend(target: any): any;
-    static guid(guid: string): string;
+        /** Methods */
+        init(): any;
+        setOption(option: string | any, value?: any): any;
+        getOption(option?: string): any;
+        refresh(): any;
+        start(): any;
+        stop(): any;
+        disableBrowse(disable: boolean): any;
+        getFile(id: string): any;
+        addFile(file: any, fileName?: string): any;
+        removeFile(file: any): any;
+        splice(start?: number, length?: number): any;
+        trigger(name: string, Multiple: any): any;
+        hasEventListener(name: string): any;
+        bind(name: string, func: any, scope?: any): any;
+        unbind(name: string, func: any): any;
+        unbindAll(): any;
+        destroy(): any;
+    }
 
-    /** Properties */
-    id: string;
-    state: number;
-    features: string;
-    runtime: string;
-    files: any;
-    settings: any;
-    total: plupload_queue_progress;
+    export const VERSION: string;
 
-    /** Methods */
-    init(): any;
-    setOption(option: string | any, value?: any): any;
-    getOption(option?: string): any;
-    refresh(): any;
-    start(): any;
-    stop(): any;
-    disableBrowse(disable: boolean): any;
-    getFile(id: string): any;
-    addFile(file: any, fileName?: string): any;
-    removeFile(file: any): any;
-    splice(start?: number, length?: number): any;
-    trigger(name: string, Multiple: any): any;
-    hasEventListener(name: string): any;
-    bind(name: string, func: any, scope: any): any;
-    unbind(name: string, func: any): any;
-    unbindAll(): any;
-    destroy(): any;
+    export const STOPPED: number;
+    export const STARTED: number;
+    export const QUEUED: number;
+    export const UPLOADING: number;
+    export const FAILED: number;
+    export const DONE: number;
+    export const GENERIC_ERROR: number;
+    export const HTTP_ERROR: number;
+    export const IO_ERROR: number;
+    export const SECURITY_ERROR: number;
+    export const INIT_ERROR: number;
+    export const FILE_SIZE_ERROR: number;
+    export const FILE_EXTENSION_ERROR: number;
+    export const FILE_DUPLICATE_ERROR: number;
+    export const IMAGE_FORMAT_ERROR: number;
+    export const MEMORY_ERROR: number;
+    export const IMAGE_DIMENSIONS_ERROR: number;
+
+    export const mimeTypes: any;
+    export const ua: any;
+
+    /**
+     * Gets the true type of the built-in object (better version of typeof).
+     * @credits Angus Croll (http://javascriptweblog.wordpress.com/)
+     *
+     * @method typeOf
+     * @static
+     * @param {Object} o Object to check.
+     * @return {String} Object [[Class]]
+     */
+    function typeOf(o: any): string;
+
+    /**
+     * Extends the specified object with another object.
+     *
+     * @method extend
+     * @static
+     * @param {Object} target Object to extend.
+     * @param {Object..} obj Multiple objects to extend with.
+     * @return {Object} Same as target, the extended object.
+     */
+    function extend(target: any): any;
+
+    /**
+     * Generates an unique ID. This is 99.99% unique since it takes the current time and 5 random numbers.
+     * The only way a user would be able to get the same ID is if the two persons at the same exact millisecond manages
+     * to get 5 the same random numbers between 0-65535 it also uses a counter so each call will be guaranteed to be page unique.
+     * It's more probable for the earth to be hit with an asteriod. You can also if you want to be 100% sure set the plupload.guidPrefix property
+     * to an user unique key.
+     *
+     * @method guid
+     * @static
+     * @return {String} Virtually unique id.
+     */
+    function guid(guid: string): string;
 
     /** Utility methods **/
 
@@ -206,7 +241,7 @@ declare class plupload {
      * @param {Object} obj Object to iterate.
      * @param {function} callback Callback function to execute for each item.
      */
-    static each(obj: any, callback: Function): void;
+    function each(obj: any, callback: Function): void;
 
     /**
      * Returns the absolute x, y position of an Element. The position will be returned in a object with x, y fields.
@@ -217,7 +252,7 @@ declare class plupload {
      * @param {Element} root Optional root element to stop calculations at.
      * @return {object} Absolute position of the specified element object with x, y fields.
      */
-    static getPos(node: Element, root: Element): any;
+    function getPos(node: Element, root: Element): any;
 
     /**
      * Returns the size of the specified node in pixels.
@@ -227,7 +262,7 @@ declare class plupload {
      * @param {Node} node Node to get the size of.
      * @return {Object} Object with a w and h property.
      */
-    static getSize(node: Node): any;
+    function getSize(node: Node): any;
 
     /**
      * Encodes the specified string.
@@ -237,7 +272,7 @@ declare class plupload {
      * @param {String} s String to encode.
      * @return {String} Encoded string.
      */
-    static xmlEncode(str: string): string;
+    function xmlEncode(str: string): string;
 
     /**
      * Forces anything into an array.
@@ -247,7 +282,7 @@ declare class plupload {
      * @param {Object} obj Object with length field.
      * @return {Array} Array object containing all items.
      */
-    static toArray(obj: any): Array<any>;
+    function toArray(obj: any): Array<any>;
 
     /**
      * Find an element in array and return its index if present, otherwise return -1.
@@ -258,7 +293,7 @@ declare class plupload {
      * @param {Array} array
      * @return {Int} Index of the element, or -1 if not found
      */
-    static inArray(needle: any, array: Array<any>): number;
+    function inArray(needle: any, array: Array<any>): number;
 
     /**
     Recieve an array of functions (usually async) to call in sequence, each  function
@@ -271,7 +306,7 @@ declare class plupload {
     @param {Array} queue Array of functions to call in sequence
     @param {Function} cb Main callback that is called in the end, or in case of error
     */
-    static inSeries(queue: Array<any>, callback: Function): void;
+    function inSeries(queue: Array<any>, callback: Function): void;
 
     /**
      * Extends the language pack object with new items.
@@ -281,7 +316,7 @@ declare class plupload {
      * @param {Object} pack Language pack items to add.
      * @return {Object} Extended language pack object.
      */
-    static addI18n(pack: any): any;
+    function addI18n(pack: any): any;
 
     /**
      * Translates the specified string by checking for the english string in the language pack lookup.
@@ -291,7 +326,7 @@ declare class plupload {
      * @param {String} str String to look for.
      * @return {String} Translated string or the input string if it wasn't found.
      */
-    static translate(str: string): string;
+    function translate(str: string): string;
 
     /**
      * Pseudo sprintf implementation - simple way to replace tokens with specified values.
@@ -299,7 +334,7 @@ declare class plupload {
      * @param {String} str String with tokens
      * @return {String} String with replaced tokens
      */
-    static sprintf(str: string): string;
+    function sprintf(str: string): string;
 
     /**
      * Checks if object is empty.
@@ -309,7 +344,7 @@ declare class plupload {
      * @param {Object} obj Object to check.
      * @return {Boolean}
      */
-    static isEmptyObj(obj: any): boolean;
+    function isEmptyObj(obj: any): boolean;
 
     /**
      * Checks if specified DOM element has specified class.
@@ -319,7 +354,7 @@ declare class plupload {
      * @param {Object} obj DOM element like object to add handler to.
      * @param {String} name Class name
      */
-    static hasClass(obj: any, name: string): any;
+    function hasClass(obj: any, name: string): any;
 
     /**
      * Adds specified className to specified DOM element.
@@ -329,7 +364,7 @@ declare class plupload {
      * @param {Object} obj DOM element like object to add handler to.
      * @param {String} name Class name
      */
-    static addClass(obj: any, name: string): any;
+    function addClass(obj: any, name: string): any;
 
     /**
      * Removes specified className from specified DOM element.
@@ -339,7 +374,7 @@ declare class plupload {
      * @param {Object} obj DOM element like object to add handler to.
      * @param {String} name Class name
      */
-    static removeClass(obj: any, name: string): any;
+    function removeClass(obj: any, name: string): any;
 
     /**
      * Returns a given computed style of a DOM element.
@@ -349,7 +384,7 @@ declare class plupload {
      * @param {Object} obj DOM element like object.
      * @param {String} name Style you want to get from the DOM element
      */
-    static getStyle(obj: any, name: string): any;
+    function getStyle(obj: any, name: string): any;
 
     /**
      * Adds an event handler to the specified object and store reference to the handler
@@ -362,7 +397,7 @@ declare class plupload {
      * @param {Function} callback Function to call when event occurs.
      * @param {String} (optional) key that might be used to add specifity to the event record.
      */
-    static addEvent(obj: any, name: string, callback: Function, key?: string);
+    function addEvent(obj: any, name: string, callback: Function, key?: string): any;
 
     /**
      * Remove event handler from the specified object. If third argument (callback)
@@ -374,7 +409,7 @@ declare class plupload {
      * @param {String} name Name of event listener to remove.
      * @param {Function|String} (optional) might be a callback or unique key to match.
      */
-    static removeEvent(obj: any, name: string, optional?: Function | string);
+    function removeEvent(obj: any, name: string, optional?: Function | string): any;
 
     /**
      * Remove all kind of events from the specified object
@@ -384,7 +419,7 @@ declare class plupload {
      * @param {Object} obj DOM element to remove event listeners from.
      * @param {String} (optional) unique key to match, when removing events.
      */
-    static removeAllEvents(obj: any, key?: string);
+    function removeAllEvents(obj: any, key?: string): any;
 
     /**
      * Cleans the specified name from national characters (diacritics). The result will be a name with only a-z, 0-9 and _.
@@ -394,7 +429,7 @@ declare class plupload {
      * @param {String} s String to clean up.
      * @return {String} Cleaned string.
      */
-    static cleanName(name: string): string;
+    function cleanName(name: string): string;
 
     /**
      * Builds a full url out of a base URL and an object with items to append as query string items.
@@ -405,7 +440,7 @@ declare class plupload {
      * @param {Object} items Name/value object to serialize as a querystring.
      * @return {String} String with url + serialized query string items.
      */
-    static buildUrl(url, items): string;
+    function buildUrl(url: string, items: any): string;
 
     /**
      * Formats the specified number as a size string for example 1024 becomes 1 KB.
@@ -415,7 +450,7 @@ declare class plupload {
      * @param {Number} size Size to format as string.
      * @return {String} Formatted size string.
      */
-    static formatSize(size: number): string;
+    function formatSize(size: number): string;
 
     /**
      * Parses the specified size string into a byte value. For example 10kb becomes 10240.
@@ -425,7 +460,7 @@ declare class plupload {
      * @param {String|Number} size String to parse or number to just pass through.
      * @return {Number} Size in bytes.
      */
-    static parseSize(size: number | string): number;
+    function parseSize(size: number | string): number;
 
 
     /**
@@ -438,7 +473,7 @@ declare class plupload {
      * @param {String} [runtimes] Comma-separated list of runtimes to check against
      * @return {String} Type of compatible runtime
      */
-    static predictRuntime(config: any, runtimes: string): string;
+    function predictRuntime(config: any, runtimes: string): string;
 
     /**
      * Registers a filter that will be executed for each file added to the queue.
@@ -452,5 +487,5 @@ declare class plupload {
      * @param {String} name Name of the filter by which it can be referenced in settings.filters
      * @param {String} cb Callback - the actual routine that every added file must pass
      */
-    static addFileFilter(name: string, cb: Function): void;
+    function addFileFilter(name: string, cb: Function): void;
 }
diff --git a/types/plupload/plupload-tests.ts b/types/plupload/plupload-tests.ts
index b03cc458ff..2a416a0bbc 100644
--- a/types/plupload/plupload-tests.ts
+++ b/types/plupload/plupload-tests.ts
@@ -9,7 +9,6 @@ import 'plupload';
     uploader.init();
     uploader.start();
 
-
     uploader.bind('FilesAdded', function (up: any, files: any) {
         var html = '';
         plupload.each(files, function (file: any) {
diff --git a/types/plupload/tsconfig.json b/types/plupload/tsconfig.json
index ae69b36956..d7dc70a3bd 100644
--- a/types/plupload/tsconfig.json
+++ b/types/plupload/tsconfig.json
@@ -5,7 +5,7 @@
             "es6",
             "dom"
         ],
-        "noImplicitAny": false,
+        "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": false,
         "strictFunctionTypes": true,

From 461c0d67dd50c8153d562abf11129648fde1d36e Mon Sep 17 00:00:00 2001
From: Joshua Goldberg <josh@fullscreenmario.com>
Date: Wed, 4 Apr 2018 19:49:49 -0700
Subject: [PATCH 1071/1382] TS@2.4; lint disablement

---
 types/expect-puppeteer/index.d.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/expect-puppeteer/index.d.ts b/types/expect-puppeteer/index.d.ts
index ed89a0f709..7b33ef686c 100644
--- a/types/expect-puppeteer/index.d.ts
+++ b/types/expect-puppeteer/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/smooth-code/jest-puppeteer
 // Definitions by: Josh Goldberg <https://github.com/JoshuaKGoldberg>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.4
 
 /// <reference types="jest" />
 
@@ -46,6 +46,7 @@ interface ExpectPuppeteer {
 
 declare global {
     namespace jest {
+        // tslint:disable-next-line no-empty-interface
         interface Matchers<R> extends ExpectPuppeteer { }
     }
 }

From 1f18ca2c554075348bf7d63235506b8359f26edb Mon Sep 17 00:00:00 2001
From: jemmyphan <jemmyphan94@gmail.com>
Date: Thu, 5 Apr 2018 10:18:43 +0700
Subject: [PATCH 1072/1382] [react-navigation] update transitionConfig
 (transitionConfig accept 3 params)

---
 types/react-navigation/index.d.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index fcfb8d4988..9aafc994fb 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -280,7 +280,11 @@ export interface NavigationStackViewConfig {
   mode?: 'card' | 'modal';
   headerMode?: HeaderMode;
   cardStyle?: StyleProp<ViewStyle>;
-  transitionConfig?: () => TransitionConfig;
+  transitionConfig?: (
+    transitionProps: NavigationTransitionProps,
+    prevTransitionProps: NavigationTransitionProps,
+    isModal: boolean,
+  ) => TransitionConfig;
   onTransitionStart?: () => void;
   onTransitionEnd?: () => void;
 }

From e60ab3a1729ff95d630f4c75dca20643112f2824 Mon Sep 17 00:00:00 2001
From: Princess Rosella <princess.rosella.of.daventry@gmail.com>
Date: Wed, 4 Apr 2018 23:52:30 -0700
Subject: [PATCH 1073/1382] pngjs: Fixed PNG.sync.write method signature

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

diff --git a/types/pngjs/index.d.ts b/types/pngjs/index.d.ts
index ece3434de1..d5476e9e1f 100644
--- a/types/pngjs/index.d.ts
+++ b/types/pngjs/index.d.ts
@@ -24,7 +24,7 @@ export class PNG extends Duplex {
 
 	static sync: {
 		read(buffer: Buffer, options?: ParserOptions): PNG;
-		write(buffer: Buffer, options?: PackerOptions): PNG;
+		write(png: PNG, options?: PackerOptions): Buffer;
 	};
 
 	constructor(options?: PNGOptions);

From 85d38719e6a0df163591460fcdafd3f244ab8a28 Mon Sep 17 00:00:00 2001
From: Richard <konsultaner@users.noreply.github.com>
Date: Thu, 5 Apr 2018 15:11:00 +0200
Subject: [PATCH 1074/1382] Fixes types for `args` and `OnChallangeHandler`

Fixes https://github.com/DefinitelyTyped/DefinitelyTyped/issues/24408

The Subscribe Handler and the call may use send an `any` if args only contain one element.
---
 types/autobahn/index.d.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/types/autobahn/index.d.ts b/types/autobahn/index.d.ts
index 969c703478..59bb2c404d 100644
--- a/types/autobahn/index.d.ts
+++ b/types/autobahn/index.d.ts
@@ -25,7 +25,7 @@ declare namespace autobahn {
 
         leave(reason: string, message: string): void;
 
-        call<TResult>(procedure: string, args?: any[], kwargs?: any, options?: ICallOptions): When.Promise<TResult>;
+        call<TResult>(procedure: string, args?: any[] | any, kwargs?: any, options?: ICallOptions): When.Promise<TResult>;
 
         publish(topic: string, args?: any[], kwargs?: any, options?: IPublishOptions): When.Promise<IPublication>;
 
@@ -96,7 +96,7 @@ declare namespace autobahn {
         kwargs: any;
     }
 
-    type SubscribeHandler = (args?: any[], kwargs?: any, details?: IEvent) => void;
+    type SubscribeHandler = (args?: any[] | any, kwargs?: any, details?: IEvent) => void;
 
     interface ISubscription {
         topic: string;
@@ -206,7 +206,7 @@ declare namespace autobahn {
 
     type DeferFactory = () => When.Promise<any>;
 
-    type OnChallengeHandler = (session: Session, method: string, extra: any) => string;
+    type OnChallengeHandler = (session: Session, method: string, extra: any) => string | When.Promise<string>;
 
     interface IConnectionOptions {
         use_es6_promises?: boolean;

From 23361b3499e92e67f5bb9a9cec9f541fdbfbcbdc Mon Sep 17 00:00:00 2001
From: Sergei Samsonov <osenvosem@gmail.com>
Date: Thu, 5 Apr 2018 14:16:29 +0300
Subject: [PATCH 1075/1382] Update pre hooks type definitions

---
 types/mongoose/index.d.ts        |  78 +++++++++++++++++++--
 types/mongoose/mongoose-tests.ts | 112 +++++++++++++++++++++++++++++++
 2 files changed, 184 insertions(+), 6 deletions(-)

diff --git a/types/mongoose/index.d.ts b/types/mongoose/index.d.ts
index e9576b5098..35763d2131 100644
--- a/types/mongoose/index.d.ts
+++ b/types/mongoose/index.d.ts
@@ -618,8 +618,74 @@ declare module "mongoose" {
     /**
      * Defines a pre hook for the document.
      */
-    pre(method: string, parallel: boolean, fn: HookAsyncCallback, errorCb?: HookErrorCallback): this;
-    pre(method: string, fn: HookSyncCallback, errorCb?: HookErrorCallback): this;
+    pre<T extends Document = Document>(
+      method: "init" | "validate" | "save" | "remove",
+      fn: HookSyncCallback<T>,
+      errorCb?: HookErrorCallback
+    ): this;
+    pre<T extends Query<any> = Query<any>>(
+      method:
+        | "count"
+        | "find"
+        | "findOne"
+        | "findOneAndRemove"
+        | "findOneAndUpdate"
+        | "update",
+      fn: HookSyncCallback<T>,
+      errorCb?: HookErrorCallback
+    ): this;
+    pre<T extends Aggregate<any> = Aggregate<any>>(
+      method: "aggregate",
+      fn: HookSyncCallback<T>,
+      errorCb?: HookErrorCallback
+    ): this;
+    pre<T extends Model<Document> = Model<Document>>(
+      method: "insertMany",
+      fn: HookSyncCallback<T>,
+      errorCb?: HookErrorCallback
+    ): this;
+    pre<T extends Document | Model<Document> | Query<any> | Aggregate<any>>(
+      method: string,
+      fn: HookSyncCallback<T>,
+      errorCb?: HookErrorCallback
+    ): this;
+
+    pre<T extends Document = Document>(
+      method: "init" | "validate" | "save" | "remove",
+      parallel: boolean,
+      fn: HookAsyncCallback<T>,
+      errorCb?: HookErrorCallback
+    ): this;
+    pre<T extends Query<any> = Query<any>>(
+      method:
+        | "count"
+        | "find"
+        | "findOne"
+        | "findOneAndRemove"
+        | "findOneAndUpdate"
+        | "update",
+      parallel: boolean,
+      fn: HookAsyncCallback<T>,
+      errorCb?: HookErrorCallback
+    ): this;
+    pre<T extends Aggregate<any> = Aggregate<any>>(
+      method: "aggregate",
+      parallel: boolean,
+      fn: HookAsyncCallback<T>,
+      errorCb?: HookErrorCallback
+    ): this;
+    pre<T extends Model<Document> = Model<Document>>(
+      method: "insertMany",
+      parallel: boolean,
+      fn: HookAsyncCallback<T>,
+      errorCb?: HookErrorCallback
+    ): this;
+    pre<T extends Document | Model<Document> | Query<any> | Aggregate<any>>(
+      method: string,
+      parallel: boolean,
+      fn: HookAsyncCallback<T>,
+      errorCb?: HookErrorCallback
+    ): this;
 
     /**
      * Adds a method call to the queue.
@@ -679,12 +745,12 @@ declare module "mongoose" {
   }
 
   // Hook functions: https://github.com/vkarpov15/hooks-fixed
-  interface HookSyncCallback {
-    (next: HookNextFunction): any;
+  interface HookSyncCallback<T> {
+    (this: T, next: HookNextFunction): Promise<any> | void;
   }
 
-  interface HookAsyncCallback {
-    (next: HookNextFunction, done: HookDoneFunction): any;
+  interface HookAsyncCallback<T> {
+    (this: T, next: HookNextFunction, done: HookDoneFunction): Promise<any> | void;
   }
 
   interface HookErrorCallback {
diff --git a/types/mongoose/mongoose-tests.ts b/types/mongoose/mongoose-tests.ts
index bf2f61f4a3..963de3eb0e 100644
--- a/types/mongoose/mongoose-tests.ts
+++ b/types/mongoose/mongoose-tests.ts
@@ -260,6 +260,118 @@ schema.plugin(function (schema, opts) {
   }
 }).plugin(cb, {opts: true});
 
+/* `.pre` hook tests */
+
+interface PreHookTestDocumentInterface extends mongoose.Document {}
+interface PreHookTestQueryInterface<T> extends mongoose.Query<T> {}
+interface PreHookTestAggregateInterface<T> extends mongoose.Aggregate<T> {}
+interface PreHookTestModelInterface<T extends mongoose.Document> extends mongoose.Model<T> {}
+
+// it is used to ensure that all testing cases return a value of mongoose.Schema type
+const preHookTestSchemaArr: mongoose.Schema[] = [];
+
+// testing order:
+//   serial with default value and returning void
+//   serial with a type argument and returning a promise
+//   parallel with default value and returning void
+//   parallel with a type argument and returning a promise
+
+// Document
+preHookTestSchemaArr.push(
+  schema.pre("init", function (next) {
+    const isDefaultType: mongoose.Document = this;
+  }, err => {})
+);
+preHookTestSchemaArr.push(
+  schema.pre<PreHookTestDocumentInterface>("init", function (next) {
+    const isSpecificType: PreHookTestDocumentInterface = this;
+    return Promise.resolve("");
+  }, err => {})
+);
+preHookTestSchemaArr.push(
+  schema.pre("init", true, function (next, done) {
+    const isDefaultType: mongoose.Document = this;
+  }, err => {})
+);
+preHookTestSchemaArr.push(
+  schema.pre<PreHookTestDocumentInterface>("init", true, function (next, done) {
+    const isSpecificType: PreHookTestDocumentInterface = this;
+    return Promise.resolve("");
+  }, err => {})
+);
+
+// Query
+preHookTestSchemaArr.push(
+  schema.pre("count", function (next) {
+    const isDefaultType: mongoose.Query<any> = this;
+  }, err => {})
+);
+preHookTestSchemaArr.push(
+  schema.pre<PreHookTestQueryInterface<number>>("count", function (next) {
+    const isSpecificType: PreHookTestQueryInterface<number> = this;
+    return Promise.resolve("");
+  }, err => {})
+);
+preHookTestSchemaArr.push(
+  schema.pre("count", true, function (next, done) {
+    const isDefaultType: mongoose.Query<any> = this;
+  }, err => {})
+);
+preHookTestSchemaArr.push(
+  schema.pre<PreHookTestQueryInterface<number>>("count", true, function (next, done) {
+    const isSpecificType: PreHookTestQueryInterface<number> = this;
+    return Promise.resolve("");
+  }, err => {})
+);
+
+// Aggregate
+preHookTestSchemaArr.push(
+  schema.pre("aggregate", function(next) {
+    const isDefaultType: mongoose.Aggregate<any> = this;
+  }, err => {})
+);
+preHookTestSchemaArr.push(
+  schema.pre<PreHookTestAggregateInterface<number>>("aggregate", function(next) {
+    const isSpecificType: PreHookTestAggregateInterface<number> = this;
+    return Promise.resolve("")
+  }, err => {})
+);
+preHookTestSchemaArr.push(
+  schema.pre("aggregate", true, function(next, done) {
+    const isDefaultType: mongoose.Aggregate<any> = this;
+  }, err => {})
+);
+preHookTestSchemaArr.push(
+  schema.pre<PreHookTestAggregateInterface<number>>("aggregate", true, function(next, done) {
+    const isSpecificType: PreHookTestAggregateInterface<number> = this;
+    return Promise.resolve("")
+  }, err => {})
+);
+
+// Model<Document>
+preHookTestSchemaArr.push(
+  schema.pre("insertMany", function(next) {
+    const isDefaultType: mongoose.Model<mongoose.Document> = this;
+  }, err => {})
+);
+preHookTestSchemaArr.push(
+  schema.pre<PreHookTestModelInterface<PreHookTestDocumentInterface>>("insertMany", function(next) {
+    const isSpecificType: PreHookTestModelInterface<PreHookTestDocumentInterface> = this;
+    return Promise.resolve("")
+  }, err => {})
+);
+preHookTestSchemaArr.push(
+  schema.pre("insertMany", true, function(next, done) {
+    const isDefaultType: mongoose.Model<mongoose.Document> = this;
+  }, err => {})
+);
+preHookTestSchemaArr.push(
+  schema.pre<PreHookTestModelInterface<PreHookTestDocumentInterface>>("insertMany", true, function(next, done) {
+    const isSpecificType: PreHookTestModelInterface<PreHookTestDocumentInterface> = this;
+    return Promise.resolve("")
+  }, err => {})
+);
+
 schema
 .post('save', function (error, doc, next) {
   error.stack;

From 0104de233468bda68376307c5d27b3057807e1bb Mon Sep 17 00:00:00 2001
From: Shenghan Gao <shenghang@nvidia.com>
Date: Thu, 5 Apr 2018 10:23:58 -0700
Subject: [PATCH 1076/1382] fix a typo

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

diff --git a/types/mongoose/index.d.ts b/types/mongoose/index.d.ts
index 4cd32a0126..81974b2ee0 100644
--- a/types/mongoose/index.d.ts
+++ b/types/mongoose/index.d.ts
@@ -2619,7 +2619,7 @@ declare module "mongoose" {
     insertMany(docs: any[], callback?: (error: any, docs: T[]) => void): Promise<T[]>;
     insertMany(docs: any[], options?: { ordered?: boolean, rawResult?: boolean }, callback?: (error: any, docs: T[]) => void): Promise<T[]>;
     insertMany(doc: any, callback?: (error: any, doc: T) => void): Promise<T>;
-    insertMany(doc: any, options?: { rdered?: boolean, rawResult?: boolean }, callback?: (error: any, doc: T) => void): Promise<T>;
+    insertMany(doc: any, options?: { ordered?: boolean, rawResult?: boolean }, callback?: (error: any, doc: T) => void): Promise<T>;
 
     /**
      * Executes a mapReduce command.

From 420e69a0c960f0dc2daf7008b4121ccaacdebff4 Mon Sep 17 00:00:00 2001
From: Joshua Goldberg <josh@fullscreenmario.com>
Date: Thu, 5 Apr 2018 12:40:40 -0700
Subject: [PATCH 1077/1382] Used sub-monorepo link

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

diff --git a/types/expect-puppeteer/index.d.ts b/types/expect-puppeteer/index.d.ts
index 7b33ef686c..12f19c785d 100644
--- a/types/expect-puppeteer/index.d.ts
+++ b/types/expect-puppeteer/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for expect-puppeteer 2.2
-// Project: https://github.com/smooth-code/jest-puppeteer
+// Project: https://github.com/smooth-code/jest-puppeteer/tree/master/packages/expect-puppeteer
 // Definitions by: Josh Goldberg <https://github.com/JoshuaKGoldberg>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4

From fd6ea7aba8c8e221c4b109d2a08fc11557a6715b Mon Sep 17 00:00:00 2001
From: Joshua Goldberg <josh@fullscreenmario.com>
Date: Thu, 5 Apr 2018 12:41:29 -0700
Subject: [PATCH 1078/1382] Used sub-monorepo link

---
 types/jest-environment-puppeteer/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/jest-environment-puppeteer/index.d.ts b/types/jest-environment-puppeteer/index.d.ts
index abb0ad02d1..e22bee2f7d 100644
--- a/types/jest-environment-puppeteer/index.d.ts
+++ b/types/jest-environment-puppeteer/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for jest-environment-puppeteer 2.2
-// Project: https://github.com/smooth-code/jest-puppeteer
+// Project: https://github.com/smooth-code/jest-puppeteer/tree/master/packages/jest-environment-puppeteer
 // Definitions by: Josh Goldberg <https://github.com/joshuakgoldberg>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3

From 51818eb371559273921bf5526896ef33d479e6ea Mon Sep 17 00:00:00 2001
From: AndersonFriaca <afriacaxd@gmail.com>
Date: Thu, 5 Apr 2018 15:51:13 -0400
Subject: [PATCH 1079/1382] Adjustments for JQuery CountTo

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

diff --git a/types/jquery-countto/index.d.ts b/types/jquery-countto/index.d.ts
index a215abb7d4..a815340d0b 100644
--- a/types/jquery-countto/index.d.ts
+++ b/types/jquery-countto/index.d.ts
@@ -35,7 +35,7 @@ export interface Options {
     /**
      * A handler that is used to format the current value before rendering to the DOM
      */
-    formatter: (value: number, options: Options) => string;
+    formatter?: (value: number, options: Options) => string;
 
     /**
      * A callback function that is triggered for every iteration that the counter updates

From 157d57188b3f27b58d6aeae6832ced68fdf18866 Mon Sep 17 00:00:00 2001
From: guilhermehubner <guilherme_hubner@msn.com>
Date: Thu, 5 Apr 2018 15:10:00 -0300
Subject: [PATCH 1080/1382] [react-places-autocomplete] Adding disabled option
 to

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

diff --git a/types/react-places-autocomplete/index.d.ts b/types/react-places-autocomplete/index.d.ts
index 73a8e7ae55..667106d916 100644
--- a/types/react-places-autocomplete/index.d.ts
+++ b/types/react-places-autocomplete/index.d.ts
@@ -21,6 +21,7 @@ export interface PropTypes {
         name?: string;
         placeholder?: string;
         onBlur?: (event: React.FocusEvent<HTMLInputElement>) => void;
+        disabled?: boolean;
     };
     onError?: (status: string, clearSuggestion: () => void) => void;
     onSelect?: (address: string, placeID: string) => void;

From 914559196c8c1c0b3df87e7d29a3a10f0ec55b01 Mon Sep 17 00:00:00 2001
From: AndersonFriaca <afriacaxd@gmail.com>
Date: Thu, 5 Apr 2018 15:54:19 -0400
Subject: [PATCH 1081/1382] Adjustments for JQuery CountTo

---
 types/jquery-countto/jquery-countto-tests.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/jquery-countto/jquery-countto-tests.ts b/types/jquery-countto/jquery-countto-tests.ts
index 0bc7998f56..07ec15518b 100644
--- a/types/jquery-countto/jquery-countto-tests.ts
+++ b/types/jquery-countto/jquery-countto-tests.ts
@@ -21,6 +21,7 @@ const options: Options = {
   };
 
 $('.timer').countTo(options);
+$('.timer').countTo({from: 50});
 
 // Controls
 $('.timer').countTo('start');

From 86765719a3588de58bac8fff2869b569cd7ed678 Mon Sep 17 00:00:00 2001
From: Julien Chaumond <chaumond@gmail.com>
Date: Thu, 5 Apr 2018 17:34:14 -0400
Subject: [PATCH 1082/1382] [mongodb] since v3 of the driver, `aggregate` calls
 back with an AggregationCursor

---
 types/mongodb/index.d.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/types/mongodb/index.d.ts b/types/mongodb/index.d.ts
index 0ebe9203bb..4fb7dc68f6 100644
--- a/types/mongodb/index.d.ts
+++ b/types/mongodb/index.d.ts
@@ -8,6 +8,7 @@
 //                 Mariano Cortesi <https://github.com/mcortesi>
 //                 Enrico Picci <https://github.com/EnricoPicci>
 //                 Alexander Christie <https://github.com/AJCStriker>
+//                 Julien Chaumond <https://github.com/julien-c>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -465,8 +466,8 @@ export interface Collection<TSchema = Default> {
     // Get current index hint for collection.
     hint: any;
     /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#aggregate */
-    aggregate<T = TSchema>(pipeline: Object[], callback: MongoCallback<T[]>): AggregationCursor<T>;
-    aggregate<T = TSchema>(pipeline: Object[], options?: CollectionAggregationOptions, callback?: MongoCallback<T[]>): AggregationCursor<T>;
+    aggregate<T = TSchema>(pipeline: Object[], callback: MongoCallback<AggregationCursor<T>>): AggregationCursor<T>;
+    aggregate<T = TSchema>(pipeline: Object[], options?: CollectionAggregationOptions, callback?: MongoCallback<AggregationCursor<T>>): AggregationCursor<T>;
     /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#bulkWrite */
     bulkWrite(operations: Object[], callback: MongoCallback<BulkWriteOpResultObject>): void;
     bulkWrite(operations: Object[], options?: CollectionBluckWriteOptions): Promise<BulkWriteOpResultObject>;

From ca4d656606d7d9577f26b2814610210bbc8bf1f2 Mon Sep 17 00:00:00 2001
From: Jeremy Stucki <jeremy@interactivethings.com>
Date: Thu, 5 Apr 2018 23:59:44 +0200
Subject: [PATCH 1083/1382] Remove catalog

---
 notNeededPackages.json          |   6 ++
 types/catalog/catalog-tests.tsx |  42 ------------
 types/catalog/index.d.ts        | 109 --------------------------------
 types/catalog/tsconfig.json     |  25 --------
 types/catalog/tslint.json       |   3 -
 5 files changed, 6 insertions(+), 179 deletions(-)
 delete mode 100644 types/catalog/catalog-tests.tsx
 delete mode 100644 types/catalog/index.d.ts
 delete mode 100644 types/catalog/tsconfig.json
 delete mode 100644 types/catalog/tslint.json

diff --git a/notNeededPackages.json b/notNeededPackages.json
index cbfcc651a1..0f318582a8 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -210,6 +210,12 @@
             "sourceRepoURL": "https://github.com/blakeembrey/camel-case",
             "asOfVersion": "1.2.1"
         },
+        {
+            "libraryName": "catalog",
+            "typingsPackageName": "catalog",
+            "sourceRepoURL": "https://github.com/interactivethings/catalog",
+            "asOfVersion": "3.5.0"
+        },
         {
             "libraryName": "chalk",
             "typingsPackageName": "chalk",
diff --git a/types/catalog/catalog-tests.tsx b/types/catalog/catalog-tests.tsx
deleted file mode 100644
index 37a87540d1..0000000000
--- a/types/catalog/catalog-tests.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import * as React from "react";
-import { Config, render, markdown, Catalog, ReactSpecimen, Page } from "catalog";
-
-const config: Config = {
-  title: 'Test',
-  pages: [
-    {
-      path: '/',
-      title: 'Introduction',
-      content: '/patd/to/file.md',
-    },
-    {
-      path: '/materials',
-      title: 'Materials',
-      pages: [
-        {
-          path: '/materials/typeface',
-          title: 'Typeface',
-          component: <Page />,
-        },
-      ],
-    },
-  ],
-  useBrowserHistory: true,
-  basePath: '/doc',
-  responsiveSizes: [
-    { name: 'large', width: 978, height: 1100 },
-    { name: 'medium', width: 640, height: 900 },
-    { name: 'small', width: 471, height: 700 },
-  ],
-};
-
-render(config, document.body);
-<Catalog {...config} />;
-
-markdown`
-# Test
-
-${<ReactSpecimen sourceText='.'>
-  <div />
-</ReactSpecimen>}
-`;
diff --git a/types/catalog/index.d.ts b/types/catalog/index.d.ts
deleted file mode 100644
index 3476e86641..0000000000
--- a/types/catalog/index.d.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-// Type definitions for catalog 3.2
-// Project: https://github.com/interactivethings/catalog/
-// Definitions by: Peter Gassner <https://github.com/grossbart>, Tomas Carnecky <https://github.com/wereHamster>
-// Definitions: https://github.com/interactivethings/catalog/
-// TypeScript Version: 2.6
-
-import * as React from "react";
-
-// Configuration
-
-// XXX: Can not name this 'Page' because there's already a 'Page'
-// component here.
-export interface ConfigPage {
-  path: string;
-  title: string;
-
-  content?: any;
-  component?: any;
-  pages?: ConfigPage[];
-}
-
-export interface ConfigResponsiveSize {
-  name: string;
-  width: number;
-  height: number;
-}
-
-export interface Config {
-  title: string;
-  pages: ConfigPage[];
-
-  useBrowserHistory?: boolean;
-  basePath?: string;
-  responsiveSizes?: ConfigResponsiveSize[];
-}
-
-export function render(config: Config, element: HTMLElement): void;
-export function configure(config: any): any;
-export function configureRoutes(config: any): any;
-export function configureJSXRoutes(config: any): any;
-
-export function pageLoader(f: () => Promise<any>): any;
-export function markdown(...x: any[]): JSX.Element;
-
-// Components
-export interface DefaultCatalogProps extends React.Props<{}> {
-  span?: number;
-  theme?: any;
-}
-
-export class Card extends React.Component<DefaultCatalogProps> {}
-export class Page extends React.Component<DefaultCatalogProps> {}
-export interface SpanProps extends DefaultCatalogProps {
-  style?: any;
-}
-export class Span extends React.Component<SpanProps> {}
-
-// Specimens
-export class AudioSpecimen extends React.Component<DefaultCatalogProps> {}
-
-export interface CodeSpecimenProps extends DefaultCatalogProps {
-  rawBody: string;
-  collapsed: boolean;
-  lang: string;
-  raw: boolean;
-}
-export class CodeSpecimen extends React.Component<CodeSpecimenProps> {}
-
-export interface ColorSpecimenProps extends DefaultCatalogProps {
-  value: string;
-  name: string;
-}
-export class ColorSpecimen extends React.Component<ColorSpecimenProps> {}
-
-export interface ColorPaletteSpecimenProps extends DefaultCatalogProps {
-  colors: Array<{name?: string, value: string}>;
-  horizontal?: boolean;
-}
-export class ColorPaletteSpecimen extends React.Component<ColorPaletteSpecimenProps> {}
-
-export class HtmlSpecimen extends React.Component<DefaultCatalogProps> {}
-export class HintSpecimen extends React.Component<DefaultCatalogProps> {}
-export class ImageSpecimen extends React.Component<DefaultCatalogProps> {}
-
-export interface TypeSpecimenProps extends DefaultCatalogProps {
-  color?: string;
-  font: string;
-  headings: string[] | number[];
-  style?: string;
-  weight: string;
-}
-export class TypeSpecimen extends React.Component<TypeSpecimenProps> {}
-export class DownloadSpecimen extends React.Component<DefaultCatalogProps> {}
-
-export interface ReactSpecimenProps extends DefaultCatalogProps {
-  noSource?: boolean;
-  plain?: boolean;
-  light?: boolean;
-  dark?: boolean;
-  frame?: boolean;
-  state?: any;
-  responsive?: boolean | string | string[];
-  sourceText?: string;
-}
-export class ReactSpecimen extends React.Component<ReactSpecimenProps> {}
-
-export class VideoSpecimen extends React.Component<DefaultCatalogProps> {}
-
-export class Catalog extends React.Component<Config> {}
diff --git a/types/catalog/tsconfig.json b/types/catalog/tsconfig.json
deleted file mode 100644
index ee00ec7af2..0000000000
--- a/types/catalog/tsconfig.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true,
-        "jsx": "react"
-    },
-    "files": [
-        "index.d.ts",
-        "catalog-tests.tsx"
-    ]
-}
\ No newline at end of file
diff --git a/types/catalog/tslint.json b/types/catalog/tslint.json
deleted file mode 100644
index b4b47a0378..0000000000
--- a/types/catalog/tslint.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-	"extends": "dtslint/dt.json"
-}

From 4d7b0c1f0a204a6816e82b7d2410bd82a7358e37 Mon Sep 17 00:00:00 2001
From: Jim Bouquet <jbouquet@clearblade.com>
Date: Thu, 5 Apr 2018 17:10:03 -0500
Subject: [PATCH 1084/1382] Added type definitions for clearbladejs-client,
 clearbladejs-server, and clearbladejs-node.

---
 .../clearbladejs-client-tests.ts              | 193 ++++++++
 types/clearbladejs-client/global.d.ts         |   5 +
 types/clearbladejs-client/index.d.ts          | 441 ++++++++++++++++++
 types/clearbladejs-client/tsconfig.json       |  32 ++
 types/clearbladejs-client/tslint.json         |  79 ++++
 .../clearbladejs-node-tests.ts                | 128 +++++
 types/clearbladejs-node/index.d.ts            | 256 ++++++++++
 types/clearbladejs-node/tsconfig.json         |  34 ++
 types/clearbladejs-node/tslint.json           |  79 ++++
 .../clearbladejs-server-tests.ts              | 192 ++++++++
 types/clearbladejs-server/global.d.ts         |   5 +
 types/clearbladejs-server/index.d.ts          | 336 +++++++++++++
 types/clearbladejs-server/tsconfig.json       |  32 ++
 types/clearbladejs-server/tslint.json         |  79 ++++
 14 files changed, 1891 insertions(+)
 create mode 100644 types/clearbladejs-client/clearbladejs-client-tests.ts
 create mode 100644 types/clearbladejs-client/global.d.ts
 create mode 100644 types/clearbladejs-client/index.d.ts
 create mode 100644 types/clearbladejs-client/tsconfig.json
 create mode 100644 types/clearbladejs-client/tslint.json
 create mode 100644 types/clearbladejs-node/clearbladejs-node-tests.ts
 create mode 100644 types/clearbladejs-node/index.d.ts
 create mode 100644 types/clearbladejs-node/tsconfig.json
 create mode 100644 types/clearbladejs-node/tslint.json
 create mode 100644 types/clearbladejs-server/clearbladejs-server-tests.ts
 create mode 100644 types/clearbladejs-server/global.d.ts
 create mode 100644 types/clearbladejs-server/index.d.ts
 create mode 100644 types/clearbladejs-server/tsconfig.json
 create mode 100644 types/clearbladejs-server/tslint.json

diff --git a/types/clearbladejs-client/clearbladejs-client-tests.ts b/types/clearbladejs-client/clearbladejs-client-tests.ts
new file mode 100644
index 0000000000..9aece4b19a
--- /dev/null
+++ b/types/clearbladejs-client/clearbladejs-client-tests.ts
@@ -0,0 +1,193 @@
+// Testing type definitions for clearbladejs Client SDK v1.0.0
+// Project: https://github.com/ClearBlade/JavaScript-API
+// Definitions by: Jim Bouquet <https://github.com/ClearBlade/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+var genericCallback = function(error: boolean, response: Resp) {};
+
+///////////////////////////////////////
+//ClearBlade object API invocations
+///////////////////////////////////////
+ClearBlade.init({
+    systemKey: "abcdef",
+    systemSecret: "abcdefg",
+    callback: genericCallback
+});
+
+ClearBlade.setUser("test@test.com", "password");
+ClearBlade.registerUser("test@test.com", "password", genericCallback);
+ClearBlade.isCurrentUserAuthenticated(genericCallback);
+ClearBlade.logoutUser(genericCallback);
+ClearBlade.loginAnon(genericCallback);
+ClearBlade.loginUser("test@test.com", "password", genericCallback);
+ClearBlade.loginUserMqtt("test@test.com", "password", genericCallback);
+ClearBlade.sendPush(["user1", "user2"], {data: "Test"}, "appId: string", genericCallback);
+ClearBlade.getAllCollections(genericCallback);
+
+var coll1 = ClearBlade.Collection("collectionID");
+var coll2 = ClearBlade.Collection({ collectionName: "collectionName" });
+var coll3 = ClearBlade.Collection({ collectionID: "collectionID" });
+
+var query1 = ClearBlade.Query("collectionID");
+var query2 = ClearBlade.Query({ offset: 5, limit: 5, collectionID: "collectionID" });
+var query3 = ClearBlade.Query({ collectionName: "collectionName" });
+
+var item1 = ClearBlade.Item({}, "collectionID");
+var item2 = ClearBlade.Item({}, { collectionID: "collectionID" });
+
+var code = ClearBlade.Code();
+var user = ClearBlade.User();
+
+var messaging = ClearBlade.Messaging({}, genericCallback);
+var stats = ClearBlade.MessagingStats();
+
+var edge = ClearBlade.Edge();
+var metrics = ClearBlade.Metrics();
+var device = ClearBlade.Device();
+var analytics = ClearBlade.Analytics();
+var portal = ClearBlade.Portal("MyPortal");
+var triggers = ClearBlade.Triggers();
+
+ClearBlade.getEdges(query1.query, genericCallback);
+
+///////////////////////////////////////
+//Collection API invocations
+///////////////////////////////////////
+coll1.fetch(query1.query, genericCallback);
+coll1.create(ClearBlade.Item({}, ""), genericCallback);
+coll1.update(query1.query, {}, genericCallback);
+coll1.remove(query1.query, genericCallback);
+coll1.columns(genericCallback);
+coll1.count(query1.query, genericCallback);
+
+///////////////////////////////////////
+//Query API invocations
+///////////////////////////////////////
+query1.addSortToQuery(
+    query1,
+    QuerySortDirections.QUERY_SORT_ASCENDING,
+    "column1"
+);
+query1.addFilterToQuery(
+    query1,
+    QueryConditions.QUERY_GREATERTHAN,
+    "key",
+    "value"
+);
+query1.ascending("string");
+query1.descending("string");
+query1.equalTo("string", "string");
+query1.greaterThan("string", 2);
+query1.greaterThanEqualTo("string", false);
+query1.lessThan("string", "string");
+query1.lessThanEqualTo("string", "string");
+query1.notEqualTo("string", "string");
+query1.matches("string", new RegExp(/.*/));
+query1.or(query2);
+query1.setPage(1, 1);
+query1.fetch(genericCallback);
+query1.update({}, genericCallback);
+query1.columns([]);
+query1.remove(genericCallback);
+
+///////////////////////////////////////
+//Item API invocations
+///////////////////////////////////////
+item1.save(genericCallback);
+item1.refresh(genericCallback);
+item1.destroy(genericCallback);
+
+///////////////////////////////////////
+//Code API invocations
+///////////////////////////////////////
+code.create("codeName", "body: string", genericCallback);
+code.update("codeName", "body: string", genericCallback);
+code.delete("codeName", genericCallback);
+code.execute("codeName", {}, genericCallback);
+code.getCompletedServices(genericCallback);
+code.getFailedServices(genericCallback);
+code.getAllServices(genericCallback);
+
+///////////////////////////////////////
+//User API invocations
+///////////////////////////////////////
+user.getUser(genericCallback);
+user.setUser({}, genericCallback);
+user.allUsers(query1.query, genericCallback);
+user.setPassword("old_password", "new_password", genericCallback);
+user.count(query1.query, genericCallback);
+
+///////////////////////////////////////
+//Messaging API invocations
+///////////////////////////////////////
+messaging.getMessageHistoryWithTimeFrame("topic", 5, 10, 15, 20, genericCallback);
+messaging.getMessageHistory("topic", 5, 15, genericCallback);
+messaging.getAndDeleteMessageHistory("topic", 5, 10, 1, 20, genericCallback);
+messaging.currentTopics(genericCallback);
+messaging.publish("topic", {});
+messaging.publishREST("topic", { payload: Object }, genericCallback);
+var mcb = function(message: string) {};
+messaging.subscribe("topic", {}, mcb);
+messaging.unsubscribe("topic", {});
+messaging.disconnect();
+
+///////////////////////////////////////
+//MessagingStats API invocations
+///////////////////////////////////////
+stats.getAveragePayloadSize("topic: string", 5, 5, genericCallback);
+stats.getOpenConnections(genericCallback);
+stats.getCurrentSubscribers("topic: string", genericCallback);
+
+///////////////////////////////////////
+//Edge API invocations
+///////////////////////////////////////
+edge.updateEdgeByName("edgename", {changedColumn: "New value"}, genericCallback);
+edge.deleteEdgeByName("edgename", genericCallback);
+edge.create({newEdge: Object}, "edgename", genericCallback);
+edge.columns(genericCallback);
+edge.count(query1.query, genericCallback);
+
+///////////////////////////////////////
+//Metrics API invocations
+///////////////////////////////////////
+metrics.setQuery(query1.query);
+metrics.getStatistics(genericCallback);
+metrics.getStatisticsHistory(genericCallback);
+metrics.getDBConnections(genericCallback);
+metrics.getLogs(genericCallback);
+
+///////////////////////////////////////
+//Device API invocations
+///////////////////////////////////////
+device.getDeviceByName("devicename", genericCallback);
+device.updateDeviceByName("devicename", { object: Object }, true, genericCallback);
+device.deleteDeviceByName("devicename", genericCallback);
+device.fetch(query1.query, genericCallback);
+device.update(query1.query, { object: Object }, false, genericCallback);
+device.delete(query1.query, genericCallback);
+device.create({ newDevice: Object }, genericCallback);
+device.columns(genericCallback);
+device.count(query1.query, genericCallback);
+
+///////////////////////////////////////
+//Analytics API invocations
+///////////////////////////////////////
+analytics.getStorage({}, genericCallback);
+analytics.getCount({}, genericCallback);
+analytics.getEventList({}, genericCallback);
+analytics.getEventTotals({}, genericCallback);
+analytics.getUserEvents({}, genericCallback);
+
+///////////////////////////////////////
+//Portal API invocations
+///////////////////////////////////////
+portal.fetch(genericCallback);
+portal.update({data: Object}, genericCallback);
+
+///////////////////////////////////////
+//Triggers API invocations
+///////////////////////////////////////
+triggers.fetchDefinitions(genericCallback);
+triggers.create("triggername", {data: Object}, genericCallback);
+triggers.update("triggername", {data: Object}, genericCallback);
+triggers.delete("triggername", genericCallback);
diff --git a/types/clearbladejs-client/global.d.ts b/types/clearbladejs-client/global.d.ts
new file mode 100644
index 0000000000..7f70ed08f7
--- /dev/null
+++ b/types/clearbladejs-client/global.d.ts
@@ -0,0 +1,5 @@
+declare global {
+    var ClearBlade: ClearBladeGlobal;
+}
+
+export {};
\ No newline at end of file
diff --git a/types/clearbladejs-client/index.d.ts b/types/clearbladejs-client/index.d.ts
new file mode 100644
index 0000000000..3c7ebd40f1
--- /dev/null
+++ b/types/clearbladejs-client/index.d.ts
@@ -0,0 +1,441 @@
+// Type definitions for clearbladejs Client SDK v1.0.0
+// Project: https://github.com/ClearBlade/JavaScript-API
+// Definitions by: Jim Bouquet <https://github.com/ClearBlade/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+//
+// TypeScript Version: 2.1
+
+/// <reference types="paho-mqtt" />
+
+interface Resp {
+    error(msg: any): never; // todo: figure out if we can have the compiler throw an error if someone adds code after this
+    success(msg: any): never;
+}
+
+declare enum MessagingQOS {
+    MESSAGING_QOS_AT_MOST_ONCE = 0,
+    MESSAGING_QOS_AT_LEAST_ONCE = 1,
+    MESSAGING_QOS_EXACTLY_ONCE = 2
+}
+
+interface InitOptions {
+    systemKey: string;
+    systemSecret: string;
+    masterSecret?: string;
+    logging?: boolean;
+    callback?: CbCallback;
+    email?: string;
+    password?: string;
+    registerUser?: boolean;
+    useUser?: APIUser;
+    URI?: string;
+    messagingURI?: string;
+    messagingPort?: number;
+    defaultQoS?: MessagingQOS;
+    callTimeout?: number;
+    messagingAuthPort?: number;
+}
+
+interface RequestOptions {
+    method?: string;
+    endpoint?: string;
+    body?: string;
+    qs?: string;
+    URI?: string;
+    useUser?: boolean;
+    authToken?: string;
+    timeout?: number;
+    user?: APIUser;
+}
+
+interface APIUser {
+    email: string;
+    authToken: string;
+}
+
+interface CbCallback {
+    (error: boolean, response: Resp): void;
+}
+
+interface ClearBladeGlobal extends ClearBladeInt {
+    MESSAGING_QOS_AT_MOST_ONCE: MessagingQOS.MESSAGING_QOS_AT_MOST_ONCE;
+    MESSAGING_QOS_AT_LEAST_ONCE: MessagingQOS.MESSAGING_QOS_AT_LEAST_ONCE;
+    MESSAGING_QOS_EXACTLY_ONCE: MessagingQOS.MESSAGING_QOS_EXACTLY_ONCE;
+
+    request(options: RequestOptions, callback: CbCallback): void;
+}
+
+interface ClearBladeInt {
+    systemKey: string;
+    systemSecret: string;
+    masterSecret: string;
+    URI: string;
+    messagingURI: string;
+    messagingPort: number;
+    logging: boolean;
+    defaultQoS: MessagingQOS;
+
+    init(options: InitOptions): void;
+    setUser(email: string, password: string): void;
+    registerUser(email: string, password: string, callback: CbCallback): void;
+    isCurrentUserAuthenticated(callback: CbCallback): void;
+    logoutUser(callback: CbCallback): void;
+    loginAnon(callback: CbCallback): void;
+    loginUser(email: string, password: string, callback: CbCallback): void;
+    loginUserMqtt(email: string, password: string, callback: CbCallback): void;
+    registerMasterCallback(callback: CbCallback): void;
+    Collection(options: string | CollectionOptionsWithName | CollectionOptionsWithID): Collection;
+    Query(
+        options: string | QueryOptionsWithName | QueryOptionsWithID
+    ): QueryObj;
+    Item(data: Object, collectionID: string | ItemOptions): Item;
+    Code(): Code;
+    User(): AppUser;
+    Messaging(options: MessagingOptions, callback: CbCallback): Messaging;
+    MessagingStats(): MessagingStats;
+    sendPush(
+        users: string[],
+        payload: Object,
+        appId: string,
+        callback: CbCallback
+    ): void;
+    getEdges(query: Query, callback: CbCallback): void;
+    Edge(): Edge;
+    Metrics(): Metrics;
+    Device(): Device;
+    Analytics(): Analytics;
+    Portal(name: string): Portal;
+    Triggers(): Triggers;
+
+    getAllCollections(callback: CbCallback): void;
+}
+interface CollectionOptionsWithName {
+    collectionName: string;
+}
+
+interface CollectionOptionsWithID {
+    collectionID: string;
+}
+
+interface Collection {
+    name: string;
+    endpoint: string;
+    isUsingCollectionName: boolean;
+    user: APIUser;
+    URI: string;
+    systemKey: string;
+    systemSecret: string;
+
+    fetch(query: Query, callback: CbCallback): void;
+    create(newItem: Item, callback: CbCallback): void;
+    update(query: Query, changes: Object, callback: CbCallback): void;
+    remove(query: Query, callback: CbCallback): void;
+    columns(callback: CbCallback): void;
+    count(query: Query, callback: CbCallback): void;
+}
+
+declare const enum QuerySortDirections {
+    QUERY_SORT_ASCENDING = "ASC",
+    QUERY_SORT_DESCENDING = "DESC"
+}
+
+declare const enum QueryConditions {
+    QUERY_EQUAL = "EQ",
+    QUERY_NOTEQUAL = "NEQ",
+    QUERY_GREATERTHAN = "GT",
+    QUERY_GREATERTHAN_EQUAL = "GTE",
+    QUERY_LESSTHAN = "LT",
+    QUERY_LESSTHAN_EQUAL = "LTE",
+    QUERY_MATCHES = "RE"
+}
+
+type QueryValue = string | number | boolean;
+
+interface QueryOptions {
+    offset?: number;
+    limit?: number;
+}
+
+interface QueryOptionsWithName
+    extends CollectionOptionsWithName,
+        QueryOptions {}
+interface QueryOptionsWithID extends CollectionOptionsWithID, QueryOptions {}
+
+interface Query {
+    SELECTCOLUMNS?: string[];
+    SORT?: QuerySortDirections;
+    FILTERS?: QueryFilter[];
+    PAGESIZE?: number;
+    PAGENUM?: number;
+}
+
+interface QueryFilter {
+    [QueryConditions: string]: QueryFilterValue;
+}
+
+interface QueryFilterValue {
+    [name: string]: QueryValue;
+}
+
+interface QueryObj {
+    endpoint: string;
+    user: APIUser;
+    URI: string;
+    systemKey: string;
+    systemSecret: string;
+    query: Query;
+    OR: Query[];
+    offset: number;
+    limit: number;
+
+    addSortToQuery(
+        query: QueryObj,
+        direction: QuerySortDirections,
+        column: string
+    ): void;
+    addFilterToQuery(
+        query: QueryObj,
+        condition: QueryConditions,
+        key: string,
+        value: QueryValue
+    ): void;
+    ascending(field: string): void;
+    descending(field: string): void;
+    equalTo(field: string, value: QueryValue): void;
+    greaterThan(field: string, value: QueryValue): void;
+    greaterThanEqualTo(field: string, value: QueryValue): void;
+    lessThan(field: string, value: QueryValue): void;
+    lessThanEqualTo(field: string, value: QueryValue): void;
+    notEqualTo(field: string, value: QueryValue): void;
+    matches(field: string, pattern: RegExp): void;
+    or(query: QueryObj): void;
+    setPage(pageSize: number, pageNum: number): void;
+    fetch(callback: CbCallback): void;
+    update(changes: Object, callback: CbCallback): void;
+    columns(columnsArray: string[]): void;
+    remove(callback: CbCallback): void;
+}
+
+interface ItemOptions extends CollectionOptionsWithID {}
+
+interface Item {
+    data: Object;
+
+    save(callback: CbCallback): void;
+    refresh(callback: CbCallback): void;
+    destroy(callback: CbCallback): void;
+}
+
+interface Code {
+    user: APIUser;
+    URI: string;
+    systemKey: string;
+    systemSecret: string;
+    callTimeout: number;
+
+    create(name: string, body: string, callback: CbCallback): void;
+    update(name: string, body: string, callback: CbCallback): void;
+    delete(name: string, callback: CbCallback): void;
+    execute(name: string, params: Object, callback: CbCallback): void;
+    getCompletedServices(callback: CbCallback): void;
+    getFailedServices(callback: CbCallback): void;
+    getAllServices(callback: CbCallback): void;
+}
+
+interface AppUser {
+    user: APIUser;
+    URI: string;
+    endpoint: string;
+    systemKey: string;
+    systemSecret: string;
+    callTimeout: number;
+
+    getUser(callback: CbCallback): void;
+    setUser(data: Object, callback: CbCallback): void;
+    allUsers(query: Query, callback: CbCallback): void;
+    setPassword(
+        old_password: string,
+        new_password: string,
+        callback: CbCallback
+    ): void;
+    count(query: Query, callback: CbCallback): void;
+}
+
+interface Messaging {
+    user: APIUser;
+    URI: string;
+    endpoint: string;
+    systemKey: string;
+    systemSecret: string;
+    callTimeout: number;
+    client: Paho.MQTT.Client;
+
+    getMessageHistoryWithTimeFrame(
+        topic: string,
+        count: number,
+        last: number,
+        start: number,
+        stop: number,
+        callback: CbCallback
+    ): void;
+    getMessageHistory(
+        topic: string,
+        last: number,
+        count: number,
+        callback: CbCallback
+    ): void;
+    getAndDeleteMessageHistory(
+        topic: string,
+        count: number,
+        last: number,
+        start: number,
+        stop: number,
+        callback: CbCallback
+    ): void;
+    currentTopics(callback: CbCallback): void;
+    publish(topic: string, payload: Object): void;
+    publishREST(topic: string, payload: Object, callback: CbCallback): void;
+    subscribe(
+        topic: string,
+        options: MessagingSubscribeOptions,
+        messageCallback: MessageCallback
+    ): void;
+    unsubscribe(topic: string, options: MessagingSubscribeOptions): void;
+    disconnect(): void;
+}
+
+interface CommonMessagingProperties {
+    cleanSession?: boolean;
+    useSSL?: boolean;
+    hosts?: string;
+    ports?: string;
+    onSuccess?: Function;
+    onFailure?: Function;
+}
+
+interface MessagingOptions extends CommonMessagingProperties {
+    qos?: MessagingQOS;
+}
+
+interface MessagingConfiguration extends CommonMessagingProperties {
+    userName: string;
+    password: string;
+}
+
+interface MessageCallback {
+    (message: string): void;
+}
+
+interface MessagingSubscribeOptions {
+    qos?: MessagingQOS;
+    invocationContext?: Object;
+    onSuccess?: Function;
+    onFailure?: Function;
+    timeout?: number;
+}
+
+interface MessagingStats {
+    user: APIUser;
+    URI: string;
+    endpoint: string;
+    systemKey: string;
+
+    getAveragePayloadSize(
+        topic: string,
+        start: number,
+        stop: number,
+        callback: CbCallback
+    ): void;
+    getOpenConnections(callback: CbCallback): void;
+    getCurrentSubscribers(topic: string, callback: CbCallback): void;
+}
+
+interface Edge {
+    user: APIUser;
+    URI: string;
+    systemKey: string;
+    systemSecret: string;
+
+    updateEdgeByName(name: string, object: Object, callback: CbCallback): void;
+    deleteEdgeByName(name: string, callback: CbCallback): void;
+    create(newEdge: Object, name: string, callback: CbCallback): void;
+    columns(callback: CbCallback): void;
+    count(query: Query, callback: CbCallback): void;
+}
+
+interface Metrics {
+    user: APIUser;
+    URI: string;
+    systemKey: string;
+
+    setQuery(query: Query): void;
+    getStatistics(callback: CbCallback): void;
+    getStatisticsHistory(callback: CbCallback): void;
+    getDBConnections(callback: CbCallback): void;
+    getLogs(callback: CbCallback): void;
+}
+
+interface Device {
+    user: APIUser;
+    URI: string;
+    systemKey: string;
+    systemSecret: string;
+
+    getDeviceByName(name: string, callback: CbCallback): void;
+    updateDeviceByName(
+        name: string,
+        object: Object,
+        trigger: boolean,
+        callback: CbCallback
+    ): void;
+    deleteDeviceByName(name: string, callback: CbCallback): void;
+    fetch(query: Query, callback: CbCallback): void;
+    update(
+        query: Query,
+        object: Object,
+        trigger: boolean,
+        callback: CbCallback
+    ): void;
+    delete(query: Query, callback: CbCallback): void;
+    create(newDevice: Object, callback: CbCallback): void;
+    columns(callback: CbCallback): void;
+    count(query: Query, callback: CbCallback): void;
+}
+
+interface Analytics {
+    user: APIUser;
+    URI: string;
+    systemKey: string;
+    systemSecret: string;
+
+    getStorage(filter: QueryFilter, callback: CbCallback): void;
+    getCount(filter: QueryFilter, callback: CbCallback): void;
+    getEventList(filter: QueryFilter, callback: CbCallback): void;
+    getEventTotals(filter: QueryFilter, callback: CbCallback): void;
+    getUserEvents(filter: QueryFilter, callback: CbCallback): void;
+}
+
+interface Portal {
+    name: string;
+    user: APIUser;
+    URI: string;
+    systemKey: string;
+    systemSecret: string;
+
+    fetch(callback: CbCallback): void;
+    update(data: Object, callback: CbCallback): void;
+}
+
+interface Triggers {
+    user: APIUser;
+    URI: string;
+    systemKey: string;
+    systemSecret: string;
+
+    fetchDefinitions(callback: CbCallback): void;
+    create(name: string, data: Object, callback: CbCallback): void;
+    update(name: string, data: Object, callback: CbCallback): void;
+    delete(name: string, callback: CbCallback): void;
+}
+
+declare var ClearBlade: ClearBladeGlobal;
diff --git a/types/clearbladejs-client/tsconfig.json b/types/clearbladejs-client/tsconfig.json
new file mode 100644
index 0000000000..b360802518
--- /dev/null
+++ b/types/clearbladejs-client/tsconfig.json
@@ -0,0 +1,32 @@
+{
+    "compilerOptions": {
+        "target": "ES5",
+        "moduleResolution": "node",
+        "module": "none",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            ".",
+            "../",
+            "../../node_modules/"
+        ],
+        "types": ["node"],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "clearbladejs-client-tests.ts",
+        "global.d.ts"
+    ],
+    "exclude": [
+        "**/clearbladejs-node/*",
+        "**/clearbladejs-server/*"
+    ]
+}
\ No newline at end of file
diff --git a/types/clearbladejs-client/tslint.json b/types/clearbladejs-client/tslint.json
new file mode 100644
index 0000000000..a4c53997aa
--- /dev/null
+++ b/types/clearbladejs-client/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
\ No newline at end of file
diff --git a/types/clearbladejs-node/clearbladejs-node-tests.ts b/types/clearbladejs-node/clearbladejs-node-tests.ts
new file mode 100644
index 0000000000..b600332ca2
--- /dev/null
+++ b/types/clearbladejs-node/clearbladejs-node-tests.ts
@@ -0,0 +1,128 @@
+import { ClearBlade, Resp, QuerySortDirections, QueryConditions } from ".";
+
+// Sample code for clearbladejs Node SDK v1.0.0 used to test typescript definitions
+// Project: https://github.com/ClearBlade/Node-SDK
+// Definitions by: Jim Bouquet <https://github.com/ClearBlade/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+const constants = require("./constants.json");
+
+var genericCallback = function(error: boolean, response: Resp) {};
+
+///////////////////////////////////////
+//ClearBlade object API invocations
+///////////////////////////////////////
+ClearBlade.init({
+	email: "a@a.com",
+	password: "a",
+	systemKey: constants.systemKey,
+	systemSecret: constants.systemSecret,
+	URI: constants.URL,
+	messagingURI: constants.messageURL,
+	callback: genericCallback
+})
+
+ClearBlade.setUser("test@test.com", "password");
+ClearBlade.registerUser("test@test.com", "password", genericCallback);
+ClearBlade.isCurrentUserAuthenticated(genericCallback);
+if (!ClearBlade.isObjectEmpty({prop: "test"})) {
+	ClearBlade.logger("Object is not empty");
+}
+
+ClearBlade.validateEmailPassword("test@test.com", "password");
+
+ClearBlade.logoutUser(genericCallback);
+ClearBlade.loginAnon(genericCallback);
+ClearBlade.loginUser("test@test.com", "password", genericCallback);
+
+ClearBlade.sendPush([], {}, "appId: string", genericCallback);
+
+// execute(error: Object, response: Object, callback: ClearBladeCallback): void;
+// makeKVPair(key: string, value: string): KeyValuePair;
+// request(options: RequestOptions, callback: RequestCallback): void;
+
+var coll1 = ClearBlade.Collection("collectionID");
+var coll2 = ClearBlade.Collection({collectionName: "collectionName"});
+var coll3 = ClearBlade.Collection({collectionID: "collectionID"});
+
+var query1 = ClearBlade.Query("collectionID");
+var query2 = ClearBlade.Query({offset: 5, limit: 5, collectionID: "collectionID"});
+var query3 = ClearBlade.Query({collectionName: "collectionName"});
+var query4 = ClearBlade.Query({collection: "collectionID"});
+
+ClearBlade.addToQuery(query1, "key", "value");
+ClearBlade.addFilterToQuery(query1, QueryConditions.QUERY_GREATERTHAN, "key", "value");
+ClearBlade.addSortToQuery(query1, QuerySortDirections.QUERY_SORT_ASCENDING, "column1");
+
+var opQueryStr = ClearBlade.parseOperationQuery(query1.query);
+var parse1:string = ClearBlade.parseQuery(query1.query);
+var parse2:string = ClearBlade.parseQuery(query1);
+
+
+var item1 = ClearBlade.Item({}, "hello");
+var item2 = ClearBlade.Item({}, {collectionID: "hello"});
+
+var code = ClearBlade.Code();
+var user = ClearBlade.User();
+
+var messaging = ClearBlade.Messaging({}, genericCallback);
+
+///////////////////////////////////////
+//Collection API invocations
+///////////////////////////////////////
+coll1.fetch(query1, genericCallback);
+coll1.create(ClearBlade.Item({}, ""), genericCallback);
+coll1.update(query1.query, {}, genericCallback);
+coll1.remove(query1.query, genericCallback);
+
+///////////////////////////////////////
+//Query API invocations
+///////////////////////////////////////
+query1.ascending("string");
+query1.descending("string");
+query1.equalTo("string", "string");
+query1.greaterThan("string", 2);
+query1.greaterThanEqualTo("string", false);
+query1.lessThan("string", "string");
+query1.lessThanEqualTo("string", "string");
+query1.notEqualTo("string", "string");
+query1.or(query2);
+query1.setPage(1, 1);
+query1.fetch(genericCallback);
+query1.update({}, genericCallback);
+query1.remove(genericCallback);
+
+///////////////////////////////////////
+//Item API invocations
+///////////////////////////////////////
+item1.save();
+item1.refresh();
+item1.destroy();
+
+///////////////////////////////////////
+//Code API invocations
+///////////////////////////////////////
+code.execute("codeName", {}, genericCallback);
+
+///////////////////////////////////////
+//User API invocations
+///////////////////////////////////////
+user.getUser(genericCallback);
+user.setUser({}, genericCallback);
+user.allUsers(query1.query, genericCallback);
+
+///////////////////////////////////////
+//Messaging API invocations
+///////////////////////////////////////
+messaging.getMessageHistory("topic: string", 5, 15, genericCallback);
+
+messaging.publish("topic: string", {});
+
+messaging.subscribe("my/topic", {}, messageReceivedCb);
+
+function messageReceivedCb (message: string) {
+	messaging.unsubscribe("my/topic");
+}
+
+
+
diff --git a/types/clearbladejs-node/index.d.ts b/types/clearbladejs-node/index.d.ts
new file mode 100644
index 0000000000..a80ecc21d5
--- /dev/null
+++ b/types/clearbladejs-node/index.d.ts
@@ -0,0 +1,256 @@
+import { Response, RequestCallback } from "request/index";
+import { MqttClient, PacketCallback } from "mqtt";
+
+// Type definitions for clearbladejs Node SDK v1.0.0
+// Project: https://github.com/ClearBlade/Node-SDK
+// Definitions by: Jim Bouquet <https://github.com/ClearBlade/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+//
+// TypeScript Version: 2.1
+
+/// <reference types="request" />
+/// <reference types="mqtt" />
+
+declare enum MessagingQOS {
+    MESSAGING_QOS_AT_MOST_ONCE = 0,
+    MESSAGING_QOS_AT_LEAST_ONCE = 1,
+    MESSAGING_QOS_EXACTLY_ONCE = 2
+}
+
+export interface Resp {
+    error(msg: any): never; // todo: figure out if we can have the compiler throw an error if someone adds code after this
+    success(msg: any): never;
+}
+
+export interface InitOptions { 
+    systemKey: string;
+    systemSecret: string;
+    logging?: boolean;
+    callback?: CbCallback;
+    email?: string;
+    password?: string;
+    registerUser?: boolean;
+    useUser?: APIUser;
+    URI?: string;
+    messagingURI?: string;
+    messagingPort?: number;
+    defaultQoS?: MessagingQOS;
+    callTimeout?: number;
+}
+
+export interface RequestOptions {
+    systemKey: string;
+    systemSecret: string;
+    method?: string;
+    endpoint?: string;
+    body?: string;
+    qs?: string;
+    URI?: string;
+    useUser?: boolean;
+    authToken?: string;
+    user?: APIUser;
+}
+
+export interface APIUser { 
+    email: string;
+    authToken: string;
+}
+
+export interface KeyValuePair {
+    [key: string]: any;
+}
+
+export interface CbCallback {
+    (error: boolean, response: Resp): void
+} 
+
+export default interface ClearBladeGlobal extends ClearBladeInt {
+    isCurrentUserAuthenticated(callback: CbCallback): void;
+}
+
+export interface ClearBladeInt {
+    addToQuery(queryObj: QueryObj, key: string, value: string): void;
+    addFilterToQuery(queryObj: QueryObj, condition: QueryConditions, key: string, value: QueryValue): void;
+    addSortToQuery(queryObj: QueryObj, direction: QuerySortDirections, column: string): void;
+    Code() :Code;
+    Collection(options: string | CollectionOptionsWithName | CollectionOptionsWithID) :Collection;
+    execute(error: Object, response: Object, callback: CbCallback): void;
+    init(options: InitOptions): void;
+    isObjectEmpty(obj: Object): boolean;
+    Item(data: Object, options: string | ItemOptions) :Item;
+    logger(message: string): void;
+    loginAnon(callback: CbCallback): void;
+    loginUser(email: string, password: string, callback: CbCallback): void;
+    logoutUser(callback: CbCallback): void;
+    makeKVPair(key: string, value: string): KeyValuePair;
+    parseOperationQuery(query: Query): string;
+    parseQuery(query: Query | QueryObj): string;
+    Query(options: string | QueryOptionsWithCollection | QueryOptionsWithName | QueryOptionsWithID) :QueryObj;
+    registerUser(email: string, password: string, callback: CbCallback): void;
+    request(options: RequestOptions, callback: RequestCallback): void;
+    setUser(email: string, password: string): void;
+    User() :AppUser;
+    Messaging(options: MessagingOptions, callback: CbCallback) :Messaging;
+    sendPush(users: string[], payload: Object, appId: string, callback: CbCallback): void;
+    validateEmailPassword(email: string, password:string): void;
+}
+
+export interface CollectionOptionsWithName { 
+    collectionName: string;
+}
+
+export interface CollectionOptionsWithID { 
+    collectionID: string;
+}
+
+export interface Collection {
+    endpoint: string;
+    user: APIUser;
+    URI: string;
+    systemKey: string;
+    systemSecret: string;
+
+    fetch(query: QueryObj, callback: CbCallback): void;
+    create(newItem: Item, callback: CbCallback): void;
+    update(query: Query, changes: Object, callback: CbCallback): void;
+    remove(query: Query, callback: CbCallback): void;
+}
+
+export declare const enum QuerySortDirections {
+    QUERY_SORT_ASCENDING = 'ASC',
+    QUERY_SORT_DESCENDING = 'DESC'
+}
+
+export declare const enum QueryConditions {
+    QUERY_EQUAL = 'EQ',
+    QUERY_NOTEQUAL = 'NEQ',
+    QUERY_GREATERTHAN = 'GT',
+    QUERY_GREATERTHAN_EQUAL = 'GTE',
+    QUERY_LESSTHAN = 'LT',
+    QUERY_LESSTHAN_EQUAL = 'LTE',
+    QUERY_MATCHES = 'RE'
+}
+
+export type QueryValue = string|number|boolean;
+
+export interface QueryOptions { 
+    offset?: number;
+    limit?: number;
+}
+
+export interface QueryOptionsWithCollection extends QueryOptions{
+    collection: string;
+}
+
+export interface QueryOptionsWithName extends CollectionOptionsWithName, QueryOptions{}
+export interface QueryOptionsWithID extends CollectionOptionsWithID, QueryOptions{}
+
+export interface Query {
+    SELECTCOLUMNS?: string[];
+    SORT?: QuerySortDirections;
+    FILTERS?: QueryFilter[];
+    PAGESIZE?: number;
+    PAGENUM?: number;
+}
+
+export interface QueryFilter {
+    [QueryConditions: string]: QueryFilterValue
+}
+
+export interface QueryFilterValue {
+    [name: string]: QueryValue
+}
+
+export interface QueryObj {
+    endpoint: string;
+    user: APIUser;
+    URI: string;
+    systemKey: string;
+    systemSecret: string;
+    query: Query;
+    OR: Query[];
+    offset: number;
+    limit: number;
+
+    ascending(field: string): Query;
+    descending(field: string): Query;
+    equalTo(field: string, value: QueryValue): Query;
+    greaterThan(field: string, value: QueryValue): Query;
+    greaterThanEqualTo(field: string, value: QueryValue): Query;
+    lessThan(field: string, value: QueryValue): Query;
+    lessThanEqualTo(field: string, value: QueryValue): Query;
+    notEqualTo(field: string, value: QueryValue): Query;
+    matches(field: string, pattern: string): Query;
+    or(query: QueryObj): Query;
+    setPage(pageSize: number, pageNum: number): Query;
+    fetch(callback: CbCallback): void;
+    update(changes: Object, callback: CbCallback): void;
+    remove(callback: CbCallback): void;
+}
+
+export interface ItemOptions extends CollectionOptionsWithID{}
+
+export interface Item {
+    data: Object;
+
+    save(): void;
+    refresh(): void;
+    destroy(): void;
+}
+
+export interface Code {
+    user: APIUser;
+    URI: string;
+    systemKey: string;
+    systemSecret: string;
+    callTimeout: number;
+    URIPrefix: string;
+
+    execute(name: string, params: Object, callback: CbCallback): void;
+}
+
+export interface AppUser {
+    user: APIUser;
+    URI: string;
+    systemKey: string;
+    systemSecret: string;
+
+    getUser(callback: CbCallback): void;
+    setUser(data: Object, callback: CbCallback): void;
+    allUsers(query: Query, callback: CbCallback): void;
+}
+
+export interface Messaging {
+    user: APIUser;
+    URI: string;
+    systemKey: string;
+    systemSecret: string;
+    client: MqttClient;
+
+    getMessageHistory(topic: string, startTime: number, count: number, callback: CbCallback): void;
+    publish(topic: string, payload: Object): void;
+    subscribe(topic: string, options: MessagingSubscribeOptions, messageCallback: MessageCallback): void;
+    unsubscribe(topic: string, callback?: PacketCallback): void;
+}
+
+export interface CommonMessagingProperties {
+    hosts?: string;
+    ports?: string;
+}
+
+export interface MessagingOptions extends CommonMessagingProperties {
+    qos?: MessagingQOS
+}
+
+export interface MessagingSubscribeOptions {
+    qos?: MessagingQOS;
+    timeout?: number;
+}
+
+export interface MessageCallback {
+    (message: string): void;
+}
+
+declare var ClearBlade: ClearBladeGlobal;
+
+export {ClearBlade};
diff --git a/types/clearbladejs-node/tsconfig.json b/types/clearbladejs-node/tsconfig.json
new file mode 100644
index 0000000000..da91170d85
--- /dev/null
+++ b/types/clearbladejs-node/tsconfig.json
@@ -0,0 +1,34 @@
+{
+    "compileOnSave": true,
+    "compilerOptions": {
+        "target": "ES5",
+        "module": "es6",
+        "moduleResolution": "Node",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": false,
+        "noStrictGenericChecks": false,
+        "strictNullChecks": false,
+        "strictFunctionTypes": false,
+        "baseUrl": "../",
+        "typeRoots": [
+            ".",
+            "../",
+            "../../node_modules/"
+        ],
+        "types": ["node"],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "clearbladejs-node-tests.ts",
+        "../../node_modules/mqtt/types/index.d.ts"
+    ],
+    "exclude": [
+        "**/clearbladejs-client/*",
+        "**/clearbladejs-server/*"
+    ]
+}
\ No newline at end of file
diff --git a/types/clearbladejs-node/tslint.json b/types/clearbladejs-node/tslint.json
new file mode 100644
index 0000000000..a4c53997aa
--- /dev/null
+++ b/types/clearbladejs-node/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
\ No newline at end of file
diff --git a/types/clearbladejs-server/clearbladejs-server-tests.ts b/types/clearbladejs-server/clearbladejs-server-tests.ts
new file mode 100644
index 0000000000..ea7c179df2
--- /dev/null
+++ b/types/clearbladejs-server/clearbladejs-server-tests.ts
@@ -0,0 +1,192 @@
+// Testing type definitions for clearbladejs Client SDK v1.0.0
+// Project: https://github.com/ClearBlade/JavaScript-API
+// Definitions by: Jim Bouquet <https://github.com/ClearBlade/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+var genericCallback = function(error: boolean, response: Resp) {};
+
+///////////////////////////////////////
+//ClearBlade object API invocations
+///////////////////////////////////////
+ClearBlade.init({
+    systemKey: "abcdef",
+    systemSecret: "abcdefg",
+    callback: genericCallback
+});
+
+ClearBlade.init({request: {
+    isLogging: false,
+    params: {
+      param1: "1",
+      param2: 2
+    },
+    systemKey: "abcdef",
+    systemSecret: "abcdef",
+    userEmail: "test@test.com",
+    userToken: "abcdef",
+    userid: "abcdef",
+}});
+
+var about = ClearBlade.about();
+ClearBlade.setUser("test@test.com", "authtoken", "userId");
+ClearBlade.registerUser("test@test.com", "password", genericCallback);
+ClearBlade.isCurrentUserAuthenticated(genericCallback);
+ClearBlade.logoutUser(genericCallback);
+ClearBlade.loginAnon(genericCallback);
+ClearBlade.loginUser("test@test.com", "password", genericCallback);
+
+ClearBlade.getAllCollections(genericCallback);
+var edgeID = ClearBlade.edgeId();
+var isEdge = ClearBlade.isEdge(genericCallback);
+if (ClearBlade.isObjectEmpty({test: "test"})) {
+    ClearBlade.logger("Object is empty");
+}
+var kvPair = ClearBlade.makeKVPair("key", "value");
+
+var coll1 = ClearBlade.Collection("collectionID");
+var coll2 = ClearBlade.Collection({ collectionName: "collectionName" });
+var coll3 = ClearBlade.Collection({ collectionID: "collectionID" });
+var coll4 = ClearBlade.Collection({ collection: "collectionID" });
+
+var query1 = ClearBlade.Query({ collectionID: "collectionID" });
+var query2 = ClearBlade.Query({ collectionName: "collectionName" });
+var query3 = ClearBlade.Query({ collection: "collectionID" });
+
+var item1 = ClearBlade.Item({}, "collectionID");
+var item2 = ClearBlade.Item({}, { collectionID: "collectionID" });
+
+var code = ClearBlade.Code();
+var deployment = ClearBlade.Deployment();
+var user = ClearBlade.User();
+
+var messaging = ClearBlade.Messaging({}, genericCallback);
+
+var device = ClearBlade.Device();
+
+ClearBlade.addToQuery(query1, "key", "value");
+ClearBlade.addSortToQuery(
+    query1,
+    QuerySortDirections.QUERY_SORT_ASCENDING,
+    "column1"
+);
+ClearBlade.addFilterToQuery(
+    query1,
+    QueryConditions.QUERY_GREATERTHAN,
+    "key",
+    "value"
+);
+
+ClearBlade.newCollection("collectionName", genericCallback);
+
+var parseOperation = ClearBlade.parseOperationQuery(query1.query);
+var parseQuery1 = ClearBlade.parseQuery(query1);
+var parseQuery2 = ClearBlade.parseQuery(query1.query);
+
+ClearBlade.createDevice("devicename", {type: "devicetype"}, false, genericCallback);
+ClearBlade.deleteDevice("devicename", true, genericCallback);
+ClearBlade.updateDevice("devicename", {type: "devicetype"}, true, genericCallback);
+ClearBlade.getDeviceByName("devicename", genericCallback);
+ClearBlade.getAllDevicesForSystem(genericCallback);
+ClearBlade.validateEmailPassword("test@test.com", "password");
+
+///////////////////////////////////////
+//Collection API invocations
+///////////////////////////////////////
+coll1.addColumn({name: "column1"}, genericCallback);
+coll1.dropColumn("column1", genericCallback);
+coll1.deleteCollection(genericCallback);
+coll1.fetch(query1.query, genericCallback);
+coll1.create(ClearBlade.Item({}, ""), genericCallback);
+coll1.update(query1.query, {}, genericCallback);
+coll1.remove(query1.query, genericCallback);
+coll1.columns(genericCallback);
+coll1.count(query1.query, genericCallback);
+
+///////////////////////////////////////
+//Query API invocations
+///////////////////////////////////////
+query2.ascending("string");
+query1.descending("string");
+query1.equalTo("string", "string");
+query1.greaterThan("string", 2);
+query1.greaterThanEqualTo("string", false);
+query1.lessThan("string", "string");
+query1.lessThanEqualTo("string", "string");
+query1.notEqualTo("string", "string");
+query1.matches("string", ".*");
+query1.or(query2);
+query1.setPage(1, 1);
+query1.fetch(genericCallback);
+query1.update({}, genericCallback);
+query1.columns([]);
+query1.remove(genericCallback);
+
+///////////////////////////////////////
+//Item API invocations
+///////////////////////////////////////
+item1.save();
+item1.refresh();
+item1.destroy();
+
+///////////////////////////////////////
+//Code API invocations
+///////////////////////////////////////
+code.execute("codeName", {}, true, genericCallback);
+code.getAllServices(genericCallback);
+
+///////////////////////////////////////
+//Deployment API invocations
+///////////////////////////////////////
+deployment.create("deploymentname", "deployment description", {}, genericCallback);
+deployment.update("deploymentname", {}, genericCallback);
+deployment.delete("deploymentname", genericCallback);
+deployment.read("deploymentname", genericCallback);
+deployment.readAll(query1, genericCallback);
+
+///////////////////////////////////////
+//User API invocations
+///////////////////////////////////////
+user.getUser(genericCallback);
+user.setUser({}, genericCallback);
+user.setUsers(query2, {name: "Fred"}, genericCallback);
+user.allUsers(query1, genericCallback);
+user.count(query1, genericCallback);
+
+///////////////////////////////////////
+//Messaging API invocations
+///////////////////////////////////////
+messaging.getMessageHistoryWithTimeFrame("topic", 5, 10, 15, 20, genericCallback);
+messaging.getMessageHistory("topic", 5, 15, genericCallback);
+messaging.getAndDeleteMessageHistory("topic", 5, 10, 1, 20, genericCallback);
+messaging.getCurrentTopics(genericCallback);
+messaging.publish("topic", "payload");
+
+///////////////////////////////////////
+//Device API invocations
+///////////////////////////////////////
+device.fetch(query1.query, genericCallback);
+device.update(query1.query, { object: Object }, genericCallback);
+device.delete(query1.query, genericCallback);
+device.create({ newDevice: Object }, genericCallback);
+
+///////////////////////////////////////
+//Triggers API invocations
+///////////////////////////////////////
+ClearBlade.Trigger.Create(
+    "triggername", 
+    {
+        system_key: "key",
+	    name: "triggername",
+	    def_module: TriggerModule.DEVICE,
+	    def_name: "someName",
+	    key_value_pairs: [],
+        service_name: "ServiceName"
+    },
+    genericCallback);
+ClearBlade.Trigger.Fetch("triggername", genericCallback);
+
+///////////////////////////////////////
+//Timers API invocations
+///////////////////////////////////////
+ClearBlade.Timer.Create("timername", {}, genericCallback);
+ClearBlade.Timer.Fetch("timername", genericCallback);
diff --git a/types/clearbladejs-server/global.d.ts b/types/clearbladejs-server/global.d.ts
new file mode 100644
index 0000000000..7f70ed08f7
--- /dev/null
+++ b/types/clearbladejs-server/global.d.ts
@@ -0,0 +1,5 @@
+declare global {
+    var ClearBlade: ClearBladeGlobal;
+}
+
+export {};
\ No newline at end of file
diff --git a/types/clearbladejs-server/index.d.ts b/types/clearbladejs-server/index.d.ts
new file mode 100644
index 0000000000..7333b04cb9
--- /dev/null
+++ b/types/clearbladejs-server/index.d.ts
@@ -0,0 +1,336 @@
+// Type definitions for clearbladejs Server SDK v1.0.0
+// Project: https://docs.clearblade.com/v/3/4-developer_reference/platformsdk/ClearBlade.js/
+// Definitions by: Jim Bouquet <https://github.com/ClearBlade/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+//
+// TypeScript Version: 2.1
+
+/// <reference types="paho-mqtt" />
+
+interface BasicReq {
+    readonly isLogging: boolean;
+    readonly params: {
+      [id: string]: any;
+    };
+    readonly systemKey: string;
+    readonly systemSecret: string;
+    readonly userEmail: string;
+    readonly userToken: string;
+    readonly userid: string;
+}
+type ReqTypes = BasicReq;
+declare var req: ReqTypes;
+interface Resp {
+    error(msg: any): never;
+    success(msg: any): never;
+}
+declare var resp: Resp;
+ 
+declare enum MessagingQOS {
+    MESSAGING_QOS_AT_MOST_ONCE = 0,
+    MESSAGING_QOS_AT_LEAST_ONCE = 1,
+    MESSAGING_QOS_EXACTLY_ONCE = 2
+}
+
+interface InitOptions { 
+    systemKey: string;
+    systemSecret: string;
+    logging?: boolean;
+    callback?: CbCallback;
+    authToken?: string;
+    userToken?: string;
+    email?: string;
+    password?: string;
+    registerUser?: boolean;
+    useUser?: APIUser;
+    URI?: string;
+    messagingURI?: string;
+    messagingPort?: number;
+    defaultQoS?: MessagingQOS;
+    callTimeout?: number;
+}
+
+interface APIUser { 
+    email: string;
+    authToken: string;
+    user_id?: string;
+}
+
+interface KeyValuePair {
+    [key: string]: any;
+}
+
+interface CbCallback {
+    (error: boolean, response: Resp): void
+} 
+
+interface ClearBladeGlobal extends ClearBladeInt {
+    user: APIUser;
+}
+
+interface ClearBladeInt {
+    Trigger: TriggerClass;
+    Timer: TimerClass;
+
+    about(): string;
+    addToQuery(queryObj: QueryObj, key: string, value: string): void;
+    addFilterToQuery(queryObj: QueryObj, condition: QueryConditions, key: string, value: QueryValue): void;
+    addSortToQuery(queryObj: QueryObj, direction: QuerySortDirections, column: string): void;
+    Code(): Code;
+    Collection(options: string | CollectionOptionsWithName | CollectionOptionsWithID | CollectionOptionsWithCollection) :Collection;
+    Deployment(): Deployment;
+    Device(): Device;
+    edgeId(): string;
+    execute(error: Object, response: Object, callback: CbCallback): any;
+    getAllCollections(callback: CbCallback): void;
+    http(): Object;
+    init(options: InitOptions | {request: BasicReq}): void;
+    isEdge(callback: CbCallback): boolean;
+    isCurrentUserAuthenticated(callback: CbCallback): void;
+    isObjectEmpty(obj: Object): boolean;
+    Item(data: Object, options: string | ItemOptions): Item;
+    logger(message: string): void;
+    loginAnon(callback: CbCallback): void;
+    loginUser(email: string, password: string, callback: CbCallback): void;
+    logoutUser(callback: CbCallback): void;
+    makeKVPair(key: string, value: string): KeyValuePair;
+    Messaging(options: MessagingOptions, callback: CbCallback): Messaging;
+    newCollection(name: string, callback: CbCallback): void;
+    Query(options: QueryOptionsWithCollection | QueryOptionsWithName | QueryOptionsWithID): QueryObj;
+    parseOperationQuery(query: Query): string;
+    parseQuery(query: Query | QueryObj): string;
+    registerUser(email: string, password: string, callback: CbCallback): void;
+    setUser(email: string, authToken: string, userId: string): void;
+    User(): AppUser;
+
+    createDevice(name: string, data: object, causeTrigger: boolean, callback: CbCallback): void;
+    deleteDevice(name: string, causeTrigger: boolean, callback: CbCallback): void;
+    updateDevice(name: string, data: object, causeTrigger: boolean, callback: CbCallback): void;
+    getDeviceByName(name: string, callback: CbCallback): void;
+    getAllDevicesForSystem(callback: CbCallback): void;
+    validateEmailPassword(email: string, password:string): void;
+}
+
+interface CollectionOptionsWithCollection { 
+    collection: string;
+}
+
+interface CollectionOptionsWithName { 
+    collectionName: string;
+}
+
+interface CollectionOptionsWithID { 
+    collectionID: string;
+}
+
+interface Collection {
+    user: APIUser;
+    URI: string;
+    systemKey: string;
+    systemSecret: string;
+
+    addColumn(options: Object, callback: CbCallback): void;
+    dropColumn(name: string, callback: CbCallback): void;
+    deleteCollection(callback: CbCallback): void;
+    fetch(query: Query, callback: CbCallback): void;
+    create(newItem: Item, callback: CbCallback): void;
+    update(query: Query, changes: Object, callback: CbCallback): void;
+    remove(query: Query, callback: CbCallback): void;
+    columns(callback: CbCallback): void;
+    count(query: Query, callback: CbCallback): void;
+}
+
+declare const enum QuerySortDirections {
+    QUERY_SORT_ASCENDING = 'ASC',
+    QUERY_SORT_DESCENDING = 'DESC'
+}
+
+declare const enum QueryConditions {
+    QUERY_EQUAL = 'EQ',
+    QUERY_NOTEQUAL = 'NEQ',
+    QUERY_GREATERTHAN = 'GT',
+    QUERY_GREATERTHAN_EQUAL = 'GTE',
+    QUERY_LESSTHAN = 'LT',
+    QUERY_LESSTHAN_EQUAL = 'LTE',
+    QUERY_MATCHES = 'RE'
+}
+
+type QueryValue = string|number|boolean;
+
+interface QueryOptions { 
+    offset?: number;
+    limit?: number;
+}
+
+interface QueryOptionsWithCollection extends CollectionOptionsWithCollection, QueryOptions{}
+interface QueryOptionsWithName extends CollectionOptionsWithName, QueryOptions{}
+interface QueryOptionsWithID extends CollectionOptionsWithID, QueryOptions{}
+
+interface Query {
+    SELECTCOLUMNS?: string[];
+    SORT?: QuerySortDirections;
+    FILTERS?: QueryFilter[];
+    PAGESIZE?: number;
+    PAGENUM?: number;
+}
+
+interface QueryFilter {
+    [QueryConditions: string]: QueryFilterValue
+}
+
+interface QueryFilterValue {
+    [name: string]: QueryValue
+}
+
+interface QueryObj {
+    id: string;
+    user: APIUser;
+    URI: string;
+    systemKey: string;
+    systemSecret: string;
+    query: Query;
+    OR: Query[];
+    offset: number;
+    limit: number;
+
+    ascending(field: string): void;
+    descending(field: string): void;
+    equalTo(field: string, value: QueryValue): void;
+    greaterThan(field: string, value: QueryValue): void;
+    greaterThanEqualTo(field: string, value: QueryValue): void;
+    lessThan(field: string, value: QueryValue): void;
+    lessThanEqualTo(field: string, value: QueryValue): void;
+    notEqualTo(field: string, value: QueryValue): void;
+    matches(field: string, pattern: QueryValue): void;
+    or(query: QueryObj): void;
+    setPage(pageSize: number, pageNum: number): void;
+    fetch(callback: CbCallback): void;
+    update(changes: Object, callback: CbCallback): void;
+    columns(columnsArray: string[]): void;
+    remove(callback: CbCallback): void;
+}
+
+interface ItemOptions extends CollectionOptionsWithID{}
+
+interface Item {
+    data: Object;
+
+    save(): void;
+    refresh(): void;
+    destroy(): void;
+}
+
+interface Code {
+    user: APIUser;
+    systemKey: string;
+    systemSecret: string;
+
+    execute(name: string, params: Object, loggingEnabled: boolean, callback: CbCallback): void;
+    getAllServices(callback: CbCallback): void;
+}
+
+interface DeploymentOptions{}
+
+interface Deployment {
+    user: APIUser;
+    systemKey: string;
+    systemSecret: string;
+
+    create(name: string, description: string, options: DeploymentOptions, callback: CbCallback): void;
+    update(name: string, options: DeploymentOptions, callback: CbCallback): void;
+    delete(name: string, callback: CbCallback): void;
+    read(name: string, callback: CbCallback): void;
+    readAll(query: QueryObj, callback: CbCallback): void;
+}
+
+interface AppUser {
+    user: APIUser;
+    URI: string;
+    systemKey: string;
+    systemSecret: string;
+
+    getUser(callback: CbCallback): void;
+    setUser(data: Object, callback: CbCallback): void;
+    setUsers(query: QueryObj, data: Object, callback: CbCallback): void;
+    allUsers(query: QueryObj, callback: CbCallback): void;
+    count(query: QueryObj, callback: CbCallback): void;
+}
+
+interface Messaging {
+    user: APIUser;
+    systemKey: string;
+    systemSecret: string;
+
+    getMessageHistoryWithTimeFrame(topic: string, count: number, last: number, start: number, stop: number, callback: CbCallback): void;
+    getMessageHistory(topic: string, start: number, count: number, callback: CbCallback): void;
+    getAndDeleteMessageHistory(topic: string, count: number, last: number, start: number, stop: number, callback: CbCallback): void;
+    getCurrentTopics(callback: CbCallback): void;
+    publish(topic: string, payload: string | ArrayBuffer): void;
+}
+
+interface MessagingOptions {}
+
+interface Device {
+    URI: string;
+    systemKey: string;
+    systemSecret: string;
+
+    fetch(query: Query, callback: CbCallback): void;
+    update(query: Query, changes: Object, callback: CbCallback): void;
+    delete(query: Query, callback: CbCallback): void;
+    create(newDevice: Object, callback: CbCallback): void;
+}
+
+declare const enum TriggerModule {
+    DEVICE = "Device",
+    Data = "Data",
+    MESSAGING = "Messaging",
+    USER = "User"
+}
+
+interface TriggerCreateOptions {
+    system_key: string;
+	name: string;
+	def_module: TriggerModule;
+	def_name: string;
+	key_value_pairs: KeyValuePair[];
+	service_name: string;
+}
+
+interface TriggerClass {
+    Create(name: string, options: TriggerCreateOptions, callback: CbCallback): void;
+    Fetch(name: string, callback: CbCallback): void;
+}
+
+interface TimerCreateOptions {
+    description?: string;
+    start_time?: Date;
+    repeats?: number;
+    frequency?: number;
+    service_name?: string;
+    user_id?: string;
+    user_token?: string;
+}
+
+interface TimerClass {
+    Create(name: string, options: TimerCreateOptions, callback: CbCallback): void;
+    Fetch(name: string, callback: CbCallback): void;
+}
+
+interface TriggerInstance {
+    name: string;
+    systemKey: string;
+
+    Update(options: Object, callback: CbCallback): void;
+    Delete(callback: CbCallback): void;
+}
+
+interface TimerInstance {
+    name: string;
+    systemKey: string;
+
+    Update(options: Object, callback: CbCallback): void;
+    Delete(callback: CbCallback): void;
+}
+
+declare var ClearBlade: ClearBladeGlobal;
\ No newline at end of file
diff --git a/types/clearbladejs-server/tsconfig.json b/types/clearbladejs-server/tsconfig.json
new file mode 100644
index 0000000000..a49f8d53d9
--- /dev/null
+++ b/types/clearbladejs-server/tsconfig.json
@@ -0,0 +1,32 @@
+{
+    "compilerOptions": {
+        "target": "ES5",
+        "moduleResolution": "node",
+        "module": "none",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            ".",
+            "../",
+            "../../node_modules/"
+        ],
+        "types": ["node"],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "clearbladejs-server-tests.ts",
+        "global.d.ts"
+    ],
+    "exclude": [
+        "**/clearbladejs-client/*",
+        "**/clearbladejs-node/*"
+    ]
+}
\ No newline at end of file
diff --git a/types/clearbladejs-server/tslint.json b/types/clearbladejs-server/tslint.json
new file mode 100644
index 0000000000..a4c53997aa
--- /dev/null
+++ b/types/clearbladejs-server/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}
\ No newline at end of file

From fa2aeb93171943bb61604eb3dfa5057bdbc9bc8c Mon Sep 17 00:00:00 2001
From: Tim Niemueller <niemueller@kbsg.rwth-aachen.de>
Date: Fri, 6 Apr 2018 00:30:35 +0200
Subject: [PATCH 1085/1382] c3: add missing fields in LegendOptions

There is configuration for tiles introduced with
https://github.com/c3js/c3/issues/1033 and defined in
spec/legend-spec.js which is missing from @types/c3.
---
 types/c3/c3-tests.ts | 20 ++++++++++++++++++++
 types/c3/index.d.ts  | 20 +++++++++++++++++++-
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/types/c3/c3-tests.ts b/types/c3/c3-tests.ts
index 7ac2f0ccd8..f2e630cd09 100644
--- a/types/c3/c3-tests.ts
+++ b/types/c3/c3-tests.ts
@@ -1798,6 +1798,26 @@ function legend_custom() {
         });
 }
 
+function legend_tiles() {
+    const chart = c3.generate({
+        data: {
+            columns: [
+                ["sample", 30, 200, 100, 400, 150, 250]
+            ]
+        },
+        legend: {
+            // amount of padding to put between each legend element
+            padding: 5,
+            // define custom height and width for the legend item tile
+            item: {
+                tile: {
+                    width: 15,
+                    height: 2
+                }
+            }
+        }});
+}
+
 /////////////////////
 // Tooltip Tests
 /////////////////////
diff --git a/types/c3/index.d.ts b/types/c3/index.d.ts
index a1dfaaf8f0..6c466458e3 100644
--- a/types/c3/index.d.ts
+++ b/types/c3/index.d.ts
@@ -1,9 +1,10 @@
-// Type definitions for C3js 0.5
+// Type definitions for C3js 0.6
 // Project: http://c3js.org/
 // Definitions by: Marc Climent <https://github.com/mcliment>
 //                 Gerin Jacob <https://github.com/gerinjacob>
 //                 Bernd Hacker <https://github.com/denyo>
 //                 Dzmitry Shyndzin <https://github.com/dmitryshindin>
+//                 Tim Niemueller <https://github.com/timn>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -700,6 +701,10 @@ export interface LegendOptions {
         y?: number;
         step?: number;
     };
+    /**
+     * Padding between legend elements.
+     */
+    padding?: number;
 
     item?: {
         /**
@@ -714,6 +719,19 @@ export interface LegendOptions {
          * Set mouseout event handler to the legend item.
          */
         onmouseout?(id: any): void;
+        /**
+         * Tile settings for legend color display.
+         */
+        tile?: {
+            /**
+             * Tile width.
+             */
+            width?: number;
+            /**
+             * Tile height
+             */
+            height?: number;
+        }
     };
 }
 

From 3a1f68f9c1f2ccebb1923d34c3930f73d4e1870d Mon Sep 17 00:00:00 2001
From: repl-chris <chris@replicon.com>
Date: Thu, 5 Apr 2018 16:02:13 -0600
Subject: [PATCH 1086/1382] Added AWSLambda.KinesisDataStream event type
 definitions (aws-lambda)

---
 types/aws-lambda/aws-lambda-tests.ts | 24 ++++++++++++++++++++++
 types/aws-lambda/index.d.ts          | 30 +++++++++++++++++++++++++++-
 2 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/types/aws-lambda/aws-lambda-tests.ts b/types/aws-lambda/aws-lambda-tests.ts
index 2b7b375576..1441c6b794 100644
--- a/types/aws-lambda/aws-lambda-tests.ts
+++ b/types/aws-lambda/aws-lambda-tests.ts
@@ -572,6 +572,28 @@ const CloudFrontResponseEvent: AWSLambda.CloudFrontResponseEvent = {
     ]
 };
 
+/* Kinesis Data Stream Events */
+declare let kinesisStreamEvent: AWSLambda.KinesisStreamEvent;
+declare let kinesisStreamRecord: AWSLambda.KinesisStreamRecord;
+declare let kinesisStreamRecordPayload: AWSLambda.KinesisStreamRecordPayload;
+
+kinesisStreamRecord = kinesisStreamEvent.Records[0];
+
+str = kinesisStreamRecord.awsRegion;
+str = kinesisStreamRecord.eventID;
+str = kinesisStreamRecord.eventName;
+str = kinesisStreamRecord.eventSource;
+str = kinesisStreamRecord.eventSourceARN;
+str = kinesisStreamRecord.eventVersion;
+str = kinesisStreamRecord.invokeIdentityArn;
+kinesisStreamRecordPayload = kinesisStreamRecord.kinesis;
+
+num = kinesisStreamRecordPayload.approximateArrivalTimestamp;
+str = kinesisStreamRecordPayload.data;
+str = kinesisStreamRecordPayload.kinesisSchemaVersion;
+str = kinesisStreamRecordPayload.partitionKey;
+str = kinesisStreamRecordPayload.sequenceNumber;
+
 /* Compatibility functions */
 context.done();
 context.done(error);
@@ -661,3 +683,5 @@ let customHandler: AWSLambda.Handler<CustomEvent, CustomResult> = (event, contex
     // $ExpectError
     cb(null, { resultString: bool });
 };
+
+let kinesisStreamHandler: AWSLambda.KinesisStreamHandler = (event: AWSLambda.KinesisStreamEvent, context: AWSLambda.Context, cb: AWSLambda.Callback<void>) => { };
diff --git a/types/aws-lambda/index.d.ts b/types/aws-lambda/index.d.ts
index 5802913c37..8da84c6ff3 100644
--- a/types/aws-lambda/index.d.ts
+++ b/types/aws-lambda/index.d.ts
@@ -16,6 +16,7 @@
 //                 Danilo Raisi <https://github.com/daniloraisi>
 //                 Simon Buchan <https://github.com/simonbuchan>
 //                 David Hayden <https://github.com/Haydabase>
+//                 Chris Redekop <https://github.com/repl-chris>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -529,6 +530,31 @@ export interface CloudFrontRequestEvent {
 
 export type CloudFrontResponseResult = undefined | null | CloudFrontResultResponse;
 
+// Kinesis Streams
+// https://docs.aws.amazon.com/lambda/latest/dg/eventsources.html#eventsources-kinesis-streams
+export interface KinesisStreamRecordPayload {
+    approximateArrivalTimestamp: number;
+    data: string;
+    kinesisSchemaVersion: string;
+    partitionKey: string;
+    sequenceNumber: string;
+}
+
+export interface KinesisStreamRecord {
+    awsRegion: string;
+    eventID: string;
+    eventName: string;
+    eventSource: string;
+    eventSourceARN: string;
+    eventVersion: string;
+    invokeIdentityArn: string;
+    kinesis: KinesisStreamRecordPayload;
+}
+
+export interface KinesisStreamEvent {
+    Records: KinesisStreamRecord[];
+}
+
 /**
  * AWS Lambda handler function.
  * http://docs.aws.amazon.com/lambda/latest/dg/nodejs-prog-model-handler.html
@@ -595,7 +621,9 @@ export type CloudFrontRequestCallback = Callback<CloudFrontRequestResult>;
 export type CloudFrontResponseHandler = Handler<CloudFrontResponseEvent, CloudFrontResponseResult>;
 export type CloudFrontResponseCallback = Callback<CloudFrontResponseResult>;
 
-// TODO: Kinesis (should be very close to DynamoDB stream?)
+export type KinesisStreamHandler = Handler<KinesisStreamEvent, void>;
+
+// TODO: Kinesis Firehose
 
 export type CustomAuthorizerHandler = Handler<CustomAuthorizerEvent, CustomAuthorizerResult>;
 export type CustomAuthorizerCallback = Callback<CustomAuthorizerResult>;

From dd43368fe0a4e6056aac0302a6097c7afc1cfab2 Mon Sep 17 00:00:00 2001
From: Jim Bouquet <jbouquet@clearblade.com>
Date: Thu, 5 Apr 2018 17:47:17 -0500
Subject: [PATCH 1087/1382] Modified tsconfig.json files based on errors
 received from dtslint. Removed const in enum declarations based on errors
 received from tsLint

---
 types/clearbladejs-client/index.d.ts    |  6 +++---
 types/clearbladejs-client/tsconfig.json |  9 +++------
 types/clearbladejs-node/index.d.ts      | 12 ++++++------
 types/clearbladejs-node/tsconfig.json   | 18 ++++++------------
 types/clearbladejs-server/index.d.ts    | 12 ++++++------
 types/clearbladejs-server/tsconfig.json | 11 +++--------
 6 files changed, 27 insertions(+), 41 deletions(-)

diff --git a/types/clearbladejs-client/index.d.ts b/types/clearbladejs-client/index.d.ts
index 3c7ebd40f1..dcc7048cb8 100644
--- a/types/clearbladejs-client/index.d.ts
+++ b/types/clearbladejs-client/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Jim Bouquet <https://github.com/ClearBlade/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 //
-// TypeScript Version: 2.1
+// TypeScript Version: 2.4
 
 /// <reference types="paho-mqtt" />
 
@@ -134,12 +134,12 @@ interface Collection {
     count(query: Query, callback: CbCallback): void;
 }
 
-declare const enum QuerySortDirections {
+declare enum QuerySortDirections {
     QUERY_SORT_ASCENDING = "ASC",
     QUERY_SORT_DESCENDING = "DESC"
 }
 
-declare const enum QueryConditions {
+declare enum QueryConditions {
     QUERY_EQUAL = "EQ",
     QUERY_NOTEQUAL = "NEQ",
     QUERY_GREATERTHAN = "GT",
diff --git a/types/clearbladejs-client/tsconfig.json b/types/clearbladejs-client/tsconfig.json
index b360802518..7821d7db9e 100644
--- a/types/clearbladejs-client/tsconfig.json
+++ b/types/clearbladejs-client/tsconfig.json
@@ -1,8 +1,7 @@
 {
     "compilerOptions": {
         "target": "ES5",
-        "moduleResolution": "node",
-        "module": "none",
+        "module": "commonjs",
         "lib": [
             "es6"
         ],
@@ -12,11 +11,9 @@
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
-            ".",
-            "../",
-            "../../node_modules/"
+            "../"
         ],
-        "types": ["node"],
+        "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
diff --git a/types/clearbladejs-node/index.d.ts b/types/clearbladejs-node/index.d.ts
index a80ecc21d5..63b12af7e6 100644
--- a/types/clearbladejs-node/index.d.ts
+++ b/types/clearbladejs-node/index.d.ts
@@ -1,3 +1,6 @@
+/// <reference types="request" />
+/// <reference types="mqtt" />
+
 import { Response, RequestCallback } from "request/index";
 import { MqttClient, PacketCallback } from "mqtt";
 
@@ -6,10 +9,7 @@ import { MqttClient, PacketCallback } from "mqtt";
 // Definitions by: Jim Bouquet <https://github.com/ClearBlade/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 //
-// TypeScript Version: 2.1
-
-/// <reference types="request" />
-/// <reference types="mqtt" />
+// TypeScript Version: 2.4
 
 declare enum MessagingQOS {
     MESSAGING_QOS_AT_MOST_ONCE = 0,
@@ -116,12 +116,12 @@ export interface Collection {
     remove(query: Query, callback: CbCallback): void;
 }
 
-export declare const enum QuerySortDirections {
+export declare enum QuerySortDirections {
     QUERY_SORT_ASCENDING = 'ASC',
     QUERY_SORT_DESCENDING = 'DESC'
 }
 
-export declare const enum QueryConditions {
+export declare enum QueryConditions {
     QUERY_EQUAL = 'EQ',
     QUERY_NOTEQUAL = 'NEQ',
     QUERY_GREATERTHAN = 'GT',
diff --git a/types/clearbladejs-node/tsconfig.json b/types/clearbladejs-node/tsconfig.json
index da91170d85..490278df1e 100644
--- a/types/clearbladejs-node/tsconfig.json
+++ b/types/clearbladejs-node/tsconfig.json
@@ -2,23 +2,17 @@
     "compileOnSave": true,
     "compilerOptions": {
         "target": "ES5",
-        "module": "es6",
-        "moduleResolution": "Node",
+        "module": "commonjs",
         "lib": [
             "es6"
         ],
         "noImplicitAny": true,
-        "noImplicitThis": false,
-        "noStrictGenericChecks": false,
-        "strictNullChecks": false,
-        "strictFunctionTypes": false,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
-        "typeRoots": [
-            ".",
-            "../",
-            "../../node_modules/"
-        ],
-        "types": ["node"],
+        "typeRoots": ["../"],
+        "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
diff --git a/types/clearbladejs-server/index.d.ts b/types/clearbladejs-server/index.d.ts
index 7333b04cb9..178198ce05 100644
--- a/types/clearbladejs-server/index.d.ts
+++ b/types/clearbladejs-server/index.d.ts
@@ -1,11 +1,11 @@
+/// <reference types="paho-mqtt" />
+
 // Type definitions for clearbladejs Server SDK v1.0.0
 // Project: https://docs.clearblade.com/v/3/4-developer_reference/platformsdk/ClearBlade.js/
 // Definitions by: Jim Bouquet <https://github.com/ClearBlade/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 //
-// TypeScript Version: 2.1
-
-/// <reference types="paho-mqtt" />
+// TypeScript Version: 2.4
 
 interface BasicReq {
     readonly isLogging: boolean;
@@ -140,12 +140,12 @@ interface Collection {
     count(query: Query, callback: CbCallback): void;
 }
 
-declare const enum QuerySortDirections {
+declare enum QuerySortDirections {
     QUERY_SORT_ASCENDING = 'ASC',
     QUERY_SORT_DESCENDING = 'DESC'
 }
 
-declare const enum QueryConditions {
+declare enum QueryConditions {
     QUERY_EQUAL = 'EQ',
     QUERY_NOTEQUAL = 'NEQ',
     QUERY_GREATERTHAN = 'GT',
@@ -281,7 +281,7 @@ interface Device {
     create(newDevice: Object, callback: CbCallback): void;
 }
 
-declare const enum TriggerModule {
+declare enum TriggerModule {
     DEVICE = "Device",
     Data = "Data",
     MESSAGING = "Messaging",
diff --git a/types/clearbladejs-server/tsconfig.json b/types/clearbladejs-server/tsconfig.json
index a49f8d53d9..b549e1c685 100644
--- a/types/clearbladejs-server/tsconfig.json
+++ b/types/clearbladejs-server/tsconfig.json
@@ -1,8 +1,7 @@
 {
     "compilerOptions": {
         "target": "ES5",
-        "moduleResolution": "node",
-        "module": "none",
+        "module": "commonjs",
         "lib": [
             "es6"
         ],
@@ -11,12 +10,8 @@
         "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
-        "typeRoots": [
-            ".",
-            "../",
-            "../../node_modules/"
-        ],
-        "types": ["node"],
+        "typeRoots": ["../"],
+        "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },

From c976361bf6f980c67a87dd32b3d4720f2ce6e15b Mon Sep 17 00:00:00 2001
From: Joshua Goldberg <josh@fullscreenmario.com>
Date: Thu, 5 Apr 2018 16:21:15 -0700
Subject: [PATCH 1088/1382] Hackily added toMatch to expect-puppeteer

---
 types/expect-puppeteer/expect-puppeteer-tests.ts |  3 +++
 types/expect-puppeteer/index.d.ts                | 15 ++++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/types/expect-puppeteer/expect-puppeteer-tests.ts b/types/expect-puppeteer/expect-puppeteer-tests.ts
index 979c34394d..84a7e65486 100644
--- a/types/expect-puppeteer/expect-puppeteer-tests.ts
+++ b/types/expect-puppeteer/expect-puppeteer-tests.ts
@@ -10,6 +10,9 @@ const testGlobal = async (instance: ElementHandle | Page) => {
     await expect(instance).toFill("selector", "value");
     await expect(instance).toFill("selector", "value", { polling: 777 });
 
+    await expect(instance).toMatch("selector");
+    await expect(instance).toMatch("selector", { timeout: 777 });
+
     await expect(instance).toMatchElement("selector", "value");
     await expect(instance).toMatchElement("selector", "value", { polling: "mutation" });
 
diff --git a/types/expect-puppeteer/index.d.ts b/types/expect-puppeteer/index.d.ts
index 12f19c785d..ce20675d37 100644
--- a/types/expect-puppeteer/index.d.ts
+++ b/types/expect-puppeteer/index.d.ts
@@ -36,9 +36,12 @@ interface ExpectToClickOptions extends ExpectTimingActions {
 }
 
 interface ExpectPuppeteer {
+    // These must all match the ExpectPuppeteer interface above.
+    // We can't extend from it directly because some method names conflict in type-incompatible ways.
     toClick(selector: string, options?: ExpectToClickOptions): Promise<void>;
     toDisplayDialog(block: () => Promise<void>): Promise<void>;
     toFill(selector: string, value: string, options?: ExpectTimingActions): Promise<void>;
+    toMatch(selector: string, options?: ExpectTimingActions): Promise<void>;
     toMatchElement(selector: string, value: string, options?: ExpectTimingActions): Promise<void>;
     toSelect(selector: string, valueOrText: string, options?: ExpectTimingActions): Promise<void>;
     toUploadFile(selector: string, filePath: string, options?: ExpectTimingActions): Promise<void>;
@@ -47,7 +50,17 @@ interface ExpectPuppeteer {
 declare global {
     namespace jest {
         // tslint:disable-next-line no-empty-interface
-        interface Matchers<R> extends ExpectPuppeteer { }
+        interface Matchers<R> {
+            // These must all match the ExpectPuppeteer interface above.
+            // We can't extend from it directly because some method names conflict in type-incompatible ways.
+            toClick(selector: string, options?: ExpectToClickOptions): Promise<void>;
+            toDisplayDialog(block: () => Promise<void>): Promise<void>;
+            toFill(selector: string, value: string, options?: ExpectTimingActions): Promise<void>;
+            toMatch(selector: string, options?: ExpectTimingActions): Promise<void>;
+            toMatchElement(selector: string, value: string, options?: ExpectTimingActions): Promise<void>;
+            toSelect(selector: string, valueOrText: string, options?: ExpectTimingActions): Promise<void>;
+            toUploadFile(selector: string, filePath: string, options?: ExpectTimingActions): Promise<void>;
+        }
     }
 }
 

From f4788e7c6a9c875db621831030c2c5524dcee4f0 Mon Sep 17 00:00:00 2001
From: Jim Bouquet <jbouquet@clearblade.com>
Date: Thu, 5 Apr 2018 18:34:12 -0500
Subject: [PATCH 1089/1382] Made changes to fix build issues

---
 types/clearbladejs-client/index.d.ts               |  1 -
 types/clearbladejs-node/clearbladejs-node-tests.ts |  3 ---
 types/clearbladejs-node/index.d.ts                 | 13 ++++++-------
 types/clearbladejs-node/tsconfig.json              |  3 +--
 types/clearbladejs-server/index.d.ts               |  5 ++---
 5 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/types/clearbladejs-client/index.d.ts b/types/clearbladejs-client/index.d.ts
index dcc7048cb8..44dd355213 100644
--- a/types/clearbladejs-client/index.d.ts
+++ b/types/clearbladejs-client/index.d.ts
@@ -2,7 +2,6 @@
 // Project: https://github.com/ClearBlade/JavaScript-API
 // Definitions by: Jim Bouquet <https://github.com/ClearBlade/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-//
 // TypeScript Version: 2.4
 
 /// <reference types="paho-mqtt" />
diff --git a/types/clearbladejs-node/clearbladejs-node-tests.ts b/types/clearbladejs-node/clearbladejs-node-tests.ts
index b600332ca2..18cd509cc7 100644
--- a/types/clearbladejs-node/clearbladejs-node-tests.ts
+++ b/types/clearbladejs-node/clearbladejs-node-tests.ts
@@ -1,9 +1,6 @@
 import { ClearBlade, Resp, QuerySortDirections, QueryConditions } from ".";
 
 // Sample code for clearbladejs Node SDK v1.0.0 used to test typescript definitions
-// Project: https://github.com/ClearBlade/Node-SDK
-// Definitions by: Jim Bouquet <https://github.com/ClearBlade/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 const constants = require("./constants.json");
 
diff --git a/types/clearbladejs-node/index.d.ts b/types/clearbladejs-node/index.d.ts
index 63b12af7e6..9efea47430 100644
--- a/types/clearbladejs-node/index.d.ts
+++ b/types/clearbladejs-node/index.d.ts
@@ -1,16 +1,15 @@
+// Type definitions for clearbladejs Node SDK v1.0.0
+// Project: https://github.com/ClearBlade/Node-SDK
+// Definitions by: Jim Bouquet <https://github.com/ClearBlade/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
 /// <reference types="request" />
 /// <reference types="mqtt" />
 
 import { Response, RequestCallback } from "request/index";
 import { MqttClient, PacketCallback } from "mqtt";
 
-// Type definitions for clearbladejs Node SDK v1.0.0
-// Project: https://github.com/ClearBlade/Node-SDK
-// Definitions by: Jim Bouquet <https://github.com/ClearBlade/>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-//
-// TypeScript Version: 2.4
-
 declare enum MessagingQOS {
     MESSAGING_QOS_AT_MOST_ONCE = 0,
     MESSAGING_QOS_AT_LEAST_ONCE = 1,
diff --git a/types/clearbladejs-node/tsconfig.json b/types/clearbladejs-node/tsconfig.json
index 490278df1e..67aea82d3f 100644
--- a/types/clearbladejs-node/tsconfig.json
+++ b/types/clearbladejs-node/tsconfig.json
@@ -18,8 +18,7 @@
     },
     "files": [
         "index.d.ts",
-        "clearbladejs-node-tests.ts",
-        "../../node_modules/mqtt/types/index.d.ts"
+        "clearbladejs-node-tests.ts"
     ],
     "exclude": [
         "**/clearbladejs-client/*",
diff --git a/types/clearbladejs-server/index.d.ts b/types/clearbladejs-server/index.d.ts
index 178198ce05..2c3a0845b4 100644
--- a/types/clearbladejs-server/index.d.ts
+++ b/types/clearbladejs-server/index.d.ts
@@ -1,12 +1,11 @@
-/// <reference types="paho-mqtt" />
-
 // Type definitions for clearbladejs Server SDK v1.0.0
 // Project: https://docs.clearblade.com/v/3/4-developer_reference/platformsdk/ClearBlade.js/
 // Definitions by: Jim Bouquet <https://github.com/ClearBlade/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-//
 // TypeScript Version: 2.4
 
+/// <reference types="paho-mqtt" />
+
 interface BasicReq {
     readonly isLogging: boolean;
     readonly params: {

From b5444aab1873c752298813cb4ea06f5df68e43e6 Mon Sep 17 00:00:00 2001
From: Lucas Serven <lserven@gmail.com>
Date: Fri, 6 Apr 2018 08:34:37 +0200
Subject: [PATCH 1090/1382] types: add react-webcam

---
 types/react-webcam/index.d.ts             | 38 +++++++++++++++++++++++
 types/react-webcam/react-webcam-tests.tsx | 29 +++++++++++++++++
 types/react-webcam/tsconfig.json          | 25 +++++++++++++++
 types/react-webcam/tslint.json            |  1 +
 4 files changed, 93 insertions(+)
 create mode 100644 types/react-webcam/index.d.ts
 create mode 100644 types/react-webcam/react-webcam-tests.tsx
 create mode 100644 types/react-webcam/tsconfig.json
 create mode 100644 types/react-webcam/tslint.json

diff --git a/types/react-webcam/index.d.ts b/types/react-webcam/index.d.ts
new file mode 100644
index 0000000000..5bb6337838
--- /dev/null
+++ b/types/react-webcam/index.d.ts
@@ -0,0 +1,38 @@
+// Type definitions for react-webcam 0.3
+// Project: https://github.com/mozmorris/react-webcam
+// Definitions by: Lucas Servén Marín <https://github.com/squat>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+import * as React from 'react';
+
+export = Webcam;
+
+declare class Webcam extends React.Component<Webcam.WebcamProps, Webcam.WebcamState> {
+    private static mountedInstances: Webcam[];
+    private static userMediaRequested: boolean;
+    getScreenshot(): string|null;
+    getCanvas(): HTMLCanvasElement|null;
+    requestUserMedia(): void;
+    handleUserMedia(error: Error, stream: MediaStream): void;
+}
+
+declare namespace Webcam {
+    interface WebcamProps {
+        audio?: boolean;
+        muted?: boolean;
+        height?: number|string;
+        width?: number|string;
+        screenshotFormat?: 'image/jpeg' | 'image/png' | 'image/webp';
+        style?: React.CSSProperties;
+        className?: string;
+        audioSource?: string;
+        videoSource?: string;
+        onUserMedia?(): void;
+    }
+
+    interface WebcamState {
+        hasUserMedia: boolean;
+        src?: string;
+    }
+}
diff --git a/types/react-webcam/react-webcam-tests.tsx b/types/react-webcam/react-webcam-tests.tsx
new file mode 100644
index 0000000000..6a28fb9ba7
--- /dev/null
+++ b/types/react-webcam/react-webcam-tests.tsx
@@ -0,0 +1,29 @@
+import * as React from "react";
+import Webcam = require("react-webcam");
+
+export class ReactWebcamTest extends React.Component {
+    private webcam: Webcam;
+
+    setRef = (webcam: Webcam) => {
+        this.webcam = webcam;
+    }
+
+    capture = () => {
+        const imageSrc = this.webcam.getScreenshot();
+    }
+
+    render() {
+        return (
+            <div>
+                <Webcam
+                    audio={false}
+                    height={350}
+                    ref={this.setRef}
+                    screenshotFormat="image/jpeg"
+                    width={350}
+                />
+                <button onClick={this.capture}>Capture photo</button>
+            </div>
+        );
+    }
+}
diff --git a/types/react-webcam/tsconfig.json b/types/react-webcam/tsconfig.json
new file mode 100644
index 0000000000..b48e4757e4
--- /dev/null
+++ b/types/react-webcam/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "jsx": "react",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-webcam-tests.tsx"
+    ]
+}
diff --git a/types/react-webcam/tslint.json b/types/react-webcam/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-webcam/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From cac060e93607116d7e6883bd8e812724262dd703 Mon Sep 17 00:00:00 2001
From: RalfNieuwenhuizen <ralfnieuwenhuizen@gmail.com>
Date: Fri, 6 Apr 2018 09:06:43 +0200
Subject: [PATCH 1091/1382] ListHeaderComponent can also be a rendered element

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

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index 8323779057..a248fd3010 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -3715,7 +3715,7 @@ export interface SectionListProperties<ItemT> extends VirtualizedListProperties<
     /**
      * Rendered at the very beginning of the list.
      */
-    ListHeaderComponent?: React.ComponentClass<any> | (() => React.ReactElement<any>) | null;
+    ListHeaderComponent?: React.ComponentClass<any> | React.ReactElement<any> | (() => React.ReactElement<any>) | null;
 
     /**
      * Rendered in between each section.

From 50cda51a519eeb3c7c45e0037a03c18044b5a393 Mon Sep 17 00:00:00 2001
From: euxn23 <euxn23@gmail.com>
Date: Fri, 6 Apr 2018 16:25:07 +0900
Subject: [PATCH 1092/1382] Add node to browser name type

---
 types/detect-browser/index.d.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/detect-browser/index.d.ts b/types/detect-browser/index.d.ts
index 351067ff59..4395539aa0 100644
--- a/types/detect-browser/index.d.ts
+++ b/types/detect-browser/index.d.ts
@@ -18,7 +18,8 @@ export type BrowserName =
     "phantomjs" |
     "safari" |
     "vivaldi" |
-    "yandexbrowser";
+    "yandexbrowser" |
+    "node";
 
 export function detect(): null | {
     name: BrowserName | "node";

From 6ab85a3e068817ea9e65a686b8ab7360b541bbba Mon Sep 17 00:00:00 2001
From: euxn23 <euxn23@gmail.com>
Date: Fri, 6 Apr 2018 16:25:11 +0900
Subject: [PATCH 1093/1382] Detect-browser/add browser info type

---
 types/detect-browser/index.d.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/types/detect-browser/index.d.ts b/types/detect-browser/index.d.ts
index 4395539aa0..22d6bf9c17 100644
--- a/types/detect-browser/index.d.ts
+++ b/types/detect-browser/index.d.ts
@@ -21,8 +21,10 @@ export type BrowserName =
     "yandexbrowser" |
     "node";
 
-export function detect(): null | {
-    name: BrowserName | "node";
+export interface BrowserInfo {
+    name: BrowserName;
     version: string;
     os: string;
-};
+}
+
+export function detect(): null | BrowserInfo;

From c5648fb940138f33a03f8c1ef67e877bb999280b Mon Sep 17 00:00:00 2001
From: Jim Bouquet <jbouquet@clearblade.com>
Date: Fri, 6 Apr 2018 06:51:33 -0500
Subject: [PATCH 1094/1382] Removed references to mqtt library

---
 types/clearbladejs-node/index.d.ts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/types/clearbladejs-node/index.d.ts b/types/clearbladejs-node/index.d.ts
index 9efea47430..bef502bb00 100644
--- a/types/clearbladejs-node/index.d.ts
+++ b/types/clearbladejs-node/index.d.ts
@@ -5,10 +5,9 @@
 // TypeScript Version: 2.4
 
 /// <reference types="request" />
-/// <reference types="mqtt" />
 
 import { Response, RequestCallback } from "request/index";
-import { MqttClient, PacketCallback } from "mqtt";
+//import {//PacketCallback } from "mqtt";
 
 declare enum MessagingQOS {
     MESSAGING_QOS_AT_MOST_ONCE = 0,
@@ -224,12 +223,12 @@ export interface Messaging {
     URI: string;
     systemKey: string;
     systemSecret: string;
-    client: MqttClient;
+    client: Object;
 
     getMessageHistory(topic: string, startTime: number, count: number, callback: CbCallback): void;
     publish(topic: string, payload: Object): void;
     subscribe(topic: string, options: MessagingSubscribeOptions, messageCallback: MessageCallback): void;
-    unsubscribe(topic: string, callback?: PacketCallback): void;
+    unsubscribe(topic: string, callback?: (error?: Error, packet?: Object) => any): void;
 }
 
 export interface CommonMessagingProperties {

From 0c25a88d7693761d6b1a6afaf27815a9455d0c7a Mon Sep 17 00:00:00 2001
From: AndersonFriaca <afriacaxd@gmail.com>
Date: Fri, 6 Apr 2018 09:12:23 -0400
Subject: [PATCH 1095/1382] Adjustments

---
 types/jquery-countto/index.d.ts | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/types/jquery-countto/index.d.ts b/types/jquery-countto/index.d.ts
index a815340d0b..babeb7741b 100644
--- a/types/jquery-countto/index.d.ts
+++ b/types/jquery-countto/index.d.ts
@@ -6,47 +6,47 @@
 
 /// <reference types="jquery" />
 
-export interface Options {
+export type Options = Partial<{
     /**
      * The number to start counting from
      */
-    from?: number;
+    from: number;
 
     /**
      * The number to stop counting at
      */
-    to?: number;
+    to: number;
 
     /**
      * The number of milliseconds it should take to finish counting
      */
-    speed?: number;
+    speed: number;
 
     /**
-     * he number of milliseconds to wait between refreshing the counter
+     * The number of milliseconds to wait between refreshing the counter
      */
-    refreshInterval?: number;
+    refreshInterval: number;
 
     /**
      * The number of decimal places to show when using the default formatter
      */
-    decimals?: number;
+    decimals: number;
 
     /**
      * A handler that is used to format the current value before rendering to the DOM
      */
-    formatter?: (value: number, options: Options) => string;
+    formatter: (value: number, options: Options) => string;
 
     /**
      * A callback function that is triggered for every iteration that the counter updates
      */
-    onUpdate?: (value: number) => void;
+    onUpdate: (value: number) => void;
 
     /**
      * A callback function that is triggered when counting finishes
      */
-    onComplete?: (value: number) => void;
-}
+    onComplete: (value: number) => void;
+}>;
 
 export type Method = 'start' | 'stop' | 'toggle' | 'restart';
 

From 391d67f6d71d8e2991cc29572098a36207cd7c7e Mon Sep 17 00:00:00 2001
From: Janeene Beeforth <gh@dawnmist.net>
Date: Sat, 7 Apr 2018 00:04:54 +1000
Subject: [PATCH 1096/1382] [jest-image-snapshot]: New type definitions.

---
 types/jest-image-snapshot/index.d.ts          | 75 +++++++++++++++++++
 .../jest-image-snapshot-tests.ts              | 23 ++++++
 types/jest-image-snapshot/tsconfig.json       | 23 ++++++
 types/jest-image-snapshot/tslint.json         |  1 +
 4 files changed, 122 insertions(+)
 create mode 100644 types/jest-image-snapshot/index.d.ts
 create mode 100644 types/jest-image-snapshot/jest-image-snapshot-tests.ts
 create mode 100644 types/jest-image-snapshot/tsconfig.json
 create mode 100644 types/jest-image-snapshot/tslint.json

diff --git a/types/jest-image-snapshot/index.d.ts b/types/jest-image-snapshot/index.d.ts
new file mode 100644
index 0000000000..c15e435cc9
--- /dev/null
+++ b/types/jest-image-snapshot/index.d.ts
@@ -0,0 +1,75 @@
+// Type definitions for jest-image-snapshot 2.4
+// Project: https://github.com/americanexpress/jest-image-snapshot#readme
+// Definitions by: Janeene Beeforth <https://github.com/dawnmist>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="jest" />
+
+/**
+ * Options to be passed to the 'pixelmatch' image diffing function.
+ */
+export interface PixelmatchOptions {
+    /** Matching threshold, ranges from 0 to 1. Smaller values make the comparison more sensitive. 0.1 by default. */
+    readonly threshold?: number;
+    /** If true, disables detecting and ignoring anti-aliased pixels. false by default. */
+    readonly includeAA?: boolean;
+}
+
+export interface MatchImageSnapshotOptions {
+    /**
+     * Custom config passed to 'pixelmatch'
+     */
+    customDiffConfig?: PixelmatchOptions;
+    /**
+     * Custom snapshots directory.
+     * Absolute path of a directory to keep the snapshot in.
+     */
+    customSnapshotsDir?: string;
+    /**
+     * A custom name to give this snapshot. If not provided, one is computed automatically.
+     */
+    customSnapshotIdentifier?: string;
+    /**
+     * Removes coloring from the console output, useful if storing the results to a file.
+     * Defaults to false.
+     */
+    noColors?: boolean;
+    /**
+     * Sets the threshold that would trigger a test failure based on the failureThresholdType selected. This is different
+     * to the customDiffConfig.threshold above - the customDiffConfig.threshold is the per pixel failure threshold, whereas
+     * this is the failure threshold for the entire comparison.
+     * Defaults to 0.
+     */
+    failureThreshold?: number;
+    /**
+     * Sets the type of threshold that would trigger a failure.
+     * Defaults to 'pixel'.
+     */
+    failureThresholdType?: 'pixel' | 'percent';
+}
+
+/**
+ * Function to be passed to jest's expect.extend.
+ * Example:
+ *   import { toMatchImageSnapshot } from 'jest-image-snapshot';
+ *   expect.extend({ toMatchImageSnapshot });
+ */
+export function toMatchImageSnapshot(): { message(): string; pass: boolean; };
+
+/**
+ * Configurable function that can be passed to jest's expect.extend.
+ * Example:
+ *   import { configureToMatchImageSnapshot } from 'jest-image-snapshot';
+ *   const toMatchImageSnapshot = configureToMatchImageSnapshot({ noColors: true });
+ *   expect.extend({ toMatchImageSnapshot });
+ */
+export function configureToMatchImageSnapshot(options: MatchImageSnapshotOptions): () => { message(): string; pass: boolean; };
+
+declare global {
+    namespace jest {
+        interface Matchers<R> {
+            toMatchImageSnapshot(): R;
+        }
+    }
+}
diff --git a/types/jest-image-snapshot/jest-image-snapshot-tests.ts b/types/jest-image-snapshot/jest-image-snapshot-tests.ts
new file mode 100644
index 0000000000..a2ccb8c777
--- /dev/null
+++ b/types/jest-image-snapshot/jest-image-snapshot-tests.ts
@@ -0,0 +1,23 @@
+// Typescript Version: 2.3
+import { toMatchImageSnapshot, configureToMatchImageSnapshot } from 'jest-image-snapshot';
+
+it('should be able to use toMatchImageSnapshot in a test', () => {
+    expect.extend({ toMatchImageSnapshot });
+
+    expect(400).toMatchImageSnapshot();
+});
+
+it('should be able to use configureToMatchImageSnapshot in a test', () => {
+    const matchFn = configureToMatchImageSnapshot({
+        noColors: true,
+        customDiffConfig: {
+            threshold: 5,
+            includeAA: false
+        },
+        failureThreshold: 10,
+        failureThresholdType: 'percent'
+    });
+    expect.extend({ toMatchImageSnapshot: matchFn });
+
+    expect('Me').toMatchImageSnapshot();
+});
diff --git a/types/jest-image-snapshot/tsconfig.json b/types/jest-image-snapshot/tsconfig.json
new file mode 100644
index 0000000000..5bf932371d
--- /dev/null
+++ b/types/jest-image-snapshot/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "jest-image-snapshot-tests.ts"
+    ]
+}
diff --git a/types/jest-image-snapshot/tslint.json b/types/jest-image-snapshot/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/jest-image-snapshot/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From e204ccc77f0a0425bcc1dbca2a3977123cf022d3 Mon Sep 17 00:00:00 2001
From: Janeene Beeforth <gh@dawnmist.net>
Date: Sat, 7 Apr 2018 00:16:20 +1000
Subject: [PATCH 1097/1382] [jest-specific-snapshot]: New definition.

---
 types/jest-specific-snapshot/index.d.ts       | 27 +++++++++++++++++++
 .../jest-specific-snapshot-tests.ts           | 16 +++++++++++
 types/jest-specific-snapshot/tsconfig.json    | 23 ++++++++++++++++
 types/jest-specific-snapshot/tslint.json      |  1 +
 4 files changed, 67 insertions(+)
 create mode 100644 types/jest-specific-snapshot/index.d.ts
 create mode 100644 types/jest-specific-snapshot/jest-specific-snapshot-tests.ts
 create mode 100644 types/jest-specific-snapshot/tsconfig.json
 create mode 100644 types/jest-specific-snapshot/tslint.json

diff --git a/types/jest-specific-snapshot/index.d.ts b/types/jest-specific-snapshot/index.d.ts
new file mode 100644
index 0000000000..ef0e7f4225
--- /dev/null
+++ b/types/jest-specific-snapshot/index.d.ts
@@ -0,0 +1,27 @@
+// Type definitions for jest-specific-snapshot 0.5
+// Project: https://github.com/igor-dv/jest-specific-snapshot#readme
+// Definitions by: Janeene Beeforth <https://github.com/dawnmist>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+/// <reference types="jest" />
+
+declare global {
+    namespace jest {
+        interface Matchers<R> {
+            toMatchSpecificSnapshot(snapshotFilename: string): R;
+        }
+    }
+}
+
+/**
+ * Specify the serializer that should be used by toMatchSpecificSnapshot.
+ * Note: toMatchSpecificSnapshot ignores the existing jest snapshot serializer settings. If you want to use a custom serializer,
+ * you need to set it via this addSerializer function.
+ */
+export function addSerializer(serializer: any): void;
+
+/**
+ * This is used to create a customized version of toMatchSpecificSnapshot.
+ */
+export function toMatchSpecificSnapshot(data: any, snapshotFile: string, testName: string): () => { message(): string; pass: boolean; };
diff --git a/types/jest-specific-snapshot/jest-specific-snapshot-tests.ts b/types/jest-specific-snapshot/jest-specific-snapshot-tests.ts
new file mode 100644
index 0000000000..046a563c9e
--- /dev/null
+++ b/types/jest-specific-snapshot/jest-specific-snapshot-tests.ts
@@ -0,0 +1,16 @@
+import { addSerializer, toMatchSpecificSnapshot } from 'jest-specific-snapshot';
+import toJson from 'enzyme-to-json';
+
+expect(100).toMatchSpecificSnapshot('mySnapshotFile.snap');
+
+addSerializer(toJson);
+
+function doSomeThing(received: any) {
+    return received;
+}
+expect.extend({
+    toMatchDecoratedSpecificSnapshot(received, snapshotFile) {
+        const data = doSomeThing(received);
+        return toMatchSpecificSnapshot.call(this, data, snapshotFile);
+    }
+});
diff --git a/types/jest-specific-snapshot/tsconfig.json b/types/jest-specific-snapshot/tsconfig.json
new file mode 100644
index 0000000000..e4156ae2ff
--- /dev/null
+++ b/types/jest-specific-snapshot/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "jest-specific-snapshot-tests.ts"
+    ]
+}
diff --git a/types/jest-specific-snapshot/tslint.json b/types/jest-specific-snapshot/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/jest-specific-snapshot/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 26b07e5960e1e592bd5222c6f20b2a852b35e2ec Mon Sep 17 00:00:00 2001
From: Andy <anhans@microsoft.com>
Date: Fri, 6 Apr 2018 09:06:44 -0700
Subject: [PATCH 1098/1382] rot-js: Remove empty jsdoc comments (#24768)

---
 types/rot-js/index.d.ts | 38 --------------------------------------
 1 file changed, 38 deletions(-)

diff --git a/types/rot-js/index.d.ts b/types/rot-js/index.d.ts
index e57d243755..44eeab7698 100644
--- a/types/rot-js/index.d.ts
+++ b/types/rot-js/index.d.ts
@@ -97,25 +97,15 @@ export const VK_PRINTSCREEN: number;
 export const VK_INSERT: number;
 /** Del(ete) key. */
 export const VK_DELETE: number;
-/***/
 export const VK_0: number;
-/***/
 export const VK_1: number;
-/***/
 export const VK_2: number;
-/***/
 export const VK_3: number;
-/***/
 export const VK_4: number;
-/***/
 export const VK_5: number;
-/***/
 export const VK_6: number;
-/***/
 export const VK_7: number;
-/***/
 export const VK_8: number;
-/***/
 export const VK_9: number;
 /** Colon (:) key. Requires Gecko 15.0 */
 export const VK_COLON: number;
@@ -131,59 +121,32 @@ export const VK_GREATER_THAN: number;
 export const VK_QUESTION_MARK: number;
 /** Atmark (@) key. Requires Gecko 15.0 */
 export const VK_AT: number;
-/***/
 export const VK_A: number;
-/***/
 export const VK_B: number;
-/***/
 export const VK_C: number;
-/***/
 export const VK_D: number;
-/***/
 export const VK_E: number;
-/***/
 export const VK_F: number;
-/***/
 export const VK_G: number;
-/***/
 export const VK_H: number;
-/***/
 export const VK_I: number;
-/***/
 export const VK_J: number;
-/***/
 export const VK_K: number;
-/***/
 export const VK_L: number;
-/***/
 export const VK_M: number;
-/***/
 export const VK_N: number;
-/***/
 export const VK_O: number;
-/***/
 export const VK_P: number;
-/***/
 export const VK_Q: number;
-/***/
 export const VK_R: number;
-/***/
 export const VK_S: number;
-/***/
 export const VK_T: number;
-/***/
 export const VK_U: number;
-/***/
 export const VK_V: number;
-/***/
 export const VK_W: number;
-/***/
 export const VK_X: number;
-/***/
 export const VK_Y: number;
-/***/
 export const VK_Z: number;
-/***/
 export const VK_CONTEXT_MENU: number;
 /** 0 on the numeric keypad. */
 export const VK_NUMPAD0: number;
@@ -209,7 +172,6 @@ export const VK_NUMPAD9: number;
 export const VK_MULTIPLY: number;
 /** + on the numeric keypad. */
 export const VK_ADD: number;
-/***/
 export const VK_SEPARATOR: number;
 /** - on the numeric keypad. */
 export const VK_SUBTRACT: number;

From c974fcb070bf9f90f61ee5ff611ee8a0d8fa5749 Mon Sep 17 00:00:00 2001
From: emzeroit <eperez@emzeroit.com>
Date: Fri, 6 Apr 2018 14:32:25 -0300
Subject: [PATCH 1099/1382] [@types/node] Added authorization property to
 IncomingHttpHeaders.

---
 types/node/v8/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/node/v8/index.d.ts b/types/node/v8/index.d.ts
index 1697093de7..fb70650458 100644
--- a/types/node/v8/index.d.ts
+++ b/types/node/v8/index.d.ts
@@ -943,6 +943,7 @@ declare module "http" {
         'access-control-allow-headers'?: string;
         'accept-patch'?: string;
         'accept-ranges'?: string;
+        'authorization'?: string;
         'age'?: string;
         'allow'?: string;
         'alt-svc'?: string;

From 5f2ef68fae908eb4e24335807683d0385e5b5598 Mon Sep 17 00:00:00 2001
From: Pete Johanson <peter@peterjohanson.com>
Date: Fri, 6 Apr 2018 13:39:02 -0400
Subject: [PATCH 1100/1382] Add whatwg-mimetype definition.

---
 types/whatwg-mimetype/index.d.ts              | 22 +++++++++++++++++
 types/whatwg-mimetype/tsconfig.json           | 23 ++++++++++++++++++
 types/whatwg-mimetype/tslint.json             |  1 +
 .../whatwg-mimetype/whatwg-mimetype-tests.ts  | 24 +++++++++++++++++++
 4 files changed, 70 insertions(+)
 create mode 100644 types/whatwg-mimetype/index.d.ts
 create mode 100644 types/whatwg-mimetype/tsconfig.json
 create mode 100644 types/whatwg-mimetype/tslint.json
 create mode 100644 types/whatwg-mimetype/whatwg-mimetype-tests.ts

diff --git a/types/whatwg-mimetype/index.d.ts b/types/whatwg-mimetype/index.d.ts
new file mode 100644
index 0000000000..b30fe64f67
--- /dev/null
+++ b/types/whatwg-mimetype/index.d.ts
@@ -0,0 +1,22 @@
+// Type definitions for whatwg-mimetype 2.1
+// Project: https://github.com/jsdom/whatwg-mimetype#readme
+// Definitions by: Pete Johanson <https://github.com/petejohanson>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = MIMEType;
+
+declare class MIMEType {
+  type: string;
+  subtype: string;
+
+  readonly essence: string;
+  readonly parameters: Map<string, string>;
+
+  static parse(s: string): MIMEType | null;
+
+  constructor(s: string);
+
+  isHTML(): boolean;
+  isXML(): boolean;
+  isJavaScript(opts?: { allowParameters?: boolean }): boolean;
+}
diff --git a/types/whatwg-mimetype/tsconfig.json b/types/whatwg-mimetype/tsconfig.json
new file mode 100644
index 0000000000..ca1583f063
--- /dev/null
+++ b/types/whatwg-mimetype/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "whatwg-mimetype-tests.ts"
+    ]
+}
diff --git a/types/whatwg-mimetype/tslint.json b/types/whatwg-mimetype/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/whatwg-mimetype/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/whatwg-mimetype/whatwg-mimetype-tests.ts b/types/whatwg-mimetype/whatwg-mimetype-tests.ts
new file mode 100644
index 0000000000..5b5ab0f8ab
--- /dev/null
+++ b/types/whatwg-mimetype/whatwg-mimetype-tests.ts
@@ -0,0 +1,24 @@
+/// <reference types="node" />
+import assert = require("assert");
+import MIMEType = require('whatwg-mimetype');
+
+const mt = MIMEType.parse("text/plain");
+
+assert(mt !== null);
+if (mt) {
+  assert(mt.type === "text");
+  assert(mt.subtype === "plain");
+  assert(mt.essence === "text/plain");
+  assert(mt.parameters.size === 0);
+  assert(!mt.isXML());
+  assert(!mt.isHTML());
+  assert(!mt.isJavaScript());
+}
+
+const mt2 = new MIMEType("application/javascript; charset=utf8");
+
+assert(mt2.type === "text");
+assert(mt2.subtype === "plain");
+assert(mt2.essence === "text/plain");
+assert(mt2.parameters.get("charset") === "utf8");
+assert(mt2.isJavaScript({ allowParameters: true }));

From bfaaf9272a60229befd27456d6ddde37ed8e80b5 Mon Sep 17 00:00:00 2001
From: Jim Bouquet <jbouquet@clearblade.com>
Date: Fri, 6 Apr 2018 16:15:11 -0500
Subject: [PATCH 1101/1382] Modified tslint.json files to enable most rules.
 Cleaned up code to remove lint errors.

---
 .../clearbladejs-client-tests.ts              | 72 +++++++--------
 types/clearbladejs-client/global.d.ts         |  2 +-
 types/clearbladejs-client/index.d.ts          | 48 +++++-----
 types/clearbladejs-client/tslint.json         | 74 +---------------
 .../clearbladejs-node-tests.ts                | 69 ++++++++-------
 types/clearbladejs-node/index.d.ts            | 87 +++++++++----------
 types/clearbladejs-node/tslint.json           | 74 +---------------
 .../clearbladejs-server-tests.ts              | 72 +++++++--------
 types/clearbladejs-server/global.d.ts         |  2 +-
 types/clearbladejs-server/index.d.ts          | 74 ++++++++--------
 types/clearbladejs-server/tslint.json         | 75 +---------------
 11 files changed, 211 insertions(+), 438 deletions(-)

diff --git a/types/clearbladejs-client/clearbladejs-client-tests.ts b/types/clearbladejs-client/clearbladejs-client-tests.ts
index 9aece4b19a..bce39bee2a 100644
--- a/types/clearbladejs-client/clearbladejs-client-tests.ts
+++ b/types/clearbladejs-client/clearbladejs-client-tests.ts
@@ -1,12 +1,12 @@
-// Testing type definitions for clearbladejs Client SDK v1.0.0
+// Testing type definitions for clearbladejs-client 1.0
 // Project: https://github.com/ClearBlade/JavaScript-API
-// Definitions by: Jim Bouquet <https://github.com/ClearBlade/>
+// Definitions by: Jim Bouquet <https://github.com/ClearBlade>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-var genericCallback = function(error: boolean, response: Resp) {};
+let genericCallback = (error: boolean, response: Resp) => {};
 
 ///////////////////////////////////////
-//ClearBlade object API invocations
+// ClearBlade object API invocations
 ///////////////////////////////////////
 ClearBlade.init({
     systemKey: "abcdef",
@@ -24,34 +24,34 @@ ClearBlade.loginUserMqtt("test@test.com", "password", genericCallback);
 ClearBlade.sendPush(["user1", "user2"], {data: "Test"}, "appId: string", genericCallback);
 ClearBlade.getAllCollections(genericCallback);
 
-var coll1 = ClearBlade.Collection("collectionID");
-var coll2 = ClearBlade.Collection({ collectionName: "collectionName" });
-var coll3 = ClearBlade.Collection({ collectionID: "collectionID" });
+let coll1 = ClearBlade.Collection("collectionID");
+let coll2 = ClearBlade.Collection({ collectionName: "collectionName" });
+let coll3 = ClearBlade.Collection({ collectionID: "collectionID" });
 
-var query1 = ClearBlade.Query("collectionID");
-var query2 = ClearBlade.Query({ offset: 5, limit: 5, collectionID: "collectionID" });
-var query3 = ClearBlade.Query({ collectionName: "collectionName" });
+let query1 = ClearBlade.Query("collectionID");
+let query2 = ClearBlade.Query({ offset: 5, limit: 5, collectionID: "collectionID" });
+let query3 = ClearBlade.Query({ collectionName: "collectionName" });
 
-var item1 = ClearBlade.Item({}, "collectionID");
-var item2 = ClearBlade.Item({}, { collectionID: "collectionID" });
+let item1 = ClearBlade.Item({}, "collectionID");
+let item2 = ClearBlade.Item({}, { collectionID: "collectionID" });
 
-var code = ClearBlade.Code();
-var user = ClearBlade.User();
+let code = ClearBlade.Code();
+let user = ClearBlade.User();
 
-var messaging = ClearBlade.Messaging({}, genericCallback);
-var stats = ClearBlade.MessagingStats();
+let messaging = ClearBlade.Messaging({}, genericCallback);
+let stats = ClearBlade.MessagingStats();
 
-var edge = ClearBlade.Edge();
-var metrics = ClearBlade.Metrics();
-var device = ClearBlade.Device();
-var analytics = ClearBlade.Analytics();
-var portal = ClearBlade.Portal("MyPortal");
-var triggers = ClearBlade.Triggers();
+let edge = ClearBlade.Edge();
+let metrics = ClearBlade.Metrics();
+let device = ClearBlade.Device();
+let analytics = ClearBlade.Analytics();
+let portal = ClearBlade.Portal("MyPortal");
+let triggers = ClearBlade.Triggers();
 
 ClearBlade.getEdges(query1.query, genericCallback);
 
 ///////////////////////////////////////
-//Collection API invocations
+// Collection API invocations
 ///////////////////////////////////////
 coll1.fetch(query1.query, genericCallback);
 coll1.create(ClearBlade.Item({}, ""), genericCallback);
@@ -61,7 +61,7 @@ coll1.columns(genericCallback);
 coll1.count(query1.query, genericCallback);
 
 ///////////////////////////////////////
-//Query API invocations
+// Query API invocations
 ///////////////////////////////////////
 query1.addSortToQuery(
     query1,
@@ -91,14 +91,14 @@ query1.columns([]);
 query1.remove(genericCallback);
 
 ///////////////////////////////////////
-//Item API invocations
+// Item API invocations
 ///////////////////////////////////////
 item1.save(genericCallback);
 item1.refresh(genericCallback);
 item1.destroy(genericCallback);
 
 ///////////////////////////////////////
-//Code API invocations
+// Code API invocations
 ///////////////////////////////////////
 code.create("codeName", "body: string", genericCallback);
 code.update("codeName", "body: string", genericCallback);
@@ -109,7 +109,7 @@ code.getFailedServices(genericCallback);
 code.getAllServices(genericCallback);
 
 ///////////////////////////////////////
-//User API invocations
+// User API invocations
 ///////////////////////////////////////
 user.getUser(genericCallback);
 user.setUser({}, genericCallback);
@@ -118,7 +118,7 @@ user.setPassword("old_password", "new_password", genericCallback);
 user.count(query1.query, genericCallback);
 
 ///////////////////////////////////////
-//Messaging API invocations
+// Messaging API invocations
 ///////////////////////////////////////
 messaging.getMessageHistoryWithTimeFrame("topic", 5, 10, 15, 20, genericCallback);
 messaging.getMessageHistory("topic", 5, 15, genericCallback);
@@ -126,20 +126,20 @@ messaging.getAndDeleteMessageHistory("topic", 5, 10, 1, 20, genericCallback);
 messaging.currentTopics(genericCallback);
 messaging.publish("topic", {});
 messaging.publishREST("topic", { payload: Object }, genericCallback);
-var mcb = function(message: string) {};
+let mcb = (message: string) => {};
 messaging.subscribe("topic", {}, mcb);
 messaging.unsubscribe("topic", {});
 messaging.disconnect();
 
 ///////////////////////////////////////
-//MessagingStats API invocations
+// MessagingStats API invocations
 ///////////////////////////////////////
 stats.getAveragePayloadSize("topic: string", 5, 5, genericCallback);
 stats.getOpenConnections(genericCallback);
 stats.getCurrentSubscribers("topic: string", genericCallback);
 
 ///////////////////////////////////////
-//Edge API invocations
+// Edge API invocations
 ///////////////////////////////////////
 edge.updateEdgeByName("edgename", {changedColumn: "New value"}, genericCallback);
 edge.deleteEdgeByName("edgename", genericCallback);
@@ -148,7 +148,7 @@ edge.columns(genericCallback);
 edge.count(query1.query, genericCallback);
 
 ///////////////////////////////////////
-//Metrics API invocations
+// Metrics API invocations
 ///////////////////////////////////////
 metrics.setQuery(query1.query);
 metrics.getStatistics(genericCallback);
@@ -157,7 +157,7 @@ metrics.getDBConnections(genericCallback);
 metrics.getLogs(genericCallback);
 
 ///////////////////////////////////////
-//Device API invocations
+// Device API invocations
 ///////////////////////////////////////
 device.getDeviceByName("devicename", genericCallback);
 device.updateDeviceByName("devicename", { object: Object }, true, genericCallback);
@@ -170,7 +170,7 @@ device.columns(genericCallback);
 device.count(query1.query, genericCallback);
 
 ///////////////////////////////////////
-//Analytics API invocations
+// Analytics API invocations
 ///////////////////////////////////////
 analytics.getStorage({}, genericCallback);
 analytics.getCount({}, genericCallback);
@@ -179,13 +179,13 @@ analytics.getEventTotals({}, genericCallback);
 analytics.getUserEvents({}, genericCallback);
 
 ///////////////////////////////////////
-//Portal API invocations
+// Portal API invocations
 ///////////////////////////////////////
 portal.fetch(genericCallback);
 portal.update({data: Object}, genericCallback);
 
 ///////////////////////////////////////
-//Triggers API invocations
+// Triggers API invocations
 ///////////////////////////////////////
 triggers.fetchDefinitions(genericCallback);
 triggers.create("triggername", {data: Object}, genericCallback);
diff --git a/types/clearbladejs-client/global.d.ts b/types/clearbladejs-client/global.d.ts
index 7f70ed08f7..d6e2e88a70 100644
--- a/types/clearbladejs-client/global.d.ts
+++ b/types/clearbladejs-client/global.d.ts
@@ -2,4 +2,4 @@ declare global {
     var ClearBlade: ClearBladeGlobal;
 }
 
-export {};
\ No newline at end of file
+export {};
diff --git a/types/clearbladejs-client/index.d.ts b/types/clearbladejs-client/index.d.ts
index 44dd355213..4cb8c4744b 100644
--- a/types/clearbladejs-client/index.d.ts
+++ b/types/clearbladejs-client/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for clearbladejs Client SDK v1.0.0
+// Type definitions for clearbladejs-client 1.0
 // Project: https://github.com/ClearBlade/JavaScript-API
-// Definitions by: Jim Bouquet <https://github.com/ClearBlade/>
+// Definitions by: Jim Bouquet <https://github.com/ClearBlade>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
@@ -52,9 +52,7 @@ interface APIUser {
     authToken: string;
 }
 
-interface CbCallback {
-    (error: boolean, response: Resp): void;
-}
+type CbCallback = (error: boolean, response: Resp) => void;
 
 interface ClearBladeGlobal extends ClearBladeInt {
     MESSAGING_QOS_AT_MOST_ONCE: MessagingQOS.MESSAGING_QOS_AT_MOST_ONCE;
@@ -87,14 +85,14 @@ interface ClearBladeInt {
     Query(
         options: string | QueryOptionsWithName | QueryOptionsWithID
     ): QueryObj;
-    Item(data: Object, collectionID: string | ItemOptions): Item;
+    Item(data: object, collectionID: string | ItemOptions): Item;
     Code(): Code;
     User(): AppUser;
     Messaging(options: MessagingOptions, callback: CbCallback): Messaging;
     MessagingStats(): MessagingStats;
     sendPush(
         users: string[],
-        payload: Object,
+        payload: object,
         appId: string,
         callback: CbCallback
     ): void;
@@ -127,7 +125,7 @@ interface Collection {
 
     fetch(query: Query, callback: CbCallback): void;
     create(newItem: Item, callback: CbCallback): void;
-    update(query: Query, changes: Object, callback: CbCallback): void;
+    update(query: Query, changes: object, callback: CbCallback): void;
     remove(query: Query, callback: CbCallback): void;
     columns(callback: CbCallback): void;
     count(query: Query, callback: CbCallback): void;
@@ -210,7 +208,7 @@ interface QueryObj {
     or(query: QueryObj): void;
     setPage(pageSize: number, pageNum: number): void;
     fetch(callback: CbCallback): void;
-    update(changes: Object, callback: CbCallback): void;
+    update(changes: object, callback: CbCallback): void;
     columns(columnsArray: string[]): void;
     remove(callback: CbCallback): void;
 }
@@ -218,7 +216,7 @@ interface QueryObj {
 interface ItemOptions extends CollectionOptionsWithID {}
 
 interface Item {
-    data: Object;
+    data: object;
 
     save(callback: CbCallback): void;
     refresh(callback: CbCallback): void;
@@ -235,7 +233,7 @@ interface Code {
     create(name: string, body: string, callback: CbCallback): void;
     update(name: string, body: string, callback: CbCallback): void;
     delete(name: string, callback: CbCallback): void;
-    execute(name: string, params: Object, callback: CbCallback): void;
+    execute(name: string, params: object, callback: CbCallback): void;
     getCompletedServices(callback: CbCallback): void;
     getFailedServices(callback: CbCallback): void;
     getAllServices(callback: CbCallback): void;
@@ -250,7 +248,7 @@ interface AppUser {
     callTimeout: number;
 
     getUser(callback: CbCallback): void;
-    setUser(data: Object, callback: CbCallback): void;
+    setUser(data: object, callback: CbCallback): void;
     allUsers(query: Query, callback: CbCallback): void;
     setPassword(
         old_password: string,
@@ -292,8 +290,8 @@ interface Messaging {
         callback: CbCallback
     ): void;
     currentTopics(callback: CbCallback): void;
-    publish(topic: string, payload: Object): void;
-    publishREST(topic: string, payload: Object, callback: CbCallback): void;
+    publish(topic: string, payload: object): void;
+    publishREST(topic: string, payload: object, callback: CbCallback): void;
     subscribe(
         topic: string,
         options: MessagingSubscribeOptions,
@@ -321,13 +319,11 @@ interface MessagingConfiguration extends CommonMessagingProperties {
     password: string;
 }
 
-interface MessageCallback {
-    (message: string): void;
-}
+type MessageCallback = (message: string) => void;
 
 interface MessagingSubscribeOptions {
     qos?: MessagingQOS;
-    invocationContext?: Object;
+    invocationContext?: object;
     onSuccess?: Function;
     onFailure?: Function;
     timeout?: number;
@@ -355,9 +351,9 @@ interface Edge {
     systemKey: string;
     systemSecret: string;
 
-    updateEdgeByName(name: string, object: Object, callback: CbCallback): void;
+    updateEdgeByName(name: string, object: object, callback: CbCallback): void;
     deleteEdgeByName(name: string, callback: CbCallback): void;
-    create(newEdge: Object, name: string, callback: CbCallback): void;
+    create(newEdge: object, name: string, callback: CbCallback): void;
     columns(callback: CbCallback): void;
     count(query: Query, callback: CbCallback): void;
 }
@@ -383,7 +379,7 @@ interface Device {
     getDeviceByName(name: string, callback: CbCallback): void;
     updateDeviceByName(
         name: string,
-        object: Object,
+        object: object,
         trigger: boolean,
         callback: CbCallback
     ): void;
@@ -391,12 +387,12 @@ interface Device {
     fetch(query: Query, callback: CbCallback): void;
     update(
         query: Query,
-        object: Object,
+        object: object,
         trigger: boolean,
         callback: CbCallback
     ): void;
     delete(query: Query, callback: CbCallback): void;
-    create(newDevice: Object, callback: CbCallback): void;
+    create(newDevice: object, callback: CbCallback): void;
     columns(callback: CbCallback): void;
     count(query: Query, callback: CbCallback): void;
 }
@@ -422,7 +418,7 @@ interface Portal {
     systemSecret: string;
 
     fetch(callback: CbCallback): void;
-    update(data: Object, callback: CbCallback): void;
+    update(data: object, callback: CbCallback): void;
 }
 
 interface Triggers {
@@ -432,8 +428,8 @@ interface Triggers {
     systemSecret: string;
 
     fetchDefinitions(callback: CbCallback): void;
-    create(name: string, data: Object, callback: CbCallback): void;
-    update(name: string, data: Object, callback: CbCallback): void;
+    create(name: string, data: object, callback: CbCallback): void;
+    update(name: string, data: object, callback: CbCallback): void;
     delete(name: string, callback: CbCallback): void;
 }
 
diff --git a/types/clearbladejs-client/tslint.json b/types/clearbladejs-client/tslint.json
index a4c53997aa..d538486d5e 100644
--- a/types/clearbladejs-client/tslint.json
+++ b/types/clearbladejs-client/tslint.json
@@ -1,79 +1,7 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
         "ban-types": false,
-        "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
-        "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
-        "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
-        "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
-        "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
-        "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
-        "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
+        "no-empty-interface": false
     }
 }
\ No newline at end of file
diff --git a/types/clearbladejs-node/clearbladejs-node-tests.ts b/types/clearbladejs-node/clearbladejs-node-tests.ts
index 18cd509cc7..e9cb585d50 100644
--- a/types/clearbladejs-node/clearbladejs-node-tests.ts
+++ b/types/clearbladejs-node/clearbladejs-node-tests.ts
@@ -1,23 +1,26 @@
+// Testing type definitions for clearbladejs-node 1.0
+// Project: https://github.com/ClearBlade/Node-SDK
+// Definitions by: Jim Bouquet <https://github.com/ClearBlade>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
 import { ClearBlade, Resp, QuerySortDirections, QueryConditions } from ".";
 
 // Sample code for clearbladejs Node SDK v1.0.0 used to test typescript definitions
 
-const constants = require("./constants.json");
-
-var genericCallback = function(error: boolean, response: Resp) {};
+const genericCallback = (error: boolean, response: Resp) => {};
 
 ///////////////////////////////////////
-//ClearBlade object API invocations
+// ClearBlade object API invocations
 ///////////////////////////////////////
 ClearBlade.init({
 	email: "a@a.com",
 	password: "a",
-	systemKey: constants.systemKey,
-	systemSecret: constants.systemSecret,
-	URI: constants.URL,
-	messagingURI: constants.messageURL,
+	systemKey: "testkey",
+	systemSecret: "testsecret",
+	URI: "https://mycbplatform.com",
+	messagingURI: "mycbplatform.com",
 	callback: genericCallback
-})
+});
 
 ClearBlade.setUser("test@test.com", "password");
 ClearBlade.registerUser("test@test.com", "password", genericCallback);
@@ -38,34 +41,33 @@ ClearBlade.sendPush([], {}, "appId: string", genericCallback);
 // makeKVPair(key: string, value: string): KeyValuePair;
 // request(options: RequestOptions, callback: RequestCallback): void;
 
-var coll1 = ClearBlade.Collection("collectionID");
-var coll2 = ClearBlade.Collection({collectionName: "collectionName"});
-var coll3 = ClearBlade.Collection({collectionID: "collectionID"});
+const coll1 = ClearBlade.Collection("collectionID");
+const coll2 = ClearBlade.Collection({collectionName: "collectionName"});
+const coll3 = ClearBlade.Collection({collectionID: "collectionID"});
 
-var query1 = ClearBlade.Query("collectionID");
-var query2 = ClearBlade.Query({offset: 5, limit: 5, collectionID: "collectionID"});
-var query3 = ClearBlade.Query({collectionName: "collectionName"});
-var query4 = ClearBlade.Query({collection: "collectionID"});
+const query1 = ClearBlade.Query("collectionID");
+const query2 = ClearBlade.Query({offset: 5, limit: 5, collectionID: "collectionID"});
+const query3 = ClearBlade.Query({collectionName: "collectionName"});
+const query4 = ClearBlade.Query({collection: "collectionID"});
 
 ClearBlade.addToQuery(query1, "key", "value");
 ClearBlade.addFilterToQuery(query1, QueryConditions.QUERY_GREATERTHAN, "key", "value");
 ClearBlade.addSortToQuery(query1, QuerySortDirections.QUERY_SORT_ASCENDING, "column1");
 
-var opQueryStr = ClearBlade.parseOperationQuery(query1.query);
-var parse1:string = ClearBlade.parseQuery(query1.query);
-var parse2:string = ClearBlade.parseQuery(query1);
+const opQueryStr = ClearBlade.parseOperationQuery(query1.query);
+const parse1: string = ClearBlade.parseQuery(query1.query);
+const parse2: string = ClearBlade.parseQuery(query1);
 
+const item1 = ClearBlade.Item({}, "hello");
+const item2 = ClearBlade.Item({}, {collectionID: "hello"});
 
-var item1 = ClearBlade.Item({}, "hello");
-var item2 = ClearBlade.Item({}, {collectionID: "hello"});
+const code = ClearBlade.Code();
+const user = ClearBlade.User();
 
-var code = ClearBlade.Code();
-var user = ClearBlade.User();
-
-var messaging = ClearBlade.Messaging({}, genericCallback);
+const messaging = ClearBlade.Messaging({}, genericCallback);
 
 ///////////////////////////////////////
-//Collection API invocations
+// Collection API invocations
 ///////////////////////////////////////
 coll1.fetch(query1, genericCallback);
 coll1.create(ClearBlade.Item({}, ""), genericCallback);
@@ -73,7 +75,7 @@ coll1.update(query1.query, {}, genericCallback);
 coll1.remove(query1.query, genericCallback);
 
 ///////////////////////////////////////
-//Query API invocations
+// Query API invocations
 ///////////////////////////////////////
 query1.ascending("string");
 query1.descending("string");
@@ -90,26 +92,26 @@ query1.update({}, genericCallback);
 query1.remove(genericCallback);
 
 ///////////////////////////////////////
-//Item API invocations
+// Item API invocations
 ///////////////////////////////////////
 item1.save();
 item1.refresh();
 item1.destroy();
 
 ///////////////////////////////////////
-//Code API invocations
+// Code API invocations
 ///////////////////////////////////////
 code.execute("codeName", {}, genericCallback);
 
 ///////////////////////////////////////
-//User API invocations
+// User API invocations
 ///////////////////////////////////////
 user.getUser(genericCallback);
 user.setUser({}, genericCallback);
 user.allUsers(query1.query, genericCallback);
 
 ///////////////////////////////////////
-//Messaging API invocations
+// Messaging API invocations
 ///////////////////////////////////////
 messaging.getMessageHistory("topic: string", 5, 15, genericCallback);
 
@@ -117,9 +119,6 @@ messaging.publish("topic: string", {});
 
 messaging.subscribe("my/topic", {}, messageReceivedCb);
 
-function messageReceivedCb (message: string) {
+function messageReceivedCb(message: string) {
 	messaging.unsubscribe("my/topic");
 }
-
-
-
diff --git a/types/clearbladejs-node/index.d.ts b/types/clearbladejs-node/index.d.ts
index bef502bb00..192b1a97ee 100644
--- a/types/clearbladejs-node/index.d.ts
+++ b/types/clearbladejs-node/index.d.ts
@@ -1,26 +1,26 @@
-// Type definitions for clearbladejs Node SDK v1.0.0
+// Type definitions for clearbladejs-node 1.0
 // Project: https://github.com/ClearBlade/Node-SDK
-// Definitions by: Jim Bouquet <https://github.com/ClearBlade/>
+// Definitions by: Jim Bouquet <https://github.com/ClearBlade>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
 /// <reference types="request" />
 
 import { Response, RequestCallback } from "request/index";
-//import {//PacketCallback } from "mqtt";
+// import {//PacketCallback } from "mqtt";
 
-declare enum MessagingQOS {
+export enum MessagingQOS {
     MESSAGING_QOS_AT_MOST_ONCE = 0,
     MESSAGING_QOS_AT_LEAST_ONCE = 1,
     MESSAGING_QOS_EXACTLY_ONCE = 2
 }
 
 export interface Resp {
-    error(msg: any): never; // todo: figure out if we can have the compiler throw an error if someone adds code after this
+    error(msg: any): never;
     success(msg: any): never;
 }
 
-export interface InitOptions { 
+export interface InitOptions {
     systemKey: string;
     systemSecret: string;
     logging?: boolean;
@@ -49,7 +49,7 @@ export interface RequestOptions {
     user?: APIUser;
 }
 
-export interface APIUser { 
+export interface APIUser {
     email: string;
     authToken: string;
 }
@@ -58,9 +58,7 @@ export interface KeyValuePair {
     [key: string]: any;
 }
 
-export interface CbCallback {
-    (error: boolean, response: Resp): void
-} 
+export type CbCallback = (error: boolean, response: Resp) => void;
 
 export default interface ClearBladeGlobal extends ClearBladeInt {
     isCurrentUserAuthenticated(callback: CbCallback): void;
@@ -70,12 +68,12 @@ export interface ClearBladeInt {
     addToQuery(queryObj: QueryObj, key: string, value: string): void;
     addFilterToQuery(queryObj: QueryObj, condition: QueryConditions, key: string, value: QueryValue): void;
     addSortToQuery(queryObj: QueryObj, direction: QuerySortDirections, column: string): void;
-    Code() :Code;
-    Collection(options: string | CollectionOptionsWithName | CollectionOptionsWithID) :Collection;
-    execute(error: Object, response: Object, callback: CbCallback): void;
+    Code(): Code;
+    Collection(options: string | CollectionOptionsWithName | CollectionOptionsWithID): Collection;
+    execute(error: object, response: object, callback: CbCallback): void;
     init(options: InitOptions): void;
-    isObjectEmpty(obj: Object): boolean;
-    Item(data: Object, options: string | ItemOptions) :Item;
+    isObjectEmpty(obj: object): boolean;
+    Item(data: object, options: string | ItemOptions): Item;
     logger(message: string): void;
     loginAnon(callback: CbCallback): void;
     loginUser(email: string, password: string, callback: CbCallback): void;
@@ -83,21 +81,21 @@ export interface ClearBladeInt {
     makeKVPair(key: string, value: string): KeyValuePair;
     parseOperationQuery(query: Query): string;
     parseQuery(query: Query | QueryObj): string;
-    Query(options: string | QueryOptionsWithCollection | QueryOptionsWithName | QueryOptionsWithID) :QueryObj;
+    Query(options: string | QueryOptionsWithCollection | QueryOptionsWithName | QueryOptionsWithID): QueryObj;
     registerUser(email: string, password: string, callback: CbCallback): void;
     request(options: RequestOptions, callback: RequestCallback): void;
     setUser(email: string, password: string): void;
-    User() :AppUser;
-    Messaging(options: MessagingOptions, callback: CbCallback) :Messaging;
-    sendPush(users: string[], payload: Object, appId: string, callback: CbCallback): void;
-    validateEmailPassword(email: string, password:string): void;
+    User(): AppUser;
+    Messaging(options: MessagingOptions, callback: CbCallback): Messaging;
+    sendPush(users: string[], payload: object, appId: string, callback: CbCallback): void;
+    validateEmailPassword(email: string, password: string): void;
 }
 
-export interface CollectionOptionsWithName { 
+export interface CollectionOptionsWithName {
     collectionName: string;
 }
 
-export interface CollectionOptionsWithID { 
+export interface CollectionOptionsWithID {
     collectionID: string;
 }
 
@@ -110,16 +108,16 @@ export interface Collection {
 
     fetch(query: QueryObj, callback: CbCallback): void;
     create(newItem: Item, callback: CbCallback): void;
-    update(query: Query, changes: Object, callback: CbCallback): void;
+    update(query: Query, changes: object, callback: CbCallback): void;
     remove(query: Query, callback: CbCallback): void;
 }
 
-export declare enum QuerySortDirections {
+export enum QuerySortDirections {
     QUERY_SORT_ASCENDING = 'ASC',
     QUERY_SORT_DESCENDING = 'DESC'
 }
 
-export declare enum QueryConditions {
+export enum QueryConditions {
     QUERY_EQUAL = 'EQ',
     QUERY_NOTEQUAL = 'NEQ',
     QUERY_GREATERTHAN = 'GT',
@@ -131,17 +129,18 @@ export declare enum QueryConditions {
 
 export type QueryValue = string|number|boolean;
 
-export interface QueryOptions { 
+export interface QueryOptions {
     offset?: number;
     limit?: number;
 }
 
-export interface QueryOptionsWithCollection extends QueryOptions{
+export interface QueryOptionsWithCollection extends QueryOptions {
     collection: string;
 }
 
-export interface QueryOptionsWithName extends CollectionOptionsWithName, QueryOptions{}
-export interface QueryOptionsWithID extends CollectionOptionsWithID, QueryOptions{}
+export interface QueryOptionsWithName extends CollectionOptionsWithName, QueryOptions {}
+
+export interface QueryOptionsWithID extends CollectionOptionsWithID, QueryOptions {}
 
 export interface Query {
     SELECTCOLUMNS?: string[];
@@ -152,11 +151,11 @@ export interface Query {
 }
 
 export interface QueryFilter {
-    [QueryConditions: string]: QueryFilterValue
+    [QueryConditions: string]: QueryFilterValue;
 }
 
 export interface QueryFilterValue {
-    [name: string]: QueryValue
+    [name: string]: QueryValue;
 }
 
 export interface QueryObj {
@@ -182,14 +181,14 @@ export interface QueryObj {
     or(query: QueryObj): Query;
     setPage(pageSize: number, pageNum: number): Query;
     fetch(callback: CbCallback): void;
-    update(changes: Object, callback: CbCallback): void;
+    update(changes: object, callback: CbCallback): void;
     remove(callback: CbCallback): void;
 }
 
-export interface ItemOptions extends CollectionOptionsWithID{}
+export interface ItemOptions extends CollectionOptionsWithID {}
 
 export interface Item {
-    data: Object;
+    data: object;
 
     save(): void;
     refresh(): void;
@@ -204,7 +203,7 @@ export interface Code {
     callTimeout: number;
     URIPrefix: string;
 
-    execute(name: string, params: Object, callback: CbCallback): void;
+    execute(name: string, params: object, callback: CbCallback): void;
 }
 
 export interface AppUser {
@@ -214,7 +213,7 @@ export interface AppUser {
     systemSecret: string;
 
     getUser(callback: CbCallback): void;
-    setUser(data: Object, callback: CbCallback): void;
+    setUser(data: object, callback: CbCallback): void;
     allUsers(query: Query, callback: CbCallback): void;
 }
 
@@ -223,12 +222,12 @@ export interface Messaging {
     URI: string;
     systemKey: string;
     systemSecret: string;
-    client: Object;
+    client: object;
 
     getMessageHistory(topic: string, startTime: number, count: number, callback: CbCallback): void;
-    publish(topic: string, payload: Object): void;
+    publish(topic: string, payload: object): void;
     subscribe(topic: string, options: MessagingSubscribeOptions, messageCallback: MessageCallback): void;
-    unsubscribe(topic: string, callback?: (error?: Error, packet?: Object) => any): void;
+    unsubscribe(topic: string, callback?: (error?: Error, packet?: object) => any): void;
 }
 
 export interface CommonMessagingProperties {
@@ -237,7 +236,7 @@ export interface CommonMessagingProperties {
 }
 
 export interface MessagingOptions extends CommonMessagingProperties {
-    qos?: MessagingQOS
+    qos?: MessagingQOS;
 }
 
 export interface MessagingSubscribeOptions {
@@ -245,10 +244,6 @@ export interface MessagingSubscribeOptions {
     timeout?: number;
 }
 
-export interface MessageCallback {
-    (message: string): void;
-}
+export type MessageCallback = (message: string) => void;
 
-declare var ClearBlade: ClearBladeGlobal;
-
-export {ClearBlade};
+export let ClearBlade: ClearBladeGlobal;
diff --git a/types/clearbladejs-node/tslint.json b/types/clearbladejs-node/tslint.json
index a4c53997aa..2e3f95d861 100644
--- a/types/clearbladejs-node/tslint.json
+++ b/types/clearbladejs-node/tslint.json
@@ -1,79 +1,7 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
-        "ban-types": false,
-        "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
-        "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
         "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
-        "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
-        "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
-        "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
-        "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
+        "no-relative-import-in-test": false
     }
 }
\ No newline at end of file
diff --git a/types/clearbladejs-server/clearbladejs-server-tests.ts b/types/clearbladejs-server/clearbladejs-server-tests.ts
index ea7c179df2..d240f181ea 100644
--- a/types/clearbladejs-server/clearbladejs-server-tests.ts
+++ b/types/clearbladejs-server/clearbladejs-server-tests.ts
@@ -1,12 +1,12 @@
-// Testing type definitions for clearbladejs Client SDK v1.0.0
+// Testing type definitions for clearbladejs-server 1.0
 // Project: https://github.com/ClearBlade/JavaScript-API
-// Definitions by: Jim Bouquet <https://github.com/ClearBlade/>
+// Definitions by: Jim Bouquet <https://github.com/ClearBlade>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-var genericCallback = function(error: boolean, response: Resp) {};
+const genericCallback = (error: boolean, response: Resp) => {};
 
 ///////////////////////////////////////
-//ClearBlade object API invocations
+// ClearBlade object API invocations
 ///////////////////////////////////////
 ClearBlade.init({
     systemKey: "abcdef",
@@ -27,7 +27,7 @@ ClearBlade.init({request: {
     userid: "abcdef",
 }});
 
-var about = ClearBlade.about();
+const about = ClearBlade.about();
 ClearBlade.setUser("test@test.com", "authtoken", "userId");
 ClearBlade.registerUser("test@test.com", "password", genericCallback);
 ClearBlade.isCurrentUserAuthenticated(genericCallback);
@@ -36,32 +36,32 @@ ClearBlade.loginAnon(genericCallback);
 ClearBlade.loginUser("test@test.com", "password", genericCallback);
 
 ClearBlade.getAllCollections(genericCallback);
-var edgeID = ClearBlade.edgeId();
-var isEdge = ClearBlade.isEdge(genericCallback);
+const edgeID = ClearBlade.edgeId();
+const isEdge = ClearBlade.isEdge(genericCallback);
 if (ClearBlade.isObjectEmpty({test: "test"})) {
     ClearBlade.logger("Object is empty");
 }
-var kvPair = ClearBlade.makeKVPair("key", "value");
+const kvPair = ClearBlade.makeKVPair("key", "value");
 
-var coll1 = ClearBlade.Collection("collectionID");
-var coll2 = ClearBlade.Collection({ collectionName: "collectionName" });
-var coll3 = ClearBlade.Collection({ collectionID: "collectionID" });
-var coll4 = ClearBlade.Collection({ collection: "collectionID" });
+const coll1 = ClearBlade.Collection("collectionID");
+const coll2 = ClearBlade.Collection({ collectionName: "collectionName" });
+const coll3 = ClearBlade.Collection({ collectionID: "collectionID" });
+const coll4 = ClearBlade.Collection({ collection: "collectionID" });
 
-var query1 = ClearBlade.Query({ collectionID: "collectionID" });
-var query2 = ClearBlade.Query({ collectionName: "collectionName" });
-var query3 = ClearBlade.Query({ collection: "collectionID" });
+const query1 = ClearBlade.Query({ collectionID: "collectionID" });
+const query2 = ClearBlade.Query({ collectionName: "collectionName" });
+const query3 = ClearBlade.Query({ collection: "collectionID" });
 
-var item1 = ClearBlade.Item({}, "collectionID");
-var item2 = ClearBlade.Item({}, { collectionID: "collectionID" });
+const item1 = ClearBlade.Item({}, "collectionID");
+const item2 = ClearBlade.Item({}, { collectionID: "collectionID" });
 
-var code = ClearBlade.Code();
-var deployment = ClearBlade.Deployment();
-var user = ClearBlade.User();
+const code = ClearBlade.Code();
+const deployment = ClearBlade.Deployment();
+const user = ClearBlade.User();
 
-var messaging = ClearBlade.Messaging({}, genericCallback);
+const messaging = ClearBlade.Messaging({}, genericCallback);
 
-var device = ClearBlade.Device();
+const device = ClearBlade.Device();
 
 ClearBlade.addToQuery(query1, "key", "value");
 ClearBlade.addSortToQuery(
@@ -78,9 +78,9 @@ ClearBlade.addFilterToQuery(
 
 ClearBlade.newCollection("collectionName", genericCallback);
 
-var parseOperation = ClearBlade.parseOperationQuery(query1.query);
-var parseQuery1 = ClearBlade.parseQuery(query1);
-var parseQuery2 = ClearBlade.parseQuery(query1.query);
+const parseOperation = ClearBlade.parseOperationQuery(query1.query);
+const parseQuery1 = ClearBlade.parseQuery(query1);
+const parseQuery2 = ClearBlade.parseQuery(query1.query);
 
 ClearBlade.createDevice("devicename", {type: "devicetype"}, false, genericCallback);
 ClearBlade.deleteDevice("devicename", true, genericCallback);
@@ -90,7 +90,7 @@ ClearBlade.getAllDevicesForSystem(genericCallback);
 ClearBlade.validateEmailPassword("test@test.com", "password");
 
 ///////////////////////////////////////
-//Collection API invocations
+// Collection API invocations
 ///////////////////////////////////////
 coll1.addColumn({name: "column1"}, genericCallback);
 coll1.dropColumn("column1", genericCallback);
@@ -103,7 +103,7 @@ coll1.columns(genericCallback);
 coll1.count(query1.query, genericCallback);
 
 ///////////////////////////////////////
-//Query API invocations
+// Query API invocations
 ///////////////////////////////////////
 query2.ascending("string");
 query1.descending("string");
@@ -122,20 +122,20 @@ query1.columns([]);
 query1.remove(genericCallback);
 
 ///////////////////////////////////////
-//Item API invocations
+// Item API invocations
 ///////////////////////////////////////
 item1.save();
 item1.refresh();
 item1.destroy();
 
 ///////////////////////////////////////
-//Code API invocations
+// Code API invocations
 ///////////////////////////////////////
 code.execute("codeName", {}, true, genericCallback);
 code.getAllServices(genericCallback);
 
 ///////////////////////////////////////
-//Deployment API invocations
+// Deployment API invocations
 ///////////////////////////////////////
 deployment.create("deploymentname", "deployment description", {}, genericCallback);
 deployment.update("deploymentname", {}, genericCallback);
@@ -144,7 +144,7 @@ deployment.read("deploymentname", genericCallback);
 deployment.readAll(query1, genericCallback);
 
 ///////////////////////////////////////
-//User API invocations
+// User API invocations
 ///////////////////////////////////////
 user.getUser(genericCallback);
 user.setUser({}, genericCallback);
@@ -153,7 +153,7 @@ user.allUsers(query1, genericCallback);
 user.count(query1, genericCallback);
 
 ///////////////////////////////////////
-//Messaging API invocations
+// Messaging API invocations
 ///////////////////////////////////////
 messaging.getMessageHistoryWithTimeFrame("topic", 5, 10, 15, 20, genericCallback);
 messaging.getMessageHistory("topic", 5, 15, genericCallback);
@@ -162,7 +162,7 @@ messaging.getCurrentTopics(genericCallback);
 messaging.publish("topic", "payload");
 
 ///////////////////////////////////////
-//Device API invocations
+// Device API invocations
 ///////////////////////////////////////
 device.fetch(query1.query, genericCallback);
 device.update(query1.query, { object: Object }, genericCallback);
@@ -170,10 +170,10 @@ device.delete(query1.query, genericCallback);
 device.create({ newDevice: Object }, genericCallback);
 
 ///////////////////////////////////////
-//Triggers API invocations
+// Triggers API invocations
 ///////////////////////////////////////
 ClearBlade.Trigger.Create(
-    "triggername", 
+    "triggername",
     {
         system_key: "key",
 	    name: "triggername",
@@ -186,7 +186,7 @@ ClearBlade.Trigger.Create(
 ClearBlade.Trigger.Fetch("triggername", genericCallback);
 
 ///////////////////////////////////////
-//Timers API invocations
+// Timers API invocations
 ///////////////////////////////////////
 ClearBlade.Timer.Create("timername", {}, genericCallback);
 ClearBlade.Timer.Fetch("timername", genericCallback);
diff --git a/types/clearbladejs-server/global.d.ts b/types/clearbladejs-server/global.d.ts
index 7f70ed08f7..d6e2e88a70 100644
--- a/types/clearbladejs-server/global.d.ts
+++ b/types/clearbladejs-server/global.d.ts
@@ -2,4 +2,4 @@ declare global {
     var ClearBlade: ClearBladeGlobal;
 }
 
-export {};
\ No newline at end of file
+export {};
diff --git a/types/clearbladejs-server/index.d.ts b/types/clearbladejs-server/index.d.ts
index 2c3a0845b4..fb3ef065ce 100644
--- a/types/clearbladejs-server/index.d.ts
+++ b/types/clearbladejs-server/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for clearbladejs Server SDK v1.0.0
+// Type definitions for clearbladejs-server 1.0
 // Project: https://docs.clearblade.com/v/3/4-developer_reference/platformsdk/ClearBlade.js/
-// Definitions by: Jim Bouquet <https://github.com/ClearBlade/>
+// Definitions by: Jim Bouquet <https://github.com/ClearBlade>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
@@ -24,14 +24,14 @@ interface Resp {
     success(msg: any): never;
 }
 declare var resp: Resp;
- 
+
 declare enum MessagingQOS {
     MESSAGING_QOS_AT_MOST_ONCE = 0,
     MESSAGING_QOS_AT_LEAST_ONCE = 1,
     MESSAGING_QOS_EXACTLY_ONCE = 2
 }
 
-interface InitOptions { 
+interface InitOptions {
     systemKey: string;
     systemSecret: string;
     logging?: boolean;
@@ -49,7 +49,7 @@ interface InitOptions {
     callTimeout?: number;
 }
 
-interface APIUser { 
+interface APIUser {
     email: string;
     authToken: string;
     user_id?: string;
@@ -59,9 +59,7 @@ interface KeyValuePair {
     [key: string]: any;
 }
 
-interface CbCallback {
-    (error: boolean, response: Resp): void
-} 
+type CbCallback = (error: boolean, response: Resp) => void;
 
 interface ClearBladeGlobal extends ClearBladeInt {
     user: APIUser;
@@ -76,18 +74,18 @@ interface ClearBladeInt {
     addFilterToQuery(queryObj: QueryObj, condition: QueryConditions, key: string, value: QueryValue): void;
     addSortToQuery(queryObj: QueryObj, direction: QuerySortDirections, column: string): void;
     Code(): Code;
-    Collection(options: string | CollectionOptionsWithName | CollectionOptionsWithID | CollectionOptionsWithCollection) :Collection;
+    Collection(options: string | CollectionOptionsWithName | CollectionOptionsWithID | CollectionOptionsWithCollection): Collection;
     Deployment(): Deployment;
     Device(): Device;
     edgeId(): string;
-    execute(error: Object, response: Object, callback: CbCallback): any;
+    execute(error: object, response: object, callback: CbCallback): any;
     getAllCollections(callback: CbCallback): void;
-    http(): Object;
+    http(): object;
     init(options: InitOptions | {request: BasicReq}): void;
     isEdge(callback: CbCallback): boolean;
     isCurrentUserAuthenticated(callback: CbCallback): void;
-    isObjectEmpty(obj: Object): boolean;
-    Item(data: Object, options: string | ItemOptions): Item;
+    isObjectEmpty(obj: object): boolean;
+    Item(data: object, options: string | ItemOptions): Item;
     logger(message: string): void;
     loginAnon(callback: CbCallback): void;
     loginUser(email: string, password: string, callback: CbCallback): void;
@@ -107,18 +105,18 @@ interface ClearBladeInt {
     updateDevice(name: string, data: object, causeTrigger: boolean, callback: CbCallback): void;
     getDeviceByName(name: string, callback: CbCallback): void;
     getAllDevicesForSystem(callback: CbCallback): void;
-    validateEmailPassword(email: string, password:string): void;
+    validateEmailPassword(email: string, password: string): void;
 }
 
-interface CollectionOptionsWithCollection { 
+interface CollectionOptionsWithCollection {
     collection: string;
 }
 
-interface CollectionOptionsWithName { 
+interface CollectionOptionsWithName {
     collectionName: string;
 }
 
-interface CollectionOptionsWithID { 
+interface CollectionOptionsWithID {
     collectionID: string;
 }
 
@@ -128,12 +126,12 @@ interface Collection {
     systemKey: string;
     systemSecret: string;
 
-    addColumn(options: Object, callback: CbCallback): void;
+    addColumn(options: object, callback: CbCallback): void;
     dropColumn(name: string, callback: CbCallback): void;
     deleteCollection(callback: CbCallback): void;
     fetch(query: Query, callback: CbCallback): void;
     create(newItem: Item, callback: CbCallback): void;
-    update(query: Query, changes: Object, callback: CbCallback): void;
+    update(query: Query, changes: object, callback: CbCallback): void;
     remove(query: Query, callback: CbCallback): void;
     columns(callback: CbCallback): void;
     count(query: Query, callback: CbCallback): void;
@@ -156,14 +154,16 @@ declare enum QueryConditions {
 
 type QueryValue = string|number|boolean;
 
-interface QueryOptions { 
+interface QueryOptions {
     offset?: number;
     limit?: number;
 }
 
-interface QueryOptionsWithCollection extends CollectionOptionsWithCollection, QueryOptions{}
-interface QueryOptionsWithName extends CollectionOptionsWithName, QueryOptions{}
-interface QueryOptionsWithID extends CollectionOptionsWithID, QueryOptions{}
+interface QueryOptionsWithCollection extends CollectionOptionsWithCollection, QueryOptions {}
+
+interface QueryOptionsWithName extends CollectionOptionsWithName, QueryOptions {}
+
+interface QueryOptionsWithID extends CollectionOptionsWithID, QueryOptions {}
 
 interface Query {
     SELECTCOLUMNS?: string[];
@@ -174,11 +174,11 @@ interface Query {
 }
 
 interface QueryFilter {
-    [QueryConditions: string]: QueryFilterValue
+    [QueryConditions: string]: QueryFilterValue;
 }
 
 interface QueryFilterValue {
-    [name: string]: QueryValue
+    [name: string]: QueryValue;
 }
 
 interface QueryObj {
@@ -204,15 +204,15 @@ interface QueryObj {
     or(query: QueryObj): void;
     setPage(pageSize: number, pageNum: number): void;
     fetch(callback: CbCallback): void;
-    update(changes: Object, callback: CbCallback): void;
+    update(changes: object, callback: CbCallback): void;
     columns(columnsArray: string[]): void;
     remove(callback: CbCallback): void;
 }
 
-interface ItemOptions extends CollectionOptionsWithID{}
+interface ItemOptions extends CollectionOptionsWithID {}
 
 interface Item {
-    data: Object;
+    data: object;
 
     save(): void;
     refresh(): void;
@@ -224,11 +224,11 @@ interface Code {
     systemKey: string;
     systemSecret: string;
 
-    execute(name: string, params: Object, loggingEnabled: boolean, callback: CbCallback): void;
+    execute(name: string, params: object, loggingEnabled: boolean, callback: CbCallback): void;
     getAllServices(callback: CbCallback): void;
 }
 
-interface DeploymentOptions{}
+interface DeploymentOptions {}
 
 interface Deployment {
     user: APIUser;
@@ -249,8 +249,8 @@ interface AppUser {
     systemSecret: string;
 
     getUser(callback: CbCallback): void;
-    setUser(data: Object, callback: CbCallback): void;
-    setUsers(query: QueryObj, data: Object, callback: CbCallback): void;
+    setUser(data: object, callback: CbCallback): void;
+    setUsers(query: QueryObj, data: object, callback: CbCallback): void;
     allUsers(query: QueryObj, callback: CbCallback): void;
     count(query: QueryObj, callback: CbCallback): void;
 }
@@ -275,9 +275,9 @@ interface Device {
     systemSecret: string;
 
     fetch(query: Query, callback: CbCallback): void;
-    update(query: Query, changes: Object, callback: CbCallback): void;
+    update(query: Query, changes: object, callback: CbCallback): void;
     delete(query: Query, callback: CbCallback): void;
-    create(newDevice: Object, callback: CbCallback): void;
+    create(newDevice: object, callback: CbCallback): void;
 }
 
 declare enum TriggerModule {
@@ -320,7 +320,7 @@ interface TriggerInstance {
     name: string;
     systemKey: string;
 
-    Update(options: Object, callback: CbCallback): void;
+    Update(options: object, callback: CbCallback): void;
     Delete(callback: CbCallback): void;
 }
 
@@ -328,8 +328,8 @@ interface TimerInstance {
     name: string;
     systemKey: string;
 
-    Update(options: Object, callback: CbCallback): void;
+    Update(options: object, callback: CbCallback): void;
     Delete(callback: CbCallback): void;
 }
 
-declare var ClearBlade: ClearBladeGlobal;
\ No newline at end of file
+declare var ClearBlade: ClearBladeGlobal;
diff --git a/types/clearbladejs-server/tslint.json b/types/clearbladejs-server/tslint.json
index a4c53997aa..6a6f758e67 100644
--- a/types/clearbladejs-server/tslint.json
+++ b/types/clearbladejs-server/tslint.json
@@ -1,79 +1,6 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
-        "ban-types": false,
-        "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
-        "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
-        "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
-        "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
-        "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
-        "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
-        "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
+        "no-empty-interface": false
     }
 }
\ No newline at end of file

From baaab3299c503f8ece8d286fc61992603a20c891 Mon Sep 17 00:00:00 2001
From: Jacob <blankstar85@gmail.com>
Date: Mon, 9 Apr 2018 12:35:10 -0400
Subject: [PATCH 1102/1382] Added new type definition for npm package
 strong-error-handler v2.3 (#24821)

* added new type definition for npm package strong-error-handler v2.3

* Updated strict null checks to true, tsconfig

Per reviewers request, updated tsconfig strictnullchecks true
---
 types/strong-error-handler/index.d.ts         | 52 +++++++++++++++++++
 .../strong-error-handler-tests.ts             | 10 ++++
 types/strong-error-handler/tsconfig.json      | 23 ++++++++
 types/strong-error-handler/tslint.json        |  3 ++
 4 files changed, 88 insertions(+)
 create mode 100644 types/strong-error-handler/index.d.ts
 create mode 100644 types/strong-error-handler/strong-error-handler-tests.ts
 create mode 100644 types/strong-error-handler/tsconfig.json
 create mode 100644 types/strong-error-handler/tslint.json

diff --git a/types/strong-error-handler/index.d.ts b/types/strong-error-handler/index.d.ts
new file mode 100644
index 0000000000..8620a36a36
--- /dev/null
+++ b/types/strong-error-handler/index.d.ts
@@ -0,0 +1,52 @@
+// Type definitions for strong-error-handler 2.3
+// Project: https://github.com/strongloop/strong-error-handler
+// Definitions by: Jacob Copeland <https://github.com/blankstar85>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+import express = require('express');
+
+declare namespace StrongErrorHandler {
+    interface options {
+        /***
+         * HTTP responses include all error properties, including sensitive data such as file paths,
+         * URLs and stack traces, defaults to false.
+         */
+        debug?: boolean;
+
+        /***
+         *If true, all errors are printed via console.error, including an array of fields (custom error properties)
+         *that are safe to include in response messages (both 4xx and 5xx).
+         *If false, sends only the error back in the response.
+         * Defaults to true
+         */
+        log?: boolean;
+
+        /***
+         * Specifies property names on errors that are allowed to be passed through in 4xx and 5xx responses.
+         */
+        safeFields?: [string];
+
+        /***
+         * Specify the default response content type to use when the client does not provide any Accepts header.
+         * Defaults to 'json'.
+         */
+        defaultType?: string;
+
+        /***
+         * Negotiate the response content type via Accepts request header.
+         * When disabled, strong-error-handler will always use the default content type when producing responses.
+         * Disabling content type negotiation is useful if you want to see JSON-formatted
+         * error responses in browsers, because browsers usually prefer HTML and XML over other content types.
+         */
+        negotiateContentType?: boolean;
+    }
+}
+
+/***
+ * Create a new strong error middleware funciton using the given options.
+ * @param options
+ */
+declare function createStrongErrorHandler(options?: StrongErrorHandler.options): express.RequestHandler;
+
+export = createStrongErrorHandler;
diff --git a/types/strong-error-handler/strong-error-handler-tests.ts b/types/strong-error-handler/strong-error-handler-tests.ts
new file mode 100644
index 0000000000..6e7a541b6e
--- /dev/null
+++ b/types/strong-error-handler/strong-error-handler-tests.ts
@@ -0,0 +1,10 @@
+import express = require('express');
+import errorHandler = require('strong-error-handler');
+
+errorHandler({
+    debug: false,
+    log: false,
+    safeFields: ['test'],
+    defaultType: 'json',
+    negotiateContentType: true,
+});
diff --git a/types/strong-error-handler/tsconfig.json b/types/strong-error-handler/tsconfig.json
new file mode 100644
index 0000000000..3d49780aec
--- /dev/null
+++ b/types/strong-error-handler/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "strong-error-handler-tests.ts"
+    ]
+}
diff --git a/types/strong-error-handler/tslint.json b/types/strong-error-handler/tslint.json
new file mode 100644
index 0000000000..d88586e5bd
--- /dev/null
+++ b/types/strong-error-handler/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}

From 0a20ea4ad994522994c814ee5d065234dc943f05 Mon Sep 17 00:00:00 2001
From: Pine Mizune <pinemz@gmail.com>
Date: Tue, 10 Apr 2018 01:35:40 +0900
Subject: [PATCH 1103/1382] add jquery-drawer (#24840)

---
 types/jquery-drawer/index.d.ts             | 29 ++++++++++++++
 types/jquery-drawer/jquery-drawer-tests.ts | 46 ++++++++++++++++++++++
 types/jquery-drawer/tsconfig.json          | 24 +++++++++++
 types/jquery-drawer/tslint.json            |  1 +
 4 files changed, 100 insertions(+)
 create mode 100644 types/jquery-drawer/index.d.ts
 create mode 100644 types/jquery-drawer/jquery-drawer-tests.ts
 create mode 100644 types/jquery-drawer/tsconfig.json
 create mode 100644 types/jquery-drawer/tslint.json

diff --git a/types/jquery-drawer/index.d.ts b/types/jquery-drawer/index.d.ts
new file mode 100644
index 0000000000..6c96e711aa
--- /dev/null
+++ b/types/jquery-drawer/index.d.ts
@@ -0,0 +1,29 @@
+// Type definitions for jquery-drawer 3.2
+// Project: http://git.blivesta.com/drawer
+// Definitions by: Pine Mizune <https://github.com/pine>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="jquery" />
+/// <reference types="iscroll" />
+
+interface JQueryDrawerClassOptions {
+    nav?: string;
+    toggle?: string;
+    overlay?: string;
+    open?: string;
+    close?: string;
+    dropdown?: string;
+}
+
+interface JQueryDrawerOptions {
+    class?: JQueryDrawerClassOptions;
+    iscroll?: IScrollOptions;
+    showOverlay?: boolean;
+}
+
+interface JQuery {
+    drawer(options?: JQueryDrawerOptions): JQuery;
+    drawer(method: 'open'|'close'|'toggle'|'destroy'): JQuery;
+    on(event: 'drawer.opened'|'drawer.closed', handler: () => void): JQuery;
+}
diff --git a/types/jquery-drawer/jquery-drawer-tests.ts b/types/jquery-drawer/jquery-drawer-tests.ts
new file mode 100644
index 0000000000..b0249f8618
--- /dev/null
+++ b/types/jquery-drawer/jquery-drawer-tests.ts
@@ -0,0 +1,46 @@
+const elem = $('foo');
+
+elem.drawer();
+elem.drawer({});
+elem.drawer({
+    class: {
+        nav: 'drawer-nav',
+        toggle: 'drawer-toggle',
+        overlay: 'drawer-overlay',
+        open: 'drawer-open',
+        close: 'drawer-close',
+        dropdown: 'drawer-dropdown'
+    },
+    iscroll: {
+        mouseWheel: true,
+        preventDefault: false,
+    },
+    showOverlay: true,
+});
+elem.drawer({ class: {} });
+elem.drawer({
+    class: {
+        nav: 'drawer-nav',
+        toggle: 'drawer-toggle',
+        overlay: 'drawer-overlay',
+        open: 'drawer-open',
+        close: 'drawer-close',
+        dropdown: 'drawer-dropdown'
+    },
+});
+elem.drawer({ iscroll: {} });
+elem.drawer({
+    iscroll: {
+        mouseWheel: true,
+        preventDefault: false,
+    },
+});
+elem.drawer({ showOverlay: true });
+
+elem.on('drawer.opened', () => {});
+elem.on('drawer.closed', () => {});
+
+elem.drawer('open');
+elem.drawer('close');
+elem.drawer('toggle');
+elem.drawer('destroy');
diff --git a/types/jquery-drawer/tsconfig.json b/types/jquery-drawer/tsconfig.json
new file mode 100644
index 0000000000..a22a6dec91
--- /dev/null
+++ b/types/jquery-drawer/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery-drawer-tests.ts"
+    ]
+}
diff --git a/types/jquery-drawer/tslint.json b/types/jquery-drawer/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/jquery-drawer/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 6bd12e9136b94a65058db1302fdf9b58f3c8ad39 Mon Sep 17 00:00:00 2001
From: Karol Majewski <karol-majewski@users.noreply.github.com>
Date: Mon, 9 Apr 2018 18:47:24 +0200
Subject: [PATCH 1104/1382] Create definitions for dotenv-webpack (#24828)

---
 types/dotenv-webpack/dotenv-webpack-tests.ts | 21 +++++++++++
 types/dotenv-webpack/index.d.ts              | 37 ++++++++++++++++++++
 types/dotenv-webpack/tsconfig.json           | 23 ++++++++++++
 types/dotenv-webpack/tslint.json             |  1 +
 4 files changed, 82 insertions(+)
 create mode 100644 types/dotenv-webpack/dotenv-webpack-tests.ts
 create mode 100644 types/dotenv-webpack/index.d.ts
 create mode 100644 types/dotenv-webpack/tsconfig.json
 create mode 100644 types/dotenv-webpack/tslint.json

diff --git a/types/dotenv-webpack/dotenv-webpack-tests.ts b/types/dotenv-webpack/dotenv-webpack-tests.ts
new file mode 100644
index 0000000000..6605550529
--- /dev/null
+++ b/types/dotenv-webpack/dotenv-webpack-tests.ts
@@ -0,0 +1,21 @@
+import * as webpack from 'webpack';
+import DotenvWebpackPlugin = require('dotenv-webpack');
+
+new DotenvWebpackPlugin(); // $ExpectType DotenvWebpackPlugin
+
+const options: DotenvWebpackPlugin.Options = {
+    path: './some.other.env',
+    safe: true,
+    systemvars: true,
+    silent: true
+};
+
+const config: webpack.Configuration = {
+    plugins: [
+        new DotenvWebpackPlugin(),
+        new DotenvWebpackPlugin({
+            path: './some.other.env',
+        }),
+        new DotenvWebpackPlugin(options),
+    ]
+};
diff --git a/types/dotenv-webpack/index.d.ts b/types/dotenv-webpack/index.d.ts
new file mode 100644
index 0000000000..2d330ace45
--- /dev/null
+++ b/types/dotenv-webpack/index.d.ts
@@ -0,0 +1,37 @@
+// Type definitions for dotenv-webpack 1.5
+// Project: https://github.com/mrsteele/dotenv-webpack
+// Definitions by: Karol Majewski <https://github.com/karol-majewski>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.7
+
+import * as webpack from 'webpack';
+
+declare class DotenvWebpackPlugin extends webpack.Plugin {
+  constructor(options?: DotenvWebpackPlugin.Options);
+}
+
+declare namespace DotenvWebpackPlugin {
+  interface Options {
+    /**
+     * The path to your environment variables. Default: `'./.env'`.
+     */
+    path?: string;
+
+    /**
+     * If `false` ignore safe-mode, if `true` load `'./.env.example'`, if a `string` load that file as the sample. Default: `false`.
+     */
+    safe?: boolean;
+
+    /**
+     * Set to `true` if you would rather load all system variables as well (useful for CI purposes). Default: `false`.
+     */
+    systemvars?: boolean;
+
+    /**
+     * If `true`, all warnings will be surpressed. Default: `false`.
+     */
+    silent?: boolean;
+  }
+}
+
+export = DotenvWebpackPlugin;
diff --git a/types/dotenv-webpack/tsconfig.json b/types/dotenv-webpack/tsconfig.json
new file mode 100644
index 0000000000..f87dcd737b
--- /dev/null
+++ b/types/dotenv-webpack/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "dotenv-webpack-tests.ts"
+    ]
+}
diff --git a/types/dotenv-webpack/tslint.json b/types/dotenv-webpack/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/dotenv-webpack/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 89fba32869c01fcf814ac8dc0d7e0afdfc6c2a29 Mon Sep 17 00:00:00 2001
From: Wu Haotian <whtsky@gmail.com>
Date: Tue, 10 Apr 2018 00:48:55 +0800
Subject: [PATCH 1105/1382] Added new type definition for npm package
 fb-watchman 2.0.0 (#24825)

---
 types/fb-watchman/fb-watchman-tests.ts | 14 ++++++++++
 types/fb-watchman/index.d.ts           | 38 ++++++++++++++++++++++++++
 types/fb-watchman/tsconfig.json        | 23 ++++++++++++++++
 types/fb-watchman/tslint.json          |  1 +
 4 files changed, 76 insertions(+)
 create mode 100644 types/fb-watchman/fb-watchman-tests.ts
 create mode 100644 types/fb-watchman/index.d.ts
 create mode 100644 types/fb-watchman/tsconfig.json
 create mode 100644 types/fb-watchman/tslint.json

diff --git a/types/fb-watchman/fb-watchman-tests.ts b/types/fb-watchman/fb-watchman-tests.ts
new file mode 100644
index 0000000000..9b1aeb387b
--- /dev/null
+++ b/types/fb-watchman/fb-watchman-tests.ts
@@ -0,0 +1,14 @@
+import { Client } from "fb-watchman";
+
+const client = new Client();
+const clientB = new Client({});
+
+client.capabilityCheck({ optional: [], required: ['relative_root'] }, e => {
+	if (e) {
+	  client.end();
+	  return;
+	}
+});
+client.connect();
+
+client.command(['watch-project', '/tmp'], () => {});
diff --git a/types/fb-watchman/index.d.ts b/types/fb-watchman/index.d.ts
new file mode 100644
index 0000000000..a009cbe247
--- /dev/null
+++ b/types/fb-watchman/index.d.ts
@@ -0,0 +1,38 @@
+// Type definitions for fb-watchman 2.0
+// Project: https://facebook.github.io/watchman/
+// Definitions by: Wu Haotian <https://github.com/whtsky>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import { EventEmitter } from 'events';
+
+// Emit the responses to these when they get sent down to us
+export type UnilateralTags = 'unilateralTags' | 'log';
+
+export interface ClientOptions {
+  /**
+   * Absolute path to the watchman binary.
+   * If not provided, the Client locates the binary using the PATH specified
+   * by the node child_process's default env.
+   */
+  watchmanBinaryPath?: string;
+}
+
+export interface Capabilities {
+  optional: any[];
+  required: any[];
+}
+
+export type doneCallback = (error?: Error | null, resp?: any) => any;
+
+export class Client extends EventEmitter {
+  constructor(options?: ClientOptions)
+  sendNextCommand(): void;
+  cancelCommands(why: string): void;
+  connect(): void;
+  command(args: any, done: doneCallback): void;
+  capabilityCheck(
+    caps: Capabilities,
+    done: doneCallback,
+  ): void;
+  end(): void;
+}
diff --git a/types/fb-watchman/tsconfig.json b/types/fb-watchman/tsconfig.json
new file mode 100644
index 0000000000..83ad2335ea
--- /dev/null
+++ b/types/fb-watchman/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "fb-watchman-tests.ts"
+    ]
+}
diff --git a/types/fb-watchman/tslint.json b/types/fb-watchman/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/fb-watchman/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 6a9edddf73922999239d93a28518cb65da55d2b0 Mon Sep 17 00:00:00 2001
From: Christian Chown <christianchown@gmail.com>
Date: Mon, 9 Apr 2018 17:53:58 +0100
Subject: [PATCH 1106/1382] react-native-android-taskdescription initial commit
 (#24813)

---
 .../index.d.ts                                | 14 +++++++++++
 ...t-native-android-taskdescription-tests.tsx |  9 +++++++
 .../tsconfig.json                             | 24 +++++++++++++++++++
 .../tslint.json                               |  1 +
 4 files changed, 48 insertions(+)
 create mode 100644 types/react-native-android-taskdescription/index.d.ts
 create mode 100644 types/react-native-android-taskdescription/react-native-android-taskdescription-tests.tsx
 create mode 100644 types/react-native-android-taskdescription/tsconfig.json
 create mode 100644 types/react-native-android-taskdescription/tslint.json

diff --git a/types/react-native-android-taskdescription/index.d.ts b/types/react-native-android-taskdescription/index.d.ts
new file mode 100644
index 0000000000..0f395e91f2
--- /dev/null
+++ b/types/react-native-android-taskdescription/index.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for react-native-android-taskdescription 1.0
+// Project: https://github.com/jwarby/react-native-android-taskdescription
+// Definitions by: Christian Chown <https://github.com/christianchown>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+import * as React from 'react';
+
+export interface ReactNativeAndroidTaskDescriptionProps {
+  backgroundColor?: string;
+  label?: string;
+}
+
+export default class ReactNativeAndroidTaskDescription extends React.Component<ReactNativeAndroidTaskDescriptionProps> {}
diff --git a/types/react-native-android-taskdescription/react-native-android-taskdescription-tests.tsx b/types/react-native-android-taskdescription/react-native-android-taskdescription-tests.tsx
new file mode 100644
index 0000000000..a49036e519
--- /dev/null
+++ b/types/react-native-android-taskdescription/react-native-android-taskdescription-tests.tsx
@@ -0,0 +1,9 @@
+import * as React from 'react';
+import ReactNativeAndroidTaskDescription from 'react-native-android-taskdescription';
+
+const test: React.SFC = () => (
+    <ReactNativeAndroidTaskDescription
+        label="React native android task description"
+        backgroundColor="#112233"
+    />
+);
diff --git a/types/react-native-android-taskdescription/tsconfig.json b/types/react-native-android-taskdescription/tsconfig.json
new file mode 100644
index 0000000000..e36bea114b
--- /dev/null
+++ b/types/react-native-android-taskdescription/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "jsx": "react-native",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-native-android-taskdescription-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/types/react-native-android-taskdescription/tslint.json b/types/react-native-android-taskdescription/tslint.json
new file mode 100644
index 0000000000..2750cc0197
--- /dev/null
+++ b/types/react-native-android-taskdescription/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file

From 6fda8a5f9dbe3514b08956969f9aef59462c125c Mon Sep 17 00:00:00 2001
From: Christian Chown <christianchown@gmail.com>
Date: Mon, 9 Apr 2018 17:54:16 +0100
Subject: [PATCH 1107/1382] react-native-photo-view initial commit (#24812)

---
 types/react-native-photo-view/index.d.ts      | 30 +++++++++++++++
 .../react-native-photo-view-tests.tsx         | 38 +++++++++++++++++++
 types/react-native-photo-view/tsconfig.json   | 24 ++++++++++++
 types/react-native-photo-view/tslint.json     |  1 +
 4 files changed, 93 insertions(+)
 create mode 100644 types/react-native-photo-view/index.d.ts
 create mode 100644 types/react-native-photo-view/react-native-photo-view-tests.tsx
 create mode 100644 types/react-native-photo-view/tsconfig.json
 create mode 100644 types/react-native-photo-view/tslint.json

diff --git a/types/react-native-photo-view/index.d.ts b/types/react-native-photo-view/index.d.ts
new file mode 100644
index 0000000000..8979635288
--- /dev/null
+++ b/types/react-native-photo-view/index.d.ts
@@ -0,0 +1,30 @@
+// Type definitions for react-native-photo-view 1.5
+// Project: https://github.com/alwx/react-native-photo-view
+// Definitions by: Christian Chown <https://github.com/christianchown>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+import * as React from 'react';
+import { ImagePropertiesSourceOptions, ViewProperties } from 'react-native';
+
+export interface ReactNativePhotoViewProps {
+    source?: ImagePropertiesSourceOptions;
+    loadingIndicatorSource?: ImagePropertiesSourceOptions;
+    fadeDuration?: number;
+    minimumZoomScale?: number;
+    maximumZoomScale?: number;
+    showsHorizontalScrollIndicator?: boolean;
+    showsVerticalScrollIndicator?: boolean;
+    scale?: number;
+    androidZoomTransitionDuration?: number;
+    androidScaleType?: 'center' | 'centerCrop' | 'centerInside' | 'fitCenter' | 'fitStart' | 'fitEnd' | 'fitXY';
+    onLoadStart?: () => void;
+    onLoad?: () => void;
+    onLoadEnd?: () => void;
+    onProgress?: (loaded: number, total: number) => void;
+    onTap?: (point: {x: number, y: number}, target?: React.ReactElement<any>) => void;
+    onViewTap?: (point: {x: number, y: number}, target?: React.ReactElement<any>) => void;
+    onScale?: (scale: number, target?: React.ReactElement<any>) => void;
+}
+
+export default class ReactNativePhotoView extends React.Component<ReactNativePhotoViewProps & ViewProperties> {}
diff --git a/types/react-native-photo-view/react-native-photo-view-tests.tsx b/types/react-native-photo-view/react-native-photo-view-tests.tsx
new file mode 100644
index 0000000000..f83168d280
--- /dev/null
+++ b/types/react-native-photo-view/react-native-photo-view-tests.tsx
@@ -0,0 +1,38 @@
+import * as React from 'react';
+import ReactNativePhotoView from 'react-native-photo-view';
+
+const test: React.SFC = () => (
+    <ReactNativePhotoView
+        source={{uri: 'https://assets-cdn.github.com/images/modules/logos_page/GitHub-Logo.png'}}
+        loadingIndicatorSource={{uri: 'https://assets-cdn.github.com/images/modules/logos_page/GitHub-Mark.png'}}
+        fadeDuration={100}
+        minimumZoomScale={0}
+        maximumZoomScale={1}
+        showsHorizontalScrollIndicator={true}
+        showsVerticalScrollIndicator={true}
+        scale={0.5}
+        androidZoomTransitionDuration={1000}
+        androidScaleType="center"
+        onLoadStart={() => {
+            console.log('onLoadStart');
+        }}
+        onLoad={() => {
+            console.log('onLoad');
+        }}
+        onLoadEnd={() => {
+            console.log('onLoadEnd');
+        }}
+        onProgress={(loaded: number, total: number) => {
+            console.log(`onProgress ${loaded}/${total}`);
+        }}
+        onTap={(point: {x: number; y: number}, target?: React.ReactElement<any>) => {
+            console.log('onTap');
+        }}
+        onViewTap={(point: {x: number; y: number}, target?: React.ReactElement<any>) => {
+            console.log(`onViewTap ${point.x},${point.y} ${!!target ? 'targetted' : ''}`);
+        }}
+        onScale={(scale: number, target?: React.ReactElement<any>) => {
+            console.log(`onScale ${scale} ${!!target ? 'targetted' : ''}`);
+        }}
+    />
+);
diff --git a/types/react-native-photo-view/tsconfig.json b/types/react-native-photo-view/tsconfig.json
new file mode 100644
index 0000000000..f6147e7192
--- /dev/null
+++ b/types/react-native-photo-view/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "jsx": "react-native",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-native-photo-view-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/types/react-native-photo-view/tslint.json b/types/react-native-photo-view/tslint.json
new file mode 100644
index 0000000000..2750cc0197
--- /dev/null
+++ b/types/react-native-photo-view/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file

From ad0637bfe32c42d5f5cb99bbc86d5a3abd93c8a3 Mon Sep 17 00:00:00 2001
From: Angel Merino <amerino@voxel.at>
Date: Mon, 9 Apr 2018 18:56:02 +0200
Subject: [PATCH 1108/1382] Add types for dnssd (#24760)

* Added types for dnssd

* Cosmetics, test passed

* Removed unused rules
---
 types/dnssd/dnssd-tests.ts |  6 ++++
 types/dnssd/index.d.ts     | 58 ++++++++++++++++++++++++++++++++++++++
 types/dnssd/tsconfig.json  | 23 +++++++++++++++
 types/dnssd/tslint.json    |  1 +
 4 files changed, 88 insertions(+)
 create mode 100644 types/dnssd/dnssd-tests.ts
 create mode 100644 types/dnssd/index.d.ts
 create mode 100644 types/dnssd/tsconfig.json
 create mode 100644 types/dnssd/tslint.json

diff --git a/types/dnssd/dnssd-tests.ts b/types/dnssd/dnssd-tests.ts
new file mode 100644
index 0000000000..14b637d384
--- /dev/null
+++ b/types/dnssd/dnssd-tests.ts
@@ -0,0 +1,6 @@
+import * as dnssd from 'dnssd';
+
+const serviceType = new dnssd.ServiceType(dnssd.tcp('_mqtt'), dnssd.udp('_mqtt'));
+
+const advertisement = new dnssd.Advertisement(serviceType, 1883, { name: 'broker' });
+const browser: dnssd.Browser = new dnssd.Browser(serviceType);
diff --git a/types/dnssd/index.d.ts b/types/dnssd/index.d.ts
new file mode 100644
index 0000000000..3f5617afcb
--- /dev/null
+++ b/types/dnssd/index.d.ts
@@ -0,0 +1,58 @@
+// Type definitions for dnssd 0.3
+// Project: https://github.com/DeMille/dnssd.js#readme
+// Definitions by: Angel Merino <https://github.com/angelmerino>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+/** Declaration file generated by dts-gen */
+
+export class Advertisement {
+    constructor(type: any, port: any, ...args: any[]);
+
+    start(): any;
+
+    stop(forceImmediate: any, callback: any): void;
+
+    updateTXT(txtObj: any): void;
+}
+
+export class Browser {
+    constructor(type: any, ...args: any[]);
+
+    list(): any;
+
+    start(): any;
+
+    stop(): any;
+}
+
+export class ServiceType {
+    constructor(...args: any[]);
+
+    toString(): any;
+
+    static all(): any;
+
+    static tcp(...args: any[]): any;
+
+    static udp(...args: any[]): any;
+}
+
+export const resolveA: any;
+
+export const resolveAAAA: any;
+
+export function all(): any;
+
+export function resolve(name: any, type: any, ...args: any[]): any;
+
+export function resolveSRV(name: any, opts: any): any;
+
+export function resolveService(name: any, ...args: any[]): any;
+
+export function resolveTXT(name: any, opts: any): any;
+
+export function tcp(...args: any[]): any;
+
+export function udp(...args: any[]): any;
diff --git a/types/dnssd/tsconfig.json b/types/dnssd/tsconfig.json
new file mode 100644
index 0000000000..88346a63fd
--- /dev/null
+++ b/types/dnssd/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "dnssd-tests.ts"
+    ]
+}
diff --git a/types/dnssd/tslint.json b/types/dnssd/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/dnssd/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 65f148de7d22e0e2fbdc89db5fcb2a088042bcb3 Mon Sep 17 00:00:00 2001
From: Vincent Langlet <VincentLanglet@users.noreply.github.com>
Date: Mon, 9 Apr 2018 18:58:52 +0200
Subject: [PATCH 1109/1382] Add type for react-native-permissions (#24793)

---
 types/react-native-permissions/index.d.ts     | 28 +++++++++++++++++++
 .../react-native-permissions-tests.ts         |  9 ++++++
 types/react-native-permissions/tsconfig.json  | 23 +++++++++++++++
 types/react-native-permissions/tslint.json    |  1 +
 4 files changed, 61 insertions(+)
 create mode 100644 types/react-native-permissions/index.d.ts
 create mode 100644 types/react-native-permissions/react-native-permissions-tests.ts
 create mode 100644 types/react-native-permissions/tsconfig.json
 create mode 100644 types/react-native-permissions/tslint.json

diff --git a/types/react-native-permissions/index.d.ts b/types/react-native-permissions/index.d.ts
new file mode 100644
index 0000000000..4b08cee5b3
--- /dev/null
+++ b/types/react-native-permissions/index.d.ts
@@ -0,0 +1,28 @@
+// Type definitions for react-native-permissions 1.1
+// Project: https://github.com/yonahforst/react-native-permissions
+// Definitions by: Vincent Langlet <https://github.com/vincentlanglet>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+type Status = 'authorized' | 'denied' | 'restricted' | 'undetermined';
+
+interface Rationale {
+    title: string;
+    message: string;
+}
+
+type CheckOptions = string | { type: string };
+
+type RequestOptions = string | { type: string, rationale?: Rationale };
+
+interface ReactNativePermissions {
+    canOpenSettings: () => Promise<boolean>;
+    openSettings: () => Promise<any>;
+    getTypes: () => string[];
+    check: (permission: string, options?: CheckOptions) => Promise<Status>;
+    request: (permission: string, options?: RequestOptions) => Promise<Status>;
+    checkMultiple: (permissions: string[]) => Promise<{ [key: string]: string }>;
+}
+
+declare const Permissions: ReactNativePermissions;
+
+export default Permissions;
diff --git a/types/react-native-permissions/react-native-permissions-tests.ts b/types/react-native-permissions/react-native-permissions-tests.ts
new file mode 100644
index 0000000000..f4595f558c
--- /dev/null
+++ b/types/react-native-permissions/react-native-permissions-tests.ts
@@ -0,0 +1,9 @@
+import Permissions from 'react-native-permissions';
+
+const firstType = Permissions.getTypes()[0];
+
+Permissions.canOpenSettings().then();
+Permissions.openSettings().then();
+Permissions.check('geolocation').then();
+Permissions.request('geolocation').then();
+Permissions.checkMultiple(['geolocation', 'notification']).then();
diff --git a/types/react-native-permissions/tsconfig.json b/types/react-native-permissions/tsconfig.json
new file mode 100644
index 0000000000..6c1dc92447
--- /dev/null
+++ b/types/react-native-permissions/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-native-permissions-tests.ts"
+    ]
+}
diff --git a/types/react-native-permissions/tslint.json b/types/react-native-permissions/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-native-permissions/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From d4cb87d64d01d221d5a043f53278352cc610f967 Mon Sep 17 00:00:00 2001
From: Vincent Langlet <VincentLanglet@users.noreply.github.com>
Date: Mon, 9 Apr 2018 18:59:12 +0200
Subject: [PATCH 1110/1382] Add type for react-native-version-number module
 (#24789)

---
 types/react-native-version-number/index.d.ts  | 14 +++++++++++
 .../react-native-version-number-tests.ts      | 22 ++++++++++++++++++
 .../react-native-version-number/tsconfig.json | 23 +++++++++++++++++++
 types/react-native-version-number/tslint.json |  1 +
 4 files changed, 60 insertions(+)
 create mode 100644 types/react-native-version-number/index.d.ts
 create mode 100644 types/react-native-version-number/react-native-version-number-tests.ts
 create mode 100644 types/react-native-version-number/tsconfig.json
 create mode 100644 types/react-native-version-number/tslint.json

diff --git a/types/react-native-version-number/index.d.ts b/types/react-native-version-number/index.d.ts
new file mode 100644
index 0000000000..313f19fe5b
--- /dev/null
+++ b/types/react-native-version-number/index.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for react-native-version-number 0.3
+// Project: https://github.com/APSL/react-native-version-number
+// Definitions by: Vincent Langlet <https://github.com/VincentLanglet>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface VersionNumber {
+    appVersion?: string;
+    buildVersion?: string;
+    bundleIdentifier?: string;
+}
+
+declare const VersionNumber: VersionNumber;
+
+export default VersionNumber;
diff --git a/types/react-native-version-number/react-native-version-number-tests.ts b/types/react-native-version-number/react-native-version-number-tests.ts
new file mode 100644
index 0000000000..e218345a8e
--- /dev/null
+++ b/types/react-native-version-number/react-native-version-number-tests.ts
@@ -0,0 +1,22 @@
+import VersionNumber from 'react-native-version-number';
+
+const FullVersionNumber: VersionNumber = {
+  appVersion: '1.0',
+  buildVersion: '42',
+  bundleIdentifier: 'com.foo.bar.MyApp',
+};
+
+const MissingAppVersionNumber: VersionNumber = {
+  buildVersion: '42',
+  bundleIdentifier: 'com.foo.bar.MyApp',
+};
+
+const MissingBuildVersionNumber: VersionNumber = {
+  appVersion: '1.0',
+  bundleIdentifier: 'com.foo.bar.MyApp',
+};
+
+const MissingBundleVersionNumber: VersionNumber = {
+  appVersion: '1.0',
+  buildVersion: '42',
+};
diff --git a/types/react-native-version-number/tsconfig.json b/types/react-native-version-number/tsconfig.json
new file mode 100644
index 0000000000..15e55211ff
--- /dev/null
+++ b/types/react-native-version-number/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-native-version-number-tests.ts"
+    ]
+}
diff --git a/types/react-native-version-number/tslint.json b/types/react-native-version-number/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-native-version-number/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 13a7c4201358ca9cc3e8d39552f8be9acfe73fe5 Mon Sep 17 00:00:00 2001
From: Vincent Langlet <VincentLanglet@users.noreply.github.com>
Date: Mon, 9 Apr 2018 18:59:36 +0200
Subject: [PATCH 1111/1382] [react-native-i18n] Add type for react-native-i18n
 module (#24790)

* Add type for react-native-i18n

* Fix tests with correct typescript version
---
 types/react-native-i18n/index.d.ts            | 11 +++++++++
 .../react-native-i18n-tests.ts                | 10 ++++++++
 types/react-native-i18n/tsconfig.json         | 23 +++++++++++++++++++
 types/react-native-i18n/tslint.json           |  1 +
 4 files changed, 45 insertions(+)
 create mode 100644 types/react-native-i18n/index.d.ts
 create mode 100644 types/react-native-i18n/react-native-i18n-tests.ts
 create mode 100644 types/react-native-i18n/tsconfig.json
 create mode 100644 types/react-native-i18n/tslint.json

diff --git a/types/react-native-i18n/index.d.ts b/types/react-native-i18n/index.d.ts
new file mode 100644
index 0000000000..00d50e3caf
--- /dev/null
+++ b/types/react-native-i18n/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for react-native-i18n 2.0
+// Project: https://github.com/AlexanderZaytsev/react-native-i18n
+// Definitions by: Vincent Langlet <https://github.com/VincentLanglet>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+import I18n = require("i18n-js");
+
+export function getLanguages(): Promise<string[]>;
+
+export default I18n;
diff --git a/types/react-native-i18n/react-native-i18n-tests.ts b/types/react-native-i18n/react-native-i18n-tests.ts
new file mode 100644
index 0000000000..1ab2134c69
--- /dev/null
+++ b/types/react-native-i18n/react-native-i18n-tests.ts
@@ -0,0 +1,10 @@
+import I18n, { getLanguages } from 'react-native-i18n';
+
+getLanguages().then(languages => languages[0]);
+
+I18n.defaultLocale = 'en';
+I18n.fallbacks = true;
+I18n.translations = {};
+I18n.locale = 'fr';
+
+const currentLocale: string = I18n.currentLocale();
diff --git a/types/react-native-i18n/tsconfig.json b/types/react-native-i18n/tsconfig.json
new file mode 100644
index 0000000000..f6a744565f
--- /dev/null
+++ b/types/react-native-i18n/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-native-i18n-tests.ts"
+    ]
+}
diff --git a/types/react-native-i18n/tslint.json b/types/react-native-i18n/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-native-i18n/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 6235cb3eb1361a99aab8bb2833d3c8051f45899e Mon Sep 17 00:00:00 2001
From: Omar Diab <me@omardiab.com>
Date: Mon, 9 Apr 2018 10:00:13 -0700
Subject: [PATCH 1112/1382] add react-mailchimp-subscribe (#24783)

---
 types/react-mailchimp-subscribe/index.d.ts    | 51 +++++++++++++++++
 .../react-mailchimp-subscribe-tests.tsx       | 57 +++++++++++++++++++
 types/react-mailchimp-subscribe/tsconfig.json | 24 ++++++++
 types/react-mailchimp-subscribe/tslint.json   |  1 +
 4 files changed, 133 insertions(+)
 create mode 100644 types/react-mailchimp-subscribe/index.d.ts
 create mode 100644 types/react-mailchimp-subscribe/react-mailchimp-subscribe-tests.tsx
 create mode 100644 types/react-mailchimp-subscribe/tsconfig.json
 create mode 100644 types/react-mailchimp-subscribe/tslint.json

diff --git a/types/react-mailchimp-subscribe/index.d.ts b/types/react-mailchimp-subscribe/index.d.ts
new file mode 100644
index 0000000000..558c6a92cd
--- /dev/null
+++ b/types/react-mailchimp-subscribe/index.d.ts
@@ -0,0 +1,51 @@
+// Type definitions for react-mailchimp-subscribe 2.0
+// Project: https://revolunet.github.io/react-mailchimp-subscribe/
+// Definitions by: Omar Diab <https://github.com/osdiab>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+import { Component, ReactNode } from "react";
+
+// A few common set of form fields, based on defaults in Mailchimp's website
+export interface EmailFormFields {
+    EMAIL: string;
+}
+
+export interface NameFormFields extends EmailFormFields {
+    FNAME: string;
+    LNAME: string;
+}
+
+export interface ClassicFormFields extends NameFormFields {
+    "BIRTHDAY[month]": number;
+    "BIRTHDAY[day]": number;
+}
+
+// library default form just sends EMAIL
+export type DefaultFormFields = EmailFormFields;
+
+export interface ResponseArgs {
+    status: "success" | "error";
+    message: string;
+}
+
+export interface PendingArgs {
+    status: "sending" | null;
+    message: null;
+}
+
+export interface SubscribeArg<FormFields> {
+    subscribe: (data: FormFields) => void;
+}
+
+export type FormHooks<FormFields> = SubscribeArg<FormFields> &
+    (ResponseArgs | PendingArgs);
+
+export interface Props<FormFields> {
+    render?: (hooks: FormHooks<FormFields>) => ReactNode;
+    url: string;
+}
+
+export default class MailchimpSubscribe<FormFields = DefaultFormFields> extends Component<
+    Props<FormFields>
+> {}
diff --git a/types/react-mailchimp-subscribe/react-mailchimp-subscribe-tests.tsx b/types/react-mailchimp-subscribe/react-mailchimp-subscribe-tests.tsx
new file mode 100644
index 0000000000..0507d7657a
--- /dev/null
+++ b/types/react-mailchimp-subscribe/react-mailchimp-subscribe-tests.tsx
@@ -0,0 +1,57 @@
+import * as React from "react";
+import MailchimpSubscribe, {
+  NameFormFields
+} from "react-mailchimp-subscribe";
+
+const Example: React.StatelessComponent = () => (
+  <>
+    <MailchimpSubscribe
+      render={(hooks) => (<>
+        { hooks.status === "error" &&
+          <span>hooks.message</span>
+        }
+        { hooks.status === "sending" &&
+          <span>Sending!</span>
+        }
+        { hooks.status === "success" &&
+          <span>It's been sent! {hooks.message}</span>
+        }
+        <form
+          onSubmit={e => {
+            e.preventDefault();
+            hooks.subscribe({ EMAIL: "8675309@aol.com" });
+          }}
+        />
+      </>)}
+      url="spam.biz/subscribe"
+    />
+    { /* once Typescript 2.9 is out, generics in components will be allowed, at that point uncomment these. */ }
+    { /* https://github.com/Microsoft/TypeScript/pull/22415 */ }
+    {/* <MailchimpSubscribe<any>
+      render={(hooks) => (
+        <form
+          onSubmit={e => {
+            e.preventDefault();
+            hooks.subscribe({ myArbitraryData: "is here!" });
+          }}
+        />
+      )}
+      url="spam.biz/subscribe"
+    />
+    <MailchimpSubscribe<NameFormFields>
+      render={(hooks) => (
+        <form
+          onSubmit={e => {
+            e.preventDefault();
+            hooks.subscribe({
+              FNAME: "大",
+              LNAME: "哥",
+              EMAIL: "da.ge@qq.com",
+            });
+          }}
+        />
+      )}
+      url="spam.biz/subscribe"
+    /> */}
+  </>
+);
diff --git a/types/react-mailchimp-subscribe/tsconfig.json b/types/react-mailchimp-subscribe/tsconfig.json
new file mode 100644
index 0000000000..4f2f142ca5
--- /dev/null
+++ b/types/react-mailchimp-subscribe/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-mailchimp-subscribe-tests.tsx"
+    ]
+}
diff --git a/types/react-mailchimp-subscribe/tslint.json b/types/react-mailchimp-subscribe/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-mailchimp-subscribe/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 7dd9844eae873fc2e78ff99dc29caaec5d081258 Mon Sep 17 00:00:00 2001
From: Furos86 <furos86@gmail.com>
Date: Mon, 9 Apr 2018 19:01:15 +0200
Subject: [PATCH 1113/1382] Added onProgress and onError arguments to the load
 function of MaterialLoader (#24834)

see https://threejs.org/docs/#api/loaders/MaterialLoader.load
---
 types/three/three-core.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/three/three-core.d.ts b/types/three/three-core.d.ts
index 2487b117b1..ffaa34434f 100644
--- a/types/three/three-core.d.ts
+++ b/types/three/three-core.d.ts
@@ -2251,7 +2251,7 @@ export class MaterialLoader {
     manager: LoadingManager;
     textures: { [key: string]: Texture };
 
-    load(url: string, onLoad: (material: Material) => void): void;
+    load(url: string, onLoad: (material: Material) => void, onProgress?: (event: ProgressEvent) => void, onError?: (event: Error | ErrorEvent) => void): void;
     setTextures(textures: { [key: string]: Texture }): void;
     getTexture(name: string): Texture;
     parse(json: any): Material;

From 4fec28ab9ae8c16a15c4802ba3b2dc51633aab4a Mon Sep 17 00:00:00 2001
From: Edo Rivai <edo.rivai@gmail.com>
Date: Mon, 9 Apr 2018 19:01:37 +0200
Subject: [PATCH 1114/1382] [nock] Add Promise based Nock Back types (#24808)

* [nock] Add Promise based Nock Back types

Documentation:
https://github.com/node-nock/nock#nock-back

* [nock] Add test for promised nockBack
---
 types/nock/index.d.ts    |  7 +++++++
 types/nock/nock-tests.ts | 22 ++++++++++++++--------
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/types/nock/index.d.ts b/types/nock/index.d.ts
index 91037b8e54..90eae08189 100644
--- a/types/nock/index.d.ts
+++ b/types/nock/index.d.ts
@@ -158,6 +158,13 @@ declare namespace nock {
 
         (fixtureName: string, nockedFn: (nockDone: () => void) => void): void;
         (fixtureName: string, options: NockBackOptions, nockedFn: (nockDone: () => void) => void): void;
+        (fixtureName: string, options?: NockBackOptions): Promise<{ nockDone: () => void, context: NockBackContext }>;
+    }
+
+    export interface NockBackContext {
+      scopes: Scope[];
+      assertScopesFinished(): void;
+      isLoaded: boolean;
     }
 
     export interface NockBackOptions {
diff --git a/types/nock/nock-tests.ts b/types/nock/nock-tests.ts
index 44397db941..7ed4ecc25d 100644
--- a/types/nock/nock-tests.ts
+++ b/types/nock/nock-tests.ts
@@ -72,10 +72,10 @@ scope = inst.reply(num, str);
 scope = inst.reply(num, str, headers);
 scope = inst.reply(num, obj, headers);
 scope = inst.reply(num, (uri: string, body: string) => {
-	return str;
+  return str;
 });
 scope = inst.reply(num, (uri: string, body: string) => {
-	return str;
+  return str;
 }, headers);
 scope = inst.replyWithFile(num, str);
 
@@ -97,11 +97,11 @@ inst = inst.delayConnection(num);
 
 scope = scope.filteringPath(regex, str);
 scope = scope.filteringPath((path: string) => {
-	return str;
+  return str;
 });
 scope = scope.filteringRequestBody(regex, str);
 scope = scope.filteringRequestBody((path: string) => {
-	return str;
+  return str;
 });
 
 scope = scope.log(() => { });
@@ -126,8 +126,8 @@ scope.restore();
 nock.recorder.rec();
 nock.recorder.rec(true);
 nock.recorder.rec({
-	dont_print: true,
-	output_objects: true
+  dont_print: true,
+  output_objects: true
 });
 nock.recorder.clear();
 strings = nock.recorder.play() as string[];
@@ -713,6 +713,12 @@ nockBack('zomboFixture.json', { before, after }, (nockDone: () => void) => {
   });
 });
 
+// in promise mode
+nockBack('promisedFixture.json')
+  .then(({nockDone, context}) => {
+    context.assertScopesFinished();
 
-
-
+    // do your tests returning a promise and chain it with
+    Promise.resolve('foo')
+      .then(nockDone);
+  });

From 6a75839b6f143a8ff1eed890517e9e5e9fb40460 Mon Sep 17 00:00:00 2001
From: milan-mimra <38138968+milan-mimra@users.noreply.github.com>
Date: Mon, 9 Apr 2018 19:02:01 +0200
Subject: [PATCH 1115/1382] [express-jwt] Fixed UnauthorizedError definiton -
 #22781 (#24776)

---
 types/express-jwt/express-jwt-tests.ts |  2 +-
 types/express-jwt/index.d.ts           | 24 +++++++++++++++++-------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/types/express-jwt/express-jwt-tests.ts b/types/express-jwt/express-jwt-tests.ts
index 9de759adb2..a4d4d11845 100644
--- a/types/express-jwt/express-jwt-tests.ts
+++ b/types/express-jwt/express-jwt-tests.ts
@@ -45,6 +45,6 @@ app.use(function (err: any, req: express.Request, res: express.Response, next: e
             res.end();
         }
     } else {
-        next(err);
+        next(new jwt.UnauthorizedError('invalid_token', new Error('error-message')));
     }
 });
diff --git a/types/express-jwt/index.d.ts b/types/express-jwt/index.d.ts
index 33c1206254..1187f4fbca 100644
--- a/types/express-jwt/index.d.ts
+++ b/types/express-jwt/index.d.ts
@@ -1,6 +1,9 @@
 // Type definitions for express-jwt
 // Project: https://www.npmjs.org/package/express-jwt
-// Definitions by: Wonshik Kim <https://github.com/wokim>, Kacper Polak <https://github.com/kacepe>, Sl1MBoy <https://github.com/Sl1MBoy>
+// Definitions by:  Wonshik Kim <https://github.com/wokim>
+//                  Kacper Polak <https://github.com/kacepe>
+//                  Sl1MBoy <https://github.com/Sl1MBoy>
+//                  Milan Mimra <https://github.com/milan-mimra>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -12,17 +15,22 @@ export = jwt;
 declare function jwt(options: jwt.Options): jwt.RequestHandler;
 declare namespace jwt {
     export type secretType = string | Buffer
+    export type ErrorCode =
+        "revoked_token" |
+        "invalid_token" |
+        "credentials_bad_scheme" |
+        "credentials_bad_format" |
+        "credentials_required"
+
     export interface SecretCallbackLong {
         (req: express.Request, header: any, payload: any, done: (err: any, secret?: secretType) => void): void;
     }
     export interface SecretCallback {
         (req: express.Request, payload: any, done: (err: any, secret?: secretType) => void): void;
     }
-
     export interface IsRevokedCallback {
         (req: express.Request, payload: any, done: (err: any, revoked?: boolean) => void): void;
     }
-
     export interface GetTokenCallback {
         (req: express.Request): any;
     }
@@ -41,11 +49,13 @@ declare namespace jwt {
     }
 
     export class UnauthorizedError extends Error  {
-        name: string;
-        message: string;
-        code: string;
         status: number;
-        inner: Error
+        message: string;
+        name: 'UnauthorizedError';
+        code: ErrorCode;
+        inner: { message: string };
+
+        constructor(code: ErrorCode, error: { message: string });
     }
 }
 declare global {

From 00ca94db93dd766471b3fb4a4bc2863583a523f5 Mon Sep 17 00:00:00 2001
From: Dylan Simon <dylan@dylex.net>
Date: Mon, 9 Apr 2018 13:02:39 -0400
Subject: [PATCH 1116/1382] chart.js: add ChartOptions.onHover alias and amend
 type (#24740)

Present in 2.7 as per docs and code
---
 types/chart.js/chart.js-tests.ts | 3 +++
 types/chart.js/index.d.ts        | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/types/chart.js/chart.js-tests.ts b/types/chart.js/chart.js-tests.ts
index 6041889b66..03c347fee7 100644
--- a/types/chart.js/chart.js-tests.ts
+++ b/types/chart.js/chart.js-tests.ts
@@ -21,6 +21,9 @@ const chart: Chart = new Chart(new CanvasRenderingContext2D(), {
         hover: {
             intersect: true
         },
+        onHover(ev: MouseEvent, points: any[]) {
+          return;
+        },
         tooltips: {
             filter: data => Number(data.yLabel) > 0,
             intersect: true,
diff --git a/types/chart.js/index.d.ts b/types/chart.js/index.d.ts
index c637164d30..9e1a511229 100644
--- a/types/chart.js/index.d.ts
+++ b/types/chart.js/index.d.ts
@@ -184,6 +184,7 @@ declare namespace Chart {
         aspectRatio?: number;
         maintainAspectRatio?: boolean;
         events?: string[];
+        onHover?(this: Chart, event: MouseEvent, activeElements: Array<{}>): any;
         onClick?(event?: MouseEvent, activeElements?: Array<{}>): any;
         title?: ChartTitleOptions;
         legend?: ChartLegendOptions;
@@ -291,7 +292,7 @@ declare namespace Chart {
         mode?: string;
         animationDuration?: number;
         intersect?: boolean;
-        onHover?(active: any): void;
+        onHover?(this: Chart, event: MouseEvent, activeElements: Array<{}>): any;
     }
 
     interface ChartAnimationObject {

From e2efee7a56b6f80604a2a10df162cd27cb306e25 Mon Sep 17 00:00:00 2001
From: Felix <info.mixotic@gmail.com>
Date: Tue, 10 Apr 2018 00:03:42 +0700
Subject: [PATCH 1117/1382] radium: update typings to fit with new default
 export in radium >= 0.22.0 (#24686)

* radium: update typings to fit with new default export in radium >= 0.22.0

* radium: replace tabs with spaces

* radium: updated radium version number in header comment
---
 types/radium/index.d.ts       |  4 ++--
 types/radium/radium-tests.tsx | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/types/radium/index.d.ts b/types/radium/index.d.ts
index d861783e92..ce5ae3776a 100644
--- a/types/radium/index.d.ts
+++ b/types/radium/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for radium 0.18.1
+// Type definitions for radium 0.24.0
 // Project: https://github.com/formidablelabs/radium
 // Definitions by: Alex Gorbatchev <https://github.com/alexgorbatchev>, Philipp Holzer <https://github.com/nupplaphil>, Alexey Svetliakov <https://github.com/asvetliakov>, Mikael Hermansson <https://github.com/mihe>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -6,7 +6,7 @@
 
 import * as React from 'react';
 
-export = Radium;
+export default Radium;
 
 // @Radium decorator
 declare function Radium<TElement extends Function>(component: TElement): TElement;
diff --git a/types/radium/radium-tests.tsx b/types/radium/radium-tests.tsx
index 6b7aaa1a46..d7fece99c7 100644
--- a/types/radium/radium-tests.tsx
+++ b/types/radium/radium-tests.tsx
@@ -1,6 +1,6 @@
 import * as React from "react";
-import { StyleRoot, Style } from "radium";
-import Radium = require('radium');
+import Radium from "radium";
+
 
 @Radium
 class TestComponent extends React.Component<{ a: number }> {
@@ -29,7 +29,7 @@ class TestComponentWithConfig extends React.Component<{ a?: number }> {
         return (
             <div>
                 <Radium.StyleRoot >
-                    <Style scopeSelector="test"
+                    <Radium.Style scopeSelector="test"
                         rules={{
                             a: {
                                 background: "green"
@@ -39,13 +39,13 @@ class TestComponentWithConfig extends React.Component<{ a?: number }> {
                             }
                         }}
                     >
-                    </Style>
-                    <Style scopeSelector="test"
+                    </Radium.Style>
+                    <Radium.Style scopeSelector="test"
                         rules={{
                             background: "green"
                         }}
                     >
-                    </Style>
+                    </Radium.Style>
                 </Radium.StyleRoot>
             </div>
         )
@@ -62,7 +62,7 @@ class TestComponentWithConfigInStyleRoot
                     userAgent: "test",
                     matchMedia: window.matchMedia
                 }} >
-                    <Style scopeSelector="test"
+                    <Radium.Style scopeSelector="test"
                         rules={{
                             a: {
                                 background: "green"
@@ -72,13 +72,13 @@ class TestComponentWithConfigInStyleRoot
                             }
                         }}
                     >
-                    </Style>
-                    <Style scopeSelector="test"
+                    </Radium.Style>
+                    <Radium.Style scopeSelector="test"
                         rules={{
                             background: "green"
                         }}
                     >
-                    </Style>
+                    </Radium.Style>
                 </Radium.StyleRoot>
             </div>
         )

From 78350168c5b9a66a4699d8a7af143efc1c5c95bf Mon Sep 17 00:00:00 2001
From: Simon Buchan <simon.buchan.nz@gmail.com>
Date: Tue, 10 Apr 2018 05:21:48 +1200
Subject: [PATCH 1118/1382] [aws-lambda] Rutime node8.10 support. (#24823)

Bump version to 8.10 to match current runtime, allow returning result promises in handlers.
---
 types/aws-lambda/aws-lambda-tests.ts | 23 +++++++++++++++++++++--
 types/aws-lambda/index.d.ts          |  9 +++++++--
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/types/aws-lambda/aws-lambda-tests.ts b/types/aws-lambda/aws-lambda-tests.ts
index 1441c6b794..f4f97ccfc4 100644
--- a/types/aws-lambda/aws-lambda-tests.ts
+++ b/types/aws-lambda/aws-lambda-tests.ts
@@ -607,8 +607,27 @@ context.fail(str);
 /* Handler */
 let handler: AWSLambda.Handler = (event: any, context: AWSLambda.Context, cb: AWSLambda.Callback) => { };
 
-// async methods return Promise, test assignability
-let asyncHandler: AWSLambda.Handler = async (event: any, context: AWSLambda.Context, cb: AWSLambda.Callback) => { };
+/* In node8.10 runtime, handlers may return a promise for the result value, so existing async
+ * handlers that return Promise<void> before calling the callback will now have a `null` result.
+ * Be safe and make that badly typed with a major verson bump to 8.10 so users expect the breaking change,
+ * since the upgrade effort should be pretty low in most cases, and it points them at a nicer solution.
+ */
+// $ExpectError
+let legacyAsyncHandler: AWSLambda.APIGatewayProxyHandler = async (
+    event: AWSLambda.APIGatewayProxyEvent,
+    context: AWSLambda.Context,
+    cb: AWSLambda.Callback<AWSLambda.APIGatewayProxyResult>,
+) => {
+    cb(null, { statusCode: 200, body: 'No longer valid' });
+};
+
+let node8AsyncHandler: AWSLambda.APIGatewayProxyHandler = async (
+    event: AWSLambda.APIGatewayProxyEvent,
+    context: AWSLambda.Context,
+    cb: AWSLambda.Callback<AWSLambda.APIGatewayProxyResult>,
+) => {
+    return { statusCode: 200, body: 'Is now valid!' };
+};
 
 let inferredHandler: AWSLambda.S3Handler = (event, context, cb) => {
     // $ExpectType S3Event
diff --git a/types/aws-lambda/index.d.ts b/types/aws-lambda/index.d.ts
index 8da84c6ff3..bd108fa2a5 100644
--- a/types/aws-lambda/index.d.ts
+++ b/types/aws-lambda/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for AWS Lambda
+// Type definitions for AWS Lambda 8.10
 // Project: http://docs.aws.amazon.com/lambda
 // Definitions by: James Darbyshire <https://github.com/darbio/aws-lambda-typescript>
 //                 Michael Skarum <https://github.com/skarum>
@@ -562,8 +562,13 @@ export interface KinesisStreamEvent {
  * @param event – event data.
  * @param context – runtime information of the Lambda function that is executing.
  * @param callback – optional callback to return information to the caller, otherwise return value is null.
+ * @return In the node8.10 runtime, a promise for the lambda result.
  */
-export type Handler<TEvent = any, TResult = any> = (event: TEvent, context: Context, callback: Callback<TResult>) => void;
+export type Handler<TEvent = any, TResult = any> = (
+    event: TEvent,
+    context: Context,
+    callback: Callback<TResult>,
+) => void | Promise<TResult>;
 
 /**
  * Optional callback parameter.

From 882c7f38297a1d7316f6a36ed09627adccd17661 Mon Sep 17 00:00:00 2001
From: Stefan Lacatus <petrisor.lacatus@gmail.com>
Date: Mon, 9 Apr 2018 20:22:59 +0300
Subject: [PATCH 1119/1382] [Three] Added missing methods in Transform Controls
 (#24819)

* Update three-transformcontrols.d.ts

Added missing methods

* Update three-core.d.ts

Added missing isMesh prop
---
 types/three/three-core.d.ts              | 1 +
 types/three/three-transformcontrols.d.ts | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/types/three/three-core.d.ts b/types/three/three-core.d.ts
index ffaa34434f..6d06b2a6f6 100644
--- a/types/three/three-core.d.ts
+++ b/types/three/three-core.d.ts
@@ -5110,6 +5110,7 @@ export class Mesh extends Object3D {
     drawMode: TrianglesDrawModes;
     morphTargetInfluences?: number[];
     morphTargetDictionary?: { [key: string]: number; };
+	isMesh: boolean;
 
     setDrawMode(drawMode: TrianglesDrawModes): void;
     updateMorphTargets(): void;
diff --git a/types/three/three-transformcontrols.d.ts b/types/three/three-transformcontrols.d.ts
index 3f3713256d..15ac11eda0 100644
--- a/types/three/three-transformcontrols.d.ts
+++ b/types/three/three-transformcontrols.d.ts
@@ -2,6 +2,10 @@ import { Camera, Object3D } from "./three-core";
 
 export class TransformControls extends Object3D {
     constructor(object: Camera, domElement?: HTMLElement);
+    
+    size: number;
+    
+    space: string;
 
     object: Object3D;
 
@@ -20,5 +24,9 @@ export class TransformControls extends Object3D {
     setSize(size: number): void;
 
     setSpace(space: string): void;
+    
+    setTranslationSnap(size: number): void;
+    
+    setRotationSnap(size: number): void;
 
 }

From c2613828079f094ae3690e604819f3587a67aa0e Mon Sep 17 00:00:00 2001
From: FishOrBear <cay776@gmail.com>
Date: Tue, 10 Apr 2018 01:23:11 +0800
Subject: [PATCH 1120/1382] <threejs> Geometry: Move computeLineDistance() to
 Line (#24803)

* add 'Texture' attribute: 'center','rotation'

* add 'ShapeBufferGeometry'

* Geometry: Move computeLineDistance() to Line

* return this
---
 types/three/three-core.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/three/three-core.d.ts b/types/three/three-core.d.ts
index 6d06b2a6f6..0a17adf51b 100644
--- a/types/three/three-core.d.ts
+++ b/types/three/three-core.d.ts
@@ -5082,6 +5082,7 @@ export class Line extends Object3D {
     geometry: Geometry|BufferGeometry;
     material: Material; // LineDashedMaterial or LineBasicMaterial or ShaderMaterial
 
+    computeLineDistances(): this;
     raycast(raycaster: Raycaster, intersects: any): void;
 }
 

From 089d5708060999599d4a317178671736ebdf74a0 Mon Sep 17 00:00:00 2001
From: Max Rumpf <max.rumpf1998@gmail.com>
Date: Mon, 9 Apr 2018 19:23:22 +0200
Subject: [PATCH 1121/1382] [types/ejs] Also return undefined in Cache.get()
 (#24807)

As lru-cache has `V | undefined`, this `get()` function should also mark undefined as possible return type to allow assigning an LRU to `cache`.
---
 types/ejs/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/ejs/index.d.ts b/types/ejs/index.d.ts
index e785f2c6ae..e56ad1a8ec 100644
--- a/types/ejs/index.d.ts
+++ b/types/ejs/index.d.ts
@@ -108,7 +108,7 @@ export function escapeRegexChars(s: string): string;
 export function escapeXML(markup: string): string;
 export interface Cache {
     set(key: string, val: TemplateFunction): void;
-    get(key: string): TemplateFunction;
+    get(key: string): TemplateFunction | undefined;
 }
 export let delimiter: string;
 

From 7fa673a804847c7f101084a4c27102e28036b28d Mon Sep 17 00:00:00 2001
From: Maciej Goszczycki <mgoszcz2@gmail.com>
Date: Mon, 9 Apr 2018 18:23:36 +0100
Subject: [PATCH 1122/1382] react-virtualized: Allow null tabIndex (#24777)

---
 types/react-virtualized/dist/es/Grid.d.ts    | 2 +-
 types/react-virtualized/dist/es/List.d.ts    | 2 +-
 types/react-virtualized/dist/es/Masonry.d.ts | 2 +-
 types/react-virtualized/dist/es/Table.d.ts   | 2 +-
 types/react-virtualized/index.d.ts           | 1 +
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/types/react-virtualized/dist/es/Grid.d.ts b/types/react-virtualized/dist/es/Grid.d.ts
index 1cc1623a04..83230ca794 100644
--- a/types/react-virtualized/dist/es/Grid.d.ts
+++ b/types/react-virtualized/dist/es/Grid.d.ts
@@ -282,7 +282,7 @@ export type GridCoreProps = {
     /** Optional inline style */
     style?: React.CSSProperties;
     /** Tab index for focus */
-    tabIndex?: number;
+    tabIndex?: number | null;
     /**
      * Width of Grid; this property determines the number of visible (vs virtualized) columns.
      */
diff --git a/types/react-virtualized/dist/es/List.d.ts b/types/react-virtualized/dist/es/List.d.ts
index 94dde630fd..7f550d2dcb 100644
--- a/types/react-virtualized/dist/es/List.d.ts
+++ b/types/react-virtualized/dist/es/List.d.ts
@@ -60,7 +60,7 @@ export type ListProps = GridCoreProps & {
     /** Optional inline style */
     style?: React.CSSProperties;
     /** Tab index for focus */
-    tabIndex?: number;
+    tabIndex?: number | null;
     /** Width of list */
     width: number;
 }
diff --git a/types/react-virtualized/dist/es/Masonry.d.ts b/types/react-virtualized/dist/es/Masonry.d.ts
index 4c67835722..59394bc170 100644
--- a/types/react-virtualized/dist/es/Masonry.d.ts
+++ b/types/react-virtualized/dist/es/Masonry.d.ts
@@ -45,7 +45,7 @@ export type MasonryProps = {
     scrollingResetTimeInterval?: number,
     scrollTop?: number,
     style?: React.CSSProperties,
-    tabIndex?: number,
+    tabIndex?: number | null,
     width: number,
     /**
      * PLEASE NOTE
diff --git a/types/react-virtualized/dist/es/Table.d.ts b/types/react-virtualized/dist/es/Table.d.ts
index 87f79de86d..f74c816463 100644
--- a/types/react-virtualized/dist/es/Table.d.ts
+++ b/types/react-virtualized/dist/es/Table.d.ts
@@ -291,7 +291,7 @@ export type TableProps = GridCoreProps & {
     /** Optional inline style */
     style?: React.CSSProperties;
     /** Tab index for focus */
-    tabIndex?: number;
+    tabIndex?: number | null;
     /** Width of list */
     width?: number;
 }
diff --git a/types/react-virtualized/index.d.ts b/types/react-virtualized/index.d.ts
index 8159c49ff2..18710b4983 100644
--- a/types/react-virtualized/index.d.ts
+++ b/types/react-virtualized/index.d.ts
@@ -6,6 +6,7 @@
 //                 Szőke Szabolcs <https://github.com/szabolcsx>
 //                 Kræn Hansen <https://github.com/kraenhansen>
 //                 Steve Zhang <https://github.com/Stevearzh>
+//                 Maciej Goszczycki <https://github.com/mgoszcz2>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 

From 2a755363046505c029ff06d39d03547473bea082 Mon Sep 17 00:00:00 2001
From: Pras Velagapudi <psigen@gmail.com>
Date: Mon, 9 Apr 2018 13:23:54 -0400
Subject: [PATCH 1123/1382] [stripe] Fix typo in `IProductCreationOptions`.
 (#24796)

* [stripe] Fix typo in `IProductCreationOptions`.

The `IProductCreationOptions` interface mistakenly lists `attribute` instead of `attributes` as a property.

This does not not match [the API specification for product creation](https://stripe.com/docs/api#create_product), and attempting to actually populate this field results in: `Error: Received unknown parameter: attribute`.

Changing this value to `attributes` successfully allows `stripe.products.create()` calls to succeed in populating attributes.

* Added `attributes` to tests for product creation.
---
 types/stripe/index.d.ts      | 2 +-
 types/stripe/stripe-tests.ts | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/types/stripe/index.d.ts b/types/stripe/index.d.ts
index c43e3357a5..418525d38f 100644
--- a/types/stripe/index.d.ts
+++ b/types/stripe/index.d.ts
@@ -3029,7 +3029,7 @@ declare namespace Stripe {
              * A list of up to 5 alphanumeric attributes that each SKU can provide values for (e.g. ["color", "size"]).
              * Applicable to both service and good types.
              */
-            attribute?: Array<string>;
+            attributes?: Array<string>;
 
             /**
              * A short one-line description of the product, meant to be displayable to the customer. May only be set if type=good.
diff --git a/types/stripe/stripe-tests.ts b/types/stripe/stripe-tests.ts
index 7a45ee9fca..e56a454108 100644
--- a/types/stripe/stripe-tests.ts
+++ b/types/stripe/stripe-tests.ts
@@ -796,13 +796,15 @@ stripe.accounts.createExternalAccount("", { external_account: "tok_15V2YhEe31JkL
 
 stripe.products.create({
     name: "My amazing product",
-    type: "service"
+    type: "service",
+    attributes: ["color"]
 }, function (err, coupon) {
     // asynchronously called
 });
 stripe.products.create({
     name: "My amazing product",
-    type: "service"
+    type: "service",
+    attributes: ["color"]
 }).then(function (product) {
     // asynchronously called
     const prodType: "service" | "good" = product.type;

From 67c33c9335f244228250bd34159fd09ba682d899 Mon Sep 17 00:00:00 2001
From: leozhao0709 <leozhao0709@users.noreply.github.com>
Date: Mon, 9 Apr 2018 10:28:59 -0700
Subject: [PATCH 1124/1382] add proxy for StrategyOptions (#24784)

This proxy property is used for some like heroku product using.
---
 types/passport-google-oauth2/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/passport-google-oauth2/index.d.ts b/types/passport-google-oauth2/index.d.ts
index a2ba210c4b..cd40791eb7 100644
--- a/types/passport-google-oauth2/index.d.ts
+++ b/types/passport-google-oauth2/index.d.ts
@@ -12,6 +12,7 @@ export interface StrategyOptions {
   callbackURL: string;
   passReqToCallback?: true;
   scope?: string[];
+  proxy?: boolean;
 }
 
 export interface StrategyOptionsWithRequest {

From 3f8c6acca159a354188f77770efdf0b9650c778f Mon Sep 17 00:00:00 2001
From: Marks Polakovs <marks@markspolakovs.me>
Date: Mon, 9 Apr 2018 20:29:41 +0300
Subject: [PATCH 1125/1382] [hubot] Add type for Robot.adapter (#24735)

* Type Response and ListenerCallback to avoid any type

* Add tests for adapter type
---
 types/hubot/hubot-tests.ts |  5 +++--
 types/hubot/index.d.ts     | 17 +++++++++--------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/types/hubot/hubot-tests.ts b/types/hubot/hubot-tests.ts
index 9c5e832bc2..1c7540c950 100644
--- a/types/hubot/hubot-tests.ts
+++ b/types/hubot/hubot-tests.ts
@@ -4,11 +4,12 @@ const brain = new Hubot.Brain();
 brain; // $ExpectType Brain
 brain.userForName('someone'); // $ExpectType any
 
-const robot = new Hubot.Robot(
+const robot = new Hubot.Robot<{}>(
   'src/adapters',
   'slack',
   false,
   'hubot',
 );
-robot; // $ExpectType Robot
+robot; // $ExpectType Robot<{}>
+robot.adapter; // $ExpectType {}
 robot.hear(/hello/, () => null); // $ExpectType void
diff --git a/types/hubot/index.d.ts b/types/hubot/index.d.ts
index e0a809f69a..7da5501736 100644
--- a/types/hubot/index.d.ts
+++ b/types/hubot/index.d.ts
@@ -20,26 +20,27 @@ declare namespace Hubot {
         id: string;
     }
 
-    class Response {
+    class Response<R> {
         match: RegExpMatchArray;
         message: Message;
 
-        constructor(robot: Robot, message: Message, match: RegExpMatchArray);
+        constructor(robot: R, message: Message, match: RegExpMatchArray);
         send(...strings: string[]): void;
         reply(...strings: string[]): void;
         random<T>(items: T[]): T;
     }
 
-    type ListenerCallback = (response: Response) => void;
+    type ListenerCallback<R> = (response: Response<R>) => void;
 
-    class Robot {
+    class Robot<A> {
         brain: Brain;
+        readonly adapter: A;
 
         constructor(adapterPath: string, adapter: string, httpd: boolean, name: string, alias?: string);
-        hear(regex: RegExp, callback: ListenerCallback): void;
-        hear(regex: RegExp, options: any, callback: ListenerCallback): void;
-        respond(regex: RegExp, callback: ListenerCallback): void;
-        respond(regex: RegExp, options: any, callback: ListenerCallback): void;
+        hear(regex: RegExp, callback: ListenerCallback<this>): void;
+        hear(regex: RegExp, options: any, callback: ListenerCallback<this>): void;
+        respond(regex: RegExp, callback: ListenerCallback<this>): void;
+        respond(regex: RegExp, options: any, callback: ListenerCallback<this>): void;
     }
 }
 

From 3321a12dc9cf7d9758d195dbf96e76723906b7c5 Mon Sep 17 00:00:00 2001
From: Joha2n <johann.rakotoharisoa@gmail.com>
Date: Mon, 9 Apr 2018 19:29:54 +0200
Subject: [PATCH 1126/1382] feat(react-bootstrap/fade): update props interface
 (#24763)

- add missing mountOnEnter
- rename transitionAppear to appear
---
 types/react-bootstrap/index.d.ts    | 1 +
 types/react-bootstrap/lib/Fade.d.ts | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/types/react-bootstrap/index.d.ts b/types/react-bootstrap/index.d.ts
index ccbc01d31a..45a645fc32 100644
--- a/types/react-bootstrap/index.d.ts
+++ b/types/react-bootstrap/index.d.ts
@@ -11,6 +11,7 @@
 //                 Vito Samson <https://github.com/vitosamson>,
 //                 Karol Janyst <https://github.com/LKay>
 //                 Aaron Beall <https://github.com/aaronbeall>
+//                 Johann Rakotoharisoa <https://github.com/jrakotoharisoa>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
diff --git a/types/react-bootstrap/lib/Fade.d.ts b/types/react-bootstrap/lib/Fade.d.ts
index cb6e456417..4b30c04a5c 100644
--- a/types/react-bootstrap/lib/Fade.d.ts
+++ b/types/react-bootstrap/lib/Fade.d.ts
@@ -5,7 +5,8 @@ declare namespace Fade {
     export interface FadeProps extends TransitionCallbacks, React.HTMLProps<Fade> {
         in?: boolean;
         timeout?: number;
-        transitionAppear?: boolean;
+        mountOnEnter?: boolean;
+        appear?: boolean;
         unmountOnExit?: boolean;
     }
 }

From 0b4845442c035559e5a87b62696d9d928189efaa Mon Sep 17 00:00:00 2001
From: Martijn Verbakel <mhverbakel@users.noreply.github.com>
Date: Mon, 9 Apr 2018 19:32:12 +0200
Subject: [PATCH 1127/1382] [luxon] Splitted min and max in a function that
 only returns undefined and a function that only returnes a DateTime. (#24715)

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

diff --git a/types/luxon/index.d.ts b/types/luxon/index.d.ts
index ed78e5d542..c3b9d2a029 100644
--- a/types/luxon/index.d.ts
+++ b/types/luxon/index.d.ts
@@ -135,8 +135,10 @@ declare module 'luxon' {
                 second?: number,
                 millisecond?: number
             ): DateTime;
-            static max(...dateTimes: DateTime[]): DateTime | undefined;
-            static min(...dateTimes: DateTime[]): DateTime | undefined;
+            static max(): undefined;
+            static max(...dateTimes: DateTime[]): DateTime;
+            static min(): undefined;
+            static min(...dateTimes: DateTime[]): DateTime;
             static utc(
                 year?: number,
                 month?: number,

From 6e605f1695e6276ebe4e7f420bb5009a85d94351 Mon Sep 17 00:00:00 2001
From: TheBekker <christianbekker@gmail.com>
Date: Mon, 9 Apr 2018 19:32:23 +0200
Subject: [PATCH 1128/1382] Add io:any to boardoptions interface to allow
 passing in io at init of board (#24786)

---
 types/johnny-five/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/johnny-five/index.d.ts b/types/johnny-five/index.d.ts
index 297069f0f1..5f0f6a9f37 100644
--- a/types/johnny-five/index.d.ts
+++ b/types/johnny-five/index.d.ts
@@ -102,6 +102,7 @@ export interface BoardOption {
     repl?: boolean;
     debug?: boolean;
     timeout?: number;
+    io?: any;
 }
 
 export declare class Board {

From 0b59f703b50975e2b86cf2b69819553e503fb641 Mon Sep 17 00:00:00 2001
From: Justin Francos <jf@justinfrancos.com>
Date: Mon, 9 Apr 2018 13:32:40 -0400
Subject: [PATCH 1129/1382] Update to Auth0LockConstructorOptions (#24781)

The member 'avatar' should allow 'null', to be consistent with the documentation at:
https://auth0.com/docs/libraries/lock/v11/configuration#avatar-object-

I discovered this when I was trying to figure out why I was seeing 404 errors to gravitar.com in my browser console when logging in.
---
 types/auth0-lock/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/auth0-lock/index.d.ts b/types/auth0-lock/index.d.ts
index dd3e6aa7ee..93305bfd1f 100644
--- a/types/auth0-lock/index.d.ts
+++ b/types/auth0-lock/index.d.ts
@@ -118,7 +118,7 @@ interface Auth0LockConstructorOptions {
     auth?: Auth0LockAuthOptions;
     autoclose?: boolean;
     autofocus?: boolean;
-    avatar?: Auth0LockAvatarOptions;
+    avatar?: Auth0LockAvatarOptions | null;
     clientBaseUrl?: string;
     closable?: boolean;
     configurationBaseUrl?: string;

From e101bf49718fd8facde23bdf1d68d9e8b1efe6da Mon Sep 17 00:00:00 2001
From: Alexey <itPiligrim@gmail.com>
Date: Mon, 9 Apr 2018 20:32:54 +0300
Subject: [PATCH 1130/1382] formidable - maxFileSize prop add (#24689)

* maxFileSize prop add

Add maxFileSize

* maxFileSize prop add

Add maxFileSize property
---
 types/express-formidable/index.d.ts | 1 +
 types/formidable/index.d.ts         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/types/express-formidable/index.d.ts b/types/express-formidable/index.d.ts
index 75a34d0350..ee38be639e 100644
--- a/types/express-formidable/index.d.ts
+++ b/types/express-formidable/index.d.ts
@@ -22,6 +22,7 @@ interface ExpressFormidableOptions {
     uploadDir?: string;
     keepExtensions?: boolean;
     type?: "multipart" | "urlencoded";
+    maxFileSize?: number;
     maxFieldsSize?: number;
     maxFields?: number;
     hash?: boolean | "sha1" | "md5";
diff --git a/types/formidable/index.d.ts b/types/formidable/index.d.ts
index 8163fa5894..da5c730ae8 100644
--- a/types/formidable/index.d.ts
+++ b/types/formidable/index.d.ts
@@ -14,6 +14,7 @@ export declare class IncomingForm extends events.EventEmitter {
     encoding: string;
     uploadDir: string;
     keepExtensions: boolean;
+    maxFileSize: number;
     maxFieldsSize: number;
     maxFields: number;
     hash: string | boolean;

From bf9ad949f17ce055913b10c523e58ff7244105ad Mon Sep 17 00:00:00 2001
From: Anne-VI <ann-kristin.krappe@virtual-identity.com>
Date: Mon, 9 Apr 2018 19:35:51 +0200
Subject: [PATCH 1131/1382] Update index.d.ts - made interface properties
 optional (#24826)

---
 types/jstree/index.d.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/types/jstree/index.d.ts b/types/jstree/index.d.ts
index 6bbbb43d2a..d1ac386a49 100644
--- a/types/jstree/index.d.ts
+++ b/types/jstree/index.d.ts
@@ -1968,37 +1968,37 @@ interface JSTreeGetJsonOptions {
     /**
     * do not return state information
     */
-    no_state: boolean;
+    no_state?: boolean;
 
     /**
     * do not return ID
     */
-    no_id: boolean;
+    no_id?: boolean;
 
     /**
     * do not include children
     */
-    no_children: boolean;
+    no_children?: boolean;
 
     /**
     * do not include node data
     */
-    no_data: boolean;
+    no_data?: boolean;
 
     /**
     * do not include LI attributes
     */
-    no_li_attr: boolean;
+    no_li_attr?: boolean;
 
     /**
     * do not include A attributes
     */
-    no_a_attr: boolean;
+    no_a_attr?: boolean;
 
     /**
     * return flat JSON instead of nested
     */
-    flat: boolean;
+    flat?: boolean;
 }
 
 interface JSTreeBindOptions {

From 94634500dce75d64cfdbd6c3a8586709d727318d Mon Sep 17 00:00:00 2001
From: Brian D <briandu@microsoft.com>
Date: Mon, 9 Apr 2018 10:36:12 -0700
Subject: [PATCH 1132/1382] Victory Charts: VictoryLegend - adds optional fill
 parameter to symbol object; Adds optional itemsPerRow (#24687)

* Victory Charts: added fill parameter

* Adds 'itemsPerRow' to VictoryLegend

http://formidable.com/open-source/victory/docs/victory-legend/
---
 types/victory/index.d.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/types/victory/index.d.ts b/types/victory/index.d.ts
index 0c7f756b26..1ce04d2436 100644
--- a/types/victory/index.d.ts
+++ b/types/victory/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Victory 0.9.1
+// Type definitions for Victory 0.9.2
 // Project: https://github.com/FormidableLabs/victory
 // Definitions by: Alexey Svetliakov <https://github.com/asvetliakov>
 //                 snerks <https://github.com/snerks>
@@ -1242,9 +1242,17 @@ declare module "victory" {
         data?: Array<{
             name?: string;
             symbol?: {
+                fill?: string;
                 type?: string;
             };
         }>;
+        /**
+         * The itemsPerRow prop determines how many items to render in each row
+         * of a horizontal legend, or in each column of a vertical legend. This
+         * prop should be given as an integer. When this prop is not given,
+         * legend items will be rendered in a single row or column.
+         */
+        itemsPerRow?: number;
         /**
          * The dataComponent prop takes a component instance which will be
          * responsible for rendering a data element used to associate a symbol

From 4f156d89a50cb7cddf3a0faaad988ef9d26d4b3b Mon Sep 17 00:00:00 2001
From: Wooseop Kim <wooseop.kim.dev@gmail.com>
Date: Tue, 10 Apr 2018 02:36:50 +0900
Subject: [PATCH 1133/1382] Add sharp.SharpInstance#toBuffer({
 resolveWithObject: boolean }) overloads (#24703)

---
 types/sharp/index.d.ts     | 10 +++++++++-
 types/sharp/sharp-tests.ts | 15 +++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/types/sharp/index.d.ts b/types/sharp/index.d.ts
index 432be5346d..e1108575ab 100644
--- a/types/sharp/index.d.ts
+++ b/types/sharp/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for sharp 0.17
 // Project: https://github.com/lovell/sharp
 // Definitions by: François Nguyen <https://github.com/lith-light-g>
+//                 Wooseop Kim <https://github.com/wooseopkim>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -359,9 +360,16 @@ declare namespace sharp {
         toBuffer(callback: (err: Error, buffer: Buffer, info: OutputInfo) => void): SharpInstance;
         /**
          * Write output to a Buffer. JPEG, PNG, WebP, and RAW output are supported. By default, the format will match the input image, except GIF and SVG input which become PNG output.
+         * @param options resolve options
          * @returns A promise that fulfills with the resulting Buffer
          */
-        toBuffer(): Promise<Buffer>;
+        toBuffer(options?: { resolveWithObject: false }): Promise<Buffer>;
+        /**
+         * Write output to a Buffer. JPEG, PNG, WebP, and RAW output are supported. By default, the format will match the input image, except GIF and SVG input which become PNG output.
+         * @param options resolve options
+         * @returns A promise that fulfills with an object containing the Buffer data and an info object containing the output image format, size (bytes), width, height and channels
+         */
+        toBuffer(options: { resolveWithObject: true }): Promise<{ data: Buffer, info: OutputInfo }>;
         /**
          * Use these JPEG options for output image.
          * @param options Output options.
diff --git a/types/sharp/sharp-tests.ts b/types/sharp/sharp-tests.ts
index f1010c533c..2cef4e42a4 100644
--- a/types/sharp/sharp-tests.ts
+++ b/types/sharp/sharp-tests.ts
@@ -183,6 +183,21 @@ sharp(input)
         // than 200 pixels regardless of the inputBuffer image dimensions
     });
 
+sharp(input)
+    .resize(100, 100)
+    .toBuffer({ resolveWithObject: false })
+    .then((outputBuffer: Buffer) => {
+        // Resolves with a Buffer object when resolveWithObject is false
+    });
+
+sharp(input)
+    .resize(100, 100)
+    .toBuffer({ resolveWithObject: true })
+    .then((object: { data: Buffer, info: sharp.OutputInfo }) => {
+        // Resolve with an object containing data Buffer and an OutputInfo object
+        // when resolveWithObject is true
+    });
+
 const stats = sharp.cache();
 
 sharp.cache({ items: 200 });

From 1945bf693b1c5073c42a478756a20790217e3b90 Mon Sep 17 00:00:00 2001
From: Jack <szdc@users.noreply.github.com>
Date: Tue, 10 Apr 2018 03:40:45 +1000
Subject: [PATCH 1134/1382] feat(diff): update types to support v3.5 (#24697)

---
 types/diff/diff-tests.ts | 27 ++++++++++++-----------
 types/diff/index.d.ts    | 46 +++++++++++++++++++++++++++-------------
 2 files changed, 46 insertions(+), 27 deletions(-)

diff --git a/types/diff/diff-tests.ts b/types/diff/diff-tests.ts
index e787c44f48..f859a735b4 100644
--- a/types/diff/diff-tests.ts
+++ b/types/diff/diff-tests.ts
@@ -3,12 +3,10 @@ const one = 'beep boop';
 const other = 'beep boob blah';
 
 let diff = jsdiff.diffChars(one, other);
+printDiff(diff);
 
-diff.forEach(part => {
-    const mark = part.added ? '+' :
-        part.removed ? '-' : ' ';
-    console.log(`${mark} ${part.value}`);
-});
+diff = jsdiff.diffArrays(['a', 'b', 'c'], ['a', 'c', 'd']);
+printDiff(diff);
 
 // --------------------------
 
@@ -22,13 +20,13 @@ class LineDiffWithoutWhitespace extends jsdiff.Diff {
     }
 }
 
-const obj = new LineDiffWithoutWhitespace(true);
+const obj = new LineDiffWithoutWhitespace();
 diff = obj.diff(one, other);
 printDiff(diff);
 
 function printDiff(diff: jsdiff.IDiffResult[]) {
-    function addLineHeader(decorator: string, str: string) {
-        return str.split("\n").map((line, index, array) => {
+    function addLineHeader(decorator: string, str: string | string[]) {
+        return (typeof str === 'string' ? str.split("\n") : str).map((line, index, array) => {
             if (index === array.length - 1 && line === "") {
                 return line;
             } else {
@@ -52,7 +50,8 @@ function verifyPatchMethods(oldStr: string, newStr: string, uniDiff: jsdiff.IUni
     const verifyPatch = jsdiff.parsePatch(
         jsdiff.createTwoFilesPatch("oldFile.ts", "newFile.ts", oldStr, newStr,
             "old", "new", { context: 1 }));
-    if (JSON.stringify(verifyPatch) !== JSON.stringify(uniDiff)) {
+
+    if (JSON.stringify(verifyPatch[0], Object.keys(verifyPatch[0]).sort()) !== JSON.stringify(uniDiff, Object.keys(uniDiff).sort())) {
         console.error("Patch did not match uniDiff");
     }
 }
@@ -82,7 +81,11 @@ function verifyApplyMethods(oldStr: string, newStr: string, uniDiff: jsdiff.IUni
     });
 }
 
-const uniDiff = jsdiff.structuredPatch("oldFile.ts", "newFile.ts", one, other,
+const uniDiffPatch = jsdiff.structuredPatch("oldFile.ts", "newFile.ts", one, other,
     "old", "new", { context: 1 });
-verifyPatchMethods(one, other, uniDiff);
-verifyApplyMethods(one, other, uniDiff);
+verifyPatchMethods(one, other, uniDiffPatch);
+
+const uniDiffStr = jsdiff.createPatch("file.ts", one, other, "old", "new",
+    { context: 1 });
+const uniDiffApply = jsdiff.parsePatch(uniDiffStr)[0];
+verifyApplyMethods(one, other, uniDiffApply);
diff --git a/types/diff/index.d.ts b/types/diff/index.d.ts
index 720a8d3270..2017b43e0e 100644
--- a/types/diff/index.d.ts
+++ b/types/diff/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for diff 3.2
+// Type definitions for diff 3.5
 // Project: https://github.com/kpdecker/jsdiff
 // Definitions by: vvakame <https://github.com/vvakame>
+//                 szdc <https://github.com/szdc>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -8,15 +9,19 @@ export = JsDiff;
 export as namespace JsDiff;
 
 declare namespace JsDiff {
-    interface ICaseOptions {
+    interface IOptions {
         ignoreCase: boolean;
     }
 
-    interface ILinesOptions {
+    interface ILinesOptions extends IOptions {
         ignoreWhitespace?: boolean;
         newlineIsToken?: boolean;
     }
 
+    interface IArrayOptions extends IOptions {
+        comparator?: (left: any, right: any) => number;
+    }
+
     interface IDiffResult {
         value: string;
         count?: number;
@@ -42,38 +47,45 @@ declare namespace JsDiff {
         newFileName: string;
         oldHeader: string;
         newHeader: string;
+        index: string;
         hunks: IHunk[];
     }
 
     class Diff {
-        ignoreWhitespace: boolean;
+        diff(oldString: string, newString: string, options?: IOptions): IDiffResult[];
 
-        constructor(ignoreWhitespace?: boolean);
-
-        diff(oldString: string, newString: string): IDiffResult[];
-
-        pushComponent(components: IDiffResult[], value: string, added: boolean, removed: boolean): void;
+        pushComponent(components: IDiffResult[], added: boolean, removed: boolean): void;
 
         extractCommon(basePath: IBestPath, newString: string, oldString: string, diagonalPath: number): number;
 
         equals(left: string, right: string): boolean;
 
-        join(left: string, right: string): string;
+        removeEmpty(array: any[]): any[];
+
+        castInput(value: any): any;
+
+        join(chars: string[]): string;
 
         tokenize(value: string): any; // return types are string or string[]
     }
 
-    function diffChars(oldStr: string, newStr: string, options?: ICaseOptions): IDiffResult[];
+    function diffChars(oldStr: string, newStr: string, options?: IOptions): IDiffResult[];
 
-    function diffWords(oldStr: string, newStr: string, options?: ICaseOptions): IDiffResult[];
+    function diffWords(oldStr: string, newStr: string, options?: IOptions): IDiffResult[];
 
-    function diffWordsWithSpace(oldStr: string, newStr: string): IDiffResult[];
+    function diffWordsWithSpace(oldStr: string, newStr: string, options?: IOptions): IDiffResult[];
 
-    function diffJson(oldObj: object, newObj: object): IDiffResult[];
+    function diffJson(oldObj: object, newObj: object, options?: IOptions): IDiffResult[];
 
     function diffLines(oldStr: string, newStr: string, options?: ILinesOptions): IDiffResult[];
 
-    function diffCss(oldStr: string, newStr: string): IDiffResult[];
+    function diffCss(oldStr: string, newStr: string, options?: IOptions): IDiffResult[];
+
+    function diffTrimmedLines(oldStr: string, newStr: string, options?: ILinesOptions): IDiffResult[];
+
+    function diffSentences(oldStr: string, newStr: string, options?: IOptions): IDiffResult[];
+
+    function diffArrays(oldArr: any[], newArr: any[], options?: IArrayOptions): IDiffResult[];
 
     function createPatch(fileName: string, oldStr: string, newStr: string, oldHeader: string, newHeader: string, options?: {context: number}): string;
 
@@ -94,4 +106,8 @@ declare namespace JsDiff {
     function convertChangesToXML(changes: IDiffResult[]): string;
 
     function convertChangesToDMP(changes: IDiffResult[]): Array<{0: number; 1: string; }>;
+
+    function merge(mine: string, theirs: string, base: string): IUniDiff;
+
+    function canonicalize(obj: any, stack: any[], replacementStack: any[]): any;
 }

From 710de9e6945f6d042d17db9683366035f8b0d3b6 Mon Sep 17 00:00:00 2001
From: Stian Didriksen <stipsan@gmail.com>
Date: Mon, 9 Apr 2018 19:41:45 +0200
Subject: [PATCH 1135/1382] Fix blunder in #24691 (#24693)

noModule got added to the wrong element (doh)
---
 types/react/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index 2ed2fb497c..4b22054b77 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -1568,6 +1568,7 @@ declare namespace React {
         crossOrigin?: string;
         defer?: boolean;
         integrity?: string;
+        noModule?: boolean;
         nonce?: string;
         src?: string;
         type?: string;
@@ -1579,7 +1580,6 @@ declare namespace React {
         form?: string;
         multiple?: boolean;
         name?: string;
-        noModule?: boolean;
         required?: boolean;
         size?: number;
         value?: string | string[] | number;

From ea718d99b4b677fe4e2bb0961263f80b811f4e1b Mon Sep 17 00:00:00 2001
From: Omar Diab <me@omardiab.com>
Date: Mon, 9 Apr 2018 10:42:41 -0700
Subject: [PATCH 1136/1382] [react-intl] FormattedMessage children prop
 (#24670)

---
 types/react-intl/index.d.ts           | 1 +
 types/react-intl/react-intl-tests.tsx | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/types/react-intl/index.d.ts b/types/react-intl/index.d.ts
index 72d5d69f51..7da9dbd487 100644
--- a/types/react-intl/index.d.ts
+++ b/types/react-intl/index.d.ts
@@ -142,6 +142,7 @@ declare namespace ReactIntl {
         interface Props extends MessageDescriptor {
             values?: {[key: string]: MessageValue | JSX.Element};
             tagName?: string;
+            children?: (formattedMessage: string[]) => React.ReactNode;
         }
     }
     class FormattedMessage extends React.Component<FormattedMessage.Props> { }
diff --git a/types/react-intl/react-intl-tests.tsx b/types/react-intl/react-intl-tests.tsx
index 726802a8bb..75490a5ca1 100644
--- a/types/react-intl/react-intl-tests.tsx
+++ b/types/react-intl/react-intl-tests.tsx
@@ -143,6 +143,13 @@ class SomeComponent extends React.Component<SomeComponentProps & InjectedIntlPro
                 values={{ blank: null, empty: undefined }}
                 tagName="div" />
 
+            <FormattedMessage
+                id="test"
+                description="Test"
+            >
+                {(text) => <div className="messageDiv">{text}</div>}
+            </FormattedMessage>
+
             <FormattedHTMLMessage
                 id="test"
                 description="Test"

From 07847a40211d4e821a72168dc944735f41db861c Mon Sep 17 00:00:00 2001
From: Yuki Nishijima <yk.nishijima@gmail.com>
Date: Mon, 9 Apr 2018 13:44:33 -0400
Subject: [PATCH 1137/1382] [react-transition-group] Add const for Transition
 (#24778)

This fixes the following TS errors:

  import Transition, { ENTERED, ENTERING } from 'react-transition-group/Transition'
  // => Module '"./node_modules/@types/react-transition-group/Transition"' has no exported member 'ENTERED'.
  // => Module '"./node_modules/@types/react-transition-group/Transition"' has no exported member 'ENTERING'.
---
 types/react-transition-group/Transition.d.ts                | 6 ++++++
 .../react-transition-group/react-transition-group-tests.tsx | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/types/react-transition-group/Transition.d.ts b/types/react-transition-group/Transition.d.ts
index 24f0265ee2..66ab782d1e 100644
--- a/types/react-transition-group/Transition.d.ts
+++ b/types/react-transition-group/Transition.d.ts
@@ -4,6 +4,12 @@ export type EndHandler = (node: HTMLElement, done: () => void) => void;
 export type EnterHandler = (node: HTMLElement, isAppearing: boolean) => void;
 export type ExitHandler = (node: HTMLElement) => void;
 
+export const UNMOUNTED = 'unmounted';
+export const EXITED = 'exited';
+export const ENTERING = 'entering';
+export const ENTERED = 'entered';
+export const EXITING = 'exiting';
+
 export interface TransitionActions {
     appear?: boolean;
     enter?: boolean;
diff --git a/types/react-transition-group/react-transition-group-tests.tsx b/types/react-transition-group/react-transition-group-tests.tsx
index dd6555df68..f45630e4a4 100644
--- a/types/react-transition-group/react-transition-group-tests.tsx
+++ b/types/react-transition-group/react-transition-group-tests.tsx
@@ -1,6 +1,6 @@
 import * as React from "react";
 import CSSTransition = require("react-transition-group/CSSTransition");
-import Transition from "react-transition-group/Transition";
+import Transition, { UNMOUNTED, EXITED, ENTERING, ENTERED, EXITING } from "react-transition-group/Transition";
 import TransitionGroup = require("react-transition-group/TransitionGroup");
 import Components = require("react-transition-group");
 

From 92801a99e350e3abc0032750f76b8905b5238e4c Mon Sep 17 00:00:00 2001
From: Shude Li <lishude@aliyun.com>
Date: Tue, 10 Apr 2018 01:45:10 +0800
Subject: [PATCH 1138/1382] node@8: fix return type of Cipher. setAAD() and
 Cipher. setAutoPadding() (#24801)

* fix: fix return type of Cipher. setAAD() and Cipher. setAutoPadding()

* node@8: fix return types of Decipher.setAAD() and Decipher.setAutoPadding()

* fix: fix return types of Decipher.setAuthTag()
---
 types/node/v8/index.d.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/types/node/v8/index.d.ts b/types/node/v8/index.d.ts
index a17800dfb7..164df0a960 100644
--- a/types/node/v8/index.d.ts
+++ b/types/node/v8/index.d.ts
@@ -5156,9 +5156,9 @@ declare module "crypto" {
         update(data: string, input_encoding: Utf8AsciiBinaryEncoding, output_encoding: HexBase64BinaryEncoding): string;
         final(): Buffer;
         final(output_encoding: string): string;
-        setAutoPadding(auto_padding?: boolean): void;
+        setAutoPadding(auto_padding?: boolean): this;
         getAuthTag(): Buffer;
-        setAAD(buffer: Buffer): void;
+        setAAD(buffer: Buffer): this;
     }
     export function createDecipher(algorithm: string, password: any): Decipher;
     export function createDecipheriv(algorithm: string, key: any, iv: any): Decipher;
@@ -5169,9 +5169,9 @@ declare module "crypto" {
         update(data: string, input_encoding: HexBase64BinaryEncoding, output_encoding: Utf8AsciiBinaryEncoding): string;
         final(): Buffer;
         final(output_encoding: string): string;
-        setAutoPadding(auto_padding?: boolean): void;
-        setAuthTag(tag: Buffer): void;
-        setAAD(buffer: Buffer): void;
+        setAutoPadding(auto_padding?: boolean): this;
+        setAuthTag(tag: Buffer): this;
+        setAAD(buffer: Buffer): this;
     }
     export function createSign(algorithm: string): Signer;
     export interface Signer extends NodeJS.WritableStream {

From bf68326d76f5a36c1829366015a6b507025a058c Mon Sep 17 00:00:00 2001
From: Michele Bombardi <bmsoftware.co@gmail.com>
Date: Mon, 9 Apr 2018 19:45:37 +0200
Subject: [PATCH 1139/1382] Added react-native AppRegistry registerHeadlessTask
 typing (#24806)

* react-native: AppRegistry registerHeadlessTask

* Definitions by header

* Task, TaskProvider and registerHeadlessTask task param type
---
 types/react-native/index.d.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index a248fd3010..6dc9608668 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -7,6 +7,7 @@
 //                 Kamal Mahyuddin <https://github.com/kamal>
 //                 Naoufal El Yousfi <https://github.com/nelyousfi>
 //                 Alex Dunne <https://github.com/alexdunne>
+//                 Michele Bombardi <https://github.com/bm-software>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -339,6 +340,9 @@ export function createElement<P>(
 
 export type Runnable = (appParameters: any) => void;
 
+type Task = (taskData: any) => Promise<void>;
+type TaskProvider = () => Task;
+
 type NodeHandle = number;
 
 // Similar to React.SyntheticEvent except for nativeEvent
@@ -466,6 +470,8 @@ export namespace AppRegistry {
     function unmountApplicationComponentAtRootTag(rootTag: number): void;
 
     function runApplication(appKey: string, appParameters: any): void;
+
+    function registerHeadlessTask(appKey: string, task: TaskProvider): void;
 }
 
 export interface LayoutAnimationTypes {

From 76db75e673978e77a004a18dd983c9a153ba2599 Mon Sep 17 00:00:00 2001
From: Jesse Lentz <jesselentz@gmail.com>
Date: Mon, 9 Apr 2018 13:45:56 -0400
Subject: [PATCH 1140/1382] [mongodb] Update SSLOptions.sslValidate to be a
 boolean (#24810)

Per
http://mongodb.github.io/node-mongodb-native/3.0/api/MongoClient.html,
this MongoClient option should be a boolean instead of an Object.
---
 types/mongodb/index.d.ts       | 2 +-
 types/mongodb/mongodb-tests.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/mongodb/index.d.ts b/types/mongodb/index.d.ts
index 4fb7dc68f6..335d7e0187 100644
--- a/types/mongodb/index.d.ts
+++ b/types/mongodb/index.d.ts
@@ -105,7 +105,7 @@ export interface SSLOptions {
     // Use ssl connection (needs to have a mongod server with ssl support)
     ssl?: boolean;
     // Default: true; Validate mongod server certificate against ca (mongod server >=2.4 with ssl support required)
-    sslValidate?: Object;
+    sslValidate?: boolean;
     // Default: true; Server identity checking during SSL
     checkServerIdentity?: boolean | Function;
     // Array of valid certificates either as Buffers or Strings
diff --git a/types/mongodb/mongodb-tests.ts b/types/mongodb/mongodb-tests.ts
index af307ce6d8..434f71dc91 100644
--- a/types/mongodb/mongodb-tests.ts
+++ b/types/mongodb/mongodb-tests.ts
@@ -20,7 +20,7 @@ let options: mongodb.MongoClientOptions = {
     reconnectInterval: 123456,
 
     ssl: true,
-    sslValidate: {},
+    sslValidate: false,
     checkServerIdentity: function () { },
     sslCA: ['str'],
     sslCert: new Buffer(999),

From d472efccd0e040d1ebb23273361d029c9b61dd05 Mon Sep 17 00:00:00 2001
From: Xiaohan Zhang <hellochar@users.noreply.github.com>
Date: Mon, 9 Apr 2018 10:52:14 -0700
Subject: [PATCH 1141/1382] threejs - use correct skinWeights and skinIndices
 types (#24800)

---
 types/three/test/docs/scenes/bones_browser.ts | 124 ++++++++++++++++++
 types/three/three-core.d.ts                   |  12 +-
 types/three/tsconfig.json                     |   3 +-
 3 files changed, 131 insertions(+), 8 deletions(-)
 create mode 100644 types/three/test/docs/scenes/bones_browser.ts

diff --git a/types/three/test/docs/scenes/bones_browser.ts b/types/three/test/docs/scenes/bones_browser.ts
new file mode 100644
index 0000000000..c04a788cde
--- /dev/null
+++ b/types/three/test/docs/scenes/bones_browser.ts
@@ -0,0 +1,124 @@
+// https://github.com/mrdoob/three.js/blob/master/docs/scenes/bones-browser.html
+
+() => {
+    var scene: THREE.Scene;
+    var camera: THREE.PerspectiveCamera;
+    var renderer: THREE.WebGLRenderer;
+    var orbit: THREE.OrbitControls;
+    var lights: THREE.Light[];
+    var mesh: THREE.SkinnedMesh;
+    var bones: THREE.Bone[];
+    var skeletonHelper: THREE.SkeletonHelper;
+    var state = {
+        animateBones: false
+    };
+    function initScene() {
+        scene = new THREE.Scene();
+        camera = new THREE.PerspectiveCamera(75, window.innerWidth / window.innerHeight, 0.1, 200);
+        camera.position.z = 30;
+        camera.position.y = 30;
+        renderer = new THREE.WebGLRenderer({ antialias: true });
+        renderer.setPixelRatio(window.devicePixelRatio);
+        renderer.setSize(window.innerWidth, window.innerHeight);
+        renderer.setClearColor(0x000000, 1);
+        document.body.appendChild(renderer.domElement);
+        orbit = new THREE.OrbitControls(camera, renderer.domElement);
+        orbit.enableZoom = false;
+        lights = [];
+        lights[0] = new THREE.PointLight(0xffffff, 1, 0);
+        lights[1] = new THREE.PointLight(0xffffff, 1, 0);
+        lights[2] = new THREE.PointLight(0xffffff, 1, 0);
+        lights[0].position.set(0, 200, 0);
+        lights[1].position.set(100, 200, 100);
+        lights[2].position.set(- 100, - 200, - 100);
+        scene.add(lights[0]);
+        scene.add(lights[1]);
+        scene.add(lights[2]);
+        window.addEventListener('resize', function () {
+            camera.aspect = window.innerWidth / window.innerHeight;
+            camera.updateProjectionMatrix();
+            renderer.setSize(window.innerWidth, window.innerHeight);
+        }, false);
+        initBones();
+    }
+    function createGeometry(sizing: any) {
+        var geometry = new THREE.CylinderGeometry(
+            5,                       // radiusTop
+            5,                       // radiusBottom
+            sizing.height,           // height
+            8,                       // radiusSegments
+            sizing.segmentCount * 3, // heightSegments
+            true                     // openEnded
+        );
+        for (var i = 0; i < geometry.vertices.length; i++) {
+            var vertex = geometry.vertices[i];
+            var y = (vertex.y + sizing.halfHeight);
+            var skinIndex = Math.floor(y / sizing.segmentHeight);
+            var skinWeight = (y % sizing.segmentHeight) / sizing.segmentHeight;
+            geometry.skinIndices.push(new THREE.Vector4(skinIndex, skinIndex + 1, 0, 0));
+            geometry.skinWeights.push(new THREE.Vector4(1 - skinWeight, skinWeight, 0, 0));
+        }
+        return geometry;
+    }
+    function createBones(sizing: any) {
+        bones = [];
+        var prevBone = new THREE.Bone();
+        bones.push(prevBone);
+        prevBone.position.y = - sizing.halfHeight;
+        for (var i = 0; i < sizing.segmentCount; i++) {
+            var bone = new THREE.Bone();
+            bone.position.y = sizing.segmentHeight;
+            bones.push(bone);
+            prevBone.add(bone);
+            prevBone = bone;
+        }
+        return bones;
+    }
+    function createMesh(geometry: THREE.Geometry, bones: THREE.Bone[]) {
+        var material = new THREE.MeshPhongMaterial({
+            skinning: true,
+            color: 0x156289,
+            emissive: 0x072534,
+            side: THREE.DoubleSide,
+            flatShading: true
+        });
+        var mesh = new THREE.SkinnedMesh(geometry, material);
+        var skeleton = new THREE.Skeleton(bones);
+        mesh.add(bones[0]);
+        mesh.bind(skeleton);
+        skeletonHelper = new THREE.SkeletonHelper(mesh);
+        (skeletonHelper.material as THREE.LineBasicMaterial).linewidth = 2;
+        scene.add(skeletonHelper);
+        return mesh;
+    }
+    function initBones() {
+        var segmentHeight = 8;
+        var segmentCount = 4;
+        var height = segmentHeight * segmentCount;
+        var halfHeight = height * 0.5;
+        var sizing = {
+            segmentHeight: segmentHeight,
+            segmentCount: segmentCount,
+            height: height,
+            halfHeight: halfHeight
+        };
+        var geometry = createGeometry(sizing);
+        var bones = createBones(sizing);
+        mesh = createMesh(geometry, bones);
+        mesh.scale.multiplyScalar(1);
+        scene.add(mesh);
+    }
+    function render() {
+        requestAnimationFrame(render);
+        var time = Date.now() * 0.001;
+        //Wiggle the bones
+        if (state.animateBones) {
+            for (var i = 0; i < mesh.skeleton.bones.length; i++) {
+                mesh.skeleton.bones[i].rotation.z = Math.sin(time) * 2 / mesh.skeleton.bones.length;
+            }
+        }
+        renderer.render(scene, camera);
+    }
+    initScene();
+    render();
+}
diff --git a/types/three/three-core.d.ts b/types/three/three-core.d.ts
index 0a17adf51b..2d8d40f1d6 100644
--- a/types/three/three-core.d.ts
+++ b/types/three/three-core.d.ts
@@ -1015,8 +1015,8 @@ export class DirectGeometry extends EventDispatcher {
     uvs2: Vector2[];
     groups: {start: number, materialIndex: number}[];
     morphTargets: MorphTarget[];
-    skinWeights: number[];
-    skinIndices: number[];
+    skinWeights: Vector4[];
+    skinIndices: Vector4[];
     boundingBox: Box3;
     boundingSphere: Sphere;
     verticesNeedUpdate: boolean;
@@ -1270,12 +1270,12 @@ export class Geometry extends EventDispatcher {
     /**
      * Array of skinning weights, matching number and order of vertices.
      */
-    skinWeights: number[];
+    skinWeights: Vector4[];
 
     /**
      * Array of skinning indices, matching number and order of vertices.
      */
-    skinIndices: number[];
+    skinIndices: Vector4[];
 
     /**
      *
@@ -5020,9 +5020,7 @@ export class QuaternionLinearInterpolant extends Interpolant {
 // Objects //////////////////////////////////////////////////////////////////////////////////
 
 export class Bone extends Object3D {
-    constructor(skin: SkinnedMesh);
-
-    skin: SkinnedMesh;
+    constructor();
 }
 
 export class Group extends Object3D {
diff --git a/types/three/tsconfig.json b/types/three/tsconfig.json
index 2c62dbad6b..ff443f85f7 100644
--- a/types/three/tsconfig.json
+++ b/types/three/tsconfig.json
@@ -21,6 +21,7 @@
         "index.d.ts",
         "detector.d.ts",
         "test/references.ts",
+        "test/docs/scenes/bones_browser.ts",
         "test/math/test_unit_math.ts",
         "test/webgl/webgl_animation_cloth.ts",
         "test/webgl/webgl_animation_skinning_morph.ts",
@@ -57,4 +58,4 @@
         "test/examples/loaders/webgl_loader_obj_mtl.ts",
         "test/webvr/webvr.ts"
     ]
-}
\ No newline at end of file
+}

From 0df701c2d61f78660a2714ef27e1cb4ade93de1a Mon Sep 17 00:00:00 2001
From: Manuel Alabor <swissmanu@users.noreply.github.com>
Date: Mon, 9 Apr 2018 19:53:42 +0200
Subject: [PATCH 1142/1382] Add InputAccessoryView to react-native Typing
 (#24837)

Adds typing for react-natives InputAccessoryView component.
---
 types/react-native/index.d.ts     | 34 ++++++++++++++++++++++++++++++-
 types/react-native/test/index.tsx | 13 ++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index 6dc9608668..3503c69f6b 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-native 0.52
+// Type definitions for react-native 0.55
 // Project: https://github.com/facebook/react-native
 // Definitions by: Eloy Durán <https://github.com/alloy>
 //                 HuHuanming <https://github.com/huhuanming>
@@ -7,6 +7,7 @@
 //                 Kamal Mahyuddin <https://github.com/kamal>
 //                 Naoufal El Yousfi <https://github.com/nelyousfi>
 //                 Alex Dunne <https://github.com/alexdunne>
+//                 Manuel Alabor <https://github.com/swissmanu>
 //                 Michele Bombardi <https://github.com/bm-software>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
@@ -1226,6 +1227,13 @@ export interface TextInputProperties
      */
     testID?: string;
 
+    /**
+     * Used to connect to an InputAccessoryView. Not part of react-natives documentation, but present in examples and
+     * code.
+     * See https://facebook.github.io/react-native/docs/inputaccessoryview.html for more information.
+     */
+    inputAccessoryViewID?: string;
+
     /**
      * The value to show for the text input. TextInput is a controlled component,
      * which means the native value will be forced to match this value prop if provided.
@@ -2257,6 +2265,27 @@ export interface SegmentedControlIOSProperties extends ViewProperties {
  */
 export interface SafeAreaViewStatic extends NativeMethodsMixin, React.ClassicComponentClass<ViewProperties> {}
 
+
+/**
+ * A component which enables customization of the keyboard input accessory view on iOS. The input accessory view is
+ * displayed above the keyboard whenever a TextInput has focus. This component can be used to create custom toolbars.
+ *
+ * To use this component wrap your custom toolbar with the InputAccessoryView component, and set a nativeID. Then, pass
+ * that nativeID as the inputAccessoryViewID of whatever TextInput you desire.
+ */
+export interface InputAccessoryViewStatic extends React.ClassicComponentClass<InputAccessoryViewProperties> {}
+
+export interface InputAccessoryViewProperties {
+    backgroundColor?: string;
+
+    /**
+     * An ID which is used to associate this InputAccessoryView to specified TextInput(s).
+     */
+    nativeID?: string;
+
+    style?: StyleProp<ViewStyle>;
+}
+
 /**
  * Use `SegmentedControlIOS` to render a UISegmentedControl iOS.
  *
@@ -8376,6 +8405,9 @@ export type ImageBackground = ImageBackgroundStatic;
 export var ImagePickerIOS: ImagePickerIOSStatic;
 export type ImagePickerIOS = ImagePickerIOSStatic;
 
+export var InputAccessoryView: InputAccessoryViewStatic;
+export type InputAccessoryView = InputAccessoryViewStatic;
+
 export var FlatList: FlatListStatic<any>;
 export type FlatList<ItemT> = FlatListStatic<ItemT>;
 
diff --git a/types/react-native/test/index.tsx b/types/react-native/test/index.tsx
index 65db445695..557df0869d 100644
--- a/types/react-native/test/index.tsx
+++ b/types/react-native/test/index.tsx
@@ -45,6 +45,8 @@ import {
     TabBarIOS,
     NativeModules,
     MaskedViewIOS,
+    TextInput,
+    InputAccessoryView,
 } from "react-native";
 
 declare module "react-native" {
@@ -369,6 +371,17 @@ class MaskedViewTest extends React.Component {
     }
 }
 
+class InputAccessoryViewTest extends React.Component {
+    render() {
+        const uniqueID = "foobar";
+        return (
+            <InputAccessoryView nativeID={uniqueID}>
+                <TextInput inputAccessoryViewID={uniqueID} />
+            </InputAccessoryView>
+        )
+    }
+}
+
 // DataSourceAssetCallback
 const dataSourceAssetCallback1: DataSourceAssetCallback = {
     rowHasChanged: (r1, r2) => true,

From 419a725bff66ca535fb0fd4f81b6386aacfc258b Mon Sep 17 00:00:00 2001
From: Andy <anhans@microsoft.com>
Date: Mon, 9 Apr 2018 11:11:05 -0700
Subject: [PATCH 1143/1382] victory: Fix test (#24769)

---
 types/victory/victory-tests.tsx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/types/victory/victory-tests.tsx b/types/victory/victory-tests.tsx
index aa21609ff5..56f9d34b54 100644
--- a/types/victory/victory-tests.tsx
+++ b/types/victory/victory-tests.tsx
@@ -243,8 +243,7 @@ test = (
         padding={75}
         style={{
             data: {
-              fill: (data: any) => data.y > 2 ?
-                "red" : "blue"
+              fill: "red",
             }
         }}
         data={[
@@ -374,8 +373,7 @@ test = (
             style={{
               data: {
                 width: 15,
-                fill: (data: any) => data.y > 3 ?
-                  "gold" : "orange"
+                fill: "gold",
               }
             }}
             data={[

From d05ed194dfa8d67550e7c27d301fcd72c8808bf0 Mon Sep 17 00:00:00 2001
From: Rob Moran <github@thegecko.org>
Date: Mon, 9 Apr 2018 19:39:11 +0100
Subject: [PATCH 1144/1382] Updated node-hid types to v0.7 (#24831)

* Updated node-hid types to v0.7.2

* Only use MAJOR.MINOR version
---
 types/node-hid/index.d.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/types/node-hid/index.d.ts b/types/node-hid/index.d.ts
index 92ffd4a60a..00a2f5eaee 100644
--- a/types/node-hid/index.d.ts
+++ b/types/node-hid/index.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for node-hid 0.5
+// Type definitions for node-hid 0.7
 // Project: https://github.com/node-hid/node-hid#readme
 // Definitions by: Mohamed Hegazy <https://github.com/mhegazy>
 //                 Robert Kiss <https://github.com/ert78gb>
+//                 Rob Moran <https://github.com/thegecko>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export interface Device {
@@ -22,13 +23,14 @@ export class HID {
     constructor(vid: number, pid: number);
     close(): void;
     pause(): void;
-    read(callback: (value: any, err: any) => void): any;
+    read(callback: (err: any, data: number[]) => void): void;
     readSync(): number[];
     readTimeout(time_out: number): number[];
-    sendFeatureReport(data: number[]): void;
+    sendFeatureReport(data: number[]): number;
     getFeatureReport(report_id: number, report_length: number): number[];
     resume(): void;
     on(event: string, handler: (value: any) => void): void;
-    write(values: number[]): void;
+    write(values: number[]): number;
+    setDriverType(type: string): void;
 }
 export function devices(): Device[];

From 857ee0bd10006c0a5278519eebd7a2a687f77a87 Mon Sep 17 00:00:00 2001
From: Mathis Wiehl <mail@mathiswiehl.de>
Date: Mon, 9 Apr 2018 20:43:08 +0200
Subject: [PATCH 1145/1382] fix(async): fix applyEach rest args (#24674)

Add missing rest argument notation to `applyEach` and `applyEachSeries` since the previous notation enforced a notation that simply didn't work.
---
 types/async/index.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/async/index.d.ts b/types/async/index.d.ts
index e2ecb522bc..961dd73ebb 100644
--- a/types/async/index.d.ts
+++ b/types/async/index.d.ts
@@ -168,8 +168,8 @@ export function forever<E>(next: (next : ErrorCallback<E>) => void, errBack: Err
 export function waterfall<T, E>(tasks: Function[], callback?: AsyncResultCallback<T, E | Error>): void;
 export function compose(...fns: Function[]): Function;
 export function seq(...fns: Function[]): Function;
-export function applyEach(fns: Function[], argsAndCallback: any[]): void;           // applyEach(fns, args..., callback). TS does not support ... for a middle argument. Callback is optional.
-export function applyEachSeries(fns: Function[], argsAndCallback: any[]): void;     // applyEachSeries(fns, args..., callback). TS does not support ... for a middle argument. Callback is optional.
+export function applyEach(fns: Function[], ...argsAndCallback: any[]): void;           // applyEach(fns, args..., callback). TS does not support ... for a middle argument. Callback is optional.
+export function applyEachSeries(fns: Function[], ...argsAndCallback: any[]): void;     // applyEachSeries(fns, args..., callback). TS does not support ... for a middle argument. Callback is optional.
 export function queue<T, E>(worker: AsyncWorker<T, E>, concurrency?: number): AsyncQueue<T>;
 export function queue<T, R, E>(worker: AsyncResultIterator<T, R, E>, concurrency?: number): AsyncQueue<T>;
 export function priorityQueue<T, E>(worker: AsyncWorker<T, E>, concurrency: number): AsyncPriorityQueue<T>;

From 03aba67bf9b9051223f1373b34c58d546d9c4e81 Mon Sep 17 00:00:00 2001
From: Andy <anhans@microsoft.com>
Date: Mon, 9 Apr 2018 11:45:56 -0700
Subject: [PATCH 1146/1382] Update CODEOWNERS (#24847)

---
 .github/CODEOWNERS | 297 ++++++++++++++++++++++++++++++---------------
 1 file changed, 199 insertions(+), 98 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index a769c20dfc..7182a5462f 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,3 +1,7 @@
+# This file is generated.
+# Add yourself to the "Definitions by:" list instead.
+# See https://github.com/DefinitelyTyped/DefinitelyTyped#edit-an-existing-package
+
 /types/abbrev/                                  @BendingBender
 /types/abs/                                     @AyaMorisawa
 /types/absolute/                                @AyaMorisawa
@@ -47,13 +51,15 @@
 /types/alt/                                     @Shearerbeard
 /types/amazon-product-api/                      @MattiLehtinen @alien35
 /types/amcharts/                                @ldrick
+/types/amphtml-validator/                       @kevincharm
 /types/amplify/                                 @joeriks
 /types/amplify-deferred/                        @joeriks @laurentiustamate94
 /types/amplitude-js/                            @Asido
 /types/amqp/                                    @seikho @jonnysparkplugs
 /types/amqp-rpc/                                @wokim
-/types/amqplib/                                 @mnahkies @abreits @nfantone
+/types/amqplib/                                 @mnahkies @abreits @nfantone @zelein
 /types/analytics-node/                          @fongandrew @thomasthiebaud
+/types/anchor-js/                               @xt0rted
 /types/angular/                                 @diegovilar @thorn0 @calebstdenis @leonard-thieu
 /types/angular-agility/                         @rolandzwaga
 /types/angular-animate/                         @michelsalib @adidahiya @rasch @codyschaaf
@@ -65,6 +71,7 @@
 /types/angular-cookie/                          @borislavjivkov
 /types/angular-cookies/                         @diegovilar @aciccarello
 /types/angular-deferred-bootstrap/              @Ritzlgrmft
+/types/angular-desktop-notification/            @Dona278
 /types/angular-dialog-service/                  @wcomartin
 /types/angular-dynamic-locale/                  @stephenlautier
 /types/angular-environment/                     @terrawheat
@@ -110,7 +117,6 @@
 /types/angular-toastr/                          @nkovacic @trodi
 /types/angular-toasty/                          @muenchdo
 /types/angular-tooltips/                        @leonard-thieu
-/types/angular-touchspin/                       @nkovacic
 /types/angular-translate/                       @michelsalib
 /types/angular-ui-bootstrap/                    @xt0rted @ry8806
 /types/angular-ui-router/                       @michelsalib @matiishyn @mikehaas763
@@ -164,6 +170,7 @@
 /types/array-find-index/                        @samverschueren
 /types/array-foreach/                           @skysteve
 /types/array-uniq/                              @DanielRosenwasser
+/types/array-unique/                            @CSLTech
 /types/arrify/                                  @wanganjun
 /types/artillery/                               @kmccoan-allocadia
 /types/asana/                                   @tkqubo
@@ -183,7 +190,7 @@
 /types/async.nexttick/                          @pyrho
 /types/asynciterator/                           @rubensworks
 /types/atlaskit__button/                        @dijimsta
-/types/atmosphere.js/                           @toedter @Mory1879
+/types/atmosphere.js/                           @toedter @Mory1879 @Scipion
 /types/atom/                                    @GlenCFL @smhxx @lierdakil
 /types/atom-keymap/                             @GlenCFL
 /types/atom-mocha-test-runner/                  @GlenCFL
@@ -221,6 +228,7 @@
 /types/babel-traverse/                          @yortus @marvinhagemeister
 /types/babel-types/                             @yortus @baxtersa @marvinhagemeister @bcherny
 /types/babel-webpack-plugin/                    @j-f1
+/types/babel__code-frame/                       @mohsen1 @ForbesLindesay
 /types/babelify/                                @TeamworkGuy2 @marvinhagemeister
 /types/babylon/                                 @yortus @marvinhagemeister
 /types/babylon-walk/                            @czbuchi
@@ -231,7 +239,7 @@
 /types/backbone-relational/                     @eirikhm
 /types/backbone.layoutmanager/                  @hejiang2000
 /types/backbone.localstorage/                   @lgrignon
-/types/backbone.marionette/                     @zhamid @nvivo @sventschui
+/types/backbone.marionette/                     @zhamid @nvivo @sventschui @razorness
 /types/backbone.paginator/                      @Nyamazing
 /types/backbone.radio/                          @alphaleonis
 /types/backgrid/                                @jlujan
@@ -245,6 +253,7 @@
 /types/base-x/                                  @chrootsu
 /types/base16/                                  @alechill
 /types/base64-js/                               @pe8ter
+/types/base64-url/                              @urish
 /types/base64topdf/                             @lucasriondel
 /types/bases/                                   @harikv
 /types/bash-glob/                               @mrmlnc
@@ -255,6 +264,7 @@
 /types/bcryptjs/                                @RafaelKr
 /types/beats/                                   @urish
 /types/bech32/                                  @micksatana
+/types/bell/                                    @SimonSchick
 /types/bem-cn/                                  @selkinvitaly
 /types/better-curry/                            @pocesar
 /types/better-sqlite3/                          @Morfent @matrumz
@@ -269,7 +279,6 @@
 /types/binary-parser/                           @riggs @dolanmiu
 /types/bind-ponyfill/                           @skysteve
 /types/bindings/                                @unindented
-/types/bingmaps/                                @rbrundritt
 /types/bintrees/                                @CjS77
 /types/bip21/                                   @stefanhuber
 /types/bip38/                                   @micksatana
@@ -300,11 +309,12 @@
 /types/bonjour/                                 @quentin-ol @octo-sniffle
 /types/bookshelf/                               @arcticwaters @vesse
 /types/boom/v3/                                 @rogatty
-/types/boom/v4/                                 @rogatty @AJamesPhillips @jineshshah36
-/types/boom/                                    @rogatty @AJamesPhillips @jineshshah36 @TimonVS
+/types/boom/v4/                                 @rogatty @AJamesPhillips @jineshshah36 @danielmachado
+/types/boom/                                    @rogatty @AJamesPhillips @jineshshah36 @TimonVS @danielmachado
 /types/bootbox/                                 @vbortone @konpikwastaken @kanup @icereed @trodi @stannynuytkens @renjfk
 /types/bootpag/                                 @rdeneau
-/types/bootstrap/                               @borisyankov
+/types/bootstrap/v3/                            @borisyankov
+/types/bootstrap/                               @denisname
 /types/bootstrap-3-typeahead/                   @AndersonFriaca
 /types/bootstrap-datepicker/                    @borisyankov
 /types/bootstrap-fileinput/                     @CheCoxshall
@@ -322,6 +332,7 @@
 /types/bootstrap.timepicker/                    @derikwhittaker @heatherbooker
 /types/bootstrap.v3.datetimepicker/v3/          @bayitajesi
 /types/bootstrap.v3.datetimepicker/             @katonap
+/types/bootstrap3-dialog/                       @nakupanda @cnboland
 /types/bounce.js/                               @cherrry
 /types/box2d/                                   @jbaldwin
 /types/brace-expansion/                         @BendingBender
@@ -348,7 +359,7 @@
 /types/bufferstream/                            @Bartvds
 /types/builtin-modules/                         @ajafff
 /types/bull/v2/                                 @bgrieder @JProgrammer
-/types/bull/                                    @bgrieder @JProgrammer @marshall007 @weeco @blaugold
+/types/bull/                                    @bgrieder @JProgrammer @marshall007 @weeco @blaugold @iamolegga
 /types/bump-regex/                              @silkentrance
 /types/bunnymq/                                 @cyrilschumacher
 /types/bunyan/                                  @amikhalev
@@ -363,7 +374,7 @@
 /types/bwip-js/                                 @MugeSo
 /types/byline/                                  @reppners
 /types/bytebuffer/                              @cappellin
-/types/bytes/                                   @danny8002
+/types/bytes/                                   @danny8002 @believer
 /types/c3/                                      @mcliment @gerinjacob @denyo @dmitryshindin
 /types/cache-manager/                           @GausSim
 /types/cal-heatmap/                             @RetroChrisB
@@ -409,7 +420,7 @@
 /types/chai-subset/                             @delta62 @AGBrown
 /types/chai-webdriverio/                        @sherlock1982
 /types/chai-xml/                                @jedigo
-/types/chance/                                  @cbowdon @brikou
+/types/chance/                                  @cbowdon @brikou @cafesanu
 /types/change-emitter/                          @iskandersierra
 /types/charm/                                   @Xananax
 /types/charset/                                 @cspotcode
@@ -429,6 +440,7 @@
 /types/chroma-js/v0/                            @invliD
 /types/chroma-js/                               @invliD @mpacholec
 /types/chrome/                                  @matthewkimber @otiai10 @couven92 @rreverser @sreimer15
+/types/circuit-breaker-js/                      @DeTeam
 /types/circular-json/                           @jpevarnek
 /types/ckeditor/                                @wittwert
 /types/clamp-js/                                @Hikariii
@@ -475,7 +487,6 @@
 /types/color-namer/                             @in19farkt
 /types/color-string/                            @BendingBender @danmarshall
 /types/colorbrewer/                             @mtraynham
-/types/colors/                                  @Bartvds @staeke
 /types/com.darktalker.cordova.screenshot/       @akarienta
 /types/combine-source-map/                      @TeamworkGuy2
 /types/combined-stream/                         @felixge @tlaziuk
@@ -492,7 +503,7 @@
 /types/component-emitter/                       @psnider
 /types/compose-function/                        @denis-sokolov
 /types/compressible/                            @BendingBender
-/types/compression/                             @santialbo
+/types/compression/                             @santialbo @rburgt
 /types/compression-webpack-plugin/              @dublicator
 /types/compute-stdev/                           @mrmlnc
 /types/concat-stream/                           @jmarianer
@@ -502,6 +513,7 @@
 /types/confidence/                              @jppellerin
 /types/config/                                  @RWander @forrestbice @jndonald3 @albertovasquez
 /types/configstore/                             @ArcticLight
+/types/configurable/                            @jewbre
 /types/confit/                                  @ethanresnick
 /types/connect/                                 @SomaticIT
 /types/connect-busboy/                          @pinguet62
@@ -559,6 +571,7 @@
 /types/cordova_app_version_plugin/              @larrybahr
 /types/cordovarduino/                           @hendrikmaus
 /types/core-js/                                 @rbuckton @mfdeveloper
+/types/cosmiconfig/                             @ozum
 /types/cote/                                    @makepost
 /types/couchbase/                               @maouida
 /types/countdown/                               @gjuchault
@@ -598,6 +611,7 @@
 /types/csurf/                                   @horiuchi
 /types/csv-parse/                               @davidm77 @obi-jan-kenobi
 /types/csv-stringify/                           @rogierschouten @arjenvanderende
+/types/csv2json/                                @dex4er
 /types/csvrow/                                  @codeanimal
 /types/csvtojson/                               @EricByers @wcarson
 /types/cucumber/v1/                             @abraaoalves @jan-molak @isoung @BendingBender
@@ -665,6 +679,7 @@
 /types/dat.gui/                                 @gyohk @sonic3d @rroylance
 /types/data-driven/                             @mrhen
 /types/datadog-metrics/                         @pushplay
+/types/datadog-tracer/                          @dineshsaravanan
 /types/datatables.net/                          @Silver-Connection @omidkrad @pragmatrix @CNBoland
 /types/datatables.net-buttons/                  @Silver-Connection @SammyG4Free @jimhartford
 /types/datatables.net-fixedheader/              @szechyjs @Silver-Connection
@@ -697,14 +712,14 @@
 /types/deep-freeze/                             @Bartvds @aluanhaddad
 /types/deep-freeze-es6/                         @mattbishop
 /types/deep-freeze-strict/                      @mhegazy
-/types/deepmerge/                               @marvinscharle @syy1125
+/types/deepmerge/                               @marvinscharle @syy1125 @AppLover69
 /types/defaults/                                @IbtihelCHNAB
 /types/defer-promise/                           @niklasf
 /types/define-lazy-prop/                        @BendingBender
 /types/defined/                                 @BendingBender
 /types/deku/                                    @pocka
 /types/del/v2/                                  @AyaMorisawa
-/types/del/                                     @AyaMorisawa @BendingBender
+/types/del/                                     @AyaMorisawa @BendingBender @bitjson
 /types/delaunator/                              @DenisCarriere
 /types/delay/                                   @BendingBender
 /types/denodeify/                               @joaomoreno
@@ -733,6 +748,7 @@
 /types/diff2html/                               @rtfpessoa
 /types/dir-resolve/                             @andy-ms
 /types/discontinuous-range/                     @OiCMudkips
+/types/dispatchr/                               @Ragg-
 /types/disposable-email-domains/                @geoffreak
 /types/doccookies/                              @jonegerton
 /types/dockerode/                               @seikho @nlaplante @isac322 @lazarusx @meisenzahl @thegecko
@@ -762,10 +778,10 @@
 /types/dottie/                                  @domarmstrong
 /types/double-ended-queue/                      @dsagal
 /types/doublearray/                             @mzsm
-/types/doubleclick-gpt/                         @johngeorgewright
+/types/doubleclick-gpt/                         @johngeorgewright @steven-joyce
 /types/download/                                @nicojs
 /types/downloadjs/                              @cwmoo740
-/types/draft-js/                                @dmitryrogozhny @eelco @ghotiphud @schwers @michael-yx-wu @willisplummer @smvilar
+/types/draft-js/                                @dmitryrogozhny @eelco @ghotiphud @schwers @michael-yx-wu @willisplummer @smvilar @sulf
 /types/drag-timetable/                          @chinkan
 /types/draggabilly/                             @jaydubu
 /types/dragster/                                @zskovacs
@@ -784,11 +800,11 @@
 /types/dvtng-jss/                               @Ptival
 /types/dw-bxslider-4/                           @namerci
 /types/dwt/v12/                                 @yushulx
-/types/dwt/                                     @yushulx @jbh
+/types/dwt/                                     @yushulx @jbh @lincoln2018 @Tom-Dynamsoft
 /types/dygraphs/                                @danvk
 /types/dymo-label-framework/                    @thijskuipers
 /types/dynatable/                               @francoismassart
-/types/dynogels/                                @SpartanLabs
+/types/dynogels/                                @SpartanLabs @ramondeklein @stephentuso
 /types/each/                                    @misak113
 /types/earcut/                                  @NaridaL
 /types/easeljs/                                 @evilangelist
@@ -811,7 +827,7 @@
 /types/ejs/                                     @benliddicott
 /types/ejs-locals/                              @jt000
 /types/ejson/                                   @shantanubhadoria
-/types/elasticsearch/                           @CasperSkydt @bfsmith @ddunkin @pushplay @mlamp @ahmadferdous @SimonSchick
+/types/elasticsearch/                           @CasperSkydt @bfsmith @ddunkin @pushplay @mlamp @ahmadferdous @SimonSchick @brabster @deerawan
 /types/electron-config/                         @mrfunkycold @unindented
 /types/electron-debug/                          @unindented
 /types/electron-devtools-installer/             @gamesmaxed
@@ -852,6 +868,7 @@
 /types/engine.io-client/                        @KentarouTakeda
 /types/enhanced-resolve/                        @e-cloud @onigoetz
 /types/enigma.js/                               @konne
+/types/enquire.js/                              @screendriver
 /types/ent/                                     @rogierschouten
 /types/entities/                                @aliceklipper
 /types/env-to-object/                           @MugeSo
@@ -888,18 +905,23 @@
 /types/estraverse/                              @sanex3339
 /types/estree/                                  @RReverser
 /types/etag/                                    @BendingBender
+/types/ethereumjs-util/                         @cortopy
 /types/ethjs-signer/                            @doppio
 /types/eureka-js-client/                        @Schnillz
 /types/evaporate/                               @kookster @chrisrhoden
 /types/event-emitter/                           @LKay
+/types/event-emitter-es6/                       @ahstro
 /types/event-kit/                               @GlenCFL
 /types/event-loop-lag/                          @rogierschouten
 /types/event-stream/                            @flcdrg
 /types/event-to-promise/                        @flying-sheep
 /types/events/                                  @yasupeke
+/types/eventsource/                             @scottleedavis
 /types/evernote/                                @corps
+/types/excel-style-dataformatter/               @SanderDeWaal1992
 /types/exceljs/                                 @rogierschouten @alitaheri
 /types/execa/                                   @douglasduteil @BendingBender @borekb @mickdekkers
+/types/exenv/                                   @christianchown
 /types/exit/                                    @Bartvds
 /types/exit-hook/                               @BendingBender
 /types/exorcist/                                @TeamworkGuy2
@@ -908,13 +930,14 @@
 /types/expectations/                            @vvakame
 /types/expo/v23/                                @KonstantinKai
 /types/expo/v24/                                @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger
-/types/expo/                                    @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger
+/types/expo/                                    @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger @umidbekkarimov
 /types/expo__vector-icons/                      @incleaf
 /types/express/                                 @borisyankov
 /types/express-brute/                           @cyrilschumacher
 /types/express-brute-memcached/                 @cyrilschumacher
 /types/express-brute-mongo/                     @cyrilschumacher
 /types/express-brute-redis/                     @scottharwell
+/types/express-bunyan-logger/                   @shreyjain1994
 /types/express-busboy/                          @pinguet62
 /types/express-cluster/                         @nenadalm
 /types/express-debug/                           @federicobond
@@ -925,7 +948,7 @@
 /types/express-flash-2/                         @mathsalmi
 /types/express-flash-notification/              @Mister4Eyes
 /types/express-formidable/                      @tdolsen @evanshortiss
-/types/express-graphql/                         @isman-usoh @nitintutlani @hubel @zya
+/types/express-graphql/                         @isman-usoh @nitintutlani @hubel @zya @mlamp @firede
 /types/express-handlebars/                      @stpettersens @yhaskell
 /types/express-jwt/                             @wokim @kacepe @Sl1MBoy
 /types/express-less/                            @xieyubo
@@ -952,8 +975,10 @@
 /types/extract-text-webpack-plugin/             @flying-sheep @katyo
 /types/extract-zip/                             @mizunashi-mana
 /types/eyes/                                    @brynbellomy
+/types/ez-plus/                                 @AndersonFriaca
 /types/f1/                                      @neolwc
 /types/fabric/                                  @oklemencic @joewashear007 @mrand01 @NotWoods
+/types/facebook-instant-games/                  @menushka
 /types/facebook-js-sdk/                         @amritk
 /types/facebook-pixel/                          @noctishsu
 /types/faker/v3/                                @Kuniwak
@@ -984,7 +1009,7 @@
 /types/feathersjs__authentication-oauth2/       @j2L4e
 /types/feathersjs__configuration/               @j2L4e
 /types/feathersjs__errors/                      @j2L4e
-/types/feathersjs__express/                     @j2L4e
+/types/feathersjs__express/                     @j2L4e @DadUndead
 /types/feathersjs__feathers/                    @j2L4e @AbraaoAlves
 /types/feathersjs__primus/                      @j2L4e
 /types/feathersjs__primus-client/               @j2L4e
@@ -995,7 +1020,7 @@
 /types/feedme/                                  @codeanimal
 /types/feedparser/                              @cortopy
 /types/fetch-jsonp/                             @tkrotoff
-/types/fetch-mock/                              @asvetliakov @tamird @merrywhether @chrissinclair
+/types/fetch-mock/                              @asvetliakov @tamird @merrywhether @chrissinclair @matttennison @quentinbouygues
 /types/fetch.io/                                @newraina
 /types/ffi/                                     @loyd
 /types/ffmpeg-static/                           @iamstevetran
@@ -1038,10 +1063,11 @@
 /types/flux/                                    @stkb @GiedriusGrabauskas
 /types/fluxxor/                                 @mrk21
 /types/fm-websync/                              @markusmauch
+/types/fnv-lite/                                @marcind
 /types/fontfaceobserver/                        @RandScullard
 /types/fontoxml/                                @rolandzwaga
 /types/forever-agent/                           @yavanosta
-/types/forever-monitor/                         @shuntksh
+/types/forever-monitor/                         @shuntksh @wrboyce
 /types/forge-di/                                @adamcarr
 /types/form-data/                               @soywiz @leonyu @BendingBender
 /types/form-serializer/                         @flqw
@@ -1060,7 +1086,8 @@
 /types/freeport/                                @atd-schubert
 /types/fresh/                                   @BendingBender
 /types/friendly-errors-webpack-plugin/          @bahlo
-/types/frisby/                                  @johnny4753
+/types/frisby/v0/                               @johnny4753
+/types/frisby/                                  @cwoodland @johnny4753
 /types/from/                                    @Bartvds
 /types/from2/                                   @BendingBender
 /types/fromjs/                                  @glenndierckx
@@ -1233,8 +1260,9 @@
 /types/gaussian/                                @scttcper
 /types/geetest/                                 @plantain-00
 /types/gen-readlines/                           @CodeAnimal
+/types/generate-changelog/                      @ffflorian
 /types/generic-functions/                       @stpettersens
-/types/generic-pool/                            @jerray
+/types/generic-pool/                            @jerray @wrboyce
 /types/gently/                                  @bonnici
 /types/geodesy/                                 @DenisCarriere @HandyG52 @excelulous
 /types/geojson/                                 @cobster @atd-schubert @JeffJacobson
@@ -1270,6 +1298,7 @@
 /types/globalize-compiler/                      @iclanton
 /types/globby/                                  @douglasduteil @ikatyang
 /types/globule/                                 @durad
+/types/glue/                                    @garfty
 /types/gm/                                      @ChaosinaCan @maartenvanvliet
 /types/go/                                      @NorthwoodsSoftware
 /types/google-adwords-scripts/                  @jafaircl
@@ -1297,9 +1326,10 @@
 /types/graceful-fs/                             @Bartvds @BendingBender
 /types/graham_scan/                             @hberntsen
 /types/graphite-udp/                            @EricByers
-/types/graphql/                                 @TonyPythoneer @calebmer @intellix @firede @kepennar @freiksenet @IvanGoncharov @DxCx @rportugal @tgriesser @dyst5422 @adnsio
+/types/graphql/                                 @TonyPythoneer @calebmer @intellix @firede @kepennar @freiksenet @IvanGoncharov @DxCx @rportugal @tgriesser @dyst5422 @adnsio @divyenduz
 /types/graphql-date/                            @enaeseth
 /types/graphql-iso-date/                        @jwaldrip
+/types/graphql-list-fields/                     @filipows
 /types/graphql-relay/                           @arvitaly @nitintutlani @Grelinfo
 /types/graphql-resolve-batch/                   @nayni
 /types/graphql-type-json/                       @schfkt
@@ -1396,7 +1426,8 @@
 /types/hapi/v16/                                @jasonswearingen @AJamesPhillips
 /types/hapi/                                    @BorntraegerMarc @rafaelsouzaf @jhsimms
 /types/hapi-auth-basic/                         @AJamesPhillips @saboya
-/types/hapi-auth-jwt2/                          @warrenseymour
+/types/hapi-auth-jwt2/v7/                       @warrenseymour
+/types/hapi-auth-jwt2/                          @warrenseymour @SimonSchick
 /types/hapi-decorators/                         @kenhowardpdx
 /types/har-format/                              @micmro
 /types/hard-rejection/                          @BendingBender
@@ -1448,6 +1479,7 @@
 /types/html-minifier/                           @tkrotoff @rikuayanokozy
 /types/html-pdf/                                @westy92
 /types/html-to-text/                            @erykwarren
+/types/html-void-elements/                      @rhysd
 /types/html-webpack-plugin/                     @deevus @bumbleblym @tlaziuk
 /types/html-webpack-template/                   @bumbleblym
 /types/html2canvas/                             @rwhepburn @tan9
@@ -1521,7 +1553,7 @@
 /types/iniparser/                               @chrootsu
 /types/inline-css/                              @philipisapain
 /types/inline-style-prefixer/                   @ahz @dpetrezselyova
-/types/inquirer/                                @tkQubo @ppathan @jouderianjr
+/types/inquirer/                                @tkQubo @ppathan @jouderianjr @bang88 @bitjson @synarque @jrockwood
 /types/insert-module-globals/                   @leonard-thieu
 /types/insight/                                 @vvakame
 /types/integer/                                 @Morfent
@@ -1551,7 +1583,9 @@
 /types/is-archive/                              @mhegazy
 /types/is-array/                                @pine
 /types/is-binary-path/                          @DanielRosenwasser
+/types/is-color/                                @VitorLuizC
 /types/is-compressed/                           @mhegazy
+/types/is-empty/                                @termosa
 /types/is-finite/                               @mhegazy
 /types/is-glob/                                 @mrmlnc
 /types/is-hotkey/                               @petester42
@@ -1579,7 +1613,7 @@
 /types/iso-3166-2/                              @sicilica
 /types/iso8601-localizer/                       @avielfedida
 /types/isomorphic-fetch/                        @toddlucas
-/types/isotope-layout/                          @avidenic
+/types/isotope-layout/                          @avidenic @malinushj
 /types/istanbul/                                @tkrotoff
 /types/istanbul-lib-coverage/                   @jason0x43
 /types/istanbul-lib-hook/                       @jason0x43
@@ -1617,7 +1651,7 @@
 /types/jdataview/                               @RReverser
 /types/jdenticon/                               @mtr
 /types/jest/v16/                                @NoHomey @jwbay
-/types/jest/                                    @NoHomey @jwbay @asvetliakov @alexjoverm @epicallan @ikatyang @wsmd @JamieMason @douglasduteil @AhnpGit
+/types/jest/                                    @NoHomey @jwbay @asvetliakov @alexjoverm @epicallan @ikatyang @wsmd @JamieMason @douglasduteil @AhnpGit @joshuakgoldberg @bradleyayers
 /types/jest-diff/                               @myabc
 /types/jest-docblock/                           @ikatyang
 /types/jest-get-type/                           @myabc
@@ -1633,7 +1667,7 @@
 /types/johnny-five/                             @nakakura @ujvzolee @workshop2
 /types/joi/v6/                                  @Bartvds @laurence-myers @cglantschnig @DavidBR-SW
 /types/joi/v10/                                 @Bartvds @laurence-myers @cglantschnig @DavidBR-SW @GaelMagnan @ralekna @schfkt @rokoroku
-/types/joi/                                     @Bartvds @laurence-myers @cglantschnig @DavidBR-SW @GaelMagnan @ralekna @schfkt @rokoroku @dankraus @wanganjun
+/types/joi/                                     @Bartvds @laurence-myers @cglantschnig @DavidBR-SW @GaelMagnan @ralekna @schfkt @rokoroku @dankraus @wanganjun @rafaelkallis
 /types/joigoose/                                @boothwhack
 /types/josa/                                    @vichyssoise
 /types/jpeg-js/                                 @DanielRosenwasser
@@ -1676,10 +1710,12 @@
 /types/jquery-urlparam/                         @stpettersens
 /types/jquery-validation-unobtrusive/           @EnableSoftware
 /types/jquery.address/                          @martinduparc @mardaneus86
+/types/jquery.appear/                           @AndersonFriaca
 /types/jquery.are-you-sure/                     @jonegerton
 /types/jquery.autosize/                         @kingdango
 /types/jquery.bbq/                              @sunetos
 /types/jquery.bootstrap.wizard/                 @niemyjski @dennisahlin
+/types/jquery.browser/                          @AndersonFriaca
 /types/jquery.cleditor/                         @pushplay
 /types/jquery.clientsidelogging/                @diullei
 /types/jquery.color/                            @derekcicerone
@@ -1709,6 +1745,7 @@
 /types/jquery.notifybar/                        @zaneli
 /types/jquery.noty/                             @kingdango @thelfensdrfer
 /types/jquery.payment/                          @ejsmith @johnrutherford
+/types/jquery.pin/                              @AndersonFriaca
 /types/jquery.pjax/                             @lijunle
 /types/jquery.placeholder/                      @majorsilence @EnableSoftware
 /types/jquery.pnotify/                          @DavidSichau @FUNExtreme
@@ -1752,10 +1789,12 @@
 /types/js-fixtures/                             @kazimanzurrashid
 /types/js-git/                                  @Bartvds
 /types/js-md5/                                  @mwmccarthy
+/types/js-money/                                @kanatkubash
 /types/js-quantities/                           @wrummler
 /types/js-schema/                               @marcinporebski @roblabat
 /types/js-search/                               @guoyunhe
 /types/js-sha512/                               @nicojs
+/types/js-string-escape/                        @viralpickaxe
 /types/js-to-java/                              @skyitachi
 /types/js-url/                                  @pine613
 /types/js-yaml/                                 @Bartvds @sclausen
@@ -1780,10 +1819,11 @@
 /types/json-pointer/                            @Bartvds
 /types/json-query/                              @mtraynham
 /types/json-rpc-ws/                             @npenin @mlamp
-/types/json-schema/                             @bcherny @cyrilletuzi
+/types/json-schema/                             @bcherny @cyrilletuzi @lucianbuzzo
 /types/json-socket/                             @svi3c
 /types/json-stable-stringify/                   @mhfrantz
 /types/json-stringify-safe/                     @BendingBender
+/types/json2csv/                                @juanjoDiaz
 /types/json2md/                                 @MartynasZilinskas
 /types/jsonata/                                 @nick121212
 /types/jsoneditor/                              @alejo90
@@ -1801,13 +1841,17 @@
 /types/jsqrcode/                                @lordazzi
 /types/jsrender/                                @zakki
 /types/jsreport-core/                           @taoqf
+/types/jsreport-html-to-xlsx/                   @me
+/types/jsreport-jsrender/                       @taoqf
+/types/jsreport-phantom-pdf/                    @taoqf
+/types/jsreport-xlsx/                           @taoqf
 /types/jsrp/                                    @harryshipton
 /types/jss/                                     @appsforartists @kof
 /types/jssha/                                   @randombk @SrTobi
 /types/jstimezonedetect/                        @olamothe
 /types/jstorage/                                @dflor003
 /types/jstree/                                  @adaskothebeast
-/types/jsts/                                    @StephaneAlie
+/types/jsts/                                    @StephaneAlie @jrocha
 /types/jsuite/                                  @darrenhillconsulting
 /types/jsuri/                                   @coldacid @flqw
 /types/jsurl/                                   @agorshkov23
@@ -1818,11 +1862,12 @@
 /types/jui-core/                                @easylogic
 /types/jui-grid/                                @easylogic
 /types/jweixin/                                 @taoqf @gomydodo
-/types/jwplayer/                                @martinduparc @kutomer @philippguertler
+/types/jwplayer/                                @martinduparc @kutomer @philippguertler @danielmcgraw
 /types/jws/                                     @JustinBeckwith
 /types/jwt-client/                              @timoteoponce
 /types/jwt-decode/v1/                           @QuatroDevOfficial
 /types/jwt-decode/                              @GiedriusGrabauskas @madsmadsen
+/types/jwt-express/                             @nickp10
 /types/jwt-simple/                              @kenfdev @GaelMagnan
 /types/kafka-node/                              @dansitu @bkim54 @sfrooster @amiram
 /types/karma/                                   @tkrotoff @43081j
@@ -1831,6 +1876,7 @@
 /types/karma-coverage/                          @tkrotoff
 /types/karma-fixture/                           @evictor
 /types/karma-jasmine/                           @michelsalib
+/types/karma-viewport/                          @karak
 /types/karma-webpack/                           @mtraynham
 /types/katex/                                   @mrand01
 /types/kcors/                                   @Xstoudi @izayoiko
@@ -1844,12 +1890,13 @@
 /types/keypress.js/                             @rcchen
 /types/keysym/                                  @harryshipton
 /types/keytar/                                  @miniak @shiftkey @juturu
+/types/keyv/                                    @Arylo
 /types/kik-browser/                             @joelday
 /types/klaw/v1/                                 @mceachen
 /types/klaw/                                    @mceachen
 /types/klaw-sync/                               @shiftkey
 /types/kms-json/                                @sunnyone
-/types/knex/                                    @tkQubo @baronfel @MeLlamoPablo @mastermatt @micksatana
+/types/knex/                                    @tkQubo @baronfel @MeLlamoPablo @mastermatt @micksatana @shreyjain1994
 /types/knex-postgis/                            @vesse
 /types/knockback/                               @borisyankov
 /types/knockout/                                @borisyankov @Igorbek @moonpyk @EnableSoftware @BenjaminEckardt @ffMathy
@@ -1914,7 +1961,7 @@
 /types/kramed/                                  @tonicblue
 /types/kss/                                     @giladgray
 /types/kue/                                     @drudge @amiram @pc-jedi
-/types/kurento-utils/                           @nenadalm
+/types/kurento-utils/                           @nenadalm @riggs
 /types/kuromoji/                                @mzsm @kgtkr
 /types/lab/                                     @prashaantt
 /types/ladda/                                   @dflor003 @leemicw
@@ -1973,6 +2020,7 @@
 /types/line-by-line/                            @etomsen
 /types/line-reader/                             @stpettersens
 /types/linkify-it/                              @praxxis
+/types/listr/                                   @durad
 /types/lls/                                     @borislavjivkov
 /types/load-json-file/                          @SamVerschueren
 /types/loader-runner/                           @e-cloud
@@ -2323,7 +2371,7 @@
 /types/mapnik/                                  @ipv4sec
 /types/mapsjs/                                  @davismj
 /types/mariasql/                                @bennett000
-/types/mark.js/                                 @renjfk
+/types/mark.js/                                 @renjfk @RomanGotsiy
 /types/markdown-it/                             @rapropos
 /types/markdown-it-anchor/                      @seryl
 /types/markdown-it-container/                   @hronex
@@ -2375,12 +2423,13 @@
 /types/media-typer/                             @BendingBender
 /types/medium-editor/                           @keika299
 /types/mem/                                     @SamVerschueren
+/types/mem-fs/                                  @MyFoodBag
 /types/memcached/                               @KentarouTakeda
 /types/memoizee/                                @juanpicado
 /types/memory-cache/                            @jedigo @thieman
 /types/memory-fs/                               @e-cloud
 /types/memwatch-next/                           @cyrilschumacher
-/types/meow/                                    @KnisterPeter @praxxis
+/types/meow/                                    @KnisterPeter @praxxis @bitjson
 /types/merge-descriptors/                       @danny8002
 /types/merge-stream/                            @k-kagurazaka @daniel-zazula
 /types/merge2/                                  @tkrotoff @smac89
@@ -2396,7 +2445,7 @@
 /types/meteor-persistent-session/               @vangorra
 /types/meteor-prime8consulting-oauth2/          @vangorra
 /types/meteor-publish-composite/                @vangorra
-/types/meteor-roles/                            @vangorra
+/types/meteor-roles/                            @vangorra @mattmm3d
 /types/method-override/                         @santialbo
 /types/methods/                                 @cprecioso
 /types/metric-suffix/                           @davidm77
@@ -2416,6 +2465,7 @@
 /types/mime-types/                              @Perlmint
 /types/mimos/                                   @AJamesPhillips
 /types/mina/                                    @lhk @mattanja @kant2002
+/types/mini-css-extract-plugin/                 @JounQin
 /types/minimatch/                               @vvakame @shantmarouti
 /types/minimist/                                @Bartvds @Necroskillz @kamranayub
 /types/minimist-options/                        @ikatyang
@@ -2430,7 +2480,7 @@
 /types/mkdirp/                                  @Bartvds @mrmlnc
 /types/mkpath/                                  @optical
 /types/mobx-apollo/                             @pselden
-/types/mocha/                                   @kazimanzurrashid @otiai10 @jt000 @enlight
+/types/mocha/                                   @kazimanzurrashid @otiai10 @jt000 @enlight @cspotcode
 /types/mocha-each/                              @magnostherobot
 /types/mocha-phantomjs/                         @ErikSchierboom
 /types/mocha-steps/                             @Arylo
@@ -2456,9 +2506,9 @@
 /types/moment-timezone/                         @michelsalib @alanblins
 /types/mongo-sanitize/                          @CedricCazin
 /types/mongodb/v2/                              @CaselIT @alanmarcell @kikar @bitjson @dante-101 @mcortesi
-/types/mongodb/                                 @CaselIT @alanmarcell @kikar @bitjson @dante-101 @mcortesi
+/types/mongodb/                                 @CaselIT @alanmarcell @kikar @bitjson @dante-101 @mcortesi @EnricoPicci @AJCStriker
 /types/mongoose/v4/                             @simonxca @horiuchi @sindrenm @lukasz-zak
-/types/mongoose/                                @simonxca @horiuchi @sindrenm @lukasz-zak @Alorel @jendrikw @ethanresnick
+/types/mongoose/                                @horiuchi @sindrenm @lukasz-zak @Alorel @jendrikw @ethanresnick @vologab
 /types/mongoose-auto-increment/                 @AyaMorisawa
 /types/mongoose-deep-populate/                  @AyaMorisawa
 /types/mongoose-geojson-schema/                 @bondz
@@ -2469,6 +2519,7 @@
 /types/mongoose-sequence/                       @linusbrolin
 /types/mongoose-simple-random/                  @rsxdalv
 /types/mongoose-unique-validator/               @stevehipwell
+/types/mongorito/                               @pinguet62
 /types/moo/                                     @deltaidea @MofX
 /types/moonjs/                                  @DanielRosenwasser
 /types/morgan/                                  @staticfunction @pscanf
@@ -2487,6 +2538,7 @@
 /types/msportalfx-test/                         @julioct
 /types/mssql/                                   @jaminfarr @buzinas @mrrichar @elhaard @pkeuter
 /types/mu2/                                     @jedigo
+/types/muicss/                                  @samuelneff
 /types/multer/                                  @jt000 @DavidBR-SW @mxl @hyunseob
 /types/multer-gridfs-storage/v1/                @devconcept
 /types/multer-gridfs-storage/                   @devconcept
@@ -2502,7 +2554,7 @@
 /types/musicmetadata/                           @Xstoudi
 /types/mustache/                                @markashleybell
 /types/mv/                                      @nenadalm
-/types/mysql/                                   @wjohnsto @kacepe @kpping
+/types/mysql/                                   @wjohnsto @kacepe @kpping @jdmunro
 /types/mz/                                      @ThomasHickman
 /types/n3/                                      @phreed
 /types/nano/                                    @timjacobi @vincekovacs
@@ -2515,9 +2567,10 @@
 /types/natsort/                                 @mgroenhoff
 /types/natural/                                 @dmoonfire
 /types/natural-sort/                            @a-morales
+/types/navermaps/                               @ckboyjiy
 /types/navigation/                              @grahammendick
 /types/navigation-react/                        @grahammendick
-/types/navigo/                                  @aersamkull @dancespiele
+/types/navigo/                                  @aersamkull @dancespiele @deini
 /types/nblas/                                   @erikgerrits
 /types/nconf/                                   @jedigo @jmthibault
 /types/ncp/                                     @bartvds
@@ -2559,16 +2612,17 @@
 /types/ngstorage/                               @kubiq
 /types/ngtoaster/                               @btesser
 /types/ngwysiwyg/                               @patrick-mackay
-/types/nightmare/                               @horiuchi @samyang-au
+/types/nightmare/                               @horiuchi @samyang-au @Bleser92
 /types/nightwatch/                              @rkavalap @schlesiger
+/types/nivo-slider/                             @AndersonFriaca
 /types/noble/                                   @swook @wind-rider @shantanubhadoria @lukel99 @bioball @keton
 /types/nock/                                    @bonnici @horiuchi @afharo @mastermatt @damour
 /types/nodal/                                   @charrondev
 /types/node/v4/                                 @eps1lon
 /types/node/v6/                                 @WilcoBakker @inlined @eps1lon @Alorel
 /types/node/v7/                                 @parambirs @tellnes @WilcoBakker @eps1lon
-/types/node/v8/                                 @parambirs @tellnes @WilcoBakker @octo-sniffle @smac89 @Flarna @mwiktorczyk @wwwy3y3 @DeividasBakanas @kjin @alvis @OliverJAsh @eps1lon @Hannes-Magnusson-CK @jkomyno @hoo29
-/types/node/                                    @parambirs @tellnes @WilcoBakker @octo-sniffle @smac89 @Flarna @mwiktorczyk @wwwy3y3 @DeividasBakanas @kjin @alvis @OliverJAsh @eps1lon @Hannes-Magnusson-CK @jkomyno @ajafff @hoo29
+/types/node/v8/                                 @parambirs @tellnes @WilcoBakker @octo-sniffle @smac89 @Flarna @mwiktorczyk @wwwy3y3 @DeividasBakanas @kjin @alvis @OliverJAsh @eps1lon @Hannes-Magnusson-CK @jkomyno @hoo29 @n-e
+/types/node/                                    @parambirs @tellnes @WilcoBakker @octo-sniffle @smac89 @Flarna @mwiktorczyk @wwwy3y3 @DeividasBakanas @kjin @alvis @OliverJAsh @eps1lon @Hannes-Magnusson-CK @jkomyno @ajafff @hoo29 @n-e
 /types/node-7z/                                 @erkie
 /types/node-array-ext/                          @Beng89
 /types/node-cache/                              @chrootsu @dthunell @useltmann
@@ -2596,9 +2650,10 @@
 /types/node-notifier/                           @tkQubo
 /types/node-polyglot/                           @timjk
 /types/node-powershell/                         @rodrigoff
+/types/node-pushnotifications/                  @menushka
 /types/node-ral/                                @ssddi456
 /types/node-red/                                @andersea
-/types/node-rsa/                                @alitaheri
+/types/node-rsa/                                @alitaheri @xm
 /types/node-schedule/                           @cyrilschumacher @flowpl
 /types/node-slack/                              @tkQubo
 /types/node-snap7/                              @heilingbrunner
@@ -2614,6 +2669,7 @@
 /types/node-xmpp-core/                          @PJakcson
 /types/node-zookeeper-client/                   @plantain-00 @jessezhang91
 /types/node_redis/                              @borisyankov
+/types/nodecredstash/                           @migstopheles
 /types/nodegit/                                 @dolanmiu
 /types/nodemailer/v3/                           @rogierschouten
 /types/nodemailer/                              @rogierschouten @dex4er
@@ -2758,11 +2814,12 @@
 /types/papaparse/                               @torpedro @rainshen49 @jfloff @johnnyreilly
 /types/paper/                                   @clark-stevenson @Xakaloz
 /types/paralleljs/                              @jbaldwin
+/types/parcel-env/                              @fathyb
 /types/parent-package-json/                     @sgmccli
 /types/parity-pmd/                              @leovujanic @jewbre
 /types/parity-pmr/                              @leovujanic
 /types/parity-poe/                              @leovujanic
-/types/parse/                                   @dpoetzsch @jaeggerr @flavionegrao @wesleygrimes
+/types/parse/                                   @dpoetzsch @jaeggerr @flavionegrao @wesleygrimes @owsas
 /types/parse-git-config/                        @leonard-thieu
 /types/parse-glob/                              @glen-84
 /types/parse-json/                              @mrmlnc
@@ -2864,8 +2921,9 @@
 /types/platform/                                @JakeH
 /types/playcanvas/                              @Neoflash1979
 /types/playerframework/                         @ricardosabino
+/types/playmusic/                               @nickp10
 /types/pleasejs/                                @nakakura
-/types/plotly.js/                               @chrisgervang @martinduparc @frederikaalund @taoqf @Dadstart
+/types/plotly.js/                               @chrisgervang @martinduparc @frederikaalund @taoqf @Dadstart @szechyjs
 /types/plugapi/                                 @BNedry
 /types/plugin-error/                            @rogierschouten
 /types/plupload/                                @patrickbussmann
@@ -2882,6 +2940,7 @@
 /types/popcorn/                                 @grapswiz
 /types/portscanner/                             @douglasduteil
 /types/postal/                                  @lokeshpeta @myitcv
+/types/postman-collection/                      @kbuzby
 /types/postmark/                                @benbayard
 /types/pouch-redux-middleware/                  @charrondev
 /types/pouchdb/                                 @AGBrown @geppy @fredgalvao
@@ -2913,6 +2972,7 @@
 /types/pretty-ms/                               @BendingBender
 /types/printf/                                  @AluisioASG
 /types/priorityqueuejs/                         @geoffreak
+/types/prismic-dom/                             @nickw444
 /types/prismjs/                                 @eriklieben @andrewiggins @mmiszy
 /types/private-ip/                              @coderslagoon
 /types/procfs-stats/                            @cyrilschumacher
@@ -2970,7 +3030,7 @@
 /types/puppeteer/                               @marvinhagemeister @cdeutsch @jwbay
 /types/pure-render-decorator/                   @seansfkelley
 /types/purl/                                    @danfma
-/types/pusher-js/                               @tkqubo
+/types/pusher-js/                               @tkqubo @cainlevy
 /types/pvutils/                                 @microshine
 /types/python-shell/                            @dolanmiu @WORMSS
 /types/q/v0/                                    @bnemetchek @johnnyreilly
@@ -2997,7 +3057,7 @@
 /types/rabbit.js/                               @wokim
 /types/radium/                                  @alexgorbatchev @nupplaphil @asvetliakov @mihe
 /types/radius/                                  @codeanimal
-/types/ramda/                                   @donnut @mdekrey @mrdziuban @sbking @afharo @teves-castro @1M0reBug @hojberg @charlespwd @samsonkeung @angeloocana @raynerd @googol @moshensky @ethanresnick
+/types/ramda/                                   @donnut @mdekrey @mrdziuban @sbking @afharo @teves-castro @1M0reBug @hojberg @charlespwd @samsonkeung @angeloocana @raynerd @googol @moshensky @ethanresnick @leighman
 /types/random-js/                               @pistacchio
 /types/random-number/                           @OpenByteDev
 /types/random-seed/                             @endel
@@ -3019,7 +3079,7 @@
 /types/raspi-soft-pwm/                          @nebrius
 /types/ratelimiter/                             @AyaMorisawa
 /types/raty/                                    @terrawheat
-/types/raven/                                   @scttcper @1999
+/types/raven/                                   @scttcper @1999 @shreyjain1994
 /types/raven-for-redux/                         @chiubaka
 /types/raygun4js/                               @xt0rted @BenjaminHarding
 /types/rbac-a/                                  @tlaziuk
@@ -3031,13 +3091,14 @@
 /types/rdf-data-model/                          @rubensworks
 /types/rdf-js/                                  @rubensworks
 /types/react/v15/                               @bbenezech @pzavolinsky @digiguru @ericanderson @morcerf @tkrotoff @DovydasNavickas @onigoetz
-/types/react/                                   @johnnyreilly @bbenezech @pzavolinsky @digiguru @ericanderson @morcerf @tkrotoff @DovydasNavickas @onigoetz @richseviora @theruther4d
+/types/react/                                   @johnnyreilly @bbenezech @pzavolinsky @digiguru @ericanderson @morcerf @tkrotoff @DovydasNavickas @onigoetz @richseviora @theruther4d @guilhermehubner @joshuakgoldberg
 /types/react-alert/                             @ssyrell
 /types/react-alice-carousel/                    @endigo
 /types/react-app/                               @prakarshpandey
 /types/react-aria-menubutton/                   @forabi @crohlfs
 /types/react-autosuggest/                       @nicolas-schmitt @pjo256 @robessog @tbayne @cdeutsch @rosskevin
-/types/react-beautiful-dnd/                     @varHarrie @bradleyayers
+/types/react-avatar-editor/                     @diogocorrea @gabsprates
+/types/react-beautiful-dnd/                     @varHarrie @bradleyayers @paustint
 /types/react-big-calendar/                      @piotrwitek @paustint @pikpok
 /types/react-body-classname/                    @mhegazy
 /types/react-bootstrap/                         @walkerburgin @vsiao @danilojrr @Batbold-Gansukh @octatone @chengsieuly @mretolaza @katbusch @vitosamson @LKay @aaronbeall
@@ -3098,7 +3159,7 @@
 /types/react-flexr/                             @pushplay
 /types/react-fontawesome/                       @timurrustamov @dublicator @vincaslt @gavingregory
 /types/react-form/v1/                           @cameron-mcateer
-/types/react-form/                              @cameron-mcateer
+/types/react-form/                              @cameron-mcateer @TiuSh
 /types/react-foundation/                        @danielearwicker
 /types/react-geosuggest/                        @brmenchl
 /types/react-google-recaptcha/                  @KoalaHuman
@@ -3121,6 +3182,7 @@
 /types/react-image-gallery/                     @adamwpc
 /types/react-imageloader/                       @stephenjelfs
 /types/react-infinite/                          @rhysd
+/types/react-infinite-calendar/                 @christianchown
 /types/react-infinite-scroller/                 @Lapanti @psrebniak
 /types/react-input-calendar/                    @stepancar
 /types/react-input-mask/                        @apare
@@ -3138,6 +3200,7 @@
 /types/react-list/                              @buptyyf @tomshen
 /types/react-loadable/                          @Kovensky @odensc @ianks @tlaziuk
 /types/react-loader/                            @artfuldev
+/types/react-map-gl/                            @rimig
 /types/react-maskedinput/                       @LKay @lavoaster @CarlosBonetti
 /types/react-mce/                               @morphologue
 /types/react-mdl/                               @bradzacher
@@ -3147,14 +3210,16 @@
 /types/react-monaco-editor/                     @jnetterf
 /types/react-motion/                            @stepancar @asvetliakov @dimitarnestorov
 /types/react-motion-slider/                     @asvetliakov
-/types/react-native/                            @alloy @huhuanming @iRoachie @timwangdev @kamal @nelyousfi
-/types/react-native-collapsible/                @iRoachie
+/types/react-native/                            @alloy @huhuanming @iRoachie @timwangdev @kamal @nelyousfi @alexdunne
+/types/react-native-auth0/                      @ascariandrea
+/types/react-native-collapsible/                @iRoachie @umidbekkarimov
 /types/react-native-communications/             @huhuanming @PaitoAnderson
 /types/react-native-datepicker/                 @jacobbaskin
 /types/react-native-doc-viewer/                 @iRoachie
 /types/react-native-document-picker/            @plantain-00
 /types/react-native-drawer/                     @jnbt
 /types/react-native-drawer-layout/              @jmfirth
+/types/react-native-elevated-view/              @fhelwanger
 /types/react-native-fabric/                     @josephroque
 /types/react-native-fbsdk/                      @ifiokjr
 /types/react-native-fetch-blob/                 @MNBuyskih
@@ -3176,17 +3241,20 @@
 /types/react-native-safari-view/                @mrand01
 /types/react-native-scrollable-tab-view/        @CaiHuan @egorshulga
 /types/react-native-sensor-manager/             @SahinVardar
-/types/react-native-snap-carousel/              @jnbt @j-fro
+/types/react-native-snap-carousel/              @jnbt @j-fro @gazaret
 /types/react-native-sortable-grid/              @j-fro
 /types/react-native-sortable-list/              @sivolobov
+/types/react-native-sqlite-storage/             @dryganets
+/types/react-native-star-rating/                @iRoachie
 /types/react-native-svg-uri/                    @iRoachie
 /types/react-native-swiper/                     @CaiHuan @huhuanming @mhcgrq
 /types/react-native-tab-navigator/              @iRoachie
 /types/react-native-tab-view/                   @kaoDev
-/types/react-native-touch-id/                   @huhuanming
+/types/react-native-text-input-mask/            @RodrigoAWeber
+/types/react-native-touch-id/                   @huhuanming @gazaret
 /types/react-native-vector-icons/               @iRoachie @timwangdev
-/types/react-native-video/                      @huhuanming @abrahambotros
-/types/react-navigation/                        @huhuanming @mhcgrq @fangpenlin @abrahambotros @petejkim @iRoachie @phanalpha @charlesfamu @timwangdev @bang88 @svbutko @levito @robertohuertasm @YourGamesBeOver
+/types/react-native-video/                      @huhuanming
+/types/react-navigation/                        @huhuanming @mhcgrq @fangpenlin @petejkim @iRoachie @phanalpha @charlesfamu @timwangdev @bang88 @svbutko @levito @robertohuertasm @YourGamesBeOver @ArmandoAssuncao @cliedeman
 /types/react-notification-system/               @GiedriusGrabauskas @DeividasBakanas @LKay @sztobar
 /types/react-notification-system-redux/         @LKay
 /types/react-numeric-input/                     @heatherbooker
@@ -3195,6 +3263,7 @@
 /types/react-onsenui/                           @salim7 @jemmyw
 /types/react-overlays/                          @aaronbeall @vitosamson
 /types/react-paginate/                          @deevus @wouterhardeman @pegel03 @archy-bold
+/types/react-places-autocomplete/               @guilhermehubner
 /types/react-pointable/                         @istefo @mdibyo
 /types/react-portal/                            @shuntksh
 /types/react-props-decorators/                  @tkqubo
@@ -3204,25 +3273,27 @@
 /types/react-redux-i18n/                        @clementdevos
 /types/react-redux-toastr/                      @Smiche @artyomsv @kulmajaba
 /types/react-relay/                             @graphcool @voxmatt @alloy @npirotte
+/types/react-resize-detector/                   @matthew-matvei
 /types/react-resolver/                          @forabi
 /types/react-responsive/v1/                     @asvetliakov
 /types/react-responsive/                        @asvetliakov @alechill @xaviergonz
+/types/react-rnd/                               @Ragg-
 /types/react-router/v2/                         @sergey-buturlakin @mrk21 @vasek17 @ngbrown @awendland @KostyaEsmukov
 /types/react-router/v3/                         @sergey-buturlakin @mrk21 @vasek17 @ngbrown @awendland @KostyaEsmukov @johnnyreilly @LKay @DovydasNavickas @ssorallen
-/types/react-router/                            @sergey-buturlakin @mrk21 @vasek17 @ngbrown @awendland @KostyaEsmukov @johnnyreilly @LKay @DovydasNavickas @tkrotoff @huy-nguyen @grmiade @DaIgeb @egorshulga @neuoy
+/types/react-router/                            @sergey-buturlakin @mrk21 @vasek17 @ngbrown @awendland @KostyaEsmukov @johnnyreilly @LKay @DovydasNavickas @tkrotoff @huy-nguyen @grmiade @DaIgeb @egorshulga @neuoy @rraina
 /types/react-router-bootstrap/                  @vlesierse @LKay @olmobrutall
 /types/react-router-config/                     @lith-light-g
-/types/react-router-dom/                        @tkrotoff @huy-nguyen
-/types/react-router-native/                     @ezintz
+/types/react-router-dom/                        @tkrotoff @huy-nguyen @p-jackson
+/types/react-router-native/                     @ezintz @fhelwanger
 /types/react-router-navigation/                 @kaoDev
 /types/react-router-navigation-core/            @kaoDev
 /types/react-router-redux/v3/                   @isman-usoh @noah79 @rosendi
 /types/react-router-redux/v4/                   @isman-usoh @noah79 @rosendi @LKay @DovydasNavickas
-/types/react-router-redux/                      @huy-nguyen @8398a7
+/types/react-router-redux/                      @huy-nguyen @8398a7 @mykolas
 /types/react-s-alert/                           @mitsuruog
 /types/react-scroll/                            @sudoplz @GiedriusGrabauskas
 /types/react-scrollbar/                         @stephenjelfs
-/types/react-select/                            @Hesquibet @giladgray @iebaker @skirsdeda @vujevits @devrelm @MartynasZilinskas @onatm @ninjaferret @tehbi4 @misantronic
+/types/react-select/                            @Hesquibet @giladgray @iebaker @skirsdeda @vujevits @devrelm @MartynasZilinskas @onatm @ninjaferret @tehbi4 @misantronic @darkartur
 /types/react-side-effect/                       @remojansen
 /types/react-sidebar/                           @jeroenvervaeke
 /types/react-sketchapp/                         @ricokahler @DomiR
@@ -3234,7 +3305,8 @@
 /types/react-spinkit/v1/                        @tkqubo @mleko @pelotom
 /types/react-spinkit/                           @tkqubo @mleko @pelotom @zzanol
 /types/react-sticky/                            @curtisw0
-/types/react-stripe-elements/                   @dan-j @santiagodoldan @sonnysangha
+/types/react-stripe-elements/                   @dan-j @santiagodoldan @sonnysangha @9y5 @thchia
+/types/react-svg/                               @viccrubs
 /types/react-svg-pan-zoom/                      @huy-nguyen
 /types/react-swf/                               @stepancar
 /types/react-swipe/                             @DeividasBakanas
@@ -3265,7 +3337,7 @@
 /types/react-twitter-auth/                      @paulfasola
 /types/react-user-tour/                         @ccancellieri
 /types/react-virtual-keyboard/                  @bsurai
-/types/react-virtualized/                       @kaoDev @guntherjh @wasd171 @szabolcsx @kraenhansen
+/types/react-virtualized/                       @kaoDev @guntherjh @wasd171 @szabolcsx @kraenhansen @Stevearzh
 /types/react-virtualized-select/                @seansfkelley
 /types/react-weui/                              @tairan
 /types/react-widgets/                           @rogierschouten @sanyatuning @frodehansen2 @r3nya
@@ -3274,7 +3346,7 @@
 /types/reactable/                               @spielc
 /types/reactcss/                                @chrisgervang @LKay
 /types/reactstrap/v4/                           @alihammad @mfal @danilobjr @fabiopaiva
-/types/reactstrap/                              @alihammad @mfal @danilobjr @fabiopaiva @FaithForHumans @KurtPreston @kraenhansen @timc13
+/types/reactstrap/                              @alihammad @mfal @danilobjr @fabiopaiva @FaithForHumans @KurtPreston @timc13
 /types/read/                                    @timjk
 /types/read-chunk/                              @crispybee
 /types/read-package-tree/                       @mgroenhoff
@@ -3286,12 +3358,13 @@
 /types/readline-transform/                      @dex4er
 /types/reapop/                                  @Barrokgl
 /types/recase/                                  @18steps
-/types/recharts/                                @mthmulders @rapmue @royxue @ZheyangSong @richbai90
-/types/recompose/                               @iskandersierra @mrapogee @clayne11
+/types/recharts/                                @mthmulders @rapmue @royxue @ZheyangSong @richbai90 @caspeco-dan
+/types/recluster/                               @dex4er
+/types/recompose/                               @iskandersierra @mrapogee @clayne11 @Pajn
 /types/reconnectingwebsocket/                   @nguarracino
 /types/recursive-readdir/v1/                    @elisee
 /types/recursive-readdir/                       @elisee @MicahZoltu
-/types/redis/                                   @soywiz @CodeAnimal @MugeSo @UppaJung @Rokt33r @43081j
+/types/redis/                                   @soywiz @CodeAnimal @MugeSo @UppaJung @Rokt33r @43081j @barnski
 /types/redis-errors/                            @43081j
 /types/redis-mock/                              @BendingBender
 /types/redis-rate-limiter/                      @westy92
@@ -3315,7 +3388,7 @@
 /types/redux-first-router-link/                 @janb87
 /types/redux-form/v4/                           @aikoven
 /types/redux-form/v6/                           @carsonf @aikoven @LKay @bancek
-/types/redux-form/                              @carsonf @aikoven @LKay @bancek @alsiola @tehbi4
+/types/redux-form/                              @carsonf @aikoven @LKay @bancek @alsiola @tehbi4 @huwmartin
 /types/redux-immutable/                         @oizie @sebald @gavingregory
 /types/redux-immutable-state-invariant/         @remojansen @highflying
 /types/redux-infinite-scroll/                   @silkyfray
@@ -3338,6 +3411,7 @@
 /types/redux-storage/                           @asvetliakov
 /types/redux-storage-engine-jsurl/              @screendriver
 /types/redux-storage-engine-localstorage/       @screendriver
+/types/redux-test-utils/                        @huwmartin
 /types/redux-ui/                                @andyshuxin
 /types/ref/                                     @loyd
 /types/ref-array/                               @loyd
@@ -3380,7 +3454,7 @@
 /types/restler/                                 @cyrilschumacher
 /types/restling/                                @loghorn
 /types/resumablejs/                             @DanielMcAssey
-/types/rethinkdb/                               @alexgorbatchev
+/types/rethinkdb/                               @alexgorbatchev @AdrianFarmadin
 /types/retry/                                   @krenor
 /types/retry-as-promised/                       @Raigen
 /types/rev-hash/                                @ikatyang
@@ -3396,14 +3470,16 @@
 /types/riot/                                    @Stubb0rn
 /types/riot-api-nodejs/                         @zafixlrp
 /types/riot-games-api/                          @xstoudi
+/types/riot-route/                              @karak
 /types/riotcontrol/                             @chrootsu
 /types/riotjs/                                  @vvakame
 /types/rison/                                   @impworks
 /types/rivets/                                  @TrevorDev @matjanos
 /types/roads/                                   @dancespiele
+/types/roads-server/                            @dancespiele
 /types/rollup-plugin-json/                      @asmockler
 /types/ronomon__crypto-async/                   @BendingBender
-/types/rosie/                                   @abner @subvertallchris
+/types/rosie/                                   @abner @subvertallchris @abukurov
 /types/roslib/                                  @Pro @skycoop @dgorobopec
 /types/rot-js/                                  @atiaxi
 /types/route-parser/                            @ianks @bobbuehler
@@ -3448,7 +3524,7 @@
 /types/saml20/                                  @HackerUndKoch
 /types/samlp/                                   @horiuchi
 /types/sammy/                                   @borisyankov @oising
-/types/sanctuary/                               @davidchambers @cortopy
+/types/sanctuary/                               @davidchambers @cortopy @piq9117
 /types/sandboxed-module/                        @svi3c
 /types/sane/                                    @BendingBender
 /types/sanitize-filename/                       @Nemo157
@@ -3472,8 +3548,10 @@
 /types/scryptsy/                                @micksatana
 /types/seamless/                                @danmana
 /types/seamless-immutable/                      @alex3165 @xsburg @geirsagberg
+/types/seededshuffle/                           @urish
 /types/seedrandom/                              @kernhanda
 /types/segment-analytics/                       @fongandrew
+/types/select2/v3/                              @borisyankov
 /types/select2/                                 @borisyankov
 /types/selectables/                             @renjfk
 /types/selectize/                               @adidahiya @naBausch
@@ -3506,9 +3584,9 @@
 /types/semver-diff/                             @chrismbarr
 /types/sencha_touch/                            @brian428
 /types/send/                                    @MikeJerred
-/types/seneca/                                  @psnider
+/types/seneca/                                  @psnider @kevynb
 /types/sequelize/v3/                            @samuelneff @codeanimal @drinchev @morpheusxaut @torhal
-/types/sequelize/                               @samuelneff @codeanimal @drinchev @babolivier @kukoo1 @oktapodia @morpheusxaut @TitaneBoy @zjy01 @nidzov @Raigen @todd
+/types/sequelize/                               @samuelneff @codeanimal @drinchev @babolivier @kukoo1 @oktapodia @morpheusxaut @TitaneBoy @zjy01 @nidzov @Raigen @todd @nrschultz
 /types/sequelize-fixtures/                      @cschwarz
 /types/sequencify/                              @npenin
 /types/sequester/                               @Strate
@@ -3522,6 +3600,7 @@
 /types/session-file-store/                      @blendsdk @rokt33r
 /types/set-cookie-parser/                       @nickp10
 /types/set-value/                               @DanielRosenwasser
+/types/settings/                                @shreyjain1994
 /types/sha1/                                    @arcdev1
 /types/shallowequal/                            @seansfkelley
 /types/shapefile/                               @DenisCarriere
@@ -3539,7 +3618,7 @@
 /types/shortid/                                 @stpettersens @despairblue
 /types/shot/                                    @AJamesPhillips
 /types/should-sinon/                            @Arylo
-/types/showdown/                                @cbowdon @tan9
+/types/showdown/                                @cbowdon @tan9 @arielsaldana
 /types/shrink-ray/                              @forabi
 /types/siema/                                   @Irmiz @0x6368656174 @samnau
 /types/siesta/                                  @bquarmby
@@ -3556,6 +3635,7 @@
 /types/simple-oauth2/                           @mad-mike
 /types/simple-peer/                             @tlaziuk
 /types/simple-url-cache/                        @a-lucas
+/types/simple-websocket/                        @dex4er
 /types/simple-xml/                              @notVitaliy
 /types/simplebar/v1/                            @gregonnet @leonard-thieu
 /types/simplebar/                               @gregonnet @leonard-thieu
@@ -3566,7 +3646,7 @@
 /types/sinon/                                   @mrbigdog2u @rationull @lumaxis @nicojs @43081j
 /types/sinon-as-promised/                       @igrayson
 /types/sinon-chai/                              @kazimanzurrashid @jedmao
-/types/sinon-chrome/                            @pimterry @crimx
+/types/sinon-chrome/                            @pimterry @crimx @kobanyan
 /types/sinon-express-mock/                      @jpchip @tlaziuk
 /types/sinon-mongoose/                          @stevehipwell
 /types/sinon-stub-promise/                      @vintem @tstackhouse
@@ -3614,6 +3694,7 @@
 /types/sort-array/                              @mrmlnc
 /types/sortablejs/                              @Maw-Fox
 /types/soundmanager2/                           @elton2048
+/types/soupbintcp/                              @jewbre
 /types/source-list-map/                         @e-cloud
 /types/source-map-support/                      @Bartvds @jason0x43
 /types/space-pen/                               @vvakame
@@ -3638,7 +3719,7 @@
 /types/sprintf/                                 @soywiz @BendingBender
 /types/sprintf-js/                              @jasonswearingen @BendingBender
 /types/sql.js/                                  @Hozuki
-/types/sqlite3/                                 @nmalaguti @dpyro
+/types/sqlite3/                                 @nmalaguti @dpyro @BehindTheMath
 /types/sqlstring/                               @marvinhagemeister
 /types/squirejs/                                @bradleyayers
 /types/srp/                                     @Patman64
@@ -3660,7 +3741,11 @@
 /types/statuses/                                @tkrotoff @BendingBender
 /types/std-mocks/                               @jdxcode
 /types/steam/                                   @kant2002
+/types/steam-client/                            @Slessi
+/types/steam-totp/                              @phenomax
+/types/steamid/                                 @Slessi
 /types/steed/                                   @Paul-Isache
+/types/stellar-sdk/                             @carl-foster @tristonj
 /types/stemmer/                                 @will-ockmore
 /types/sticky-cluster/                          @paustint
 /types/stompjs/                                 @jimic @Dr4k4n
@@ -3681,9 +3766,11 @@
 /types/stream-series/                           @k-kagurazaka
 /types/stream-to-array/v0/                      @Bartvds
 /types/stream-to-array/                         @Bartvds @BendingBender
+/types/stream-to-promise/                       @Alorel
 /types/streaming-json-stringify/                @BendingBender
 /types/streamjs/                                @erosb
 /types/strftime/                                @cyrilschumacher
+/types/strict-uri-encode/                       @hoishin
 /types/string/                                  @basp
 /types/string-hash/                             @ethanrubio
 /types/string-similarity/                       @ragtime
@@ -3693,7 +3780,7 @@
 /types/strip-ansi/                              @mhegazy
 /types/strip-bom/                               @mhegazy
 /types/strip-json-comments/                     @dmoonfire
-/types/stripe/                                  @wjohnsto @codeanimal @sampsonjoliver @LinusU @brannon @kkamperschroer @starhoshi
+/types/stripe/                                  @wjohnsto @codeanimal @sampsonjoliver @LinusU @brannon @kkamperschroer @starhoshi @bruun
 /types/stripe-checkout/                         @cgwrench
 /types/stripe-v2/                               @ejsmith @amritk @adamcmiel @jleider @galuszkak
 /types/stripe-v3/                               @ejsmith @amritk @adamcmiel @jleider @galuszkak
@@ -3709,7 +3796,7 @@
 /types/succinct/                                @EnableSoftware
 /types/sudo-block/                              @BendingBender
 /types/suitescript/                             @darrenhillconsulting
-/types/sumo-logger/                             @forabi
+/types/sumo-logger/                             @forabi @clementallen
 /types/superagent/v2/                           @varju @NicoZelaya @mxl
 /types/superagent/                              @NicoZelaya @mxl @paplorinc @shreyjain1994
 /types/superagent-no-cache/                     @mxl
@@ -3729,6 +3816,7 @@
 /types/swag/                                    @shiwano
 /types/swagger-express-middleware/              @alexandreroba
 /types/swagger-express-mw/                      @micmro
+/types/swagger-express-validator/               @pinguet62
 /types/swagger-hapi/                            @micmro
 /types/swagger-jsdoc/                           @drGrove
 /types/swagger-node-runner/                     @micmro
@@ -3755,6 +3843,7 @@
 /types/tabris-plugin-firebase/                  @eclipsesource
 /types/tabtab/                                  @vojtechhabarta
 /types/tabulator/                               @euginio
+/types/tapable/v0/                              @e-cloud
 /types/tapable/                                 @e-cloud
 /types/tape/                                    @Bartvds @sodatea @DennisSchwartz @mikehenrty
 /types/tar/                                     @SomaticIT @connor4312
@@ -3775,6 +3864,7 @@
 /types/text-buffer/                             @GlenCFL
 /types/text-encoding/                           @pine613
 /types/text-encoding-utf-8/                     @trxcllnt
+/types/textarea-caret/                          @shiftkey
 /types/three/                                   @gyohk @florentpoujol @SereznoKot @omni360 @ivoisbelongtous @piranha771 @qszhusightp @nakakura @s093294 @Pro @efokschaner @PsychoSTS @dhritzkiv @apurvaojas
 /types/thrift/                                  @kamek-pf @kevin-greene-ck @jessezhang91
 /types/throng/                                  @cyrilschumacher @tatethurston
@@ -3792,6 +3882,7 @@
 /types/timer-machine/                           @dolanmiu
 /types/timezone-js/                             @bonnici
 /types/tinder/                                  @pingec
+/types/tiny-slider-react/                       @screendriver
 /types/tinycolor2/                              @M-Zuber @geertjansen @nvh
 /types/tinycopy/                                @vvatanabe
 /types/tinymce/                                 @martinduparc @ipoul @nicohartto
@@ -3806,7 +3897,7 @@
 /types/toastr/                                  @borisyankov
 /types/tocktimer/                               @evanshortiss
 /types/tooltipster/                             @stephenlautier @pjmagee @VorobeY1326 @leonard-thieu @janhi @joeskeen
-/types/topojson/                                @ricardo-mello @chenzhutian
+/types/topojson/                                @ricardo-mello @chenzhutian @denisname
 /types/torrent-stream/                          @xstoudi
 /types/touch/                                   @mizunashi-mana @BendingBender
 /types/touch-events/                            @kevinb7
@@ -3815,13 +3906,14 @@
 /types/tracking/                                @pimterry
 /types/transducers-js/                          @colinkahn @dphilipson @NaridaL
 /types/transducers.js/                          @dphilipson
-/types/trash/                                   @matthew-matvei
+/types/trash/                                   @matthew-matvei @hoishin
 /types/traverse/                                @newclear
 /types/traverson/                               @marcinporebski
 /types/trayballoon/                             @korve
 /types/tress/                                   @sindilevich
 /types/trim/                                    @skysteve
 /types/trunk8/                                  @niemyjski
+/types/tryer/                                   @bengry
 /types/tspromise/                               @soywiz
 /types/tunnel/                                  @BendingBender
 /types/tus-js-client/                           @kevhiggins
@@ -3847,9 +3939,11 @@
 /types/typescript-deferred/                     @DirtyHairy
 /types/tz-format/                               @samverschueren
 /types/ua-parser-js/                            @superduper @legendecas @MeLlamoPablo
-/types/uglify-js/                               @tkrotoff
+/types/uglify-js/v2/                            @tkrotoff
+/types/uglify-js/                               @alan-agius4 @tkrotoff
 /types/uglifycss/                               @blendsdk
-/types/ui-grid/                                 @btesser @joeskeen
+/types/uglifyjs-webpack-plugin/                 @vajkayrene
+/types/ui-grid/                                 @btesser @joeskeen @pbojanczyk
 /types/ui-router-extras/                        @mputters @marcel-k @LaserUnicorns
 /types/ui-select/                               @nkovacic
 /types/uid-safe/                                @geoffreak
@@ -3858,7 +3952,7 @@
 /types/ultra-strftime/                          @dex4er
 /types/umbraco/                                 @DeCareSystemsIreland
 /types/umd/                                     @TeamworkGuy2
-/types/umzug/                                   @drinchev @mlamp
+/types/umzug/                                   @drinchev @mlamp @trodi
 /types/underscore/                              @borisyankov @jbaldwin @ccurrens @clottman
 /types/underscore-ko/                           @MagicMau
 /types/underscore.string/                       @rygine
@@ -3878,7 +3972,7 @@
 /types/unzip/                                   @coding2012
 /types/unzipper/                                @s73obrien
 /types/update-notifier/v1/                      @vvakame @nchen63
-/types/update-notifier/                         @vvakame @nchen63
+/types/update-notifier/                         @vvakame @nchen63 @bitjson
 /types/upng-js/                                 @plantain-00
 /types/uppercamelcase/                          @plantain-00
 /types/urbanairship-cordova/                    @Justin-Credible
@@ -3909,13 +4003,13 @@
 /types/uuid-1345/                               @mugeso
 /types/uuid-js/                                 @mhegazy
 /types/uuid-validate/                           @HiromiShikata
-/types/uws/                                     @plantain-00
+/types/uws/                                     @plantain-00 @orblazer
 /types/valdr/                                   @ilbertz
 /types/valdr-message/                           @ilbertz
 /types/valerie/                                 @conficient
 /types/vali-date/                               @SamVerschueren
 /types/valid-url/                               @stevehipwell
-/types/validator/                               @tgfjt @chrootsu @IOAyman @louy @kacepe @deptno
+/types/validator/                               @tgfjt @chrootsu @IOAyman @louy @kacepe @deptno @builtinnya
 /types/validatorjs/                             @LKay @danmana
 /types/vanilla-modal/                           @samnau
 /types/vanilla-tilt/                            @BrunnerLivio
@@ -3963,6 +4057,7 @@
 /types/w2ui/                                    @Ptival
 /types/w3c-generic-sensor/                      @kenchris
 /types/w3c-image-capture/                       @cosium
+/types/w3c-permissions/                         @jberube
 /types/w3c-screen-orientation/                  @kenchris
 /types/w3c-web-usb/                             @larsgk
 /types/waitme/                                  @totpero
@@ -3987,12 +4082,14 @@
 /types/webcl/                                   @NCARalph
 /types/webcomponents.js/                        @adidahiya
 /types/webcrypto/                               @iislucas
-/types/webdriverio/                             @nmalaguti @timbru31 @fsmedberg-tc @tanvirislam06
+/types/webdriverio/                             @nmalaguti @timbru31 @fsmedberg-tc @tanvirislam06 @phil-lgr
 /types/webfontloader/                           @doskallemaskin
 /types/webgl-ext/                               @zenmumbler
 /types/webgl2/                                  @nkemnitz
+/types/webidl2/                                 @saschanaz
 /types/webmidi/                                 @lostfictions
-/types/webpack/                                 @tkqubo @bumbleblym @bcherny @tommytroylin @mohsen1 @jcreamer898 @ahmed-taj @alan-agius4 @elliottsj @jason0x43
+/types/webpack/v3/                              @tkqubo @bumbleblym @bcherny @tommytroylin @mohsen1 @jcreamer898 @ahmed-taj @alan-agius4 @elliottsj @jason0x43
+/types/webpack/                                 @tkqubo @bumbleblym @bcherny @tommytroylin @mohsen1 @jcreamer898 @ahmed-taj @alan-agius4 @elliottsj @jason0x43 @dennispg
 /types/webpack-bundle-analyzer/                 @kryops
 /types/webpack-chain/                           @eirikurn @psachs21
 /types/webpack-chunk-hash/                      @mtraynham
@@ -4020,7 +4117,7 @@
 /types/webvr-api/                               @lostfictions
 /types/week/                                    @sindrenm
 /types/weighted/                                @ccitro
-/types/weixin-app/                              @taoqf
+/types/weixin-app/                              @taoqf @AlexStacker
 /types/wellknown/                               @yairtawil
 /types/whatwg-streams/                          @saschanaz
 /types/wheel/                                   @BTOdell
@@ -4039,19 +4136,22 @@
 /types/winrt-uwp/                               @saschanaz @taylor224
 /types/winston/                                 @bonnici @codeanimal @DABH
 /types/winston-dynamodb/                        @nickiannone
+/types/winston-syslog/                          @cjbarth
 /types/wiring-pi/                               @NoHomey
 /types/wnumb/                                   @acoreyj
 /types/wonder.js/                               @yyc-git
 /types/word-list-json/                          @dovidm
 /types/wordcloud/                               @joeskeen
 /types/words-to-numbers/                        @James-Frowen
+/types/wpapi/                                   @guoyunhe
+/types/wrap-ansi/v2/                            @kayahr
 /types/wrap-ansi/                               @kayahr
 /types/wreck/                                   @marcinporebski
 /types/wrench/                                  @soywiz
 /types/write-file-atomic/                       @BendingBender
 /types/write-json-file/                         @DenisCarriere
 /types/write-pkg/                               @azasypkin
-/types/ws/                                      @loyd @elithrar @mlamp @TitaneBoy
+/types/ws/                                      @loyd @elithrar @mlamp @TitaneBoy @orblazer
 /types/wtfnode/                                 @dex4er
 /types/wu/                                      @phiresky
 /types/wx-js-sdk-dt/                            @agasbzj
@@ -4086,6 +4186,7 @@
 /types/yargs/                                   @poelstra @mizunashi-mana @pushplay @jeffkenney @JimiC
 /types/yauzl/                                   @ffflorian
 /types/yayson/                                  @Codesleuth
+/types/yazl/                                    @taoqf
 /types/ydn-db/                                  @yathit @gabrielmaldi
 /types/yeoman-generator/                        @armorik83 @janslow @ikatyang
 /types/yeoman-test/                             @ikatyang

From fee7a9e1164a689ed514f716260b8e8c78e41b63 Mon Sep 17 00:00:00 2001
From: Andy <anhans@microsoft.com>
Date: Mon, 9 Apr 2018 11:57:57 -0700
Subject: [PATCH 1147/1382] Update CODEOWNERS (#24849)

---
 .github/CODEOWNERS | 89 ++++++++++++++++++++++++++++++++--------------
 1 file changed, 62 insertions(+), 27 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 7182a5462f..f3343415f0 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -41,7 +41,7 @@
 /types/adm-zip/                                 @jvilk @abner
 /types/adone/                                   @s0m3on3 @maxveres
 /types/aframe/                                  @devpaul @bertoritger
-/types/agenda/                                  @meirgottlieb
+/types/agenda/                                  @meirgottlieb @princjef
 /types/aggregate-error/                         @BendingBender
 /types/alertify/                                @jjeffery
 /types/alexa-sdk/                               @petebeegle @hoo29 @pascalwhoop @blforce @rk-7 @alexmalcoci
@@ -51,6 +51,8 @@
 /types/alt/                                     @Shearerbeard
 /types/amazon-product-api/                      @MattiLehtinen @alien35
 /types/amcharts/                                @ldrick
+/types/amp/                                     @jewbre
+/types/amp-message/                             @jewbre
 /types/amphtml-validator/                       @kevincharm
 /types/amplify/                                 @joeriks
 /types/amplify-deferred/                        @joeriks @laurentiustamate94
@@ -186,7 +188,7 @@
 /types/async-cache/                             @BendingBender
 /types/async-lock/                              @elisee @afharo @rhymmor
 /types/async-polling/                           @Goldsmith42
-/types/async-retry/                             @albertywu
+/types/async-retry/                             @albertywu @MeLlamoPablo
 /types/async.nexttick/                          @pyrho
 /types/asynciterator/                           @rubensworks
 /types/atlaskit__button/                        @dijimsta
@@ -211,7 +213,7 @@
 /types/autosuggest-highlight/                   @senukartur
 /types/awesomplete/                             @webbiesdk @bmdixon @tbekolay
 /types/aws-iot-device-sdk/                      @niik @mlamp
-/types/aws-lambda/                              @skarum @tobyhede @buggy @y13i @wwwy3y3 @OrthoDex @MichaelMarner @daniel-cottone @kostya-misura @coderbyheart @palmithor @daniloraisi @simonbuchan @Haydabase
+/types/aws-lambda/                              @skarum @tobyhede @buggy @y13i @wwwy3y3 @OrthoDex @MichaelMarner @daniel-cottone @kostya-misura @coderbyheart @palmithor @daniloraisi @simonbuchan @Haydabase @repl-chris
 /types/aws-serverless-express/                  @threesquared @jcaffey @mattmeye @albertovasquez
 /types/aws4/                                    @ajcrites
 /types/axel/                                    @ruslan-molodyko
@@ -375,7 +377,7 @@
 /types/byline/                                  @reppners
 /types/bytebuffer/                              @cappellin
 /types/bytes/                                   @danny8002 @believer
-/types/c3/                                      @mcliment @gerinjacob @denyo @dmitryshindin
+/types/c3/                                      @mcliment @gerinjacob @denyo @dmitryshindin @timn
 /types/cache-manager/                           @GausSim
 /types/cal-heatmap/                             @RetroChrisB
 /types/callsite/                                @newclear
@@ -396,8 +398,7 @@
 /types/caseless/                                @downace @mastermatt
 /types/cash/                                    @akvlko
 /types/casperjs/                                @jedmao @urielch
-/types/cassandra-driver/                        @Svjard
-/types/catalog/                                 @grossbart @wereHamster
+/types/cassandra-driver/                        @Svjard @pc-jedi
 /types/catbox/v7/                               @jasonswearingen @AJamesPhillips
 /types/catbox/                                  @jasonswearingen @AJamesPhillips @saboya
 /types/cbor/                                    @pushplay
@@ -451,6 +452,9 @@
 /types/clean-stack/                             @BendingBender
 /types/clean-webpack-plugin/                    @j-f1
 /types/clear-require/                           @dan-j
+/types/clearbladejs-client/                     @ClearBlade
+/types/clearbladejs-node/                       @ClearBlade
+/types/clearbladejs-server/                     @ClearBlade
 /types/cleave.js/                               @clentfort @jasongi-at-sportsbet @sashashakun
 /types/cli/                                     @kayahr
 /types/cli-color/                               @ChaosinaCan
@@ -494,6 +498,7 @@
 /types/cometd/                                  @derekcicerone
 /types/command-line-args/                       @CzBuCHi
 /types/command-line-commands/                   @CzBuCHi
+/types/command-line-usage/                      @Dvorsky
 /types/commangular/                             @hiraash
 /types/comment-json/                            @Jason3S
 /types/common-tags/                             @zuzusik @tzupengwang
@@ -592,7 +597,7 @@
 /types/createjs-lib/                            @evilangelist @gyohk
 /types/credential/                              @phuvo
 /types/credit-card-type/                        @LKay
-/types/cron/                                    @horiuchi
+/types/cron/                                    @horiuchi @winup
 /types/cropperjs/                               @stepancar
 /types/croppie/                                 @connor4312 @dklmuc @sarunint
 /types/cross-spawn/                             @Alorel
@@ -681,7 +686,9 @@
 /types/datadog-metrics/                         @pushplay
 /types/datadog-tracer/                          @dineshsaravanan
 /types/datatables.net/                          @Silver-Connection @omidkrad @pragmatrix @CNBoland
+/types/datatables.net-autofill/                 @andy-maca
 /types/datatables.net-buttons/                  @Silver-Connection @SammyG4Free @jimhartford
+/types/datatables.net-colreorder/               @andy-maca
 /types/datatables.net-fixedheader/              @szechyjs @Silver-Connection
 /types/datatables.net-rowgroup/                 @maixiu
 /types/datatables.net-rowreorder/               @baywet
@@ -744,12 +751,13 @@
 /types/dhtmlxscheduler/                         @mkozhukh
 /types/di-lite/                                 @dcrusader
 /types/diacritics/                              @otociulis
-/types/diff/                                    @vvakame
+/types/diff/                                    @vvakame @szdc
 /types/diff2html/                               @rtfpessoa
 /types/dir-resolve/                             @andy-ms
 /types/discontinuous-range/                     @OiCMudkips
 /types/dispatchr/                               @Ragg-
 /types/disposable-email-domains/                @geoffreak
+/types/dnssd/                                   @angelmerino
 /types/doccookies/                              @jonegerton
 /types/dockerode/                               @seikho @nlaplante @isac322 @lazarusx @meisenzahl @thegecko
 /types/docopt/                                  @giggio
@@ -774,6 +782,7 @@
 /types/dotenv/v2/                               @jussikinnula @borekb @enaeseth
 /types/dotenv/                                  @jussikinnula @borekb @enaeseth
 /types/dotenv-safe/                             @krenor
+/types/dotenv-webpack/                          @karol-majewski
 /types/dotfile-regex/                           @mrmlnc
 /types/dottie/                                  @domarmstrong
 /types/double-ended-queue/                      @dsagal
@@ -849,7 +858,7 @@
 /types/elm/                                     @thSoft
 /types/email-templates/                         @cyrilschumacher @gurisko @blankstar85
 /types/ember/v1/                                @jedmao
-/types/ember/                                   @jedmao @bttf @dwickern @chriskrycho @theroncross @mfeckie
+/types/ember/                                   @jedmao @bttf @dwickern @chriskrycho @theroncross @mfeckie @alexlafroscia
 /types/ember-data/                              @dwickern @mike-north @chriskrycho
 /types/ember-feature-flags/                     @tansongyang
 /types/ember-mocha/                             @dwickern
@@ -890,6 +899,7 @@
 /types/es6-weak-map/                            @pine
 /types/escape-html/                             @elisee
 /types/escape-latex/                            @olsio
+/types/escape-regexp/                           @jewbre
 /types/escape-string-regexp/                    @kruncher @faergeek
 /types/escodegen/                               @simondel
 /types/eslint/                                  @pmdartus @j-f1
@@ -926,6 +936,7 @@
 /types/exit-hook/                               @BendingBender
 /types/exorcist/                                @TeamworkGuy2
 /types/expect/                                  @jmreidy @merrywhether
+/types/expect-puppeteer/                        @JoshuaKGoldberg
 /types/expect.js/                               @teppeis
 /types/expectations/                            @vvakame
 /types/expo/v23/                                @KonstantinKai
@@ -945,12 +956,13 @@
 /types/express-ejs-layouts/                     @erikma
 /types/express-enforces-ssl/                    @kevinstubbs
 /types/express-fileupload/                      @Naktibalda
+/types/express-flash/                           @iMobs
 /types/express-flash-2/                         @mathsalmi
 /types/express-flash-notification/              @Mister4Eyes
 /types/express-formidable/                      @tdolsen @evanshortiss
 /types/express-graphql/                         @isman-usoh @nitintutlani @hubel @zya @mlamp @firede
 /types/express-handlebars/                      @stpettersens @yhaskell
-/types/express-jwt/                             @wokim @kacepe @Sl1MBoy
+/types/express-jwt/                             @wokim @kacepe @Sl1MBoy @milan-mimra
 /types/express-less/                            @xieyubo
 /types/express-minify/                          @borislavjivkov
 /types/express-mongo-sanitize/                  @ericbyers
@@ -977,7 +989,7 @@
 /types/eyes/                                    @brynbellomy
 /types/ez-plus/                                 @AndersonFriaca
 /types/f1/                                      @neolwc
-/types/fabric/                                  @oklemencic @joewashear007 @mrand01 @NotWoods
+/types/fabric/                                  @oklemencic @joewashear007 @mrand01 @NotWoods @bmartinson
 /types/facebook-instant-games/                  @menushka
 /types/facebook-js-sdk/                         @amritk
 /types/facebook-pixel/                          @noctishsu
@@ -999,6 +1011,7 @@
 /types/fastclick/                               @shinnn
 /types/favico.js/                               @drowse314-dev-ymat
 /types/fb/                                      @JoshStrobl
+/types/fb-watchman/                             @whtsky
 /types/fbemitter/                               @kmxz
 /types/featherlight/                            @xStrom
 /types/feathersjs__authentication/              @AbraaoAlves @j2L4e
@@ -1285,6 +1298,7 @@
 /types/git-config/                              @stpettersens
 /types/git-remote-origin-url/                   @janslow
 /types/github-username-regex/                   @BehindTheMath
+/types/gitlab/                                  @yanqing6628780 @Arylo
 /types/gl-matrix/                               @mattijskneppers @tatchx @nbabanov @auzmartist @surtr-isaz
 /types/gldatepicker/                            @qcz
 /types/glidejs/                                 @milanjaros
@@ -1624,6 +1638,7 @@
 /types/istanbul-reports/                        @jason0x43
 /types/ityped/                                  @DanielRosenwasser
 /types/ix.js/                                   @Igorbek
+/types/jackrabbit/                              @elvisvoer
 /types/jade/                                    @panuhorsmalahti
 /types/jalaali-js/                              @alitaheri
 /types/japanese-holidays/                       @syamatoo
@@ -1654,11 +1669,14 @@
 /types/jest/                                    @NoHomey @jwbay @asvetliakov @alexjoverm @epicallan @ikatyang @wsmd @JamieMason @douglasduteil @AhnpGit @joshuakgoldberg @bradleyayers
 /types/jest-diff/                               @myabc
 /types/jest-docblock/                           @ikatyang
+/types/jest-environment-puppeteer/              @joshuakgoldberg
 /types/jest-get-type/                           @myabc
+/types/jest-image-snapshot/                     @dawnmist
 /types/jest-in-case/                            @geovanisouza92
 /types/jest-json-schema/                        @deadNightTiger
 /types/jest-matcher-utils/                      @myabc
 /types/jest-matchers/                           @joscha
+/types/jest-specific-snapshot/                  @dawnmist
 /types/jest-validate/                           @ikatyang
 /types/jfs/                                     @tlaziuk
 /types/jjv/                                     @Nemo157
@@ -1682,8 +1700,10 @@
 /types/jquery-awesome-cursor/                   @zskovacs
 /types/jquery-backstretch/                      @dkulyk
 /types/jquery-countdown/                        @AndersonFriaca
+/types/jquery-countto/                          @AndersonFriaca
 /types/jquery-cropbox/                          @PerKastman
 /types/jquery-deparam/                          @patsissons
+/types/jquery-drawer/                           @pine
 /types/jquery-easy-loading/                     @delphinus35
 /types/jquery-editable-select/                  @baywet
 /types/jquery-fullscreen/                       @bgrieder
@@ -1827,6 +1847,7 @@
 /types/json2md/                                 @MartynasZilinskas
 /types/jsonata/                                 @nick121212
 /types/jsoneditor/                              @alejo90
+/types/jsoneditor-for-react/                    @joshuakgoldberg
 /types/jsoneditoronline/                        @vbortone
 /types/jsonfile/                                @dbowring
 /types/jsonminify/                              @no23reason
@@ -1846,7 +1867,7 @@
 /types/jsreport-phantom-pdf/                    @taoqf
 /types/jsreport-xlsx/                           @taoqf
 /types/jsrp/                                    @harryshipton
-/types/jss/                                     @appsforartists @kof
+/types/jss/                                     @appsforartists @kof @pelotom
 /types/jssha/                                   @randombk @SrTobi
 /types/jstimezonedetect/                        @olamothe
 /types/jstorage/                                @dflor003
@@ -2359,6 +2380,7 @@
 /types/mailcheck/                               @pocesar
 /types/maildev/                                 @cyrilschumacher @zbarbuto
 /types/mailgen/                                 @vothanhkiet @jordanfarrer
+/types/mailgun-js/                              @sampsonjoliver
 /types/mailparser/                              @psnider
 /types/main-bower-files/                        @k-kagurazaka
 /types/make-dir/                                @ikatyang @BendingBender
@@ -2469,7 +2491,7 @@
 /types/minimatch/                               @vvakame @shantmarouti
 /types/minimist/                                @Bartvds @Necroskillz @kamranayub
 /types/minimist-options/                        @ikatyang
-/types/minio/                                   @barinbritva
+/types/minio/                                   @barinbritva @castorw
 /types/minipass/                                @BendingBender
 /types/mirrorx/                                 @aaronphy
 /types/mithril/                                 @spacejack @andraaspar @isiahmeadows
@@ -2506,7 +2528,7 @@
 /types/moment-timezone/                         @michelsalib @alanblins
 /types/mongo-sanitize/                          @CedricCazin
 /types/mongodb/v2/                              @CaselIT @alanmarcell @kikar @bitjson @dante-101 @mcortesi
-/types/mongodb/                                 @CaselIT @alanmarcell @kikar @bitjson @dante-101 @mcortesi @EnricoPicci @AJCStriker
+/types/mongodb/                                 @CaselIT @alanmarcell @kikar @bitjson @dante-101 @mcortesi @EnricoPicci @AJCStriker @julien-c
 /types/mongoose/v4/                             @simonxca @horiuchi @sindrenm @lukasz-zak
 /types/mongoose/                                @horiuchi @sindrenm @lukasz-zak @Alorel @jendrikw @ethanresnick @vologab
 /types/mongoose-auto-increment/                 @AyaMorisawa
@@ -2557,6 +2579,7 @@
 /types/mysql/                                   @wjohnsto @kacepe @kpping @jdmunro
 /types/mz/                                      @ThomasHickman
 /types/n3/                                      @phreed
+/types/named-regexp-groups/                     @jewbre
 /types/nano/                                    @timjacobi @vincekovacs
 /types/nanoajax/                                @nathancahill
 /types/nanoid/                                  @bash
@@ -2615,7 +2638,7 @@
 /types/nightmare/                               @horiuchi @samyang-au @Bleser92
 /types/nightwatch/                              @rkavalap @schlesiger
 /types/nivo-slider/                             @AndersonFriaca
-/types/noble/                                   @swook @wind-rider @shantanubhadoria @lukel99 @bioball @keton
+/types/noble/                                   @swook @wind-rider @shantanubhadoria @lukel99 @bioball @keton @thegecko
 /types/nock/                                    @bonnici @horiuchi @afharo @mastermatt @damour
 /types/nodal/                                   @charrondev
 /types/node/v4/                                 @eps1lon
@@ -2639,7 +2662,7 @@
 /types/node-gcm/                                @horiuchi
 /types/node-geocoder/                           @rosek86
 /types/node-getopt/                             @kcauchy
-/types/node-hid/                                @mhegazy @ert78gb
+/types/node-hid/                                @mhegazy @ert78gb @thegecko
 /types/node-horseman/                           @apratheek
 /types/node-hue-api/                            @fjmorel
 /types/node-int64/                              @x3cion @kevin-greene-ck
@@ -2743,7 +2766,8 @@
 /types/onoff/                                   @marcel-ernst
 /types/open/                                    @Bartvds
 /types/opener/                                  @tikurahul
-/types/openfin/                                 @chrisbarker
+/types/openfin/v17/                             @chrisbarker
+/types/openfin/                                 @chrisbarker @rdepena
 /types/openjscad/                               @danmarshall
 /types/openlayers/v2/                           @bolhovsky
 /types/openlayers/v3/                           @osechet @matthiasdailey-ccri
@@ -2860,6 +2884,7 @@
 /types/path-exists/v1/                          @shiwano
 /types/path-exists/                             @shiwano @BendingBender
 /types/path-is-absolute/                        @mhegazy
+/types/path-is-inside/                          @aomarks
 /types/pathfinding/                             @BNedry
 /types/pathjs/                                  @lokeshpeta
 /types/pathwatcher/                             @GlenCFL
@@ -3034,7 +3059,7 @@
 /types/pvutils/                                 @microshine
 /types/python-shell/                            @dolanmiu @WORMSS
 /types/q/v0/                                    @bnemetchek @johnnyreilly
-/types/q/                                       @bnemetchek @AndrewGaspar @johnnyreilly @mboudreau
+/types/q/                                       @bnemetchek @AndrewGaspar @johnnyreilly @mboudreau @TeamworkGuy2
 /types/q-io/                                    @Bartvds
 /types/q-retry/                                 @vilic
 /types/qhistory/                                @Kovensky
@@ -3091,7 +3116,7 @@
 /types/rdf-data-model/                          @rubensworks
 /types/rdf-js/                                  @rubensworks
 /types/react/v15/                               @bbenezech @pzavolinsky @digiguru @ericanderson @morcerf @tkrotoff @DovydasNavickas @onigoetz
-/types/react/                                   @johnnyreilly @bbenezech @pzavolinsky @digiguru @ericanderson @morcerf @tkrotoff @DovydasNavickas @onigoetz @richseviora @theruther4d @guilhermehubner @joshuakgoldberg
+/types/react/                                   @johnnyreilly @bbenezech @pzavolinsky @digiguru @ericanderson @morcerf @tkrotoff @DovydasNavickas @onigoetz @theruther4d @guilhermehubner @joshuakgoldberg @jrakotoharisoa
 /types/react-alert/                             @ssyrell
 /types/react-alice-carousel/                    @endigo
 /types/react-app/                               @prakarshpandey
@@ -3101,7 +3126,7 @@
 /types/react-beautiful-dnd/                     @varHarrie @bradleyayers @paustint
 /types/react-big-calendar/                      @piotrwitek @paustint @pikpok
 /types/react-body-classname/                    @mhegazy
-/types/react-bootstrap/                         @walkerburgin @vsiao @danilojrr @Batbold-Gansukh @octatone @chengsieuly @mretolaza @katbusch @vitosamson @LKay @aaronbeall
+/types/react-bootstrap/                         @walkerburgin @vsiao @danilojrr @Batbold-Gansukh @octatone @chengsieuly @mretolaza @katbusch @vitosamson @LKay @aaronbeall @jrakotoharisoa
 /types/react-bootstrap-date-picker/             @LKay @ssi-hu-antal-bodnar
 /types/react-bootstrap-daterangepicker/         @ianks
 /types/react-bootstrap-table/v2/                @flaub @alelode @UJosue10
@@ -3198,8 +3223,9 @@
 /types/react-lazyload/                          @m0a
 /types/react-leaflet/                           @danzel @davschne @yuit
 /types/react-list/                              @buptyyf @tomshen
-/types/react-loadable/                          @Kovensky @odensc @ianks @tlaziuk
+/types/react-loadable/                          @Kovensky @odensc @ianks @tlaziuk @iMobs
 /types/react-loader/                            @artfuldev
+/types/react-mailchimp-subscribe/               @osdiab
 /types/react-map-gl/                            @rimig
 /types/react-maskedinput/                       @LKay @lavoaster @CarlosBonetti
 /types/react-mce/                               @morphologue
@@ -3210,7 +3236,8 @@
 /types/react-monaco-editor/                     @jnetterf
 /types/react-motion/                            @stepancar @asvetliakov @dimitarnestorov
 /types/react-motion-slider/                     @asvetliakov
-/types/react-native/                            @alloy @huhuanming @iRoachie @timwangdev @kamal @nelyousfi @alexdunne
+/types/react-native/                            @alloy @huhuanming @iRoachie @timwangdev @kamal @nelyousfi @alexdunne @swissmanu @bm-software
+/types/react-native-android-taskdescription/    @christianchown
 /types/react-native-auth0/                      @ascariandrea
 /types/react-native-collapsible/                @iRoachie @umidbekkarimov
 /types/react-native-communications/             @huhuanming @PaitoAnderson
@@ -3225,6 +3252,7 @@
 /types/react-native-fetch-blob/                 @MNBuyskih
 /types/react-native-fs/                         @pocesar @josephroque
 /types/react-native-google-signin/              @j-fro
+/types/react-native-i18n/                       @VincentLanglet
 /types/react-native-keep-awake/                 @huhuanming
 /types/react-native-linear-gradient/            @j-fro
 /types/react-native-loading-spinner-overlay/    @fhelwanger
@@ -3235,6 +3263,8 @@
 /types/react-native-modalbox/                   @iRoachie
 /types/react-native-navigation/                 @egorshulga
 /types/react-native-orientation/                @MoLow
+/types/react-native-permissions/                @vincentlanglet
+/types/react-native-photo-view/                 @christianchown
 /types/react-native-popup-dialog/               @PaitoAnderson @connectdotz
 /types/react-native-push-notification/          @PaitoAnderson @tomSawkins
 /types/react-native-qrcode/                     @plantain-00
@@ -3253,6 +3283,7 @@
 /types/react-native-text-input-mask/            @RodrigoAWeber
 /types/react-native-touch-id/                   @huhuanming @gazaret
 /types/react-native-vector-icons/               @iRoachie @timwangdev
+/types/react-native-version-number/             @VincentLanglet
 /types/react-native-video/                      @huhuanming
 /types/react-navigation/                        @huhuanming @mhcgrq @fangpenlin @petejkim @iRoachie @phanalpha @charlesfamu @timwangdev @bang88 @svbutko @levito @robertohuertasm @YourGamesBeOver @ArmandoAssuncao @cliedeman
 /types/react-notification-system/               @GiedriusGrabauskas @DeividasBakanas @LKay @sztobar
@@ -3337,8 +3368,9 @@
 /types/react-twitter-auth/                      @paulfasola
 /types/react-user-tour/                         @ccancellieri
 /types/react-virtual-keyboard/                  @bsurai
-/types/react-virtualized/                       @kaoDev @guntherjh @wasd171 @szabolcsx @kraenhansen @Stevearzh
+/types/react-virtualized/                       @kaoDev @guntherjh @wasd171 @szabolcsx @kraenhansen @Stevearzh @mgoszcz2
 /types/react-virtualized-select/                @seansfkelley
+/types/react-webcam/                            @squat
 /types/react-weui/                              @tairan
 /types/react-widgets/                           @rogierschouten @sanyatuning @frodehansen2 @r3nya
 /types/react-widgets-moment/                    @dawnmist
@@ -3487,7 +3519,6 @@
 /types/royalslider/                             @csrakowski
 /types/rpio/                                    @DominikPalo @Pencl
 /types/rrc/                                     @DeividasBakanas
-/types/rrule/                                   @waratuman
 /types/rsmq/                                    @MugeSo
 /types/rsmq-worker/                             @MugeSo
 /types/rss/                                     @secondwtq
@@ -3606,7 +3637,7 @@
 /types/shapefile/                               @DenisCarriere
 /types/sharedworker/                            @nakakura
 /types/sharepoint/                              @gandjustas @andrei-markeev @baywet @teroarvola @dennispg
-/types/sharp/                                   @lith-light-g
+/types/sharp/                                   @lith-light-g @wooseopkim
 /types/sheetify/                                @toddself
 /types/shell-escape/                            @nenadalm
 /types/shell-quote/                             @jason0x43
@@ -3718,6 +3749,7 @@
 /types/spotify-web-playback-sdk/                @Festify @mraerino @NeoLegends
 /types/sprintf/                                 @soywiz @BendingBender
 /types/sprintf-js/                              @jasonswearingen @BendingBender
+/types/sql-bricks/                              @adn05 @paleo
 /types/sql.js/                                  @Hozuki
 /types/sqlite3/                                 @nmalaguti @dpyro @BehindTheMath
 /types/sqlstring/                               @marvinhagemeister
@@ -3785,6 +3817,7 @@
 /types/stripe-v2/                               @ejsmith @amritk @adamcmiel @jleider @galuszkak
 /types/stripe-v3/                               @ejsmith @amritk @adamcmiel @jleider @galuszkak
 /types/strong-cluster-control/                  @shuntksh
+/types/strong-error-handler/                    @blankstar85
 /types/strong-log-transformer/                  @azasypkin
 /types/strophe/                                 @DavidKDeutsch
 /types/structured-source/                       @azu
@@ -3886,7 +3919,7 @@
 /types/tinycolor2/                              @M-Zuber @geertjansen @nvh
 /types/tinycopy/                                @vvatanabe
 /types/tinymce/                                 @martinduparc @ipoul @nicohartto
-/types/titanium/                                @cyounkins
+/types/titanium/                                @appcelerator @janvennemann
 /types/title/                                   @fa7ad
 /types/tldjs/                                   @geoffreak
 /types/tmp/                                     @optical @Perlmint
@@ -4114,12 +4147,14 @@
 /types/webspeechapi/                            @saschanaz
 /types/websql/                                  @TeamworkGuy2
 /types/webtorrent/                              @niieani @tlaziuk
-/types/webvr-api/                               @lostfictions
+/types/webvr-api/                               @efokschaner
 /types/week/                                    @sindrenm
 /types/weighted/                                @ccitro
 /types/weixin-app/                              @taoqf @AlexStacker
 /types/wellknown/                               @yairtawil
+/types/whatwg-mimetype/                         @petejohanson
 /types/whatwg-streams/                          @saschanaz
+/types/whatwg-url/                              @aomarks
 /types/wheel/                                   @BTOdell
 /types/when/                                    @derekcicerone @Nemo157
 /types/which/                                   @vvakame @cspotcode

From 17c171a73deca79b11995970ed7ab2200efc2cab Mon Sep 17 00:00:00 2001
From: eugeniy-balaban <balevg@gmail.com>
Date: Mon, 9 Apr 2018 22:06:59 +0300
Subject: [PATCH 1148/1382] update to 172.6 version (#24131)

---
 types/devexpress-web/index.d.ts               |  4341 +-
 .../v171/devexpress-web-tests.ts              |   418 +
 types/devexpress-web/v171/index.d.ts          | 33698 ++++++++++++++++
 types/devexpress-web/v171/tsconfig.json       |    32 +
 types/devexpress-web/v171/tslint.json         |    79 +
 5 files changed, 38020 insertions(+), 548 deletions(-)
 create mode 100644 types/devexpress-web/v171/devexpress-web-tests.ts
 create mode 100644 types/devexpress-web/v171/index.d.ts
 create mode 100644 types/devexpress-web/v171/tsconfig.json
 create mode 100644 types/devexpress-web/v171/tslint.json

diff --git a/types/devexpress-web/index.d.ts b/types/devexpress-web/index.d.ts
index 50aac382b1..9b29d9e0db 100644
--- a/types/devexpress-web/index.d.ts
+++ b/types/devexpress-web/index.d.ts
@@ -1,7 +1,11 @@
-// Type definitions for DevExpress ASP.NET v171.4
+// Type definitions for DevExpress ASP.NET v172.6
 // Project: http://devexpress.com/
 // Definitions by: DevExpress Inc. <http://devexpress.com/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="knockout"/>
+/// <reference types="jquery"/>
 
 /**
  * A client-side counterpart of the DashboardViewer extension.
@@ -115,7 +119,7 @@ interface ASPxClientDashboardItemClickEventArgs extends ASPxClientEventArgs {
     /**
      * Requests underlying data corresponding to the clicked visual element.
      * @param onCompleted A ASPxClientDashboardItemRequestUnderlyingDataCompleted object that references a method executed after the request is completed.
-     * @param dataMembers An array of string values that specify data members used to obtain underlying data.
+     * @param dataMembers (Optional) An array of string values that specify data members used to obtain underlying data. If this parameter is not specified, underlying data for all available data members will be requested.
      */
     RequestUnderlyingData(onCompleted: ASPxClientDashboardItemRequestUnderlyingDataCompleted, dataMembers: string[]): void;
 }
@@ -550,6 +554,53 @@ interface ASPxClientDashboardItemDataDeltaValue {
      */
     GetIndicatorType(): ASPxClientDashboardItemDataMeasureValue;
 }
+/**
+ * References a method that will handle the ItemCaptionToolbarUpdated event.
+ */
+interface ASPxClientDashboardItemCaptionToolbarUpdatedEventHandler<S> {
+    /**
+     * References a method that will handle the ItemCaptionToolbarUpdated event.
+     * @param source The event source.
+     * @param e The ASPxClientDashboardItemCaptionToolbarUpdatedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardItemCaptionToolbarUpdatedEventArgs): void;
+}
+/**
+ * Provides data for the ItemCaptionToolbarUpdated event.
+ */
+interface ASPxClientDashboardItemCaptionToolbarUpdatedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets a component name of the dashboard item.
+     * Value: A string value that is a component name of the dashboard item.
+     */
+    ItemName: string;
+    /**
+     * Provides access to caption options of the dashboard item.
+     * Value: A <a href="https://documentation.devexpress.com/ClientDashboard/api/DevExpress.Dashboard.DashboardItemCaptionToolbarOptions.html">DashboardItemCaptionToolbarOptions</a> object containing caption options of the dashboard item.
+     */
+    Options: Object;
+}
+/**
+ * References a method that will handle the DashboardTitleToolbarUpdated event.
+ */
+interface ASPxClientDashboardTitleToolbarUpdatedEventHandler<S> {
+    /**
+     * References a method that will handle the DashboardTitleToolbarUpdated event.
+     * @param source The event source.
+     * @param e A ASPxClientDashboardTitleToolbarUpdatedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardTitleToolbarUpdatedEventArgs): void;
+}
+/**
+ * Provides data for the DashboardTitleToolbarUpdated event.
+ */
+interface ASPxClientDashboardTitleToolbarUpdatedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Provides access to dashboard title options.
+     * Value: A <a href="https://documentation.devexpress.com/ClientDashboard/api/DevExpress.Dashboard.DashboardTitleToolbarOptions.html">DashboardTitleToolbarOptions</a> object containing dashboard title options.
+     */
+    Options: Object;
+}
 /**
  * A point on the data axis.
  */
@@ -945,6 +996,16 @@ interface DashboardPdfExportOptions {
      * Value: A DashboardExportScaleMode value that specifies the mode for scaling a dashboard/dashboard item in the exported document.
      */
     ScaleMode: string;
+    /**
+     * Gets or sets the mode for scaling a dashboard/dashboard item in the exported document.
+     * Value: A DashboardExportDocumentScaleMode value that specifies the mode for scaling a dashboard/dashboard item in the exported document.
+     */
+    DocumentScaleMode: string;
+    /**
+     * Gets or sets whether the page orientation used to export a dashboard is selected automatically.
+     * Value: true, to automatically select the page orientation used to export a dashboard; otherwise, false.
+     */
+    DashboardAutomaticPageLayout: boolean;
     /**
      * Gets or sets the scale factor (in fractions of 1), by which a dashboard/dashboard item is scaled in the exported document.
      * Value: A Single value that specifies the scale factor by which a dashboard/dashboard item is scaled in the exported document.
@@ -1232,6 +1293,30 @@ interface ASPxClientDashboard extends ASPxClientControl {
      * Occurs after the dashboard update is performed.
      */
     DashboardEndUpdate: ASPxClientEvent<ASPxClientDashboardEndUpdateEventHandler<ASPxClientDashboard>>;
+    /**
+     * Allows you to customize a dashboard item's caption (for instance, add custom buttons, menus, etc.).
+     */
+    ItemCaptionToolbarUpdated: ASPxClientEvent<ASPxClientDashboardItemCaptionToolbarUpdatedEventHandler<ASPxClientDashboard>>;
+    /**
+     * Allows you to customize a dashboard title (for instance, add custom buttons, menus, etc.).
+     */
+    DashboardTitleToolbarUpdated: ASPxClientEvent<ASPxClientDashboardTitleToolbarUpdatedEventHandler<ASPxClientDashboard>>;
+    /**
+     * Returns names of the predefined ranges available for the specified Range Filter.
+     * @param itemName A string value that specifies the component name of the Range Filter dashboard item.
+     */
+    GetAvailablePredefinedRanges(itemName: string): string[];
+    /**
+     * Returns the name of the currently selected predefined range.
+     * @param itemName A string value that specifies the component name of the Range Filter dashboard item.
+     */
+    GetCurrentPredefinedRange(itemName: string): string;
+    /**
+     * 
+     * @param itemName 
+     */
+    UpdateItemCaptionToolbar(itemName: string): void;
+    UpdateDashboardTitleToolbar(): void;
     /**
      * Sends a callback to the server and generates the server-side CustomDataCallback event, passing it the specified argument.
      * @param parameter A string value that represents any information that needs to be sent to the server-side CustomDataCallback event.
@@ -1239,7 +1324,7 @@ interface ASPxClientDashboard extends ASPxClientControl {
      */
     PerformDataCallback(parameter: string, onCallback: ASPxClientDataCallback): void;
     /**
-     * Gets an inner part of the ASPxClientDashboard control.
+     * Gets the DashboardControl object that is the client-side part of the Web Dashboard.
      */
     GetDashboardControl(): DashboardControl;
     /**
@@ -1299,7 +1384,7 @@ interface ASPxClientDashboard extends ASPxClientControl {
     GetParameters(): ASPxClientDashboardParameters;
     /**
      * Invokes the dialog that allows end-users to export the entire dashboard to the specified format.
-     * @param format A string value that specifies the format. For instance, you can use 'PDF' or 'Image'.
+     * @param format A string value that specifies the format. For instance, you can use 'PDF', 'Image', or 'Excel'.
      */
     ShowExportDashboardDialog(format: string): void;
     /**
@@ -1635,16 +1720,6 @@ interface ASPxClientDashboard extends ASPxClientControl {
      * @param dateTimePeriodName A String value that specifies the predefined range name.
      */
     SetPredefinedRange(itemName: string, dateTimePeriodName: string): void;
-    /**
-     * Returns names of the predefined ranges available for the specified Range Filter.
-     * @param itemName A string value that specifies the component name of the Range Filter dashboard item.
-     */
-    GetAvailablePredefinedRanges(itemName: string): string[];
-    /**
-     * Returns the name of the currently selected predefined range.
-     * @param itemName A string value that specifies the component name of the Range Filter dashboard item.
-     */
-    GetCurrentPredefinedRange(itemName: string): string;
 }
 /**
  * References a method that will handle the DashboardStateChanged event.
@@ -1986,6 +2061,14 @@ interface ASPxClientDashboardViewer extends ASPxClientControl {
      * Allows you to color the required dashboard item elements using the specified colors.
      */
     ItemElementCustomColor: ASPxClientEvent<ASPxClientDashboardItemElementCustomColorEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Allows you to customize a dashboard item's caption (for instance, add custom buttons, menus, etc.).
+     */
+    ItemCaptionToolbarUpdated: ASPxClientEvent<ASPxClientDashboardItemCaptionToolbarUpdatedEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Allows you to customize a dashboard title (for instance, add custom buttons, menus, etc.).
+     */
+    TitleToolbarUpdated: ASPxClientEvent<ASPxClientDashboardTitleToolbarUpdatedEventHandler<ASPxClientDashboardViewer>>;
     /**
      * Reloads data in the data sources.
      */
@@ -2064,6 +2147,12 @@ interface ASPxClientDashboardViewer extends ASPxClientControl {
      * @param itemName A String that specifies a component name of the master filter item.
      */
     GetCurrentSelection(itemName: string): ASPxClientDashboardItemDataAxisPointTuple[];
+    /**
+     * 
+     * @param itemName 
+     */
+    UpdateItemCaptionToolbar(itemName: string): void;
+    UpdateDashboardTitleToolbar(): void;
     /**
      * Requests underlying data for the specified dashboard item.
      * @param itemName A string that specifies the component name of the dashboard item.
@@ -2079,6 +2168,21 @@ interface ASPxClientDashboardViewer extends ASPxClientControl {
      * Closes the Dashboard Parameters dialog.
      */
     HideParametersDialog(): void;
+    /**
+     * Shows the dialog that allows end-users to export the dashboard.
+     * @param format A string value that specifies the format. For instance, you can use 'PDF, 'Image' or 'Excel'.
+     */
+    ShowExportDialog(format: string): void;
+    /**
+     * Shows the dialog that allows end-users to export the dashboard item.
+     * @param itemComponentName A component name of the dashboard item.
+     * @param format A string value that specifies the format. For instance, you can use 'PDF, 'Image' or 'Excel'.
+     */
+    ShowExportDashboardItemDialog(itemComponentName: string, format: string): void;
+    /**
+     * Hides the dialog that allows end-users to export the dashboard/dashboard item.
+     */
+    HideExportDialog(): void;
     /**
      * Returns settings that specify parameters affecting how the dashboard is exported.
      */
@@ -2554,8 +2658,17 @@ interface ASPxClientDashboardDrillUpPerformedEventArgs extends ASPxClientEventAr
      */
     ItemName: string;
 }
+/**
+ * Provides data for the onCustomizeText handler.
+ */
 interface CardWidgetCustomizeTextEventArgs {
+    /**
+     * Gets a dimension/measure value to be displayed within the card.
+     */
     getValue(): Object;
+    /**
+     * Gets a formatted value displayed within the card.
+     */
     getDefaultText(): string;
 }
 /**
@@ -2567,7 +2680,15 @@ interface CardWidget {
      * Value: A string that specifies the <a href="https://www.w3schools.com/html/html_colors.asp">HTML color</a> used to paint a card's background.
      */
     cardBackColor: string;
+    /**
+     * Allows you to customize texts displayed within individual cards.
+     * Value: A handler used customize texts displayed within individual cards.
+     */
     onCustomizeText: Object;
+    /**
+     * Gets the root element of the widget.
+     */
+    element(): Object;
 }
 /**
  * When implemented, represents the Web Dashboard extension.
@@ -2588,14 +2709,14 @@ interface IExtension {
     stop(): void;
 }
 /**
- * An inner part of the ASPxClientDashboard control.
+ * A client-side part of the Web Dashboard.
  */
 interface DashboardControl {
     /**
      * Gets or sets knockout templates that you can use in the Web Dashboard.
      * Value: A <see cref="KnockoutObservableArray" /> object that is a knockout template collection.
      */
-    customTemplates: KnockoutObservableArray;
+    customTemplates: KnockoutObservableArray<any>;
     /**
      * Provides an access to the collection of registered dashboard extensions.
      * Value: An array of IExtension objects that are dashboard extensions.
@@ -2630,11 +2751,60 @@ interface DashboardControl {
      */
     unregisterExtension(extensionName: string): void;
 }
+interface UrlStateExtension extends IExtension {
+}
+interface Element {
+}
+/**
+ * The content of the Dashboard Parameters dialog.
+ */
+interface ParameterDialogContent {
+    /**
+     * Gets the Dashboard Parameters dialog's grid that displays parameter values.
+     * Value: The Dashboards Parameters dialog's grid that displays parameter values.
+     */
+    grid: Object;
+    /**
+     * Applies changes made in the Dashboard Parameters dialog.
+     */
+    submitParameterValues(): void;
+    /**
+     * Resets changes in the Dashboard Parameters dialog to the default values.
+     */
+    resetParameterValues(): void;
+    valueChanged(): void;
+}
+/**
+ * A Web Dashboard extension that is the Dashboard Parameters dialog.
+ */
 interface DashboardParameterDialogExtension extends IExtension {
+    /**
+     * Gets or sets whether to show the Dashboard Parameters button in the dashboard title.
+     * Value: true, to show the Dashboard Parameters button; otherwise, false.
+     */
+    showDialogButton: KnockoutObservableBoolean;
+    /**
+     * Invokes the Dashboard Parameters dialog.
+     */
+    show(): void;
+    /**
+     * Closes the Dashboard Parameters dialog.
+     */
+    hide(): void;
+    /**
+     * Allows you to be notified about the dashboard parameter settings changes.
+     * @param callback A custom function.
+     */
+    subscribeToContentChanges(callback: Function): Object;
+    /**
+     * Renders the content of the Dashboard Parameters dialog inside the specified JQuery element.
+     * @param element A JQuery element where the Dashboard Parameters dialog content is rendered.
+     */
+    renderContent(element: Element): ParameterDialogContent;
 }
 interface DashboardExportExtension extends IExtension {
 }
-interface DashboardClientApiExtension extends IExtension {
+interface ViewerApiExtension extends IExtension {
 }
 interface DashboardCurrencyEditorExtension extends IExtension {
 }
@@ -2642,7 +2812,12 @@ interface DataSourceBrowserExtension extends IExtension {
 }
 interface DataSourceWizardExtension extends IExtension {
 }
-interface DashboadItemMenuExtension extends IExtension {
+interface DashboardItemMenuExtension extends IExtension {
+}
+/**
+ * A Web Dashboard extension that allows you to configure color schemes.
+ */
+interface DashboardColorSchemeEditorExtension extends IExtension {
 }
 /**
  * A Web Dashboard extension that allows you to keep track of all user actions, and cancel or repeat them.
@@ -2654,17 +2829,12 @@ interface UndoRedoExtension extends IExtension {
     isChanged(): boolean;
 }
 /**
- * An extension that is the dashboard item's Binding menu allowing you to create and modify data binding.
+ * A Web Dashboard extension that is the dashboard item's Binding menu allowing you to create and modify data binding.
  */
 interface BindingPanelExtension extends IExtension {
 }
 /**
- * A Web Dashboard extension that allows you to configure color schemes.
- */
-interface DashboardColorSchemeEditorExtension extends IExtension {
-}
-/**
- * An extension that is the dashboard item's Convert To menu allowing you to convert or duplicate the current item.
+ * A Web Dashboard extension that is the dashboard item's Convert To menu allowing you to convert or duplicate the current item.
  */
 interface ConversionPanelExtension extends IExtension {
 }
@@ -2710,22 +2880,22 @@ interface OpenDashboardExtension extends IExtension {
     loadDashboard(id: string): void;
 }
 /**
- * An extension that is the dashboard item's Interactivity menu containing settings that affect on interaction between various dashboard items.
+ * A Web Dashboard extension that is the dashboard item's Interactivity menu containing settings that affect on interaction between various dashboard items.
  */
 interface InteractivityPanelExtension extends IExtension {
 }
 /**
- * An extension that is the dashboard item's Options menu containing specific options and settings related to the current dashboard item.
+ * A Web Dashboard extension that is the dashboard item's Options menu containing specific options and settings related to the current dashboard item.
  */
 interface OptionsPanelExtension extends IExtension {
 }
 /**
- * An extension that is the Web Dashboard title editor.
+ * A Web Dashboard extension that is the dashboard title editor.
  */
 interface DashboardTitleEditorExtension extends IExtension {
 }
 /**
- * The Dashboard Panel extension that displays a list of available dashboards and lets you switch between the designer and viewer modes.
+ * The Dashboard Panel extension that allows users to switch between dashboards and enable the Designer mode.
  */
 interface DashboardPanelExtension extends IExtension {
     /**
@@ -2894,10 +3064,10 @@ interface DashboardToolboxGroup {
      */
     index: number;
     /**
-     * Provide an access to the collection of toolbox items obtained from the specified toolbox group.
-     * Value: A <see cref="KnockoutObservableArray" /> object that is an array of items obtained from the specified toolbox group.
+     * Provides access to a collection of toolbox group items.
+     * Value: A DashboardToolboxItem).
      */
-    items: KnockoutObservableArray;
+    items: KnockoutObservableArray<any>;
 }
 /**
  * A toolbar group that contains dashboard toolbar items.
@@ -2919,35 +3089,34 @@ interface DashboardToolbarGroup {
      */
     index: number;
     /**
-     * Provide an access to the collection of toolbox items obtained from the specified toolbar group.
-     * Value: A <see cref="KnockoutObservableArray" /> object that is an array of items obtained from the specified toolbar group.
+     * Provides access to a collection of toolbar group items.
+     * Value: A DashboardToolbarItem).
      */
-    items: KnockoutObservableArray;
+    items: KnockoutObservableArray<any>;
 }
 /**
  * The Web Dashboard Toolbox extension that provides access to the dashboard menu and allows you to add dashboard items, as well as undo or repeat user actions.
  */
 interface ToolboxExtension extends IExtension {
     /**
-     * Gets or sets the visibility of the dashboard menu.
-     * Value: true, to display the dashboard menu; otherwise, false.
+     * Provides access to a collection of the dashboard menu items.
+     * Value: A DashboardMenuItem).
+     */
+    menuItems: KnockoutObservableArray<any>;
+    /**
+     * Provides access to a collection of the Toolbox groups.
+     * Value: A DashboardToolboxGroup).
+     */
+    toolboxGroups: KnockoutObservableArray<any>;
+    /**
+     * Provides access to a collection of toolbar groups from the Toolbox.
+     * Value: A DashboardToolbarGroup).
+     */
+    toolbarGroups: KnockoutObservableArray<any>;
+    /**
+     * For internal use.
      */
     menuVisible: KnockoutObservableBoolean;
-    /**
-     * Provide an access to the collection of menu items obtained from the dashboard menu.
-     * Value: A <see cref="KnockoutObservableArray" /> object that is a collection the dashboard menu items .
-     */
-    menuItems: KnockoutObservableArray;
-    /**
-     * Provide an access to the collection of toolbox groups obtained from the Toolbox.
-     * Value: A <see cref="KnockoutObservableArray" /> object that is a collection the toolbox groups.
-     */
-    toolboxGroups: KnockoutObservableArray;
-    /**
-     * Provide an access to the collection of toolbar groups obtained from the Toolbox.
-     * Value: A <see cref="KnockoutObservableArray" /> object that is a collection the toolbar groups.
-     */
-    toolbarGroups: KnockoutObservableArray;
     /**
      * Allows you to add a specified menu item to the dashboard menu.
      * @param menuItem A DashboardMenuItem object that is a dashboard menu item.
@@ -2970,9 +3139,9 @@ interface ToolboxExtension extends IExtension {
      */
     addToolboxItem(groupName: string, toolboxItem: DashboardToolboxItem): void;
     /**
-     * Removes the specified toolbox item from the specified toolbox group.
-     * @param groupName A string value that is a unique toolbox group name.
-     * @param toolboxItemName A string value that is a unique toolbox item name.
+     * Removes the specified item from the specified toolbox group.
+     * @param groupName A string value that is a unique toolbox group name (name).
+     * @param toolboxItemName A string value that is a unique toolbox item name (name).
      */
     removeToolboxItem(groupName: string, toolboxItemName: string): void;
     /**
@@ -3438,6 +3607,10 @@ interface ASPxClientTextEdit extends ASPxClientEdit {
      * Fires on the client side when the editor's text is changed and focus moves out of the editor by end-user interactions.
      */
     TextChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientTextEdit>>;
+    /**
+     * Fires on the client side when the editor's input value is changed before the focus moves out of the editor by end-user interactions.
+     */
+    UserInput: ASPxClientEvent<ASPxClientEventHandler<ASPxClientTextEdit>>;
     /**
      * Returns the text displayed within the editor.
      */
@@ -4249,7 +4422,7 @@ interface ASPxClientListBox extends ASPxClientListEdit {
      */
     PerformCallback(parameter: string): void;
     /**
-     * Adds a new item to the end of the editor's items collection, specifying the item's display text, and returns the index of the added item.
+     * Adds a new item to the editor, specifying the item's display text, and returns the added item's index.
      * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of the corresponding columns within the editor's Columns collection.
      */
     AddItem(texts: string[]): number;
@@ -5021,6 +5194,11 @@ interface ASPxClientGridBase extends ASPxClientControl {
  */
 interface ASPxClientGridColumnBase {
 }
+/**
+ * Lists values that specify the document formats available for export from the grid.
+ */
+interface ASPxClientGridExportFormat {
+}
 /**
  * A method that will handle the ToolbarItemClick event.
  */
@@ -5047,8 +5225,8 @@ interface ASPxClientGridToolbarItemClickEventArgs extends ASPxClientProcessingMo
      */
     toolbarName: string;
     /**
-     * Gets the clicked toolbar item.
-     * Value: A ASPxClientMenuItem object that is the toolbar item.
+     * Gets the clicked menu item
+     * Value: An ASPxClientMenu value that is the menu item.
      */
     item: ASPxClientMenuItem;
     /**
@@ -5158,7 +5336,11 @@ interface ASPxClientCardView extends ASPxClientGridBase {
     /**
      * Fires in response to changing card focus.
      */
-    FocusedCardChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientCardView>>;
+    FocusedCardChanged: ASPxClientEvent<ASPxClientCardViewFocusEventHandler<ASPxClientCardView>>;
+    /**
+     * Fires before a card has been focused.
+     */
+    CardFocusing: ASPxClientEvent<ASPxClientCardViewCardFocusingEventHandler<ASPxClientCardView>>;
     /**
      * Occurs when a callback for server-side processing is initiated.
      */
@@ -5175,6 +5357,21 @@ interface ASPxClientCardView extends ASPxClientGridBase {
      * Fires after the customization window has been closed.
      */
     CustomizationWindowCloseUp: ASPxClientEvent<ASPxClientEventHandler<ASPxClientCardView>>;
+    /**
+     * Returns the editor used to edit the specified column's values.
+     * @param column An ASPxClientCardViewColumn object that specifies the required column within the client grid.
+     */
+    GetEditor(column: ASPxClientCardViewColumn): ASPxClientEdit;
+    /**
+     * Returns the editor used to edit the specified column's values.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     */
+    GetEditor(columnIndex: number): ASPxClientEdit;
+    /**
+     * Returns the editor used to edit the specified column's values.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     */
+    GetEditor(columnFieldNameOrId: string): ASPxClientEdit;
     /**
      * Returns the value of the specified edit cell.
      * @param column An ASPxClientCardViewColumn object that represents the data column within the client grid.
@@ -5255,6 +5452,11 @@ interface ASPxClientCardView extends ASPxClientGridBase {
      * @param columnIndex A zero-based index that identifies the column in the column collection (the column's Index property value).
      */
     SetFocusedCell(cardVisibleIndex: number, columnIndex: number): void;
+    /**
+     * Specifies a custom editor for the search panel on the client side.
+     * @param editor An ASPxClientEdit object representing a custom editor.
+     */
+    SetSearchPanelCustomEditor(editor: ASPxClientEdit): void;
     /**
      * Sorts data by the specified data column's values.
      * @param column An ASPxClientCardViewColumn object that represents the data column.
@@ -5407,7 +5609,7 @@ interface ASPxClientCardView extends ASPxClientGridBase {
      */
     IsNewCardEditing(): boolean;
     /**
-     * Adds a new record.
+     * Adds a new card.
      */
     AddNewCard(): void;
     /**
@@ -5543,6 +5745,11 @@ interface ASPxClientCardView extends ASPxClientGridBase {
      * @param visibleIndex An integer value that identifies the card by its visible index.
      */
     IsCardSelectedOnPage(visibleIndex: number): boolean;
+    /**
+     * Exports a grid data to a file in the specified format.
+     * @param format An ASPxClientCardViewExportFormat object specifying the export format.
+     */
+    ExportTo(format: ASPxClientCardViewExportFormat): void;
     /**
      * Applies the specified search panel filter criterion to grid data.
      * @param value A string value that specifies the filter criterion.
@@ -5682,25 +5889,10 @@ interface ASPxClientCardView extends ASPxClientGridBase {
      */
     GetColumnById(columnId: string): ASPxClientCardViewColumn;
     /**
-     * Returns the client column which is bound to the specified data source field.
+     * Returns the client column to which the specified data source field is bound.
      * @param columnFieldName A string value that specifies the name of the data source field to which the column is bound (the column's FieldName property value).
      */
     GetColumnByField(columnFieldName: string): ASPxClientCardViewColumn;
-    /**
-     * Returns the editor used to edit the specified column's values.
-     * @param column An ASPxClientCardViewColumn object that specifies the required column within the client grid.
-     */
-    GetEditor(column: ASPxClientCardViewColumn): ASPxClientEdit;
-    /**
-     * Returns the editor used to edit the specified column's values.
-     * @param columnIndex An integer value that specifies the column's position within the column collection.
-     */
-    GetEditor(columnIndex: number): ASPxClientEdit;
-    /**
-     * Returns the editor used to edit the specified column's values.
-     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
-     */
-    GetEditor(columnFieldNameOrId: string): ASPxClientEdit;
 }
 /**
  * Represents a client column.
@@ -5758,6 +5950,32 @@ interface ASPxClientCardViewColumnCancelEventArgs extends ASPxClientCancelEventA
      */
     column: ASPxClientCardViewColumn;
 }
+/**
+ * A method that will handle the client CardFocusing event.
+ */
+interface ASPxClientCardViewCardFocusingEventHandler<S> {
+    /**
+     * Represents a method that will handle the CardFocusing event.
+     * @param source The event source.
+     * @param e An ASPxClientCardViewCardFocusingEventArgs object which contains event data.
+     */
+    (source: S, e: ASPxClientCardViewCardFocusingEventArgs): void;
+}
+/**
+ * Provides data for the CardFocusing event.
+ */
+interface ASPxClientCardViewCardFocusingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the card visible index.
+     * Value: An integer value specifying the visible index.
+     */
+    visibleIndex: number;
+    /**
+     * Provides access to the parameters associated with the CardFocusing event.
+     * Value: An object that contains parameters associated with the event.
+     */
+    htmlEvent: Object;
+}
 /**
  * A method that will handle the CardClick event.
  */
@@ -5846,6 +6064,27 @@ interface ASPxClientCardViewSelectionEventArgs extends ASPxClientProcessingModeE
      */
     isChangedOnServer: boolean;
 }
+/**
+ * A method that will handle the client FocusedCardChanged event.
+ */
+interface ASPxClientCardViewFocusEventHandler<S> {
+    /**
+     * Represents a method that will handle the FocusedCardChanged event.
+     * @param source The event source.
+     * @param e An ASPxClientCardViewFocusEventArgs object which contains event data.
+     */
+    (source: S, e: ASPxClientCardViewFocusEventArgs): void;
+}
+/**
+ * Provides data for the corresponding event.
+ */
+interface ASPxClientCardViewFocusEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets whether card focusing has been changed on the server.
+     * Value: true , if the card focusing has been changed on the server; otherwise, false.
+     */
+    isChangedOnServer: boolean;
+}
 /**
  * A method that will handle the client BatchEditStartEditing event.
  */
@@ -6143,6 +6382,30 @@ interface ASPxClientCardViewBatchEditApi {
      * @param visibleIndex An integer value that identifies the card by its visible index.
      */
     IsNewCard(visibleIndex: number): boolean;
+    /**
+     * Adds a new card when ASPxCardView is in Batch Edit mode.
+     */
+    AddNewCard(): void;
+    /**
+     * Deletes the specified card when ASPxCardView is in Batch Edit mode.
+     * @param visibleIndex An integer value that identifies the card index.
+     */
+    DeleteCard(visibleIndex: number): void;
+    /**
+     * Deletes a card with a specified key value when ASPxCardView is in Batch Edit mode.
+     * @param key An object that uniquely identifies the card.
+     */
+    DeleteCardByKey(key: Object): void;
+    /**
+     * Recovers the specified card when ASPxCardView is in Batch Edit mode.
+     * @param visibleIndex An integer value that identifies the card index.
+     */
+    RecoverCard(visibleIndex: number): void;
+    /**
+     * Recovers a card with a specified key value when ASPxCardView is in Batch Edit mode.
+     * @param key An object that uniquely identifies the card.
+     */
+    RecoverCardByKey(key: Object): void;
     /**
      * Programmatically moves the focus to the previous cell in the card
      */
@@ -6220,6 +6483,12 @@ interface ASPxClientCardViewBatchEditApi {
      * Ends cell or card editing.
      */
     EndEdit(): void;
+    /**
+     * Provides the text displayed within the cell according to the specified display format rule.
+     * @param columnFieldNameOrId A string value representing the column's unique identifier or field name.
+     * @param value An object representing a value.
+     */
+    GetColumnDisplayText(columnFieldNameOrId: string, value: Object): string;
 }
 /**
  * Contains information on a grid cell.
@@ -6236,6 +6505,11 @@ interface ASPxClientCardViewCellInfo {
      */
     column: ASPxClientCardViewColumn;
 }
+/**
+ * Lists values that specify the document formats available for export from the grid.
+ */
+interface ASPxClientCardViewExportFormat extends ASPxClientGridExportFormat {
+}
 /**
  * A client-side equivalent of the ASPxGridView object.
  */
@@ -6260,7 +6534,11 @@ interface ASPxClientGridView extends ASPxClientGridBase {
     /**
      * Fires in response to changing row focus.
      */
-    FocusedRowChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientGridView>>;
+    FocusedRowChanged: ASPxClientEvent<ASPxClientGridViewFocusEventHandler<ASPxClientGridView>>;
+    /**
+     * Fires before a row has been focused.
+     */
+    RowFocusing: ASPxClientEvent<ASPxClientGridViewRowFocusingEventHandler<ASPxClientGridView>>;
     /**
      * Enables you to cancel data grouping.
      */
@@ -6369,6 +6647,29 @@ interface ASPxClientGridView extends ASPxClientGridBase {
      * Fires after the Customization Window has been closed.
      */
     CustomizationWindowCloseUp: ASPxClientEvent<ASPxClientEventHandler<ASPxClientGridView>>;
+    /**
+     * Selects the specified rows within the grid.
+     * @param visibleIndices An array of zero-based indices that identify data rows within the grid.
+     */
+    SelectRows(visibleIndices: number[]): void;
+    /**
+     * Selects or deselects the specified rows within the grid.
+     * @param visibleIndices An array of zero-based indices that identify data rows within the grid.
+     * @param selected true to select the specified rows; false to deselect the rows.
+     */
+    SelectRows(visibleIndices: number[], selected: boolean): void;
+    /**
+     * Selects or deselects the specified row within the grid.
+     * @param visibleIndex An integer zero-based index that identifies the data row within the grid.
+     * @param selected true to select the specified row; false to deselect the row.
+     */
+    SelectRows(visibleIndex: number, selected?: boolean): void;
+    /**
+     * Selects or deselects the specified rows displayed within the grid.
+     * @param keys An array of objects that uniquely identify the rows.
+     * @param selected true to select the specified rows; false to deselect the rows.
+     */
+    SelectRowsByKey(keys: Object[], selected?: boolean): void;
     /**
      * Selects or deselects the specified row displayed within the grid.
      * @param key An object that uniquely identifies the row.
@@ -6498,6 +6799,16 @@ interface ASPxClientGridView extends ASPxClientGridBase {
      * @param scrollableRowSettings An object specifying which types of grid rows should or should not be scrollable.
      */
     SetFixedColumnScrollableRows(scrollableRowSettings: Object): void;
+    /**
+     * Exports a grid data to a file in the specified format.
+     * @param format An ASPxClientGridViewExportFormat object specifying the export format.
+     */
+    ExportTo(format: ASPxClientGridViewExportFormat): void;
+    /**
+     * Returns a value specifying the indices of the rows visible in the browser's view port.
+     * @param includePartiallyVisible true, to include partially visible rows, otherwise, false.
+     */
+    GetRowIndicesVisibleInViewPort(includePartiallyVisible: boolean): number[];
     /**
      * Applies a filter specified in the filter row to the GridView.
      */
@@ -6777,6 +7088,11 @@ interface ASPxClientGridView extends ASPxClientGridBase {
      * @param columnIndex A zero-based index that identifies the column in the column collection (the column's Index property value).
      */
     SetFocusedCell(rowVisibleIndex: number, columnIndex: number): void;
+    /**
+     * Specifies a custom editor for the search panel on the client side.
+     * @param editor An ASPxClientEdit object representing a custom editor.
+     */
+    SetSearchPanelCustomEditor(editor: ASPxClientEdit): void;
     /**
      * Invokes the Customization Dialog and displays it over the grid.
      */
@@ -6996,6 +7312,15 @@ interface ASPxClientGridView extends ASPxClientGridBase {
      * @param moveFromGroup true, to ungroup the grid's data by the column; otherwise, false.
      */
     MoveColumn(columnFieldNameOrId: string, moveToColumnVisibleIndex: number, targetPosition: ASPxClientGridColumnMovingTargetPosition, moveToGroup: boolean, moveFromGroup: boolean): void;
+    /**
+     * Returns an object specifying the grid column's layout.
+     */
+    GetColumnLayout(): Object;
+    /**
+     * Specifies the grid column's layout.
+     * @param columnLayout An object specifying the grid column's layout.
+     */
+    SetColumnLayout(columnLayout: Object): void;
     /**
      * Groups data by the values of the specified column.
      * @param column An ASPxClientGridViewColumn object that represents the data column by whose values data is grouped.
@@ -7184,29 +7509,6 @@ interface ASPxClientGridView extends ASPxClientGridBase {
      * @param visibleIndex A zero-based integer value that specifies the row's visible index.
      */
     SelectRows(visibleIndex: number): void;
-    /**
-     * Selects the specified rows within the grid.
-     * @param visibleIndices An array of zero-based indices that identify data rows within the grid.
-     */
-    SelectRows(visibleIndices: number[]): void;
-    /**
-     * Selects or deselects the specified rows within the grid.
-     * @param visibleIndices An array of zero-based indices that identify data rows within the grid.
-     * @param selected true to select the specified rows; false to deselect the rows.
-     */
-    SelectRows(visibleIndices: number[], selected: boolean): void;
-    /**
-     * Selects or deselects the specified row within the grid.
-     * @param visibleIndex An integer zero-based index that identifies the data row within the grid.
-     * @param selected true to select the specified row; false to deselect the row.
-     */
-    SelectRows(visibleIndex: number, selected?: boolean): void;
-    /**
-     * Selects or deselects the specified rows displayed within the grid.
-     * @param keys An array of objects that uniquely identify the rows.
-     * @param selected true to select the specified rows; false to deselect the rows.
-     */
-    SelectRowsByKey(keys: Object[], selected?: boolean): void;
 }
 /**
  * A client grid column.
@@ -7347,6 +7649,48 @@ interface ASPxClientGridViewSelectionEventArgs extends ASPxClientProcessingModeE
      */
     isChangedOnServer: boolean;
 }
+/**
+ * A method that will handle the client FocusedRowChanged event.
+ */
+interface ASPxClientGridViewFocusEventHandler<S> {
+    /**
+     * Represents a method that will handle the FocusedRowChanged event.
+     * @param source The event source.
+     * @param e An ASPxClientGridViewFocusEventArgs object which contains event data.
+     */
+    (source: S, e: ASPxClientGridViewFocusEventArgs): void;
+}
+/**
+ * Provides data for the corresponding event.
+ */
+interface ASPxClientGridViewFocusEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets whether the row focusing has been changed on the server.
+     * Value: true , if the row focusing has been changed on the server; otherwise, false.
+     */
+    isChangedOnServer: boolean;
+}
+/**
+ * A method that will handle the client RowFocusing event.
+ */
+interface ASPxClientGridViewRowFocusingEventHandler<S> {
+    /**
+     * Represents a method that will handle the RowFocusing event.
+     * @param source The event source.
+     * @param e An ASPxClientGridViewRowFocusingEventArgs object which contains event data.
+     */
+    (source: S, e: ASPxClientGridViewRowFocusingEventArgs): void;
+}
+/**
+ * Provides data for the RowFocusing event.
+ */
+interface ASPxClientGridViewRowFocusingEventArgs extends ASPxClientGridViewRowCancelEventArgs {
+    /**
+     * Provides access to the parameters associated with the RowFocusing event.
+     * Value: An object that contains parameters associated with the event.
+     */
+    htmlEvent: Object;
+}
 /**
  * A method that will handle the RowClick events.
  */
@@ -7829,6 +8173,30 @@ interface ASPxClientGridViewBatchEditApi {
      * @param visibleIndex An integer value that identifies the row by its visible index.
      */
     IsNewRow(visibleIndex: number): boolean;
+    /**
+     * Adds a new row when ASPxGridView is in Batch Edit mode.
+     */
+    AddNewRow(): void;
+    /**
+     * Deletes the specified row when ASPxGridView is in Batch Edit.
+     * @param visibleIndex An integer value that identifies the row index.
+     */
+    DeleteRow(visibleIndex: number): void;
+    /**
+     * Deletes a row with a specified key value when ASPxGridView is in Batch Edit mode.
+     * @param key An object that uniquely identifies the row.
+     */
+    DeleteRowByKey(key: Object): void;
+    /**
+     * Recovers the specified row when ASPxGridView is in Batch Edit mode.
+     * @param visibleIndex An integer value that identifies the row index.
+     */
+    RecoverRow(visibleIndex: number): void;
+    /**
+     * Recovers a row with a specified key value when ASPxGridView is in Batch Edit mode.
+     * @param key An object that uniquely identifies the row.
+     */
+    RecoverRowByKey(key: Object): void;
     /**
      * Programmatically moves the focus to the previous cell in the row.
      */
@@ -7906,6 +8274,17 @@ interface ASPxClientGridViewBatchEditApi {
      * Ends cell or row editing.
      */
     EndEdit(): void;
+    /**
+     * Provides the text displayed within the cell according to the specified display format rule.
+     * @param columnFieldNameOrId A string value representing the column's unique identifier or field name.
+     * @param value An object representing a value.
+     */
+    GetColumnDisplayText(columnFieldNameOrId: string, value: Object): string;
+}
+/**
+ * Lists values that specify the document formats available for export from the grid.
+ */
+interface ASPxClientGridViewExportFormat extends ASPxClientGridExportFormat {
 }
 /**
  * A client-side equivalent of the ASPxVerticalGrid object.
@@ -8207,6 +8586,11 @@ interface ASPxClientVerticalGrid extends ASPxClientGridBase {
      * @param visibleIndex An integer value that identifies the record by its visible index.
      */
     IsRecordSelectedOnPage(visibleIndex: number): boolean;
+    /**
+     * Exports a grid data to a file in the specified format.
+     * @param format An ASPxClientVerticalGridExportFormat object specifying the export format.
+     */
+    ExportTo(format: ASPxClientVerticalGridExportFormat): void;
     /**
      * Returns the values of the specified data source fields within the specified record.
      * @param visibleIndex An integer value that identifies the record.
@@ -8221,7 +8605,7 @@ interface ASPxClientVerticalGrid extends ASPxClientGridBase {
      */
     GetPageRecordValues(fieldNames: string, onCallback: ASPxClientVerticalGridValuesCallback): void;
     /**
-     * Returns the number of records actually displayed within the active page.
+     * Returns the number of records actually displayed on the active page.
      */
     GetVisibleRecordsOnPage(): number;
     /**
@@ -8338,6 +8722,11 @@ interface ASPxClientVerticalGrid extends ASPxClientGridBase {
      * @param isFilterEnabled true to enable the current filter; otherwise, false.
      */
     SetFilterEnabled(isFilterEnabled: boolean): void;
+    /**
+     * Specifies a custom editor for the search panel on the client side.
+     * @param editor An ASPxClientEdit object representing a custom editor.
+     */
+    SetSearchPanelCustomEditor(editor: ASPxClientEdit): void;
     /**
      * Returns the client row that resides at the specified position within the row collection.
      * @param rowIndex A zero-based index that identifies the row within the row collection (the row's Index property value).
@@ -8903,6 +9292,30 @@ interface ASPxClientVerticalGridBatchEditApi {
      * @param visibleIndex An integer value that identifies the record by its visible index.
      */
     IsNewRecord(visibleIndex: number): boolean;
+    /**
+     * Adds a new record when ASPxVerticalGrid is in Batch Edit mode.
+     */
+    AddNewRecord(): void;
+    /**
+     * Deletes the specified record when ASPxVerticalGrid is in Batch Edit mode.
+     * @param visibleIndex An integer value that identifies the record index.
+     */
+    DeleteRecord(visibleIndex: number): void;
+    /**
+     * Deletes a record with a specified key value when ASPxVerticalGrid is in Batch Edit mode.
+     * @param key An object that uniquely identifies the record.
+     */
+    DeleteRecordByKey(key: Object): void;
+    /**
+     * Recovers the specified record when ASPxVerticalGrid is in Batch Edit mode.
+     * @param visibleIndex An integer value that identifies the record index.
+     */
+    RecoverRecord(visibleIndex: number): void;
+    /**
+     * Recovers a record with a specified key value when ASPxVerticalGrid is in Batch Edit mode.
+     * @param key An object that uniquely identifies the record.
+     */
+    RecoverRecordByKey(key: Object): void;
     /**
      * Programmatically moves the focus to the previous cell in the record.
      */
@@ -8980,6 +9393,17 @@ interface ASPxClientVerticalGridBatchEditApi {
      * Ends the cell(s) editing.
      */
     EndEdit(): void;
+    /**
+     * Provides the text displayed within the cell according to the specified display format rule.
+     * @param columnFieldNameOrId A string value representing the row's unique identifier or field name.
+     * @param value An object representing a value.
+     */
+    GetColumnDisplayText(columnFieldNameOrId: string, value: Object): string;
+}
+/**
+ * Lists values that specify the document formats available for export from the grid.
+ */
+interface ASPxClientVerticalGridExportFormat extends ASPxClientGridExportFormat {
 }
 /**
  * Contains style settings related to media elements in ASPxHtmlEditor.
@@ -9886,6 +10310,11 @@ interface ASPxClientHtmlEditor extends ASPxClientControl {
      * Performs validation of the editor's content.
      */
     Validate(): void;
+    /**
+     * Returns a toolbar specified by its name.
+     * @param name A string value specifying the toolbar name.
+     */
+    GetToolbarByName(name: string): ASPxClientMenu;
     /**
      * Set an active tab specified by its name.
      * @param name A string value that is the name of the tab.
@@ -10730,22 +11159,246 @@ interface ASPxClientRichEditHyperlinkClickEventArgs extends ASPxClientEventArgs
      */
     targetUri: string;
 }
+/**
+ * A method that will handle the KeyDown event.
+ */
+interface ASPxClientRichEditKeyDownEventHandler<S> {
+    /**
+     * A method that will handle the KeyDown event.
+     * @param source The event source.
+     * @param e An ASPxClientRichEditKeyDownEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientRichEditKeyDownEventArgs): void;
+}
+/**
+ * Provides data for the KeyDown event.
+ */
+interface ASPxClientRichEditKeyDownEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets or sets whether the event is handled manually, so no default processing is required.
+     * Value: true if the event is handled and no default processing is required; otherwise false.
+     */
+    handled: boolean;
+    /**
+     * Gets a DHTML event object that relates to the processed event.
+     * Value: An object that maintains DHTML event-specific information.
+     */
+    htmlEvent: Object;
+}
+/**
+ * A method that will handle the KeyUp event.
+ */
+interface ASPxClientRichEditKeyUpEventHandler<S> {
+    /**
+     * A method that will handle the KeyUp event.
+     * @param source The event source.
+     * @param e An ASPxClientRichEditKeyUpEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientRichEditKeyUpEventArgs): void;
+}
+/**
+ * Provides data for the KeyUp event.
+ */
+interface ASPxClientRichEditKeyUpEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets a DHTML event object that relates to the processed event.
+     * Value: An object that maintains DHTML event-specific information.
+     */
+    htmlEvent: Object;
+}
+/**
+ * A method that will handle the PointerDown event.
+ */
+interface ASPxClientRichEditPointerDownEventHandler<S> {
+    /**
+     * A method that will handle the PointerDown event.
+     * @param source The event source.
+     * @param e An ASPxClientRichEditPointerDownEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientRichEditPointerDownEventArgs): void;
+}
+/**
+ * Provides data for the PointerDown event.
+ */
+interface ASPxClientRichEditPointerDownEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets or sets whether the event is handled manually, so no default processing is required.
+     * Value: true if the event is handled and no default processing is required; otherwise false.
+     */
+    handled: boolean;
+    /**
+     * Gets a DHTML event object that relates to the processed event.
+     * Value: An object that maintains DHTML event-specific information.
+     */
+    htmlEvent: Object;
+}
+/**
+ * A method that will handle the PointerUp event.
+ */
+interface ASPxClientRichEditPointerUpEventHandler<S> {
+    /**
+     * A method that will handle the PointerUp event.
+     * @param source The event source.
+     * @param e An ASPxClientRichEditPointerUpEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientRichEditPointerUpEventArgs): void;
+}
+/**
+ * Provides data for the PointerUp event.
+ */
+interface ASPxClientRichEditPointerUpEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets or sets whether the event is handled manually, so no default processing is required.
+     * Value: true if the event is handled and no default processing is required; otherwise false.
+     */
+    handled: boolean;
+    /**
+     * Gets a DHTML event object that relates to the processed event.
+     * Value: An object that maintains DHTML event-specific information.
+     */
+    htmlEvent: Object;
+}
+/**
+ * A method that will handle the ContentInserted event.
+ */
+interface ASPxClientRichEditContentInsertedEventHandler<S> {
+    /**
+     * A method that will handle the ContentInserted event.
+     * @param source The event source
+     * @param e An ASPxClientRichEditContentInsertedEventArgs that contains event data.
+     */
+    (source: S, e: ASPxClientRichEditContentInsertedEventArgs): void;
+}
+/**
+ * Provides data for the ContentInserted event.
+ */
+interface ASPxClientRichEditContentInsertedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the active sub-document's identifier.
+     * Value: An integer value specifying the sub-document's identifier.
+     */
+    subDocumentId: number;
+    /**
+     * Gets the text buffer interval related to the inserted content.
+     * Value: An object that stores the inserted content's length and position.
+     */
+    interval: Interval;
+}
+/**
+ * A method that will handle the ContentRemoved event.
+ */
+interface ASPxClientRichEditContentRemovedEventHandler<S> {
+    /**
+     * A method that will handle the ContentRemoved event.
+     * @param source The event source
+     * @param e An ASPxClientRichEditContentRemovedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientRichEditContentRemovedEventArgs): void;
+}
+/**
+ * Provides data for the ContentRemoved event.
+ */
+interface ASPxClientRichEditContentRemovedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the active sub-document's identifier.
+     * Value: An integer value specifying the sub-document's identifier
+     */
+    subDocumentId: number;
+    /**
+     * Gets the text buffer interval related to the removed content.
+     * Value: An object that stores the removed content's length and position.
+     */
+    interval: Interval;
+}
+/**
+ * A method that will handle the CharacterPropertiesChanged event.
+ */
+interface ASPxClientRichEditCharacterPropertiesChangedEventHandler<S> {
+    /**
+     * A method that will handle the CharacterPropertiesChanged event.
+     * @param source The event source
+     * @param e An ASPxClientRichEditCharacterPropertiesChangedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientRichEditCharacterPropertiesChangedEventArgs): void;
+}
+/**
+ * Provides data for the CharacterPropertiesChanged event.
+ */
+interface ASPxClientRichEditCharacterPropertiesChangedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the active sub-document's identifier.
+     * Value: An integer value specifying the sub-document's identifier.
+     */
+    subDocumentId: number;
+    /**
+     * Gets the text buffer interval related to the changed characters.
+     * Value: An object that stores the changed character length and position.
+     */
+    interval: Interval;
+}
+/**
+ * A method that will handle the ParagraphPropertiesChanged event.
+ */
+interface ASPxClientRichEditParagraphPropertiesChangedEventHandler<S> {
+    /**
+     * A method that will handle the ParagraphPropertiesChanged event.
+     * @param source The event source.
+     * @param e An ASPxClientRichEditParagraphPropertiesChangedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientRichEditParagraphPropertiesChangedEventArgs): void;
+}
+/**
+ * Provides data for the ParagraphPropertiesChanged event.
+ */
+interface ASPxClientRichEditParagraphPropertiesChangedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the active sub-document's identifier.
+     * Value: An integer value specifying the sub-document's identifier
+     */
+    subDocumentId: number;
+    /**
+     * Gets the changed paragraph's index.
+     * Value: An integer value specifying the changed paragraph's identifier.
+     */
+    paragraphIndex: number;
+}
+/**
+ * A method that will handle the PopupMenuShowing event.
+ */
+interface ASPxClientRichEditPopupMenuShowingEventHandler<S> {
+    /**
+     * A method that will handle the PopupMenuShowing event.
+     * @param source The event source.
+     * @param e An ASPxClientRichEditPopupMenuShowingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientRichEditPopupMenuShowingEventArgs): void;
+}
+/**
+ * Provides data for the PopupMenuShowing event.
+ */
+interface ASPxClientRichEditPopupMenuShowingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Provides access to a collection of menu items in the context menu being invoked.
+     * Value: A <see cref="ASPxClientRichEditPopupMenuItemCollection" /> object representing the context menu's item collection.
+     */
+    menuItems: ASPxClientRichEditPopupMenuItemCollection;
+}
 /**
  * A client-side equivalent of the ASPxRichEdit object.
  */
 interface ASPxClientRichEdit extends ASPxClientControl {
     /**
      * Provides access to document structural elements.
-     * Value: A <see cref="RichEditDocument" /> object that lists RichEdit's document structural elements.
+     * Value: A <see cref="RichEditDocument" /> object that lists a RichEdit document's structural elements.
      */
     document: RichEditDocument;
     /**
-     * Provides access to RichEdit's client-side commands.
-     * Value: A <see cref="RichEditCommands" /> object that lists RichEdit's client-side commands.
+     * Provides access to the RichEdit's client-side commands.
+     * Value: A <see cref="RichEditCommands" /> object that lists the RichEdit's client-side commands.
      */
     commands: RichEditCommands;
     /**
-     * Provides access to the client methods that changes the selection.
+     * Provides access to the client methods that change the selection.
      * Value: A <see cref="RichEditSelection" /> object that lists methods to work with the selection.
      */
     selection: RichEditSelection;
@@ -10778,18 +11431,70 @@ interface ASPxClientRichEdit extends ASPxClientControl {
      * Fires on the client if any server error occurs during server-side processing of a callback sent by the RichEdit.
      */
     CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientRichEdit>>;
+    /**
+     * Occurs on the client side when a document model is loaded into the control.
+     */
+    DocumentLoaded: ASPxClientEvent<ASPxClientEventHandler<ASPxClientRichEdit>>;
     /**
      * Fires if any change is made to the RichEdit's document on the client.
      */
     DocumentChanged: ASPxClientEvent<ASPxClientEventHandler<ASPxClientRichEdit>>;
     /**
-     * Occurs when a hyperlink is clicked within the document.
+     * Occurs when the active sub-document is substituted with another sub-document.
+     */
+    ActiveSubDocumentChanged: ASPxClientEvent<ASPxClientEventHandler<ASPxClientRichEdit>>;
+    /**
+     * Occurs when the control receives focus.
+     */
+    GotFocus: ASPxClientEvent<ASPxClientEventHandler<ASPxClientRichEdit>>;
+    /**
+     * Occurs when the control loses focus.
+     */
+    LostFocus: ASPxClientEvent<ASPxClientEventHandler<ASPxClientRichEdit>>;
+    /**
+     * Occurs when the mouse pointer is over the RichEdit's document and a mouse button is pressed.
+     */
+    PointerDown: ASPxClientEvent<ASPxClientRichEditPointerDownEventHandler<ASPxClientRichEdit>>;
+    /**
+     * Occurs when the mouse button is released if it was pressed within the RichEdit's document.
+     */
+    PointerUp: ASPxClientEvent<ASPxClientRichEditPointerUpEventHandler<ASPxClientRichEdit>>;
+    /**
+     * Occurs when a key is pressed while the ASPxRichEdit's document has focus.
+     */
+    KeyDown: ASPxClientEvent<ASPxClientRichEditKeyDownEventHandler<ASPxClientRichEdit>>;
+    /**
+     * Occurs when a key is released while the ASPxRichEdit's document has focus.
+     */
+    KeyUp: ASPxClientEvent<ASPxClientRichEditKeyUpEventHandler<ASPxClientRichEdit>>;
+    /**
+     * Occurs when a pop-up menu is about to be shown.
+     */
+    PopupMenuShowing: ASPxClientEvent<ASPxClientRichEditPopupMenuShowingEventHandler<ASPxClientRichEdit>>;
+    /**
+     * Occurs when a hyperlink is activated within the document.
      */
     HyperlinkClick: ASPxClientEvent<ASPxClientRichEditHyperlinkClickEventHandler<ASPxClientRichEdit>>;
     /**
      * Occurs when the selection is changed within the document.
      */
     SelectionChanged: ASPxClientEvent<ASPxClientEventHandler<ASPxClientRichEdit>>;
+    /**
+     * Occurs when content is inserted into the document.
+     */
+    ContentInserted: ASPxClientEvent<ASPxClientRichEditContentInsertedEventHandler<ASPxClientRichEdit>>;
+    /**
+     * Occurs when content is removed from the document
+     */
+    ContentRemoved: ASPxClientEvent<ASPxClientRichEditContentRemovedEventHandler<ASPxClientRichEdit>>;
+    /**
+     * Occurs when the characters' formatting is changed.
+     */
+    CharacterPropertiesChanged: ASPxClientEvent<ASPxClientRichEditCharacterPropertiesChangedEventHandler<ASPxClientRichEdit>>;
+    /**
+     * Occurs when a paragraph's formatting is changed.
+     */
+    ParagraphPropertiesChanged: ASPxClientEvent<ASPxClientRichEditParagraphPropertiesChangedEventHandler<ASPxClientRichEdit>>;
     /**
      * Enables you to switch the full-screen mode of the Rich Text Editor.
      * @param fullscreen true to activate full-screen mode; false to deactivate full-screen mode.
@@ -10823,6 +11528,123 @@ interface ASPxClientRichEdit extends ASPxClientControl {
      */
     ReconnectToExternalRibbon(): void;
 }
+/**
+ * Represents an individual item of the Rich Edit's context menu.
+ */
+interface ASPxClientRichEditPopupMenuItem {
+    /**
+     * Gets the immediate parent menu item to which the current menu item belongs.
+     * Value: A ASPxClientRichEditPopupMenuItem object representing the menu item's immediate parent.
+     */
+    parent: ASPxClientRichEditPopupMenuItem;
+    /**
+     * Gets or sets the unique identifier name for the current menu item.
+     * Value: A string value that specifies the item's unique identifier name.
+     */
+    name: string;
+    /**
+     * Gets or sets the text content of the current menu item.
+     * Value: A string value that specifies the text content of the menu item.
+     */
+    text: string;
+    /**
+     * Gets or sets a value that indicates whether the menu item is enabled, allowing the item to respond to end-user interactions.
+     * Value: true if the item is enabled; otherwise, false.
+     */
+    enabled: boolean;
+    /**
+     * Gets or sets the CSS class name defining the menu item's image.
+     * Value: A string value specifying the class name.
+     */
+    imageClassName: string;
+    /**
+     * Gets or sets a URL which defines the navigation location.
+     * Value: A string value which represents a URL where the client web browser will navigate.
+     */
+    navigateUrl: string;
+    /**
+     * Gets or sets the URL of the menu item's image.
+     * Value: A string value that specifies the location of an image.
+     */
+    imageUrl: string;
+    /**
+     * Gets or sets a value that specifies whether the current menu item starts a group.
+     * Value: true if the current menu item starts a group; otherwise, false.
+     */
+    beginGroup: boolean;
+    /**
+     * Gets or sets the current menu item's tooltip text.
+     * Value: A string which specifies the text content of the current menu item's tooltip.
+     */
+    tooltip: string;
+    /**
+     * Gets or sets the window or frame at which to target the contents of the URL associated with the current menu item.
+     * Value: A string which identifies the window or frame at which to target the URL content.
+     */
+    target: string;
+    /**
+     * Gets a collection that contains the submenu items of the current menu item.
+     */
+    GetSubItems(): ASPxClientRichEditPopupMenuItemCollection;
+    /**
+     * Returns the menu item's sub-item with the specified index.
+     * @param index An integer value specifying the index of the sub-item within a collection of the current menu item's submenu items.
+     */
+    GetItem(index: number): ASPxClientRichEditPopupMenuItem;
+    /**
+     * Returns the menu item's sub-item with the specified name property value.
+     * @param name A string value specifying the name property value of the sub-item to find.
+     */
+    GetItemByName(name: string): ASPxClientRichEditPopupMenuItem;
+    /**
+     * Returns the total number of the menu item's child items (submenu items).
+     */
+    GetItemCount(): number;
+}
+/**
+ * Represents a collection of items in the Rich Edit's context menu.
+ */
+interface ASPxClientRichEditPopupMenuItemCollection {
+    /**
+     * Adds the specified menu item to the end of the collection.
+     * @param item An ASPxClientRichEditPopupMenuItem object specifying the item to be added to the collection.
+     */
+    Add(item: ASPxClientRichEditPopupMenuItem): void;
+    /**
+     * Removes a menu item specified by its index within the collection.
+     * @param index An integer value specifying the index of the menu item to remove.
+     */
+    Remove(index: number): void;
+    /**
+     * Removes a menu item specified by its name.
+     * @param name A string value specifying the name property value of a menu item to remove from the collection.
+     */
+    RemoveByName(name: string): void;
+    /**
+     * Adds the specified item to the specified position within the collection.
+     * @param index An integer value that specifies the zero-based index at which the specified item should be inserted.
+     * @param item An ASPxClientRichEditPopupMenuItem object to insert.
+     */
+    Insert(index: number, item: ASPxClientRichEditPopupMenuItem): void;
+    /**
+     * Returns the total number of menu items in the collection.
+     */
+    GetCount(): number;
+    /**
+     * Returns an item object with the specified name property value.
+     * @param name A string value representing the name property value of the required item.
+     */
+    GetByName(name: string): ASPxClientRichEditPopupMenuItem;
+    /**
+     * Returns a menu item specified by its index in the collection.
+     * @param index An integer value that is the zero-based index of the <see cref="ASPxClientRichEditPopupMenuItem" /> to retrieve from the ASPxClientRichEditPopupMenuItemCollection.
+     */
+    Get(index: number): ASPxClientRichEditPopupMenuItem;
+    /**
+     * Removes all menu items from the collection.
+     */
+    Clear(): void;
+}
 /**
  * Contains a set of the available client commands.
  */
@@ -10833,7 +11655,7 @@ interface RichEditCommands {
      */
     fileNew: FileNewCommand;
     /**
-     * Gets a command to open the file, specifying its path.
+     * Gets a command to open a document stored in the specified file.
      * Value: A <see cref="FileOpenCommand" /> object that provides methods for executing the command and checking its state.
      */
     fileOpen: FileOpenCommand;
@@ -10843,22 +11665,22 @@ interface RichEditCommands {
      */
     fileOpenDialog: FileOpenDialogCommand;
     /**
-     * Gets a command to save the document to a file.
+     * Gets a command to save the document at its original location on the server.
      * Value: A <see cref="FileSaveCommand" /> object that provides methods for executing the command and checking its state.
      */
     fileSave: FileSaveCommand;
     /**
-     * Gets a command to download the document file, specifying its extension.
+     * Gets a command to download the document specifying the file's extension.
      * Value: A <see cref="FileDownloadCommand" /> object that provides methods for executing the command and checking its state.
      */
     fileDownload: FileDownloadCommand;
     /**
-     * Gets a command to invoke the Save As dialog that prompts for a file name and saves the current document in a file with the specified path.
+     * Gets a command to save a document in a file with the specified path.
      * Value: A <see cref="FileSaveAsCommand" /> object that provides methods for executing the command and checking its state.
      */
     fileSaveAs: FileSaveAsCommand;
     /**
-     * Gets a command to open the file's Save As dialog.
+     * Gets a command to invoke the Save As dialog that prompts for a file name and saves the current document in a file with the specified path.
      * Value: A <see cref="FileSaveAsDialogCommand" /> object that provides methods for executing the command and checking its state.
      */
     fileSaveAsDialog: FileSaveAsDialogCommand;
@@ -10898,17 +11720,17 @@ interface RichEditCommands {
      */
     changeFontName: ChangeFontNameCommand;
     /**
-     * Gets a command to change the font size of characters in a selected range.
+     * Gets a command to change the font size (in points) of characters in a selected range.
      * Value: A <see cref="ChangeFontSizeCommand" /> object that provides methods for executing the command and checking its state.
      */
     changeFontSize: ChangeFontSizeCommand;
     /**
-     * Gets a command to increase the font size of characters in a selected range to the closest larger predefined value.
+     * Gets a command to increase the font size of characters in a selected range to the closest larger predefined value (in points).
      * Value: A <see cref="IncreaseFontSizeCommand" /> object that provides methods for executing the command and checking its state.
      */
     increaseFontSize: IncreaseFontSizeCommand;
     /**
-     * Gets a command to decrease the selected range's font size to the closest smaller predefined value.
+     * Gets a command to decrease the selected range's font size to the closest smaller predefined value (in points).
      * Value: A <see cref="DecreaseFontSizeCommand" /> object that provides methods for executing the command and checking its state.
      */
     decreaseFontSize: DecreaseFontSizeCommand;
@@ -10958,7 +11780,7 @@ interface RichEditCommands {
      */
     changeFontSuperscript: ChangeFontSuperscriptCommand;
     /**
-     * Gets a command to change the subscript formatting of characters in the selected range.
+     * Gets a command to change the subscript formatting of characters in a selected range.
      * Value: A <see cref="ChangeFontSubscriptCommand" /> object that provides methods for executing the command and checking its state.
      */
     changeFontSubscript: ChangeFontSubscriptCommand;
@@ -10973,12 +11795,12 @@ interface RichEditCommands {
      */
     changeFontBackColor: ChangeFontBackColorCommand;
     /**
-     * Gets a command to reset text and paragraph formatting in the selected range to default.
+     * Gets a command to reset textual and paragraph formatting in the selected range to default values.
      * Value: A <see cref="ClearFormattingCommand" /> object that provides methods for executing the command and checking its state.
      */
     clearFormatting: ClearFormattingCommand;
     /**
-     * Gets a command to change the selected range's style.
+     * Gets a command to apply a character or paragraph style settings to text in a selected range.
      * Value: A <see cref="ChangeStyleCommand" /> object that provides methods for executing the command and checking its state.
      */
     changeStyle: ChangeStyleCommand;
@@ -11088,7 +11910,7 @@ interface RichEditCommands {
      */
     openParagraphFormattingDialog: OpenParagraphFormattingDialogCommand;
     /**
-     * Gets a command to change the formatting of paragraphs in a selected range.
+     * Gets a command to apply formatting settings to paragraphs within a selected range.
      * Value: A <see cref="ChangeParagraphFormattingCommand" /> object that provides methods for executing the command and checking its state.
      */
     changeParagraphFormatting: ChangeParagraphFormattingCommand;
@@ -11103,7 +11925,7 @@ interface RichEditCommands {
      */
     openInsertTableDialog: OpenInsertTableDialogCommand;
     /**
-     * Gets a command to insert a rectangle table of a specified size.
+     * Gets a command to insert a rectangular table of the specified size.
      * Value: A <see cref="InsertTableCommand" /> object that provides methods for executing the command and checking its state.
      */
     insertTable: InsertTableCommand;
@@ -11113,7 +11935,7 @@ interface RichEditCommands {
      */
     openInsertPictureDialog: OpenInsertPictureDialogCommand;
     /**
-     * Gets a command to insert an inline picture stored by specifed web address.
+     * Gets a command to insert an inline picture stored by the specified web address.
      * Value: A <see cref="InsertPictureCommand" /> object that provides methods for executing the command and checking its state.
      */
     insertPicture: InsertPictureCommand;
@@ -11143,7 +11965,7 @@ interface RichEditCommands {
      */
     openInsertHyperlinkDialog: OpenInsertHyperlinkDialogCommand;
     /**
-     * Gets a command to insert a hyperlink at the current position in the document.
+     * Gets a command to insert and update a hyperlink field in place of a selected range.
      * Value: A <see cref="InsertHyperlinkCommand" /> object that provides methods for executing the command and checking its state.
      */
     insertHyperlink: InsertHyperlinkCommand;
@@ -11158,7 +11980,7 @@ interface RichEditCommands {
      */
     deleteHyperlinks: DeleteHyperlinksCommand;
     /**
-     * Gets a command to navigate to the document bookmark or URI (uniform resource identifier) specified for the hyperlink.
+     * Gets a command to go to a bookmark or URI contained within the selected hyperlink.
      * Value: A <see cref="OpenHyperlinkCommand" /> object that provides methods for executing the command and checking its state.
      */
     openHyperlink: OpenHyperlinkCommand;
@@ -11168,12 +11990,12 @@ interface RichEditCommands {
      */
     openInsertSymbolDialog: OpenInsertSymbolDialogCommand;
     /**
-     * Gets a command to insert a character into a document.
+     * Gets a command to insert characters into a document instead of a selected range.
      * Value: A <see cref="InsertSymbolCommand" /> object that provides methods for executing the command and checking its state.
      */
     insertSymbol: InsertSymbolCommand;
     /**
-     * Gets a command to change page margin settings.
+     * Gets a command to apply page margins settings to sections located within a selected range.
      * Value: A <see cref="ChangePageMarginsCommand" /> object that provides methods for executing the command and checking its state.
      */
     changePageMargins: ChangePageMarginsCommand;
@@ -11183,12 +12005,12 @@ interface RichEditCommands {
      */
     openPageMarginsDialog: OpenPageMarginsDialogCommand;
     /**
-     * Gets a command to change the page orientation.
+     * Gets a command to apply page orientation settings to sections located within a selected range.
      * Value: A <see cref="ChangePageOrientationCommand" /> object that provides methods for executing the command and checking its state.
      */
     changePageOrientation: ChangePageOrientationCommand;
     /**
-     * Gets a command to define the page size dialog's settings.
+     * Gets a command to invoke the Page Setup dialog.
      * Value: A <see cref="SetPageSizeDialogCommand" /> object that provides methods for executing the command and checking its state.
      */
     setPageSizeDialog: SetPageSizeDialogCommand;
@@ -11198,12 +12020,12 @@ interface RichEditCommands {
      */
     openPagePaperSizeDialog: OpenPagePaperSizeDialogCommand;
     /**
-     * Gets a command to change the page size.
+     * Gets a command to apply page size settings to sections located within a selected range.
      * Value: A <see cref="ChangePageSizeCommand" /> object that provides methods for executing the command and checking its state.
      */
     changePageSize: ChangePageSizeCommand;
     /**
-     * Gets a command to change the number of section columns having the same width.
+     * Gets a command to change the number of columns having the same width in a section.
      * Value: A <see cref="ChangeSectionEqualColumnCountCommand" /> object that provides methods for executing the command and checking its state.
      */
     changeSectionEqualColumnCount: ChangeSectionEqualColumnCountCommand;
@@ -11213,7 +12035,7 @@ interface RichEditCommands {
      */
     openSectionColumnsDialog: OpenSectionColumnsDialogCommand;
     /**
-     * Gets a command to change the settings of individual section columns.
+     * Gets a command to apply column layout settings to a section.
      * Value: A <see cref="ChangeSectionColumnsCommand" /> object that provides methods for executing the command and checking its state.
      */
     changeSectionColumns: ChangeSectionColumnsCommand;
@@ -11238,7 +12060,7 @@ interface RichEditCommands {
      */
     insertSectionBreakOddPage: InsertSectionBreakOddPageCommand;
     /**
-     * Gets a command to set the background color of the page.
+     * Gets a command to set the background color of all pages contained in the document.
      * Value: A <see cref="ChangePageColorCommand" /> object that provides methods for executing the command and checking its state.
      */
     changePageColor: ChangePageColorCommand;
@@ -11263,12 +12085,12 @@ interface RichEditCommands {
      */
     insertParagraph: InsertParagraphCommand;
     /**
-     * Gets a command to insert text at the current position in a document.
+     * Gets a command to insert text in place of a selected range.
      * Value: A <see cref="InsertTextCommand" /> object that provides methods for executing the command and checking its state.
      */
     insertText: InsertTextCommand;
     /**
-     * Gets a command to delete the text in a selected range.
+     * Gets a command to delete text and in-line objects in a selected range.
      * Value: A <see cref="DeleteCommand" /> object that provides methods for executing the command and checking its state.
      */
     delete: DeleteCommand;
@@ -11283,7 +12105,7 @@ interface RichEditCommands {
      */
     removeNextWord: RemoveNextWordCommand;
     /**
-     * Gets a command to move the cursor backwards and erase the character in that space.
+     * Gets a command to move the cursor backwards and erase characters in a selected range.
      * Value: A <see cref="BackspaceCommand" /> object that provides methods for executing the command and checking its state.
      */
     backspace: BackspaceCommand;
@@ -11293,12 +12115,12 @@ interface RichEditCommands {
      */
     insertLineBreak: InsertLineBreakCommand;
     /**
-     * Gets a command to scale pictures in a selected range.
+     * Gets a command to scale a selected in-line picture.
      * Value: A <see cref="ChangePictureScaleCommand" /> object that provides methods for executing the command and checking its state.
      */
     changePictureScale: ChangePictureScaleCommand;
     /**
-     * Gets a command to increment the left indentation of paragraphs in a selected range.
+     * Gets a command to increment the left indent of paragraphs in a selected range.
      * Value: A <see cref="IncrementParagraphLeftIndentCommand" /> object that provides methods for executing the command and checking its state.
      */
     incrementParagraphLeftIndent: IncrementParagraphLeftIndentCommand;
@@ -11322,13 +12144,18 @@ interface RichEditCommands {
      * Value: A <see cref="InsertTabCommand" /> object that provides methods for executing the command and checking its state.
      */
     insertTab: InsertTabCommand;
+    /**
+     * Gets a command to add a non-breaking space in place of a selected range
+     * Value: A <see cref="InsertNonBreakingSpaceCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertNonBreakingSpace: InsertNonBreakingSpaceCommand;
     /**
      * Gets a command to invoke the Tabs dialog window.
      * Value: A <see cref="OpenTabsDialogCommand" /> object that provides methods for executing the command and checking its state.
      */
     openTabsDialog: OpenTabsDialogCommand;
     /**
-     * Gets a command to change the tab stop value of a document or selected paragraphs
+     * Gets a command to change the default tab stop value of a document and apply custom tab settings to the selected paragraphs.
      * Value: A <see cref="ChangeTabsCommand" /> object that provides methods for executing the command and checking its state.
      */
     changeTabs: ChangeTabsCommand;
@@ -11358,12 +12185,12 @@ interface RichEditCommands {
      */
     decrementNumberingIndent: DecrementNumberingIndentCommand;
     /**
-     * Gets a command to create a field with an empty code and populate it with the selection (if it is not collapsed).
+     * Gets a command to create a field with an empty code and populate it with the characters in the selected range (if it is not collapsed).
      * Value: A <see cref="CreateFieldCommand" /> object that provides methods for executing the command and checking its state.
      */
     createField: CreateFieldCommand;
     /**
-     * Gets a command to update the field's result.
+     * Gets a command to update each field's result in the selection.
      * Value: A <see cref="UpdateFieldCommand" /> object that provides methods for executing the command and checking its state.
      */
     updateField: UpdateFieldCommand;
@@ -11388,12 +12215,12 @@ interface RichEditCommands {
      */
     insertNumeration: InsertNumerationCommand;
     /**
-     * Gets a command to remove the selected numeration.
+     * Gets a command to exclude the selected paragraphs from the numbered list.
      * Value: A <see cref="RemoveNumerationCommand" /> object that provides methods for executing the command and checking its state.
      */
     removeNumeration: RemoveNumerationCommand;
     /**
-     * Gets a command to update all fields in the selected range.
+     * Gets a command to update all fields in the document.
      * Value: A <see cref="UpdateAllFieldsCommand" /> object that provides methods for executing the command and checking its state.
      */
     updateAllFields: UpdateAllFieldsCommand;
@@ -11413,12 +12240,12 @@ interface RichEditCommands {
      */
     createPageField: CreatePageFieldCommand;
     /**
-     * Gets a command to convert the text of all selected sentences to sentence case.
+     * Gets a command changing all selected text to the sentence case capitalization.
      * Value: A <see cref="MakeTextSentenceCaseCommand" /> object that provides methods for executing the command and checking its state.
      */
     makeTextSentenceCase: MakeTextSentenceCaseCommand;
     /**
-     * Gets a command to switch the text case at the current position in the document.
+     * Gets a command to switch the text capitalization in the selection.
      * Value: A <see cref="SwitchTextCaseCommand" /> object that provides methods for executing the command and checking its state.
      */
     switchTextCase: SwitchTextCaseCommand;
@@ -11438,7 +12265,7 @@ interface RichEditCommands {
      */
     goToNextDataRecord: GoToNextDataRecordCommand;
     /**
-     * Gets a command to navigate to the next data record.
+     * Gets a command to open the specified data record.
      * Value: A <see cref="GoToDataRecordCommand" /> object that provides methods for executing the command and checking its state.
      */
     goToDataRecord: GoToDataRecordCommand;
@@ -11478,12 +12305,12 @@ interface RichEditCommands {
      */
     mailMergeAndSaveAs: MailMergeAndSaveAsCommand;
     /**
-     * Gets a command to activate the page header and begin editing.
+     * Gets a command to create a header sub-document (if it is not yet created) and set it as an active sub-document instead of the main sub-document.
      * Value: A <see cref="InsertHeaderCommand" /> object that provides methods for executing the command and checking its state.
      */
     insertHeader: InsertHeaderCommand;
     /**
-     * Gets a command to activate the page footer and begin editing.
+     * Gets a command to create a footer sub-document (if it is not yet created) and set it as an active sub-document instead of the main sub-document.
      * Value: A <see cref="InsertFooterCommand" /> object that provides methods for executing the command and checking its state.
      */
     insertFooter: InsertFooterCommand;
@@ -11493,37 +12320,37 @@ interface RichEditCommands {
      */
     linkHeaderFooterToPrevious: LinkHeaderFooterToPreviousCommand;
     /**
-     * Gets a command to navigate to the page footer from the page header in the header/footer editing mode.
+     * Gets a command to substitute a header sub-document with a footer sub-document of the same page as an active sub-document.
      * Value: A <see cref="GoToFooterCommand" /> object that provides methods for executing the command and checking its state.
      */
     goToFooter: GoToFooterCommand;
     /**
-     * Gets a command to navigate to the page header from the page footer in the header/footer editing mode.
+     * Gets a command to substitute a footer sub-document with a header sub-document of the same page as an active sub-document.
      * Value: A <see cref="GoToHeaderCommand" /> object that provides methods for executing the command and checking its state.
      */
     goToHeader: GoToHeaderCommand;
     /**
-     * Gets a command to navigate to the next page header or footer in the header/footer editing mode.
+     * Gets a command to substitute a current header/footer with a header/footer of the next section as an active sub-document.
      * Value: A <see cref="GoToNextHeaderFooterCommand" /> object that provides methods for executing the command and checking its state.
      */
     goToNextHeaderFooter: GoToNextHeaderFooterCommand;
     /**
-     * Gets a command to navigate to the previous page header or footer in the header/footer editing mode.
+     * Gets a command to substitute a current header/footer with a header/footer of the previous section as an active sub-document.
      * Value: A <see cref="GoToPreviousHeaderFooterCommand" /> object that provides methods for executing the command and checking its state.
      */
     goToPreviousHeaderFooter: GoToPreviousHeaderFooterCommand;
     /**
-     * Gets a command to change the header/footer edit mode, so it allows creation of a different header or footer for the first page of a document or section.
+     * Gets a command to enable (or disable if it is enabled) a different page header and footer for the first page of the current section.
      * Value: A <see cref="SetDifferentFirstPageHeaderFooterCommand" /> object that provides methods for executing the command and checking its state.
      */
     setDifferentFirstPageHeaderFooter: SetDifferentFirstPageHeaderFooterCommand;
     /**
-     * Gets a command to change the header/footer edit mode so it allows creation of a different header or footer for odd and even pages of a document or section.
+     * Gets a command to enable (or disable if it is enabled) a different page header and footer for odd and even pages of the current section.
      * Value: A <see cref="SetDifferentOddAndEvenPagesHeaderFooterCommand" /> object that provides methods for executing the command and checking its state.
      */
     setDifferentOddAndEvenPagesHeaderFooter: SetDifferentOddAndEvenPagesHeaderFooterCommand;
     /**
-     * Gets a command to finish header/footer editing.
+     * Gets a command to substitute a header/footer sub-document with the main sub-document as an active sub-document.
      * Value: A <see cref="CloseHeaderFooterCommand" /> object that provides methods for executing the command and checking its state.
      */
     closeHeaderFooter: CloseHeaderFooterCommand;
@@ -11553,7 +12380,7 @@ interface RichEditCommands {
      */
     changeTableCellPreferredWidth: ChangeTableCellPreferredWidthCommand;
     /**
-     * Gets a command to toggle inside borders for selected cells on/off.
+     * Gets a command to apply (or cancel) border settings of the inside borders for the selected cells.
      * Value: A <see cref="ToggleTableCellInsideBordersCommand" /> object that provides methods for executing the command and checking its state.
      */
     toggleTableCellInsideBorders: ToggleTableCellInsideBordersCommand;
@@ -11708,22 +12535,22 @@ interface RichEditCommands {
      */
     changeTableStyle: ChangeTableStyleCommand;
     /**
-     * Gets a command to toggle top borders for selected cells on/off.
+     * Gets a command to apply (or cancel) border settings of the top border for the selected cells.
      * Value: A <see cref="ToggleTableCellTopBorderCommand" /> object that provides methods for executing the command and checking its state.
      */
     toggleTableCellTopBorder: ToggleTableCellTopBorderCommand;
     /**
-     * Gets a command to toggle right borders for selected cells on/off.
+     * Gets a command to apply (or cancel) border settings of the right border for the selected cells.
      * Value: A <see cref="ToggleTableCellRightBorderCommand" /> object that provides methods for executing the command and checking its state.
      */
     toggleTableCellRightBorder: ToggleTableCellRightBorderCommand;
     /**
-     * Gets a command to toggle bottom borders for selected cells on/off.
+     * Gets a command to apply (or cancel) border settings of the bottom border for the selected cells.
      * Value: A <see cref="ToggleTableCellBottomBorderCommand" /> object that provides methods for executing the command and checking its state.
      */
     toggleTableCellBottomBorder: ToggleTableCellBottomBorderCommand;
     /**
-     * Gets a command to toggle left borders for selected cells on/off.
+     * Gets a command to apply (or cancel) border settings of the left border for the selected cells.
      * Value: A <see cref="ToggleTableCellLeftBorderCommand" /> object that provides methods for executing the command and checking its state.
      */
     toggleTableCellLeftBorder: ToggleTableCellLeftBorderCommand;
@@ -11733,22 +12560,22 @@ interface RichEditCommands {
      */
     removeTableCellBorders: RemoveTableCellBordersCommand;
     /**
-     * Gets a command to toggle all borders for selected cells on/off.
+     * Gets a command to apply (or cancel) border settings to all borders of the selected cells.
      * Value: A <see cref="ToggleTableCellAllBordersCommand" /> object that provides methods for executing the command and checking its state.
      */
     toggleTableCellAllBorders: ToggleTableCellAllBordersCommand;
     /**
-     * Gets a command to toggle inner horizontal borders for selected cells on/off.
+     * Gets a command to apply (or cancel) border settings of the inside horizontal borders for the selected cells.
      * Value: A <see cref="ToggleTableCellInsideHorizontalBordersCommand" /> object that provides methods for executing the command and checking its state.
      */
     toggleTableCellInsideHorizontalBorders: ToggleTableCellInsideHorizontalBordersCommand;
     /**
-     * Gets a command to toggle inner vertical borders for selected cells on/off.
+     * Gets a command to apply (or cancel) border settings of the inside vertical borders for the selected cells.
      * Value: A <see cref="ToggleTableCellInsideVerticalBordersCommand" /> object that provides methods for executing the command and checking its state.
      */
     toggleTableCellInsideVerticalBorders: ToggleTableCellInsideVerticalBordersCommand;
     /**
-     * Gets a command to toggle outer borders for selected cells on/off.
+     * Gets a command to apply (or cancel) border settings of the outside borders for the selected cells.
      * Value: A <see cref="ToggleTableCellOutsideBordersCommand" /> object that provides methods for executing the command and checking its state.
      */
     toggleTableCellOutsideBorders: ToggleTableCellOutsideBordersCommand;
@@ -11758,12 +12585,12 @@ interface RichEditCommands {
      */
     changeTableLook: ChangeTableLookCommand;
     /**
-     * Gets a command to change the repository item's table border style.
+     * Gets a command to apply borders' drawing settings.
      * Value: A <see cref="ChangeTableBorderRepositoryItemCommand" /> object that provides methods for executing the command and checking its state.
      */
     changeTableBorderRepositoryItem: ChangeTableBorderRepositoryItemCommand;
     /**
-     * Gets a command to change cell shading in the selected table elements.
+     * Gets a command to change cell shading in selected table cells.
      * Value: A <see cref="ChangeTableCellShadingCommand" /> object that provides methods for executing the command and checking its state.
      */
     changeTableCellShading: ChangeTableCellShadingCommand;
@@ -11788,17 +12615,17 @@ interface RichEditCommands {
      */
     findAll: FindAllCommand;
     /**
-     * Gets a command to hide the results of the search.
+     * Gets a command to hide the search results.
      * Value: A <see cref="HideFindResultsCommand" /> object that provides methods for executing the command and checking its state.
      */
     hideFindResults: HideFindResultsCommand;
     /**
-     * Gets a command to search for a specific text and replace all matches in the document with the specified string.
+     * Gets a command to replace all matches of the specified text with new characters.
      * Value: A <see cref="ReplaceAllCommand" /> object that provides methods for executing the command and checking its state.
      */
     replaceAll: ReplaceAllCommand;
     /**
-     * Gets a command to search for a specific text and replace the next match in the document with the specified string.
+     * Gets a command to find and replace a next match of the specified text after the cursor position with new characters.
      * Value: A <see cref="ReplaceNextCommand" /> object that provides methods for executing the command and checking its state.
      */
     replaceNext: ReplaceNextCommand;
@@ -11853,7 +12680,7 @@ interface RichEditCommands {
      */
     changeFloatingObjectAbsoluteSize: ChangeFloatingObjectAbsoluteSizeCommand;
     /**
-     * Gets a command to modify a text box' relative size settings.
+     * Gets a command to modify a text box's relative size settings.
      * Value: A <see cref="ChangeTextBoxRelativeSizeCommand" /> object that provides methods for executing the command and checking its state.
      */
     changeTextBoxRelativeSize: ChangeTextBoxRelativeSizeCommand;
@@ -11883,11 +12710,20 @@ interface RichEditCommands {
      */
     changeFloatingObjectOutlineWidth: ChangeFloatingObjectOutlineWidthCommand;
     /**
-     * Gets a command to modify a text box' content margins.
+     * Gets a command to modify a text box's content margins.
      * Value: A <see cref="ChangeTextBoxContentMarginsCommand" /> object that provides methods for executing the command and checking its state.
      */
     changeTextBoxContentMargins: ChangeTextBoxContentMarginsCommand;
+    /**
+     * Gets a command to resize the shape to fit the text in the text box.
+     * Value: A <see cref="ChangeTextBoxResizeShapeToFitTextCommand" /> object that provides methods for executing the command and checking its state.
+     */
     changeTextBoxResizeShapeToFitText: ChangeTextBoxResizeShapeToFitTextCommand;
+    /**
+     * Gets a command to add an HTML formatted content in place of a selected range.
+     * Value: A <see cref="InsertHtmlCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertHtml: InsertHtmlCommand;
 }
 /**
  * Serves as a base for objects that implement different client command functionalities.
@@ -11981,6 +12817,10 @@ interface RichEditDocument {
  * An abstract numbering list definition that defines the appearance and behavior of numbered paragraphs in a document.
  */
 interface AbstractNumberingList {
+    /**
+     * Gets or sets a value indicating whether an abstract numbering list is deleted.
+     * Value: true, if the abstract numbering list is deleted; otherwise, false.
+     */
     deleted: boolean;
 }
 /**
@@ -12067,6 +12907,11 @@ interface Field {
      * Value: true, if the field code is displayed; false, if the field result is displayed.
      */
     showCode: boolean;
+    /**
+     * Gets the index of the field
+     * Value: An integer value specifying the field's index
+     */
+    index: number;
 }
 /**
  * Defines a bookmark in the document.
@@ -12468,7 +13313,7 @@ interface SpellingInfo {
     spellCheckerState: any;
     /**
      * Provides access to an array containing misspelled intervals.
-     * Value: An array of <see cref="MisspelledInterval[]" /> objects.
+     * Value: An array of MisspelledInterval objects.
      */
     misspelledIntervals: MisspelledInterval[];
 }
@@ -12635,6 +13480,26 @@ interface SubDocument {
      * Value: An integer that is the number of character positions in the document.
      */
     length: number;
+    /**
+     * Returns a field if its interval includes the specified position.
+     * @param position An integer value specifying the target field's position.
+     */
+    findFields(position: number): Field[];
+    /**
+     * Returns all fields contained in the specified interval.
+     * @param interval A text buffer interval that contains the target fields.
+     */
+    findFields(interval: Interval): Field[];
+    /**
+     * Returns a table if its interval includes the specified position.
+     * @param position An integer value specifying the target table's position.
+     */
+    findTables(position: number): Field[];
+    /**
+     * Returns all tables contained in the specified interval.
+     * @param interval A text buffer interval that contains the target tables.
+     */
+    findTables(interval: Interval): Field[];
 }
 declare enum SubDocumentType {
     Main=0,
@@ -12656,6 +13521,11 @@ interface Table {
      * Value: A integer value specifying the character length of the table.
      */
     length: number;
+    /**
+     * Gets an index of the table.
+     * Value: An integer value specifying the table's index.
+     */
+    index: number;
     /**
      * Gets the text buffer interval occupied by the current table element.
      * Value: An <see cref="Interval" /> object specifying the interval settings.
@@ -12809,7 +13679,7 @@ interface DeleteBookmarkCommand extends CommandWithSimpleStateBase {
 interface GoToBookmarkCommand extends CommandWithSimpleStateBase {
     /**
      * Executes the GoToBookmarkCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
-     * @param name 
+     * @param name A string value specifying the bookmark's name
      */
     execute(name: string): boolean;
 }
@@ -12857,6 +13727,11 @@ interface UpdateFieldCommand extends CommandWithSimpleStateBase {
      * Executes the UpdateFieldCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
      */
     execute(): boolean;
+    /**
+     * Executes the UpdateFieldCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param callback A callback function that is performed when updating of all fields in the selection is completed.
+     */
+    execute(callback: Function): boolean;
 }
 /**
  * A command to display the selected field's field codes.
@@ -12894,6 +13769,11 @@ interface UpdateAllFieldsCommand extends CommandWithSimpleStateBase {
      * Executes the UpdateAllFieldsCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
      */
     execute(): boolean;
+    /**
+     * Executes the UpdateAllFieldsCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param callback A callback function that is performed when updating of all fields in the document is completed.
+     */
+    execute(callback: Function): boolean;
 }
 /**
  * A command to insert a DATE field displaying the current date.
@@ -12945,6 +13825,10 @@ interface DataRecordOptions {
      * Value: An integer value specifying the data record index.
      */
     activeRecordIndex: number;
+    /**
+     * Gets or sets the count of data source records.
+     * Value: An integer value specifying the count of data source records.
+     */
     recordCount: number;
 }
 /**
@@ -13163,7 +14047,7 @@ interface FileSaveCommand extends CommandWithSimpleStateBase {
 interface FileSaveAsCommand extends CommandWithSimpleStateBase {
     /**
      * Executes the FileSaveAsCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
-     * @param path A string value specifying path to the saving file.
+     * @param path A string value specifying path to the saving file. Note that the path should be relative to the work directory.
      */
     execute(path: string): boolean;
     /**
@@ -13231,15 +14115,15 @@ interface FindAllCommand extends CommandWithSimpleStateBase {
      * Executes the FindAllCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
      * @param text A string value specifying finding text.
      * @param matchCase true, to perform a case-sensitive search; otherwise, false.
-     * @param highlightResults true, to highlight result of search; otherwise, false.
+     * @param highlightResults true, to highlight the search results; otherwise, false.
      */
     execute(text: string, matchCase: boolean, highlightResults: boolean): boolean;
     /**
      * Executes the FindAllCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
      * @param text A string value specifying text to find.
      * @param matchCase true, to perform a case-sensitive search; otherwise, false.
-     * @param highlightResults true, to highlight result of search; otherwise, false.
-     * @param results An array of Interval objects containing the results of search.
+     * @param highlightResults true, to highlight the search results; otherwise, false.
+     * @param results An array of Interval objects containing the search results.
      */
     execute(text: string, matchCase: boolean, highlightResults: boolean, results: Interval[]): boolean;
 }
@@ -13259,7 +14143,7 @@ interface ReplaceAllCommand extends CommandWithSimpleStateBase {
     /**
      * Executes the ReplaceAllCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
      * @param text A string value specifying a text to replace.
-     * @param replaceText A string value specifying the replacing text.
+     * @param replaceText A string value specifying the inserted text.
      * @param matchCase true, to perform a case-sensitive search; otherwise, false.
      */
     execute(text: string, replaceText: string, matchCase: boolean): boolean;
@@ -13270,8 +14154,8 @@ interface ReplaceAllCommand extends CommandWithSimpleStateBase {
 interface ReplaceNextCommand extends CommandWithSimpleStateBase {
     /**
      * Executes the ReplaceNextCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
-     * @param text A string value specifying text to replace.
-     * @param replaceText A string value specifying replacing text.
+     * @param text A string value specifying a text to replace.
+     * @param replaceText A string value specifying the inserted text.
      * @param matchCase true, to perform a case-sensitive search; otherwise, false.
      */
     execute(text: string, replaceText: string, matchCase: boolean): boolean;
@@ -13325,7 +14209,7 @@ interface ChangeFloatingObjectAlignmentPositionCommand extends CommandBase {
 interface ChangeFloatingObjectAbsolutePositionCommand extends CommandBase {
     /**
      * Executes the ChangeFloatingObjectAbsolutePositionCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
-     * @param settings A FloatingObjectAbsolutePositionSettings object specifying page margin settings.
+     * @param settings A FloatingObjectAbsolutePositionSettings object specifying object position settings.
      */
     execute(settings: FloatingObjectAbsolutePositionSettings): boolean;
     /**
@@ -13473,8 +14357,18 @@ interface ChangeTextBoxContentMarginsCommand extends CommandBase {
      */
     getState(): any;
 }
+/**
+ * A command to resize the shape to fit the text in the text box.
+ */
 interface ChangeTextBoxResizeShapeToFitTextCommand extends CommandBase {
+    /**
+     * Executes the ChangeTextBoxResizeShapeToFitTextCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param resizeShapeToFitText true, to resize the shape to fit the text; otherwise, false.
+     */
     execute(resizeShapeToFitText: boolean): boolean;
+    /**
+     * Gets information about the command state.
+     */
     getState(): any;
 }
 /**
@@ -13508,7 +14402,7 @@ interface FloatingObjectAlignmentPositionSettings {
 interface FloatingObjectAbsolutePositionSettings {
     /**
      * Gets or sets a floating object's horizontal position relative to an element specified by the horizontalPositionType property.
-     * Value: An integer value specifying the position.
+     * Value: An integer value specifying the position in twips.
      */
     horizontalAbsolutePosition: number;
     /**
@@ -13518,7 +14412,7 @@ interface FloatingObjectAbsolutePositionSettings {
     horizontalPositionType: any;
     /**
      * Gets or sets a floating object's vertical position relative to an element specified by the verticalPositionType property.
-     * Value: An integer value specifying the position.
+     * Value: An integer value specifying the position in twips.
      */
     verticalAbsolutePosition: number;
     /**
@@ -13533,7 +14427,7 @@ interface FloatingObjectAbsolutePositionSettings {
 interface FloatingObjectRelativePositionSettings {
     /**
      * Gets or sets the horizontal distance between the edge of a floating object and the element specified by the horizontalRelativePosition property
-     * Value: An integer value specifying the horizontal position.
+     * Value: An integer value specifying the horizontal position in twips.
      */
     horizontalRelativePosition: number;
     /**
@@ -13543,7 +14437,7 @@ interface FloatingObjectRelativePositionSettings {
     horizontalPositionType: any;
     /**
      * Gets or sets the horizontal distance between the edge of a floating object and the element specified by the verticalRelativePosition property
-     * Value: An integer value specifying the vertical position.
+     * Value: An integer value specifying the vertical position in twips.
      */
     verticalRelativePosition: number;
     /**
@@ -13568,22 +14462,22 @@ interface FloatingObjectTextWrappingSettings {
     floatingObjectTextWrapSide: any;
     /**
      * Gets or sets the left offset of text wrapping.
-     * Value: An integer value specifying the left offset.
+     * Value: An integer value specifying the left offset in twips.
      */
     leftDistance: number;
     /**
      * Gets or sets the right offset of text wrapping.
-     * Value: An integer value specifying the right offset.
+     * Value: An integer value specifying the right offset in twips.
      */
     rightDistance: number;
     /**
      * Gets or sets the top offset of text wrapping.
-     * Value: An integer value specifying the top offset.
+     * Value: An integer value specifying the top offset in twips.
      */
     topDistance: number;
     /**
      * Gets or sets the bottom offset of text wrapping.
-     * Value: An integer value specifying the bottom offset.
+     * Value: An integer value specifying the bottom offset in twips.
      */
     bottomDistance: number;
 }
@@ -13593,12 +14487,12 @@ interface FloatingObjectTextWrappingSettings {
 interface FloatingObjectAbsoluteSizeSettings {
     /**
      * Gets or sets a floating object's absolute width.
-     * Value: An integer value specifying the width.
+     * Value: An integer value specifying the width in twips.
      */
     absoluteWidth: number;
     /**
      * Gets or sets a floating object's absolute height.
-     * Value: An integer value specifying the height.
+     * Value: An integer value specifying the height in twips.
      */
     absoluteHeight: number;
 }
@@ -13710,6 +14604,16 @@ interface RedoCommand extends CommandWithSimpleStateBase {
      */
     execute(): boolean;
 }
+/**
+ * A command to add an HTML formatted content in place of a selected range.
+ */
+interface InsertHtmlCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertHtmlCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param html A string that specifies the inserted HTML code.
+     */
+    execute(html: string): boolean;
+}
 /**
  * A command to invoke the Hyperlink dialog.
  */
@@ -13725,7 +14629,7 @@ interface OpenInsertHyperlinkDialogCommand extends CommandWithSimpleStateBase {
 interface InsertHyperlinkCommand extends CommandBase {
     /**
      * Executes the InsertHyperlinkCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
-     * @param settings A HyperLinkSettings object specifying hyperlink settings.
+     * @param settings A HyperlinkSettings object specifying hyperlink settings.
      */
     execute(settings: HyperlinkSettings): boolean;
     /**
@@ -14204,8 +15108,8 @@ interface ChangePictureScaleCommand extends CommandBase {
     execute(scale: Scale): boolean;
     /**
      * Executes the ChangePictureScaleCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
-     * @param x An interger number specifying width of the picture
-     * @param y An interger number specifying height of the picture
+     * @param x An integer number specifying the scaling value for the width of the picture as a percentage.
+     * @param y An integer number specifying the scaling value for the height of the picture as a percentage.
      */
     execute(x: number, y: number): boolean;
     /**
@@ -14229,7 +15133,7 @@ interface MoveContentCommand extends CommandWithSimpleStateBase {
 interface CopyContentCommand extends CommandWithSimpleStateBase {
     /**
      * Executes the CopyContentCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
-     * @param position An integer number value specifying position for pasting selected text.
+     * @param position An integer value specifying a position of the inserted text.
      */
     execute(position: number): boolean;
 }
@@ -14242,6 +15146,15 @@ interface InsertTabCommand extends CommandWithSimpleStateBase {
      */
     execute(): boolean;
 }
+/**
+ * A command to add a non-breaking space in place of a selected range.
+ */
+interface InsertNonBreakingSpaceCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertNonBreakingSpaceCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
 /**
  * Defines the scaling settings.
  */
@@ -14263,10 +15176,10 @@ interface Scale {
 interface ChangePageMarginsCommand extends CommandBase {
     /**
      * Executes the ChangePageMarginsCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
-     * @param left An integer number specifying left margin of the page.
-     * @param top An integer number specifying top margin of the page.
-     * @param right An integer number specifying right margin of the page.
-     * @param bottom An integer number specifying bottom margin of the page.
+     * @param left An integer number specifying left margin of the page in twips.
+     * @param top An integer number specifying top margin of the page in twips.
+     * @param right An integer number specifying right margin of the page in twips.
+     * @param bottom An integer number specifying bottom margin of the page in twips.
      */
     execute(left: number, top: number, right: number, bottom: number): boolean;
     /**
@@ -14326,8 +15239,8 @@ interface SetPageSizeDialogCommand extends CommandWithSimpleStateBase {
 interface ChangePageSizeCommand extends CommandBase {
     /**
      * Executes the ChangePageSizeCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
-     * @param width An integer number specifying width of the page.
-     * @param height An integer number specifying height of the page.
+     * @param width An integer number specifying width of the page in twips.
+     * @param height An integer number specifying height of the page in twips.
      */
     execute(width: number, height: number): boolean;
     /**
@@ -14383,7 +15296,7 @@ interface ChangeSectionColumnsCommand extends CommandBase {
 interface ChangePageColorCommand extends CommandBase {
     /**
      * Executes the ChangePageColorCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
-     * @param color A string specifying a background color the page. May be specified as a color name or a hex color value.
+     * @param color A string specifying a background color of all pages contained in the document. May be specified as a color name or a hex color value.
      */
     execute(color: string): boolean;
     /**
@@ -14497,12 +15410,12 @@ interface CloseHeaderFooterCommand extends CommandWithSimpleStateBase {
 interface SectionColumn {
     /**
      * Gets or sets the width of the section column.
-     * Value: An integer value specifying the section column width.
+     * Value: An integer value specifying the section column width in twips.
      */
     width: number;
     /**
      * Gets or sets the amount of space between adjacent section columns.
-     * Value: An integer value specifying the spacing between section columns.
+     * Value: An integer value specifying the spacing after a column in twips.
      */
     spacing: number;
 }
@@ -14511,12 +15424,12 @@ interface SectionColumn {
  */
 interface Size {
     /**
-     * Gets or sets the width value.
+     * Gets or sets the width value in twips.
      * Value: An integer value specifying the width.
      */
     width: number;
     /**
-     * Gets or sets the height value.
+     * Gets or sets the height value in twips.
      * Value: An integer value specifying the height.
      */
     height: number;
@@ -14527,22 +15440,22 @@ interface Size {
 interface Margins {
     /**
      * Gets or sets the left margin.
-     * Value: An integer value specifying the left margin.
+     * Value: An integer value specifying the left margin in twips.
      */
     left: number;
     /**
      * Gets or sets the top margin.
-     * Value: An integer value specifying the top margin.
+     * Value: An integer value specifying the top margin in twips.
      */
     top: number;
     /**
      * Gets or sets the right margin.
-     * Value: An integer value specifying the right margin.
+     * Value: An integer value specifying the right margin in twips.
      */
     right: number;
     /**
      * Gets or sets the bottom margin.
-     * Value: An integer value specifying the bottom margin.
+     * Value: An integer value specifying the bottom margin in twips.
      */
     bottom: number;
 }
@@ -14829,17 +15742,17 @@ interface ParagraphFormattingSettings {
      */
     outlineLevel: number;
     /**
-     * Gets or sets the right indent value for the specified paragraph.
+     * Gets or sets the right indent value for the specified paragraph (in twips).
      * Value: An integer value specifying the right indent.
      */
     rightIndent: number;
     /**
-     * Gets or sets the spacing before the current paragraph.
+     * Gets or sets the spacing before each selected paragraph (in twips).
      * Value: An integer value specifying the spacing before the paragraph.
      */
     spacingBefore: number;
     /**
-     * Gets or sets the spacing after the current paragraph.
+     * Gets or sets the spacing after each selected paragraph (in twips).
      * Value: An integer value specifying the spacing after the paragraph.
      */
     spacingAfter: number;
@@ -14854,7 +15767,7 @@ interface ParagraphFormattingSettings {
      */
     firstLineIndentType: any;
     /**
-     * Gets or sets a value specifying the indent of the first line of a paragraph.
+     * Gets or sets a value specifying the indent of the first line of a paragraph (in twips).
      * Value: An integer value specifying the indent of the first line.
      */
     firstLineIndent: number;
@@ -14874,12 +15787,12 @@ interface ParagraphFormattingSettings {
      */
     pageBreakBefore: boolean;
     /**
-     * Gets or sets the left indent for text within a paragraph.
+     * Gets or sets the left indent for text within a paragraph (in twips).
      * Value: An integer value specifying the left indent.
      */
     leftIndent: number;
     /**
-     * Gets or sets a line spacing value.
+     * Gets or sets a line spacing value (in twips).
      * Value: An integer value specifying the line spacing.
      */
     lineSpacing: number;
@@ -14914,10 +15827,10 @@ declare enum ParagraphFirstLineIndent {
 interface AssignShortcutCommand extends CommandWithSimpleStateBase {
     /**
      * Executes the AssignShortcutCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
-     * @param keyCode An integer value specifying the code uniquely identifying the key combination.
-     * @param callback A callback function to execute on pressing the shortcut.
+     * @param keyCode A specifically generated code that uniquely identifies the combination of keys specified for a shortcut. This code is specified using the GetShortcutCode method.
+     * @param callback A callback function to execute when a shortcut is activated.
      */
-    execute(keyCode: number, callback: (arg1: string) => void): boolean;
+    execute(keyCode: number, callback: Function): boolean;
 }
 /**
  * A command to invoke the Spelling dialog window.
@@ -15529,7 +16442,7 @@ interface TableBorderSettings {
      */
     color: string;
     /**
-     * Gets or sets the border line width.
+     * Gets or sets the border line width in twips.
      * Value: An integer value defining the border line width.
      */
     width: number;
@@ -15752,22 +16665,22 @@ interface TableCellFormattingSettings {
      */
     noWrap: boolean;
     /**
-     * Gets or sets a table cell's left margin.
+     * Gets or sets a table cell's left margin in twips.
      * Value: An integer value specifying the left margin.
      */
     marginLeft: number;
     /**
-     * Gets or sets a table cell's right margin.
+     * Gets or sets a table cell's right margin in twips.
      * Value: An integer value specifying the right margin.
      */
     marginRight: number;
     /**
-     * Gets or sets a table cell's top margin.
+     * Gets or sets a table cell's top margin in twips.
      * Value: An integer value specifying the top margin.
      */
     marginTop: number;
     /**
-     * Gets or sets a table cell's bottom margin.
+     * Gets or sets a table cell's bottom margin in twips.
      * Value: An integer value specifying the bottom margin.
      */
     marginBottom: number;
@@ -15798,12 +16711,12 @@ interface TableFormattingSettings {
      */
     alignment: any;
     /**
-     * Gets or sets the table's left indent.
+     * Gets or sets the table's left indent in twips.
      * Value: An integer value specifying the indent.
      */
     indent: number;
     /**
-     * Gets or sets the spacing between table cells.
+     * Gets or sets the spacing between table cells in twips.
      * Value: An integer value specifying the spacing.
      */
     spacingBetweenCells: number;
@@ -15818,22 +16731,22 @@ interface TableFormattingSettings {
      */
     resizeToFitContent: boolean;
     /**
-     * Gets or sets the default left margin for cells in the table.
+     * Gets or sets the default left margin for cells in the table in twips.
      * Value: An integer value specifying the margin value.
      */
     defaultCellMarginLeft: number;
     /**
-     * Gets or sets the default right margin for cells in the table.
+     * Gets or sets the default right margin for cells in the table in twips.
      * Value: An integer value specifying the margin value.
      */
     defaultCellMarginRight: number;
     /**
-     * Gets or sets the default top margin for cells in the table.
+     * Gets or sets the default top margin for cells in the table in twips.
      * Value: An integer value specifying the margin value.
      */
     defaultCellMarginTop: number;
     /**
-     * Gets or sets the default bottom margin for cells in the table.
+     * Gets or sets the default bottom margin for cells in the table in twips.
      * Value: An integer value specifying the margin value.
      */
     defaultCellMarginBottom: number;
@@ -15843,7 +16756,7 @@ interface TableFormattingSettings {
  */
 interface TableWidthUnit {
     /**
-     * Gets or sets the table width value.
+     * Gets or sets the table width value in twips.
      * Value: An integer value specifying the table width.
      */
     value: number;
@@ -15858,7 +16771,7 @@ interface TableWidthUnit {
  */
 interface TableHeightUnit {
     /**
-     * Gets or sets the table height value.
+     * Gets or sets the table height value in twips.
      * Value: An integer value specifying the table height.
      */
     value: number;
@@ -15907,7 +16820,7 @@ interface ChangeFontNameCommand extends CommandBase {
 interface ChangeFontSizeCommand extends CommandBase {
     /**
      * Executes the ChangeFontSizeCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
-     * @param fontSize An integer number specifying the font size.
+     * @param fontSize An integer number specifying the font size in points.
      */
     execute(fontSize: number): boolean;
     /**
@@ -16161,7 +17074,7 @@ interface FontFormattingSettings {
      */
     fontName: string;
     /**
-     * Gets or sets the character(s) font size.
+     * Gets or sets the character(s) font size (in points).
      * Value: An integer value specifying the font size.
      */
     size: number;
@@ -16197,7 +17110,7 @@ interface FontFormattingSettings {
     italic: boolean;
     /**
      * Gets or sets a value specifying whether the strikeout formatting is applied to a character(s).
-     * Value: true if the strikeout formatting is applied; otherwise, false.
+     * Value: true, if the strikeout formatting is applied; otherwise, false.
      */
     strikeout: boolean;
     /**
@@ -16972,7 +17885,7 @@ interface YearlyRecurrenceValuesAccessor extends DefaultRecurrenceRuleValuesAcce
     GetWeekOfMonth(): ASPxClientWeekOfMonth;
 }
 /**
- * Provides base functionality for ASPxClientScheduler's forms.
+ * Provides base functionality for the ASPxClientScheduler's forms.
  */
 interface ASPxClientFormBase {
     /**
@@ -17201,6 +18114,10 @@ interface ASPxClientScheduler extends ASPxClientControl {
      * Client-side event that fires before an appointment is deleted.
      */
     AppointmentDeleting: ASPxClientEvent<ASPxClientAppointmentDeletingEventHandler<ASPxClientScheduler>>;
+    /**
+     * Fires on the client side before the appointment tooltip is shown.
+     */
+    AppointmentToolTipShowing: ASPxClientEvent<ASPxClientAppointmentToolTipShowingEventHandler<ASPxClientScheduler>>;
     /**
      * Client-side scripting  method that gets the active View.
      */
@@ -17265,6 +18182,24 @@ interface ASPxClientScheduler extends ASPxClientControl {
      * Client-side function that returns the time interval, selected in the scheduler.
      */
     GetSelectedInterval(): ASPxClientTimeInterval;
+    /**
+     * Selects time cells which encompass the specified time interval on the client side.
+     * @param interval An ASPxClientTimeInterval object that specifies the time interval to select.
+     */
+    SetSelection(interval: ASPxClientTimeInterval): void;
+    /**
+     * Selects time cells which encompass the specified time interval on the client side.
+     * @param interval An ASPxClientTimeInterval object that specifies the time interval to select.
+     * @param resourceId An integer value specifying the ID of the resource to which the specified time interval belongs.
+     */
+    SetSelection(interval: ASPxClientTimeInterval, resourceId: string): void;
+    /**
+     * Selects time cells which encompass the specified time interval on the client side.
+     * @param interval An ASPxClientTimeInterval object that specifies the time interval to select.
+     * @param resourceId An integer value specifying the ID of the resource to which the specified time interval belongs.
+     * @param scrollToSelection true, to scroll the scheduler's contents to make the selection visible; otherwise, false.
+     */
+    SetSelection(interval: ASPxClientTimeInterval, resourceId: string, scrollToSelection: boolean): void;
     /**
      * Client-side function that returns the ResourceId of selected time cell's resource.
      */
@@ -17292,6 +18227,12 @@ interface ASPxClientScheduler extends ASPxClientControl {
      * @param aptId An appointment's identifier.
      */
     SelectAppointmentById(aptId: Object): void;
+    /**
+     * Selects the appointment with the specified ID.
+     * @param aptId An integer value specifying the appointment ID.
+     * @param scrollToSelection true, to scroll to the selected appointment; otherwise, false.
+     */
+    SelectAppointmentById(aptId: Object, scrollToSelection: boolean): void;
     /**
      * Enables obtaining appointment property values in a client-side script. Executes the callback command with the AppointmentData identifier.
      * @param aptId An integer, representing the appointment ID.
@@ -17439,6 +18380,42 @@ interface ASPxClientScheduler extends ASPxClientControl {
      * Client-side scripting method that changes the alert time for the selected reminder to the specified interval.
      */
     ReminderFormSnooze(): void;
+    /**
+     * Specifies whether the toolbar is visible.
+     * @param visible true, to make the toolbar visible; otherwise, false.
+     */
+    SetToolbarVisible(visible: boolean): void;
+    /**
+     * Returns a value specifying whether a toolbar is displayed.
+     */
+    GetToolbarVisible(): boolean;
+    /**
+     * Specifies whether the Resource Navigator is visible.
+     * @param visible true, to make the Resource Navigator visible; otherwise, false.
+     */
+    SetResourceNavigatorVisible(visible: boolean): void;
+    /**
+     * Returns a value specifying whether the Resource Navigator is displayed.
+     */
+    GetResourceNavigatorVisible(): boolean;
+    /**
+     * Returns the value specifying the Scheduler's scrollable area height.
+     */
+    GetScrollAreaHeight(): number;
+    /**
+     * Specifies the All-Day Area area height.
+     * @param height An integer value specifying the all-day area height.
+     */
+    SetAllDayAreaHeight(height: number): void;
+    /**
+     * Gets the All-Day Area area height.
+     */
+    GetAllDayAreaHeight(): number;
+    /**
+     * Sets the Scheduler's height.
+     * @param height An integer value specifying the scheduler's height.
+     */
+    SetHeight(height: number): void;
 }
 /**
  * Represents a client-side equivalent of the SchedulerViewType object.
@@ -17923,6 +18900,27 @@ interface CellClickEventArgs extends ASPxClientEventArgs {
      */
     resource: string;
 }
+/**
+ * A method that will handle the client AppointmentToolTipShowing event.
+ */
+interface ASPxClientAppointmentToolTipShowingEventHandler<S> {
+    /**
+     * A method that will handle the corresponding client event.
+     * @param source The event source.
+     * @param e An ASPxClientAppointmentToolTipShowingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientAppointmentToolTipShowingEventArgs): void;
+}
+/**
+ * Provides data for the AppointmentToolTipShowing event.
+ */
+interface ASPxClientAppointmentToolTipShowingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the appointment.
+     * Value: An ASPxClientAppointment object representing the appointment.
+     */
+    appointment: ASPxClientAppointment;
+}
 /**
  * Contains information about a client tooltip.
  */
@@ -17968,13 +18966,13 @@ interface ASPxClientToolTipBase {
      */
     CalculatePosition(bounds: Object): ASPxClientPoint;
     /**
-     * Displays the Appointment Menu in the position of the tooltip.
-     * @param eventObject An object containing information about the event on which the menu is displayed.
+     * Displays the Appointment Menu at the position of the tooltip.
+     * @param eventObject An object containing information about the event in which the menu is displayed.
      */
     ShowAppointmentMenu(eventObject: Object): void;
     /**
-     * Displays the View Menu in the position of the tooltip.
-     * @param eventObject An object containing information about the event on which the menu is displayed.
+     * Displays the View Menu at the position of the tooltip.
+     * @param eventObject An object containing information about the event in which the menu is displayed.
      */
     ShowViewMenu(eventObject: Object): void;
     /**
@@ -18579,6 +19577,20 @@ interface ASPxClientTreeList extends ASPxClientControl {
      * Occurs after a column's width has been changed by an end-user.
      */
     ColumnResized: ASPxClientEvent<ASPxClientTreeListColumnResizedEventHandler<ASPxClientTreeList>>;
+    /**
+     * Hides the Filter Control.
+     */
+    CloseFilterControl(): void;
+    /**
+     * Enables or disables the current filter.
+     * @param isFilterEnabled true to enable the current filter; otherwise, false.
+     */
+    SetFilterEnabled(isFilterEnabled: boolean): void;
+    /**
+     * Specifies a custom editor for the search panel on the client side.
+     * @param editor An ASPxClientEdit object representing a custom editor.
+     */
+    SetSearchPanelCustomEditor(editor: ASPxClientEdit): void;
     /**
      * Sets input focus to the ASPxTreeList.
      */
@@ -18973,6 +19985,66 @@ interface ASPxClientTreeList extends ASPxClientControl {
      * @param position An integer value specifying the horizontal scroll position.
      */
     SetHorizontalScrollPosition(position: number): void;
+    /**
+     * Exports tree list data to a file in the specified format.
+     * @param format An ASPxClientTreeListExportFormat object specifying the export format.
+     */
+    ExportTo(format: ASPxClientTreeListExportFormat): void;
+    /**
+     * Applies the specified filter expression to the tree list.
+     * @param filterExpression A string value that specifies the filter expression.
+     */
+    ApplyFilter(filterExpression: string): void;
+    /**
+     * Clears the filter expression applied to a client Tree List.
+     */
+    ClearFilter(): void;
+    /**
+     * Applies a filter specified in the filter row to the ASPxTreeList.
+     */
+    ApplyOnClickRowFilter(): void;
+    /**
+     * Applies the specified search panel filter criterion to tree list data.
+     * @param value A string value that specifies the filter criterion.
+     */
+    ApplySearchPanelFilter(value: string): void;
+    /**
+     * Returns the editor used to edit the value in the auto filter row for the specified data column.
+     * @param column An ASPxClientTreeListColumn object that represents the data column within the ASPxTreeList.
+     */
+    GetAutoFilterEditor(column: ASPxClientTreeListColumn): Object;
+    /**
+     * Returns the editor used to edit the value in the auto filter row for the specified data column.
+     * @param columnIndex An integer value that identifies the data column by its index.
+     */
+    GetAutoFilterEditor(columnIndex: number): Object;
+    /**
+     * Returns the editor used to edit the value in the auto filter row for the specified data column.
+     * @param columnFieldNameOrId A string value that specifies the column's name or its data base field name.
+     */
+    GetAutoFilterEditor(columnFieldNameOrId: string): Object;
+    /**
+     * Applies a filter to the specified data column.
+     * @param column An ASPxClientTreeListColumn object that represents the data column within the client Tree List.
+     * @param val A string value that specifies the filter expression.
+     */
+    AutoFilterByColumn(column: ASPxClientTreeListColumn, val: string): void;
+    /**
+     * Applies a filter to the specified data column.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     * @param val A string value that specifies the filter expression.
+     */
+    AutoFilterByColumn(columnIndex: number, val: string): void;
+    /**
+     * Applies a filter to the specified data column.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     * @param val A string value that specifies the filter expression.
+     */
+    AutoFilterByColumn(columnFieldNameOrId: string, val: string): void;
+    /**
+     * Displays the Filter Control.
+     */
+    ShowFilterControl(): void;
 }
 /**
  * Represents a client column.
@@ -18994,6 +20066,11 @@ interface ASPxClientTreeListColumn {
      */
     fieldName: string;
 }
+/**
+ * Lists values that specify the document formats available for export from the tree list.
+ */
+interface ASPxClientTreeListExportFormat {
+}
 /**
  * Provides data for the CustomDataCallback event.
  */
@@ -19227,8 +20304,8 @@ interface ASPxClientTreeListToolbarItemClickEventArgs extends ASPxClientProcessi
      */
     toolbarName: string;
     /**
-     * Gets the toolbar item related to the event.
-     * Value: An ASPxClientMenuItem object that is the toolbar item.
+     * Gets the clicked menu item
+     * Value: An ASPxClientMenu value that is the menu item.
      */
     item: ASPxClientMenuItem;
     /**
@@ -19252,7 +20329,241 @@ interface ASPxClientTreeListToolbarItemClickEventHandler<S> {
  * Represents a client-side equivalent of the BootstrapAccordion control.
  */
 interface BootstrapClientAccordion extends ASPxClientNavBar {
+    /**
+     * Returns a group specified by its index.
+     * @param index An integer value specifying the zero-based index of the group object to retrieve.
+     */
+    GetGroup(index: number): BootstrapClientAccordionGroup;
+    /**
+     * Returns a group specified by its name.
+     * @param name A string value specifying the name of the group.
+     */
+    GetGroupByName(name: string): BootstrapClientAccordionGroup;
+    /**
+     * Returns the Accordion control's active group.
+     */
+    GetActiveGroup(): BootstrapClientAccordionGroup;
+    /**
+     * Makes the specified group active.
+     * @param group A BootstrapClientAccordionGroup object that specifies the active group.
+     */
+    SetActiveGroup(group: BootstrapClientAccordionGroup): void;
+    /**
+     * Returns an item specified by its name.
+     * @param name A string value specifying the name of the item.
+     */
+    GetItemByName(name: string): BootstrapClientAccordionItem;
+    /**
+     * Returns the selected item within the Accordion control.
+     */
+    GetSelectedItem(): BootstrapClientAccordionItem;
+    /**
+     * Selects the specified item within the Accordion control on the client side.
+     * @param item A BootstrapClientAccordionItem object specifying the item to select.
+     */
+    SetSelectedItem(item: BootstrapClientAccordionItem): void;
+    /**
+     * Makes the specified group active.
+     * @param group A ASPxClientNavBarGroup object that specifies the active group.
+     */
+    SetActiveGroup(group: ASPxClientNavBarGroup): void;
+    /**
+     * Selects the specified item within the navbar control on the client side.
+     * @param item An ASPxClientNavBarItem object specifying the item to select.
+     */
+    SetSelectedItem(item: ASPxClientNavBarItem): void;
 }
+/**
+ * Represents a client-side equivalent of the Accordion's BootstrapAccordionGroup object.
+ */
+interface BootstrapClientAccordionGroup extends ASPxClientNavBarGroup {
+    /**
+     * Gets the BootstrapClientAccordion object to which the current group belongs.
+     * Value: A <see cref="BootstrapClientAccordion" /> object that is the group's owner.
+     */
+    navBar: BootstrapClientAccordion;
+    /**
+     * Returns the group's item specified by its index.
+     * @param index An integer value specifying the zero-based index of the item to be retrieved.
+     */
+    GetItem(index: number): BootstrapClientAccordionItem;
+    /**
+     * Returns a group item specified by its name.
+     * @param name A string value specifying the name of the item.
+     */
+    GetItemByName(name: string): BootstrapClientAccordionItem;
+    /**
+     * Gets the text displayed within an accordion group header badge.
+     */
+    GetHeaderBadgeText(): string;
+    /**
+     * Sets the text displayed within an accordion group header badge.
+     * @param text A String specifying the badge text.
+     */
+    SetHeaderBadgeText(text: string): void;
+    /**
+     * Gets the CSS class of the icon displayed within an accordion group header badge.
+     */
+    GetHeaderBadgeIconCssClass(): string;
+    /**
+     * Sets the CSS class of the icon displayed within an accordion group header badge.
+     * @param cssClass A String containing the name of a CSS class.
+     */
+    SetHeaderBadgeIconCssClass(cssClass: string): void;
+}
+/**
+ * Represents a client-side equivalent of the Accordion's BootstrapAccordionItem object.
+ */
+interface BootstrapClientAccordionItem extends ASPxClientNavBarItem {
+    /**
+     * Gets the BootstrapClientAccordion object to which the current item belongs.
+     * Value: A <see cref="BootstrapClientAccordion" /> object that is the item's owner.
+     */
+    navBar: BootstrapClientAccordion;
+    /**
+     * Gets the group to which the current item belongs.
+     * Value: A <see cref="BootstrapClientAccordionGroup" /> object representing the group to which the item belongs.
+     */
+    group: BootstrapClientAccordionGroup;
+    /**
+     * Gets the text displayed within the accordion item badge.
+     */
+    GetBadgeText(): string;
+    /**
+     * Sets the text displayed within the accordion item badge.
+     * @param text A String specifying the badge text.
+     */
+    SetBadgeText(text: string): void;
+    /**
+     * Gets the CSS class of the icon displayed within the accordion item badge.
+     */
+    GetBadgeIconCssClass(): string;
+    /**
+     * Sets the CSS class of the icon displayed within the accordion item badge.
+     * @param cssClass A string containing the name of a CSS class.
+     */
+    SetBadgeIconCssClass(cssClass: string): void;
+    /**
+     * Specifies the URL which points to the image displayed within the item.
+     */
+    GetImageUrl(): string;
+    /**
+     * Specifies the URL which points to the image displayed within the item.
+     * @param value 
+     */
+    SetImageUrl(value: string): void;
+    /**
+     * Gets the CSS class of the icon displayed by the Accordion item.
+     */
+    GetIconCssClass(): string;
+    /**
+     * Sets the CSS class of the icon displayed by the Accordion item.
+     * @param cssClass A string containing the name of a CSS class.
+     */
+    SetIconCssClass(cssClass: string): void;
+}
+/**
+ * A method that will handle the Accordion control's client events concerning manipulations with an item.
+ */
+interface BootstrapClientAccordionItemEventHandler<S> {
+    /**
+     * A method that will handle the Accordion control's client events concerning manipulations with an item.
+     * @param source An object representing the event source. Identifies the BootstrapClientAccordion control that raised the event.
+     * @param e An BootstrapClientAccordionItemEventArgs object that contains event data.
+     */
+    (source: S, e: BootstrapClientAccordionItemEventArgs): void;
+}
+/**
+ * Provides data for events related to manipulations on items.
+ */
+interface BootstrapClientAccordionItemEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the item object related to the event.
+     * Value: A BootstrapClientAccordionItem object, manipulations on which forced the event to be raised.
+     */
+    item: BootstrapClientAccordionItem;
+    /**
+     * Gets an HTML object that contains the processed Accordion item.
+     * Value: An HTML object.
+     */
+    htmlElement: Object;
+    /**
+     * Gets a DHTML event object that relates to the processed event.
+     * Value: A DHTML event object.
+     */
+    htmlEvent: Object;
+}
+/**
+ * A method that will handle the Accordion control's client events concerning manipulations with a group.
+ */
+interface BootstrapClientAccordionGroupEventHandler<S> {
+    /**
+     * A method that will handle the Accordion control's client events concerning manipulations with a group.
+     * @param source An object representing the event source. Identifies the BootstrapClientAccordion control that raised the event.
+     * @param e An BootstrapClientAccordionGroupEventArgs object that contains event data.
+     */
+    (source: S, e: BootstrapClientAccordionGroupEventArgs): void;
+}
+/**
+ * Provides data for events related to manipulations on groups.
+ */
+interface BootstrapClientAccordionGroupEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the group object related to the event.
+     * Value: A BootstrapClientAccordionGroup object, manipulations on which forced the event to be raised.
+     */
+    group: BootstrapClientAccordionGroup;
+}
+/**
+ * A method that will handle the Accordion control's cancelable client events concerning manipulations with a group.
+ */
+interface BootstrapClientAccordionGroupCancelEventHandler<S> {
+    /**
+     * A method that will handle the Accordion control's cancelable client events concerning manipulations with a group.
+     * @param source An object representing the event source. Identifies the BootstrapClientAccordion control that raised the event.
+     * @param e An BootstrapClientAccordionGroupCancelEventArgs object that contains event data.
+     */
+    (source: S, e: BootstrapClientAccordionGroupCancelEventArgs): void;
+}
+/**
+ * Provides data for events related to manipulations on accordion groups.
+ */
+interface BootstrapClientAccordionGroupCancelEventArgs extends ASPxClientProcessingModeCancelEventArgs {
+    /**
+     * Gets the group object related to the event.
+     * Value: A BootstrapClientAccordionGroup object, manipulations on which forced the event to be raised.
+     */
+    group: BootstrapClientAccordionGroup;
+}
+/**
+ * A method that will handle the Accordion control's client events concerning clicks on groups.
+ */
+interface BootstrapClientAccordionGroupClickEventHandler<S> {
+    /**
+     * A method that will handle the Accordion control's client events concerning clicks on groups.
+     * @param source An object representing the event source. Identifies the BootstrapClientAccordion control that raised the event.
+     * @param e An BootstrapClientAccordionGroupClickEventArgs object that contains event data.
+     */
+    (source: S, e: BootstrapClientAccordionGroupClickEventArgs): void;
+}
+/**
+ * Provides data for events related to clicking on the control's group headers.
+ */
+interface BootstrapClientAccordionGroupClickEventArgs extends BootstrapClientAccordionGroupCancelEventArgs {
+    /**
+     * Gets an HTML object that contains the processed Accordion group.
+     * Value: An HTML object.
+     */
+    htmlElement: Object;
+    /**
+     * Gets a DHTML event object that relates to the processed event.
+     * Value: A DHTML event object.
+     */
+    htmlEvent: Object;
+}
+/**
+ * Represents the client-side equivalent of the BootstrapBinaryImage control.
+ */
 interface BootstrapClientBinaryImage extends ASPxClientHyperLink {
 }
 /**
@@ -19268,6 +20579,24 @@ interface BootstrapClientButton extends ASPxClientButton {
      * @param value A string value specifying the text to be displayed within the button.
      */
     SetText(value: string): void;
+    /**
+     * Gets the text displayed within the button badge.
+     */
+    GetBadgeText(): string;
+    /**
+     * Sets the text displayed within the button badge.
+     * @param text A String specifying the badge text.
+     */
+    SetBadgeText(text: string): void;
+    /**
+     * Gets the CSS class of the icon displayed within the button badge.
+     */
+    GetBadgeIconCssClass(): string;
+    /**
+     * Sets the CSS class of the icon displayed within the button badge.
+     * @param cssClass A string containing the name of a CSS class.
+     */
+    SetBadgeIconCssClass(cssClass: string): void;
 }
 /**
  * Represents a client-side equivalent of the BootstrapCalendar control.
@@ -19320,92 +20649,12 @@ interface BootstrapClientCallbackPanel extends ASPxClientControl {
      */
     GetEnabled(): boolean;
 }
-/**
- * Serves as the base type for the BootstrapClientPieChart objects.
- */
-interface BootstrapClientChartBase extends ASPxClientControl {
-    Done: ASPxClientEvent<BootstrapClientChartBaseDoneEventHandler<BootstrapClientChartBase>>;
-    LegendClick: ASPxClientEvent<BootstrapClientChartBaseLegendClickEventHandler<BootstrapClientChartBase>>;
-    PointClick: ASPxClientEvent<BootstrapClientChartBasePointClickEventHandler<BootstrapClientChartBase>>;
-    PointHoverChanged: ASPxClientEvent<BootstrapClientChartBasePointHoverChangedEventHandler<BootstrapClientChartBase>>;
-    PointSelectionChanged: ASPxClientEvent<BootstrapClientChartBasePointSelectionChangedEventHandler<BootstrapClientChartBase>>;
-    TooltipHidden: ASPxClientEvent<BootstrapClientChartBaseTooltipHiddenEventHandler<BootstrapClientChartBase>>;
-    TooltipShown: ASPxClientEvent<BootstrapClientChartBaseTooltipShownEventHandler<BootstrapClientChartBase>>;
-    ArgumentAxisClick: ASPxClientEvent<BootstrapClientCoordinateSystemChartArgumentAxisClickEventHandler<BootstrapClientChartBase>>;
-    SeriesClick: ASPxClientEvent<BootstrapClientCoordinateSystemChartSeriesClickEventHandler<BootstrapClientChartBase>>;
-    SeriesHoverChanged: ASPxClientEvent<BootstrapClientCoordinateSystemChartSeriesHoverChangedEventHandler<BootstrapClientChartBase>>;
-    SeriesSelectionChanged: ASPxClientEvent<BootstrapClientCoordinateSystemChartSeriesSelectionChangedEventHandler<BootstrapClientChartBase>>;
-}
-/**
- * Represents a client-side equivalent of the BootstrapChart control.
- */
-interface BootstrapClientChart extends BootstrapClientChartBase {
-    ZoomStart: ASPxClientEvent<BootstrapClientChartZoomStartEventHandler<BootstrapClientChart>>;
-    ZoomEnd: ASPxClientEvent<BootstrapClientChartZoomEndEventHandler<BootstrapClientChart>>;
-}
-/**
- * Represents a client-side equivalent of the BootstrapPolarChart control.
- */
-interface BootstrapClientPolarChart extends BootstrapClientChartBase {
-}
-/**
- * Represents a client-side equivalent of the BootstrapPieChart control.
- */
-interface BootstrapClientPieChart extends BootstrapClientChartBase {
-}
-interface BootstrapClientChartBaseDoneEventHandler<S> {
-    (source: S, e: BootstrapUIWidgetEventArgsBase): void;
-}
-interface BootstrapClientChartBaseLegendClickEventHandler<S> {
-    (source: S, e: BootstrapUIWidgetElementClickEventArgs): void;
-}
-interface BootstrapClientCoordinateSystemChartArgumentAxisClickEventHandler<S> {
-    (source: S, e: BootstrapUIWidgetElementClickEventArgs): void;
-}
-interface BootstrapClientChartBasePointClickEventHandler<S> {
-    (source: S, e: BootstrapUIWidgetElementClickEventArgs): void;
-}
-interface BootstrapClientChartBasePointHoverChangedEventHandler<S> {
-    (source: S, e: BootstrapUIWidgetElementActionEventArgs): void;
-}
-interface BootstrapClientChartBasePointSelectionChangedEventHandler<S> {
-    (source: S, e: BootstrapUIWidgetElementActionEventArgs): void;
-}
-interface BootstrapClientChartBaseTooltipHiddenEventHandler<S> {
-    (source: S, e: BootstrapUIWidgetElementActionEventArgs): void;
-}
-interface BootstrapClientChartBaseTooltipShownEventHandler<S> {
-    (source: S, e: BootstrapUIWidgetElementActionEventArgs): void;
-}
-interface BootstrapClientCoordinateSystemChartSeriesClickEventHandler<S> {
-    (source: S, e: BootstrapUIWidgetElementClickEventArgs): void;
-}
-interface BootstrapClientCoordinateSystemChartSeriesHoverChangedEventHandler<S> {
-    (source: S, e: BootstrapUIWidgetElementActionEventArgs): void;
-}
-interface BootstrapClientCoordinateSystemChartSeriesSelectionChangedEventHandler<S> {
-    (source: S, e: BootstrapUIWidgetElementActionEventArgs): void;
-}
-interface BootstrapClientChartZoomStartEventHandler<S> {
-    (source: S, e: BootstrapUIWidgetEventArgsBase): void;
-}
-interface BootstrapClientChartZoomEndEventHandler<S> {
-    (source: S, e: BootstrapClientChartZoomEndEventArgs): void;
-}
-interface BootstrapUIWidgetEventArgsBase extends ASPxClientEventArgs {
-    component: Object;
-    element: Object;
-}
-interface BootstrapClientChartZoomEndEventArgs extends BootstrapUIWidgetEventArgsBase {
-    rangeStart: Object;
-    rangeEnd: Object;
-}
 /**
  * Represents a client-side equivalent of the BootstrapCheckBox control.
  */
 interface BootstrapClientCheckBox extends ASPxClientEdit {
     /**
-     * Occurs on the client side when the editor's checked state is changed.
+     * Occurs on the client side when the editor's checked state has been changed.
      */
     CheckedChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<BootstrapClientCheckBox>>;
     /**
@@ -19414,7 +20663,7 @@ interface BootstrapClientCheckBox extends ASPxClientEdit {
     GetChecked(): boolean;
     /**
      * Sets a value which specifies the checked status of the check box editor.
-     * @param isChecked 
+     * @param isChecked true if the check box editor is checked; otherwise, false.
      */
     SetChecked(isChecked: boolean): void;
     /**
@@ -19427,12 +20676,12 @@ interface BootstrapClientCheckBox extends ASPxClientEdit {
     GetCheckState(): string;
     /**
      * Sets a value specifying the state of a check box.
-     * @param checkState 
+     * @param checkState A string value matches one of the CheckState enumeration values.
      */
     SetCheckState(checkState: string): void;
     /**
      * Sets the text to be displayed within the editor.
-     * @param text 
+     * @param text A string value specifying the text to be displayed within the editor.
      */
     SetText(text: string): void;
 }
@@ -19450,103 +20699,125 @@ interface BootstrapClientComboBox extends ASPxClientComboBox {
      */
     GetSelectedItem(): BootstrapClientListBoxItem;
     /**
-     * Sets the combo box editor's selected item.
-     * @param item 
+     * Sets the list editor's selected item.
+     * @param item A BootstrapClientListBoxItem object that specifies the item to select.
      */
     SetSelectedItem(item: BootstrapClientListBoxItem): void;
     /**
      * Returns an item specified by its index within the combo box editor's item collection.
-     * @param index 
+     * @param index An integer value specifying the zero-based index of the item to search for.
      */
     GetItem(index: number): BootstrapClientListBoxItem;
     /**
      * Returns a combo box item by its text.
-     * @param text 
+     * @param text A string that specifies the item's text.
      */
     FindItemByText(text: string): BootstrapClientListBoxItem;
     /**
      * Returns a combo box item by its value.
-     * @param value 
+     * @param value An object that specifies the item's value.
      */
     FindItemByValue(value: Object): BootstrapClientListBoxItem;
     /**
-     * Adds a new item to the editor, specifying the item's display text, and returns the index of the added item.
+     * Adds a new item to the end of the editor's items collection, specifying the item's display text, and returns the index of the added item.
      * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of the corresponding fields within the editor's Fields collection.
      */
     AddItem(texts: string[]): number;
     /**
      * Adds a new item to the end of the control's items collection.
-     * @param texts 
-     * @param value 
+     * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of the corresponding fields within the editor's Fields collection.
+     * @param value An object that represents the item's associated value.
      */
     AddItem(texts: string[], value: Object): number;
     /**
      * Adds a new item to the end of the control's items collection.
-     * @param texts 
-     * @param value 
-     * @param iconCssClass 
+     * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of the corresponding fields within the editor's Fields collection.
+     * @param value An object that represents the item's associated value.
+     * @param iconCssClass A String value specifying the CSS class of the image displayed by the list item.
      */
     AddItem(texts: string[], value: Object, iconCssClass: string): number;
     /**
-     * Adds a new item to the editor specifying the item's display text and returns the index of the added item.
-     * @param text 
+     * Adds a new item to the editor, specifying the item's display text, and returns the index of the added item.
+     * @param text A string value specifying the item's display text.
      */
     AddItem(text: string): number;
     /**
-     * Adds a new item to the editor specifying the item's display text and associated value, and returns the index of the added item.
-     * @param text 
-     * @param value 
+     * Adds a new item to the editor, specifying the item's display text and associated value, and returns the index of the added item.
+     * @param text A string value specifying the item's display text.
+     * @param value An object that represents the item's associated value.
      */
     AddItem(text: string, value: Object): number;
     /**
-     * Adds a new item to the editor specifying the item's display text, associated value and displayed image, and returns the index of the added item.
-     * @param text 
-     * @param value 
-     * @param iconCssClass 
+     * Adds a new item to the editor, specifying the item's display text, associated value and displayed image, and returns the index of the added item.
+     * @param text A string value specifying the item's display text.
+     * @param value An object that represents the item's associated value.
+     * @param iconCssClass A String value specifying the CSS class of the image displayed by the list item.
      */
     AddItem(text: string, value: Object, iconCssClass: string): number;
     /**
-     * Adds a new item to the control's items collection at the specified index.
-     * @param index 
-     * @param texts 
-     * @param value 
-     * @param iconCssClass 
+     * Inserts a new item into the control's items collection at the specified index.
+     * @param index An integer value that represents the index position.
+     * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of the corresponding field within the editor's Fields collection.
+     * @param value An object that represents the item's associated value.
+     * @param iconCssClass A String value specifying the CSS class of the image displayed by the list item.
      */
     InsertItem(index: number, texts: string[], value: Object, iconCssClass: string): void;
     /**
-     * Adds a new item to the control's items collection at the specified index.
-     * @param index 
-     * @param texts 
-     * @param value 
+     * Inserts a new item into the control's items collection at the specified index.
+     * @param index An integer value that represents the index position.
+     * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of the corresponding fields within the editor's Fields collection.
+     * @param value An object that represents the item's associated value.
      */
     InsertItem(index: number, texts: string[], value: Object): void;
     /**
-     * Adds a new item to the control's items collection at the specified index.
-     * @param index 
-     * @param texts 
+     * Inserts a new item into the control's items collection at the specified index.
+     * @param index An integer value that represents the index position.
+     * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of the corresponding fields within the editor's Fields collection.
      */
     InsertItem(index: number, texts: string[]): void;
     /**
-     * Adds a new item to the control's items collection at the specified index.
-     * @param index 
-     * @param text 
-     * @param value 
-     * @param iconCssClass 
+     * Inserts a new item specified by its display text, associated value and displayed image into the editor's item collection, at the position specified.
+     * @param index An integer value that represents the index position.
+     * @param text A string value specifying the item's display text.
+     * @param value An object that represents the item's associated value.
+     * @param iconCssClass A String value specifying the CSS class of the image displayed by the list item.
      */
     InsertItem(index: number, text: string, value: Object, iconCssClass: string): void;
     /**
-     * Inserts a new item specified by its display text and associated value into the editor's item collection, at the position specified.
-     * @param index 
-     * @param text 
-     * @param value 
+     * Inserts a new item specified by its display text, associated value and displayed image into the editor's item collection, at the position specified.
+     * @param index An integer value that represents the index position.
+     * @param text A string value specifying the item's display text.
+     * @param value An object that represents the item's associated value.
      */
     InsertItem(index: number, text: string, value: Object): void;
     /**
-     * Inserts a new item specified by its display text into the editor's item collection, at the position specified.
-     * @param index 
-     * @param text 
+     * Inserts a new item into the control's items collection at the specified index.
+     * @param index An integer value that represents the index position.
+     * @param text A string value specifying the item's display text.
      */
     InsertItem(index: number, text: string): void;
+    /**
+     * Gets the text displayed within a Combo Box item badge.
+     * @param index The index of a Combo Box item.
+     */
+    GetItemBadgeText(index: number): string;
+    /**
+     * Sets the text displayed within a Combo Box item badge.
+     * @param index The index of a Combo Box item.
+     * @param text A String specifying the badge text.
+     */
+    SetItemBadgeText(index: number, text: string): void;
+    /**
+     * Gets the CSS class of the icon displayed within a Combo Box item badge.
+     * @param index The index of a Combo Box item.
+     */
+    GetItemBadgeIconCssClass(index: number): string;
+    /**
+     * Sets the CSS class of the icon displayed within a Combo Box item badge.
+     * @param index The index of a Combo Box item.
+     * @param cssClass A String containing the name of a CSS class.
+     */
+    SetItemBadgeIconCssClass(index: number, cssClass: string): void;
     /**
      * Sets the list editor's selected item.
      * @param item An ASPxClientListEditItem object that specifies the item to select.
@@ -19572,7 +20843,28 @@ interface BootstrapClientFormLayout extends ASPxClientFormLayout {
  * Represents a client-side equivalent of the BootstrapHyperLink control.
  */
 interface BootstrapClientHyperLink extends ASPxClientHyperLink {
+    /**
+     * Gets the text displayed within the hyperlink badge.
+     */
+    GetBadgeText(): string;
+    /**
+     * Sets the text displayed within the hyperlink badge.
+     * @param text A String specifying the badge text.
+     */
+    SetBadgeText(text: string): void;
+    /**
+     * Gets the CSS class of the icon displayed within the hyperlink badge.
+     */
+    GetBadgeIconCssClass(): string;
+    /**
+     * Sets the CSS class of the icon displayed within the hyperlink badge.
+     * @param cssClass A string containing the name of a CSS class.
+     */
+    SetBadgeIconCssClass(cssClass: string): void;
 }
+/**
+ * Represents the client-side equivalent of the BootstrapImage control.
+ */
 interface BootstrapClientImage extends ASPxClientImage {
 }
 /**
@@ -19583,6 +20875,10 @@ interface BootstrapClientListBoxItem extends ASPxClientListEditItem {
      * This member is not in effect for this class. It is overridden only for the purpose of preventing it from appearing in Microsoft Visual Studio designer tools.
      */
     imageUrl: string;
+    /**
+     * Gets the CSS class of the icon displayed by the list box item.
+     * Value: A string containing the name of a CSS class.
+     */
     iconCssClass: string;
     /**
      * 
@@ -19595,13 +20891,13 @@ interface BootstrapClientListBoxItem extends ASPxClientListEditItem {
      */
     GetColumnText(columnName: string): string;
     /**
-     * 
-     * @param fieldIndex 
+     * Returns the list item's text value that corresponds to a data field specified by its index.
+     * @param fieldIndex An integer value that specifies the field's index within the editor's Fields collection.
      */
     GetFieldText(fieldIndex: number): string;
     /**
-     * 
-     * @param fieldName 
+     * Returns the list item's text value that corresponds to a data field specified by its name.
+     * @param fieldName A string value that specifies the data field's name defined via a FieldName property.
      */
     GetFieldText(fieldName: string): string;
 }
@@ -19610,17 +20906,17 @@ interface BootstrapClientListBoxItem extends ASPxClientListEditItem {
  */
 interface BootstrapClientListBox extends ASPxClientListBox {
     /**
-     * Returns the list box editor's selected item.
+     * Returns the list editor's selected item.
      */
     GetSelectedItem(): BootstrapClientListBoxItem;
     /**
-     * Sets the list box editor's selected item.
-     * @param item 
+     * Sets the list editor's selected item.
+     * @param item A BootstrapClientListBoxItem object that specifies the item to select.
      */
     SetSelectedItem(item: BootstrapClientListBoxItem): void;
     /**
      * Returns an item specified by its index within the list box editor's item collection.
-     * @param index 
+     * @param index An integer value specifying the zero-based index of the item to search for.
      */
     GetItem(index: number): BootstrapClientListBoxItem;
     /**
@@ -19629,102 +20925,124 @@ interface BootstrapClientListBox extends ASPxClientListBox {
     GetSelectedItems(): BootstrapClientListBoxItem[];
     /**
      * Selects the specified items within a list box.
-     * @param items 
+     * @param items An array of BootstrapClientListBoxItem objects that represent the items.
      */
     SelectItems(items: BootstrapClientListBoxItem[]): void;
     /**
      * Unselects an array of the specified list box items.
-     * @param items 
+     * @param items An array of BootstrapClientListBoxItem objects that represent the items.
      */
     UnselectItems(items: BootstrapClientListBoxItem[]): void;
     /**
      * Returns a list box item by its text.
-     * @param text 
+     * @param text A string that specifies the item's text.
      */
     FindItemByText(text: string): BootstrapClientListBoxItem;
     /**
      * Returns a list box item by its value.
-     * @param value 
+     * @param value An object that specifies the item's value.
      */
     FindItemByValue(value: Object): BootstrapClientListBoxItem;
     /**
      * Adds a new item to the end of the editor's items collection, specifying the item's display text, and returns the index of the added item.
-     * @param texts 
+     * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of the corresponding fields within the editor's Fields collection.
      */
     AddItem(texts: string[]): number;
     /**
      * Adds a new item to the end of the control's items collection.
-     * @param texts 
-     * @param value 
+     * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of the corresponding fields within the editor's Fields collection.
+     * @param value An object that represents the item's associated value.
      */
     AddItem(texts: string[], value: Object): number;
     /**
      * Adds a new item to the end of the control's items collection.
-     * @param texts 
-     * @param value 
-     * @param iconCssClass 
+     * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of the corresponding fields within the editor's Fields collection.
+     * @param value An object that represents the item's associated value.
+     * @param iconCssClass A String value specifying the CSS class of the image displayed by the list item.
      */
     AddItem(texts: string[], value: Object, iconCssClass: string): number;
     /**
      * Adds a new item to the editor, specifying the item's display text, and returns the index of the added item.
-     * @param text 
+     * @param text A string value specifying the item's display text.
      */
     AddItem(text: string): number;
     /**
      * Adds a new item to the editor, specifying the item's display text and associated value, and returns the index of the added item.
-     * @param text 
-     * @param value 
+     * @param text A string value specifying the item's display text.
+     * @param value An object that represents the item's associated value.
      */
     AddItem(text: string, value: Object): number;
     /**
      * Adds a new item to the editor, specifying the item's display text, associated value and displayed image, and returns the index of the added item.
-     * @param text 
-     * @param value 
-     * @param iconCssClass 
+     * @param text A string value specifying the item's display text.
+     * @param value An object that represents the item's associated value.
+     * @param iconCssClass A String value specifying the CSS class of the image displayed by the list item.
      */
     AddItem(text: string, value: Object, iconCssClass: string): number;
     /**
-     * Adds a new item to the control's items collection at the specified index.
-     * @param index 
-     * @param texts 
-     * @param value 
-     * @param iconCssClass 
+     * Inserts a new item into the control's items collection at the specified index.
+     * @param index An integer value that represents the index position.
+     * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of the corresponding field within the editor's Fields collection.
+     * @param value An object that represents the item's associated value.
+     * @param iconCssClass A String value specifying the CSS class of the image displayed by the list item.
      */
     InsertItem(index: number, texts: string[], value: Object, iconCssClass: string): void;
     /**
-     * Adds a new item to the control's items collection at the specified index.
-     * @param index 
-     * @param texts 
-     * @param value 
+     * Inserts a new item into the control's items collection at the specified index.
+     * @param index An integer value that represents the index position.
+     * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of the corresponding fields within the editor's Fields collection.
+     * @param value An object that represents the item's associated value.
      */
     InsertItem(index: number, texts: string[], value: Object): void;
     /**
-     * Adds a new item to the control's items collection at the specified index.
-     * @param index 
-     * @param texts 
+     * Inserts a new item into the control's items collection at the specified index.
+     * @param index An integer value that represents the index position.
+     * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of the corresponding fields within the editor's Fields collection.
      */
     InsertItem(index: number, texts: string[]): void;
     /**
      * Inserts a new item specified by its display text, associated value and displayed image into the editor's item collection, at the position specified.
-     * @param index 
-     * @param text 
-     * @param value 
-     * @param iconCssClass 
+     * @param index An integer value that represents the index position.
+     * @param text A string value specifying the item's display text.
+     * @param value An object that represents the item's associated value.
+     * @param iconCssClass A String value specifying the CSS class of the image displayed by the list item.
      */
     InsertItem(index: number, text: string, value: Object, iconCssClass: string): void;
     /**
      * Inserts a new item specified by its display text and associated value into the editor's item collection, at the position specified.
-     * @param index 
-     * @param text 
-     * @param value 
+     * @param index An integer value representing the zero-based index of the position where the item should be inserted.
+     * @param text A string value specifying the item's display text.
+     * @param value An object specifying the value associated with the item.
      */
     InsertItem(index: number, text: string, value: Object): void;
     /**
      * Inserts a new item specified by its display text into the editor's item collection, at the position specified.
-     * @param index 
-     * @param text 
+     * @param index An integer value representing the zero-based index of the position where the item should be inserted.
+     * @param text A string value specifying the item's display text.
      */
     InsertItem(index: number, text: string): void;
+    /**
+     * Gets the text displayed within a List Box item badge.
+     * @param index The index of a List Box item.
+     */
+    GetItemBadgeText(index: number): string;
+    /**
+     * Sets the text displayed within a List Box item badge.
+     * @param index The index of a List Box item.
+     * @param text A String specifying the badge text.
+     */
+    SetItemBadgeText(index: number, text: string): void;
+    /**
+     * Gets the CSS class of the icon displayed within a List Box item badge.
+     * @param index The index of a List Box item.
+     */
+    GetItemBadgeIconCssClass(index: number): string;
+    /**
+     * Sets the CSS class of the icon displayed within a List Box item badge.
+     * @param index The index of a List Box item.
+     * @param cssClass A String containing the name of a CSS class.
+     */
+    SetItemBadgeIconCssClass(index: number, cssClass: string): void;
     /**
      * Selects the specified items within a list box.
      * @param items An array of ASPxClientListEditItem objects that represent the items.
@@ -19751,10 +21069,162 @@ interface BootstrapClientCheckBoxList extends ASPxClientCheckBoxList {
  */
 interface BootstrapClientRadioButtonList extends ASPxClientRadioButtonList {
 }
+/**
+ * Represents a client-side equivalent of the menu's BootstrapMenuItem object.
+ */
+interface BootstrapClientMenuItem extends ASPxClientMenuItem {
+    /**
+     * Gets the immediate parent item to which the current item belongs.
+     * Value: A BootstrapClientMenuItem object representing the item's immediate parent.
+     */
+    parent: BootstrapClientMenuItem;
+    /**
+     * Returns the current menu item's immediate subitem specified by its index.
+     * @param index An integer value specifying the zero-based index of the submenu item to be retrieved.
+     */
+    GetItem(index: number): BootstrapClientMenuItem;
+    /**
+     * Returns the current menu item's subitem specified by its name.
+     * @param name A string value specifying the name of the menu item.
+     */
+    GetItemByName(name: string): BootstrapClientMenuItem;
+    /**
+     * Gets the text displayed within the menu item badge.
+     */
+    GetBadgeText(): string;
+    /**
+     * Sets the text displayed within the menu item badge.
+     * @param text A String specifying the badge text.
+     */
+    SetBadgeText(text: string): void;
+    /**
+     * Gets the CSS class of the icon displayed within the menu item badge.
+     */
+    GetBadgeIconCssClass(): string;
+    /**
+     * Sets the CSS class of the icon displayed within the menu item badge.
+     * @param cssClass A string containing the name of a CSS class.
+     */
+    SetBadgeIconCssClass(cssClass: string): void;
+    /**
+     * Returns the URL pointing to the image displayed within the menu item.
+     */
+    GetImageUrl(): string;
+    /**
+     * Sets the URL which points to the image displayed within the menu item.
+     * @param value 
+     */
+    SetImageUrl(value: string): void;
+    /**
+     * Gets the CSS class of the icon displayed by the menu item.
+     */
+    GetIconCssClass(): string;
+    /**
+     * Sets the CSS class of the icon displayed by the menu item.
+     * @param cssClass A string containing the name of a CSS class.
+     */
+    SetIconCssClass(cssClass: string): void;
+}
 /**
  * Represents a client-side equivalent of the BootstrapMenu control.
  */
 interface BootstrapClientMenu extends ASPxClientMenu {
+    /**
+     * Returns the menu's root menu item specified by its index.
+     * @param index An integer value specifying the zero-based index of the root menu item to be retrieved.
+     */
+    GetItem(index: number): BootstrapClientMenuItem;
+    /**
+     * Returns a menu item specified by its name.
+     * @param name A string value specifying the name of the menu item.
+     */
+    GetItemByName(name: string): BootstrapClientMenuItem;
+    /**
+     * Returns the selected item within the menu control.
+     */
+    GetSelectedItem(): BootstrapClientMenuItem;
+    /**
+     * Selects the specified menu item within the Menu control on the client side.
+     * @param item A BootstrapClientMenuItem object specifying the menu item to select.
+     */
+    SetSelectedItem(item: BootstrapClientMenuItem): void;
+    /**
+     * Returns a root menu item.
+     */
+    GetRootItem(): BootstrapClientMenuItem;
+    /**
+     * Selects the specified menu item within a menu control on the client side.
+     * @param item An ASPxClientMenuItem object specifying the menu item to select.
+     */
+    SetSelectedItem(item: ASPxClientMenuItem): void;
+}
+/**
+ * A method that will handle the menu's client events concerning manipulations with an item.
+ */
+interface BootstrapClientMenuItemEventHandler<S> {
+    /**
+     * A method that will handle the menu's client events concerning manipulations with an item.
+     * @param source An object representing the event source. Identifies the BootstrapMenu control that raised the event.
+     * @param e An BootstrapClientMenuItemEventArgs object that contains event data.
+     */
+    (source: S, e: BootstrapClientMenuItemEventArgs): void;
+}
+/**
+ * Provides data for events related to manipulations on menu items.
+ */
+interface BootstrapClientMenuItemEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the menu item object related to the event.
+     * Value: A BootstrapClientMenuItem object, manipulations on which forced the event to be raised.
+     */
+    item: BootstrapClientMenuItem;
+}
+/**
+ * A method that will handle the ItemMouseOver events.
+ */
+interface BootstrapClientMenuItemMouseEventHandler<S> {
+    /**
+     * A method that will handle the ItemMouseOver events.
+     * @param source An object representing the event source. Identifies the BootstrapMenu control that raised the event.
+     * @param e An BootstrapClientMenuItemMouseEventArgs object that contains event data.
+     */
+    (source: S, e: BootstrapClientMenuItemMouseEventArgs): void;
+}
+/**
+ * Provides data for client events related to mouse hovering over menu items.
+ */
+interface BootstrapClientMenuItemMouseEventArgs extends BootstrapClientMenuItemEventArgs {
+}
+/**
+ * A method that will handle client ItemClick events.
+ */
+interface BootstrapClientMenuItemClickEventHandler<S> {
+    /**
+     * A method that will handle client ItemClick events.
+     * @param source An object representing the event source. Identifies the BootstrapMenu control that raised the event.
+     * @param e An BootstrapClientMenuItemClickEventArgs object that contains event data.
+     */
+    (source: S, e: BootstrapClientMenuItemClickEventArgs): void;
+}
+/**
+ * Provides data for events related to clicking on the control's items.
+ */
+interface BootstrapClientMenuItemClickEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the menu item object related to the event.
+     * Value: A BootstrapClientMenuItem object, manipulations on which forced the event to be raised.
+     */
+    item: BootstrapClientMenuItem;
+    /**
+     * Gets an HTML object that contains the processed Menu item.
+     * Value: An HTML object.
+     */
+    htmlElement: Object;
+    /**
+     * Gets a DHTML event object that relates to the processed event.
+     * Value: A DHTML event object.
+     */
+    htmlEvent: Object;
 }
 /**
  * Represents a client-side equivalent of the BootstrapPager control.
@@ -19766,8 +21236,8 @@ interface BootstrapClientPager extends ASPxClientPager {
  */
 interface BootstrapClientPopupControl extends ASPxClientPopupControl {
     /**
-     * 
-     * @param selector 
+     * Sets the CSS selector of a web control or HTML element with which the current popup window is associated.
+     * @param selector A string value specifying the CSS selector of the web control or HTML element with which the popup window is associated.
      */
     SetPopupElementCssSelector(selector: string): void;
 }
@@ -19776,10 +21246,38 @@ interface BootstrapClientPopupControl extends ASPxClientPopupControl {
  */
 interface BootstrapClientPopupMenu extends ASPxClientPopupMenu {
     /**
-     * 
-     * @param selector 
+     * Returns the popup menu's root menu item specified by its index.
+     * @param index An integer value specifying the zero-based index of the root menu item to be retrieved.
+     */
+    GetItem(index: number): BootstrapClientMenuItem;
+    /**
+     * Returns a menu item specified by its name.
+     * @param name A string value specifying the name of the menu item.
+     */
+    GetItemByName(name: string): BootstrapClientMenuItem;
+    /**
+     * Returns the selected item within the menu control.
+     */
+    GetSelectedItem(): BootstrapClientMenuItem;
+    /**
+     * Selects the specified menu item within a the Popup Menu control on the client side.
+     * @param item A BootstrapClientMenuItem object specifying the menu item to select.
+     */
+    SetSelectedItem(item: BootstrapClientMenuItem): void;
+    /**
+     * Returns a root menu item.
+     */
+    GetRootItem(): BootstrapClientMenuItem;
+    /**
+     * Sets the CSS selector of a web control or HTML element with which the current popup menu is associated.
+     * @param selector A string value specifying the CSS selector of the web control or HTML element with which the popup menu is associated.
      */
     SetPopupElementCssSelector(selector: string): void;
+    /**
+     * Selects the specified menu item within a menu control on the client side.
+     * @param item An ASPxClientMenuItem object specifying the menu item to select.
+     */
+    SetSelectedItem(item: ASPxClientMenuItem): void;
 }
 /**
  * Represents a client-side equivalent of the BootstrapProgressBar control.
@@ -19791,15 +21289,472 @@ interface BootstrapClientProgressBar extends ASPxClientProgressBar {
  */
 interface BootstrapClientSpinEdit extends ASPxClientSpinEdit {
 }
+/**
+ * Represents the client-side equivalent of the BootstrapClientTimeEdit control.
+ */
+interface BootstrapClientTimeEdit extends ASPxClientTimeEdit {
+}
 /**
  * Represents a client-side equivalent of the BootstrapTabControl control.
  */
 interface BootstrapClientTabControl extends ASPxClientTabControl {
+    /**
+     * Returns the active tab within the Tab Control.
+     */
+    GetActiveTab(): BootstrapClientTab;
+    /**
+     * Makes the specified tab active within the Tab Control on the client side.
+     * @param tab A BootstrapClientTab object specifying the tab to select.
+     */
+    SetActiveTab(tab: BootstrapClientTab): void;
+    /**
+     * Returns a tab specified by its index.
+     * @param index An integer value specifying the zero-based index of the tab object to retrieve.
+     */
+    GetTab(index: number): BootstrapClientTab;
+    /**
+     * Returns a tab specified by its name.
+     * @param name A string value specifying the name of the tab.
+     */
+    GetTabByName(name: string): BootstrapClientTab;
+    /**
+     * Makes the specified tab active within the tab control on the client side.
+     * @param tab An ASPxClientTab object specifying the tab to select.
+     */
+    SetActiveTab(tab: ASPxClientTab): void;
 }
 /**
  * Represents a client-side equivalent of the BootstrapPageControl control.
  */
 interface BootstrapClientPageControl extends ASPxClientPageControl {
+    /**
+     * Returns the active tab within the Page Control.
+     */
+    GetActiveTab(): BootstrapClientTab;
+    /**
+     * Makes the specified tab active within the Page Control on the client side.
+     * @param tab A BootstrapClientTab object specifying the tab to select.
+     */
+    SetActiveTab(tab: BootstrapClientTab): void;
+    /**
+     * Returns a tab specified by its index.
+     * @param index An integer value specifying the zero-based index of the tab object to retrieve.
+     */
+    GetTab(index: number): BootstrapClientTab;
+    /**
+     * Returns a tab specified by its name.
+     * @param name A string value specifying the name of the tab.
+     */
+    GetTabByName(name: string): BootstrapClientTab;
+    /**
+     * Returns the HTML code that represents the contents of the specified page within the page control.
+     * @param tab An BootstrapClientTab object that specifies the required page.
+     */
+    GetTabContentHTML(tab: BootstrapClientTab): string;
+    /**
+     * Defines the HTML content for a specific tab page within the page control.
+     * @param tab A BootstrapClientTab object that specifies the required tab page.
+     * @param html A string value that represents the HTML code defining the content of the specified page.
+     */
+    SetTabContentHTML(tab: BootstrapClientTab, html: string): void;
+    /**
+     * Returns the HTML code that represents the contents of the specified page within the page control.
+     * @param tab An ASPxClientTab object that specifies the required page.
+     */
+    GetTabContentHTML(tab: ASPxClientTab): string;
+    /**
+     * Defines the HTML content for a specific tab page within the page control.
+     * @param tab An ASPxClientTab object that specifies the required tab page.
+     * @param html A string value that represents the HTML code defining the content of the specified page.
+     */
+    SetTabContentHTML(tab: ASPxClientTab, html: string): void;
+    /**
+     * Makes the specified tab active within the tab control on the client side.
+     * @param tab An ASPxClientTab object specifying the tab to select.
+     */
+    SetActiveTab(tab: ASPxClientTab): void;
+}
+/**
+ * Represents a client-side equivalent of a tab control's BootstrapTabPage object.
+ */
+interface BootstrapClientTab extends ASPxClientTab {
+    /**
+     * Gets the text displayed within the tab badge.
+     */
+    GetBadgeText(): string;
+    /**
+     * Sets the text displayed within the tab badge.
+     * @param text A String specifying the badge text.
+     */
+    SetBadgeText(text: string): void;
+    /**
+     * Gets the CSS class of the icon displayed within the tab badge.
+     */
+    GetBadgeIconCssClass(): string;
+    /**
+     * Sets the CSS class of the icon displayed within the tab badge.
+     * @param cssClass A string containing the name of a CSS class.
+     */
+    SetBadgeIconCssClass(cssClass: string): void;
+    /**
+     * Returns the URL pointing to the image displayed within the tab.
+     */
+    GetImageUrl(): string;
+    /**
+     * Specifies the URL which points to the image displayed within the tab.
+     * @param value 
+     */
+    SetImageUrl(value: string): void;
+    /**
+     * Returns the URL pointing to the image displayed within the active tab.
+     */
+    GetActiveImageUrl(): string;
+    /**
+     * Specifies the URL which points to the image displayed within the active tab.
+     * @param value 
+     */
+    SetActiveImageUrl(value: string): void;
+    /**
+     * Gets the CSS class of the icon displayed by the tab.
+     */
+    GetIconCssClass(): string;
+    /**
+     * Sets the CSS class of the icon displayed by the tab.
+     * @param cssClass A string containing the name of a CSS class.
+     */
+    SetIconCssClass(cssClass: string): void;
+    /**
+     * Gets the CSS class of an icon displayed by the tab when it is active.
+     */
+    GetActiveIconCssClass(): string;
+    /**
+     * Sets the CSS class of an icon displayed by the tab when it is active.
+     * @param cssClass A String containing the name of a CSS class.
+     */
+    SetActiveIconCssClass(cssClass: string): void;
+}
+/**
+ * A method that will handle a tab control's client events concerning manipulations with a tab.
+ */
+interface BootstrapClientTabControlTabEventHandler<S> {
+    /**
+     * A method that will handle a tab control's client events concerning manipulations with a tab.
+     * @param source An object representing the event source. Identifies the BootstrapClientTabControl that raised the event.
+     * @param e An BootstrapClientTabControlTabEventArgs object that contains event data.
+     */
+    (source: S, e: BootstrapClientTabControlTabEventArgs): void;
+}
+/**
+ * Provides data for events related to manipulations on tabs.
+ */
+interface BootstrapClientTabControlTabEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the tab object related to the event.
+     * Value: A BootstrapClientTab object, manipulations on which forced the event to be raised.
+     */
+    tab: BootstrapClientTab;
+}
+/**
+ * A method that will handle a tab control's cancelable client events concerning manipulations with a tab.
+ */
+interface BootstrapClientTabControlTabCancelEventHandler<S> {
+    /**
+     * A method that will handle a tab control's cancelable client events concerning manipulations with a tab.
+     * @param source An object representing the event source. Identifies the BootstrapTabControl that raised the event.
+     * @param e An BootstrapClientTabControlTabCancelEventArgs object that contains event data.
+     */
+    (source: S, e: BootstrapClientTabControlTabCancelEventArgs): void;
+}
+/**
+ * Provides data for cancellable events related to manipulations on tabs.
+ */
+interface BootstrapClientTabControlTabCancelEventArgs extends ASPxClientProcessingModeCancelEventArgs {
+    /**
+     * Gets the tab object related to the event.
+     * Value: A BootstrapClientTab object representing the tab manipulations on which forced the tab control to raise the event.
+     */
+    tab: BootstrapClientTab;
+    /**
+     * Gets or sets a value specifying whether a callback should be sent to the server to reload the content of the page being activated.
+     * Value: true, to reload the page's content; otherwise, false.
+     */
+    reloadContentOnCallback: boolean;
+}
+/**
+ * A method that will handle client events concerning clicks on tabs.
+ */
+interface BootstrapClientTabControlTabClickEventHandler<S> {
+    /**
+     * A method that will handle client events concerning clicks on tabs.
+     * @param source An object representing the event source. Identifies the BootstrapTabControl that raised the event.
+     * @param e An BootstrapClientTabControlTabClickEventArgs object that contains event data.
+     */
+    (source: S, e: BootstrapClientTabControlTabClickEventArgs): void;
+}
+/**
+ * Provides data for events related to clicking on the control's tabs.
+ */
+interface BootstrapClientTabControlTabClickEventArgs extends BootstrapClientTabControlTabCancelEventArgs {
+    /**
+     * Gets an HTML object that contains the processed tab.
+     * Value: An HTML object.
+     */
+    htmlElement: Object;
+    /**
+     * Gets a DHTML event object that relates to the processed event.
+     * Value: A DHTML event object.
+     */
+    htmlEvent: Object;
+}
+/**
+ * A client-side equivalent of the BootstrapTagBox object.
+ */
+interface BootstrapClientTagBox extends ASPxClientTokenBox {
+    /**
+     * Use the TagsChanged event instead.
+     */
+    TokensChanged: ASPxClientEvent<ASPxClientEventHandler<BootstrapClientTagBox>>;
+    /**
+     * Fires on the client side after the tag collection has been changed.
+     */
+    TagsChanged: ASPxClientEvent<ASPxClientEventHandler<BootstrapClientTagBox>>;
+    /**
+     * Adds a new token with the specified text to the end of the control's token collection.
+     * @param text 
+     */
+    AddToken(text: string): void;
+    /**
+     * Adds a new tag with the specified text to the end of the control's tag collection.
+     * @param text A string value specifying the tag's text.
+     */
+    AddTag(text: string): void;
+    /**
+     * Use the RemoveTagByText method instead.
+     * @param text 
+     */
+    RemoveTokenByText(text: string): void;
+    /**
+     * Removes a tag specified by its text from the tag box on the client.
+     * @param text A string value that is the text of the tag to be removed.
+     */
+    RemoveTagByText(text: string): void;
+    /**
+     * Use the RemoveTag method instead.
+     * @param index 
+     */
+    RemoveToken(index: number): void;
+    /**
+     * Removes a tag specified by its index from the tag box on the client.
+     * @param index An integer value that is the index of the tag to be removed.
+     */
+    RemoveTag(index: number): void;
+    /**
+     * Returns an HTML span element that corresponds to the specified token.
+     * @param index 
+     */
+    GetTokenHtmlElement(index: number): Object;
+    /**
+     * Returns an HTML span element that corresponds to the specified tag.
+     * @param index An integer value that is the tag index.
+     */
+    GetTagHtmlElement(index: number): Object;
+    /**
+     * Returns an HTML span element that corresponds to the specified token's text.
+     * @param index 
+     */
+    GetTokenTextHtmlElement(index: number): Object;
+    /**
+     * Returns an HTML span element that corresponds to the specified tag's text.
+     * @param index An integer value that is the tag index.
+     */
+    GetTagTextHtmlElement(index: number): Object;
+    /**
+     * Returns an HTML span element that corresponds to the specified token's remove button.
+     * @param index 
+     */
+    GetTokenRemoveButtonHtmlElement(index: number): Object;
+    /**
+     * Returns an HTML span element that corresponds to the specified tag's remove button.
+     * @param index An integer value that is the tag index.
+     */
+    GetTagRemoveButtonHtmlElement(index: number): Object;
+    /**
+     * Returns a collection of tokens.
+     */
+    GetTokenCollection(): string[];
+    /**
+     * Returns a collection of tags.
+     */
+    GetTagCollection(): string[];
+    /**
+     * Returns a collection of tokens.
+     * @param collection 
+     */
+    SetTokenCollection(collection: string[]): void;
+    /**
+     * Sets a collection of tags.
+     * @param collection An  object that is the collection of tags.
+     */
+    SetTagCollection(collection: string[]): void;
+    /**
+     * Use the ClearTagCollection method instead.
+     */
+    ClearTokenCollection(): void;
+    /**
+     * Removes all tags contained in the tag box.
+     */
+    ClearTagCollection(): void;
+    /**
+     * Returns the index of a token specified by its text.
+     * @param text 
+     */
+    GetTokenIndexByText(text: string): number;
+    /**
+     * Returns the index of a tag specified by its text.
+     * @param text A string value that specifies the text of the tag.
+     */
+    GetTagIndexByText(text: string): number;
+    /**
+     * Use the IsCustomTag method instead.
+     * @param text 
+     * @param caseSensitive 
+     */
+    IsCustomToken(text: string, caseSensitive: boolean): boolean;
+    /**
+     * Returns a value that indicates if the specified tag (string) is a custom tag.
+     * @param text A string value that is a tag.
+     * @param caseSensitive true, if tags are case sensitive; otherwise, false.
+     */
+    IsCustomTag(text: string, caseSensitive: boolean): boolean;
+    /**
+     * Returns the editor's selected item.
+     */
+    GetSelectedItem(): BootstrapClientListBoxItem;
+    /**
+     * Sets the list editor's selected item.
+     * @param item A BootstrapClientListBoxItem object that specifies the item to select.
+     */
+    SetSelectedItem(item: BootstrapClientListBoxItem): void;
+    /**
+     * Returns an item specified by its index within the tag box editor's item collection.
+     * @param index An integer value specifying the zero-based index of the item to search for.
+     */
+    GetItem(index: number): BootstrapClientListBoxItem;
+    /**
+     * Returns an item by its text.
+     * @param text A string that specifies the item's text.
+     */
+    FindItemByText(text: string): BootstrapClientListBoxItem;
+    /**
+     * Returns a list item by its value.
+     * @param value An object that specifies the item's value.
+     */
+    FindItemByValue(value: Object): BootstrapClientListBoxItem;
+    /**
+     * This method is not in effect for the BootstrapClientTagBox class.
+     * @param texts 
+     */
+    AddItem(texts: string[]): number;
+    /**
+     * This method is not in effect for the BootstrapClientTagBox class.
+     * @param texts 
+     * @param value 
+     */
+    AddItem(texts: string[], value: Object): number;
+    /**
+     * This method is not in effect for the BootstrapClientTagBox class.
+     * @param texts 
+     * @param value 
+     * @param iconCssClass 
+     */
+    AddItem(texts: string[], value: Object, iconCssClass: string): number;
+    /**
+     * Adds a new item to the editor, specifying the item's display text, and returns the index of the added item.
+     * @param text A string value specifying the item's display text.
+     */
+    AddItem(text: string): number;
+    /**
+     * Adds a new item to the editor, specifying the item's display text and associated value, and returns the index of the added item.
+     * @param text A string value specifying the item's display text.
+     * @param value An object that represents the item's associated value.
+     */
+    AddItem(text: string, value: Object): number;
+    /**
+     * Adds a new item to the editor, specifying the item's display text, associated value and displayed image, and returns the index of the added item.
+     * @param text A string value specifying the item's display text.
+     * @param value An object that represents the item's associated value.
+     * @param iconCssClass A String value specifying the CSS class of the image displayed by the list item.
+     */
+    AddItem(text: string, value: Object, iconCssClass: string): number;
+    /**
+     * This method is not in effect for the BootstrapClientTagBox class.
+     * @param index 
+     * @param texts 
+     * @param value 
+     * @param iconCssClass 
+     */
+    InsertItem(index: number, texts: string[], value: Object, iconCssClass: string): void;
+    /**
+     * This method is not in effect for the BootstrapClientTagBox class.
+     * @param index 
+     * @param texts 
+     * @param value 
+     */
+    InsertItem(index: number, texts: string[], value: Object): void;
+    /**
+     * This method is not in effect for the BootstrapClientTagBox class.
+     * @param index 
+     * @param texts 
+     */
+    InsertItem(index: number, texts: string[]): void;
+    /**
+     * Inserts a new item specified by its display text, associated value and displayed image into the editor's item collection, at the position specified.
+     * @param index An integer value that represents the index position.
+     * @param text A string value specifying the item's display text.
+     * @param value An object specifying the value associated with the item.
+     * @param iconCssClass A String value specifying the CSS class of the image displayed by the list item.
+     */
+    InsertItem(index: number, text: string, value: Object, iconCssClass: string): void;
+    /**
+     * Inserts a new item specified by its display text, associated value and displayed image into the editor's item collection, at the position specified.
+     * @param index An integer value that represents the index position.
+     * @param text A string value specifying the item's display text.
+     * @param value An object that represents the item's associated value.
+     */
+    InsertItem(index: number, text: string, value: Object): void;
+    /**
+     * Inserts a new item into the control's items collection at the specified index.
+     * @param index An integer value that represents the index position.
+     * @param text A string value specifying the item's display text.
+     */
+    InsertItem(index: number, text: string): void;
+    /**
+     * Gets the text displayed within a Tag Box item badge.
+     * @param index The index of a Tag Box item.
+     */
+    GetItemBadgeText(index: number): string;
+    /**
+     * Sets the text displayed within a Tag Box item badge.
+     * @param index The index of a Tag Box item.
+     * @param text A String specifying the badge text.
+     */
+    SetItemBadgeText(index: number, text: string): void;
+    /**
+     * Gets the CSS class of the icon displayed within a Tag Box item badge.
+     * @param index The index of a Tag Box item.
+     */
+    GetItemBadgeIconCssClass(index: number): string;
+    /**
+     * Sets the CSS class of the icon displayed within a Tag Box item badge.
+     * @param index The index of a Tag Box item.
+     * @param cssClass A String containing the name of a CSS class.
+     */
+    SetItemBadgeIconCssClass(index: number, cssClass: string): void;
+    /**
+     * Sets the list editor's selected item.
+     * @param item An ASPxClientListEditItem object that specifies the item to select.
+     */
+    SetSelectedItem(item: ASPxClientListEditItem): void;
 }
 /**
  * Represents a client-side equivalent of the BootstrapTextBox control.
@@ -19816,79 +21771,741 @@ interface BootstrapClientMemo extends ASPxClientMemo {
  */
 interface BootstrapClientButtonEdit extends ASPxClientButtonEdit {
 }
+/**
+ * Represents the client-side equivalent of the BootstrapToolbar control.
+ */
+interface BootstrapClientToolbar extends BootstrapClientMenu {
+}
 /**
  * Represents a client-side equivalent of the BootstrapTreeView control.
  */
 interface BootstrapClientTreeView extends ASPxClientTreeView {
+    /**
+     * Returns a node specified by its index within the Tree View's node collection.
+     * @param index An integer value specifying the zero-based index of the node to be retrieved.
+     */
+    GetNode(index: number): BootstrapClientTreeViewNode;
+    /**
+     * Returns a node specified by its name.
+     * @param name A string value specifying the name of the node.
+     */
+    GetNodeByName(name: string): BootstrapClientTreeViewNode;
+    /**
+     * Returns a node specified by its text.
+     * @param text A string value specifying the text content of the node.
+     */
+    GetNodeByText(text: string): BootstrapClientTreeViewNode;
+    /**
+     * Returns the selected node within the Tree View control on the client side.
+     */
+    GetSelectedNode(): BootstrapClientTreeViewNode;
+    /**
+     * Selects the specified node within the Tree View control on the client side.
+     * @param node A BootstrapClientTreeViewNode object specifying the node to select.
+     */
+    SetSelectedNode(node: BootstrapClientTreeViewNode): void;
+    /**
+     * Gets the root node of the Tree View control.
+     */
+    GetRootNode(): BootstrapClientTreeViewNode;
+    /**
+     * Selects the specified node within the ASPxTreeView control on the client side.
+     * @param node An ASPxClientTreeViewNode object specifying the node to select.
+     */
+    SetSelectedNode(node: ASPxClientTreeViewNode): void;
 }
-interface BootstrapUIWidgetBase extends ASPxClientControl {
-    Init: ASPxClientEvent<BootstrapUIWidgetInitializedEventHandler<BootstrapUIWidgetBase>>;
-    Drawn: ASPxClientEvent<BootstrapUIWidgetDrawnEventHandler<BootstrapUIWidgetBase>>;
-    Disposing: ASPxClientEvent<BootstrapUIWidgetDisposingEventHandler<BootstrapUIWidgetBase>>;
-    OptionChanged: ASPxClientEvent<BootstrapUIWidgetOptionChangedEventHandler<BootstrapUIWidgetBase>>;
-    Exporting: ASPxClientEvent<BootstrapUIWidgetExportingEventHandler<BootstrapUIWidgetBase>>;
-    Exported: ASPxClientEvent<BootstrapUIWidgetExportedEventHandler<BootstrapUIWidgetBase>>;
-    FileSaving: ASPxClientEvent<BootstrapUIWidgetFileSavingEventHandler<BootstrapUIWidgetBase>>;
-    IncidentOccurred: ASPxClientEvent<BootstrapUIWidgetErrorEventHandler<BootstrapUIWidgetBase>>;
-    GetInstance(): Object;
-    SetOptions(options: Object): void;
-    SetDataSource(dataSource: Object): void;
-    GetDataSource(): Object;
-    ExportTo(format: string, fileName: string): void;
-    Print(): void;
+/**
+ * Represents a client-side equivalent of the TreeView's BootstrapTreeViewNode object.
+ */
+interface BootstrapClientTreeViewNode extends ASPxClientTreeViewNode {
+    /**
+     * Gets the BootstrapClientTreeView object to which the current node belongs.
+     * Value: A <see cref="BootstrapClientTreeView" /> object that is the node's owner.
+     */
+    treeView: BootstrapClientTreeView;
+    /**
+     * Gets the current node's parent node.
+     * Value: A BootstrapClientTreeViewNode object representing the node's immediate parent.
+     */
+    parent: BootstrapClientTreeViewNode;
+    /**
+     * Returns the current node's immediate child node specified by its index.
+     * @param index An integer value specifying the zero-based index of the node to be retrieved.
+     */
+    GetNode(index: number): BootstrapClientTreeViewNode;
+    /**
+     * Returns the current node's child node specified by its name.
+     * @param name A string value specifying the name of the node.
+     */
+    GetNodeByName(name: string): BootstrapClientTreeViewNode;
+    /**
+     * Returns the current node's child node specified by its text.
+     * @param text A string value specifying the text content of the node.
+     */
+    GetNodeByText(text: string): BootstrapClientTreeViewNode;
+    /**
+     * Gets the text displayed within the node badge.
+     */
+    GetBadgeText(): string;
+    /**
+     * Sets the text displayed within the node badge.
+     * @param text A String specifying the badge text.
+     */
+    SetBadgeText(text: string): void;
+    /**
+     * Gets the CSS class of the icon displayed within the node badge.
+     */
+    GetBadgeIconCssClass(): string;
+    /**
+     * Sets the CSS class of the icon displayed within the node badge.
+     * @param cssClass A string containing the name of a CSS class.
+     */
+    SetBadgeIconCssClass(cssClass: string): void;
+    /**
+     * Returns the URL pointing to the image displayed within the node.
+     */
+    GetImageUrl(): string;
+    /**
+     * Sets the URL which points to the image displayed within the node.
+     * @param value 
+     */
+    SetImageUrl(value: string): void;
+    /**
+     * Gets the CSS class of the icon displayed by the node.
+     */
+    GetIconCssClass(): string;
+    /**
+     * Sets the CSS class of the icon displayed by the node.
+     * @param cssClass A string containing the name of a CSS class.
+     */
+    SetIconCssClass(cssClass: string): void;
 }
-interface BootstrapUIWidgetInitializedEventHandler<S> {
-    (source: S, e: BootstrapUIWidgetEventArgsBase): void;
+/**
+ * A method that will handle the client events concerned with node processing.
+ */
+interface BootstrapClientTreeViewNodeProcessingModeEventHandler<S> {
+    /**
+     * A method that will handle the client events concerned with node processing.
+     * @param source An object representing the event source. Identifies the BootstrapClientTreeView control that raised the event.
+     * @param e An BootstrapClientTreeViewNodeProcessingModeEventArgs object that contains event data.
+     */
+    (source: S, e: BootstrapClientTreeViewNodeProcessingModeEventArgs): void;
 }
-interface BootstrapUIWidgetDrawnEventHandler<S> {
-    (source: S, e: BootstrapUIWidgetEventArgsBase): void;
+/**
+ * Provides data for the client events related to node processing, and allowing the event's processing to be passed to the server side.
+ */
+interface BootstrapClientTreeViewNodeProcessingModeEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets a node object related to the event.
+     * Value: A BootstrapClientTreeViewNode object, manipulations on which forced the event to be raised.
+     */
+    node: BootstrapClientTreeViewNode;
 }
-interface BootstrapUIWidgetDisposingEventHandler<S> {
-    (source: S, e: BootstrapUIWidgetEventArgsBase): void;
+/**
+ * A method that will handle the NodeClick event.
+ */
+interface BootstrapClientTreeViewNodeClickEventHandler<S> {
+    /**
+     * A method that will handle the NodeClick event.
+     * @param source An object representing the event source. Identifies the BootstrapClientTreeView control that raised the event.
+     * @param e An BootstrapClientTreeViewNodeClickEventArgs object that contains event data.
+     */
+    (source: S, e: BootstrapClientTreeViewNodeClickEventArgs): void;
 }
-interface BootstrapUIWidgetExportedEventHandler<S> {
-    (source: S, e: BootstrapUIWidgetEventArgsBase): void;
+/**
+ * Provides data for the NodeClick event.
+ */
+interface BootstrapClientTreeViewNodeClickEventArgs extends BootstrapClientTreeViewNodeProcessingModeEventArgs {
+    /**
+     * Gets an HTML object that contains the processed Tree View node.
+     * Value: An HTML object.
+     */
+    htmlElement: Object;
+    /**
+     * Gets a DHTML event object that relates to the processed event.
+     * Value: A DHTML event object.
+     */
+    htmlEvent: Object;
 }
-interface BootstrapUIWidgetOptionChangedEventHandler<S> {
-    (source: S, e: BootstrapUIWidgetOptionChangedEventArgs): void;
+/**
+ * A method that will handle the Tree View control's client events, concerning manipulations with a node.
+ */
+interface BootstrapClientTreeViewNodeEventHandler<S> {
+    /**
+     * A method that will handle the Tree View control's client events, concerning manipulations with a node.
+     * @param source An object representing the event source. Identifies the BootstrapClientTreeView control that raised the event.
+     * @param e An BootstrapClientTreeViewNodeEventArgs object that contains event data.
+     */
+    (source: S, e: BootstrapClientTreeViewNodeEventArgs): void;
 }
-interface BootstrapUIWidgetOptionChangedEventArgs extends BootstrapUIWidgetEventArgsBase {
-    fullName: string;
-    name: string;
-    previousValue: Object;
-    value: Object;
+/**
+ * Provides data for the ExpandedChanged events.
+ */
+interface BootstrapClientTreeViewNodeEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets a node object related to the event.
+     * Value: A BootstrapClientTreeViewNode object, manipulations on which forced the event to be raised.
+     */
+    node: BootstrapClientTreeViewNode;
 }
-interface BootstrapUIWidgetExportingEventHandler<S> {
-    (source: S, e: BootstrapUIWidgetExportEventArgs): void;
+/**
+ * A method that will handle the Tree View's cancelable client events, concerning manipulations with nodes.
+ */
+interface BootstrapClientTreeViewNodeCancelEventHandler<S> {
+    /**
+     * A method that will handle the Tree View's cancelable client events, concerning manipulations with nodes.
+     * @param source An object representing the event source. Identifies the BootstrapClientTreeView control that raised the event.
+     * @param e An BootstrapClientTreeViewNodeCancelEventArgs object that contains event data.
+     */
+    (source: S, e: BootstrapClientTreeViewNodeCancelEventArgs): void;
 }
-interface BootstrapUIWidgetFileSavingEventHandler<S> {
-    (source: S, e: BootstrapUIWidgetExportEventArgs): void;
-}
-interface BootstrapUIWidgetExportEventArgs extends BootstrapUIWidgetEventArgsBase {
-    cancel: boolean;
-    data: Object;
-    fileName: string;
-    format: string;
-}
-interface BootstrapUIWidgetErrorEventHandler<S> {
-    (source: S, e: BootstrapUIWidgetErrorEventArgs): void;
-}
-interface BootstrapUIWidgetErrorEventArgs extends BootstrapUIWidgetEventArgsBase {
-    target: Object;
-}
-interface BootstrapUIWidgetElementActionEventArgs extends BootstrapUIWidgetEventArgsBase {
-    target: Object;
-}
-interface BootstrapUIWidgetElementClickEventArgs extends BootstrapUIWidgetElementActionEventArgs {
-    jQueryEvent: Object;
+/**
+ * Provides data for the ExpandedChanging event.
+ */
+interface BootstrapClientTreeViewNodeCancelEventArgs extends ASPxClientProcessingModeCancelEventArgs {
+    /**
+     * Gets a node object related to the event.
+     * Value: A BootstrapClientTreeViewNode object, manipulations on which forced the event to be raised.
+     */
+    node: BootstrapClientTreeViewNode;
 }
 /**
  * Represents a client-side equivalent of the BootstrapUploadControl.
  */
 interface BootstrapClientUploadControl extends ASPxClientUploadControl {
 }
+/**
+ * Represents the client BootstrapGridView.
+ */
 interface BootstrapClientGridView extends ASPxClientGridView {
 }
+/**
+ * Represents the client BootstrapCardView.
+ */
+interface BootstrapClientCardView extends ASPxClientGridView {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapWebClientUIWidget class.
+ */
+interface BootstrapUIWidgetBase extends ASPxClientControl {
+    /**
+     * Fires once, after the widget is initialized.
+     */
+    Init: ASPxClientEvent<BootstrapUIWidgetInitializedEventHandler<BootstrapUIWidgetBase>>;
+    /**
+     * Fires when the widget has finished drawing itself.
+     */
+    Drawn: ASPxClientEvent<BootstrapUIWidgetDrawnEventHandler<BootstrapUIWidgetBase>>;
+    /**
+     * Fires when the widget is removed from the DOM using the remove(), empty(), or html() jQuery methods only.
+     */
+    Disposing: ASPxClientEvent<BootstrapUIWidgetDisposingEventHandler<BootstrapUIWidgetBase>>;
+    /**
+     * Fires after an option of the widget has been changed.
+     */
+    OptionChanged: ASPxClientEvent<BootstrapUIWidgetOptionChangedEventHandler<BootstrapUIWidgetBase>>;
+    /**
+     * Fires before data from the widget is exported.
+     */
+    Exporting: ASPxClientEvent<BootstrapUIWidgetExportingEventHandler<BootstrapUIWidgetBase>>;
+    /**
+     * Fires after data from the widget is exported.
+     */
+    Exported: ASPxClientEvent<BootstrapUIWidgetExportedEventHandler<BootstrapUIWidgetBase>>;
+    /**
+     * Raised before a file with exported data is saved on the user's local storage.
+     */
+    FileSaving: ASPxClientEvent<BootstrapUIWidgetFileSavingEventHandler<BootstrapUIWidgetBase>>;
+    /**
+     * Fires when an error or warning appears in the widget.
+     */
+    IncidentOccurred: ASPxClientEvent<BootstrapUIWidgetErrorEventHandler<BootstrapUIWidgetBase>>;
+    /**
+     * Gets an instance of the widget.
+     */
+    GetInstance(): Object;
+    /**
+     * Sets the widget's options to values specified in the passed object.
+     * @param options An object containing key-value pairs specifying new option values.
+     */
+    SetOptions(options: Object): void;
+    /**
+     * Gets the client data source instance.
+     * @param dataSource A DevExtreme <a href="https://js.devexpress.com/Documentation/ApiReference/Data_Layer/DataSource/">DataSource</a> object.
+     */
+    SetDataSource(dataSource: Object): void;
+    /**
+     * Gets the client data source instance.
+     */
+    GetDataSource(): Object;
+    /**
+     * Exports the widget.
+     * @param format A string specifying the target file format.
+     * @param fileName A string specifying the file name.
+     */
+    ExportTo(format: string, fileName: string): void;
+    /**
+     * Invokes the browser's Print window to print the widget's contents.
+     */
+    Print(): void;
+}
+/**
+ * Represents a client-side equivalent of the BootstrapChartBase class.
+ */
+interface BootstrapClientChartBase extends BootstrapUIWidgetBase {
+    /**
+     * Fires when the Series and Points chart elements are ready to be accessed.
+     */
+    Done: ASPxClientEvent<BootstrapClientChartBaseDoneEventHandler<BootstrapClientChartBase>>;
+    /**
+     * Fires when an item on the chart legend is clicked.
+     */
+    LegendClick: ASPxClientEvent<BootstrapClientChartBaseLegendClickEventHandler<BootstrapClientChartBase>>;
+    /**
+     * Fires when a user clicks a series point.
+     */
+    PointClick: ASPxClientEvent<BootstrapClientChartBasePointClickEventHandler<BootstrapClientChartBase>>;
+    /**
+     * Fires when the hover state of a series point has been changed.
+     */
+    PointHoverChanged: ASPxClientEvent<BootstrapClientChartBasePointHoverChangedEventHandler<BootstrapClientChartBase>>;
+    /**
+     * Fires when the selection state of a series point has been changed.
+     */
+    PointSelectionChanged: ASPxClientEvent<BootstrapClientChartBasePointSelectionChangedEventHandler<BootstrapClientChartBase>>;
+    /**
+     * Fires when a point's tooltip becomes hidden.
+     */
+    TooltipHidden: ASPxClientEvent<BootstrapClientChartBaseTooltipHiddenEventHandler<BootstrapClientChartBase>>;
+    /**
+     * Fires when a point's tooltip appears.
+     */
+    TooltipShown: ASPxClientEvent<BootstrapClientChartBaseTooltipShownEventHandler<BootstrapClientChartBase>>;
+    /**
+     * Fires when a user clicks a label on the argument axis.
+     */
+    ArgumentAxisClick: ASPxClientEvent<BootstrapClientCoordinateSystemChartArgumentAxisClickEventHandler<BootstrapClientChartBase>>;
+    /**
+     * Fires when a user clicks a series.
+     */
+    SeriesClick: ASPxClientEvent<BootstrapClientCoordinateSystemChartSeriesClickEventHandler<BootstrapClientChartBase>>;
+    /**
+     * Fires when the hover state of a series has been changed.
+     */
+    SeriesHoverChanged: ASPxClientEvent<BootstrapClientCoordinateSystemChartSeriesHoverChangedEventHandler<BootstrapClientChartBase>>;
+    /**
+     * Fires when the selection state of a series has been changed.
+     */
+    SeriesSelectionChanged: ASPxClientEvent<BootstrapClientCoordinateSystemChartSeriesSelectionChangedEventHandler<BootstrapClientChartBase>>;
+}
+/**
+ * Represents a client-side equivalent of the Chart control.
+ */
+interface BootstrapClientChart extends BootstrapClientChartBase {
+    /**
+     * Fires when a chart zooming or scrolling begins.
+     */
+    ZoomStart: ASPxClientEvent<BootstrapClientChartZoomStartEventHandler<BootstrapClientChart>>;
+    /**
+     * Fires when a chart zooming or scrolling ends.
+     */
+    ZoomEnd: ASPxClientEvent<BootstrapClientChartZoomEndEventHandler<BootstrapClientChart>>;
+}
+/**
+ * Represents a client-side equivalent of the BootstrapPolarChart control.
+ */
+interface BootstrapClientPolarChart extends BootstrapClientChartBase {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapPieChart control.
+ */
+interface BootstrapClientPieChart extends BootstrapClientChartBase {
+}
+/**
+ * A method that will handle the Done event.
+ */
+interface BootstrapClientChartBaseDoneEventHandler<S> {
+    /**
+     * A method that will handle the Done event.
+     * @param source The event source.
+     * @param e A BootstrapUIWidgetEventArgsBase object that contains event data.
+     */
+    (source: S, e: BootstrapUIWidgetEventArgsBase): void;
+}
+/**
+ * A method that will handle the LegendClick event.
+ */
+interface BootstrapClientChartBaseLegendClickEventHandler<S> {
+    /**
+     * A method that will handle the LegendClick event.
+     * @param source The event source.
+     * @param e A BootstrapUIWidgetElementClickEventArgs object that contains event data.
+     */
+    (source: S, e: BootstrapUIWidgetElementClickEventArgs): void;
+}
+/**
+ * A method that will handle the Invoke event.
+ */
+interface BootstrapClientCoordinateSystemChartArgumentAxisClickEventHandler<S> {
+    /**
+     * A method that will handle the Invoke event.
+     * @param source The event source.
+     * @param e A BootstrapUIWidgetElementClickEventArgs object that contains event data.
+     */
+    (source: S, e: BootstrapUIWidgetElementClickEventArgs): void;
+}
+/**
+ * A method that will handle the PointClick event.
+ */
+interface BootstrapClientChartBasePointClickEventHandler<S> {
+    /**
+     * A method that will handle the PointClick event.
+     * @param source The event source.
+     * @param e A BootstrapUIWidgetElementClickEventArgs object that contains event data.
+     */
+    (source: S, e: BootstrapUIWidgetElementClickEventArgs): void;
+}
+/**
+ * A method that will handle the PointHoverChanged event.
+ */
+interface BootstrapClientChartBasePointHoverChangedEventHandler<S> {
+    /**
+     * A method that will handle the PointHoverChanged event.
+     * @param source The event source.
+     * @param e A BootstrapUIWidgetElementActionEventArgs object that contains event data.
+     */
+    (source: S, e: BootstrapUIWidgetElementActionEventArgs): void;
+}
+/**
+ * A method that will handle the PointSelectionChanged event.
+ */
+interface BootstrapClientChartBasePointSelectionChangedEventHandler<S> {
+    /**
+     * A method that will handle the PointSelectionChanged event.
+     * @param source The event source.
+     * @param e A BootstrapUIWidgetElementActionEventArgs object that contains event data.
+     */
+    (source: S, e: BootstrapUIWidgetElementActionEventArgs): void;
+}
+/**
+ * A method that will handle the TooltipHidden event.
+ */
+interface BootstrapClientChartBaseTooltipHiddenEventHandler<S> {
+    /**
+     * A method that will handle the TooltipHidden event.
+     * @param source The event source.
+     * @param e A BootstrapUIWidgetElementActionEventArgs object that contains event data.
+     */
+    (source: S, e: BootstrapUIWidgetElementActionEventArgs): void;
+}
+/**
+ * A method that will handle the TooltipShown event.
+ */
+interface BootstrapClientChartBaseTooltipShownEventHandler<S> {
+    /**
+     * A method that will handle the TooltipShown event.
+     * @param source The event source.
+     * @param e A BootstrapUIWidgetElementActionEventArgs object that contains event data.
+     */
+    (source: S, e: BootstrapUIWidgetElementActionEventArgs): void;
+}
+/**
+ * A method that will handle the SeriesClick event.
+ */
+interface BootstrapClientCoordinateSystemChartSeriesClickEventHandler<S> {
+    /**
+     * A method that will handle the SeriesClick event.
+     * @param source The event source.
+     * @param e A BootstrapUIWidgetElementClickEventArgs object that contains event data.
+     */
+    (source: S, e: BootstrapUIWidgetElementClickEventArgs): void;
+}
+/**
+ * A method that will handle the SeriesHoverChanged event.
+ */
+interface BootstrapClientCoordinateSystemChartSeriesHoverChangedEventHandler<S> {
+    /**
+     * A method that will handle the SeriesHoverChanged event.
+     * @param source The event source.
+     * @param e A BootstrapUIWidgetElementActionEventArgs object that contains event data.
+     */
+    (source: S, e: BootstrapUIWidgetElementActionEventArgs): void;
+}
+/**
+ * A method that will handle the SeriesSelectionChanged event.
+ */
+interface BootstrapClientCoordinateSystemChartSeriesSelectionChangedEventHandler<S> {
+    /**
+     * A method that will handle the SeriesSelectionChanged event.
+     * @param source The event source.
+     * @param e A BootstrapUIWidgetElementActionEventArgs object that contains event data.
+     */
+    (source: S, e: BootstrapUIWidgetElementActionEventArgs): void;
+}
+/**
+ * A method that will handle the ZoomStart event.
+ */
+interface BootstrapClientChartZoomStartEventHandler<S> {
+    /**
+     * A method that will handle the ZoomStart event.
+     * @param source The event source.
+     * @param e A BootstrapUIWidgetEventArgsBase object that contains event data.
+     */
+    (source: S, e: BootstrapUIWidgetEventArgsBase): void;
+}
+/**
+ * A method that will handle the ZoomEnd event.
+ */
+interface BootstrapClientChartZoomEndEventHandler<S> {
+    /**
+     * A method that will handle the ZoomEnd event.
+     * @param source The event source.
+     * @param e A BootstrapClientChartZoomEndEventArgs object that contains event data.
+     */
+    (source: S, e: BootstrapClientChartZoomEndEventArgs): void;
+}
+/**
+ * Provides base data for the client-side events.
+ */
+interface BootstrapUIWidgetEventArgsBase extends ASPxClientEventArgs {
+    /**
+     * The widget instance.
+     * Value: An object specifying the widget instance.
+     */
+    component: Object;
+    /**
+     * The widget's container.
+     * Value: An object specifying the widget's container.
+     */
+    element: Object;
+}
+/**
+ * Provides data for the ZoomEnd event.
+ */
+interface BootstrapClientChartZoomEndEventArgs extends BootstrapUIWidgetEventArgsBase {
+    /**
+     * The value that became the start of the argument axis after zooming or scrolling ended.
+     * Value: An object specifying the start of the argument axis.
+     */
+    rangeStart: Object;
+    /**
+     * The value that became the end of the argument axis after zooming or scrolling ended.
+     * Value: An object specifying the end of the argument axis.
+     */
+    rangeEnd: Object;
+}
+/**
+ * Represents a client-side equivalent of the Range Selector control.
+ */
+interface BootstrapClientRangeSelector extends BootstrapUIWidgetBase {
+    /**
+     * Fires after the selected range has been changed by moving one of the sliders.
+     */
+    ValueChanged: ASPxClientEvent<BootstrapClientRangeSelectorValueChangedEventHandler<BootstrapClientRangeSelector>>;
+    /**
+     * Gets the Range Selector's selected value range.
+     */
+    GetValue(): Object[];
+    /**
+     * Gets the Range Selector's selected value range.
+     * @param value An array containing the value range.
+     */
+    SetValue(value: Object[]): void;
+}
+/**
+ * Provides data for events which concern manipulations on the selected range.
+ */
+interface BootstrapClientRangeSelectorValueChangedEventArgs extends BootstrapUIWidgetEventArgsBase {
+    /**
+     * The value currently specified for the RangeSelector control.
+     * Value: A System.Object instance defining the current value specified for a RangeSelector control.
+     */
+    value: Object;
+    /**
+     * The previous value of a RangeSelector control.
+     * Value: A System.Object type defining the previous value specified for a RangeSelector control.
+     */
+    previousValue: Object;
+}
+/**
+ * A method that will handle the ValueChanged event.
+ */
+interface BootstrapClientRangeSelectorValueChangedEventHandler<S> {
+    /**
+     * A method that will handle the ValueChanged event.
+     * @param source The event source.
+     * @param e A BootstrapClientRangeSelectorValueChangedEventArgs object that contains event data.
+     */
+    (source: S, e: BootstrapClientRangeSelectorValueChangedEventArgs): void;
+}
+/**
+ * A method that will handle the Init event.
+ */
+interface BootstrapUIWidgetInitializedEventHandler<S> {
+    /**
+     * A method that will handle the Init event.
+     * @param source The event source.
+     * @param e A BootstrapUIWidgetEventArgsBase object that contains event data.
+     */
+    (source: S, e: BootstrapUIWidgetEventArgsBase): void;
+}
+/**
+ * A method that will handle the Drawn event.
+ */
+interface BootstrapUIWidgetDrawnEventHandler<S> {
+    /**
+     * A method that will handle the Drawn event.
+     * @param source The event source.
+     * @param e A BootstrapUIWidgetEventArgsBase object that contains event data.
+     */
+    (source: S, e: BootstrapUIWidgetEventArgsBase): void;
+}
+/**
+ * A method that will handle the Disposing event.
+ */
+interface BootstrapUIWidgetDisposingEventHandler<S> {
+    /**
+     * A method that will handle the Disposing event.
+     * @param source The event source.
+     * @param e A BootstrapUIWidgetEventArgsBase object that contains event data.
+     */
+    (source: S, e: BootstrapUIWidgetEventArgsBase): void;
+}
+/**
+ * A method that will handle the Exported event.
+ */
+interface BootstrapUIWidgetExportedEventHandler<S> {
+    /**
+     * A method that will handle the Exported event.
+     * @param source The event source.
+     * @param e A BootstrapUIWidgetEventArgsBase object that contains event data.
+     */
+    (source: S, e: BootstrapUIWidgetEventArgsBase): void;
+}
+/**
+ * A method that will handle the OptionChanged event.
+ */
+interface BootstrapUIWidgetOptionChangedEventHandler<S> {
+    /**
+     * A method that will handle the OptionChanged event.
+     * @param source The event source.
+     * @param e A BootstrapUIWidgetOptionChangedEventArgs object that contains event data.
+     */
+    (source: S, e: BootstrapUIWidgetOptionChangedEventArgs): void;
+}
+/**
+ * Provides data for client events raised in response to changing the widget's options.
+ */
+interface BootstrapUIWidgetOptionChangedEventArgs extends BootstrapUIWidgetEventArgsBase {
+    /**
+     * The option's full name.
+     * Value: A string value specifying the option's full name.
+     */
+    fullName: string;
+    /**
+     * The option's short name.
+     * Value: A string value specifying the option's short name.
+     */
+    name: string;
+    /**
+     * The option's old value.
+     * Value: An object that is the option's old value.
+     */
+    previousValue: Object;
+    /**
+     * The option's new value.
+     * Value: An object that is the option's new value.
+     */
+    value: Object;
+}
+/**
+ * A method that will handle the Exporting event.
+ */
+interface BootstrapUIWidgetExportingEventHandler<S> {
+    /**
+     * A method that will handle the Exporting event.
+     * @param source The event source.
+     * @param e A BootstrapUIWidgetExportEventArgs object that contains event data.
+     */
+    (source: S, e: BootstrapUIWidgetExportEventArgs): void;
+}
+/**
+ * A method that will handle the FileSaving event.
+ */
+interface BootstrapUIWidgetFileSavingEventHandler<S> {
+    /**
+     * A method that will handle the FileSaving event.
+     * @param source The event source.
+     * @param e A BootstrapUIWidgetExportEventArgs object that contains event data.
+     */
+    (source: S, e: BootstrapUIWidgetExportEventArgs): void;
+}
+/**
+ * Provides data for events related to saving files in the built-in dialogs.
+ */
+interface BootstrapUIWidgetExportEventArgs extends BootstrapUIWidgetEventArgsBase {
+    /**
+     * Allows you to cancel file saving.
+     * Value: true, to cancel the file saving; otherwise, false.
+     */
+    cancel: boolean;
+    /**
+     * Gets the saved data as a BLOB object.
+     * Value: A <a href="https://msdn.microsoft.com/en-us/library/dd301120.aspx" target="_blank">BLOB</a> object containing saved data.
+     */
+    data: Object;
+    /**
+     * Gets a name of a saved file.
+     * Value: A string value specifying the saved file's name.
+     */
+    fileName: string;
+    /**
+     * Gets the saved file's format.
+     * Value: A string value specifying the saved file's format.
+     */
+    format: string;
+}
+/**
+ * A method that will handle the IncidentOccurred event.
+ */
+interface BootstrapUIWidgetErrorEventHandler<S> {
+    /**
+     * A method that will handle the IncidentOccurred event.
+     * @param source The event source.
+     * @param e A BootstrapUIWidgetErrorEventArgs object that contains event data.
+     */
+    (source: S, e: BootstrapUIWidgetErrorEventArgs): void;
+}
+/**
+ * Provides data for client events raised in response to widget errors.
+ */
+interface BootstrapUIWidgetErrorEventArgs extends BootstrapUIWidgetEventArgsBase {
+    /**
+     * Contains information on the error that occurred.
+     * Value: An object containing information on the error that occurred.
+     */
+    target: Object;
+}
+/**
+ * Provides data for client events related to actions performed on the widget's visual elements.
+ */
+interface BootstrapUIWidgetElementActionEventArgs extends BootstrapUIWidgetEventArgsBase {
+    /**
+     * The DOM element that initiated the event.
+     * Value: An object that initiated the event.
+     */
+    target: Object;
+}
+/**
+ * Provides data for the client-side clicking events.
+ */
+interface BootstrapUIWidgetElementClickEventArgs extends BootstrapUIWidgetElementActionEventArgs {
+    /**
+     * The jQuery event that caused the handler execution.
+     * Value: An object of the <a href="http://api.jquery.com/Types/#Event" target="_blank">jQuery.Event</a> type.
+     */
+    jQueryEvent: Object;
+}
 /**
  * A client-side counterpart of the Calendar and CalendarFor extensions.
  */
@@ -20343,7 +22960,7 @@ interface MVCxClientPopupControl extends ASPxClientPopupControl {
      */
     PerformWindowCallback(window: ASPxClientPopupWindow, data: Object): void;
     /**
-     * 
+     * Sends a callback with parameters to update the popup window by processing the related popup window.
      * @param window 
      * @param parameter 
      */
@@ -20849,6 +23466,27 @@ interface MVCxClientVerticalGrid extends ASPxClientVerticalGrid {
  */
 interface MVCxClientWebDocumentViewer extends ASPxClientWebDocumentViewer {
 }
+interface ANCxClientBeginCallbackEventHandler<S> {
+    (source: S, e: ANCxClientBeginCallbackEventArgs): void;
+}
+/**
+ * Serves as the base class for arguments of the web controls' client-side events.
+ */
+interface ASPxClientEventArgs {
+}
+/**
+ * Provides data for client events related to the beginning of a callback processing round trip.
+ */
+interface ASPxClientBeginCallbackEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets a command name that identifies which client action forced a callback to be occurred.
+     * Value: A string value that represents the name of the command which initiated a callback.
+     */
+    command: string;
+}
+interface ANCxClientBeginCallbackEventArgs extends ASPxClientBeginCallbackEventArgs {
+    customArgs: Object;
+}
 /**
  * Serves as the base type for all the objects included in the client-side object model.
  */
@@ -20871,6 +23509,10 @@ interface ASPxClientControlBase {
      * @param message A String value that specifies a text.
      */
     SendMessageToAssistiveTechnology(message: string): void;
+    /**
+     * Returns a client instance of the control that is the parent for a specified control.
+     */
+    GetParentControl(): Object;
     /**
      * Returns a value specifying whether a control is displayed.
      */
@@ -20969,11 +23611,6 @@ interface ASPxClientCallbackCompleteEventHandler<S> {
      */
     (source: S, e: ASPxClientCallbackCompleteEventArgs): void;
 }
-/**
- * Serves as the base class for arguments of the web controls' client-side events.
- */
-interface ASPxClientEventArgs {
-}
 /**
  * Provides data for events concerning the final processing of a callback.
  */
@@ -21195,11 +23832,6 @@ interface ASPxClientProcessingModeCancelEventArgs extends ASPxClientProcessingMo
  */
 interface KnockoutObservableBoolean {
 }
-/**
- * Provides access to observable arrays that allow you to detect and respond to changes in a collection of things.
- */
-interface KnockoutObservableArray {
-}
 /**
  * Represents a JavaScript function which receives callback data obtained via a call to a specific client method (such as the PerformDataCallback).
  */
@@ -21262,16 +23894,6 @@ interface ASPxClientBeginCallbackEventHandler<S> {
      */
     (source: S, e: ASPxClientBeginCallbackEventArgs): void;
 }
-/**
- * Provides data for client events related to the beginning of a callback processing round trip.
- */
-interface ASPxClientBeginCallbackEventArgs extends ASPxClientEventArgs {
-    /**
-     * Gets a command name that identifies which client action forced a callback to be occurred.
-     * Value: A string value that represents the name of the command which initiated a callback.
-     */
-    command: string;
-}
 /**
  * A method that will handle the BeginCallback event.
  */
@@ -22478,6 +25100,10 @@ interface ASPxClientFileManagerItem {
      * @param skipRootFolder true, to skip the root folder; otherwise, false.
      */
     GetFullName(separator: string, skipRootFolder: boolean): string;
+    /**
+     * Gets the current item's metadata.
+     */
+    GetMetadata(): Object;
 }
 /**
  * Represents the client-side equivalent of the FileManagerFile object.
@@ -23523,6 +26149,11 @@ interface ASPxClientHintOptions {
      * Value: true, to display a hint in a callout box; otherwise, false.
      */
     showCallout: boolean;
+    /**
+     * Gets or sets a value that specifies whether a hint's title is displayed.
+     * Value: true, to display the hint's title; otherwise, false.
+     */
+    showTitle: boolean;
     /**
      * Gets or sets where a hint should be positioned.
      * Value: A string value that specifies a hint position.
@@ -24596,7 +27227,7 @@ interface ASPxClientPopupControl extends ASPxClientPopupControlBase {
      */
     GetWindowPopUpReasonMouseEvent(window: ASPxClientPopupWindow): Object;
     /**
-     * 
+     * Sends a callback with parameters to update the popup window by processing the related popup window.
      * @param window 
      * @param parameter 
      */
@@ -24749,6 +27380,103 @@ interface ASPxClientPopupControl extends ASPxClientPopupControlBase {
      * @param html A string value that represents the HTML code defining the content of the specified popup window.
      */
     SetWindowContentHtml(window: ASPxClientPopupWindow, html: string): void;
+    /**
+     * Stretches the popup window in adaptive mode vertically to the full height of the browser window.
+     */
+    StretchVertically(): void;
+    /**
+     * Stretches the specified popup window in adaptive mode vertically to the full height of the browser window.
+     * @param window A ASPxClientPopupWindow object representing the required popup window.
+     */
+    WindowStretchVertically(window: ASPxClientPopupWindow): void;
+    /**
+     * Sets the minimum width of the popup window in adaptive mode.
+     * @param minWidth An integer value specifying the minimum width of the popup window in adaptive mode.
+     */
+    SetAdaptiveMinWidth(minWidth: number): void;
+    /**
+     * Sets the minimum width of the popup window in adaptive mode.
+     * @param minWidth A string value specifying the minimum width of the popup window in adaptive mode as a percentage of the browser window inner width value.
+     */
+    SetAdaptiveMinWidth(minWidth: string): void;
+    /**
+     * Sets the minimum width of the specified popup window in adaptive mode.
+     * @param window A ASPxClientPopupWindow object representing the required popup window.
+     * @param minWidth An integer value specifying the minimum width of the popup window in adaptive mode.
+     */
+    SetWindowAdaptiveMinWidth(window: ASPxClientPopupWindow, minWidth: number): void;
+    /**
+     * Sets the minimum width of the specified popup window in adaptive mode.
+     * @param window A ASPxClientPopupWindow object representing the required popup window.
+     * @param minWidth An integer value specifying the minimum width of the popup window in adaptive mode as a percentage of the browser window inner width value.
+     */
+    SetWindowAdaptiveMinWidth(window: ASPxClientPopupWindow, minWidth: string): void;
+    /**
+     * Sets the maximum width of the popup window in adaptive mode.
+     * @param maxWidth An integer value specifying the maximum width of the popup window in adaptive mode.
+     */
+    SetAdaptiveMaxWidth(maxWidth: number): void;
+    /**
+     * Sets the maximum width of the popup window in adaptive mode.
+     * @param maxWidth A string value specifying the maximum width of the popup window in adaptive mode as a percentage of the browser window inner width value.
+     */
+    SetAdaptiveMaxWidth(maxWidth: string): void;
+    /**
+     * Sets the maximum width of the specified popup window in adaptive mode.
+     * @param window A ASPxClientPopupWindow object representing the required popup window.
+     * @param maxWidth An integer value specifying the maximum width of the popup window in adaptive mode.
+     */
+    SetWindowAdaptiveMaxWidth(window: ASPxClientPopupWindow, maxWidth: number): void;
+    /**
+     * Sets the maximum width of the specified popup window in adaptive mode.
+     * @param window A ASPxClientPopupWindow object representing the required popup window.
+     * @param maxWidth An integer value specifying the maximum width of the popup window in adaptive mode as a percentage of the browser window inner width value.
+     */
+    SetWindowAdaptiveMaxWidth(window: ASPxClientPopupWindow, maxWidth: string): void;
+    /**
+     * Sets the minimum height of the popup window in adaptive mode.
+     * @param minHeight An integer value specifying the minimum height of the popup window in adaptive mode.
+     */
+    SetAdaptiveMinHeight(minHeight: number): void;
+    /**
+     * Sets the minimum height of the popup window in adaptive mode.
+     * @param minHeight A string value specifying the minimum height of the popup window in adaptive mode as a percentage of the browser window inner height value.
+     */
+    SetAdaptiveMinHeight(minHeight: string): void;
+    /**
+     * Sets the minimum height of the specified popup window in adaptive mode.
+     * @param window A ASPxClientPopupWindow object representing the required popup window.
+     * @param minHeight An integer value specifying the minimum height of the popup window in adaptive mode.
+     */
+    SetWindowAdaptiveMinHeight(window: ASPxClientPopupWindow, minHeight: number): void;
+    /**
+     * Sets the minimum height of the specified popup window in adaptive mode.
+     * @param window A ASPxClientPopupWindow object representing the required popup window.
+     * @param minHeight An integer value specifying the minimum height of the popup window in adaptive mode as a percentage of the browser window inner height value.
+     */
+    SetWindowAdaptiveMinHeight(window: ASPxClientPopupWindow, minHeight: string): void;
+    /**
+     * Sets the maximum height of the popup window in adaptive mode.
+     * @param maxHeight An integer value specifying the maximum height of the popup window in adaptive mode.
+     */
+    SetAdaptiveMaxHeight(maxHeight: number): void;
+    /**
+     * Sets the maximum height of the popup window in adaptive mode.
+     * @param maxHeight A string value specifying the maximum height of the popup window in adaptive mode as a percentage of the browser window inner height value.
+     */
+    SetAdaptiveMaxHeight(maxHeight: string): void;
+    /**
+     * Sets the maximum height of the specified popup window in adaptive mode.
+     * @param window A ASPxClientPopupWindow object representing the required popup window.
+     * @param maxHeight An integer value specifying the maximum height of the popup window in adaptive mode.
+     */
+    SetWindowAdaptiveMaxHeight(window: ASPxClientPopupWindow, maxHeight: number): void;
+    /**
+     * Sets the maximum height of the specified popup window in adaptive mode.
+     * @param window A ASPxClientPopupWindow object representing the required popup window.
+     * @param maxHeight An integer value specifying the maximum height of the popup window in adaptive mode as a percentage of the browser window inner height value.
+     */
+    SetWindowAdaptiveMaxHeight(window: ASPxClientPopupWindow, maxHeight: string): void;
     /**
      * Returns an iframe object containing a web page specified via the specified popup window's SetWindowContentUrl client method).
      * @param window A ASPxClientPopupWindow object representing the required popup window.
@@ -28890,7 +31618,7 @@ interface ASPxClientDocumentViewer extends ASPxClientControl {
      */
     EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientDocumentViewer>>;
     /**
-     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientDocumentViewer.
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by ASPxClientDocumentViewer.
      */
     CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientDocumentViewer>>;
     /**
@@ -29011,13 +31739,17 @@ interface ASPxClientQueryBuilder extends ASPxClientControl {
      */
     EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientQueryBuilder>>;
     /**
-     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientQueryBuilder.
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by ASPxClientQueryBuilder.
      */
     CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientQueryBuilder>>;
     /**
      * Enables you to customize the menu actions of a Query Builder.
      */
     CustomizeToolbarActions: ASPxClientEvent<ASPxClientQueryBuilderCustomizeToolbarActionsEventHandler<ASPxClientQueryBuilder>>;
+    /**
+     * Enables you to customize the Query Builder's localization strings.
+     */
+    CustomizeLocalization: ASPxClientEvent<ASPxClientQueryBuilderCustomizeLocalizationEventHandler<ASPxClientQueryBuilder>>;
     /**
      * Occurs when executing the Save command on the client.
      */
@@ -29034,7 +31766,7 @@ interface ASPxClientQueryBuilder extends ASPxClientControl {
      */
     PerformCallback(arg: string, onSuccess: (arg1: string) => void): void;
     /**
-     * Updates the localization settings of the ASPxClientQueryBuilder properties.
+     * Updates the ASPxClientQueryBuilder properties' localization settings.
      * @param localization A dictionary containing the property names, along with their localized equivalents.
      */
     UpdateLocalization(localization: { [key: string]: string; }): void;
@@ -29091,6 +31823,16 @@ interface ASPxClientQueryBuilderCustomizeToolbarActionsEventHandler<S> {
      */
     (source: S, e: ASPxClientCustomizeMenuActionsEventArgs): void;
 }
+/**
+ * A method that will handle the CustomizeLocalization event.
+ */
+interface ASPxClientQueryBuilderCustomizeLocalizationEventHandler<S> {
+    /**
+     * A method that will handle the CustomizeLocalization event.
+     * @param source The event sender.
+     */
+    (source: S): void;
+}
 /**
  * The client-side equivalent of the Web Report Designer control.
  */
@@ -29104,7 +31846,7 @@ interface ASPxClientReportDesigner extends ASPxClientControl {
      */
     EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientReportDesigner>>;
     /**
-     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientReportDesigner.
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by ASPxClientReportDesigner.
      */
     CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientReportDesigner>>;
     /**
@@ -29112,7 +31854,7 @@ interface ASPxClientReportDesigner extends ASPxClientControl {
      */
     SaveCommandExecute: ASPxClientEvent<ASPxClientReportDesignerSaveCommandExecuteEventHandler<ASPxClientReportDesigner>>;
     /**
-     * Enables you to customize the menu actions of the Web Report Designer.
+     * Enables you to customize the Web Report Designer's menu actions.
      */
     CustomizeMenuActions: ASPxClientEvent<ASPxClientReportDesignerCustomizeMenuActionsEventHandler<ASPxClientReportDesigner>>;
     /**
@@ -29143,6 +31885,14 @@ interface ASPxClientReportDesigner extends ASPxClientControl {
      * Occurs when a report has been opened in the Web Report Designer.
      */
     ReportOpened: ASPxClientEvent<ASPxClientReportDesignerReportOpenedEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Occurs when a report tab is about to be closed in the Web Report Designer.
+     */
+    ReportTabClosing: ASPxClientEvent<ASPxClientReportDesignerReportTabClosingEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Occurs when a report tab was closed in the Web Report Designer.
+     */
+    ReportTabClosed: ASPxClientEvent<ASPxClientReportDesignerReportTabClosedEventHandler<ASPxClientReportDesigner>>;
     /**
      * Occurs on the client each time a server-side error raises.
      */
@@ -29152,7 +31902,7 @@ interface ASPxClientReportDesigner extends ASPxClientControl {
      */
     ComponentAdded: ASPxClientEvent<ASPxClientReportDesignerComponentAddedEventHandler<ASPxClientReportDesigner>>;
     /**
-     * Enables you to customize UI elements of the Web Report Designer.
+     * Enables you to customize the Web Report Designer's UI elements.
      */
     CustomizeElements: ASPxClientEvent<ASPxClientReportDesignerCustomizeElementsEventHandler<ASPxClientReportDesigner>>;
     /**
@@ -29176,7 +31926,7 @@ interface ASPxClientReportDesigner extends ASPxClientControl {
      */
     PreviewDocumentReady: ASPxClientEvent<ASPxClientWebDocumentViewerDocumentReadyEventHandler<ASPxClientReportDesigner>>;
     /**
-     * Occurs each time a value of an editing field changes in Print Preview.
+     * Occurs each time an editing field's value changes in Print Preview.
      */
     PreviewEditingFieldChanged: ASPxClientEvent<ASPxClientWebDocumentViewerEditingFieldChangedEventHandler<ASPxClientReportDesigner>>;
     /**
@@ -29188,17 +31938,25 @@ interface ASPxClientReportDesigner extends ASPxClientControl {
      */
     PreviewCustomizeMenuActions: ASPxClientEvent<ASPxClientWebDocumentViewerCustomizeMenuActionsEventHandler<ASPxClientReportDesigner>>;
     /**
-     * Occurs when the left mouse button has been clicked over a report document in Print Preview.
+     * Occurs when the left mouse button is clicked on a report document in Print Preview.
      */
     PreviewClick: ASPxClientEvent<ASPxClientWebDocumentViewerPreviewClickEventHandler<ASPxClientReportDesigner>>;
     /**
-     * Occurs after report parameter values have been reset to their default values in Print Preview.
+     * Occurs after report parameter values are reset to their default values in Print Preview.
      */
     PreviewParametersReset: ASPxClientEvent<ASPxClientWebDocumentViewerParametersResetEventHandler<ASPxClientReportDesigner>>;
     /**
-     * Occurs after report parameter values have been submitted in Print Preview.
+     * Occurs after report parameter values are submitted in Print Preview.
      */
     PreviewParametersSubmitted: ASPxClientEvent<ASPxClientWebDocumentViewerParametersSubmittedEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Enables you to customize the Web Report Designer's localization strings.
+     */
+    CustomizeLocalization: ASPxClientEvent<ASPxClientReportDesignerCustomizeLocalizationEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Occurs before the Web Report Designer UI is initialized.
+     */
+    BeforeRender: ASPxClientEvent<ASPxClientReportDesignerBeforeRenderEventHandler<ASPxClientReportDesigner>>;
     /**
      * Sends a callback to the server with the specified argument.
      * @param arg A String value, specifying the callback argument.
@@ -29211,18 +31969,18 @@ interface ASPxClientReportDesigner extends ASPxClientControl {
      */
     PerformCallback(arg: string, onSuccess: (arg1: string) => void): void;
     /**
-     * Updates the localization settings of the ASPxClientReportDesigner properties.
+     * Updates the Report Designer properties' localization settings.
      * @param localization A dictionary containing the property names, along with their localized equivalents.
      */
     UpdateLocalization(localization: { [key: string]: string; }): void;
     /**
-     * Returns the object model of a Web Report Designer.
+     * Provides access to a client-side model of a Web Report Designer.
      */
     GetDesignerModel(): Object;
     /**
-     * Provides access to the preview model of the ASPxClientReportDesigner.
+     * Provides access to the Document Viewer's client-side model.
      */
-    GetPreviewModel(): Object;
+    GetPreviewModel(): ASPxClientSidePreviewModel;
     /**
      * Returns information about the specified property of the specified control.
      * @param controlType A string that specifies the control type.
@@ -29313,7 +32071,7 @@ interface ASPxClientReportDesigner extends ASPxClientControl {
      */
     ReportStorageGetUrls(): any;
     /**
-     * Opens the specified report on the client side of the Web Report Designer.
+     * Opens the specified report on the Web Report Designer's client side.
      * @param url A string that specifies the URL of a report to be opened.
      */
     OpenReport(url: string): void;
@@ -29362,12 +32120,42 @@ interface ASPxClientReportDesignerDialogEventArgs extends ASPxClientEventArgs {
      * Value: An object that specifies the report currently being processed.
      */
     Report: Object;
+}
+/**
+ * Provides data for the events related to opening and saving reports in the Web Report Designer.
+ */
+interface ASPxClientReportDesignerDialogCancelEventArgs extends ASPxClientReportDesignerDialogEventArgs {
     /**
      * Specifies whether or not the operation performed with a report should be canceled.
      * Value: true, if the operation should be canceled; otherwise, false.
      */
     Cancel: boolean;
 }
+/**
+ * Provides data for the ReportTabClosed event.
+ */
+interface ASPxClientReportDesignerTabEventArgs extends ASPxClientEventArgs {
+    /**
+     * Specifies the report tab currently being processed.
+     * Value: An object that specifies the report tab currently being processed.
+     */
+    Tab: ASPxDesignerNavigateTab;
+}
+/**
+ * Provides data for the ReportTabClosing event.
+ */
+interface ASPxClientReportDesignerTabClosingEventArgs extends ASPxClientReportDesignerTabEventArgs {
+    /**
+     * Specifies whether or not the event was handled.
+     * Value: true, if the event was handled and no other processing should occur; otherwise, false.
+     */
+    Handled: boolean;
+    /**
+     * Specifies the JQueryDeferred object, which when resolved, forces the report tab to be closed.
+     * Value: A JQueryDeferred object.
+     */
+    ReadyToClose: JQueryDeferred<any>;
+}
 /**
  * Provides data for the OnServerError event.
  */
@@ -29513,9 +32301,9 @@ interface ASPxClientReportDesignerReportSavingEventHandler<S> {
     /**
      * A method that will handle the ReportSaving event.
      * @param source The event sender.
-     * @param e An ASPxClientReportDesignerDialogEventArgs object that contains data related to the event.
+     * @param e An ASPxClientReportDesignerDialogCancelEventArgs object that contains data related to the event.
      */
-    (source: S, e: ASPxClientReportDesignerDialogEventArgs): void;
+    (source: S, e: ASPxClientReportDesignerDialogCancelEventArgs): void;
 }
 /**
  * A method that will handle the ReportSaved event.
@@ -29535,9 +32323,9 @@ interface ASPxClientReportDesignerReportOpeningEventHandler<S> {
     /**
      * A method that will handle the ReportOpening event.
      * @param source The event sender.
-     * @param e An ASPxClientReportDesignerDialogEventArgs object that contains data related to the event.
+     * @param e An ASPxClientReportDesignerDialogCancelEventArgs object that contains data related to the event.
      */
-    (source: S, e: ASPxClientReportDesignerDialogEventArgs): void;
+    (source: S, e: ASPxClientReportDesignerDialogCancelEventArgs): void;
 }
 /**
  * A method that will handle the ReportOpened event.
@@ -29550,6 +32338,28 @@ interface ASPxClientReportDesignerReportOpenedEventHandler<S> {
      */
     (source: S, e: ASPxClientReportDesignerDialogEventArgs): void;
 }
+/**
+ * A method that will handle the ReportTabClosing event.
+ */
+interface ASPxClientReportDesignerReportTabClosingEventHandler<S> {
+    /**
+     * A method that will handle the ReportTabClosing event.
+     * @param source The event sender.
+     * @param e An ASPxClientReportDesignerTabClosingEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientReportDesignerTabClosingEventArgs): void;
+}
+/**
+ * A method that will handle the ReportTabClosed event.
+ */
+interface ASPxClientReportDesignerReportTabClosedEventHandler<S> {
+    /**
+     * A method that will handle the ReportTabClosed event.
+     * @param source The event sender.
+     * @param e An ASPxClientReportDesignerTabEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientReportDesignerTabEventArgs): void;
+}
 /**
  * A method that will handle the OnServerError event.
  */
@@ -29616,6 +32426,27 @@ interface ASPxClientReportDesignerCustomizeToolboxEventHandler<S> {
      */
     (source: S, e: ASPxClientReportDesignerCustomizeToolboxEventArgs): void;
 }
+/**
+ * A method that will handle the CustomizeLocalization event.
+ */
+interface ASPxClientReportDesignerCustomizeLocalizationEventHandler<S> {
+    /**
+     * A method that will handle the CustomizeLocalization event.
+     * @param source The event sender.
+     */
+    (source: S): void;
+}
+/**
+ * A method that will handle the BeforeRender event.
+ */
+interface ASPxClientReportDesignerBeforeRenderEventHandler<S> {
+    /**
+     * A method that will handle the BeforeRender event.
+     * @param source The event sender.
+     * @param designerModel A client-side Report Designer model.
+     */
+    (source: S, designerModel: Object): void;
+}
 /**
  * Provides information about a value editor used in the Property Grid.
  */
@@ -29994,7 +32825,7 @@ interface ASPxClientReportViewer extends ASPxClientControl {
      */
     EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientReportViewer>>;
     /**
-     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientReportViewer.
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by ASPxClientReportViewer.
      */
     CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientReportViewer>>;
     /**
@@ -30147,10 +32978,10 @@ interface ASPxClientMenuAction {
      */
     hotKey: ASPxClientMenuActionHotKey;
     /**
-     * Provides access to the value that specifies whether or not the command has a visual separator.
+     * Specifies whether or not the command has a visual separator.
      * Value: true, if the command has a visual separator; otherwise, false.
      */
-    hasSeparator: string;
+    hasSeparator: boolean;
     /**
      * Provides access to a value that specifies the command location.
      * Value: A string that specifies the command location.
@@ -30505,6 +33336,11 @@ interface ASPxClientPreviewClickEventArgs extends ASPxClientEventArgs {
      * Returns a string providing additional information on the Brick.
      */
     GetBrickValue(): string;
+    /**
+     * Returns a string providing additional information about the current Brick by the specified key.
+     * @param key A string that specifies a unique key.
+     */
+    GetBrickValue(key: string): string;
 }
 /**
  * Provides information about a visual brick used to render a report control to construct a document in the Web Document Viewer.
@@ -30571,19 +33407,19 @@ interface ASPxClientWebDocumentViewerBrickNavigation {
  */
 interface ASPxClientWebDocumentViewer extends ASPxClientControl {
     /**
-     * Occurs after a report document has been loaded to the Web Document Viewer.
+     * Occurs after the Web Document Viewer loads a report document.
      */
     DocumentReady: ASPxClientEvent<ASPxClientWebDocumentViewerDocumentReadyEventHandler<ASPxClientWebDocumentViewer>>;
     /**
-     * Occurs each time a value of an editing field changes.
+     * Occurs each time an editing field's value changes.
      */
     EditingFieldChanged: ASPxClientEvent<ASPxClientWebDocumentViewerEditingFieldChangedEventHandler<ASPxClientWebDocumentViewer>>;
     /**
-     * Enables you to customize UI elements of the Web Document Viewer.
+     * Allows you to customize the Web Document Viewer's UI elements.
      */
     CustomizeElements: ASPxClientEvent<ASPxClientWebDocumentViewerCustomizeElementsEventHandler<ASPxClientWebDocumentViewer>>;
     /**
-     * Enables you to customize the menu actions of a Web Document Viewer.
+     * Enables you to customize the Web Document Viewer's menu actions.
      */
     CustomizeMenuActions: ASPxClientEvent<ASPxClientWebDocumentViewerCustomizeMenuActionsEventHandler<ASPxClientWebDocumentViewer>>;
     /**
@@ -30595,27 +33431,44 @@ interface ASPxClientWebDocumentViewer extends ASPxClientControl {
      */
     CustomizeParameterLookUpSource: ASPxClientEvent<ASPxClientWebDocumentViewerCustomizeParameterLookUpSourceEventHandler<ASPxClientWebDocumentViewer>>;
     /**
-     * Occurs when the left mouse button has been clicked over a report document.
+     * Occurs when the left mouse button is clicked on a report document.
      */
     PreviewClick: ASPxClientEvent<ASPxClientWebDocumentViewerPreviewClickEventHandler<ASPxClientWebDocumentViewer>>;
     /**
-     * Occurs after report parameter values have been reset to their default values.
+     * Occurs after report parameter values are reset to their default values.
      */
     ParametersReset: ASPxClientEvent<ASPxClientWebDocumentViewerParametersResetEventHandler<ASPxClientWebDocumentViewer>>;
     /**
-     * Occurs after report parameter values have been submitted.
+     * Occurs after report parameter values are submitted.
      */
     ParametersSubmitted: ASPxClientEvent<ASPxClientWebDocumentViewerParametersSubmittedEventHandler<ASPxClientWebDocumentViewer>>;
     /**
-     * Provides access to the preview model of the ASPxClientWebDocumentViewer.
+     * Enables you to customize the Web Document Viewer's localization strings.
      */
-    GetPreviewModel(): Object;
+    CustomizeLocalization: ASPxClientEvent<ASPxClientWebDocumentViewerCustomizeLocalizationEventHandler<ASPxClientWebDocumentViewer>>;
     /**
-     * Returns a model for a report parameter.
+     * Occurs before the Web Document Viewer UI is initialized.
      */
-    GetParametersModel(): Object;
+    BeforeRender: ASPxClientEvent<ASPxClientWebDocumentViewerBeforeRenderEventHandler<ASPxClientWebDocumentViewer>>;
     /**
-     * Opens the specified report on the client side of the Web Document Viewer.
+     * Provides access to the Document Viewer's client-side model.
+     */
+    GetPreviewModel(): ASPxClientSidePreviewModel;
+    /**
+     * Provides access to the report preview.
+     */
+    GetReportPreview(): ASPxClientReportPreview;
+    /**
+     * Provide access to the report parameters' client-side model.
+     */
+    GetParametersModel(): ASPxClientSideParametersModel;
+    /**
+     * Enables navigation between drill-through reports on the client-side.
+     * @param customData Provides access to custom client data associated with a currently previewed report.
+     */
+    DrillThrough(customData: string): any;
+    /**
+     * Opens the specified report on the Web Document Viewer's client side.
      * @param url A string that specifies the URL of a report to be opened.
      */
     OpenReport(url: string): any;
@@ -30644,7 +33497,7 @@ interface ASPxClientWebDocumentViewer extends ASPxClientControl {
      */
     ExportTo(format: string, inlineResult: boolean): void;
     /**
-     * Returns the zero-based index of the currently displayed page.
+     * Returns the current page's zero-based index.
      */
     GetCurrentPageIndex(): number;
     /**
@@ -30653,11 +33506,11 @@ interface ASPxClientWebDocumentViewer extends ASPxClientControl {
      */
     GoToPage(pageIndex: number): void;
     /**
-     * Closes the document currently being opened in the Web Document Viewer.
+     * Closes the document which is currently opened in the Web Document Viewer.
      */
     Close(): void;
     /**
-     * Resets the values of report parameters to their default values.
+     * Resets the report parameter values to the default values.
      */
     ResetParameters(): void;
     /**
@@ -30665,7 +33518,22 @@ interface ASPxClientWebDocumentViewer extends ASPxClientControl {
      */
     StartBuild(): void;
     /**
-     * Updates the localization settings of the ASPxClientWebDocumentViewer properties.
+     * Performs a custom operation with a currently opened document on the client side.
+     */
+    PerformCustomDocumentOperation(): any;
+    /**
+     * Performs a custom operation with a currently opened document on the client-side.
+     * @param customData Provides access to custom client data associated with a target document operation.
+     */
+    PerformCustomDocumentOperation(customData: string): any;
+    /**
+     * Performs a custom operation with a currently opened document on the client-side.
+     * @param customData Provides access to custom client data associated with a target document operation.
+     * @param hideMessageFromUser true, to hide a message with the operation result from a user; otherwise, false.
+     */
+    PerformCustomDocumentOperation(customData: string, hideMessageFromUser: boolean): any;
+    /**
+     * Updates the Web Document Viewer properties' localization settings.
      * @param localization A dictionary containing the property names, along with their localized equivalents.
      */
     UpdateLocalization(localization: { [key: string]: string; }): void;
@@ -30769,6 +33637,219 @@ interface ASPxClientWebDocumentViewerParametersSubmittedEventHandler<S> {
      */
     (source: S, e: ASPxClientParametersSubmittedEventArgs): void;
 }
+/**
+ * A method that will handle the CustomizeLocalization event.
+ */
+interface ASPxClientWebDocumentViewerCustomizeLocalizationEventHandler<S> {
+    /**
+     * A method that will handle the CustomizeLocalization event.
+     * @param source The event sender.
+     */
+    (source: S): void;
+}
+/**
+ * A method that will handle the BeforeRender event.
+ */
+interface ASPxClientWebDocumentViewerBeforeRenderEventHandler<S> {
+    /**
+     * A method that will handle the BeforeRender event.
+     * @param source The event sender.
+     * @param previewModel A client-side Document Viewer model.
+     */
+    (source: S, previewModel: Object): void;
+}
+/**
+ * Provides information about the result of preforming a custom document operation on the client side.
+ */
+interface ASPxClientWebDocumentViewerDocumentOperationResponse {
+    /**
+     * Specifies whether a document operation has been successfully performed.
+     * Value: true, if the document operation has been successfully performed; otherwise, false.
+     */
+    succeeded: boolean;
+    /**
+     * Specifies the error message to display if performing a document operation fails.
+     * Value: A string specifying the text of the error message.
+     */
+    message: string;
+    /**
+     * Specifies custom data associated with the performed document operation.
+     * Value: A string containing information associated with the document operation.
+     */
+    customData: string;
+    /**
+     * Specifies the document ID.
+     * Value: A string that specifies the document ID.
+     */
+    documentId: string;
+}
+/**
+ * Provides information a client-side Document Preview model.
+ */
+interface ASPxClientSidePreviewModel {
+    /**
+     * Provides access to the report preview.
+     * Value: An object that specifies the report preview.
+     */
+    reportPreview: ASPxClientReportPreview;
+    /**
+     * Provides access to a panel at the right of the Document Viewer.
+     * Value: An object that specifies the panel at the right of the Document Viewer.
+     */
+    tabPanel: ASPxClientDocumentPreviewTabPanel;
+    /**
+     * Opens the specified report on the Web Document Viewer's client side.
+     * @param url A string that specifies the URL of a report to be opened.
+     */
+    OpenReport(url: string): any;
+    /**
+     * Prints the current document.
+     */
+    Print(): void;
+    /**
+     * Prints the document's page with the specified index.
+     * @param pageIndex An index of the page to be printed.
+     */
+    Print(pageIndex: number): void;
+    /**
+     * Exports the document to a PDF file.
+     */
+    ExportTo(): void;
+    /**
+     * Exports the document to a specified file format.
+     * @param format A String value, specifying the export format. The following formats are currently supported: 'csv', 'html', 'image', 'mht', 'pdf', 'rtf', 'docx', 'txt', 'xls', and 'xlsx'.
+     */
+    ExportTo(format: string): void;
+    /**
+     * Exports the document to a specified file format.
+     * @param format A String value that specifies the export format. The following formats are currently supported: 'csv', 'html', 'image', 'mht', 'pdf', 'rtf', 'docx', 'txt', 'xls', and 'xlsx'.
+     * @param inlineResult true, to try opening the result file in a new browser tab without a download; otherwise, false.
+     */
+    ExportTo(format: string, inlineResult: boolean): void;
+    /**
+     * Returns the current page's zero-based index.
+     */
+    GetCurrentPageIndex(): number;
+    /**
+     * Displays the report page with the specified page index.
+     * @param pageIndex A zero-based integer value that specifies the index of a page to be displayed.
+     */
+    GoToPage(pageIndex: number): void;
+    /**
+     * Closes the document which is currently opened in the Web Document Viewer.
+     */
+    Close(): void;
+    /**
+     * Resets the report parameter values to the default values.
+     */
+    ResetParameters(): void;
+    /**
+     * Starts building a report document.
+     */
+    StartBuild(): void;
+    /**
+     * Provide access to the report parameters' client-side model.
+     */
+    GetParametersModel(): ASPxClientSideParametersModel;
+}
+/**
+ * Provides information about the Document Viewer's tab panel.
+ */
+interface ASPxClientDocumentPreviewTabPanel {
+    /**
+     * Specifies the width of the panel at the right of the Document Viewer.
+     * Value: A knockout observable object that specifies the tab panel width.
+     */
+    width: any;
+    /**
+     * Specifies whether the panel at the right of the Document Viewer is collapsed.
+     * Value: A knockout observable object that specifies whether the tab panel is collapsed.
+     */
+    collapsed: any;
+    /**
+     * Provides access to the tabs of the panel at the right of the Document Viewer.
+     * Value: A collection of ASPxClientDocumentPreviewTab objects.
+     */
+    tabs: ASPxClientDocumentPreviewTab[];
+}
+/**
+ * Provides information about a tab available in the Document Viewer.
+ */
+interface ASPxClientDocumentPreviewTab {
+    /**
+     * Provides access to the name of an HTML template used by a tab.
+     * Value: A knockout observable string that specifies the name of the HTML template used by the tab.
+     */
+    template: string;
+    /**
+     * Provides access to the tab text.
+     * Value: A string that specifies the tab text.
+     */
+    text: string;
+    /**
+     * Provides access to a tab model.
+     * Value: An object that specifies the tab model.
+     */
+    model: Object;
+    /**
+     * Provides access to the value that specifies whether a tab is active.
+     * Value: A knockout observable object that specifies whether the tab is active.
+     */
+    active: any;
+    /**
+     * Provides access to the value that specifies whether a tab is visible.
+     * Value: A knockout observable object that specifies whether the tab is visible.
+     */
+    visible: any;
+}
+/**
+ * Provides information about the report parameters' client-side model.
+ */
+interface ASPxClientSideParametersModel {
+    /**
+     * Provides information about the tab for specifying parameter values.
+     * Value: An object that provides information about the Parameters tab.
+     */
+    tabInfo: ASPxClientDocumentPreviewTab;
+    /**
+     * Initiates passing parameter values and generating the report document.
+     */
+    submit(): void;
+    /**
+     * Serializes report parameters before passing them to the server.
+     */
+    serializeParameters(): void;
+}
+/**
+ * Provides information about a report preview.
+ */
+interface ASPxClientReportPreview {
+    /**
+     * Zooms the Document Viewer's current document.
+     * Value: A knockout observable object that specifies the zoom factor.
+     */
+    zoom: any;
+    /**
+     * Enables the Document Viewer's multi-page mode.
+     * Value: A knockout observable object that specifies whether the multi-page mode is enabled.
+     */
+    showMultipagePreview: any;
+    /**
+     * Provides access to the current document page's index.
+     * Value: A knockout observable object that specifies the zero-based index of the current page.
+     */
+    pageIndex: any;
+    /**
+     * Provides access to document pages.
+     * Value: An array of objects that specify document pages.
+     */
+    pages: any;
+    /**
+     * Provides access to a value that specifies whether the document is currently building.
+     * Value: A knockout observable object that specifies whether the document is building.
+     */
+    documentBuilding: any;
+}
 
 interface MVCxClientDashboardViewerStatic extends ASPxClientDashboardViewerStatic {
 }
@@ -30812,7 +33893,7 @@ interface DashboardSpecialValuesStatic {
      */
     OthersValue: string;
     /**
-     * Represents an error value for calculated fields.
+     * Represents an error value (for instance, this can be a calculated field value that cannot be evaluated).
      */
     ErrorValue: string;
     /**
@@ -30890,6 +33971,20 @@ interface DashboardExportScaleModeStatic {
      */
     AutoFitWithinOnePage: string;
 }
+interface DashboardExportDocumentScaleModeStatic {
+    /**
+     * The dashboard / dashboard item on the exported page retains its original size.
+     */
+    None: string;
+    /**
+     * The size of the dashboard / dashboard item on the exported page is changed according to the scale factor value (ScaleFactor).
+     */
+    UseScaleFactor: string;
+    /**
+     * The size of the dashboard / dashboard item is changed according to the width of the exported pages.
+     */
+    AutoFitToPagesWidth: string;
+}
 interface DashboardExportFilterStateStatic {
     /**
      * The filter state is not included in the exported document.
@@ -31156,6 +34251,18 @@ interface ASPxClientEditStatic extends ASPxClientEditBaseStatic {
      * Verifies whether visible editors on a page are valid.
      */
     AreEditorsValid(): boolean;
+    /**
+     * Attaches a handler to the ASPxClientEdit's event indicating whether the editor has been changed since the previous state.
+     * @param handler An object representing a handler.
+     * @param predicate An ASPxClientControlPredicate object representing the predicate criteria.
+     */
+    AttachEditorModificationListener(handler: Object, predicate: ASPxClientControlPredicate): void;
+    /**
+     * Detaches a handler from the editor's event if the editor meets the predicate criteria.
+     * @param handler An object representing a handler.
+     * @param predicate An ASPxClientControlPredicate object representing a predicate criteria.
+     */
+    DetachEditorModificationListener(handler: Object, predicate: ASPxClientControlPredicate): void;
 }
 interface ASPxClientBinaryImageStatic extends ASPxClientEditStatic {
     /**
@@ -31538,11 +34645,41 @@ interface ASPxClientGridViewCallbackCommandStatic {
      * Default value: "TOOLBAR"
      */
     Toolbar: string;
+    /**
+     * Default value: "EXPORT"
+     */
+    Export: string;
     /**
      * Default value: "CUSTOMVALUES"
      */
     CustomValues: string;
 }
+interface ASPxClientGridExportFormatStatic {
+    /**
+     * Identifies Portable Document Format (.pdf).
+     */
+    Pdf: string;
+    /**
+     * Identifies DOCX format (.docx).
+     */
+    Docx: string;
+    /**
+     * Identifies Rich Text Format (.rtf).
+     */
+    Rtf: string;
+    /**
+     * Identifies Comma Separated Values format (.csv).
+     */
+    Csv: string;
+    /**
+     * Identifies Excel Binary File format (.xls).
+     */
+    Xls: string;
+    /**
+     * Identifies XML spreadsheet file format (.xlsx).
+     */
+    Xlsx: string;
+}
 interface ASPxClientGridLookupStatic extends ASPxClientDropDownEditBaseStatic {
     /**
      * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
@@ -31557,6 +34694,8 @@ interface ASPxClientCardViewStatic extends ASPxClientGridBaseStatic {
      */
     Cast(obj: Object): ASPxClientCardView;
 }
+interface ASPxClientCardViewExportFormatStatic extends ASPxClientGridExportFormatStatic {
+}
 interface ASPxClientGridViewStatic extends ASPxClientGridBaseStatic {
     /**
      * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
@@ -31564,6 +34703,8 @@ interface ASPxClientGridViewStatic extends ASPxClientGridBaseStatic {
      */
     Cast(obj: Object): ASPxClientGridView;
 }
+interface ASPxClientGridViewExportFormatStatic extends ASPxClientGridExportFormatStatic {
+}
 interface ASPxClientVerticalGridStatic extends ASPxClientGridBaseStatic {
     /**
      * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
@@ -31577,6 +34718,8 @@ interface ASPxClientVerticalGridCallbackCommandStatic {
      */
     ExpandRow: string;
 }
+interface ASPxClientVerticalGridExportFormatStatic extends ASPxClientGridExportFormatStatic {
+}
 interface ASPxClientCommandConstsStatic {
     /**
      * Identifies a command that shows a search panel.
@@ -32106,6 +35249,27 @@ interface ASPxClientHtmlEditorStatic extends ASPxClientControlStatic {
      * @param data An object representing custom data associated with a custom dialog.
      */
     CustomDialogComplete(status: Object, data: Object): void;
+    /**
+     * Highlights the text.
+     * @param text A string value specifying the text to be highlighted.
+     * @param searchContainer An object specifying the container where the specified text should be searched.
+     */
+    HighlightText(text: string, searchContainer: Object): void;
+    /**
+     * Highlights the text with the specified settings.
+     * @param text A string value specifying the text to be highlighted.
+     * @param searchContainer An object specifying the container where the specified text should be searched.
+     * @param className A string value specifying the text color.
+     */
+    HighlightText(text: string, searchContainer: Object, className: string): void;
+    /**
+     * Highlights the text with the specified text color and background color.
+     * @param text A string value specifying the text to be highlighted.
+     * @param searchContainer An object specifying the container where the specified text should be searched.
+     * @param color A string value specifying the text color.
+     * @param backgroundColor A string value specifying the background color.
+     */
+    HighlightText(text: string, searchContainer: Object, color: string, backgroundColor: string): void;
 }
 interface ASPxClientHtmlEditorMediaPreloadModeStatic {
     /**
@@ -32229,6 +35393,28 @@ interface ASPxClientTreeListStatic extends ASPxClientControlStatic {
      */
     Cast(obj: Object): ASPxClientTreeList;
 }
+interface ASPxClientTreeListExportFormatStatic {
+    /**
+     * Identifies Portable Document Format (.pdf).
+     */
+    Pdf: string;
+    /**
+     * Identifies DOCX format (.docx).
+     */
+    Docx: string;
+    /**
+     * Identifies Rich Text Format (.rtf).
+     */
+    Rtf: string;
+    /**
+     * Identifies Excel Binary File format (.xls).
+     */
+    Xls: string;
+    /**
+     * Identifies XML spreadsheet file format (.xlsx).
+     */
+    Xlsx: string;
+}
 interface BootstrapClientAccordionStatic extends ASPxClientNavBarStatic {
 }
 interface BootstrapClientBinaryImageStatic extends ASPxClientHyperLinkStatic {
@@ -32239,14 +35425,6 @@ interface BootstrapClientCalendarStatic extends ASPxClientCalendarStatic {
 }
 interface BootstrapClientCallbackPanelStatic extends ASPxClientControlStatic {
 }
-interface BootstrapClientChartBaseStatic extends ASPxClientControlStatic {
-}
-interface BootstrapClientChartStatic extends BootstrapClientChartBaseStatic {
-}
-interface BootstrapClientPolarChartStatic extends BootstrapClientChartBaseStatic {
-}
-interface BootstrapClientPieChartStatic extends BootstrapClientChartBaseStatic {
-}
 interface BootstrapClientCheckBoxStatic extends ASPxClientEditStatic {
 }
 interface BootstrapClientRadioButtonStatic extends BootstrapClientCheckBoxStatic {
@@ -32281,24 +35459,45 @@ interface BootstrapClientProgressBarStatic extends ASPxClientProgressBarStatic {
 }
 interface BootstrapClientSpinEditStatic extends ASPxClientSpinEditStatic {
 }
+interface BootstrapClientTimeEditStatic extends ASPxClientTimeEditStatic {
+}
 interface BootstrapClientTabControlStatic extends ASPxClientTabControlStatic {
 }
 interface BootstrapClientPageControlStatic extends ASPxClientPageControlStatic {
 }
+interface BootstrapClientTagBoxStatic extends ASPxClientTokenBoxStatic {
+}
 interface BootstrapClientTextBoxStatic extends ASPxClientTextBoxStatic {
 }
 interface BootstrapClientMemoStatic extends ASPxClientMemoStatic {
 }
 interface BootstrapClientButtonEditStatic extends ASPxClientButtonEditStatic {
 }
-interface BootstrapClientTreeViewStatic extends ASPxClientTreeViewStatic {
+interface BootstrapClientToolbarStatic extends BootstrapClientMenuStatic {
 }
-interface BootstrapUIWidgetBaseStatic extends ASPxClientControlStatic {
+interface BootstrapClientTreeViewStatic extends ASPxClientTreeViewStatic {
 }
 interface BootstrapClientUploadControlStatic extends ASPxClientUploadControlStatic {
 }
+interface BootstrapClientUtilsStatic {
+    UpdateDefaultStyles(): void;
+}
 interface BootstrapClientGridViewStatic extends ASPxClientGridViewStatic {
 }
+interface BootstrapClientCardViewStatic extends ASPxClientGridViewStatic {
+}
+interface BootstrapUIWidgetBaseStatic extends ASPxClientControlStatic {
+}
+interface BootstrapClientChartBaseStatic extends BootstrapUIWidgetBaseStatic {
+}
+interface BootstrapClientChartStatic extends BootstrapClientChartBaseStatic {
+}
+interface BootstrapClientPolarChartStatic extends BootstrapClientChartBaseStatic {
+}
+interface BootstrapClientPieChartStatic extends BootstrapClientChartBaseStatic {
+}
+interface BootstrapClientRangeSelectorStatic extends BootstrapUIWidgetBaseStatic {
+}
 interface MVCxClientCalendarStatic extends ASPxClientCalendarStatic {
     /**
      * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
@@ -32728,6 +35927,28 @@ interface ASPxClientFileManagerErrorConstsStatic {
      */
     AlreadyExists: number;
 }
+interface ASPxClientFileManagerCallbackCommandStatic {
+    GetAllItems: string;
+    GetFileList: string;
+    Refresh: string;
+    DeleteItems: string;
+    MoveItems: string;
+    CopyItems: string;
+    RenameItem: string;
+    Download: string;
+    ShowFolderBrowserDialog: string;
+    ShowCreateFolderEditorInTreeView: string;
+    CreateFolder: string;
+    SelectedFileOpened: string;
+    FoldersTreeView: string;
+    FolderBrowserTreeView: string;
+    GridView: string;
+    ChangeFolder: string;
+    ChangeFolderInTreeView: string;
+    CustomCallback: string;
+    VirtualScrolling: string;
+    GridViewVirtualScrolling: string;
+}
 interface ASPxClientFormLayoutStatic extends ASPxClientControlStatic {
     /**
      * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
@@ -33384,10 +36605,10 @@ interface ASPxClientUtilsStatic {
     DeleteCookie(name: string): void;
     /**
      * Returns a specifically generated code that uniquely identifies the combination of keys specified via the parameters.
-     * @param keyCode An integer value that specifies the code of the key.
-     * @param isCtrlKey true if the CTRL key should be included into the key combination; otherwise, false.
-     * @param isShiftKey true if the SHIFT key should be included into the key combination; otherwise, false.
-     * @param isAltKey true if the ALT key should be included into the key combination; otherwise, false.
+     * @param keyCode An integer value that specifies the code of the key. Codes are available via the ASPx.KeyCode client object's members.
+     * @param isCtrlKey true, if the CTRL key should be included into the key combination; otherwise, false.
+     * @param isShiftKey true, if the SHIFT key should be included into the key combination; otherwise, false.
+     * @param isAltKey true, if the ALT key should be included into the key combination; otherwise, false.
      */
     GetShortcutCode(keyCode: number, isCtrlKey: boolean, isShiftKey: boolean, isAltKey: boolean): number;
     /**
@@ -33415,6 +36636,17 @@ interface ASPxClientUtilsStatic {
      * @param str A string value representing the string for trimming.
      */
     TrimEnd(str: string): string;
+    /**
+     * Returns values of editors located in the specified container.
+     * @param containerOrId A container of editors, or its ID.
+     */
+    GetEditorValuesInContainer(containerOrId: Object): Object;
+    /**
+     * Returns values of editors located in the specified container.
+     * @param containerOrId A container of editors, or its ID.
+     * @param processInvisibleEditors true to process both visible and invisible editors that belong to the specified container; false to process only visible editors.
+     */
+    GetEditorValuesInContainer(containerOrId: Object, processInvisibleEditors: boolean): Object;
     /**
      * Specifies the text that Assistive Technologies (screen readers or braille display, for example) will provide to a user.
      * @param message A String value that specifies a text.
@@ -33488,6 +36720,7 @@ declare var DashboardSpecialValues: DashboardSpecialValuesStatic;
 declare var DashboardExportPageLayout: DashboardExportPageLayoutStatic;
 declare var DashboardExportPaperKind: DashboardExportPaperKindStatic;
 declare var DashboardExportScaleMode: DashboardExportScaleModeStatic;
+declare var DashboardExportDocumentScaleMode: DashboardExportDocumentScaleModeStatic;
 declare var DashboardExportFilterState: DashboardExportFilterStateStatic;
 declare var DashboardStateExportPosition: DashboardStateExportPositionStatic;
 declare var DashboardStateExcelExportPosition: DashboardStateExcelExportPositionStatic;
@@ -33541,11 +36774,15 @@ declare var ASPxClientValidationSummary: ASPxClientValidationSummaryStatic;
 declare var ASPxClientGaugeControl: ASPxClientGaugeControlStatic;
 declare var ASPxClientGridBase: ASPxClientGridBaseStatic;
 declare var ASPxClientGridViewCallbackCommand: ASPxClientGridViewCallbackCommandStatic;
+declare var ASPxClientGridExportFormat: ASPxClientGridExportFormatStatic;
 declare var ASPxClientGridLookup: ASPxClientGridLookupStatic;
 declare var ASPxClientCardView: ASPxClientCardViewStatic;
+declare var ASPxClientCardViewExportFormat: ASPxClientCardViewExportFormatStatic;
 declare var ASPxClientGridView: ASPxClientGridViewStatic;
+declare var ASPxClientGridViewExportFormat: ASPxClientGridViewExportFormatStatic;
 declare var ASPxClientVerticalGrid: ASPxClientVerticalGridStatic;
 declare var ASPxClientVerticalGridCallbackCommand: ASPxClientVerticalGridCallbackCommandStatic;
+declare var ASPxClientVerticalGridExportFormat: ASPxClientVerticalGridExportFormatStatic;
 declare var ASPxClientCommandConsts: ASPxClientCommandConstsStatic;
 declare var ASPxClientHtmlEditor: ASPxClientHtmlEditorStatic;
 declare var ASPxClientHtmlEditorMediaPreloadMode: ASPxClientHtmlEditorMediaPreloadModeStatic;
@@ -33567,15 +36804,12 @@ declare var ASPxClientSpellChecker: ASPxClientSpellCheckerStatic;
 declare var ASPxClientSpellCheckerStopCheckingReason: ASPxClientSpellCheckerStopCheckingReasonStatic;
 declare var ASPxClientSpreadsheet: ASPxClientSpreadsheetStatic;
 declare var ASPxClientTreeList: ASPxClientTreeListStatic;
+declare var ASPxClientTreeListExportFormat: ASPxClientTreeListExportFormatStatic;
 declare var BootstrapClientAccordion: BootstrapClientAccordionStatic;
 declare var BootstrapClientBinaryImage: BootstrapClientBinaryImageStatic;
 declare var BootstrapClientButton: BootstrapClientButtonStatic;
 declare var BootstrapClientCalendar: BootstrapClientCalendarStatic;
 declare var BootstrapClientCallbackPanel: BootstrapClientCallbackPanelStatic;
-declare var BootstrapClientChartBase: BootstrapClientChartBaseStatic;
-declare var BootstrapClientChart: BootstrapClientChartStatic;
-declare var BootstrapClientPolarChart: BootstrapClientPolarChartStatic;
-declare var BootstrapClientPieChart: BootstrapClientPieChartStatic;
 declare var BootstrapClientCheckBox: BootstrapClientCheckBoxStatic;
 declare var BootstrapClientRadioButton: BootstrapClientRadioButtonStatic;
 declare var BootstrapClientComboBox: BootstrapClientComboBoxStatic;
@@ -33593,15 +36827,25 @@ declare var BootstrapClientPopupControl: BootstrapClientPopupControlStatic;
 declare var BootstrapClientPopupMenu: BootstrapClientPopupMenuStatic;
 declare var BootstrapClientProgressBar: BootstrapClientProgressBarStatic;
 declare var BootstrapClientSpinEdit: BootstrapClientSpinEditStatic;
+declare var BootstrapClientTimeEdit: BootstrapClientTimeEditStatic;
 declare var BootstrapClientTabControl: BootstrapClientTabControlStatic;
 declare var BootstrapClientPageControl: BootstrapClientPageControlStatic;
+declare var BootstrapClientTagBox: BootstrapClientTagBoxStatic;
 declare var BootstrapClientTextBox: BootstrapClientTextBoxStatic;
 declare var BootstrapClientMemo: BootstrapClientMemoStatic;
 declare var BootstrapClientButtonEdit: BootstrapClientButtonEditStatic;
+declare var BootstrapClientToolbar: BootstrapClientToolbarStatic;
 declare var BootstrapClientTreeView: BootstrapClientTreeViewStatic;
-declare var BootstrapUIWidgetBase: BootstrapUIWidgetBaseStatic;
 declare var BootstrapClientUploadControl: BootstrapClientUploadControlStatic;
+declare var BootstrapClientUtils: BootstrapClientUtilsStatic;
 declare var BootstrapClientGridView: BootstrapClientGridViewStatic;
+declare var BootstrapClientCardView: BootstrapClientCardViewStatic;
+declare var BootstrapUIWidgetBase: BootstrapUIWidgetBaseStatic;
+declare var BootstrapClientChartBase: BootstrapClientChartBaseStatic;
+declare var BootstrapClientChart: BootstrapClientChartStatic;
+declare var BootstrapClientPolarChart: BootstrapClientPolarChartStatic;
+declare var BootstrapClientPieChart: BootstrapClientPieChartStatic;
+declare var BootstrapClientRangeSelector: BootstrapClientRangeSelectorStatic;
 declare var MVCxClientCalendar: MVCxClientCalendarStatic;
 declare var MVCxClientCallbackPanel: MVCxClientCallbackPanelStatic;
 declare var MVCxClientCardView: MVCxClientCardViewStatic;
@@ -33651,6 +36895,7 @@ declare var ASPxClientDockZone: ASPxClientDockZoneStatic;
 declare var ASPxClientFileManager: ASPxClientFileManagerStatic;
 declare var ASPxClientFileManagerCommandConsts: ASPxClientFileManagerCommandConstsStatic;
 declare var ASPxClientFileManagerErrorConsts: ASPxClientFileManagerErrorConstsStatic;
+declare var ASPxClientFileManagerCallbackCommand: ASPxClientFileManagerCallbackCommandStatic;
 declare var ASPxClientFormLayout: ASPxClientFormLayoutStatic;
 declare var ASPxClientHiddenField: ASPxClientHiddenFieldStatic;
 declare var ASPxClientHint: ASPxClientHintStatic;
diff --git a/types/devexpress-web/v171/devexpress-web-tests.ts b/types/devexpress-web/v171/devexpress-web-tests.ts
new file mode 100644
index 0000000000..ef7eb8de37
--- /dev/null
+++ b/types/devexpress-web/v171/devexpress-web-tests.ts
@@ -0,0 +1,418 @@
+declare var hiddenField: ASPxClientHiddenField;
+declare var mainCallbackPanel: ASPxClientCallbackPanel;
+declare var loginPopup: ASPxClientPopupControl;
+declare var searchButton: ASPxClientButton;
+declare var searchComboBox: ASPxClientComboBox;
+declare var roomsNumberSpinEdit: ASPxClientSpinEdit;
+declare var adultsNumberSpinEdit: ASPxClientSpinEdit; 
+declare var childrenNumberSpinEdit: ASPxClientSpinEdit;
+declare var checkInDateEdit: ASPxClientDateEdit;
+declare var checkOutDateEdit: ASPxClientDateEdit;
+declare var backSlider: ASPxClientImageSlider;
+declare var locationComboBox: ASPxClientComboBox;
+declare var nightyRateTrackBar: ASPxClientTrackBar;
+declare var customerRatingTrackBar: ASPxClientTrackBar;
+declare var ourRatingCheckBoxList: ASPxClientCheckBoxList;
+declare var startFilterPopupControl: ASPxClientPopupControl;
+declare var imagePopupControl: ASPxClientPopupControl;
+declare var emailTextBox: ASPxClientTextBox;
+declare var creditCardEmailTextBox: ASPxClientTextBox;
+declare var accountEmailTextBox: ASPxClientTextBox;
+declare var bookingPageControl: ASPxClientPageControl;
+declare var paymentTypePageControl: ASPxClientPageControl;
+declare var offerFormPopup: ASPxClientPopupControl;
+declare var roomsSpinEdit: ASPxClientSpinEdit;
+declare var adultsSpinEdit: ASPxClientSpinEdit;
+declare var childrenSpinEdit: ASPxClientSpinEdit;
+declare var hotelDetailsCallbackPanel: ASPxClientCallbackPanel;
+declare var leftPanel: ASPxClientPanel;
+declare var menuButton: ASPxClientButton;
+declare var aboutWindow: ASPxClientPopupControl;
+declare var offersZone: ASPxClientDockZone;
+
+module DXDemo {
+    function showPage(page: string, params: { [key: string]: any }, skipHistory?: boolean): void {
+        var queryString = getQueryString(params || {});
+        hiddenField.Set("page", page);
+        hiddenField.Set("parameters", queryString);
+        hideMenu();
+        var uri = queryString.length ? (page + "?" + queryString) : page;
+        try {
+            if (!skipHistory && window.history && window.history.pushState)
+                window.history.pushState(uri, "", uri || "Default.aspx");
+        } catch (e) { }
+        mainCallbackPanel.PerformCallback(uri);
+    };
+
+    export function onMainMenuItemClick(s: ASPxClientMenu, e: ASPxClientMenuItemClickEventArgs): void {
+        switch (e.item.name) {
+            case "login":
+                hideMenu();
+                setTimeout(function () { loginPopup.ShowAtElementByID("MainCallbackPanel_ContentPane"); }, 300);
+                break;
+            case "offers":
+                showPage("SpecialOffers", {});
+                break;
+            default:
+                hideMenu();
+                setTimeout(function () { showAboutWindow(); }, 300);
+                break;
+        }
+    };
+
+    export function onLoginButtonClick(s: ASPxClientButton, e: ASPxClientButtonClickEventArgs): void {
+        loginPopup.Hide();
+        showAboutWindow();
+    };
+
+    export function onSearchButtonClick(): void {
+        if (ASPxClientEdit.ValidateGroup("DateEditors")) {
+            showPage("ShowHotels", {
+                location: searchComboBox.GetValue(),
+                checkin: getFormattedDate(<Date>checkInDateEdit.GetValue()),
+                checkout: getFormattedDate(<Date>checkOutDateEdit.GetValue()),
+                rooms: roomsNumberSpinEdit.GetValue() || 1,
+                adults: adultsNumberSpinEdit.GetValue() || 1,
+                children: childrenNumberSpinEdit.GetValue() || 0
+            });
+        }
+    };
+
+    export function onSearchComboBoxIndexChanged(s: ASPxClientComboBox, e: ASPxClientProcessingModeEventArgs): void {
+        hideMenu();
+        searchButton.AdjustControl();
+    };
+
+    export function onIndexOfferCloseClick(index: number): void {
+        var panel = <ASPxClientDockPanel>ASPxClientControl.GetControlCollection().GetByName("OfferDockPanel" + index);
+        var sibPanel = <ASPxClientDockPanel>ASPxClientControl.GetControlCollection().GetByName("OfferDockPanel" + (index == 1 ? 2 : 1));
+        panel.Hide();
+        sibPanel.MakeFloat();
+        sibPanel.SetWidth(offersZone.GetWidth());
+        sibPanel.Dock(offersZone);
+    };
+
+    export function onLogoClick(): void {
+        showPage("", null, false);
+    };
+
+    export function onMenuNavButtonCheckedChanged(s: ASPxClientCheckBox, e: ASPxClientProcessingModeEventArgs): void {
+        var mainContainer = mainCallbackPanel.GetMainElement();
+        if (s.GetChecked()) {
+            backSlider.Pause();
+            showMenu();
+        }
+        else {
+            hideMenu();
+            backSlider.Play();
+        }
+    };
+
+    export function onBackNavButtonClick(s: ASPxClientButton, e: ASPxClientButtonClickEventArgs): void {
+        var params = getCurrentQueryParams();
+        switch (getCurrentPage()) {
+            case "PrintInvoice":
+                showPage("Booking", params, false);
+                break;
+            case "Booking":
+                if (bookingPageControl.GetActiveTabIndex() > 0)
+                    bookingPageControl.SetActiveTabIndex(bookingPageControl.GetActiveTabIndex() - 1);
+                else
+                    showPage("ShowRooms", params, false);
+                break;
+            case "ShowRooms":
+                showPage("ShowHotels", params, false);
+                break;
+            case "ShowDetails":
+                showPage("ShowHotels", params, false);
+                break;
+            case "ShowHotels":
+            case "SpecialOffers":
+                showPage("", null, false);
+                break;
+        }
+    };
+
+    export function updateSearchResults(): void {
+        var params = getCurrentQueryParams();
+        params["location"] = locationComboBox.GetValue();
+        params["minprice"] = nightyRateTrackBar.GetPositionStart();
+        params["maxprice"] = nightyRateTrackBar.GetPositionEnd();
+        params["custrating"] = customerRatingTrackBar.GetPosition();
+        params["ourrating"] = ourRatingCheckBoxList.GetSelectedValues().join(",");
+        showPage("ShowHotels", params);
+    };
+
+    export function onBookHotelButtonClick(hotelID: string): void {
+        var queryParams = getCurrentQueryParams();
+        queryParams["hotelID"] = hotelID;
+        showPage("ShowRooms", queryParams);
+    };
+
+    export function onDetailsHotelButtonClick(hotelID: string): void {
+        var queryParams = getCurrentQueryParams();
+        queryParams["hotelID"] = hotelID;
+        showPage("ShowDetails", queryParams);
+    };
+
+    export function onShowStartFilterButtonClick(s: ASPxClientButton, e: ASPxClientButtonClickEventArgs): void {
+        startFilterPopupControl.ShowAtElementByID("MainCallbackPanel_ContentPane");
+    };
+
+    export function onChangeStartFilterButtonClick(s: ASPxClientButton, e: ASPxClientButtonClickEventArgs): void {
+        if (ASPxClientEdit.ValidateGroup("DateEditors")) {
+            var params = getCurrentQueryParams();
+            params["checkin"] = getFormattedDate(<Date>checkInDateEdit.GetValue());
+            params["checkout"] = getFormattedDate(<Date>checkOutDateEdit.GetValue());
+            params["rooms"] = roomsNumberSpinEdit.GetValue() || 1;
+            params["adults"] = adultsNumberSpinEdit.GetValue() || 1;
+            params["children"] = childrenNumberSpinEdit.GetValue() || 0;
+            startFilterPopupControl.Hide();
+            showPage(hiddenField.Get("page").toString(), params);
+        }
+    };
+
+    export function onBookRoomButtonClick(roomID: string): void {
+        var params = getCurrentQueryParams();
+        params["roomID"] = roomID;
+        showPage("Booking", params);
+    };
+
+    export function onShowRoomsButtonClick(): void {
+        var queryParams = getCurrentQueryParams();
+        showPage("ShowRooms", queryParams);
+    };
+
+    export function onShowDetailsButtonClick(): void {
+        var queryParams = getCurrentQueryParams();
+        showPage("ShowDetails", queryParams);
+    };
+
+    export function onRoomImageNavItemClick(roomID: string, pictureName: string): void {
+        setTimeout(function () {
+            imagePopupControl.PerformCallback(roomID + "|" + pictureName);
+            imagePopupControl.ShowAtElementByID("MainCallbackPanel_ContentPane");
+        }, 500);
+    };
+
+    export function onRoomsNavBarExpandedChanged(s: ASPxClientNavBar, e: ASPxClientNavBarGroupEventArgs): void {
+        ASPxClientControl.AdjustControls(s.GetMainElement());
+    };
+
+    export function onNextBookingStepButtonClick(step: number): void {
+        var valid = true;
+        var validationGroup = "";
+        if (step == 1)
+            validationGroup = "Account";
+        if (step == 2)
+            validationGroup = "RoomDetails";
+        if (step == 3)
+            validationGroup = "PaymentDetails";
+
+        switch (step) {
+            case 1:
+                valid = ASPxClientEdit.ValidateEditorsInContainer(bookingPageControl.GetMainElement(), "Account");
+                if (valid) {
+                    emailTextBox.SetValue(accountEmailTextBox.GetValue());
+                    creditCardEmailTextBox.SetValue(accountEmailTextBox.GetValue());
+                    showPage("Booking", getCurrentQueryParams());
+                    return;
+                }
+                break;
+            case 2:
+                valid = ASPxClientEdit.ValidateEditorsInContainer(bookingPageControl.GetMainElement(), "RoomDetails");
+                emailTextBox.SetValue(accountEmailTextBox.GetValue());
+                break;
+            case 3:
+                var paymentType = paymentTypePageControl.GetActiveTabIndex();
+                if (paymentType == 0)
+                    valid = ASPxClientEdit.ValidateEditorsInContainer(bookingPageControl.GetMainElement(), "CreditCard");
+                else if (paymentType == 1)
+                    valid = ASPxClientEdit.ValidateEditorsInContainer(bookingPageControl.GetMainElement(), "Cash");
+                else if (paymentType == 2)
+                    valid = ASPxClientEdit.ValidateEditorsInContainer(bookingPageControl.GetMainElement(), "PayPal");
+                break;
+        }
+        if (valid) {
+            bookingPageControl.GetTab(step).SetEnabled(true);
+            bookingPageControl.SetActiveTabIndex(step);
+        }
+    };
+
+    export function onAccountCaptchaHiddenFieldInit(s: ASPxClientHiddenField, e: ASPxClientEventArgs): void {
+        if (s.Get("IsCaptchaValid")) {
+            bookingPageControl.GetTab(1).SetEnabled(true);
+            bookingPageControl.SetActiveTabIndex(1);
+        }
+    };
+
+    export function onFinishBookingStepButtonClick(): void {
+        showAboutWindow();
+    };
+
+    export function OnPrintInvoiceButtonClick(): void {
+        showPage("PrintInvoice", getCurrentQueryParams());
+    };
+
+    export function onOfferClick(offerID: string): void {
+        offerFormPopup.SetContentHtml("");
+        offerFormPopup.PerformCallback(offerID);
+        var panel = <ASPxClientDockPanel>ASPxClientControl.GetControlCollection().GetByName("DockPanel" + offerID);
+        var panelElement = <HTMLElement>panel.GetMainElement();
+        if (panelElement.offsetWidth < 330 || panelElement.offsetHeight < 250) {
+            offerFormPopup.SetWidth(400);
+            offerFormPopup.SetHeight(280);
+            offerFormPopup.ShowAtElementByID("SpecialOffersContainer");
+        }
+        else {
+            offerFormPopup.SetWidth(panelElement.offsetWidth);
+            offerFormPopup.SetHeight(panelElement.offsetHeight);
+            offerFormPopup.ShowAtElement(panelElement);
+        }
+    };
+
+    export function onSpecialOfferCheckButtonClick(hotelID: string, locationID: string): void {
+        if (ASPxClientEdit.ValidateGroup("DateEditors")) {
+            var queryParams: { [key: string]: any } = {
+                location: locationID,
+                hotelID: hotelID,
+                checkin: getFormattedDate(<Date>checkInDateEdit.GetValue()),
+                checkout: getFormattedDate(<Date>checkOutDateEdit.GetValue()),
+                rooms: roomsSpinEdit.GetValue() || 1,
+                adults: adultsSpinEdit.GetValue() || 1,
+                children: childrenSpinEdit.GetValue() || 0
+            };
+            showPage("ShowRooms", queryParams);
+        }
+    };
+
+    export function onIndexOfferClick(): void {
+        showPage("SpecialOffers", {});
+    };
+
+    export function onControlsInit(): void {
+        ASPxClientUtils.AttachEventToElement(window, 'popstate', onHistoryPopState);
+        var pathParts = document.location.href.split("/");
+        var url = pathParts[pathParts.length - 1];
+        try {
+            if (window.history)
+                window.history.replaceState(url, "");
+        } catch (e) { }
+        ASPxClientUtils.AttachEventToElement(window, "resize", onWindowResize);
+        if (ASPxClientUtils.iOSPlatform) {
+            // animate
+        }
+    };
+
+    export function updateRatingLabels(ratingControl: ASPxClientTrackBar) {
+        var start = ratingControl.GetPositionStart().toString();
+        var end = ratingControl.GetPositionEnd().toString();
+        document.getElementById("cpLeftLabelID").innerHTML = start + " " + end;
+    };
+
+    export function onRatingControlItemClick(s: ASPxClientRatingControl, e: ASPxClientRatingControlItemClickEventArgs): void {
+        hotelDetailsCallbackPanel.PerformCallback(s.GetValue().toString());
+    };
+
+    export function onInputKeyDown(s: ASPxClientTextBox, e: ASPxClientEditKeyEventArgs): void {
+        var keyCode = ASPxClientUtils.GetKeyCode(e.htmlEvent);
+        if (keyCode == 13)
+            (<HTMLElement>s.GetInputElement()).blur();
+    };
+
+    function getCurrentPage(): string {
+        var hfPage = <string>hiddenField.Get("page");
+        if (hfPage)
+            return hfPage;
+        var pathParts = document.location.pathname.split("/");
+        return pathParts[pathParts.length - 1];
+    };
+
+    function showAboutWindow(): void {
+        aboutWindow.ShowAtElementByID("MainCallbackPanel_ContentPane");
+    };
+
+    function hideMenu(): void {
+        leftPanel.Collapse();
+        if (menuButton.GetMainElement() && menuButton.GetChecked())
+            menuButton.SetChecked(false);
+    };
+
+    function showMenu(): void {
+        leftPanel.Expand();
+    };
+
+    var _resizeSpecialOffersTimeoutID = -1;
+    function onWindowResize(): void {
+        switch (<string>hiddenField.Get("page")) {
+            case "SpecialOffers":
+                if (_resizeSpecialOffersTimeoutID == -1)
+                    _resizeSpecialOffersTimeoutID = setTimeout(resizeSpecialOffers, 200);
+                break;
+        }
+        hidePopups("AboutWindow", "StartFilterPopupControl", "LoginPopup", "OfferFormPopup", "ImagePopupControl");
+    };
+
+    function hidePopups(...names: string[]): void {
+        for (var i = 0; i < names.length; i++) {
+            var popupControl = <ASPxClientPopupControl>ASPxClientControl.GetControlCollection().GetByName(names[i]);
+            popupControl.Hide();
+        }
+    };
+
+    function resizeSpecialOffers(): void {
+        for (var i = 1; i <= 4; i++) {
+            var panel = <ASPxClientDockPanel>ASPxClientControl.GetControlCollection().GetByName("DockPanel" + i);
+            if (panel && panel.IsVisible()) {
+                var zone = panel.GetOwnerZone();
+                zone.SetWidth((<HTMLElement>(<HTMLElement>zone.GetMainElement()).parentNode).offsetWidth)
+            }
+        }
+        _resizeSpecialOffersTimeoutID = -1;
+    };
+
+    function getFormattedDate(date: Date): string {
+        return (date.getMonth() + 1) + "-" + date.getDate() + "-" + date.getFullYear();
+    };
+
+    function getCurrentQueryParams(): { [key:string]: any } {
+        var hfParams = <string>hiddenField.Get("parameters");
+        if (hfParams)
+            return getParamsByQueryString(hfParams);
+        var query = document.location.search;
+        if (query[0] === "?")
+            query = query.substr(1);
+        return getParamsByQueryString(query);
+    };
+
+    function getQueryString(params: { [key:string]: any }): string {
+        var queryItems: any[] = [];
+        for (var key in params) {
+            if (!params.hasOwnProperty(key)) continue;
+            queryItems.push(key + "=" + params[key]);
+        }
+        if (queryItems.length > 0)
+            return queryItems.join("&");
+        return "";
+    };
+
+    function getParamsByQueryString(queryString: string): { [key: string]: string } {
+        var result: { [key: string]: any } = {};
+        if (queryString) {
+            var queryStringArray = queryString.split("&");
+            for (var i = 0; i < queryStringArray.length; i++) {
+                var part = queryStringArray[i].split('=');
+                if (part.length != 2) continue;
+                result[part[0]] = decodeURIComponent(part[1].replace(/\+/g, " "));
+            }
+        }
+        return result;
+    };
+
+    function onHistoryPopState(evt: any): void {
+        if (evt.state !== null && evt.state !== undefined) {
+            var uriParts = evt.state.split("?");
+            showPage(uriParts[0], getParamsByQueryString(uriParts[1]), true);
+        }
+    };
+}
\ No newline at end of file
diff --git a/types/devexpress-web/v171/index.d.ts b/types/devexpress-web/v171/index.d.ts
new file mode 100644
index 0000000000..50aac382b1
--- /dev/null
+++ b/types/devexpress-web/v171/index.d.ts
@@ -0,0 +1,33698 @@
+// Type definitions for DevExpress ASP.NET v171.4
+// Project: http://devexpress.com/
+// Definitions by: DevExpress Inc. <http://devexpress.com/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * A client-side counterpart of the DashboardViewer extension.
+ */
+interface MVCxClientDashboardViewer extends ASPxClientDashboardViewer {
+}
+/**
+ * Represents a list of records from the dashboard data source.
+ */
+interface ASPxClientDashboardItemUnderlyingData {
+    /**
+     * Gets the number of rows in the underlying data set.
+     */
+    GetRowCount(): number;
+    /**
+     * Returns the value of the specified cell within the underlying data set.
+     * @param rowIndex An integer value that specifies the zero-based index of the required row.
+     * @param dataMember A String that specifies the required data member.
+     */
+    GetRowValue(rowIndex: number, dataMember: string): Object;
+    /**
+     * Returns an array of data members available in a data source.
+     */
+    GetDataMembers(): string[];
+    /**
+     * Returns whether or not a request for underlying data was successful.
+     */
+    IsDataReceived(): boolean;
+    /**
+     * Returns a callstack containing the error caused by an unsuccessful request for underlying data.
+     */
+    GetRequestDataError(): string;
+}
+/**
+ * Contains parameters used to obtain the underlying data for the dashboard item.
+ */
+interface ASPxClientDashboardItemRequestUnderlyingDataParameters {
+    /**
+     * Gets or sets an array of data member identifiers used to obtain underlying data.
+     * Value: An array of string values that specify data member identifiers.
+     */
+    DataMembers: string[];
+    /**
+     * Gets or sets axis points used to obtain the underlying data.
+     * Value: An array of ASPxClientDashboardItemDataAxisPoint objects that represent axis points.
+     */
+    AxisPoints: ASPxClientDashboardItemDataAxisPoint[];
+    /**
+     * Gets or sets the dimension value used to obtain the underlying data.
+     * Value: The dimension value.
+     */
+    ValuesByAxisName: Object;
+    /**
+     * Gets or sets the unique dimension value used to obtain the underlying data.
+     * Value: The unique dimension value.
+     */
+    UniqueValuesByAxisName: Object;
+}
+/**
+ * References a method executed after an asynchronous request is complete.
+ */
+interface ASPxClientDashboardItemRequestUnderlyingDataCompleted {
+    /**
+     * References a method executed after an asynchronous request is completed.
+     * @param data An ASPxClientDashboardItemUnderlyingData object that represents a list of records from the dashboard data source.
+     */
+    (data: ASPxClientDashboardItemUnderlyingData): void;
+}
+/**
+ * References a method that will handle the ItemClick events.
+ */
+interface ASPxClientDashboardItemClickEventHandler<S> {
+    /**
+     * References a method that will handle the ItemClick events.
+     * @param source The event source.
+     * @param e A ASPxClientDashboardItemClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardItemClickEventArgs): void;
+}
+/**
+ * Provides data for the ItemClick events.
+ */
+interface ASPxClientDashboardItemClickEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name of the dashboard item for which the event has been raised.
+     * Value: A string value that is the dashboard item name.
+     */
+    ItemName: string;
+    /**
+     * Gets the dashboard item's client data.
+     */
+    GetData(): ASPxClientDashboardItemData;
+    /**
+     * Returns the axis point corresponding to the clicked visual element.
+     * @param axisName A string value returned by the DashboardDataAxisNames class that specifies the name of the data axis.
+     */
+    GetAxisPoint(axisName: string): ASPxClientDashboardItemDataAxisPoint;
+    /**
+     * Gets measures corresponding to the clicked visual element.
+     */
+    GetMeasures(): ASPxClientDashboardItemDataMeasure[];
+    /**
+     * Gets deltas corresponding to the clicked visual element.
+     */
+    GetDeltas(): ASPxClientDashboardItemDataDelta[];
+    /**
+     * Gets the dimensions used to create a hierarchy of axis points for the specified axis.
+     * @param axisName A string value returned by the DashboardDataAxisNames class that specifies the name of the data axis.
+     */
+    GetDimensions(axisName: string): ASPxClientDashboardItemDataDimension[];
+    /**
+     * Requests underlying data corresponding to the clicked visual element.
+     * @param onCompleted A ASPxClientDashboardItemRequestUnderlyingDataCompleted object that references a method executed after the request is completed.
+     * @param dataMembers An array of string values that specify data members used to obtain underlying data.
+     */
+    RequestUnderlyingData(onCompleted: ASPxClientDashboardItemRequestUnderlyingDataCompleted, dataMembers: string[]): void;
+}
+/**
+ * References a method that will handle the ItemVisualInteractivity events.
+ */
+interface ASPxClientDashboardItemVisualInteractivityEventHandler<S> {
+    /**
+     * References a method that will handle the ItemVisualInteractivity events.
+     * @param source The event source.
+     * @param e A ASPxClientDashboardItemVisualInteractivityEventArgs object containing event data.
+     */
+    (source: S, e: ASPxClientDashboardItemVisualInteractivityEventArgs): void;
+}
+/**
+ * Provides data for the ItemVisualInteractivity events.
+ */
+interface ASPxClientDashboardItemVisualInteractivityEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the component name of the dashboard item for which the event was raised.
+     * Value: A string value that is the component name of the dashboard item.
+     */
+    ItemName: string;
+    /**
+     * Gets the selection mode for dashboard item elements.
+     */
+    GetSelectionMode(): string;
+    /**
+     * Sets the selection mode for dashboard item elements.
+     * @param selectionMode A String that specifies the selection mode.
+     */
+    SetSelectionMode(selectionMode: string): void;
+    /**
+     * Returns whether or not highlighting is enabled for the current dashboard item.
+     */
+    IsHighlightingEnabled(): boolean;
+    /**
+     * Enables highlighting for the current dashboard item.
+     * @param enableHighlighting true, to enable highlighting; otherwise, false.
+     */
+    EnableHighlighting(enableHighlighting: boolean): void;
+    /**
+     * Gets data axes used to perform custom interactivity actions.
+     */
+    GetTargetAxes(): string[];
+    /**
+     * Sets data axes used to perform custom interactivity actions.
+     * @param targetAxes An array of String objects that specify names of data axes.
+     */
+    SetTargetAxes(targetAxes: string[]): void;
+    /**
+     * Gets the default selection for the current dashboard item.
+     */
+    GetDefaultSelection(): ASPxClientDashboardItemDataAxisPointTuple[];
+    /**
+     * Sets the default selection for the current dashboard item.
+     * @param values An array of ASPxClientDashboardItemDataAxisPointTuple objects specifying axis point tuples used to select default elements.
+     */
+    SetDefaultSelection(values: ASPxClientDashboardItemDataAxisPointTuple[]): void;
+}
+/**
+ * References a method that will handle the ItemSelectionChanged events.
+ */
+interface ASPxClientDashboardItemSelectionChangedEventHandler<S> {
+    /**
+     * References a method that will handle the ItemSelectionChanged events.
+     * @param source The event source.
+     * @param e A ASPxClientDashboardItemSelectionChangedEventArgs object containing event data.
+     */
+    (source: S, e: ASPxClientDashboardItemSelectionChangedEventArgs): void;
+}
+/**
+ * Provides data for the ItemSelectionChanged events.
+ */
+interface ASPxClientDashboardItemSelectionChangedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the component name of the dashboard item for which the event was raised.
+     * Value: A string that is the component name of the dashboard item.
+     */
+    ItemName: string;
+    /**
+     * Gets currently selected elements.
+     */
+    GetCurrentSelection(): ASPxClientDashboardItemDataAxisPointTuple[];
+}
+/**
+ * References a method that will handle the ItemElementCustomColor event.
+ */
+interface ASPxClientDashboardItemElementCustomColorEventHandler<S> {
+    /**
+     * References a method that will handle the ItemElementCustomColor events.
+     * @param source The event source.
+     * @param e An ASPxClientDashboardItemElementCustomColorEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardItemElementCustomColorEventArgs): void;
+}
+/**
+ * Provides data for the ItemElementCustomColor events.
+ */
+interface ASPxClientDashboardItemElementCustomColorEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the component name of the dashboard item for which the event was raised.
+     * Value: A string value that is the component name of the dashboard item for which the event was raised.
+     */
+    ItemName: string;
+    /**
+     * Gets the axis point tuple that corresponds to the current dashboard item element.
+     */
+    GetTargetElement(): ASPxClientDashboardItemDataAxisPointTuple;
+    /**
+     * Gets the color of the current dashboard item element.
+     */
+    GetColor(): string;
+    /**
+     * Sets the color of the current dashboard item element.
+     * @param color A String that specifies the color of the current dashboard item element.
+     */
+    SetColor(color: string): void;
+    /**
+     * Gets measures corresponding to the current dashboard item element.
+     */
+    GetMeasures(): ASPxClientDashboardItemDataMeasure[];
+}
+/**
+ * References a method that will handle the ItemWidgetCreated events.
+ */
+interface ASPxClientDashboardItemWidgetCreatedEventHandler<S> {
+    /**
+     * References a method that will handle the ItemWidgetCreated events.
+     * @param source The event source.
+     * @param e A ASPxClientDashboardItemWidgetEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardItemWidgetEventArgs): void;
+}
+/**
+ * References a method that will handle the ItemWidgetUpdating event.
+ */
+interface ASPxClientDashboardItemWidgetUpdatingEventHandler<S> {
+    /**
+     * References a method that will handle the ItemWidgetUpdating event.
+     * @param source The event source.
+     * @param e A ASPxClientDashboardItemWidgetEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardItemWidgetEventArgs): void;
+}
+/**
+ * References a method that will handle the ItemWidgetUpdated event.
+ */
+interface ASPxClientDashboardItemWidgetUpdatedEventHandler<S> {
+    /**
+     * References a method that will handle the ItemWidgetUpdated event.
+     * @param source The event source.
+     * @param e A ASPxClientDashboardItemWidgetEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardItemWidgetEventArgs): void;
+}
+/**
+ * References a method that will handle the ItemBeforeWidgetDisposed events.
+ */
+interface ASPxClientDashboardItemBeforeWidgetDisposedEventHandler<S> {
+    /**
+     * References a method that will handle the ItemBeforeWidgetDisposed events.
+     * @param source The event source.
+     * @param e A ASPxClientDashboardItemWidgetEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardItemWidgetEventArgs): void;
+}
+/**
+ * Provides data for events related to client widgets used to visualize data in dashboard items.
+ */
+interface ASPxClientDashboardItemWidgetEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the component name of the dashboard item for which the event was raised.
+     * Value: A string value that is the component name of the dashboard item.
+     */
+    ItemName: string;
+    /**
+     * Returns an underlying widget corresponding to the current dashboard item.
+     */
+    GetWidget(): Object;
+}
+/**
+ * Represents multidimensional data visualized in the dashboard item.
+ */
+interface ASPxClientDashboardItemData {
+    /**
+     * Gets the names of the axes that constitute the current ASPxClientDashboardItemData.
+     */
+    GetAxisNames(): string[];
+    /**
+     * Returns the specified data axis.
+     * @param axisName A string value returned by the DashboardDataAxisNames class that specifies the name of the data axis.
+     */
+    GetAxis(axisName: string): ASPxClientDashboardItemDataAxis;
+    /**
+     * Gets the dimensions used to create a hierarchy of axis points for the specified axis.
+     * @param axisName A string value returned by the DashboardDataAxisNames class that specifies the name of the data axis.
+     */
+    GetDimensions(axisName: string): ASPxClientDashboardItemDataDimension[];
+    /**
+     * Gets the measures for the current ASPxClientDashboardItemData object.
+     */
+    GetMeasures(): ASPxClientDashboardItemDataMeasure[];
+    /**
+     * Gets the deltas for the current ASPxClientDashboardItemData object.
+     */
+    GetDeltas(): ASPxClientDashboardItemDataDelta[];
+    /**
+     * Gets the slice of the current ASPxClientDashboardItemData object by the specified axis point tuple.
+     * @param tuple A ASPxClientDashboardItemDataAxisPointTuple object that is a tuple of axis points.
+     */
+    GetSlice(tuple: ASPxClientDashboardItemDataAxisPointTuple): ASPxClientDashboardItemData;
+    /**
+     * Gets the slice of the current ASPxClientDashboardItemData object by the specified axis point.
+     * @param axisPoint An ASPxClientDashboardItemDataAxisPoint object that is the data point in a multidimensional space.
+     */
+    GetSlice(axisPoint: ASPxClientDashboardItemDataAxisPoint): ASPxClientDashboardItemData;
+    /**
+     * Returns a total summary value for the specified measure.
+     * @param measureId A String that is the measure identifier.
+     */
+    GetMeasureValue(measureId: string): ASPxClientDashboardItemDataMeasureValue;
+    /**
+     * Gets the summary value for the specified delta.
+     * @param deltaId A String that is the data item identifier.
+     */
+    GetDeltaValue(deltaId: string): ASPxClientDashboardItemDataDeltaValue;
+    /**
+     * Returns an array of data members available in a data source.
+     */
+    GetDataMembers(): string[];
+    /**
+     * Creates a tuple based on the specified axes names and corresponding values.
+     * @param values An array of name-value pairs containing the axis name and corresponding values.
+     */
+    CreateTuple(values: Object[]): ASPxClientDashboardItemDataAxisPointTuple;
+    /**
+     * Creates a tuple based on the specified axis points.
+     * @param axisPoints An array of ASPxClientDashboardItemDataAxisPoint objects that specify axis points belonging to different data axes.
+     */
+    CreateTuple(axisPoints: ASPxClientDashboardItemDataAxisPoint[]): ASPxClientDashboardItemDataAxisPointTuple;
+}
+/**
+ * An axis that contains data points corresponding to the specified value hierarchy.
+ */
+interface ASPxClientDashboardItemDataAxis {
+    /**
+     * Gets the dimensions used to create a hierarchy of axis points belonging to the current axis.
+     */
+    GetDimensions(): ASPxClientDashboardItemDataDimension[];
+    /**
+     * Gets the root axis point belonging to the current ASPxClientDashboardItemDataAxis.
+     */
+    GetRootPoint(): ASPxClientDashboardItemDataAxisPoint;
+    /**
+     * Returns axis points corresponding to values of the last-level dimension.
+     */
+    GetPoints(): ASPxClientDashboardItemDataAxisPoint[];
+    /**
+     * Returns axis points corresponding to the specified dimension.
+     * @param dimensionId A String that is the dimension identifier.
+     */
+    GetPointsByDimension(dimensionId: string): ASPxClientDashboardItemDataAxisPoint[];
+    /**
+     * Returns the data point for the specified axis by unique values.
+     * @param uniqueValues A hierarchy of unique values identifying the required data point.
+     */
+    GetPointByUniqueValues(uniqueValues: Object[]): ASPxClientDashboardItemDataAxisPoint;
+}
+/**
+ * Contains the dimension metadata.
+ */
+interface ASPxClientDashboardItemDataDimension {
+    /**
+     * Gets the dimension identifier.
+     * Value: A string value that is the dimension identifier.
+     */
+    Id: string;
+    /**
+     * Gets or sets the name of the dimension.
+     * Value: A string value that is the name of the dimension.
+     */
+    Name: string;
+    /**
+     * Gets the data member identifier for the current dimension.
+     * Value: A string value that identifies a data member.
+     */
+    DataMember: string;
+    /**
+     * Gets the group interval for date-time values for the current dimension.
+     * Value: A string value that represents how date-time values are grouped.
+     */
+    DateTimeGroupInterval: string;
+    /**
+     * Gets the group interval for string values.
+     * Value: A string value that specifies the group interval for string values.
+     */
+    TextGroupInterval: string;
+    /**
+     * Formats the specified value using format settings of the current dimension.
+     * @param value A value to be formatted.
+     */
+    Format(value: Object): string;
+}
+/**
+ * Contains the measure metadata.
+ */
+interface ASPxClientDashboardItemDataMeasure {
+    /**
+     * Gets the measure identifier.
+     * Value: A string value that is the measure identifier.
+     */
+    Id: string;
+    /**
+     * Gets the name of the measure.
+     * Value: A string value that is the name of the measure.
+     */
+    Name: string;
+    /**
+     * Gets the data member that identifies the data source list used to provide data for the current measure.
+     * Value: A string value that identifies the data source list used to provide data for the current measure.
+     */
+    DataMember: string;
+    /**
+     * Gets the type of summary function calculated against the current measure.
+     * Value: A string value that identifies the type of summary function calculated against the current measure.
+     */
+    SummaryType: string;
+    /**
+     * Formats the specified value using format settings of the current measure.
+     * @param value A value to be formatted.
+     */
+    Format(value: Object): string;
+}
+/**
+ * Contains the delta metadata.
+ */
+interface ASPxClientDashboardItemDataDelta {
+    /**
+     * Gets the data item identifier.
+     * Value: A string that is the data item identifier.
+     */
+    Id: string;
+    /**
+     * Gets the name of the data item container.
+     * Value: A string value that is the name of the data item container.
+     */
+    Name: string;
+    /**
+     * Gets the identifier for the measure that provides actual values.
+     * Value: A string value that is the measure identifier.
+     */
+    ActualMeasureId: string;
+    /**
+     * Gets the identifier for the measure that provides target values.
+     * Value: A string value that is the measure identifier.
+     */
+    TargetMeasureId: string;
+}
+/**
+ * Provides dimension values at the specified axis point.
+ */
+interface ASPxClientDashboardItemDataDimensionValue {
+    /**
+     * Gets the current dimension value.
+     */
+    GetValue(): Object;
+    /**
+     * Gets the unique value for the current dimension value.
+     */
+    GetUniqueValue(): Object;
+    /**
+     * Gets the display text for the current dimension value.
+     */
+    GetDisplayText(): string;
+}
+/**
+ * Provides the measure value and display text.
+ */
+interface ASPxClientDashboardItemDataMeasureValue {
+    /**
+     * Gets the measure value.
+     */
+    GetValue(): Object;
+    /**
+     * Gets the measure display text.
+     */
+    GetDisplayText(): string;
+}
+/**
+ * Provides delta element values.
+ */
+interface ASPxClientDashboardItemDataDeltaValue {
+    /**
+     * Provides access to the actual value displayed within the delta element.
+     */
+    GetActualValue(): ASPxClientDashboardItemDataMeasureValue;
+    /**
+     * Provides access to the target value.
+     */
+    GetTargetValue(): ASPxClientDashboardItemDataMeasureValue;
+    /**
+     * Provides access to the absolute difference between the actual and target values.
+     */
+    GetAbsoluteVariation(): ASPxClientDashboardItemDataMeasureValue;
+    /**
+     * Provides access to the percent of variation between the actual and target values.
+     */
+    GetPercentVariation(): ASPxClientDashboardItemDataMeasureValue;
+    /**
+     * Provides access to the percentage of the actual value in the target value.
+     */
+    GetPercentOfTarget(): ASPxClientDashboardItemDataMeasureValue;
+    /**
+     * Provides access to the main delta value.
+     */
+    GetDisplayValue(): ASPxClientDashboardItemDataMeasureValue;
+    /**
+     * Provides access to the first additional delta value.
+     */
+    GetDisplaySubValue1(): ASPxClientDashboardItemDataMeasureValue;
+    /**
+     * Provides access to the second additional delta value.
+     */
+    GetDisplaySubValue2(): ASPxClientDashboardItemDataMeasureValue;
+    /**
+     * Gets the value specifying the condition for displaying the delta indication.
+     */
+    GetIsGood(): ASPxClientDashboardItemDataMeasureValue;
+    /**
+     * Gets the type of delta indicator.
+     */
+    GetIndicatorType(): ASPxClientDashboardItemDataMeasureValue;
+}
+/**
+ * A point on the data axis.
+ */
+interface ASPxClientDashboardItemDataAxisPoint {
+    /**
+     * Gets the name of the axis to which the current axis point belongs.
+     */
+    GetAxisName(): string;
+    /**
+     * Gets the last level dimension corresponding to the current axis point.
+     */
+    GetDimension(): ASPxClientDashboardItemDataDimension;
+    /**
+     * Gets the collection of dimensions used to create a hierarchy of axis points from the root point to the current axis point.
+     */
+    GetDimensions(): ASPxClientDashboardItemDataDimension[];
+    /**
+     * Gets the value corresponding to the current axis point.
+     */
+    GetValue(): Object;
+    /**
+     * Gets the display text corresponding to the current axis point.
+     */
+    GetDisplayText(): string;
+    /**
+     * Gets the unique value corresponding to the current axis point.
+     */
+    GetUniqueValue(): Object;
+    /**
+     * Gets the dimension values at the specified axis point.
+     */
+    GetDimensionValue(): ASPxClientDashboardItemDataDimensionValue;
+    /**
+     * Gets the dimension value at the current axis point.
+     * @param dimensionId A String value that specifies the dimension identifier.
+     */
+    GetDimensionValue(dimensionId: string): ASPxClientDashboardItemDataDimensionValue;
+    /**
+     * Gets the child axis points for the current axis point.
+     */
+    GetChildren(): ASPxClientDashboardItemDataAxisPoint[];
+    /**
+     * Gets the parent axis point for the current axis point.
+     */
+    GetParent(): ASPxClientDashboardItemDataAxisPoint;
+}
+/**
+ * Represents a tuple of axis points.
+ */
+interface ASPxClientDashboardItemDataAxisPointTuple {
+    /**
+     * Returns the axis point belonging to the default data axis.
+     */
+    GetAxisPoint(): ASPxClientDashboardItemDataAxisPoint;
+    /**
+     * Returns the axis point belonging to the specified data axis.
+     * @param axisName A string value returned by the DashboardDataAxisNames class that specifies the name of the data axis.
+     */
+    GetAxisPoint(axisName: string): ASPxClientDashboardItemDataAxisPoint;
+}
+/**
+ * A range in the Range Filter dashboard item.
+ */
+interface ASPxClientDashboardRangeFilterSelection {
+    /**
+     * Gets or sets a maximum value in the range of the Range Filter dashboard item.
+     * Value: A maximum value in the range of the Range Filter dashboard item.
+     */
+    Maximum: Object;
+    /**
+     * Gets or sets a minimum value in the range of the Range Filter dashboard item.
+     * Value: A minimum value in the range of the Range Filter dashboard item.
+     */
+    Minimum: Object;
+}
+/**
+ * A collection of ASPxClientDashboardParameter objects.
+ */
+interface ASPxClientDashboardParameters {
+    /**
+     * Returns an array of dashboard parameters from the ASPxClientDashboardParameters collection.
+     */
+    GetParameterList(): ASPxClientDashboardParameter[];
+    /**
+     * Returns a dashboard parameter by its name.
+     * @param name A String object that specifies the parameter name.
+     */
+    GetParameterByName(name: string): ASPxClientDashboardParameter;
+    /**
+     * Returns a dashboard parameter by its index in the ASPxClientDashboardParameters collection.
+     * @param index An integer value that specifies the parameter index.
+     */
+    GetParameterByIndex(index: number): ASPxClientDashboardParameter;
+}
+/**
+ * A client-side dashboard parameter.
+ */
+interface ASPxClientDashboardParameter {
+    /**
+     * Gets the dashboard parameter name on the client side.
+     * Value: A string value that is the dashboard parameter name on the client side.
+     */
+    Name: string;
+    /**
+     * Gets the dashboard parameter value on the client side.
+     * Value: A string value that specifies the dashboard parameter value on the client side.
+     */
+    Value: Object;
+    /**
+     * Returns a parameter name.
+     */
+    GetName(): string;
+    /**
+     * Returns a current parameter value(s).
+     */
+    GetValue(): Object;
+    /**
+     * Specifies the current parameter value(s).
+     * @param value The current parameter value(s).
+     */
+    SetValue(value: Object): void;
+    /**
+     * Returns a default parameter value.
+     */
+    GetDefaultValue(): Object;
+    /**
+     * Returns the parameter's description displayed to an end-user.
+     */
+    GetDescription(): string;
+    /**
+     * Returns a parameter type.
+     */
+    GetType(): string;
+    /**
+     * Returns possible parameter values.
+     */
+    GetValues(): ASPxClientDashboardParameterValue[];
+}
+/**
+ * Provides access to the parameter value and display text.
+ */
+interface ASPxClientDashboardParameterValue {
+    /**
+     * Returns the parameter display text.
+     */
+    GetDisplayText(): string;
+    /**
+     * Returns a parameter value.
+     */
+    GetValue(): Object;
+}
+/**
+ * Contains settings that specify parameters affecting how the dashboard or dashboard item is exported in Image format.
+ */
+interface ImageFormatOptions {
+    /**
+     * Gets or sets an image format in which the dashboard (dashboard item) is exported.
+     * Value: A value returned by the DashboardExportImageFormat class that specifies an image format in which the dashboard (dashboard item) is exported.
+     */
+    Format: string;
+    /**
+     * Gets or sets the resolution (in dpi) used to export a dashboard (dashboard item) in Image format.
+     * Value: An integer value that specifies the resolution (in dpi) used to export a dashboard (dashboard item) in Image format.
+     */
+    Resolution: number;
+}
+/**
+ * Contains options which define how the dashboard item is exported to Excel format.
+ */
+interface ExcelFormatOptions {
+    /**
+     * Gets or sets the Excel format in which the dashboard item is exported.
+     * Value: A value returned by the DashboardExportExcelFormat class that specifies the Excel format in which the dashboard item is exported.
+     */
+    Format: string;
+    /**
+     * Gets or sets a character used to separate values in a CSV document.
+     * Value: A string value that specifies the character used to separate values in a CSV document.
+     */
+    CsvValueSeparator: string;
+}
+/**
+ * Contains settings that specify parameters affecting how the Grid dashboard item is exported.
+ */
+interface GridExportOptions {
+    /**
+     * Gets or sets whether the size of the Grid dashboard item is changed according to the width of the exported page.
+     * Value: true, to change the size of the Grid dashboard item according to the width of the exported page; otherwise, false.
+     */
+    FitToPageWidth: boolean;
+    /**
+     * Gets or sets whether to print column headers of the Grid dashboard item on every page.
+     * Value: true, to print column headers on every page; otherwise, false.
+     */
+    PrintHeadersOnEveryPage: boolean;
+}
+/**
+ * Contains settings that specify parameters affecting how the Pivot dashboard item is exported.
+ */
+interface PivotExportOptions {
+    /**
+     * Gets or sets whether to print the column headers of the Pivot dashboard item on every page.
+     * Value: true, to print column headers on every page; otherwise, false.
+     */
+    PrintHeadersOnEveryPage: boolean;
+}
+/**
+ * Contains settings that specify parameters affecting how the Pie dashboard item is exported.
+ */
+interface PieExportOptions {
+    /**
+     * Gets or sets whether dashboard item elements are arranged automatically on the exported page.
+     * Value: true, to arrange dashboard item elements automatically on the exported page; otherwise, false.
+     */
+    AutoArrangeContent: boolean;
+}
+/**
+ * Contains settings that specify parameters affecting how the Gauge dashboard item is exported.
+ */
+interface GaugeExportOptions {
+    /**
+     * Gets or sets whether dashboard item elements are arranged automatically on the exported page.
+     * Value: true, to arrange dashboard item elements automatically on the exported page; otherwise, false.
+     */
+    AutoArrangeContent: boolean;
+}
+/**
+ * Contains settings that specify parameters affecting how the Card dashboard item is exported.
+ */
+interface CardExportOptions {
+    /**
+     * Gets or sets whether dashboard item elements are arranged automatically on the exported page.
+     * Value: true, to arrange dashboard item elements automatically on the exported page; otherwise, false.
+     */
+    AutoArrangeContent: boolean;
+}
+/**
+ * Contains settings that specify parameters affecting how the Range Filter dashboard item is exported.
+ */
+interface RangeFilterExportOptions {
+    /**
+     * Gets or sets whether the page orientation used to export a Range Filter dashboard item is selected automatically.
+     * Value: true, to automatically select the page orientation used to export a Range Filter dashboard item; otherwise, false.
+     */
+    AutomaticPageLayout: boolean;
+    /**
+     * Gets or sets the export size mode for the Range Filter dashboard item.
+     * Value: A value returned by the RangeFilterExportSizeMode class that specifies the export size mode for the Range Filter dashboard item.
+     */
+    SizeMode: string;
+}
+/**
+ * Contains settings that specify parameters affecting how Chart dashboard items are exported.
+ */
+interface ChartExportOptions {
+    /**
+     * Gets or sets whether the page orientation used to export a Chart dashboard item is selected automatically.
+     * Value: true, to automatically select the page orientation used to export a Chart dashboard item; otherwise, false.
+     */
+    AutomaticPageLayout: boolean;
+    /**
+     * Gets or sets the export size mode for the Chart dashboard item.
+     * Value: A value returned by the ChartExportSizeMode class that specifies the export size mode for the Chart dashboard item.
+     */
+    SizeMode: string;
+}
+/**
+ * Contains settings that specify parameters affecting how Map dashboard items are exported.
+ */
+interface MapExportOptions {
+    /**
+     * Gets or sets whether the page orientation used to export a map dashboard item is selected automatically.
+     * Value: true, to automatically select the page orientation used to export a map dashboard item; otherwise, false.
+     */
+    AutomaticPageLayout: boolean;
+    /**
+     * Gets or sets the export size mode for the map dashboard item.
+     * Value: A value returned by the MapExportSizeMode class that specifies specifies the export size mode for the map dashboard item.
+     */
+    SizeMode: string;
+}
+/**
+ * Contains settings that specify parameters affecting how the dashboard (dashboard item) is exported.
+ */
+interface ASPxClientDashboardExportOptions {
+    /**
+     * Gets or sets the standard paper size.
+     * Value: A string value returned by the DashboardExportPaperKind class that specifies the standard paper size.
+     */
+    PaperKind: string;
+    /**
+     * Gets or sets the page orientation used to export a dashboard (dashboard item).
+     * Value: A string value returned by the DashboardExportPageLayout class that specifies the page orientation used to export a dashboard (dashboard item).
+     */
+    PageLayout: string;
+    /**
+     * Gets or sets the mode for scaling when exporting a dashboard (dashboard item).
+     * Value: A string value returned by the DashboardExportScaleMode class that specifies the mode for scaling when exporting a dashboard (dashboard item).
+     */
+    ScaleMode: string;
+    /**
+     * Gets or sets the scale factor (in fractions of 1) by which a dashboard (dashboard item) is scaled.
+     * Value: A Single value that specifies the scale factor by which a dashboard (dashboard item) is scaled.
+     */
+    ScaleFactor: number;
+    /**
+     * Gets or sets the number of horizontal/vertical pages spanning the total width/height of a dashboard (dashboard item).
+     * Value: An integer value that specifies the number of horizontal/vertical pages spanning the total width/height of a dashboard (dashboard item).
+     */
+    AutoFitPageCount: number;
+    /**
+     * Gets or sets the title of the exported document.
+     * Value: A string value that specifies the title of the exported document.
+     */
+    Title: string;
+    /**
+     * Gets or sets whether a dashboard title (or dashboard item's caption) is included as the exported document title.
+     * Value: A boolean value that specifies whether a dashboard title (or dashboard item's caption) is included as the exported document title.
+     */
+    ShowTitle: boolean;
+    /**
+     * Gets or sets the filter state's location on the exported document.
+     * Value: A string value returned by the DashboardExportFilterState class that specifies the filter state's location on the exported document.
+     */
+    FilterState: string;
+    /**
+     * Provides access to options for exporting a dashboard or individual items in Image format.
+     * Value: An ImageFormatOptions object containing settings that specify parameters affecting how the dashboard or dashboard item is exported in Image format.
+     */
+    ImageOptions: ImageFormatOptions;
+    /**
+     * Provides access to options for exporting individual dashboard items in Excel format.
+     * Value: An ExcelFormatOptions object containing settings that specify parameters affecting how the dashboard item is exported in Excel format.
+     */
+    ExcelOptions: ExcelFormatOptions;
+    /**
+     * Provides access to options for exporting a Grid dashboard item.
+     * Value: A GridExportOptions object containing settings that specify parameters that affect how Grid dashboard items are exported.
+     */
+    GridOptions: GridExportOptions;
+    /**
+     * Provides access to options for exporting a Pivot dashboard item.
+     * Value: A PivotExportOptions object containing settings that specify parameters that affect how Pivot dashboard items are exported.
+     */
+    PivotOptions: PivotExportOptions;
+    /**
+     * Provides access to options for exporting a Pie dashboard item.
+     * Value: A PieExportOptions object containing settings that specify parameters that affect how Pie dashboard items are exported.
+     */
+    PieOptions: PieExportOptions;
+    /**
+     * Provides access to options for exporting a Gauge dashboard item.
+     * Value: A GaugeExportOptions object containing settings that specify parameters that affect how Gauge dashboard items are exported.
+     */
+    GaugeOptions: GaugeExportOptions;
+    /**
+     * Provides access to options for exporting a Card dashboard item.
+     * Value: A CardExportOptions object containing settings that specify parameters that affect how Card dashboard items are exported.
+     */
+    CardOptions: CardExportOptions;
+    /**
+     * Provides access to options for exporting a Range Filter dashboard item.
+     * Value: A RangeFilterExportOptions object containing settings that specify parameters affecting how the Range Filter dashboard item is exported.
+     */
+    RangeFilterOptions: RangeFilterExportOptions;
+    /**
+     * Provides access to options for exporting a Chart dashboard item.
+     * Value: A ChartExportOptions object containing settings that specify parameters that affect how Chart dashboard items are exported.
+     */
+    ChartOptions: ChartExportOptions;
+    /**
+     * Provides access to options for exporting map dashboard items.
+     * Value: A MapExportOptions object containing settings that specify parameters that affect how map dashboard items are exported.
+     */
+    MapOptions: MapExportOptions;
+}
+/**
+ * Contains options related to exporting a dashboard/dashboard item to the PDF format.
+ */
+interface DashboardPdfExportOptions {
+    /**
+     * Gets or sets the type of paper for the exported document.
+     * Value: A DashboardExportPaperKind value that specifies the type of paper for the exported document.
+     */
+    PaperKind: string;
+    /**
+     * Gets or sets the page orientation used to export a dashboard/dashboard item.
+     * Value: A DashboardExportPageLayout value that specifies the page orientation used to export a dashboard/dashboard item.
+     */
+    PageLayout: string;
+    /**
+     * Gets or sets the mode for scaling a dashboard/dashboard item in the exported document.
+     * Value: A DashboardExportScaleMode value that specifies the mode for scaling a dashboard/dashboard item in the exported document.
+     */
+    ScaleMode: string;
+    /**
+     * Gets or sets the scale factor (in fractions of 1), by which a dashboard/dashboard item is scaled in the exported document.
+     * Value: A Single value that specifies the scale factor by which a dashboard/dashboard item is scaled in the exported document.
+     */
+    ScaleFactor: number;
+    /**
+     * Gets or sets the number of horizontal/vertical pages spanning the total width/height of a dashboard/dashboard item.
+     * Value: An integer value that specifies the number of horizontal/vertical pages spanning the total width/height of a dashboard/dashboard item.
+     */
+    AutoFitPageCount: number;
+    /**
+     * Gets or sets the title of the exported document.
+     * Value: A string value that specifies the title of the exported document.
+     */
+    Title: string;
+    /**
+     * Gets or sets whether a dashboard title (or dashboard item's caption) is included as the exported document title.
+     * Value: A boolean value that specifies whether a dashboard title (or dashboard item's caption) is included as the exported document title.
+     */
+    ShowTitle: boolean;
+    /**
+     * Gets or sets whether to add the state of master filter items to the exported document.
+     * Value: true, to add the state of master filter items to the exported document; otherwise, false.
+     */
+    ExportFilters: boolean;
+    /**
+     * Gets or sets whether to add current parameter values to the exported document.
+     * Value: true, to add current parameter values to the exported document; otherwise, false.
+     */
+    ExportParameters: boolean;
+    /**
+     * Gets or sets whether to add current values of a hidden parameter to the exported document.
+     * Value: true, to add current values of a hidden parameter to the exported document; otherwise, false.
+     */
+    IncludeHiddenParameters: boolean;
+    /**
+     * Gets or sets a position of the dashboard state (such as master filter or current parameter values) in the exported document.
+     * Value: A DashboardStateExportPosition object that specifies the position of the dashboard state in the exported document.
+     */
+    DashboardStatePosition: string;
+    /**
+     * Gets or sets whether cards within the Card dashboard item are arranged automatically on the exported page.
+     * Value: true, to arrange cards automatically on the exported page; otherwise, false.
+     */
+    CardAutoArrangeContent: boolean;
+    /**
+     * Gets or sets whether the page orientation used to export the Chart dashboard item is selected automatically.
+     * Value: true, to automatically select the page orientation used to export the Chart dashboard item; otherwise, false.
+     */
+    ChartAutomaticPageLayout: boolean;
+    /**
+     * Gets or sets the export size mode for the Chart dashboard item.
+     * Value: A ChartExportSizeMode value that specifies the export size mode for the Chart dashboard item.
+     */
+    ChartSizeMode: string;
+    /**
+     * Gets or sets whether gauges within the Gauge dashboard item are arranged automatically on the exported page.
+     * Value: true, to arrange gauges automatically on the exported page; otherwise, false.
+     */
+    GaugeAutoArrangeContent: boolean;
+    /**
+     * Gets or sets whether the size of the Grid dashboard item is changed according to the width of the exported page.
+     * Value: true, to change the size of the Grid dashboard item according to the width of the exported page; otherwise, false.
+     */
+    GridFitToPageWidth: boolean;
+    /**
+     * Gets or sets whether to add column headers of the Grid dashboard item to every page.
+     * Value: true, to add column headers to every page; otherwise, false.
+     */
+    GridPrintHeadersOnEveryPage: boolean;
+    /**
+     * Gets or sets whether the page orientation used to export the Map dashboard item is selected automatically.
+     * Value: true, to automatically select the page orientation used to export the Map dashboard item; otherwise, false.
+     */
+    MapAutomaticPageLayout: boolean;
+    /**
+     * Gets or sets the export size mode for the Map dashboard item.
+     * Value: A MapExportSizeMode value that specifies the export size mode for the Map dashboard item.
+     */
+    MapSizeMode: string;
+    /**
+     * Gets or sets whether pies within the Pie dashboard item are arranged automatically on the exported page.
+     * Value: true, to arrange pies automatically on the exported page; otherwise, false.
+     */
+    PieAutoArrangeContent: boolean;
+    /**
+     * Gets or sets whether to add column headers of the Pivot dashboard item to every page.
+     * Value: true, to add column headers to every page; otherwise, false.
+     */
+    PivotPrintHeadersOnEveryPage: boolean;
+    /**
+     * Gets or sets whether the page orientation used to export the Range Filter dashboard item is selected automatically.
+     * Value: true, to automatically select the page orientation used to export the Range Filter dashboard item; otherwise, false.
+     */
+    RangeFilterAutomaticPageLayout: boolean;
+    /**
+     * Gets or sets the export size mode for the Range Filter dashboard item.
+     * Value: A RangeFilterExportSizeMode value that specifies the export size mode for the Range Filter dashboard item.
+     */
+    RangeFilterSizeMode: string;
+    /**
+     * Gets or sets whether the page orientation used to export the Treemap dashboard item is selected automatically.
+     * Value: true, to automatically select the page orientation used to export the Treemap dashboard item; otherwise, false.
+     */
+    TreemapAutomaticPageLayout: boolean;
+    /**
+     * Gets or sets the export size mode for the Treemap dashboard item.
+     * Value: A TreemapExportSizeMode value that specifies the export size mode for the Treemap dashboard item.
+     */
+    TreemapSizeMode: string;
+}
+/**
+ * Contains options related to exporting a dashboard/dashboard item to an image.
+ */
+interface DashboardImageExportOptions {
+    /**
+     * Gets or sets a title of the exported document.
+     * Value: A string value that specifies the title of the exported document.
+     */
+    Title: string;
+    /**
+     * Gets or sets whether a dashboard title (or dashboard item's caption) is included as the exported document title.
+     * Value: true, to include a dashboard title (or dashboard item's caption) as the exported document title; otherwise, false.
+     */
+    ShowTitle: boolean;
+    /**
+     * Gets or sets whether to add the state of master filter items to the exported document.
+     * Value: true, to add the state of master filter items to the exported document; otherwise, false.
+     */
+    ExportFilters: boolean;
+    /**
+     * Gets or sets whether to add current parameter values to the exported document.
+     * Value: true, to add current parameter values to the exported document; otherwise, false.
+     */
+    ExportParameters: boolean;
+    /**
+     * Gets or sets whether to add current values of a hidden parameter to the exported document.
+     * Value: true, to add current values of a hidden parameter to the exported document; otherwise, false.
+     */
+    IncludeHiddenParameters: boolean;
+    /**
+     * Gets or sets an image format in which the dashboard/dashboard item is exported.
+     * Value: A DashboardExportImageFormat value that specifies an image format in which the dashboard/dashboard item is exported.
+     */
+    Format: string;
+    /**
+     * Gets or sets the resolution (in dpi) used to export a dashboard/dashboard item to an image.
+     * Value: An integer value that specifies the resolution (in dpi) used to export a dashboard/dashboard item to an image.
+     */
+    Resolution: number;
+    /**
+     * Gets or sets the scale factor (in fractions of 1), by which a dashboard/dashboard item is scaled in the exported document.
+     * Value: A string value that specifies the scale factor by which a dashboard/dashboard item is scaled in the exported document.
+     */
+    ScaleFactor: number;
+}
+/**
+ * Contains options related to exporting a dashboard/dashboard item to the Excel format.
+ */
+interface DashboardExcelExportOptions {
+    /**
+     * Gets or sets the Excel format in which the dashboard item is exported.
+     * Value: A DashboardExportExcelFormat value that specifies the Excel format in which the dashboard item is exported.
+     */
+    Format: string;
+    /**
+     * Gets or sets a character used to separate values in a CSV document.
+     * Value: A string value that specifies the character used to separate values in a CSV document.
+     */
+    CsvValueSeparator: string;
+    /**
+     * Gets or sets whether to add the state of master filter items to the exported document.
+     * Value: true, to add the state of master filter items to the exported document; otherwise, false.
+     */
+    ExportFilters: boolean;
+    /**
+     * Gets or sets whether to add current parameter values to the exported document.
+     * Value: true, to add current parameter values to the exported document; otherwise, false.
+     */
+    ExportParameters: boolean;
+    /**
+     * Gets or sets whether to add current values of a hidden parameter to the exported document.
+     * Value: true, to add current values of a hidden parameter to the exported document; otherwise, false.
+     */
+    IncludeHiddenParameters: boolean;
+    /**
+     * Gets or sets the position of the dashboard state (such as master filter or current parameter values) in the exported document.
+     * Value: A DashboardStateExcelExportPosition object that specifies the position of the dashboard state in the exported document.
+     */
+    DashboardStatePosition: string;
+}
+/**
+ * A client-side equivalent of the ASPxDashboard control.
+ */
+interface ASPxClientDashboard extends ASPxClientControl {
+    /**
+     * Fires when a round trip to the server has been initiated by a call to the client PerformDataCallback method.
+     */
+    CustomDataCallback: ASPxClientEvent<ASPxClientCustomDataCallbackEventHandler<ASPxClientDashboard>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientDashboard>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientDashboard>>;
+    /**
+     * Occurs after the state of the dashboard displayed in the ASPxClientDashboard is changed.
+     */
+    DashboardStateChanged: ASPxClientEvent<ASPxClientDashboardStateChangedEventHandler<ASPxClientDashboard>>;
+    /**
+     * Occurs after a new dashboard is displayed in the ASPxClientDashboard.
+     */
+    DashboardChanged: ASPxClientEvent<ASPxClientDashboardChangedEventHandler<ASPxClientDashboard>>;
+    /**
+     * For internal use.
+     */
+    CustomizeMenuItems: ASPxClientEvent<ASPxClientDashboardCustomizeMenuItemsEventHandler<ASPxClientDashboard>>;
+    /**
+     * Occurs before any element in the Web Dashboard control has been rendered.
+     */
+    BeforeRender: ASPxClientEvent<ASPxClientDashboardBeforeRenderEventHandler<ASPxClientDashboard>>;
+    /**
+     * Occurs when an end-user clicks a dashboard item.
+     */
+    ItemClick: ASPxClientEvent<ASPxClientDashboardItemClickEventHandler<ASPxClientDashboard>>;
+    /**
+     * Allows you to provide custom visual interactivity for data-bound dashboard items that support element selection and highlighting.
+     */
+    ItemVisualInteractivity: ASPxClientEvent<ASPxClientDashboardItemVisualInteractivityEventHandler<ASPxClientDashboard>>;
+    /**
+     * Allows you to access underlying UI/Data Visualization widgets.
+     */
+    ItemWidgetCreated: ASPxClientEvent<ASPxClientDashboardItemWidgetCreatedEventHandler<ASPxClientDashboard>>;
+    /**
+     * Allows you to access underlying UI/Data Visualization widgets.
+     */
+    ItemWidgetUpdating: ASPxClientEvent<ASPxClientDashboardItemWidgetUpdatingEventHandler<ASPxClientDashboard>>;
+    /**
+     * Allows you to access underlying UI/Data Visualization widgets.
+     */
+    ItemWidgetUpdated: ASPxClientEvent<ASPxClientDashboardItemWidgetUpdatedEventHandler<ASPxClientDashboard>>;
+    /**
+     * Allows you to access underlying UI/Data Visualization widgets.
+     */
+    ItemBeforeWidgetDisposed: ASPxClientEvent<ASPxClientDashboardItemBeforeWidgetDisposedEventHandler<ASPxClientDashboard>>;
+    /**
+     * Occurs after the selection within the dashboard item is changed.
+     */
+    ItemSelectionChanged: ASPxClientEvent<ASPxClientDashboardItemSelectionChangedEventHandler<ASPxClientDashboard>>;
+    /**
+     * Allows you to color the required dashboard item elements using the specified colors.
+     */
+    ItemElementCustomColor: ASPxClientEvent<ASPxClientDashboardItemElementCustomColorEventHandler<ASPxClientDashboard>>;
+    /**
+     * Occurs when a master filter state is changed.
+     */
+    ItemMasterFilterStateChanged: ASPxClientEvent<ASPxClientDashboardItemMasterFilterStateChangedEventHandler<ASPxClientDashboard>>;
+    /**
+     * Occurs when a drill-down/drill-up is performed.
+     */
+    ItemDrillDownStateChanged: ASPxClientEvent<ASPxClientDashboardItemDrillDownStateChangedEventHandler<ASPxClientDashboard>>;
+    /**
+     * Occurs after the available interactivity actions have changed for the specific dashboard item.
+     */
+    ActionAvailabilityChanged: ASPxClientEvent<ASPxClientActionAvailabilityChangedEventHandler<ASPxClientDashboard>>;
+    /**
+     * Occurs after parameter values provided using a Dynamic List are loaded.
+     */
+    DynamicLookUpValuesLoaded: ASPxClientEvent<ASPxClientDynamicLookUpValuesLoadedEventHandler<ASPxClientDashboard>>;
+    /**
+     * Occurs when a dashboard item update is initiated.
+     */
+    ItemBeginUpdate: ASPxClientEvent<ASPxClientItemBeginUpdateEventHandler<ASPxClientDashboard>>;
+    /**
+     * Occurs after the dashboard item update is performed.
+     */
+    ItemEndUpdate: ASPxClientEvent<ASPxClientItemEndUpdateEventHandler<ASPxClientDashboard>>;
+    /**
+     * Occurs when a dashboard update is initiated.
+     */
+    DashboardBeginUpdate: ASPxClientEvent<ASPxClientDashboardBeginUpdateEventHandler<ASPxClientDashboard>>;
+    /**
+     * Occurs after the dashboard update is performed.
+     */
+    DashboardEndUpdate: ASPxClientEvent<ASPxClientDashboardEndUpdateEventHandler<ASPxClientDashboard>>;
+    /**
+     * Sends a callback to the server and generates the server-side CustomDataCallback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side CustomDataCallback event.
+     * @param onCallback A ASPxClientDataCallback object that represents the JavaScript function which receives the callback data as a parameter.
+     */
+    PerformDataCallback(parameter: string, onCallback: ASPxClientDataCallback): void;
+    /**
+     * Gets an inner part of the ASPxClientDashboard control.
+     */
+    GetDashboardControl(): DashboardControl;
+    /**
+     * Switches the ASPxClientDashboard to the viewer mode.
+     */
+    SwitchToViewer(): void;
+    /**
+     * Switches the ASPxClientDashboard to the designer mode.
+     */
+    SwitchToDesigner(): void;
+    /**
+     * Gets the current working mode of the Web Dashboard.
+     */
+    GetWorkingMode(): string;
+    /**
+     * Gets the identifier of the dashboard that is displayed in the ASPxClientDashboard.
+     */
+    GetDashboardId(): string;
+    /**
+     * Gets the name of the dashboard that is displayed in the ASPxClientDashboard.
+     */
+    GetDashboardName(): string;
+    /**
+     * Gets the state of the dashboard displayed in the ASPxClientDashboard.
+     */
+    GetDashboardState(): string;
+    /**
+     * Sets the state of the dashboard displayed in the ASPxClientDashboard.
+     * @param dashboardState A JSON object that specifies the dashboard state.
+     */
+    SetDashboardState(dashboardState: Object): void;
+    /**
+     * Sets the state of the dashboard displayed in the ASPxClientDashboard.
+     * @param dashboardStateString A string value that specifies the state of the dashboard displayed in the ASPxClientDashboard.
+     */
+    SetDashboardState(dashboardStateString: string): void;
+    /**
+     * Loads a dashboard with the specified identifier from the dashboard storage.
+     * @param dashboardId A string value that specifies the dashboard identifier.
+     */
+    LoadDashboard(dashboardId: string): void;
+    /**
+     * Saves a current dashboard to the dashboard storage.
+     */
+    SaveDashboard(): void;
+    /**
+     * Invokes the Dashboard Parameters dialog.
+     */
+    ShowParametersDialog(): void;
+    /**
+     * Closes the Dashboard Parameters dialog.
+     */
+    HideParametersDialog(): void;
+    /**
+     * Returns dashboard parameter settings and metadata.
+     */
+    GetParameters(): ASPxClientDashboardParameters;
+    /**
+     * Invokes the dialog that allows end-users to export the entire dashboard to the specified format.
+     * @param format A string value that specifies the format. For instance, you can use 'PDF' or 'Image'.
+     */
+    ShowExportDashboardDialog(format: string): void;
+    /**
+     * Invokes the dialog that allows end-users to export the dashboard item to the specified format.
+     * @param itemComponentName A string value that specifies the component name of the dashboard item to export.
+     * @param format A string value that specifies the format. For instance, you can use 'PDF, 'Image' or 'Excel'. Note that some items (i.e., ImageDashboardItem) do not support exporting to the 'Excel' format.
+     */
+    ShowExportDashboardItemDialog(itemComponentName: string, format: string): void;
+    /**
+     * Hides the dialog that allows end-users to export the dashboard/dashboard item.
+     */
+    HideExportDialog(): void;
+    /**
+     * Returns settings that specify parameters affecting how the dashboard is exported.
+     */
+    GetExportOptions(): ASPxClientDashboardExportOptions;
+    /**
+     * Allows you to obtain options related to exporting a dashboard/dashboard item to the PDF format.
+     */
+    GetPdfExportOptions(): DashboardPdfExportOptions;
+    /**
+     * Allows you to obtain options related to exporting a dashboard/dashboard item to an image.
+     */
+    GetImageExportOptions(): DashboardImageExportOptions;
+    /**
+     * Allows you to obtain options related to exporting a dashboard/dashboard item to the Excel format.
+     */
+    GetExcelExportOptions(): DashboardExcelExportOptions;
+    /**
+     * Specifies settings that specify parameters affecting how the dashboard is exported.
+     * @param options A ASPxClientDashboardExportOptions object containing settings that specify parameters affecting how the dashboard is exported.
+     */
+    SetExportOptions(options: ASPxClientDashboardExportOptions): void;
+    /**
+     * Allows you to specify options related to exporting a dashboard/dashboard item to the PDF format.
+     * @param options A DashboardPdfExportOptions object containing options related to exporting a dashboard/dashboard item to the PDF format.
+     */
+    SetPdfExportOptions(options: DashboardPdfExportOptions): void;
+    /**
+     * Allows you to specify options related to exporting a dashboard/dashboard item to an image.
+     * @param options A DashboardImageExportOptions object containing options related to exporting a dashboard/dashboard item to an image.
+     */
+    SetImageExportOptions(options: DashboardImageExportOptions): void;
+    /**
+     * Allows you to specify options related to exporting a dashboard/dashboard item to the Excel format.
+     * @param options A DashboardExcelExportOptions object containing options related to exporting a dashboard item to the Excel format.
+     */
+    SetExcelExportOptions(options: DashboardExcelExportOptions): void;
+    /**
+     * Exports a dashboard to a PDF file and writes it to the Response.
+     */
+    ExportToPdf(): void;
+    /**
+     * Exports a dashboard to a PDF file with the specified export options and writes it to the Response.
+     * @param options A DashboardPdfExportOptions object containing PDF-specific export options.
+     */
+    ExportToPdf(options: DashboardPdfExportOptions): void;
+    /**
+     * Exports a dashboard to a PDF file with the specified export options and writes it to the Response.
+     * @param options A DashboardPdfExportOptions object containing PDF-specific export options.
+     * @param fileName A string that specifies the name of the exported file.
+     */
+    ExportToPdf(options: DashboardPdfExportOptions, fileName: string): void;
+    /**
+     * Exports a dashboard to a PDF file with the specified export options and writes it to the Response.
+     * @param options A ASPxClientDashboardExportOptions object containing settings that specify parameters affecting how the dashboard is exported.
+     */
+    ExportToPdf(options: ASPxClientDashboardExportOptions): void;
+    /**
+     * Exports a dashboard to a PDF file with the specified export options and writes it to the Response.
+     * @param options A ASPxClientDashboardExportOptions object containing settings that specify parameters affecting how the dashboard is exported.
+     * @param fileName A string that specifies the name of the exported file.
+     */
+    ExportToPdf(options: ASPxClientDashboardExportOptions, fileName: string): void;
+    /**
+     * Exports a dashboard to an Image file and writes it to the Response.
+     */
+    ExportToImage(): void;
+    /**
+     * Exports a dashboard to an Image file with the specified export options and writes it to the Response.
+     * @param options A DashboardImageExportOptions object containing image-specific export options.
+     */
+    ExportToImage(options: DashboardImageExportOptions): void;
+    /**
+     * Exports a dashboard to an Image file with the specified export options and writes it to the Response.
+     * @param options A DashboardImageExportOptions object containing image-specific export options.
+     * @param fileName A string that specifies the name of the exported file.
+     */
+    ExportToImage(options: DashboardImageExportOptions, fileName: string): void;
+    /**
+     * Exports a dashboard to an Image file with the specified export options and writes it to the Response.
+     * @param options A ASPxClientDashboardExportOptions object containing settings that specify parameters affecting how the dashboard is exported.
+     */
+    ExportToImage(options: ASPxClientDashboardExportOptions): void;
+    /**
+     * Exports a dashboard to an Image file with the specified export options and writes it to the Response.
+     * @param options A ASPxClientDashboardExportOptions object containing settings that specify parameters affecting how the dashboard is exported.
+     * @param fileName A string that specifies the name of the exported file.
+     */
+    ExportToImage(options: ASPxClientDashboardExportOptions, fileName: string): void;
+    /**
+     * Exports dashboard data to the specified file in Excel format.
+     */
+    ExportToExcel(): void;
+    /**
+     * Exports dashboard data to the specified file in Excel format.
+     * @param options A DashboardExcelExportOptions object containing Excel-specific options.
+     */
+    ExportToExcel(options: DashboardExcelExportOptions): void;
+    /**
+     * Exports dashboard data to the specified file in Excel format.
+     * @param options A DashboardExcelExportOptions object containing Excel-specific options.
+     * @param fileName A string value that specifies the name of the exported file.
+     */
+    ExportToExcel(options: DashboardExcelExportOptions, fileName: string): void;
+    /**
+     * Exports a dashboard item to a PDF file and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     */
+    ExportDashboardItemToPdf(itemName: string): void;
+    /**
+     * Exports a dashboard item to a PDF file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options A DashboardPdfExportOptions object containing PDF-specific export options.
+     */
+    ExportDashboardItemToPdf(itemName: string, options: DashboardPdfExportOptions): void;
+    /**
+     * Exports a dashboard item to a PDF file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options A DashboardPdfExportOptions object containing PDF-specific export options.
+     * @param fileName A string that specifies the name of the exported file.
+     */
+    ExportDashboardItemToPdf(itemName: string, options: DashboardPdfExportOptions, fileName: string): void;
+    /**
+     * Exports a dashboard item to a PDF file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options An ASPxClientDashboardExportOptions object containing export options to be applied to the exported dashboard item.
+     */
+    ExportDashboardItemToPdf(itemName: string, options: ASPxClientDashboardExportOptions): void;
+    /**
+     * Exports a dashboard item to a PDF file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options An ASPxClientDashboardExportOptions object containing export options to be applied to the exported dashboard item.
+     * @param fileName A string that specifies the name of the exported file.
+     */
+    ExportDashboardItemToPdf(itemName: string, options: ASPxClientDashboardExportOptions, fileName: string): void;
+    /**
+     * Exports a dashboard item to an Image file and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     */
+    ExportDashboardItemToImage(itemName: string): void;
+    /**
+     * Exports a dashboard item to an Image file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options A DashboardImageExportOptions object containing image-specific export options.
+     */
+    ExportDashboardItemToImage(itemName: string, options: DashboardImageExportOptions): void;
+    /**
+     * Exports a dashboard item to an Image file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options A DashboardImageExportOptions object containing image-specific export options.
+     * @param fileName A string value that specifies the name of the exported file.
+     */
+    ExportDashboardItemToImage(itemName: string, options: DashboardImageExportOptions, fileName: string): void;
+    /**
+     * Exports a dashboard item to an Image file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options An ASPxClientDashboardExportOptions object containing export options to be applied to the exported dashboard item.
+     */
+    ExportDashboardItemToImage(itemName: string, options: ASPxClientDashboardExportOptions): void;
+    /**
+     * Exports a dashboard item to an Image file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options An ASPxClientDashboardExportOptions object containing export options to be applied to the exported dashboard item.
+     * @param fileName A string value that specifies the name of the exported file.
+     */
+    ExportDashboardItemToImage(itemName: string, options: ASPxClientDashboardExportOptions, fileName: string): void;
+    /**
+     * Exports a dashboard item to an Excel file and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     */
+    ExportDashboardItemToExcel(itemName: string): void;
+    /**
+     * Exports a dashboard item to an Excel file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options A DashboardExcelExportOptions object containing Excel export options.
+     */
+    ExportDashboardItemToExcel(itemName: string, options: DashboardExcelExportOptions): void;
+    /**
+     * Exports a dashboard item to an Excel file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options A DashboardExcelExportOptions object containing Excel export options.
+     * @param fileName A string that specifies the name of the exported Excel file.
+     */
+    ExportDashboardItemToExcel(itemName: string, options: DashboardExcelExportOptions, fileName: string): void;
+    /**
+     * Exports a dashboard item to an Excel file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options An ASPxClientDashboardExportOptions object containing export options to be applied to the exported dashboard item.
+     */
+    ExportDashboardItemToExcel(itemName: string, options: ASPxClientDashboardExportOptions): void;
+    /**
+     * Exports a dashboard item to an Excel file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options An ASPxClientDashboardExportOptions object containing export options to be applied to the exported dashboard item.
+     * @param fileName A string that specifies the name of the exported Excel file.
+     */
+    ExportDashboardItemToExcel(itemName: string, options: ASPxClientDashboardExportOptions, fileName: string): void;
+    /**
+     * Returns whether or not master filtering  can be applied in the current state of the specified master filter item.
+     * @param itemName A string that specifies the component name of the master filter item.
+     */
+    CanSetMasterFilter(itemName: string): boolean;
+    /**
+     * Returns whether or not the specified master filter can be cleared in the current state.
+     * @param itemName A string that specifies the component name of the master filter item.
+     */
+    CanClearMasterFilter(itemName: string): boolean;
+    /**
+     * Returns whether or not drill down is possible in the current state of the specified dashboard item.
+     * @param itemName A string that specifies the component name of the dashboard item.
+     */
+    CanPerformDrillDown(itemName: string): boolean;
+    /**
+     * Returns whether or not drill up is possible in the current state of the specified dashboard item.
+     * @param itemName A string that specifies the component name of the dashboard item.
+     */
+    CanPerformDrillUp(itemName: string): boolean;
+    /**
+     * Selects required elements by their values in the specified master filter item.
+     * @param itemName A String that specifies the component name of the master filter item.
+     * @param values Values that will be used to select elements in the master filter item.
+     */
+    SetMasterFilter(itemName: string, values: Object[][]): void;
+    /**
+     * Selects the required elements in the specified master filter item.
+     * @param itemName A String that species the component name of the master filter item.
+     * @param axisPointTuples An array of ASPxClientDashboardItemDataAxisPointTuple objects used to identify master filter elements.
+     */
+    SetMasterFilter(itemName: string, axisPointTuples: ASPxClientDashboardItemDataAxisPointTuple[]): void;
+    /**
+     * Performs a drill-down into the required element by its value.
+     * @param itemName A String that species the component name of the dashboard item.
+     * @param value A value that will be used to perform a drill-down for the required element.
+     */
+    PerformDrillDown(itemName: string, value: Object): void;
+    /**
+     * Performs a drill-down into the required element.
+     * @param itemName A String that specifies the component name of the dashboard item.
+     * @param axisPointTuple A ASPxClientDashboardItemDataAxisPointTuple object representing a set of axis points.
+     */
+    PerformDrillDown(itemName: string, axisPointTuple: ASPxClientDashboardItemDataAxisPointTuple): void;
+    /**
+     * Clears the specified master filter item.
+     * @param itemName A string that specifies the component name of the master filter item.
+     */
+    ClearMasterFilter(itemName: string): void;
+    /**
+     * Performs a drill-up for the specified dashboard item.
+     * @param itemName A String that specifies the component name of the dashboard item.
+     */
+    PerformDrillUp(itemName: string): void;
+    /**
+     * Returns axis point tuples identifying elements that can be used to perform drill-down in the specified dashboard item.
+     * @param itemName A String that is the component name of the dashboard item.
+     */
+    GetAvailableDrillDownValues(itemName: string): ASPxClientDashboardItemDataAxisPointTuple[];
+    /**
+     * Returns the axis point tuple identifying the current drill-down state.
+     * @param itemName A String that is the component name of the dashboard item.
+     */
+    GetCurrentDrillDownValues(itemName: string): ASPxClientDashboardItemDataAxisPointTuple;
+    /**
+     * Returns axis point tuples identifying elements that can be selected in the current state of the master filter item.
+     * @param itemName A String that is the component name of the master filter item.
+     */
+    GetAvailableFilterValues(itemName: string): ASPxClientDashboardItemDataAxisPointTuple[];
+    /**
+     * Returns axis point tuples identifying currently selected elements in the master filter item.
+     * @param itemName A String that is the component name of the master filter item.
+     */
+    GetCurrentFilterValues(itemName: string): ASPxClientDashboardItemDataAxisPointTuple[];
+    /**
+     * Returns currently selected elements in the master filter item.
+     * @param itemName A String that specifies a component name of the master filter item.
+     */
+    GetCurrentSelection(itemName: string): ASPxClientDashboardItemDataAxisPointTuple[];
+    /**
+     * Returns the client data for the specified dashboard item.
+     * @param itemName A string that specifies the component name of the dashboard item.
+     */
+    GetItemData(itemName: string): ASPxClientDashboardItemData;
+    /**
+     * Refreshes an entire dashboard displayed in the Web Dashboard control.
+     */
+    Refresh(): void;
+    /**
+     * Refreshes the specific item from the dashboard displayed in the Web Dashboard control.
+     * @param itemName A string value that specifies the component name of the dashboard item to be refreshed.
+     */
+    Refresh(itemName: string): void;
+    /**
+     * Refreshes specific items from the dashboard displayed in the Web Dashboard control.
+     * @param itemName An array of string values that specify the component names of the dashboard items to be refreshed.
+     */
+    Refresh(itemName: string[]): void;
+    /**
+     * Requests underlying data for the specified dashboard item.
+     * @param itemName A string that specifies the component name of the dashboard item.
+     * @param args A ASPxClientDashboardItemRequestUnderlyingDataParameters object containing parameters used to obtain the underlying data.
+     * @param onCompleted A ASPxClientDashboardItemRequestUnderlyingDataCompleted object that references a method executed after the request is completed.
+     */
+    RequestUnderlyingData(itemName: string, args: ASPxClientDashboardItemRequestUnderlyingDataParameters, onCompleted: ASPxClientDashboardItemRequestUnderlyingDataCompleted): void;
+    /**
+     * Returns the currently selected range in the specified Range Filter dashboard item.
+     * @param itemName A String value that specifies the component name of the Range Filter dashboard item.
+     */
+    GetCurrentRange(itemName: string): ASPxClientDashboardRangeFilterSelection;
+    /**
+     * Returns the visible range for the specified Range Filter dashboard item.
+     * @param itemName A String value that specifies the component name of the Range Filter dashboard item.
+     */
+    GetEntireRange(itemName: string): ASPxClientDashboardRangeFilterSelection;
+    /**
+     * Selects the required range in the specified Range Filter dashboard item.
+     * @param itemName A String that specifies the component name of the Range Filter dashboard item.
+     * @param range A ASPxClientDashboardRangeFilterSelection object that specifies a range to be selected.
+     */
+    SetRange(itemName: string, range: ASPxClientDashboardRangeFilterSelection): void;
+    /**
+     * Selects a predefined range in the Range Filter dashboard item.
+     * @param itemName A String value that specifies the component name of the Range Filter.
+     * @param dateTimePeriodName A String value that specifies the predefined range name.
+     */
+    SetPredefinedRange(itemName: string, dateTimePeriodName: string): void;
+    /**
+     * Returns names of the predefined ranges available for the specified Range Filter.
+     * @param itemName A string value that specifies the component name of the Range Filter dashboard item.
+     */
+    GetAvailablePredefinedRanges(itemName: string): string[];
+    /**
+     * Returns the name of the currently selected predefined range.
+     * @param itemName A string value that specifies the component name of the Range Filter dashboard item.
+     */
+    GetCurrentPredefinedRange(itemName: string): string;
+}
+/**
+ * References a method that will handle the DashboardStateChanged event.
+ */
+interface ASPxClientDashboardStateChangedEventHandler<S> {
+    /**
+     * References a method that will handle the DashboardStateChanged event.
+     * @param source The event source.
+     * @param e A ASPxClientDashboardStateChangedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardStateChangedEventArgs): void;
+}
+/**
+ * Provides data for the DashboardStateChanged event.
+ */
+interface ASPxClientDashboardStateChangedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the current state of the dashboard.
+     * Value: A string value that is the current state of the dashboard.
+     */
+    DashboardState: string;
+}
+/**
+ * References a method that will handle the DashboardChanged event.
+ */
+interface ASPxClientDashboardChangedEventHandler<S> {
+    /**
+     * References a method that will handle the DashboardChanged event.
+     * @param source The event source.
+     * @param e A ASPxClientDashboardChangedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardChangedEventArgs): void;
+}
+/**
+ * Provides data for the DashboardChanged event.
+ */
+interface ASPxClientDashboardChangedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the identifier of a newly opened dashboard.
+     * Value: A string value that is an identifier of newly opened dashboard.
+     */
+    DashboardId: string;
+    /**
+     * Gets the name of a newly opened dashboard.
+     * Value: A string value that is the name of newly opened dashboard.
+     */
+    DashboardName: string;
+}
+interface ASPxClientDashboardCustomizeMenuItemsEventHandler<S> {
+    (source: S, e: ASPxClientDashboardCustomizeMenuItemsEventArgs): void;
+}
+interface ASPxClientDashboardMenuItem {
+    id: string;
+    title: string;
+    template: string;
+    selected: boolean;
+    disabled: boolean;
+    hasSeparator: boolean;
+    click: Function;
+    hotKey: number;
+}
+interface ASPxClientDashboardCustomizeMenuItemsEventArgs extends ASPxClientEventArgs {
+    Items: ASPxClientDashboardMenuItem[];
+    FindById(itemId: string): ASPxClientDashboardMenuItem;
+}
+/**
+ * References a method that will handle the BeforeRender event.
+ */
+interface ASPxClientDashboardBeforeRenderEventHandler<S> {
+    /**
+     * References a method that will handle the BeforeRender event.
+     * @param source The event source.
+     * @param e An ASPxClientEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientEventArgs): void;
+}
+/**
+ * Serves as the base class for classes that provide data for client-side events related to dashboard items.
+ */
+interface ASPxClientDashboardItemEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the component name of the dashboard item.
+     * Value: A string value that is the component name of the dashboard item.
+     */
+    ItemName: string;
+    /**
+     * Returns whether or not the specified value is null.
+     * @param value The specified value.
+     */
+    IsNullValue(value: Object): boolean;
+    /**
+     * Returns whether or not the specified value is 'others'.
+     * @param value The specified value.
+     */
+    IsOthersValue(value: Object): boolean;
+}
+/**
+ * References a method that will handle the ItemMasterFilterStateChanged event.
+ */
+interface ASPxClientDashboardItemMasterFilterStateChangedEventHandler<S> {
+    /**
+     * References a method that will handle the ItemMasterFilterStateChanged event.
+     * @param source The event source.
+     * @param e An ASPxClientDashboardItemMasterFilterStateChangedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardItemMasterFilterStateChangedEventArgs): void;
+}
+/**
+ * Provides data for the ItemMasterFilterStateChanged event.
+ */
+interface ASPxClientDashboardItemMasterFilterStateChangedEventArgs extends ASPxClientDashboardItemEventArgs {
+    /**
+     * Gets the currently selected values.
+     * Value: An array of objects that are the currently selected values.
+     */
+    Values: Object[][];
+}
+/**
+ * References a method that will handle the ItemDrillDownStateChanged event.
+ */
+interface ASPxClientDashboardItemDrillDownStateChangedEventHandler<S> {
+    /**
+     * References a method that will handle the ItemDrillDownStateChanged event.
+     * @param source The event source.
+     * @param e An ASPxClientDashboardItemDrillDownStateChangedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardItemDrillDownStateChangedEventArgs): void;
+}
+/**
+ * Provides data for the ItemDrillDownStateChanged event.
+ */
+interface ASPxClientDashboardItemDrillDownStateChangedEventArgs extends ASPxClientDashboardItemEventArgs {
+    /**
+     * Gets the drill-down action performed in the dashboard item.
+     * Value: A string value that is the drill-down action performed in the dashboard item.
+     */
+    Action: string;
+    /**
+     * Gets values from the current drill-down hierarchy.
+     * Value: An array of values from the current drill-down hierarchy.
+     */
+    Values: Object[];
+}
+/**
+ * References a method that will handle the ActionAvailabilityChanged event.
+ */
+interface ASPxClientActionAvailabilityChangedEventHandler<S> {
+    /**
+     * References a method that will handle the ActionAvailabilityChanged event.
+     * @param source The event source.
+     * @param e A ASPxClientActionAvailabilityChangedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientActionAvailabilityChangedEventArgs): void;
+}
+/**
+ * Provides data for the ActionAvailabilityChanged event.
+ */
+interface ASPxClientActionAvailabilityChangedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the component name of the dashboard item.
+     * Value: A string value that is the component name of the dashboard item.
+     */
+    ItemName: string;
+}
+/**
+ * References a method that will handle the DynamicLookUpValuesLoaded event.
+ */
+interface ASPxClientDynamicLookUpValuesLoadedEventHandler<S> {
+    /**
+     * References a method that will handle the DynamicLookUpValuesLoaded event.
+     * @param source The event source.
+     * @param e A ASPxClientDynamicLookUpValuesLoadedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDynamicLookUpValuesLoadedEventArgs): void;
+}
+/**
+ * Provides data for the DynamicLookUpValuesLoaded event.
+ */
+interface ASPxClientDynamicLookUpValuesLoadedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the dashboard parameter name whose values have been loaded.
+     * Value: A string value that is the dashboard parameter name whose values have been loaded.
+     */
+    ParameterName: string;
+}
+/**
+ * References a method that will handle the ItemBeginUpdate event.
+ */
+interface ASPxClientItemBeginUpdateEventHandler<S> {
+    /**
+     * References a method that will handle the ItemBeginUpdate event.
+     * @param source The event source.
+     * @param e A ASPxClientItemBeginUpdateEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientItemBeginUpdateEventArgs): void;
+}
+/**
+ * Provides data for the ItemBeginUpdate event.
+ */
+interface ASPxClientItemBeginUpdateEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the component name of the dashboard item.
+     * Value: A string value that is the component name of the dashboard item.
+     */
+    ItemName: string;
+}
+/**
+ * References a method that will handle the ItemEndUpdate event.
+ */
+interface ASPxClientItemEndUpdateEventHandler<S> {
+    /**
+     * References a method that will handle the ItemEndUpdate event.
+     * @param source The event source.
+     * @param e A ASPxClientItemEndUpdateEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientItemEndUpdateEventArgs): void;
+}
+/**
+ * Provides data for the ItemEndUpdate event.
+ */
+interface ASPxClientItemEndUpdateEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the component name of the dashboard item.
+     * Value: A string value that is the component name of the dashboard item.
+     */
+    ItemName: string;
+}
+/**
+ * References a method that will handle the DashboardBeginUpdate event.
+ */
+interface ASPxClientDashboardBeginUpdateEventHandler<S> {
+    /**
+     * References a method that will handle the DashboardBeginUpdate event.
+     * @param source The event source.
+     * @param e A ASPxClientDashboardBeginUpdateEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardBeginUpdateEventArgs): void;
+}
+/**
+ * Provides data for the DashboardBeginUpdate event.
+ */
+interface ASPxClientDashboardBeginUpdateEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the identifier of the dashboard for which the event was raised.
+     * Value: A string value that is the dashboard identifier.
+     */
+    DashboardId: string;
+}
+/**
+ * References a method that will handle the DashboardEndUpdate event.
+ */
+interface ASPxClientDashboardEndUpdateEventHandler<S> {
+    /**
+     * References a method that will handle the DashboardEndUpdate event.
+     * @param source The event source.
+     * @param e An ASPxClientDashboardEndUpdateEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardEndUpdateEventArgs): void;
+}
+/**
+ * Provides data for the DashboardEndUpdate event.
+ */
+interface ASPxClientDashboardEndUpdateEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the identifier of the dashboard for which the event was raised.
+     * Value: A string value that is the dashboard identifier.
+     */
+    DashboardId: string;
+}
+/**
+ * A client-side equivalent of the ASPxDashboardViewer control.
+ */
+interface ASPxClientDashboardViewer extends ASPxClientControl {
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Occurs after the available interactivity actions have changed.
+     */
+    ActionAvailabilityChanged: ASPxClientEvent<ASPxClientDashboardActionAvailabilityChangedEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Occurs when an end-user changes the state of the master filter.
+     */
+    MasterFilterSet: ASPxClientEvent<ASPxClientDashboardMasterFilterSetEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Occurs when an end-user clears the selection in the master filter item.
+     */
+    MasterFilterCleared: ASPxClientEvent<ASPxClientDashboardMasterFilterClearedEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Provides the capability to handle data loading errors in the ASPxClientDashboardViewer.
+     */
+    DataLoadingError: ASPxClientEvent<ASPxClientDashboardDataLoadingErrorEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Occurs after a drill-down is performed.
+     */
+    DrillDownPerformed: ASPxClientEvent<ASPxClientDashboardDrillDownPerformedEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Occurs after a drill-up is performed.
+     */
+    DrillUpPerformed: ASPxClientEvent<ASPxClientDashboardDrillUpPerformedEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Occurs after the ASPxClientDashboardViewer is loaded.
+     */
+    Loaded: ASPxClientEvent<ASPxClientEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Occurs when an end-user clicks a dashboard item.
+     */
+    ItemClick: ASPxClientEvent<ASPxClientDashboardItemClickEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Allows you to provide custom visual interactivity for data-bound dashboard items that support element selection and highlighting.
+     */
+    ItemVisualInteractivity: ASPxClientEvent<ASPxClientDashboardItemVisualInteractivityEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Allows you to access underlying UI/Data Visualization widgets.
+     */
+    ItemWidgetCreated: ASPxClientEvent<ASPxClientDashboardItemWidgetCreatedEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Allows you to access underlying UI/Data Visualization widgets.
+     */
+    ItemWidgetUpdating: ASPxClientEvent<ASPxClientDashboardItemWidgetUpdatingEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Allows you to access underlying UI/Data Visualization widgets.
+     */
+    ItemWidgetUpdated: ASPxClientEvent<ASPxClientDashboardItemWidgetUpdatedEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Allows you to access underlying UI/Data Visualization widgets.
+     */
+    ItemBeforeWidgetDisposed: ASPxClientEvent<ASPxClientDashboardItemBeforeWidgetDisposedEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Occurs after the selection within the dashboard item is changed.
+     */
+    ItemSelectionChanged: ASPxClientEvent<ASPxClientDashboardItemSelectionChangedEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Allows you to color the required dashboard item elements using the specified colors.
+     */
+    ItemElementCustomColor: ASPxClientEvent<ASPxClientDashboardItemElementCustomColorEventHandler<ASPxClientDashboardViewer>>;
+    /**
+     * Reloads data in the data sources.
+     */
+    ReloadData(): void;
+    /**
+     * Reloads data in the data sources.
+     * @param parameters An array of ASPxClientDashboardParameter objects that specify dashboard parameters on the client side.
+     */
+    ReloadData(parameters: ASPxClientDashboardParameter[]): void;
+    /**
+     * Returns dashboard parameter settings and metadata.
+     */
+    GetParameters(): ASPxClientDashboardParameters;
+    /**
+     * Locks the EndUpdateParameters method call.
+     */
+    BeginUpdateParameters(): void;
+    /**
+     * Unlocks the BeginUpdateParameters method and applies changes made to the parameter settings.
+     */
+    EndUpdateParameters(): void;
+    /**
+     * Returns the currently selected range in the specified Range Filter dashboard item.
+     * @param itemName A String value that specifies the component name of the Range Filter dashboard item.
+     */
+    GetCurrentRange(itemName: string): ASPxClientDashboardRangeFilterSelection;
+    /**
+     * Returns the visible range for the specified Range Filter dashboard item.
+     * @param itemName A String value that specifies the component name of the Range Filter dashboard item.
+     */
+    GetEntireRange(itemName: string): ASPxClientDashboardRangeFilterSelection;
+    /**
+     * Selects the required range in the specified Range Filter dashboard item.
+     * @param itemName A String that specifies the component name of the Range Filter dashboard item.
+     * @param range A ASPxClientDashboardRangeFilterSelection object that specifies a range to be selected.
+     */
+    SetRange(itemName: string, range: ASPxClientDashboardRangeFilterSelection): void;
+    /**
+     * Selects a predefined range in the Range Filter dashboard item.
+     * @param itemName A String value that specifies the component name of the Range Filter.
+     * @param dateTimePeriodName A String value that specifies the predefined range name.
+     */
+    SetPredefinedRange(itemName: string, dateTimePeriodName: string): void;
+    /**
+     * Returns names of the predefined ranges available for the specified Range Filter.
+     * @param itemName A string value that specifies the component name of the Range Filter dashboard item.
+     */
+    GetAvailablePredefinedRanges(itemName: string): string[];
+    /**
+     * Returns the name of the currently selected predefined range.
+     * @param itemName A string value that specifies the component name of the Range Filter dashboard item.
+     */
+    GetCurrentPredefinedRange(itemName: string): string;
+    /**
+     * Returns axis point tuples identifying elements that can be used to perform drill-down in the specified dashboard item.
+     * @param itemName A String that is the component name of the dashboard item.
+     */
+    GetAvailableDrillDownValues(itemName: string): ASPxClientDashboardItemDataAxisPointTuple[];
+    /**
+     * Returns the axis point tuple identifying the current drill-down state.
+     * @param itemName A String that is the component name of the dashboard item.
+     */
+    GetCurrentDrillDownValues(itemName: string): ASPxClientDashboardItemDataAxisPointTuple;
+    /**
+     * Returns axis point tuples identifying elements that can be selected in the current state of the master filter item.
+     * @param itemName A String that is the component name of the master filter item.
+     */
+    GetAvailableFilterValues(itemName: string): ASPxClientDashboardItemDataAxisPointTuple[];
+    /**
+     * Returns axis point tuples identifying currently selected elements in the master filter item.
+     * @param itemName A String that is the component name of the master filter item.
+     */
+    GetCurrentFilterValues(itemName: string): ASPxClientDashboardItemDataAxisPointTuple[];
+    /**
+     * Returns currently selected elements in the master filter item.
+     * @param itemName A String that specifies a component name of the master filter item.
+     */
+    GetCurrentSelection(itemName: string): ASPxClientDashboardItemDataAxisPointTuple[];
+    /**
+     * Requests underlying data for the specified dashboard item.
+     * @param itemName A string that specifies the component name of the dashboard item.
+     * @param args A ASPxClientDashboardItemRequestUnderlyingDataParameters object containing parameters used to obtain the underlying data.
+     * @param onCompleted A ASPxClientDashboardItemRequestUnderlyingDataCompleted object that references a method executed after the request is completed.
+     */
+    RequestUnderlyingData(itemName: string, args: ASPxClientDashboardItemRequestUnderlyingDataParameters, onCompleted: ASPxClientDashboardItemRequestUnderlyingDataCompleted): void;
+    /**
+     * Invokes the Dashboard Parameters dialog.
+     */
+    ShowParametersDialog(): void;
+    /**
+     * Closes the Dashboard Parameters dialog.
+     */
+    HideParametersDialog(): void;
+    /**
+     * Returns settings that specify parameters affecting how the dashboard is exported.
+     */
+    GetExportOptions(): ASPxClientDashboardExportOptions;
+    /**
+     * Allows you to obtain options related to exporting a dashboard/dashboard item to the PDF format.
+     */
+    GetPdfExportOptions(): DashboardPdfExportOptions;
+    /**
+     * Allows you to obtain options related to exporting a dashboard/dashboard item to an image.
+     */
+    GetImageExportOptions(): DashboardImageExportOptions;
+    /**
+     * Allows you to obtain options related to exporting a dashboard/dashboard item to the Excel format.
+     */
+    GetExcelExportOptions(): DashboardExcelExportOptions;
+    /**
+     * Specifies settings that specify parameters affecting how the dashboard is exported.
+     * @param options A ASPxClientDashboardExportOptions object containing settings that specify parameters affecting how the dashboard is exported.
+     */
+    SetExportOptions(options: ASPxClientDashboardExportOptions): void;
+    /**
+     * Allows you to specify options related to exporting a dashboard/dashboard item to the PDF format.
+     * @param options A DashboardPdfExportOptions object containing options related to exporting a dashboard/dashboard item to the PDF format.
+     */
+    SetPdfExportOptions(options: DashboardPdfExportOptions): void;
+    /**
+     * Allows you to specify options related to exporting a dashboard/dashboard item to an image.
+     * @param options A DashboardImageExportOptions object containing options related to exporting a dashboard/dashboard item to an image.
+     */
+    SetImageExportOptions(options: DashboardImageExportOptions): void;
+    /**
+     * Allows you to specify options related to exporting a dashboard/dashboard item to the Excel format.
+     * @param options A DashboardExcelExportOptions object containing options related to exporting a dashboard item to the Excel format.
+     */
+    SetExcelExportOptions(options: DashboardExcelExportOptions): void;
+    /**
+     * Exports a dashboard to a PDF file and writes it to the Response.
+     */
+    ExportToPdf(): void;
+    /**
+     * Exports a dashboard to a PDF file with the specified export options and writes it to the Response.
+     * @param options A DashboardPdfExportOptions object containing PDF-specific export options.
+     */
+    ExportToPdf(options: DashboardPdfExportOptions): void;
+    /**
+     * Exports a dashboard to a PDF file with the specified export options and writes it to the Response.
+     * @param options A DashboardPdfExportOptions object containing PDF-specific export options.
+     * @param fileName A string that specifies the name of the exported file.
+     */
+    ExportToPdf(options: DashboardPdfExportOptions, fileName: string): void;
+    /**
+     * Exports a dashboard to a PDF file with the specified export options and writes it to the Response.
+     * @param options A ASPxClientDashboardExportOptions object containing settings that specify parameters affecting how the dashboard is exported.
+     */
+    ExportToPdf(options: ASPxClientDashboardExportOptions): void;
+    /**
+     * Exports a dashboard to a PDF file with the specified export options and writes it to the Response.
+     * @param options A ASPxClientDashboardExportOptions object containing settings that specify parameters affecting how the dashboard is exported.
+     * @param fileName A string that specifies the name of the exported file.
+     */
+    ExportToPdf(options: ASPxClientDashboardExportOptions, fileName: string): void;
+    /**
+     * Exports a dashboard to an Image file and writes it to the Response.
+     */
+    ExportToImage(): void;
+    /**
+     * Exports a dashboard to an Image file with the specified export options and writes it to the Response.
+     * @param options A DashboardImageExportOptions object containing image-specific export options.
+     */
+    ExportToImage(options: DashboardImageExportOptions): void;
+    /**
+     * Exports a dashboard to an Image file with the specified export options and writes it to the Response.
+     * @param options A DashboardImageExportOptions object containing image-specific export options.
+     * @param fileName A string that specifies the name of the exported file.
+     */
+    ExportToImage(options: DashboardImageExportOptions, fileName: string): void;
+    /**
+     * Exports a dashboard to an Image file with the specified export options and writes it to the Response.
+     * @param options A ASPxClientDashboardExportOptions object containing settings that specify parameters affecting how the dashboard is exported.
+     */
+    ExportToImage(options: ASPxClientDashboardExportOptions): void;
+    /**
+     * Exports a dashboard to an Image file with the specified export options and writes it to the Response.
+     * @param options A ASPxClientDashboardExportOptions object containing settings that specify parameters affecting how the dashboard is exported.
+     * @param fileName A string that specifies the name of the exported file.
+     */
+    ExportToImage(options: ASPxClientDashboardExportOptions, fileName: string): void;
+    /**
+     * Exports dashboard data to the specified file in Excel format.
+     */
+    ExportToExcel(): void;
+    /**
+     * Exports dashboard data to the specified file in Excel format.
+     * @param options A DashboardExcelExportOptions object containing Excel-specific options.
+     */
+    ExportToExcel(options: DashboardImageExportOptions): void;
+    /**
+     * Exports dashboard data to the specified file in Excel format.
+     * @param options A DashboardExcelExportOptions object containing Excel-specific options.
+     * @param fileName A string value that specifies the name of the exported file.
+     */
+    ExportToExcel(options: DashboardImageExportOptions, fileName: string): void;
+    /**
+     * Exports a dashboard item to a PDF file and writes it to the Response.
+     * @param itemName A String that is the component name of the dashboard item to be exported.
+     */
+    ExportDashboardItemToPdf(itemName: string): void;
+    /**
+     * Exports a dashboard item to a PDF file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options A DashboardPdfExportOptions object containing PDF-specific export options.
+     */
+    ExportDashboardItemToPdf(itemName: string, options: DashboardPdfExportOptions): void;
+    /**
+     * Exports a dashboard item to a PDF file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options A DashboardPdfExportOptions object containing PDF-specific export options.
+     * @param fileName A string that specifies the name of the exported file.
+     */
+    ExportDashboardItemToPdf(itemName: string, options: DashboardPdfExportOptions, fileName: string): void;
+    /**
+     * Exports a dashboard item to a PDF file with the specified export options and writes it to the Response.
+     * @param itemName A String that is the component name of the dashboard item to be exported.
+     * @param options An ASPxClientDashboardExportOptions object containing export options to be applied to the exported dashboard item.
+     */
+    ExportDashboardItemToPdf(itemName: string, options: ASPxClientDashboardExportOptions): void;
+    /**
+     * Exports a dashboard item to a PDF file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options An ASPxClientDashboardExportOptions object containing export options to be applied to the exported dashboard item.
+     * @param fileName A string that specifies the name of the exported file.
+     */
+    ExportDashboardItemToPdf(itemName: string, options: ASPxClientDashboardExportOptions, fileName: string): void;
+    /**
+     * Exports a dashboard item to an Image file and writes it to the Response.
+     * @param itemName A String that is the component name of the dashboard item to be exported.
+     */
+    ExportDashboardItemToImage(itemName: string): void;
+    /**
+     * Exports a dashboard item to an Image file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options A DashboardImageExportOptions object containing image-specific export options.
+     */
+    ExportDashboardItemToImage(itemName: string, options: DashboardImageExportOptions): void;
+    /**
+     * Exports a dashboard item to an Image file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options A DashboardImageExportOptions object containing image-specific export options.
+     * @param fileName A string value that specifies the name of the exported file.
+     */
+    ExportDashboardItemToImage(itemName: string, options: DashboardImageExportOptions, fileName: string): void;
+    /**
+     * Exports a dashboard item to an Image file with the specified export options and writes it to the Response.
+     * @param itemName A String that is the component name of the dashboard item to be exported.
+     * @param options An ASPxClientDashboardExportOptions object containing export options to be applied to the exported dashboard item.
+     */
+    ExportDashboardItemToImage(itemName: string, options: ASPxClientDashboardExportOptions): void;
+    /**
+     * Exports a dashboard item to an Image file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options An ASPxClientDashboardExportOptions object containing export options to be applied to the exported dashboard item.
+     * @param fileName A string value that specifies the name of the exported file.
+     */
+    ExportDashboardItemToImage(itemName: string, options: ASPxClientDashboardExportOptions, fileName: string): void;
+    /**
+     * Exports a dashboard item to an Excel file and writes it to the Response.
+     * @param itemName A String that is the component name of the dashboard item to be exported.
+     */
+    ExportDashboardItemToExcel(itemName: string): void;
+    /**
+     * Exports a dashboard item to an Excel file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options A DashboardExcelExportOptions object containing Excel export options.
+     */
+    ExportDashboardItemToExcel(itemName: string, options: DashboardExcelExportOptions): void;
+    /**
+     * Exports a dashboard item to an Excel file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options A DashboardExcelExportOptions object containing Excel export options.
+     * @param fileName A string that specifies the name of the exported Excel file.
+     */
+    ExportDashboardItemToExcel(itemName: string, options: DashboardExcelExportOptions, fileName: string): void;
+    /**
+     * Exports a dashboard item to an Excel file with the specified export options and writes it to the Response.
+     * @param itemName A String that is the component name of the dashboard item to be exported.
+     * @param options An ASPxClientDashboardExportOptions object containing export options to be applied to the exported dashboard item.
+     */
+    ExportDashboardItemToExcel(itemName: string, options: ASPxClientDashboardExportOptions): void;
+    /**
+     * Exports a dashboard item to an Excel file with the specified export options and writes it to the Response.
+     * @param itemName A string that is the component name of the dashboard item to be exported.
+     * @param options An ASPxClientDashboardExportOptions object containing export options.
+     * @param fileName A string that specifies the name of the exported Excel file.
+     */
+    ExportDashboardItemToExcel(itemName: string, options: ASPxClientDashboardExportOptions, fileName: string): void;
+    /**
+     * Returns the dashboard width.
+     */
+    GetWidth(): number;
+    /**
+     * Returns the dashboard height.
+     */
+    GetHeight(): number;
+    /**
+     * Specifies the dashboard width.
+     * @param width An integer value that specifies the dashboard width.
+     */
+    SetWidth(width: number): void;
+    /**
+     * Specifies the dashboard height.
+     * @param height An integer value that specifies the dashboard height.
+     */
+    SetHeight(height: number): void;
+    /**
+     * Specifies the dashboard size.
+     * @param width An integer value that specifies the dashboard width.
+     * @param height An integer value that specifies the dashboard height.
+     */
+    SetSize(width: number, height: number): void;
+    /**
+     * Selects required elements by their values in the specified master filter item.
+     * @param itemName A String that species the component name of the master filter item.
+     * @param values Values that will be used to select elements in the master filter item.
+     */
+    SetMasterFilter(itemName: string, values: Object[][]): void;
+    /**
+     * Selects the required elements in the specified master filter item.
+     * @param itemName A String that specifies the component name of the master filter item.
+     * @param axisPointTuples An array of ASPxClientDashboardItemDataAxisPointTuple objects used to identify master filter elements.
+     */
+    SetMasterFilter(itemName: string, axisPointTuples: ASPxClientDashboardItemDataAxisPointTuple[]): void;
+    /**
+     * Performs a drill-down for the required element by its value.
+     * @param itemName A String that species the component name of the dashboard item.
+     * @param value A value that will be used to perform a drill-down for the required element.
+     */
+    PerformDrillDown(itemName: string, value: Object): void;
+    /**
+     * Performs a drill-down for the required element.
+     * @param itemName A String that specifies the component name of the dashboard item.
+     * @param axisPointTuple A ASPxClientDashboardItemDataAxisPointTuple object representing a set of axis points.
+     */
+    PerformDrillDown(itemName: string, axisPointTuple: ASPxClientDashboardItemDataAxisPointTuple): void;
+    /**
+     * Clears the specified master filter item.
+     * @param itemName A String that specifies the component name of the master filter item.
+     */
+    ClearMasterFilter(itemName: string): void;
+    /**
+     * Performs a drill-up for the specified dashboard item.
+     * @param itemName A String that specifies the component name of the dashboard item.
+     */
+    PerformDrillUp(itemName: string): void;
+    /**
+     * Returns whether or not the specified master filter item allows selecting one or more elements.
+     * @param itemName A String that specifies the component name of the master filter item.
+     */
+    CanSetMasterFilter(itemName: string): boolean;
+    /**
+     * Returns whether or not the specified master filter can be cleared in the current state.
+     * @param itemName A String that specifies the component name of the master filter item.
+     */
+    CanClearMasterFilter(itemName: string): boolean;
+    /**
+     * Returns whether or not drill down is possible in the current state of the specified dashboard item.
+     * @param itemName A String that specifies the component name of the dashboard item.
+     */
+    CanPerformDrillDown(itemName: string): boolean;
+    /**
+     * Returns whether or not drill up is possible in the current state of the specified dashboard item.
+     * @param itemName A String that specifies the component name of the dashboard item.
+     */
+    CanPerformDrillUp(itemName: string): boolean;
+    /**
+     * Returns the client data for the specified dashboard item.
+     * @param itemName A string that specifies the component name of the dashboard item.
+     */
+    GetItemData(itemName: string): ASPxClientDashboardItemData;
+}
+/**
+ * References a method that will handle the ActionAvailabilityChanged event.
+ */
+interface ASPxClientDashboardActionAvailabilityChangedEventHandler<S> {
+    /**
+     * References a method that will handle the ActionAvailabilityChanged event.
+     * @param source The event source.
+     * @param e A ASPxClientDashboardActionAvailabilityChangedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardActionAvailabilityChangedEventArgs): void;
+}
+/**
+ * Provides data for the ActionAvailabilityChanged event.
+ */
+interface ASPxClientDashboardActionAvailabilityChangedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets whether or not data reloading is available in the current state of dashboard item.
+     * Value: true, if data reloading is available in the current state of dashboard item; otherwise, false.
+     */
+    IsReloadDataAvailable: boolean;
+    /**
+     * Gets interactivity actions currently available for the dashboard item.
+     * Value: An array of ASPxClientDashboardItemAction objects that represent interactivity actions currently available for the dashboard item.
+     */
+    ItemActions: ASPxClientDashboardItemAction[];
+}
+/**
+ * References a method that will handle the DataLoadingError event.
+ */
+interface ASPxClientDashboardDataLoadingErrorEventHandler<S> {
+    /**
+     * References a method that will handle the DataLoadingError event.
+     * @param source The event source.
+     * @param e A ASPxClientDashboardDataLoadingErrorEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardDataLoadingErrorEventArgs): void;
+}
+/**
+ * Provides data for the DataLoadingError event.
+ */
+interface ASPxClientDashboardDataLoadingErrorEventArgs extends ASPxClientEventArgs {
+    /**
+     * Allows you to determine whether or not the error message will be shown.
+     */
+    IsErrorMessageShown(): boolean;
+    /**
+     * Allows you to specify whether to show the error message.
+     * @param value true, to show the error message; otherwise, false.
+     */
+    ShowErrorMessage(value: boolean): void;
+    /**
+     * Allows you to obtain the displayed error message.
+     */
+    GetError(): string;
+    /**
+     * Allows you to specify the displayed error message.
+     * @param value A string value that specifies the displayed error message.
+     */
+    SetError(value: string): void;
+}
+/**
+ * Represents an interactivity action in the dashboard item.
+ */
+interface ASPxClientDashboardItemAction {
+    /**
+     * Gets the name of the dashboard item.
+     * Value: A string that specifies the name of the dashboard item.
+     */
+    ItemName: string;
+    /**
+     * Gets interactivity actions performed on a dashboard item.
+     * Value: An array of ASPxClientDashboardAction values that specify interactivity actions performed on a dashboard item.
+     */
+    Actions: any[];
+}
+declare enum ASPxClientDashboardAction {
+    SetMasterFilter=0,
+    ClearMasterFilter=1,
+    DrillDown=2,
+    DrillUp=3
+}
+/**
+ * References a method that will handle the MasterFilterSet event.
+ */
+interface ASPxClientDashboardMasterFilterSetEventHandler<S> {
+    /**
+     * References a method that will handle the MasterFilterSet event.
+     * @param source The event source.
+     * @param e A ASPxClientDashboardMasterFilterSetEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardMasterFilterSetEventArgs): void;
+}
+/**
+ * Provides data for the MasterFilterSet event.
+ */
+interface ASPxClientDashboardMasterFilterSetEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name of the dashboard item.
+     * Value: A string value that specifies the component name of the dashboard item.
+     */
+    ItemName: string;
+    /**
+     * Gets values of currently selected elements in the master filter item.
+     * Value: Values of currently selected elements in the master filter item.
+     */
+    Values: Object[][];
+    /**
+     * Returns whether or not the specified value is NullValue.
+     * @param value The specified value.
+     */
+    IsNullValue(value: Object): boolean;
+    /**
+     * Returns whether or not the specified value is OthersValue.
+     * @param value The specified value.
+     */
+    IsOthersValue(value: Object): boolean;
+}
+/**
+ * References a method that will handle the MasterFilterCleared event.
+ */
+interface ASPxClientDashboardMasterFilterClearedEventHandler<S> {
+    /**
+     * References a method that will handle the MasterFilterCleared event.
+     * @param source The event source.
+     * @param e A ASPxClientDashboardMasterFilterClearedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardMasterFilterClearedEventArgs): void;
+}
+/**
+ * Provides data for the MasterFilterCleared event.
+ */
+interface ASPxClientDashboardMasterFilterClearedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name of the dashboard item.
+     * Value: A string value that is the component name of the dashboard item.
+     */
+    ItemName: string;
+}
+/**
+ * References a method that will handle the DrillDownPerformed event.
+ */
+interface ASPxClientDashboardDrillDownPerformedEventHandler<S> {
+    /**
+     * References a method that will handle the DrillDownPerformed event.
+     * @param source The event source.
+     * @param e A ASPxClientDashboardDrillDownPerformedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardDrillDownPerformedEventArgs): void;
+}
+/**
+ * Provides data for the DrillDownPerformed event.
+ */
+interface ASPxClientDashboardDrillDownPerformedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name of the dashboard item.
+     * Value: A string that specifies the name of the dashboard item.
+     */
+    ItemName: string;
+    /**
+     * Gets values from the current drill-down hierarchy.
+     * Value: An array of values from the current drill-down hierarchy.
+     */
+    Values: Object[];
+    /**
+     * Returns whether or not the specified value is NullValue.
+     * @param value The specified value.
+     */
+    IsNullValue(value: Object): boolean;
+    /**
+     * Returns whether or not the specified value is OthersValue.
+     * @param value The specified value.
+     */
+    IsOthersValue(value: Object): boolean;
+}
+/**
+ * References a method that will handle the DrillUpPerformed event.
+ */
+interface ASPxClientDashboardDrillUpPerformedEventHandler<S> {
+    /**
+     * References a method that will handle the DrillUpPerformed event.
+     * @param source The event source.
+     * @param e A ASPxClientDashboardDrillUpPerformedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDashboardDrillUpPerformedEventArgs): void;
+}
+/**
+ * Provides data for the DrillUpPerformed event.
+ */
+interface ASPxClientDashboardDrillUpPerformedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name of the dashboard item.
+     * Value: A string that is the name of the dashboard item.
+     */
+    ItemName: string;
+}
+interface CardWidgetCustomizeTextEventArgs {
+    getValue(): Object;
+    getDefaultText(): string;
+}
+/**
+ * A Card widget that visualizes a Card dashboard item's data.
+ */
+interface CardWidget {
+    /**
+     * Gets or sets the background color for a card.
+     * Value: A string that specifies the <a href="https://www.w3schools.com/html/html_colors.asp">HTML color</a> used to paint a card's background.
+     */
+    cardBackColor: string;
+    onCustomizeText: Object;
+}
+/**
+ * When implemented, represents the Web Dashboard extension.
+ */
+interface IExtension {
+    /**
+     * Gets a unique name of a Web Dashboard extension.
+     * Value: A string value that is a unique name of a Web Dashboard extension.
+     */
+    name: string;
+    /**
+     * Contains code that will be invoked when you register the dashboard extension.
+     */
+    start(): void;
+    /**
+     * Contains code that will be invoked when you unregister the dashboard extension.
+     */
+    stop(): void;
+}
+/**
+ * An inner part of the ASPxClientDashboard control.
+ */
+interface DashboardControl {
+    /**
+     * Gets or sets knockout templates that you can use in the Web Dashboard.
+     * Value: A <see cref="KnockoutObservableArray" /> object that is a knockout template collection.
+     */
+    customTemplates: KnockoutObservableArray;
+    /**
+     * Provides an access to the collection of registered dashboard extensions.
+     * Value: An array of IExtension objects that are dashboard extensions.
+     */
+    extensions: IExtension[];
+    /**
+     * Initializes a new dashboard with the specified name and JSON model.
+     * @param id A string value that is a unique name of the created dashboard.
+     * @param dashboardJson A dashboard model encoded in the specified JSON string.
+     */
+    initializeDashboard(id: string, dashboardJson: string): void;
+    /**
+     * Initializes a new dashboard with the specified name, JSON model and initial state.
+     * @param id A string value that is a unique name of the created dashboard.
+     * @param dashboardJson A dashboard model encoded in the specified JSON string.
+     * @param initialState A JSON object that specifies the  dashboard state.
+     */
+    initializeDashboard(id: string, dashboardJson: string, initialState: Object): void;
+    /**
+     * Allows you to register a dashboard extension to add its functionality to the Web Dashboard.
+     * @param extension An IExtension object that is a dashboard extension.
+     */
+    registerExtension(extension: IExtension): void;
+    /**
+     * Allows you to get access to the extension.
+     * @param extensionName A string value that is the dashboard extension name.
+     */
+    findExtension(extensionName: string): IExtension;
+    /**
+     * Allows you to unregister a dashboard extension to disable its functionality in the Web Dashboard.
+     * @param extensionName A string value that is a dashboard extension name.
+     */
+    unregisterExtension(extensionName: string): void;
+}
+interface DashboardParameterDialogExtension extends IExtension {
+}
+interface DashboardExportExtension extends IExtension {
+}
+interface DashboardClientApiExtension extends IExtension {
+}
+interface DashboardCurrencyEditorExtension extends IExtension {
+}
+interface DataSourceBrowserExtension extends IExtension {
+}
+interface DataSourceWizardExtension extends IExtension {
+}
+interface DashboadItemMenuExtension extends IExtension {
+}
+/**
+ * A Web Dashboard extension that allows you to keep track of all user actions, and cancel or repeat them.
+ */
+interface UndoRedoExtension extends IExtension {
+    /**
+     * Allows you to track whether the Web Dashboard has unsaved changes.
+     */
+    isChanged(): boolean;
+}
+/**
+ * An extension that is the dashboard item's Binding menu allowing you to create and modify data binding.
+ */
+interface BindingPanelExtension extends IExtension {
+}
+/**
+ * A Web Dashboard extension that allows you to configure color schemes.
+ */
+interface DashboardColorSchemeEditorExtension extends IExtension {
+}
+/**
+ * An extension that is the dashboard item's Convert To menu allowing you to convert or duplicate the current item.
+ */
+interface ConversionPanelExtension extends IExtension {
+}
+/**
+ * A Web Dashboard extension that allows you to save the current dashboard.
+ */
+interface SaveDashboardExtension extends IExtension {
+    /**
+     * Allows you to save the current dashboard with a specified unique name and JSON model.
+     * @param dashboardId A string value that is a unique name of the created dashboard.
+     * @param dashboardJson A dashboard model encoded in the specified JSON string.
+     */
+    performSaveDashboard(dashboardId: string, dashboardJson: string): void;
+    /**
+     * Allows you to invoke a custom function while you save a dashboard.
+     * @param action A custom function that is invoked when the dashboard is about to be saved.
+     */
+    ensureDashboardSaved(action: Function): void;
+    /**
+     * Saves the opened dashboard.
+     */
+    saveDashboard(): void;
+}
+/**
+ * A Web Dashboard extension that allows you to create a new dashboard.
+ */
+interface CreateDashboardExtension extends IExtension {
+    /**
+     * Creates a new dashboard with a specified name and JSON model.
+     * @param dashboardName A string value that is the name of the created dashboard.
+     * @param dashboardJson A dashboard model encoded in the specified JSON string.
+     */
+    performCreateDashboard(dashboardName: string, dashboardJson: string): void;
+}
+/**
+ * A Web Dashboard extension that allows you to open the created dashboards.
+ */
+interface OpenDashboardExtension extends IExtension {
+    /**
+     * Loads a dashboard with the specified identifier from the dashboard storage.
+     * @param id A String value that specifies the unique dashboard name.
+     */
+    loadDashboard(id: string): void;
+}
+/**
+ * An extension that is the dashboard item's Interactivity menu containing settings that affect on interaction between various dashboard items.
+ */
+interface InteractivityPanelExtension extends IExtension {
+}
+/**
+ * An extension that is the dashboard item's Options menu containing specific options and settings related to the current dashboard item.
+ */
+interface OptionsPanelExtension extends IExtension {
+}
+/**
+ * An extension that is the Web Dashboard title editor.
+ */
+interface DashboardTitleEditorExtension extends IExtension {
+}
+/**
+ * The Dashboard Panel extension that displays a list of available dashboards and lets you switch between the designer and viewer modes.
+ */
+interface DashboardPanelExtension extends IExtension {
+    /**
+     * Gets or sets the width of the Dashboard Panel extension.
+     * Value: An integer value that specifies the Dashboard Panel's width.
+     */
+    panelWidth: number;
+    /**
+     * Gets or sets whether the Dashboard Panel is visible.
+     * Value: true, to display the Dashboard Panel; otherwise, false.
+     */
+    visible: KnockoutObservableBoolean;
+    /**
+     * Gets or sets whether you can switch into the designer mode.
+     * Value: true, to display the Edit in Designer button on the dashboard panel; otherwise, false.
+     */
+    allowSwitchToDesigner: KnockoutObservableBoolean;
+}
+/**
+ * An extension that is a list of available data sources used to provide data to the Web Dashboard.
+ */
+interface AvailableDataSourcesExtension extends IExtension {
+}
+/**
+ * A dashboard menu item.
+ */
+interface DashboardMenuItem {
+    /**
+     * Gets or sets a unique identifier of a dashboard menu item.
+     * Value: A string value that is a menu item's unique identifier.
+     */
+    id: string;
+    /**
+     * Gets or sets a dashboard menu item title.
+     * Value: A string value that is a dashboard menu item title.
+     */
+    title: string;
+    /**
+     * Gets or sets a position of the dashboard menu item within the dashboard menu.
+     * Value: A zero-based integer specifying the position of the current dashboard menu item.
+     */
+    index: number;
+    /**
+     * Gets or sets a code of the key used in the keyboard shortcut. This shortcut allows you to invoke the current menu item.
+     * Value: An integer value that specifies a key code.
+     */
+    hotKey: number;
+    /**
+     * Gets or sets a custom function that is invoked when a click occurs.
+     * Value: A custom function that is invoked when a click occurs.
+     */
+    click: Function;
+    /**
+     * Gets or sets a knockout template for the extension.
+     * Value: A string value that is an id of the knockout template.
+     */
+    template: string;
+    /**
+     * Gets or sets whether the dashboard menu item is selected.
+     * Value: true, if the dashboard menu item is selected; otherwise, false;
+     */
+    selected: KnockoutObservableBoolean;
+    /**
+     * Gets whether a dashboard menu item is disabled.
+     * Value: true, if a dashboard menu item should be disabled; otherwise, false.
+     */
+    disabled: KnockoutObservableBoolean;
+    /**
+     * Gets or sets whether a dashboard menu item has a separator.
+     * Value: true, if a dashboard menu item has a separator; otherwise, false.
+     */
+    hasSeparator: boolean;
+    /**
+     * Gets or sets data that is used by a menu item.
+     * Value: An object that contains data used by a menu item.
+     */
+    data: Object;
+}
+/**
+ * A toolbox item of the specified dashboard toolbox group.
+ */
+interface DashboardToolboxItem {
+    /**
+     * Gets or sets a dashboard item type.
+     * Value: A string value that is a dashboard item type.
+     */
+    type: string;
+    /**
+     * Gets or sets an icon of the dashboard toolbox item.
+     * Value: A string value that is the icon id from the SVG definition.
+     */
+    icon: string;
+    /**
+     * Gets or sets a unique name of the dashboard toolbox item.
+     * Value: A string value that is a toolbox item's unique name.
+     */
+    name: string;
+    /**
+     * Gets or sets a dashboard toolbox item title.
+     * Value: A string value that is a dashboard toolbox item title.
+     */
+    title: string;
+    /**
+     * Gets or sets whether a toolbox item should be disabled.
+     * Value: true, if a toolbox item should be disabled; otherwise, false.
+     */
+    disabled: KnockoutObservableBoolean;
+    /**
+     * Gets or sets a custom function that is invoked when a click occurs.
+     * Value: A custom function that is invoked when a click occurs.
+     */
+    click: Function;
+}
+/**
+ * A toolbar item of the specified dashboard toolbar group.
+ */
+interface DashboardToolbarItem {
+    /**
+     * Gets or sets an icon of the dashboard toolbar item.
+     * Value: A string value that is the icon id from the SVG definition.
+     */
+    icon: string;
+    /**
+     * Gets or sets a unique name of the dashboard toolbar item.
+     * Value: A string value that is a unique toolbar item name.
+     */
+    name: string;
+    /**
+     * Gets or sets a dashboard toolbar item title.
+     * Value: A string value that is a dashboard toolbar item title.
+     */
+    title: string;
+    /**
+     * Gets or sets whether a toolbar item should be disabled.
+     * Value: true, if a toolbar item is disabled; otherwise, false.
+     */
+    disabled: KnockoutObservableBoolean;
+    /**
+     * Gets or sets a knockout extension template.
+     * Value: A string value that is an id of the knockout template.
+     */
+    template: string;
+    /**
+     * Gets or sets a custom function that is invoked when a click occurs.
+     * Value: A custom function that is invoked when a click occurs.
+     */
+    click: Function;
+}
+/**
+ * A toolbox group that contains dashboard toolbox items.
+ */
+interface DashboardToolboxGroup {
+    /**
+     * Gets or sets a unique name of the dashboard toolbox group.
+     * Value: A string value that is a unique toolbox group name.
+     */
+    name: string;
+    /**
+     * Gets or sets a dashboard toolbox group title.
+     * Value: A string value that is a dashboard toolbox group title.
+     */
+    title: string;
+    /**
+     * Gets or sets a position of the toolbox group within the Toolbox.
+     * Value: A zero-based integer specifying the position of the current toolbox group.
+     */
+    index: number;
+    /**
+     * Provide an access to the collection of toolbox items obtained from the specified toolbox group.
+     * Value: A <see cref="KnockoutObservableArray" /> object that is an array of items obtained from the specified toolbox group.
+     */
+    items: KnockoutObservableArray;
+}
+/**
+ * A toolbar group that contains dashboard toolbar items.
+ */
+interface DashboardToolbarGroup {
+    /**
+     * Gets or sets a unique name of the dashboard toolbar group.
+     * Value: A string value that is a unique toolbar group name.
+     */
+    name: string;
+    /**
+     * Gets or sets a dashboard toolbar group title.
+     * Value: A string value that is a dashboard toolbar group title.
+     */
+    title: string;
+    /**
+     * Gets or sets a position of the toolbar group within the Toolbox.
+     * Value: A zero-based integer specifying the position of the current toolbar group.
+     */
+    index: number;
+    /**
+     * Provide an access to the collection of toolbox items obtained from the specified toolbar group.
+     * Value: A <see cref="KnockoutObservableArray" /> object that is an array of items obtained from the specified toolbar group.
+     */
+    items: KnockoutObservableArray;
+}
+/**
+ * The Web Dashboard Toolbox extension that provides access to the dashboard menu and allows you to add dashboard items, as well as undo or repeat user actions.
+ */
+interface ToolboxExtension extends IExtension {
+    /**
+     * Gets or sets the visibility of the dashboard menu.
+     * Value: true, to display the dashboard menu; otherwise, false.
+     */
+    menuVisible: KnockoutObservableBoolean;
+    /**
+     * Provide an access to the collection of menu items obtained from the dashboard menu.
+     * Value: A <see cref="KnockoutObservableArray" /> object that is a collection the dashboard menu items .
+     */
+    menuItems: KnockoutObservableArray;
+    /**
+     * Provide an access to the collection of toolbox groups obtained from the Toolbox.
+     * Value: A <see cref="KnockoutObservableArray" /> object that is a collection the toolbox groups.
+     */
+    toolboxGroups: KnockoutObservableArray;
+    /**
+     * Provide an access to the collection of toolbar groups obtained from the Toolbox.
+     * Value: A <see cref="KnockoutObservableArray" /> object that is a collection the toolbar groups.
+     */
+    toolbarGroups: KnockoutObservableArray;
+    /**
+     * Allows you to add a specified menu item to the dashboard menu.
+     * @param menuItem A DashboardMenuItem object that is a dashboard menu item.
+     */
+    addMenuItem(menuItem: DashboardMenuItem): void;
+    /**
+     * Removes the specified dashboard item from the dashboard menu.
+     * @param menuItemId A string value that is a unique dashboard item name.
+     */
+    removeMenuItem(menuItemId: string): void;
+    /**
+     * Simulates a dashboard menu item selection.
+     * @param menuItem A DashboardMenuItem object that is a dashboard menu item.
+     */
+    selectMenuItem(menuItem: DashboardMenuItem): void;
+    /**
+     * Allows you to add a specified toolbox item into a specified toolbox group.
+     * @param groupName A string value that is a toolbox group name. To get a toolbox group name, use the name property.
+     * @param toolboxItem A DashboardToolboxItem object that is a dashboard toolbox item.
+     */
+    addToolboxItem(groupName: string, toolboxItem: DashboardToolboxItem): void;
+    /**
+     * Removes the specified toolbox item from the specified toolbox group.
+     * @param groupName A string value that is a unique toolbox group name.
+     * @param toolboxItemName A string value that is a unique toolbox item name.
+     */
+    removeToolboxItem(groupName: string, toolboxItemName: string): void;
+    /**
+     * Allows you to add a specified toolbar item into a specified toolbar group.
+     * @param groupName A string value that is a toolbar group name. To get a toolbar group name, use the name property.
+     * @param toolbarItem A DashboardToolbarItem object that is a dashboard toolbar item.
+     */
+    addToolbarItem(groupName: string, toolbarItem: DashboardToolbarItem): void;
+    /**
+     * Removes the specified toolbar item from the specified toolbar group.
+     * @param groupName A string value that is a unique toolbar group name.
+     * @param toolbarItemName A string value that is a unique toolbar item name.
+     */
+    removeToolbarItem(groupName: string, toolbarItemName: string): void;
+}
+/**
+ * A Web Dashboard extension that allows you to create and edit dashboard parameters.
+ */
+interface DashboardParameterEditorExtension extends IExtension {
+}
+/**
+ * Serves as the base object for all the editors included in the client-side object model.
+ */
+interface ASPxClientEditBase extends ASPxClientControl {
+    /**
+     * Returns the editor's value.
+     */
+    GetValue(): Object;
+    /**
+     * Changes the editor's value.
+     * @param value An object representing the data to be assigned to the editor's edit value.
+     */
+    SetValue(value: Object): void;
+    /**
+     * Returns a value indicating whether an editor is enabled.
+     */
+    GetEnabled(): boolean;
+    /**
+     * Specifies whether an editor is enabled.
+     * @param value true to enable the editor; otherwise, false.
+     */
+    SetEnabled(value: boolean): void;
+    /**
+     * Returns the text displayed in the editor caption.
+     */
+    GetCaption(): string;
+    /**
+     * Specifies the text displayed in the editor caption.
+     * @param caption A string value specifying the editor caption.
+     */
+    SetCaption(caption: string): void;
+}
+/**
+ * Serves as the base object for all the editors that support validation.
+ */
+interface ASPxClientEdit extends ASPxClientEditBase {
+    /**
+     * Fires on the client side when the editor receives input focus.
+     */
+    GotFocus: ASPxClientEvent<ASPxClientEventHandler<ASPxClientEdit>>;
+    /**
+     * Fires on the client side when the editor loses input focus.
+     */
+    LostFocus: ASPxClientEvent<ASPxClientEventHandler<ASPxClientEdit>>;
+    /**
+     * Allows you to specify whether the value entered into the editor is valid, and whether the editor is allowed to lose focus.
+     */
+    Validation: ASPxClientEvent<ASPxClientEditValidationEventHandler<ASPxClientEdit>>;
+    /**
+     * Fires after the editor's value has been changed by end-user interactions.
+     */
+    ValueChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientEdit>>;
+    /**
+     * Returns an HTML element that represents the control's input element.
+     */
+    GetInputElement(): Object;
+    /**
+     * Sets input focus to the editor.
+     */
+    Focus(): void;
+    /**
+     * Gets a value that indicates whether the editor's value passes validation.
+     */
+    GetIsValid(): boolean;
+    /**
+     * Gets the error text to be displayed within the editor's error frame if the editor's validation fails.
+     */
+    GetErrorText(): string;
+    /**
+     * Sets a value that specifies whether the editor's value is valid.
+     * @param isValid True if the editor's value is valid; otherwise, False.
+     */
+    SetIsValid(isValid: boolean): void;
+    /**
+     * Sets the error text to be displayed within the editor's error frame if the editor's validation fails.
+     * @param errorText A string value representing the error text.
+     */
+    SetErrorText(errorText: string): void;
+    /**
+     * Performs the editor's validation.
+     */
+    Validate(): void;
+}
+/**
+ * Represents the client-side equivalent of the ASPxBinaryImage control.
+ */
+interface ASPxClientBinaryImage extends ASPxClientEdit {
+    /**
+     * Occurs on the client side after an image is clicked.
+     */
+    Click: ASPxClientEvent<ASPxClientEditEventHandler<ASPxClientBinaryImage>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientBinaryImage>>;
+    /**
+     * Occurs after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientBinaryImage>>;
+    /**
+     * Fires on the client side if any server error occurs during server-side processing of a callback sent by the ASPxClientBinaryImage.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientBinaryImage>>;
+    /**
+     * Sets the size of the image editor.
+     * @param width An integer value that specifies the control's width.
+     * @param height An integer value that specifies the control's height.
+     */
+    SetSize(width: number, height: number): void;
+    /**
+     * For internal use only.
+     */
+    GetValue(): Object;
+    /**
+     * For internal use only.
+     * @param value 
+     */
+    SetValue(value: Object): void;
+    /**
+     * Removes an image from the editor content.
+     */
+    Clear(): void;
+    /**
+     * Returns a name of the last uploaded file.
+     */
+    GetUploadedFileName(): string;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param parameter A string value that contains any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param parameter A string value that contains any information that needs to be sent to the server-side CustomCallback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * Represents the client-side equivalent of the ASPxButton control.
+ */
+interface ASPxClientButton extends ASPxClientControl {
+    /**
+     * Occurs on the client side when the button's checked state is changed.
+     */
+    CheckedChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientButton>>;
+    /**
+     * Fires on the client side when the button receives input focus.
+     */
+    GotFocus: ASPxClientEvent<ASPxClientEventHandler<ASPxClientButton>>;
+    /**
+     * Fires on the client side when the button loses input focus.
+     */
+    LostFocus: ASPxClientEvent<ASPxClientEventHandler<ASPxClientButton>>;
+    /**
+     * Occurs on the client side after a button is clicked.
+     */
+    Click: ASPxClientEvent<ASPxClientButtonClickEventHandler<ASPxClientButton>>;
+    /**
+     * Simulates a mouse click action on the button control.
+     */
+    DoClick(): void;
+    /**
+     * Returns a value indicating whether the button is checked.
+     */
+    GetChecked(): boolean;
+    /**
+     * Sets a value that specifies the button's checked status.
+     * @param value true if the button is checked; otherwise, false.
+     */
+    SetChecked(value: boolean): void;
+    /**
+     * Returns the text displayed within the button.
+     */
+    GetText(): string;
+    /**
+     * Sets the text to be displayed within the button.
+     * @param value A string value specifying the text to be displayed within the button.
+     */
+    SetText(value: string): void;
+    /**
+     * Returns the URL pointing to the image displayed within the button.
+     */
+    GetImageUrl(): string;
+    /**
+     * Sets the URL pointing to the image displayed within the button.
+     * @param value A string value that is the URL to the image displayed within the button.
+     */
+    SetImageUrl(value: string): void;
+    /**
+     * Sets a value specifying whether the button is enabled.
+     * @param value true to enable the button; false to disable it.
+     */
+    SetEnabled(value: boolean): void;
+    /**
+     * Returns a value indicating whether the button is enabled.
+     */
+    GetEnabled(): boolean;
+    /**
+     * Sets input focus to the button.
+     */
+    Focus(): void;
+}
+/**
+ * A method that will handle the client Click event.
+ */
+interface ASPxClientButtonClickEventHandler<S> {
+    /**
+     * A method that will handle the client Click event.
+     * @param source An object that is the event's source.
+     * @param e An ASPxClientButtonClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientButtonClickEventArgs): void;
+}
+/**
+ * Provides data for the Click event.
+ */
+interface ASPxClientButtonClickEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Specifies whether both the event's default action and the event's bubbling upon the hierarchy of event handlers should be canceled.
+     * Value: true to cancel the event's default action and the event's bubbling upon the hierarchy of event handlers; otherwise, false.
+     */
+    cancelEventAndBubble: boolean;
+}
+/**
+ * Represents the client-side equivalent of the ASPxCalendar control.
+ */
+interface ASPxClientCalendar extends ASPxClientEdit {
+    /**
+     * Fires on the client side after the selected date has been changed within the calendar.
+     */
+    SelectionChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientCalendar>>;
+    /**
+     * Occurs on the client side when the month displayed within the calendar is changed.
+     */
+    VisibleMonthChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientCalendar>>;
+    /**
+     * Allows you to disable the calendar's days.
+     */
+    CustomDisabledDate: ASPxClientEvent<ASPxClientCalendarCustomDisabledDateEventHandler<ASPxClientCalendar>>;
+    /**
+     * Occurs on the client-side when an end-user presses a key while the editor has focus.
+     */
+    KeyDown: ASPxClientEvent<ASPxClientEditKeyEventHandler<ASPxClientCalendar>>;
+    /**
+     * Occurs on the client-side when an end-user presses and releases a key while the editor has focus.
+     */
+    KeyPress: ASPxClientEvent<ASPxClientEditKeyEventHandler<ASPxClientCalendar>>;
+    /**
+     * Occurs on the client-side when an end-user releases a pressed key while the editor has focus.
+     */
+    KeyUp: ASPxClientEvent<ASPxClientEditKeyEventHandler<ASPxClientCalendar>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientCalendar>>;
+    /**
+     * Occurs on the client side after the callback server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientCalendar>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientCalendar.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientCalendar>>;
+    /**
+     * Tests whether the specified date is selected.
+     * @param date A date-time value that specifies the date to test.
+     */
+    IsDateSelected(date: Date): boolean;
+    /**
+     * Sets the date that specifies the month and year to be displayed in the calendar.
+     * @param date The date that specifies calendar's visible month and year.
+     */
+    SetVisibleDate(date: Date): void;
+    /**
+     * Sets the calendar's selected date.
+     * @param date A date object that specifies the calendar's selected date.
+     */
+    SetSelectedDate(date: Date): void;
+    /**
+     * Returns the calendar's selected date.
+     */
+    GetSelectedDate(): Date;
+    /**
+     * Gets the date that determines the month and year that are currently displayed in the calendar.
+     */
+    GetVisibleDate(): Date;
+    /**
+     * Selects the specified date within the calendar.
+     * @param date A date-time value that specifies the selected date.
+     */
+    SelectDate(date: Date): void;
+    /**
+     * Selects the specified range of dates within the calendar.
+     * @param start A date-time value that specifies the range's first date.
+     * @param end A date-time value that specifies the range's last date.
+     */
+    SelectRange(start: Date, end: Date): void;
+    /**
+     * Deselects the specified date within the calendar.
+     * @param date A date-time value that specifies the date to deselect.
+     */
+    DeselectDate(date: Date): void;
+    /**
+     * Deselects the specified range of dates within the calendar.
+     * @param start A date-time value that specifies the range's first date.
+     * @param end A date-time value that specifies the range's last date.
+     */
+    DeselectRange(start: Date, end: Date): void;
+    /**
+     * Deselects all the selected dates within the calendar.
+     */
+    ClearSelection(): void;
+    /**
+     * Returns a list of dates which are selected within the calendar.
+     */
+    GetSelectedDates(): Date[];
+    /**
+     * Gets the minimum date on the calendar.
+     */
+    GetMinDate(): Date;
+    /**
+     * Sets the minimum date of the calendar.
+     * @param date A DateTime object representing the minimum date.
+     */
+    SetMinDate(date: Date): void;
+    /**
+     * Gets the maximum date on the calendar.
+     */
+    GetMaxDate(): Date;
+    /**
+     * Sets the maximum date of the calendar.
+     * @param date A DateTime object representing the maximum date.
+     */
+    SetMaxDate(date: Date): void;
+}
+/**
+ * Provides data for the CustomDisabledDate event.
+ */
+interface ASPxClientCalendarCustomDisabledDateEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the date processed in the calendar.
+     * Value: A DateTime value containing processed data.
+     */
+    date: Date;
+    /**
+     * Gets or sets a value specifying whether selection of the processed calendar date is disabled.
+     * Value: true, if the date is disabled; otherwise, false.
+     */
+    isDisabled: boolean;
+}
+/**
+ * A method that will handle the client CustomDisabledDate event.
+ */
+interface ASPxClientCalendarCustomDisabledDateEventHandler<S> {
+    /**
+     * A method that will handle the client CustomDisabledDate event.
+     * @param source The event source.
+     * @param e An ASPxClientCalendarCustomDisabledDateEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCalendarCustomDisabledDateEventArgs): void;
+}
+/**
+ * Represents the client-side equivalent of the ASPxCaptcha control.
+ */
+interface ASPxClientCaptcha extends ASPxClientControl {
+    /**
+     * Sets input focus to the control's text box.
+     */
+    Focus(): void;
+    /**
+     * Refreshes the code displayed within the editor's challenge image.
+     */
+    Refresh(): void;
+}
+/**
+ * Represents the client-side equivalent of the ASPxCheckBox control.
+ */
+interface ASPxClientCheckBox extends ASPxClientEdit {
+    /**
+     * Occurs on the client side when the editor's checked state is changed.
+     */
+    CheckedChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientCheckBox>>;
+    /**
+     * Returns a value indicating whether the check box editor is checked.
+     */
+    GetChecked(): boolean;
+    /**
+     * Sets a value which specifies the checked status of the check box editor.
+     * @param isChecked true if the check box editor is checked; otherwise, false.
+     */
+    SetChecked(isChecked: boolean): void;
+    /**
+     * Returns the text displayed within the editor.
+     */
+    GetText(): string;
+    /**
+     * Returns a value which specifies a check box checked state.
+     */
+    GetCheckState(): string;
+    /**
+     * Sets a value specifying the state of a check box.
+     * @param checkState A string value matches one of the CheckState enumeration values.
+     */
+    SetCheckState(checkState: string): void;
+    /**
+     * Sets the text to be displayed within the editor.
+     * @param text A string value specifying the text to be displayed within the editor.
+     */
+    SetText(text: string): void;
+}
+/**
+ * Represents the client-side equivalent of the ASPxRadioButton control.
+ */
+interface ASPxClientRadioButton extends ASPxClientCheckBox {
+    /**
+     * Returns a value indicating whether the radio button is checked.
+     */
+    GetChecked(): boolean;
+    /**
+     * Sets a value which specifies the radio button's checked status.
+     * @param isChecked true if the radio button is checked; otherwise, false.
+     */
+    SetChecked(isChecked: boolean): void;
+}
+/**
+ * Represents a base for client-side objects which allow single-line text input.
+ */
+interface ASPxClientTextEdit extends ASPxClientEdit {
+    /**
+     * Occurs on the client-side when an end-user presses a key while the editor has focus.
+     */
+    KeyDown: ASPxClientEvent<ASPxClientEditKeyEventHandler<ASPxClientTextEdit>>;
+    /**
+     * Occurs on the client-side when an end-user presses and releases a key while the editor has focus.
+     */
+    KeyPress: ASPxClientEvent<ASPxClientEditKeyEventHandler<ASPxClientTextEdit>>;
+    /**
+     * Occurs on the client-side when an end-user releases a pressed key while the editor has focus.
+     */
+    KeyUp: ASPxClientEvent<ASPxClientEditKeyEventHandler<ASPxClientTextEdit>>;
+    /**
+     * Fires on the client side when the editor's text is changed and focus moves out of the editor by end-user interactions.
+     */
+    TextChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientTextEdit>>;
+    /**
+     * Returns the text displayed within the editor.
+     */
+    GetText(): string;
+    /**
+     * Sets the text to be displayed within the editor.
+     * @param text A string value specifying the text to be displayed within the editor.
+     */
+    SetText(text: string): void;
+    /**
+     * Selects all text in the text editor.
+     */
+    SelectAll(): void;
+    /**
+     * Sets the caret position within the edited text.
+     * @param position An integer value that specifies the zero-based index of a text character that shall precede the caret.
+     */
+    SetCaretPosition(position: number): void;
+    /**
+     * Obtains the caret position within the edited text.
+     */
+    GetCaretPosition(): number;
+    /**
+     * Selects the specified portion of the editor's text.
+     * @param startPos A zero-based integer value specifying the selection's starting position.
+     * @param endPos A zero-based integer value specifying the selection's ending position.
+     * @param scrollToSelection true to scroll the editor's contents to make the selection visible; otherwise, false.
+     */
+    SetSelection(startPos: number, endPos: number, scrollToSelection: boolean): void;
+}
+/**
+ * Represents a base for client-side editors which are capable of displaying and editing text data in their edit regions.
+ */
+interface ASPxClientTextBoxBase extends ASPxClientTextEdit {
+}
+/**
+ * Represents a base for client button editor objects.
+ */
+interface ASPxClientButtonEditBase extends ASPxClientTextBoxBase {
+    /**
+     * Occurs on the client side after an editor button is clicked.
+     */
+    ButtonClick: ASPxClientEvent<ASPxClientButtonEditClickEventHandler<ASPxClientButtonEditBase>>;
+    /**
+     * Specifies whether the button is visible.
+     * @param number An integer value specifying the button's index within the Buttons collection.
+     * @param value true, to make the button visible; otherwise, false.
+     */
+    SetButtonVisible(number: number, value: boolean): void;
+    /**
+     * Returns a value specifying whether a button is displayed.
+     * @param number An integer value specifying the button's index within the Buttons collection.
+     */
+    GetButtonVisible(number: number): boolean;
+}
+/**
+ * Represents a base class for the editors that contain a drop down window.
+ */
+interface ASPxClientDropDownEditBase extends ASPxClientButtonEditBase {
+    /**
+     * Occurs on the client-side when the drop down window is opened.
+     */
+    DropDown: ASPxClientEvent<ASPxClientEventHandler<ASPxClientDropDownEditBase>>;
+    /**
+     * Occurs on the client side when the drop down window is closed.
+     */
+    CloseUp: ASPxClientEvent<ASPxClientEventHandler<ASPxClientDropDownEditBase>>;
+    /**
+     * Occurs on the client side before the drop down window is closed and allows you to cancel the operation.
+     */
+    QueryCloseUp: ASPxClientEvent<ASPxClientCancelEventHandler<ASPxClientDropDownEditBase>>;
+    /**
+     * Modifies the size of the drop down window in accordance with its content.
+     */
+    AdjustDropDownWindow(): void;
+    /**
+     * Invokes the editor's drop down window.
+     */
+    ShowDropDown(): void;
+    /**
+     * Closes the opened drop down window of the editor.
+     */
+    HideDropDown(): void;
+}
+/**
+ * Represents the client-side equivalent of the ASPxColorEdit control.
+ */
+interface ASPxClientColorEdit extends ASPxClientDropDownEditBase {
+    /**
+     * Fires after the selected color has been changed within the color editor via end-user interaction.
+     */
+    ColorChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientColorEdit>>;
+    /**
+     * This event is not in effect for the ASPxClientColorEdit. Use the ColorChanged event instead.
+     */
+    TextChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientColorEdit>>;
+    /**
+     * Returns the color editor's value.
+     */
+    GetColor(): string;
+    /**
+     * Specifies the color value for the color editor.
+     * @param value A string value specifying the editor color.
+     */
+    SetColor(value: string): void;
+    /**
+     * Indicates whether the automatic color item is selected.
+     */
+    IsAutomaticColorSelected(): boolean;
+}
+/**
+ * Represent the client-side equivalent of the ASPxComboBox control.
+ */
+interface ASPxClientComboBox extends ASPxClientDropDownEditBase {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientComboBox>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientComboBox>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientComboBox.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientComboBox>>;
+    /**
+     * Occurs on the client side after a different item in the list has been selected (focus has been moved from one item to another).
+     */
+    SelectedIndexChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientComboBox>>;
+    /**
+     * Specifies the text displayed within the editor's edit box.
+     * @param text A string value specifying the editor's text.
+     */
+    SetText(text: string): void;
+    /**
+     * Adds a new item to the editor specifying the item's display text and returns the index of the added item.
+     * @param text A string value specifying the item's display text.
+     */
+    AddItem(text: string): number;
+    /**
+     * Adds a new item to the editor specifying the item's display text and associated value, and returns the index of the added item.
+     * @param text A string value specifying the item's display text.
+     * @param value An object specifying the value associated with the item.
+     */
+    AddItem(text: string, value: Object): number;
+    /**
+     * Adds a new item to the editor specifying the item's display text, associated value and displayed image, and returns the index of the added item.
+     * @param text A string value specifying the item's display text.
+     * @param value An object specifying the value associated with the item.
+     * @param imageUrl A string value specifying the path to the image displayed by the item.
+     */
+    AddItem(text: string, value: Object, imageUrl: string): number;
+    /**
+     * Inserts a new item specified by its display text, associated value and displayed image into the editor's item collection, at the position specified.
+     * @param index An integer value representing the zero-based index of the position where the item should be inserted.
+     * @param text A string value specifying the item's display text.
+     * @param value An object specifying the value associated with the item.
+     * @param imageUrl A string value specifying the path to the image displayed by the item.
+     */
+    InsertItem(index: number, text: string, value: Object, imageUrl: string): void;
+    /**
+     * Inserts a new item specified by its display text and associated value into the editor's item collection, at the position specified.
+     * @param index An integer value representing the zero-based index of the position where the item should be inserted.
+     * @param text A string value specifying the item's display text.
+     * @param value An object specifying the value associated with the item.
+     */
+    InsertItem(index: number, text: string, value: Object): void;
+    /**
+     * Inserts a new item specified by its display text into the editor's item collection, at the position specified.
+     * @param index An integer value representing the zero-based index of the position where the item should be inserted.
+     * @param text A string value specifying the item's display text.
+     */
+    InsertItem(index: number, text: string): void;
+    /**
+     * Removes an item specified by its index from the client list editor.
+     * @param index An integer value representing the index of the list item to be removed.
+     */
+    RemoveItem(index: number): void;
+    /**
+     * Removes all items from the client combo box editor.
+     */
+    ClearItems(): void;
+    /**
+     * Prevents the client combobox editor from being rendered until the EndUpdate method is called.
+     */
+    BeginUpdate(): void;
+    /**
+     * Re-enables editor render operations after a call to the BeginUpdate method and forces an immediate re-rendering.
+     */
+    EndUpdate(): void;
+    /**
+     * Scrolls the editor's item list, so that the specified item becomes visible.
+     * @param index An integer value that specifies the item's index within the editor's client item list.
+     */
+    MakeItemVisible(index: number): void;
+    /**
+     * Returns an item specified by its index within the combo box editor's item collection.
+     * @param index An integer value specifying the zero-based index of the item to search for.
+     */
+    GetItem(index: number): ASPxClientListEditItem;
+    /**
+     * Returns a combo box item by its text.
+     * @param text A string that specifies the item's text.
+     */
+    FindItemByText(text: string): ASPxClientListEditItem;
+    /**
+     * Returns a combo box item by its value.
+     * @param value An object that specifies the item's value.
+     */
+    FindItemByValue(value: Object): ASPxClientListEditItem;
+    /**
+     * Gets the number of items contained in the editor's item collection.
+     */
+    GetItemCount(): number;
+    /**
+     * Returns the index of the selected item within the combo box editor.
+     */
+    GetSelectedIndex(): number;
+    /**
+     * Sets the combobox editor's selected item specified by its index.
+     * @param index An integer value specifying the zero-based index of the item to select.
+     */
+    SetSelectedIndex(index: number): void;
+    /**
+     * Returns the combo box editor's selected item.
+     */
+    GetSelectedItem(): ASPxClientListEditItem;
+    /**
+     * Sets the list editor's selected item.
+     * @param item An ASPxClientListEditItem object that specifies the item to select.
+     */
+    SetSelectedItem(item: ASPxClientListEditItem): void;
+    /**
+     * Gets the text displayed in the editor's edit box.
+     */
+    GetText(): string;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Adds a new item to the editor, specifying the item's display text, and returns the index of the added item.
+     * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of the corresponding columns within the editor's Columns collection.
+     */
+    AddItem(texts: string[]): number;
+    /**
+     * Adds a new item to the end of the control's items collection.
+     * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of the corresponding columns within the editor's Columns collection.
+     * @param value An object that represents the item's associated value.
+     */
+    AddItem(texts: string[], value: Object): number;
+    /**
+     * Adds a new item to the end of the control's items collection.
+     * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of the corresponding columns within the editor's Columns collection.
+     * @param value An object that represents the item's associated value.
+     * @param imageUrl A string value specifying the path to the image displayed by the item.
+     */
+    AddItem(texts: string[], value: Object, imageUrl: string): number;
+    /**
+     * Adds a new item to the control's items collection at the specified index.
+     * @param index An integer value that represents the index position.
+     * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of the corresponding columns within the editor's Columns collection.
+     * @param value An object that represents the item's associated value.
+     * @param imageUrl A String value specifying the path to the image displayed by the item.
+     */
+    InsertItem(index: number, texts: string[], value: Object, imageUrl: string): void;
+    /**
+     * Adds a new item to the control's items collection at the specified index.
+     * @param index An integer value that represents the index position.
+     * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of the corresponding columns within the editor's Columns collection.
+     * @param value An object that represents the item's associated value.
+     */
+    InsertItem(index: number, texts: string[], value: Object): void;
+    /**
+     * Adds a new item to the control's items collection at the specified index.
+     * @param index An integer value that represents the index position.
+     * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of the corresponding columns within the editor's Columns collection.
+     */
+    InsertItem(index: number, texts: string[]): void;
+    /**
+     * Determines whether the drop-down content is loaded; if not - loads the content.
+     * @param callbackFunction An object that is the JavaScript function that receives the callback data as a parameter. The function is performed after the combo box content is loaded.
+     */
+    EnsureDropDownLoaded(callbackFunction: Object): void;
+    /**
+     * Defines the HTML content for the specified combo box item.
+     * @param index An integer value specifying the zero-based index of the item.
+     * @param html A string value that is the HTML code defining the content of the combo box item.
+     */
+    SetItemHtml(index: number, html: string): void;
+    /**
+     * Sets the tooltip text for the combo box editor's item specified by its index.
+     * @param index An integer value specifying the zero-based index of the item.
+     * @param tooltip A string value specifying the tooltip text.
+     */
+    SetItemTooltip(index: number, tooltip: string): void;
+    /**
+     * Sets the CSS class for a combo box item specified by its index.
+     * @param index An integer value specifying the zero-based index of the item.
+     * @param className A string value specifying the CSS class name.
+     */
+    AddItemCssClass(index: number, className: string): void;
+    /**
+     * Removes the CSS class from a combo box item specified by its index.
+     * @param index An integer value specifying the zero-based index of the item.
+     * @param className A string value specifying the CSS class name.
+     */
+    RemoveItemCssClass(index: number, className: string): void;
+    /**
+     * Defines the HTML content for the specified combo box item's text cell.
+     * @param itemIndex An integer value specifying the zero-based index of the item.
+     * @param textCellIndex An integer value specifying the zero-based index of the item's text cell.
+     * @param html A string value that is the HTML code defining the content of the combo box item.
+     */
+    SetItemTextCellHtml(itemIndex: number, textCellIndex: number, html: string): void;
+    /**
+     * Sets the tooltip text for the text cell of the editor's item specified by its index.
+     * @param itemIndex An integer value specifying the zero-based index of the item.
+     * @param textCellIndex An integer value specifying the zero-based index of the item's text cell.
+     * @param tooltip A string value specifying the tooltip text.
+     */
+    SetItemTextCellTooltip(itemIndex: number, textCellIndex: number, tooltip: string): void;
+    /**
+     * Sets the CSS class for a combo box item's text cell specified by its index.
+     * @param itemIndex An integer value specifying the zero-based index of the item.
+     * @param textCellIndex An integer value specifying the zero-based index of the item's text cell.
+     * @param className A string value specifying the CSS class name.
+     */
+    AddItemTextCellCssClass(itemIndex: number, textCellIndex: number, className: string): void;
+    /**
+     * Removes the CSS class from a combo box item's text cell specified by its index.
+     * @param itemIndex An integer value specifying the zero-based index of the item.
+     * @param textCellIndex An integer value specifying the zero-based index of the item's text cell.
+     * @param className A string value specifying the CSS class name.
+     */
+    RemoveItemTextCellCssClass(itemIndex: number, textCellIndex: number, className: string): void;
+}
+/**
+ * Represents the client-side equivalent of the ASPxDateEdit control.
+ */
+interface ASPxClientDateEdit extends ASPxClientDropDownEditBase {
+    /**
+     * Fires after the selected date has been changed within the date editor.
+     */
+    DateChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientDateEdit>>;
+    /**
+     * Enables you to convert the value entered by an end user into the value that will be stored by the date editor.
+     */
+    ParseDate: ASPxClientEvent<ASPxClientParseDateEventHandler<ASPxClientDateEdit>>;
+    /**
+     * Allows you to disable the calendar's days.
+     */
+    CalendarCustomDisabledDate: ASPxClientEvent<ASPxClientCalendarCustomDisabledDateEventHandler<ASPxClientDateEdit>>;
+    /**
+     * This event is not in effect for the ASPxClientDateEdit. Use the DateChanged event instead.
+     */
+    TextChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientDateEdit>>;
+    /**
+     * Returns the calendar of the date editor.
+     */
+    GetCalendar(): ASPxClientCalendar;
+    /**
+     * Returns the built-in time edit control.
+     */
+    GetTimeEdit(): ASPxClientTimeEdit;
+    /**
+     * Specifies the date for the editor.
+     * @param date A DateTime object that is the date.
+     */
+    SetDate(date: Date): void;
+    /**
+     * Gets the date that is the editor's value.
+     */
+    GetDate(): Date;
+    /**
+     * Returns the number of days in a range selected within a date edit.
+     */
+    GetRangeDayCount(): number;
+    /**
+     * Gets the minimum date of the editor.
+     */
+    GetMinDate(): Date;
+    /**
+     * Sets the minimum date of the editor.
+     * @param date A DateTime object representing the minimum date.
+     */
+    SetMinDate(date: Date): void;
+    /**
+     * Gets the maximum date of the editor.
+     */
+    GetMaxDate(): Date;
+    /**
+     * Sets the maximum date of the editor.
+     * @param date A DateTime object representing the maximum date.
+     */
+    SetMaxDate(date: Date): void;
+}
+/**
+ * Provides data for the ParseDate client-side event that parses a string entered into a date editor.
+ */
+interface ASPxClientParseDateEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the value entered into the date editor by an end user.
+     * Value: The string value entered into the date editor by an end user.
+     */
+    value: string;
+    /**
+     * Gets or sets the edit value of the date editor.
+     * Value: A date/time value representing the edit value of the date editor.
+     */
+    date: Date;
+    /**
+     * Gets or sets a value specifying whether the event was handled.
+     * Value: true if the event was handled and default processing should not occur; false if the event should be handled using default processing.
+     */
+    handled: boolean;
+}
+/**
+ * A method that will handle the client ParseDate event, that parses a date editor's value when entered.
+ */
+interface ASPxClientParseDateEventHandler<S> {
+    /**
+     * A method that will handle the ParseDate event.
+     * @param source An object representing the event source. Identifies the button editor that raised the event.
+     * @param e An ASPxClientParseDateEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientParseDateEventArgs): void;
+}
+/**
+ * Represents a base for client editor objects realizing the dropdown editor functionality.
+ */
+interface ASPxClientDropDownEdit extends ASPxClientDropDownEditBase {
+    /**
+     * Obtains the key value associated with the text displayed within the editor's edit box.
+     */
+    GetKeyValue(): string;
+    /**
+     * Specifies the key value associated with the text displayed within the editor's edit box.
+     * @param keyValue A string specifying the key value associated with the editor's value (displayed text).
+     */
+    SetKeyValue(keyValue: string): void;
+}
+/**
+ * A method that will handle the client events involving a keyboard key being pressed or released.
+ */
+interface ASPxClientEditKeyEventHandler<S> {
+    /**
+     * A method that will handle the client events concerning a keyboard key being pressed.
+     * @param source The event source. This parameter identifies the editor which raised the event.
+     * @param e An ASPxClientEditKeyEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientEditKeyEventArgs): void;
+}
+/**
+ * Provides data for the client events involved with a key being pressed or released.
+ */
+interface ASPxClientEditKeyEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets a DHTML event object that relates to the processed event.
+     * Value: An object that maintains DHTML event-specific information.
+     */
+    htmlEvent: Object;
+}
+/**
+ * A method that will handle client validation events.
+ */
+interface ASPxClientEditValidationEventHandler<S> {
+    /**
+     * A method that will handle client validation events.
+     * @param source An object representing the event source. Identifies the button editor that raised the event.
+     * @param e An ASPxClientEditValidationEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientEditValidationEventArgs): void;
+}
+/**
+ * Provides data for the client events that are related to data validation (see Validate).
+ */
+interface ASPxClientEditValidationEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets or sets the error description.
+     * Value: A string representing the error description.
+     */
+    errorText: string;
+    /**
+     * Gets or sets a value specifying whether the validated value is valid.
+     * Value: true if the value is valid; otherwise, false.
+     */
+    isValid: boolean;
+    /**
+     * Gets or sets the editor's value being validated.
+     * Value: An object that represents the validated value.
+     */
+    value: string;
+}
+/**
+ * Represents the client ASPxFilterControl.
+ */
+interface ASPxClientFilterControl extends ASPxClientControl {
+    /**
+     * Occurs after a new filter expression has been applied.
+     */
+    Applied: ASPxClientEvent<ASPxClientFilterAppliedEventHandler<ASPxClientFilterControl>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientFilterControl>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientFilterControl>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientFilterControl.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientFilterControl>>;
+    /**
+     * Returns the filter expression.
+     */
+    GetFilterExpression(): string;
+    /**
+     * Returns the applied filter expression.
+     */
+    GetAppliedFilterExpression(): string;
+    /**
+     * Returns the editor used to edit operand values for the specified filter column.
+     * @param editorIndex An integer value that identifies the filter column by its index within the collection.
+     */
+    GetEditor(editorIndex: number): ASPxClientEditBase;
+    /**
+     * Returns a value indicating whether the filter expression being currently composed on the client side is valid - all expression conditions are filled.
+     */
+    IsFilterExpressionValid(): boolean;
+    /**
+     * Applies a filter constructed by an end-user.
+     */
+    Apply(): void;
+    /**
+     * Resets the current filter expression to a previously applied filter expression.
+     */
+    Reset(): void;
+}
+/**
+ * A method that will handle the Applied event.
+ */
+interface ASPxClientFilterAppliedEventHandler<S> {
+    /**
+     * A method that will handle the Applied event.
+     * @param source The event source.
+     * @param e An ASPxClientFilterAppliedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFilterAppliedEventArgs): void;
+}
+/**
+ * Provides data for the Applied event.
+ */
+interface ASPxClientFilterAppliedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the filter expression currently being applied.
+     * Value: A string value that specifies the filter expression currently being applied.
+     */
+    filterExpression: string;
+}
+/**
+ * Represents a base for client editor objects that display a list of items.
+ */
+interface ASPxClientListEdit extends ASPxClientEdit {
+    /**
+     * Occurs on the client side after a different item in the list has been selected (focus has been moved from one item to another).
+     */
+    SelectedIndexChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientListEdit>>;
+    /**
+     * Returns the list editor's selected item.
+     */
+    GetSelectedItem(): ASPxClientListEditItem;
+    /**
+     * Returns the index of the selected item within the list editor.
+     */
+    GetSelectedIndex(): number;
+    /**
+     * Sets the list editor's selected item.
+     * @param item An ASPxClientListEditItem object that specifies the item to select.
+     */
+    SetSelectedItem(item: ASPxClientListEditItem): void;
+    /**
+     * Sets the list editor's selected item specified by its index.
+     * @param index An integer value specifying the zero-based index of the item to select.
+     */
+    SetSelectedIndex(index: number): void;
+}
+/**
+ * Represents the client-side equivalent of the ListEditItem object.
+ */
+interface ASPxClientListEditItem {
+    /**
+     * Gets a value that indicates whether a list edit item is selected.
+     * Value: true if a list edit item is selected; otherwise, false.
+     */
+    selected: boolean;
+    /**
+     * Gets an editor to which the current item belongs.
+     * Value: An ASPxClientListEdit object that represents the item's owner editor.
+     */
+    listEditBase: ASPxClientListEdit;
+    /**
+     * Gets the item's index.
+     * Value: An integer value that represents the item's index within the corresponding editor's item collection.
+     */
+    index: number;
+    /**
+     * Gets the item's associated image.
+     * Value: A string value that represents the path to the image displayed by the item.
+     */
+    imageUrl: string;
+    /**
+     * Gets the item's display text.
+     * Value: A string value that represents the item's display text.
+     */
+    text: string;
+    /**
+     * Gets the item's associated value.
+     * Value: An object that represents the value associated with the item.
+     */
+    value: Object;
+    /**
+     * Returns the list item's value that corresponds to a column specified by its index.
+     * @param columnIndex An integer value that specifies the column's index within the editor's Columns collection.
+     */
+    GetColumnText(columnIndex: number): string;
+    /**
+     * Returns the list item's value that corresponds to a column specified by its field name.
+     * @param columnName A string value that specifies the column's field name defined via the FieldName property.
+     */
+    GetColumnText(columnName: string): string;
+}
+/**
+ * Represents the client-side equivalent of the ASPxListBox control.
+ */
+interface ASPxClientListBox extends ASPxClientListEdit {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientListBox>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientListBox>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientListBox.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientListBox>>;
+    /**
+     * Occurs on the client side when an end-user presses a key while the editor has focus.
+     */
+    KeyDown: ASPxClientEvent<ASPxClientEditKeyEventHandler<ASPxClientListBox>>;
+    /**
+     * Occurs on the client side when an end-user presses and releases a key while the editor has focus.
+     */
+    KeyPress: ASPxClientEvent<ASPxClientEditKeyEventHandler<ASPxClientListBox>>;
+    /**
+     * Occurs on the client side when an end-user releases a pressed key while the editor has focus.
+     */
+    KeyUp: ASPxClientEvent<ASPxClientEditKeyEventHandler<ASPxClientListBox>>;
+    /**
+     * Occurs on the client side after a different item in the list box has been selected (focus has been moved from one item to another).
+     */
+    SelectedIndexChanged: ASPxClientEvent<ASPxClientListEditItemSelectedChangedEventHandler<ASPxClientListBox>>;
+    /**
+     * Occurs on the client when the editor's item is double clicked.
+     */
+    ItemDoubleClick: ASPxClientEvent<ASPxClientEventHandler<ASPxClientListBox>>;
+    /**
+     * Gets the number of items contained in the editor's item collection.
+     */
+    GetItemCount(): number;
+    /**
+     * Returns an item specified by its index within the list box editor's item collection.
+     * @param index An integer value specifying the zero-based index of the item to search for.
+     */
+    GetItem(index: number): ASPxClientListEditItem;
+    /**
+     * Returns an array of the list editor's selected items indices.
+     */
+    GetSelectedIndices(): number[];
+    /**
+     * Returns an array of the list editor's selected items values.
+     */
+    GetSelectedValues(): Object[];
+    /**
+     * Returns an array of the list editor's selected items.
+     */
+    GetSelectedItems(): ASPxClientListEditItem[];
+    /**
+     * Selects all list box items.
+     */
+    SelectAll(): void;
+    /**
+     * Unselects all list box items.
+     */
+    UnselectAll(): void;
+    /**
+     * Selects the items with the specified indices within a list box.
+     * @param indices An array of integer values that represent the items indices.
+     */
+    SelectIndices(indices: number[]): void;
+    /**
+     * Unselects an array of the list box items with the specified indices.
+     * @param indices An array of integer values that represent the indices.
+     */
+    UnselectIndices(indices: number[]): void;
+    /**
+     * Selects the specified items within a list box.
+     * @param items An array of ASPxClientListEditItem objects that represent the items.
+     */
+    SelectItems(items: ASPxClientListEditItem[]): void;
+    /**
+     * Unselects an array of the specified list box items.
+     * @param items An array of ASPxClientListEditItem objects that represent the items.
+     */
+    UnselectItems(items: ASPxClientListEditItem[]): void;
+    /**
+     * Select the items with the specified values within a list box.
+     * @param values An array of Object[] objects that represent the item's values.
+     */
+    SelectValues(values: Object[]): void;
+    /**
+     * Unselects an array of the list box items with the specified values.
+     * @param values An array of Object[] objects that represent the values.
+     */
+    UnselectValues(values: Object[]): void;
+    /**
+     * Scrolls the editor's item list, so that the specified item becomes visible.
+     * @param index An integer value that specifies the item's index within the editor's client item list.
+     */
+    MakeItemVisible(index: number): void;
+    /**
+     * Initializes the ASPxClientListBox client object when its parent container becomes visible dynamically, on the client side.
+     */
+    InitOnContainerMadeVisible(): void;
+    /**
+     * Adds a new item to the editor, specifying the item's display text, and returns the index of the added item.
+     * @param text A string value specifying the item's display text.
+     */
+    AddItem(text: string): number;
+    /**
+     * Adds a new item to the editor, specifying the item's display text and associated value, and returns the index of the added item.
+     * @param text A string value specifying the item's display text.
+     * @param value An object specifying the value associated with the item.
+     */
+    AddItem(text: string, value: Object): number;
+    /**
+     * Adds a new item to the editor, specifying the item's display text, associated value and displayed image, and returns the index of the added item.
+     * @param text A string value specifying the item's display text.
+     * @param value An object specifying the value associated with the item.
+     * @param imageUrl A string value specifying the path to the image displayed by the item.
+     */
+    AddItem(text: string, value: Object, imageUrl: string): number;
+    /**
+     * Inserts a new item specified by its display text, associated value and displayed image into the editor's item collection, at the position specified.
+     * @param index An integer value representing the zero-based index of the position where the item should be inserted.
+     * @param text A string value specifying the item's display text.
+     * @param value An object specifying the value associated with the item.
+     * @param imageUrl A string value specifying the path to the image displayed by the item.
+     */
+    InsertItem(index: number, text: string, value: Object, imageUrl: string): void;
+    /**
+     * Inserts a new item specified by its display text and associated value into the editor's item collection, at the position specified.
+     * @param index An integer value representing the zero-based index of the position where the item should be inserted.
+     * @param text A string value specifying the item's display text.
+     * @param value An object specifying the value associated with the item.
+     */
+    InsertItem(index: number, text: string, value: Object): void;
+    /**
+     * Inserts a new item specified by its display text into the editor's item collection, at the position specified.
+     * @param index An integer value representing the zero-based index of the position where the item should be inserted.
+     * @param text A string value specifying the item's display text.
+     */
+    InsertItem(index: number, text: string): void;
+    /**
+     * Prevents the client list box editor from being rendered until the EndUpdate method is called.
+     */
+    BeginUpdate(): void;
+    /**
+     * Re-enables editor render operations after a call to the BeginUpdate method, and forces an immediate re-rendering.
+     */
+    EndUpdate(): void;
+    /**
+     * Removes all items from the client list box editor.
+     */
+    ClearItems(): void;
+    /**
+     * Removes an item specified by its index from the client list editor.
+     * @param index An integer value representing the index of the list item to be removed.
+     */
+    RemoveItem(index: number): void;
+    /**
+     * Returns a list box item by its text.
+     * @param text A string that specifies the item's text.
+     */
+    FindItemByText(text: string): ASPxClientListEditItem;
+    /**
+     * Returns a list box item by its value.
+     * @param value An object that specifies the item's value.
+     */
+    FindItemByValue(value: Object): ASPxClientListEditItem;
+    /**
+     * Sends a callback to the server, and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Adds a new item to the end of the editor's items collection, specifying the item's display text, and returns the index of the added item.
+     * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of the corresponding columns within the editor's Columns collection.
+     */
+    AddItem(texts: string[]): number;
+    /**
+     * Adds a new item to the end of the control's items collection.
+     * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of corresponding columns within the editor's Columns collection.
+     * @param value An object that represents the item's associated value.
+     */
+    AddItem(texts: string[], value: Object): number;
+    /**
+     * Adds a new item to the end of the editor's items collection, specifying the item's display text, associated value and displayed image, and returns the index of the added item.
+     * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of the corresponding columns within the editor's Columns collection.
+     * @param value An object that represents the item's associated value.
+     * @param imageUrl A String value specifying the path to the image displayed by the item.
+     */
+    AddItem(texts: string[], value: Object, imageUrl: string): number;
+    /**
+     * Adds a new item to the control's items collection at the specified index.
+     * @param index An integer value that represents the index position.
+     * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of the corresponding columns within the editor's Columns collection.
+     * @param value An object that represents the item's associated value.
+     * @param imageUrl A String value specifying the path to the image displayed by the item.
+     */
+    InsertItem(index: number, texts: string[], value: Object, imageUrl: string): void;
+    /**
+     * Adds a new item to the control's items collection at the specified index.
+     * @param index An integer value that represents the index position.
+     * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of the corresponding columns within the editor's Columns collection.
+     * @param value An object that represents the item's associated value.
+     */
+    InsertItem(index: number, texts: string[], value: Object): void;
+    /**
+     * Adds a new item to the control's items collection at the specified index.
+     * @param index An integer value that represents the index position.
+     * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of the corresponding columns within the editor's Columns collection.
+     */
+    InsertItem(index: number, texts: string[]): void;
+    /**
+     * Defines the HTML content for the specified list box item.
+     * @param index An integer value specifying the zero-based index of the item.
+     * @param html A string value that is the HTML code defining the content of the list box item.
+     */
+    SetItemHtml(index: number, html: string): void;
+    /**
+     * Sets the tooltip text for the list box editor's item specified by its index.
+     * @param index An integer value specifying the zero-based index of the item.
+     * @param tooltip A string value specifying the tooltip text.
+     */
+    SetItemTooltip(index: number, tooltip: string): void;
+    /**
+     * Sets the CSS class for a list box item specified by its index.
+     * @param index An integer value specifying the zero-based index of the item.
+     * @param className A string value specifying the CSS class name.
+     */
+    AddItemCssClass(index: number, className: string): void;
+    /**
+     * Removes the CSS class from a list box item specified by its index.
+     * @param index An integer value specifying the zero-based index of the item.
+     * @param className A string value specifying the CSS class name.
+     */
+    RemoveItemCssClass(index: number, className: string): void;
+    /**
+     * Defines the HTML content for the specified list box item's text cell.
+     * @param itemIndex An integer value specifying the zero-based index of the item.
+     * @param textCellIndex An integer value specifying the zero-based index of the item's text cell.
+     * @param html A string value that is the HTML code defining the content of the list box item.
+     */
+    SetItemTextCellHtml(itemIndex: number, textCellIndex: number, html: string): void;
+    /**
+     * Sets the tooltip text for the text cell of the editor's item specified by its index.
+     * @param itemIndex An integer value specifying the zero-based index of the item.
+     * @param textCellIndex An integer value specifying the zero-based index of the item's text cell.
+     * @param tooltip A string value specifying the tooltip text.
+     */
+    SetItemTextCellTooltip(itemIndex: number, textCellIndex: number, tooltip: string): void;
+    /**
+     * Sets the CSS class for a list box item's text cell specified by its index.
+     * @param itemIndex An integer value specifying the zero-based index of the item.
+     * @param textCellIndex An integer value specifying the zero-based index of the item's text cell.
+     * @param className A string value specifying the CSS class name.
+     */
+    AddItemTextCellCssClass(itemIndex: number, textCellIndex: number, className: string): void;
+    /**
+     * Removes the CSS class from a list box item's text cell specified by its index.
+     * @param itemIndex An integer value specifying the zero-based index of the item.
+     * @param textCellIndex An integer value specifying the zero-based index of the item's text cell.
+     * @param className A string value specifying the CSS class name.
+     */
+    RemoveItemTextCellCssClass(itemIndex: number, textCellIndex: number, className: string): void;
+}
+/**
+ * Serves as the base type for the ASPxClientRadioButtonList objects.
+ */
+interface ASPxClientCheckListBase extends ASPxClientListEdit {
+    /**
+     * Gets the number of items contained in the editor's item collection.
+     */
+    GetItemCount(): number;
+    /**
+     * Returns the editor's item specified by its index.
+     * @param index An integer value specifying the zero-based index of the item to be retrieved.
+     */
+    GetItem(index: number): ASPxClientListEditItem;
+}
+/**
+ * Represents the client-side equivalent of the ASPxRadioButtonList control.
+ */
+interface ASPxClientRadioButtonList extends ASPxClientCheckListBase {
+}
+/**
+ * A client-side equivalent of the ASPxCheckBoxList object.
+ */
+interface ASPxClientCheckBoxList extends ASPxClientCheckListBase {
+    /**
+     * Occurs on the client side after a different item in the check box list has been selected (focus has been moved from one item to another).
+     */
+    SelectedIndexChanged: ASPxClientEvent<ASPxClientListEditItemSelectedChangedEventHandler<ASPxClientCheckBoxList>>;
+    /**
+     * Returns an array of the check box list editor's selected items indices.
+     */
+    GetSelectedIndices(): number[];
+    /**
+     * Returns an array of the check box list editor's selected items values.
+     */
+    GetSelectedValues(): Object[];
+    /**
+     * Returns an array of the check box list editor's selected items.
+     */
+    GetSelectedItems(): ASPxClientListEditItem[];
+    /**
+     * Selects all check box list items.
+     */
+    SelectAll(): void;
+    /**
+     * Unselects all check box list items.
+     */
+    UnselectAll(): void;
+    /**
+     * Selects items with the specified indices within a check box list.
+     * @param indices An array of integer values that are the item indices.
+     */
+    SelectIndices(indices: number[]): void;
+    /**
+     * Selects the specified items within a check box list.
+     * @param items An array of ASPxClientListEditItem objects that are the items.
+     */
+    SelectItems(items: ASPxClientListEditItem[]): void;
+    /**
+     * Selects items with the specified values within a check box list.
+     * @param values An array of Object[] objects that are the item values.
+     */
+    SelectValues(values: Object[]): void;
+    /**
+     * Unselects items with the specified indices within a check box list.
+     * @param indices An array of integer values that are the item indices.
+     */
+    UnselectIndices(indices: number[]): void;
+    /**
+     * Unselects the specified items within a check box list.
+     * @param items An array of ASPxClientListEditItem objects that are the items.
+     */
+    UnselectItems(items: ASPxClientListEditItem[]): void;
+    /**
+     * Unselects items with the specified values within a check box list.
+     * @param values An array of Object[] objects that are the item values.
+     */
+    UnselectValues(values: Object[]): void;
+}
+/**
+ * A method that will handle the SelectedIndexChanged event.
+ */
+interface ASPxClientListEditItemSelectedChangedEventHandler<S> {
+    /**
+     * A method that will handle the SelectedIndexChanged event.
+     * @param source The event source.
+     * @param e An ASPxClientListEditItemSelectedChangedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientListEditItemSelectedChangedEventArgs): void;
+}
+/**
+ * Provides data for the SelectedIndexChanged event.
+ */
+interface ASPxClientListEditItemSelectedChangedEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the index of the item related to the event.
+     * Value: An integer value that represents the item's index within the corresponding editor's item collection.
+     */
+    index: number;
+    /**
+     * Gets whether the item has been selected.
+     * Value: true if the item is selected; otherwise, false.
+     */
+    isSelected: boolean;
+}
+/**
+ * Represents a client-side equivalent of the ASPxProgressBar control.
+ */
+interface ASPxClientProgressBar extends ASPxClientEditBase {
+    /**
+     * Sets the position of the operation's progress.
+     * @param position An integer value specifying the progress position.
+     */
+    SetPosition(position: number): void;
+    /**
+     * Gets the position of the operation's progress.
+     */
+    GetPosition(): number;
+    /**
+     * Sets the pattern used to format the displayed text for the progress bar.
+     * @param text A  value that is the format pattern.
+     */
+    SetCustomDisplayFormat(text: string): void;
+    /**
+     * Returns the text displayed within the progress bar.
+     */
+    GetDisplayText(): string;
+    /**
+     * Sets the percentage representation of the progress position.
+     */
+    GetPercent(): number;
+    /**
+     * Sets the minimum range value of the progress bar.
+     * @param min An integer value specifying the minimum value of the progress bar range.
+     */
+    SetMinimum(min: number): void;
+    /**
+     * Sets the maximum range value of the progress bar.
+     * @param max An integer value specifying the maximum value of the progress bar range.
+     */
+    SetMaximum(max: number): void;
+    /**
+     * Gets the minimum range value of the progress bar.
+     */
+    GetMinimum(): number;
+    /**
+     * Gets the maximum range value of the progress bar.
+     */
+    GetMaximum(): number;
+    /**
+     * Sets the minimum and maximum range values of the progress bar.
+     * @param minValue An integer value specifying the minimum value of the progress bar range.
+     * @param maxValue An integer value specifying the maximum value of the progress bar range.
+     */
+    SetMinMaxValues(minValue: number, maxValue: number): void;
+}
+/**
+ * Represents a base class for the ASPxClientSpinEdit object.
+ */
+interface ASPxClientSpinEditBase extends ASPxClientButtonEditBase {
+    /**
+     * This event is not in effect for the ASPxClientSpinEditBase. Use the ASPxClientTimeEdit.
+     */
+    TextChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientSpinEditBase>>;
+}
+/**
+ * Represents the client-side equivalent of the ASPxSpinEdit control.
+ */
+interface ASPxClientSpinEdit extends ASPxClientSpinEditBase {
+    /**
+     * Occurs on the client side when the editor's value is altered in any way.
+     */
+    NumberChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientSpinEdit>>;
+    /**
+     * Specifies the value of the spin edit control on the client side.
+     * @param number A Decimal value specifying the control value.
+     */
+    SetValue(number: number): void;
+    /**
+     * Sets the spin editor's value.
+     * @param number A decimal number specifying the value to assign to the spin editor.
+     */
+    SetNumber(number: number): void;
+    /**
+     * Gets a number which represents the spin editor's value.
+     */
+    GetNumber(): number;
+    /**
+     * Returns the text displayed within the editor.
+     */
+    GetText(): string;
+    /**
+     * Sets the minimum value of the editor.
+     * @param value A decimal value specifying the minimum value of the editor.
+     */
+    SetMinValue(value: number): void;
+    /**
+     * Gets the minimum value of the editor.
+     */
+    GetMinValue(): number;
+    /**
+     * Sets the maximum value of the editor.
+     * @param value A decimal value specifying the maximum value of the editor.
+     */
+    SetMaxValue(value: number): void;
+    /**
+     * Gets the maximum value of the editor.
+     */
+    GetMaxValue(): number;
+    /**
+     * Changes the editor's value.
+     * @param value An object representing the data to be assigned to the editor's edit value.
+     */
+    SetValue(value: Object): void;
+}
+/**
+ * Represents the client-side equivalent of the ASPxTimeEdit control.
+ */
+interface ASPxClientTimeEdit extends ASPxClientSpinEditBase {
+    /**
+     * Fires after the selected date has been changed within the time editor.
+     */
+    DateChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientTimeEdit>>;
+    /**
+     * Specifies the date for the editor.
+     * @param date A DateTime object that is the date.
+     */
+    SetDate(date: Date): void;
+    /**
+     * Gets the date that is the editor's value.
+     */
+    GetDate(): Date;
+}
+/**
+ * Represents a base for client-side static editors whose values cannot be visually changed by end users.
+ */
+interface ASPxClientStaticEdit extends ASPxClientEditBase {
+    /**
+     * Occurs on the client side after an end-user clicks within a static editor.
+     */
+    Click: ASPxClientEvent<ASPxClientEditEventHandler<ASPxClientStaticEdit>>;
+}
+/**
+ * A method that will handle client-side events which concern clicking within editors.
+ */
+interface ASPxClientEditEventHandler<S> {
+    /**
+     * A method that will handle client-side events which concern clicking within editors.
+     * @param source An object representing the event source. Identifies the editor that raised the event.
+     * @param e An ASPxClientEditClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientEditClickEventArgs): void;
+}
+/**
+ * Provides data for the client-side events which concern clicking within editors.
+ */
+interface ASPxClientEditClickEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the HTML element related to the event.
+     * Value: An object that represents the clicked HTML element.
+     */
+    htmlElement: Object;
+    /**
+     * Gets a DHTML event object that relates to the processed event.
+     * Value: An object that maintains DHTML event-specific information.
+     */
+    htmlEvent: Object;
+}
+/**
+ * Represents the client-side equivalent of the ASPxHyperLink control.
+ */
+interface ASPxClientHyperLink extends ASPxClientStaticEdit {
+    /**
+     * Gets an URL which defines the navigation location for the editor's hyperlink.
+     */
+    GetNavigateUrl(): string;
+    /**
+     * Specifies an URL which defines the navigation location for the editor's hyperlink.
+     * @param url A string value which specifies an URL to where the client web browser will navigate when a hyperlink in the editor is clicked.
+     */
+    SetNavigateUrl(url: string): void;
+    /**
+     * Gets the text caption displayed for the hyperlink in the hyperlink editor.
+     */
+    GetText(): string;
+    /**
+     * Specifies the text caption displayed for the hyperlink in the hyperlink editor.
+     * @param text A string value specifying the text caption for the hyperlink in the editor.
+     */
+    SetText(text: string): void;
+}
+/**
+ * Represents a base for client-side editors which are capable of displaying images.
+ */
+interface ASPxClientImageBase extends ASPxClientStaticEdit {
+    /**
+     * Sets the size of the image displayed within the image editor.
+     * @param width An integer value that specifies the image's width.
+     * @param height An integer value that specifies the image's height.
+     */
+    SetSize(width: number, height: number): void;
+}
+/**
+ * Represents the client-side equivalent of the ASPxImage control.
+ */
+interface ASPxClientImage extends ASPxClientImageBase {
+    /**
+     * Returns the URL pointing to the image displayed within the image editor.
+     */
+    GetImageUrl(): string;
+    /**
+     * Sets the URL which points to the image displayed within the image editor.
+     * @param url A string value specifying the URL to the image displayed within the editor.
+     */
+    SetImageUrl(url: string): void;
+}
+/**
+ * Represents the client-side equivalent of the ASPxLabel control.
+ */
+interface ASPxClientLabel extends ASPxClientStaticEdit {
+    /**
+     * Returns the text displayed within the editor.
+     */
+    GetText(): string;
+    /**
+     * Sets the text to be displayed within the editor.
+     * @param text A string value specifying the text to be displayed within the editor.
+     */
+    SetText(text: string): void;
+}
+/**
+ * Represents the client-side equivalent of the ASPxTextBox control.
+ */
+interface ASPxClientTextBox extends ASPxClientTextBoxBase {
+}
+/**
+ * Represents the client-side equivalent of the ASPxMemo control.
+ */
+interface ASPxClientMemo extends ASPxClientTextEdit {
+}
+/**
+ * Represents the client-side equivalent of the ASPxButtonEdit control.
+ */
+interface ASPxClientButtonEdit extends ASPxClientButtonEditBase {
+}
+/**
+ * A method that will handle the ButtonClick event.
+ */
+interface ASPxClientButtonEditClickEventHandler<S> {
+    /**
+     * A method that will handle the ButtonClick event.
+     * @param source An object representing the event source. Identifies the button editor that raised the event.
+     * @param e An ASPxClientButtonEditClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientButtonEditClickEventArgs): void;
+}
+/**
+ * Provides data for the ButtonClick event.
+ */
+interface ASPxClientButtonEditClickEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the index of the clicked button.
+     * Value: An integer value representing the index of the clicked button within the editor's Buttons collection.
+     */
+    buttonIndex: number;
+}
+/**
+ * A client-side equivalent of the ASPxTokenBox object.
+ */
+interface ASPxClientTokenBox extends ASPxClientComboBox {
+    /**
+     * Fires on the client side after the token collection has been changed.
+     */
+    TokensChanged: ASPxClientEvent<ASPxClientEventHandler<ASPxClientTokenBox>>;
+    /**
+     * Adds a new token with the specified text to the end of the control's token collection.
+     * @param text A string value specifying the token's text.
+     */
+    AddToken(text: string): void;
+    /**
+     * Removes a token specified by its text from the client token box.
+     * @param text A string value that is the text of the token to be removed.
+     */
+    RemoveTokenByText(text: string): void;
+    /**
+     * Removes a token specified by its index from the client token box.
+     * @param index An integer value that is the index of the token to be removed.
+     */
+    RemoveToken(index: number): void;
+    /**
+     * Returns an HTML span element that corresponds to the specified token.
+     * @param index An integer value that is the token index.
+     */
+    GetTokenHtmlElement(index: number): Object;
+    /**
+     * Returns an HTML span element that corresponds to the specified token's text.
+     * @param index An integer value that is the token index.
+     */
+    GetTokenTextHtmlElement(index: number): Object;
+    /**
+     * Returns an HTML span element that corresponds to the specified token's remove button.
+     * @param index An integer value that is the token index.
+     */
+    GetTokenRemoveButtonHtmlElement(index: number): Object;
+    /**
+     * Returns a collection of tokens.
+     */
+    GetTokenCollection(): string[];
+    /**
+     * Sets a collection of tokens.
+     * @param collection A  object that is the collection of tokens.
+     */
+    SetTokenCollection(collection: string[]): void;
+    /**
+     * Removes all tokens contained in the token box.
+     */
+    ClearTokenCollection(): void;
+    /**
+     * Returns the index of a token specified by its text.
+     * @param text A string value that specifies the text of the token.
+     */
+    GetTokenIndexByText(text: string): number;
+    /**
+     * Gets the token texts, separated with a sign, specified by the TextSeparator property.
+     */
+    GetText(): string;
+    /**
+     * Sets the token texts, separated with a sign, specified by the TextSeparator property.
+     * @param text A string value that is the token texts separated with a text separator.
+     */
+    SetText(text: string): void;
+    /**
+     * Gets the editor value.
+     */
+    GetValue(): string;
+    /**
+     * Sets the editor value.
+     * @param value A string that is the editor value.
+     */
+    SetValue(value: string): void;
+    /**
+     * Returns a value that indicates if the specified token (string) is a custom token.
+     * @param text A string value that is a token.
+     * @param caseSensitive true, if tokens are case sensitive; otherwise, false.
+     */
+    IsCustomToken(text: string, caseSensitive: boolean): boolean;
+    /**
+     * Changes the editor's value.
+     * @param value An object representing the data to be assigned to the editor's edit value.
+     */
+    SetValue(value: Object): void;
+}
+/**
+ * The client-side equivalent of the ASPxTrackBar control.
+ */
+interface ASPxClientTrackBar extends ASPxClientEdit {
+    /**
+     * Fires on the client side before a track bar position is changed and allows you to cancel the action.
+     */
+    PositionChanging: ASPxClientEvent<ASPxClientTrackBarPositionChangingEventHandler<ASPxClientTrackBar>>;
+    /**
+     * Fires after the editor's position has been changed.
+     */
+    PositionChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientTrackBar>>;
+    /**
+     * Occurs on the client-side when an end-user moves a cursor while the drag handle is held down.
+     */
+    Track: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientTrackBar>>;
+    /**
+     * Occurs on the client-side when an end-user presses a drag handle and moves it.
+     */
+    TrackStart: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientTrackBar>>;
+    /**
+     * Occurs on the client-side when an end-user releases a drag handle after moving it.
+     */
+    TrackEnd: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientTrackBar>>;
+    /**
+     * Returns a track bar item index by the item's value.
+     * @param value An object that specifies the item's value.
+     */
+    GetItemIndexByValue(value: Object): number;
+    /**
+     * Returns a track bar item's associated value.
+     * @param index An integer value that specifies the required item's index.
+     */
+    GetItemValue(index: number): Object;
+    /**
+     * Returns a track bar item text.
+     * @param index An integer value that specifies the required item's index.
+     */
+    GetItemText(index: number): string;
+    /**
+     * Returns a track bar item's tooltip text.
+     * @param index An integer value that specifies the required item's index.
+     */
+    GetItemToolTip(index: number): string;
+    /**
+     * Returns the number of the track bar items that are maintained by the item collection.
+     */
+    GetItemCount(): number;
+    /**
+     * Specifies the secondary drag handle position.
+     * @param position A  value that specifies the position.
+     */
+    SetPositionEnd(position: number): void;
+    /**
+     * Specifies the main drag handle position.
+     * @param position A  value that specifies the position.
+     */
+    SetPositionStart(position: number): void;
+    /**
+     * Returns the secondary drag handle position.
+     */
+    GetPositionEnd(): number;
+    /**
+     * Returns the main drag handle position.
+     */
+    GetPositionStart(): number;
+    /**
+     * Gets a drag handle position.
+     */
+    GetPosition(): number;
+    /**
+     * Specifies a drag handle position.
+     * @param position A  value that specifies the position.
+     */
+    SetPosition(position: number): void;
+}
+/**
+ * A method that will handle the client PositionChanging event.
+ */
+interface ASPxClientTrackBarPositionChangingEventHandler<S> {
+    /**
+     * A method that will handle the PositionChanging event.
+     * @param source The event source. Identifies the ASPxTrackBar control that raised the event.
+     * @param e A ASPxClientTrackBarPositionChangingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTrackBarPositionChangingEventArgs): void;
+}
+/**
+ * Provides data for the PositionChanging event.
+ */
+interface ASPxClientTrackBarPositionChangingEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets or sets a value indicating whether the action which raised the event should be canceled.
+     * Value: true if the action that raised the event should be canceled; otherwise, false.
+     */
+    cancel: boolean;
+    /**
+     * Gets the current drag handle position.
+     * Value: A <see cref="Decimal" /> value that is the drag handle position.
+     */
+    currentPosition: number;
+    /**
+     * Gets the current secondary drag handle position.
+     * Value: A <see cref="Decimal" /> value that is the drag handle position.
+     */
+    currentPositionEnd: number;
+    /**
+     * Gets the current main drag handle position.
+     * Value: A <see cref="Decimal" /> value that is the drag handle position.
+     */
+    currentPositionStart: number;
+    /**
+     * Gets a position where the drag handle is being moved.
+     * Value: A <see cref="Decimal" /> value that is the drag handle position.
+     */
+    newPosition: number;
+    /**
+     * Gets a position where the secondary drag handle is being moved.
+     * Value: A <see cref="Decimal" /> value that is the drag handle position.
+     */
+    newPositionEnd: number;
+    /**
+     * Gets a position where the main drag handle is being moved.
+     * Value: A <see cref="Decimal" /> value that is the drag handle position.
+     */
+    newPositionStart: number;
+}
+/**
+ * Represents the client-side equivalent of the ASPxValidationSummary control.
+ */
+interface ASPxClientValidationSummary extends ASPxClientControl {
+    /**
+     * Occurs on the client side when the validation summary's visibility is changed.
+     */
+    VisibilityChanged: ASPxClientEvent<ASPxClientValidationSummaryVisibilityChangedEventHandler<ASPxClientValidationSummary>>;
+}
+/**
+ * A method that will handle the VisibilityChanged event.
+ */
+interface ASPxClientValidationSummaryVisibilityChangedEventHandler<S> {
+    /**
+     * A method that will handle the VisibilityChanged client event.
+     * @param source An object representing the event source.
+     * @param e A ASPxClientValidationSummaryVisibilityChangedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientValidationSummaryVisibilityChangedEventArgs): void;
+}
+/**
+ * Provides data for the VisibilityChanged event.
+ */
+interface ASPxClientValidationSummaryVisibilityChangedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets or sets whether the editor is visible on the client.
+     * Value: true if the editor is visible; otherwise, false.
+     */
+    visible: boolean;
+}
+/**
+ * Represents the client ASPxGaugeControl.
+ */
+interface ASPxClientGaugeControl extends ASPxClientControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientGaugeControl>>;
+    /**
+     * Occurs on the client after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientGaugeControl>>;
+    /**
+     * Fires when errors have occurred during callback processing.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientGaugeControl>>;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * Lists values that specify the position relative to the target column in which a moved column should be placed.
+ */
+interface ASPxClientGridColumnMovingTargetPosition {
+    /**
+     * A moved column should be placed to the right of the target column.
+     */
+    Right: number;
+    /**
+     * A moved column should be placed to the left of the target column.
+     */
+    Left: number;
+    /**
+     * A moved column should be placed at the top of the target column.
+     */
+    Top: number;
+    /**
+     * A moved column should be placed at the bottom of the target column.
+     */
+    Bottom: number;
+}
+/**
+ * Represents the client ASPxGridView.
+ */
+interface ASPxClientGridBase extends ASPxClientControl {
+    /**
+     * Fires after a toolbar item has been clicked.
+     */
+    ToolbarItemClick: ASPxClientEvent<ASPxClientGridToolbarItemClickEventHandler<ASPxClientGridBase>>;
+    /**
+     * Returns a toolbar specified by its name.
+     * @param name A string value specifying the toolbar name.
+     */
+    GetToolbarByName(name: string): ASPxClientMenu;
+    /**
+     * Returns a grid's toolbar specified by its index.
+     * @param index An integer value specifying the zero-based index of the toolbar object to retrieve.
+     */
+    GetToolbar(index: number): ASPxClientMenu;
+}
+/**
+ * Serves as a base object implementing the client column functionality.
+ */
+interface ASPxClientGridColumnBase {
+}
+/**
+ * A method that will handle the ToolbarItemClick event.
+ */
+interface ASPxClientGridToolbarItemClickEventHandler<S> {
+    /**
+     * A method that will handle the ToolbarItemClick event.
+     * @param source The event source.
+     * @param e An ASPxClientGridToolbarItemClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridToolbarItemClickEventArgs): void;
+}
+/**
+ * Provides data for the ToolbarItemClick event.
+ */
+interface ASPxClientGridToolbarItemClickEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the toolbar index.
+     * Value: An integer value that is the toolbar index.
+     */
+    toolbarIndex: number;
+    /**
+     * Gets the toolbar name.
+     * Value: A string value that is the toolbar name.
+     */
+    toolbarName: string;
+    /**
+     * Gets the clicked toolbar item.
+     * Value: A ASPxClientMenuItem object that is the toolbar item.
+     */
+    item: ASPxClientMenuItem;
+    /**
+     * Specifies whether a postback or a callback is used to finally process the event on the server side.
+     * Value: true to perform the round trip to the server side via postback; false to perform the round trip to the server side via callback.
+     */
+    usePostBack: boolean;
+}
+/**
+ * The client-side equivalent of the ASPxGridLookup control.
+ */
+interface ASPxClientGridLookup extends ASPxClientDropDownEditBase {
+    /**
+     * Fires on the client when a data row is clicked within the built-in dropdown grid.
+     */
+    RowClick: ASPxClientEvent<ASPxClientGridViewRowClickEventHandler<ASPxClientGridLookup>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientGridLookup>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientGridLookup>>;
+    /**
+     * Returns a client object representing the built-in dropdown grid.
+     */
+    GetGridView(): ASPxClientGridView;
+    /**
+     * Confirms the current selection made by an end-user within the editor's dropdown grid.
+     */
+    ConfirmCurrentSelection(): void;
+    /**
+     * Cancels the current selection made by an end-user within the editor's dropdown grid and rolls back to the last confirmed selection. The selection can be confirmed by either pressing the Enter key or calling the ConfirmCurrentSelection method.
+     */
+    RollbackToLastConfirmedSelection(): void;
+}
+/**
+ * Represents the client ASPxCardView.
+ */
+interface ASPxClientCardView extends ASPxClientGridBase {
+    /**
+     * Provides access to the batch editing client API.
+     * Value: A <see cref="ASPxClientCardViewBatchEditApi" /> object that exposes the batch editing client API methods.
+     */
+    batchEditApi: ASPxClientCardViewBatchEditApi;
+    /**
+     * Occurs when a custom command button has been clicked.
+     */
+    CustomButtonClick: ASPxClientEvent<ASPxClientCardViewCustomButtonEventHandler<ASPxClientCardView>>;
+    /**
+     * Fires after the selection has been changed.
+     */
+    SelectionChanged: ASPxClientEvent<ASPxClientCardViewSelectionEventHandler<ASPxClientCardView>>;
+    /**
+     * Enables you to prevent columns from being sorted.
+     */
+    ColumnSorting: ASPxClientEvent<ASPxClientCardViewColumnCancelEventHandler<ASPxClientCardView>>;
+    /**
+     * Occurs when a grid switches to batch edit mode.
+     */
+    BatchEditStartEditing: ASPxClientEvent<ASPxClientCardViewBatchEditStartEditingEventHandler<ASPxClientCardView>>;
+    /**
+     * Occurs when a grid leaves batch edit mode.
+     */
+    BatchEditEndEditing: ASPxClientEvent<ASPxClientCardViewBatchEditEndEditingEventHandler<ASPxClientCardView>>;
+    /**
+     * Enables you to prevent a batch edit confirmation message from being displayed.
+     */
+    BatchEditConfirmShowing: ASPxClientEvent<ASPxClientCardViewBatchEditConfirmShowingEventHandler<ASPxClientCardView>>;
+    /**
+     * Enables you to provide navigation for editors contained in a templated cell in Batch Edit mode.
+     */
+    BatchEditTemplateCellFocused: ASPxClientEvent<ASPxClientCardViewBatchEditTemplateCellFocusedEventHandler<ASPxClientCardView>>;
+    /**
+     * Enables you to specify whether card data is valid and provide an error text.
+     */
+    BatchEditCardValidating: ASPxClientEvent<ASPxClientCardViewBatchEditCardValidatingEventHandler<ASPxClientCardView>>;
+    /**
+     * Occurs on the client side before data changes are saved in batch edit mode.
+     */
+    BatchEditChangesSaving: ASPxClientEvent<ASPxClientCardViewBatchEditChangesSavingEventHandler<ASPxClientCardView>>;
+    /**
+     * Occurs on the client side before data changes are canceled in batch edit mode.
+     */
+    BatchEditChangesCanceling: ASPxClientEvent<ASPxClientCardViewBatchEditChangesCancelingEventHandler<ASPxClientCardView>>;
+    /**
+     * Occurs on the client side before a card is inserted in batch edit mode.
+     */
+    BatchEditCardInserting: ASPxClientEvent<ASPxClientCardViewBatchEditCardInsertingEventHandler<ASPxClientCardView>>;
+    /**
+     * Occurs on the client side before a card is deleted in batch edit mode.
+     */
+    BatchEditCardDeleting: ASPxClientEvent<ASPxClientCardViewBatchEditCardDeletingEventHandler<ASPxClientCardView>>;
+    /**
+     * Occurs on the client side when the focused cell is about to be changed.
+     */
+    FocusedCellChanging: ASPxClientEvent<ASPxClientCardViewFocusedCellChangingEventHandler<ASPxClientCardView>>;
+    /**
+     * Fires on the client when a card is clicked.
+     */
+    CardClick: ASPxClientEvent<ASPxClientCardViewCardClickEventHandler<ASPxClientCardView>>;
+    /**
+     * Fires on the client when a card is double clicked.
+     */
+    CardDblClick: ASPxClientEvent<ASPxClientCardViewCardClickEventHandler<ASPxClientCardView>>;
+    /**
+     * Fires in response to changing card focus.
+     */
+    FocusedCardChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientCardView>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientCardView>>;
+    /**
+     * Occurs on the client after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientCardView>>;
+    /**
+     * Fires on the client if any unhandled server error occurs during server-side processing of a callback sent by the ASPxClientCardView.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientCardView>>;
+    /**
+     * Fires after the customization window has been closed.
+     */
+    CustomizationWindowCloseUp: ASPxClientEvent<ASPxClientEventHandler<ASPxClientCardView>>;
+    /**
+     * Returns the value of the specified edit cell.
+     * @param column An ASPxClientCardViewColumn object that represents the data column within the client grid.
+     */
+    GetEditValue(column: ASPxClientCardViewColumn): string;
+    /**
+     * Returns the value of the specified edit cell.
+     * @param columnIndex An integer value that identifies the data column within the grid's column collection.
+     */
+    GetEditValue(columnIndex: number): string;
+    /**
+     * Returns the value of the specified edit cell.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     */
+    GetEditValue(columnFieldNameOrId: string): string;
+    /**
+     * Moves focus to the specified edit cell within the edited card.
+     * @param column An ASPxClientCardViewColumn object that represents the data column within the client grid.
+     */
+    FocusEditor(column: ASPxClientCardViewColumn): void;
+    /**
+     * Moves focus to the specified edit cell within the edited card.
+     * @param columnIndex An integer value that specifies the column's position within the columns collection.
+     */
+    FocusEditor(columnIndex: number): void;
+    /**
+     * Moves focus to the specified edit cell within the edited card.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     */
+    FocusEditor(columnFieldNameOrId: string): void;
+    /**
+     * Sets the value of the specified edit cell.
+     * @param column An ASPxClientCardViewColumn object that represents the data column within the client grid.
+     * @param value A string value that specifies the edit cell's new value.
+     */
+    SetEditValue(column: ASPxClientCardViewColumn, value: string): void;
+    /**
+     * Sets the value of the specified edit cell.
+     * @param columnIndex An integer value that identifies the data column within the grid's column collection.
+     * @param value A string value that specifies the edit cell's new value.
+     */
+    SetEditValue(columnIndex: number, value: string): void;
+    /**
+     * Sets the value of the specified edit cell.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     * @param value A string value that specifies the edit cell's new value.
+     */
+    SetEditValue(columnFieldNameOrId: string, value: string): void;
+    /**
+     * Displays the Filter Control.
+     */
+    ShowFilterControl(): void;
+    /**
+     * Hides the Filter Control.
+     */
+    CloseFilterControl(): void;
+    /**
+     * Enables or disables the current filter.
+     * @param isFilterEnabled true to enable the current filter; otherwise, false.
+     */
+    SetFilterEnabled(isFilterEnabled: boolean): void;
+    /**
+     * Returns the current vertical scroll position of the grid's content.
+     */
+    GetVerticalScrollPosition(): number;
+    /**
+     * Specifies the vertical scroll position for the grid's content.
+     * @param position An integer value specifying the vertical scroll position.
+     */
+    SetVerticalScrollPosition(position: number): void;
+    /**
+     * Gets information about a focused cell.
+     */
+    GetFocusedCell(): ASPxClientCardViewCellInfo;
+    /**
+     * Focuses the specified cell.
+     * @param cardVisibleIndex An  value that specifies the visible index of the card.
+     * @param columnIndex A zero-based index that identifies the column in the column collection (the column's Index property value).
+     */
+    SetFocusedCell(cardVisibleIndex: number, columnIndex: number): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param column An ASPxClientCardViewColumn object that represents the data column.
+     */
+    SortBy(column: ASPxClientCardViewColumn): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     */
+    SortBy(columnIndex: number): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     */
+    SortBy(columnFieldNameOrId: string): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param column An ASPxClientCardViewColumn object that represents the data column.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     */
+    SortBy(column: ASPxClientCardViewColumn, sortOrder: string): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     */
+    SortBy(columnIndex: number, sortOrder: string): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     */
+    SortBy(columnFieldNameOrId: string, sortOrder: string): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param column An ASPxClientCardViewColumn object that represents the data column.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     */
+    SortBy(column: ASPxClientCardViewColumn, sortOrder: string, reset: boolean): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     */
+    SortBy(columnIndex: number, sortOrder: string, reset: boolean): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     */
+    SortBy(columnFieldNameOrId: string, sortOrder: string, reset: boolean): void;
+    /**
+     * Sorts data by the specified data column's values, and places the column to the specified position among the sorted columns.
+     * @param column An ASPxClientCardViewColumn object that represents the data column.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     * @param sortIndex 
+     */
+    SortBy(column: ASPxClientCardViewColumn, sortOrder: string, reset: boolean, sortIndex: number): void;
+    /**
+     * Sorts data by the specified data column's values, and places the column to the specified position among the sorted columns.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     * @param sortIndex An integer value that specifies the zero-based column's index among the sorted columns. -1 if data is not sorted by this column.
+     */
+    SortBy(columnIndex: number, sortOrder: string, reset: boolean, sortIndex: number): void;
+    /**
+     * Sorts data by the specified data column's values, and places the column to the specified position among the sorted columns.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     * @param sortIndex An integer value that specifies the zero-based column's index among the sorted columns. -1 if data is not sorted by this column.
+     */
+    SortBy(columnFieldNameOrId: string, sortOrder: string, reset: boolean, sortIndex: number): void;
+    /**
+     * Hides the specified column.
+     * @param column An ASPxClientCardViewColumn object that represents the column to hide.
+     */
+    MoveColumn(column: ASPxClientCardViewColumn): void;
+    /**
+     * Hides the specified column.
+     * @param columnIndex An integer value that specifies the absolute index of the column to hide.
+     */
+    MoveColumn(columnIndex: number): void;
+    /**
+     * Hides the specified column.
+     * @param columnFieldNameOrId A string value that identifies the column to be hidden by the name of the data source field to which the column is bound, or by the column's name.
+     */
+    MoveColumn(columnFieldNameOrId: string): void;
+    /**
+     * Moves the specified column to the specified visual position within the ASPxCardView.
+     * @param column An ASPxClientCardViewColumn object that represents the column to move.
+     * @param moveToColumnVisibleIndex An integer value that specifies the column's position among the visible columns within the ASPxCardView.
+     */
+    MoveColumn(column: ASPxClientCardViewColumn, moveToColumnVisibleIndex: number): void;
+    /**
+     * Moves the specified column to the specified visual position within the ASPxCardView.
+     * @param columnIndex An integer value that specifies the absolute index of the column to move.
+     * @param moveToColumnVisibleIndex An integer value that specifies the column's position among the visible columns within the grid.
+     */
+    MoveColumn(columnIndex: number, moveToColumnVisibleIndex: number): void;
+    /**
+     * Moves the specified column to the specified visual position within the ASPxCardView.
+     * @param columnFieldNameOrId A string value that identifies the column to be moved by the name of the data source field to which the column is bound or by the column's name.
+     * @param moveToColumnVisibleIndex An integer value that specifies the column's position among the visible columns within the ASPxCardView.
+     */
+    MoveColumn(columnFieldNameOrId: string, moveToColumnVisibleIndex: number): void;
+    /**
+     * Moves the specified column to the specified visual position within the ASPxCardView.
+     * @param column An ASPxClientCardViewColumn object that represents the column to move.
+     * @param moveToColumnVisibleIndex An integer value that identifies the target column displayed within the CardView.
+     * @param moveBefore true, to move the column before the target column; otherwise, false.
+     */
+    MoveColumn(column: ASPxClientCardViewColumn, moveToColumnVisibleIndex: number, moveBefore: boolean): void;
+    /**
+     * Moves the specified column to the specified visual position within the ASPxCardView.
+     * @param columnIndex An integer value that specifies the absolute index of the column to move.
+     * @param moveToColumnVisibleIndex An integer value that identifies the target column displayed within the grid.
+     * @param moveBefore true to move the column before the target column; otherwise, false.
+     */
+    MoveColumn(columnIndex: number, moveToColumnVisibleIndex: number, moveBefore: boolean): void;
+    /**
+     * Moves the specified column to the specified visual position within the ASPxCardView.
+     * @param columnFieldNameOrId A string value that identifies the column to be moved by the name of the data source field to which the column is bound or by the column's name.
+     * @param moveToColumnVisibleIndex An integer value that identifies the target column displayed within the grid.
+     * @param moveBefore true to move the column before the target column; otherwise, false.
+     */
+    MoveColumn(columnFieldNameOrId: string, moveToColumnVisibleIndex: number, moveBefore: boolean): void;
+    /**
+     * Returns the key value of the specified card.
+     * @param visibleIndex An integer value that specifies the card's visible index.
+     */
+    GetCardKey(visibleIndex: number): string;
+    /**
+     * Switches the CardView to edit mode.
+     * @param visibleIndex A zero-based integer that identifies a card to be edited.
+     */
+    StartEditCard(visibleIndex: number): void;
+    /**
+     * Switches the ASPxCardView to edit mode.
+     * @param key An object that uniquely identifies a card to be edited.
+     */
+    StartEditCardByKey(key: Object): void;
+    /**
+     * Indicates whether or not a new card is being edited.
+     */
+    IsNewCardEditing(): boolean;
+    /**
+     * Adds a new record.
+     */
+    AddNewCard(): void;
+    /**
+     * Deletes the specified card.
+     * @param visibleIndex An integer value that identifies the card.
+     */
+    DeleteCard(visibleIndex: number): void;
+    /**
+     * Deletes a card with the specified key value.
+     * @param key An object that uniquely identifies the card.
+     */
+    DeleteCardByKey(key: Object): void;
+    /**
+     * Returns the focused card's index.
+     */
+    GetFocusedCardIndex(): number;
+    /**
+     * Moves focus to the specified card.
+     * @param visibleIndex An integer value that specifies the focused card's index.
+     */
+    SetFocusedCardIndex(visibleIndex: number): void;
+    /**
+     * Selects all the unselected cards within the CardView.
+     */
+    SelectCards(): void;
+    /**
+     * Selects the specified card displayed within the CardView.
+     * @param visibleIndex A zero-based integer value that specifies the card's visible index.
+     */
+    SelectCards(visibleIndex: number): void;
+    /**
+     * Selects the specified cards within the CardView.
+     * @param visibleIndices An array of zero-based indices that identify data cards within the grid.
+     */
+    SelectCards(visibleIndices: number[]): void;
+    /**
+     * Selects or deselects the specified cards within the CardView.
+     * @param visibleIndices An array of zero-based indices that identify data cards within the grid.
+     * @param selected true to select the specified cards; false to deselect the cards.
+     */
+    SelectCards(visibleIndices: number[], selected: boolean): void;
+    /**
+     * Selects or deselects the specified card within the GridView.
+     * @param visibleIndex An integer zero-based index that identifies the data card within the grid.
+     * @param selected true to select the specified card; false to deselect the card.
+     */
+    SelectCards(visibleIndex: number, selected?: boolean): void;
+    /**
+     * Selects or deselects the specified cards displayed within the CardView.
+     * @param keys An array of objects that uniquely identify the cards.
+     * @param selected true to select the specified cards; false to deselect the cards.
+     */
+    SelectCardsByKey(keys: Object[], selected?: boolean): void;
+    /**
+     * Selects or deselects the specified card displayed within the CardView.
+     * @param key An object that uniquely identifies the card.
+     * @param selected true to select the specified card; false to deselect the card.
+     */
+    SelectCardsByKey(key: Object, selected?: boolean): void;
+    /**
+     * Selects the specified cards displayed within the CardView.
+     * @param keys An array of objects that uniquely identify the cards.
+     */
+    SelectCardsByKey(keys: Object[]): void;
+    /**
+     * Selects a card displayed within the CardView by its key.
+     * @param key An object that uniquely identifies the card.
+     */
+    SelectCardsByKey(key: Object): void;
+    /**
+     * Deselects the specified cards displayed within the ASPxCardView.
+     * @param keys An array of objects that uniquely identify the cards.
+     */
+    UnselectCardsByKey(keys: Object[]): void;
+    /**
+     * Deselects the specified card displayed within the ASPxCardView.
+     * @param key An object that uniquely identifies the card.
+     */
+    UnselectCardsByKey(key: Object): void;
+    /**
+     * Deselects all the selected cards within the ASPxCardView.
+     */
+    UnselectCards(): void;
+    /**
+     * Deselects the specified cards (if selected) within the ASPxCardView.
+     * @param visibleIndices An array of zero-based indices that identify data cards within the grid.
+     */
+    UnselectCards(visibleIndices: number[]): void;
+    /**
+     * Deselects the specified cards (if selected) within the ASPxCardView.
+     * @param visibleIndex A zero-based integer value that specifies the card's visible index.
+     */
+    UnselectCards(visibleIndex: number): void;
+    /**
+     * Deselects all grid cards that match the filter criteria currently applied to the CardView.
+     */
+    UnselectFilteredCards(): void;
+    /**
+     * Selects the specified card displayed on the current page.
+     * @param visibleIndex A zero-based integer value that specifies the card's visible index.
+     */
+    SelectCardOnPage(visibleIndex: number): void;
+    /**
+     * Selects or deselects the specified card displayed on the current page.
+     * @param visibleIndex A zero-based integer value that specifies the card's visible index.
+     * @param selected true to select the specified card; false to deselect the card.
+     */
+    SelectCardOnPage(visibleIndex: number, selected?: boolean): void;
+    /**
+     * Deselects the specified cards (if selected) displayed on the current page.
+     * @param visibleIndex A zero-based integer value that specifies the card's visible index.
+     */
+    UnselectCardOnPage(visibleIndex: number): void;
+    /**
+     * Selects all unselected cards displayed on the current page.
+     */
+    SelectAllCardsOnPage(): void;
+    /**
+     * Allows you to select or deselect all cards displayed on the current page based on the parameter passed.
+     * @param selected true to select all unselected cards displayed on the current page; false to deselect all selected cards on the page.
+     */
+    SelectAllCardsOnPage(selected: boolean): void;
+    /**
+     * Deselects all selected cards displayed on the current page.
+     */
+    UnselectAllCardsOnPage(): void;
+    /**
+     * Returns the number of selected cards.
+     */
+    GetSelectedCardCount(): number;
+    /**
+     * Indicates whether or not the specified card is selected within the current page.
+     * @param visibleIndex An integer value that identifies the card by its visible index.
+     */
+    IsCardSelectedOnPage(visibleIndex: number): boolean;
+    /**
+     * Applies the specified search panel filter criterion to grid data.
+     * @param value A string value that specifies the filter criterion.
+     */
+    ApplySearchPanelFilter(value: string): void;
+    /**
+     * Applies the specified filter expression to the grid.
+     * @param filterExpression A string value that specifies the filter expression.
+     */
+    ApplyFilter(filterExpression: string): void;
+    /**
+     * Clears the filter expression applied to a client CardView.
+     */
+    ClearFilter(): void;
+    /**
+     * Gets the Popup Edit Form.
+     */
+    GetPopupEditForm(): ASPxClientPopupControl;
+    /**
+     * Sets input focus to the grid.
+     */
+    Focus(): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(args: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side event, passing the specified argument to it.
+     * @param args A string value that represents any information that needs to be sent to the server-side event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(args: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Selects the specified page.
+     * @param pageIndex An integer value that specifies the active page's index.
+     */
+    GotoPage(pageIndex: number): void;
+    /**
+     * Gets the index of the page currently being selected.
+     */
+    GetPageIndex(): number;
+    /**
+     * Gets the number of pages to which the grid's data is divided.
+     */
+    GetPageCount(): number;
+    /**
+     * Activates the next page.
+     */
+    NextPage(): void;
+    /**
+     * Activates the previous page.
+     */
+    PrevPage(): void;
+    /**
+     * Returns the index of the first card displayed within the grid's active page.
+     */
+    GetTopVisibleIndex(): number;
+    /**
+     * Indicates whether the grid is in edit mode.
+     */
+    IsEditing(): boolean;
+    /**
+     * Saves all the changes made and switches the grid to browse mode.
+     */
+    UpdateEdit(): void;
+    /**
+     * Cancels all the changes made and switches the CardView to browse mode.
+     */
+    CancelEdit(): void;
+    /**
+     * Updates data displayed within the grid.
+     */
+    Refresh(): void;
+    /**
+     * Indicates whether the customization window is displayed.
+     */
+    IsCustomizationWindowVisible(): boolean;
+    /**
+     * Invokes the customization window.
+     */
+    ShowCustomizationWindow(): void;
+    /**
+     * Invokes the customization window and displays it over the specified HTML element.
+     * @param showAtElement An object that specifies the HTML element relative to whose position the customization window is invoked.
+     */
+    ShowCustomizationWindow(showAtElement?: Object): void;
+    /**
+     * Closes the customization window.
+     */
+    HideCustomizationWindow(): void;
+    /**
+     * Returns the number of columns within the client grid.
+     */
+    GetColumnCount(): number;
+    /**
+     * Returns the card values displayed within all selected cards.
+     * @param fieldNames The names of data source fields separated via a semicolon, whose values within the selected cards are returned.
+     * @param onCallback An ASPxClientCardViewValuesCallback object that represents the JavaScript function which receives the list of card values as a parameter.
+     */
+    GetSelectedFieldValues(fieldNames: string, onCallback: ASPxClientCardViewValuesCallback): void;
+    /**
+     * Returns key values of selected cards displayed within the current page.
+     */
+    GetSelectedKeysOnPage(): Object[];
+    /**
+     * Sends a callback to the server and generates the server-side CustomDataCallback event.
+     * @param args A string value that is any information that needs to be sent to the server-side CustomDataCallback event.
+     * @param onCallback An ASPxClientCardViewValuesCallback object that is the JavaScript function which receives the information on the client side.
+     */
+    GetValuesOnCustomCallback(args: string, onCallback: ASPxClientCardViewValuesCallback): void;
+    /**
+     * Returns the values of the specified data source fields within the specified card.
+     * @param visibleIndex An integer value that identifies the data card.
+     * @param fieldNames The names of data source fields separated via a semicolon, whose values within the specified card are returned.
+     * @param onCallback An ASPxClientCardViewValuesCallback object that represents the JavaScript function which receives the list of card values as a parameter.
+     */
+    GetCardValues(visibleIndex: number, fieldNames: string, onCallback: ASPxClientCardViewValuesCallback): void;
+    /**
+     * Returns the card values displayed within the current page.
+     * @param fieldNames The names of data source fields whose values are returned.
+     * @param onCallback An ASPxClientCardViewValuesCallback object that represents the JavaScript function which receives the list of card values as a parameter.
+     */
+    GetPageCardValues(fieldNames: string, onCallback: ASPxClientCardViewValuesCallback): void;
+    /**
+     * Returns the number of cards actually displayed within the active page.
+     */
+    GetVisibleCardsOnPage(): number;
+    /**
+     * Returns the client column that resides at the specified position within the column collection.
+     * @param columnIndex A zero-based index that identifies the column within the column collection (the column's Index property value).
+     */
+    GetColumn(columnIndex: number): ASPxClientCardViewColumn;
+    /**
+     * Returns the column with the specified unique identifier.
+     * @param columnId A string value that specifies the column's unique identifier (the column's Name property value).
+     */
+    GetColumnById(columnId: string): ASPxClientCardViewColumn;
+    /**
+     * Returns the client column which is bound to the specified data source field.
+     * @param columnFieldName A string value that specifies the name of the data source field to which the column is bound (the column's FieldName property value).
+     */
+    GetColumnByField(columnFieldName: string): ASPxClientCardViewColumn;
+    /**
+     * Returns the editor used to edit the specified column's values.
+     * @param column An ASPxClientCardViewColumn object that specifies the required column within the client grid.
+     */
+    GetEditor(column: ASPxClientCardViewColumn): ASPxClientEdit;
+    /**
+     * Returns the editor used to edit the specified column's values.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     */
+    GetEditor(columnIndex: number): ASPxClientEdit;
+    /**
+     * Returns the editor used to edit the specified column's values.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     */
+    GetEditor(columnFieldNameOrId: string): ASPxClientEdit;
+}
+/**
+ * Represents a client column.
+ */
+interface ASPxClientCardViewColumn extends ASPxClientGridColumnBase {
+    /**
+     * Gets the name that uniquely identifies the column.
+     * Value: A string value assigned to the column's Name property.
+     */
+    name: string;
+    /**
+     * Gets the column's position within the collection.
+     * Value: An integer zero-bazed index that specifies the column's position within the collection.
+     */
+    index: number;
+    /**
+     * Gets the name of the database field assigned to the current column.
+     * Value: A string value that specifies the name of a data field.
+     */
+    fieldName: string;
+    /**
+     * Gets whether the column is visible.
+     * Value: true to display the column; otherwise, false.
+     */
+    visible: boolean;
+}
+/**
+ * Represents a JavaScript function which receives the list of card values when the client GetSelectedFieldValues method is called.
+ */
+interface ASPxClientCardViewValuesCallback {
+    /**
+     * Represents a JavaScript function which receives the list of card values when the client GetSelectedFieldValues method is called.
+     * @param result An object that represents the list of card values received from the server.
+     */
+    (result: Object): void;
+}
+/**
+ * A method that will handle the cancelable events of a client ASPxCardView column.
+ */
+interface ASPxClientCardViewColumnCancelEventHandler<S> {
+    /**
+     * A method that will handle the cancelable events of a client ASPxCardView column.
+     * @param source The event source. This parameter identifies the ASPxClientCardView object that raised the event.
+     * @param e An ASPxClientCardViewColumnCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCardViewColumnCancelEventArgs): void;
+}
+/**
+ * Provides data for the cancelable events of a client ASPxCardView column.
+ */
+interface ASPxClientCardViewColumnCancelEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the processed client column.
+     * Value: An ASPxClientCardViewColumn object that represents the processed column.
+     */
+    column: ASPxClientCardViewColumn;
+}
+/**
+ * A method that will handle the CardClick event.
+ */
+interface ASPxClientCardViewCardClickEventHandler<S> {
+    /**
+     * A method that will handle the CardClick event.
+     * @param source The event source. This parameter identifies the ASPxClientCardView object that raised the event.
+     * @param e An ASPxClientCardViewCardClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCardViewCardClickEventArgs): void;
+}
+/**
+ * Provides data for the CardClick event.
+ */
+interface ASPxClientCardViewCardClickEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the processed card's visible index.
+     * Value: An integer zero-based index that identifies the processed record.
+     */
+    visibleIndex: number;
+    /**
+     * Provides access to the parameters associated with the CardClick event.
+     * Value: An object that contains parameters associated with the event.
+     */
+    htmlEvent: Object;
+}
+/**
+ * A method that will handle the CustomButtonClick event.
+ */
+interface ASPxClientCardViewCustomButtonEventHandler<S> {
+    /**
+     * A method that will handle the CustomButtonClick event.
+     * @param source The event source.  This parameter identifies the ASPxClientCardView object that raised the event.
+     * @param e An ASPxClientCardViewCustomButtonEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCardViewCustomButtonEventArgs): void;
+}
+/**
+ * Provides data for the CustomButtonClick event.
+ */
+interface ASPxClientCardViewCustomButtonEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the value which identifies the card whose custom button has been clicked.
+     * Value: An integer value that identifies the card whose custom button has been clicked.
+     */
+    visibleIndex: number;
+    /**
+     * Gets the value which identifies the custom button.
+     * Value: A string value that identifies the clicked custom button.
+     */
+    buttonID: string;
+}
+/**
+ * A method that will handle the SelectionChanged event.
+ */
+interface ASPxClientCardViewSelectionEventHandler<S> {
+    /**
+     * A method that will handle the SelectionChanged event.
+     * @param source The event source.
+     * @param e An ASPxClientCardViewSelectionEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCardViewSelectionEventArgs): void;
+}
+/**
+ * Provides data for the SelectionChanged event.
+ */
+interface ASPxClientCardViewSelectionEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the visible index of the card whose selected state has been changed.
+     * Value: An <see cref="Int32" /> value that specifies the visible index of the card.
+     */
+    visibleIndex: number;
+    /**
+     * Gets whether the card has been selected.
+     * Value: true if the card has been selected; otherwise, false.
+     */
+    isSelected: boolean;
+    /**
+     * Gets whether all cards displayed within a page have been selected or unselected.
+     * Value: true if all cards displayed within a page have been selected or unselected; otherwise, false.
+     */
+    isAllRecordsOnPage: boolean;
+    /**
+     * Gets whether a selection has been changed on the server.
+     * Value: true  if a selection has been changed on the server; otherwise, false.
+     */
+    isChangedOnServer: boolean;
+}
+/**
+ * A method that will handle the client BatchEditStartEditing event.
+ */
+interface ASPxClientCardViewBatchEditStartEditingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditStartEditing event.
+     * @param source The event source.
+     * @param e An ASPxClientCardViewBatchEditStartEditingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCardViewBatchEditStartEditingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditStartEditing event.
+ */
+interface ASPxClientCardViewBatchEditStartEditingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the visible index of the card whose cells are about to be edited.
+     * Value: An <see cref="Int32" /> value that specifies the visible index of the card.
+     */
+    visibleIndex: number;
+    /**
+     * Gets the CardView column that owns a cell that is about to be edited.
+     * Value: An <see cref="ASPxClientCardViewColumn" /> object that is the focused CardView column.
+     */
+    focusedColumn: ASPxClientCardViewColumn;
+    /**
+     * Gets a hashtable that maintains information about editable cells.
+     * Value: A hashtable that stores information about editable cells.
+     */
+    cardValues: Object;
+}
+/**
+ * A method that will handle the client BatchEditEndEditing event.
+ */
+interface ASPxClientCardViewBatchEditEndEditingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditEndEditing event.
+     * @param source The event source.
+     * @param e An ASPxClientCardViewBatchEditEndEditingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCardViewBatchEditEndEditingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditEndEditing event.
+ */
+interface ASPxClientCardViewBatchEditEndEditingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the visible index of the card whose cells have been edited.
+     * Value: An <see cref="Int32" /> value that specifies the visible index of the card.
+     */
+    visibleIndex: number;
+    /**
+     * Gets a hashtable that maintains information about editable cells.
+     * Value: A hashtable that stores information about editable cells.
+     */
+    cardValues: Object;
+}
+/**
+ * A method that will handle the client BatchEditCardValidating event.
+ */
+interface ASPxClientCardViewBatchEditCardValidatingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditCardValidating event.
+     * @param source The event source.
+     * @param e An ASPxClientCardViewBatchEditCardValidatingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCardViewBatchEditCardValidatingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditCardValidating event.
+ */
+interface ASPxClientCardViewBatchEditCardValidatingEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the processed card's visible index.
+     * Value: An integer value that specifies the processed card's visible index.
+     */
+    visibleIndex: number;
+    /**
+     * Provides validation information of a card currently being validated.
+     * Value: An object that is a hashtable containing validation information.
+     */
+    validationInfo: Object;
+}
+/**
+ * Represents an object that will handle the client-side BatchEditConfirmShowing event.
+ */
+interface ASPxClientCardViewBatchEditConfirmShowingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditConfirmShowing client event.
+     * @param source The event source.
+     * @param e An ASPxClientCardViewBatchEditConfirmShowingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCardViewBatchEditConfirmShowingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditConfirmShowing event.
+ */
+interface ASPxClientCardViewBatchEditConfirmShowingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the client identifier of an object that initiates a send request.
+     * Value: A string value that specifies the object client identifier.
+     */
+    requestTriggerID: string;
+}
+/**
+ * A method that will handle the client BatchEditTemplateCellFocused event.
+ */
+interface ASPxClientCardViewBatchEditTemplateCellFocusedEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditTemplateCellFocused event.
+     * @param source An object representing the event source. Identifies the button editor that raised the event.
+     * @param e An ASPxClientCardViewBatchEditTemplateCellFocusedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCardViewBatchEditTemplateCellFocusedEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditTemplateCellFocused event.
+ */
+interface ASPxClientCardViewBatchEditTemplateCellFocusedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the currently processed column.
+     * Value: An <see cref="ASPxClientCardViewColumn" /> object that is the client-side column object.
+     */
+    column: ASPxClientCardViewColumn;
+    /**
+     * Gets or sets a value specifying whether the event was handled.
+     * Value: true if the event was handled and default processing should not occur; false if the event should be handled using default processing.
+     */
+    handled: boolean;
+}
+/**
+ * A method that will handle the BatchEditChangesSaving event.
+ */
+interface ASPxClientCardViewBatchEditChangesSavingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditChangesSaving event.
+     * @param source The event source. This parameter identifies the card view object which raised the event.
+     * @param e An ASPxClientCardViewBatchEditChangesSavingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCardViewBatchEditChangesSavingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditChangesSaving event.
+ */
+interface ASPxClientCardViewBatchEditChangesSavingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets a hashtable that maintains information about inserted cells.
+     * Value: A hashtable that stores information about inserted cells.
+     */
+    insertedValues: Object;
+    /**
+     * Gets a hashtable that maintains information about deleted cells.
+     * Value: A hashtable that stores information about deleted cells.
+     */
+    deletedValues: Object;
+    /**
+     * Gets a hashtable that maintains information about updated cells.
+     * Value: A hashtable that stores information about updated cells.
+     */
+    updatedValues: Object;
+}
+/**
+ * A method that will handle the BatchEditChangesCanceling event.
+ */
+interface ASPxClientCardViewBatchEditChangesCancelingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditChangesCanceling event.
+     * @param source The event source. This parameter identifies the card view object which raised the event.
+     * @param e An ASPxClientCardViewBatchEditChangesCancelingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCardViewBatchEditChangesCancelingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditChangesCanceling event.
+ */
+interface ASPxClientCardViewBatchEditChangesCancelingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets a hashtable that maintains information about inserted cells.
+     * Value: A hashtable that stores information about inserted cells.
+     */
+    insertedValues: Object;
+    /**
+     * Gets a hashtable that maintains information about deleted cells.
+     * Value: A hashtable that stores information about deleted cells.
+     */
+    deletedValues: Object;
+    /**
+     * Gets a hashtable that maintains information about updated cells.
+     * Value: A hashtable that stores information about updated cells.
+     */
+    updatedValues: Object;
+}
+/**
+ * A method that will handle the BatchEditCardInserting event.
+ */
+interface ASPxClientCardViewBatchEditCardInsertingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditCardInserting event.
+     * @param source The event source. This parameter identifies the card view object which raised the event.
+     * @param e An ASPxClientCardViewBatchEditCardInsertingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCardViewBatchEditCardInsertingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditCardInserting event.
+ */
+interface ASPxClientCardViewBatchEditCardInsertingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the processed card visible index.
+     * Value: An integer value that specifies the processed card visible index.
+     */
+    visibleIndex: number;
+}
+/**
+ * A method that will handle the BatchEditCardDeleting event.
+ */
+interface ASPxClientCardViewBatchEditCardDeletingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditCardDeleting event.
+     * @param source The event source. This parameter identifies the card view object which raised the event.
+     * @param e An ASPxClientCardViewBatchEditCardDeletingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCardViewBatchEditCardDeletingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditCardDeleting event.
+ */
+interface ASPxClientCardViewBatchEditCardDeletingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the processed card visible index.
+     * Value: An integer value that specifies the processed card visible index.
+     */
+    visibleIndex: number;
+    /**
+     * Gets a hashtable that maintains information about deleted cells.
+     * Value: A hashtable that stores information about deleted cells.
+     */
+    cardValues: Object;
+}
+/**
+ * A method that will handle the FocusedCellChanging event.
+ */
+interface ASPxClientCardViewFocusedCellChangingEventHandler<S> {
+    /**
+     * A method that will handle the FocusedCellChanging event.
+     * @param source The event source.
+     * @param e An ASPxClientCardViewFocusedCellChangingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCardViewFocusedCellChangingEventArgs): void;
+}
+/**
+ * Provides data for the FocusedCellChanging event.
+ */
+interface ASPxClientCardViewFocusedCellChangingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Provides information of a card's cell currently being focused.
+     * Value: A ASPxClientCardViewCellInfo object that provides information about the card's cell.
+     */
+    cellInfo: ASPxClientCardViewCellInfo;
+}
+/**
+ * Provides members related to Batch Edit Mode
+ */
+interface ASPxClientCardViewBatchEditApi {
+    /**
+     * Performs validation of CardView data contained in the cards when the CardView operates in Batch Edit mode.
+     * @param validateOnlyModified true, if only modified cards should be validated; otherwise, false.
+     */
+    ValidateCards(validateOnlyModified?: boolean): boolean;
+    /**
+     * Performs validation of CardView data contained in the specified card when the CardView operates in Batch Edit mode.
+     * @param visibleIndex An integer value specifying the visible index of the validated card.
+     */
+    ValidateCard(visibleIndex: number): boolean;
+    /**
+     * Returns an array of card visible indices.
+     * @param includeDeleted true, to include visible indices of deleted cards to the returned array; otherwise, false.
+     */
+    GetCardVisibleIndices(includeDeleted: boolean): number[];
+    /**
+     * Returns an array of the deleted card visible indices.
+     */
+    GetDeletedCardIndices(): number[];
+    /**
+     * Returns an array of the inserted card visible indices.
+     */
+    GetInsertedCardIndices(): number[];
+    /**
+     * Indicates if the card with the specified visible index is deleted.
+     * @param visibleIndex An integer value that identifies the card by its visible index.
+     */
+    IsDeletedCard(visibleIndex: number): boolean;
+    /**
+     * Indicates if the card with the specified visible index is newly created.
+     * @param visibleIndex An integer value that identifies the card by its visible index.
+     */
+    IsNewCard(visibleIndex: number): boolean;
+    /**
+     * Programmatically moves the focus to the previous cell in the card
+     */
+    MoveFocusBackward(): boolean;
+    /**
+     * Programmatically moves the focus to the next cell in the card.
+     */
+    MoveFocusForward(): boolean;
+    /**
+     * Sets the value of the specified cell.
+     * @param visibleIndex An integer zero-based index that identifies the card containing the processed cell.
+     * @param columnFieldNameOrId A string value that specifies the field name or unique identifier (the column's Name property value) of a column containing the processed cell.
+     * @param value An object that contains the new cell value.
+     */
+    SetCellValue(visibleIndex: number, columnFieldNameOrId: string, value: Object): void;
+    /**
+     * Sets the value of the specified cell.
+     * @param visibleIndex An integer zero-based index that identifies the card containing the processed cell.
+     * @param columnFieldNameOrId A string value that specifies the field name or unique identifier (the column's Name property value) of a column containing the processed cell.
+     * @param value An object that contains the new cell value.
+     * @param displayText A string value that specifies the cell display text.
+     * @param cancelCellHighlighting true to cancel highlighting of the modified cell, false to highlight the modified cell.
+     */
+    SetCellValue(visibleIndex: number, columnFieldNameOrId: string, value: Object, displayText: string, cancelCellHighlighting?: boolean): void;
+    /**
+     * Gets the value of the specified cell.
+     * @param visibleIndex A zero-based integer value that specifies the visible index of a card containing the processed cell.
+     * @param columnFieldNameOrId A string value that specifies the field name or unique identifier (the column's Name property value) of a column containing the processed cell.
+     * @param initial true, to return the initial (server) value; false, to return a value currently contained on the client side (modified value).
+     */
+    GetCellValue(visibleIndex: number, columnFieldNameOrId: string, initial?: boolean): Object;
+    /**
+     * Gets a container holding a data cell content.
+     * @param visibleIndex An integer value that is the visible index.
+     * @param columnFieldNameOrId A string value that is the column's Field Name or ID.
+     */
+    GetCellTextContainer(visibleIndex: number, columnFieldNameOrId: string): Object;
+    /**
+     * Gets information about the cell currently being edited.
+     */
+    GetEditCellInfo(): ASPxClientCardViewCellInfo;
+    /**
+     * Returns a value that indicates whether the card view has changed data.
+     */
+    HasChanges(): boolean;
+    /**
+     * Returns a value that indicates whether the specified card has changed data.
+     * @param visibleIndex An integer value that specifies the visible index of a card.
+     */
+    HasChanges(visibleIndex: number): boolean;
+    /**
+     * Returns a value that indicates whether the specified cell's data has been changed.
+     * @param visibleIndex An integer value that specifies the visible index of a card.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     */
+    HasChanges(visibleIndex: number, columnFieldNameOrId: string): boolean;
+    /**
+     * Resets changes in the specified card.
+     * @param visibleIndex An integer value that specifies the visible index of a card.
+     */
+    ResetChanges(visibleIndex: number): void;
+    /**
+     * Resets changes in the specified cell.
+     * @param visibleIndex An integer value that specifies the visible index of a card containing the processed cell.
+     * @param columnIndex A string value that specifies the field name or unique identifier (the column's Name property value) of a column containing the processed cell.
+     */
+    ResetChanges(visibleIndex: number, columnIndex: number): void;
+    /**
+     * Switches the specified cell to edit mode.
+     * @param visibleIndex A zero-based integer value that specifies the visible index of a card containing the processed cell.
+     * @param columnIndex A zero-based integer value that identifies the column which contains the processed cell in the column collection.
+     */
+    StartEdit(visibleIndex: number, columnIndex: number): void;
+    /**
+     * Ends cell or card editing.
+     */
+    EndEdit(): void;
+}
+/**
+ * Contains information on a grid cell.
+ */
+interface ASPxClientCardViewCellInfo {
+    /**
+     * Gets the visible index of the card that contains the cell currently being processed.
+     * Value: An <see cref="Int32" /> value that specifies the visible index of the card.
+     */
+    cardVisibleIndex: number;
+    /**
+     * Gets the data column that contains the cell currently being processed.
+     * Value: An <see cref="ASPxClientCardViewColumn" /> object that is the data column which contains the processed cell.
+     */
+    column: ASPxClientCardViewColumn;
+}
+/**
+ * A client-side equivalent of the ASPxGridView object.
+ */
+interface ASPxClientGridView extends ASPxClientGridBase {
+    /**
+     * Provides access to the batch editing client API.
+     * Value: A <see cref="ASPxClientGridViewBatchEditApi" /> object that exposes the batch editing client API methods.
+     */
+    batchEditApi: ASPxClientGridViewBatchEditApi;
+    /**
+     * Occurs when a custom command button has been clicked.
+     */
+    CustomButtonClick: ASPxClientEvent<ASPxClientGridViewCustomButtonEventHandler<ASPxClientGridView>>;
+    /**
+     * Fires after the selection has been changed.
+     */
+    SelectionChanged: ASPxClientEvent<ASPxClientGridViewSelectionEventHandler<ASPxClientGridView>>;
+    /**
+     * Enables you to prevent columns from being sorted.
+     */
+    ColumnSorting: ASPxClientEvent<ASPxClientGridViewColumnCancelEventHandler<ASPxClientGridView>>;
+    /**
+     * Fires in response to changing row focus.
+     */
+    FocusedRowChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientGridView>>;
+    /**
+     * Enables you to cancel data grouping.
+     */
+    ColumnGrouping: ASPxClientEvent<ASPxClientGridViewColumnCancelEventHandler<ASPxClientGridView>>;
+    /**
+     * Fires when an end-user starts dragging the column's header and enables you to cancel this operation.
+     */
+    ColumnStartDragging: ASPxClientEvent<ASPxClientGridViewColumnCancelEventHandler<ASPxClientGridView>>;
+    /**
+     * Enables you to prevent columns from being resized.
+     */
+    ColumnResizing: ASPxClientEvent<ASPxClientGridViewColumnCancelEventHandler<ASPxClientGridView>>;
+    /**
+     * Occurs after a column's width has been changed by an end-user.
+     */
+    ColumnResized: ASPxClientEvent<ASPxClientGridViewColumnProcessingModeEventHandler<ASPxClientGridView>>;
+    /**
+     * Enables you to control column movement.
+     */
+    ColumnMoving: ASPxClientEvent<ASPxClientGridViewColumnMovingEventHandler<ASPxClientGridView>>;
+    /**
+     * Fires before a group row is expanded.
+     */
+    RowExpanding: ASPxClientEvent<ASPxClientGridViewRowCancelEventHandler<ASPxClientGridView>>;
+    /**
+     * Fires before a group row is collapsed.
+     */
+    RowCollapsing: ASPxClientEvent<ASPxClientGridViewRowCancelEventHandler<ASPxClientGridView>>;
+    /**
+     * Fires before a detail row is expanded.
+     */
+    DetailRowExpanding: ASPxClientEvent<ASPxClientGridViewRowCancelEventHandler<ASPxClientGridView>>;
+    /**
+     * Fires before a detail row is collapsed.
+     */
+    DetailRowCollapsing: ASPxClientEvent<ASPxClientGridViewRowCancelEventHandler<ASPxClientGridView>>;
+    /**
+     * Fires on the client when a data row is clicked.
+     */
+    RowClick: ASPxClientEvent<ASPxClientGridViewRowClickEventHandler<ASPxClientGridView>>;
+    /**
+     * Fires on the client when a data row is double clicked.
+     */
+    RowDblClick: ASPxClientEvent<ASPxClientGridViewRowClickEventHandler<ASPxClientGridView>>;
+    /**
+     * Occurs after an end-user right clicks in the GridView, and enables you to provide a custom context menu.
+     */
+    ContextMenu: ASPxClientEvent<ASPxClientGridViewContextMenuEventHandler<ASPxClientGridView>>;
+    /**
+     * Fires on the client side when a context menu item has been clicked.
+     */
+    ContextMenuItemClick: ASPxClientEvent<ASPxClientGridViewContextMenuItemClickEventHandler<ASPxClientGridView>>;
+    /**
+     * Enables you to specify whether row data is valid and provide an error text.
+     */
+    BatchEditRowValidating: ASPxClientEvent<ASPxClientGridViewBatchEditRowValidatingEventHandler<ASPxClientGridView>>;
+    /**
+     * Enables you to prevent a batch edit confirmation message from being displayed.
+     */
+    BatchEditConfirmShowing: ASPxClientEvent<ASPxClientGridViewBatchEditConfirmShowingEventHandler<ASPxClientGridView>>;
+    /**
+     * Occurs when a grid switches to batch edit mode.
+     */
+    BatchEditStartEditing: ASPxClientEvent<ASPxClientGridViewBatchEditStartEditingEventHandler<ASPxClientGridView>>;
+    /**
+     * Occurs when a grid leaves the batch edit mode.
+     */
+    BatchEditEndEditing: ASPxClientEvent<ASPxClientGridViewBatchEditEndEditingEventHandler<ASPxClientGridView>>;
+    /**
+     * Enables you to provide navigation for editors contained in a templated cell in Batch Edit mode.
+     */
+    BatchEditTemplateCellFocused: ASPxClientEvent<ASPxClientGridViewBatchEditTemplateCellFocusedEventHandler<ASPxClientGridView>>;
+    /**
+     * Occurs on the client side before data changes are saved in batch edit mode.
+     */
+    BatchEditChangesSaving: ASPxClientEvent<ASPxClientGridViewBatchEditChangesSavingEventHandler<ASPxClientGridView>>;
+    /**
+     * Occurs on the client side before data changes are canceled in batch edit mode.
+     */
+    BatchEditChangesCanceling: ASPxClientEvent<ASPxClientGridViewBatchEditChangesCancelingEventHandler<ASPxClientGridView>>;
+    /**
+     * Occurs on the client side before a data row is inserted in batch edit mode.
+     */
+    BatchEditRowInserting: ASPxClientEvent<ASPxClientGridViewBatchEditRowInsertingEventHandler<ASPxClientGridView>>;
+    /**
+     * Occurs on the client side before a data row is deleted in batch edit mode.
+     */
+    BatchEditRowDeleting: ASPxClientEvent<ASPxClientGridViewBatchEditRowDeletingEventHandler<ASPxClientGridView>>;
+    /**
+     * Occurs on the client side when the focused cell is about to be changed.
+     */
+    FocusedCellChanging: ASPxClientEvent<ASPxClientGridViewFocusedCellChangingEventHandler<ASPxClientGridView>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientGridView>>;
+    /**
+     * Occurs on the client after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientGridView>>;
+    /**
+     * Fires on the client if any unhandled server error occurs during server-side processing of a callback sent by the ASPxClientGridView.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientGridView>>;
+    /**
+     * Fires after the Customization Window has been closed.
+     */
+    CustomizationWindowCloseUp: ASPxClientEvent<ASPxClientEventHandler<ASPxClientGridView>>;
+    /**
+     * Selects or deselects the specified row displayed within the grid.
+     * @param key An object that uniquely identifies the row.
+     * @param selected true to select the specified row; false to deselect the row.
+     */
+    SelectRowsByKey(key: Object, selected?: boolean): void;
+    /**
+     * Selects the specified rows displayed within the grid.
+     * @param keys An array of objects that uniquely identify the rows.
+     */
+    SelectRowsByKey(keys: Object[]): void;
+    /**
+     * Selects a grid row by its key.
+     * @param key An object that uniquely identifies the row.
+     */
+    SelectRowsByKey(key: Object): void;
+    /**
+     * Deselects the specified rows displayed within the grid.
+     * @param keys An array of objects that uniquely identify the rows.
+     */
+    UnselectRowsByKey(keys: Object[]): void;
+    /**
+     * Deselects the specified row displayed within the grid.
+     * @param key An object that uniquely identifies the row.
+     */
+    UnselectRowsByKey(key: Object): void;
+    /**
+     * Deselects all the selected rows within the grid.
+     */
+    UnselectRows(): void;
+    /**
+     * Deselects the specified rows (if selected) within the grid.
+     * @param visibleIndices An array of zero-based indices that identify data rows within the grid.
+     */
+    UnselectRows(visibleIndices: number[]): void;
+    /**
+     * Deselects the specified row (if selected) within the grid.
+     * @param visibleIndex A zero-based integer value that specifies the row's visible index.
+     */
+    UnselectRows(visibleIndex: number): void;
+    /**
+     * Deselects all grid rows that match the filter criteria currently applied to the grid.
+     */
+    UnselectFilteredRows(): void;
+    /**
+     * Selects the specified row displayed on the current page.
+     * @param visibleIndex A zero-based integer value that specifies the row's visible index.
+     */
+    SelectRowOnPage(visibleIndex: number): void;
+    /**
+     * Selects or deselects the specified row displayed on the current page.
+     * @param visibleIndex A zero-based integer value that specifies the row's visible index.
+     * @param selected true to select the specified row; false to deselect the row.
+     */
+    SelectRowOnPage(visibleIndex: number, selected?: boolean): void;
+    /**
+     * Deselects the specified row (if selected) displayed on the current page.
+     * @param visibleIndex A zero-based integer value that specifies the row's visible index.
+     */
+    UnselectRowOnPage(visibleIndex: number): void;
+    /**
+     * Selects all unselected rows displayed on the current page.
+     */
+    SelectAllRowsOnPage(): void;
+    /**
+     * Allows you to select or deselect all rows displayed on the current page based on the parameter passed.
+     * @param selected true to select all unselected rows displayed on the current page; false to deselect all selected rows on the page.
+     */
+    SelectAllRowsOnPage(selected: boolean): void;
+    /**
+     * Deselects all selected rows displayed on the current page.
+     */
+    UnselectAllRowsOnPage(): void;
+    /**
+     * Returns the number of selected rows.
+     */
+    GetSelectedRowCount(): number;
+    /**
+     * Indicates whether or not the specified row is selected within the current page.
+     * @param visibleIndex An integer value that identifies the row by its visible index.
+     */
+    IsRowSelectedOnPage(visibleIndex: number): boolean;
+    /**
+     * Indicates whether the specified row is a group row.
+     * @param visibleIndex An integer value that identifies the row by its visible index.
+     */
+    IsGroupRow(visibleIndex: number): boolean;
+    /**
+     * Indicates whether the specified row is a data row.
+     * @param visibleIndex An integer value that identifies the row by its visible index.
+     */
+    IsDataRow(visibleIndex: number): boolean;
+    /**
+     * Indicates whether the specified group row is expanded.
+     * @param visibleIndex An integer value that identifies the group row by its visible index.
+     */
+    IsGroupRowExpanded(visibleIndex: number): boolean;
+    /**
+     * Returns the current vertical scroll position of the grid's content.
+     */
+    GetVertScrollPos(): number;
+    /**
+     * Returns the current horizontal scroll position of the grid's content.
+     */
+    GetHorzScrollPos(): number;
+    /**
+     * Returns the current horizontal scroll position of the grid's content.
+     */
+    GetHorizontalScrollPosition(): number;
+    /**
+     * Specifies the vertical scroll position for the grid's content.
+     * @param position An integer value specifying the vertical scroll position.
+     */
+    SetVertScrollPos(position: number): void;
+    /**
+     * Specifies the horizontal scroll position for the grid's content.
+     * @param position An integer value specifying the horizontal scroll position.
+     */
+    SetHorzScrollPos(position: number): void;
+    /**
+     * Specifies the horizontal scroll position for the grid's content.
+     * @param position An integer value specifying the horizontal scroll position.
+     */
+    SetHorizontalScrollPosition(position: number): void;
+    /**
+     * Sets the scrollability of various types of grid rows when the grid displays fixed columns.
+     * @param scrollableRowSettings An object specifying which types of grid rows should or should not be scrollable.
+     */
+    SetFixedColumnScrollableRows(scrollableRowSettings: Object): void;
+    /**
+     * Applies a filter specified in the filter row to the GridView.
+     */
+    ApplyOnClickRowFilter(): void;
+    /**
+     * Returns the editor used to edit the value in the auto filter row for the specified data column.
+     * @param column An ASPxClientGridViewColumn object that represents the data colum within the ASPxGridView.
+     */
+    GetAutoFilterEditor(column: ASPxClientGridViewColumn): Object;
+    /**
+     * Returns the editor used to edit the value in the auto filter row for the specified data column.
+     * @param columnIndex An integer value that identifies the data column by its index.
+     */
+    GetAutoFilterEditor(columnIndex: number): Object;
+    /**
+     * Returns the editor used to edit the value in the auto filter row for the specified data column.
+     * @param columnFieldNameOrId A string value that specifies the column's name or its data base field name.
+     */
+    GetAutoFilterEditor(columnFieldNameOrId: string): Object;
+    /**
+     * Applies a filter to the specified data column.
+     * @param column An ASPxClientGridViewColumn object that represents the data column within the client GridView.
+     * @param val A string value that specifies the filter expression.
+     */
+    AutoFilterByColumn(column: ASPxClientGridViewColumn, val: string): void;
+    /**
+     * Applies a filter to the specified data column.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     * @param val A string value that specifies the filter expression.
+     */
+    AutoFilterByColumn(columnIndex: number, val: string): void;
+    /**
+     * Applies a filter to the specified data column.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     * @param val A string value that specifies the filter expression.
+     */
+    AutoFilterByColumn(columnFieldNameOrId: string, val: string): void;
+    /**
+     * Applies the specified search panel filter criterion to grid data.
+     * @param value A string value that specifies the filter criterion.
+     */
+    ApplySearchPanelFilter(value: string): void;
+    /**
+     * Applies the specified filter expression to the GridView.
+     * @param filterExpression A string value that specifies the filter expression.
+     */
+    ApplyFilter(filterExpression: string): void;
+    /**
+     * Clears the filter expression applied to a client GridView.
+     */
+    ClearFilter(): void;
+    /**
+     * Gets the Popup Edit Form.
+     */
+    GetPopupEditForm(): ASPxClientPopupControl;
+    /**
+     * Sets input focus to the grid.
+     */
+    Focus(): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(args: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side event, passing the specified argument to it.
+     * @param args A string value that represents any information that needs to be sent to the server-side event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(args: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Selects the specified page.
+     * @param pageIndex An integer value that specifies the active page's index.
+     */
+    GotoPage(pageIndex: number): void;
+    /**
+     * Gets the index of the page currently being selected.
+     */
+    GetPageIndex(): number;
+    /**
+     * Gets the number of pages to which the grid's data is divided.
+     */
+    GetPageCount(): number;
+    /**
+     * Activates the next page.
+     */
+    NextPage(): void;
+    /**
+     * Activates the previous page.
+     */
+    PrevPage(): void;
+    /**
+     * Returns the index of the first data row displayed within the GridView's active page.
+     */
+    GetTopVisibleIndex(): number;
+    /**
+     * Indicates whether the grid is in edit mode.
+     */
+    IsEditing(): boolean;
+    /**
+     * Saves all the changes made and switches the grid to browse mode.
+     */
+    UpdateEdit(): void;
+    /**
+     * Cancels all the changes made and switches the GridView to browse mode.
+     */
+    CancelEdit(): void;
+    /**
+     * Updates data displayed within the grid.
+     */
+    Refresh(): void;
+    /**
+     * Indicates whether the Customization Window is displayed.
+     */
+    IsCustomizationWindowVisible(): boolean;
+    /**
+     * Invokes the Customization Window.
+     */
+    ShowCustomizationWindow(): void;
+    /**
+     * Invokes the Customization Window and displays it over the specified HTML element.
+     * @param showAtElement An object that specifies the HTML element relative to whose position the customization window is invoked.
+     */
+    ShowCustomizationWindow(showAtElement?: Object): void;
+    /**
+     * Closes the Customization Window.
+     */
+    HideCustomizationWindow(): void;
+    /**
+     * Returns the number of columns within the client GridView.
+     */
+    GetColumnsCount(): number;
+    /**
+     * Returns the number of columns within the client GridView.
+     */
+    GetColumnCount(): number;
+    /**
+     * Returns the row values displayed within all selected rows.
+     * @param fieldNames The names of data source fields separated via a semicolon, whose values within the selected rows are returned.
+     * @param onCallback A ASPxClientGridViewValuesCallback object that represents the JavaScript function which receives the list of row values as a parameter.
+     */
+    GetSelectedFieldValues(fieldNames: string, onCallback: ASPxClientGridViewValuesCallback): void;
+    /**
+     * Returns key values of selected rows displayed within the current page.
+     */
+    GetSelectedKeysOnPage(): Object[];
+    /**
+     * Sends a callback to the server and generates the server-side CustomDataCallback event.
+     * @param args A string value that is any information that needs to be sent to the server-side CustomDataCallback event.
+     * @param onCallback A ASPxClientGridViewValuesCallback object that is the JavaScript function which receives the information on the client side.
+     */
+    GetValuesOnCustomCallback(args: string, onCallback: ASPxClientGridViewValuesCallback): void;
+    /**
+     * Returns the values of the specified data source fields within the specified row.
+     * @param visibleIndex An integer value that identifies the data row.
+     * @param fieldNames The names of data source fields separated via a semicolon, whose values within the specified row are returned.
+     * @param onCallback An ASPxClientGridViewValuesCallback object that represents the JavaScript function which receives the list of row values as a parameter.
+     */
+    GetRowValues(visibleIndex: number, fieldNames: string, onCallback: ASPxClientGridViewValuesCallback): void;
+    /**
+     * Returns the row values displayed within the current page.
+     * @param fieldNames The names of data source fields whose values are returned.
+     * @param onCallback A ASPxClientGridViewValuesCallback object that represents the JavaScript function which receives the list of row values as a parameter.
+     */
+    GetPageRowValues(fieldNames: string, onCallback: ASPxClientGridViewValuesCallback): void;
+    /**
+     * Returns the number of rows actually displayed within the active page.
+     */
+    GetVisibleRowsOnPage(): number;
+    /**
+     * Returns the client column that resides at the specified position within the column collection.
+     * @param columnIndex A zero-based index that identifies the column within the column collection (the column's Index property value).
+     */
+    GetColumn(columnIndex: number): ASPxClientGridViewColumn;
+    /**
+     * Returns the column with the specified unique identifier.
+     * @param columnId A string value that specifies the column's unique identifier (the column's Name property value).
+     */
+    GetColumnById(columnId: string): ASPxClientGridViewColumn;
+    /**
+     * Returns the client column which is bound to the specified data source field.
+     * @param columnFieldName A string value that specifies the name of the data source field to which the column is bound (the column's FieldName property value).
+     */
+    GetColumnByField(columnFieldName: string): ASPxClientGridViewColumn;
+    /**
+     * Returns the editor used to edit the specified column's values.
+     * @param column An ASPxClientGridViewColumn object that specifies the required column within the client grid.
+     */
+    GetEditor(column: ASPxClientGridViewColumn): ASPxClientEdit;
+    /**
+     * Returns the editor used to edit the specified column's values.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     */
+    GetEditor(columnIndex: number): ASPxClientEdit;
+    /**
+     * Returns the editor used to edit the specified column's values.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     */
+    GetEditor(columnFieldNameOrId: string): ASPxClientEdit;
+    /**
+     * Returns the value of the specified edit cell.
+     * @param column An ASPxClientGridViewColumn object that represents the data column within the client grid.
+     */
+    GetEditValue(column: ASPxClientGridViewColumn): string;
+    /**
+     * Returns the value of the specified edit cell.
+     * @param columnIndex An integer value that identifies the data column within the grid's column collection.
+     */
+    GetEditValue(columnIndex: number): string;
+    /**
+     * Returns the value of the specified edit cell.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     */
+    GetEditValue(columnFieldNameOrId: string): string;
+    /**
+     * Moves focus to the specified edit cell within the edited row.
+     * @param column An ASPxClientGridViewColumn object that represents the data column within the client grid.
+     */
+    FocusEditor(column: ASPxClientGridViewColumn): void;
+    /**
+     * Moves focus to the specified edit cell within the edited row.
+     * @param columnIndex An integer value that specifies the column's position within the columns collection.
+     */
+    FocusEditor(columnIndex: number): void;
+    /**
+     * Moves focus to the specified edit cell within the edited row.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     */
+    FocusEditor(columnFieldNameOrId: string): void;
+    /**
+     * Sets the value of the specified edit cell.
+     * @param column An ASPxClientGridViewColumn object that represents the data column within the client grid.
+     * @param value A string value that specifies the edit cell's new value.
+     */
+    SetEditValue(column: ASPxClientGridViewColumn, value: string): void;
+    /**
+     * Sets the value of the specified edit cell.
+     * @param columnIndex An integer value that identifies the data column within the grid's column collection.
+     * @param value A string value that specifies the edit cell's new value.
+     */
+    SetEditValue(columnIndex: number, value: string): void;
+    /**
+     * Sets the value of the specified edit cell.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     * @param value A string value that specifies the edit cell's new value.
+     */
+    SetEditValue(columnFieldNameOrId: string, value: string): void;
+    /**
+     * Displays the Filter Control.
+     */
+    ShowFilterControl(): void;
+    /**
+     * Hides the Filter Control.
+     */
+    CloseFilterControl(): void;
+    /**
+     * Enables or disables the current filter.
+     * @param isFilterEnabled true to enable the current filter; otherwise, false.
+     */
+    SetFilterEnabled(isFilterEnabled: boolean): void;
+    /**
+     * Returns the current vertical scroll position of the grid's content.
+     */
+    GetVerticalScrollPosition(): number;
+    /**
+     * Specifies the vertical scroll position for the grid's content.
+     * @param position An integer value specifying the vertical scroll position.
+     */
+    SetVerticalScrollPosition(position: number): void;
+    /**
+     * Gets information about a focused cell.
+     */
+    GetFocusedCell(): ASPxClientGridViewCellInfo;
+    /**
+     * Focuses the specified cell.
+     * @param rowVisibleIndex An integer value that specifies the visible index of the row.
+     * @param columnIndex A zero-based index that identifies the column in the column collection (the column's Index property value).
+     */
+    SetFocusedCell(rowVisibleIndex: number, columnIndex: number): void;
+    /**
+     * Invokes the Customization Dialog and displays it over the grid.
+     */
+    ShowCustomizationDialog(): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param column An ASPxClientGridViewColumn object that represents the data column.
+     */
+    SortBy(column: ASPxClientGridViewColumn): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     */
+    SortBy(columnIndex: number): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     */
+    SortBy(columnFieldNameOrId: string): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param column An ASPxClientGridViewColumn object that represents the data column.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     */
+    SortBy(column: ASPxClientGridViewColumn, sortOrder: string): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     */
+    SortBy(columnIndex: number, sortOrder: string): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     */
+    SortBy(columnFieldNameOrId: string, sortOrder: string): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param column An ASPxClientGridViewColumn object that represents the data column.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     */
+    SortBy(column: ASPxClientGridViewColumn, sortOrder: string, reset: boolean): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     */
+    SortBy(columnIndex: number, sortOrder: string, reset: boolean): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     */
+    SortBy(columnFieldNameOrId: string, sortOrder: string, reset: boolean): void;
+    /**
+     * Sorts data by the specified data column's values, and places the column to the specified position among the sorted columns.
+     * @param column An ASPxClientGridViewColumn object that represents the data column.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     * @param sortIndex An integer value that specifies the zero-based column's index among the sorted columns. -1 if data is not sorted by this column.
+     */
+    SortBy(column: ASPxClientGridViewColumn, sortOrder: string, reset: boolean, sortIndex: number): void;
+    /**
+     * Sorts data by the specified data column's values, and places the column to the specified position among the sorted columns.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     * @param sortIndex An integer value that specifies the zero-based column's index among the sorted columns. -1 if data is not sorted by this column.
+     */
+    SortBy(columnIndex: number, sortOrder: string, reset: boolean, sortIndex: number): void;
+    /**
+     * Sorts data by the specified data column's values, and places the column to the specified position among the sorted columns.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     * @param sortIndex An integer value that specifies the zero-based column's index among the sorted columns. -1 if data is not sorted by this column.
+     */
+    SortBy(columnFieldNameOrId: string, sortOrder: string, reset: boolean, sortIndex: number): void;
+    /**
+     * Hides the specified column.
+     * @param column An ASPxClientGridViewColumn object that represents the column to hide.
+     */
+    MoveColumn(column: ASPxClientGridViewColumn): void;
+    /**
+     * Hides the specified column.
+     * @param columnIndex An integer value that specifies the absolute index of the column to hide.
+     */
+    MoveColumn(columnIndex: number): void;
+    /**
+     * Hides the specified column.
+     * @param columnFieldNameOrId A String value that identifies the column to be hidden by the name of the data source field to which the column is bound, or by the column's name.
+     */
+    MoveColumn(columnFieldNameOrId: string): void;
+    /**
+     * Moves the specified column to the specified visual position within the grid.
+     * @param column An ASPxClientGridViewColumn object that represents the column to move.
+     * @param moveToColumnVisibleIndex An integer value that specifies the column's position among the visible columns within the grid.
+     */
+    MoveColumn(column: ASPxClientGridViewColumn, moveToColumnVisibleIndex: number): void;
+    /**
+     * Moves the specified column to the specified visual position within the grid.
+     * @param columnIndex An integer value that specifies the absolute index of the column to move.
+     * @param moveToColumnVisibleIndex An integer value that specifies the column's position among the visible columns within the grid.
+     */
+    MoveColumn(columnIndex: number, moveToColumnVisibleIndex: number): void;
+    /**
+     * Moves the specified column to the specified visual position within the grid.
+     * @param columnFieldNameOrId A String value that identifies the column to be moved by the name of the data source field to which the column is bound or by the column's name.
+     * @param moveToColumnVisibleIndex An integer value that specifies the column's position among the visible columns within the grid.
+     */
+    MoveColumn(columnFieldNameOrId: string, moveToColumnVisibleIndex: number): void;
+    /**
+     * Moves the specified column to the specified visual position within the grid.
+     * @param column An ASPxClientGridViewColumn object that represents the column to move.
+     * @param moveToColumnVisibleIndex An integer value that identifies the target column displayed within the grid.
+     * @param moveBefore true to move the column before the target column; otherwise, false.
+     */
+    MoveColumn(column: ASPxClientGridViewColumn, moveToColumnVisibleIndex: number, moveBefore: boolean): void;
+    /**
+     * Moves the specified column to the specified visual position within the grid.
+     * @param columnIndex An integer value that specifies the absolute index of the column to move.
+     * @param moveToColumnVisibleIndex An integer value that identifies the target column displayed within the grid.
+     * @param moveBefore true to move the column before the target column; otherwise, false.
+     */
+    MoveColumn(columnIndex: number, moveToColumnVisibleIndex: number, moveBefore: boolean): void;
+    /**
+     * Moves the specified column to the specified visual position within the grid.
+     * @param columnFieldNameOrId A string value that identifies the column to be moved by the name of the data source field to which the column is bound or by the column's name.
+     * @param moveToColumnVisibleIndex An integer value that identifies the target column displayed within the grid.
+     * @param moveBefore true to move the column before the target column; otherwise, false.
+     */
+    MoveColumn(columnFieldNameOrId: string, moveToColumnVisibleIndex: number, moveBefore: boolean): void;
+    /**
+     * Moves the specified column to the specified visual position within the grid and optionally groups the grid's data by this column.
+     * @param column An ASPxClientGridViewColumn object that represents the column to move.
+     * @param moveToColumnVisibleIndex An integer value that identifies the target column displayed within the grid.
+     * @param moveBefore true to move the column before the target column; otherwise, false.
+     * @param moveToGroup true to group the grid's data by the column; otherwise, false.
+     */
+    MoveColumn(column: ASPxClientGridViewColumn, moveToColumnVisibleIndex: number, moveBefore: boolean, moveToGroup: boolean): void;
+    /**
+     * Moves the specified column to the specified visual position within the grid and optionally groups the grid's data by this column.
+     * @param columnIndex An integer value that specifies the absolute index of the column to move.
+     * @param moveToColumnVisibleIndex An integer value that identifies the target column displayed within the grid.
+     * @param moveBefore true to move the column before the target column; otherwise, false.
+     * @param moveToGroup true to group the ASPxGridView's data by the column; otherwise, false.
+     */
+    MoveColumn(columnIndex: number, moveToColumnVisibleIndex: number, moveBefore: boolean, moveToGroup: boolean): void;
+    /**
+     * Moves the specified column to the specified visual position within the grid and optionally groups the grid's data by this column.
+     * @param columnFieldNameOrId A string value that identifies the column to be moved by the name of the data source field to which the column is bound or by the column's name.
+     * @param moveToColumnVisibleIndex An integer value that identifies the target column displayed within the grid.
+     * @param moveBefore true to move the column before the target column; otherwise, false.
+     * @param moveToGroup true to group the grid's data by the column; otherwise, false.
+     */
+    MoveColumn(columnFieldNameOrId: string, moveToColumnVisibleIndex: number, moveBefore: boolean, moveToGroup: boolean): void;
+    /**
+     * Moves the specified column to the specified visual position within the grid and optionally groups or ungroups the grid's data by this column.
+     * @param column An ASPxClientGridViewColumn object that represents the column to move.
+     * @param moveToColumnVisibleIndex An integer value that identifies the target column displayed within the grid.
+     * @param moveBefore true to move the column before the target column; otherwise, false.
+     * @param moveToGroup true to group the grid's data by the column; otherwise, false.
+     * @param moveFromGroup true to ungroup the grid's data by the column; otherwise, false.
+     */
+    MoveColumn(column: ASPxClientGridViewColumn, moveToColumnVisibleIndex: number, moveBefore: boolean, moveToGroup: boolean, moveFromGroup: boolean): void;
+    /**
+     * Moves the specified column to the specified visual position within the grid and optionally groups or ungroups the grid's data by this column.
+     * @param columnIndex An integer value that specifies the absolute index of the column to move.
+     * @param moveToColumnVisibleIndex An integer value that identifies the target column displayed within the grid.
+     * @param moveBefore true to move the column before the target column; otherwise, false.
+     * @param moveToGroup true to group the grid's data by the column; otherwise, false.
+     * @param moveFromGroup true to ungroup the grid's data by the column; otherwise, false.
+     */
+    MoveColumn(columnIndex: number, moveToColumnVisibleIndex: number, moveBefore: boolean, moveToGroup: boolean, moveFromGroup: boolean): void;
+    /**
+     * Moves the specified column to the specified visual position within the grid and optionally groups or ungroups the grid's data by this column.
+     * @param columnFieldNameOrId A string value that identifies the column to be moved by the name of the data source field to which the column is bound or by the column's name.
+     * @param moveToColumnVisibleIndex An integer value that identifies the target column displayed within the grid.
+     * @param moveBefore true to move the column before the target column; otherwise, false.
+     * @param moveToGroup true to group the grid's data by the column; otherwise, false.
+     * @param moveFromGroup true to ungroup the grid's data by the column; otherwise, false.
+     */
+    MoveColumn(columnFieldNameOrId: string, moveToColumnVisibleIndex: number, moveBefore: boolean, moveToGroup: boolean, moveFromGroup: boolean): void;
+    /**
+     * Moves the specified column to the specified visual position within the grid.
+     * @param columnIndex An integer value that specifies the absolute index of the column to move.
+     * @param moveToColumnVisibleIndex An integer value that specifies the column's position among the visible columns within the grid.
+     * @param targetPosition An ASPxClientGridColumnMovingTargetPosition enumeration value specifying the position relative to the target column in which to place the moved column.
+     */
+    MoveColumn(columnIndex: number, moveToColumnVisibleIndex: number, targetPosition: ASPxClientGridColumnMovingTargetPosition): void;
+    /**
+     * Moves the specified column to the specified visual position within the grid.
+     * @param columnFieldNameOrId A String value that identifies the column to be moved by the name of the data source field to which the column is bound or by the column's name.
+     * @param moveToColumnVisibleIndex An integer value that specifies the column's position among the visible columns within the grid.
+     * @param targetPosition An ASPxClientGridColumnMovingTargetPosition enumeration value specifying the position relative to the target column in which to place the moved column.
+     */
+    MoveColumn(columnFieldNameOrId: string, moveToColumnVisibleIndex: number, targetPosition: ASPxClientGridColumnMovingTargetPosition): void;
+    /**
+     * Moves the specified column to the specified visual position within the grid and optionally groups or ungroups the grid's data by this column.
+     * @param columnIndex An integer value that specifies the absolute index of the column to move.
+     * @param moveToColumnVisibleIndex An integer value that identifies the target column displayed within the grid.
+     * @param targetPosition An ASPxClientGridColumnMovingTargetPosition enumeration value specifying the position relative to the target column in which to place the moved column.
+     * @param moveToGroup true, to group the ASPxGridView's data by the column; otherwise, false.
+     * @param moveFromGroup true, to ungroup the grid's data by the column; otherwise, false.
+     */
+    MoveColumn(columnIndex: number, moveToColumnVisibleIndex: number, targetPosition: ASPxClientGridColumnMovingTargetPosition, moveToGroup: boolean, moveFromGroup: boolean): void;
+    /**
+     * Moves the specified column to the specified visual position within the grid and optionally groups or ungroups the grid's data by this column.
+     * @param columnFieldNameOrId A string value that identifies the column to be moved by the name of the data source field to which the column is bound or by the column's name.
+     * @param moveToColumnVisibleIndex An integer value that identifies the target column displayed within the grid.
+     * @param targetPosition An ASPxClientGridColumnMovingTargetPosition enumeration value specifying the position relative to the target column in which to place the moved column.
+     * @param moveToGroup true, to group the grid's data by the column; otherwise, false.
+     * @param moveFromGroup true, to ungroup the grid's data by the column; otherwise, false.
+     */
+    MoveColumn(columnFieldNameOrId: string, moveToColumnVisibleIndex: number, targetPosition: ASPxClientGridColumnMovingTargetPosition, moveToGroup: boolean, moveFromGroup: boolean): void;
+    /**
+     * Groups data by the values of the specified column.
+     * @param column An ASPxClientGridViewColumn object that represents the data column by whose values data is grouped.
+     */
+    GroupBy(column: ASPxClientGridViewColumn): void;
+    /**
+     * Groups data by the values of the specified column.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     */
+    GroupBy(columnIndex: number): void;
+    /**
+     * Groups data by the values of the specified column.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     */
+    GroupBy(columnFieldNameOrId: string): void;
+    /**
+     * Groups data by the values of the specified data column. If several columns are involved in grouping, the specified column will reside at the specified grouping level.
+     * @param column An ASPxClientGridViewColumn object that represents the data column by whose values data is grouped.
+     * @param groupIndex An integer value that specifies the grouping level. -1 to cancel grouping by the column's values.
+     */
+    GroupBy(column: ASPxClientGridViewColumn, groupIndex: number): void;
+    /**
+     * Groups data by the values of the specified data column. If several columns are involved in grouping, the specified column will reside at the specified grouping level.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     * @param groupIndex An integer value that specifies the grouping level. -1 to cancel grouping by the column's values.
+     */
+    GroupBy(columnIndex: number, groupIndex: number): void;
+    /**
+     * Groups data by the values of the specified data column. If several columns are involved in grouping, the specified column will reside at the specified grouping level.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     * @param groupIndex An integer value that specifies the grouping level. -1 to cancel grouping by the column's values.
+     */
+    GroupBy(columnFieldNameOrId: string, groupIndex: number): void;
+    /**
+     * Groups data by the values of the specified data column with the specified sort order. If several columns are involved in grouping, the specified column will reside at the specified grouping level.
+     * @param column An ASPxClientGridViewColumn object that represents the data column by whose values data is grouped.
+     * @param groupIndex An integer value that specifies the grouping level. -1 to cancel grouping by the column's values.
+     * @param sortOrder A string value that specifies the column's sort order.
+     */
+    GroupBy(column: ASPxClientGridViewColumn, groupIndex: number, sortOrder: string): void;
+    /**
+     * Groups data by the values of the specified data column with the specified sort order. If several columns are involved in grouping, the specified column will reside at the specified grouping level.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     * @param groupIndex An integer value that specifies the grouping level. -1 to cancel grouping by the column's values.
+     * @param sortOrder A string value that specifies the column's sort order.
+     */
+    GroupBy(columnIndex: number, groupIndex: number, sortOrder: string): void;
+    /**
+     * Groups data by the values of the specified data column with the specified sort order. If several columns are involved in grouping, the specified column will reside at the specified grouping level.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     * @param groupIndex An integer value that specifies the grouping level. -1 to cancel grouping by the column's values.
+     * @param sortOrder A string value that specifies the column's sort order.
+     */
+    GroupBy(columnFieldNameOrId: string, groupIndex: number, sortOrder: string): void;
+    /**
+     * Ungroups data by the values of the specified column.
+     * @param column An ASPxClientGridViewColumn object that represents the data column within the ASPxGridView.
+     */
+    UnGroup(column: ASPxClientGridViewColumn): void;
+    /**
+     * Ungroups data by the values of the specified column.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     */
+    UnGroup(columnIndex: number): void;
+    /**
+     * Ungroups data by the values of the specified column.
+     * @param columnFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     */
+    UnGroup(columnFieldNameOrId: string): void;
+    /**
+     * Ungroups data by the values of a specified column.
+     * @param column A ASPxClientGridViewColumn object that is the grid column.
+     */
+    Ungroup(column: ASPxClientGridViewColumn): void;
+    /**
+     * Ungroups data by the values of a specified column.
+     * @param columnIndex An integer value that is the column index.
+     */
+    Ungroup(columnIndex: number): void;
+    /**
+     * Ungroups data by the values of a specified column.
+     * @param columnFieldNameOrId A string value that is the column's FieldName or ID.
+     */
+    Ungroup(columnFieldNameOrId: string): void;
+    /**
+     * Expands all group rows.
+     */
+    ExpandAll(): void;
+    /**
+     * Collapses all group rows.
+     */
+    CollapseAll(): void;
+    /**
+     * Expands all detail rows.
+     */
+    ExpandAllDetailRows(): void;
+    /**
+     * Collapses all detail rows.
+     */
+    CollapseAllDetailRows(): void;
+    /**
+     * Expands the specified group row preserving the collapsed state of any child group row.
+     * @param visibleIndex An integer value that identifies the group row.
+     */
+    ExpandRow(visibleIndex: number): void;
+    /**
+     * Expands the specified group row and optionally child group rows at all nesting levels.
+     * @param visibleIndex An integer value that identifies the group row.
+     * @param recursive true to expand any child group rows at all nesting levels; false to preserve the collapsed state of any child group rows.
+     */
+    ExpandRow(visibleIndex: number, recursive?: boolean): void;
+    /**
+     * Collapses the specified group row preserving the expanded state of child group rows.
+     * @param visibleIndex An integer value that identifies the group row by its visible index.
+     */
+    CollapseRow(visibleIndex: number): void;
+    /**
+     * Collapses the specified group row and optionally child group rows at all nesting levels.
+     * @param visibleIndex An integer value that identifies the group row by its visible index.
+     * @param recursive true to collapse child group rows at all nesting levels; false to preserve the expanded state of any child group row.
+     */
+    CollapseRow(visibleIndex: number, recursive?: boolean): void;
+    /**
+     * Scrolls the view to the specified row.
+     * @param visibleIndex An integer value that identifies a row by its visible index.
+     */
+    MakeRowVisible(visibleIndex: number): void;
+    /**
+     * Expands the specified detail row.
+     * @param visibleIndex A zero-based integer index that identifies the detail row.
+     */
+    ExpandDetailRow(visibleIndex: number): void;
+    /**
+     * Collapses the specified detail row.
+     * @param visibleIndex A zero-based integer index that identifies the detail row.
+     */
+    CollapseDetailRow(visibleIndex: number): void;
+    /**
+     * Returns the key value of the specified data row.
+     * @param visibleIndex An integer value that specifies the row's visible index.
+     */
+    GetRowKey(visibleIndex: number): string;
+    /**
+     * Switches the grid to edit mode.
+     * @param visibleIndex A zero-based integer that identifies a data row to be edited.
+     */
+    StartEditRow(visibleIndex: number): void;
+    /**
+     * Switches the grid to edit mode.
+     * @param key An object that uniquely identifies a data row to be edited.
+     */
+    StartEditRowByKey(key: Object): void;
+    /**
+     * Indicates whether or not a new row is being edited.
+     */
+    IsNewRowEditing(): boolean;
+    /**
+     * Adds a new record.
+     */
+    AddNewRow(): void;
+    /**
+     * Deletes the specified row.
+     * @param visibleIndex An integer value that identifies the row.
+     */
+    DeleteRow(visibleIndex: number): void;
+    /**
+     * Deletes a row with the specified key value.
+     * @param key An object that uniquely identifies the row.
+     */
+    DeleteRowByKey(key: Object): void;
+    /**
+     * Returns the focused row's index.
+     */
+    GetFocusedRowIndex(): number;
+    /**
+     * Moves focus to the specified row.
+     * @param visibleIndex An integer value that specifies the focused row's index.
+     */
+    SetFocusedRowIndex(visibleIndex: number): void;
+    /**
+     * Selects all the unselected rows within the grid.
+     */
+    SelectRows(): void;
+    /**
+     * Selects the specified row displayed within the grid.
+     * @param visibleIndex A zero-based integer value that specifies the row's visible index.
+     */
+    SelectRows(visibleIndex: number): void;
+    /**
+     * Selects the specified rows within the grid.
+     * @param visibleIndices An array of zero-based indices that identify data rows within the grid.
+     */
+    SelectRows(visibleIndices: number[]): void;
+    /**
+     * Selects or deselects the specified rows within the grid.
+     * @param visibleIndices An array of zero-based indices that identify data rows within the grid.
+     * @param selected true to select the specified rows; false to deselect the rows.
+     */
+    SelectRows(visibleIndices: number[], selected: boolean): void;
+    /**
+     * Selects or deselects the specified row within the grid.
+     * @param visibleIndex An integer zero-based index that identifies the data row within the grid.
+     * @param selected true to select the specified row; false to deselect the row.
+     */
+    SelectRows(visibleIndex: number, selected?: boolean): void;
+    /**
+     * Selects or deselects the specified rows displayed within the grid.
+     * @param keys An array of objects that uniquely identify the rows.
+     * @param selected true to select the specified rows; false to deselect the rows.
+     */
+    SelectRowsByKey(keys: Object[], selected?: boolean): void;
+}
+/**
+ * A client grid column.
+ */
+interface ASPxClientGridViewColumn extends ASPxClientGridColumnBase {
+    /**
+     * Gets the column's unique identifier.
+     * Value: A string value that specifies the column's unique identifier.
+     */
+    id: string;
+    /**
+     * Gets the name that uniquely identifies the column.
+     * Value: A string value assigned to the column's Name property.
+     */
+    name: string;
+    /**
+     * Gets the column's position within the collection.
+     * Value: An integer zero-bazed index that specifies the column's position within the collection.
+     */
+    index: number;
+    /**
+     * Gets the name of the database field assigned to the current column.
+     * Value: A string value that specifies the name of a data field.
+     */
+    fieldName: string;
+    /**
+     * Gets whether the column is visible.
+     * Value: true to display the column; otherwise, false.
+     */
+    visible: boolean;
+}
+/**
+ * Represents a JavaScript function which receives the list of row values when the client GetSelectedFieldValues method is called.
+ */
+interface ASPxClientGridViewValuesCallback {
+    /**
+     * Represents a JavaScript function which receives the list of row values when the client GetSelectedFieldValues method is called.
+     * @param result An object that represents the list of row values received from the server.
+     */
+    (result: Object): void;
+}
+/**
+ * A method that will handle the cancelable events of a client ASPxGridView column.
+ */
+interface ASPxClientGridViewColumnCancelEventHandler<S> {
+    /**
+     * A method that will handle the cancelable events of a client ASPxGridView column.
+     * @param source The event source.
+     * @param e An ASPxClientGridViewColumnCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewColumnCancelEventArgs): void;
+}
+/**
+ * Provides data for the cancelable events of a client ASPxGridView column.
+ */
+interface ASPxClientGridViewColumnCancelEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the processed client column.
+     * Value: An ASPxClientGridViewColumn object that represents the processed column.
+     */
+    column: ASPxClientGridViewColumn;
+}
+/**
+ * A method that will handle the client events concerned with column processing.
+ */
+interface ASPxClientGridViewColumnProcessingModeEventHandler<S> {
+    /**
+     * A method that will handle the client events concerned with column processing.
+     * @param source The event source.
+     * @param e A ASPxClientGridViewColumnProcessingModeEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewColumnProcessingModeEventArgs): void;
+}
+/**
+ * Provides data for the client events  concerned with column processing, and that allow the event's processing to be passed to the server side.
+ */
+interface ASPxClientGridViewColumnProcessingModeEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets a grid column related to the event.
+     * Value: An ASPxClientGridViewColumn object representing the column related to the event.
+     */
+    column: ASPxClientGridViewColumn;
+}
+/**
+ * A method that will handle the RowExpanding events.
+ */
+interface ASPxClientGridViewRowCancelEventHandler<S> {
+    /**
+     * A method that will handle the RowExpanding events.
+     * @param source The event source.
+     * @param e An ASPxClientGridViewRowCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewRowCancelEventArgs): void;
+}
+/**
+ * Provides data for the RowExpanding events.
+ */
+interface ASPxClientGridViewRowCancelEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the processed row's visible index.
+     * Value: An integer zero-based index that identifies the processed row.
+     */
+    visibleIndex: number;
+}
+/**
+ * A method that will handle the SelectionChanged event.
+ */
+interface ASPxClientGridViewSelectionEventHandler<S> {
+    /**
+     * A method that will handle the SelectionChanged event.
+     * @param source The event source.
+     * @param e An ASPxClientGridViewSelectionEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewSelectionEventArgs): void;
+}
+/**
+ * Provides data for the SelectionChanged event.
+ */
+interface ASPxClientGridViewSelectionEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the visible index of the row whose selected state has been changed.
+     * Value: An <see cref="Int32" /> value that specifies the visible index of the row.
+     */
+    visibleIndex: number;
+    /**
+     * Gets whether the row has been selected.
+     * Value: true if the row has been selected; otherwise, false.
+     */
+    isSelected: boolean;
+    /**
+     * Gets whether all rows displayed within a page have been selected or unselected.
+     * Value: true if all rows displayed within a page have been selected or unselected; otherwise, false.
+     */
+    isAllRecordsOnPage: boolean;
+    /**
+     * Gets whether a selection has been changed on the server.
+     * Value: true  if a selection has been changed on the server; otherwise, false.
+     */
+    isChangedOnServer: boolean;
+}
+/**
+ * A method that will handle the RowClick events.
+ */
+interface ASPxClientGridViewRowClickEventHandler<S> {
+    /**
+     * A method that will handle the RowClick event.
+     * @param source The event source. This parameter identifies the ASPxClientGridView object that raised the event.
+     * @param e An ASPxClientGridViewRowClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewRowClickEventArgs): void;
+}
+/**
+ * Provides data for the RowClick event.
+ */
+interface ASPxClientGridViewRowClickEventArgs extends ASPxClientGridViewRowCancelEventArgs {
+    /**
+     * Provides access to the parameters associated with the RowClick event.
+     * Value: An object that contains parameters associated with the event.
+     */
+    htmlEvent: Object;
+}
+/**
+ * A method that will handle the ContextMenu event.
+ */
+interface ASPxClientGridViewContextMenuEventHandler<S> {
+    /**
+     * A method that will handle the ContextMenu event.
+     * @param source The event source.
+     * @param e An ASPxClientGridViewContextMenuEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewContextMenuEventArgs): void;
+}
+/**
+ * Provides data for the ContextMenu event.
+ */
+interface ASPxClientGridViewContextMenuEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets which grid element has been right clicked by the user.
+     * Value: A String value that specifies grid element.
+     */
+    objectType: string;
+    /**
+     * Identifies the grid element being right clicked by the user.
+     * Value: A zero-based integer index that identifies the grid element being clicked by the user.
+     */
+    index: number;
+    /**
+     * Provides access to the parameters associated with the ContextMenu event.
+     * Value: An object that contains parameters associated with the event.
+     */
+    htmlEvent: Object;
+    /**
+     * Gets the currently processed menu object.
+     * Value: An object that is the currently processed menu.
+     */
+    menu: Object;
+    /**
+     * Specifies whether a browser context menu should be displayed.
+     * Value: true, to display a browser context menu; otherwise, false.    The default is false.
+     */
+    showBrowserMenu: boolean;
+}
+/**
+ * A method that will handle the client ContextMenuItemClick event.
+ */
+interface ASPxClientGridViewContextMenuItemClickEventHandler<S> {
+    /**
+     * A method that will handle the ContextMenuItemClick event.
+     * @param source The event source.
+     * @param e An ASPxClientGridViewContextMenuItemClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewContextMenuItemClickEventArgs): void;
+}
+/**
+ * Provides data for the ContextMenuItemClick event.
+ */
+interface ASPxClientGridViewContextMenuItemClickEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the clicked context menu item.
+     * Value: An <see cref="ASPxClientMenuItem" /> object, manipulations on which forced the event to be raised.
+     */
+    item: ASPxClientMenuItem;
+    /**
+     * Gets which grid element has been right clicked by the user.
+     * Value: A String value that specifies the grid element.
+     */
+    objectType: string;
+    /**
+     * Returns the processed element index.
+     * Value: An integer value that specifies the processed element index.
+     */
+    elementIndex: number;
+    /**
+     * Specifies whether a postback or a callback is used to finally process the event on the server side.
+     * Value: true to perform the round trip to the server side via postback; false to perform the round trip to the server side via callback.
+     */
+    usePostBack: boolean;
+    /**
+     * Specifies whether default context menu item click is handled manually, so no default processing is required.
+     * Value: true if no default processing is required; otherwise false.
+     */
+    handled: boolean;
+}
+/**
+ * A method that will handle the CustomButtonClick event.
+ */
+interface ASPxClientGridViewCustomButtonEventHandler<S> {
+    /**
+     * A method that will handle the CustomButtonClick event.
+     * @param source The event source.  This parameter identifies the ASPxClientGridView object that raised the event.
+     * @param e An ASPxClientGridViewCustomButtonEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewCustomButtonEventArgs): void;
+}
+/**
+ * Provides data for the CustomButtonClick event.
+ */
+interface ASPxClientGridViewCustomButtonEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the value which identifies the row whose custom button has been clicked.
+     * Value: An integer value that identifies the row whose custom button has been clicked.
+     */
+    visibleIndex: number;
+    /**
+     * Gets the value which identifies the custom button.
+     * Value: A string value that identifies the clicked custom button.
+     */
+    buttonID: string;
+}
+/**
+ * A method that will handle the ColumnMoving event.
+ */
+interface ASPxClientGridViewColumnMovingEventHandler<S> {
+    /**
+     * A method that will handle the ColumnMoving event.
+     * @param source The event source.
+     * @param e An ASPxClientGridViewColumnMovingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewColumnMovingEventArgs): void;
+}
+/**
+ * Provides data for the ColumnMoving event.
+ */
+interface ASPxClientGridViewColumnMovingEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets or sets whether a column is allowed to be moved.
+     * Value: true to allow column moving; otherwise, false.
+     */
+    allow: boolean;
+    /**
+     * Gets the column currently being dragged by an end-user.
+     * Value: An ASPxClientGridViewColumn object that represents the column currently being dragged by an end-user.
+     */
+    sourceColumn: ASPxClientGridViewColumn;
+    /**
+     * Gets the target column, before or after which the source column will be inserted (if dropped).
+     * Value: An ASPxClientGridViewColumn object that represents the target column. null (Nothing in Visual Basic) if the source column isn't over the column header panel.
+     */
+    destinationColumn: ASPxClientGridViewColumn;
+    /**
+     * Gets whether the source column will be inserted before the target column (if dropped).
+     * Value: true if the source column will be inserted before the target column (if dropped); otherwise, false.
+     */
+    isDropBefore: boolean;
+    /**
+     * Gets whether the source column is currently over the Group Panel.
+     * Value: true if the source column is currently over the Group Panel; otherwise, false.
+     */
+    isGroupPanel: boolean;
+}
+/**
+ * Represents an object that will handle the client-side BatchEditConfirmShowing event.
+ */
+interface ASPxClientGridViewBatchEditConfirmShowingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditConfirmShowing client event.
+     * @param source The event source.
+     * @param e An ASPxClientGridViewBatchEditConfirmShowingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewBatchEditConfirmShowingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditConfirmShowing event.
+ */
+interface ASPxClientGridViewBatchEditConfirmShowingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the client identifier of an object that initiates a send request.
+     * Value: A string value that specifies the object client identifier.
+     */
+    requestTriggerID: string;
+}
+/**
+ * A method that will handle the client BatchEditStartEditing event.
+ */
+interface ASPxClientGridViewBatchEditStartEditingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditStartEditing event.
+     * @param source The event source.
+     * @param e An ASPxClientGridViewBatchEditStartEditingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewBatchEditStartEditingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditStartEditing event.
+ */
+interface ASPxClientGridViewBatchEditStartEditingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the visible index of the row whose cells are about to be edited.
+     * Value: An <see cref="Int32" /> value that specifies the visible index of the row.
+     */
+    visibleIndex: number;
+    /**
+     * Gets the grid column that owns a cell that is about to be edited.
+     * Value: An <see cref="ASPxClientGridViewColumn" /> object that is the focused grid column.
+     */
+    focusedColumn: ASPxClientGridViewColumn;
+    /**
+     * Gets a hashtable that maintains information about editable cells.
+     * Value: A hashtable that stores information about editable cells.
+     */
+    rowValues: Object;
+}
+/**
+ * A method that will handle the client BatchEditEndEditing event.
+ */
+interface ASPxClientGridViewBatchEditEndEditingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditEndEditing event.
+     * @param source The event source.
+     * @param e An ASPxClientGridViewBatchEditEndEditingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewBatchEditEndEditingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditEndEditing event.
+ */
+interface ASPxClientGridViewBatchEditEndEditingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the visible index of the row whose cells has been edited.
+     * Value: An <see cref="Int32" /> value that specifies the visible index of the row.
+     */
+    visibleIndex: number;
+    /**
+     * Gets a hashtable that maintains information about editable cells.
+     * Value: A hashtable that stores information about editable cells.
+     */
+    rowValues: Object;
+}
+/**
+ * A method that will handle the client BatchEditRowValidating event.
+ */
+interface ASPxClientGridViewBatchEditRowValidatingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditRowValidating event.
+     * @param source The event source.
+     * @param e An ASPxClientGridViewBatchEditRowValidatingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewBatchEditRowValidatingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditRowValidating event.
+ */
+interface ASPxClientGridViewBatchEditRowValidatingEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the processed row's visible index.
+     * Value: An integer value that specifies the processed row's visible index.
+     */
+    visibleIndex: number;
+    /**
+     * Provides validation information of a row currently being validated.
+     * Value: An object that is a hashtable containing validation information.
+     */
+    validationInfo: Object;
+}
+/**
+ * A method that will handle the client BatchEditTemplateCellFocused event.
+ */
+interface ASPxClientGridViewBatchEditTemplateCellFocusedEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditTemplateCellFocused event.
+     * @param source An object representing the event source. Identifies the button editor that raised the event.
+     * @param e An ASPxClientGridViewBatchEditTemplateCellFocusedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewBatchEditTemplateCellFocusedEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditTemplateCellFocused event.
+ */
+interface ASPxClientGridViewBatchEditTemplateCellFocusedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the currently processed column.
+     * Value: A <see cref="ASPxClientGridViewColumn" /> object that is the client-side column object.
+     */
+    column: ASPxClientGridViewColumn;
+    /**
+     * Gets or sets a value specifying whether the event was handled.
+     * Value: true if the event was handled and default processing should not occur; false if the event should be handled using default processing.
+     */
+    handled: boolean;
+}
+/**
+ * A method that will handle the BatchEditChangesSaving event.
+ */
+interface ASPxClientGridViewBatchEditChangesSavingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditChangesSaving event.
+     * @param source The event source. This parameter identifies the grid view object which raised the event.
+     * @param e An ASPxClientGridViewBatchEditChangesSavingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewBatchEditChangesSavingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditChangesSaving event.
+ */
+interface ASPxClientGridViewBatchEditChangesSavingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets a hashtable that maintains information about inserted cells.
+     * Value: A hashtable that stores information about inserted cells.
+     */
+    insertedValues: Object;
+    /**
+     * Gets a hashtable that maintains information about deleted cells.
+     * Value: A hashtable that stores information about deleted cells.
+     */
+    deletedValues: Object;
+    /**
+     * Gets a hashtable that maintains information about updated cells.
+     * Value: A hashtable that stores information about updated cells.
+     */
+    updatedValues: Object;
+}
+/**
+ * A method that will handle the BatchEditChangesCanceling event.
+ */
+interface ASPxClientGridViewBatchEditChangesCancelingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditChangesCanceling event.
+     * @param source The event source. This parameter identifies the grid view object which raised the event.
+     * @param e An ASPxClientGridViewBatchEditChangesCancelingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewBatchEditChangesCancelingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditChangesCanceling event.
+ */
+interface ASPxClientGridViewBatchEditChangesCancelingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets a hashtable that maintains information about inserted cells.
+     * Value: A hashtable that stores information about inserted cells.
+     */
+    insertedValues: Object;
+    /**
+     * Gets a hashtable that maintains information about deleted cells.
+     * Value: A hashtable that stores information about deleted cells.
+     */
+    deletedValues: Object;
+    /**
+     * Gets a hashtable that maintains information about updated cells.
+     * Value: A hashtable that stores information about updated cells.
+     */
+    updatedValues: Object;
+}
+/**
+ * A method that will handle the BatchEditRowInserting event.
+ */
+interface ASPxClientGridViewBatchEditRowInsertingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditRowInserting event.
+     * @param source The event source. This parameter identifies the card view object which raised the event.
+     * @param e An ASPxClientGridViewBatchEditRowInsertingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewBatchEditRowInsertingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditRowInserting event.
+ */
+interface ASPxClientGridViewBatchEditRowInsertingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the processed row's visible index.
+     * Value: An integer value that specifies the processed row's visible index.
+     */
+    visibleIndex: number;
+}
+/**
+ * A method that will handle the BatchEditRowDeleting event.
+ */
+interface ASPxClientGridViewBatchEditRowDeletingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditRowDeleting event.
+     * @param source The event source. This parameter identifies the grid view object which raised the event.
+     * @param e An ASPxClientGridViewBatchEditRowDeletingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewBatchEditRowDeletingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditRowDeleting event.
+ */
+interface ASPxClientGridViewBatchEditRowDeletingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the processed row's visible index.
+     * Value: An integer value that specifies the processed row's visible index.
+     */
+    visibleIndex: number;
+    /**
+     * Gets a hashtable that maintains information about deleted cells.
+     * Value: A hashtable that stores information about deleted cells.
+     */
+    rowValues: Object;
+}
+/**
+ * A method that will handle the FocusedCellChanging event.
+ */
+interface ASPxClientGridViewFocusedCellChangingEventHandler<S> {
+    /**
+     * A method that will handle the FocusedCellChanging event.
+     * @param source The event source.
+     * @param e An ASPxClientGridViewFocusedCellChangingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGridViewFocusedCellChangingEventArgs): void;
+}
+/**
+ * Provides data for the FocusedCellChanging event.
+ */
+interface ASPxClientGridViewFocusedCellChangingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Provides information on a cell currently being focused.
+     * Value: A ASPxClientGridViewCellInfo object that is the cell information.
+     */
+    cellInfo: ASPxClientGridViewCellInfo;
+}
+/**
+ * Contains information on a grid cell.
+ */
+interface ASPxClientGridViewCellInfo {
+    /**
+     * Gets the visible index of the row that contains the cell currently being processed.
+     * Value: An <see cref="Int32" /> value that specifies the visible index of the row.
+     */
+    rowVisibleIndex: number;
+    /**
+     * Gets the data column that contains the cell currently being processed.
+     * Value: An <see cref="ASPxClientGridViewColumn" /> object that is the data column which contains the processed cell.
+     */
+    column: ASPxClientGridViewColumn;
+}
+/**
+ * Provides members related to Batch Edit Mode
+ */
+interface ASPxClientGridViewBatchEditApi {
+    /**
+     * Performs validation of grid data contained in all rows when the grid operates in Batch Edit mode.
+     * @param validateOnlyModified true, if only modified rows should be validated; otherwise, false.
+     */
+    ValidateRows(validateOnlyModified?: boolean): boolean;
+    /**
+     * Performs validation of grid data contained in the specified row when the grid operates in Batch Edit mode.
+     * @param visibleIndex An integer value specifying the visible index of the validated row.
+     */
+    ValidateRow(visibleIndex: number): boolean;
+    /**
+     * Returns an array of row visible indices.
+     * @param includeDeleted true, to include visible indices of deleted rows to the returned array; otherwise, false.
+     */
+    GetRowVisibleIndices(includeDeleted: boolean): number[];
+    /**
+     * Returns an array of the deleted row visible indices.
+     */
+    GetDeletedRowIndices(): number[];
+    /**
+     * Returns an array of the inserted row visible indices.
+     */
+    GetInsertedRowIndices(): number[];
+    /**
+     * Indicates if the row with specified visible index is deleted.
+     * @param visibleIndex An integer value that identifies the row by its visible index.
+     */
+    IsDeletedRow(visibleIndex: number): boolean;
+    /**
+     * Indicates if the row with specified visible index is newly created.
+     * @param visibleIndex An integer value that identifies the row by its visible index.
+     */
+    IsNewRow(visibleIndex: number): boolean;
+    /**
+     * Programmatically moves the focus to the previous cell in the row.
+     */
+    MoveFocusBackward(): boolean;
+    /**
+     * Programmatically moves the focus to the next cell in the row.
+     */
+    MoveFocusForward(): boolean;
+    /**
+     * Sets a value of the specified cell.
+     * @param visibleIndex An integer zero-based index that identifies the row containing the processed cell.
+     * @param columnFieldNameOrId A string value that specifies the field name or unique identifier (the column's Name property value) of a column containing the processed cell.
+     * @param value An object that contains the new cell value.
+     */
+    SetCellValue(visibleIndex: number, columnFieldNameOrId: string, value: Object): void;
+    /**
+     * Sets the value of the specified cell.
+     * @param visibleIndex An integer zero-based index that identifies the row containing the processed cell.
+     * @param columnFieldNameOrId A string value that specifies the field name or unique identifier (the column's Name property value) of a column containing the processed cell.
+     * @param value An object that contains the new cell value.
+     * @param displayText A string value that specifies the cell display text.
+     * @param cancelCellHighlighting true to cancel highlighting of the modified cell, false to highlight the modified cell.
+     */
+    SetCellValue(visibleIndex: number, columnFieldNameOrId: string, value: Object, displayText: string, cancelCellHighlighting?: boolean): void;
+    /**
+     * Gets the value of the specified cell.
+     * @param visibleIndex A zero-based integer value that specifies a visible index of a row containing the processed cell.
+     * @param columnFieldNameOrId A string value that specifies the field name or unique identifier (the column's Name property value) of a column containing the processed cell.
+     * @param initial true, to return the initial (server) value; false, to return a value currently contained on the client side (modified value).
+     */
+    GetCellValue(visibleIndex: number, columnFieldNameOrId: string, initial?: boolean): Object;
+    /**
+     * Gets a container holding a data cell content.
+     * @param visibleIndex An integer value that is the visible index.
+     * @param columnFieldNameOrId A string value that is the column's Field Name or ID.
+     */
+    GetCellTextContainer(visibleIndex: number, columnFieldNameOrId: string): Object;
+    /**
+     * Gets information about the cell currently being edited.
+     */
+    GetEditCellInfo(): ASPxClientGridViewCellInfo;
+    /**
+     * Returns a value that indicates whether the grid has changed data.
+     */
+    HasChanges(): boolean;
+    /**
+     * Returns a value that indicates whether the specified row has changed data.
+     * @param visibleIndex An integer value that specifies the visible index of a row.
+     */
+    HasChanges(visibleIndex: number): boolean;
+    /**
+     * Returns a value that indicates whether the specified data cell's data has been changed.
+     * @param visibleIndex An integer value that specifies the visible index of a row.
+     * @param columnFieldNameOrId A string value that identifies the column by the name of the data source field to which the column is bound, or by the column's name.
+     */
+    HasChanges(visibleIndex: number, columnFieldNameOrId: string): boolean;
+    /**
+     * Resets changes in the specified row.
+     * @param visibleIndex An integer value that specifies the visible index of a row.
+     */
+    ResetChanges(visibleIndex: number): void;
+    /**
+     * Resets changes in the specified cell.
+     * @param visibleIndex An integer value that specifies the visible index of a row containing the processed cell.
+     * @param columnIndex A string value that specifies the field name or unique identifier (the column's Name property value) of a column containing the processed cell.
+     */
+    ResetChanges(visibleIndex: number, columnIndex: number): void;
+    /**
+     * Switches the specified cell to edit mode.
+     * @param visibleIndex A zero-based integer value that specifies the visible index of a row containing the processed cell.
+     * @param columnIndex A zero-based integer value that identifies the column which contains the processed cell in the column collection.
+     */
+    StartEdit(visibleIndex: number, columnIndex: number): void;
+    /**
+     * Ends cell or row editing.
+     */
+    EndEdit(): void;
+}
+/**
+ * A client-side equivalent of the ASPxVerticalGrid object.
+ */
+interface ASPxClientVerticalGrid extends ASPxClientGridBase {
+    /**
+     * Provides access to the batch editing client API.
+     * Value: A <see cref="ASPxClientVerticalGridBatchEditApi" /> object that exposes the batch editing client API methods.
+     */
+    batchEditApi: ASPxClientVerticalGridBatchEditApi;
+    /**
+     * Occurs when a custom command button has been clicked.
+     */
+    CustomButtonClick: ASPxClientEvent<ASPxClientVerticalGridCustomButtonEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Fires after the selection has been changed.
+     */
+    SelectionChanged: ASPxClientEvent<ASPxClientVerticalGridSelectionEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Occurs when a grid switches to batch edit mode.
+     */
+    BatchEditStartEditing: ASPxClientEvent<ASPxClientVerticalGridBatchEditStartEditingEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Occurs when a grid leaves the batch edit mode.
+     */
+    BatchEditEndEditing: ASPxClientEvent<ASPxClientVerticalGridBatchEditEndEditingEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Enables you to prevent a batch edit confirmation message from being displayed.
+     */
+    BatchEditConfirmShowing: ASPxClientEvent<ASPxClientVerticalGridBatchEditConfirmShowingEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Enables you to provide navigation for editors contained in a templated cell in Batch Edit mode.
+     */
+    BatchEditTemplateCellFocused: ASPxClientEvent<ASPxClientVerticalGridBatchEditTemplateCellFocusedEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Occurs on the client side before data changes are saved in batch edit mode.
+     */
+    BatchEditChangesSaving: ASPxClientEvent<ASPxClientVerticalGridBatchEditChangesSavingEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Occurs on the client side before data changes are canceled in batch edit mode.
+     */
+    BatchEditChangesCanceling: ASPxClientEvent<ASPxClientVerticalGridBatchEditChangesCancelingEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Occurs on the client side before a record is inserted in batch edit mode.
+     */
+    BatchEditRecordInserting: ASPxClientEvent<ASPxClientVerticalGridBatchEditRecordInsertingEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Occurs on the client side before a record is deleted in batch edit mode.
+     */
+    BatchEditRecordDeleting: ASPxClientEvent<ASPxClientVerticalGridBatchEditRecordDeletingEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Enables you to specify whether record data is valid and provide an error text.
+     */
+    BatchEditRecordValidating: ASPxClientEvent<ASPxClientVerticalGridBatchEditRecordValidatingEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Occurs on the client side when the focused cell is about to be changed.
+     */
+    FocusedCellChanging: ASPxClientEvent<ASPxClientVerticalGridFocusedCellChangingEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Enables you to prevent rows from being sorted.
+     */
+    RowSorting: ASPxClientEvent<ASPxClientVerticalGridRowCancelEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Fires on the client side before the expansion state of a row is changed by end-user interaction.
+     */
+    RowExpandedChanging: ASPxClientEvent<ASPxClientVerticalGridRowExpandingEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Fires on the client side after a row's expansion state has been changed by end-user interaction.
+     */
+    RowExpandedChanged: ASPxClientEvent<ASPxClientVerticalGridRowExpandedEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Fires on the client when a record is clicked.
+     */
+    RecordClick: ASPxClientEvent<ASPxClientVerticalGridRecordClickEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Fires on the client when a record is double clicked.
+     */
+    RecordDblClick: ASPxClientEvent<ASPxClientVerticalGridRecordClickEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Occurs on the client after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Fires on the client if any unhandled server error occurs during server-side processing of a callback sent by the ASPxClientVerticalGrid.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientVerticalGrid>>;
+    /**
+     * Sorts data by the specified data row's values.
+     * @param row An ASPxClientVerticalGridRow object that represents the data row.
+     */
+    SortBy(row: ASPxClientVerticalGridRow): void;
+    /**
+     * Sorts data by the specified data row's values.
+     * @param rowIndex An integer value that specifies the row's position within the row collection.
+     */
+    SortBy(rowIndex: number): void;
+    /**
+     * Sorts data by the specified data row's values.
+     * @param rowFieldNameOrId A string value that specifies the row's field name or unique identifier (the row's Name property value).
+     */
+    SortBy(rowFieldNameOrId: string): void;
+    /**
+     * Sorts data by the specified data row's values.
+     * @param row An ASPxClientVerticalGridRow object that represents the data row.
+     * @param sortOrder A string value that specifies the row's sort order ('ASC', 'DSC' or 'NONE').
+     */
+    SortBy(row: ASPxClientVerticalGridRow, sortOrder: string): void;
+    /**
+     * Sorts data by the specified data row's values.
+     * @param rowIndex An integer value that specifies the row's position within the row collection.
+     * @param sortOrder A string value that specifies the row's sort order ('ASC', 'DSC' or 'NONE').
+     */
+    SortBy(rowIndex: number, sortOrder: string): void;
+    /**
+     * Sorts data by the specified data row's values.
+     * @param rowFieldNameOrId A string value that specifies the row's field name or unique identifier (the row's Name property value).
+     * @param sortOrder A string value that specifies the row's sort order ('ASC', 'DSC' or 'NONE').
+     */
+    SortBy(rowFieldNameOrId: string, sortOrder: string): void;
+    /**
+     * Sorts data by the specified data row's values.
+     * @param row An ASPxClientVerticalGridRow object that represents the data row.
+     * @param sortOrder A string value that specifies the row's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     */
+    SortBy(row: ASPxClientVerticalGridRow, sortOrder: string, reset: boolean): void;
+    /**
+     * Sorts data by the specified data row's values.
+     * @param rowIndex An integer value that specifies the row's position within the row collection.
+     * @param sortOrder A string value that specifies the row's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true, to clear any previous sorting; otherwise, false.
+     */
+    SortBy(rowIndex: number, sortOrder: string, reset: boolean): void;
+    /**
+     * Sorts data by the specified data row's values.
+     * @param rowFieldNameOrId A string value that specifies the row's field name or unique identifier (the row's Name property value).
+     * @param sortOrder A string value that specifies the row's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     */
+    SortBy(rowFieldNameOrId: string, sortOrder: string, reset: boolean): void;
+    /**
+     * Sorts data by the specified data row's values, and places the row to the specified position among the sorted rows.
+     * @param row An ASPxClientGridViewColumn object that represents the data column.
+     * @param sortOrder A string value that specifies the row's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     * @param sortIndex An integer value that specifies the zero-based row's index among the sorted rows. -1 if data is not sorted by this row.
+     */
+    SortBy(row: ASPxClientVerticalGridRow, sortOrder: string, reset: boolean, sortIndex: number): void;
+    /**
+     * Sorts data by the specified data row's values, and places the row to the specified position among the sorted rows.
+     * @param rowIndex An integer value that specifies the row's position within the row collection.
+     * @param sortOrder A string value that specifies the row's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     * @param sortIndex 
+     */
+    SortBy(rowIndex: number, sortOrder: string, reset: boolean, sortIndex: number): void;
+    /**
+     * Sorts data by the specified data row's values, and places the row to the specified position among the sorted rows.
+     * @param rowFieldNameOrId A string value that specifies the column's field name or unique identifier (the column's Name property value).
+     * @param sortOrder A string value that specifies the row's sort order ('ASC', 'DSC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     * @param sortIndex An integer value that specifies the zero-based row's index among the sorted rows. -1 if data is not sorted by this row.
+     */
+    SortBy(rowFieldNameOrId: string, sortOrder: string, reset: boolean, sortIndex: number): void;
+    /**
+     * Returns the key value of the specified data row (record in the vertical grid).
+     * @param visibleIndex An integer value that specifies the record's visible index.
+     */
+    GetRecordKey(visibleIndex: number): string;
+    /**
+     * Adds a new record.
+     */
+    AddNewRecord(): void;
+    /**
+     * Deletes the specified record.
+     * @param visibleIndex An integer value that identifies the record.
+     */
+    DeleteRecord(visibleIndex: number): void;
+    /**
+     * Deletes a record with the specified key value.
+     * @param key An object that uniquely identifies the record.
+     */
+    DeleteRecordByKey(key: Object): void;
+    /**
+     * Selects all the unselected records within the grid.
+     */
+    SelectRecords(): void;
+    /**
+     * Selects the specified record displayed within the grid.
+     * @param visibleIndex A zero-based integer value that specifies the record's visible index.
+     */
+    SelectRecords(visibleIndex: number): void;
+    /**
+     * Selects the specified rercords within the grid.
+     * @param visibleIndices An array of zero-based indices that identify records within the grid.
+     */
+    SelectRecords(visibleIndices: number[]): void;
+    /**
+     * Selects or deselects the specified records within the grid.
+     * @param visibleIndices An array of zero-based indices that identify records within the grid.
+     * @param selected true to select the specified records; false to deselect the records.
+     */
+    SelectRecords(visibleIndices: number[], selected: boolean): void;
+    /**
+     * Selects or deselects the specified record within the grid.
+     * @param visibleIndex An integer zero-based index that identifies the record within the grid.
+     * @param selected true to select the specified record; false to deselect the record.
+     */
+    SelectRecords(visibleIndex: number, selected?: boolean): void;
+    /**
+     * Selects or deselects the specified records displayed within the grid.
+     * @param keys An array of objects that uniquely identify the records.
+     * @param selected true to select the specified records; false to deselect the records.
+     */
+    SelectRecordsByKey(keys: Object[], selected?: boolean): void;
+    /**
+     * Selects or deselects the specified record displayed within the grid.
+     * @param key An object that uniquely identifies the record.
+     * @param selected true to select the specified record; false to deselect the record.
+     */
+    SelectRecordsByKey(key: Object, selected?: boolean): void;
+    /**
+     * Selects the specified records displayed within the grid.
+     * @param keys An array of objects that uniquely identify the records.
+     */
+    SelectRecordsByKey(keys: Object[]): void;
+    /**
+     * Selects a grid record by its key.
+     * @param key An object that uniquely identifies the record.
+     */
+    SelectRecordsByKey(key: Object): void;
+    /**
+     * Deselects all the selected records within the grid.
+     */
+    UnselectRecords(): void;
+    /**
+     * Deselects the specified records (if selected) within the grid.
+     * @param visibleIndices An array of zero-based indices that identify records within the grid.
+     */
+    UnselectRecords(visibleIndices: number[]): void;
+    /**
+     * Deselects the specified record (if selected) within the grid.
+     * @param visibleIndex A zero-based integer value that specifies the record's visible index.
+     */
+    UnselectRecords(visibleIndex: number): void;
+    /**
+     * Deselects the specified records displayed within the grid.
+     * @param keys An array of objects that uniquely identify the records.
+     */
+    UnselectRecordsByKey(keys: Object[]): void;
+    /**
+     * Deselects the specified record displayed within the grid.
+     * @param key An object that uniquely identifies the record.
+     */
+    UnselectRecordsByKey(key: Object): void;
+    /**
+     * Deselects all grid records that match the filter criteria currently applied to the grid.
+     */
+    UnselectFilteredRecords(): void;
+    /**
+     * Selects the specified record displayed on the current page.
+     * @param visibleIndex A zero-based integer value that specifies the record's visible index.
+     */
+    SelectRecordOnPage(visibleIndex: number): void;
+    /**
+     * Selects or deselects the specified record displayed on the current page.
+     * @param visibleIndex A zero-based integer value that specifies the record's visible index.
+     * @param selected true to select the specified record; false to deselect the record.
+     */
+    SelectRecordOnPage(visibleIndex: number, selected?: boolean): void;
+    /**
+     * Deselects the specified record (if selected) displayed on the current page.
+     * @param visibleIndex A zero-based integer value that specifies the record's visible index.
+     */
+    UnselectRecordOnPage(visibleIndex: number): void;
+    /**
+     * Selects all unselected records displayed on the current page.
+     */
+    SelectAllRecordsOnPage(): void;
+    /**
+     * Allows you to select or deselect all records displayed on the current page based on the parameter passed.
+     * @param selected true to select all unselected records displayed on the current page; false to deselect all selected records on the page.
+     */
+    SelectAllRecordsOnPage(selected: boolean): void;
+    /**
+     * Deselects all selected records displayed on the current page.
+     */
+    UnselectAllRecordsOnPage(): void;
+    /**
+     * Returns the number of selected records.
+     */
+    GetSelectedRecordCount(): number;
+    /**
+     * Indicates whether or not the specified record is selected within the current page.
+     * @param visibleIndex An integer value that identifies the record by its visible index.
+     */
+    IsRecordSelectedOnPage(visibleIndex: number): boolean;
+    /**
+     * Returns the values of the specified data source fields within the specified record.
+     * @param visibleIndex An integer value that identifies the record.
+     * @param fieldNames The names of data source fields separated using a semicolon, whose values within the specified record are returned.
+     * @param onCallback An ASPxClientVerticalGridValuesCallback object that represents the JavaScript function which receives the list of record values as a parameter.
+     */
+    GetRecordValues(visibleIndex: number, fieldNames: string, onCallback: ASPxClientVerticalGridValuesCallback): void;
+    /**
+     * Returns the record values displayed within the current page.
+     * @param fieldNames The names of data source fields whose values are returned.
+     * @param onCallback A ASPxClientVerticalGridValuesCallback object that represents the JavaScript function which receives the list of record values as a parameter.
+     */
+    GetPageRecordValues(fieldNames: string, onCallback: ASPxClientVerticalGridValuesCallback): void;
+    /**
+     * Returns the number of records actually displayed within the active page.
+     */
+    GetVisibleRecordsOnPage(): number;
+    /**
+     * Returns the number of rows within the client vertical grid.
+     */
+    GetRowCount(): number;
+    /**
+     * Applies the specified search panel filter criterion to grid data.
+     * @param value A string value that specifies the filter criterion.
+     */
+    ApplySearchPanelFilter(value: string): void;
+    /**
+     * Applies the specified filter expression to the ASPxVerticalGrid.
+     * @param filterExpression A string value that specifies the filter expression.
+     */
+    ApplyFilter(filterExpression: string): void;
+    /**
+     * Clears the filter expression applied to a client vertical grid.
+     */
+    ClearFilter(): void;
+    /**
+     * Sets input focus to the grid.
+     */
+    Focus(): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(args: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side event, passing the specified argument to it.
+     * @param args A string value that represents any information that needs to be sent to the server-side event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(args: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Selects the specified page.
+     * @param pageIndex An integer value that specifies the active page's index.
+     */
+    GotoPage(pageIndex: number): void;
+    /**
+     * Gets the index of the page currently being selected.
+     */
+    GetPageIndex(): number;
+    /**
+     * Gets the number of pages to which the grid's data is divided.
+     */
+    GetPageCount(): number;
+    /**
+     * Activates the next page.
+     */
+    NextPage(): void;
+    /**
+     * Activates the previous page.
+     */
+    PrevPage(): void;
+    /**
+     * Returns the index of the first record displayed within the vertical grid's active page.
+     */
+    GetTopVisibleIndex(): number;
+    /**
+     * Saves all the changes made and switches the grid to browse mode.
+     */
+    UpdateEdit(): void;
+    /**
+     * Cancels all the changes made and switches the ASPxVerticalGrid to browse mode.
+     */
+    CancelEdit(): void;
+    /**
+     * Updates data displayed within the grid.
+     */
+    Refresh(): void;
+    /**
+     * Returns the record values displayed within all selected records.
+     * @param fieldNames The names of data source fields separated by a semicolon, whose values within the selected records are returned.
+     * @param onCallback A ASPxClientVerticalGridValuesCallback object that represents the JavaScript function which receives the list of record values as a parameter.
+     */
+    GetSelectedFieldValues(fieldNames: string, onCallback: ASPxClientVerticalGridValuesCallback): void;
+    /**
+     * Returns key values of selected records displayed within the current page.
+     */
+    GetSelectedKeysOnPage(): Object[];
+    /**
+     * Sends a callback to the server and generates the server-side CustomDataCallback event.
+     * @param args A string value that is any information that needs to be sent to the server-side CustomDataCallback event.
+     * @param onCallback A ASPxClientVerticalGridValuesCallback object that is the JavaScript function which receives the information on the client side.
+     */
+    GetValuesOnCustomCallback(args: string, onCallback: ASPxClientVerticalGridValuesCallback): void;
+    /**
+     * Returns the editor used to edit the specified row's values.
+     * @param row An ASPxClientVerticalGridRowobject that specifies the required row within the client grid.
+     */
+    GetEditor(row: ASPxClientVerticalGridRow): ASPxClientEdit;
+    /**
+     * Returns the editor used to edit the specified row's values.
+     * @param rowIndex An integer value that specifies the row's position within the rows collection.
+     */
+    GetEditor(rowIndex: number): ASPxClientEdit;
+    /**
+     * Returns the editor used to edit the specified row's values.
+     * @param rowFieldNameOrId A string value that specifies the row's field name or unique identifier (the row's Name property value).
+     */
+    GetEditor(rowFieldNameOrId: string): ASPxClientEdit;
+    /**
+     * Displays the Filter Control.
+     */
+    ShowFilterControl(): void;
+    /**
+     * Hides the Filter Control.
+     */
+    CloseFilterControl(): void;
+    /**
+     * Enables or disables the current filter.
+     * @param isFilterEnabled true to enable the current filter; otherwise, false.
+     */
+    SetFilterEnabled(isFilterEnabled: boolean): void;
+    /**
+     * Returns the client row that resides at the specified position within the row collection.
+     * @param rowIndex A zero-based index that identifies the row within the row collection (the row's Index property value).
+     */
+    GetRow(rowIndex: number): ASPxClientVerticalGridRow;
+    /**
+     * Returns the row with the specified unique identifier.
+     * @param rowId A string value that specifies the row's unique identifier (the row's Name property value).
+     */
+    GetRowById(rowId: string): ASPxClientVerticalGridRow;
+    /**
+     * Returns the client row which is bound to the specified data source field.
+     * @param rowFieldName A string value that specifies the name of the data source field to which the row is bound (the row's fieldName property value).
+     */
+    GetRowByField(rowFieldName: string): ASPxClientVerticalGridRow;
+    /**
+     * Returns the current vertical scroll position of the grid's content.
+     */
+    GetVerticalScrollPosition(): number;
+    /**
+     * Returns the current horizontal scroll position of the grid's content.
+     */
+    GetHorizontalScrollPosition(): number;
+    /**
+     * Specifies the vertical scroll position for the grid's content.
+     * @param position An integer value specifying the vertical scroll position.
+     */
+    SetVerticalScrollPosition(position: number): void;
+    /**
+     * Specifies the horizontal scroll position for the grid's content.
+     * @param position An integer value specifying the horizontal scroll position.
+     */
+    SetHorizontalScrollPosition(position: number): void;
+    /**
+     * Gets the value that specifies whether the required row is expanded.
+     * @param row An ASPxClientVerticalGridRowobject that specifies the row.
+     */
+    GetRowExpanded(row: ASPxClientVerticalGridRow): boolean;
+    /**
+     * Gets the value that specifies whether the row with the specified index is expanded.
+     * @param rowIndex An integer value specifying the row's index.
+     */
+    GetRowExpanded(rowIndex: number): boolean;
+    /**
+     * Gets the value that specifies whether the row with the specified field name or ID is expanded.
+     * @param rowFieldNameOrId A string value specifying the row's field name or ID.
+     */
+    GetRowExpanded(rowFieldNameOrId: string): boolean;
+    /**
+     * Sets a value indicating whether the row is expanded.
+     * @param row An ASPxClientVerticalGridRowobject that specifies the required row within the client grid.
+     * @param value true, to expand the row; otherwise, false.
+     */
+    SetRowExpanded(row: ASPxClientVerticalGridRow, value: boolean): void;
+    /**
+     * Sets a value indicating whether the row is expanded.
+     * @param rowIndex An integer value specifying the index of the row.
+     * @param value true, to expand the row; otherwise, false.
+     */
+    SetRowExpanded(rowIndex: number, value: boolean): void;
+    /**
+     * Sets a value indicating whether the row is expanded.
+     * @param rowFieldNameOrId A string value that specifies the row's field name or unique identifier (the row's Name property value).
+     * @param value true, to expand the row; otherwise, false.
+     */
+    SetRowExpanded(rowFieldNameOrId: string, value: boolean): void;
+}
+/**
+ * A client grid row.
+ */
+interface ASPxClientVerticalGridRow extends ASPxClientGridColumnBase {
+    /**
+     * Gets the name that uniquely identifies the row.
+     * Value: A string value assigned to the row's Name property.
+     */
+    name: string;
+    /**
+     * Gets the row's position within the collection.
+     * Value: An integer zero-bazed index that specifies the row's position within the collection.
+     */
+    index: number;
+    /**
+     * Gets the name of the database field assigned to the current row.
+     * Value: A string value that specifies the name of a data field.
+     */
+    fieldName: string;
+    /**
+     * Gets whether the row is visible.
+     * Value: true, to display the row; otherwise, false.
+     */
+    visible: boolean;
+}
+/**
+ * Represents a JavaScript function which receives the list of record values when the client GetSelectedFieldValues method is called.
+ */
+interface ASPxClientVerticalGridValuesCallback {
+    /**
+     * Represents a JavaScript function which receives the list of record values when the client GetSelectedFieldValues method is called.
+     * @param result An object that represents the list of record values received from the server.
+     */
+    (result: Object): void;
+}
+/**
+ * A method that will handle the CustomButtonClick event.
+ */
+interface ASPxClientVerticalGridRowCancelEventHandler<S> {
+    /**
+     * A method that will handle the cancelable events of a client ASPxVerticalGrid row.
+     * @param source The event source.
+     * @param e An ASPxClientVerticalGridRowCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientVerticalGridRowCancelEventArgs): void;
+}
+/**
+ * Provides data for the cancelable events of a client ASPxVerticalGrid row.
+ */
+interface ASPxClientVerticalGridRowCancelEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the processed client row.
+     * Value: An ASPxClientVerticalGridRow object that represents the processed row.
+     */
+    row: ASPxClientVerticalGridRow;
+}
+/**
+ * A method that will handle the RecordClick event.
+ */
+interface ASPxClientVerticalGridRecordClickEventHandler<S> {
+    /**
+     * A method that will handle the RecordClick event.
+     * @param source The event source. This parameter identifies the ASPxClientVerticalGrid object that raised the event.
+     * @param e An ASPxClientVerticalGridRecordClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientVerticalGridRecordClickEventArgs): void;
+}
+/**
+ * Provides data for the RecordClick event.
+ */
+interface ASPxClientVerticalGridRecordClickEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the processed record's visible index.
+     * Value: An integer zero-based index that identifies the processed record.
+     */
+    visibleIndex: number;
+    /**
+     * Provides access to the parameters associated with the RecordClick event.
+     * Value: An object that contains parameters associated with the event.
+     */
+    htmlEvent: Object;
+}
+/**
+ * A method that will handle the CustomButtonClick event.
+ */
+interface ASPxClientVerticalGridCustomButtonEventHandler<S> {
+    /**
+     * A method that will handle the CustomButtonClick event.
+     * @param source The event source.  This parameter identifies the ASPxClientVerticalGrid object that raised the event.
+     * @param e An ASPxClientVerticalGridCustomButtonEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientVerticalGridCustomButtonEventArgs): void;
+}
+/**
+ * Provides data for the CustomButtonClick event.
+ */
+interface ASPxClientVerticalGridCustomButtonEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the value which identifies the record whose custom button has been clicked.
+     * Value: An integer value that identifies the record whose custom button has been clicked.
+     */
+    visibleIndex: number;
+    /**
+     * Gets the value which identifies the custom button.
+     * Value: A string value that identifies the clicked custom button.
+     */
+    buttonID: string;
+}
+/**
+ * A method that will handle the SelectionChanged event.
+ */
+interface ASPxClientVerticalGridSelectionEventHandler<S> {
+    /**
+     * A method that will handle the SelectionChanged event.
+     * @param source The event source.
+     * @param e An ASPxClientVerticalGridSelectionEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientVerticalGridSelectionEventArgs): void;
+}
+/**
+ * Provides data for the SelectionChanged event.
+ */
+interface ASPxClientVerticalGridSelectionEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the visible index of the record whose selected state has been changed.
+     * Value: An <see cref="Int32" /> value that specifies the visible index of the record.
+     */
+    visibleIndex: number;
+    /**
+     * Gets whether the record has been selected.
+     * Value: true, if the record has been selected; otherwise, false.
+     */
+    isSelected: boolean;
+    /**
+     * Gets whether all records displayed within a page have been selected or unselected.
+     * Value: true if all records displayed within a page have been selected or unselected; otherwise, false.
+     */
+    isAllRecordsOnPage: boolean;
+    /**
+     * Gets whether a selection has been changed on the server.
+     * Value: true  if a selection has been changed on the server; otherwise, false.
+     */
+    isChangedOnServer: boolean;
+}
+/**
+ * A method that will handle the RowExpandedChanged event.
+ */
+interface ASPxClientVerticalGridRowExpandedEventHandler<S> {
+    /**
+     * A method that will handle the RowExpandedChanged event.
+     * @param source The event source.
+     * @param e An ASPxClientVerticalGridRowExpandedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientVerticalGridRowExpandedEventArgs): void;
+}
+/**
+ * Provides data for the RowExpandedChanged event.
+ */
+interface ASPxClientVerticalGridRowExpandedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the expanded row.
+     * Value: An ASPxClientVerticalGridRow object that represents the expanded row.
+     */
+    row: ASPxClientVerticalGridRow;
+}
+/**
+ * A method that will handle the RowExpandedChanging event.
+ */
+interface ASPxClientVerticalGridRowExpandingEventHandler<S> {
+    /**
+     * A method that will handle the RowExpandedChanging event.
+     * @param source The event source.
+     * @param e An ASPxClientVerticalGridRowExpandedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientVerticalGridRowExpandingEventArgs): void;
+}
+/**
+ * Provides data for the RowExpandedChanging event.
+ */
+interface ASPxClientVerticalGridRowExpandingEventArgs extends ASPxClientVerticalGridRowExpandedEventArgs {
+    /**
+     * Gets or sets a value indicating whether the action which raised the event should be canceled.
+     * Value: true, if the action that raised the event should be canceled; otherwise, false.
+     */
+    cancel: boolean;
+}
+/**
+ * Represents an object that will handle the client-side BatchEditStartEditing event.
+ */
+interface ASPxClientVerticalGridBatchEditStartEditingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditStartEditing event.
+     * @param source The event source.
+     * @param e An ASPxClientVerticalGridBatchEditStartEditingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientVerticalGridBatchEditStartEditingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditStartEditing event.
+ */
+interface ASPxClientVerticalGridBatchEditStartEditingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the visible index of the record whose cells are about to be edited.
+     * Value: An <see cref="Int32" /> value that specifies the visible index of the record.
+     */
+    visibleIndex: number;
+    /**
+     * Gets the grid row that owns a cell that is about to be edited.
+     * Value: An <see cref="ASPxClientVerticalGridRow" /> object that is the focused grid row.
+     */
+    focusedRow: ASPxClientVerticalGridRow;
+    /**
+     * Gets a hashtable that maintains information about editable cells.
+     * Value: A hashtable that stores information about editable cells.
+     */
+    recordValues: Object;
+}
+/**
+ * Represents an object that will handle the client-side BatchEditEndEditing event.
+ */
+interface ASPxClientVerticalGridBatchEditEndEditingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditEndEditing event.
+     * @param source The event source.
+     * @param e An ASPxClientVerticalGridBatchEditEndEditingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientVerticalGridBatchEditEndEditingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditEndEditing event.
+ */
+interface ASPxClientVerticalGridBatchEditEndEditingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the visible index of the record whose cells have been edited.
+     * Value: An <see cref="Int32" /> value that specifies the visible index of the record.
+     */
+    visibleIndex: number;
+    /**
+     * Gets a hashtable that maintains information about editable cells.
+     * Value: Gets a hashtable that maintains information about editable cells.
+     */
+    recordValues: Object;
+}
+/**
+ * Represents an object that will handle the client-side BatchEditRecordValidating event.
+ */
+interface ASPxClientVerticalGridBatchEditRecordValidatingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditRecordValidating event.
+     * @param source The event source.
+     * @param e An ASPxClientVerticalGridBatchEditRecordValidatingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientVerticalGridBatchEditRecordValidatingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditRecordValidating event.
+ */
+interface ASPxClientVerticalGridBatchEditRecordValidatingEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the processed record's visible index.
+     * Value: An integer value that specifies the processed record's visible index.
+     */
+    visibleIndex: number;
+    /**
+     * Provides validation information on the record currently being validated.
+     * Value: An object that is a hashtable containing validation information.
+     */
+    validationInfo: Object;
+}
+/**
+ * Represents an object that will handle the client-side BatchEditConfirmShowing event.
+ */
+interface ASPxClientVerticalGridBatchEditConfirmShowingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditConfirmShowing client event.
+     * @param source The event source.
+     * @param e An ASPxClientVerticalGridBatchEditConfirmShowingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientVerticalGridBatchEditConfirmShowingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditConfirmShowing event.
+ */
+interface ASPxClientVerticalGridBatchEditConfirmShowingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the client identifier of an object that initiates a send request.
+     * Value: A string value that specifies the object client identifier.
+     */
+    requestTriggerID: string;
+}
+/**
+ * Represents an object that will handle the client-side BatchEditTemplateCellFocused event.
+ */
+interface ASPxClientVerticalGridBatchEditTemplateCellFocusedEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditTemplateCellFocused event.
+     * @param source An object representing the event source. Identifies the button editor that raised the event.
+     * @param e An ASPxClientVerticalGridBatchEditTemplateCellFocusedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientVerticalGridBatchEditTemplateCellFocusedEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditTemplateCellFocused event.
+ */
+interface ASPxClientVerticalGridBatchEditTemplateCellFocusedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the currently processed row.
+     * Value: A <see cref="ASPxClientVerticalGridRow" /> object that is the client-side row object.
+     */
+    row: ASPxClientVerticalGridRow;
+    /**
+     * Gets or sets a value specifying whether the event was handled.
+     * Value: true if the event was handled and default processing should not occur; false if the event should be handled using default processing.
+     */
+    handled: boolean;
+}
+/**
+ * Represents an object that will handle the client-side BatchEditChangesSaving event.
+ */
+interface ASPxClientVerticalGridBatchEditChangesSavingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditChangesSaving event.
+     * @param source The event source. This parameter identifies the vertical grid object which raised the event.
+     * @param e An ASPxClientVerticalGridBatchEditChangesSavingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientVerticalGridBatchEditChangesSavingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditChangesSaving event.
+ */
+interface ASPxClientVerticalGridBatchEditChangesSavingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets a hashtable that maintains information about inserted cells.
+     * Value: A hashtable that stores information about inserted cells.
+     */
+    insertedValues: Object;
+    /**
+     * Gets a hashtable that maintains information about deleted cells.
+     * Value: A hashtable that stores information about deleted cells.
+     */
+    deletedValues: Object;
+    /**
+     * Gets a hashtable that maintains information about updated cells.
+     * Value: A hashtable that stores information about updated cells.
+     */
+    updatedValues: Object;
+}
+/**
+ * Represents an object that will handle the client-side BatchEditChangesCanceling event.
+ */
+interface ASPxClientVerticalGridBatchEditChangesCancelingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditChangesCanceling event.
+     * @param source The event source. This parameter identifies the vertical grid object which raised the event.
+     * @param e An ASPxClientVerticalGridBatchEditChangesCancelingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientVerticalGridBatchEditChangesCancelingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditChangesCanceling event.
+ */
+interface ASPxClientVerticalGridBatchEditChangesCancelingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets a hashtable that maintains information about inserted cells.
+     * Value: A hashtable that stores information about inserted cells.
+     */
+    insertedValues: Object;
+    /**
+     * Gets a hashtable that maintains information about deleted cells.
+     * Value: A hashtable that stores information about deleted cells.
+     */
+    deletedValues: Object;
+    /**
+     * Gets a hashtable that maintains information about updated cells.
+     * Value: A hashtable that stores information about updated cells.
+     */
+    updatedValues: Object;
+}
+/**
+ * Represents an object that will handle the client-side BatchEditRecordInserting event.
+ */
+interface ASPxClientVerticalGridBatchEditRecordInsertingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditRecordInserting event.
+     * @param source The event source. This parameter identifies the vertical grid object which raised the event.
+     * @param e An ASPxClientVerticalGridBatchEditRecordInsertingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientVerticalGridBatchEditRecordInsertingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditRecordInserting event.
+ */
+interface ASPxClientVerticalGridBatchEditRecordInsertingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the processed record's visible index.
+     * Value: An integer value that specifies the processed record's visible index.
+     */
+    visibleIndex: number;
+}
+/**
+ * Represents an object that will handle the client-side BatchEditRecordDeleting event.
+ */
+interface ASPxClientVerticalGridBatchEditRecordDeletingEventHandler<S> {
+    /**
+     * A method that will handle the BatchEditRecordDeleting event.
+     * @param source The event source. This parameter identifies the vertical grid object which raised the event.
+     * @param e An ASPxClientVerticalGridBatchEditRecordDeletingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientVerticalGridBatchEditRecordDeletingEventArgs): void;
+}
+/**
+ * Provides data for the BatchEditRecordDeleting event.
+ */
+interface ASPxClientVerticalGridBatchEditRecordDeletingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the processed record's visible index.
+     * Value: An integer value that specifies the processed record's visible index.
+     */
+    visibleIndex: number;
+    /**
+     * Gets a hashtable that maintains information about deleted cells.
+     * Value: A hashtable that stores information about deleted cells.
+     */
+    recordValues: Object;
+}
+/**
+ * A method that will handle the FocusedCellChanging event.
+ */
+interface ASPxClientVerticalGridFocusedCellChangingEventHandler<S> {
+    /**
+     * A method that will handle the FocusedCellChanging event.
+     * @param source The event source.
+     * @param e An ASPxClientVerticalGridFocusedCellChangingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientVerticalGridFocusedCellChangingEventArgs): void;
+}
+/**
+ * Provides data for the FocusedCellChanging event.
+ */
+interface ASPxClientVerticalGridFocusedCellChangingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Provides information on a cell currently being focused.
+     * Value: A ASPxClientVerticalGridCellInfo object that is the cell information.
+     */
+    cellInfo: ASPxClientVerticalGridCellInfo;
+}
+/**
+ * Contains information on a cell that is being edited.
+ */
+interface ASPxClientVerticalGridCellInfo {
+    /**
+     * Gets the row that contains the cell currently being processed.
+     * Value: An <see cref="ASPxClientVerticalGridRow" /> object that is the row which contains the processed cell.
+     */
+    row: ASPxClientVerticalGridRow;
+    /**
+     * Gets the visible index of the record that contains the cell currently being processed.
+     * Value: An <see cref="Int32" /> value that specifies the visible index of the record.
+     */
+    recordVisibleIndex: number;
+}
+/**
+ * Provides members related to Batch Edit Mode
+ */
+interface ASPxClientVerticalGridBatchEditApi {
+    /**
+     * Performs validation of grid data contained in all records when the grid operates in batch edit mode.
+     * @param validateOnlyModified true, if only modified records should be validated; otherwise, false.
+     */
+    ValidateRecords(validateOnlyModified?: boolean): boolean;
+    /**
+     * Performs validation of grid data contained in the specified record when the grid operates in batch edit mode.
+     * @param visibleIndex An integer value specifying the visible index of the validated record.
+     */
+    ValidateRecord(visibleIndex: number): boolean;
+    /**
+     * Returns an array of record visible indices.
+     * @param includeDeleted true, to include visible indices of deleted records to the returned array; otherwise, false.
+     */
+    GetRecordVisibleIndices(includeDeleted: boolean): number[];
+    /**
+     * Returns an array of the deleted record visible indices.
+     */
+    GetDeletedRecordIndices(): number[];
+    /**
+     * Returns an array of the inserted record visible indices.
+     */
+    GetInsertedRecordIndices(): number[];
+    /**
+     * Indicates if the record with the specified visible index is deleted.
+     * @param visibleIndex An integer value that identifies the record by its visible index.
+     */
+    IsDeletedRecord(visibleIndex: number): boolean;
+    /**
+     * Indicates if the record with specified visible index is newly created.
+     * @param visibleIndex An integer value that identifies the record by its visible index.
+     */
+    IsNewRecord(visibleIndex: number): boolean;
+    /**
+     * Programmatically moves the focus to the previous cell in the record.
+     */
+    MoveFocusBackward(): boolean;
+    /**
+     * Programmatically moves the focus to the next cell in the record.
+     */
+    MoveFocusForward(): boolean;
+    /**
+     * Sets a value of the specified cell.
+     * @param visibleIndex An integer zero-based index that identifies the record containing the processed cell.
+     * @param rowFieldNameOrId A string value that specifies the field name or unique identifier (the row's Name property value) of a row containing the processed cell.
+     * @param value An object that contains the new cell value.
+     */
+    SetCellValue(visibleIndex: number, rowFieldNameOrId: string, value: Object): void;
+    /**
+     * Sets the value of the specified cell.
+     * @param visibleIndex An integer zero-based index that identifies the row containing the processed cell.
+     * @param rowFieldNameOrId A string value that specifies the field name or unique identifier (the column's Name property value) of a column containing the processed cell.
+     * @param value An object that contains the new cell value.
+     * @param displayText A string value that specifies the cell display text.
+     * @param cancelCellHighlighting true to cancel highlighting of the modified cell, false to highlight the modified cell.
+     */
+    SetCellValue(visibleIndex: number, rowFieldNameOrId: string, value: Object, displayText: string, cancelCellHighlighting?: boolean): void;
+    /**
+     * Gets the value of the specified cell.
+     * @param visibleIndex A zero-based integer value that specifies a visible index of a record containing the processed cell.
+     * @param rowFieldNameOrId A string value that specifies the field name or unique identifier (the row's Name property value) of a row containing the processed cell.
+     * @param initial true, to return the initial (server) value; false, to return a value currently contained on the client side (modified value).
+     */
+    GetCellValue(visibleIndex: number, rowFieldNameOrId: string, initial?: boolean): Object;
+    /**
+     * Gets a container holding the data cell content.
+     * @param visibleIndex An integer value that is the visible index.
+     * @param columnFieldNameOrId A string value that is the column's Field Name or ID.
+     */
+    GetCellTextContainer(visibleIndex: number, columnFieldNameOrId: string): Object;
+    /**
+     * Gets information about the cell currently being edited.
+     */
+    GetEditCellInfo(): ASPxClientVerticalGridCellInfo;
+    /**
+     * Returns a value that indicates whether the vertical grid has changed data.
+     */
+    HasChanges(): boolean;
+    /**
+     * Returns a value that indicates whether the specified record has changed data.
+     * @param visibleIndex An integer value that specifies the visible index of a record.
+     */
+    HasChanges(visibleIndex: number): boolean;
+    /**
+     * Returns a value that indicates whether the specified data cell's data has been changed.
+     * @param visibleIndex An integer value that specifies the visible index of a record.
+     * @param rowFieldNameOrId A string value that identifies the row by the name of the data source field to which the row is bound, or by the row's name.
+     */
+    HasChanges(visibleIndex: number, rowFieldNameOrId: string): boolean;
+    /**
+     * Resets changes in the specified record.
+     * @param visibleIndex An integer value that specifies the visible index of a record.
+     */
+    ResetChanges(visibleIndex: number): void;
+    /**
+     * Resets changes in the specified cell.
+     * @param visibleIndex An integer value that specifies the visible index of a record containing the processed cell.
+     * @param rowIndex A string value that specifies the field name or unique identifier (the row's Name property value) of a row containing the processed cell.
+     */
+    ResetChanges(visibleIndex: number, rowIndex: number): void;
+    /**
+     * Switches the specified cell to batch edit mode.
+     * @param visibleIndex A zero-based integer value that specifies the visible index of a record containing the processed cell.
+     * @param rowIndex A zero-based integer value that identifies the row which contains the processed cell in the rows collection.
+     */
+    StartEdit(visibleIndex: number, rowIndex: number): void;
+    /**
+     * Ends the cell(s) editing.
+     */
+    EndEdit(): void;
+}
+/**
+ * Contains style settings related to media elements in ASPxHtmlEditor.
+ */
+interface ASPxClientHtmlEditorCommandStyleSettings {
+    /**
+     * Gets or sets a media element's CSS class name.
+     * Value: A string that specifies a class name.
+     */
+    className: string;
+    /**
+     * Gets or sets an element's width.
+     * Value: A string that specifies an element's width <a href="http://www.w3schools.com/cssref/pr_dim_width.asp">in any correct format</a>.
+     */
+    width: string;
+    /**
+     * Gets or sets an element's height.
+     * Value: A string that specifies an element's height <a href="http://www.w3schools.com/cssref/pr_dim_height.asp">in any correct format</a>.
+     */
+    height: string;
+    /**
+     * Gets or sets a media element's border width.
+     * Value: A string that specifies a border width <a href="http://www.w3schools.com/cssref/pr_border-width.asp">in any correct format</a>.
+     */
+    borderWidth: string;
+    /**
+     * Gets or sets a media element's border color.
+     * Value: A string that specifies a border color <a href="http://www.w3schools.com/cssref/css_colors_legal.asp">in any correct format</a>.
+     */
+    borderColor: string;
+    /**
+     * Gets or sets a media element's border style.
+     * Value: A string that specifies a border style <a href="http://www.w3schools.com/cssref/pr_border-style.asp">in any correct format</a>.
+     */
+    borderStyle: string;
+    /**
+     * Gets or sets an element's top margin.
+     * Value: A string that specifies an element's top margin <a href="http://www.w3schools.com/cssref/pr_margin.asp">in any correct format</a>.
+     */
+    marginTop: string;
+    /**
+     * Gets or sets an element's right margin.
+     * Value: A string that specifies an element's right margin <a href="http://www.w3schools.com/cssref/pr_margin.asp">in any correct format</a>.
+     */
+    marginRight: string;
+    /**
+     * Gets or sets an element's bottom margin.
+     * Value: A string that specifies an element's bottom margin <a href="http://www.w3schools.com/cssref/pr_margin.asp">in any correct format</a>.
+     */
+    marginBottom: string;
+    /**
+     * Gets or sets an element's left margin.
+     * Value: A string that specifies an element's left margin <a href="http://www.w3schools.com/cssref/pr_margin.asp">in any correct format</a>.
+     */
+    marginLeft: string;
+    /**
+     * Gets or sets a media element's background color.
+     * Value: A string that specifies a background color <a href="http://www.w3schools.com/cssref/css_colors_legal.asp">in any correct format</a>.
+     */
+    backgroundColor: string;
+    /**
+     * Gets or sets the element's text alignment.
+     * Value: A string value that specifies the element's text alignment <a href="http://www.w3schools.com/cssref/css_colors_legal.asp">in any correct format</a>.
+     */
+    textAlign: string;
+    /**
+     * Gets or sets the element's vertical alignment.
+     * Value: A string value that specifies the element's vertical alignment <a href="http://www.w3schools.com/cssref/css_colors_legal.asp">in any correct format</a>.
+     */
+    verticalAlign: string;
+}
+/**
+ * The base class for parameters used in the ASPxHtmlEditor's client-side commands.
+ */
+interface ASPxClientHtmlEditorCommandArguments {
+    /**
+     * Gets the currently selected element in the ASPxHtmlEditor.
+     * Value: An HTML object which is the currently selected element.
+     */
+    selectedElement: Object;
+}
+/**
+ * Contains settings related to the INSERTIMAGE_COMMAND command parameter.
+ */
+interface ASPxClientHtmlEditorInsertImageCommandArguments extends ASPxClientHtmlEditorCommandArguments {
+    /**
+     * Specifies the source of the target image.
+     * Value: A string specifying the source of the target image.
+     */
+    src: string;
+    /**
+     * Creates an alternate text for the target image.
+     * Value: A string that specifies an alternate text for the target image.
+     */
+    alt: string;
+    /**
+     * Determines if the target image is wrapped with text.
+     * Value: true, if the target image is wrapped with text; otherwise, false.
+     */
+    useFloat: boolean;
+    /**
+     * Determines the position of the target image.
+     * Value: A string value defining the position of the target image.
+     */
+    align: string;
+    /**
+     * Contains the style settings specifying the appearance of the target image.
+     * Value: An <see cref="ASPxClientHtmlEditorCommandStyleSettings" /> object that contains the style settings specifying the appearance of the target image.
+     */
+    styleSettings: ASPxClientHtmlEditorCommandStyleSettings;
+}
+/**
+ * Contains settings related to the CHANGEIMAGE_COMMAND command parameter.
+ */
+interface ASPxClientHtmlEditorChangeImageCommandArguments extends ASPxClientHtmlEditorInsertImageCommandArguments {
+}
+/**
+ * Contains settings related to the INSERTLINK_COMMAND command parameter.
+ */
+interface ASPxClientHtmlEditorInsertLinkCommandArguments extends ASPxClientHtmlEditorCommandArguments {
+    /**
+     * Specifies the url of the page the target link goes to.
+     * Value: A string value specifying the target link url.
+     */
+    url: string;
+    /**
+     * Specifiies the text of the target link.
+     * Value: A string value specifying the text of the target link.
+     */
+    text: string;
+    /**
+     * Determines where to open the target link.
+     * Value: A string that specifies where to open the target link <a href="http://www.w3schools.com/tags/att_a_target.asp">in any correct format</a>.
+     */
+    target: string;
+    /**
+     * Defines the title of the target link.
+     * Value: A string value defining the title of the target link.
+     */
+    title: string;
+    /**
+     * Contains the style settings defining the appearance of the target link element.
+     * Value: An <see cref="ASPxClientHtmlEditorCommandStyleSettings" /> object that contains the style settings defining the appearance of the target link element.
+     */
+    styleSettings: ASPxClientHtmlEditorCommandStyleSettings;
+}
+/**
+ * The base class for parameters related to inserting or changing media elements in the ASPxHtmlEditor.
+ */
+interface ASPxClientHtmlEditorChangeMediaElementCommandArguments extends ASPxClientHtmlEditorCommandArguments {
+    /**
+     * Defines the <a href="http://www.w3schools.com/tags/att_global_id.asp">HTML "id"</a> attribute of the target media element.
+     * Value: A string value which is a unique identifier for the element.
+     */
+    id: string;
+    /**
+     * Defines the source of the target media element.
+     * Value: A string defining the source of the target media element.
+     */
+    src: string;
+    /**
+     * Determines the position of the target media element.
+     * Value: A string value indicating the position of the target media element.
+     */
+    align: string;
+    /**
+     * Contains the style settings defining the appearance of the target media element.
+     * Value: An <see cref="ASPxClientHtmlEditorCommandStyleSettings" /> object that contains the style settings defining the appearance of the target media element.
+     */
+    styleSettings: ASPxClientHtmlEditorCommandStyleSettings;
+    /**
+     * Returns the name of the client-side command corresponding to the parameter.
+     */
+    GetCommandName(): string;
+}
+/**
+ * The base class for parameters related to inserting or changing HTML5 media elements (Audio and Video) in the ASPxHtmlEditor.
+ */
+interface ASPxClientHtmlEditorChangeHtml5MediaElementCommandArguments extends ASPxClientHtmlEditorChangeMediaElementCommandArguments {
+    /**
+     * Determines if a media file will start playing automatically.
+     * Value: true, if autoplay is enabled; otherwise, false.
+     */
+    autoPlay: boolean;
+    /**
+     * Determines if a media file repeats indefinitely, or stops when it reaches the last frame.
+     * Value: true, to loop playback; otherwise, false.
+     */
+    loop: boolean;
+    /**
+     * Determines if the media player controls should be displayed.
+     * Value: true, if media player controls are displayed; otherwise, false.
+     */
+    showPlayerControls: boolean;
+    /**
+     * Determines how a media file should be loaded when the page loads.
+     * Value: One of the ASPxClientHtmlEditorMediaPreloadMode enumeration values.
+     */
+    preloadMode: string;
+}
+/**
+ * Contains settings related to the INSERTAUDIO_COMMAND command parameter.
+ */
+interface ASPxClientHtmlEditorInsertAudioCommandArguments extends ASPxClientHtmlEditorChangeHtml5MediaElementCommandArguments {
+}
+/**
+ * Contains settings related to the CHANGEAUDIO_COMMAND command parameter.
+ */
+interface ASPxClientHtmlEditorChangeAudioCommandArguments extends ASPxClientHtmlEditorInsertAudioCommandArguments {
+}
+/**
+ * Contains settings related to the INSERTVIDEO_COMMAND command parameter.
+ */
+interface ASPxClientHtmlEditorInsertVideoCommandArguments extends ASPxClientHtmlEditorChangeHtml5MediaElementCommandArguments {
+    /**
+     * Defines the URL of an image that is shown while the video file is downloading, or until an end-user clicks the play button.
+     * Value: A string value that specifies the poster image URL.
+     */
+    posterUrl: string;
+}
+/**
+ * Contains settings related to the CHANGEVIDEO_COMMAND command parameter.
+ */
+interface ASPxClientHtmlEditorChangeVideoCommandArguments extends ASPxClientHtmlEditorInsertVideoCommandArguments {
+}
+/**
+ * Contains settings related to the INSERTFLASH_COMMAND command parameter.
+ */
+interface ASPxClientHtmlEditorInsertFlashCommandArguments extends ASPxClientHtmlEditorChangeMediaElementCommandArguments {
+    /**
+     * Determines if the target flash element will start playing automatically.
+     * Value: true, if autoplay is enabled; otherwise, false.
+     */
+    autoPlay: boolean;
+    /**
+     * Defines if the target flash element repeats indefinitely, or stops when it reaches the last frame.
+     * Value: true, to loop playback; otherwise, false.
+     */
+    loop: boolean;
+    /**
+     * Determines if the flash related items are displayed in the context menu of the target flash element.
+     * Value: true, if the specific context menu items are displayed; otherwise, false
+     */
+    enableFlashMenu: boolean;
+    /**
+     * Determines if the target flash element can be displayed in the fullscreen mode.
+     * Value: true, if the fullscreen mode is allowed; otherwise, false.
+     */
+    allowFullscreen: boolean;
+    /**
+     * Defines the rendering quality level used for the target flash element.
+     * Value: A string value that specifies the target flash element rendering quality.
+     */
+    quality: string;
+}
+/**
+ * Contains settings related to the CHANGEFLASH_COMMAND command parameter.
+ */
+interface ASPxClientHtmlEditorChangeFlashCommandArguments extends ASPxClientHtmlEditorInsertFlashCommandArguments {
+}
+/**
+ * Contains settings related to the INSERTYOUTUBEVIDEO_COMMAND command parameter.
+ */
+interface ASPxClientHtmlEditorInsertYouTubeVideoCommandArguments extends ASPxClientHtmlEditorChangeMediaElementCommandArguments {
+    /**
+     * Determines if suggested videos are shown after the target YouTube video finishes.
+     * Value: true, to show suggested videos; otherwise, false
+     */
+    showRelatedVideos: boolean;
+    /**
+     * Determines if the target YouTube video title and player actions (Watch later, Share) are shown.
+     * Value: true, to display the title and player actions; otherwise, false.
+     */
+    showVideoInfo: boolean;
+    /**
+     * Determines if the privacy-enhanced mode is enabled for the target YouTube video.
+     * Value: true, if the privace-enhanced mode is enabled; otherwise, false
+     */
+    enablePrivacyEnhancedMode: boolean;
+    /**
+     * Determines if the player controls are displayed for the target YouTube video.
+     * Value: true, if the player controls are displayed; otherwise, false.
+     */
+    showPlayerControls: boolean;
+}
+/**
+ * Contains settings related to the CHANGEYOUTUBEVIDEO_COMMAND command parameter.
+ */
+interface ASPxClientHtmlEditorChangeYouTubeVideoCommandArguments extends ASPxClientHtmlEditorInsertYouTubeVideoCommandArguments {
+}
+/**
+ * Contains settings related to the TABLEPROPERTIES_DIALOG_COMMAND command parameter.
+ */
+interface ASPxClientHtmlEditorTablePropertiesCommandArguments extends ASPxClientHtmlEditorCommandArguments {
+    /**
+     * Contains the style settings defining the appearance of the target table element.
+     * Value: An <see cref="ASPxClientHtmlEditorCommandStyleSettings" /> object that contains the style settings defining the appearance of the target table element.
+     */
+    styleSettings: ASPxClientHtmlEditorCommandStyleSettings;
+    /**
+     * Determines the position of the target table element.
+     * Value: A string value indicating the position of the target table element.
+     */
+    align: string;
+    /**
+     * Gets or sets a table cell padding.
+     * Value: An integer value that is the cell padding.
+     */
+    cellPadding: number;
+    /**
+     * Gets or sets the table cell spacing.
+     * Value: An integer value that is the table cell spacing.
+     */
+    cellSpacing: number;
+    /**
+     * Gets or sets a value that is the table caption.
+     * Value: A string value that is the caption.
+     */
+    caption: string;
+    /**
+     * Gets or sets a value indicating whether the first row/column serves as the table's header.
+     * Value: A string value that specifies whether the first row/column serves as the table's header.
+     */
+    headers: string;
+    /**
+     * Gets or sets the table's summary.
+     * Value: A string value that is the table's summary.
+     */
+    summary: string;
+}
+/**
+ * Contains settings related to the INSERTTABLE_COMMAND command parameter.
+ */
+interface ASPxClientHtmlEditorInsertTableCommandArguments extends ASPxClientHtmlEditorTablePropertiesCommandArguments {
+    /**
+     * Gets or sets the count of columns in the table.
+     * Value: An integer value that is the count of columns.
+     */
+    columns: number;
+    /**
+     * Gets or sets the count of rows in the table.
+     * Value: An integer value that is the count of rows.
+     */
+    rows: number;
+    /**
+     * Gets or sets a value indicating whether all table columns should have equal width.
+     * Value: true, to create equal widths for all columns; otherwise, false.
+     */
+    isEqualColumnWidth: boolean;
+}
+/**
+ * Contains settings related to the TABLECELLPROPERTIES_DIALOG_COMMAND command parameter.
+ */
+interface ASPxClientHtmlEditorTableCellPropertiesCommandArguments extends ASPxClientHtmlEditorCommandArguments {
+    /**
+     * Contains the style settings defining the appearance of the target cell element.
+     * Value: An <see cref="ASPxClientHtmlEditorCommandStyleSettings" /> object that contains the style settings defining the appearance of the target cell element.
+     */
+    styleSettings: ASPxClientHtmlEditorCommandStyleSettings;
+    /**
+     * Gets or sets a value that indicates whether the cell settings should be applied to all cells in the table.
+     * Value: true, if the cell settings should be applied to all cells in the table; otherwise, false.
+     */
+    applyForAll: boolean;
+}
+/**
+ * Contains settings related to the TABLEROWPROPERTIES_DIALOG_COMMAND command parameter.
+ */
+interface ASPxClientHtmlEditorTableRowPropertiesCommandArguments extends ASPxClientHtmlEditorCommandArguments {
+    /**
+     * Contains the style settings specifying the appearance of the specified table row.
+     * Value: An <see cref="ASPxClientHtmlEditorCommandStyleSettings" /> object that contains the style settings specifying the appearance of the specified table row.
+     */
+    styleSettings: ASPxClientHtmlEditorCommandStyleSettings;
+}
+/**
+ * Contains settings related to the TABLECOLUMNPROPERTIES_DIALOG_COMMAND command parameter.
+ */
+interface ASPxClientHtmlEditorTableColumnPropertiesCommandArguments extends ASPxClientHtmlEditorCommandArguments {
+    /**
+     * Contains the style settings defining the appearance of the target column element.
+     * Value: An <see cref="ASPxClientHtmlEditorCommandStyleSettings" /> object that contains the style settings defining the appearance of the target column element.
+     */
+    styleSettings: ASPxClientHtmlEditorCommandStyleSettings;
+}
+/**
+ * A method that will handle the DialogInitialized client event.
+ */
+interface ASPxClientHtmlEditorDialogInitializedEventHandler<S> {
+    /**
+     * A method that will handle the client DialogInitialized event.
+     * @param source An object representing the event's source.
+     * @param e An ASPxClientHtmlEditorDialogInitializedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientHtmlEditorDialogInitializedEventArgs): void;
+}
+/**
+ * Provides data for the DialogInitialized client event.
+ */
+interface ASPxClientHtmlEditorDialogInitializedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name of the dialog that has been initialized.
+     * Value: A string value that is the name of the initialized dialog.
+     */
+    dialogName: string;
+    /**
+     * Gets a dialog object related to the event.
+     * Value: A ASPxClientHtmlEditorDialogBase object that is the dialog.
+     */
+    dialog: ASPxClientHtmlEditorDialogBase;
+}
+/**
+ * Provides data for the event that fires when the HTML Editor dialogs are closed or are going to be closed.
+ */
+interface ASPxClientHtmlEditorDialogCloseEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the dialog name related to the event.
+     * Value: A string value that is the dialog name.
+     */
+    dialogName: string;
+    /**
+     * Gets the dialog object related to the event.
+     * Value: An ASPxClientHtmlEditorDialogBase object that is the dialog.
+     */
+    dialog: ASPxClientHtmlEditorDialogBase;
+    /**
+     * Gets a string that contains specific information (if any) passed from the client side for server-side processing.
+     * Value: A string value representing specific information passed from the client to the server side.
+     */
+    parameter: Object;
+}
+/**
+ * A method that will handle the DialogClosing event.
+ */
+interface ASPxClientHtmlEditorDialogClosingEventHandler<S> {
+    /**
+     * A method that will handle the DialogClosing event.
+     * @param source The event source.
+     * @param e An ASPxClientHtmlEditorDialogClosingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientHtmlEditorDialogClosingEventArgs): void;
+}
+/**
+ * Provides data for the DialogClosing event.
+ */
+interface ASPxClientHtmlEditorDialogClosingEventArgs extends ASPxClientHtmlEditorDialogCloseEventArgs {
+    /**
+     * Gets or sets a value indicating whether the action which raised the event should be canceled.
+     * Value: true, if the action that raised the event should be canceled; otherwise, false.
+     */
+    cancel: boolean;
+}
+/**
+ * A method that will handle the DialogClosed event.
+ */
+interface ASPxClientHtmlEditorDialogClosedEventHandler<S> {
+    /**
+     * A method that will handle the DialogClosed event.
+     * @param source The event source.
+     * @param e An ASPxClientHtmlEditorDialogClosedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientHtmlEditorDialogClosedEventArgs): void;
+}
+/**
+ * Provides data for the DialogClosed event.
+ */
+interface ASPxClientHtmlEditorDialogClosedEventArgs extends ASPxClientHtmlEditorDialogCloseEventArgs {
+}
+/**
+ * A method that will handle the CommandExecuting event.
+ */
+interface ASPxClientHtmlEditorCommandExecutingEventHandler<S> {
+    /**
+     * A method that will handle the client CommandExecuted event.
+     * @param source The event's source.
+     * @param e An ASPxClientHtmlEditorCommandExecutingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientHtmlEditorCommandExecutingEventArgs): void;
+}
+/**
+ * Provides data for the CommandExecuting event.
+ */
+interface ASPxClientHtmlEditorCommandExecutingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the name of the processed command.
+     * Value: A string value specifying the processed command's name.
+     */
+    commandName: string;
+    /**
+     * Gets an optional parameter that complements the processed command.
+     * Value: An object containing additional information about the processed command.
+     */
+    parameter: Object;
+}
+/**
+ * A method that will handle the client events related to command processing.
+ */
+interface ASPxClientHtmlEditorCommandEventHandler<S> {
+    /**
+     * A method that will handle the corresponding client event.
+     * @param source The event source. This parameter identifies the editor which raised the event.
+     * @param e An ASPxClientHtmlEditorCommandEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientHtmlEditorCommandEventArgs): void;
+}
+/**
+ * Provides data for client events that relate to command processing (CustomCommand).
+ */
+interface ASPxClientHtmlEditorCommandEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name of the processed command.
+     * Value: A string value representing the processed command's name.
+     */
+    commandName: string;
+    /**
+     * Gets an optional parameter that complements the processed command.
+     * Value: A string value containing additional information about the processed command.
+     */
+    parameter: Object;
+}
+/**
+ * A method that will handle the client events that relate to custom dialog operations.
+ */
+interface ASPxClientHtmlEditorCustomDialogEventHandler<S> {
+    /**
+     * A method that will handle the client CustomDialogOpened event.
+     * @param source An object representing the event's source.
+     * @param e An ASPxClientHtmlEditorCustomDialogEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientHtmlEditorCustomDialogEventArgs): void;
+}
+/**
+ * Provides data for client events that relate to custom dialog operations.
+ */
+interface ASPxClientHtmlEditorCustomDialogEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name that uniquely identifies the processed custom dialog.
+     * Value: A string value that represents the value assigned to the processed custom dialog's Name property.
+     */
+    name: string;
+}
+/**
+ * Provides data for client events that relate to closing a custom dialog.
+ */
+interface ASPxClientHtmlEditorCustomDialogCloseEventArgsBase extends ASPxClientHtmlEditorCustomDialogEventArgs {
+    /**
+     * Gets the status of the closed custom dialog.
+     * Value: An object representing a custom dialog's closing status. By default, it's the "cancel" string if the dialog operation is canceled, or the "ok" string if a dialog is closed by submitting a file. You can also provide your custom status, if your dialog contains additional buttons.
+     */
+    status: Object;
+}
+/**
+ * A method that will handle the CustomDialogClosing client event.
+ */
+interface ASPxClientHtmlEditorCustomDialogClosingEventHandler<S> {
+    /**
+     * A method that will handle the client CustomDialogClosing event.
+     * @param source An object representing the event's source.
+     * @param e An ASPxClientHtmlEditorCustomDialogClosingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientHtmlEditorCustomDialogClosingEventArgs): void;
+}
+/**
+ * Provides data for the CustomDialogClosing client event.
+ */
+interface ASPxClientHtmlEditorCustomDialogClosingEventArgs extends ASPxClientHtmlEditorCustomDialogCloseEventArgsBase {
+    /**
+     * Gets or sets a value specifying whether the event was handled.
+     * Value: true if the event was handled and default processing should not occur; false if the event should be handled using default processing.
+     */
+    handled: boolean;
+}
+/**
+ * A method that will handle the CustomDialogClosed client event.
+ */
+interface ASPxClientHtmlEditorCustomDialogClosedEventHandler<S> {
+    /**
+     * A method that will handle the client CustomDialogClosed event.
+     * @param source An object representing the event's source.
+     * @param e An ASPxClientHtmlEditorCustomDialogClosedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientHtmlEditorCustomDialogClosedEventArgs): void;
+}
+/**
+ * Provides data for the CustomDialogClosed client event.
+ */
+interface ASPxClientHtmlEditorCustomDialogClosedEventArgs extends ASPxClientHtmlEditorCustomDialogCloseEventArgsBase {
+    /**
+     * Gets an object associated with the closed dialog.
+     * Value: An object containing custom data associated with dialog closing.
+     */
+    data: Object;
+}
+/**
+ * A method that will handle the Validation client event.
+ */
+interface ASPxClientHtmlEditorValidationEventHandler<S> {
+    /**
+     * A method that will handle the client Validation event.
+     * @param source An object representing the event's source.
+     * @param e An ASPxClientHtmlEditorValidationEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientHtmlEditorValidationEventArgs): void;
+}
+/**
+ * Provides data for the Validation client event.
+ */
+interface ASPxClientHtmlEditorValidationEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets or sets the HTML markup that is the ASPxHtmlEditor's content.
+     * Value: A string value that specifies the HTML content to validate.
+     */
+    html: string;
+    /**
+     * Gets or sets a value specifying whether the validated value is valid.
+     * Value: true if the validation has been completed successfully; otherwise, false.
+     */
+    isValid: boolean;
+    /**
+     * Gets or sets the error text to be displayed within the editor's error frame if the editor's validation fails.
+     * Value: A string value specifying the error description.
+     */
+    errorText: string;
+}
+/**
+ * A method that will handle the ActiveTabChanged event.
+ */
+interface ASPxClientHtmlEditorTabEventHandler<S> {
+    /**
+     * A method that will handle the client ActiveTabChanged event.
+     * @param source The event's source.
+     * @param e An ASPxClientHtmlEditorTabEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientHtmlEditorTabEventArgs): void;
+}
+/**
+ * Provides data for the ActiveTabChanged event that concerns manipulations on tabs.
+ */
+interface ASPxClientHtmlEditorTabEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name that uniquely identifies an editor tab.
+     * Value: A string value that is the tab name.
+     */
+    name: string;
+}
+/**
+ * A method that will handle the ActiveTabChanging event.
+ */
+interface ASPxClientHtmlEditorTabCancelEventHandler<S> {
+    /**
+     * A method that will handle the client ActiveTabChanging event.
+     * @param source The event's source.
+     * @param e An ASPxClientHtmlEditorTabCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientHtmlEditorTabCancelEventArgs): void;
+}
+/**
+ * Provides data for the cancellable ActiveTabChanging event that concerns manipulations on tabs.
+ */
+interface ASPxClientHtmlEditorTabCancelEventArgs extends ASPxClientHtmlEditorTabEventArgs {
+    /**
+     * Gets or sets a value indicating whether the action which raised the event, should be canceled.
+     * Value: true, if the action that raised the event should be canceled; otherwise, false.
+     */
+    cancel: boolean;
+}
+/**
+ * A method that will handle the BeforePaste event.
+ */
+interface ASPxClientHtmlEditorBeforePasteEventHandler<S> {
+    /**
+     * A method that will handle the BeforePaste event.
+     * @param source The event source. This parameter identifies the HTML editor object that raised the event.
+     * @param e An ASPxClientHtmlEditorBeforePasteEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientHtmlEditorBeforePasteEventArgs): void;
+}
+/**
+ * Provides data for the BeforePaste event.
+ */
+interface ASPxClientHtmlEditorBeforePasteEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name of the processed command.
+     * Value: A string value identifying the command's name.
+     */
+    commandName: string;
+    /**
+     * Gets or sets the HTML markup that is about to be pasted to the ASPxHtmlEditor's content.
+     * Value: A string value that specifies the HTML content to paste.
+     */
+    html: string;
+}
+/**
+ * Represents a client-side equivalent of the ASPxHtmlEditor control.
+ */
+interface ASPxClientHtmlEditor extends ASPxClientControl {
+    /**
+     * Occurs on the client side after a dialog has been initialized.
+     */
+    DialogInitialized: ASPxClientEvent<ASPxClientHtmlEditorDialogInitializedEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Fires on the client side before a dialog is going to be closed.
+     */
+    DialogClosing: ASPxClientEvent<ASPxClientHtmlEditorDialogClosingEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Occurs on the client side after a dialog is closed.
+     */
+    DialogClosed: ASPxClientEvent<ASPxClientHtmlEditorDialogClosedEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Occurs before a default or custom command has been executed and allows you to cancel the action.
+     */
+    CommandExecuting: ASPxClientEvent<ASPxClientHtmlEditorCommandExecutingEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Enables you to implement a custom command's logic.
+     */
+    CustomCommand: ASPxClientEvent<ASPxClientHtmlEditorCommandEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Occurs after a default or custom command has been executed on the client side.
+     */
+    CommandExecuted: ASPxClientEvent<ASPxClientHtmlEditorCommandEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Fires on the client side when the editor's Design View Area receives input focus.
+     */
+    GotFocus: ASPxClientEvent<ASPxClientEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Fires on the client side when the editor's Design View Area loses input focus.
+     */
+    LostFocus: ASPxClientEvent<ASPxClientEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Occurs on the client when a selection is changed within the ASPxHtmlEditor.
+     */
+    SelectionChanged: ASPxClientEvent<ASPxClientEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Occurs on the client side when the content of the editor changes.
+     */
+    HtmlChanged: ASPxClientEvent<ASPxClientEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Occurs on the client side after a custom dialog is opened.
+     */
+    CustomDialogOpened: ASPxClientEvent<ASPxClientHtmlEditorCustomDialogEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Fires on the client side before a custom dialog is closed.
+     */
+    CustomDialogClosing: ASPxClientEvent<ASPxClientHtmlEditorCustomDialogClosingEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Occurs on the client side after a custom dialog is closed.
+     */
+    CustomDialogClosed: ASPxClientEvent<ASPxClientHtmlEditorCustomDialogClosedEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Allows you to specify whether the value entered into the ASPxHtmlEditor is valid.
+     */
+    Validation: ASPxClientEvent<ASPxClientHtmlEditorValidationEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Occurs on the client side before a context menu is shown.
+     */
+    ContextMenuShowing: ASPxClientEvent<ASPxClientEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientHtmlEditor.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Fires after a callback, sent by the CustomDataCallback event handler.
+     */
+    CustomDataCallback: ASPxClientEvent<ASPxClientCustomDataCallbackEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Occurs on the client side after the editor content is spell checked.
+     */
+    SpellingChecked: ASPxClientEvent<ASPxClientEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Fires on the client side after the active tab has been changed within a control.
+     */
+    ActiveTabChanged: ASPxClientEvent<ASPxClientHtmlEditorTabEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Fires on the client side before the active tab is changed within a control.
+     */
+    ActiveTabChanging: ASPxClientEvent<ASPxClientHtmlEditorTabCancelEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Occurs before an HTML code is pasted to editor content, and allows you to modify it.
+     */
+    BeforePaste: ASPxClientEvent<ASPxClientHtmlEditorBeforePasteEventHandler<ASPxClientHtmlEditor>>;
+    /**
+     * Returns the document object generated by an iframe element within a design view area.
+     */
+    GetDesignViewDocument(): Object;
+    /**
+     * Provides access to the client ASPxPopupControl object that is a Html Editor's dialog.
+     */
+    GetDialogPopupControl(): ASPxClientPopupControl;
+    /**
+     * Returns the document object generated by an iframe element within a preview area.
+     */
+    GetPreviewDocument(): Object;
+    /**
+     * Returns a collection of client context menu objects.
+     */
+    GetContextMenu(): ASPxClientPopupMenu;
+    /**
+     * Returns a value indicating whether an editor is enabled.
+     */
+    GetEnabled(): boolean;
+    /**
+     * Specifies whether an editor is enabled.
+     * @param value true to enable the editor; false to disable it.
+     */
+    SetEnabled(value: boolean): void;
+    /**
+     * Sets input focus to the ASPxHtmlEditor's edit region.
+     */
+    Focus(): void;
+    /**
+     * Gets the HTML markup that represents the editor's content.
+     */
+    GetHtml(): string;
+    /**
+     * Specifies the HTML markup that represents the editor's content.
+     * @param html A string value that specifies the HTML markup.
+     */
+    SetHtml(html: string): void;
+    /**
+     * Sets the HTML markup that represents the editor's content.
+     * @param html A string value that specifies the HTML markup.
+     * @param clearUndoHistory true to clear the undo stack; otherwise, false.
+     */
+    SetHtml(html: string, clearUndoHistory: boolean): void;
+    /**
+     * Replaces placeholders with the specified values.
+     * @param html A string value that specifies the HTML code to process.
+     * @param placeholders An array of objects that specify the placeholders and values to replace them.
+     */
+    ReplacePlaceholders(html: string, placeholders: Object[]): string;
+    /**
+     * Creates a parameter for ASPxHtmlEditor's client-side commands related to changing media elements.
+     * @param element An element that is being changed.
+     */
+    CreateChangeMediaElementCommandArguments(element: Object): ASPxClientHtmlEditorChangeMediaElementCommandArguments;
+    /**
+     * Executes the specified command.
+     * @param commandName A string value that specifies the command to perform.
+     * @param parameter A string value specifying additional information about the command to perform.
+     * @param addToUndoHistory true, to add the specified command to the undo stack; otherwise, false.
+     */
+    ExecuteCommand(commandName: string, parameter: Object, addToUndoHistory: boolean): boolean;
+    /**
+     * Adds the current editor state to the undo/redo history.
+     */
+    SaveToUndoHistory(): void;
+    /**
+     * Returns the selection in the ASPxHtmlEditor.
+     */
+    GetSelection(): ASPxClientHtmlEditorSelection;
+    /**
+     * Restores the selection within the ASPxHtmlEditor.
+     */
+    RestoreSelection(): boolean;
+    /**
+     * Sets the value of the combo box within the HtmlEditor on the client side.
+     * @param commandName A string value that identifies the combo box's command name within the HtmlEditor's control collection.
+     * @param value A string value that specifies the combo box's new value.
+     */
+    SetToolbarComboBoxValue(commandName: string, value: string): void;
+    /**
+     * Sets the value of the dropdown item picker in the HtmlEditor on the client side.
+     * @param commandName A string value that identifies the dropdown item picker by its command name. This value is contained in the CommandName property.
+     * @param value A string value that specifies the dropdown item picker's new value, i.e., the ToolbarItemPickerItem object.
+     */
+    SetToolbarDropDownItemPickerValue(commandName: string, value: string): void;
+    /**
+     * Specifies the visibility of a ribbon context tab category specified by its name.
+     * @param categoryName A Name property value of the required category.
+     * @param active true to make a category visible; false to make it hidden.
+     */
+    SetRibbonContextTabCategoryVisible(categoryName: string, active: string): void;
+    /**
+     * Provides access to an object implementing the HtmlEditor's ribbon UI.
+     */
+    GetRibbon(): ASPxClientRibbon;
+    /**
+     * Gets a value that indicates whether the editor's value passes validation.
+     */
+    GetIsValid(): boolean;
+    /**
+     * Gets the error text to be displayed within the editor's error frame if the editor's validation fails.
+     */
+    GetErrorText(): string;
+    /**
+     * Sets a value that specifies whether the editor's value passes validation.
+     * @param isValid true if the editor's value passes validation; otherwise, false.
+     */
+    SetIsValid(isValid: boolean): void;
+    /**
+     * Sets the error text to be displayed within the editor's error frame if the editor's validation fails.
+     * @param errorText A string value representing the error text.
+     */
+    SetErrorText(errorText: string): void;
+    /**
+     * Performs validation of the editor's content.
+     */
+    Validate(): void;
+    /**
+     * Set an active tab specified by its name.
+     * @param name A string value that is the name of the tab.
+     */
+    SetActiveTabByName(name: string): void;
+    /**
+     * Returns the name of the active HTML editor tab.
+     */
+    GetActiveTabName(): string;
+    /**
+     * Reconnect the control to an external ribbon.
+     */
+    ReconnectToExternalRibbon(): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomDataCallback event passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side CustomDataCallback event.
+     * @param onCallback A ASPxClientDataCallback object that represents the JavaScript function which receives the callback data as a parameter.
+     */
+    PerformDataCallback(parameter: string, onCallback: ASPxClientDataCallback): void;
+}
+/**
+ * Provides client functionality for dialogs within the  ASPxHtmlEditor.
+ */
+interface ASPxClientHtmlEditorDialogBase {
+    /**
+     * Provides access to the client ASPxFormLayout object that arranges all editors in the Html Editor's dialogs.
+     */
+    GetFormLayout(): ASPxClientFormLayout;
+    /**
+     * Provides access to the client object of the "OK" button in the Html Editor's dialogs.
+     */
+    GetOkButton(): ASPxClientButton;
+    /**
+     * Provides access to the client object of the "Cancel" button in the Html Editor's dialogs.
+     */
+    GetCancelButton(): ASPxClientButton;
+}
+/**
+ * Provides client functionality for Html Editor dialogs operated with its elements.
+ */
+interface ASPxClientHtmlEditorEditElementDialog extends ASPxClientHtmlEditorDialogBase {
+    /**
+     * Provides access to the client object of the "Border style" combo box in the Html Editor's dialogs (Style Settings).
+     */
+    GetBorderStyleComboBox(): ASPxClientComboBox;
+    /**
+     * Provides access to the client object of the "Border width" spin editor in the Html Editor's dialogs (Style Settings).
+     */
+    GetBorderWidthSpinEdit(): ASPxClientSpinEdit;
+    /**
+     * Provides access to the client object of the "Border color" color editor in the Html Editor's dialogs (Style Settings).
+     */
+    GetBorderColorColorEdit(): ASPxClientColorEdit;
+    /**
+     * Provides access to the client object of the "Top margin" text box in the Html Editor's dialogs (Style Settings).
+     */
+    GetTopMarginTextBox(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the "Bottom margin" text box in the Html Editor's dialogs (Style Settings).
+     */
+    GetBottomMarginTextBox(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the "Left margin" text box in the Html Editor's dialogs (Style Settings).
+     */
+    GetLeftMarginTextBox(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the "Right margin" text box in the Html Editor's dialogs (Style Settings).
+     */
+    GetRightMarginTextBox(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the "CSS class" combo box in the Html Editor's dialogs (Style Settings).
+     */
+    GetCssClassNameComboBox(): ASPxClientComboBox;
+}
+/**
+ * Provides client functionality for the Change Element Properties dialog within the  ASPxHtmlEditor.
+ */
+interface ASPxClientHtmlEditorChangeElementPropertiesDialog extends ASPxClientHtmlEditorEditElementDialog {
+    /**
+     * Provides access to the client object of the "ID" text box in the Html Editor's "Change Element Properties" dialog.
+     */
+    GetIdTextBox(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the "Title" text box in the Html Editor's "Change Element Properties" dialog.
+     */
+    GetTitleTextBox(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the "Direction" combo box in the Html Editor's "Change Element Properties" dialog.
+     */
+    GetDirectionComboBox(): ASPxClientComboBox;
+    /**
+     * Provides access to the client object of the "Value" text box in the Html Editor's "Change Element Properties" dialog.
+     */
+    GetValueTextBox(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the "Tab index" text box in the Html Editor's "Change Element Properties" dialog.
+     */
+    GetTabIndexTextBox(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the "Disabled" check box in the Html Editor's "Change Element Properties" dialog.
+     */
+    GetDisabledCheckBox(): ASPxClientCheckBox;
+    /**
+     * Provides access to the client object of the "Input type" combo box in the Html Editor's "Change Element Properties" dialog.
+     */
+    GetInputTypeComboBox(): ASPxClientComboBox;
+    /**
+     * Provides access to the client object of the "For" text box in the Html Editor's "Change Element Properties" dialog.
+     */
+    GetForTextBox(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the "Name" text box in the Html Editor's "Change Element Properties" dialog.
+     */
+    GetNameTextBox(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the "Method" text box in the Html Editor's "Change Element Properties" dialog.
+     */
+    GetMethodTextBox(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the "Action" text box in the Html Editor's "Change Element Properties" dialog.
+     */
+    GetActionTextBox(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the "Checked" check box in the Html Editor's "Change Element Properties" dialog.
+     */
+    GetCheckedCheckBox(): ASPxClientCheckBox;
+    /**
+     * Provides access to the client object of the "Max length" text box in the Html Editor's "Change Element Properties" dialog.
+     */
+    GetMaxLengthTextBox(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the "Size" text box in the Html Editor's "Change Element Properties" dialog.
+     */
+    GetSizeTextBox(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the "Readonly" check box in the Html Editor's "Change Element Properties" dialog.
+     */
+    GetReadonlyCheckBox(): ASPxClientCheckBox;
+    /**
+     * Provides access to the client object of the "Src" text box in the Html Editor's "Change Element Properties" dialog.
+     */
+    GetSrcTextBox(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the "Accept" text box in the Html Editor's "Change Element Properties" dialog.
+     */
+    GetAcceptTextBox(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the "Alt" text box in the Html Editor's "Change Element Properties" dialog.
+     */
+    GetAltTextBox(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the "Start" spin editor in the Html Editor's "Change Element Properties" dialog.
+     */
+    GetStartSpinEdit(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the "Width" spin editor in the Html Editor's "Change Element Properties" dialog.
+     */
+    GetWidthValueSpinEdit(): ASPxClientSpinEdit;
+    /**
+     * Provides access to the client ASPxComboBox object that allows you to specify the element width measurement unit in the Html Editor's "Change Element Properties" dialog.
+     */
+    GetWidthValueTypeComboBox(): ASPxClientComboBox;
+    /**
+     * Provides access to the client object of the "Height" spin editor in the Html Editor's "Change Element Properties" dialog.
+     */
+    GetHeightValueSpinEdit(): ASPxClientSpinEdit;
+    /**
+     * Provides access to the client ASPxComboBox object that allows to specify the element height measurement unit in the Html Editor's "Change Element Properties" dialog.
+     */
+    GetHeightValueTypeComboBox(): ASPxClientComboBox;
+}
+/**
+ * Provides client functionality for the Link dialog within the ASPxHtmlEditor.
+ */
+interface ASPxClientHtmlEditorLinkDialog extends ASPxClientHtmlEditorDialogBase {
+    /**
+     * Provides access to the client object of the "E-mail to" text box in the Html Editor's Link dialog.
+     */
+    GetEmailTextBox(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the "Text" text box in the Html Editor's Link dialog.
+     */
+    GetTextTextBox(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the "ToolTip" text box in the Html Editor's Link dialog.
+     */
+    GetTooltipTextBox(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the "Subject" text box in the Html Editor's Link dialog.
+     */
+    GetSubjectTextBox(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the "URL" text box in the Html Editor's Link dialog.
+     */
+    GetUrlTextBox(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the file manager used in the Link dialog's "Select Document" popup window.
+     */
+    GetFileManager(): ASPxClientFileManager;
+    /**
+     * Provides access to the client object of the "Cancel" button in the Link dialog's "Select Document" popup window.
+     */
+    GetSelectDocumentPopupCancelButton(): ASPxClientButton;
+    /**
+     * Provides access to the client object of the "Select" button in the Link dialog's "Select Document" popup window.
+     */
+    GetSelectDocumentPopupSelectButton(): ASPxClientButton;
+    /**
+     * Provides access to the client popup control object that is the "Select Document" popup window in the Html Editor's Link dialog.
+     */
+    GetSelectDocumentPopupControl(): ASPxClientPopupControl;
+    /**
+     * Provides access to the client object of the "Open in new window" check box in the Html Editor's Link dialog.
+     */
+    GetOpenInNewWindowCheckBox(): ASPxClientCheckBox;
+    /**
+     * Provides access to the client radio button list object used to specify the link type in the Html Editor's Link dialog.
+     */
+    GetLinkTypeRadioButtonList(): ASPxClientRadioButtonList;
+}
+/**
+ * Provides client functionality for the Placeholder dialog within the ASPxHtmlEditor.
+ */
+interface ASPxClientHtmlEditorPlaceholderDialog extends ASPxClientHtmlEditorDialogBase {
+    /**
+     * Provides access to the ASPxListBox client object that lists placeholder names in the Html Editor's Placeholder dialog.
+     */
+    GetPlaceholderNameListBox(): ASPxClientListBox;
+}
+/**
+ * Provides client functionality for the Paste From Word dialog within the ASPxHtmlEditor.
+ */
+interface ASPxClientHtmlEditorPasteFromWordDialog extends ASPxClientHtmlEditorDialogBase {
+    /**
+     * Provides access to the client object of the "Remove font family" check box in the Html Editor's Flash dialog.
+     */
+    GetRemoveFontFamilyCheckBox(): ASPxClientCheckBox;
+}
+/**
+ * Provides client functionality for the media dialogs within the ASPxHtmlEditor.
+ */
+interface ASPxClientHtmlEditorMediaDialogBase extends ASPxClientHtmlEditorEditElementDialog {
+    /**
+     * Provides access to the client object of the media file selector that allows you to insert/change media files in the Html Editor's Audio/Video/Flash dialogs.
+     */
+    GetMediaFileSelector(): ASPxClientMediaFileSelector;
+    /**
+     * Provides access to the client object of the "More options" check box in the Html Editor's Audio/Video/Flash/Image dialogs.
+     */
+    GetMoreOptionsCheckBox(): ASPxClientCheckBox;
+    /**
+     * Provides access to the client object of the "Width" spin editor in the Html Editor's Audio/Video/Flash dialogs.
+     */
+    GetWidthSpinEdit(): ASPxClientSpinEdit;
+    /**
+     * Provides access to the client object of the "Height" spin editor in the Html Editor's Audio/Video/Flash dialogs.
+     */
+    GetHeightSpinEdit(): ASPxClientSpinEdit;
+    /**
+     * Provides access to the client object of the "Position" combo box in the Html Editor's Audio/Video/Flash/Image dialogs.
+     */
+    GetPositionComboBox(): ASPxClientComboBox;
+}
+/**
+ * Provides client functionality for the Image dialog within the  ASPxHtmlEditor.
+ */
+interface ASPxClientHtmlEditorImageDialog extends ASPxClientHtmlEditorMediaDialogBase {
+    /**
+     * Provides access to the client object of the "Size" combo box in the Html Editor's Image dialog.
+     */
+    GetSizeComboBox(): ASPxClientComboBox;
+    /**
+     * Provides access to the client object of the "Create thumbnail" check box in the Html Editor's Image dialog.
+     */
+    GetCreateThumbnailCheckBox(): ASPxClientCheckBox;
+    /**
+     * Provides access to the client object of the "New image name" text box in the Html Editor's Image dialog.
+     */
+    GetThumbnailNameTextBox(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the "Wrap text around image" check box in the Html Editor's Image dialog.
+     */
+    GetWrapTextCheckBox(): ASPxClientCheckBox;
+    /**
+     * Provides access to the client object of the "Description" text box in the Html Editor's Image dialog.
+     */
+    GetDescriptionTextBox(): ASPxClientTextBox;
+}
+/**
+ * Provides client functionality for the Flash dialog within the  ASPxHtmlEditor.
+ */
+interface ASPxClientHtmlEditorFlashDialog extends ASPxClientHtmlEditorMediaDialogBase {
+    /**
+     * Provides access to the client object of the "Quality" combo box in the Html Editor's Flash dialog.
+     */
+    GetQualityComboBox(): ASPxClientComboBox;
+    /**
+     * Provides access to the client object of the "Auto play" check box in the Html Editor's Flash dialog.
+     */
+    GetAutoPlayCheckBox(): ASPxClientCheckBox;
+    /**
+     * Provides access to the client object of the "Enable flash menu" check box in the Html Editor's Flash dialog.
+     */
+    GetEnableFlashMenuCheckBox(): ASPxClientCheckBox;
+    /**
+     * Provides access to the client object of the "Loop" check box in the Html Editor's Flash dialog.
+     */
+    GetLoopCheckBox(): ASPxClientCheckBox;
+    /**
+     * Provides access to the client object of the "Allow fullscreen" check box in the Html Editor's Flash dialog.
+     */
+    GetAllowFullscreenCheckBox(): ASPxClientCheckBox;
+}
+/**
+ * Provides client functionality for the Audio dialog within the  ASPxHtmlEditor.
+ */
+interface ASPxClientHtmlEditorAudioDialog extends ASPxClientHtmlEditorMediaDialogBase {
+    /**
+     * Provides access to the client object of the "Auto play" check box in the Html Editor's Audio dialogs.
+     */
+    GetAutoPlayCheckBox(): ASPxClientCheckBox;
+    /**
+     * Provides access to the client object of the "Preload mode" combo box in the Html Editor's Audio dialogs.
+     */
+    GetPreloadModeComboBox(): ASPxClientComboBox;
+    /**
+     * Provides access to the client object of the "Loop" check box in the Html Editor's Audio dialogs.
+     */
+    GetLoopCheckBox(): ASPxClientCheckBox;
+    /**
+     * Provides access to the client object of the "Show player controls" check box in the Html Editor's Audio dialogs.
+     */
+    GetShowPlayerControlsCheckBox(): ASPxClientCheckBox;
+}
+/**
+ * Provides client functionality for the Video dialog within the ASPxHtmlEditor.
+ */
+interface ASPxClientHtmlEditorVideoDialog extends ASPxClientHtmlEditorMediaDialogBase {
+    /**
+     * Provides access to the client object of the "Auto play" check box in the Html Editor's Video dialog.
+     */
+    GetAutoPlayCheckBox(): ASPxClientCheckBox;
+    /**
+     * Provides access to the client object of the "Preload mode" combo box in the Html Editor's Video dialog.
+     */
+    GetPreloadModeComboBox(): ASPxClientComboBox;
+    /**
+     * Provides access to the client object of the "Loop" check box in the Html Editor's Video dialog.
+     */
+    GetLoopCheckBox(): ASPxClientCheckBox;
+    /**
+     * Provides access to the client object of the "Show player controls" check box in the Html Editor's Video dialog.
+     */
+    GetShowPlayerControlsCheckBox(): ASPxClientCheckBox;
+    /**
+     * Provides access to the client object of the "Poster URL" text box in the Html Editor's Video dialog.
+     */
+    GetPosterTextBox(): ASPxClientTextBox;
+}
+/**
+ * Provides client functionality for the YouTube Video dialog within the ASPxHtmlEditor.
+ */
+interface ASPxClientHtmlEditorYouTubeDialog extends ASPxClientHtmlEditorEditElementDialog {
+    /**
+     * Provides access to the client object of the "Enable privacy-enhanced mode" check box in the Html Editor's YouTube Video dialog.
+     */
+    GetConfidentModeCheckBox(): ASPxClientCheckBox;
+    /**
+     * Provides access to the client object of the "Show suggested videos when the video finishes" check box in the Html Editor's YouTube Video dialog.
+     */
+    GetShowSameVideosCheckBox(): ASPxClientCheckBox;
+    /**
+     * Provides access to the client object of the "Show video title and player actions" check box in the Html Editor's YouTube Video dialog.
+     */
+    GetShowVideoNameCheckBox(): ASPxClientCheckBox;
+    /**
+     * Provides access to the client object of the "Show player controls" check box in the Html Editor's YouTube Video dialog.
+     */
+    GetShowPlayerControlsCheckBox(): ASPxClientCheckBox;
+}
+/**
+ * Provides base client functionality for the Table dialog within the ASPxHtmlEditor.
+ */
+interface ASPxClientHtmlEditorTableDialogBase extends ASPxClientHtmlEditorDialogBase {
+    /**
+     * Provides access to the client object of the "Background color" color editor in the Html Editor's Table dialogs.
+     */
+    GetBackgroundColorColorEdit(): ASPxClientColorEdit;
+}
+/**
+ * Provides client functionality for the Table dialog within the ASPxHtmlEditor.
+ */
+interface ASPxClientHtmlEditorTableDialog extends ASPxClientHtmlEditorTableDialogBase {
+    /**
+     * Provides access to the client object of the "Width" combo box in the Html Editor's Table dialogs.
+     */
+    GetWidthTypeComboBox(): ASPxClientComboBox;
+    /**
+     * Provides access to the client object of the spin editor in the Html Editor's Table dialogs that allows you to specify the table width value.
+     */
+    GetWidthValueSpinEdit(): ASPxClientSpinEdit;
+    /**
+     * Provides access to the client object of the combo box in the Html Editor's Table dialogs that allows you to specify the table width measurement unit.
+     */
+    GetWidthValueTypeComboBox(): ASPxClientComboBox;
+    /**
+     * Provides access to the client object of the "Height" combo box in the Html Editor's Table dialogs.
+     */
+    GetHeightTypeComboBox(): ASPxClientComboBox;
+    /**
+     * Provides access to the client object of the spin editor in the Html Editor's Table dialogs that allows you specify the table height value.
+     */
+    GetHeightValueSpinEdit(): ASPxClientSpinEdit;
+    /**
+     * Provides access to the client object of the combo box in the Html Editor's Table dialogs that allows you to specify the table height measurement unit.
+     */
+    GetHeightValueTypeComboBox(): ASPxClientComboBox;
+    /**
+     * Provides access to the client object of the "Cell padding" spin editor in the Html Editor's Table dialogs.
+     */
+    GetCellPaddingSpinEdit(): ASPxClientSpinEdit;
+    /**
+     * Provides access to the client object of the "Cell spacing" spin editor in the Html Editor's Table dialogs.
+     */
+    GetCellSpacingSpinEdit(): ASPxClientSpinEdit;
+    /**
+     * Provides access to the client object of the "Alignment" combo box in the Html Editor's Table dialogs.
+     */
+    GetAlignmentComboBox(): ASPxClientComboBox;
+    /**
+     * Provides access to the client object of the "Border Color" color editor in the Html Editor's Table dialogs.
+     */
+    GetBorderColorColorEdit(): ASPxClientColorEdit;
+    /**
+     * Provides access to the client object of the "Border size" spin editor in the Html Editor's Table dialogs.
+     */
+    GetBorderWidthSpinEdit(): ASPxClientSpinEdit;
+    /**
+     * Provides access to the client object of the "Headers" combo box in the Html Editor's Table dialogs.
+     */
+    GetHeadersComboBox(): ASPxClientComboBox;
+    /**
+     * Provides access to the client object of the "Caption" text box in the Html Editor's Table dialogs.
+     */
+    GetCaptionTextBox(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the "Summary" text box in the Html Editor's Table dialogs.
+     */
+    GetSummaryTextBox(): ASPxClientTextBox;
+    /**
+     * Provides access to the client object of the "Accessibility" check box related to the Html Editor's Table dialogs.
+     */
+    GetAccessibilityCheckBox(): ASPxClientCheckBox;
+}
+/**
+ * Provides client functionality for the Insert Table dialog within the  ASPxHtmlEditor.
+ */
+interface ASPxClientHtmlEditorInsertTableDialog extends ASPxClientHtmlEditorTableDialog {
+    /**
+     * Provides access to the client object of the "Columns" spin editor in the Html Editor's Table dialogs.
+     */
+    GetColumnCountSpinEdit(): ASPxClientSpinEdit;
+    /**
+     * Provides access to the client object of the "Rows" spin editor in the Html Editor's Table dialogs.
+     */
+    GetRowCountSpinEdit(): ASPxClientSpinEdit;
+    /**
+     * Provides access to the client object of the "Equal column widths" check box in the Html Editor's Table dialogs.
+     */
+    GetEqualWidthCheckBox(): ASPxClientCheckBox;
+}
+/**
+ * Provides client functionality for Table dialogs within the ASPxHtmlEditor.
+ */
+interface ASPxClientHtmlEditorTableElementPropertiesDialog extends ASPxClientHtmlEditorTableDialogBase {
+    /**
+     * Provides access to the client object of the "Horizontal" combo box in the Html Editor's Row/Column/Cell Properties dialog's Alignment group.
+     */
+    GetHorizontalAlignmentComboBox(): ASPxClientComboBox;
+    /**
+     * Provides access to the client object of the "Vertical" combo box in the Html Editor's Row/Column/Cell Properties dialog's Alignment group.
+     */
+    GetVerticalAlignmentComboBox(): ASPxClientComboBox;
+}
+/**
+ * Provides client functionality for the Cell Properties dialog within the ASPxHtmlEditor.
+ */
+interface ASPxClientHtmlEditorTableCellPropertiesDialog extends ASPxClientHtmlEditorTableElementPropertiesDialog {
+    /**
+     * Provides access to the client object of the "Apply to all cells in the table" check box in the Html Editor's Cell Properties dialog.
+     */
+    GetApplyToAllCellsCheckBox(): ASPxClientCheckBox;
+}
+/**
+ * Provides client functionality for the Row Properties dialog within the ASPxHtmlEditor.
+ */
+interface ASPxClientHtmlEditorTableRowPropertiesDialog extends ASPxClientHtmlEditorTableElementPropertiesDialog {
+    /**
+     * Provides access to the client object of the "Height" combo box in the Html Editor's "Row Properties" dialog.
+     */
+    GetHeightTypeComboBox(): ASPxClientComboBox;
+    /**
+     * Provides access to the client ASPxSpinEdit object that allows you to specify the row height in the Html Editor's "Row Properties" dialog.
+     */
+    GetHeightValueSpinEdit(): ASPxClientSpinEdit;
+    /**
+     * Provides access to the client ASPxComboBox object that allows you to specify the row height measurement unit in the Html Editor's "Row Properties" dialog.
+     */
+    GetHeightValueTypeComboBox(): ASPxClientComboBox;
+}
+/**
+ * Provides client functionality for the Column Properties dialog within the ASPxHtmlEditor.
+ */
+interface ASPxClientHtmlEditorTableColumnPropertiesDialog extends ASPxClientHtmlEditorTableElementPropertiesDialog {
+    /**
+     * Provides access to the client object of the "Width" combo box in the Html Editor's "Column Properties" dialog.
+     */
+    GetWidthTypeComboBox(): ASPxClientComboBox;
+    /**
+     * Provides access to the client object of the spin editor that allows you to set the column width value in the Html Editor's "Column Properties" dialog.
+     */
+    GetWidthValueSpinEdit(): ASPxClientSpinEdit;
+    /**
+     * Provides access to the client object of the combo box that allows you to specify the column width measurement unit in the Html Editor's "Column Properties" dialog.
+     */
+    GetWidthValueTypeComboBox(): ASPxClientComboBox;
+}
+/**
+ * A selection in the ASPxHtmlEditor.
+ */
+interface ASPxClientHtmlEditorSelection {
+    /**
+     * Returns a DOM element that relates to the current selection.
+     */
+    GetSelectedElement(): Object;
+    /**
+     * Returns the HTML markup specifying the currently selected ASPxHtmlEditor content.
+     */
+    GetHtml(): string;
+    /**
+     * Returns the text within the currently selected ASPxHtmlEditor content.
+     */
+    GetText(): string;
+    /**
+     * Returns an array of the currently selected elements.
+     */
+    GetElements(): Object[];
+    /**
+     * Sets the new HTML markup in place of the currently selected within ASPxHtmlEditor content.
+     * @param html A string value specifying the new HTML markup.
+     * @param addToHistory true to add this operation to the history; otherwise, false.
+     */
+    SetHtml(html: string, addToHistory: boolean): void;
+}
+/**
+ * The client-side equivalent of the ASPxPivotGrid control.
+ */
+interface ASPxClientPivotGrid extends ASPxClientControl {
+    /**
+     * Occurs on the client after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientPivotGrid>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientPivotGrid.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientPivotGrid>>;
+    /**
+     * Fires after a callback that has been processed on the server returns back to the client.
+     */
+    AfterCallback: ASPxClientEvent<ASPxClientEventHandler<ASPxClientPivotGrid>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientPivotGrid>>;
+    /**
+     * Fires before a callback is sent to the server for server-side processing.
+     */
+    BeforeCallback: ASPxClientEvent<ASPxClientEventHandler<ASPxClientPivotGrid>>;
+    /**
+     * Fires on the client side after the customization form's visible state has been changed.
+     */
+    CustomizationFieldsVisibleChanged: ASPxClientEvent<ASPxClientEventHandler<ASPxClientPivotGrid>>;
+    /**
+     * Occurs when a cell is clicked.
+     */
+    CellClick: ASPxClientEvent<ASPxClientClickEventHandler<ASPxClientPivotGrid>>;
+    /**
+     * Occurs when a cell is double clicked.
+     */
+    CellDblClick: ASPxClientEvent<ASPxClientClickEventHandler<ASPxClientPivotGrid>>;
+    /**
+     * Occurs when a custom menu item has been clicked.
+     */
+    PopupMenuItemClick: ASPxClientEvent<ASPxClientPivotMenuItemClickEventHandler<ASPxClientPivotGrid>>;
+    /**
+     * Indicates whether the Defer Layout Update check box is enabled.
+     */
+    IsDeferUpdatesChecked(): boolean;
+    /**
+     * Indicates whether the Filter Editor (Prefilter) is visible.
+     */
+    IsPrefilterVisible(): boolean;
+    /**
+     * Shows the Filter Editor.
+     */
+    ShowPrefilter(): void;
+    /**
+     * Hides the Filter Editor.
+     */
+    HidePrefilter(): void;
+    /**
+     * Clears the filter expression applied using the Prefilter (Filter Editor).
+     */
+    ClearPrefilter(): void;
+    /**
+     * Enables or disables the current filter applied by the Filter Editor (Prefilter).
+     */
+    ChangePrefilterEnabled(): void;
+    /**
+     * Returns a value that specifies whether the customization form is visible.
+     */
+    GetCustomizationFieldsVisibility(): boolean;
+    /**
+     * Specifies the visibility of the customization form.
+     * @param value true to display the customization form; false to hide the customization form.
+     */
+    SetCustomizationFieldsVisibility(value: boolean): void;
+    /**
+     * Switches the customization form's visible state.
+     */
+    ChangeCustomizationFieldsVisibility(): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(args: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(args: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * A method that will handle the CellDblClick event.
+ */
+interface ASPxClientClickEventHandler<S> {
+    /**
+     * A method that will handle the CellDblClick event.
+     * @param source The event source.
+     * @param e An ASPxClientClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientClickEventArgs): void;
+}
+/**
+ * Provides data for the CellDblClick client events.
+ */
+interface ASPxClientClickEventArgs extends ASPxClientEventArgs {
+    /**
+     * Provides access to the parameters associated with the CellDblClick events.
+     * Value: An object that contains parameters associated with the CellDblClick events.
+     */
+    HtmlEvent: Object;
+    /**
+     * Gets the processed cell's value.
+     * Value: An object that represents the processed cell's value.
+     */
+    Value: Object;
+    /**
+     * Gets the index of a column that owns the processed cell.
+     * Value: An integer value that identifies a column.
+     */
+    ColumnIndex: number;
+    /**
+     * Gets the index of a row that owns the processed cell.
+     * Value: An integer value that identifies a row.
+     */
+    RowIndex: number;
+    /**
+     * Gets a column field value.
+     * Value: An object that represents a column field value.
+     */
+    ColumnValue: Object;
+    /**
+     * Gets a row field value.
+     * Value: An object that represents a row field value.
+     */
+    RowValue: Object;
+    /**
+     * Gets a column field name.
+     * Value: A String value that represents a column field name.
+     */
+    ColumnFieldName: string;
+    /**
+     * Gets a row field name.
+     * Value: A String value that represents a row field name.
+     */
+    RowFieldName: string;
+    /**
+     * Gets a column value type.
+     * Value: A String value that represents a column value type.
+     */
+    ColumnValueType: string;
+    /**
+     * Gets a row value type.
+     * Value: A String value that represents a row value type.
+     */
+    RowValueType: string;
+    /**
+     * Gets the index of the data field which corresponds to the clicked summary value.
+     * Value: An integer value that identifies the data field.
+     */
+    DataIndex: number;
+}
+/**
+ * A method that will handle the PopupMenuItemClick event.
+ */
+interface ASPxClientPivotMenuItemClickEventHandler<S> {
+    /**
+     * A method that will handle the PopupMenuItemClick event.
+     * @param source The event source.
+     * @param e An ASPxClientPivotMenuItemClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientPivotMenuItemClickEventArgs): void;
+}
+/**
+ * Provides data for the PopupMenuItemClick event.
+ */
+interface ASPxClientPivotMenuItemClickEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the context menu's type.
+     * Value: A PivotGridPopupMenuType enumeration value that identifies the context menu.
+     */
+    MenuType: string;
+    /**
+     * Gets the name of the menu item currently being clicked.
+     * Value: A String value that identifies the clicked item by its name.
+     */
+    MenuItemName: string;
+    /**
+     * Gets the field's unique indentifier.
+     * Value: A string which specifies the field's unique indentifier.
+     */
+    FieldID: string;
+    /**
+     * Gets the index of the field value for which the popup menu has been invoked.
+     * Value: An integer value that identifies the field value.
+     */
+    FieldValueIndex: number;
+}
+/**
+ * A client-side equivalent of the ASPxPivotCustomizationControl control.
+ */
+interface ASPxClientPivotCustomization extends ASPxClientControl {
+    /**
+     * Returns an HTML element that represents the root of the control's hierarchy.
+     */
+    GetMainContainer(): Object;
+    /**
+     * Returns a client-side equivalent of the owner Pivot Grid Control.
+     */
+    GetPivotGrid(): ASPxClientPivotGrid;
+    /**
+     * Specifies the Customization Control's height.
+     * @param value An integer value that specifies the Customization Control's height.
+     */
+    SetHeight(value: number): void;
+    /**
+     * Specifies the Customization Control's width.
+     * @param value An integer value that specifies the Customization Control's width.
+     */
+    SetWidth(value: number): void;
+    /**
+     * Recalculates the Customization Control height.
+     */
+    UpdateHeight(): void;
+    /**
+     * Specifies the Customization Control's layout.
+     * @param layout A string that specifies the Customization Control's layout.
+     */
+    SetLayout(layout: string): void;
+}
+/**
+ * A method that will handle the CustomCommandExecuted event.
+ */
+interface ASPxClientRichEditCustomCommandExecutedEventHandler<S> {
+    /**
+     * A method that will handle the CustomCommandExecuted event.
+     * @param source An object representing the event source. Identifies the RichEdit that raised the event.
+     * @param e A ASPxClientRichEditCustomCommandExecutedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientRichEditCustomCommandExecutedEventArgs): void;
+}
+/**
+ * Provides data for the CustomCommandExecuted event.
+ */
+interface ASPxClientRichEditCustomCommandExecutedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name of the processed command.
+     * Value: A string value representing the processed command's name.
+     */
+    commandName: string;
+    /**
+     * Gets an optional parameter that complements the processed command.
+     * Value: A string value containing additional information about the processed command.
+     */
+    parameter: Object;
+}
+/**
+ * A method that will handle the HyperlinkClick event.
+ */
+interface ASPxClientRichEditHyperlinkClickEventHandler<S> {
+    /**
+     * A method that will handle the HyperlinkClick event.
+     * @param source The event source.
+     * @param e An ASPxClientRichEditHyperlinkClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientRichEditHyperlinkClickEventArgs): void;
+}
+/**
+ * Provides data for the HyperlinkClick event.
+ */
+interface ASPxClientRichEditHyperlinkClickEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets or sets whether the event is handled manually, so no default processing is required.
+     * Value: true if the event is handled and no default processing is required; otherwise false.
+     */
+    handled: boolean;
+    /**
+     * Gets a DHTML event object that relates to the processed event.
+     * Value: An object that maintains DHTML event-specific information.
+     */
+    htmlEvent: Object;
+    /**
+     * Gets a value identifying the clicked hyperlink type.
+     * Value: One of the <see cref="ASPxClientOfficeDocumentLinkType" /> values.
+     */
+    hyperlinkType: ASPxClientOfficeDocumentLinkType;
+    /**
+     * Gets the clicked link's URI.
+     * Value: A sting value specifying the link's URI.
+     */
+    targetUri: string;
+}
+/**
+ * A client-side equivalent of the ASPxRichEdit object.
+ */
+interface ASPxClientRichEdit extends ASPxClientControl {
+    /**
+     * Provides access to document structural elements.
+     * Value: A <see cref="RichEditDocument" /> object that lists RichEdit's document structural elements.
+     */
+    document: RichEditDocument;
+    /**
+     * Provides access to RichEdit's client-side commands.
+     * Value: A <see cref="RichEditCommands" /> object that lists RichEdit's client-side commands.
+     */
+    commands: RichEditCommands;
+    /**
+     * Provides access to the client methods that changes the selection.
+     * Value: A <see cref="RichEditSelection" /> object that lists methods to work with the selection.
+     */
+    selection: RichEditSelection;
+    /**
+     * Gets a unit converter.
+     * Value: A <see cref="RichEditUnitConverter" /> object representing a unit converter.
+     */
+    unitConverter: RichEditUnitConverter;
+    /**
+     * Occurs after a custom command has been executed on the client side.
+     */
+    CustomCommandExecuted: ASPxClientEvent<ASPxClientRichEditCustomCommandExecutedEventHandler<ASPxClientRichEdit>>;
+    /**
+     * Fires after a client change has been made to the document and the client-server synchronization starts to apply the change on the server.
+     */
+    BeginSynchronization: ASPxClientEvent<ASPxClientEventHandler<ASPxClientRichEdit>>;
+    /**
+     * Fires after a document change has been applied to the server and server and client document models have been synchronized.
+     */
+    EndSynchronization: ASPxClientEvent<ASPxClientEventHandler<ASPxClientRichEdit>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientRichEdit>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientRichEdit>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the RichEdit.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientRichEdit>>;
+    /**
+     * Fires if any change is made to the RichEdit's document on the client.
+     */
+    DocumentChanged: ASPxClientEvent<ASPxClientEventHandler<ASPxClientRichEdit>>;
+    /**
+     * Occurs when a hyperlink is clicked within the document.
+     */
+    HyperlinkClick: ASPxClientEvent<ASPxClientRichEditHyperlinkClickEventHandler<ASPxClientRichEdit>>;
+    /**
+     * Occurs when the selection is changed within the document.
+     */
+    SelectionChanged: ASPxClientEvent<ASPxClientEventHandler<ASPxClientRichEdit>>;
+    /**
+     * Enables you to switch the full-screen mode of the Rich Text Editor.
+     * @param fullscreen true to activate full-screen mode; false to deactivate full-screen mode.
+     */
+    SetFullscreenMode(fullscreen: boolean): void;
+    /**
+     * Provides access to an object implementing the RichEdit's ribbon UI.
+     */
+    GetRibbon(): ASPxClientRibbon;
+    /**
+     * Sets input focus to the RichEdit.
+     */
+    Focus(): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Indicates whether any unsaved changes are contained in the current document.
+     */
+    HasUnsavedChanges(): boolean;
+    /**
+     * Reconnects the RichEdit to an external ribbon.
+     */
+    ReconnectToExternalRibbon(): void;
+}
+/**
+ * Contains a set of the available client commands.
+ */
+interface RichEditCommands {
+    /**
+     * Gets a command to create a new empty document.
+     * Value: A <see cref="FileNewCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    fileNew: FileNewCommand;
+    /**
+     * Gets a command to open the file, specifying its path.
+     * Value: A <see cref="FileOpenCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    fileOpen: FileOpenCommand;
+    /**
+     * Gets a command to invoke the File Open dialog allowing one to select and load a document file into RichEdit.
+     * Value: A <see cref="FileOpenDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    fileOpenDialog: FileOpenDialogCommand;
+    /**
+     * Gets a command to save the document to a file.
+     * Value: A <see cref="FileSaveCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    fileSave: FileSaveCommand;
+    /**
+     * Gets a command to download the document file, specifying its extension.
+     * Value: A <see cref="FileDownloadCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    fileDownload: FileDownloadCommand;
+    /**
+     * Gets a command to invoke the Save As dialog that prompts for a file name and saves the current document in a file with the specified path.
+     * Value: A <see cref="FileSaveAsCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    fileSaveAs: FileSaveAsCommand;
+    /**
+     * Gets a command to open the file's Save As dialog.
+     * Value: A <see cref="FileSaveAsDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    fileSaveAsDialog: FileSaveAsDialogCommand;
+    /**
+     * Gets a command to invoke a browser-specific Print dialog allowing one to print the current document.
+     * Value: A <see cref="FilePrintCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    filePrint: FilePrintCommand;
+    /**
+     * Gets a command to cancel changes caused by the previous command.
+     * Value: A <see cref="UndoCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    undo: UndoCommand;
+    /**
+     * Gets a command to reverse actions of the previous undo command.
+     * Value: A <see cref="RedoCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    redo: RedoCommand;
+    /**
+     * Gets a command to copy the selected text and place it to the clipboard.
+     * Value: A <see cref="CopyCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    copy: CopyCommand;
+    /**
+     * Gets a command to paste the text from the clipboard over the selection.
+     * Value: A <see cref="PasteCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    paste: PasteCommand;
+    /**
+     * Gets a command to cut the selected text and place it to the clipboard.
+     * Value: A <see cref="CutCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    cut: CutCommand;
+    /**
+     * Gets a command to change the font name of characters in a selected range.
+     * Value: A <see cref="ChangeFontNameCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFontName: ChangeFontNameCommand;
+    /**
+     * Gets a command to change the font size of characters in a selected range.
+     * Value: A <see cref="ChangeFontSizeCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFontSize: ChangeFontSizeCommand;
+    /**
+     * Gets a command to increase the font size of characters in a selected range to the closest larger predefined value.
+     * Value: A <see cref="IncreaseFontSizeCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    increaseFontSize: IncreaseFontSizeCommand;
+    /**
+     * Gets a command to decrease the selected range's font size to the closest smaller predefined value.
+     * Value: A <see cref="DecreaseFontSizeCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    decreaseFontSize: DecreaseFontSizeCommand;
+    /**
+     * Gets a command to convert selected text to upper case.
+     * Value: A <see cref="MakeTextUpperCaseCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    makeTextUpperCase: MakeTextUpperCaseCommand;
+    /**
+     * Gets a command to convert selected text to lower case.
+     * Value: A <see cref="MakeTextLowerCaseCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    makeTextLowerCase: MakeTextLowerCaseCommand;
+    /**
+     * Gets a command to capitalize each word in the selected sentence.
+     * Value: A <see cref="CapitalizeEachWordTextCaseCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    capitalizeEachWordTextCase: CapitalizeEachWordTextCaseCommand;
+    /**
+     * Gets a command to toggle case for each character - upper case becomes lower, lower case becomes upper.
+     * Value: A <see cref="ToggleTextCaseCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTextCase: ToggleTextCaseCommand;
+    /**
+     * Gets a command to change the bold formatting of characters in a selected range.
+     * Value: A <see cref="ChangeFontBoldCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFontBold: ChangeFontBoldCommand;
+    /**
+     * Gets a command to change the italic formatting of characters in a selected range.
+     * Value: A <see cref="ChangeFontItalicCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFontItalic: ChangeFontItalicCommand;
+    /**
+     * Gets a command to change the underline formatting of characters in a selected range.
+     * Value: A <see cref="ChangeFontUnderlineCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFontUnderline: ChangeFontUnderlineCommand;
+    /**
+     * Gets a command to change the strikeout formatting of characters in a selected range.
+     * Value: A <see cref="ChangeFontStrikeoutCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFontStrikeout: ChangeFontStrikeoutCommand;
+    /**
+     * Gets a command to change the superscript formatting of characters in a selected range.
+     * Value: A <see cref="ChangeFontSuperscriptCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFontSuperscript: ChangeFontSuperscriptCommand;
+    /**
+     * Gets a command to change the subscript formatting of characters in the selected range.
+     * Value: A <see cref="ChangeFontSubscriptCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFontSubscript: ChangeFontSubscriptCommand;
+    /**
+     * Gets a command to change the font color of characters in a selected range.
+     * Value: A <see cref="ChangeFontForeColorCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFontForeColor: ChangeFontForeColorCommand;
+    /**
+     * Gets a command to change the background color of characters in a selected range.
+     * Value: A <see cref="ChangeFontBackColorCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFontBackColor: ChangeFontBackColorCommand;
+    /**
+     * Gets a command to reset text and paragraph formatting in the selected range to default.
+     * Value: A <see cref="ClearFormattingCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    clearFormatting: ClearFormattingCommand;
+    /**
+     * Gets a command to change the selected range's style.
+     * Value: A <see cref="ChangeStyleCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeStyle: ChangeStyleCommand;
+    /**
+     * Gets a command to toggle between the bulleted paragraph and normal text.
+     * Value: A <see cref="ToggleBulletedListCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleBulletedList: ToggleBulletedListCommand;
+    /**
+     * Gets a command to toggle between the numbered paragraph and normal text.
+     * Value: A <see cref="ToggleNumberingListCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleNumberingList: ToggleNumberingListCommand;
+    /**
+     * Gets a command to toggle between the multilevel list style and normal text.
+     * Value: A <see cref="ToggleMultilevelListCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleMultilevelList: ToggleMultilevelListCommand;
+    /**
+     * Gets a command to increment the indent level of paragraphs in a selected range.
+     * Value: A <see cref="IncreaseIndentCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    increaseIndent: IncreaseIndentCommand;
+    /**
+     * Gets a command to decrease the indent level of paragraphs in a selected range.
+     * Value: A <see cref="DecreaseIndentCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    decreaseIndent: DecreaseIndentCommand;
+    /**
+     * Gets a command to toggle hidden symbol visibility.
+     * Value: A <see cref="ShowHiddenSymbolsCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    showHiddenSymbols: ShowHiddenSymbolsCommand;
+    /**
+     * Gets a command to toggle left paragraph alignment on and off.
+     * Value: A <see cref="ToggleParagraphAlignmentLeftCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleParagraphAlignmentLeft: ToggleParagraphAlignmentLeftCommand;
+    /**
+     * Gets a command to toggle centered paragraph alignment on and off.
+     * Value: A <see cref="ToggleParagraphAlignmentCenterCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleParagraphAlignmentCenter: ToggleParagraphAlignmentCenterCommand;
+    /**
+     * Gets a command to toggle right paragraph alignment on and off.
+     * Value: A <see cref="ToggleParagraphAlignmentRightCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleParagraphAlignmentRight: ToggleParagraphAlignmentRightCommand;
+    /**
+     * Gets a command to toggle justified paragraph alignment on and off.
+     * Value: A <see cref="ToggleParagraphAlignmentJustifyCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleParagraphAlignmentJustify: ToggleParagraphAlignmentJustifyCommand;
+    /**
+     * Gets a command to format a current paragraph with single line spacing.
+     * Value: A <see cref="SetSingleParagraphSpacingCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    setSingleParagraphSpacing: SetSingleParagraphSpacingCommand;
+    /**
+     * Gets a command to format a current paragraph with one and a half line spacing.
+     * Value: A <see cref="SetSesquialteralParagraphSpacingCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    setSesquialteralParagraphSpacing: SetSesquialteralParagraphSpacingCommand;
+    /**
+     * Gets a command to format a selected paragraph with double line spacing.
+     * Value: A <see cref="SetDoubleParagraphSpacingCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    setDoubleParagraphSpacing: SetDoubleParagraphSpacingCommand;
+    /**
+     * Gets a command to add spacing before a paragraph.
+     * Value: A <see cref="AddSpacingBeforeParagraphCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    addSpacingBeforeParagraph: AddSpacingBeforeParagraphCommand;
+    /**
+     * Gets a command to add spacing after a paragraph.
+     * Value: A <see cref="AddSpacingAfterParagraphCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    addSpacingAfterParagraph: AddSpacingAfterParagraphCommand;
+    /**
+     * Gets a command to remove spacing before the selected paragraph.
+     * Value: A <see cref="RemoveSpacingBeforeParagraphCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    removeSpacingBeforeParagraph: RemoveSpacingBeforeParagraphCommand;
+    /**
+     * Gets a command to remove spacing after the selected paragraph.
+     * Value: A <see cref="RemoveSpacingAfterParagraphCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    removeSpacingAfterParagraph: RemoveSpacingAfterParagraphCommand;
+    /**
+     * Gets a command to change the background color of paragraphs in a selected range.
+     * Value: A <see cref="ChangeParagraphBackColorCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeParagraphBackColor: ChangeParagraphBackColorCommand;
+    /**
+     * Gets a command to invoke the Font dialog window.
+     * Value: A <see cref="OpenFontFormattingDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openFontFormattingDialog: OpenFontFormattingDialogCommand;
+    /**
+     * Gets a command to change the font formatting of characters in a selected range.
+     * Value: A <see cref="ChangeFontFormattingCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFontFormatting: ChangeFontFormattingCommand;
+    /**
+     * Gets a command to invoke the Indents And Spacing tab of the Paragraph dialog window.
+     * Value: A <see cref="OpenParagraphFormattingDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openParagraphFormattingDialog: OpenParagraphFormattingDialogCommand;
+    /**
+     * Gets a command to change the formatting of paragraphs in a selected range.
+     * Value: A <see cref="ChangeParagraphFormattingCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeParagraphFormatting: ChangeParagraphFormattingCommand;
+    /**
+     * Gets a command to insert a page break at the current position in the document.
+     * Value: A <see cref="InsertPageBreakCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertPageBreak: InsertPageBreakCommand;
+    /**
+     * Gets a command to invoke the Insert Table dialog window.
+     * Value: A <see cref="OpenInsertTableDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openInsertTableDialog: OpenInsertTableDialogCommand;
+    /**
+     * Gets a command to insert a rectangle table of a specified size.
+     * Value: A <see cref="InsertTableCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertTable: InsertTableCommand;
+    /**
+     * Gets a command to invoke the Insert Image dialog window.
+     * Value: A <see cref="OpenInsertPictureDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openInsertPictureDialog: OpenInsertPictureDialogCommand;
+    /**
+     * Gets a command to insert an inline picture stored by specifed web address.
+     * Value: A <see cref="InsertPictureCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertPicture: InsertPictureCommand;
+    /**
+     * Gets a command to invoke the Bookmark dialog window.
+     * Value: A <see cref="OpenInsertBookmarkDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openInsertBookmarkDialog: OpenInsertBookmarkDialogCommand;
+    /**
+     * Gets a command to insert a new bookmark that references the current selection.
+     * Value: A <see cref="InsertBookmarkCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertBookmark: InsertBookmarkCommand;
+    /**
+     * A command to delete a specific bookmark.
+     * Value: A <see cref="DeleteBookmarkCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    deleteBookmark: DeleteBookmarkCommand;
+    /**
+     * Gets a command to navigate to the specified bookmark.
+     * Value: A <see cref="GoToBookmarkCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    goToBookmark: GoToBookmarkCommand;
+    /**
+     * Gets a command to invoke the Hyperlink dialog window.
+     * Value: A <see cref="OpenInsertHyperlinkDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openInsertHyperlinkDialog: OpenInsertHyperlinkDialogCommand;
+    /**
+     * Gets a command to insert a hyperlink at the current position in the document.
+     * Value: A <see cref="InsertHyperlinkCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertHyperlink: InsertHyperlinkCommand;
+    /**
+     * Gets a command to delete the selected hyperlink.
+     * Value: A <see cref="DeleteHyperlinkCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    deleteHyperlink: DeleteHyperlinkCommand;
+    /**
+     * Gets a command to delete all hyperlinks in the selected range.
+     * Value: A <see cref="DeleteHyperlinksCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    deleteHyperlinks: DeleteHyperlinksCommand;
+    /**
+     * Gets a command to navigate to the document bookmark or URI (uniform resource identifier) specified for the hyperlink.
+     * Value: A <see cref="OpenHyperlinkCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openHyperlink: OpenHyperlinkCommand;
+    /**
+     * Gets a command to invoke the Symbols dialog window.
+     * Value: A <see cref="OpenInsertSymbolDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openInsertSymbolDialog: OpenInsertSymbolDialogCommand;
+    /**
+     * Gets a command to insert a character into a document.
+     * Value: A <see cref="InsertSymbolCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertSymbol: InsertSymbolCommand;
+    /**
+     * Gets a command to change page margin settings.
+     * Value: A <see cref="ChangePageMarginsCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changePageMargins: ChangePageMarginsCommand;
+    /**
+     * Gets a command to invoke the Margins tab of the Page Setup dialog window.
+     * Value: A <see cref="OpenPageMarginsDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openPageMarginsDialog: OpenPageMarginsDialogCommand;
+    /**
+     * Gets a command to change the page orientation.
+     * Value: A <see cref="ChangePageOrientationCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changePageOrientation: ChangePageOrientationCommand;
+    /**
+     * Gets a command to define the page size dialog's settings.
+     * Value: A <see cref="SetPageSizeDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    setPageSizeDialog: SetPageSizeDialogCommand;
+    /**
+     * Gets a command to invoke the Paper tab of the Page Setup dialog window.
+     * Value: A <see cref="OpenPagePaperSizeDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openPagePaperSizeDialog: OpenPagePaperSizeDialogCommand;
+    /**
+     * Gets a command to change the page size.
+     * Value: A <see cref="ChangePageSizeCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changePageSize: ChangePageSizeCommand;
+    /**
+     * Gets a command to change the number of section columns having the same width.
+     * Value: A <see cref="ChangeSectionEqualColumnCountCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeSectionEqualColumnCount: ChangeSectionEqualColumnCountCommand;
+    /**
+     * Gets a command to invoke the Columns dialog window.
+     * Value: A <see cref="OpenSectionColumnsDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openSectionColumnsDialog: OpenSectionColumnsDialogCommand;
+    /**
+     * Gets a command to change the settings of individual section columns.
+     * Value: A <see cref="ChangeSectionColumnsCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeSectionColumns: ChangeSectionColumnsCommand;
+    /**
+     * Gets a command to insert a column break at the current position in the document.
+     * Value: A <see cref="InsertColumnBreakCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertColumnBreak: InsertColumnBreakCommand;
+    /**
+     * Gets a command to insert a section break and starts a new section on the next page.
+     * Value: A <see cref="InsertSectionBreakNextPageCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertSectionBreakNextPage: InsertSectionBreakNextPageCommand;
+    /**
+     * Gets a command to insert a section break and starts a new section on the next even-numbered page.
+     * Value: A <see cref="InsertSectionBreakEvenPageCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertSectionBreakEvenPage: InsertSectionBreakEvenPageCommand;
+    /**
+     * Gets a command to insert a section break and starts a new section on the next odd-numbered page.
+     * Value: A <see cref="InsertSectionBreakOddPageCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertSectionBreakOddPage: InsertSectionBreakOddPageCommand;
+    /**
+     * Gets a command to set the background color of the page.
+     * Value: A <see cref="ChangePageColorCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changePageColor: ChangePageColorCommand;
+    /**
+     * Gets a command to toggle the horizontal ruler's visibility.
+     * Value: A <see cref="ShowHorizontalRulerCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    showHorizontalRuler: ShowHorizontalRulerCommand;
+    /**
+     * Gets a command to toggle the fullscreen mode.
+     * Value: A <see cref="SetFullscreenCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    setFullscreen: SetFullscreenCommand;
+    /**
+     * Gets a command to invoke the Bulleted and Numbering dialog window.
+     * Value: A <see cref="OpenNumberingListDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openNumberingListDialog: OpenNumberingListDialogCommand;
+    /**
+     * Gets a command to insert a paragraph break at the current position in the document.
+     * Value: A <see cref="InsertParagraphCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertParagraph: InsertParagraphCommand;
+    /**
+     * Gets a command to insert text at the current position in a document.
+     * Value: A <see cref="InsertTextCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertText: InsertTextCommand;
+    /**
+     * Gets a command to delete the text in a selected range.
+     * Value: A <see cref="DeleteCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    delete: DeleteCommand;
+    /**
+     * Gets a command to remove the previous word.
+     * Value: A <see cref="RemovePrevWordCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    removePrevWord: RemovePrevWordCommand;
+    /**
+     * Gets a command to remove the next word.
+     * Value: A <see cref="RemoveNextWordCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    removeNextWord: RemoveNextWordCommand;
+    /**
+     * Gets a command to move the cursor backwards and erase the character in that space.
+     * Value: A <see cref="BackspaceCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    backspace: BackspaceCommand;
+    /**
+     * Gets a command to insert the line break at the current position in the document.
+     * Value: A <see cref="InsertLineBreakCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertLineBreak: InsertLineBreakCommand;
+    /**
+     * Gets a command to scale pictures in a selected range.
+     * Value: A <see cref="ChangePictureScaleCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changePictureScale: ChangePictureScaleCommand;
+    /**
+     * Gets a command to increment the left indentation of paragraphs in a selected range.
+     * Value: A <see cref="IncrementParagraphLeftIndentCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    incrementParagraphLeftIndent: IncrementParagraphLeftIndentCommand;
+    /**
+     * Gets a command to decrement the paragraph's left indent position.
+     * Value: A <see cref="DecrementParagraphLeftIndentCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    decrementParagraphLeftIndent: DecrementParagraphLeftIndentCommand;
+    /**
+     * Gets a command to move the selected range.
+     * Value: A <see cref="MoveContentCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    moveContent: MoveContentCommand;
+    /**
+     * Gets a command to copy the selected text and place it to the specified position.
+     * Value: A <see cref="CopyContentCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    copyContent: CopyContentCommand;
+    /**
+     * Gets a command to insert a tab character at the current position in the document.
+     * Value: A <see cref="InsertTabCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertTab: InsertTabCommand;
+    /**
+     * Gets a command to invoke the Tabs dialog window.
+     * Value: A <see cref="OpenTabsDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openTabsDialog: OpenTabsDialogCommand;
+    /**
+     * Gets a command to change the tab stop value of a document or selected paragraphs
+     * Value: A <see cref="ChangeTabsCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeTabs: ChangeTabsCommand;
+    /**
+     * Gets a command to invoke the Customize Numbered List dialog window.
+     * Value: A <see cref="OpenCustomNumberingListDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openCustomNumberingListDialog: OpenCustomNumberingListDialogCommand;
+    /**
+     * Gets a command to customize the numbered list parameters.
+     * Value: A <see cref="ChangeCustomNumberingListCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeCustomNumberingList: ChangeCustomNumberingListCommand;
+    /**
+     * Gets a command to restart the numbering list.
+     * Value: A <see cref="RestartNumberingListCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    restartNumberingList: RestartNumberingListCommand;
+    /**
+     * Gets a command to increment the indent level of paragraphs in a selected numbered list.
+     * Value: A <see cref="IncrementNumberingIndentCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    incrementNumberingIndent: IncrementNumberingIndentCommand;
+    /**
+     * Gets a command to decrement the indent level of paragraphs in a selected numbered list.
+     * Value: A <see cref="DecrementNumberingIndentCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    decrementNumberingIndent: DecrementNumberingIndentCommand;
+    /**
+     * Gets a command to create a field with an empty code and populate it with the selection (if it is not collapsed).
+     * Value: A <see cref="CreateFieldCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    createField: CreateFieldCommand;
+    /**
+     * Gets a command to update the field's result.
+     * Value: A <see cref="UpdateFieldCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    updateField: UpdateFieldCommand;
+    /**
+     * Gets a command to display the selected field's codes.
+     * Value: A <see cref="ShowFieldCodesCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    showFieldCodes: ShowFieldCodesCommand;
+    /**
+     * Get a command to display all field codes in place of the fields in the document.
+     * Value: A <see cref="ShowAllFieldCodesCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    showAllFieldCodes: ShowAllFieldCodesCommand;
+    /**
+     * Gets a command to continue the list's numbering.
+     * Value: A <see cref="ContinueNumberingListCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    continueNumberingList: ContinueNumberingListCommand;
+    /**
+     * Gets a command to insert numeration to a paragraph making it a numbering list item.
+     * Value: A <see cref="InsertNumerationCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertNumeration: InsertNumerationCommand;
+    /**
+     * Gets a command to remove the selected numeration.
+     * Value: A <see cref="RemoveNumerationCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    removeNumeration: RemoveNumerationCommand;
+    /**
+     * Gets a command to update all fields in the selected range.
+     * Value: A <see cref="UpdateAllFieldsCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    updateAllFields: UpdateAllFieldsCommand;
+    /**
+     * Gets a command to insert and update a field with a DATE code.
+     * Value: A <see cref="CreateDateFieldCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    createDateField: CreateDateFieldCommand;
+    /**
+     * Gets a command to replace the selection with a TIME field displaying the current time.
+     * Value: A <see cref="CreateTimeFieldCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    createTimeField: CreateTimeFieldCommand;
+    /**
+     * A command to replace the selection with a PAGE field displaying the current page number.
+     * Value: A <see cref="CreatePageFieldCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    createPageField: CreatePageFieldCommand;
+    /**
+     * Gets a command to convert the text of all selected sentences to sentence case.
+     * Value: A <see cref="MakeTextSentenceCaseCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    makeTextSentenceCase: MakeTextSentenceCaseCommand;
+    /**
+     * Gets a command to switch the text case at the current position in the document.
+     * Value: A <see cref="SwitchTextCaseCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    switchTextCase: SwitchTextCaseCommand;
+    /**
+     * Gets a command to navigate to the first data record.
+     * Value: A <see cref="GoToFirstDataRecordCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    goToFirstDataRecord: GoToFirstDataRecordCommand;
+    /**
+     * Gets a command to navigate to the previous data record of the bound data source.
+     * Value: A <see cref="GoToPreviousDataRecordCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    goToPreviousDataRecord: GoToPreviousDataRecordCommand;
+    /**
+     * Gets a command to navigate to the next data record of the bound data source.
+     * Value: A <see cref="GoToNextDataRecordCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    goToNextDataRecord: GoToNextDataRecordCommand;
+    /**
+     * Gets a command to navigate to the next data record.
+     * Value: A <see cref="GoToDataRecordCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    goToDataRecord: GoToDataRecordCommand;
+    /**
+     * Gets a command to navigate to the last data record of the bound data source.
+     * Value: A <see cref="GoToLastDataRecordCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    goToLastDataRecord: GoToLastDataRecordCommand;
+    /**
+     * Gets a command to display or hide actual data in MERGEFIELD fields.
+     * Value: A <see cref="ShowMergedDataCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    showMergedData: ShowMergedDataCommand;
+    /**
+     * Gets a command to invoke the Insert Merge Field dialog window.
+     * Value: A <see cref="MergeFieldDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    mergeFieldDialog: MergeFieldDialogCommand;
+    /**
+     * Gets a command to replace the selection with a MERGEFIELD (a data source column name is passed with a parameter).
+     * Value: A <see cref="CreateMergeFieldCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    createMergeField: CreateMergeFieldCommand;
+    /**
+     * Gets a command to invoke the Export Range dialog window to start a mail merge.
+     * Value: A <see cref="MailMergeDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    mailMergeDialog: MailMergeDialogCommand;
+    /**
+     * Gets a command to perform a mail merge and download the merged document.
+     * Value: A <see cref="MailMergeAndDownloadCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    mailMergeAndDownload: MailMergeAndDownloadCommand;
+    /**
+     * Gets a command to perform a mail merge and save the merged document to the server.
+     * Value: A <see cref="MailMergeAndSaveAsCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    mailMergeAndSaveAs: MailMergeAndSaveAsCommand;
+    /**
+     * Gets a command to activate the page header and begin editing.
+     * Value: A <see cref="InsertHeaderCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertHeader: InsertHeaderCommand;
+    /**
+     * Gets a command to activate the page footer and begin editing.
+     * Value: A <see cref="InsertFooterCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertFooter: InsertFooterCommand;
+    /**
+     * Gets a command to link a header/footer to the previous section, so it has the same content.
+     * Value: A <see cref="LinkHeaderFooterToPreviousCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    linkHeaderFooterToPrevious: LinkHeaderFooterToPreviousCommand;
+    /**
+     * Gets a command to navigate to the page footer from the page header in the header/footer editing mode.
+     * Value: A <see cref="GoToFooterCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    goToFooter: GoToFooterCommand;
+    /**
+     * Gets a command to navigate to the page header from the page footer in the header/footer editing mode.
+     * Value: A <see cref="GoToHeaderCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    goToHeader: GoToHeaderCommand;
+    /**
+     * Gets a command to navigate to the next page header or footer in the header/footer editing mode.
+     * Value: A <see cref="GoToNextHeaderFooterCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    goToNextHeaderFooter: GoToNextHeaderFooterCommand;
+    /**
+     * Gets a command to navigate to the previous page header or footer in the header/footer editing mode.
+     * Value: A <see cref="GoToPreviousHeaderFooterCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    goToPreviousHeaderFooter: GoToPreviousHeaderFooterCommand;
+    /**
+     * Gets a command to change the header/footer edit mode, so it allows creation of a different header or footer for the first page of a document or section.
+     * Value: A <see cref="SetDifferentFirstPageHeaderFooterCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    setDifferentFirstPageHeaderFooter: SetDifferentFirstPageHeaderFooterCommand;
+    /**
+     * Gets a command to change the header/footer edit mode so it allows creation of a different header or footer for odd and even pages of a document or section.
+     * Value: A <see cref="SetDifferentOddAndEvenPagesHeaderFooterCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    setDifferentOddAndEvenPagesHeaderFooter: SetDifferentOddAndEvenPagesHeaderFooterCommand;
+    /**
+     * Gets a command to finish header/footer editing.
+     * Value: A <see cref="CloseHeaderFooterCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    closeHeaderFooter: CloseHeaderFooterCommand;
+    /**
+     * Gets a command to replace the selection with a NUMPAGES field displaying the total number of pages.
+     * Value: A <see cref="CreatePageCountFieldCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    createPageCountField: CreatePageCountFieldCommand;
+    /**
+     * Gets a command to invoke the Table tab of the Table Properties dialog window.
+     * Value: A <see cref="OpenTableFormattingDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openTableFormattingDialog: OpenTableFormattingDialogCommand;
+    /**
+     * Gets a command to change the selected table's formatting.
+     * Value: A <see cref="ChangeTableFormattingCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeTableFormatting: ChangeTableFormattingCommand;
+    /**
+     * Gets a command to change the selected table rows' preferred height.
+     * Value: A <see cref="ChangeTableRowPreferredHeightCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeTableRowPreferredHeight: ChangeTableRowPreferredHeightCommand;
+    /**
+     * Gets a command to change the preferred cell width of the selected table rows.
+     * Value: A <see cref="ChangeTableCellPreferredWidthCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeTableCellPreferredWidth: ChangeTableCellPreferredWidthCommand;
+    /**
+     * Gets a command to toggle inside borders for selected cells on/off.
+     * Value: A <see cref="ToggleTableCellInsideBordersCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellInsideBorders: ToggleTableCellInsideBordersCommand;
+    /**
+     * Gets a command to change the selected table columns' preferred width.
+     * Value: A <see cref="ChangeTableColumnPreferredWidthCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeTableColumnPreferredWidth: ChangeTableColumnPreferredWidthCommand;
+    /**
+     * Gets a command to change the cell formatting of the selected table elements.
+     * Value: A <see cref="ChangeTableCellFormattingCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeTableCellFormatting: ChangeTableCellFormattingCommand;
+    /**
+     * Gets a command to insert a table column to the left of the current position in the table.
+     * Value: A <see cref="InsertTableColumnToTheLeftCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertTableColumnToTheLeft: InsertTableColumnToTheLeftCommand;
+    /**
+     * Gets a command to insert a table column to the right of the current position in the table.
+     * Value: A <see cref="InsertTableColumnToTheRightCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertTableColumnToTheRight: InsertTableColumnToTheRightCommand;
+    /**
+     * Gets a command to insert a row in the table below the selected row.
+     * Value: A <see cref="InsertTableRowBelowCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertTableRowBelow: InsertTableRowBelowCommand;
+    /**
+     * Gets a command to insert a row in the table above the selected row.
+     * Value: A <see cref="InsertTableRowAboveCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertTableRowAbove: InsertTableRowAboveCommand;
+    /**
+     * Gets a command to delete the selected rows in the table.
+     * Value: A <see cref="DeleteTableRowsCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    deleteTableRows: DeleteTableRowsCommand;
+    /**
+     * Gets a command to delete the selected columns in the table.
+     * Value: A <see cref="DeleteTableColumnsCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    deleteTableColumns: DeleteTableColumnsCommand;
+    /**
+     * Gets a command to insert table cells with a horizontal shift into the selected table.
+     * Value: A <see cref="InsertTableCellWithShiftToTheLeftCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertTableCellWithShiftToTheLeft: InsertTableCellWithShiftToTheLeftCommand;
+    /**
+     * Gets a command to delete the selected table cells with a horizontal shift.
+     * Value: A <see cref="DeleteTableCellsWithShiftHorizontallyCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    deleteTableCellsWithShiftHorizontally: DeleteTableCellsWithShiftHorizontallyCommand;
+    /**
+     * Gets a command to delete the selected table cells with a vertical shift.
+     * Value: A <see cref="DeleteTableCellsWithShiftVerticallyCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    deleteTableCellsWithShiftVertically: DeleteTableCellsWithShiftVerticallyCommand;
+    /**
+     * Gets a command to delete the selected table.
+     * Value: A <see cref="DeleteTableCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    deleteTable: DeleteTableCommand;
+    /**
+     * Gets a command to invoke the Insert Cells dialog window.
+     * Value: A <see cref="InsertTableCellsDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertTableCellsDialog: InsertTableCellsDialogCommand;
+    /**
+     * Gets a command to invoke the Delete Cells dialog window.
+     * Value: A <see cref="DeleteTableCellsDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    deleteTableCellsDialog: DeleteTableCellsDialogCommand;
+    /**
+     * Gets a command to merge the selected cells.
+     * Value: A <see cref="MergeTableCellsCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    mergeTableCells: MergeTableCellsCommand;
+    /**
+     * Gets a command to invoke the Split Cells dialog window.
+     * Value: A <see cref="SplitTableCellsDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    splitTableCellsDialog: SplitTableCellsDialogCommand;
+    /**
+     * Gets a command to split the selected table cells.
+     * Value: A <see cref="SplitTableCellsCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    splitTableCells: SplitTableCellsCommand;
+    /**
+     * Gets a command to insert table cells with a vertical shift into the selected table.
+     * Value: A <see cref="InsertTableCellsWithShiftToTheVerticallyCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertTableCellsWithShiftToTheVertically: InsertTableCellsWithShiftToTheVerticallyCommand;
+    /**
+     * Gets a command to invoke the Borders tab of the Borders and Shading dialog window.
+     * Value: A <see cref="OpenTableBordersAndShadingDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openTableBordersAndShadingDialog: OpenTableBordersAndShadingDialogCommand;
+    /**
+     * Gets a command to change the selected table's borders and shading.
+     * Value: A <see cref="ChangeTableBordersAndShadingCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeTableBordersAndShading: ChangeTableBordersAndShadingCommand;
+    /**
+     * Gets a command to apply top-left alignment for the selected cells.
+     * Value: A <see cref="ToggleTableCellAlignTopLeftCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellAlignTopLeft: ToggleTableCellAlignTopLeftCommand;
+    /**
+     * Gets a command to apply top-center alignment for the selected cells.
+     * Value: A <see cref="ToggleTableCellAlignTopCenterCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellAlignTopCenter: ToggleTableCellAlignTopCenterCommand;
+    /**
+     * Gets a command to apply top-right alignment for the selected cells.
+     * Value: A <see cref="ToggleTableCellAlignTopRightCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellAlignTopRight: ToggleTableCellAlignTopRightCommand;
+    /**
+     * Gets a command to apply middle-left alignment for the selected cells.
+     * Value: A <see cref="ToggleTableCellAlignMiddleLeftCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellAlignMiddleLeft: ToggleTableCellAlignMiddleLeftCommand;
+    /**
+     * Gets a command to apply middle-center alignment for the selected cells.
+     * Value: A <see cref="ToggleTableCellAlignMiddleCenterCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellAlignMiddleCenter: ToggleTableCellAlignMiddleCenterCommand;
+    /**
+     * Gets a command to apply middle-right alignment for the selected cells.
+     * Value: A <see cref="ToggleTableCellAlignMiddleRightCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellAlignMiddleRight: ToggleTableCellAlignMiddleRightCommand;
+    /**
+     * Gets a command to apply bottom-left alignment for the selected cells.
+     * Value: A <see cref="ToggleTableCellAlignBottomLeftCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellAlignBottomLeft: ToggleTableCellAlignBottomLeftCommand;
+    /**
+     * Gets a command to apply bottom-center alignment for the selected cells.
+     * Value: A <see cref="ToggleTableCellAlignBottomCenterCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellAlignBottomCenter: ToggleTableCellAlignBottomCenterCommand;
+    /**
+     * Gets a command to apply bottom-right alignment for the selected cells.
+     * Value: A <see cref="ToggleTableCellAlignBottomRightCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellAlignBottomRight: ToggleTableCellAlignBottomRightCommand;
+    /**
+     * Gets a command to change the selected table's style.
+     * Value: A <see cref="ChangeTableStyleCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeTableStyle: ChangeTableStyleCommand;
+    /**
+     * Gets a command to toggle top borders for selected cells on/off.
+     * Value: A <see cref="ToggleTableCellTopBorderCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellTopBorder: ToggleTableCellTopBorderCommand;
+    /**
+     * Gets a command to toggle right borders for selected cells on/off.
+     * Value: A <see cref="ToggleTableCellRightBorderCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellRightBorder: ToggleTableCellRightBorderCommand;
+    /**
+     * Gets a command to toggle bottom borders for selected cells on/off.
+     * Value: A <see cref="ToggleTableCellBottomBorderCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellBottomBorder: ToggleTableCellBottomBorderCommand;
+    /**
+     * Gets a command to toggle left borders for selected cells on/off.
+     * Value: A <see cref="ToggleTableCellLeftBorderCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellLeftBorder: ToggleTableCellLeftBorderCommand;
+    /**
+     * Gets a command to remove the borders of the selected table cells.
+     * Value: A <see cref="RemoveTableCellBordersCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    removeTableCellBorders: RemoveTableCellBordersCommand;
+    /**
+     * Gets a command to toggle all borders for selected cells on/off.
+     * Value: A <see cref="ToggleTableCellAllBordersCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellAllBorders: ToggleTableCellAllBordersCommand;
+    /**
+     * Gets a command to toggle inner horizontal borders for selected cells on/off.
+     * Value: A <see cref="ToggleTableCellInsideHorizontalBordersCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellInsideHorizontalBorders: ToggleTableCellInsideHorizontalBordersCommand;
+    /**
+     * Gets a command to toggle inner vertical borders for selected cells on/off.
+     * Value: A <see cref="ToggleTableCellInsideVerticalBordersCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellInsideVerticalBorders: ToggleTableCellInsideVerticalBordersCommand;
+    /**
+     * Gets a command to toggle outer borders for selected cells on/off.
+     * Value: A <see cref="ToggleTableCellOutsideBordersCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    toggleTableCellOutsideBorders: ToggleTableCellOutsideBordersCommand;
+    /**
+     * Gets a command to change the selected table's style options.
+     * Value: A <see cref="ChangeTableLookCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeTableLook: ChangeTableLookCommand;
+    /**
+     * Gets a command to change the repository item's table border style.
+     * Value: A <see cref="ChangeTableBorderRepositoryItemCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeTableBorderRepositoryItem: ChangeTableBorderRepositoryItemCommand;
+    /**
+     * Gets a command to change cell shading in the selected table elements.
+     * Value: A <see cref="ChangeTableCellShadingCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeTableCellShading: ChangeTableCellShadingCommand;
+    /**
+     * Gets a command to toggle the display of grid lines for a table with no borders applied - on/off.
+     * Value: A <see cref="ShowTableGridLinesCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    showTableGridLines: ShowTableGridLinesCommand;
+    /**
+     * Gets a command to invoke the Search Panel allowing end-users to search text and navigate through search results.
+     * Value: A <see cref="OpenFindPanelCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openFindPanel: OpenFindPanelCommand;
+    /**
+     * Gets a command to invoke the Find and Replace dialog window.
+     * Value: A <see cref="OpenFindAndReplaceDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openFindAndReplaceDialog: OpenFindAndReplaceDialogCommand;
+    /**
+     * Gets a command to find all matches of the specified text in the document.
+     * Value: A <see cref="FindAllCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    findAll: FindAllCommand;
+    /**
+     * Gets a command to hide the results of the search.
+     * Value: A <see cref="HideFindResultsCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    hideFindResults: HideFindResultsCommand;
+    /**
+     * Gets a command to search for a specific text and replace all matches in the document with the specified string.
+     * Value: A <see cref="ReplaceAllCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    replaceAll: ReplaceAllCommand;
+    /**
+     * Gets a command to search for a specific text and replace the next match in the document with the specified string.
+     * Value: A <see cref="ReplaceNextCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    replaceNext: ReplaceNextCommand;
+    /**
+     * Gets a command to invoke the Spelling dialog window.
+     * Value: A <see cref="OpenSpellingDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openSpellingDialog: OpenSpellingDialogCommand;
+    /**
+     * Gets a command to assign a shortcut to the specified client command.
+     * Value: A <see cref="AssignShortcutCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    assignShortcut: AssignShortcutCommand;
+    /**
+     * Gets a command to invoke the Layout dialog window to customize the settings of a floating object.
+     * Value: A <see cref="OpenLayoutOptionsDialogCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    openLayoutOptionsDialog: OpenLayoutOptionsDialogCommand;
+    /**
+     * Gets a command to insert a floating text box.
+     * Value: A <see cref="InsertFloatingTextBoxCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    insertFloatingTextBox: InsertFloatingTextBoxCommand;
+    /**
+     * Gets a command to modify a floating object's alignment position.
+     * Value: A <see cref="ChangeFloatingObjectAlignmentPositionCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFloatingObjectAlignmentPosition: ChangeFloatingObjectAlignmentPositionCommand;
+    /**
+     * Gets a command to change a floating object's absolute position.
+     * Value: A <see cref="ChangeFloatingObjectAbsolutePositionCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFloatingObjectAbsolutePosition: ChangeFloatingObjectAbsolutePositionCommand;
+    /**
+     * Gets a command to modify a floating object's relative position.
+     * Value: A <see cref="ChangeFloatingObjectRelativePositionCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFloatingObjectRelativePosition: ChangeFloatingObjectRelativePositionCommand;
+    /**
+     * Gets a command to lock a floating object's anchor.
+     * Value: A <see cref="ChangeFloatingObjectLockAnchorCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFloatingObjectLockAnchor: ChangeFloatingObjectLockAnchorCommand;
+    /**
+     * Gets a command to modify a floating object's text wrapping settings.
+     * Value: A <see cref="ChangeFloatingObjectTextWrappingCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFloatingObjectTextWrapping: ChangeFloatingObjectTextWrappingCommand;
+    /**
+     * Gets a command to change a floating object's absolute size.
+     * Value: A <see cref="ChangeFloatingObjectAbsoluteSizeCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFloatingObjectAbsoluteSize: ChangeFloatingObjectAbsoluteSizeCommand;
+    /**
+     * Gets a command to modify a text box' relative size settings.
+     * Value: A <see cref="ChangeTextBoxRelativeSizeCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeTextBoxRelativeSize: ChangeTextBoxRelativeSizeCommand;
+    /**
+     * Gets a command to rotate a floating object.
+     * Value: A <see cref="ChangeFloatingObjectRotationCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFloatingObjectRotation: ChangeFloatingObjectRotationCommand;
+    /**
+     * Gets a command to lock a floating object's aspect ratio.
+     * Value: A <see cref="ChangeFloatingObjectLockAspectRatioCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFloatingObjectLockAspectRatio: ChangeFloatingObjectLockAspectRatioCommand;
+    /**
+     * Gets a command to modify a floating object's background fill color.
+     * Value: A <see cref="ChangeFloatingObjectFillColorCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFloatingObjectFillColor: ChangeFloatingObjectFillColorCommand;
+    /**
+     * Gets a command to modify a floating object's outline color.
+     * Value: A <see cref="ChangeFloatingObjectOutlineColorCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFloatingObjectOutlineColor: ChangeFloatingObjectOutlineColorCommand;
+    /**
+     * Gets a command to modify a floating object's outline width.
+     * Value: A <see cref="ChangeFloatingObjectOutlineWidthCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeFloatingObjectOutlineWidth: ChangeFloatingObjectOutlineWidthCommand;
+    /**
+     * Gets a command to modify a text box' content margins.
+     * Value: A <see cref="ChangeTextBoxContentMarginsCommand" /> object that provides methods for executing the command and checking its state.
+     */
+    changeTextBoxContentMargins: ChangeTextBoxContentMarginsCommand;
+    changeTextBoxResizeShapeToFitText: ChangeTextBoxResizeShapeToFitTextCommand;
+}
+/**
+ * Serves as a base for objects that implement different client command functionalities.
+ */
+interface CommandBase {
+}
+/**
+ * Serves as a base for commands with a simple common command state.
+ */
+interface CommandWithSimpleStateBase extends CommandBase {
+    /**
+     * Gets information about the command state.
+     */
+    getState(): SimpleCommandState;
+}
+/**
+ * Serves as a base for commands with the Boolean state.
+ */
+interface CommandWithBooleanStateBase extends CommandBase {
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * Defines a simple state common to most of the client commands.
+ */
+interface SimpleCommandState {
+    /**
+     * Gets a value indicating whether the command's UI element is enabled (within the ribbon and context menu).
+     * Value: true, if the command's related UI element is enabled; otherwise, false.
+     */
+    enabled: boolean;
+    /**
+     * Gets a value indicating whether the command's UI element is visible.
+     * Value: true, if the command's related UI element is visible; otherwise, false.
+     */
+    visible: boolean;
+}
+/**
+ * Defines the state of a command.
+ */
+interface CommandState<T> extends SimpleCommandState {
+    /**
+     * Gets the command state value.
+     * Value: A T object specifying the command state value.
+     */
+    value: T;
+}
+/**
+ * Contains a set properties providing the current information about certain document structural elements.
+ */
+interface RichEditDocument {
+    /**
+     * Provides the information about the active sub-document.
+     * Value: A <see cref="SubDocument" /> object storing information about the essential document functionality.
+     */
+    activeSubDocument: SubDocument;
+    /**
+     * Provides information about sections in the current document.
+     * Value: An array of Section objects storing information about sections.
+     */
+    sectionsInfo: Section[];
+    /**
+     * Provides information about paragraph styles in the current document.
+     * Value: An array of ParagraphStyle objects storing information about paragraph styles.
+     */
+    paragraphStylesInfo: ParagraphStyle[];
+    /**
+     * Provides information about character styles in the current document.
+     * Value: An array of CharacterStyle objects storing information about character styles.
+     */
+    characterStylesInfo: CharacterStyle[];
+    /**
+     * Provides information about numbered paragraphs in the document.
+     * Value: An array of AbstractNumberingList objects storing the information about numbered paragraphs.
+     */
+    abstractNumberingListsInfo: AbstractNumberingList[];
+    /**
+     * Provides information about table styles in the current document.
+     * Value: An array of TableStyle objects storing information about table styles.
+     */
+    tableStylesInfo: TableStyle[];
+    /**
+     * Provides information about spell checking in the current document.
+     * Value: A <see cref="SpellingInfo" /> object.
+     */
+    spellingInfo: SpellingInfo;
+}
+/**
+ * An abstract numbering list definition that defines the appearance and behavior of numbered paragraphs in a document.
+ */
+interface AbstractNumberingList {
+    deleted: boolean;
+}
+/**
+ * Defines a paragraph in the document.
+ */
+interface Paragraph {
+    /**
+     * Gets the paragraph's character length.
+     * Value: An integer value specifying the element length in characters.
+     */
+    length: number;
+    /**
+     * Gets the paragraph's start position in the document.
+     * Value: An integer value specifying the start position.
+     */
+    start: number;
+    /**
+     * Gets the text buffer interval occupied by the current paragraph element.
+     * Value: An <see cref="Interval" /> object specifying the interval settings.
+     */
+    interval: Interval;
+    /**
+     * Gets the name of the paragraph style applied to the current paragraph (see name).
+     * Value: A string value specifying the style name.
+     */
+    styleName: string;
+    /**
+     * Gets the index of a list applied to the paragraph.
+     * Value: An integer that is the index of a list to which the paragraph belongs.
+     */
+    listIndex: number;
+    /**
+     * Gets the index of the list level applied to the current paragraph in the numbering list.
+     * Value: An integer that is the index of the list level of the current paragraph.
+     */
+    listLevelIndex: number;
+}
+/**
+ * Defines a field in the document.
+ */
+interface Field {
+    /**
+     * Gets the field's start position in a document.
+     * Value: An integer value specifying the start position.
+     */
+    start: number;
+    /**
+     * Gets the field length in a document.
+     * Value: An integer value specifying the field length.
+     */
+    length: number;
+    /**
+     * Gets the text buffer interval occupied by the field code element.
+     * Value: An <see cref="Interval" /> object specifying the interval settings.
+     */
+    codeInterval: Interval;
+    /**
+     * Gets the text buffer interval occupied by the field result element.
+     * Value: An <see cref="Interval" /> object specifying the interval settings.
+     */
+    resultInterval: Interval;
+    /**
+     * Gets the text buffer interval occupied by the current field element.
+     * Value: An <see cref="Interval" /> object specifying the interval settings.
+     */
+    interval: Interval;
+    /**
+     * Gets or sets a URI to navigate to when the hyperlink (represented by the current field) is activated.
+     * Value: A string representing an URI.
+     */
+    hyperlinkUri: string;
+    /**
+     * Gets or sets the text for the tooltip displayed when the mouse hovers over a hyperlink field.
+     * Value: A string containing the tooltip text.
+     */
+    hyperlinkTip: string;
+    /**
+     * Gets or sets the name of a bookmark (or a hyperlink) in the current document which shall be the target of the hyperlink field.
+     * Value: A string representing the bookmark's name.
+     */
+    hyperlinkAnchor: string;
+    /**
+     * Gets a value specifying whether a field's code or result is dispalyed.
+     * Value: true, if the field code is displayed; false, if the field result is displayed.
+     */
+    showCode: boolean;
+}
+/**
+ * Defines a bookmark in the document.
+ */
+interface Bookmark {
+    /**
+     * Gets the bookmark's start position in a document.
+     * Value: An integer value specifying the start position.
+     */
+    start: number;
+    /**
+     * Gets the bookmark's length.
+     * Value: An integer value specifying the length of the bookmark.
+     */
+    length: number;
+    /**
+     * Gets the text buffer interval occupied by the current bookmark element.
+     * Value: An <see cref="Interval" /> object specifying the interval settings.
+     */
+    interval: Interval;
+    /**
+     * Gets the name of a bookmark in the document.
+     * Value: A string that is the unique bookmark's name.
+     */
+    name: string;
+}
+/**
+ * Defines a section in the document.
+ */
+interface Section {
+    /**
+     * Gets the section's start position in the document.
+     * Value: An integer value specifying the start position.
+     */
+    start: number;
+    /**
+     * Gets the section's character length.
+     * Value: An integer value specifying the element length in characters.
+     */
+    length: number;
+    /**
+     * Gets the text buffer interval occupied by the current section element.
+     * Value: An <see cref="Interval" /> object specifying the interval settings.
+     */
+    interval: Interval;
+    /**
+     * Provides access to the section's headers.
+     * Value: An array of HeaderFooter objects storing information about the section's headers.
+     */
+    headers: HeaderFooter[];
+    /**
+     * Provides access to the section's footers.
+     * Value: An array of HeaderFooter objects storing information about the section's footers.
+     */
+    footers: HeaderFooter[];
+}
+/**
+ * Contains settings defining a header or footer in a document.
+ */
+interface HeaderFooter {
+    /**
+     * Gets the type of the header (footer).
+     * Value: One of the <see cref="HeaderFooterType" /> values.
+     */
+    type: any;
+    /**
+     * Provides access to an object implementing the basic document functionality that is common to the header, footer and the main document body.
+     * Value: A <see cref="SubDocument" /> object exposing the basic document functionality.
+     */
+    subDocument: SubDocument;
+}
+/**
+ * Contains in-line picture settings.
+ */
+interface InlinePictureInfo {
+    /**
+     * Gets the image identifier.
+     * Value: An integer value specifying the image identifier.
+     */
+    id: number;
+    /**
+     * Gets the image position.
+     * Value: An integer value specifying the image position.
+     */
+    position: number;
+    /**
+     * Gets the initial image width.
+     * Value: An integer value specifying the image width.
+     */
+    initialWidth: number;
+    /**
+     * Gets the initial image height.
+     * Value: An integer value specifying the image height.
+     */
+    initialHeight: number;
+    /**
+     * Gets the X-scaling factor of the inline image.
+     * Value: An integer value specifying the scaling factor for the X-axis.
+     */
+    scaleX: number;
+    /**
+     * Gets the Y-scaling factor of the inline image.
+     * Value: An integer value specifying the scaling factor for the Y-axis.
+     */
+    scaleY: number;
+    /**
+     * Gets the actual image width.
+     * Value: An integer value specifying the image width.
+     */
+    actualWidth: number;
+    /**
+     * Gets the actual image height.
+     * Value: An integer value specifying the image height.
+     */
+    actualHeight: number;
+}
+declare enum HeaderFooterType {
+    First=0,
+    Odd=1,
+    Primary=1,
+    Even=2
+}
+/**
+ * Contains the settings defining a file to save to.
+ */
+interface RichEditFileInfo {
+    /**
+     * Gets or sets the file's folder name.
+     * Value: A string value specifying the folder name.
+     */
+    folderPath: string;
+    /**
+     * Gets or sets the file name.
+     * Value: A string value specifying the file name.
+     */
+    fileName: string;
+    /**
+     * Gets or sets the file's document format.
+     * Value: A DocumentFormat enumeration value.
+     */
+    documentFormat: any;
+}
+declare enum DocumentFormat {
+    Undefined=0,
+    PlainText=1,
+    Rtf=2,
+    Html=3,
+    OpenXml=4,
+    Mht=5,
+    WordML=6,
+    OpenDocument=7,
+    ePub=9,
+    Doc=10
+}
+/**
+ * Contains a set of methods and properties to work with the document selection.
+ */
+interface RichEditSelection {
+    /**
+     * Gets or sets an array of document intervals in the selection.
+     * Value: An array of Interval objects.
+     */
+    intervals: Interval[];
+    /**
+     * Gets or sets a value specifying whether the current selection is collapsed (and represents the cursor position).
+     * Value: true, if the selection is collapsed; otherwise, false.
+     */
+    collapsed: boolean;
+    /**
+     * Gets the maximum position of a document interval in the selection.
+     */
+    getIntervalMaxPosition(): number;
+    /**
+     * Moves the cursor to the next line.
+     */
+    goToNextLine(): void;
+    /**
+     * Moves the cursor to the next line and allows you to extend the selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    goToNextLine(extendSelection: boolean): void;
+    /**
+     * Moves the cursor to the end of the line in which the cursor is located.
+     */
+    goToLineEnd(): void;
+    /**
+     * Moves the cursor to the end of the line in which the cursor is located and allows you to extend the selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    goToLineEnd(extendSelection: boolean): void;
+    /**
+     * Moves the cursor to the start of the line in which the cursor is located.
+     */
+    goToLineStart(): void;
+    /**
+     * Moves the cursor to the start of the line in which the cursor is located and allows you to extend the selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    goToLineStart(extendSelection: boolean): void;
+    /**
+     * Moves the cursor to the previous line.
+     */
+    goToPreviousLine(): void;
+    /**
+     * Moves the cursor to the previous line and allows you to extend the selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    goToPreviousLine(extendSelection: boolean): void;
+    /**
+     * Moves the cursor to the next character.
+     */
+    goToNextCharacter(): void;
+    /**
+     * Moves the cursor to the next character and allows you to extend the selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    goToNextCharacter(extendSelection: boolean): void;
+    /**
+     * Moves the cursor to the previous character.
+     */
+    goToPreviousCharacter(): void;
+    /**
+     * Moves the cursor to the previous character and allows you to extend the selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    goToPreviousCharacter(extendSelection: boolean): void;
+    /**
+     * Selects the line in which the cursor is located.
+     */
+    selectLine(): void;
+    /**
+     * Selects the line in which the cursor is located and allows you to extend the entire selection with the currently existing selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    selectLine(extendSelection: boolean): void;
+    /**
+     * Moves the cursor to the beginning of the next page.
+     */
+    goToNextPage(): void;
+    /**
+     * Moves the cursor to the beginning of the next page and allows you to extend the selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    goToNextPage(extendSelection: boolean): void;
+    /**
+     * Moves the cursor to the beginning of the previous page.
+     */
+    goToPreviousPage(): void;
+    /**
+     * Moves the cursor to the beginning of the previous page and allows you to extend the selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    goToPreviousPage(extendSelection: boolean): void;
+    /**
+     * Moves the cursor to the start of the document.
+     */
+    goToDocumentStart(): void;
+    /**
+     * Moves the cursor to the start of the document and allows you to extend the selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    goToDocumentStart(extendSelection: boolean): void;
+    /**
+     * Moves the cursor to the end of the document.
+     */
+    goToDocumentEnd(): void;
+    /**
+     * Moves the cursor to the end of the document and allows you to extend the selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    goToDocumentEnd(extendSelection: boolean): void;
+    /**
+     * Moves the cursor to the next word.
+     */
+    goToNextWord(): void;
+    /**
+     * Moves the cursor to the next word and allows you to extend the selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    goToNextWord(extendSelection: boolean): void;
+    /**
+     * Moves the cursor to the previous word.
+     */
+    goToPrevWord(): void;
+    /**
+     * Moves the cursor to the previous word and allows you to extend the selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    goToPrevWord(extendSelection: boolean): void;
+    /**
+     * Moves the cursor to the start of the paragraph in which the cursor is located.
+     */
+    goToParagraphStart(): void;
+    /**
+     * Moves the cursor to the start of the paragraph in which the cursor is located and allows you to extend the selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    goToParagraphStart(extendSelection: boolean): void;
+    /**
+     * Moves the cursor to the end of the paragraph in which the cursor is located.
+     */
+    goToParagraphEnd(): void;
+    /**
+     * Moves the cursor to the end of the paragraph in which the cursor is located and allows you to extend the selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    goToParagraphEnd(extendSelection: boolean): void;
+    /**
+     * Selects the paragraph in which the cursor is located.
+     */
+    selectParagraph(): void;
+    /**
+     * Moves the cursor to the next page break mark.
+     */
+    goToStartNextPageCommand(): void;
+    /**
+     * Moves the cursor to the next page break mark and extends the selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    goToStartNextPageCommand(extendSelection: boolean): void;
+    /**
+     * Moves the cursor to the previous page break mark.
+     */
+    goToStartPrevPageCommand(): void;
+    /**
+     * Moves the cursor to the previous page break mark and extends the selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    goToStartPrevPageCommand(extendSelection: boolean): void;
+    /**
+     * Selects the table cell in which the cursor is located.
+     */
+    selectTableCell(): void;
+    /**
+     * Selects the table cell in which the cursor is located and allows you to extend the entire selection with the currently existing selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    selectTableCell(extendSelection: boolean): void;
+    /**
+     * Selects the table row in which the cursor is located.
+     */
+    selectTableRow(): void;
+    /**
+     * Selects the table row in which the cursor is located and allows you to extend the entire selection with the currently existing selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    selectTableRow(extendSelection: boolean): void;
+    /**
+     * Selects the entire table in which the cursor is located.
+     */
+    selectTable(): void;
+    /**
+     * Selects the entire table in which the cursor is located and allows you to extend the entire selection with the currently existing selection.
+     * @param extendSelection true to extend the selection; otherwise, false.
+     */
+    selectTable(extendSelection: boolean): void;
+    /**
+     * Selects the editor's entire content.
+     */
+    selectAll(): void;
+    /**
+     * Makes the main sub-document active and moves the cursor to its beginning.
+     */
+    setMainSubDocumentAsActive(): void;
+    /**
+     * Creates a footer sub-document (if it was not created before) and sets the footer as the active sub-document. Moves the cursor to the footer's start position.
+     * @param pageIndex An integer value specifying the active page's index.
+     */
+    setFooterSubDocumentAsActiveByPageIndex(pageIndex: number): void;
+    /**
+     * Creates a header sub-document (if it was not created before) and sets the header as the active sub-document. Moves the cursor to the header's start position.
+     * @param pageIndex An integer value specifying the active page's index.
+     */
+    setHeaderSubDocumentAsActiveByPageIndex(pageIndex: number): void;
+}
+/**
+ * Defines a document's interval.
+ */
+interface Interval {
+    /**
+     * Gets the interval's start position in the document.
+     * Value: An integer value specifying the start position.
+     */
+    start: number;
+    /**
+     * Gets the interval's character length.
+     * Value: An integer value specifying the element length in characters.
+     */
+    length: number;
+}
+/**
+ * Contains spell checking related settings.
+ */
+interface SpellingInfo {
+    /**
+     * Gets a value specifying the spell checking state.
+     * Value: One of the <see cref="SpellCheckerState" /> enumeration values.
+     */
+    spellCheckerState: any;
+    /**
+     * Provides access to an array containing misspelled intervals.
+     * Value: An array of <see cref="MisspelledInterval[]" /> objects.
+     */
+    misspelledIntervals: MisspelledInterval[];
+}
+declare enum SpellCheckerState {
+    Disabled=0,
+    InProgress=1,
+    Done=2
+}
+/**
+ * Contains the settings defining a misspelled interval.
+ */
+interface MisspelledInterval {
+    /**
+     * Gets the start position of the misspelled word in the interval.
+     * Value: An integer value specifying the misspelled word's start position.
+     */
+    start: number;
+    /**
+     * Gets the length of the misspelled interval.
+     * Value: An integer value specifying the misspelled interval's length.
+     */
+    length: number;
+    /**
+     * Gets the text buffer interval occupied by the current element.
+     * Value: An <see cref="Interval" /> object specifying the interval settings.
+     */
+    interval: Interval;
+    /**
+     * Gets the spelling error type.
+     * Value: One of the <see cref="SpellingErrorType" /> enumeration values.
+     */
+    errorType: any;
+    /**
+     * Gets an erroneous word found during spell check.
+     * Value: A string that is the erroneous or misspelled word.
+     */
+    word: string;
+    /**
+     * Gets a list of suggested words to replace the misspelled word.
+     * Value: A string array containing suggested words.
+     */
+    suggestions: string[];
+}
+declare enum SpellingErrorType {
+    Misspelling=0,
+    Repeating=1
+}
+/**
+ * Serves as a base for objects implementing different element styles.
+ */
+interface StyleBase {
+    /**
+     * Gets or sets the name of the style.
+     * Value: A string specifying the style name.
+     */
+    name: string;
+    /**
+     * Gets whether the specified style is marked as deleted.
+     * Value: true, if the style is deleted; otherwise, false.
+     */
+    isDeleted: boolean;
+}
+/**
+ * Defines the paragraph style settings.
+ */
+interface ParagraphStyle extends StyleBase {
+    /**
+     * Gets or sets the linked style for the current style.
+     * Value: A <see cref="CharacterStyle" /> object representing a character style linked to a current style.
+     */
+    linkedStyle: CharacterStyle;
+    /**
+     * Gets or sets the default style for a paragraph that immediately follows the current paragraph.
+     * Value: A <see cref="ParagraphStyle" /> object specifying the style for the next paragraph.
+     */
+    nextStyle: ParagraphStyle;
+    /**
+     * Gets the index of the list item associated with the paragraph formatted with the current style.
+     * Value: An integer value specifying the list item index.
+     */
+    listIndex: number;
+    /**
+     * Gets the index of the list level applied to the paragraph formatted with the current style.
+     * Value: An integer that is the list level index.
+     */
+    listLevelIndex: number;
+    /**
+     * Gets or sets the style from which the current style inherits.
+     * Value: A <see cref="ParagraphStyle" /> object representing the parent style.
+     */
+    parent: ParagraphStyle;
+}
+/**
+ * Contains characteristics of a character style in a document.
+ */
+interface CharacterStyle extends StyleBase {
+    /**
+     * Gets or sets the linked style for the current style.
+     * Value: A <see cref="ParagraphStyle" /> object representing a paragraph style linked to a current style.
+     */
+    linkedStyle: ParagraphStyle;
+    /**
+     * Gets the style form which the current style inherits.
+     * Value: A <see cref="CharacterStyle" /> object representing the parent style.
+     */
+    parent: CharacterStyle;
+}
+/**
+ * Defines the table style settings.
+ */
+interface TableStyle extends StyleBase {
+    /**
+     * Gets or sets the style from which the current style inherits.
+     * Value: A <see cref="TableStyle" /> object that is the parent style.
+     */
+    parent: TableStyle;
+}
+/**
+ * Exposes the settings providing the information about the essential document functionality.
+ */
+interface SubDocument {
+    /**
+     * Gets the sub-document identifier.
+     * Value: An integer value specifying the sub-document identifier.
+     */
+    id: number;
+    /**
+     * Gets a value specifying the sub-document type.
+     * Value: One of the <see cref="SubDocumentType" /> enumeration values.
+     */
+    type: any;
+    /**
+     * Provides information about paragraphs contained in the document.
+     * Value: An array of Paragraph objects storing information about document paragraphs.
+     */
+    paragraphsInfo: Paragraph[];
+    /**
+     * Provides information about fields in the current document.
+     * Value: An array of Field objects storing information about document fields.
+     */
+    fieldsInfo: Field[];
+    /**
+     * Provides information about tables contained in the document.
+     * Value: An array of Table objects storing information about document tables.
+     */
+    tablesInfo: Table[];
+    /**
+     * Provides information about document bookmarks.
+     * Value: An array of Bookmark objects storing information about document bookmarks.
+     */
+    bookmarksInfo: Bookmark[];
+    /**
+     * Provides access to an array of objects containing in-line picture settings.
+     * Value: An array of <see cref="InlinePictureInfo[]" /> objects.
+     */
+    inlinePicturesInfo: InlinePictureInfo[];
+    /**
+     * Gets the document's textual representation.
+     * Value: A string value specifying the document's text.
+     */
+    text: string;
+    /**
+     * Gets the character length of the document.
+     * Value: An integer that is the number of character positions in the document.
+     */
+    length: number;
+}
+declare enum SubDocumentType {
+    Main=0,
+    Header=1,
+    Footer=2,
+    TextBox=3
+}
+/**
+ * Defines a table in the document.
+ */
+interface Table {
+    /**
+     * Gets the table's start position in the document.
+     * Value: An integer value specifying the start position.
+     */
+    start: number;
+    /**
+     * Gets the table length in characters.
+     * Value: A integer value specifying the character length of the table.
+     */
+    length: number;
+    /**
+     * Gets the text buffer interval occupied by the current table element.
+     * Value: An <see cref="Interval" /> object specifying the interval settings.
+     */
+    interval: Interval;
+    /**
+     * Provides access to a collection of table rows.
+     * Value: An array of TableRow objects storing information about individual table rows.
+     */
+    rows: TableRow[];
+    /**
+     * Gets the name of the style applied to the table (see name).
+     * Value: A string value specifying the style name.
+     */
+    styleName: string;
+}
+/**
+ * Defines a table row in the document.
+ */
+interface TableRow {
+    /**
+     * Gets the table row's start position in the document.
+     * Value: An integer value specifying the start position.
+     */
+    start: number;
+    /**
+     * Gets the table row's character length.
+     * Value: An integer value specifying the element length in characters.
+     */
+    length: number;
+    /**
+     * Gets the text buffer interval occupied by the current table row element.
+     * Value: An <see cref="Interval" /> object specifying the interval settings.
+     */
+    interval: Interval;
+    /**
+     * Provides information about the table row's cells.
+     * Value: An array of TableCell objects storing information about cells.
+     */
+    cells: TableCell[];
+}
+/**
+ * Defines a table cell in the document.
+ */
+interface TableCell {
+    /**
+     * Gets the table cell's start position in the document.
+     * Value: An integer value specifying the start position.
+     */
+    start: number;
+    /**
+     * Gets the table cell's character length.
+     * Value: An integer value specifying the element length in characters.
+     */
+    length: number;
+    /**
+     * Gets the text buffer interval occupied by the current table cell element.
+     * Value: An <see cref="Interval" /> object specifying the interval settings.
+     */
+    interval: Interval;
+}
+/**
+ * Contains the method to convert different units of measurement.
+ */
+interface RichEditUnitConverter {
+    /**
+     * Converts a measurement from pixels to twips.
+     * @param value The pixels value to be converted.
+     */
+    pixelsToTwips(value: number): number;
+    /**
+     * Converts a measurement from inches to twips.
+     * @param value The inches value (floating) to be converted.
+     */
+    inchesToTwips(value: number): number;
+    /**
+     * Converts a measurement from points to twips.
+     * @param value The points value to be converted.
+     */
+    pointsToTwips(value: number): number;
+    /**
+     * Converts a value in centimeters to twips.
+     * @param value A floating value specifying the value in centimeters to convert.
+     */
+    centimetersToTwips(value: number): number;
+    /**
+     * Converts a measurement from twips to centimeters.
+     * @param value The twips value to be converted.
+     */
+    twipsToCentimeters(value: number): number;
+    /**
+     * Converts a measurement from pixels to centimeters.
+     * @param value The pixels value to be converted.
+     */
+    pixelsToCentimeters(value: number): number;
+    /**
+     * Converts a measurement from twips to inches.
+     * @param value The twips value to be converted.
+     */
+    twipsToInches(value: number): number;
+    /**
+     * Converts a measurement from pixels to inches.
+     * @param value The pixels value to be converted.
+     */
+    pixelsToInches(value: number): number;
+    /**
+     * Converts a measurement from pixels to points.
+     * @param value The pixels value to be converted.
+     */
+    pixelsToPoints(value: number): number;
+    /**
+     * Converts a measurement from twips to points.
+     * @param value The twips value to be converted.
+     */
+    twipsToPoints(value: number): number;
+}
+/**
+ * A command to invoke the Bookmark dialog.
+ */
+interface OpenInsertBookmarkDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenInsertBookmarkDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert a new bookmark that references the current selection.
+ */
+interface InsertBookmarkCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertBookmarkCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param name A string value specifying a name of the created bookmark.
+     * @param start An integer value specifying the start position of the bookmark's range.
+     * @param length An integer value specifying the length of the bookmark's range.
+     */
+    execute(name: string, start: number, length: number): boolean;
+}
+/**
+ * A command to delete a specific bookmark.
+ */
+interface DeleteBookmarkCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the DeleteBookmarkCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param name A string value specifying a name of the deleted bookmark.
+     */
+    execute(name: string): boolean;
+}
+/**
+ * Gets a command to navigate to the specified bookmark in the document.
+ */
+interface GoToBookmarkCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the GoToBookmarkCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param name 
+     */
+    execute(name: string): boolean;
+}
+/**
+ * A command to paste the text from the clipboard over the selection.
+ */
+interface PasteCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the PasteCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to copy the selected text and place it to the clipboard.
+ */
+interface CopyCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the CopyCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to cut the selected text and place it to the clipboard.
+ */
+interface CutCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the CutCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert an empty document field at the current position in the document.
+ */
+interface CreateFieldCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the CreateFieldCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to update the field's result.
+ */
+interface UpdateFieldCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the UpdateFieldCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to display the selected field's field codes.
+ */
+interface ShowFieldCodesCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the ShowFieldCodesCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param showFieldCodes true to display field codes, false to hide field codes.
+     */
+    execute(showFieldCodes: boolean): boolean;
+    /**
+     * Executes the ShowFieldCodesCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to display all field codes in place of the fields in the document.
+ */
+interface ShowAllFieldCodesCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the ShowAllFieldCodesCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param showFieldCodes true to display field codes, false to hide field codes.
+     */
+    execute(showFieldCodes: boolean): boolean;
+    /**
+     * Executes the ShowAllFieldCodesCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to update all fields in the selected range.
+ */
+interface UpdateAllFieldsCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the UpdateAllFieldsCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert a DATE field displaying the current date.
+ */
+interface CreateDateFieldCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the CreateDateFieldCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert a TIME field displaying the current time.
+ */
+interface CreateTimeFieldCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the CreateTimeFieldCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert a PAGE field displaying the current page number.
+ */
+interface CreatePageFieldCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the CreatePageFieldCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to navigate to the next data record of the bound data source.
+ */
+interface GoToDataRecordCommand extends CommandBase {
+    /**
+     * Executes the GoToDataRecordCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param activeRecordIndex An integer value specifying index of the next data record.
+     */
+    execute(activeRecordIndex: number): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * Contains the settings defining a data record.
+ */
+interface DataRecordOptions {
+    /**
+     * Gets or sets the index of the active data record.
+     * Value: An integer value specifying the data record index.
+     */
+    activeRecordIndex: number;
+    recordCount: number;
+}
+/**
+ * A command to navigate to the first data record of the bound data source.
+ */
+interface GoToFirstDataRecordCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the GoToFirstDataRecordCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to navigate to the previous data record of the bound data source.
+ */
+interface GoToPreviousDataRecordCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the GoToPreviousDataRecordCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to navigate to the next data record of the bound data source.
+ */
+interface GoToNextDataRecordCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the GoToNextDataRecordCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to navigate to the last data record of the bound data source.
+ */
+interface GoToLastDataRecordCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the GoToLastDataRecordCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to display or hide actual data in MERGEFIELD fields.
+ */
+interface ShowMergedDataCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ShowMergedDataCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+    /**
+     * Executes the ShowMergedDataCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param showMergedData true to display merged data, false to hide merged data.
+     */
+    execute(showMergedData: boolean): boolean;
+}
+/**
+ * A command to invoke the Insert Merge Field dialog.
+ */
+interface MergeFieldDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the MergeFieldDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert a MERGEFIELD field (with a data source column name) at the current position in the document.
+ */
+interface CreateMergeFieldCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the CreateMergeFieldCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param fieldName A string value specifying the name of the merge field.
+     */
+    execute(fieldName: string): boolean;
+}
+/**
+ * Gets a command to invoke the Export Range dialog to start a mail merge.
+ */
+interface MailMergeDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the MailMergeDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to start the mail merge process and download the resulting document containing the merged information.
+ */
+interface MailMergeAndDownloadCommand extends CommandBase {
+    /**
+     * Executes the MailMergeAndDownloadCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param fileExtension A string value specifying the file extension of the resulting document.
+     */
+    execute(fileExtension: string): boolean;
+    /**
+     * Executes the MailMergeAndDownloadCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param documentFormat One of the DocumentFormat enumeration values.
+     */
+    execute(documentFormat: any): boolean;
+    /**
+     * Executes the MailMergeAndDownloadCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param fileExtension A string value specifying the file extension of the resulting document.
+     * @param settings A MailMergeSettings object containing settings to set up mail merge operations.
+     */
+    execute(fileExtension: string, settings: MailMergeSettings): boolean;
+    /**
+     * Executes the MailMergeAndDownloadCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param documentFormat One of the DocumentFormat enumeration values.
+     * @param settings A MailMergeSettings object specifying the mail merge settings.
+     */
+    execute(documentFormat: any, settings: MailMergeSettings): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to start the mail merge process and save the resulting merged document to the server.
+ */
+interface MailMergeAndSaveAsCommand extends CommandBase {
+    /**
+     * Executes the MailMergeAndSaveAsCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param filePath A string value specifying path to the saving file on the server.
+     */
+    execute(filePath: string): boolean;
+    /**
+     * Executes the MailMergeAndSaveAsCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param fileInfo A RichEditFileInfo object specifying a file to save to.
+     * @param settings A MailMergeSettings object specifying the mail merge settings.
+     */
+    execute(fileInfo: RichEditFileInfo, settings: MailMergeSettings): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to insert a NUMPAGES field displaying the total number of pages.
+ */
+interface CreatePageCountFieldCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the CreatePageCountFieldCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * Contains settings to set up mail merge operations.
+ */
+interface MailMergeSettings {
+    /**
+     * Gets or sets a value specifying which data rows should be exported into a merged document.
+     * Value: One of the <see cref="MailMergeExportRange" /> values.
+     */
+    range: any;
+    /**
+     * Gets or sets the index of the row from which the exported range starts.
+     * Value: An integer value specifying the row index.
+     */
+    exportFrom: number;
+    /**
+     * Gets or sets the number of data rows in the exported mail-merge range.
+     * Value: An integer value specifying the row count.
+     */
+    exportRecordsCount: number;
+    /**
+     * Gets or sets the merge mode.
+     * Value: One of the <see cref="MergeMode" /> values.
+     */
+    mergeMode: any;
+}
+declare enum MergeMode {
+    NewParagraph=0,
+    NewSection=1,
+    JoinTables=2
+}
+declare enum MailMergeExportRange {
+    AllRecords=0,
+    CurrentRecord=1,
+    Range=2
+}
+/**
+ * A command to create a new empty document.
+ */
+interface FileNewCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the FileNewCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to open the file, specifying its path.
+ */
+interface FileOpenCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the FileOpenCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param path A string value specifying path to the opening file.
+     */
+    execute(path: string): boolean;
+}
+/**
+ * A command to invoke the File Open dialog allowing one to select and load a document file into RichEdit.
+ */
+interface FileOpenDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the FileOpenDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to save the document to a file.
+ */
+interface FileSaveCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the FileSaveCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to invoke the Save As dialog that prompts for a file name and saves the current document in a file with the specified path.
+ */
+interface FileSaveAsCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the FileSaveAsCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param path A string value specifying path to the saving file.
+     */
+    execute(path: string): boolean;
+    /**
+     * Executes the FileSaveAsCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param fileInfo A <see cref="Boolean" /> object specifying a file to save to.
+     */
+    execute(fileInfo: RichEditFileInfo): boolean;
+}
+/**
+ * A command to download the document file, specifying its extension.
+ */
+interface FileDownloadCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the FileDownloadCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param fileExtension A string value specifying the extension of the downloading file.
+     */
+    execute(fileExtension: string): boolean;
+    /**
+     * Executes the FileDownloadCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param documentFormat A DocumentFormat enumeration value.
+     */
+    execute(documentFormat: any): boolean;
+}
+/**
+ * A command to open the file's Save As dialog.
+ */
+interface FileSaveAsDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the FileSaveAsDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to invoke a browser-specific Print dialog allowing one to print the current document.
+ */
+interface FilePrintCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the FilePrintCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to invoke the Search Panel allowing end-users to search text and navigate through search results.
+ */
+interface OpenFindPanelCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenFindPanelCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to invoke the Find and Replace dialog.
+ */
+interface OpenFindAndReplaceDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenFindAndReplaceDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to find all matches of the specified text in the document.
+ */
+interface FindAllCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the FindAllCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param text A string value specifying finding text.
+     * @param matchCase true, to perform a case-sensitive search; otherwise, false.
+     * @param highlightResults true, to highlight result of search; otherwise, false.
+     */
+    execute(text: string, matchCase: boolean, highlightResults: boolean): boolean;
+    /**
+     * Executes the FindAllCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param text A string value specifying text to find.
+     * @param matchCase true, to perform a case-sensitive search; otherwise, false.
+     * @param highlightResults true, to highlight result of search; otherwise, false.
+     * @param results An array of Interval objects containing the results of search.
+     */
+    execute(text: string, matchCase: boolean, highlightResults: boolean, results: Interval[]): boolean;
+}
+/**
+ * A command to hide the search results.
+ */
+interface HideFindResultsCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the HideFindResultsCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to search for a specific text and replace all matches in the document with the specified string.
+ */
+interface ReplaceAllCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the ReplaceAllCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param text A string value specifying a text to replace.
+     * @param replaceText A string value specifying the replacing text.
+     * @param matchCase true, to perform a case-sensitive search; otherwise, false.
+     */
+    execute(text: string, replaceText: string, matchCase: boolean): boolean;
+}
+/**
+ * A command to search for a specific text and replace the next match in the document with the specified string.
+ */
+interface ReplaceNextCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the ReplaceNextCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param text A string value specifying text to replace.
+     * @param replaceText A string value specifying replacing text.
+     * @param matchCase true, to perform a case-sensitive search; otherwise, false.
+     */
+    execute(text: string, replaceText: string, matchCase: boolean): boolean;
+}
+interface OpenLayoutOptionsDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenLayoutOptionsDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert a floating text box.
+ */
+interface InsertFloatingTextBoxCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertFloatingTextBoxCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to lock a floating object's anchor.
+ */
+interface ChangeFloatingObjectLockAnchorCommand extends CommandBase {
+    /**
+     * Executes the ChangeFloatingObjectLockAnchorCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param lockAnchor true to lock the anchor; false, otherwise.
+     */
+    execute(lockAnchor: boolean): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to modify a floating object's alignment position.
+ */
+interface ChangeFloatingObjectAlignmentPositionCommand extends CommandBase {
+    /**
+     * Executes the ChangeFloatingObjectAlignmentPositionCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param settings A FloatingObjectAlignmentPositionSettings object specifying alignment position settings.
+     */
+    execute(settings: FloatingObjectAlignmentPositionSettings): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to change a floating object's absolute position.
+ */
+interface ChangeFloatingObjectAbsolutePositionCommand extends CommandBase {
+    /**
+     * Executes the ChangeFloatingObjectAbsolutePositionCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param settings A FloatingObjectAbsolutePositionSettings object specifying page margin settings.
+     */
+    execute(settings: FloatingObjectAbsolutePositionSettings): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to modify a floating object's relative position.
+ */
+interface ChangeFloatingObjectRelativePositionCommand extends CommandBase {
+    /**
+     * Executes the ChangeFloatingObjectRelativePositionCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param settings A FloatingObjectRelativePositionSettings object specifying relative positioin settings.
+     */
+    execute(settings: FloatingObjectRelativePositionSettings): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to modify a floating object's text wrapping settings.
+ */
+interface ChangeFloatingObjectTextWrappingCommand extends CommandBase {
+    /**
+     * Executes the ChangeFloatingObjectTextWrappingCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param settings A FloatingObjectTextWrappingSettings object specifying text wrapping settings.
+     */
+    execute(settings: FloatingObjectTextWrappingSettings): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to change a floating object's absolute size.
+ */
+interface ChangeFloatingObjectAbsoluteSizeCommand extends CommandBase {
+    /**
+     * Executes the ChangeFloatingObjectAbsoluteSizeCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param settings A FloatingObjectAbsoluteSizeSettings object specifying absolute size settings.
+     */
+    execute(settings: FloatingObjectAbsoluteSizeSettings): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to modify a text box' relative size settings.
+ */
+interface ChangeTextBoxRelativeSizeCommand extends CommandBase {
+    /**
+     * Executes the ChangeTextBoxRelativeSizeCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param settings A TextBoxRelativeSizeSettings object specifying relative size settings.
+     */
+    execute(settings: TextBoxRelativeSizeSettings): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to rotate a floating object.
+ */
+interface ChangeFloatingObjectRotationCommand extends CommandBase {
+    /**
+     * Executes the ChangeFloatingObjectRotationCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param rotation An integer value specifying the angle of rotation.
+     */
+    execute(rotation: number): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to lock a floating object's aspect ratio.
+ */
+interface ChangeFloatingObjectLockAspectRatioCommand extends CommandBase {
+    /**
+     * Executes the ChangeFloatingObjectLockAspectRatioCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param lockAspectRatio true to lock the aspect ratio and maintain the proportions; otherwise, false.
+     */
+    execute(lockAspectRatio: boolean): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to modify a floating object's background fill color.
+ */
+interface ChangeFloatingObjectFillColorCommand extends CommandBase {
+    /**
+     * Executes the ChangeFloatingObjectFillColorCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param color A string value specifying the color.
+     */
+    execute(color: string): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to modify a floating object's outline color.
+ */
+interface ChangeFloatingObjectOutlineColorCommand extends CommandBase {
+    /**
+     * Executes the ChangeFloatingObjectOutlineColorCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param color A string value specifying the color.
+     */
+    execute(color: string): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to modify a floating object's outline width.
+ */
+interface ChangeFloatingObjectOutlineWidthCommand extends CommandBase {
+    /**
+     * Executes the ChangeFloatingObjectOutlineWidthCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param width An integer value specifying the outline width.
+     */
+    execute(width: number): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to modify a text box' content margins.
+ */
+interface ChangeTextBoxContentMarginsCommand extends CommandBase {
+    /**
+     * Executes the ChangeTextBoxContentMarginsCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param settings A Margins object specifying margin settings.
+     */
+    execute(settings: Margins): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+interface ChangeTextBoxResizeShapeToFitTextCommand extends CommandBase {
+    execute(resizeShapeToFitText: boolean): boolean;
+    getState(): any;
+}
+/**
+ * Contains alignment position settings for floating objects.
+ */
+interface FloatingObjectAlignmentPositionSettings {
+    /**
+     * Gets or sets a value specifying how a floating object is horizontally aligned relative to an element specified by the horizontalPositionAlignment property.
+     * Value: One of the <see cref="FloatingObjectHorizontalPositionAlignment" /> enumeration values.
+     */
+    horizontalPositionAlignment: any;
+    /**
+     * Gets or sets a value specifying to what element the horizontal alignment of a floating object is relative.
+     * Value: One of the <see cref="FloatingObjectHorizontalPositionType" /> enumeration values.
+     */
+    horizontalPositionType: any;
+    /**
+     * Gets or sets a value specifying how a floating object is vertically aligned relative to an element specified by the verticalPositionAlignment property.
+     * Value: One of the <see cref="FloatingObjectVerticalPositionAlignment" /> enumeration values.
+     */
+    verticalPositionAlignment: any;
+    /**
+     * Gets or sets a value specifying to what element the vertical alignment of a floating object is relative.
+     * Value: One of the <see cref="FloatingObjectVerticalPositionType" /> enumeration values.
+     */
+    verticalPositionType: any;
+}
+/**
+ * Contains page margin settings.
+ */
+interface FloatingObjectAbsolutePositionSettings {
+    /**
+     * Gets or sets a floating object's horizontal position relative to an element specified by the horizontalPositionType property.
+     * Value: An integer value specifying the position.
+     */
+    horizontalAbsolutePosition: number;
+    /**
+     * Gets or sets a value specifying to what element the horizontal position of a floating object is relative.
+     * Value: One of the <see cref="FloatingObjectHorizontalPositionType" /> enumeration values.
+     */
+    horizontalPositionType: any;
+    /**
+     * Gets or sets a floating object's vertical position relative to an element specified by the verticalPositionType property.
+     * Value: An integer value specifying the position.
+     */
+    verticalAbsolutePosition: number;
+    /**
+     * Gets or sets a value specifying to what element the vertical position of a floating object is relative.
+     * Value: One of the <see cref="FloatingObjectVerticalPositionType" /> enumeration values.
+     */
+    verticalPositionType: any;
+}
+/**
+ * Contains relative position settings for floating objects.
+ */
+interface FloatingObjectRelativePositionSettings {
+    /**
+     * Gets or sets the horizontal distance between the edge of a floating object and the element specified by the horizontalRelativePosition property
+     * Value: An integer value specifying the horizontal position.
+     */
+    horizontalRelativePosition: number;
+    /**
+     * Gets or sets a value specifying to what element the horizontal position of a floating object is relative.
+     * Value: One of the <see cref="FloatingObjectHorizontalPositionType" /> enumeration values.
+     */
+    horizontalPositionType: any;
+    /**
+     * Gets or sets the horizontal distance between the edge of a floating object and the element specified by the verticalRelativePosition property
+     * Value: An integer value specifying the vertical position.
+     */
+    verticalRelativePosition: number;
+    /**
+     * Gets or sets a value specifying to what element the vertical position of a floating object is relative.
+     * Value: One of the <see cref="FloatingObjectVerticalPositionType" /> enumeration values.
+     */
+    verticalPositionType: any;
+}
+/**
+ * Contains text wrapping settings for floating objects.
+ */
+interface FloatingObjectTextWrappingSettings {
+    /**
+     * Gets or sets a value specifying how text is wrapped around a floating object.
+     * Value: One of the <see cref="FloatingObjectTextWrapType" /> enumeration values.
+     */
+    floatingObjectTextWrapType: any;
+    /**
+     * Gets or sets a value specifying how text can wrap around a floating object's left and right sides.
+     * Value: One of the <see cref="FloatingObjectTextWrapSide" /> enumeration values.
+     */
+    floatingObjectTextWrapSide: any;
+    /**
+     * Gets or sets the left offset of text wrapping.
+     * Value: An integer value specifying the left offset.
+     */
+    leftDistance: number;
+    /**
+     * Gets or sets the right offset of text wrapping.
+     * Value: An integer value specifying the right offset.
+     */
+    rightDistance: number;
+    /**
+     * Gets or sets the top offset of text wrapping.
+     * Value: An integer value specifying the top offset.
+     */
+    topDistance: number;
+    /**
+     * Gets or sets the bottom offset of text wrapping.
+     * Value: An integer value specifying the bottom offset.
+     */
+    bottomDistance: number;
+}
+/**
+ * Contains absolute size settings for floating objects.
+ */
+interface FloatingObjectAbsoluteSizeSettings {
+    /**
+     * Gets or sets a floating object's absolute width.
+     * Value: An integer value specifying the width.
+     */
+    absoluteWidth: number;
+    /**
+     * Gets or sets a floating object's absolute height.
+     * Value: An integer value specifying the height.
+     */
+    absoluteHeight: number;
+}
+/**
+ * Contains relative size settings for floating objects.
+ */
+interface TextBoxRelativeSizeSettings {
+    /**
+     * Gets or sets the percentage specifying a floating object's width relative to the element defined by the relativeWidthType property.
+     * Value: An integer value specifying the relative width, as a percentage.
+     */
+    relativeWidth: number;
+    /**
+     * Gets or sets a value specifying to what element the floating object width is relative.
+     * Value: One of the <see cref="FloatingObjectRelativeWidthType" /> enumeration values.
+     */
+    relativeWidthType: any;
+    /**
+     * Gets or sets the percentage specifying a floating object's height relative to the element defined by the relativeHeightType property.
+     * Value: An integer value specifying the relative height, as a percentage.
+     */
+    relativeHeight: number;
+    /**
+     * Gets or sets a value specifying to what element the floating object height is relative.
+     * Value: One of the <see cref="FloatingObjectRelativeHeightType" /> enumeration values.
+     */
+    relativeHeightType: any;
+}
+declare enum FloatingObjectRelativeWidthType {
+    Margin=0,
+    Page=1,
+    LeftMargin=2,
+    RightMargin=3,
+    InsideMargin=4,
+    OutsideMargin=5
+}
+declare enum FloatingObjectRelativeHeightType {
+    Margin=0,
+    Page=1,
+    TopMargin=2,
+    BottomMargin=3,
+    InsideMargin=4,
+    OutsideMargin=5
+}
+declare enum FloatingObjectTextWrapType {
+    None=0,
+    TopAndBottom=1,
+    Tight=2,
+    Through=3,
+    Square=4
+}
+declare enum FloatingObjectTextWrapSide {
+    Both=0,
+    Left=1,
+    Right=2,
+    Largest=3
+}
+declare enum FloatingObjectHorizontalPositionType {
+    Page=0,
+    Character=1,
+    Column=2,
+    Margin=3,
+    LeftMargin=4,
+    RightMargin=5,
+    InsideMargin=6,
+    OutsideMargin=7
+}
+declare enum FloatingObjectHorizontalPositionAlignment {
+    None=0,
+    Left=1,
+    Center=2,
+    Right=3,
+    Inside=4,
+    Outside=5
+}
+declare enum FloatingObjectVerticalPositionType {
+    Page=0,
+    Line=1,
+    Paragraph=2,
+    Margin=3,
+    TopMargin=4,
+    BottomMargin=5,
+    InsideMargin=6,
+    OutsideMargin=7
+}
+declare enum FloatingObjectVerticalPositionAlignment {
+    None=0,
+    Top=1,
+    Center=2,
+    Bottom=3,
+    Inside=4,
+    Outside=5
+}
+/**
+ * A command to cancel changes caused by the previous command.
+ */
+interface UndoCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the UndoCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to reverse actions of the previous undo command.
+ */
+interface RedoCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the RedoCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to invoke the Hyperlink dialog.
+ */
+interface OpenInsertHyperlinkDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenInsertHyperlinkDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert a hyperlink at the current position in the document.
+ */
+interface InsertHyperlinkCommand extends CommandBase {
+    /**
+     * Executes the InsertHyperlinkCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param settings A HyperLinkSettings object specifying hyperlink settings.
+     */
+    execute(settings: HyperlinkSettings): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to delete the selected hyperlink.
+ */
+interface DeleteHyperlinkCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the DeleteHyperlinkCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to delete all hyperlinks in a selected range.
+ */
+interface DeleteHyperlinksCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the DeleteHyperlinksCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to navigate to the document bookmark or URI (uniform resource identifier) specified for the hyperlink.
+ */
+interface OpenHyperlinkCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenHyperlinkCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * Contains settings to define hyperlinks.
+ */
+interface HyperlinkSettings {
+    /**
+     * Gets or sets a text displayed for a hyperlink.
+     * Value: A string value specifying the hyperlink display text.
+     */
+    text: string;
+    /**
+     * Gets or sets a text for the tooltip displayed when the mouse hovers over a hyperlink.
+     * Value: A string containing the tooltip text.
+     */
+    tooltip: string;
+    /**
+     * Gets or sets the hyperlink destination.
+     * Value: A string value that specifies the destination to which a hyperlink refers.
+     */
+    url: string;
+    /**
+     * Gets or sets the associated bookmak.
+     * Value: A string value specifying the bookmark name.
+     */
+    bookmark: string;
+}
+/**
+ * A command to insert a page break at the current position in the document.
+ */
+interface InsertPageBreakCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertPageBreakCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert a column break at the current position in the document.
+ */
+interface InsertColumnBreakCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertColumnBreakCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert a section break and start a new section on the next page.
+ */
+interface InsertSectionBreakNextPageCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertSectionBreakNextPageCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert a section break and start a new section on the next even-numbered page.
+ */
+interface InsertSectionBreakEvenPageCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertSectionBreakEvenPageCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert a section break and start a new section on the next odd-numbered page.
+ */
+interface InsertSectionBreakOddPageCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertSectionBreakOddPageCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert the line break at the current position in the document.
+ */
+interface InsertLineBreakCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertLineBreakCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to toggle between the bulleted paragraph and normal text.
+ */
+interface ToggleBulletedListCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleBulletedListCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to toggle between the numbered paragraph and normal text.
+ */
+interface ToggleNumberingListCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleNumberingListCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to toggle between the multilevel list style and normal text.
+ */
+interface ToggleMultilevelListCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleMultilevelListCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to invoke the Bulleted and Numbering dialog.
+ */
+interface OpenNumberingListDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenNumberingListDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to invoke the Customize Numbered List dialog.
+ */
+interface OpenCustomNumberingListDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenCustomNumberingListDialogCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param abstractNumberingListIndex An integer value specifying index of abstract numbering list.
+     */
+    execute(abstractNumberingListIndex: number): boolean;
+}
+/**
+ * A command to customize the numbered list parameters.
+ */
+interface ChangeCustomNumberingListCommand extends CommandBase {
+    /**
+     * Executes the ChangeCustomNumberingListCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param abstractNumberingListIndex An integer value specifying the numbering list index.
+     * @param listLevelSettings An array of ListLevelSettings objects defining settings for list levels.
+     */
+    execute(abstractNumberingListIndex: number, listLevelSettings: ListLevelSettings[]): boolean;
+    /**
+     * Gets information about the command state.
+     * @param abstractNumberingListIndex An integer value specifying the index of the abstract numbering list item whose state to return.
+     */
+    getState(abstractNumberingListIndex: number): any;
+}
+/**
+ * A command to restart the numbering list.
+ */
+interface RestartNumberingListCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the RestartNumberingListCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to increment the indent level of paragraphs in a selected numbered list.
+ */
+interface IncrementNumberingIndentCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the IncrementNumberingIndentCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to decrement the indent level of paragraphs in a selected numbered list.
+ */
+interface DecrementNumberingIndentCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the DecrementNumberingIndentCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to continue the list's numbering.
+ */
+interface ContinueNumberingListCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the ContinueNumberingListCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert numeration to a paragraph making it a numbering list item.
+ */
+interface InsertNumerationCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertNumerationCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param abstractNumberingListIndex An integer value specifying index of abstract numbering list.
+     */
+    execute(abstractNumberingListIndex: number): boolean;
+    /**
+     * Executes the InsertNumerationCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param numberingListIndex An integer value specifying an index of the numbering list.
+     * @param isAbstractNumberingList true, to insert an abstract numbering list; otherwise, false.
+     */
+    execute(numberingListIndex: number, isAbstractNumberingList: boolean): boolean;
+}
+/**
+ * A command to remove the selected numeration.
+ */
+interface RemoveNumerationCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the RemoveNumerationCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * Contains settings to define individual bulleted or numbered list levels.
+ */
+interface ListLevelSettings {
+    /**
+     * Gets or sets the pattern used to format the list level for display purposes.
+     * Value: A string value specifying the format pattern.
+     */
+    displayFormatString: string;
+    /**
+     * Gets or sets the numbering format used for the current list level's paragraph.
+     * Value: One of the <see cref="ListLevelFormat" /> values.
+     */
+    format: any;
+    /**
+     * Gets the list level item's start position in the document.
+     * Value: An integer value specifying the start position.
+     */
+    start: number;
+    /**
+     * Gets or sets the paragraph text alignment within numbered list levels.
+     * Value: One of the <see cref="ListLevelNumberAlignment" /> values.
+     */
+    alignment: any;
+    /**
+     * Gets or sets the character inserted after the number for a numbered list item.
+     * Value: A string value that is the trailing character for the list level.
+     */
+    separator: string;
+    /**
+     * Gets or sets the left indent for text within the current list level's paragraph.
+     * Value: An integer value specifying the left indent.
+     */
+    leftIndent: number;
+    /**
+     * Gets or sets a value specifying the indent of the first line of the current list level's paragraph.
+     * Value: An integer value specifying the indent.
+     */
+    firstLineIndent: number;
+    /**
+     * Gets or sets a value specifying whether and how the first line of the current list level's paragraph is indented.
+     * Value: One of the <see cref="ParagraphFirstLineIndent" /> values.
+     */
+    firstLineIndentType: any;
+    /**
+     * Gets or sets the font name of the current list level's paragraph.
+     * Value: A string value specifying the font name.
+     */
+    fontName: string;
+    /**
+     * Gets or sets the font color of the current list level's paragraph.
+     * Value: A string value specifying the font color.
+     */
+    fontColor: string;
+    /**
+     * Gets or sets the font size of the current list level's paragraph.
+     * Value: An integer value specifying the font size.
+     */
+    fontSize: number;
+    /**
+     * Gets or sets whether the font formatting of the current list level's paragraph is bold.
+     * Value: true, if the font formatting is bold; otherwise, false.
+     */
+    fontBold: boolean;
+    /**
+     * Gets or sets whether the font formatting of the current list level's paragraph is italic.
+     * Value: true, if the font formatting is italic; otherwise, false.
+     */
+    fontItalic: boolean;
+}
+declare enum ListLevelFormat {
+    Decimal=0,
+    AIUEOHiragana=1,
+    AIUEOFullWidthHiragana=2,
+    ArabicAbjad=3,
+    ArabicAlpha=4,
+    Bullet=5,
+    CardinalText=6,
+    Chicago=7,
+    ChineseCounting=8,
+    ChineseCountingThousand=9,
+    ChineseLegalSimplified=10,
+    Chosung=11,
+    DecimalEnclosedCircle=12,
+    DecimalEnclosedCircleChinese=13,
+    DecimalEnclosedFullstop=14,
+    DecimalEnclosedParentheses=15,
+    DecimalFullWidth=16,
+    DecimalFullWidth2=17,
+    DecimalHalfWidth=18,
+    DecimalZero=19,
+    Ganada=20,
+    Hebrew1=21,
+    Hebrew2=22,
+    Hex=23,
+    HindiConsonants=24,
+    HindiDescriptive=25,
+    HindiNumbers=26,
+    HindiVowels=27,
+    IdeographDigital=28,
+    IdeographEnclosedCircle=29,
+    IdeographLegalTraditional=30,
+    IdeographTraditional=31,
+    IdeographZodiac=32,
+    IdeographZodiacTraditional=33,
+    Iroha=34,
+    IrohaFullWidth=35,
+    JapaneseCounting=36,
+    JapaneseDigitalTenThousand=37,
+    JapaneseLegal=38,
+    KoreanCounting=39,
+    KoreanDigital=40,
+    KoreanDigital2=41,
+    KoreanLegal=42,
+    LowerLetter=43,
+    LowerRoman=44,
+    None=45,
+    NumberInDash=46,
+    Ordinal=47,
+    OrdinalText=48,
+    RussianLower=49,
+    RussianUpper=50,
+    TaiwaneseCounting=51,
+    TaiwaneseCountingThousand=52,
+    TaiwaneseDigital=53,
+    ThaiDescriptive=54,
+    ThaiLetters=55,
+    ThaiNumbers=56,
+    UpperLetter=57,
+    UpperRoman=58,
+    VietnameseDescriptive=59
+}
+declare enum ListLevelNumberAlignment {
+    Left=0,
+    Center=1,
+    Right=2
+}
+/**
+ * A command to invoke the Insert Image dialog.
+ */
+interface OpenInsertPictureDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenInsertPictureDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert a picture from a file.
+ */
+interface InsertPictureCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertPictureCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param imageUrl A string value specifying picture's Url.
+     */
+    execute(imageUrl: string): boolean;
+}
+/**
+ * A command to invoke the Symbols dialog.
+ */
+interface OpenInsertSymbolDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenInsertSymbolDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert a character into the document.
+ */
+interface InsertSymbolCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertSymbolCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param symbol A string value specifying symbols to insert.
+     * @param fontName A string value specifying the font of symbols to insert.
+     */
+    execute(symbol: string, fontName: string): boolean;
+}
+/**
+ * A command to insert a paragraph break at the current position in the document.
+ */
+interface InsertParagraphCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertParagraphCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert text at the current position in the document.
+ */
+interface InsertTextCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertTextCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param text A string value specifying a text to insert.
+     */
+    execute(text: string): boolean;
+}
+/**
+ * A command to delete the text in a selected range.
+ */
+interface DeleteCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the DeleteCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to remove the previous word.
+ */
+interface RemovePrevWordCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the RemovePrevWordCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to remove the next word.
+ */
+interface RemoveNextWordCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the RemoveNextWordCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to move the cursor backwards and erase the character in that space.
+ */
+interface BackspaceCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the BackspaceCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to scale pictures in a selected range.
+ */
+interface ChangePictureScaleCommand extends CommandBase {
+    /**
+     * Executes the ChangePictureScaleCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param scale A Scale object specifying scaling of the picture.
+     */
+    execute(scale: Scale): boolean;
+    /**
+     * Executes the ChangePictureScaleCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param x An interger number specifying width of the picture
+     * @param y An interger number specifying height of the picture
+     */
+    execute(x: number, y: number): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to move the selected range to a specific position in the document.
+ */
+interface MoveContentCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the MoveContentCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param position An integer value specifying position to insert selected text.
+     */
+    execute(position: number): boolean;
+}
+/**
+ * A command to copy the selected text and place it to the specified position.
+ */
+interface CopyContentCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the CopyContentCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param position An integer number value specifying position for pasting selected text.
+     */
+    execute(position: number): boolean;
+}
+/**
+ * A command to insert a tab character at the current position in the document.
+ */
+interface InsertTabCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertTabCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * Defines the scaling settings.
+ */
+interface Scale {
+    /**
+     * Gets or sets the image's y-scale factor as a percent.
+     * Value: An integer value that is the y-scale factor as a percent.
+     */
+    x: number;
+    /**
+     * Gets or sets the image's x-scale factor as a percent.
+     * Value: An integer value that is the x-scale factor as a percent.
+     */
+    y: number;
+}
+/**
+ * A command to change page margin settings.
+ */
+interface ChangePageMarginsCommand extends CommandBase {
+    /**
+     * Executes the ChangePageMarginsCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param left An integer number specifying left margin of the page.
+     * @param top An integer number specifying top margin of the page.
+     * @param right An integer number specifying right margin of the page.
+     * @param bottom An integer number specifying bottom margin of the page.
+     */
+    execute(left: number, top: number, right: number, bottom: number): boolean;
+    /**
+     * Executes the ChangePageMarginsCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param margins A Margins object specifying page margin settings.
+     */
+    execute(margins: Margins): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to invoke the Margins tab of the Page Setup dialog.
+ */
+interface OpenPageMarginsDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenPageMarginsDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to change the page orientation.
+ */
+interface ChangePageOrientationCommand extends CommandBase {
+    /**
+     * Executes the ChangePageOrientationCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param isPortrait One of the Orientation enumeration values.
+     */
+    execute(isPortrait: any): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to invoke the Paper tab of the Page Setup dialog.
+ */
+interface OpenPagePaperSizeDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenPagePaperSizeDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to set the page size.
+ */
+interface SetPageSizeDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the SetPageSizeDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to change the page size.
+ */
+interface ChangePageSizeCommand extends CommandBase {
+    /**
+     * Executes the ChangePageSizeCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param width An integer number specifying width of the page.
+     * @param height An integer number specifying height of the page.
+     */
+    execute(width: number, height: number): boolean;
+    /**
+     * Executes the ChangePageSizeCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param size A Size object specifying the page size settings.
+     */
+    execute(size: Size): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to change the number of section columns having the same width.
+ */
+interface ChangeSectionEqualColumnCountCommand extends CommandBase {
+    /**
+     * Executes the ChangeSectionEqualColumnCountCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param columnCount An interger number specifying the number of section columns having the same width.
+     */
+    execute(columnCount: number): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to invoke the Columns dialog.
+ */
+interface OpenSectionColumnsDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenSectionColumnsDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to change the settings of individual section columns.
+ */
+interface ChangeSectionColumnsCommand extends CommandBase {
+    /**
+     * Executes the ChangeSectionColumnsCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param columns An array of SectionColumn objects.
+     */
+    execute(columns: SectionColumn[]): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to change the background color of the page.
+ */
+interface ChangePageColorCommand extends CommandBase {
+    /**
+     * Executes the ChangePageColorCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param color A string specifying a background color the page. May be specified as a color name or a hex color value.
+     */
+    execute(color: string): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to activate the page header and begin editing.
+ */
+interface InsertHeaderCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertHeaderCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to activate the page footer and begin editing.
+ */
+interface InsertFooterCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertFooterCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to link a header/footer to the previous section, so it has the same content.
+ */
+interface LinkHeaderFooterToPreviousCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the LinkHeaderFooterToPreviousCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to navigate to the page footer from the page header in the header/footer editing mode.
+ */
+interface GoToFooterCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the GoToFooterCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to navigate to the page header from the page footer in the header/footer editing mode.
+ */
+interface GoToHeaderCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the GoToHeaderCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to navigate to the next page header or footer in the header/footer editing mode.
+ */
+interface GoToNextHeaderFooterCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the GoToNextHeaderFooterCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to navigate to the previous page header or footer in the header/footer editing mode.
+ */
+interface GoToPreviousHeaderFooterCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the GoToPreviousHeaderFooterCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to change the header/footer edit mode, so it allows creation of a different header or footer for the first page of a document or section.
+ */
+interface SetDifferentFirstPageHeaderFooterCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the SetDifferentFirstPageHeaderFooterCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+    /**
+     * Executes the SetDifferentFirstPageHeaderFooterCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param differentFirstPage true to apply a different text for the first page's header and footer, false to remove the difference.
+     */
+    execute(differentFirstPage: boolean): boolean;
+}
+/**
+ * A command to change the header/footer edit mode so it allows creation of a different header or footer for odd and even pages of a document or section.
+ */
+interface SetDifferentOddAndEvenPagesHeaderFooterCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the SetDifferentOddAndEvenPagesHeaderFooterCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+    /**
+     * Executes the SetDifferentOddAndEvenPagesHeaderFooterCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param differentOddAndEvenPages true to apply a different text for the header and footer of the odd and even pages , false to remove the difference.
+     */
+    execute(differentOddAndEvenPages: boolean): boolean;
+}
+/**
+ * A command to finish header/footer editing.
+ */
+interface CloseHeaderFooterCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the CloseHeaderFooterCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * Defines a section column in the document.
+ */
+interface SectionColumn {
+    /**
+     * Gets or sets the width of the section column.
+     * Value: An integer value specifying the section column width.
+     */
+    width: number;
+    /**
+     * Gets or sets the amount of space between adjacent section columns.
+     * Value: An integer value specifying the spacing between section columns.
+     */
+    spacing: number;
+}
+/**
+ * Defines the size settings.
+ */
+interface Size {
+    /**
+     * Gets or sets the width value.
+     * Value: An integer value specifying the width.
+     */
+    width: number;
+    /**
+     * Gets or sets the height value.
+     * Value: An integer value specifying the height.
+     */
+    height: number;
+}
+/**
+ * Defines the margin settings.
+ */
+interface Margins {
+    /**
+     * Gets or sets the left margin.
+     * Value: An integer value specifying the left margin.
+     */
+    left: number;
+    /**
+     * Gets or sets the top margin.
+     * Value: An integer value specifying the top margin.
+     */
+    top: number;
+    /**
+     * Gets or sets the right margin.
+     * Value: An integer value specifying the right margin.
+     */
+    right: number;
+    /**
+     * Gets or sets the bottom margin.
+     * Value: An integer value specifying the bottom margin.
+     */
+    bottom: number;
+}
+declare enum Orientation {
+    Landscape=0,
+    Portrait=1
+}
+/**
+ * A command to increment the indent level of paragraphs in a selected range.
+ */
+interface IncreaseIndentCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the IncreaseIndentCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to decrement the indent level of paragraphs in a selected range.
+ */
+interface DecreaseIndentCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the DecreaseIndentCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to toggle the visibility of hidden symbols.
+ */
+interface ShowHiddenSymbolsCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ShowHiddenSymbolsCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+    /**
+     * Executes the ShowHiddenSymbolsCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param show true to display hidden symbols; otherwise, false.
+     */
+    execute(show: boolean): boolean;
+}
+/**
+ * A command to toggle left paragraph alignment on and off.
+ */
+interface ToggleParagraphAlignmentLeftCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleParagraphAlignmentLeftCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to toggle centered paragraph alignment on and off.
+ */
+interface ToggleParagraphAlignmentCenterCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleParagraphAlignmentCenterCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to toggle right paragraph alignment on and off.
+ */
+interface ToggleParagraphAlignmentRightCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleParagraphAlignmentRightCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to toggle justified paragraph alignment on and off.
+ */
+interface ToggleParagraphAlignmentJustifyCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleParagraphAlignmentJustifyCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to format a current paragraph with single line spacing.
+ */
+interface SetSingleParagraphSpacingCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the SetSingleParagraphSpacingCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to format a current paragraph with one and a half line spacing.
+ */
+interface SetSesquialteralParagraphSpacingCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the SetSesquialteralParagraphSpacingCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to format a current paragraph with double line spacing.
+ */
+interface SetDoubleParagraphSpacingCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the SetDoubleParagraphSpacingCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to add spacing before a paragraph.
+ */
+interface AddSpacingBeforeParagraphCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the AddSpacingBeforeParagraphCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to add spacing after a paragraph.
+ */
+interface AddSpacingAfterParagraphCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the AddSpacingAfterParagraphCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to remove spacing before the selected paragraph.
+ */
+interface RemoveSpacingBeforeParagraphCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the RemoveSpacingBeforeParagraphCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to remove spacing after the selected paragraph.
+ */
+interface RemoveSpacingAfterParagraphCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the RemoveSpacingAfterParagraphCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to change the background color of paragraphs in a selected range.
+ */
+interface ChangeParagraphBackColorCommand extends CommandBase {
+    /**
+     * Executes the ChangeParagraphBackColorCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param color A string specifying a background color of the paragraphs in a selected range. May be specified as a color name or a hex color value.
+     */
+    execute(color: string): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to invoke the Paragraph dialog allowing end-users to set paragraph formatting.
+ */
+interface OpenParagraphFormattingDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenParagraphFormattingDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to change the formatting of paragraphs in a selected range.
+ */
+interface ChangeParagraphFormattingCommand extends CommandBase {
+    /**
+     * Executes the ChangeParagraphFormattingCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param settings A ParagraphFormattingSettings object specifying paragraph formatting settings.
+     */
+    execute(settings: ParagraphFormattingSettings): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to increment the left indentation of paragraphs in a selected range.
+ */
+interface IncrementParagraphLeftIndentCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the IncrementParagraphLeftIndentCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to decrement the left indentation of paragraphs in a selected range.
+ */
+interface DecrementParagraphLeftIndentCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the DecrementParagraphLeftIndentCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to invoke the Tabs paragraph dialog.
+ */
+interface OpenTabsDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenTabsDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to change paragraph tab stops.
+ */
+interface ChangeTabsCommand extends CommandBase {
+    /**
+     * Executes the ChangeTabsCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param settings A TabsSettings object maintaining the information about tab stops.
+     */
+    execute(settings: TabsSettings): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * Contains the information about tab stops.
+ */
+interface TabsSettings {
+    /**
+     * Gets or sets the default tab stop value.
+     * Value: An integer value specifying the default tab stop.
+     */
+    defaultTabStop: number;
+    /**
+     * Gets or sets a list of tab stops.
+     * Value: An array of TabSettings objects containing individual tab stop settings.
+     */
+    tabs: TabSettings[];
+}
+/**
+ * Contains settings of a tab stop.
+ */
+interface TabSettings {
+    /**
+     * Gets or sets the alignment type, specifying how any text after the tab will be lined up.
+     * Value: One of the <see cref="TabAlign" /> values.
+     */
+    alignment: any;
+    /**
+     * Gets or sets the tab leader style, i.e., the symbol used as a tab leader.
+     * Value: One of the <see cref="TabLeaderType" /> values.
+     */
+    leader: any;
+    /**
+     * Gets or sets the position of the tab stop.
+     * Value: A number representing the distance from the left edge of the text area.
+     */
+    position: number;
+    /**
+     * Gets or sets whether the individual tab stop is in effect.
+     * Value: true to switch off this tab stop; otherwise, false.
+     */
+    deleted: boolean;
+}
+declare enum TabAlign {
+    Left=0,
+    Center=1,
+    Right=2,
+    Decimal=3
+}
+declare enum TabLeaderType {
+    None=0,
+    Dots=1,
+    MiddleDots=2,
+    Hyphens=3,
+    Underline=4,
+    ThickLine=5,
+    EqualSign=6
+}
+/**
+ * Contains settings to define the paragraph formatting.
+ */
+interface ParagraphFormattingSettings {
+    /**
+     * Gets or sets the paragraph alignment.
+     * Value: One of the <see cref="ParagraphAlignment" /> values.
+     */
+    alignment: any;
+    /**
+     * Gets or sets the outline level of a paragraph.
+     * Value: An integer specifying the level number.
+     */
+    outlineLevel: number;
+    /**
+     * Gets or sets the right indent value for the specified paragraph.
+     * Value: An integer value specifying the right indent.
+     */
+    rightIndent: number;
+    /**
+     * Gets or sets the spacing before the current paragraph.
+     * Value: An integer value specifying the spacing before the paragraph.
+     */
+    spacingBefore: number;
+    /**
+     * Gets or sets the spacing after the current paragraph.
+     * Value: An integer value specifying the spacing after the paragraph.
+     */
+    spacingAfter: number;
+    /**
+     * Gets or sets a value which determines the spacing between lines in a paragraph.
+     * Value: One of the <see cref="ParagraphLineSpacingType" /> values.
+     */
+    lineSpacingType: any;
+    /**
+     * Gets or sets a value specifying whether and how the first line of a paragraph is indented.
+     * Value: One of the <see cref="ParagraphFirstLineIndent" /> values.
+     */
+    firstLineIndentType: any;
+    /**
+     * Gets or sets a value specifying the indent of the first line of a paragraph.
+     * Value: An integer value specifying the indent of the first line.
+     */
+    firstLineIndent: number;
+    /**
+     * Gets or sets whether to suppress addition of additional space (contextual spacing) between paragraphs of the same style.
+     * Value: true to remove extra spacing between paragraphs, false to add extra space.
+     */
+    contextualSpacing: boolean;
+    /**
+     * Gets or sets whether to prevent all page breaks that interrupt a paragraph.
+     * Value: true, to keep paragraph lines together; otherwise, false.
+     */
+    keepLinesTogether: boolean;
+    /**
+     * Gets or sets whether a page break is inserted automatically before a specified paragraph(s).
+     * Value: true, if a page break is inserted automatically before a paragraph(s); otherwise, false.
+     */
+    pageBreakBefore: boolean;
+    /**
+     * Gets or sets the left indent for text within a paragraph.
+     * Value: An integer value specifying the left indent.
+     */
+    leftIndent: number;
+    /**
+     * Gets or sets a line spacing value.
+     * Value: An integer value specifying the line spacing.
+     */
+    lineSpacing: number;
+    /**
+     * Gets or sets the paragraph background color.
+     * Value: A string value specifying the background color.
+     */
+    backColor: string;
+}
+declare enum ParagraphAlignment {
+    Left=0,
+    Right=1,
+    Center=2,
+    Justify=3
+}
+declare enum ParagraphLineSpacingType {
+    Single=0,
+    Sesquialteral=1,
+    Double=2,
+    Multiple=3,
+    Exactly=4,
+    AtLeast=5
+}
+declare enum ParagraphFirstLineIndent {
+    None=0,
+    Indented=1,
+    Hanging=2
+}
+/**
+ * A command to assign a shortcut to the specified client command.
+ */
+interface AssignShortcutCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the AssignShortcutCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param keyCode An integer value specifying the code uniquely identifying the key combination.
+     * @param callback A callback function to execute on pressing the shortcut.
+     */
+    execute(keyCode: number, callback: (arg1: string) => void): boolean;
+}
+/**
+ * A command to invoke the Spelling dialog window.
+ */
+interface OpenSpellingDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenSpellingDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to invoke the Insert Table dialog.
+ */
+interface OpenInsertTableDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenInsertTableDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to invoke the Insert Table dialog.
+ */
+interface InsertTableCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertTableCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param columnCount An integer value specifying a number of columns in a generated table.
+     * @param rowCount An integer value specifying a number of rows in a generated table.
+     */
+    execute(columnCount: number, rowCount: number): boolean;
+}
+/**
+ * A command to invoke the Table Properties dialog.
+ */
+interface OpenTableFormattingDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenTableFormattingDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to change the selected table's formatting.
+ */
+interface ChangeTableFormattingCommand extends CommandBase {
+    /**
+     * Executes the ChangeTableFormattingCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param settings A TableFormattingSettings object containing the settings to format a table.
+     */
+    execute(settings: TableFormattingSettings): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to change the selected table's preferred row height.
+ */
+interface ChangeTableRowPreferredHeightCommand extends CommandBase {
+    /**
+     * Executes the ChangeTableRowPreferredHeightCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param preferredHeight A TableHeightUnit object specifying preferred height of the selected table rows.
+     */
+    execute(preferredHeight: TableHeightUnit): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to change the preferred cell width of the selected table rows.
+ */
+interface ChangeTableCellPreferredWidthCommand extends CommandBase {
+    /**
+     * Executes the ChangeTableCellPreferredWidthCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param preferredWidth A TableWidthUnit object specifying preferred width of the selected table rows.
+     */
+    execute(preferredWidth: TableWidthUnit): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to change the selected table's preferred column width.
+ */
+interface ChangeTableColumnPreferredWidthCommand extends CommandBase {
+    /**
+     * Executes the ChangeTableColumnPreferredWidthCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param preferredWidth A TableWidthUnit object specifying preferred width of the selected table columns.
+     */
+    execute(preferredWidth: TableWidthUnit): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to change the cell formatting of the selected table elements.
+ */
+interface ChangeTableCellFormattingCommand extends CommandBase {
+    /**
+     * Executes the ChangeTableCellFormattingCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param settings A TableFormattingSettings object specifying cell formatting of the selected table elements.
+     */
+    execute(settings: TableCellFormattingSettings): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to insert a table column to the left of the current position in the table.
+ */
+interface InsertTableColumnToTheLeftCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertTableColumnToTheLeftCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert a table column to the right of the current position in the table.
+ */
+interface InsertTableColumnToTheRightCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertTableColumnToTheRightCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert a row in a table below the selected row.
+ */
+interface InsertTableRowBelowCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertTableRowBelowCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert a row in a table above the selected row.
+ */
+interface InsertTableRowAboveCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertTableRowAboveCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to delete the selected table rows.
+ */
+interface DeleteTableRowsCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the DeleteTableRowsCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to delete the selected table columns.
+ */
+interface DeleteTableColumnsCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the DeleteTableColumnsCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to insert table cells with a horizontal shift into the selected table.
+ */
+interface InsertTableCellWithShiftToTheLeftCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertTableCellWithShiftToTheLeftCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to delete the selected table cells with a horizontal shift.
+ */
+interface DeleteTableCellsWithShiftHorizontallyCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the DeleteTableCellsWithShiftHorizontallyCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to delete the selected table cells with a vertical shift.
+ */
+interface DeleteTableCellsWithShiftVerticallyCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the DeleteTableCellsWithShiftVerticallyCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to delete the selected table.
+ */
+interface DeleteTableCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the DeleteTableCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to invoke the Insert Cells dialog.
+ */
+interface InsertTableCellsDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertTableCellsDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to invoke the Delete Cells dialog.
+ */
+interface DeleteTableCellsDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the DeleteTableCellsDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to merge the selected table cells.
+ */
+interface MergeTableCellsCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the MergeTableCellsCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to invoke the Split Cells dialog.
+ */
+interface SplitTableCellsDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the SplitTableCellsDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to split the selected table cells based on the specified options.
+ */
+interface SplitTableCellsCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the SplitTableCellsCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param rowCount An integer value specifying a number of rows in the split table cells.
+     * @param columnCount An integer value specifying a number of columns in the split table cells.
+     * @param mergeBeforeSplit true to merge the selected cells before the splitting; otherwise, false.
+     */
+    execute(rowCount: number, columnCount: number, mergeBeforeSplit: boolean): boolean;
+}
+/**
+ * A command to insert table cells with a vertical shift into the selected table.
+ */
+interface InsertTableCellsWithShiftToTheVerticallyCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the InsertTableCellsWithShiftToTheVerticallyCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to invoke the Borders and Shading table dialog.
+ */
+interface OpenTableBordersAndShadingDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenTableBordersAndShadingDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to change borders and shading of the selected table elements.
+ */
+interface ChangeTableBordersAndShadingCommand extends CommandBase {
+    /**
+     * Executes the ChangeTableBordersAndShadingCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param settings A TableBorderSettings object with settings specifying table borders.
+     * @param applyToWholeTable true to apply the border settings to the whole table, false to apply the border settings to the selected cells.
+     */
+    execute(settings: TableBordersSettings, applyToWholeTable: boolean): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to apply top-left alignment for the selected table cells.
+ */
+interface ToggleTableCellAlignTopLeftCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellAlignTopLeftCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to apply top-center alignment for the selected table cells.
+ */
+interface ToggleTableCellAlignTopCenterCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellAlignTopCenterCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to apply top-right alignment for the selected table cells.
+ */
+interface ToggleTableCellAlignTopRightCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellAlignTopRightCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to apply middle-left alignment for the selected table cells.
+ */
+interface ToggleTableCellAlignMiddleLeftCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellAlignMiddleLeftCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to apply middle-center alignment for the selected table cells.
+ */
+interface ToggleTableCellAlignMiddleCenterCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellAlignMiddleCenterCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to apply middle-right alignment for the selected table cells.
+ */
+interface ToggleTableCellAlignMiddleRightCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellAlignMiddleRightCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to apply bottom-left alignment for the selected table cells.
+ */
+interface ToggleTableCellAlignBottomLeftCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellAlignBottomLeftCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to apply bottom-center alignment for the selected table cells.
+ */
+interface ToggleTableCellAlignBottomCenterCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellAlignBottomCenterCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to apply bottom-right alignment for the selected table cells.
+ */
+interface ToggleTableCellAlignBottomRightCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellAlignBottomRightCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to change the selected table's style.
+ */
+interface ChangeTableStyleCommand extends CommandBase {
+    /**
+     * Executes the ChangeTableStyleCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param style A TableStyle object specifying the style applying to the table.
+     */
+    execute(style: TableStyle): boolean;
+    /**
+     * Executes the ChangeTableStyleCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param styleName A string specifying the name of style applying to the table.
+     */
+    execute(styleName: string): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to toggle top borders for selected cells on/off.
+ */
+interface ToggleTableCellTopBorderCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellTopBorderCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to toggle right borders for selected cells on/off.
+ */
+interface ToggleTableCellRightBorderCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellRightBorderCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to toggle bottom borders for selected cells on/off.
+ */
+interface ToggleTableCellBottomBorderCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellBottomBorderCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to toggle left borders for selected cells on/off.
+ */
+interface ToggleTableCellLeftBorderCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellLeftBorderCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to remove the borders of the selected table cells.
+ */
+interface RemoveTableCellBordersCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the RemoveTableCellBordersCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to toggle all borders for selected cells on/off.
+ */
+interface ToggleTableCellAllBordersCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellAllBordersCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to toggle inner borders for selected cells on/off.
+ */
+interface ToggleTableCellInsideBordersCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellInsideBordersCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to toggle inner horizontal borders for selected cells on/off.
+ */
+interface ToggleTableCellInsideHorizontalBordersCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellInsideHorizontalBordersCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to toggle inner vertical borders for selected cells on/off.
+ */
+interface ToggleTableCellInsideVerticalBordersCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellInsideVerticalBordersCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to toggle outer borders for selected cells on/off.
+ */
+interface ToggleTableCellOutsideBordersCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ToggleTableCellOutsideBordersCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to change the selected table's style options.
+ */
+interface ChangeTableLookCommand extends CommandBase {
+    /**
+     * Executes the ChangeTableLookCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param settings A TableLookSettings object containing the settings that modify the table appearance.
+     */
+    execute(settings: TableLookSettings): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to change the repository item's table border style.
+ */
+interface ChangeTableBorderRepositoryItemCommand extends CommandBase {
+    /**
+     * Executes the ChangeTableBorderRepositoryItemCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param settings A TableBorderSettings object specifying the repository item's table border style.
+     */
+    execute(settings: TableBorderSettings): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to change cell shading in the selected table elements.
+ */
+interface ChangeTableCellShadingCommand extends CommandBase {
+    /**
+     * Executes the ChangeTableCellShadingCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param color A string specifying the color of the selected cells' shading. May be specified as a color name or a hex color value.
+     */
+    execute(color: string): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to toggle the display of grid lines for a table with no borders applied - on/off.
+ */
+interface ShowTableGridLinesCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ShowTableGridLinesCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+    /**
+     * Executes the ShowTableGridLinesCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param showTableGridLines true to display grid lines of the table, false to hide grid lines of the table.
+     */
+    execute(showTableGridLines: boolean): boolean;
+}
+/**
+ * Contains the table style settings that modify the table appearance.
+ */
+interface TableLookSettings {
+    /**
+     * Gets or sets a value specifying whether special formatting is applied to the first row of the table.
+     * Value: true, to apply the formatting; otherwise, false.
+     */
+    applyFirstRow: boolean;
+    /**
+     * Gets or sets a value specifying whether special formatting is applied to the last row of the table.
+     * Value: true, to apply the formatting; otherwise, false.
+     */
+    applyLastRow: boolean;
+    /**
+     * Gets or sets a value specifying whether special formatting is applied to the first column of the table.
+     * Value: true, to apply the formatting; otherwise, false.
+     */
+    applyFirstColumn: boolean;
+    /**
+     * Gets or sets a value specifying whether special formatting is applied to the last column of the table.
+     * Value: true, to apply the formatting; otherwise, false.
+     */
+    applyLastColumn: boolean;
+    /**
+     * Gets or sets a value specifying whether row banding formatting is not applied to the table.
+     * Value: true, to apply the formatting; otherwise, false.
+     */
+    doNotApplyRowBanding: boolean;
+    /**
+     * Gets or sets a value specifying whether column banding formatting is not applied to the table.
+     * Value: true, to apply the formatting; otherwise, false.
+     */
+    doNotApplyColumnBanding: boolean;
+}
+/**
+ * Contains settings to define table borders.
+ */
+interface TableBordersSettings {
+    /**
+     * Gets or sets the top border's settings.
+     * Value: A TableBorderSettings object containing the table border settings.
+     */
+    top: TableBorderSettings;
+    /**
+     * Gets or sets the right border's settings.
+     * Value: A TableBorderSettings object containing the table border settings.
+     */
+    right: TableBorderSettings;
+    /**
+     * Gets or sets the bottom border's settings.
+     * Value: A TableBorderSettings object containing the table border settings.
+     */
+    bottom: TableBorderSettings;
+    /**
+     * Gets or sets the left border's settings.
+     * Value: A TableBorderSettings object containing the table border settings.
+     */
+    left: TableBorderSettings;
+    /**
+     * Gets or sets the inside horizontal border's settings.
+     * Value: A TableBorderSettings object containing the table border settings.
+     */
+    insideHorizontal: TableBorderSettings;
+    /**
+     * Gets or sets the inside vertical border's settings.
+     * Value: A TableBorderSettings object containing the table border settings.
+     */
+    insideVertical: TableBorderSettings;
+    /**
+     * Gets or sets the background color of table borders.
+     * Value: A string value specifying the background color.
+     */
+    backgroundColor: string;
+}
+/**
+ * Contains settings to define a table border.
+ */
+interface TableBorderSettings {
+    /**
+     * Gets or sets the border color.
+     * Value: A string value specifying the border color.
+     */
+    color: string;
+    /**
+     * Gets or sets the border line width.
+     * Value: An integer value defining the border line width.
+     */
+    width: number;
+    /**
+     * Gets or sets the border line style.
+     * Value: A <see cref="BorderLineStyle" /> object defining the border line style.
+     */
+    style: any;
+}
+declare enum BorderLineStyle {
+    None=0,
+    Single=1,
+    Thick=2,
+    Double=3,
+    Dotted=4,
+    Dashed=5,
+    DotDash=6,
+    DotDotDash=7,
+    Triple=8,
+    ThinThickSmallGap=9,
+    ThickThinSmallGap=10,
+    ThinThickThinSmallGap=11,
+    ThinThickMediumGap=12,
+    ThickThinMediumGap=13,
+    ThinThickThinMediumGap=14,
+    ThinThickLargeGap=15,
+    ThickThinLargeGap=16,
+    ThinThickThinLargeGap=17,
+    Wave=18,
+    DoubleWave=19,
+    DashSmallGap=20,
+    DashDotStroked=21,
+    ThreeDEmboss=22,
+    ThreeDEngrave=23,
+    Outset=24,
+    Inset=25,
+    Apples=26,
+    ArchedScallops=27,
+    BabyPacifier=28,
+    BabyRattle=29,
+    Balloons3Colors=30,
+    BalloonsHotAir=31,
+    BasicBlackDashes=32,
+    BasicBlackDots=33,
+    BasicBlackSquares=34,
+    BasicThinLines=35,
+    BasicWhiteDashes=36,
+    BasicWhiteDots=37,
+    BasicWhiteSquares=38,
+    BasicWideInline=39,
+    BasicWideMidline=40,
+    BasicWideOutline=41,
+    Bats=42,
+    Birds=43,
+    BirdsFlight=44,
+    Cabins=45,
+    CakeSlice=46,
+    CandyCorn=47,
+    CelticKnotwork=48,
+    CertificateBanner=49,
+    ChainLink=50,
+    ChampagneBottle=51,
+    CheckedBarBlack=52,
+    CheckedBarColor=53,
+    Checkered=54,
+    ChristmasTree=55,
+    CirclesLines=56,
+    CirclesRectangles=57,
+    ClassicalWave=58,
+    Clocks=59,
+    Compass=60,
+    Confetti=61,
+    ConfettiGrays=62,
+    ConfettiOutline=63,
+    ConfettiStreamers=64,
+    ConfettiWhite=65,
+    CornerTriangles=66,
+    CouponCutoutDashes=67,
+    CouponCutoutDots=68,
+    CrazyMaze=69,
+    CreaturesButterfly=70,
+    CreaturesFish=71,
+    CreaturesInsects=72,
+    CreaturesLadyBug=73,
+    CrossStitch=74,
+    Cup=75,
+    DecoArch=76,
+    DecoArchColor=77,
+    DecoBlocks=78,
+    DiamondsGray=79,
+    DoubleD=80,
+    DoubleDiamonds=81,
+    Earth1=82,
+    Earth2=83,
+    EclipsingSquares1=84,
+    EclipsingSquares2=85,
+    EggsBlack=86,
+    Fans=87,
+    Film=88,
+    Firecrackers=89,
+    FlowersBlockPrint=90,
+    FlowersDaisies=91,
+    FlowersModern1=92,
+    FlowersModern2=93,
+    FlowersPansy=94,
+    FlowersRedRose=95,
+    FlowersRoses=96,
+    FlowersTeacup=97,
+    FlowersTiny=98,
+    Gems=99,
+    GingerbreadMan=100,
+    Gradient=101,
+    Handmade1=102,
+    Handmade2=103,
+    HeartBalloon=104,
+    HeartGray=105,
+    Hearts=106,
+    HeebieJeebies=107,
+    Holly=108,
+    HouseFunky=109,
+    Hypnotic=110,
+    IceCreamCones=111,
+    LightBulb=112,
+    Lightning1=113,
+    Lightning2=114,
+    MapleLeaf=115,
+    MapleMuffins=116,
+    MapPins=117,
+    Marquee=118,
+    MarqueeToothed=119,
+    Moons=120,
+    Mosaic=121,
+    MusicNotes=122,
+    Northwest=123,
+    Ovals=124,
+    Packages=125,
+    PalmsBlack=126,
+    PalmsColor=127,
+    PaperClips=128,
+    Papyrus=129,
+    PartyFavor=130,
+    PartyGlass=131,
+    Pencils=132,
+    People=133,
+    PeopleHats=134,
+    PeopleWaving=135,
+    Poinsettias=136,
+    PostageStamp=137,
+    Pumpkin1=138,
+    PushPinNote1=139,
+    PushPinNote2=140,
+    Pyramids=141,
+    PyramidsAbove=142,
+    Quadrants=143,
+    Rings=144,
+    Safari=145,
+    Sawtooth=146,
+    SawtoothGray=147,
+    ScaredCat=148,
+    Seattle=149,
+    ShadowedSquares=150,
+    SharksTeeth=151,
+    ShorebirdTracks=152,
+    Skyrocket=153,
+    SnowflakeFancy=154,
+    Snowflakes=155,
+    Sombrero=156,
+    Southwest=157,
+    Stars=158,
+    Stars3d=159,
+    StarsBlack=160,
+    StarsShadowed=161,
+    StarsTop=162,
+    Sun=163,
+    Swirligig=164,
+    TornPaper=165,
+    TornPaperBlack=166,
+    Trees=167,
+    TriangleParty=168,
+    Triangles=169,
+    Tribal1=170,
+    Tribal2=171,
+    Tribal3=172,
+    Tribal4=173,
+    Tribal5=174,
+    Tribal6=175,
+    TwistedLines1=176,
+    TwistedLines2=177,
+    Vine=178,
+    Waveline=179,
+    WeavingAngles=180,
+    WeavingBraid=181,
+    WeavingRibbon=182,
+    WeavingStrips=183,
+    WhiteFlowers=184,
+    Woodwork=185,
+    XIllusions=186,
+    ZanyTriangles=187,
+    ZigZag=188,
+    ZigZagStitch=189,
+    Nil=-1
+}
+/**
+ * Contains the settings to define the table cell formatting.
+ */
+interface TableCellFormattingSettings {
+    /**
+     * Gets or sets a table cell's preferred width.
+     * Value: A <see cref="TableWidthUnit" /> object specifying the preferred cell width.
+     */
+    preferredWidth: TableWidthUnit;
+    /**
+     * Gets or sets the vertical alignment of a table cell's content.
+     * Value: One the <see cref="TableCellVerticalAlignment" /> values.
+     */
+    verticalAlignment: any;
+    /**
+     * Gets or sets a value specifying whether text is wrapped in a table cell.
+     * Value: true if text is wrapped; false if text is not wrapped.
+     */
+    noWrap: boolean;
+    /**
+     * Gets or sets a table cell's left margin.
+     * Value: An integer value specifying the left margin.
+     */
+    marginLeft: number;
+    /**
+     * Gets or sets a table cell's right margin.
+     * Value: An integer value specifying the right margin.
+     */
+    marginRight: number;
+    /**
+     * Gets or sets a table cell's top margin.
+     * Value: An integer value specifying the top margin.
+     */
+    marginTop: number;
+    /**
+     * Gets or sets a table cell's bottom margin.
+     * Value: An integer value specifying the bottom margin.
+     */
+    marginBottom: number;
+    /**
+     * Gets or sets a value specifying whether a table cell's margins are inherited from the table level settings.
+     * Value: true to inherit table level margins; false to use a table cell's own margin settings.
+     */
+    marginsSameAsTable: boolean;
+}
+declare enum TableCellVerticalAlignment {
+    Top=0,
+    Both=1,
+    Center=2,
+    Bottom=3
+}
+/**
+ * Contains the settings to format a table.
+ */
+interface TableFormattingSettings {
+    /**
+     * Gets or sets the preferred width of cells in the table.
+     * Value: A <see cref="TableWidthUnit" /> object specifying the width.
+     */
+    preferredWidth: TableWidthUnit;
+    /**
+     * Gets or sets the alignment of table rows.
+     * Value: One of the <see cref="TableRowAlignment" /> values.
+     */
+    alignment: any;
+    /**
+     * Gets or sets the table's left indent.
+     * Value: An integer value specifying the indent.
+     */
+    indent: number;
+    /**
+     * Gets or sets the spacing between table cells.
+     * Value: An integer value specifying the spacing.
+     */
+    spacingBetweenCells: number;
+    /**
+     * Gets or sets a value specifying whether spacing is allowed between table cells.
+     * Value: true, to allow spacing; otherwise, false.
+     */
+    allowSpacingBetweenCells: boolean;
+    /**
+     * Gets or sets a value that specifying whether to allow automatic resizing of table cells to fit their contents.
+     * Value: true, to allow automatic resizing; otherwise, false.
+     */
+    resizeToFitContent: boolean;
+    /**
+     * Gets or sets the default left margin for cells in the table.
+     * Value: An integer value specifying the margin value.
+     */
+    defaultCellMarginLeft: number;
+    /**
+     * Gets or sets the default right margin for cells in the table.
+     * Value: An integer value specifying the margin value.
+     */
+    defaultCellMarginRight: number;
+    /**
+     * Gets or sets the default top margin for cells in the table.
+     * Value: An integer value specifying the margin value.
+     */
+    defaultCellMarginTop: number;
+    /**
+     * Gets or sets the default bottom margin for cells in the table.
+     * Value: An integer value specifying the margin value.
+     */
+    defaultCellMarginBottom: number;
+}
+/**
+ * Contains settings defining the table width's measurement units and value.
+ */
+interface TableWidthUnit {
+    /**
+     * Gets or sets the table width value.
+     * Value: An integer value specifying the table width.
+     */
+    value: number;
+    /**
+     * Gets or sets the unit type for the table width.
+     * Value: One of the <see cref="TableWidthUnitType" /> values.
+     */
+    type: any;
+}
+/**
+ * Contains settings defining the table height's measurement units and value.
+ */
+interface TableHeightUnit {
+    /**
+     * Gets or sets the table height value.
+     * Value: An integer value specifying the table height.
+     */
+    value: number;
+    /**
+     * Gets or sets the unit type for the table height.
+     * Value: One of the <see cref="TableHeightUnitType" /> enumeration values.
+     */
+    type: any;
+}
+declare enum TableHeightUnitType {
+    Minimum=0,
+    Auto=1,
+    Exact=2
+}
+declare enum TableRowAlignment {
+    Both=0,
+    Center=1,
+    Distribute=2,
+    Left=3,
+    NumTab=4,
+    Right=5
+}
+declare enum TableWidthUnitType {
+    Nil=0,
+    Auto=1,
+    FiftiethsOfPercent=2,
+    ModelUnits=3
+}
+/**
+ * A command to change the font name of characters in a selected range.
+ */
+interface ChangeFontNameCommand extends CommandBase {
+    /**
+     * Executes the ChangeFontNameCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param fontName A string specifying the font name.
+     */
+    execute(fontName: string): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to change the font size of characters in a selected range.
+ */
+interface ChangeFontSizeCommand extends CommandBase {
+    /**
+     * Executes the ChangeFontSizeCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param fontSize An integer number specifying the font size.
+     */
+    execute(fontSize: number): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to increase the font size of characters in a selected range to the closest larger predefined value.
+ */
+interface IncreaseFontSizeCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the IncreaseFontSizeCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to decrease the font size of characters in a selected range to the closest smaller predefined value.
+ */
+interface DecreaseFontSizeCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the DecreaseFontSizeCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to convert the selected text to upper case.
+ */
+interface MakeTextUpperCaseCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the MakeTextUpperCaseCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to convert the selected text to lower case.
+ */
+interface MakeTextLowerCaseCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the MakeTextLowerCaseCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to capitalize each word in the selected sentence.
+ */
+interface CapitalizeEachWordTextCaseCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the CapitalizeEachWordTextCaseCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to toggle the case for each character - upper case becomes lower, lower case becomes upper.
+ */
+interface ToggleTextCaseCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the ToggleTextCaseCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to change the bold formatting of characters in a selected range.
+ */
+interface ChangeFontBoldCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ChangeFontBoldCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+    /**
+     * Executes the ChangeFontBoldCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param fontBold true to apply bold formatting to the text, false to remove bold formatting.
+     */
+    execute(fontBold: boolean): boolean;
+}
+/**
+ * A command to change the italic formatting of characters in a selected range.
+ */
+interface ChangeFontItalicCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ChangeFontItalicCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+    /**
+     * Executes the ChangeFontItalicCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param fontItalic true to apply italic formatting to the text, false to remove italic formatting.
+     */
+    execute(fontItalic: boolean): boolean;
+}
+/**
+ * A command to change the underline formatting of characters in a selected range.
+ */
+interface ChangeFontUnderlineCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ChangeFontUnderlineCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+    /**
+     * Executes the ChangeFontUnderlineCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param fontUnderline true to apply underline formatting to the text, false to remove underline formatting.
+     */
+    execute(fontUnderline: boolean): boolean;
+}
+/**
+ * A command to change the strikeout formatting of characters in a selected range.
+ */
+interface ChangeFontStrikeoutCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ChangeFontStrikeoutCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+    /**
+     * Executes the ChangeFontStrikeoutCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param fontStrikeout true to apply strikeout formatting to the text, false to remove strikeout formatting.
+     */
+    execute(fontStrikeout: boolean): boolean;
+}
+/**
+ * A command to change the superscript formatting of characters in a selected range.
+ */
+interface ChangeFontSuperscriptCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ChangeFontSuperscriptCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+    /**
+     * Executes the ChangeFontSuperscriptCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param fontSuperscript true to apply superscript formatting to the text, false to remove superscript formatting.
+     */
+    execute(fontSuperscript: boolean): boolean;
+}
+/**
+ * A command to change the subscript formatting of characters in the selected range.
+ */
+interface ChangeFontSubscriptCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ChangeFontSubscriptCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+    /**
+     * Executes the ChangeFontSubscriptCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param fontSubscript true to apply subscript formatting to the text, false to remove subscript formatting.
+     */
+    execute(fontSubscript: boolean): boolean;
+}
+/**
+ * A command to change the font color of characters in a selected range.
+ */
+interface ChangeFontForeColorCommand extends CommandBase {
+    /**
+     * Executes the ChangeFontForeColorCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param color A string specifying the font color. May be specified as a color name or a hex color value.
+     */
+    execute(color: string): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to change the background color of characters in a selected range.
+ */
+interface ChangeFontBackColorCommand extends CommandBase {
+    /**
+     * Executes the ChangeFontBackColorCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param color A string specifying the background font color. May be specified as a color name or a hex color value.
+     */
+    execute(color: string): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to reset the selected text's formatting to default.
+ */
+interface ClearFormattingCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the ClearFormattingCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to change the selected range's style.
+ */
+interface ChangeStyleCommand extends CommandBase {
+    /**
+     * Executes the ChangeStyleCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param style A StyleBase object specifying the selected range's style.
+     */
+    execute(style: StyleBase): boolean;
+    /**
+     * Executes the ChangeStyleCommand command by applying the specified settings.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param styleName A string specifying the applying style's name.
+     * @param isParagraphStyle true to apply the style to a paragraph, false to apply the style to a character.
+     */
+    execute(styleName: string, isParagraphStyle: boolean): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * A command to invoke the Font dialog allowing end-users to change the font, size and style of the selected text.
+ */
+interface OpenFontFormattingDialogCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the OpenFontFormattingDialogCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to convert the text of all selected sentences to sentence case.
+ */
+interface MakeTextSentenceCaseCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the MakeTextSentenceCaseCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to switch the text case at the current position in the document.
+ */
+interface SwitchTextCaseCommand extends CommandWithSimpleStateBase {
+    /**
+     * Executes the SwitchTextCaseCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+}
+/**
+ * A command to change the font formatting of characters in a selected range.
+ */
+interface ChangeFontFormattingCommand extends CommandBase {
+    /**
+     * Executes the ChangeFontFormattingCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param settings A  FontFormattingSettings object specifying font formatting settings.
+     */
+    execute(settings: FontFormattingSettings): boolean;
+    /**
+     * Gets information about the command state.
+     */
+    getState(): any;
+}
+/**
+ * Contains settings to define the font formatting.
+ */
+interface FontFormattingSettings {
+    /**
+     * Gets or sets the character(s) font name.
+     * Value: A string value specifying the font name.
+     */
+    fontName: string;
+    /**
+     * Gets or sets the character(s) font size.
+     * Value: An integer value specifying the font size.
+     */
+    size: number;
+    /**
+     * Gets or sets the foreground color of characters.
+     * Value: A string value specifying the foreground color.
+     */
+    foreColor: string;
+    /**
+     * Gets or sets the character background color.
+     * Value: A string value specifying the background color.
+     */
+    backColor: string;
+    /**
+     * Gets or sets the type of underline applied to the character(s).
+     * Value: true, if characters are underlined; otherwise, false.
+     */
+    underline: boolean;
+    /**
+     * Gets or sets the color of the underline for the specified characters.
+     * Value: A string value specifying the underline color.
+     */
+    underlineColor: string;
+    /**
+     * Gets or sets whether the character formatting is bold.
+     * Value: true, if characters are bold; otherwise, false.
+     */
+    bold: boolean;
+    /**
+     * Gets or sets a value indicating whether a character(s) is italicized.
+     * Value: true, if characters are italicized; otherwise, false.
+     */
+    italic: boolean;
+    /**
+     * Gets or sets a value specifying whether the strikeout formatting is applied to a character(s).
+     * Value: true if the strikeout formatting is applied; otherwise, false.
+     */
+    strikeout: boolean;
+    /**
+     * Gets or sets whether only word characters are underlined.
+     * Value: true to underline only characters in words; false to underline all characters.
+     */
+    underlineWordsOnly: boolean;
+    /**
+     * Gets or sets a value specifying character script formatting.
+     * Value: One of the <see cref="CharacterFormattingScript" /> values.
+     */
+    script: any;
+    /**
+     * Gets or sets a value indicating whether all characters are capital letters.
+     * Value: true, if all characters are capitalized; otherwise, false.
+     */
+    allCaps: boolean;
+    /**
+     * Gets or sets a value indicating whether a character(s) is hidden.
+     * Value: true, if characters are hidden; otherwise, false.
+     */
+    hidden: boolean;
+}
+declare enum CharacterFormattingScript {
+    Normal=0,
+    Subscript=1,
+    Superscript=2
+}
+/**
+ * A command to toggle the horizontal ruler's visibility.
+ */
+interface ShowHorizontalRulerCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the ShowHorizontalRulerCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+    /**
+     * Executes the ShowHorizontalRulerCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param show true to display the horizontal ruler, false to hide the horizontal ruler.
+     */
+    execute(show: boolean): boolean;
+}
+/**
+ * A command to toggle the fullscreen mode.
+ */
+interface SetFullscreenCommand extends CommandWithBooleanStateBase {
+    /**
+     * Executes the SetFullscreenCommand command by imitating the corresponding end-user action made in the RichEdit's UI.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     */
+    execute(): boolean;
+    /**
+     * Executes the SetFullscreenCommand command by applying the specified setting.  May result in taking no action if the command's state does not allow command execution. Use the object's getState method to check the command state.
+     * @param fullscreen true to apply the fullscreen mode, false to disable the fullscreen mode.
+     */
+    execute(fullscreen: boolean): boolean;
+}
+/**
+ * Holds the information that determines what action types can be performed for appointments.
+ */
+interface ASPxClientAppointmentFlags {
+    /**
+     * Gets a value that specifies whether an end-user is allowed to delete appointments.
+     * Value: true if an end-user can delete appointments; otherwise, false. Default is true.
+     */
+    allowDelete: boolean;
+    /**
+     * Gets a value that specifies whether an end-user is allowed to edit appointments.
+     * Value: true if the end-user can edit appointments; otherwise, false.
+     */
+    allowEdit: boolean;
+    /**
+     * Gets a value that specifies whether an end-user is allowed to change the time boundaries of appointments.
+     * Value: true if appointment resizing is allowed; otherwise, false. Default is true.
+     */
+    allowResize: boolean;
+    /**
+     * Gets a value that specifies whether an end-user is allowed to copy appointments.
+     * Value: true if a user can copy appointments; otherwise, false. Default is true.
+     */
+    allowCopy: boolean;
+    /**
+     * Gets a value that specifies whether an end-user is allowed to drag and drop appointments to another time slot or date.
+     * Value: true if the user can drag and drop appointments; otherwise, false.
+     */
+    allowDrag: boolean;
+    /**
+     * Gets a value that specifies whether an end-user is allowed to drag and drop appointments between resources.
+     * Value: true if the end-user can drag appointment from one resource to another; otherwise, false.
+     */
+    allowDragBetweenResources: boolean;
+    /**
+     * Gets a value that specifies whether an inplace editor can be activated for an appointment.
+     * Value: true if an inplace editor is activated; otherwise, false. Default is true.
+     */
+    allowInplaceEditor: boolean;
+    /**
+     * Gets a value that specifies whether an end-user is allowed to share the schedule time between two or more appointments.
+     * Value: true if appointments with the same schedule time are allowed; otherwise, false. Default is true.
+     */
+    allowConflicts: boolean;
+}
+/**
+ * Represents a client-side equivalent of the Appointment class.
+ */
+interface ASPxClientAppointment {
+    /**
+     * Gets the time interval of the appointment for client-side scripting.
+     * Value: An ASPxClientTimeInterval object, representing the interval assigned to an appointment.
+     */
+    interval: ASPxClientTimeInterval;
+    /**
+     * Gets the identifiers of resources associated with the appointment for client-side scripting.
+     * Value: An array of string representations for resource identifiers.
+     */
+    resources: string[];
+    /**
+     * Gets the ID of an appointment for use in client-side scripts.
+     * Value: A string representation of the appointment ID.
+     */
+    appointmentId: string;
+    /**
+     * Gets the type of appointment for use in client-side scripts.
+     * Value: An ASPxAppointmentType enumeration member, representing the appointment's type.
+     */
+    appointmentType: ASPxAppointmentType;
+    /**
+     * Gets the index of the availability status object associated with the appointment.
+     * Value: An integer value that specifies the index of the corresponding Statuses collection.
+     */
+    statusIndex: number;
+    /**
+     * Gets  the index of the label object associated with the appointment for client-side scripting.
+     * Value: An integer value that specifies the index of the corresponding Labels collection.
+     */
+    labelIndex: number;
+    /**
+     * Gets the client appointment value that is equivalent in meaning to the Subject property.
+     * Value: A string representing the appointment subject.
+     */
+    subject: string;
+    /**
+     * Gets the client appointment value that is equivalent in meaning to the Description property.
+     * Value: A string, representing the description for an appointment.
+     */
+    description: string;
+    /**
+     * Gets the client appointment value that is equivalent in meaning to the Location property.
+     * Value: A string representing the appointment location.
+     */
+    location: string;
+    /**
+     * Gets the client appointment value that is equivalent in meaning to the AllDay property.
+     * Value: true indicates the all-day appointment; otherwise, false.
+     */
+    allDay: boolean;
+    /**
+     * Adds a resource to the collection of resources associated with the client appointment.
+     * @param resourceId An object, representing the resource id.
+     */
+    AddResource(resourceId: Object): void;
+    /**
+     * Gets the resource associated with the client-side appointment by its index.
+     * @param index An integer, representing an index of a resource in a resource collection associated with the current appointment.
+     */
+    GetResource(index: number): Object;
+    /**
+     * Sets the property value of the client appointment, corresponding to the Start appointment property.
+     * @param start A JavaScript Date object representing the appointment start.
+     */
+    SetStart(start: Date): void;
+    /**
+     * Gets the property value of the client appointment corresponding to the Start appointment property.
+     */
+    GetStart(): Date;
+    /**
+     * Sets the property value of the client appointment, corresponding to the End appointment property.
+     * @param end A JavaScript Date object representing the end of the appointment.
+     */
+    SetEnd(end: Date): void;
+    /**
+     * Gets the property value of the client appointment corresponding to the End appointment property.
+     */
+    GetEnd(): Date;
+    /**
+     * Sets the property value of the client appointment, corresponding to the Duration appointment property.
+     * @param duration A TimeSpan object representing the appointment duration.
+     */
+    SetDuration(duration: any): void;
+    /**
+     * Gets the property value of the client appointment corresponding to the Duration appointment property.
+     */
+    GetDuration(): number;
+    /**
+     * Sets the ID of the client appointment.
+     * @param id An object representing the appointment identifier.
+     */
+    SetId(id: Object): void;
+    /**
+     * Gets the ID of the client appointment.
+     */
+    GetId(): Object;
+    /**
+     * Specifies the type of the current client appointment.
+     * @param type An ASPxAppointmentType enumeration value indicating the appointment type.
+     */
+    SetAppointmentType(type: ASPxAppointmentType): void;
+    /**
+     * Gets the type of the client appointment.
+     */
+    GetAppointmentType(): ASPxAppointmentType;
+    /**
+     * Sets the property value of the client appointment, corresponding to the StatusId appointment property.
+     * @param statusId An integer representing the index in the AppointmentStatusCollection.
+     */
+    SetStatusId(statusId: number): void;
+    /**
+     * Gets the property value of the client appointment corresponding to the StatusId appointment property.
+     */
+    GetStatusId(): number;
+    /**
+     * Sets the property value of the client appointment, corresponding to the LabelId appointment property.
+     * @param statusId An integer representing the index of the label in the Labels label collection.
+     */
+    SetLabelId(statusId: number): void;
+    /**
+     * Gets the property value of the client appointment corresponding to the LabelId appointment property.
+     */
+    GetLabelId(): number;
+    /**
+     * Sets the property value of the client appointment, corresponding to the Subject appointment property.
+     * @param subject A string containing the appointment subject.
+     */
+    SetSubject(subject: string): void;
+    /**
+     * Gets the property value of the client appointment corresponding to the Subject appointment property.
+     */
+    GetSubject(): string;
+    /**
+     * Sets the property value of the client appointment, corresponding to the Description appointment property.
+     * @param description A string representing the appointment description.
+     */
+    SetDescription(description: string): void;
+    /**
+     * Gets the property value of the client appointment corresponding to the Description appointment property.
+     */
+    GetDescription(): string;
+    /**
+     * Sets the property value of the client appointment, corresponding to the Location appointment property.
+     * @param location A string representing the appointment location.
+     */
+    SetLocation(location: string): void;
+    /**
+     * Gets the property value of the client appointment corresponding to the Location appointment property.
+     */
+    GetLocation(): string;
+    /**
+     * Specifies the property value of the client appointment corresponding to the AllDay appointment property.
+     * @param allDay true to indicate the all-day appointment; otherwise, false.
+     */
+    SetAllDay(allDay: boolean): void;
+    /**
+     * Gets the property value of the client appointment corresponding to the AllDay appointment property.
+     */
+    GetAllDay(): boolean;
+    /**
+     * Gets the appointment that is the RecurrencePattern for the current appointment.
+     */
+    GetRecurrencePattern(): ASPxClientAppointment;
+    /**
+     * Sets the property value of the client appointment, corresponding to the RecurrenceInfo appointment property.
+     * @param recurrenceInfo An ASPxClientRecurrenceInfo object representing the recurrence information.
+     */
+    SetRecurrenceInfo(recurrenceInfo: ASPxClientRecurrenceInfo): void;
+    /**
+     * Gets the property value of the client appointment corresponding to the RecurrenceInfo appointment property.
+     */
+    GetRecurrenceInfo(): ASPxClientRecurrenceInfo;
+}
+/**
+ * A client point object.
+ */
+interface ASPxClientPoint {
+    /**
+     * Gets the point's X-coordinate.
+     */
+    GetX(): number;
+    /**
+     * Gets the point's Y-coordinate.
+     */
+    GetY(): number;
+}
+/**
+ * A client rectangle object.
+ */
+interface ASPxClientRect {
+    /**
+     * Gets the X-coordinate of the rectangle's left edge.
+     */
+    GetLeft(): number;
+    /**
+     * Gets the X-coordinate of the rectangle's right edge.
+     */
+    GetRight(): number;
+    /**
+     * Gets the Y-coordinate of the rectangle's top edge.
+     */
+    GetTop(): number;
+    /**
+     * Gets the Y-coordinate of the rectangle's bottom edge.
+     */
+    GetBottom(): number;
+    /**
+     * Gets the rectangle's width.
+     */
+    GetWidth(): number;
+    /**
+     * Gets the rectangle's height.
+     */
+    GetHeight(): number;
+}
+/**
+ * Contains information defining the occurrences of a recurring client appointment.
+ */
+interface ASPxClientRecurrenceInfo {
+    /**
+     * Sets the recurrence start date.
+     * @param start A JavaScript date object value that specifies the start date for the recurrence.
+     */
+    SetStart(start: Date): void;
+    /**
+     * Gets the recurrence start date.
+     */
+    GetStart(): Date;
+    /**
+     * Sets the recurrence end date.
+     * @param end A JavaScript Date object that specifies the end date for the recurrence.
+     */
+    SetEnd(end: Date): void;
+    /**
+     * Gets the recurrence end date.
+     */
+    GetEnd(): Date;
+    /**
+     * Sets the duration of the recurrence.
+     * @param duration A TimeSpan object representing the duration.
+     */
+    SetDuration(duration: any): void;
+    /**
+     * Gets the duration of the recurrence.
+     */
+    GetDuration(): number;
+    /**
+     * Sets the time base for the frequency of the corresponding appointment occurrences.
+     * @param type An ASPxClientRecurrenceType enumeration value that specifies the recurrence's frequency type.
+     */
+    SetRecurrenceType(type: ASPxClientRecurrenceType): void;
+    /**
+     * Gets the time base for the frequency of the corresponding appointment reoccurrence.
+     */
+    GetRecurrenceType(): ASPxClientRecurrenceType;
+    /**
+     * Sets the day/days in a week that the corresponding appointment recurs on.
+     * @param weekDays The ASPxClientWeekDays enumeration value specifying the day/days in a week.
+     */
+    SetWeekDays(weekDays: ASPxClientWeekDays): void;
+    /**
+     * Gets the day/days in a week on which the corresponding appointment occurs.
+     */
+    GetWeekDays(): ASPxClientWeekDays;
+    /**
+     * Sets how many times the appointment occurs.
+     * @param occurrenceCount An integer value that specifies how many times the appointment occurs.
+     */
+    SetOccurrenceCount(occurrenceCount: number): void;
+    /**
+     * Gets how many times the appointment occurs.
+     */
+    GetOccurrenceCount(): number;
+    /**
+     * Sets the frequency with which the corresponding appointment occurs (dependent on the recurrence Type).
+     * @param periodicity An integer value that specifies the frequency with which the corresponding appointment occurs.
+     */
+    SetPeriodicity(periodicity: number): void;
+    /**
+     * Gets the frequency with which the corresponding appointment reoccurs (dependent on the recurrence Type).
+     */
+    GetPeriodicity(): number;
+    /**
+     * Sets the ordinal number of a day within a defined month.
+     * @param dayNumber A positive integer value that specifies the day number within a month.
+     */
+    SetDayNumber(dayNumber: number): void;
+    /**
+     * Gets the ordinal number of a day within a defined month.
+     */
+    GetDayNumber(): number;
+    /**
+     * Sets the occurrence number of the week in a month for the recurrence pattern.
+     * @param weekOfMonth A ASPxClientWeekOfMonth enumeration value that specifies a particular week in every month.
+     */
+    SetWeekOfMonth(weekOfMonth: ASPxClientWeekOfMonth): void;
+    /**
+     * Gets the occurrence number of the week in a month for the recurrence pattern.
+     */
+    GetWeekOfMonth(): ASPxClientWeekOfMonth;
+    /**
+     * Sets the month (as a number) on which the corresponding appointment occurs.
+     * @param month A positive integer value that specifies the month's number.
+     */
+    SetMonth(month: number): void;
+    /**
+     * Gets the month (as a number) on which the corresponding appointment recurs.
+     */
+    GetMonth(): number;
+    /**
+     * Gets the type of the recurrence range.
+     */
+    GetRange(): ASPxClientRecurrenceRange;
+    /**
+     * Sets the type of the recurrence range.
+     * @param range An ASPxClientRecurrenceRangeenumeration value that specifies the recurrence range type.
+     */
+    SetRange(range: ASPxClientRecurrenceRange): void;
+}
+/**
+ * Contains types of the recurrence range.
+ */
+interface ASPxClientRecurrenceRange {
+    /**
+     * A recurring appointment will not have an end date, i.e. infinite recurrence
+     * Value: The "NoEndDate" string.
+     */
+    NoEndDate: string;
+    /**
+     * A recurring appointment will end after its recurrence count exceeds the value specified by the SetOccurrenceCount method.
+     * Value: The "OccurrenceCount" string.
+     */
+    OccurrenceCount: string;
+    /**
+     * A recurring appointment will end after the date specified by the SetEnd method.
+     * Value: The "EndByDate" string.
+     */
+    EndByDate: string;
+}
+/**
+ * Contains recurrence types.
+ */
+interface ASPxClientRecurrenceType {
+    /**
+     * The recurring appointment occurs on a daily basis.
+     * Value: The "Daily" string.
+     */
+    Daily: string;
+    /**
+     * The recurring appointment reoccurs on a weekly basis.
+     * Value: The "Weekly" string.
+     */
+    Weekly: string;
+    /**
+     * The recurring appointment reoccurs on a monthly basis.
+     * Value: The "Monthly" string.
+     */
+    Monthly: string;
+    /**
+     * The recurring appointment reoccurs on an yearly basis.
+     * Value: The "Yearly" string.
+     */
+    Yearly: string;
+    /**
+     * The recurring appointment occurs on an hourly base.
+     * Value: The "Hourly" string.
+     */
+    Hourly: string;
+}
+/**
+ * Contains days and groups of days for use in recurrence patterns.
+ */
+interface ASPxClientWeekDays {
+    /**
+     * Specifies Sunday.
+     * Value: The integer 1 value.
+     */
+    Sunday: number;
+    /**
+     * Specifies Monday.
+     * Value: The integer 2 value.
+     */
+    Monday: number;
+    /**
+     * Specifies Tuesday.
+     * Value: The integer 4 value.
+     */
+    Tuesday: number;
+    /**
+     * Specifies Wednesday.
+     * Value: The integer 8 value.
+     */
+    Wednesday: number;
+    /**
+     * Specifies Thursday.
+     * Value: The integer 16 value.
+     */
+    Thursday: number;
+    /**
+     * Specifies Friday.
+     * Value: The integer 32 value.
+     */
+    Friday: number;
+    /**
+     * Specifies Saturday.
+     * Value: The integer 64 value.
+     */
+    Saturday: number;
+    /**
+     * Specifies Saturday and Sunday.
+     * Value: The integer 65 value.
+     */
+    WeekendDays: number;
+    /**
+     * Specifies work days (Monday, Tuesday, Wednesday, Thursday and Friday).
+     * Value: The integer 62 value.
+     */
+    WorkDays: number;
+    /**
+     * Specifies every day of the week.
+     * Value: The integer 127 value.
+     */
+    EveryDay: number;
+}
+/**
+ * Contains number of weeks in a month in which the event occurs.
+ */
+interface ASPxClientWeekOfMonth {
+    /**
+     * There isn't any recurrence rule based on the weeks in a month.
+     * Value: The integer 0 value.
+     */
+    None: number;
+    /**
+     * The recurring event will occur once a month, on the specified day or days of the first week in the month.
+     * Value: The integer 1 value.
+     */
+    First: number;
+    /**
+     * The recurring event will occur once a month, on the specified day or days of the second week in the month.
+     * Value: The integer 2 value.
+     */
+    Second: number;
+    /**
+     * The recurring event will occur once a month, on the specified day or days of the third week in the month.
+     * Value: The integer 3 value.
+     */
+    Third: number;
+    /**
+     * The recurring event will occur once a month, on the specified day or days of the fourth week in the month.
+     * Value: The integer 4 value;
+     */
+    Fourth: number;
+    /**
+     * The recurring event will occur once a month, on the specified day or days of the last week in the month.
+     * Value: The integer 5 value;
+     */
+    Last: number;
+}
+/**
+ * Represents a client-side equivalent of the WeekDaysCheckEdit control.
+ */
+interface ASPxClientWeekDaysCheckEdit extends ASPxClientControl {
+    /**
+     * Gets the selection state of the week day check boxes.
+     */
+    GetValue(): ASPxClientWeekDays;
+    /**
+     * Gets the selection state of the week day check boxes.
+     * @param value An ASPxClientWeekDays object specifying the selection state of the week day check boxes.
+     */
+    SetValue(value: ASPxClientWeekDays): void;
+}
+/**
+ * Represents a client-side equivalent of the RecurrenceRangeControl.
+ */
+interface ASPxClientRecurrenceRangeControl extends ASPxClientControl {
+    /**
+     * Gets the type of the recurrence range.
+     */
+    GetRange(): ASPxClientRecurrenceRange;
+    /**
+     * Gets how many times the appointment occurs.
+     */
+    GetOccurrenceCount(): number;
+    /**
+     * Gets the recurrence end date.
+     */
+    GetEndDate(): Date;
+    /**
+     * Sets the type of the recurrence range.
+     * @param range An ASPxClientRecurrenceRangeenumeration value that specifies the recurrence range type.
+     */
+    SetRange(range: ASPxClientRecurrenceRange): void;
+    /**
+     * Sets how many times the appointment occurs.
+     * @param occurrenceCount An integer value that specifies how many times the appointment occurs.
+     */
+    SetOccurrenceCount(occurrenceCount: number): void;
+    /**
+     * Sets the recurrence end date.
+     * @param date A JavaScript Date object that specifies the end date for the recurrence.
+     */
+    SetEndDate(date: Date): void;
+}
+/**
+ * A base for client equivalents of recurrence controls available in the XtraScheduler library.
+ */
+interface ASPxClientRecurrenceControlBase extends ASPxClientControl {
+    /**
+     * Returns an object providing access to the ASPxClientRecurrenceControlBase control's editor values.
+     */
+    CreateValueAccessor(): DefaultRecurrenceRuleValuesAccessor;
+    /**
+     * Updates values of editors displayed by the ASPxClientRecurrenceControlBase control.
+     * @param recurrenceInfo An ASPxClientRecurrenceInfo object containing new editor values.
+     */
+    Update(recurrenceInfo: ASPxClientRecurrenceInfo): void;
+}
+/**
+ * Represents a client-side equivalent of the DailyRecurrenceControl - a control for specifying the daily recurrence.
+ */
+interface ASPxClientDailyRecurrenceControl extends ASPxClientRecurrenceControlBase {
+    /**
+     * Returns an object providing access to the ASPxClientDailyRecurrenceControl's editor values.
+     */
+    CreateValueAccessor(): DefaultRecurrenceRuleValuesAccessor;
+    /**
+     * Updates values of editors displayed by the ASPxClientDailyRecurrenceControl.
+     * @param recurrenceInfo An ASPxClientRecurrenceInfo object containing new editor values.
+     */
+    Update(recurrenceInfo: ASPxClientRecurrenceInfo): void;
+}
+/**
+ * Represents a client-side equivalent of the WeeklyRecurrenceControl.
+ */
+interface ASPxClientWeeklyRecurrenceControl extends ASPxClientRecurrenceControlBase {
+    /**
+     * Returns an object providing access to the ASPxClientWeeklyRecurrenceControl's editor values.
+     */
+    CreateValueAccessor(): DefaultRecurrenceRuleValuesAccessor;
+    /**
+     * Updates values of editors displayed by the ASPxClientWeeklyRecurrenceControl.
+     * @param recurrenceInfo An ASPxClientRecurrenceInfo object containing new editor values.
+     */
+    Update(recurrenceInfo: ASPxClientRecurrenceInfo): void;
+}
+/**
+ * Represents a client-side equivalent of the MonthlyRecurrenceControl.
+ */
+interface ASPxClientMonthlyRecurrenceControl extends ASPxClientRecurrenceControlBase {
+    /**
+     * Returns an object providing access to the ASPxClientMonthlyRecurrenceControl's editor values.
+     */
+    CreateValueAccessor(): DefaultRecurrenceRuleValuesAccessor;
+    /**
+     * Updates values of editors displayed by the ASPxClientMonthlyRecurrenceControll.
+     * @param recurrenceInfo An ASPxClientRecurrenceInfo object containing new editor values.
+     */
+    Update(recurrenceInfo: ASPxClientRecurrenceInfo): void;
+}
+/**
+ * Represents a client-side equivalent of the YearlyRecurrenceControl.
+ */
+interface ASPxClientYearlyRecurrenceControl extends ASPxClientRecurrenceControlBase {
+    /**
+     * Returns an object providing access to the ASPxClientYearlyRecurrenceControl's editor values.
+     */
+    CreateValueAccessor(): DefaultRecurrenceRuleValuesAccessor;
+    /**
+     * Updates values of editors displayed by the ASPxClientYearlyRecurrenceControl.
+     * @param recurrenceInfo An ASPxClientRecurrenceInfo object containing new editor values.
+     */
+    Update(recurrenceInfo: ASPxClientRecurrenceInfo): void;
+}
+/**
+ * An object providing access to an ASPxClientRecurrenceControlBase control's editor values.
+ */
+interface DefaultRecurrenceRuleValuesAccessor {
+    /**
+     * Get the frequency with which the appointment occurs with respect to the appointment's recurrence type.
+     */
+    GetPeriodicity(): number;
+    /**
+     * Gets the number of the month's day in which the appointment is scheduled.
+     */
+    GetDayNumber(): number;
+    /**
+     * Gets or sets the month's number.
+     */
+    GetMonth(): number;
+    /**
+     * Gets the days of the week on which a weekly recurrent appointment is scheduled.
+     */
+    GetWeekDays(): ASPxClientWeekDays;
+    /**
+     * Gets the number of the week in a month when an appointment is scheduled.
+     */
+    GetWeekOfMonth(): ASPxClientWeekOfMonth;
+}
+/**
+ * An object providing access to an ASPxClientDailyRecurrenceControl's editor values.
+ */
+interface DailyRecurrenceValuesAccessor extends DefaultRecurrenceRuleValuesAccessor {
+    /**
+     * Gets the number of days between appointment occurrences.
+     */
+    GetPeriodicity(): number;
+    /**
+     * Gets the days of the week to which a daily recurrent appointment is scheduled.
+     */
+    GetWeekDays(): ASPxClientWeekDays;
+}
+/**
+ * An object providing access to an ASPxClientWeeklyRecurrenceControl's editor values.
+ */
+interface WeeklyRecurrenceValuesAccessor extends DefaultRecurrenceRuleValuesAccessor {
+    /**
+     * Gets the number of weeks between appointment occurrences.
+     */
+    GetPeriodicity(): number;
+    /**
+     * Gets the days of the week on which a weekly recurrent appointment is scheduled.
+     */
+    GetWeekDays(): ASPxClientWeekDays;
+}
+/**
+ * An object providing access to an ASPxClientMonthlyRecurrenceControl's editor values.
+ */
+interface MonthlyRecurrenceValuesAccessor extends DefaultRecurrenceRuleValuesAccessor {
+    /**
+     * Gets the day of the month on which the appointment is scheduled.
+     */
+    GetDayNumber(): number;
+    /**
+     * Gets the number of months between appointment occurrences.
+     */
+    GetPeriodicity(): number;
+    /**
+     * Gets the days of the week on which a monthly recurrent appointment is scheduled.
+     */
+    GetWeekDays(): ASPxClientWeekDays;
+    /**
+     * Gets the number of the week in a month when an appointment is scheduled.
+     */
+    GetWeekOfMonth(): ASPxClientWeekOfMonth;
+}
+/**
+ * An object providing access to an ASPxClientYearlyRecurrenceControl's editor values.
+ */
+interface YearlyRecurrenceValuesAccessor extends DefaultRecurrenceRuleValuesAccessor {
+    /**
+     * Gets the day of the month on which the appointment is scheduled.
+     */
+    GetDayNumber(): number;
+    /**
+     * Gets or sets the month's number.
+     */
+    GetMonth(): number;
+    /**
+     * Gets the days of the week on which a yearly recurrent appointment is scheduled.
+     */
+    GetWeekDays(): ASPxClientWeekDays;
+    /**
+     * Gets or sets the number of a week in a month when an appointment is scheduled.
+     */
+    GetWeekOfMonth(): ASPxClientWeekOfMonth;
+}
+/**
+ * Provides base functionality for ASPxClientScheduler's forms.
+ */
+interface ASPxClientFormBase {
+    /**
+     * Occurs when the form has been closed.
+     */
+    FormClosed: ASPxClientEvent<ASPxClientEventHandler<ASPxClientFormBase>>;
+    /**
+     * Closes the form.
+     */
+    Close(): void;
+    /**
+     * Sets the visibility state of the specified form element.
+     * @param element An object specifying the element whose visibility state should be changed.
+     * @param isVisible true to display the element; false to hide the element.
+     */
+    SetVisibleCore(element: Object, isVisible: boolean): void;
+}
+/**
+ * Represents a client-side equivalent of the RecurrenceTypeEdit.
+ */
+interface ASPxClientRecurrenceTypeEdit extends ASPxClientRadioButtonList {
+    /**
+     * Gets the selected recurrence type.
+     */
+    GetRecurrenceType(): ASPxClientRecurrenceType;
+    /**
+     * Sets the selected recurrence type.
+     * @param recurrenceType An ASPxClientRecurrenceType enumeration value.
+     */
+    SetRecurrenceType(recurrenceType: ASPxClientRecurrenceType): void;
+}
+/**
+ * Contains lists of property names for different appointment types.
+ */
+interface AppointmentPropertyNames {
+    /**
+     * Gets the list of properties characteristic for appointments of the Normal type.
+     * Value: A string array which is composed of the appointment property names.
+     */
+    Normal: string;
+    /**
+     * Gets the list of properties characteristic for appointments of the Pattern type.
+     * Value: A string array which is composed of the appointment property names.
+     */
+    Pattern: string;
+}
+/**
+ * Represents the client-side equivalent of the TimeInterval class.
+ */
+interface ASPxClientTimeInterval {
+    /**
+     * Gets a value indicating if the time interval is All-Day.
+     */
+    GetAllDay(): boolean;
+    /**
+     * Sets a value specifying if the time interval is All-Day.
+     * @param allDayValue true, if this is an all-day time interval; otherwise, false.
+     */
+    SetAllDay(allDayValue: boolean): void;
+    /**
+     * Client-side function that returns the start time of the interval.
+     */
+    GetStart(): Date;
+    /**
+     * Client-side function that returns the duration of the specified time interval.
+     */
+    GetDuration(): number;
+    /**
+     * Client-side function that returns the end time of the interval.
+     */
+    GetEnd(): Date;
+    /**
+     * Client-side function that sets the start time of the interval.
+     * @param value A DateTime value, representing the beginning of the interval.
+     */
+    SetStart(value: Date): void;
+    /**
+     * Client-side function that returns the duration of the specified time interval.
+     * @param value A TimeSpan  object, representing the duration of the time period.
+     */
+    SetDuration(value: any): void;
+    /**
+     * Client-side function that sets the end time of the interval.
+     * @param value A DateTime value, representing the end of the interval.
+     */
+    SetEnd(value: Date): void;
+    /**
+     * Determines whether the specified object is equal to the current ASPxClientTimeInterval instance.
+     * @param interval The object to compare with the current object.
+     */
+    Equals(interval: ASPxClientTimeInterval): boolean;
+    /**
+     * Checks if the current time interval intersects with the specified time interval.
+     * @param interval A ASPxClientTimeInterval object which represents the time interval to be checked.
+     */
+    IntersectsWith(interval: ASPxClientTimeInterval): boolean;
+    /**
+     * Checks if the current time interval intersects with the specified time interval. The boundaries of the time intervals are excluded from the check.
+     * @param interval A ASPxClientTimeInterval object which represents the time interval to be checked.
+     */
+    IntersectsWithExcludingBounds(interval: ASPxClientTimeInterval): boolean;
+    /**
+     * Client-side function that determines whether the specified interval is contained within the current one.
+     * @param interval An ASPxClientTimeInterval object, representing the time interval to check.
+     */
+    Contains(interval: ASPxClientTimeInterval): boolean;
+}
+/**
+ * Holds action types for the client-side Refresh method.
+ */
+interface ASPxClientSchedulerRefreshAction {
+    /**
+     * Gets the value of the action parameter which initiates a simple reload of the control.
+     * Value: An integer representing the action parameter value.
+     */
+    None: number;
+    /**
+     * Gets the value of the action parameter which initiates reloading of the main ASPxScheduler control and its data-dependent satellites.
+     * Value: An integer representing the action parameter value.
+     */
+    VisibleIntervalChanged: number;
+    /**
+     * Gets the value of the action parameter which initiates reloading of the main ASPxScheduler control and its satellite View controls.
+     * Value: An integer representing the action parameter value.
+     */
+    ActiveViewTypeChanged: number;
+}
+/**
+ * Contains methods allowing you to perform or cancel an operation.
+ */
+interface ASPxClientAppointmentOperation {
+    /**
+     * Passes parameters to the corresponding callback function to accomplish the operation.
+     */
+    Apply(): void;
+    /**
+     * Cancels the operation.
+     */
+    Cancel(): void;
+}
+/**
+ * Represents the client-side equivalent of the ASPxScheduler control.
+ */
+interface ASPxClientScheduler extends ASPxClientControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientScheduler>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientScheduler>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientScheduler.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientScheduler>>;
+    /**
+     * Occurs on the client side when the Scheduler control is about to change its active view.
+     */
+    ActiveViewChanging: ASPxClientEvent<ActiveViewChangingEventHandler<ASPxClientScheduler>>;
+    /**
+     * Client-side event. Occurs after the active view of the ASPxScheduler has been changed.
+     */
+    ActiveViewChanged: ASPxClientEvent<ASPxClientEventHandler<ASPxClientScheduler>>;
+    /**
+     * Occurs when an end-user presses a keyboard shortcut.
+     */
+    Shortcut: ASPxClientEvent<ShortcutEventHandler<ASPxClientScheduler>>;
+    /**
+     * Occurs when the end-user clicks an appointment.
+     */
+    AppointmentClick: ASPxClientEvent<AppointmentClickEventHandler<ASPxClientScheduler>>;
+    /**
+     * Occurs when the end-user double clicks on an appointment.
+     */
+    AppointmentDoubleClick: ASPxClientEvent<AppointmentClickEventHandler<ASPxClientScheduler>>;
+    /**
+     * Occurs when an end-user clicks a time cell.
+     */
+    CellClick: ASPxClientEvent<CellClickEventHandler<ASPxClientScheduler>>;
+    /**
+     * Occurs when and end-user double-clicks a time cell.
+     */
+    CellDoubleClick: ASPxClientEvent<CellClickEventHandler<ASPxClientScheduler>>;
+    /**
+     * Occurs on the client side when the user selects an appointment.
+     */
+    AppointmentsSelectionChanged: ASPxClientEvent<AppointmentsSelectionEventHandler<ASPxClientScheduler>>;
+    /**
+     * Fires on the client side when the time cell selection is changed.
+     */
+    SelectionChanged: ASPxClientEvent<ASPxClientEventHandler<ASPxClientScheduler>>;
+    /**
+     * Occurs on the client side when the time cell selection is about to change.
+     */
+    SelectionChanging: ASPxClientEvent<ASPxClientEventHandler<ASPxClientScheduler>>;
+    /**
+     * Fires on the client side when the  time interval of the scheduling area is changed.
+     */
+    VisibleIntervalChanged: ASPxClientEvent<ASPxClientEventHandler<ASPxClientScheduler>>;
+    /**
+     * Occurs when one of  More Buttons is clicked.
+     */
+    MoreButtonClicked: ASPxClientEvent<MoreButtonClickedEventHandler<ASPxClientScheduler>>;
+    /**
+     * Client-side event that occurs when a popup menu item is clicked.
+     */
+    MenuItemClicked: ASPxClientEvent<MenuItemClickedEventHandler<ASPxClientScheduler>>;
+    /**
+     * Client-side event that occurs after an appointment has been dragged and dropped.
+     */
+    AppointmentDrop: ASPxClientEvent<AppointmentDropEventHandler<ASPxClientScheduler>>;
+    /**
+     * A client-side event that occurs when an appointment is being dragged.
+     */
+    AppointmentDrag: ASPxClientEvent<AppointmentDragEventHandler<ASPxClientScheduler>>;
+    /**
+     * A client-side event that occurs when an appointment is being resized.
+     */
+    AppointmentResizing: ASPxClientEvent<AppointmentResizingEventHandler<ASPxClientScheduler>>;
+    /**
+     * Client-side event that occurs when an appointment is resized.
+     */
+    AppointmentResize: ASPxClientEvent<AppointmentResizeEventHandler<ASPxClientScheduler>>;
+    /**
+     * Client-side event that fires before an appointment is deleted.
+     */
+    AppointmentDeleting: ASPxClientEvent<ASPxClientAppointmentDeletingEventHandler<ASPxClientScheduler>>;
+    /**
+     * Client-side scripting  method that gets the active View.
+     */
+    GetActiveViewType(): ASPxSchedulerViewType;
+    /**
+     * Client-side scripting  method to change the ASPxScheduler's active View.
+     * @param value A ASPxSchedulerViewType enumeration value, representing a view type to set.
+     */
+    SetActiveViewType(value: ASPxSchedulerViewType): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument
+     * @param parameter A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Client-side scripting method which initiates a round trip to the server so that the current page will be reloaded.
+     */
+    Refresh(): void;
+    /**
+     * Client-side scripting method which initiates a round trip to the server, so that the control will be reloaded using the specified refresh action.
+     * @param refreshAction An ASPxClientSchedulerRefreshAction enumeration value, specifying the refresh action.
+     */
+    Refresh(refreshAction: ASPxClientSchedulerRefreshAction): void;
+    /**
+     * Client-side function that returns the type of grouping applied to the appointments displayed in the scheduler.
+     */
+    GetGroupType(): ASPxSchedulerGroupType;
+    /**
+     * Client-side scripting method which raises the callback command to set the GroupType.
+     * @param value An ASPxSchedulerGroupType enumeration value, which specifies how appointments are grouped.
+     */
+    SetGroupType(value: ASPxSchedulerGroupType): void;
+    /**
+     * Client-side method that navigates the scheduler to the current system date.
+     */
+    GotoToday(): void;
+    /**
+     * Client-side scripting method which raises the GotoDate callback command.
+     * @param date A DateTime value specifying the destination time.
+     */
+    GotoDate(date: Date): void;
+    /**
+     * Client-side function which slides the visible interval one time span back.
+     */
+    NavigateBackward(): void;
+    /**
+     * Client-side function which slides the visible interval one time span forward.
+     */
+    NavigateForward(): void;
+    /**
+     * Client-side method which raises the callback command to change the ClientTimeZoneId of the scheduler.
+     * @param timeZoneId A string, a time zone identifier which is valid for the System.TimeZoneInfo.Id property.
+     */
+    ChangeTimeZoneId(timeZoneId: string): void;
+    /**
+     * Displays a Selection ToolTip on a position given by the specified coordinates.
+     * @param x An integer representing the X-coordinate.
+     * @param y An integer representing the Y-coordinate.
+     */
+    ShowSelectionToolTip(x: number, y: number): void;
+    /**
+     * Client-side function that returns the time interval, selected in the scheduler.
+     */
+    GetSelectedInterval(): ASPxClientTimeInterval;
+    /**
+     * Client-side function that returns the ResourceId of selected time cell's resource.
+     */
+    GetSelectedResource(): string;
+    /**
+     * Gets a collection of visible appointments.
+     */
+    GetVisibleAppointments(): ASPxClientAppointment[];
+    /**
+     * Client-side function that returns an appointment with the specified ID.
+     * @param id An appointment's identifier.
+     */
+    GetAppointmentById(id: Object): ASPxClientAppointment;
+    /**
+     * Client-side function that returns the id's of selected appointments.
+     */
+    GetSelectedAppointmentIds(): string[];
+    /**
+     * Client-side function that removes the appointment specified by its client ID from a collection of selected appointments.
+     * @param aptId An appointment's identifier.
+     */
+    DeselectAppointmentById(aptId: Object): void;
+    /**
+     * Client-side function that selects an appointment with the specified ID.
+     * @param aptId An appointment's identifier.
+     */
+    SelectAppointmentById(aptId: Object): void;
+    /**
+     * Enables obtaining appointment property values in a client-side script. Executes the callback command with the AppointmentData identifier.
+     * @param aptId An integer, representing the appointment ID.
+     * @param propertyNames An array of strings, representing the appointment properties to query.
+     * @param onCallBack A handler of a function which will receive and process the properties' values.
+     */
+    GetAppointmentProperties(aptId: number, propertyNames: string[], onCallBack: Object): string[];
+    /**
+     * Initiates a callback to retrieve and apply the values for the specified list of properties to the specified appointment, and transfer control to the specified function.
+     * @param clientAppointment An ASPxClientAppointment object that is the client appointment for which the data is retrieved.
+     * @param propertyNames An array of strings, that are the names of appointment properties to query.
+     * @param onCallBack A handler of a function executed after a callback.
+     */
+    RefreshClientAppointmentProperties(clientAppointment: ASPxClientAppointment, propertyNames: string[], onCallBack: Object): void;
+    /**
+     * Client-side function that invokes the editing form for the appointment specified by its client ID.
+     * @param aptClientId A string, representing the appointment client identifier.
+     */
+    ShowAppointmentFormByClientId(aptClientId: string): void;
+    /**
+     * Client-side function that invokes the editing form for the appointment specified by its storage identifier.
+     * @param aptServerId A string, representing the appointment identifier.
+     */
+    ShowAppointmentFormByServerId(aptServerId: string): void;
+    /**
+     * Sets the time of the day corresponding to the start of the topmost displayed time cell row.
+     * @param duration An integer, representing the number of milliseconds passed since the start of the day.
+     * @param viewType An ASPxSchedulerViewType enumeration member, representing the scheduler's View. It can be either 'Day' or 'WorkWeek'.
+     */
+    SetTopRowTime(duration: number, viewType: ASPxSchedulerViewType): void;
+    /**
+     * Sets the time of the day corresponding to the start of the topmost displayed time cell row.
+     * @param duration An integer, representing the number of milliseconds passed since the start of the day.
+     */
+    SetTopRowTime(duration: number): void;
+    /**
+     * Gets the time of the day corresponding to the start of the topmost displayed time cell row.
+     * @param viewType An ASPxSchedulerViewType enumeration member, representing the scheduler's View. It can be either "Day" or  "WorkWeek", otherwise the result is undefined.
+     */
+    GetTopRowTime(viewType: ASPxSchedulerViewType): number;
+    /**
+     * Gets the time of day corresponding to the start of the topmost displayed time cell row.
+     */
+    GetTopRowTime(): number;
+    /**
+     * Client-side scripting method which displays the Loading Panel.
+     */
+    ShowLoadingPanel(): void;
+    /**
+     * Client-side scripting method which hides the Loading Panel from view.
+     */
+    HideLoadingPanel(): void;
+    /**
+     * Client-side method that invokes the inplace editor form to create a new appointment.
+     * @param start A date object, representing the start of the new appointment.
+     * @param end A date object, representing the end of the new appointment.
+     */
+    ShowInplaceEditor(start: Date, end: Date): void;
+    /**
+     * Client-side method that invokes the inplace editor form to create a new appointment.
+     * @param start A date object, representing the start of the new appointment.
+     * @param end A date object, representing the end of the new appointment.
+     * @param resourceId An object representing the identifier of a resource associated with the new appointment.
+     */
+    ShowInplaceEditor(start: Date, end: Date, resourceId: string): void;
+    /**
+     * Client-side scripting  method to insert the specified appointment.
+     * @param apt An ASPxClientAppointment object representing the client-side appointment.
+     */
+    InsertAppointment(apt: ASPxClientAppointment): void;
+    /**
+     * Client-side scripting  method to update the specified appointment.
+     * @param apt An ASPxClientAppointment object representing the client-side appointment.
+     */
+    UpdateAppointment(apt: ASPxClientAppointment): void;
+    /**
+     * Client-side scripting  method to delete the specified appointment.
+     * @param apt An ASPxClientAppointment object representing the client-side appointment.
+     */
+    DeleteAppointment(apt: ASPxClientAppointment): void;
+    /**
+     * Client-side method that allows retrieving a collection of time intervals displayed by the ASPxScheduler.
+     */
+    GetVisibleIntervals(): ASPxClientTimeInterval[];
+    /**
+     * Changes the container that the ASPxScheduler tooltip belongs to.
+     * @param container An object that serves as the new container for the pop-up menu.
+     */
+    ChangeToolTipContainer(container: Object): void;
+    /**
+     * Changes the container that the ASPxScheduler pop-up menu belongs to.
+     * @param container An object that serves as the new container for the pop-up menu.
+     */
+    ChangePopupMenuContainer(container: Object): void;
+    /**
+     * Returns focus to the form if the ASPxScheduler control is not visible when the reminder fires.
+     * @param container A DIV object that is located in such a way that it is visible on the page in situations when the ASPxScheduler control is hidden.
+     */
+    ChangeFormContainer(container: Object): void;
+    /**
+     * Client-side scripting method that saves appointment modifications and closes the form.
+     */
+    AppointmentFormSave(): void;
+    /**
+     * Client-side scripting method that deletes the appointment being edited.
+     */
+    AppointmentFormDelete(): void;
+    /**
+     * Client-side scripting method that cancels changes and closes the appointment editing form.
+     */
+    AppointmentFormCancel(): void;
+    /**
+     * Client-side scripting method that navigates the scheduler to the date selected in the GotoDate form and closes the form.
+     */
+    GoToDateFormApply(): void;
+    /**
+     * Client-side scripting method that cancels changes and closes the GotoDate form.
+     */
+    GoToDateFormCancel(): void;
+    /**
+     * Client-side scripting method that cancels changes and closes the form.
+     */
+    InplaceEditFormSave(): void;
+    /**
+     * Client-side scripting method that cancels changes and closes the form.
+     */
+    InplaceEditFormCancel(): void;
+    /**
+     * Client-side scripting method that invokes the appointment editing form for the appointment being edited in the inplace editor.
+     */
+    InplaceEditFormShowMore(): void;
+    /**
+     * Client-side scripting method that closes the Reminder form.
+     */
+    ReminderFormCancel(): void;
+    /**
+     * Client-side scripting method that calls the Dismiss method for the selected reminder.
+     */
+    ReminderFormDismiss(): void;
+    /**
+     * Client-side scripting method that dismisses all reminders shown in the Reminder form.
+     */
+    ReminderFormDismissAll(): void;
+    /**
+     * Client-side scripting method that changes the alert time for the selected reminder to the specified interval.
+     */
+    ReminderFormSnooze(): void;
+}
+/**
+ * Represents a client-side equivalent of the SchedulerViewType object.
+ */
+interface ASPxSchedulerViewType {
+    /**
+     * Gets a string representation equivalent of Day enumeration for use in client scripts.
+     * Value: A string "Day", indicating the DayView.
+     */
+    Day: string;
+    /**
+     * Gets a string representation equivalent of WorkWeek enumeration for use in client scripts.
+     * Value: A string "WorkWeek", indicating the WorkWeekView.
+     */
+    WorkWeek: string;
+    /**
+     * Gets a string representation equivalent of Week enumeration for use in client scripts.
+     * Value: A string "Week", indicating the WeekView.
+     */
+    Week: string;
+    /**
+     * Gets a string representation equivalent of Month enumeration for use in client scripts.
+     * Value: A string "Month", indicating the MonthView.
+     */
+    Month: string;
+    /**
+     * Gets a string representation equivalent of Timeline enumeration for use in client scripts.
+     * Value: A string "Timeline", indicating the TimelineView.
+     */
+    Timeline: string;
+    /**
+     * Gets a string representation equivalent of FullWeek enumeration for use in client scripts.
+     * Value: A string "FullWeek", indicating the FullWeekView.
+     */
+    FullWeek: string;
+    /**
+     * Gets a string representation equivalent to the Agenda enumeration for use in client scripts.
+     * Value: A string "Agenda", indicating the AgendaView.
+     */
+    Agenda: string;
+}
+/**
+ * Represents a client-side equivalent of the SchedulerGroupType enumeration.
+ */
+interface ASPxSchedulerGroupType {
+    /**
+     * Gets a string representation equivalent of None enumeration for use in client scripts.
+     * Value: A "None" string value.
+     */
+    None: string;
+    /**
+     * Gets a string representation equivalent of Date enumeration for use in client scripts.
+     * Value: A "Date" string value.
+     */
+    Date: string;
+    /**
+     * Gets a string representation equivalent of Resource enumeration for use in client scripts.
+     * Value: A "Resource" string value.
+     */
+    Resource: string;
+}
+/**
+ * Represents a client-side equivalent of the AppointmentType enumeration.
+ */
+interface ASPxAppointmentType {
+    /**
+     * Gets a string representation equivalent of Normal enumeration for use in client scripts.
+     * Value: A "Normal" string value.
+     */
+    Normal: string;
+    /**
+     * Gets a string representation equivalent of Pattern enumeration for use in client scripts.
+     * Value: A "Pattern" string value.
+     */
+    Pattern: string;
+    /**
+     * Gets a string representation equivalent of Occurrence enumeration for use in client scripts.
+     * Value: An "Occurrence" string value.
+     */
+    Occurrence: string;
+    /**
+     * Gets a string representation equivalent of ChangedOccurrence enumeration for use in client scripts.
+     * Value: A "ChangedOccurrence" string value.
+     */
+    ChangedOccurrence: string;
+    /**
+     * Gets a string representation equivalent of DeletedOccurrence enumeration for use in client scripts.
+     * Value: A "DeletedOccurrence" string value.
+     */
+    DeletedOccurrence: string;
+}
+interface ASPxClientAppointmentDeletingEventHandler<S> {
+    /**
+     * A method that will handle the AppointmentDeleting event.
+     * @param source The event sender (typically an ASPxClientScheduler control).
+     * @param e A ASPxClientAppointmentDeletingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientAppointmentDeletingEventArgs): void;
+}
+/**
+ * Provides data for the AppointmentDeleting event.
+ */
+interface ASPxClientAppointmentDeletingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets client IDs of the appointments that are intended to be removed.
+     * Value: An array of client appointment identifiers, representing appointments passed for deletion.
+     */
+    appointmentIds: Object[];
+}
+interface AppointmentClickEventHandler<S> {
+    /**
+     * A method that will handle the AppointmentClick event.
+     * @param source The event sender (typically an ASPxClientScheduler control).
+     * @param e A AppointmentClickEventArgs object that contains event data.
+     */
+    (source: S, e: AppointmentClickEventArgs): void;
+}
+/**
+ * Provides data for the AppointmentDoubleClick events.
+ */
+interface AppointmentClickEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the client appointment ID for the appointment being clicked.
+     * Value: A string, representing the client ID of the appointment.
+     */
+    appointmentId: string;
+    /**
+     * Gets the HTML element that the event was triggered on.
+     * Value: An object containing event data.
+     */
+    htmlElement: Object;
+    /**
+     * Gets or sets whether an event is handled, and that default actions are not required.
+     * Value: true if no default processing is required; otherwise, false.
+     */
+    handled: boolean;
+}
+/**
+ * A method that will handle the AppointmentsSelectionChanged event.
+ */
+interface AppointmentsSelectionEventHandler<S> {
+    /**
+     * A method that will handle the AppointmentsSelectionChanged event.
+     * @param source The ASPxScheduler control which fires the event.
+     * @param e A AppointmentsSelectionEventArgs object that contains event data.
+     */
+    (source: S, e: AppointmentsSelectionEventArgs): void;
+}
+/**
+ * Provides data for the AppointmentsSelectionChanged event.
+ */
+interface AppointmentsSelectionEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets identifiers of the selected appointments.
+     * Value: A comma separated list of string values, representing appointment IDs.
+     */
+    appointmentIds: string[];
+}
+/**
+ * A method that will handle the Shortcut event.
+ */
+interface ShortcutEventHandler<S> {
+    /**
+     * A method that will handle the Shortcut event.
+     * @param source The event sender (typically an ASPxClientScheduler control).
+     * @param e A ShortcutEventArgs object that contains event data.
+     */
+    (source: S, e: ShortcutEventArgs): void;
+}
+/**
+ * Provides data for the client-side Shortcut event.
+ */
+interface ShortcutEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name of a command associated with the keyboard shortcut.
+     * Value: A string containing a command name.
+     */
+    commandName: string;
+    /**
+     * Gets an object containing information about a keyboard shortcut event.
+     * Value: An object containing event data.
+     */
+    htmlEvent: Object;
+    /**
+     * Gets or sets whether an event is handled, and that default actions are not required.
+     * Value: true, if no default processing is required; otherwise, false.
+     */
+    handled: boolean;
+}
+/**
+ * A method that will handle the ActiveViewChanging event.
+ */
+interface ActiveViewChangingEventHandler<S> {
+    /**
+     * A method that will handle the ActiveViewChanging event.
+     * @param source The ASPxClientScheduler control which fires the event.
+     * @param e An ActiveViewChangingEventArgs object that contains event data
+     */
+    (source: S, e: ActiveViewChangingEventArgs): void;
+}
+/**
+ * Provides data for the client-side ActiveViewChanging event.
+ */
+interface ActiveViewChangingEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the value of the ActiveView property before modification.
+     * Value: A SchedulerViewType enumeration.
+     */
+    oldView: ASPxSchedulerViewType;
+    /**
+     * Gets the new value of the ActiveView property.
+     * Value: A string, which is the SchedulerViewType enumeration value.
+     */
+    newView: ASPxSchedulerViewType;
+    /**
+     * Gets or sets whether the change of active view should be canceled.
+     * Value: true to cancel the operation; otherwise, false.
+     */
+    cancel: boolean;
+}
+/**
+ * A method that will handle the MoreButtonClicked event.
+ */
+interface MoreButtonClickedEventHandler<S> {
+    /**
+     * A method that will handle MoreButtonClicked event.
+     * @param source The ASPxClientScheduler control which fires the event.
+     * @param e A MoreButtonClickedEventArgs object that contains event data.
+     */
+    (source: S, e: MoreButtonClickedEventArgs): void;
+}
+/**
+ * Provides data for the MoreButtonClicked client-side event.
+ */
+interface MoreButtonClickedEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the Start or End values of the target appointment.
+     * Value: A DateTime value representing the target appointment's boundary.
+     */
+    targetDateTime: Date;
+    /**
+     * Gets the time interval of the cell where the button is located.
+     * Value: An ASPxClientTimeInterval object representing the time interval of the cell which holds the button.
+     */
+    interval: ASPxClientTimeInterval;
+    /**
+     * Gets the resource identifier associated with the cell where the button is located.
+     * Value: A string, corresponding to ResourceId.
+     */
+    resource: string;
+    /**
+     * Gets or sets whether an event is handled. If it is handled, default actions are not required.
+     * Value: true if no default processing is required; otherwise, false.
+     */
+    handled: boolean;
+}
+/**
+ * A method that will handle the MenuItemClicked event.
+ */
+interface MenuItemClickedEventHandler<S> {
+    /**
+     * A method that will handle the MenuItemClicked event.
+     * @param source The ASPxClientScheduler control which fires the event.
+     * @param e A MenuItemClickedEventArgs object that contains event data.
+     */
+    (source: S, e: MenuItemClickedEventArgs): void;
+}
+/**
+ * Provides data for the MenuItemClicked event.
+ */
+interface MenuItemClickedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name of the menu item which is clicked.
+     * Value: A string, containing the menu item name.
+     */
+    itemName: string;
+    /**
+     * Gets or sets whether an event is handled, and that default actions are not required.
+     * Value: true if no default processing is required; otherwise, false.
+     */
+    handled: boolean;
+}
+/**
+ * A method that will handle the AppointmentDrag event.
+ */
+interface AppointmentDragEventHandler<S> {
+    /**
+     * A method that will handle the AppointmentDrag event.
+     * @param source The event sender (typically an ASPxClientScheduler object).
+     * @param e A ASPxClientAppointmentDragEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientAppointmentDragEventArgs): void;
+}
+/**
+ * Provides data for the AppointmentDrag event.
+ */
+interface ASPxClientAppointmentDragEventArgs extends ASPxClientEventArgs {
+    /**
+     * Specifies whether or not appointments can be dropped into the intervals over which they are currently dragged.
+     * Value: true to allow dropping appointments; otherwise, false.
+     */
+    allow: boolean;
+    /**
+     * Gets a mouse event object related to the current drag operation.
+     * Value: An object providing event properties specific to mouse events.
+     */
+    mouseEvent: Object;
+    /**
+     * Provides information about dragged appointments.
+     * Value: An array of ASPxClientAppointmentDragInfo objects storing information about dragged appointments.
+     */
+    dragInformation: ASPxClientAppointmentDragInfo[];
+}
+/**
+ * A method that will handle the AppointmentDrop event.
+ */
+interface AppointmentDropEventHandler<S> {
+    /**
+     * A method that will handle the AppointmentDrop event.
+     * @param source The event sender (typically an ASPxClientScheduler object).
+     * @param e A ASPxClientAppointmentDropEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientAppointmentDropEventArgs): void;
+}
+/**
+ * Provides data for the AppointmentDrop event.
+ */
+interface ASPxClientAppointmentDropEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets or sets a value that specifies whether the event is handled, and the default processing is not required.
+     * Value: true, if if the event is completely handled by custom code and no default processing is required; otherwise, false.
+     */
+    handled: boolean;
+    /**
+     * Provides access to an object that enables you to choose an operation to perform.
+     * Value: An ASPxClientAppointmentOperation object providing methods to perform the required operation.
+     */
+    operation: ASPxClientAppointmentOperation;
+    /**
+     * Provides information about dropped appointments.
+     * Value: An array of ASPxClientAppointmentDragInfo objects storing information about dropped appointments.
+     */
+    dragInformation: ASPxClientAppointmentDragInfo[];
+}
+interface AppointmentResizeEventHandler<S> {
+    /**
+     * A method that will handle the AppointmentResize event.
+     * @param source The event sender (typically an ASPxClientScheduler control).
+     * @param e A ASPxClientAppointmentResizeEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientAppointmentResizeEventArgs): void;
+}
+/**
+ * Provides data for the AppointmentResize event.
+ */
+interface ASPxClientAppointmentResizeEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets or sets whether default event processing is required.
+     * Value: true to process an event using only custom code; otherwise, false.
+     */
+    handled: boolean;
+    /**
+     * Provides access to an object that enables you to choose an operation to perform.
+     * Value: An ASPxClientAppointmentOperation object providing methods to perform the required operation.
+     */
+    operation: ASPxClientAppointmentOperation;
+    /**
+     * Gets the resized appointment's identifier.
+     * Value: A string containing an appointment identifier.
+     */
+    appointmentId: string;
+    /**
+     * Gets the appointment's interval before resizing.
+     * Value: An <see cref="ASPxClientTimeInterval" /> object representing the interval assigned to the appointment.
+     */
+    oldInterval: ASPxClientTimeInterval;
+    /**
+     * Gets the appointment's interval after resizing.
+     * Value: An <see cref="ASPxClientTimeInterval" /> object representing the interval assigned to the appointment.
+     */
+    newInterval: ASPxClientTimeInterval;
+}
+/**
+ * A method that will handle the AppointmentResizing event.
+ */
+interface AppointmentResizingEventHandler<S> {
+    /**
+     * A method that will handle the AppointmentResizing event.
+     * @param source The event sender (typically an ASPxClientScheduler object).
+     * @param e A ASPxClientAppointmentResizingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientAppointmentResizingEventArgs): void;
+}
+/**
+ * Provides data for the AppointmentResizing event.
+ */
+interface ASPxClientAppointmentResizingEventArgs extends ASPxClientEventArgs {
+    /**
+     * Specifies whether or not an appointment can be resized to the new time interval.
+     * Value: true to allow resizing the appointment; otherwise, false.
+     */
+    allow: boolean;
+    /**
+     * Gets a mouse event object related to the current appointment resizing operation.
+     * Value: An object providing event properties specific to mouse events.
+     */
+    mouseEvent: Object;
+    /**
+     * Gets the resized appointment's identifier.
+     * Value: A string containing an appointment identifier.
+     */
+    appointmentId: string;
+    /**
+     * Gets the appointment's interval before resizing.
+     * Value: An <see cref="ASPxClientTimeInterval" /> object representing the interval assigned to the appointment.
+     */
+    oldInterval: ASPxClientTimeInterval;
+    /**
+     * Gets the appointment's interval after resizing.
+     * Value: An <see cref="ASPxClientTimeInterval" /> object representing the interval assigned to the appointment.
+     */
+    newInterval: ASPxClientTimeInterval;
+}
+/**
+ * Stores information about an appointment drag operation.
+ */
+interface ASPxClientAppointmentDragInfo {
+    /**
+     * Gets the dragged appointment's identifier.
+     * Value: A string containing an appointment identifier.
+     */
+    appointmentId: string;
+    /**
+     * Gets the appointment's interval before the drag operation.
+     * Value: An <see cref="ASPxClientTimeInterval" /> object representing the interval assigned to the appointment.
+     */
+    oldInterval: ASPxClientTimeInterval;
+    /**
+     * Gets resources that were associated with the appointment before the drag operation.
+     * Value: A array of strings containing resource identifiers.
+     */
+    oldResources: string[];
+    /**
+     * Gets the appointment's interval after the drag operation.
+     * Value: An <see cref="ASPxClientTimeInterval" /> object representing the interval assigned to the appointment.
+     */
+    newInterval: ASPxClientTimeInterval;
+    /**
+     * Gets resources associated with the appointment after the drag operation.
+     * Value: An array of strings containing resource identifiers.
+     */
+    newResources: string[];
+}
+/**
+ * A method that will handle the CellDoubleClick events.
+ */
+interface CellClickEventHandler<S> {
+    /**
+     * A method that will handle the CellClick event.
+     * @param source The event sender (typically an ASPxClientScheduler control).
+     * @param e A CellClickEventArgs object that contains event data.
+     */
+    (source: S, e: CellClickEventArgs): void;
+}
+/**
+ * Provides data for the CellDoubleClick events.
+ */
+interface CellClickEventArgs extends ASPxClientEventArgs {
+    /**
+     * Provides access to an object containing information about an HTML element representing the clicked time cell.
+     * Value: An object containing information about an HTML element.
+     */
+    htmlElement: Object;
+    /**
+     * Provides access to a time interval occupied by the clicked time cell.
+     * Value: An <see cref="ASPxClientTimeInterval" /> object.
+     */
+    interval: ASPxClientTimeInterval;
+    /**
+     * Gets the name of a resource to which the clicked time cell belongs.
+     * Value: A string containing the name of a resource.
+     */
+    resource: string;
+}
+/**
+ * Contains information about a client tooltip.
+ */
+interface ASPxClientSchedulerToolTipData {
+    /**
+     * Returns the client appointment for which the tooltip is displayed.
+     */
+    GetAppointment(): ASPxClientAppointment;
+    /**
+     * Returns the client time interval for which the tooltip is displayed.
+     */
+    GetInterval(): ASPxClientTimeInterval;
+    /**
+     * Returns the resources associated with the appointment for which the tooltip is displayed.
+     */
+    GetResources(): Object[];
+}
+/**
+ * A client-side equivalent of the ASPxSchedulerToolTipBase control.
+ */
+interface ASPxClientToolTipBase {
+    /**
+     * Returns the value that indicates whether or not the tooltip can be displayed.
+     */
+    CanShowToolTip(): boolean;
+    /**
+     * Ends updating the tooltip content.
+     * @param toolTipData An ASPxClientSchedulerToolTipData object providing data required to update the tooltip content.
+     */
+    FinalizeUpdate(toolTipData: ASPxClientSchedulerToolTipData): void;
+    /**
+     * Updates the tooltip content.
+     * @param toolTipData An ASPxClientSchedulerToolTipData object providing data required to update the tooltip content.
+     */
+    Update(toolTipData: ASPxClientSchedulerToolTipData): void;
+    /**
+     * Closes the tooltip.
+     */
+    Close(): void;
+    /**
+     * Gets the tooltip position.
+     * @param bounds An object that represents the tooltip bounds.
+     */
+    CalculatePosition(bounds: Object): ASPxClientPoint;
+    /**
+     * Displays the Appointment Menu in the position of the tooltip.
+     * @param eventObject An object containing information about the event on which the menu is displayed.
+     */
+    ShowAppointmentMenu(eventObject: Object): void;
+    /**
+     * Displays the View Menu in the position of the tooltip.
+     * @param eventObject An object containing information about the event on which the menu is displayed.
+     */
+    ShowViewMenu(eventObject: Object): void;
+    /**
+     * Returns the string representation of the specified interval.
+     * @param interval An ASPxClientTimeInterval object to convert.
+     */
+    ConvertIntervalToString(interval: ASPxClientTimeInterval): string;
+}
+/**
+ * Represents the client-side equivalent of the ASPxSpellChecker class.
+ */
+interface ASPxClientSpellChecker extends ASPxClientControl {
+    /**
+     * Client-side event that occurs before the spell check starts.
+     */
+    BeforeCheck: ASPxClientEvent<ASPxClientBeforeCheckEventHandler<ASPxClientSpellChecker>>;
+    /**
+     * Client-side event that occurs before a message box informing about process completion is shown.
+     */
+    CheckCompleteFormShowing: ASPxClientEvent<ASPxClientCancelEventHandler<ASPxClientSpellChecker>>;
+    /**
+     * Client-side event that occurs when a spell check is finished.
+     */
+    AfterCheck: ASPxClientEvent<ASPxClientAfterCheckEventHandler<ASPxClientSpellChecker>>;
+    /**
+     * Occurs after a word is changed in a checked text.
+     */
+    WordChanged: ASPxClientEvent<ASPxClientWordChangedEventHandler<ASPxClientSpellChecker>>;
+    /**
+     * Starts the spelling check of the text contained within the element specified by the CheckedElementID value.
+     */
+    Check(): void;
+    /**
+     * Starts checking contents of the specified element.
+     * @param element An object representing the element being checked.
+     */
+    CheckElement(element: Object): void;
+    /**
+     * Starts checking contents of the specified element.
+     * @param id A string representing the identifier of the element being checked.
+     */
+    CheckElementById(id: string): void;
+    /**
+     * Starts checking the contents of controls in the specified container.
+     * @param containerElement An object representing a control which contains elements being checked.
+     */
+    CheckElementsInContainer(containerElement: Object): void;
+    /**
+     * Starts checking the contents of controls in the specified container.
+     * @param containerId A string, specifying the control's identifier.
+     */
+    CheckElementsInContainerById(containerId: string): void;
+}
+/**
+ * Represents an object that will handle the client-side BeforeCheck event.
+ */
+interface ASPxClientBeforeCheckEventHandler<S> {
+    /**
+     * A method that will handle the BeforeCheck event.
+     * @param source The ASPxClientSpellChecker control which fires the event.
+     * @param e A ASPxClientSpellCheckerBeforeCheckEventArgs object that contains event data
+     */
+    (source: S, e: ASPxClientSpellCheckerBeforeCheckEventArgs): void;
+}
+/**
+ * Provides data for an event that occurs before a spelling check is started. Represents the client-side equivalent of the BeforeCheckEventArgs class.
+ */
+interface ASPxClientSpellCheckerBeforeCheckEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the programmatic identifier assigned to the control which is going to be checked.
+     * Value: A string, containing the control's identifier.
+     */
+    controlId: string;
+}
+/**
+ * Represents an object that will handle the client-side AfterCheck event.
+ */
+interface ASPxClientAfterCheckEventHandler<S> {
+    /**
+     * A method that will handle the AfterCheck event.
+     * @param source The ASPxClientSpellChecker control which fires the event.
+     * @param e A ASPxClientSpellCheckerAfterCheckEventArgs object that contains event data
+     */
+    (source: S, e: ASPxClientSpellCheckerAfterCheckEventArgs): void;
+}
+/**
+ * Provides data for the client event that occurs after a spelling check is complete.
+ */
+interface ASPxClientSpellCheckerAfterCheckEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the programmatic identifier assigned to the control which has been checked.
+     * Value: A string, containing the control's identifier.
+     */
+    controlId: string;
+    /**
+     * Gets the text that has been checked.
+     * Value: A string, containing checked text.
+     */
+    checkedText: string;
+    /**
+     * Gets a value specifying whether spell checking is finished or stopped by the user.
+     * Value: A string value identifying the reason ("Default" or "User").
+     */
+    reason: string;
+}
+/**
+ * Represents an object that will handle the client-side WordChanged event.
+ */
+interface ASPxClientWordChangedEventHandler<S> {
+    /**
+     * A method that will handle the AfterCheck event.
+     * @param source The event source.
+     * @param e An ASPxClientSpellCheckerAfterCheckEventArgs object which contains event data.
+     */
+    (source: S, e: ASPxClientSpellCheckerAfterCheckEventArgs): void;
+}
+declare enum ASPxClientSpreadsheetPopupMenuType {
+    ColumnHeading=0,
+    RowHeading=1,
+    SheetTab=3,
+    Picture=4,
+    Chart=5,
+    Cell=7,
+    AutoFilter=8
+}
+/**
+ * A method that will handle the CustomCommandExecuted event.
+ */
+interface ASPxClientSpreadsheetCustomCommandExecutedEventHandler<S> {
+    /**
+     * A method that will handle the CustomCommandExecuted event.
+     * @param source An object representing the event source. Identifies the Spreadsheet that raised the event.
+     * @param e A ASPxClientSpreadsheetCustomCommandExecutedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientSpreadsheetCustomCommandExecutedEventArgs): void;
+}
+/**
+ * Provides data for the CustomCommandExecuted event.
+ */
+interface ASPxClientSpreadsheetCustomCommandExecutedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name of the processed command.
+     * Value: A string value representing the processed command's name.
+     */
+    commandName: string;
+    /**
+     * Gets an optional parameter that complements the processed command.
+     * Value: A string value containing additional information about the processed command.
+     */
+    parameter: string;
+    /**
+     * This property is now obsolete. Use the commandName property instead.
+     */
+    item: ASPxClientRibbonItem;
+}
+/**
+ * A method that will handle the DocumentChanged event.
+ */
+interface ASPxClientSpreadsheetDocumentChangedEventHandler<S> {
+    /**
+     * A method that will handle the DocumentChanged event.
+     * @param source An object representing the event source. Identifies the Spreadsheet that raised the event.
+     * @param e A ASPxClientSpreadsheetDocumentChangedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientSpreadsheetDocumentChangedEventArgs): void;
+}
+/**
+ * Provides data for the DocumentChanged event.
+ */
+interface ASPxClientSpreadsheetDocumentChangedEventArgs extends ASPxClientEventArgs {
+}
+/**
+ * A method that will handle the EndSynchronization events.
+ */
+interface ASPxClientSpreadsheetSynchronizationEventHandler<S> {
+    /**
+     * A method that will handle the EndSynchronization events.
+     * @param source An object representing the event source. Identifies the Spreadsheet that raised the event.
+     * @param e A ASPxClientSpreadsheetSynchronizationEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientSpreadsheetSynchronizationEventArgs): void;
+}
+/**
+ * Provides data for the EndSynchronization events.
+ */
+interface ASPxClientSpreadsheetSynchronizationEventArgs extends ASPxClientEventArgs {
+}
+/**
+ * A method that will handle the HyperlinkClick event.
+ */
+interface ASPxClientSpreadsheetHyperlinkClickEventHandler<S> {
+    /**
+     * A method that will handle the HyperlinkClick event.
+     * @param source An object representing the event source. Identifies the Spreadsheet that raised the event.
+     * @param e An ASPxClientSpreadsheetHyperlinkClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientSpreadsheetHyperlinkClickEventArgs): void;
+}
+/**
+ * Provides data for the HyperlinkClick event.
+ */
+interface ASPxClientSpreadsheetHyperlinkClickEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets or sets a value that specifies whether the event is handled, and the default processing is not required.
+     * Value: true, if if the event is completely handled by custom code and no default processing is required; otherwise, false.
+     */
+    handled: boolean;
+    /**
+     * Gets a DHTML event object that relates to the processed event.
+     * Value: An object that maintains DHTML event-specific information.
+     */
+    htmlEvent: Object;
+    /**
+     * Gets a value identifying the clicked hyperlink type.
+     * Value: One of the <see cref="ASPxClientOfficeDocumentLinkType" /> values.
+     */
+    hyperlinkType: ASPxClientOfficeDocumentLinkType;
+    /**
+     * Gets the clicked link's URI.
+     * Value: A sting value specifying the link's URI.
+     */
+    targetUri: string;
+}
+/**
+ * A method that will handle the PopupMenuShowing event.
+ */
+interface ASPxClientSpreadsheetPopupMenuShowingEventHandler<S> {
+    /**
+     * A method that will handle the PopupMenuShowing event.
+     * @param source The event sender (typically an ASPxClientSpreadsheet object).
+     * @param e A ASPxClientSpreadsheetPopupMenuShowingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientSpreadsheetPopupMenuShowingEventArgs): void;
+}
+/**
+ * Provides data for the PopupMenuShowing event.
+ */
+interface ASPxClientSpreadsheetPopupMenuShowingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Provides access to a collection of menu items in the context menu being invoked.
+     * Value: A <see cref="ASPxClientSpreadsheetPopupMenuItemCollection" /> object representing the context menu's item collection.
+     */
+    menuItems: ASPxClientSpreadsheetPopupMenuItemCollection;
+    /**
+     * Gets the currently displayed context menu's type.
+     * Value: One of the <see cref="ASPxClientSpreadsheetPopupMenuType" /> enumeration values.
+     */
+    menuType: any;
+}
+/**
+ * A client-side equivalent of the ASPxSpreadsheet object.
+ */
+interface ASPxClientSpreadsheet extends ASPxClientControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientSpreadsheet>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientSpreadsheet>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientSpreadsheet.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientSpreadsheet>>;
+    /**
+     * Occurs on the client when a selection is changed in the ASPxSpreadsheet.
+     */
+    SelectionChanged: ASPxClientEvent<ASPxClientSpreadsheetSelectionChangedEventHandler<ASPxClientSpreadsheet>>;
+    /**
+     * Occurs after a custom command has been executed on the client side.
+     */
+    CustomCommandExecuted: ASPxClientEvent<ASPxClientSpreadsheetCustomCommandExecutedEventHandler<ASPxClientSpreadsheet>>;
+    /**
+     * Fires if any change is made to the Spreadsheet's document on the client.
+     */
+    DocumentChanged: ASPxClientEvent<ASPxClientSpreadsheetDocumentChangedEventHandler<ASPxClientSpreadsheet>>;
+    /**
+     * Fires after a client change has been made to the document and the client-server synchronization starts to apply the change on the server.
+     */
+    BeginSynchronization: ASPxClientEvent<ASPxClientSpreadsheetSynchronizationEventHandler<ASPxClientSpreadsheet>>;
+    /**
+     * Fires after a document change has been applied to the server and server and client document models have been synchronized.
+     */
+    EndSynchronization: ASPxClientEvent<ASPxClientSpreadsheetSynchronizationEventHandler<ASPxClientSpreadsheet>>;
+    /**
+     * Occurs on the client side after a hyperlink is clicked within the Spreadsheet's document.
+     */
+    HyperlinkClick: ASPxClientEvent<ASPxClientSpreadsheetHyperlinkClickEventHandler<ASPxClientSpreadsheet>>;
+    /**
+     * Occurs before the context menu is displayed and allows menu customization.
+     */
+    PopupMenuShowing: ASPxClientEvent<ASPxClientSpreadsheetPopupMenuShowingEventHandler<ASPxClientSpreadsheet>>;
+    /**
+     * Sets input focus to the Spreadsheet.
+     */
+    Focus(): void;
+    /**
+     * Gets access to the client ribbon object.
+     */
+    GetRibbon(): ASPxClientRibbon;
+    /**
+     * Enables you to switch the full-screen mode of the Spreadsheet.
+     * @param fullscreen true to activate full-screen mode; false to deactivate full-screen mode.
+     */
+    SetFullscreenMode(fullscreen: boolean): void;
+    /**
+     * Returns the current selection made in a Spreadsheet.
+     */
+    GetSelection(): ASPxClientSpreadsheetSelection;
+    /**
+     * Indicates whether any unsaved changes are contained in the current document.
+     */
+    HasUnsavedChanges(): boolean;
+    /**
+     * Gets the value of the specified cell.
+     * @param colModelIndex An integer value specifying the cell's column index.
+     * @param rowModelIndex An integer value specifying the cell's row index.
+     */
+    GetCellValue(colModelIndex: number, rowModelIndex: number): Object;
+    /**
+     * Returns the comment associated with the specified data cell.
+     * @param colModelIndex An integer value specifying the data cell's column index.
+     * @param rowModelIndex An integer value specifying the data cell's row index.
+     */
+    GetCellComment(colModelIndex: number, rowModelIndex: number): Object;
+    /**
+     * Gets the value of the currently active cell.
+     */
+    GetActiveCellValue(): Object;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side DocumentCallback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side DocumentCallback event.
+     */
+    PerformDocumentCallback(parameter: string): void;
+    /**
+     * Reconnects the Spreadsheet to an external ribbon.
+     */
+    ReconnectToExternalRibbon(): void;
+}
+/**
+ * A method that will handle the client SelectionChanged event.
+ */
+interface ASPxClientSpreadsheetSelectionChangedEventHandler<S> {
+    /**
+     * A method that will handle the SelectionChanged event.
+     * @param source An object representing the event source. Identifies the button editor that raised the event.
+     * @param e An ASPxClientSpreadsheetSelectionChangedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientSpreadsheetSelectionChangedEventArgs): void;
+}
+/**
+ * Provides data for the SelectionChanged event.
+ */
+interface ASPxClientSpreadsheetSelectionChangedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets an object that determines the currently selected region within the Spreadsheet.
+     * Value: A <see cref="ASPxClientSpreadsheetSelection" /> object defining the current selection.
+     */
+    selection: ASPxClientSpreadsheetSelection;
+}
+/**
+ * Represents the selection in the Spreadsheet.
+ */
+interface ASPxClientSpreadsheetSelection {
+    /**
+     * Gets the column index of the active cell.
+     * Value: An integer value specifying the active cell column index.
+     */
+    activeCellColumnIndex: number;
+    /**
+     * Gets the row index of the active cell.
+     * Value: An integer value specifying the active cell row index.
+     */
+    activeCellRowIndex: number;
+    /**
+     * Gets the index of the selection's left column.
+     * Value: An integer value specifying the index of the left column within the selection.
+     */
+    leftColumnIndex: number;
+    /**
+     * Gets the index of the selection's top row.
+     * Value: An integer value specifying the index of the top row within the selection.
+     */
+    topRowIndex: number;
+    /**
+     * Gets the index of the selection's right column.
+     * Value: An integer value specifying the index of the right column within the selection.
+     */
+    rightColumnIndex: number;
+    /**
+     * Gets the index of the selection's bottom row.
+     * Value: An integer value specifying the index of the bottom row within the selection.
+     */
+    bottomRowIndex: number;
+}
+/**
+ * Represents an individual item of the Spreadsheet's context menu.
+ */
+interface ASPxClientSpreadsheetPopupMenuItem {
+    /**
+     * Gets the immediate parent menu item to which the current menu item belongs.
+     * Value: A ASPxClientSpreadsheetPopupMenuItem object representing the menu item's immediate parent.
+     */
+    parent: ASPxClientSpreadsheetPopupMenuItem;
+    /**
+     * Gets or sets the unique identifier name for the current menu item.
+     * Value: A string value that specifies the item's unique identifier name.
+     */
+    name: string;
+    /**
+     * Gets or sets the text content of the current menu item.
+     * Value: A string value that specifies the text content of the menu item.
+     */
+    text: string;
+    /**
+     * Gets or sets a value that indicates whether the menu item is enabled, allowing the item to respond to end-user interactions.
+     * Value: true if the item is enabled; otherwise, false.
+     */
+    enabled: boolean;
+    /**
+     * Gets or sets the CSS class name defining the menu item's image.
+     * Value: A string value specifying the class name.
+     */
+    imageClassName: string;
+    /**
+     * Gets or sets an URL which defines the navigation location.
+     * Value: A string value which represents an URL where the client web browser will navigate.
+     */
+    navigateUrl: string;
+    /**
+     * Gets or sets the URL of the menu item's image.
+     * Value: A string value that specifies the location of an image.
+     */
+    imageUrl: string;
+    /**
+     * Gets or sets a value that specifies whether the current menu item starts a group.
+     * Value: true if the current menu item starts a group; otherwise, false.
+     */
+    beginGroup: boolean;
+    /**
+     * Gets or sets the current menu item's tooltip text.
+     * Value: A string which specifies the text content of the current menu item's tooltip.
+     */
+    tooltip: string;
+    /**
+     * Gets or sets the window or frame at which to target the contents of the URL associated with the current menu item.
+     * Value: A string which identifies the window or frame at which to target the URL content.
+     */
+    target: string;
+    /**
+     * Gets a collection that contains the submenu items of the current menu item.
+     */
+    GetSubItems(): ASPxClientSpreadsheetPopupMenuItemCollection;
+    /**
+     * Returns the menu item's sub-item with the specified index.
+     * @param index An integer value specifying the index of the sub-item within a collection of the current menu item's submenu items.
+     */
+    GetItem(index: number): ASPxClientSpreadsheetPopupMenuItem;
+    /**
+     * Returns the menu item's sub-item with the specified name property value.
+     * @param name A string value specifying the name property value of the sub-item to find.
+     */
+    GetItemByName(name: string): ASPxClientSpreadsheetPopupMenuItem;
+    /**
+     * Returns the total number of the menu item's child items (submenu items).
+     */
+    GetItemCount(): number;
+}
+/**
+ * Represents a collection of items in the Spreadhseet's context menu.
+ */
+interface ASPxClientSpreadsheetPopupMenuItemCollection {
+    /**
+     * Adds the specified menu item to the end of the collection.
+     * @param item An ASPxClientSpreadsheetPopupMenuItem object specifying the item to be added to the collection.
+     */
+    Add(item: ASPxClientSpreadsheetPopupMenuItem): void;
+    /**
+     * Removes a menu item specified by its index within the collection.
+     * @param index An integer value specifying the index of the menu item to remove.
+     */
+    Remove(index: number): void;
+    /**
+     * Removes a menu item specified by its name.
+     * @param name A string value specifying the name property value of a menu item to remove from the collection.
+     */
+    RemoveByName(name: string): void;
+    /**
+     * Adds the specified item to the specified position within the collection.
+     * @param index An integer value that specifies the zero-based index at which the specified item should be inserted.
+     * @param item An ASPxClientSpreadsheetPopupMenuItem object to insert.
+     */
+    Insert(index: number, item: ASPxClientSpreadsheetPopupMenuItem): void;
+    /**
+     * Returns the total number of menu items in the collection.
+     */
+    GetCount(): number;
+    /**
+     * Returns an item object with the specified name property value.
+     * @param name A string value representing the name property value of the required item.
+     */
+    GetByName(name: string): ASPxClientSpreadsheetPopupMenuItem;
+    /**
+     * Returns a menu item specified by its index in the collection.
+     * @param index An integer value that is the zero-based index of the <see cref="ASPxClientSpreadsheetPopupMenuItem" /> to retrieve from the ASPxClientSpreadsheetPopupMenuItemCollection.
+     */
+    Get(index: number): ASPxClientSpreadsheetPopupMenuItem;
+    /**
+     * Removes all menu items from the collection.
+     */
+    Clear(): void;
+}
+/**
+ * Represents the client ASPxTreeList.
+ */
+interface ASPxClientTreeList extends ASPxClientControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientTreeList>>;
+    /**
+     * Occurs on the client after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientTreeList>>;
+    /**
+     * Fires on the client if any unhandled server error occurs during server-side processing of a callback sent by the ASPxClientTreeList.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientTreeList>>;
+    /**
+     * Enables you to display a context menu.
+     */
+    ContextMenu: ASPxClientEvent<ASPxClientTreeListContextMenuEventHandler<ASPxClientTreeList>>;
+    /**
+     * Occurs when a custom command button has been clicked.
+     */
+    CustomButtonClick: ASPxClientEvent<ASPxClientTreeListCustomButtonEventHandler<ASPxClientTreeList>>;
+    /**
+     * Fires after a toolbar item has been clicked.
+     */
+    ToolbarItemClick: ASPxClientEvent<ASPxClientTreeListToolbarItemClickEventHandler<ASPxClientTreeList>>;
+    /**
+     * Fires before the focused node has been changed.
+     */
+    NodeFocusing: ASPxClientEvent<ASPxClientTreeListNodeEventHandler<ASPxClientTreeList>>;
+    /**
+     * Fires in response to changing node focus.
+     */
+    FocusedNodeChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientTreeList>>;
+    /**
+     * Fires after the selection has been changed via end-user interaction.
+     */
+    SelectionChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientTreeList>>;
+    /**
+     * Fires after the Customization Window has been closed.
+     */
+    CustomizationWindowCloseUp: ASPxClientEvent<ASPxClientEventHandler<ASPxClientTreeList>>;
+    /**
+     * Fires after the callback has been processed in the CustomDataCallback event handler.
+     */
+    CustomDataCallback: ASPxClientEvent<ASPxClientTreeListCustomDataCallbackEventHandler<ASPxClientTreeList>>;
+    /**
+     * Fires on the client when a node is clicked.
+     */
+    NodeClick: ASPxClientEvent<ASPxClientTreeListNodeEventHandler<ASPxClientTreeList>>;
+    /**
+     * Fires on the client when a node is double clicked.
+     */
+    NodeDblClick: ASPxClientEvent<ASPxClientTreeListNodeEventHandler<ASPxClientTreeList>>;
+    /**
+     * Fires before a node is expanded.
+     */
+    NodeExpanding: ASPxClientEvent<ASPxClientTreeListNodeEventHandler<ASPxClientTreeList>>;
+    /**
+     * Fires before a node is collapsed.
+     */
+    NodeCollapsing: ASPxClientEvent<ASPxClientTreeListNodeEventHandler<ASPxClientTreeList>>;
+    /**
+     * Occurs before a node is dragged by an end-user.
+     */
+    StartDragNode: ASPxClientEvent<ASPxClientTreeListStartDragNodeEventHandler<ASPxClientTreeList>>;
+    /**
+     * Occurs after a node drag and drop operation is completed.
+     */
+    EndDragNode: ASPxClientEvent<ASPxClientTreeListEndDragNodeEventHandler<ASPxClientTreeList>>;
+    /**
+     * Enables you to prevent columns from being resized.
+     */
+    ColumnResizing: ASPxClientEvent<ASPxClientTreeListColumnResizingEventHandler<ASPxClientTreeList>>;
+    /**
+     * Occurs after a column's width has been changed by an end-user.
+     */
+    ColumnResized: ASPxClientEvent<ASPxClientTreeListColumnResizedEventHandler<ASPxClientTreeList>>;
+    /**
+     * Sets input focus to the ASPxTreeList.
+     */
+    Focus(): void;
+    /**
+     * Gets the Popup Edit Form.
+     */
+    GetPopupEditForm(): ASPxClientPopupControl;
+    /**
+     * Returns a toolbar specified by its name.
+     * @param name A string value specifying the toolbar name.
+     */
+    GetToolbarByName(name: string): ASPxClientMenu;
+    /**
+     * Returns a toolbar specified by its index.
+     * @param index An integer value specifying the zero-based index of the toolbar object to retrieve.
+     */
+    GetToolbar(index: number): ASPxClientMenu;
+    /**
+     * Returns the focused node's key value.
+     */
+    GetFocusedNodeKey(): string;
+    /**
+     * Moves focus to the specified node.
+     * @param key A String value that uniquely identifies the node.
+     */
+    SetFocusedNodeKey(key: string): void;
+    /**
+     * Indicates whether the specified node is selected.
+     * @param nodeKey A String value that identifies the node by its key value.
+     */
+    IsNodeSelected(nodeKey: string): any;
+    /**
+     * Selects the specified node.
+     * @param nodeKey A string value that identifies the node.
+     */
+    SelectNode(nodeKey: string): void;
+    /**
+     * Selects or deselects the specified node.
+     * @param nodeKey A string value that identifies the node.
+     * @param state true to select the node; otherwise, false.
+     */
+    SelectNode(nodeKey: string, state: boolean): void;
+    /**
+     * Obtains key values of selected nodes that are displayed within the current page.
+     */
+    GetVisibleSelectedNodeKeys(): string[];
+    /**
+     * Indicates whether the Customization Window is displayed.
+     */
+    IsCustomizationWindowVisible(): boolean;
+    /**
+     * Invokes the Customization Window.
+     */
+    ShowCustomizationWindow(): void;
+    /**
+     * Invokes the Customization Window and displays it over the specified HTML element.
+     * @param htmlElement An object that specifies the HTML element relative to whose position the customization window is invoked.
+     */
+    ShowCustomizationWindow(htmlElement: Object): void;
+    /**
+     * Closes the Customization Window.
+     */
+    HideCustomizationWindow(): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param arg A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCustomCallback(arg: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(args: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(args: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomDataCallback event passing it the specified argument.
+     * @param arg A string value that represents any information that needs to be sent to the server-side CustomDataCallback event.
+     */
+    PerformCustomDataCallback(arg: string): void;
+    /**
+     * Obtains specified data source field values within a specified node, and submits them to the specified JavaScript function.
+     * @param nodeKey A string value that identifies the node.
+     * @param fieldNames A string value that contains the names of data source fields whose values within the specified node are returned. The field names should be separated by ';'.
+     * @param onCallback A ASPxClientTreeListValuesCallback object that represents the JavaScript function which receives the list of values as a parameter.
+     */
+    GetNodeValues(nodeKey: string, fieldNames: string, onCallback: ASPxClientTreeListValuesCallback): void;
+    /**
+     * Obtains specified data source field values within a specified node, and submits them to the specified JavaScript function.
+     * @param nodeKey A string value that identifies the node.
+     * @param fieldNames The names of data source fields whose values within the specified node are returned.
+     * @param onCallback A ASPxClientTreeListValuesCallback object that represents the JavaScript function which receives the list of values as a parameter.
+     */
+    GetNodeValues(nodeKey: string, fieldNames: string[], onCallback: ASPxClientTreeListValuesCallback): void;
+    /**
+     * Obtains specified data source field values within nodes that are displayed within the current page, and submits them to the specified JavaScript function.
+     * @param fieldNames A string value that contains the names of data source fields whose values within visible nodes are returned. The field names should be separated by ';'.
+     * @param onCallback A ASPxClientTreeListValuesCallback object that represents the JavaScript function which receives the list of values as a parameter.
+     */
+    GetVisibleNodeValues(fieldNames: string, onCallback: ASPxClientTreeListValuesCallback): void;
+    /**
+     * Obtains specified data source field values within nodes that are displayed within the current page, and submits them to the specified JavaScript function.
+     * @param fieldNames The names of data source fields whose values within visible nodes are returned.
+     * @param onCallback A ASPxClientTreeListValuesCallback object that represents the JavaScript function which receives the list of values as a parameter.
+     */
+    GetVisibleNodeValues(fieldNames: string[], onCallback: ASPxClientTreeListValuesCallback): void;
+    /**
+     * Obtains specified data source field values within selected nodes, and submits them to the specified JavaScript function.
+     * @param fieldNames A string value that contains the names of data source fields whose values within selected nodes are returned. The field names should be separated by ';'.
+     * @param onCallback A ASPxClientTreeListValuesCallback object that represents the JavaScript function which receives the list of values as a parameter.
+     */
+    GetSelectedNodeValues(fieldNames: string, onCallback: ASPxClientTreeListValuesCallback): void;
+    /**
+     * Obtains specified data source field values within selected nodes, and submits them to the specified JavaScript function.
+     * @param fieldNames The names of data source fields whose values within selected nodes are returned.
+     * @param onCallback A ASPxClientTreeListValuesCallback object that represents the JavaScript function which receives the list of values as a parameter.
+     */
+    GetSelectedNodeValues(fieldNames: string[], onCallback: ASPxClientTreeListValuesCallback): void;
+    /**
+     * Obtains specified data source field values within selected nodes, and submits them to the specified JavaScript function.
+     * @param fieldNames A string value that contains the names of data source fields whose values within selected nodes are returned. The field names should be separated by ';'.
+     * @param onCallback A ASPxClientTreeListValuesCallback object that represents the JavaScript function which receives the list of values as a parameter.
+     * @param visibleOnly true to return values within selected nodes that are displayed within the current page; false to return values within all selected nodes.
+     */
+    GetSelectedNodeValues(fieldNames: string, onCallback: ASPxClientTreeListValuesCallback, visibleOnly: boolean): void;
+    /**
+     * Obtains specified data source field values within selected nodes, and submits them to the specified JavaScript function.
+     * @param fieldNames The names of data source fields whose values within selected nodes are returned.
+     * @param onCallback A ASPxClientTreeListValuesCallback object that represents the JavaScript function which receives the list of values as a parameter.
+     * @param visibleOnly true to return values within selected nodes that are displayed within the current page; false to return values within all selected nodes.
+     */
+    GetSelectedNodeValues(fieldNames: string[], onCallback: ASPxClientTreeListValuesCallback, visibleOnly: boolean): void;
+    /**
+     * Selects the specified page.
+     * @param index An integer value that specifies the active page's index.
+     */
+    GoToPage(index: number): void;
+    /**
+     * Activates the previous page.
+     */
+    PrevPage(): void;
+    /**
+     * Activates the next page.
+     */
+    NextPage(): void;
+    /**
+     * Gets the index of the page currently being selected.
+     */
+    GetPageIndex(): number;
+    /**
+     * Gets the number of pages to which the ASPxTreeList's data is divided.
+     */
+    GetPageCount(): number;
+    /**
+     * Returns the specified node's state.
+     * @param nodeKey A String value that identifies the node.
+     */
+    GetNodeState(nodeKey: string): string;
+    /**
+     * Expands all nodes.
+     */
+    ExpandAll(): void;
+    /**
+     * Collapses all Node.
+     */
+    CollapseAll(): void;
+    /**
+     * Expands the specified node preserving the collapsed state of child nodes.
+     * @param key A String value that uniquely identifies the node.
+     */
+    ExpandNode(key: string): void;
+    /**
+     * Collapses the specified node preserving the expanded state of child nodes.
+     * @param key A String value that uniquely identifies the node.
+     */
+    CollapseNode(key: string): void;
+    /**
+     * Obtains key values of nodes that are displayed within the current page.
+     */
+    GetVisibleNodeKeys(): string[];
+    /**
+     * Returns an HTML table row that represents the specified node.
+     * @param nodeKey A string value that identifies the node.
+     */
+    GetNodeHtmlElement(nodeKey: string): Object;
+    /**
+     * Returns the number of visible columns within the client ASPxTreeList.
+     */
+    GetVisibleColumnCount(): number;
+    /**
+     * Returns the number of columns within the client ASPxTreeList.
+     */
+    GetColumnCount(): number;
+    /**
+     * Returns the column located at the specified position within the Columns collection.
+     * @param index An integer value that identifies the column within the collection (the column's Index property value).
+     */
+    GetColumnByIndex(index: number): ASPxClientTreeListColumn;
+    /**
+     * Returns the column with the specified name.
+     * @param name A string value that specifies the column's name (the column's Name property value).
+     */
+    GetColumnByName(name: string): ASPxClientTreeListColumn;
+    /**
+     * Returns the client column which is bound to the specified data source field.
+     * @param fieldName A string value that specifies the name of the data source field to which the column is bound (the column's FieldName property value).
+     */
+    GetColumnByFieldName(fieldName: string): ASPxClientTreeListColumn;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     */
+    SortBy(columnIndex: number): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DESC' or 'NONE').
+     */
+    SortBy(columnIndex: number, sortOrder: string): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param columnIndex An integer value that specifies the column's position within the column collection.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DESC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     */
+    SortBy(columnIndex: number, sortOrder: string, reset: boolean): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param nameOrFieldName A String value that specifies the column's name or field name.
+     */
+    SortBy(nameOrFieldName: string): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param nameOrFieldName A String value that specifies the column's name or field name.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DESC' or 'NONE').
+     */
+    SortBy(nameOrFieldName: string, sortOrder: string): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param nameOrFieldName A String value that specifies the column's name or field name.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DESC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     */
+    SortBy(nameOrFieldName: string, sortOrder: string, reset: boolean): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param column An ASPxClientTreeListColumn object that represents the data column.
+     */
+    SortBy(column: ASPxClientTreeListColumn): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param column An ASPxClientTreeListColumn object that represents the data column.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DESC' or 'NONE').
+     */
+    SortBy(column: ASPxClientTreeListColumn, sortOrder: string): void;
+    /**
+     * Sorts data by the specified data column's values.
+     * @param column An ASPxClientTreeListColumn object that represents the data column.
+     * @param sortOrder A string value that specifies the column's sort order ('ASC', 'DESC' or 'NONE').
+     * @param reset true to clear any previous sorting; otherwise, false.
+     */
+    SortBy(column: ASPxClientTreeListColumn, sortOrder: string, reset: boolean): void;
+    /**
+     * Switches the ASPxTreeList to edit mode.
+     * @param nodeKey A string value that identifies the node by its key value.
+     */
+    StartEdit(nodeKey: string): void;
+    /**
+     * Saves all the changes made and switches the ASPxTreeList to browse mode.
+     */
+    UpdateEdit(): void;
+    /**
+     * Cancels all the changes made and switches the ASPxTreeList to browse mode.
+     */
+    CancelEdit(): void;
+    /**
+     * Indicates whether the ASPxTreeList is in edit mode.
+     */
+    IsEditing(): boolean;
+    /**
+     * Gets the key value of the node currently being edited.
+     */
+    GetEditingNodeKey(): string;
+    /**
+     * Moves the specified node to a new position.
+     * @param nodeKey A string value that identifies the target node by its key value.
+     * @param parentNodeKey A string value that identifies the node to whose child collection the target node is moved. An empty string to display the target node within the root.
+     */
+    MoveNode(nodeKey: string, parentNodeKey: string): void;
+    /**
+     * Deletes the specified node.
+     * @param nodeKey A string value that identifies the node.
+     */
+    DeleteNode(nodeKey: string): void;
+    /**
+     * Switches the ASPxTreeList to edit mode and allows new root node values to be edited.
+     */
+    StartEditNewNode(): void;
+    /**
+     * Switches the ASPxTreeList to edit mode and allows new node values to be edited.
+     * @param parentNodeKey A String value that identifies the parent node, which owns a new node.
+     */
+    StartEditNewNode(parentNodeKey: string): void;
+    /**
+     * Returns the editor used to edit the specified column's values.
+     * @param column An ASPxClientTreeListColumn object that represents the data column within the client ASPxTreeList.
+     */
+    GetEditor(column: ASPxClientTreeListColumn): Object;
+    /**
+     * Returns the editor used to edit the specified column's values.
+     * @param columnIndex An integer value that identifies the column by its position within the column collection.
+     */
+    GetEditor(columnIndex: number): Object;
+    /**
+     * Returns the editor used to edit the specified column's values.
+     * @param columnNameOrFieldName A String value that identifies the column by its name or field name.
+     */
+    GetEditor(columnNameOrFieldName: string): Object;
+    /**
+     * Returns the value of the specified edit cell.
+     * @param column An ASPxClientTreeListColumn object that represents the data column within the client ASPxTreeList.
+     */
+    GetEditValue(column: ASPxClientTreeListColumn): Object;
+    /**
+     * Returns the value of the specified edit cell.
+     * @param columnIndex An integer value that identifies the data column by its index within the ASPxTreeList's column collection.
+     */
+    GetEditValue(columnIndex: number): Object;
+    /**
+     * Returns the value of the specified edit cell.
+     * @param columnNameOrFieldName A String value that identifies the column by its name or field name.
+     */
+    GetEditValue(columnNameOrFieldName: string): Object;
+    /**
+     * Sets the value of the specified edit cell.
+     * @param column An ASPxClientTreeListColumn object that represents the data column within the client ASPxTreeList.
+     * @param value An object that specifies the edit cell's new value.
+     */
+    SetEditValue(column: ASPxClientTreeListColumn, value: Object): void;
+    /**
+     * Sets the value of the specified edit cell.
+     * @param columnIndex An integer value that identifies the data column by its index within the ASPxTreeList's column collection.
+     * @param value An object that specifies the edit cell's new value.
+     */
+    SetEditValue(columnIndex: number, value: Object): void;
+    /**
+     * Sets the value of the specified edit cell.
+     * @param columnNameOrFieldName A String value that identifies the column by its name or field name.
+     * @param value An object that specifies the edit cell's new value.
+     */
+    SetEditValue(columnNameOrFieldName: string, value: Object): void;
+    /**
+     * Moves focus to the specified editor within the edited node.
+     * @param column A ASPxClientTreeListColumn object that represents the data column within the client ASPxTreeList.
+     */
+    FocusEditor(column: ASPxClientTreeListColumn): void;
+    /**
+     * Moves focus to the specified editor within the edited node.
+     * @param columnIndex An integer value that identifies the data column.
+     */
+    FocusEditor(columnIndex: number): void;
+    /**
+     * Moves focus to the specified editor within the edited node.
+     * @param columnNameOrFieldName A String value that specifies the column's name or field name.
+     */
+    FocusEditor(columnNameOrFieldName: string): void;
+    /**
+     * Scrolls the tree list so that the specified node becomes visible.
+     * @param nodeKey An integer value that specifies the node index within the tree list's client item list.
+     */
+    MakeNodeVisible(nodeKey: string): void;
+    /**
+     * Returns the current vertical scroll position of the tree list's content.
+     */
+    GetVerticalScrollPosition(): number;
+    /**
+     * Returns the current horizontal scroll position of the tree list's content.
+     */
+    GetHorizontalScrollPosition(): number;
+    /**
+     * Specifies the vertical scroll position for the tree list's content.
+     * @param position An integer value specifying the vertical scroll position.
+     */
+    SetVerticalScrollPosition(position: number): void;
+    /**
+     * Specifies the horizontal scroll position for the tree list's content.
+     * @param position An integer value specifying the horizontal scroll position.
+     */
+    SetHorizontalScrollPosition(position: number): void;
+}
+/**
+ * Represents a client column.
+ */
+interface ASPxClientTreeListColumn {
+    /**
+     * Gets the column's position within the collection.
+     * Value: An integer zero-bazed index that specifies the column's position within the collection.
+     */
+    index: number;
+    /**
+     * Gets the name that uniquely identifies the column.
+     * Value: A string value assigned to the column's Name property.
+     */
+    name: string;
+    /**
+     * Gets the name of the database field assigned to the current column.
+     * Value: A String value that specifies the name of a data field.
+     */
+    fieldName: string;
+}
+/**
+ * Provides data for the CustomDataCallback event.
+ */
+interface ASPxClientTreeListCustomDataCallbackEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the information that has been collected on the client-side and sent to the  server-side CustomDataCallback event.
+     * Value: A string value that represents the information that has been collected on the client-side and sent to the server-side CustomDataCallback event.
+     */
+    arg: string;
+    /**
+     * Gets the information passed from the server-side CustomDataCallback event.
+     * Value: An object that represents the information passed from the server-side CustomDataCallback event.
+     */
+    result: Object;
+}
+/**
+ * A method that will handle the CustomDataCallback event.
+ */
+interface ASPxClientTreeListCustomDataCallbackEventHandler<S> {
+    /**
+     * A method that will handle the CustomDataCallback event.
+     * @param source The event source.
+     * @param e An ASPxClientTreeListCustomDataCallbackEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTreeListCustomDataCallbackEventArgs): void;
+}
+/**
+ * Provides data for the NodeDblClick events.
+ */
+interface ASPxClientTreeListNodeEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the processed node's key value.
+     * Value: A String value that identifies the processed node.
+     */
+    nodeKey: string;
+    /**
+     * Provides access to the parameters associated with the NodeDblClick events.
+     * Value: An object that contains parameters associated with the event.
+     */
+    htmlEvent: Object;
+    /**
+     * Gets or sets a value indicating whether the action which raised the event should be canceled.
+     * Value: true if the action that raised the event should be canceled; otherwise, false.
+     */
+    cancel: boolean;
+}
+/**
+ * A method that will handle the NodeDblClick event.
+ */
+interface ASPxClientTreeListNodeEventHandler<S> {
+    /**
+     * A method that will handle the NodeDblClick event.
+     * @param source The event source.
+     * @param e An ASPxClientTreeListNodeEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTreeListNodeEventArgs): void;
+}
+/**
+ * Provides data for the ContextMenu event.
+ */
+interface ASPxClientTreeListContextMenuEventArgs extends ASPxClientEventArgs {
+    /**
+     * Identifies which tree list element has been right-clicked.
+     * Value: A string value that identifies which tree list element ('Header' or 'Node') has been right-clicked.
+     */
+    objectType: string;
+    /**
+     * Gets a value that identifies the right-clicked object.
+     * Value: The right-clicked object's identifier.
+     */
+    objectKey: Object;
+    /**
+     * Gets a DHTML event object that relates to the processed event.
+     * Value: An object that relates to the processed event.
+     */
+    htmlEvent: Object;
+    /**
+     * Gets or sets whether to invoke the browser's context menu.
+     * Value: true to hide the browser's context menu; otherwise, false.
+     */
+    cancel: boolean;
+}
+/**
+ * A method that will handle the ContextMenu event.
+ */
+interface ASPxClientTreeListContextMenuEventHandler<S> {
+    /**
+     * A method that will handle the ContextMenu event.
+     * @param source The event sender.
+     * @param e An ASPxClientTreeListContextMenuEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTreeListContextMenuEventArgs): void;
+}
+/**
+ * Provides data for the StartDragNode event.
+ */
+interface ASPxClientTreeListStartDragNodeEventArgs extends ASPxClientTreeListNodeEventArgs {
+    /**
+     * Gets an array of targets where a node can be dragged.
+     * Value: An array of objects that represent targets for the dragged node.
+     */
+    targets: Object[];
+}
+/**
+ * A method that will handle the StartDragNode event.
+ */
+interface ASPxClientTreeListStartDragNodeEventHandler<S> {
+    /**
+     * A method that will handle the StartDragNode event.
+     * @param source The event source.
+     * @param e An ASPxClientTreeListStartDragNodeEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTreeListStartDragNodeEventArgs): void;
+}
+/**
+ * Provides data for the EndDragNode event.
+ */
+interface ASPxClientTreeListEndDragNodeEventArgs extends ASPxClientTreeListNodeEventArgs {
+    /**
+     * Gets the target element.
+     * Value: An object that represents the target element to which the dragged node has been dropped.
+     */
+    targetElement: Object;
+}
+/**
+ * A method that will handle the EndDragNode event.
+ */
+interface ASPxClientTreeListEndDragNodeEventHandler<S> {
+    /**
+     * A method that will handle the EndDragNode event.
+     * @param source The event source.
+     * @param e An ASPxClientTreeListEndDragNodeEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTreeListEndDragNodeEventArgs): void;
+}
+/**
+ * Provides data for the CustomButtonClick event.
+ */
+interface ASPxClientTreeListCustomButtonEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the key value of the node whose custom button has been clicked.
+     * Value: A string value that uniquely identifies the node whose custom button has been clicked.
+     */
+    nodeKey: string;
+    /**
+     * Gets the button's index.
+     * Value: An integer value that specifies the button's position within the CustomButtons collection.
+     */
+    buttonIndex: number;
+    /**
+     * Gets the value which identifies the custom button.
+     * Value: A String value that identifies the clicked custom button.
+     */
+    buttonID: string;
+}
+/**
+ * A method that will handle the CustomButtonClick event.
+ */
+interface ASPxClientTreeListCustomButtonEventHandler<S> {
+    /**
+     * A method that will handle the CustomButtonClick event.
+     * @param source The event source.
+     * @param e An ASPxClientTreeListCustomButtonEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTreeListCustomButtonEventArgs): void;
+}
+/**
+ * Represents a JavaScript function which receives the list of row values when a specific client method (such as the GetSelectedNodeValues) is called.
+ */
+interface ASPxClientTreeListValuesCallback {
+    /**
+     * A JavaScript function which receives the list of row values when a specific client method (such as the GetSelectedNodeValues) is called.
+     * @param result An object that represents the list of row values received from the server.
+     */
+    (result: Object): void;
+}
+/**
+ * Provides data for the ColumnResizing event.
+ */
+interface ASPxClientTreeListColumnResizingEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the processed client column.
+     * Value: An <see cref="ASPxClientTreeListColumn" /> object that is the processed column.
+     */
+    column: ASPxClientTreeListColumn;
+}
+/**
+ * A method that will handle the client ColumnResizing event.
+ */
+interface ASPxClientTreeListColumnResizingEventHandler<S> {
+    /**
+     * A method that will handle the ColumnResizing event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientTreeListColumnResizingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTreeListColumnResizingEventArgs): void;
+}
+/**
+ * Provides data for the ColumnResized event.
+ */
+interface ASPxClientTreeListColumnResizedEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the processed client column.
+     * Value: An <see cref="ASPxClientTreeListColumn" /> object that is the processed column.
+     */
+    column: ASPxClientTreeListColumn;
+}
+/**
+ * A method that will handle the client ColumnResized event.
+ */
+interface ASPxClientTreeListColumnResizedEventHandler<S> {
+    /**
+     * A method that will handle the ColumnResized event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientTreeListColumnResizedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTreeListColumnResizedEventArgs): void;
+}
+/**
+ * Provides data for the ToolbarItemClick event.
+ */
+interface ASPxClientTreeListToolbarItemClickEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the toolbar index related to the event.
+     * Value: An integer value that is the toolbar index.
+     */
+    toolbarIndex: number;
+    /**
+     * Gets the toolbar name.
+     * Value: A string object that is the toolbar name.
+     */
+    toolbarName: string;
+    /**
+     * Gets the toolbar item related to the event.
+     * Value: An ASPxClientMenuItem object that is the toolbar item.
+     */
+    item: ASPxClientMenuItem;
+    /**
+     * Specifies whether a postback or a callback is used to finally process the event on the server side.
+     * Value: true to perform the round trip to the server side via postback; false to perform the round trip to the server side via callback.
+     */
+    usePostBack: boolean;
+}
+/**
+ * A method that will handle the ToolbarItemClick event.
+ */
+interface ASPxClientTreeListToolbarItemClickEventHandler<S> {
+    /**
+     * A method that will handle the ToolbarItemClick event.
+     * @param source The event source.
+     * @param e An ASPxClientTreeListToolbarItemClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTreeListToolbarItemClickEventArgs): void;
+}
+/**
+ * Represents a client-side equivalent of the BootstrapAccordion control.
+ */
+interface BootstrapClientAccordion extends ASPxClientNavBar {
+}
+interface BootstrapClientBinaryImage extends ASPxClientHyperLink {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapButton control.
+ */
+interface BootstrapClientButton extends ASPxClientButton {
+    /**
+     * Returns the text displayed within the button.
+     */
+    GetText(): string;
+    /**
+     * Sets the text to be displayed within the button.
+     * @param value A string value specifying the text to be displayed within the button.
+     */
+    SetText(value: string): void;
+}
+/**
+ * Represents a client-side equivalent of the BootstrapCalendar control.
+ */
+interface BootstrapClientCalendar extends ASPxClientCalendar {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapCallbackPanel control.
+ */
+interface BootstrapClientCallbackPanel extends ASPxClientControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<BootstrapClientCallbackPanel>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<BootstrapClientCallbackPanel>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the BootstrapClientCallbackPanel.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<BootstrapClientCallbackPanel>>;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Returns the HTML code that specifies the contents of the control's window.
+     */
+    GetContentHtml(): string;
+    /**
+     * Sets the HTML markup specifying the contents of the control's window.
+     * @param html A string value that specifies the HTML markup.
+     */
+    SetContentHtml(html: string): void;
+    /**
+     * Sets a value specifying whether the callback panel is enabled.
+     * @param enabled true, to enable the callback panel; false to disable it.
+     */
+    SetEnabled(enabled: boolean): void;
+    /**
+     * Returns a value specifying whether a callback panel is enabled.
+     */
+    GetEnabled(): boolean;
+}
+/**
+ * Serves as the base type for the BootstrapClientPieChart objects.
+ */
+interface BootstrapClientChartBase extends ASPxClientControl {
+    Done: ASPxClientEvent<BootstrapClientChartBaseDoneEventHandler<BootstrapClientChartBase>>;
+    LegendClick: ASPxClientEvent<BootstrapClientChartBaseLegendClickEventHandler<BootstrapClientChartBase>>;
+    PointClick: ASPxClientEvent<BootstrapClientChartBasePointClickEventHandler<BootstrapClientChartBase>>;
+    PointHoverChanged: ASPxClientEvent<BootstrapClientChartBasePointHoverChangedEventHandler<BootstrapClientChartBase>>;
+    PointSelectionChanged: ASPxClientEvent<BootstrapClientChartBasePointSelectionChangedEventHandler<BootstrapClientChartBase>>;
+    TooltipHidden: ASPxClientEvent<BootstrapClientChartBaseTooltipHiddenEventHandler<BootstrapClientChartBase>>;
+    TooltipShown: ASPxClientEvent<BootstrapClientChartBaseTooltipShownEventHandler<BootstrapClientChartBase>>;
+    ArgumentAxisClick: ASPxClientEvent<BootstrapClientCoordinateSystemChartArgumentAxisClickEventHandler<BootstrapClientChartBase>>;
+    SeriesClick: ASPxClientEvent<BootstrapClientCoordinateSystemChartSeriesClickEventHandler<BootstrapClientChartBase>>;
+    SeriesHoverChanged: ASPxClientEvent<BootstrapClientCoordinateSystemChartSeriesHoverChangedEventHandler<BootstrapClientChartBase>>;
+    SeriesSelectionChanged: ASPxClientEvent<BootstrapClientCoordinateSystemChartSeriesSelectionChangedEventHandler<BootstrapClientChartBase>>;
+}
+/**
+ * Represents a client-side equivalent of the BootstrapChart control.
+ */
+interface BootstrapClientChart extends BootstrapClientChartBase {
+    ZoomStart: ASPxClientEvent<BootstrapClientChartZoomStartEventHandler<BootstrapClientChart>>;
+    ZoomEnd: ASPxClientEvent<BootstrapClientChartZoomEndEventHandler<BootstrapClientChart>>;
+}
+/**
+ * Represents a client-side equivalent of the BootstrapPolarChart control.
+ */
+interface BootstrapClientPolarChart extends BootstrapClientChartBase {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapPieChart control.
+ */
+interface BootstrapClientPieChart extends BootstrapClientChartBase {
+}
+interface BootstrapClientChartBaseDoneEventHandler<S> {
+    (source: S, e: BootstrapUIWidgetEventArgsBase): void;
+}
+interface BootstrapClientChartBaseLegendClickEventHandler<S> {
+    (source: S, e: BootstrapUIWidgetElementClickEventArgs): void;
+}
+interface BootstrapClientCoordinateSystemChartArgumentAxisClickEventHandler<S> {
+    (source: S, e: BootstrapUIWidgetElementClickEventArgs): void;
+}
+interface BootstrapClientChartBasePointClickEventHandler<S> {
+    (source: S, e: BootstrapUIWidgetElementClickEventArgs): void;
+}
+interface BootstrapClientChartBasePointHoverChangedEventHandler<S> {
+    (source: S, e: BootstrapUIWidgetElementActionEventArgs): void;
+}
+interface BootstrapClientChartBasePointSelectionChangedEventHandler<S> {
+    (source: S, e: BootstrapUIWidgetElementActionEventArgs): void;
+}
+interface BootstrapClientChartBaseTooltipHiddenEventHandler<S> {
+    (source: S, e: BootstrapUIWidgetElementActionEventArgs): void;
+}
+interface BootstrapClientChartBaseTooltipShownEventHandler<S> {
+    (source: S, e: BootstrapUIWidgetElementActionEventArgs): void;
+}
+interface BootstrapClientCoordinateSystemChartSeriesClickEventHandler<S> {
+    (source: S, e: BootstrapUIWidgetElementClickEventArgs): void;
+}
+interface BootstrapClientCoordinateSystemChartSeriesHoverChangedEventHandler<S> {
+    (source: S, e: BootstrapUIWidgetElementActionEventArgs): void;
+}
+interface BootstrapClientCoordinateSystemChartSeriesSelectionChangedEventHandler<S> {
+    (source: S, e: BootstrapUIWidgetElementActionEventArgs): void;
+}
+interface BootstrapClientChartZoomStartEventHandler<S> {
+    (source: S, e: BootstrapUIWidgetEventArgsBase): void;
+}
+interface BootstrapClientChartZoomEndEventHandler<S> {
+    (source: S, e: BootstrapClientChartZoomEndEventArgs): void;
+}
+interface BootstrapUIWidgetEventArgsBase extends ASPxClientEventArgs {
+    component: Object;
+    element: Object;
+}
+interface BootstrapClientChartZoomEndEventArgs extends BootstrapUIWidgetEventArgsBase {
+    rangeStart: Object;
+    rangeEnd: Object;
+}
+/**
+ * Represents a client-side equivalent of the BootstrapCheckBox control.
+ */
+interface BootstrapClientCheckBox extends ASPxClientEdit {
+    /**
+     * Occurs on the client side when the editor's checked state is changed.
+     */
+    CheckedChanged: ASPxClientEvent<ASPxClientProcessingModeEventHandler<BootstrapClientCheckBox>>;
+    /**
+     * Returns a value indicating whether the check box editor is checked.
+     */
+    GetChecked(): boolean;
+    /**
+     * Sets a value which specifies the checked status of the check box editor.
+     * @param isChecked 
+     */
+    SetChecked(isChecked: boolean): void;
+    /**
+     * Returns the text displayed within the editor.
+     */
+    GetText(): string;
+    /**
+     * Returns a value which specifies a check box checked state.
+     */
+    GetCheckState(): string;
+    /**
+     * Sets a value specifying the state of a check box.
+     * @param checkState 
+     */
+    SetCheckState(checkState: string): void;
+    /**
+     * Sets the text to be displayed within the editor.
+     * @param text 
+     */
+    SetText(text: string): void;
+}
+/**
+ * Represents a client-side equivalent of the BootstrapRadioButton control.
+ */
+interface BootstrapClientRadioButton extends BootstrapClientCheckBox {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapComboBox control.
+ */
+interface BootstrapClientComboBox extends ASPxClientComboBox {
+    /**
+     * Returns the combo box editor's selected item.
+     */
+    GetSelectedItem(): BootstrapClientListBoxItem;
+    /**
+     * Sets the combo box editor's selected item.
+     * @param item 
+     */
+    SetSelectedItem(item: BootstrapClientListBoxItem): void;
+    /**
+     * Returns an item specified by its index within the combo box editor's item collection.
+     * @param index 
+     */
+    GetItem(index: number): BootstrapClientListBoxItem;
+    /**
+     * Returns a combo box item by its text.
+     * @param text 
+     */
+    FindItemByText(text: string): BootstrapClientListBoxItem;
+    /**
+     * Returns a combo box item by its value.
+     * @param value 
+     */
+    FindItemByValue(value: Object): BootstrapClientListBoxItem;
+    /**
+     * Adds a new item to the editor, specifying the item's display text, and returns the index of the added item.
+     * @param texts An array of strings that specifies the item's display text. Array element positions relate to the positions of the corresponding fields within the editor's Fields collection.
+     */
+    AddItem(texts: string[]): number;
+    /**
+     * Adds a new item to the end of the control's items collection.
+     * @param texts 
+     * @param value 
+     */
+    AddItem(texts: string[], value: Object): number;
+    /**
+     * Adds a new item to the end of the control's items collection.
+     * @param texts 
+     * @param value 
+     * @param iconCssClass 
+     */
+    AddItem(texts: string[], value: Object, iconCssClass: string): number;
+    /**
+     * Adds a new item to the editor specifying the item's display text and returns the index of the added item.
+     * @param text 
+     */
+    AddItem(text: string): number;
+    /**
+     * Adds a new item to the editor specifying the item's display text and associated value, and returns the index of the added item.
+     * @param text 
+     * @param value 
+     */
+    AddItem(text: string, value: Object): number;
+    /**
+     * Adds a new item to the editor specifying the item's display text, associated value and displayed image, and returns the index of the added item.
+     * @param text 
+     * @param value 
+     * @param iconCssClass 
+     */
+    AddItem(text: string, value: Object, iconCssClass: string): number;
+    /**
+     * Adds a new item to the control's items collection at the specified index.
+     * @param index 
+     * @param texts 
+     * @param value 
+     * @param iconCssClass 
+     */
+    InsertItem(index: number, texts: string[], value: Object, iconCssClass: string): void;
+    /**
+     * Adds a new item to the control's items collection at the specified index.
+     * @param index 
+     * @param texts 
+     * @param value 
+     */
+    InsertItem(index: number, texts: string[], value: Object): void;
+    /**
+     * Adds a new item to the control's items collection at the specified index.
+     * @param index 
+     * @param texts 
+     */
+    InsertItem(index: number, texts: string[]): void;
+    /**
+     * Adds a new item to the control's items collection at the specified index.
+     * @param index 
+     * @param text 
+     * @param value 
+     * @param iconCssClass 
+     */
+    InsertItem(index: number, text: string, value: Object, iconCssClass: string): void;
+    /**
+     * Inserts a new item specified by its display text and associated value into the editor's item collection, at the position specified.
+     * @param index 
+     * @param text 
+     * @param value 
+     */
+    InsertItem(index: number, text: string, value: Object): void;
+    /**
+     * Inserts a new item specified by its display text into the editor's item collection, at the position specified.
+     * @param index 
+     * @param text 
+     */
+    InsertItem(index: number, text: string): void;
+    /**
+     * Sets the list editor's selected item.
+     * @param item An ASPxClientListEditItem object that specifies the item to select.
+     */
+    SetSelectedItem(item: ASPxClientListEditItem): void;
+}
+/**
+ * Represents a client-side equivalent of the BootstrapDateEdit control.
+ */
+interface BootstrapClientDateEdit extends ASPxClientDateEdit {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapDropDownEdit control.
+ */
+interface BootstrapClientDropDownEdit extends ASPxClientDropDownEdit {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapFormLayout control.
+ */
+interface BootstrapClientFormLayout extends ASPxClientFormLayout {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapHyperLink control.
+ */
+interface BootstrapClientHyperLink extends ASPxClientHyperLink {
+}
+interface BootstrapClientImage extends ASPxClientImage {
+}
+/**
+ * Represents the client-side equivalent of the BootstrapListEditItem object.
+ */
+interface BootstrapClientListBoxItem extends ASPxClientListEditItem {
+    /**
+     * This member is not in effect for this class. It is overridden only for the purpose of preventing it from appearing in Microsoft Visual Studio designer tools.
+     */
+    imageUrl: string;
+    iconCssClass: string;
+    /**
+     * 
+     * @param columnIndex 
+     */
+    GetColumnText(columnIndex: number): string;
+    /**
+     * 
+     * @param columnName 
+     */
+    GetColumnText(columnName: string): string;
+    /**
+     * 
+     * @param fieldIndex 
+     */
+    GetFieldText(fieldIndex: number): string;
+    /**
+     * 
+     * @param fieldName 
+     */
+    GetFieldText(fieldName: string): string;
+}
+/**
+ * Represents a client-side equivalent of the BootstrapListBox control.
+ */
+interface BootstrapClientListBox extends ASPxClientListBox {
+    /**
+     * Returns the list box editor's selected item.
+     */
+    GetSelectedItem(): BootstrapClientListBoxItem;
+    /**
+     * Sets the list box editor's selected item.
+     * @param item 
+     */
+    SetSelectedItem(item: BootstrapClientListBoxItem): void;
+    /**
+     * Returns an item specified by its index within the list box editor's item collection.
+     * @param index 
+     */
+    GetItem(index: number): BootstrapClientListBoxItem;
+    /**
+     * Returns an array of the list editor's selected items.
+     */
+    GetSelectedItems(): BootstrapClientListBoxItem[];
+    /**
+     * Selects the specified items within a list box.
+     * @param items 
+     */
+    SelectItems(items: BootstrapClientListBoxItem[]): void;
+    /**
+     * Unselects an array of the specified list box items.
+     * @param items 
+     */
+    UnselectItems(items: BootstrapClientListBoxItem[]): void;
+    /**
+     * Returns a list box item by its text.
+     * @param text 
+     */
+    FindItemByText(text: string): BootstrapClientListBoxItem;
+    /**
+     * Returns a list box item by its value.
+     * @param value 
+     */
+    FindItemByValue(value: Object): BootstrapClientListBoxItem;
+    /**
+     * Adds a new item to the end of the editor's items collection, specifying the item's display text, and returns the index of the added item.
+     * @param texts 
+     */
+    AddItem(texts: string[]): number;
+    /**
+     * Adds a new item to the end of the control's items collection.
+     * @param texts 
+     * @param value 
+     */
+    AddItem(texts: string[], value: Object): number;
+    /**
+     * Adds a new item to the end of the control's items collection.
+     * @param texts 
+     * @param value 
+     * @param iconCssClass 
+     */
+    AddItem(texts: string[], value: Object, iconCssClass: string): number;
+    /**
+     * Adds a new item to the editor, specifying the item's display text, and returns the index of the added item.
+     * @param text 
+     */
+    AddItem(text: string): number;
+    /**
+     * Adds a new item to the editor, specifying the item's display text and associated value, and returns the index of the added item.
+     * @param text 
+     * @param value 
+     */
+    AddItem(text: string, value: Object): number;
+    /**
+     * Adds a new item to the editor, specifying the item's display text, associated value and displayed image, and returns the index of the added item.
+     * @param text 
+     * @param value 
+     * @param iconCssClass 
+     */
+    AddItem(text: string, value: Object, iconCssClass: string): number;
+    /**
+     * Adds a new item to the control's items collection at the specified index.
+     * @param index 
+     * @param texts 
+     * @param value 
+     * @param iconCssClass 
+     */
+    InsertItem(index: number, texts: string[], value: Object, iconCssClass: string): void;
+    /**
+     * Adds a new item to the control's items collection at the specified index.
+     * @param index 
+     * @param texts 
+     * @param value 
+     */
+    InsertItem(index: number, texts: string[], value: Object): void;
+    /**
+     * Adds a new item to the control's items collection at the specified index.
+     * @param index 
+     * @param texts 
+     */
+    InsertItem(index: number, texts: string[]): void;
+    /**
+     * Inserts a new item specified by its display text, associated value and displayed image into the editor's item collection, at the position specified.
+     * @param index 
+     * @param text 
+     * @param value 
+     * @param iconCssClass 
+     */
+    InsertItem(index: number, text: string, value: Object, iconCssClass: string): void;
+    /**
+     * Inserts a new item specified by its display text and associated value into the editor's item collection, at the position specified.
+     * @param index 
+     * @param text 
+     * @param value 
+     */
+    InsertItem(index: number, text: string, value: Object): void;
+    /**
+     * Inserts a new item specified by its display text into the editor's item collection, at the position specified.
+     * @param index 
+     * @param text 
+     */
+    InsertItem(index: number, text: string): void;
+    /**
+     * Selects the specified items within a list box.
+     * @param items An array of ASPxClientListEditItem objects that represent the items.
+     */
+    SelectItems(items: ASPxClientListEditItem[]): void;
+    /**
+     * Unselects an array of the specified list box items.
+     * @param items An array of ASPxClientListEditItem objects that represent the items.
+     */
+    UnselectItems(items: ASPxClientListEditItem[]): void;
+    /**
+     * Sets the list editor's selected item.
+     * @param item An ASPxClientListEditItem object that specifies the item to select.
+     */
+    SetSelectedItem(item: ASPxClientListEditItem): void;
+}
+/**
+ * Represents a client-side equivalent of the BootstrapCheckBoxList control.
+ */
+interface BootstrapClientCheckBoxList extends ASPxClientCheckBoxList {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapRadioButtonList control.
+ */
+interface BootstrapClientRadioButtonList extends ASPxClientRadioButtonList {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapMenu control.
+ */
+interface BootstrapClientMenu extends ASPxClientMenu {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapPager control.
+ */
+interface BootstrapClientPager extends ASPxClientPager {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapPopupControl control.
+ */
+interface BootstrapClientPopupControl extends ASPxClientPopupControl {
+    /**
+     * 
+     * @param selector 
+     */
+    SetPopupElementCssSelector(selector: string): void;
+}
+/**
+ * Represents a client-side equivalent of the BootstrapPopupMenu control.
+ */
+interface BootstrapClientPopupMenu extends ASPxClientPopupMenu {
+    /**
+     * 
+     * @param selector 
+     */
+    SetPopupElementCssSelector(selector: string): void;
+}
+/**
+ * Represents a client-side equivalent of the BootstrapProgressBar control.
+ */
+interface BootstrapClientProgressBar extends ASPxClientProgressBar {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapSpinEdit control.
+ */
+interface BootstrapClientSpinEdit extends ASPxClientSpinEdit {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapTabControl control.
+ */
+interface BootstrapClientTabControl extends ASPxClientTabControl {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapPageControl control.
+ */
+interface BootstrapClientPageControl extends ASPxClientPageControl {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapTextBox control.
+ */
+interface BootstrapClientTextBox extends ASPxClientTextBox {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapMemo control.
+ */
+interface BootstrapClientMemo extends ASPxClientMemo {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapButtonEdit control.
+ */
+interface BootstrapClientButtonEdit extends ASPxClientButtonEdit {
+}
+/**
+ * Represents a client-side equivalent of the BootstrapTreeView control.
+ */
+interface BootstrapClientTreeView extends ASPxClientTreeView {
+}
+interface BootstrapUIWidgetBase extends ASPxClientControl {
+    Init: ASPxClientEvent<BootstrapUIWidgetInitializedEventHandler<BootstrapUIWidgetBase>>;
+    Drawn: ASPxClientEvent<BootstrapUIWidgetDrawnEventHandler<BootstrapUIWidgetBase>>;
+    Disposing: ASPxClientEvent<BootstrapUIWidgetDisposingEventHandler<BootstrapUIWidgetBase>>;
+    OptionChanged: ASPxClientEvent<BootstrapUIWidgetOptionChangedEventHandler<BootstrapUIWidgetBase>>;
+    Exporting: ASPxClientEvent<BootstrapUIWidgetExportingEventHandler<BootstrapUIWidgetBase>>;
+    Exported: ASPxClientEvent<BootstrapUIWidgetExportedEventHandler<BootstrapUIWidgetBase>>;
+    FileSaving: ASPxClientEvent<BootstrapUIWidgetFileSavingEventHandler<BootstrapUIWidgetBase>>;
+    IncidentOccurred: ASPxClientEvent<BootstrapUIWidgetErrorEventHandler<BootstrapUIWidgetBase>>;
+    GetInstance(): Object;
+    SetOptions(options: Object): void;
+    SetDataSource(dataSource: Object): void;
+    GetDataSource(): Object;
+    ExportTo(format: string, fileName: string): void;
+    Print(): void;
+}
+interface BootstrapUIWidgetInitializedEventHandler<S> {
+    (source: S, e: BootstrapUIWidgetEventArgsBase): void;
+}
+interface BootstrapUIWidgetDrawnEventHandler<S> {
+    (source: S, e: BootstrapUIWidgetEventArgsBase): void;
+}
+interface BootstrapUIWidgetDisposingEventHandler<S> {
+    (source: S, e: BootstrapUIWidgetEventArgsBase): void;
+}
+interface BootstrapUIWidgetExportedEventHandler<S> {
+    (source: S, e: BootstrapUIWidgetEventArgsBase): void;
+}
+interface BootstrapUIWidgetOptionChangedEventHandler<S> {
+    (source: S, e: BootstrapUIWidgetOptionChangedEventArgs): void;
+}
+interface BootstrapUIWidgetOptionChangedEventArgs extends BootstrapUIWidgetEventArgsBase {
+    fullName: string;
+    name: string;
+    previousValue: Object;
+    value: Object;
+}
+interface BootstrapUIWidgetExportingEventHandler<S> {
+    (source: S, e: BootstrapUIWidgetExportEventArgs): void;
+}
+interface BootstrapUIWidgetFileSavingEventHandler<S> {
+    (source: S, e: BootstrapUIWidgetExportEventArgs): void;
+}
+interface BootstrapUIWidgetExportEventArgs extends BootstrapUIWidgetEventArgsBase {
+    cancel: boolean;
+    data: Object;
+    fileName: string;
+    format: string;
+}
+interface BootstrapUIWidgetErrorEventHandler<S> {
+    (source: S, e: BootstrapUIWidgetErrorEventArgs): void;
+}
+interface BootstrapUIWidgetErrorEventArgs extends BootstrapUIWidgetEventArgsBase {
+    target: Object;
+}
+interface BootstrapUIWidgetElementActionEventArgs extends BootstrapUIWidgetEventArgsBase {
+    target: Object;
+}
+interface BootstrapUIWidgetElementClickEventArgs extends BootstrapUIWidgetElementActionEventArgs {
+    jQueryEvent: Object;
+}
+/**
+ * Represents a client-side equivalent of the BootstrapUploadControl.
+ */
+interface BootstrapClientUploadControl extends ASPxClientUploadControl {
+}
+interface BootstrapClientGridView extends ASPxClientGridView {
+}
+/**
+ * A client-side counterpart of the Calendar and CalendarFor extensions.
+ */
+interface MVCxClientCalendar extends ASPxClientCalendar {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientCalendar>>;
+}
+/**
+ * A client-side counterpart of the CallbackPanel extension.
+ */
+interface MVCxClientCallbackPanel extends ASPxClientCallbackPanel {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientCallbackPanel>>;
+    /**
+     * Sends a callback with a parameter to update the Callback Panel by processing the passed information on the server, in an Action specified by the Callback Panel's CallbackRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the Callback Panel by processing the passed information on the server, in an Action specified by the Callback Panel's CallbackRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * A client-side counterpart of the CardView extension.
+ */
+interface MVCxClientCardView extends ASPxClientCardView {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientCardView>>;
+    /**
+     * Sends a callback with a parameter to update the CardView by processing the passed information on the server, in an Action specified via the CardView's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CardView's CustomActionRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the CardView by processing the passed information on the server, in an Action specified via the CardView's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CardView's CustomActionRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback with a parameter to process the passed information on the server, in an Action specified via the CardView's CustomDataActionRouteValues property, and then process the returned result in the specified client function. This method does not update the CardView.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomDataActionRouteValues property.
+     * @param onCallback A ASPxClientCardViewValuesCallback object that represents the JavaScript function which receives the information on the client side.
+     */
+    GetValuesOnCustomCallback(data: Object, onCallback: ASPxClientCardViewValuesCallback): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(args: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side event, passing the specified argument to it.
+     * @param args A string value that represents any information that needs to be sent to the server-side event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(args: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomDataCallback event.
+     * @param args A string value that is any information that needs to be sent to the server-side CustomDataCallback event.
+     * @param onCallback An ASPxClientCardViewValuesCallback object that is the JavaScript function which receives the information on the client side.
+     */
+    GetValuesOnCustomCallback(args: string, onCallback: ASPxClientCardViewValuesCallback): void;
+}
+/**
+ * A client-side counterpart of the Chart extension.
+ */
+interface MVCxClientChart extends ASPxClientWebChartControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientChart>>;
+    /**
+     * Sends a callback with a parameter to update a Chart by processing the passed information on the server, in an Action specified via the Chart's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomActionRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update a Chart by processing the passed information on the server, in an Action specified via the Chart's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomActionRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side event.
+     */
+    PerformCallback(args: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(args: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * A client-side counterpart of the ComboBox and ComboBoxFor extensions.
+ */
+interface MVCxClientComboBox extends ASPxClientComboBox {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientComboBox>>;
+    /**
+     * Sends a callback with a parameter to update the ComboBox by processing the passed information on the server, in an Action specified by the ComboBox's CallbackRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the ComboBox by processing the passed information on the server, in an Action specified by the ComboBox's CallbackRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     */
+    PerformCallback(parameter: string): void;
+}
+/**
+ * A client-side counterpart of the DataView extension.
+ */
+interface MVCxClientDataView extends ASPxClientDataView {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientDataView>>;
+    /**
+     * Sends a callback with a parameter to update the DataView by processing the passed information on the server, in an Action specified via the DataView's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomActionRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the DataView by processing the passed information on the server, in an Action specified via the DataView's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomActionRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * A client-side counterpart of the DateEdit extension.
+ */
+interface MVCxClientDateEdit extends ASPxClientDateEdit {
+}
+/**
+ * A client-side counterpart of the DockManager extension.
+ */
+interface MVCxClientDockManager extends ASPxClientDockManager {
+    /**
+     * Sends a callback with a parameter to update the DockManager by processing the passed information on the server, in an Action specified by the DockManager's CallbackRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the DockManager by processing the passed information on the server, in an Action specified by the DockManager's CallbackRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that contains any information that needs to be sent to the server-side Callback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that contains any information that needs to be sent to the server-side Callback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * A client-side counterpart of the DockPanel extension.
+ */
+interface MVCxClientDockPanel extends ASPxClientDockPanel {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientDockPanel>>;
+    /**
+     * Sends a callback with a parameter to update the DockPanel by processing the passed information on the server, in an Action specified by the DockPanel's DockPanelSettings.CallbackRouteValues) property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the DockPanel by processing the passed information on the server, in an Action specified by the DockPanel's DockPanelSettings.CallbackRouteValues) property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side WindowCallback event, passing the specified argument to it.
+     * @param parameter A string value that is any information that needs to be sent to the server-side WindowCallback event.
+     */
+    PerformCallback(parameter: string): void;
+}
+/**
+ * A client-side counterpart of the FileManager extension.
+ */
+interface MVCxClientFileManager extends ASPxClientFileManager {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientFileManager>>;
+    /**
+     * Sends a callback with a parameter to update the FileManager by processing the passed information on the server, in an Action specified via the extension's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the file manager's CustomActionRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param data A string value that specifies any information that needs to be sent to the server-side CustomCallback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that specifies any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(args: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that specifies any information that needs to be sent to the server-side CustomCallback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(args: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * A client-side counterpart of the GridView extension.
+ */
+interface MVCxClientGridView extends ASPxClientGridView {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientGridView>>;
+    /**
+     * Sends a callback with a parameter to update the GridView by processing the passed information on the server, in an Action specified via the grid's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the grid's CustomActionRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the GridView by processing the passed information on the server, in an Action specified via the grid's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the grid's CustomActionRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback with a parameter to process the passed information on the server, in an Action specified via the GridView's CustomDataActionRouteValues property, and then process the returned result in the specified client function. This method does not update the GridView.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomDataActionRouteValues property.
+     * @param onCallback A ASPxClientGridViewValuesCallback object that represents the JavaScript function which receives the information on the client side.
+     */
+    GetValuesOnCustomCallback(data: Object, onCallback: ASPxClientGridViewValuesCallback): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(args: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side event, passing the specified argument to it.
+     * @param args A string value that represents any information that needs to be sent to the server-side event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(args: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomDataCallback event.
+     * @param args A string value that is any information that needs to be sent to the server-side CustomDataCallback event.
+     * @param onCallback A ASPxClientGridViewValuesCallback object that is the JavaScript function which receives the information on the client side.
+     */
+    GetValuesOnCustomCallback(args: string, onCallback: ASPxClientGridViewValuesCallback): void;
+}
+/**
+ * A client-side counterpart of the HtmlEditor extension.
+ */
+interface MVCxClientHtmlEditor extends ASPxClientHtmlEditor {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientHtmlEditor>>;
+    /**
+     * Sends a callback with a parameter to process the passed information on the server, in an Action specified via the HtmlEditor's CustomDataCallback event on the client. This method does not update the HtmlEditor.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomDataActionRouteValues property.
+     */
+    PerformDataCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to process the passed information on the server, in an Action specified via the HtmlEditor's CustomDataCallback event on the client. This method does not update the HtmlEditor.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomDataActionRouteValues property.
+     * @param onCallback An ASPxClientDataCallback object that is the JavaScript function which receives the callback data as a parameter.
+     */
+    PerformDataCallback(data: Object, onCallback: ASPxClientDataCallback): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomDataCallback event passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side CustomDataCallback event.
+     * @param onCallback A ASPxClientDataCallback object that represents the JavaScript function which receives the callback data as a parameter.
+     */
+    PerformDataCallback(parameter: string, onCallback: ASPxClientDataCallback): void;
+}
+/**
+ * A client-side counterpart of the ImageGallery extension.
+ */
+interface MVCxClientImageGallery extends ASPxClientImageGallery {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientImageGallery>>;
+    /**
+     * Sends a callback with a parameter to update the ImageGallery by processing the passed information on the server, in an Action specified via the ImageGallery's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomActionRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the ImageGallery by processing the passed information on the server, in an Action specified via the ImageGallery's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomActionRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * A client-side counterpart of the ListBox and ListBoxFor extensions.
+ */
+interface MVCxClientListBox extends ASPxClientListBox {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientListBox>>;
+    /**
+     * Sends a callback with a parameter to update the ListBox by processing the passed information on the server, in an Action specified by the ListBox's CallbackRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the ListBox by processing the passed information on the server, in an Action specified by the ListBox's CallbackRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server, and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     */
+    PerformCallback(parameter: string): void;
+}
+/**
+ * A client-side counterpart of the NavBar extension.
+ */
+interface MVCxClientNavBar extends ASPxClientNavBar {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientNavBar>>;
+}
+/**
+ * A client-side counterpart of the PivotGrid extension.
+ */
+interface MVCxClientPivotGrid extends ASPxClientPivotGrid {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientPivotGrid>>;
+    /**
+     * Sends a callback with a parameter to update the PivotGrid by processing the passed information on the server, in an Action specified via the grid's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the grid's CustomActionRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the PivotGrid by processing the passed information on the server, in an Action specified via the grid's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the grid's CustomActionRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Passes PivotGrid callback parameters to the specified object.
+     * @param obj An object that receives PivotGrid callback parameters.
+     */
+    FillStateObject(obj: Object): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(args: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(args: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * A client-side counterpart of the PopupControl extension.
+ */
+interface MVCxClientPopupControl extends ASPxClientPopupControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientPopupControl>>;
+    /**
+     * Sends a callback with a parameter to update the PopupControl by processing the passed information on the server, in an Action specified via the PopupControl's CallbackRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CallbackRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the PopupControl by processing the passed information on the server, in an Action specified via the PopupControl's CallbackRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CallbackRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback with a parameters to update the popup window by processing the related popup window and the passed information on the server, in an Action specified by the PopupControl's CallbackRouteValues property.
+     * @param window A ASPxClientPopupWindow object identifying the processed popup window.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     */
+    PerformWindowCallback(window: ASPxClientPopupWindow, data: Object): void;
+    /**
+     * 
+     * @param window 
+     * @param parameter 
+     */
+    PerformWindowCallback(window: ASPxClientPopupWindow, parameter: string): void;
+    /**
+     * Sends a callback with parameters to update the popup window by processing the related popup window and the passed information on the server.
+     * @param window A ASPxClientPopupWindow object identifying the processed popup window.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformWindowCallback(window: ASPxClientPopupWindow, parameter: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side WindowCallback event, passing the specified argument to it.
+     * @param parameter A string value that is any information that needs to be sent to the server-side WindowCallback event.
+     */
+    PerformCallback(parameter: string): void;
+}
+/**
+ * A client-side equivalent of the MVCxDocumentViewer class.
+ */
+interface MVCxClientDocumentViewer extends ASPxClientDocumentViewer {
+    /**
+     * Occurs before performing a document export request.
+     */
+    BeforeExportRequest: ASPxClientEvent<MVCxClientBeforeExportRequestEventHandler<MVCxClientDocumentViewer>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientDocumentViewer>>;
+}
+/**
+ * Obsolete. Use the MVCxClientDocumentViewer class instead.
+ */
+interface MVCxClientReportViewer extends ASPxClientReportViewer {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientReportViewer>>;
+    /**
+     * Occurs before performing a document export request.
+     */
+    BeforeExportRequest: ASPxClientEvent<MVCxClientBeforeExportRequestEventHandler<MVCxClientReportViewer>>;
+}
+/**
+ * A method that will handle the BeforeExportRequest event.
+ */
+interface MVCxClientBeforeExportRequestEventHandler<S> {
+    /**
+     * A method that will handle the BeforeExportRequest event.
+     * @param source An object which is the event source. Identifies the client object that raised the event.
+     * @param e A MVCxClientBeforeExportRequestEventArgs object that contains event data.
+     */
+    (source: S, e: MVCxClientBeforeExportRequestEventArgs): void;
+}
+/**
+ * Provides data for client BeforeExportRequest events.
+ */
+interface MVCxClientBeforeExportRequestEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets an object containing specific information (if any, as name/value pairs) that should be passed as a request parameter from the client to the server side for further processing.
+     * Value: A hash table object containing named values to be passed from the client to the server side via request parameters.
+     */
+    customArgs: Object;
+}
+/**
+ * A client-side equivalent of the MVCxReportDesigner class.
+ */
+interface MVCxClientReportDesigner extends ASPxClientReportDesigner {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientReportDesigner>>;
+    /**
+     * Occurs after executing the Save command on the client.
+     */
+    SaveCommandExecuted: ASPxClientEvent<MVCxClientReportDesignerSaveCommandExecutedEventHandler<MVCxClientReportDesigner>>;
+    /**
+     * Sends a callback to the server with the specified argument.
+     * @param arg A Object value, specifying the callback argument.
+     */
+    PerformCallback(arg: Object): void;
+    /**
+     * Sends a callback to the server and generates the server-side event, passing it the specified argument.
+     * @param arg A string value that represents any information that needs to be sent to the server-side event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(arg: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server with the specified argument.
+     * @param arg A String value, specifying the callback argument.
+     */
+    PerformCallback(arg: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side event, passing it the specified argument.
+     * @param arg A string value that represents any information that needs to be sent to the server-side event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(arg: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * A method that will handle the SaveCommandExecuted event.
+ */
+interface MVCxClientReportDesignerSaveCommandExecutedEventHandler<S> {
+    /**
+     * A method that will handle the SaveCommandExecuted event.
+     * @param source An object which is the event source. Identifies the client object that raised the event.
+     * @param e A MVCxClientBeforeExportRequestEventArgs object that contains event data.
+     */
+    (source: S, e: MVCxClientReportDesignerSaveCommandExecutedEventArgs): void;
+}
+/**
+ * Provides data for the SaveCommandExecuted event.
+ */
+interface MVCxClientReportDesignerSaveCommandExecutedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Returns the operation result.
+     * Value: A String value, specifying the operation result.
+     */
+    Result: string;
+}
+/**
+ * A client-side counterpart of the RichEdit extension.
+ */
+interface MVCxClientRichEdit extends ASPxClientRichEdit {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientRichEdit>>;
+    /**
+     * Sends a callback with a parameter to update the RichEdit by processing the passed information on the server, in an Action specified via the CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomActionRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the RichEdit by processing the passed information on the server, in an Action specified via the CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomActionRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * A client-side counterpart of the RoundPanel extension.
+ */
+interface MVCxClientRoundPanel extends ASPxClientRoundPanel {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientRoundPanel>>;
+    /**
+     * Sends a callback with a parameter to update the Round Panel by processing the passed information on the server, in an Action specified by the Round Panel's CallbackRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the Round Panel by processing the passed information on the server, in an Action specified by the Round Panel's CallbackRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side ContentCallback event, passing it the specified argument.
+     * @param parameter A string value that is any information that needs to be sent to the server-side ContentCallback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side ContentCallback event, passing it the specified argument.
+     * @param parameter A string value that is any information that needs to be sent to the server-side ContentCallback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * A client-side counterpart of the Scheduler extension.
+ */
+interface MVCxClientScheduler extends ASPxClientScheduler {
+    /**
+     * Occurs on the client side when the tooltip is about to be displayed.
+     */
+    ToolTipDisplaying: ASPxClientEvent<MVCxClientSchedulerToolTipDisplayingEventHandler<MVCxClientScheduler>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientScheduler>>;
+    /**
+     * Sends a callback with a parameter to update the Scheduler by processing the passed information on the server, in an Action specified via the Scheduler's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomActionRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the Scheduler by processing the passed information on the server, in an Action specified via the Scheduler's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomActionRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument
+     * @param parameter A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(parameter: string): void;
+}
+/**
+ * A template that is rendered to display a tooltip.
+ */
+interface MVCxClientSchedulerTemplateToolTip extends ASPxClientToolTipBase {
+    /**
+     * Gets the tooltip type.
+     * Value: A MVCxSchedulerToolTipType object that specifies the tooltip type.
+     */
+    type: MVCxSchedulerToolTipType;
+}
+/**
+ * A delegate method that enables you to adjust the tooltip content before displaying.
+ */
+interface MVCxClientSchedulerToolTipDisplayingEventHandler<S> {
+    /**
+     * A method that will handle the ToolTipDisplaying event.
+     * @param source An object which is the event source. Identifies the client object that raised the event.
+     * @param e A MVCxClientSchedulerToolTipDisplayingEventArgs object that contains the related arguments.
+     */
+    (source: S, e: MVCxClientSchedulerToolTipDisplayingEventArgs): void;
+}
+/**
+ * Provides data for the ToolTipDisplaying event.
+ */
+interface MVCxClientSchedulerToolTipDisplayingEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the tooltip related to the event.
+     * Value: A MVCxClientSchedulerTemplateToolTip object that specifies the tooltip.
+     */
+    toolTip: MVCxClientSchedulerTemplateToolTip;
+    /**
+     * Gets information about the tooltip related to the event.
+     * Value: A ASPxClientSchedulerToolTipData object that specifies information about the tooltip.
+     */
+    data: ASPxClientSchedulerToolTipData;
+}
+/**
+ * Lists available tooltip types.
+ */
+interface MVCxSchedulerToolTipType {
+}
+/**
+ * A client-side counterpart of the Spreadsheet extension.
+ */
+interface MVCxClientSpreadsheet extends ASPxClientSpreadsheet {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientSpreadsheet>>;
+    /**
+     * Sends a callback with a parameter to update the Spreadsheet by processing the passed information on the server, in an Action specified via the CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomActionRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the Spreadsheet by processing the passed information on the server, in an Action specified via the CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomActionRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * A client-side counterpart of the PageControl extension.
+ */
+interface MVCxClientPageControl extends ASPxClientPageControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientPageControl>>;
+    /**
+     * Sends a callback with a parameter to update the PageControl by processing the passed information on the server, in an Action specified by the PageControl's CallbackRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the PageControl by processing the passed information on the server, in an Action specified by the PageControl's CallbackRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * A client-side counterpart of the TokenBox and TokenBoxFor extensions.
+ */
+interface MVCxClientTokenBox extends ASPxClientTokenBox {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientTokenBox>>;
+    /**
+     * Sends a callback with a parameter to update the TokenBox by processing the passed information on the server, in an Action specified by the TokenBox's CallbackRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the TokenBox by processing the passed information on the server, in an Action specified by the TokenBox's CallbackRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified by the CallbackRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     */
+    PerformCallback(parameter: string): void;
+}
+/**
+ * A client-side counterpart of the TreeList extension.
+ */
+interface MVCxClientTreeList extends ASPxClientTreeList {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientTreeList>>;
+    /**
+     * Sends a callback with a parameter to update the TreeList by processing the passed information on the server, in an Action specified via the TreeList's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomActionRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the TreeList by processing the passed information on the server, in an Action specified via the TreeList's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomActionRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback with a parameter to process the passed information on the server, in an Action specified via the TreeList's CustomDataCallback event. This method does not update the TreeList.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomDataActionRouteValues property.
+     */
+    PerformCustomDataCallback(data: Object): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(args: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(args: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomDataCallback event passing it the specified argument.
+     * @param arg A string value that represents any information that needs to be sent to the server-side CustomDataCallback event.
+     */
+    PerformCustomDataCallback(arg: string): void;
+}
+/**
+ * A client-side counterpart of the TreeView extension.
+ */
+interface MVCxClientTreeView extends ASPxClientTreeView {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientTreeView>>;
+}
+/**
+ * A client-side counterpart of the UploadControl extension.
+ */
+interface MVCxClientUploadControl extends ASPxClientUploadControl {
+}
+/**
+ * A method that will handle client BeginCallback events.
+ */
+interface MVCxClientBeginCallbackEventHandler<S> {
+    /**
+     * A method that will handle client BeginCallback events.
+     * @param source An object which is the event source. Identifies the client object that raised the event.
+     * @param e A MVCxClientBeginCallbackEventArgs object that contains event data.
+     */
+    (source: S, e: MVCxClientBeginCallbackEventArgs): void;
+}
+/**
+ * Provides data for client BeginCallback events.
+ */
+interface MVCxClientBeginCallbackEventArgs extends ASPxClientBeginCallbackEventArgs {
+    /**
+     * Gets an object containing specific information (if any, as name/value pairs) that should be passed as a request parameter from the client to the server side for further processing.
+     * Value: A hash table object containing named values to be passed from the client to the server side via request parameters.
+     */
+    customArgs: Object;
+}
+/**
+ * A method that will handle the BeginCallback event.
+ */
+interface MVCxClientGlobalBeginCallbackEventHandler<S> {
+    /**
+     * A method that will handle the BeginCallback event.
+     * @param source An object which is the event source. Identifies the client object that raised the event.
+     * @param e A MVCxClientGlobalBeginCallbackEventArgs object that contains event data.
+     */
+    (source: S, e: MVCxClientGlobalBeginCallbackEventArgs): void;
+}
+/**
+ * Provides data for the BeginCallback event.
+ */
+interface MVCxClientGlobalBeginCallbackEventArgs extends ASPxClientGlobalBeginCallbackEventArgs {
+    /**
+     * Gets an object containing specific information (if any, as name/value pairs) that should be passed as a request parameter from the client to the server side for further processing.
+     * Value: A hash table object containing named values to be passed from the client to the server side via request parameters.
+     */
+    customArgs: Object;
+}
+/**
+ * An ASP.NET MVC equivalent of the client ASPxClientGlobalEvents component.
+ */
+interface MVCxClientGlobalEvents {
+    /**
+     * Occurs on the client side after client object models of all DevExpress MVC extensions contained within the page have been initialized.
+     */
+    ControlsInitialized: ASPxClientEvent<ASPxClientControlsInitializedEventHandler<MVCxClientGlobalEvents>>;
+    /**
+     * Occurs on the client when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientGlobalBeginCallbackEventHandler<MVCxClientGlobalEvents>>;
+    /**
+     * Occurs on the client after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientGlobalEndCallbackEventHandler<MVCxClientGlobalEvents>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by a DevExpress MVC extension.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientGlobalCallbackErrorEventHandler<MVCxClientGlobalEvents>>;
+}
+/**
+ * A client-side counterpart of the VerticalGrid extension.
+ */
+interface MVCxClientVerticalGrid extends ASPxClientVerticalGrid {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<MVCxClientBeginCallbackEventHandler<MVCxClientVerticalGrid>>;
+    /**
+     * Sends a callback with a parameter to update the VerticalGrid by processing the passed information on the server in an Action specified via the grid's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the grid's CustomActionRouteValues property.
+     */
+    PerformCallback(data: Object): void;
+    /**
+     * Sends a callback with a parameter to update the VerticalGrid by processing the passed information on the server in an Action specified via the grid's CustomActionRouteValues property.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the grid's CustomActionRouteValues property.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(data: Object, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback with a parameter to process the passed information on the server, in an Action specified via the VerticalGrid's CustomDataActionRouteValues property, and then process the returned result in the specified client function. This method does not update the VerticalGrid.
+     * @param data An object containing any information that needs to be passed to a handling Action specified via the CustomDataActionRouteValues property.
+     * @param onCallback A ASPxClientGridViewValuesCallback object that represents the JavaScript function which receives the information on the client side.
+     */
+    GetValuesOnCustomCallback(data: Object, onCallback: ASPxClientGridViewValuesCallback): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(args: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side event, passing the specified argument to it.
+     * @param args A string value that represents any information that needs to be sent to the server-side event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(args: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomDataCallback event.
+     * @param args A string value that is any information that needs to be sent to the server-side CustomDataCallback event.
+     * @param onCallback A ASPxClientVerticalGridValuesCallback object that is the JavaScript function which receives the information on the client side.
+     */
+    GetValuesOnCustomCallback(args: string, onCallback: ASPxClientVerticalGridValuesCallback): void;
+}
+/**
+ * A client-side equivalent of the MVCxWebDocumentViewer class.
+ */
+interface MVCxClientWebDocumentViewer extends ASPxClientWebDocumentViewer {
+}
+/**
+ * Serves as the base type for all the objects included in the client-side object model.
+ */
+interface ASPxClientControlBase {
+    /**
+     * Gets the unique, hierarchically-qualified identifier for the control.
+     * Value: The fully-qualified identifier for the control.
+     */
+    name: string;
+    /**
+     * Occurs on the client side after the control has been initialized.
+     */
+    Init: ASPxClientEvent<ASPxClientEventHandler<ASPxClientControlBase>>;
+    /**
+     * Returns an HTML element that is the root of the control's hierarchy.
+     */
+    GetMainElement(): Object;
+    /**
+     * Specifies the text that Assistive Technologies (screen readers or braille display, for example) will provide to a user.
+     * @param message A String value that specifies a text.
+     */
+    SendMessageToAssistiveTechnology(message: string): void;
+    /**
+     * Returns a value specifying whether a control is displayed.
+     */
+    GetClientVisible(): boolean;
+    /**
+     * Specifies whether a control is displayed.
+     * @param visible 
+     */
+    SetClientVisible(visible: boolean): void;
+    /**
+     * Returns a value specifying whether a control is displayed.
+     */
+    GetVisible(): boolean;
+    /**
+     * Specifies whether a control is displayed.
+     * @param visible true to make a control visible; false to make it hidden.
+     */
+    SetVisible(visible: boolean): void;
+    /**
+     * Returns a value that determines whether a callback request sent by a web control is being currently processed on the server side.
+     */
+    InCallback(): boolean;
+}
+/**
+ * Serves as the base type for all the objects included in the client-side object model.
+ */
+interface ASPxClientControl extends ASPxClientControlBase {
+    /**
+     * Returns the control's width.
+     */
+    GetWidth(): number;
+    /**
+     * Returns the control's height.
+     */
+    GetHeight(): number;
+    /**
+     * Specifies the control's width.
+     * @param width An integer value that specifies the control's width.
+     */
+    SetWidth(width: number): void;
+    /**
+     * Specifies the control's height.   Note that this method is not in effect for some controls.
+     * @param height An integer value that specifies the control's height.
+     */
+    SetHeight(height: number): void;
+    /**
+     * Modifies the control's size against the control's container.
+     */
+    AdjustControl(): void;
+}
+/**
+ * Represents a client-side equivalent of the ASPxCallback control.
+ */
+interface ASPxClientCallback extends ASPxClientControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientCallback>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientCallback>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientCallback.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientCallback>>;
+    /**
+     * Fires on the client side when a callback initiated by the client Callback event's handler returns back to the client.
+     */
+    CallbackComplete: ASPxClientEvent<ASPxClientCallbackCompleteEventHandler<ASPxClientCallback>>;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     */
+    SendCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * A method that will handle the client events related to completion of callback server-side processing.
+ */
+interface ASPxClientCallbackCompleteEventHandler<S> {
+    /**
+     * A method that will handle the client events related to completion of callback server-side processing.
+     * @param source An object representing the event source. Identifies the web control that raised the event.
+     * @param e An ASPxClientCallbackCompleteEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCallbackCompleteEventArgs): void;
+}
+/**
+ * Serves as the base class for arguments of the web controls' client-side events.
+ */
+interface ASPxClientEventArgs {
+}
+/**
+ * Provides data for events concerning the final processing of a callback.
+ */
+interface ASPxClientCallbackCompleteEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets a string that contains specific information (if any) passed from the client side for server-side processing.
+     * Value: A string value representing specific information passed from the client to the server side.
+     */
+    parameter: string;
+    /**
+     * Gets a string that contains specific information (if any) that has been passed from the server to the client side for further processing.
+     * Value: A string value representing specific information passed from the server back to the client side.
+     */
+    result: string;
+}
+/**
+ * Serves as the base class for controls that implement panel functionality.
+ */
+interface ASPxClientPanelBase extends ASPxClientControl {
+    /**
+     * Returns the HTML code that is the content of the panel.
+     */
+    GetContentHtml(): string;
+    /**
+     * Sets the HTML content for the panel.
+     * @param html A string value that is the HTML code defining the content of the panel.
+     */
+    SetContentHtml(html: string): void;
+    /**
+     * Sets a value specifying whether the panel is enabled.
+     * @param enabled true to enable the panel; false to disable it.
+     */
+    SetEnabled(enabled: boolean): void;
+    /**
+     * Returns a value specifying whether a panel is enabled.
+     */
+    GetEnabled(): boolean;
+}
+/**
+ * Represents a client-side equivalent of the ASPxPanel control.
+ */
+interface ASPxClientPanel extends ASPxClientPanelBase {
+    /**
+     * Occurs when the expanded panel is closed.
+     */
+    Collapsed: ASPxClientEvent<ASPxClientEventHandler<ASPxClientPanel>>;
+    /**
+     * Occurs when an end-user opens the expand panel.
+     */
+    Expanded: ASPxClientEvent<ASPxClientEventHandler<ASPxClientPanel>>;
+    /**
+     * Expands or collapses the client panel.
+     */
+    Toggle(): void;
+    /**
+     * Returns a value specifying whether the panel can be expanded.
+     */
+    IsExpandable(): boolean;
+    /**
+     * Returns a value specifying whether the panel is expanded.
+     */
+    IsExpanded(): boolean;
+    /**
+     * Expands the collapsed panel.
+     */
+    Expand(): void;
+    /**
+     * Collapses the expanded panel.
+     */
+    Collapse(): void;
+}
+/**
+ * Represents a client-side equivalent of the ASPxCallbackPanel control.
+ */
+interface ASPxClientCallbackPanel extends ASPxClientPanel {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientCallbackPanel>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientCallbackPanel>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientCallbackPanel.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientCallbackPanel>>;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Returns the text displayed within the control's loading panel.
+     */
+    GetLoadingPanelText(): string;
+    /**
+     * Sets the text to be displayed within the control's loading panel.
+     * @param loadingPanelText A string value specifying the text to be displayed within the loading panel.
+     */
+    SetLoadingPanelText(loadingPanelText: string): void;
+    /**
+     * Sets a value specifying whether the callback panel is enabled.
+     * @param enabled true, to enable the callback panel; false to disable it.
+     */
+    SetEnabled(enabled: boolean): void;
+    /**
+     * Returns a value specifying whether a callback panel is enabled.
+     */
+    GetEnabled(): boolean;
+}
+/**
+ * Represents the event object used for client-side events.
+ */
+interface ASPxClientEvent<T> {
+    /**
+     * Dynamically connects the event with an appropriate event handler function.
+     * @param handler An object representing the event handling function's content.
+     */
+    AddHandler(handler: T): void;
+    /**
+     * Dynamically disconnects the event from the associated event handler function.
+     * @param handler An object representing the event handling function's content.
+     */
+    RemoveHandler(handler: T): void;
+    /**
+     * Dynamically disconnects the event from all the associated event handler functions.
+     */
+    ClearHandlers(): void;
+    /**
+     * For internal use only.
+     * @param source 
+     * @param e 
+     */
+    FireEvent(source: Object, e: ASPxClientEventArgs): void;
+}
+/**
+ * A method that will handle the client-side events of a web control's client-side equivalent.
+ */
+interface ASPxClientEventHandler<S> {
+    /**
+     * A method that will handle the client-side events of a web control's client-side equivalent.
+     * @param source An object representing the event source. Identifies the control that raised the event.
+     * @param e An ASPxClientEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientEventArgs): void;
+}
+/**
+ * A method that will handle the cancelable events of a web control's client-side equivalent.
+ */
+interface ASPxClientCancelEventHandler<S> {
+    /**
+     * A method that will handle the cancelable events of a web control's client-side equivalent.
+     * @param source An object representing the event source. Identifies the web control that raised the event.
+     * @param e An ASPxClientCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCancelEventArgs): void;
+}
+/**
+ * Provides data for cancelable client events.
+ */
+interface ASPxClientCancelEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets or sets a value indicating whether the action which raised the event should be canceled.
+     * Value: true if the action that raised the event should be canceled; otherwise, false.
+     */
+    cancel: boolean;
+}
+/**
+ * A method that will handle the client events which can't be cancelled and allow the event's processing to be passed to the server side.
+ */
+interface ASPxClientProcessingModeEventHandler<S> {
+    /**
+     * A method that will handle the client events which can't be cancelled and allow the event's processing to be passed to the server side.
+     * @param source An object representing the event source. Identifies the web control that raised the event.
+     * @param e An ASPxClientProcessingModeEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientProcessingModeEventArgs): void;
+}
+/**
+ * Provides data for the client events which can't be cancelled and allow the event's processing to be passed to the server side.
+ */
+interface ASPxClientProcessingModeEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets or sets a value that specifies whether the event should be finally processed on the server side.
+     * Value: true to process the event on the server side; false to completely handle it on the client side.
+     */
+    processOnServer: boolean;
+}
+/**
+ * A method that will handle the cancelable client-side events which allow the event's processing to be passed to the server side.
+ */
+interface ASPxClientProcessingModeCancelEventHandler<S> {
+    /**
+     * A method that will handle the cancelable client-side events which allow the event's processing to be passed to the server side.
+     * @param source An object representing the event source. Identifies the web control that raised the event.
+     * @param e An ASPxClientProcessingModeCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientProcessingModeCancelEventArgs): void;
+}
+/**
+ * Provides data for the cancelable client-side events which allow the event's processing to be passed to the server side.
+ */
+interface ASPxClientProcessingModeCancelEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets or sets a value indicating whether the action which raised the event should be canceled.
+     * Value: true if the action that raised the event should be canceled; otherwise, false.
+     */
+    cancel: boolean;
+}
+/**
+ * Provides access to an observable boolean, that allows you to detect and respond to changes.
+ */
+interface KnockoutObservableBoolean {
+}
+/**
+ * Provides access to observable arrays that allow you to detect and respond to changes in a collection of things.
+ */
+interface KnockoutObservableArray {
+}
+/**
+ * Represents a JavaScript function which receives callback data obtained via a call to a specific client method (such as the PerformDataCallback).
+ */
+interface ASPxClientDataCallback {
+    /**
+     * A JavaScript function which receives a callback data obtained via a call to a specific client method (such as the PerformDataCallback).
+     * @param sender An object whose client method generated a callback.
+     * @param result A string value that represents the result of server-side callback processing.
+     */
+    (sender: Object, result: string): void;
+}
+/**
+ * Represents a client-side equivalent of the ASPxCloudControl control.
+ */
+interface ASPxClientCloudControl extends ASPxClientControl {
+    /**
+     * Fires after an item has been clicked.
+     */
+    ItemClick: ASPxClientEvent<ASPxClientCloudControlItemEventHandler<ASPxClientCloudControl>>;
+}
+/**
+ * A method that will handle client events involving manipulations with the control's items.
+ */
+interface ASPxClientCloudControlItemEventHandler<S> {
+    /**
+     * A method that will handle client events concerning manipulations with items.
+     * @param source The event source. This parameter identifies the cloud control object which raised the event.
+     * @param e An ASPxClientCloudControlItemEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCloudControlItemEventArgs): void;
+}
+/**
+ * Provides data for events which involve clicking on the control's items.
+ */
+interface ASPxClientCloudControlItemEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the name that uniquely identifies the processed item.
+     * Value: A string value that represents the value assigned to the item's Name property.
+     */
+    name: Object;
+    /**
+     * Gets the HTML object that contains the processed item.
+     * Value: An object representing a container for the item related to the event.
+     */
+    htmlElement: Object;
+    /**
+     * Gets a DHTML event object that relates to the processed event.
+     * Value: An object that maintains DHTML event-specific information.
+     */
+    htmlEvent: Object;
+}
+/**
+ * A method that will handle the client events related to the begining of a callback processing round trip.
+ */
+interface ASPxClientBeginCallbackEventHandler<S> {
+    /**
+     * A method that will handle client BeginCallback events.
+     * @param source An object representing the event source. Identifies the web control that raised the event.
+     * @param e An ASPxClientBeginCallbackEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientBeginCallbackEventArgs): void;
+}
+/**
+ * Provides data for client events related to the beginning of a callback processing round trip.
+ */
+interface ASPxClientBeginCallbackEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets a command name that identifies which client action forced a callback to be occurred.
+     * Value: A string value that represents the name of the command which initiated a callback.
+     */
+    command: string;
+}
+/**
+ * A method that will handle the BeginCallback event.
+ */
+interface ASPxClientGlobalBeginCallbackEventHandler<S> {
+    /**
+     * A method that will handle the BeginCallback event.
+     * @param source The event source.
+     * @param e An ASPxDataValidationEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGlobalBeginCallbackEventArgs): void;
+}
+/**
+ * Provides data for the BeginCallback event.
+ */
+interface ASPxClientGlobalBeginCallbackEventArgs extends ASPxClientBeginCallbackEventArgs {
+    /**
+     * Gets an object that initiated a callback.
+     * Value: An <see cref="ASPxClientControl" /> class descendant object that is the control that initiated a callback.
+     */
+    control: ASPxClientControl;
+}
+/**
+ * A method that will handle the client events related to the completion of a callback processing round trip.
+ */
+interface ASPxClientEndCallbackEventHandler<S> {
+    /**
+     * A method that will handle client EndCallback events.
+     * @param source An object representing the event source.
+     * @param e A MenuItemEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientEndCallbackEventArgs): void;
+}
+/**
+ * Provides data for client events related to the completion of a callback processing round trip.
+ */
+interface ASPxClientEndCallbackEventArgs extends ASPxClientEventArgs {
+}
+/**
+ * A method that will handle the EndCallback event.
+ */
+interface ASPxClientGlobalEndCallbackEventHandler<S> {
+    /**
+     * A method that will handle the EndCallback event.
+     * @param source The event source.
+     * @param e An ASPxDataValidationEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGlobalEndCallbackEventArgs): void;
+}
+/**
+ * Provides data for the EndCallback event.
+ */
+interface ASPxClientGlobalEndCallbackEventArgs extends ASPxClientEndCallbackEventArgs {
+    /**
+     * Gets an object that initiated a callback.
+     * Value: An <see cref="ASPxClientControl" /> class descendant object that is the control that initiated a callback.
+     */
+    control: ASPxClientControl;
+}
+/**
+ * A method that will handle a CustomCallback client event exposed by some DevExpress web controls.
+ */
+interface ASPxClientCustomDataCallbackEventHandler<S> {
+    /**
+     * A method that will handle the client CustomCallback event of some controls.
+     * @param source An object representing the event source.
+     * @param e An ASPxClientCustomDataCallbackEventHandler object that contains event data.
+     */
+    (source: S, e: ASPxClientCustomDataCallbackEventArgs): void;
+}
+/**
+ * Provides data for the CustomCallback event.
+ */
+interface ASPxClientCustomDataCallbackEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets a string that contains specific information (if any) that has been passed from the server to the client side for further processing, related to the CustomCallback event.
+     * Value: A string value representing specific information passed from the server back to the client side.
+     */
+    result: string;
+}
+/**
+ * A method that will handle client events related to server-side errors that occured during callback processing.
+ */
+interface ASPxClientCallbackErrorEventHandler<S> {
+    /**
+     * A method that will handle client CallbackError events.
+     * @param source An object representing the event source.
+     * @param e A ASPxClientCallbackErrorEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientCallbackErrorEventArgs): void;
+}
+/**
+ * Provides data for client events related to server-side errors that occured during callback processing.
+ */
+interface ASPxClientCallbackErrorEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the error message that describes the server error that occurred.
+     * Value: A string value that represents the error message.
+     */
+    message: string;
+    /**
+     * Gets or sets whether the event is handled and the default error handling actions are not required.
+     * Value: true if the error is handled and no default processing is required; otherwise false.
+     */
+    handled: boolean;
+}
+/**
+ * A method that will handle the CallbackError event.
+ */
+interface ASPxClientGlobalCallbackErrorEventHandler<S> {
+    /**
+     * A method that will handle the CallbackError event.
+     * @param source The event source.
+     * @param e An ASPxDataValidationEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientGlobalCallbackErrorEventArgs): void;
+}
+/**
+ * Provides data for the CallbackError event.
+ */
+interface ASPxClientGlobalCallbackErrorEventArgs extends ASPxClientCallbackErrorEventArgs {
+    /**
+     * Gets an object that initiated a callback.
+     * Value: An <see cref="ASPxClientControl" /> class descendant object that is the control that initiated a callback.
+     */
+    control: ASPxClientControl;
+}
+/**
+ * A method that will handle the ValidationCompleted client event.
+ */
+interface ASPxClientValidationCompletedEventHandler<S> {
+    /**
+     * A method that will handle the ValidationCompleted event.
+     * @param source An object representing the event source. Identifies the ASPxClientGlobalEvents object that raised the event.
+     * @param e An ASPxClientValidationCompletedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientValidationCompletedEventArgs): void;
+}
+/**
+ * Provides data for the ValidationCompleted client event that allows you to centrally validate user input within all DevExpress web controls to which validation is applied.
+ */
+interface ASPxClientValidationCompletedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets a container object that holds the validated control(s).
+     * Value: An object that represents a container of the validated control(s).
+     */
+    container: Object;
+    /**
+     * Gets the name of the validation group name to which validation has been applied.
+     * Value: A string value that represents the name of the validation group that has been validated.
+     */
+    validationGroup: string;
+    /**
+     * Gets a value that indicates whether validation has been applied to both visible and invisible controls.
+     * Value: true if validation has been applied to both visible and invisible controls; false if only visible controls have been validated.
+     */
+    invisibleControlsValidated: boolean;
+    /**
+     * Gets a value specifying whether the validation has been completed successfully.
+     * Value: true if the validation has been completed successfully; otherwise, false.
+     */
+    isValid: boolean;
+    /**
+     * Gets the first control (either visible or invisible) that hasn't passed the validation applied.
+     * Value: An ASPxClientControl object that represents the first invalid control.
+     */
+    firstInvalidControl: ASPxClientControl;
+    /**
+     * Gets the first visible control that hasn't passed the validation applied.
+     * Value: An ASPxClientControl object that represents the first visible invalid control.
+     */
+    firstVisibleInvalidControl: ASPxClientControl;
+}
+/**
+ * A method that will handle the client ControlsInitialized event.
+ */
+interface ASPxClientControlsInitializedEventHandler<S> {
+    /**
+     * A method that will handle the client ControlsInitialized event.
+     * @param source An object representing the event source.
+     * @param e An ASPxClientControlsInitializedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientControlsInitializedEventArgs): void;
+}
+/**
+ * Provides data for the client ControlsInitialized event.
+ */
+interface ASPxClientControlsInitializedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets a value that specifies whether a callback is sent during a controls initialization.
+     * Value: true if a callback is sent; otherwise, false.
+     */
+    isCallback: boolean;
+}
+/**
+ * A JavaScript function which returns a value specifying whether an object meets the criteria defined within the method specified by this delegate.
+ */
+interface ASPxClientControlPredicate {
+    /**
+     * A JavaScript function which returns a value specifying whether an object meets the criteria defined within the method specified by this delegate.
+     * @param control An object to compare against the criteria defined within the method.
+     */
+    (control: Object): boolean;
+}
+/**
+ * Represents a JavaScript function which receives the action to perform for a control when the client ForEachControl method is called.
+ */
+interface ASPxClientControlAction {
+    /**
+     * Represents a JavaScript function which receives the action to perform for a control when the client ForEachControl method is called.
+     * @param control An object that specifies a control.
+     */
+    (control: Object): void;
+}
+/**
+ * A collection object used on the client side to maintain particular client control objects
+ */
+interface ASPxClientControlCollection {
+    /**
+     * Occurs on the client side after client object models of all DevExpress web controls contained within the page have been initialized.
+     */
+    ControlsInitialized: ASPxClientEvent<ASPxClientControlsInitializedEventHandler<ASPxClientControlCollection>>;
+    /**
+     * Occurs when the browser window is being resized.
+     */
+    BrowserWindowResized: ASPxClientEvent<ASPxClientEventHandler<ASPxClientControlCollection>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated by any DevExpress control.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientGlobalBeginCallbackEventHandler<ASPxClientControlCollection>>;
+    /**
+     * Occurs on the client side, after server-side processing of a callback initiated by any DevExpress web control, has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientGlobalEndCallbackEventHandler<ASPxClientControlCollection>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by any DevExpress web control.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientGlobalCallbackErrorEventHandler<ASPxClientControlCollection>>;
+    /**
+     * Occurs after the validation initiated for a DevExpress web control (or a group of DevExpress web controls) has been completed.
+     */
+    ValidationCompleted: ASPxClientEvent<ASPxClientValidationCompletedEventHandler<ASPxClientControlCollection>>;
+    /**
+     * Returns a collection item identified by its unique hierarchically-qualified identifier.
+     * @param name A string value representing the hierarchically-qualified identifier of the required control.
+     */
+    Get(name: Object): Object;
+    /**
+     * Returns a DevExpress client control object identified by its unique hierarchically-qualified identifier (either ClientInstanceName or ClientID property value).
+     * @param name A string value that is the hierarchically-qualified identifier of the required DevExpress control.
+     */
+    GetByName(name: string): Object;
+    /**
+     * Returns all controls in the collection that satisfy the specified predicate.
+     * @param predicate An ASPxClientControlPredicate object that is a predicate used to search for controls in the collection.
+     */
+    GetControlsByPredicate(predicate: ASPxClientControlPredicate): Object[];
+    /**
+     * Returns all controls of the specified type.
+     * @param type The object specifying the client control type.
+     */
+    GetControlsByType(type: Object): Object[];
+    /**
+     * Performs the specified action for each control in the collection.
+     * @param action An ASPxClientControlAction object specifying an action to perform.
+     */
+    ForEachControl(action: ASPxClientControlAction): void;
+}
+/**
+ * Represents a client-side equivalent of the ASPxDataView object.
+ */
+interface ASPxClientDataView extends ASPxClientControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientDataView>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientDataView>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientDataView.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientDataView>>;
+    /**
+     * Activates the specified page.
+     * @param pageIndex An integer value that specifies the active page's index.
+     */
+    GotoPage(pageIndex: number): void;
+    /**
+     * Gets the index of the page that is currently active.
+     */
+    GetPageIndex(): number;
+    /**
+     * Gets the size of a single ASPxDataView's page.
+     */
+    GetPageSize(): number;
+    /**
+     * Sets the size of a single ASPxDataView's page.
+     * @param pageSize An integer value that specifies the page size.
+     */
+    SetPageSize(pageSize: number): void;
+    /**
+     * Gets the number of pages into which the ASPxDataView's data is divided.
+     */
+    GetPageCount(): number;
+    /**
+     * Activates the next page.
+     */
+    NextPage(): void;
+    /**
+     * Activates the previous page.
+     */
+    PrevPage(): void;
+    /**
+     * Activates the first page.
+     */
+    FirstPage(): void;
+    /**
+     * Activates the last page.
+     */
+    LastPage(): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * A JavaScript function which returns a value specifying whether an object meets the criteria defined within the method specified by this delegate.
+ */
+interface ASPxClientDockingFilterPredicate {
+    /**
+     * A JavaScript function which returns a value specifying whether an object meets the criteria defined within the method specified by this delegate.
+     * @param item An object to compare against the criteria defined within the method.
+     */
+    (item: Object): boolean;
+}
+/**
+ * A client-side equivalent of the ASPxDockManager   object.
+ */
+interface ASPxClientDockManager extends ASPxClientControl {
+    /**
+     * Fires on the client side before a panel is docked in a zone and allows you to cancel the action.
+     */
+    BeforeDock: ASPxClientEvent<ASPxClientDockManagerProcessingModeCancelEventHandler<ASPxClientDockManager>>;
+    /**
+     * Fires on the client side after a panel is docked in a zone.
+     */
+    AfterDock: ASPxClientEvent<ASPxClientDockManagerProcessingModeEventHandler<ASPxClientDockManager>>;
+    /**
+     * Fires on the client side before a panel is made floating (undocked from a zone) and allows you to cancel the action.
+     */
+    BeforeFloat: ASPxClientEvent<ASPxClientDockManagerProcessingModeCancelEventHandler<ASPxClientDockManager>>;
+    /**
+     * Fires on the client side after a panel is undocked from a zone.
+     */
+    AfterFloat: ASPxClientEvent<ASPxClientDockManagerProcessingModeEventHandler<ASPxClientDockManager>>;
+    /**
+     * Occurs when a panel dragging operation is started.
+     */
+    StartPanelDragging: ASPxClientEvent<ASPxClientDockManagerEventHandler<ASPxClientDockManager>>;
+    /**
+     * Occurs after a panel dragging operation is complete.
+     */
+    EndPanelDragging: ASPxClientEvent<ASPxClientDockManagerEventHandler<ASPxClientDockManager>>;
+    /**
+     * Occurs on the client side before a panel is closed, and allows you to cancel the action.
+     */
+    PanelClosing: ASPxClientEvent<ASPxClientDockManagerCancelEventHandler<ASPxClientDockManager>>;
+    /**
+     * Occurs on the client side when a panel is closed.
+     */
+    PanelCloseUp: ASPxClientEvent<ASPxClientDockManagerEventHandler<ASPxClientDockManager>>;
+    /**
+     * Occurs on the client side when a panel pops up.
+     */
+    PanelPopUp: ASPxClientEvent<ASPxClientDockManagerEventHandler<ASPxClientDockManager>>;
+    /**
+     * Occurs on the client side after a panel has been invoked.
+     */
+    PanelShown: ASPxClientEvent<ASPxClientDockManagerEventHandler<ASPxClientDockManager>>;
+    /**
+     * Occurs on the client side after a panel has been resized.
+     */
+    PanelResize: ASPxClientEvent<ASPxClientDockManagerEventHandler<ASPxClientDockManager>>;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that contains any information that needs to be sent to the server-side Callback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that contains any information that needs to be sent to the server-side Callback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Returns a zone specified by its unique identifier (zoneUID).
+     * @param zoneUID A string value specifying the unique identifier of the zone.
+     */
+    GetZoneByUID(zoneUID: string): ASPxClientDockZone;
+    /**
+     * Returns a panel specified by its unique identifier (panelUID).
+     * @param panelUID A string value specifying the unique identifier of the panel.
+     */
+    GetPanelByUID(panelUID: string): ASPxClientDockPanel;
+    /**
+     * Returns an array of panels contained in a page.
+     */
+    GetPanels(): ASPxClientDockPanel[];
+    /**
+     * Returns an array of panels that are contained in a page and meet a specified criteria.
+     * @param filterPredicate An ASPxClientDockingFilterPredicate delegate that defines a set of criteria and determines whether a panel meets those criteria.
+     */
+    GetPanels(filterPredicate: ASPxClientDockingFilterPredicate): ASPxClientDockPanel[];
+    /**
+     * Returns an array of zones contained in a page.
+     */
+    GetZones(): ASPxClientDockZone[];
+    /**
+     * Returns an array of zones that are contained in a page and meet a specified criteria.
+     * @param filterPredicate An ASPxClientDockingFilterPredicate delegate that defines a set of criteria and determines whether a zone meets those criteria.
+     */
+    GetZones(filterPredicate: ASPxClientDockingFilterPredicate): ASPxClientDockZone[];
+}
+/**
+ * A method that will handle the client BeforeDock event.
+ */
+interface ASPxClientDockManagerProcessingModeCancelEventHandler<S> {
+    /**
+     * A method that will handle the BeforeDock event.
+     * @param source The event source. This parameter identifies the dock manager object which raised the event.
+     * @param e An ASPxClientDockManagerProcessingModeCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDockManagerProcessingModeCancelEventArgs): void;
+}
+/**
+ * Provides data for the BeforeDock event.
+ */
+interface ASPxClientDockManagerProcessingModeCancelEventArgs extends ASPxClientProcessingModeCancelEventArgs {
+    /**
+     * Gets the panel currently being processed.
+     * Value: An ASPxClientDockPanel object that is the processed panel.
+     */
+    panel: ASPxClientDockPanel;
+    /**
+     * Gets the zone currently being processed.
+     * Value: An ASPxClientDockZone object that is the processed zone.
+     */
+    zone: ASPxClientDockZone;
+}
+/**
+ * A method that will handle the client AfterDock event.
+ */
+interface ASPxClientDockManagerProcessingModeEventHandler<S> {
+    /**
+     * A method that will handle the AfterDock event.
+     * @param source The event source. This parameter identifies the dock manager object which raised the event.
+     * @param e An ASPxClientDockManagerProcessingModeEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDockManagerProcessingModeEventArgs): void;
+}
+/**
+ * Provides data for the AfterDock event.
+ */
+interface ASPxClientDockManagerProcessingModeEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the panel currently being processed.
+     * Value: An ASPxClientDockPanel object that is the processed panel.
+     */
+    panel: ASPxClientDockPanel;
+    /**
+     * Gets the zone currently being processed.
+     * Value: An ASPxClientDockZone object that is the processed zone.
+     */
+    zone: ASPxClientDockZone;
+}
+/**
+ * A method that will handle client-side events concerning manipulations with panels.
+ */
+interface ASPxClientDockManagerEventHandler<S> {
+    /**
+     * A method that will handle client-side events concerning manipulations with panels.
+     * @param source The event source. This parameter identifies the dock manager object which raised the event.
+     * @param e An ASPxClientDockManagerEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDockManagerEventArgs): void;
+}
+/**
+ * Provides data for events which concern manipulations on panels.
+ */
+interface ASPxClientDockManagerEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the panel currently being processed.
+     * Value: An ASPxClientDockPanel object that is the processed panel.
+     */
+    panel: ASPxClientDockPanel;
+}
+/**
+ * A method that will handle the client BeforeDock event.
+ */
+interface ASPxClientDockManagerCancelEventHandler<S> {
+    /**
+     * A method that will handle the PanelClosing event.
+     * @param source The event source. This parameter identifies the dock manager object which raised the event.
+     * @param e An ASPxClientDockManagerCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDockManagerCancelEventArgs): void;
+}
+/**
+ * Provides data for the BeforeDock event.
+ */
+interface ASPxClientDockManagerCancelEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the panel currently being processed.
+     * Value: An ASPxClientDockPanel object that is the processed panel.
+     */
+    panel: ASPxClientDockPanel;
+}
+/**
+ * Serves as a base class for the ASPxClientPopupControl classes.
+ */
+interface ASPxClientPopupControlBase extends ASPxClientControl {
+    /**
+     * Occurs on the client side when window resizing initiates.
+     */
+    BeforeResizing: ASPxClientEvent<ASPxClientPopupWindowEventHandler<ASPxClientPopupControlBase>>;
+    /**
+     * Occurs on the client side when window resizing completes.
+     */
+    AfterResizing: ASPxClientEvent<ASPxClientPopupWindowEventHandler<ASPxClientPopupControlBase>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientPopupControlBase>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientPopupControlBase>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the control.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientPopupControlBase>>;
+    /**
+     * Occurs on the client side when a control's window closes or hides.
+     */
+    CloseUp: ASPxClientEvent<ASPxClientPopupWindowCloseUpEventHandler<ASPxClientPopupControlBase>>;
+    /**
+     * Enables you to cancel window closing on the client side.
+     */
+    Closing: ASPxClientEvent<ASPxClientPopupWindowCancelEventHandler<ASPxClientPopupControlBase>>;
+    /**
+     * Occurs on the client side when a control's window is invoked.
+     */
+    PopUp: ASPxClientEvent<ASPxClientPopupWindowEventHandler<ASPxClientPopupControlBase>>;
+    /**
+     * Occurs on the client side after a window has been resized.
+     */
+    Resize: ASPxClientEvent<ASPxClientPopupWindowResizeEventHandler<ASPxClientPopupControlBase>>;
+    /**
+     * Occurs on the client side after a control's window has been invoked.
+     */
+    Shown: ASPxClientEvent<ASPxClientPopupWindowEventHandler<ASPxClientPopupControlBase>>;
+    /**
+     * Occurs on the client side when the window pin state is changed.
+     */
+    PinnedChanged: ASPxClientEvent<ASPxClientPopupWindowPinnedChangedEventHandler<ASPxClientPopupControlBase>>;
+    /**
+     * Modifies a control's window size in accordance with the content.
+     */
+    AdjustSize(): void;
+    /**
+     * Brings the window to the front of the z-order.
+     */
+    BringToFront(): void;
+    /**
+     * Returns a value indicating whether the window is collapsed.
+     */
+    GetCollapsed(): boolean;
+    /**
+     * Returns the HTML code that specifies the contents of the control's window.
+     */
+    GetContentHtml(): string;
+    /**
+     * Returns an iframe object containing a web page specified via the control's SetContentUrl client method).
+     */
+    GetContentIFrame(): Object;
+    /**
+     * Returns an iframe object containing a web page specified via the control's SetContentUrl client method).
+     */
+    GetContentIFrameWindow(): Object;
+    /**
+     * Returns the URL pointing to the web page displayed within the control's window.
+     */
+    GetContentUrl(): string;
+    /**
+     * Returns the URL pointing to the image displayed within the window footer by default.
+     */
+    GetFooterImageUrl(): string;
+    /**
+     * Returns the URL where the web browser will navigate when the text or image is clicked within a window's footer.
+     */
+    GetFooterNavigateUrl(): string;
+    /**
+     * Returns the text displayed within a window's footer.
+     */
+    GetFooterText(): string;
+    /**
+     * Returns the URL pointing to the image displayed within the window header.
+     */
+    GetHeaderImageUrl(): string;
+    /**
+     * Returns the URL where the web browser will navigate when the text or image is clicked within a window's header.
+     */
+    GetHeaderNavigateUrl(): string;
+    /**
+     * Returns the text displayed within a window's header.
+     */
+    GetHeaderText(): string;
+    /**
+     * Gets the width of the default window's (for ASPxPopupControl) or panel's (for ASPxDockPanel) content region.
+     */
+    GetContentWidth(): number;
+    /**
+     * Gets the height of the default window's (for ASPxPopupControl) or panel's (for ASPxDockPanel) content region.
+     */
+    GetContentHeight(): number;
+    /**
+     * Returns a value indicating whether the window is maximized.
+     */
+    GetMaximized(): boolean;
+    /**
+     * Returns a value indicating whether the window is pinned.
+     */
+    GetPinned(): boolean;
+    /**
+     * Sends a callback to the server and generates the server-side WindowCallback event, passing the specified argument to it.
+     * @param parameter A string value that is any information that needs to be sent to the server-side WindowCallback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Refreshes the content of the web page displayed within the control's window.
+     */
+    RefreshContentUrl(): void;
+    /**
+     * Sets a value indicating whether the window is collapsed.
+     * @param value true, to collapse the window; otherwise, false.
+     */
+    SetCollapsed(value: boolean): void;
+    /**
+     * Sets the HTML markup specifying the contents of the control's window.
+     * @param html A string value that specifies the HTML markup.
+     */
+    SetContentHtml(html: string): void;
+    /**
+     * Sets the URL to point to the web page that should be loaded into, and displayed within the control's window.
+     * @param url A string value specifying the URL to the web page displayed within the control's window.
+     */
+    SetContentUrl(url: string): void;
+    /**
+     * Specifies the URL which points to the image displayed within the window footer by default.
+     * @param value A string value that is the URL for the image displayed within the window footer.
+     */
+    SetFooterImageUrl(value: string): void;
+    /**
+     * Specifies the URL where the web browser will navigate when the text or image is clicked within a window's footer.
+     * @param value A string value which specifies the required navigation location.
+     */
+    SetFooterNavigateUrl(value: string): void;
+    /**
+     * Specifies the text displayed within a window's footer.
+     * @param value A string value that specifies a window's footer text.
+     */
+    SetFooterText(value: string): void;
+    /**
+     * Specifies the URL which points to the image displayed within the window header.
+     * @param value A string value that is the URL to the image displayed within the header.
+     */
+    SetHeaderImageUrl(value: string): void;
+    /**
+     * Specifies the URL where the web browser will navigate when the text or image is clicked within a window's header.
+     * @param value A string value which specifies the required navigation location.
+     */
+    SetHeaderNavigateUrl(value: string): void;
+    /**
+     * Specifies the text displayed within a window's header.
+     * @param value A string value that specifies a window's header text.
+     */
+    SetHeaderText(value: string): void;
+    /**
+     * Sets a value indicating whether the window is maximized.
+     * @param value true. to maximize the window; otherwise, false.
+     */
+    SetMaximized(value: boolean): void;
+    /**
+     * Sets a value indicating whether the window is pinned.
+     * @param value true, to pin the window; otherwise, false.
+     */
+    SetPinned(value: boolean): void;
+    /**
+     * Invokes the control's window.
+     */
+    Show(): void;
+    /**
+     * Invokes the control's window at the popup element with the specified index.
+     * @param popupElementIndex An integer value specifying the zero-based index of the popup element.
+     */
+    Show(popupElementIndex: number): void;
+    /**
+     * Invokes the control's window and displays it over the specified HTML element.
+     * @param htmlElement An object specifying the HTML element relative to whose position the window is invoked.
+     */
+    ShowAtElement(htmlElement: Object): void;
+    /**
+     * Invokes the control's window and displays it over an HTML element specified by its unique identifier.
+     * @param id A string value that specifies the hierarchically qualified identifier of an HTML element relative to whose position the window is invoked.
+     */
+    ShowAtElementByID(id: string): void;
+    /**
+     * Invokes the control's window at the specified position.
+     * @param x A integer value specifying the x-coordinate of the window's display position.
+     * @param y A integer value specifying the y-coordinate of the window's display position.
+     */
+    ShowAtPos(x: number, y: number): void;
+    /**
+     * Closes the control's window.
+     */
+    Hide(): void;
+    /**
+     * Returns a value that specifies whether the control's window is displayed.
+     */
+    IsVisible(): boolean;
+}
+/**
+ * A client-side equivalent of the ASPxDockPanel object.
+ */
+interface ASPxClientDockPanel extends ASPxClientPopupControlBase {
+    /**
+     * Gets or sets the unique identifier of a panel on a page.
+     * Value: A string that is the unique identifier of a panel.
+     */
+    panelUID: string;
+    /**
+     * Fires on the client side before a panel is docked in a zone and allows you to cancel the action.
+     */
+    BeforeDock: ASPxClientEvent<ASPxClientDockPanelProcessingModeCancelEventHandler<ASPxClientDockPanel>>;
+    /**
+     * Fires on the client side after a panel is docked in a zone.
+     */
+    AfterDock: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientDockPanel>>;
+    /**
+     * Fires on the client side before a panel is made floating (undocked from a zone) and allows you to cancel the action.
+     */
+    BeforeFloat: ASPxClientEvent<ASPxClientDockPanelProcessingModeCancelEventHandler<ASPxClientDockPanel>>;
+    /**
+     * Fires on the client side after a panel is undocked from a zone.
+     */
+    AfterFloat: ASPxClientEvent<ASPxClientDockPanelProcessingModeEventHandler<ASPxClientDockPanel>>;
+    /**
+     * Occurs when a panel dragging operation is started.
+     */
+    StartDragging: ASPxClientEvent<ASPxClientEventHandler<ASPxClientDockPanel>>;
+    /**
+     * Occurs after a panel dragging operation is complete.
+     */
+    EndDragging: ASPxClientEvent<ASPxClientEventHandler<ASPxClientDockPanel>>;
+    /**
+     * Retrieves a zone that owns the current panel.
+     */
+    GetOwnerZone(): ASPxClientDockZone;
+    /**
+     * Docks the current panel in the specified zone.
+     * @param zone An ASPxClientDockZone object specifying the zone.
+     */
+    Dock(zone: ASPxClientDockZone): void;
+    /**
+     * Docks the current panel in a zone at the specified position.
+     * @param zone An ASPxClientDockZone object specifying the zone, where the panel is docked
+     * @param visibleIndex An integer value specifying the visible index position.
+     */
+    Dock(zone: ASPxClientDockZone, visibleIndex: number): void;
+    /**
+     * Undocks the current panel.
+     */
+    MakeFloat(): void;
+    /**
+     * Undocks the current panel and place it at the specified position.
+     * @param x An integer value that specifies the X-coordinate of the panel's display position.
+     * @param y An integer value that specifies the Y-coordinate of the panel's display position.
+     */
+    MakeFloat(x: number, y: number): void;
+    /**
+     * Gets a value specifying the position of the current panel, amongst the visible panels within a zone.
+     */
+    GetVisibleIndex(): number;
+    /**
+     * Sets a value specifying the position of the current panel, amongst the visible panels in a zone.
+     * @param visibleIndex An integer value specifying the zero-based index of the panel amongst visible panels in the zone.
+     */
+    SetVisibleIndex(visibleIndex: number): void;
+    /**
+     * Returns a value indicating whether the panel is docked.
+     */
+    IsDocked(): boolean;
+}
+/**
+ * A method that will handle the client BeforeDock event.
+ */
+interface ASPxClientDockPanelProcessingModeCancelEventHandler<S> {
+    /**
+     * A method that will handle the BeforeDock event.
+     * @param source A ASPxClientDockPanel object that raised the event.
+     * @param e A ASPxClientDockPanelProcessingModeCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDockPanelProcessingModeCancelEventArgs): void;
+}
+/**
+ * Provides data for the BeforeDock event.
+ */
+interface ASPxClientDockPanelProcessingModeCancelEventArgs extends ASPxClientProcessingModeCancelEventArgs {
+    /**
+     * Gets the zone currently being processed.
+     * Value: An ASPxClientDockZone object that is the processed zone.
+     */
+    zone: ASPxClientDockZone;
+}
+/**
+ * A method that will handle the client BeforeDock event.
+ */
+interface ASPxClientDockPanelProcessingModeEventHandler<S> {
+    /**
+     * A method that will handle the AfterFloat event.
+     * @param source A ASPxClientDockPanel object that raised the event.
+     * @param e A ASPxClientDockPanelProcessingModeEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDockPanelProcessingModeEventArgs): void;
+}
+/**
+ * Provides data for the AfterFloat event.
+ */
+interface ASPxClientDockPanelProcessingModeEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the zone currently being processed.
+     * Value: An ASPxClientDockZone object that is the processed zone.
+     */
+    zone: ASPxClientDockZone;
+}
+/**
+ * A client-side equivalent of the ASPxDockZone object.
+ */
+interface ASPxClientDockZone extends ASPxClientControl {
+    /**
+     * Gets or sets the unique identifier of a zone on a page.
+     * Value: A string that is the unique identifier of a zone.
+     */
+    zoneUID: string;
+    /**
+     * Fires on the client side before a panel is docked in a zone and allows you to cancel the action.
+     */
+    BeforeDock: ASPxClientEvent<ASPxClientDockZoneCancelEventHandler<ASPxClientDockZone>>;
+    /**
+     * Fires on the client side after a panel is docked in a zone.
+     */
+    AfterDock: ASPxClientEvent<ASPxClientDockZoneProcessingModeEventHandler<ASPxClientDockZone>>;
+    /**
+     * Returns a value that indicates the orientation in which panels are stacked in the current zone.
+     */
+    IsVertical(): boolean;
+    /**
+     * Gets a value that indicates whether the zone can enlarge its size.
+     */
+    GetAllowGrowing(): boolean;
+    /**
+     * Gets the number of panels contained in the zone.
+     */
+    GetPanelCount(): number;
+    /**
+     * Returns a panel specified by its unique identifier (panelUID).
+     * @param panelUID A string value specifying the unique identifier of the panel.
+     */
+    GetPanelByUID(panelUID: string): ASPxClientDockPanel;
+    /**
+     * Returns a panel specified by its visible index.
+     * @param visibleIndex An integer value specifying the panel's position among the visible panels within the current zone.
+     */
+    GetPanelByVisibleIndex(visibleIndex: number): ASPxClientDockPanel;
+    /**
+     * Returns an array of panels docked in the current zone.
+     */
+    GetPanels(): ASPxClientDockPanel[];
+    /**
+     * Returns an array of panels that are docked in the current zone and meet a specified criteria.
+     * @param filterPredicate An ASPxClientDockingFilterPredicate delegate that defines a set of criteria and determines whether a panel meets those criteria.
+     */
+    GetPanels(filterPredicate: ASPxClientDockingFilterPredicate): ASPxClientDockPanel[];
+}
+/**
+ * A method that will handle the client BeforeDock event.
+ */
+interface ASPxClientDockZoneCancelEventHandler<S> {
+    /**
+     * A method that will handle the BeforeDock event.
+     * @param source The event source. This parameter identifies the zone object which raised the event.
+     * @param e A ASPxClientDockZoneCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDockZoneCancelEventArgs): void;
+}
+/**
+ * Provides data for the BeforeDock event.
+ */
+interface ASPxClientDockZoneCancelEventArgs extends ASPxClientProcessingModeCancelEventArgs {
+    /**
+     * Gets the panel currently being processed.
+     * Value: An ASPxClientDockPanel object that is the processed panel.
+     */
+    panel: ASPxClientDockPanel;
+}
+/**
+ * A method that will handle the client AfterDock event.
+ */
+interface ASPxClientDockZoneProcessingModeEventHandler<S> {
+    /**
+     * A method that will handle the AfterDock event.
+     * @param source The event source. This parameter identifies the zone object which raised the event.
+     * @param e An  ASPxClientDockZoneProcessingModeEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientDockZoneProcessingModeEventArgs): void;
+}
+/**
+ * Provides data for the AfterDock event.
+ */
+interface ASPxClientDockZoneProcessingModeEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the panel currently being processed.
+     * Value: An ASPxClientDockPanel object that is the processed panel.
+     */
+    panel: ASPxClientDockPanel;
+}
+/**
+ * Represents the client-side equivalent of the ASPxFileManager control.
+ */
+interface ASPxClientFileManager extends ASPxClientControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientFileManager>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientFileManager.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires on the client side after the selected file has been changed.
+     */
+    SelectedFileChanged: ASPxClientEvent<ASPxClientFileManagerFileEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires on the client side when an end-user opens a file by double-clicking it or pressing the Enter key.
+     */
+    SelectedFileOpened: ASPxClientEvent<ASPxClientFileManagerFileOpenedEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires after the focused item has been changed.
+     */
+    FocusedItemChanged: ASPxClientEvent<ASPxClientFileManagerFocusedItemChangedEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires after the selection has been changed.
+     */
+    SelectionChanged: ASPxClientEvent<ASPxClientFileManagerSelectionChangedEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires on the client side after the current folder has been changed within a file manager.
+     */
+    CurrentFolderChanged: ASPxClientEvent<ASPxClientFileManagerCurrentFolderChangedEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires on the client side before the folder is created, and allows you to cancel the action.
+     */
+    FolderCreating: ASPxClientEvent<ASPxClientFileManagerItemEditingEventHandler<ASPxClientFileManager>>;
+    /**
+     * Occurs on the client side after a folder has been created.
+     */
+    FolderCreated: ASPxClientEvent<ASPxClientFileManagerItemCreatedEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires on the client side before an item is renamed and allows you to cancel the action.
+     */
+    ItemRenaming: ASPxClientEvent<ASPxClientFileManagerItemEditingEventHandler<ASPxClientFileManager>>;
+    /**
+     * Occurs on the client side after a file manager's item has been renamed.
+     */
+    ItemRenamed: ASPxClientEvent<ASPxClientFileManagerItemRenamedEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires on the client side before an item is deleted and allows you to cancel the action.
+     */
+    ItemDeleting: ASPxClientEvent<ASPxClientFileManagerItemEditingEventHandler<ASPxClientFileManager>>;
+    /**
+     * Occurs on the client side after a file manager's item has been deleted.
+     */
+    ItemDeleted: ASPxClientEvent<ASPxClientFileManagerItemDeletedEventHandler<ASPxClientFileManager>>;
+    /**
+     * Occurs on the client side after all the selected items have been deleted.
+     */
+    ItemsDeleted: ASPxClientEvent<ASPxClientFileManagerItemsDeletedEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires on the client side before an item is moved and allows you to cancel the action.
+     */
+    ItemMoving: ASPxClientEvent<ASPxClientFileManagerItemEditingEventHandler<ASPxClientFileManager>>;
+    /**
+     * Occurs on the client side after a file manager's item has been moved.
+     */
+    ItemMoved: ASPxClientEvent<ASPxClientFileManagerItemMovedEventHandler<ASPxClientFileManager>>;
+    /**
+     * Occurs on the client side after all the selected items have been moved .
+     */
+    ItemsMoved: ASPxClientEvent<ASPxClientFileManagerItemsMovedEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires on the client side before an item is copied and allows you to cancel the action.
+     */
+    ItemCopying: ASPxClientEvent<ASPxClientFileManagerItemEditingEventHandler<ASPxClientFileManager>>;
+    /**
+     * Occurs on the client side after a file manager item has been copied.
+     */
+    ItemCopied: ASPxClientEvent<ASPxClientFileManagerItemCopiedEventHandler<ASPxClientFileManager>>;
+    /**
+     * Occurs on the client side after all the selected items have been copied.
+     */
+    ItemsCopied: ASPxClientEvent<ASPxClientFileManagerItemsCopiedEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires on the client if any error occurs while editing an item.
+     */
+    ErrorOccurred: ASPxClientEvent<ASPxClientFileManagerErrorEventHandler<ASPxClientFileManager>>;
+    /**
+     * Enables you to display the alert with the result error description.
+     */
+    ErrorAlertDisplaying: ASPxClientEvent<ASPxClientFileManagerErrorAlertDisplayingEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires when a custom item is clicked, allowing you to perform custom actions.
+     */
+    CustomCommand: ASPxClientEvent<ASPxClientFileManagerCustomCommandEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires on the client side when the file manager updates the state of toolbar or context menu items.
+     */
+    ToolbarUpdating: ASPxClientEvent<ASPxClientFileManagerToolbarUpdatingEventHandler<ASPxClientFileManager>>;
+    /**
+     * Enables you to highlight the search text, which is specified using the filter box, in templates.
+     */
+    HighlightItemTemplate: ASPxClientEvent<ASPxClientFileManagerHighlightItemTemplateEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires on the client side before a file upload starts, and allows you to cancel the action.
+     */
+    FileUploading: ASPxClientEvent<ASPxClientFileManagerFileUploadingEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires on the client side before the selected items are uploaded and allows you to cancel the action.
+     */
+    FilesUploading: ASPxClientEvent<ASPxClientFileManagerFilesUploadingEventHandler<ASPxClientFileManager>>;
+    /**
+     * Occurs on the client side after a file has been uploaded.
+     */
+    FileUploaded: ASPxClientEvent<ASPxClientFileManagerFileUploadedEventHandler<ASPxClientFileManager>>;
+    /**
+     * Occurs on the client side after upload of all selected files has been completed.
+     */
+    FilesUploaded: ASPxClientEvent<ASPxClientFileManagerFilesUploadedEventHandler<ASPxClientFileManager>>;
+    /**
+     * Enables you to specify whether the selected file(s) are valid and provide an error text.
+     */
+    FileUploadValidationErrorOccurred: ASPxClientEvent<ASPxClientUploadControlValidationErrorOccurredEventHandler<ASPxClientFileManager>>;
+    /**
+     * Fires on the client side before a file download starts, and allows you to cancel the action.
+     */
+    FileDownloading: ASPxClientEvent<ASPxClientFileManagerFileDownloadingEventHandler<ASPxClientFileManager>>;
+    /**
+     * Gets the name of the currently active file manager area.
+     */
+    GetActiveAreaName(): string;
+    /**
+     * Client-side scripting method which initiates a round trip to the server, so that the current page will be reloaded.
+     */
+    Refresh(): void;
+    /**
+     * Executes the specified command.
+     * @param commandName A string value that specifies the command to perform.
+     */
+    ExecuteCommand(commandName: string): boolean;
+    /**
+     * Returns the selected file within the ASPxFileManager control's file container.
+     */
+    GetSelectedFile(): ASPxClientFileManagerFile;
+    /**
+     * Returns an array of the file manager's selected items.
+     */
+    GetSelectedItems(): ASPxClientFileManagerFile[];
+    /**
+     * Returns a list of files that are loaded on the current page.
+     */
+    GetItems(): ASPxClientFileManagerFile[];
+    /**
+     * Sends a callback to the server and returns a list of files that are contained within the current folder.
+     * @param onCallback A  object that represents the JavaScript function which receives the list of row values as a parameter.
+     */
+    GetAllItems(onCallback: ASPxClientFileManagerAllItemsCallback): void;
+    /**
+     * Returns a toolbar item specified by its command name.
+     * @param commandName A string value specifying the command name of the item.
+     */
+    GetToolbarItemByCommandName(commandName: string): ASPxClientFileManagerToolbarItem;
+    /**
+     * Returns a context menu item specified by its command name.
+     * @param commandName A string value specifying the command name of the item.
+     */
+    GetContextMenuItemByCommandName(commandName: string): ASPxClientFileManagerToolbarItem;
+    /**
+     * Gets the current folder's path.
+     */
+    GetCurrentFolderPath(): string;
+    /**
+     * Gets the current folder's path with the specified separator.
+     * @param separator A string value that specifies the separator between the folder's name within a path.
+     */
+    GetCurrentFolderPath(separator: string): string;
+    /**
+     * Gets the current folder's path with the specified settings.
+     * @param separator A string value that specifies the separator between the folder's name within the path.
+     * @param skipRootFolder true to skip the root folder; otherwise, false.
+     */
+    GetCurrentFolderPath(separator: string, skipRootFolder: boolean): string;
+    /**
+     * Sets the current folder's path.
+     * @param path A String value that is the relative path to the folder (without the root folder).
+     * @param onCallback A ASPxClientFileManagerCallback object that is the JavaScript function that receives the callback data as a parameter.
+     */
+    SetCurrentFolderPath(path: string, onCallback: ASPxClientFileManagerCallback): void;
+    /**
+     * Gets the current folder's ID.
+     */
+    GetCurrentFolderId(): string;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that specifies any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(args: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param args A string value that specifies any information that needs to be sent to the server-side CustomCallback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(args: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * A JavaScript function which receives callback data obtained via a call to the client SetCurrentFolderPath method.
+ */
+interface ASPxClientFileManagerCallback {
+    /**
+     * A JavaScript function that receives callback data obtained via a call to the SetCurrentFolderPath method.
+     * @param result An object that contains a callback data.
+     */
+    (result: Object): void;
+}
+/**
+ * A client-side equivalent of the file manager's FileManagerItem object and serves as a base class for client file and folder objects.
+ */
+interface ASPxClientFileManagerItem {
+    /**
+     * Gets the name of the current item.
+     * Value: A string value that is the item's name.
+     */
+    name: string;
+    /**
+     * Gets the item's unique identifier.
+     * Value: A String value that specifies the item's unique identifier.
+     */
+    id: string;
+    /**
+     * Gets a value that indicates if the current file manager item is a folder.
+     * Value: true if the current item is a folder or parent folder; false if the current item is a file.
+     */
+    isFolder: boolean;
+    /**
+     * Specifies whether the file manager item is selected.
+     * @param selected true, to select the item; otherwise, false.
+     */
+    SetSelected(selected: boolean): void;
+    /**
+     * Gets a value indicating whether the item is selected in the file manager.
+     */
+    IsSelected(): boolean;
+    /**
+     * Gets the current item's full name.
+     */
+    GetFullName(): string;
+    /**
+     * Gets the current item's full name with the specified separator.
+     * @param separator A string value that specifies the separator between the folder name inside the item's full name.
+     */
+    GetFullName(separator: string): string;
+    /**
+     * Gets the current item's full name with the specified settings.
+     * @param separator A string value that specifies the separator between the folder name inside the item's full name.
+     * @param skipRootFolder true, to skip the root folder; otherwise, false.
+     */
+    GetFullName(separator: string, skipRootFolder: boolean): string;
+}
+/**
+ * Represents the client-side equivalent of the FileManagerFile object.
+ */
+interface ASPxClientFileManagerFile extends ASPxClientFileManagerItem {
+    /**
+     * Downloads a file from a file manager.
+     */
+    Download(): void;
+}
+/**
+ * A client-side equivalent of the FileManagerFolder object.
+ */
+interface ASPxClientFileManagerFolder extends ASPxClientFileManagerItem {
+    /**
+     * Gets a value specifying whether an item is a parent folder.
+     * Value: true if an item is a parent folder; false if an item is a file or folder.
+     */
+    isParentFolder: boolean;
+}
+/**
+ * A JavaScript function which receives callback data obtained by a call to the client GetAllItems method.
+ */
+interface ASPxClientFileManagerAllItemsCallback {
+    /**
+     * A JavaScript function which receives callback data obtained by a call to the client GetAllItems method.
+     * @param items An array of ASPxClientFileManagerItem objects that are items contained in the current folder.
+     */
+    (items: ASPxClientFileManagerItem[]): void;
+}
+/**
+ * A method that will handle the client SelectedFileOpened events.
+ */
+interface ASPxClientFileManagerFileEventHandler<S> {
+    /**
+     * A method that will handle the SelectedFileOpened events.
+     * @param source An object representing the event's source.
+     * @param e An ASPxClientFileManagerFileEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerFileEventArgs): void;
+}
+/**
+ * Provides data for the SelectedFileOpened events.
+ */
+interface ASPxClientFileManagerFileEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets a file related to the event.
+     * Value: An ASPxClientFileManagerFile object that represents a file currently being processed.
+     */
+    file: ASPxClientFileManagerFile;
+}
+/**
+ * A method that will handle the client SelectedFileOpened event.
+ */
+interface ASPxClientFileManagerFileOpenedEventHandler<S> {
+    /**
+     * A method that will handle the SelectedFileOpened event.
+     * @param source The event source. This parameter identifies the file manager object which raised the event.
+     * @param e An ASPxClientFileManagerFileOpenedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerFileOpenedEventArgs): void;
+}
+/**
+ * Provides data for the SelectedFileOpened event.
+ */
+interface ASPxClientFileManagerFileOpenedEventArgs extends ASPxClientFileManagerFileEventArgs {
+    /**
+     * Gets or sets a value that specifies whether the event should be finally processed on the server side.
+     * Value: true to process the event on the server side; false to completely handle it on the client side.
+     */
+    processOnServer: boolean;
+}
+/**
+ * Serves as a base for classes that are used as arguments for events generated on the client side.
+ */
+interface ASPxClientFileManagerActionEventArgsBase extends ASPxClientEventArgs {
+    /**
+     * Gets the full name of the item currently being processed.
+     * Value: A string value that is the item's full name.
+     */
+    fullName: string;
+    /**
+     * Gets the name of the currently processed item.
+     * Value: A string value that specifies the item's name.
+     */
+    name: string;
+    /**
+     * Gets a value specifying whether the current processed item is a folder.
+     * Value: true if the processed  item is a folder; false if the processed item is a file.
+     */
+    isFolder: boolean;
+}
+/**
+ * A method that will handle the client ItemRenaming events.
+ */
+interface ASPxClientFileManagerItemEditingEventHandler<S> {
+    /**
+     * A method that will handle the ItemRenaming events.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerItemEditingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerItemEditingEventArgs): void;
+}
+/**
+ * Provides data for the item editing event.
+ */
+interface ASPxClientFileManagerItemEditingEventArgs extends ASPxClientFileManagerActionEventArgsBase {
+    /**
+     * Gets or sets a value indicating whether the action which raised the event should be canceled.
+     * Value: true if the action that raised the event should be canceled; otherwise, false.
+     */
+    cancel: boolean;
+}
+/**
+ * A method that will handle the client ItemRenamed event.
+ */
+interface ASPxClientFileManagerItemRenamedEventHandler<S> {
+    /**
+     * A method that will handle the ItemRenamed event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerItemRenamedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerItemRenamedEventArgs): void;
+}
+/**
+ * Provides data for the ItemRenamed event.
+ */
+interface ASPxClientFileManagerItemRenamedEventArgs extends ASPxClientFileManagerActionEventArgsBase {
+    /**
+     * Gets the previous name of the renamed item.
+     * Value: A  string value that specifies the item name.
+     */
+    oldName: string;
+}
+/**
+ * A method that will handle the client ItemDeleted event.
+ */
+interface ASPxClientFileManagerItemDeletedEventHandler<S> {
+    /**
+     * A method that will handle the ItemDeleted event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerItemDeletedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerItemDeletedEventArgs): void;
+}
+/**
+ * Provides data for the ItemDeleted event.
+ */
+interface ASPxClientFileManagerItemDeletedEventArgs extends ASPxClientFileManagerActionEventArgsBase {
+}
+/**
+ * A method that will handle the client ItemsDeleted event.
+ */
+interface ASPxClientFileManagerItemsDeletedEventHandler<S> {
+    /**
+     * A method that will handle the ItemsDeleted event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerItemsDeletedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerItemsDeletedEventArgs): void;
+}
+/**
+ * Provides data for the ItemsDeleted event.
+ */
+interface ASPxClientFileManagerItemsDeletedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets an array of the currently processed items.
+     * Value: An array of ASPxClientFileManagerItem objects that are items currently being processed.
+     */
+    items: ASPxClientFileManagerItem[];
+}
+/**
+ * A method that will handle the client ItemMoved event.
+ */
+interface ASPxClientFileManagerItemMovedEventHandler<S> {
+    /**
+     * A method that will handle the ItemMoved event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerItemMovedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerItemMovedEventArgs): void;
+}
+/**
+ * Provides data for the ItemMoved event.
+ */
+interface ASPxClientFileManagerItemMovedEventArgs extends ASPxClientFileManagerActionEventArgsBase {
+    /**
+     * Gets the full name of the folder from which an item is moved.
+     * Value: A string value that specifies the folder's full name.
+     */
+    oldFolderFullName: string;
+}
+/**
+ * A method that will handle the client ItemsMoved event.
+ */
+interface ASPxClientFileManagerItemsMovedEventHandler<S> {
+    /**
+     * A method that will handle the ItemsMoved event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerItemsMovedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerItemsMovedEventArgs): void;
+}
+/**
+ * Provides data for the ItemsMoved event.
+ */
+interface ASPxClientFileManagerItemsMovedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets an array of the currently processed items.
+     * Value: An array of ASPxClientFileManagerItem objects that are items currently being processed.
+     */
+    items: ASPxClientFileManagerItem[];
+    /**
+     * Gets the full name of the folder from which items are moved.
+     * Value: A string value that specifies the folder's full name.
+     */
+    oldFolderFullName: string;
+}
+/**
+ * A method that will handle the client ItemCopied event.
+ */
+interface ASPxClientFileManagerItemCopiedEventHandler<S> {
+    /**
+     * A method that will handle the ItemCopied event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerItemCopiedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerItemCopiedEventArgs): void;
+}
+/**
+ * Provides data for the ItemCopied event.
+ */
+interface ASPxClientFileManagerItemCopiedEventArgs extends ASPxClientFileManagerActionEventArgsBase {
+    /**
+     * Gets the full name of the folder from which an item is copied.
+     * Value: A string value that specifies the folder's full name.
+     */
+    oldFolderFullName: string;
+}
+/**
+ * A method that will handle the client ItemsCopied event.
+ */
+interface ASPxClientFileManagerItemsCopiedEventHandler<S> {
+    /**
+     * A method that will handle the ItemsCopied event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerItemsCopiedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerItemsCopiedEventArgs): void;
+}
+/**
+ * Provides data for the ItemsCopied event.
+ */
+interface ASPxClientFileManagerItemsCopiedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets an array of the currently processed items.
+     * Value: An array of ASPxClientFileManagerItem objects that are items currently being processed.
+     */
+    items: ASPxClientFileManagerItem[];
+    /**
+     * Gets the full name of the folder from which items are copied.
+     * Value: A string value that specifies the folder's full name.
+     */
+    oldFolderFullName: string;
+}
+/**
+ * A method that will handle the client FolderCreated event.
+ */
+interface ASPxClientFileManagerItemCreatedEventHandler<S> {
+    /**
+     * A method that will handle the FolderCreated event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerItemCreatedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerItemCreatedEventArgs): void;
+}
+/**
+ * Provides data for the FolderCreated event.
+ */
+interface ASPxClientFileManagerItemCreatedEventArgs extends ASPxClientFileManagerActionEventArgsBase {
+}
+/**
+ * A method that will handle the client ErrorOccurred event.
+ */
+interface ASPxClientFileManagerErrorEventHandler<S> {
+    /**
+     * A method that will handle the client ErrorOccurred event.
+     * @param source An object representing the event's source.
+     * @param e An ASPxClientFileManagerErrorEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerErrorEventArgs): void;
+}
+/**
+ * Provides data for the ErrorOccurred event.
+ */
+interface ASPxClientFileManagerErrorEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name of the processed command.
+     * Value: A string value representing the processed command's name.
+     */
+    commandName: string;
+    /**
+     * Gets or sets the error description.
+     * Value: A string value specifying the error description.
+     */
+    errorText: string;
+    /**
+     * Gets or sets a value specifying whether an event error message is sent to the ErrorAlertDisplaying event.
+     * Value: true to sent an error message; otherwise, false.
+     */
+    showAlert: boolean;
+    /**
+     * Gets a specifically generated code that uniquely identifies an error, which occurs while editing an item.
+     * Value: An integer value that specifies the code uniquely identifying an error.
+     */
+    errorCode: number;
+}
+/**
+ * A method that will handle the client ErrorAlertDisplaying event.
+ */
+interface ASPxClientFileManagerErrorAlertDisplayingEventHandler<S> {
+    /**
+     * A method that will handle the ErrorAlertDisplaying event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerErrorAlertDisplayingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerErrorAlertDisplayingEventArgs): void;
+}
+/**
+ * Provides data for the ErrorAlertDisplaying event.
+ */
+interface ASPxClientFileManagerErrorAlertDisplayingEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name of the processed command.
+     * Value: A string value that is the processed command's name.
+     */
+    commandName: string;
+    /**
+     * Gets or sets the errors description.
+     * Value: A string that is the errors description.
+     */
+    errorText: string;
+    /**
+     * Gets or sets a value specifying whether an alert message is displayed when the event fires.
+     * Value: true to display an alert message; otherwise, false.
+     */
+    showAlert: boolean;
+}
+/**
+ * A method that will handle the client FileUploading event.
+ */
+interface ASPxClientFileManagerFileUploadingEventHandler<S> {
+    /**
+     * A method that will handle the FileUploading event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerFileUploadingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerFileUploadingEventArgs): void;
+}
+/**
+ * Provides data for the FileUploading event.
+ */
+interface ASPxClientFileManagerFileUploadingEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the path to the folder where a file is being uploaded.
+     * Value: A string value specifying the path where a file is being uploaded.
+     */
+    folder: string;
+    /**
+     * Gets the name of a file selected for upload.
+     * Value: A string value that specifies the file name.
+     */
+    fileName: string;
+    /**
+     * Gets or sets a value indicating whether the action which raised the event should be canceled.
+     * Value: true if the action that raised the event should be canceled; otherwise, false.
+     */
+    cancel: boolean;
+}
+/**
+ * A method that will handle the client FilesUploading event.
+ */
+interface ASPxClientFileManagerFilesUploadingEventHandler<S> {
+    /**
+     * A method that will handle the FilesUploading event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerFilesUploadingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerFilesUploadingEventArgs): void;
+}
+/**
+ * Provides data for the FilesUploading event.
+ */
+interface ASPxClientFileManagerFilesUploadingEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the path to the folder where files are being uploaded.
+     * Value: A string value specifying the folder path.
+     */
+    folder: string;
+    /**
+     * Gets the names of files selected for upload.
+     * Value: An array of string values that are the file names.
+     */
+    fileNames: string[];
+    /**
+     * Gets or sets a value indicating whether the action which raised the event should be canceled.
+     * Value: true if the action that raised the event should be canceled; otherwise, false.
+     */
+    cancel: boolean;
+}
+/**
+ * A method that will handle the client FileUploaded event.
+ */
+interface ASPxClientFileManagerFileUploadedEventHandler<S> {
+    /**
+     * A method that will handle the FileUploaded event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerFileUploadedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerFileUploadedEventArgs): void;
+}
+/**
+ * Provides data for the FileUploaded event.
+ */
+interface ASPxClientFileManagerFileUploadedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the path to the folder where a file is uploaded.
+     * Value: A string value specifying the uploaded file path.
+     */
+    folder: string;
+    /**
+     * Gets the name of the uploaded file.
+     * Value: A string value that specifies the file name.
+     */
+    fileName: string;
+}
+/**
+ * A method that will handle the client FilesUploaded event.
+ */
+interface ASPxClientFileManagerFilesUploadedEventHandler<S> {
+    /**
+     * A method that will handle the FilesUploaded event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerFilesUploadedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerFilesUploadedEventArgs): void;
+}
+/**
+ * Provides data for the FilesUploaded event.
+ */
+interface ASPxClientFileManagerFilesUploadedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the path to the folder where files are uploaded.
+     * Value: A string value specifying the uploaded files path.
+     */
+    folder: string;
+    /**
+     * Gets an array of uploaded file names.
+     * Value: An array of string values that are the file names.
+     */
+    fileNames: string[];
+}
+/**
+ * A method that will handle the client FileDownloading event.
+ */
+interface ASPxClientFileManagerFileDownloadingEventHandler<S> {
+    /**
+     * A method that will handle the FileDownloading event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerFileDownloadingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerFileDownloadingEventArgs): void;
+}
+/**
+ * Provides data for the FileDownloading event.
+ */
+interface ASPxClientFileManagerFileDownloadingEventArgs extends ASPxClientFileManagerFileEventArgs {
+    /**
+     * Gets or sets a value indicating whether the action which raised the event, should be canceled.
+     * Value: true, if the action that raised the event should be canceled; otherwise, false.
+     */
+    cancel: boolean;
+}
+/**
+ * A method that will handle the client FocusedItemChanged event.
+ */
+interface ASPxClientFileManagerFocusedItemChangedEventHandler<S> {
+    /**
+     * A method that will handle the FocusedItemChanged event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerFocusedItemChangedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerFocusedItemChangedEventArgs): void;
+}
+/**
+ * Provides data for the FocusedItemChanged event.
+ */
+interface ASPxClientFileManagerFocusedItemChangedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the file manager item object related to the event.
+     * Value: An <see cref="ASPxClientFileManagerItem" /> object, manipulations on which forced the event to be raised.
+     */
+    item: ASPxClientFileManagerItem;
+    /**
+     * Gets the name of the focused item.
+     * Value: A string value that specifies the item's name.
+     */
+    name: string;
+    /**
+     * Gets the full name of the item currently being processed.
+     * Value: A string value that is the item's full name.
+     */
+    fullName: string;
+}
+/**
+ * A method that will handle the client CurrentFolderChanged event.
+ */
+interface ASPxClientFileManagerCurrentFolderChangedEventHandler<S> {
+    /**
+     * A method that will handle the CurrentFolderChanged event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerCurrentFolderChangedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerCurrentFolderChangedEventArgs): void;
+}
+/**
+ * Provides data for the CurrentFolderChanged event.
+ */
+interface ASPxClientFileManagerCurrentFolderChangedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name of the currently processed folder.
+     * Value: A string value that specifies the folder's name.
+     */
+    name: string;
+    /**
+     * Gets the full name of the folder currently being processed.
+     * Value: A string value that is the folder's full name.
+     */
+    fullName: string;
+}
+/**
+ * A method that will handle the client SelectionChanged event.
+ */
+interface ASPxClientFileManagerSelectionChangedEventHandler<S> {
+    /**
+     * A method that will handle the SelectionChanged event.
+     * @param source The event source. Identifies the ASPxFileManager control that raised the event.
+     * @param e A ASPxClientFileManagerSelectionChangedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerSelectionChangedEventArgs): void;
+}
+/**
+ * Provides data for the SelectionChanged event.
+ */
+interface ASPxClientFileManagerSelectionChangedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the file manager item object related to the event.
+     * Value: An <see cref="ASPxClientFileManagerItem" /> object, manipulations on which forced the event to be raised.
+     */
+    item: ASPxClientFileManagerItem;
+    /**
+     * Gets the name of the currently processed file.
+     * Value: A string value that specifies the file's name.
+     */
+    name: string;
+    /**
+     * Gets the full name of the file currently being processed.
+     * Value: A string value that is the file's full name.
+     */
+    fullName: string;
+    /**
+     * Gets whether the item has been selected.
+     * Value: true if the file has been selected; otherwise, false.
+     */
+    isSelected: boolean;
+}
+/**
+ * A method that will handle the CustomCommand event.
+ */
+interface ASPxClientFileManagerCustomCommandEventHandler<S> {
+    /**
+     * A method that will handle the CustomCommand event.
+     * @param source The event source.
+     * @param e An ASPxClientFileManagerCustomCommandEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerCustomCommandEventArgs): void;
+}
+/**
+ * Provides data for the CustomCommand event.
+ */
+interface ASPxClientFileManagerCustomCommandEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name of the processed command.
+     * Value: A string value that is the processed command's name.
+     */
+    commandName: string;
+}
+/**
+ * A method that will handle the ToolbarUpdating event.
+ */
+interface ASPxClientFileManagerToolbarUpdatingEventHandler<S> {
+    /**
+     * A method that will handle the ToolbarUpdating event.
+     * @param source The event source.
+     * @param e An ASPxClientFileManagerToolbarUpdatingEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerToolbarUpdatingEventArgs): void;
+}
+/**
+ * Provides data for the ToolbarUpdating event.
+ */
+interface ASPxClientFileManagerToolbarUpdatingEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the name of the currently active file manager area.
+     * Value: A string value that identifies the active area.
+     */
+    activeAreaName: string;
+}
+/**
+ * A method that will handle the client HighlightItemTemplate event.
+ */
+interface ASPxClientFileManagerHighlightItemTemplateEventHandler<S> {
+    /**
+     * A method that will handle the HighlightItemTemplate event.
+     * @param source The event source. This parameter identifies the file manager object that raised the event.
+     * @param e An ASPxClientFileManagerHighlightItemTemplateEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFileManagerHighlightItemTemplateEventArgs): void;
+}
+/**
+ * Provides data for the HighlightItemTemplate event.
+ */
+interface ASPxClientFileManagerHighlightItemTemplateEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets a string that is a filter value specified by the filter box.
+     * Value: A string that is a filter value.
+     */
+    filterValue: string;
+    /**
+     * Gets the name of the item currently being processed.
+     * Value: A string that is the item name.
+     */
+    itemName: string;
+    /**
+     * Gets an element containing the item template.
+     * Value: An object that is an element containing the item template.
+     */
+    templateElement: string;
+    /**
+     * Get the name of the cascading style sheet (CSS) class associated with an item in the highlighted state.
+     * Value: A string that is the name of a CSS class.
+     */
+    highlightCssClassName: string;
+}
+/**
+ * Represents a client-side equivalent of the menu's MenuItem object.
+ */
+interface ASPxClientMenuItem {
+    /**
+     * Gets the menu object to which the current item belongs.
+     * Value: An ASPxClientMenuBase object representing the menu to which the item belongs.
+     */
+    menu: ASPxClientMenuBase;
+    /**
+     * Gets the immediate parent item to which the current item belongs.
+     * Value: An ASPxClientMenuItem object representing the item's immediate parent.
+     */
+    parent: ASPxClientMenuItem;
+    /**
+     * Gets the item's index within the parent's collection of items.
+     * Value: An integer value representing the item's zero-based index within the Items collection of the parent object (a menu or item) to which the item belongs.
+     */
+    index: number;
+    /**
+     * Gets the name that uniquely identifies the menu item.
+     * Value: A string value that represents the value assigned to the item's Name property.
+     */
+    name: string;
+    /**
+     * For internal use only.
+     */
+    indexPath: string;
+    /**
+     * Returns the number of the current menu item's immediate child items.
+     */
+    GetItemCount(): number;
+    /**
+     * Returns the current menu item's immediate subitem specified by its index.
+     * @param index An integer value specifying the zero-based index of the submenu item to be retrieved.
+     */
+    GetItem(index: number): ASPxClientMenuItem;
+    /**
+     * Returns the current menu item's subitem specified by its name.
+     * @param name A string value specifying the name of the menu item.
+     */
+    GetItemByName(name: string): ASPxClientMenuItem;
+    /**
+     * Indicates whether the menu item is checked.
+     */
+    GetChecked(): boolean;
+    /**
+     * Specifies whether the menu item is checked.
+     * @param value true if the menu item is checked; otherwise, false.
+     */
+    SetChecked(value: boolean): void;
+    /**
+     * Returns a value specifying whether a menu item is enabled.
+     */
+    GetEnabled(): boolean;
+    /**
+     * Specifies whether the menu item is enabled.
+     * @param value true to enable the menu item; otherwise, false.
+     */
+    SetEnabled(value: boolean): void;
+    /**
+     * Returns the URL pointing to the image displayed within the menu item.
+     */
+    GetImageUrl(): string;
+    /**
+     * Sets the URL which points to the image displayed within the menu item.
+     * @param value A string value specifying the URL to the image displayed within the menu item.
+     */
+    SetImageUrl(value: string): void;
+    /**
+     * Gets a URL which defines the navigation location for the menu item.
+     */
+    GetNavigateUrl(): string;
+    /**
+     * Specifies a URL which defines the navigation location for the menu item.
+     * @param value A string value which specifies a URL to where the client web browser will navigate when the menu item is clicked.
+     */
+    SetNavigateUrl(value: string): void;
+    /**
+     * Returns text displayed within the menu item.
+     */
+    GetText(): string;
+    /**
+     * Sets the text to be displayed within the menu item.
+     * @param value A string value specifying the text to be displayed within the menu item.
+     */
+    SetText(value: string): void;
+    /**
+     * Returns a value specifying whether a menu item is displayed.
+     */
+    GetVisible(): boolean;
+    /**
+     * Specifies the menu item's visibility.
+     * @param value true if the menu item is visible; otherwise, false.
+     */
+    SetVisible(value: boolean): void;
+}
+/**
+ * A client-side equivalent of the file manager's FileManagerToolbarItemBase object.
+ */
+interface ASPxClientFileManagerToolbarItem extends ASPxClientMenuItem {
+    /**
+     * This property is not in effect for the ASPxClientFileManagerToolbarItem class.
+     */
+    menu: ASPxClientMenuBase;
+    /**
+     * This property is not in effect for the ASPxClientFileManagerToolbarItem class.
+     */
+    parent: ASPxClientMenuItem;
+    /**
+     * This property is not in effect for the ASPxClientFileManagerToolbarItem class.
+     */
+    index: number;
+}
+/**
+ * A client-side equivalent of the ASPxFormLayout's LayoutItem object.
+ */
+interface ASPxClientLayoutItem {
+    /**
+     * Gets the form layout object to which the current item belongs.
+     * Value: An <see cref="ASPxClientFormLayout" /> object representing the form layout to which the item belongs.
+     */
+    formLayout: ASPxClientFormLayout;
+    /**
+     * Gets the name that uniquely identifies the layout item.
+     * Value: A string value that represents the value assigned to the layout item's Name property.
+     */
+    name: string;
+    /**
+     * Gets the immediate parent layout item to which the current layout item belongs.
+     * Value: An <see cref="ASPxClientLayoutItem" /> object representing the item's immediate parent.
+     */
+    parent: ASPxClientLayoutItem;
+    /**
+     * Returns the current layout item's subitem specified by its name.
+     * @param name A string value specifying the name of the layout item.
+     */
+    GetItemByName(name: string): ASPxClientLayoutItem;
+    /**
+     * Returns a value specifying whether a layout item is displayed.
+     */
+    GetVisible(): boolean;
+    /**
+     * Specifies the layout item's visibility.
+     * @param value true, if the layout item is visible; otherwise, false.
+     */
+    SetVisible(value: boolean): void;
+    /**
+     * Specifies the text displayed in the layout item caption.
+     * @param caption A string value specifying the item caption.
+     */
+    SetCaption(caption: string): void;
+    /**
+     * Returns the text displayed in the layout item caption.
+     */
+    GetCaption(): string;
+}
+/**
+ * Represents a client-side equivalent of the ASPxFormLayout object.
+ */
+interface ASPxClientFormLayout extends ASPxClientControl {
+    /**
+     * Returns an item specified by its name.
+     * @param name A string value specifying the name of the item.
+     */
+    GetItemByName(name: string): ASPxClientLayoutItem;
+}
+/**
+ * Represents a client-side equivalent of the ASPxGlobalEvents component.
+ */
+interface ASPxClientGlobalEvents {
+    /**
+     * Occurs on the client side after client object models of all DevExpress web controls contained within the page have been initialized.
+     */
+    ControlsInitialized: ASPxClientEvent<ASPxClientControlsInitializedEventHandler<ASPxClientGlobalEvents>>;
+    /**
+     * Occurs when the browser window is being resized.
+     */
+    BrowserWindowResized: ASPxClientEvent<ASPxClientEventHandler<ASPxClientGlobalEvents>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated by any DevExpress control.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientGlobalBeginCallbackEventHandler<ASPxClientGlobalEvents>>;
+    /**
+     * Occurs on the client side, after server-side processing of a callback initiated by any DevExpress web control, has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientGlobalEndCallbackEventHandler<ASPxClientGlobalEvents>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by any of DevExpress web controls.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientGlobalCallbackErrorEventHandler<ASPxClientGlobalEvents>>;
+    /**
+     * Occurs on the client side after the validation initiated for a DevExpress web control (or a group of DevExpress web controls) has been completed.
+     */
+    ValidationCompleted: ASPxClientEvent<ASPxClientValidationCompletedEventHandler<ASPxClientGlobalEvents>>;
+}
+/**
+ * Represents a client-side equivalent of the ASPxHiddenField control.
+ */
+interface ASPxClientHiddenField extends ASPxClientControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientHiddenField>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientHiddenField>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientHiddenField.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientHiddenField>>;
+    /**
+     * Sends a callback to the server and generates the server-side CustomCallback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Adds a new value to the control's collection of property name/value pairs, on the client side.
+     * @param propertyName A string value that specifies the property name. It can contain letters, digits, underline characters, and dollar signs. It cannot begin with a digit character.
+     * @param propertyValue An object that represents the value of the specified property.
+     */
+    Add(propertyName: string, propertyValue: Object): void;
+    /**
+     * Returns the value with the specified property name.
+     * @param propertyName A string value that specifies the property name.
+     */
+    Get(propertyName: string): Object;
+    /**
+     * Adds a new value to the control's collection of property name/value pairs, on the client side.
+     * @param propertyName A string value that specifies the property name. It can contain letters, digits, underline characters, and dollar signs. It cannot begin with a digit character.
+     * @param propertyValue An object that represents the property value.
+     */
+    Set(propertyName: string, propertyValue: Object): void;
+    /**
+     * Removes the specified value from the ASPxHiddenField collection.
+     * @param propertyName A string value representing the property name.
+     */
+    Remove(propertyName: string): void;
+    /**
+     * Clears the ASPxHiddenField's value collection.
+     */
+    Clear(): void;
+    /**
+     * Returns a value indicating whether the value with the specified property name is contained within the ASPxHiddenField control's value collection.
+     * @param propertyName A string value that specifies the property name.
+     */
+    Contains(propertyName: string): boolean;
+}
+/**
+ * Represents the client-side equivalent of the ASPxHint control.
+ */
+interface ASPxClientHint extends ASPxClientControl {
+    /**
+     * Occurs on the client side when a hint is about to be shown.
+     */
+    Showing: ASPxClientEvent<ASPxClientHintShowingEventHandler>;
+    /**
+     * Occurs on the client side when a hint is about to be hidden.
+     */
+    Hiding: ASPxClientEvent<ASPxClientHintHidingEventHandler>;
+    /**
+     * This method is not in effect for a ASPxClientHint object.
+     */
+    GetMainElement(): Object;
+    /**
+     * Invokes a hint.
+     * @param targetElement A HTML DOM element near to which the hint is displayed in response to user interaction.
+     */
+    Show(targetElement: Object): ASPxClientHintWindow;
+    /**
+     * Invokes a hint.
+     * @param targetSelector A string value that is the CSS selector used to specify for which UI elements on a web page a hint is displayed.
+     */
+    Show(targetSelector: string): ASPxClientHintWindow;
+}
+/**
+ * Represents the client-side equivalent of the ASPxHint's window.
+ */
+interface ASPxClientHintWindow {
+    /**
+     * Forces the ASPxClientHint's window to recalculate its position.
+     */
+    UpdatePosition(): void;
+}
+/**
+ * A method that will handle the Showing event.
+ */
+interface ASPxClientHintShowingEventHandler {
+    /**
+     * A method that will handle the Showing event.
+     * @param sender The event source.
+     * @param e A ASPxClientHintShowingEventArgs object that contains the required data.
+     */
+    (sender: ASPxClientHintWindow, e: ASPxClientHintShowingEventArgs): void;
+}
+/**
+ * Provides data for the Showing event.
+ */
+interface ASPxClientHintShowingEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the object that is the hint's target element.
+     * Value: An object representing the hint's target element related to the event.
+     */
+    targetElement: Object;
+    /**
+     * Gets the object that is the hint.
+     * Value: An object representing the hint related to the event.
+     */
+    hintElement: Object;
+    /**
+     * Gets the object that is the hint's content.
+     * Value: An object representing the hint's content element related to the event.
+     */
+    contentElement: Object;
+    /**
+     * Gets the object that is the hint's title.
+     * Value: An object representing the hint's title element related to the event.
+     */
+    titleElement: Object;
+    /**
+     * Gets or sets a value indicating whether the event should be canceled.
+     * Value: true, if the event should be canceled; otherwise, false.
+     */
+    cancel: boolean;
+}
+/**
+ * A method that will handle the Hiding event.
+ */
+interface ASPxClientHintHidingEventHandler {
+    /**
+     * A method that will handle the Hiding event.
+     * @param sender The event source.
+     * @param e A ASPxClientHintHidingEventArgs object that contains the required data.
+     */
+    (sender: ASPxClientHintWindow, e: ASPxClientHintHidingEventArgs): void;
+}
+/**
+ * Provides data for the Hiding event.
+ */
+interface ASPxClientHintHidingEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the object that is the hint's target element.
+     * Value: An object representing the hint's target element.
+     */
+    targetElement: Object;
+    /**
+     * Gets the object that is the hint element.
+     * Value: An object representing the hint related to the event.
+     */
+    hintElement: Object;
+    /**
+     * Gets the object that is the hint's content.
+     * Value: An object representing the hint's content element related to the event.
+     */
+    contentElement: Object;
+    /**
+     * Gets the object that is the hint's title.
+     * Value: An object representing the hint's title element related to the event.
+     */
+    titleElement: Object;
+    /**
+     * Gets or sets a value indicating whether the event should be canceled.
+     * Value: true, if the event should be canceled; otherwise, false.
+     */
+    cancel: boolean;
+}
+/**
+ * The hint control's options.
+ */
+interface ASPxClientHintOptions {
+    /**
+     * Gets or sets which user action triggers a hint.
+     * Value: A string value that is a user action.
+     */
+    triggerAction: string;
+    /**
+     * Gets or sets the delay in displaying the hint.
+     * Value: An integer value that specifies the time interval, in milliseconds, after which a hint is displayed.
+     */
+    appearAfter: number;
+    /**
+     * Gets or sets the duration after which a hint disappears when the mouse pointer is no longer positioned over the target element.
+     * Value: The length of time (in milliseconds) a hint is displayed after the mouse pointer is no longer positioned over the target element.
+     */
+    disappearAfter: number;
+    /**
+     * Gets or sets a value that specifies whether a hint is displayed in a callout box.
+     * Value: true, to display a hint in a callout box; otherwise, false.
+     */
+    showCallout: boolean;
+    /**
+     * Gets or sets where a hint should be positioned.
+     * Value: A string value that specifies a hint position.
+     */
+    position: string;
+    /**
+     * Gets or sets a custom CSS class name that will be assigned to the root ASPxHint element.
+     * Value: A string value that is the CSS class name.
+     */
+    className: string;
+    /**
+     * Gets or sets the attribute name.
+     * Value: A string value that is the attribute name.
+     */
+    contentAttribute: string;
+    /**
+     * Gets or sets the attribute name.
+     * Value: A string value that is the attribute name.
+     */
+    titleAttribute: string;
+    /**
+     * Gets or sets the hint's content.
+     * Value: A string value that is the hint's content.
+     */
+    content: string;
+    /**
+     * Gets or sets a value that is the hint's title.
+     * Value: A string value that is the title text.
+     */
+    title: string;
+    /**
+     * Gets or sets a value that is the HTML DOM-element.
+     * Value: A string that is the DOM-element.
+     */
+    container: string;
+    /**
+     * A handler for the Showing event.
+     * Value: An <see cref="ASPxClientHintShowingEventHandler" /> delegate method allowing you to implement custom processing.
+     */
+    onShowing: ASPxClientHintShowingEventHandler;
+    /**
+     * A handler for the Hiding event.
+     * Value: An <see cref="ASPxClientHintHidingEventHandler" /> delegate method allowing you to implement custom processing.
+     */
+    onHiding: ASPxClientHintHidingEventHandler;
+    /**
+     * Gets or sets a value that is the hint's width.
+     * Value: A string value that is the hint's width.
+     */
+    width: string;
+    /**
+     * Gets or sets a value that is the hint's height.
+     * Value: A string value that is the hint's height.
+     */
+    height: string;
+    /**
+     * Gets or sets the X coordinate.
+     * Value: An integer value that is the X coordinate.
+     */
+    x: number;
+    /**
+     * Gets or sets the Y coordinate.
+     * Value: An integer value that is the Y coordinate.
+     */
+    y: number;
+    /**
+     * Gets or sets a value that specifies whether to flip the hint to the opposite position relative to the target element.
+     * Value: true, to flip the hint; otherwise, false.
+     */
+    allowFlip: boolean;
+    /**
+     * Gets or sets a value that specifies whether to shift a hint if its content and title are hidden outside of the client area.
+     * Value: true, to shift the hint; otherwise, false.
+     */
+    allowShift: boolean;
+    /**
+     * Gets or sets whether it should use animation effects when a hint appears.
+     * Value: true if animation is enabled; otherwise false.
+     */
+    animation: any;
+    /**
+     * Gets the offset of a hint.
+     * Value: An integer value.
+     */
+    offset: number;
+}
+/**
+ * The client-side equivalent of the ASPxImageGallery control.
+ */
+interface ASPxClientImageGallery extends ASPxClientDataView {
+    /**
+     * Fires on the client side before the fullscreen viewer is shown and allows you to cancel the action.
+     */
+    FullscreenViewerShowing: ASPxClientEvent<ASPxClientImageGalleryCancelEventHandler<ASPxClientImageGallery>>;
+    /**
+     * Occurs on the client side after an active item has been changed within the fullscreen viewer.
+     */
+    FullscreenViewerActiveItemIndexChanged: ASPxClientEvent<ASPxClientImageGalleryFullscreenViewerEventHandler<ASPxClientImageGallery>>;
+    /**
+     * Shows the fullscreen viewer with the specified active item.
+     * @param index An Int32 value that is an index of the active item.
+     */
+    ShowFullscreenViewer(index: number): void;
+    /**
+     * Hides the fullscreen viewer.
+     */
+    HideFullscreenViewer(): void;
+    /**
+     * Makes the specified item active within the fullscreen viewer on the client side.
+     * @param index An integer value specifying the index of the item to select.
+     * @param preventAnimation true to prevent the animation effect; false to change images using animation.
+     */
+    SetFullscreenViewerActiveItemIndex(index: number, preventAnimation: boolean): void;
+    /**
+     * Gets the number of items contained in the control's item collection.
+     */
+    GetFullscreenViewerItemCount(): number;
+    /**
+     * Returns the index of the active item within the fullscreen viewer.
+     */
+    GetFullscreenViewerActiveItemIndex(): number;
+    /**
+     * Plays a slide show within a fullscreen viewer.
+     */
+    PlaySlideShow(): void;
+    /**
+     * Pauses a slide show within a fullscreen viewer.
+     */
+    PauseSlideShow(): void;
+}
+/**
+ * A method that will handle the client FullscreenViewerShowing event.
+ */
+interface ASPxClientImageGalleryCancelEventHandler<S> {
+    /**
+     * A method that will handle the FullscreenViewerShowing event.
+     * @param source The event source. Identifies the ASPxImageGallery control that raised the event.
+     * @param e An ASPxClientImageGalleryCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientImageGalleryCancelEventArgs): void;
+}
+/**
+ * Provides data for the FullscreenViewerShowing event.
+ */
+interface ASPxClientImageGalleryCancelEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the index of the item related to the event.
+     * Value: An <see cref="Int32" /> value that is the related item's index.
+     */
+    index: number;
+    /**
+     * Gets the unique identifier name of the item related to the event.
+     * Value: A string value that specifies the item's unique identifier name.
+     */
+    name: string;
+}
+/**
+ * A method that will handle the client FullscreenViewerActiveItemIndexChanged event.
+ */
+interface ASPxClientImageGalleryFullscreenViewerEventHandler<S> {
+    /**
+     * A method that will handle the FullscreenViewerActiveItemIndexChanged event.
+     * @param source The event source. Identifies the ASPxImageGallery control that raised the event.
+     * @param e An ASPxClientImageGalleryFullscreenViewerEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientImageGalleryFullscreenViewerEventArgs): void;
+}
+/**
+ * Provides data for the FullscreenViewerActiveItemIndexChanged event.
+ */
+interface ASPxClientImageGalleryFullscreenViewerEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the index of the item related to the event.
+     * Value: An <see cref="Int32" /> value that is the related item's index.
+     */
+    index: number;
+    /**
+     * Gets the unique identifier name of the item related to the event.
+     * Value: A string value that specifies the item's unique identifier name.
+     */
+    name: string;
+}
+/**
+ * A client-side equivalent of the ASPxImageSlider object.
+ */
+interface ASPxClientImageSlider extends ASPxClientControl {
+    /**
+     * Occurs after the active image, displayed within the image area, is changed.
+     */
+    ActiveItemChanged: ASPxClientEvent<ASPxClientImageSliderItemEventHandler<ASPxClientImageSlider>>;
+    /**
+     * Fires after an image item has been clicked within the image area.
+     */
+    ItemClick: ASPxClientEvent<ASPxClientImageSliderItemEventHandler<ASPxClientImageSlider>>;
+    /**
+     * Occurs on the client side when a thumbnail is clicked.
+     */
+    ThumbnailItemClick: ASPxClientEvent<ASPxClientImageSliderItemEventHandler<ASPxClientImageSlider>>;
+    /**
+     * Returns an item specified by its index within the image slider's item collection.
+     * @param index An integer value specifying the zero-based index of the item to be retrieved.
+     */
+    GetItem(index: number): ASPxClientImageSliderItem;
+    /**
+     * Returns an item specified by its name.
+     * @param name A string value specifying the name of the item.
+     */
+    GetItemByName(name: string): ASPxClientImageSliderItem;
+    /**
+     * Returns the index of the active item within the image slider control.
+     */
+    GetActiveItemIndex(): number;
+    /**
+     * Makes the specified item active within the image slider control on the client side.
+     * @param index An integer value specifying the index of the item to select.
+     * @param preventAnimation true to prevent the animation effect; false to change images using animation.
+     */
+    SetActiveItemIndex(index: number, preventAnimation: boolean): void;
+    /**
+     * Returns the active item within the ASPxImageSlider control.
+     */
+    GetActiveItem(): ASPxClientImageSliderItem;
+    /**
+     * Makes the specified item active within the image slider control on the client side.
+     * @param item An ASPxClientImageSliderItem object specifying the item to select.
+     * @param preventAnimation true to prevent animation effect; false to enable animation.
+     */
+    SetActiveItem(item: ASPxClientImageSliderItem, preventAnimation: boolean): void;
+    /**
+     * Gets the number of items contained in the control's item collection.
+     */
+    GetItemCount(): number;
+    /**
+     * Sets input focus to the ASPxImageSlider control.
+     */
+    Focus(): void;
+    /**
+     * Plays a slide show within an image slider.
+     */
+    Play(): void;
+    /**
+     * Pauses a slide show within image slider.
+     */
+    Pause(): void;
+    /**
+     * Gets a value indicating whether the slide show is playing.
+     */
+    IsSlideShowPlaying(): boolean;
+}
+/**
+ * A method that will handle the ItemClick events.
+ */
+interface ASPxClientImageSliderItemEventHandler<S> {
+    /**
+     * A method that will handle the ItemClick events.
+     * @param source The event source. Identifies the ASPxImageSlider control that raised the event.
+     * @param e An ASPxClientImageSliderItemEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientImageSliderItemEventArgs): void;
+}
+/**
+ * Provides data for the ItemClick events.
+ */
+interface ASPxClientImageSliderItemEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets an item object related to the event.
+     * Value: An <see cref="ASPxClientImageSliderItem" /> object, manipulations on which forced the event to be raised.
+     */
+    item: ASPxClientImageSliderItem;
+}
+/**
+ * A client-side equivalent of the image slider's ImageSliderItem object.
+ */
+interface ASPxClientImageSliderItem {
+    /**
+     * Gets an image slider to which the current item belongs.
+     * Value: An <see cref="ASPxClientImageSlider" /> object that is the item's owner.
+     */
+    imageSlider: ASPxClientImageSlider;
+    /**
+     * Gets the item's index within an items collection.
+     * Value: An integer value is the item's zero-based index within the Items collection.
+     */
+    index: number;
+    /**
+     * Gets the name that uniquely identifies the image slider item.
+     * Value: A string value that is the value assigned to the item's Name property.
+     */
+    name: string;
+    /**
+     * Gets or sets the path to the image displayed within the ASPxClientImageSliderItem.
+     * Value: A <see cref="String" /> value specifying the path to the image.
+     */
+    imageUrl: string;
+    /**
+     * Gets the item's display text.
+     * Value: A string value that is the item's display text.
+     */
+    text: string;
+}
+/**
+ * The client-side equivalent of the ASPxImageZoomNavigator object.
+ */
+interface ASPxClientImageZoomNavigator extends ASPxClientImageSlider {
+}
+/**
+ * A client-side equivalent of the ASPxImageZoom object.
+ */
+interface ASPxClientImageZoom extends ASPxClientControl {
+    /**
+     * Sets the properties on an image displayed in the image zoom control.
+     * @param imageUrl A string value specifying the path to the preview image displayed in the preview image.
+     * @param largeImageUrl A string value specifying the path to the preview image displayed in the zoom window and the expand window.
+     * @param zoomWindowText A string value specifying the text displayed in the zoom window.
+     * @param expandWindowText A string value specifying the text displayed in the expand window.
+     * @param alternateText A string value that specifies the alternate text displayed instead of the image.
+     */
+    SetImageProperties(imageUrl: string, largeImageUrl: string, zoomWindowText: string, expandWindowText: string, alternateText: string): void;
+}
+/**
+ * Represents a client-side equivalent of the ASPxLoadingPanel control.
+ */
+interface ASPxClientLoadingPanel extends ASPxClientControl {
+    /**
+     * Invokes the loading panel.
+     */
+    Show(): void;
+    /**
+     * Invokes the loading panel, displaying it over the specified HTML element.
+     * @param htmlElement An object that specifies the required HTML element.
+     */
+    ShowInElement(htmlElement: Object): void;
+    /**
+     * Invokes the loading panel, displaying it over the specified element.
+     * @param id A string that specifies the required element's identifier.
+     */
+    ShowInElementByID(id: string): void;
+    /**
+     * Invokes the loading panel at the specified position.
+     * @param x An integer value specifying the x-coordinate of the loading panel's display position.
+     * @param y An integer value specifying the y-coordinate of the loaidng panel's display position.
+     */
+    ShowAtPos(x: number, y: number): void;
+    /**
+     * Sets the text to be displayed within the ASPxLoadingPanel.
+     * @param text A string value specifying the text to be displayed within the ASPxLoadingPanel.
+     */
+    SetText(text: string): void;
+    /**
+     * Gets the text displayed within the ASPxLoadingPanel.
+     */
+    GetText(): string;
+    /**
+     * Hides the loading panel.
+     */
+    Hide(): void;
+}
+/**
+ * Represents the client-side equivalent of the area that is used within the Html Editor's media dialogs.
+ */
+interface ASPxClientMediaFileSelector extends ASPxClientControl {
+    /**
+     * Returns a URL text from the URL text box in Html Editor's media dialogs.
+     */
+    GetUrl(): string;
+    /**
+     * Sets a URL text in the Html Editor's media dialogs.
+     * @param url A string value that is the Url text.
+     */
+    SetUrl(url: string): void;
+}
+/**
+ * Serves as the base type for the ASPxClientPopupMenu objects.
+ */
+interface ASPxClientMenuBase extends ASPxClientControl {
+    /**
+     * Fires after a menu item has been clicked.
+     */
+    ItemClick: ASPxClientEvent<ASPxClientMenuItemClickEventHandler<ASPxClientMenuBase>>;
+    /**
+     * Occurs on the client side when the mouse cursor is moved into a menu item.
+     */
+    ItemMouseOver: ASPxClientEvent<ASPxClientMenuItemMouseEventHandler<ASPxClientMenuBase>>;
+    /**
+     * Occurs on the client side when the mouse cursor moves outside a menu item.
+     */
+    ItemMouseOut: ASPxClientEvent<ASPxClientMenuItemMouseEventHandler<ASPxClientMenuBase>>;
+    /**
+     * Occurs on the client side when a submenu pops up.
+     */
+    PopUp: ASPxClientEvent<ASPxClientMenuItemEventHandler<ASPxClientMenuBase>>;
+    /**
+     * Occurs on the client side when a submenu closes.
+     */
+    CloseUp: ASPxClientEvent<ASPxClientMenuItemEventHandler<ASPxClientMenuBase>>;
+    /**
+     * Returns the number of menu items at the root menu level.
+     */
+    GetItemCount(): number;
+    /**
+     * Returns the menu's root menu item specified by its index.
+     * @param index An integer value specifying the zero-based index of the root menu item to be retrieved.
+     */
+    GetItem(index: number): ASPxClientMenuItem;
+    /**
+     * Returns a menu item specified by its name.
+     * @param name A string value specifying the name of the menu item.
+     */
+    GetItemByName(name: string): ASPxClientMenuItem;
+    /**
+     * Returns the selected item within the menu control.
+     */
+    GetSelectedItem(): ASPxClientMenuItem;
+    /**
+     * Selects the specified menu item within a menu control on the client side.
+     * @param item An ASPxClientMenuItem object specifying the menu item to select.
+     */
+    SetSelectedItem(item: ASPxClientMenuItem): void;
+    /**
+     * Returns a root menu item.
+     */
+    GetRootItem(): ASPxClientMenuItem;
+}
+/**
+ * Represents a client collection that maintains client menu objects.
+ */
+interface ASPxClientMenuCollection extends ASPxClientControlCollection {
+    /**
+     * Recalculates the position of visible sub menus.
+     */
+    RecalculateAll(): void;
+    /**
+     * Hides all menus maitained by the collection.
+     */
+    HideAll(): void;
+}
+/**
+ * Represents a client-side equivalent of the ASPxMenu object.
+ */
+interface ASPxClientMenu extends ASPxClientMenuBase {
+    /**
+     * Gets a value specifying the menu orientation.
+     */
+    GetOrientation(): string;
+    /**
+     * Sets the menu orientation.
+     * @param orientation 'Vertical' to orient the menu vertically; 'Horizontal' to orient the menu horizontally.
+     */
+    SetOrientation(orientation: string): void;
+}
+/**
+ * A method that will handle the menu's client events concerning manipulations with an item.
+ */
+interface ASPxClientMenuItemEventHandler<S> {
+    /**
+     * A method that will handle the menu's client events concerning manipulations with an item.
+     * @param source The event source. This parameter identifies the menu object which raised the event.
+     * @param e An ASPxClientMenuItemEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientMenuItemEventArgs): void;
+}
+/**
+ * Provides data for events which concern manipulations on menu items.
+ */
+interface ASPxClientMenuItemEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the menu item object related to the event.
+     * Value: An ASPxClientMenuItem object, manipulations on which forced the event to be raised.
+     */
+    item: ASPxClientMenuItem;
+}
+/**
+ * A method that will handle client events which relate to mouse hovering (such as entering or leaving) over menu items.
+ */
+interface ASPxClientMenuItemMouseEventHandler<S> {
+    /**
+     * A method that will handle the ItemMouseOver events.
+     * @param source An object representing the event source.
+     * @param e A MenuItemEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientMenuItemMouseEventArgs): void;
+}
+/**
+ * Provides data for client events which relate to mouse hovering (such as entering or leaving) over menu items.
+ */
+interface ASPxClientMenuItemMouseEventArgs extends ASPxClientMenuItemEventArgs {
+    /**
+     * Gets the HTML object that contains the processed item.
+     * Value: An HTML object representing a container for the item related to the event.
+     */
+    htmlElement: Object;
+}
+/**
+ * A method that will handle client events concerning clicks on the control's items.
+ */
+interface ASPxClientMenuItemClickEventHandler<S> {
+    /**
+     * A method that will handle client ItemClick events.
+     * @param source An object representing the event source.
+     * @param e A MenuItemEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientMenuItemClickEventArgs): void;
+}
+/**
+ * Provides data for events which concern clicking on the control's items.
+ */
+interface ASPxClientMenuItemClickEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the menu item object related to the event.
+     * Value: An ASPxClientMenuItem object, manipulations on which forced the event to be raised.
+     */
+    item: ASPxClientMenuItem;
+    /**
+     * Gets the HTML object that contains the processed item.
+     * Value: An object representing a container for the item related to the event.
+     */
+    htmlElement: Object;
+    /**
+     * Gets a DHTML event object that relates to the processed event.
+     * Value: An object that maintains DHTML event-specific information.
+     */
+    htmlEvent: Object;
+}
+/**
+ * Contains options affecting the touch scrolling functionality.
+ */
+interface ASPxClientTouchUIOptions {
+    /**
+     * Gets or sets a value that specifies whether or not the horizontal scroll bar should be displayed.
+     * Value: true to display the horizontal scroll bar; otherwise, false. The default value is true.
+     */
+    showHorizontalScrollbar: boolean;
+    /**
+     * Gets or sets a value that specifies whether or not the vertical scroll bar should be displayed.
+     * Value: true to display the vertical scroll bar; otherwise, false. The default value is true.
+     */
+    showVerticalScrollbar: boolean;
+    /**
+     * Gets or sets the name of the CSS class defining the vertical scroll bar's appearance.
+     * Value: A string value specifying the class name.
+     */
+    vScrollClassName: string;
+    /**
+     * Gets or sets the name of the CSS class defining the horizontal scroll bar's appearance.
+     * Value: A string value specifying the class name.
+     */
+    hScrollClassName: string;
+}
+/**
+ * Contains a method allowing you to apply the current scroll extender to a specific element.
+ */
+interface ScrollExtender {
+    /**
+     * Applies the current scroll extender to the element specified by the ID.
+     * @param id A string value specifying the element's ID.
+     */
+    ChangeElement(id: string): void;
+    /**
+     * Applies the current scroll extender to the specified DOM element.
+     * @param element An object specifying the required DOM element.
+     */
+    ChangeElement(element: Object): void;
+}
+/**
+ * Represents a client-side equivalent of the ASPxNavBar control.
+ */
+interface ASPxClientNavBar extends ASPxClientControl {
+    /**
+     * Fires after an item has been clicked.
+     */
+    ItemClick: ASPxClientEvent<ASPxClientNavBarItemEventHandler<ASPxClientNavBar>>;
+    /**
+     * Fires on the client side after a group's expansion state has been changed.
+     */
+    ExpandedChanged: ASPxClientEvent<ASPxClientNavBarGroupEventHandler<ASPxClientNavBar>>;
+    /**
+     * Fires on the client side before the expansion state of a group is changed.
+     */
+    ExpandedChanging: ASPxClientEvent<ASPxClientNavBarGroupCancelEventHandler<ASPxClientNavBar>>;
+    /**
+     * Fires when a group header is clicked.
+     */
+    HeaderClick: ASPxClientEvent<ASPxClientNavBarGroupClickEventHandler<ASPxClientNavBar>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientNavBar>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientNavBar>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientNavBar.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientNavBar>>;
+    /**
+     * Returns the number of groups in the navbar.
+     */
+    GetGroupCount(): number;
+    /**
+     * Returns a group specified by its index.
+     * @param index An integer value specifying the zero-based index of the group object to retrieve.
+     */
+    GetGroup(index: number): ASPxClientNavBarGroup;
+    /**
+     * Returns a group specified by its name.
+     * @param name A string value specifying the name of the group.
+     */
+    GetGroupByName(name: string): ASPxClientNavBarGroup;
+    /**
+     * Returns the navbar's active group.
+     */
+    GetActiveGroup(): ASPxClientNavBarGroup;
+    /**
+     * Makes the specified group active.
+     * @param group A ASPxClientNavBarGroup object that specifies the active group.
+     */
+    SetActiveGroup(group: ASPxClientNavBarGroup): void;
+    /**
+     * Returns an item specified by its name.
+     * @param name A string value specifying the name of the item.
+     */
+    GetItemByName(name: string): ASPxClientNavBarItem;
+    /**
+     * Returns the selected item within the navbar control.
+     */
+    GetSelectedItem(): ASPxClientNavBarItem;
+    /**
+     * Selects the specified item within the navbar control on the client side.
+     * @param item An ASPxClientNavBarItem object specifying the item to select.
+     */
+    SetSelectedItem(item: ASPxClientNavBarItem): void;
+    /**
+     * Collapses all groups of the navbar.
+     */
+    CollapseAll(): void;
+    /**
+     * Expands all groups of the navbar.
+     */
+    ExpandAll(): void;
+}
+/**
+ * Represents a client-side equivalent of the navbar's NavBarGroup object.
+ */
+interface ASPxClientNavBarGroup {
+    /**
+     * Gets the navbar to which the current group belongs.
+     * Value: An ASPxClientNavBar object representing the navbar to which the group belongs.
+     */
+    navBar: ASPxClientNavBar;
+    /**
+     * Gets the group's index within a collection of a navbar's groups.
+     * Value: An integer value representing the group's zero-based index within the Groups collection of the navbar to which the group belongs.
+     */
+    index: number;
+    /**
+     * Gets the name that uniquely identifies the group.
+     * Value: A string value that represents the value assigned to the group's Name property.
+     */
+    name: string;
+    /**
+     * Returns a value specifying whether a group is enabled.
+     */
+    GetEnabled(): boolean;
+    /**
+     * Returns a value specifying whether the group is expanded.
+     */
+    GetExpanded(): boolean;
+    /**
+     * Sets the group's expansion state.
+     * @param value true to expand the group; false to collapse the group.
+     */
+    SetExpanded(value: boolean): void;
+    /**
+     * Returns a value specifying whether a group is displayed.
+     */
+    GetVisible(): boolean;
+    /**
+     * Returns text displayed within a group.
+     */
+    GetText(): string;
+    /**
+     * Specifies the text displayed within a group.
+     * @param text A string value that is the text displayed within the navbar group.
+     */
+    SetText(text: string): void;
+    /**
+     * Specifies whether the group is visible.
+     * @param value true if the group is visible; otherwise, false.
+     */
+    SetVisible(value: boolean): void;
+    /**
+     * Returns the number of items in the group.
+     */
+    GetItemCount(): number;
+    /**
+     * Returns the group's item specified by its index.
+     * @param index An integer value specifying the zero-based index of the item to be retrieved.
+     */
+    GetItem(index: number): ASPxClientNavBarItem;
+    /**
+     * Returns a group item specified by its name.
+     * @param name A string value specifying the name of the item.
+     */
+    GetItemByName(name: string): ASPxClientNavBarItem;
+}
+/**
+ * Represents a client-side equivalent of the navbar's NavBarItem object.
+ */
+interface ASPxClientNavBarItem {
+    /**
+     * Gets the navbar to which the current item belongs.
+     * Value: An ASPxClientNavBar object representing the navbar to which the item belongs.
+     */
+    navBar: ASPxClientNavBar;
+    /**
+     * Gets the group to which the current item belongs.
+     * Value: An ASPxClientNavBarGroup object representing the group to which the item belongs.
+     */
+    group: ASPxClientNavBarGroup;
+    /**
+     * Gets the item's index within a collection of a group's items.
+     * Value: An integer value representing the item's zero-based index within the Items collection of the group to which the item belongs.
+     */
+    index: number;
+    /**
+     * Gets the name that uniquely identifies the item.
+     * Value: A string value that represents the value assigned to the item's Name property.
+     */
+    name: string;
+    /**
+     * Returns a value indicating whether an item is enabled.
+     */
+    GetEnabled(): boolean;
+    /**
+     * Specifies whether the item is enabled.
+     * @param value true if the item is enabled; otherwise, false.
+     */
+    SetEnabled(value: boolean): void;
+    /**
+     * Returns the URL which points to the image displayed within the item.
+     */
+    GetImageUrl(): string;
+    /**
+     * Specifies the URL which points to the image displayed within the item.
+     * @param value A string value that specifies the URL to the image displayed within the item.
+     */
+    SetImageUrl(value: string): void;
+    /**
+     * Gets an URL which defines the item's navigation location.
+     */
+    GetNavigateUrl(): string;
+    /**
+     * Specifies a URL which defines the item's navigation location.
+     * @param value A string value which represents the URL to where the client web browser will navigate when the item is clicked.
+     */
+    SetNavigateUrl(value: string): void;
+    /**
+     * Returns text displayed within the item.
+     */
+    GetText(): string;
+    /**
+     * Specifies the text displayed within the item.
+     * @param value A string value that represents the text displayed within the item.
+     */
+    SetText(value: string): void;
+    /**
+     * Returns a value specifying whether an item is displayed.
+     */
+    GetVisible(): boolean;
+    /**
+     * Specifies whether the item is visible.
+     * @param value true is the item is visible; otherwise, false.
+     */
+    SetVisible(value: boolean): void;
+}
+/**
+ * A method that will handle the navbar's client events concerning manipulations with an item.
+ */
+interface ASPxClientNavBarItemEventHandler<S> {
+    /**
+     * A method that will handle the navbar's client events concerning manipulations with an item.
+     * @param source An object representing the event's source. Identifies the navbar object that raised the event.
+     * @param e An ASPxClientNavBarItemEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientNavBarItemEventArgs): void;
+}
+/**
+ * Provides data for events which concern manipulations on items.
+ */
+interface ASPxClientNavBarItemEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the item object related to the event.
+     * Value: An ASPxClientNavBarItem object, manipulations on which forced the event to be raised.
+     */
+    item: ASPxClientNavBarItem;
+    /**
+     * Gets the HTML object that contains the processed navbar item.
+     * Value: An object representing a container for the navbar item related to the event.
+     */
+    htmlElement: Object;
+    /**
+     * Gets a DHTML event object that relates to the processed event.
+     * Value: An object that maintains DHTML event-specific information.
+     */
+    htmlEvent: Object;
+}
+/**
+ * A method that will handle the navbar's client events concerning manipulations with a group.
+ */
+interface ASPxClientNavBarGroupEventHandler<S> {
+    /**
+     * A method that will handle the navbar's client events concerning manipulations with a group.
+     * @param source An object representing the event's source. Identifies the navbar object that raised the event.
+     * @param e An ASPxClientNavBarGroupEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientNavBarGroupEventArgs): void;
+}
+/**
+ * Provides data for events which concern manipulations on groups.
+ */
+interface ASPxClientNavBarGroupEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the group object related to the event.
+     * Value: An ASPxClientNavBarGroup object, manipulations on which forced the event to be raised.
+     */
+    group: ASPxClientNavBarGroup;
+}
+/**
+ * A method that will handle the navbar's cancelable client events concerning manipulations with a group.
+ */
+interface ASPxClientNavBarGroupCancelEventHandler<S> {
+    /**
+     * A method that will handle the navbar's cancelable client events concerning manipulations with a group.
+     * @param source An object representing the event's source. Identifies the navbar object that raised the event.
+     * @param e An ASPxClientNavBarGroupCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientNavBarGroupCancelEventArgs): void;
+}
+/**
+ * Provides data for cancellable events which concern manipulations on groups.
+ */
+interface ASPxClientNavBarGroupCancelEventArgs extends ASPxClientProcessingModeCancelEventArgs {
+    /**
+     * Gets the group object related to the event.
+     * Value: An ASPxClientNavBarGroup object representing the group manipulations on which forced the navbar to raise the event.
+     */
+    group: ASPxClientNavBarGroup;
+}
+/**
+ * A method that will handle client events concerning clicks on the control's group headers.
+ */
+interface ASPxClientNavBarGroupClickEventHandler<S> {
+    /**
+     * A method that will handle the navbar's client events concerning clicks on groups.
+     * @param source The event source. This parameter identifies the navbar object which raised the event.
+     * @param e An ASPxClientNavBarGroupClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientNavBarGroupClickEventArgs): void;
+}
+/**
+ * Provides data for events which concern clicking on the control's group headers.
+ */
+interface ASPxClientNavBarGroupClickEventArgs extends ASPxClientNavBarGroupCancelEventArgs {
+    /**
+     * Gets the HTML object that contains the processed group.
+     * Value: An object representing a container for the group related to the event.
+     */
+    htmlElement: Object;
+    /**
+     * Gets a DHTML event object that relates to the processed event.
+     * Value: An object that maintains DHTML event-specific information.
+     */
+    htmlEvent: Object;
+}
+/**
+ * Represents a client-side equivalent of the ASPxNewsControl object.
+ */
+interface ASPxClientNewsControl extends ASPxClientDataView {
+    /**
+     * Fires after an item's tail has been clicked.
+     */
+    TailClick: ASPxClientEvent<ASPxClientNewsControlItemEventHandler<ASPxClientNewsControl>>;
+}
+/**
+ * A method that will handle client events concerning manipulations with an item.
+ */
+interface ASPxClientNewsControlItemEventHandler<S> {
+    /**
+     * A method that will handle the news control's client events concerning manipulations with an item.
+     * @param source An object representing the event's source. Identifies the news control object that raised the event.
+     * @param e An ASPxClientNewsControlItemEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientNewsControlItemEventArgs): void;
+}
+/**
+ * Provides data for events which concern tail clicking within the control's items.
+ */
+interface ASPxClientNewsControlItemEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the name that uniquely identifies the processed item.
+     * Value: A string value that represents the value assigned to the processed item's Name property.
+     */
+    name: Object;
+    /**
+     * Gets the HTML object that contains the processed item.
+     * Value: An object representing a container for the item related to the event.
+     */
+    htmlElement: Object;
+    /**
+     * Gets a DHTML event object that relates to the processed event.
+     * Value: An object that maintains DHTML event-specific information.
+     */
+    htmlEvent: Object;
+}
+/**
+ * Represents a client-side equivalent of the ASPxObjectContainer control.
+ */
+interface ASPxClientObjectContainer extends ASPxClientControl {
+    /**
+     * Occurs on the client side when the FSCommand action is called within the associated flash object's action script.
+     */
+    FlashScriptCommand: ASPxClientEvent<ASPxClientFlashScriptCommandEventHandler<ASPxClientObjectContainer>>;
+    /**
+     * Play the Flash movie backwards.
+     */
+    Back(): void;
+    /**
+     * Returns the value of the Flash variable specified.
+     * @param name A string value that specifies the Flash variable.
+     */
+    GetVariable(name: string): string;
+    /**
+     * Play the Flash movie forwards.
+     */
+    Forward(): void;
+    /**
+     * Activates the specified frame in the Flash movie.
+     * @param frameNumber An integer value that specifies the requested frame.
+     */
+    GotoFrame(frameNumber: number): void;
+    /**
+     * Indicates whether the Flash movie is currently playing.
+     */
+    IsPlaying(): boolean;
+    /**
+     * Loads the Flash movie to the specified layer.
+     * @param layerNumber An integer value that identifies a layer in which to load the movie.
+     * @param url A string value that specifies the movie's URL.
+     */
+    LoadMovie(layerNumber: number, url: string): void;
+    /**
+     * Pans a zoomed-in Flash movie to the specified coordinates.
+     * @param x An integer value that specifies the X-coordinate.
+     * @param y An integer value that specifies the Y-coordinate.
+     * @param mode 0 the coordinates are pixels; 1 the coordinates are a percentage of the window.
+     */
+    Pan(x: number, y: number, mode: number): void;
+    /**
+     * Returns the percent of the Flash Player movie that has streamed into the browser so far.
+     */
+    PercentLoaded(): string;
+    /**
+     * Starts playing the Flash movie.
+     */
+    Play(): void;
+    /**
+     * Rewinds the Flash movie to the first frame.
+     */
+    Rewind(): void;
+    /**
+     * Sets the value of the specified Flash variable.
+     * @param name A string value that specifies the Flash variable.
+     * @param value A string value that represents a new value.
+     */
+    SetVariable(name: string, value: string): void;
+    /**
+     * Zooms in on the specified rectangular area of the Flash movie.
+     * @param left An integer value that specifies the x-coordinate of the rectangle's left side, in twips.
+     * @param top An integer value that specifies the y-coordinate of the rectangle's top side, in twips.
+     * @param right An integer value that specifies the x-coordinate of the rectangle's right side, in twips.
+     * @param bottom An integer value that specifies the y-coordinate of the rectangle's bottom side, in twips.
+     */
+    SetZoomRect(left: number, top: number, right: number, bottom: number): void;
+    /**
+     * Stops playing the Flash movie.
+     */
+    StopPlay(): void;
+    /**
+     * Returns the total number of frames in the Flash movie.
+     */
+    TotalFrames(): number;
+    /**
+     * Zooms the Flash view by a relative scale factor.
+     * @param percent An integer value that specifies the relative scale factor, as a  percentage.
+     */
+    Zoom(percent: number): void;
+    /**
+     * Starts playing a Quick Time movie.
+     */
+    QTPlay(): void;
+    /**
+     * Stops playing a Quick Time movie.
+     */
+    QTStopPlay(): void;
+    /**
+     * Rewinds a Quick Time movie to the first frame.
+     */
+    QTRewind(): void;
+    /**
+     * Steps through a Quick Time video stream by a specified number of frames.
+     * @param count An integer value that specifies the number of frames to step.
+     */
+    QTStep(count: number): void;
+}
+/**
+ * A method that will handle the FlashScriptCommand event.
+ */
+interface ASPxClientFlashScriptCommandEventHandler<S> {
+    /**
+     * A method that will handle the FlashScriptCommand event.
+     * @param source The event source.
+     * @param e A ASPxClientFlashScriptCommandEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientFlashScriptCommandEventArgs): void;
+}
+/**
+ * Provides data for the FlashScriptCommand client event.
+ */
+interface ASPxClientFlashScriptCommandEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets a command passed via the FSCommand action of the flash object.
+     * Value: A string that represents the value of the FSCommand action's command parameter.
+     */
+    command: string;
+    /**
+     * Gets arguments passed via the FSCommand action of the flash object.
+     * Value: A string that represents the value of the FSCommand action's args parameter.
+     */
+    args: string;
+}
+/**
+ * Lists the available link types within office documents.
+ */
+interface ASPxClientOfficeDocumentLinkType {
+}
+/**
+ * Represents the client-side equivalent of the ASPxPager control.
+ */
+interface ASPxClientPager extends ASPxClientControl {
+}
+/**
+ * Represents a client-side equivalent of the ASPxPopupControl control.
+ */
+interface ASPxClientPopupControl extends ASPxClientPopupControlBase {
+    /**
+     * Occurs when a popup window's close button is clicked.
+     */
+    CloseButtonClick: ASPxClientEvent<ASPxClientPopupWindowEventHandler<ASPxClientPopupControl>>;
+    /**
+     * This method is not in effect for a ASPxClientPopupControl object.
+     */
+    GetMainElement(): Object;
+    /**
+     * Returns an object containing the information about a mouse event that invoked a default popup window.
+     */
+    GetPopUpReasonMouseEvent(): Object;
+    /**
+     * Returns an object containing the information about a mouse event that invoked the specified popup window.
+     * @param window A ASPxClientPopupWindow object that specifies the required popup window.
+     */
+    GetWindowPopUpReasonMouseEvent(window: ASPxClientPopupWindow): Object;
+    /**
+     * 
+     * @param window 
+     * @param parameter 
+     */
+    PerformWindowCallback(window: ASPxClientPopupWindow, parameter: string): void;
+    /**
+     * Sends a callback with parameters to update the popup window by processing the related popup window and the passed information on the server.
+     * @param window A ASPxClientPopupWindow object identifying the processed popup window.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side CustomCallback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformWindowCallback(window: ASPxClientPopupWindow, parameter: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Specifies the default popup window's size.
+     * @param width An integer value that specifies the default popup window's width.
+     * @param height An integer value that specifies the default popup window's height.
+     */
+    SetSize(width: number, height: number): void;
+    /**
+     * Gets the width of the specified popup window's content region.
+     * @param window An ASPxClientPopupWindow object that specifies the required popup window.
+     */
+    GetWindowContentWidth(window: ASPxClientPopupWindow): number;
+    /**
+     * Gets the height of the specified popup window's content region.
+     * @param window An ASPxClientPopupWindow object that specifies the required popup window.
+     */
+    GetWindowContentHeight(window: ASPxClientPopupWindow): number;
+    /**
+     * Returns the height of a specific popup window.
+     * @param window A ASPxClientPopupWindow object that specifies the required popup window.
+     */
+    GetWindowHeight(window: ASPxClientPopupWindow): number;
+    /**
+     * Returns the width of a specific popup window.
+     * @param window A ASPxClientPopupWindow object that specifies the required popup window.
+     */
+    GetWindowWidth(window: ASPxClientPopupWindow): number;
+    /**
+     * Specifies the size of a specific popup window.
+     * @param window A ASPxClientPopupWindow object that specifies the required popup window.
+     * @param width An integer value that specifies the required popup window's width.
+     * @param height An integer value that specifies the required popup window's height.
+     */
+    SetWindowSize(window: ASPxClientPopupWindow, width: number, height: number): void;
+    /**
+     * Returns the HTML code that is the content of the popup control's default popup window.
+     */
+    GetContentHTML(): string;
+    /**
+     * Defines the HTML content for the popup control's default popup window.
+     * @param html A string value that is the HTML code defining the content of the popup window.
+     */
+    SetContentHTML(html: string): void;
+    /**
+     * Sets the ID of a web control or HTML element (or a list of IDs) with which the current popup control's window is associated.
+     * @param window An ASPxClientPopupWindow object representing a popup control's window.
+     * @param popupElementId A string value specifying the ID (or a list of IDs) of the web control or HTML element with which the popup control's window is associated.
+     */
+    SetWindowPopupElementID(window: ASPxClientPopupWindow, popupElementId: string): void;
+    /**
+     * Sets the ID of a web control or HTML element (or a list of IDs) with which the current popup control is associated.
+     * @param popupElementId A string value specifying the ID (or a list of IDs) of the web control or HTML element to which the popup control is associated.
+     */
+    SetPopupElementID(popupElementId: string): void;
+    /**
+     * Returns an index of the object that invoked the default window within the PopupElementID list.
+     */
+    GetCurrentPopupElementIndex(): number;
+    /**
+     * Returns an index of the object that invoked the specified popup window, within the window's PopupElementID list.
+     * @param window An ASPxClientPopupWindow object that specifies the required popup window.
+     */
+    GetWindowCurrentPopupElementIndex(window: ASPxClientPopupWindow): number;
+    /**
+     * Returns an object that invoked the default window.
+     */
+    GetCurrentPopupElement(): Object;
+    /**
+     * Returns an object that invoked the specified popup window.
+     * @param window An ASPxClientPopupWindow object that specifies the required popup window.
+     */
+    GetWindowCurrentPopupElement(window: ASPxClientPopupWindow): Object;
+    /**
+     * Returns a value that specifies whether the popup control's specific window is displayed.
+     * @param window A ASPxClientPopupWindow object representing the popup window whose visibility is checked.
+     */
+    IsWindowVisible(window: ASPxClientPopupWindow): boolean;
+    /**
+     * Returns a popup window specified by its index.
+     * @param index An integer value specifying the zero-based index of the popup window object to be retrieved.
+     */
+    GetWindow(index: number): ASPxClientPopupWindow;
+    /**
+     * Returns a popup window specified by its name.
+     * @param name A string value specifying the name of the popup window.
+     */
+    GetWindowByName(name: string): ASPxClientPopupWindow;
+    /**
+     * Returns the number of popup windows in the popup control.
+     */
+    GetWindowCount(): number;
+    /**
+     * Invokes the popup control's specific window.
+     * @param window A ASPxClientPopupWindow object representing the popup window to display.
+     */
+    ShowWindow(window: ASPxClientPopupWindow): void;
+    /**
+     * Invokes the specified popup window at the popup element with the specified index.
+     * @param window A ASPxClientPopupWindow object that specifies the required popup window.
+     * @param popupElementIndex An integer value specifying the zero-based index of the popup element within the window's PopupElementID list.
+     */
+    ShowWindow(window: ASPxClientPopupWindow, popupElementIndex: number): void;
+    /**
+     * Invokes the popup control's specific window and displays it over the specified HTML element.
+     * @param window A ASPxClientPopupWindow object representing the popup window to display.
+     * @param htmlElement An object specifying the HTML element relative to whose position the default popup window is invoked.
+     */
+    ShowWindowAtElement(window: ASPxClientPopupWindow, htmlElement: Object): void;
+    /**
+     * Invokes the popup control's specific window and displays it over an HTML element specified by its unique identifier.
+     * @param window A ASPxClientPopupWindow object representing the popup window to display.
+     * @param id A string value that specifies the hierarchically qualified identifier of an HTML element relative to whose position the default popup window is invoked.
+     */
+    ShowWindowAtElementByID(window: ASPxClientPopupWindow, id: string): void;
+    /**
+     * Invokes the popup control's specific popup window at the specified position.
+     * @param window A ASPxClientPopupWindow object representing the popup window to display.
+     * @param x A integer value specifying the x-coordinate of the popup window's display position.
+     * @param y A integer value specifying the y-coordinate of the popup window's display position.
+     */
+    ShowWindowAtPos(window: ASPxClientPopupWindow, x: number, y: number): void;
+    /**
+     * Brings the specified popup window to the front of the z-order.
+     * @param window A ASPxClientPopupWindow object representing the popup window.
+     */
+    BringWindowToFront(window: ASPxClientPopupWindow): void;
+    /**
+     * Closes the popup control's specified window.
+     * @param window A ASPxClientPopupWindow object representing the popup window to close.
+     */
+    HideWindow(window: ASPxClientPopupWindow): void;
+    /**
+     * Returns the HTML code that represents the contents of the specified popup window.
+     * @param window An ASPxClientPopupWindow object that specifies the required popup window.
+     */
+    GetWindowContentHtml(window: ASPxClientPopupWindow): string;
+    /**
+     * Defines the HTML content for a specific popup window within the popup control.
+     * @param window An ASPxClientPopupWindow object that specifies the required popup window.
+     * @param html A string value that represents the HTML code defining the content of the specified popup window.
+     */
+    SetWindowContentHtml(window: ASPxClientPopupWindow, html: string): void;
+    /**
+     * Returns an iframe object containing a web page specified via the specified popup window's SetWindowContentUrl client method).
+     * @param window A ASPxClientPopupWindow object representing the required popup window.
+     */
+    GetWindowContentIFrame(window: ASPxClientPopupWindow): Object;
+    /**
+     * Returns the URL pointing to the web page displayed within the control's specific popup window.
+     * @param window A ASPxClientPopupWindow object representing the required popup window.
+     */
+    GetWindowContentUrl(window: ASPxClientPopupWindow): string;
+    /**
+     * Sets the URL pointing to the web page that should be loaded into and displayed within the control's specific popup window.
+     * @param window A ASPxClientPopupWindow object representing the required popup window.
+     * @param url A string value specifying the URL to the web page to be displayed within the specified popup window.
+     */
+    SetWindowContentUrl(window: ASPxClientPopupWindow, url: string): void;
+    /**
+     * Returns a value indicating whether the specified window is pinned.
+     * @param window An ASPxClientPopupWindow object specifying the popup window.
+     */
+    GetWindowPinned(window: ASPxClientPopupWindow): boolean;
+    /**
+     * Sets a value indicating whether the specified window is pinned.
+     * @param window An ASPxClientPopupWindow object specifying the popup window.
+     * @param value true to pin the window; otherwise, false.
+     */
+    SetWindowPinned(window: ASPxClientPopupWindow, value: boolean): void;
+    /**
+     * Returns a value indicating whether the specified window is maximized.
+     * @param window An ASPxClientPopupWindow object specifying the popup window.
+     */
+    GetWindowMaximized(window: ASPxClientPopupWindow): boolean;
+    /**
+     * Sets a value indicating whether the specified window is maximized.
+     * @param window An ASPxClientPopupWindow object specifying the popup window.
+     * @param value true to maximize the window; otherwise, false.
+     */
+    SetWindowMaximized(window: ASPxClientPopupWindow, value: boolean): void;
+    /**
+     * Returns a value indicating whether the specified window is collapsed.
+     * @param window An ASPxClientPopupWindow object specifying the popup window.
+     */
+    GetWindowCollapsed(window: ASPxClientPopupWindow): boolean;
+    /**
+     * Sets a value indicating whether the specified window is collapsed.
+     * @param window An ASPxClientPopupWindow object specifying the popup window.
+     * @param value true to collapse the window; otherwise, false.
+     */
+    SetWindowCollapsed(window: ASPxClientPopupWindow, value: boolean): void;
+    /**
+     * Refreshes the content of the web page displayed within the control's specific popup window.
+     * @param window A ASPxClientPopupWindow object representing the required popup window.
+     */
+    RefreshWindowContentUrl(window: ASPxClientPopupWindow): void;
+    /**
+     * Updates the default popup window's position, to correctly align it at either the specified element, or the center of the browser's window.
+     */
+    UpdatePosition(): void;
+    /**
+     * Updates the default popup window's position, to correctly align it at the specified HTML element.
+     * @param htmlElement An object specifying the HTML element to which the default popup window is aligned using the PopupVerticalAlign properties.
+     */
+    UpdatePositionAtElement(htmlElement: Object): void;
+    /**
+     * Updates the specified popup window's position, to correctly align it at either the specified element, or the center of the browser's window.
+     * @param window An ASPxClientPopupWindow object that specifies the required popup window.
+     */
+    UpdateWindowPosition(window: ASPxClientPopupWindow): void;
+    /**
+     * Updates the specified popup window's position, to correctly align it at the specified HTML element.
+     * @param window An ASPxClientPopupWindow object that specifies the required popup window.
+     * @param htmlElement An object specifying the HTML element to which the specified popup window is aligned using the PopupVerticalAlign properties.
+     */
+    UpdateWindowPositionAtElement(window: ASPxClientPopupWindow, htmlElement: Object): void;
+    /**
+     * Refreshes the connection between the ASPxPopupControl and the popup element.
+     */
+    RefreshPopupElementConnection(): void;
+}
+/**
+ * Represents a client-side equivalent of a popup control's PopupWindow object.
+ */
+interface ASPxClientPopupWindow {
+    /**
+     * Gets the popup control to which the current popup window belongs.
+     * Value: An ASPxClientPopupControl object representing the popup control to which the window belongs.
+     */
+    popupControl: ASPxClientPopupControl;
+    /**
+     * Gets the index of the current popup window within the popup control's Windows collection.
+     * Value: An integer value representing the zero-based index of the current popup window within the Windows collection of the popup control to which the window belongs.
+     */
+    index: number;
+    /**
+     * Gets the name that uniquely identifies the current popup window.
+     * Value: A string value that represents a value assigned to the popup window's Name property.
+     */
+    name: string;
+    /**
+     * Returns the URL pointing to the image displayed within the window header.
+     */
+    GetHeaderImageUrl(): string;
+    /**
+     * Specifies the URL which points to the image displayed within the window header.
+     * @param value A string value that is the URL to the image displayed within the header.
+     */
+    SetHeaderImageUrl(value: string): void;
+    /**
+     * Returns the URL pointing to the image displayed within the window footer.
+     */
+    GetFooterImageUrl(): string;
+    /**
+     * Specifies the URL which points to the image displayed within the window footer.
+     * @param value A string value that is the URL to the image displayed within the window footer.
+     */
+    SetFooterImageUrl(value: string): void;
+    /**
+     * Returns the URL where the web browser will navigate when the text or image is clicked within the popup window's header.
+     */
+    GetHeaderNavigateUrl(): string;
+    /**
+     * Returns the URL where the web browser will navigate when the text or image is clicked within the popup window's header.
+     * @param value A string value which specifies the required navigation location.
+     */
+    SetHeaderNavigateUrl(value: string): void;
+    /**
+     * Returns the URL where the web browser will navigate when the text or image is clicked within the popup window's footer.
+     */
+    GetFooterNavigateUrl(): string;
+    /**
+     * Specifies the URL where the web browser will navigate when the text or image is clicked within the popup window's footer.
+     * @param value A string value which specifies the required navigation location.
+     */
+    SetFooterNavigateUrl(value: string): void;
+    /**
+     * Returns the text displayed within the window's header.
+     */
+    GetHeaderText(): string;
+    /**
+     * Specifies the text displayed within the window's header.
+     * @param value A string value that specifies the window's header text.
+     */
+    SetHeaderText(value: string): void;
+    /**
+     * Returns the text displayed within the popup window's footer.
+     */
+    GetFooterText(): string;
+    /**
+     * Specifies the text displayed within the window's footer.
+     * @param value A string value that specifies the window's footer text.
+     */
+    SetFooterText(value: string): void;
+}
+/**
+ * A method that will handle the popup control's client events invoked in response to manipulating a popup window.
+ */
+interface ASPxClientPopupWindowEventHandler<S> {
+    /**
+     * A method that will handle the popup control's client events when a popup window is manipulated.
+     * @param source An object representing the event's source. Identifies the popup control object (ASPxClientPopupControl) that raised the event.
+     * @param e An ASPxClientPopupWindowEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientPopupWindowEventArgs): void;
+}
+/**
+ * Provides data for events concerning client manipulations on popup windows.
+ */
+interface ASPxClientPopupWindowEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the popup window object related to the event.
+     * Value: An ASPxClientPopupWindow object representing the popup window that was manipulated, causing the popup control to raise the event.
+     */
+    window: ASPxClientPopupWindow;
+}
+/**
+ * A method that will handle the popup window's cancellable client events, such as the Closing.
+ */
+interface ASPxClientPopupWindowCancelEventHandler<S> {
+    /**
+     * A method that will handle the popup window's cancelable client events.
+     * @param source An object representing the event's source. Identifies the popup window object that raised the event.
+     * @param e An ASPxClientPopupWindowCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientPopupWindowCancelEventArgs): void;
+}
+/**
+ * Provides data for the popup control's cancellable client events, such as the Closing.
+ */
+interface ASPxClientPopupWindowCancelEventArgs extends ASPxClientCancelEventArgs {
+    /**
+     * Gets the popup window object related to the event.
+     * Value: An ASPxClientPopupWindow object representing the popup window that was manipulated, causing the popup control to raise the event.
+     */
+    window: ASPxClientPopupWindow;
+    /**
+     * Gets the value that identifies the reason the popup window is about to close.
+     * Value: One of the ASPxClientPopupControlCloseReason enumeration values.
+     */
+    closeReason: ASPxClientPopupControlCloseReason;
+}
+/**
+ * A method that will handle the CloseUp event.
+ */
+interface ASPxClientPopupWindowCloseUpEventHandler<S> {
+    /**
+     * A method that will handle the CloseUp event.
+     * @param source The event source.
+     * @param e An ASPxClientPopupWindowCloseUpEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientPopupWindowCloseUpEventArgs): void;
+}
+/**
+ * Provides data for the CloseUp event.
+ */
+interface ASPxClientPopupWindowCloseUpEventArgs extends ASPxClientPopupWindowEventArgs {
+    /**
+     * Gets the value that identifies the reason the popup window closes.
+     * Value: One of the ASPxClientPopupControlCloseReason enumeration values.
+     */
+    closeReason: ASPxClientPopupControlCloseReason;
+}
+/**
+ * A method that will handle the Resize event.
+ */
+interface ASPxClientPopupWindowResizeEventHandler<S> {
+    /**
+     * A method that will handle the Resize event.
+     * @param source The event source.
+     * @param e A ASPxClientPopupWindowResizeEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientPopupWindowResizeEventArgs): void;
+}
+/**
+ * Provides data for the Resize event.
+ */
+interface ASPxClientPopupWindowResizeEventArgs extends ASPxClientPopupWindowEventArgs {
+    /**
+     * Returns the value indicating the window state after resizing.
+     * Value: The integer value indicating the window resize state.
+     */
+    resizeState: number;
+}
+/**
+ * A method that will handle the PinnedChanged event.
+ */
+interface ASPxClientPopupWindowPinnedChangedEventHandler<S> {
+    /**
+     * A method that will handle the PinnedChanged event.
+     * @param source The event source.
+     * @param e A ASPxClientPopupWindowPinnedChangedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientPopupWindowPinnedChangedEventArgs): void;
+}
+/**
+ * Provides data for the PinnedChanged event.
+ */
+interface ASPxClientPopupWindowPinnedChangedEventArgs extends ASPxClientPopupWindowEventArgs {
+    /**
+     * Gets a value indicating whether the processed popup window has been pinned.
+     * Value: true, if the window has been pinned; otherwise, false.
+     */
+    pinned: boolean;
+}
+/**
+ * Represents a client collection that maintains client popup control objects.
+ */
+interface ASPxClientPopupControlCollection extends ASPxClientControlCollection {
+    /**
+     * Hides all popup windows maintained by the collection.
+     */
+    HideAllWindows(): void;
+}
+/**
+ * Declares client constants that identify the reason the popup window closes.
+ */
+interface ASPxClientPopupControlCloseReason {
+}
+/**
+ * Represents a client-side equivalent of the ASPxPopupMenu object.
+ */
+interface ASPxClientPopupMenu extends ASPxClientMenuBase {
+    /**
+     * Sets the ID of a web control or HTML element (or a list of IDs) with which the current popup menu is associated.
+     * @param popupElementId A string value specifying the ID (or a list of IDs) of the web control or HTML element with which the popup menu is associated.
+     */
+    SetPopupElementID(popupElementId: string): void;
+    /**
+     * Returns an index of the object that invoked the popup menu within the PopupElementID list.
+     */
+    GetCurrentPopupElementIndex(): number;
+    /**
+     * Returns an object that invoked the popup menu.
+     */
+    GetCurrentPopupElement(): Object;
+    /**
+     * Refreshes the connection between the ASPxPopupMenu and the popup element.
+     */
+    RefreshPopupElementConnection(): void;
+    /**
+     * Hides the popup menu.
+     */
+    Hide(): void;
+    /**
+     * Invokes the popup menu.
+     */
+    Show(): void;
+    /**
+     * Invokes the popup menu at the popup element with the specified index.
+     * @param popupElementIndex An integer value specifying the zero-based index of the popup element.
+     */
+    Show(popupElementIndex: number): void;
+    /**
+     * Invokes the popup menu and displays it over the specified HTML element.
+     * @param htmlElement An object specifying the HTML element relative to which position the popup menu is invoked.
+     */
+    ShowAtElement(htmlElement: Object): void;
+    /**
+     * Invokes the popup menu and displays it over an HTML element specified by its unique identifier.
+     * @param id A string value that specifies the hierarchically qualified identifier of an HTML element relative to which position the popup menu is invoked.
+     */
+    ShowAtElementByID(id: string): void;
+    /**
+     * Invokes the popup menu at the specified position.
+     * @param x An integer value specifying the x-coordinate of the popup menu's display position.
+     * @param y An integer value specifying the y-coordinate of the popup menu's display position.
+     */
+    ShowAtPos(x: number, y: number): void;
+}
+/**
+ * Represents the client-side equivalent of the ASPxRatingControl control.
+ */
+interface ASPxClientRatingControl extends ASPxClientControl {
+    /**
+     * Fires on the server after an item has been clicked.
+     */
+    ItemClick: ASPxClientEvent<ASPxClientRatingControlItemClickEventHandler<ASPxClientRatingControl>>;
+    /**
+     * Occurs on the client side when the mouse cursor is moved into a rating control item.
+     */
+    ItemMouseOver: ASPxClientEvent<ASPxClientRatingControlItemMouseEventHandler<ASPxClientRatingControl>>;
+    /**
+     * Occurs on the client side when the mouse cursor moves outside a rating control item.
+     */
+    ItemMouseOut: ASPxClientEvent<ASPxClientRatingControlItemMouseEventHandler<ASPxClientRatingControl>>;
+    /**
+     * Gets the item tooltip title specified by the item index.
+     * @param index An integer value specifying the item index.
+     */
+    GetTitle(index: number): string;
+    /**
+     * Returns a value indicating whether the control's status is read-only.
+     */
+    GetReadOnly(): boolean;
+    /**
+     * Specifies whether the control's status is read-only.
+     * @param value true to make the control read-only; otherwise, false.
+     */
+    SetReadOnly(value: boolean): void;
+    /**
+     * Returns the value of the ASPxRatingControl.
+     */
+    GetValue(): number;
+    /**
+     * Modifies the value of the ASPxRatingControl on the client side.
+     * @param value A decimal value representing the value of the control.
+     */
+    SetValue(value: number): void;
+}
+/**
+ * A method that will handle the client ItemClick event.
+ */
+interface ASPxClientRatingControlItemClickEventHandler<S> {
+    /**
+     * A method that will handle the client ItemClick event.
+     * @param source An object representing the event source.
+     * @param e A ASPxClientRatingControlItemClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientRatingControlItemClickEventArgs): void;
+}
+/**
+ * Provides data for the ItemClick event.
+ */
+interface ASPxClientRatingControlItemClickEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the index of the item related to the event.
+     * Value: An integer value that represents the clicked item's index.
+     */
+    index: number;
+}
+/**
+ * A method that will handle the rating control's ItemMouseOver and ItemMouseOut client events (such as ItemMouseOut).
+ */
+interface ASPxClientRatingControlItemMouseEventHandler<S> {
+    /**
+     * A method that will handle the ItemMouseOver events.
+     * @param source The event source.
+     * @param e An ASPxClientRatingControlItemMouseEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientRatingControlItemMouseEventArgs): void;
+}
+/**
+ * Provides data for the rating control's ItemMouseOver and ItemMouseOut client events (such as ItemMouseOut).
+ */
+interface ASPxClientRatingControlItemMouseEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the index of the item related to the event.
+     * Value: An integer value that represents the related item's index.
+     */
+    index: number;
+}
+/**
+ * Represents the client-side equivalent of the ASPxRibbon control.
+ */
+interface ASPxClientRibbon extends ASPxClientControl {
+    /**
+     * Occurs after an end-user executes an action on a ribbon item.
+     */
+    CommandExecuted: ASPxClientEvent<ASPxClientRibbonCommandExecutedEventHandler<ASPxClientRibbon>>;
+    /**
+     * Fires on the client side after the active tab has been changed within a ribbon control.
+     */
+    ActiveTabChanged: ASPxClientEvent<ASPxClientRibbonTabEventHandler<ASPxClientRibbon>>;
+    /**
+     * Occurs on the client side when the ribbon minimization state is changed by end-user actions.
+     */
+    MinimizationStateChanged: ASPxClientEvent<ASPxClientRibbonMinimizationStateEventHandler<ASPxClientRibbon>>;
+    /**
+     * Occurs when the file tab is clicked.
+     */
+    FileTabClicked: ASPxClientEvent<ASPxClientEventHandler<ASPxClientRibbon>>;
+    /**
+     * Fires on the client side after a dialog box launcher has been clicked.
+     */
+    DialogBoxLauncherClicked: ASPxClientEvent<ASPxClientRibbonDialogBoxLauncherClickedEventHandler<ASPxClientRibbon>>;
+    /**
+     * Fires after key tips are closed by pressing Esc.
+     */
+    KeyTipsClosedOnEscape: ASPxClientEvent<ASPxClientEventHandler<ASPxClientRibbon>>;
+    /**
+     * Specifies whether the ribbon control is enabled.
+     * @param enabled true to enable the ribbon; false to disable it.
+     */
+    SetEnabled(enabled: boolean): void;
+    /**
+     * Returns a value indicating whether the ribbon is enabled.
+     */
+    GetEnabled(): boolean;
+    /**
+     * Returns a tab specified by its index.
+     * @param index An integer value specifying the zero-based index of the tab object to retrieve.
+     */
+    GetTab(index: number): ASPxClientRibbonTab;
+    /**
+     * Returns a tab specified by its name.
+     * @param name A string value specifying the name of the tab.
+     */
+    GetTabByName(name: string): ASPxClientRibbonTab;
+    /**
+     * Returns the number of tabs in the ribbon Tabs collection.
+     */
+    GetTabCount(): number;
+    /**
+     * Returns the active tab within the ribbon control.
+     */
+    GetActiveTab(): ASPxClientRibbonTab;
+    /**
+     * Makes the specified tab active in the ribbon control on the client side.
+     * @param tab A ASPxClientRibbonTab object specifying the tab selection.
+     */
+    SetActiveTab(tab: ASPxClientRibbonTab): void;
+    /**
+     * Makes a tab active within the ribbon control, specifying the tab's index.
+     * @param index An integer value specifying the index of the tab to select.
+     */
+    SetActiveTabIndex(index: number): void;
+    /**
+     * Returns a ribbon item specified by its name.
+     * @param name A string value specifying the name of the item.
+     */
+    GetItemByName(name: string): ASPxClientRibbonItem;
+    /**
+     * Returns a value of item with the specified name.
+     * @param name A string value specifying the name of the item.
+     */
+    GetItemValueByName(name: string): Object;
+    /**
+     * Sets the value of the item with the specified name.
+     * @param name A string value specifying the name of the item.
+     * @param value An object that is the new item value.
+     */
+    SetItemValueByName(name: string, value: Object): void;
+    /**
+     * Specifies whether the ribbon is minimized.
+     * @param minimized true to set the ribbon state to minimized; false to set the ribbon state to normal.
+     */
+    SetMinimized(minimized: boolean): void;
+    /**
+     * Gets a value specifying whether the ribbon is minimized.
+     */
+    GetMinimized(): boolean;
+    /**
+     * Specifies the visibility of a context tab category specified by its name.
+     * @param categoryName A Name property value of the required category.
+     * @param visible true to make a category visible; false to make it hidden.
+     */
+    SetContextTabCategoryVisible(categoryName: string, visible: boolean): void;
+    /**
+     * Shows ribbon key tips.
+     */
+    ShowKeyTips(): void;
+}
+/**
+ * A client-side equivalent of the ribbon's RibbonTab object.
+ */
+interface ASPxClientRibbonTab {
+    /**
+     * Gets the client ribbon object to which the current tab belongs.
+     * Value: An <see cref="ASPxClientRibbon" /> object to which the tab belongs.
+     */
+    ribbon: ASPxClientRibbon;
+    /**
+     * Gets or sets the tab's index within the collection.
+     * Value: An integer value that is the zero-based index of the tab within the collection.
+     */
+    index: number;
+    /**
+     * Gets the name of the current ribbon tab.
+     * Value: A string value that is the tab's name.
+     */
+    name: string;
+    /**
+     * Returns the text displayed in the tab.
+     */
+    GetText(): string;
+    /**
+     * Sets a value specifying whether the tab is enabled.
+     * @param enabled true to enable the tab; false to disable it.
+     */
+    SetEnabled(enabled: boolean): void;
+    /**
+     * Returns a value indicating whether a ribbon tab is enabled.
+     */
+    GetEnabled(): boolean;
+    /**
+     * Returns a value specifying whether a ribbon tab is displayed.
+     */
+    GetVisible(): boolean;
+}
+/**
+ * A client-side equivalent of the ribbon's RibbonGroup object.
+ */
+interface ASPxClientRibbonGroup {
+    /**
+     * Gets the client ribbon object to which the current group belongs.
+     * Value: An <see cref="ASPxClientRibbon" /> object to which the group belongs.
+     */
+    ribbon: ASPxClientRibbon;
+    /**
+     * Gets the client tab object to which the current group belongs.
+     * Value: An <see cref="ASPxClientRibbonTab" /> object to which the group belongs.
+     */
+    tab: ASPxClientRibbonTab;
+    /**
+     * Gets or sets the group's index within the collection.
+     * Value: An integer value that is the zero-based index of the group within the collection.
+     */
+    index: number;
+    /**
+     * Gets the name of the current ribbon group.
+     * Value: A string value that is the group's name.
+     */
+    name: string;
+    /**
+     * Returns a value specifying whether a ribbon group is displayed.
+     */
+    GetVisible(): boolean;
+}
+/**
+ * A client-side equivalent of the ribbon's RibbonItemBase object.
+ */
+interface ASPxClientRibbonItem {
+    /**
+     * Gets the client group object to which the current item belongs.
+     * Value: An <see cref="ASPxClientRibbonGroup" /> object to which the item belongs.
+     */
+    group: ASPxClientRibbonGroup;
+    /**
+     * Gets or sets the item's index within the collection.
+     * Value: An integer value that is the zero-based index of the item within the collection.
+     */
+    index: number;
+    /**
+     * Gets the name of the current ribbon item.
+     * Value: A string value that is the item's name.
+     */
+    name: string;
+    /**
+     * Gets the client ribbon object to which the current item belongs.
+     * Value: An <see cref="ASPxClientRibbon" /> object to which the item belongs.
+     */
+    ribbon: ASPxClientRibbon;
+    /**
+     * Returns a value indicating whether a ribbon item is enabled.
+     */
+    GetEnabled(): boolean;
+    /**
+     * Sets a value specifying whether the item is enabled.
+     * @param enabled true to enable the item; false to disable it.
+     */
+    SetEnabled(enabled: boolean): void;
+    /**
+     * Returns the item value.
+     */
+    GetValue(): Object;
+    /**
+     * Sets the item value.
+     * @param value An  that specifies the item value.
+     */
+    SetValue(value: Object): void;
+    /**
+     * Returns a value specifying whether a ribbon item is displayed.
+     */
+    GetVisible(): boolean;
+}
+/**
+ * A method that will handle the CommandExecuted event.
+ */
+interface ASPxClientRibbonCommandExecutedEventHandler<S> {
+    /**
+     * A method that will handle the CommandExecuted event.
+     * @param source The event source. Identifies the ASPxRibbon control that raised the event.
+     * @param e An ASPxClientRibbonCommandExecutedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientRibbonCommandExecutedEventArgs): void;
+}
+/**
+ * Provides data for the CommandExecuted event.
+ */
+interface ASPxClientRibbonCommandExecutedEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets an item object related to the event.
+     * Value: An <see cref="ASPxClientRibbonItem" /> object, manipulations on which forced the event to be raised.
+     */
+    item: ASPxClientRibbonItem;
+    /**
+     * Gets an optional parameter that complements the processed command.
+     * Value: A string value containing additional information about the processed command.
+     */
+    parameter: string;
+}
+/**
+ * A method that will handle the ActiveTabChanged event.
+ */
+interface ASPxClientRibbonTabEventHandler<S> {
+    /**
+     * A method that will handle the ActiveTabChanged event.
+     * @param source The event source. Identifies the ASPxRibbon control that raised the event.
+     * @param e A ASPxClientRibbonTabEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientRibbonTabEventArgs): void;
+}
+/**
+ * Provides data for the ActiveTabChanged event.
+ */
+interface ASPxClientRibbonTabEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the tab object related to the event.
+     * Value: An <see cref="ASPxClientRibbonTab" /> object that is the tab, manipulations on which forced the ribbon control to raise the event.
+     */
+    tab: ASPxClientRibbonTab;
+}
+/**
+ * A method that will handle the MinimizationStateChanged event.
+ */
+interface ASPxClientRibbonMinimizationStateEventHandler<S> {
+    /**
+     * A method that will handle the MinimizationStateChanged event.
+     * @param source The event source. Identifies the ASPxRibbon control that raised the event.
+     * @param e An ASPxClientRibbonMinimizationStateEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientRibbonMinimizationStateEventArgs): void;
+}
+/**
+ * Provides data for the MinimizationStateChanged event.
+ */
+interface ASPxClientRibbonMinimizationStateEventArgs extends ASPxClientEventArgs {
+    /**
+     * Returns the value indicating the new ribbon state.
+     * Value: The integer value indicating the ribbon minimization state.
+     */
+    ribbonState: number;
+}
+/**
+ * A method that will handle the DialogBoxLauncherClicked event.
+ */
+interface ASPxClientRibbonDialogBoxLauncherClickedEventHandler<S> {
+    /**
+     * A method that will handle the DialogBoxLauncherClicked event.
+     * @param source The event source. This parameter identifies the ribbon object which raised the event.
+     * @param e An ASPxClientRibbonDialogBoxLauncherClickedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientRibbonDialogBoxLauncherClickedEventArgs): void;
+}
+/**
+ * Provides data for the DialogBoxLauncherClicked event.
+ */
+interface ASPxClientRibbonDialogBoxLauncherClickedEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the client group object to which the clicked dialog box launcher belongs.
+     * Value: An <see cref="ASPxClientRibbonGroup" /> object to which the dialog box launcher belongs.
+     */
+    group: ASPxClientRibbonGroup;
+}
+/**
+ * Represents a client-side equivalent of the ASPxRoundPanel control.
+ */
+interface ASPxClientRoundPanel extends ASPxClientPanelBase {
+    /**
+     * Fires on the client side after a panel has been expanded or collapsed via end-user interactions, i.e., by clicking a panel header or collapse button.
+     */
+    CollapsedChanged: ASPxClientEvent<ASPxClientEventHandler<ASPxClientRoundPanel>>;
+    /**
+     * Fires on the client side before a panel is expanded or collapsed by end-user interactions, i.e., by clicking a panel header or collapse button.
+     */
+    CollapsedChanging: ASPxClientEvent<ASPxClientCancelEventHandler<ASPxClientRoundPanel>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientRoundPanel>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientRoundPanel>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientRoundPanel.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientRoundPanel>>;
+    /**
+     * Sends a callback to the server and generates the server-side ContentCallback event, passing it the specified argument.
+     * @param parameter A string value that is any information that needs to be sent to the server-side ContentCallback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side ContentCallback event, passing it the specified argument.
+     * @param parameter A string value that is any information that needs to be sent to the server-side ContentCallback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Returns the text displayed within the panel's header.
+     */
+    GetHeaderText(): string;
+    /**
+     * Specifies the text displayed in the panel's header.
+     * @param text A string value that specifies the panel header's text.
+     */
+    SetHeaderText(text: string): void;
+    /**
+     * Returns a value indicating whether the panel is collapsed.
+     */
+    GetCollapsed(): boolean;
+    /**
+     * Sets a value indicating whether the panel is collapsed.
+     * @param collapsed true, to collapse the panel; otherwise, false.
+     */
+    SetCollapsed(collapsed: boolean): void;
+}
+/**
+ * Represents a client-side equivalent of the ASPxSplitter object.
+ */
+interface ASPxClientSplitter extends ASPxClientControl {
+    /**
+     * Fires before a pane is resized.
+     */
+    PaneResizing: ASPxClientEvent<ASPxClientSplitterPaneCancelEventHandler<ASPxClientSplitter>>;
+    /**
+     * Fires after a pane has been resized.
+     */
+    PaneResized: ASPxClientEvent<ASPxClientSplitterPaneEventHandler<ASPxClientSplitter>>;
+    /**
+     * Fires before a pane is collapsed.
+     */
+    PaneCollapsing: ASPxClientEvent<ASPxClientSplitterPaneCancelEventHandler<ASPxClientSplitter>>;
+    /**
+     * Fires after a pane has been collapsed.
+     */
+    PaneCollapsed: ASPxClientEvent<ASPxClientSplitterPaneEventHandler<ASPxClientSplitter>>;
+    /**
+     * Fires before a pane is expanded.
+     */
+    PaneExpanding: ASPxClientEvent<ASPxClientSplitterPaneCancelEventHandler<ASPxClientSplitter>>;
+    /**
+     * Fires after a pane has been expanded.
+     */
+    PaneExpanded: ASPxClientEvent<ASPxClientSplitterPaneEventHandler<ASPxClientSplitter>>;
+    /**
+     * Occurs when a pane resize operation has been completed.
+     */
+    PaneResizeCompleted: ASPxClientEvent<ASPxClientSplitterPaneEventHandler<ASPxClientSplitter>>;
+    /**
+     * Fires after a specific web page has been loaded into a pane.
+     */
+    PaneContentUrlLoaded: ASPxClientEvent<ASPxClientSplitterPaneEventHandler<ASPxClientSplitter>>;
+    /**
+     * Returns the number of panes at the root level of a splitter.
+     */
+    GetPaneCount(): number;
+    /**
+     * Returns the splitter's root pane specified by its index within the Panes collection.
+     * @param index An integer value specifying the zero-based index of the root pane to be retrieved.
+     */
+    GetPane(index: number): ASPxClientSplitterPane;
+    /**
+     * Returns a pane specified by its name.
+     * @param name A string value specifying the name of the pane.
+     */
+    GetPaneByName(name: string): ASPxClientSplitterPane;
+    /**
+     * Specifies whether the control's panes can be resized by end-users on the client side.
+     * @param allowResize true if pane resizing is allowed; otherwise, false.
+     */
+    SetAllowResize(allowResize: boolean): void;
+    /**
+     * Returns a string value that represents the client state of splitter panes.
+     */
+    GetLayoutData(): string;
+}
+/**
+ * Represents a client-side equivalent of the splitter's SplitterPane object.
+ */
+interface ASPxClientSplitterPane {
+    /**
+     * Gets the index of the current pane within the pane collection to which it belongs.
+     * Value: An integer value representing the zero-based index of the current pane within the SplitterPaneCollection collection.
+     */
+    index: number;
+    /**
+     * Gets the name that uniquely identifies the current splitter pane.
+     * Value: A string value that represents the value assigned to the pane's Name property.
+     */
+    name: string;
+    /**
+     * Returns a client splitter object that contains the current pane.
+     */
+    GetSplitter(): ASPxClientSplitter;
+    /**
+     * Returns the immediate parent of the current pane.
+     */
+    GetParentPane(): ASPxClientSplitterPane;
+    /**
+     * Returns the previous sibling pane of the current pane.
+     */
+    GetPrevPane(): ASPxClientSplitterPane;
+    /**
+     * Returns the next sibling pane of the current pane.
+     */
+    GetNextPane(): ASPxClientSplitterPane;
+    /**
+     * Determines whether the current pane is the first pane within the SplitterPaneCollection.
+     */
+    IsFirstPane(): boolean;
+    /**
+     * Determines whether the current pane is the last pane within the SplitterPaneCollection.
+     */
+    IsLastPane(): boolean;
+    /**
+     * Returns a value that indicates the orientation in which the current pane and its sibling panes are stacked.
+     */
+    IsVertical(): boolean;
+    /**
+     * Returns the number of the current pane's immediate child panes.
+     */
+    GetPaneCount(): number;
+    /**
+     * Returns the current pane's immediate child pane specified by its index.
+     * @param index An integer value specifying the zero-based index of the child pane to be retrieved.
+     */
+    GetPane(index: number): ASPxClientSplitterPane;
+    /**
+     * Returns the current pane's child pane specified by its name.
+     * @param name A string value specifying the name of the pane.
+     */
+    GetPaneByName(name: string): ASPxClientSplitterPane;
+    /**
+     * Gets the width of the pane's content area.
+     */
+    GetClientWidth(): number;
+    /**
+     * Gets the height of the pane's content area.
+     */
+    GetClientHeight(): number;
+    /**
+     * Collapses the current pane and occupies its space by maximizing the specified pane.
+     * @param maximizedPane A ASPxClientSplitterPane object specifying the pane to be maximized to occupy the freed space.
+     */
+    Collapse(maximizedPane: ASPxClientSplitterPane): boolean;
+    /**
+     * Collapses the current pane in a forward direction and occupies its space by maximizing the previous adjacent pane.
+     */
+    CollapseForward(): boolean;
+    /**
+     * Collapses the current pane in a backward direction, and occupies its space by maximizing the next adjacent pane.
+     */
+    CollapseBackward(): boolean;
+    /**
+     * Expands the current pane object on the client side.
+     */
+    Expand(): boolean;
+    /**
+     * Returns whether the pane is collapsed.
+     */
+    IsCollapsed(): boolean;
+    /**
+     * Returns whether the pane's content is loaded from an external web page.
+     */
+    IsContentUrlPane(): boolean;
+    /**
+     * Gets the URL of a web page displayed as a pane's content.
+     */
+    GetContentUrl(): string;
+    /**
+     * Sets the URL to point to a web page that should be loaded into, and displayed within the current pane.
+     * @param url A string value specifying the URL to a web page displayed within the pane.
+     */
+    SetContentUrl(url: string): void;
+    /**
+     * Sets the URL to point to a web page that should be loaded into, and displayed within the current pane, but should not be cached by a client browser.
+     * @param url A string value specifying the URL to a web page displayed within the pane.
+     * @param preventBrowserCaching true to prevent the browser to cache the loaded content; false to allow browser caching.
+     */
+    SetContentUrl(url: string, preventBrowserCaching: boolean): void;
+    /**
+     * Refreshes the content of the web page displayed within the current pane.
+     */
+    RefreshContentUrl(): void;
+    /**
+     * Returns an iframe object containing a web page specified via the pane's SetContentUrl client method).
+     */
+    GetContentIFrame(): Object;
+    /**
+     * Specifies whether the current pane can be resized by end-users on the client side.
+     * @param allowResize true if pane resizing is allowed; otherwise, false.
+     */
+    SetAllowResize(allowResize: boolean): void;
+    /**
+     * Forces the client PaneResized event to be generated.
+     */
+    RaiseResizedEvent(): void;
+    /**
+     * Returns an HTML element representing a splitter pane object.
+     */
+    GetElement(): Object;
+    /**
+     * Specifies the splitter pane's size in pixels.
+     * @param size An integer value that specifies the splitter pane's size.
+     */
+    SetSize(size: number): void;
+    /**
+     * Specifies the splitter pane's size, in pixels or percents.
+     * @param size A string value that specifies the splitter pane's size, in pixels or percents.
+     */
+    SetSize(size: string): void;
+    /**
+     * Returns the splitter pane's size, in pixels or percents.
+     */
+    GetSize(): string;
+    /**
+     * Returns the distance between the top edge of the pane content and the topmost portion of the content currently visible in the pane.
+     */
+    GetScrollTop(): number;
+    /**
+     * Specifies the distance between the top edge of the pane content and the topmost portion of the content currently visible in the pane.
+     * @param value An integer value that is the distance (in pixels).
+     */
+    SetScrollTop(value: number): void;
+    /**
+     * Returns the distance between the left edge of the pane content and the leftmost portion of the content currently visible in the pane.
+     */
+    GetScrollLeft(): number;
+    /**
+     * Specifies the distance between the left edge of the pane content and the leftmost portion of the content currently visible in the pane.
+     * @param value An integer value that is the distance (in pixels).
+     */
+    SetScrollLeft(value: number): void;
+}
+/**
+ * A method that will handle the splitter's client events concerning manipulations with a pane.
+ */
+interface ASPxClientSplitterPaneEventHandler<S> {
+    /**
+     * A method that will handle the splitter's client events concerning pane manipulations.
+     * @param source An object representing the event's source. Identifies the splitter object that raised the event.
+     * @param e An ASPxClientSplitterPaneEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientSplitterPaneEventArgs): void;
+}
+/**
+ * A method that will handle the splitter's client events concerning manipulations with a pane.
+ */
+interface ASPxClientSplitterPaneEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the pane object related to the event.
+     * Value: An ASPxClientSplitterPane object, manipulations on which forced the event to be raised.
+     */
+    pane: ASPxClientSplitterPane;
+}
+/**
+ * A method that will handle a splitter control's cancelable client events concerning manipulations with a pane.
+ */
+interface ASPxClientSplitterPaneCancelEventHandler<S> {
+    /**
+     * A method that will handle a splitter control's cancelable client events concerning pane manipulations.
+     * @param source An object representing the event's source. Identifies the splitter control object that raised the event.
+     * @param e An ASPxClientSplitterPaneCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientSplitterPaneCancelEventArgs): void;
+}
+/**
+ * Provides data for a splitter control's cancelable client events concerning manipulations with a pane.
+ */
+interface ASPxClientSplitterPaneCancelEventArgs extends ASPxClientSplitterPaneEventArgs {
+    /**
+     * Gets or sets a value indicating whether the action which raised the event should be canceled.
+     * Value: true if the action that raised the event should be canceled; otherwise, false.
+     */
+    cancel: boolean;
+}
+/**
+ * Represents a base for the ASPxClientPageControl objects.
+ */
+interface ASPxClientTabControlBase extends ASPxClientControl {
+    /**
+     * Fires when a tab is clicked.
+     */
+    TabClick: ASPxClientEvent<ASPxClientTabControlTabClickEventHandler<ASPxClientTabControlBase>>;
+    /**
+     * Fires on the client side after the active tab has been changed within a tab control.
+     */
+    ActiveTabChanged: ASPxClientEvent<ASPxClientTabControlTabEventHandler<ASPxClientTabControlBase>>;
+    /**
+     * Fires on the client side before the active tab is changed within a tab control.
+     */
+    ActiveTabChanging: ASPxClientEvent<ASPxClientTabControlTabCancelEventHandler<ASPxClientTabControlBase>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientTabControlBase>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientTabControlBase>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by a client tab control.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientTabControlBase>>;
+    /**
+     * Modifies a tab page's size in accordance with the content.
+     */
+    AdjustSize(): void;
+    /**
+     * Returns the active tab within the tab control.
+     */
+    GetActiveTab(): ASPxClientTab;
+    /**
+     * Makes the specified tab active within the tab control on the client side.
+     * @param tab An ASPxClientTab object specifying the tab to select.
+     */
+    SetActiveTab(tab: ASPxClientTab): void;
+    /**
+     * Returns the index of the active tab within the tab control.
+     */
+    GetActiveTabIndex(): number;
+    /**
+     * Makes a tab active within the tab control, specifying the tab's index.
+     * @param index An integer value specifying the index of the tab to select.
+     */
+    SetActiveTabIndex(index: number): void;
+    /**
+     * Returns the number of tabs in the ASPxTabControl.
+     */
+    GetTabCount(): number;
+    /**
+     * Returns a tab specified by its index.
+     * @param index An integer value specifying the zero-based index of the tab object to retrieve.
+     */
+    GetTab(index: number): ASPxClientTab;
+    /**
+     * Returns a tab specified by its name.
+     * @param name A string value specifying the name of the tab.
+     */
+    GetTabByName(name: string): ASPxClientTab;
+}
+/**
+ * Represents a client-side equivalent of the ASPxTabControl object.
+ */
+interface ASPxClientTabControl extends ASPxClientTabControlBase {
+}
+/**
+ * Represents a client-side equivalent of the ASPxPageControl object.
+ */
+interface ASPxClientPageControl extends ASPxClientTabControlBase {
+    /**
+     * Returns the HTML code that represents the contents of the specified page within the page control.
+     * @param tab An ASPxClientTab object that specifies the required page.
+     */
+    GetTabContentHTML(tab: ASPxClientTab): string;
+    /**
+     * Defines the HTML content for a specific tab page within the page control.
+     * @param tab An ASPxClientTab object that specifies the required tab page.
+     * @param html A string value that represents the HTML code defining the content of the specified page.
+     */
+    SetTabContentHTML(tab: ASPxClientTab, html: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     */
+    PerformCallback(parameter: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side Callback event, passing it the specified argument.
+     * @param parameter A string value that represents any information that needs to be sent to the server-side Callback event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(parameter: string, onSuccess: (arg1: string) => void): void;
+}
+/**
+ * Represents a client-side equivalent of a tab control's TabPage object.
+ */
+interface ASPxClientTab {
+    /**
+     * Gets the tab control to which the current tab belongs.
+     * Value: An ASPxClientTabControlBase object representing the control to which the tab belongs.
+     */
+    tabControl: ASPxClientTabControlBase;
+    /**
+     * Gets the index of the current tab (tabbed page) within the control's collection of tabs (tabbed pages).
+     * Value: An integer value representing the zero-based index of the current tab (tabbed page) within the TabPages) collection of the control to which the tab belongs.
+     */
+    index: number;
+    /**
+     * Gets the name that uniquely identifies the current tab.
+     * Value: A string value that represents the value assigned to the tab's Name property.
+     */
+    name: string;
+    /**
+     * Returns a value specifying whether a tab is enabled.
+     */
+    GetEnabled(): boolean;
+    /**
+     * Specifies whether the tab is enabled.
+     * @param value true to enable the tab; otherwise, false.
+     */
+    SetEnabled(value: boolean): void;
+    /**
+     * Returns the URL pointing to the image displayed within the tab.
+     */
+    GetImageUrl(): string;
+    /**
+     * Specifies the URL which points to the image displayed within the tab.
+     * @param value A string value that is the URL to the image displayed within the tab.
+     */
+    SetImageUrl(value: string): void;
+    /**
+     * Returns the URL pointing to the image displayed within the active tab.
+     */
+    GetActiveImageUrl(): string;
+    /**
+     * Specifies the URL which points to the image displayed within the active tab.
+     * @param value A string value that is the URL to the image displayed within the active tab.
+     */
+    SetActiveImageUrl(value: string): void;
+    /**
+     * Gets an URL which defines the navigation location for the tab.
+     */
+    GetNavigateUrl(): string;
+    /**
+     * Specifies a URL which defines the navigation location for the tab.
+     * @param value A string value which is a URL to where the client web browser will navigate when the tab is clicked.
+     */
+    SetNavigateUrl(value: string): void;
+    /**
+     * Returns text displayed within the tab.
+     */
+    GetText(): string;
+    /**
+     * Specifies the text displayed within the tab.
+     * @param value A string value that is the text displayed within the tab.
+     */
+    SetText(value: string): void;
+    /**
+     * Returns a value specifying whether a tab is displayed.
+     */
+    GetVisible(): boolean;
+    /**
+     * Specifies whether the tab is visible.
+     * @param value true is the tab is visible; otherwise, false.
+     */
+    SetVisible(value: boolean): void;
+}
+/**
+ * A method that will handle a tab control's client events concerning manipulations with a tab.
+ */
+interface ASPxClientTabControlTabEventHandler<S> {
+    /**
+     * A method that will handle a tab control's client events concerning manipulations with a tab.
+     * @param source An object representing the event's source. Identifies the tab control object that raised the event.
+     * @param e An ASPxClientTabControlTabEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTabControlTabEventArgs): void;
+}
+/**
+ * Provides data for events which concern manipulations on tabs.
+ */
+interface ASPxClientTabControlTabEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the tab object related to the event.
+     * Value: An ASPxClientTab object, manipulations on which forced the event to be raised.
+     */
+    tab: ASPxClientTab;
+}
+/**
+ * A method that will handle a tab control's cancelable client events concerning manipulations with a tab.
+ */
+interface ASPxClientTabControlTabCancelEventHandler<S> {
+    /**
+     * A method that will handle a tab control's cancelable client events concerning manipulations with a tab.
+     * @param source An object representing the event's source. Identifies the tab control object that raised the event.
+     * @param e An ASPxClientTabControlTabCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTabControlTabCancelEventArgs): void;
+}
+/**
+ * Provides data for cancellable events which concern manipulations on tabs.
+ */
+interface ASPxClientTabControlTabCancelEventArgs extends ASPxClientProcessingModeCancelEventArgs {
+    /**
+     * Gets the tab object related to the event.
+     * Value: An ASPxClientTab object representing the tab manipulations on which forced the tab control to raise the event.
+     */
+    tab: ASPxClientTab;
+    /**
+     * Gets or sets a value specifying whether a callback should be sent to the server to reload the content of the page being activated.
+     * Value: true to reload the page's content; otherwise, false.
+     */
+    reloadContentOnCallback: boolean;
+}
+/**
+ * A method that will handle client events concerning clicks on the control's tabs.
+ */
+interface ASPxClientTabControlTabClickEventHandler<S> {
+    /**
+     * A method that will handle client events concerning clicks on tabs.
+     * @param source The event source. This parameter identifies the tab control object which raised the event.
+     * @param e An ASPxClientTabControlTabClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTabControlTabClickEventArgs): void;
+}
+/**
+ * Provides data for events which concern clicking on the control's tabs.
+ */
+interface ASPxClientTabControlTabClickEventArgs extends ASPxClientTabControlTabCancelEventArgs {
+    /**
+     * Gets the HTML object that contains the processed tab.
+     * Value: An object representing a container for the tab related to the event.
+     */
+    htmlElement: Object;
+    /**
+     * Gets a DHTML event object that relates to the processed event.
+     * Value: An object that maintains DHTML event-specific information.
+     */
+    htmlEvent: Object;
+}
+/**
+ * Represents a client-side equivalent of the ASPxTimer object.
+ */
+interface ASPxClientTimer extends ASPxClientControl {
+    /**
+     * Fires on the client side when the specified timer interval has elapsed, and the timer is enabled.
+     */
+    Tick: ASPxClientEvent<ASPxClientProcessingModeEventHandler<ASPxClientTimer>>;
+    /**
+     * Returns a value indicating whether the timer is enabled.
+     */
+    GetEnabled(): boolean;
+    /**
+     * Enables the timer.
+     * @param enabled true to turn the timer on; false, to turn the timer off.
+     */
+    SetEnabled(enabled: boolean): void;
+    /**
+     * Gets the time before the Tick event.
+     */
+    GetInterval(): number;
+    /**
+     * Specifies the time before the Tick event.
+     * @param interval An integer value that specifies the number of milliseconds before the Tick event is raised relative to the last occurrence of the Tick event. The value cannot be less than one.
+     */
+    SetInterval(interval: number): void;
+}
+/**
+ * Represents a client-side equivalent of the ASPxTitleIndex object.
+ */
+interface ASPxClientTitleIndex extends ASPxClientControl {
+    /**
+     * Fires after an item has been clicked.
+     */
+    ItemClick: ASPxClientEvent<ASPxClientTitleIndexItemEventHandler<ASPxClientTitleIndex>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientTitleIndex>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientTitleIndex>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientTitleIndex.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientTitleIndex>>;
+}
+/**
+ * A method that will handle client events concerning manipulations with an item.
+ */
+interface ASPxClientTitleIndexItemEventHandler<S> {
+    /**
+     * A method that will handle the title index control's client events concerning manipulations with an item.
+     * @param source An object representing the event's source. Identifies the title index control object that raised the event.
+     * @param e An ASPxClientTitleIndexItemEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTitleIndexItemEventArgs): void;
+}
+/**
+ * Provides data for events which concern manipulations on the control's items.
+ */
+interface ASPxClientTitleIndexItemEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the name that uniquely identifies the processed item.
+     * Value: A string value that represents the value assigned to the processed item's Name property.
+     */
+    name: Object;
+    /**
+     * Gets the HTML object that contains the processed item.
+     * Value: An object representing a container for the item related to the event.
+     */
+    htmlElement: Object;
+    /**
+     * Gets a DHTML event object that relates to the processed event.
+     * Value: An object that maintains DHTML event-specific information.
+     */
+    htmlEvent: Object;
+}
+/**
+ * Represents a client-side equivalent of the ASPxTreeView object.
+ */
+interface ASPxClientTreeView extends ASPxClientControl {
+    /**
+     * Fires on the client side after a node has been clicked.
+     */
+    NodeClick: ASPxClientEvent<ASPxClientTreeViewNodeClickEventHandler<ASPxClientTreeView>>;
+    /**
+     * Fires on the client side after a node's expansion state has been changed by end-user interaction.
+     */
+    ExpandedChanged: ASPxClientEvent<ASPxClientTreeViewNodeEventHandler<ASPxClientTreeView>>;
+    /**
+     * Fires on the client side before the expansion state of a node is changed via end-user interaction.
+     */
+    ExpandedChanging: ASPxClientEvent<ASPxClientTreeViewNodeCancelEventHandler<ASPxClientTreeView>>;
+    /**
+     * Occurs on the client side when the node's checked state is changed by clicking on a check box.
+     */
+    CheckedChanged: ASPxClientEvent<ASPxClientTreeViewNodeProcessingModeEventHandler<ASPxClientTreeView>>;
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientTreeView>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientTreeView>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientTreeView.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientTreeView>>;
+    /**
+     * Returns a node specified by its index within the ASPxTreeView's node collection.
+     * @param index An integer value specifying the zero-based index of the node to be retrieved.
+     */
+    GetNode(index: number): ASPxClientTreeViewNode;
+    /**
+     * Returns a node specified by its name.
+     * @param name A string value specifying the name of the node.
+     */
+    GetNodeByName(name: string): ASPxClientTreeViewNode;
+    /**
+     * Returns a node specified by its text.
+     * @param text A string value specifying the text content of the node.
+     */
+    GetNodeByText(text: string): ASPxClientTreeViewNode;
+    /**
+     * Returns the number of nodes at the ASPxTreeView's zero level.
+     */
+    GetNodeCount(): number;
+    /**
+     * Returns the selected node within the ASPxTreeView control on the client side.
+     */
+    GetSelectedNode(): ASPxClientTreeViewNode;
+    /**
+     * Selects the specified node within the ASPxTreeView control on the client side.
+     * @param node An ASPxClientTreeViewNode object specifying the node to select.
+     */
+    SetSelectedNode(node: ASPxClientTreeViewNode): void;
+    /**
+     * Gets the root node of the ASPxTreeView object.
+     */
+    GetRootNode(): ASPxClientTreeViewNode;
+    /**
+     * Collapses all nodes in the ASPxTreeView on the client side.
+     */
+    CollapseAll(): void;
+    /**
+     * Expands all nodes in the ASPxTreeView on the client side.
+     */
+    ExpandAll(): void;
+}
+/**
+ * Represents a client-side equivalent of the ASPxTreeView's TreeViewNode object.
+ */
+interface ASPxClientTreeViewNode {
+    /**
+     * Gets the client representation of the ASPxTreeView control to which the current node belongs.
+     * Value: An ASPxClientTreeView object representing the control to which the node belongs.
+     */
+    treeView: ASPxClientTreeView;
+    /**
+     * Gets the current node's parent node.
+     * Value: An ASPxClientTreeViewNode object representing the node's immediate parent.
+     */
+    parent: ASPxClientTreeViewNode;
+    /**
+     * Gets the node's index within the parent's collection of nodes.
+     * Value: An integer value representing the node's zero-based index within the Nodes collection of the node to which the node belongs.
+     */
+    index: number;
+    /**
+     * Gets the name that uniquely identifies the node.
+     * Value: A string value that represents the value assigned to the node's Name property.
+     */
+    name: string;
+    /**
+     * Returns the number of the current node's immediate child nodes.
+     */
+    GetNodeCount(): number;
+    /**
+     * Returns the current node's immediate child node specified by its index.
+     * @param index An integer value specifying the zero-based index of the node to be retrieved.
+     */
+    GetNode(index: number): ASPxClientTreeViewNode;
+    /**
+     * Returns the current node's child node specified by its name.
+     * @param name A string value specifying the name of the node.
+     */
+    GetNodeByName(name: string): ASPxClientTreeViewNode;
+    /**
+     * Returns the current node's child node specified by its text.
+     * @param text A string value specifying the text content of the node.
+     */
+    GetNodeByText(text: string): ASPxClientTreeViewNode;
+    /**
+     * Returns a value indicating whether the node is expanded.
+     */
+    GetExpanded(): boolean;
+    /**
+     * Sets a value which specifies the node's expansion state.
+     * @param value true if the node is expanded; otherwise, false.
+     */
+    SetExpanded(value: boolean): void;
+    /**
+     * Returns a value indicating whether the node is checked.
+     */
+    GetChecked(): boolean;
+    /**
+     * Sets a value indicating whether the node is checked.
+     * @param value true if the node is checked; otherwise, false.
+     */
+    SetChecked(value: boolean): void;
+    /**
+     * Returns a value which specifies the node's check state.
+     */
+    GetCheckState(): string;
+    /**
+     * Returns a value specifying whether the node is enabled.
+     */
+    GetEnabled(): boolean;
+    /**
+     * Sets a value specifying whether the node is enabled.
+     * @param value true to make the node enabled; false to disable it.
+     */
+    SetEnabled(value: boolean): void;
+    /**
+     * Returns the URL pointing to the image displayed within the node.
+     */
+    GetImageUrl(): string;
+    /**
+     * Sets the URL which points to the image displayed within the node.
+     * @param value A string value specifying the URL to the image displayed within the node.
+     */
+    SetImageUrl(value: string): void;
+    /**
+     * Gets an URL which defines the navigation location for the node's hyperlink.
+     */
+    GetNavigateUrl(): string;
+    /**
+     * Specifies a URL which defines the node's navigate URL.
+     * @param value A string value which specifies a URL to where the client web browser will navigate when the node is clicked.
+     */
+    SetNavigateUrl(value: string): void;
+    /**
+     * Gets the text, displayed within the node.
+     */
+    GetText(): string;
+    /**
+     * Specifies the text, displayed within the node.
+     * @param value A string value that represents the text displayed within the node.
+     */
+    SetText(value: string): void;
+    /**
+     * Returns a value specifying whether a node is displayed.
+     */
+    GetVisible(): boolean;
+    /**
+     * Specifies whether the node is visible.
+     * @param value true if the node is visible; otherwise, false.
+     */
+    SetVisible(value: boolean): void;
+    /**
+     * Gets the HTML object that contains the current node.
+     */
+    GetHtmlElement(): Object;
+}
+/**
+ * A method that will handle the client events concerned with node processing.
+ */
+interface ASPxClientTreeViewNodeProcessingModeEventHandler<S> {
+    /**
+     * A method that will handle the client events concerned with node processing.
+     * @param source An object representing the event source. Identifies the ASPxClientTreeView control that raised the event.
+     * @param e An ASPxClientTreeViewNodeProcessingModeEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTreeViewNodeProcessingModeEventArgs): void;
+}
+/**
+ * Provides data for the client events concerned with node processing, and that allow the event's processing to be passed to the server side.
+ */
+interface ASPxClientTreeViewNodeProcessingModeEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets a node object related to the event.
+     * Value: An ASPxClientTreeViewNode object, manipulations on which forced the event to be raised.
+     */
+    node: ASPxClientTreeViewNode;
+}
+/**
+ * A method that will handle the ASPxClientTreeView.ItemClick event.
+ */
+interface ASPxClientTreeViewNodeClickEventHandler<S> {
+    /**
+     * A method that will handle the NodeClick event.
+     * @param source The ASPxClientTreeView control which fires the event.
+     * @param e An ASPxClientTreeViewNodeClickEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTreeViewNodeClickEventArgs): void;
+}
+/**
+ * Provides data for the NodeClick event.
+ */
+interface ASPxClientTreeViewNodeClickEventArgs extends ASPxClientTreeViewNodeProcessingModeEventArgs {
+    /**
+     * Gets the HTML object that contains the processed node.
+     * Value: An object representing a container for the node related to the event.
+     */
+    htmlElement: Object;
+    /**
+     * Gets a DHTML event object that relates to the processed event.
+     * Value: An object that maintains DHTML event-specific information.
+     */
+    htmlEvent: Object;
+}
+/**
+ * A method that will handle the ASPxTreeView control's client events concerning manipulations with a node.
+ */
+interface ASPxClientTreeViewNodeEventHandler<S> {
+    /**
+     * A method that will handle the ASPxTreeView control's client events, concerning manipulations with a node.
+     * @param source An object representing the event's source. Identifies the ASPxClientTreeView control object that raised the event.
+     * @param e An ASPxClientTreeViewNodeEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTreeViewNodeEventArgs): void;
+}
+/**
+ * Provides data for the ExpandedChanged events.
+ */
+interface ASPxClientTreeViewNodeEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets a node object related to the event.
+     * Value: An ASPxClientTreeViewNode object, manipulations on which forced the event to be raised.
+     */
+    node: ASPxClientTreeViewNode;
+}
+/**
+ * A method that will handle the ASPxTreeView's cancelable client events, concerning manipulations with nodes.
+ */
+interface ASPxClientTreeViewNodeCancelEventHandler<S> {
+    /**
+     * A method that will handle the ASPxTreeView's cancelable client events, concerning manipulations with nodes.
+     * @param source An object representing the event's source. Identifies the ASPxClientTreeView object that raised the event.
+     * @param e An ASPxClientTreeViewNodeCancelEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientTreeViewNodeCancelEventArgs): void;
+}
+/**
+ * Provides data for the ExpandedChanging event.
+ */
+interface ASPxClientTreeViewNodeCancelEventArgs extends ASPxClientProcessingModeCancelEventArgs {
+    /**
+     * Gets a node object related to the event.
+     * Value: An ASPxClientTreeViewNode object, manipulations on which forced the event to be raised.
+     */
+    node: ASPxClientTreeViewNode;
+}
+/**
+ * Represents a client-side equivalent of the ASPxUploadControl control.
+ */
+interface ASPxClientUploadControl extends ASPxClientControl {
+    /**
+     * Occurs on the client after a file has been uploaded.
+     */
+    FileUploadComplete: ASPxClientEvent<ASPxClientUploadControlFileUploadCompleteEventHandler<ASPxClientUploadControl>>;
+    /**
+     * Occurs on the client after upload of all selected files has been completed.
+     */
+    FilesUploadComplete: ASPxClientEvent<ASPxClientUploadControlFilesUploadCompleteEventHandler<ASPxClientUploadControl>>;
+    /**
+     * Occurs on the client side before upload of the specified files starts.
+     */
+    FileUploadStart: ASPxClientEvent<ASPxClientUploadControlFilesUploadStartEventHandler<ASPxClientUploadControl>>;
+    /**
+     * Occurs on the client side before file upload is started.
+     */
+    FilesUploadStart: ASPxClientEvent<ASPxClientUploadControlFilesUploadStartEventHandler<ASPxClientUploadControl>>;
+    /**
+     * Fires on the client side when the text within the control's edit box is changed while the control has focus.
+     */
+    TextChanged: ASPxClientEvent<ASPxClientUploadControlTextChangedEventHandler<ASPxClientUploadControl>>;
+    /**
+     * Occurs on the client side when the progress bar indicator position is changed.
+     */
+    UploadingProgressChanged: ASPxClientEvent<ASPxClientUploadControlUploadingProgressChangedEventHandler<ASPxClientUploadControl>>;
+    /**
+     * Occurs on the client side when the file input elements count is changed.
+     */
+    FileInputCountChanged: ASPxClientEvent<ASPxClientEventHandler<ASPxClientUploadControl>>;
+    /**
+     * Enables you to specify whether the selected file(s) are valid and provide an error text.
+     */
+    ValidationErrorOccurred: ASPxClientEvent<ASPxClientUploadControlValidationErrorOccurredEventHandler<ASPxClientUploadControl>>;
+    /**
+     * Fires when the mouse enters a drop zone or an external drop zone element while dragging a file.
+     */
+    DropZoneEnter: ASPxClientEvent<ASPxClientUploadControlDropZoneEnterEventHandler<ASPxClientUploadControl>>;
+    /**
+     * Fires when the mouse leaves a drop zone or an external drop zone element while dragging a file.
+     */
+    DropZoneLeave: ASPxClientEvent<ASPxClientUploadControlDropZoneLeaveEventHandler<ASPxClientUploadControl>>;
+    /**
+     * Specifies whether the upload control's Advanced mode is enabled.
+     */
+    IsAdvancedModeEnabled(): boolean;
+    /**
+     * Initiates uploading of the specified file to the web server's memory.
+     */
+    UploadFile(): void;
+    /**
+     * Adds a new file input element to the ASPxUploadControl.
+     */
+    AddFileInput(): void;
+    /**
+     * Removes a file input element from the ASPxUploadControl.
+     * @param index An integer value that represents a file input element's index.
+     */
+    RemoveFileInput(index: number): void;
+    /**
+     * Removes a file with the specified index from the selected file list.
+     * @param fileIndex An integer value that is the zero-based index of an item in the file list.
+     */
+    RemoveFileFromSelection(fileIndex: number): void;
+    /**
+     * Removes the specified file from the list of files selected for uploading in the upload control.
+     * @param file An ASPxClientUploadControl object that is the file to be removed from the list of files.
+     */
+    RemoveFileFromSelection(file: ASPxClientUploadControlFile): void;
+    /**
+     * Returns files selected for uploading within the specified file input.
+     * @param inputIndex An integer value that specifies the index of a file input. Default value is "0".
+     */
+    GetSelectedFiles(inputIndex: number): ASPxClientUploadControlFile[];
+    /**
+     * Gets the text displayed within the edit box of the specified file input element.
+     * @param index An integer value that specifies the required file input element's index.
+     */
+    GetText(index: number): string;
+    /**
+     * Gets the number of file input elements contained within the ASPxUploadControl.
+     */
+    GetFileInputCount(): number;
+    /**
+     * Specifies the count of the file input elements within the upload control.
+     * @param count An integer value that specifies the file input elements count.
+     */
+    SetFileInputCount(count: number): void;
+    /**
+     * Specifies whether the upload control is enabled.
+     * @param enabled true, to enable the upload control; otherwise, false.
+     */
+    SetEnabled(enabled: boolean): void;
+    /**
+     * Returns a value indicating whether the upload control is enabled.
+     */
+    GetEnabled(): boolean;
+    /**
+     * Initiates uploading of the specified file(s) to the web server's memory.
+     */
+    Upload(): void;
+    /**
+     * Cancels the initiated file uploading process.
+     */
+    Cancel(): void;
+    /**
+     * Clears the file selection in the upload control.
+     */
+    ClearText(): void;
+    /**
+     * Sets the text to be displayed within the add button.
+     * @param text A string value specifying the text to be displayed within the button.
+     */
+    SetAddButtonText(text: string): void;
+    /**
+     * Sets the text to be displayed within the upload button.
+     * @param text A string value specifying the text to be displayed within the button.
+     */
+    SetUploadButtonText(text: string): void;
+    /**
+     * Returns the text displayed within the add button.
+     */
+    GetAddButtonText(): string;
+    /**
+     * Returns the text displayed within the upload button.
+     */
+    GetUploadButtonText(): string;
+    /**
+     * Sets the ID of a web control or HTML element (or a list of IDs), a click on which invokes file upload dialog.
+     * @param ids A string value specifying the ID or a list of IDs separated by the semicolon (;).
+     */
+    SetDialogTriggerID(ids: string): void;
+}
+/**
+ * A method that will handle the client FilesUploadStart event.
+ */
+interface ASPxClientUploadControlFilesUploadStartEventHandler<S> {
+    /**
+     * A method that will handle the FilesUploadStart event.
+     * @param source The event source. Identifies the ASPxUploadControl control that raised the event.
+     * @param e A ASPxClientUploadControlFilesUploadStartEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientUploadControlFilesUploadStartEventArgs): void;
+}
+/**
+ * Provides data for the FilesUploadStart event.
+ */
+interface ASPxClientUploadControlFilesUploadStartEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets or sets a value indicating whether the action which raised the event should be canceled.
+     * Value: true if the action that raised the event should be canceled; otherwise, false.
+     */
+    cancel: boolean;
+}
+/**
+ * A method that handles the FileUploadComplete client event.
+ */
+interface ASPxClientUploadControlFileUploadCompleteEventHandler<S> {
+    /**
+     * A method that will handle the corresponding client event.
+     * @param source The event source. This parameter identifies the upload control which raised the event.
+     * @param e An ASPxClientUploadControlFileUploadCompleteEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientUploadControlFileUploadCompleteEventArgs): void;
+}
+/**
+ * Provides data for the FileUploadComplete event.
+ */
+interface ASPxClientUploadControlFileUploadCompleteEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the index of a file input element within the ASPxUploadControl.
+     * Value: An integer value that specifies the file input element's index.
+     */
+    inputIndex: number;
+    /**
+     * Gets or sets a value indicating whether the uploaded file passes validation.
+     * Value: true if the file is valid; otherwise, false.
+     */
+    isValid: boolean;
+    /**
+     * Gets the error text to be displayed within the ASPxUploadControl's error frame.
+     * Value: A string value that represents the error text.
+     */
+    errorText: string;
+    /**
+     * Gets a string that contains specific information (if any) passed from the server side for further client processing.
+     * Value: A string value representing callback data passed from the server.
+     */
+    callbackData: string;
+}
+/**
+ * A method that will handle the FilesUploadComplete client event.
+ */
+interface ASPxClientUploadControlFilesUploadCompleteEventHandler<S> {
+    /**
+     * A method that will handle the client FilesUploadComplete event.
+     * @param source The event source. This parameter identifies the upload control which raised the event.
+     * @param e A  object that contains event data.
+     */
+    (source: S, e: ASPxClientUploadControlFilesUploadCompleteEventArgs): void;
+}
+/**
+ * Provides data for the FilesUploadComplete client event, which enables you to perform specific actions after all selected files have been uploaded.
+ */
+interface ASPxClientUploadControlFilesUploadCompleteEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the error text to be displayed within the upload control's error frame.
+     * Value: A string value that is the error text.
+     */
+    errorText: string;
+    /**
+     * Gets a string that contains specific information (if any) passed from the server side for further client processing.
+     * Value: A string value that is the callback data passed from the server.
+     */
+    callbackData: string;
+}
+/**
+ * A method that will handle the TextChanged client event.
+ */
+interface ASPxClientUploadControlTextChangedEventHandler<S> {
+    /**
+     * A method that will handle the TextChanged client event.
+     * @param source The event source. This parameter identifies the upload control which raised the event.
+     * @param e An ASPxClientUploadControlTextChangedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientUploadControlTextChangedEventArgs): void;
+}
+/**
+ * Provides data for the TextChanged client event that allows you to respond to an end-user changing an edit box's text.
+ */
+interface ASPxClientUploadControlTextChangedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the index of a file input element within the ASPxUploadControl.
+     * Value: An integer value that specifies the file input element's index.
+     */
+    inputIndex: number;
+}
+/**
+ * A method that will handle the ASPxUploadControl's client event, concerned with changes in upload progress.
+ */
+interface ASPxClientUploadControlUploadingProgressChangedEventHandler<S> {
+    /**
+     * A method that will handle the ASPxUploadControl's client event concerning the uploading process being changed.
+     * @param source An object representing the event's source. Identifies the ASPxUploadControl object that raised the event.
+     * @param e An ASPxClientUploadControlUploadingProgressChangedEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientUploadControlUploadingProgressChangedEventArgs): void;
+}
+/**
+ * Provides data for the UploadingProgressChanged event.
+ */
+interface ASPxClientUploadControlUploadingProgressChangedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the number of the files selected for upload.
+     * Value: An integer value that represents the total number of selected files.
+     */
+    fileCount: number;
+    /**
+     * Gets the name of the file being currently uploaded.
+     * Value: A string value that represents the file name.
+     */
+    currentFileName: string;
+    /**
+     * Gets the content length of the currently uploaded file.
+     * Value: An integer value specifying the content length.
+     */
+    currentFileContentLength: number;
+    /**
+     * Gets the content length of the current file already uploaded to the server.
+     * Value: An integer value that is the content length.
+     */
+    currentFileUploadedContentLength: number;
+    /**
+     * Gets the position of the current file upload progress.
+     * Value: An <see cref="Int32" /> value specifying the upload progress position.
+     */
+    currentFileProgress: number;
+    /**
+     * Gets the content length of the files selected for upload.
+     * Value: An integer value specifying the total content length of the selected files.
+     */
+    totalContentLength: number;
+    /**
+     * Gets the content length of the files already uploaded to the server.
+     * Value: An integer value that represents the content length.
+     */
+    uploadedContentLength: number;
+    /**
+     * Gets the current position of total upload progress.
+     * Value: An <see cref="Int32" /> value specifying the total upload progress position.
+     */
+    progress: number;
+}
+/**
+ * A method that will handle the ValidationErrorOccurred client event.
+ */
+interface ASPxClientUploadControlValidationErrorOccurredEventHandler<S> {
+    /**
+     * A method that will handle the ValidationErrorOccurred event.
+     * @param source The event source.
+     * @param e An ASPxClientUploadControlValidationErrorOccurredEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientUploadControlValidationErrorOccurredEventArgs): void;
+}
+/**
+ * Provides data for the ValidationErrorOccurred event.
+ */
+interface ASPxClientUploadControlValidationErrorOccurredEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets or sets the error text.
+     * Value: A string value that represents the error text.
+     */
+    errorText: string;
+    /**
+     * Gets or sets a value specifying whether an alert message is displayed when the ValidationErrorOccurred event fires.
+     * Value: true, to display an alert message; otherwise, false.
+     */
+    showAlert: boolean;
+    /**
+     * Gets the validation settings for the selected files.
+     * Value: An ASPxClientUploadControlValidationSettings object that provides validation settings.
+     */
+    validationSettings: ASPxClientUploadControlValidationSettings;
+    /**
+     * Returns an array of invalid files.
+     * Value: An array of the ASPxClientUploadControlInvalidFileInfo objects.
+     */
+    invalidFiles: ASPxClientUploadControlInvalidFileInfo[];
+}
+/**
+ * Contains settings that relate to the ValidationErrorOccurred client event.
+ */
+interface ASPxClientUploadControlValidationSettings {
+    /**
+     * Gets the maximum file size.
+     * Value: An <see cref="Int64" /> value that specifies the maximum file size, in bytes.
+     */
+    maxFileSize: any;
+    /**
+     * Gets the maximum count of files that can be selected for uploading at once.
+     * Value: An integer value that specifies the maximum count of files.
+     */
+    maxFileCount: number;
+    /**
+     * Gets the allowed file extensions.
+     * Value: An array of string values that contains file extensions that are allowed.
+     */
+    allowedFileExtensions: string[];
+    /**
+     * Gets which characters in a file name are not allowed.
+     * Value: An array of string values that contains characters that are not allowed.
+     */
+    invalidFileNameCharacters: string[];
+}
+/**
+ * Contains settings of the file that hasn't passed validation.
+ */
+interface ASPxClientUploadControlInvalidFileInfo {
+    /**
+     * Gets the name of the invalid file.
+     * Value: A string value that specifies the file name.
+     */
+    fileName: string;
+    /**
+     * Gets the size of the invalid file.
+     * Value: An integer value that specifies the file size.
+     */
+    fileSize: number;
+    /**
+     * Gets the error type.
+     * Value: An ASPxClientUploadControlValidationErrorTypeConsts object that provides possible types of errors.
+     */
+    errorType: ASPxClientUploadControlValidationErrorTypeConsts;
+}
+/**
+ * Declares client constants containing codes of validation errors that can occur while selecting files for uploading.
+ */
+interface ASPxClientUploadControlValidationErrorTypeConsts {
+}
+/**
+ * Represents a client file that corresponds to a particular file selected for uploading in the upload control.
+ */
+interface ASPxClientUploadControlFile {
+    /**
+     * Gets the name of the file selected for uploading.
+     * Value: A string value that specifies the file's name.
+     */
+    name: string;
+    /**
+     * Gets the size of the file selected for uploading.
+     * Value: An Int64 value specifying the file's size, in bytes.
+     */
+    size: any;
+    /**
+     * Provides access to the file as a native Javascript object.
+     * Value: A JavaScript object that is the file selected for uploading.
+     */
+    sourceFileObject: any;
+}
+/**
+ * A method that will handle the DropZoneEnter event.
+ */
+interface ASPxClientUploadControlDropZoneEnterEventHandler<S> {
+    /**
+     * A method that will handle the DropZoneEnter event.
+     * @param source The event source. This parameter identifies the upload control object which raised the event.
+     * @param e An ASPxClientUploadControlDropZoneEnterEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientUploadControlDropZoneEnterEventArgs): void;
+}
+/**
+ * Provides data for the DropZoneEnter event.
+ */
+interface ASPxClientUploadControlDropZoneEnterEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets a drop zone object related to the processed event.
+     * Value: An object that is a drop zone related to the processed event.
+     */
+    dropZone: Object;
+}
+/**
+ * A method that will handle the DropZoneLeave event.
+ */
+interface ASPxClientUploadControlDropZoneLeaveEventHandler<S> {
+    /**
+     * A method that will handle the DropZoneLeave event.
+     * @param source The event source. Identifies the upload control object that raised the event.
+     * @param e A ASPxClientUploadControlDropZoneLeaveEventArgs object that contains event data.
+     */
+    (source: S, e: ASPxClientUploadControlDropZoneLeaveEventArgs): void;
+}
+/**
+ * Provides data for the DropZoneLeave event.
+ */
+interface ASPxClientUploadControlDropZoneLeaveEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets a drop zone object related to the processed event.
+     * Value: An object that is a drop zone related to the processed event.
+     */
+    dropZone: Object;
+}
+/**
+ * The JavaScript equivalent of the ASPxChartDesigner class.
+ */
+interface ASPxClientChartDesigner extends ASPxClientControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientChartDesigner>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientChartDesigner>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientChartDesigner.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientChartDesigner>>;
+    /**
+     * Occurs when executing the Save command on the client.
+     */
+    SaveCommandExecute: ASPxClientEvent<ASPxClientChartDesignerSaveCommandExecuteEventHandler<ASPxClientChartDesigner>>;
+    /**
+     * Enables you to customize the menu actions of a Client Chart Designer.
+     */
+    CustomizeMenuActions: ASPxClientEvent<ASPxClientChartDesignerCustomizeMenuActionsEventHandler<ASPxClientChartDesigner>>;
+    /**
+     * Sends a callback to the server and generates the server-side event, passing it the specified argument.
+     * @param arg A string value that represents any information that needs to be sent to the server-side event.
+     */
+    PerformCallback(arg: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side event, passing it the specified argument.
+     * @param arg A string value that represents any information that needs to be sent to the server-side event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(arg: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Updates the localization settings of the ASPxClientChartDesigner properties.
+     * @param localization A dictionary containing the property names, along with their localized equivalents.
+     */
+    UpdateLocalization(localization: { [key: string]: string; }): void;
+    /**
+     * Returns the model of the Client Chart Designer.
+     */
+    GetDesignerModel(): Object;
+    /**
+     * For internal use.
+     */
+    GetJsonChartModel(): string;
+}
+/**
+ * A method that will handle the SaveCommandExecute  event.
+ */
+interface ASPxClientChartDesignerSaveCommandExecuteEventHandler<S> {
+    /**
+     * Represents a method that will handle the SaveCommandExecute event.
+     * @param source The event source. This parameter identifies the ASPxChartDesigner which raised the event.
+     * @param e A ASPxClientChartDesignerSaveCommandExecuteEventArgs object which contains event data.
+     */
+    (source: S, e: ASPxClientChartDesignerSaveCommandExecuteEventArgs): void;
+}
+/**
+ * Provides data for a chart control's SaveCommandExecute event.
+ */
+interface ASPxClientChartDesignerSaveCommandExecuteEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets or sets a value specifying whether an event has been handled.
+     * Value: true, if the event hasn't been handled by a control; otherwise, false.
+     */
+    handled: boolean;
+}
+/**
+ * Represents a method that will handle the CustomizeMenuActions events.
+ */
+interface ASPxClientChartDesignerCustomizeMenuActionsEventHandler<S> {
+    /**
+     * Represents a method that will handle the CustomizeMenuActions event.
+     * @param source The event source. This parameter identifies the ASPxChartDesigner which raised the event.
+     * @param e An ASPxClientChartDesignerCustomizeMenuActionsEventArgs object which contains event data.
+     */
+    (source: S, e: ASPxClientChartDesignerCustomizeMenuActionsEventArgs): void;
+}
+/**
+ * An action of the Client Chart Designer's menu.
+ */
+interface ASPxClientChartDesignerMenuAction {
+    /**
+     * Provides access to the text for the command.
+     * Value: A String value.
+     */
+    text: string;
+    /**
+     * Provides access to the CSS class of the command's glyph.
+     * Value: A String value.
+     */
+    imageClassName: string;
+    /**
+     * Provides access to the action performed when the Client Chart Designer's button is clicked.
+     * Value: The specific action implementation.
+     */
+    clickAction: Function;
+    /**
+     * Provides access to the value that specifies whether or not the command is disabled by default.
+     * Value: true, if the command is disabled by default; otherwise, false.
+     */
+    disabled: boolean;
+    /**
+     * Provides access to the value that specifies whether or not the command is visible in the designer user interface.
+     * Value: true if the command is visible; otherwise false.
+     */
+    visible: boolean;
+    /**
+     * Provides access to the keyboard shortcut used to invoke the command.
+     * Value: A String value.
+     */
+    hotKey: string;
+    /**
+     * Provides access to the value that specifies whether or not the command has a visual separator.
+     * Value: true, if the command has a visual separator; otherwise, false.
+     */
+    hasSeparator: string;
+    /**
+     * Provides access to the location of the displayed command.
+     * Value: A String value.
+     */
+    container: string;
+}
+/**
+ * Provides data for a chart control's CustomizeMenuActions event on the client side.
+ */
+interface ASPxClientChartDesignerCustomizeMenuActionsEventArgs extends ASPxClientEventArgs {
+    /**
+     * Returns an array of the Client Chart Designer's menu actions.
+     * Value: An array of the ASPxClientChartDesignerMenuAction objects.
+     */
+    actions: ASPxClientChartDesignerMenuAction[];
+}
+/**
+ * A class which provides access to the entire hierarchy of chart elements on the client side.
+ */
+interface ASPxClientWebChartControl extends ASPxClientControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientWebChartControl>>;
+    /**
+     * Occurs on the client side after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientWebChartControl>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientWebChartControl.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientWebChartControl>>;
+    /**
+     * Occurs on the client side when any chart element is hot-tracked.
+     */
+    ObjectHotTracked: ASPxClientEvent<ASPxClientWebChartControlHotTrackEventHandler<ASPxClientWebChartControl>>;
+    /**
+     * Occurs before crosshair items are drawn when the chart's contents are being drawn.
+     */
+    CustomDrawCrosshair: ASPxClientEvent<ASPxClientWebChartControlCustomDrawCrosshairEventHandler<ASPxClientWebChartControl>>;
+    /**
+     * Occurs on the client side when any chart element is selected.
+     */
+    ObjectSelected: ASPxClientEvent<ASPxClientWebChartControlHotTrackEventHandler<ASPxClientWebChartControl>>;
+    /**
+     * Returns an ASPxClientWebChart object, which contains information about the hierarchy of a chart control, and provides access to the main properties of chart elements  on the client side.
+     */
+    GetChart(): ASPxClientWebChart;
+    /**
+     * Returns the printing options of the chart control.
+     */
+    GetPrintOptions(): ASPxClientChartPrintOptions;
+    /**
+     * Changes the mouse pointer, which is shown when the mouse is over the chart control, to the pointer with the specified name.
+     * @param cursor A string value representing the name of the desired cursor.
+     */
+    SetCursor(cursor: string): void;
+    /**
+     * Returns the specific chart element which is located under the test point.
+     * @param x An integer value that specifies the x coordinate of the test point.
+     * @param y An integer value that specifies the y coordinate of the test point.
+     */
+    HitTest(x: number, y: number): ASPxClientHitObject[];
+    /**
+     * Sends a callback to the server and generates the server-side event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side event.
+     */
+    PerformCallback(args: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side event, passing it the specified argument.
+     * @param args A string value that represents any information that needs to be sent to the server-side event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(args: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Prints the current chart on the client side.
+     */
+    Print(): void;
+    /**
+     * Loads a chart which should be customized from its object model.
+     * @param serializedChartObjectModel A String object representing the chart model.
+     */
+    LoadFromObjectModel(serializedChartObjectModel: string): void;
+    /**
+     * Exports a chart to the file of the specified format, and saves it to the disk.
+     * @param format A string value specifying the format, to which a chart should be exported.
+     */
+    SaveToDisk(format: string): void;
+    /**
+     * Exports a chart to a file in the specified format, and saves it to disk, using the specified file name.
+     * @param format A string value specifying the format, to which a chart should be exported.
+     * @param filename A string value specifying the file name, to which a chart should be exported. If this parameter is missing or set to an empty string, then the created file will be named using the client-side name of a chart.
+     */
+    SaveToDisk(format: string, filename: string): void;
+    /**
+     * Exports a report to the file of the specified format, and shows it in a new Web Browser window.
+     * @param format A string  value specifying a format in which a report should be exported.
+     */
+    SaveToWindow(format: string): void;
+    /**
+     * Gets the main DOM (Document Object Model) element on a Web Page representing this ASPxClientWebChartControl object.
+     */
+    GetMainDOMElement(): Object;
+}
+/**
+ * A method that will handle the CustomDrawCrosshair  event.
+ */
+interface ASPxClientWebChartControlCustomDrawCrosshairEventHandler<S> {
+    /**
+     * A method that will handle the CustomDrawCrosshair event.
+     * @param source The event source. This parameter identifies the chartControl which raised the event.
+     * @param e An ASPxClientWebChartControlCustomDrawCrosshairEventArgs object which contains event data.
+     */
+    (source: S, e: ASPxClientWebChartControlCustomDrawCrosshairEventArgs): void;
+}
+/**
+ * Provides data for a chart control's CustomDrawCrosshair event.
+ */
+interface ASPxClientWebChartControlCustomDrawCrosshairEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets crosshair elements settings  to custom draw a crosshair cursor.
+     * Value: An  ASPxClientCrosshairElement object.
+     */
+    crosshairElements: ASPxClientCrosshairElement;
+    /**
+     * Gets the settings of crosshair axis label elements to customize their appearance.
+     * Value: An ASPxClientCrosshairAxisLabelElement object.
+     */
+    cursorCrosshairAxisLabelElements: ASPxClientCrosshairAxisLabelElement;
+    /**
+     * Gets crosshair line element settings that are used to custom draw a crosshair cursor.
+     * Value: An ASPxClientCrosshairLineElement object that contains crosshair line element settings.
+     */
+    cursorCrosshairLineElement: ASPxClientCrosshairLineElement;
+    /**
+     * Gets the settings of crosshair group header elements to customize their appearance.
+     * Value: An ASPxClientCrosshairGroupHeaderElement object.
+     */
+    crosshairGroupHeaderElements: ASPxClientCrosshairGroupHeaderElement;
+    /**
+     * Provides access to the settings of crosshair elements and crosshair group header elements to customize their appearance.
+     * Value: An ASPxClientCrosshairElementGroup object.
+     */
+    crosshairElementGroups: ASPxClientCrosshairElementGroup;
+}
+/**
+ * Represents the client-side equivalent of the CrosshairElement class.
+ */
+interface ASPxClientCrosshairElement {
+    /**
+     * Gets a series that a crosshair element hovers over when implementing a custom draw.
+     * Value: An ASPxClientSeries object which represents the series currently being painted.
+     */
+    Series: ASPxClientSeries;
+    /**
+     * Gets the series point that a crosshair element hovers over when implementing a custom draw.
+     * Value: An ASPxClientSeriesPoint object, representing the series point that a crosshair element hovers over.
+     */
+    Point: ASPxClientSeriesPoint;
+    /**
+     * Gets or sets the crosshair line element to custom draw a crosshair cursor.
+     * Value: An ASPxClientCrosshairLineElement object, representing the crosshair line element.
+     */
+    LineElement: ASPxClientCrosshairLineElement;
+    /**
+     * Provides access to the crosshair axis label element.
+     * Value: An ASPxClientCrosshairAxisLabelElement object, representing the crosshair axis label element.
+     */
+    AxisLabelElement: ASPxClientCrosshairAxisLabelElement;
+    /**
+     * Gets the crosshair label element.
+     * Value: An ASPxClientCrosshairSeriesLabelElement object, representing the crosshair label element.
+     */
+    LabelElement: ASPxClientCrosshairSeriesLabelElement;
+    /**
+     * Specifies whether the crosshair element is visible when implementing custom drawing in the crosshair cursor.
+     * Value: true, if the crosshair element is visible; otherwise, false.
+     */
+    visible: boolean;
+}
+/**
+ * Represents the client-side equivalent of the CrosshairLineElement class.
+ */
+interface ASPxClientCrosshairLineElement {
+}
+/**
+ * Represents the client-side equivalent of the CrosshairAxisLabelElement class.
+ */
+interface ASPxClientCrosshairAxisLabelElement {
+}
+/**
+ * The client-side equivalent of the CrosshairGroupHeaderElement class.
+ */
+interface ASPxClientCrosshairGroupHeaderElement {
+}
+/**
+ * The client-side equivalent of the CrosshairLabelElement class.
+ */
+interface ASPxClientCrosshairSeriesLabelElement {
+}
+/**
+ * Represents the client-side equivalent of the CrosshairElementGroup class.
+ */
+interface ASPxClientCrosshairElementGroup {
+}
+/**
+ * Represents a method that will handle the ObjectSelected events.
+ */
+interface ASPxClientWebChartControlHotTrackEventHandler<S> {
+    /**
+     * Represents a method that will handle the ObjectSelected events.
+     * @param source The event source. This parameter identifies the ASPxClientWebChartControl which raised the event.
+     * @param e An ASPxClientWebChartControlHotTrackEventArgs object which contains event data.
+     */
+    (source: S, e: ASPxClientWebChartControlHotTrackEventArgs): void;
+}
+/**
+ * Provides data for a chart control's ObjectSelected events on the client side.
+ */
+interface ASPxClientWebChartControlHotTrackEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Provides access on the client side to the chart element, for which the event was raised.
+     * Value: An ASPxClientWebChartElement object, which represents the chart element for which the event was raised.
+     */
+    hitObject: ASPxClientWebChartElement;
+    /**
+     * Provides access on the client side to the object, which is in some way related to the object being hit. The returned value depends on the hitObject type and hit point location.
+     * Value: An ASPxClientWebChartElement object representing an additional object that relates to the one being hit.
+     */
+    additionalHitObject: ASPxClientWebChartElement;
+    /**
+     * Gets details on the chart elements located at the point where an end-user has clicked when hot-tracking or selecting a chart element on the client side.
+     * Value: An ASPxClientWebChartHitInfo object, which contains information about the chart elements located at the point where an end-user has clicked.
+     */
+    hitInfo: ASPxClientWebChartHitInfo;
+    /**
+     * Provides access on the client side to the chart and all its elements.
+     * Value: An ASPxClientWebChart object, which provides access to chart properties.
+     */
+    chart: ASPxClientWebChart;
+    /**
+     * Gets the HTML object that contains the processed item.
+     * Value: An object representing a container for the item related to the event.
+     */
+    htmlElement: Object;
+    /**
+     * Gets the X-coordinate of the hit test point, relative to the top left corner of the chart.
+     * Value: An integer value specifying X-coordinate of the hit test point (in pixels).
+     */
+    x: number;
+    /**
+     * Gets the Y-coordinate of the hit test point, relative to the top left corner of the chart.
+     * Value: An integer value specifying Y-coordinate of the hit test point (in pixels).
+     */
+    y: number;
+    /**
+     * Gets the X-coordinate of the hit test point, relative to the top left corner of the Web Page containing this chart.
+     * Value: An integer value specifying X-coordinate of the hit test point (in pixels).
+     */
+    absoluteX: number;
+    /**
+     * Gets the Y-coordinate of the hit test point, relative to the top left corner of the Web Page containing this chart.
+     * Value: An integer value specifying Y-coordinate of the hit test point (in pixels).
+     */
+    absoluteY: number;
+    /**
+     * Gets a value indicating whether the hot-tracking or object selection should be canceled.
+     * Value: true to cancel the hot-tracking or selection of an object; otherwise, false.
+     */
+    cancel: boolean;
+}
+/**
+ * Represents an object under the hit test point within a chart control, on the client side.
+ */
+interface ASPxClientHitObject {
+    /**
+     * Gets the chart element for which the event was raised.
+     * Value: An ASPxClientWebChartElement object, representing the chart element for which the event was raised.
+     */
+    Object: ASPxClientWebChartElement;
+    /**
+     * Provides access to an object, which is in some way related to the object being hit. The returned value depends on the Object type and hit point location.
+     * Value: An ASPxClientWebChartElement object that represents an additional object related to the one being hit.
+     */
+    AdditionalObject: ASPxClientWebChartElement;
+}
+/**
+ * Contains information about a specific test point within a chart control, on the client side.
+ */
+interface ASPxClientWebChartHitInfo {
+    /**
+     * Gets a value indicating whether the test point is within the chart.
+     * Value: true if the test point is within a chart; otherwise, false.
+     */
+    inChart: boolean;
+    /**
+     * Gets a value indicating whether the test point is within the chart title.
+     * Value: true if the test point is within a chart title; otherwise, false.
+     */
+    inChartTitle: boolean;
+    /**
+     * Gets a value indicating whether the test point is within the axis.
+     * Value: true if the test point is within an axis; otherwise, false.
+     */
+    inAxis: boolean;
+    /**
+     * Gets a value indicating whether the test point is within the axis label item.
+     * Value: true if the test point is within an axis label item; otherwise, false.
+     */
+    inAxisLabelItem: boolean;
+    /**
+     * Gets a value indicating whether the test point is within the axis title.
+     * Value: true if the test point is within an axis title; otherwise, false.
+     */
+    inAxisTitle: boolean;
+    /**
+     * Gets a value indicating whether the test point is within the constant line.
+     * Value: true if the test point is within a constant line; otherwise, false.
+     */
+    inConstantLine: boolean;
+    /**
+     * Gets a value indicating whether the test point is within the diagram.
+     * Value: true if the test point is within a diagram; otherwise, false.
+     */
+    inDiagram: boolean;
+    /**
+     * Gets a value indicating whether the test point is within the non-default pane.
+     * Value: true if the test point is within a non-default pane; otherwise, false.
+     */
+    inNonDefaultPane: boolean;
+    /**
+     * Gets a value indicating whether the test point is within the legend.
+     * Value: true if the test point is within a legend; otherwise, false.
+     */
+    inLegend: boolean;
+    /**
+     * Gets the value indicating whether or not the test point is within a custom legend item.
+     * Value: true if the test point is within a custom legend item; otherwise, false.
+     */
+    inCustomLegendItem: boolean;
+    /**
+     * Gets a value indicating whether the test point is within the series.
+     * Value: true if the test point is within a series; otherwise, false.
+     */
+    inSeries: boolean;
+    /**
+     * Gets a value indicating whether the test point is within the series label.
+     * Value: true if the test point is within a series label; otherwise, false.
+     */
+    inSeriesLabel: boolean;
+    /**
+     * Gets a value indicating whether the test point is within the series point.
+     * Value: true if the test point is within a series point; otherwise, false.
+     */
+    inSeriesPoint: boolean;
+    /**
+     * Gets a value indicating whether the test point is within the series title.
+     * Value: true if the test point is within a series title; otherwise, false.
+     */
+    inSeriesTitle: boolean;
+    /**
+     * Gets a value indicating whether the test point is within the trendline.
+     * Value: true if the test point is within a trendline; otherwise, false.
+     */
+    inTrendLine: boolean;
+    /**
+     * Gets a value indicating whether the test point is within the Fibonacci Indicator.
+     * Value: true if the test point is within a Fibonacci Indicator; otherwise, false.
+     */
+    inFibonacciIndicator: boolean;
+    /**
+     * Gets a value indicating whether the test point is within the regression line.
+     * Value: true if the test point is within a regression line; otherwise, false.
+     */
+    inRegressionLine: boolean;
+    /**
+     * Gets a value specifying whether the test point is within an indicator.
+     * Value: true if the test point is within an indicator; otherwise, false.
+     */
+    inIndicator: boolean;
+    /**
+     * Gets a value indicating whether the test point is within an annotation.
+     * Value: true if the test point is within an annotation; otherwise, false.
+     */
+    inAnnotation: boolean;
+    /**
+     * Gets a value indicating whether the test point is within a hyperlink.
+     * Value: true, if the test point is within a hyperlink; otherwise, false.
+     */
+    inHyperlink: boolean;
+    /**
+     * Gets the client-side chart instance from under the test point.
+     * Value: An ASPxClientWebChart object.
+     */
+    chart: ASPxClientWebChart;
+    /**
+     * Gets the client-side chart title instance from under the test point.
+     * Value: An ASPxClientChartTitle object.
+     */
+    chartTitle: ASPxClientChartTitle;
+    /**
+     * Gets the client-side axis instance from under the test point.
+     * Value: An ASPxClientAxisBase descendant.
+     */
+    axis: ASPxClientAxisBase;
+    /**
+     * Gets the client-side constant line instance from under the test point.
+     * Value: An ASPxClientConstantLine object.
+     */
+    constantLine: ASPxClientConstantLine;
+    /**
+     * Gets the client-side diagram instance from under the test point.
+     * Value: An ASPxClientXYDiagramBase descendant.
+     */
+    diagram: ASPxClientXYDiagramBase;
+    /**
+     * Gets the client-side non-default pane instance from under the test point.
+     * Value: An ASPxClientXYDiagramPane object.
+     */
+    nonDefaultPane: ASPxClientXYDiagramPane;
+    /**
+     * Gets the client-side legend instance from under the test point.
+     * Value: An ASPxClientLegend object.
+     */
+    legend: ASPxClientLegend;
+    /**
+     * Gets a custom legend item which is located under the test point.
+     * Value: An ASPxClientCustomLegendItem object which represents the item located under the test point.
+     */
+    customLegendItem: ASPxClientCustomLegendItem;
+    /**
+     * Gets the client-side series instance from under the test point.
+     * Value: An ASPxClientSeries object.
+     */
+    series: ASPxClientSeries;
+    /**
+     * Gets the client-side series label instance from under the test point.
+     * Value: An ASPxClientSeriesLabel object.
+     */
+    seriesLabel: ASPxClientSeriesLabel;
+    /**
+     * Gets the client-side series title instance from under the test point.
+     * Value: An ASPxClientSeriesTitle object.
+     */
+    seriesTitle: ASPxClientSeriesTitle;
+    /**
+     * Gets the client-side trendline instance from under the test point.
+     * Value: An ASPxClientTrendLine object.
+     */
+    trendLine: ASPxClientTrendLine;
+    /**
+     * Gets the client-side Fibonacci indicator instance from under the test point.
+     * Value: An ASPxClientFibonacciIndicator object.
+     */
+    fibonacciIndicator: ASPxClientFibonacciIndicator;
+    /**
+     * Gets the client-side regression line instance from under the test point.
+     * Value: An ASPxClientRegressionLine object.
+     */
+    regressionLine: ASPxClientRegressionLine;
+    /**
+     * Gets the client-side indicator instance from under the test point.
+     * Value: An ASPxClientIndicator descendant.
+     */
+    indicator: ASPxClientIndicator;
+    /**
+     * Gets the client-side annotation instance from under the test point.
+     * Value: An ASPxClientAnnotation object.
+     */
+    annotation: ASPxClientAnnotation;
+    /**
+     * Gets the client-side series point instance from under the test point.
+     * Value: An ASPxClientSeriesPoint object.
+     */
+    seriesPoint: ASPxClientSeriesPoint;
+    /**
+     * Gets the client-side axis label item instance from under the test point.
+     * Value: An ASPxClientAxisLabelItem object.
+     */
+    axisLabelItem: ASPxClientAxisLabelItem;
+    /**
+     * Gets the client-side axis title instance from under the test point.
+     * Value: An ASPxClientAxisTitle object.
+     */
+    axisTitle: ASPxClientAxisTitle;
+    /**
+     * Returns a hyperlink which is located under the test point.
+     * Value: A String object representing a hyperlink.
+     */
+    hyperlink: string;
+}
+/**
+ * Represents the client-side equivalent of the DiagramCoordinates class.
+ */
+interface ASPxClientDiagramCoordinates {
+    /**
+     * Gets the type of the argument scale.
+     * Value: A string object which contains the current scale type.
+     */
+    argumentScaleType: string;
+    /**
+     * Gets the type of the value scale.
+     * Value: A string object which contains the current scale type.
+     */
+    valueScaleType: string;
+    /**
+     * Gets the argument of the data point as a text string.
+     * Value: A string object, representing a data point's argument.
+     */
+    qualitativeArgument: string;
+    /**
+     * Gets the numerical representation of the data point's argument.
+     * Value: A Double value, representing the data point's argument.
+     */
+    numericalArgument: number;
+    /**
+     * Gets the date-time representation of the data point's argument.
+     * Value: A date object, representing the point's argument.
+     */
+    dateTimeArgument: Date;
+    /**
+     * Gets the numerical representation of the data point's value.
+     * Value: A Double value, representing the data point's value.
+     */
+    numericalValue: number;
+    /**
+     * Gets the date-time representation of the data point's value.
+     * Value: A date object, representing the point's value.
+     */
+    dateTimeValue: Date;
+    /**
+     * Gets the X-axis of the diagram point.
+     * Value: An ASPxClientAxisBase descendant, representing the axis of arguments (X-axis).
+     */
+    axisX: ASPxClientAxisBase;
+    /**
+     * Gets the Y-axis of the diagram point.
+     * Value: An ASPxClientAxisBase descendant, representing the axis of values (Y-axis).
+     */
+    axisY: ASPxClientAxisBase;
+    /**
+     * Gets the pane of the diagram point.
+     * Value: An ASPxClientXYDiagramPane descendant, representing the pane.
+     */
+    pane: ASPxClientXYDiagramPane;
+    /**
+     * Checks whether the current object represents a point outside the diagram area.
+     */
+    IsEmpty(): boolean;
+    /**
+     * Gets the value of the client-side axis instance.
+     * @param axis An ASPxClientAxisBase class descendant, representing the axis that contains the requested value.
+     */
+    GetAxisValue(axis: ASPxClientAxisBase): ASPxClientAxisValue;
+}
+/**
+ * Contains the information about an axis value.
+ */
+interface ASPxClientAxisValue {
+    /**
+     * Gets the axis scale type.
+     * Value: A String value, specifying the axis scale type.
+     */
+    scaleType: string;
+    /**
+     * Gets the axis value, if the axis scale type is qualitative.
+     * Value: A String value, specifying the axis value.
+     */
+    qualitativeValue: string;
+    /**
+     * Gets the axis value, if the axis scale type is numerical.
+     * Value: A Double value, specifying the axis value.
+     */
+    numericalValue: number;
+    /**
+     * Gets the axis value, if the axis scale type is date-time.
+     * Value: A DateTime value, specifying the axis value.
+     */
+    dateTimeValue: Date;
+}
+/**
+ * Represents the client-side equivalent of the ControlCoordinates class.
+ */
+interface ASPxClientControlCoordinates {
+    /**
+     * Gets the point's pane.
+     * Value: An ASPxClientXYDiagramPane object.
+     */
+    pane: ASPxClientXYDiagramPane;
+    /**
+     * Gets the point's X-coordinate, in pixels.
+     * Value: An integer value, specifying the X-coordinate (in pixels).
+     */
+    x: number;
+    /**
+     * Gets the point's Y-coordinate, in pixels.
+     * Value: An integer value, specifying the Y-coordinate (in pixels).
+     */
+    y: number;
+    /**
+     * Gets the point's visibility state.
+     * Value: "Visible", "Hidden", or "Undefined".
+     */
+    visibility: string;
+}
+/**
+ * Represents the client-side equivalent of the ChartElement class.
+ */
+interface ASPxClientWebChartElement {
+    /**
+     * Gets the chart that owns the current chart element.
+     * Value: An ASPxClientWebChart object, to which the chart element belongs.
+     */
+    chart: ASPxClientWebChart;
+}
+/**
+ * Represents a base class for chart elements, which are not necessarily required to be present on the client side.
+ */
+interface ASPxClientWebChartEmptyElement extends ASPxClientWebChartElement {
+}
+/**
+ * Represents a base class for chart elements, which are required to be present on the client side.
+ */
+interface ASPxClientWebChartRequiredElement extends ASPxClientWebChartElement {
+}
+/**
+ * Represents the client-side equivalent of the ChartElementNamed class.
+ */
+interface ASPxClientWebChartElementNamed extends ASPxClientWebChartRequiredElement {
+    /**
+     * Gets the name of the chart element.
+     * Value: A string object representing the name of the chart element.
+     */
+    name: string;
+}
+/**
+ * Represents the client-side equivalent of the WebChartControl control.
+ */
+interface ASPxClientWebChart extends ASPxClientWebChartRequiredElement {
+    /**
+     * Gets the client-side Chart Control that owns the current chart.
+     * Value: An ASPxClientWebChartControl object, to which the chart belongs.
+     */
+    chartControl: ASPxClientWebChartControl;
+    /**
+     * Gets the chart's diagram and provides access to its settings.
+     * Value: An ASPxClientRadarDiagram),  that represents the chart's diagram.
+     */
+    diagram: ASPxClientWebChartElement;
+    /**
+     * Provides access to the chart's collection of series.
+     * Value: An array of ASPxClientSeries objects that represent the collection of series.
+     */
+    series: ASPxClientSeries[];
+    /**
+     * Provides access to the collection of chart titles.
+     * Value: An array of ASPxClientChartTitle objects, that represent the collection of chart titles.
+     */
+    titles: ASPxClientChartTitle[];
+    /**
+     * Provides access to the chart's collection of annotations.
+     * Value: An array of ASPxClientAnnotation objects, representing the collection of annotations.
+     */
+    annotations: ASPxClientAnnotation[];
+    /**
+     * Gets the chart's legend and provides access to its settings.
+     * Value: An ASPxClientLegend object that represents the chart's legend.
+     */
+    legend: ASPxClientLegend;
+    /**
+     * Returns the collection of legends.
+     * Value: An array of ASPxClientLegend objects.
+     */
+    legends: ASPxClientLegend[];
+    /**
+     * Gets the name of the appearance, which is currently used to draw the chart's elements.
+     * Value: A string value that represents the appearance name.
+     */
+    appearanceName: string;
+    /**
+     * Gets the name of the palette currently used to draw the chart's series.
+     * Value: A string value that represents the palette name.
+     */
+    paletteName: string;
+    /**
+     * Gets a value indicating whether series tooltips should be shown.
+     * Value: true to show tooltips for series; otherwise, false.
+     */
+    showSeriesToolTip: boolean;
+    /**
+     * Gets a value indicating whether point tooltips should be shown.
+     * Value: true to show tooltips for series points; otherwise, false.
+     */
+    showPointToolTip: boolean;
+    /**
+     * Gets a value indicating whether a crosshair cursor should be shown.
+     * Value: true to show a crosshair cursor; otherwise, false.
+     */
+    showCrosshair: boolean;
+    /**
+     * Gets a value that contains information on how the tooltip position is defined, for example, relative to a mouse pointer or chart element.
+     * Value: An ASPxClientToolTipPosition class descendant that defines the tooltip position type.
+     */
+    toolTipPosition: ASPxClientToolTipPosition;
+    /**
+     * Returns the tooltip controller that shows tooltips for chart elements.
+     * Value: An ASPxClientToolTipController object.
+     */
+    toolTipController: ASPxClientToolTipController;
+    /**
+     * Gets the settings for a crosshair cursor concerning its position and appearance on a diagram.
+     * Value: An ASPxClientCrosshairOptions object descendant which provides access to crosshair cursor options on a diagram.
+     */
+    crosshairOptions: ASPxClientCrosshairOptions;
+    /**
+     * Gets a css postfix for a chart.
+     * Value: A string value.
+     */
+    cssPostfix: string;
+    /**
+     * Gets or sets a value which specifies how the chart elements are selected.
+     * Value: A String object representing the name of the selection mode.
+     */
+    selectionMode: string;
+}
+/**
+ * Represents the client-side equivalent of the SimpleDiagram class.
+ */
+interface ASPxClientSimpleDiagram extends ASPxClientWebChartEmptyElement {
+}
+/**
+ * Represents the base class for all diagram classes, which have X and Y axes.
+ */
+interface ASPxClientXYDiagramBase extends ASPxClientWebChartRequiredElement {
+    /**
+     * Gets the X-axis.
+     * Value: An ASPxClientAxisBase object which represents the X-axis.
+     */
+    axisX: ASPxClientAxisBase;
+    /**
+     * Gets the Y-axis.
+     * Value: An ASPxClientAxisBase object which represents the Y-axis.
+     */
+    axisY: ASPxClientAxisBase;
+}
+/**
+ * Represents the client-side equivalent of the XYDiagram2D class.
+ */
+interface ASPxClientXYDiagram2D extends ASPxClientXYDiagramBase {
+    /**
+     * Provides access to a collection of secondary X-axes for a given 2D XY-diagram.
+     * Value: An array of ASPxClientAxis objects, that is a collection of secondary X-axes.
+     */
+    secondaryAxesX: ASPxClientAxis[];
+    /**
+     * Provides access to a collection of secondary Y-axes for a given 2D XY-diagram.
+     * Value: An array of ASPxClientAxis objects, that is a collection of secondary X-axes.
+     */
+    secondaryAxesY: ASPxClientAxis[];
+    /**
+     * Provides access to a default pane object.
+     * Value: An ASPxClientXYDiagramPane object which represents the default pane of a chart.
+     */
+    defaultPane: ASPxClientXYDiagramPane;
+    /**
+     * Provides access to an array of a diagram's panes.
+     * Value: An array of ASPxClientXYDiagramPane objects.
+     */
+    panes: ASPxClientXYDiagramPane[];
+    /**
+     * Converts the display coordinates into a diagram coordinates object.
+     * @param x An integer value, representing the X-coordinate of a point (measured in pixels relative to the top left corner of a chart).
+     * @param y An integer value, representing the Y-coordinate of a point (measured in pixels relative to the top left corner of a chart).
+     */
+    PointToDiagram(x: number, y: number): ASPxClientDiagramCoordinates;
+    /**
+     * Converts the diagram coordinates of a point into screen coordinates.
+     * @param argument An object, representing the point's argument.
+     * @param value An object, representing the point's value.
+     * @param axisX An ASPxClientAxis2D descendant, representing the X-axis.
+     * @param axisY An ASPxClientAxis2D descendant, representing the Y-axis.
+     * @param pane An ASPxClientXYDiagramPane object, representing the pane.
+     */
+    DiagramToPoint(argument: Object, value: Object, axisX: ASPxClientAxis2D, axisY: ASPxClientAxis2D, pane: ASPxClientXYDiagramPane): ASPxClientControlCoordinates;
+    /**
+     * Shows the Crosshair Cursor at the point with the specified coordinates.
+     * @param screenX The horizontal coordinate that is related to the top-left angle of the chart.
+     * @param screenY The vertical coordinate that is related to the top-left angle of the chart.
+     */
+    ShowCrosshair(screenX: number, screenY: number): void;
+}
+/**
+ * Represents the client-side equivalent of the XYDiagram class.
+ */
+interface ASPxClientXYDiagram extends ASPxClientXYDiagram2D {
+    /**
+     * Gets a value indicating whether the diagram is rotated.
+     * Value: true if the diagram is rotated; otherwise, false.
+     */
+    rotated: boolean;
+}
+/**
+ * Represents the client-side equivalent of the SwiftPlotDiagram class.
+ */
+interface ASPxClientSwiftPlotDiagram extends ASPxClientXYDiagram2D {
+}
+/**
+ * Represents the client-side equivalent of the XYDiagramPane class.
+ */
+interface ASPxClientXYDiagramPane extends ASPxClientWebChartElementNamed {
+    /**
+     * Gets the diagram that owns the current pane object.
+     * Value: An ASPxClientXYDiagram object, to which the pane belongs.
+     */
+    diagram: ASPxClientXYDiagram;
+}
+/**
+ * Represents the client-side equivalent of the XYDiagram3D class.
+ */
+interface ASPxClientXYDiagram3D extends ASPxClientXYDiagramBase {
+}
+/**
+ * Represents the client-side equivalent of the RadarDiagram class.
+ */
+interface ASPxClientRadarDiagram extends ASPxClientXYDiagramBase {
+    /**
+     * Converts the display coordinates into a diagram coordinates object.
+     * @param x An integer value, representing the X-coordinate of a point (measured in pixels relative to the top left corner of a chart).
+     * @param y An integer value, representing the Y-coordinate of a point (measured in pixels relative to the top left corner of a chart).
+     */
+    PointToDiagram(x: number, y: number): ASPxClientDiagramCoordinates;
+    /**
+     * Converts the diagram coordinates of a point into screen coordinates.
+     * @param argument An object, representing the point's argument.
+     * @param value An object, representing the point's value.
+     */
+    DiagramToPoint(argument: Object, value: Object): ASPxClientControlCoordinates;
+}
+/**
+ * Represents the client-side equivalent of the AxisBase class.
+ */
+interface ASPxClientAxisBase extends ASPxClientWebChartElementNamed {
+    /**
+     * Provides access to the XY-diagram which contains the current axis.
+     * Value: An ASPxClientXYDiagramBase class descendant.
+     */
+    diagram: ASPxClientXYDiagramBase;
+    /**
+     * Provides acess to the range of the axis coordinates.
+     * Value: An ASPxClientAxisRange object, which contains the common range settings of the axis coordinates.
+     */
+    range: ASPxClientAxisRange;
+}
+/**
+ * Represents the client-side equivalent of the Axis2D class.
+ */
+interface ASPxClientAxis2D extends ASPxClientAxisBase {
+    /**
+     * Provides access to an axis title object.
+     * Value: An ASPxClientAxisTitle object which represents the axis title.
+     */
+    axisTitle: ASPxClientAxisTitle;
+    /**
+     * Provides access to the axis strips collection.
+     * Value: An array of ASPxClientStrip objects.
+     */
+    strips: ASPxClientStrip[];
+    /**
+     * Provides access to the collection of the axis constant lines.
+     * Value: An array of ASPxClientConstantLine objects which represent constant lines that belong to this axis.
+     */
+    constantLines: ASPxClientConstantLine[];
+}
+/**
+ * Represents the client-side equivalent of the Axis class.
+ */
+interface ASPxClientAxis extends ASPxClientAxis2D {
+    /**
+     * Gets a value indicating whether the axis is reversed.
+     * Value: true if the axis is reversed; otherwise, false.
+     */
+    reverse: boolean;
+}
+/**
+ * Represents the client-side equivalent of the SwiftPlotDiagramAxis class.
+ */
+interface ASPxClientSwiftPlotDiagramAxis extends ASPxClientAxis2D {
+}
+/**
+ * Represents the client-side equivalent of the Axis3D class.
+ */
+interface ASPxClientAxis3D extends ASPxClientAxisBase {
+}
+/**
+ * Represents the client-side equivalent of the RadarAxis class.
+ */
+interface ASPxClientRadarAxis extends ASPxClientAxisBase {
+}
+/**
+ * Represents the client-side equivalent of the AxisTitle class.
+ */
+interface ASPxClientAxisTitle extends ASPxClientWebChartRequiredElement {
+    /**
+     * Gets the axis to which the axis title belongs.
+     * Value: An ASPxClientAxisBase descendant, which identifies the axis.
+     */
+    axis: ASPxClientAxisBase;
+    /**
+     * Gets the text of the axis title.
+     * Value: A string object which contains the axis title's text.
+     */
+    text: string;
+}
+/**
+ * Represents the client-side equivalent of the AxisLabelItem class.
+ */
+interface ASPxClientAxisLabelItem extends ASPxClientWebChartRequiredElement {
+    /**
+     * Gets the axis to which an axis label item belongs.
+     * Value: An ASPxClientAxisBase descendant, which identifies the axis.
+     */
+    axis: ASPxClientAxisBase;
+    /**
+     * Gets the text of an axis label item.
+     * Value: A string object which contains the axis label item's text.
+     */
+    text: string;
+    /**
+     * Gets the axis value to which an axis label item corresponds.
+     * Value: An object that specifies the axis value.
+     */
+    axisValue: Object;
+    /**
+     * Gets the internal representation of the axis value to which an axis label item corresponds.
+     * Value: A Double value which specifies the internal representation of the axis value.
+     */
+    axisValueInternal: number;
+}
+/**
+ * Represents the client-side equivalent of the AxisRange class.
+ */
+interface ASPxClientAxisRange extends ASPxClientWebChartRequiredElement {
+    /**
+     * Gets the axis that owns the current axis range object.
+     * Value: An ASPxClientAxisBase object, to which the axis range belongs.
+     */
+    axis: ASPxClientAxisBase;
+    /**
+     * Gets the minimum value to display on an axis.
+     * Value: An object representing the minimum value of the axis range.
+     */
+    minValue: Object;
+    /**
+     * Gets the maximum value to display on an axis.
+     * Value: An object representing the maximum value of the axis range.
+     */
+    maxValue: Object;
+    /**
+     * Gets the internal float representation of the range minimum value.
+     * Value: A Double value which specifies the internal representation of the range minimum value.
+     */
+    minValueInternal: number;
+    /**
+     * Gets the internal float representation of the range maximum value.
+     * Value: A Double value which specifies the internal representation of the range maximum value.
+     */
+    maxValueInternal: number;
+}
+/**
+ * Represents the client-side equivalent of the Strip class.
+ */
+interface ASPxClientStrip extends ASPxClientWebChartElementNamed {
+    /**
+     * Gets the axis that owns the current strip object.
+     * Value: An ASPxClientAxis object, to which the strip belongs.
+     */
+    axis: ASPxClientAxis;
+    /**
+     * Gets the minimum value of the strip's range.
+     * Value: An object that represents the minimum value of the strip's range.
+     */
+    minValue: Object;
+    /**
+     * Gets the maximum value of the strip's range.
+     * Value: An object that represents the maximum value of the strip's range.
+     */
+    maxValue: Object;
+}
+/**
+ * Represents the client-side equivalent of the ConstantLine class.
+ */
+interface ASPxClientConstantLine extends ASPxClientWebChartElementNamed {
+    /**
+     * Gets the axis that owns the current constant line object.
+     * Value: An ASPxClientAxis object, to which the constant line belongs.
+     */
+    axis: ASPxClientAxis;
+    /**
+     * Gets the constant line's position along the axis.
+     * Value: An object that specifies the constant line's position.
+     */
+    value: Object;
+    /**
+     * Gets the constant line title.
+     * Value: A string object, representing the title's text.
+     */
+    title: string;
+}
+/**
+ * Represents the client-side equivalent of the Series class.
+ */
+interface ASPxClientSeries extends ASPxClientWebChartElementNamed {
+    /**
+     * Gets a value that specifies the view type of the series.
+     * Value: A string object which contains the current view type.
+     */
+    viewType: string;
+    /**
+     * Gets a value that specifies the scale type for the argument data of the series' data points.
+     * Value: A string object which contains the current scale type.
+     */
+    argumentScaleType: string;
+    /**
+     * Gets a value that specifies the scale type for the value data of the series' data points.
+     * Value: A string object which contains the current scale type.
+     */
+    valueScaleType: string;
+    /**
+     * Gets the X-Axis that is used to plot the current series on the XY-diagram.
+     * Value: A string object, which represents the X-axis name.
+     */
+    axisX: string;
+    /**
+     * Gets the Y-Axis that is used to plot the current series on the XY-diagram.
+     * Value: A string object, which represents the Y-axis name.
+     */
+    axisY: string;
+    /**
+     * Gets the pane that is used to plot the current series on the XY-diagram.
+     * Value: A string object, which represents the pane's name.
+     */
+    pane: string;
+    /**
+     * Gets a value indicating whether the series is visible.
+     * Value: true if the series is visible; otherwise, false.
+     */
+    visible: boolean;
+    /**
+     * Gets a value that specifies whether or not a tooltip is enabled for a chart.
+     * Value: true - a tooltip is enabled for a chart; false - a tooltip is disabled.
+     */
+    toolTipEnabled: boolean;
+    /**
+     * Gets the text to be displayed within series tooltips.
+     * Value: A string value.
+     */
+    toolTipText: string;
+    /**
+     * Gets an image to be displayed within series tooltips.
+     * Value: A string value.
+     */
+    toolTipImage: string;
+    /**
+     * Gets the settings of series labels.
+     * Value: An ASPxClientSeriesLabel object, which provides the series label settings.
+     */
+    label: ASPxClientSeriesLabel;
+    /**
+     * Gets the series' collection of data points.
+     * Value: An array of ASPxClientSeriesPoint objects, that represent the series' data points.
+     */
+    points: ASPxClientSeriesPoint[];
+    /**
+     * Provides access to the collection of series titles.
+     * Value: An array of ASPxClientSeriesTitle objects, that represent the collection of series titles.
+     */
+    titles: ASPxClientSeriesTitle[];
+    /**
+     * Gets the series' collection of indicators.
+     * Value: An array of ASPxClientIndicator objects, that belong to the series.
+     */
+    indicators: ASPxClientIndicator[];
+    /**
+     * Provides access to the collection of regression lines.
+     * Value: An array of ASPxClientRegressionLine objects which represent regression lines available for the series.
+     */
+    regressionLines: ASPxClientRegressionLine[];
+    /**
+     * Provides access to the collection of trendlines.
+     * Value: An array of ASPxClientTrendLine objects, that represent the collection of trendlines.
+     */
+    trendLines: ASPxClientTrendLine[];
+    /**
+     * Provides access to the collection of Fibonacci Indicators.
+     * Value: An array of ASPxClientFibonacciIndicator objects, that represent the collection of Fibonacci Indicators.
+     */
+    fibonacciIndicators: ASPxClientFibonacciIndicator[];
+    /**
+     * Gets the color of a series.
+     * Value: A string value.
+     */
+    color: string;
+    /**
+     * Gets a value that defines a group for stacked series.
+     * Value: A string value.
+     */
+    stackedGroup: string;
+    /**
+     * Gets a string which represents the pattern specifying the text to be displayed within a crosshair label for the current Series  type.
+     * Value: A Empty.
+     */
+    crosshairLabelPattern: string;
+    /**
+     * This property is intended for internal use only.
+     * Value: A String value.
+     */
+    groupedElementsPattern: string;
+    /**
+     * Returns a collection of crosshair value items.
+     * Value: An array of ASPxClientCrosshairValueItem objects.
+     */
+    crosshairValueItems: ASPxClientCrosshairValueItem[];
+    /**
+     * Gets a value indicating whether a crosshair cursor is enabled.
+     * Value: true if a crosshair cursor is enabled; otherwise, false.
+     */
+    actualCrosshairEnabled: boolean;
+    /**
+     * Gets a value indicating whether a crosshair label should be shown for this series.
+     * Value: true if crosshair labels are visible; otherwise, false.
+     */
+    actualCrosshairLabelVisibility: boolean;
+}
+/**
+ * Represents the client-side equivalent of the SeriesLabelBase class.
+ */
+interface ASPxClientSeriesLabel extends ASPxClientWebChartElement {
+    /**
+     * Gets the series that owns the current series label object.
+     * Value: An ASPxClientSeries object, to which the series label belongs.
+     */
+    series: ASPxClientSeries;
+    /**
+     * Gets the common text for all series point labels.
+     * Value: Returns an empty string object.
+     */
+    text: string;
+}
+/**
+ * Represents the client-side equivalent of the SeriesPoint class.
+ */
+interface ASPxClientSeriesPoint extends ASPxClientWebChartRequiredElement {
+    /**
+     * Gets the series that owns the current series point object.
+     * Value: An ASPxClientSeries object, to which the series point belongs.
+     */
+    series: ASPxClientSeries;
+    /**
+     * Gets the data point's argument.
+     * Value: An object that specifies the data point's argument.
+     */
+    argument: Object;
+    /**
+     * Gets the point's data value(s).
+     * Value: An array of objects that represent the data value(s) of the series data point.
+     */
+    values: Object[];
+    /**
+     * Gets the text to be displayed within series points tooltips.
+     * Value: A string value.
+     */
+    toolTipText: string;
+    /**
+     * Gets the color of a series point.
+     * Value: A string value.
+     */
+    color: string;
+    /**
+     * Gets the percent value of a series point.
+     * Value: A float value.
+     */
+    percentValue: number;
+    /**
+     * Gets a hint that is shown in series points tooltips.
+     * Value: A string value.
+     */
+    toolTipHint: string;
+}
+/**
+ * Represents the client-side equivalent of the Legend class.
+ */
+interface ASPxClientLegend extends ASPxClientWebChartEmptyElement {
+    /**
+     * Returns a value which determines whether to use checkboxes instead of markers on a chart legend for all legend items.
+     * Value: true, if legend checkboxes are shown instead of markers for all legend items; otherwise, false.
+     */
+    useCheckBoxes: boolean;
+    /**
+     * Returns a collection of custom legend items of the legend.
+     * Value: A collection of ASPxClientCustomLegendItem objects.
+     */
+    customItems: ASPxClientCustomLegendItem[];
+    /**
+     * Returns the name of the legend.
+     * Value: The string value representing the name of the legend.
+     */
+    name: string;
+}
+/**
+ * Represents the base for ASPxClientSeriesTitle classes.
+ */
+interface ASPxClientTitleBase extends ASPxClientWebChartRequiredElement {
+    /**
+     * Gets the lines of text within a title.
+     * Value: An array of string values containing the text of a title.
+     */
+    lines: string[];
+    /**
+     * Gets the alignment of the title.
+     * Value: A string value containing the text, which specifies the alignment of a title.
+     */
+    alignment: string;
+    /**
+     * Gets a value that specifies to which edges of a parent element the title should be docked.
+     * Value: A string value.
+     */
+    dock: string;
+}
+/**
+ * Represents the client-side equivalent of the ChartTitle class.
+ */
+interface ASPxClientChartTitle extends ASPxClientTitleBase {
+}
+/**
+ * Represents the client-side equivalent of the SeriesTitle class.
+ */
+interface ASPxClientSeriesTitle extends ASPxClientTitleBase {
+    /**
+     * Gets the series that owns the current title object.
+     * Value: An ASPxClientSeries object, to which the series title belongs.
+     */
+    series: ASPxClientSeries;
+}
+/**
+ * Represents the client-side equivalent of the Indicator class.
+ */
+interface ASPxClientIndicator extends ASPxClientWebChartElementNamed {
+    /**
+     * Gets the indicator's associated series.
+     * Value: An ASPxClientSeries object.
+     */
+    series: ASPxClientSeries;
+}
+/**
+ * Represents the client-side equivalent of the FinancialIndicator class.
+ */
+interface ASPxClientFinancialIndicator extends ASPxClientIndicator {
+    /**
+     * Gets the first point of the financial indicator.
+     * Value: An ASPxClientFinancialIndicatorPoint object, which represents a financial indicator's first point.
+     */
+    point1: ASPxClientFinancialIndicatorPoint;
+    /**
+     * Gets the second point of the financial indicator.
+     * Value: An ASPxClientFinancialIndicatorPoint object, which represents a financial indicator's second point.
+     */
+    point2: ASPxClientFinancialIndicatorPoint;
+}
+/**
+ * Represents the client-side equivalent of the TrendLine class.
+ */
+interface ASPxClientTrendLine extends ASPxClientFinancialIndicator {
+}
+/**
+ * Represents the client-side equivalent of the FibonacciIndicator class.
+ */
+interface ASPxClientFibonacciIndicator extends ASPxClientFinancialIndicator {
+}
+/**
+ * Represents the client-side equivalent of the FinancialIndicatorPoint class.
+ */
+interface ASPxClientFinancialIndicatorPoint extends ASPxClientWebChartRequiredElement {
+    /**
+     * Gets the financial indicator that owns the current financial indicator point.
+     * Value: An ASPxClientFinancialIndicator object, to which the point belongs.
+     */
+    financialIndicator: ASPxClientFinancialIndicator;
+    /**
+     * Gets the argument of the financial indicator's point.
+     * Value: An object that specifies the point argument.
+     */
+    argument: Object;
+    /**
+     * Gets a value, indicating how the value of a financial indicator's point is obtained.
+     * Value: A string value, which indicates how to obtain a financial indicator point's value.
+     */
+    valueLevel: string;
+}
+/**
+ * The client-side equivalent of the SingleLevelIndicator class.
+ */
+interface ASPxClientSingleLevelIndicator extends ASPxClientIndicator {
+    /**
+     * Gets a value specifying the value level to which the single-level indicator corresponds.
+     * Value: A string value.
+     */
+    valueLevel: string;
+}
+/**
+ * Represents the client-side equivalent of the RegressionLine class.
+ */
+interface ASPxClientRegressionLine extends ASPxClientSingleLevelIndicator {
+}
+/**
+ * The client-side equivalent of the MovingAverage class.
+ */
+interface ASPxClientMovingAverage extends ASPxClientSingleLevelIndicator {
+    /**
+     * Gets the number of data points used to calculate the moving average.
+     * Value: An integer value, specifying the number of points.
+     */
+    pointsCount: number;
+    /**
+     * Gets a value specifying whether to display a Moving Average, Envelope, or both.
+     * Value: A string value.
+     */
+    kind: string;
+    /**
+     * Gets a value specifying the Envelope percent.
+     * Value: A double value which specifies the Envelope percent.
+     */
+    envelopePercent: number;
+}
+/**
+ * The client-side equivalent of the SimpleMovingAverage class.
+ */
+interface ASPxClientSimpleMovingAverage extends ASPxClientMovingAverage {
+}
+/**
+ * The client-side equivalent of the ExponentialMovingAverage class.
+ */
+interface ASPxClientExponentialMovingAverage extends ASPxClientMovingAverage {
+}
+/**
+ * The client-side equivalent of the WeightedMovingAverage class.
+ */
+interface ASPxClientWeightedMovingAverage extends ASPxClientMovingAverage {
+}
+/**
+ * The client-side equivalent of the TriangularMovingAverage class.
+ */
+interface ASPxClientTriangularMovingAverage extends ASPxClientMovingAverage {
+}
+/**
+ * Represents the client-side equivalent of the TripleExponentialMovingAverageTema class.
+ */
+interface ASPxClientTripleExponentialMovingAverageTema extends ASPxClientMovingAverage {
+}
+/**
+ * Represents the client-side equivalent of the BollingerBands class.
+ */
+interface ASPxClientBollingerBands extends ASPxClientIndicator {
+    /**
+     * Gets the number of data points used to calculate the indicator values.
+     * Value: An integer value, specifying the number of points.
+     */
+    pointsCount: number;
+    /**
+     * Gets a value, indicating whose series point values are used to calculate the indicator's values.
+     * Value: A string value, which indicates which series point value should be used to calculate indicator values.
+     */
+    valueLevel: string;
+}
+/**
+ * Represents the client-side equivalent of the MedianPrice class.
+ */
+interface ASPxClientMedianPrice extends ASPxClientIndicator {
+}
+/**
+ * Represents the client-side equivalent of the TypicalPrice class.
+ */
+interface ASPxClientTypicalPrice extends ASPxClientIndicator {
+}
+/**
+ * Represents the client-side equivalent of the WeightedClose class.
+ */
+interface ASPxClientWeightedClose extends ASPxClientIndicator {
+}
+/**
+ * Represents the client-side equivalent of the SeparatePaneIndicator class.
+ */
+interface ASPxSeparatePaneIndicator extends ASPxClientIndicator {
+    /**
+     * Returns the name of the Y-axis that is used to plot the current indicator on a ASPxClientXYDiagram.
+     * Value: A string value specifying the Y-axis name.
+     */
+    axisY: string;
+    /**
+     * Returns the name of a pane, used to plot the separate pane indicator on an XYDiagram.
+     * Value: A string that is the name of a pane.
+     */
+    pane: string;
+}
+/**
+ * Represents the client-side equivalent of the AverageTrueRange class.
+ */
+interface ASPxClientAverageTrueRange extends ASPxSeparatePaneIndicator {
+    /**
+     * Gets the number of data points used to calculate the indicator values.
+     * Value: An integer value, specifying the number of points.
+     */
+    pointsCount: number;
+}
+/**
+ * Represents the client-side equivalent of the ChaikinsVolatility class.
+ */
+interface ASPxClientChaikinsVolatility extends ASPxSeparatePaneIndicator {
+    /**
+     * Gets the number of data points used to calculate the indicator values.
+     * Value: An integer value, specifying the number of points.
+     */
+    pointsCount: number;
+}
+/**
+ * Represents the client-side equivalent of the CommodityChannelIndex class.
+ */
+interface ASPxClientCommodityChannelIndex extends ASPxSeparatePaneIndicator {
+    /**
+     * Gets the number of data points used to calculate the indicator values.
+     * Value: An integer value, specifying the number of points.
+     */
+    pointsCount: number;
+}
+/**
+ * Represents the client-side equivalent of the DetrendedPriceOscillator class.
+ */
+interface ASPxClientDetrendedPriceOscillator extends ASPxSeparatePaneIndicator {
+    /**
+     * Gets the number of data points used to calculate the indicator values.
+     * Value: An integer value, specifying the number of points.
+     */
+    pointsCount: number;
+    /**
+     * Gets a value, indicating whose series point values are used to calculate the indicator's values.
+     * Value: A string value, which indicates which series point value should be used to calculate indicator values.
+     */
+    valueLevel: string;
+}
+/**
+ * Represents the client-side equivalent of the MassIndex class.
+ */
+interface ASPxClientMassIndex extends ASPxSeparatePaneIndicator {
+    /**
+     * Returns the count of points used to calculate the exponential moving average (EMA).
+     * Value: An integer value, specifying the count of points used to calculate EMA.
+     */
+    movingAveragePointsCount: number;
+    /**
+     * Returns the count of summable values.
+     * Value: An integer value specifying the count of summable ratios.
+     */
+    sumPointsCount: number;
+}
+/**
+ * Represents the client-side equivalent of the MovingAverageConvergenceDivergence class.
+ */
+interface ASPxClientMovingAverageConvergenceDivergence extends ASPxSeparatePaneIndicator {
+    /**
+     * Returns the short period value required to calculate the indicator.
+     * Value: An integer value specifying the short period value.
+     */
+    shortPeriod: number;
+    /**
+     * Returns the long period value required to calculate the indicator.
+     * Value: An integer value specifying the long period.
+     */
+    longPeriod: number;
+    /**
+     * Returns the smoothing period value required to calculate the indicator.
+     * Value: An integer value specifying the smoothing period value.
+     */
+    signalSmoothingPeriod: number;
+}
+/**
+ * Represents the client-side equivalent of the RateOfChange class.
+ */
+interface ASPxClientRateOfChange extends ASPxSeparatePaneIndicator {
+    /**
+     * Gets the number of data points used to calculate the indicator values.
+     * Value: An integer value, specifying the number of points.
+     */
+    pointsCount: number;
+    /**
+     * Gets a value, indicating whose series point values are used to calculate the indicator's values.
+     * Value: A string value, which indicates which series point value should be used to calculate indicator values.
+     */
+    valueLevel: string;
+}
+/**
+ * Represents the client-side equivalent of the RelativeStrengthIndex class.
+ */
+interface ASPxClientRelativeStrengthIndex extends ASPxSeparatePaneIndicator {
+    /**
+     * Gets the number of data points used to calculate the indicator values.
+     * Value: An integer value, specifying the number of points.
+     */
+    pointsCount: number;
+    /**
+     * Gets a value, indicating whose series point values are used to calculate the indicator's values.
+     * Value: A string value, which indicates which series point value should be used to calculate indicator values.
+     */
+    valueLevel: string;
+}
+/**
+ * Represents the client-side equivalent of the StandardDeviation class.
+ */
+interface ASPxClientStandardDeviation extends ASPxSeparatePaneIndicator {
+    /**
+     * Gets the number of data points used to calculate the indicator values.
+     * Value: An integer value, specifying the number of points.
+     */
+    pointsCount: number;
+    /**
+     * Gets a value, indicating whose series point values are used to calculate the indicator's values.
+     * Value: A string value, which indicates which series point value should be used to calculate indicator values.
+     */
+    valueLevel: string;
+}
+/**
+ * Represents the client-side equivalent of the TripleExponentialMovingAverageTrix class.
+ */
+interface ASPxClientTripleExponentialMovingAverageTrix extends ASPxSeparatePaneIndicator {
+    /**
+     * Gets the number of data points used to calculate the indicator values.
+     * Value: An integer value, specifying the number of points.
+     */
+    pointsCount: number;
+    /**
+     * Gets a value, indicating whose series point values are used to calculate the indicator's values.
+     * Value: A string value, which indicates which series point value should be used to calculate indicator values.
+     */
+    valueLevel: string;
+}
+/**
+ * Represents the client-side equivalent of the WilliamsR class.
+ */
+interface ASPxClientWilliamsR extends ASPxSeparatePaneIndicator {
+    /**
+     * Gets the number of data points used to calculate the indicator values.
+     * Value: An integer value, specifying the number of points.
+     */
+    pointsCount: number;
+}
+/**
+ * Represents the client-side equivalent of the FixedValueErrorBars class.
+ */
+interface ASPxClientFixedValueErrorBars extends ASPxClientIndicator {
+    /**
+     * Gets or sets the fixed positive error value.
+     * Value: A double value specifying the positive error value.
+     */
+    positiveError: number;
+    /**
+     * Returns the fixed negative error value.
+     * Value: A double value specifying the negative error value.
+     */
+    negativeError: number;
+}
+/**
+ * Represents the client-side equivalent of the PercentageErrorBars class.
+ */
+interface ASPxClientPercentageErrorBars extends ASPxClientIndicator {
+    /**
+     * Returns the value specifying the percentage of error values of series point values.
+     * Value: A double value specifying the percentage. Values less than or equal to 0 are not allowed.
+     */
+    percent: number;
+}
+/**
+ * Represents the client-side equivalent of the StandardDeviationErrorBars class.
+ */
+interface ASPxClientStandardDeviationErrorBars extends ASPxClientIndicator {
+    /**
+     * Returns the multiplier on which the standard deviation value is multiplied before display.
+     * Value: A double value specifying the multiplier. Values less than 0 are not allowed.
+     */
+    multiplier: number;
+}
+/**
+ * Represents the client-side equivalent of the StandardErrorBars class.
+ */
+interface ASPxClientStandardErrorBars extends ASPxClientIndicator {
+}
+/**
+ * Represents the client-side equivalent of the DataSourceBasedErrorBars class.
+ */
+interface ASPxClientDataSourceBasedErrorBars extends ASPxClientIndicator {
+}
+/**
+ * Represents the client-side equivalent of the Annotation class.
+ */
+interface ASPxClientAnnotation extends ASPxClientWebChartElementNamed {
+}
+/**
+ * Represents the client-side equivalent of the TextAnnotation class.
+ */
+interface ASPxClientTextAnnotation extends ASPxClientAnnotation {
+    /**
+     * Gets the lines of text within an annotation.
+     * Value: An array of string values containing the text of a title.
+     */
+    lines: string[];
+}
+/**
+ * Represents the client-side equivalent of the ImageAnnotation class.
+ */
+interface ASPxClientImageAnnotation extends ASPxClientAnnotation {
+}
+/**
+ * The client-side equivalent of the CrosshairValueItem class.
+ */
+interface ASPxClientCrosshairValueItem {
+    /**
+     * Gets the value that is displayed in a crosshair label.
+     * Value: A float value.
+     */
+    value: number;
+    /**
+     * Gets an index of a point for which this crosshair value item is displayed.
+     * Value: An integer value.
+     */
+    pointIndex: number;
+}
+/**
+ * The client-side equivalent of the ChartToolTipController class.
+ */
+interface ASPxClientToolTipController extends ASPxClientWebChartEmptyElement {
+    /**
+     * Gets a value indicating whether an image should be shown in tooltips.
+     * Value: true to show an image in tooltips; otherwise, false.
+     */
+    showImage: boolean;
+    /**
+     * Gets a value indicating whether it is necessary to show text in tooltips.
+     * Value: true to show text in tooltips; otherwise, false.
+     */
+    showText: boolean;
+    /**
+     * Gets a value that defines the position of an image within a tooltip.
+     * Value: A string value.
+     */
+    imagePosition: string;
+    /**
+     * Gets a value that defines when tooltips should be invoked.
+     * Value: A string value.
+     */
+    openMode: string;
+}
+/**
+ * The client-side equivalent of the ToolTipPosition class.
+ */
+interface ASPxClientToolTipPosition {
+}
+/**
+ * The client-side equivalent of the ToolTipRelativePosition class.
+ */
+interface ASPxClientToolTipRelativePosition extends ASPxClientToolTipPosition {
+    /**
+     * Gets the horizontal offset of a tooltip.
+     * Value: An integer value.
+     */
+    offsetX: number;
+    /**
+     * Gets the vertical offset of a tooltip.
+     * Value: An integer value.
+     */
+    offsetY: number;
+}
+/**
+ * The client-side equivalent of the ToolTipFreePosition class.
+ */
+interface ASPxClientToolTipFreePosition extends ASPxClientToolTipPosition {
+    /**
+     * Gets the horizontal offset of a tooltip.
+     * Value: An integer value.
+     */
+    offsetX: number;
+    /**
+     * Gets the vertical offset of a tooltip.
+     * Value: An integer value.
+     */
+    offsetY: number;
+    /**
+     * Gets the ID of a pane.
+     * Value: An integer value.
+     */
+    paneID: number;
+    /**
+     * Gets an object containing settings that define how a tooltip should be docked.
+     * Value: A string value.
+     */
+    dockPosition: string;
+}
+/**
+ * The client-side equivalent of the CrosshairLabelPosition class.
+ */
+interface ASPxClientCrosshairPosition {
+    /**
+     * Gets the horizontal offset of a crosshair cursor.
+     * Value: An integer value that is the X-offset.
+     */
+    offsetX: number;
+    /**
+     * Gets the vertical offset of a crosshair cursor.
+     * Value: An integer value that is the Y-offset.
+     */
+    offsetY: number;
+}
+/**
+ * The client-side equivalent of the CrosshairMousePosition class.
+ */
+interface ASPxClientCrosshairMousePosition extends ASPxClientCrosshairPosition {
+}
+/**
+ * The client-side equivalent of the CrosshairFreePosition class.
+ */
+interface ASPxClientCrosshairFreePosition extends ASPxClientCrosshairPosition {
+    /**
+     * Gets a Pane's ID when the crosshair cursor is in the free position mode.
+     * Value: An integer value that is the pane's ID.
+     */
+    paneID: number;
+    /**
+     * Gets a string containing information on a crosshair label's dock position when the crosshair cursor is in the free position mode.
+     * Value: A string value containing information on a crosshair label's dock position.
+     */
+    dockPosition: string;
+}
+/**
+ * Defines line style settings.
+ */
+interface ASPxClientLineStyle extends ASPxClientWebChartElement {
+    /**
+     * Gets the dash style used to paint the line.
+     * Value: A string value that contains information about the style used to paint the line.
+     */
+    dashStyle: string;
+    /**
+     * Gets the thickness that corresponds to the value of the current ASPxClientLineStyle object.
+     * Value: An integer value which specifies the thickness, in pixels.
+     */
+    thickness: number;
+    /**
+     * Returns the join style for the ends of consecutive lines.
+     * Value: A string representing the name of the line join type.
+     */
+    lineJoin: string;
+}
+/**
+ * The client-side equivalent of the CrosshairOptions class.
+ */
+interface ASPxClientCrosshairOptions extends ASPxClientWebChartEmptyElement {
+    /**
+     * Gets a value indicating whether it is necessary to show a crosshair label for the X-axis.
+     * Value: true to show a crosshair label for the X-axis; otherwise, false.
+     */
+    showAxisXLabels: boolean;
+    /**
+     * Gets a value indicating whether it is necessary to show a crosshair label for the Y-axis.
+     * Value: true to show the crosshair label for the Y-axis; otherwise, false.
+     */
+    showAxisYLabels: boolean;
+    /**
+     * Gets a value that defines whether a crosshair label of a series point indicated by a crosshair cursor is shown on a diagram.
+     * Value: true if a crosshair label indicated by a crosshair cursor is shown on a diagram; otherwise, false.
+     */
+    showCrosshairLabels: boolean;
+    /**
+     * Gets a value that indicates whether a crosshair cursor argument line is shown for a series point on a diagram.
+     * Value: true if a crosshair cursor argument line is displayed on a diagram;  otherwise, false.
+     */
+    showArgumentLine: boolean;
+    /**
+     * Specifies whether to show a value line of a series point indicated by a crosshair cursor on a diagram.
+     * Value: true to display a value line indicated by a crosshair cursor on a diagram; otherwise, false.
+     */
+    showValueLine: boolean;
+    /**
+     * Gets a value that specifies whether to show a crosshair cursor in a focused pane only.
+     * Value: true to display a crosshair cursor in a focused pane; otherwise, false.
+     */
+    showOnlyInFocusedPane: boolean;
+    /**
+     * Specifies the current snap mode of a crosshair cursor.
+     * Value: A string value.
+     */
+    snapMode: string;
+    /**
+     * Specifies the way in which the crosshair label is shown for a series on a diagram.
+     * Value: A string value that specifies how the crosshair label is shown for a series.
+     */
+    crosshairLabelMode: string;
+    /**
+     * Gets a value that indicates whether to show a header for each series group in crosshair cursor labels.
+     * Value: true, to show a group header in crosshair cursor labels; otherwise, false.
+     */
+    showGroupHeaders: boolean;
+    /**
+     * Gets a string which represents the  pattern specifying the group header text to be displayed within the crosshair label.
+     * Value: A String, which represents the group header's pattern.
+     */
+    groupHeaderPattern: string;
+    /**
+     * Gets a value that specifies whether the Crosshair cursor should show points that are out of visual range.
+     * Value: true if the out of visual range points should be shown in the Crosshair label; otherwise false.
+     */
+    showOutOfRangePoints: boolean;
+    /**
+     * Gets the identifier specifying the behavior of the selection of points shown in the crosshair label.
+     * Value: The selection behavior identifier.
+     */
+    valueSelectionMode: string;
+    /**
+     * Gets the color of a crosshair argument line.
+     * Value: A String value, specifying the color of a crosshair argument line.
+     */
+    argumentLineColor: string;
+    /**
+     * Gets the color of a crosshair value line.
+     * Value: A String value, specifying the color of a crosshair value line.
+     */
+    valueLineColor: string;
+}
+/**
+ * The chart print options storage.
+ */
+interface ASPxClientChartPrintOptions {
+    /**
+     * Gets the size mode used to print a chart.
+     */
+    GetSizeMode(): string;
+    /**
+     * Sets the size mode used to print a chart.
+     * @param sizeMode A System.String object, specifying the name of the size mode.
+     */
+    SetSizeMode(sizeMode: string): void;
+    /**
+     * Gets a value indicating that the landscape orientation will be used to print a chart.
+     */
+    GetLandscape(): boolean;
+    /**
+     * Sets a value indicating that the landscape orientation will be used to print a chart.
+     * @param landscape A Boolean value, specifying that the landscape orientation will be used to print a chart.
+     */
+    SetLandscape(landscape: boolean): void;
+    /**
+     * Gets the left margin which will be used to print a chart.
+     */
+    GetMarginLeft(): number;
+    /**
+     * Sets the left margin which will be used to print a chart.
+     * @param marginLeft A System.Int32 value, specifying the margin in hundredths of an inch.
+     */
+    SetMarginLeft(marginLeft: number): void;
+    /**
+     * Gets the top margin which will be used to print a chart.
+     */
+    GetMarginTop(): number;
+    /**
+     * Sets the top margin which will be used to print a chart.
+     * @param marginTop A System.Int32 value, specifying the margin in hundredths of an inch.
+     */
+    SetMarginTop(marginTop: number): void;
+    /**
+     * Gets the right margin which will be used to print a chart.
+     */
+    GetMarginRight(): number;
+    /**
+     * Sets the right margin which will be used to print a chart.
+     * @param marginRight A System.Int32 value, specifying the margin in hundredths of an inch.
+     */
+    SetMarginRight(marginRight: number): void;
+    /**
+     * Gets the bottom margin which will be used to print a chart.
+     */
+    GetMarginBottom(): number;
+    /**
+     * Sets the bottom margin which will be used to print a chart.
+     * @param marginBottom A System.Int32 value, specifying the margin in hundredths of an inch.
+     */
+    SetMarginBottom(marginBottom: number): void;
+    /**
+     * Gets the predefined size ratio of the paper which will be used to print a chart.
+     */
+    GetPaperKind(): string;
+    /**
+     * Sets the predefined size ratio of the paper which will be used to print a chart.
+     * @param paperKind A System.String object, specifying the name of a size ratio.
+     */
+    SetPaperKind(paperKind: string): void;
+    /**
+     * Gets the custom paper width which will be used to print a chart.
+     */
+    GetCustomPaperWidth(): number;
+    /**
+     * Sets the custom paper width which will be used to print a chart.
+     * @param customPaperWidth A System.Int32 object, specifying the width in hundredths of an inch.
+     */
+    SetCustomPaperWidth(customPaperWidth: number): void;
+    /**
+     * Gets the custom paper height which will be used to print a chart.
+     */
+    GetCustomPaperHeight(): number;
+    /**
+     * Sets the custom paper height which will be used to print a chart.
+     * @param customPaperHeight A System.Int32 object, specifying the height in hundredths of an inch.
+     */
+    SetCustomPaperHeight(customPaperHeight: number): void;
+    /**
+     * Gets the name of the custom paper width-height ratio used to print the chart.
+     */
+    GetCustomPaperName(): string;
+    /**
+     * Sets the name of the custom paper width-height ratio used to print a chart.
+     * @param customPaperName A String object, specifying the name of the custom paper width-height ratio.
+     */
+    SetCustomPaperName(customPaperName: string): void;
+}
+/**
+ * Represents the client-side equivalent of the CustomLegendItem class.
+ */
+interface ASPxClientCustomLegendItem extends ASPxClientWebChartElementNamed {
+    /**
+     * Returns the text displayed by the custom legend item.
+     * Value: A string value that specifies legend item text.
+     */
+    text: string;
+}
+/**
+ * The client-side equivalent of the ASPxDocumentViewer control.
+ */
+interface ASPxClientDocumentViewer extends ASPxClientControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientDocumentViewer>>;
+    /**
+     * Occurs on the client after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientDocumentViewer>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientDocumentViewer.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientDocumentViewer>>;
+    /**
+     * Occurs when the value of an item within the Document Viewer's report toolbar is changed.
+     */
+    ToolbarItemValueChanged: ASPxClientEvent<ASPxClientEventHandler<ASPxClientDocumentViewer>>;
+    /**
+     * Occurs when an item within the Document Viewer's report toolbar is clicked.
+     */
+    ToolbarItemClick: ASPxClientEvent<ASPxClientEventHandler<ASPxClientDocumentViewer>>;
+    /**
+     * Occurs on the client side when a report page is loaded into this ASPxClientDocumentViewer instance.
+     */
+    PageLoad: ASPxClientEvent<ASPxClientReportViewerPageLoadEventHandler<ASPxClientDocumentViewer>>;
+    /**
+     * Provides access to the Splitter of the ASPxClientDocumentViewer.
+     */
+    GetSplitter(): ASPxClientSplitter;
+    /**
+     * Provides access to the ASPxClientDocumentViewer's preview that exposes methods to print and export the document.
+     */
+    GetViewer(): ASPxClientReportViewer;
+    /**
+     * Provides access to the Document Viewer toolbar on the client.
+     */
+    GetToolbar(): ASPxClientReportToolbar;
+    /**
+     * Provides access to the Ribbon of the ASPxClientDocumentViewer.
+     */
+    GetRibbonToolbar(): ASPxClientRibbon;
+    /**
+     * Provides access to the parameters panel of the ASPxClientDocumentViewer.
+     */
+    GetParametersPanel(): ASPxClientReportParametersPanel;
+    /**
+     * Provides access to the document of the ASPxClientDocumentViewer.
+     */
+    GetDocumentMap(): ASPxClientReportDocumentMap;
+    /**
+     * Sets focus on the report control specified by its bookmark.
+     * @param pageIndex An integer value, specifying the page index.
+     * @param bookmarkPath A String value, specifying the path to the bookmark.
+     */
+    GotoBookmark(pageIndex: number, bookmarkPath: string): void;
+    /**
+     * Initiates a round trip to the server so that the current page will be reloaded.
+     */
+    Refresh(): void;
+    /**
+     * Prints the current document.
+     */
+    Print(): void;
+    /**
+     * Prints the document's page with the specified page index.
+     * @param pageIndex A Int32 representing the index of the page to be printed.
+     */
+    Print(pageIndex: number): void;
+    /**
+     * Displays the specified report page.
+     * @param pageIndex An integer value, identifying the report page.
+     */
+    GotoPage(pageIndex: number): void;
+    /**
+     * Invokes the Search dialog, which allows end-users to search for specific text in a report.
+     */
+    Search(): void;
+    /**
+     * Gets a value indicating whether or not searching text across a report is permitted in the web browser.
+     */
+    IsSearchAllowed(): boolean;
+    /**
+     * Exports a report to a file of the specified format, and shows it in a new Web Browser window.
+     * @param format A string specifying the format to which a report should be exported.
+     */
+    SaveToWindow(format: string): void;
+    /**
+     * Exports a report to a file of the specified format, and saves it to the disk.
+     * @param format A string specifying the format to which a report should be exported.
+     */
+    SaveToDisk(format: string): void;
+}
+/**
+ * A method that will handle the ItemValueChanged event.
+ */
+interface ASPxClientToolbarItemValueChangedEventHandler<S> {
+    /**
+     * A method that will handle the ToolbarItemValueChanged event.
+     * @param source A Object that is the event source.
+     * @param e An ASPxClientToolbarItemValueChangedEventArgs object, containing the event arguments.
+     */
+    (source: S, e: ASPxClientToolbarItemValueChangedEventArgs): void;
+}
+/**
+ * Provides data for the ItemValueChanged event.
+ */
+interface ASPxClientToolbarItemValueChangedEventArgs extends ASPxClientProcessingModeEventArgs {
+    /**
+     * Gets the menu item object related to the event.
+     * Value: An ASPxClientMenuItem object, manipulations on which forced the event to be raised.
+     */
+    item: ASPxClientMenuItem;
+    /**
+     * Provides access to the toolbar's value editor on the client.
+     * Value: An ASPxClientControl descendant.
+     */
+    editor: ASPxClientControl;
+}
+/**
+ * The client-side equivalent of the ASPxQueryBuilder control.
+ */
+interface ASPxClientQueryBuilder extends ASPxClientControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientQueryBuilder>>;
+    /**
+     * Occurs on the client after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientQueryBuilder>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientQueryBuilder.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientQueryBuilder>>;
+    /**
+     * Enables you to customize the menu actions of a Query Builder.
+     */
+    CustomizeToolbarActions: ASPxClientEvent<ASPxClientQueryBuilderCustomizeToolbarActionsEventHandler<ASPxClientQueryBuilder>>;
+    /**
+     * Occurs when executing the Save command on the client.
+     */
+    SaveCommandExecute: ASPxClientEvent<ASPxClientQueryBuilderSaveCommandExecuteEventHandler<ASPxClientQueryBuilder>>;
+    /**
+     * Sends a callback to the server with the specified argument.
+     * @param arg A String value, specifying the callback argument.
+     */
+    PerformCallback(arg: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side event, passing it the specified argument.
+     * @param arg A string value that represents any information that needs to be sent to the server-side event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(arg: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Updates the localization settings of the ASPxClientQueryBuilder properties.
+     * @param localization A dictionary containing the property names, along with their localized equivalents.
+     */
+    UpdateLocalization(localization: { [key: string]: string; }): void;
+    /**
+     * Returns the object model of a Query Builder.
+     */
+    GetDesignerModel(): Object;
+    /**
+     * Gets a client-side model of the currently opened query serialized to Json.
+     */
+    GetJsonQueryModel(): string;
+    /**
+     * Saves the current query.
+     */
+    Save(): void;
+    /**
+     * Invokes a Data Preview for the current query.
+     */
+    ShowPreview(): void;
+    /**
+     * Specifies whether or not the current query is a valid SQL string.
+     */
+    IsQueryValid(): boolean;
+}
+/**
+ * A method that will handle the SaveCommandExecute event.
+ */
+interface ASPxClientQueryBuilderSaveCommandExecuteEventHandler<S> {
+    /**
+     * A method that will handle the SaveCommandExecute event.
+     * @param source The event sender.
+     * @param e An ASPxClientQueryBuilderSaveCommandExecuteEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientQueryBuilderSaveCommandExecuteEventArgs): void;
+}
+/**
+ * Provides data for the SaveCommandExecute event.
+ */
+interface ASPxClientQueryBuilderSaveCommandExecuteEventArgs extends ASPxClientEventArgs {
+    /**
+     * Specifies whether or not the event was handled.
+     * Value: true if the event was handled and default processing should not occur; false if the event should be handled using default processing.
+     */
+    handled: boolean;
+}
+/**
+ * A method that will handle the CustomizeToolbarActions event.
+ */
+interface ASPxClientQueryBuilderCustomizeToolbarActionsEventHandler<S> {
+    /**
+     * A method that will handle the CustomizeToolbarActions event.
+     * @param source The event sender.
+     * @param e An ASPxClientCustomizeMenuActionsEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientCustomizeMenuActionsEventArgs): void;
+}
+/**
+ * The client-side equivalent of the Web Report Designer control.
+ */
+interface ASPxClientReportDesigner extends ASPxClientControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Occurs on the client after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientReportDesigner.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Occurs when executing the Save command on the client.
+     */
+    SaveCommandExecute: ASPxClientEvent<ASPxClientReportDesignerSaveCommandExecuteEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Enables you to customize the menu actions of the Web Report Designer.
+     */
+    CustomizeMenuActions: ASPxClientEvent<ASPxClientReportDesignerCustomizeMenuActionsEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Occurs each time a standard editor is created for a report parameter based on a parameter type.
+     */
+    CustomizeParameterEditors: ASPxClientEvent<ASPxClientReportDesignerCustomizeParameterEditorsEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Occurs each time a look-up editor is created for a report parameter.
+     */
+    CustomizeParameterLookUpSource: ASPxClientEvent<ASPxClientReportDesignerCustomizeParameterLookUpSourceEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Occurs on the client side when the Report Designer is being closed.
+     */
+    ExitDesigner: ASPxClientEvent<ASPxClientReportDesignerExitDesignerEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Occurs when a report is about to be saved in the Web Report Designer.
+     */
+    ReportSaving: ASPxClientEvent<ASPxClientReportDesignerReportSavingEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Occurs when a report has been saved in the Web Report Designer.
+     */
+    ReportSaved: ASPxClientEvent<ASPxClientReportDesignerReportSavedEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Occurs when a report is about to be opened in the Web Report Designer.
+     */
+    ReportOpening: ASPxClientEvent<ASPxClientReportDesignerReportOpeningEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Occurs when a report has been opened in the Web Report Designer.
+     */
+    ReportOpened: ASPxClientEvent<ASPxClientReportDesignerReportOpenedEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Occurs on the client each time a server-side error raises.
+     */
+    OnServerError: ASPxClientEvent<ASPxClientReportDesignerErrorEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Occurs after a component has been added to the report currently being edited in the Web Report Designer.
+     */
+    ComponentAdded: ASPxClientEvent<ASPxClientReportDesignerComponentAddedEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Enables you to customize UI elements of the Web Report Designer.
+     */
+    CustomizeElements: ASPxClientEvent<ASPxClientReportDesignerCustomizeElementsEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Enables you to customize the Save dialog of the Web Report Designer.
+     */
+    CustomizeSaveDialog: ASPxClientEvent<ASPxClientReportDesignerCustomizeSaveDialogEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Enables you to customize the Save Report dialog of the Web Report Designer.
+     */
+    CustomizeSaveAsDialog: ASPxClientEvent<ASPxClientReportDesignerCustomizeSaveAsDialogEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Enables you to customize the Open Report dialog of the Web Report Designer.
+     */
+    CustomizeOpenDialog: ASPxClientEvent<ASPxClientReportDesignerCustomizeOpenDialogEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Enables you to customize the Toolbox of the Web Report Designer.
+     */
+    CustomizeToolbox: ASPxClientEvent<ASPxClientReportDesignerCustomizeToolboxEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Occurs after a report has been switched to Print Preview.
+     */
+    PreviewDocumentReady: ASPxClientEvent<ASPxClientWebDocumentViewerDocumentReadyEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Occurs each time a value of an editing field changes in Print Preview.
+     */
+    PreviewEditingFieldChanged: ASPxClientEvent<ASPxClientWebDocumentViewerEditingFieldChangedEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Enables you to customize UI elements of a Document Viewer built into a Web Report Designer.
+     */
+    PreviewCustomizeElements: ASPxClientEvent<ASPxClientWebDocumentViewerCustomizeElementsEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Enables you to customize the actions of a Document Viewer built into a Web Report Designer.
+     */
+    PreviewCustomizeMenuActions: ASPxClientEvent<ASPxClientWebDocumentViewerCustomizeMenuActionsEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Occurs when the left mouse button has been clicked over a report document in Print Preview.
+     */
+    PreviewClick: ASPxClientEvent<ASPxClientWebDocumentViewerPreviewClickEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Occurs after report parameter values have been reset to their default values in Print Preview.
+     */
+    PreviewParametersReset: ASPxClientEvent<ASPxClientWebDocumentViewerParametersResetEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Occurs after report parameter values have been submitted in Print Preview.
+     */
+    PreviewParametersSubmitted: ASPxClientEvent<ASPxClientWebDocumentViewerParametersSubmittedEventHandler<ASPxClientReportDesigner>>;
+    /**
+     * Sends a callback to the server with the specified argument.
+     * @param arg A String value, specifying the callback argument.
+     */
+    PerformCallback(arg: string): void;
+    /**
+     * Sends a callback to the server and generates the server-side event, passing it the specified argument.
+     * @param arg A string value that represents any information that needs to be sent to the server-side event.
+     * @param onSuccess A client action to perform if the server round-trip completed successfully.
+     */
+    PerformCallback(arg: string, onSuccess: (arg1: string) => void): void;
+    /**
+     * Updates the localization settings of the ASPxClientReportDesigner properties.
+     * @param localization A dictionary containing the property names, along with their localized equivalents.
+     */
+    UpdateLocalization(localization: { [key: string]: string; }): void;
+    /**
+     * Returns the object model of a Web Report Designer.
+     */
+    GetDesignerModel(): Object;
+    /**
+     * Provides access to the preview model of the ASPxClientReportDesigner.
+     */
+    GetPreviewModel(): Object;
+    /**
+     * Returns information about the specified property of the specified control.
+     * @param controlType A string that specifies the control type.
+     * @param path A string that specifies the path to the property.
+     */
+    GetPropertyInfo(controlType: string, path: string): ASPxDesignerElementSerializationInfo;
+    /**
+     * Returns information about the specified properties of the specified control.
+     * @param controlType A string that specifies the control type.
+     * @param path An array of strings that specify paths to properties.
+     */
+    GetPropertyInfo(controlType: string, path: string[]): ASPxDesignerElementSerializationInfo;
+    /**
+     * Returns actions performed by buttons available in the menu and toolbar of the Web Report Designer.
+     */
+    GetButtonStorage(): Object;
+    /**
+     * Gets a client-side model of the currently opened report serialized to Json.
+     */
+    GetJsonReportModel(): string;
+    /**
+     * Indicates whether or not the current ASPxClientReportDesigner instance has been modified.
+     */
+    IsModified(): boolean;
+    /**
+     * Resets the value returned by the IsModified method.
+     */
+    ResetIsModified(): void;
+    /**
+     * Adds a custom property to the Properties Panel.
+     * @param groupName A string that specifies the name of group to which a property should be added.
+     * @param property An object that provides information required to serialize a property.
+     */
+    AddToPropertyGrid(groupName: string, property: ASPxDesignerElementSerializationInfo): void;
+    /**
+     * Adds a custom parameter type to the Web End-User Report Designer.
+     * @param parameterInfo An object that provides information about a parameter type to be added.
+     * @param editorOptions An object that provides information about an editor used to specify parameter values in design mode.
+     */
+    AddParameterType(parameterInfo: ASPxDesignerParameterType, editorOptions: ASPxDesignerEditorOptions): void;
+    /**
+     * Removes the specified parameter type from the Web End-User Report Designer.
+     * @param parameterType A string that specifies a parameter type to be deleted.
+     */
+    RemoveParameterType(parameterType: string): void;
+    /**
+     * Returns an object that contains information on the specified parameter type.
+     * @param parameterType A string that specifies a parameter type.
+     */
+    GetParameterInfo(parameterType: string): ASPxDesignerParameterType;
+    /**
+     * Returns a value editor associated with the specified parameter type.
+     * @param parameterType A string that specifies a parameter type.
+     */
+    GetParameterEditor(parameterType: string): ASPxDesignerEditorOptions;
+    /**
+     * Returns the report layout stored in a report storage under the specified URL.
+     * @param url A string that specifies the report URL.
+     */
+    ReportStorageGetData(url: string): any;
+    /**
+     * Stores the specified report to a report storage using the specified URL.
+     * @param reportLayout A string that specifies the report layout to be saved.
+     * @param url A string that specifies the URL used to save a report.
+     */
+    ReportStorageSetData(reportLayout: string, url: string): any;
+    /**
+     * Stores the specified report to a report storage using a new URL.
+     * @param reportLayout A string that specifies the report layout to be saved.
+     * @param url A string that specifies the default report URL.
+     */
+    ReportStorageSetNewData(reportLayout: string, url: string): any;
+    /**
+     * Saves the current report.
+     */
+    SaveReport(): any;
+    /**
+     * Closes the report tab currently being opened in the Web Report Designer.
+     */
+    CloseCurrentTab(): void;
+    /**
+     * Saves the current report under a new name.
+     * @param reportName A string that specifies the report name.
+     */
+    SaveNewReport(reportName: string): any;
+    /**
+     * Returns the report URLs and display names existing in a report storage.
+     */
+    ReportStorageGetUrls(): any;
+    /**
+     * Opens the specified report on the client side of the Web Report Designer.
+     * @param url A string that specifies the URL of a report to be opened.
+     */
+    OpenReport(url: string): void;
+    /**
+     * Switches the Web Report Designer to the preview mode.
+     */
+    ShowPreview(): void;
+}
+/**
+ * A method that will handle the SaveCommandExecute event.
+ */
+interface ASPxClientReportDesignerSaveCommandExecuteEventHandler<S> {
+    /**
+     * A method that will handle the SaveCommandExecute event.
+     * @param source The event sender.
+     * @param e An ASPxClientReportDesignerSaveCommandExecuteEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientReportDesignerSaveCommandExecuteEventArgs): void;
+}
+/**
+ * Provides data for the SaveCommandExecute event.
+ */
+interface ASPxClientReportDesignerSaveCommandExecuteEventArgs extends ASPxClientEventArgs {
+    /**
+     * Specifies whether or not the event was handled.
+     * Value: true if the event was handled and default processing should not occur; false if the event should be handled using default processing.
+     */
+    handled: boolean;
+}
+/**
+ * Provides data for the ExitDesigner event.
+ */
+interface ASPxClientReportDesignerExitDesignerEventArgs extends ASPxClientEventArgs {
+}
+/**
+ * Provides data for the events related to opening and saving reports in the Web Report Designer.
+ */
+interface ASPxClientReportDesignerDialogEventArgs extends ASPxClientEventArgs {
+    /**
+     * Specifies the URL of the report currently being processed.
+     * Value: A string that specifies the URL of the report currently being processed.
+     */
+    Url: string;
+    /**
+     * Specifies the report currently being processed.
+     * Value: An object that specifies the report currently being processed.
+     */
+    Report: Object;
+    /**
+     * Specifies whether or not the operation performed with a report should be canceled.
+     * Value: true, if the operation should be canceled; otherwise, false.
+     */
+    Cancel: boolean;
+}
+/**
+ * Provides data for the OnServerError event.
+ */
+interface ASPxClientReportDesignerErrorEventArgs extends ASPxClientEventArgs {
+    /**
+     * Provides access to information about a server-side error.
+     * Value: An object that provides information about an error.
+     */
+    Error: Object;
+}
+/**
+ * Provides data for the ComponentAdded event.
+ */
+interface ASPxClientReportDesignerComponentAddedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets the model of a component that has been added to a report.
+     * Value: An object that specifies the component model.
+     */
+    Model: Object;
+    /**
+     * Gets the parent of a component that has been added to a report.
+     * Value: An object that specifies the component parent.
+     */
+    Parent: Object;
+}
+/**
+ * Provides data for the CustomizeSaveDialog event.
+ */
+interface ASPxClientReportDesignerCustomizeSaveDialogEventArgs extends ASPxClientEventArgs {
+    /**
+     * Provides access to the Save dialog.
+     * Value: An object that specifies the Save dialog.
+     */
+    Popup: ASPxDesignerSaveDialog;
+    /**
+     * Customizes the Save dialog based on the specified template and model.
+     * @param template A string that specifies the name of an HTML template for the dialog.
+     * @param model A model of the Save dialog.
+     */
+    Customize(template: string, model: ASPxDesignerDialogModel): void;
+}
+/**
+ * Provides data for the CustomizeSaveAsDialog event.
+ */
+interface ASPxClientReportDesignerCustomizeSaveAsDialogEventArgs extends ASPxClientEventArgs {
+    /**
+     * Provides access to the Save Report dialog.
+     * Value: An object that specifies the  Save Report dialog.
+     */
+    Popup: ASPxDesignerSaveAsDialog;
+    /**
+     * Customizes the Save Report dialog based on the specified template and model.
+     * @param template A string that specifies the name of an HTML template for the dialog.
+     * @param model A model of the Save Report dialog.
+     */
+    Customize(template: string, model: ASPxDesignerDialogModel): void;
+}
+/**
+ * Provides data for the CustomizeOpenDialog event.
+ */
+interface ASPxClientReportDesignerCustomizeOpenDialogEventArgs extends ASPxClientEventArgs {
+    /**
+     * Provides access to the Open Report dialog.
+     * Value: An object that specifies the Open Report dialog.
+     */
+    Popup: ASPxDesignerOpenDialog;
+    /**
+     * Customizes the Open Report dialog based on the specified template and model.
+     * @param template A string that specifies the name of an HTML template for the dialog.
+     * @param model A model of the Open Report dialog.
+     */
+    Customize(template: string, model: ASPxDesignerDialogModel): void;
+}
+/**
+ * Provides data for the CustomizeToolbox event.
+ */
+interface ASPxClientReportDesignerCustomizeToolboxEventArgs extends ASPxClientEventArgs {
+    /**
+     * Provides information about all controls available in the Toolbox.
+     * Value: An ASPxDesignerControlsFactory object that provides information about toolbox controls.
+     */
+    ControlsFactory: ASPxDesignerControlsFactory;
+}
+/**
+ * A method that will handle the CustomizeMenuActions event.
+ */
+interface ASPxClientReportDesignerCustomizeMenuActionsEventHandler<S> {
+    /**
+     * A method that will handle the CustomizeMenuActions event.
+     * @param source The event sender.
+     * @param e An ASPxClientCustomizeMenuActionsEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientCustomizeMenuActionsEventArgs): void;
+}
+/**
+ * A method that will handle the CustomizeParameterLookUpSource event.
+ */
+interface ASPxClientReportDesignerCustomizeParameterLookUpSourceEventHandler<S> {
+    /**
+     * A method that will handle the CustomizeParameterLookUpSource event.
+     * @param source The event sender.
+     * @param e An ASPxClientCustomizeParameterLookUpSourceEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientCustomizeParameterLookUpSourceEventArgs): void;
+}
+/**
+ * A method that will handle the CustomizeParameterEditors event.
+ */
+interface ASPxClientReportDesignerCustomizeParameterEditorsEventHandler<S> {
+    /**
+     * A method that will handle the CustomizeParameterEditors event.
+     * @param source The event sender.
+     * @param e An ASPxClientCustomizeParameterEditorsEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientCustomizeParameterEditorsEventArgs): void;
+}
+/**
+ * A method that will handle the CustomizeElements event.
+ */
+interface ASPxClientReportDesignerCustomizeElementsEventHandler<S> {
+    /**
+     * A method that will handle the CustomizeElements event.
+     * @param source The event sender.
+     * @param e An ASPxClientCustomizeElementsEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientCustomizeElementsEventArgs): void;
+}
+/**
+ * A method that will handle the ExitDesigner event.
+ */
+interface ASPxClientReportDesignerExitDesignerEventHandler<S> {
+    /**
+     * A method that will handle the ExitDesigner event.
+     * @param source The event sender.
+     * @param e An ASPxClientReportDesignerExitDesignerEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientReportDesignerExitDesignerEventArgs): void;
+}
+/**
+ * A method that will handle the ReportSaving event.
+ */
+interface ASPxClientReportDesignerReportSavingEventHandler<S> {
+    /**
+     * A method that will handle the ReportSaving event.
+     * @param source The event sender.
+     * @param e An ASPxClientReportDesignerDialogEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientReportDesignerDialogEventArgs): void;
+}
+/**
+ * A method that will handle the ReportSaved event.
+ */
+interface ASPxClientReportDesignerReportSavedEventHandler<S> {
+    /**
+     * A method that will handle the ReportSaved event.
+     * @param source The event sender.
+     * @param e An ASPxClientReportDesignerDialogEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientReportDesignerDialogEventArgs): void;
+}
+/**
+ * A method that will handle the ReportOpening event.
+ */
+interface ASPxClientReportDesignerReportOpeningEventHandler<S> {
+    /**
+     * A method that will handle the ReportOpening event.
+     * @param source The event sender.
+     * @param e An ASPxClientReportDesignerDialogEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientReportDesignerDialogEventArgs): void;
+}
+/**
+ * A method that will handle the ReportOpened event.
+ */
+interface ASPxClientReportDesignerReportOpenedEventHandler<S> {
+    /**
+     * A method that will handle the ReportOpened event.
+     * @param source The event sender.
+     * @param e An ASPxClientReportDesignerDialogEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientReportDesignerDialogEventArgs): void;
+}
+/**
+ * A method that will handle the OnServerError event.
+ */
+interface ASPxClientReportDesignerErrorEventHandler<S> {
+    /**
+     * A method that will handle the OnServerError event.
+     * @param source The event sender.
+     * @param e An ASPxClientReportDesignerErrorEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientReportDesignerErrorEventArgs): void;
+}
+/**
+ * A method that will handle the ComponentAdded event.
+ */
+interface ASPxClientReportDesignerComponentAddedEventHandler<S> {
+    /**
+     * A method that will handle the ComponentAdded event.
+     * @param source The event sender.
+     * @param e An ASPxClientReportDesignerComponentAddedEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientReportDesignerComponentAddedEventArgs): void;
+}
+/**
+ * A method that will handle the CustomizeSaveDialog event.
+ */
+interface ASPxClientReportDesignerCustomizeSaveDialogEventHandler<S> {
+    /**
+     * A method that will handle the CustomizeSaveDialog event.
+     * @param source The event sender.
+     * @param e An ASPxClientReportDesignerCustomizeSaveDialogEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientReportDesignerCustomizeSaveDialogEventArgs): void;
+}
+/**
+ * A method that will handle the CustomizeSaveAsDialog event.
+ */
+interface ASPxClientReportDesignerCustomizeSaveAsDialogEventHandler<S> {
+    /**
+     * A method that will handle the CustomizeSaveAsDialog event.
+     * @param source The event sender.
+     * @param e An ASPxClientReportDesignerCustomizeSaveAsDialogEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientReportDesignerCustomizeSaveAsDialogEventArgs): void;
+}
+/**
+ * A method that will handle the CustomizeOpenDialog event.
+ */
+interface ASPxClientReportDesignerCustomizeOpenDialogEventHandler<S> {
+    /**
+     * A method that will handle the CustomizeOpenDialog event.
+     * @param source The event sender.
+     * @param e An ASPxClientReportDesignerCustomizeOpenDialogEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientReportDesignerCustomizeOpenDialogEventArgs): void;
+}
+/**
+ * A method that will handle the CustomizeToolbox event.
+ */
+interface ASPxClientReportDesignerCustomizeToolboxEventHandler<S> {
+    /**
+     * A method that will handle the CustomizeToolbox event.
+     * @param source The event sender.
+     * @param e An ASPxClientReportDesignerCustomizeToolboxEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientReportDesignerCustomizeToolboxEventArgs): void;
+}
+/**
+ * Provides information about a value editor used in the Property Grid.
+ */
+interface ASPxDesignerEditorOptions {
+    /**
+     * Provides access to the name of an HTML template specifying the editor and header of a complex object.
+     * Value: A string that specifies the HTML template.
+     */
+    header: string;
+    /**
+     * Provides access to the name of an HTML template used by a complex object's editor.
+     * Value: A string that specifies the name of an HTML template.
+     */
+    content: string;
+    /**
+     * Provides access to the type of the editor model.
+     * Value: An object that specifies the editor type.
+     */
+    editorType: Object;
+}
+/**
+ * Provides functionality to an undo/redo engine in the Web Report Designer.
+ */
+interface ASPxDesignerUndoEngine {
+    /**
+     * Provides access to a value that specifies whether or not the redo action can currently be performed.
+     * Value: A knockout observable boolean object, whose value is true if the redo action can be performed, and false otherwise.
+     */
+    redoEnabled: any;
+    /**
+     * Provides access to a value that specifies whether or not the undo action can currently be performed.
+     * Value: A knockout observable boolean object, whose value is true if the undo action can be performed, and false otherwise.
+     */
+    undoEnabled: any;
+    /**
+     * Provides access to a value that specifies whether or not a report has been changed.
+     * Value: A knockout observable boolean object, whose value is true if the report has been modified, and false otherwise.
+     */
+    isDirty: any;
+    /**
+     * Undoes all changes made to a report.
+     */
+    undoAll(): void;
+    /**
+     * Clears information about edit operations made to a report, so they cannot not be undone.
+     */
+    clearHistory(): void;
+    /**
+     * Undoes the last edit action in a report.
+     */
+    undo(): void;
+    /**
+     * Reverses the results of the last undo action.
+     */
+    redo(): void;
+}
+/**
+ * Provides functionality for a tab displayed a report in the Web Report Designer.
+ */
+interface ASPxDesignerNavigateTab {
+    /**
+     * Provides access to a value that specifies the display name of the current tab.
+     * Value: A knockout computed string that specifies the tab's display name.
+     */
+    displayName: any;
+    /**
+     * Provides access to a value that specifies whether or not the report in the current tab has been changed.
+     * Value: A knockout computed boolean object, whose value is true if the report has been modified, and false otherwise.
+     */
+    isDirty: any;
+    /**
+     * Provides access to a report opened in the current tab.
+     * Value: A knockout observable object that specifies a report opened in the current tab.
+     */
+    report: any;
+    /**
+     * Provides access to an engine that manages undo and redo operations in the Web Report Designer.
+     * Value: An object that specifies an undo/redo engine.
+     */
+    undoEngine: ASPxDesignerUndoEngine;
+    /**
+     * Provides access to the URL of a report opened in the current tab.
+     * Value: A knockout observable string that specifies the report URL.
+     */
+    url: any;
+}
+/**
+ * A model of dialogs used to save and open reports in the Web Report Designer.
+ */
+interface ASPxDesignerDialogModel {
+    /**
+     * Provides access to the collection of buttons displayed in a dialog.
+     * Value: An array of objects that specify buttons displayed in a dialog.
+     */
+    popupButtons: Object[];
+    /**
+     * Specifies a function that gets the report URL.
+     */
+    getUrl(): string;
+    /**
+     * Specifies a function that sets the report URL.
+     * @param url A string that specifies the report URL.
+     */
+    setUrl(url: string): void;
+    /**
+     * Specifies a function to be executed when showing a dialog.
+     * @param tab An object that specifies the report tab for which a dialog is invoked.
+     */
+    onShow(tab: ASPxDesignerNavigateTab): void;
+}
+/**
+ * Provides the base functionality for dialogs used to open and save reports on the client side of the Web Report Designer.
+ */
+interface ASPxDesignerReportDialogBase {
+    /**
+     * Provides access to a dialog's width.
+     * Value: A knockout observable object that specifies a dialog's width.
+     */
+    width: any;
+    /**
+     * Provides access to a dialog's height.
+     * Value: A knockout observable object that specifies a dialog's height.
+     */
+    height: any;
+    /**
+     * Provides access to the name of an HTML template used by a dialog.
+     * Value: A knockout observable string that specifies the name of the HTML template used by a dialog.
+     */
+    template: any;
+    /**
+     * Provides access to buttons displayed in a dialog.
+     * Value: An array of objects that specify buttons displayed in the dialog.
+     */
+    buttons: Object[];
+    /**
+     * Provides access to a dialog's model.
+     * Value: A knockout observable object of the ASPxDesignerDialogModel type.
+     */
+    model: any;
+    /**
+     * Provides access to a report tab for which a dialog appears.
+     * Value: A knockout observable object of the ASPxDesignerNavigateTab type.
+     */
+    tab: any;
+    /**
+     * Provides access to a value that specifies a dialog's visibility state.
+     * Value: true, if the dialog is visible; otherwise, false;
+     */
+    visible: any;
+    /**
+     * Provides access to a dialog's title.
+     * Value: A string that specifies a dialog's title.
+     */
+    title: string;
+    /**
+     * Shows the dialog for the specified report tab.
+     * @param tab A report tab for which the dialog should be shown.
+     */
+    show(tab: ASPxDesignerNavigateTab): void;
+    /**
+     * Customizes the dialog based on the specified template and model.
+     * @param template A string that specifies the name of an HTML template for the dialog.
+     * @param model An object that specifies the dialog model.
+     */
+    customize(template: string, model: ASPxDesignerDialogModel): void;
+    /**
+     * Cancels the dialog.
+     */
+    cancel(): void;
+}
+/**
+ * Provides functionality for the Save dialog on the client side of the Web Report Designer.
+ */
+interface ASPxDesignerSaveDialog extends ASPxDesignerReportDialogBase {
+    /**
+     * Provides access to the Save Report dialog that appears if a user selected to save changes in the Save dialog.
+     * Value: An object that specifies the Save As dialog.
+     */
+    saveReportDialog: ASPxDesignerSaveAsDialog;
+    /**
+     * Saves the report with the specified URL.
+     * @param url A string that specifies an URL of the report to be saved.
+     */
+    save(url: string): void;
+    /**
+     * Closes the dialog without saving the current report.
+     */
+    notSave(): void;
+}
+/**
+ * Provides functionality for the Save Report dialog on the client side of the Web Report Designer.
+ */
+interface ASPxDesignerSaveAsDialog extends ASPxDesignerReportDialogBase {
+    /**
+     * Saves the report with the specified URL.
+     * @param url A string that specifies a URL of the report to be saved.
+     */
+    save(url: string): void;
+}
+/**
+ * Provides functionality for the Open Report dialog on the client side of the Web Report Designer.
+ */
+interface ASPxDesignerOpenDialog extends ASPxDesignerReportDialogBase {
+    /**
+     * Opens the report with the specified URL.
+     * @param url A string that specifies an URL of the report to be opened.
+     */
+    open(url: string): void;
+}
+/**
+ * Provides information about a toolbox control item.
+ */
+interface ASPxDesignerToolboxItem {
+    /**
+     * Provides access to information required to serialize a toolbox control.
+     * Value: An array of ASPxDesignerElementSerializationInfo objects that provide information required to serialize an element.
+     */
+    info: ASPxDesignerElementSerializationInfo[];
+    /**
+     * Provides access to a surface type of toolbox control.
+     * Value: A surface type of toolbox control.
+     */
+    surfaceType: any;
+    /**
+     * Provides access to a toolbox control type.
+     * Value: A toolbox control type.
+     */
+    type: any;
+    /**
+     * Provides access to a zero-based index of a control in the toolbox.
+     * Value: An integer value that specifies a control index in the toolbox.
+     */
+    toolboxIndex: number;
+    /**
+     * Provides access to the default property values used for a toolbox control.
+     * Value: An object that specifies default propery values.
+     */
+    defaultVal: Object;
+    /**
+     * Provides access to popular properties of a toolbox control.
+     * Value: An array of strings that specify names of popular properties.
+     */
+    popularProperties: string[];
+    /**
+     * Gets whether a control item is displayed in a toolbox.
+     * Value: true, if the control is available in the toolbox; otherwise, false.
+     */
+    isToolboxItem: boolean;
+}
+/**
+ * Enables you to customize controls available in the Toolbox of the Web Report Designer.
+ */
+interface ASPxDesignerControlsFactory {
+    /**
+     * Returns information about the specified toolbox control.
+     * @param controlType A string that specifies the control type.
+     */
+    getControlInfo(controlType: string): ASPxDesignerToolboxItem;
+    /**
+     * Returns a control type by the specified model.
+     * @param model An object that specifies the control model.
+     */
+    getControlType(model: Object): string;
+    /**
+     * Registers the specified control in the Toolbox of the Web Report Designer.
+     * @param typeName A string that specifies the name of a custom control.
+     * @param metadata An ASPxDesignerToolboxItem object that provides information about a toolbox item.
+     */
+    registerControl(typeName: string, metadata: ASPxDesignerToolboxItem): void;
+    /**
+     * Returns information about the specified property of the specified control.
+     * @param controlType A string that specifies the control type.
+     * @param propertyDisplayName A string that specifies the property display name.
+     */
+    getPropertyInfo(controlType: string, propertyDisplayName: string): ASPxDesignerElementSerializationInfo;
+}
+/**
+ * Provides information about a report parameter type.
+ */
+interface ASPxDesignerParameterType {
+    /**
+     * Provides access to an actual parameter type.
+     * Value: A string that specifies the parameter type.
+     */
+    value: string;
+    /**
+     * Provides access to a text displayed to end-users when creating parameters of the current type.
+     * Value: A string displayed to end-users.
+     */
+    displayValue: string;
+    /**
+     * Provides access to the default value for parameters of the current type.
+     * Value: An object that specifies the default value.
+     */
+    defaultVal: Object;
+    /**
+     * Provides access to the specifics of a current parameter type.
+     * Value: Parameter type specifics.
+     */
+    specifics: string;
+    /**
+     * Converts the specified parameter value to the current parameter type.
+     * @param val An object that specifies the parameter value to be converted.
+     */
+    valueConverter(val: Object): Object;
+}
+/**
+ * The client-side equivalent of the ASPxClientDocumentViewer control's Document Map.
+ */
+interface ASPxClientReportDocumentMap extends ASPxClientControl {
+    /**
+     * Occurs after the content of the Document Viewer's document map is updated.
+     */
+    ContentChanged: ASPxClientEvent<ASPxClientEventHandler<ASPxClientReportDocumentMap>>;
+}
+/**
+ * The client-side equivalent of the ASPxClientDocumentViewer control's Parameters Panel.
+ */
+interface ASPxClientReportParametersPanel extends ASPxClientControl {
+    /**
+     * Assigns a value to a parameter of the report displayed in the document viewer.
+     * @param parametersInfo An array of ASPxClientReportParameterInfo values specifying parameters and values to assign.
+     */
+    AssignParameters(parametersInfo: ASPxClientReportParameterInfo[]): void;
+    /**
+     * Assigns a value to a parameter of the report displayed in the document viewer.
+     * @param path A System.String specifying the parameter's path.
+     * @param value An object specifying the parameter value.
+     */
+    AssignParameter(path: string, value: Object): void;
+    /**
+     * Returns an array storing the names of parameters available in a report.
+     */
+    GetParameterNames(): string[];
+    /**
+     * Returns a value editor that is associated with a parameter with the specified name.
+     * @param parameterName A String value, specifying the parameter name.
+     */
+    GetEditorByParameterName(parameterName: string): ASPxClientControl;
+}
+/**
+ * Provides information about a report parameter on the client side.
+ */
+interface ASPxClientReportParameterInfo {
+    /**
+     * Specifies the parameter path, relative to its parent container (e.g., "subreport1.subreportParameter1" for a subreport's parameter, or "parameter1" for a report's parameter).
+     * Value: A String value, specifying the parameter path (e.g., "subreport1.subreportParameter1").
+     */
+    Path: string;
+    /**
+     * Provides access to a parameter value on the client.
+     * Value: A Object value.
+     */
+    Value: Object;
+}
+/**
+ * The client-side equivalent of the ASPxClientDocumentViewer control's toolbar.
+ */
+interface ASPxClientReportToolbar extends ASPxClientControl {
+    /**
+     * Provides access to the control template assigned for the specified menu item.
+     * @param name A String value, specifying the menu item name.
+     */
+    GetItemTemplateControl(name: string): ASPxClientControl;
+}
+/**
+ * The client-side equivalent of the ReportViewer.
+ */
+interface ASPxClientReportViewer extends ASPxClientControl {
+    /**
+     * Occurs when a callback for server-side processing is initiated.
+     */
+    BeginCallback: ASPxClientEvent<ASPxClientBeginCallbackEventHandler<ASPxClientReportViewer>>;
+    /**
+     * Occurs on the client after a callback's server-side processing has been completed.
+     */
+    EndCallback: ASPxClientEvent<ASPxClientEndCallbackEventHandler<ASPxClientReportViewer>>;
+    /**
+     * Fires on the client if any server error occurs during server-side processing of a callback sent by the ASPxClientReportViewer.
+     */
+    CallbackError: ASPxClientEvent<ASPxClientCallbackErrorEventHandler<ASPxClientReportViewer>>;
+    /**
+     * Occurs on the client side when another report page is loaded into this ASPxClientReportViewer instance.
+     */
+    PageLoad: ASPxClientEvent<ASPxClientReportViewerPageLoadEventHandler<ASPxClientReportViewer>>;
+    /**
+     * Submits the values of the specified parameters.
+     * @param parameters A dictionary containing the parameter names, along with their Object values.
+     */
+    SubmitParameters(parameters: { [key: string]: Object; }): void;
+    /**
+     * Prints a report shown in the ReportViewer.
+     */
+    Print(): void;
+    /**
+     * Prints a report page with the specified page index.
+     * @param pageIndex An integer value which specifies an index of the page to be printed.
+     */
+    Print(pageIndex: number): void;
+    /**
+     * Displays a report page with the specified page index in the ReportViewer.
+     * @param pageIndex An integer value which specifies the index of a page to be displayed.
+     */
+    GotoPage(pageIndex: number): void;
+    /**
+     * Initiates a round trip to the server so that the current page will be reloaded.
+     */
+    Refresh(): void;
+    /**
+     * Invokes the Search dialog, which allows end-users to search for specific text in a report.
+     */
+    Search(): void;
+    /**
+     * Exports a report to a file of the specified format, and shows it in a new Web Browser window.
+     * @param format A string specifying the format, to which a report should be exported.
+     */
+    SaveToWindow(format: string): void;
+    /**
+     * Exports a report to a file of the specified format, and saves it to the disk.
+     * @param format A string specifying the format, to which a report should be exported.
+     */
+    SaveToDisk(format: string): void;
+    /**
+     * Gets a value indicating whether or not searching text across a report is permitted in the web browser.
+     */
+    IsSearchAllowed(): boolean;
+}
+/**
+ * A method that will handle the PageLoad events.
+ */
+interface ASPxClientReportViewerPageLoadEventHandler<S> {
+    /**
+     * A method that will handle the PageLoad event.
+     * @param source The event sender.
+     * @param e An ASPxClientReportViewerPageLoadEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientReportViewerPageLoadEventArgs): void;
+}
+/**
+ * Provides data for the PageLoad events on the client side.
+ */
+interface ASPxClientReportViewerPageLoadEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets a value specifying a zero-based index of a page to be displayed in a report viewer.
+     * Returns: $
+     */
+    PageIndex: number;
+    /**
+     * Gets a value specifying the total number of pages displayed in a report viewer.
+     * Returns: $
+     */
+    PageCount: number;
+    /**
+     * Gets a value indicating whether a report page, which is currently loaded into the ASPxClientReportViewer, is the first page of a report.
+     */
+    IsFirstPage(): boolean;
+    /**
+     * Gets a value indicating whether a report page, which is currently loaded into the ASPxClientReportViewer, is the last page of a report.
+     */
+    IsLastPage(): boolean;
+}
+/**
+ * Provides data for the CustomizeParameterEditors events.
+ */
+interface ASPxClientCustomizeParameterEditorsEventArgs extends ASPxClientEventArgs {
+    /**
+     * Provides access to an object that stores information about a parameter.
+     * Value: An ASPxDesignerElementParameterDescriptor object.
+     */
+    parameter: ASPxDesignerElementParameterDescriptor;
+    /**
+     * Provides access to an object that stores information required to serialize a parameter editor.
+     * Value: An ASPxDesignerElementSerializationInfo object.
+     */
+    info: ASPxDesignerElementSerializationInfo;
+}
+/**
+ * Provides data for the CustomizeParameterLookUpSource events.
+ */
+interface ASPxClientCustomizeParameterLookUpSourceEventArgs extends ASPxClientEventArgs {
+    /**
+     * Provides access to an object that stores information about a parameter.
+     * Value: An ASPxDesignerElementParameterDescriptor object that stores information about the parameter.
+     */
+    parameter: ASPxDesignerElementParameterDescriptor;
+    /**
+     * Provides access to the collection of look-up parameter values.
+     * Value: An array of ASPxDesignerElementEditorItem objects that store information about look-up parameter values.
+     */
+    items: ASPxDesignerElementEditorItem[];
+    /**
+     * Specifies the data source that provides look-up values for the parameter editor.
+     * Value: An Object specifying the data source that provides look-up values to the parameter editor.
+     */
+    dataSource: Object;
+}
+/**
+ * Provides information about a command available in the toolbar or menu.
+ */
+interface ASPxClientMenuAction {
+    /**
+     * Provides access to the text for the command.
+     * Value: A string that is the command text.
+     */
+    text: string;
+    /**
+     * Provides access to the CSS class of the command's glyph.
+     * Value: A string that specifies the name of the CSS class.
+     */
+    imageClassName: string;
+    /**
+     * Provides access to the action performed when a button is clicked.
+     * Value: The specific action implementation.
+     */
+    clickAction: Function;
+    /**
+     * Provides access to the value that specifies whether or not the command is disabled by default.
+     * Value: true, if the command is disabled by default; otherwise, false.
+     */
+    disabled: boolean;
+    /**
+     * Provides access to the value that specifies whether or not the command is visible in the user interface.
+     * Value: true if the command is visible; otherwise false.
+     */
+    visible: boolean;
+    /**
+     * Provides access to the keyboard shortcut used to invoke the command.
+     * Value: An ASPxClientMenuActionHotKey object that specifies the keyboard shortcut.
+     */
+    hotKey: ASPxClientMenuActionHotKey;
+    /**
+     * Provides access to the value that specifies whether or not the command has a visual separator.
+     * Value: true, if the command has a visual separator; otherwise, false.
+     */
+    hasSeparator: string;
+    /**
+     * Provides access to a value that specifies the command location.
+     * Value: A string that specifies the command location.
+     */
+    container: string;
+}
+/**
+ * Provides information about a hot key used to perform an action assigned to a menu item.
+ */
+interface ASPxClientMenuActionHotKey {
+    /**
+     * Provides access to a hot key code.
+     * Value: An integer value that specifies the hot key code.
+     */
+    keyCode: number;
+    /**
+     * Provides access to a value that specifies whether the CTRL key is used in combination with a hot key.
+     * Value: true, if the CTRL key is included into the key combination; otherwise, false.
+     */
+    ctrlKey: boolean;
+}
+/**
+ * Provides data for the CustomizeMenuActions.
+ */
+interface ASPxClientCustomizeMenuActionsEventArgs extends ASPxClientEventArgs {
+    /**
+     * Provides access to the collection of actions available in the toolbar and menu.
+     * Value: An array of ASPxClientMenuAction objects.
+     */
+    Actions: ASPxClientMenuAction[];
+    /**
+     * Returns a menu action with the specified ID.
+     * @param actionId A String value that specifies the action ID.
+     */
+    GetById(actionId: string): ASPxClientMenuAction;
+}
+/**
+ * Provides data for the CustomizeElements events.
+ */
+interface ASPxClientCustomizeElementsEventArgs extends ASPxClientEventArgs {
+    /**
+     * Provides access to the collection of UI elements.
+     * Value: An array of the ASPxReportUIElement objects.
+     */
+    Elements: ASPxReportUIElement[];
+    /**
+     * Returns UI elements with the specified ID.
+     * @param templateId A string that specifies the element ID.
+     */
+    GetById(templateId: string): ASPxReportUIElement[];
+}
+/**
+ * Provides general information about a report parameter.
+ */
+interface ASPxDesignerElementParameterDescriptor {
+    /**
+     * Provides access to the parameter description.
+     * Value: A String value, specifying the parameter description.
+     */
+    description: string;
+    /**
+     * Provides access to the parameter name.
+     * Value: A String value, specifying the parameter name.
+     */
+    name: string;
+    /**
+     * Provides access to the parameter type.
+     * Value: A String value, specifying the parameter type.
+     */
+    type: string;
+    /**
+     * Provides access to the parameter value.
+     * Value: A Object, specifying the parameter value.
+     */
+    value: Object;
+    /**
+     * Provides access to the parameter visibility state.
+     * Value: true if the parameter is visible; otherwise false.
+     */
+    visible: boolean;
+}
+/**
+ * Provides information required to serialize an element.
+ */
+interface ASPxDesignerElementSerializationInfo {
+    /**
+     * Gets the property name that will be used in the model to store the property value.
+     * Value: A String value.
+     */
+    propertyName: string;
+    /**
+     * Gets the property name in the model that is displayed in the Property grid.
+     * Value: A String value.
+     */
+    displayName: string;
+    /**
+     * Gets the property name that will be used during serialization to store the property value.
+     * Value: A String value.
+     */
+    modelName: string;
+    /**
+     * Gets the default property value used for serialization.
+     * Value: A Object value.
+     */
+    defaultVal: Object;
+    /**
+     * Gets the information about a complex object's content.
+     * Value: An array of ASPxDesignerElementSerializationInfo objects.
+     */
+    info: ASPxDesignerElementSerializationInfo[];
+    /**
+     * Gets a value indicating whether or not the property returns an array.
+     * Value: true if the property returns an array; otherwise false.
+     */
+    array: boolean;
+    /**
+     * Gets a value indicating whether an object should be serialized to the ComponentStorage property.
+     * Value: true to serialize an object to the ObjectStorage; otherwise false.
+     */
+    link: boolean;
+    /**
+     * Gets a value specifying the type of value editor for the Property Grid.
+     * Value: An ASPxDesignerElementEditor object.
+     */
+    editor: ASPxDesignerElementEditor;
+    /**
+     * Gets the collection of values displayed in the Property grid.
+     * Value: An array of ASPxDesignerElementEditorItem objects.
+     */
+    valuesArray: ASPxDesignerElementEditorItem[];
+    /**
+     * Gets the rules for validating the property value entered into its editor.
+     * Value: An array of Object values.
+     */
+    validationRules: Object[];
+    /**
+     * Gets the visibility state of the value editor in the Property Grid.
+     * Value: A Object value.
+     */
+    visible: Object;
+    /**
+     * Gets a value, indicating whether or not the property value can be edited.
+     * Value: true to disable the property editing; otherwise false.
+     */
+    disabled: Object;
+}
+/**
+ * Provides information about a serialized property's value editor used in the Property Grid.
+ */
+interface ASPxDesignerElementEditor {
+    /**
+     * Gets the name of an HTML template specifying the editor and header of a complex object (i.e., an object having its content properties specified).
+     * Value: A String value.
+     */
+    header: string;
+    /**
+     * Gets a nullable value, specifying the name of an HTML template used by a complex object's editor.
+     * Value: A String value.
+     */
+    content: string;
+    /**
+     * Gets additional options for <a href="https://js.devexpress.com/Documentation/Overview/">DevExtreme</a> UI widgets.
+     * Value: An object that provides editor options.
+     */
+    extendedOptions: Object;
+    /**
+     * Gets a nullable value, specifying the type of the editor's model.
+     * Value: A Object value.
+     */
+    editorType: Object;
+}
+/**
+ * Provides information about property values.
+ */
+interface ASPxDesignerElementEditorItem {
+    /**
+     * Gets an actual property value.
+     * Value: A Object value.
+     */
+    value: Object;
+    /**
+     * Gets a value displayed by a property editor.
+     * Value: A String value.
+     */
+    displayValue: string;
+}
+/**
+ * Provides information about a UI element of the Web Report Designer or Web Document Viewer.
+ */
+interface ASPxReportUIElement {
+    /**
+     * Provides access to an element model.
+     * Value: An object that specifies the element model.
+     */
+    model: Object;
+    /**
+     * Provides access to the name of an HTML template used by an element.
+     * Value: A string that specifies the name of the HTML template.
+     */
+    templateName: string;
+}
+/**
+ * Provides data for the PreviewDocumentReady events.
+ */
+interface ASPxClientWebDocumentViewerDocumentReadyEventArgs extends ASPxClientEventArgs {
+    /**
+     * Specifies the report ID.
+     */
+    ReportId: string;
+    /**
+     * Specifies the report document ID.
+     */
+    DocumentId: string;
+    /**
+     * Specifies the total number of pages in a report document.
+     */
+    PageCount: number;
+}
+/**
+ * Provides data for the PreviewEditingFieldChanged events.
+ */
+interface ASPxClientWebDocumentViewerEditingFieldChangedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets an editing field whose value has been changed.
+     * Value: An object that specifies an editing field whose content has been changed.
+     */
+    Field: ASPxClientWebDocumentViewerEditingField;
+    /**
+     * Provides access to a previous value of an editing field.
+     * Value: An object that specifies an editing field's previous value.
+     */
+    OldValue: Object;
+    /**
+     * Provides access to a new value of an editing field.
+     * Value: An object that specifies an editing field's new value.
+     */
+    NewValue: Object;
+}
+/**
+ * Provides functionality for a field whose content can be edited in the Web Document Viewer.
+ */
+interface ASPxClientWebDocumentViewerEditingField {
+    /**
+     * Provides access to a value that specifies whether or not an editing field's content can be customized in Print Preview.
+     * Returns: true, if a field cannot be edited in Print Preview; otherwise, false.
+     */
+    readOnly: any;
+    /**
+     * Provides access to the current value of an editing field.
+     * Returns: An object that specifies the current field value.
+     */
+    editValue: any;
+    /**
+     * Returns the unique identifier of an editing field.
+     */
+    id(): string;
+    /**
+     * Returns the ID of a logical group to which an editing field for a check box belongs.
+     */
+    groupID(): string;
+    /**
+     * Returns the name of an editor used to change a field value in Print Preview.
+     */
+    editorName(): string;
+    /**
+     * Returns the index of the page on which an editing field is located.
+     */
+    pageIndex(): number;
+}
+/**
+ * Provides data for the PreviewParametersSubmitted events.
+ */
+interface ASPxClientParametersSubmittedEventArgs extends ASPxClientEventArgs {
+    /**
+     * Provides access to a View Model for report parameters.
+     * Value: A View Model object.
+     */
+    ParametersViewModel: Object;
+    /**
+     * Provides access to report parameters and their submitted values.
+     * Value: A dictionary containing the parameter names along with their values.
+     */
+    Parameters: { [key: string]: Object; };
+}
+/**
+ * Provides data for the PreviewParametersReset events.
+ */
+interface ASPxClientParametersResetEventArgs extends ASPxClientEventArgs {
+    /**
+     * Provides access to a View Model for report parameters.
+     * Value: A View Model object.
+     */
+    ParametersViewModel: Object;
+    /**
+     * Provides access to report parameters whose values have been reset.
+     * Value: An ASPxClientWebDocumentViewerParameter array.
+     */
+    Parameters: ASPxClientWebDocumentViewerParameter[];
+}
+/**
+ * Provides general information about a report parameter on the client-side of the Web Document Viewer.
+ */
+interface ASPxClientWebDocumentViewerParameter {
+    /**
+     * Provides access to the current value of a report parameter.
+     * Value: An object that specifies the report parameter's current value.
+     */
+    value: Object;
+    /**
+     * Provides access to a report parameter's value type.
+     * Value: An object that specifies the report parameter type.
+     */
+    type: Object;
+    /**
+     * Provides access to a value that specifies whether or not a parameter can have multiple values.
+     * Value: true, if a parameter can have multiple values; otherwise, false.
+     */
+    isMultiValue: boolean;
+    /**
+     * Returns an object that provides general information about a report parameter.
+     */
+    getParameterDescriptor(): ASPxDesignerElementParameterDescriptor;
+}
+/**
+ * Provides data for the PreviewClick events.
+ */
+interface ASPxClientPreviewClickEventArgs extends ASPxClientEventArgs {
+    /**
+     * Gets a value specifying the zero-based index of the page that has been clicked.
+     * Value: An integer value that specifies a page index.
+     */
+    PageIndex: number;
+    /**
+     * Provides information on a visual brick representing content of a report control that has been clicked.
+     * Value: An object that provides information on a visual brick.
+     */
+    Brick: ASPxClientWebDocumentViewerBrick;
+    /**
+     * Specifies whether or not the event was handled and no default processing is required.
+     * Value: true, if the event is completely handled by custom code and no default processing is required; otherwise, false.
+     */
+    Handled: boolean;
+    /**
+     * Specifies the default function used to handle the PreviewClick event.
+     */
+    DefaultHandler(): void;
+    /**
+     * Returns the text displayed by the Brick.
+     */
+    GetBrickText(): string;
+    /**
+     * Returns a string providing additional information on the Brick.
+     */
+    GetBrickValue(): string;
+}
+/**
+ * Provides information about a visual brick used to render a report control to construct a document in the Web Document Viewer.
+ */
+interface ASPxClientWebDocumentViewerBrick {
+    /**
+     * Provides access to a brick's content.
+     * Value: A dictionary that stores content keys along with the corresponding contents.
+     */
+    content: { [key: string]: string; };
+    /**
+     * Provides access to navigation settings of the current brick.
+     * Value: An object that provides a brick's navigation settings.
+     */
+    navigation: ASPxClientWebDocumentViewerBrickNavigation;
+    /**
+     * Provides access to a brick's top vertical coordinate.
+     * Value: An integer value that specifies the brick's top coordinate.
+     */
+    top: number;
+    /**
+     * Provides access to a brick's left horizontal coordinate.
+     * Value: An integer value that specifies the brick's left coordinate.
+     */
+    left: number;
+    /**
+     * Provides access to a brick's width.
+     * Value: An integer value that specifies the brick width.
+     */
+    width: number;
+    /**
+     * Provides access to a brick's height.
+     * Value: An integer value that specifies the brick height.
+     */
+    height: number;
+    /**
+     * Provides access to a value that specifies whether or not the right-to-left feature is enabled for a brick.
+     * Value: true, if the right-to-left feature is enabled; otherwise, false.
+     */
+    rtl: boolean;
+}
+/**
+ * Provides navigation settings for a brick used to construct a document in the Web Document Viewer.
+ */
+interface ASPxClientWebDocumentViewerBrickNavigation {
+    /**
+     * Provides access to the URL to navigate to when a brick is a clicked.
+     * Value: A string that specifies the URL.
+     */
+    url: string;
+    /**
+     * Provides access to a value that specifies the target window or frame in which to display the linked Web page's content when the brick is clicked.
+     * Value: A string that specifies the window or frame to which to target the URL's content.
+     */
+    target: string;
+    /**
+     * Provides access to a drill-down key.
+     * Value: A string that specifies a drill-down key.
+     */
+    drillDownKey: string;
+}
+/**
+ * A client-side equivalent of the ASPxWebDocumentViewer class.
+ */
+interface ASPxClientWebDocumentViewer extends ASPxClientControl {
+    /**
+     * Occurs after a report document has been loaded to the Web Document Viewer.
+     */
+    DocumentReady: ASPxClientEvent<ASPxClientWebDocumentViewerDocumentReadyEventHandler<ASPxClientWebDocumentViewer>>;
+    /**
+     * Occurs each time a value of an editing field changes.
+     */
+    EditingFieldChanged: ASPxClientEvent<ASPxClientWebDocumentViewerEditingFieldChangedEventHandler<ASPxClientWebDocumentViewer>>;
+    /**
+     * Enables you to customize UI elements of the Web Document Viewer.
+     */
+    CustomizeElements: ASPxClientEvent<ASPxClientWebDocumentViewerCustomizeElementsEventHandler<ASPxClientWebDocumentViewer>>;
+    /**
+     * Enables you to customize the menu actions of a Web Document Viewer.
+     */
+    CustomizeMenuActions: ASPxClientEvent<ASPxClientWebDocumentViewerCustomizeMenuActionsEventHandler<ASPxClientWebDocumentViewer>>;
+    /**
+     * Occurs each time a standard editor is created for a report parameter based on a parameter type.
+     */
+    CustomizeParameterEditors: ASPxClientEvent<ASPxClientWebDocumentViewerCustomizeParameterEditorsEventHandler<ASPxClientWebDocumentViewer>>;
+    /**
+     * Occurs each time a look-up editor is created for a report parameter.
+     */
+    CustomizeParameterLookUpSource: ASPxClientEvent<ASPxClientWebDocumentViewerCustomizeParameterLookUpSourceEventHandler<ASPxClientWebDocumentViewer>>;
+    /**
+     * Occurs when the left mouse button has been clicked over a report document.
+     */
+    PreviewClick: ASPxClientEvent<ASPxClientWebDocumentViewerPreviewClickEventHandler<ASPxClientWebDocumentViewer>>;
+    /**
+     * Occurs after report parameter values have been reset to their default values.
+     */
+    ParametersReset: ASPxClientEvent<ASPxClientWebDocumentViewerParametersResetEventHandler<ASPxClientWebDocumentViewer>>;
+    /**
+     * Occurs after report parameter values have been submitted.
+     */
+    ParametersSubmitted: ASPxClientEvent<ASPxClientWebDocumentViewerParametersSubmittedEventHandler<ASPxClientWebDocumentViewer>>;
+    /**
+     * Provides access to the preview model of the ASPxClientWebDocumentViewer.
+     */
+    GetPreviewModel(): Object;
+    /**
+     * Returns a model for a report parameter.
+     */
+    GetParametersModel(): Object;
+    /**
+     * Opens the specified report on the client side of the Web Document Viewer.
+     * @param url A string that specifies the URL of a report to be opened.
+     */
+    OpenReport(url: string): any;
+    /**
+     * Prints the current document.
+     */
+    Print(): void;
+    /**
+     * Prints the document's page with the specified index.
+     * @param pageIndex An index of the page to be printed.
+     */
+    Print(pageIndex: number): void;
+    /**
+     * Exports the document to a PDF file.
+     */
+    ExportTo(): void;
+    /**
+     * Exports the document to a specified file format.
+     * @param format A String value, specifying the export format. The following formats are currently supported: 'csv', 'html', 'image', 'mht', 'pdf', 'rtf', 'docx', 'txt', 'xls', and 'xlsx'.
+     */
+    ExportTo(format: string): void;
+    /**
+     * Exports the document to a specified file format.
+     * @param format A String value that specifies the export format. The following formats are currently supported: 'csv', 'html', 'image', 'mht', 'pdf', 'rtf', 'docx', 'txt', 'xls', and 'xlsx'.
+     * @param inlineResult true, to try opening the result file in a new browser tab without a download; otherwise, false.
+     */
+    ExportTo(format: string, inlineResult: boolean): void;
+    /**
+     * Returns the zero-based index of the currently displayed page.
+     */
+    GetCurrentPageIndex(): number;
+    /**
+     * Displays the report page with the specified page index.
+     * @param pageIndex A zero-based integer value that specifies the index of a page to be displayed.
+     */
+    GoToPage(pageIndex: number): void;
+    /**
+     * Closes the document currently being opened in the Web Document Viewer.
+     */
+    Close(): void;
+    /**
+     * Resets the values of report parameters to their default values.
+     */
+    ResetParameters(): void;
+    /**
+     * Starts building a report document.
+     */
+    StartBuild(): void;
+    /**
+     * Updates the localization settings of the ASPxClientWebDocumentViewer properties.
+     * @param localization A dictionary containing the property names, along with their localized equivalents.
+     */
+    UpdateLocalization(localization: { [key: string]: string; }): void;
+}
+/**
+ * A method that will handle the EditingFieldChanged event.
+ */
+interface ASPxClientWebDocumentViewerEditingFieldChangedEventHandler<S> {
+    /**
+     * A method that will handle the PreviewEditingFieldChanged event.
+     * @param source The event sender.
+     * @param e An ASPxClientWebDocumentViewerEditingFieldChangedEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientWebDocumentViewerEditingFieldChangedEventArgs): void;
+}
+/**
+ * A method that will handle the DocumentReady event.
+ */
+interface ASPxClientWebDocumentViewerDocumentReadyEventHandler<S> {
+    /**
+     * A method that will handle the PreviewDocumentReady event.
+     * @param source The event sender.
+     * @param e An ASPxClientWebDocumentViewerDocumentReadyEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientWebDocumentViewerDocumentReadyEventArgs): void;
+}
+/**
+ * A method that will handle the CustomizeElements event.
+ */
+interface ASPxClientWebDocumentViewerCustomizeElementsEventHandler<S> {
+    /**
+     * A method that will handle the PreviewCustomizeElements event.
+     * @param source The event sender.
+     * @param e An ASPxClientCustomizeElementsEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientCustomizeElementsEventArgs): void;
+}
+/**
+ * A method that will handle the CustomizeMenuActions event.
+ */
+interface ASPxClientWebDocumentViewerCustomizeMenuActionsEventHandler<S> {
+    /**
+     * A method that will handle the CustomizeMenuActions event.
+     * @param source The event sender.
+     * @param e An ASPxClientCustomizeMenuActionsEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientCustomizeMenuActionsEventArgs): void;
+}
+/**
+ * A method that will handle the CustomizeParameterEditors event.
+ */
+interface ASPxClientWebDocumentViewerCustomizeParameterEditorsEventHandler<S> {
+    /**
+     * A method that will handle the CustomizeParameterEditors event.
+     * @param source The event sender.
+     * @param e An ASPxClientCustomizeParameterEditorsEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientCustomizeParameterEditorsEventArgs): void;
+}
+/**
+ * A method that will handle the CustomizeParameterLookUpSource event.
+ */
+interface ASPxClientWebDocumentViewerCustomizeParameterLookUpSourceEventHandler<S> {
+    /**
+     * A method that will handle the CustomizeParameterLookUpSource event.
+     * @param source The event sender.
+     * @param e An ASPxClientCustomizeParameterLookUpSourceEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientCustomizeParameterLookUpSourceEventArgs): void;
+}
+/**
+ * A method that will handle the PreviewClick event.
+ */
+interface ASPxClientWebDocumentViewerPreviewClickEventHandler<S> {
+    /**
+     * A method that will handle the PreviewClick event.
+     * @param source The event sender.
+     * @param e An ASPxClientPreviewClickEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientPreviewClickEventArgs): void;
+}
+/**
+ * A method that will handle the ParametersReset event.
+ */
+interface ASPxClientWebDocumentViewerParametersResetEventHandler<S> {
+    /**
+     * A method that will handle the PreviewParametersReset event.
+     * @param source The event sender.
+     * @param e An ASPxClientParametersResetEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientParametersResetEventArgs): void;
+}
+/**
+ * A method that will handle the ParametersSubmitted event.
+ */
+interface ASPxClientWebDocumentViewerParametersSubmittedEventHandler<S> {
+    /**
+     * A method that will handle the PreviewParametersSubmitted event.
+     * @param source The event sender.
+     * @param e An ASPxClientParametersSubmittedEventArgs object that contains data related to the event.
+     */
+    (source: S, e: ASPxClientParametersSubmittedEventArgs): void;
+}
+
+interface MVCxClientDashboardViewerStatic extends ASPxClientDashboardViewerStatic {
+}
+interface DashboardDataAxisNamesStatic {
+    /**
+     * Identifies a default axis in all data-bound dashboard items.
+     */
+    DefaultAxis: string;
+    /**
+     * Identifies a series axis in a chart and pie.
+     */
+    ChartSeriesAxis: string;
+    /**
+     * Identifies an argument axis in a chart, scatter chart and pie.
+     */
+    ChartArgumentAxis: string;
+    /**
+     * Identifies a sparkline axis in a grid and cards.
+     */
+    SparklineAxis: string;
+    /**
+     * Identifies a pivot column axis.
+     */
+    PivotColumnAxis: string;
+    /**
+     * Identifies a pivot row axis.
+     */
+    PivotRowAxis: string;
+}
+interface DashboardSpecialValuesStatic {
+    /**
+     * Represents a null value.
+     */
+    NullValue: string;
+    /**
+     * Represents a null value in OLAP mode.
+     */
+    OlapNullValue: string;
+    /**
+     * Represents an Others value.
+     */
+    OthersValue: string;
+    /**
+     * Represents an error value for calculated fields.
+     */
+    ErrorValue: string;
+    /**
+     * Returns whether or not the specified value is an NullValue.
+     * @param value The specified value.
+     */
+    IsNullValue(value: Object): boolean;
+    /**
+     * Returns whether or not the specified value is an OlapNullValue.
+     * @param value The specified value.
+     */
+    IsOlapNullValue(value: Object): boolean;
+    /**
+     * Returns whether or not the specified value is an OthersValue.
+     * @param value The specified value.
+     */
+    IsOthersValue(value: Object): boolean;
+    /**
+     * Returns whether or not the specified value is an ErrorValue.
+     * @param value The specified value.
+     */
+    IsErrorValue(value: Object): boolean;
+}
+interface DashboardExportPageLayoutStatic {
+    /**
+     * The page orientation used to export a dashboard (dashboard item) is portrait.
+     */
+    Portrait: string;
+    /**
+     * The page orientation used to export a dashboard (dashboard item) is landscape.
+     */
+    Landscape: string;
+}
+interface DashboardExportPaperKindStatic {
+    /**
+     * Letter paper (8.5 in. by 11 in.).
+     */
+    Letter: string;
+    /**
+     * Legal paper (8.5 in. by 14 in.).
+     */
+    Legal: string;
+    /**
+     * Executive paper (7.25 in. by 10.5 in.).
+     */
+    Executive: string;
+    /**
+     * A5 paper (148 mm by 210 mm).
+     */
+    A5: string;
+    /**
+     * A4 paper (210 mm by 297 mm).
+     */
+    A4: string;
+    /**
+     * A3 paper (297 mm by 420 mm).
+     */
+    A3: string;
+}
+interface DashboardExportScaleModeStatic {
+    /**
+     * The dashboard (dashboard item) on the exported page retains its original size.
+     */
+    None: string;
+    /**
+     * The size of the dashboard (dashboard item) on the exported page is changed according to the scale factor value.
+     */
+    UseScaleFactor: string;
+    /**
+     * The size of the dashboard (dashboard item) is changed according to the width of the exported page.
+     */
+    AutoFitToPageWidth: string;
+    /**
+     * The size of the dashboard (dashboard item) is changed to fit its content on a single page.
+     */
+    AutoFitWithinOnePage: string;
+}
+interface DashboardExportFilterStateStatic {
+    /**
+     * The filter state is not included in the exported document.
+     */
+    None: string;
+    /**
+     * The filter state is placed below the dashboard (dashboard item) in the exported document.
+     */
+    Below: string;
+    /**
+     * The filter state is placed on a separate page in the exported document.
+     */
+    SeparatePage: string;
+}
+interface DashboardStateExportPositionStatic {
+    /**
+     * The dashboard state is placed below the exported dashboard/dashboard item.
+     */
+    Below: string;
+    /**
+     * The dashboard state is placed on a separate page.
+     */
+    SeparatePage: string;
+}
+interface DashboardStateExcelExportPositionStatic {
+    /**
+     * The dashboard state is placed below the exported data.
+     */
+    Below: string;
+    /**
+     * The dashboard state is placed on a separate sheet.
+     */
+    SeparateSheet: string;
+}
+interface DashboardExportImageFormatStatic {
+    /**
+     * The PNG image format.
+     */
+    Png: string;
+    /**
+     * The GIF image format.
+     */
+    Gif: string;
+    /**
+     * The JPG image format.
+     */
+    Jpg: string;
+}
+interface ExcelExportFilterStateStatic {
+    none: string;
+    below: string;
+    separatePage: string;
+}
+interface DashboardExportExcelFormatStatic {
+    /**
+     * The Excel 97 - Excel 2003 (XLS) file format.
+     */
+    Xls: string;
+    /**
+     * The Office Excel 2007 XML-based (XLSX) file format.
+     */
+    Xlsx: string;
+    /**
+     * A comma-separated values (CSV) file format.
+     */
+    Csv: string;
+}
+interface ChartExportSizeModeStatic {
+    /**
+     * A chart dashboard item is exported in a size identical to that shown on the dashboard.
+     */
+    None: string;
+    /**
+     * A chart dashboard item is stretched or shrunk to fit the page to which it is exported.
+     */
+    Stretch: string;
+    /**
+     * A chart dashboard item is resized proportionally to best fit the exported page.
+     */
+    Zoom: string;
+}
+interface MapExportSizeModeStatic {
+    /**
+     * A map dashboard item is exported in a size identical to that shown on the dashboard
+     */
+    None: string;
+    /**
+     * A map dashboard item is resized proportionally to best fit the exported page.
+     */
+    Zoom: string;
+}
+interface TreemapExportSizeModeStatic {
+    /**
+     * For internal use.
+     */
+    none: string;
+    /**
+     * For internal use.
+     */
+    zoom: string;
+}
+interface RangeFilterExportSizeModeStatic {
+    /**
+     * A Range Filter dashboard item is exported in a size identical to that shown on the dashboard.
+     */
+    None: string;
+    /**
+     * A Range Filter dashboard item is stretched or shrunk to fit the page to which it is exported.
+     */
+    Stretch: string;
+    /**
+     * A Range Filter dashboard item is resized proportionally to best fit the printed page.
+     */
+    Zoom: string;
+}
+interface DashboardSelectionModeStatic {
+    None: string;
+    Single: string;
+    Multiple: string;
+}
+interface ASPxClientDashboardStatic extends ASPxClientControlStatic {
+}
+interface ASPxClientDashboardViewerStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientDashboardViewer;
+}
+interface ASPxClientEditBaseStatic extends ASPxClientControlStatic {
+}
+interface ASPxClientEditStatic extends ASPxClientEditBaseStatic {
+    /**
+     * Assigns a null value to all editors in a specified visibility state, which are located within a specified container and belong to a specific validation group.
+     * @param container An HTML element specifying the container of editors to be validated.
+     * @param validationGroup A string value specifying the validation group's name.
+     * @param clearInvisibleEditors true to clear both visible and invisible editors that belong to the specified container and group; false to clear only visible editors.
+     */
+    ClearEditorsInContainer(container: Object, validationGroup: string, clearInvisibleEditors: boolean): void;
+    /**
+     * Assigns a null value to all visible editors located within a specified container, and belonging to a specific validation group.
+     * @param container An HTML element specifying the container of editors to be validated.
+     * @param validationGroup A string value specifying the validation group's name.
+     */
+    ClearEditorsInContainer(container: Object, validationGroup: string): void;
+    /**
+     * Assigns a null value to all visible editors located within a specified container.
+     * @param container An HTML element specifying the container of editors to be validated.
+     */
+    ClearEditorsInContainer(container: Object): void;
+    /**
+     * Assigns a null value to all editors which are located within the specified container object, and belonging to a specific validation group, dependent on the visibility state specified.
+     * @param containerId A string value specifying the editor container's identifier.
+     * @param validationGroup A string value specifying the validatiion group's name.
+     * @param clearInvisibleEditors true to clear both visible and invisible editors that belong to the specified container and group; false to clear only visible editors.
+     */
+    ClearEditorsInContainerById(containerId: string, validationGroup: string, clearInvisibleEditors: boolean): void;
+    /**
+     * Assigns a null value to all visible editors that are located within the specified container object, and belonging to a specific validation group.
+     * @param containerId A string value specifying the editor container's identifier.
+     * @param validationGroup A string value specifying the validatiion group's name.
+     */
+    ClearEditorsInContainerById(containerId: string, validationGroup: string): void;
+    /**
+     * Assigns a null value to all visible editors that are located within the specified container object.
+     * @param containerId A string value specifying the editor container's identifier.
+     */
+    ClearEditorsInContainerById(containerId: string): void;
+    /**
+     * Assigns a null value to all editors which belong to a specific validation group, dependent on the visibility state specified.
+     * @param validationGroup A string value specifying the validation group's name.
+     * @param clearInvisibleEditors true to clear both visible and invisible editors that belong to the specified validation group; false to clear only visible editors.
+     */
+    ClearGroup(validationGroup: string, clearInvisibleEditors: boolean): void;
+    /**
+     * Assigns a null value to all visible editors which belong to a specific validation group.
+     * @param validationGroup A string value specifying the validation group's name.
+     */
+    ClearGroup(validationGroup: string): void;
+    /**
+     * Performs validation of all editors in a specified visibility state, which are located within a specified container and belong to a specific validation group.
+     * @param container An HTML element specifying the container of editors to be validated.
+     * @param validationGroup A string value that specifies the validation group's name.
+     * @param validateInvisibleEditors true to validate both visible and invisible editors that belong to the specified container and group; false to validate only visible editors.
+     */
+    ValidateEditorsInContainer(container: Object, validationGroup: string, validateInvisibleEditors: boolean): boolean;
+    /**
+     * Performs validation of visible editors that are located within the specified container and belong to a specific validation group.
+     * @param container An HTML element specifying the container of editors to be validated.
+     * @param validationGroup A string value that specifies the validation group's name.
+     */
+    ValidateEditorsInContainer(container: Object, validationGroup: string): boolean;
+    /**
+     * Performs validation of visible editors that are located within the specified container.
+     * @param container An HTML element specifying the container of editors to be validated.
+     */
+    ValidateEditorsInContainer(container: Object): boolean;
+    /**
+     * Performs validation of the editors which are located within the specified container and belong to a specific validation group, dependent on the visibility state specified.
+     * @param containerId A string value specifying the editor container's identifier.
+     * @param validationGroup A string value that specifies the validation group's name.
+     * @param validateInvisibleEditors true to validate both visible and invisible editors that belong to the specified container and group; false to validate only visible editors.
+     */
+    ValidateEditorsInContainerById(containerId: string, validationGroup: string, validateInvisibleEditors: boolean): boolean;
+    /**
+     * Performs validation of visible editors that are located within the specified container and belong to a specific validation group.
+     * @param containerId A string value that specifies the container's unique identifier.
+     * @param validationGroup A string value that specifies the validation group's name.
+     */
+    ValidateEditorsInContainerById(containerId: string, validationGroup: string): boolean;
+    /**
+     * Performs validation of visible editors which are located within the specified container.
+     * @param containerId A string value that specifies the container's unique identifier.
+     */
+    ValidateEditorsInContainerById(containerId: string): boolean;
+    /**
+     * Performs validation of editors contained within the specified validation group, dependent on the editor visibility state specified.
+     * @param validationGroup A string value specifying the validation group's name.
+     * @param validateInvisibleEditors true to validate both visible and invisible editors that belong to the specified validation group; false to validate only visible editors.
+     */
+    ValidateGroup(validationGroup: string, validateInvisibleEditors: boolean): boolean;
+    /**
+     * Performs validation of visible editors contained within the specified validation group.
+     * @param validationGroup A string value specifying the validation group's name.
+     */
+    ValidateGroup(validationGroup: string): boolean;
+    /**
+     * Verifies whether the editors in a specified visibility state, which are located within a specified container and belong to a specific validation group, are valid.
+     * @param container An HTML element specifying the container of editors to be validated.
+     * @param validationGroup A string value that specifies the validation group's name.
+     * @param checkInvisibleEditors true to check both visible and invisible editors that belong to the specified container; false to check only visible editors.
+     */
+    AreEditorsValid(container: Object, validationGroup: string, checkInvisibleEditors: boolean): boolean;
+    /**
+     * Verifies whether visible editors, which are located within a specified container and belong to a specific validation group, are valid.
+     * @param container An HTML element specifying the container of editors to be validated.
+     * @param validationGroup A string value that specifies the validation group's name.
+     */
+    AreEditorsValid(container: Object, validationGroup: string): boolean;
+    /**
+     * Verifies whether visible editors located in a specified container are valid.
+     * @param container An HTML element specifying the container of editors to be validated.
+     */
+    AreEditorsValid(container: Object): boolean;
+    /**
+     * Verifies whether the editors with the specified settings are valid.
+     * @param containerId A string value that specifies the container's unique identifier.
+     * @param validationGroup A string value that specifies the validation group's name.
+     * @param checkInvisibleEditors true to check both visible and invisible editors that belong to the specified container; false to check only visible editors.
+     */
+    AreEditorsValid(containerId: string, validationGroup: string, checkInvisibleEditors: boolean): boolean;
+    /**
+     * Verifies whether visible editors with the specified settings are valid.
+     * @param containerId A string value that specifies the container's unique identifier.
+     * @param validationGroup A string value that specifies the validation group's name.
+     */
+    AreEditorsValid(containerId: string, validationGroup: string): boolean;
+    /**
+     * Verifies whether visible editors with the specified settings are valid.
+     * @param containerId A string value that specifies the container's unique identifier.
+     */
+    AreEditorsValid(containerId: string): boolean;
+    /**
+     * Verifies whether visible editors on a page are valid.
+     */
+    AreEditorsValid(): boolean;
+}
+interface ASPxClientBinaryImageStatic extends ASPxClientEditStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientBinaryImage;
+}
+interface ASPxClientButtonStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientButton;
+}
+interface ASPxClientCalendarStatic extends ASPxClientEditStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientCalendar;
+}
+interface ASPxClientCaptchaStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientCaptcha;
+}
+interface ASPxClientCheckBoxStatic extends ASPxClientEditStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientCheckBox;
+}
+interface ASPxClientRadioButtonStatic extends ASPxClientCheckBoxStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientRadioButton;
+}
+interface ASPxClientTextEditStatic extends ASPxClientEditStatic {
+}
+interface ASPxClientTextBoxBaseStatic extends ASPxClientTextEditStatic {
+}
+interface ASPxClientButtonEditBaseStatic extends ASPxClientTextBoxBaseStatic {
+}
+interface ASPxClientDropDownEditBaseStatic extends ASPxClientButtonEditBaseStatic {
+}
+interface ASPxClientColorEditStatic extends ASPxClientDropDownEditBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientColorEdit;
+}
+interface ASPxClientComboBoxStatic extends ASPxClientDropDownEditBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientComboBox;
+}
+interface ASPxClientDateEditStatic extends ASPxClientDropDownEditBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientDateEdit;
+}
+interface ASPxClientDropDownEditStatic extends ASPxClientDropDownEditBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientDropDownEdit;
+}
+interface ASPxClientFilterControlStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientFilterControl;
+}
+interface ASPxClientListEditStatic extends ASPxClientEditStatic {
+}
+interface ASPxClientListBoxStatic extends ASPxClientListEditStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientListBox;
+}
+interface ASPxClientCheckListBaseStatic extends ASPxClientListEditStatic {
+}
+interface ASPxClientRadioButtonListStatic extends ASPxClientCheckListBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientRadioButtonList;
+}
+interface ASPxClientCheckBoxListStatic extends ASPxClientCheckListBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientCheckBoxList;
+}
+interface ASPxClientProgressBarStatic extends ASPxClientEditBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientProgressBar;
+}
+interface ASPxClientSpinEditBaseStatic extends ASPxClientButtonEditBaseStatic {
+}
+interface ASPxClientSpinEditStatic extends ASPxClientSpinEditBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientSpinEdit;
+}
+interface ASPxClientTimeEditStatic extends ASPxClientSpinEditBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientTimeEdit;
+}
+interface ASPxClientStaticEditStatic extends ASPxClientEditBaseStatic {
+}
+interface ASPxClientHyperLinkStatic extends ASPxClientStaticEditStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientHyperLink;
+}
+interface ASPxClientImageBaseStatic extends ASPxClientStaticEditStatic {
+}
+interface ASPxClientImageStatic extends ASPxClientImageBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientImage;
+}
+interface ASPxClientLabelStatic extends ASPxClientStaticEditStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientLabel;
+}
+interface ASPxClientTextBoxStatic extends ASPxClientTextBoxBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientTextBox;
+}
+interface ASPxClientMemoStatic extends ASPxClientTextEditStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientMemo;
+}
+interface ASPxClientButtonEditStatic extends ASPxClientButtonEditBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientButtonEdit;
+}
+interface ASPxClientTokenBoxStatic extends ASPxClientComboBoxStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientTokenBox;
+}
+interface ASPxClientTrackBarStatic extends ASPxClientEditStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientTrackBar;
+}
+interface ASPxClientValidationSummaryStatic extends ASPxClientControlStatic {
+}
+interface ASPxClientGaugeControlStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientGaugeControl;
+}
+interface ASPxClientGridBaseStatic extends ASPxClientControlStatic {
+}
+interface ASPxClientGridViewCallbackCommandStatic {
+    /**
+     * Default value: "NEXTPAGE"
+     */
+    NextPage: string;
+    /**
+     * Default value: "PREVPAGE"
+     */
+    PreviousPage: string;
+    /**
+     * Default value: "GOTOPAGE"
+     */
+    GotoPage: string;
+    /**
+     * Default value: "SELECTROWS"
+     */
+    SelectRows: string;
+    /**
+     * Default value: "SELECTROWSKEY"
+     */
+    SelectRowsKey: string;
+    /**
+     * Default value: "SELECTION"
+     */
+    Selection: string;
+    /**
+     * Default value: "FOCUSEDROW"
+     */
+    FocusedRow: string;
+    /**
+     * Default value: "GROUP"
+     */
+    Group: string;
+    /**
+     * Default value: "UNGROUP"
+     */
+    UnGroup: string;
+    /**
+     * Default value: "SORT"
+     */
+    Sort: string;
+    /**
+     * Default value: "COLUMNMOVE"
+     */
+    ColumnMove: string;
+    /**
+     * Default value: "COLLAPSEALL"
+     */
+    CollapseAll: string;
+    /**
+     * Default value: "EXPANDALL"
+     */
+    ExpandAll: string;
+    /**
+     * Default value: "EXPANDROW"
+     */
+    ExpandRow: string;
+    /**
+     * Default value: "COLLAPSEROW"
+     */
+    CollapseRow: string;
+    /**
+     * Default value: "HIDEALLDETAIL"
+     */
+    HideAllDetail: string;
+    /**
+     * Default value: "SHOWALLDETAIL"
+     */
+    ShowAllDetail: string;
+    /**
+     * Default value: "SHOWDETAILROW"
+     */
+    ShowDetailRow: string;
+    /**
+     * Default value: "HIDEDETAILROW"
+     */
+    HideDetailRow: string;
+    /**
+     * Default value: "PAGERONCLICK"
+     */
+    PagerOnClick: string;
+    /**
+     * Default value: "APPLYFILTER"
+     */
+    ApplyFilter: string;
+    /**
+     * Default value: "APPLYCOLUMNFILTER"
+     */
+    ApplyColumnFilter: string;
+    /**
+     * Default value: "APPLYMULTICOLUMNFILTER"
+     */
+    ApplyMultiColumnFilter: string;
+    /**
+     * Default value: "APPLYHEADERCOLUMNFILTER"
+     */
+    ApplyHeaderColumnFilter: string;
+    /**
+     * Default value: "APPLYSEARCHPANELFILTER"
+     */
+    ApplySearchPanelFilter: string;
+    /**
+     * Default value: "APPLYCUSTOMIZATIONDIALOGCHANGES"
+     */
+    ApplyCustomizationDialogChanges: string;
+    /**
+     * Default value: "FILTERROWMENU"
+     */
+    FilterRowMenu: string;
+    /**
+     * Default value: "STARTEDIT"
+     */
+    StartEdit: string;
+    /**
+     * Default value: "CANCELEDIT"
+     */
+    CancelEdit: string;
+    /**
+     * Default value: "UPDATEEDIT"
+     */
+    UpdateEdit: string;
+    /**
+     * Default value: "ADDNEWROW"
+     */
+    AddNewRow: string;
+    /**
+     * Default value: "DELETEROW"
+     */
+    DeleteRow: string;
+    /**
+     * Default value: "CUSTOMBUTTON"
+     */
+    CustomButton: string;
+    /**
+     * Default value: "CUSTOMCALLBACK"
+     */
+    CustomCallback: string;
+    /**
+     * Default value: "SHOWFILTERCONTROL"
+     */
+    ShowFilterControl: string;
+    /**
+     * Default value: "CLOSEFILTERCONTROL"
+     */
+    CloseFilterControl: string;
+    /**
+     * Default value: "SETFILTERENABLED"
+     */
+    SetFilterEnabled: string;
+    /**
+     * Default value: "REFRESH"
+     */
+    Refresh: string;
+    /**
+     * Default value: "SELFIELDVALUES"
+     */
+    SelFieldValues: string;
+    /**
+     * Default value: "ROWVALUES"
+     */
+    RowValues: string;
+    /**
+     * Default value: "PAGEROWVALUES"
+     */
+    PageRowValues: string;
+    /**
+     * Default value: "FILTERPOPUP"
+     */
+    FilterPopup: string;
+    /**
+     * Default value: "CONTEXTMENU"
+     */
+    ContextMenu: string;
+    /**
+     * Default value: "TOOLBAR"
+     */
+    Toolbar: string;
+    /**
+     * Default value: "CUSTOMVALUES"
+     */
+    CustomValues: string;
+}
+interface ASPxClientGridLookupStatic extends ASPxClientDropDownEditBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientGridLookup;
+}
+interface ASPxClientCardViewStatic extends ASPxClientGridBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientCardView;
+}
+interface ASPxClientGridViewStatic extends ASPxClientGridBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientGridView;
+}
+interface ASPxClientVerticalGridStatic extends ASPxClientGridBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientVerticalGrid;
+}
+interface ASPxClientVerticalGridCallbackCommandStatic {
+    /**
+     * Default value: "EXPANDROW"
+     */
+    ExpandRow: string;
+}
+interface ASPxClientCommandConstsStatic {
+    /**
+     * Identifies a command that shows a search panel.
+     * Value: "showsearchpanel"
+     */
+    SHOWSEARCHPANEL_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Find and Replace dialog.
+     * Value: "findandreplacedialog"
+     */
+    FINDANDREPLACE_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that applies the bold text formatting to the selected text. If it's already applied, cancels it.
+     * Value: "bold"
+     */
+    BOLD_COMMAND: string;
+    /**
+     * Identifies a command that makes the selected text italic or regular type depending on the current state.
+     * Value: "italic"
+     */
+    ITALIC_COMMAND: string;
+    /**
+     * Identifies a command that applies the underline text formatting to the selected text. If it's already applied, cancels it.
+     * Value: "underline"
+     */
+    UNDERLINE_COMMAND: string;
+    /**
+     * Identifies a command that applies the strike through text formatting to the selected text. If it's already applied, cancels it.
+     * Value: "strikethrough"
+     */
+    STRIKETHROUGH_COMMAND: string;
+    /**
+     * Identifies a command that applies the superscript text formatting to the selected text. If it's already applied, cancels it.
+     * Value: "superscript"
+     */
+    SUPERSCRIPT_COMMAND: string;
+    /**
+     * Identifies a command that applies the subscript text formatting to the selected text. If it's already applied, cancels it.
+     * Value: "subscript"
+     */
+    SUBSCRIPT_COMMAND: string;
+    /**
+     * Identifies a command that centers the content of the currently focused paragraph.
+     * Value: "justifycenter"
+     */
+    JUSTIFYCENTER_COMMAND: string;
+    /**
+     * Identifies a command that left justifies the content of the currently focused paragraph.
+     * Value: "justifyleft"
+     */
+    JUSTIFYLEFT_COMMAND: string;
+    /**
+     * Identifies a command that creates an indent for the selected paragarph.
+     * Value: "indent"
+     */
+    INDENT_COMMAND: string;
+    /**
+     * Identifies a command that creates an outdent for the focused paragarph.
+     * Value: "outdent"
+     */
+    OUTDENT_COMMAND: string;
+    /**
+     * Identifies a command that right justifies the content of the currently focused paragraph.
+     * Value: "justifyright"
+     */
+    JUSTIFYRIGHT_COMMAND: string;
+    /**
+     * Identifies a command that fully justifies the content of the currently focused paragraph (aligned with both the left and right margines).
+     * Value: "justifyfull"
+     */
+    JUSTIFYFULL_COMMAND: string;
+    /**
+     * Identifies a command that changes the size of the selected text.
+     * Value: "fontsize"
+     */
+    FONTSIZE_COMMAND: string;
+    /**
+     * Identifies a command that changes the font of the selected text.
+     * Value: "fontname"
+     */
+    FONTNAME_COMMAND: string;
+    /**
+     * Identifies a command that changes the color of a fore color pickers and sets the selected text fore color.
+     * Value: "forecolor"
+     */
+    FONTCOLOR_COMMAND: string;
+    /**
+     * Identifies a command that changes the color of a back color pickers and sets the selected text back color.
+     * Value: "backcolor"
+     */
+    BACKCOLOR_COMMAND: string;
+    /**
+     * Identifies a command that wraps the selected paragraph in the specified html tag.
+     * Value: "formatblock"
+     */
+    FORMATBLOCK_COMMAND: string;
+    /**
+     * Identifies a command that wraps the currently selected text content in a specific html tag with a css class assigned to it.
+     * Value: "applycss"
+     */
+    APPLYCSS_COMMAND: string;
+    /**
+     * Identifies a command that removes all formatting from the selected content.
+     * Value: "removeformat"
+     */
+    REMOVEFORMAT_COMMAND: string;
+    /**
+     * Identifies a command that cancels the last action.
+     * Value: "undo"
+     */
+    UNDO_COMMAND: string;
+    /**
+     * Identifies a command that returns a previously canceled action.
+     * Value: "redo"
+     */
+    REDO_COMMAND: string;
+    /**
+     * Identifies a command that copies the selected content.
+     * Value: "copy"
+     */
+    COPY_COMMAND: string;
+    /**
+     * Identifies a command that pastes the content of the clipboard at the current cursor position.
+     * Value: "paste"
+     */
+    PASTE_COMMAND: string;
+    /**
+     * Identifies a command that pastes a specified content taking into account that it was copied from Word.
+     * Value: "pastefromword"
+     */
+    PASTEFROMWORD_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Paste from Word dialog.
+     * Value: "pastefromworddialog"
+     */
+    PASTEFROMWORDDIALOG_COMMAND: string;
+    /**
+     * Identifies a command that cuts the selected content.
+     * Value: "cut"
+     */
+    CUT_COMMAND: string;
+    /**
+     * Identifies a command that selects all content inside the html editor.
+     * Value: "selectall"
+     */
+    SELECT_ALL: string;
+    /**
+     * Identifies a command that deletes the selected content.
+     * Value: "delete"
+     */
+    DELETE_COMMAND: string;
+    /**
+     * Identifies a command that can be used to correctly insert HTML code into the editor.
+     * Value: "pastehtml"
+     */
+    PASTEHTML_COMMAND: string;
+    /**
+     * Identifies a command that inserts a new ordered list.
+     * Value: "insertorderedlist"
+     */
+    INSERTORDEREDLIST_COMMAND: string;
+    /**
+     * Identifies a command that inserts a new unordered list.
+     * Value: "insertunorderedlist"
+     */
+    INSERTUNORDEREDLIST_COMMAND: string;
+    /**
+     * Identifies a command that restarts the current ordered list.
+     * Value: "restartorderedlist"
+     */
+    RESTARTORDEREDLIST_COMMAND: string;
+    /**
+     * Identifies a command that continues a disrupted ordered list.
+     * Value: "continueorderedlist"
+     */
+    CONTINUEORDEREDLIST_COMMAND: string;
+    /**
+     * Identifies a command that removes a hyperlink from the selected text or image.
+     * Value: "unlink"
+     */
+    UNLINK_COMMAND: string;
+    /**
+     * Identifies a command that inserts a new hyperlink.
+     * Value: "insertlink"
+     */
+    INSERTLINK_COMMAND: string;
+    /**
+     * Identifies a command that inserts a new image.
+     * Value: "insertimage"
+     */
+    INSERTIMAGE_COMMAND: string;
+    /**
+     * Identifies a command that changes the selected image.
+     * Value: "changeimage"
+     */
+    CHANGEIMAGE_COMMAND: string;
+    /**
+     * Identifies a command that initiates spell checking.
+     * Value: "checkspelling"
+     */
+    CHECKSPELLING_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Insert Image dialog.
+     * Value: "insertimagedialog"
+     */
+    INSERTIMAGE_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Change Image dialog.
+     * Value: "changeimagedialog"
+     */
+    CHANGEIMAGE_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Insert Link dialog.
+     * Value: "insertlinkdialog"
+     */
+    INSERTLINK_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Change Link dialog.
+     * Value: "changelinkdialog"
+     */
+    CHANGELINK_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Insert Table dialog.
+     * Value: "inserttabledialog"
+     */
+    INSERTTABLE_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Table Properties dialog.
+     * Value: "tablepropertiesdialog"
+     */
+    TABLEPROPERTIES_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Cell Properties dialog.
+     * Value: "tablecellpropertiesdialog"
+     */
+    TABLECELLPROPERTIES_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Column Properties dialog.
+     * Value: "tablecolumnpropertiesdialog"
+     */
+    TABLECOLUMNPROPERTIES_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Row Properties dialog.
+     * Value: "tablerowpropertiesdialog"
+     */
+    TABLEROWPROPERTIES_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes a default browser Print dialog, allowing an end-user to print the content of the html editor.
+     * Value: "print"
+     */
+    PRINT_COMMAND: string;
+    /**
+     * Identifies a command that toggles the full-screen mode.
+     * Value: "fullscreen"
+     */
+    FULLSCREEN_COMMAND: string;
+    /**
+     * Identifies a command that inserts a new table.
+     * Value: "inserttable"
+     */
+    INSERTTABLE_COMMAND: string;
+    /**
+     * Identifies a command that changes the selected table.
+     * Value: "changetable"
+     */
+    CHANGETABLE_COMMAND: string;
+    /**
+     * Identifies a command that changes the selected table cell.
+     * Value: "changetablecell"
+     */
+    CHANGETABLECELL_COMMAND: string;
+    /**
+     * Identifies a command that changes the selected table row.
+     * Value: "changetablerow"
+     */
+    CHANGETABLEROW_COMMAND: string;
+    /**
+     * Identifies a command that changes the selected table column.
+     * Value: "changetablecolumn"
+     */
+    CHANGETABLECOLUMN_COMMAND: string;
+    /**
+     * Identifies a command that deletes the currently selected table.
+     * Value: "deletetable"
+     */
+    DELETETABLE_COMMAND: string;
+    /**
+     * Identifies a command that deletes the currently selected table row.
+     * Value: "deletetablerow"
+     */
+    DELETETABLEROW_COMMAND: string;
+    /**
+     * Identifies a command that deletes the currently selected table column.
+     * Value: "deletetablecolumn"
+     */
+    DELETETABLECOLUMN_COMMAND: string;
+    /**
+     * Identifies a command that inserts a new column to the left from the currently focused one.
+     * Value: "inserttablecolumntoleft"
+     */
+    INSERTTABLECOLUMNTOLEFT_COMMAND: string;
+    /**
+     * Identifies a command that inserts a new column to the right from the currently focused one.
+     * Value: "inserttablecolumntoright"
+     */
+    INSERTTABLECOLUMNTORIGHT_COMMAND: string;
+    /**
+     * Identifies a command that inserts a new row below the currently focused one.
+     * Value: "inserttablerowbelow"
+     */
+    INSERTTABLEROWBELOW_COMMAND: string;
+    /**
+     * Identifies a command that inserts a new row above the currently focused one.
+     * Value: "inserttablerowabove"
+     */
+    INSERTTABLEROWABOVE_COMMAND: string;
+    /**
+     * Identifies a command that splits the current table cell horizontally.
+     * Value: "splittablecellhorizontally"
+     */
+    SPLITTABLECELLHORIZONTALLY_COMMAND: string;
+    /**
+     * Identifies a command that splits the current table cell vertically.
+     * Value: "splittablecellvertically"
+     */
+    SPLITTABLECELLVERTICALLY_COMMAND: string;
+    /**
+     * Identifies a command that merges the focused table cell with the one to the right.
+     * Value: "mergetablecellright"
+     */
+    MERGETABLECELLRIGHT_COMMAND: string;
+    /**
+     * Identifies a command that merges the focused table cell with the one below.
+     * Value: "mergetablecelldown"
+     */
+    MERGETABLECELLDOWN_COMMAND: string;
+    /**
+     * Identifies a command that invokes a custom dialog.
+     * Value: "customdialog"
+     */
+    CUSTOMDIALOG_COMMAND: string;
+    /**
+     * Identifies a command that exports the html editor content.
+     * Value: "export"
+     */
+    EXPORT_COMMAND: string;
+    /**
+     * Identifies a command that inserts a new audio element.
+     * Value: "insertaudio"
+     */
+    INSERTAUDIO_COMMAND: string;
+    /**
+     * Identifies a command that inserts a new video.
+     * Value: "insertvideo"
+     */
+    INSERTVIDEO_COMMAND: string;
+    /**
+     * Identifies a command that inserts a new flash element.
+     * Value: "insertflash"
+     */
+    INSERTFLASH_COMMAND: string;
+    /**
+     * Identifies a command that inserts a new YouTube video.
+     * Value: "insertyoutubevideo"
+     */
+    INSERTYOUTUBEVIDEO_COMMAND: string;
+    /**
+     * Identifies a command that changes the selected audio element.
+     * Value: "changeaudio"
+     */
+    CHANGEAUDIO_COMMAND: string;
+    /**
+     * Identifies a command that changes the selected video element.
+     * Value: "changevideo"
+     */
+    CHANGEVIDEO_COMMAND: string;
+    /**
+     * Identifies a command that changes the selected flash element.
+     * Value: "changeflash"
+     */
+    CHANGEFLASH_COMMAND: string;
+    /**
+     * Identifies a command that changes the selected YouTube video element.
+     * Value: "changeyoutubevideo"
+     */
+    CHANGEYOUTUBEVIDEO_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Insert Audio dialog.
+     * Value: "insertaudiodialog"
+     */
+    INSERTAUDIO_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Insert Video dialog.
+     * Value: "insertvideodialog"
+     */
+    INSERTVIDEO_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Insert Flash dialog.
+     * Value: "insertflashdialog"
+     */
+    INSERTFLASH_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Insert YouTube Video dialog.
+     * Value: "insertyoutubevideodialog"
+     */
+    INSERTYOUTUBEVIDEO_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Change Audio dialog.
+     * Value: "changeaudiodialog"
+     */
+    CHANGEAUDIO_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Change Video dialog.
+     * Value: "changevideodialog"
+     */
+    CHANGEVIDEO_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Change Flash dialog.
+     * Value: "changeflash"
+     */
+    CHANGEFLASH_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Change YouTube Video dialog.
+     * Value: "changeyoutubevideodialog"
+     */
+    CHANGEYOUTUBEVIDEO_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that pastes the content of the clipboard to the current cursor position, taking into account that the PasteMode property is set to SourceFormatting.
+     * Value: "pastehtmlsourceformatting"
+     */
+    PASTEHTMLSOURCEFORMATTING_COMMAND: string;
+    /**
+     * Identifies a command that pastes the content of the clipboard to the current cursor position, taking into account that the PasteMode property is set to PlainText.
+     * Value: "pastehtmlplaintext"
+     */
+    PASTEHTMLPLAINTEXT_COMMAND: string;
+    /**
+     * Identifies a command that pastes the content of the clipboard to the current cursor position, taking into account that the PasteMode property is set to MergeFormatting.
+     * Value: "pastehtmlmergeformatting"
+     */
+    PASTEHTMLMERGEFORMATTING_COMMAND: string;
+    /**
+     * Identifies a command that inserts a new placeholder.
+     * Value: "insertplaceholder"
+     */
+    INSERTPLACEHOLDER_COMMAND: string;
+    /**
+     * Identifies a command that changes the selected placeholder.
+     * Value: "changeplaceholder"
+     */
+    CHANGEPLACEHOLDER_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Insert Placeholder dialog.
+     * Value: "insertplaceholderdialog"
+     */
+    INSERTPLACEHOLDER_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Change Placeholder dialog.
+     * Value: "changeplaceholderdialog"
+     */
+    CHANGEPLACEHOLDER_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that updates the editor content.
+     * Value: "updatedocument"
+     */
+    UPDATEDOCUMENT_COMMAND: string;
+    /**
+     * Identifies a command that changes properties of the element selected in the tag inspector.
+     * Value: "changeelementproperties"
+     */
+    CHANGEELEMENTPROPERTIES_COMMAND: string;
+    /**
+     * Identifies a command that invokes the Change Element Properties dialog.
+     * Value: "changeelementpropertiesdialog"
+     */
+    CHANGEELEMENTPROPERTIES_DIALOG_COMMAND: string;
+    /**
+     * Identifies a command that comments the selected HTML code. If no code is selected, it comments the focused tag.
+     * Value: "comment"
+     */
+    COMMENT_COMMAND: string;
+    /**
+     * Identifies a command that uncomments the selected HTML code. If no code is selected, the command uncomments the currently focused tag.
+     * Value: "uncomment"
+     */
+    UNCOMMENTHTML_COMMAND: string;
+    /**
+     * Identifies a command that formats the current HTML document.
+     * Value: "formatdocument"
+     */
+    FORMATDOCUMENT_COMMAND: string;
+    /**
+     * Identifies a command that applies the indent formatting to the selected content.
+     * Value: "indent"
+     */
+    INDENTLINE_COMMAND: string;
+    /**
+     * Identifies a command that applies the outdent formatting to the focused content.
+     * Value: "outdent"
+     */
+    OUTDENTLINE_COMMAND: string;
+    /**
+     * Identifies a command that collapses the selected HTML tag.
+     * Value: "collapsetag"
+     */
+    COLLAPSETAG_COMMAND: string;
+    /**
+     * Identifies a command that expands the selected HTML tag.
+     * Value: "expandtag"
+     */
+    EXPANDTAG_COMMAND: string;
+    /**
+     * Identifies a command that shows intellisense for the HTML code editor.
+     * Value: "showintellisense"
+     */
+    SHOWINTELLISENSE_COMMAND: string;
+}
+interface ASPxClientHtmlEditorStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientHtmlEditor;
+    /**
+     * Programmatically closes a custom dialog, supplying it with specific parameters.
+     * @param status An object representing a custom dialog's closing status.
+     * @param data An object representing custom data associated with a custom dialog.
+     */
+    CustomDialogComplete(status: Object, data: Object): void;
+}
+interface ASPxClientHtmlEditorMediaPreloadModeStatic {
+    /**
+     * The browser does not load a media file when the page loads.
+     */
+    None: string;
+    /**
+     * The browser loads the entire video when the page loads.
+     */
+    Auto: string;
+    /**
+     * The browser loads only metadata when the page loads.
+     */
+    Metadata: string;
+}
+interface ASPxClientPivotGridStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientPivotGrid;
+}
+interface ASPxClientPivotCustomizationStatic extends ASPxClientControlStatic {
+}
+interface ASPxClientRichEditStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientRichEdit;
+}
+interface ASPxSchedulerDateTimeHelperStatic {
+    /**
+     * Returns the date part of the specified DateTime value.
+     * @param date A DateTime object from which to extract the date.
+     */
+    TruncToDate(date: Date): Date;
+    /**
+     * Returns the day time part of the specified DateTime value.
+     * @param date A DateTime object from which to extract the day time.
+     */
+    ToDayTime(date: Date): any;
+    /**
+     * Adds the specified number of days to a DateTime object and returns the result.
+     * @param date A DateTime object to which to add days.
+     * @param dayCount The number of days to add.
+     */
+    AddDays(date: Date, dayCount: number): Date;
+    /**
+     * Adds the specified timespan to a DateTime object and returns the result.
+     * @param date A DateTime object to which to add a timespan.
+     * @param timeSpan A TimeSpan object specifying the timespan to add.
+     */
+    AddTimeSpan(date: Date, timeSpan: any): Date;
+    /**
+     * Rounds a DateTime value up to the nearest interval.
+     * @param date A DateTime object containing a value to round.
+     * @param spanInMs A TimeSpan object specifying an interval to which to round.
+     */
+    CeilDateTime(date: Date, spanInMs: any): Date;
+}
+interface ASPxClientWeekDaysCheckEditStatic extends ASPxClientControlStatic {
+}
+interface ASPxClientRecurrenceRangeControlStatic extends ASPxClientControlStatic {
+}
+interface ASPxClientRecurrenceControlBaseStatic extends ASPxClientControlStatic {
+}
+interface ASPxClientDailyRecurrenceControlStatic extends ASPxClientRecurrenceControlBaseStatic {
+}
+interface ASPxClientWeeklyRecurrenceControlStatic extends ASPxClientRecurrenceControlBaseStatic {
+}
+interface ASPxClientMonthlyRecurrenceControlStatic extends ASPxClientRecurrenceControlBaseStatic {
+}
+interface ASPxClientYearlyRecurrenceControlStatic extends ASPxClientRecurrenceControlBaseStatic {
+}
+interface ASPxClientRecurrenceTypeEditStatic extends ASPxClientRadioButtonListStatic {
+}
+interface ASPxClientTimeIntervalStatic {
+    /**
+     * Gets the duration of a time interval between two points in time.
+     * @param start A DateTime object specifying the starting point of the time interval.
+     * @param end A DateTime object specifying the ending point of the time interval.
+     */
+    CalculateDuration(start: Date, end: Date): number;
+}
+interface ASPxClientSchedulerStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientScheduler;
+}
+interface ASPxClientSpellCheckerStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientSpellChecker;
+}
+interface ASPxClientSpellCheckerStopCheckingReasonStatic {
+    /**
+     * Spell checking is finished normally.
+     */
+    Default: string;
+    /**
+     * The user stopped spell checking.
+     */
+    User: string;
+}
+interface ASPxClientSpreadsheetStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientSpreadsheet;
+}
+interface ASPxClientTreeListStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientTreeList;
+}
+interface BootstrapClientAccordionStatic extends ASPxClientNavBarStatic {
+}
+interface BootstrapClientBinaryImageStatic extends ASPxClientHyperLinkStatic {
+}
+interface BootstrapClientButtonStatic extends ASPxClientButtonStatic {
+}
+interface BootstrapClientCalendarStatic extends ASPxClientCalendarStatic {
+}
+interface BootstrapClientCallbackPanelStatic extends ASPxClientControlStatic {
+}
+interface BootstrapClientChartBaseStatic extends ASPxClientControlStatic {
+}
+interface BootstrapClientChartStatic extends BootstrapClientChartBaseStatic {
+}
+interface BootstrapClientPolarChartStatic extends BootstrapClientChartBaseStatic {
+}
+interface BootstrapClientPieChartStatic extends BootstrapClientChartBaseStatic {
+}
+interface BootstrapClientCheckBoxStatic extends ASPxClientEditStatic {
+}
+interface BootstrapClientRadioButtonStatic extends BootstrapClientCheckBoxStatic {
+}
+interface BootstrapClientComboBoxStatic extends ASPxClientComboBoxStatic {
+}
+interface BootstrapClientDateEditStatic extends ASPxClientDateEditStatic {
+}
+interface BootstrapClientDropDownEditStatic extends ASPxClientDropDownEditStatic {
+}
+interface BootstrapClientFormLayoutStatic extends ASPxClientFormLayoutStatic {
+}
+interface BootstrapClientHyperLinkStatic extends ASPxClientHyperLinkStatic {
+}
+interface BootstrapClientImageStatic extends ASPxClientImageStatic {
+}
+interface BootstrapClientListBoxStatic extends ASPxClientListBoxStatic {
+}
+interface BootstrapClientCheckBoxListStatic extends ASPxClientCheckBoxListStatic {
+}
+interface BootstrapClientRadioButtonListStatic extends ASPxClientRadioButtonListStatic {
+}
+interface BootstrapClientMenuStatic extends ASPxClientMenuStatic {
+}
+interface BootstrapClientPagerStatic extends ASPxClientPagerStatic {
+}
+interface BootstrapClientPopupControlStatic extends ASPxClientPopupControlStatic {
+}
+interface BootstrapClientPopupMenuStatic extends ASPxClientPopupMenuStatic {
+}
+interface BootstrapClientProgressBarStatic extends ASPxClientProgressBarStatic {
+}
+interface BootstrapClientSpinEditStatic extends ASPxClientSpinEditStatic {
+}
+interface BootstrapClientTabControlStatic extends ASPxClientTabControlStatic {
+}
+interface BootstrapClientPageControlStatic extends ASPxClientPageControlStatic {
+}
+interface BootstrapClientTextBoxStatic extends ASPxClientTextBoxStatic {
+}
+interface BootstrapClientMemoStatic extends ASPxClientMemoStatic {
+}
+interface BootstrapClientButtonEditStatic extends ASPxClientButtonEditStatic {
+}
+interface BootstrapClientTreeViewStatic extends ASPxClientTreeViewStatic {
+}
+interface BootstrapUIWidgetBaseStatic extends ASPxClientControlStatic {
+}
+interface BootstrapClientUploadControlStatic extends ASPxClientUploadControlStatic {
+}
+interface BootstrapClientGridViewStatic extends ASPxClientGridViewStatic {
+}
+interface MVCxClientCalendarStatic extends ASPxClientCalendarStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientCalendar;
+}
+interface MVCxClientCallbackPanelStatic extends ASPxClientCallbackPanelStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientCallbackPanel;
+}
+interface MVCxClientCardViewStatic extends ASPxClientCardViewStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientCardView;
+}
+interface MVCxClientChartStatic extends ASPxClientWebChartControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientChart;
+}
+interface MVCxClientComboBoxStatic extends ASPxClientComboBoxStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientComboBox;
+}
+interface MVCxClientDataViewStatic extends ASPxClientDataViewStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientDataView;
+}
+interface MVCxClientDateEditStatic extends ASPxClientDateEditStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientDateEdit;
+}
+interface MVCxClientDockManagerStatic extends ASPxClientDockManagerStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientDockManager;
+}
+interface MVCxClientDockPanelStatic extends ASPxClientDockPanelStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientDockPanel;
+}
+interface MVCxClientFileManagerStatic extends ASPxClientFileManagerStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientFileManager;
+}
+interface MVCxClientGridViewStatic extends ASPxClientGridViewStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientGridView;
+}
+interface MVCxClientHtmlEditorStatic extends ASPxClientHtmlEditorStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientHtmlEditor;
+}
+interface MVCxClientImageGalleryStatic extends ASPxClientImageGalleryStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientImageGallery;
+}
+interface MVCxClientListBoxStatic extends ASPxClientListBoxStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientListBox;
+}
+interface MVCxClientNavBarStatic extends ASPxClientNavBarStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientNavBar;
+}
+interface MVCxClientPivotGridStatic extends ASPxClientPivotGridStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientPivotGrid;
+}
+interface MVCxClientPopupControlStatic extends ASPxClientPopupControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientPopupControl;
+}
+interface MVCxClientDocumentViewerStatic extends ASPxClientDocumentViewerStatic {
+}
+interface MVCxClientReportViewerStatic extends ASPxClientReportViewerStatic {
+}
+interface MVCxClientReportDesignerStatic extends ASPxClientReportDesignerStatic {
+}
+interface MVCxClientRichEditStatic extends ASPxClientRichEditStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientRichEdit;
+}
+interface MVCxClientRoundPanelStatic extends ASPxClientRoundPanelStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientRoundPanel;
+}
+interface MVCxClientSchedulerStatic extends ASPxClientSchedulerStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientScheduler;
+}
+interface MVCxSchedulerToolTipTypeStatic {
+    /**
+     * The tooltip is displayed for a selected appointment.
+     */
+    Appointment: number;
+    /**
+     * The tooltip is displayed for a dragged appointment.
+     */
+    AppointmentDrag: number;
+    /**
+     * The tooltip is displayed for a selected time interval.
+     */
+    Selection: number;
+}
+interface MVCxClientSpreadsheetStatic extends ASPxClientSpreadsheetStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientSpreadsheet;
+}
+interface MVCxClientPageControlStatic extends ASPxClientPageControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientPageControl;
+}
+interface MVCxClientTokenBoxStatic extends ASPxClientTokenBoxStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientTokenBox;
+}
+interface MVCxClientTreeListStatic extends ASPxClientTreeListStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientTreeList;
+}
+interface MVCxClientTreeViewStatic extends ASPxClientTreeViewStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientTreeView;
+}
+interface MVCxClientUploadControlStatic extends ASPxClientUploadControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientUploadControl;
+}
+interface MVCxClientUtilsStatic {
+    /**
+     * Loads service resources (such as scripts, CSS files, etc.) required for DevExpress functionality to work properly after a non DevExpress callback has been processed on the server and returned back to the client.
+     */
+    FinalizeCallback(): void;
+    /**
+     * Returns values of editors placed in the specified container.
+     * @param containerOrId A container of editors, or its ID.
+     */
+    GetSerializedEditorValuesInContainer(containerOrId: Object): Object;
+    /**
+     * Returns values of editors placed in the specified container.
+     * @param containerOrId A container of editors, or its ID.
+     * @param processInvisibleEditors true to process both visible and invisible editors that belong to the specified container; false to process only visible editors.
+     */
+    GetSerializedEditorValuesInContainer(containerOrId: Object, processInvisibleEditors: boolean): Object;
+}
+interface MVCxClientGlobalEventsStatic {
+    /**
+     * Dynamically connects the ControlsInitialized client event with an appropriate event handler function.
+     * @param handler A object representing the event handling function's content.
+     */
+    AddControlsInitializedEventHandler(handler: ASPxClientControlsInitializedEventHandler<any>): void;
+    /**
+     * Dynamically connects the BeginCallback client event with an appropriate event handler function.
+     * @param handler A object containing the event handling function's content.
+     */
+    AddBeginCallbackEventHandler(handler: MVCxClientBeginCallbackEventHandler<any>): void;
+    /**
+     * Dynamically connects the EndCallback client event with an appropriate event handler function.
+     * @param handler A object containing the event handling function's content.
+     */
+    AddEndCallbackEventHandler(handler: ASPxClientEndCallbackEventHandler<any>): void;
+    /**
+     * Dynamically connects the CallbackError client event with an appropriate event handler function.
+     * @param handler A object containing the event handling function's content.
+     */
+    AddCallbackErrorHandler(handler: ASPxClientCallbackErrorEventHandler<any>): void;
+}
+interface MVCxClientVerticalGridStatic extends ASPxClientVerticalGridStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): MVCxClientVerticalGrid;
+}
+interface MVCxClientWebDocumentViewerStatic extends ASPxClientWebDocumentViewerStatic {
+}
+interface ASPxClientControlBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientControlBase;
+}
+interface ASPxClientControlStatic extends ASPxClientControlBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientControl;
+    /**
+     * Modifies the controls size on the page.
+     */
+    AdjustControls(): void;
+    /**
+     * Modifies the controls size within the specified container.
+     * @param container An HTML element that is the container of the controls.
+     */
+    AdjustControls(container: Object): void;
+    /**
+     * Returns a collection of client web control objects.
+     */
+    GetControlCollection(): ASPxClientControlCollection;
+}
+interface ASPxClientCallbackStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientCallback;
+}
+interface ASPxClientPanelBaseStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientPanelBase;
+}
+interface ASPxClientPanelStatic extends ASPxClientPanelBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientPanel;
+}
+interface ASPxClientCallbackPanelStatic extends ASPxClientPanelStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientCallbackPanel;
+}
+interface ASPxClientCloudControlStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientCloudControl;
+}
+interface ASPxClientDataViewStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientDataView;
+}
+interface ASPxClientDockManagerStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientDockManager;
+}
+interface ASPxClientPopupControlBaseStatic extends ASPxClientControlStatic {
+}
+interface ASPxClientDockPanelStatic extends ASPxClientPopupControlBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientDockPanel;
+}
+interface ASPxClientDockZoneStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientDockZone;
+}
+interface ASPxClientFileManagerStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientFileManager;
+}
+interface ASPxClientFileManagerCommandConstsStatic {
+    /**
+     * The name of a command that is executed when an end-user renames an item.
+     */
+    Rename: string;
+    /**
+     * The name of a command that is executed when an end-user moves an item.
+     */
+    Move: string;
+    /**
+     * The name of a command that is executed when an end-user deletes an item.
+     */
+    Delete: string;
+    /**
+     * The name of a command that is executed when an end-user creates a folder.
+     */
+    Create: string;
+    /**
+     * The name of a command that is executed when an end-user uploads a file.
+     */
+    Upload: string;
+    /**
+     * The name of a command that is executed when an end-user downloads an item.
+     */
+    Download: string;
+    /**
+     * The name of a command that is executed when an end-user copies an item.
+     */
+    Copy: string;
+    /**
+     * The name of a command that is executed when an end-user opens an item.
+     */
+    Open: string;
+}
+interface ASPxClientFileManagerErrorConstsStatic {
+    /**
+     * The specified file is not found.    Return Value: 0
+     */
+    FileNotFound: number;
+    /**
+     * The specified folder is not found.    Return Value: 1
+     */
+    FolderNotFound: number;
+    /**
+     * Access is denied.    Return Value: 2
+     */
+    AccessDenied: number;
+    /**
+     * Unspecified IO error occurs.    Return Value: 3
+     */
+    UnspecifiedIO: number;
+    /**
+     * Unspecified error occurs.    Return Value: 4
+     */
+    Unspecified: number;
+    /**
+     * The file/folder name is empty.    Return Value: 5
+     */
+    EmptyName: number;
+    /**
+     * The operation was canceled.    Return Value: 6
+     */
+    CanceledOperation: number;
+    /**
+     * The specified name contains invalid characters.    Return Value: 7
+     */
+    InvalidSymbols: number;
+    /**
+     * The specified file extension is not allowed.    Return Value: 8
+     */
+    WrongExtension: number;
+    /**
+     * The file/folder is being used by another process.    Return Value: 9
+     */
+    UsedByAnotherProcess: number;
+    /**
+     * The specified file/folder already exists.    Return Value: 10
+     */
+    AlreadyExists: number;
+}
+interface ASPxClientFormLayoutStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientFormLayout;
+}
+interface ASPxClientHiddenFieldStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientHiddenField;
+}
+interface ASPxClientHintStatic extends ASPxClientControlStatic {
+    /**
+     * Forces the hint to reselect target UI elements according to the specified CSS selector.
+     */
+    Update(): void;
+    /**
+     * Forces the hint to recalculate its position.
+     */
+    UpdatePosition(): void;
+    /**
+     * Forces the hint to recalculate its position.
+     * @param hintElementOrTargetElement An object that is the hint element or the target element.
+     */
+    UpdatePosition(hintElementOrTargetElement: Object): void;
+    /**
+     * Registers a hint's functionality with the specified settings.
+     * @param targetSelector A string value that is the CSS selector. Specifies to which UI elements the hint is displayed.
+     * @param options An ASPxClientHintOptions object that is the hint's options.
+     */
+    Register(targetSelector: string, options: ASPxClientHintOptions): ASPxClientHint;
+    /**
+     * Registers a hint's functionality with the specified settings.
+     * @param targetSelector A string value that is the CSS selector. Specifies to which UI elements the hint is displayed.
+     * @param contentAttribute A string value that is the attribute name. Specifies from which target element's attribute a hint obtains its content.
+     */
+    Register(targetSelector: string, contentAttribute: string): ASPxClientHint;
+    /**
+     * Registers a hint's functionality with the specified settings.
+     * @param targetSelector A string value that is the CSS selector. Specifies for which UI elements the hint is displayed.
+     * @param onShowing An ASPxClientHintShowingEventHandler object that is a handler for the displayed event.
+     */
+    Register(targetSelector: string, onShowing: ASPxClientHintShowingEventHandler): ASPxClientHint;
+    /**
+     * Invokes a hint.
+     * @param targetSelector A string value that is the CSS selector.
+     * @param options An ASPxClientHintOptions object that is the hint's options.
+     */
+    Show(targetSelector: string, options: ASPxClientHintOptions): void;
+    /**
+     * Invokes a hint.
+     * @param targetSelector A string value that is the CSS selector used to specify for which UI elements on a web page a hint is displayed.
+     * @param content A string value that is the hint's content.
+     */
+    Show(targetSelector: string, content: string): void;
+    /**
+     * Invokes a hint.
+     * @param targetElement An object that is the target element.
+     * @param options An ASPxClientHintOptions object that is the hint's options.
+     */
+    Show(targetElement: Object, options: ASPxClientHintOptions): void;
+    /**
+     * Invokes a hint.
+     * @param targetElement A HTML DOM element near to which the hint is displayed in response to user interaction.
+     * @param content A string value that is the hint's content.
+     */
+    Show(targetElement: Object, content: string): void;
+    /**
+     * Invokes a hint.
+     * @param options An ASPxClientHintOptions object that is the hint's options.
+     */
+    Show(options: ASPxClientHintOptions): void;
+    /**
+     * Hides a hint window.
+     * @param targetSelector A string value that is the CSS selector.
+     */
+    Hide(targetSelector: string): void;
+    /**
+     * Hides a hint window.
+     * @param targetElementOrHintElement An object that is the target element or hint element.
+     */
+    Hide(targetElementOrHintElement: Object): void;
+    /**
+     * Hides all hints.
+     */
+    HideAll(): void;
+}
+interface ASPxClientImageGalleryStatic extends ASPxClientDataViewStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientImageGallery;
+}
+interface ASPxClientImageSliderStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientImageSlider;
+}
+interface ASPxClientImageZoomNavigatorStatic extends ASPxClientImageSliderStatic {
+}
+interface ASPxClientImageZoomStatic extends ASPxClientControlStatic {
+}
+interface ASPxClientLoadingPanelStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientLoadingPanel;
+}
+interface ASPxClientMediaFileSelectorStatic extends ASPxClientControlStatic {
+}
+interface ASPxClientMenuBaseStatic extends ASPxClientControlStatic {
+    /**
+     * Returns a collection of client menu objects.
+     */
+    GetMenuCollection(): ASPxClientMenuCollection;
+}
+interface ASPxClientMenuStatic extends ASPxClientMenuBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientMenu;
+}
+interface ASPxClientTouchUIStatic {
+    /**
+     * Extends the specified element's functionality with scrolling via touch behavior (one finger) and the ability to display vertical and horizontal scroll bars.
+     * @param id A string value specifying the element's ID.
+     */
+    MakeScrollable(id: string): ScrollExtender;
+    /**
+     * Extends the specified element's functionality with scrolling via touch behavior (one finger) and the ability to display vertical and horizontal scroll bars.
+     * @param element An object that specifies the required DOM element.
+     */
+    MakeScrollable(element: Object): ScrollExtender;
+    /**
+     * Extends the specified element's functionality with  scrolling via touch behavior (one finger) and customized scrollbar-related options.
+     * @param id A string value specifying the name of a DOM element that should be extended with the touch scrolling functionality.
+     * @param options An ASPxClientTouchUIOptions object that provides options affecting the touch scrolling functionality.
+     */
+    MakeScrollable(id: string, options: ASPxClientTouchUIOptions): ScrollExtender;
+    /**
+     * Extends the specified element's functionality with scrolling via touch behavior (one finger) and customized scrollbar-related options.
+     * @param element An object specifying the DOM element to extend with the touch scrolling functionality.
+     * @param options An ASPxClientTouchUIOptions object that provides options affecting the touch scrolling functionality.
+     */
+    MakeScrollable(element: Object, options: ASPxClientTouchUIOptions): ScrollExtender;
+}
+interface ASPxClientNavBarStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientNavBar;
+}
+interface ASPxClientNewsControlStatic extends ASPxClientDataViewStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientNewsControl;
+}
+interface ASPxClientObjectContainerStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientObjectContainer;
+}
+interface ASPxClientPagerStatic extends ASPxClientControlStatic {
+}
+interface ASPxClientPopupControlStatic extends ASPxClientPopupControlBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientPopupControl;
+    /**
+     * Returns a collection of client popup control objects.
+     */
+    GetPopupControlCollection(): ASPxClientPopupControlCollection;
+}
+interface ASPxClientPopupControlResizeStateStatic {
+    /**
+     * A window has been resized. Returns 0.
+     */
+    Resized: number;
+    /**
+     * A window has been collapsed. Returns 1.
+     */
+    Collapsed: number;
+    /**
+     * A window has been expanded. Returns 2.
+     */
+    Expanded: number;
+    /**
+     * A window has been maximized. Returns 3.
+     */
+    Maximized: number;
+    /**
+     * A window has been restored after maximizing. Returns 4.
+     */
+    RestoredAfterMaximized: number;
+}
+interface ASPxClientPopupControlCloseReasonStatic {
+    /**
+     * The window has been closed by an API.
+     */
+    API: string;
+    /**
+     * An end-user clicks the close header button.
+     */
+    CloseButton: string;
+    /**
+     * An end-user clicks outside the window's region
+     */
+    OuterMouseClick: string;
+    /**
+     * An end-user moves the mouse pointer out of the window region.
+     */
+    MouseOut: string;
+    /**
+     * An end-user presses the ESC key.
+     */
+    Escape: string;
+}
+interface ASPxClientPopupMenuStatic extends ASPxClientMenuBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientPopupMenu;
+}
+interface ASPxClientRatingControlStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientRatingControl;
+}
+interface ASPxClientRibbonStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientRibbon;
+}
+interface ASPxClientRibbonStateStatic {
+    /**
+     * A ribbon is in the normal state. Returns 0
+     */
+    Normal: number;
+    /**
+     * A ribbon is minimized. Returns 1
+     */
+    Minimized: number;
+    /**
+     * A ribbon is temporarily shown. Returns 2
+     */
+    TemporaryShown: number;
+}
+interface ASPxClientRoundPanelStatic extends ASPxClientPanelBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientRoundPanel;
+}
+interface ASPxClientSplitterStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientSplitter;
+}
+interface ASPxClientTabControlBaseStatic extends ASPxClientControlStatic {
+}
+interface ASPxClientTabControlStatic extends ASPxClientTabControlBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientTabControl;
+}
+interface ASPxClientPageControlStatic extends ASPxClientTabControlBaseStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientPageControl;
+}
+interface ASPxClientTimerStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientTimer;
+}
+interface ASPxClientTitleIndexStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientTitleIndex;
+}
+interface ASPxClientTreeViewStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientTreeView;
+}
+interface ASPxClientUploadControlStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientUploadControl;
+}
+interface ASPxClientUploadControlValidationErrorTypeConstsStatic {
+    /**
+     * The allowed maximum file size is exceeded.  Return Value: 1
+     */
+    MaxFileSizeExceeded: number;
+    /**
+     * The file's extension is not allowed.  Return Value: 2
+     */
+    NotAllowedFileExtension: number;
+    /**
+     * The allowed maximum count of the files is exceeded.  Return Value: 3
+     */
+    MaxFileCountExceeded: number;
+    /**
+     * A file name contains invalid character.Return Value: 4
+     */
+    FileNameContainsInvalidCharacter: number;
+}
+interface ASPxClientUtilsStatic {
+    /**
+     * Gets the user-agent string, which identifies the client browser and provides certain system details of the client computer.
+     * Value: A string value representing the browser's user-agent string.
+     */
+    agent: string;
+    /**
+     * Gets a value that specifies whether the client browser is Opera.
+     * Value: true if the client browser is Opera; otherwise, false.
+     */
+    opera: boolean;
+    /**
+     * Gets a value that specifies whether the client browser is Opera version 9.
+     * Value: true if the client browser is Opera version 9; otherwise, false.
+     */
+    opera9: boolean;
+    /**
+     * Gets a value that specifies whether the client browser is Safari.
+     * Value: true if the client browser is Safari; otherwise, false.
+     */
+    safari: boolean;
+    /**
+     * Gets a value that specifies whether the client browser is Safari version 3.
+     * Value: true if the client browser is Safari version 3; otherwise, false.
+     */
+    safari3: boolean;
+    /**
+     * Gets a value that specifies whether the client browser is Safari, running under a MacOS operating system.
+     * Value: true if the client browser is Safari, running under a MacOS operating system; otherwise, false.
+     */
+    safariMacOS: boolean;
+    /**
+     * Gets a value that specifies whether the client browser is Google Chrome.
+     * Value: true if the client browser is Google Chrome; otherwise, false.
+     */
+    chrome: boolean;
+    /**
+     * Gets a value that specifies whether the client browser is Internet Explorer.
+     * Value: true if the client browser is Intenet Explorer; otherwise, false.
+     */
+    ie: boolean;
+    /**
+     * Gets a value that specifies whether the client browser is Internet Explorer version 7.
+     * Value: true if the client browser is Intenet Explorer version 7; otherwise, false.
+     */
+    ie7: boolean;
+    /**
+     * Gets a value that specifies whether the client browser is Firefox.
+     * Value: true if the client browser is Firefox; otherwise, false.
+     */
+    firefox: boolean;
+    /**
+     * Gets a value that specifies whether the client browser is Firefox version 3.
+     * Value: true if the client browser is Firefox version 3; otherwise, false.
+     */
+    firefox3: boolean;
+    /**
+     * Gets a value that specifies whether the client browser is Mozilla.
+     * Value: true if the client browser is Mozilla; otherwise, false.
+     */
+    mozilla: boolean;
+    /**
+     * Gets a value that specifies whether the client browser is Netscape.
+     * Value: true if the client browser is Netscape; otherwise, false.
+     */
+    netscape: boolean;
+    /**
+     * Gets a value that specifies a client browser's full version.
+     * Value: A double precision floating-point value that specifies a client browser's version.
+     */
+    browserVersion: number;
+    /**
+     * Gets a value that specifies a client browser's major version.
+     * Value: An integer value that specifies a client browser's major version.
+     */
+    browserMajorVersion: number;
+    /**
+     * Gets a value that specifies whether the application is run under a MacOS platform.
+     * Value: true if the application is run under the MacOS platform; otherwise, false.
+     */
+    macOSPlatform: boolean;
+    /**
+     * Gets a value that specifies whether the application is run under the Windows platform.
+     * Value: true if the application is run under the Windows platform; otherwise, false.
+     */
+    windowsPlatform: boolean;
+    /**
+     * Gets a value that specifies whether a client browser is based on WebKit.
+     * Value: true if the client browser is based on WebKit; otherwise, false.
+     */
+    webKitFamily: boolean;
+    /**
+     * Gets a value that specifies whether a client browser is based on Netscape.
+     * Value: true if client browser is based on Netscape; otherwise, false.
+     */
+    netscapeFamily: boolean;
+    /**
+     * Gets a value that specifies whether the client browser supports touch.
+     * Value: true if the client browser supports touch; otherwise, false.
+     */
+    touchUI: boolean;
+    /**
+     * Gets a value that specifies whether the client browser supports the WebKit touch user interface.
+     * Value: true if the client browser supports the WebKit touch user interface; otherwise, false.
+     */
+    webKitTouchUI: boolean;
+    /**
+     * Gets a value that specifies whether the client browser supports the Microsoft touch user interface.
+     * Value: true if the client browser supports the Microsoft touch user interface; otherwise, false.
+     */
+    msTouchUI: boolean;
+    /**
+     * Gets a value that specifies whether the application is run under an iOS platform.
+     * Value: true if the application is run under the iOS platform; otherwise, false.
+     */
+    iOSPlatform: boolean;
+    /**
+     * Gets a value that specifies whether the application is run under the Android platform.
+     * Value: true if the application is run under the Android platform; otherwise, false.
+     */
+    androidPlatform: boolean;
+    /**
+     * Inserts the specified item into the specified array object.
+     * @param array An object that specifies the array to manipulate.
+     * @param element An object that specifies the array item to insert.
+     */
+    ArrayInsert(array: Object[], element: Object): void;
+    /**
+     * Removes the specified item from the specified array object.
+     * @param array An object that specifies the array to manipulate.
+     * @param element An object that specifies the array item to remove.
+     */
+    ArrayRemove(array: Object[], element: Object): void;
+    /**
+     * Removes an item at the specified index location from the specified array object.
+     * @param array An object that specifies the array to manipulate.
+     * @param index The zero-based index location of the array item to remove.
+     */
+    ArrayRemoveAt(array: Object[], index: number): void;
+    /**
+     * Removes all items from the specified array object.
+     * @param array An object that specifies the array to manipulate.
+     */
+    ArrayClear(array: Object[]): void;
+    /**
+     * Searches for the specified array item and returns the zero-based index of its first occurrence within the specified array object.
+     * @param array An object that specifies the array to manipulate.
+     * @param element An object that specifies the array item to locate.
+     */
+    ArrayIndexOf(array: Object[], element: Object): number;
+    /**
+     * Binds the specified function to a specific element's event, so that the function gets called whenever the event fires on the element.
+     * @param element An object specifying the required element.
+     * @param eventName A string value that specifies the required event name without the "on" prefix.
+     * @param method An object that specifies the event's handling function.
+     */
+    AttachEventToElement(element: Object, eventName: string, method: Object): void;
+    /**
+     * Unbinds the specified function from a specific element's event, so that the function stops receiving notifications when the event fires.
+     * @param element An object specifying the required element.
+     * @param eventName A string value that specifies the required event name.
+     * @param method An object that specifies the event's handling function.
+     */
+    DetachEventFromElement(element: Object, eventName: string, method: Object): void;
+    /**
+     * Returns the object that fired the event.
+     * @param htmlEvent An object that represents the current event.
+     */
+    GetEventSource(htmlEvent: Object): Object;
+    /**
+     * Gets the x-coordinate of the event-related mouse pointer position relative to an end-user's screen.
+     * @param htmlEvent An object specifying the required HTML event.
+     */
+    GetEventX(htmlEvent: Object): number;
+    /**
+     * Gets the y-coordinate of the event-related mouse pointer position relative to an end-user's screen.
+     * @param htmlEvent An object specifying the required HTML event.
+     */
+    GetEventY(htmlEvent: Object): number;
+    /**
+     * Gets the keyboard code for the specified event.
+     * @param htmlEvent An object specifying the required HTML event.
+     */
+    GetKeyCode(htmlEvent: Object): number;
+    /**
+     * Cancels the default action of the specified event.
+     * @param htmlEvent An object that specifies the required HTML event.
+     */
+    PreventEvent(htmlEvent: Object): boolean;
+    /**
+     * Cancels both the specified event's default action and the event's bubbling upon the hierarchy of event handlers.
+     * @param htmlEvent An object that specifies the required HTML event.
+     */
+    PreventEventAndBubble(htmlEvent: Object): boolean;
+    /**
+     * Removes mouse capture from the specified event's source object.
+     * @param htmlEvent An object that specifies the required HTML event.
+     */
+    PreventDragStart(htmlEvent: Object): boolean;
+    /**
+     * Clears any text selection made within the window's client region.
+     */
+    ClearSelection(): void;
+    /**
+     * Gets a value that indicates whether the specified object exists on the client side.
+     * @param obj The object to test.
+     */
+    IsExists(obj: Object): boolean;
+    /**
+     * Gets a value that indicates whether the specified object is a function.
+     * @param obj The object to test.
+     */
+    IsFunction(obj: Object): boolean;
+    /**
+     * Gets the x-coordinate of the specified element's top left corner relative to the client area of the window, excluding scroll bars.
+     * @param element An object identifying the HTML element whose position should be obtained.
+     */
+    GetAbsoluteX(element: Object): number;
+    /**
+     * Gets the y-coordinate of the specified element's top left corner relative to the client area of the window, excluding scroll bars.
+     * @param element An object identifying the HTML element whose position should be obtained.
+     */
+    GetAbsoluteY(element: Object): number;
+    /**
+     * Sets the x-coordinate of the specified element's top left corner relative to the client area of the window, excluding scroll bars.
+     * @param element An object identifying the HTML element whose position should be defined.
+     * @param x An integer value specifying the required element's x-coordinate, in pixels.
+     */
+    SetAbsoluteX(element: Object, x: number): void;
+    /**
+     * Sets the y-coordinate of the specified element's top left corner relative to the client area of the window, excluding scroll bars.
+     * @param element An object identifying the HTML element whose position should be defined.
+     * @param y An integer value specifying the required element's y-coordinate, in pixels.
+     */
+    SetAbsoluteY(element: Object, y: number): void;
+    /**
+     * Returns the distance between the top edge of the document and the topmost portion of the content currently visible in the window.
+     */
+    GetDocumentScrollTop(): number;
+    /**
+     * Returns the distance between the left edge of the document and the leftmost portion of the content currently visible in the window.
+     */
+    GetDocumentScrollLeft(): number;
+    /**
+     * Gets the width of the window's client region.
+     */
+    GetDocumentClientWidth(): number;
+    /**
+     * Gets the height of the window's client region.
+     */
+    GetDocumentClientHeight(): number;
+    /**
+     * Gets a value indicating whether the object passed via the parentElement parameter is a parent of the object passed via the element parameter.
+     * @param parentElement An object specifying the parent HTML element.
+     * @param element An object specifying the child HTML element.
+     */
+    GetIsParent(parentElement: Object, element: Object): boolean;
+    /**
+     * Returns a reference to the specified HTML element's first parent object which has an ID that matches the specified value.
+     * @param element An object specifying the child HTML element whose parent elements are searched.
+     * @param id A string specifying the required parent's ID.
+     */
+    GetParentById(element: Object, id: string): Object;
+    /**
+     * Returns a reference to the specified HTML element's first parent object whose element name matches the specified value.
+     * @param element An object specifying the child HTML element whose parent elements are searched.
+     * @param tagName A string value specifying the element name (tag name) of the desired HTML element.
+     */
+    GetParentByTagName(element: Object, tagName: string): Object;
+    /**
+     * Returns a reference to the specified HTML element's first parent object whose class name matches the specified value.
+     * @param element An object specifying the child HTML element whose parent elements are searched.
+     * @param className A string value specifying the class name of the desired HTML element.
+     */
+    GetParentByClassName(element: Object, className: string): Object;
+    /**
+     * Returns a reference to the first element that has the specified ID in the parent HTML element specified.
+     * @param element An object identifying the parent HTML element to search.
+     * @param id A string specifying the ID attribute value of the desired child element.
+     */
+    GetChildById(element: Object, id: string): Object;
+    /**
+     * Returns a reference to the particular element that has the specified element name and is contained within the specified parent HTML element.
+     * @param element An object specifying the parent HTML element to search.
+     * @param tagName A string value specifying the element name (tag name) of the desired HTML element.
+     * @param index An integer value specifying the zero-based index of the desired element amongst all the matching elements found.
+     */
+    GetChildByTagName(element: Object, tagName: string, index: number): Object;
+    /**
+     * Creates or updates the HTTP cookie for the response.
+     * @param name A string value that represents the name of a cookie.
+     * @param value A string representing the cookie value.
+     */
+    SetCookie(name: string, value: string): void;
+    /**
+     * Creates or updates the HTTP cookie for the response.
+     * @param name A string value that represents the name of a cookie.
+     * @param value A string representing the cookie value.
+     * @param expirationDate A date-time object that represents the expiration date and time for the cookie.
+     */
+    SetCookie(name: string, value: string, expirationDate: Date): void;
+    /**
+     * Retrieves a cookie with the specified name.
+     * @param name A string value that represents the name of a cookie.
+     */
+    GetCookie(name: string): string;
+    /**
+     * Deletes a cookie with the specified name.
+     * @param name A string value that represents the name of a cookie.
+     */
+    DeleteCookie(name: string): void;
+    /**
+     * Returns a specifically generated code that uniquely identifies the combination of keys specified via the parameters.
+     * @param keyCode An integer value that specifies the code of the key.
+     * @param isCtrlKey true if the CTRL key should be included into the key combination; otherwise, false.
+     * @param isShiftKey true if the SHIFT key should be included into the key combination; otherwise, false.
+     * @param isAltKey true if the ALT key should be included into the key combination; otherwise, false.
+     */
+    GetShortcutCode(keyCode: number, isCtrlKey: boolean, isShiftKey: boolean, isAltKey: boolean): number;
+    /**
+     * Returns a specifically generated code that uniquely identifies the pressed key combination, which is specified by the related HTML event.
+     * @param htmlEvent A DHTML event object that relates to a key combination being pressed.
+     */
+    GetShortcutCodeByEvent(htmlEvent: Object): number;
+    /**
+     * Returns a specifically generated code that uniquely identifies the combination of keys specified via the parameter.
+     * @param shortcutString A string value that specifies the key combination.
+     */
+    StringToShortcutCode(shortcutString: string): number;
+    /**
+     * Trims all leading and trailing whitespaces from the string.
+     * @param str A string value representing the string for trimming.
+     */
+    Trim(str: string): string;
+    /**
+     * Trims all leading whitespaces from the string.
+     * @param str A string value representing the string for trimming.
+     */
+    TrimStart(str: string): string;
+    /**
+     * Trims all trailing whitespaces from the string.
+     * @param str A string value representing the string for trimming.
+     */
+    TrimEnd(str: string): string;
+    /**
+     * Specifies the text that Assistive Technologies (screen readers or braille display, for example) will provide to a user.
+     * @param message A String value that specifies a text.
+     */
+    SendMessageToAssistiveTechnology(message: string): void;
+}
+interface ASPxClientChartDesignerStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientChartDesigner;
+}
+interface ASPxClientWebChartControlStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientWebChartControl;
+}
+interface ASPxClientDocumentViewerStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientDocumentViewer;
+}
+interface ASPxClientQueryBuilderStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientQueryBuilder;
+}
+interface ASPxClientReportDesignerStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientReportDesigner;
+}
+interface ASPxClientReportDocumentMapStatic extends ASPxClientControlStatic {
+}
+interface ASPxClientReportParametersPanelStatic extends ASPxClientControlStatic {
+}
+interface ASPxClientReportToolbarStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientReportToolbar;
+}
+interface ASPxClientReportViewerStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientReportViewer;
+}
+interface ASPxClientWebDocumentViewerStatic extends ASPxClientControlStatic {
+    /**
+     * Converts the specified object to the current object's type. This method is effective when you utilize the Client API IntelliSense feature provided by DevExpress.
+     * @param obj The client object to be type cast. Represents an instance of a DevExpress web control's client object.
+     */
+    Cast(obj: Object): ASPxClientWebDocumentViewer;
+}
+
+declare var MVCxClientDashboardViewer: MVCxClientDashboardViewerStatic;
+declare var DashboardDataAxisNames: DashboardDataAxisNamesStatic;
+declare var DashboardSpecialValues: DashboardSpecialValuesStatic;
+declare var DashboardExportPageLayout: DashboardExportPageLayoutStatic;
+declare var DashboardExportPaperKind: DashboardExportPaperKindStatic;
+declare var DashboardExportScaleMode: DashboardExportScaleModeStatic;
+declare var DashboardExportFilterState: DashboardExportFilterStateStatic;
+declare var DashboardStateExportPosition: DashboardStateExportPositionStatic;
+declare var DashboardStateExcelExportPosition: DashboardStateExcelExportPositionStatic;
+declare var DashboardExportImageFormat: DashboardExportImageFormatStatic;
+declare var ExcelExportFilterState: ExcelExportFilterStateStatic;
+declare var DashboardExportExcelFormat: DashboardExportExcelFormatStatic;
+declare var ChartExportSizeMode: ChartExportSizeModeStatic;
+declare var MapExportSizeMode: MapExportSizeModeStatic;
+declare var TreemapExportSizeMode: TreemapExportSizeModeStatic;
+declare var RangeFilterExportSizeMode: RangeFilterExportSizeModeStatic;
+declare var DashboardSelectionMode: DashboardSelectionModeStatic;
+declare var ASPxClientDashboard: ASPxClientDashboardStatic;
+declare var ASPxClientDashboardViewer: ASPxClientDashboardViewerStatic;
+declare var ASPxClientEditBase: ASPxClientEditBaseStatic;
+declare var ASPxClientEdit: ASPxClientEditStatic;
+declare var ASPxClientBinaryImage: ASPxClientBinaryImageStatic;
+declare var ASPxClientButton: ASPxClientButtonStatic;
+declare var ASPxClientCalendar: ASPxClientCalendarStatic;
+declare var ASPxClientCaptcha: ASPxClientCaptchaStatic;
+declare var ASPxClientCheckBox: ASPxClientCheckBoxStatic;
+declare var ASPxClientRadioButton: ASPxClientRadioButtonStatic;
+declare var ASPxClientTextEdit: ASPxClientTextEditStatic;
+declare var ASPxClientTextBoxBase: ASPxClientTextBoxBaseStatic;
+declare var ASPxClientButtonEditBase: ASPxClientButtonEditBaseStatic;
+declare var ASPxClientDropDownEditBase: ASPxClientDropDownEditBaseStatic;
+declare var ASPxClientColorEdit: ASPxClientColorEditStatic;
+declare var ASPxClientComboBox: ASPxClientComboBoxStatic;
+declare var ASPxClientDateEdit: ASPxClientDateEditStatic;
+declare var ASPxClientDropDownEdit: ASPxClientDropDownEditStatic;
+declare var ASPxClientFilterControl: ASPxClientFilterControlStatic;
+declare var ASPxClientListEdit: ASPxClientListEditStatic;
+declare var ASPxClientListBox: ASPxClientListBoxStatic;
+declare var ASPxClientCheckListBase: ASPxClientCheckListBaseStatic;
+declare var ASPxClientRadioButtonList: ASPxClientRadioButtonListStatic;
+declare var ASPxClientCheckBoxList: ASPxClientCheckBoxListStatic;
+declare var ASPxClientProgressBar: ASPxClientProgressBarStatic;
+declare var ASPxClientSpinEditBase: ASPxClientSpinEditBaseStatic;
+declare var ASPxClientSpinEdit: ASPxClientSpinEditStatic;
+declare var ASPxClientTimeEdit: ASPxClientTimeEditStatic;
+declare var ASPxClientStaticEdit: ASPxClientStaticEditStatic;
+declare var ASPxClientHyperLink: ASPxClientHyperLinkStatic;
+declare var ASPxClientImageBase: ASPxClientImageBaseStatic;
+declare var ASPxClientImage: ASPxClientImageStatic;
+declare var ASPxClientLabel: ASPxClientLabelStatic;
+declare var ASPxClientTextBox: ASPxClientTextBoxStatic;
+declare var ASPxClientMemo: ASPxClientMemoStatic;
+declare var ASPxClientButtonEdit: ASPxClientButtonEditStatic;
+declare var ASPxClientTokenBox: ASPxClientTokenBoxStatic;
+declare var ASPxClientTrackBar: ASPxClientTrackBarStatic;
+declare var ASPxClientValidationSummary: ASPxClientValidationSummaryStatic;
+declare var ASPxClientGaugeControl: ASPxClientGaugeControlStatic;
+declare var ASPxClientGridBase: ASPxClientGridBaseStatic;
+declare var ASPxClientGridViewCallbackCommand: ASPxClientGridViewCallbackCommandStatic;
+declare var ASPxClientGridLookup: ASPxClientGridLookupStatic;
+declare var ASPxClientCardView: ASPxClientCardViewStatic;
+declare var ASPxClientGridView: ASPxClientGridViewStatic;
+declare var ASPxClientVerticalGrid: ASPxClientVerticalGridStatic;
+declare var ASPxClientVerticalGridCallbackCommand: ASPxClientVerticalGridCallbackCommandStatic;
+declare var ASPxClientCommandConsts: ASPxClientCommandConstsStatic;
+declare var ASPxClientHtmlEditor: ASPxClientHtmlEditorStatic;
+declare var ASPxClientHtmlEditorMediaPreloadMode: ASPxClientHtmlEditorMediaPreloadModeStatic;
+declare var ASPxClientPivotGrid: ASPxClientPivotGridStatic;
+declare var ASPxClientPivotCustomization: ASPxClientPivotCustomizationStatic;
+declare var ASPxClientRichEdit: ASPxClientRichEditStatic;
+declare var ASPxSchedulerDateTimeHelper: ASPxSchedulerDateTimeHelperStatic;
+declare var ASPxClientWeekDaysCheckEdit: ASPxClientWeekDaysCheckEditStatic;
+declare var ASPxClientRecurrenceRangeControl: ASPxClientRecurrenceRangeControlStatic;
+declare var ASPxClientRecurrenceControlBase: ASPxClientRecurrenceControlBaseStatic;
+declare var ASPxClientDailyRecurrenceControl: ASPxClientDailyRecurrenceControlStatic;
+declare var ASPxClientWeeklyRecurrenceControl: ASPxClientWeeklyRecurrenceControlStatic;
+declare var ASPxClientMonthlyRecurrenceControl: ASPxClientMonthlyRecurrenceControlStatic;
+declare var ASPxClientYearlyRecurrenceControl: ASPxClientYearlyRecurrenceControlStatic;
+declare var ASPxClientRecurrenceTypeEdit: ASPxClientRecurrenceTypeEditStatic;
+declare var ASPxClientTimeInterval: ASPxClientTimeIntervalStatic;
+declare var ASPxClientScheduler: ASPxClientSchedulerStatic;
+declare var ASPxClientSpellChecker: ASPxClientSpellCheckerStatic;
+declare var ASPxClientSpellCheckerStopCheckingReason: ASPxClientSpellCheckerStopCheckingReasonStatic;
+declare var ASPxClientSpreadsheet: ASPxClientSpreadsheetStatic;
+declare var ASPxClientTreeList: ASPxClientTreeListStatic;
+declare var BootstrapClientAccordion: BootstrapClientAccordionStatic;
+declare var BootstrapClientBinaryImage: BootstrapClientBinaryImageStatic;
+declare var BootstrapClientButton: BootstrapClientButtonStatic;
+declare var BootstrapClientCalendar: BootstrapClientCalendarStatic;
+declare var BootstrapClientCallbackPanel: BootstrapClientCallbackPanelStatic;
+declare var BootstrapClientChartBase: BootstrapClientChartBaseStatic;
+declare var BootstrapClientChart: BootstrapClientChartStatic;
+declare var BootstrapClientPolarChart: BootstrapClientPolarChartStatic;
+declare var BootstrapClientPieChart: BootstrapClientPieChartStatic;
+declare var BootstrapClientCheckBox: BootstrapClientCheckBoxStatic;
+declare var BootstrapClientRadioButton: BootstrapClientRadioButtonStatic;
+declare var BootstrapClientComboBox: BootstrapClientComboBoxStatic;
+declare var BootstrapClientDateEdit: BootstrapClientDateEditStatic;
+declare var BootstrapClientDropDownEdit: BootstrapClientDropDownEditStatic;
+declare var BootstrapClientFormLayout: BootstrapClientFormLayoutStatic;
+declare var BootstrapClientHyperLink: BootstrapClientHyperLinkStatic;
+declare var BootstrapClientImage: BootstrapClientImageStatic;
+declare var BootstrapClientListBox: BootstrapClientListBoxStatic;
+declare var BootstrapClientCheckBoxList: BootstrapClientCheckBoxListStatic;
+declare var BootstrapClientRadioButtonList: BootstrapClientRadioButtonListStatic;
+declare var BootstrapClientMenu: BootstrapClientMenuStatic;
+declare var BootstrapClientPager: BootstrapClientPagerStatic;
+declare var BootstrapClientPopupControl: BootstrapClientPopupControlStatic;
+declare var BootstrapClientPopupMenu: BootstrapClientPopupMenuStatic;
+declare var BootstrapClientProgressBar: BootstrapClientProgressBarStatic;
+declare var BootstrapClientSpinEdit: BootstrapClientSpinEditStatic;
+declare var BootstrapClientTabControl: BootstrapClientTabControlStatic;
+declare var BootstrapClientPageControl: BootstrapClientPageControlStatic;
+declare var BootstrapClientTextBox: BootstrapClientTextBoxStatic;
+declare var BootstrapClientMemo: BootstrapClientMemoStatic;
+declare var BootstrapClientButtonEdit: BootstrapClientButtonEditStatic;
+declare var BootstrapClientTreeView: BootstrapClientTreeViewStatic;
+declare var BootstrapUIWidgetBase: BootstrapUIWidgetBaseStatic;
+declare var BootstrapClientUploadControl: BootstrapClientUploadControlStatic;
+declare var BootstrapClientGridView: BootstrapClientGridViewStatic;
+declare var MVCxClientCalendar: MVCxClientCalendarStatic;
+declare var MVCxClientCallbackPanel: MVCxClientCallbackPanelStatic;
+declare var MVCxClientCardView: MVCxClientCardViewStatic;
+declare var MVCxClientChart: MVCxClientChartStatic;
+declare var MVCxClientComboBox: MVCxClientComboBoxStatic;
+declare var MVCxClientDataView: MVCxClientDataViewStatic;
+declare var MVCxClientDateEdit: MVCxClientDateEditStatic;
+declare var MVCxClientDockManager: MVCxClientDockManagerStatic;
+declare var MVCxClientDockPanel: MVCxClientDockPanelStatic;
+declare var MVCxClientFileManager: MVCxClientFileManagerStatic;
+declare var MVCxClientGridView: MVCxClientGridViewStatic;
+declare var MVCxClientHtmlEditor: MVCxClientHtmlEditorStatic;
+declare var MVCxClientImageGallery: MVCxClientImageGalleryStatic;
+declare var MVCxClientListBox: MVCxClientListBoxStatic;
+declare var MVCxClientNavBar: MVCxClientNavBarStatic;
+declare var MVCxClientPivotGrid: MVCxClientPivotGridStatic;
+declare var MVCxClientPopupControl: MVCxClientPopupControlStatic;
+declare var MVCxClientDocumentViewer: MVCxClientDocumentViewerStatic;
+declare var MVCxClientReportViewer: MVCxClientReportViewerStatic;
+declare var MVCxClientReportDesigner: MVCxClientReportDesignerStatic;
+declare var MVCxClientRichEdit: MVCxClientRichEditStatic;
+declare var MVCxClientRoundPanel: MVCxClientRoundPanelStatic;
+declare var MVCxClientScheduler: MVCxClientSchedulerStatic;
+declare var MVCxSchedulerToolTipType: MVCxSchedulerToolTipTypeStatic;
+declare var MVCxClientSpreadsheet: MVCxClientSpreadsheetStatic;
+declare var MVCxClientPageControl: MVCxClientPageControlStatic;
+declare var MVCxClientTokenBox: MVCxClientTokenBoxStatic;
+declare var MVCxClientTreeList: MVCxClientTreeListStatic;
+declare var MVCxClientTreeView: MVCxClientTreeViewStatic;
+declare var MVCxClientUploadControl: MVCxClientUploadControlStatic;
+declare var MVCxClientUtils: MVCxClientUtilsStatic;
+declare var MVCxClientGlobalEvents: MVCxClientGlobalEventsStatic;
+declare var MVCxClientVerticalGrid: MVCxClientVerticalGridStatic;
+declare var MVCxClientWebDocumentViewer: MVCxClientWebDocumentViewerStatic;
+declare var ASPxClientControlBase: ASPxClientControlBaseStatic;
+declare var ASPxClientControl: ASPxClientControlStatic;
+declare var ASPxClientCallback: ASPxClientCallbackStatic;
+declare var ASPxClientPanelBase: ASPxClientPanelBaseStatic;
+declare var ASPxClientPanel: ASPxClientPanelStatic;
+declare var ASPxClientCallbackPanel: ASPxClientCallbackPanelStatic;
+declare var ASPxClientCloudControl: ASPxClientCloudControlStatic;
+declare var ASPxClientDataView: ASPxClientDataViewStatic;
+declare var ASPxClientDockManager: ASPxClientDockManagerStatic;
+declare var ASPxClientPopupControlBase: ASPxClientPopupControlBaseStatic;
+declare var ASPxClientDockPanel: ASPxClientDockPanelStatic;
+declare var ASPxClientDockZone: ASPxClientDockZoneStatic;
+declare var ASPxClientFileManager: ASPxClientFileManagerStatic;
+declare var ASPxClientFileManagerCommandConsts: ASPxClientFileManagerCommandConstsStatic;
+declare var ASPxClientFileManagerErrorConsts: ASPxClientFileManagerErrorConstsStatic;
+declare var ASPxClientFormLayout: ASPxClientFormLayoutStatic;
+declare var ASPxClientHiddenField: ASPxClientHiddenFieldStatic;
+declare var ASPxClientHint: ASPxClientHintStatic;
+declare var ASPxClientImageGallery: ASPxClientImageGalleryStatic;
+declare var ASPxClientImageSlider: ASPxClientImageSliderStatic;
+declare var ASPxClientImageZoomNavigator: ASPxClientImageZoomNavigatorStatic;
+declare var ASPxClientImageZoom: ASPxClientImageZoomStatic;
+declare var ASPxClientLoadingPanel: ASPxClientLoadingPanelStatic;
+declare var ASPxClientMediaFileSelector: ASPxClientMediaFileSelectorStatic;
+declare var ASPxClientMenuBase: ASPxClientMenuBaseStatic;
+declare var ASPxClientMenu: ASPxClientMenuStatic;
+declare var ASPxClientTouchUI: ASPxClientTouchUIStatic;
+declare var ASPxClientNavBar: ASPxClientNavBarStatic;
+declare var ASPxClientNewsControl: ASPxClientNewsControlStatic;
+declare var ASPxClientObjectContainer: ASPxClientObjectContainerStatic;
+declare var ASPxClientPager: ASPxClientPagerStatic;
+declare var ASPxClientPopupControl: ASPxClientPopupControlStatic;
+declare var ASPxClientPopupControlResizeState: ASPxClientPopupControlResizeStateStatic;
+declare var ASPxClientPopupControlCloseReason: ASPxClientPopupControlCloseReasonStatic;
+declare var ASPxClientPopupMenu: ASPxClientPopupMenuStatic;
+declare var ASPxClientRatingControl: ASPxClientRatingControlStatic;
+declare var ASPxClientRibbon: ASPxClientRibbonStatic;
+declare var ASPxClientRibbonState: ASPxClientRibbonStateStatic;
+declare var ASPxClientRoundPanel: ASPxClientRoundPanelStatic;
+declare var ASPxClientSplitter: ASPxClientSplitterStatic;
+declare var ASPxClientTabControlBase: ASPxClientTabControlBaseStatic;
+declare var ASPxClientTabControl: ASPxClientTabControlStatic;
+declare var ASPxClientPageControl: ASPxClientPageControlStatic;
+declare var ASPxClientTimer: ASPxClientTimerStatic;
+declare var ASPxClientTitleIndex: ASPxClientTitleIndexStatic;
+declare var ASPxClientTreeView: ASPxClientTreeViewStatic;
+declare var ASPxClientUploadControl: ASPxClientUploadControlStatic;
+declare var ASPxClientUploadControlValidationErrorTypeConsts: ASPxClientUploadControlValidationErrorTypeConstsStatic;
+declare var ASPxClientUtils: ASPxClientUtilsStatic;
+declare var ASPxClientChartDesigner: ASPxClientChartDesignerStatic;
+declare var ASPxClientWebChartControl: ASPxClientWebChartControlStatic;
+declare var ASPxClientDocumentViewer: ASPxClientDocumentViewerStatic;
+declare var ASPxClientQueryBuilder: ASPxClientQueryBuilderStatic;
+declare var ASPxClientReportDesigner: ASPxClientReportDesignerStatic;
+declare var ASPxClientReportDocumentMap: ASPxClientReportDocumentMapStatic;
+declare var ASPxClientReportParametersPanel: ASPxClientReportParametersPanelStatic;
+declare var ASPxClientReportToolbar: ASPxClientReportToolbarStatic;
+declare var ASPxClientReportViewer: ASPxClientReportViewerStatic;
+declare var ASPxClientWebDocumentViewer: ASPxClientWebDocumentViewerStatic;
+
diff --git a/types/devexpress-web/v171/tsconfig.json b/types/devexpress-web/v171/tsconfig.json
new file mode 100644
index 0000000000..af3cbffe0a
--- /dev/null
+++ b/types/devexpress-web/v171/tsconfig.json
@@ -0,0 +1,32 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "types": [],
+		"paths": {
+            "devexpress-web": [
+                "devexpress-web/v171"
+            ],
+            "devexpress-web/*": [
+                "devexpress-web/v171/*"
+            ]
+        },
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "devexpress-web-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/devexpress-web/v171/tslint.json b/types/devexpress-web/v171/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/devexpress-web/v171/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-declare-modifiers": false,
+        "trim-file": false,
+        "triple-equals": false,
+        "typedef-whitespace": false,
+        "unified-signatures": false,
+        "void-return": false,
+        "whitespace": false
+    }
+}

From eb6898062172020fb106893f64632d7b9056c8ed Mon Sep 17 00:00:00 2001
From: Tiger Oakes <tigeroakes@gmail.com>
Date: Mon, 9 Apr 2018 12:10:25 -0700
Subject: [PATCH 1149/1382] Added type definitions for svg-path-bounding-box
 (#23987)

---
 types/svg-path-bounding-box/index.d.ts        | 85 +++++++++++++++++++
 .../svg-path-bounding-box-tests.ts            | 22 +++++
 types/svg-path-bounding-box/tsconfig.json     | 23 +++++
 types/svg-path-bounding-box/tslint.json       |  1 +
 4 files changed, 131 insertions(+)
 create mode 100644 types/svg-path-bounding-box/index.d.ts
 create mode 100644 types/svg-path-bounding-box/svg-path-bounding-box-tests.ts
 create mode 100644 types/svg-path-bounding-box/tsconfig.json
 create mode 100644 types/svg-path-bounding-box/tslint.json

diff --git a/types/svg-path-bounding-box/index.d.ts b/types/svg-path-bounding-box/index.d.ts
new file mode 100644
index 0000000000..cf3754036b
--- /dev/null
+++ b/types/svg-path-bounding-box/index.d.ts
@@ -0,0 +1,85 @@
+// Type definitions for svg-path-bounding-box 1.0
+// Project: https://github.com/icons8/svg-path-bounding-box
+// Definitions by: Tiger Oakes <https://github.com/NotWoods>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = svgPathBoundingBox;
+
+declare function svgPathBoundingBox(
+    path: string,
+): svgPathBoundingBox.BoundingBoxView;
+
+declare namespace svgPathBoundingBox {
+    /**
+     * pass in initial points if you want
+     * @see https://github.com/gabelerner/canvg/blob/860e418aca67b9a41e858a223d74d375793ec364/canvg.js#L449
+     */
+    class BoundingBox {
+        x1: number;
+        y1: number;
+        x2: number;
+        y2: number;
+
+        constructor(x1: number, y1: number, x2: number, y2: number);
+
+        width(): number;
+
+        height(): number;
+
+        addPoint(x: number, y: number): void;
+
+        addX(x: number): void;
+
+        addY(y: number): void;
+
+        addQuadraticCurve(
+            p0x: number,
+            p0y: number,
+            p1x: number,
+            p1y: number,
+            p2x: number,
+            p2y: number,
+        ): void;
+
+        /** @see http://blog.hackers-cafe.net/2009/06/how-to-calculate-bezier-curves-bounding.html */
+        addBezierCurve(
+            p0x: number,
+            p0y: number,
+            p1x: number,
+            p1y: number,
+            p2x: number,
+            p2y: number,
+            p3x: number,
+            p3y: number,
+        ): void;
+    }
+
+    class BoundingBoxView {
+        x1: number;
+        y1: number;
+        x2: number;
+        y2: number;
+        minX: number;
+        minY: number;
+        maxX: number;
+        maxY: number;
+        width: number;
+        height: number;
+
+        constructor(boundingBox: BoundingBox);
+
+        round(precision?: number): this;
+
+        scale(scale?: number): this;
+
+        toString(): string;
+    }
+
+    class Path {
+        d: string;
+
+        constructor(d: string);
+
+        getBoundingBox(): BoundingBoxView;
+    }
+}
diff --git a/types/svg-path-bounding-box/svg-path-bounding-box-tests.ts b/types/svg-path-bounding-box/svg-path-bounding-box-tests.ts
new file mode 100644
index 0000000000..c381541c17
--- /dev/null
+++ b/types/svg-path-bounding-box/svg-path-bounding-box-tests.ts
@@ -0,0 +1,22 @@
+import * as svgPathBoundingBox from 'svg-path-bounding-box';
+
+const bbox = svgPathBoundingBox('M300,200 h-150 a150,150 0 1,0 150,-150 z');
+
+const x1: number = bbox.x1;
+const y1: number = bbox.y1;
+const x2: number = bbox.x2;
+const y2: number = bbox.y2;
+const minX: number = bbox.minX;
+const minY: number = bbox.minY;
+const maxX: number = bbox.maxX;
+const maxY: number = bbox.maxY;
+const width: number = bbox.width;
+const height: number = bbox.height;
+
+const rounded: svgPathBoundingBox.BoundingBoxView = bbox.round(2);
+const scaled: svgPathBoundingBox.BoundingBoxView = bbox.scale(2);
+const roundedString: string = rounded.toString();
+
+const path = new svgPathBoundingBox.Path('M300,200 h-150 a150,150 0 1,0 150,-150 z');
+const d: string = path.d;
+const bbox2: svgPathBoundingBox.BoundingBoxView = path.getBoundingBox();
diff --git a/types/svg-path-bounding-box/tsconfig.json b/types/svg-path-bounding-box/tsconfig.json
new file mode 100644
index 0000000000..6ff287f9b7
--- /dev/null
+++ b/types/svg-path-bounding-box/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "svg-path-bounding-box-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/svg-path-bounding-box/tslint.json b/types/svg-path-bounding-box/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/svg-path-bounding-box/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From b6afede767da957838c488059daab048641c8902 Mon Sep 17 00:00:00 2001
From: Xiaohan Zhang <hellochar@users.noreply.github.com>
Date: Mon, 9 Apr 2018 12:11:10 -0700
Subject: [PATCH 1150/1382] add clmtrackr types (#23837)

---
 types/clmtrackr/clmtrackr-tests.ts | 26 ++++++++++++++
 types/clmtrackr/index.d.ts         | 55 ++++++++++++++++++++++++++++++
 types/clmtrackr/tsconfig.json      | 24 +++++++++++++
 types/clmtrackr/tslint.json        |  1 +
 4 files changed, 106 insertions(+)
 create mode 100644 types/clmtrackr/clmtrackr-tests.ts
 create mode 100644 types/clmtrackr/index.d.ts
 create mode 100644 types/clmtrackr/tsconfig.json
 create mode 100644 types/clmtrackr/tslint.json

diff --git a/types/clmtrackr/clmtrackr-tests.ts b/types/clmtrackr/clmtrackr-tests.ts
new file mode 100644
index 0000000000..8a38e4361c
--- /dev/null
+++ b/types/clmtrackr/clmtrackr-tests.ts
@@ -0,0 +1,26 @@
+import clm from "clmtrackr";
+
+const ctracker = new clm.tracker();
+
+console.log(clm.version);
+
+ctracker.init({
+    constantVelocity: true,
+    searchWindow: 11,
+    useWebGL: true,
+    scoreThreshold: 0.50,
+    stopOnConvergence: false,
+    /** object with parameters for facedetection : */
+    faceDetection: { useWebWorkers: true}
+});
+
+const video = document.getElementsByTagName("video")[0];
+ctracker.start(video);
+const positions = ctracker.getCurrentPosition();
+if (positions) {
+    const canvas = document.getElementsByTagName("canvas")[0];
+    ctracker.draw(canvas);
+    positions.forEach(([x, y]) => {
+        const sum: number = x + y;
+    });
+}
diff --git a/types/clmtrackr/index.d.ts b/types/clmtrackr/index.d.ts
new file mode 100644
index 0000000000..a0c778ed00
--- /dev/null
+++ b/types/clmtrackr/index.d.ts
@@ -0,0 +1,55 @@
+// Type definitions for clmtrackr 1.1
+// Project: https://github.com/auduno/clmtrackr
+// Definitions by: hellochar <https://github.com/hellochar>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface TrackerParams {
+    /** whether to use constant velocity model when fitting (default is true) */
+    constantVelocity?: boolean;
+    /** the size of the searchwindow around each point (default is 11) */
+    searchWindow?: number;
+    /** whether to use webGL if it is available (default is true) */
+    useWebGL?: boolean;
+    /** threshold for when to assume we've lost tracking (default is 0.50) */
+    scoreThreshold?: number;
+    /** whether to stop tracking when the fitting has converged (default is false) */
+    stopOnConvergence?: boolean;
+    /** object with parameters for facedetection : */
+    faceDetection?: {
+        /** whether to use web workers for face detection (default is true) */
+        useWebWorkers?: boolean;
+    };
+}
+
+type IPosition = [number, number];
+
+type Model = any;
+
+declare namespace _default {
+    class tracker {
+        constructor(params?: TrackerParams);
+
+        init(model?: Model): void;
+
+        start(element: HTMLVideoElement | HTMLCanvasElement): void;
+
+        track(element: HTMLVideoElement | HTMLCanvasElement): IPosition[] | false;
+
+        reset(): void;
+
+        getConvergence(): number;
+
+        getCurrentParameters(): number[];
+
+        getCurrentPosition(): IPosition[] | false;
+
+        getScore(): number;
+
+        draw(canvas: HTMLCanvasElement): void;
+
+        setResponseMode(type: "single" | "cycle" | "blend", list: Array<"raw" | "sobel" | "lbp">): void;
+    }
+    const version: string;
+}
+
+export default _default;
diff --git a/types/clmtrackr/tsconfig.json b/types/clmtrackr/tsconfig.json
new file mode 100644
index 0000000000..54d471be5c
--- /dev/null
+++ b/types/clmtrackr/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "dom",
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "clmtrackr-tests.ts"
+    ]
+}
diff --git a/types/clmtrackr/tslint.json b/types/clmtrackr/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/clmtrackr/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 2a84417fe04a1eef9b1521a297352c992db93b28 Mon Sep 17 00:00:00 2001
From: Robert Hjalmers <hjalmers@users.noreply.github.com>
Date: Mon, 9 Apr 2018 21:12:38 +0200
Subject: [PATCH 1151/1382] added typings for swe-validation (#23778)

* Create index.d.ts

* Create tslint.json

* Create tsconfig.json

* Update index.d.ts

* used template

* fixed swe-validation typings and test
---
 types/swe-validation/index.d.ts              | 27 ++++++++++++++++++++
 types/swe-validation/swe-validation-tests.ts |  4 +++
 types/swe-validation/tsconfig.json           | 23 +++++++++++++++++
 types/swe-validation/tslint.json             |  1 +
 4 files changed, 55 insertions(+)
 create mode 100644 types/swe-validation/index.d.ts
 create mode 100644 types/swe-validation/swe-validation-tests.ts
 create mode 100644 types/swe-validation/tsconfig.json
 create mode 100644 types/swe-validation/tslint.json

diff --git a/types/swe-validation/index.d.ts b/types/swe-validation/index.d.ts
new file mode 100644
index 0000000000..34dad38f44
--- /dev/null
+++ b/types/swe-validation/index.d.ts
@@ -0,0 +1,27 @@
+// Type definitions for swe-validation 1.0
+// Project: https://github.com/keype/swe-validation
+// Definitions by: Robert Hjalmers <https://github.com/hjalmers>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface cin {
+    isValid: boolean;
+    corporation: {
+        type: string;
+        id: string;
+    };
+}
+
+interface ssn {
+    isValid: boolean;
+    person?: {
+        type: string;
+        sex: string;
+        ssn: string;
+    };
+}
+
+declare let validate: {
+    ssn(number: number): ssn;
+    cin(number: number): cin;
+};
+export = validate;
diff --git a/types/swe-validation/swe-validation-tests.ts b/types/swe-validation/swe-validation-tests.ts
new file mode 100644
index 0000000000..0615fd9f83
--- /dev/null
+++ b/types/swe-validation/swe-validation-tests.ts
@@ -0,0 +1,4 @@
+import validate = require("swe-validation");
+
+const corporateId = validate.cin(5500123456);
+const personalId = validate.ssn(192301120123);
diff --git a/types/swe-validation/tsconfig.json b/types/swe-validation/tsconfig.json
new file mode 100644
index 0000000000..b4943f9dd7
--- /dev/null
+++ b/types/swe-validation/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "swe-validation-tests.ts"
+    ]
+}
diff --git a/types/swe-validation/tslint.json b/types/swe-validation/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/swe-validation/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From dfc686e26664b77dda1130c85573ae2fbf53e078 Mon Sep 17 00:00:00 2001
From: Rajab Shakirov <radzikSH@gmail.com>
Date: Mon, 9 Apr 2018 22:14:07 +0300
Subject: [PATCH 1152/1382] [pdfmake] add definitions for pdfmake (#23555)

---
 types/pdfmake/index.d.ts       | 70 ++++++++++++++++++++++++++++++++++
 types/pdfmake/pdfmake-tests.ts | 10 +++++
 types/pdfmake/tsconfig.json    | 24 ++++++++++++
 types/pdfmake/tslint.json      |  6 +++
 4 files changed, 110 insertions(+)
 create mode 100644 types/pdfmake/index.d.ts
 create mode 100644 types/pdfmake/pdfmake-tests.ts
 create mode 100644 types/pdfmake/tsconfig.json
 create mode 100644 types/pdfmake/tslint.json

diff --git a/types/pdfmake/index.d.ts b/types/pdfmake/index.d.ts
new file mode 100644
index 0000000000..9d5f8023c3
--- /dev/null
+++ b/types/pdfmake/index.d.ts
@@ -0,0 +1,70 @@
+// Type definitions for pdfmake 0.1
+// Project: http://pdfmake.org
+// Definitions by: Milen Stefanov <https://github.com/m1llen1um>
+//                 Rajab Shakirov <https://github.com/radziksh>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare module 'pdfmake/build/vfs_fonts' {
+    let pdfMake: {
+        vfs: any;
+        [name: string]: any;
+    };
+}
+
+declare module 'pdfmake/build/pdfmake' {
+    let vfs: TFontFamily;
+    let fonts: { [name: string]: TFontFamilyTypes };
+    function createPdf(documentDefinitions: TDocumentDefinitions): TCreatedPdf;
+
+    type pageSizeType =
+        '4A0' | '2A0' | 'A0' | 'A1' | 'A2' | 'A3' | 'A4' | 'A5' | 'A6' | 'A7' | 'A8' | 'A9' | 'A10' |
+        'B0' | 'B1' | 'B2' | 'B3' | 'B4' | 'B5' | 'B6' | 'B7' | 'B8' | 'B9' | 'B10' |
+        'C0' | 'C1' | 'C2' | 'C3' | 'C4' | 'C5' | 'C6' | 'C7' | 'C8' | 'C9' | 'C10' |
+        'RA0' | 'RA1' | 'RA2' | 'RA3' | 'RA4' |
+        'SRA0' | 'SRA1' | 'SRA2' | 'SRA3' | 'SRA4' |
+        'EXECUTIVE' | 'FOLIO' | 'LEGAL' | 'LETTER' | 'TABLOID';
+
+    type pageOrientationType = "portrait" | "landscape";
+
+    let pdfMake: pdfMakeStatic;
+
+    interface TFontFamily {
+        [fontName: string]: string;
+    }
+
+    interface TFontFamilyTypes {
+        normal?: string;
+        bold?: string;
+        italics?: string;
+        bolditalics?: string;
+    }
+
+    interface TDocumentDefinitions {
+        content: any;
+        styles?: any;
+        pageSize?: pageSizeType;
+        pageOrientation?: pageOrientationType;
+        pageMargins?: [number, number, number, number];
+        defaultStyle?: {
+            font?: string;
+        };
+    }
+
+    type CreatedPdfParams = (
+        defaultFileName?: string,
+        cb?: string,
+        options?: string
+    ) => void;
+
+    interface TCreatedPdf {
+        download: CreatedPdfParams;
+        open: CreatedPdfParams;
+        print: CreatedPdfParams;
+    }
+
+    interface pdfMakeStatic {
+        vfs: TFontFamily;
+        fonts: { [name: string]: TFontFamilyTypes };
+        createPdf(documentDefinitions: TDocumentDefinitions): TCreatedPdf;
+    }
+}
diff --git a/types/pdfmake/pdfmake-tests.ts b/types/pdfmake/pdfmake-tests.ts
new file mode 100644
index 0000000000..0f23e5c5d5
--- /dev/null
+++ b/types/pdfmake/pdfmake-tests.ts
@@ -0,0 +1,10 @@
+import * as pdfMake from 'pdfmake/build/pdfmake';
+import * as pdfFonts from 'pdfmake/build/vfs_fonts';
+
+const docDefinition = { content: 'This is an sample PDF printed with pdfMake' };
+
+const createPdf = () => {
+  const pdf = pdfMake;
+  pdf.vfs = pdfFonts.pdfMake.vfs;
+  pdfMake.createPdf(docDefinition).download();
+};
diff --git a/types/pdfmake/tsconfig.json b/types/pdfmake/tsconfig.json
new file mode 100644
index 0000000000..2e8b5b10af
--- /dev/null
+++ b/types/pdfmake/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "esModuleInterop": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "pdfmake-tests.ts"
+    ]
+}
diff --git a/types/pdfmake/tslint.json b/types/pdfmake/tslint.json
new file mode 100644
index 0000000000..aa858f144a
--- /dev/null
+++ b/types/pdfmake/tslint.json
@@ -0,0 +1,6 @@
+{
+  "extends": "dtslint/dt.json",
+  "rules": {
+    "no-declare-current-package": false
+  }
+}
\ No newline at end of file

From 236276b2e6beb22555c0cea87753e5fd82e0b068 Mon Sep 17 00:00:00 2001
From: Tiger Oakes <tigeroakes@gmail.com>
Date: Mon, 9 Apr 2018 12:26:39 -0700
Subject: [PATCH 1153/1382] Added document-promises types (#24851)

---
 .../document-promises-tests.ts                | 16 +++++++++++++
 types/document-promises/index.d.ts            | 23 +++++++++++++++++++
 types/document-promises/tsconfig.json         | 23 +++++++++++++++++++
 types/document-promises/tslint.json           |  1 +
 4 files changed, 63 insertions(+)
 create mode 100644 types/document-promises/document-promises-tests.ts
 create mode 100644 types/document-promises/index.d.ts
 create mode 100644 types/document-promises/tsconfig.json
 create mode 100644 types/document-promises/tslint.json

diff --git a/types/document-promises/document-promises-tests.ts b/types/document-promises/document-promises-tests.ts
new file mode 100644
index 0000000000..5e45dffd5f
--- /dev/null
+++ b/types/document-promises/document-promises-tests.ts
@@ -0,0 +1,16 @@
+import { parsed, contentLoaded, loaded } from 'document-promises';
+
+let promise: Promise<void>;
+promise = parsed;
+promise = contentLoaded;
+promise = loaded;
+
+parsed.then(() => {
+    // Document parsed
+});
+contentLoaded.then(() => {
+    // Document is ready
+});
+loaded.then(() => {
+    // Document loaded
+});
diff --git a/types/document-promises/index.d.ts b/types/document-promises/index.d.ts
new file mode 100644
index 0000000000..2202c0d7ab
--- /dev/null
+++ b/types/document-promises/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for document-promises 3.1
+// Project: https://github.com/jonathantneal/document-promises#readme
+// Definitions by: Tiger Oakes <https://github.com/NotWoods>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * document.parsed is a promise that fulfills when the document is parsed
+ * and `readyState` is `interactive`, before deferred and async scripts have run.
+ */
+export const parsed: Promise<void>;
+
+/**
+ * document.contentLoaded is a promise that fulfills when the document is
+ * parsed, blocking scripts have completed, and `DOMContentLoaded` fires.
+ */
+export const contentLoaded: Promise<void>;
+
+/**
+ * document.loaded is a promise that fulfills when the document is parsed,
+ * blocking scripts have completed, images, scripts, links and sub-frames
+ * have finished loading, and `readyState` is `complete`.
+ */
+export const loaded: Promise<void>;
diff --git a/types/document-promises/tsconfig.json b/types/document-promises/tsconfig.json
new file mode 100644
index 0000000000..6b1ddaaa6b
--- /dev/null
+++ b/types/document-promises/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "document-promises-tests.ts"
+    ]
+}
diff --git a/types/document-promises/tslint.json b/types/document-promises/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/document-promises/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 206bedb68579320c5f0a8c84d0292734784ad06b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillermo=20Fern=C3=A1ndez?= <guillermofr.dev@gmail.com>
Date: Mon, 9 Apr 2018 21:50:01 +0200
Subject: [PATCH 1154/1382] Ngsijs npm package types file (#23023)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* add types for ngsijs package

* add types for ngsijs package

* clean d.ts

* clean d.ts

* strictFunctionTypes true

* fix errors with paddings

* another fix updating tsconfig after removing test file

* eofline

* trailing whitespaces ¬¬

* Remove additional dependence
---
 types/ngsijs/index.d.ts    | 58 ++++++++++++++++++++++++++++++++++++++
 types/ngsijs/tsconfig.json | 22 +++++++++++++++
 types/ngsijs/tslint.json   |  1 +
 3 files changed, 81 insertions(+)
 create mode 100644 types/ngsijs/index.d.ts
 create mode 100644 types/ngsijs/tsconfig.json
 create mode 100644 types/ngsijs/tslint.json

diff --git a/types/ngsijs/index.d.ts b/types/ngsijs/index.d.ts
new file mode 100644
index 0000000000..b39cbb5469
--- /dev/null
+++ b/types/ngsijs/index.d.ts
@@ -0,0 +1,58 @@
+// Type definitions for ngsijs 1.0
+// Project: https://github.com/conwetlab/ngsijs
+// Definitions by: Guillermofr <https://github.com/guillermofr>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export class Connection {
+    constructor(url: any);
+    v2: Connection.V2;
+    v1: Connection.V1;
+}
+
+export namespace Connection {
+    class V1 {
+        constructor(connection: any);
+        addAttributes(toAdd: any, callbacks: any): void;
+        cancelAvailabilitySubscription(subId: any, callbacks: any): void;
+        cancelRegistration(regId: any, callbacks: any): void;
+        cancelSubscription(subId: any, options: any): void;
+        createAvailabilitySubscription(entities: any, attributeNames: any, duration: any, restriction: any, options: any, ...args: any[]): void;
+        createRegistration(entities: any, attributes: any, duration: any, providingApplication: any, callbacks: any): void;
+        createSubscription(entities: any, attributeNames: any, duration: any, throttling: any, cond: any, options: any, ...args: any[]): void;
+        deleteAttributes(toDelete: any, callbacks: any): void;
+        discoverAvailability(entities: any, attributeNames: any, callbacks: any): void;
+        getAvailableTypes(options: any): void;
+        getTypeInfo(type: any, options: any): void;
+        query(entities: any, attributesName: any, options: any): void;
+        updateAttributes(update: any, callbacks: any): void;
+        updateAvailabilitySubscription(subId: any, entities: any, attributeNames: any, duration: any, restriction: any, callbacks: any): void;
+        updateRegistration(regId: any, entities: any, attributes: any, duration: any, providingApplication: any, callbacks: any): any;
+        updateSubscription(subId: any, duration: any, throttling: any, cond: any, options: any): void;
+    }
+
+    class V2 {
+        constructor(connection: any);
+        appendEntityAttributes(changes: any, options: any): any;
+        batchQuery(query: any, options: any): any;
+        batchUpdate(changes: any, options: any): any;
+        createEntity(entity: any, options: any): any;
+        createSubscription(subscription: any, options: any): any;
+        deleteEntity(options: any): any;
+        deleteEntityAttribute(options: any): any;
+        deleteSubscription(options: any): any;
+        getEntity(options: any): any;
+        getEntityAttribute(options: any): any;
+        getEntityAttributeValue(options: any): any;
+        getEntityAttributes(options: any): any;
+        getSubscription(options: any): any;
+        getType(options: any): any;
+        listEntities(options: any): any;
+        listSubscriptions(options: any): any;
+        listTypes(options: any): any;
+        replaceEntityAttribute(changes: any, options: any): any;
+        replaceEntityAttributeValue(options: any): any;
+        replaceEntityAttributes(entity: any, options: any): any;
+        updateEntityAttributes(changes: any, options: any): any;
+        updateSubscription(changes: any, options: any): any;
+    }
+}
diff --git a/types/ngsijs/tsconfig.json b/types/ngsijs/tsconfig.json
new file mode 100644
index 0000000000..ecc22c8314
--- /dev/null
+++ b/types/ngsijs/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
diff --git a/types/ngsijs/tslint.json b/types/ngsijs/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/ngsijs/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 5601488fff70c82ab84c0f0974e54aefe4928f56 Mon Sep 17 00:00:00 2001
From: Vincent Langlet <VincentLanglet@users.noreply.github.com>
Date: Mon, 9 Apr 2018 21:50:56 +0200
Subject: [PATCH 1155/1382] Export all defined type (#24853)

---
 types/react-native-permissions/index.d.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/types/react-native-permissions/index.d.ts b/types/react-native-permissions/index.d.ts
index 4b08cee5b3..274bdf2134 100644
--- a/types/react-native-permissions/index.d.ts
+++ b/types/react-native-permissions/index.d.ts
@@ -3,18 +3,18 @@
 // Definitions by: Vincent Langlet <https://github.com/vincentlanglet>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-type Status = 'authorized' | 'denied' | 'restricted' | 'undetermined';
+export type Status = 'authorized' | 'denied' | 'restricted' | 'undetermined';
 
-interface Rationale {
+export interface Rationale {
     title: string;
     message: string;
 }
 
-type CheckOptions = string | { type: string };
+export type CheckOptions = string | { type: string };
 
-type RequestOptions = string | { type: string, rationale?: Rationale };
+export type RequestOptions = string | { type: string, rationale?: Rationale };
 
-interface ReactNativePermissions {
+export interface ReactNativePermissions {
     canOpenSettings: () => Promise<boolean>;
     openSettings: () => Promise<any>;
     getTypes: () => string[];

From 25a78f261aed39304adcea4e985faabf4d00e04e Mon Sep 17 00:00:00 2001
From: Jacob <blankstar85@gmail.com>
Date: Mon, 9 Apr 2018 15:52:41 -0400
Subject: [PATCH 1156/1382] Updated email-templates typings to email-templates
 v3.5 (#24822)

* updated emailTemplate typings to email-templates 3.5

* Update index.d.ts

removed duplicate note
---
 types/email-templates/email-templates-tests.ts | 13 ++++++++++---
 types/email-templates/index.d.ts               | 13 +++++++++++--
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/types/email-templates/email-templates-tests.ts b/types/email-templates/email-templates-tests.ts
index a3311d6e81..3d828281af 100644
--- a/types/email-templates/email-templates-tests.ts
+++ b/types/email-templates/email-templates-tests.ts
@@ -2,13 +2,20 @@ import EmailTemplates = require('email-templates');
 
 const email = new EmailTemplates({
     message: {
-    from: 'Test@tesitng.com'
+      from: 'Test@testing.com'
     },
     transport: {
         jsonTransport: true
-    }}
-);
+    }
+});
+
+const emailNoTransporter = new EmailTemplates({
+    message: {
+      from: 'test@testing.com'
+    },
+});
 
 email.juiceResources('<p>bob</p><style>div{color:red;}</style><div/>');
 email.render('mars/html.pug', {name: 'elon'});
 email.send({template: 'mars', message: {to: 'elon@spacex.com'}, locals: {name: 'Elon'}});
+emailNoTransporter.render('mars/html.pug', {name: 'elon'});
diff --git a/types/email-templates/index.d.ts b/types/email-templates/index.d.ts
index 12dceb181d..1cdd43c36e 100644
--- a/types/email-templates/index.d.ts
+++ b/types/email-templates/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for node-email-templates 3.1
+// Type definitions for node-email-templates 3.5
 // Project: https://github.com/niftylettuce/node-email-templates
 // Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>
 //                 Matus Gura <https://github.com/gurisko>
@@ -13,7 +13,7 @@ interface EmailConfig {
     /**
      * The nodemailer Transport created via nodemailer.createTransport
      */
-    transport: any;
+    transport?: any;
     /**
      * The email template directory and engine information
      */
@@ -34,10 +34,19 @@ interface EmailConfig {
      * Pass a custom render function if necessary
      */
     render?: { view: string, locals: any };
+    /**
+     * force text-only rendering of template (disregards template folder)
+     */
+    textOnly?: boolean;
     /**
      * <Https://github.com/werk85/node-html-to-text>
      */
     htmlToText?: any;
+    /**
+     * You can pass an option to prefix subject lines with a string
+     * env === 'production' ? false : `[${env.toUpperCase()}] `; // <--- HERE
+     */
+    subjectPrefix?: any;
     /**
      * <https://github.com/Automattic/juice>
      */

From 35097ce41be2bbc96252906ba6c16b1867c694c0 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Mon, 9 Apr 2018 21:52:51 +0200
Subject: [PATCH 1157/1382] fix(uglify-js): add missing `includeSources` to
 `SourceMapOptions` (#24804)

---
 types/uglify-js/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/uglify-js/index.d.ts b/types/uglify-js/index.d.ts
index eca756bd53..8778975020 100644
--- a/types/uglify-js/index.d.ts
+++ b/types/uglify-js/index.d.ts
@@ -204,6 +204,7 @@ export interface MinifyOutput {
 }
 
 export interface SourceMapOptions {
+    includeSources?: boolean;
     filename?: string;
     url?: string | 'inline';
     root?: string;

From 9075daa8979c435d7a12b8531a4ac02eeb39765c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anderson=20Fria=C3=A7a?= <afriacaxd@gmail.com>
Date: Mon, 9 Apr 2018 15:53:04 -0400
Subject: [PATCH 1158/1382] JQuery Lazy Load - Adjustment in type appear
 (#24799)

* Adjustment in type appear

* Allow type null in appear

* Adjustments
---
 types/jquery-lazyload/index.d.ts               | 2 +-
 types/jquery-lazyload/jquery-lazyload-tests.ts | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/types/jquery-lazyload/index.d.ts b/types/jquery-lazyload/index.d.ts
index 5505c247f5..28563a774d 100644
--- a/types/jquery-lazyload/index.d.ts
+++ b/types/jquery-lazyload/index.d.ts
@@ -15,7 +15,7 @@ declare namespace JQueryLazyLoad {
         container?: JQuery;
         data_attribute?: string;
         skip_invisible?: boolean;
-        appear?: null;
+        appear?: ((elementsLeft: number, options: Options) => void) | null;
         load?: (elementsLeft?: number, options?: Options) => void;
         placeholder?: string;
     }
diff --git a/types/jquery-lazyload/jquery-lazyload-tests.ts b/types/jquery-lazyload/jquery-lazyload-tests.ts
index 086069d11d..105bbe094a 100644
--- a/types/jquery-lazyload/jquery-lazyload-tests.ts
+++ b/types/jquery-lazyload/jquery-lazyload-tests.ts
@@ -9,7 +9,10 @@ $(document).ready(() => {
         effect: 'fadeIn',
         container: $('#container'),
         failure_limit: 10,
-        skip_invisible: true
+        skip_invisible: true,
+        appear: (elementsLeft: number, settings: JQueryLazyLoad.Options) => {
+            console.log(elementsLeft);
+        }
     };
     $('.lazyload').lazyload(options);
 

From 06d09706a65b4bfc47c33d7c2b854c49a536b6c7 Mon Sep 17 00:00:00 2001
From: Dona278 <Dona278@users.noreply.github.com>
Date: Mon, 9 Apr 2018 21:54:49 +0200
Subject: [PATCH 1159/1382] [angular-material] - Added $mdDialogProvider
 definition (#24733)

* [angular-material] - Added $mdDialogProvider definition

Docs: https://material.angularjs.org/latest/api/service/$mdDialog#custom-presets

* [angular-material] - Added "methods" property to "addPreset()" options parameter
---
 .../angular-material-tests.ts                 | 25 ++++++++++++++++++-
 types/angular-material/index.d.ts             | 11 +++++++-
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/types/angular-material/angular-material-tests.ts b/types/angular-material/angular-material-tests.ts
index ad79cff2db..f29de44222 100644
--- a/types/angular-material/angular-material-tests.ts
+++ b/types/angular-material/angular-material-tests.ts
@@ -8,7 +8,8 @@ myApp.config((
     $mdAriaProvider: ng.material.IAriaProvider,
     $mdThemingProvider: ng.material.IThemingProvider,
     $mdIconProvider: ng.material.IIconProvider,
-    $mdProgressCircularProvider: ng.material.IProgressCircularProvider) => {
+    $mdProgressCircularProvider: ng.material.IProgressCircularProvider,
+    $mdDialogProvider: ng.material.IDialogProvider) => {
     $mdThemingProvider.alwaysWatchTheme(true);
     const neonRedMap: ng.material.IPalette = $mdThemingProvider.extendPalette('red', {
         500: 'ff0000'
@@ -56,6 +57,23 @@ myApp.config((
 
     // Globally disables all ARIA warnings.
     $mdAriaProvider.disableWarnings();
+
+    // Add custom dialog preset
+    $mdDialogProvider.addPreset('testPreset', {
+        methods: ['entityName'],
+        options: () => {
+            return {
+                template:
+                    '<md-dialog>' +
+                    'This is a custom preset' +
+                    '</md-dialog>',
+                controllerAs: 'dialog',
+                bindToController: true,
+                clickOutsideToClose: true,
+                escapeToClose: true
+            };
+        }
+    });
 });
 
 myApp.controller('BottomSheetController', ($scope: TestScope, $mdBottomSheet: ng.material.IBottomSheetService, $q: ng.IQService) => {
@@ -192,6 +210,11 @@ myApp.controller('DialogController', ($scope: TestScope, $mdDialog: ng.material.
         onComplete: (scope, element) => { },
         onRemoving: (element, removePromise) => { },
     });
+
+    // Show custom dialog preset
+    $mdDialog.show(
+        $mdDialog['testPreset']().entityName('Product #6')
+    );
 });
 
 class IconDirective implements ng.IDirective {
diff --git a/types/angular-material/index.d.ts b/types/angular-material/index.d.ts
index d77f5ae7ce..6885916e8a 100644
--- a/types/angular-material/index.d.ts
+++ b/types/angular-material/index.d.ts
@@ -125,6 +125,11 @@ declare module 'angular' {
         }
 
         interface IDialogService {
+            // indexer used to call preset dialog created with $mdDialogProvider
+            // see: https://material.angularjs.org/latest/api/service/$mdDialog#custom-presets
+            // tslint:disable-next-line:ban-types
+            [presetName: string]: Function;
+
             show(dialog: IDialogOptions | IAlertDialog | IConfirmDialog | IPromptDialog): IPromise<any>;
             confirm(): IConfirmDialog;
             alert(): IAlertDialog;
@@ -133,6 +138,10 @@ declare module 'angular' {
             cancel(response?: any): void;
         }
 
+        interface IDialogProvider {
+            addPreset(presetName: string, presetOptions: { methods?: ReadonlyArray<string>, options: () => IDialogOptions }): IDialogProvider;
+        }
+
         type IIcon = (id: string) => IPromise<Element>; // id is a unique ID or URL
 
         interface IIconProvider {
@@ -223,7 +232,7 @@ declare module 'angular' {
             contrastDefaultColor?: string;
             contrastDarkColors?: string | string[];
             contrastLightColors?: string | string[];
-            contrastStrongLightColors?: string|string[];
+            contrastStrongLightColors?: string | string[];
         }
 
         interface IThemeHues {

From e50e94b2a0a5f36208526ce8b15f77b446d93ce6 Mon Sep 17 00:00:00 2001
From: Brian Caruso <carusobp@gmail.com>
Date: Mon, 9 Apr 2018 12:55:05 -0700
Subject: [PATCH 1160/1382] Add '_enableIdPInitiatedLogin' to auth0-lock
 constructor's type definition (#24721)

---
 types/auth0-lock/auth0-lock-tests.ts | 4 +++-
 types/auth0-lock/index.d.ts          | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/types/auth0-lock/auth0-lock-tests.ts b/types/auth0-lock/auth0-lock-tests.ts
index 3ef12e327b..b3b2c81339 100644
--- a/types/auth0-lock/auth0-lock-tests.ts
+++ b/types/auth0-lock/auth0-lock-tests.ts
@@ -124,7 +124,9 @@ const otherOptions : Auth0LockConstructorOptions = {
   configurationBaseUrl: "https://cdn.auth0.com",
   languageBaseUrl: "http://www.example.com",
   hashCleanup: false,
-  leeway: 30
+  leeway: 30,
+  _enableImpersonation: true,
+  _enableIdPInitiatedLogin: false
 };
 
 new Auth0Lock(CLIENT_ID, DOMAIN, otherOptions);
diff --git a/types/auth0-lock/index.d.ts b/types/auth0-lock/index.d.ts
index 93305bfd1f..fec943ce02 100644
--- a/types/auth0-lock/index.d.ts
+++ b/types/auth0-lock/index.d.ts
@@ -144,6 +144,7 @@ interface Auth0LockConstructorOptions {
     theme?: Auth0LockThemeOptions;
     usernameStyle?: string;
     _enableImpersonation?: boolean;
+    _enableIdPInitiatedLogin?: boolean;
 }
 
 interface Auth0LockFlashMessageOptions {

From 273c90ffb96f9b43b5f5c8a1b33bc453b50fb622 Mon Sep 17 00:00:00 2001
From: Andy <anhans@microsoft.com>
Date: Mon, 9 Apr 2018 13:00:51 -0700
Subject: [PATCH 1161/1382] graceful-fs: Fix test (#24855)

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

diff --git a/types/graceful-fs/graceful-fs-tests.ts b/types/graceful-fs/graceful-fs-tests.ts
index 233eb7124a..17f20c786a 100644
--- a/types/graceful-fs/graceful-fs-tests.ts
+++ b/types/graceful-fs/graceful-fs-tests.ts
@@ -14,7 +14,7 @@ gfs.renameSync(str, str);
 gfs2.chmodSync(buf, 1);
 
 const gracefulified = gfs.gracefulify(fs);
-gracefulified; // $ExpectType typeof "fs" & Lutimes
+const _fs: typeof fs = gracefulified;
 gracefulified.lutimes; // $ExpectType typeof lutimes
 promisify(gracefulified.lutimes); // $ExpectType (path: PathLike, atime: string | number | Date, mtime: string | number | Date) => Promise<void>
 

From 4e9ecb03e459a0ead4aac7b9b2f397e6dd808824 Mon Sep 17 00:00:00 2001
From: Joscha Feth <joscha@feth.com>
Date: Tue, 10 Apr 2018 06:02:16 +1000
Subject: [PATCH 1162/1382] @storybook/addon-knobs: add framework-specific
 entry points (#22939)

* @storybook/addon-knobs: add framework-specific entry points

* Update vue.d.ts

* PR feedback

* bue -> vue
---
 types/storybook__addon-knobs/angular.d.ts  | 1 +
 types/storybook__addon-knobs/index.d.ts    | 2 +-
 types/storybook__addon-knobs/react.d.ts    | 1 +
 types/storybook__addon-knobs/tsconfig.json | 7 +++++--
 types/storybook__addon-knobs/vue.d.ts      | 1 +
 5 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 types/storybook__addon-knobs/angular.d.ts
 create mode 100644 types/storybook__addon-knobs/react.d.ts
 create mode 100644 types/storybook__addon-knobs/vue.d.ts

diff --git a/types/storybook__addon-knobs/angular.d.ts b/types/storybook__addon-knobs/angular.d.ts
new file mode 100644
index 0000000000..ea465c2a34
--- /dev/null
+++ b/types/storybook__addon-knobs/angular.d.ts
@@ -0,0 +1 @@
+export * from './index';
diff --git a/types/storybook__addon-knobs/index.d.ts b/types/storybook__addon-knobs/index.d.ts
index 4125f10b84..c129c5f574 100644
--- a/types/storybook__addon-knobs/index.d.ts
+++ b/types/storybook__addon-knobs/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for @storybook/addon-knobs 3.2
+// Type definitions for @storybook/addon-knobs 3.3
 // Project: https://github.com/storybooks/storybook
 // Definitions by: Joscha Feth <https://github.com/joscha>
 //                 Martynas Kadisa <https://github.com/martynaskadisa>
diff --git a/types/storybook__addon-knobs/react.d.ts b/types/storybook__addon-knobs/react.d.ts
new file mode 100644
index 0000000000..ea465c2a34
--- /dev/null
+++ b/types/storybook__addon-knobs/react.d.ts
@@ -0,0 +1 @@
+export * from './index';
diff --git a/types/storybook__addon-knobs/tsconfig.json b/types/storybook__addon-knobs/tsconfig.json
index fb2307556f..1e011639d0 100644
--- a/types/storybook__addon-knobs/tsconfig.json
+++ b/types/storybook__addon-knobs/tsconfig.json
@@ -27,7 +27,10 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
+        "angular.d.ts",
         "index.d.ts",
-        "storybook__addon-knobs-tests.tsx"
+        "react.d.ts",
+        "storybook__addon-knobs-tests.tsx",
+        "vue.d.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/storybook__addon-knobs/vue.d.ts b/types/storybook__addon-knobs/vue.d.ts
new file mode 100644
index 0000000000..ea465c2a34
--- /dev/null
+++ b/types/storybook__addon-knobs/vue.d.ts
@@ -0,0 +1 @@
+export * from './index';

From 93135b0ac2f1ea9d445f897f8d8a350f78a757c1 Mon Sep 17 00:00:00 2001
From: peszek90 <36853408+peszek90@users.noreply.github.com>
Date: Mon, 9 Apr 2018 22:08:36 +0200
Subject: [PATCH 1163/1382] Make renderOrder nullable in VectorTileOptions
 (#23942)

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

diff --git a/types/openlayers/index.d.ts b/types/openlayers/index.d.ts
index 9dc5461f5e..2a7d1b0949 100644
--- a/types/openlayers/index.d.ts
+++ b/types/openlayers/index.d.ts
@@ -11952,7 +11952,7 @@ export namespace olx {
         interface VectorTileOptions {
             renderBuffer?: number;
             renderMode?: (ol.layer.VectorTileRenderType | string);
-            renderOrder: (feature1: ol.Feature, feature2: ol.Feature) => number;
+            renderOrder?: (feature1: ol.Feature, feature2: ol.Feature) => number;
             map?: ol.Map;
             extent?: ol.Extent;
             minResolution?: number;

From d95790803294745106f8f5adb9e2bd5daa4a829c Mon Sep 17 00:00:00 2001
From: Walter Rumsby <wrumsby@users.noreply.github.com>
Date: Tue, 10 Apr 2018 08:18:04 +1200
Subject: [PATCH 1164/1382] Export Store from mem-fs (#24522)

---
 types/mem-fs/index.d.ts      | 15 ++++++++-------
 types/mem-fs/mem-fs-tests.ts |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/types/mem-fs/index.d.ts b/types/mem-fs/index.d.ts
index 0cece1da38..4b1d8c4d14 100644
--- a/types/mem-fs/index.d.ts
+++ b/types/mem-fs/index.d.ts
@@ -9,13 +9,14 @@ import { EventEmitter } from 'events';
 import { Transform } from 'stream';
 import * as File from 'vinyl';
 
-export function create(...args: any[]): memFs.Store;
+export interface Store extends EventEmitter {
+    add: (file: File, content: string) => void;
+    each: (callback: (file: File, index: number) => void) => void;
+    get: (filepath: string) => File;
+    stream: () => Transform;
+}
+
+export function create(...args: any[]): Store;
 
 export namespace memFs {
-    interface Store extends EventEmitter {
-        add: (file: File, content: string) => void;
-        each: (callback: (file: File, index: number) => void) => void;
-        get: (filepath: string) => File;
-        stream: () => Transform;
-    }
 }
diff --git a/types/mem-fs/mem-fs-tests.ts b/types/mem-fs/mem-fs-tests.ts
index ada05c22c7..9605c65ef7 100644
--- a/types/mem-fs/mem-fs-tests.ts
+++ b/types/mem-fs/mem-fs-tests.ts
@@ -1,6 +1,6 @@
 import * as fs from 'mem-fs';
 
-const store = fs.create();
+const store: fs.Store = fs.create();
 const file = store.get('hello');
 
 store.add(file, 'hahahahah');

From 4e707e3844b5271cfba311bbfb3261844109c1e4 Mon Sep 17 00:00:00 2001
From: Tommy Nguyen <tn0502@users.noreply.github.com>
Date: Mon, 9 Apr 2018 22:22:03 +0200
Subject: [PATCH 1165/1382] Revert "[react-native] Replacing
 ScrollViewProperties with VirtualizedListProperties for SectionList" (#24033)

---
 types/react-native/index.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index 3503c69f6b..5e5316c6b4 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -3731,7 +3731,7 @@ export interface SectionListData<ItemT> extends SectionBase<ItemT> {
     [key: string]: any;
 }
 
-export interface SectionListProperties<ItemT> extends VirtualizedListProperties<ItemT> {
+export interface SectionListProperties<ItemT> extends ScrollViewProperties {
     /**
      * Rendered in between adjacent Items within each section.
      */
@@ -3805,7 +3805,7 @@ export interface SectionListProperties<ItemT> extends VirtualizedListProperties<
     /**
      * Default renderer for every item in every section. Can be over-ridden on a per-section basis.
      */
-    renderItem: ListRenderItem<ItemT>;
+    renderItem?: ListRenderItem<ItemT>;
 
     /**
      * Rendered at the top of each section. Sticky headers are not yet supported.

From 8070848da5f0259daf40bbd57b971fc7daa22486 Mon Sep 17 00:00:00 2001
From: Federico Caselli <CaselIT@users.noreply.github.com>
Date: Mon, 9 Apr 2018 22:25:43 +0200
Subject: [PATCH 1166/1382] Fixed generic type bug in Collection.find (#24857)

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

diff --git a/types/mongodb/index.d.ts b/types/mongodb/index.d.ts
index 335d7e0187..8b5a637ebd 100644
--- a/types/mongodb/index.d.ts
+++ b/types/mongodb/index.d.ts
@@ -509,9 +509,9 @@ export interface Collection<TSchema = Default> {
     dropIndexes(callback?: MongoCallback<any>): void;
     dropIndexes(options: {session?: ClientSession, maxTimeMS?: number}, callback: MongoCallback<any>): void;
     /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#find */
-    find<T = TSchema>(query?: FilterQuery<T>): Cursor<T>;
+    find<T = TSchema>(query?: FilterQuery<TSchema>): Cursor<T>;
     /** @deprecated */
-    find<T = TSchema>(query: FilterQuery<T>, options?: FindOneOptions): Cursor<T>;
+    find<T = TSchema>(query: FilterQuery<TSchema>, options?: FindOneOptions): Cursor<T>;
     /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#findOne */
     findOne<T = TSchema>(filter: FilterQuery<TSchema>, callback: MongoCallback<T | null>): void;
     findOne<T = TSchema>(filter: FilterQuery<TSchema>, options?: FindOneOptions): Promise<T | null>;
diff --git a/types/mongodb/mongodb-tests.ts b/types/mongodb/mongodb-tests.ts
index 434f71dc91..270379989a 100644
--- a/types/mongodb/mongodb-tests.ts
+++ b/types/mongodb/mongodb-tests.ts
@@ -113,5 +113,7 @@ MongoClient.connect('mongodb://127.0.0.1:27017/test', options, function (err: mo
                 $and: [{ $gt: 0, $lt: 100 }]
             }
         });
+
+        const res: mongodb.Cursor<TestCollection> = testCollection.find({ _id: 123 });
     }
 })

From 6c5c0a88983b7243ae13f08fd515cad2922bb2d2 Mon Sep 17 00:00:00 2001
From: Tiger Oakes <tigeroakes@gmail.com>
Date: Mon, 9 Apr 2018 13:26:18 -0700
Subject: [PATCH 1167/1382] [three] CubeTextureLoader: Fixed crossOrigin typo
 and made types more precise (#24848)

* Updated CubeTextureLoader types

* Feedback: keep `urls` as plain array
---
 types/three/index.d.ts      | 2 +-
 types/three/three-core.d.ts | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/types/three/index.d.ts b/types/three/index.d.ts
index 50450fd793..4afce12ebb 100644
--- a/types/three/index.d.ts
+++ b/types/three/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for three.js 0.91
 // Project: https://threejs.org
-// Definitions by: Kon <http://phyzkit.net/>, Satoru Kimura <https://github.com/gyohk>, Florent Poujol <https://github.com/florentpoujol>, SereznoKot <https://github.com/SereznoKot>, HouChunlei <https://github.com/omni360>, Ivo <https://github.com/ivoisbelongtous>, David Asmuth <https://github.com/piranha771>, Brandon Roberge, Qinsi ZHU <https://github.com/qszhusightp>, Toshiya Nakakura <https://github.com/nakakura>, Poul Kjeldager Sørensen <https://github.com/s093294>, Stefan Profanter <https://github.com/Pro>, Edmund Fokschaner <https://github.com/efokschaner>, Roelof Jooste <https://github.com/PsychoSTS>, Daniel Hritzkiv <https://github.com/dhritzkiv>, Apurva Ojas <https://github.com/apurvaojas>
+// Definitions by: Kon <http://phyzkit.net/>, Satoru Kimura <https://github.com/gyohk>, Florent Poujol <https://github.com/florentpoujol>, SereznoKot <https://github.com/SereznoKot>, HouChunlei <https://github.com/omni360>, Ivo <https://github.com/ivoisbelongtous>, David Asmuth <https://github.com/piranha771>, Brandon Roberge, Qinsi ZHU <https://github.com/qszhusightp>, Toshiya Nakakura <https://github.com/nakakura>, Poul Kjeldager Sørensen <https://github.com/s093294>, Stefan Profanter <https://github.com/Pro>, Edmund Fokschaner <https://github.com/efokschaner>, Roelof Jooste <https://github.com/PsychoSTS>, Daniel Hritzkiv <https://github.com/dhritzkiv>, Apurva Ojas <https://github.com/apurvaojas>, Tiger Oakes <https://github.com/NotWoods>
 // Definitions: https://github.com//DefinitelyTyped
 
 export * from "./three-core";
diff --git a/types/three/three-core.d.ts b/types/three/three-core.d.ts
index 2d8d40f1d6..2ec61c82cd 100644
--- a/types/three/three-core.d.ts
+++ b/types/three/three-core.d.ts
@@ -2303,12 +2303,12 @@ export class CubeTextureLoader {
     constructor(manager?: LoadingManager);
 
     manager: LoadingManager;
-    corssOrigin: string;
-    path: string;
+    crossOrigin: string;
+    path?: string;
 
     load(urls: Array<string>, onLoad?: (texture: CubeTexture) => void, onProgress?: (event: ProgressEvent) => void, onError?: (event: ErrorEvent) => void): CubeTexture;
-    setCrossOrigin(crossOrigin: string): CubeTextureLoader;
-    setPath(path: string): CubeTextureLoader;
+    setCrossOrigin(crossOrigin: string): this;
+    setPath(path: string): this;
 }
 
 export class DataTextureLoader {

From 1f6b5b9e809feace6c95f99f6e0d244d08881346 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Armando=20Assun=C3=A7=C3=A3o?=
 <armando.assuncao.93@gmail.com>
Date: Mon, 9 Apr 2018 17:26:29 -0300
Subject: [PATCH 1168/1382] Reactstrap: updated props to Modal component
 (#24814)

---
 types/reactstrap/lib/Modal.d.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/types/reactstrap/lib/Modal.d.ts b/types/reactstrap/lib/Modal.d.ts
index bfab2f56fd..cead67c943 100644
--- a/types/reactstrap/lib/Modal.d.ts
+++ b/types/reactstrap/lib/Modal.d.ts
@@ -22,6 +22,10 @@ export interface ModalProps extends React.HTMLAttributes<HTMLElement> {
   fade?: boolean;
   backdropTransition?: FadeProps;
   modalTransition?: FadeProps;
+  centered?: boolean;
+  external?: React.ReactNode;
+  labelledBy?: string;
+  role?: string;
 }
 
 declare const Modal: React.StatelessComponent<ModalProps>;

From 89a3abfbff841cfd8dbe0ccd7bfecf425397ef2c Mon Sep 17 00:00:00 2001
From: Daniel K <FredyC@users.noreply.github.com>
Date: Mon, 9 Apr 2018 22:27:22 +0200
Subject: [PATCH 1169/1382] Change RRN.Link.component to ComponentType (#24758)

---
 types/react-router-native/index.d.ts             |  2 +-
 .../react-router-native-tests.tsx                | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/types/react-router-native/index.d.ts b/types/react-router-native/index.d.ts
index 17601361bd..ea2a5f766c 100644
--- a/types/react-router-native/index.d.ts
+++ b/types/react-router-native/index.d.ts
@@ -33,7 +33,7 @@ export class AndroidBackButton extends React.Component<BackButtonProps> {}
 export class DeepLinking extends React.Component {}
 
 export interface LinkProps {
-  component?: React.Component | React.ComponentClass;
+  component?: React.ComponentType<any>;
   replace?: boolean;
   style?: any;
   to: H.LocationDescriptor;
diff --git a/types/react-router-native/react-router-native-tests.tsx b/types/react-router-native/react-router-native-tests.tsx
index 2cbdfac1b2..5b7dcfa4e7 100644
--- a/types/react-router-native/react-router-native-tests.tsx
+++ b/types/react-router-native/react-router-native-tests.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
-import { StyleSheet, Text, View } from 'react-native';
-import { NativeRouter as Router, Route, Link, AndroidBackButton, BackButton } from 'react-router-native';
+import { StyleSheet, Text, TouchableOpacity, TouchableOpacityProperties, View } from 'react-native';
+import { AndroidBackButton, BackButton, Link, NativeRouter as Router, Route } from 'react-router-native';
 
 const Home: React.SFC = () => {
   return (
@@ -24,6 +24,14 @@ const About: React.SFC = () => {
  );
 };
 
+interface ButtonTextProps extends TouchableOpacityProperties {
+    text: string;
+}
+
+const ButtonText: React.SFC<ButtonTextProps> = ({ text, ...props }) => (
+  <TouchableOpacity {...props}><Text>{text}</Text></TouchableOpacity>
+);
+
 export default class App extends React.Component {
   render() {
     return (
@@ -35,9 +43,7 @@ export default class App extends React.Component {
               <Link to="/" style={styles.navItem}>
                 <Text>Home</Text>
               </Link>
-              <Link to="/about" style={styles.navItem}>
-                <Text>About</Text>
-              </Link>
+              <Link to="/about" style={styles.navItem} component={ButtonText} text="About" />
             </View>
             <Route exact path="/" component={Home} />
             <Route path="/about" component={About} />

From 192d6dc1254fbe108bf3d5c2aeae825c4c9ca180 Mon Sep 17 00:00:00 2001
From: Dona278 <Dona278@users.noreply.github.com>
Date: Mon, 9 Apr 2018 22:48:34 +0200
Subject: [PATCH 1170/1382] [typed.js] - Added definition (#24858)

---
 types/typed.js/index.d.ts        | 185 +++++++++++++++++++++++++++++++
 types/typed.js/tsconfig.json     |  24 ++++
 types/typed.js/tslint.json       |   3 +
 types/typed.js/typed.js-tests.ts |  29 +++++
 4 files changed, 241 insertions(+)
 create mode 100644 types/typed.js/index.d.ts
 create mode 100644 types/typed.js/tsconfig.json
 create mode 100644 types/typed.js/tslint.json
 create mode 100644 types/typed.js/typed.js-tests.ts

diff --git a/types/typed.js/index.d.ts b/types/typed.js/index.d.ts
new file mode 100644
index 0000000000..45064e9c03
--- /dev/null
+++ b/types/typed.js/index.d.ts
@@ -0,0 +1,185 @@
+// Type definitions for typed.js 2.0
+// Project: https://github.com/mattboldt/typed.js
+// Definitions by: Davide Donadello <https://github.com/Dona278>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export default Typed;
+
+export class Typed {
+    constructor(elementId: string, options: TypedJsOptions);
+
+    /**
+     * Toggle start() and stop() of the Typed instance
+     */
+    toggle(): void;
+
+    /**
+     * Stop typing / backspacing and enable cursor blinking
+     */
+    stop(): void;
+
+    /**
+     * Start typing / backspacing after being stopped
+     */
+    start(): void;
+
+    /**
+     * Destroy this instance of Typed
+     */
+    destroy(): void;
+
+    /**
+     * Reset Typed and optionally restarts
+     */
+    reset(restart: boolean): void;
+}
+
+export type TypedJsContentType = "html" | "null";
+
+export interface TypedJsOptions {
+    /**
+     * Strings to be typed
+     */
+    strings?: string[];
+
+    /**
+     * ID of element containing string children
+     */
+    stringsElement?: string;
+
+    /**
+     * Type speed in milliseconds
+     */
+    typeSpeed?: number;
+
+    /**
+     * Time before typing starts in milliseconds
+     */
+    startDelay?: number;
+
+    /**
+     * Backspacing speed in milliseconds
+     */
+    backSpeed?: number;
+
+    /**
+     * Only backspace what doesn't match the previous string
+     */
+    smartBackspace?: boolean;
+
+    /**
+     * Shuffle the strings
+     */
+    shuffle?: boolean;
+
+    /**
+     * Time before backspacing in milliseconds
+     */
+    backDelay?: number;
+
+    /**
+     * Fade out instead of backspace
+     */
+    fadeOut?: boolean;
+
+    /**
+     * Css class for fade animation
+     */
+    fadeOutClass?: string;
+
+    /**
+     * Fade out delay in milliseconds
+     */
+    fadeOutDelay?: number;
+
+    /**
+     * Loop strings
+     */
+    loop?: boolean;
+
+    /**
+     * Amount of loops
+     */
+    loopCount?: number;
+
+    /**
+     * Show cursor
+     */
+    showCursor?: boolean;
+
+    /**
+     * Character for cursor
+     */
+    cursorChar?: string;
+
+    /**
+     * Insert CSS for cursor and fadeOut into HTML <head>
+     */
+    autoInsertCss?: boolean;
+
+    /**
+     * Attribute for typing
+     * Ex: input placeholder, value, or just HTML text
+     */
+    attr?: string;
+
+    /**
+     * Bind to focus and blur if el is text input
+     */
+    bindInputFocusEvents?: boolean;
+
+    /**
+     * 'html' or 'null' for plaintext
+     */
+    contentType?: TypedJsContentType;
+
+    /**
+     * All typing is complete
+     */
+    onComplete?: (self: Typed) => void;
+
+    /**
+     * Before each string is typed
+     */
+    preStringTyped?: (arrayPos: number, self: Typed) => void;
+
+    /**
+     * After each string is typed
+     */
+    onStringTyped?: (arrayPos: number, self: Typed) => void;
+
+    /**
+     * During looping, after last string is typed
+     */
+    onLastStringBackspaced?: (self: Typed) => void;
+
+    /**
+     * Typing has been stopped
+     */
+    onTypingPaused?: (arrayPos: number, self: Typed) => void;
+
+    /**
+     * Typing has been started after being stopped
+     */
+    onTypingResumed?: (arrayPos: number, self: Typed) => void;
+
+    /**
+     * After reset
+     */
+    onReset?: (self: Typed) => void;
+
+    /**
+     * After stop
+     */
+    onStop?: (arrayPos: number, self: Typed) => void;
+
+    /**
+     * After start
+     */
+    onStart?: (arrayPos: number, self: Typed) => void;
+
+    /**
+     * After destroy
+     */
+    onDestroy?: (self: Typed) => void;
+}
diff --git a/types/typed.js/tsconfig.json b/types/typed.js/tsconfig.json
new file mode 100644
index 0000000000..b018ca64fe
--- /dev/null
+++ b/types/typed.js/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "esModuleInterop": true
+    },
+    "files": [
+        "index.d.ts",
+        "typed.js-tests.ts"
+    ]
+}
diff --git a/types/typed.js/tslint.json b/types/typed.js/tslint.json
new file mode 100644
index 0000000000..e60c15844f
--- /dev/null
+++ b/types/typed.js/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
\ No newline at end of file
diff --git a/types/typed.js/typed.js-tests.ts b/types/typed.js/typed.js-tests.ts
new file mode 100644
index 0000000000..3e4bd0a137
--- /dev/null
+++ b/types/typed.js/typed.js-tests.ts
@@ -0,0 +1,29 @@
+import { Typed, TypedJsOptions } from 'typed.js';
+
+// Create instance
+const typed = new Typed(".element", {
+    strings: ["<i>First</i> sentence.", "&amp; a second sentence."],
+    typeSpeed: 100,
+    startDelay: 0,
+    backSpeed: 50,
+    smartBackspace: true,
+    shuffle: true,
+    backDelay: 150,
+    loop: true,
+    showCursor: true,
+    autoInsertCss: true,
+    contentType: "html",
+    onComplete: (self: Typed) => {
+        // Complete!!
+    },
+    onDestroy: (self: Typed) => {
+        // End!!
+    },
+});
+
+// Methods
+typed.reset(false);
+typed.destroy();
+typed.start();
+typed.stop();
+typed.toggle();

From c701072a0ecbe47091d34020b9f323e3e19a7969 Mon Sep 17 00:00:00 2001
From: Michael Williamson <michael@healx.io>
Date: Mon, 9 Apr 2018 21:49:40 +0100
Subject: [PATCH 1171/1382] Cytoscape: Allow overlay style to be set (#23667)

* Cytoscape: Allow overlay style to be set

* Update TS version
---
 types/cytoscape/index.d.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/types/cytoscape/index.d.ts b/types/cytoscape/index.d.ts
index b04ac2276e..4da9cd9ca0 100644
--- a/types/cytoscape/index.d.ts
+++ b/types/cytoscape/index.d.ts
@@ -8,7 +8,7 @@
 //
 // Translation from Objects in help to Typescript interface.
 // http://js.cytoscape.org/#notation/functions
-//
+// TypeScript Version: 2.2
 
 /**
  * cy   --> Cy.Core
@@ -3145,7 +3145,7 @@ declare namespace cytoscape {
         /**
          * http://js.cytoscape.org/#style/node-body
          */
-        interface Node extends PaddingNode {
+        interface Node extends Partial<Overlay>, PaddingNode {
             "label"?: string;
             /**
              * The width of the node’s body.
@@ -3320,7 +3320,7 @@ declare namespace cytoscape {
             "pie-i-background-opacity": number;
         }
 
-        interface Edge extends EdgeLine, EdgeArror { }
+        interface Edge extends EdgeLine, EdgeArror, Partial<Overlay> { }
 
         /**
          * These properties affect the styling of an edge’s line:

From 52670470e34ab31afd946cc34939661574792ffc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kh=E1=BA=A3i?= <hvksmr1996@gmail.com>
Date: Tue, 10 Apr 2018 03:52:55 +0700
Subject: [PATCH 1172/1382] Change type of path.sep and path.delimiter in
 @types/node (#24833)

* Update type of path.sep and path.delimiter

* Change `path.sep` to `'\\' | '/'`
* Change `path.delimiter` to  `';' | ':'`

* Update index.d.ts

* Change types of path.sep and path.delimiter in types/node/{v8,v6}

* Change types of path.sep and path.delimiter in types/node/v7
---
 types/node/index.d.ts    | 5 +++--
 types/node/v6/index.d.ts | 5 +++--
 types/node/v7/index.d.ts | 5 +++--
 types/node/v8/index.d.ts | 5 +++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index 3404e37d46..2522d51f54 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -20,6 +20,7 @@
 //                 Klaus Meinhardt <https://github.com/ajafff>
 //                 Huw <https://github.com/hoo29>
 //                 Nicolas Even <https://github.com/n-e>
+//                 Hoàng Văn Khải <https://github.com/KSXGitHub>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /** inspector module types */
@@ -4683,11 +4684,11 @@ declare module "path" {
     /**
      * The platform-specific file separator. '\\' or '/'.
      */
-    export var sep: string;
+    export var sep: '\\' | '/';
     /**
      * The platform-specific file delimiter. ';' or ':'.
      */
-    export var delimiter: string;
+    export var delimiter: ';' | ':';
     /**
      * Returns an object from a path string - the opposite of format().
      *
diff --git a/types/node/v6/index.d.ts b/types/node/v6/index.d.ts
index f38cdf01dd..ed9949a9ac 100644
--- a/types/node/v6/index.d.ts
+++ b/types/node/v6/index.d.ts
@@ -6,6 +6,7 @@
 //                 Thomas Bouldin <https://github.com/inlined>
 //                 Sebastian Silbermann <https://github.com/eps1lon>
 //                 Alorel <https://github.com/Alorel>
+//                 Hoàng Văn Khải <https://github.com/KSXGitHub>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /************************************************
@@ -3003,11 +3004,11 @@ declare module "path" {
     /**
      * The platform-specific file separator. '\\' or '/'.
      */
-    export var sep: string;
+    export var sep: '\\' | '/';
     /**
      * The platform-specific file delimiter. ';' or ':'.
      */
-    export var delimiter: string;
+    export var delimiter: ';' | ':';
     /**
      * Returns an object from a path string - the opposite of format().
      *
diff --git a/types/node/v7/index.d.ts b/types/node/v7/index.d.ts
index 896b5a887f..950e143536 100644
--- a/types/node/v7/index.d.ts
+++ b/types/node/v7/index.d.ts
@@ -6,6 +6,7 @@
 //                 Christian Vaagland Tellnes <https://github.com/tellnes>
 //                 Wilco Bakker <https://github.com/WilcoBakker>
 //                 Sebastian Silbermann <https://github.com/eps1lon>
+//                 Hoàng Văn Khải <https://github.com/KSXGitHub>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /************************************************
@@ -3092,11 +3093,11 @@ declare module "path" {
     /**
      * The platform-specific file separator. '\\' or '/'.
      */
-    export var sep: string;
+    export var sep: '\\' | '/';
     /**
      * The platform-specific file delimiter. ';' or ':'.
      */
-    export var delimiter: string;
+    export var delimiter: ';' | ':';
     /**
      * Returns an object from a path string - the opposite of format().
      *
diff --git a/types/node/v8/index.d.ts b/types/node/v8/index.d.ts
index 164df0a960..28bc5dc779 100644
--- a/types/node/v8/index.d.ts
+++ b/types/node/v8/index.d.ts
@@ -19,6 +19,7 @@
 //                 Alberto Schiabel <https://github.com/jkomyno>
 //                 Huw <https://github.com/hoo29>
 //                 Nicolas Even <https://github.com/n-e>
+//                 Hoàng Văn Khải <https://github.com/KSXGitHub>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
@@ -4662,11 +4663,11 @@ declare module "path" {
     /**
      * The platform-specific file separator. '\\' or '/'.
      */
-    export var sep: string;
+    export var sep: '\\' | '/';
     /**
      * The platform-specific file delimiter. ';' or ':'.
      */
-    export var delimiter: string;
+    export var delimiter: ';' | ':';
     /**
      * Returns an object from a path string - the opposite of format().
      *

From d39c95d43fa49a8130d15f102f1d47b6943845b3 Mon Sep 17 00:00:00 2001
From: Pusztai Tibor <kondi.elte@gmail.com>
Date: Mon, 9 Apr 2018 23:00:14 +0200
Subject: [PATCH 1173/1382] Add few methods and indexCreate overload to
 rethinkdb types (#24692)

* Add few methods and indexCreate overload to rethinkdb types

Inspired by https://github.com/types/rethinkdb

* Add server method to Connection in rethinkdb types
---
 types/rethinkdb/index.d.ts         | 45 ++++++++++++++++++++++++++++--
 types/rethinkdb/rethinkdb-tests.ts | 16 +++++++++++
 2 files changed, 58 insertions(+), 3 deletions(-)

diff --git a/types/rethinkdb/index.d.ts b/types/rethinkdb/index.d.ts
index 038a9d48e6..aedd37950d 100644
--- a/types/rethinkdb/index.d.ts
+++ b/types/rethinkdb/index.d.ts
@@ -1,6 +1,8 @@
 // Type definitions for RethinkDB 2.3
 // Project: http://rethinkdb.com/
-// Definitions by: Alex Gorbatchev <https://github.com/alexgorbatchev>, Adrian Farmadin <https://github.com/AdrianFarmadin>
+// Definitions by: Alex Gorbatchev <https://github.com/alexgorbatchev>
+//                 Adrian Farmadin <https://github.com/AdrianFarmadin>
+//                 Pusztai Tibor <https://github.com/kondi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -42,6 +44,7 @@ declare module "rethinkdb" {
 
     export function point(lng: number, lat: number): Point;
     export function polygon(...point: Point[]): Polygon;
+    export function circle(point: Point, radius: number, options?: CircleOptions): Geometry;
 
     export var count: Aggregator;
     export function sum(prop: string): Aggregator;
@@ -136,6 +139,12 @@ declare module "rethinkdb" {
         noreplyWait: boolean;
     }
 
+    interface ServerResult {
+        id: string;
+        proxy: boolean;
+        name?: string;
+    }
+
     interface Connection {
         open: boolean;
 
@@ -148,6 +157,9 @@ declare module "rethinkdb" {
         reconnect(opts: NoReplyWait, cb: (err: Error, conn: Connection) => void): void;
         reconnect(opts?: NoReplyWait): Promise<Connection>;
 
+        server(cb: (err: Error, conn: ServerResult) => void): void;
+        server(): Promise<ServerResult>;
+
         use(dbName: string): void;
         addListener(event: string, cb: Function): void;
         on(event: string, cb: Function): void;
@@ -236,7 +248,7 @@ declare module "rethinkdb" {
          * See: https://rethinkdb.com/api/javascript/has_fields/
          */
         hasFields(...fields: string[]): T;
-    } 
+    }
 
     interface Geometry { }
 
@@ -245,7 +257,7 @@ declare module "rethinkdb" {
     interface Polygon extends Geometry { }
 
     interface Table extends Sequence, HasFields<Sequence> {
-        indexCreate(name: string, index?: ExpressionFunction<any>): Operation<CreateResult>;
+        indexCreate(name: string, index?: IndexFunction<any>): Operation<CreateResult>;
         indexDrop(name: string): Operation<DropResult>;
         indexList(): Operation<string[]>;
         indexWait(name?: string): Operation<Array<{ index: string, ready: true, function: number, multi: boolean, geo: boolean, outdated: boolean }>>;
@@ -301,6 +313,7 @@ declare module "rethinkdb" {
         isEmpty(): Expression<boolean>;
         union(sequence: Sequence): Sequence;
         sample(n: number): Sequence;
+        getField(prop: string): Sequence;
 
         // Aggregate
         reduce(r: ReduceFunction<any>, base?: any): Expression<any>;
@@ -315,6 +328,8 @@ declare module "rethinkdb" {
         without(...props: string[]): Sequence;
     }
 
+    type IndexFunction<U> = Expression<U> | Expression<U>[] | ((doc: Expression<any>) => Expression<U> | Expression<U>[]);
+
     interface ExpressionFunction<U> {
         (doc: Expression<any>): Expression<U>;
     }
@@ -339,6 +354,28 @@ declare module "rethinkdb" {
         returnChanges?: boolean;
     }
 
+    export interface DistanceOptions {
+        /**
+         * Unit for the distance. Possible values are `m` (meter, the default), `km` (kilometer), `mi` (international mile), `nm` (nautical mile), `ft` (international foot).
+         */
+        unit?: 'm' | 'km' | 'mi' | 'nm' | 'ft';
+        /**
+         * The reference ellipsoid to use for geographic coordinates. Possible values are `WGS84` (the default), a common standard for Earth’s geometry, or `unit_sphere`, a perfect sphere of 1 meter radius.
+         */
+        geoSystem?: 'WGS84' | 'unit_sphere';
+    }
+
+    export interface CircleOptions extends DistanceOptions {
+        /**
+         * The number of vertices in the polygon or line. Defaults to 32.
+         */
+        numVertices?: number;
+        /**
+         * If `true` (the default) the circle is filled, creating a polygon; if `false` the circle is unfilled (creating a line).
+         */
+        fill?: boolean;
+    }
+
     interface WriteResult {
         inserted: number;
         replaced: number;
@@ -418,6 +455,8 @@ declare module "rethinkdb" {
         div(n: number): Expression<number>;
         mod(n: number): Expression<number>;
 
+        distance(geometry: Geometry, options?: DistanceOptions): Expression<number>;
+
         default(value: T): Expression<T>;
     }
 
diff --git a/types/rethinkdb/rethinkdb-tests.ts b/types/rethinkdb/rethinkdb-tests.ts
index 411a306d7c..fb129b94a5 100644
--- a/types/rethinkdb/rethinkdb-tests.ts
+++ b/types/rethinkdb/rethinkdb-tests.ts
@@ -6,6 +6,8 @@ function cursorCallback(cursor: r.Cursor): void {}
 r.connect({ host: "localhost", port: 28015 }, function(err: Error, conn: r.Connection) {
     console.log("HI", err, conn);
 
+    conn.server((err, server) => {});
+
     const testDb = r.db("test");
 
     r.table("players").hasFields("games_won").run(conn, errorAndCursorCallback);
@@ -20,6 +22,14 @@ r.connect({ host: "localhost", port: 28015 }, function(err: Error, conn: r.Conne
     )
     .run(conn, errorAndCursorCallback);
 
+    const center = r.point(123, 456);
+    r.table("geo")
+      .getIntersecting(r.circle(center, 1000, { unit: "m" }), { index: "location" })
+      .orderBy(r.row("location").distance(center, { unit: "m" }))
+      .eqJoin("external", testDb.table("other"), { index: "external" })
+      .getField("right")
+      .run(conn, errorAndCursorCallback);
+
     testDb.tableCreate("users").run(conn, function(err, stuff) {
         const users = testDb.table("users");
         users.wait({waitFor: 'ready_for_reads'});
@@ -41,6 +51,8 @@ r.connect({ host: "localhost", port: 28015 }, function(err: Error, conn: r.Conne
         });
     });
 
+    testDb.table("users").indexCreate("name_index", [r.row("name")]);
+
     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) {});
@@ -54,6 +66,10 @@ r.connect({ host: "localhost", port: 28015 }, function(err: Error, conn: r.Conne
 r.connect({ host: "localhost", port: 28015 }).then(function(conn: r.Connection) {
     console.log("HI", conn);
 
+    conn.server().then(server => {
+        console.log(server.id, server.proxy);
+    });
+
     const testDb = r.db("test");
     testDb.wait({timeout: 1});
 

From 15db8183d988a2caf174fd08507a1935002b5b37 Mon Sep 17 00:00:00 2001
From: Vincent Langlet <VincentLanglet@users.noreply.github.com>
Date: Mon, 9 Apr 2018 23:01:27 +0200
Subject: [PATCH 1174/1382] [React-native] Fix type for Stylesheet.flatten
 (#24772)

* Use generic type for Stylesheet.flatten

* Keep using overload, but fix it by changing order of definition

* Adding tests
---
 types/react-native/index.d.ts     |  2 +-
 types/react-native/test/index.tsx | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index 5e5316c6b4..53514cfdd3 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -4840,9 +4840,9 @@ export namespace StyleSheet {
      * the alternative use.
      */
     export function flatten<T>(style?: RegisteredStyle<T>): T;
-    export function flatten(style?: StyleProp<ViewStyle>): ViewStyle;
     export function flatten(style?: StyleProp<TextStyle>): TextStyle;
     export function flatten(style?: StyleProp<ImageStyle>): ImageStyle;
+    export function flatten(style?: StyleProp<ViewStyle>): ViewStyle;
 
     /**
      * This is defined as the width of a thin line on the platform. It can be
diff --git a/types/react-native/test/index.tsx b/types/react-native/test/index.tsx
index 557df0869d..8d3925d4bd 100644
--- a/types/react-native/test/index.tsx
+++ b/types/react-native/test/index.tsx
@@ -22,10 +22,12 @@ import {
     DataSourceAssetCallback,
     DeviceEventEmitterStatic,
     Dimensions,
+    ImageStyle,
     InteractionManager,
     ListView,
     ListViewDataSource,
     StyleSheet,
+    StyleProp,
     Systrace,
     Text,
     TextStyle,
@@ -127,6 +129,20 @@ const stylesAlt = StyleSheet.create({
 
 const welcomeFontSize = StyleSheet.flatten(styles.welcome).fontSize;
 
+const viewStyle: StyleProp<ViewStyle> = {
+  backgroundColor: "#F5FCFF",
+}
+const textStyle: StyleProp<TextStyle> = {
+  fontSize: 20,
+}
+const imageStyle: StyleProp<ImageStyle> = {
+  resizeMode: 'contain',
+}
+
+const viewProperty = StyleSheet.flatten(viewStyle).backgroundColor;
+const textProperty = StyleSheet.flatten(textStyle).fontSize;
+const imageProperty = StyleSheet.flatten(imageStyle).resizeMode;
+
 class CustomView extends React.Component {
     render() {
         return <Text style={[StyleSheet.absoluteFill, { ...StyleSheet.absoluteFillObject }]}>Custom View</Text>;

From 7a5a3751ab8ceb5c04a07bdc1f5734e30a58709a Mon Sep 17 00:00:00 2001
From: "M. Fatih MAR" <mfatihmar@gmail.com>
Date: Mon, 9 Apr 2018 22:03:50 +0100
Subject: [PATCH 1175/1382] Add Missing Constants (#24809)

---
 .../electron-devtools-installer-tests.ts                     | 5 +++++
 types/electron-devtools-installer/index.d.ts                 | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/types/electron-devtools-installer/electron-devtools-installer-tests.ts b/types/electron-devtools-installer/electron-devtools-installer-tests.ts
index a453221698..798e6ad223 100644
--- a/types/electron-devtools-installer/electron-devtools-installer-tests.ts
+++ b/types/electron-devtools-installer/electron-devtools-installer-tests.ts
@@ -3,6 +3,8 @@ import installExtension, {
     BACKBONE_DEBUGGER, JQUERY_DEBUGGER,
     ANGULARJS_BATARANG, VUEJS_DEVTOOLS,
     REDUX_DEVTOOLS, REACT_PERF,
+    CYCLEJS_DEVTOOL, APOLLO_DEVELOPER_TOOLS,
+    MOBX_DEVTOOLS
 } from 'electron-devtools-installer';
 
 
@@ -14,4 +16,7 @@ installExtension(ANGULARJS_BATARANG);
 installExtension(VUEJS_DEVTOOLS);
 installExtension(REDUX_DEVTOOLS);
 installExtension(REACT_PERF);
+installExtension(CYCLEJS_DEVTOOL);
+installExtension(APOLLO_DEVELOPER_TOOLS);
+installExtension(MOBX_DEVTOOLS);
 installExtension('abcdefghijkl');
\ No newline at end of file
diff --git a/types/electron-devtools-installer/index.d.ts b/types/electron-devtools-installer/index.d.ts
index 8a108c1d2f..88649cd0a8 100644
--- a/types/electron-devtools-installer/index.d.ts
+++ b/types/electron-devtools-installer/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for electron-devtools-installer v2.0.1
 // Project: https://github.com/MarshallOfSound/electron-devtools-installer
 // Definitions by: Robin Van den Broeck <https://github.com/gamesmaxed>
+//                 M. Fatih Mar <https://github.com/mfatihmar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare module "electron-devtools-installer" {
@@ -21,4 +22,7 @@ declare module "electron-devtools-installer" {
     export const VUEJS_DEVTOOLS: ExtensionReference;
     export const REDUX_DEVTOOLS: ExtensionReference;
     export const REACT_PERF: ExtensionReference;
+    export const CYCLEJS_DEVTOOL: ExtensionReference;
+    export const APOLLO_DEVELOPER_TOOLS: ExtensionReference;
+    export const MOBX_DEVTOOLS: ExtensionReference;
 }
\ No newline at end of file

From c63b81da94f147233634defc907c496e4185da4b Mon Sep 17 00:00:00 2001
From: Adam Epling <adamepling@gmail.com>
Date: Mon, 9 Apr 2018 23:04:30 +0200
Subject: [PATCH 1176/1382] Add `placeholder`, for use in contentEditable
 elements (#24539)

* Added `placeholder` to the list of standard attributes, to allow its use on contentEditable <div> elements.

* Added placeholder for use in contentEditable elements in React.
---
 types/react/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index 4b22054b77..968063559a 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -934,6 +934,7 @@ declare namespace React {
         hidden?: boolean;
         id?: string;
         lang?: string;
+        placeholder?: string;
         slot?: string;
         spellCheck?: boolean;
         style?: CSSProperties;

From 467b78e8b15be4f0d2b9e0ee7be3861147c5f66c Mon Sep 17 00:00:00 2001
From: Zbyszek Wieczorek <zbyszek.wieczorek@gmail.com>
Date: Mon, 9 Apr 2018 23:08:31 +0200
Subject: [PATCH 1177/1382] Mssing datepticker orientation options: (#24827)

https://bootstrap-datepicker.readthedocs.io/en/stable/options.html#orientation
taken from author's online demo:
https://uxsolutions.github.io/bootstrap-datepicker/
---
 types/bootstrap-datepicker/index.d.ts | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/types/bootstrap-datepicker/index.d.ts b/types/bootstrap-datepicker/index.d.ts
index dfe358854e..b841fe07ab 100644
--- a/types/bootstrap-datepicker/index.d.ts
+++ b/types/bootstrap-datepicker/index.d.ts
@@ -10,7 +10,20 @@ type DatepickerEvents = "show"|"hide"|"clearDate"|"changeDate"|"changeMonth"|"ch
 
 type DatepickerViewModes = 0|"days"|1|"months"|2|"years"|3|"decades"|4|"centuries"|"millenium";
 
-type DatepickerOrientations = "auto"|"left top"|"left bottom"|"right top"|"right bottom";
+type DatepickerOrientations =
+    "auto"
+    | "left top"
+    | "left bottom"
+    | "right top"
+    | "right bottom"
+    | "top auto"
+    | "bottom auto"
+    | "auto left"
+    | "top left"
+    | "bottom left"
+    | "auto right"
+    | "top right"
+    | "bottom right"
 
 /**
  * All options that take a “Date” can handle a Date object; a String

From c2724adc96c7d9be8162860bc2223a0853120516 Mon Sep 17 00:00:00 2001
From: Andy <anhans@microsoft.com>
Date: Mon, 9 Apr 2018 14:10:29 -0700
Subject: [PATCH 1178/1382] wordcloud: Lint and expose as a module (#24845)

---
 types/wordcloud/index.d.ts         |  16 ++--
 types/wordcloud/tslint.json        |  76 +-----------------
 types/wordcloud/wordcloud-tests.ts | 125 +++++++++++++----------------
 3 files changed, 69 insertions(+), 148 deletions(-)

diff --git a/types/wordcloud/index.d.ts b/types/wordcloud/index.d.ts
index 76d1939799..79ed06d252 100644
--- a/types/wordcloud/index.d.ts
+++ b/types/wordcloud/index.d.ts
@@ -1,20 +1,23 @@
-// Type definitions for wordcloud
+// Type definitions for wordcloud 1.1
 // Project: https://github.com/timdream/wordcloud2.js
 // Definitions by: Joe Skeen <https://github.com/joeskeen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+export = WordCloud;
+export as namespace WordCloud;
+
 declare function WordCloud(elements: HTMLElement | HTMLElement[], options: WordCloud.Options): void;
 
 declare namespace WordCloud {
-	var isSupported: boolean;
-	var miniumFontSize: number;
+	const isSupported: boolean;
+	let miniumFontSize: number;
 
 	interface Options {
 		/**
 		 * List of words/text to paint on the canvas in a 2-d array, in the form of [word, size],
 		 * e.g. [['foo', 12] , ['bar', 6]].
 		 */
-		list?: Array<ListEntry> | any[];
+		list?: ListEntry[] | any[];
 		/** font to use. */
 		fontFamily?: string;
 		/** font weight to use, e.g. normal, bold or 600 */
@@ -28,8 +31,9 @@ declare namespace WordCloud {
 		/**
 		 * for DOM clouds, allows the user to define the class of the span elements.Can be a normal class
 		 * string, applying the same class to every span or a callback(word, weight, fontSize, distance, theta)
-		 * for per-span class definition. In canvas clouds or if equals null, this option has no effect. */
-		classes?: string | ((word: string, weight: string | number, fontSize: number, distance: number, theta: number) => string); 
+		 * for per-span class definition. In canvas clouds or if equals null, this option has no effect.
+		 */
+		classes?: string | ((word: string, weight: string | number, fontSize: number, distance: number, theta: number) => string);
 		/** minimum font size to draw on the canvas. */
 		minSize?: number;
 		/** function to call or number to multiply for size of each word in the list. */
diff --git a/types/wordcloud/tslint.json b/types/wordcloud/tslint.json
index a41bf5d19a..3d04da382b 100644
--- a/types/wordcloud/tslint.json
+++ b/types/wordcloud/tslint.json
@@ -1,79 +1,7 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
-        "ban-types": false,
-        "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
-        "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
-        "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
-        "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
-        "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
-        "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
-        "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
+        // TODO
+        "ban-types": false
     }
 }
diff --git a/types/wordcloud/wordcloud-tests.ts b/types/wordcloud/wordcloud-tests.ts
index 1486d03307..8f21798c33 100644
--- a/types/wordcloud/wordcloud-tests.ts
+++ b/types/wordcloud/wordcloud-tests.ts
@@ -1,24 +1,15 @@
-/// <reference types="qunit" />
+import WordCloud = require("wordcloud");
 
-'use strict';
-//declare function test(name: string, test: Function);
-var element: HTMLElement | HTMLElement[];
+declare function test(name: string, cb: () => void): void;
+
+declare const element: HTMLElement | HTMLElement[];
 
 if (!WordCloud.isSupported)
   console.log('WordCloud is not supported.');
-  
+
 WordCloud.miniumFontSize = 20;
 
-var list = (function () {
-  var string = 'Grumpy wizards make toxic brew for the evil Queen and Jack';
-
-  var list: WordCloud.ListEntry[] = [];
-  string.split(' ').forEach(function(word) {
-    list.push([word, word.length * 5]);
-  });
-
-  return list;
-})();
+const list = 'Grumpy wizards make toxic brew for the evil Queen and Jack'.split(' ').map(word => [word, word.length * 5]);
 
 function getTestOptions(): WordCloud.Options {
   return {
@@ -26,107 +17,107 @@ function getTestOptions(): WordCloud.Options {
     rotateRatio: 0,
     color: '#000',
     fontFamily: 'sans-serif',
-    list: list
+    list,
   };
-};
+}
 
-QUnit.test('Test runs without any extra parameters.', function() {
-  var options = getTestOptions();
+test('Test runs without any extra parameters.', () => {
+  const options = getTestOptions();
   WordCloud(element, options);
 });
 
-QUnit.test('Empty list results no output.', function() {
-  var options = getTestOptions();
+test('Empty list results no output.', () => {
+  const options = getTestOptions();
   options.list = [];
 
   WordCloud(element, options);
 });
 
-QUnit.test('gridSize can be set', function() {
-  var options = getTestOptions();
+test('gridSize can be set', () => {
+  const options = getTestOptions();
   options.gridSize = 15;
 
   WordCloud(element, options);
 });
 
-QUnit.test('ellipticity can be set', function() {
-  var options = getTestOptions();
+test('ellipticity can be set', () => {
+  const options = getTestOptions();
   options.ellipticity = 1.5;
 
   WordCloud(element, options);
 });
 
-QUnit.test('origin can be set', function() {
-  var options = getTestOptions();
+test('origin can be set', () => {
+  const options = getTestOptions();
   options.origin = [300, 0];
 
   WordCloud(element, options);
 });
 
-QUnit.test('minSize can be set', function() {
-  var options = getTestOptions();
+test('minSize can be set', () => {
+  const options = getTestOptions();
   options.minSize = 10;
 
   WordCloud(element, options);
 });
 
-QUnit.test('rotation can be set and locked', function() {
-  var options = getTestOptions();
+test('rotation can be set and locked', () => {
+  const options = getTestOptions();
   options.rotateRatio = 1;
   options.minRotation = options.maxRotation = Math.PI / 6;
 
   WordCloud(element, options);
 });
 
-QUnit.test('drawMask can be set', function() {
-  var options = getTestOptions();
+test('drawMask can be set', () => {
+  const options = getTestOptions();
   options.drawMask = true;
 
   WordCloud(element, options);
 });
 
-QUnit.test('maskColor can be set', function() {
-  var options = getTestOptions();
+test('maskColor can be set', () => {
+  const options = getTestOptions();
   options.drawMask = true;
   options.maskColor = 'rgba(0, 0, 255, 0.8)';
 
   WordCloud(element, options);
 });
 
-QUnit.test('backgroundColor can be set', function() {
-  var options = getTestOptions();
+test('backgroundColor can be set', () => {
+  const options = getTestOptions();
   options.backgroundColor = 'rgb(0, 0, 255)';
 
   WordCloud(element, options);
 });
 
-QUnit.test('semi-transparent backgroundColor can be set', function() {
-  var options = getTestOptions();
+test('semi-transparent backgroundColor can be set', () => {
+  const options = getTestOptions();
   options.backgroundColor = 'rgba(0, 0, 255, 0.3)';
 
   WordCloud(element, options);
 });
 
-QUnit.test('weightFactor can be set', function() {
-  var options = getTestOptions();
+test('weightFactor can be set', () => {
+  const options = getTestOptions();
   options.weightFactor = 2;
 
   WordCloud(element, options);
 });
 
-QUnit.test('weightFactor can be set as a function', function() {
-  var options = getTestOptions();
-  options.weightFactor = function (w) { return Math.sqrt(w); };
+test('weightFactor can be set as a function', () => {
+  const options = getTestOptions();
+  options.weightFactor = w => Math.sqrt(w);
 
   WordCloud(element, options);
 });
 
-QUnit.test('color can be set as a function', function() {
-  var options = getTestOptions();
-  options.color = function (word, weight, fontSize, radius, theta) {
-    if (theta < 2*Math.PI/3) {
+test('color can be set as a function', () => {
+  const options = getTestOptions();
+  options.color = (word, weight, fontSize, radius, theta) => {
+    if (theta < 2 * Math.PI / 3) {
       return '#600';
-    } else if (theta < 2*Math.PI*2/3) {
+    } else if (theta < 2 * Math.PI * 2 / 3) {
       return '#060';
     } else {
       return '#006';
@@ -136,60 +127,58 @@ QUnit.test('color can be set as a function', function() {
   WordCloud(element, options);
 });
 
-QUnit.test('shape can be set to circle', function() {
-  var options = getTestOptions();
+test('shape can be set to circle', () => {
+  const options = getTestOptions();
   options.shape = 'circle';
 
   WordCloud(element, options);
 });
 
-QUnit.test('shape can be set to cardioid', function() {
-  var options = getTestOptions();
+test('shape can be set to cardioid', () => {
+  const options = getTestOptions();
   options.shape = 'cardioid';
 
   WordCloud(element, options);
 });
 
-QUnit.test('shape can be set to diamond', function() {
-  var options = getTestOptions();
+test('shape can be set to diamond', () => {
+  const options = getTestOptions();
   options.shape = 'diamond';
 
   WordCloud(element, options);
 });
 
-QUnit.test('shape can be set to triangle', function() {
-  var options = getTestOptions();
+test('shape can be set to triangle', () => {
+  const options = getTestOptions();
   options.shape = 'triangle';
 
   WordCloud(element, options);
 });
 
-QUnit.test('shape can be set to triangle-forward', function() {
-  var options = getTestOptions();
+test('shape can be set to triangle-forward', () => {
+  const options = getTestOptions();
   options.shape = 'triangle-forward';
 
   WordCloud(element, options);
 });
 
-QUnit.test('shape can be set to pentagon', function() {
-  var options = getTestOptions();
+test('shape can be set to pentagon', () => {
+  const options = getTestOptions();
   options.shape = 'pentagon';
 
   WordCloud(element, options);
 });
 
-QUnit.test('shape can be set to star', function() {
-  var options = getTestOptions();
+test('shape can be set to star', () => {
+  const options = getTestOptions();
   options.shape = 'star';
 
   WordCloud(element, options);
 });
 
-QUnit.test('shape can be set to a given polar equation', function() {
-  var options = getTestOptions();
-  options.shape = function (theta) {
-    return theta / (2 * Math.PI);
-  };
+test('shape can be set to a given polar equation', () => {
+  const options = getTestOptions();
+  options.shape = theta => theta / (2 * Math.PI);
 
   WordCloud(element, options);
 });

From fd5d770d39c0918fc420c9b29e9ff647cb86aa24 Mon Sep 17 00:00:00 2001
From: Eric Kirkham <eric@southerneer.com>
Date: Mon, 9 Apr 2018 16:14:33 -0700
Subject: [PATCH 1179/1382] add caretHidden to TextInputProperties

---
 types/react-native/index.d.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index 53514cfdd3..84b7032562 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -1092,6 +1092,11 @@ export interface TextInputProperties
      */
     blurOnSubmit?: boolean;
 
+    /**
+     * If true, the caret is hidden
+     */
+    caretHidden?: boolean
+
     /**
      * Provides an initial value that will change when the user starts typing.
      * Useful for simple use-cases where you don't want to deal with listening to events

From c0d45f681033af09d4e7ceeb380d5ef35218e2e7 Mon Sep 17 00:00:00 2001
From: Rob <r0b-@users.noreply.github.com>
Date: Tue, 10 Apr 2018 01:20:53 +0200
Subject: [PATCH 1180/1382] Added typings for next/config. (#24815)

---
 types/next/config.d.ts   | 1 +
 types/next/tsconfig.json | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 types/next/config.d.ts

diff --git a/types/next/config.d.ts b/types/next/config.d.ts
new file mode 100644
index 0000000000..1b2e330bb0
--- /dev/null
+++ b/types/next/config.d.ts
@@ -0,0 +1 @@
+export default function(): {serverRuntimeConfig: any, publicRuntimeConfig: any};
diff --git a/types/next/tsconfig.json b/types/next/tsconfig.json
index 05e0b4e7ad..48d3f0c8be 100644
--- a/types/next/tsconfig.json
+++ b/types/next/tsconfig.json
@@ -26,6 +26,7 @@
         "head.d.ts",
         "link.d.ts",
         "router.d.ts",
+        "config.d.ts",
         "test/next-tests.ts",
         "test/next-error-tests.tsx",
         "test/next-head-tests.tsx",
@@ -34,4 +35,4 @@
         "test/next-dynamic-tests.tsx",
         "test/next-router-tests.tsx"
     ]
-}
\ No newline at end of file
+}

From d1d68e7452babdc7a57212b3d184e4e2ec6fab04 Mon Sep 17 00:00:00 2001
From: Fluccioni <luccioni.f@gmail.com>
Date: Tue, 10 Apr 2018 01:22:03 +0200
Subject: [PATCH 1181/1382] Add google pay web api definitions (#24860)

---
 types/googlepay/googlepay-tests.ts |  68 ++++++++++++
 types/googlepay/index.d.ts         | 160 +++++++++++++++++++++++++++++
 types/googlepay/tsconfig.json      |  24 +++++
 types/googlepay/tslint.json        |   3 +
 4 files changed, 255 insertions(+)
 create mode 100644 types/googlepay/googlepay-tests.ts
 create mode 100644 types/googlepay/index.d.ts
 create mode 100644 types/googlepay/tsconfig.json
 create mode 100644 types/googlepay/tslint.json

diff --git a/types/googlepay/googlepay-tests.ts b/types/googlepay/googlepay-tests.ts
new file mode 100644
index 0000000000..ea97c2a586
--- /dev/null
+++ b/types/googlepay/googlepay-tests.ts
@@ -0,0 +1,68 @@
+const allowedPaymentMethods = new Array<google.payments.api.AllowedPaymentMethod>('CARD', 'TOKENIZED_CARD');
+
+const allowedCardNetworks = new Array<google.payments.api.AllowedCardNetwork>('AMEX', 'DISCOVER', 'JCB', 'MASTERCARD', 'VISA');
+
+const tokenizationParameters: google.payments.api.PaymentMethodTokenizationParameters = {
+    tokenizationType: 'PAYMENT_GATEWAY',
+    parameters: {
+      gateway: 'example',
+      gatewayMerchantId: 'abc123'
+    }
+};
+
+const getGooglePaymentsClient = (env?: google.payments.api.EnvironmentType) => new google.payments.api.PaymentsClient({environment: env});
+
+function onGooglePayLoaded() {
+    const client = getGooglePaymentsClient();
+
+    client.isReadyToPay({allowedPaymentMethods}).then(response => {
+        if (response.result) {
+            addGooglePayButton();
+            prefetchGooglePaymentData();
+        }
+    }).catch(err => {
+        console.error(err);
+    });
+}
+
+function addGooglePayButton() {
+    const button = document.createElement('button');
+    button.className = 'google-pay';
+    button.appendChild(document.createTextNode('Google Pay'));
+    button.addEventListener('click', onGooglePaymentButtonClick);
+    document.appendChild(document.createElement('div').appendChild(button));
+}
+
+function getGooglePaymentDataConfiguration(): google.payments.api.PaymentDataRequest {
+    return {
+        merchantId: '01234567890123456789',
+        transactionInfo: {
+            totalPriceStatus: 'FINAL',
+            totalPrice: '123.45',
+            currencyCode: 'USD'
+        },
+        paymentMethodTokenizationParameters: tokenizationParameters,
+        allowedPaymentMethods,
+        cardRequirements: {
+            allowedCardNetworks,
+            billingAddressRequired: true,
+            billingAddressFormat: 'FULL'
+        },
+        phoneNumberRequired: false,
+        shippingAddressRequired: true
+    };
+}
+
+function prefetchGooglePaymentData() {
+    const client = getGooglePaymentsClient();
+    client.prefetchPaymentData(getGooglePaymentDataConfiguration());
+}
+
+function onGooglePaymentButtonClick() {
+    const request = getGooglePaymentDataConfiguration();
+    const client = getGooglePaymentsClient();
+
+    client.loadPaymentData(request)
+        .then(data => console.log(data))
+        .catch(err => console.error(err));
+}
diff --git a/types/googlepay/index.d.ts b/types/googlepay/index.d.ts
new file mode 100644
index 0000000000..524c277691
--- /dev/null
+++ b/types/googlepay/index.d.ts
@@ -0,0 +1,160 @@
+// Type definitions for Google Pay API 0.0
+// Project: https://developers.google.com/pay/api/web/setup/
+// Definitions by: Florian Luccioni <https://github.com/Fluccioni>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace google.payments.api {
+    type AddressFormat = 'FULL' | 'MIN';
+    type AllowedCardNetwork = 'AMEX' | 'DISCOVER' | 'JCB' | 'MASTERCARD' | 'VISA';
+    type AllowedPaymentMethod = 'CARD' | 'TOKENIZED_CARD';
+    type CardClass = 'CREDIT' | 'DEBIT';
+    type CardInfo = CardInfoMin | CardInfoFull;
+    type CardRequirements = CardRequirementsMin | CardRequirementsFull;
+    type EnvironmentType = 'PRODUCTION' | 'TEST';
+    type ErrorStatusCode = 'BUYER_ACCOUNT_ERROR' | 'CANCELED' | 'DEVELOPER_ERROR' | 'INTERNAL_ERROR';
+    type PaymentMethodTokenizationParameters = PaymentMethodDirectTokenizationParameters | PaymentMethodGatewayTokenizationParameters;
+    type TokenizationType = 'DIRECT' | 'PAYMENT_GATEWAY';
+    type TotalPriceStatus =  'ESTIMATED' | 'FINAL' | 'NOT_CURRENTLY_KNOWN';
+    type UserAddress = UserAddressFull | UserAddressMin;
+    type PaymentDataRequest = PaymentDataRequestMin | PaymentDataRequestFull;
+    type PaymentData = PaymentDataMin | PaymentDataFull;
+
+    interface PaymentOptions {
+        environment?: EnvironmentType;
+    }
+
+    interface IsReadyToPayRequest {
+        allowedPaymentMethods: AllowedPaymentMethod[];
+    }
+
+    interface BasePaymentDataRequest {
+        merchantId: string;
+        transactionInfo: TransactionInfo;
+        cardRequirements: CardRequirements;
+        paymentMethodTokenizationParameters: PaymentMethodTokenizationParameters;
+        allowedPaymentMethods: AllowedPaymentMethod[];
+        phoneNumberRequired?: boolean;
+        emailRequired?: boolean;
+        shippingAddressRequired?: boolean;
+        shippingAddressRequirements?: ShippingAddressRequirements;
+    }
+
+    interface PaymentDataRequestMin extends BasePaymentDataRequest {
+        cardRequirements: CardRequirementsMin;
+    }
+
+    interface PaymentDataRequestFull extends BasePaymentDataRequest {
+        cardRequirements: CardRequirementsFull;
+    }
+
+    interface BasePaymentMethodTokenizationParameters {
+        tokenizationType: TokenizationType;
+    }
+
+    interface PaymentMethodGatewayTokenizationParameters extends BasePaymentMethodTokenizationParameters {
+        tokenizationType: 'PAYMENT_GATEWAY';
+        parameters: {
+            [parameter: string]: string;
+        };
+    }
+
+    interface PaymentMethodDirectTokenizationParameters extends BasePaymentMethodTokenizationParameters {
+        tokenizationType: 'DIRECT';
+        parameters: {
+            publicKey: string;
+        };
+    }
+
+    interface BaseCardRequirements {
+        allowedCardNetworks: AllowedCardNetwork[];
+        billingAddressRequired?: boolean;
+        billingAddressFormat?: AddressFormat;
+    }
+
+    interface CardRequirementsMin extends BaseCardRequirements {
+        billingAddressFormat?: 'MIN';
+    }
+
+    interface CardRequirementsFull extends BaseCardRequirements {
+        billingAddressFormat?: 'FULL';
+    }
+
+    interface ShippingAddressRequirements {
+        allowedCountryCodes?: string[];
+    }
+
+    interface TransactionInfo {
+        totalPriceStatus: TotalPriceStatus;
+        totalPrice?: string;
+        currencyCode?: string;
+    }
+
+    interface BasePaymentData {
+        cardInfo: CardInfo;
+        paymentMethodToken: PaymentMethodToken;
+        shippingAddress?: UserAddressFull;
+        email?: string;
+    }
+
+    interface PaymentDataMin extends BasePaymentData {
+        cardInfo: CardInfoMin;
+    }
+
+    interface PaymentDataFull extends BasePaymentData {
+        cardInfo: CardInfoFull;
+    }
+
+    interface BaseCardInfo {
+        cardDescription: string;
+        cardClass: CardClass;
+        cardDetails: string;
+        cardNetwork: AllowedCardNetwork;
+        billingAddress?: UserAddress;
+    }
+
+    interface CardInfoMin extends BaseCardInfo {
+        billingAddress?: UserAddressMin;
+    }
+
+    interface CardInfoFull extends BaseCardInfo {
+        billingAddress?: UserAddressFull;
+    }
+
+    interface UserAddressMin {
+        name: string;
+        postalCode: string;
+        countryCode: string;
+        phoneNumber?: string;
+    }
+
+    interface UserAddressFull extends UserAddressMin {
+        companyName: string;
+        address1: string;
+        address2: string;
+        address3: string;
+        address4: string;
+        address5: string;
+        locality: string;
+        administrativeArea: string;
+        sortingCode: string;
+    }
+
+    interface PaymentMethodToken {
+        tokenizationType: TokenizationType;
+        token: string;
+    }
+
+    interface PaymentsError {
+        statusCode: ErrorStatusCode;
+        statusMessage: string;
+    }
+
+    class PaymentsClient {
+        constructor(paymentOptions: PaymentOptions);
+        isReadyToPay(request: IsReadyToPayRequest): Promise<{result: boolean}>;
+        loadPaymentData(request: PaymentDataRequestMin): Promise<PaymentDataMin>;
+        loadPaymentData(request: PaymentDataRequestFull): Promise<PaymentDataFull>;
+        loadPaymentData(request: PaymentDataRequest): Promise<PaymentData>;
+        prefetchPaymentData(request: PaymentDataRequest): void;
+    }
+}
diff --git a/types/googlepay/tsconfig.json b/types/googlepay/tsconfig.json
new file mode 100644
index 0000000000..38fba1d6c8
--- /dev/null
+++ b/types/googlepay/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "googlepay-tests.ts"
+    ]
+}
diff --git a/types/googlepay/tslint.json b/types/googlepay/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/googlepay/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}

From bf0dd39818917e1a6e06f45111525004b7655fc0 Mon Sep 17 00:00:00 2001
From: Rasmus Eneman <rasmus@eneman.eu>
Date: Tue, 10 Apr 2018 01:23:25 +0200
Subject: [PATCH 1182/1382] Improve type inference of react-redux (#24764)

---
 types/react-redux/index.d.ts            | 12 ++++++------
 types/react-redux/react-redux-tests.tsx | 22 ++++++++++++++++++++++
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/types/react-redux/index.d.ts b/types/react-redux/index.d.ts
index 1528d58af5..52cc28b9a5 100644
--- a/types/react-redux/index.d.ts
+++ b/types/react-redux/index.d.ts
@@ -10,14 +10,14 @@
 //                 Prashant Deva <https://github.com/pdeva>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
-    
+
 // Known Issue:
-// There is a known issue in TypeScript, which doesn't allow decorators to change the signature of the classes 
+// There is a known issue in TypeScript, which doesn't allow decorators to change the signature of the classes
 // they are decorating. Due to this, if you are using @connect() decorator in your code,
 // you will see a bunch of errors from TypeScript. The current workaround is to use connect() as a function call on
 // a separate line instead of as a decorator. Discussed in this github issue:
 // https://github.com/DefinitelyTyped/DefinitelyTyped/issues/20796
-    
+
 import * as React from 'react';
 import * as Redux from 'redux';
 
@@ -80,17 +80,17 @@ export interface Connect {
 
     <TStateProps = {}, no_dispatch = {}, TOwnProps = {}, State = {}>(
         mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>
-    ): InferableComponentEnhancerWithProps<TStateProps & DispatchProp<any>, TOwnProps>;
+    ): InferableComponentEnhancerWithProps<TStateProps & DispatchProp<any> & TOwnProps, TOwnProps>;
 
     <no_state = {}, TDispatchProps = {}, TOwnProps = {}>(
         mapStateToProps: null | undefined,
         mapDispatchToProps: MapDispatchToPropsParam<TDispatchProps, TOwnProps>
-    ): InferableComponentEnhancerWithProps<TDispatchProps, TOwnProps>;
+    ): InferableComponentEnhancerWithProps<TDispatchProps & TOwnProps, TOwnProps>;
 
     <TStateProps = {}, TDispatchProps = {}, TOwnProps = {}, State = {}>(
         mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>,
         mapDispatchToProps: MapDispatchToPropsParam<TDispatchProps, TOwnProps>
-    ): InferableComponentEnhancerWithProps<TStateProps & TDispatchProps, TOwnProps>;
+    ): InferableComponentEnhancerWithProps<TStateProps & TDispatchProps & TOwnProps, TOwnProps>;
 
     <TStateProps = {}, no_dispatch = {}, TOwnProps = {}, TMergedProps = {}, State = {}>(
         mapStateToProps: MapStateToPropsParam<TStateProps, TOwnProps, State>,
diff --git a/types/react-redux/react-redux-tests.tsx b/types/react-redux/react-redux-tests.tsx
index 393c4d09da..07b81ff082 100644
--- a/types/react-redux/react-redux-tests.tsx
+++ b/types/react-redux/react-redux-tests.tsx
@@ -899,3 +899,25 @@ namespace TestCreateProvider {
     // <h1>A is 2</h1>
     ReactDOM.render(<Combined />, document.body);
 }
+
+namespace TestTypeInference {
+    interface State { a: number };
+
+    const OnlyState = connect(
+        (state: {a: number}, props: {b: number}) => ({a: state.a, c: state.a + props.b})
+    )(props => <span>{props.a} + {props.b} = {props.c}</span>)
+    interface State { a: number };
+    ReactDOM.render(<OnlyState b={1} />, document.body);
+
+    const OnlyDispatch = connect(
+        undefined,
+        (dispatch, props: {b: number}) => ({action: () => dispatch({type: 'action', b: props.b})})
+    )(props => <span onClick={props.action}>{props.b}</span>)
+    ReactDOM.render(<OnlyDispatch b={1} />, document.body);
+
+    const StateAndDispatch = connect(
+        (state: {a: number}, props: {b: number}) => ({a: state.a, c: state.a + props.b}),
+        (dispatch, props: {b: number}) => ({action: () => dispatch({type: 'action', b: props.b})})
+    )(props => <span>{props.a} + {props.b} = {props.c}</span>)
+    ReactDOM.render(<StateAndDispatch b={1} />, document.body);
+}

From 951c4f05dc8d1ab6db29896a8500f12be1f54a9e Mon Sep 17 00:00:00 2001
From: Matt Traynham <skitch920@gmail.com>
Date: Mon, 9 Apr 2018 19:24:54 -0400
Subject: [PATCH 1183/1382] Update supports color to 5.3 (#24745)

* Update supports color to 5.3

* Correct lint issue with supports-color v3

* Remove extra `export`
---
 types/supports-color/index.d.ts               | 23 +++---
 types/supports-color/supports-color-tests.ts  | 34 +++++---
 types/supports-color/tslint.json              | 78 +------------------
 types/supports-color/v3/index.d.ts            | 15 ++++
 .../supports-color/v3/supports-color-tests.ts | 17 ++++
 types/supports-color/v3/tsconfig.json         | 26 +++++++
 types/supports-color/v3/tslint.json           |  3 +
 7 files changed, 100 insertions(+), 96 deletions(-)
 create mode 100644 types/supports-color/v3/index.d.ts
 create mode 100644 types/supports-color/v3/supports-color-tests.ts
 create mode 100644 types/supports-color/v3/tsconfig.json
 create mode 100644 types/supports-color/v3/tslint.json

diff --git a/types/supports-color/index.d.ts b/types/supports-color/index.d.ts
index 34df865d4b..11fbde86ae 100644
--- a/types/supports-color/index.d.ts
+++ b/types/supports-color/index.d.ts
@@ -1,15 +1,18 @@
-// Type definitions for supports-color 3.1.2
+// Type definitions for supports-color 5.3
 // Project: https://github.com/chalk/supports-color
-// Definitions by: Melvin Groenhoff <https://github.com/mgroenhoff>
+// Definitions by: Melvin Groenhoff <https://github.com/mgroenhoff>, Matt Traynham <https://github.com/mtraynham>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare interface SupportsColor {
-    level: number;
-    hasBasic: boolean;
-    has256: boolean;
-    has16m: boolean;
+export namespace supportsColor {
+    interface Level {
+        level: number;
+        hasBasic: boolean;
+        has256: boolean;
+        has16m: boolean;
+    }
+
+    type SupportsColor = boolean & Level;
 }
 
-declare const supportsColor: boolean & SupportsColor;
-
-export = supportsColor;
+export const stdout: supportsColor.SupportsColor;
+export const stderr: supportsColor.SupportsColor;
diff --git a/types/supports-color/supports-color-tests.ts b/types/supports-color/supports-color-tests.ts
index 2e8d887c58..8d226ff78b 100644
--- a/types/supports-color/supports-color-tests.ts
+++ b/types/supports-color/supports-color-tests.ts
@@ -1,17 +1,33 @@
-import supportsColor = require("supports-color");
+import { stdout, stderr } from "supports-color";
 
-if (supportsColor) {
-    // Terminal supports color
+if (stdout) {
+    // Terminal standard output supports color
 }
 
-if (supportsColor.hasBasic) {
-    // Terminal supports color
+if (stdout.hasBasic) {
+    // Terminal standard output supports color
 }
 
-if (supportsColor.has256) {
-    // Terminal supports 256 colors
+if (stdout.has256) {
+    // Terminal standard output supports 256 colors
 }
 
-if (supportsColor.has16m) {
-    // Terminal supports 16 million colors (truecolor)
+if (stdout.has16m) {
+    // Terminal standard output supports 16 million colors (truecolor)
+}
+
+if (stderr) {
+    // Terminal standard error supports color
+}
+
+if (stderr.hasBasic) {
+    // Terminal standard error supports color
+}
+
+if (stderr.has256) {
+    // Terminal standard error supports 256 colors
+}
+
+if (stderr.has16m) {
+    // Terminal standard error supports 16 million colors (truecolor)
 }
diff --git a/types/supports-color/tslint.json b/types/supports-color/tslint.json
index a41bf5d19a..f93cf8562a 100644
--- a/types/supports-color/tslint.json
+++ b/types/supports-color/tslint.json
@@ -1,79 +1,3 @@
 {
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
-        "ban-types": false,
-        "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
-        "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
-        "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
-        "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
-        "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
-        "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
-        "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
-    }
+    "extends": "dtslint/dt.json"
 }
diff --git a/types/supports-color/v3/index.d.ts b/types/supports-color/v3/index.d.ts
new file mode 100644
index 0000000000..ead9dee193
--- /dev/null
+++ b/types/supports-color/v3/index.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for supports-color 3.1
+// Project: https://github.com/chalk/supports-color
+// Definitions by: Melvin Groenhoff <https://github.com/mgroenhoff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface SupportsColor {
+    level: number;
+    hasBasic: boolean;
+    has256: boolean;
+    has16m: boolean;
+}
+
+declare const supportsColor: boolean & SupportsColor;
+
+export = supportsColor;
diff --git a/types/supports-color/v3/supports-color-tests.ts b/types/supports-color/v3/supports-color-tests.ts
new file mode 100644
index 0000000000..2e8d887c58
--- /dev/null
+++ b/types/supports-color/v3/supports-color-tests.ts
@@ -0,0 +1,17 @@
+import supportsColor = require("supports-color");
+
+if (supportsColor) {
+    // Terminal supports color
+}
+
+if (supportsColor.hasBasic) {
+    // Terminal supports color
+}
+
+if (supportsColor.has256) {
+    // Terminal supports 256 colors
+}
+
+if (supportsColor.has16m) {
+    // Terminal supports 16 million colors (truecolor)
+}
diff --git a/types/supports-color/v3/tsconfig.json b/types/supports-color/v3/tsconfig.json
new file mode 100644
index 0000000000..c1dd8f8f2a
--- /dev/null
+++ b/types/supports-color/v3/tsconfig.json
@@ -0,0 +1,26 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "types": [],
+        "paths": {
+            "supports-color": ["supports-color/v3"]
+        },
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "supports-color-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/supports-color/v3/tslint.json b/types/supports-color/v3/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/supports-color/v3/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}

From 21e5370ae94da375550f414d386d16387cdbcfc1 Mon Sep 17 00:00:00 2001
From: Andy Patterson <andnpatterson@gmail.com>
Date: Mon, 9 Apr 2018 19:31:31 -0400
Subject: [PATCH 1184/1382] [@types/mathjs] enable linting (#24725)

* [@types/mathjs] enable linting

* [@types/mathjs] add username to definitions

* [@types/mathjs] remove redundant jsdoc annotations and export statements
---
 types/mathjs/index.d.ts      | 1000 ++++++++++++++++------------------
 types/mathjs/mathjs-tests.ts |  311 +++++------
 types/mathjs/tslint.json     |   75 +--
 3 files changed, 594 insertions(+), 792 deletions(-)

diff --git a/types/mathjs/index.d.ts b/types/mathjs/index.d.ts
index 0341d80c6b..a02729b635 100644
--- a/types/mathjs/index.d.ts
+++ b/types/mathjs/index.d.ts
@@ -1,22 +1,22 @@
-// Type definitions for mathjs
+// Type definitions for mathjs 3.20
 // Project: http://mathjs.org/
-// Definitions by: Ilya Shestakov <https://github.com/siavol>
+// Definitions by: Ilya Shestakov <https://github.com/siavol>,
+// 				   Andy Patterson <https://github.com/andnp>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
 
 import { Decimal } from 'decimal.js';
 
-declare var math: mathjs.IMathJsStatic;
-export as namespace math;
-export = math;
-
-declare namespace mathjs {
+declare const math: math.MathJsStatic; // tslint:disable-line strict-export-declare-modifiers
+export as namespace math; // tslint:disable-line strict-export-declare-modifiers
+export = math; // tslint:disable-line strict-export-declare-modifiers
 
+declare namespace math { // tslint:disable-line strict-export-declare-modifiers
 	type MathArray = number[]|number[][];
 	type MathType = number|BigNumber|Fraction|Complex|Unit|MathArray|Matrix;
 	type MathExpression = string|string[]|MathArray|Matrix;
 
-	export interface IMathJsStatic {
-
+	interface MathJsStatic {
 		e: number;
 		pi: number;
 		i: number;
@@ -35,9 +35,9 @@ declare namespace mathjs {
 		uninitialized: any;
 		version: string;
 
-		config(options: any): void;
+		expression: MathNode;
 
-                expression: MathNode;
+		config: (options: any) => void;
 
 		/**
 		 * Solves the linear equation system by forwards substitution. Matrix must be a lower triangular matrix.
@@ -48,7 +48,7 @@ declare namespace mathjs {
 		lsolve(L: Matrix|MathArray, b: Matrix|MathArray): Matrix|MathArray;
 
 		/**
-                 * Calculate the Matrix LU decomposition with partial pivoting. Matrix A is decomposed in two matrices (L, U)
+		 * Calculate the Matrix LU decomposition with partial pivoting. Matrix A is decomposed in two matrices (L, U)
 		 * and a row permutation vector p where A[p,:] = L * U
 		 * @param A A two dimensional matrix or array for which to get the LUP decomposition.
 		 * @returns The lower triangular matrix, the upper triangular matrix and the permutation matrix.
@@ -61,22 +61,22 @@ declare namespace mathjs {
 		 * @param b Column Vector
 		 * @returns Column vector with the solution to the linear system A * x = b
 		 */
-		lusolve(A: Matrix|MathArray|Number, b: Matrix|MathArray): Matrix|MathArray;
+		lusolve(A: Matrix|MathArray|number, b: Matrix|MathArray): Matrix|MathArray;
 
 		/**
-                 * Calculate the Sparse Matrix LU decomposition with full pivoting. Sparse Matrix A is decomposed in
+		 * Calculate the Sparse Matrix LU decomposition with full pivoting. Sparse Matrix A is decomposed in
 		 * two matrices (L, U) and two permutation vectors (pinv, q) where P * A * Q = L * U
 		 * @param A A two dimensional sparse matrix for which to get the LU decomposition.
-                 * @param order The Symbolic Ordering and Analysis order: 0 - Natural ordering, no permutation vector q is
-                 * returned 1 - Matrix must be square, symbolic ordering and analisis is performed on M = A + A' 2 - Symbolic
-                 * ordering and analisis is performed on M = A' * A. Dense columns from A' are dropped, A recreated from A'.
-                 * This is appropriatefor LU factorization of unsymmetric matrices. 3 - Symbolic ordering and analisis is performed
-                 * on M = A' * A. This is best used for LU factorization is matrix M has no dense rows. A dense row is a row with
+		 * @param order The Symbolic Ordering and Analysis order: 0 - Natural ordering, no permutation vector q is
+		 * returned 1 - Matrix must be square, symbolic ordering and analisis is performed on M = A + A' 2 - Symbolic
+		 * ordering and analysis is performed on M = A' * A. Dense columns from A' are dropped, A recreated from A'.
+		 * This is appropriate for LU factorization of non-symmetric matrices. 3 - Symbolic ordering and analysis is performed
+		 * on M = A' * A. This is best used for LU factorization is matrix M has no dense rows. A dense row is a row with
 		 * more than 10*sqr(columns) entries.
 		 * @param threshold Partial pivoting threshold (1 for partial pivoting)
 		 * @returns The lower triangular matrix, the upper triangular matrix and the permutation vectors.
 		 */
-		slu(A: Matrix, order: Number, threshold: Number): any;
+		slu(A: Matrix, order: number, threshold: number): any;
 
 		/**
 		 * Solves the linear equation system by backward substitution. Matrix must be an upper triangular matrix. U * x = b
@@ -84,7 +84,7 @@ declare namespace mathjs {
 		 * @param b A column vector with the b values
 		 * @returns A column vector with the linear system solution (x)
 		 */
-		usolve(U: Matrix|MathArray, b:Matrix|MathArray): Matrix|MathArray;
+		usolve(U: Matrix|MathArray, b: Matrix|MathArray): Matrix|MathArray;
 
 		/**
 		 * Calculate the absolute value of a number. For matrices, the function is evaluated element wise.
@@ -134,7 +134,7 @@ declare namespace mathjs {
 		ceil(x: Matrix): Matrix;
 		ceil(x: Unit): Unit;
 
-                /**
+		/**
 		 * Compute the cube of a value, x * x * x. For matrices, the function is evaluated element wise.
 		 * @param x Number for which to calculate the cube
 		 * @returns Cube of x
@@ -155,7 +155,7 @@ declare namespace mathjs {
 		 */
 		divide(x: Unit, y: Unit): Unit;
 		divide(x: number, y: number): number;
-		divide(x:MathType, y:MathType): MathType;
+		divide(x: MathType, y: MathType): MathType;
 
 		/**
 		 * Divide two matrices element wise. The function accepts both matrices and scalar values.
@@ -173,7 +173,7 @@ declare namespace mathjs {
 		 */
 		dotMultiply(x: MathType, y: MathType): MathType;
 
-                /**
+		/**
 		 * Calculates the power of x to y element wise.
 		 * @param x The base
 		 * @param y The exponent
@@ -187,21 +187,21 @@ declare namespace mathjs {
 		 * #returns Exponent of x
 		 */
 		exp(x: number): number;
-		exp(x: BigNumber ): BigNumber ;
-		exp(x: Complex ): Complex ;
-		exp(x: MathArray ): MathArray ;
+		exp(x: BigNumber): BigNumber ;
+		exp(x: Complex): Complex ;
+		exp(x: MathArray): MathArray ;
 		exp(x: Matrix): Matrix;
 
-                /**
+		/**
 		 * Round a value towards zero. For matrices, the function is evaluated element wise.
 		 * @param x Number to be rounded
 		 * @returns Rounded value
 		 */
 		fix(x: number): number;
-		fix(x: BigNumber ): BigNumber ;
-		fix(x: Fraction ): Fraction ;
-		fix(x: Complex ): Complex ;
-		fix(x: MathArray ): MathArray ;
+		fix(x: BigNumber): BigNumber ;
+		fix(x: Fraction): Fraction ;
+		fix(x: Complex): Complex ;
+		fix(x: MathArray): MathArray ;
 		fix(x: Matrix): Matrix;
 
 		/**
@@ -210,10 +210,10 @@ declare namespace mathjs {
 		 * @returns Rounded value
 		 */
 		floor(x: number): number;
-		floor(x: BigNumber ): BigNumber ;
-		floor(x: Fraction ): Fraction ;
-		floor(x: Complex ): Complex ;
-		floor(x: MathArray ): MathArray ;
+		floor(x: BigNumber): BigNumber ;
+		floor(x: Fraction): Fraction ;
+		floor(x: Complex): Complex ;
+		floor(x: MathArray): MathArray ;
 		floor(x: Matrix): Matrix;
 
 		/**
@@ -246,7 +246,7 @@ declare namespace mathjs {
 		 * For matrices, the function is evaluated element wise.
 		 */
 		lcm(a: number, b: number): number;
-		lcm(a: BigNumber , b: BigNumber ): BigNumber ;
+		lcm(a: BigNumber , b: BigNumber): BigNumber ;
 		lcm(a: MathArray, b: MathArray): MathArray;
 		lcm(a: Matrix, b: Matrix): Matrix;
 
@@ -271,7 +271,7 @@ declare namespace mathjs {
 		 * Calculates the modulus, the remainder of an integer division. For matrices, the function is evaluated element wise.
 		 * The modulus is defined as:
 		 * x - y * floor(x / y)
-		 * See http://en.wikipedia.org/wiki/Modulo_operation.
+		 * @see http://en.wikipedia.org/wiki/Modulo_operation.
 		 * @param x Dividend
 		 * @param y Divisor
 		 */
@@ -280,7 +280,6 @@ declare namespace mathjs {
 		/**
 		 * Multiply two values, x * y. The result is squeezed. For matrices, the matrix product is calculated.
 		 */
-		multiply(x: MathArray|Matrix, y: MathArray|Matrix): Matrix;
 		multiply(x: MathArray|Matrix, y: MathType): Matrix;
 		multiply(x: Unit, y: Unit): Unit;
 		multiply(x: number, y: number): number;
@@ -325,9 +324,9 @@ declare namespace mathjs {
 		 * For matrices, the function is evaluated element wise.
 		 */
 		sign(x: number): number;
-		sign(x: BigNumber ): BigNumber;
-		sign(x: Fraction ): Fraction ;
-		sign(x: Complex ): Complex ;
+		sign(x: BigNumber): BigNumber;
+		sign(x: Fraction): Fraction ;
+		sign(x: Complex): Complex ;
 		sign(x: MathArray): MathArray;
 		sign(x: Matrix): Matrix;
 		sign(x: Unit): Unit;
@@ -336,8 +335,8 @@ declare namespace mathjs {
 		 * Calculate the square root of a value. For matrices, the function is evaluated element wise.
 		 */
 		sqrt(x: number): number;
-		sqrt(x: BigNumber ): BigNumber;
-		sqrt(x: Complex ): Complex ;
+		sqrt(x: BigNumber): BigNumber;
+		sqrt(x: Complex): Complex ;
 		sqrt(x: MathArray): MathArray;
 		sqrt(x: Matrix): Matrix;
 		sqrt(x: Unit): Unit;
@@ -346,9 +345,9 @@ declare namespace mathjs {
 		 * Compute the square of a value, x * x. For matrices, the function is evaluated element wise.
 		 */
 		square(x: number): number;
-		square(x: BigNumber ): BigNumber;
-		square(x: Fraction ): Fraction ;
-		square(x: Complex ): Complex ;
+		square(x: BigNumber): BigNumber;
+		square(x: Fraction): Fraction ;
+		square(x: Complex): Complex ;
 		square(x: MathArray): MathArray;
 		square(x: Matrix): Matrix;
 		square(x: Unit): Unit;
@@ -363,9 +362,9 @@ declare namespace mathjs {
 		 * For matrices, the function is evaluated element wise. Boolean values and strings will be converted to a number. For complex numbers, both real and complex value are inverted.
 		 */
 		unaryMinus(x: number): number;
-		unaryMinus(x: BigNumber ): BigNumber;
-		unaryMinus(x: Fraction ): Fraction ;
-		unaryMinus(x: Complex ): Complex ;
+		unaryMinus(x: BigNumber): BigNumber;
+		unaryMinus(x: Fraction): Fraction ;
+		unaryMinus(x: Complex): Complex ;
 		unaryMinus(x: MathArray): MathArray;
 		unaryMinus(x: Matrix): Matrix;
 		unaryMinus(x: Unit): Unit;
@@ -375,10 +374,10 @@ declare namespace mathjs {
 		 * For matrices, the function is evaluated element wise.
 		 */
 		unaryPlus(x: number): number;
-		unaryPlus(x: BigNumber ): BigNumber;
-		unaryPlus(x: Fraction ): Fraction ;
+		unaryPlus(x: BigNumber): BigNumber;
+		unaryPlus(x: Fraction): Fraction ;
 		unaryPlus(x: string): string;
-		unaryPlus(x: Complex ): Complex ;
+		unaryPlus(x: Complex): Complex ;
 		unaryPlus(x: MathArray): MathArray;
 		unaryPlus(x: Matrix): Matrix;
 		unaryPlus(x: Unit): Unit;
@@ -397,7 +396,7 @@ declare namespace mathjs {
 		 * Bitwise NOT value, ~x. For matrices, the function is evaluated element wise. For units, the function is evaluated on the best prefix base.
 		 */
 		bitNot(x: number): number;
-		bitNot(x: BigNumber ): BigNumber ;
+		bitNot(x: BigNumber): BigNumber ;
 		bitNot(x: MathArray): MathArray;
 		bitNot(x: Matrix): Matrix;
 
@@ -405,7 +404,7 @@ declare namespace mathjs {
 		 * Bitwise OR two values, x | y. For matrices, the function is evaluated element wise. For units, the function is evaluated on the lowest print base.
 		 */
 		bitOr(x: number): number;
-		bitOr(x: BigNumber ): BigNumber ;
+		bitOr(x: BigNumber): BigNumber ;
 		bitOr(x: MathArray): MathArray;
 		bitOr(x: Matrix): Matrix;
 
@@ -436,17 +435,19 @@ declare namespace mathjs {
 		rightLogShift(x: number|MathArray|Matrix, y: number): number|MathArray|Matrix;
 
 		/**
-		 * The Bell Numbers count the number of partitions of a set. A partition is a pairwise disjoint subset of S whose union is S. bellNumbers only takes integer arguments. The following condition must be enforced: n >= 0
+		 * The Bell Numbers count the number of partitions of a set.
+		 * A partition is a pairwise disjoint subset of S whose union is S. bellNumbers only takes integer arguments.
+		 * The following condition must be enforced: n >= 0
 		 * @param n Total number of objects in the set
 		 */
-		bellNumbers(n: Number): Number;
+		bellNumbers(n: number): number;
 		bellNumbers(n: BigNumber): BigNumber;
 
 		/**
 		 * The Catalan Numbers enumerate combinatorial structures of many different types. catalan only takes integer arguments. The following condition must be enforced: n >= 0
-		 * @pararm n nth Catalan number
+		 * @param n nth Catalan number
 		 */
-		catalan(n: Number): Number;
+		catalan(n: number): number;
 		catalan(n: BigNumber): BigNumber;
 
 		/**
@@ -455,22 +456,22 @@ declare namespace mathjs {
 		 * @param k Number of objects in the subset
 		 * @returns Returns the composition counts of n into k parts.
 		 */
-		composition(n: Number|BigNumber, k: Number|BigNumber): Number|BigNumber
+		composition(n: number|BigNumber, k: number|BigNumber): number|BigNumber;
 
 		/**
-		 * The Stirling numbers of the second kind, counts the number of ways to partition a set of n labelled objects into k nonempty unlabelled subsets. stirlingS2 only takes integer arguments. The following condition must be enforced: k <= n.
+		 * The Stirling numbers of the second kind, counts the number of ways to partition a set of n labelled objects into k nonempty unlabelled subsets.
+		 * stirlingS2 only takes integer arguments. The following condition must be enforced: k <= n.
 		 * If n = k or k = 1, then s(n,k) = 1
 		 * @param n Total number of objects in the set
 		 * @param k Number of objects in the subset
 		 */
-		stirlingS2(n: Number|BigNumber, k: Number|BigNumber): Number|BigNumber;
+		stirlingS2(n: number|BigNumber, k: number|BigNumber): number|BigNumber;
 
 		/**
 		 * Compute the argument of a complex value. For a complex number a + bi, the argument is computed as atan2(b, a). For matrices, the function is evaluated element wise.
 		 * @param x A complex number or array with complex numbers
 		 */
-		arg(x: number): number;
-		arg(x: Complex): number;
+		arg(x: number|Complex): number;
 		arg(x: MathArray): MathArray;
 		arg(x: Matrix): Matrix;
 
@@ -480,8 +481,8 @@ declare namespace mathjs {
 		 */
 		conj(x: number|BigNumber|Complex|MathArray|Matrix): number|BigNumber|Complex|MathArray|Matrix;
 
-                /**
-                 * Get the imaginary part of a complex number. For a complex number a + bi, the function returns b.
+		/**
+		 * Get the imaginary part of a complex number. For a complex number a + bi, the function returns b.
 		 * For matrices, the function is evaluated element wise.
 		 */
 		im(x: number|BigNumber|Complex|MathArray|Matrix): number|BigNumber|MathArray|Matrix;
@@ -498,29 +499,28 @@ declare namespace mathjs {
 		bignumber(x?: number|string|MathArray|Matrix|boolean): BigNumber;
 
 		/**
-		 * Create a boolean or convert a string or number to a boolean. In case of a number, true is returned for non-zero numbers, and false in case of zero. Strings can be 'true' or 'false', or can contain a number. When value is a matrix, all elements will be converted to boolean.
+		 * Create a boolean or convert a string or number to a boolean.
+		 * In case of a number, true is returned for non-zero numbers, and false in case of zero.
+		 * Strings can be 'true' or 'false', or can contain a number. When value is a matrix, all elements will be converted to boolean.
 		 */
-		boolean(x: string|number|boolean|MathArray|Matrix ): boolean|MathArray|Matrix;
+		boolean(x: string|number|boolean|MathArray|Matrix): boolean|MathArray|Matrix;
 
 		/**
 		 * Wrap any value in a chain, allowing to perform chained operations on the value.
-		 * All methods available in the math.js library can be called upon the chain, and then will be evaluated with the value itself as first argument. The chain can be closed by executing chain.done(), which returns the final value.
+		 * All methods available in the math.js library can be called upon the chain, and then will be evaluated with the value itself as first argument.
+		 * The chain can be closed by executing chain.done(), which returns the final value.
 		 * The chain has a number of special functions:
 		 * done() Finalize the chain and return the chain's value.
 		 * valueOf() The same as done()
 		 * toString() Executes math.format() onto the chain's value, returning a string representation of the value.
 		 */
-		chain(value?: any): IMathJsChain;
+		chain(value?: any): MathJsChain;
 
 		/**
 		 * Create a complex value or convert a value to a complex value.
 		 */
-		complex(): Complex;
+		complex(arg?: Complex|string|MathArray| PolarCoordinates): Complex;
 		complex(re: number, im: number): Complex;
-		complex(complex: Complex): Complex;
-		complex(arg: string): Complex;
-		complex(array: MathArray): Complex;
-		complex(obj: IPolarCoordinates): Complex;
 
 		/**
 		 * Create a fraction convert a value to a fraction.
@@ -533,8 +533,8 @@ declare namespace mathjs {
 		index(...ranges: any[]): Index;
 
 		/**
-                 * Create a Matrix. The function creates a new math.type.Matrix object from an Array. A Matrix has utility functions
-                 * to manipulate the data in the matrix, like getting the size and getting or setting values in the matrix. Supported
+		 * Create a Matrix. The function creates a new math.type.Matrix object from an Array. A Matrix has utility functions
+		 * to manipulate the data in the matrix, like getting the size and getting or setting values in the matrix. Supported
 		 * storage formats are 'dense' and 'sparse'.
 		 */
 		matrix(format?: 'sparse'|'dense'): Matrix;
@@ -547,11 +547,11 @@ declare namespace mathjs {
 		number(unit: Unit, valuelessUnit: Unit|string): number|MathArray|Matrix;
 
 		/**
-                 * Create a Sparse Matrix. The function creates a new math.type.Matrix object from an Array. A Matrix has utility
+		 * Create a Sparse Matrix. The function creates a new math.type.Matrix object from an Array. A Matrix has utility
 		 * functions to manipulate the data in the matrix, like getting the size and getting or setting values in the matrix.
 		 * @param data A two dimensional array
 		 */
-		sparse(data?: MathArray|Matrix, dataType?:string): Matrix;
+		sparse(data?: MathArray|Matrix, dataType?: string): Matrix;
 
 		/**
 		 * Create a string or convert any object into a string. Elements of Arrays and Matrices are processed element wise.
@@ -560,18 +560,17 @@ declare namespace mathjs {
 		string(value: any): string|MathArray|Matrix;
 
 		/**
-                 * Create a unit. Depending on the passed arguments, the function will create and return a new math.type.Unit object.
+		 * Create a unit. Depending on the passed arguments, the function will create and return a new math.type.Unit object.
 		 * When a matrix is provided, all elements will be converted to units.
 		 */
 		unit(unit: string): Unit;
 		unit(value: number, unit: string): Unit;
 
 		/**
-                 * Create a user-defined unit and register it with the Unit type.
+		 * Create a user-defined unit and register it with the Unit type.
 		 */
-		createUnit(name: string): Unit;
-		createUnit(name: string, definition: string|UnitDefinition, options?: CreateUnitOptions): Unit;
-		createUnit(units: {[name: string]: string|UnitDefinition}, options?: CreateUnitOptions): Unit;
+		createUnit(name: string, definition?: string|UnitDefinition, options?: CreateUnitOptions): Unit;
+		createUnit(units: Record<string, string|UnitDefinition>, options?: CreateUnitOptions): Unit;
 
 		/**
 		 * Parse and compile an expression. Returns a an object with a function eval([scope]) to evaluate the compiled expression.
@@ -582,8 +581,7 @@ declare namespace mathjs {
 		/**
 		 * Evaluate an expression.
 		 */
-		eval(expr: MathExpression, scope?: any): any;
-		eval(exprs: MathExpression[], scope?: any): any;
+		eval(expr: MathExpression|MathExpression[], scope?: any): any;
 
 		/**
 		 * Retrieve help on a function or data type. Help files are retrieved from the documentation in math.expression.docs.
@@ -602,21 +600,21 @@ declare namespace mathjs {
 		parser(): Parser;
 
 		/**
-                 * Calculates: The eucledian distance between two points in 2 and 3 dimensional spaces. Distance between point
-                 * and a line in 2 and 3 dimensional spaces. Pairwise distance between a set of 2D or 3D points NOTE: When
-                 * substituting coefficients of a line(a, b and c), use ax + by + c = 0 instead of ax + by = c For parametric
+		 * Calculates: The eucledian distance between two points in 2 and 3 dimensional spaces. Distance between point
+		 * and a line in 2 and 3 dimensional spaces. Pairwise distance between a set of 2D or 3D points NOTE: When
+		 * substituting coefficients of a line(a, b and c), use ax + by + c = 0 instead of ax + by = c For parametric
 		 * equation of a 3D line, x0, y0, z0, a, b, c are from: (x−x0, y−y0, z−z0) = t(a, b, c)
 		 */
-		distance(x: MathArray|Matrix|any, y: MathArray|Matrix|any): Number | BigNumber;
+		distance(x: MathType, y: MathType): number | BigNumber;
 
 		/**
-                 * Calculates the point of intersection of two lines in two or three dimensions and of a line and a plane in
-                 * three dimensions. The inputs are in the form of arrays or 1 dimensional matrices. The line intersection functions
+		 * Calculates the point of intersection of two lines in two or three dimensions and of a line and a plane in
+		 * three dimensions. The inputs are in the form of arrays or 1 dimensional matrices. The line intersection functions
 		 * return null if the lines do not meet.
 		 * Note: Fill the plane coefficients as x + y + z = c and not as x + y + z + c = 0.
 		 * @param w Co-ordinates of first end-point of first line
 		 * @param x Co-ordinates of second end-point of first line
-		 * @param y Co-ordinates of first end-point of second line OR Co-efficients of the plane's equation
+		 * @param y Co-ordinates of first end-point of second line OR Coefficients of the plane's equation
 		 * @param z Co-ordinates of second end-point of second line OR null if the calculation is for line and plane
 		 * @returns Returns the point of intersection of lines/lines-planes
 		 */
@@ -646,10 +644,10 @@ declare namespace mathjs {
 		 * Concatenate two or more matrices.
 		 * dim: number is a zero-based dimension over which to concatenate the matrices. By default the last dimension of the matrices.
 		 */
-		concat(...args: (MathArray|Matrix|number)[]): MathArray|Matrix;
+		concat(...args: Array<MathArray|Matrix|number>): MathArray|Matrix;
 
 		/**
-                 * Calculate the cross product for two vectors in three dimensional space. The cross product of A = [a1, a2, a3]
+		 * Calculate the cross product for two vectors in three dimensional space. The cross product of A = [a1, a2, a3]
 		 * and B =[b1, b2, b3] is defined as:
 		 * cross(A, B) = [ a2 * b3 - a3 * b2, a3 * b1 - a1 * b3, a1 * b2 - a2 * b1 ]
 		 */
@@ -662,9 +660,9 @@ declare namespace mathjs {
 
 		/**
 		 * Create a diagonal matrix or retrieve the diagonal of a matrix.
-                 * When x is a vector, a matrix with vector x on the diagonal will be returned. When x is a two dimensional matrix,
+		 * When x is a vector, a matrix with vector x on the diagonal will be returned. When x is a two dimensional matrix,
 		 * the matrixes kth diagonal will be returned
-                 * as vector. When k is positive, the values are placed on the super diagonal. When k is negative, the values are
+		 * as vector. When k is positive, the values are placed on the super diagonal. When k is negative, the values are
 		 * placed on the sub diagonal.
 		 * @param X A two dimensional matrix or a vector
 		 * @param k The diagonal where the vector will be filled in or retrieved. Default value: 0.
@@ -674,7 +672,8 @@ declare namespace mathjs {
 		diag(X: MathArray|Matrix, k: number|BigNumber, format?: string): Matrix;
 
 		/**
-                 * Calculate the dot product of two vectors. The dot product of A = [a1, a2, a3, ..., an] and B = [b1, b2, b3, ..., bn]
+		 * Calculate the dot product of two vectors.
+		 * The dot product of A = [a1, a2, a3, ..., an] and B = [b1, b2, b3, ..., bn]
 		 * is defined as:
 		 * dot(A, B) = a1 * b1 + a2 * b2 + a3 * b3 + ... + an * bn
 		 */
@@ -683,14 +682,13 @@ declare namespace mathjs {
 		/**
 		 * Create a 2-dimensional identity matrix with size m x n or n x n. The matrix has ones on the diagonal and zeros elsewhere.
 		 */
-		eye(n: number, format?: string): Matrix;
+		eye(n: number|number[], format?: string): Matrix;
 		eye(m: number, n: number, format?: string): Matrix;
-		eye(size: number[], format?: string): Matrix;
 
 		/**
 		 * Flatten a multi dimensional matrix into a single dimensional matrix.
 		 */
-                flatten(x: MathArray|Matrix): MathArray|Matrix;
+        flatten(x: MathArray|Matrix): MathArray|Matrix;
 
 		/**
 		 * Calculate the inverse of a square matrix.
@@ -700,9 +698,8 @@ declare namespace mathjs {
 		/**
 		 * Create a matrix filled with ones. The created matrix can have one or multiple dimensions.
 		 */
-		ones(n: number, format?: string): MathArray|Matrix;
+		ones(n: number|number[], format?: string): MathArray|Matrix;
 		ones(m: number, n: number, format?: string): MathArray|Matrix;
-		ones(size: number[], format?: string): MathArray|Matrix;
 
 		/**
 		 * Create an array from a range. By default, the range end is excluded. This can be customized by providing an extra parameter includeEnd.
@@ -713,8 +710,8 @@ declare namespace mathjs {
 		 * @returns Parameters describing the ranges start, end, and optional step.
 		 */
 		range(str: string, includeEnd?: boolean): Matrix;
-		range(start: number|BigNumber, end:number|BigNumber, includeEnd?:boolean): Matrix;
-		range(start: number|BigNumber, end: number|BigNumber, step: number|BigNumber, includeEnd?:boolean): Matrix;
+		range(start: number|BigNumber, end: number|BigNumber, includeEnd?: boolean): Matrix;
+		range(start: number|BigNumber, end: number|BigNumber, step: number|BigNumber, includeEnd?: boolean): Matrix;
 
 		/**
 		 * Resize a matrix
@@ -756,12 +753,11 @@ declare namespace mathjs {
 		/**
 		 * Create a matrix filled with zeros. The created matrix can have one or multiple dimensions.
 		 */
-		zeros(n: number, format?: string): MathArray|Matrix;
+		zeros(n: number|number[], format?: string): MathArray|Matrix;
 		zeros(m: number, n: number, format?: string): MathArray|Matrix;
-		zeros(size: number[], format?: string): MathArray|Matrix;
 
 		/**
-                 * Compute the number of ways of picking k unordered outcomes from n possibilities.
+		 * Compute the number of ways of picking k unordered outcomes from n possibilities.
 		 * Combinations only takes integer arguments. The following condition must be enforced: k <= n.
 		 */
 		combinations(n: number|BigNumber, k: number|BigNumber): number|BigNumber;
@@ -779,7 +775,7 @@ declare namespace mathjs {
 		factorial(n: number|BigNumber|MathArray|Matrix): number|BigNumber|MathArray|Matrix;
 
 		/**
-                 * Compute the gamma function of a value using Lanczos approximation for small values, and an extended
+		 * Compute the gamma function of a value using Lanczos approximation for small values, and an extended
 		 * Stirling approximation for large values.
 		 * For matrices, the function is evaluated element wise.
 		 */
@@ -802,7 +798,7 @@ declare namespace mathjs {
 		 * @param n The number of objects in total
 		 * @param k The number of objects in the subset
 		 */
-		permutations(n: number|BigNumber, k?:number|BigNumber): number|BigNumber;
+		permutations(n: number|BigNumber, k?: number|BigNumber): number|BigNumber;
 
 		/**
 		 * Random pick a value from a one dimensional array. Array element is picked using a random function with uniform distribution.
@@ -812,23 +808,18 @@ declare namespace mathjs {
 		/**
 		 * Return a random number larger or equal to min and smaller than max using a uniform distribution.
 		 */
-		random(): number;
-		random(max: number): number;
-		random(min: number, max: number): number;
-		random(size: MathArray|Matrix, max?: number): MathArray|Matrix;
-		random(size: MathArray|Matrix, min:number, max: number): MathArray|Matrix;
+		random(min?: number, max?: number): number;
+		random(size: MathArray|Matrix, min?: number, max?: number): MathArray|Matrix;
 
 		/**
 		 * Return a random integer number larger or equal to min and smaller than max using a uniform distribution.
 		 */
-		randomInt(max: number): number;
-		randomInt(min: number, max: number): number;
-		randomInt(size: MathArray|Matrix, max?: number): MathArray|Matrix;
-		randomInt(size: MathArray|Matrix, min:number, max: number): MathArray|Matrix;
+		randomInt(min: number, max?: number): number;
+		randomInt(size: MathArray|Matrix, min?: number, max?: number): MathArray|Matrix;
 
 		/**
 		 * Compare two values. Returns 1 when x > y, -1 when x < y, and 0 when x == y.
-                 * x and y are considered equal when the relative difference between x and y is smaller than the configured epsilon.
+		 * x and y are considered equal when the relative difference between x and y is smaller than the configured epsilon.
 		 * The function cannot be used to compare values smaller than approximately 2.22e-16.
 		 * For matrices, the function is evaluated element wise.
 		 */
@@ -841,91 +832,78 @@ declare namespace mathjs {
 
 		/**
 		 * Test whether two values are equal.
-                 *
-                 * The function tests whether the relative difference between x and y is smaller than the configured epsilon.
+		 *
+		 * The function tests whether the relative difference between x and y is smaller than the configured epsilon.
 		 * The function cannot be used to compare values smaller than approximately 2.22e-16.
-                 *
 		 * For matrices, the function is evaluated element wise. In case of complex numbers, x.re must equal y.re, and x.im must equal y.im.
-                 *
 		 * Values null and undefined are compared strictly, thus null is only equal to null and nothing else, and undefined is only equal to undefined and nothing else.
 		 */
 		equal(x: MathType, y: MathType): boolean|MathArray|Matrix;
 
 		/**
 		 * Test whether value x is larger than y.
-                 *
-                 * The function returns true when x is larger than y and the relative difference between x and y is larger than the configured epsilon.
+		 * The function returns true when x is larger than y and the relative difference between x and y is larger than the configured epsilon.
 		 * The function cannot be used to compare values smaller than approximately 2.22e-16.
-                 *
 		 * For matrices, the function is evaluated element wise.
 		 */
 		larger(x: MathType, y: MathType): boolean|MathArray|Matrix;
 
 		/**
 		 * Test whether value x is larger or equal to y.
-                 *
-                 * The function returns true when x is larger than y or the relative difference between x and y is smaller than the configured epsilon.
+		 * The function returns true when x is larger than y or the relative difference between x and y is smaller than the configured epsilon.
 		 * The function cannot be used to compare values smaller than approximately 2.22e-16.
-                 *
 		 * For matrices, the function is evaluated element wise.
 		 */
 		largerEq(x: MathType, y: MathType): boolean|MathArray|Matrix;
 
 		/**
 		 * Test whether value x is smaller than y.
-                 *
-                 * The function returns true when x is smaller than y and the relative difference between x and y is smaller than the configured epsilon.
+		 * The function returns true when x is smaller than y and the relative difference between x and y is smaller than the configured epsilon.
 		 * The function cannot be used to compare values smaller than approximately 2.22e-16.
-                 *
 		 * For matrices, the function is evaluated element wise.
 		 */
 		smaller(x: MathType, y: MathType): boolean|MathArray|Matrix;
 
 		/**
 		 * Test whether value x is smaller or equal to y.
-                 *
-                 * The function returns true when x is smaller than y or the relative difference between x and y is smaller than the configured epsilon.
+		 * The function returns true when x is smaller than y or the relative difference between x and y is smaller than the configured epsilon.
 		 * The function cannot be used to compare values smaller than approximately 2.22e-16. For matrices, the function is evaluated element wise.
 		 */
 		smallerEq(x: MathType, y: MathType): boolean|MathArray|Matrix;
 
 		/**
 		 * Test whether two values are unequal.
-                 *
-                 * The function tests whether the relative difference between x and y is larger than the configured epsilon. The function cannot
+		 * The function tests whether the relative difference between x and y is larger than the configured epsilon. The function cannot
 		 * be used to compare values smaller than approximately 2.22e-16.
-                 *
 		 * For matrices, the function is evaluated element wise. In case of complex numbers, x.re must unequal y.re, or x.im must unequal y.im.
-                 *
-                 * Values null and undefined are compared strictly, thus null is unequal with everything except null, and undefined is unequal with
-		 * everying except. undefined.
+		 * Values null and undefined are compared strictly, thus null is unequal with everything except null, and undefined is unequal with
+		 * everything except undefined.
 		 */
 		unequal(x: MathType, y: MathType): boolean|MathArray|Matrix;
 
 		/**
-                 * Compute the maximum value of a matrix or a list with values. In case of a multi dimensional array, the maximum of the flattened
+		 * Compute the maximum value of a matrix or a list with values. In case of a multi dimensional array, the maximum of the flattened
 		 * array will be calculated. When dim is provided, the maximum over the selected dimension will be calculated. Parameter dim is zero-based.
 		 */
 		max(...args: MathType[]): any;
 		max(A: MathArray|Matrix, dim?: number): any;
 
 		/**
-                 * Compute the mean value of matrix or a list with values. In case of a multi dimensional array, the mean of the flattened array will be
+		 * Compute the mean value of matrix or a list with values. In case of a multi dimensional array, the mean of the flattened array will be
 		 * calculated. When dim is provided, the maximum over the selected dimension will be calculated. Parameter dim is zero-based.
 		 */
 		mean(...args: MathType[]): any;
 		mean(A: MathArray|Matrix, dim?: number): any;
 
 		/**
-                 * Compute the median of a matrix or a list with values. The values are sorted and the middle value is returned. In case of an
+		 * Compute the median of a matrix or a list with values. The values are sorted and the middle value is returned. In case of an
 		 * even number of values, the average of the two middle values is returned. Supported types of values are: Number, BigNumber, Unit
-                 *
 		 * In case of a (multi dimensional) array or matrix, the median of all elements will be calculated.
 		 */
 		median(...args: MathType[]): any;
 
 		/**
-                 * Compute the maximum value of a matrix or a list of values. In case of a multi dimensional array, the maximum of the flattened
+		 * Compute the maximum value of a matrix or a list of values. In case of a multi dimensional array, the maximum of the flattened
 		 * array will be calculated. When dim is provided, the maximum over the selected dimension will be calculated. Parameter dim is zero-based.
 		 */
 		min(...args: MathType[]): any;
@@ -942,21 +920,18 @@ declare namespace mathjs {
 		prod(...args: MathType[]): any;
 
 		/**
-                 * Compute the prob order quantile of a matrix or a list with values. The sequence is sorted and the middle value is returned.
+		 * Compute the prob order quantile of a matrix or a list with values. The sequence is sorted and the middle value is returned.
 		 * Supported types of sequence values are: Number, BigNumber, Unit Supported types of probability are: Number, BigNumber
-                 *
 		 * In case of a (multi dimensional) array or matrix, the prob order quantile of all elements will be calculated.
 		 */
-		quantileSeq(A: MathArray|Matrix, prob: Number|BigNumber|MathArray, sorted?: boolean): Number|BigNumber|Unit|MathArray;
+		quantileSeq(A: MathArray|Matrix, prob: number|BigNumber|MathArray, sorted?: boolean): number|BigNumber|Unit|MathArray;
 
 		/**
-                 * Compute the standard deviation of a matrix or a list with values. The standard deviations is defined as the square root of the
-                 * variance: std(A) = sqrt(var(A)). In case of a (multi dimensional) array or matrix, the standard deviation over all elements will
+		 * Compute the standard deviation of a matrix or a list with values. The standard deviations is defined as the square root of the
+		 * variance: std(A) = sqrt(var(A)). In case of a (multi dimensional) array or matrix, the standard deviation over all elements will
 		 * be calculated.
-                 *
-                 * Optionally, the type of normalization can be specified as second parameter. The parameter normalization can be one of the following
+		 * Optionally, the type of normalization can be specified as second parameter. The parameter normalization can be one of the following
 		 * values:
-                 *
 		 * 'unbiased' (default) The sum of squared errors is divided by (n - 1)
 		 * 'uncorrected' The sum of squared errors is divided by n
 		 * 'biased' The sum of squared errors is divided by (n + 1)
@@ -966,23 +941,21 @@ declare namespace mathjs {
 		/**
 		 * Compute the sum of a matrix or a list with values. In case of a (multi dimensional) array or matrix, the sum of all elements will be calculated.
 		 */
-		sum(...args: (Number|BigNumber|Fraction)[]): any;
+		sum(...args: Array<number|BigNumber|Fraction>): any;
 		sum(array: MathArray|Matrix): any;
 
 		/**
-                 * Compute the variance of a matrix or a list with values. In case of a (multi dimensional) array or matrix, the variance over all
+		 * Compute the variance of a matrix or a list with values. In case of a (multi dimensional) array or matrix, the variance over all
 		 * elements will be calculated.
-                 *
-                 * Optionally, the type of normalization can be specified as second parameter. The parameter normalization can be one of the
+		 * Optionally, the type of normalization can be specified as second parameter. The parameter normalization can be one of the
 		 * following values:
-                 *
 		 * 'unbiased' (default) The sum of squared errors is divided by (n - 1)
 		 * 'uncorrected' The sum of squared errors is divided by n
 		 * 'biased' The sum of squared errors is divided by (n + 1)
-                 * Note that older browser may not like the variable name var. In that case, the function can be called as math['var'](...)
+		 * Note that older browser may not like the variable name var. In that case, the function can be called as math['var'](...)
 		 * instead of math.var(...).
 		 */
-		var(...args: (Number|BigNumber|Fraction)[]): any;
+		var(...args: Array<number|BigNumber|Fraction>): any;
 		var(array: MathArray|Matrix, normalization?: string): any;
 
 		/**
@@ -1080,9 +1053,8 @@ declare namespace mathjs {
 		atan(x: Matrix): Matrix;
 
 		/**
-                 * Calculate the inverse tangent function with two arguments, y/x. By providing two arguments, the right quadrant of the
+		 * Calculate the inverse tangent function with two arguments, y/x. By providing two arguments, the right quadrant of the
 		 * computed angle can be determined.
-                 *
 		 * For matrices, the function is evaluated element wise.
 		 */
 		atan2(y: number, x: number): number;
@@ -1097,127 +1069,105 @@ declare namespace mathjs {
 		atanh(x: MathArray): MathArray;
 		atanh(x: Matrix): Matrix;
 
-		/**
-		 * Calculate the cosine of a value. For matrices, the function is evaluated element wise.
-		 */
-		asin(x: number): number;
-		asin(x: BigNumber): BigNumber;
-		asin(x: Complex): Complex;
-		asin(x: Unit): number;
-		asin(x: MathArray): MathArray;
-		asin(x: Matrix): Matrix;
-
 		/**
 		 * Calculate the hyperbolic cosine of a value, defined as cosh(x) = 1/2 * (exp(x) + exp(-x)). For matrices, the function is evaluated element wise.
 		 */
-		cosh(x: number): number;
+		cosh(x: number|Unit): number;
 		cosh(x: BigNumber): BigNumber;
 		cosh(x: Complex): Complex;
-		cosh(x: Unit): number;
 		cosh(x: MathArray): MathArray;
 		cosh(x: Matrix): Matrix;
 
 		/**
 		 * Calculate the cotangent of a value. cot(x) is defined as 1 / tan(x). For matrices, the function is evaluated element wise.
 		 */
-		cot(x: number): number;
+		cot(x: number|Unit): number;
 		cot(x: Complex): Complex;
-		cot(x: Unit): number;
 		cot(x: MathArray): MathArray;
 		cot(x: Matrix): Matrix;
 
 		/**
 		 * Calculate the hyperbolic cotangent of a value, defined as coth(x) = 1 / tanh(x). For matrices, the function is evaluated element wise.
 		 */
-		coth(x: number): number;
+		coth(x: number|Unit): number;
 		coth(x: Complex): Complex;
-		coth(x: Unit): number;
 		coth(x: MathArray): MathArray;
 		coth(x: Matrix): Matrix;
 
 		/**
 		 * Calculate the cosecant of a value, defined as csc(x) = 1/sin(x). For matrices, the function is evaluated element wise.
 		 */
-		csc(x: number): number;
+		csc(x: number|Unit): number;
 		csc(x: Complex): Complex;
-		csc(x: Unit): number;
 		csc(x: MathArray): MathArray;
 		csc(x: Matrix): Matrix;
 
 		/**
 		 * Calculate the hyperbolic cosecant of a value, defined as csch(x) = 1 / sinh(x). For matrices, the function is evaluated element wise.
 		 */
-		csch(x: number): number;
+		csch(x: number|Unit): number;
 		csch(x: Complex): Complex;
-		csch(x: Unit): number;
 		csch(x: MathArray): MathArray;
 		csch(x: Matrix): Matrix;
 
 		/**
 		 * Calculate the secant of a value, defined as sec(x) = 1/cos(x). For matrices, the function is evaluated element wise.
 		 */
-		sec(x: number): number;
+		sec(x: number|Unit): number;
 		sec(x: Complex): Complex;
-		sec(x: Unit): number;
 		sec(x: MathArray): MathArray;
 		sec(x: Matrix): Matrix;
 
 		/**
 		 * Calculate the hyperbolic secant of a value, defined as sech(x) = 1 / cosh(x). For matrices, the function is evaluated element wise.
 		 */
-		sech(x: number): number;
+		sech(x: number|Unit): number;
 		sech(x: Complex): Complex;
-		sech(x: Unit): number;
 		sech(x: MathArray): MathArray;
 		sech(x: Matrix): Matrix;
 
 		/**
 		 * Calculate the sine of a value. For matrices, the function is evaluated element wise.
 		 */
-		sin(x: number): number;
+		sin(x: number|Unit): number;
 		sin(x: BigNumber): BigNumber;
 		sin(x: Complex): Complex;
-		sin(x: Unit): number;
 		sin(x: MathArray): MathArray;
 		sin(x: Matrix): Matrix;
 
 		/**
 		 * Calculate the cosine of a value. For matrices, the function is evaluated element wise.
 		 */
-		cos(x: number): number;
+		cos(x: number|Unit): number;
 		cos(x: BigNumber): BigNumber;
 		cos(x: Complex): Complex;
-		cos(x: Unit): number;
 		cos(x: MathArray): MathArray;
 		cos(x: Matrix): Matrix;
 
 		/**
 		 * Calculate the hyperbolic sine of a value, defined as sinh(x) = 1/2 * (exp(x) - exp(-x)). For matrices, the function is evaluated element wise.
 		 */
-		sinh(x: number): number;
+		sinh(x: number|Unit): number;
 		sinh(x: BigNumber): BigNumber;
 		sinh(x: Complex): Complex;
-		sinh(x: Unit): number;
 		sinh(x: MathArray): MathArray;
 		sinh(x: Matrix): Matrix;
 
 		/**
 		 * Calculate the tangent of a value. tan(x) is equal to sin(x) / cos(x). For matrices, the function is evaluated element wise.
 		 */
-		tan(x: number): number;
+		tan(x: number|Unit): number;
 		tan(x: BigNumber): BigNumber;
 		tan(x: Complex): Complex;
-		tan(x: Unit): number;
 		tan(x: MathArray): MathArray;
 		tan(x: Matrix): Matrix;
 
 		/**
 		 * Calculate the hyperbolic tangent of a value, defined as tanh(x) = (exp(2 * x) - 1) / (exp(2 * x) + 1). For matrices, the function is evaluated element wise.
 		 */
-		tanh(x: number): number;
+		tanh(x: number|Unit): number;
 		tanh(x: BigNumber): BigNumber;
 		tanh(x: Complex): Complex;
-		tanh(x: Unit): number;
 		tanh(x: MathArray): MathArray;
 		tanh(x: Matrix): Matrix;
 
@@ -1226,7 +1176,7 @@ declare namespace mathjs {
 		 * @param x The unit to be converted.
 		 * @param unit New unit. Can be a string like "cm" or a unit without value.
 		 */
-		to(x: Unit|MathArray|Matrix, unit: Unit|string): Unit|MathArray|Matrix
+		to(x: Unit|MathArray|Matrix, unit: Unit|string): Unit|MathArray|Matrix;
 
 		/**
 		 * Clone an object.
@@ -1236,25 +1186,25 @@ declare namespace mathjs {
 		/**
 		 * Filter the items in an array or one dimensional matrix.
 		 * @param x A one dimensional matrix or array to filter
-                 * @param test
+		 * @param test
 		 */
-		filter(x: MathArray|Matrix, test: RegExp|((item: any)=>boolean)): MathArray|Matrix;
+		filter(x: MathArray|Matrix, test: RegExp|((item: any) => boolean)): MathArray|Matrix;
 
 		/**
 		 * Iterate over all elements of a matrix/array, and executes the given callback function.
 		 * @param x The matrix to iterate on.
 		 * @param callback The callback function is invoked with three parameters: the value of the element, the index of the element, and the Matrix/array being traversed.
 		 */
-		forEach(x: MathArray|Matrix, callback: (item: any)=>any): void;
+		forEach: (x: MathArray|Matrix, callback: (item: any) => any) => void;
 
 		/**
 		 * Format a value of any type into a string.
 		 * @param value The value to be formatted
 		 */
-		format(value: any, options?: IFormatOptions|number|((item: any)=>string)): string;
+		format(value: any, options?: FormatOptions|number|((item: any) => string)): string;
 
 		/**
-                 * Test whether a value is an integer number. The function supports number, BigNumber, and Fraction.
+		 * Test whether a value is an integer number. The function supports number, BigNumber, and Fraction.
 		 * The function is evaluated element-wise in case of Array or Matrix input.
 		 */
 		isInteger(x: any): boolean;
@@ -1287,7 +1237,7 @@ declare namespace mathjs {
 		 * @param x The matrix to iterate on.
 		 * @param callback The callback method is invoked with three parameters: the value of the element, the index of the element, and the matrix being traversed.
 		 */
-		map(x: MathArray|Matrix, callback: (item: any)=>any): MathArray|Matrix;
+		map(x: MathArray|Matrix, callback: (item: any) => any): MathArray|Matrix;
 
 		/**
 		 * Partition-based selection of an array or 1D matrix. Will find the kth smallest value, and mutates the input array. Uses Quickselect.
@@ -1296,7 +1246,7 @@ declare namespace mathjs {
 		 * @param compare  An optional comparator function. The function is called as compare(a, b), and must return 1 when a > b, -1 when a < b, and 0 when a == b. Default value: 'asc'.
 		 * @returns Returns the kth lowest value.
 		 */
-		partitionSelect(x: MathArray|Matrix, k: number, compare?: string|((a: any, b: any)=>number)): any;
+		partitionSelect(x: MathArray|Matrix, k: number, compare?: string|((a: any, b: any) => number)): any;
 
 		/**
 		 * Interpolate values into a string template.
@@ -1304,14 +1254,14 @@ declare namespace mathjs {
 		 * @param values An object containing variables which will be filled in in the template.
 		 * @param precision Number of digits to format numbers. If not provided, the value will not be rounded.
 		 */
-		print(template:string, values: any, precision?: number): void;
+		print: (template: string, values: any, precision?: number) => void;
 
 		/**
 		 * Sort the items in a matrix.
 		 * @param x A one dimensional matrix or array to sort
 		 * @param compare  An optional comparator function. The function is called as compare(a, b), and must return 1 when a > b, -1 when a < b, and 0 when a == b. Default value: 'asc'.
 		 */
-		sort(x: MathArray|Matrix, compare?: string|((a: any, b: any)=>number)): MathArray|Matrix;
+		sort(x: MathArray|Matrix, compare?: string|((a: any, b: any) => number)): MathArray|Matrix;
 
 		/**
 		 * Determine the type of a variable.
@@ -1319,7 +1269,7 @@ declare namespace mathjs {
 		typeof(x: any): string;
 	}
 
-	export interface Matrix {
+	interface Matrix {
 		type: string;
 		storage(): string;
 		datatype(): string;
@@ -1331,391 +1281,380 @@ declare namespace mathjs {
 		clone(): Matrix;
 		size(): number[];
 		map(callback: (a: any, b: number, c: Matrix) => any, skipZeros?: boolean): Matrix;
-		forEach(callback: (a: any, b: number, c: Matrix) => void, skipZeros?: boolean): void;
+		forEach: (callback: (a: any, b: number, c: Matrix) => void, skipZeros?: boolean) => void;
 		toJSON(): any;
 		diagonal(k?: number|BigNumber): any[];
 		swapRows(i: number, j: number): Matrix;
 	}
 
-	export interface BigNumber extends Decimal {
+	interface BigNumber extends Decimal {} // tslint:disable-line no-empty-interface
 
-	}
-
-	export interface Fraction {
+	interface Fraction {
 		s: number;
 		n: number;
 		d: number;
 	}
 
-	export interface Complex {
+	interface Complex {
 		re: number;
 		im: number;
-		toPolar(): IPolarCoordinates;
+		toPolar(): PolarCoordinates;
 		clone(): Complex;
 	}
 
-	export interface IPolarCoordinates {
+	interface PolarCoordinates {
         r: number;
 		phi: number;
     }
 
-	export interface Unit {
+	interface Unit {
 		to(unit: string): Unit;
 		toNumber(unit: string): number;
 	}
 
-	export interface CreateUnitOptions {
+	interface CreateUnitOptions {
 		override?: boolean;
 	}
 
-	export interface UnitDefinition {
+	interface UnitDefinition {
 		definition?: string|Unit;
 		prefixes?: string;
 		offset?: number;
 		aliases?: string[];
 	}
 
-	export interface Index {
+	interface Index {} // tslint:disable-line no-empty-interface
 
-	}
-
-	export interface EvalFunction {
+	interface EvalFunction {
 		eval(scope?: any): any;
 	}
 
-	export interface MathNode {
-                isNode: boolean;
-                isSymbolNode?: boolean;
-                isConstantNode?: boolean;
-                isOperatorNode?: boolean;
-                op?: string;
-                fn?: string;
-                args?: MathNode[];
-                type: string;
-                name?: string;
-                value?: any;
+	interface MathNode {
+		isNode: boolean;
+		isSymbolNode?: boolean;
+		isConstantNode?: boolean;
+		isOperatorNode?: boolean;
+		op?: string;
+		fn?: string;
+		args?: MathNode[];
+		type: string;
+		name?: string;
+		value?: any;
 
-                compile(): EvalFunction;
-                eval(): any;
-                eval(expr: string): any;
-                /**
-                 *
-                 * Filter nodes in an expression tree. The callback function is called as callback(node: Node, path: string, parent: Node) : boolean for every node in the tree,
-                 * and must return a boolean. The function filter returns an array with nodes for which the test returned true.
-                 * Parameter path is a string containing a relative JSON Path.
-                 *
-                 * Example:
-                 *
-                 * ```
-                 * var node = math.parse('x^2 + x/4 + 3*y');
-                 * var filtered = node.filter(function (node) {
-                  * return node.isSymbolNode && node.name == 'x';
-                 * });
-                 * // returns an array with two entries: two SymbolNodes 'x'
-                 * ```
-                 *
-                 * @param The callback function is called as callback(node: Node, path: string, parent: Node) : boolean for every node in the tree, and must return a boolean. The function filter returns an array with nodes for which the test returned true. Parameter path is a string containing a relative JSON Path.
-                 * @param  {Function} callback(node [description]
-                 * @return {[Mathnode]}           Returns an array with nodes for which test returned true
-                 */
-                filter(callback: (node: MathNode, path: string, parent: MathNode)=>any ): MathNode[];
+		compile(): EvalFunction;
+		eval(expr?: string): any;
+		/**
+		 *
+		 * Filter nodes in an expression tree. The callback function is called as callback(node: Node, path: string, parent: Node) : boolean for every node in the tree,
+		 * and must return a boolean. The function filter returns an array with nodes for which the test returned true.
+		 * Parameter path is a string containing a relative JSON Path.
+		 *
+		 * Example:
+		 *
+		 * ```
+		 * var node = math.parse('x^2 + x/4 + 3*y');
+		 * var filtered = node.filter(function (node) {
+		 * return node.isSymbolNode && node.name == 'x';
+		 * });
+		 * // returns an array with two entries: two SymbolNodes 'x'
+		 * ```
+		 *
+		 * The callback function is called as callback(node: Node, path: string, parent: Node) : boolean for every node in the tree, and must return a boolean.
+		 * The function filter returns an array with nodes for which the test returned true. Parameter path is a string containing a relative JSON Path.
+		 * @return Returns an array with nodes for which test returned true
+		 */
+		filter(callback: (node: MathNode, path: string, parent: MathNode) => any): MathNode[];
 
+		/**
+		 * [forEach description]
+		 */
+		forEach(callback: (node: MathNode, path: string, parent: MathNode) => any): MathNode[];
 
-                /**
-                 * [forEach description]
-                 * @param  {MathNode} callback(node [description]
-                 * @return {[type]}                 [description]
-                 */
-                forEach(callback: (node: MathNode, path: string, parent: MathNode)=>any): MathNode[];
+		/**
+		 * `traverse(callback)`
+		 *
+		 * Recursively traverse all nodes in a node tree.
+		 * Executes given callback for this node and each of its child nodes.
+		 * Similar to Array.forEach, except recursive.
+		 * The callback function is a mapping function accepting a node, and returning a replacement for the node or the original node.
+		 * Function callback is called as callback(node: Node, path: string, parent: Node) for every node in the tree.
+		 * Parameter path is a string containing a relative JSON Path. Example:
+		 *
+		 * ```
+		 * var node = math.parse('3 * x + 2');
+		 * node.traverse(function (node, path, parent) {
+		 * switch (node.type) {
+		 * case 'OperatorNode': console.log(node.type, node.op);    break;
+		 * case 'ConstantNode': console.log(node.type, node.value); break;
+		 * case 'SymbolNode':   console.log(node.type, node.name);  break;
+		 * default:             console.log(node.type);
+		 * }
+		 * });
+		 * // outputs:
+		 * //   OperatorNode +
+		 * //   OperatorNode *
+		 * //   ConstantNode 3
+		 * //   SymbolNode x
+		 * //   ConstantNode 2
+		 * ```
+		 */
+		traverse(callback: (node: MathNode, path: string, parent: MathNode) => void): any;
+		/**
+		 * Recursively transform an expression tree via a transform function. Similar to Array.map,
+		 * but recursively executed on all nodes in the expression tree. The callback function is a
+		 * mapping function accepting a node, and returning a replacement for the node or the original node.
+		 * Function callback is called as callback(node: Node, path: string, parent: Node) for every node in
+		 * the tree, and must return a Node. Parameter path is a string containing a relative JSON Path.
+		 *
+		 * For example, to replace all nodes of type SymbolNode having name ‘x’ with a ConstantNode with value 3:
+		 * ```js
+		 * var node = math.parse('x^2 + 5*x');
+		 * var transformed = node.transform(function (node, path, parent) {
+		 *   if (node.SymbolNode && node.name == 'x') {
+		 *     return new math.expression.node.ConstantNode(3);
+		 *   }
+		 *   else {
+		 *     return node;
+		 *   }
+		 * });
+		 * transformed.toString(); // returns '(3 ^ 2) + (5 * 3)'
+		 * ```
+		 */
+		transform(callback: (node: MathNode, path: string, parent: MathNode) => MathNode): MathNode;
 
-
-                /**
-                * `traverse(callback)`
-                *
-                * Recursively traverse all nodes in a node tree. Executes given callback for this node and each of its child nodes. Similar to Array.forEach, except recursive. The callback function is a mapping function accepting a node, and returning a replacement for the node or the original node. Function callback is called as callback(node: Node, path: string, parent: Node) for every node in the tree. Parameter path is a string containing a relative JSON Path. Example:
-                *
-                * ```
-                * var node = math.parse('3 * x + 2');
-                * node.traverse(function (node, path, parent) {
-                * switch (node.type) {
-                * case 'OperatorNode': console.log(node.type, node.op);    break;
-                * case 'ConstantNode': console.log(node.type, node.value); break;
-                * case 'SymbolNode':   console.log(node.type, node.name);  break;
-                * default:             console.log(node.type);
-                * }
-                * });
-                * // outputs:
-                * //   OperatorNode +
-                * //   OperatorNode *
-                * //   ConstantNode 3
-                * //   SymbolNode x
-                * //   ConstantNode 2
-                * ```
-                *
-                * @param  {MathNode} callback=(node [description]
-                * @return {[type]}                  [description]
-                */
-                traverse(callback: (node: MathNode, path: string, parent: MathNode)=> void): any;
-//addEventListener(ev: 'change', callback: (ev: EditorChangeEvent) => any);
-                /**
-                 * Recursively transform an expression tree via a transform function. Similar to Array.map,
-                 * but recursively executed on all nodes in the expression tree. The callback function is a
-                 * mapping function accepting a node, and returning a replacement for the node or the original node.
-                 * Function callback is called as callback(node: Node, path: string, parent: Node) for every node in
-                 * the tree, and must return a Node. Parameter path is a string containing a relative JSON Path.
-                 *
-                 * For example, to replace all nodes of type SymbolNode having name ‘x’ with a ConstantNode with value 3:
-                 * ```js
-                 * var node = math.parse('x^2 + 5*x');
-                 * var transformed = node.transform(function (node, path, parent) {
-                 *   if (node.SymbolNode && node.name == 'x') {
-                 *     return new math.expression.node.ConstantNode(3);
-                 *   }
-                 *   else {
-                 *     return node;
-                 *   }
-                 * });
-                 * transformed.toString(); // returns '(3 ^ 2) + (5 * 3)'
-                 * ```
-                 */
-                transform(callback: (node: MathNode, path: string, parent: MathNode)=>MathNode): MathNode;
-                /**
-                 * Transform a node. Creates a new Node having it’s childs be the results of calling the provided
-                 * callback function for each of the childs of the original node. The callback function is called
-                 * as `callback(child: Node, path: string, parent: Node)` and must return a Node.
-                 * Parameter path is a string containing a relative JSON Path.
-                 *
-                 *
-                 * See also transform, which is a recursive version of map.
-                */
-                map(callback: (node: MathNode, path: string, parent: MathNode)=>MathNode): MathNode;
+		/**
+		 * Transform a node. Creates a new Node having it’s child's be the results of calling the provided
+		 * callback function for each of the child's of the original node. The callback function is called
+		 * as `callback(child: Node, path: string, parent: Node)` and must return a Node.
+		 * Parameter path is a string containing a relative JSON Path.
+		 *
+		 *
+		 * See also transform, which is a recursive version of map.
+		 */
+		map(callback: (node: MathNode, path: string, parent: MathNode) => MathNode): MathNode;
 	}
 
-
-	export interface Parser {
+	interface Parser {
 		eval(expr: string): any;
 		get(variable: string): any;
-		set(variable: string, value: any): void;
-		clear(): void;
+		set: (variable: string, value: any) => void;
+		clear: () => void;
 	}
 
-	export interface Distribution {
+	interface Distribution {
 		random(size: any, min?: any, max?: any): any;
 		randomInt(min: any, max?: any): any;
 		pickRandom(array: any): any;
 	}
 
-	export interface IFormatOptions {
+	interface FormatOptions {
 		/**
 		 * Number notation. Choose from:
 		 * 'fixed' Always use regular number notation. For example '123.40' and '14000000'
 		 * 'exponential' Always use exponential notation. For example '1.234e+2' and '1.4e+7'
-                 * 'auto' (default) Regular number notation for numbers having an absolute value between lower and upper bounds, and
+		 * 'auto' (default) Regular number notation for numbers having an absolute value between lower and upper bounds, and
 		 * uses exponential notation elsewhere. Lower bound is included, upper bound is excluded. For example '123.4' and '1.4e7'.
 		 */
 		notation?: string;
 
 		/**
-                 * A number between 0 and 16 to round the digits of the number. In case of notations 'exponential' and 'auto',
-                 * precision defines the total number of significant digits returned and is undefined by default. In case of notation 'fixed',
+		 * A number between 0 and 16 to round the digits of the number. In case of notations 'exponential' and 'auto',
+		 * precision defines the total number of significant digits returned and is undefined by default. In case of notation 'fixed',
 		 * precision defines the number of significant digits after the decimal point, and is 0 by default.
 		 */
 		precision?: number;
 
 		/**
-                 * An object containing two parameters, {number} lower and {number} upper, used by notation 'auto' to determine
+		 * An object containing two parameters, {number} lower and {number} upper, used by notation 'auto' to determine
 		 * when to return exponential notation. Default values are lower=1e-3 and upper=1e5. Only applicable for notation auto.
 		 */
 		exponential?: {lower: number; upper: number};
 
 		/**
-                 * Available values: 'ratio' (default) or 'decimal'. For example format(fraction(1, 3)) will output '1/3' when 'ratio'
+		 * Available values: 'ratio' (default) or 'decimal'. For example format(fraction(1, 3)) will output '1/3' when 'ratio'
 		 * is configured, and will output 0.(3) when 'decimal' is configured.
 		 */
 		fraction?: string;
 
-                /**
-                 * A custom formatting function. Can be used to override the built-in notations. Function fn is called with
-                 * value as parameter and must return a string. Is useful for example to format all values inside a matrix in a particular way.
-		 * */
-		fn?: (item: any)=>string;
+		/**
+		 * A custom formatting function. Can be used to override the built-in notations. Function fn is called with
+		 * value as parameter and must return a string. Is useful for example to format all values inside a matrix in a particular way.
+		 */
+		fn?: (item: any) => string;
 	}
 
-	export interface Help {
+	interface Help {
 		toString(): string;
 		toJSON(): string;
-        }
+    }
 
-        export interface IMathJsChain {
+    interface MathJsChain {
 		/**
 		 * Solves the linear equation system by forwards substitution. Matrix must be a lower triangular matrix.
 		 * @param b A column vector with the b values
 		 */
-		lsolve(b: Matrix|MathArray): IMathJsChain;
+		lsolve(b: Matrix|MathArray): MathJsChain;
 
 		/**
-                 * Calculate the Matrix LU decomposition with partial pivoting. Matrix A is decomposed in two matrices (L, U)
+		 * Calculate the Matrix LU decomposition with partial pivoting. Matrix A is decomposed in two matrices (L, U)
 		 * and a row permutation vector p where A[p,:] = L * U
 		 */
-		lup(): IMathJsChain;
+		lup(): MathJsChain;
 
 		/**
 		 * Solves the linear system A * x = b where A is an [n x n] matrix and b is a [n] column vector.
 		 * @param b Column Vector
 		 */
-		lusolve(b: Matrix|MathArray): IMathJsChain;
+		lusolve(b: Matrix|MathArray): MathJsChain;
 
 		/**
-                 * Calculate the Sparse Matrix LU decomposition with full pivoting. Sparse Matrix A is decomposed in
+		 * Calculate the Sparse Matrix LU decomposition with full pivoting. Sparse Matrix A is decomposed in
 		 * two matrices (L, U) and two permutation vectors (pinv, q) where P * A * Q = L * U
-                 * @param order The Symbolic Ordering and Analysis order: 0 - Natural ordering, no permutation vector q is
-                 * returned 1 - Matrix must be square, symbolic ordering and analisis is performed on M = A + A' 2 - Symbolic
-                 * ordering and analisis is performed on M = A' * A. Dense columns from A' are dropped, A recreated from A'.
-                 * This is appropriatefor LU factorization of unsymmetric matrices. 3 - Symbolic ordering and analisis is performed
-                 * on M = A' * A. This is best used for LU factorization is matrix M has no dense rows. A dense row is a row with
+		 * @param order The Symbolic Ordering and Analysis order: 0 - Natural ordering, no permutation vector q is
+		 * returned 1 - Matrix must be square, symbolic ordering and analysis is performed on M = A + A' 2 - Symbolic
+		 * ordering and analysis is performed on M = A' * A. Dense columns from A' are dropped, A recreated from A'.
+		 * This is appropriate for LU factorization of non-symmetric matrices. 3 - Symbolic ordering and analysis is performed
+		 * on M = A' * A. This is best used for LU factorization is matrix M has no dense rows. A dense row is a row with
 		 * more than 10*sqr(columns) entries.
 		 * @param threshold Partial pivoting threshold (1 for partial pivoting)
 		 * @returns The lower triangular matrix, the upper triangular matrix and the permutation vectors.
 		 */
-		slu(order: Number, threshold: Number): IMathJsChain;
+		slu(order: number, threshold: number): MathJsChain;
 
 		/**
 		 * Solves the linear equation system by backward substitution. Matrix must be an upper triangular matrix. U * x = b
 		 * @param b A column vector with the b values
 		 * @returns A column vector with the linear system solution (x)
 		 */
-		usolve(b:Matrix|MathArray): IMathJsChain;
+		usolve(b: Matrix|MathArray): MathJsChain;
 
 		/**
 		 * Calculate the absolute value of a number. For matrices, the function is evaluated element wise.
 		 */
-		abs(): IMathJsChain;
+		abs(): MathJsChain;
 
 		/**
 		 * Add two values, x + y. For matrices, the function is evaluated element wise.
 		 * @param y Second value to add
 		 */
-		add(y: MathType): IMathJsChain;
+		add(y: MathType): MathJsChain;
 
 		/**
 		 * Calculate the cubic root of a value. For matrices, the function is evaluated element wise.
 		 * @param allRoots Optional, false by default. Only applicable when x is a number or complex number. If true, all complex roots are returned, if false (default) the principal root is returned.
 		 */
-		cbrt(allRoots?: boolean): IMathJsChain;
+		cbrt(allRoots?: boolean): MathJsChain;
 
 		/**
 		 * Round a value towards plus infinity If x is complex, both real and imaginary part are rounded towards plus infinity. For matrices, the function is evaluated element wise.
 		 */
-		ceil(): IMathJsChain;
+		ceil(): MathJsChain;
 
-                /**
+		/**
 		 * Compute the cube of a value, x * x * x. For matrices, the function is evaluated element wise.
 		 */
-		cube(): IMathJsChain;
+		cube(): MathJsChain;
 
 		/**
 		 * Divide two values, x / y. To divide matrices, x is multiplied with the inverse of y: x * inv(y).
 		 * @param y Denominator
 		 */
-		divide(y:MathType): IMathJsChain;
+		divide(y: MathType): MathJsChain;
 
 		/**
 		 * Divide two matrices element wise. The function accepts both matrices and scalar values.
 		 * @param y Denominator
 		 */
-		dotDivide(y: MathType): IMathJsChain;
+		dotDivide(y: MathType): MathJsChain;
 
 		/**
 		 * Multiply two matrices element wise. The function accepts both matrices and scalar values.
 		 * @param y Right hand value
 		 */
-		dotMultiply(y: MathType): IMathJsChain;
+		dotMultiply(y: MathType): MathJsChain;
 
-                /**
+		/**
 		 * Calculates the power of x to y element wise.
 		 * @param y The exponent
 		 */
-		dotPow(y: MathType): IMathJsChain;
+		dotPow(y: MathType): MathJsChain;
 
 		/**
 		 * Calculate the exponent of a value. For matrices, the function is evaluated element wise.
 		 */
-		exp(): IMathJsChain;
+		exp(): MathJsChain;
 
-                /**
+		/**
 		 * Round a value towards zero. For matrices, the function is evaluated element wise.
 		 */
-		fix(): IMathJsChain;
+		fix(): MathJsChain;
 
 		/**
 		 * Round a value towards minus infinity. For matrices, the function is evaluated element wise.
 		 */
-		floor(): IMathJsChain;
+		floor(): MathJsChain;
 
 		/**
 		 * Calculate the greatest common divisor for two or more values or arrays. For matrices, the function is evaluated element wise.
 		 */
-		gcd(...args: number[]): IMathJsChain;
-		gcd(...args: BigNumber[]): IMathJsChain ;
-		gcd(...args: Fraction[]): IMathJsChain ;
-		gcd(...args: MathArray[]): IMathJsChain ;
-		gcd(...args: Matrix[]): IMathJsChain;
+		gcd(...args: number[]): MathJsChain;
+		gcd(...args: BigNumber[]): MathJsChain ;
+		gcd(...args: Fraction[]): MathJsChain ;
+		gcd(...args: MathArray[]): MathJsChain ;
+		gcd(...args: Matrix[]): MathJsChain;
 
 		/**
-		 * Calculate the hypotenusa of a list with values. The hypotenusa is defined as:
+		 * Calculate the hypotenuse of a list with values. The hypotenuse is defined as:
 		 * hypot(a, b, c, ...) = sqrt(a^2 + b^2 + c^2 + ...)
-		 * For matrix input, the hypotenusa is calculated for all values in the matrix.
+		 * For matrix input, the hypotenuse is calculated for all values in the matrix.
 		 */
-		hypot(...args: number[]): IMathJsChain;
-		hypot(...args: BigNumber[]): IMathJsChain;
+		hypot(...args: number[]): MathJsChain;
+		hypot(...args: BigNumber[]): MathJsChain;
 
         /**
          * Calculate the kronecker product of two matrices or vectors
          * @param x First Matrix
          * @param y Second Matrix
          */
-        kron(x: Matrix|MathArray, y: Matrix|MathArray): IMathJsChain;
+        kron(x: Matrix|MathArray, y: Matrix|MathArray): MathJsChain;
 
 		/**
 		 * Calculate the least common multiple for two or more values or arrays. lcm is defined as:
 		 * lcm(a, b) = abs(a * b) / gcd(a, b)
 		 * For matrices, the function is evaluated element wise.
 		 */
-		lcm(b: number): IMathJsChain;
-		lcm(b: BigNumber ): IMathJsChain ;
-		lcm(b: MathArray): IMathJsChain;
-		lcm(b: Matrix): IMathJsChain;
+		lcm(b: number|BigNumber|MathArray|Matrix): MathJsChain;
 
 		/**
 		 * Calculate the logarithm of a value. For matrices, the function is evaluated element wise.
 		 * @param base Optional base for the logarithm. If not provided, the natural logarithm of x is calculated. Default value: e.
 		 */
-		log(base?: number|BigNumber|Complex): IMathJsChain;
+		log(base?: number|BigNumber|Complex): MathJsChain;
 
 		/**
 		 * Calculate the 10-base of a value. This is the same as calculating log(x, 10). For matrices, the function is evaluated element wise.
 		 */
-		log10(): IMathJsChain;
+		log10(): MathJsChain;
 
 		/**
 		 * Calculates the modulus, the remainder of an integer division. For matrices, the function is evaluated element wise.
 		 * The modulus is defined as:
 		 * x - y * floor(x / y)
-		 * See http://en.wikipedia.org/wiki/Modulo_operation.
+		 * @see http://en.wikipedia.org/wiki/Modulo_operation.
 		 * @param y Divisor
 		 */
-		mod(y: number|BigNumber|Fraction|MathArray|Matrix): IMathJsChain;
+		mod(y: number|BigNumber|Fraction|MathArray|Matrix): MathJsChain;
 
 		/**
 		 * Multiply two values, x * y. The result is squeezed. For matrices, the matrix product is calculated.
 		 */
-		multiply(y: MathType): IMathJsChain;
+		multiply(y: MathType): MathJsChain;
 
 		/**
 		 * Calculate the norm of a number, vector or matrix. The second parameter p is optional. If not provided, it defaults to 2.
 		 * @param p Vector space. Supported numbers include Infinity and -Infinity. Supported strings are: 'inf', '-inf', and 'fro' (The Frobenius norm) Default value: 2.
 		 */
-		norm(p?: number|BigNumber|string): IMathJsChain;
+		norm(p?: number|BigNumber|string): MathJsChain;
 
 		/**
 		 * Calculate the nth root of a value. The principal nth root of a positive real number A, is the positive real solution of the equation
@@ -1723,19 +1662,19 @@ declare namespace mathjs {
 		 * For matrices, the function is evaluated element wise.
 		 * @param root The root. Default value: 2.
 		 */
-		nthRoot(root?: number|BigNumber): IMathJsChain;
+		nthRoot(root?: number|BigNumber): MathJsChain;
 
 		/**
 		 * Calculates the power of x to y, x ^ y. Matrix exponentiation is supported for square matrices x, and positive integer exponents y.
 		 * @param y The exponent
 		 */
-		pow(y: number|BigNumber|Complex): IMathJsChain;
+		pow(y: number|BigNumber|Complex): MathJsChain;
 
 		/**
 		 * Round a value towards the nearest integer. For matrices, the function is evaluated element wise.
 		 * @param n Number of decimals Default value: 0.
 		 */
-		round(n?: number|BigNumber|MathArray): IMathJsChain;
+		round(n?: number|BigNumber|MathArray): MathJsChain;
 
 		/**
 		 * Compute the sign of a value. The sign of a value x is:
@@ -1744,92 +1683,94 @@ declare namespace mathjs {
 		 * 0 when x == 0
 		 * For matrices, the function is evaluated element wise.
 		 */
-		sign(): IMathJsChain;
+		sign(): MathJsChain;
 
 		/**
 		 * Calculate the square root of a value. For matrices, the function is evaluated element wise.
 		 */
-		sqrt(): IMathJsChain;
+		sqrt(): MathJsChain;
 
 		/**
 		 * Compute the square of a value, x * x. For matrices, the function is evaluated element wise.
 		 */
-		square(): IMathJsChain;
+		square(): MathJsChain;
 
 		/**
 		 * Subtract two values, x - y. For matrices, the function is evaluated element wise.
 		 */
-		subtract(y: MathType): IMathJsChain;
+		subtract(y: MathType): MathJsChain;
 
 		/**
 		 * Inverse the sign of a value, apply a unary minus operation.
 		 * For matrices, the function is evaluated element wise. Boolean values and strings will be converted to a number. For complex numbers, both real and complex value are inverted.
 		 */
-		unaryMinus(): IMathJsChain;
+		unaryMinus(): MathJsChain;
 
 		/**
 		 * Unary plus operation. Boolean values and strings will be converted to a number, numeric values will be returned as is.
 		 * For matrices, the function is evaluated element wise.
 		 */
-		unaryPlus(): IMathJsChain;
+		unaryPlus(): MathJsChain;
 
 		/**
 		 * Calculate the extended greatest common divisor for two values. See http://en.wikipedia.org/wiki/Extended_Euclidean_algorithm.
 		 */
-		xgcd(b: number|BigNumber): IMathJsChain;
+		xgcd(b: number|BigNumber): MathJsChain;
 
 		/**
 		 * Bitwise AND two values, x & y. For matrices, the function is evaluated element wise.
 		 */
-		bitAnd(y: number|BigNumber|MathArray|Matrix): IMathJsChain;
+		bitAnd(y: number|BigNumber|MathArray|Matrix): MathJsChain;
 
 		/**
 		 * Bitwise NOT value, ~x. For matrices, the function is evaluated element wise. For units, the function is evaluated on the best prefix base.
 		 */
-		bitNot(): IMathJsChain;
+		bitNot(): MathJsChain;
 
 		/**
 		 * Bitwise OR two values, x | y. For matrices, the function is evaluated element wise. For units, the function is evaluated on the lowest print base.
 		 */
-		bitOr(): IMathJsChain;
+		bitOr(): MathJsChain;
 
 		/**
 		 * Bitwise XOR two values, x ^ y. For matrices, the function is evaluated element wise.
 		 */
-		bitXor(y: number|BigNumber|MathArray|Matrix): IMathJsChain;
+		bitXor(y: number|BigNumber|MathArray|Matrix): MathJsChain;
 
 		/**
 		 * Bitwise left logical shift of a value x by y number of bits, x << y. For matrices, the function is evaluated element wise. For units, the function is evaluated on the best prefix base.
 		 * @param x Value to be shifted
 		 * @param y Amount of shifts
 		 */
-		leftShift(y: number|BigNumber): IMathJsChain;
+		leftShift(y: number|BigNumber): MathJsChain;
 
 		/**
 		 * Bitwise right arithmetic shift of a value x by y number of bits, x >> y. For matrices, the function is evaluated element wise. For units, the function is evaluated on the best prefix base.
 		 * @param x Value to be shifted
 		 * @param y Amount of shifts
 		 */
-		rightArithShift(y: number|BigNumber): IMathJsChain;
+		rightArithShift(y: number|BigNumber): MathJsChain;
 
 		/**
 		 * Bitwise right logical shift of value x by y number of bits, x >>> y. For matrices, the function is evaluated element wise. For units, the function is evaluated on the best prefix base.
 		 * @param x Value to be shifted
 		 * @param y Amount of shifts
 		 */
-		rightLogShift(y: number): IMathJsChain;
+		rightLogShift(y: number): MathJsChain;
 
 		/**
-		 * The Bell Numbers count the number of partitions of a set. A partition is a pairwise disjoint subset of S whose union is S. bellNumbers only takes integer arguments. The following condition must be enforced: n >= 0
+		 * The Bell Numbers count the number of partitions of a set.
+		 * A partition is a pairwise disjoint subset of S whose union is S.
+		 * bellNumbers only takes integer arguments. The following condition must be enforced: n >= 0
 		 * @param n Total number of objects in the set
 		 */
-		bellNumbers(): IMathJsChain;
+		bellNumbers(): MathJsChain;
 
 		/**
 		 * The Catalan Numbers enumerate combinatorial structures of many different types. catalan only takes integer arguments. The following condition must be enforced: n >= 0
-		 * @pararm n nth Catalan number
+		 * @param n nth Catalan number
 		 */
-		catalan(): IMathJsChain;
+		catalan(): MathJsChain;
 
 		/**
 		 * The composition counts of n into k parts. Composition only takes integer arguments. The following condition must be enforced: k <= n.
@@ -1837,51 +1778,52 @@ declare namespace mathjs {
 		 * @param k Number of objects in the subset
 		 * @returns Returns the composition counts of n into k parts.
 		 */
-		composition(k: Number|BigNumber): IMathJsChain;
+		composition(k: number|BigNumber): MathJsChain;
 
 		/**
-		 * The Stirling numbers of the second kind, counts the number of ways to partition a set of n labelled objects into k nonempty unlabelled subsets. stirlingS2 only takes integer arguments. The following condition must be enforced: k <= n.
+		 * The Stirling numbers of the second kind, counts the number of ways to partition a set of n labelled objects into k nonempty unlabelled subsets.
+		 * stirlingS2 only takes integer arguments. The following condition must be enforced: k <= n.
 		 * If n = k or k = 1, then s(n,k) = 1
 		 * @param n Total number of objects in the set
 		 * @param k Number of objects in the subset
 		 */
-		stirlingS2(k: Number|BigNumber): IMathJsChain;
+		stirlingS2(k: number|BigNumber): MathJsChain;
 
 		/**
 		 * Compute the argument of a complex value. For a complex number a + bi, the argument is computed as atan2(b, a). For matrices, the function is evaluated element wise.
 		 * @param x A complex number or array with complex numbers
 		 */
-		arg(): IMathJsChain;
+		arg(): MathJsChain;
 
 		/**
 		 * Compute the complex conjugate of a complex value. If x = a+bi, the complex conjugate of x is a - bi. For matrices, the function is evaluated element wise.
 		 * @param x A complex number or array with complex numbers
 		 */
-		conj(): IMathJsChain;
+		conj(): MathJsChain;
 
-                /**
-                 * Get the imaginary part of a complex number. For a complex number a + bi, the function returns b.
+		/**
+		 * Get the imaginary part of a complex number. For a complex number a + bi, the function returns b.
 		 * For matrices, the function is evaluated element wise.
 		 */
-		im(): IMathJsChain;
+		im(): MathJsChain;
 
 		/**
 		 * Get the real part of a complex number. For a complex number a + bi, the function returns a.
 		 * For matrices, the function is evaluated element wise.
 		 */
-		re(): IMathJsChain;
+		re(): MathJsChain;
 
 		/**
-                 * Calculates: The eucledian distance between two points in 2 and 3 dimensional spaces. Distance between point
-                 * and a line in 2 and 3 dimensional spaces. Pairwise distance between a set of 2D or 3D points NOTE: When
-                 * substituting coefficients of a line(a, b and c), use ax + by + c = 0 instead of ax + by = c For parametric
+		 * Calculates: The eucledian distance between two points in 2 and 3 dimensional spaces. Distance between point
+		 * and a line in 2 and 3 dimensional spaces. Pairwise distance between a set of 2D or 3D points NOTE: When
+		 * substituting coefficients of a line(a, b and c), use ax + by + c = 0 instead of ax + by = c For parametric
 		 * equation of a 3D line, x0, y0, z0, a, b, c are from: (x−x0, y−y0, z−z0) = t(a, b, c)
 		 */
-		distance(y: MathArray|Matrix|any): IMathJsChain;
+		distance(y: MathType): MathJsChain;
 
 		/**
-                 * Calculates the point of intersection of two lines in two or three dimensions and of a line and a plane in
-                 * three dimensions. The inputs are in the form of arrays or 1 dimensional matrices. The line intersection functions
+		 * Calculates the point of intersection of two lines in two or three dimensions and of a line and a plane in
+		 * three dimensions. The inputs are in the form of arrays or 1 dimensional matrices. The line intersection functions
 		 * return null if the lines do not meet.
 		 * Note: Fill the plane coefficients as x + y + z = c and not as x + y + z + c = 0.
 		 * @param w Co-ordinates of first end-point of first line
@@ -1890,39 +1832,39 @@ declare namespace mathjs {
 		 * @param z Co-ordinates of second end-point of second line OR null if the calculation is for line and plane
 		 * @returns Returns the point of intersection of lines/lines-planes
 		 */
-		intersect(x: MathArray|Matrix, y: MathArray|Matrix, z: MathArray|Matrix): IMathJsChain;
+		intersect(x: MathArray|Matrix, y: MathArray|Matrix, z: MathArray|Matrix): MathJsChain;
 
 		/**
 		 * Logical and. Test whether two values are both defined with a nonzero/nonempty value. For matrices, the function is evaluated element wise.
 		 */
-		and(y: number|BigNumber|Complex|Unit|MathArray|Matrix): IMathJsChain;
+		and(y: number|BigNumber|Complex|Unit|MathArray|Matrix): MathJsChain;
 
 		/**
 		 * Logical not. Flips boolean value of a given parameter. For matrices, the function is evaluated element wise.
 		 */
-		not(): IMathJsChain;
+		not(): MathJsChain;
 
 		/**
 		 * Logical or. Test if at least one value is defined with a nonzero/nonempty value. For matrices, the function is evaluated element wise.
 		 */
-		or(y: number|BigNumber|Complex|Unit|MathArray|Matrix): IMathJsChain;
+		or(y: number|BigNumber|Complex|Unit|MathArray|Matrix): MathJsChain;
 
 		/**
 		 * Logical xor. Test whether one and only one value is defined with a nonzero/nonempty value. For matrices, the function is evaluated element wise.
 		 */
-		xor(y: number|BigNumber|Complex|Unit|MathArray|Matrix): IMathJsChain;
+		xor(y: number|BigNumber|Complex|Unit|MathArray|Matrix): MathJsChain;
 
 		/**
-                 * Calculate the cross product for two vectors in three dimensional space. The cross product of A = [a1, a2, a3]
+		 * Calculate the cross product for two vectors in three dimensional space. The cross product of A = [a1, a2, a3]
 		 * and B =[b1, b2, b3] is defined as:
 		 * cross(A, B) = [ a2 * b3 - a3 * b2, a3 * b1 - a1 * b3, a1 * b2 - a2 * b1 ]
 		 */
-		cross(y: MathArray|Matrix): IMathJsChain;
+		cross(y: MathArray|Matrix): MathJsChain;
 
 		/**
 		 * Calculate the determinant of a matrix.
 		 */
-		det(): IMathJsChain;
+		det(): MathJsChain;
 
 		/**
 		 * Resize a matrix
@@ -1930,17 +1872,17 @@ declare namespace mathjs {
 		 * @param size One dimensional array with numbers
 		 * @param defaultValue Zero by default, except in case of a string, in that case defaultValue = ' ' Default value: 0.
 		 */
-		resize(size: MathArray|Matrix, defaultValue?: number|string): IMathJsChain;
+		resize(size: MathArray|Matrix, defaultValue?: number|string): MathJsChain;
 
 		/**
 		 * Calculate the size of a matrix or scalar.
 		 */
-		size(): IMathJsChain;
+		size(): MathJsChain;
 
 		/**
 		 * Squeeze a matrix, remove inner and outer singleton dimensions from a matrix.
 		 */
-		squeeze(): IMathJsChain;
+		squeeze(): MathJsChain;
 
 		/**
 		 * Get or set a subset of a matrix or string.
@@ -1949,352 +1891,328 @@ declare namespace mathjs {
 		 * @param replacement An array, matrix, or scalar. If provided, the subset is replaced with replacement. If not provided, the subset is returned
 		 * @param defaultValue Default value, filled in on new entries when the matrix is resized. If not provided, math.matrix elements will be left undefined. Default value: undefined.
 		 */
-		subset(index: Index, replacement?: any, defaultValue?: any): IMathJsChain;
+		subset(index: Index, replacement?: any, defaultValue?: any): MathJsChain;
 
 		/**
 		 * Calculate the trace of a matrix: the sum of the elements on the main diagonal of a square matrix.
 		 */
-		trace(): IMathJsChain;
+		trace(): MathJsChain;
 
 		/**
 		 * Transpose a matrix. All values of the matrix are reflected over its main diagonal. Only two dimensional matrices are supported.
 		 */
-		transpose(): IMathJsChain;
+		transpose(): MathJsChain;
 
 		/**
 		 * Random pick a value from a one dimensional array. Array element is picked using a random function with uniform distribution.
 		 */
-		pickRandom(): IMathJsChain;
+		pickRandom(): MathJsChain;
 
 		/**
 		 * Return a random number larger or equal to min and smaller than max using a uniform distribution.
 		 */
-		random(): IMathJsChain;
-		random(max?: number): IMathJsChain;
-		random(min:number, max: number): IMathJsChain;
+		random(min?: number, max?: number): MathJsChain;
 
 		/**
 		 * Return a random integer number larger or equal to min and smaller than max using a uniform distribution.
 		 */
-		randomInt(max?: number): IMathJsChain;
-		randomInt(min:number, max: number): IMathJsChain;
+		randomInt(min?: number, max?: number): MathJsChain;
 
 		/**
 		 * Compare two values. Returns 1 when x > y, -1 when x < y, and 0 when x == y.
-                 * x and y are considered equal when the relative difference between x and y is smaller than the configured epsilon.
+		 * x and y are considered equal when the relative difference between x and y is smaller than the configured epsilon.
 		 * The function cannot be used to compare values smaller than approximately 2.22e-16.
 		 * For matrices, the function is evaluated element wise.
 		 */
-		compare(y: MathType): IMathJsChain;
+		compare(y: MathType): MathJsChain;
 
 		/**
 		 * Test element wise whether two matrices are equal. The function accepts both matrices and scalar values.
 		 */
-		deepEqual(y: MathType): IMathJsChain;
+		deepEqual(y: MathType): MathJsChain;
 
 		/**
 		 * Test whether two values are equal.
-                 *
-                 * The function tests whether the relative difference between x and y is smaller than the configured epsilon.
+		 * The function tests whether the relative difference between x and y is smaller than the configured epsilon.
 		 * The function cannot be used to compare values smaller than approximately 2.22e-16.
-                 *
 		 * For matrices, the function is evaluated element wise. In case of complex numbers, x.re must equal y.re, and x.im must equal y.im.
-                 *
 		 * Values null and undefined are compared strictly, thus null is only equal to null and nothing else, and undefined is only equal to undefined and nothing else.
 		 */
-		equal(y: MathType): IMathJsChain;
+		equal(y: MathType): MathJsChain;
 
 		/**
 		 * Test whether value x is larger than y.
-                 *
-                 * The function returns true when x is larger than y and the relative difference between x and y is larger than the configured epsilon.
+		 * The function returns true when x is larger than y and the relative difference between x and y is larger than the configured epsilon.
 		 * The function cannot be used to compare values smaller than approximately 2.22e-16.
-                 *
 		 * For matrices, the function is evaluated element wise.
 		 */
-		larger(y: MathType): IMathJsChain;
+		larger(y: MathType): MathJsChain;
 
 		/**
 		 * Test whether value x is larger or equal to y.
-                 *
-                 * The function returns true when x is larger than y or the relative difference between x and y is smaller than the configured epsilon.
+		 * The function returns true when x is larger than y or the relative difference between x and y is smaller than the configured epsilon.
 		 * The function cannot be used to compare values smaller than approximately 2.22e-16.
-                 *
 		 * For matrices, the function is evaluated element wise.
 		 */
-		largerEq(y: MathType): IMathJsChain;
+		largerEq(y: MathType): MathJsChain;
 
 		/**
 		 * Test whether value x is smaller than y.
-                 *
-                 * The function returns true when x is smaller than y and the relative difference between x and y is smaller than the configured epsilon.
+		 * The function returns true when x is smaller than y and the relative difference between x and y is smaller than the configured epsilon.
 		 * The function cannot be used to compare values smaller than approximately 2.22e-16.
-                 *
 		 * For matrices, the function is evaluated element wise.
 		 */
-		smaller(IMathJsChainy: MathType): IMathJsChain;
+		smaller(MathJsChainy: MathType): MathJsChain;
 
 		/**
 		 * Test whether value x is smaller or equal to y.
-                 *
-                 * The function returns true when x is smaller than y or the relative difference between x and y is smaller than the configured epsilon.
+		 * The function returns true when x is smaller than y or the relative difference between x and y is smaller than the configured epsilon.
 		 * The function cannot be used to compare values smaller than approximately 2.22e-16. For matrices, the function is evaluated element wise.
 		 */
-		smallerEq(IMathJsChainy: MathType): IMathJsChain;
+		smallerEq(MathJsChainy: MathType): MathJsChain;
 
 		/**
 		 * Test whether two values are unequal.
-                 *
-                 * The function tests whether the relative difference between x and y is larger than the configured epsilon. The function cannot
+		 * The function tests whether the relative difference between x and y is larger than the configured epsilon. The function cannot
 		 * be used to compare values smaller than approximately 2.22e-16.
-                 *
 		 * For matrices, the function is evaluated element wise. In case of complex numbers, x.re must unequal y.re, or x.im must unequal y.im.
-                 *
-                 * Values null and undefined are compared strictly, thus null is unequal with everything except null, and undefined is unequal with
-		 * everying except. undefined.
+		 * Values null and undefined are compared strictly, thus null is unequal with everything except null, and undefined is unequal with
+		 * everything except undefined.
 		 */
-		unequal(IMathJsChainy: MathType): IMathJsChain;
+		unequal(MathJsChainy: MathType): MathJsChain;
 
 		/**
-                 * Compute the maximum value of a matrix or a list with values. In case of a multi dimensional array, the maximum of the flattened
+		 * Compute the maximum value of a matrix or a list with values. In case of a multi dimensional array, the maximum of the flattened
 		 * array will be calculated. When dim is provided, the maximum over the selected dimension will be calculated. Parameter dim is zero-based.
 		 */
-		max(dim?: number): IMathJsChain;
+		max(dim?: number): MathJsChain;
 
 		/**
-                 * Compute the mean value of matrix or a list with values. In case of a multi dimensional array, the mean of the flattened array will be
+		 * Compute the mean value of matrix or a list with values. In case of a multi dimensional array, the mean of the flattened array will be
 		 * calculated. When dim is provided, the maximum over the selected dimension will be calculated. Parameter dim is zero-based.
 		 */
-		mean(dim?: number): IMathJsChain;
+		mean(dim?: number): MathJsChain;
 
 		/**
-                 * Compute the median of a matrix or a list with values. The values are sorted and the middle value is returned. In case of an
+		 * Compute the median of a matrix or a list with values. The values are sorted and the middle value is returned. In case of an
 		 * even number of values, the average of the two middle values is returned. Supported types of values are: Number, BigNumber, Unit
-                 *
 		 * In case of a (multi dimensional) array or matrix, the median of all elements will be calculated.
 		 */
-		median(): IMathJsChain;
+		median(): MathJsChain;
 
 		/**
-                 * Compute the maximum value of a matrix or a list of values. In case of a multi dimensional array, the maximum of the flattened
+		 * Compute the maximum value of a matrix or a list of values. In case of a multi dimensional array, the maximum of the flattened
 		 * array will be calculated. When dim is provided, the maximum over the selected dimension will be calculated. Parameter dim is zero-based.
 		 */
-		min(dim?: number): IMathJsChain;
+		min(dim?: number): MathJsChain;
 
 		/**
 		 * Computes the mode of a set of numbers or a list with values(numbers or characters). If there are more than one modes, it returns a list of those values.
 		 */
-		mode(): IMathJsChain;
+		mode(): MathJsChain;
 
 		/**
 		 * Compute the product of a matrix or a list with values. In case of a (multi dimensional) array or matrix, the sum of all elements will be calculated.
 		 */
-		prod(): IMathJsChain;
+		prod(): MathJsChain;
 
 		/**
-                 * Compute the prob order quantile of a matrix or a list with values. The sequence is sorted and the middle value is returned.
+		 * Compute the prob order quantile of a matrix or a list with values. The sequence is sorted and the middle value is returned.
 		 * Supported types of sequence values are: Number, BigNumber, Unit Supported types of probability are: Number, BigNumber
-                 *
 		 * In case of a (multi dimensional) array or matrix, the prob order quantile of all elements will be calculated.
 		 */
-		quantileSeq(prob: Number|BigNumber|MathArray, sorted?: boolean): IMathJsChain;
+		quantileSeq(prob: number|BigNumber|MathArray, sorted?: boolean): MathJsChain;
 
 		/**
-                 * Compute the standard deviation of a matrix or a list with values. The standard deviations is defined as the square root of the
-                 * variance: std(A) = sqrt(var(A)). In case of a (multi dimensional) array or matrix, the standard deviation over all elements will
+		 * Compute the standard deviation of a matrix or a list with values. The standard deviations is defined as the square root of the
+		 * variance: std(A) = sqrt(var(A)). In case of a (multi dimensional) array or matrix, the standard deviation over all elements will
 		 * be calculated.
-                 *
-                 * Optionally, the type of normalization can be specified as second parameter. The parameter normalization can be one of the following
+		 * Optionally, the type of normalization can be specified as second parameter. The parameter normalization can be one of the following
 		 * values:
-                 *
 		 * 'unbiased' (default) The sum of squared errors is divided by (n - 1)
 		 * 'uncorrected' The sum of squared errors is divided by n
 		 * 'biased' The sum of squared errors is divided by (n + 1)
 		 */
-		std(normalization?: string): IMathJsChain;
+		std(normalization?: string): MathJsChain;
 
 		/**
 		 * Compute the sum of a matrix or a list with values. In case of a (multi dimensional) array or matrix, the sum of all elements will be calculated.
 		 */
-		sum(): IMathJsChain;
+		sum(): MathJsChain;
 
 		/**
-                 * Compute the variance of a matrix or a list with values. In case of a (multi dimensional) array or matrix, the variance over all
+		 * Compute the variance of a matrix or a list with values. In case of a (multi dimensional) array or matrix, the variance over all
 		 * elements will be calculated.
-                 *
-                 * Optionally, the type of normalization can be specified as second parameter. The parameter normalization can be one of the
+		 * Optionally, the type of normalization can be specified as second parameter. The parameter normalization can be one of the
 		 * following values:
-                 *
 		 * 'unbiased' (default) The sum of squared errors is divided by (n - 1)
 		 * 'uncorrected' The sum of squared errors is divided by n
 		 * 'biased' The sum of squared errors is divided by (n + 1)
-                 * Note that older browser may not like the variable name var. In that case, the function can be called as math['var'](...)
+		 * Note that older browser may not like the variable name var. In that case, the function can be called as math['var'](...)
 		 * instead of math.var(...).
 		 */
-		var(normalization?: string): IMathJsChain;
+		var(normalization?: string): MathJsChain;
 
 		/**
 		 * Calculate the inverse cosine of a value. For matrices, the function is evaluated element wise.
 		 */
-		acos(): IMathJsChain;
+		acos(): MathJsChain;
 
 		/**
 		 * Calculate the hyperbolic arccos of a value, defined as acosh(x) = ln(sqrt(x^2 - 1) + x).
 		 * For matrices, the function is evaluated element wise.
 		 */
-		acosh(): IMathJsChain;
+		acosh(): MathJsChain;
 
 		/**
 		 * Calculate the inverse cotangent of a value. For matrices, the function is evaluated element wise.
 		 */
-		acot(): IMathJsChain;
+		acot(): MathJsChain;
 
 		/**
 		 * Calculate the hyperbolic arccotangent of a value, defined as acoth(x) = (ln((x+1)/x) + ln(x/(x-1))) / 2.
 		 * For matrices, the function is evaluated element wise.
 		 */
-		acoth(): IMathJsChain;
+		acoth(): MathJsChain;
 
 		/**
 		 * Calculate the inverse cosecant of a value. For matrices, the function is evaluated element wise.
 		 */
-		acsc(): IMathJsChain;
+		acsc(): MathJsChain;
 
 		/**
 		 * Calculate the hyperbolic arccosecant of a value, defined as acsch(x) = ln(1/x + sqrt(1/x^2 + 1)).
 		 * For matrices, the function is evaluated element wise.
 		 */
-		acsch(): IMathJsChain;
+		acsch(): MathJsChain;
 
 		/**
 		 * Calculate the inverse secant of a value. For matrices, the function is evaluated element wise.
 		 */
-		asec(): IMathJsChain;
+		asec(): MathJsChain;
 
 		/**
 		 * Calculate the hyperbolic arcsecant of a value, defined as asech(x) = ln(sqrt(1/x^2 - 1) + 1/x). For matrices, the function is evaluated element wise.
 		 */
-		asech(): IMathJsChain;
+		asech(): MathJsChain;
 
-                /**
+		/**
 		 * Calculate the inverse sine of a value. For matrices, the function is evaluated element wise.
 		 */
-		asin(): IMathJsChain;
+		asin(): MathJsChain;
 
 		/**
 		 * Calculate the hyperbolic arcsine of a value, defined as asinh(x) = ln(x + sqrt(x^2 + 1)). For matrices, the function is evaluated element wise.
 		 */
-		asinh(): IMathJsChain;
+		asinh(): MathJsChain;
 
 		/**
 		 * Calculate the inverse tangent of a value. For matrices, the function is evaluated element wise.
 		 */
-		atan(): IMathJsChain;
+		atan(): MathJsChain;
 
 		/**
-                 * Calculate the inverse tangent function with two arguments, y/x. By providing two arguments, the right quadrant of the
+		 * Calculate the inverse tangent function with two arguments, y/x. By providing two arguments, the right quadrant of the
 		 * computed angle can be determined.
-                 *
 		 * For matrices, the function is evaluated element wise.
 		 */
-		atan2(x: number): IMathJsChain;
-		atan2(x: MathArray|Matrix): IMathJsChain;
+		atan2(x: number|MathArray|Matrix): MathJsChain;
 
 		/**
 		 * Calculate the hyperbolic arctangent of a value, defined as atanh(x) = ln((1 + x)/(1 - x)) / 2.
 		 * For matrices, the function is evaluated element wise.
 		 */
-		atanh(): IMathJsChain;
+		atanh(): MathJsChain;
 
 		/**
 		 * Calculate the cosine of a value. For matrices, the function is evaluated element wise.
 		 */
-		asin(): IMathJsChain;
+		asin(): MathJsChain; // tslint:disable-line adjacent-overload-signatures
 
 		/**
 		 * Calculate the hyperbolic cosine of a value, defined as cosh(x) = 1/2 * (exp(x) + exp(-x)). For matrices, the function is evaluated element wise.
 		 */
-		cosh(): IMathJsChain;
+		cosh(): MathJsChain;
 
 		/**
 		 * Calculate the cotangent of a value. cot(x) is defined as 1 / tan(x). For matrices, the function is evaluated element wise.
 		 */
-		cot(): IMathJsChain;
+		cot(): MathJsChain;
 
 		/**
 		 * Calculate the hyperbolic cotangent of a value, defined as coth(x) = 1 / tanh(x). For matrices, the function is evaluated element wise.
 		 */
-		coth(): IMathJsChain;
+		coth(): MathJsChain;
 
 		/**
 		 * Calculate the cosecant of a value, defined as csc(x) = 1/sin(x). For matrices, the function is evaluated element wise.
 		 */
-		csc(): IMathJsChain;
+		csc(): MathJsChain;
 
 		/**
 		 * Calculate the hyperbolic cosecant of a value, defined as csch(x) = 1 / sinh(x). For matrices, the function is evaluated element wise.
 		 */
-		csch(): IMathJsChain;
+		csch(): MathJsChain;
 
 		/**
 		 * Calculate the secant of a value, defined as sec(x) = 1/cos(x). For matrices, the function is evaluated element wise.
 		 */
-		sec(): IMathJsChain;
+		sec(): MathJsChain;
 
 		/**
 		 * Calculate the hyperbolic secant of a value, defined as sech(x) = 1 / cosh(x). For matrices, the function is evaluated element wise.
 		 */
-		sech(): IMathJsChain;
+		sech(): MathJsChain;
 
 		/**
 		 * Calculate the sine of a value. For matrices, the function is evaluated element wise.
 		 */
-		sin(): IMathJsChain;
+		sin(): MathJsChain;
 
 		/**
 		 * Calculate the hyperbolic sine of a value, defined as sinh(x) = 1/2 * (exp(x) - exp(-x)). For matrices, the function is evaluated element wise.
 		 */
-		sinh(): IMathJsChain;
+		sinh(): MathJsChain;
 
 		/**
 		 * Calculate the tangent of a value. tan(x) is equal to sin(x) / cos(x). For matrices, the function is evaluated element wise.
 		 */
-		tan(): IMathJsChain;
+		tan(): MathJsChain;
 
 		/**
 		 * Calculate the hyperbolic tangent of a value, defined as tanh(x) = (exp(2 * x) - 1) / (exp(2 * x) + 1). For matrices, the function is evaluated element wise.
 		 */
-		tanh(): IMathJsChain;
+		tanh(): MathJsChain;
 
 		/**
 		 * Change the unit of a value. For matrices, the function is evaluated element wise.
 		 * @param x The unit to be converted.
 		 * @param unit New unit. Can be a string like "cm" or a unit without value.
 		 */
-		to(unit: Unit|string): IMathJsChain;
+		to(unit: Unit|string): MathJsChain;
 
 		/**
 		 * Clone an object.
 		 */
-		clone(): IMathJsChain;
+		clone(): MathJsChain;
 
 		/**
 		 * Filter the items in an array or one dimensional matrix.
 		 * @param x A one dimensional matrix or array to filter
-                 * @param test
+		 * @param test
 		 */
-		filter(test: RegExp|((item: any)=>boolean)): IMathJsChain;
+		filter(test: RegExp|((item: any) => boolean)): MathJsChain;
 
 		/**
 		 * Format a value of any type into a string.
 		 */
-		format(options?: IFormatOptions|number|((item: any)=>string)): IMathJsChain;
+		format(options?: FormatOptions|number|((item: any) => string)): MathJsChain;
 
 		/**
 		 * Create a new matrix or array with the results of the callback function executed on each entry of the matrix/array.
 		 * @param callback The callback method is invoked with three parameters: the value of the element, the index of the element, and the matrix being traversed.
 		 */
-		map(callback: (item: any)=>any): IMathJsChain;
+		map(callback: (item: any) => any): MathJsChain;
 
 		/**
 		 * Partition-based selection of an array or 1D matrix. Will find the kth smallest value, and mutates the input array. Uses Quickselect.
@@ -2302,13 +2220,13 @@ declare namespace mathjs {
 		 * @param compare  An optional comparator function. The function is called as compare(a, b), and must return 1 when a > b, -1 when a < b, and 0 when a == b. Default value: 'asc'.
 		 * @returns Returns the kth lowest value.
 		 */
-		partitionSelect(k: number, compare?: string|((a: any, b: any)=>number)): IMathJsChain;
+		partitionSelect(k: number, compare?: string|((a: any, b: any) => number)): MathJsChain;
 
 		/**
 		 * Sort the items in a matrix.
 		 * @param compare  An optional comparator function. The function is called as compare(a, b), and must return 1 when a > b, -1 when a < b, and 0 when a == b. Default value: 'asc'.
 		 */
-		sort(compare?: string|((a: any, b: any)=>number)): IMathJsChain;
+		sort(compare?: string|((a: any, b: any) => number)): MathJsChain;
 
 		done(): any;
 		valueOf(): any;
diff --git a/types/mathjs/mathjs-tests.ts b/types/mathjs/mathjs-tests.ts
index 64e5e0673b..306ab44ccd 100644
--- a/types/mathjs/mathjs-tests.ts
+++ b/types/mathjs/mathjs-tests.ts
@@ -1,17 +1,14 @@
-
-
-
 /*
 Basic usage examples
 */
-(function(){
+{
 	// functions and constants
 	math.round(math.e, 3);           // 2.718
 	math.atan2(3, -3) / math.pi;     // 0.75
 	math.log(10000, 10);             // 4
 	math.sqrt(-4);                   // 2i
 	math.pow([[-1, 2], [3, 1]], 2);  // [[7, 0], [0, 7]]
-	var angle = 0.2;
+	const angle = 0.2;
 	math.add(math.pow(math.sin(angle), 2), math.pow(math.cos(angle), 2)); // returns number ~1
 
 	// expressions
@@ -22,7 +19,7 @@ Basic usage examples
 	math.eval('det([-1, 2; 3, 1])'); // -7
 
 	// chained operations
-	var a = math.chain(3)
+	const a = math.chain(3)
 		.add(4)
 		.multiply(2)
 		.done(); // 14
@@ -33,18 +30,17 @@ Basic usage examples
 	math.multiply(math.unit('5 mm'), 3);   // Unit * number,  15 mm
 	math.subtract([2, 3, 4], 5);           // Array - number, [-3, -2, -1]
 	math.add(math.matrix([2, 3]), [4, 5]); // Matrix + Array, [6, 8]
-}());
-
+}
 
 /*
 Bignumbers examples
 */
-(function() {
+{
 	// configure the default type of numbers as BigNumbers
 	math.config({
-	number: 'bignumber',  // Default type of number:
-							// 'number' (default), 'bignumber', or 'fraction'
-	precision: 20         // Number of significant digits for BigNumbers
+		number: 'bignumber',	// Default type of number:
+								// 'number' (default), 'bignumber', or 'fraction'
+		precision: 20       	// Number of significant digits for BigNumbers
 	});
 
 	console.log('round-off errors with numbers');
@@ -68,23 +64,21 @@ Bignumbers examples
 	math.eval('0.1 + 0.2');  // BigNumber, 0.3
 	math.eval('0.3 / 0.2');  // BigNumber, 1.5
 	console.log();
-}());
-
-
+}
 
 /*
 Chaining examples
 */
-(function() {
+{
 	// create a chained operation using the function `chain(value)`
 	// end a chain using done(). Let's calculate (3 + 4) * 2
-	var a = math.chain(3)
+	const a = math.chain(3)
 		.add(4)
 		.multiply(2)
 		.done(); // 14
 
 	// Another example, calculate square(sin(pi / 4))
-	var b = math.chain(math.pi)
+	const b = math.chain(math.pi)
 		.divide(4)
 		.sin()
 		.square()
@@ -94,46 +88,44 @@ Chaining examples
 	// these are demonstrated in the following examples
 
 	// toString will return a string representation of the chain's value
-	var chain = math.chain(2).divide(3);
-	var str = chain.toString(); // "0.6666666666666666"
+	const chain = math.chain(2).divide(3);
+	const str = chain.toString(); // "0.6666666666666666"
 
 	// a chain has a function .valueOf(), which returns the value hold by the chain.
 	// This allows using it in regular operations. The function valueOf() acts the
 	// same as function done().
 	chain.valueOf(); // 0.66666666666667
 
-
 	// the function subset can be used to get or replace sub matrices
-	var array = [[1, 2], [3, 4]];
-	var v = math.chain(array)
+	const array = [[1, 2], [3, 4]];
+	const v = math.chain(array)
 		.subset(math.index(1, 0))
 		.done(); // 3
 
-	var m = math.chain(array)
+	const m = math.chain(array)
 		.subset(math.index(0, 0), 8)
 		.multiply(3)
 		.done(); // [[24, 6], [9, 12]]
-}());
-
+}
 
 /*
 Complex numbers examples
 */
-(function(){
-	var a = math.complex(2, 3); // 2 + 3i
+{
+	const a = math.complex(2, 3); // 2 + 3i
 
 	// read the real and complex parts of the complex number
 	a.re;                    // 2
 	a.im;                    // 3
 
 	// clone a complex value
-	var clone = a.clone(); // 2 + 3i
+	const clone = a.clone(); // 2 + 3i
 
 	// adjust the complex value
 	a.re = 5; // 5 + 3i
 
 	// create a complex number by providing a string with real and complex parts
-	var b = math.complex('3 - 7i'); // 3 - 7i
+	const b = math.complex('3 - 7i'); // 3 - 7i
 	console.log();
 
 	// perform operations with complex numbers
@@ -148,18 +140,17 @@ Complex numbers examples
 
 	// create a complex number from polar coordinates
 	console.log('create complex numbers with polar coordinates');
-	var c = math.complex({r: math.sqrt(2), phi: math.pi / 4}); // 1 + i
+	const c = math.complex({r: math.sqrt(2), phi: math.pi / 4}); // 1 + i
 
 	// get polar coordinates of a complex number
-	var d = math.complex(3, 4);
+	const d = math.complex(3, 4);
         d.toPolar();      // { r: 5, phi: 0.9272952180016122 }
-}());
-
+}
 
 /*
 Expressions examples
 */
-(function() {
+{
 	// 1. using the function math.eval
 	//
 	// Function `eval` accepts a single expression or an array with
@@ -179,16 +170,16 @@ Expressions examples
 	// evaluate multiple expressions at once
 	console.log('\nevaluate multiple expressions at once');
 	math.eval([
-	'f = 3',
-	'g = 4',
-	'f * g'
-	]);                                        // [3, 4, 12]
+		'f = 3',
+		'g = 4',
+		'f * g'
+	]); // [3, 4, 12]
 
 	// provide a scope (just a regular JavaScript Object)
 	console.log('\nevaluate expressions providing a scope with variables and functions');
-	var scope: any = {
-	a: 3,
-	b: 4
+	let scope: any = {
+		a: 3,
+		b: 4,
 	};
 
 	// variables can be read from the scope
@@ -199,18 +190,16 @@ Expressions examples
 	scope.c;                             // 6.8
 
 	// scope can contain both variables and functions
-	scope["hello"] = function (name: string) {
-		return 'hello, ' + name + '!';
+	scope["hello"] = function(name: string) {
+		return `hello, ${name}!`;
 	};
 	math.eval('hello("hero")', scope);   // "hello, hero!"
 
 	// define a function as an expression
-	var f = math.eval('f(x) = x ^ a', scope);
+	let f = math.eval('f(x) = x ^ a', scope);
 	f(2);                                // 8
 	scope.f(2);                          // 8
 
-
-
 	// 2. using function math.parse
 	//
 	// Function `math.parse` parses expressions into a node tree. The syntax is
@@ -224,7 +213,7 @@ Expressions examples
 
 	// parse an expression
 	console.log('\nparse an expression into a node tree');
-	var node1 = math.parse('sqrt(3^2 + 4^2)');
+	const node1 = math.parse('sqrt(3^2 + 4^2)');
 	node1.toString();                    // "sqrt((3 ^ 2) + (4 ^ 2))"
 
 	// compile and evaluate the compiled code
@@ -233,12 +222,12 @@ Expressions examples
 
 	// provide a scope
 	console.log('\nprovide a scope');
-	var node2 = math.parse('x^a');
-	var code2 = node2.compile();
+	const node2 = math.parse('x^a');
+	let code2 = node2.compile();
 	node2.toString();                    // "x ^ a"
-	var scope: any = {
-	x: 3,
-	a: 2
+	scope = {
+		x: 3,
+		a: 2,
 	};
 	code2.eval(scope);                   // 9
 
@@ -246,7 +235,6 @@ Expressions examples
 	scope.a = 3;
 	code2.eval(scope);                   // 27
 
-
 	// 3. using function math.compile
 	//
 	// Function `math.compile` compiles expressions into a node tree. The syntax is
@@ -260,21 +248,18 @@ Expressions examples
 
 	// parse an expression
 	console.log('\ncompile an expression');
-	var code3 = math.compile('sqrt(3^2 + 4^2)');
+	const code3 = math.compile('sqrt(3^2 + 4^2)');
 
 	// evaluate the compiled code
 	code3.eval();                        // 5
 
 	// provide a scope for the variable assignment
 	console.log('\nprovide a scope');
-	var code2 = math.compile('a = a + 3');
-	var scope: any = {
-	a: 7
-	};
+	code2 = math.compile('a = a + 3');
+	scope = { a: 7 };
 	code2.eval(scope);
 	scope.a;                             // 10
 
-
 	// 4. using a parser
 	//
 	// In addition to the static functions `math.eval` and `math.parse`, math.js
@@ -282,7 +267,7 @@ Expressions examples
 	// keeps a scope with assigned variables in memory. The parser also contains
 	// some convenience methods to get, set, and remove variables from memory.
 	console.log('\n4. USING A PARSER');
-	var parser = math.parser();
+	const parser = math.parser();
 
 	// evaluate with parser
 	console.log('\nevaluate expressions');
@@ -313,29 +298,28 @@ Expressions examples
 
 	// get and set variables and functions
 	console.log('\nget and set variables and function in the scope of the parser');
-	var x = parser.get('x');
+	const x = parser.get('x');
 	console.log('x =', x);                          // x = 7
-	var f = parser.get('f');
+	f = parser.get('f');
 	console.log('f =', math.format(f));             // f = f(x, y)
-	var g = f(3, 3);
+	const g = f(3, 3);
 	console.log('g =', g);                          // g = 27
 
 	parser.set('h', 500);
 	parser.eval('h / 2');                    // 250
-	parser.set('hello', function (name: string) {
-	return 'hello, ' + name + '!';
+	parser.set('hello', function(name: string) {
+	return `hello, ${name}!`;
 	});
 	parser.eval('hello("hero")');            // "hello, hero!"
 
 	// clear defined functions and variables
 	parser.clear();
-}());
-
+}
 
 /*
 Fractions examples
 */
-(function(){
+{
 	// configure the default type of numbers as Fractions
 	math.config({
 		number: 'fraction'   // Default type of number:
@@ -377,65 +361,64 @@ Fractions examples
 
 	// output formatting
 	console.log('output formatting of fractions');
-	var a = math.fraction('2/3');
+	const a = math.fraction('2/3');
 	console.log(math.format(a));                          // Fraction,  2/3
 	console.log(math.format(a, {fraction: 'ratio'}));     // Fraction,  2/3
 	console.log(math.format(a, {fraction: 'decimal'}));   // Fraction,  0.(6)
 	console.log(a.toString());                            // Fraction,  0.(6)
         console.log();
-}());
+}
 
 /*
 Matrices examples
 */
-(function() {
+{
 	// create matrices and arrays. a matrix is just a wrapper around an Array,
 	// providing some handy utilities.
 	console.log('create a matrix');
-	var a = math.matrix([1, 4, 9, 16, 25]); // [1, 4, 9, 16, 25]
-	var b = math.matrix(math.ones([2, 3])); // [[1, 1, 1], [1, 1, 1]]
+	const a = math.matrix([1, 4, 9, 16, 25]); // [1, 4, 9, 16, 25]
+	const b = math.matrix(math.ones([2, 3])); // [[1, 1, 1], [1, 1, 1]]
 	b.size();                           // [2, 3]
 
 	// the Array data of a Matrix can be retrieved using valueOf()
-	var array = a.valueOf();  // [1, 4, 9, 16, 25]
+	const array = a.valueOf();  // [1, 4, 9, 16, 25]
 
 	// Matrices can be cloned
-	var clone = a.clone(); // [1, 4, 9, 16, 25]
+	const clone = a.clone(); // [1, 4, 9, 16, 25]
 	console.log();
 
 	// perform operations with matrices
 	console.log('perform operations');
 	math.sqrt(a);                       // [1, 2, 3, 4, 5]
-	var c = [1, 2, 3, 4, 5];
+	const c = [1, 2, 3, 4, 5];
 	math.factorial(c);                  // [1, 2, 6, 24, 120]
 	console.log();
 
 	// create and manipulate matrices. Arrays and Matrices can be used mixed.
 	console.log('manipulate matrices');
-	var d = [[1, 2], [3, 4]]; // [[1, 2], [3, 4]]
-	var e = math.matrix([[5, 6], [1, 1]]); // [[5, 6], [1, 1]]
+	const d = [[1, 2], [3, 4]]; // [[1, 2], [3, 4]]
+	const e = math.matrix([[5, 6], [1, 1]]); // [[5, 6], [1, 1]]
 
 	// set a submatrix.
 	// Matrix indexes are zero-based.
 	e.subset(math.index(1, [0, 1]), [[7, 8]]); // [[5, 6], [7, 8]]
-	var f = math.multiply(d, e); // [[19, 22], [43, 50]]
-	var g = f.subset(math.index(1, 0)); // 43
+	const f = math.multiply(d, e); // [[19, 22], [43, 50]]
+	const g = f.subset(math.index(1, 0)); // 43
 	console.log();
 
 	// get a sub matrix
 	// Matrix indexes are zero-based.
 	console.log('get a sub matrix');
-	var h = math.diag(math.range(1,4)); // [[1, 0, 0], [0, 2, 0], [0, 0, 3]]
-	h.subset( math.index([1, 2], [1, 2])); // [[2, 0], [0, 3]]
-	var i = math.range(1,6); // [1, 2, 3, 4, 5]
-	i.subset(math.index(math.range(1,4))); // [2, 3, 4]
+	const h = math.diag(math.range(1, 4)); // [[1, 0, 0], [0, 2, 0], [0, 0, 3]]
+	h.subset(math.index([1, 2], [1, 2])); // [[2, 0], [0, 3]]
+	const i = math.range(1, 6); // [1, 2, 3, 4, 5]
+	i.subset(math.index(math.range(1, 4))); // [2, 3, 4]
 	console.log();
 
-
 	// resize a multi dimensional matrix
 	console.log('resizing a matrix');
-	var j = math.matrix();
-	var defaultValue = 0;
+	const j = math.matrix();
+	let defaultValue = 0;
 	j.resize([2, 2, 2], defaultValue); // [[[0, 0], [0, 0]], [[0, 0], [0, 0]]]
 	j.size();                            // [2, 2, 2]
 	j.resize([2, 2]); // [[0, 0], [0, 0]]
@@ -445,12 +428,12 @@ Matrices examples
 	// setting a value outside the matrices range will resize the matrix.
 	// new elements will be initialized with zero.
 	console.log('set a value outside a matrices range');
-	var k = math.matrix();
+	const k = math.matrix();
 	k.subset(math.index(2), 6); // [0, 0, 6]
 	console.log();
 
 	console.log('set a value outside a matrices range, leaving new entries uninitialized');
-	var m = math.matrix();
+	const m = math.matrix();
 	defaultValue = math.uninitialized;
 	m.subset(math.index(2), 6, defaultValue); // [undefined, undefined, 6]
 	console.log();
@@ -462,38 +445,38 @@ Matrices examples
 	math.range('2:-1:-3');               // [2, 1, 0, -1, -2]
 	math.factorial(math.range('1:6'));   // [1, 2, 6, 24, 120]
 	console.log();
-}());
+}
 
 /*
 Sparse matrices examples
 */
-(function() {
+{
 	// create a sparse matrix
 	console.log('creating a 1000x1000 sparse matrix...');
-	var a = math.eye(1000, 1000, 'sparse');
+	const a = math.eye(1000, 1000, 'sparse');
 
 	// do operations with a sparse matrix
 	console.log('doing some operations on the sparse matrix...');
-	var b = math.multiply(a, a);
-	var c = math.multiply(b, math.complex(2, 2));
-	var d = math.transpose(c);
-	var e = math.multiply(d, a);
+	const b = math.multiply(a, a);
+	const c = math.multiply(b, math.complex(2, 2));
+	const d = math.transpose(c);
+	const e = math.multiply(d, a);
 
 	// we will not print the output, but doing the same operations
 	// with a dense matrix are very slow, try it for yourself.
 	console.log('already done');
 	console.log('now try this with a dense matrix :)');
-}());
+}
 
 /*
 Units examples
 */
-(function() {
+{
 	// units can be created by providing a value and unit name, or by providing
 	// a string with a valued unit.
 	console.log('create units');
-	var a = math.unit(45, 'cm'); // 450 mm
-	var b = math.unit('0.1m'); // 100 mm
+	const a = math.unit(45, 'cm'); // 450 mm
+	const b = math.unit('0.1m'); // 100 mm
 	console.log();
 
 	// creating units
@@ -509,7 +492,7 @@ Units examples
 		aliases: ['knots', 'kt', 'kts'],
 		prefixes: 'long'
 	}, {override: true});
-	math.createUnit( {
+	math.createUnit({
 		foo: {
 			prefixes: 'long'
 		},
@@ -561,10 +544,10 @@ Units examples
 
 	// example engineering calculations
 	console.log('compute molar volume of ideal gas at 65 Fahrenheit, 14.7 psi in L/mol');
-	var Rg = math.unit('8.314 N m / (mol K)');
-	var T = math.unit('65 degF');
-	var P = math.unit('14.7 psi');
-	var v = math.divide(math.multiply(Rg, T), P);
+	const Rg = math.unit('8.314 N m / (mol K)');
+	const T = math.unit('65 degF');
+	const P = math.unit('14.7 psi');
+	const v = math.divide(math.multiply(Rg, T), P);
 	console.log('gas constant (Rg) = ', format(Rg));
 	console.log('P = ' + format(P));
 	console.log('T = ' + format(T));
@@ -572,100 +555,74 @@ Units examples
 	console.log();
 
 	console.log('compute speed of fluid flowing out of hole in a container');
-	var g = math.unit('9.81 m / s^2');
-	var h = math.unit('1 m');
-	var v2 = math.pow(math.multiply(2, math.multiply(g, h)), 0.5); // Can also use math.sqrt
+	const g = math.unit('9.81 m / s^2');
+	const h = math.unit('1 m');
+	const v2 = math.pow(math.multiply(2, math.multiply(g, h)), 0.5); // Can also use math.sqrt
 	console.log('g = ' + format(g));
 	console.log('h = ' + format(h));
 	console.log('v = (2 g h) ^ 0.5 = ' + format(v2)); // 4.429... m / s
 	console.log();
 
 	console.log('electrical power consumption:');
-	var expr = '460 V * 20 A * 30 days to kWh';
-	console.log(expr + ' = ' + math.eval(expr));  // 6624 kWh
+	let expr = '460 V * 20 A * 30 days to kWh';
+	console.log(`${expr} = ${math.eval(expr)}`);  // 6624 kWh
 	console.log();
 
 	console.log('circuit design:');
-	var expr = '24 V / (6 mA)';
-	console.log(expr + ' = ' + math.eval(expr));  // 4 kohm
+	expr = '24 V / (6 mA)';
+	console.log(`${expr} = ${math.eval(expr)}`);  // 4 kohm
 	console.log();
 
 	console.log('operations on arrays:');
-	var B = math.eval('[1, 0, 0] T');
-	var v3 = math.eval('[0, 1, 0] m/s');
-	var q = math.eval('1 C');
-	var F = math.multiply(q, math.cross(v3, B));
+	const B = math.eval('[1, 0, 0] T');
+	const v3 = math.eval('[0, 1, 0] m/s');
+	const q = math.eval('1 C');
+	const F = math.multiply(q, math.cross(v3, B));
 	console.log('B (magnetic field strength) = ' + format(B)); // [1 T, 0 T, 0 T]
 	console.log('v (particle velocity) = ' + format(v3));       // [0 m / s, 1 m / s, 0 m / s]
 	console.log('q (particle charge) = ' + format(q));         // 1 C
 	console.log('F (force) = q (v cross B) = ' + format(F));   // [0 N, 0 N, -1 N]
 
 	/**
-	* Helper function to format an output a value.
-	* @param {*} value
-	* @return {string} Returns the formatted value
-	*/
-	function format (value: any): string {
-		var precision = 14;
+	 * Helper function to format an output a value.
+	 * @return Returns the formatted value
+	 */
+	function format(value: any): string {
+		const precision = 14;
 		return math.format(value, precision);
 	}
-}());
-
+}
 
 /*
 Expression tree examples
 */
-(function(){
+{
+	// Filter an expression tree
+	console.log('Filter all symbol nodes "x" in the expression "x^2 + x/4 + 3*y"');
+	const node = math.parse('x^2 + x/4 + 3*y');
+	const filtered = node.filter(function(node) {
+		return node.isSymbolNode && node.name === 'x';
+	});
+	// returns an array with two entries: two SymbolNodes 'x'
 
-        // Filter an expression tree
-console.log('Filter all symbol nodes "x" in the expression "x^2 + x/4 + 3*y"');
-var node = math.parse('x^2 + x/4 + 3*y');
-var filtered = node.filter(function (node) {
-  return node.isSymbolNode && node.name == 'x';
-});
-// returns an array with two entries: two SymbolNodes 'x'
+	filtered.forEach(function(node) {
+		console.log(node.type, node.toString());
+	});
+	// outputs:
+	//  SymbolNode x
+	//  SymbolNode x
 
-filtered.forEach(function (node) {
-  console.log(node.type, node.toString())
-});
-// outputs:
-//  SymbolNode x
-//  SymbolNode x
-
-
-// Traverse an expression tree
-console.log();
-console.log('Traverse the expression tree of expression "3 * x + 2"');
-var node1 = math.parse('3 * x + 2');
-node1.traverse(function (node, path, parent) {
-  switch (node.type) {
-    // case 'OperatorNode': console.log(node.type, node.op);    break;
-    case 'OperatorNode': console.log(node.type);             break;//for now removing .op
-    case 'ConstantNode': console.log(node.type, node.value); break;
-    case 'SymbolNode':   console.log(node.type, node.name);  break;
-    default:             console.log(node.type);
-  }
-});
-// outputs:
-//   OperatorNode +
-//   OperatorNode *
-//   ConstantNode 3
-//   SymbolNode x
-//   ConstantNode 2
-
-
-// transform an expression tree
-// console.log();
-// console.log('Replace all symbol nodes "x" in expression "x^2 + 5*x" with a constant 3');
-// var node2 = math.parse('x^2 + 5*x');
-// var transformed = node2.transform(function (node, path, parent) {
-//   if (node.isSymbolNode && node.name == 'x') {
-//     return new math.expression.node.ConstantNode(3);
-//   }
-//   else {
-//     return node;
-//   }
-// });
-// console.log(transformed.toString());
-// outputs: '(3 ^ 2) + (5 * 3)'
-}());
+	// Traverse an expression tree
+	console.log();
+	console.log('Traverse the expression tree of expression "3 * x + 2"');
+	const node1 = math.parse('3 * x + 2');
+	node1.traverse(function(node, path, parent) {
+	switch (node.type) {
+		// case 'OperatorNode': console.log(node.type, node.op);    break;
+		case 'OperatorNode': console.log(node.type);             break; // for now removing .op
+		case 'ConstantNode': console.log(node.type, node.value); break;
+		case 'SymbolNode':   console.log(node.type, node.name);  break;
+		default:             console.log(node.type);
+	}
+	});
+}
diff --git a/types/mathjs/tslint.json b/types/mathjs/tslint.json
index a41bf5d19a..c2e987daf6 100644
--- a/types/mathjs/tslint.json
+++ b/types/mathjs/tslint.json
@@ -1,79 +1,6 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
-        "ban-types": false,
-        "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
-        "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
-        "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
-        "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
-        "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
-        "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
-        "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
+        "only-arrow-functions": false
     }
 }

From 57238f66d8325ca3051ae5b0bead4cfac8fab596 Mon Sep 17 00:00:00 2001
From: Eric Kirkham <eric@southerneer.com>
Date: Mon, 9 Apr 2018 16:40:08 -0700
Subject: [PATCH 1185/1382] add default value

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

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index 84b7032562..c3ba83c70c 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -1093,7 +1093,7 @@ export interface TextInputProperties
     blurOnSubmit?: boolean;
 
     /**
-     * If true, the caret is hidden
+     * If true, caret is hidden. The default value is false.
      */
     caretHidden?: boolean
 

From dc5668557c0566a74e3a6116bd71d0f623001343 Mon Sep 17 00:00:00 2001
From: Vincent Langlet <vincentl@theodo.fr>
Date: Tue, 10 Apr 2018 12:09:24 +0200
Subject: [PATCH 1186/1382] Avoid error with XMLHttpRequest =
 originalXMLHttpRequest || XMLHttpRequest

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

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index c3ba83c70c..96526fcd9b 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -8792,7 +8792,7 @@ declare global {
      *
      * @see https://github.com/facebook/react-native/issues/934
      */
-    var originalXMLHttpRequest: Object;
+    var originalXMLHttpRequest: any;
 
     var __BUNDLE_START_TIME__: number;
     var ErrorUtils: ErrorUtils;

From 7780641c37711014764a599dc4f6a08cd0ec6824 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vilim=20Stubi=C4=8Dan?= <vilim.stubican@degordian.com>
Date: Tue, 10 Apr 2018 19:13:33 +0200
Subject: [PATCH 1187/1382] type definitions for axon (#24877)

---
 types/axon/axon-tests.ts | 173 +++++++++++++++++++++++++++++++++++++++
 types/axon/index.d.ts    | 134 ++++++++++++++++++++++++++++++
 types/axon/tsconfig.json |  23 ++++++
 types/axon/tslint.json   |   1 +
 4 files changed, 331 insertions(+)
 create mode 100644 types/axon/axon-tests.ts
 create mode 100644 types/axon/index.d.ts
 create mode 100644 types/axon/tsconfig.json
 create mode 100644 types/axon/tslint.json

diff --git a/types/axon/axon-tests.ts b/types/axon/axon-tests.ts
new file mode 100644
index 0000000000..a7f2a95a87
--- /dev/null
+++ b/types/axon/axon-tests.ts
@@ -0,0 +1,173 @@
+import * as axon from 'axon';
+import { Socket as NetSocket } from 'net';
+
+const PubEmitterSocket = axon.PubEmitterSocket;
+const PubSocket = axon.PubSocket;
+const RepSocket = axon.RepSocket;
+const ReqSocket = axon.ReqSocket;
+const Socket = axon.Socket;
+const SubSocket = axon.SubSocket;
+
+const pubSocket = new PubSocket();
+const pubEmitterSocket = new PubEmitterSocket();
+const repSocket = new RepSocket();
+const reqSocket = new ReqSocket();
+const netSocket = new NetSocket();
+const socket = new Socket();
+const subSocket = new SubSocket();
+
+// $ExpectType PubSocket
+pubSocket.send('anything');
+
+// $ExpectType PubSocket
+pubSocket.send('anything', {w: 100, h: 200});
+
+// $ExpectType PubSocket
+pubEmitterSocket.send('anything');
+
+// $ExpectType PubSocket
+pubEmitterSocket.send('anything', {w: 100, h: 200});
+
+// $ExpectType Socket
+pubEmitterSocket.bind(3000);
+
+// $ExpectError
+pubEmitterSocket.bind({a, b, c});
+
+// $ExpectError
+pubEmitterSocket.bind();
+
+// $ExpectType Socket
+pubEmitterSocket.connect(3000);
+
+// $ExpectError
+pubEmitterSocket.connect({a, b, c});
+
+// $ExpectError
+pubEmitterSocket.connect();
+
+// $ExpectType (args: Buffer | Buffer[]) => void
+repSocket.onmessage(netSocket);
+
+// $ExpectError
+repSocket.onmessage();
+
+// $ExpectError
+repSocket.onmessage('');
+
+// $ExpectError
+repSocket.onmessage(1);
+
+// $ExpectError
+repSocket.onmessage({});
+
+// $ExpectType string
+reqSocket.id();
+
+// $ExpectType (args: Buffer | Buffer[]) => void
+reqSocket.onmessage();
+
+// $ExpectType void
+reqSocket.send('anything');
+
+// $ExpectType void
+reqSocket.send('anything', {w: 100, h: 200});
+
+// $ExpectType Socket
+socket.set('name', 'aaa');
+
+// $ExpectError
+socket.set(1, 'aaa');
+
+// $ExpectError
+socket.set({}, 'aaa');
+
+// $ExpectError
+socket.set('name');
+
+// $ExpectType any
+socket.get('name');
+
+// $ExpectError
+socket.get(1);
+
+// $ExpectError
+socket.get({});
+
+// $ExpectType Socket
+socket.enable('name');
+
+// $ExpectError
+socket.enable(1);
+
+// $ExpectError
+socket.enable({});
+
+// $ExpectType Socket
+socket.disable('name');
+
+// $ExpectError
+socket.disable(1);
+
+// $ExpectError
+socket.disable({});
+
+// $ExpectType boolean
+socket.enabled('name');
+
+// $ExpectError
+socket.enabled(1);
+
+// $ExpectError
+socket.enabled({});
+
+// $ExpectType boolean
+socket.disabled('name');
+
+// $ExpectError
+socket.disabled(1);
+
+// $ExpectError
+socket.disabled({});
+
+// $ExpectType boolean
+subSocket.hasSubscriptions();
+
+// $ExpectType boolean
+subSocket.matches('name');
+
+// $ExpectError
+subSocket.matches(1);
+
+// $ExpectError
+subSocket.matches({});
+
+// $ExpectType RegExp
+subSocket.subscribe(/some regex/);
+
+// $ExpectType RegExp
+subSocket.subscribe('some string');
+
+// $ExpectError
+subSocket.subscribe(1);
+
+// $ExpectError
+subSocket.subscribe({});
+
+// $ExpectError
+subSocket.subscribe();
+
+// $ExpectType void
+subSocket.unsubscribe(/some regex/);
+
+// $ExpectType void
+subSocket.unsubscribe('some string');
+
+// $ExpectError
+subSocket.unsubscribe(1);
+
+// $ExpectError
+subSocket.unsubscribe({});
+
+// $ExpectError
+subSocket.unsubscribe();
diff --git a/types/axon/index.d.ts b/types/axon/index.d.ts
new file mode 100644
index 0000000000..2449b83eb4
--- /dev/null
+++ b/types/axon/index.d.ts
@@ -0,0 +1,134 @@
+// Type definitions for axon 2.0
+// Project: https://github.com/visionmedia/axon#readme
+// Definitions by: Vilim Stubičan <https://github.com/jewbre>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+/// <reference types="node" />
+
+import { EventEmitter } from "events";
+import { Socket as NetSocket } from "net";
+
+export class Socket extends EventEmitter {
+    set(name: string, val: any): Socket;
+
+    get(name: string): any;
+
+    enable(name: string): Socket;
+
+    disable(name: string): Socket;
+
+    enabled(name: string): boolean;
+
+    disabled(name: string): boolean;
+
+    use(plugin: (socket: Socket) => any): Socket;
+
+    pack(args: Buffer | Buffer[]): Buffer;
+
+    closeSockets(): void;
+
+    close(): void;
+
+    closeServer(fn: () => any): void;
+
+    address(): { port: number; family: string; address: string; string: string } | undefined;
+
+    removeSocket(sock: Socket): void;
+
+    addSocket(sock: Socket): void;
+
+    handleErrors(sock: Socket): void;
+
+    onmessage(sock: NetSocket): (args: Buffer | Buffer[]) => void;
+
+    connect(port: ConnectionPort, host?: string | (() => void), fn?: () => void): Socket;
+
+    onconnect(sock: Socket): void;
+
+    bind(port: ConnectionPort, host?: string | (() => void), fn?: () => void): Socket;
+}
+
+export class SubSocket extends Socket {
+    hasSubscriptions(): boolean;
+
+    matches(topic: string): boolean;
+
+    onmessage(sock: NetSocket): (args: Buffer | Buffer[]) => void;
+
+    subscribe(re: RegExp | string): RegExp;
+
+    unsubscribe(re: RegExp | string): void;
+
+    clearSubscriptions(): void;
+
+    /**
+     * @throws {Error}
+     */
+    send(): void;
+}
+
+export class SubEmitterSocket {
+    onmessage(): (args: Buffer | Buffer[]) => void;
+
+    on(event: string, fn: (...args: any[]) => void): SubEmitterSocket;
+
+    off(event: string): SubEmitterSocket;
+
+    bind(port: ConnectionPort, host?: string | (() => void), fn?: () => void): Socket;
+
+    connect(port: ConnectionPort, host?: string | (() => void), fn?: () => void): Socket;
+
+    close(): void;
+}
+
+export class PubSocket extends Socket {
+    send(...args: any[]): PubSocket;
+}
+
+export class PubEmitterSocket {
+    sock: PubSocket;
+
+    send(...args: any[]): PubSocket;
+
+    bind(port: ConnectionPort, host?: string | (() => void), fn?: () => void): Socket;
+
+    connect(port: ConnectionPort, host?: string | (() => void), fn?: () => void): Socket;
+
+    close(): void;
+}
+
+export class PushSocket extends Socket {
+    send(...args: any[]): void;
+    enqueue(msg: any): void;
+}
+
+export class ReqSocket extends Socket {
+    id(): string;
+
+    onmessage(): (args: Buffer | Buffer[]) => void;
+
+    send(...args: any[]): void;
+}
+
+export class RepSocket extends Socket {
+    onmessage(sock: NetSocket): (args: Buffer | Buffer[]) => void;
+}
+
+export class PullSocket extends Socket {
+    /**
+     * @throws {Error}
+     */
+    send(): void;
+}
+
+export type ConnectionPort =
+    number
+    | string
+    | { protocol?: string, hostname?: string, pathname: string, port: string | number };
+
+export function socket(type: string, options?: any): Socket;
+
+export const types: {
+    [propName: string]: { new(): PubEmitterSocket | SubEmitterSocket | PushSocket | PullSocket | PubSocket | SubSocket | ReqSocket | RepSocket | Socket };
+};
diff --git a/types/axon/tsconfig.json b/types/axon/tsconfig.json
new file mode 100644
index 0000000000..2025639930
--- /dev/null
+++ b/types/axon/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "axon-tests.ts"
+    ]
+}
diff --git a/types/axon/tslint.json b/types/axon/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/axon/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 52ff77428ab551a95601f96f376d01953a84f87b Mon Sep 17 00:00:00 2001
From: noticeMaker <37525090+noticeMaker@users.noreply.github.com>
Date: Wed, 11 Apr 2018 01:14:16 +0800
Subject: [PATCH 1188/1382] added new type definition for npm package
 express-xml-bodyparser v0.3 (#24870)

---
 .../express-xml-bodyparser-tests.ts           | 10 ++++++++
 types/express-xml-bodyparser/index.d.ts       | 23 +++++++++++++++++++
 types/express-xml-bodyparser/tsconfig.json    | 23 +++++++++++++++++++
 types/express-xml-bodyparser/tslint.json      |  1 +
 4 files changed, 57 insertions(+)
 create mode 100644 types/express-xml-bodyparser/express-xml-bodyparser-tests.ts
 create mode 100644 types/express-xml-bodyparser/index.d.ts
 create mode 100644 types/express-xml-bodyparser/tsconfig.json
 create mode 100644 types/express-xml-bodyparser/tslint.json

diff --git a/types/express-xml-bodyparser/express-xml-bodyparser-tests.ts b/types/express-xml-bodyparser/express-xml-bodyparser-tests.ts
new file mode 100644
index 0000000000..e8deca25e3
--- /dev/null
+++ b/types/express-xml-bodyparser/express-xml-bodyparser-tests.ts
@@ -0,0 +1,10 @@
+import express = require('express');
+import xmlparser = require('express-xml-bodyparser');
+
+const app: express.Express = express();
+
+app.use(xmlparser());
+
+app.post("/auth", xmlparser({explicitArray: false}), (req, res, next) => {
+    res.send("Success!");
+});
diff --git a/types/express-xml-bodyparser/index.d.ts b/types/express-xml-bodyparser/index.d.ts
new file mode 100644
index 0000000000..1c674d71fb
--- /dev/null
+++ b/types/express-xml-bodyparser/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for express-xml-bodyparser 0.3
+// Project: https://github.com/macedigital/express-xml-bodyparser
+// Definitions by: Notice Maker <https://github.com/noticeMaker>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { Request, Response, NextFunction } from 'express';
+
+declare function xmlparser(options?: xmlparser.XmlparserOptions): (req: Request, res: Response, next: NextFunction) => void;
+
+declare namespace xmlparser {
+    let regexp: RegExp;
+
+    interface XmlparserOptions {
+        async?: boolean;
+        explicitArray?: boolean;
+        normalize?: boolean;
+        normalizeTags?: boolean;
+        trim?: boolean;
+    }
+}
+
+export = xmlparser;
diff --git a/types/express-xml-bodyparser/tsconfig.json b/types/express-xml-bodyparser/tsconfig.json
new file mode 100644
index 0000000000..49f0ac53bc
--- /dev/null
+++ b/types/express-xml-bodyparser/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "express-xml-bodyparser-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/express-xml-bodyparser/tslint.json b/types/express-xml-bodyparser/tslint.json
new file mode 100644
index 0000000000..2750cc0197
--- /dev/null
+++ b/types/express-xml-bodyparser/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file

From 74782d2c5087c8801347b5aada6d5b0409ba38b3 Mon Sep 17 00:00:00 2001
From: Janeene Beeforth <dawnmist@users.noreply.github.com>
Date: Wed, 11 Apr 2018 03:14:28 +1000
Subject: [PATCH 1189/1382] [react-bootstrap]: Add missing mountOnEnter prop
 for TabPane. (#24874)

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

diff --git a/types/react-bootstrap/lib/TabPane.d.ts b/types/react-bootstrap/lib/TabPane.d.ts
index c1ea0cf501..fefe101923 100644
--- a/types/react-bootstrap/lib/TabPane.d.ts
+++ b/types/react-bootstrap/lib/TabPane.d.ts
@@ -7,6 +7,7 @@ declare namespace TabPane {
         'aria-labelledby'?: string;
         bsClass?: string;
         eventKey?: any;
+        mountOnEnter?: boolean;
         unmountOnExit?: boolean;
     }
 }

From 8f457e08d0b84143a5c6886eb2ec8738ae78e44c Mon Sep 17 00:00:00 2001
From: RalfNieuwenhuizen <ralfnieuwenhuizen@gmail.com>
Date: Tue, 10 Apr 2018 19:15:04 +0200
Subject: [PATCH 1190/1382] Callback function typings for PushNotificationIOS
 (#24867)

* Callback function typings for PushNotificationIOS

Allow the different kind of callback functions for different events in the `PushNotificationIOS` class, according to the specification in https://facebook.github.io/react-native/docs/pushnotificationios.html#addeventlistener

* Remove trailing spaces

* Fix line length
---
 types/react-native/index.d.ts | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index 96526fcd9b..f7a70b79ac 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -7336,13 +7336,36 @@ export interface PushNotificationIOSStatic {
      *
      * The type MUST be 'notification'
      */
-    addEventListener(type: PushNotificationEventName, handler: (notification: PushNotification) => void): void;
+    addEventListener(type: "notification" | "localNotification", handler: (notification: PushNotification) => void): void;
+
+    /**
+     * Fired when the user registers for remote notifications.
+     *
+     * The handler will be invoked with a hex string representing the deviceToken.
+     *
+     * The type MUST be 'register'
+     */
+    addEventListener(type: "register", handler: (deviceToken: string) => void): void;
+
+    /**
+     * Fired when the user fails to register for remote notifications.
+     * Typically occurs when APNS is having issues, or the device is a simulator.
+     *
+     * The handler will be invoked with {message: string, code: number, details: any}.
+     *
+     * The type MUST be 'registrationError'
+     */
+    addEventListener(type: "registrationError", handler: (error: { message: string, code: number, details: any }) => void): void;
 
     /**
      * Removes the event listener. Do this in `componentWillUnmount` to prevent
      * memory leaks
      */
-    removeEventListener(type: PushNotificationEventName, handler: (notification: PushNotification) => void): void;
+    removeEventListener(type: PushNotificationEventName,
+        handler: ((notification: PushNotification) => void)
+            | ((deviceToken: string) => void)
+            | ((error: { message: string, code: number, details: any }) => void)
+    ): void;
 
     /**
      * Requests all notification permissions from iOS, prompting the user's

From 5193c7c6eddbba03fe885e61f3d21214c467f79e Mon Sep 17 00:00:00 2001
From: Mohsen Azimi <me@azimi.me>
Date: Tue, 10 Apr 2018 10:15:37 -0700
Subject: [PATCH 1191/1382] Add string option for vm.runIn*Context methods in
 Node.js typing (#24798)

* Add string option for vm.runIn*Context methods

* Add test

* lint
---
 types/node/index.d.ts       | 8 +++++---
 types/node/v8/index.d.ts    | 6 +++---
 types/node/v8/node-tests.ts | 4 ++++
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index 2522d51f54..86080907da 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -20,6 +20,7 @@
 //                 Klaus Meinhardt <https://github.com/ajafff>
 //                 Huw <https://github.com/hoo29>
 //                 Nicolas Even <https://github.com/n-e>
+//                 Mohsen Azimi <https://github.com/mohsen1>
 //                 Hoàng Văn Khải <https://github.com/KSXGitHub>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
@@ -2002,10 +2003,11 @@ declare module "vm" {
     }
     export function createContext(sandbox?: Context): Context;
     export function isContext(sandbox: Context): boolean;
-    export function runInContext(code: string, contextifiedSandbox: Context, options?: RunningScriptOptions): any;
+    export function runInContext(code: string, contextifiedSandbox: Context, options?: RunningScriptOptions | string): any;
+    /** @deprecated */
     export function runInDebugContext(code: string): any;
-    export function runInNewContext(code: string, sandbox?: Context, options?: RunningScriptOptions): any;
-    export function runInThisContext(code: string, options?: RunningScriptOptions): any;
+    export function runInNewContext(code: string, sandbox?: Context, options?: RunningScriptOptions | string): any;
+    export function runInThisContext(code: string, options?: RunningScriptOptions | string): any;
 }
 
 declare module "child_process" {
diff --git a/types/node/v8/index.d.ts b/types/node/v8/index.d.ts
index 28bc5dc779..fe36bccd1f 100644
--- a/types/node/v8/index.d.ts
+++ b/types/node/v8/index.d.ts
@@ -1992,10 +1992,10 @@ declare module "vm" {
     }
     export function createContext(sandbox?: Context): Context;
     export function isContext(sandbox: Context): boolean;
-    export function runInContext(code: string, contextifiedSandbox: Context, options?: RunningScriptOptions): any;
+    export function runInContext(code: string, contextifiedSandbox: Context, options?: RunningScriptOptions | string): any;
     export function runInDebugContext(code: string): any;
-    export function runInNewContext(code: string, sandbox?: Context, options?: RunningScriptOptions): any;
-    export function runInThisContext(code: string, options?: RunningScriptOptions): any;
+    export function runInNewContext(code: string, sandbox?: Context, options?: RunningScriptOptions | string): any;
+    export function runInThisContext(code: string, options?: RunningScriptOptions | string): any;
 }
 
 declare module "child_process" {
diff --git a/types/node/v8/node-tests.ts b/types/node/v8/node-tests.ts
index 58c1319261..845837230a 100644
--- a/types/node/v8/node-tests.ts
+++ b/types/node/v8/node-tests.ts
@@ -2526,6 +2526,10 @@ namespace vm_tests {
         const Debug = vm.runInDebugContext('Debug');
         Debug.scripts().forEach((script: any) => { console.log(script.name); });
     }
+
+    {
+        vm.runInThisContext('console.log("hello world"', './my-file.js');
+    }
 }
 
 /////////////////////////////////////////////////////

From b24419795db48447632332332ccebbd085ba4fcb Mon Sep 17 00:00:00 2001
From: falsandtru <falsandtru@users.noreply.github.com>
Date: Wed, 11 Apr 2018 02:16:16 +0900
Subject: [PATCH 1192/1382] power-assert: Update APIs (#24578)

* Update APIs

* Update header
---
 types/power-assert/index.d.ts            |  4 +++-
 types/power-assert/power-assert-tests.ts | 12 ++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/types/power-assert/index.d.ts b/types/power-assert/index.d.ts
index fa23620b8e..ab066b28bc 100644
--- a/types/power-assert/index.d.ts
+++ b/types/power-assert/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for power-assert 1.4.1
+// Type definitions for power-assert 1.5.0
 // Project: https://github.com/twada/power-assert
 // Definitions by: vvakame <https://github.com/vvakame>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -62,6 +62,8 @@ declare namespace assert {
 
     export function ifError(value:any):void;
 
+    export const strict: typeof assert;
+
     export interface Options {
         assertion?: empower.Options;
         output?: powerAssertFormatter.Options;
diff --git a/types/power-assert/power-assert-tests.ts b/types/power-assert/power-assert-tests.ts
index 0ec099b32c..a60f99964d 100644
--- a/types/power-assert/power-assert-tests.ts
+++ b/types/power-assert/power-assert-tests.ts
@@ -1,5 +1,3 @@
-
-
 import assert = require("power-assert");
 
 assert(1 + 1 - 2 === 0, "The universe isn't how it should.");
@@ -16,13 +14,13 @@ assert.notDeepStrictEqual([{a:1}], [{a:1}], "uses === comparator");
 
 assert.throws(() => {
     throw "a hammer at your face";
-}, undefined, "DODGED IT");
+}, "DODGED IT");
 
 assert.doesNotThrow(() => {
     if (!!false) {
         throw "a hammer at your face";
     }
-}, undefined, "What the...*crunch*");
+}, "What the...*crunch*");
 
 
 var customizedAssert1 = assert.customize({
@@ -41,13 +39,13 @@ customizedAssert1.notStrictEqual(2, "2", "uses === comparator");
 
 customizedAssert1.throws(() => {
     throw "a hammer at your face";
-}, undefined, "DODGED IT");
+}, "DODGED IT");
 
 customizedAssert1.doesNotThrow(() => {
     if (!!false) {
         throw "a hammer at your face";
     }
-}, undefined, "What the...*crunch*");
+}, "What the...*crunch*");
 
 
 var customizedAssert2 = assert.customize({
@@ -85,3 +83,5 @@ var customizedAssert2 = assert.customize({
         ]
     }
 });
+
+(): typeof assert => assert.strict;

From 7f2ac5d513366c00738d1f30339da95410aab0b3 Mon Sep 17 00:00:00 2001
From: Sergei Dorogin <github@dorogin.com>
Date: Tue, 10 Apr 2018 20:19:30 +0300
Subject: [PATCH 1193/1382] Handlebars: improved typings (#23215)

* Handlebars: Added HelperDelegate and HelperOptions interfaces, data field to RuntimeOptions

WIP

* Handlebars:

Added HelperDelegate and HelperOptions interfaces, TemplateDelegate, Template
RuntimeOptions: added data and blockParams fields
registerHelper and registerPartial methods: typed signatures for callbacks (HelperDelegate)

* Handlebars:

SafeString and Utils were moved into Handlebars namespace
fix: added tests into tsconfig.json::files
fix: handlebars-tests.ts: made tslint happy

* Handlebars: updated authors, bumped up version (to the latest 4.0.11)

* small fixes of typos (missing semicolons)
---
 types/handlebars/handlebars-tests.ts |  64 +++++++-------
 types/handlebars/index.d.ts          | 127 ++++++++++++++++-----------
 types/handlebars/tsconfig.json       |   6 +-
 3 files changed, 113 insertions(+), 84 deletions(-)

diff --git a/types/handlebars/handlebars-tests.ts b/types/handlebars/handlebars-tests.ts
index 95342c2e63..1ec2528db3 100644
--- a/types/handlebars/handlebars-tests.ts
+++ b/types/handlebars/handlebars-tests.ts
@@ -1,8 +1,8 @@
 
-import Handlebars = require('handlebars');
+//import Handlebars = require('handlebars');
+import * as Handlerbars from 'handlebars';
 
-
-var context = {
+const context = {
     author: { firstName: 'Alan', lastName: 'Johnson' },
     body: 'I Love Handlebars',
     comments: [{
@@ -20,65 +20,61 @@ Handlebars.registerHelper('agree_button', function() {
     );
 });
 
-var source = '<p>Hello, my name is {{name}}. I am from {{hometown}}. I have ' +
+const source1 = '<p>Hello, my name is {{name}}. I am from {{hometown}}. I have ' +
              '{{kids.length}} kids:</p>' +
              '<ul>{{#kids}}<li>{{name}} is {{age}}</li>{{/kids}}</ul>';
-var template = Handlebars.compile(source);
-var data = { 'name': 'Alan', 'hometown': 'Somewhere, TX',
-             'kids': [{'name': 'Jimmy', 'age': '12'}, {'name': 'Sally', 'age': '4'}]};
-var result = template(data);
+const template1 = Handlebars.compile(source1);
+template1({ name: "Alan", hometown: "Somewhere, TX", kids: [{name: "Jimmy", age: 12}, {name: "Sally", age: 4}]});
 
 Handlebars.registerHelper('link_to', (context: typeof post) => {
     return '<a href="' + context.url + '">' + context.body + '</a>';
 });
-
-var post = { url: '/hello-world', body: 'Hello World!' };
-var context2 = { posts: [post] };
-var source2 = '<ul>{{#posts}}<li>{{{link_to this}}}</li>{{/posts}}</ul>';
-
-var template2: HandlebarsTemplateDelegate<{ posts: { url: string, body: string }[] }> = Handlebars.compile(source2);
+const post = { url: "/hello-world", body: "Hello World!" };
+const context2 = { posts: [post] };
+const source2 = '<ul>{{#posts}}<li>{{{link_to this}}}</li>{{/posts}}</ul>';
+const template2: HandlebarsTemplateDelegate<{ posts: { url: string, body: string }[] }> = Handlebars.compile(source2);
 template2(context2);
 
 Handlebars.registerHelper('link_to', (title: string, context: typeof post) => {
     return '<a href="/posts' + context.url + '">' + title + '!</a>';
 });
-
-var context3 = { posts: [{url: '/hello-world', body: 'Hello World!'}] };
-var source3 = '<ul>{{#posts}}<li>{{{link_to "Post" this}}}</li>{{/posts}}</ul>';
-var template3 = Handlebars.compile<typeof context3>(source3);
+const context3 = { posts: [{url: '/hello-world', body: 'Hello World!'}] };
+const source3 = '<ul>{{#posts}}<li>{{{link_to "Post" this}}}</li>{{/posts}}</ul>';
+const template3 = Handlebars.compile<typeof context3>(source3);
 template3(context3);
 
-var source4 = '<ul>{{#people}}<li>{{#link}}{{name}}{{/link}}</li>{{/people}}</ul>';
+const source4 = '<ul>{{#people}}<li>{{#link}}{{name}}{{/link}}</li>{{/people}}</ul>';
 Handlebars.registerHelper('link', function(context: any) {
     return '<a href="/people/' + this.id + '">' + context.fn(this) + '</a>';
 });
-var template4 = Handlebars.compile<{ people: { name: string, id: number }[] }>(source4);
-var data2 = { 'people': [
+const template4 = Handlebars.compile<{ people: { name: string, id: number }[] }>(source4);
+const data2 = { 'people': [
     { 'name': 'Alan', 'id': 1 },
     { 'name': 'Yehuda', 'id': 2 }
 ]};
 template4(data2);
 
-var source5 = '<ul>{{#people}}<li>{{> link}}</li>{{/people}}</ul>';
+const source5 = '<ul>{{#people}}<li>{{> link}}</li>{{/people}}</ul>';
 Handlebars.registerPartial('link', '<a href="/people/{{id}}">{{name}}</a>');
-var template5 = Handlebars.compile(source5);
-var data3 = { 'people': [
+const template5 = Handlebars.compile(source5);
+const data3 = { 'people': [
     { 'name': 'Alan', 'id': 1 },
     { 'name': 'Yehuda', 'id': 2 }
 ]};
 template5(data3);
 
-Handlebars.registerHelper('list', (items: any, fn: (item: any) => string) => {
-    var out = '<ul>';
-    for(var i=0, l=items.length; i<l; i++) {
-        out = out + '<li>' + fn(items[i]) + '</li>';
-    }
-    return out + '</ul>';
-});
-Handlebars.registerHelper('fullName', (person: typeof context.author) => {
-    return person.firstName + ' ' + person.lastName;
+const source6 = '{{#list nav}}<a href="{{url}}">{{title}}</a>{{/list}}';
+const template6 = Handlebars.compile(source6);
+Handlebars.registerHelper('list', (context, options: Handlebars.HelperOptions) => {
+  let ret = "<ul>";
+  for(let i=0, j=context.length; i<j; i++) {
+    ret = ret + "<li>" + options.fn(context[i]) + "</li>";
+  }
+  return ret + "</ul>";
 });
+template6([{url:"", title:""}])
 
-var escapedExpression = Handlebars.Utils.escapeExpression('<script>alert(\'xss\');</script>');
+
+const escapedExpression = Handlebars.Utils.escapeExpression('<script>alert(\'xss\');</script>');
 
 Handlebars.helpers !== undefined;
diff --git a/types/handlebars/index.d.ts b/types/handlebars/index.d.ts
index eb5958f6db..351d98fb10 100644
--- a/types/handlebars/index.d.ts
+++ b/types/handlebars/index.d.ts
@@ -1,15 +1,48 @@
-// Type definitions for Handlebars v4.0.5
+// Type definitions for Handlebars v4.0.11
 // Project: http://handlebarsjs.com/
-// Definitions by: Boris Yankov <https://github.com/borisyankov>
+// Definitions by: Boris Yankov <https://github.com/borisyankov>, Sergei Dorogin <https://github.com/evil-shrike>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
 declare namespace Handlebars {
-    export function registerHelper(name: string, fn: Function, inverse?: boolean): void;
-    export function registerHelper(name: Object): void;
-    export function registerPartial(name: string, str: any): void;
+    export interface TemplateDelegate<T = any> {
+        (context: T, options?: RuntimeOptions): string;
+    }
+
+    export type Template<T = any> = TemplateDelegate<T>|string;
+
+    export interface RuntimeOptions {
+        partial?: boolean;
+        depths?: any[];
+        helpers?: { [name: string]: Function };
+        partials?: { [name: string]: HandlebarsTemplateDelegate };
+        decorators?: { [name: string]: Function };
+        data?: any;
+        blockParams?: any[];
+    }
+
+    export interface HelperOptions {
+        fn: TemplateDelegate;
+        inverse: TemplateDelegate;
+        hash: any;
+        data?: any;
+    }
+
+    export interface HelperDelegate {
+        (context?: any, arg1?: any, arg2?: any, arg3?: any, arg4?: any, arg5?: any, options?: HelperOptions): any;
+    }
+    export interface HelperDeclareSpec {
+        [key: string]: HelperDelegate;
+    }
+
+    export function registerHelper(name: string, fn: HelperDelegate): void;
+    export function registerHelper(name: HelperDeclareSpec): void;
     export function unregisterHelper(name: string): void;
+
+    export function registerPartial(name: string, fn: Template): void;
     export function unregisterPartial(name: string): void;
+
+    // TODO: replace Function with actual signature
     export function registerDecorator(name: string, fn: Function): void;
     export function unregisterDecorator(name: string): void;
 
@@ -25,23 +58,36 @@ declare namespace Handlebars {
 
     export function create(): typeof Handlebars;
 
-    export var SafeString: typeof hbs.SafeString;
-    export var escapeExpression: typeof hbs.Utils.escapeExpression;
-    export var Utils: typeof hbs.Utils;
-    export var logger: Logger;
-    export var templates: HandlebarsTemplates;
-    export var helpers: { [name: string]: Function };
-    export var partials: { [name: string]: any };
-    export var decorators: { [name: string]: Function };
-
-    export function registerDecorator(name: string, fn: Function): void;
-    export function registerDecorator(obj: {[name: string] : Function}): void;
-    export function unregisterDecorator(name: string): void;
+    export const escapeExpression: typeof Utils.escapeExpression;
+    //export const Utils: typeof hbs.Utils;
+    export const logger: Logger;
+    export const templates: HandlebarsTemplates;
+    export const helpers: { [name: string]: HelperDelegate };
+    export const partials: { [name: string]: any };
+    // TODO: replace Function with actual signature
+    export const decorators: { [name: string]: Function };
 
     export function noConflict(): typeof Handlebars;
 
-    export module AST {
-        export var helpers: hbs.AST.helpers;
+    export class SafeString {
+        constructor(str: string);
+        toString(): string;
+        toHTML(): string;
+    }
+
+    export namespace Utils {
+        export function escapeExpression(str: string): string;
+        export function createFrame(object: any): any;
+        export function blockParams(obj: any[], ids: any[]): any[];
+        export function isEmpty(obj: any) : boolean;
+        export function extend(obj: any, ...source: any[]): any;
+        export function toString(obj: any): string;
+        export function isArray(obj: any): boolean;
+        export function isFunction(obj: any): boolean;
+    }
+
+    export namespace AST {
+        export const helpers: hbs.AST.helpers;
     }
 
     interface ICompiler {
@@ -96,9 +142,8 @@ interface HandlebarsTemplatable {
     template: HandlebarsTemplateDelegate;
 }
 
-interface HandlebarsTemplateDelegate<T = any> {
-    (context: T, options?: RuntimeOptions): string;
-}
+// NOTE: for backward compatibility of this typing
+type HandlebarsTemplateDelegate<T = any> = Handlebars.TemplateDelegate<T>;
 
 interface HandlebarsTemplates {
     [index: string]: HandlebarsTemplateDelegate;
@@ -108,13 +153,8 @@ interface TemplateSpecification {
 
 }
 
-interface RuntimeOptions {
-    partial?: boolean;
-    depths?: any[];
-    helpers?: { [name: string]: Function }
-    partials?: { [name: string]: HandlebarsTemplateDelegate }
-    decorators?: { [name: string]: Function }
-}
+// for backward compatibility of this typing
+type RuntimeOptions = Handlebars.RuntimeOptions;
 
 interface CompileOptions {
     data?: boolean;
@@ -128,7 +168,7 @@ interface CompileOptions {
         with?: boolean;
         log?: boolean;
         lookup?: boolean;
-    }
+    };
     knownHelpersOnly?: boolean;
     noEscape?: boolean;
     strict?: boolean;
@@ -144,21 +184,10 @@ interface PrecompileOptions extends CompileOptions {
 }
 
 declare namespace hbs {
-    class SafeString {
-        constructor(str: string);
-        static toString(): string;
-    }
+    // for backward compatibility of this typing
+    type SafeString = Handlebars.SafeString;
 
-    namespace Utils {
-        function escapeExpression(str: string): string;
-        function createFrame(object: any): any;
-        function blockParams(obj: any[], ids: any[]): any[];
-        function isEmpty(obj: any) : boolean;
-        function extend(obj: any, ...source: any[]): any;
-        function toString(obj: any): string;
-        function isArray(obj: any): boolean;
-        function isFunction(obj: any): boolean;
-    }
+    type Utils = typeof Handlebars.Utils;
 }
 
 interface Logger {
@@ -231,11 +260,11 @@ declare namespace hbs {
 
         interface PartialBlockStatement extends Statement {
             name: PathExpression | SubExpression;
-            params: Expression[],
-            hash: Hash,
-            program: Program,
-            openStrip: StripFlags,
-            closeStrip: StripFlags
+            params: Expression[];
+            hash: Hash;
+            program: Program;
+            openStrip: StripFlags;
+            closeStrip: StripFlags;
         }
 
         interface ContentStatement extends Statement {
diff --git a/types/handlebars/tsconfig.json b/types/handlebars/tsconfig.json
index 5f874f3996..5c7bf000d0 100644
--- a/types/handlebars/tsconfig.json
+++ b/types/handlebars/tsconfig.json
@@ -19,5 +19,9 @@
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
-    }
+    },
+    "files": [
+        "index.d.ts",
+        "handlebars-tests.ts"
+    ]
 }
\ No newline at end of file

From 5515e867df0b46385d446aa41f36918dcb414efb Mon Sep 17 00:00:00 2001
From: Rasmus Eneman <rasmus@eneman.eu>
Date: Tue, 10 Apr 2018 19:21:14 +0200
Subject: [PATCH 1194/1382] [react-dom] fix signature of findDOMNode (#24211)

fixes #24167
---
 types/react-dom/index.d.ts                  | 2 +-
 types/react-tooltip/react-tooltip-tests.tsx | 4 ++--
 types/react/test/index.ts                   | 4 ++--
 types/react/v15/test/index.ts               | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/types/react-dom/index.d.ts b/types/react-dom/index.d.ts
index da494182d6..bd9541217d 100644
--- a/types/react-dom/index.d.ts
+++ b/types/react-dom/index.d.ts
@@ -16,7 +16,7 @@ import {
     DOMAttributes, DOMElement, ReactNode, ReactPortal
 } from 'react';
 
-export function findDOMNode(instance: ReactInstance): Element;
+export function findDOMNode(instance: ReactInstance): Element | null | Text;
 export function unmountComponentAtNode(container: Element): boolean;
 
 export function createPortal(children: ReactNode, container: Element): ReactPortal;
diff --git a/types/react-tooltip/react-tooltip-tests.tsx b/types/react-tooltip/react-tooltip-tests.tsx
index 3fee5dba3e..97b7a085ea 100644
--- a/types/react-tooltip/react-tooltip-tests.tsx
+++ b/types/react-tooltip/react-tooltip-tests.tsx
@@ -91,7 +91,7 @@ export class ReactTooltipTest extends React.PureComponent {
             <p data-for="show-on-click" ref="fooShow" data-tip="tooltip" />
             <button
                 onClick={() => {
-                    ReactTooltip.show(findDOMNode(this.refs.fooShow));
+                    ReactTooltip.show(findDOMNode(this.refs.fooShow) as Element);
                 }}
             />
             <ReactTooltip id="show-on-click" />
@@ -99,7 +99,7 @@ export class ReactTooltipTest extends React.PureComponent {
             <p data-for="hide-on-click" ref="fooHide" data-tip="tooltip"/>
             <button
                 onClick={() => {
-                    ReactTooltip.hide(findDOMNode(this.refs.fooHide));
+                    ReactTooltip.hide(findDOMNode(this.refs.fooHide) as Element);
                 }}
             />
             <ReactTooltip id="hide-on-click" />
diff --git a/types/react/test/index.ts b/types/react/test/index.ts
index e0e4a09065..1df0282ee8 100644
--- a/types/react/test/index.ts
+++ b/types/react/test/index.ts
@@ -237,8 +237,8 @@ const str: string = ReactDOMServer.renderToString(element);
 const markup: string = ReactDOMServer.renderToStaticMarkup(element);
 const notValid: boolean = React.isValidElement(props); // false
 const isValid = React.isValidElement(element); // true
-let domNode: Element = ReactDOM.findDOMNode(component);
-domNode = ReactDOM.findDOMNode(domNode);
+let domNode = ReactDOM.findDOMNode(component);
+domNode = ReactDOM.findDOMNode(domNode as Element);
 const fragmentType: React.ComponentType = React.Fragment;
 
 //
diff --git a/types/react/v15/test/index.ts b/types/react/v15/test/index.ts
index 8cd6765f4c..45894cb397 100644
--- a/types/react/v15/test/index.ts
+++ b/types/react/v15/test/index.ts
@@ -255,8 +255,8 @@ const str: string = ReactDOMServer.renderToString(element);
 const markup: string = ReactDOMServer.renderToStaticMarkup(element);
 const notValid: boolean = React.isValidElement(props); // false
 const isValid = React.isValidElement(element); // true
-let domNode: Element = ReactDOM.findDOMNode(component);
-domNode = ReactDOM.findDOMNode(domNode);
+let domNode = ReactDOM.findDOMNode(component);
+domNode = ReactDOM.findDOMNode(domNode as Element);
 
 //
 // React Elements

From 130f2eec2fdd02a395de133bb7423af3f1975c05 Mon Sep 17 00:00:00 2001
From: Ferdy Budhidharma <ferd312@gmail.com>
Date: Tue, 10 Apr 2018 12:22:57 -0500
Subject: [PATCH 1195/1382] [react] add forwardRef and createRef functions for
 React v16.3 (#24624)

* feat(react): add forwardRef and createRef functions

* fix(tests): fix failing tests
- datepicker needs to be updated to use optional generic types since it was using ClassAttributes incorrectly
---
 .../create-react-class-tests.ts               |  2 +-
 types/react-daterange-picker/index.d.ts       |  4 ++--
 types/react/index.d.ts                        | 20 ++++++++++++++++++-
 types/react/test/index.ts                     | 12 ++++++++++-
 4 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/types/create-react-class/create-react-class-tests.ts b/types/create-react-class/create-react-class-tests.ts
index b8025b23f0..3d7536d722 100644
--- a/types/create-react-class/create-react-class-tests.ts
+++ b/types/create-react-class/create-react-class-tests.ts
@@ -11,7 +11,7 @@ interface State {
     bar: number;
 }
 
-const props: Props & React.ClassAttributes<{}> = {
+const props: Props = {
     foo: "foo"
 };
 
diff --git a/types/react-daterange-picker/index.d.ts b/types/react-daterange-picker/index.d.ts
index e6fac4c33d..9d1d3ec565 100644
--- a/types/react-daterange-picker/index.d.ts
+++ b/types/react-daterange-picker/index.d.ts
@@ -12,7 +12,7 @@ import * as momentRange from "moment-range";
 export default class DateRangePicker extends React.Component<Props> { }
 export as namespace ReactDateRangePicker;
 
-export interface Props extends React.Props<{}> {
+export interface Props<T = DateRangePicker> extends React.Props<T> {
     bemBlock?: string;
     bemNamespace?: string;
     dateStates?: DateState[];
@@ -57,7 +57,7 @@ export interface StateDefinition {
     selectable?: boolean;
 }
 
-export interface PaginationArrowProps extends React.Props<{}> {
+export interface PaginationArrowProps<T = PaginationArrow> extends React.Props<T> {
     disabled?: boolean;
     onTrigger?(): void;
     direction?: 'next' | 'previous';
diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index 968063559a..beaf5327d5 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -15,6 +15,7 @@
 //                 Josh Rutherford <https://github.com/theruther4d>
 //                 Guilherme Hübner <https://github.com/guilhermehubner>
 //                 Josh Goldberg <https://github.com/joshuakgoldberg>
+//                 Ferdy Budhidharma <https://github.com/ferdaber>
 //                 Johann Rakotoharisoa <https://github.com/jrakotoharisoa>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
@@ -79,7 +80,12 @@ declare namespace React {
     type ComponentType<P = {}> = ComponentClass<P> | StatelessComponent<P>;
 
     type Key = string | number;
-    type Ref<T> = string | { bivarianceHack(instance: T | null): any }["bivarianceHack"];
+
+    interface RefObject<T> {
+        readonly current: T | null;
+    }
+
+    type Ref<T> = string | { bivarianceHack(instance: T | null): any }["bivarianceHack"] | RefObject<T>;
 
     // tslint:disable-next-line:interface-over-type-literal
     type ComponentState = {};
@@ -334,6 +340,14 @@ declare namespace React {
         displayName?: string;
     }
 
+    interface RefForwardingComponent<T, P = {}> {
+        (props: P & { children?: ReactNode }, ref?: Ref<T>): ReactElement<any> | null;
+        propTypes?: ValidationMap<P>;
+        contextTypes?: ValidationMap<any>;
+        defaultProps?: Partial<P>;
+        displayName?: string;
+    }
+
     interface ComponentClass<P = {}> extends StaticLifecycle<P, any> {
         new (props: P, context?: any): Component<P, ComponentState>;
         propTypes?: ValidationMap<P>;
@@ -535,6 +549,10 @@ declare namespace React {
         [propertyName: string]: any;
     }
 
+    function createRef<T>(): RefObject<T>;
+
+    function forwardRef<T, P = {}>(Component: RefForwardingComponent<T, P>): ComponentType<P & ClassAttributes<T>>;
+
     //
     // Event System
     // ----------------------------------------------------------------------
diff --git a/types/react/test/index.ts b/types/react/test/index.ts
index 1df0282ee8..4ec98db218 100644
--- a/types/react/test/index.ts
+++ b/types/react/test/index.ts
@@ -37,7 +37,8 @@ interface MyComponent extends React.Component<Props, State> {
     reset(): void;
 }
 
-const props: Props & React.ClassAttributes<{}> = {
+// use any for ClassAttribute type sine we're using string refs
+const props: Props & React.ClassAttributes<any> = {
     key: 42,
     ref: "myComponent42",
     hello: "world",
@@ -288,6 +289,15 @@ DOM.div({ ref: node => domNodeRef = node });
 let inputNodeRef: HTMLInputElement | null;
 DOM.input({ ref: node => inputNodeRef = node as HTMLInputElement });
 
+const ForwardingRefComponent = React.forwardRef((props: {}, ref: React.Ref<RefComponent>) => {
+    return React.createElement(RefComponent, { ref });
+});
+
+function RefCarryingComponent() {
+    const ref: React.RefObject<RefComponent> = React.createRef();
+    return React.createElement(ForwardingRefComponent, { ref });
+}
+
 //
 // Attributes
 // --------------------------------------------------------------------------

From e42e0bde81f19ea15e3e77f2cbf03bc11481f100 Mon Sep 17 00:00:00 2001
From: Lior Chen <liorchen@gmail.com>
Date: Tue, 10 Apr 2018 20:27:08 +0300
Subject: [PATCH 1196/1382] fix(restangular): remove duplicate IScopedService
 (#24865)

---
 types/restangular/index.d.ts | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/types/restangular/index.d.ts b/types/restangular/index.d.ts
index 1b8068f34e..00d15ba073 100644
--- a/types/restangular/index.d.ts
+++ b/types/restangular/index.d.ts
@@ -107,15 +107,6 @@ declare namespace restangular {
     getList<T>(queryParams?: any, headers?: any): ICollectionPromise<T>;
   }
 
-  interface IScopedService extends IService {
-    one(id: number): IElement;
-    one(id: string): IElement;
-    post(elementToPost: any, queryParams?: any, headers?: any): IPromise<any>;
-    post<T>(elementToPost: T, queryParams?: any, headers?: any): IPromise<T>;
-    getList(queryParams?: any, headers?: any): ICollectionPromise<any>;
-    getList<T>(queryParams?: any, headers?: any): ICollectionPromise<T>;
-  }
-
   interface IElement extends IService {
     get(queryParams?: any, headers?: any): IPromise<any>;
     get<T>(queryParams?: any, headers?: any): IPromise<T>;

From bd402d4157ad0e08cce42a28f2c859fc774e5bad Mon Sep 17 00:00:00 2001
From: Jack <szdc@users.noreply.github.com>
Date: Wed, 11 Apr 2018 03:28:26 +1000
Subject: [PATCH 1197/1382] fix(diff): update diffArrays return value type to
 support arrays (#24869)

---
 types/diff/diff-tests.ts | 12 ++++++++++--
 types/diff/index.d.ts    |  9 ++++++++-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/types/diff/diff-tests.ts b/types/diff/diff-tests.ts
index f859a735b4..0dea2a305e 100644
--- a/types/diff/diff-tests.ts
+++ b/types/diff/diff-tests.ts
@@ -5,8 +5,16 @@ const other = 'beep boob blah';
 let diff = jsdiff.diffChars(one, other);
 printDiff(diff);
 
-diff = jsdiff.diffArrays(['a', 'b', 'c'], ['a', 'c', 'd']);
-printDiff(diff);
+const diffArraysResult = jsdiff.diffArrays<string>(['a', 'b', 'c'], ['a', 'c', 'd']);
+diffArraysResult.forEach(result => {
+    if (result.added) {
+        console.log(`added ${result.value.length} line(s):`, ...result.value);
+    } else if (result.removed) {
+        console.log(`removed ${result.value.length} line(s):`, ...result.value);
+    } else {
+        console.log(`no changes`);
+    }
+});
 
 // --------------------------
 
diff --git a/types/diff/index.d.ts b/types/diff/index.d.ts
index 2017b43e0e..33d337d1b7 100644
--- a/types/diff/index.d.ts
+++ b/types/diff/index.d.ts
@@ -29,6 +29,13 @@ declare namespace JsDiff {
         removed?: boolean;
     }
 
+    interface IDiffArraysResult<T> {
+        value: T[];
+        count?: number;
+        added?: boolean;
+        removed?: boolean;
+    }
+
     interface IBestPath {
         newPos: number;
         componenets: IDiffResult[];
@@ -85,7 +92,7 @@ declare namespace JsDiff {
 
     function diffSentences(oldStr: string, newStr: string, options?: IOptions): IDiffResult[];
 
-    function diffArrays(oldArr: any[], newArr: any[], options?: IArrayOptions): IDiffResult[];
+    function diffArrays<T>(oldArr: T[], newArr: T[], options?: IArrayOptions): Array<IDiffArraysResult<T>>;
 
     function createPatch(fileName: string, oldStr: string, newStr: string, oldHeader: string, newHeader: string, options?: {context: number}): string;
 

From bce06c637e331db94a0515a9eaad5299836224b3 Mon Sep 17 00:00:00 2001
From: Makoto Sakaguchi <Umoxfo@users.noreply.github.com>
Date: Tue, 10 Apr 2018 10:28:53 -0700
Subject: [PATCH 1198/1382] [tar-fs] Add missing options (#24880)

* Format

* Define the return type

* Move some properties of ExtractOptions into Options

* Minorchange
---
 types/tar-fs/index.d.ts | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/types/tar-fs/index.d.ts b/types/tar-fs/index.d.ts
index 07c02bab4b..9d6d6c20a4 100644
--- a/types/tar-fs/index.d.ts
+++ b/types/tar-fs/index.d.ts
@@ -8,16 +8,22 @@
 
 /// <reference types="node" />
 
-import fs = require("fs");
+import fs = require('fs');
+import stream = require('stream');
 
-export function pack(cwd: string, opts?: PackOptions): any;
-export function extract(cwd: string, opts?: ExtractOptions): any;
+// Replace these return values with the value of tar-stream when it becomes available
+export function pack(cwd: string, opts?: PackOptions): stream.Readable;
+export function extract(cwd: string, opts?: ExtractOptions): stream.Writable;
 
 export interface Options {
     ignore?: (name: string) => boolean;
     filter?: (name: string) => boolean;
     map?: (header: Headers) => Headers;
     mapStream?: (fileStream: fs.ReadStream, header: Headers) => fs.ReadStream;
+    dmode?: number;
+    fmode?: number;
+    readable?: boolean;
+    writable?: boolean;
     strict?: boolean;
 }
 
@@ -31,10 +37,6 @@ export interface PackOptions extends Options {
 export interface ExtractOptions extends Options {
     ignore?: (name: string, header?: Headers) => boolean;
     filter?: (name: string, header?: Headers) => boolean;
-    dmode?: number;
-    fmode?: number;
-    readable?: boolean;
-    writable?: boolean;
 }
 
 export interface Headers {
@@ -42,7 +44,7 @@ export interface Headers {
     mode: number;
     mtime: Date;
     size: number;
-    type: "file" | "directory" | "symlink";
+    type: 'file' | 'directory' | 'link' | 'symlink';
     uid: number;
     gid: number;
 }

From 354aa1f2931676127e87c90e5966717b9b80e57a Mon Sep 17 00:00:00 2001
From: Yuki Nishijima <yk.nishijima@gmail.com>
Date: Tue, 10 Apr 2018 13:30:09 -0400
Subject: [PATCH 1199/1382] Make Overlay.OverlayProps importable (#24881)

---
 types/react-overlays/lib/Overlay.d.ts         | 43 ++++++++++---------
 .../test/react-overlays-tests-individual.tsx  |  4 ++
 2 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/types/react-overlays/lib/Overlay.d.ts b/types/react-overlays/lib/Overlay.d.ts
index 7df97f3cc3..473f391a74 100644
--- a/types/react-overlays/lib/Overlay.d.ts
+++ b/types/react-overlays/lib/Overlay.d.ts
@@ -5,30 +5,31 @@ import { PortalProps } from './Portal';
 import { PositionProps } from './Position';
 
 declare class Overlay extends React.Component<OverlayProps> { }
-declare namespace Overlay { }
 export = Overlay;
 
-interface OverlayProps extends TransitionCallbacks, PortalProps, PositionProps {
-  /**
-   * Set the visibility of the Overlay
-   */
-  show?: boolean;
+declare namespace Overlay {
+  interface OverlayProps extends TransitionCallbacks, PortalProps, PositionProps {
+    /**
+     * Set the visibility of the Overlay
+     */
+    show?: boolean;
 
-  /**
-   * Specify whether the overlay should trigger `onHide` when the user clicks outside the overlay
-   */
-  rootClose?: boolean;
+    /**
+     * Specify whether the overlay should trigger `onHide` when the user clicks outside the overlay
+     */
+    rootClose?: boolean;
 
-  /**
-   * A Callback fired by the Overlay when it wishes to be hidden.
-   *
-   * __required__ when `rootClose` is `true`.
-   */
-  onHide?(props: PortalProps, ...args: any[]): any;
+    /**
+     * A Callback fired by the Overlay when it wishes to be hidden.
+     *
+     * __required__ when `rootClose` is `true`.
+     */
+    onHide?(props: PortalProps, ...args: any[]): any;
 
-  /**
-   * A `react-transition-group@2.0.0` `<Transition/>` component
-   * used to animate the overlay as it changes visibility.
-   */
-  transition?: React.ComponentType<TransitionProps>;
+    /**
+     * A `react-transition-group@2.0.0` `<Transition/>` component
+     * used to animate the overlay as it changes visibility.
+     */
+    transition?: React.ComponentType<TransitionProps>;
+  }
 }
diff --git a/types/react-overlays/test/react-overlays-tests-individual.tsx b/types/react-overlays/test/react-overlays-tests-individual.tsx
index b066a40ec3..9201604d49 100644
--- a/types/react-overlays/test/react-overlays-tests-individual.tsx
+++ b/types/react-overlays/test/react-overlays-tests-individual.tsx
@@ -22,6 +22,10 @@ class TestAffix extends React.Component {
   }
 }
 
+interface OverlayTriggerProps extends Overlay.OverlayProps {
+  overlay: any;
+}
+
 class TestOverlay extends React.Component<{}, {open: boolean}> {
   target: HTMLElement | null = null;
   state = {open: false};

From b98b4e9c9a6da80d4a22d18dff3a0f260566a098 Mon Sep 17 00:00:00 2001
From: tkohr <tobiaskohr@gmail.com>
Date: Tue, 10 Apr 2018 19:30:46 +0200
Subject: [PATCH 1200/1382] Add missing options to NavigationControl (#24878)

Add boolean options showCompass and showZoom to NavigationControl like documented: https://www.mapbox.com/mapbox-gl-js/api/#navigationcontrol
---
 types/mapbox-gl/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/mapbox-gl/index.d.ts b/types/mapbox-gl/index.d.ts
index 24dca985e4..b6a63ef9dd 100644
--- a/types/mapbox-gl/index.d.ts
+++ b/types/mapbox-gl/index.d.ts
@@ -399,7 +399,7 @@ declare namespace mapboxgl {
      * Navigation
      */
     export class NavigationControl extends Control {
-        constructor();
+		constructor(options?: {showCompass?: boolean, showZoom?: boolean});
     }
 
     export class PositionOptions {

From 5a7d2de9b2bcbc281cb8e374ea5618a99e1ee7bf Mon Sep 17 00:00:00 2001
From: Kiyotoshi Ichikawa <kji.websolutions@gmail.com>
Date: Tue, 10 Apr 2018 13:42:53 -0400
Subject: [PATCH 1201/1382] [browser-sync] Type definition for Option type is
 missing many valid properties. (#24739)

Also appending tests to cover newly added properties/interfaces.
---
 types/browser-sync/browser-sync-tests.ts | 276 +++++++++++++++++++++--
 types/browser-sync/index.d.ts            | 147 +++++++++---
 2 files changed, 379 insertions(+), 44 deletions(-)

diff --git a/types/browser-sync/browser-sync-tests.ts b/types/browser-sync/browser-sync-tests.ts
index bcd829367a..613f8aee25 100644
--- a/types/browser-sync/browser-sync-tests.ts
+++ b/types/browser-sync/browser-sync-tests.ts
@@ -8,11 +8,98 @@ import browserSync = require("browser-sync");
 })();
 
 browserSync({
-    server: {
-        baseDir: "./"
+    ui: true
+});
+
+browserSync({
+    ui: {
+        port: 9000,
+        weinre: {
+            port: 9001
+        }
     }
 });
 
+browserSync({
+    files: "app/css/style.css"
+});
+
+browserSync({
+    files: [
+        "app/css/style.css",
+        "app/js/*.js"
+    ]
+});
+
+browserSync({
+    files: [
+        "app/css/style.css",
+        "!app/js/*.js"
+    ]
+});
+
+browserSync({
+    files: [
+        "wp-content/themes/**/*.css",
+        {
+            match: ["wp-content/themes/**/*.css"],
+            fn: function (event, file) {
+                /** Custom event handler **/
+            }
+        }
+    ]
+});
+
+browserSync({
+    watchEvents: [
+        "change",
+        "add",
+        "unlink",
+        "addDir",
+        "unlinkDir"
+    ]
+});
+
+browserSync({
+    watch: true
+});
+
+browserSync({
+    ignore: [
+        "app/js/*.js"
+    ]
+});
+
+browserSync({
+    single: true
+});
+
+browserSync({
+    watchOptions: {
+        ignoreInitial: true,
+        ignored: '*.txt'
+    },
+    files: ['./app']
+});
+
+browserSync({
+    files: [
+        {
+            match: ["wp-content/themes/**/*.php"],
+            fn: function (event, file) {
+                /** Custom event handler **/
+            },
+            options: {
+                ignored: '*.txt'
+            }
+        }
+    ]
+});
+
+browserSync({
+    server: "app"
+});
+
 // multiple base directory
 browserSync({
     server: {
@@ -20,6 +107,39 @@ browserSync({
     }
 });
 
+browserSync({
+    server: true
+});
+
+browserSync({
+    server: {
+        baseDir: "./"
+    }
+});
+
+browserSync({
+    server: {
+        baseDir: "./",
+        index: "index.htm"
+    }
+});
+
+browserSync({
+    server: {
+        baseDir: "./",
+        directory: true
+    }
+});
+
+browserSync({
+    server: {
+        baseDir: "app",
+        serveStaticOptions: {
+            extensions: ["html"]
+        }
+    }
+});
+
 browserSync({
     proxy: "yourlocal.dev"
 });
@@ -27,8 +147,8 @@ browserSync({
 browserSync({
     proxy: {
         target: "http://yourlocal.dev",
-        proxyReq: function(proxyReq) {
-           console.log(proxyReq);
+        proxyReq: function (proxyReq) {
+            console.log(proxyReq);
         }
     }
 });
@@ -37,7 +157,7 @@ browserSync({
     proxy: {
         target: "http://yourlocal.dev",
         proxyReq: [
-            function(proxyReq) {
+            function (proxyReq) {
                 console.log(proxyReq);
             }
         ]
@@ -47,7 +167,7 @@ browserSync({
 browserSync({
     proxy: {
         target: "http://yourlocal.dev",
-        proxyRes: function(proxyRes, req, res) {
+        proxyRes: function (proxyRes, req, res) {
             console.log(proxyRes);
         }
     }
@@ -57,13 +177,137 @@ browserSync({
     proxy: {
         target: "http://yourlocal.dev",
         proxyRes: [
-            function(proxyRes, req, res) {
+            function (proxyRes, req, res) {
                 console.log(proxyRes);
             }
         ]
     }
 });
 
+browserSync({
+    proxy: "https://yourlocal.dev",
+    https: {
+        key: "./path/to/the/key/file.key",
+        cert: "./path/to/the/cert/file.cer"
+    }
+});
+
+browserSync({
+    port: 3000
+});
+
+browserSync({
+    proxy: "http://yourlocal.dev",
+    serveStatic: ['.', './app/css']
+});
+
+browserSync({
+    proxy: "http://yourlocal.dev",
+    serveStatic: [{
+        route: '/assets',
+        dir: 'tmp'
+    }]
+});
+
+browserSync({
+    proxy: "http://yourlocal.dev",
+    serveStatic: [{
+        route: ['/assets', '/content'],
+        dir: 'tmp'
+    }]
+});
+
+browserSync({
+    proxy: "http://yourlocal.dev",
+    serveStatic: [{
+        route: '/assets',
+        dir: ['./tmp', './app']
+    }]
+});
+
+browserSync({
+    serveStatic: ['.', './app', './temp'],
+    serveStaticOptions: {
+        extensions: ['html'] // pretty urls
+    }
+});
+
+browserSync({
+    https: true
+});
+
+browserSync({
+    server: "./app",
+    https: true
+});
+
+browserSync({
+    server: "./app",
+    https: {
+        key: "./path/to/the/key/file.key",
+        cert: "./path/to/the/cert/file.cer"
+    }
+});
+
+browserSync({
+    httpModule: "http2"
+});
+
+browserSync({
+    ghostMode: {
+        clicks: true,
+        scroll: true,
+        forms: {
+            inputs: true,
+            submit: true,
+            toggles: true
+        }
+    },
+    proxy: "https://yourlocal.dev"
+});
+
+/**
+ * Not testing a bunch because they are either only string or boolean types.
+ * ....Also just got lazy and tired of writing the simple ones.
+ */
+
+browserSync({
+    snippetOptions: {
+
+        // Ignore all HTML files within the templates folder
+        blacklist: [
+            "templates/*.html"
+        ],
+        // Provide a custom Regex for inserting the snippet.
+        rule: {
+            match: /<\/body>/i,
+            fn: function (snippet, match) {
+                return snippet + match;
+            }
+        }
+    }
+});
+
+browserSync({
+    rewriteRules: [
+        {
+            match: /Browsersync/g,
+            fn: function (req, res, match) {
+                return 'kittenz';
+            }
+        }
+    ]
+});
+
+browserSync({
+    rewriteRules: [
+        {
+            match: /(cats|kitten[sz]) are mediocre/g,
+            replace: "$1 are excellent"
+        }
+    ]
+});
+
 var config = {
     server: {
         baseDir: "./"
@@ -84,13 +328,13 @@ browserSync(config, function (err, bs) {
 browserSync.reload();
 
 // single file
-browserSync.reload( "styles.css" );
+browserSync.reload("styles.css");
 
 // multiple files
-browserSync.reload( ["styles.css", "ie.css"] );
+browserSync.reload(["styles.css", "ie.css"]);
 
 // streams support
-browserSync.reload( { stream: true } );
+browserSync.reload({ stream: true });
 
 browserSync.notify("Compiling, please wait!");
 
@@ -143,19 +387,19 @@ browser.exit();
 browser.stream();
 
 // -- "once" option.
-browser.stream({once: true});
+browser.stream({ once: true });
 
 // -- "match" option (string).
-browser.stream({match: "**/*.js"});
+browser.stream({ match: "**/*.js" });
 
 // -- "match" option (RegExp).
-browser.stream({match: /\.js$/});
+browser.stream({ match: /\.js$/ });
 
 // -- "match" option (function).
-browser.stream({match: (testString) => true});
+browser.stream({ match: (testString) => true });
 
 // -- "match" option (array).
-browser.stream({match: ["**/*.js", /\.js$/, (testString) => true]});
+browser.stream({ match: ["**/*.js", /\.js$/, (testString) => true] });
 
 // -- Both options.
-browser.stream({once: true, match: ["**/*.js", /\.js$/, (testString) => true]});
+browser.stream({ once: true, match: ["**/*.js", /\.js$/, (testString) => true] });
diff --git a/types/browser-sync/index.d.ts b/types/browser-sync/index.d.ts
index b22054c367..3b97fc8616 100644
--- a/types/browser-sync/index.d.ts
+++ b/types/browser-sync/index.d.ts
@@ -1,16 +1,21 @@
 // Type definitions for browser-sync
 // Project: http://www.browsersync.io/
-// Definitions by: Asana <https://asana.com>, Joe Skeen <https://github.com/joeskeen>
+// Definitions by: Asana <https://asana.com>,
+//                 Joe Skeen <https://github.com/joeskeen>
 //                 Thomas "Thasmo" Deinhamer <https://thasmo.com/>
+//                 Kiyotoshi Ichikawa <https://github.com/aznnomness>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 /// <reference types="chokidar"/>
 /// <reference types="node" />
+/// <reference types="serve-static" />
 
 import * as chokidar from "chokidar";
 import * as fs from "fs";
 import * as http from "http";
 import * as mm from "micromatch";
+import { ServeStaticOptions } from "serve-static";
 
 declare namespace browserSync {
     interface Options {
@@ -20,7 +25,7 @@ declare namespace browserSync {
          *
          * port - Default: 3001
          * weinre.port - Default: 8080
-         * Note: requires at least version 2.0.0
+         * Note: Requires at least version 2.0.0.
          */
         ui?: UIOptions | boolean;
         /**
@@ -29,20 +34,40 @@ declare namespace browserSync {
          * patterns.
          * Default: false
          */
-        files?: string | (string | FileCallback)[];
+        files?: string | (string | FileCallback | object)[];
+        /**
+         * Specify which file events to respond to.
+         * Available events: `add`, `change`, `unlink`, `addDir`, `unlinkDir`
+         */
+        watchEvents?: string[];
+        /**
+         * Watch files automatically.
+         */
+        watch?: boolean;
+        /**
+         * Patterns for any watchers to ignore.
+         * Anything provided here will end up inside 'watchOptions.ignored'.
+         */
+        ignore?: string[];
+        /**
+         * Serve an index.html file for all non-asset routes.
+         * Useful when using client-routers.
+         */
+        single?: boolean;
         /**
          * File watching options that get passed along to Chokidar. Check their docs for available options
          * Default: undefined
-         * Note: requires at least version 2.6.0
+         * Note: Requires at least version 2.6.0.
          */
         watchOptions?: chokidar.WatchOptions;
         /**
          * Use the built-in static server for basic HTML/JS/CSS websites.
          * Default: false
          */
-        server?: ServerOptions;
+        server?: string | boolean | string[] | ServerOptions;
         /**
          * Proxy an EXISTING vhost. Browsersync will wrap your vhost with a proxy URL to view your site.
+         * Passing only a URL as a string equates to passing only target property of ProxyOptions type.
          * target - Default: undefined
          * ws - Default: undefined
          * middleware - Default: undefined
@@ -50,25 +75,40 @@ declare namespace browserSync {
          * proxyRes - Default: undefined
          * proxyReq - Default: undefined
          */
-        proxy?: string | boolean | ProxyOptions;
+        proxy?: string | ProxyOptions;
         /**
          * Use a specific port (instead of the one auto-detected by Browsersync)
          * Default: 3000
          */
         port?: number;
+        /**
+         * Functions or actual plugins used as middleware.
+         */
+        middleware?: MiddlewareHandler | PerRouteMiddleware | (MiddlewareHandler | PerRouteMiddleware)[];
         /**
          * Add additional directories from which static files should be served.
          * Should only be used in proxy or snippet mode.
          * Default: []
-         * Note: requires at least version 2.8.0
+         * Note: Requires at least version 2.8.0.
          */
-        serveStatic?: string[];
+        serveStatic?: (string | { route?: string | string[], dir?: string | string[]})[];
+        /**
+         * Options that are passed to the serve-static middleware when you use the
+         * string[] syntax: eg: `serveStatic: ['./app']`.
+         * Please see [serve-static](https://github.com/expressjs/serve-static) for details.
+         */
+        serveStaticOptions?: ServeStaticOptions;
         /**
          * Enable https for localhost development.
-         * Note - this is not needed for proxy option as it will be inferred from your target url.
-         * Note: requires at least version 1.3.0
+         * Note: This may not be needed for proxy option as it will try to infer from your target url.
+         * Note: If privacy error is encountered please see HttpsOptions below, setting those will resolve.
+         * Note: Requires at least version 1.3.0.
          */
-        https?: boolean;
+        https?: boolean | HttpsOptions;
+        /**
+         * Override http module to allow using 3rd party server modules (such as http2).
+         */
+        httpModule?: string;
         /**
          * Clicks, Scrolls & Form inputs on any device will be mirrored to all others.
          * clicks - Default: true
@@ -84,7 +124,7 @@ declare namespace browserSync {
         /**
          * Change the console logging prefix. Useful if you're creating your own project based on Browsersync
          * Default: BS
-         * Note: requires at least version 1.5.1
+         * Note: Requires at least version 1.5.1.
          */
         logPrefix?: string;
         /**
@@ -100,19 +140,19 @@ declare namespace browserSync {
         /**
          * Log the snippet to the console when you're in snippet mode (no proxy/server)
          * Default: true
-         * Note: requires at least version 1.5.2
+         * Note: Requires at least version 1.5.2.
          */
         logSnippet?: boolean;
         /**
          * You can control how the snippet is injected onto each page via a custom regex + function.
          * You can also provide patterns for certain urls that should be ignored from the snippet injection.
-         * Note: requires at least version 2.0.0
+         * Note: Requires at least version 2.0.0.
          */
         snippetOptions?: SnippetOptions;
         /**
          * Add additional HTML rewriting rules.
          * Default: false
-         * Note: requires at least version 2.4.0
+         * Note: Requires at least version 2.4.0.
          */
         rewriteRules?: boolean | RewriteRules[];
         /**
@@ -139,7 +179,7 @@ declare namespace browserSync {
         /**
          * Add HTTP access control (CORS) headers to assets served by Browsersync.
          * Default: false
-         * Note: requires at least version 2.16.0
+         * Note: Requires at least version 2.16.0.
          */
         cors?: boolean;
         /**
@@ -177,12 +217,12 @@ declare namespace browserSync {
         /**
          * Sync the scroll position of any element on the page. Add any amount of CSS selectors
          * Default: []
-         * Note: requires at least version 2.9.0
+         * Note: Requires at least version 2.9.0.
          */
         scrollElements?: string[];
         /**
          * Default: []
-         * Note: requires at least version 2.9.0
+         * Note: Requires at least version 2.9.0.
          * Sync the scroll position of any element on the page - where any scrolled element will cause
          * all others to match scroll position. This is helpful when a breakpoint alters which element
          * is actually scrolling
@@ -197,13 +237,18 @@ declare namespace browserSync {
         /**
          * Restrict the frequency in which browser:reload events can be emitted to connected clients
          * Default: 0
-         * Note: requires at least version 2.6.0
+         * Note: Requires at least version 2.6.0.
          */
         reloadDebounce?: number;
+        /**
+         * Emit only the first event during sequential time windows of a specified duration.
+         * Note: Requires at least version 2.13.0.
+         */
+        reloadThrottle?: number;
         /**
          * User provided plugins
          * Default: []
-         * Note: requires at least version 2.6.0
+         * Note: Requires at least version 2.6.0.
          */
         plugins?: any[];
         /**
@@ -224,6 +269,10 @@ declare namespace browserSync {
          * Override host detection if you know the correct IP to use
          */
         host?: string;
+        /**
+         * Support environments where dynamic hostnames are not required (ie: electron).
+         */
+        localOnly?: boolean;
         /**
          * Send file-change events to the browser
          * Default: true
@@ -234,10 +283,16 @@ declare namespace browserSync {
          * Default: true
          */
         timestamps?: boolean;
+        /**
+         * ¯\_(ツ)_/¯
+         * Best guess, when ghostMode (or SocketIO?) is setup the events
+         * listed here will be emitted and able to hook into.
+         */
+        clientEvents?: string[];
         /**
          * Alter the script path for complete control over where the Browsersync Javascript is served
          * from. Whatever you return from this function will be used as the script path.
-         * Note: requires at least version 1.5.0
+         * Note: Requires at least version 1.5.0.
          */
         scriptPath?: (path: string) => string;
         /**
@@ -248,10 +303,21 @@ declare namespace browserSync {
          * domain - Default: undefined
          * port - Default: undefined
          * clients.heartbeatTimeout - Default: 5000
-         * Note: requires at least version 1.6.2
+         * Note: Requires at least version 1.6.2.
          */
         socket?: SocketOptions;
-        middleware?: MiddlewareHandler | PerRouteMiddleware | (MiddlewareHandler | PerRouteMiddleware)[];
+        /**
+         * ¯\_(ツ)_/¯
+         */
+        tagNames?: TagNamesOptions;
+        /**
+         * ¯\_(ツ)_/¯
+         */
+        injectFileTypes?: string[];
+        /**
+         * ¯\_(ツ)_/¯
+         */
+        excludeFileTypes?: string[];
     }
 
     interface Hash<T> {
@@ -287,6 +353,7 @@ declare namespace browserSync {
         routes?: Hash<string>;
         /** configure custom middleware */
         middleware?: (MiddlewareHandler | PerRouteMiddleware)[];
+        serveStaticOptions?: ServeStaticOptions
     }
 
     interface ProxyOptions {
@@ -298,6 +365,11 @@ declare namespace browserSync {
         proxyReq?: ((res: http.ServerRequest) => any)[] | ((res: http.ServerRequest) => any);
     }
 
+    interface HttpsOptions {
+        key?: string;
+        cert?: string;
+    }
+
     interface MiddlewareHandler {
         (req: http.IncomingMessage, res: http.ServerResponse, next: Function): any;
     }
@@ -310,11 +382,17 @@ declare namespace browserSync {
     interface GhostOptions {
         clicks?: boolean;
         scroll?: boolean;
-        forms?: boolean;
+        forms?: boolean | {
+            submit?: boolean;
+            inputs?: boolean;
+            toggles?: boolean;
+        };
     }
 
     interface SnippetOptions {
-        ignorePaths?: string;
+        async?: boolean,
+        whitelist?: string[],
+        blacklist?: string[],
         rule?: { match?: RegExp; fn?: (snippet: string, match: string) => any };
     }
 
@@ -327,9 +405,22 @@ declare namespace browserSync {
         clients?: { heartbeatTimeout?: number; };
     }
 
+    interface TagNamesOptions {
+        less?: string;
+        scss?: string;
+        css?: string;
+        jpg?: string;
+        jpeg?: string;
+        png?: string;
+        svg?: string;
+        gif?: string;
+        js?: string;
+    }
+
     interface RewriteRules {
         match: RegExp;
-        fn: (match: string) => string;
+        replace?: string;
+        fn?: (req: http.IncomingMessage, res: http.ServerResponse, match: string) => string;
     }
 
     interface StreamOptions {
@@ -342,7 +433,7 @@ declare namespace browserSync {
          * Start the Browsersync service. This will launch a server, proxy or start the snippet mode
          * depending on your use-case.
          */
-        (config?: Options, callback?: (err: Error, bs: Object) => any): BrowserSyncInstance;
+        (config?: Options, callback?: (err: Error, bs: object) => any): BrowserSyncInstance;
         /**
          * Create a Browsersync instance
          * @param name an identifier that can used for retrieval later
@@ -367,7 +458,7 @@ declare namespace browserSync {
          * Start the Browsersync service. This will launch a server, proxy or start the snippet mode
          * depending on your use-case.
          */
-        init(config?: Options, callback?: (err: Error, bs: Object) => any): BrowserSyncInstance;
+        init(config?: Options, callback?: (err: Error, bs: object) => any): BrowserSyncInstance;
         /**
          * Reload the browser
          * The reload method will inform all browsers about changed files and will either cause the browser

From 1efaacbdd0cb44d6d8083029d34630bbb3166a6f Mon Sep 17 00:00:00 2001
From: Shadowglen Elf <shadowglen@outlook.com>
Date: Tue, 10 Apr 2018 10:44:49 -0700
Subject: [PATCH 1202/1382] props in cloneElement should be Partial<P> &
 Attributes instead of workaround (#24641)

---
 types/react/index.d.ts    | 43 ++++++---------------------------------
 types/react/test/index.ts |  9 +++-----
 2 files changed, 9 insertions(+), 43 deletions(-)

diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index beaf5327d5..b4c350e7d7 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -20,37 +20,6 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
-/*
-Known Problems & Workarounds
-1. The type of cloneElement is incorrect.
-cloneElement(element, props) should accept props object with a subset of properties on element.props.
-React attributes, such as key and ref, should also be accepted in props, but should not exist on element.props.
-The "correct" way to model this, then, is with:
-declare function cloneElement<P extends Q, Q>(
-    element: ReactElement<P>,
-    props?: Q & Attributes,
-    ...children: ReactNode[]): ReactElement<P>;
-However, type inference for Q defaults to {} when intersected with another type.
-(https://github.com/Microsoft/TypeScript/pull/5738#issuecomment-181904905)
-And since any object is assignable to {}, we would lose the type safety of the P extends Q constraint.
-Therefore, the type of props is left as Q, which should work for most cases.
-If you need to call cloneElement with key or ref, you'll need a type cast:
-interface ButtonProps {
-    label: string;
-    isDisabled?: boolean;
-}
-var element: React.CElement<ButtonProps, Button>;
-React.cloneElement(element, { label: "label" });
-// cloning with optional props requires a cast
-React.cloneElement(element, <{ isDisabled?: boolean }>{ isDisabled: true });
-// cloning with key or ref requires a cast
-React.cloneElement(element, <React.ClassAttributes<Button>>{ ref: button => button.reset() });
-React.cloneElement(element, <{ isDisabled?: boolean } & React.Attributes>{
-    key: "disabledButton",
-    isDisabled: true
-});
-*/
-
 /// <reference path="global.d.ts" />
 
 import * as CSS from 'csstype';
@@ -259,17 +228,17 @@ declare namespace React {
         ...children: ReactNode[]): DOMElement<P, T>;
 
     // Custom components
-    function cloneElement<P extends Q, Q>(
+    function cloneElement<P>(
         element: SFCElement<P>,
-        props?: Q, // should be Q & Attributes, but then Q is inferred as {}
+        props?: Partial<P> & Attributes,
         ...children: ReactNode[]): SFCElement<P>;
-    function cloneElement<P extends Q, Q, T extends Component<P, ComponentState>>(
+    function cloneElement<P, T extends Component<P, ComponentState>>(
         element: CElement<P, T>,
-        props?: Q, // should be Q & ClassAttributes<T>
+        props?: Partial<P> & ClassAttributes<T>,
         ...children: ReactNode[]): CElement<P, T>;
-    function cloneElement<P extends Q, Q>(
+    function cloneElement<P>(
         element: ReactElement<P>,
-        props?: Q, // should be Q & Attributes
+        props?: Partial<P> & Attributes,
         ...children: ReactNode[]): ReactElement<P>;
 
     function isValidElement<P>(object: {} | null | undefined): object is ReactElement<P>;
diff --git a/types/react/test/index.ts b/types/react/test/index.ts
index 4ec98db218..6dae0cbe3c 100644
--- a/types/react/test/index.ts
+++ b/types/react/test/index.ts
@@ -194,19 +194,16 @@ React.cloneElement(element, {});
 React.cloneElement(element, {}, null);
 
 const clonedElement2: React.CElement<Props, ModernComponent> =
-    // known problem: cloning with key or ref requires cast
     React.cloneElement(element, {
         ref: c => c && c.reset()
-    } as React.ClassAttributes<ModernComponent>);
+    });
 const clonedElement3: React.CElement<Props, ModernComponent> =
     React.cloneElement(element, {
         key: "8eac7",
         foo: 55
-    } as { foo: number } & React.Attributes);
+    });
 const clonedStatelessElement: React.SFCElement<SCProps> =
-    // known problem: cloning with optional props don't work properly
-    // workaround: cast to actual props type
-    React.cloneElement(statelessElement, { foo: 44 } as SCProps);
+    React.cloneElement(statelessElement, { foo: 44 });
 // Clone base DOMElement
 const clonedDOMElement: React.DOMElement<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement> =
     React.cloneElement(domElement, {

From 499d03f7f5759fbd1f804ad871ad14f94b583d8a Mon Sep 17 00:00:00 2001
From: Daryl LaBar <d3labar@hotmail.com>
Date: Tue, 10 Apr 2018 14:16:01 -0400
Subject: [PATCH 1203/1382] Xrm: Added New Collection interface defined via the
 client Web Api (#24850)

* An assumption was made that the string indexable collections new with Xrm 9 applied to all collections.  They don't.  I've have added seperate collection index to be able to allow for the string indexability of the new collections.

* Added back accidently removed overlaod

* F

* Fixed Dictionary Back to previous Name
---
 types/xrm/index.d.ts | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/types/xrm/index.d.ts b/types/xrm/index.d.ts
index fc5b8bb20a..fe5d44214e 100644
--- a/types/xrm/index.d.ts
+++ b/types/xrm/index.d.ts
@@ -1299,19 +1299,24 @@ declare namespace Xrm {
         type IterativeDelegate<T> = (item: T, index?: number) => void;
 
         /**
-         * Interface for an item collection.
-         * @param T Generic type parameter.
+         * Defines collections that are index-able by string
+         * @param Generic type parameter.
          */
         interface Dictionary<T> {
             [key: string]: T;
-            [index: number]: T;
         }
 
+        /**
+         * Defines item collections that are index-able by string
+         * @param Generic type parameter.
+         */
+        type StringIndexableItemCollection<T> = Dictionary<T> & ItemCollection<T>;
+
         /**
          * Collections are structures to provide access to data that represent an array, but without the ability to modify the data in the array.
          * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
          */
-        type ItemCollection<T> = Dictionary<T> & {
+        interface ItemCollection<T> {
             /**
              * Applies an operation to all items in this collection.
              * @param delegate An iterative delegate function
@@ -1367,7 +1372,7 @@ declare namespace Xrm {
              * @returns The length.
              */
             getLength(): number;
-        };
+        }
     }
 
     /**
@@ -4403,7 +4408,7 @@ declare namespace Xrm {
             /**
              * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
              */
-            Attributes: Collection.ItemCollection<AttributeMetadata>;
+            Attributes: Collection.StringIndexableItemCollection<AttributeMetadata>;
             AutoRouteToOwnerQueue: boolean;
             CanEnableSyncToExternalSearchIndex: boolean;
             CanBeInManyToMany: boolean;
@@ -4466,7 +4471,7 @@ declare namespace Xrm {
             /**
              * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
              */
-            LocalizedLabels: Collection.ItemCollection<LocalizedLabel>;
+            LocalizedLabels: LocalizedLabel[];
             UserLocalizedLabel: LocalizedLabel;
         }
 
@@ -4486,7 +4491,7 @@ declare namespace Xrm {
             /**
              * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
              */
-            options: Collection.ItemCollection<string>;
+            options: string[];
             logicalName: string;
             displayName: string;
             attributeType: XrmEnum.AttributeTypeCode;
@@ -4494,7 +4499,7 @@ declare namespace Xrm {
             /**
              * @see {@link https://docs.microsoft.com/en-us/dynamics365/customer-engagement/developer/clientapi/reference/collections External Link: Collections (Client API reference)}
              */
-            optionSet: Collection.ItemCollection<OptionMetadata>;
+            optionSet: OptionMetadata[];
         }
 
         /**

From a9ae33a9f630cb634c6fe0720abcd831b32e4df6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gerhard=20St=C3=B6bich?= <Flarna@users.noreply.github.com>
Date: Tue, 10 Apr 2018 21:19:17 +0200
Subject: [PATCH 1204/1382] [node] Sync v8 and v9 (#24852)

* [node] Sync v8 and v9

* sync vm test added in v8 only
---
 types/node/index.d.ts       | 22 ++++++----------
 types/node/node-tests.ts    |  4 +++
 types/node/v8/index.d.ts    | 50 +++++++++++++++++++++----------------
 types/node/v8/node-tests.ts |  8 ++++--
 4 files changed, 46 insertions(+), 38 deletions(-)

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index 86080907da..ad70b302f9 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -955,6 +955,7 @@ declare module "http" {
         'access-control-allow-headers'?: string;
         'accept-patch'?: string;
         'accept-ranges'?: string;
+        'authorization'?: string;
         'age'?: string;
         'allow'?: string;
         'alt-svc'?: string;
@@ -1751,17 +1752,9 @@ declare module "https" {
 
     export type ServerOptions = tls.SecureContextOptions & tls.TlsOptions;
 
-    export type RequestOptions = http.RequestOptions & {
+    export type RequestOptions = http.RequestOptions & tls.SecureContextOptions & {
         rejectUnauthorized?: boolean; // Defaults to true
         servername?: string; // SNI TLS Extension
-        pfx?: string | Buffer | Array<string | Buffer | Object>;
-        key?: string | Buffer | Array<Buffer | Object>;
-        passphrase?: string;
-        cert?: string | Buffer | Array<string | Buffer>;
-        ca?: string | Buffer | Array<string | Buffer>;
-        ciphers?: string;
-        clientCertEngine?: string;
-        secureProtocol?: string; // SSL Method, e.g. SSLv23_method
     };
 
     export interface AgentOptions extends http.AgentOptions, tls.ConnectionOptions {
@@ -4981,7 +4974,6 @@ declare module "tls" {
     }
 
     export interface TlsOptions extends SecureContextOptions {
-        clientCertEngine?: string;
         handshakeTimeout?: number;
         requestCert?: boolean;
         rejectUnauthorized?: boolean;
@@ -5182,9 +5174,9 @@ declare module "crypto" {
         update(data: string, input_encoding: Utf8AsciiBinaryEncoding, output_encoding: HexBase64BinaryEncoding): string;
         final(): Buffer;
         final(output_encoding: string): string;
-        setAutoPadding(auto_padding?: boolean): void;
+        setAutoPadding(auto_padding?: boolean): this;
         getAuthTag(): Buffer;
-        setAAD(buffer: Buffer): void;
+        setAAD(buffer: Buffer): this;
     }
     export function createDecipher(algorithm: string, password: any): Decipher;
     export function createDecipheriv(algorithm: string, key: any, iv: any): Decipher;
@@ -5195,9 +5187,9 @@ declare module "crypto" {
         update(data: string, input_encoding: HexBase64BinaryEncoding, output_encoding: Utf8AsciiBinaryEncoding): string;
         final(): Buffer;
         final(output_encoding: string): string;
-        setAutoPadding(auto_padding?: boolean): void;
-        setAuthTag(tag: Buffer): void;
-        setAAD(buffer: Buffer): void;
+        setAutoPadding(auto_padding?: boolean): this;
+        setAuthTag(tag: Buffer): this;
+        setAAD(buffer: Buffer): this;
     }
     export function createSign(algorithm: string): Signer;
     export interface Signer extends NodeJS.WritableStream {
diff --git a/types/node/node-tests.ts b/types/node/node-tests.ts
index 89d87578d9..72d0e6e0eb 100644
--- a/types/node/node-tests.ts
+++ b/types/node/node-tests.ts
@@ -2555,6 +2555,10 @@ namespace vm_tests {
         const Debug = vm.runInDebugContext('Debug');
         Debug.scripts().forEach((script: any) => { console.log(script.name); });
     }
+
+    {
+        vm.runInThisContext('console.log("hello world"', './my-file.js');
+    }
 }
 
 /////////////////////////////////////////////////////
diff --git a/types/node/v8/index.d.ts b/types/node/v8/index.d.ts
index fe36bccd1f..b11601895e 100644
--- a/types/node/v8/index.d.ts
+++ b/types/node/v8/index.d.ts
@@ -31,6 +31,7 @@ interface Console {
     Console: NodeJS.ConsoleConstructor;
     assert(value: any, message?: string, ...optionalParams: any[]): void;
     dir(obj: any, options?: NodeJS.InspectOptions): void;
+    debug(message?: any, ...optionalParams: any[]): void;
     error(message?: any, ...optionalParams: any[]): void;
     info(message?: any, ...optionalParams: any[]): void;
     log(message?: any, ...optionalParams: any[]): void;
@@ -527,6 +528,7 @@ declare namespace NodeJS {
     }
 
     export interface WriteStream extends Socket {
+        readonly writableHighWaterMark: number;
         columns?: number;
         rows?: number;
         _write(chunk: any, encoding: string, callback: Function): void;
@@ -538,6 +540,7 @@ declare namespace NodeJS {
         destroy(error?: Error): void;
     }
     export interface ReadStream extends Socket {
+        readonly readableHighWaterMark: number;
         isRaw?: boolean;
         setRawMode?(mode: boolean): void;
         _read(size: number): void;
@@ -792,6 +795,7 @@ declare namespace NodeJS {
     class Module {
         static runMain(): void;
         static wrap(code: string): string;
+        static builtinModules: string[];
 
         static Module: typeof Module;
 
@@ -1469,27 +1473,28 @@ declare module "zlib" {
     export function createInflateRaw(options?: ZlibOptions): InflateRaw;
     export function createUnzip(options?: ZlibOptions): Unzip;
 
-    export function deflate(buf: Buffer | string, callback: (error: Error | null, result: Buffer) => void): void;
-    export function deflate(buf: Buffer | string, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
-    export function deflateSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
-    export function deflateRaw(buf: Buffer | string, callback: (error: Error | null, result: Buffer) => void): void;
-    export function deflateRaw(buf: Buffer | string, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
-    export function deflateRawSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
-    export function gzip(buf: Buffer | string, callback: (error: Error | null, result: Buffer) => void): void;
-    export function gzip(buf: Buffer | string, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
-    export function gzipSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
-    export function gunzip(buf: Buffer | string, callback: (error: Error | null, result: Buffer) => void): void;
-    export function gunzip(buf: Buffer | string, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
-    export function gunzipSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
-    export function inflate(buf: Buffer | string, callback: (error: Error | null, result: Buffer) => void): void;
-    export function inflate(buf: Buffer | string, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
-    export function inflateSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
-    export function inflateRaw(buf: Buffer | string, callback: (error: Error | null, result: Buffer) => void): void;
-    export function inflateRaw(buf: Buffer | string, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
-    export function inflateRawSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
-    export function unzip(buf: Buffer | string, callback: (error: Error | null, result: Buffer) => void): void;
-    export function unzip(buf: Buffer | string, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
-    export function unzipSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
+    type InputType = string | Buffer | DataView /* | TypedArray */;
+    export function deflate(buf: InputType, callback: (error: Error | null, result: Buffer) => void): void;
+    export function deflate(buf: InputType, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
+    export function deflateSync(buf: InputType, options?: ZlibOptions): Buffer;
+    export function deflateRaw(buf: InputType, callback: (error: Error | null, result: Buffer) => void): void;
+    export function deflateRaw(buf: InputType, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
+    export function deflateRawSync(buf: InputType, options?: ZlibOptions): Buffer;
+    export function gzip(buf: InputType, callback: (error: Error | null, result: Buffer) => void): void;
+    export function gzip(buf: InputType, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
+    export function gzipSync(buf: InputType, options?: ZlibOptions): Buffer;
+    export function gunzip(buf: InputType, callback: (error: Error | null, result: Buffer) => void): void;
+    export function gunzip(buf: InputType, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
+    export function gunzipSync(buf: InputType, options?: ZlibOptions): Buffer;
+    export function inflate(buf: InputType, callback: (error: Error | null, result: Buffer) => void): void;
+    export function inflate(buf: InputType, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
+    export function inflateSync(buf: InputType, options?: ZlibOptions): Buffer;
+    export function inflateRaw(buf: InputType, callback: (error: Error | null, result: Buffer) => void): void;
+    export function inflateRaw(buf: InputType, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
+    export function inflateRawSync(buf: InputType, options?: ZlibOptions): Buffer;
+    export function unzip(buf: InputType, callback: (error: Error | null, result: Buffer) => void): void;
+    export function unzip(buf: InputType, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
+    export function unzipSync(buf: InputType, options?: ZlibOptions): Buffer;
 
     export namespace constants {
         // Allowed flush values.
@@ -5285,6 +5290,7 @@ declare module "stream" {
 
         export class Readable extends Stream implements NodeJS.ReadableStream {
             readable: boolean;
+            readonly readableHighWaterMark: number;
             constructor(opts?: ReadableOptions);
             _read(size: number): void;
             read(size?: number): any;
@@ -5370,6 +5376,7 @@ declare module "stream" {
 
         export class Writable extends Stream implements NodeJS.WritableStream {
             writable: boolean;
+            readonly writableHighWaterMark: number;
             constructor(opts?: WritableOptions);
             _write(chunk: any, encoding: string, callback: (err?: Error) => void): void;
             _writev?(chunks: Array<{ chunk: any, encoding: string }>, callback: (err?: Error) => void): void;
@@ -5461,6 +5468,7 @@ declare module "stream" {
         // Note: Duplex extends both Readable and Writable.
         export class Duplex extends Readable implements Writable {
             writable: boolean;
+            readonly writableHighWaterMark: number;
             constructor(opts?: DuplexOptions);
             _write(chunk: any, encoding: string, callback: (err?: Error) => void): void;
             _writev?(chunks: Array<{ chunk: any, encoding: string }>, callback: (err?: Error) => void): void;
diff --git a/types/node/v8/node-tests.ts b/types/node/v8/node-tests.ts
index 845837230a..0013486263 100644
--- a/types/node/v8/node-tests.ts
+++ b/types/node/v8/node-tests.ts
@@ -2030,14 +2030,17 @@ namespace string_decoder_tests {
 namespace child_process_tests {
     {
         childProcess.exec("echo test");
+        childProcess.exec("echo test", {windowsHide: true});
         childProcess.spawnSync("echo test");
+        childProcess.spawnSync("echo test", {windowsVerbatimArguments: false});
     }
 
     {
         childProcess.execFile("npm", () => {});
+        childProcess.execFile("npm", { windowsHide: true }, () => {});
         childProcess.execFile("npm", ["-v"], () => {});
-        childProcess.execFile("npm", ["-v"], { encoding: 'utf-8' }, (stdout, stderr) => { assert(stdout instanceof String); });
-        childProcess.execFile("npm", ["-v"], { encoding: 'buffer' }, (stdout, stderr) => { assert(stdout instanceof Buffer); });
+        childProcess.execFile("npm", ["-v"], { windowsHide: true, encoding: 'utf-8' }, (stdout, stderr) => { assert(stdout instanceof String); });
+        childProcess.execFile("npm", ["-v"], { windowsHide: true, encoding: 'buffer' }, (stdout, stderr) => { assert(stdout instanceof Buffer); });
         childProcess.execFile("npm", { encoding: 'utf-8' }, (stdout, stderr) => { assert(stdout instanceof String); });
         childProcess.execFile("npm", { encoding: 'buffer' }, (stdout, stderr) => { assert(stdout instanceof Buffer); });
     }
@@ -3953,6 +3956,7 @@ namespace module_tests {
 
     const m1: Module = new Module("moduleId");
     const m2: Module = new Module.Module("moduleId");
+    const b: string[] = Module.builtinModules;
     let paths: string[] = module.paths;
     paths = m1.paths;
 }

From 81d0e4984d4b5e10668020eacd4b9a4542c5c837 Mon Sep 17 00:00:00 2001
From: Sine <sine@sinewave.me>
Date: Tue, 10 Apr 2018 16:42:47 -0400
Subject: [PATCH 1205/1382] Added type definitions for 'oauth' (a.k.a.
 'node-oauth') (#24882)

* added declarations for oauth (a.k.a. 'node-oauth')

* fixed tsconfig.json

* cleaned up unecessary dependency on new TS version
---
 types/oauth/index.d.ts     | 315 +++++++++++++++++++++++++++++++++++++
 types/oauth/oauth-tests.ts |  68 ++++++++
 types/oauth/tsconfig.json  |  23 +++
 types/oauth/tslint.json    |   1 +
 4 files changed, 407 insertions(+)
 create mode 100644 types/oauth/index.d.ts
 create mode 100644 types/oauth/oauth-tests.ts
 create mode 100644 types/oauth/tsconfig.json
 create mode 100644 types/oauth/tslint.json

diff --git a/types/oauth/index.d.ts b/types/oauth/index.d.ts
new file mode 100644
index 0000000000..21b74369e9
--- /dev/null
+++ b/types/oauth/index.d.ts
@@ -0,0 +1,315 @@
+// Type definitions for oauth 0.9
+// Project: https://github.com/ciaranj/node-oauth#readme
+// Definitions by: nonAlgebraic <https://github.com/nonAlgebraic>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types='node' />
+
+import { Agent, ClientRequest, IncomingMessage, OutgoingHttpHeaders, RequestOptions } from 'http';
+
+import { UrlWithStringQuery } from 'url';
+
+export type oauth1tokenCallback = (
+  err: {statusCode: number, data?: any},
+  token: string,
+  token_secret: string,
+  parsedQueryString: any
+) => any;
+
+export type oauth2tokenCallback = (
+  err: {statusCode: number, data?: any},
+  access_token: string,
+  refresh_token: string,
+  result: any
+) => any;
+
+export type dataCallback = (
+  err: {statusCode: number, data?: any},
+  result: string | Buffer,
+  response: IncomingMessage
+) => any;
+
+export class OAuth {
+  protected _isEcho: boolean;
+  protected _requestUrl: string;
+  protected _accessUrl: string;
+  protected _consumerKey: string;
+  protected _consumerSecret: string;
+  protected _protectedKey: string;
+  protected _version: string;
+  protected _authorize_callback: string;
+  protected _signatureMethod: string;
+  protected _nonceSize: number;
+  protected _headers: OutgoingHttpHeaders;
+  protected _clientOptions: {
+    requestTokenHttpMethod: string,
+    accessTokenHttpMethod: string,
+    followRedirects: boolean
+  };
+  protected _oauthParameterSeperator: string;
+  protected _realm: string;
+  protected _verifyCredentials: string;
+
+  NONCE_CHARS: string[];
+
+  constructor(
+    requestUrl: string,
+    accessUrl: string,
+    consumerKey: string,
+    consumerSecret: string,
+    version: string,
+    authorize_callback: string | null,
+    signatureMethod: string,
+    nonceSize?: number,
+    customHeaders?: OutgoingHttpHeaders
+  );
+
+  setClientOptions(options: {
+    requestTokenHttpMethod: string,
+    accessTokenHttpMethod: string,
+    followRedirects: boolean
+  }): void;
+
+  getOAuthAccessToken(
+    oauth_token: string,
+    oauth_token_secret: string,
+    oauth_verifier: string,
+    callback: oauth1tokenCallback
+  ): void;
+  getOAuthAccessToken(
+    oauth_token: string,
+    oauth_token_secret: string,
+    callback: oauth1tokenCallback
+  ): void;
+
+  getProtectedResource(
+    url: string,
+    method: string,
+    oauth_token: string,
+    oauth_token_secret: string,
+    callback: dataCallback
+  ): void;
+
+  delete(
+    url: string,
+    oauth_token: string,
+    oauth_token_secret: string,
+    callback: dataCallback
+  ): ClientRequest;
+
+  get(
+    url: string,
+    oauth_token: string,
+    oauth_token_secret: string,
+    callback: dataCallback
+  ): ClientRequest;
+
+  put(
+    url: string,
+    oauth_token: string,
+    oauth_token_secret: string,
+    post_body?: any,
+    post_content_type?: string,
+    callback?: dataCallback
+  ): ClientRequest;
+
+  post(
+    url: string,
+    oauth_token: string,
+    oauth_token_secret: string,
+    post_body?: any,
+    post_content_type?: string,
+    callback?: dataCallback
+  ): ClientRequest;
+
+  getOAuthRequestToken(
+    extraparams: any,
+    callback: oauth1tokenCallback
+  ): void;
+  getOAuthRequestToken(callback: oauth1tokenCallback): void;
+
+  signUrl(
+    url: string,
+    oauth_token: string,
+    oauth_token_secret: string,
+    method?: string
+  ): string;
+
+  authHeader(
+    url: string,
+    oauth_token: string,
+    oauth_token_secret: string,
+    method?: string
+  ): string;
+
+  protected _getTimestamp(): number | string;
+
+  protected _encodeData(toEncode: string): string;
+
+  protected _decodeData(toDecode: string): string;
+
+  protected _getSignature(
+    method: string,
+    url: string,
+    parameters: string,
+    tokenSecret: string
+  ): string;
+
+  protected _normalizeUrl(url: string): string;
+
+  protected _isParameterNameAnOAuthParameter(parameter: string): boolean;
+
+  protected _buildAuthorizationHeaders(orderedParameters: string[][]): string;
+
+  protected _makeArrayOfArgumentsHash(
+    argumentHash: {[key: string]: string | string[]}
+  ): string[][];
+
+  protected _sortRequestParams(argument_pairs: string[][]): string[][];
+
+  protected _normaliseRequestParams(args: string[][]): string;
+
+  protected _createSignatureBase(
+    method: string,
+    url: string,
+    parameters: string
+  ): string;
+
+  protected  _createSignature(signatureBase: string, tokenSecret: string): string;
+
+  protected _getNonce(nonceSize: number): string;
+
+  protected _createClient(
+    port?: number | string,
+    hostname?: string,
+    method?: string,
+    path?: string,
+    headers?: OutgoingHttpHeaders,
+    sslEnabled?: boolean
+  ): ClientRequest;
+
+  protected _prepareParameters(
+    oauth_token: string,
+    oauth_token_secret: string,
+    method: string,
+    url: string,
+    extra_params?: any
+  ): string[][];
+  protected _prepareParameters(
+    oauth_token_secret: string,
+    method: string,
+    url: string,
+    extra_params?: any
+  ): string[][];
+
+  protected _performSecureRequest(
+    oauth_token: string,
+    oauth_token_secret: string,
+    method: string,
+    url: string,
+    extra_params?: any,
+    post_body?: any,
+    post_content_type?: string,
+    callback?: dataCallback
+  ): ClientRequest;
+
+  protected _putOrPost(
+    method: string,
+    url: string,
+    oauth_token: string,
+    oauth_token_secret: string,
+    post_body?: any,
+    post_content_type?: string,
+    callback?: dataCallback
+  ): ClientRequest;
+}
+
+export class OAuthEcho extends OAuth {
+  constructor(
+    realm: string,
+    verify_credentials: string,
+    consumerKey: string,
+    consumerSecret: string,
+    version: string,
+    signatureMethod: string,
+    nonceSize?: number,
+    customHeaders?: OutgoingHttpHeaders
+  );
+}
+
+export class OAuth2 {
+  protected _clientId: string;
+  protected _clientSecret: string;
+  protected _baseSite: string;
+  protected _authorizeUrl: string;
+  protected _accessTokenUrl: string;
+  protected _accessTokenName: string;
+  protected _authMethod: string;
+  protected _customHeaders: OutgoingHttpHeaders;
+  protected _useAuthorizationHeaderForGET: boolean;
+  protected _agent: Agent | boolean;
+
+  constructor(
+    clientId: string,
+    clientSecret: string,
+    baseSite: string,
+    authorizePath?: string,
+    accessTokenPath?: string,
+    customHeaders?: OutgoingHttpHeaders
+  );
+
+  setAgent(agent: Agent | boolean): void;
+
+  setAccessTokenName(name: string): void;
+
+  setAuthMethod(authMethod: string): void;
+
+  useAuthorizationHeaderforGET(useIt: boolean): void;
+
+  buildAuthHeader(token: string): string;
+
+  getAuthorizeUrl(params?: any): string;
+
+  getOAuthAccessToken(
+    code: string,
+    params: any,
+    callback: oauth2tokenCallback
+  ): void;
+  getOAuthAccessToken(code: string, callback: oauth2tokenCallback): void;
+
+  getProtectedResource(
+    url: string,
+    access_token: string,
+    callback: dataCallback
+  ): void;
+
+  get(url: string,
+    access_token: string,
+    callback: string
+  ): void;
+
+  protected _getAccessTokenUrl(): string;
+
+  protected _chooseHttpLibrary(parsedUrl: UrlWithStringQuery): string;
+
+  protected _request(
+    method: string,
+    url: string,
+    headers: OutgoingHttpHeaders | null,
+    post_body: any,
+    access_token: string | null,
+    callback: dataCallback
+  ): void;
+
+  protected _executeRequest(
+    http_library: string,
+    options: RequestOptions,
+    post_body: any,
+    callback: dataCallback
+  ): void;
+  protected _executeRequest(
+    http_library: string,
+    options: RequestOptions,
+    callback: dataCallback
+  ): void;
+}
diff --git a/types/oauth/oauth-tests.ts b/types/oauth/oauth-tests.ts
new file mode 100644
index 0000000000..3218a46754
--- /dev/null
+++ b/types/oauth/oauth-tests.ts
@@ -0,0 +1,68 @@
+import { OAuth2 } from 'oauth';
+
+import http = require('http');
+import qs = require('querystring');
+
+const clientID = '';
+const clientSecret = '';
+const oauth2 = new OAuth2(clientID,
+                        clientSecret,
+                        'https://github.com/',
+                        'login/oauth/authorize',
+                        'login/oauth/access_token');
+
+http.createServer((req, res) => {
+    const p: string[] = [];
+    if (req.url) {
+      req.url.split('/');
+    }
+    const pLen = p.length;
+
+    /**
+     * Authorised url as per github docs:
+     * https://developer.github.com/v3/oauth/#redirect-users-to-request-github-access
+     *
+     * getAuthorizedUrl: https://github.com/ciaranj/node-oauth/blob/master/lib/oauth2.js#L148
+     * Adding params to authorize url with fields as mentioned in github docs
+     *
+     */
+    const authURL = oauth2.getAuthorizeUrl({
+        redirect_uri: 'http://localhost:8080/code',
+        scope: ['repo', 'user'],
+        state: 'some random string to protect against cross-site request forgery attacks'
+    });
+
+    /**
+     * Creating an anchor with authURL as href and sending as response
+     */
+    const body = `<a href="${authURL}"> Get Code </a>`;
+    if (pLen === 2 && p[1] === '') {
+        res.writeHead(200, {
+            'Content-Length': body.length,
+            'Content-Type': 'text/html' });
+        res.end(body);
+    } else if (pLen === 2 && p[1].indexOf('code') === 0) {
+        /** Github sends auth code so that access_token can be obtained */
+        /** To obtain and parse code='...' from code?code='...' */
+        const qsObj = qs.parse<{[key: string]: string}>(p[1].split('?')[1]);
+
+        /** Obtaining access_token */
+        oauth2.getOAuthAccessToken(
+            qsObj['code'],
+            {redirect_uri: 'http://localhost:8080/code/'},
+            (e, access_token, refresh_token, results) => {
+                if (e) {
+                    console.log(e);
+                    res.end(e);
+                } else if (results.error) {
+                    console.log(results);
+                    res.end(JSON.stringify(results));
+                } else {
+                    console.log('Obtained access_token: ', access_token);
+                    res.end(access_token);
+                }
+        });
+    } else {
+        // Unhandled url
+    }
+}).listen(8080);
diff --git a/types/oauth/tsconfig.json b/types/oauth/tsconfig.json
new file mode 100644
index 0000000000..1c60786e15
--- /dev/null
+++ b/types/oauth/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": true
+    },
+    "files": [
+        "index.d.ts",
+        "oauth-tests.ts"
+    ]
+}
diff --git a/types/oauth/tslint.json b/types/oauth/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/oauth/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 2a5c6453e93a9d5158829110c48bdeec002d916f Mon Sep 17 00:00:00 2001
From: Rodrigo Weber <rodrigoantonioweber@hotmail.com>
Date: Wed, 11 Apr 2018 15:39:29 -0300
Subject: [PATCH 1206/1382] Add typings react-native-bluetooth-serial (#24908)

---
 .../react-native-bluetooth-serial/index.d.ts  | 20 +++++++++++++++
 .../react-native-bluetooth-serial-tests.tsx   | 22 ++++++++++++++++
 .../tsconfig.json                             | 25 +++++++++++++++++++
 .../react-native-bluetooth-serial/tslint.json |  1 +
 4 files changed, 68 insertions(+)
 create mode 100644 types/react-native-bluetooth-serial/index.d.ts
 create mode 100644 types/react-native-bluetooth-serial/react-native-bluetooth-serial-tests.tsx
 create mode 100644 types/react-native-bluetooth-serial/tsconfig.json
 create mode 100644 types/react-native-bluetooth-serial/tslint.json

diff --git a/types/react-native-bluetooth-serial/index.d.ts b/types/react-native-bluetooth-serial/index.d.ts
new file mode 100644
index 0000000000..8dc4d9c1a1
--- /dev/null
+++ b/types/react-native-bluetooth-serial/index.d.ts
@@ -0,0 +1,20 @@
+// Type definitions for react-native-bluetooth-serial 1.0
+// Project: https://github.com/rusel1989/react-native-bluetooth-serial
+// Definitions by: Rodrigo Weber <https://github.com/RodrigoAWeber>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+import * as React from "react";
+import * as ReactNative from "react-native";
+
+export type Buffer = (data: number[]) => void;
+
+export namespace BluetoothSerial {
+    function on(eventName: string, handler: () => void): void;
+    function removeListener(eventName: string, handler: () => void): void;
+    function write(data: Buffer | string): Promise<boolean>;
+    function list(): Promise<Array<{ id: string, name: string }>>;
+    function isEnabled(): Promise<boolean>;
+    function connect(id: string): Promise<void>;
+    function disconnect(): Promise<void>;
+    function isConnected(): Promise<boolean>;
+}
diff --git a/types/react-native-bluetooth-serial/react-native-bluetooth-serial-tests.tsx b/types/react-native-bluetooth-serial/react-native-bluetooth-serial-tests.tsx
new file mode 100644
index 0000000000..fc03d1a702
--- /dev/null
+++ b/types/react-native-bluetooth-serial/react-native-bluetooth-serial-tests.tsx
@@ -0,0 +1,22 @@
+import * as React from 'react';
+import { View, Text } from 'react-native';
+import { BluetoothSerial } from 'react-native-bluetooth-serial';
+
+class Example extends React.Component {
+	async componentDidMount() {
+		const devices = await BluetoothSerial.list();
+
+		await BluetoothSerial.connect(devices[0].id);
+
+		BluetoothSerial.write("Hello");
+
+		await BluetoothSerial.disconnect();
+	}
+	render() {
+		return (
+			<View>
+				<Text>Printer</Text>
+			</View>
+		);
+	}
+}
diff --git a/types/react-native-bluetooth-serial/tsconfig.json b/types/react-native-bluetooth-serial/tsconfig.json
new file mode 100644
index 0000000000..213f3fd025
--- /dev/null
+++ b/types/react-native-bluetooth-serial/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react"
+    },
+    "files": [
+        "index.d.ts",
+        "react-native-bluetooth-serial-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/types/react-native-bluetooth-serial/tslint.json b/types/react-native-bluetooth-serial/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-native-bluetooth-serial/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 53714e16a5ffe56205fa36865b02bf4b8e44b7dc Mon Sep 17 00:00:00 2001
From: Aankhen <Aankhen@users.noreply.github.com>
Date: Thu, 12 Apr 2018 00:12:15 +0530
Subject: [PATCH 1207/1382] Add gulp-image-resize types. (#24894)

---
 .../gulp-image-resize-tests.ts                | 40 +++++++++++++++++++
 types/gulp-image-resize/index.d.ts            | 38 ++++++++++++++++++
 types/gulp-image-resize/tsconfig.json         | 23 +++++++++++
 types/gulp-image-resize/tslint.json           |  1 +
 4 files changed, 102 insertions(+)
 create mode 100644 types/gulp-image-resize/gulp-image-resize-tests.ts
 create mode 100644 types/gulp-image-resize/index.d.ts
 create mode 100644 types/gulp-image-resize/tsconfig.json
 create mode 100644 types/gulp-image-resize/tslint.json

diff --git a/types/gulp-image-resize/gulp-image-resize-tests.ts b/types/gulp-image-resize/gulp-image-resize-tests.ts
new file mode 100644
index 0000000000..46360827c1
--- /dev/null
+++ b/types/gulp-image-resize/gulp-image-resize-tests.ts
@@ -0,0 +1,40 @@
+import resize = require('gulp-image-resize');
+
+resize();                       // $ExpectType Transform
+resize(undefined);
+resize("1");                  // $ExpectError
+
+resize({                        // $ExpectType Transform
+    width: 100,
+    height: 100,
+    crop: true,
+    upscale: false
+});
+
+resize({
+    widt: 5                     // $ExpectError
+});
+
+resize({
+    width: undefined,
+    height: undefined,
+    upscale: undefined,
+    crop: undefined,
+    gravity: undefined,
+    quality: undefined,
+    format: undefined,
+    filter: undefined,
+    sharpen: undefined,
+    samplingFactor: undefined,
+    noProfile: undefined,
+    interlace: undefined,
+    imageMagick: undefined,
+    background: undefined,
+    flatten: undefined,
+    percentage: undefined,
+    cover: undefined
+});
+
+resize({ format: 'jpeg' });
+resize({ width: 100 });
+resize({ percentage: 50 });
diff --git a/types/gulp-image-resize/index.d.ts b/types/gulp-image-resize/index.d.ts
new file mode 100644
index 0000000000..3166b0d9b9
--- /dev/null
+++ b/types/gulp-image-resize/index.d.ts
@@ -0,0 +1,38 @@
+// Type definitions for gulp-image-resize 0.13
+// Project: https://github.com/scalableminds/gulp-image-resize
+// Definitions by: Aankhen <https://github.com/Aankhen>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+/// <reference types="node" />
+
+import * as stream from "stream";
+import * as gm from "gm";
+
+export = GulpImageResize;
+
+declare function GulpImageResize(options?: GulpImageResize.Options): stream.Transform;
+
+declare namespace GulpImageResize {
+    type SamplingFactor = [number, number];
+
+    interface Options {
+        width?: number;
+        height?: number;
+        upscale?: boolean;
+        crop?: boolean;
+        gravity?: gm.GravityDirection;
+        quality?: number;
+        format?: string;
+        filter?: gm.FilterType;
+        sharpen?: boolean | string;
+        samplingFactor?: SamplingFactor;
+        noProfile?: boolean;
+        interlace?: boolean;
+        imageMagick?: boolean;
+        background?: string;
+        flatten?: boolean;
+        percentage?: number;
+        cover?: boolean;
+    }
+}
diff --git a/types/gulp-image-resize/tsconfig.json b/types/gulp-image-resize/tsconfig.json
new file mode 100644
index 0000000000..7f26af6c84
--- /dev/null
+++ b/types/gulp-image-resize/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-image-resize-tests.ts"
+    ]
+}
diff --git a/types/gulp-image-resize/tslint.json b/types/gulp-image-resize/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/gulp-image-resize/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From b46ec025ce88fcaefe7c4c208db901798d5c18bc Mon Sep 17 00:00:00 2001
From: Walter Rumsby <wrumsby@users.noreply.github.com>
Date: Thu, 12 Apr 2018 06:43:07 +1200
Subject: [PATCH 1208/1382] Add typings for mem-fs-editor (#24886)

* Add mem-fs-editor

* Tidy up imports

* wip

* Typings for mem-fs-editor

* Change type to ReadonlyArray<Transform>

* Bump minimum TypeScript version based on requirements of EJS

* revert

* ...
---
 types/mem-fs-editor/index.d.ts             | 48 ++++++++++++++++++++++
 types/mem-fs-editor/mem-fs-editor-tests.ts | 18 ++++++++
 types/mem-fs-editor/tsconfig.json          | 23 +++++++++++
 types/mem-fs-editor/tslint.json            |  1 +
 4 files changed, 90 insertions(+)
 create mode 100644 types/mem-fs-editor/index.d.ts
 create mode 100644 types/mem-fs-editor/mem-fs-editor-tests.ts
 create mode 100644 types/mem-fs-editor/tsconfig.json
 create mode 100644 types/mem-fs-editor/tslint.json

diff --git a/types/mem-fs-editor/index.d.ts b/types/mem-fs-editor/index.d.ts
new file mode 100644
index 0000000000..01234bbc0c
--- /dev/null
+++ b/types/mem-fs-editor/index.d.ts
@@ -0,0 +1,48 @@
+// Type definitions for mem-fs-editor 4.0
+// Project: https://github.com/SBoudrias/mem-fs-editor#readme
+// Definitions by: My Food Bag <https://github.com/MyFoodBag>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+/// <reference types="node" />
+
+import * as Buffer from 'buffer';
+import { Transform } from 'stream';
+import { Store } from 'mem-fs';
+import { Options as TemplateOptions } from 'ejs';
+import { IOptions as GlobOptions } from 'glob';
+
+export function create(store: Store): memFsEditor.Editor;
+
+export namespace memFsEditor {
+    type Contents = string|Buffer;
+
+    type ReplacerFunc = (key: string, value: any) => string|null|undefined;
+
+    type Space = string|number;
+
+    type ProcessFunc = (contents: Buffer) => Contents;
+
+    interface CopyOptions {
+        process?: ProcessFunc;
+        globOptions?: GlobOptions;
+    }
+
+    interface Editor {
+        read: (filepath: string, options?: { raw: boolean, defaults: string }) => string;
+        readJSON: (filepath: string, defaults?: string) => string;
+        write: (filepath: string, contents: Contents) => void;
+        writeJSON: (filepath: string, contents: object, replacer?: ReplacerFunc, space?: Space) => void;
+        append: (filepath: string, contents: Contents, options?: { trimEnd: boolean, separator: string }) => void;
+        extendJSON: (filepath: string, contents: object, replacer?: ReplacerFunc, space?: Space) => void;
+        delete: (filepath: string, options?: { globOptions: GlobOptions }) => void;
+        copy: (from: string, to: string, options?: CopyOptions) => void;
+        copyTpl: (from: string, to: string, context: object, templateOptions?: TemplateOptions, copyOptions?: CopyOptions) => void;
+        move: (from: string, to: string, options?: { globOptions: GlobOptions }) => void;
+        exists: (filepath: string) => boolean;
+        commit: (filters: ReadonlyArray<Transform>, callback: () => void) => void;
+    }
+
+    const prototype: {
+    };
+}
diff --git a/types/mem-fs-editor/mem-fs-editor-tests.ts b/types/mem-fs-editor/mem-fs-editor-tests.ts
new file mode 100644
index 0000000000..355c714bf9
--- /dev/null
+++ b/types/mem-fs-editor/mem-fs-editor-tests.ts
@@ -0,0 +1,18 @@
+import memFs = require('mem-fs');
+import editor = require('mem-fs-editor');
+
+const store = memFs.create();
+const fs = editor.create(store);
+
+fs.write('template.js', 'var a = 1; console.log(\'<%= foo %>\', a);');
+
+fs.copy('template.js', 'template.tpl', {
+    process: (contents) => contents,
+    globOptions: {
+        cwd: '.'
+    }
+});
+
+fs.copyTpl('template.tpl', 'output.js', {
+    foo: 'bar'
+});
diff --git a/types/mem-fs-editor/tsconfig.json b/types/mem-fs-editor/tsconfig.json
new file mode 100644
index 0000000000..52623549e4
--- /dev/null
+++ b/types/mem-fs-editor/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "mem-fs-editor-tests.ts"
+    ]
+}
diff --git a/types/mem-fs-editor/tslint.json b/types/mem-fs-editor/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/mem-fs-editor/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 8b636fd9a8df6538f1bf9201a1d34af02bfbe5cd Mon Sep 17 00:00:00 2001
From: Aankhen <Aankhen@users.noreply.github.com>
Date: Thu, 12 Apr 2018 00:15:43 +0530
Subject: [PATCH 1209/1382] Add gulp-image types. (#24889)

---
 types/gulp-image/gulp-image-tests.ts | 28 +++++++++++++++++++++++++
 types/gulp-image/index.d.ts          | 31 ++++++++++++++++++++++++++++
 types/gulp-image/tsconfig.json       | 23 +++++++++++++++++++++
 types/gulp-image/tslint.json         |  1 +
 4 files changed, 83 insertions(+)
 create mode 100644 types/gulp-image/gulp-image-tests.ts
 create mode 100644 types/gulp-image/index.d.ts
 create mode 100644 types/gulp-image/tsconfig.json
 create mode 100644 types/gulp-image/tslint.json

diff --git a/types/gulp-image/gulp-image-tests.ts b/types/gulp-image/gulp-image-tests.ts
new file mode 100644
index 0000000000..6d94c46921
--- /dev/null
+++ b/types/gulp-image/gulp-image-tests.ts
@@ -0,0 +1,28 @@
+import image = require('gulp-image');
+
+image(false);                   // $ExpectError
+
+image();                        // $ExpectType Transform
+image({});
+image({
+    pngquant: true,
+    optipng: false,
+    zopflipng: true,
+    jpegRecompress: false,
+    mozjpeg: true,
+    guetzli: false,
+    gifsicle: true,
+    svgo: true,
+    concurrent: 10,
+    quiet: true // defaults to false
+});
+image({
+    optipng: ['-i 1', '-strip all', '-fix', '-o7', '-force'],
+    pngquant: ['--speed=1', '--force', 256],
+    zopflipng: ['-y', '--lossy_8bit', '--lossy_transparent'],
+    jpegRecompress: ['--strip', '--quality', 'medium', '--min', 40, '--max', 80],
+    mozjpeg: ['-optimize', '-progressive'],
+    guetzli: ['--quality', 85],
+    gifsicle: ['--optimize'],
+    svgo: ['--enable', 'cleanupIDs', '--disable', 'convertColors']
+});
diff --git a/types/gulp-image/index.d.ts b/types/gulp-image/index.d.ts
new file mode 100644
index 0000000000..d46d68f3ab
--- /dev/null
+++ b/types/gulp-image/index.d.ts
@@ -0,0 +1,31 @@
+// Type definitions for gulp-image 4.3
+// Project: https://github.com/1000ch/gulp-image#readme
+// Definitions by: Aankhen <https://github.com/Aankhen>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+/// <reference types="node" />
+
+import stream = require("stream");
+
+export = GulpImage;
+
+declare function GulpImage(options?: GulpImage.Options): stream.Transform;
+
+declare namespace GulpImage {
+    type OptimizerSetting = boolean
+        | any[];
+
+    interface Options {
+        pngquant?: OptimizerSetting;
+        optipng?: OptimizerSetting;
+        zopflipng?: OptimizerSetting;
+        jpegRecompress?: OptimizerSetting;
+        mozjpeg?: OptimizerSetting;
+        guetzli?: OptimizerSetting;
+        gifsicle?: OptimizerSetting;
+        svgo?: OptimizerSetting;
+        concurrent?: number;
+        quiet?: boolean;
+    }
+}
diff --git a/types/gulp-image/tsconfig.json b/types/gulp-image/tsconfig.json
new file mode 100644
index 0000000000..a9d788e360
--- /dev/null
+++ b/types/gulp-image/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-image-tests.ts"
+    ]
+}
diff --git a/types/gulp-image/tslint.json b/types/gulp-image/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/gulp-image/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From abad5a877b8a21799078fca860eeb60436d75f62 Mon Sep 17 00:00:00 2001
From: Aankhen <Aankhen@users.noreply.github.com>
Date: Thu, 12 Apr 2018 00:15:57 +0530
Subject: [PATCH 1210/1382] Add gulp-change types. (#24890)

---
 types/gulp-change/gulp-change-tests.ts | 17 +++++++++++++++++
 types/gulp-change/index.d.ts           | 16 ++++++++++++++++
 types/gulp-change/tsconfig.json        | 23 +++++++++++++++++++++++
 types/gulp-change/tslint.json          |  1 +
 4 files changed, 57 insertions(+)
 create mode 100644 types/gulp-change/gulp-change-tests.ts
 create mode 100644 types/gulp-change/index.d.ts
 create mode 100644 types/gulp-change/tsconfig.json
 create mode 100644 types/gulp-change/tslint.json

diff --git a/types/gulp-change/gulp-change-tests.ts b/types/gulp-change/gulp-change-tests.ts
new file mode 100644
index 0000000000..5a52062951
--- /dev/null
+++ b/types/gulp-change/gulp-change-tests.ts
@@ -0,0 +1,17 @@
+import change = require('gulp-change');
+
+change();                       // $ExpectError
+change(1);                      // $ExpectError
+
+function performChange(content: string): string {
+    return content.replace(/foo/g, 'FOO');
+}
+
+change(performChange);          // $ExpectType MapStream
+
+function performChangeAsync(content: string, done: (err: any, content: string) => any): void {
+    content.replace(/foo/g, 'FOO');
+    done(null, content);
+}
+
+change(performChangeAsync);     // $ExpectType MapStream
diff --git a/types/gulp-change/index.d.ts b/types/gulp-change/index.d.ts
new file mode 100644
index 0000000000..2220100fd9
--- /dev/null
+++ b/types/gulp-change/index.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for gulp-change 1.0
+// Project: https://github.com/PoliteJS/gulp-change
+// Definitions by: Aankhen <https://github.com/Aankhen>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as eventStream from "event-stream";
+
+export = GulpChange;
+
+declare function GulpChange(transformer: GulpChange.ChangeFunction): eventStream.MapStream;
+
+declare namespace GulpChange {
+    type Callback = (err: any, content: string) => any;
+
+    type ChangeFunction = (content: string, callback: Callback) => string | void;
+}
diff --git a/types/gulp-change/tsconfig.json b/types/gulp-change/tsconfig.json
new file mode 100644
index 0000000000..1b736a1975
--- /dev/null
+++ b/types/gulp-change/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-change-tests.ts"
+    ]
+}
diff --git a/types/gulp-change/tslint.json b/types/gulp-change/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/gulp-change/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 342f054c775a7288a9e14da94e8b7faea679c30d Mon Sep 17 00:00:00 2001
From: Aankhen <Aankhen@users.noreply.github.com>
Date: Thu, 12 Apr 2018 00:18:07 +0530
Subject: [PATCH 1211/1382] Add rename types (#24887)

---
 types/rename/index.d.ts      | 39 ++++++++++++++++++++++++++++++
 types/rename/rename-tests.ts | 46 ++++++++++++++++++++++++++++++++++++
 types/rename/tsconfig.json   | 23 ++++++++++++++++++
 types/rename/tslint.json     |  1 +
 4 files changed, 109 insertions(+)
 create mode 100644 types/rename/index.d.ts
 create mode 100644 types/rename/rename-tests.ts
 create mode 100644 types/rename/tsconfig.json
 create mode 100644 types/rename/tslint.json

diff --git a/types/rename/index.d.ts b/types/rename/index.d.ts
new file mode 100644
index 0000000000..9b61f316ef
--- /dev/null
+++ b/types/rename/index.d.ts
@@ -0,0 +1,39 @@
+// Type definitions for rename 1.0
+// Project: https://github.com/popomore/rename
+// Definitions by: Aankhen <https://github.com/Aankhen>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.5
+
+/// <reference types="node" />
+
+export = Rename;
+
+declare function Rename(filepath: string | Rename.FileObject, transformer: Rename.Transformer): Rename.FilePath;
+
+declare namespace Rename {
+    interface FileObject { // using package's terminology
+        dirname?: string;
+        basename?: string;
+        extname?: string;
+        path?: string;
+        hash?: string;          // not populated by package
+    }
+
+    interface Specification {
+        dirname?: string;
+        prefix?: string;
+        basename?: string;
+        suffix?: string;
+        extname?: string;
+    }
+
+    type FilePath = string
+        | Specification;
+
+    type Transformer = ((spec: FileObject) => FilePath)
+        | FilePath;
+
+    function parse(filename: string): FileObject;
+
+    function stringify(obj: FileObject): string;
+}
diff --git a/types/rename/rename-tests.ts b/types/rename/rename-tests.ts
new file mode 100644
index 0000000000..96c283d0f2
--- /dev/null
+++ b/types/rename/rename-tests.ts
@@ -0,0 +1,46 @@
+import rename = require('rename');
+
+rename();                       // $ExpectError
+rename('a.js');                 // $ExpectError
+rename(undefined, undefined);   // $ExpectError
+rename(1, 2);                   // $ExpectError
+rename('a.js', () => { });       // $ExpectError
+rename('a.js', (obj) => { });    // $ExpectError
+rename({ non: "existent" }, 'b.js'); // $ExpectError
+
+rename('a.js', 'b.js');         // $ExpectType FilePath
+rename('a.js', { suffix: '-debug' });
+rename('a.js', (fileObject) => {
+    return { suffix: '-debug' };
+});
+
+rename({}, 'b.js');
+rename({ basename: 'a', extname: '.js' }, 'b.js');
+
+function transformer(obj: rename.FileObject): rename.Specification {
+    return {
+        suffix: obj.hash || '-debug'
+    };
+}
+
+rename({ basename: 'a', extname: '.js' }, transformer);
+rename({ basename: 'a', extname: '.js', hash: '-123' }, transformer);
+
+rename({
+    basename: 'c',
+    extname: '.js',
+    hash: '111'
+}, {
+        // tslint:disable-next-line no-invalid-template-strings
+        suffix: '-${hash}'
+    });
+
+rename.parse();                 // $ExpectError
+rename.parse({});               // $ExpectError
+rename.parse("p.js");
+
+rename.stringify();             // $ExpectError
+rename.stringify("abcd.js");    // $ExpectError
+rename.stringify({});
+rename.stringify({ suffix: ".js" }); // $ExpectError
+rename.stringify({ extname: ".js" });
diff --git a/types/rename/tsconfig.json b/types/rename/tsconfig.json
new file mode 100644
index 0000000000..0f06c2bcc3
--- /dev/null
+++ b/types/rename/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "rename-tests.ts"
+    ]
+}
diff --git a/types/rename/tslint.json b/types/rename/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/rename/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From c73b50e6c5908daaebf5dafd9e49bb233ce705a3 Mon Sep 17 00:00:00 2001
From: Aankhen <Aankhen@users.noreply.github.com>
Date: Thu, 12 Apr 2018 00:18:34 +0530
Subject: [PATCH 1212/1382] Add types for gulp-responsive-images. (#24885)

---
 .../gulp-responsive-images-tests.ts           | 63 +++++++++++++++++++
 types/gulp-responsive-images/index.d.ts       | 43 +++++++++++++
 types/gulp-responsive-images/tsconfig.json    | 23 +++++++
 types/gulp-responsive-images/tslint.json      |  1 +
 4 files changed, 130 insertions(+)
 create mode 100644 types/gulp-responsive-images/gulp-responsive-images-tests.ts
 create mode 100644 types/gulp-responsive-images/index.d.ts
 create mode 100644 types/gulp-responsive-images/tsconfig.json
 create mode 100644 types/gulp-responsive-images/tslint.json

diff --git a/types/gulp-responsive-images/gulp-responsive-images-tests.ts b/types/gulp-responsive-images/gulp-responsive-images-tests.ts
new file mode 100644
index 0000000000..63957ec047
--- /dev/null
+++ b/types/gulp-responsive-images/gulp-responsive-images-tests.ts
@@ -0,0 +1,63 @@
+import gulpResponsiveImages = require('gulp-responsive-images');
+
+gulpResponsiveImages(); // $ExpectError
+
+gulpResponsiveImages({});       // $ExpectType Transform
+
+gulpResponsiveImages({ 1: "abcd" }); // $ExpectError
+
+gulpResponsiveImages({
+    'hero.png': [
+        {
+        }
+    ]
+}
+);
+
+gulpResponsiveImages({
+    'hero.png': [
+        {
+            crop: false,
+            gravity: 'Center',
+            height: 100,
+            overwrite: true,
+            quality: 100,
+            sharpen: false,
+            suffix: '-100',
+            upscale: false,
+            width: 100
+        }
+    ]
+}
+);
+
+gulpResponsiveImages({
+    'hero.png': [
+        {
+            format: "jpeg",
+            rename: "image.jpg",
+            percentage: 50
+        }
+    ]
+}
+);
+
+gulpResponsiveImages({
+    'hero.png': [
+        {
+            crop: undefined,
+            gravity: undefined,
+            height: undefined,
+            overwrite: undefined,
+            quality: undefined,
+            sharpen: undefined,
+            suffix: undefined,
+            upscale: undefined,
+            width: undefined,
+            format: undefined,
+            rename: undefined,
+            percentage: undefined
+        }
+    ]
+}
+);
diff --git a/types/gulp-responsive-images/index.d.ts b/types/gulp-responsive-images/index.d.ts
new file mode 100644
index 0000000000..3b3707f024
--- /dev/null
+++ b/types/gulp-responsive-images/index.d.ts
@@ -0,0 +1,43 @@
+// Type definitions for gulp-responsive-images 0.0
+// Project: https://github.com/dcgauld/gulp-responsive-images#readme
+// Definitions by: Aankhen <https://github.com/aankhen>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import * as stream from "stream";
+import * as gm from "gm";
+import { ParsedPath, Options as RenameOptions } from "gulp-rename";
+
+export = GulpResponsiveImage;
+
+declare function GulpResponsiveImage(configs: GulpResponsiveImage.Matchers): stream.Transform;
+
+declare namespace GulpResponsiveImage {
+    type SamplingFactor = [number, number];
+
+    type Rename = string
+        | ((path: ParsedPath) => any)
+        | RenameOptions;
+
+    interface Settings {
+        crop?: boolean;
+        format?: string;
+        gravity?: gm.GravityDirection;
+        overwrite?: boolean;
+        quality?: number;
+        rename?: Rename;
+        percentage?: number;
+        sharpen?: boolean;
+        upscale?: boolean;
+        filter?: gm.FilterType;
+        height?: number;
+        width?: number;
+        samplingFactor?: SamplingFactor;
+        suffix?: string;
+    }
+
+    interface Matchers {
+        [index: string]: ReadonlyArray<Settings>;
+    }
+}
diff --git a/types/gulp-responsive-images/tsconfig.json b/types/gulp-responsive-images/tsconfig.json
new file mode 100644
index 0000000000..2c4c0aa75b
--- /dev/null
+++ b/types/gulp-responsive-images/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "gulp-responsive-images-tests.ts"
+    ]
+}
diff --git a/types/gulp-responsive-images/tslint.json b/types/gulp-responsive-images/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/gulp-responsive-images/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 1114fdf41284426ef3f88563d59147f866c82dd1 Mon Sep 17 00:00:00 2001
From: Ben Saufley <bensaufley+git@gmail.com>
Date: Wed, 11 Apr 2018 14:52:53 -0400
Subject: [PATCH 1213/1382] Adjust css export (#24771)

---
 types/styled-jsx/css.d.ts             | 2 +-
 types/styled-jsx/styled-jsx-tests.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/styled-jsx/css.d.ts b/types/styled-jsx/css.d.ts
index 55a9533bb8..588956c57e 100644
--- a/types/styled-jsx/css.d.ts
+++ b/types/styled-jsx/css.d.ts
@@ -1,4 +1,4 @@
 type Tag = (chunks: TemplateStringsArray, ...args: any[]) => string;
 
 declare let css: Tag;
-export default css;
+export = css;
diff --git a/types/styled-jsx/styled-jsx-tests.tsx b/types/styled-jsx/styled-jsx-tests.tsx
index ada37c2248..09883d8df6 100644
--- a/types/styled-jsx/styled-jsx-tests.tsx
+++ b/types/styled-jsx/styled-jsx-tests.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import css from 'styled-jsx/css';
+import * as css from 'styled-jsx/css';
 import flushToReact, { flushToHTML } from 'styled-jsx/server';
 
 const styled = (

From 542bf50d12aa8c5206817a59716b1879344a868b Mon Sep 17 00:00:00 2001
From: Sebastian Schocke <sschocke@mweb.co.za>
Date: Wed, 11 Apr 2018 20:53:29 +0200
Subject: [PATCH 1214/1382] Update Html2CanvasOptions accordingly for v1.0
 (#24761)

Update Html2CanvasOptions to reflect the available options according to documentation on http://html2canvas.hertzen.com/configuration/ on version 1.0
---
 types/html2canvas/index.d.ts | 62 ++++++++++++++++++++++++++++--------
 1 file changed, 49 insertions(+), 13 deletions(-)

diff --git a/types/html2canvas/index.d.ts b/types/html2canvas/index.d.ts
index dbc38f44bc..4fcfd81338 100644
--- a/types/html2canvas/index.d.ts
+++ b/types/html2canvas/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for html2canvas.js 0.5
+// Type definitions for html2canvas.js 1.0-alpha
 // Project: https://github.com/niklasvh/html2canvas
-// Definitions by: Richard Hepburn <https://github.com/rwhepburn>, Pei-Tang Huang <https://github.com/tan9>
+// Definitions by: Richard Hepburn <https://github.com/rwhepburn>, Pei-Tang Huang <https://github.com/tan9>, Sebastian Schocke <https://github.com/sschocke>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -8,15 +8,27 @@
 
 declare namespace Html2Canvas {
     interface Html2CanvasOptions {
+        /** Whether to parse and render the element asynchronously */
+        async?: boolean;
+
         /** Whether to allow cross-origin images to taint the canvas */
         allowTaint?: boolean;
 
         /** Canvas background color, if none is specified in DOM. Set undefined for transparent */
-        background?: string;
+        backgroundColor?: string;
 
-        /** Define the heigt of the canvas in pixels. If null, renders with full height of the window. */
-        height?: number;
+        /** Existing canvas element to use as a base for drawing on */
+        canvas?: any;
 
+        /** Whether to use ForeignObject rendering if the browser supports it */
+        foreignObjectRendering?: boolean;
+        
+        /** Predicate function which removes the matching elements from the render. */
+        ignoreElements?: (element: HTMLElement) => boolean;
+        
+        /** Timeout for loading images, in milliseconds. Setting it to 0 will result in no timeout. */
+        imageTimeout?: number;
+        
         /** Whether to render each letter seperately. Necessary if letter-spacing is used. */
         letterRendering?: boolean;
 
@@ -26,20 +38,44 @@ declare namespace Html2Canvas {
         /** Url to the proxy which is to be used for loading cross-origin images. If left empty, cross-origin images won't be loaded. */
         proxy?: string;
 
+        /** Whether to cleanup the cloned DOM elements html2canvas creates temporarily */
+        removeContainer?: boolean;
+
+        /** The scale to use for rendering. Defaults to the browsers device pixel ratio. */
+        scale?: number;
+
+        /** Use svg powered rendering where available (FF11+). */
+        svgRendering?: boolean;
+        
         /** Whether to test each image if it taints the canvas before drawing them */
         taintTest?: boolean;
 
-        /** Timeout for loading images, in milliseconds. Setting it to 0 will result in no timeout. */
-        timeout?: number;
-
-        /** Define the width of the canvas in pixels. If null, renders with full width of the window. */
-        width?: number;
-
         /** Whether to attempt to load cross-origin images as CORS served, before reverting back to proxy. */
         useCORS?: boolean;
 
-        /** Use svg powered rendering where available (FF11+). */
-        svgRendering?: boolean;
+        /** Define the width of the canvas in pixels. If null, renders with full width of the window. */
+        width?: number;
+
+        /** Define the heigt of the canvas in pixels. If null, renders with full height of the window. */
+        height?: number;
+
+        /** Crop canvas x-coordinate */
+        x?: number;
+
+        /** Crop canvas y-coordinate */
+        y?: number;
+
+        /** The x-scroll position to used when rendering element, (for example if the Element uses position: fixed ) */
+        scrollX?: number;
+
+        /** The y-scroll position to used when rendering element, (for example if the Element uses position: fixed ) */
+        scrollY?: number;
+
+        /** Window width to use when rendering Element, which may affect things like Media queries */
+        windowWidth?: number;
+
+        /** Window height to use when rendering Element, which may affect things like Media queries */
+        windowHeight?: number;
     }
 }
 

From 6e26904116b72aeb5debdcaa674edd4d5c0811f1 Mon Sep 17 00:00:00 2001
From: Anthony Ciccarello <aciccarello@users.noreply.github.com>
Date: Wed, 11 Apr 2018 12:57:04 -0600
Subject: [PATCH 1215/1382] use npm export syntax in adal-angular (#24727)

* (adal-angular) export AuthenticationContext as module

* add adal-angular properties and tests

* add adal-angular properties and tests

* add response type property

* fix testing errors

* add esModuleInterop support
---
 types/adal-angular/adal-angular-tests.ts |  20 +-
 types/adal-angular/index.d.ts            | 381 ++++++++++++++---------
 types/adal-angular/tsconfig.json         |   5 +-
 3 files changed, 256 insertions(+), 150 deletions(-)

diff --git a/types/adal-angular/adal-angular-tests.ts b/types/adal-angular/adal-angular-tests.ts
index 272591d56e..81293de159 100644
--- a/types/adal-angular/adal-angular-tests.ts
+++ b/types/adal-angular/adal-angular-tests.ts
@@ -1,10 +1,6 @@
-import AuthenticationContext, {
-    AuthenticationContextOptions,
-    TokenCallback,
-    UserCallback
-} from "adal-angular";
+import AuthenticationContext = require("adal-angular");
 
-const onLogin: TokenCallback = (errorDescription, idToken, error) => {
+const onLogin: AuthenticationContext.TokenCallback = (errorDescription, idToken, error) => {
     if (error) {
         console.error(errorDescription, error);
         return;
@@ -14,7 +10,7 @@ const onLogin: TokenCallback = (errorDescription, idToken, error) => {
     }
 };
 
-const onToken: TokenCallback = (errorDesc, token, error) => {
+const onToken: AuthenticationContext.TokenCallback = (errorDesc, token, error) => {
     if (error) {
         console.error(error);
         return;
@@ -22,7 +18,7 @@ const onToken: TokenCallback = (errorDesc, token, error) => {
     console.log('Making request with token:', token);
 };
 
-const onUser: UserCallback = (error, user) => {
+const onUser: AuthenticationContext.UserCallback = (error, user) => {
     if (error) {
         console.error(error);
         return;
@@ -57,7 +53,7 @@ const acquireAnAccessToken = () => {
     );
 };
 
-const config: AuthenticationContextOptions = {
+const config: AuthenticationContext.Options = {
     clientId: "7cee0f68-5051-41f6-9e45-80463d21d65d",
     redirectUri: "http://localhost:16969/",
     instance: "https://login.microsoftonline.com/",
@@ -70,6 +66,7 @@ const config: AuthenticationContextOptions = {
 };
 
 const authenticationContext = new AuthenticationContext(config);
+window.Logging.level = authenticationContext.CONSTANTS.LOGGING_LEVEL.ERROR;
 
 if (authenticationContext.isCallback(window.location.hash)) {
     authenticationContext.handleWindowCallback();
@@ -79,6 +76,11 @@ if (authenticationContext.isCallback(window.location.hash)) {
     acquireAnAccessToken();
 }
 
+const injectedContext = AuthenticationContext.inject({
+    clientId: "7cee0f68-5051-41f6-9e45-80463d21d65d",
+});
+injectedContext.handleWindowCallback();
+
 setTimeout(() => {
     authenticationContext.logOut();
 }, 60000);
diff --git a/types/adal-angular/index.d.ts b/types/adal-angular/index.d.ts
index 00dc813ee8..ea4963b6d2 100644
--- a/types/adal-angular/index.d.ts
+++ b/types/adal-angular/index.d.ts
@@ -1,142 +1,28 @@
 // Type definitions for adal-angular 1.0
 // Project: https://github.com/AzureAD/azure-activedirectory-library-for-js#readme
 // Definitions by: Daniel Perez Alvarez <https://github.com/unindented>
+//                 Anthony Ciccarello <https://github.com/aciccarello>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-export enum LoggingLevel {
-    ERROR = 0,
-    WARNING = 1,
-    INFO = 2,
-    VERBOSE = 3
-}
+// In module contexts the class constructor function is the exported object
+export = AuthenticationContext;
 
-export type RequestType = "LOGIN" | "RENEW_TOKEN" | "UNKNOWN";
+// This class is defined globally in not in a module context
+declare class AuthenticationContext {
+    instance: string;
+    config: AuthenticationContext.Options;
+    callback: AuthenticationContext.TokenCallback;
+    popUp: boolean;
+    isAngular: boolean;
 
-export type ResponseType = "id_token token" | "token";
+    /**
+     * Enum for request type
+     */
+    REQUEST_TYPE: AuthenticationContext.RequestType;
+    RESPONSE_TYPE: AuthenticationContext.ResponseType;
+    CONSTANTS: AuthenticationContext.Constants;
 
-export interface RequestInfo {
-    /**
-     * Object comprising of fields such as id_token/error, session_state, state, e.t.c.
-     */
-    parameters: any;
-    /**
-     * Request type.
-     */
-    requestType: RequestType;
-    /**
-     * Whether state is valid.
-     */
-    stateMatch: boolean;
-    /**
-     * Unique guid used to match the response with the request.
-     */
-    stateResponse: string;
-    /**
-     * Whether `requestType` contains `id_token`, `access_token` or error.
-     */
-    valid: boolean;
-}
-
-export interface UserInfo {
-    /**
-     * Username assigned from UPN or email.
-     */
-    userName: string;
-    /**
-     * Properties parsed from `id_token`.
-     */
-    profile: any;
-}
-
-export type TokenCallback = (
-    errorDesc: string | null,
-    token: string,
-    error: any
-) => void;
-
-export type UserCallback = (errorDesc: string | null, user: UserInfo) => void;
-
-export interface AuthenticationContextOptions {
-    /**
-     * Client ID assigned to your app by Azure Active Directory.
-     */
-    clientId: string;
-    /**
-     * Endpoint at which you expect to receive tokens.Defaults to `window.location.href`.
-     */
-    redirectUri: string;
-    /**
-     * Azure Active Directory instance. Defaults to `https://login.microsoftonline.com/`.
-     */
-    instance?: string;
-    /**
-     * Your target tenant. Defaults to `common`.
-     */
-    tenant?: string;
-    /**
-     * Query parameters to add to the authentication request.
-     */
-    extraQueryParameter?: string;
-    /**
-     * Unique identifier used to map the request with the response. Defaults to RFC4122 version 4 guid (128 bits).
-     */
-    correlationId?: string;
-    /**
-     * User defined function of handling the navigation to Azure AD authorization endpoint in case of login.
-     */
-    displayCall?: (url: string) => void;
-    /**
-     * Set this to true to enable login in a popup winodow instead of a full redirect. Defaults to `false`.
-     */
-    popUp?: boolean;
-    /**
-     * Set this to the resource to request on login. Defaults to `clientId`.
-     */
-    loginResource?: string;
-    /**
-     * Set this to redirect the user to a custom login page.
-     */
-    localLoginUrl?: string;
-    /**
-     * Redirects to start page after login. Defaults to `true`.
-     */
-    navigateToLoginRequestUrl?: boolean;
-    /**
-     * Set this to redirect the user to a custom logout page.
-     */
-    logOutUri?: string;
-    /**
-     * Redirects the user to postLogoutRedirectUri after logout. Defaults to `redirectUri`.
-     */
-    postLogoutRedirectUri?: string;
-    /**
-     * Sets browser storage to either 'localStorage' or sessionStorage'. Defaults to `sessionStorage`.
-     */
-    cacheLocation?: "localStorage" | "sessionStorage";
-    /**
-     * Array of keywords or URIs. Adal will attach a token to outgoing requests that have these keywords or URIs.
-     */
-    endpoints?: { [resource: string]: string };
-    /**
-     * Array of keywords or URIs. Adal will not attach a token to outgoing requests that have these keywords or URIs.
-     */
-    anonymousEndpoints?: string[];
-    /**
-     * If the cached token is about to be expired in the expireOffsetSeconds (in seconds), Adal will renew the token instead of using the cached token. Defaults to 300 seconds.
-     */
-    expireOffsetSeconds?: number;
-    /**
-     * The number of milliseconds of inactivity before a token renewal response from AAD should be considered timed out. Defaults to 6 seconds.
-     */
-    loadFrameTimeout?: number;
-    /**
-     * Callback to be invoked when a token is acquired.
-     */
-    callback?: TokenCallback;
-}
-
-export default class AuthenticationContext {
-    constructor(options: AuthenticationContextOptions);
+    constructor(options: AuthenticationContext.Options);
     /**
      * Initiates the login process by redirecting the user to Azure AD authorization endpoint.
      */
@@ -153,7 +39,7 @@ export default class AuthenticationContext {
     /**
      * If user object exists, returns it. Else creates a new user object by decoding `id_token` from the cache.
      */
-    getCachedUser(): UserInfo;
+    getCachedUser(): AuthenticationContext.UserInfo;
     /**
      * Adds the passed callback to the array of callbacks for the specified resource.
      * @param resource A URI that identifies the resource for which the token is requested.
@@ -163,14 +49,14 @@ export default class AuthenticationContext {
     registerCallback(
         expectedState: string,
         resource: string,
-        callback: TokenCallback
+        callback: AuthenticationContext.TokenCallback
     ): void;
     /**
      * Acquires token from the cache if it is not expired. Otherwise sends request to AAD to obtain a new token.
      * @param resource Resource URI identifying the target resource.
      * @param callback The callback provided by the caller. It will be called with token or error.
      */
-    acquireToken(resource: string, callback: TokenCallback): void;
+    acquireToken(resource: string, callback: AuthenticationContext.TokenCallback): void;
     /**
      * Acquires token (interactive flow using a popup window) by sending request to AAD to obtain a new token.
      * @param resource Resource URI identifying the target resource.
@@ -182,7 +68,7 @@ export default class AuthenticationContext {
         resource: string,
         extraQueryParameters: string | null | undefined,
         claims: string | null | undefined,
-        callback: TokenCallback
+        callback: AuthenticationContext.TokenCallback
     ): void;
     /**
      * Acquires token (interactive flow using a redirect) by sending request to AAD to obtain a new token. In this case the callback passed in the authentication request constructor will be called.
@@ -217,7 +103,7 @@ export default class AuthenticationContext {
      * Calls the passed in callback with the user object or error message related to the user.
      * @param callback The callback provided by the caller. It will be called with user or error.
      */
-    getUser(callback: UserCallback): void;
+    getUser(callback: AuthenticationContext.UserCallback): void;
     /**
      * Checks if the URL fragment contains access token, id token or error description.
      * @param hash Hash passed from redirect page.
@@ -230,11 +116,11 @@ export default class AuthenticationContext {
     /**
      * Creates a request info object from the URL fragment and returns it.
      */
-    getRequestInfo(hash: string): RequestInfo;
+    getRequestInfo(hash: string): AuthenticationContext.RequestInfo;
     /**
      * Saves token or error received in the response from AAD in the cache. In case of `id_token`, it also creates the user object.
      */
-    saveTokenFromHash(requestInfo: RequestInfo): void;
+    saveTokenFromHash(requestInfo: AuthenticationContext.RequestInfo): void;
     /**
      * Gets resource for given endpoint if mapping is provided with config.
      * @param endpoint Resource URI identifying the target resource.
@@ -252,7 +138,7 @@ export default class AuthenticationContext {
      * @param message Message to log.
      * @param error Error to log.
      */
-    log(level: LoggingLevel, message: string, error: any): void;
+    log(level: AuthenticationContext.LoggingLevel, message: string, error: any): void;
     /**
      * Logs messages when logging level is set to 0.
      * @param message Message to log.
@@ -274,4 +160,221 @@ export default class AuthenticationContext {
      * @param message Message to log.
      */
     verbose(message: string): void;
+
+    /**
+     * Logs Pii messages when Logging Level is set to 0 and window.piiLoggingEnabled is set to true.
+     * @param message Message to log.
+     * @param error Error to log.
+     */
+    errorPii(message: string, error: any): void;
+
+    /**
+     * Logs  Pii messages when Logging Level is set to 1 and window.piiLoggingEnabled is set to true.
+     * @param message Message to log.
+     */
+    warnPii(message: string): void;
+
+    /**
+     * Logs messages when Logging Level is set to 2 and window.piiLoggingEnabled is set to true.
+     * @param message Message to log.
+     */
+    infoPii(message: string): void;
+
+    /**
+     * Logs messages when Logging Level is set to 3 and window.piiLoggingEnabled is set to true.
+     * @param message Message to log.
+     */
+    verbosePii(message: string): void;
+}
+
+declare namespace AuthenticationContext {
+    function inject(config: Options): AuthenticationContext;
+
+    type LoggingLevel = 0 | 1 | 2 | 3;
+
+    type RequestType = "LOGIN" | "RENEW_TOKEN" | "UNKNOWN";
+
+    type ResponseType = "id_token token" | "token";
+
+    interface RequestInfo {
+        /**
+         * Object comprising of fields such as id_token/error, session_state, state, e.t.c.
+         */
+        parameters: any;
+        /**
+         * Request type.
+         */
+        requestType: RequestType;
+        /**
+         * Whether state is valid.
+         */
+        stateMatch: boolean;
+        /**
+         * Unique guid used to match the response with the request.
+         */
+        stateResponse: string;
+        /**
+         * Whether `requestType` contains `id_token`, `access_token` or error.
+         */
+        valid: boolean;
+    }
+
+    interface UserInfo {
+        /**
+         * Username assigned from UPN or email.
+         */
+        userName: string;
+        /**
+         * Properties parsed from `id_token`.
+         */
+        profile: any;
+    }
+
+    type TokenCallback = (
+        errorDesc: string | null,
+        token: string | null,
+        error: any
+    ) => void;
+
+    type UserCallback = (errorDesc: string | null, user: UserInfo | null) => void;
+
+    /**
+     * Configuration options for Authentication Context
+     */
+    interface Options {
+        /**
+         * Client ID assigned to your app by Azure Active Directory.
+         */
+        clientId: string;
+        /**
+         * Endpoint at which you expect to receive tokens.Defaults to `window.location.href`.
+         */
+        redirectUri?: string;
+        /**
+         * Azure Active Directory instance. Defaults to `https://login.microsoftonline.com/`.
+         */
+        instance?: string;
+        /**
+         * Your target tenant. Defaults to `common`.
+         */
+        tenant?: string;
+        /**
+         * Query parameters to add to the authentication request.
+         */
+        extraQueryParameter?: string;
+        /**
+         * Unique identifier used to map the request with the response. Defaults to RFC4122 version 4 guid (128 bits).
+         */
+        correlationId?: string;
+        /**
+         * User defined function of handling the navigation to Azure AD authorization endpoint in case of login.
+         */
+        displayCall?: (url: string) => void;
+        /**
+         * Set this to true to enable login in a popup winodow instead of a full redirect. Defaults to `false`.
+         */
+        popUp?: boolean;
+        /**
+         * Set this to the resource to request on login. Defaults to `clientId`.
+         */
+        loginResource?: string;
+        /**
+         * Set this to redirect the user to a custom login page.
+         */
+        localLoginUrl?: string;
+        /**
+         * Redirects to start page after login. Defaults to `true`.
+         */
+        navigateToLoginRequestUrl?: boolean;
+        /**
+         * Set this to redirect the user to a custom logout page.
+         */
+        logOutUri?: string;
+        /**
+         * Redirects the user to postLogoutRedirectUri after logout. Defaults to `redirectUri`.
+         */
+        postLogoutRedirectUri?: string;
+        /**
+         * Sets browser storage to either 'localStorage' or sessionStorage'. Defaults to `sessionStorage`.
+         */
+        cacheLocation?: "localStorage" | "sessionStorage";
+        /**
+         * Array of keywords or URIs. Adal will attach a token to outgoing requests that have these keywords or URIs.
+         */
+        endpoints?: { [resource: string]: string };
+        /**
+         * Array of keywords or URIs. Adal will not attach a token to outgoing requests that have these keywords or URIs.
+         */
+        anonymousEndpoints?: string[];
+        /**
+         * If the cached token is about to be expired in the expireOffsetSeconds (in seconds), Adal will renew the token instead of using the cached token. Defaults to 300 seconds.
+         */
+        expireOffsetSeconds?: number;
+        /**
+         * The number of milliseconds of inactivity before a token renewal response from AAD should be considered timed out. Defaults to 6 seconds.
+         */
+        loadFrameTimeout?: number;
+        /**
+         * Callback to be invoked when a token is acquired.
+         */
+        callback?: TokenCallback;
+    }
+
+    interface LoggingConfig {
+        level: LoggingLevel;
+        log: (message: string) => void;
+        piiLoggingEnabled: boolean;
+    }
+
+    /**
+     * Enum for storage constants
+     */
+    interface Constants {
+        ACCESS_TOKEN: 'access_token';
+        EXPIRES_IN: 'expires_in';
+        ID_TOKEN: 'id_token';
+        ERROR_DESCRIPTION: 'error_description';
+        SESSION_STATE: 'session_state';
+        STORAGE: {
+            TOKEN_KEYS: 'adal.token.keys';
+            ACCESS_TOKEN_KEY: 'adal.access.token.key';
+            EXPIRATION_KEY: 'adal.expiration.key';
+            STATE_LOGIN: 'adal.state.login';
+            STATE_RENEW: 'adal.state.renew';
+            NONCE_IDTOKEN: 'adal.nonce.idtoken';
+            SESSION_STATE: 'adal.session.state';
+            USERNAME: 'adal.username';
+            IDTOKEN: 'adal.idtoken';
+            ERROR: 'adal.error';
+            ERROR_DESCRIPTION: 'adal.error.description';
+            LOGIN_REQUEST: 'adal.login.request';
+            LOGIN_ERROR: 'adal.login.error';
+            RENEW_STATUS: 'adal.token.renew.status';
+        };
+        RESOURCE_DELIMETER: '|';
+        LOADFRAME_TIMEOUT: '6000';
+        TOKEN_RENEW_STATUS_CANCELED: 'Canceled';
+        TOKEN_RENEW_STATUS_COMPLETED: 'Completed';
+        TOKEN_RENEW_STATUS_IN_PROGRESS: 'In Progress';
+        LOGGING_LEVEL: {
+            ERROR: 0;
+            WARN: 1;
+            INFO: 2;
+            VERBOSE: 3;
+        };
+        LEVEL_STRING_MAP: {
+            0: 'ERROR:';
+            1: 'WARNING:';
+            2: 'INFO:';
+            3: 'VERBOSE:';
+        };
+        POPUP_WIDTH: 483;
+        POPUP_HEIGHT: 600;
+    }
+}
+
+declare global {
+    interface Window {
+        Logging: AuthenticationContext.LoggingConfig;
+    }
 }
diff --git a/types/adal-angular/tsconfig.json b/types/adal-angular/tsconfig.json
index 9052e3fc04..f297baa423 100644
--- a/types/adal-angular/tsconfig.json
+++ b/types/adal-angular/tsconfig.json
@@ -15,10 +15,11 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true
+        "forceConsistentCasingInFileNames": true,
+        "esModuleInterop": true
     },
     "files": [
         "index.d.ts",
         "adal-angular-tests.ts"
     ]
-}
\ No newline at end of file
+}

From ddfe9e664bf4e02aa5bae824253d7fecdc9efe62 Mon Sep 17 00:00:00 2001
From: Joscha Feth <joscha@feth.com>
Date: Thu, 12 Apr 2018 04:58:06 +1000
Subject: [PATCH 1216/1382] @storybook/addon-knobs: groupId (#24797)

* @storybook/addon-knobs: groupId

* no spaces

* Update index.d.ts

* Update index.d.ts

* Update index.d.ts
---
 types/storybook__addon-knobs/index.d.ts       | 31 ++++++++++++-------
 .../storybook__addon-knobs-tests.tsx          | 15 +++++++++
 2 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/types/storybook__addon-knobs/index.d.ts b/types/storybook__addon-knobs/index.d.ts
index c129c5f574..3c9bbe0fc4 100644
--- a/types/storybook__addon-knobs/index.d.ts
+++ b/types/storybook__addon-knobs/index.d.ts
@@ -25,28 +25,37 @@ export interface NumberOptions {
     step: number;
 }
 
+export interface EmptyNumberOptions {
+    range?: undefined;
+    min?: undefined;
+    max?: undefined;
+    step?: undefined;
+}
+
 export function knob<T>(name: string, options: KnobOption<T>): T;
 
-export function text(name: string, value: string | null): string;
+export function text(name: string, value: string | null, groupId?: string): string;
 
-export function boolean(name: string, value: boolean): boolean;
+export function boolean(name: string, value: boolean, groupId?: string): boolean;
 
-export function number(name: string, value: number, options?: NumberOptions): number;
+export function files(label: string, accept: string, defaultValue: string[]): string[];
 
-export function color(name: string, value: string): string;
+export function number(name: string, value: number, options?: NumberOptions | EmptyNumberOptions, groupId?: string): number;
 
-export function object<T>(name: string, value: T): T;
+export function color(name: string, value: string, groupId?: string): string;
+
+export function object<T>(name: string, value: T, groupId?: string): T;
 
 export type SelectValue = string | number;
-export function select<T extends string>(name: string, options: { [s: string]: string }, value: T): T;
-export function select<T extends number>(name: string, options: { [s: number]: string }, value: T): T;
-export function select<T extends SelectValue>(name: string, options: T[], value: T): T;
+export function select<T extends string>(name: string, options: { [s: string]: string }, value: T, groupId?: string): T;
+export function select<T extends number>(name: string, options: { [s: number]: string }, value: T, groupId?: string): T;
+export function select<T extends SelectValue>(name: string, options: T[], value: T, groupId?: string): T;
 
-export function date(name: string, value?: Date): Date;
+export function date(name: string, value?: Date, groupId?: string): Date;
 
-export function array<T>(name: string, value: T[], separator?: string): T[];
+export function array<T>(name: string, value: T[], separator?: string, groupId?: string): T[];
 
-export function button(name: string, handler: () => any): void;
+export function button(name: string, handler: () => any, groupId?: string): void;
 
 export interface WrapStoryProps {
     context?: object;
diff --git a/types/storybook__addon-knobs/storybook__addon-knobs-tests.tsx b/types/storybook__addon-knobs/storybook__addon-knobs-tests.tsx
index 18d8d0a29e..c35268ac6b 100644
--- a/types/storybook__addon-knobs/storybook__addon-knobs-tests.tsx
+++ b/types/storybook__addon-knobs/storybook__addon-knobs-tests.tsx
@@ -5,6 +5,7 @@ import {
   withKnobsOptions,
   number,
   color,
+  files,
   object,
   boolean,
   text,
@@ -88,3 +89,17 @@ stories.add('dynamic knobs', () => {
     </div>
   );
 });
+
+// groups
+const groupId = 'GROUP-ID1';
+
+text('label', 'default', groupId);
+boolean('label', true, groupId);
+number('label', 1, {}, groupId);
+color('label', '#ffffff', groupId);
+object('label', {}, groupId);
+array('label', [], ',', groupId);
+select<any>('label', { option: 'Option' }, null, groupId);
+files('label', 'image/*', []);
+date('label', new Date(), groupId);
+button('label', () => undefined, groupId);

From 47ba52eb87852c82cd6275dfd90ba8e4664bd444 Mon Sep 17 00:00:00 2001
From: DonatienCorrea <donatien.correa@altirnao.com>
Date: Wed, 11 Apr 2018 20:58:19 +0200
Subject: [PATCH 1217/1382] [google.picker] Add setMaxItems method to the
 PickerBuilder (#24896)

---
 types/google.picker/index.d.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/types/google.picker/index.d.ts b/types/google.picker/index.d.ts
index 851697cb32..b5fc91404d 100644
--- a/types/google.picker/index.d.ts
+++ b/types/google.picker/index.d.ts
@@ -47,6 +47,9 @@ declare namespace google {
             // ISO 639 language code. If the language is not supported, en-US is used. This method provides an alternative to setting the locale at google.load() time. See the Developer's Guide for a list of supported locales.
             setLocale(locale:string):PickerBuilder;
 
+            // Sets the maximum number of items a user can pick.
+            setMaxItems(max: number):PickerBuilder;
+
             // Sets an OAuth token to use for authenticating the current user. Depending on the scope of the token, only certain views will display data. Valid scopes are Google Docs, Drive, Photos, YouTube.
             setOAuthToken(token:string):PickerBuilder;
 

From 8ad05d59bce4a57668398f0b385af054f2bb06d8 Mon Sep 17 00:00:00 2001
From: ThierryLehoux <thierry.lehoux@gmail.com>
Date: Wed, 11 Apr 2018 20:58:38 +0200
Subject: [PATCH 1218/1382] express-winston: add the boolean meta option of the
 logger in the d.ts (#24842)

---
 .../express-winston/express-winston-tests.ts  | 19 ++++++++++---------
 types/express-winston/index.d.ts              | 11 ++++++-----
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/types/express-winston/express-winston-tests.ts b/types/express-winston/express-winston-tests.ts
index 297b7afc49..b64bce0b3e 100644
--- a/types/express-winston/express-winston-tests.ts
+++ b/types/express-winston/express-winston-tests.ts
@@ -7,18 +7,19 @@ const app = express();
 // Logger with all options
 app.use(expressWinston.logger({
   baseMeta: { foo: 'foo' },
-  bodyBlacklist: [ 'foo' ],
-  bodyWhitelist: [ 'bar' ],
+  bodyBlacklist: ['foo'],
+  bodyWhitelist: ['bar'],
   colorize: true,
   dynamicMeta: (req, res, err) => ({ foo: 'bar' }),
   expressFormat: true,
   ignoreRoute: (req, res) => true,
-  ignoredRoutes: [ 'foo' ],
+  ignoredRoutes: ['foo'],
   level: 'level',
+  meta: true,
   metaField: 'metaField',
   msg: 'msg',
   requestFilter: (req, prop) => true,
-  requestWhitelist: [ 'foo', 'bar' ],
+  requestWhitelist: ['foo', 'bar'],
   skip: (req, res) => false,
   statusLevels: ({ error: 'error', success: 'success', warn: 'warn' }),
   transports: [
@@ -52,7 +53,7 @@ app.use(expressWinston.errorLogger({
   metaField: 'metaField',
   msg: 'msg',
   requestFilter: (req, prop) => true,
-  requestWhitelist: [ 'foo', 'bar' ],
+  requestWhitelist: ['foo', 'bar'],
   transports: [
     new winston.transports.Console({
       json: true,
@@ -87,8 +88,8 @@ expressWinston.responseWhitelist.push('body');
 const router = express.Router();
 
 router.post('/user/register', (req, res, next) => {
-    const expressWinstonReq = req as expressWinston.ExpressWinstonRequest;
-    expressWinstonReq._routeWhitelists.body = [ 'username', 'email', 'age' ];
-    expressWinstonReq._routeWhitelists.req = [ 'userId' ];
-    expressWinstonReq._routeWhitelists.res = [ '_headers' ];
+  const expressWinstonReq = req as expressWinston.ExpressWinstonRequest;
+  expressWinstonReq._routeWhitelists.body = ['username', 'email', 'age'];
+  expressWinstonReq._routeWhitelists.req = ['userId'];
+  expressWinstonReq._routeWhitelists.res = ['_headers'];
 });
diff --git a/types/express-winston/index.d.ts b/types/express-winston/index.d.ts
index 21e7ead653..920939abd6 100644
--- a/types/express-winston/index.d.ts
+++ b/types/express-winston/index.d.ts
@@ -26,6 +26,7 @@ export interface BaseLoggerOptions {
   ignoreRoute?: RouteFilter;
   ignoredRoutes?: string[];
   level?: string;
+  meta?: boolean;
   metaField?: string;
   msg?: string;
   requestFilter?: RequestFilter;
@@ -91,9 +92,9 @@ export let defaultResponseFilter: ResponseFilter;
 export function defaultSkip(): boolean;
 
 export interface ExpressWinstonRequest extends Request {
-    _routeWhitelists: {
-        body: string[];
-        req: string[];
-        res: string[];
-    };
+  _routeWhitelists: {
+    body: string[];
+    req: string[];
+    res: string[];
+  };
 }

From 66b655cb716a907480f257762608c29996caba7a Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 11 Apr 2018 20:59:03 +0200
Subject: [PATCH 1219/1382] fix: make `spyOn` typesafe with `keyof` (#24912)

---
 types/jest/index.d.ts    | 2 +-
 types/jest/jest-tests.ts | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/types/jest/index.d.ts b/types/jest/index.d.ts
index 3dc26955e6..4520247216 100644
--- a/types/jest/index.d.ts
+++ b/types/jest/index.d.ts
@@ -560,7 +560,7 @@ declare namespace jest {
 // Relevant parts of Jasmine's API are below so they can be changed and removed over time.
 // This file can't reference jasmine.d.ts since the globals aren't compatible.
 
-declare function spyOn(object: any, method: string): jasmine.Spy;
+declare function spyOn<T>(object: T, method: keyof T): jasmine.Spy;
 /**
  * If you call the function pending anywhere in the spec body,
  * no matter the expectations, the spec will be marked pending.
diff --git a/types/jest/jest-tests.ts b/types/jest/jest-tests.ts
index 786dccb641..a90a7a9e5a 100644
--- a/types/jest/jest-tests.ts
+++ b/types/jest/jest-tests.ts
@@ -367,6 +367,11 @@ describe('missing tests', () => {
         expect(mock.getMockName()).toBe('Carrot');
     });
 
+    it('tests mock name functionality', () => {
+        const mock = spyOn(console, 'warn');
+        expect(mock).toHaveBeenCalled();
+    });
+
     it('creates snapshoter', () => {
        jest.disableAutomock().mock('./render', () => jest.fn((): string => "{Link to: \"facebook\"}"), { virtual: true });
        const render: () => string = require('./render');

From d22c02790141aebaf78d53da4b6815aabde152d1 Mon Sep 17 00:00:00 2001
From: Justin Rockwood <rockwood@cs.stanford.edu>
Date: Wed, 11 Apr 2018 11:59:19 -0700
Subject: [PATCH 1220/1382] fix(fs-extra): copy can take an async filter
 function (#24888)

---
 types/fs-extra/fs-extra-tests.ts |  2 +-
 types/fs-extra/index.d.ts        | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/types/fs-extra/fs-extra-tests.ts b/types/fs-extra/fs-extra-tests.ts
index 50d594e1a4..dbe48cf971 100644
--- a/types/fs-extra/fs-extra-tests.ts
+++ b/types/fs-extra/fs-extra-tests.ts
@@ -48,7 +48,7 @@ fs.copy(src, dest,
 	{
 		overwrite: true,
 		preserveTimestamps: true,
-		filter: (src: string, dest: string) => false
+		filter: (src: string, dest: string) => Promise.resolve(false)
 	},
 	errorCallback
 );
diff --git a/types/fs-extra/index.d.ts b/types/fs-extra/index.d.ts
index 6183dce393..adf236955b 100644
--- a/types/fs-extra/index.d.ts
+++ b/types/fs-extra/index.d.ts
@@ -3,7 +3,8 @@
 // Definitions by: Alan Agius <https://github.com/alan-agius4>,
 //                 midknight41 <https://github.com/midknight41>,
 //                 Brendan Forster <https://github.com/shiftkey>,
-//                 Mees van Dijk <https://github.com/mees->
+//                 Mees van Dijk <https://github.com/mees->,
+//                 Justin Rockwood <https://github.com/jrockwood>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -16,7 +17,7 @@ export * from "fs";
 export function copy(src: string, dest: string, options?: CopyOptions): Promise<void>;
 export function copy(src: string, dest: string, callback: (err: Error) => void): void;
 export function copy(src: string, dest: string, options: CopyOptions, callback: (err: Error) => void): void;
-export function copySync(src: string, dest: string, options?: CopyOptions): void;
+export function copySync(src: string, dest: string, options?: CopyOptionsSync): void;
 
 export function move(src: string, dest: string, options?: MoveOptions): Promise<void>;
 export function move(src: string, dest: string, callback: (err: Error) => void): void;
@@ -254,7 +255,8 @@ export interface PathEntryStream {
     read(): PathEntry | null;
 }
 
-export type CopyFilter = (src: string, dest: string) => boolean;
+export type CopyFilterSync = (src: string, dest: string) => boolean;
+export type CopyFilterAsync = (src: string, dest: string) => Promise<boolean>;
 
 export type SymlinkType = "dir" | "file";
 
@@ -263,10 +265,14 @@ export interface CopyOptions {
     overwrite?: boolean;
     preserveTimestamps?: boolean;
     errorOnExist?: boolean;
-    filter?: CopyFilter;
+    filter?: CopyFilterSync | CopyFilterAsync;
     recursive?: boolean;
 }
 
+export interface CopyOptionsSync extends CopyOptions {
+    filter?: CopyFilterSync;
+}
+
 export interface MoveOptions {
     overwrite?: boolean;
     limit?: number;

From 21d3f1d7f99209af58dbdca79f3d23b2faa39f80 Mon Sep 17 00:00:00 2001
From: Michael Auer <auer@uni-heidelberg.de>
Date: Wed, 11 Apr 2018 20:59:47 +0200
Subject: [PATCH 1221/1382] @types/leaflet enhance return types of
 L.Polyline.getLatLngs() to support nested arrays of LatLng (#24030)

* Update index.d.ts

enhanced possible types of the return value for nested arrays of Polyline or Polygon

* Update index.d.ts

changed "Definitions by" in header section
---
 types/leaflet/index.d.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/leaflet/index.d.ts b/types/leaflet/index.d.ts
index 41b4fbd84c..89f9625114 100644
--- a/types/leaflet/index.d.ts
+++ b/types/leaflet/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/Leaflet/Leaflet
 // Definitions by: Alejandro Sánchez <https://github.com/alejo90>
 //                 Arne Schubert <https://github.com/atd-schubert>
+//                 Michael Auer <https://github.com/mcauer>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -611,7 +612,7 @@ export interface PolylineOptions extends PathOptions {
 export class Polyline<T extends geojson.GeometryObject = geojson.LineString | geojson.MultiLineString, P = any> extends Path {
     constructor(latlngs: LatLngExpression[], options?: PolylineOptions);
     toGeoJSON(): geojson.Feature<T, P>;
-    getLatLngs(): LatLng[];
+    getLatLngs(): LatLng[] | LatLng[][] | LatLng[][][];
     setLatLngs(latlngs: LatLngExpression[]): this;
     isEmpty(): boolean;
     getCenter(): LatLng;

From c95f6e951b97e9a6fed7d9cd1555f167e12aa6c1 Mon Sep 17 00:00:00 2001
From: xcq1 <xcq1@users.noreply.github.com>
Date: Wed, 11 Apr 2018 21:06:26 +0200
Subject: [PATCH 1222/1382] Nightwatch: Fix signature of frame (#24897)

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

diff --git a/types/nightwatch/index.d.ts b/types/nightwatch/index.d.ts
index 6d3cc8f4a0..8559f73b10 100644
--- a/types/nightwatch/index.d.ts
+++ b/types/nightwatch/index.d.ts
@@ -1822,7 +1822,7 @@ export interface NightwatchAPI {
      * @param frameId: Identifier for the frame to change focus to.
      * @param callback: Optional callback function to be called when the command finishes.
      */
-    frame(frameId?: string, callback?: () => void): this;
+    frame(frameId: string | undefined | null, callback?: () => void): this;
 
     /**
      * Change focus to the parent context. If the current context is the top level browsing context, the context remains unchanged.

From aca7b39f779f9b319622dc8ffd3922a0fc343bea Mon Sep 17 00:00:00 2001
From: Kalle Ott <kalle.ott@cap3.de>
Date: Wed, 11 Apr 2018 21:07:45 +0200
Subject: [PATCH 1223/1382] typings update to catch up with current version of
 react-virtualized (#24900)

* typings update to catch up with current version of react-virtualized

* fixed lint errors

* fixed ts version

* fixed void return type of defaultProps functions

* changed interface to type for better consistency
---
 .../dist/es/ArrowKeyStepper.d.ts              |  73 ++--
 .../react-virtualized/dist/es/AutoSizer.d.ts  |  58 ++-
 .../dist/es/CellMeasurer.d.ts                 |  93 ++---
 .../react-virtualized/dist/es/Collection.d.ts |  91 +++--
 .../dist/es/ColumnSizer.d.ts                  |  32 +-
 types/react-virtualized/dist/es/Grid.d.ts     | 305 +++++++--------
 .../dist/es/InfiniteLoader.d.ts               |  36 +-
 types/react-virtualized/dist/es/List.d.ts     |  97 ++---
 types/react-virtualized/dist/es/Masonry.d.ts  | 156 ++++----
 .../react-virtualized/dist/es/MultiGrid.d.ts  |  90 ++---
 .../react-virtualized/dist/es/ScrollSync.d.ts |  57 ++-
 types/react-virtualized/dist/es/Table.d.ts    | 360 ++++++++++--------
 .../dist/es/WindowScroller.d.ts               | 104 ++---
 types/react-virtualized/index.d.ts            |  83 ++--
 types/react-virtualized/tsconfig.json         |  14 +-
 15 files changed, 841 insertions(+), 808 deletions(-)

diff --git a/types/react-virtualized/dist/es/ArrowKeyStepper.d.ts b/types/react-virtualized/dist/es/ArrowKeyStepper.d.ts
index 17844914af..2c4f36d7d2 100644
--- a/types/react-virtualized/dist/es/ArrowKeyStepper.d.ts
+++ b/types/react-virtualized/dist/es/ArrowKeyStepper.d.ts
@@ -1,27 +1,28 @@
-import { PureComponent, Validator, Requireable } from 'react'
-import * as PropTypes from 'prop-types'
+import { PureComponent, Validator, Requireable } from "react";
+import * as PropTypes from "prop-types";
+import { RenderedSection } from "./Grid";
 
-export type OnSectionRenderedParams = {
-    columnStartIndex: number,
-    columnStopIndex: number,
-    rowStartIndex: number,
-    rowStopIndex: number
-}
+export type OnSectionRenderedParams = RenderedSection;
 
 export type ChildProps = {
-    onSectionRendered: (params: OnSectionRenderedParams) => void,
-    scrollToColumn: number,
-    scrollToRow: number
+    onSectionRendered: (params: RenderedSection) => void;
+    scrollToColumn: number;
+    scrollToRow: number;
 };
 /**
  * This HOC decorates a virtualized component and responds to arrow-key events by scrolling one row or column at a time.
  */
 export type ArrowKeyStepperProps = {
-    children?: (props: ChildProps) => React.ReactNode;
+    children: (props: ChildProps) => React.ReactNode;
     className?: string;
     columnCount: number;
     rowCount: number;
-    mode?: 'edges' | 'cells';
+    mode?: "edges" | "cells";
+    disabled?: boolean;
+    isControlled?: boolean;
+    onScrollToChange?: (params: ScrollIndices) => void;
+    scrollToColumn?: number;
+    scrollToRow?: number;
     /**
      * PLEASE NOTE
      * The [key: string]: any; line is here on purpose
@@ -30,35 +31,23 @@ export type ArrowKeyStepperProps = {
      * https://github.com/bvaughn/react-virtualized#pass-thru-props
      */
     [key: string]: any;
-}
-export type ScrollIndexes = {
-    scrollToRow: number,
-    scrollToColumn: number
-}
-export class ArrowKeyStepper extends PureComponent<ArrowKeyStepperProps, ScrollIndexes> {
+};
+export type ScrollIndices = {
+    scrollToRow: number;
+    scrollToColumn: number;
+};
+
+export type ScrollIndexes = ScrollIndices;
+
+export class ArrowKeyStepper extends PureComponent<
+    ArrowKeyStepperProps,
+    ScrollIndices
+> {
     static defaultProps: {
-        disabled: false,
-        mode: 'edges',
-        scrollToColumn: 0,
-        scrollToRow: 0
+        disabled: false;
+        isControlled: false;
+        mode: "edges";
+        scrollToColumn: 0;
+        scrollToRow: 0;
     };
-
-    static propTypes: {
-        children: Validator<(props: ChildProps) => React.ReactNode>,
-        className: Requireable<string>,
-        columnCount: Validator<number>,
-        disabled: Validator<boolean>,
-        mode: Validator<'cells' | 'edges'>,
-        rowCount: Validator<number>,
-        scrollToColumn: Validator<number>,
-        scrollToRow: Validator<number>
-    };
-
-    constructor(props: ArrowKeyStepperProps, context: any);
-
-    componentWillReceiveProps(nextProps: ArrowKeyStepperProps): void;
-
-    setScrollIndexes(params: ScrollIndexes): void;
-
-    render(): JSX.Element;
 }
diff --git a/types/react-virtualized/dist/es/AutoSizer.d.ts b/types/react-virtualized/dist/es/AutoSizer.d.ts
index b54fce89e1..d3981f3a16 100644
--- a/types/react-virtualized/dist/es/AutoSizer.d.ts
+++ b/types/react-virtualized/dist/es/AutoSizer.d.ts
@@ -1,12 +1,34 @@
-import { PureComponent, Validator, Requireable } from 'react'
-import * as PropTypes from 'prop-types'
+import { PureComponent, Validator, Requireable } from "react";
+import * as PropTypes from "prop-types";
 
-export type Dimensions = {
-    height: number,
-    width: number
-}
+export type Size = {
+    height: number;
+    width: number;
+};
+export type Dimensions = Size;
 
 export type AutoSizerProps = {
+    /**
+     * Function responsible for rendering children.
+     * This function should implement the following signature:
+     * ({ height, width }) => PropTypes.element
+     */
+    children: (props: Size) => React.ReactNode;
+    /**
+     * 	Optional custom CSS class name to attach to root AutoSizer element.
+     * This is an advanced property and is not typically necessary.
+     */
+    className?: string;
+    /**
+     * Height passed to child for initial render; useful for server-side rendering.
+     * This value will be overridden with an accurate height after mounting.
+     */
+    defaultHeight?: number;
+    /**
+     * Width passed to child for initial render; useful for server-side rendering.
+     * This value will be overridden with an accurate width after mounting.
+     */
+    defaultWidth?: number;
     /** Disable dynamic :height property */
     disableHeight?: boolean;
     /** Disable dynamic :width property */
@@ -14,13 +36,12 @@ export type AutoSizerProps = {
     /** Nonce of the inlined stylesheet for Content Security Policy */
     nonce?: string;
     /** Callback to be invoked on-resize: ({ height, width }) */
-    onResize?: (info: { height: number, width: number }) => any;
+    onResize?: (info: Size) => any;
     /**
-     * Function responsible for rendering children.
-     * This function should implement the following signature:
-     * ({ height, width }) => PropTypes.element
+     * Optional custom inline style to attach to root AutoSizer element.
+     * This is an advanced property and is not typically necessary.
      */
-    children?: (props: Dimensions) => React.ReactNode
+    style?: React.CSSProperties;
     /**
      * PLEASE NOTE
      * The [key: string]: any; line is here on purpose
@@ -35,17 +56,12 @@ export type AutoSizerProps = {
  * Child component should not be declared as a child but should rather be specified by a `ChildComponent` property.
  * All other properties will be passed through to the child component.
  */
-export class AutoSizer extends PureComponent<AutoSizerProps, Dimensions> {
-    static propTypes: {
-        children: Validator<(props: Dimensions) => React.ReactNode>,
-        disableHeight: Requireable<boolean>,
-        disableWidth: Requireable<boolean>,
-        nonce: Validator<string>,
-        onResize: Validator<(props: Dimensions) => any>
-    };
-
+export class AutoSizer extends PureComponent<AutoSizerProps, Size> {
     static defaultProps: {
-        onResize: () => {}
+        onResize: () => void;
+        disableHeight: false;
+        disableWidth: false;
+        style: {};
     };
 
     constructor(props: AutoSizerProps);
diff --git a/types/react-virtualized/dist/es/CellMeasurer.d.ts b/types/react-virtualized/dist/es/CellMeasurer.d.ts
index 46c033ba49..5c56332964 100644
--- a/types/react-virtualized/dist/es/CellMeasurer.d.ts
+++ b/types/react-virtualized/dist/es/CellMeasurer.d.ts
@@ -1,41 +1,42 @@
-import { PureComponent } from 'react'
+import { PureComponent } from "react";
 
-export type KeyMapper = (
-    rowIndex: number,
-    columnIndex: number
-) => any;
+export type CellMeasurerCacheInterface = {
+    hasFixedWidth(): boolean;
+    hasFixedHeight(): boolean;
+    has(rowIndex: number, columnIndex: number): boolean;
+    set(
+        rowIndex: number,
+        columnIndex: number,
+        width: number,
+        height: number
+    ): void;
+    getHeight(rowIndex: number, columnIndex?: number): number;
+    getWidth(rowIndex: number, columnIndex?: number): number;
+};
+
+export type KeyMapper = (rowIndex: number, columnIndex: number) => any;
 
 export type CellMeasurerCacheParams = {
-    defaultHeight?: number,
-    defaultWidth?: number,
-    fixedHeight?: boolean,
-    fixedWidth?: boolean,
-    minHeight?: number,
-    minWidth?: number,
-    keyMapper?: KeyMapper
-}
-export class CellMeasurerCache {
-    constructor(params: CellMeasurerCacheParams);
-    clear(
-        rowIndex: number,
-        columnIndex: number
-    ): void;
+    defaultHeight?: number;
+    defaultWidth?: number;
+    fixedHeight?: boolean;
+    fixedWidth?: boolean;
+    minHeight?: number;
+    minWidth?: number;
+    keyMapper?: KeyMapper;
+};
+export class CellMeasurerCache implements CellMeasurerCacheInterface {
+    constructor(params?: CellMeasurerCacheParams);
+    clear(rowIndex: number, columnIndex: number): void;
     clearAll(): void;
     columnWidth: (params: { index: number }) => number | undefined;
+    readonly defaultHeight: number;
+    readonly defaultWidth: number;
     hasFixedHeight(): boolean;
     hasFixedWidth(): boolean;
-    getHeight(
-        rowIndex: number,
-        columnIndex: number
-    ): number | undefined;
-    getWidth(
-        rowIndex: number,
-        columnIndex: number
-    ): number | undefined;
-    has(
-        rowIndex: number,
-        columnIndex: number
-    ): boolean;
+    getHeight(rowIndex: number, columnIndex: number): number | undefined;
+    getWidth(rowIndex: number, columnIndex: number): number | undefined;
+    has(rowIndex: number, columnIndex: number): boolean;
     rowHeight: (params: { index: number }) => number | undefined;
     set(
         rowIndex: number,
@@ -45,12 +46,24 @@ export class CellMeasurerCache {
     ): void;
 }
 
+export type CellPosition = {
+    columnIndex: number;
+    rowIndex: number;
+};
+
+export type MeasuredCellParent = {
+    invalidateCellSizeAfterRender?: (cell: CellPosition) => void;
+    recomputeGridSize?: (cell: CellPosition) => void;
+};
+
 export type CellMeasurerProps = {
-    cache?: CellMeasurerCache;
-    children?: ((props: {measure: () => void}) => React.ReactNode) | JSX.Element;
+    cache: CellMeasurerCacheInterface;
+    children:
+        | ((props: { measure: () => void }) => React.ReactNode)
+        | React.ReactNode;
     columnIndex?: number;
     index?: number;
-    parent?: React.ReactType;
+    parent: MeasuredCellParent;
     rowIndex?: number;
     style?: React.CSSProperties;
     /**
@@ -61,18 +74,10 @@ export type CellMeasurerProps = {
      * https://github.com/bvaughn/react-virtualized#pass-thru-props
      */
     [key: string]: any;
-}
+};
 /**
  * Wraps a cell and measures its rendered content.
  * Measurements are stored in a per-cell cache.
  * Cached-content is not be re-measured.
  */
-export class CellMeasurer extends PureComponent<CellMeasurerProps> {
-    constructor(props: CellMeasurerProps, context: any);
-
-    componentDidMount(): void;
-
-    componentDidUpdate(prevProps: CellMeasurerProps, prevState: any): void;
-
-    render(): JSX.Element;
-}
+export class CellMeasurer extends PureComponent<CellMeasurerProps> {}
diff --git a/types/react-virtualized/dist/es/Collection.d.ts b/types/react-virtualized/dist/es/Collection.d.ts
index e3b378eacb..d813e397f9 100644
--- a/types/react-virtualized/dist/es/Collection.d.ts
+++ b/types/react-virtualized/dist/es/Collection.d.ts
@@ -1,4 +1,4 @@
-import { PureComponent, Validator, Requireable } from 'react'
+import { PureComponent, Validator, Requireable } from "react";
 import {
     Alignment,
     Index,
@@ -7,25 +7,36 @@ import {
     SectionRenderedParams,
     SizeInfo,
     SizeAndPositionInfo
-} from '../../index';
+} from "../../index";
 
-export type CollectionCellSizeAndPosition = { height: number, width: number, x: number, y: number };
-export type CollectionCellSizeAndPositionGetter = (params: Index) => CollectionCellSizeAndPosition;
+export type CollectionCellSizeAndPosition = {
+    height: number;
+    width: number;
+    x: number;
+    y: number;
+};
+export type CollectionCellSizeAndPositionGetter = (
+    params: Index
+) => CollectionCellSizeAndPosition;
 
 export type CollectionCellGroupRendererParams = {
-    cellSizeAndPositionGetter: CollectionCellSizeAndPositionGetter,
-    indices: number[],
-    cellRenderer: CollectionCellRenderer
-}
-export type CollectionCellGroupRenderer = (params: CollectionCellGroupRendererParams) => React.ReactNode[];
+    cellSizeAndPositionGetter: CollectionCellSizeAndPositionGetter;
+    indices: number[];
+    cellRenderer: CollectionCellRenderer;
+};
+export type CollectionCellGroupRenderer = (
+    params: CollectionCellGroupRendererParams
+) => React.ReactNode[];
 export type CollectionCellRendererParams = {
-    index: number,
-    key: string,
-    style?: React.CSSProperties
-}
-export type CollectionCellRenderer = (params: CollectionCellRendererParams) => React.ReactNode;
+    index: number;
+    key: string;
+    style?: React.CSSProperties;
+};
+export type CollectionCellRenderer = (
+    params: CollectionCellRendererParams
+) => React.ReactNode;
 export type CollectionProps = {
-    'aria-label'?: string;
+    "aria-label"?: string;
     /**
      * Outer height of Collection is set to "auto". This property should only be
      * used in conjunction with the WindowScroller HOC.
@@ -43,17 +54,17 @@ export type CollectionProps = {
      *   cellRenderer: Function
      * }): Array<PropTypes.node>
      */
-    cellGroupRenderer?: CollectionCellGroupRenderer,
+    cellGroupRenderer?: CollectionCellGroupRenderer;
     /**
      * Responsible for rendering a cell given an row and column index.
      * Should implement the following interface: ({ index: number, key: string, style: object }): PropTypes.element
      */
-    cellRenderer: CollectionCellRenderer,
+    cellRenderer: CollectionCellRenderer;
     /**
      * Callback responsible for returning size and offset/position information for a given cell (index).
      * ({ index: number }): { height: number, width: number, x: number, y: number }
      */
-    cellSizeAndPositionGetter: CollectionCellSizeAndPositionGetter,
+    cellSizeAndPositionGetter: CollectionCellSizeAndPositionGetter;
     /**
      * Optional custom CSS class name to attach to root Collection element.
      */
@@ -122,30 +133,26 @@ export type CollectionProps = {
  */
 export class Collection extends PureComponent<CollectionProps> {
     static propTypes: {
-        'aria-label': Requireable<string>,
-        cellCount: Validator<number>,
-        cellGroupRenderer: Validator<CollectionCellGroupRenderer>,
-        cellRenderer: Validator<CollectionCellRenderer>,
-        cellSizeAndPositionGetter: Validator<CollectionCellSizeAndPositionGetter>,
-        sectionSize: Requireable<number>
+        "aria-label": Requireable<string>;
+        cellCount: Validator<number>;
+        cellGroupRenderer: Validator<CollectionCellGroupRenderer>;
+        cellRenderer: Validator<CollectionCellRenderer>;
+        cellSizeAndPositionGetter: Validator<
+            CollectionCellSizeAndPositionGetter
+        >;
+        sectionSize: Requireable<number>;
     };
 
     static defaultProps: {
-        'aria-label': 'grid',
-        cellGroupRenderer: CollectionCellGroupRenderer
+        "aria-label": "grid";
+        cellGroupRenderer: CollectionCellGroupRenderer;
     };
 
-    constructor(props: CollectionProps, context: any);
-
     forceUpdate(): void;
 
     /** See Collection#recomputeCellSizesAndPositions */
     recomputeCellSizesAndPositions(): void;
 
-    /** React lifecycle methods */
-
-    render(): JSX.Element;
-
     /** CellLayoutManager interface */
 
     calculateSizeAndPositionData(): void;
@@ -159,17 +166,19 @@ export class Collection extends PureComponent<CollectionProps> {
      * Calculates the minimum amount of change from the current scroll position to ensure the specified cell is (fully) visible.
      */
     getScrollPositionForCell(params: {
-        align: 'auto' | 'start' | 'end' | 'center',
-        cellIndex: number,
-        height: number,
-        scrollLeft: number,
-        scrollTop: number,
-        width: number
+        align: "auto" | "start" | "end" | "center";
+        cellIndex: number;
+        height: number;
+        scrollLeft: number;
+        scrollTop: number;
+        width: number;
     }): ScrollPosition;
 
     getTotalSize(): SizeInfo;
 
-    cellRenderers(params: {
-        isScrolling: boolean,
-    } & SizeInfo): React.ReactNode[];
+    cellRenderers(
+        params: {
+            isScrolling: boolean;
+        } & SizeInfo
+    ): React.ReactNode[];
 }
diff --git a/types/react-virtualized/dist/es/ColumnSizer.d.ts b/types/react-virtualized/dist/es/ColumnSizer.d.ts
index c3779c493c..fd42ad5cf5 100644
--- a/types/react-virtualized/dist/es/ColumnSizer.d.ts
+++ b/types/react-virtualized/dist/es/ColumnSizer.d.ts
@@ -1,11 +1,11 @@
-import { PureComponent, Validator, Requireable } from 'react'
+import { PureComponent, Validator, Requireable } from "react";
 
 export type SizedColumnProps = {
-    adjustedWidth: number,
-    columnWidth: number,
-    getColumnWidth: () => number,
-    registerChild: any
-}
+    adjustedWidth: number;
+    columnWidth: number;
+    getColumnWidth: () => number;
+    registerChild: any;
+};
 
 export type ColumnSizerProps = {
     /**
@@ -17,7 +17,7 @@ export type ColumnSizerProps = {
      * The :registerChild should be passed to the Grid's :ref property.
      * The :adjustedWidth property is optional; it reflects the lesser of the overall width or the width of all columns.
      */
-    children?: (props: SizedColumnProps) => React.ReactNode;
+    children: (props: SizedColumnProps) => React.ReactNode;
     /** Optional maximum allowed column width */
     columnMaxWidth?: number;
     /** Optional minimum allowed column width */
@@ -34,22 +34,16 @@ export type ColumnSizerProps = {
      * https://github.com/bvaughn/react-virtualized#pass-thru-props
      */
     [key: string]: any;
-}
+};
 /**
  * High-order component that auto-calculates column-widths for `Grid` cells.
  */
 export class ColumnSizer extends PureComponent<ColumnSizerProps> {
     static propTypes: {
-        children: Validator<(props: SizedColumnProps) => React.ReactNode>,
-        columnMaxWidth: Requireable<number>,
-        columnMinWidth: Requireable<number>,
-        columnCount: Validator<number>,
-        width: Validator<number>
+        children: Validator<(props: SizedColumnProps) => React.ReactNode>;
+        columnMaxWidth: Requireable<number>;
+        columnMinWidth: Requireable<number>;
+        columnCount: Validator<number>;
+        width: Validator<number>;
     };
-
-    constructor(props: ColumnSizerProps, context: any);
-
-    componentDidUpdate(prevProps: ColumnSizerProps, prevState: any): void;
-
-    render(): JSX.Element;
 }
diff --git a/types/react-virtualized/dist/es/Grid.d.ts b/types/react-virtualized/dist/es/Grid.d.ts
index 83230ca794..a543521b7a 100644
--- a/types/react-virtualized/dist/es/Grid.d.ts
+++ b/types/react-virtualized/dist/es/Grid.d.ts
@@ -1,56 +1,67 @@
-import { Validator, Requireable, PureComponent } from 'react'
-import { List } from './List';
-import { Table } from './Table';
-import { CellMeasurerCache } from './CellMeasurer';
-import { Index, Map, Alignment } from '../../index';
+import { Validator, Requireable, PureComponent } from "react";
+import { List } from "./List";
+import { Table } from "./Table";
+import { CellMeasurerCache, MeasuredCellParent } from "./CellMeasurer";
+import { Index, Map, Alignment } from "../../index";
+
+export type RenderedSection = {
+    columnOverscanStartIndex: number;
+    columnOverscanStopIndex: number;
+    columnStartIndex: number;
+    columnStopIndex: number;
+    rowOverscanStartIndex: number;
+    rowOverscanStopIndex: number;
+    rowStartIndex: number;
+    rowStopIndex: number;
+};
 
 export type GridCellProps = {
     columnIndex: number;
     isScrolling: boolean;
     isVisible: boolean;
     key: string;
-    parent: typeof Grid | typeof List | typeof Table;
+    parent: MeasuredCellParent;
     rowIndex: number;
     style: React.CSSProperties;
 };
 export type GridCellRenderer = (props: GridCellProps) => React.ReactNode;
 
 export type ConfigureParams = {
-    cellCount: number,
-    estimatedCellSize: number
+    cellCount: number;
+    estimatedCellSize: number;
 };
 export type ContainerSizeAndOffset = {
-    containerSize: number,
-    offset: number
+    containerSize: number;
+    offset: number;
 };
 export type SizeAndPositionData = {
-    offset: number,
-    size: number
+    offset: number;
+    size: number;
 };
 export type GetVisibleCellRangeParams = {
-    containerSize: number,
-    offset: number
+    containerSize: number;
+    offset: number;
 };
 export type VisibleCellRange = {
     start: number;
     stop: number;
 };
 export type ScrollParams = {
-    clientHeight: number,
-    clientWidth: number,
-    scrollHeight: number,
-    scrollLeft: number,
-    scrollTop: number,
-    scrollWidth: number
+    clientHeight: number;
+    clientWidth: number;
+    scrollHeight: number;
+    scrollLeft: number;
+    scrollTop: number;
+    scrollWidth: number;
 };
 export type SectionRenderedParams = {
-    columnStartIndex: number,
-    columnStopIndex: number,
-    rowStartIndex: number,
-    rowStopIndex: number
+    columnStartIndex: number;
+    columnStopIndex: number;
+    rowStartIndex: number;
+    rowStopIndex: number;
 };
-export type SCROLL_DIRECTION_HORIZONTAL = 'horizontal';
-export type SCROLL_DIRECTION_VERTICAL = 'vertical';
+export type SCROLL_DIRECTION_HORIZONTAL = "horizontal";
+export type SCROLL_DIRECTION_VERTICAL = "vertical";
 export type OverscanIndicesGetterParams = {
     direction?: SCROLL_DIRECTION_HORIZONTAL | SCROLL_DIRECTION_VERTICAL;
     cellCount: number;
@@ -60,15 +71,17 @@ export type OverscanIndicesGetterParams = {
     stopIndex: number;
 };
 export type OverscanIndices = {
-    overscanStartIndex: number,
-    overscanStopIndex: number
+    overscanStartIndex: number;
+    overscanStopIndex: number;
 };
-export type OverscanIndicesGetter = (params: OverscanIndicesGetterParams) => OverscanIndices;
+export type OverscanIndicesGetter = (
+    params: OverscanIndicesGetterParams
+) => OverscanIndices;
 
 export type ScrollOffset = {
-    scrollLeft: number,
-    scrollTop: number
-}
+    scrollLeft: number;
+    scrollTop: number;
+};
 
 export type CellSizeAndPositionManager = {
     areOffsetsAdjusted(): boolean;
@@ -76,7 +89,10 @@ export type CellSizeAndPositionManager = {
     getCellCount(): number;
     getEstimatedCellSize(): number;
     getLastMeasuredIndex(): number;
-    getOffsetAdjustment({ containerSize, offset/*safe*/ }: ContainerSizeAndOffset): number;
+    getOffsetAdjustment({
+        containerSize,
+        offset /*safe*/
+    }: ContainerSizeAndOffset): number;
     /**
      * This method returns the size and position for the cell at the specified index.
      * It just-in-time calculates (or used cached values) for cells leading up to the index.
@@ -101,10 +117,10 @@ export type CellSizeAndPositionManager = {
      * @return Offset to use to ensure the specified cell is visible
      */
     getUpdatedOffsetForIndex(params: {
-        align: string,
-        containerSize: number,
-        currentOffset: number,
-        targetIndex: number
+        align: string;
+        containerSize: number;
+        currentOffset: number;
+        targetIndex: number;
     }): number;
     getVisibleCellRange(params: GetVisibleCellRangeParams): VisibleCellRange;
     /**
@@ -112,33 +128,36 @@ export type CellSizeAndPositionManager = {
      * This method should be called for any cell that has changed its size.
      * It will not immediately perform any calculations; they'll be performed the next time getSizeAndPositionOfCell() is called.
      */
-    resetCell(index: number): void
-}
+    resetCell(index: number): void;
+};
 
 export type GridCellRangeProps = {
-    cellCache: Map<any>,
-    cellRenderer: GridCellRenderer,
-    columnSizeAndPositionManager: CellSizeAndPositionManager,
-    columnStartIndex: number,
-    columnStopIndex: number,
-    isScrolling: boolean,
-    rowSizeAndPositionManager: CellSizeAndPositionManager,
-    rowStartIndex: number,
-    rowStopIndex: number,
-    scrollLeft: number,
-    scrollTop: number,
-    deferredMeasurementCache: CellMeasurerCache,
-    horizontalOffsetAdjustment: number,
-    parent: typeof Grid | typeof List | typeof Table,
-    styleCache: Map<React.CSSProperties>,
-    verticalOffsetAdjustment: number,
-    visibleColumnIndices: VisibleCellRange,
-    visibleRowIndices: VisibleCellRange
-}
-export type GridCellRangeRenderer = (params: GridCellRangeProps) => React.ReactNode[];
+    cellCache: Map<any>;
+    cellRenderer: GridCellRenderer;
+    columnSizeAndPositionManager: CellSizeAndPositionManager;
+    columnStartIndex: number;
+    columnStopIndex: number;
+    isScrolling: boolean;
+    rowSizeAndPositionManager: CellSizeAndPositionManager;
+    rowStartIndex: number;
+    rowStopIndex: number;
+    scrollLeft: number;
+    scrollTop: number;
+    deferredMeasurementCache: CellMeasurerCache;
+    horizontalOffsetAdjustment: number;
+    parent: MeasuredCellParent;
+    styleCache: Map<React.CSSProperties>;
+    verticalOffsetAdjustment: number;
+    visibleColumnIndices: VisibleCellRange;
+    visibleRowIndices: VisibleCellRange;
+};
+export type GridCellRangeRenderer = (
+    params: GridCellRangeProps
+) => React.ReactNode[];
 
 export type GridCoreProps = {
-    'aria-label'?: string;
+    "aria-label"?: string;
+    "aria-readonly"?: boolean;
     /**
      * Set the width of the inner scrollable container to 'auto'.
      * This is useful for single-column Grids to ensure that the column doesn't extend below a vertical scrollbar.
@@ -175,6 +194,10 @@ export type GridCoreProps = {
      * Optional custom CSS class name to attach to root Grid element.
      */
     className?: string;
+    /** Unfiltered props for the Grid container. */
+    containerProps?: object;
+    /** ARIA role for the cell-container.  */
+    containerRole?: string;
     /** Optional inline style applied to inner cell-container */
     containerStyle?: React.CSSProperties;
     /**
@@ -208,7 +231,7 @@ export type GridCoreProps = {
      * Override internal is-scrolling state tracking.
      * This property is primarily intended for use with the WindowScroller component.
      */
-    isScrolling?: boolean,
+    isScrolling?: boolean;
     /**
      * Optional renderer to be used in place of rows when either :rowCount or :columnCount is 0.
      */
@@ -295,7 +318,7 @@ export type GridCoreProps = {
      * https://github.com/bvaughn/react-virtualized#pass-thru-props
      */
     [key: string]: any;
-}
+};
 
 export type GridProps = GridCoreProps & {
     /**
@@ -314,95 +337,69 @@ export type GridProps = GridCoreProps & {
     columnWidth: number | ((params: Index) => number);
 };
 
-export type ScrollDirection = 'horizontal' | 'vertical';
+export type ScrollDirection = "horizontal" | "vertical";
 
 export type GridState = {
-    isScrolling: boolean,
-    scrollDirectionHorizontal: ScrollDirection,
-    scrollDirectionVertical: ScrollDirection,
-    scrollLeft: number,
-    scrollTop: number
+    isScrolling: boolean;
+    scrollDirectionHorizontal: ScrollDirection;
+    scrollDirectionVertical: ScrollDirection;
+    scrollLeft: number;
+    scrollTop: number;
 };
 
 /**
  * Specifies the number of miliseconds during which to disable pointer events while a scroll is in progress.
  * This improves performance and makes scrolling smoother.
  */
-export const DEFAULT_SCROLLING_RESET_TIME_INTERVAL = 150
+export const DEFAULT_SCROLLING_RESET_TIME_INTERVAL = 150;
 
 /**
  * Renders tabular data with virtualization along the vertical and horizontal axes.
  * Row heights and column widths must be known ahead of time and specified as properties.
  */
 export class Grid extends PureComponent<GridProps, GridState> {
-    static propTypes: {
-        'aria-label': Requireable<string>,
-        autoContainerWidth: Requireable<boolean>,
-        autoHeight: Requireable<boolean>,
-        cellRenderer: Validator<(props: GridCellProps) => React.ReactNode>,
-        cellRangeRenderer: Validator<(params: GridCellRangeProps) => React.ReactNode[]>,
-        className: Requireable<string>,
-        columnCount: Validator<number>,
-        columnWidth: Validator<number | ((index: number) => number)>,
-        containerStyle: Requireable<React.CSSProperties>,
-        deferredMeasurementCache: Requireable<CellMeasurerCache>,
-        estimatedColumnSize: Validator<number>,
-        estimatedRowSize: Validator<number>,
-        getScrollbarSize: Validator<() => number>,
-        height: Validator<number>,
-        id: Requireable<string>,
-        isScrolling: Requireable<boolean>,
-        noContentRenderer: Requireable<() => JSX.Element>,
-        onScroll: Validator<(params: ScrollParams) => void>,
-        onSectionRendered: Validator<(params: SectionRenderedParams) => void>,
-        overscanColumnCount: Validator<number>,
-        overscanIndicesGetter: Validator<OverscanIndicesGetter>,
-        overscanRowCount: Validator<number>,
-        role: Requireable<string>,
-        rowHeight: Validator<number | ((params: Index) => number)>,
-        rowCount: Validator<number>,
-        scrollingResetTimeInterval: Requireable<number>,
-        scrollLeft: Requireable<number>,
-        scrollToAlignment: Validator<Alignment>,
-        scrollToColumn: Validator<number>,
-        scrollTop: Requireable<number>,
-        scrollToRow: Validator<number>,
-        style: Requireable<React.CSSProperties>,
-        tabIndex: Requireable<number>,
-        width: Validator<number>
-    };
-
     static defaultProps: {
-        'aria-label': 'grid',
-        cellRangeRenderer: GridCellRangeRenderer,
-        estimatedColumnSize: 100,
-        estimatedRowSize: 30,
-        getScrollbarSize: () => number,
-        noContentRenderer: () => null,
-        onScroll: () => null,
-        onSectionRendered: () => null,
-        overscanColumnCount: 0,
-        overscanIndicesGetter: OverscanIndicesGetter,
-        overscanRowCount: 10,
-        role: 'grid',
-        scrollingResetTimeInterval: typeof DEFAULT_SCROLLING_RESET_TIME_INTERVAL,
-        scrollToAlignment: 'auto',
-        scrollToColumn: -1,
-        scrollToRow: -1,
-        style: {},
-        tabIndex: 0
+        "aria-label": "grid";
+        "aria-readonly": true;
+        autoContainerWidth: false;
+        autoHeight: false;
+        autoWidth: false;
+        cellRangeRenderer: GridCellRangeRenderer;
+        containerRole: "rowgroup";
+        containerStyle: {};
+        estimatedColumnSize: 100;
+        estimatedRowSize: 30;
+        getScrollbarSize: () => number;
+        noContentRenderer: () => React.ReactNode;
+        onScroll: () => void;
+        onScrollbarPresenceChange: () => void;
+        onSectionRendered: () => void;
+        overscanColumnCount: 0;
+        overscanIndicesGetter: OverscanIndicesGetter;
+        overscanRowCount: 10;
+        role: "grid";
+        scrollingResetTimeInterval: typeof DEFAULT_SCROLLING_RESET_TIME_INTERVAL;
+        scrollToAlignment: "auto";
+        scrollToColumn: -1;
+        scrollToRow: -1;
+        style: {};
+        tabIndex: 0;
     };
 
-    constructor(props: GridProps, context: any);
-
     /**
      * Gets offsets for a given cell and alignment.
      */
     getOffsetForCell(params?: {
-        alignment?: Alignment,
-        columnIndex?: number,
-        rowIndex?: number
-    }): ScrollOffset
+        alignment?: Alignment;
+        columnIndex?: number;
+        rowIndex?: number;
+    }): ScrollOffset;
+
+    /**
+     * This method handles a scroll event originating from an external scroll control.
+     * It's an advanced method and should probably not be used unless you're implementing a custom scroll-bar solution.
+     */
+    handleScrollEvent(params: Partial<ScrollOffset>): void;
 
     /**
      * Invalidate Grid size and recompute visible cells.
@@ -412,9 +409,9 @@ export class Grid extends PureComponent<GridProps, GridState> {
      */
     // @TODO (bvaughn) Add automated test coverage for this.
     invalidateCellSizeAfterRender(params: {
-        columnIndex: number,
-        rowIndex: number
-    }): void
+        columnIndex: number;
+        rowIndex: number;
+    }): void;
 
     /**
      * Pre-measure all columns and rows in a Grid.
@@ -429,56 +426,24 @@ export class Grid extends PureComponent<GridProps, GridState> {
      * Since Grid only receives :columnCount and :rowCount it has no way of detecting when the underlying data changes.
      */
     recomputeGridSize(params?: {
-        columnIndex?: number,
-        rowIndex?: number
+        columnIndex?: number;
+        rowIndex?: number;
     }): void;
 
     /**
      * Ensure column and row are visible.
      */
-    scrollToCell(params: {
-        columnIndex: number,
-        rowIndex: number
-    }): void;
+    scrollToCell(params: { columnIndex: number; rowIndex: number }): void;
 
     /**
      * Scroll to the specified offset(s).
      * Useful for animating position changes.
      */
-    scrollToPosition(params?: {
-        scrollLeft: number,
-        scrollTop: number
-    }): void;
-
-    componentDidMount(): void;
-
-    /**
-     * @private
-     * This method updates scrollLeft/scrollTop in state for the following conditions:
-     * 1) New scroll-to-cell props have been set
-     */
-    componentDidUpdate(prevProps: GridProps, prevState: GridState): void;
-
-    componentWillMount(): void;
-
-    componentWillUnmount(): void;
-
-    /**
-     * @private
-     * This method updates scrollLeft/scrollTop in state for the following conditions:
-     * 1) Empty content (0 rows or columns)
-     * 2) New scroll props overriding the current state
-     * 3) Cells-count or cells-size has changed, making previous scroll offsets invalid
-     */
-    componentWillReceiveProps(nextProps: GridProps): void;
-
-    componentWillUpdate(nextProps: GridProps, nextState: GridState): void;
-
-    render(): JSX.Element;
+    scrollToPosition(params?: { scrollLeft: number; scrollTop: number }): void;
 }
 
 export const defaultCellRangeRenderer: GridCellRangeRenderer;
 
-export const accessibilityOverscanIndicesGetter: OverscanIndicesGetter
+export const accessibilityOverscanIndicesGetter: OverscanIndicesGetter;
 
 export const defaultOverscanIndicesGetter: OverscanIndicesGetter;
diff --git a/types/react-virtualized/dist/es/InfiniteLoader.d.ts b/types/react-virtualized/dist/es/InfiniteLoader.d.ts
index c247ad3c0e..78b3d0a39b 100644
--- a/types/react-virtualized/dist/es/InfiniteLoader.d.ts
+++ b/types/react-virtualized/dist/es/InfiniteLoader.d.ts
@@ -1,10 +1,10 @@
-import { PureComponent, Validator, Requireable } from 'react'
-import { Index, IndexRange } from '../../index';
+import { PureComponent, Validator, Requireable } from "react";
+import { Index, IndexRange } from "../../index";
 
 export type InfiniteLoaderChildProps = {
-    onRowsRendered: (params: { startIndex: number, stopIndex: number }) => void,
-    registerChild: (registeredChild: any) => void
-}
+    onRowsRendered: (params: { startIndex: number; stopIndex: number }) => void;
+    registerChild: (registeredChild: any) => void;
+};
 
 export type InfiniteLoaderProps = {
     /**
@@ -15,7 +15,7 @@ export type InfiniteLoaderProps = {
      * The specified :onRowsRendered function should be passed through to the child's :onRowsRendered property.
      * The :registerChild callback should be set as the virtualized component's :ref.
      */
-    children?: (props: InfiniteLoaderChildProps) => React.ReactNode;
+    children: (props: InfiniteLoaderChildProps) => React.ReactNode;
     /**
      * Function responsible for tracking the loaded state of each row.
      * It should implement the following signature: ({ index: number }): boolean
@@ -61,23 +61,21 @@ export type InfiniteLoaderProps = {
  */
 export class InfiniteLoader extends PureComponent<InfiniteLoaderProps> {
     static propTypes: {
-        children: Validator<(props: InfiniteLoaderChildProps) => React.ReactNode>,
-        isRowLoaded: Validator<(params: Index) => boolean>,
-        loadMoreRows: Validator<(params: IndexRange) => Promise<any>>,
-        minimumBatchSize: Validator<number>,
-        rowCount: Validator<number>,
-        threshold: Validator<number>
+        children: Validator<
+            (props: InfiniteLoaderChildProps) => React.ReactNode
+        >;
+        isRowLoaded: Validator<(params: Index) => boolean>;
+        loadMoreRows: Validator<(params: IndexRange) => Promise<any>>;
+        minimumBatchSize: Validator<number>;
+        rowCount: Validator<number>;
+        threshold: Validator<number>;
     };
 
     static defaultProps: {
-        minimumBatchSize: 10,
-        rowCount: 0,
-        threshold: 15
+        minimumBatchSize: 10;
+        rowCount: 0;
+        threshold: 15;
     };
 
-    constructor(props: InfiniteLoaderProps, context: any);
-
     resetLoadMoreRowsCache(autoReload?: boolean): void;
-
-    render(): JSX.Element;
 }
diff --git a/types/react-virtualized/dist/es/List.d.ts b/types/react-virtualized/dist/es/List.d.ts
index 7f550d2dcb..23d76e19ab 100644
--- a/types/react-virtualized/dist/es/List.d.ts
+++ b/types/react-virtualized/dist/es/List.d.ts
@@ -1,9 +1,17 @@
-import { PureComponent, Validator, Requireable } from 'react'
-import { Grid, GridCoreProps, GridCellProps, OverscanIndicesGetter } from './Grid'
-import { Index, IndexRange, Alignment } from '../../index'
-import { CellMeasurerCache } from './CellMeasurer'
+import { PureComponent, Validator, Requireable } from "react";
+import {
+    Grid,
+    GridCoreProps,
+    GridCellProps,
+    OverscanIndicesGetter
+} from "./Grid";
+import { Index, IndexRange, Alignment } from "../../index";
+import { CellMeasurerCache, CellPosition } from "./CellMeasurer";
 
-export type ListRowProps = GridCellProps & { index: number, style: React.CSSProperties };
+export type ListRowProps = GridCellProps & {
+    index: number;
+    style: React.CSSProperties;
+};
 
 export type ListRowRenderer = (props: ListRowProps) => React.ReactNode;
 export type ListProps = GridCoreProps & {
@@ -28,7 +36,14 @@ export type ListProps = GridCoreProps & {
      * Callback invoked with information about the slice of rows that were just rendered.
      * ({ startIndex, stopIndex }): void
      */
-    onRowsRendered?: (info: { overscanStartIndex: number, overscanStopIndex: number, startIndex: number, stopIndex: number }) => void;
+    onRowsRendered?: (
+        info: {
+            overscanStartIndex: number;
+            overscanStopIndex: number;
+            startIndex: number;
+            stopIndex: number;
+        }
+    ) => void;
     /**
      * Number of rows to render above/below the visible bounds of the list.
      * These rows can help for smoother scrolling on touch devices.
@@ -39,9 +54,11 @@ export type ListProps = GridCoreProps & {
      * This callback can be used to sync scrolling between lists, tables, or grids.
      * ({ clientHeight, scrollHeight, scrollTop }): void
      */
-    onScroll?: (info: { clientHeight: number, scrollHeight: number, scrollTop: number }) => void;
+    onScroll?: (
+        info: { clientHeight: number; scrollHeight: number; scrollTop: number }
+    ) => void;
     /** See Grid#overscanIndicesGetter */
-    overscanIndicesGetter?: OverscanIndicesGetter,
+    overscanIndicesGetter?: OverscanIndicesGetter;
     /**
      * Either a fixed row height (number) or a function that returns the height of a row given its index.
      * ({ index: number }): number
@@ -63,7 +80,7 @@ export type ListProps = GridCoreProps & {
     tabIndex?: number | null;
     /** Width of list */
     width: number;
-}
+};
 /**
  * It is inefficient to create and manage a large list of DOM elements within a scrolling container
  * if only a few of those elements are visible. The primary purpose of this component is to improve
@@ -73,60 +90,44 @@ export type ListProps = GridCoreProps & {
  * This component renders a virtualized list of elements with either fixed or dynamic heights.
  */
 export class List extends PureComponent<ListProps> {
-    static propTypes: {
-        'aria-label': Requireable<string>,
-        autoHeight: Requireable<boolean>,
-        className: Requireable<string>,
-        estimatedRowSize: Validator<number>,
-        height: Validator<number>,
-        noRowsRenderer: Validator<() => JSX.Element>,
-        onRowsRendered: Validator<(params: IndexRange) => void>,
-        overscanRowCount: Validator<number>,
-        onScroll: Validator<(params: { clientHeight: number, scrollHeight: number, scrollTop: number }) => void>,
-        overscanIndicesGetter: Validator<OverscanIndicesGetter>,
-        rowHeight: Validator<number | ((params: Index) => number)>,
-        rowRenderer: Validator<ListRowRenderer>,
-        rowCount: Validator<number>,
-        scrollToAlignment: Validator<Alignment>,
-        scrollToIndex: Validator<number>,
-        scrollTop: Requireable<number>,
-        style: Validator<React.CSSProperties>,
-        tabIndex: Requireable<number>,
-        width: Validator<number>
-    };
-
     static defaultProps: {
-        estimatedRowSize: 30,
-        noRowsRenderer: () => null,
-        onRowsRendered: () => null,
-        onScroll: () => null,
-        overscanRowCount: 10,
-        scrollToAlignment: 'auto',
-        scrollToIndex: -1,
-        style: {}
+        autoHeight: false;
+        estimatedRowSize: 30;
+        onScroll: () => void;
+        noRowsRenderer: () => null;
+        onRowsRendered: () => void;
+        overscanIndicesGetter: OverscanIndicesGetter;
+        overscanRowCount: 10;
+        scrollToAlignment: "auto";
+        scrollToIndex: -1;
+        style: {};
     };
 
-    constructor(props: ListProps, context: any);
+    Grid?: Grid;
 
     forceUpdateGrid(): void;
 
+    /** See Grid#getOffsetForCell */
+    getOffsetForRow(params: { alignment?: Alignment; index?: number }): number;
+
+    /** CellMeasurer compatibility */
+    invalidateCellSizeAfterRender({
+        columnIndex,
+        rowIndex
+    }: CellPosition): void;
+
     /** See Grid#measureAllCells */
     measureAllRows(): void;
 
+    /** CellMeasurer compatibility */
+    recomputeGridSize(params?: Partial<CellPosition>): void;
+
     /** See Grid#recomputeGridSize */
     recomputeRowHeights(index?: number): void;
 
-    /** See Grid#getOffsetForCell */
-    getOffsetForRow(params: {
-        alignment?: Alignment,
-        index?: number
-    }): number;
-
     /** See Grid#scrollToPosition */
     scrollToPosition(scrollTop?: number): void;
 
     /** See Grid#scrollToCell */
     scrollToRow(index?: number): void;
-
-    render(): JSX.Element;
 }
diff --git a/types/react-virtualized/dist/es/Masonry.d.ts b/types/react-virtualized/dist/es/Masonry.d.ts
index 59394bc170..f29cf86749 100644
--- a/types/react-virtualized/dist/es/Masonry.d.ts
+++ b/types/react-virtualized/dist/es/Masonry.d.ts
@@ -1,52 +1,59 @@
-import { PureComponent, Validator, Requireable } from 'react'
-import { CellMeasurerCache, KeyMapper } from './CellMeasurer';
-import { GridCellRenderer } from './Grid';
+import { PureComponent, Validator, Requireable } from "react";
+import {
+    CellMeasurerCacheInterface,
+    KeyMapper,
+    MeasuredCellParent
+} from "./CellMeasurer";
+import { GridCellRenderer } from "./Grid";
 /**
  * Specifies the number of miliseconds during which to disable pointer events while a scroll is in progress.
  * This improves performance and makes scrolling smoother.
  */
-export const DEFAULT_SCROLLING_RESET_TIME_INTERVAL = 150
+export const DEFAULT_SCROLLING_RESET_TIME_INTERVAL = 150;
 
-export type OnCellsRenderedCallback = (params: {
-    startIndex: number,
-    stopIndex: number
-}) => void;
+export type OnCellsRenderedCallback = (
+    params: {
+        startIndex: number;
+        stopIndex: number;
+    }
+) => void;
 
-export type OnScrollCallback = (params: {
-    clientHeight: number,
-    scrollHeight: number,
-    scrollTop: number
-}) => void;
+export type OnScrollCallback = (
+    params: {
+        clientHeight: number;
+        scrollHeight: number;
+        scrollTop: number;
+    }
+) => void;
 
 export type MasonryCellProps = {
-    index: number,
-    isScrolling: boolean,
-    key: React.Key,
-    parent: React.ReactType,
-    style?: React.CSSProperties
-}
+    index: number;
+    isScrolling: boolean;
+    key: React.Key;
+    parent: MeasuredCellParent;
+    style?: React.CSSProperties;
+};
 
-export type CellRenderer = (props: MasonryCellProps) => React.ReactNode
+export type CellRenderer = (props: MasonryCellProps) => React.ReactNode;
 
 export type MasonryProps = {
-    autoHeight: boolean,
-    cellCount: number,
-    cellMeasurerCache: CellMeasurerCache,
-    cellPositioner: Positioner,
-    cellRenderer: CellRenderer,
-    className?: string,
-    height: number,
-    id?: string,
-    keyMapper?: KeyMapper,
-    onCellsRendered?: OnCellsRenderedCallback,
-    onScroll?: OnScrollCallback,
-    overscanByPixels?: number,
-    role?: string,
-    scrollingResetTimeInterval?: number,
-    scrollTop?: number,
-    style?: React.CSSProperties,
-    tabIndex?: number | null,
-    width: number,
+    autoHeight: boolean;
+    cellCount: number;
+    cellMeasurerCache: CellMeasurerCacheInterface;
+    cellPositioner: Positioner;
+    cellRenderer: CellRenderer;
+    className?: string;
+    height: number;
+    id?: string;
+    keyMapper?: KeyMapper;
+    onCellsRendered?: OnCellsRenderedCallback;
+    onScroll?: OnScrollCallback;
+    overscanByPixels?: number;
+    role?: string;
+    scrollingResetTimeInterval?: number;
+    style?: React.CSSProperties;
+    tabIndex?: number | null;
+    width: number;
     /**
      * PLEASE NOTE
      * The [key: string]: any; line is here on purpose
@@ -55,12 +62,12 @@ export type MasonryProps = {
      * https://github.com/bvaughn/react-virtualized#pass-thru-props
      */
     [key: string]: any;
-}
+};
 
 export type MasonryState = {
-    isScrolling: boolean,
-    scrollTop: number
-}
+    isScrolling: boolean;
+    scrollTop: number;
+};
 
 /**
  * This component efficiently displays arbitrarily positioned cells using windowing techniques.
@@ -92,61 +99,58 @@ export type MasonryState = {
  */
 export class Masonry extends PureComponent<MasonryProps, MasonryState> {
     static defaultProps: {
-        autoHeight: false,
-        keyMapper: identity,
-        onCellsRendered: noop,
-        onScroll: noop,
-        overscanByPixels: 20,
-        role: 'grid',
-        scrollingResetTimeInterval: typeof DEFAULT_SCROLLING_RESET_TIME_INTERVAL,
-        style: emptyObject,
-        tabIndex: 0
-    }
-
-    constructor(props: MasonryProps, context: any);
+        autoHeight: false;
+        keyMapper: identity;
+        onCellsRendered: noop;
+        onScroll: noop;
+        overscanByPixels: 20;
+        role: "grid";
+        scrollingResetTimeInterval: typeof DEFAULT_SCROLLING_RESET_TIME_INTERVAL;
+        style: emptyObject;
+        tabIndex: 0;
+    };
 
     clearCellPositions(): void;
 
     // HACK This method signature was intended for Grid
-    invalidateCellSizeAfterRender(params: { rowIndex: number }): void
+    invalidateCellSizeAfterRender(params: { rowIndex: number }): void;
 
     recomputeCellPositions(): void;
 
-    componentDidMount(): void;
-
-    componentDidUpdate(prevProps: MasonryProps, prevState: MasonryState): void;
-
-    componentWillUnmount(): void;
-
-    componentWillReceiveProps(nextProps: MasonryProps): void;
-
-    render(): JSX.Element;
+    static getDerivedStateFromProps(
+        nextProps: MasonryProps,
+        prevState: MasonryState
+    ): MasonryState | null;
 }
 
-export type emptyObject = {}
+export type emptyObject = {};
 
 export type identity = <T>(value: T) => T;
 
 export type noop = () => void;
 
 export type Position = {
-    left: number,
-    top: number
+    left: number;
+    top: number;
 };
 
 export type createCellPositionerParams = {
-    cellMeasurerCache: CellMeasurerCache,
-    columnCount: number,
-    columnWidth: number,
-    spacer?: number
+    cellMeasurerCache: CellMeasurerCacheInterface;
+    columnCount: number;
+    columnWidth: number;
+    spacer?: number;
 };
 
 export type resetParams = {
-    columnCount: number,
-    columnWidth: number,
-    spacer?: number
+    columnCount: number;
+    columnWidth: number;
+    spacer?: number;
 };
 
-export type Positioner = ((index: number) => Position) & { reset: (params: resetParams) => void };
+export type Positioner = ((index: number) => Position) & {
+    reset: (params: resetParams) => void;
+};
 
-export const createCellPositioner: (params: createCellPositionerParams) => Positioner;
+export const createCellPositioner: (
+    params: createCellPositionerParams
+) => Positioner;
diff --git a/types/react-virtualized/dist/es/MultiGrid.d.ts b/types/react-virtualized/dist/es/MultiGrid.d.ts
index 96c33e3bed..7796b1c281 100644
--- a/types/react-virtualized/dist/es/MultiGrid.d.ts
+++ b/types/react-virtualized/dist/es/MultiGrid.d.ts
@@ -1,5 +1,6 @@
-import { PureComponent, Validator, Requireable } from 'react'
-import { GridProps } from './Grid'
+import { PureComponent, Validator, Requireable } from "react";
+import { GridProps } from "./Grid";
+import { CellPosition } from "./CellMeasurer";
 
 export type MultiGridProps = {
     classNameBottomLeftGrid?: string;
@@ -18,9 +19,9 @@ export type MultiGridProps = {
 } & GridProps;
 
 export type MultiGridState = {
-    scrollLeft: number,
-    scrollTop: number
-}
+    scrollLeft: number;
+    scrollTop: number;
+};
 
 /**
  * Renders 1, 2, or 4 Grids depending on configuration.
@@ -31,63 +32,54 @@ export type MultiGridState = {
  */
 export class MultiGrid extends PureComponent<MultiGridProps, MultiGridState> {
     static propTypes: {
-        classNameBottomLeftGrid: Validator<string>,
-        classNameBottomRightGrid: Validator<string>,
-        classNameTopLeftGrid: Validator<string>,
-        classNameTopRightGrid: Validator<string>,
-        enableFixedColumnScroll: Validator<boolean>,
-        enableFixedRowScroll: Validator<boolean>,
-        fixedColumnCount: Validator<number>,
-        fixedRowCount: Validator<number>,
-        style: Validator<React.CSSProperties>,
-        styleBottomLeftGrid: Validator<React.CSSProperties>,
-        styleBottomRightGrid: Validator<React.CSSProperties>,
-        styleTopLeftGrid: Validator<React.CSSProperties>,
-        styleTopRightGrid: Validator<React.CSSProperties>
+        classNameBottomLeftGrid: Validator<string>;
+        classNameBottomRightGrid: Validator<string>;
+        classNameTopLeftGrid: Validator<string>;
+        classNameTopRightGrid: Validator<string>;
+        enableFixedColumnScroll: Validator<boolean>;
+        enableFixedRowScroll: Validator<boolean>;
+        fixedColumnCount: Validator<number>;
+        fixedRowCount: Validator<number>;
+        style: Validator<React.CSSProperties>;
+        styleBottomLeftGrid: Validator<React.CSSProperties>;
+        styleBottomRightGrid: Validator<React.CSSProperties>;
+        styleTopLeftGrid: Validator<React.CSSProperties>;
+        styleTopRightGrid: Validator<React.CSSProperties>;
     };
 
     static defaultProps: {
-        classNameBottomLeftGrid: '',
-        classNameBottomRightGrid: '',
-        classNameTopLeftGrid: '',
-        classNameTopRightGrid: '',
-        enableFixedColumnScroll: false,
-        enableFixedRowScroll: false,
-        fixedColumnCount: 0,
-        fixedRowCount: 0,
-        style: {},
-        styleBottomLeftGrid: {},
-        styleBottomRightGrid: {},
-        styleTopLeftGrid: {},
-        styleTopRightGrid: {}
+        classNameBottomLeftGrid: "";
+        classNameBottomRightGrid: "";
+        classNameTopLeftGrid: "";
+        classNameTopRightGrid: "";
+        enableFixedColumnScroll: false;
+        enableFixedRowScroll: false;
+        fixedColumnCount: 0;
+        fixedRowCount: 0;
+        scrollToColumn: -1;
+        scrollToRow: -1;
+        style: {};
+        styleBottomLeftGrid: {};
+        styleBottomRightGrid: {};
+        styleTopLeftGrid: {};
+        styleTopRightGrid: {};
     };
 
-    constructor(props: MultiGridProps, context: any);
-
     forceUpdateGrids(): void;
 
     /** See Grid#invalidateCellSizeAfterRender */
-    invalidateCellSizeAfterRender(params?: {
-        columnIndex?: number,
-        rowIndex?: number
-    }): void;
+    invalidateCellSizeAfterRender(params?: Partial<CellPosition>): void;
 
     /** See Grid#measureAllCells */
     measureAllCells(): void;
 
     /** See Grid#recomputeGridSize */
     recomputeGridSize(params?: {
-        columnIndex?: number,
-        rowIndex?: number
+        columnIndex?: number;
+        rowIndex?: number;
     }): void;
-
-    componentDidMount(): void;
-
-    componentDidUpdate(prevProps: MultiGridProps, prevState: MultiGridState): void;
-
-    componentWillMount(): void;
-
-    componentWillReceiveProps(nextProps: MultiGridProps, nextState: MultiGridState): void;
-
-    render(): JSX.Element;
+    static getDerivedStateFromProps(
+        nextProps: MultiGridProps,
+        prevState: MultiGridState
+    ): MultiGridState | null;
 }
diff --git a/types/react-virtualized/dist/es/ScrollSync.d.ts b/types/react-virtualized/dist/es/ScrollSync.d.ts
index 00137bf635..3a6cad6a6d 100644
--- a/types/react-virtualized/dist/es/ScrollSync.d.ts
+++ b/types/react-virtualized/dist/es/ScrollSync.d.ts
@@ -1,23 +1,23 @@
-import { PureComponent, Validator, Requireable } from 'react'
+import { PureComponent, Validator, Requireable } from "react";
 
 export type OnScrollParams = {
-    clientHeight: number,
-    clientWidth: number,
-    scrollHeight: number,
-    scrollLeft: number,
-    scrollTop: number,
-    scrollWidth: number
-}
+    clientHeight: number;
+    clientWidth: number;
+    scrollHeight: number;
+    scrollLeft: number;
+    scrollTop: number;
+    scrollWidth: number;
+};
 
 export type ScrollSyncChildProps = {
-    clientHeight: number,
-    clientWidth: number,
-    onScroll: (params: OnScrollParams) => void,
-    scrollHeight: number,
-    scrollLeft: number,
-    scrollTop: number,
-    scrollWidth: number
-}
+    clientHeight: number;
+    clientWidth: number;
+    onScroll: (params: OnScrollParams) => void;
+    scrollHeight: number;
+    scrollLeft: number;
+    scrollTop: number;
+    scrollWidth: number;
+};
 
 export type ScrollSyncProps = {
     /**
@@ -25,7 +25,7 @@ export type ScrollSyncProps = {
      * This function should implement the following signature:
      * ({ onScroll, scrollLeft, scrollTop }) => PropTypes.element
      */
-    children?: (props: ScrollSyncChildProps) => React.ReactNode
+    children: (props: ScrollSyncChildProps) => React.ReactNode;
     /**
      * PLEASE NOTE
      * The [key: string]: any; line is here on purpose
@@ -37,23 +37,22 @@ export type ScrollSyncProps = {
 };
 
 export type ScrollSyncState = {
-    clientHeight: number,
-    clientWidth: number,
-    scrollHeight: number,
-    scrollLeft: number,
-    scrollTop: number,
-    scrollWidth: number
+    clientHeight: number;
+    clientWidth: number;
+    scrollHeight: number;
+    scrollLeft: number;
+    scrollTop: number;
+    scrollWidth: number;
 };
 
 /**
  * HOC that simplifies the process of synchronizing scrolling between two or more virtualized components.
  */
-export class ScrollSync extends PureComponent<ScrollSyncProps, ScrollSyncState> {
+export class ScrollSync extends PureComponent<
+    ScrollSyncProps,
+    ScrollSyncState
+> {
     static propTypes: {
-        children: Validator<(props: ScrollSyncChildProps) => React.ReactNode>
+        children: Validator<(props: ScrollSyncChildProps) => React.ReactNode>;
     };
-
-    constructor(props: ScrollSyncProps, context: any);
-
-    render(): JSX.Element;
 }
diff --git a/types/react-virtualized/dist/es/Table.d.ts b/types/react-virtualized/dist/es/Table.d.ts
index f74c816463..571f67a371 100644
--- a/types/react-virtualized/dist/es/Table.d.ts
+++ b/types/react-virtualized/dist/es/Table.d.ts
@@ -1,63 +1,110 @@
-import { Validator, Requireable, PureComponent, Component } from 'react';
-import { CellMeasurerCache } from './CellMeasurer';
-import { Index, Alignment, ScrollEventData, IndexRange, OverscanIndexRange } from '../../index';
-import { Grid, GridCoreProps } from './Grid';
+import { Validator, Requireable, PureComponent, Component } from "react";
+import { CellMeasurerCache } from "./CellMeasurer";
+import {
+    Index,
+    Alignment,
+    ScrollEventData,
+    IndexRange,
+    OverscanIndexRange
+} from "../../index";
+import { Grid, GridCoreProps } from "./Grid";
+
+export type SortParams = {
+    defaultSortDirection: SortDirectionType;
+    event: MouseEvent;
+    sortBy: string;
+};
+
+export type SortDirectionMap = { [key: string]: SortDirectionType };
+
+export type MultiSortOptions = {
+    defaultSortBy?: string[];
+    defaultSortDirection?: SortDirectionMap;
+};
+
+export type MultiSortReturn = {
+    /**
+     * Sort property to be passed to the `Table` component.
+     * This function updates `sortBy` and `sortDirection` values.
+     */
+    sort: (params: SortParams) => void;
+
+    /**
+     * Specifies the fields currently responsible for sorting data,
+     * In order of importance.
+     */
+    sortBy: string[];
+
+    /**
+     * Specifies the direction a specific field is being sorted in.
+     */
+    sortDirection: SortDirectionMap;
+};
+
+export function createMultiSort(
+    sortCallback: (
+        params: { sortBy: string; sortDirection: SortDirectionType }
+    ) => void,
+    options?: MultiSortOptions
+): MultiSortReturn;
 
 export type TableCellDataGetterParams = {
-    columnData?: any,
-    dataKey: string,
-    rowData: any
+    columnData?: any;
+    dataKey: string;
+    rowData: any;
 };
 export type TableCellProps = {
-    cellData?: any,
-    columnData?: any,
-    columnIndex: number,
-    dataKey: string,
-    isScrolling: boolean,
-    parent?: any,
-    rowData: any,
-    rowIndex: number
+    cellData?: any;
+    columnData?: any;
+    columnIndex: number;
+    dataKey: string;
+    isScrolling: boolean;
+    parent?: any;
+    rowData: any;
+    rowIndex: number;
 };
 export type TableHeaderProps = {
-    columnData?: any,
-    dataKey: string,
-    disableSort?: boolean,
-    label?: string,
-    sortBy?: string,
-    sortDirection?: SortDirectionType
+    columnData?: any;
+    dataKey: string;
+    disableSort?: boolean;
+    label?: string;
+    sortBy?: string;
+    sortDirection?: SortDirectionType;
 };
 export type TableHeaderRowProps = {
-    className: string,
-    columns: React.ReactNode[],
-    style: React.CSSProperties,
-    scrollbarWidth: number,
-    height: number,
-    width: number
+    className: string;
+    columns: React.ReactNode[];
+    style: React.CSSProperties;
+    scrollbarWidth: number;
+    height: number;
+    width: number;
 };
 export type TableRowProps = {
-    className: string,
-    columns: any[],
-    index: number,
-    isScrolling: boolean,
-    onRowClick?: (params: RowMouseEventHandlerParams) => void,
-    onRowDoubleClick?: (params: RowMouseEventHandlerParams) => void,
-    onRowMouseOver?: (params: RowMouseEventHandlerParams) => void,
-    onRowMouseOut?: (params: RowMouseEventHandlerParams) => void,
-    onRowRightClick?: (params: RowMouseEventHandlerParams) => void,
-    rowData: any,
-    style: any
+    className: string;
+    columns: any[];
+    index: number;
+    isScrolling: boolean;
+    onRowClick?: (params: RowMouseEventHandlerParams) => void;
+    onRowDoubleClick?: (params: RowMouseEventHandlerParams) => void;
+    onRowMouseOver?: (params: RowMouseEventHandlerParams) => void;
+    onRowMouseOut?: (params: RowMouseEventHandlerParams) => void;
+    onRowRightClick?: (params: RowMouseEventHandlerParams) => void;
+    rowData: any;
+    style: any;
 };
 
 export type TableCellDataGetter = (params: TableCellDataGetterParams) => any;
 export type TableCellRenderer = (props: TableCellProps) => React.ReactNode;
 export type TableHeaderRenderer = (props: TableHeaderProps) => React.ReactNode;
-export type TableHeaderRowRenderer = (props: TableHeaderRowProps) => React.ReactNode;
+export type TableHeaderRowRenderer = (
+    props: TableHeaderRowProps
+) => React.ReactNode;
 export type TableRowRenderer = (props: TableRowProps) => React.ReactNode;
 
 // https://github.com/bvaughn/react-virtualized/blob/master/docs/Column.md
 export type ColumnProps = {
     /** Optional aria-label value to set on the column header */
-    'aria-label'?: string,
+    "aria-label"?: string;
     /**
      * Callback responsible for returning a cell's data, given its :dataKey
      * ({ columnData: any, dataKey: string, rowData: any }): any
@@ -103,57 +150,57 @@ export type ColumnProps = {
     style?: React.CSSProperties;
     /** Flex basis (width) for this column; This value can grow or shrink based on :flexGrow and :flexShrink properties. */
     width: number;
-}
+};
 export class Column extends Component<ColumnProps> {
     static propTypes: {
-        'aria-label': Requireable<string>,
-        cellDataGetter: Requireable<TableCellDataGetter>,
-        cellRenderer: Requireable<TableCellRenderer>,
-        className: Requireable<string>,
-        columnData: Requireable<object>,
-        dataKey: Validator<string>,
-        disableSort: Requireable<boolean>,
-        flexGrow: Requireable<number>,
-        flexShrink: Requireable<number>,
-        headerClassName: Requireable<string>,
-        headerRenderer: Validator<TableHeaderRowRenderer>,
-        label: Requireable<string>,
-        maxWidth: Requireable<number>,
-        minWidth: Requireable<number>,
-        style: Requireable<React.CSSProperties>,
-        width: Validator<number>,
-        id: Requireable<string>
+        "aria-label": Requireable<string>;
+        cellDataGetter: Requireable<TableCellDataGetter>;
+        cellRenderer: Requireable<TableCellRenderer>;
+        className: Requireable<string>;
+        columnData: Requireable<object>;
+        dataKey: Validator<string>;
+        disableSort: Requireable<boolean>;
+        flexGrow: Requireable<number>;
+        flexShrink: Requireable<number>;
+        headerClassName: Requireable<string>;
+        headerRenderer: Validator<TableHeaderRowRenderer>;
+        label: Requireable<string>;
+        maxWidth: Requireable<number>;
+        minWidth: Requireable<number>;
+        style: Requireable<React.CSSProperties>;
+        width: Validator<number>;
+        id: Requireable<string>;
     };
 
     static defaultProps: {
-        cellDataGetter: TableCellDataGetter,
-        cellRenderer: TableCellRenderer,
-        flexGrow: 0,
-        flexShrink: 1,
-        headerRenderer: TableHeaderRenderer,
-        style: {}
+        cellDataGetter: TableCellDataGetter;
+        cellRenderer: TableCellRenderer;
+        flexGrow: 0;
+        flexShrink: 1;
+        headerRenderer: TableHeaderRenderer;
+        style: {};
     };
 }
 
 export type RowMouseEventHandlerParams = {
     rowData: {
-        columnData: object,
-        id: string,
-        index: number
-    },
-    index: number,
-    event: React.SyntheticEvent<React.MouseEvent<any>>
-}
+        columnData: object;
+        id: string;
+        index: number;
+    };
+    index: number;
+    event: React.SyntheticEvent<React.MouseEvent<any>>;
+};
 
 export type HeaderMouseEventHandlerParams = {
-    dataKey: string,
-    columnData: any,
-    event: React.SyntheticEvent<React.MouseEvent<any>>
-}
+    dataKey: string;
+    columnData: any;
+    event: React.SyntheticEvent<React.MouseEvent<any>>;
+};
 
 // ref: https://github.com/bvaughn/react-virtualized/blob/master/docs/Table.md
 export type TableProps = GridCoreProps & {
-    'aria-label'?: string,
+    "aria-label"?: string;
     deferredMeasurementCache?: CellMeasurerCache;
     /**
      * Removes fixed height from the scrollingContainer so that the total height
@@ -161,7 +208,9 @@ export type TableProps = GridCoreProps & {
      */
     autoHeight?: boolean;
     /** One or more Columns describing the data displayed in this row */
-    children?: React.ReactElement<ColumnProps>[] | React.ReactElement<ColumnProps>;
+    children?:
+        | React.ReactElement<ColumnProps>[]
+        | React.ReactElement<ColumnProps>;
     /** Optional CSS class name */
     className?: string;
     /** Disable rendering the header at all */
@@ -283,7 +332,7 @@ export type TableProps = GridCoreProps & {
      * Sort function to be called if a sortable header is clicked.
      * ({ sortBy: string, sortDirection: SortDirection }): void
      */
-    sort?: (info: { sortBy: string, sortDirection: SortDirectionType }) => void;
+    sort?: (info: { sortBy: string; sortDirection: SortDirectionType }) => void;
     /** Table data is currently sorted by this :dataKey (if it is sorted at all) */
     sortBy?: string;
     /** Table data is currently sorted in this direction (if it is sorted at all) */
@@ -294,11 +343,13 @@ export type TableProps = GridCoreProps & {
     tabIndex?: number | null;
     /** Width of list */
     width?: number;
-}
+};
 
 export const defaultCellDataGetter: TableCellDataGetter;
 export const defaultCellRenderer: TableCellRenderer;
-export const defaultHeaderRenderer: () => React.ReactElement<TableHeaderProps>[];
+export const defaultHeaderRenderer: () => React.ReactElement<
+    TableHeaderProps
+>[];
 export const defaultHeaderRowRenderer: TableHeaderRowRenderer;
 export const defaultRowRenderer: TableRowRenderer;
 
@@ -307,20 +358,22 @@ export type SortDirectionStatic = {
      * Sort items in ascending order.
      * This means arranging from the lowest value to the highest (e.g. a-z, 0-9).
      */
-    ASC: 'ASC',
+    ASC: "ASC";
 
     /**
      * Sort items in descending order.
      * This means arranging from the highest value to the lowest (e.g. z-a, 9-0).
      */
-    DESC: 'DESC'
-}
+    DESC: "DESC";
+};
 
-export const SortDirection: SortDirectionStatic
+export const SortDirection: SortDirectionStatic;
 
-export type SortDirectionType = 'ASC' | 'DESC'
+export type SortDirectionType = "ASC" | "DESC";
 
-export const SortIndicator: React.StatelessComponent<{ sortDirection: SortDirectionType }>
+export const SortIndicator: React.StatelessComponent<{
+    sortDirection: SortDirectionType;
+}>;
 
 /**
  * Table component with fixed headers and virtualized rows for improved performance with large data sets.
@@ -328,74 +381,85 @@ export const SortIndicator: React.StatelessComponent<{ sortDirection: SortDirect
  */
 export class Table extends PureComponent<TableProps> {
     static propTypes: {
-        'aria-label': Requireable<string>,
-        autoHeight: Requireable<boolean>,
-        children: Validator<Column>,
-        className: Requireable<string>,
-        disableHeader: Requireable<boolean>,
-        estimatedRowSize: Validator<number>,
-        gridClassName: Requireable<string>,
-        gridStyle: Requireable<React.CSSProperties>,
-        headerClassName: Requireable<string>,
-        headerHeight: Validator<number>,
-        headerRowRenderer: Requireable<TableHeaderRowRenderer>,
-        headerStyle: Requireable<React.CSSProperties>,
-        height: Validator<number>,
-        id: Requireable<string>,
-        noRowsRenderer: Requireable<() => JSX.Element>,
-        onHeaderClick: Requireable<(params: HeaderMouseEventHandlerParams) => void>,
-        onRowClick: Requireable<(params: RowMouseEventHandlerParams) => void>,
-        onRowDoubleClick: Requireable<(params: RowMouseEventHandlerParams) => void>,
-        onRowMouseOut: Requireable<(params: RowMouseEventHandlerParams) => void>,
-        onRowMouseOver: Requireable<(params: RowMouseEventHandlerParams) => void>,
-        onRowsRendered: Requireable<(params: RowMouseEventHandlerParams) => void>,
-        onScroll: Requireable<(params: ScrollEventData) => void>,
-        overscanRowCount: Validator<number>,
-        rowClassName: Requireable<string | ((params: Index) => string)>,
-        rowGetter: Validator<(params: Index) => any>,
-        rowHeight: Validator<number | ((params: Index) => number)>,
-        rowCount: Validator<number>,
-        rowRenderer: Requireable<(props: TableRowProps) => React.ReactNode>,
-        rowStyle: Validator<React.CSSProperties | ((params: Index) => React.CSSProperties)>,
-        scrollToAlignment: Validator<Alignment>,
-        scrollToIndex: Validator<number>,
-        scrollTop: Requireable<number>,
-        sort: Requireable<(params: { sortBy: string, sortDirection: SortDirectionType }) => void>,
-        sortBy: Requireable<string>,
-        sortDirection: Validator<SortDirectionType>,
-        style: Requireable<React.CSSProperties>,
-        tabIndex: Requireable<number>,
-        width: Validator<number>
+        "aria-label": Requireable<string>;
+        autoHeight: Requireable<boolean>;
+        children: Validator<Column>;
+        className: Requireable<string>;
+        disableHeader: Requireable<boolean>;
+        estimatedRowSize: Validator<number>;
+        gridClassName: Requireable<string>;
+        gridStyle: Requireable<React.CSSProperties>;
+        headerClassName: Requireable<string>;
+        headerHeight: Validator<number>;
+        headerRowRenderer: Requireable<TableHeaderRowRenderer>;
+        headerStyle: Requireable<React.CSSProperties>;
+        height: Validator<number>;
+        id: Requireable<string>;
+        noRowsRenderer: Requireable<() => JSX.Element>;
+        onHeaderClick: Requireable<
+            (params: HeaderMouseEventHandlerParams) => void
+        >;
+        onRowClick: Requireable<(params: RowMouseEventHandlerParams) => void>;
+        onRowDoubleClick: Requireable<
+            (params: RowMouseEventHandlerParams) => void
+        >;
+        onRowMouseOut: Requireable<
+            (params: RowMouseEventHandlerParams) => void
+        >;
+        onRowMouseOver: Requireable<
+            (params: RowMouseEventHandlerParams) => void
+        >;
+        onRowsRendered: Requireable<
+            (params: RowMouseEventHandlerParams) => void
+        >;
+        onScroll: Requireable<(params: ScrollEventData) => void>;
+        overscanRowCount: Validator<number>;
+        rowClassName: Requireable<string | ((params: Index) => string)>;
+        rowGetter: Validator<(params: Index) => any>;
+        rowHeight: Validator<number | ((params: Index) => number)>;
+        rowCount: Validator<number>;
+        rowRenderer: Requireable<(props: TableRowProps) => React.ReactNode>;
+        rowStyle: Validator<
+            React.CSSProperties | ((params: Index) => React.CSSProperties)
+        >;
+        scrollToAlignment: Validator<Alignment>;
+        scrollToIndex: Validator<number>;
+        scrollTop: Requireable<number>;
+        sort: Requireable<
+            (
+                params: { sortBy: string; sortDirection: SortDirectionType }
+            ) => void
+        >;
+        sortBy: Requireable<string>;
+        sortDirection: Validator<SortDirectionType>;
+        style: Requireable<React.CSSProperties>;
+        tabIndex: Requireable<number>;
+        width: Validator<number>;
     };
 
     static defaultProps: {
-        disableHeader: false,
-        estimatedRowSize: 30,
-        headerHeight: 0,
-        headerStyle: {},
-        noRowsRenderer: () => null,
-        onRowsRendered: () => null,
-        onScroll: () => null,
-        overscanRowCount: 10,
-        rowRenderer: TableRowRenderer,
-        headerRowRenderer: TableHeaderRenderer,
-        rowStyle: {},
-        scrollToAlignment: 'auto',
-        scrollToIndex: -1,
-        style: {}
+        disableHeader: false;
+        estimatedRowSize: 30;
+        headerHeight: 0;
+        headerStyle: {};
+        noRowsRenderer: () => null;
+        onRowsRendered: () => null;
+        onScroll: () => null;
+        overscanRowCount: 10;
+        rowRenderer: TableRowRenderer;
+        headerRowRenderer: TableHeaderRenderer;
+        rowStyle: {};
+        scrollToAlignment: "auto";
+        scrollToIndex: -1;
+        style: {};
     };
 
     Grid: Grid;
 
-    constructor(props: TableProps);
-
     forceUpdateGrid(): void;
 
     /** See Grid#getOffsetForCell */
-    getOffsetForRow(params: {
-        alignment?: Alignment,
-        index?: number
-    }): number;
+    getOffsetForRow(params: { alignment?: Alignment; index?: number }): number;
 
     /** See Grid#scrollToPosition */
     scrollToPosition(scrollTop?: number): void;
@@ -407,11 +471,5 @@ export class Table extends PureComponent<TableProps> {
     recomputeRowHeights(index?: number): void;
 
     /** See Grid#scrollToCell */
-    scrollToRow(index?: number): void
-
-    componentDidMount(): void;
-
-    componentDidUpdate(): void;
-
-    render(): JSX.Element;
+    scrollToRow(index?: number): void;
 }
diff --git a/types/react-virtualized/dist/es/WindowScroller.d.ts b/types/react-virtualized/dist/es/WindowScroller.d.ts
index d19e83c06d..723862485f 100644
--- a/types/react-virtualized/dist/es/WindowScroller.d.ts
+++ b/types/react-virtualized/dist/es/WindowScroller.d.ts
@@ -1,28 +1,55 @@
-import { Validator, Requireable, PureComponent } from 'react'
+import { Validator, Requireable, PureComponent } from "react";
+
+/**
+ * Specifies the number of miliseconds during which to disable pointer events while a scroll is in progress.
+ * This improves performance and makes scrolling smoother.
+ */
+export const IS_SCROLLING_TIMEOUT = 150;
 
 export type WindowScrollerChildProps = {
-    height: number,
-    width: number,
-    isScrolling: boolean,
-    scrollTop: number,
-    onChildScroll: () => void
+    height: number;
+    width: number;
+    isScrolling: boolean;
+    scrollTop: number;
+    onChildScroll: () => void;
 };
 
 export type WindowScrollerProps = {
     /**
      * Function responsible for rendering children.
      * This function should implement the following signature:
-     * ({ height: number, width: number, isScrolling: boolean, scrollTop: number, onChildScroll: function }) => PropTypes.element
+     * ({ height, isScrolling, scrollLeft, scrollTop, width }) => PropTypes.element
      */
-    children?: (props: WindowScrollerChildProps) => React.ReactNode;
-    /** Callback to be invoked on-resize: ({ height }) */
-    onResize?: (params: { height: number, width: number }) => void;
-    /** Callback to be invoked on-scroll: ({ scrollTop }) */
-    onScroll?: (params: { scrollTop: number }) => void;
+    children: (
+        params: {
+            onChildScroll: ({ scrollTop: number }) => void;
+            registerChild: (params?: Element) => void;
+            height: number;
+            isScrolling: boolean;
+            scrollLeft: number;
+            scrollTop: number;
+            width: number;
+        }
+    ) => React.ReactNode;
+
+    /** Callback to be invoked on-resize: ({ height, width }) */
+    onResize?: (params: { height: number; width: number }) => void;
+
+    /** Callback to be invoked on-scroll: ({ scrollLeft, scrollTop }) */
+    onScroll?: (params: { scrollLeft: number; scrollTop: number }) => void;
+
     /** Element to attach scroll event listeners. Defaults to window. */
-    scrollElement?: HTMLElement;
-    /** Wait this amount of time after the last scroll event before resetting WindowScroller pointer-events; defaults to 150ms */
+    scrollElement?: typeof window | Element;
+    /**
+     * Wait this amount of time after the last scroll event before resetting child `pointer-events`.
+     */
     scrollingResetTimeInterval?: number;
+
+    /** Height used for server-side rendering */
+    serverHeight?: number;
+
+    /** Width used for server-side rendering */
+    serverWidth?: number;
     /**
      * PLEASE NOTE
      * The [key: string]: any; line is here on purpose
@@ -31,43 +58,28 @@ export type WindowScrollerProps = {
      * https://github.com/bvaughn/react-virtualized#pass-thru-props
      */
     [key: string]: any;
-}
+};
 
 export type WindowScrollerState = {
-    height: number,
-    width: number,
-    isScrolling: boolean,
-    scrollLeft: number
-    scrollTop: number
-}
-
-export class WindowScroller extends PureComponent<WindowScrollerProps, WindowScrollerState> {
-    static propTypes: {
-        children: Requireable<(props: WindowScrollerChildProps) => React.ReactNode>,
-        onResize: Validator<(params: { height: number, width: number }) => void>,
-        onScroll: Validator<(params: { scrollTop: number }) => void>,
-        scrollElement: Validator<HTMLElement>,
-        scrollingResetTimeInterval: Validator<number>
-    };
+    height: number;
+    width: number;
+    isScrolling: boolean;
+    scrollLeft: number;
+    scrollTop: number;
+};
 
+export class WindowScroller extends PureComponent<
+    WindowScrollerProps,
+    WindowScrollerState
+> {
     static defaultProps: {
-        onResize: () => {},
-        onScroll: () => {},
-        scrollingResetTimeInterval: 150
+        onResize: () => void;
+        onScroll: () => void;
+        scrollingResetTimeInterval: typeof IS_SCROLLING_TIMEOUT;
+        scrollElement: Window | undefined;
+        serverHeight: 0;
+        serverWidth: 0;
     };
 
-    constructor(props: WindowScrollerProps);
-
-    // Can’t use defaultProps for scrollElement without breaking server-side rendering
-    readonly scrollElement: HTMLElement | Window;
-
     updatePosition(scrollElement?: HTMLElement): void;
-
-    componentDidMount(): void;
-
-    componentWillReceiveProps(nextProps: WindowScrollerProps): void;
-
-    componentWillUnmount(): void;
-
-    render(): JSX.Element;
 }
diff --git a/types/react-virtualized/index.d.ts b/types/react-virtualized/index.d.ts
index 18710b4983..7c6b5d11fb 100644
--- a/types/react-virtualized/index.d.ts
+++ b/types/react-virtualized/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-virtualized 9.7
+// Type definitions for react-virtualized 9.18
 // Project: https://github.com/bvaughn/react-virtualized
 // Definitions by: Kalle Ott <https://github.com/kaoDev>
 //                 John Gunther <https://github.com/guntherjh>
@@ -13,20 +13,22 @@
 export {
     ArrowKeyStepper,
     ArrowKeyStepperProps,
-    ChildProps as ArrowKeyStepperChildProps
-} from './dist/es/ArrowKeyStepper'
+    ChildProps as ArrowKeyStepperChildProps,
+    ScrollIndices
+} from "./dist/es/ArrowKeyStepper";
 export {
     AutoSizer,
     AutoSizerProps,
-    Dimensions
-} from './dist/es/AutoSizer'
+    Dimensions,
+    Size
+} from "./dist/es/AutoSizer";
 export {
     CellMeasurer,
     CellMeasurerCache,
     CellMeasurerCacheParams,
     CellMeasurerProps,
     KeyMapper
-} from './dist/es/CellMeasurer'
+} from "./dist/es/CellMeasurer";
 export {
     Collection,
     CollectionCellGroupRenderer,
@@ -36,12 +38,12 @@ export {
     CollectionCellSizeAndPosition,
     CollectionCellSizeAndPositionGetter,
     CollectionProps
-} from './dist/es/Collection'
+} from "./dist/es/Collection";
 export {
     ColumnSizer,
     ColumnSizerProps,
     SizedColumnProps
-} from './dist/es/ColumnSizer'
+} from "./dist/es/ColumnSizer";
 export {
     accessibilityOverscanIndicesGetter,
     defaultOverscanIndicesGetter,
@@ -64,18 +66,13 @@ export {
     SectionRenderedParams,
     SizeAndPositionData,
     VisibleCellRange
-} from './dist/es/Grid'
+} from "./dist/es/Grid";
 export {
     InfiniteLoader,
     InfiniteLoaderChildProps,
     InfiniteLoaderProps
-} from './dist/es/InfiniteLoader'
-export {
-    List,
-    ListProps,
-    ListRowProps,
-    ListRowRenderer
-} from './dist/es/List'
+} from "./dist/es/InfiniteLoader";
+export { List, ListProps, ListRowProps, ListRowRenderer } from "./dist/es/List";
 export {
     createCellPositioner as createMasonryCellPositioner,
     Masonry,
@@ -87,20 +84,17 @@ export {
     OnScrollCallback,
     Position,
     Positioner
-} from './dist/es/Masonry'
-export {
-    MultiGrid,
-    MultiGridProps,
-    MultiGridState
-} from './dist/es/MultiGrid'
+} from "./dist/es/Masonry";
+export { MultiGrid, MultiGridProps, MultiGridState } from "./dist/es/MultiGrid";
 export {
     ScrollSync,
     OnScrollParams,
     ScrollSyncChildProps,
     ScrollSyncProps,
     ScrollSyncState
-} from './dist/es/ScrollSync'
+} from "./dist/es/ScrollSync";
 export {
+    createMultiSort as createTableMultiSort,
     defaultCellDataGetter as defaultTableCellDataGetter,
     defaultCellRenderer as defaultTableCellRenderer,
     defaultHeaderRenderer as defaultTableHeaderRenderer,
@@ -125,51 +119,52 @@ export {
     TableProps,
     TableRowProps,
     TableRowRenderer
-} from './dist/es/Table'
+} from "./dist/es/Table";
 export {
     WindowScroller,
     WindowScrollerChildProps,
     WindowScrollerProps,
-    WindowScrollerState
-} from './dist/es/WindowScroller'
+    WindowScrollerState,
+    IS_SCROLLING_TIMEOUT
+} from "./dist/es/WindowScroller";
 
 export type Index = {
-    index: number
+    index: number;
 };
 
 export type PositionInfo = {
-    x: number,
-    y: number
+    x: number;
+    y: number;
 };
 
 export type ScrollPosition = {
-    scrollLeft: number,
-    scrollTop: number
+    scrollLeft: number;
+    scrollTop: number;
 };
 
 export type SizeInfo = {
-    height: number,
-    width: number
+    height: number;
+    width: number;
 };
 
 export type SizeAndPositionInfo = SizeInfo & PositionInfo;
 
 export type Map<T> = { [key: string]: T };
 
-export type Alignment = 'auto' | 'end' | 'start' | 'center';
+export type Alignment = "auto" | "end" | "start" | "center";
 
 export type IndexRange = {
-    startIndex: number,
-    stopIndex: number
-}
+    startIndex: number;
+    stopIndex: number;
+};
 
 export type OverscanIndexRange = {
-    overscanStartIndex: number,
-    overscanStopIndex: number,
-}
+    overscanStartIndex: number;
+    overscanStopIndex: number;
+};
 
 export type ScrollEventData = {
-    clientHeight: number,
-    scrollHeight: number,
-    scrollTop: number
-}
+    clientHeight: number;
+    scrollHeight: number;
+    scrollTop: number;
+};
diff --git a/types/react-virtualized/tsconfig.json b/types/react-virtualized/tsconfig.json
index 4457f73e3d..9a6a1ce9de 100644
--- a/types/react-virtualized/tsconfig.json
+++ b/types/react-virtualized/tsconfig.json
@@ -1,22 +1,18 @@
 {
     "compilerOptions": {
         "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
+        "lib": ["es6", "dom"],
         "noImplicitAny": false,
         "noImplicitThis": true,
         "strictNullChecks": false,
         "strictFunctionTypes": false,
         "jsx": "react",
         "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
+        "typeRoots": ["../"],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true
+        "forceConsistentCasingInFileNames": true,
+        "target": "es5"
     },
     "files": [
         "index.d.ts",
@@ -48,4 +44,4 @@
         "dist/commonjs/WindowScroller.d.ts",
         "react-virtualized-tests.tsx"
     ]
-}
\ No newline at end of file
+}

From 775ade8fa63b5d5baa2cd5ae8a64d0c01fc28242 Mon Sep 17 00:00:00 2001
From: ramlez <ramlez@users.noreply.github.com>
Date: Wed, 11 Apr 2018 21:08:06 +0200
Subject: [PATCH 1224/1382] [BSON] add types for missing `calculateObjectSize`
 method (#24901)

---
 types/bson/bson-tests.ts |  9 ++++++++-
 types/bson/index.d.ts    | 16 ++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/types/bson/bson-tests.ts b/types/bson/bson-tests.ts
index ebdd8a19c3..b3173053c8 100644
--- a/types/bson/bson-tests.ts
+++ b/types/bson/bson-tests.ts
@@ -6,7 +6,7 @@ bson.ObjectID.cacheHexString = true
 let BSON = new bson.BSON();
 let Long = bson.Long;
 
-let doc = {long: Long.fromNumber(100)}
+let doc = { long: Long.fromNumber(100) }
 
 // Serialize a document
 let data = BSON.serialize(doc, false, true, false);
@@ -19,3 +19,10 @@ console.log("doc_2:", doc_2);
 BSON = new bson.BSON();
 data = BSON.serialize(doc);
 doc_2 = BSON.deserialize(data);
+
+
+// Calculate Object Size
+BSON = new bson.BSON();
+console.log("Calculated Object size - no options object:", BSON.calculateObjectSize(doc));
+console.log("Calculated Object size - empty options object:", BSON.calculateObjectSize(doc, {}));
+console.log("Calculated Object size - custom options object:", BSON.calculateObjectSize(doc, { ignoreUndefined: false, serializeFunctions: true }));
diff --git a/types/bson/index.d.ts b/types/bson/index.d.ts
index 24372ff0f5..3b0feb0113 100644
--- a/types/bson/index.d.ts
+++ b/types/bson/index.d.ts
@@ -16,6 +16,14 @@ export interface DeserializeOptions {
     /** {Boolean, default:false}, deserialize Binary data directly into node.js Buffer object. */
     promoteBuffers?: boolean;
 }
+
+export interface CalculateObjectSizeOptions {
+    /** {Boolean, default:false}, serialize the javascript functions */
+    serializeFunctions?: boolean;
+    /** {Boolean, default:true}, ignore undefined fields. */
+    ignoreUndefined?: boolean;
+}
+
 export class BSON {
     /**
      * @param {Object} object the Javascript object to serialize.
@@ -26,6 +34,14 @@ export class BSON {
      */
     serialize(object: any, checkKeys?: boolean, asBuffer?: boolean, serializeFunctions?: boolean): Buffer;
     deserialize(buffer: Buffer, options?: DeserializeOptions, isArray?: boolean): any;
+    /**
+     * Calculate the bson size for a passed in Javascript object.
+     *
+     * @param {Object} object the Javascript object to calculate the BSON byte size for.
+     * @param {CalculateObjectSizeOptions} Options
+     * @return {Number} returns the number of bytes the BSON object will take up.
+     */
+    calculateObjectSize(object: any, options?: CalculateObjectSizeOptions): number;
 }
 
 export class Binary {

From a0ca17240ae77638c933461a44acbf23739ce662 Mon Sep 17 00:00:00 2001
From: Gintautas <GintasG@users.noreply.github.com>
Date: Wed, 11 Apr 2018 22:09:01 +0300
Subject: [PATCH 1225/1382] Added superagent retry callback (#24903)

https://visionmedia.github.io/superagent/
---
 types/superagent/index.d.ts          | 2 +-
 types/superagent/superagent-tests.ts | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/types/superagent/index.d.ts b/types/superagent/index.d.ts
index 200046d439..6520b4eb66 100644
--- a/types/superagent/index.d.ts
+++ b/types/superagent/index.d.ts
@@ -136,7 +136,7 @@ declare namespace request {
         query(val: object | string): this;
         redirects(n: number): this;
         responseType(type: string): this;
-        retry(count?: number): this;
+        retry(count?: number, callback?: CallbackHandler): this;
         send(data?: string | object): this;
         serialize(serializer: Serializer): this;
         set(field: object): this;
diff --git a/types/superagent/superagent-tests.ts b/types/superagent/superagent-tests.ts
index bbea2d617c..351e78b156 100644
--- a/types/superagent/superagent-tests.ts
+++ b/types/superagent/superagent-tests.ts
@@ -252,6 +252,10 @@ request
     .get('http://example.com/search')
     .retry(2)
     .end(callback);
+request
+    .get('http://example.com/search')
+    .retry(2, callback)
+    .end(callback);
 
 (() => {
     const stream = fs.createWriteStream('path/to/my.json');

From 3ca6e33abfd9831f169e27285c47e4d052b81f5c Mon Sep 17 00:00:00 2001
From: Arda TANRIKULU <ardatanrikulu@gmail.com>
Date: Wed, 11 Apr 2018 22:12:10 +0300
Subject: [PATCH 1226/1382] fix meteor server-render package typings (#24915)

* ServiceConfiguration types added

* New usage of publishComposite added to meteor-publish-composite

* meteor/underscore added

* [meteor/server-render] Sink methods are optional

* fix onPageLoad

* refactor
---
 types/meteor/server-render.d.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/types/meteor/server-render.d.ts b/types/meteor/server-render.d.ts
index 1695142ee4..0f78cac1c0 100644
--- a/types/meteor/server-render.d.ts
+++ b/types/meteor/server-render.d.ts
@@ -12,5 +12,7 @@ declare module "meteor/server-render" {
         appendToElementById?(id: string, html: string): void;
         renderIntoElementById?(id: string, html: string): void;
     }
-    function onPageLoad(sink: Sink): Promise<any> | any;
+    
+    type Callback = (sink: Sink) => Promise <any> | any;
+    export function onPageLoad<T extends Callback>(callback: T): T;
 }

From 40c7baae326a38c745493a9aec53c3d17e07661b Mon Sep 17 00:00:00 2001
From: Josh Goldberg <joshuakgoldberg@outlook.com>
Date: Wed, 11 Apr 2018 12:13:03 -0700
Subject: [PATCH 1227/1382] Removed myself from React types authors list
 (#24921)

So many notifications!
---
 types/react/index.d.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index b4c350e7d7..c1be48ddce 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -14,7 +14,6 @@
 //                 Stéphane Goetz <https://github.com/onigoetz>
 //                 Josh Rutherford <https://github.com/theruther4d>
 //                 Guilherme Hübner <https://github.com/guilhermehubner>
-//                 Josh Goldberg <https://github.com/joshuakgoldberg>
 //                 Ferdy Budhidharma <https://github.com/ferdaber>
 //                 Johann Rakotoharisoa <https://github.com/jrakotoharisoa>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From fe3fcd77c952fdc23670f0a1c66431384c10862c Mon Sep 17 00:00:00 2001
From: Tom Crockett <pelotom@gmail.com>
Date: Wed, 11 Apr 2018 14:34:31 -0700
Subject: [PATCH 1228/1382] [React] Remove string index fallback for CSS
 properties (#24911)

* [React] Remove string index fallback for CSS properties (resolves #24568)

* Require a minimum version of 2.2 for csstype

* Fix aphrodite types

* Fix react-confirm test

* Use Omit

* Fix react-geosuggest types

* Fix victory test

* Make customStyle and customStyleOnEditCell into functions
---
 types/aphrodite/index.d.ts                  | 37 +++++++++++++--------
 types/aphrodite/package.json                |  6 ++++
 types/react-bootstrap-table/index.d.ts      |  4 +--
 types/react-confirm/react-confirm-tests.tsx |  6 ++--
 types/react-geosuggest/index.d.ts           | 10 +++++-
 types/react/index.d.ts                      |  6 +---
 types/react/package.json                    |  2 +-
 types/victory/victory-tests.tsx             |  2 +-
 8 files changed, 46 insertions(+), 27 deletions(-)
 create mode 100644 types/aphrodite/package.json

diff --git a/types/aphrodite/index.d.ts b/types/aphrodite/index.d.ts
index 9684895588..583e84e996 100644
--- a/types/aphrodite/index.d.ts
+++ b/types/aphrodite/index.d.ts
@@ -4,27 +4,36 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
-import * as React from "react";
+import * as CSS from "csstype";
+
+type BaseCSSProperties = CSS.Properties<number | string>;
 
 type FontFamily =
-    | React.CSSProperties['fontFamily']
-    | Pick<React.CSSProperties,
-        | 'fontFamily'
-        | 'fontStyle'
-        | 'fontWeight'
-        | 'src'
-    >
+    | BaseCSSProperties['fontFamily']
+    | CSS.FontFace;
+
+// Replace with Exclude once on 2.8+
+type Diff<T extends string, U extends string> = (
+    & { [P in T]: P }
+    & { [P in U]: never }
+    & { [x: string]: never }
+)[T];
+type Omit<T, K extends keyof T> = Pick<T, Diff<keyof T, K>>;
+
+type CSSProperties = Omit<BaseCSSProperties, 'fontFamily'> & {
+    fontFamily?: FontFamily | FontFamily[];
+};
+
+// For pseudo selectors and media queries
+interface OpenCSSProperties  extends CSSProperties {
+    [k: string]: CSSProperties[keyof CSSProperties] | CSSProperties;
+}
 
 /**
  * Aphrodite style declaration
  */
 export interface StyleDeclaration {
-    [key: string]: Pick<React.CSSProperties, (
-        & React.CSSProperties
-        & { fontFamily: never }
-    )[keyof React.CSSProperties]> & {
-        fontFamily?: FontFamily | FontFamily[];
-    };
+    [key: string]: OpenCSSProperties;
 }
 
 interface StyleSheetStatic {
diff --git a/types/aphrodite/package.json b/types/aphrodite/package.json
new file mode 100644
index 0000000000..e6696d08e7
--- /dev/null
+++ b/types/aphrodite/package.json
@@ -0,0 +1,6 @@
+{
+  "private": true,
+  "dependencies": {
+    "csstype": "^2.2.0"
+  }
+}
diff --git a/types/react-bootstrap-table/index.d.ts b/types/react-bootstrap-table/index.d.ts
index 1ad6b3be73..6e9fd1dea8 100644
--- a/types/react-bootstrap-table/index.d.ts
+++ b/types/react-bootstrap-table/index.d.ts
@@ -1857,7 +1857,7 @@ export interface KeyboardNavigation {
 	/**
 	 * Return a style object which will be applied on the navigating cell.
 	 */
-	customStyle?: CSSProperties;
+	customStyle?(cell: any, row: any): CSSProperties;
 	/**
 	 * Set to false to disable click to navigate, usually user wants to click to select row instead of navigation.
 	 */
@@ -1865,7 +1865,7 @@ export interface KeyboardNavigation {
 	/**
 	 * Return a style object which will be applied on the both of navigating and editing cell.
 	 */
-	customStyleOnEditCell?: CSSProperties;
+	customStyleOnEditCell?(cell: any, row: any): CSSProperties;
 	/**
 	 * When set to true, pressing ENTER will begin to edit the cell if cellEdit is also enabled.
 	 */
diff --git a/types/react-confirm/react-confirm-tests.tsx b/types/react-confirm/react-confirm-tests.tsx
index a062b1e2a2..cfa3499ffc 100644
--- a/types/react-confirm/react-confirm-tests.tsx
+++ b/types/react-confirm/react-confirm-tests.tsx
@@ -6,13 +6,13 @@ interface CustomModalProps {
 }
 
 class CustomModal extends React.Component<CustomModalProps & ReactConfirmProps> {
-    modalStyle(): string {
-        return this.props.show ? "display: none;" : "";
+    modalStyle() {
+        return this.props.show ? { display: 'none' } : undefined;
     }
 
     render() {
         return (
-            <div style={this.modalStyle}>
+            <div style={this.modalStyle()}>
                 <h1>{this.props.title}</h1>
 
                 <div>
diff --git a/types/react-geosuggest/index.d.ts b/types/react-geosuggest/index.d.ts
index 2537754b02..344e768b08 100644
--- a/types/react-geosuggest/index.d.ts
+++ b/types/react-geosuggest/index.d.ts
@@ -16,7 +16,15 @@ export default class Geosuggest extends Component<GeosuggestProps> {
     selectSuggest(value?: Suggest): void;
 }
 
-export interface GeosuggestProps extends InputHTMLAttributes<HTMLInputElement> {
+// Replace with Exclude once on 2.8+
+export type Diff<T extends string, U extends string> = (
+    & { [P in T]: P }
+    & { [P in U]: never }
+    & { [x: string]: never }
+)[T];
+export type Omit<T, K extends keyof T> = Pick<T, Diff<keyof T, K>>;
+
+export interface GeosuggestProps extends Omit<InputHTMLAttributes<HTMLInputElement>, 'style'> {
     placeholder?: string;
     initialValue?: string;
     className?: string;
diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index c1be48ddce..50dca5578b 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -897,11 +897,7 @@ declare namespace React {
         onTransitionEndCapture?: TransitionEventHandler<T>;
     }
 
-    export interface CSSProperties extends CSS.Properties<string | number> {
-        // The string index signature fallback is needed at least until csstype
-        // provides SVG CSS properties: https://github.com/frenic/csstype/issues/4
-        [propertyName: string]: any;
-    }
+    export interface CSSProperties extends CSS.Properties<string | number> {}
 
     interface HTMLAttributes<T> extends DOMAttributes<T> {
         // React-specific Attributes
diff --git a/types/react/package.json b/types/react/package.json
index f3be220fbc..e6696d08e7 100644
--- a/types/react/package.json
+++ b/types/react/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
   "dependencies": {
-    "csstype": "^2.0.0"
+    "csstype": "^2.2.0"
   }
 }
diff --git a/types/victory/victory-tests.tsx b/types/victory/victory-tests.tsx
index 56f9d34b54..3b882c7583 100644
--- a/types/victory/victory-tests.tsx
+++ b/types/victory/victory-tests.tsx
@@ -158,7 +158,7 @@ test = (
           grid: {strokeWidth: 2},
           ticks: {stroke: "red"},
           tickLabels: {fontSize: 12},
-          axisLabel: {fontsize: 16}
+          axisLabel: {fontSize: 16}
         }}
         label="Planets"
         tickValues={[

From c61cfb100370f8d3762ba1ef93dccd3a5e4a6eeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Zugmeyer?= <bzugmeyer@gmail.com>
Date: Thu, 12 Apr 2018 01:14:16 +0200
Subject: [PATCH 1229/1382] [chart.js] the `text` property of title options can
 be `string[]` (#24923)

See the [chart.js
documentation](http://www.chartjs.org/docs/latest/configuration/title.html):
"if specified as an array, text is rendered on multiple lines."
---
 types/chart.js/chart.js-tests.ts | 3 +++
 types/chart.js/index.d.ts        | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/types/chart.js/chart.js-tests.ts b/types/chart.js/chart.js-tests.ts
index 03c347fee7..9e6117c5e5 100644
--- a/types/chart.js/chart.js-tests.ts
+++ b/types/chart.js/chart.js-tests.ts
@@ -24,6 +24,9 @@ const chart: Chart = new Chart(new CanvasRenderingContext2D(), {
         onHover(ev: MouseEvent, points: any[]) {
           return;
         },
+        title: {
+            text: ["foo", "bar"]
+        },
         tooltips: {
             filter: data => Number(data.yLabel) > 0,
             intersect: true,
diff --git a/types/chart.js/index.d.ts b/types/chart.js/index.d.ts
index 9e1a511229..a2ea423cb8 100644
--- a/types/chart.js/index.d.ts
+++ b/types/chart.js/index.d.ts
@@ -219,7 +219,7 @@ declare namespace Chart {
         fontColor?: ChartColor;
         fontStyle?: string;
         padding?: number;
-        text?: string;
+        text?: string | string[];
     }
 
     interface ChartLegendOptions {

From 70d32cd228c442786ae44ddf3acb821693df629f Mon Sep 17 00:00:00 2001
From: denisname <denisname@users.noreply.github.com>
Date: Thu, 12 Apr 2018 01:14:42 +0200
Subject: [PATCH 1230/1382] Update to bootstrap 4.1 (#24928)

---
 types/bootstrap/bootstrap-tests.ts | 11 +++++++++++
 types/bootstrap/index.d.ts         | 29 +++++++++++++++++++++++++++--
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/types/bootstrap/bootstrap-tests.ts b/types/bootstrap/bootstrap-tests.ts
index 21286ad5f4..f0a353889c 100755
--- a/types/bootstrap/bootstrap-tests.ts
+++ b/types/bootstrap/bootstrap-tests.ts
@@ -43,10 +43,15 @@ $("#carousel").on("slide.bs.carousel", function(ev) {
 $("#carousel").carousel({
     interval: 5000,
     keyboard: true,
+    slide: false,
     pause: "hover",
     wrap: true,
 });
 
+$("#carousel").carousel({
+    slide: "prev",
+});
+
 $("#carousel").carousel({
     pause: false,
 });
@@ -96,6 +101,8 @@ $("#dropdown").dropdown({
     offset: 10,
     flip: false,
     boundary: "window",
+    reference: "toggle",
+    display: "dynamic",
 });
 
 $("#dropdown").dropdown({
@@ -114,6 +121,10 @@ $("#dropdown").dropdown({
     boundary: document.body,
 });
 
+$("#dropdown").dropdown({
+    reference: document.body,
+});
+
 // --------------------------------------------------------------------------------------
 // Modal
 // --------------------------------------------------------------------------------------
diff --git a/types/bootstrap/index.d.ts b/types/bootstrap/index.d.ts
index 88bcc66af8..2f43555a73 100755
--- a/types/bootstrap/index.d.ts
+++ b/types/bootstrap/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Bootstrap 4.0
+// Type definitions for Bootstrap 4.1
 // Project: https://github.com/twbs/bootstrap/
 // Definitions by: denisname <https://github.com/denisname>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -55,6 +55,14 @@ export interface CarouselOption {
      */
     keyboard?: boolean;
 
+    /**
+     * Use to easily control the position of the carousel. It accepts the keywords prev or next, which alters the slide position
+     * relative to its current position. Alternatively, use `data-slide-to` to pass a raw slide index to the carousel.
+     *
+     * @default false
+     */
+    slide?: "next" | "prev" | false;
+
     /**
      * If set to "hover", pauses the cycling of the carousel on mouseenter and resumes the cycling of the carousel on mouseleave.
      * If set to false, hovering over the carousel won't pause it.
@@ -116,6 +124,21 @@ export interface DropdownOption {
      * @default "scrollParent"
      */
     boundary?: Popper.Boundary | HTMLElement;
+
+    /**
+     * Reference element of the dropdown menu. Accepts the values of 'toggle', 'parent', or an HTMLElement reference.
+     * For more information refer to Popper.js's referenceObject docs.
+     *
+     * @default "toggle"
+     */
+    reference?: "toggle" | "parent" | HTMLElement;
+
+    /**
+     * By default, we use Popper.js for dynamic positioning. Disable this with 'static'.
+     *
+     * @default "dynamic"
+     */
+    display?: "dynamic" | "static";
 }
 
 export interface ModalOption {
@@ -154,6 +177,8 @@ export interface PopoverOption extends TooltipOption {
      * Default content value if data-content attribute isn't present.
      * If a function is given, it will be called with its this reference
      * set to the element that the popover is attached to.
+     *
+     * @default ""
      */
     content?: string | Element | ((this: Element) => string | Element);
 }
@@ -226,7 +251,7 @@ export interface TooltipOption {
      * the tooltip or popover DOM node as its first argument and the triggering element DOM node as its second.
      * The this context is set to the tooltip or popover instance.
      *
-     * @default "top"
+     * @default tooltip: "top", popover: "right"
      */
     placement?: Placement | ((this: TooltipInstance<this>, node: HTMLElement, trigger: Element) => Placement);
 

From 72d8a9e5e67928596e44c9cb92620520d52f1e06 Mon Sep 17 00:00:00 2001
From: Andy <anhans@microsoft.com>
Date: Wed, 11 Apr 2018 16:15:03 -0700
Subject: [PATCH 1231/1382] phonegap-nfc: Fix test (#24930)

---
 types/phonegap-nfc/phonegap-nfc-tests.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/phonegap-nfc/phonegap-nfc-tests.ts b/types/phonegap-nfc/phonegap-nfc-tests.ts
index 50eb34f293..b61009a7da 100644
--- a/types/phonegap-nfc/phonegap-nfc-tests.ts
+++ b/types/phonegap-nfc/phonegap-nfc-tests.ts
@@ -117,6 +117,7 @@ let ndefTagEvent = {
     AT_TARGET: 0,
     BUBBLING_PHASE: 0,
     CAPTURING_PHASE: 0,
+    NONE: 0,
     scoped: false,
     deepPath(): any { },
     tag: ndefTag

From 9db24f13b5e100032f8d84893c846ccaad6304f6 Mon Sep 17 00:00:00 2001
From: jphhoeks <jphhoeks@users.noreply.github.com>
Date: Thu, 12 Apr 2018 01:15:40 +0200
Subject: [PATCH 1232/1382] react-onsenui: added missing definition for Select
 component (#24909)

* Fix: added missing definition for Select component in react-onsenui typings

* react-onsenui: updated version number
---
 types/react-onsenui/index.d.ts | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/types/react-onsenui/index.d.ts b/types/react-onsenui/index.d.ts
index 27a664d27a..00437e099b 100644
--- a/types/react-onsenui/index.d.ts
+++ b/types/react-onsenui/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for React Onsen UI (react-onsenui) 2.8
+// Type definitions for React Onsen UI (react-onsenui) 2.9
 // Project: https://onsen.io/v2/docs/guide/react/
 // Definitions by: Ozytis <https://ozytis.fr>, Salim <https://github.com/salim7>, Jemmyw <https://github.com/jemmyw>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -336,6 +336,18 @@ export class Range extends Component<{
     disabled?: boolean,
 }, any> {}
 
+export class Select extends Component<{
+    modifier?: string,
+    disabled?: boolean,
+    onChange?: (e: React.ChangeEvent<any>) => void,
+    value?: string,
+    multiple?: boolean,
+    autofocus?: boolean,
+    required?: boolean,
+    form?: string,
+    size?: string
+}, any> {}
+
 export class Switch extends Component<{
     onChange?(e: SwitchChangeEvent): void,
     checked?: boolean,

From d113bbc18a95346a55749bab15f554f19e4d75be Mon Sep 17 00:00:00 2001
From: Kerwyn <kerwyn.rg@gmail.com>
Date: Wed, 11 Apr 2018 17:15:58 -0600
Subject: [PATCH 1233/1382] Added type definitions for react-timeout (#24916)

* Added type definitions for react-timeout

* Fixed export

* Removed rules from tslint.json

* Added types

* Indented

* Fixed types
---
 types/react-timeout/index.d.ts    | 32 +++++++++++++++++++++++++++++++
 types/react-timeout/tsconfig.json | 23 ++++++++++++++++++++++
 types/react-timeout/tslint.json   |  3 +++
 3 files changed, 58 insertions(+)
 create mode 100644 types/react-timeout/index.d.ts
 create mode 100644 types/react-timeout/tsconfig.json
 create mode 100644 types/react-timeout/tslint.json

diff --git a/types/react-timeout/index.d.ts b/types/react-timeout/index.d.ts
new file mode 100644
index 0000000000..b214318a23
--- /dev/null
+++ b/types/react-timeout/index.d.ts
@@ -0,0 +1,32 @@
+// Type definitions for react-timeout 1.1
+// Project: https://github.com/plougsgaard/react-timeout
+// Definitions by: Kerwyn Rojas <https://github.com/kerwynrg>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+/// <reference types="node" />
+
+import * as React from 'react';
+
+export = ReactTimeout;
+
+declare function ReactTimeout<T>(
+    SourceComponent: React.ComponentClass<T> | React.StatelessComponent<T>
+): React.ComponentClass<T>;
+
+declare namespace ReactTimeout {
+  type Timer = NodeJS.Timer | number;
+
+  type Id = number;
+
+  interface ReactTimeoutProps {
+      setTimeout?: (callback: (...args: any[]) => void, ms: number, ...args: any[]) => Timer;
+      clearTimeout?: (timer: Timer) => void;
+      setInterval?: (callback: (...args: any[]) => void, ms: number, ...args: any[]) => Id;
+      clearInterval?: (id: Id) => void;
+      setImmediate?: (callback: (...args: any[]) => void, ...args: any[]) => Id;
+      clearImmediate?: (id: Id) => void;
+      requestAnimationFrame?: (callback: (...args: any[]) => void) => Id;
+      cancelAnimationFrame?: (id: Id) => void;
+  }
+}
diff --git a/types/react-timeout/tsconfig.json b/types/react-timeout/tsconfig.json
new file mode 100644
index 0000000000..71e6b79545
--- /dev/null
+++ b/types/react-timeout/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
diff --git a/types/react-timeout/tslint.json b/types/react-timeout/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/react-timeout/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}

From 326cb88142fcba69136595d632143f84f291fc4f Mon Sep 17 00:00:00 2001
From: Andy <anhans@microsoft.com>
Date: Wed, 11 Apr 2018 16:18:24 -0700
Subject: [PATCH 1234/1382] algoliasearch: Remove unnecessary destructuring
 (#24929)

---
 types/algoliasearch/index.d.ts | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/types/algoliasearch/index.d.ts b/types/algoliasearch/index.d.ts
index 5c7026d70e..3304ad579d 100644
--- a/types/algoliasearch/index.d.ts
+++ b/types/algoliasearch/index.d.ts
@@ -805,11 +805,7 @@ declare namespace algoliasearch {
      * @param err() error callback
      * https://www.algolia.com/doc/api-reference/api-methods/search-for-facet-values/
      */
-    searchForFacetValues({
-      facetName,
-      facetQuery,
-      ...qp,
-    }: {
+    searchForFacetValues(options: {
       facetName: string;
       facetQuery: string;
     } & AlgoliaQueryParameters): Promise<any>;
@@ -820,12 +816,7 @@ declare namespace algoliasearch {
      * @param err() error callback
      * https://www.algolia.com/doc/api-reference/api-methods/search-for-facet-values/
      */
-    searchForFacetValues(
-      {
-        facetName,
-        facetQuery,
-        ...qp,
-      }: {
+    searchForFacetValues(options: {
         facetName: string;
         facetQuery: string;
       } & AlgoliaQueryParameters,

From d8df907997c1e911c27f71bfe5cb45b0ebcf8ba3 Mon Sep 17 00:00:00 2001
From: Peter Weinberg <pweinberg633@gmail.com>
Date: Wed, 11 Apr 2018 19:31:22 -0400
Subject: [PATCH 1235/1382] [redux-pack]: add key signature to ActionMeta
 interface (#24785)

* [redux-pack]: add key signature to ActionMeta interface

* [redux-pack]: improve type definitions for handler actions, allow passing custom metadata and all FSA compliant keys

* [redux-pack]: fix no-unnecessary-generics error
---
 types/redux-pack/index.d.ts          | 76 ++++++++++++++++++---------
 types/redux-pack/redux-pack-tests.ts | 77 ++++++++++++++++++++++------
 2 files changed, 111 insertions(+), 42 deletions(-)

diff --git a/types/redux-pack/index.d.ts b/types/redux-pack/index.d.ts
index 2bffdf8117..01e6ff4c0d 100644
--- a/types/redux-pack/index.d.ts
+++ b/types/redux-pack/index.d.ts
@@ -1,52 +1,78 @@
 // Type definitions for redux-pack 0.1
 // Project: https://github.com/lelandrichardson/redux-pack
 // Definitions by: tansongyang <https://github.com/tansongyang>
+//                 dschuman <https://github.com/quicksnap>
+//                 pweinberg <https://github.com/no-stack-dub-sack>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
+
 import {
     Action as ReduxAction,
     Middleware,
-    Reducer,
+    Reducer
 } from 'redux';
 
 export const KEY: {
-    readonly LIFECYCLE: 'redux-pack/LIFECYCLE'
-    readonly TRANSACTION: 'redux-pack/TRANSACTION'
+    readonly LIFECYCLE: 'redux-pack/LIFECYCLE';
+    readonly TRANSACTION: 'redux-pack/TRANSACTION';
 };
 
 export const LIFECYCLE: {
-    readonly START: 'start'
-    readonly SUCCESS: 'success'
-    readonly FAILURE: 'failure'
+    readonly START: 'start';
+    readonly SUCCESS: 'success';
+    readonly FAILURE: 'failure';
 };
-export type LIFECYCLEValues = 'start'| 'succes'| 'failure';
+
+export type LIFECYCLEValues = 'start' | 'succes' | 'failure';
 
 export const middleware: Middleware;
 
-export interface Handlers<S> {
-    start?: Reducer<S>;
-    finish?: Reducer<S>;
-    failure?: Reducer<S>;
-    success?: Reducer<S>;
-    always?: Reducer<S>;
+// MetaPayload differs from ActionMeta in that it is the object that the reducers
+// receive, instead of what is dispatched
+export type MetaPayload<M> = M & {
+    ['redux-pack/LIFECYCLE']?: LIFECYCLEValues;
+    ['redux-pack/TRANSACTION']?: string;
+};
+
+// Incomplete typing
+export type PackActionPayload<Payload, M> = ReduxAction & {
+    payload: Payload;
+    meta: MetaPayload<M>;
+};
+
+export type handlerReducer<S, A> = (state: S, action: A) => S;
+export interface Handlers<S, TSuccessPayload, TErrorPayload, TStartPayload, TMetaPayload> {
+    start?: handlerReducer<S, PackActionPayload<TStartPayload, TMetaPayload>>;
+    finish?: handlerReducer<S, ReduxAction>;
+    failure?: handlerReducer<S, PackActionPayload<TErrorPayload, TMetaPayload>>;
+    success?: handlerReducer<S, PackActionPayload<TSuccessPayload, TMetaPayload>>;
+    always?: handlerReducer<S, ReduxAction>;
 }
+
 export type GetState<S> = () => S;
-export interface ActionMeta<TState = {}, TSuccessPayload = {}, TErrorPayload = {}, TStartPayload = {}> {
+export interface ActionMeta<TFullState = {}, TSuccessPayload = {}, TErrorPayload = {}, TStartPayload = {}> {
     startPayload?: TStartPayload;
-    onStart?(payload: TStartPayload, getState: GetState<TState>): void;
-    onFinish?(resolved: boolean, getState: GetState<TState>): void;
-    onSuccess?(response: TSuccessPayload, getState: GetState<TState>): void;
-    onFailure?(error: TErrorPayload, getState: GetState<TState>): void;
-    ['redux-pack/LIFECYCLE']?: keyof LIFECYCLEValues;
+    onStart?(payload: TStartPayload, getState: GetState<TFullState>): void;
+    onFinish?(resolved: boolean, getState: GetState<TFullState>): void;
+    onSuccess?(response: TSuccessPayload, getState: GetState<TFullState>): void;
+    onFailure?(error: TErrorPayload, getState: GetState<TFullState>): void;
+    ['redux-pack/LIFECYCLE']?: LIFECYCLEValues;
     ['redux-pack/TRANSACTION']?: string;
 }
-export interface Action<TState = {}, TSuccessPayload = {}, TErrorPayload = {}, TStartPayload = {}> extends ReduxAction {
+
+export interface PackError { error: boolean; payload: any; }
+export interface Action<TFullState = {}, TSuccessPayload = {}, TErrorPayload = PackError, TStartPayload = {}, TMetaPayload = {}> extends ReduxAction {
     promise?: Promise<TSuccessPayload>;
     payload?: TSuccessPayload | TErrorPayload | TStartPayload;
-    meta?: ActionMeta<TState, TSuccessPayload, TErrorPayload, TStartPayload>;
+    meta?: ActionMeta<TFullState, TSuccessPayload, TErrorPayload, TStartPayload> & TMetaPayload;
+    // add optional error key to conform to FSA design: https://github.com/redux-utilities/flux-standard-action
+    // note that users of this middleware (using our types) must conform to FSA shaped actions or code will not compile
+    error?: boolean | null;
 }
-export function handle<TState>(
+
+export interface TFullState { [key: string]: any; }
+export function handle<TState, TSuccessPayload, TErrorPayload, TStartPayload, TMetaPayload>(
     state: TState,
-    action: Action<TState, any, any, any>,
-    handlers: Handlers<TState>)
-    : TState;
+    action: Action<TFullState, TSuccessPayload, TErrorPayload, TStartPayload, TMetaPayload>,
+    handlers: Handlers<TState, TSuccessPayload, TErrorPayload, TStartPayload, TMetaPayload>,
+): TState;
diff --git a/types/redux-pack/redux-pack-tests.ts b/types/redux-pack/redux-pack-tests.ts
index ff1746bdbf..0dbe1bf433 100644
--- a/types/redux-pack/redux-pack-tests.ts
+++ b/types/redux-pack/redux-pack-tests.ts
@@ -1,44 +1,87 @@
-import { handle, Action } from 'redux-pack';
+import { handle, Action, GetState } from 'redux-pack';
 
 interface Foo {
-    id: string;
+  id: string;
 }
 interface FooState {
-    foo: Foo | null;
-    error: string | null;
-    isLoading: boolean;
-    currentUser: {
-        id: string;
-    };
+  foo: Foo | null;
+  bar: string;
+  error: boolean;
+  errorMsg: string;
+  isLoading: boolean;
+  metaPropOne: string;
+  metaPropTwo: string;
+  currentUser: {
+    id: string;
+  };
 }
 
 // https://github.com/lelandrichardson/redux-pack/tree/v0.1.5#logging-beforeafter
 declare const Api: {
-    getFoo(id: string): Promise<Foo>;
+  getFoo(id: string): Promise<Foo>;
 };
+
 declare function logSuccess(foo: Foo): void;
-function loadFoo(id: string): Action<FooState, Foo> {
+
+interface MetaOne { propOne: string; }
+function loadFoo(id: string): Action<FooState, Foo, {}, {}, MetaOne> {
   return {
     type: LOAD_FOO,
     promise: Api.getFoo(id),
     meta: {
-      onSuccess: logSuccess
+      onSuccess: logSuccess,
+      // pass custom metadata through to reducer
+      // allowed by library, and a common redux pattern
+      // https://github.com/lelandrichardson/redux-pack/blob/7818ffd4304d5f0e2c94056f3626a399fc9a5a10/src/middleware.js#L44
+      propOne: 'some meta'
     },
   };
 }
 
+interface MetaTwo { propTwo: string; }
+function barError(): Action<FooState, Foo, {}, {}, MetaTwo> {
+  return {
+    type: BAR_ERROR,
+    error: true,
+    payload: new Error('this is an error action'),
+    meta: {
+      propTwo: 'other meta'
+    }
+  };
+}
+
+// bad (non-FSA action):
+function baz(baz: string): Action<FooState, Foo> {
+  return {
+    type: 'BAZ',
+    // boo: baz // <-- will not compile, shape of action is not FSA
+    // see line 62 & 63 of index.d.ts
+  };
+}
+
 // https://github.com/lelandrichardson/redux-pack/tree/v0.1.5#using-the-handle-helper
 const LOAD_FOO = 'LOAD_FOO';
+const BAR_ERROR = 'BAR_ERROR';
 declare const initialState: FooState;
-function fooReducer(state = initialState, action: Action<FooState, Foo, string | null>) {
+function fooReducer(state = initialState, action: Action<FooState, Foo, string | null, {}, MetaOne & MetaTwo>) {
   const { type, payload } = action;
   switch (type) {
+    // example of non-redux-pack action
+    // works as long as action is FSA compliant
+    case BAR_ERROR:
+      return {
+        ...state,
+        error: action.error,
+        errorMsg: action.payload,
+        metaPropTwo: action.meta && action.meta.propTwo
+      };
     case LOAD_FOO:
       return handle(state, action, {
-        start: prevState => ({ ...prevState, isLoading: true, error: null, foo: null }),
+        start: prevState => ({ ...prevState, isLoading: true, error: false, foo: null }),
         finish: prevState => ({ ...prevState, isLoading: false }),
-        failure: prevState => ({ ...prevState, error: payload as string }),
-        success: prevState => ({ ...prevState, foo: payload as Foo }),
+        failure: prevState => ({ ...prevState, error: true, errorMsg: payload as string }),
+        // must define both state and action params to correctly scope action (to access custom meta)
+        success: (prevState, action) => ({ ...prevState, foo: payload as Foo, metaPropOne: action.meta.propOne }),
         always: prevState => prevState, // unnecessary, for the sake of example
       });
     default:
@@ -50,8 +93,8 @@ function fooReducer(state = initialState, action: Action<FooState, Foo, string |
 const DO_FOO = 'DO_FOO';
 declare function doFoo(): Promise<Foo>;
 declare function sendAnalytics(action: string, data: {
-    userId: string,
-    fooId: string,
+  userId: string,
+  fooId: string,
 }): void;
 function userDoesFoo(): Action<FooState, Foo> {
   return {

From 2ca53b72e4b4799e159ba2a6c641345d4cc99126 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <DanielRosenwasser@users.noreply.github.com>
Date: Wed, 11 Apr 2018 16:35:18 -0700
Subject: [PATCH 1236/1382] Avoid language that encourages users to send
 `.d.ts` PRs to libraries

---
 .github/PULL_REQUEST_TEMPLATE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 79793c16c1..b1a1039f82 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -10,7 +10,7 @@ Please fill in this template.
 Select one of these and delete the others:
 
 If adding a new definition:
-- [ ] The package does not provide its own types, and you can not add them.
+- [ ] The package does not already provide its own types, or cannot have its `.d.ts` files generated via `--declaration`
 - [ ] If this is for an NPM package, match the name. If not, do not conflict with the name of an NPM package.
 - [ ] Create it with `dts-gen --dt`, not by basing it on an existing project.
 - [ ] `tslint.json` should be present, and `tsconfig.json` should have `noImplicitAny`, `noImplicitThis`, `strictNullChecks`, and `strictFunctionTypes` set to `true`.

From 8dc5b41e17513993f5544a98c98a74030af16863 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Wed, 11 Apr 2018 16:41:46 -0700
Subject: [PATCH 1237/1382] Update readme (#24932)

* Add note about `esModuleInterop`

* Update guidance on publishing to DT

Refrenced in https://github.com/Microsoft/TypeScript-Handbook/commit/884e4e80f0868a2057234796f6a2076e27582d8d#commitcomment-28080081

* Edits

* writen -> written
---
 README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index cc59284394..7c58fe8901 100644
--- a/README.md
+++ b/README.md
@@ -105,7 +105,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 types](http://www.typescriptlang.org/docs/handbook/declaration-files/publishing.html) instead of publishing to DefinitelyTyped.
+If you are the library author and your package is written in TypeScript, [bundle the autogenerated declaration files](http://www.typescriptlang.org/docs/handbook/declaration-files/publishing.html) in your package 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.
@@ -239,7 +239,8 @@ If types are part of a web standard, they should be contributed to [TSJS-lib-gen
 
 #### A package uses `export =`, but I prefer to use default imports. Can I change `export =` to `export default`?
 
-If default imports work in your environment, consider turning on the [`--allowSyntheticDefaultImports`](http://www.typescriptlang.org/docs/handbook/compiler-options.html) compiler option.
+If you are using TypeScript 2.7 or later, use `--esModuleInterop` in your project.
+Otherwise, if default imports work in your environment (e.g. Webpack, SystemJS, esm), consider turning on the [`--allowSyntheticDefaultImports`](http://www.typescriptlang.org/docs/handbook/compiler-options.html) compiler option.
 Do not change the type definition if it is accurate.
 For an NPM package, `export =` is accurate if `node -p 'require("foo")'` is the export, and `export default` is accurate if `node -p 'require("foo").default'` is the export.
 

From 5517a66c04f6828641595768140a855160fa16f2 Mon Sep 17 00:00:00 2001
From: Greg Zapp <greg.zapp@gmail.com>
Date: Wed, 11 Apr 2018 18:53:04 -0500
Subject: [PATCH 1238/1382] Add tableau API types. (#24931)

* Add tableau API types.

* Add tslint config.

* Fix lint errors.
---
 types/tableau/index.d.ts    | 697 ++++++++++++++++++++++++++++++++++++
 types/tableau/tsconfig.json |  24 ++
 types/tableau/tslint.json   |   1 +
 3 files changed, 722 insertions(+)
 create mode 100644 types/tableau/index.d.ts
 create mode 100644 types/tableau/tsconfig.json
 create mode 100644 types/tableau/tslint.json

diff --git a/types/tableau/index.d.ts b/types/tableau/index.d.ts
new file mode 100644
index 0000000000..c8ade03046
--- /dev/null
+++ b/types/tableau/index.d.ts
@@ -0,0 +1,697 @@
+// Type definitions for tableau 2.2
+// Project: https://onlinehelp.tableau.com/current/api/js_api/en-us/JavaScriptAPI/js_api.htm
+// Definitions by: Greg Zapp <https://github.com/protip>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+declare namespace tableau {
+    interface VizCreateOptions {
+        /** Undoes action on sheet, defaults to a single undo unless optional parameters is specified. */
+        hideTabs?: boolean;
+        /** Indicates whether the toolbar is hidden or shown. */
+        hideToolbar?: boolean;
+        /**
+         * Specifies the ID of an existing instance to make a copy (clone) of.
+         * This is useful if the user wants to continue analysis of an existing visualization without losing the state of the original.
+         * If the ID does not refer to an existing visualization, the cloned version is derived from the original visualization.
+         */
+        instanceIdToClone?: string;
+        /** Can be any valid CSS size specifier. If not specified, defaults to the published height of the view. */
+        height?: string;
+        /** Can be any valid CSS size specifier. If not specified, defaults to the published height of the view. */
+        width?: string;
+        /**
+         * Specifies a device layout for a dashboard, if it exists.
+         * Values can be desktop, tablet, or phone.
+         * If not specified, defaults to loading a layout based on the smallest dimension of the hosting iframe element.
+         */
+        device?: string;
+        /**
+         * Callback function that is invoked when the Viz object first becomes interactive.
+         * This is only called once, but it’s guaranteed to be called.
+         * If the Viz object is already interactive, it will be called immediately, but on a separate "thread."
+         */
+        onFirstInteractive?: (e: TableauEvent) => void;
+        /**
+         * Callback function that's invoked when the size of the Viz object is known.
+         * You can use this callback to perform tasks such as resizing the elements surrounding the Viz object once the object's size has been established.
+         */
+        onFirstVizSizeKnown?: (e: VizResizeEvent) => void;
+        /**
+         * Apply a filter that you specify to the view when it is first rendered.
+         * For example, if you have an Academic Year filter and only want to display data for 2017,
+         * you might enter "Academic Year": "2016". For more information, see Filtering.
+         */
+        [filter: string]: any;
+    }
+
+    class TableauEvent {
+        /** Gets the Viz object associated with the event. */
+        getViz(): Viz;
+
+        /** Gets the name of the event, which is a string, but is also one of the items in the TableauEventName enum. */
+        getEventName(): TableauEventName;
+    }
+
+    class CustomViewEvent extends TableauEvent {
+        getCustomViewAsync(): Promise<CustomView>;
+    }
+
+    class FilterEvent extends TableauEvent {
+        /** Gets the Worksheet object associated with the event. */
+        getWorksheet(): Worksheet;
+
+        /** Gets the name of the field. */
+        getFieldName(): string;
+
+        /** Gets the Filter object associated with the event. */
+        getFilterAsync(): Promise<ConcreteFilter>;
+    }
+
+    class VizResizeEvent extends TableauEvent {
+        /** Gets the Viz object associated with the event. */
+        getViz(): Viz;
+        /** Gets the name of the event, which is a string, but is also one of the items in the TableauEventName enum. */
+        getEventName(): TableauEventName;
+        /** Gets the sheetSize record for the current sheet. For more information, see SheetSizeOptions Record. */
+        getVizSize(): Size;
+    }
+
+    enum TableauEventName {
+        CUSTOM_VIEW_LOAD = 'customviewload',
+        CUSTOM_VIEW_REMOVE = 'customviewremove',
+        CUSTOM_VIEW_SAVE = 'customviewsave',
+        CUSTOM_VIEW_SET_DEFAULT = 'customviewsetdefault',
+        FILTER_CHANGE = 'filterchange',
+        MARKS_SELECTION = 'marksselection',
+        PARAMETER_VALUE_CHANGE = 'parametervaluechange',
+        STORY_POINT_SWITCH = 'storypointswitch',
+        TAB_SWITCH = 'tabswitch',
+        TOOLBAR_STATE_CHANGE = 'toolbarstatechange',
+        VIZ_RESIZE = 'vizresize',
+    }
+
+    enum DashboardObjectType {
+        BLANK = 'blank',
+        WORKSHEET = 'worksheet',
+        QUICK_FILTER = 'quickFilter',
+        PARAMETER_CONTROL = 'parameterControl',
+        PAGE_FILTER = 'pageFilter',
+        LEGEND = 'legend',
+        TITLE = 'title',
+        TEXT = 'text',
+        IMAGE = 'image',
+        WEB_PAGE = 'webPage',
+        ADDIN = 'addIn'
+    }
+
+    enum FieldAggregationType {
+        SUM,
+        AVG,
+        MIN,
+        MAX,
+        STDEV,
+        STDEVP,
+        VAR,
+        VARP,
+        COUNT,
+        COUNTD,
+        MEDIAN,
+        ATTR,
+        NONE,
+        YEAR,
+        QTR,
+        MONTH,
+        DAY,
+        HOUR,
+        MINUTE,
+        SECOND,
+        WEEK,
+        WEEKDAY,
+        MONTHYEAR,
+        MDY,
+        END,
+        TRUNC_YEAR,
+        TRUNC_QTR,
+        TRUNC_MONTH,
+        TRUNC_WEEK,
+        TRUNC_DAY,
+        TRUNC_HOUR,
+        TRUNC_MINUTE,
+        TRUNC_SECOND,
+        QUART1,
+        QUART3,
+        SKEWNESS,
+        KURTOSIS,
+        INOUT,
+        USER
+    }
+
+    enum FieldRoleType {
+        DIMENSION, MEASURE, UKNOWN
+    }
+
+    enum FilterType {
+        CATEGORICAL = 'categorical',
+        QUANTITATIVE = 'quantitative',
+        HIERARCHICAL = 'hierarchical',
+        RELATIVE_DATE = 'relativedate',
+    }
+
+    enum SheetType {
+        WORKSHEET = 'worksheet',
+        DASHBOARD = 'dashboard',
+        STORY = 'story',
+    }
+
+    enum DateRangeType {
+        LAST = 'last', /** Refers to the last day, week, month, etc. of the date period. */
+        LASTN = 'lastn', /** Refers to the last N days, weeks, months, etc. of the date period. */
+        NEXT = 'next', /** Refers to the next day, week, month, etc. of the date period. */
+        NEXTN = 'nextn', /** Refers to the next N days, weeks, months, etc. of the date period. */
+        CURRENT = 'current', /** Refers to the current day, week, month, etc. of the date period. */
+        TODATE = 'todate', /** Refers to everything up to and including the current day, week, month, etc. of the date period. */
+    }
+
+    enum ParameterAllowableValuesType {
+        ALL = 'all',
+        LIST = 'list',
+        RANGE = 'range',
+    }
+
+    enum ParameterDataType {
+        FLOAT = 'float',
+        INTEGER = 'integer',
+        STRING = 'string',
+        BOOLEAN = 'boolean',
+        DATE = 'date',
+        DATETIME = 'datetime'
+    }
+
+    enum PeriodType {
+        YEARS = 'years',
+        QUARTERS = 'quarters',
+        MONTHS = 'months',
+        WEEKS = 'weeks',
+        DAYS = 'days',
+        HOURS = 'hours',
+        MINUTES = 'minutes',
+        SECONDS = 'seconds',
+    }
+
+    //#region
+    class VizManager {
+        getVizs(): Viz[];
+    }
+
+    type ListenerFunction = (event: TableauEvent) => void;
+
+    class Viz {
+        /**
+         * Creates a new Tableau Viz inside of the given HTML container, which is typically a <div> element.
+         * Each option as well as the options parameter is optional.
+         * If there is already a Viz associated with the parentElement, an exception is thrown.
+         * Before reusing the parentElement you must first call dispose().
+         */
+        constructor(node: HTMLElement, url: string, options?: VizCreateOptions);
+
+        /** Indicates whether the tabs are displayed in the UI. It does not actually hide individual tabs. */
+        getAreTabsHidden(): boolean;
+        /** Indicates whether the toolbar is displayed. */
+        getToolbarHidden(): boolean;
+        /** Indicates whether the visualization is displayed on the hosting page. */
+        getIsHidden(): boolean;
+        /** Returns the node that was specified in the constructor. */
+        getParentElement(): HTMLElement;
+        /** The URL of the visualization, as specified in the constructor */
+        getUrl(): string;
+        /** One Workbook is supported per visualization. */
+        getWorkbook(): Workbook;
+        /** Indicates whether automatic updates are currently paused. */
+        getAreAutomaticUpdatesPaused(): boolean;
+
+        addEventListener(event: TableauEventName.FILTER_CHANGE, f: (event: FilterEvent) => void): void;
+        addEventListener(event: TableauEventName.CUSTOM_VIEW_LOAD, f: (event: CustomViewEvent) => void): void;
+
+        /** Removes an event listener from the specified event. */
+        removeEventListener(type: TableauEventName, f: ListenerFunction): void;
+        /** Shows or hides the iframe element hosting the visualization. */
+        show(): void;
+        /** Shows or hides the iframe element hosting the visualization. */
+        hide(): void;
+        /**
+         * Cleans up any resources associated with the visualization,
+         * removes the visualization from the VizManager instance,
+         * and removes any DOM elements from the parentElement object.
+         * In effect, this method restores the page to what it was before a Viz object was instantiated.
+         */
+        dispose(): void;
+        /** Pauses or resumes layout updates. This is useful if you are resizing the visualization or performing multiple calls that could affect the layout. */
+        pauseAutomaticUpdatesAsync(): void;
+        resumeAutomaticUpdatesAsync(): void;
+        toggleAutomaticUpdatesAsync(): void;
+        /** Equivalent to clicking on the Revert All toolbar button, which restores the workbook to its starting state. */
+        revertAllAsync(): Promise<void>;
+        /** Equivalent to clicking on the Refresh Data toolbar button. */
+        refreshDataAsync(): Promise<void>;
+        /** Equivalent to clicking on the Download toolbar button, which downloads a copy of the original workbook. */
+        showDownloadWorkbookDialog(): void;
+        /** Equivalent to clicking on the Export Image toolbar button, which creates a PNG file of the current visualization. */
+        showExportImageDialog(): void;
+        /** Equivalent to clicking on the Export PDF toolbar button, which shows a dialog allowing the user to select options for the export. */
+        showExportPDFDialog(): void;
+        /**
+         * Shows the Export Data dialog, which is currently a popup window. The worksheetInDashboard parameter is optional.
+         * If not specified, the currently active Worksheet is used.
+         */
+        showExportDataDialog(worksheetInDashboard: Sheet | SheetInfo | string): void;
+        /** Shows the Export CrossTab dialog. The worksheetInDashboard parameter is optional. If not specified, the currently active Worksheet is used. */
+        showExportCrossTabDialog(worksheetInDashboard: Sheet | SheetInfo | string): void;
+        /**
+         * Equivalent to clicking on the Share toolbar button,
+         * which displays a dialog allowing the user to share the visualization by email or by embedding its HTML in a web page.
+         */
+        showShareDialog(): void;
+        /**
+         * Sets the size of the iframe element, which causes the visualization to expand or
+         * collapse to fit the iframe element if the visualization size (current sheet's size) is set to AUTOMATIC.
+         */
+        setFrameSize(width: number, height: number): void;
+        /** Gets the URL of the visualization asynchronously. */
+        getCurrentUrlAsync(): Promise<string>;
+        /** Redoes last action on a sheet, defaults to a single redo unless optional parameters is specified. */
+        redoAsync(): Promise<void>;
+        /** Undoes action on sheet, defaults to a single undo unless optional parameters is specified. */
+        undoAsync(): Promise<void>;
+    }
+    //#endregion
+
+    //#region Sheet Classes
+    class SheetInfo {
+        /** Gets the name of the sheet. */
+        getName(): string;
+        /** Gets the index of the sheet within the published tabs. Note that hidden tabs are still counted in the ordering, as long as they are published. */
+        getIndex(): number;
+        /**
+         * Gets a value indicating whether the sheet is the currently active sheet.Due to a technical limitation,
+         * this will always return false if the object is a Worksheet instance that is part of a Dashboard.
+         */
+        getIsActive(): boolean;
+        /**
+         * Gets a value indicating whether the sheet is hidden in the UI. Note that if the entire tab control is hidden,
+         * it does not affect the state of this flag. This sheet may still report that it is visible even when the tabs control is hidden.
+         */
+        getIsHidden(): boolean;
+        /** Gets the type of the sheet. SheetType is an enum with the following values: WORKSHEET, DASHBOARD and STORY. */
+        getSheetType(): SheetType;
+        /** Gets the size information that the author specified when publishing the workbook. */
+        getSize(): SheetSizeOptions;
+        /** Gets the URL for this sheet. */
+        getUrl(): string;
+        /** Gets the Workbook to which this Sheet belongs. */
+        getWorkbook(): Workbook;
+    }
+
+    class Sheet {
+        /** Gets the name of the sheet. */
+        getName(): string;
+        /** Gets the index of the sheet within the published tabs. Note that hidden tabs are still counted in the ordering, as long as they are published. */
+        getIndex(): number;
+        /** Gets a value indicating whether the sheet is the currently active sheet. */
+        getIsActive(): boolean;
+        /**
+         * Gets a value indicating whether the sheet is hidden in the UI.
+         * Note that if the entire tab control is hidden, it does not affect the state of this flag.
+         * This sheet may still report that it is visible even when the tabs control is hidden.
+         */
+        getIsHidden(): boolean;
+        /** Gets the type of the sheet. SheetType is an enum with the following values: WORKSHEET , DASHBOARD and STORY. */
+        getSheetType(): SheetType;
+        /** Gets the size information that the author specified when publishing the workbook. */
+        getSize(): SheetSizeOptions;
+        /** Gets the URL for this sheet. */
+        getUrl(): string;
+        /** Gets the Workbook to which this Sheet belongs. */
+        getWorkbook(): Workbook;
+        /**
+         * Sets the size information on a sheet. Note that if the sheet is a Worksheet,
+         * only SheetSizeBehavior.AUTOMATIC is allowed since you can’t actually set a Worksheet to a fixed size.
+         */
+        changeSizeAsync(options: SheetSizeOptions): Promise<SheetSizeOptions>;
+    }
+
+    enum SheetSizeBehaviour {
+        AUTOMATIC = 'automatic',
+        EXACTLY = 'exactly',
+        RANGE = 'range',
+        ATLEAST = 'atleast',
+        ATMOST = 'atmost',
+    }
+
+    interface SheetSizeOptions {
+        /** Contains an enumeration value of one of the following: AUTOMATIC, EXACTLY, RANGE, ATLEAST, and ATMOST. */
+        behavior: SheetSizeBehaviour;
+        /** This is only defined when behavior is EXACTLY, RANGE or ATMOST. */
+        maxSize: number;
+        /** This is only defined when behavior is EXACTLY, RANGE, or ATLEAST. */
+        minSize: number;
+    }
+
+    class DataTable {
+        /** Either "Underlying Data Table" or "Summary Data Table". */
+        getName(): string;
+        /**
+         * A two-dimensional array of data without the sheet or column metadata.
+         * The first array index is the row index and the second array index is the column index.
+         */
+        getData(): any[];
+        /** The column information, including the name, data type, and index. */
+        getColumns(): Column[];
+        /** The number of rows in the returned data. */
+        getTotalRowCount(): number;
+        /** Whether the data is summary data or underlying data. Returns true for summary data. */
+        getIsSummaryData(): boolean;
+    }
+
+    class Column {
+        /** The name of the column. */
+        getFieldName(): string;
+        /** The data type of the column. Possible values are float, integer, string, boolean, date, and datetime. */
+        getDataType(): string;
+        /** Whether the column data is referenced in the visualization. */
+        getIsReferenced(): boolean;
+        /** The number of rows in the returned data. */
+        getIndex(): number;
+    }
+
+    class Worksheet {
+        /** Returns the Dashboard object to which this Worksheet belongs (if it’s on a dashboard). Otherwise, it returns null. */
+        getParentDashboard(): Dashboard;
+        /**
+         * Returns the StoryPoint object to which this Worksheet belongs (if it’s on a story sheet).
+         * Otherwise, it returns null. If the Worksheet instance does not come from a call to StoryPoint.getContainedSheet(), it also returns null.
+         */
+        getParentStoryPoint(): StoryPoint;
+        /**
+         * Gets the primary and all of the secondary data sources for this worksheet.
+         * Note that by convention the primary data source should always be the first element.
+         */
+        getDataSourcesAsync(): Promise<DataSource[]>;
+        /**
+         * Gets aggregated data for the fields used in the currently active sheet and returns it as an object.
+         * You can specify options with an optional parameter. This can only be called on sheets of the WORKSHEET type.
+         */
+        getSummaryDataAsync(options: getSummaryDataOptions): Promise<DataTable>;
+        /**
+         * Gets data for all fields in the data source used by the currently active sheet and returns it as an object.
+         * You can specify options with an optional parameter. This can only be called on sheets of the WORKSHEET type.
+         */
+        getUnderlyingDataAsync(options: getUnderlyingDataOptions): Promise<DataTable>;
+    }
+
+    interface getSummaryDataOptions {
+        /** Do not use aliases specified in the data source in Tableau. Default is false. */
+        ignoreAliases?: boolean;
+        /** Only return data for the currently selected marks. Default is false. */
+        ignoreSelection?: boolean;
+        /** The number of rows of data that you want to return. Enter 0 to return all rows. */
+        maxRows: number;
+    }
+
+    interface getUnderlyingDataOptions {
+        /** Do not use aliases specified in the data source in Tableau. Default is false. */
+        ignoreAliases?: boolean;
+        /** Only return data for the currently selected marks. Default is false. */
+        ignoreSelection?: boolean;
+        /** Return all the columns for the data source. Default is false. */
+        ignoreAllColumns?: boolean;
+        /** The number of rows of data that you want to return. Enter 0 to return all rows. */
+        maxRows: number;
+    }
+
+    class Dashboard {
+        /** Gets the collection of objects. */
+        getObjects(): DashboardObject[];
+        /**
+         * Gets the collection of worksheets contained in the dashboard.
+         * Note that this is a helper method and is equivalent to looping through getObjects() and collecting all of
+         * the DashboardObject.Worksheet pointers when DashboardObject.getType() === tableau.DashboardObjectType.WORKSHEET.
+         */
+        getWorksheets(): Worksheet[];
+        /**
+         * Returns the StoryPoint object to which this Dashboard belongs (if it’s on a story sheet).
+         * Otherwise, it returns null.
+         * If the Dashboard instance does not come from a call to StoryPoint.getContainedSheet(), it also returns null.
+         */
+        getParentStoryPoint(): StoryPoint;
+    }
+
+    class DashboardObject {
+        /**
+         * Gets what the object represents, which is an enum with the following values:
+         * BLANK, WORKSHEET, QUICK_FILTER, PARAMETER_CONTROL, PAGE_FILTER, LEGEND, TITLE, TEXT, IMAGE, WEB_PAGE.
+         */
+        getObjectType(): DashboardObjectType;
+        /** Gets the Dashboard object that contains this object. */
+        getDashboard(): Dashboard;
+        /** If getType() returns WORKSHEET, this contains a pointer to the Worksheet object. */
+        getWorksheet(): Worksheet;
+        /** Gets the coordinates relative to the top-left corner of the dashboard of the object. */
+        getPosition(): Point;
+        /** Gets the size of the object. */
+        getSize(): Size;
+    }
+
+    class Story extends Sheet {
+        /**
+         * Gets an array (not a collection) of StoryPointInfo objects.
+         * Note that this is not a collection, since we don’t have a unique string key for a story point.
+         * We only need ordinal access to the story points (by index).
+         */
+        getStoryPointsInfo(): StoryPointInfo[];
+        /** Gets the currently active story point. */
+        getActiveStoryPoint(): StoryPoint;
+        /**
+         * Activates the story point at the specified index and returns a promise of the activated StoryPoint.
+         * Throws a tableau.ErrorCode.INDEX_OUT_OF_RANGE error if the index is less than zero or greater than or equal to the number of story points in the array.
+         */
+        activateStoryPointAsync(index: number): Promise<StoryPoint>;
+        /** Activates the next story point if there is one. If the current story point is the last one, then is stays active. */
+        activateNextStoryPointAsync(): Promise<StoryPoint>;
+        /** Activates the previous story point if there is one. If the current story point is the first one, then it stays active. */
+        activatePreviousStoryPointAsync(): Promise<StoryPoint>;
+        /**
+         * Reverts the story point at the specified index and returns a promise of the reverted StoryPoint.
+         * Throws a tableau.ErrorCode.INDEX_OUT_OF_RANGE error if the index is less than zero or greater than or equal to the number of story points in the array.
+         */
+        revertStoryPointAsync(index: number): Promise<StoryPoint>;
+    }
+
+    class StoryPointInfo {
+        /** Gets the zero-based index of this story point within the parent Story sheet. */
+        getIndex(): number;
+        /** Gets the content of the textual description for this story point. */
+        getCaption(): string;
+        /** Gets a value indicating whether the story point is the currently active point in the story. */
+        getIsActive(): boolean;
+        /** Gets a value indicating whether the story point is updated, meaning that there are no changes from the last time the story point was “captured”. */
+        getIsUpdated(): boolean;
+        /** Gets the Story object that contains the story point. */
+        getParentStory(): Story;
+    }
+
+    class StoryPoint {
+        /** Gets the zero-based index of this story point within the parent Story sheet. */
+        getIndex(): number;
+        /** Gets the content of the textual description for this story point. */
+        getCaption(): string;
+        /** Gets a value indicating whether the story point is the currently active point in the story. */
+        getIsActive(): boolean;
+        /** Gets a value indicating whether the story point is updated, meaning that there are no changes from the last time the story point was “captured”. */
+        getIsUpdated(): boolean;
+        /** Gets the sheet that this story point contains. This will be null if the story point does not have a contained sheet. */
+        getContainedSheet(): Sheet;
+        /** Gets the Story object that contains the story point. */
+        getParentStory(): Story;
+    }
+    //#endregion
+
+    //#region Workbook Classes
+    class Workbook {
+        /** Gets the Viz object that contains the workbook. */
+        getViz(): Viz;
+        /** Gets the currently active sheet (the active tab) */
+        getActiveSheet(): Sheet;
+        /** Gets the currently active custom view, or null if no custom view is active. */
+        getActiveCustomView(): CustomView;
+        /** Note that this is synchronous, meaning that all of the sheets are expected when loaded. */
+        getPublishedSheetsInfo(): SheetInfo[];
+        /** Gets the name of the workbook saved to the server. Note that this is not necessarily the file name. */
+        getName(): string;
+        /** Activates the sheet, either by name or index, and returns a promise of the sheet that was activated. */
+        activateSheetAsync(sheetNameOrIndex: string | number): Promise<Sheet>;
+        /** Reverts the workbook to its last saved state. */
+        revertAllAsync(): Promise<void>;
+        /** Fetches the parameters for this workbook. */
+        getParametersAsync(): Promise<Parameter[]>;
+        /**
+         * Changes the value of the parameter with the given name and returns the new Parameter.
+         * The value should be the same data type as the parameter and within the allowable range of values.
+         * It also needs to be the aliased value and not the raw value.
+         * For more information and examples, see changeParameterValueAsync() Additional Information
+         */
+        changeParameterValueAsync(name: string, value: any): Promise<Parameter>;
+        /** Gets the collection of CustomView objects associated with the workbook. */
+        getCustomViewsAsync(): Promise<CustomView[]>;
+        /** Changes the visualization to show the named saved state. */
+        showCustomViewAsync(customViewName: string): Promise<CustomView>;
+        /** Removes the named custom view. */
+        removeCustomViewAsync(customViewName: string): Promise<CustomView>;
+        /** Remembers the current state of the workbook by assigning a custom view name. */
+        rememberCustomViewAsync(customViewName: string): Promise<CustomView>;
+        /** Sets the active custom view as the default. */
+        setActiveCustomViewAsDefaultAsync(): void;
+    }
+
+    class DataSource {
+        /** The name of the DataSource as seen in the UI. */
+        getName(): string;
+        /** Indicates whether this DataSource is a primary or a secondary data source. */
+        getIsPrimary(): boolean;
+        /** Gets an array of Fields associated with the DataSource. */
+        getFields(): Field[];
+    }
+
+    class Field {
+        /** Gets the field name (i.e. caption). */
+        getName(): string;
+        getAggregation(): FieldAggregationType;
+        /** Gets the data source to which this field belongs. */
+        getDataSource(): DataSource;
+        /** One of the following values: DIMENSION, MEASURE, UKNOWN */
+        getRole(): FieldRoleType;
+    }
+
+    class CustomView {
+        /** User-friendly name for the custom view */
+        getName(): string;
+        /** User-friendly name for the custom view */
+        setName(name: string): string;
+
+        /** Indicates whether the custom view is public or private. */
+        getAdvertised(): boolean;
+        /** Indicates whether the custom view is public or private. */
+        setAdvertised(bool: boolean): boolean;
+
+        /** Gets or sets whether this is the default custom view. */
+        getDefault(): boolean;
+
+        /** Gets the user that created the custom view. */
+        getOwnerName(): string;
+
+        /** Unique URL to load this view again. */
+        getUrl(): string;
+
+        /** Gets the Workbook to which this CustomView belongs. */
+        getWorkbook(): Workbook;
+
+        /** After saveAsync() is called, the result of the getUrl method is no longer blank. */
+        saveAsync(): Promise<CustomView>;
+    }
+    //#endregion
+
+    //#region Parameter Classes
+    class Parameter {
+        /** A unique identifier for the parameter, as specified by the user. */
+        getName(): string;
+        /** The current value of the parameter. */
+        getCurrentValue(): DataValue;
+        /** The data type of the parameter can be one of the following: FLOAT, INTEGER, STRING, BOOLEAN, DATE, DATETIME. */
+        getDataType(): ParameterDataType;
+        /** The type of allowable values that the parameter can accept. It can be one of the following enumeration items: ALL, LIST, RANGE. */
+        getAllowableValuesType(): ParameterAllowableValuesType;
+        /**
+         * If the parameter is restricted to a list of allowable values, this property contains the array of those values.
+         * Note that this is not a standard collection, but a JavaScript array.
+         */
+        getAllowableValues(): DataValue[];
+        /** If getAllowableValuesType is RANGE, this defines the minimum allowable value, inclusive. Otherwise it’s undefined/null. */
+        getMinValue(): DataValue;
+        /** If getAllowableValuesType is RANGE, this defines the maximum allowable value, inclusive. Otherwise it’s undefined/null. */
+        getMaxValue(): DataValue;
+        /** If getAllowableValuesType is RANGE, this defines the step size used in the parameter UI control slider. Otherwise it’s undefined/null. */
+        getStepSize(): number;
+        /**
+         * If getAllowableValuesType is RANGE and getDataType is DATE or DATETIME,
+         * this defines the step date period used in the Parameter UI control slider.
+         * Otherwise it’s undefined/null.
+         */
+        getDateStepPeriod(): PeriodType;
+    }
+    //#endregion
+
+    //#region Filtering
+    class Filter {
+        /** Gets the parent worksheet */
+        getWorksheet(): Worksheet;
+        /** Gets the type of the filter. See FilterType Enum for the values in the enum. */
+        getFilterType(): FilterType;
+        /** Gets the name of the field being filtered. Note that this is the caption as shown in the UI and not the actual database field name. */
+        getFieldName(): string;
+        /** Gets the field that is currently being filtered. */
+        getFieldAsync(): Promise<Field>;
+    }
+
+    class CategoricalFilter extends Filter {
+        /** Gets a value indicating whether the filter is exclude or include (default). */
+        getIsExcludeMode(): boolean;
+        /**
+         * Gets the collection of values that are currently set on the filter.
+         * This is a native JavaScript array and not a keyed collection.
+         * Note that only the first 200 values are returned.
+         */
+        getAppliedValues(): DataValue[];
+    }
+
+    class QuantitativeFilter extends Filter {
+        /** Gets the minimum value as specified in the domain. */
+        getDomainMin(): DataValue;
+        /** Gets the maximum value as specified in the domain. */
+        getDomainMax(): DataValue;
+        /** Gets the minimum value, inclusive, applied to the filter. */
+        getMin(): DataValue;
+        /** Gets the maximum value, inclusive, applied to the filter. */
+        getMax(): DataValue;
+        /** Indicates whether null values are included in the filter. */
+        getIncludeNullValues(): boolean;
+    }
+
+    class RelativeDateFilter extends Filter {
+        /** The date period of the filter. See PeriodType Enum for the values in the enum. */
+        getPeriod(): PeriodType;
+        /** The range of the date filter (years, months, etc.). See DateRangeType Enum for the values in the enum. */
+        getRange(): DateRangeType;
+        /** When getRange returns LASTN or NEXTN, this is the N value (how many years, months, etc.). */
+        getRangeN(): number;
+    }
+
+    type ConcreteFilter = CategoricalFilter | QuantitativeFilter | RelativeDateFilter;
+
+    class DataValue {
+        /** Contains the raw native value as a JavaScript type, which is one of String, Number, Boolean, or Date */
+        value: any;
+        /** The value formatted according to the locale and the formatting applied to the field or parameter. */
+        formattedValue: string;
+    }
+    //#endregion
+
+    interface Size {
+        width: number;
+        height: number;
+    }
+
+    interface Point {
+        x: number;
+        y: number;
+    }
+}
diff --git a/types/tableau/tsconfig.json b/types/tableau/tsconfig.json
new file mode 100644
index 0000000000..adad086fdc
--- /dev/null
+++ b/types/tableau/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/tableau/tslint.json b/types/tableau/tslint.json
new file mode 100644
index 0000000000..2750cc0197
--- /dev/null
+++ b/types/tableau/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file

From 45ff24159ba3127e69dfea78cefb34b4e42081b8 Mon Sep 17 00:00:00 2001
From: Nico Montanari <nicomontanari.dev@gmail.com>
Date: Thu, 12 Apr 2018 17:34:21 +0200
Subject: [PATCH 1239/1382] Added listKey prop to VirtualizedListProperties

---
 types/react-native/index.d.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index f7a70b79ac..b8b13fa69a 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -3938,6 +3938,8 @@ export interface VirtualizedListProperties<ItemT> extends ScrollViewProperties {
     inverted?: boolean;
 
     keyExtractor?: (item: ItemT, index: number) => string;
+                                       
+    listKey?: string;
 
     /**
      * The maximum number of items to render in each incremental render batch. The more rendered at

From e77f5638ae92d6001e528331811217f21ed3772f Mon Sep 17 00:00:00 2001
From: tnoonan-salesforce <tnoonan@salesforce.com>
Date: Thu, 12 Apr 2018 10:59:13 -0600
Subject: [PATCH 1240/1382] New Types for JSForce (#24925)

Additional Types added for jsforce

analytics
metadata
chatter
---
 types/jsforce/api/analytics.d.ts   |  82 +++++++++++++
 types/jsforce/api/chatter.d.ts     |  71 +++++++++++
 types/jsforce/api/metadata.d.ts    | 178 +++++++++++++++++++++++++++
 types/jsforce/connection.d.ts      |  69 ++++++++++-
 types/jsforce/describe-result.d.ts |  28 ++++-
 types/jsforce/index.d.ts           |  14 ++-
 types/jsforce/jsforce-tests.ts     | 190 ++++++++++++++++++++++++++++-
 types/jsforce/oauth2.d.ts          |  35 ++++++
 types/jsforce/promise.d.ts         |   3 +
 types/jsforce/query.d.ts           |  39 ++++--
 10 files changed, 693 insertions(+), 16 deletions(-)
 create mode 100644 types/jsforce/api/analytics.d.ts
 create mode 100644 types/jsforce/api/chatter.d.ts
 create mode 100644 types/jsforce/api/metadata.d.ts
 create mode 100644 types/jsforce/oauth2.d.ts
 create mode 100644 types/jsforce/promise.d.ts

diff --git a/types/jsforce/api/analytics.d.ts b/types/jsforce/api/analytics.d.ts
new file mode 100644
index 0000000000..02f04fac41
--- /dev/null
+++ b/types/jsforce/api/analytics.d.ts
@@ -0,0 +1,82 @@
+import { callback } from '../connection';
+
+interface ReportInfo {
+}
+
+export class Dashboard {
+    describe(callback?: callback<object>): Promise<any>;
+
+    del(callback?: callback<object>): Promise<any>;
+
+    destory(callback?: callback<object>): Promise<any>;
+
+    delete(callback?: callback<object>): Promise<any>;
+
+    components(componentIds: () => any | string[] | string, callback?: callback<object>): Promise<any>;
+
+    status(callback?: callback<object>): Promise<any>;
+
+    refresh(callback?: callback<object>): Promise<any>;
+
+    clone(name: string | object, folderid: string, callback?: callback<object>): Promise<any>;
+}
+
+export class ReportInstance {
+    constructor(report: Report, id: string);
+
+    retrieve(callback: callback<ReportResult>): Promise<ReportResult>
+}
+
+export class Report {
+    describe(callback?: callback<ReportMetadata>): Promise<ReportMetadata>;
+
+    del(callback?: callback<ReportResult>): Promise<ReportResult>;
+
+    destory(callback?: callback<ReportResult>): Promise<ReportResult>;
+
+    delete(callback?: callback<ReportResult>): Promise<ReportResult>;
+
+    clone(name: string, callback?: callback<ReportResult>): Promise<ReportResult>;
+
+    explain(callback?: callback<ExplainInfo>): Promise<ExplainInfo>;
+
+    run(options: () => any | object, callback?: callback<ReportResult>): Promise<ReportResult>;
+
+    exec(options: () => any | object, callback?: callback<ReportResult>): Promise<ReportResult>;
+
+    execute(options: () => any | object, callback?: callback<ReportResult>): Promise<ReportResult>;
+
+    executeAsync(options: () => any | object, callback?: callback<ReportInstanceAttrs>): Promise<ReportInstanceAttrs>;
+
+    instance(id: string): ReportInstance;
+
+    instances(callback?: callback<ReportInstance[]>): Promise<ReportInstance[]>;
+}
+
+export interface ReportInstanceAttrs {
+}
+
+export interface ExplainInfo {
+}
+
+export interface ReportMetadata {
+}
+
+export interface ReportResult {
+}
+
+export interface ReportInfo {
+}
+
+export interface DashboardInfo {
+}
+
+export class Analytics {
+    report(id: string): Promise<Report>;
+
+    reports(callback?: callback<ReportInfo[]>): Promise<ReportInfo[]>;
+
+    dashboard(id: string): Promise<Dashboard>;
+
+    dashboards(callback?: callback<DashboardInfo[]>): Promise<DashboardInfo[]>;
+}
diff --git a/types/jsforce/api/chatter.d.ts b/types/jsforce/api/chatter.d.ts
new file mode 100644
index 0000000000..05fc4551e0
--- /dev/null
+++ b/types/jsforce/api/chatter.d.ts
@@ -0,0 +1,71 @@
+import { Connection, callback } from '../connection';
+import { Query } from '../query';
+import { Stream } from 'stream';
+
+interface BatchRequestParams extends RequestParams {
+    method: string;
+    url: string;
+    richInput?: string;
+}
+
+interface BatchRequestResult {
+    statusCode: string;
+    result: RequestResult;
+}
+
+interface BatchRequestResults {
+    hasError: boolean;
+    results: BatchRequestResult[];
+}
+
+interface RequestParams {
+    method: string;
+    url: string;
+    body?: string;
+}
+
+export class RequestResult {
+}
+
+export class Request<T> implements Promise<T> {
+    constructor(chatter: Chatter, params: RequestParams);
+
+    batchParams(): BatchRequestParams;
+
+    promise(): Promise<T>;
+
+    stream(): Stream;
+
+    catch<TResult>(onrejected?: ((reason: any) => (PromiseLike<TResult> | TResult)) | null | undefined): Promise<T | TResult>;
+
+    then<TResult1, TResult2>(onfulfilled?: ((value: T) => (PromiseLike<TResult1> | TResult1)) | null | undefined,
+                             onrejected?: ((reason: any) => (PromiseLike<TResult2> | TResult2)) | null | undefined): Promise<TResult1 | TResult2>;
+
+    thenCall(callback?: (err: Error, records: T) => void): Query<T>;
+
+    readonly [Symbol.toStringTag]: 'Promise';
+}
+
+export class Resource<T> extends Request<T> {
+    constructor(chatter: Chatter, url: string, queryParams?: object);
+
+    create(data: object | string, callback?: callback<T>): Request<T>;
+
+    del(callback?: callback<T>): Request<T>;
+
+    delete(callback?: callback<T>): Request<T>;
+
+    retrieve(callback?: callback<T>): Request<T>;
+
+    update(data: object, callback?: callback<T>): Request<T>;
+}
+
+export class Chatter {
+    constructor(conn: Connection);
+
+    batch(callback?: callback<BatchRequestResults>): Promise<BatchRequestResults>;
+
+    request(params: RequestParams, callback?: callback<Request<RequestResult>>): Request<RequestResult>;
+
+    resource(url: string, queryParams?: object): Resource<RequestResult>
+}
diff --git a/types/jsforce/api/metadata.d.ts b/types/jsforce/api/metadata.d.ts
new file mode 100644
index 0000000000..c867ece15b
--- /dev/null
+++ b/types/jsforce/api/metadata.d.ts
@@ -0,0 +1,178 @@
+import { callback, Connection } from '../connection';
+import { EventEmitter } from 'events';
+import { Stream } from 'stream';
+
+interface DeployResult {
+    id: string;
+    checkOnly: boolean;
+    completedDate: string;
+    createdDate: string;
+    details?: object[];
+    done: boolean;
+    errorMessage?: string;
+    errorStatusCode?: string;
+    ignoreWarnings?: boolean;
+    lastModifiedDate: string;
+    numberComponentErrors: number;
+    numberComponentsDeployed: number;
+    numberComponentsTotal: number;
+    numberTestErrors: number;
+    numberTestsCompleted: number;
+    numberTestsTotal: number;
+    rollbackOnError?: boolean;
+    startDate: string;
+    status: string;
+    success: boolean;
+}
+
+interface MetadataObject {
+    childXmlNames: string[];
+    directoryName: string;
+    inFolder: boolean;
+    metaFile: boolean;
+    suffix: string;
+    xmlName: string;
+}
+
+interface DescribeMetadataResult {
+    metadataObjects: MetadataObject[];
+    organizationNamespace: string;
+    partialSaveAllowed: boolean;
+    testRequired: boolean;
+}
+
+interface FileProperties {
+    type: string;
+    createdById: string;
+    createdByName: string;
+    createdDate: string;
+    fileName: string;
+    fullName: string;
+    id: string;
+    lastModifiedById: string;
+    lastModifiedByName: string;
+    lastModifiedDate: string;
+    manageableState?: string;
+    namespacePrefix?: string;
+}
+
+interface ListMetadataQuery {
+    type: string;
+    folder?: string;
+}
+
+interface MetadataInfo {
+    fullName: string;
+}
+
+interface RetrieveRequest {
+}
+
+interface RetrieveResult {
+    fileProperties: FileProperties[];
+    id: string;
+    messages: object[];
+    zipFile: string
+}
+
+interface SaveResult {
+    success: boolean;
+    fullName: string;
+}
+
+interface UpdateMetadataInfo {
+    currentName: string;
+    metadata: MetadataInfo;
+}
+
+interface UpsertResult {
+    success: boolean;
+    fullName: string;
+    created: boolean;
+}
+
+interface AsyncResult {
+    done: boolean;
+    id: string;
+    state: string;
+    statusCode?: string;
+    message?: string;
+}
+
+interface DeployOptions {
+    allowMissingFiles?:	boolean;
+    autoUpdatePackage?: boolean;
+    checkOnly?:	boolean;
+    ignoreWarnings?: boolean;
+    performRetrieve?: boolean;
+    purgeOnDelete?: boolean;
+    rollbackOnError?: boolean;
+    runAllTests?: boolean;
+    runTests?: string[];
+    singlePackage?:	boolean;
+}
+
+export class AsyncResultLocator<T> extends EventEmitter implements Promise<T> {
+    check(callback?: callback<T>): Promise<T>
+
+    complete(callback?: callback<T>): Promise<T>
+
+    poll(interval: number, timeout: number): void;
+
+    catch<TResult>(onrejected?: ((reason: any) => (PromiseLike<TResult> | TResult)) | null | undefined): Promise<T | TResult>;
+
+    then<TResult1, TResult2>(onfulfilled?: ((value: T) => (PromiseLike<TResult1> | TResult1)) | null | undefined,
+                             onrejected?: ((reason: any) => (PromiseLike<TResult2> | TResult2)) | null | undefined): Promise<TResult1 | TResult2>;
+
+    readonly [Symbol.toStringTag]: "Promise";
+}
+
+export class DeployResultLocator<T> extends AsyncResultLocator<T> {}
+export class RetrieveResultLocator<T> extends AsyncResultLocator<T> {}
+
+export class Metadata {
+    pollInterval: number;
+    pollTimeout: number;
+
+    constructor(conn: Connection);
+
+    checkDeployStatus(id: string, includeDetails?: boolean, callback?: callback<DeployResult>): Promise<DeployResult>
+
+    checkRetrieveStatus(id: string, callback?: callback<RetrieveResult>): Promise<RetrieveResult>
+
+    checkStatus(ids: string | string[], callback?: callback<AsyncResult | Array<AsyncResult>>): AsyncResultLocator<AsyncResult | Array<AsyncResult>>
+
+    create(type: string, metadata: MetadataInfo | Array<MetadataInfo>, callback?: callback<SaveResult | Array<SaveResult>>): Promise<SaveResult | Array<SaveResult>>
+
+    createAsync(type: string, metadata: MetadataInfo | Array<MetadataInfo>, callback?: callback<SaveResult | Array<SaveResult>>): Promise<SaveResult | Array<SaveResult>>
+
+    createSync(type: string, metadata: MetadataInfo | Array<MetadataInfo>,  callback?: callback<SaveResult | Array<SaveResult>>): Promise<SaveResult | Array<SaveResult>>;
+
+    delete(type: string, fullNames: string | string[], callback?: callback<SaveResult | Array<SaveResult>>): Promise<SaveResult | Array<SaveResult>>;
+
+    deleteAsync(type: string, metadata: string | string[] | MetadataInfo | Array<MetadataInfo>, callback?: callback<AsyncResult | Array<AsyncResult>>): AsyncResultLocator<AsyncResult | Array<AsyncResult>>
+
+    deleteSync(type: string, fullNames: string | string[], callback?: callback<SaveResult | Array<SaveResult>>): Promise<SaveResult | Array<SaveResult>>;
+
+    deploy(zipInput: Stream | Buffer | string, options: DeployOptions, callback?:callback<AsyncResult>): DeployResultLocator<AsyncResult>;
+
+    describe(version?: string, callback?: callback<DescribeMetadataResult>): Promise<DescribeMetadataResult>;
+
+    list(queries: ListMetadataQuery | Array<ListMetadataQuery>, version?: string, callback?: callback<Array<FileProperties>>): Promise<Array<FileProperties>>;
+
+    read(type: string, fullNames: string | string[], callback?: callback<MetadataInfo | Array<MetadataInfo>>): Promise<MetadataInfo | Array<MetadataInfo>>;
+
+    readSync(type: string, fullNames: string | string[], callback?: callback<MetadataInfo | Array<MetadataInfo>>): Promise<MetadataInfo | Array<MetadataInfo>>;
+
+    rename(type: string, oldFullName: string, newFullName: string, callback?: callback<SaveResult>): Promise<SaveResult>
+
+    retrieve(request: RetrieveRequest, callback: callback<AsyncResult>): RetrieveResultLocator<AsyncResult>
+
+    update(type: string, updateMetadata: MetadataInfo | Array<MetadataInfo>, callback?: callback<SaveResult | Array<SaveResult>>): Promise<SaveResult | Array<SaveResult>>
+
+    updateAsync(type: string, updateMetadata: MetadataInfo, callback?: callback<AsyncResult | Array<AsyncResult>>): AsyncResultLocator<AsyncResult | Array<AsyncResult>>
+
+    updateSync(type: string, updateMetadata: MetadataInfo | Array<MetadataInfo>, callback?: callback<SaveResult | Array<SaveResult>>): Promise<SaveResult | Array<SaveResult>>
+
+    upsert(type: string, metadata: MetadataInfo | Array<MetadataInfo>, callback?: callback<UpsertResult | Array<UpsertResult>>): Promise<UpsertResult | Array<UpsertResult>>
+}
diff --git a/types/jsforce/connection.d.ts b/types/jsforce/connection.d.ts
index 4c3e1eb5fb..06cda5e29f 100644
--- a/types/jsforce/connection.d.ts
+++ b/types/jsforce/connection.d.ts
@@ -1,8 +1,14 @@
-import { SObjectCreateOptions } from './create-options';
-import { DescribeSObjectResult } from './describe-result';
+import { EventEmitter } from 'events';
+import { DescribeSObjectResult, DescribeGlobalResult } from './describe-result';
 import { Query, QueryResult } from './query';
+import { Record } from './record';
 import { RecordResult } from './record-result';
 import { SObject } from './salesforce-object';
+import { Analytics } from './api/analytics';
+import { Chatter } from './api/chatter';
+import { Metadata } from './api/metadata';
+
+export type callback<T> = (err: Error, result: T) => void;
 
 // These are pulled out because according to http://jsforce.github.io/jsforce/doc/connection.js.html#line49
 // the oauth options can either be in the `oauth2` proeprty OR spread across the main connection
@@ -13,6 +19,12 @@ export interface OAuth2Options {
     redirectUri?: string;
 }
 
+export interface RequestInfo {
+    method?: string;
+    url?: string;
+    headers?: object;
+}
+
 export interface ConnectionOptions extends OAuth2Options {
     accessToken?: string;
     callOptions?: Object;
@@ -36,6 +48,14 @@ export interface UserInfo {
     url: string;
 }
 
+export abstract class RestApi {
+    get(path: string, options: object, callback: () => object): Promise<object>;
+    post(path: string, body: object, options: object, callback: () => object): Promise<object>;
+    put(path: string, body: object, options: object, callback: () => object): Promise<object>;
+    patch(path: string, body: object, options: object, callback: () => object): Promise<object>;
+    del(path: string, options: object, callback: () => object): Promise<object>;
+}
+
 export type ConnectionEvent = "refresh";
 
 /**
@@ -57,19 +77,58 @@ export type ConnectionEvent = "refresh";
  *
  * to ensure that you have the correct data types for the various collection names.
  */
-export interface Connection {
+export abstract class BaseConnection extends EventEmitter {
+    _baseUrl(): string;
+    request(info: RequestInfo | string, options?: Object, callback?: (err: Error, Object: object) => void): Promise<Object>;
     query<T>(soql: string, callback?: (err: Error, result: QueryResult<T>) => void): Query<QueryResult<T>>;
+    queryMore<T>(locator: string, options?: object, callback?: (err: Error, result: QueryResult<T>) => void): Promise<QueryResult<T>>;
+    create<T>(type: string, records: Record<T>|Array<Record<T>>, options?: Object,
+        callback?: (err: Error, result: RecordResult | RecordResult[]) => void): Promise<(RecordResult | RecordResult[])>;
+    insert<T>(type: string, records: Record<T>|Array<Record<T>>, options?: Object,
+        callback?: (err: Error, result: RecordResult | RecordResult[]) => void): Promise<(RecordResult | RecordResult[])>;
+    retrieve<T>(type: string, ids: string|string[], options?: Object,
+        callback?: (err: Error, result: Record<T> | Array<Record<T>>) => void): Promise<(Record<T> | Array<Record<T>>)>;
+    update<T>(type: string, records: Record<T>|Array<Record<T>>, options?: Object,
+        callback?: (err: Error, result: RecordResult | Array<Record<T>>) => void): Promise<(RecordResult | RecordResult[])>;
+    upsert<T>(type: string, records: Record<T>|Array<Record<T>>, extIdField: string, options?: Object,
+        callback?: (err: Error, result: RecordResult | RecordResult[]) => void): Promise<(RecordResult | RecordResult[])>;
+    del<T>(type: string, ids: string|string[], options?: Object,
+        callback?: (err: Error, result: RecordResult | RecordResult[]) => void): Promise<(RecordResult | RecordResult[])>;
+    delete<T>(type: string, ids: string|string[], options?: Object,
+        callback?: (err: Error, result: RecordResult | RecordResult[]) => void): Promise<(RecordResult | RecordResult[])>;
+    destroy<T>(type: string, ids: string|string[], options?: Object,
+        callback?: (err: Error, result: RecordResult | RecordResult[]) => void): Promise<(RecordResult | RecordResult[])>;
+    describe<T>(type: string, callback?: (err: Error, result: DescribeSObjectResult) => void): Promise<DescribeSObjectResult>;
+    describeGlobal<T>(callback?: (err: Error, result: DescribeGlobalResult) => void): Promise<DescribeGlobalResult>;
     sobject<T>(resource: string): SObject<T>;
 }
 
-export class Connection implements Connection {
+export class Connection extends BaseConnection {
     constructor(params: ConnectionOptions)
+
+    tooling: Tooling;
+    analytics: Analytics;
+    chatter: Chatter;
+    metadata: Metadata;
+
+    // Specific to Connection
+    instanceUrl: string;
+    version: string;
     accessToken: string;
+    initialize(options?: ConnectionOptions): void;
+    queryAll<T>(soql: string, options?: object, callback?: (err: Error, result: QueryResult<T>) => void): Query<QueryResult<T>>;
+    authorize(code: string, callback?: (err: Error, res: UserInfo) => void): Promise<UserInfo>;
     login(user: string, password: string, callback?: (err: Error, res: UserInfo) => void): Promise<UserInfo>;
     loginByOAuth2(user: string, password: string, callback?: (err: Error, res: UserInfo) => void): Promise<UserInfo>;
     loginBySoap(user: string, password: string, callback?: (err: Error, res: UserInfo) => void): Promise<UserInfo>;
     logout(callback?: (err: Error, res: undefined) => void): Promise<void>;
     logoutByOAuth2(callback?: (err: Error, res: undefined) => void): Promise<void>;
     logoutBySoap(callback?: (err: Error, res: undefined) => void): Promise<void>;
-    on(eventName: ConnectionEvent, callback: Function): void;
+}
+
+export class Tooling extends BaseConnection {
+    _logger: any;
+
+    // Specific to tooling
+    executeAnonymous(body: string, callback?: (err: Error, res: any) => void): Promise<any>;
 }
diff --git a/types/jsforce/describe-result.d.ts b/types/jsforce/describe-result.d.ts
index 584a62d3bf..352c4223a6 100644
--- a/types/jsforce/describe-result.d.ts
+++ b/types/jsforce/describe-result.d.ts
@@ -1,4 +1,30 @@
 export interface DescribeSObjectResult {
     label: string;
-    fields: string[];
+    fields: object[];
+}
+
+export interface DescribeGlobalResult {
+    activateable: boolean;
+    createable: boolean;
+    custom: boolean;
+    customSetting: boolean;
+    deletable: boolean;
+    deprecatedAndHidden: boolean;
+    feedEnabled: boolean;
+    hasSubtypes: boolean;
+    isSubtype: boolean;
+    keyPrefix: string;
+    label: string;
+    labelPlural: string;
+    layoutable: boolean;
+    mergeable: boolean;
+    mruEnabled: boolean;
+    name: string;
+    queryable: boolean;
+    replicateable: boolean;
+    retrieveable: boolean;
+    searchable: boolean;
+    triggerable: boolean;
+    undeletable: boolean;
+    updateable: boolean;
 }
diff --git a/types/jsforce/index.d.ts b/types/jsforce/index.d.ts
index 73a848b79f..edb2830f52 100644
--- a/types/jsforce/index.d.ts
+++ b/types/jsforce/index.d.ts
@@ -2,6 +2,8 @@
 // Project: https://github.com/jsforce/jsforce
 // Definitions by: Dolan Miu <https://github.com/dolanmiu>
 //                 Kamil Ejsymont <https://github.com/netes>
+//                 Thomas Dvornik <https://github.com/amphro>
+//                 Tim Noonan <https://github.com/tnoonan-salesforce>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -13,6 +15,16 @@ import * as glob from 'glob';
 export { Date } from './date-enum';
 export { Record } from './record';
 export { RecordResult } from './record-result';
-export { Connection } from './connection';
+export { Connection, ConnectionOptions, RequestInfo, Tooling, callback } from './connection';
 export { SObject } from './salesforce-object';
 export { SalesforceId } from './salesforce-id';
+export { OAuth2, OAuth2Options } from './oauth2';
+export { Query, QueryResult } from './query';
+export { Promise } from './promise';
+export { Report, Dashboard, Analytics, ReportInstance, DashboardInfo, ReportInfo, ExplainInfo, ReportInstanceAttrs,
+    ReportMetadata, ReportResult } from './api/analytics';
+export { Chatter, Request, RequestResult, BatchRequestResults, BatchRequestParams,
+    Resource, BatchRequestResult, RequestParams } from './api/chatter';
+export { Metadata, SaveResult, MetadataInfo, AsyncResult, RetrieveResultLocator, RetrieveRequest, FileProperties,
+    ListMetadataQuery, DescribeMetadataResult, DeployOptions, AsyncResultLocator, RetrieveResult, MetadataObject,
+    DeployResult, DeployResultLocator, UpdateMetadataInfo, UpsertResult } from './api/metadata';
diff --git a/types/jsforce/jsforce-tests.ts b/types/jsforce/jsforce-tests.ts
index 2c1b5b1f9c..9205d59096 100644
--- a/types/jsforce/jsforce-tests.ts
+++ b/types/jsforce/jsforce-tests.ts
@@ -79,7 +79,7 @@ salesforceConnection.query('SELECT Id FROM Account')
     .on('end', (query: any) => {
         console.log(records);
     })
-    .on('error', (error) => {
+    .on('error', (error: Error) => {
         console.log('Error returned from query:', error);
     })
     .run({ autoFetch: true, maxFetch: 25 });
@@ -89,3 +89,191 @@ salesforceConnection.sobject<any>('Coverage__c')
 
 salesforceConnection.sobject<any>('Coverage__c')
     .select(['Id', 'Name']).del("test", () => { });
+
+async function testAnalytics(conn: sf.Connection): Promise<void> {
+    const analytics: sf.Analytics = conn.analytics;
+
+    const dashboards: sf.DashboardInfo[] = await analytics.dashboards();
+    const dashboard = dashboards[0] as any;
+    Object.keys(dashboards[0])
+        .forEach((key: string) => console.log(`key: ${key} : ${dashboard[key]}`));
+    console.log('dashboard keys from await');
+
+    analytics.dashboards((err, dashboards: sf.DashboardInfo[]) => {
+        const _dashboard: any = dashboards[0] as any;
+        Object.keys(_dashboard)
+            .forEach((key: string) => console.log(`key: ${key} : ${_dashboard[key]}`));
+        console.log('dashboard keys from callback');
+    });
+
+    const reports: sf.ReportInfo[] = await analytics.reports();
+    const report: any = reports[0] as any;
+    Object.keys(reports[0]).forEach((key: string) => console.log(`key: ${key} : ${report[key]}`));
+
+    analytics.reports((err, reports: sf.ReportInfo[]) => {
+        const _report: any = reports[0] as any;
+        Object.keys(reports[0])
+            .forEach((key: string) => console.log(`key: ${key} : ${_report[key]}`));
+        console.log('report keys from callback');
+    });
+}
+
+async function testMetadata(conn: sf.Connection): Promise<void> {
+    const md: sf.Metadata = conn.metadata;
+    const m: sf.DescribeMetadataResult = await md.describe('34.0');
+    const pages: sf.MetadataObject[] =
+        m.metadataObjects.filter((value: sf.MetadataObject) => value.directoryName === 'pages');
+    console.log(`ApexPage?: ${pages[0].xmlName === 'ApexPage'}`);
+
+    const types: sf.ListMetadataQuery[] = [{type: 'CustomObject', folder: null}];
+    md.list(types, '39.0', (err, properties: sf.FileProperties[]) => {
+        if (err) {
+            console.error('err', err);
+            return;
+        }
+        const meta: sf.FileProperties = properties[0];
+        console.log('metadata count: ' + properties.length);
+        console.log('createdById: ' + meta.createdById);
+        console.log('createdByName: ' + meta.createdByName);
+        console.log('createdDate: ' + meta.createdDate);
+        console.log('fileName: ' + meta.fileName);
+        console.log('fullName: ' + meta.fullName);
+        console.log('id: ' + meta.id);
+        console.log('lastModifiedById: ' + meta.lastModifiedById);
+        console.log('lastModifiedByName: ' + meta.lastModifiedByName);
+        console.log('lastModifiedDate: ' + meta.lastModifiedDate);
+        console.log('manageableState: ' + meta.manageableState);
+        console.log('namespacePrefix: ' + meta.namespacePrefix);
+        console.log('type: ' + meta.type);
+    });
+
+    const fullNames: string[] = [ 'Account', 'Contact' ];
+    const info: sf.MetadataInfo | sf.MetadataInfo[] = await md.read('CustomObject', fullNames);
+    console.log((info as sf.MetadataInfo[])[0].fullName);
+    console.log((info as sf.MetadataInfo[])[1].fullName);
+
+    const now: number = Date.now();
+    const now2: number = now + 1;
+    const metadata = [{
+        fullName: `TestObject${now}__c`,
+        label: `Test Object ${now}`,
+        pluralLabel: `Test Object ${now}`,
+        nameField: {
+            type: 'Text',
+            label: `Test Object Name ${now}`
+        },
+        deploymentStatus: 'Deployed',
+        sharingModel: 'ReadWrite'
+    }, {
+        fullName: `TestObject${now2}__c`,
+        label: `Test Object ${now2}`,
+        pluralLabel: `Test Object ${now2}`,
+        nameField: {
+            type: 'AutoNumber',
+            label: 'Test Object #'
+        },
+        deploymentStatus: 'InDevelopment',
+        sharingModel: 'Private'
+    }];
+
+    const result: sf.SaveResult | sf.SaveResult[] = await md.create('CustomObject', metadata);
+    console.log(`created ${(result as sf.SaveResult[])[0].fullName} - ${(result as sf.SaveResult[])[0].success}`);
+    console.log(`created ${(result as sf.SaveResult[])[1].fullName} - ${(result as sf.SaveResult[])[1].success}`);
+
+    const fullNames2: string[] = [`TestObject${now}__c`, `TestObject${now2}__c`];
+    const result2: sf.SaveResult | sf.SaveResult[] =
+        await (md.delete('CustomObject', fullNames2) as Promise<sf.SaveResult[]>);
+    console.log(`deleted ${result2[0].fullName} - ${result2[0].success}`);
+    console.log(`deleted ${result2[1].fullName} - ${result2[1].success}`);
+}
+
+async function testChatter(conn: sf.Connection): Promise<void> {
+    const chatter: sf.Chatter = conn.chatter;
+    chatter.resource('/feed-elements').create({
+        body: {
+            messageSegments: [{
+                type: 'Text',
+                text: 'This is new post'
+            }]
+        },
+        feedElementType : 'FeedItem',
+        subjectId: 'me'
+    }, (err: Error, result: any) => {
+        if (err) {
+            throw err;
+        }
+        const feedMessageUrl = `/feed-elements/${result.id}/capabilities/comments/items`;
+        chatter.resource(feedMessageUrl).create({
+            body: {
+                messageSegments: [{
+                    type: 'Text',
+                    text: 'This is new comment on the post'
+                }]
+            }
+        }, (err: Error, result: any) => {
+            if (err) {
+                throw err;
+            }
+            console.log("Id: " + result.id);
+            console.log("URL: " + result.url);
+            console.log("Body: " + result.body.messageSegments[0].text);
+        });
+    });
+
+    const resourceMe: sf.Resource<sf.RequestResult> = chatter.resource('/users/me');
+    resourceMe.retrieve((err, res: any) => {
+        if (err) {
+            console.error(err);
+            return;
+        }
+        console.log("username: " + res.username);
+        console.log("email: " + res.email);
+        console.log("small photo url: " + res.photo.smallPhotoUrl);
+    });
+
+    chatter.resource('/users', { q: 'Suzuki' }).retrieve((err, result: any) => {
+        if (err) {
+            console.error(err);
+            return;
+        }
+        console.log("current page URL: " + result['currentPageUrl']);
+        console.log("next page URL: " + result['nextPageUrl']);
+        console.log("users count: " + result['users'].length);
+        for (const user of result['users']) {
+            console.log('User ID: ' + user.id);
+            console.log('User URL: ' + user.url);
+            console.log('Username: ' + user.username);
+        }
+    });
+
+    const feedResource: sf.Resource<sf.RequestResult> = chatter.resource('/feed-elements');
+
+    const feedCreateRequest: any = await (feedResource.create({
+        body: {
+            messageSegments: [{
+                type: 'Text',
+                text: 'This is new comment on the post'
+            }]
+        },
+        feedElementType : 'FeedItem',
+        subjectId: 'me'
+    }) as Promise<sf.RequestResult>);
+
+    console.log(`feedCreateRequest.id: ${feedCreateRequest.id}`);
+    const itemLikesUrl = `/feed-elements/${feedCreateRequest.id}/capabilities/chatter-likes/items`;
+    const itemsLikeResource: sf.Resource<sf.RequestResult> = chatter.resource(itemLikesUrl);
+
+    const itemsLikeCreateResult: sf.RequestResult = await (itemsLikeResource.create('') as Promise<sf.RequestResult>);
+    console.log(`itemsLikeCreateResult['likedItem']: ${itemsLikeCreateResult as any ['likedItem']}`);
+}
+
+(async () => {
+    const query2: sf.QueryResult<object> =
+        await (salesforceConnection.query("SELECT Id, Name FROM User") as Promise<sf.QueryResult<object>>);
+    console.log("Query Promise: total in database: " + query2.totalSize);
+    console.log("Query Promise: total fetched : " + query2.records[0]);
+
+    await testAnalytics(salesforceConnection);
+    await testChatter(salesforceConnection);
+    await testMetadata(salesforceConnection);
+})();
diff --git a/types/jsforce/oauth2.d.ts b/types/jsforce/oauth2.d.ts
new file mode 100644
index 0000000000..833a9d45fd
--- /dev/null
+++ b/types/jsforce/oauth2.d.ts
@@ -0,0 +1,35 @@
+export interface OAuth2Options {
+    authzServiceUrl?: string;
+    tokenServiceUrl?: string;
+    clientId?: string;
+    clientSecret?: string;
+    httpProxy?: string;
+    loginUrl?: string;
+    proxyUrl?: string;
+    redirectUri?: string;
+    refreshToken?: string;
+    revokeServiceUrl?: string;
+    authCode?: string;
+    privateKeyFile?: string;
+    privateKey?: string; // Used for sfdx auth files for legacy support reasons
+}
+
+export class OAuth2 {
+    constructor (options? : OAuth2Options);
+
+    protected _postParams(options: any, callback: () => any): void
+
+    loginUrl: string;
+    authzServiceUrl: string;
+    tokenServiceUrl: string;
+    revokeServiceUrl: string;
+    clientId: string;
+    clientSecret: string;
+    redirectUri: string;
+
+    getAuthorizationUrl(params: any): string;
+    refreshToken(code: string, callback?: () => any): Promise<any>;
+    requestToken(code: string, callback?: () => any): Promise<any>;
+    authenticate(username: string, password: string, callback?: () => any): Promise<any>;
+    revokeToken(accessToken: string, callback?: () => any): Promise<any>;
+}
diff --git a/types/jsforce/promise.d.ts b/types/jsforce/promise.d.ts
new file mode 100644
index 0000000000..f4f6e0660b
--- /dev/null
+++ b/types/jsforce/promise.d.ts
@@ -0,0 +1,3 @@
+export class Promise {
+    thenCall: (cb: () => void) => void;
+}
diff --git a/types/jsforce/query.d.ts b/types/jsforce/query.d.ts
index 0e7d413cf8..b33af41ede 100644
--- a/types/jsforce/query.d.ts
+++ b/types/jsforce/query.d.ts
@@ -1,7 +1,5 @@
 // http://jsforce.github.io/jsforce/doc/Query.html
 import { Readable } from 'stream';
-
-import { SalesforceId } from './salesforce-id';
 import { RecordResult } from './record-result';
 
 export interface ExecuteOptions {
@@ -19,38 +17,63 @@ export interface QueryResult<T> {
 
 export class Query<T> extends Readable implements Promise<T> {
     end(): Query<T>;
+
     filter(filter: Object): Query<T>;
+
     include(include: string): Query<T>;
+
     hint(hint: Object): Query<T>;
+
     limit(value: number): Query<T>;
+
     maxFetch(value: number): Query<T>;
+
     offset(value: number): Query<T>;
+
     skip(value: number): Query<T>;
-    sort(keyOrList: string | Object[] | Object, direction?: "ASC" | "DESC" | number): Query<T>;
+
+    sort(keyOrList: string | Object[] | Object, direction?: 'ASC' | 'DESC' | number): Query<T>;
+
     run(options?: ExecuteOptions, callback?: (err: Error, records: T[]) => void): Query<T>;
+
     execute(options?: ExecuteOptions, callback?: (err: Error, records: T[]) => void): Query<T>;
+
     exec(options?: ExecuteOptions, callback?: (err: Error, records: T[]) => void): Query<T>;
+
     del(type?: string, callback?: (err: Error, ret: RecordResult) => void): any;
     del(callback?: (err: Error, ret: RecordResult) => void): any;
+
     delete(type?: string, callback?: (err: Error, ret: RecordResult) => void): any;
     delete(callback?: (err: Error, ret: RecordResult) => void): any;
+
     destroy(type?: string, callback?: (err: Error, ret: RecordResult) => void): Promise<RecordResult[]>;
     destroy(callback?: (err: Error, ret: RecordResult) => void): Promise<RecordResult[]>;
     destroy(error?: Error): void;
+
     explain(callback?: (err: Error, info: ExplainInfo) => void): Promise<ExplainInfo>;
+
     map(callback: (currentValue: Object) => void): Promise<any>;
+
     scanAll(value: boolean): Query<T>;
+
     select(fields: Object | string[] | string): Query<T>;
+
     thenCall(callback?: (err: Error, records: T) => void): Query<T>;
+
     toSOQL(callback: (err: Error, soql: string) => void): Promise<string>;
+
     update(mapping: any, type: string, callback: (err: Error, records: RecordResult[]) => void): Promise<RecordResult[]>;
+
     where(conditions: Object | string): Query<T>;
 
-    // Implementing promise methods
-    then<T, never>(onfulfilled?: any): Promise<T | never>;
-    catch<never>(onrejected?: any): Promise<T>;
     finally<never>(): Promise<T>;
-    [Symbol.toStringTag]: "Promise";
+
+    [Symbol.toStringTag]: 'Promise';
+
+    catch<TResult>(onrejected?: ((reason: any) => (PromiseLike<TResult> | TResult))): Promise<T | TResult>;
+
+    then<TResult1, TResult2>(onfulfilled?: ((value: T) => (PromiseLike<TResult1> | TResult1)),
+                             onrejected?: ((reason: any) => (PromiseLike<TResult2> | TResult2))): Promise<TResult1 | TResult2>;
 }
 
-export class ExplainInfo { }
+export class ExplainInfo {}

From e372b989c73776d9e573ad034bc9519941db61c8 Mon Sep 17 00:00:00 2001
From: Nattapong-sir <33569075+Nattapong-sir@users.noreply.github.com>
Date: Thu, 12 Apr 2018 23:59:27 +0700
Subject: [PATCH 1241/1382] Add auth options into MongoClientOptions (#24934)

Reference: https://github.com/DefinitelyTyped/DefinitelyTyped/issues/24906#issuecomment-380486889
---
 types/mongodb/index.d.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/types/mongodb/index.d.ts b/types/mongodb/index.d.ts
index 8b5a637ebd..00356214c6 100644
--- a/types/mongodb/index.d.ts
+++ b/types/mongodb/index.d.ts
@@ -97,6 +97,10 @@ export interface MongoClientOptions extends
     validateOptions?: Object;
     // The name of the application that created this MongoClient instance.
     appname?: string;
+    auth?: {
+        user: string;
+        password: string;
+    }
 }
 
 export interface SSLOptions {

From cdb3807edbfce9a848035bf997bfad95756f83ba Mon Sep 17 00:00:00 2001
From: Sean Kelley <seansfkelley@users.noreply.github.com>
Date: Thu, 12 Apr 2018 09:59:44 -0700
Subject: [PATCH 1242/1382] reactstrap: Input from StatelessComponent to
 React.Component subclass (#24846)

* reactstrap: Input from StatelessComponent to ComponentClass

`Input` is a full React component (`ComponentClass`), not a stateless component. In particular, this change allows consumers to pass `ref` to it (not legal with `StatelessComponent`), which useful for e.g. calling `HTMLInputElement#focus()`.

* ComponentClasss -> extends React.Component
---
 types/reactstrap/lib/Input.d.ts       | 3 ++-
 types/reactstrap/reactstrap-tests.tsx | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/types/reactstrap/lib/Input.d.ts b/types/reactstrap/lib/Input.d.ts
index 3da3691ea8..eddd8089be 100644
--- a/types/reactstrap/lib/Input.d.ts
+++ b/types/reactstrap/lib/Input.d.ts
@@ -1,3 +1,4 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
 export type InputType =
@@ -41,5 +42,5 @@ export interface InputProps extends React.InputHTMLAttributes<HTMLInputElement>
   cssModule?: CSSModule;
 }
 
-declare const Input: React.StatelessComponent<InputProps>;
+declare class Input extends React.Component<InputProps> {}
 export default Input;
diff --git a/types/reactstrap/reactstrap-tests.tsx b/types/reactstrap/reactstrap-tests.tsx
index 8b58c9f886..1b777d173c 100644
--- a/types/reactstrap/reactstrap-tests.tsx
+++ b/types/reactstrap/reactstrap-tests.tsx
@@ -3676,3 +3676,9 @@ const Example116 = (props: any) => {
     </div>
   );
 };
+
+class Example117 extends React.Component {
+  render() {
+    return <Input ref={e => { console.log(e); }}/>;
+  }
+}

From fbd66a68aaf21085ef6bd9ad62229559f891d7ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Zugmeyer?= <bzugmeyer@gmail.com>
Date: Thu, 12 Apr 2018 18:59:57 +0200
Subject: [PATCH 1243/1382] [chart.js] add the Chart option `devicePixelRatio`
 (#24926)

See [chart.js documentation](http://www.chartjs.org/docs/latest/general/device-pixel-ratio.html)
---
 types/chart.js/chart.js-tests.ts | 1 +
 types/chart.js/index.d.ts        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/types/chart.js/chart.js-tests.ts b/types/chart.js/chart.js-tests.ts
index 9e6117c5e5..d0f6ebc684 100644
--- a/types/chart.js/chart.js-tests.ts
+++ b/types/chart.js/chart.js-tests.ts
@@ -58,6 +58,7 @@ const chart: Chart = new Chart(new CanvasRenderingContext2D(), {
                 padding: 40
             }
         },
+        devicePixelRatio: 2,
     }
 });
 chart.update();
diff --git a/types/chart.js/index.d.ts b/types/chart.js/index.d.ts
index a2ea423cb8..a085fd0381 100644
--- a/types/chart.js/index.d.ts
+++ b/types/chart.js/index.d.ts
@@ -199,6 +199,7 @@ declare namespace Chart {
         cutoutPercentage?: number;
         circumference?: number;
         rotation?: number;
+        devicePixelRatio?: number;
         // Plugins can require any options
         plugins?: { [plugin: string]: any };
     }

From 509c1b2d90de11c08c55554b7cb51213493de6a0 Mon Sep 17 00:00:00 2001
From: Simon Archer <simon@archybold.com>
Date: Thu, 12 Apr 2018 18:00:20 +0100
Subject: [PATCH 1244/1382] chart.js - Add datasetIndex property to
 ChartLegendItem (#24712)

* Add datasetIndex property to ChartLegendItem.

* New sub-type interface for ChartLegendLabelItem.
---
 types/chart.js/index.d.ts | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/types/chart.js/index.d.ts b/types/chart.js/index.d.ts
index a085fd0381..0ea854c7ba 100644
--- a/types/chart.js/index.d.ts
+++ b/types/chart.js/index.d.ts
@@ -9,6 +9,7 @@
 //                 Dan Manastireanu <https://github.com/danmana>
 //                 Guillaume Rodriguez <https://github.com/guillaume-ro-fr>
 //                 Sergey Rubanov <https://github.com/chicoxyzzy>
+//                 Simon Archer <https://github.com/archy-bold>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -126,6 +127,10 @@ declare namespace Chart {
         pointStyle?: PointStyle;
     }
 
+    interface ChartLegendLabelItem extends ChartLegendItem {
+        datasetIndex: number;
+    }
+
     interface ChartTooltipItem {
         xLabel?: string;
         yLabel?: string;
@@ -227,8 +232,8 @@ declare namespace Chart {
         display?: boolean;
         position?: PositionType;
         fullWidth?: boolean;
-        onClick?(event: MouseEvent, legendItem: ChartLegendItem): void;
-        onHover?(event: MouseEvent, legendItem: ChartLegendItem): void;
+        onClick?(event: MouseEvent, legendItem: ChartLegendLabelItem): void;
+        onHover?(event: MouseEvent, legendItem: ChartLegendLabelItem): void;
         labels?: ChartLegendLabelOptions;
         reverse?: boolean;
     }
@@ -241,7 +246,7 @@ declare namespace Chart {
         fontFamily?: string;
         padding?: number;
         generateLabels?(chart: any): any;
-        filter?(item: ChartLegendItem, data: ChartData): any;
+        filter?(legendItem: ChartLegendLabelItem, data: ChartData): any;
         usePointStyle?: boolean;
     }
 

From 22bea9740b0a057ba2778df325f12b4cf5900ce5 Mon Sep 17 00:00:00 2001
From: Matt Gibbs <matt@mtgibbs.xyz>
Date: Thu, 12 Apr 2018 13:00:40 -0400
Subject: [PATCH 1245/1382] [plupload] Additional Documentation and .features
 type fix (#24919)

* Add test for features map

I can't find a good description on the site for all of the values in
this map, so for now it's just "any".  I would like to specify this
though.

* Add documentation for a couple plupload constants

* Expand features scope out to the "any" map

These are technically fixed, but there's no good documentation on what
"features" are all supported that I can find.

* Update more documentation

* WHITESPAZE
---
 types/plupload/index.d.ts        | 301 +++++++++++++++++++++++++++++--
 types/plupload/plupload-tests.ts |   3 +
 2 files changed, 293 insertions(+), 11 deletions(-)

diff --git a/types/plupload/index.d.ts b/types/plupload/index.d.ts
index c83fd77740..df313bcc54 100644
--- a/types/plupload/index.d.ts
+++ b/types/plupload/index.d.ts
@@ -143,28 +143,172 @@ declare namespace plupload {
 
         constructor(settings: plupload_settings);
 
-        /** Properties */
+        /**
+		 * Unique id for the Uploader instance.
+		 *
+		 * @property id
+		 * @type String
+		 */
         id: string;
+
+        /**
+		 * Current state of the total uploading progress. This one can either be plupload.STARTED or plupload.STOPPED.
+		 * These states are controlled by the stop/start methods. The default value is STOPPED.
+		 *
+		 * @property state
+		 * @type Number
+		 */
         state: number;
-        features: string;
+
+        /**
+		 * Map of features that are available for the uploader runtime. Features will be filled
+		 * before the init event is called, these features can then be used to alter the UI for the end user.
+		 * Some of the current features that might be in this map is: dragdrop, chunks, jpgresize, pngresize.
+		 *
+		 * @property features
+		 * @type Object
+		 */
+        features: any;
+
+        /**
+		 * Current runtime name.
+		 *
+		 * @property runtime
+		 * @type String
+		 */
         runtime: string;
-        files: any;
+
+        /**
+		 * Current upload queue, an array of File instances.
+		 *
+		 * @property files
+		 * @type Array
+		 * @see plupload.File
+		 */
+        files: Array<any>;
+
+        /**
+		 * Object with name/value settings.
+		 *
+		 * @property settings
+		 * @type Object
+		 */
         settings: any;
+
+        /**
+		 * Total progess information. How many files has been uploaded, total percent etc.
+		 *
+		 * @property total
+		 * @type plupload.QueueProgress
+		 */
         total: plupload_queue_progress;
 
-        /** Methods */
-        init(): any;
-        setOption(option: string | any, value?: any): any;
+        /**
+		 * Initializes the Uploader instance and adds internal event listeners.
+		 *
+		 * @method init
+		 */
+        init(): void;
+
+        /**
+		 * Set the value for the specified option(s).
+		 *
+		 * @method setOption
+		 * @since 2.1
+		 * @param {String|Object} option Name of the option to change or the set of key/value pairs
+		 * @param {Mixed} [value] Value for the option (is ignored, if first argument is object)
+		 */
+        setOption(option: string | any, value?: any): void;
+
+        /**
+		 * Get the value for the specified option or the whole configuration, if not specified.
+		 *
+		 * @method getOption
+		 * @since 2.1
+		 * @param {String} [option] Name of the option to get
+		 * @return {Mixed} Value for the option or the whole set
+		 */
         getOption(option?: string): any;
-        refresh(): any;
-        start(): any;
-        stop(): any;
-        disableBrowse(disable: boolean): any;
+
+        /**
+		 * Refreshes the upload instance by dispatching out a refresh event to all runtimes.
+		 * This would for example reposition flash/silverlight shims on the page.
+		 *
+		 * @method refresh
+		 */
+        refresh(): void;
+
+        /**
+		 * Starts uploading the queued files.
+		 *
+		 * @method start
+		 */
+        start(): void;
+
+        /**
+		 * Stops the upload of the queued files.
+		 *
+		 * @method stop
+		 */
+        stop(): void;
+
+        /**
+		 * Disables/enables browse button on request.
+		 *
+		 * @method disableBrowse
+		 * @param {Boolean} disable Whether to disable or enable (default: true)
+		 */
+        disableBrowse(disable: boolean): void;
+
+        // TODO: Make plupload.File typing
+        /**
+		 * Returns the specified file object by id.
+		 *
+		 * @method getFile
+		 * @param {String} id File id to look for.
+		 * @return {plupload.File} File object or undefined if it wasn't found;
+		 */
         getFile(id: string): any;
-        addFile(file: any, fileName?: string): any;
+
+        /**
+		 * Adds file to the queue programmatically. Can be native file, instance of Plupload.File,
+		 * instance of mOxie.File, input[type="file"] element, or array of these. Fires FilesAdded,
+		 * if any files were added to the queue. Otherwise nothing happens.
+		 *
+		 * @method addFile
+		 * @since 2.0
+		 * @param {plupload.File|mOxie.File|File|Node|Array} file File or files to add to the queue.
+		 * @param {String} [fileName] If specified, will be used as a name for the file
+		 */
+        addFile(file: any, fileName?: string): void;
+
+        /**
+		 * Removes a specific file.
+		 *
+		 * @method removeFile
+		 * @param {plupload.File|String} file File to remove from queue.
+		 */
         removeFile(file: any): any;
+
+        /**
+		 * Removes part of the queue and returns the files removed. This will also trigger the
+		 * FilesRemoved and QueueChanged events.
+		 *
+		 * @method splice
+		 * @param {Number} [start=0] Start index to remove from.
+		 * @param {Number} [length] Number of files to remove (defaults to number of files in the queue).
+		 * @return {Array} Array of files that was removed.
+		 */
         splice(start?: number, length?: number): any;
+
+        /**
+		 * Dispatches the specified event name and its arguments to all listeners.
+		 * @method trigger
+	 	 * @param {String} name Event name to fire.
+         * @param {Object..} Multiple arguments to pass along to the listener functions.
+		*/
         trigger(name: string, Multiple: any): any;
+        
         hasEventListener(name: string): any;
         bind(name: string, func: any, scope?: any): any;
         unbind(name: string, func: any): any;
@@ -174,22 +318,157 @@ declare namespace plupload {
 
     export const VERSION: string;
 
+    /**
+	 * The state of the queue before it has started and after it has finished
+	 *
+	 * @property STOPPED
+	 * @static
+	 * @final
+	 */
     export const STOPPED: number;
+
+    /**
+	 * Upload process is running
+	 *
+	 * @property STARTED
+	 * @static
+	 * @final
+	 */
     export const STARTED: number;
+
+    /**
+	 * File is queued for upload
+	 *
+	 * @property QUEUED
+	 * @static
+	 * @final
+	 */
     export const QUEUED: number;
+
+    /**
+	 * File is being uploaded
+	 *
+	 * @property UPLOADING
+	 * @static
+	 * @final
+	 */
     export const UPLOADING: number;
+
+    /**
+	 * File has failed to be uploaded
+	 *
+	 * @property FAILED
+	 * @static
+	 * @final
+	 */
     export const FAILED: number;
+
+    /**
+	 * File has been uploaded successfully
+	 *
+	 * @property DONE
+	 * @static
+	 * @final
+	 */
     export const DONE: number;
+
+    /**
+	 * Generic error for example if an exception is thrown inside Silverlight.
+	 *
+	 * @property GENERIC_ERROR
+	 * @static
+	 * @final
+	 */
     export const GENERIC_ERROR: number;
+
+    /**
+	 * HTTP transport error. For example if the server produces a HTTP status other than 200.
+	 *
+	 * @property HTTP_ERROR
+	 * @static
+	 * @final
+	 */
     export const HTTP_ERROR: number;
+
+    /**
+	 * Generic I/O error. For example if it wasn't possible to open the file stream on local machine.
+	 *
+	 * @property IO_ERROR
+	 * @static
+	 * @final
+	 */
     export const IO_ERROR: number;
+
+    /**
+	 * @property SECURITY_ERROR
+	 * @static
+	 * @final
+	 */
     export const SECURITY_ERROR: number;
+
+    /**
+	 * Initialization error. Will be triggered if no runtime was initialized.
+	 *
+	 * @property INIT_ERROR
+	 * @static
+	 * @final
+	 */
     export const INIT_ERROR: number;
+
+    /**
+	 * File size error. If the user selects a file that is too large or is empty it will be blocked and
+	 * an error of this type will be triggered.
+	 *
+	 * @property FILE_SIZE_ERROR
+	 * @static
+	 * @final
+	 */
     export const FILE_SIZE_ERROR: number;
+
+    /**
+	 * File extension error. If the user selects a file that isn't valid according to the filters setting.
+	 *
+	 * @property FILE_EXTENSION_ERROR
+	 * @static
+	 * @final
+	 */
     export const FILE_EXTENSION_ERROR: number;
+
+    /**
+	 * Duplicate file error. If prevent_duplicates is set to true and user selects the same file again.
+	 *
+	 * @property FILE_DUPLICATE_ERROR
+	 * @static
+	 * @final
+	 */
     export const FILE_DUPLICATE_ERROR: number;
+
+    /**
+	 * Runtime will try to detect if image is proper one. Otherwise will throw this error.
+	 *
+	 * @property IMAGE_FORMAT_ERROR
+	 * @static
+	 * @final
+	 */
     export const IMAGE_FORMAT_ERROR: number;
+
+    /**
+	 * While working on files runtime may run out of memory and will throw this error.
+	 *
+	 * @since 2.1.2
+	 * @property MEMORY_ERROR
+	 * @static
+	 * @final
+	 */
     export const MEMORY_ERROR: number;
+
+    /**
+	 * Each runtime has an upper limit on a dimension of the image it can handle. If bigger, will throw this error.
+	 *
+	 * @property IMAGE_DIMENSIONS_ERROR
+	 * @static
+	 * @final
+	 */
     export const IMAGE_DIMENSIONS_ERROR: number;
 
     export const mimeTypes: any;
diff --git a/types/plupload/plupload-tests.ts b/types/plupload/plupload-tests.ts
index 2a416a0bbc..2e57c45c27 100644
--- a/types/plupload/plupload-tests.ts
+++ b/types/plupload/plupload-tests.ts
@@ -21,6 +21,9 @@ import 'plupload';
         document.getElementById('console').innerHTML += "\nError #" + err.code + ": " + err.message;
     });
 
+    if (!uploader.features.chunks || !uploader.features.multipart) {
+        window.alert('Your browser does not support a feature required for uploads.  Try installing Flash or Silverlight.');
+    }
 }
 
 {

From 8cf4294b848c8cbfe3721818ff835dd1dd291b08 Mon Sep 17 00:00:00 2001
From: Dennis Axelsson <knegusen@gmail.com>
Date: Thu, 12 Apr 2018 19:02:44 +0200
Subject: [PATCH 1246/1382] Add typings for enzyme-redux (#24948)

---
 types/enzyme-redux/enzyme-redux-tests.tsx |  9 ++++++++
 types/enzyme-redux/index.d.ts             | 25 +++++++++++++++++++++++
 types/enzyme-redux/tsconfig.json          | 24 ++++++++++++++++++++++
 types/enzyme-redux/tslint.json            |  1 +
 4 files changed, 59 insertions(+)
 create mode 100644 types/enzyme-redux/enzyme-redux-tests.tsx
 create mode 100644 types/enzyme-redux/index.d.ts
 create mode 100644 types/enzyme-redux/tsconfig.json
 create mode 100644 types/enzyme-redux/tslint.json

diff --git a/types/enzyme-redux/enzyme-redux-tests.tsx b/types/enzyme-redux/enzyme-redux-tests.tsx
new file mode 100644
index 0000000000..ecd196dfd8
--- /dev/null
+++ b/types/enzyme-redux/enzyme-redux-tests.tsx
@@ -0,0 +1,9 @@
+import { mountWithState, mountWithStore, shallowWithState, shallowWithStore } from 'enzyme-redux';
+import * as React from 'react';
+
+const Component = () => <div>component</div>;
+const shallowWithStateWrapper = shallowWithState(<Component />, {});
+const shallowWithStoreWrapper = shallowWithStore(<Component />, {});
+
+const mountWithStateWrapper = mountWithState(<Component />, {});
+const mountWithStoreWrapper = mountWithStore(<Component />, {});
diff --git a/types/enzyme-redux/index.d.ts b/types/enzyme-redux/index.d.ts
new file mode 100644
index 0000000000..ad312d6d1f
--- /dev/null
+++ b/types/enzyme-redux/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for enzyme-redux 0.2
+// Project: https://github.com/Knegusen/enzyme-redux#readme
+// Definitions by: Dennis Axelsson <https://github.com/knegusen>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+import { ReactWrapper, ShallowWrapper } from 'enzyme';
+import { ReactElement } from 'react';
+
+export function shallowWithStore<P>(
+    Component: ReactElement<P>,
+    store: any
+): ShallowWrapper<P>;
+export function mountWithStore<P>(
+    Component: ReactElement<P>,
+    store: any
+): ReactWrapper<P>;
+export function shallowWithState<P>(
+    Component: ReactElement<P>,
+    state: any
+): ShallowWrapper<P>;
+export function mountWithState<P>(
+    Component: ReactElement<P>,
+    state: any
+): ReactWrapper<P>;
diff --git a/types/enzyme-redux/tsconfig.json b/types/enzyme-redux/tsconfig.json
new file mode 100644
index 0000000000..7cc21814b3
--- /dev/null
+++ b/types/enzyme-redux/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "enzyme-redux-tests.tsx"
+    ]
+}
diff --git a/types/enzyme-redux/tslint.json b/types/enzyme-redux/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/enzyme-redux/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 81cb59546fde86fb8dfe1b556bea782699cf51ed Mon Sep 17 00:00:00 2001
From: Damien Erambert <damien.erambert@me.com>
Date: Thu, 12 Apr 2018 10:03:10 -0700
Subject: [PATCH 1247/1382] Add typings for `focus-within` (#24935)

* add typings for focus-within

* fix test filenames

* fix typings and tests according to review comments
---
 types/focus-within/index.d.ts                 | 16 ++++++++++++
 .../test/focus-within-global-tests.ts         | 10 ++++++++
 .../test/focus-within-import-default-tests.ts | 11 ++++++++
 types/focus-within/tsconfig.json              | 25 +++++++++++++++++++
 types/focus-within/tslint.json                |  3 +++
 5 files changed, 65 insertions(+)
 create mode 100644 types/focus-within/index.d.ts
 create mode 100644 types/focus-within/test/focus-within-global-tests.ts
 create mode 100644 types/focus-within/test/focus-within-import-default-tests.ts
 create mode 100644 types/focus-within/tsconfig.json
 create mode 100644 types/focus-within/tslint.json

diff --git a/types/focus-within/index.d.ts b/types/focus-within/index.d.ts
new file mode 100644
index 0000000000..4a8778fe05
--- /dev/null
+++ b/types/focus-within/index.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for focus-within 1.0
+// Project: https://github.com/jonathantneal/focus-within#readme
+// Definitions by: Damien Erambert <https://github.com/eramdam>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace focusWithin {
+    interface FocusWithinOpts {
+      attr?: boolean;
+      className?: string;
+    }
+}
+
+declare function focusWithin(document: HTMLDocument, opts?: focusWithin.FocusWithinOpts): void;
+
+export as namespace focusWithin;
+export = focusWithin;
diff --git a/types/focus-within/test/focus-within-global-tests.ts b/types/focus-within/test/focus-within-global-tests.ts
new file mode 100644
index 0000000000..51ddc6aad5
--- /dev/null
+++ b/types/focus-within/test/focus-within-global-tests.ts
@@ -0,0 +1,10 @@
+/*
+ * This file tests the typings of the global export of `focus-within`
+ */
+
+focusWithin(document);
+
+focusWithin(document, {
+  attr: false,
+  className: 'foo'
+});
diff --git a/types/focus-within/test/focus-within-import-default-tests.ts b/types/focus-within/test/focus-within-import-default-tests.ts
new file mode 100644
index 0000000000..627dce9660
--- /dev/null
+++ b/types/focus-within/test/focus-within-import-default-tests.ts
@@ -0,0 +1,11 @@
+/*
+ * This file tests the typings of the default export of `focus-within`
+ */
+import focusWithin = require("focus-within");
+
+focusWithin(document);
+
+focusWithin(document, {
+  attr: false,
+  className: 'foo'
+});
diff --git a/types/focus-within/tsconfig.json b/types/focus-within/tsconfig.json
new file mode 100644
index 0000000000..976335025f
--- /dev/null
+++ b/types/focus-within/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "test/focus-within-global-tests.ts",
+        "test/focus-within-import-default-tests.ts"
+    ]
+}
diff --git a/types/focus-within/tslint.json b/types/focus-within/tslint.json
new file mode 100644
index 0000000000..e60c15844f
--- /dev/null
+++ b/types/focus-within/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
\ No newline at end of file

From 1bedb8fe2b8149c76d244656ad25e01e1be35590 Mon Sep 17 00:00:00 2001
From: Margarita Yanochkina <yanochkina.mv@gmail.com>
Date: Thu, 12 Apr 2018 20:04:04 +0300
Subject: [PATCH 1248/1382] [google-map-react] bounds fix (#24794)

---
 types/google-map-react/index.d.ts | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/types/google-map-react/index.d.ts b/types/google-map-react/index.d.ts
index d0606f76fd..7f34a68cc4 100644
--- a/types/google-map-react/index.d.ts
+++ b/types/google-map-react/index.d.ts
@@ -47,10 +47,10 @@ export interface Maps {
 }
 
 export interface Bounds {
-  nw: number;
-  ne: number;
-  sw: number;
-  se: number;
+  nw: Coords;
+  ne: Coords;
+  sw: Coords;
+  se: Coords;
 }
 
 export interface Point {
@@ -63,6 +63,11 @@ export interface Coords {
   lng: number;
 }
 
+export interface Size {
+  width: number;
+  height: number;
+}
+
 export interface ClickEventValue extends Point, Coords {
   event: any;
 }
@@ -72,6 +77,7 @@ export interface ChangeEventValue {
   zoom: number;
   bounds: Bounds;
   marginBounds: Bounds;
+  size: Size;
 }
 
 export interface Props {

From ab4cfd3de4cc173c175f937f1574302fdbc63aeb Mon Sep 17 00:00:00 2001
From: Aankhen <Aankhen@users.noreply.github.com>
Date: Thu, 12 Apr 2018 22:34:19 +0530
Subject: [PATCH 1249/1382] rename: Remove minimum version and comment out
 failing tests. (#24938)

---
 types/rename/index.d.ts      |  1 -
 types/rename/rename-tests.ts | 14 ++++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/types/rename/index.d.ts b/types/rename/index.d.ts
index 9b61f316ef..733db48069 100644
--- a/types/rename/index.d.ts
+++ b/types/rename/index.d.ts
@@ -2,7 +2,6 @@
 // Project: https://github.com/popomore/rename
 // Definitions by: Aankhen <https://github.com/Aankhen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.5
 
 /// <reference types="node" />
 
diff --git a/types/rename/rename-tests.ts b/types/rename/rename-tests.ts
index 96c283d0f2..20318254ca 100644
--- a/types/rename/rename-tests.ts
+++ b/types/rename/rename-tests.ts
@@ -3,9 +3,12 @@ import rename = require('rename');
 rename();                       // $ExpectError
 rename('a.js');                 // $ExpectError
 rename(undefined, undefined);   // $ExpectError
-rename(1, 2);                   // $ExpectError
-rename('a.js', () => { });       // $ExpectError
-rename('a.js', (obj) => { });    // $ExpectError
+
+// These fail to produce errors on 2.4
+// rename(1, 2);                   // $ExpectError
+// rename('a.js', () => { });       // $ExpectError
+// rename('a.js', (obj) => { });    // $ExpectError
+
 rename({ non: "existent" }, 'b.js'); // $ExpectError
 
 rename('a.js', 'b.js');         // $ExpectType FilePath
@@ -40,7 +43,10 @@ rename.parse({});               // $ExpectError
 rename.parse("p.js");
 
 rename.stringify();             // $ExpectError
-rename.stringify("abcd.js");    // $ExpectError
+
+// This fails to produce an error on 2.4
+// rename.stringify("abcd.js");    // $ExpectError
+
 rename.stringify({});
 rename.stringify({ suffix: ".js" }); // $ExpectError
 rename.stringify({ extname: ".js" });

From 01a9dfd2f56c584942b8833733bb14fc62ae4379 Mon Sep 17 00:00:00 2001
From: m4m4m4 <max.lindstrom@gmail.com>
Date: Thu, 12 Apr 2018 19:07:10 +0200
Subject: [PATCH 1250/1382] [UI-Grid] Add missing definitions (#24835)

* Add missing definitions

Add missing optional parameters for addRowHeaderColumn
Add id and fastWatch to IGridInstance
Renamed 'viewport' to correct case 'viewPort'
Change ColumnDef for Edit events to use IColumnDefOf instead (what the api returns). Should probably be done for other methods as well.

* Missing parameters in description
---
 types/ui-grid/index.d.ts | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/types/ui-grid/index.d.ts b/types/ui-grid/index.d.ts
index 683c906087..19fdb13752 100644
--- a/types/ui-grid/index.d.ts
+++ b/types/ui-grid/index.d.ts
@@ -135,8 +135,10 @@ declare namespace uiGrid {
         /**
          * adds a row header column to the grid
          * @param {IColumnDef} colDef The column definition
+         * @param {number} order Number that indicates where the column should be placed in the grid.
+         * @param {boolean} stopColumnBuild Prevents the buildColumn callback from being triggered. This is useful to improve performance of the grid during initial load.
          */
-        addRowHeaderColumn(colDef: IColumnDefOf<TEntity>): void;
+        addRowHeaderColumn(colDef: IColumnDefOf<TEntity>, order?: number, stopColumnBuild?: boolean): void;
         /**
          * uses the first row of data to assign colDef.type for any types not defined.
          */
@@ -522,6 +524,8 @@ declare namespace uiGrid {
          * which tells us which direction we are scrolling. Set to NONE via debounced method
          */
         scrollDirection?: number;
+        
+        id: number;
     }
     export interface IBuildColumnsOptions {
         orderByColumnDefs?: boolean;
@@ -877,14 +881,18 @@ declare namespace uiGrid {
          * to generate one
          */
         rowIdentity?(row: IGridRowOf<TEntity>): any;
+
+        fastWatch?: boolean;
     }
     export interface IGridCoreApi<TEntity> {
         // Methods
         /**
          * adds a row header column to the grid
          * @param {IColumnDef} column Column Definition
+         * @param {number} order Number that indicates where the column should be placed in the grid.
+         * @param {boolean} stopColumnBuild Prevents the buildColumn callback from being triggered. This is useful to improve performance of the grid during initial load.
          */
-        addRowHeaderColumn(column: IColumnDefOf<TEntity>): void;
+        addRowHeaderColumn(column: IColumnDefOf<TEntity>, order?: number, stopColumnBuild?: boolean): void;
         /**
          * add items to the grid menu.  Used by features
          * to add their menu items if they are enabled, can also be used by
@@ -1217,21 +1225,21 @@ declare namespace uiGrid {
                  */
                 navigate: (scope: ng.IScope, handler: navigateHandler<TEntity>) => void;
                 /**
-                 * viewportKeyDown is raised when the viewPort receives a keyDown event.
+                 * viewPortKeyDown is raised when the viewPort receives a keyDown event.
                  * Cells never get focus in uiGrid due to the difficulties of setting focus on a cell that is
                  * not visible in the viewport. Use this event whenever you need a keydown event on a cell.
                  * @param {ng.IScope} scope The grid scope
                  * @param {viewportKeyDownHandler} handler Callback
                  */
-                viewportKeyDown: (scope: ng.IScope, handler: viewportKeyDownHandler<TEntity>) => void;
+                viewPortKeyDown: (scope: ng.IScope, handler: viewportKeyDownHandler<TEntity>) => void;
                 /**
-                 * viewportKeyPress is raised when the viewPort receives a keyPress event.
+                 * viewPortKeyPress is raised when the viewPort receives a keyPress event.
                  * Cells never get focus in uiGrid due to the difficulties of setting focus on a cell that is
                  * not visible in the viewport. Use this event whenever you need a keypress event on a cell.
                  * @param {ng.IScope} scope The grid scope
                  * @param {viewportKeyPressHandler} handler Callback
                  */
-                viewportKeyPress: (scope: ng.IScope, handler: viewportKeyPressHandler<TEntity>) => void;
+                viewPortKeyPress: (scope: ng.IScope, handler: viewportKeyPressHandler<TEntity>) => void;
             };
         }
 
@@ -1465,31 +1473,31 @@ declare namespace uiGrid {
             /**
              * raised when cell editing is complete
              * @param {TEntity} rowEntity the options.data element that was edited
-             * @param {IColumnDef} colDef The column that was edited
+             * @param {IColumnDefOf} colDef The column that was edited
              * @param {any} newValue New Value
              * @param {any} oldValue Old Value
              */
-            (rowEntity: TEntity, colDef: IColumnDef<TEntity>, newValue: any, oldValue: any): void;
+            (rowEntity: TEntity, colDef: IColumnDefOf<TEntity>, newValue: any, oldValue: any): void;
         }
 
         /**
          * raised when cell editing starts on a cell
          * @param {TEntity} rowEntity the options.data element that was edited
-         * @param {IColumnDef} colDef The column that was edited
+         * @param {IColumnDefOf} colDef The column that was edited
          * @param {JQueryEventObject} triggerEvent the event that triggered the edit. Useful to prevent losing
          *     keystrokes on some complex editors
          */
         export interface beginCellEditHandler<TEntity> {
-            (rowEntity: TEntity, colDef: IColumnDef<TEntity>, triggerEvent: JQueryEventObject): void;
+            (rowEntity: TEntity, colDef: IColumnDefOf<TEntity>, triggerEvent: JQueryEventObject): void;
         }
 
         /**
          * raised when cell editing is cancelled on a cell
          * @param {TEntity} rowEntity the options.data element that was edited
-         * @param {IColumnDef} colDef The column that was edited
+         * @param {IColumnDefOf} colDef The column that was edited
          */
         export interface cancelCellEditHandler<TEntity> {
-            (rowEntity: TEntity, colDef: IColumnDef<TEntity>): void;
+            (rowEntity: TEntity, colDef: IColumnDefOf<TEntity>): void;
         }
 
         /**

From a5db46d19220e320b0b2bb64d74233670b9c4669 Mon Sep 17 00:00:00 2001
From: Aneil Mallavarapu <aneilmallavar@gmail.com>
Date: Thu, 12 Apr 2018 12:11:30 -0700
Subject: [PATCH 1251/1382] Add missing elements to Policy Statement (#24792)

* Add: NotAction, NotResource, Principal, NotPrincipal
* Implement some of the conditional logic
  - e.g., Action or NotAction is required
  - however, mutual exclusivity is not implemented (hard to do in Typescript)
* Allow >1 statement per PolicyDocument
---
 types/aws-lambda/aws-lambda-tests.ts | 25 ++++++++++++++++++-
 types/aws-lambda/index.d.ts          | 37 +++++++++++++++++++++++-----
 2 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/types/aws-lambda/aws-lambda-tests.ts b/types/aws-lambda/aws-lambda-tests.ts
index f4f97ccfc4..dc16eca58f 100644
--- a/types/aws-lambda/aws-lambda-tests.ts
+++ b/types/aws-lambda/aws-lambda-tests.ts
@@ -260,9 +260,27 @@ statement = {
 };
 
 statement = {
+    Sid: str,
     Action: [str, str],
     Effect: str,
-    Resource: [str, str]
+    Resource: [str, str],
+    Condition: {
+        condition1: { key: "value" },
+        condition2: [{
+                key1: "value",
+                key2: "value"
+        }, {
+            key3: "value"
+        }]
+    },
+    Principal: [str, str],
+    NotPrincipal: [str, str]
+};
+
+statement = {
+    Effect: str,
+    NotAction: str,
+    NotResource: str
 };
 
 policyDocument = {
@@ -270,6 +288,11 @@ policyDocument = {
     Statement: [statement]
 };
 
+policyDocument = {
+    Version: str,
+    Statement: [statement, statement]
+};
+
 authResponse = {
     principalId: str,
     policyDocument,
diff --git a/types/aws-lambda/index.d.ts b/types/aws-lambda/index.d.ts
index bd108fa2a5..c060bc10ee 100644
--- a/types/aws-lambda/index.d.ts
+++ b/types/aws-lambda/index.d.ts
@@ -17,6 +17,7 @@
 //                 Simon Buchan <https://github.com/simonbuchan>
 //                 David Hayden <https://github.com/Haydabase>
 //                 Chris Redekop <https://github.com/repl-chris>
+//                 Aneil Mallavarapu <https://github.com/aneilbaboo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -438,28 +439,52 @@ export interface CustomAuthorizerResult {
     principalId: string;
     policyDocument: PolicyDocument;
     context?: AuthResponseContext;
+    usageIdentifierKey?: string;
 }
 export type AuthResponse = CustomAuthorizerResult;
 
 /**
  * API Gateway CustomAuthorizer AuthResponse.PolicyDocument.
- * http://docs.aws.amazon.com/apigateway/latest/developerguide/use-custom-authorizer.html#api-gateway-custom-authorizer-output
+ * https://docs.aws.amazon.com/apigateway/latest/developerguide/api-gateway-lambda-authorizer-output.html
+ * https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_policies_elements.html#Condition
  */
 export interface PolicyDocument {
     Version: string;
-    Statement: [Statement];
+    Id?: string;
+    Statement: Statement[];
+}
+
+/**
+ * API Gateway CustomAuthorizer AuthResponse.PolicyDocument.Condition.
+ * https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-control-access-policy-language-overview.html
+ * https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_policies_elements_condition.html
+ */
+export interface ConditionBlock {
+    [condition: string]: Condition | Condition[];
+}
+
+export interface Condition {
+    [key: string]: string | string[];
 }
 
 /**
  * API Gateway CustomAuthorizer AuthResponse.PolicyDocument.Statement.
- * http://docs.aws.amazon.com/apigateway/latest/developerguide/use-custom-authorizer.html#api-gateway-custom-authorizer-output
+ * https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-control-access-policy-language-overview.html
+ * https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_policies_elements.html
  */
-export interface Statement {
-    Action: string | string[];
+export type Statement = BaseStatement & StatementAction & StatementResource;
+
+export interface BaseStatement {
     Effect: string;
-    Resource: string | string[];
+    Sid?: string;
+    Condition?: ConditionBlock;
+    Principal?: string | string[];
+    NotPrincipal?: string | string[];
 }
 
+export type StatementAction = { Action: string | string[] } | { NotAction: string | string[] };
+export type StatementResource = { Resource: string | string[] } | { NotResource: string | string[] };
+
 /**
  * API Gateway CustomAuthorizer AuthResponse.PolicyDocument.Statement.
  * http://docs.aws.amazon.com/apigateway/latest/developerguide/use-custom-authorizer.html#api-gateway-custom-authorizer-output

From c98aed3330f1597f587d1ec60cd2c31dcefc2032 Mon Sep 17 00:00:00 2001
From: Nathan Sankbeil <nathan.sankbeil@brandingbrand.com>
Date: Thu, 12 Apr 2018 15:12:07 -0400
Subject: [PATCH 1252/1382] react-native-navigation: fix invalid orientation
 value (#24958)

---
 types/react-native-navigation/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/react-native-navigation/index.d.ts b/types/react-native-navigation/index.d.ts
index 96b21b01e2..5541f207c7 100644
--- a/types/react-native-navigation/index.d.ts
+++ b/types/react-native-navigation/index.d.ts
@@ -187,7 +187,7 @@ export interface NavigatorStyle {
     navBarSubtitleFontFamily?: string;
     navBarSubtitleFontSize?: number;
     screenBackgroundColor?: string;
-    orientation?: 'auto ' | 'landscape' | 'portrait';
+    orientation?: 'auto' | 'landscape' | 'portrait';
     disabledButtonColor?: string;
     // iOS only
     statusBarTextColorSchemeSingleScreen?: string;

From a0ab3e1a8a8485f351e84146333966376366a93e Mon Sep 17 00:00:00 2001
From: alexander-wu <sashax91@gmail.com>
Date: Thu, 12 Apr 2018 21:13:29 +0200
Subject: [PATCH 1253/1382] webpack-env require.ensure typing update (#24951)

* webpack-env require.ensure typing update

* webpack-env require.ensure typing fix
---
 types/webpack-env/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/webpack-env/index.d.ts b/types/webpack-env/index.d.ts
index 1f03a25647..d9047f965e 100644
--- a/types/webpack-env/index.d.ts
+++ b/types/webpack-env/index.d.ts
@@ -31,7 +31,7 @@ declare namespace __WebpackModuleApi {
          *
          * This creates a chunk. The chunk can be named. If a chunk with this name already exists, the dependencies are merged into that chunk and that chunk is used.
          */
-        ensure(paths: string[], callback: (require: NodeRequire) => void, chunkName?: string): void;
+        ensure(paths: string[], callback: (require: NodeRequire) => void, errorCallback?: (error: any) => void, chunkName?: string): void;
         context(path: string, deep?: boolean, filter?: RegExp): RequireContext;
         /**
          * Returns the module id of a dependency. The call is sync. No request to the server is fired. The compiler ensures that the dependency is available.

From c93bda4d661c045cfa52ecb60825f3b97b2f4e24 Mon Sep 17 00:00:00 2001
From: Greg Zapp <greg.zapp@gmail.com>
Date: Thu, 12 Apr 2018 15:25:59 -0500
Subject: [PATCH 1254/1382] Add remaining types and documentation. (#24960)

---
 types/tableau/index.d.ts | 543 ++++++++++++++++++++++++++++++---------
 1 file changed, 427 insertions(+), 116 deletions(-)

diff --git a/types/tableau/index.d.ts b/types/tableau/index.d.ts
index c8ade03046..f68790135e 100644
--- a/types/tableau/index.d.ts
+++ b/types/tableau/index.d.ts
@@ -5,92 +5,6 @@
 // TypeScript Version: 2.4
 
 declare namespace tableau {
-    interface VizCreateOptions {
-        /** Undoes action on sheet, defaults to a single undo unless optional parameters is specified. */
-        hideTabs?: boolean;
-        /** Indicates whether the toolbar is hidden or shown. */
-        hideToolbar?: boolean;
-        /**
-         * Specifies the ID of an existing instance to make a copy (clone) of.
-         * This is useful if the user wants to continue analysis of an existing visualization without losing the state of the original.
-         * If the ID does not refer to an existing visualization, the cloned version is derived from the original visualization.
-         */
-        instanceIdToClone?: string;
-        /** Can be any valid CSS size specifier. If not specified, defaults to the published height of the view. */
-        height?: string;
-        /** Can be any valid CSS size specifier. If not specified, defaults to the published height of the view. */
-        width?: string;
-        /**
-         * Specifies a device layout for a dashboard, if it exists.
-         * Values can be desktop, tablet, or phone.
-         * If not specified, defaults to loading a layout based on the smallest dimension of the hosting iframe element.
-         */
-        device?: string;
-        /**
-         * Callback function that is invoked when the Viz object first becomes interactive.
-         * This is only called once, but it’s guaranteed to be called.
-         * If the Viz object is already interactive, it will be called immediately, but on a separate "thread."
-         */
-        onFirstInteractive?: (e: TableauEvent) => void;
-        /**
-         * Callback function that's invoked when the size of the Viz object is known.
-         * You can use this callback to perform tasks such as resizing the elements surrounding the Viz object once the object's size has been established.
-         */
-        onFirstVizSizeKnown?: (e: VizResizeEvent) => void;
-        /**
-         * Apply a filter that you specify to the view when it is first rendered.
-         * For example, if you have an Academic Year filter and only want to display data for 2017,
-         * you might enter "Academic Year": "2016". For more information, see Filtering.
-         */
-        [filter: string]: any;
-    }
-
-    class TableauEvent {
-        /** Gets the Viz object associated with the event. */
-        getViz(): Viz;
-
-        /** Gets the name of the event, which is a string, but is also one of the items in the TableauEventName enum. */
-        getEventName(): TableauEventName;
-    }
-
-    class CustomViewEvent extends TableauEvent {
-        getCustomViewAsync(): Promise<CustomView>;
-    }
-
-    class FilterEvent extends TableauEvent {
-        /** Gets the Worksheet object associated with the event. */
-        getWorksheet(): Worksheet;
-
-        /** Gets the name of the field. */
-        getFieldName(): string;
-
-        /** Gets the Filter object associated with the event. */
-        getFilterAsync(): Promise<ConcreteFilter>;
-    }
-
-    class VizResizeEvent extends TableauEvent {
-        /** Gets the Viz object associated with the event. */
-        getViz(): Viz;
-        /** Gets the name of the event, which is a string, but is also one of the items in the TableauEventName enum. */
-        getEventName(): TableauEventName;
-        /** Gets the sheetSize record for the current sheet. For more information, see SheetSizeOptions Record. */
-        getVizSize(): Size;
-    }
-
-    enum TableauEventName {
-        CUSTOM_VIEW_LOAD = 'customviewload',
-        CUSTOM_VIEW_REMOVE = 'customviewremove',
-        CUSTOM_VIEW_SAVE = 'customviewsave',
-        CUSTOM_VIEW_SET_DEFAULT = 'customviewsetdefault',
-        FILTER_CHANGE = 'filterchange',
-        MARKS_SELECTION = 'marksselection',
-        PARAMETER_VALUE_CHANGE = 'parametervaluechange',
-        STORY_POINT_SWITCH = 'storypointswitch',
-        TAB_SWITCH = 'tabswitch',
-        TOOLBAR_STATE_CHANGE = 'toolbarstatechange',
-        VIZ_RESIZE = 'vizresize',
-    }
-
     enum DashboardObjectType {
         BLANK = 'blank',
         WORKSHEET = 'worksheet',
@@ -151,28 +65,12 @@ declare namespace tableau {
         DIMENSION, MEASURE, UKNOWN
     }
 
-    enum FilterType {
-        CATEGORICAL = 'categorical',
-        QUANTITATIVE = 'quantitative',
-        HIERARCHICAL = 'hierarchical',
-        RELATIVE_DATE = 'relativedate',
-    }
-
     enum SheetType {
         WORKSHEET = 'worksheet',
         DASHBOARD = 'dashboard',
         STORY = 'story',
     }
 
-    enum DateRangeType {
-        LAST = 'last', /** Refers to the last day, week, month, etc. of the date period. */
-        LASTN = 'lastn', /** Refers to the last N days, weeks, months, etc. of the date period. */
-        NEXT = 'next', /** Refers to the next day, week, month, etc. of the date period. */
-        NEXTN = 'nextn', /** Refers to the next N days, weeks, months, etc. of the date period. */
-        CURRENT = 'current', /** Refers to the current day, week, month, etc. of the date period. */
-        TODATE = 'todate', /** Refers to everything up to and including the current day, week, month, etc. of the date period. */
-    }
-
     enum ParameterAllowableValuesType {
         ALL = 'all',
         LIST = 'list',
@@ -188,23 +86,94 @@ declare namespace tableau {
         DATETIME = 'datetime'
     }
 
-    enum PeriodType {
-        YEARS = 'years',
-        QUARTERS = 'quarters',
-        MONTHS = 'months',
-        WEEKS = 'weeks',
-        DAYS = 'days',
-        HOURS = 'hours',
-        MINUTES = 'minutes',
-        SECONDS = 'seconds',
+    //#region Error Classes
+    class TableauException extends Error {
+        tableauSoftwareErrorCode: ErrorCode;
     }
 
-    //#region
+    enum ErrorCode {
+        /** The browser is not capable of supporting the Tableau JavaScript API. */
+        BROWSER_NOT_CAPABLE = 'browserNotCapable',
+        /** The permissions on a workbook or a view do not allow downloading the workbook. */
+        DOWNLOAD_WORKBOOK_NOT_ALLOWED = 'downloadWorkbookNotAllowed',
+        /** An error occurred while attempting to perform a filter operation. */
+        FILTER_CANNOT_BE_PERFORMED = 'filterCannotBePerformed',
+        /** Attempted to switch to a sheet by index that does not exist in the workbook. */
+        INDEX_OUT_OF_RANGE = 'indexOutOfRange',
+        /** An error occurred within the Tableau JavaScript API. Contact Tableau Support. */
+        INTERNAL_ERROR = 'internalError',
+        /** An invalid aggregation was specified for the filter, such as setting a range filter to "SUM(Sales)" instead of "Sales". */
+        INVALID_AGGREGATION_FIELD_NAME = 'invalidAggregationFieldName',
+        /** An operation was attempted on a custom view that does not exist. */
+        INVALID_CUSTOM_VIEW_NAME = 'invalidCustomViewName',
+        /** An invalid date was specified in a method that required a date parameter. */
+        INVALID_DATE_PARAMETER = 'invalidDateParameter',
+        /** A filter operation was attempted on a field that does not exist in the data source. */
+        INVALID_FILTER_FIELDNAME = 'invalidFilterFieldName',
+        /**
+         * Either a filter operation was attempted on a field that does not exist in the data source,
+         * or the value supplied in the filter operation is the wrong data type or format.
+         */
+        INVALID_FILTER_FIELDNAME_OR_VALUE = 'invalidFilterFieldNameOrValue',
+        /** A filter operation was attempted using a value that is the wrong data type or format. */
+        INVALID_FILTER_FIELDVALUE = 'invalidFilterFieldValue',
+        /** A parameter is not the correct data type or format. The name of the parameter is specified in the Error.message field. */
+        INVALID_PARAMETER = 'invalidParameter',
+        /** An invalid date value was specified in a Sheet.selectMarksAsync() call for a date field. */
+        INVALID_SELECTION_DATE = 'invalidSelectionDate',
+        /** A field was specified in a Sheet.selectMarksAsync() call that does not exist in the data source. */
+        INVALID_SELECTION_FIELDNAME = 'invalidSelectionFieldName',
+        /** An invalid value was specified in a Sheet.selectMarksAsync() call. */
+        INVALID_SELECTION_VALUE = 'invalidSelectionValue',
+        /** A negative size was specified or the maxSize value is less than minSize in Sheet.changeSizeAsync(). */
+        INVALID_SIZE = 'invalidSize',
+        /**
+         * A behavior other than SheetSizeBehavior.AUTOMATIC was specified in
+         * Sheet.changeSizeAsync() when the sheet is a Worksheet instance.
+         */
+        INVALID_SIZE_BEHAVIOR_ON_WORKSHEET = 'invalidSizeBehaviorOnWorksheet',
+        /** The URL specified in the Viz class constructor is not valid. */
+        INVALID_URL = 'invalidUrl',
+        /** The maxSize field is missing in Sheet.changeSizeAsync() when specifying SheetSizeBehavior.ATMOST. */
+        MISSING_MAX_SIZE = 'missingMaxSize',
+        /** The minSize field is missing in Sheet.changeSizeAsync() when specifying SheetSizeBehavior.ATLEAST. */
+        MISSING_MIN_SIZE = 'missingMinSize',
+        /**
+         * Either or both of the minSize or maxSize fields is missing in
+         * Sheet.changeSizeAsync() when specifying SheetSizeBehavior.RANGE.
+         */
+        MISSING_MINMAX_SIZE = 'missingMinMaxSize',
+        /** The rangeN field is missing for a relative date filter of type LASTN or NEXTN. */
+        MISSING_RANGEN_FOR_RELATIVE_DATE_FILTERS = 'missingRangeNForRelativeDateFilters',
+        /** An attempt was made to access Sheet.getUrl() on a hidden sheet. Hidden sheets do not have URLs. */
+        NO_URL_FOR_HIDDEN_WORKSHEET = 'noUrlForHiddenWorksheet',
+        /** One or both of the parentElement or the URL parameters is not specified in the Viz constructor. */
+        NO_URL_OR_PARENT_ELEMENT_NOT_FOUND = 'noUrlOrParentElementNotFound',
+        /** An operation was attempted on a sheet that is not active or embedded within the active dashboard. */
+        NOT_ACTIVE_SHEET = 'notActiveSheet',
+        /** A required parameter was not specified, null, or an empty string/array. */
+        NULL_OR_EMPTY_PARAMETER = 'nullOrEmptyParameter',
+        /** A general-purpose server error occurred. Details are contained in the Error object. */
+        SERVER_ERROR = 'serverError',
+        /** An operation was attempted on a sheet that does not exist in the workbook. */
+        SHEET_NOT_IN_WORKBOOK = 'sheetNotInWorkbook',
+        /** An operation is performed on a CustomView object that is no longer valid (it has been removed). */
+        STALE_DATA_REFERENCE = 'staleDataReference',
+        /** An unknown event name was specified in the call to Viz.addEventListener or Viz.removeEventListener. */
+        UNSUPPORTED_EVENT_NAME = 'unsupportedEventName',
+        /** A Viz object has already been created as a child of the parentElement specified in the Viz constructor. */
+        VIZ_ALREADY_IN_MANAGER = 'vizAlreadyInManager',
+        INVALID_TOOLBAR_BUTTON_NAME = 'invalidToolbarButtonName',
+        MAX_VIZ_RESIZE_ATTEMPTS = 'maxVizResizeAttempts',
+    }
+    //#endregion
+
+    //#region Viz Classes
     class VizManager {
         getVizs(): Viz[];
     }
 
-    type ListenerFunction = (event: TableauEvent) => void;
+    type ListenerFunction<T extends TableauEvent> = (event: T) => void;
 
     class Viz {
         /**
@@ -230,11 +199,19 @@ declare namespace tableau {
         /** Indicates whether automatic updates are currently paused. */
         getAreAutomaticUpdatesPaused(): boolean;
 
-        addEventListener(event: TableauEventName.FILTER_CHANGE, f: (event: FilterEvent) => void): void;
-        addEventListener(event: TableauEventName.CUSTOM_VIEW_LOAD, f: (event: CustomViewEvent) => void): void;
+        addEventListener(event: TableauEventName.FILTER_CHANGE, f: ListenerFunction<FilterEvent>): void;
+        addEventListener(
+            event: TableauEventName.CUSTOM_VIEW_LOAD | TableauEventName.CUSTOM_VIEW_REMOVE | TableauEventName.CUSTOM_VIEW_SAVE | TableauEventName.CUSTOM_VIEW_SET_DEFAULT,
+            f: ListenerFunction<CustomViewEvent>): void;
+        addEventListener(event: TableauEventName.MARKS_SELECTION, f: ListenerFunction<MarksEvent>): void;
+        addEventListener(event: TableauEventName.PARAMETER_VALUE_CHANGE, f: ListenerFunction<ParameterEvent>): void;
+        addEventListener(event: TableauEventName.STORY_POINT_SWITCH, f: ListenerFunction<StoryPointSwitchEvent>): void;
+        addEventListener(event: TableauEventName.TAB_SWITCH, f: ListenerFunction<TabSwitchEvent>): void;
+        addEventListener(event: TableauEventName.TOOLBAR_STATE_CHANGE, f: ListenerFunction<ToolbarStateEvent>): void;
+        addEventListener(event: TableauEventName.VIZ_RESIZE, f: ListenerFunction<VizResizeEvent>): void;
 
         /** Removes an event listener from the specified event. */
-        removeEventListener(type: TableauEventName, f: ListenerFunction): void;
+        removeEventListener(type: TableauEventName, f: ListenerFunction<TableauEvent>): void;
         /** Shows or hides the iframe element hosting the visualization. */
         show(): void;
         /** Shows or hides the iframe element hosting the visualization. */
@@ -284,6 +261,179 @@ declare namespace tableau {
         /** Undoes action on sheet, defaults to a single undo unless optional parameters is specified. */
         undoAsync(): Promise<void>;
     }
+
+    interface VizCreateOptions {
+        /** Undoes action on sheet, defaults to a single undo unless optional parameters is specified. */
+        hideTabs?: boolean;
+        /** Indicates whether the toolbar is hidden or shown. */
+        hideToolbar?: boolean;
+        /**
+         * Specifies the ID of an existing instance to make a copy (clone) of.
+         * This is useful if the user wants to continue analysis of an existing visualization without losing the state of the original.
+         * If the ID does not refer to an existing visualization, the cloned version is derived from the original visualization.
+         */
+        instanceIdToClone?: string;
+        /** Can be any valid CSS size specifier. If not specified, defaults to the published height of the view. */
+        height?: string;
+        /** Can be any valid CSS size specifier. If not specified, defaults to the published height of the view. */
+        width?: string;
+        /**
+         * Specifies a device layout for a dashboard, if it exists.
+         * Values can be desktop, tablet, or phone.
+         * If not specified, defaults to loading a layout based on the smallest dimension of the hosting iframe element.
+         */
+        device?: string;
+        /**
+         * Callback function that is invoked when the Viz object first becomes interactive.
+         * This is only called once, but it’s guaranteed to be called.
+         * If the Viz object is already interactive, it will be called immediately, but on a separate "thread."
+         */
+        onFirstInteractive?: (e: TableauEvent) => void;
+        /**
+         * Callback function that's invoked when the size of the Viz object is known.
+         * You can use this callback to perform tasks such as resizing the elements surrounding the Viz object once the object's size has been established.
+         */
+        onFirstVizSizeKnown?: (e: VizResizeEvent) => void;
+        /**
+         * Apply a filter that you specify to the view when it is first rendered.
+         * For example, if you have an Academic Year filter and only want to display data for 2017,
+         * you might enter "Academic Year": "2016". For more information, see Filtering.
+         */
+        [filter: string]: any;
+    }
+
+    enum ToolbarPosition {
+        /** Positions the toolbar along the top of the visualization. */
+        TOP = 'top',
+        /** Positions the toolbar along the bottom of the visualization. */
+        BOTTOM = 'bottom',
+    }
+
+    class ToolbarState {
+        /** Gets the Viz object associated with the toolbar. */
+        getViz(): Viz;
+        /**
+         * Gets a value indicating whether the specified toolbar button is enabled.
+         * The supported buttons are defined in the ToobarButtonName enum.
+         * Currently, only Undo and Redo are supported.
+         * Checking this property with a toolbar button that is not supported causes an InvalidToolbarButtonName error.
+         */
+        isButtonEnabled(toolbarButtonName: ToolbarButtonName): boolean;
+    }
+
+    enum ToolbarButtonName {
+        /** Specifies the Undo button in the toolbar. */
+        UNDO = 'undo',
+        /** Specifies the Redo button in the toolbar. */
+        REDO = 'redo',
+    }
+    //#endregion
+
+    //#region Viz Event Classes
+    /**
+     * Defines strings passed to the Viz.addEventListener and Viz.removeEventListener methods.
+     * The values of the enums are all lowercase strings with no underscores.
+     * For example, CUSTOM_VIEW_LOAD is customviewload.
+     * Either the fully-qualified enum (tableau.TableauEventName.FILTER_CHANGE) or the raw string (filterchange) is acceptable.
+     */
+    enum TableauEventName {
+        /**
+         * Raised when a custom view has finished loading.
+         * This event is raised after the callback function for onFirstInteractive (if any) has been called.
+         */
+        CUSTOM_VIEW_LOAD = 'customviewload',
+        /** Raised when the user removes a custom view. */
+        CUSTOM_VIEW_REMOVE = 'customviewremove',
+        /** Raised when the user saves a new or existing custom view. */
+        CUSTOM_VIEW_SAVE = 'customviewsave',
+        /** Raised when a custom view has been made the default view for this visualization. */
+        CUSTOM_VIEW_SET_DEFAULT = 'customviewsetdefault',
+        /** Raised when any filter has changed state. The Viz object may not be interactive yet. */
+        FILTER_CHANGE = 'filterchange',
+        /** Raised when marks are selected or deselected. */
+        MARKS_SELECTION = 'marksselection',
+        /** Raised when any parameter has changed state. */
+        PARAMETER_VALUE_CHANGE = 'parametervaluechange',
+        /** Raised after a story point becomes active. */
+        STORY_POINT_SWITCH = 'storypointswitch',
+        /** Raised after the tab switched, but the Viz object may not yet be interactive. */
+        TAB_SWITCH = 'tabswitch',
+        /** Raised when the state of the specified toolbar button changes. See API Reference. */
+        TOOLBAR_STATE_CHANGE = 'toolbarstatechange',
+        /** Raised every time the frame size is calculated from the available size and the Viz object's published size. */
+        VIZ_RESIZE = 'vizresize',
+    }
+
+    class TableauEvent {
+        /** Gets the Viz object associated with the event. */
+        getViz(): Viz;
+
+        /** Gets the name of the event, which is a string, but is also one of the items in the TableauEventName enum. */
+        getEventName(): TableauEventName;
+    }
+
+    class CustomViewEvent extends TableauEvent {
+        /** Gets the CustomView object associated with the event. */
+        getCustomViewAsync(): Promise<CustomView>;
+    }
+
+    class FilterEvent extends TableauEvent {
+        /** Gets the Worksheet object associated with the event. */
+        getWorksheet(): Worksheet;
+
+        /** Gets the name of the field. */
+        getFieldName(): string;
+
+        /** Gets the Filter object associated with the event. */
+        getFilterAsync(): Promise<ConcreteFilter>;
+    }
+
+    class MarksEvent extends TableauEvent {
+        /** Gets the Worksheet object associated with the event. */
+        getWorksheet(): Worksheet;
+
+        /** Gets the selected marks on the Worksheet that triggered the event. */
+        getMarksAsync(): Promise<Mark[]>;
+    }
+
+    class ParameterEvent extends TableauEvent {
+        /** Gets the name of the parameter that changed. */
+        getParameterName(): string;
+        /** Gets the Parameter object that triggered the event. */
+        getParameterAsync(): Promise<Parameter>;
+    }
+
+    class StoryPointSwitchEvent extends TableauEvent {
+        /**
+         * Gets the StoryPointInfo that was active before the story point switch event occurred.
+         * The returned object reflects the state of the story point before the switch occurred.
+         * The returned object reflects the state of the story point after the switch occured.
+         */
+        getOldStoryPointInfo(): StoryPointInfo;
+        /** Gets the StoryPoint that is currently active. */
+        getNewStoryPoint(): StoryPoint;
+    }
+
+    class TabSwitchEvent extends TableauEvent {
+        /** Gets the name of the sheet that was active before the tab switch event occurred. */
+        getOldSheetName(): string;
+        /** Gets the name of the sheet that is currently active. */
+        getNewSheetName(): string;
+    }
+
+    class ToolbarStateEvent extends TableauEvent {
+        /** Returns the new ToolbarState. */
+        getToolbarState(): ToolbarState;
+    }
+
+    class VizResizeEvent extends TableauEvent {
+        /** Gets the Viz object associated with the event. */
+        getViz(): Viz;
+        /** Gets the name of the event, which is a string, but is also one of the items in the TableauEventName enum. */
+        getEventName(): TableauEventName;
+        /** Gets the sheetSize record for the current sheet. For more information, see SheetSizeOptions Record. */
+        getVizSize(): Size;
+    }
     //#endregion
 
     //#region Sheet Classes
@@ -407,6 +557,51 @@ declare namespace tableau {
          * You can specify options with an optional parameter. This can only be called on sheets of the WORKSHEET type.
          */
         getUnderlyingDataAsync(options: getUnderlyingDataOptions): Promise<DataTable>;
+        /** Fetches the collection of filters used on the sheet. */
+        getFiltersAsync(): Promise<Filter[]>;
+        /**
+         * Applies a simple categorical filter (non-date).
+         * See the filtering examples for more details on these functions.
+         * Returns the fieldName that was filtered.
+         */
+        applyFilterAsync(fieldName: string, values: object[] | object, updateType: FilterUpdateType, options?: FilterOptions): Promise<string>;
+        /**
+         * Applies a quantitative filter to a field or to a date.
+         * If a range is specified that is outside of the domain min/max values, no error is raised and the command is allowed.
+         * Subsequent calls to getFiltersAsync[] will return these values even if they are outside of the bounds of the domain.
+         * This is equivalent to the behavior in Tableau Desktop.
+         */
+        applyRangeFilterAsync(fieldName: string, range: RangeFilterOptions): Promise<string>;
+        /** Applies a relative date filter. */
+        applyRelativeDateFilterAsync(fieldName: string, options: RelativeDateFilterOptions): Promise<string>;
+        /**
+         * Applies a hierarchical filter.
+         * The values parameter is either a single value, an array of values, or an object { levels: ["1", "2"] }.
+         */
+        applyHierarchicalFilterAsync(fieldName: string, values: object, options: any): Promise<string>;
+        /**
+         * Clears the filter, no matter what kind of filter it is.
+         * Note that the filter is removed as long as no associated quick filter is showing for the field.
+         * If there is a quick filter showing, then the filter is kept, but it’s reset to the “All” state (effectually canceling the filter).
+         * For relative date filters, however, an error is returned since there is no “All” state for a relative date filter.
+         * To clear a relative date filter with a quick filter showing, you can call applyRelativeDateFilter()
+         * instead using a range that makes sense for the specific field.
+         */
+        clearFilterAsync(fieldName: string): Promise<string>;
+        /** Clears the selection for this worksheet. */
+        clearSelectedMarksAsync(): Promise<void>;
+        /** Gets the collection of marks that are currently selected. */
+        getSelectedMarksAsync(): Promise<Mark[]>;
+        /** Selects the marks and returns them. */
+        selectMarksAsync(fieldName: string, value: object | object[], updateType: SelectionUpdateType): Promise<void>;
+        /**
+         * Allows selection based on this syntax for the first parameter:
+         * {
+         *   "Field1": value,
+         *   "Field2": [1, 2, 3]
+         * }
+         */
+        selectMarksAsync(fieldValuesMap: object | Mark[], updateType: SelectionUpdateType): Promise<void>;
     }
 
     interface getSummaryDataOptions {
@@ -631,6 +826,35 @@ declare namespace tableau {
     //#endregion
 
     //#region Filtering
+    interface FilterOptions {
+        /**
+         * Determines whether the filter will apply in exclude mode or include mode.
+         * The default is include, which means that you use the fields as part of a filter.
+         * Exclude mode means that you include everything else except the specified fields.
+         */
+        isExcludeMode: boolean;
+    }
+
+    interface RangeFilterOptions {
+        /** Minimum value for the range (inclusive). Optional. Leave blank if you want a <= filter. */
+        min: number | Date;
+        /** Maximum value for the range (inclusive). Optional. Leave blank if you want a >= filter. */
+        max: number | Date;
+        /** The null values to include */
+        nullOption: NullOption;
+    }
+
+    interface RelativeDateFilterOptions {
+        /** The UTC date from which to filter. */
+        anchorDate: Date;
+        /** Year, quarter, month, etc. */
+        periodType: PeriodType;
+        /** LAST, LASTN, NEXT, etc. */
+        rangeType: DateRangeType;
+        /** The number used when the rangeType is LASTN or NEXTN. */
+        rangeN: number;
+    }
+
     class Filter {
         /** Gets the parent worksheet */
         getWorksheet(): Worksheet;
@@ -642,6 +866,16 @@ declare namespace tableau {
         getFieldAsync(): Promise<Field>;
     }
 
+    /** An enumeration that indicates what to do with null values for a given filter or mark selection call. */
+    enum NullOption {
+        /** Only include null values in the filter. */
+        NULL_VALUES = 'nullValues',
+        /** Only include non-null values in the filter. */
+        NON_NULL_VALUES = 'nonNullValues',
+        /** Include null and non-null values in the filter. */
+        ALL_VALUES = 'allValues',
+    }
+
     class CategoricalFilter extends Filter {
         /** Gets a value indicating whether the filter is exclude or include (default). */
         getIsExcludeMode(): boolean;
@@ -683,8 +917,84 @@ declare namespace tableau {
         /** The value formatted according to the locale and the formatting applied to the field or parameter. */
         formattedValue: string;
     }
+
+    enum FilterType {
+        /** Categorical filters are used to filter to a set of values within the domain. */
+        CATEGORICAL = 'categorical',
+        /** Quantitative filters are used to filter to a range of values from a continuous domain. */
+        QUANTITATIVE = 'quantitative',
+        /** Hierarchical filters are used to filter to a set of values organized into a hierarchy within the domain. */
+        HIERARCHICAL = 'hierarchical',
+        /** Relative date filters are used to filter a date/time domain to a range of values relative to a fixed point in time. */
+        RELATIVE_DATE = 'relativedate',
+    }
+
+    enum FilterUpdateType {
+        /** Adds all values to the filter. Equivalent to checking the (All) value in a quick filter. */
+        ALL = 'all',
+        /** Replaces the current filter values with new ones specified in the call */
+        REPLACE = 'replace',
+        /** Adds the filter values as specified in the call to the current filter values. Equivalent to checking a value in a quick filter. */
+        ADD = 'add',
+        /** Removes the filter values as specified in the call from the current filter values. Equivalent to unchecking a value in a quick filter. */
+        REMOVE = 'remove',
+    }
+
+    enum PeriodType {
+        YEARS = 'years',
+        QUARTERS = 'quarters',
+        MONTHS = 'months',
+        WEEKS = 'weeks',
+        DAYS = 'days',
+        HOURS = 'hours',
+        MINUTES = 'minutes',
+        SECONDS = 'seconds',
+    }
+
+    enum DateRangeType {
+        LAST = 'last', /** Refers to the last day, week, month, etc. of the date period. */
+        LASTN = 'lastn', /** Refers to the last N days, weeks, months, etc. of the date period. */
+        NEXT = 'next', /** Refers to the next day, week, month, etc. of the date period. */
+        NEXTN = 'nextn', /** Refers to the next N days, weeks, months, etc. of the date period. */
+        CURRENT = 'current', /** Refers to the current day, week, month, etc. of the date period. */
+        TODATE = 'todate', /** Refers to everything up to and including the current day, week, month, etc. of the date period. */
+    }
     //#endregion
 
+    //#region Marks Selection
+    /**
+     * A mark represents a single data point on the visualization.
+     * It is independent of the type of visualization (bar, line, pie, etc.).
+     */
+    class Mark {
+        /** Creates a new Mark with the specified pairs. */
+        constructor(pairs: Pair[]);
+        /** Gets a collection of field name/value pairs associated with the mark. */
+        getPairs(): Pair[];
+    }
+
+    class Pair {
+        /** The value formatted according to the locale and the formatting applied to the field. */
+        formattedValue: string;
+        /** The field name to which the value is applied. */
+        fieldName: string;
+        /** Contains the raw native value for the field as a JavaScript type, which is one of String, Number, Boolean, or Date. */
+        value: string | number | boolean | Date;
+        /** Creates a new Pair with the specified field name/value pairing */
+        constructor(fieldName: string, value: string | number | boolean | Date);
+    }
+
+    enum SelectionUpdateType {
+        /** Replaces the current marks values with new ones specified in the call. */
+        REPLACE = 'replace',
+        /** Adds the values as specified in the call to the current selection. Equivalent to control-clicking in desktop. */
+        ADD = 'add',
+        /** Removes the values as specified in the call from the current selection. Equivalent to control-clicking an already selected mark in desktop. */
+        REMOVE = 'remove',
+    }
+    //#endregion
+
+    //#region Other
     interface Size {
         width: number;
         height: number;
@@ -694,4 +1004,5 @@ declare namespace tableau {
         x: number;
         y: number;
     }
+    //#endregion
 }

From 1fc00061a829e44e58e19a4001c754ef2b0ba1bc Mon Sep 17 00:00:00 2001
From: Scott Lively <slively@users.noreply.github.com>
Date: Thu, 12 Apr 2018 16:23:21 -0700
Subject: [PATCH 1255/1382] [decompress] fix return value to be array instead
 of single instance (#24957)

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

diff --git a/types/decompress/decompress-tests.ts b/types/decompress/decompress-tests.ts
index 3df7df0219..9cb8949d99 100644
--- a/types/decompress/decompress-tests.ts
+++ b/types/decompress/decompress-tests.ts
@@ -1,13 +1,13 @@
 import decompress = require('decompress');
 import * as path from "path";
 
-decompress('unicorn.zip', 'dist').then(files => {
+decompress('unicorn.zip', 'dist').then((files: decompress.File[]) => {
 	console.log('done!');
 });
 
 decompress('unicorn.zip', 'dist', {
 	filter: file => path.extname(file.path) !== '.exe'
-}).then(files => {
+}).then((files: decompress.File[]) => {
 	console.log('done!');
 });
 
@@ -16,6 +16,6 @@ decompress('unicorn.zip', 'dist', {
 		file.path = `unicorn-${file.path}`;
 		return file;
 	}
-}).then(files => {
+}).then((files: decompress.File[]) => {
 	console.log('done!');
 });
diff --git a/types/decompress/index.d.ts b/types/decompress/index.d.ts
index a493f81a0d..745bebcd2e 100644
--- a/types/decompress/index.d.ts
+++ b/types/decompress/index.d.ts
@@ -7,7 +7,7 @@
 
 export = decompress;
 
-declare function decompress(input: string | Buffer, output: string, opts?: decompress.DecompressOptions): Promise<decompress.File>;
+declare function decompress(input: string | Buffer, output: string, opts?: decompress.DecompressOptions): Promise<decompress.File[]>;
 
 declare namespace decompress {
     interface File {

From 3b4991e3fa6e137833fd9b722abd6369842b236b Mon Sep 17 00:00:00 2001
From: Fredrik Nicol <fredrik.nicol@gmail.com>
Date: Fri, 13 Apr 2018 08:44:22 +0200
Subject: [PATCH 1256/1382] [react] Add comment about removed index signature
 (#24939)

---
 types/react/index.d.ts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index 50dca5578b..1083f4afe2 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -897,7 +897,16 @@ declare namespace React {
         onTransitionEndCapture?: TransitionEventHandler<T>;
     }
 
-    export interface CSSProperties extends CSS.Properties<string | number> {}
+    export interface CSSProperties extends CSS.Properties<string | number> {
+        /**
+         * The index signature was removed to enable closed typing for style
+         * using CSSType. You're able to use type assertion or module augmentation
+         * to add properties or an index signature of your own.
+         *
+         * For examples and more information, visit:
+         * https://github.com/frenic/csstype#what-should-i-do-when-i-get-type-errors
+         */
+    }
 
     interface HTMLAttributes<T> extends DOMAttributes<T> {
         // React-specific Attributes

From 9968b18f5be1dca4711ffdab5b4872eb0fc0b890 Mon Sep 17 00:00:00 2001
From: Nico Montanari <nicomontanari.dev@gmail.com>
Date: Fri, 13 Apr 2018 11:02:52 +0200
Subject: [PATCH 1257/1382] Remove trailing spaces

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

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index b8b13fa69a..288dfada20 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -3938,7 +3938,7 @@ export interface VirtualizedListProperties<ItemT> extends ScrollViewProperties {
     inverted?: boolean;
 
     keyExtractor?: (item: ItemT, index: number) => string;
-                                       
+
     listKey?: string;
 
     /**

From 54968ba726fc344b36d107d537be7b4c96e471bf Mon Sep 17 00:00:00 2001
From: Nikolay Yakimov <root@livid.pp.ru>
Date: Fri, 13 Apr 2018 18:49:39 +0300
Subject: [PATCH 1258/1382] [atom] Updates to AC+ types (#24967)

---
 types/atom/autocomplete-plus/index.d.ts | 33 ++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/types/atom/autocomplete-plus/index.d.ts b/types/atom/autocomplete-plus/index.d.ts
index 2e91a81262..8f23911540 100644
--- a/types/atom/autocomplete-plus/index.d.ts
+++ b/types/atom/autocomplete-plus/index.d.ts
@@ -30,11 +30,20 @@ export interface SuggestionInsertedEvent {
     suggestion: TextSuggestion|SnippetSuggestion;
 }
 
+/**
+ *  COMPATIBILITY STUB. WILL BE REMOVED
+ */
+// tslint:disable-next-line:no-empty-interface
+export interface Suggestion<
+  T extends { text: string }|{ snippet: string }
+  > extends SuggestionBase {}
+// TODO: Remove on next minor version
+
 /**
  *  An autocompletion suggestion for the user.
  *  Primary data type for the Atom Autocomplete+ service.
  */
-export interface Suggestion<T extends { text: string }|{ snippet: string }> {
+export interface SuggestionBase {
     /**
      *  A string that will show in the UI for this suggestion.
      *  When not set, snippet || text is displayed.
@@ -91,14 +100,20 @@ export interface Suggestion<T extends { text: string }|{ snippet: string }> {
      *  When specified, a More.. link will be displayed in the description area.
      */
     descriptionMoreURL?: string;
+
+    /**
+     *  (experimental) Description with Markdown formatting.
+     *  Takes precedence over plaintext description.
+     */
+    descriptionMarkdown?: string;
 }
 
-export interface TextSuggestion extends Suggestion<TextSuggestion> {
+export interface TextSuggestion extends SuggestionBase {
     /** The text which will be inserted into the editor, in place of the prefix. */
     text: string;
 }
 
-export interface SnippetSuggestion extends Suggestion<SnippetSuggestion> {
+export interface SnippetSuggestion extends SuggestionBase {
     /**
      *  A snippet string. This will allow users to tab through function arguments
      *  or other options.
@@ -106,7 +121,8 @@ export interface SnippetSuggestion extends Suggestion<SnippetSuggestion> {
     snippet: string;
 }
 
-export type Suggestions = Array<TextSuggestion|SnippetSuggestion>;
+export type AnySuggestion = TextSuggestion|SnippetSuggestion;
+export type Suggestions = AnySuggestion[];
 
 /** The interface that all Autocomplete+ providers must implement. */
 export interface AutocompleteProvider {
@@ -154,4 +170,13 @@ export interface AutocompleteProvider {
 
     /** Will be called if your provider is being destroyed by autocomplete+ */
     dispose?(): void;
+
+    /**
+     *  (experimental) Is called when a suggestion is selected by the user for
+     *  the purpose of loading more information about the suggestion. Return a
+     *  Promise of the new suggestion to replace it with or return null if
+     *  no change is needed.
+     */
+    getSuggestionDetailsOnSelect?:
+      (suggestion: AnySuggestion) => Promise<AnySuggestion | null> | AnySuggestion | null;
 }

From 3b587e9ce3f894e465bbf26c9f558686538841b6 Mon Sep 17 00:00:00 2001
From: Nikolay Yakimov <root@livid.pp.ru>
Date: Fri, 13 Apr 2018 18:49:55 +0300
Subject: [PATCH 1259/1382] [atom] Clean up FilesystemChangeEvent (#24968)

Add a type for a single FilesystemChange, have `oldPath` on rename
events only.
---
 types/atom/atom-tests.ts |  2 +-
 types/atom/index.d.ts    | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/types/atom/atom-tests.ts b/types/atom/atom-tests.ts
index f21fab1114..5396338e9c 100644
--- a/types/atom/atom-tests.ts
+++ b/types/atom/atom-tests.ts
@@ -3310,7 +3310,7 @@ const pathWatcherPromise = Atom.watchPath("/var/test", {}, (events) => {
     for (const event of events) {
         str = event.path;
         str = event.action;
-        if (event.oldPath) str = event.oldPath;
+        if (event.action === "renamed") str = event.oldPath;
     }
 });
 
diff --git a/types/atom/index.d.ts b/types/atom/index.d.ts
index e673ada530..e46ee9d0cf 100644
--- a/types/atom/index.d.ts
+++ b/types/atom/index.d.ts
@@ -5647,19 +5647,28 @@ export interface FileSavedEvent {
     path: string;
 }
 
-export type FilesystemChangeEvent = Array<{
+export interface FilesystemChangeBasic<
+  Action extends "created"|"modified"|"deleted"|"renamed"
+  = "created"|"modified"|"deleted"
+> {
     /** A string describing the filesystem action that occurred. */
-    action: "created"|"modified"|"deleted"|"renamed";
+    action: Action;
 
     /** The absolute path to the filesystem entry that was acted upon. */
     path: string;
+}
 
+export interface FilesystemChangeRename extends FilesystemChangeBasic<"renamed"> {
     /**
      *  For rename events, a string containing the filesystem entry's former
      *  absolute path.
      */
-    oldPath?: string;
-}>;
+    oldPath: string;
+}
+
+export type FilesystemChange = FilesystemChangeBasic|FilesystemChangeRename;
+
+export type FilesystemChangeEvent = FilesystemChange[];
 
 export interface FullKeybindingMatchEvent {
   /** The string of keystrokes that matched the binding. */

From dcf3384ac2714c299a676cdc6dacabf1a47657c2 Mon Sep 17 00:00:00 2001
From: Alexander T <alexander.v.tarasyuk@gmail.com>
Date: Fri, 13 Apr 2018 18:50:15 +0300
Subject: [PATCH 1260/1382] Microsoft/TypeScript#23155 - Type error in
 Buffer.from() (#24966)

---
 types/node/index.d.ts       | 10 ++++------
 types/node/node-tests.ts    | 23 +++++++++++++----------
 types/node/v4/index.d.ts    |  9 +++------
 types/node/v4/node-tests.ts | 23 +++++++++++++----------
 types/node/v6/index.d.ts    |  9 +++------
 types/node/v6/node-tests.ts | 23 +++++++++++++----------
 types/node/v7/index.d.ts    |  9 +++------
 types/node/v7/node-tests.ts | 33 ++++++++++++++++++---------------
 types/node/v8/index.d.ts    |  9 +++------
 types/node/v8/node-tests.ts | 23 +++++++++++++----------
 10 files changed, 86 insertions(+), 85 deletions(-)

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index ad70b302f9..d27e680aed 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -22,6 +22,7 @@
 //                 Nicolas Even <https://github.com/n-e>
 //                 Mohsen Azimi <https://github.com/mohsen1>
 //                 Hoàng Văn Khải <https://github.com/KSXGitHub>
+//                 Alexander T. <https://github.com/a-tarasyuk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /** inspector module types */
@@ -218,10 +219,6 @@ declare var Buffer: {
      */
     new(buffer: Buffer): Buffer;
     prototype: Buffer;
-    /**
-     * Allocates a new Buffer using an {array} of octets.
-     */
-    from(array: any[]): Buffer;
     /**
      * When passed a reference to the .buffer property of a TypedArray instance,
      * the newly created Buffer will share the same allocated memory as the TypedArray.
@@ -232,9 +229,10 @@ declare var Buffer: {
      */
     from(arrayBuffer: ArrayBuffer, byteOffset?: number, length?: number): Buffer;
     /**
-     * Copies the passed {buffer} data onto a new Buffer instance.
+     * Creates a new Buffer using the passed {data}
+     * @param data data to create a new Buffer
      */
-    from(buffer: Buffer): Buffer;
+    from(data: any[] | string | Buffer | ArrayBuffer /*| TypedArray*/): Buffer;
     /**
      * Creates a new Buffer containing the given JavaScript string {str}.
      * If provided, the {encoding} parameter identifies the character encoding.
diff --git a/types/node/node-tests.ts b/types/node/node-tests.ts
index 72d0e6e0eb..776364a740 100644
--- a/types/node/node-tests.ts
+++ b/types/node/node-tests.ts
@@ -423,9 +423,19 @@ function bufferTests() {
         buf.swap64();
     }
 
-    // Class Method: Buffer.from(array)
+    // Class Method: Buffer.from(data)
     {
-        const buf: Buffer = Buffer.from([0x62, 0x75, 0x66, 0x66, 0x65, 0x72]);
+        // Array
+        const buf1: Buffer = Buffer.from([0x62, 0x75, 0x66, 0x66, 0x65, 0x72]);
+        // Buffer
+        const buf2: Buffer = Buffer.from(buf1);
+        // String
+        const buf3: Buffer = Buffer.from('this is a tést');
+        // ArrayBuffer
+        const arr: Uint16Array = new Uint16Array(2);
+        arr[0] = 5000;
+        arr[1] = 4000;
+        const buf4: Buffer = Buffer.from(arr.buffer);
     }
 
     // Class Method: Buffer.from(arrayBuffer[, byteOffset[, length]])
@@ -435,22 +445,15 @@ function bufferTests() {
         arr[1] = 4000;
 
         let buf: Buffer;
-        buf = Buffer.from(arr.buffer);
         buf = Buffer.from(arr.buffer, 1);
         buf = Buffer.from(arr.buffer, 0, 1);
     }
 
-    // Class Method: Buffer.from(buffer)
-    {
-        const buf1: Buffer = Buffer.from('buffer');
-        const buf2: Buffer = Buffer.from(buf1);
-    }
-
     // Class Method: Buffer.from(str[, encoding])
     {
-        const buf1: Buffer = Buffer.from('this is a tést');
         const buf2: Buffer = Buffer.from('7468697320697320612074c3a97374', 'hex');
     }
+
     // Class Method: Buffer.alloc(size[, fill[, encoding]])
     {
         const buf1: Buffer = Buffer.alloc(5);
diff --git a/types/node/v4/index.d.ts b/types/node/v4/index.d.ts
index ada62b683e..4793b4e9f7 100644
--- a/types/node/v4/index.d.ts
+++ b/types/node/v4/index.d.ts
@@ -164,10 +164,6 @@ declare var Buffer: {
      */
     new (buffer: Buffer): Buffer;
     prototype: Buffer;
-    /**
-     * Allocates a new Buffer using an {array} of octets.
-     */
-    from(array: any[]): Buffer;
     /**
      * When passed a reference to the .buffer property of a TypedArray instance,
      * the newly created Buffer will share the same allocated memory as the TypedArray.
@@ -178,9 +174,10 @@ declare var Buffer: {
      */
     from(arrayBuffer: ArrayBuffer, byteOffset?: number, length?:number): Buffer;
     /**
-     * Copies the passed {buffer} data onto a new Buffer instance.
+     * Creates a new Buffer using the passed {data}
+     * @param data data to create a new Buffer
      */
-    from(buffer: Buffer): Buffer;
+    from(data: any[] | string | Buffer | ArrayBuffer /*| TypedArray*/): Buffer;
     /**
      * Creates a new Buffer containing the given JavaScript string {str}.
      * If provided, the {encoding} parameter identifies the character encoding.
diff --git a/types/node/v4/node-tests.ts b/types/node/v4/node-tests.ts
index 2b3be03f8d..6409e83e18 100644
--- a/types/node/v4/node-tests.ts
+++ b/types/node/v4/node-tests.ts
@@ -240,9 +240,19 @@ function bufferTests() {
     var result1 = Buffer.concat([utf8Buffer, base64Buffer]);
     var result2 = Buffer.concat([utf8Buffer, base64Buffer], 9999999);
 
-    // Class Method: Buffer.from(array)
+    // Class Method: Buffer.from(data)
     {
-        const buf: Buffer = Buffer.from([0x62, 0x75, 0x66, 0x66, 0x65, 0x72]);
+        // Array
+        const buf1: Buffer = Buffer.from([0x62, 0x75, 0x66, 0x66, 0x65, 0x72]);
+        // Buffer
+        const buf2: Buffer = Buffer.from(buf1);
+        // String
+        const buf3: Buffer = Buffer.from('this is a tést');
+        // ArrayBuffer
+        const arr: Uint16Array = new Uint16Array(2);
+        arr[0] = 5000;
+        arr[1] = 4000;
+        const buf4: Buffer = Buffer.from(arr.buffer);
     }
 
     // Class Method: Buffer.from(arrayBuffer[, byteOffset[, length]])
@@ -252,22 +262,15 @@ function bufferTests() {
         arr[1] = 4000;
 
         let buf: Buffer;
-        buf = Buffer.from(arr.buffer);
         buf = Buffer.from(arr.buffer, 1);
         buf = Buffer.from(arr.buffer, 0, 1);
     }
 
-    // Class Method: Buffer.from(buffer)
-    {
-        const buf1: Buffer = Buffer.from('buffer');
-        const buf2: Buffer = Buffer.from(buf1);
-    }
-
     // Class Method: Buffer.from(str[, encoding])
     {
-        const buf1: Buffer = Buffer.from('this is a tést');
         const buf2: Buffer = Buffer.from('7468697320697320612074c3a97374', 'hex');
     }
+
     // Class Method: Buffer.alloc(size[, fill[, encoding]])
     {
         const buf1: Buffer = Buffer.alloc(5);
diff --git a/types/node/v6/index.d.ts b/types/node/v6/index.d.ts
index ed9949a9ac..8cde8ee611 100644
--- a/types/node/v6/index.d.ts
+++ b/types/node/v6/index.d.ts
@@ -164,10 +164,6 @@ declare var Buffer: {
      */
     new (buffer: Buffer): Buffer;
     prototype: Buffer;
-    /**
-     * Allocates a new Buffer using an {array} of octets.
-     */
-    from(array: any[]): Buffer;
     /**
      * When passed a reference to the .buffer property of a TypedArray instance,
      * the newly created Buffer will share the same allocated memory as the TypedArray.
@@ -178,9 +174,10 @@ declare var Buffer: {
      */
     from(arrayBuffer: ArrayBuffer, byteOffset?: number, length?: number): Buffer;
     /**
-     * Copies the passed {buffer} data onto a new Buffer instance.
+     * Creates a new Buffer using the passed {data}
+     * @param data data to create a new Buffer
      */
-    from(buffer: Buffer): Buffer;
+    from(data: any[] | string | Buffer | ArrayBuffer /*| TypedArray*/): Buffer;
     /**
      * Creates a new Buffer containing the given JavaScript string {str}.
      * If provided, the {encoding} parameter identifies the character encoding.
diff --git a/types/node/v6/node-tests.ts b/types/node/v6/node-tests.ts
index 6cfb45692b..f9d5a9cd62 100644
--- a/types/node/v6/node-tests.ts
+++ b/types/node/v6/node-tests.ts
@@ -321,9 +321,19 @@ function bufferTests() {
         buf.swap64();
     }
 
-    // Class Method: Buffer.from(array)
+    // Class Method: Buffer.from(data)
     {
-        const buf: Buffer = Buffer.from([0x62, 0x75, 0x66, 0x66, 0x65, 0x72]);
+        // Array
+        const buf1: Buffer = Buffer.from([0x62, 0x75, 0x66, 0x66, 0x65, 0x72]);
+        // Buffer
+        const buf2: Buffer = Buffer.from(buf1);
+        // String
+        const buf3: Buffer = Buffer.from('this is a tést');
+        // ArrayBuffer
+        const arr: Uint16Array = new Uint16Array(2);
+        arr[0] = 5000;
+        arr[1] = 4000;
+        const buf4: Buffer = Buffer.from(arr.buffer);
     }
 
     // Class Method: Buffer.from(arrayBuffer[, byteOffset[, length]])
@@ -333,22 +343,15 @@ function bufferTests() {
         arr[1] = 4000;
 
         let buf: Buffer;
-        buf = Buffer.from(arr.buffer);
         buf = Buffer.from(arr.buffer, 1);
         buf = Buffer.from(arr.buffer, 0, 1);
     }
 
-    // Class Method: Buffer.from(buffer)
-    {
-        const buf1: Buffer = Buffer.from('buffer');
-        const buf2: Buffer = Buffer.from(buf1);
-    }
-
     // Class Method: Buffer.from(str[, encoding])
     {
-        const buf1: Buffer = Buffer.from('this is a tést');
         const buf2: Buffer = Buffer.from('7468697320697320612074c3a97374', 'hex');
     }
+
     // Class Method: Buffer.alloc(size[, fill[, encoding]])
     {
         const buf1: Buffer = Buffer.alloc(5);
diff --git a/types/node/v7/index.d.ts b/types/node/v7/index.d.ts
index 950e143536..e8290f204c 100644
--- a/types/node/v7/index.d.ts
+++ b/types/node/v7/index.d.ts
@@ -175,10 +175,6 @@ declare var Buffer: {
      */
     new (buffer: Buffer): Buffer;
     prototype: Buffer;
-    /**
-     * Allocates a new Buffer using an {array} of octets.
-     */
-    from(array: any[]): Buffer;
     /**
      * When passed a reference to the .buffer property of a TypedArray instance,
      * the newly created Buffer will share the same allocated memory as the TypedArray.
@@ -189,9 +185,10 @@ declare var Buffer: {
      */
     from(arrayBuffer: ArrayBuffer, byteOffset?: number, length?: number): Buffer;
     /**
-     * Copies the passed {buffer} data onto a new Buffer instance.
+     * Creates a new Buffer using the passed {data}
+     * @param data data to create a new Buffer
      */
-    from(buffer: Buffer): Buffer;
+    from(data: any[] | string | Buffer | ArrayBuffer /*| TypedArray*/): Buffer;
     /**
      * Creates a new Buffer containing the given JavaScript string {str}.
      * If provided, the {encoding} parameter identifies the character encoding.
diff --git a/types/node/v7/node-tests.ts b/types/node/v7/node-tests.ts
index cc46b1f8e4..0ea05066b4 100644
--- a/types/node/v7/node-tests.ts
+++ b/types/node/v7/node-tests.ts
@@ -303,9 +303,19 @@ function bufferTests() {
         buf.swap64();
     }
 
-    // Class Method: Buffer.from(array)
+    // Class Method: Buffer.from(data)
     {
-        const buf: Buffer = Buffer.from([0x62, 0x75, 0x66, 0x66, 0x65, 0x72]);
+        // Array
+        const buf1: Buffer = Buffer.from([0x62, 0x75, 0x66, 0x66, 0x65, 0x72]);
+        // Buffer
+        const buf2: Buffer = Buffer.from(buf1);
+        // String
+        const buf3: Buffer = Buffer.from('this is a tést');
+        // ArrayBuffer
+        const arr: Uint16Array = new Uint16Array(2);
+        arr[0] = 5000;
+        arr[1] = 4000;
+        const buf4: Buffer = Buffer.from(arr.buffer);
     }
 
     // Class Method: Buffer.from(arrayBuffer[, byteOffset[, length]])
@@ -315,10 +325,15 @@ function bufferTests() {
         arr[1] = 4000;
 
         let buf: Buffer;
-        buf = Buffer.from(arr.buffer);
         buf = Buffer.from(arr.buffer, 1);
         buf = Buffer.from(arr.buffer, 0, 1);
     }
+
+    // Class Method: Buffer.from(str[, encoding])
+    {
+        const buf2: Buffer = Buffer.from('7468697320697320612074c3a97374', 'hex');
+    }
+
     // Class Method: Buffer.alloc(size[, fill[, encoding]])
     {
         const buf1: Buffer = Buffer.alloc(5);
@@ -334,18 +349,6 @@ function bufferTests() {
         const buf: Buffer = Buffer.allocUnsafeSlow(10);
     }
 
-    // Class Method: Buffer.from(buffer)
-    {
-        const buf1: Buffer = Buffer.from('buffer');
-        const buf2: Buffer = Buffer.from(buf1);
-    }
-
-    // Class Method: Buffer.from(str[, encoding])
-    {
-        const buf1: Buffer = Buffer.from('this is a tést');
-        const buf2: Buffer = Buffer.from('7468697320697320612074c3a97374', 'hex');
-    }
-
     // Test that TS 1.6 works with the 'as Buffer' annotation
     // on isBuffer.
     var a: Buffer | number;
diff --git a/types/node/v8/index.d.ts b/types/node/v8/index.d.ts
index b11601895e..642a957eca 100644
--- a/types/node/v8/index.d.ts
+++ b/types/node/v8/index.d.ts
@@ -217,10 +217,6 @@ declare var Buffer: {
      */
     new(buffer: Buffer): Buffer;
     prototype: Buffer;
-    /**
-     * Allocates a new Buffer using an {array} of octets.
-     */
-    from(array: any[]): Buffer;
     /**
      * When passed a reference to the .buffer property of a TypedArray instance,
      * the newly created Buffer will share the same allocated memory as the TypedArray.
@@ -231,9 +227,10 @@ declare var Buffer: {
      */
     from(arrayBuffer: ArrayBuffer, byteOffset?: number, length?: number): Buffer;
     /**
-     * Copies the passed {buffer} data onto a new Buffer instance.
+     * Creates a new Buffer using the passed {data}
+     * @param data data to create a new Buffer
      */
-    from(buffer: Buffer): Buffer;
+    from(data: any[] | string | Buffer | ArrayBuffer /*| TypedArray*/): Buffer;
     /**
      * Creates a new Buffer containing the given JavaScript string {str}.
      * If provided, the {encoding} parameter identifies the character encoding.
diff --git a/types/node/v8/node-tests.ts b/types/node/v8/node-tests.ts
index 0013486263..2546184d0a 100644
--- a/types/node/v8/node-tests.ts
+++ b/types/node/v8/node-tests.ts
@@ -397,9 +397,19 @@ function bufferTests() {
         buf.swap64();
     }
 
-    // Class Method: Buffer.from(array)
+    // Class Method: Buffer.from(data)
     {
-        const buf: Buffer = Buffer.from([0x62, 0x75, 0x66, 0x66, 0x65, 0x72]);
+        // Array
+        const buf1: Buffer = Buffer.from([0x62, 0x75, 0x66, 0x66, 0x65, 0x72]);
+        // Buffer
+        const buf2: Buffer = Buffer.from(buf1);
+        // String
+        const buf3: Buffer = Buffer.from('this is a tést');
+        // ArrayBuffer
+        const arr: Uint16Array = new Uint16Array(2);
+        arr[0] = 5000;
+        arr[1] = 4000;
+        const buf4: Buffer = Buffer.from(arr.buffer);
     }
 
     // Class Method: Buffer.from(arrayBuffer[, byteOffset[, length]])
@@ -409,22 +419,15 @@ function bufferTests() {
         arr[1] = 4000;
 
         let buf: Buffer;
-        buf = Buffer.from(arr.buffer);
         buf = Buffer.from(arr.buffer, 1);
         buf = Buffer.from(arr.buffer, 0, 1);
     }
 
-    // Class Method: Buffer.from(buffer)
-    {
-        const buf1: Buffer = Buffer.from('buffer');
-        const buf2: Buffer = Buffer.from(buf1);
-    }
-
     // Class Method: Buffer.from(str[, encoding])
     {
-        const buf1: Buffer = Buffer.from('this is a tést');
         const buf2: Buffer = Buffer.from('7468697320697320612074c3a97374', 'hex');
     }
+
     // Class Method: Buffer.alloc(size[, fill[, encoding]])
     {
         const buf1: Buffer = Buffer.alloc(5);

From ed66591fa0f71bdbdd14ffe6b255516419e32a3c Mon Sep 17 00:00:00 2001
From: Janeene Beeforth <dawnmist@users.noreply.github.com>
Date: Sat, 14 Apr 2018 01:50:29 +1000
Subject: [PATCH 1261/1382] [expo]: Add missing SvgCommonProps (#24965)

* fillRule
* rotation (both 'rotate' and 'rotation' are currently supported, but
  documentation specifies 'rotation' as the current version to use.
---
 types/expo/index.d.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/types/expo/index.d.ts b/types/expo/index.d.ts
index 2cde351dbe..8e35cb8631 100644
--- a/types/expo/index.d.ts
+++ b/types/expo/index.d.ts
@@ -1873,6 +1873,7 @@ export namespace SQLite {
 export interface SvgCommonProps {
     fill?: string;
     fillOpacity?: number | string;
+    fillRule?: 'nonzero' | 'evenodd';
     stroke?: string;
     strokeWidth?: number | string;
     strokeOpacity?: number | string;
@@ -1883,6 +1884,7 @@ export interface SvgCommonProps {
     x?: number | string;
     y?: number | string;
     rotate?: number | string;
+    rotation?: number | string;
     scale?: number | string;
     origin?: number | string;
     originX?: number | string;

From 55032550650462420c98401e182fa75d17095a77 Mon Sep 17 00:00:00 2001
From: sunnyone <sunnyone41+git@gmail.com>
Date: Sat, 14 Apr 2018 00:53:57 +0900
Subject: [PATCH 1262/1382] Add onHide to IDialogDefinition (#24964)

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

diff --git a/types/ckeditor/ckeditor-tests.ts b/types/ckeditor/ckeditor-tests.ts
index 515996e90a..03f8a1ab3e 100644
--- a/types/ckeditor/ckeditor-tests.ts
+++ b/types/ckeditor/ckeditor-tests.ts
@@ -323,7 +323,11 @@ function test_adding_dialog_by_definition() {
             title: 'Abbreviation Properties',
             minWidth: 400,
             minHeight: 200,
-
+            onLoad: () => {},
+            onOk: () => {},
+            onCancel: () => {},
+            onShow: () => {},
+            onHide: () => {},
             contents: [
                 {
                     id: 'tab-basic',
diff --git a/types/ckeditor/index.d.ts b/types/ckeditor/index.d.ts
index 49ffce2fd9..e26abd16b4 100644
--- a/types/ckeditor/index.d.ts
+++ b/types/ckeditor/index.d.ts
@@ -1735,6 +1735,7 @@ declare namespace CKEDITOR {
             onLoad?: Function;
             onOk?: Function;
             onShow?: Function;
+            onHide?: Function;
             resizable?: number;
             title?: string;
             width?: number;

From 5302148a4506d5e324dd9c3822a33f54372cadbc Mon Sep 17 00:00:00 2001
From: Sander de Waal <sdw1992@live.nl>
Date: Fri, 13 Apr 2018 18:23:13 +0200
Subject: [PATCH 1263/1382] Add HavingIn method to Knex typings (#24974)

---
 types/knex/index.d.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/types/knex/index.d.ts b/types/knex/index.d.ts
index 1d405f54b0..9c07f69f9b 100644
--- a/types/knex/index.d.ts
+++ b/types/knex/index.d.ts
@@ -125,6 +125,7 @@ declare namespace Knex {
         havingRaw: RawQueryBuilder;
         orHaving: Having;
         orHavingRaw: RawQueryBuilder;
+        havingIn: HavingIn;
 
         // Clear
         clearSelect(): QueryBuilder;
@@ -324,6 +325,10 @@ declare namespace Knex {
         (tableName: string, column1: string, operator: string, column2: string): QueryBuilder;
     }
 
+    interface HavingIn {
+        (columnName: string, values: Value[]): QueryBuilder;
+    }
+
     // commons
 
     interface ColumnNameQueryBuilder {

From 40a24d875a15e1684fc80ca9c5b7942931ee2854 Mon Sep 17 00:00:00 2001
From: drschulz <drews1109@gmail.com>
Date: Fri, 13 Apr 2018 10:20:40 -0700
Subject: [PATCH 1264/1382] Fixed Overlay class definition (#24978)

The Overlay class definition is currently broken for Typescript 2.8.1 because OverlayProps has recently been moved into the Overlay namespace. This updates the class definition to reflect that.
---
 types/react-overlays/lib/Overlay.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/react-overlays/lib/Overlay.d.ts b/types/react-overlays/lib/Overlay.d.ts
index 473f391a74..3b6cd22be9 100644
--- a/types/react-overlays/lib/Overlay.d.ts
+++ b/types/react-overlays/lib/Overlay.d.ts
@@ -4,7 +4,7 @@ import { TransitionProps } from 'react-transition-group/Transition';
 import { PortalProps } from './Portal';
 import { PositionProps } from './Position';
 
-declare class Overlay extends React.Component<OverlayProps> { }
+declare class Overlay extends React.Component<Overlay.OverlayProps> { }
 export = Overlay;
 
 declare namespace Overlay {

From 1a8b08d6d9f2546279bf079f2cf9a3f9605f4799 Mon Sep 17 00:00:00 2001
From: Cheng Wang <wangcheng678@gmail.com>
Date: Sat, 14 Apr 2018 01:21:31 +0800
Subject: [PATCH 1265/1382] add subscribe-ui-event (#24976)

---
 types/subscribe-ui-event/index.d.ts           | 99 +++++++++++++++++++
 .../subscribe-ui-event-tests.ts               | 24 +++++
 types/subscribe-ui-event/tsconfig.json        | 16 +++
 types/subscribe-ui-event/tslint.json          |  1 +
 4 files changed, 140 insertions(+)
 create mode 100644 types/subscribe-ui-event/index.d.ts
 create mode 100644 types/subscribe-ui-event/subscribe-ui-event-tests.ts
 create mode 100644 types/subscribe-ui-event/tsconfig.json
 create mode 100644 types/subscribe-ui-event/tslint.json

diff --git a/types/subscribe-ui-event/index.d.ts b/types/subscribe-ui-event/index.d.ts
new file mode 100644
index 0000000000..12fca5af91
--- /dev/null
+++ b/types/subscribe-ui-event/index.d.ts
@@ -0,0 +1,99 @@
+// Type definitions for subscribe-ui-event 1.1
+// Project: https://github.com/yahoo/subscribe-ui-event#readme
+// Definitions by: Cheng Wang <https://github.com/wangcheng678>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/subscribe-ui-event
+// TypeScript Version: 2.3
+
+export type UIEventType =
+    | 'resize'
+    | 'resizeEnd'
+    | 'resizeStart'
+    | 'scroll'
+    | 'scrollEnd'
+    | 'scrollStart'
+    | 'visibilitychange';
+
+export type TouchEventType =
+    | 'touchend'
+    | 'touchmove'
+    | 'touchmoveEnd'
+    | 'touchmoveStart'
+    | 'touchstart';
+
+export type EventType = UIEventType | TouchEventType;
+
+export interface SubscribeOptions {
+    context?: any;
+    enableResizeInfo?: boolean;
+    enableScrollInfo?: boolean;
+    enableTouchInfo?: boolean;
+    eventOptions?: AddEventListenerOptions;
+    throttleRate?: number;
+    useRAF?: boolean;
+}
+
+export interface ArgmentedEvent<T extends EventType> {
+    mainType: string;
+    resize: {
+        height: number;
+        width: number;
+    };
+    scroll: {
+        delta: number;
+        top: number;
+    };
+    subType: string;
+    type: T;
+    touch: {
+        axisIntention: 'x' | 'y' | '';
+        deltaX: number;
+        deltaY: number;
+        startX: number;
+        startY: number;
+    };
+}
+
+export type UIEventCallback<T extends UIEventType = UIEventType> = (
+    event: UIEvent,
+    payload: ArgmentedEvent<T>
+) => any;
+
+export type TouchEventCallback<T extends TouchEventType = TouchEventType> = (
+    event: TouchEvent,
+    payload: ArgmentedEvent<T>
+) => any;
+
+export interface Subscrption {
+    unsubscribe: () => void;
+}
+
+export function subscribe<T extends UIEventType>(
+    eventType: T,
+    callback: UIEventCallback<T>,
+    options?: SubscribeOptions
+): Subscrption;
+
+export function subscribe<T extends TouchEventType>(
+    eventType: T,
+    callback: TouchEventCallback<T>,
+    options?: SubscribeOptions
+): Subscrption;
+
+export function unsubscribe<T extends UIEventType>(
+    eventType: T,
+    callback: UIEventCallback<T>
+): void;
+
+export function unsubscribe<T extends TouchEventType>(
+    eventType: T,
+    callback: TouchEventCallback<T>
+): void;
+
+export function listen(
+    target: EventTarget,
+    eventType: string,
+    handler: EventListenerOrEventListenerObject,
+    options?: AddEventListenerOptions
+): {
+    remove: () => void;
+};
diff --git a/types/subscribe-ui-event/subscribe-ui-event-tests.ts b/types/subscribe-ui-event/subscribe-ui-event-tests.ts
new file mode 100644
index 0000000000..f199d00335
--- /dev/null
+++ b/types/subscribe-ui-event/subscribe-ui-event-tests.ts
@@ -0,0 +1,24 @@
+import {
+    subscribe,
+    unsubscribe,
+    listen,
+    UIEventCallback,
+} from 'subscribe-ui-event';
+
+const callback: UIEventCallback = (event, paylaod) => {
+    const target = event.target;
+    console.log(paylaod);
+};
+
+const subscription = subscribe('resize', callback);
+
+unsubscribe('touchend', (event, paylaod) => {
+    const target = event.currentTarget;
+    console.log(paylaod.type);
+});
+
+subscription.unsubscribe();
+
+const {remove} = listen(document, 'onclick', console.log);
+
+remove();
diff --git a/types/subscribe-ui-event/tsconfig.json b/types/subscribe-ui-event/tsconfig.json
new file mode 100644
index 0000000000..a931986600
--- /dev/null
+++ b/types/subscribe-ui-event/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6", "dom"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": ["index.d.ts", "subscribe-ui-event-tests.ts"]
+}
diff --git a/types/subscribe-ui-event/tslint.json b/types/subscribe-ui-event/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/subscribe-ui-event/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 5e03bfd6b09877639e58e70704bb6b96a32ea2bb Mon Sep 17 00:00:00 2001
From: Kajan Nallathamby <kajan.nallathamby@mitel.com>
Date: Fri, 13 Apr 2018 13:22:22 -0400
Subject: [PATCH 1266/1382] fixes chai-things import issues (#24975)

---
 types/chai-things/chai-things-tests.ts | 5 ++---
 types/chai-things/index.d.ts           | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/types/chai-things/chai-things-tests.ts b/types/chai-things/chai-things-tests.ts
index ecb7294dd2..b3549ab192 100644
--- a/types/chai-things/chai-things-tests.ts
+++ b/types/chai-things/chai-things-tests.ts
@@ -1,8 +1,7 @@
 
 
-import chai = require('chai');
-import chaiThings = require('chai-things');
-
+import * as chai from 'chai';
+import * as chaiThings from 'chai-things';
 chai.use(chaiThings);
 
 function test_somethingSyntax() {
diff --git a/types/chai-things/index.d.ts b/types/chai-things/index.d.ts
index 11ad20ede3..e0b3d0f0ec 100644
--- a/types/chai-things/index.d.ts
+++ b/types/chai-things/index.d.ts
@@ -60,5 +60,6 @@ interface Array<T> {
 
 declare module "chai-things" {
     function chaiThings(chai: any, utils: any): void;
+    namespace chaiThings { }
     export = chaiThings;
 }

From 20a3d80183769d978caef94f55599392843ef72c Mon Sep 17 00:00:00 2001
From: Ika <ikatyang@gmail.com>
Date: Sat, 14 Apr 2018 01:23:00 +0800
Subject: [PATCH 1267/1382] feat(prettier): update to v1.12 (#24973)

---
 types/prettier/index.d.ts | 225 ++++++++++++++++++++++++++++++++------
 1 file changed, 191 insertions(+), 34 deletions(-)

diff --git a/types/prettier/index.d.ts b/types/prettier/index.d.ts
index b323a0979b..e2fc00be38 100644
--- a/types/prettier/index.d.ts
+++ b/types/prettier/index.d.ts
@@ -1,12 +1,22 @@
-// Type definitions for prettier 1.10
+// Type definitions for prettier 1.12
 // Project: https://github.com/prettier/prettier
 // Definitions by: Ika <https://github.com/ikatyang>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
 export type AST = any;
-export type Doc = any; // https://github.com/prettier/prettier/blob/master/commands.md
-export type FastPath = any; // https://github.com/prettier/prettier/blob/master/src/common/fast-path.js
+export type Doc = doc.builders.Doc;
+
+// https://github.com/prettier/prettier/blob/master/src/common/fast-path.js
+export interface FastPath {
+    getName(): string | null;
+    getValue(): any;
+    getNode(count?: number): any;
+    getParentNode(count?: number): any;
+    call<T>(callback: (path: this) => T, ...names: string[]): T;
+    each(callback: (path: this) => void, ...names: string[]): void;
+    map<T>(callback: (path: this, index: number) => T, ...names: string[]): T[];
+}
 
 export type BuiltInParser = (text: string, options?: any) => AST;
 export type BuiltInParserName =
@@ -24,72 +34,61 @@ export type BuiltInParserName =
 
 export type CustomParser = (text: string, parsers: Record<BuiltInParserName, BuiltInParser>, options: Options) => AST;
 
-export interface Options {
-    /**
-     * Specify the line length that the printer will wrap on.
-     */
-    printWidth?: number;
-    /**
-     * Specify the number of spaces per indentation-level.
-     */
-    tabWidth?: number;
-    /**
-     * Indent lines with tabs instead of spaces
-     */
-    useTabs?: boolean;
+export interface Options extends Partial<RequiredOptions> {}
+export interface RequiredOptions extends doc.printer.Options {
     /**
      * Print semicolons at the ends of statements.
      */
-    semi?: boolean;
+    semi: boolean;
     /**
      * Use single quotes instead of double quotes.
      */
-    singleQuote?: boolean;
+    singleQuote: boolean;
     /**
      * Print trailing commas wherever possible.
      */
-    trailingComma?: 'none' | 'es5' | 'all';
+    trailingComma: 'none' | 'es5' | 'all';
     /**
      * Print spaces between brackets in object literals.
      */
-    bracketSpacing?: boolean;
+    bracketSpacing: boolean;
     /**
      * Put the `>` of a multi-line JSX element at the end of the last line instead of being alone on the next line.
      */
-    jsxBracketSameLine?: boolean;
+    jsxBracketSameLine: boolean;
     /**
      * Format only a segment of a file.
      */
-    rangeStart?: number;
+    rangeStart: number;
     /**
      * Format only a segment of a file.
      */
-    rangeEnd?: number;
+    rangeEnd: number;
     /**
      * Specify which parser to use.
      */
-    parser?: BuiltInParserName | CustomParser;
+    parser: BuiltInParserName | CustomParser;
     /**
      * Specify the input filepath. This will be used to do parser inference.
      */
-    filepath?: string;
+    filepath: string;
     /**
      * Prettier can restrict itself to only format files that contain a special comment, called a pragma, at the top of the file.
      * This is very useful when gradually transitioning large, unformatted codebases to prettier.
      */
-    requirePragma?: boolean;
+    requirePragma: boolean;
     /**
      * Prettier can insert a special @format marker at the top of files specifying that
      * the file has been formatted with prettier. This works well when used in tandem with
      * the --require-pragma option. If there is already a docblock at the top of
      * the file then this option will add a newline to it with the @format marker.
      */
-    insertPragma?: boolean;
+    insertPragma: boolean;
     /**
      * By default, Prettier will wrap markdown text as-is since some services use a linebreak-sensitive renderer.
      * In some cases you may want to rely on editor/viewer soft wrapping instead, so this option allows you to opt out.
      */
-    proseWrap?:
+    proseWrap:
         | boolean // deprecated
         | 'always'
         | 'never'
@@ -97,11 +96,16 @@ export interface Options {
     /**
      * Include parentheses around a sole arrow function parameter.
      */
-    arrowParens?: 'avoid' | 'always';
+    arrowParens: 'avoid' | 'always';
     /**
      * The plugin API is in a beta state.
      */
-    plugins?: Array<string | Plugin>;
+    plugins: Array<string | Plugin>;
+}
+
+export interface ParserOptions extends RequiredOptions {
+    locStart: (node: any) => number;
+    locEnd: (node: any) => number;
 }
 
 export interface Plugin {
@@ -111,22 +115,41 @@ export interface Plugin {
 }
 
 export interface Parser {
-    parse: (text: string, parsers: { [parserName: string]: Parser }, options: object) => AST;
+    parse: (text: string, parsers: { [parserName: string]: Parser }, options: ParserOptions) => AST;
     astFormat: string;
+    hasPragma?: (text: string) => boolean;
+    locStart: (node: any) => number;
+    locEnd: (node: any) => number;
 }
 
 export interface Printer {
     print(
         path: FastPath,
-        options: object,
+        options: ParserOptions,
         print: (path: FastPath) => Doc,
     ): Doc;
     embed(
         path: FastPath,
         print: (path: FastPath) => Doc,
-        textToDoc: (text: string, options: object) => Doc,
-        options: object,
+        textToDoc: (text: string, options: Options) => Doc,
+        options: ParserOptions,
     ): Doc | null;
+    insertPragma?: (text: string) => string;
+    /**
+     * @returns `null` if you want to remove this node
+     * @returns `void` if you want to use modified newNode
+     * @returns anything if you want to replace the node with it
+     */
+    massageAstNode?: (node: any, newNode: any, parent: any) => any;
+    hasPrettierIgnore?: (path: FastPath) => boolean;
+    canAttachComment?: (node: any) => boolean;
+    willPrintOwnComments?: (path: FastPath) => boolean;
+    printComments?: (path: FastPath, print: (path: FastPath) => Doc, options: ParserOptions, needsSemi: boolean) => Doc;
+    handleComments?: {
+        ownLine?: (commentNode: any, text: string, options: ParserOptions, ast: any, isLastComment: boolean) => boolean;
+        endOfLine?: (commentNode: any, text: string, options: ParserOptions, ast: any, isLastComment: boolean) => boolean;
+        remaining?: (commentNode: any, text: string, options: ParserOptions, ast: any, isLastComment: boolean) => boolean;
+    };
 }
 
 export interface CursorOptions extends Options {
@@ -226,6 +249,7 @@ export interface SupportLanguage {
 export interface SupportOption {
     since: string;
     type: 'int' | 'boolean' | 'choice' | 'path';
+    array?: boolean;
     deprecated?: string;
     redirect?: SupportOptionRedirect;
     description: string;
@@ -272,3 +296,136 @@ export function getSupportInfo(version?: string): SupportInfo;
  * `version` field in `package.json`
  */
 export const version: string;
+
+// https://github.com/prettier/prettier/blob/master/src/common/util-shared.js
+export namespace util {
+    function isNextLineEmpty(text: string, node: any, options: ParserOptions): boolean;
+    function isNextLineEmptyAfterIndex(text: string, index: number): boolean;
+    function getNextNonSpaceNonCommentCharacterIndex(text: string, node: any, options: ParserOptions): number;
+    function makeString(rawContent: string, enclosingQuote: "'" | '"', unescapeUnnecessaryEscapes: boolean): string;
+    function addLeadingComment(node: any, commentNode: any): void;
+    function addDanglingComment(node: any, commentNode: any): void;
+    function addTrailingComment(node: any, commentNode: any): void;
+}
+
+// https://github.com/prettier/prettier/blob/master/src/doc/index.js
+export namespace doc {
+    namespace builders {
+        type Doc =
+            | string
+            | Align
+            | BreakParent
+            | Concat
+            | Fill
+            | Group
+            | IfBreak
+            | Indent
+            | Line
+            | LineSuffix
+            | LineSuffixBoundary;
+
+        interface Align {
+            type: 'align';
+            contents: Doc;
+            n: number | string | { type: 'root' };
+        }
+
+        interface BreakParent {
+            type: 'break-parent';
+        }
+
+        interface Concat {
+            type: 'concat';
+            parts: Doc[];
+        }
+
+        interface Fill {
+            type: 'fill';
+            parts: Doc[];
+        }
+
+        interface Group {
+            type: 'group';
+            contents: Doc;
+            break: boolean;
+            expandedStates: Doc[];
+        }
+
+        interface IfBreak {
+            type: 'if-break';
+            breakContents: Doc;
+            flatContents: Doc;
+        }
+
+        interface Indent {
+            type: 'indent';
+            contents: Doc;
+        }
+
+        interface Line {
+            type: 'line';
+            soft?: boolean;
+            hard?: boolean;
+            literal?: boolean;
+        }
+
+        interface LineSuffix {
+            type: 'line-suffix';
+            contents: Doc;
+        }
+
+        interface LineSuffixBoundary {
+            type: 'line-suffix-boundary';
+        }
+
+        function addAlignmentToDoc(doc: Doc, size: number, tabWidth: number): Doc;
+        function align(n: Align['n'], contents: Doc): Align;
+        const breakParent: BreakParent;
+        function concat(contents: Doc[]): Concat;
+        function conditionalGroup(states: Doc[], opts?: { shouldBreak: boolean }): Group;
+        function dedent(contents: Doc): Align;
+        function dedentToRoot(contents: Doc): Align;
+        function fill(parts: Doc[]): Fill;
+        function group(contents: Doc, opts?: { shouldBreak: boolean }): Group;
+        const hardline: Concat;
+        function ifBreak(breakContents: Doc, flatContents: Doc): IfBreak;
+        function indent(contents: Doc): Indent;
+        function join(separator: Doc, parts: Doc[]): Concat;
+        const line: Line;
+        function lineSuffix(contents: Doc): LineSuffix;
+        const lineSuffixBoundary: LineSuffixBoundary;
+        const literalline: Concat;
+        function markAsRoot(contents: Doc): Align;
+        const softline: Line;
+    }
+    namespace debug {
+        function printDocToDebug(doc: Doc): string;
+    }
+    namespace printer {
+        function printDocToString(doc: Doc, options: Options): string;
+        interface Options {
+            /**
+             * Specify the line length that the printer will wrap on.
+             */
+            printWidth: number;
+            /**
+             * Specify the number of spaces per indentation-level.
+             */
+            tabWidth: number;
+            /**
+             * Indent lines with tabs instead of spaces
+             */
+            useTabs: boolean;
+        }
+    }
+    namespace utils {
+        function isEmpty(doc: Doc): boolean;
+        function isLineNext(doc: Doc): boolean;
+        function willBreak(doc: Doc): boolean;
+        function traverseDoc(doc: Doc, onEnter?: (doc: Doc) => void | boolean, onExit?: (doc: Doc) => void, shouldTraverseConditionalGroups?: boolean): void;
+        function mapDoc<T>(doc: Doc, callback: (doc: Doc) => T): T;
+        function propagateBreaks(doc: Doc): void;
+        function removeLines(doc: Doc): Doc;
+        function stripTrailingHardline(doc: Doc): Doc;
+    }
+}

From c252ab8bc908710388075ff4fc3067551ff7f0d1 Mon Sep 17 00:00:00 2001
From: Simon Schick <SimonSchick@users.noreply.github.com>
Date: Fri, 13 Apr 2018 20:57:40 +0200
Subject: [PATCH 1268/1382] fix(hapi): allow passing object to toolkit `state`,
 fix `tags` index signature, fix route `ext` (#24956)

* fix(hapi): allow passing object to toolkit `state`, fix `tags` index signature, fix route `ext`

* fixup! fix(hapi): allow passing object to toolkit `state`, fix `tags` index signature, fix route `ext`
---
 types/hapi/index.d.ts                  | 35 +++++++++++---------------
 types/hapi/test/route/ext.ts           | 11 ++++++--
 types/hapi/test/server/server-state.ts |  5 ++--
 3 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/types/hapi/index.d.ts b/types/hapi/index.d.ts
index d75da47e5e..d4072b0cd7 100644
--- a/types/hapi/index.d.ts
+++ b/types/hapi/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: Marc Bornträger <https://github.com/BorntraegerMarc>
 //                 Rafael Souza Fijalkowski <https://github.com/rafaelsouzaf>
 //                 Justin Simms <https://github.com/jhsimms>
+//                 Simon Schick <https://github.com/SimonSchick>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
@@ -1008,7 +1009,7 @@ export interface ResponseToolkit {
      * @return Return value: none.
      * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-hstatename-value-options)
      */
-    state(name: string, value: string, options?: ServerStateCookieOptions): void;
+    state(name: string, value: string | object, options?: ServerStateCookieOptions): void;
 
     /**
      * Used by the [authentication] method to indicate authentication failed and pass back the credentials received where:
@@ -1724,12 +1725,7 @@ export interface RouteOptions {
      * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#request-lifecycle)
      */
     ext?: {
-        onPreAuth?: Lifecycle.Method;
-        onCredentials?: Lifecycle.Method;
-        onPostAuth?: Lifecycle.Method;
-        onPreHandler?: Lifecycle.Method;
-        onPostHandler?: Lifecycle.Method;
-        onPreResponse?: Lifecycle.Method;
+        [key in RouteRequestExtType]?: RouteExtObject | RouteExtObject[];
     };
 
     /**
@@ -2229,8 +2225,8 @@ export interface RequestEvent {
     error: object;
 }
 
-export type LogEventHandler = (event: LogEvent, tags: object) => void;
-export type RequestEventHandler = (request: Request, event: RequestEvent, tags: object) => void;
+export type LogEventHandler = (event: LogEvent, tags: { [key: string]: true }) => void;
+export type RequestEventHandler = (request: Request, event: RequestEvent, tags: { [key: string]: true }) => void;
 export type ResponseEventHandler = (request: Request) => void;
 export type RouteEventHandler = (route: ServerRoute) => void;
 export type StartEventHandler = () => void;
@@ -2354,15 +2350,17 @@ export interface ServerEvents extends Podium {
  * For context [See docs](https://github.com/hapijs/hapi/blob/master/API.md#request-lifecycle)
  */
 export type ServerExtType = 'onPreStart' | 'onPostStart' | 'onPreStop' | 'onPostStop';
-export type ServerRequestExtType =
-    'onRequest'
-    | 'onPreAuth'
+export type RouteRequestExtType = 'onPreAuth'
     | 'onCredentials'
     | 'onPostAuth'
     | 'onPreHandler'
     | 'onPostHandler'
     | 'onPreResponse';
 
+export type ServerRequestExtType =
+    RouteRequestExtType
+    | 'onRequest';
+
 /**
  * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-serverextevents)
  * Registers an extension function in one of the request lifecycle extension points where:
@@ -2401,14 +2399,11 @@ export interface ServerExtEventsObject {
      * * request extension points: a lifecycle method.
      */
     method: ServerExtPointFunction | ServerExtPointFunction[];
-    /**
-     * options - (optional) an 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. Ignored if the method is an arrow function.
-     * * sandbox - if set to 'plugin' when adding a request extension points the extension is only added to routes defined by the current plugin. Not allowed when configuring route-level extensions,
-     * or when adding server extensions. Defaults to 'server' which applies to any route added to the server the extension is added to.
-     */
+    options?: ServerExtOptions;
+}
+
+export interface RouteExtObject {
+    method: Lifecycle.Method;
     options?: ServerExtOptions;
 }
 
diff --git a/types/hapi/test/route/ext.ts b/types/hapi/test/route/ext.ts
index 0a2ac25a4b..b8dff44699 100644
--- a/types/hapi/test/route/ext.ts
+++ b/types/hapi/test/route/ext.ts
@@ -7,9 +7,16 @@ server.route({
     path: "/test",
     options: {
         ext: {
-            onPreResponse(request, h) {
-                return h.continue;
+            onPreResponse: {
+                method(_request, h) {
+                    return h.continue;
+                },
             },
+            onPostHandler: [{
+                method(_request, h) {
+                    return h.continue;
+                },
+            }],
         }
     }
 });
diff --git a/types/hapi/test/server/server-state.ts b/types/hapi/test/server/server-state.ts
index 97cf5997f0..ba4ffe344c 100644
--- a/types/hapi/test/server/server-state.ts
+++ b/types/hapi/test/server/server-state.ts
@@ -1,5 +1,5 @@
 // from https://hapijs.com/tutorials/cookies?lang=en_US
-import { Request, ResponseToolkit, Server, ServerOptions, ServerRoute, ServerStateCookieOptions } from "hapi";
+import { Server, ServerOptions, ServerRoute, ServerStateCookieOptions } from "hapi";
 
 const options: ServerOptions = {
     port: 8000,
@@ -8,7 +8,8 @@ const options: ServerOptions = {
 const serverRoute: ServerRoute = {
     path: '/say-hello',
     method: 'GET',
-    handler(request, h) {
+    handler(_request, h) {
+        h.state('test', { test: true });
         return h.response('Hello').state('data', { firstVisit: false });
     }
 };

From 56e1ac7f793b80d3722daa730c2704ea2bac7208 Mon Sep 17 00:00:00 2001
From: Jose Santacruz <jose@kushkipagos.com>
Date: Fri, 13 Apr 2018 13:58:05 -0500
Subject: [PATCH 1269/1382] add namespace declaration to allow import from
 syntax (#24979)

---
 types/chai-string/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/chai-string/index.d.ts b/types/chai-string/index.d.ts
index bc990104be..fcf0fb9c23 100644
--- a/types/chai-string/index.d.ts
+++ b/types/chai-string/index.d.ts
@@ -49,4 +49,5 @@ declare global {
 }
 
 declare function chaiString(chai: any, utils: any): void;
+declare namespace chaiString { }
 export = chaiString;

From c914299740d594c75a400e9ab25eafec189c1bfe Mon Sep 17 00:00:00 2001
From: Westin Christensen <westinrc@ymail.com>
Date: Fri, 13 Apr 2018 12:12:02 -0700
Subject: [PATCH 1270/1382] Chart.js :: Added a missing type for beginAtZero
 for TickOptions. (#24920)

* Added a missing type for beginAtZero.

* Consolidated tick options into single interface, addressed PR comments.

* Added tslint disable for a depricated interface.
---
 types/chart.js/index.d.ts | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/types/chart.js/index.d.ts b/types/chart.js/index.d.ts
index 0ea854c7ba..2c5de28962 100644
--- a/types/chart.js/index.d.ts
+++ b/types/chart.js/index.d.ts
@@ -402,6 +402,10 @@ declare namespace Chart {
     interface TickOptions {
         autoSkip?: boolean;
         autoSkipPadding?: number;
+        backdropColor?: ChartColor;
+        backdropPaddingX?: number;
+        backdropPaddingY?: number;
+        beginAtZero?: boolean;
         callback?(value: any, index: any, values: any): string|number;
         display?: boolean;
         fontColor?: ChartColor;
@@ -409,14 +413,17 @@ declare namespace Chart {
         fontSize?: number;
         fontStyle?: string;
         labelOffset?: number;
+        max?: any;
         maxRotation?: number;
+        maxTicksLimit?: number;
+        min?: any;
         minRotation?: number;
         mirror?: boolean;
         padding?: number;
         reverse?: boolean;
-        min?: any;
-        max?: any;
+        showLabelBackdrop?: boolean;
     }
+
     interface AngleLineOptions {
         display?: boolean;
         color?: ChartColor;
@@ -431,26 +438,15 @@ declare namespace Chart {
         fontStyle?: string;
     }
 
-    interface TickOptions {
-        backdropColor?: ChartColor;
-        backdropPaddingX?: number;
-        backdropPaddingY?: number;
-        maxTicksLimit?: number;
-        showLabelBackdrop?: boolean;
-    }
     interface LinearTickOptions extends TickOptions {
-        beginAtZero?: boolean;
-        min?: number;
-        max?: number;
         maxTicksLimit?: number;
         stepSize?: number;
         suggestedMin?: number;
         suggestedMax?: number;
     }
 
+    // tslint:disable-next-line no-empty-interface
     interface LogarithmicTickOptions extends TickOptions {
-        min?: number;
-        max?: number;
     }
 
     type ChartColor = string | CanvasGradient | CanvasPattern | string[];

From 2ea7986e94a72cb12eb76345146ca4cf424ffa5e Mon Sep 17 00:00:00 2001
From: Dylan Scott <dylan.scott@gmail.com>
Date: Sat, 14 Apr 2018 12:08:48 -0700
Subject: [PATCH 1271/1382] express-winston: add types for dynamic level
 function (#24977)

---
 types/express-winston/express-winston-tests.ts | 4 ++--
 types/express-winston/index.d.ts               | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/types/express-winston/express-winston-tests.ts b/types/express-winston/express-winston-tests.ts
index b64bce0b3e..7fd41cfd5c 100644
--- a/types/express-winston/express-winston-tests.ts
+++ b/types/express-winston/express-winston-tests.ts
@@ -14,7 +14,7 @@ app.use(expressWinston.logger({
   expressFormat: true,
   ignoreRoute: (req, res) => true,
   ignoredRoutes: ['foo'],
-  level: 'level',
+  level: (req, res) => 'level',
   meta: true,
   metaField: 'metaField',
   msg: 'msg',
@@ -49,7 +49,7 @@ app.use(expressWinston.logger({
 app.use(expressWinston.errorLogger({
   baseMeta: { foo: 'foo' },
   dynamicMeta: (req, res, err) => ({ foo: 'bar' }),
-  level: 'level',
+  level: (req, res) => 'level',
   metaField: 'metaField',
   msg: 'msg',
   requestFilter: (req, prop) => true,
diff --git a/types/express-winston/index.d.ts b/types/express-winston/index.d.ts
index 920939abd6..6dac70c1b6 100644
--- a/types/express-winston/index.d.ts
+++ b/types/express-winston/index.d.ts
@@ -12,6 +12,7 @@ export interface MetaObject {
 }
 
 export type DynamicMetaFunction = (req: Request, res: Response, err: Error) => MetaObject | undefined;
+export type DynamicLevelFunction = (req: Request, res: Response, err: Error) => string;
 export type RequestFilter = (req: Request, propName: string) => boolean;
 export type ResponseFilter = (res: Response, propName: string) => boolean;
 export type RouteFilter = (req: Request, res: Response) => boolean;
@@ -25,7 +26,7 @@ export interface BaseLoggerOptions {
   expressFormat?: boolean;
   ignoreRoute?: RouteFilter;
   ignoredRoutes?: string[];
-  level?: string;
+  level?: string | DynamicLevelFunction;
   meta?: boolean;
   metaField?: string;
   msg?: string;
@@ -56,7 +57,7 @@ export function logger(options: LoggerOptions): Handler;
 export interface BaseErrorLoggerOptions {
   baseMeta?: MetaObject;
   dynamicMeta?: DynamicMetaFunction;
-  level?: string;
+  level?: string | DynamicLevelFunction;
   metaField?: string;
   msg?: string;
   requestFilter?: RequestFilter;

From ca3bf7f06d894d2bdc3e89a4eccaf463dfe68815 Mon Sep 17 00:00:00 2001
From: Frank Tan <tansongyang@gmail.com>
Date: Sat, 14 Apr 2018 12:09:19 -0700
Subject: [PATCH 1272/1382] Re-type `helper` from `@ember/component/helper`
 (#24986)

* Re-type `helper` from @ember/component/helper

Previous typing caused an error about using private name `Ember.Helper`
when generating declaration files.

Fortunately, the previous typings were incorrect anyway, so we can
remove the reference to `Ember.Helper` and thus fix the issue.

Relevant links:
* https://github.com/Microsoft/TypeScript/issues/5711
* https://github.com/Microsoft/TypeScript/issues/6307
* https://www.emberjs.com/api/ember/2.18/functions/@ember%2Fcomponent%2Fhelper/helper
* https://github.com/emberjs/ember.js/blob/v2.18.2/packages/ember-glimmer/lib/helper.ts#L120

* Add test for `helper` from @ember/component/helper
---
 types/ember/index.d.ts     | 15 ++++++++++++++-
 types/ember/test/helper.ts |  8 ++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/types/ember/index.d.ts b/types/ember/index.d.ts
index 740ff1308c..c825647e49 100755
--- a/types/ember/index.d.ts
+++ b/types/ember/index.d.ts
@@ -3442,7 +3442,20 @@ declare module '@ember/component/checkbox' {
 declare module '@ember/component/helper' {
     import Ember from 'ember';
     export default class Helper extends Ember.Helper { }
-    export const helper: typeof Ember.Helper.helper;
+    /**
+     * In many cases, the ceremony of a full `Helper` class is not required.
+     * The `helper` method create pure-function helpers without instances. For
+     * example:
+     * ```app/helpers/format-currency.js
+     * import { helper } from '@ember/component/helper';
+     * export default helper(function(params, hash) {
+     *   let cents = params[0];
+     *   let currency = hash.currency;
+     *   return `${currency}${cents * 0.01}`;
+     * });
+     * ```
+     */
+    export function helper(helperFn: (params: any[], hash?: any) => string): any;
 }
 
 declare module '@ember/component/text-area' {
diff --git a/types/ember/test/helper.ts b/types/ember/test/helper.ts
index efe3ce33d7..cba5709b10 100755
--- a/types/ember/test/helper.ts
+++ b/types/ember/test/helper.ts
@@ -25,3 +25,11 @@ const CurrentUserEmailHelper = Ember.Helper.extend({
             .get('email');
     },
 });
+
+import { helper } from '@ember/component/helper';
+
+function typedHelp(/*params, hash*/) {
+  return 'my type of help';
+}
+
+export default helper(typedHelp);

From 6a7bc3a968812b8e7ad8bbe494abb8fc1d6c3bc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Am=C3=A9lie=20Turgeon?= <amelie.turgeon@jive.com>
Date: Sat, 14 Apr 2018 12:09:32 -0700
Subject: [PATCH 1273/1382] Add 2 missing functions in office-js (#24924)

* Add 2 missing functions in office-js

* More details about API set of added functions
---
 types/office-js/index.d.ts | 35 ++++++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 3e8fa0d012..e08e0f1ee0 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -183,15 +183,15 @@ declare namespace Office {
         messageParent(messageObject: any): void;
         /**
          * Closes the UI container where the JavaScript is executing.
-         * 
+         *
          * Supported hosts: Outlook - Minimum requirement set: Mailbox 1.5
-         * 
+         *
          * The behavior of this method is specified by the following:
-         * 
+         *
          * Called from a UI-less command button: No effect. Any dialog opened by displayDialogAsync will remain open.
-         * 
+         *
          * Called from a taskpane: The taskpane will close. Any dialog opened by displayDialogAsync will also close. If the taskpane supports pinning and was pinned by the user, it will be un-pinned.
-         * 
+         *
          * Called from a module extension: No effect.
          */
         closeContainer(): void;
@@ -2102,6 +2102,19 @@ declare namespace Office {
          * Returns string values that match the named regular expression defined in the manifest XML file
          */
         getRegExMatchesByName(name: string): Array<string>;
+        /**
+        * Gets the entities found in the selected item that are currently selected
+        *
+        * [Api set: Mailbox 1.6]
+        */
+        getSelectedEntities(): Entities;
+        /**
+         * Returns string values in the currently selected message object that match the regular expressions defined in the manifest XML file and
+         * are selected in the current item
+         *
+         * [Api set: Mailbox 1.6]
+         */
+        getSelectedRegExMatches(): any;
     }
     export interface LocalClientTime {
         month: number;
@@ -2608,12 +2621,12 @@ declare namespace OfficeExtension {
     }
 
     export interface EmbeddedOptions {
-		sessionKey?: string,
-		container?: HTMLElement,
-		id?: string;
-		timeoutInMilliseconds?: number;
-		height?: string;
-		width?: string;
+        sessionKey?: string,
+        container?: HTMLElement,
+        id?: string;
+        timeoutInMilliseconds?: number;
+        height?: string;
+        width?: string;
     }
 
     class EmbeddedSession {

From cc77534189249acb499416429293c2db42d58b40 Mon Sep 17 00:00:00 2001
From: Claudia Hardman <cjhard@gmail.com>
Date: Sat, 14 Apr 2018 15:11:41 -0400
Subject: [PATCH 1274/1382] Fix tags property definition in Pickle interface
 (#24843)

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

diff --git a/types/cucumber/index.d.ts b/types/cucumber/index.d.ts
index d0fc9085fd..d93ad4c7b2 100644
--- a/types/cucumber/index.d.ts
+++ b/types/cucumber/index.d.ts
@@ -95,7 +95,7 @@ export namespace pickle {
         locations: Location[];
         name: string;
         steps: Step[];
-        tags: string[];
+        tags: Tag[];
     }
 
     interface Location {
@@ -117,6 +117,11 @@ export namespace pickle {
         location: Location;
         value: string;
     }
+
+    interface Tag {
+        name: string;
+        location: Location;
+    }
 }
 
 export type HookCode = (this: World, scenario: HookScenarioResult, callback?: CallbackStepDefinition) => void;

From 7132597ca2612a9f36acc344337bf7e3cd270246 Mon Sep 17 00:00:00 2001
From: Sehrope Sarkuni <sehrope@jackdb.com>
Date: Sat, 14 Apr 2018 15:11:54 -0400
Subject: [PATCH 1275/1382] Expand BufferList.append(...) to include BufferList
 and array params (#24844)

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

diff --git a/types/bl/index.d.ts b/types/bl/index.d.ts
index 5d34052b80..8ad01671fd 100644
--- a/types/bl/index.d.ts
+++ b/types/bl/index.d.ts
@@ -11,7 +11,7 @@ import stream = require('stream');
 declare class BufferList extends stream.Duplex {
     constructor(callback?: (err: Error, buffer: Buffer) => void);
 
-    append(buffer: Buffer): void;
+    append(buffer: Buffer | Buffer[] | BufferList | BufferList[] | string): void;
     get(index: number): number;
     slice(start?: number, end?: number): Buffer;
     copy(dest: Buffer, destStart?: number, srcStart?: number, srcEnd?: number): void;

From 6df4ebfc1af4f96c91f3f2147c9a2071d573a194 Mon Sep 17 00:00:00 2001
From: "howtimeflies.io developers" <dev@howtimeflies.io>
Date: Sun, 15 Apr 2018 03:12:17 +0800
Subject: [PATCH 1276/1382] [highcharts] Add support for word cloud chart and
 adding/firing events dynamically (#24824)

* Add the missing typings required by @howtimeflies/ngx-highcharts

* Add tests for the new added typings.
---
 types/highcharts/index.d.ts    | 121 +++++++++++++++++++++++++++++++++
 types/highcharts/test/index.ts |  27 ++++++++
 2 files changed, 148 insertions(+)

diff --git a/types/highcharts/index.d.ts b/types/highcharts/index.d.ts
index cf73a08e68..1434999411 100644
--- a/types/highcharts/index.d.ts
+++ b/types/highcharts/index.d.ts
@@ -5242,6 +5242,96 @@ declare namespace Highcharts {
         upColor?: Color;
     }
 
+    interface WordCloudChart extends BarChart {
+        /**
+         * For some series, there is a limit that shuts down initial animation by default when the total number of points
+         * in the chart is too high. For example, for a column chart and its derivatives, animation doesn't run if there
+         * is more than 250 points totally. To disable this cap, set animationLimit to Infinity.
+         * @default undefined
+         * @since 6.0.0
+         */
+        animationLimit?: number;
+        /**
+         * By default, series are exposed to screen readers as regions. By enabling this option, the series element itself
+         * will be exposed in the same way as the data points. This is useful if the series is not used as a grouping entity
+         * in the chart, but you still want to attach a description to the series.
+         * Requires the Accessibility module.
+         * @default undefined
+         * @since 5.0.12
+         */
+        exposeElementToA11y?: boolean;
+        /**
+         * This option decides which algorithm is used for placement, and rotation of a word. The choice of algorith is
+         * therefore a crucial part of the resulting layout of the wordcloud. It is possible for users to add their own
+         * custom placement strategies for use in word cloud. Read more about it in our documentation
+         * @default center
+         * @since 6.0.0
+         */
+        placementStrategy?: string;
+        /**
+         * Same as accessibility.pointDescriptionFormatter, but for an individual series. Overrides the chart wide
+         * configuration.
+         * @default undefined
+         * @since 5.0.12
+         */
+        pointDescriptionFormatter?: () => string;
+        /**
+         * Rotation options for the words in the wordcloud.
+         * @since 6.0.0
+         */
+        rotation?: {
+            /**
+             * The smallest degree of rotation for a
+             * @default 0
+             * @since 6.0.0
+             */
+            from?: number;
+            /**
+             * The largest degree of rotation for a word.
+             * @default 90
+             * @since 6.0.0
+             */
+            to?: number;
+            /**
+             * The number of possible orientations for a word, within the range of rotation.from and rotation.to.
+             * @default 2
+             * @since 6.0.0
+             */
+            orientations?: number;
+        };
+
+        /**
+         * If set to True, the accessibility module will skip past the points in this series for keyboard navigation.
+         * @default undefined
+         * @since 5.0.12
+         */
+        skipKeyboardNavigation?: boolean;
+        /**
+         * Spiral used for placing a word after the inital position experienced a collision with either another word or the
+         * borders. It is possible for users to add their own custom spiralling algorithms for use in word cloud. Read more
+         * about it in our documentation
+         * @default rectangular
+         * @since 6.0.0
+         */
+        spiral?: string;
+        /**
+         * CSS styles for the words.
+         * @since 6.0.0
+         */
+        style?: {
+            /**
+             * @default sans-serif
+             * @since 6.0.0
+             */
+            fontFamily?: string;
+            /**
+             * @default 900
+             * @since 6.0.0
+             */
+            fontWeight?: number | string;
+        };
+    }
+
     /**
      * The plotOptions is a wrapper object for config objects for each series type. The config objects for each series can
      * also be overridden for each series item as given in the series array.
@@ -5423,6 +5513,7 @@ declare namespace Highcharts {
     interface SplineChartSeriesOptions extends IndividualSeriesOptions, SplineChart { }
     interface TreeMapChartSeriesOptions extends IndividualSeriesOptions, TreeMapChart { }
     interface WaterFallChartSeriesOptions extends IndividualSeriesOptions, WaterFallChart { }
+    interface WordCloudChartSeriesOptions extends IndividualSeriesOptions, WordCloudChart { }
 
     interface DataPoint {
         /**
@@ -6711,6 +6802,36 @@ declare namespace Highcharts {
         map(array: any[], fn: Function): any[];
 
         wrap(prototype: any, type: string, cb: (proceed: Function, ...args: any[]) => void): void;
+
+        /**
+         * Add an event listener.
+         *
+         * @see {@link https://api.highcharts.com/class-reference/Highcharts#addEvent}
+         * @see {@link https://www.highcharts.com/docs/extending-highcharts/extending-highcharts}
+         *
+         * @param element The element or object to add a listener to. It can be a HTMLDOMElement, an Highcharts.SVGElement or any other object.
+         * @param type    The event type.
+         * @param cb      The function callback to execute when the event is fired.
+         * @returns A callback function to remove the added event.
+         */
+        addEvent(element: HTMLElement | ElementObject | object,
+                 type: string,
+                 cb: (evt: Event) => void): () => void;
+
+        /**
+         * Fire an event that was registered with
+         *
+         * @see {@link https://api.highcharts.com/class-reference/Highcharts#fireEvent}
+         *
+         * @param element         The element or object to add a listener to. It can be a HTMLDOMElement, an Highcharts.SVGElement or any other object.
+         * @param type            The event type.
+         * @param eventArguments  Custom event arguments that are passed on as an argument to the event handler.
+         * @param defaultFunction The default function to execute if the other listeners haven't returned false.
+         */
+        fireEvent(element: HTMLElement | ElementObject | object,
+                  type: string,
+                  eventArguments?: any,
+                  defaultFunction?: () => void): void;
     }
 
     /**
diff --git a/types/highcharts/test/index.ts b/types/highcharts/test/index.ts
index c4ea1bd7a8..310886b585 100644
--- a/types/highcharts/test/index.ts
+++ b/types/highcharts/test/index.ts
@@ -2789,3 +2789,30 @@ function test_TitleUpdate() {
         }
     });
 }
+
+function test_AddAndFireEvent() {
+    const chart = $('#container').highcharts();
+    const type = 'drilldown';
+    const evt = Highcharts.addEvent(chart, type, it => {});
+    Highcharts.fireEvent(chart, type);
+}
+
+function test_WordCloud() {
+    const allDefaults: Highcharts.WordCloudChartSeriesOptions = {};
+
+    // partial wordcloud demo
+    const series: Highcharts.WordCloudChartSeriesOptions = {
+        type: 'wordcloud',
+        data: [],
+        name: 'Occurrences',
+        rotation: {
+            to: 0
+        },
+        tooltip: {
+            headerFormat: null,
+            pointFormatter() {
+                return `<strong>${this.name}</strong>: Occurrence ${this.weight}`;
+            }
+        }
+    };
+}

From dda14dffe3654e8d75be54c5d1cc3dc24d8da569 Mon Sep 17 00:00:00 2001
From: Rockson <fabio.raffa96@gmail.com>
Date: Sat, 14 Apr 2018 21:12:50 +0200
Subject: [PATCH 1277/1382] Removed Partial from onSubmit values (#24816)

see iss: https://github.com/DefinitelyTyped/DefinitelyTyped/issues/24376
---
 types/redux-form/lib/reduxForm.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/redux-form/lib/reduxForm.d.ts b/types/redux-form/lib/reduxForm.d.ts
index 2c6dd40c5d..5cfcdb842c 100644
--- a/types/redux-form/lib/reduxForm.d.ts
+++ b/types/redux-form/lib/reduxForm.d.ts
@@ -18,7 +18,7 @@ import {
 } from "../index";
 
 export type FormSubmitHandler<FormData = {}, P = {}> =
-    (values: Partial<FormData>, dispatch: Dispatch<any>, props: P) => void | FormErrors<FormData> | Promise<any>;
+    (values: FormData, dispatch: Dispatch<any>, props: P) => void | FormErrors<FormData> | Promise<any>;
 
 export interface SubmitHandler<FormData = {}, P = {}> {
     (

From b4ef220eace86a8aabb2837a7351fc8ea5ef8611 Mon Sep 17 00:00:00 2001
From: Vincent Langlet <VincentLanglet@users.noreply.github.com>
Date: Sat, 14 Apr 2018 21:13:47 +0200
Subject: [PATCH 1278/1382] Add react-native-keyboard-spacer types (#24993)

---
 types/react-native-keyboard-spacer/index.d.ts | 16 +++++++++++++
 .../react-native-keyboard-spacer-tests.tsx    |  6 +++++
 .../tsconfig.json                             | 24 +++++++++++++++++++
 .../react-native-keyboard-spacer/tslint.json  |  1 +
 4 files changed, 47 insertions(+)
 create mode 100644 types/react-native-keyboard-spacer/index.d.ts
 create mode 100644 types/react-native-keyboard-spacer/react-native-keyboard-spacer-tests.tsx
 create mode 100644 types/react-native-keyboard-spacer/tsconfig.json
 create mode 100644 types/react-native-keyboard-spacer/tslint.json

diff --git a/types/react-native-keyboard-spacer/index.d.ts b/types/react-native-keyboard-spacer/index.d.ts
new file mode 100644
index 0000000000..0c7ec24262
--- /dev/null
+++ b/types/react-native-keyboard-spacer/index.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for react-native-keyboard-spacer 0.4
+// Project: https://github.com/Andr3wHur5t/react-native-keyboard-spacer#readme
+// Definitions by: Vincent Langlet <https://github.com/VincentLanglet>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+import * as React from 'react';
+import * as ReactNative from 'react-native';
+
+export interface KeyboardSpacerProps {
+    topSpacing?: number;
+    onToggle?: (keyboardIsOpen: boolean, keyboardSpace: number) => void;
+    style?: ReactNative.StyleProp<ReactNative.ViewStyle>;
+}
+
+export default class KeyboardSpacer extends React.Component<KeyboardSpacerProps, any> { }
diff --git a/types/react-native-keyboard-spacer/react-native-keyboard-spacer-tests.tsx b/types/react-native-keyboard-spacer/react-native-keyboard-spacer-tests.tsx
new file mode 100644
index 0000000000..7deb9798ef
--- /dev/null
+++ b/types/react-native-keyboard-spacer/react-native-keyboard-spacer-tests.tsx
@@ -0,0 +1,6 @@
+import * as React from 'react';
+import KeyboardSpacer from 'react-native-keyboard-spacer';
+
+() => {
+  <KeyboardSpacer />;
+};
diff --git a/types/react-native-keyboard-spacer/tsconfig.json b/types/react-native-keyboard-spacer/tsconfig.json
new file mode 100644
index 0000000000..04110630ce
--- /dev/null
+++ b/types/react-native-keyboard-spacer/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react"
+    },
+    "files": [
+        "index.d.ts",
+        "react-native-keyboard-spacer-tests.tsx"
+    ]
+}
diff --git a/types/react-native-keyboard-spacer/tslint.json b/types/react-native-keyboard-spacer/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-native-keyboard-spacer/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From ee7e9794e0b59a9c1d54052b1603a12f94ccd166 Mon Sep 17 00:00:00 2001
From: denisname <denisname@users.noreply.github.com>
Date: Sat, 14 Apr 2018 21:16:51 +0200
Subject: [PATCH 1279/1382] Extract from topojson (#24992)

---
 types/topojson-client/index.d.ts              |  43 ++++
 .../topojson-client-tests.ts}                 |  23 ++-
 types/topojson-client/tsconfig.json           |  23 +++
 types/topojson-client/tslint.json             |   1 +
 types/topojson-simplify/index.d.ts            |  37 ++++
 .../topojson-simplify-tests.ts}               |  52 ++---
 types/topojson-simplify/tsconfig.json         |  24 +++
 types/topojson-simplify/tslint.json           |   1 +
 types/topojson-specification/index.d.ts       | 118 +++++++++++
 .../topojson-specification-tests.ts}          |  22 +--
 types/topojson-specification/tsconfig.json    |  23 +++
 types/topojson-specification/tslint.json      |   1 +
 types/topojson/index.d.ts                     | 186 ++----------------
 types/topojson/test/server-tests.ts           |   2 +-
 types/topojson/topojson-tests.ts              |   7 +-
 types/topojson/tsconfig.json                  |   5 +-
 16 files changed, 345 insertions(+), 223 deletions(-)
 create mode 100644 types/topojson-client/index.d.ts
 rename types/{topojson/test/client-tests.ts => topojson-client/topojson-client-tests.ts} (80%)
 create mode 100644 types/topojson-client/tsconfig.json
 create mode 100644 types/topojson-client/tslint.json
 create mode 100644 types/topojson-simplify/index.d.ts
 rename types/{topojson/test/simplify-tests.ts => topojson-simplify/topojson-simplify-tests.ts} (65%)
 create mode 100644 types/topojson-simplify/tsconfig.json
 create mode 100644 types/topojson-simplify/tslint.json
 create mode 100644 types/topojson-specification/index.d.ts
 rename types/{topojson/test/specification-tests.ts => topojson-specification/topojson-specification-tests.ts} (87%)
 create mode 100644 types/topojson-specification/tsconfig.json
 create mode 100644 types/topojson-specification/tslint.json

diff --git a/types/topojson-client/index.d.ts b/types/topojson-client/index.d.ts
new file mode 100644
index 0000000000..62b65a96f4
--- /dev/null
+++ b/types/topojson-client/index.d.ts
@@ -0,0 +1,43 @@
+// Type definitions for topojson-client 3.0
+// Project: https://github.com/topojson/topojson-client
+// Definitions by: denisname <https://github.com/denisname>
+//                 Ricardo Mello <https://github.com/ricardo-mello>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.5
+
+import * as GeoJSON from "geojson";
+import {
+    GeometryCollection, GeometryObject, LineString,
+    MultiLineString, MultiPoint, MultiPolygon,
+    Objects, Point, Polygon, Topology, Transform
+} from "topojson-specification";
+
+export type Transformer = (point: number[], index?: boolean) => number[];
+
+export function feature<P = GeoJSON.GeoJsonProperties>(topology: Topology, object: Point<P>): GeoJSON.Feature<GeoJSON.Point, P>;
+export function feature<P = GeoJSON.GeoJsonProperties>(topology: Topology, object: MultiPoint<P>): GeoJSON.Feature<GeoJSON.MultiPoint, P>;
+export function feature<P = GeoJSON.GeoJsonProperties>(topology: Topology, object: LineString<P>): GeoJSON.Feature<GeoJSON.LineString, P>;
+export function feature<P = GeoJSON.GeoJsonProperties>(topology: Topology, object: MultiLineString<P>): GeoJSON.Feature<GeoJSON.MultiLineString, P>;
+export function feature<P = GeoJSON.GeoJsonProperties>(topology: Topology, object: Polygon<P>): GeoJSON.Feature<GeoJSON.Polygon, P>;
+export function feature<P = GeoJSON.GeoJsonProperties>(topology: Topology, object: MultiPolygon<P>): GeoJSON.Feature<GeoJSON.MultiPolygon, P>;
+export function feature<P = GeoJSON.GeoJsonProperties>(topology: Topology, object: GeometryCollection<P>): GeoJSON.FeatureCollection<GeoJSON.GeometryObject, P>;
+export function feature<P = GeoJSON.GeoJsonProperties>(topology: Topology, object: GeometryObject<P>)
+    : GeoJSON.Feature<GeoJSON.GeometryObject, P> | GeoJSON.FeatureCollection<GeoJSON.GeometryObject, P>;
+
+export function merge(topology: Topology, objects: Array<Polygon | MultiPolygon>): GeoJSON.MultiPolygon;
+
+export function mergeArcs(topology: Topology, objects: Array<Polygon | MultiPolygon>): MultiPolygon;
+
+export function mesh(topology: Topology, obj?: GeometryObject, filter?: (a: GeometryObject, b: GeometryObject) => boolean): GeoJSON.MultiLineString;
+
+export function meshArcs(topology: Topology, obj?: GeometryObject, filter?: (a: GeometryObject, b: GeometryObject) => boolean): MultiLineString;
+
+export function neighbors(objects: GeometryObject[]): number[][];
+
+export function bbox(topology: Topology): GeoJSON.BBox;
+
+export function quantize<T extends Objects>(topology: Topology<T>, transform: Transform | number): Topology<T>;
+
+export function transform(transform: Transform | null): Transformer;
+
+export function untransform(transform: Transform | null): Transformer;
diff --git a/types/topojson/test/client-tests.ts b/types/topojson-client/topojson-client-tests.ts
similarity index 80%
rename from types/topojson/test/client-tests.ts
rename to types/topojson-client/topojson-client-tests.ts
index 2e21e2b665..0d27c34cc1 100644
--- a/types/topojson/test/client-tests.ts
+++ b/types/topojson-client/topojson-client-tests.ts
@@ -1,9 +1,20 @@
-// Tests for: https://github.com/topojson/topojson-client
+import * as topojson from "topojson-client";
+import { UsAtlas, WorldAtlas } from "topojson";
+
+declare let us: UsAtlas;
+declare let world: WorldAtlas;
+
+interface UsAtlasObjects extends TopoJSON.Objects {
+    counties: {type: "GeometryCollection", geometries: Array<TopoJSON.Polygon | TopoJSON.MultiPolygon>};
+    states: {type: "GeometryCollection", geometries: Array<TopoJSON.Polygon | TopoJSON.MultiPolygon>};
+    nation: TopoJSON.GeometryCollection;
+}
 
 let geoMP: GeoJSON.MultiPolygon;
 let geoMLS: GeoJSON.MultiLineString;
-let topoMP: topojson.MultiPolygon;
-let topoMLS: topojson.MultiLineString;
+let topoMP: TopoJSON.MultiPolygon;
+let topoMLS: TopoJSON.MultiLineString;
+let newUs: TopoJSON.Topology<UsAtlasObjects>;
 let bbox: GeoJSON.BBox;
 let transformer: topojson.Transformer;
 let color: string;
@@ -14,7 +25,7 @@ interface TestProp {
     size: number;
 }
 
-const selectedGeometries: Array<topojson.Polygon | topojson.MultiPolygon> =
+const selectedGeometries: Array<TopoJSON.Polygon | TopoJSON.MultiPolygon> =
     us.objects.states.geometries.filter((g) => ["be", 2, undefined].indexOf(g.id) >= 0);
 
 const topoWithProp = {
@@ -49,7 +60,7 @@ const featureCollection: GeoJSON.FeatureCollection<GeoJSON.GeometryObject> =
     topojson.feature(us, us.objects.counties);
 
 const featureObject: GeoJSON.Feature<GeoJSON.GeometryObject> | GeoJSON.FeatureCollection<GeoJSON.GeometryObject, {}> =
-    topojson.feature(topoWithProp, topoWithProp.objects.foo as topojson.GeometryObject);
+    topojson.feature(topoWithProp, topoWithProp.objects.foo as TopoJSON.GeometryObject);
 
 const propColor = topojson.feature(topoWithProp, topoWithProp.objects.foo).properties;
 color = propColor.color;
@@ -79,7 +90,7 @@ topoMLS = topojson.meshArcs(us, us.objects.states, (a, b) => a !== b);
 const n: number[][] = topojson.neighbors(world.objects.countries.geometries);
 
 // Transforms
-const usTransform: topojson.Transform = us.transform;
+const usTransform: TopoJSON.Transform = us.transform;
 
 bbox = topojson.bbox(us);
 bbox = topojson.bbox({type: "Topology", objects: {}, arcs: []});
diff --git a/types/topojson-client/tsconfig.json b/types/topojson-client/tsconfig.json
new file mode 100644
index 0000000000..61837d76ec
--- /dev/null
+++ b/types/topojson-client/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "topojson-client-tests.ts"
+    ]
+}
diff --git a/types/topojson-client/tslint.json b/types/topojson-client/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/topojson-client/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/topojson-simplify/index.d.ts b/types/topojson-simplify/index.d.ts
new file mode 100644
index 0000000000..0927e5d7e2
--- /dev/null
+++ b/types/topojson-simplify/index.d.ts
@@ -0,0 +1,37 @@
+// Type definitions for topojson-simplify 3.0
+// Project: https://github.com/topojson/topojson-simplify
+// Definitions by: denisname <https://github.com/denisname>
+//                 Ricardo Mello <https://github.com/ricardo-mello>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.5
+
+import * as GeoJSON from "geojson";
+import { Objects, OrNull, Topology } from "topojson-specification";
+
+export type Triangle = [[number, number], [number, number], [number, number]];
+export type TriangleWeighter = (triangle: Triangle) => number;
+export type Ring = Array<[number, number]>;
+export type RingWeighter = (triangle: Ring) => number;
+export type Filter = (ring: Ring, interior: boolean) => boolean;
+
+export function presimplify<T extends Objects>(topology: Topology<T>, weight?: TriangleWeighter): Topology<T>;
+
+export function simplify<T extends Objects>(topology: Topology<T>, minWeight?: number): Topology<T>;
+
+export function quantile(topology: Topology, p: number): number;
+
+export function filter<K extends Objects>(topology: Topology<K>, filter: Filter): Topology<OrNull<K>>;
+
+export function filterAttached(topology: Topology): Filter;
+
+export function filterAttachedWeight(topology: Topology, minWeight?: number, weight?: RingWeighter): Filter;
+
+export function filterWeight(topology: Topology, minWeight?: number, weight?: RingWeighter): Filter;
+
+export function planarRingArea(ring: Ring): number;
+
+export function planarTriangleArea(triangle: Triangle): number;
+
+export function sphericalRingArea(ring: Ring, interior: boolean): number;
+
+export function sphericalTriangleArea(triangle: Triangle): number;
diff --git a/types/topojson/test/simplify-tests.ts b/types/topojson-simplify/topojson-simplify-tests.ts
similarity index 65%
rename from types/topojson/test/simplify-tests.ts
rename to types/topojson-simplify/topojson-simplify-tests.ts
index 6347466236..ce0ae8e816 100644
--- a/types/topojson/test/simplify-tests.ts
+++ b/types/topojson-simplify/topojson-simplify-tests.ts
@@ -1,24 +1,28 @@
-// Tests for: https://github.com/topojson/topojson-simplify
+import * as topojson from "topojson-simplify";
+import { UsAtlas, WorldAtlas } from "topojson";
 
-interface UsAtlasObjects extends topojson.Objects {
-    counties: {type: "GeometryCollection", geometries: Array<topojson.Polygon | topojson.MultiPolygon>};
-    states: {type: "GeometryCollection", geometries: Array<topojson.Polygon | topojson.MultiPolygon>};
-    nation: topojson.GeometryCollection;
+declare let us: UsAtlas;
+declare let world: WorldAtlas;
+
+interface UsAtlasObjects extends TopoJSON.Objects {
+    counties: {type: "GeometryCollection", geometries: Array<TopoJSON.Polygon | TopoJSON.MultiPolygon>};
+    states: {type: "GeometryCollection", geometries: Array<TopoJSON.Polygon | TopoJSON.MultiPolygon>};
+    nation: TopoJSON.GeometryCollection;
 }
 
-interface UsEmpty extends topojson.Objects {
-    counties: topojson.NullObject;
-    states: topojson.NullObject;
-    nation: topojson.NullObject;
+interface UsEmpty extends TopoJSON.Objects {
+    counties: TopoJSON.NullObject;
+    states: TopoJSON.NullObject;
+    nation: TopoJSON.NullObject;
 }
 
-let aTopology: topojson.Topology;
-let presimplifiedUs: topojson.Topology<UsAtlasObjects>;
-let newUs: topojson.Topology<UsAtlasObjects>;
-let emptyUs: topojson.Topology<UsEmpty>;
-let geomCollection: topojson.GeometryCollection;
-let geomCollectionOrNull: topojson.GeometryCollection | topojson.NullObject;
-let aNullObject: topojson.NullObject;
+let aTopology: TopoJSON.Topology;
+let presimplifiedUs: TopoJSON.Topology<UsAtlasObjects>;
+let newUs: TopoJSON.Topology<UsAtlasObjects>;
+let emptyUs: TopoJSON.Topology<UsEmpty>;
+let geomCollection: TopoJSON.GeometryCollection;
+let geomCollectionOrNull: TopoJSON.GeometryCollection | TopoJSON.NullObject;
+let aNullObject: TopoJSON.NullObject;
 let filter: topojson.Filter;
 
 presimplifiedUs = topojson.presimplify(us);
@@ -30,7 +34,7 @@ geomCollection = topojson.presimplify(us).objects.counties;
 geomCollection = topojson.presimplify(us).objects.nation;
 geomCollection = topojson.presimplify(us).objects.states;
 
-let minWeight = topojson.quantile(presimplifiedUs, 0.5);
+const minWeight = topojson.quantile(presimplifiedUs, 0.5);
 
 newUs = topojson.simplify(presimplifiedUs);
 newUs = topojson.simplify(presimplifiedUs, 1.23);
@@ -55,12 +59,12 @@ filter = topojson.filterWeight(us, 0.5, topojson.planarRingArea);
 filter = topojson.filterWeight(us, 0.5, (points: Array<[number, number]>) => 1.5);
 
 aTopology = topojson.filter(us, filter);
-newUs = topojson.filter(us, (ring: topojson.Ring, interior: boolean) => true) as topojson.UsAtlas;
-emptyUs = topojson.filter(us, () => false) as topojson.Topology<UsEmpty>;
+newUs = topojson.filter(us, (ring: topojson.Ring, interior: boolean) => true) as UsAtlas;
+emptyUs = topojson.filter(us, () => false) as TopoJSON.Topology<UsEmpty>;
 
 geomCollectionOrNull = topojson.filter(us, () => Math.random() > 0.9).objects.nation;
-aNullObject = topojson.filter(us, () => false).objects.nation as topojson.NullObject;
-geomCollection = topojson.filter(us, () => true).objects.nation as topojson.GeometryCollection;
+aNullObject = topojson.filter(us, () => false).objects.nation as TopoJSON.NullObject;
+geomCollection = topojson.filter(us, () => true).objects.nation as TopoJSON.GeometryCollection;
 
 // Geometry
 
@@ -72,14 +76,14 @@ area = topojson.sphericalTriangleArea([[0, 0], [0, 90], [90, 180]]);
 
 // Fails
 
-interface MyAtlas extends topojson.Topology {
+interface MyAtlas extends TopoJSON.Topology {
     objects: {
-        obj: topojson.GeometryCollection;
+        obj: TopoJSON.GeometryCollection;
     };
     more: "hello";
 }
 
-let myAtlas: MyAtlas = null as any; // shortcut...
+declare let myAtlas: MyAtlas;
 console.log(myAtlas.more);
 
 let s: string;
diff --git a/types/topojson-simplify/tsconfig.json b/types/topojson-simplify/tsconfig.json
new file mode 100644
index 0000000000..43534c0207
--- /dev/null
+++ b/types/topojson-simplify/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "topojson-simplify-tests.ts"
+    ]
+}
diff --git a/types/topojson-simplify/tslint.json b/types/topojson-simplify/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/topojson-simplify/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/topojson-specification/index.d.ts b/types/topojson-specification/index.d.ts
new file mode 100644
index 0000000000..764fbd6bae
--- /dev/null
+++ b/types/topojson-specification/index.d.ts
@@ -0,0 +1,118 @@
+// Type definitions for topojson-specification 1.0
+// Project: https://github.com/topojson/topojson-specification
+// Definitions by: denisname <https://github.com/denisname>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+// Last revision validated against: commit 90ed973 (2017-08-02)
+
+import * as GeoJSON from "geojson";
+
+export as namespace TopoJSON;
+
+// ---------------------------------------------------------------
+// TopoJSON Format Specification
+// ---------------------------------------------------------------
+
+// See: https://github.com/topojson/topojson-specification/
+
+// 2. TopoJSON Objects
+export interface TopoJSON {
+    type: "Topology" | GeoJSON.GeoJsonGeometryTypes | null;
+    bbox?: GeoJSON.BBox;
+}
+
+// 2.1. Topology Objects
+export interface Topology<T extends Objects<Properties> = Objects<Properties>> extends TopoJSON {
+    type: "Topology";
+    objects: T;
+    arcs: Arc[];
+    transform?: Transform;
+}
+
+// 2.1.1. Positions
+export type Positions = number[]; // at least two elements
+
+// 2.1.2. Transforms
+export interface Transform {
+    scale: [number, number];
+    translate: [number, number];
+}
+
+// 2.1.3. Arcs
+export type Arc = Positions[]; // at least two elements
+
+// 2.1.4. Arc Indexes
+export type ArcIndexes = number[];
+
+// 2.1.5. Objects
+export type Properties = GeoJSON.GeoJsonProperties;
+
+export interface Objects<P extends Properties = {}> {
+    [key: string]: GeometryObject<P>;
+}
+
+// 2.2. Geometry Objects
+export interface GeometryObjectA<P extends Properties = {}> extends TopoJSON {
+    type: GeoJSON.GeoJsonGeometryTypes | null;
+    id?: number | string;
+    properties?: P;
+}
+
+export type GeometryObject<P extends Properties = {}> =
+    Point<P> | MultiPoint<P> |
+    LineString<P> | MultiLineString<P> |
+    Polygon<P> | MultiPolygon<P> |
+    GeometryCollection<P> |
+    NullObject;
+
+// 2.2.1. Point
+export interface Point<P extends Properties = {}> extends GeometryObjectA<P> {
+    type: "Point";
+    coordinates: Positions;
+}
+
+// 2.2.2. MultiPoint
+export interface MultiPoint<P extends Properties = {}> extends GeometryObjectA<P> {
+    type: "MultiPoint";
+    coordinates: Positions[];
+}
+
+// 2.2.3. LineString
+export interface LineString<P extends Properties = {}> extends GeometryObjectA<P> {
+    type: "LineString";
+    arcs: ArcIndexes;
+}
+
+// 2.2.4. MultiLineString
+export interface MultiLineString<P extends Properties = {}> extends GeometryObjectA<P> {
+    type: "MultiLineString";
+    arcs: ArcIndexes[];
+}
+
+// 2.2.5. Polygon
+export interface Polygon<P extends Properties = {}> extends GeometryObjectA<P> {
+    type: "Polygon";
+    arcs: ArcIndexes[];
+}
+
+// 2.2.6. MultiPolygon
+export interface MultiPolygon<P extends Properties = {}> extends GeometryObjectA<P> {
+    type: "MultiPolygon";
+    arcs: ArcIndexes[][];
+}
+
+// 2.2.7. Geometry Collection
+export interface GeometryCollection<P extends Properties = {}> extends GeometryObjectA<P> {
+    type: "GeometryCollection";
+    geometries: Array<GeometryObject<P>>;
+}
+
+// More
+export interface NullObject extends GeometryObjectA {
+    type: null;
+}
+
+export type OrNull<T extends Objects> = {
+    [P in keyof T]: T[P] | NullObject;
+};
diff --git a/types/topojson/test/specification-tests.ts b/types/topojson-specification/topojson-specification-tests.ts
similarity index 87%
rename from types/topojson/test/specification-tests.ts
rename to types/topojson-specification/topojson-specification-tests.ts
index ccb4275468..c86ed57b3f 100644
--- a/types/topojson/test/specification-tests.ts
+++ b/types/topojson-specification/topojson-specification-tests.ts
@@ -1,38 +1,36 @@
-// Tests for: https://github.com/topojson/topojson-specification
-
 // Geometry Objects
 
-const point: topojson.Point = {
+const point: TopoJSON.Point = {
     type: "Point",
     coordinates: [0, 0],
 };
 
-const multiPoint: topojson.MultiPoint = {
+const multiPoint: TopoJSON.MultiPoint = {
     type: "MultiPoint",
     coordinates: [[0, 0]],
 };
 
-const lineString: topojson.LineString = {
+const lineString: TopoJSON.LineString = {
     type: "LineString",
     arcs: [0],
 };
 
-const multiLineString: topojson.MultiLineString = {
+const multiLineString: TopoJSON.MultiLineString = {
     type: "MultiLineString",
     arcs: [[3], [4]],
 };
 
-const polygon: topojson.Polygon = {
+const polygon: TopoJSON.Polygon = {
     type: "Polygon",
     arcs: [[0]],
 };
 
-const multiPolygon: topojson.MultiPolygon = {
+const multiPolygon: TopoJSON.MultiPolygon = {
     type: "MultiPolygon",
     arcs: [[[0]]],
 };
 
-const geometryCollection: topojson.GeometryCollection = {
+const geometryCollection: TopoJSON.GeometryCollection = {
     type: "GeometryCollection",
     geometries: [
         {type: "Polygon", arcs: [[0]]},
@@ -43,7 +41,7 @@ const geometryCollection: topojson.GeometryCollection = {
     ],
 };
 
-const nullObject: topojson.NullObject = {
+const nullObject: TopoJSON.NullObject = {
     type: null,
 };
 
@@ -54,7 +52,7 @@ interface TestProp {
     size: number;
 }
 
-const pointWithProp: topojson.Point<TestProp> = {
+const pointWithProp: TopoJSON.Point<TestProp> = {
     type: "Point",
     coordinates: [0, 0],
     properties: {color: "orange", size: 42},
@@ -65,7 +63,7 @@ const nbr: number = pointWithProp.properties!.size;
 
 // Topology
 
-let topology: topojson.Topology;
+let topology: TopoJSON.Topology;
 
 topology = {
     type: "Topology",
diff --git a/types/topojson-specification/tsconfig.json b/types/topojson-specification/tsconfig.json
new file mode 100644
index 0000000000..240c420906
--- /dev/null
+++ b/types/topojson-specification/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "topojson-specification-tests.ts"
+    ]
+}
diff --git a/types/topojson-specification/tslint.json b/types/topojson-specification/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/topojson-specification/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/topojson/index.d.ts b/types/topojson/index.d.ts
index 6330f23b1c..75f1853f39 100644
--- a/types/topojson/index.d.ts
+++ b/types/topojson/index.d.ts
@@ -7,211 +7,51 @@
 // TypeScript Version: 2.5
 
 import * as GeoJSON from "geojson";
+import * as TopoJSON from "topojson-specification";
 
 export as namespace topojson;
 
-// ---------------------------------------------------------------
-// TopoJSON Format Specification
-// ---------------------------------------------------------------
-
-// See: https://github.com/topojson/topojson-specification/
-
-// 2. TopoJSON Objects
-export interface TopoJSON {
-    type: "Topology" | GeoJSON.GeoJsonGeometryTypes | null;
-    bbox?: GeoJSON.BBox;
-}
-
-// 2.1. Topology Objects
-export interface Topology<T extends Objects<Properties> = Objects<Properties>> extends TopoJSON {
-    type: "Topology";
-    objects: T;
-    arcs: Arc[];
-    transform?: Transform;
-}
-
-// 2.1.1. Positions
-export type Positions = number[]; // at least two elements
-
-// 2.1.2. Transforms
-export interface Transform {
-    scale: [number, number];
-    translate: [number, number];
-}
-
-// 2.1.3. Arcs
-export type Arc = Positions[]; // at least two elements
-
-// 2.1.4. Arc Indexes
-export type ArcIndexes = number[];
-
-// 2.1.5. Objects
-export type Properties = GeoJSON.GeoJsonProperties;
-
-export interface Objects<P extends Properties = {}> {
-    [key: string]: GeometryObject<P>;
-}
-
-// 2.2. Geometry Objects
-export interface GeometryObjectA<P extends Properties = {}> extends TopoJSON {
-    type: GeoJSON.GeoJsonGeometryTypes | null;
-    id?: number | string;
-    properties?: P;
-}
-
-export type GeometryObject<P extends Properties = {}> =
-    Point<P> | MultiPoint<P> |
-    LineString<P> | MultiLineString<P> |
-    Polygon<P> | MultiPolygon<P> |
-    GeometryCollection<P> |
-    NullObject;
-
-// 2.2.1. Point
-export interface Point<P extends Properties = {}> extends GeometryObjectA<P> {
-    type: "Point";
-    coordinates: Positions;
-}
-
-// 2.2.2. MultiPoint
-export interface MultiPoint<P extends Properties = {}> extends GeometryObjectA<P> {
-    type: "MultiPoint";
-    coordinates: Positions[];
-}
-
-// 2.2.3. LineString
-export interface LineString<P extends Properties = {}> extends GeometryObjectA<P> {
-    type: "LineString";
-    arcs: ArcIndexes;
-}
-
-// 2.2.4. MultiLineString
-export interface MultiLineString<P extends Properties = {}> extends GeometryObjectA<P> {
-    type: "MultiLineString";
-    arcs: ArcIndexes[];
-}
-
-// 2.2.5. Polygon
-export interface Polygon<P extends Properties = {}> extends GeometryObjectA<P> {
-    type: "Polygon";
-    arcs: ArcIndexes[];
-}
-
-// 2.2.6. MultiPolygon
-export interface MultiPolygon<P extends Properties = {}> extends GeometryObjectA<P> {
-    type: "MultiPolygon";
-    arcs: ArcIndexes[][];
-}
-
-// 2.2.7. Geometry Collection
-export interface GeometryCollection<P extends Properties = {}> extends GeometryObjectA<P> {
-    type: "GeometryCollection";
-    geometries: Array<GeometryObject<P>>;
-}
-
-// More
-export interface NullObject extends GeometryObjectA {
-    type: null;
-}
-
-export type OrNull<T extends Objects> = {
-    [P in keyof T]: T[P] | NullObject;
-};
-
 // ---------------------------------------------------------------
 // TopoJSON Server
 // ---------------------------------------------------------------
 
-export function topology(objects: {[k: string]: GeoJSON.GeoJsonObject}, quantization?: number): Topology;
+export function topology(objects: {[k: string]: GeoJSON.GeoJsonObject}, quantization?: number): TopoJSON.Topology;
 
 // ---------------------------------------------------------------
 // TopoJSON Simplify
 // ---------------------------------------------------------------
 
-export type Triangle = [[number, number], [number, number], [number, number]];
-export type TriangleWeighter = (triangle: Triangle) => number;
-export type Ring = Array<[number, number]>;
-export type RingWeighter = (triangle: Ring) => number;
-export type Filter = (ring: Ring, interior: boolean) => boolean;
-
-export function presimplify<T extends Objects>(topology: Topology<T>, weight?: TriangleWeighter): Topology<T>;
-
-export function simplify<T extends Objects>(topology: Topology<T>, minWeight?: number): Topology<T>;
-
-export function quantile(topology: Topology, p: number): number;
-
-export function filter<K extends Objects>(topology: Topology<K>, filter: Filter): Topology<OrNull<K>>;
-
-export function filterAttached(topology: Topology): Filter;
-
-export function filterAttachedWeight(topology: Topology, minWeight?: number, weight?: RingWeighter): Filter;
-
-export function filterWeight(topology: Topology, minWeight?: number, weight?: RingWeighter): Filter;
-
-export function planarRingArea(ring: Ring): number;
-
-export function planarTriangleArea(triangle: Triangle): number;
-
-export function sphericalRingArea(ring: Ring, interior: true): number;
-
-export function sphericalTriangleArea(triangle: Triangle): number;
+export * from 'topojson-simplify';
 
 // ---------------------------------------------------------------
 // TopoJSON Client
 // ---------------------------------------------------------------
 
-export type Transformer = (point: number[], index?: boolean) => number[];
-
-export function feature<P = GeoJSON.GeoJsonProperties>(topology: Topology, object: Point<P>): GeoJSON.Feature<GeoJSON.Point, P>;
-export function feature<P = GeoJSON.GeoJsonProperties>(topology: Topology, object: MultiPoint<P>): GeoJSON.Feature<GeoJSON.MultiPoint, P>;
-export function feature<P = GeoJSON.GeoJsonProperties>(topology: Topology, object: LineString<P>): GeoJSON.Feature<GeoJSON.LineString, P>;
-export function feature<P = GeoJSON.GeoJsonProperties>(topology: Topology, object: MultiLineString<P>): GeoJSON.Feature<GeoJSON.MultiLineString, P>;
-export function feature<P = GeoJSON.GeoJsonProperties>(topology: Topology, object: Polygon<P>): GeoJSON.Feature<GeoJSON.Polygon, P>;
-export function feature<P = GeoJSON.GeoJsonProperties>(topology: Topology, object: MultiPolygon<P>): GeoJSON.Feature<GeoJSON.MultiPolygon, P>;
-export function feature<P = GeoJSON.GeoJsonProperties>(topology: Topology, object: GeometryCollection<P>): GeoJSON.FeatureCollection<GeoJSON.GeometryObject, P>;
-export function feature<P = GeoJSON.GeoJsonProperties>(topology: Topology, object: GeometryObject<P>)
-    : GeoJSON.Feature<GeoJSON.GeometryObject, P> | GeoJSON.FeatureCollection<GeoJSON.GeometryObject, P>;
-
-export function merge(topology: Topology, objects: Array<Polygon | MultiPolygon>): GeoJSON.MultiPolygon;
-
-export function mergeArcs(topology: Topology, objects: Array<Polygon | MultiPolygon>): MultiPolygon;
-
-export function mesh(topology: Topology, obj?: GeometryObject, filter?: (a: GeometryObject, b: GeometryObject) => boolean): GeoJSON.MultiLineString;
-
-export function meshArcs(topology: Topology, obj?: GeometryObject, filter?: (a: GeometryObject, b: GeometryObject) => boolean): MultiLineString;
-
-export function neighbors(objects: GeometryObject[]): number[][];
-
-export function bbox(topology: Topology): GeoJSON.BBox;
-
-export function quantize<T extends Objects>(topology: Topology<T>, transform: Transform | number): Topology<T>;
-
-export function transform(transform: Transform | null): Transformer;
-
-export function untransform(transform: Transform | null): Transformer;
+export * from 'topojson-client';
 
 // ---------------------------------------------------------------
 // U.S. Atlas TopoJSON
 // ---------------------------------------------------------------
 
-export interface UsAtlas extends topojson.Topology {
+export interface UsAtlas extends TopoJSON.Topology {
     objects: {
-        counties: {type: "GeometryCollection", geometries: Array<Polygon | MultiPolygon>};
-        states: {type: "GeometryCollection", geometries: Array<Polygon | MultiPolygon>};
-        nation: topojson.GeometryCollection;
+        counties: {type: "GeometryCollection", geometries: Array<TopoJSON.Polygon | TopoJSON.MultiPolygon>};
+        states: {type: "GeometryCollection", geometries: Array<TopoJSON.Polygon | TopoJSON.MultiPolygon>};
+        nation: TopoJSON.GeometryCollection;
     };
     bbox: [number, number, number, number];
-    transform: topojson.Transform;
+    transform: TopoJSON.Transform;
 }
 
 // ---------------------------------------------------------------
 // World Atlas TopoJSON
 // ---------------------------------------------------------------
 
-export interface WorldAtlas extends topojson.Topology {
+export interface WorldAtlas extends TopoJSON.Topology {
     objects: {
-        countries: {type: "GeometryCollection", geometries: Array<Polygon | MultiPolygon>};
-        land: topojson.GeometryCollection;
+        countries: {type: "GeometryCollection", geometries: Array<TopoJSON.Polygon | TopoJSON.MultiPolygon>};
+        land: TopoJSON.GeometryCollection;
     };
     bbox: [number, number, number, number];
-    transform: topojson.Transform;
+    transform: TopoJSON.Transform;
 }
diff --git a/types/topojson/test/server-tests.ts b/types/topojson/test/server-tests.ts
index 262fa8e6f5..9ee794593e 100644
--- a/types/topojson/test/server-tests.ts
+++ b/types/topojson/test/server-tests.ts
@@ -1,6 +1,6 @@
 // Tests for: https://github.com/topojson/topojson-server
 
-let topo: topojson.Topology;
+let topo: TopoJSON.Topology;
 
 const aPoint: GeoJSON.Point = {type: "Point", coordinates: [30, 10]};
 const aPolygon: GeoJSON.Polygon = {type: "Polygon", coordinates: [[[30, 10], [40, 40], [20, 40], [30, 10]]]};
diff --git a/types/topojson/topojson-tests.ts b/types/topojson/topojson-tests.ts
index 953fda4743..7a5f6231ed 100644
--- a/types/topojson/topojson-tests.ts
+++ b/types/topojson/topojson-tests.ts
@@ -1,4 +1,5 @@
-const hello = "world";
+// Export topojson-simplify functions
+topojson.planarRingArea([]);
 
-// NOTE: The standard bundle definition has no particular function.
-// See ./test/ for per bundle tests.
+// Export topojson-client functions
+topojson.transform(null);
diff --git a/types/topojson/tsconfig.json b/types/topojson/tsconfig.json
index 65b6cd1f07..75f46ff807 100644
--- a/types/topojson/tsconfig.json
+++ b/types/topojson/tsconfig.json
@@ -21,9 +21,6 @@
         "index.d.ts",
         "topojson-tests.ts",
         "test/atlas-tests.ts",
-        "test/client-tests.ts",
-        "test/server-tests.ts",
-        "test/simplify-tests.ts",
-        "test/specification-tests.ts"
+        "test/server-tests.ts"
     ]
 }
\ No newline at end of file

From a8637a544d40a1272532b531fa60ba4bd5f4187a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anderson=20Fria=C3=A7a?= <afriacaxd@gmail.com>
Date: Sat, 14 Apr 2018 15:17:15 -0400
Subject: [PATCH 1280/1382] Types for JQuery Focusable (#24988)

---
 types/jquery-focusable/index.d.ts             | 25 +++++++++++++++++++
 .../jquery-focusable-tests.ts                 | 12 +++++++++
 types/jquery-focusable/tsconfig.json          | 25 +++++++++++++++++++
 types/jquery-focusable/tslint.json            |  1 +
 4 files changed, 63 insertions(+)
 create mode 100644 types/jquery-focusable/index.d.ts
 create mode 100644 types/jquery-focusable/jquery-focusable-tests.ts
 create mode 100644 types/jquery-focusable/tsconfig.json
 create mode 100644 types/jquery-focusable/tslint.json

diff --git a/types/jquery-focusable/index.d.ts b/types/jquery-focusable/index.d.ts
new file mode 100644
index 0000000000..b65fd23d38
--- /dev/null
+++ b/types/jquery-focusable/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for JQuery Focusable 1.0
+// Project: https://github.com/makeup-jquery/jquery-focusable
+// Definitions by: Anderson Friaça <https://github.com/AndersonFriaca>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="jquery" />
+
+export type Options = Partial<{
+    /**
+     * Find elements with tabindex equal to -1
+     */
+    findNegativeTabindex: boolean;
+
+    /**
+     * Find elements with tabindex greater than 0
+     */
+    findPositiveTabindex: true;
+}>;
+
+declare global {
+    interface JQuery {
+        focusable(options?: Options): JQuery;
+    }
+}
diff --git a/types/jquery-focusable/jquery-focusable-tests.ts b/types/jquery-focusable/jquery-focusable-tests.ts
new file mode 100644
index 0000000000..2935d5f38f
--- /dev/null
+++ b/types/jquery-focusable/jquery-focusable-tests.ts
@@ -0,0 +1,12 @@
+import { Options } from "jquery-focusable";
+
+// Basic usage
+$('body').focusable();
+
+// With options
+const options: Options = {
+    findNegativeTabindex: true,
+    findPositiveTabindex: true
+  };
+
+$('body').focusable(options);
diff --git a/types/jquery-focusable/tsconfig.json b/types/jquery-focusable/tsconfig.json
new file mode 100644
index 0000000000..d216e5326b
--- /dev/null
+++ b/types/jquery-focusable/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "esModuleInterop": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery-focusable-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/jquery-focusable/tslint.json b/types/jquery-focusable/tslint.json
new file mode 100644
index 0000000000..d04fe2e1fa
--- /dev/null
+++ b/types/jquery-focusable/tslint.json
@@ -0,0 +1 @@
+{"extends": "dtslint/dt.json"}
\ No newline at end of file

From ffbf344eb06f93ebf4af722639f897d584807a8b Mon Sep 17 00:00:00 2001
From: AJ Livingston <livingston.aj@gmail.com>
Date: Sat, 14 Apr 2018 15:18:11 -0400
Subject: [PATCH 1281/1382] Add typings for express-ws (#24984)

* Add types for express-ws

* strictFunctionTypes=true

* dtslint compliant

* union types for application and router

* allow https server

* applyTo accepts object

* fix lint error

* applyTo accepts router-like obj

* websocket method returns this
---
 types/express-ws/express-ws-tests.ts | 72 ++++++++++++++++++++++++++++
 types/express-ws/index.d.ts          | 47 ++++++++++++++++++
 types/express-ws/tsconfig.json       | 23 +++++++++
 types/express-ws/tslint.json         |  1 +
 4 files changed, 143 insertions(+)
 create mode 100644 types/express-ws/express-ws-tests.ts
 create mode 100644 types/express-ws/index.d.ts
 create mode 100644 types/express-ws/tsconfig.json
 create mode 100644 types/express-ws/tslint.json

diff --git a/types/express-ws/express-ws-tests.ts b/types/express-ws/express-ws-tests.ts
new file mode 100644
index 0000000000..a37f315dfb
--- /dev/null
+++ b/types/express-ws/express-ws-tests.ts
@@ -0,0 +1,72 @@
+import http = require('http');
+import https = require('https');
+import express = require('express');
+import expressWs = require('express-ws');
+
+const dummyApp = express();
+const httpServer = http.createServer(dummyApp);
+const httpsServer = https.createServer({}, dummyApp);
+
+expressWs(dummyApp); // optional server argument
+expressWs(dummyApp, httpsServer); // https server allowed
+expressWs(dummyApp, httpServer, {
+    leaveRouterUntouched: false,
+    // ws server options
+    wsOptions: {
+        clientTracking: true
+    }
+});
+
+const { app, getWss, applyTo } = expressWs(express());
+
+/**
+ * applyTo accepts router object
+ */
+applyTo(express.Router());
+
+/**
+ * applyTo accepts router-like objects
+ */
+applyTo({
+    get() { return this; }
+});
+
+/**
+ * getWss function returns ws server
+ */
+getWss().clients.forEach(ws => {
+    if (ws.readyState !== ws.OPEN) {
+        ws.terminate();
+        return;
+    }
+    ws.ping();
+});
+
+/**
+ * ws method is added to express app instance
+ */
+app.ws('/', (ws, req) => {
+    ws.on('message', msg => {
+        console.log(msg);
+    });
+});
+
+/**
+ * ws method is added to express.Router prototype
+ */
+const router = express.Router();
+
+router.ws(
+    '/:id',
+    (ws, req, next) => { next(); },
+    (ws, req, next) => {
+        ws.send(req.params.id);
+
+        ws.on('close', (code, reason) => {
+            console.log('code:', code);
+            console.log('reason:', reason);
+        });
+    }
+);
+
+app.use(router);
diff --git a/types/express-ws/index.d.ts b/types/express-ws/index.d.ts
new file mode 100644
index 0000000000..81cf85c6d3
--- /dev/null
+++ b/types/express-ws/index.d.ts
@@ -0,0 +1,47 @@
+// Type definitions for express-ws 3.0
+// Project: https://github.com/HenningM/express-ws
+// Definitions by: AJ Livingston <https://github.com/ajliv>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as core from 'express-serve-static-core';
+import * as express from 'express';
+import * as http from 'http';
+import * as https from 'https';
+import * as ws from 'ws';
+
+declare module 'express' {
+    function Router(options?: RouterOptions): expressWs.Router;
+}
+
+declare function expressWs(app: express.Application, server?: http.Server | https.Server, options?: expressWs.Options): expressWs.Instance;
+declare namespace expressWs {
+    type Application = express.Application & WithWebsocketMethod;
+    type Router = express.Router & WithWebsocketMethod;
+
+    interface Options {
+        leaveRouterUntouched?: boolean;
+        wsOptions?: ws.ServerOptions;
+    }
+
+    interface RouterLike {
+        get: express.IRouterMatcher<this>;
+        [key: string]: any;
+        [key: number]: any;
+    }
+
+    interface Instance {
+        app: Application;
+        applyTo(target: RouterLike): void;
+        getWss(): ws.Server;
+    }
+
+    type WebsocketRequestHandler = (ws: ws, req: express.Request, next: express.NextFunction) => void;
+    type WebsocketMethod<T> = (route: core.PathParams, ...middlewares: WebsocketRequestHandler[]) => T;
+
+    interface WithWebsocketMethod {
+        ws: WebsocketMethod<this>;
+    }
+}
+
+export = expressWs;
diff --git a/types/express-ws/tsconfig.json b/types/express-ws/tsconfig.json
new file mode 100644
index 0000000000..e2d5677145
--- /dev/null
+++ b/types/express-ws/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "express-ws-tests.ts"
+    ]
+}
diff --git a/types/express-ws/tslint.json b/types/express-ws/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/express-ws/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 3a647d4f0e999265f0059206ddd845b87d54e21d Mon Sep 17 00:00:00 2001
From: Lukas Senionis <warliukz@gmail.com>
Date: Sat, 14 Apr 2018 22:24:56 +0300
Subject: [PATCH 1282/1382] [component-emitter] Provide easy access to
 interface (#24994)

* provide easy access to interface

* declare is not needed
---
 types/component-emitter/index.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/component-emitter/index.d.ts b/types/component-emitter/index.d.ts
index 95682f6ca4..b55a1673ab 100644
--- a/types/component-emitter/index.d.ts
+++ b/types/component-emitter/index.d.ts
@@ -13,9 +13,9 @@ interface Emitter {
     hasListeners(event: string): boolean;
 }
 
-declare const constructor: {
+declare const Emitter: {
     (obj?: any): Emitter;
     new (obj?: any): Emitter;
 };
 
-export = constructor;
+export = Emitter;

From 4ac43f606127fe8487ebc9e9ef08fbdf2ee5b77f Mon Sep 17 00:00:00 2001
From: Kalle Ott <kalle.ott@cap3.de>
Date: Sat, 14 Apr 2018 21:29:21 +0200
Subject: [PATCH 1283/1382] fix for wrong method signature in params of
 WindowScroller render-prop (#24953)

* typings update to catch up with current version of react-virtualized

* fixed lint errors

* fixed ts version

* fixed void return type of defaultProps functions

* changed interface to type for better consistency

* fixed signature of onChildScroll params in WindowScroller

* Auto stash before merge of "enable-strict-mode" and "master"

* removed unimportant line from test file

* replaced strict with explicit options

* updated TS version

* ts version set to 2.7

* back to ts 2.6

* changed autogenerated relative import to global import
---
 .../dist/es/CellMeasurer.d.ts                 |    8 +-
 .../react-virtualized/dist/es/Collection.d.ts |    5 +-
 types/react-virtualized/dist/es/Grid.d.ts     |    7 +-
 types/react-virtualized/dist/es/Table.d.ts    |    6 +-
 .../dist/es/WindowScroller.d.ts               |    2 +-
 types/react-virtualized/index.d.ts            |    3 +-
 .../react-virtualized-tests.tsx               | 1644 +++++++----------
 types/react-virtualized/tsconfig.json         |    8 +-
 8 files changed, 701 insertions(+), 982 deletions(-)

diff --git a/types/react-virtualized/dist/es/CellMeasurer.d.ts b/types/react-virtualized/dist/es/CellMeasurer.d.ts
index 5c56332964..51f0b4b07d 100644
--- a/types/react-virtualized/dist/es/CellMeasurer.d.ts
+++ b/types/react-virtualized/dist/es/CellMeasurer.d.ts
@@ -29,15 +29,15 @@ export class CellMeasurerCache implements CellMeasurerCacheInterface {
     constructor(params?: CellMeasurerCacheParams);
     clear(rowIndex: number, columnIndex: number): void;
     clearAll(): void;
-    columnWidth: (params: { index: number }) => number | undefined;
+    columnWidth: (params: { index: number }) => number;
     readonly defaultHeight: number;
     readonly defaultWidth: number;
     hasFixedHeight(): boolean;
     hasFixedWidth(): boolean;
-    getHeight(rowIndex: number, columnIndex: number): number | undefined;
-    getWidth(rowIndex: number, columnIndex: number): number | undefined;
+    getHeight(rowIndex: number, columnIndex: number): number;
+    getWidth(rowIndex: number, columnIndex: number): number;
     has(rowIndex: number, columnIndex: number): boolean;
-    rowHeight: (params: { index: number }) => number | undefined;
+    rowHeight: (params: { index: number }) => number;
     set(
         rowIndex: number,
         columnIndex: number,
diff --git a/types/react-virtualized/dist/es/Collection.d.ts b/types/react-virtualized/dist/es/Collection.d.ts
index d813e397f9..4f353d20fc 100644
--- a/types/react-virtualized/dist/es/Collection.d.ts
+++ b/types/react-virtualized/dist/es/Collection.d.ts
@@ -29,8 +29,9 @@ export type CollectionCellGroupRenderer = (
 ) => React.ReactNode[];
 export type CollectionCellRendererParams = {
     index: number;
-    key: string;
-    style?: React.CSSProperties;
+    isScrolling: boolean;
+    key: number;
+    style: React.CSSProperties;
 };
 export type CollectionCellRenderer = (
     params: CollectionCellRendererParams
diff --git a/types/react-virtualized/dist/es/Grid.d.ts b/types/react-virtualized/dist/es/Grid.d.ts
index a543521b7a..86055132aa 100644
--- a/types/react-virtualized/dist/es/Grid.d.ts
+++ b/types/react-virtualized/dist/es/Grid.d.ts
@@ -54,12 +54,7 @@ export type ScrollParams = {
     scrollTop: number;
     scrollWidth: number;
 };
-export type SectionRenderedParams = {
-    columnStartIndex: number;
-    columnStopIndex: number;
-    rowStartIndex: number;
-    rowStopIndex: number;
-};
+export type SectionRenderedParams = RenderedSection;
 export type SCROLL_DIRECTION_HORIZONTAL = "horizontal";
 export type SCROLL_DIRECTION_VERTICAL = "vertical";
 export type OverscanIndicesGetterParams = {
diff --git a/types/react-virtualized/dist/es/Table.d.ts b/types/react-virtualized/dist/es/Table.d.ts
index 571f67a371..c3e5c1478d 100644
--- a/types/react-virtualized/dist/es/Table.d.ts
+++ b/types/react-virtualized/dist/es/Table.d.ts
@@ -208,9 +208,7 @@ export type TableProps = GridCoreProps & {
      */
     autoHeight?: boolean;
     /** One or more Columns describing the data displayed in this row */
-    children?:
-        | React.ReactElement<ColumnProps>[]
-        | React.ReactElement<ColumnProps>;
+    children?: React.ReactNode;
     /** Optional CSS class name */
     className?: string;
     /** Disable rendering the header at all */
@@ -372,7 +370,7 @@ export const SortDirection: SortDirectionStatic;
 export type SortDirectionType = "ASC" | "DESC";
 
 export const SortIndicator: React.StatelessComponent<{
-    sortDirection: SortDirectionType;
+    sortDirection?: SortDirectionType;
 }>;
 
 /**
diff --git a/types/react-virtualized/dist/es/WindowScroller.d.ts b/types/react-virtualized/dist/es/WindowScroller.d.ts
index 723862485f..628d58744d 100644
--- a/types/react-virtualized/dist/es/WindowScroller.d.ts
+++ b/types/react-virtualized/dist/es/WindowScroller.d.ts
@@ -22,7 +22,7 @@ export type WindowScrollerProps = {
      */
     children: (
         params: {
-            onChildScroll: ({ scrollTop: number }) => void;
+            onChildScroll: (params: { scrollTop: number }) => void;
             registerChild: (params?: Element) => void;
             height: number;
             isScrolling: boolean;
diff --git a/types/react-virtualized/index.d.ts b/types/react-virtualized/index.d.ts
index 7c6b5d11fb..c5a1a60aaa 100644
--- a/types/react-virtualized/index.d.ts
+++ b/types/react-virtualized/index.d.ts
@@ -118,7 +118,8 @@ export {
     TableHeaderRowRenderer,
     TableProps,
     TableRowProps,
-    TableRowRenderer
+    TableRowRenderer,
+    SortParams
 } from "./dist/es/Table";
 export {
     WindowScroller,
diff --git a/types/react-virtualized/react-virtualized-tests.tsx b/types/react-virtualized/react-virtualized-tests.tsx
index f11fa644f5..e4bfd5228a 100644
--- a/types/react-virtualized/react-virtualized-tests.tsx
+++ b/types/react-virtualized/react-virtualized-tests.tsx
@@ -1,38 +1,52 @@
-import * as React from 'react';
-import { PureComponent } from 'react'
-import { ArrowKeyStepper, AutoSizer, Grid } from 'react-virtualized'
+import * as React from "react";
+import { PureComponent } from "react";
+import {
+    ArrowKeyStepper,
+    AutoSizer,
+    Grid,
+    Index,
+    CollectionCellRendererParams,
+    IndexRange,
+    CellMeasurerProps,
+    Size,
+    TableHeaderProps
+} from "react-virtualized";
 
 export class ArrowKeyStepperExample extends PureComponent<any, any> {
-    constructor(props) {
-        super(props)
-
-        this._getColumnWidth = this._getColumnWidth.bind(this)
-        this._getRowHeight = this._getRowHeight.bind(this)
-        this._cellRenderer = this._cellRenderer.bind(this)
-    }
-
     render() {
-        const { mode } = this.state
+        const { mode } = this.state;
 
         return (
-
             <ArrowKeyStepper
                 columnCount={100}
-                mode={mode as 'edges'}
+                mode={mode as "edges"}
                 rowCount={100}
             >
                 {({ onSectionRendered, scrollToColumn, scrollToRow }) => (
                     <div>
-
                         <AutoSizer disableHeight>
                             {({ width }) => (
                                 <Grid
-                                    className={'styles.Grid'}
+                                    className={"styles.Grid"}
                                     columnWidth={this._getColumnWidth}
                                     columnCount={100}
                                     height={200}
                                     onSectionRendered={onSectionRendered}
-                                    cellRenderer={({ columnIndex, key, rowIndex, style }) => this._cellRenderer({ columnIndex, key, rowIndex, scrollToColumn, scrollToRow, style })}
+                                    cellRenderer={({
+                                        columnIndex,
+                                        key,
+                                        rowIndex,
+                                        style
+                                    }) =>
+                                        this._cellRenderer({
+                                            columnIndex,
+                                            key,
+                                            rowIndex,
+                                            scrollToColumn,
+                                            scrollToRow,
+                                            style
+                                        })
+                                    }
                                     rowHeight={this._getRowHeight}
                                     rowCount={100}
                                     scrollToColumn={scrollToColumn}
@@ -44,49 +58,45 @@ export class ArrowKeyStepperExample extends PureComponent<any, any> {
                     </div>
                 )}
             </ArrowKeyStepper>
-        )
+        );
     }
 
-    _getColumnWidth({ index }) {
-        return (1 + (index % 3)) * 60
+    _getColumnWidth({ index }: Index) {
+        return (1 + index % 3) * 60;
     }
 
-    _getRowHeight({ index }) {
-        return (1 + (index % 3)) * 30
+    _getRowHeight({ index }: Index) {
+        return (1 + index % 3) * 30;
     }
 
-    _cellRenderer({ columnIndex, key, rowIndex, scrollToColumn, scrollToRow, style }) {
-
+    _cellRenderer({
+        columnIndex,
+        key,
+        rowIndex,
+        scrollToColumn,
+        scrollToRow,
+        style
+    }: any) {
         return (
-            <div
-                className={'className'}
-                key={key}
-                style={style}
-            >
+            <div className={"className"} key={key} style={style}>
                 {`r:${rowIndex}, c:${columnIndex}`}
             </div>
-        )
+        );
     }
 }
 
-import { List } from 'react-virtualized'
+import { List } from "react-virtualized";
 
 export class AutoSizerExample extends PureComponent<any, any> {
-    constructor(props) {
-        super(props)
-
-        this._rowRenderer = this._rowRenderer.bind(this)
-    }
-
     render() {
-        const { list } = this.context
-        const { hideDescription } = this.state
+        const { list } = this.context;
+        const { hideDescription } = this.state;
 
         return (
             <AutoSizer>
                 {({ width, height }) => (
                     <List
-                        className={'styles.List'}
+                        className={"styles.List"}
                         height={height}
                         rowCount={list.size}
                         rowHeight={30}
@@ -95,48 +105,45 @@ export class AutoSizerExample extends PureComponent<any, any> {
                     />
                 )}
             </AutoSizer>
-        )
+        );
     }
 
-    _rowRenderer({ index, key, style }) {
-        const { list } = this.context
-        const row = list.get(index)
+    _rowRenderer({ index, key, style }: any) {
+        const { list } = this.context;
+        const row = list.get(index);
 
         return (
-            <div
-                key={key}
-                className={'styles.row'}
-                style={style}
-            >
+            <div key={key} className={"styles.row"} style={style}>
                 {row.name}
             </div>
-        )
+        );
     }
 }
-import { } from 'react'
-import { CellMeasurer, CellMeasurerCache, ListRowProps } from 'react-virtualized'
+import {} from "react";
+import {
+    CellMeasurer,
+    CellMeasurerCache,
+    ListRowProps
+} from "react-virtualized";
 
 export class DynamicHeightList extends PureComponent<any> {
+    _cache: CellMeasurerCache;
 
-    _cache: CellMeasurerCache
-
-    constructor(props, context) {
-        super(props, context)
+    constructor(props: any, context: any) {
+        super(props, context);
 
         this._cache = new CellMeasurerCache({
             fixedWidth: true,
             minHeight: 50
-        })
-
-        this._rowRenderer = this._rowRenderer.bind(this)
+        });
     }
 
     render() {
-        const { width } = this.props
+        const { width } = this.props;
 
         return (
             <List
-                className={'styles.BodyGrid'}
+                className={"styles.BodyGrid"}
                 deferredMeasurementCache={this._cache}
                 height={400}
                 overscanRowCount={0}
@@ -145,19 +152,19 @@ export class DynamicHeightList extends PureComponent<any> {
                 rowRenderer={this._rowRenderer}
                 width={width}
             />
-        )
+        );
     }
 
     _rowRenderer({ index, isScrolling, key, parent, style }: ListRowProps) {
-        const { getClassName, list } = this.props
+        const { getClassName, list } = this.props;
 
-        const datum = list.get(index % list.size)
-        const classNames = getClassName({ columnIndex: 0, rowIndex: index })
+        const datum = list.get(index % list.size);
+        const classNames = getClassName({ columnIndex: 0, rowIndex: index });
 
-        const imageWidth = 300
-        const imageHeight = datum.size * 2
+        const imageWidth = 300;
+        const imageHeight = datum.size * 2;
 
-        const source = `http://fillmurray.com/${imageWidth}/${imageHeight}`
+        const source = `http://fillmurray.com/${imageWidth}/${imageHeight}`;
 
         return (
             <CellMeasurer
@@ -168,10 +175,7 @@ export class DynamicHeightList extends PureComponent<any> {
                 parent={parent}
             >
                 {({ measure }) => (
-                    <div
-                        className={classNames}
-                        style={style}
-                    >
+                    <div className={classNames} style={style}>
                         <img
                             onLoad={measure}
                             src={source}
@@ -182,22 +186,22 @@ export class DynamicHeightList extends PureComponent<any> {
                     </div>
                 )}
             </CellMeasurer>
-        )
+        );
     }
 }
 
-import { Collection } from 'react-virtualized'
+import { Collection } from "react-virtualized";
 
 // Defines a pattern of sizes and positions for a range of 10 rotating cells
 // These cells cover an area of 600 (wide) x 400 (tall)
-const GUTTER_SIZE = 3
-const CELL_WIDTH = 75
+const GUTTER_SIZE = 3;
+const CELL_WIDTH = 75;
 
 export class CollectionExample extends PureComponent<any, any> {
     _columnYMap: any;
 
-    constructor(props, context) {
-        super(props, context)
+    constructor(props: any, context: any) {
+        super(props, context);
 
         this.context = context;
 
@@ -209,22 +213,20 @@ export class CollectionExample extends PureComponent<any, any> {
             scrollToCell: undefined,
             showScrollingPlaceholder: false,
             verticalOverscanSize: 0
-        }
+        };
 
-        this._columnYMap = []
-
-        this._cellRenderer = this._cellRenderer.bind(this)
-        this._cellSizeAndPositionGetter = this._cellSizeAndPositionGetter.bind(this)
-        this._noContentRenderer = this._noContentRenderer.bind(this)
-        this._onCellCountChange = this._onCellCountChange.bind(this)
-        this._onHeightChange = this._onHeightChange.bind(this)
-        this._onHorizontalOverscanSizeChange = this._onHorizontalOverscanSizeChange.bind(this)
-        this._onScrollToCellChange = this._onScrollToCellChange.bind(this)
-        this._onVerticalOverscanSizeChange = this._onVerticalOverscanSizeChange.bind(this)
+        this._columnYMap = [];
     }
 
     render() {
-        const { cellCount, height, horizontalOverscanSize, scrollToCell, showScrollingPlaceholder, verticalOverscanSize } = this.state
+        const {
+            cellCount,
+            height,
+            horizontalOverscanSize,
+            scrollToCell,
+            showScrollingPlaceholder,
+            verticalOverscanSize
+        } = this.state;
 
         return (
             <AutoSizer disableHeight>
@@ -232,8 +234,10 @@ export class CollectionExample extends PureComponent<any, any> {
                     <Collection
                         cellCount={cellCount}
                         cellRenderer={this._cellRenderer}
-                        cellSizeAndPositionGetter={this._cellSizeAndPositionGetter}
-                        className={'styles.collection'}
+                        cellSizeAndPositionGetter={
+                            this._cellSizeAndPositionGetter
+                        }
+                        className={"styles.collection"}
                         height={height}
                         horizontalOverscanSize={horizontalOverscanSize}
                         noContentRenderer={this._noContentRenderer}
@@ -243,125 +247,64 @@ export class CollectionExample extends PureComponent<any, any> {
                     />
                 )}
             </AutoSizer>
-        )
+        );
     }
 
-    _cellRenderer({ index, isScrolling, key, style }) {
-        const { list } = this.context
-        const { showScrollingPlaceholder } = this.state
+    _cellRenderer({
+        index,
+        isScrolling,
+        key,
+        style
+    }: CollectionCellRendererParams) {
+        const { list } = this.context;
+        const { showScrollingPlaceholder } = this.state;
 
-        const datum = list.get(index % list.size)
-
-        // Customize style
-        style.backgroundColor = datum.color
+        const datum = list.get(index % list.size);
 
         return (
-            <div
-                className={'styles.cell'}
-                key={key}
-                style={style}
-            >
-                {showScrollingPlaceholder && isScrolling ? '...' : index}
+            <div className={"styles.cell"} key={key} style={style}>
+                {showScrollingPlaceholder && isScrolling ? "..." : index}
             </div>
-        )
+        );
     }
 
-    _cellSizeAndPositionGetter({ index }) {
-        const { list } = this.context
-        const { columnCount } = this.state
+    _cellSizeAndPositionGetter({ index }: Index) {
+        const { list } = this.context;
+        const { columnCount } = this.state;
 
-        const columnPosition = index % (columnCount || 1)
-        const datum = list.get(index % list.size)
+        const columnPosition = index % (columnCount || 1);
+        const datum = list.get(index % list.size);
 
         // Poor man's Masonry layout; columns won't all line up equally with the bottom.
-        const height = datum.size
-        const width = CELL_WIDTH
-        const x = columnPosition * (GUTTER_SIZE + width)
-        const y = this._columnYMap[columnPosition] || 0
+        const height = datum.size;
+        const width = CELL_WIDTH;
+        const x = columnPosition * (GUTTER_SIZE + width);
+        const y = this._columnYMap[columnPosition] || 0;
 
-        this._columnYMap[columnPosition] = y + height + GUTTER_SIZE
+        this._columnYMap[columnPosition] = y + height + GUTTER_SIZE;
 
         return {
             height,
             width,
             x,
             y
-        }
+        };
     }
 
-    _getColumnCount(cellCount) {
-        return Math.round(Math.sqrt(cellCount))
-    }
-
-    _onHorizontalOverscanSizeChange(event) {
-        const horizontalOverscanSize = parseInt(event.target.value, 10) || 0
-
-        this.setState({ horizontalOverscanSize })
+    _getColumnCount(cellCount: number) {
+        return Math.round(Math.sqrt(cellCount));
     }
 
     _noContentRenderer() {
-        return (
-            <div className={'styles.noCells'}>
-                No cells
-      </div>
-        )
-    }
-
-    _onCellCountChange(event) {
-        const cellCount = parseInt(event.target.value, 10) || 0
-
-        this._columnYMap = []
-
-        this.setState({
-            cellCount,
-            columnCount: this._getColumnCount(cellCount)
-        })
-    }
-
-    _onHeightChange(event) {
-        const height = parseInt(event.target.value, 10) || 0
-
-        this.setState({ height })
-    }
-
-    _onScrollToCellChange(event) {
-        const { cellCount } = this.state
-
-        let scrollToCell = Math.min(cellCount - 1, parseInt(event.target.value, 10))
-
-        if (isNaN(scrollToCell)) {
-            scrollToCell = undefined
-        }
-
-        this.setState({ scrollToCell })
-    }
-
-    _onVerticalOverscanSizeChange(event) {
-        const verticalOverscanSize = parseInt(event.target.value, 10) || 0
-
-        this.setState({ verticalOverscanSize })
+        return <div className={"styles.noCells"}>No cells</div>;
     }
 }
 
-import { ColumnSizer } from 'react-virtualized'
+import { ColumnSizer } from "react-virtualized";
 
 export class ColumnSizerExample extends PureComponent<any, any> {
-    constructor(props) {
-        super(props)
-
-        this._noColumnMaxWidthChange = this._noColumnMaxWidthChange.bind(this)
-        this._noColumnMinWidthChange = this._noColumnMinWidthChange.bind(this)
-        this._onColumnCountChange = this._onColumnCountChange.bind(this)
-        this._noContentRenderer = this._noContentRenderer.bind(this)
-        this._cellRenderer = this._cellRenderer.bind(this)
-    }
-
     render() {
-        const {
-            columnMaxWidth,
-            columnMinWidth,
-            columnCount
-    } = this.state
+        const { columnMaxWidth, columnMinWidth, columnCount } = this.state;
 
         return (
             <div>
@@ -371,12 +314,16 @@ export class ColumnSizerExample extends PureComponent<any, any> {
                             columnMaxWidth={columnMaxWidth}
                             columnMinWidth={columnMinWidth}
                             columnCount={columnCount}
-                            key='GridColumnSizer'
+                            key="GridColumnSizer"
                             width={width}
                         >
-                            {({ adjustedWidth, getColumnWidth, registerChild }) => (
+                            {({
+                                adjustedWidth,
+                                getColumnWidth,
+                                registerChild
+                            }) => (
                                 <div
-                                    className={'styles.GridContainer'}
+                                    className={"styles.GridContainer"}
                                     style={{
                                         height: 50,
                                         width: adjustedWidth
@@ -387,7 +334,9 @@ export class ColumnSizerExample extends PureComponent<any, any> {
                                         columnWidth={getColumnWidth}
                                         columnCount={columnCount}
                                         height={50}
-                                        noContentRenderer={this._noContentRenderer}
+                                        noContentRenderer={
+                                            this._noContentRenderer
+                                        }
                                         cellRenderer={this._cellRenderer}
                                         rowHeight={50}
                                         rowCount={1}
@@ -399,82 +348,37 @@ export class ColumnSizerExample extends PureComponent<any, any> {
                     )}
                 </AutoSizer>
             </div>
-        )
-    }
-
-    _noColumnMaxWidthChange(event) {
-        let columnMaxWidth = parseInt(event.target.value, 10)
-
-        columnMaxWidth = isNaN(columnMaxWidth) ? undefined : Math.min(1000, columnMaxWidth)
-
-        this.setState({ columnMaxWidth })
-    }
-
-    _noColumnMinWidthChange(event) {
-        let columnMinWidth = parseInt(event.target.value, 10)
-
-        columnMinWidth = isNaN(columnMinWidth) ? undefined : Math.max(1, columnMinWidth)
-
-        this.setState({ columnMinWidth })
-    }
-
-    _onColumnCountChange(event) {
-        this.setState({ columnCount: parseInt(event.target.value, 10) || 0 })
+        );
     }
 
     _noContentRenderer() {
-        return (
-            <div className={'styles.noCells'}>
-                No cells
-      </div>
-        )
+        return <div className={"styles.noCells"}>No cells</div>;
     }
 
-    _cellRenderer({ columnIndex, key, rowIndex, style }) {
-        const className = columnIndex === 0
-            ? 'styles.firstCell'
-            : 'styles.cell'
+    _cellRenderer({ columnIndex, key, rowIndex, style }: GridCellProps) {
+        const className =
+            columnIndex === 0 ? "styles.firstCell" : "styles.cell";
 
         return (
-            <div
-                className={className}
-                key={key}
-                style={style}
-            >
+            <div className={className} key={key} style={style}>
                 {`R:${rowIndex}, C:${columnIndex}`}
             </div>
-        )
+        );
     }
 }
 
 export class GridExample extends PureComponent<any, any> {
-    constructor(props, context) {
-        super(props, context)
-
-        this.state = {
-            columnCount: 1000,
-            height: 300,
-            overscanColumnCount: 0,
-            overscanRowCount: 10,
-            rowHeight: 40,
-            rowCount: 1000,
-            scrollToColumn: undefined,
-            scrollToRow: undefined,
-            useDynamicRowHeight: false
-        }
-
-        this._cellRenderer = this._cellRenderer.bind(this)
-        this._getColumnWidth = this._getColumnWidth.bind(this)
-        this._getRowClassName = this._getRowClassName.bind(this)
-        this._getRowHeight = this._getRowHeight.bind(this)
-        this._noContentRenderer = this._noContentRenderer.bind(this)
-        this._onColumnCountChange = this._onColumnCountChange.bind(this)
-        this._onRowCountChange = this._onRowCountChange.bind(this)
-        this._onScrollToColumnChange = this._onScrollToColumnChange.bind(this)
-        this._onScrollToRowChange = this._onScrollToRowChange.bind(this)
-        this._renderBodyCell = this._renderBodyCell.bind(this)
-        this._renderLeftSideCell = this._renderLeftSideCell.bind(this)
-    }
+    state = {
+        columnCount: 1000,
+        height: 300,
+        overscanColumnCount: 0,
+        overscanRowCount: 10,
+        rowHeight: 40,
+        rowCount: 1000,
+        scrollToColumn: undefined,
+        scrollToRow: undefined,
+        useDynamicRowHeight: false
+    };
 
     render() {
         const {
@@ -487,22 +391,23 @@ export class GridExample extends PureComponent<any, any> {
             scrollToColumn,
             scrollToRow,
             useDynamicRowHeight
-    } = this.state
+        } = this.state;
 
         return (
-
             <AutoSizer disableHeight>
                 {({ width }) => (
                     <Grid
                         cellRenderer={this._cellRenderer}
-                        className={'styles.BodyGrid'}
+                        className={"styles.BodyGrid"}
                         columnWidth={this._getColumnWidth}
                         columnCount={columnCount}
                         height={height}
                         noContentRenderer={this._noContentRenderer}
                         overscanColumnCount={overscanColumnCount}
                         overscanRowCount={overscanRowCount}
-                        rowHeight={useDynamicRowHeight ? this._getRowHeight : rowHeight}
+                        rowHeight={
+                            useDynamicRowHeight ? this._getRowHeight : rowHeight
+                        }
                         rowCount={rowCount}
                         scrollToColumn={scrollToColumn}
                         scrollToRow={scrollToRow}
@@ -510,83 +415,75 @@ export class GridExample extends PureComponent<any, any> {
                     />
                 )}
             </AutoSizer>
-        )
+        );
     }
 
-    _cellRenderer({ columnIndex, key, rowIndex, style }) {
-        if (columnIndex === 0) {
-            return this._renderLeftSideCell({ key, rowIndex, style })
+    _cellRenderer(params: GridCellProps) {
+        if (params.columnIndex === 0) {
+            return this._renderLeftSideCell(params);
         } else {
-            return this._renderBodyCell({ columnIndex, key, rowIndex, style })
+            return this._renderBodyCell(params);
         }
     }
 
-    _getColumnWidth({ index }) {
+    _getColumnWidth({ index }: Index) {
         switch (index) {
             case 0:
-                return 50
+                return 50;
             case 1:
-                return 100
+                return 100;
             case 2:
-                return 300
+                return 300;
             default:
-                return 80
+                return 80;
         }
     }
 
-    _getDatum(index) {
-        const { list } = this.context
+    _getDatum(index: number) {
+        const { list } = this.context;
 
-        return list.get(index % list.size)
+        return list.get(index % list.size);
     }
 
-    _getRowClassName(row) {
-        return row % 2 === 0 ? 'styles.evenRow' : 'styles.oddRow'
+    _getRowClassName(row: number) {
+        return row % 2 === 0 ? "styles.evenRow" : "styles.oddRow";
     }
 
-    _getRowHeight({ index }) {
-        return this._getDatum(index).size
+    _getRowHeight({ index }: Index) {
+        return this._getDatum(index).size;
     }
 
     _noContentRenderer() {
-        return (
-            <div className={'styles.noCells'}>
-                No cells
-      </div>
-        )
+        return <div className={"styles.noCells"}>No cells</div>;
     }
 
-    _renderBodyCell({ columnIndex, key, rowIndex, style }) {
-        const rowClass = this._getRowClassName(rowIndex)
-        const datum = this._getDatum(rowIndex)
+    _renderBodyCell({ columnIndex, key, rowIndex, style }: GridCellProps) {
+        const rowClass = this._getRowClassName(rowIndex);
+        const datum = this._getDatum(rowIndex);
 
-        let content
+        let content;
 
         switch (columnIndex) {
             case 1:
-                content = datum.name
-                break
+                content = datum.name;
+                break;
             case 2:
-                content = datum.random
-                break
+                content = datum.random;
+                break;
             default:
-                content = `r:${rowIndex}, c:${columnIndex}`
-                break
+                content = `r:${rowIndex}, c:${columnIndex}`;
+                break;
         }
 
         return (
-            <div
-                className={'classNames'}
-                key={key}
-                style={style}
-            >
+            <div className={"classNames"} key={key} style={style}>
                 {content}
             </div>
-        )
+        );
     }
 
-    _renderLeftSideCell({ key, rowIndex, style }) {
-        const datum = this._getDatum(rowIndex)
+    _renderLeftSideCell({ key, rowIndex, style }: GridCellProps) {
+        const datum = this._getDatum(rowIndex);
 
         // Don't modify styles.
         // These are frozen by React now (as of 16.0.0).
@@ -594,84 +491,31 @@ export class GridExample extends PureComponent<any, any> {
         style = {
             ...style,
             backgroundColor: datum.color
-        }
+        };
 
         return (
-            <div
-                className={'classNames'}
-                key={key}
-                style={style}
-            >
+            <div className={"classNames"} key={key} style={style}>
                 {datum.name.charAt(0)}
             </div>
-        )
-    }
-
-    _updateUseDynamicRowHeights(value) {
-        this.setState({
-            useDynamicRowHeight: value
-        })
-    }
-
-    _onColumnCountChange(event) {
-        const columnCount = parseInt(event.target.value, 10) || 0
-
-        this.setState({ columnCount })
-    }
-
-    _onRowCountChange(event) {
-        const rowCount = parseInt(event.target.value, 10) || 0
-
-        this.setState({ rowCount })
-    }
-
-    _onScrollToColumnChange(event) {
-        const { columnCount } = this.state
-        let scrollToColumn = Math.min(columnCount - 1, parseInt(event.target.value, 10))
-
-        if (isNaN(scrollToColumn)) {
-            scrollToColumn = undefined
-        }
-
-        this.setState({ scrollToColumn })
-    }
-
-    _onScrollToRowChange(event) {
-        const { rowCount } = this.state
-        let scrollToRow = Math.min(rowCount - 1, parseInt(event.target.value, 10))
-
-        if (isNaN(scrollToRow)) {
-            scrollToRow = undefined
-        }
-
-        this.setState({ scrollToRow })
+        );
     }
 }
 
-import { InfiniteLoader } from 'react-virtualized'
+import { InfiniteLoader } from "react-virtualized";
 
-const STATUS_LOADING = 1
-const STATUS_LOADED = 2
+const STATUS_LOADING = 1;
+const STATUS_LOADED = 2;
 
 export class InfiniteLoaderExample extends PureComponent<any, any> {
     _timeoutIds = new Set<number>();
 
-    constructor(props) {
-        super(props)
-
-        this._clearData = this._clearData.bind(this)
-        this._isRowLoaded = this._isRowLoaded.bind(this)
-        this._loadMoreRows = this._loadMoreRows.bind(this)
-        this._rowRenderer = this._rowRenderer.bind(this)
-    }
-
     componentWillUnmount() {
         this._timeoutIds.forEach(clearTimeout);
     }
 
     render() {
-        const { list } = this.context
-        const { loadedRowCount, loadingRowCount } = this.state
+        const { list } = this.context;
+        const { loadedRowCount, loadingRowCount } = this.state;
 
         return (
             <InfiniteLoader
@@ -684,7 +528,7 @@ export class InfiniteLoaderExample extends PureComponent<any, any> {
                         {({ width }) => (
                             <List
                                 ref={registerChild}
-                                className={'styles.List'}
+                                className={"styles.List"}
                                 height={200}
                                 onRowsRendered={onRowsRendered}
                                 rowCount={list.size}
@@ -696,94 +540,81 @@ export class InfiniteLoaderExample extends PureComponent<any, any> {
                     </AutoSizer>
                 )}
             </InfiniteLoader>
-        )
+        );
     }
 
-    _clearData() {
-        this.setState({
-            loadedRowCount: 0,
-            loadedRowsMap: {},
-            loadingRowCount: 0
-        })
+    _isRowLoaded({ index }: Index) {
+        const { loadedRowsMap } = this.state;
+        return !!loadedRowsMap[index]; // STATUS_LOADING or STATUS_LOADED
     }
 
-    _isRowLoaded({ index }) {
-        const { loadedRowsMap } = this.state
-        return !!loadedRowsMap[index] // STATUS_LOADING or STATUS_LOADED
-    }
-
-    _loadMoreRows({ startIndex, stopIndex }) {
-        const { loadedRowsMap, loadingRowCount } = this.state
-        const increment = stopIndex - startIndex + 1
+    _loadMoreRows({ startIndex, stopIndex }: IndexRange) {
+        const { loadedRowsMap, loadingRowCount } = this.state;
+        const increment = stopIndex - startIndex + 1;
 
         for (let i = startIndex; i <= stopIndex; i++) {
-            loadedRowsMap[i] = STATUS_LOADING
+            loadedRowsMap[i] = STATUS_LOADING;
         }
 
         this.setState({
             loadingRowCount: loadingRowCount + increment
-        })
+        });
 
         const timeoutId = setTimeout(() => {
-            const { loadedRowCount, loadingRowCount } = this.state
+            const { loadedRowCount, loadingRowCount } = this.state;
 
             this._timeoutIds.delete(timeoutId);
 
             for (let i = startIndex; i <= stopIndex; i++) {
-                loadedRowsMap[i] = STATUS_LOADED
+                loadedRowsMap[i] = STATUS_LOADED;
             }
 
             this.setState({
                 loadingRowCount: loadingRowCount - increment,
                 loadedRowCount: loadedRowCount + increment
-            })
+            });
 
-            promiseResolver()
-        }, 1000 + Math.round(Math.random() * 2000))
+            promiseResolver();
+        }, 1000 + Math.round(Math.random() * 2000));
 
         this._timeoutIds.add(timeoutId);
 
-        let promiseResolver
+        let promiseResolver: () => void;
 
         return new Promise(resolve => {
-            promiseResolver = resolve
-        })
+            promiseResolver = resolve;
+        });
     }
 
-    _rowRenderer({ index, key, style }) {
-        const { list } = this.context
-        const { loadedRowsMap } = this.state
+    _rowRenderer({ index, key, style }: ListRowProps) {
+        const { list } = this.context;
+        const { loadedRowsMap } = this.state;
 
-        const row = list.get(index)
-        let content
+        const row = list.get(index);
+        let content;
 
         if (loadedRowsMap[index] === STATUS_LOADED) {
-            content = row.name
+            content = row.name;
         } else {
             content = (
                 <div
-                    className={'styles.placeholder'}
+                    className={"styles.placeholder"}
                     style={{ width: row.size }}
                 />
-            )
+            );
         }
 
         return (
-            <div
-                className={'styles.row'}
-                key={key}
-                style={style}
-            >
+            <div className={"styles.row"} key={key} style={style}>
                 {content}
             </div>
-        )
+        );
     }
 }
 
 export class ListExample extends PureComponent<any, any> {
-
-    constructor(props, context) {
-        super(props, context)
+    constructor(props: any, context: any) {
+        super(props, context);
 
         this.state = {
             listHeight: 300,
@@ -793,13 +624,7 @@ export class ListExample extends PureComponent<any, any> {
             scrollToIndex: undefined,
             showScrollingPlaceholder: false,
             useDynamicRowHeight: false
-        }
-
-        this._getRowHeight = this._getRowHeight.bind(this)
-        this._noRowsRenderer = this._noRowsRenderer.bind(this)
-        this._onRowCountChange = this._onRowCountChange.bind(this)
-        this._onScrollToRowChange = this._onScrollToRowChange.bind(this)
-        this._rowRenderer = this._rowRenderer.bind(this)
+        };
     }
 
     render() {
@@ -811,107 +636,84 @@ export class ListExample extends PureComponent<any, any> {
             scrollToIndex,
             showScrollingPlaceholder,
             useDynamicRowHeight
-    } = this.state
+        } = this.state;
 
         return (
             <AutoSizer disableHeight>
                 {({ width }) => (
                     <List
-                        ref='List'
-                        className={'styles.List'}
+                        ref="List"
+                        className={"styles.List"}
                         height={listHeight}
                         overscanRowCount={overscanRowCount}
                         noRowsRenderer={this._noRowsRenderer}
                         rowCount={rowCount}
-                        rowHeight={useDynamicRowHeight ? this._getRowHeight : listRowHeight}
+                        rowHeight={
+                            useDynamicRowHeight
+                                ? this._getRowHeight
+                                : listRowHeight
+                        }
                         rowRenderer={this._rowRenderer}
                         scrollToIndex={scrollToIndex}
                         width={width}
                     />
                 )}
             </AutoSizer>
-        )
+        );
     }
 
-    _getDatum(index) {
-        const { list } = this.context
+    _getDatum(index: number) {
+        const { list } = this.context;
 
-        return list.get(index % list.size)
+        return list.get(index % list.size);
     }
 
-    _getRowHeight({ index }) {
-        return this._getDatum(index).size
+    _getRowHeight({ index }: Index) {
+        return this._getDatum(index).size;
     }
 
     _noRowsRenderer() {
-        return (
-            <div className={'styles.noRows'}>
-                No rows
-      </div>
-        )
+        return <div className={"styles.noRows"}>No rows</div>;
     }
 
-    _onRowCountChange(event) {
-        const rowCount = parseInt(event.target.value, 10) || 0
+    _rowRenderer({ index, isScrolling, key, style }: ListRowProps) {
+        const { showScrollingPlaceholder, useDynamicRowHeight } = this.state;
 
-        this.setState({ rowCount })
-    }
-
-    _onScrollToRowChange(event) {
-        const { rowCount } = this.state
-        let scrollToIndex = Math.min(rowCount - 1, parseInt(event.target.value, 10))
-
-        if (isNaN(scrollToIndex)) {
-            scrollToIndex = undefined
-        }
-
-        this.setState({ scrollToIndex })
-    }
-
-    _rowRenderer({ index, isScrolling, key, style }) {
-        const {
-            showScrollingPlaceholder,
-            useDynamicRowHeight
-        } = this.state
-
-        if (
-            showScrollingPlaceholder &&
-            isScrolling
-        ) {
+        if (showScrollingPlaceholder && isScrolling) {
             return (
                 <div
-                    className={'cn(styles.row, styles.isScrollingPlaceholder)'}
+                    className={"cn(styles.row, styles.isScrollingPlaceholder)"}
                     key={key}
                     style={style}
                 >
                     Scrolling...
-        </div>
-            )
+                </div>
+            );
         }
 
-        const datum = this._getDatum(index)
+        const datum = this._getDatum(index);
 
-        let additionalContent
+        let additionalContent;
 
         if (useDynamicRowHeight) {
             switch (datum.size) {
                 case 75:
-                    additionalContent = <div>It is medium-sized.</div>
-                    break
+                    additionalContent = <div>It is medium-sized.</div>;
+                    break;
                 case 100:
-                    additionalContent = <div>It is large-sized.<br />It has a 3rd row.</div>
-                    break
+                    additionalContent = (
+                        <div>
+                            It is large-sized.<br />It has a 3rd row.
+                        </div>
+                    );
+                    break;
             }
         }
 
         return (
-            <div
-                className={'styles.row'}
-                key={key}
-                style={style}
-            >
+            <div className={"styles.row"} key={key} style={style}>
                 <div
-                    className={'styles.letter'}
+                    className={"styles.letter"}
                     style={{
                         backgroundColor: datum.color
                     }}
@@ -919,21 +721,15 @@ export class ListExample extends PureComponent<any, any> {
                     {datum.name.charAt(0)}
                 </div>
                 <div>
-                    <div className={'styles.name'}>
-                        {datum.name}
-                    </div>
-                    <div className={'styles.index'}>
-                        This is row {index}
-                    </div>
+                    <div className={"styles.name"}>{datum.name}</div>
+                    <div className={"styles.index"}>This is row {index}</div>
                     {additionalContent}
                 </div>
-                {useDynamicRowHeight &&
-                    <span className={'styles.height'}>
-                        {datum.size}px
-          </span>
-                }
+                {useDynamicRowHeight && (
+                    <span className={"styles.height"}>{datum.size}px</span>
+                )}
             </div>
-        )
+        );
     }
 }
 
@@ -943,43 +739,43 @@ import {
     Positioner,
     Masonry,
     MasonryCellProps
-} from 'react-virtualized'
+} from "react-virtualized";
 
 export class GridExample2 extends PureComponent<any, any> {
     _columnCount: number;
     _cache: CellMeasurerCache;
     _columnHeights: any;
-    _width: number;
-    _height: number;
-    _scrollTop: number;
-    _cellPositioner?: Positioner;
+    _width = 0;
+    _height = 0;
+    _scrollTop?: number;
+    _cellPositioner: Positioner;
     _masonry: Masonry;
 
-    constructor(props, context) {
-        super(props, context)
+    constructor(props: any, context: any) {
+        super(props, context);
 
-        this._columnCount = 0
+        this._columnCount = 0;
 
         this._cache = new CellMeasurerCache({
             defaultHeight: 250,
             defaultWidth: 200,
             fixedWidth: true
-        })
+        });
 
-        this._columnHeights = {}
+        this._columnHeights = {};
 
         this.state = {
             columnWidth: 200,
             height: 300,
             gutterSize: 10,
             windowScrollerEnabled: false
-        }
+        };
 
-        this._cellRenderer = this._cellRenderer.bind(this)
-        this._onResize = this._onResize.bind(this)
-        this._renderAutoSizer = this._renderAutoSizer.bind(this)
-        this._renderMasonry = this._renderMasonry.bind(this)
-        this._setMasonryRef = this._setMasonryRef.bind(this)
+        this._cellRenderer = this._cellRenderer.bind(this);
+        this._onResize = this._onResize.bind(this);
+        this._renderAutoSizer = this._renderAutoSizer.bind(this);
+        this._renderMasonry = this._renderMasonry.bind(this);
+        this._setMasonryRef = this._setMasonryRef.bind(this);
     }
 
     render() {
@@ -988,41 +784,30 @@ export class GridExample2 extends PureComponent<any, any> {
             height,
             gutterSize,
             windowScrollerEnabled
-        } = this.state
+        } = this.state;
 
-        let child
+        const child = windowScrollerEnabled ? (
+            <WindowScroller>{this._renderAutoSizer}</WindowScroller>
+        ) : (
+            this._renderAutoSizer({ height })
+        );
 
-        if (windowScrollerEnabled) {
-            child = (
-                <WindowScroller>
-                    {this._renderAutoSizer}
-                </WindowScroller>
-            )
-        } else {
-            child = this._renderAutoSizer({ height })
-        }
-
-        return (
-            <div>
-                {child}
-            </div>
-        )
+        return <div>{child}</div>;
     }
 
     _calculateColumnCount() {
-        const {
-            columnWidth,
-            gutterSize
-        } = this.state
+        const { columnWidth, gutterSize } = this.state;
 
-        this._columnCount = Math.floor(this._width / (columnWidth + gutterSize))
+        this._columnCount = Math.floor(
+            this._width / (columnWidth + gutterSize)
+        );
     }
 
     _cellRenderer({ index, key, parent, style }: MasonryCellProps) {
-        const { list } = this.context
-        const { columnWidth } = this.state
+        const { list } = this.context;
+        const { columnWidth } = this.state;
 
-        const datum = list.get(index % list.size)
+        const datum = list.get(index % list.size);
 
         return (
             <CellMeasurer
@@ -1032,7 +817,7 @@ export class GridExample2 extends PureComponent<any, any> {
                 parent={parent}
             >
                 <div
-                    className={'styles.Cell'}
+                    className={"styles.Cell"}
                     style={{
                         ...style,
                         width: columnWidth
@@ -1041,64 +826,64 @@ export class GridExample2 extends PureComponent<any, any> {
                     <div
                         style={{
                             backgroundColor: datum.color,
-                            borderRadius: '0.5rem',
+                            borderRadius: "0.5rem",
                             height: datum.size * 3,
-                            marginBottom: '0.5rem',
-                            width: '100%'
+                            marginBottom: "0.5rem",
+                            width: "100%"
                         }}
                     />
                     {datum.random}
                 </div>
             </CellMeasurer>
-        )
+        );
     }
 
     _initCellPositioner() {
-        if (typeof this._cellPositioner === 'undefined') {
-            const {
-                columnWidth,
-                gutterSize
-            } = this.state
+        if (typeof this._cellPositioner === "undefined") {
+            const { columnWidth, gutterSize } = this.state;
 
             this._cellPositioner = createCellPositioner({
                 cellMeasurerCache: this._cache,
                 columnCount: this._columnCount,
                 columnWidth,
                 spacer: gutterSize
-            })
+            });
         }
     }
 
-    _onResize({ height, width }) {
-        this._width = width
+    _onResize({ height, width }: Size) {
+        this._width = width;
 
-        this._columnHeights = {}
-        this._calculateColumnCount()
-        this._resetCellPositioner()
-        this._masonry.recomputeCellPositions()
+        this._columnHeights = {};
+        this._calculateColumnCount();
+        this._resetCellPositioner();
+        this._masonry.recomputeCellPositions();
     }
 
-    _renderAutoSizer({ height, scrollTop }: { height: number, scrollTop?: number }) {
-        this._height = height
-        this._scrollTop = scrollTop
+    _renderAutoSizer({
+        height,
+        scrollTop
+    }: {
+        height: number;
+        scrollTop?: number;
+    }) {
+        this._height = height;
+        this._scrollTop = scrollTop;
 
         return (
-            <AutoSizer
-                disableHeight
-                onResize={this._onResize}
-            >
+            <AutoSizer disableHeight onResize={this._onResize}>
                 {this._renderMasonry}
             </AutoSizer>
-        )
+        );
     }
 
-    _renderMasonry({ width }) {
-        this._width = width
+    _renderMasonry({ width }: Size) {
+        this._width = width;
 
-        this._calculateColumnCount()
-        this._initCellPositioner()
+        this._calculateColumnCount();
+        this._initCellPositioner();
 
-        const { height, windowScrollerEnabled } = this.state
+        const { height, windowScrollerEnabled } = this.state;
 
         return (
             <Masonry
@@ -1112,70 +897,51 @@ export class GridExample2 extends PureComponent<any, any> {
                 scrollTop={this._scrollTop}
                 width={width}
             />
-        )
+        );
     }
 
     _resetCellPositioner() {
-        const {
-            columnWidth,
-            gutterSize
-        } = this.state
+        const { columnWidth, gutterSize } = this.state;
 
         this._cellPositioner.reset({
             columnCount: this._columnCount,
             columnWidth,
             spacer: gutterSize
-        })
+        });
     }
 
-    _setMasonryRef(ref) {
-        this._masonry = ref
+    _setMasonryRef(ref: any) {
+        this._masonry = ref;
     }
 }
 
-import { MultiGrid } from 'react-virtualized'
+import { MultiGrid } from "react-virtualized";
 
 const STYLE: React.CSSProperties = {
-    border: '1px solid #ddd',
-    overflow: 'hidden'
-}
+    border: "1px solid #ddd",
+    overflow: "hidden"
+};
 const STYLE_BOTTOM_LEFT_GRID: React.CSSProperties = {
-    borderRight: '2px solid #aaa',
-    backgroundColor: '#f7f7f7'
-}
+    borderRight: "2px solid #aaa",
+    backgroundColor: "#f7f7f7"
+};
 const STYLE_TOP_LEFT_GRID: React.CSSProperties = {
-    borderBottom: '2px solid #aaa',
-    borderRight: '2px solid #aaa',
-    fontWeight: 'bold'
-}
+    borderBottom: "2px solid #aaa",
+    borderRight: "2px solid #aaa",
+    fontWeight: "bold"
+};
 const STYLE_TOP_RIGHT_GRID: React.CSSProperties = {
-    borderBottom: '2px solid #aaa',
-    fontWeight: 'bold'
-}
+    borderBottom: "2px solid #aaa",
+    fontWeight: "bold"
+};
 
 export class MultiGridExample extends PureComponent<{}, any> {
-    state
-    _onFixedColumnCountChange
-    _onFixedRowCountChange
-    _onScrollToColumnChange
-    _onScrollToRowChange
-
-    constructor(props, context) {
-        super(props, context)
-
-        this.state = {
-            fixedColumnCount: 2,
-            fixedRowCount: 1,
-            scrollToColumn: 0,
-            scrollToRow: 0
-        }
-
-        this._cellRenderer = this._cellRenderer.bind(this)
-        this._onFixedColumnCountChange = this._createEventHandler('fixedColumnCount')
-        this._onFixedRowCountChange = this._createEventHandler('fixedRowCount')
-        this._onScrollToColumnChange = this._createEventHandler('scrollToColumn')
-        this._onScrollToRowChange = this._createEventHandler('scrollToRow')
-    }
+    state = {
+        fixedColumnCount: 2,
+        fixedRowCount: 1,
+        scrollToColumn: 0,
+        scrollToRow: 0
+    };
 
     render() {
         return (
@@ -1197,72 +963,38 @@ export class MultiGridExample extends PureComponent<{}, any> {
                     />
                 )}
             </AutoSizer>
-        )
+        );
     }
 
-    _cellRenderer({ columnIndex, key, rowIndex, style }) {
+    _cellRenderer({ columnIndex, key, rowIndex, style }: GridCellProps) {
         return (
-            <div
-                className={'styles.Cell'}
-                key={key}
-                style={style}
-            >
+            <div className={"styles.Cell"} key={key} style={style}>
                 {columnIndex}, {rowIndex}
             </div>
-        )
-    }
-
-    _createEventHandler(property) {
-        return (event) => {
-            const value = parseInt(event.target.value, 10) || 0
-
-            this.setState({
-                [property]: value
-            })
-        }
-    }
-
-    _createLabeledInput(property, eventHandler) {
-        const value = this.state[property]
-
-        return (
-            `<LabeledInput
-                label={property}
-                name={property}
-                onChange={eventHandler}
-                value={value}
-            />`
-        )
+        );
     }
 }
 
-import { ScrollSync } from 'react-virtualized'
+import { ScrollSync } from "react-virtualized";
 
-const LEFT_COLOR_FROM = hexToRgb('#471061')
-const LEFT_COLOR_TO = hexToRgb('#BC3959')
-const TOP_COLOR_FROM = hexToRgb('#000000')
-const TOP_COLOR_TO = hexToRgb('#333333')
+const LEFT_COLOR_FROM = hexToRgb("#471061");
+const LEFT_COLOR_TO = hexToRgb("#BC3959");
+const TOP_COLOR_FROM = hexToRgb("#000000");
+const TOP_COLOR_TO = hexToRgb("#333333");
 
-function scrollbarSize() { return 42; }
+function scrollbarSize() {
+    return 42;
+}
 export class GridExample3 extends PureComponent<{}, any> {
-    state
-    constructor(props, context) {
-        super(props, context)
-
-        this.state = {
-            columnWidth: 75,
-            columnCount: 50,
-            height: 300,
-            overscanColumnCount: 0,
-            overscanRowCount: 5,
-            rowHeight: 40,
-            rowCount: 100
-        }
-
-        this._renderBodyCell = this._renderBodyCell.bind(this)
-        this._renderHeaderCell = this._renderHeaderCell.bind(this)
-        this._renderLeftSideCell = this._renderLeftSideCell.bind(this)
-    }
+    state = {
+        columnWidth: 75,
+        columnCount: 50,
+        height: 300,
+        overscanColumnCount: 0,
+        overscanRowCount: 5,
+        rowHeight: 40,
+        rowCount: 100
+    };
 
     render() {
         const {
@@ -1273,37 +1005,60 @@ export class GridExample3 extends PureComponent<{}, any> {
             overscanRowCount,
             rowHeight,
             rowCount
-        } = this.state
+        } = this.state;
 
         return (
-
             <ScrollSync>
-                {({ clientHeight, clientWidth, onScroll, scrollHeight, scrollLeft, scrollTop, scrollWidth }) => {
-                    const x = scrollLeft / (scrollWidth - clientWidth)
-                    const y = scrollTop / (scrollHeight - clientHeight)
+                {({
+                    clientHeight,
+                    clientWidth,
+                    onScroll,
+                    scrollHeight,
+                    scrollLeft,
+                    scrollTop,
+                    scrollWidth
+                }) => {
+                    const x = scrollLeft / (scrollWidth - clientWidth);
+                    const y = scrollTop / (scrollHeight - clientHeight);
 
-                    const leftBackgroundColor = mixColors(LEFT_COLOR_FROM, LEFT_COLOR_TO, y)
-                    const leftColor = '#ffffff'
-                    const topBackgroundColor = mixColors(TOP_COLOR_FROM, TOP_COLOR_TO, x)
-                    const topColor = '#ffffff'
-                    const middleBackgroundColor = mixColors(leftBackgroundColor, topBackgroundColor, 0.5)
-                    const middleColor = '#ffffff'
+                    const leftBackgroundColor = mixColors(
+                        LEFT_COLOR_FROM,
+                        LEFT_COLOR_TO,
+                        y
+                    );
+                    const leftColor = "#ffffff";
+                    const topBackgroundColor = mixColors(
+                        TOP_COLOR_FROM,
+                        TOP_COLOR_TO,
+                        x
+                    );
+                    const topColor = "#ffffff";
+                    const middleBackgroundColor = mixColors(
+                        leftBackgroundColor,
+                        topBackgroundColor,
+                        0.5
+                    );
+                    const middleColor = "#ffffff";
 
                     return (
-                        <div className={'styles.GridRow'}>
+                        <div className={"styles.GridRow"}>
                             <div
-                                className={'styles.LeftSideGridContainer'}
+                                className={"styles.LeftSideGridContainer"}
                                 style={{
-                                    position: 'absolute',
+                                    position: "absolute",
                                     left: 0,
                                     top: 0,
                                     color: leftColor,
-                                    backgroundColor: `rgb(${topBackgroundColor.r},${topBackgroundColor.g},${topBackgroundColor.b})`
+                                    backgroundColor: `rgb(${
+                                        topBackgroundColor.r
+                                    },${topBackgroundColor.g},${
+                                        topBackgroundColor.b
+                                    })`
                                 }}
                             >
                                 <Grid
                                     cellRenderer={this._renderLeftHeaderCell}
-                                    className={'styles.HeaderGrid'}
+                                    className={"styles.HeaderGrid"}
                                     width={columnWidth}
                                     height={rowHeight}
                                     rowHeight={rowHeight}
@@ -1313,13 +1068,17 @@ export class GridExample3 extends PureComponent<{}, any> {
                                 />
                             </div>
                             <div
-                                className={'styles.LeftSideGridContainer'}
+                                className={"styles.LeftSideGridContainer"}
                                 style={{
-                                    position: 'absolute',
+                                    position: "absolute",
                                     left: 0,
                                     top: rowHeight,
                                     color: leftColor,
-                                    backgroundColor: `rgb(${leftBackgroundColor.r},${leftBackgroundColor.g},${leftBackgroundColor.b})`
+                                    backgroundColor: `rgb(${
+                                        leftBackgroundColor.r
+                                    },${leftBackgroundColor.g},${
+                                        leftBackgroundColor.b
+                                    })`
                                 }}
                             >
                                 <Grid
@@ -1328,7 +1087,7 @@ export class GridExample3 extends PureComponent<{}, any> {
                                     cellRenderer={this._renderLeftSideCell}
                                     columnWidth={columnWidth}
                                     columnCount={1}
-                                    className={'styles.LeftSideGrid'}
+                                    className={"styles.LeftSideGrid"}
                                     height={height - scrollbarSize()}
                                     rowHeight={rowHeight}
                                     rowCount={rowCount}
@@ -1336,46 +1095,75 @@ export class GridExample3 extends PureComponent<{}, any> {
                                     width={columnWidth}
                                 />
                             </div>
-                            <div className={'styles.GridColumn'}>
+                            <div className={"styles.GridColumn"}>
                                 <AutoSizer disableHeight>
                                     {({ width }) => (
                                         <div>
-                                            <div style={{
-                                                backgroundColor: `rgb(${topBackgroundColor.r},${topBackgroundColor.g},${topBackgroundColor.b})`,
-                                                color: topColor,
-                                                height: rowHeight,
-                                                width: width - scrollbarSize()
-                                            }}>
+                                            <div
+                                                style={{
+                                                    backgroundColor: `rgb(${
+                                                        topBackgroundColor.r
+                                                    },${topBackgroundColor.g},${
+                                                        topBackgroundColor.b
+                                                    })`,
+                                                    color: topColor,
+                                                    height: rowHeight,
+                                                    width:
+                                                        width - scrollbarSize()
+                                                }}
+                                            >
                                                 <Grid
-                                                    className={'styles.HeaderGrid'}
+                                                    className={
+                                                        "styles.HeaderGrid"
+                                                    }
                                                     columnWidth={columnWidth}
                                                     columnCount={columnCount}
                                                     height={rowHeight}
-                                                    overscanColumnCount={overscanColumnCount}
-                                                    cellRenderer={this._renderHeaderCell}
+                                                    overscanColumnCount={
+                                                        overscanColumnCount
+                                                    }
+                                                    cellRenderer={
+                                                        this._renderHeaderCell
+                                                    }
                                                     rowHeight={rowHeight}
                                                     rowCount={1}
                                                     scrollLeft={scrollLeft}
-                                                    width={width - scrollbarSize()}
+                                                    width={
+                                                        width - scrollbarSize()
+                                                    }
                                                 />
                                             </div>
                                             <div
                                                 style={{
-                                                    backgroundColor: `rgb(${middleBackgroundColor.r},${middleBackgroundColor.g},${middleBackgroundColor.b})`,
+                                                    backgroundColor: `rgb(${
+                                                        middleBackgroundColor.r
+                                                    },${
+                                                        middleBackgroundColor.g
+                                                    },${
+                                                        middleBackgroundColor.b
+                                                    })`,
                                                     color: middleColor,
                                                     height,
                                                     width
                                                 }}
                                             >
                                                 <Grid
-                                                    className={'styles.BodyGrid'}
+                                                    className={
+                                                        "styles.BodyGrid"
+                                                    }
                                                     columnWidth={columnWidth}
                                                     columnCount={columnCount}
                                                     height={height}
                                                     onScroll={onScroll}
-                                                    overscanColumnCount={overscanColumnCount}
-                                                    overscanRowCount={overscanRowCount}
-                                                    cellRenderer={this._renderBodyCell}
+                                                    overscanColumnCount={
+                                                        overscanColumnCount
+                                                    }
+                                                    overscanRowCount={
+                                                        overscanRowCount
+                                                    }
+                                                    cellRenderer={
+                                                        this._renderBodyCell
+                                                    }
                                                     rowHeight={rowHeight}
                                                     rowCount={rowCount}
                                                     width={width}
@@ -1386,107 +1174,92 @@ export class GridExample3 extends PureComponent<{}, any> {
                                 </AutoSizer>
                             </div>
                         </div>
-                    )
+                    );
                 }}
             </ScrollSync>
-        )
+        );
     }
 
-    _renderBodyCell({ columnIndex, key, rowIndex, style }) {
-        if (columnIndex < 1) {
-            return
+    _renderBodyCell(params: GridCellProps) {
+        if (params.columnIndex < 1) {
+            return;
         }
 
-        return this._renderLeftSideCell({ columnIndex, key, rowIndex, style })
+        return this._renderLeftSideCell(params);
     }
 
-    _renderHeaderCell({ columnIndex, key, rowIndex, style }) {
-        if (columnIndex < 1) {
-            return
+    _renderHeaderCell(params: GridCellProps) {
+        if (params.columnIndex < 1) {
+            return;
         }
 
-        return this._renderLeftHeaderCell({ columnIndex, key, rowIndex, style })
+        return this._renderLeftHeaderCell(params);
     }
 
-    _renderLeftHeaderCell({ columnIndex, key, rowIndex, style }) {
+    _renderLeftHeaderCell({
+        columnIndex,
+        key,
+        rowIndex,
+        style
+    }: GridCellProps) {
         return (
-            <div
-                className={'styles.headerCell'}
-                key={key}
-                style={style}
-            >
+            <div className={"styles.headerCell"} key={key} style={style}>
                 {`C${columnIndex}`}
             </div>
-        )
+        );
     }
 
-    _renderLeftSideCell({ columnIndex, key, rowIndex, style }) {
+    _renderLeftSideCell({ columnIndex, key, rowIndex, style }: GridCellProps) {
         return (
-            <div
-                className={'classNames'}
-                key={key}
-                style={style}
-            >
+            <div className={"classNames"} key={key} style={style}>
                 {`R${rowIndex}, C${columnIndex}`}
             </div>
-        )
+        );
     }
 }
 
-function hexToRgb(hex) {
-    const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex)
-    return result ? {
-        r: parseInt(result[1], 16),
-        g: parseInt(result[2], 16),
-        b: parseInt(result[3], 16)
-    } : null
+function hexToRgb(hex: string) {
+    const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
+    return result
+        ? {
+              r: parseInt(result[1], 16),
+              g: parseInt(result[2], 16),
+              b: parseInt(result[3], 16)
+          }
+        : null;
 }
 
 /**
  * Ported from sass implementation in C
  * https://github.com/sass/libsass/blob/0e6b4a2850092356aa3ece07c6b249f0221caced/functions.cpp#L209
  */
-function mixColors(color1, color2, amount) {
-    const weight1 = amount
-    const weight2 = 1 - amount
+function mixColors(color1: any, color2: any, amount: any) {
+    const weight1 = amount;
+    const weight2 = 1 - amount;
 
-    const r = Math.round(weight1 * color1.r + weight2 * color2.r)
-    const g = Math.round(weight1 * color1.g + weight2 * color2.g)
-    const b = Math.round(weight1 * color1.b + weight2 * color2.b)
+    const r = Math.round(weight1 * color1.r + weight2 * color2.r);
+    const g = Math.round(weight1 * color1.g + weight2 * color2.g);
+    const b = Math.round(weight1 * color1.b + weight2 * color2.b);
 
-    return { r, g, b }
+    return { r, g, b };
 }
 
-import { Column, Table, SortDirection, SortIndicator } from 'react-virtualized'
+import { Column, Table, SortDirection, SortIndicator } from "react-virtualized";
 
 export class TableExample extends PureComponent<{}, any> {
-    state;
-    context;
-    constructor(props, context) {
-        super(props, context)
-
-        this.state = {
-            disableHeader: false,
-            headerHeight: 30,
-            height: 270,
-            hideIndexRow: false,
-            overscanRowCount: 10,
-            rowHeight: 40,
-            rowCount: 1000,
-            scrollToIndex: undefined,
-            sortBy: 'index',
-            sortDirection: SortDirection.ASC,
-            useDynamicRowHeight: false
-        }
-
-        this._getRowHeight = this._getRowHeight.bind(this)
-        this._headerRenderer = this._headerRenderer.bind(this)
-        this._noRowsRenderer = this._noRowsRenderer.bind(this)
-        this._onRowCountChange = this._onRowCountChange.bind(this)
-        this._onScrollToRowChange = this._onScrollToRowChange.bind(this)
-        this._rowClassName = this._rowClassName.bind(this)
-        this._sort = this._sort.bind(this)
-    }
+    state = {
+        disableHeader: false,
+        headerHeight: 30,
+        height: 270,
+        hideIndexRow: false,
+        overscanRowCount: 10,
+        rowHeight: 40,
+        rowCount: 1000,
+        scrollToIndex: undefined,
+        sortBy: "index",
+        sortDirection: SortDirection.ASC,
+        useDynamicRowHeight: false
+    };
 
     render() {
         const {
@@ -1501,35 +1274,32 @@ export class TableExample extends PureComponent<{}, any> {
             sortBy,
             sortDirection,
             useDynamicRowHeight
-        } = this.state
+        } = this.state;
 
-        const { list } = this.context
-        const sortedList = this._isSortEnabled()
-            ? list
-                .sortBy(item => item[sortBy])
-                .update(list =>
-                    sortDirection === SortDirection.DESC
-                        ? list.reverse()
-                        : list
-                )
-            : list
+        const { list } = this.context;
+        const sortedList = list;
 
-        const rowGetter = ({ index }) => this._getDatum(sortedList, index)
+        const rowGetter = ({ index }: Index) =>
+            this._getDatum(sortedList, index);
 
         return (
             <div>
                 <AutoSizer disableHeight>
                     {({ width }) => (
                         <Table
-                            ref='Table'
+                            ref="Table"
                             disableHeader={disableHeader}
-                            headerClassName={'styles.headerColumn'}
+                            headerClassName={"styles.headerColumn"}
                             headerHeight={headerHeight}
                             height={height}
                             noRowsRenderer={this._noRowsRenderer}
                             overscanRowCount={overscanRowCount}
                             rowClassName={this._rowClassName}
-                            rowHeight={useDynamicRowHeight ? this._getRowHeight : rowHeight}
+                            rowHeight={
+                                useDynamicRowHeight
+                                    ? this._getRowHeight
+                                    : rowHeight
+                            }
                             rowGetter={rowGetter}
                             rowCount={rowCount}
                             scrollToIndex={scrollToIndex}
@@ -1538,20 +1308,22 @@ export class TableExample extends PureComponent<{}, any> {
                             sortDirection={sortDirection}
                             width={width}
                         >
-                            {!hideIndexRow &&
+                            {!hideIndexRow && (
                                 <Column
-                                    label='Index'
-                                    cellDataGetter={
-                                        ({ columnData, dataKey, rowData }) => rowData.index
-                                    }
-                                    dataKey='index'
+                                    label="Index"
+                                    cellDataGetter={({
+                                        columnData,
+                                        dataKey,
+                                        rowData
+                                    }) => rowData.index}
+                                    dataKey="index"
                                     disableSort={!this._isSortEnabled()}
                                     defaultSortDirection={SortDirection.DESC}
                                     width={60}
                                 />
-                            }
+                            )}
                             <Column
-                                dataKey='name'
+                                dataKey="name"
                                 disableSort={!this._isSortEnabled()}
                                 defaultSortDirection={SortDirection.ASC}
                                 headerRenderer={this._headerRenderer}
@@ -1560,29 +1332,33 @@ export class TableExample extends PureComponent<{}, any> {
                             <Column
                                 width={210}
                                 disableSort
-                                label='The description label is really long so that it will be truncated'
-                                dataKey='random'
-                                className={'styles.exampleColumn'}
-                                cellRenderer={
-                                    ({ cellData, columnData, dataKey, rowData, rowIndex }) => cellData
-                                }
+                                label="The description label is really long so that it will be truncated"
+                                dataKey="random"
+                                className={"styles.exampleColumn"}
+                                cellRenderer={({
+                                    cellData,
+                                    columnData,
+                                    dataKey,
+                                    rowData,
+                                    rowIndex
+                                }) => cellData}
                                 flexGrow={1}
                             />
                         </Table>
                     )}
                 </AutoSizer>
             </div>
-        )
+        );
     }
 
-    _getDatum(list, index) {
-        return list.get(index % list.size)
+    _getDatum(list: any, index: number) {
+        return list.get(index % list.size);
     }
 
-    _getRowHeight({ index }) {
-        const { list } = this.context
+    _getRowHeight({ index }: Index) {
+        const { list } = this.context;
 
-        return this._getDatum(list, index).size
+        return this._getDatum(list, index).size;
     }
 
     _headerRenderer({
@@ -1592,94 +1368,57 @@ export class TableExample extends PureComponent<{}, any> {
         label,
         sortBy,
         sortDirection
-    }) {
+    }: TableHeaderProps) {
         return (
             <div>
                 Full Name
-        {sortBy === dataKey &&
+                {sortBy === dataKey && (
                     <SortIndicator sortDirection={sortDirection} />
-                }
+                )}
             </div>
-        )
+        );
     }
 
     _isSortEnabled() {
-        const { list } = this.context
-        const { rowCount } = this.state
+        const { list } = this.context;
+        const { rowCount } = this.state;
 
-        return rowCount <= list.size
+        return rowCount <= list.size;
     }
 
     _noRowsRenderer() {
-        return (
-            <div className={'styles.noRows'}>
-                No rows
-      </div>
-        )
+        return <div className={"styles.noRows"}>No rows</div>;
     }
 
-    _onRowCountChange(event) {
-        const rowCount = parseInt(event.target.value, 10) || 0
-
-        this.setState({ rowCount })
-    }
-
-    _onScrollToRowChange(event) {
-        const { rowCount } = this.state
-        let scrollToIndex = Math.min(rowCount - 1, parseInt(event.target.value, 10))
-
-        if (isNaN(scrollToIndex)) {
-            scrollToIndex = undefined
-        }
-
-        this.setState({ scrollToIndex })
-    }
-
-    _rowClassName({ index }) {
+    _rowClassName({ index }: Index) {
         if (index < 0) {
-            return 'styles.headerRow'
+            return "styles.headerRow";
         } else {
-            return index % 2 === 0 ? 'styles.evenRow' : 'styles.oddRow'
+            return index % 2 === 0 ? "styles.evenRow" : "styles.oddRow";
         }
     }
 
-    _sort({ sortBy, sortDirection }) {
-        this.setState({ sortBy, sortDirection })
-    }
-
-    _updateUseDynamicRowHeight(value) {
-        this.setState({
-            useDynamicRowHeight: value
-        })
+    _sort({
+        sortBy,
+        sortDirection
+    }: {
+        sortBy: string;
+        sortDirection: SortDirectionType;
+    }) {
+        this.setState({ sortBy, sortDirection });
     }
 }
 
-import { TableCellProps } from "react-virtualized"
+import { TableCellProps } from "react-virtualized";
 
 export class DynamicHeightTableColumnExample extends PureComponent<any, any> {
-    state;
-    context;
-    _cache: CellMeasurerCache;
-    constructor(props, context) {
-        super(props, context)
-
-        this._cache = new CellMeasurerCache({
-            fixedWidth: true,
-            minHeight: 25
-        })
-
-        this._columnCellRenderer = this._columnCellRenderer.bind(this)
-        this._rowGetter = this._rowGetter.bind(this)
-    }
-
-    componentWillReceiveProps(nextProps) {
-        if (nextProps.width !== this.props.width) {
-            this._cache.clearAll()
-        }
-    }
+    _cache = new CellMeasurerCache({
+        fixedWidth: true,
+        minHeight: 25
+    });
 
     render() {
-        const { width } = this.props
+        const { width } = this.props;
 
         return (
             <Table
@@ -1687,41 +1426,39 @@ export class DynamicHeightTableColumnExample extends PureComponent<any, any> {
                 headerHeight={20}
                 height={400}
                 overscanRowCount={2}
-                rowClassName={'styles.tableRow'}
+                rowClassName={"styles.tableRow"}
                 rowHeight={this._cache.rowHeight}
                 rowGetter={this._rowGetter}
                 rowCount={1000}
                 width={width}
             >
                 <Column
-                    className={'styles.tableColumn'}
-                    dataKey='name'
-                    label='Name'
+                    className={"styles.tableColumn"}
+                    dataKey="name"
+                    label="Name"
                     width={125}
                 />
                 <Column
-                    className={'styles.tableColumn'}
-                    dataKey='color'
-                    label='Color'
+                    className={"styles.tableColumn"}
+                    dataKey="color"
+                    label="Color"
                     width={75}
                 />
                 <Column
                     width={width - 200}
-                    dataKey='random'
-                    label='Dynamic text'
+                    dataKey="random"
+                    label="Dynamic text"
                     cellRenderer={this._columnCellRenderer}
                 />
             </Table>
-        )
+        );
     }
 
     _columnCellRenderer(args: TableCellProps) {
-        const { list } = this.props
+        const { list } = this.props;
 
-        const datum = list.get(args.rowIndex % list.size)
-        const content = args.rowIndex % 5 === 0
-            ? ''
-            : datum.randomLong
+        const datum = list.get(args.rowIndex % list.size);
+        const content = args.rowIndex % 5 === 0 ? "" : datum.randomLong;
 
         return (
             <CellMeasurer
@@ -1732,65 +1469,60 @@ export class DynamicHeightTableColumnExample extends PureComponent<any, any> {
                 rowIndex={args.rowIndex}
             >
                 <div
-                    className={'styles.tableColumn'}
+                    className={"styles.tableColumn"}
                     style={{
-                        whiteSpace: 'normal'
+                        whiteSpace: "normal"
                     }}
                 >
                     {content}
                 </div>
             </CellMeasurer>
-        )
+        );
     }
 
-    _rowGetter({ index }) {
-        const { list } = this.props
+    _rowGetter({ index }: Index) {
+        const { list } = this.props;
 
-        return list.get(index % list.size)
+        return list.get(index % list.size);
     }
 }
 
 export class WindowScrollerExample extends PureComponent<{}, any> {
-    state;
-    context;
     _windowScroller: WindowScroller;
-
-    constructor(props) {
-        super(props)
-
-        this.state = {
-            showHeaderText: true
-        }
-
-        this._hideHeader = this._hideHeader.bind(this)
-        this._rowRenderer = this._rowRenderer.bind(this)
-        this._onCheckboxChange = this._onCheckboxChange.bind(this)
-        this._setRef = this._setRef.bind(this)
-    }
+    state = {
+        showHeaderText: true
+    };
 
     render() {
-        const { list, isScrollingCustomElement, customElement } = this.context
-        const { showHeaderText } = this.state
+        const { list, isScrollingCustomElement, customElement } = this.context;
+        const { showHeaderText } = this.state;
 
         return (
-
-            <div className={'styles.WindowScrollerWrapper'}>
+            <div className={"styles.WindowScrollerWrapper"}>
                 <WindowScroller
                     ref={this._setRef}
-                    scrollElement={isScrollingCustomElement ? customElement : null}
+                    scrollElement={
+                        isScrollingCustomElement ? customElement : null
+                    }
                 >
-                    {({ height, isScrolling, scrollTop }) => (
+                    {({ height, isScrolling, scrollTop, onChildScroll }) => (
                         <AutoSizer disableHeight>
                             {({ width }) => (
                                 <List
+                                    onScroll={onChildScroll}
                                     autoHeight
-                                    className={'styles.List'}
+                                    className={"styles.List"}
                                     height={height}
                                     isScrolling={isScrolling}
                                     overscanRowCount={2}
                                     rowCount={list.size}
                                     rowHeight={30}
-                                    rowRenderer={({ index, isVisible, key, style }) => this._rowRenderer({ index, isScrolling, isVisible, key, style })}
+                                    rowRenderer={params =>
+                                        this._rowRenderer({
+                                            ...params,
+                                            isScrolling
+                                        })
+                                    }
                                     scrollTop={scrollTop}
                                     width={width}
                                 />
@@ -1799,60 +1531,40 @@ export class WindowScrollerExample extends PureComponent<{}, any> {
                     )}
                 </WindowScroller>
             </div>
-        )
+        );
     }
 
-    _hideHeader() {
-        const { showHeaderText } = this.state
-
-        this.setState({
-            showHeaderText: !showHeaderText
-        }, () => {
-            this._windowScroller.updatePosition()
-        })
-    }
-
-    _rowRenderer({ index, isScrolling, isVisible, key, style }) {
-        const { list } = this.context
-        const row = list.get(index)
+    _rowRenderer({ index, isScrolling, isVisible, key, style }: ListRowProps) {
+        const { list } = this.context;
+        const row = list.get(index);
 
         return (
-            <div
-                key={key}
-                className={'className'}
-                style={style}
-            >
+            <div key={key} className={"className"} style={style}>
                 {row.name}
             </div>
-        )
+        );
     }
 
-    _setRef(windowScroller) {
-        this._windowScroller = windowScroller
-    }
-
-    _onCheckboxChange(event) {
-        this.context.setScrollingCustomElement(event.target.checked)
+    _setRef(windowScroller: any) {
+        this._windowScroller = windowScroller;
     }
 }
 
-import { GridCellProps, GridCellRangeProps } from 'react-virtualized'
+import {
+    GridCellProps,
+    GridCellRangeProps,
+    SortParams,
+    SortDirectionType
+} from "react-virtualized";
 
 export class GridCellRangeRendererExample extends PureComponent<{}, any> {
-
-    constructor(props) {
-        super(props)
-
-        this.state = {
-            columnWidth: 75,
-            columnCount: 50,
-            height: 300,
-            rowHeight: 40,
-            rowCount: 100
-        }
-
-        this._cellRangeRenderer = this._cellRangeRenderer.bind(this)
-    }
+    state = {
+        columnWidth: 75,
+        columnCount: 50,
+        height: 300,
+        rowHeight: 40,
+        rowCount: 100
+    };
 
     render() {
         const {
@@ -1861,7 +1573,7 @@ export class GridCellRangeRendererExample extends PureComponent<{}, any> {
             height,
             rowHeight,
             rowCount
-        } = this.state
+        } = this.state;
 
         return (
             <Grid
@@ -1878,54 +1590,66 @@ export class GridCellRangeRendererExample extends PureComponent<{}, any> {
                 rowHeight={rowHeight}
                 width={columnWidth}
             />
-        )
+        );
     }
 
     _cellRangeRenderer({
-        cellCache,                    // Temporary cell cache used while scrolling
-        cellRenderer,                 // Cell renderer prop supplied to Grid
+        cellCache, // Temporary cell cache used while scrolling
+        cellRenderer, // Cell renderer prop supplied to Grid
         columnSizeAndPositionManager, // @see CellSizeAndPositionManager,
-        columnStartIndex,             // Index of first column (inclusive) to render
-        columnStopIndex,              // Index of last column (inclusive) to render
-        horizontalOffsetAdjustment,   // Horizontal pixel offset (required for scaling)
-        isScrolling,                  // The Grid is currently being scrolled
-        rowSizeAndPositionManager,    // @see CellSizeAndPositionManager,
-        rowStartIndex,                // Index of first column (inclusive) to render
-        rowStopIndex,                 // Index of last column (inclusive) to render
-        scrollLeft,                   // Current horizontal scroll offset of Grid
-        scrollTop,                    // Current vertical scroll offset of Grid
-        styleCache,                   // Temporary style (size & position) cache used while scrolling
-        verticalOffsetAdjustment,     // Vertical pixel offset (required for scaling)
+        columnStartIndex, // Index of first column (inclusive) to render
+        columnStopIndex, // Index of last column (inclusive) to render
+        horizontalOffsetAdjustment, // Horizontal pixel offset (required for scaling)
+        isScrolling, // The Grid is currently being scrolled
+        rowSizeAndPositionManager, // @see CellSizeAndPositionManager,
+        rowStartIndex, // Index of first column (inclusive) to render
+        rowStopIndex, // Index of last column (inclusive) to render
+        scrollLeft, // Current horizontal scroll offset of Grid
+        scrollTop, // Current vertical scroll offset of Grid
+        styleCache, // Temporary style (size & position) cache used while scrolling
+        verticalOffsetAdjustment, // Vertical pixel offset (required for scaling)
         parent,
         visibleColumnIndices,
-        visibleRowIndices,
-      }: GridCellRangeProps): React.ReactNode[] {
-        const renderedCells: React.ReactNode[] = []
-        const style: React.CSSProperties = {}
+        visibleRowIndices
+    }: GridCellRangeProps): React.ReactNode[] {
+        const renderedCells: React.ReactNode[] = [];
+        const style: React.CSSProperties = {};
 
-        for (let rowIndex = rowStartIndex; rowIndex <= rowStopIndex; rowIndex++) {
+        for (
+            let rowIndex = rowStartIndex;
+            rowIndex <= rowStopIndex;
+            rowIndex++
+        ) {
             // This contains :offset (top) and :size (height) information for the cell
-            const rowDatum = rowSizeAndPositionManager.getSizeAndPositionOfCell(rowIndex)
+            const rowDatum = rowSizeAndPositionManager.getSizeAndPositionOfCell(
+                rowIndex
+            );
 
-            for (let columnIndex = columnStartIndex; columnIndex <= columnStopIndex; columnIndex++) {
+            for (
+                let columnIndex = columnStartIndex;
+                columnIndex <= columnStopIndex;
+                columnIndex++
+            ) {
                 // This contains :offset (left) and :size (width) information for the cell
-                const columnDatum = columnSizeAndPositionManager.getSizeAndPositionOfCell(columnIndex)
+                const columnDatum = columnSizeAndPositionManager.getSizeAndPositionOfCell(
+                    columnIndex
+                );
 
                 // Be sure to adjust cell position in case the total set of cells is too large to be supported by the browser natively.
                 // In this case, Grid will shift cells as a user scrolls to increase cell density.
-                const left = columnDatum.offset + horizontalOffsetAdjustment
-                const top = rowDatum.offset + verticalOffsetAdjustment
+                const left = columnDatum.offset + horizontalOffsetAdjustment;
+                const top = rowDatum.offset + verticalOffsetAdjustment;
 
                 // The rest of the information you need to render the cell are contained in the data.
                 // Be sure to provide unique :key attributes.
-                const key = `${rowIndex}-${columnIndex}`
-                const height = rowDatum.size
-                const width = columnDatum.size
+                const key = `${rowIndex}-${columnIndex}`;
+                const height = rowDatum.size;
+                const width = columnDatum.size;
                 const isVisible =
                     columnIndex >= visibleColumnIndices.start &&
                     columnIndex <= visibleColumnIndices.stop &&
                     rowIndex >= visibleRowIndices.start &&
-                    rowIndex <= visibleRowIndices.stop
+                    rowIndex <= visibleRowIndices.stop;
 
                 // Now render your cell and additional UI as you see fit.
                 // Add all rendered children to the :renderedCells Array.
@@ -1936,13 +1660,13 @@ export class GridCellRangeRendererExample extends PureComponent<{}, any> {
                     key,
                     parent,
                     rowIndex,
-                    style,
-                }
+                    style
+                };
 
-                renderedCells.push(cellRenderer(gridCellProps))
+                renderedCells.push(cellRenderer(gridCellProps));
             }
         }
 
-        return renderedCells
-      }
+        return renderedCells;
+    }
 }
diff --git a/types/react-virtualized/tsconfig.json b/types/react-virtualized/tsconfig.json
index 9a6a1ce9de..b3f5a6510f 100644
--- a/types/react-virtualized/tsconfig.json
+++ b/types/react-virtualized/tsconfig.json
@@ -2,13 +2,13 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": ["es6", "dom"],
-        "noImplicitAny": false,
-        "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": false,
         "jsx": "react",
         "baseUrl": "../",
         "typeRoots": ["../"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true,

From 65622d3c46c36be7d5fbb32633026fce6b391384 Mon Sep 17 00:00:00 2001
From: Hugues Stefanski <hugues.stefanski@gmail.com>
Date: Sat, 14 Apr 2018 21:37:38 +0200
Subject: [PATCH 1284/1382] D3 geo strict null check (#23794)

* d3-geo strictNullChecks mode:
Allow GeoGeometryObjects type to be null
Check existence of optional mehtods before calling them
Added null to union type or some results of call

* Missing space

* Min TS 2.4 for d3-geo

* Back to TS 2.3

* Added null as acceptable type

* d3-geo : Use of default generic types

* d3-geo : Removed generic type when using default

* d3-geo : fix generic types

* d3-geo : tests with nullable features
---
 types/d3-geo/d3-geo-tests.ts | 126 +++++++++++++++++++++++++++++++----
 types/d3-geo/index.d.ts      | 106 ++++++++++++++++-------------
 types/d3-geo/tsconfig.json   |   4 +-
 3 files changed, 175 insertions(+), 61 deletions(-)

diff --git a/types/d3-geo/d3-geo-tests.ts b/types/d3-geo/d3-geo-tests.ts
index 5124694378..51ddb93d89 100644
--- a/types/d3-geo/d3-geo-tests.ts
+++ b/types/d3-geo/d3-geo-tests.ts
@@ -89,7 +89,33 @@ const sampleExtendedFeatureCollection: d3Geo.ExtendedFeatureCollection<d3Geo.Ext
         sampleExtendedFeature2
     ]
 };
+const sampleNullableFeature: GeoJSON.Feature<null> = {
+    type: 'Feature',
+    geometry: null,
+    properties: null
+};
 
+const sampleExtendedNullableFeature: d3Geo.ExtendedFeature = {
+    type: 'Feature',
+    geometry: null,
+    properties: null
+};
+
+const sampleNullableFeatureCollection: GeoJSON.FeatureCollection<null> = {
+    type: 'FeatureCollection',
+    features: [
+        sampleNullableFeature,
+        sampleNullableFeature
+    ]
+};
+
+const sampleExtendedNullableFeatureCollection: d3Geo.ExtendedFeatureCollection = {
+    type: 'FeatureCollection',
+    features: [
+        sampleExtendedNullableFeature,
+        sampleExtendedNullableFeature
+    ]
+};
 // ----------------------------------------------------------------------
 // Spherical Math
 // ----------------------------------------------------------------------
@@ -101,10 +127,14 @@ area = d3Geo.geoArea(sampleSphere);
 area = d3Geo.geoArea(sampleGeometryCollection);
 area = d3Geo.geoArea(sampleExtendedGeometryCollection);
 area = d3Geo.geoArea(sampleFeature);
+area = d3Geo.geoArea(sampleNullableFeature);
 area = d3Geo.geoArea(sampleExtendedFeature1);
 area = d3Geo.geoArea(sampleExtendedFeature2);
+area = d3Geo.geoArea(sampleExtendedNullableFeature);
 area = d3Geo.geoArea(sampleFeatureCollection);
+area = d3Geo.geoArea(sampleNullableFeatureCollection);
 area = d3Geo.geoArea(sampleExtendedFeatureCollection);
+area = d3Geo.geoArea(sampleExtendedNullableFeatureCollection);
 
 // geoBounds(...) =========================================================
 
@@ -113,10 +143,14 @@ bounds = d3Geo.geoBounds(sampleSphere);
 bounds = d3Geo.geoBounds(sampleGeometryCollection);
 bounds = d3Geo.geoBounds(sampleExtendedGeometryCollection);
 bounds = d3Geo.geoBounds(sampleFeature);
+bounds = d3Geo.geoBounds(sampleNullableFeature);
 bounds = d3Geo.geoBounds(sampleExtendedFeature1);
 bounds = d3Geo.geoBounds(sampleExtendedFeature2);
+bounds = d3Geo.geoBounds(sampleExtendedNullableFeature);
 bounds = d3Geo.geoBounds(sampleFeatureCollection);
+bounds = d3Geo.geoBounds(sampleNullableFeatureCollection);
 bounds = d3Geo.geoBounds(sampleExtendedFeatureCollection);
+bounds = d3Geo.geoBounds(sampleExtendedNullableFeatureCollection);
 
 // geoCentroid(...) =======================================================
 
@@ -125,10 +159,14 @@ centroid = d3Geo.geoCentroid(sampleSphere);
 centroid = d3Geo.geoCentroid(sampleGeometryCollection);
 centroid = d3Geo.geoCentroid(sampleExtendedGeometryCollection);
 centroid = d3Geo.geoCentroid(sampleFeature);
+centroid = d3Geo.geoCentroid(sampleNullableFeature);
 centroid = d3Geo.geoCentroid(sampleExtendedFeature1);
 centroid = d3Geo.geoCentroid(sampleExtendedFeature2);
+centroid = d3Geo.geoCentroid(sampleExtendedNullableFeature);
 centroid = d3Geo.geoCentroid(sampleFeatureCollection);
+centroid = d3Geo.geoCentroid(sampleNullableFeatureCollection);
 centroid = d3Geo.geoCentroid(sampleExtendedFeatureCollection);
+centroid = d3Geo.geoCentroid(sampleExtendedNullableFeatureCollection);
 
 // geoContains(...) =======================================================
 
@@ -137,10 +175,14 @@ contained = d3Geo.geoContains(sampleSphere, [0, 0]);
 contained = d3Geo.geoContains(sampleGeometryCollection, [0, 0]);
 contained = d3Geo.geoContains(sampleExtendedGeometryCollection, [0, 0]);
 contained = d3Geo.geoContains(sampleFeature, [0, 0]);
+contained = d3Geo.geoContains(sampleNullableFeature, [0, 0]);
 contained = d3Geo.geoContains(sampleExtendedFeature1, [0, 0]);
 contained = d3Geo.geoContains(sampleExtendedFeature2, [0, 0]);
+contained = d3Geo.geoContains(sampleExtendedNullableFeature, [0, 0]);
 contained = d3Geo.geoContains(sampleFeatureCollection, [0, 0]);
+contained = d3Geo.geoContains(sampleNullableFeatureCollection, [0, 0]);
 contained = d3Geo.geoContains(sampleExtendedFeatureCollection, [0, 0]);
+contained = d3Geo.geoContains(sampleExtendedNullableFeatureCollection, [0, 0]);
 
 // geoDistance(...) =======================================================
 
@@ -153,10 +195,14 @@ length = d3Geo.geoLength(sampleSphere);
 length = d3Geo.geoLength(sampleGeometryCollection);
 length = d3Geo.geoLength(sampleExtendedGeometryCollection);
 length = d3Geo.geoLength(sampleFeature);
+length = d3Geo.geoLength(sampleNullableFeature);
 length = d3Geo.geoLength(sampleExtendedFeature1);
 length = d3Geo.geoLength(sampleExtendedFeature2);
+length = d3Geo.geoLength(sampleExtendedNullableFeature);
 length = d3Geo.geoLength(sampleFeatureCollection);
+length = d3Geo.geoLength(sampleNullableFeatureCollection);
 length = d3Geo.geoLength(sampleExtendedFeatureCollection);
+length = d3Geo.geoLength(sampleExtendedNullableFeatureCollection);
 
 // geoInterpolate(...) ====================================================
 
@@ -181,7 +227,7 @@ const inverted: [number, number] = rotation.invert([54, 2]);
 // Create GeoCircleGenerator ============================================
 
 // simple use case
-let circleGeneratorSimple: d3Geo.GeoCircleGenerator<any, any> = d3Geo.geoCircle();
+let circleGeneratorSimple: d3Geo.GeoCircleGenerator = d3Geo.geoCircle();
 
 // complex use as part of object
 class Circulator {
@@ -331,8 +377,9 @@ const naturalEart1Raw: d3Geo.GeoRawProjection = d3Geo.geoNaturalEarth1Raw();
 // Use Raw Projection =====================================================
 
 const rawProjectionPoint: [number, number] = azimuthalEqualAreaRaw(54, 2);
-const rawProjectionInvertedPoint: [number, number] = azimuthalEqualAreaRaw.invert(180, 6);
-
+if (azimuthalEqualAreaRaw.invert) {
+    const rawProjectionInvertedPoint: [number, number] = azimuthalEqualAreaRaw.invert(180, 6);
+}
 // ----------------------------------------------------------------------
 // Pre-Defined Projections
 // ----------------------------------------------------------------------
@@ -365,8 +412,10 @@ let constructedProjection: d3Geo.GeoProjection = mutate();
 
 // Use Projection ==========================================================
 
-const projected: [number, number] = constructedProjection([54, 2]);
-const inverted2: [number, number] = constructedProjection.invert([54, 2]);
+const projected: [number, number] | null = constructedProjection([54, 2]);
+if (constructedProjection.invert) {
+    const inverted2: [number, number] | null = constructedProjection.invert([54, 2]);
+}
 
 // TODO ?????
 // let stream: d3Geo.Stream = constructedProjection.stream([54, 2]);
@@ -378,7 +427,7 @@ constructedProjection = constructedProjection.preclip(d3Geo.geoClipCircle(45));
 const postClip: (stream: d3Geo.GeoStream) => d3Geo.GeoStream = constructedProjection.postclip();
 constructedProjection = constructedProjection.postclip(d3Geo.geoClipRectangle(0, 0, 1, 1));
 
-const clipAngle: number = constructedProjection.clipAngle();
+const clipAngle: number | null = constructedProjection.clipAngle();
 constructedProjection = constructedProjection.clipAngle(null);
 constructedProjection = constructedProjection.clipAngle(45);
 
@@ -410,40 +459,56 @@ constructedProjection = constructedProjection.fitExtent([[0, 0], [960, 500]], sa
 constructedProjection = constructedProjection.fitExtent([[0, 0], [960, 500]], sampleGeometryCollection);
 constructedProjection = constructedProjection.fitExtent([[0, 0], [960, 500]], sampleExtendedGeometryCollection);
 constructedProjection = constructedProjection.fitExtent([[0, 0], [960, 500]], sampleFeature);
+constructedProjection = constructedProjection.fitExtent([[0, 0], [960, 500]], sampleNullableFeature);
 constructedProjection = constructedProjection.fitExtent([[0, 0], [960, 500]], sampleExtendedFeature1);
 constructedProjection = constructedProjection.fitExtent([[0, 0], [960, 500]], sampleExtendedFeature2);
+constructedProjection = constructedProjection.fitExtent([[0, 0], [960, 500]], sampleExtendedNullableFeature);
 constructedProjection = constructedProjection.fitExtent([[0, 0], [960, 500]], sampleFeatureCollection);
+constructedProjection = constructedProjection.fitExtent([[0, 0], [960, 500]], sampleNullableFeatureCollection);
 constructedProjection = constructedProjection.fitExtent([[0, 0], [960, 500]], sampleExtendedFeatureCollection);
+constructedProjection = constructedProjection.fitExtent([[0, 0], [960, 500]], sampleExtendedNullableFeatureCollection);
 
 constructedProjection = constructedProjection.fitSize([960, 500], samplePolygon);
 constructedProjection = constructedProjection.fitSize([960, 500], sampleSphere);
 constructedProjection = constructedProjection.fitSize([960, 500], sampleGeometryCollection);
 constructedProjection = constructedProjection.fitSize([960, 500], sampleExtendedGeometryCollection);
 constructedProjection = constructedProjection.fitSize([960, 500], sampleFeature);
+constructedProjection = constructedProjection.fitSize([960, 500], sampleNullableFeature);
 constructedProjection = constructedProjection.fitSize([960, 500], sampleExtendedFeature1);
 constructedProjection = constructedProjection.fitSize([960, 500], sampleExtendedFeature2);
+constructedProjection = constructedProjection.fitSize([960, 500], sampleExtendedNullableFeature);
 constructedProjection = constructedProjection.fitSize([960, 500], sampleFeatureCollection);
+constructedProjection = constructedProjection.fitSize([960, 500], sampleNullableFeatureCollection);
 constructedProjection = constructedProjection.fitSize([960, 500], sampleExtendedFeatureCollection);
+constructedProjection = constructedProjection.fitSize([960, 500], sampleExtendedNullableFeatureCollection);
 
 constructedProjection = constructedProjection.fitWidth(960, samplePolygon);
 constructedProjection = constructedProjection.fitWidth(960, sampleSphere);
 constructedProjection = constructedProjection.fitWidth(960, sampleGeometryCollection);
 constructedProjection = constructedProjection.fitWidth(960, sampleExtendedGeometryCollection);
 constructedProjection = constructedProjection.fitWidth(960, sampleFeature);
+constructedProjection = constructedProjection.fitWidth(960, sampleNullableFeature);
 constructedProjection = constructedProjection.fitWidth(960, sampleExtendedFeature1);
 constructedProjection = constructedProjection.fitWidth(960, sampleExtendedFeature2);
+constructedProjection = constructedProjection.fitWidth(960, sampleExtendedNullableFeature);
 constructedProjection = constructedProjection.fitWidth(960, sampleFeatureCollection);
+constructedProjection = constructedProjection.fitWidth(960, sampleNullableFeatureCollection);
 constructedProjection = constructedProjection.fitWidth(960, sampleExtendedFeatureCollection);
+constructedProjection = constructedProjection.fitWidth(960, sampleExtendedNullableFeatureCollection);
 
 constructedProjection = constructedProjection.fitHeight(500, samplePolygon);
 constructedProjection = constructedProjection.fitHeight(500, sampleSphere);
 constructedProjection = constructedProjection.fitHeight(500, sampleGeometryCollection);
 constructedProjection = constructedProjection.fitHeight(500, sampleExtendedGeometryCollection);
 constructedProjection = constructedProjection.fitHeight(500, sampleFeature);
+constructedProjection = constructedProjection.fitHeight(500, sampleNullableFeature);
 constructedProjection = constructedProjection.fitHeight(500, sampleExtendedFeature1);
 constructedProjection = constructedProjection.fitHeight(500, sampleExtendedFeature2);
+constructedProjection = constructedProjection.fitHeight(500, sampleExtendedNullableFeature);
 constructedProjection = constructedProjection.fitHeight(500, sampleFeatureCollection);
+constructedProjection = constructedProjection.fitHeight(500, sampleNullableFeatureCollection);
 constructedProjection = constructedProjection.fitHeight(500, sampleExtendedFeatureCollection);
+constructedProjection = constructedProjection.fitHeight(500, sampleExtendedNullableFeatureCollection);
 
 // ----------------------------------------------------------------------
 // GeoConicProjection interface
@@ -471,7 +536,7 @@ const minimalRenderingContextMockUp: d3Geo.GeoContext = {
 
 // Create geoPath Generator =============================================
 
-let geoPathCanvas: d3Geo.GeoPath<any, d3Geo.GeoPermissibleObjects>;
+let geoPathCanvas: d3Geo.GeoPath;
 geoPathCanvas = d3Geo.geoPath();
 geoPathCanvas = d3Geo.geoPath(null);
 geoPathCanvas = d3Geo.geoPath(null, null);
@@ -487,8 +552,8 @@ geoPathSVG = d3Geo.geoPath<SVGPathElement, d3Geo.ExtendedFeature<GeoJSON.Polygon
 // projection(...) ------------------------------------------------------
 
 geoPathCanvas = geoPathCanvas.projection(azimuthalEqualArea);
-const geoPathProjectionMinimal: d3Geo.GeoStreamWrapper = geoPathCanvas.projection();
-const geoPathProjectionUnion: d3Geo.GeoProjection | d3Geo.GeoConicProjection | d3Geo.GeoStreamWrapper = geoPathCanvas.projection();
+const geoPathProjectionMinimal: d3Geo.GeoStreamWrapper | null = geoPathCanvas.projection();
+const geoPathProjectionUnion: d3Geo.GeoProjection | d3Geo.GeoConicProjection | d3Geo.GeoStreamWrapper | null = geoPathCanvas.projection();
 const geoPathProjection: d3Geo.GeoProjection = geoPathCanvas.projection<d3Geo.GeoProjection>();
 
 geoPathSVG = geoPathSVG.projection(conicConformal);
@@ -501,13 +566,13 @@ const geoPathConicProjection: d3Geo.GeoConicProjection = geoPathSVG.projection<d
 // minimal context interface (mockup)
 geoPathCanvas = geoPathCanvas.context(minimalRenderingContextMockUp);
 
-const geoPathContext: d3Geo.GeoContext = geoPathCanvas.context();
+const geoPathContext: d3Geo.GeoContext | null = geoPathCanvas.context();
 
 // reset
 geoPathCanvas = geoPathCanvas.context(null);
 
 // With canvas 2D rendering context
-let canvasContext: CanvasRenderingContext2D;
+let canvasContext: CanvasRenderingContext2D = {} as any;
 
 geoPathCanvas = geoPathCanvas.context(canvasContext);
 
@@ -540,12 +605,17 @@ geoPathArea = geoPathCanvas.area(sampleSphere);
 geoPathArea = geoPathCanvas.area(sampleGeometryCollection);
 geoPathArea = geoPathCanvas.area(sampleExtendedGeometryCollection);
 geoPathArea = geoPathCanvas.area(sampleFeature);
+geoPathArea = geoPathCanvas.area(sampleNullableFeature);
 geoPathArea = geoPathCanvas.area(sampleExtendedFeature1);
 geoPathArea = geoPathCanvas.area(sampleExtendedFeature2);
+geoPathArea = geoPathCanvas.area(sampleExtendedNullableFeature);
 geoPathArea = geoPathCanvas.area(sampleFeatureCollection);
+geoPathArea = geoPathCanvas.area(sampleNullableFeatureCollection);
 geoPathArea = geoPathCanvas.area(sampleExtendedFeatureCollection);
+geoPathArea = geoPathCanvas.area(sampleExtendedNullableFeatureCollection);
 
 // geoPathArea = geoPathSVG.area(sampleExtendedFeatureCollection); // fails, wrong data object type
+// geoPathArea = geoPathSVG.area(sampleExtendedNullableFeatureCollection); // fails, wrong data object type
 
 // bounds(...) ------------------------------------------------------
 
@@ -554,12 +624,17 @@ geoPathBounds = geoPathCanvas.bounds(sampleSphere);
 geoPathBounds = geoPathCanvas.bounds(sampleGeometryCollection);
 geoPathBounds = geoPathCanvas.bounds(sampleExtendedGeometryCollection);
 geoPathBounds = geoPathCanvas.bounds(sampleFeature);
+geoPathBounds = geoPathCanvas.bounds(sampleNullableFeature);
 geoPathBounds = geoPathCanvas.bounds(sampleExtendedFeature1);
 geoPathBounds = geoPathCanvas.bounds(sampleExtendedFeature2);
+geoPathBounds = geoPathCanvas.bounds(sampleExtendedNullableFeature);
 geoPathBounds = geoPathCanvas.bounds(sampleFeatureCollection);
+geoPathBounds = geoPathCanvas.bounds(sampleNullableFeatureCollection);
 geoPathBounds = geoPathCanvas.bounds(sampleExtendedFeatureCollection);
+geoPathBounds = geoPathCanvas.bounds(sampleExtendedNullableFeatureCollection);
 
 // geoPathBounds = geoPathSVG.bounds(sampleExtendedFeatureCollection); // fails, wrong data object type
+// geoPathBounds = geoPathSVG.bounds(sampleExtendedNullableFeatureCollection); // fails, wrong data object type
 
 // centroid(...) ------------------------------------------------------
 
@@ -568,12 +643,17 @@ geoPathCentroid = geoPathCanvas.centroid(sampleSphere);
 geoPathCentroid = geoPathCanvas.centroid(sampleGeometryCollection);
 geoPathCentroid = geoPathCanvas.centroid(sampleExtendedGeometryCollection);
 geoPathCentroid = geoPathCanvas.centroid(sampleFeature);
+geoPathCentroid = geoPathCanvas.centroid(sampleNullableFeature);
 geoPathCentroid = geoPathCanvas.centroid(sampleExtendedFeature1);
 geoPathCentroid = geoPathCanvas.centroid(sampleExtendedFeature2);
+geoPathCentroid = geoPathCanvas.centroid(sampleExtendedNullableFeature);
 geoPathCentroid = geoPathCanvas.centroid(sampleFeatureCollection);
+geoPathCentroid = geoPathCanvas.centroid(sampleNullableFeatureCollection);
 geoPathCentroid = geoPathCanvas.centroid(sampleExtendedFeatureCollection);
+geoPathCentroid = geoPathCanvas.centroid(sampleExtendedNullableFeatureCollection);
 
 // geoPathCentroid = geoPathSVG.centroid(sampleExtendedFeatureCollection); // fails, wrong data object type
+// geoPathCentroid = geoPathSVG.centroid(sampleExtendedNullableFeatureCollection); // fails, wrong data object type
 
 // measure(...) ------------------------------------------------------
 
@@ -582,10 +662,14 @@ geoPathMeasure = geoPathCanvas.measure(sampleSphere);
 geoPathMeasure = geoPathCanvas.measure(sampleGeometryCollection);
 geoPathMeasure = geoPathCanvas.measure(sampleExtendedGeometryCollection);
 geoPathMeasure = geoPathCanvas.measure(sampleFeature);
+geoPathMeasure = geoPathCanvas.measure(sampleNullableFeature);
 geoPathMeasure = geoPathCanvas.measure(sampleExtendedFeature1);
 geoPathMeasure = geoPathCanvas.measure(sampleExtendedFeature2);
+geoPathMeasure = geoPathCanvas.measure(sampleExtendedNullableFeature);
 geoPathMeasure = geoPathCanvas.measure(sampleFeatureCollection);
+geoPathMeasure = geoPathCanvas.measure(sampleNullableFeatureCollection);
 geoPathMeasure = geoPathCanvas.measure(sampleExtendedFeatureCollection);
+geoPathMeasure = geoPathCanvas.measure(sampleExtendedNullableFeatureCollection);
 
 // render path to context of get path string----------------------------
 
@@ -596,10 +680,14 @@ geoPathCanvas(sampleSphere);
 geoPathCanvas(sampleGeometryCollection);
 geoPathCanvas(sampleExtendedGeometryCollection);
 geoPathCanvas(sampleFeature);
+geoPathCanvas(sampleNullableFeature);
 geoPathCanvas(sampleExtendedFeature1);
 geoPathCanvas(sampleExtendedFeature2);
+geoPathCanvas(sampleExtendedNullableFeature);
 geoPathCanvas(sampleFeatureCollection);
+geoPathCanvas(sampleNullableFeatureCollection);
 geoPathCanvas(sampleExtendedFeatureCollection);
+geoPathCanvas(sampleExtendedNullableFeatureCollection);
 
 // Use path string generator for SVGPathElement
 
@@ -667,20 +755,28 @@ identityTransform = identityTransform.fitExtent([[0, 0], [960, 500]], sampleSphe
 identityTransform = identityTransform.fitExtent([[0, 0], [960, 500]], sampleGeometryCollection);
 identityTransform = identityTransform.fitExtent([[0, 0], [960, 500]], sampleExtendedGeometryCollection);
 identityTransform = identityTransform.fitExtent([[0, 0], [960, 500]], sampleFeature);
+identityTransform = identityTransform.fitExtent([[0, 0], [960, 500]], sampleNullableFeature);
 identityTransform = identityTransform.fitExtent([[0, 0], [960, 500]], sampleExtendedFeature1);
 identityTransform = identityTransform.fitExtent([[0, 0], [960, 500]], sampleExtendedFeature2);
+identityTransform = identityTransform.fitExtent([[0, 0], [960, 500]], sampleExtendedNullableFeature);
 identityTransform = identityTransform.fitExtent([[0, 0], [960, 500]], sampleFeatureCollection);
+identityTransform = identityTransform.fitExtent([[0, 0], [960, 500]], sampleNullableFeatureCollection);
 identityTransform = identityTransform.fitExtent([[0, 0], [960, 500]], sampleExtendedFeatureCollection);
+identityTransform = identityTransform.fitExtent([[0, 0], [960, 500]], sampleExtendedNullableFeatureCollection);
 
 identityTransform = identityTransform.fitSize([960, 500], samplePolygon);
 identityTransform = identityTransform.fitSize([960, 500], sampleSphere);
 identityTransform = identityTransform.fitSize([960, 500], sampleGeometryCollection);
 identityTransform = identityTransform.fitSize([960, 500], sampleExtendedGeometryCollection);
 identityTransform = identityTransform.fitSize([960, 500], sampleFeature);
+identityTransform = identityTransform.fitSize([960, 500], sampleNullableFeature);
 identityTransform = identityTransform.fitSize([960, 500], sampleExtendedFeature1);
 identityTransform = identityTransform.fitSize([960, 500], sampleExtendedFeature2);
+identityTransform = identityTransform.fitSize([960, 500], sampleExtendedNullableFeature);
 identityTransform = identityTransform.fitSize([960, 500], sampleFeatureCollection);
+identityTransform = identityTransform.fitSize([960, 500], sampleNullableFeatureCollection);
 identityTransform = identityTransform.fitSize([960, 500], sampleExtendedFeatureCollection);
+identityTransform = identityTransform.fitSize([960, 500], sampleExtendedNullableFeatureCollection);
 
 let reflecting: boolean;
 
@@ -703,7 +799,9 @@ stream.lineStart();
 stream.lineEnd();
 stream.polygonStart();
 stream.polygonEnd();
-stream.sphere();
+if (stream.sphere) {
+    stream.sphere();
+}
 
 // geoStream(...) ========================================================
 
@@ -712,10 +810,14 @@ d3Geo.geoStream(sampleSphere, stream);
 d3Geo.geoStream(sampleGeometryCollection, stream);
 d3Geo.geoStream(sampleExtendedGeometryCollection, stream);
 d3Geo.geoStream(sampleFeature, stream);
+d3Geo.geoStream(sampleNullableFeature, stream);
 d3Geo.geoStream(sampleExtendedFeature1, stream);
 d3Geo.geoStream(sampleExtendedFeature2, stream);
+d3Geo.geoStream(sampleExtendedNullableFeature, stream);
 d3Geo.geoStream(sampleFeatureCollection, stream);
+d3Geo.geoStream(sampleNullableFeatureCollection, stream);
 d3Geo.geoStream(sampleExtendedFeatureCollection, stream);
+d3Geo.geoStream(sampleExtendedNullableFeatureCollection, stream);
 
 // ----------------------------------------------------------------------
 // Clipping Function
diff --git a/types/d3-geo/index.d.ts b/types/d3-geo/index.d.ts
index d9f0931269..a41f67618a 100644
--- a/types/d3-geo/index.d.ts
+++ b/types/d3-geo/index.d.ts
@@ -31,9 +31,11 @@ export type GeoGeometryObjects = GeoJSON.GeometryObject | GeoSphere;
 
 /**
  * A GeoJSON-style GeometryCollection which supports GeoJSON geometry objects
- * and additionally GeoSphere
+ * and additionally GeoSphere.
+ *
+ * The generic refers to the type(s) of d3-geo geometry objects contained in the collection.
  */
-export interface ExtendedGeometryCollection<GeometryType extends GeoGeometryObjects> {
+export interface ExtendedGeometryCollection<GeometryType extends GeoGeometryObjects = GeoGeometryObjects> {
     type: string;
     bbox?: number[];
     crs?: {
@@ -45,9 +47,18 @@ export interface ExtendedGeometryCollection<GeometryType extends GeoGeometryObje
 
 /**
  * A GeoJSON-style Feature which support features built on GeoJSON GeometryObjects
- * or GeoSphere
+ * or GeoSphere.
+ *
+ * The first generic refers to the type(s) of d3-geo geometry objects underlying the ExtendedFeature.
+ * Unless explicitly ruled out, the geometry value is nullable.
+ *
+ * The second generic refers to the data type of the properties of the ExtendedFeature. Unless explicitly ruled out,
+ * the properties value is nullable.
  */
-export interface ExtendedFeature<GeometryType extends GeoGeometryObjects, Properties> extends GeoJSON.GeoJsonObject {
+export interface ExtendedFeature<
+    GeometryType extends GeoGeometryObjects | null = GeoGeometryObjects | null,
+    Properties extends GeoJSON.GeoJsonProperties = GeoJSON.GeoJsonProperties
+    > extends GeoJSON.GeoJsonObject {
     geometry: GeometryType;
     properties: Properties;
     id?: string | number;
@@ -56,8 +67,10 @@ export interface ExtendedFeature<GeometryType extends GeoGeometryObjects, Proper
 /**
  * A GeoJSON-style FeatureCollection which supports GeoJSON features
  * and features built on GeoSphere
+ *
+ * The generic refers to the type of ExtendedFeature contained in the ExtendedFeatureCollection.
  */
-export interface ExtendedFeatureCollection<FeatureType extends ExtendedFeature<GeoGeometryObjects, any>> extends GeoJSON.GeoJsonObject {
+export interface ExtendedFeatureCollection<FeatureType extends ExtendedFeature = ExtendedFeature> extends GeoJSON.GeoJsonObject {
     features: FeatureType[];
 }
 
@@ -65,8 +78,7 @@ export interface ExtendedFeatureCollection<FeatureType extends ExtendedFeature<G
  * Type Alias for permissible objects which can be used with d3-geo
  * methods
  */
-export type GeoPermissibleObjects = GeoGeometryObjects | ExtendedGeometryCollection<GeoGeometryObjects>
-    | ExtendedFeature<GeoGeometryObjects, any> | ExtendedFeatureCollection<ExtendedFeature<GeoGeometryObjects, any>>;
+export type GeoPermissibleObjects = GeoGeometryObjects | ExtendedGeometryCollection | ExtendedFeature | ExtendedFeatureCollection;
 
 // ----------------------------------------------------------------------
 // Spherical Math
@@ -78,14 +90,14 @@ export type GeoPermissibleObjects = GeoGeometryObjects | ExtendedGeometryCollect
  *
  * @param object A geographic feature supported by d3-geo (An extension of GeoJSON feature).
  */
-export function geoArea(object: ExtendedFeature<GeoGeometryObjects, any>): number;
+export function geoArea(object: ExtendedFeature): number;
 /**
  * Returns the spherical area of the specified feature collection in steradians.
  * This is the spherical equivalent of path.area.
  *
  * @param object A geographic feature collection supported by d3-geo (An extension of GeoJSON feature).
  */
-export function geoArea(object: ExtendedFeatureCollection<ExtendedFeature<GeoGeometryObjects, any>>): number;
+export function geoArea(object: ExtendedFeatureCollection): number;
 /**
  * Returns the spherical area of the specified GeoJson Geometry Object or GeoSphere object in steradians.
  * This is the spherical equivalent of path.area.
@@ -99,7 +111,7 @@ export function geoArea(object: GeoGeometryObjects): number;
  *
  * @param object A geographic geometry collection supported by d3-geo (An extension of GeoJSON geometry collection).
  */
-export function geoArea(object: ExtendedGeometryCollection<GeoGeometryObjects>): number;
+export function geoArea(object: ExtendedGeometryCollection): number;
 
 /**
  * Returns the spherical bounding box for the specified feature. The bounding box is represented by a two-dimensional array: [[left, bottom], [right, top]],
@@ -109,7 +121,7 @@ export function geoArea(object: ExtendedGeometryCollection<GeoGeometryObjects>):
  *
  * @param object A geographic feature supported by d3-geo (An extension of GeoJSON feature).
  */
-export function geoBounds(object: ExtendedFeature<GeoGeometryObjects, any>): [[number, number], [number, number]];
+export function geoBounds(object: ExtendedFeature): [[number, number], [number, number]];
 /**
  * Returns the spherical bounding box for the specified feature collection. The bounding box is represented by a two-dimensional array: [[left, bottom], [right, top]],
  * where left is the minimum longitude, bottom is the minimum latitude, right is maximum longitude, and top is the maximum latitude. All coordinates are given in degrees.
@@ -118,7 +130,7 @@ export function geoBounds(object: ExtendedFeature<GeoGeometryObjects, any>): [[n
  *
  * @param object A geographic feature collection supported by d3-geo (An extension of GeoJSON feature).
  */
-export function geoBounds(object: ExtendedFeatureCollection<ExtendedFeature<GeoGeometryObjects, any>>): [[number, number], [number, number]];
+export function geoBounds(object: ExtendedFeatureCollection): [[number, number], [number, number]];
 /**
  * Returns the spherical bounding box for the specified GeoJson Geometry Object or GeoSphere object. The bounding box is represented by a two-dimensional array: [[left, bottom], [right, top]],
  * where left is the minimum longitude, bottom is the minimum latitude, right is maximum longitude, and top is the maximum latitude. All coordinates are given in degrees.
@@ -136,7 +148,7 @@ export function geoBounds(object: GeoGeometryObjects): [[number, number], [numbe
  *
  * @param object A geographic geometry collection supported by d3-geo (An extension of GeoJSON geometry collection).
  */
-export function geoBounds(object: ExtendedGeometryCollection<GeoGeometryObjects>): [[number, number], [number, number]];
+export function geoBounds(object: ExtendedGeometryCollection): [[number, number], [number, number]];
 
 /**
  * Returns the spherical centroid of the specified feature in steradians.
@@ -144,14 +156,14 @@ export function geoBounds(object: ExtendedGeometryCollection<GeoGeometryObjects>
  *
  * @param object A geographic feature supported by d3-geo (An extension of GeoJSON feature).
  */
-export function geoCentroid(object: ExtendedFeature<GeoGeometryObjects, any>): [number, number];
+export function geoCentroid(object: ExtendedFeature): [number, number];
 /**
  * Returns the spherical centroid of the specified feature collection in steradians.
  * This is the spherical equivalent of path.centroid.
  *
  * @param object A geographic feature collection supported by d3-geo (An extension of GeoJSON feature).
  */
-export function geoCentroid(object: ExtendedFeatureCollection<ExtendedFeature<GeoGeometryObjects, any>>): [number, number];
+export function geoCentroid(object: ExtendedFeatureCollection): [number, number];
 /**
  * Returns the spherical centroid of the specified GeoJson Geometry Object or GeoSphere object in steradians.
  * This is the spherical equivalent of path.centroid.
@@ -165,7 +177,7 @@ export function geoCentroid(object: GeoGeometryObjects): [number, number];
  *
  * @param object A geographic geometry collection supported by d3-geo (An extension of GeoJSON geometry collection).
  */
-export function geoCentroid(object: ExtendedGeometryCollection<GeoGeometryObjects>): [number, number];
+export function geoCentroid(object: ExtendedGeometryCollection): [number, number];
 
 /**
  * Returns true if and only if the specified GeoJSON object contains the specified point, or false if the object does not contain the point.
@@ -175,7 +187,7 @@ export function geoCentroid(object: ExtendedGeometryCollection<GeoGeometryObject
  * @param object A geographic feature supported by d3-geo (An extension of GeoJSON feature).
  * @param point Point specified as a two-element array [longitude, latitude] in degrees.
  */
-export function geoContains(object: ExtendedFeature<GeoGeometryObjects, any>, point: [number, number]): boolean;
+export function geoContains(object: ExtendedFeature, point: [number, number]): boolean;
 /**
  * Returns true if and only if the specified GeoJSON object contains the specified point, or false if the object does not contain the point.
  * The point must be specified as a two-element array [longitude, latitude] in degrees. For Point and MultiPoint geometries, an exact test is used;
@@ -184,7 +196,7 @@ export function geoContains(object: ExtendedFeature<GeoGeometryObjects, any>, po
  * @param object A geographic feature collection supported by d3-geo (An extension of GeoJSON feature).
  * @param point Point specified as a two-element array [longitude, latitude] in degrees.
  */
-export function geoContains(object: ExtendedFeatureCollection<ExtendedFeature<GeoGeometryObjects, any>>, point: [number, number]): boolean;
+export function geoContains(object: ExtendedFeatureCollection, point: [number, number]): boolean;
 /**
  * Returns true if and only if the specified GeoJSON object contains the specified point, or false if the object does not contain the point.
  * The point must be specified as a two-element array [longitude, latitude] in degrees. For Point and MultiPoint geometries, an exact test is used;
@@ -202,7 +214,7 @@ export function geoContains(object: GeoGeometryObjects, point: [number, number])
  * @param object A geographic geometry collection supported by d3-geo (An extension of GeoJSON geometry collection).
  * @param point Point specified as a two-element array [longitude, latitude] in degrees.
  */
-export function geoContains(object: ExtendedGeometryCollection<GeoGeometryObjects>, point: [number, number]): boolean;
+export function geoContains(object: ExtendedGeometryCollection, point: [number, number]): boolean;
 
 /**
  * Returns the great-arc distance in radians between the two points a and b.
@@ -219,14 +231,14 @@ export function geoDistance(a: [number, number], b: [number, number]): number;
  *
  * @param object A geographic feature supported by d3-geo (An extension of GeoJSON feature).
  */
-export function geoLength(object: ExtendedFeature<GeoGeometryObjects, any>): number;
+export function geoLength(object: ExtendedFeature): number;
 /**
  * Returns the great-arc length of the specified feature collection in radians. For polygons, returns the perimeter of the exterior ring plus that of any interior rings.
  * This is the spherical equivalent of path.measure.
  *
  * @param object A geographic feature collection supported by d3-geo (An extension of GeoJSON feature).
  */
-export function geoLength(object: ExtendedFeatureCollection<ExtendedFeature<GeoGeometryObjects, any>>): number;
+export function geoLength(object: ExtendedFeatureCollection): number;
 /**
  * Returns the great-arc length of the specified GeoJson Geometry Object or GeoSphere object in radians. For polygons, returns the perimeter of the exterior ring plus that of any interior rings.
  * This is the spherical equivalent of path.measure.
@@ -240,7 +252,7 @@ export function geoLength(object: GeoGeometryObjects): number;
  *
  * @param object A geographic geometry collection supported by d3-geo (An extension of GeoJSON geometry collection).
  */
-export function geoLength(object: ExtendedGeometryCollection<GeoGeometryObjects>): number;
+export function geoLength(object: ExtendedGeometryCollection): number;
 
 /**
  * Returns an interpolator function given two points a and b.
@@ -291,7 +303,7 @@ export function geoRotation(angles: [number, number] | [number, number, number])
  *
  * The second generic corresponds to the type of the Datum which will be passed into the geo circle generator.
  */
-export interface GeoCircleGenerator<This, Datum> {
+export interface GeoCircleGenerator<This = any, Datum = any> {
     /**
      * Returns a new GeoJSON geometry object of type “Polygon” approximating a circle on the surface of a sphere,
      * with the current center, radius and precision. Any arguments are passed to the accessors.
@@ -362,7 +374,7 @@ export interface GeoCircleGenerator<This, Datum> {
 /**
  * Returns a new geo circle generator
  */
-export function geoCircle(): GeoCircleGenerator<any, any>;
+export function geoCircle(): GeoCircleGenerator;
 /**
  * Returns a new geo circle generator
  *
@@ -547,7 +559,7 @@ export interface GeoStream {
  * @param object A geographic feature supported by d3-geo (An extension of GeoJSON feature).
  * @param stream A projection stream.
  */
-export function geoStream(object: ExtendedFeature<GeoGeometryObjects, any>, stream: GeoStream): void;
+export function geoStream(object: ExtendedFeature, stream: GeoStream): void;
 
 /**
  * Streams the specified GeoJSON object to the specified projection stream. While both features and geometry objects are supported as input,
@@ -556,7 +568,7 @@ export function geoStream(object: ExtendedFeature<GeoGeometryObjects, any>, stre
  * @param object A geographic feature collection supported by d3-geo (An extension of GeoJSON feature).
  * @param stream A projection stream.
  */
-export function geoStream(object: ExtendedFeatureCollection<ExtendedFeature<GeoGeometryObjects, any>>, stream: GeoStream): void;
+export function geoStream(object: ExtendedFeatureCollection, stream: GeoStream): void;
 
 /**
  * Streams the specified GeoJSON object to the specified projection stream. While both features and geometry objects are supported as input,
@@ -574,7 +586,7 @@ export function geoStream(object: GeoGeometryObjects, stream: GeoStream): void;
  * @param object A geographic geometry collection supported by d3-geo (An extension of GeoJSON geometry collection).
  * @param stream A projection stream.
  */
-export function geoStream(object: ExtendedGeometryCollection<GeoGeometryObjects>, stream: GeoStream): void;
+export function geoStream(object: ExtendedGeometryCollection, stream: GeoStream): void;
 
 // ----------------------------------------------------------------------
 // Projections
@@ -736,7 +748,7 @@ export interface GeoProjection extends GeoStreamWrapper {
      * @param extent The extent, specified as an array [[x₀, y₀], [x₁, y₁]], where x₀ is the left side of the bounding box, y₀ is the top, x₁ is the right and y₁ is the bottom.
      * @param object A geographic feature supported by d3-geo (An extension of GeoJSON feature).
      */
-    fitExtent(extent: [[number, number], [number, number]], object: ExtendedFeature<GeoGeometryObjects, any>): this;
+    fitExtent(extent: [[number, number], [number, number]], object: ExtendedFeature): this;
     /**
      * Sets the projection’s scale and translate to fit the specified geographic feature collection in the center of the given extent.
      * Returns the projection.
@@ -746,7 +758,7 @@ export interface GeoProjection extends GeoStreamWrapper {
      * @param extent The extent, specified as an array [[x₀, y₀], [x₁, y₁]], where x₀ is the left side of the bounding box, y₀ is the top, x₁ is the right and y₁ is the bottom.
      * @param object A geographic feature collection supported by d3-geo (An extension of GeoJSON feature collection).
      */
-    fitExtent(extent: [[number, number], [number, number]], object: ExtendedFeatureCollection<ExtendedFeature<GeoGeometryObjects, any>>): this;
+    fitExtent(extent: [[number, number], [number, number]], object: ExtendedFeatureCollection): this;
     /**
      * Sets the projection’s scale and translate to fit the specified geographic geometry object in the center of the given extent.
      * Returns the projection.
@@ -766,7 +778,7 @@ export interface GeoProjection extends GeoStreamWrapper {
      * @param extent The extent, specified as an array [[x₀, y₀], [x₁, y₁]], where x₀ is the left side of the bounding box, y₀ is the top, x₁ is the right and y₁ is the bottom.
      * @param object A geographic geometry collection supported by d3-geo (An extension of GeoJSON geometry collection).
      */
-    fitExtent(extent: [[number, number], [number, number]], object: ExtendedGeometryCollection<GeoGeometryObjects>): this;
+    fitExtent(extent: [[number, number], [number, number]], object: ExtendedGeometryCollection): this;
 
     /**
      * Sets the projection’s scale and translate to fit the specified geographic feature in the center of an extent with the given size and top-left corner of [0, 0].
@@ -777,7 +789,7 @@ export interface GeoProjection extends GeoStreamWrapper {
      * @param size The size of the extent, specified as an array [width, height].
      * @param object A geographic feature supported by d3-geo (An extension of GeoJSON feature).
      */
-    fitSize(size: [number, number], object: ExtendedFeature<GeoGeometryObjects, any>): this;
+    fitSize(size: [number, number], object: ExtendedFeature): this;
     /**
      * Sets the projection’s scale and translate to fit the specified geographic feature collection in the center of an extent with the given size and top-left corner of [0, 0].
      * Returns the projection.
@@ -787,7 +799,7 @@ export interface GeoProjection extends GeoStreamWrapper {
      * @param size The size of the extent, specified as an array [width, height].
      * @param object A geographic feature collection supported by d3-geo (An extension of GeoJSON feature collection).
      */
-    fitSize(size: [number, number], object: ExtendedFeatureCollection<ExtendedFeature<GeoGeometryObjects, any>>): this;
+    fitSize(size: [number, number], object: ExtendedFeatureCollection): this;
     /**
      * Sets the projection’s scale and translate to fit the specified geographic geometry object in the center of an extent with the given size and top-left corner of [0, 0].
      * Returns the projection.
@@ -807,7 +819,7 @@ export interface GeoProjection extends GeoStreamWrapper {
      * @param size The size of the extent, specified as an array [width, height].
      * @param object A geographic geometry collection supported by d3-geo (An extension of GeoJSON geometry collection).
      */
-    fitSize(size: [number, number], object: ExtendedGeometryCollection<GeoGeometryObjects>): this;
+    fitSize(size: [number, number], object: ExtendedGeometryCollection): this;
 
     /**
      * A convenience method for projection.fitSize where the height is automatically chosen from the aspect ratio of object and the given constraint on width.
@@ -815,14 +827,14 @@ export interface GeoProjection extends GeoStreamWrapper {
      * @param width The width of the extent.
      * @param object A geographic feature supported by d3-geo (An extension of GeoJSON feature).
      */
-    fitWidth(width: number, object: ExtendedFeature<GeoGeometryObjects, any>): this;
+    fitWidth(width: number, object: ExtendedFeature): this;
     /**
      * A convenience method for projection.fitSize where the height is automatically chosen from the aspect ratio of object and the given constraint on width.
      *
      * @param width The width of the extent.
      * @param object A GeoJson Geometry Object or GeoSphere object supported by d3-geo (An extension of GeoJSON).
      */
-    fitWidth(width: number, object: ExtendedFeatureCollection<ExtendedFeature<GeoGeometryObjects, any>>): this;
+    fitWidth(width: number, object: ExtendedFeatureCollection): this;
     /**
      * A convenience method for projection.fitSize where the height is automatically chosen from the aspect ratio of object and the given constraint on width.
      *
@@ -836,7 +848,7 @@ export interface GeoProjection extends GeoStreamWrapper {
      * @param width The width of the extent.
      * @param object A geographic geometry collection supported by d3-geo (An extension of GeoJSON geometry collection).
      */
-    fitWidth(width: number, object: ExtendedGeometryCollection<GeoGeometryObjects>): this;
+    fitWidth(width: number, object: ExtendedGeometryCollection): this;
 
     /**
      * A convenience method for projection.fitSize where the width is automatically chosen from the aspect ratio of object and the given constraint on height.
@@ -844,14 +856,14 @@ export interface GeoProjection extends GeoStreamWrapper {
      * @param height The height of the extent.
      * @param object A geographic feature supported by d3-geo (An extension of GeoJSON feature).
      */
-    fitHeight(height: number, object: ExtendedFeature<GeoGeometryObjects, any>): this;
+    fitHeight(height: number, object: ExtendedFeature): this;
     /**
      * A convenience method for projection.fitSize where the width is automatically chosen from the aspect ratio of object and the given constraint on height.
      *
      * @param height The height of the extent.
      * @param object A GeoJson Geometry Object or GeoSphere object supported by d3-geo (An extension of GeoJSON).
      */
-    fitHeight(height: number, object: ExtendedFeatureCollection<ExtendedFeature<GeoGeometryObjects, any>>): this;
+    fitHeight(height: number, object: ExtendedFeatureCollection): this;
     /**
      * A convenience method for projection.fitSize where the width is automatically chosen from the aspect ratio of object and the given constraint on height.
      *
@@ -865,7 +877,7 @@ export interface GeoProjection extends GeoStreamWrapper {
      * @param height The height of the extent.
      * @param object A geographic geometry collection supported by d3-geo (An extension of GeoJSON geometry collection).
      */
-    fitHeight(height: number, object: ExtendedGeometryCollection<GeoGeometryObjects>): this;
+    fitHeight(height: number, object: ExtendedGeometryCollection): this;
 
     /**
      * Returns a new array [longitude, latitude] in degrees representing the unprojected point of the given projected point.
@@ -1012,7 +1024,7 @@ export interface GeoContext {
  *
  * The second generic corresponds to the type of the DatumObject which will be passed into the geo path generator for rendering.
  */
-export interface GeoPath<This, DatumObject extends GeoPermissibleObjects> {
+export interface GeoPath<This = any, DatumObject extends GeoPermissibleObjects = GeoPermissibleObjects> {
     /**
      * Renders the given object, which may be any GeoJSON feature or geometry object:
      *
@@ -1222,7 +1234,7 @@ export interface GeoPath<This, DatumObject extends GeoPermissibleObjects> {
  * @param context An (optional) rendering context to be used. If a context is provided, it must at least implement the interface described by GeoContext, a subset of the CanvasRenderingContext2D API.
  * Setting the context to "null" means that the path generator will return an SVG path string representing the to be rendered object. The default is "null".
  */
-export function geoPath(projection?: GeoProjection | GeoStreamWrapper | null, context?: GeoContext | null): GeoPath<any, GeoPermissibleObjects>;
+export function geoPath(projection?: GeoProjection | GeoStreamWrapper | null, context?: GeoContext | null): GeoPath;
 /**
  * Creates a new geographic path generator with the default settings.
  *
@@ -1525,7 +1537,7 @@ export interface GeoIdentityTranform extends GeoStreamWrapper {
      * @param extent The extent, specified as an array [[x₀, y₀], [x₁, y₁]], where x₀ is the left side of the bounding box, y₀ is the top, x₁ is the right and y₁ is the bottom.
      * @param object A geographic feature supported by d3-geo (An extension of GeoJSON feature).
      */
-    fitExtent(extent: [[number, number], [number, number]], object: ExtendedFeature<GeoGeometryObjects, any>): this;
+    fitExtent(extent: [[number, number], [number, number]], object: ExtendedFeature): this;
     /**
      * Sets the projection’s scale and translate to fit the specified geographic feature collection in the center of the given extent.
      * Returns the projection.
@@ -1535,7 +1547,7 @@ export interface GeoIdentityTranform extends GeoStreamWrapper {
      * @param extent The extent, specified as an array [[x₀, y₀], [x₁, y₁]], where x₀ is the left side of the bounding box, y₀ is the top, x₁ is the right and y₁ is the bottom.
      * @param object A geographic feature collection supported by d3-geo (An extension of GeoJSON feature collection).
      */
-    fitExtent(extent: [[number, number], [number, number]], object: ExtendedFeatureCollection<ExtendedFeature<GeoGeometryObjects, any>>): this;
+    fitExtent(extent: [[number, number], [number, number]], object: ExtendedFeatureCollection): this;
     /**
      * Sets the projection’s scale and translate to fit the specified geographic geometry object in the center of the given extent.
      * Returns the projection.
@@ -1555,7 +1567,7 @@ export interface GeoIdentityTranform extends GeoStreamWrapper {
      * @param extent The extent, specified as an array [[x₀, y₀], [x₁, y₁]], where x₀ is the left side of the bounding box, y₀ is the top, x₁ is the right and y₁ is the bottom.
      * @param object A geographic geometry collection supported by d3-geo (An extension of GeoJSON geometry collection).
      */
-    fitExtent(extent: [[number, number], [number, number]], object: ExtendedGeometryCollection<GeoGeometryObjects>): this;
+    fitExtent(extent: [[number, number], [number, number]], object: ExtendedGeometryCollection): this;
 
     /**
      * Sets the projection’s scale and translate to fit the specified geographic feature in the center of an extent with the given size and top-left corner of [0, 0].
@@ -1566,7 +1578,7 @@ export interface GeoIdentityTranform extends GeoStreamWrapper {
      * @param size The size of the extent, specified as an array [width, height].
      * @param object A geographic feature supported by d3-geo (An extension of GeoJSON feature).
      */
-    fitSize(size: [number, number], object: ExtendedFeature<GeoGeometryObjects, any>): this;
+    fitSize(size: [number, number], object: ExtendedFeature): this;
     /**
      * Sets the projection’s scale and translate to fit the specified geographic feature collection in the center of an extent with the given size and top-left corner of [0, 0].
      * Returns the projection.
@@ -1576,7 +1588,7 @@ export interface GeoIdentityTranform extends GeoStreamWrapper {
      * @param size The size of the extent, specified as an array [width, height].
      * @param object A geographic feature collection supported by d3-geo (An extension of GeoJSON feature collection).
      */
-    fitSize(size: [number, number], object: ExtendedFeatureCollection<ExtendedFeature<GeoGeometryObjects, any>>): this;
+    fitSize(size: [number, number], object: ExtendedFeatureCollection): this;
     /**
      * Sets the projection’s scale and translate to fit the specified geographic geometry object in the center of an extent with the given size and top-left corner of [0, 0].
      * Returns the projection.
@@ -1596,7 +1608,7 @@ export interface GeoIdentityTranform extends GeoStreamWrapper {
      * @param size The size of the extent, specified as an array [width, height].
      * @param object A geographic geometry collection supported by d3-geo (An extension of GeoJSON geometry collection).
      */
-    fitSize(size: [number, number], object: ExtendedGeometryCollection<GeoGeometryObjects>): this;
+    fitSize(size: [number, number], object: ExtendedGeometryCollection): this;
 
     /**
      * Returns true if x-reflection is enabled, which defaults to false.
diff --git a/types/d3-geo/tsconfig.json b/types/d3-geo/tsconfig.json
index f3661c3ad2..128bdf7ee8 100644
--- a/types/d3-geo/tsconfig.json
+++ b/types/d3-geo/tsconfig.json
@@ -7,7 +7,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
@@ -21,4 +21,4 @@
         "index.d.ts",
         "d3-geo-tests.ts"
     ]
-}
\ No newline at end of file
+}

From a1ff7a2a7d29b33e02acd83d32ae24aee7d25c7c Mon Sep 17 00:00:00 2001
From: AJ Richardson <aj.ric.ar+git@gmail.com>
Date: Sat, 14 Apr 2018 15:40:40 -0400
Subject: [PATCH 1285/1382] [lodash] Placeholder support (#24728)

* lodash: _.get should with numeric keys, too.
Also added some better tests.

* lodash: add one more NumericDictionary overload for _.get

* lodash: more reasonable index for _.get tests

* lodash: support placeholders for curry

* lodash: add logic for generating overloads with placeholders

* lodash: fix placeholder generation bugs

* lodash: use the original parameter name for placeholder parameters

* lodash: stop generating unnecessary generics

* lodash: move all FP functions into a single file.
Trying to fix memory error in tests.

* lodash: omit comments and useless overloads to make the build work

* lodash: update fp function files

* Fix placeholder definition files

* lodash: add placeholder constants to fp definitions

* lodash: looks like we missed some jsdoc comments.
Let's omit them for consistency.

* lodash: fix build errors
---
 types/lodash/common/array.d.ts               |    4 +-
 types/lodash/common/function.d.ts            |  332 +-
 types/lodash/common/object.d.ts              |    2 +-
 types/lodash/common/util.d.ts                |    4 +-
 types/lodash/fp.d.ts                         | 5279 +++++++++++++++---
 types/lodash/fp/F.d.ts                       |   14 +-
 types/lodash/fp/T.d.ts                       |   14 +-
 types/lodash/fp/__.d.ts                      |    3 +
 types/lodash/fp/add.d.ts                     |   51 +-
 types/lodash/fp/after.d.ts                   |   51 +-
 types/lodash/fp/all.d.ts                     |   67 +-
 types/lodash/fp/allPass.d.ts                 |   18 +-
 types/lodash/fp/always.d.ts                  |   15 +-
 types/lodash/fp/any.d.ts                     |   67 +-
 types/lodash/fp/anyPass.d.ts                 |   18 +-
 types/lodash/fp/apply.d.ts                   |   18 +-
 types/lodash/fp/ary.d.ts                     |   51 +-
 types/lodash/fp/assign.d.ts                  |  156 +-
 types/lodash/fp/assignAll.d.ts               |   37 +-
 types/lodash/fp/assignAllWith.d.ts           |  138 +-
 types/lodash/fp/assignIn.d.ts                |  151 +-
 types/lodash/fp/assignInAll.d.ts             |   36 +-
 types/lodash/fp/assignInAllWith.d.ts         |  143 +-
 types/lodash/fp/assignInWith.d.ts            |  249 +-
 types/lodash/fp/assignWith.d.ts              |  240 +-
 types/lodash/fp/assoc.d.ts                   |  147 +-
 types/lodash/fp/assocPath.d.ts               |  147 +-
 types/lodash/fp/at.d.ts                      |   96 +-
 types/lodash/fp/attempt.d.ts                 |   16 +-
 types/lodash/fp/before.d.ts                  |   61 +-
 types/lodash/fp/bind.d.ts                    |   86 +-
 types/lodash/fp/bindAll.d.ts                 |   78 +-
 types/lodash/fp/bindKey.d.ts                 |   91 +-
 types/lodash/fp/camelCase.d.ts               |   15 +-
 types/lodash/fp/capitalize.d.ts              |   15 +-
 types/lodash/fp/castArray.d.ts               |   17 +-
 types/lodash/fp/ceil.d.ts                    |   16 +-
 types/lodash/fp/chunk.d.ts                   |   58 +-
 types/lodash/fp/clamp.d.ts                   |  166 +-
 types/lodash/fp/clone.d.ts                   |   20 +-
 types/lodash/fp/cloneDeep.d.ts               |   15 +-
 types/lodash/fp/cloneDeepWith.d.ts           |   53 +-
 types/lodash/fp/cloneWith.d.ts               |   96 +-
 types/lodash/fp/compact.d.ts                 |   18 +-
 types/lodash/fp/complement.d.ts              |   16 +-
 types/lodash/fp/compose.d.ts                 |  315 +-
 types/lodash/fp/concat.d.ts                  |  113 +-
 types/lodash/fp/cond.d.ts                    |   38 +-
 types/lodash/fp/conforms.d.ts                |   48 +-
 types/lodash/fp/conformsTo.d.ts              |   48 +-
 types/lodash/fp/constant.d.ts                |   15 +-
 types/lodash/fp/contains.d.ts                |   63 +-
 types/lodash/fp/countBy.d.ts                 |  225 +-
 types/lodash/fp/create.d.ts                  |   17 +-
 types/lodash/fp/curry.d.ts                   |   65 +-
 types/lodash/fp/curryN.d.ts                  |  148 +-
 types/lodash/fp/curryRight.d.ts              |   59 +-
 types/lodash/fp/curryRightN.d.ts             |  133 +-
 types/lodash/fp/debounce.d.ts                |  118 +-
 types/lodash/fp/deburr.d.ts                  |   16 +-
 types/lodash/fp/defaultTo.d.ts               |  103 +-
 types/lodash/fp/defaults.d.ts                |   71 +-
 types/lodash/fp/defaultsAll.d.ts             |   20 +-
 types/lodash/fp/defaultsDeep.d.ts            |   46 +-
 types/lodash/fp/defaultsDeepAll.d.ts         |   15 +-
 types/lodash/fp/defer.d.ts                   |   17 +-
 types/lodash/fp/delay.d.ts                   |   56 +-
 types/lodash/fp/difference.d.ts              |   58 +-
 types/lodash/fp/differenceBy.d.ts            |  114 +-
 types/lodash/fp/differenceWith.d.ts          |  168 +-
 types/lodash/fp/dissoc.d.ts                  |   63 +-
 types/lodash/fp/dissocPath.d.ts              |   63 +-
 types/lodash/fp/divide.d.ts                  |   51 +-
 types/lodash/fp/drop.d.ts                    |   53 +-
 types/lodash/fp/dropLast.d.ts                |   53 +-
 types/lodash/fp/dropLastWhile.d.ts           |  108 +-
 types/lodash/fp/dropRight.d.ts               |   53 +-
 types/lodash/fp/dropRightWhile.d.ts          |  108 +-
 types/lodash/fp/dropWhile.d.ts               |  108 +-
 types/lodash/fp/each.d.ts                    |  330 +-
 types/lodash/fp/eachRight.d.ts               |  225 +-
 types/lodash/fp/endsWith.d.ts                |   56 +-
 types/lodash/fp/entries.d.ts                 |   25 +-
 types/lodash/fp/entriesIn.d.ts               |   25 +-
 types/lodash/fp/eq.d.ts                      |  156 +-
 types/lodash/fp/equals.d.ts                  |  141 +-
 types/lodash/fp/escape.d.ts                  |   26 +-
 types/lodash/fp/escapeRegExp.d.ts            |   16 +-
 types/lodash/fp/every.d.ts                   |   67 +-
 types/lodash/fp/extend.d.ts                  |  151 +-
 types/lodash/fp/extendAll.d.ts               |   36 +-
 types/lodash/fp/extendAllWith.d.ts           |  143 +-
 types/lodash/fp/extendWith.d.ts              |  249 +-
 types/lodash/fp/fill.d.ts                    |  233 +-
 types/lodash/fp/filter.d.ts                  |  361 +-
 types/lodash/fp/find.d.ts                    |  283 +-
 types/lodash/fp/findFrom.d.ts                |  517 +-
 types/lodash/fp/findIndex.d.ts               |  108 +-
 types/lodash/fp/findIndexFrom.d.ts           |  186 +-
 types/lodash/fp/findKey.d.ts                 |  108 +-
 types/lodash/fp/findLast.d.ts                |  143 +-
 types/lodash/fp/findLastFrom.d.ts            |  257 +-
 types/lodash/fp/findLastIndex.d.ts           |  103 +-
 types/lodash/fp/findLastIndexFrom.d.ts       |  177 +-
 types/lodash/fp/findLastKey.d.ts             |  103 +-
 types/lodash/fp/first.d.ts                   |   19 +-
 types/lodash/fp/flatMap.d.ts                 |  189 +-
 types/lodash/fp/flatMapDeep.d.ts             |  342 +-
 types/lodash/fp/flatMapDepth.d.ts            |  687 +--
 types/lodash/fp/flatten.d.ts                 |   17 +-
 types/lodash/fp/flattenDeep.d.ts             |   17 +-
 types/lodash/fp/flattenDepth.d.ts            |   53 +-
 types/lodash/fp/flip.d.ts                    |   24 +-
 types/lodash/fp/floor.d.ts                   |   16 +-
 types/lodash/fp/flow.d.ts                    |  355 +-
 types/lodash/fp/flowRight.d.ts               |  315 +-
 types/lodash/fp/forEach.d.ts                 |  330 +-
 types/lodash/fp/forEachRight.d.ts            |  225 +-
 types/lodash/fp/forIn.d.ts                   |   88 +-
 types/lodash/fp/forInRight.d.ts              |   74 +-
 types/lodash/fp/forOwn.d.ts                  |   88 +-
 types/lodash/fp/forOwnRight.d.ts             |   74 +-
 types/lodash/fp/fromPairs.d.ts               |   37 +-
 types/lodash/fp/functions.d.ts               |   28 +-
 types/lodash/fp/functionsIn.d.ts             |   28 +-
 types/lodash/fp/get.d.ts                     |  207 +-
 types/lodash/fp/getOr.d.ts                   |  313 +-
 types/lodash/fp/groupBy.d.ts                 |  225 +-
 types/lodash/fp/gt.d.ts                      |   51 +-
 types/lodash/fp/gte.d.ts                     |   51 +-
 types/lodash/fp/has.d.ts                     |  138 +-
 types/lodash/fp/hasIn.d.ts                   |  133 +-
 types/lodash/fp/head.d.ts                    |   19 +-
 types/lodash/fp/identical.d.ts               |  156 +-
 types/lodash/fp/identity.d.ts                |   23 +-
 types/lodash/fp/inRange.d.ts                 |  103 +-
 types/lodash/fp/includes.d.ts                |   63 +-
 types/lodash/fp/includesFrom.d.ts            |  105 +-
 types/lodash/fp/indexBy.d.ts                 |  225 +-
 types/lodash/fp/indexOf.d.ts                 |  118 +-
 types/lodash/fp/indexOfFrom.d.ts             |  204 +-
 types/lodash/fp/init.d.ts                    |   17 +-
 types/lodash/fp/initial.d.ts                 |   17 +-
 types/lodash/fp/intersection.d.ts            |   53 +-
 types/lodash/fp/intersectionBy.d.ts          |  186 +-
 types/lodash/fp/intersectionWith.d.ts        |  177 +-
 types/lodash/fp/invert.d.ts                  |   19 +-
 types/lodash/fp/invertBy.d.ts                |   73 +-
 types/lodash/fp/invertObj.d.ts               |   19 +-
 types/lodash/fp/invoke.d.ts                  |   48 +-
 types/lodash/fp/invokeArgs.d.ts              |   78 +-
 types/lodash/fp/invokeArgsMap.d.ts           |  187 +-
 types/lodash/fp/invokeMap.d.ts               |  103 +-
 types/lodash/fp/isArguments.d.ts             |   15 +-
 types/lodash/fp/isArray.d.ts                 |   15 +-
 types/lodash/fp/isArrayBuffer.d.ts           |   15 +-
 types/lodash/fp/isArrayLike.d.ts             |   78 +-
 types/lodash/fp/isArrayLikeObject.d.ts       |   77 +-
 types/lodash/fp/isBoolean.d.ts               |   15 +-
 types/lodash/fp/isBuffer.d.ts                |   15 +-
 types/lodash/fp/isDate.d.ts                  |   15 +-
 types/lodash/fp/isElement.d.ts               |   15 +-
 types/lodash/fp/isEmpty.d.ts                 |   16 +-
 types/lodash/fp/isEqual.d.ts                 |  141 +-
 types/lodash/fp/isEqualWith.d.ts             |  285 +-
 types/lodash/fp/isError.d.ts                 |   16 +-
 types/lodash/fp/isFinite.d.ts                |   17 +-
 types/lodash/fp/isFunction.d.ts              |   15 +-
 types/lodash/fp/isInteger.d.ts               |   31 +-
 types/lodash/fp/isLength.d.ts                |   31 +-
 types/lodash/fp/isMap.d.ts                   |   15 +-
 types/lodash/fp/isMatch.d.ts                 |  116 +-
 types/lodash/fp/isMatchWith.d.ts             |  285 +-
 types/lodash/fp/isNaN.d.ts                   |   17 +-
 types/lodash/fp/isNative.d.ts                |   15 +-
 types/lodash/fp/isNil.d.ts                   |   26 +-
 types/lodash/fp/isNull.d.ts                  |   15 +-
 types/lodash/fp/isNumber.d.ts                |   17 +-
 types/lodash/fp/isObject.d.ts                |   16 +-
 types/lodash/fp/isObjectLike.d.ts            |   30 +-
 types/lodash/fp/isPlainObject.d.ts           |   18 +-
 types/lodash/fp/isRegExp.d.ts                |   15 +-
 types/lodash/fp/isSafeInteger.d.ts           |   32 +-
 types/lodash/fp/isSet.d.ts                   |   15 +-
 types/lodash/fp/isString.d.ts                |   15 +-
 types/lodash/fp/isSymbol.d.ts                |   23 +-
 types/lodash/fp/isTypedArray.d.ts            |   15 +-
 types/lodash/fp/isUndefined.d.ts             |   15 +-
 types/lodash/fp/isWeakMap.d.ts               |   15 +-
 types/lodash/fp/isWeakSet.d.ts               |   15 +-
 types/lodash/fp/iteratee.d.ts                |   65 +-
 types/lodash/fp/join.d.ts                    |   53 +-
 types/lodash/fp/juxt.d.ts                    |   18 +-
 types/lodash/fp/kebabCase.d.ts               |   15 +-
 types/lodash/fp/keyBy.d.ts                   |  225 +-
 types/lodash/fp/keys.d.ts                    |   17 +-
 types/lodash/fp/keysIn.d.ts                  |   17 +-
 types/lodash/fp/last.d.ts                    |   17 +-
 types/lodash/fp/lastIndexOf.d.ts             |   58 +-
 types/lodash/fp/lastIndexOfFrom.d.ts         |   96 +-
 types/lodash/fp/lowerCase.d.ts               |   15 +-
 types/lodash/fp/lowerFirst.d.ts              |   15 +-
 types/lodash/fp/lt.d.ts                      |   51 +-
 types/lodash/fp/lte.d.ts                     |   51 +-
 types/lodash/fp/map.d.ts                     |  588 +-
 types/lodash/fp/mapKeys.d.ts                 |  105 +-
 types/lodash/fp/mapValues.d.ts               |  603 +-
 types/lodash/fp/matches.d.ts                 |  116 +-
 types/lodash/fp/matchesProperty.d.ts         |   90 +-
 types/lodash/fp/max.d.ts                     |   19 +-
 types/lodash/fp/maxBy.d.ts                   |  118 +-
 types/lodash/fp/mean.d.ts                    |   22 +-
 types/lodash/fp/meanBy.d.ts                  |   78 +-
 types/lodash/fp/memoize.d.ts                 |   21 +-
 types/lodash/fp/merge.d.ts                   |  151 +-
 types/lodash/fp/mergeAll.d.ts                |   36 +-
 types/lodash/fp/mergeAllWith.d.ts            |  183 +-
 types/lodash/fp/mergeWith.d.ts               |  321 +-
 types/lodash/fp/method.d.ts                  |   19 +-
 types/lodash/fp/methodOf.d.ts                |   19 +-
 types/lodash/fp/min.d.ts                     |   19 +-
 types/lodash/fp/minBy.d.ts                   |  118 +-
 types/lodash/fp/multiply.d.ts                |   46 +-
 types/lodash/fp/nAry.d.ts                    |   51 +-
 types/lodash/fp/negate.d.ts                  |   16 +-
 types/lodash/fp/noConflict.d.ts              |   16 +-
 types/lodash/fp/noop.d.ts                    |   14 +-
 types/lodash/fp/now.d.ts                     |   14 +-
 types/lodash/fp/nth.d.ts                     |   53 +-
 types/lodash/fp/nthArg.d.ts                  |   15 +-
 types/lodash/fp/omit.d.ts                    |  132 +-
 types/lodash/fp/omitAll.d.ts                 |  132 +-
 types/lodash/fp/omitBy.d.ts                  |   98 +-
 types/lodash/fp/once.d.ts                    |   16 +-
 types/lodash/fp/orderBy.d.ts                 |  461 +-
 types/lodash/fp/over.d.ts                    |   18 +-
 types/lodash/fp/overArgs.d.ts                |   58 +-
 types/lodash/fp/overEvery.d.ts               |   18 +-
 types/lodash/fp/overSome.d.ts                |   18 +-
 types/lodash/fp/pad.d.ts                     |   61 +-
 types/lodash/fp/padChars.d.ts                |  103 +-
 types/lodash/fp/padCharsEnd.d.ts             |  103 +-
 types/lodash/fp/padCharsStart.d.ts           |  103 +-
 types/lodash/fp/padEnd.d.ts                  |   61 +-
 types/lodash/fp/padStart.d.ts                |   61 +-
 types/lodash/fp/parseInt.d.ts                |   66 +-
 types/lodash/fp/partial.d.ts                 |   56 +-
 types/lodash/fp/partialRight.d.ts            |   51 +-
 types/lodash/fp/partition.d.ts               |  133 +-
 types/lodash/fp/path.d.ts                    |  207 +-
 types/lodash/fp/pathEq.d.ts                  |   90 +-
 types/lodash/fp/pathOr.d.ts                  |  313 +-
 types/lodash/fp/paths.d.ts                   |   96 +-
 types/lodash/fp/pick.d.ts                    |  159 +-
 types/lodash/fp/pickAll.d.ts                 |  159 +-
 types/lodash/fp/pickBy.d.ts                  |   93 +-
 types/lodash/fp/pipe.d.ts                    |  355 +-
 types/lodash/fp/placeholder.d.ts             |    3 +
 types/lodash/fp/pluck.d.ts                   |  588 +-
 types/lodash/fp/prop.d.ts                    |  207 +-
 types/lodash/fp/propEq.d.ts                  |   90 +-
 types/lodash/fp/propOr.d.ts                  |  313 +-
 types/lodash/fp/property.d.ts                |  207 +-
 types/lodash/fp/propertyOf.d.ts              |  207 +-
 types/lodash/fp/props.d.ts                   |   96 +-
 types/lodash/fp/pull.d.ts                    |   83 +-
 types/lodash/fp/pullAll.d.ts                 |  139 +-
 types/lodash/fp/pullAllBy.d.ts               |  502 +-
 types/lodash/fp/pullAllWith.d.ts             |  502 +-
 types/lodash/fp/pullAt.d.ts                  |   90 +-
 types/lodash/fp/random.d.ts                  |   66 +-
 types/lodash/fp/range.d.ts                   |   66 +-
 types/lodash/fp/rangeRight.d.ts              |  176 +-
 types/lodash/fp/rangeStep.d.ts               |  112 +-
 types/lodash/fp/rangeStepRight.d.ts          |  310 +-
 types/lodash/fp/rearg.d.ts                   |   58 +-
 types/lodash/fp/reduce.d.ts                  |  223 +-
 types/lodash/fp/reduceRight.d.ts             |  172 +-
 types/lodash/fp/reject.d.ts                  |  115 +-
 types/lodash/fp/remove.d.ts                  |  118 +-
 types/lodash/fp/repeat.d.ts                  |   51 +-
 types/lodash/fp/replace.d.ts                 |   87 +-
 types/lodash/fp/rest.d.ts                    |   19 +-
 types/lodash/fp/restFrom.d.ts                |   66 +-
 types/lodash/fp/result.d.ts                  |   63 +-
 types/lodash/fp/reverse.d.ts                 |   30 +-
 types/lodash/fp/round.d.ts                   |   16 +-
 types/lodash/fp/runInContext.d.ts            |   17 +-
 types/lodash/fp/sample.d.ts                  |   25 +-
 types/lodash/fp/sampleSize.d.ts              |   69 +-
 types/lodash/fp/set.d.ts                     |  147 +-
 types/lodash/fp/setWith.d.ts                 |  233 +-
 types/lodash/fp/shuffle.d.ts                 |   25 +-
 types/lodash/fp/size.d.ts                    |   16 +-
 types/lodash/fp/slice.d.ts                   |   96 +-
 types/lodash/fp/snakeCase.d.ts               |   15 +-
 types/lodash/fp/some.d.ts                    |   67 +-
 types/lodash/fp/sortBy.d.ts                  |  205 +-
 types/lodash/fp/sortedIndex.d.ts             |   98 +-
 types/lodash/fp/sortedIndexBy.d.ts           |  213 +-
 types/lodash/fp/sortedIndexOf.d.ts           |   83 +-
 types/lodash/fp/sortedLastIndex.d.ts         |   88 +-
 types/lodash/fp/sortedLastIndexBy.d.ts       |  168 +-
 types/lodash/fp/sortedLastIndexOf.d.ts       |   83 +-
 types/lodash/fp/sortedUniq.d.ts              |   23 +-
 types/lodash/fp/sortedUniqBy.d.ts            |  141 +-
 types/lodash/fp/split.d.ts                   |   66 +-
 types/lodash/fp/spread.d.ts                  |   18 +-
 types/lodash/fp/spreadFrom.d.ts              |   61 +-
 types/lodash/fp/startCase.d.ts               |   15 +-
 types/lodash/fp/startsWith.d.ts              |   56 +-
 types/lodash/fp/stubArray.d.ts               |   14 +-
 types/lodash/fp/stubFalse.d.ts               |   14 +-
 types/lodash/fp/stubObject.d.ts              |   14 +-
 types/lodash/fp/stubString.d.ts              |   14 +-
 types/lodash/fp/stubTrue.d.ts                |   14 +-
 types/lodash/fp/subtract.d.ts                |   76 +-
 types/lodash/fp/sum.d.ts                     |   22 +-
 types/lodash/fp/sumBy.d.ts                   |  118 +-
 types/lodash/fp/symmetricDifference.d.ts     |   48 +-
 types/lodash/fp/symmetricDifferenceBy.d.ts   |  186 +-
 types/lodash/fp/symmetricDifferenceWith.d.ts |  177 +-
 types/lodash/fp/tail.d.ts                    |   17 +-
 types/lodash/fp/take.d.ts                    |   53 +-
 types/lodash/fp/takeLast.d.ts                |   53 +-
 types/lodash/fp/takeLastWhile.d.ts           |  108 +-
 types/lodash/fp/takeRight.d.ts               |   53 +-
 types/lodash/fp/takeRightWhile.d.ts          |  108 +-
 types/lodash/fp/takeWhile.d.ts               |  108 +-
 types/lodash/fp/tap.d.ts                     |   66 +-
 types/lodash/fp/template.d.ts                |   37 +-
 types/lodash/fp/throttle.d.ts                |   98 +-
 types/lodash/fp/thru.d.ts                    |   56 +-
 types/lodash/fp/times.d.ts                   |   56 +-
 types/lodash/fp/toArray.d.ts                 |   32 +-
 types/lodash/fp/toFinite.d.ts                |   30 +-
 types/lodash/fp/toInteger.d.ts               |   31 +-
 types/lodash/fp/toLength.d.ts                |   32 +-
 types/lodash/fp/toLower.d.ts                 |   15 +-
 types/lodash/fp/toNumber.d.ts                |   29 +-
 types/lodash/fp/toPairs.d.ts                 |   25 +-
 types/lodash/fp/toPairsIn.d.ts               |   25 +-
 types/lodash/fp/toPath.d.ts                  |   32 +-
 types/lodash/fp/toPlainObject.d.ts           |   16 +-
 types/lodash/fp/toSafeInteger.d.ts           |   30 +-
 types/lodash/fp/toString.d.ts                |   27 +-
 types/lodash/fp/toUpper.d.ts                 |   15 +-
 types/lodash/fp/transform.d.ts               |  240 +-
 types/lodash/fp/trim.d.ts                    |   16 +-
 types/lodash/fp/trimChars.d.ts               |   51 +-
 types/lodash/fp/trimCharsEnd.d.ts            |   51 +-
 types/lodash/fp/trimCharsStart.d.ts          |   51 +-
 types/lodash/fp/trimEnd.d.ts                 |   16 +-
 types/lodash/fp/trimStart.d.ts               |   16 +-
 types/lodash/fp/truncate.d.ts                |   58 +-
 types/lodash/fp/unapply.d.ts                 |   19 +-
 types/lodash/fp/unary.d.ts                   |   21 +-
 types/lodash/fp/unescape.d.ts                |   19 +-
 types/lodash/fp/union.d.ts                   |   53 +-
 types/lodash/fp/unionBy.d.ts                 |  105 +-
 types/lodash/fp/unionWith.d.ts               |  177 +-
 types/lodash/fp/uniq.d.ts                    |   25 +-
 types/lodash/fp/uniqBy.d.ts                  |  186 +-
 types/lodash/fp/uniqWith.d.ts                |   98 +-
 types/lodash/fp/uniqueId.d.ts                |   15 +-
 types/lodash/fp/unnest.d.ts                  |   17 +-
 types/lodash/fp/unset.d.ts                   |   63 +-
 types/lodash/fp/unzip.d.ts                   |   18 +-
 types/lodash/fp/unzipWith.d.ts               |   68 +-
 types/lodash/fp/update.d.ts                  |  105 +-
 types/lodash/fp/updateWith.d.ts              |  431 +-
 types/lodash/fp/upperCase.d.ts               |   15 +-
 types/lodash/fp/upperFirst.d.ts              |   15 +-
 types/lodash/fp/useWith.d.ts                 |   58 +-
 types/lodash/fp/values.d.ts                  |   32 +-
 types/lodash/fp/valuesIn.d.ts                |   25 +-
 types/lodash/fp/where.d.ts                   |   48 +-
 types/lodash/fp/whereEq.d.ts                 |  116 +-
 types/lodash/fp/without.d.ts                 |   53 +-
 types/lodash/fp/words.d.ts                   |   16 +-
 types/lodash/fp/wrap.d.ts                    |  103 +-
 types/lodash/fp/xor.d.ts                     |   48 +-
 types/lodash/fp/xorBy.d.ts                   |  186 +-
 types/lodash/fp/xorWith.d.ts                 |  177 +-
 types/lodash/fp/zip.d.ts                     |   53 +-
 types/lodash/fp/zipAll.d.ts                  |   18 +-
 types/lodash/fp/zipObj.d.ts                  |   58 +-
 types/lodash/fp/zipObject.d.ts               |   58 +-
 types/lodash/fp/zipObjectDeep.d.ts           |   53 +-
 types/lodash/fp/zipWith.d.ts                 |  105 +-
 types/lodash/lodash-tests.ts                 |   27 +-
 types/lodash/scripts/generate-fp.ts          |  322 +-
 types/lodash/tsconfig.json                   |    5 +-
 393 files changed, 5343 insertions(+), 36622 deletions(-)
 create mode 100644 types/lodash/fp/__.d.ts
 create mode 100644 types/lodash/fp/placeholder.d.ts

diff --git a/types/lodash/common/array.d.ts b/types/lodash/common/array.d.ts
index 49f93aa313..34b9548221 100644
--- a/types/lodash/common/array.d.ts
+++ b/types/lodash/common/array.d.ts
@@ -1405,7 +1405,7 @@ declare module "../index" {
             this: LoDashImplicitWrapper<List<T1> | null | undefined>,
             values1: List<T2>,
             values2: List<T3>,
-            ...values: Array<List<T4> | Comparator2<T1, T2 | T3 | T4>>,
+            ...values: Array<List<T4> | Comparator2<T1, T2 | T3 | T4>>
         ): LoDashImplicitWrapper<T1[]>;
 
         /**
@@ -1444,7 +1444,7 @@ declare module "../index" {
             this: LoDashExplicitWrapper<List<T1> | null | undefined>,
             values1: List<T2>,
             values2: List<T3>,
-            ...values: Array<List<T4> | Comparator2<T1, T2 | T3 | T4>>,
+            ...values: Array<List<T4> | Comparator2<T1, T2 | T3 | T4>>
         ): LoDashExplicitWrapper<T1[]>;
 
         /**
diff --git a/types/lodash/common/function.d.ts b/types/lodash/common/function.d.ts
index 31055a2781..71ec3bb884 100644
--- a/types/lodash/common/function.d.ts
+++ b/types/lodash/common/function.d.ts
@@ -95,7 +95,7 @@ declare module "../index" {
     // bind
 
     interface FunctionBind {
-        placeholder: any;
+        placeholder: __;
 
         (
             func: (...args: any[]) => any,
@@ -145,7 +145,7 @@ declare module "../index" {
     // bindKey
 
     interface FunctionBindKey {
-        placeholder: any;
+        placeholder: __;
 
         (
             object: object,
@@ -195,7 +195,7 @@ declare module "../index" {
 
     // curry
 
-    interface LoDashStatic {
+    interface Curry {
         /**
          * Creates a function that accepts one or more arguments of func that when called either invokes func returning
          * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
@@ -204,7 +204,7 @@ declare module "../index" {
          * @param arity The arity of func.
          * @return Returns the new curried function.
          */
-        curry<T1, R>(func: (t1: T1) => R, arity?: number):
+        <T1, R>(func: (t1: T1) => R, arity?: number):
             CurriedFunction1<T1, R>;
         /**
          * Creates a function that accepts one or more arguments of func that when called either invokes func returning
@@ -214,7 +214,7 @@ declare module "../index" {
          * @param arity The arity of func.
          * @return Returns the new curried function.
          */
-        curry<T1, T2, R>(func: (t1: T1, t2: T2) => R, arity?: number):
+        <T1, T2, R>(func: (t1: T1, t2: T2) => R, arity?: number):
             CurriedFunction2<T1, T2, R>;
         /**
          * Creates a function that accepts one or more arguments of func that when called either invokes func returning
@@ -224,7 +224,7 @@ declare module "../index" {
          * @param arity The arity of func.
          * @return Returns the new curried function.
          */
-        curry<T1, T2, T3, R>(func: (t1: T1, t2: T2, t3: T3) => R, arity?: number):
+        <T1, T2, T3, R>(func: (t1: T1, t2: T2, t3: T3) => R, arity?: number):
             CurriedFunction3<T1, T2, T3, R>;
         /**
          * Creates a function that accepts one or more arguments of func that when called either invokes func returning
@@ -234,7 +234,7 @@ declare module "../index" {
          * @param arity The arity of func.
          * @return Returns the new curried function.
          */
-        curry<T1, T2, T3, T4, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4) => R, arity?: number):
+        <T1, T2, T3, T4, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4) => R, arity?: number):
             CurriedFunction4<T1, T2, T3, T4, R>;
         /**
          * Creates a function that accepts one or more arguments of func that when called either invokes func returning
@@ -244,7 +244,7 @@ declare module "../index" {
          * @param arity The arity of func.
          * @return Returns the new curried function.
          */
-        curry<T1, T2, T3, T4, T5, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5) => R, arity?: number):
+        <T1, T2, T3, T4, T5, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5) => R, arity?: number):
             CurriedFunction5<T1, T2, T3, T4, T5, R>;
         /**
          * Creates a function that accepts one or more arguments of func that when called either invokes func returning
@@ -254,7 +254,13 @@ declare module "../index" {
          * @param arity The arity of func.
          * @return Returns the new curried function.
          */
-        curry(func: (...args: any[]) => any, arity?: number): (...args: any[]) => any;
+        (func: (...args: any[]) => any, arity?: number): (...args: any[]) => any;
+
+        placeholder: __;
+    }
+
+    interface LoDashStatic {
+        curry: Curry;
     }
 
     interface CurriedFunction1<T1, R> {
@@ -265,60 +271,149 @@ declare module "../index" {
     interface CurriedFunction2<T1, T2, R> {
         (): CurriedFunction2<T1, T2, R>;
         (t1: T1): CurriedFunction1<T2, R>;
+        (t1: __, t2: T2): CurriedFunction1<T1, R>;
         (t1: T1, t2: T2): R;
     }
 
     interface CurriedFunction3<T1, T2, T3, R> {
         (): CurriedFunction3<T1, T2, T3, R>;
         (t1: T1): CurriedFunction2<T2, T3, R>;
+        (t1: __, t2: T2): CurriedFunction2<T1, T3, R>;
         (t1: T1, t2: T2): CurriedFunction1<T3, R>;
+        (t1: __, t2: __, t3: T3): CurriedFunction2<T1, T2, R>;
+        (t1: T1, t2: __, t3: T3): CurriedFunction1<T2, R>;
+        (t1: __, t2: T2, t3: T3): CurriedFunction1<T1, R>;
         (t1: T1, t2: T2, t3: T3): R;
     }
 
     interface CurriedFunction4<T1, T2, T3, T4, R> {
         (): CurriedFunction4<T1, T2, T3, T4, R>;
         (t1: T1): CurriedFunction3<T2, T3, T4, R>;
+        (t1: __, t2: T2): CurriedFunction3<T1, T3, T4, R>;
         (t1: T1, t2: T2): CurriedFunction2<T3, T4, R>;
+        (t1: __, t2: __, t3: T3): CurriedFunction3<T1, T2, T4, R>;
+        (t1: __, t2: __, t3: T3): CurriedFunction2<T2, T4, R>;
+        (t1: __, t2: T2, t3: T3): CurriedFunction2<T1, T4, R>;
         (t1: T1, t2: T2, t3: T3): CurriedFunction1<T4, R>;
+        (t1: __, t2: __, t3: __, t4: T4): CurriedFunction3<T1, T2, T3, R>;
+        (t1: T1, t2: __, t3: __, t4: T4): CurriedFunction2<T2, T3, R>;
+        (t1: __, t2: T2, t3: __, t4: T4): CurriedFunction2<T1, T3, R>;
+        (t1: __, t2: __, t3: T3, t4: T4): CurriedFunction2<T1, T2, R>;
+        (t1: T1, t2: T2, t3: __, t4: T4): CurriedFunction1<T3, R>;
+        (t1: T1, t2: __, t3: T3, t4: T4): CurriedFunction1<T2, R>;
+        (t1: __, t2: T2, t3: T3, t4: T4): CurriedFunction1<T1, R>;
         (t1: T1, t2: T2, t3: T3, t4: T4): R;
     }
 
     interface CurriedFunction5<T1, T2, T3, T4, T5, R> {
         (): CurriedFunction5<T1, T2, T3, T4, T5, R>;
         (t1: T1): CurriedFunction4<T2, T3, T4, T5, R>;
+        (t1: __, t2: T2): CurriedFunction4<T1, T3, T4, T5, R>;
         (t1: T1, t2: T2): CurriedFunction3<T3, T4, T5, R>;
+        (t1: __, t2: __, t3: T3): CurriedFunction4<T1, T2, T4, T5, R>;
+        (t1: T1, t2: __, t3: T3): CurriedFunction3<T2, T4, T5, R>;
+        (t1: __, t2: T2, t3: T3): CurriedFunction3<T1, T4, T5, R>;
         (t1: T1, t2: T2, t3: T3): CurriedFunction2<T4, T5, R>;
+        (t1: __, t2: __, t3: __, t4: T4): CurriedFunction4<T1, T2, T3, T5, R>;
+        (t1: T1, t2: __, t3: __, t4: T4): CurriedFunction3<T2, T3, T5, R>;
+        (t1: __, t2: T2, t3: __, t4: T4): CurriedFunction3<T1, T3, T5, R>;
+        (t1: __, t2: __, t3: T3, t4: T4): CurriedFunction3<T1, T2, T5, R>;
+        (t1: T1, t2: T2, t3: __, t4: T4): CurriedFunction2<T3, T5, R>;
+        (t1: T1, t2: __, t3: T3, t4: T4): CurriedFunction2<T2, T5, R>;
+        (t1: __, t2: T2, t3: T3, t4: T4): CurriedFunction2<T1, T5, R>;
         (t1: T1, t2: T2, t3: T3, t4: T4): CurriedFunction1<T5, R>;
+        (t1: __, t2: __, t3: __, t4: __, t5: T5): CurriedFunction4<T1, T2, T3, T4, R>;
+        (t1: T1, t2: __, t3: __, t4: __, t5: T5): CurriedFunction3<T2, T3, T4, R>;
+        (t1: __, t2: T2, t3: __, t4: __, t5: T5): CurriedFunction3<T1, T3, T4, R>;
+        (t1: __, t2: __, t3: T3, t4: __, t5: T5): CurriedFunction3<T1, T2, T4, R>;
+        (t1: __, t2: __, t3: __, t4: T4, t5: T5): CurriedFunction3<T1, T2, T3, R>;
+        (t1: T1, t2: T2, t3: __, t4: __, t5: T5): CurriedFunction2<T3, T4, R>;
+        (t1: T1, t2: __, t3: T3, t4: __, t5: T5): CurriedFunction2<T2, T4, R>;
+        (t1: T1, t2: __, t3: __, t4: T4, t5: T5): CurriedFunction2<T2, T3, R>;
+        (t1: __, t2: T2, t3: T3, t4: __, t5: T5): CurriedFunction2<T1, T4, R>;
+        (t1: __, t2: T2, t3: __, t4: T4, t5: T5): CurriedFunction2<T1, T3, R>;
+        (t1: __, t2: __, t3: T3, t4: T4, t5: T5): CurriedFunction2<T1, T2, R>;
+        (t1: T1, t2: T2, t3: T3, t4: __, t5: T5): CurriedFunction1<T4, R>;
+        (t1: T1, t2: T2, t3: __, t4: T4, t5: T5): CurriedFunction1<T3, R>;
+        (t1: T1, t2: __, t3: T3, t4: T4, t5: T5): CurriedFunction1<T2, R>;
+        (t1: __, t2: T2, t3: T3, t4: T4, t5: T5): CurriedFunction1<T1, R>;
         (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5): R;
     }
+
     interface RightCurriedFunction1<T1, R> {
         (): RightCurriedFunction1<T1, R>;
         (t1: T1): R;
     }
+
     interface RightCurriedFunction2<T1, T2, R> {
         (): RightCurriedFunction2<T1, T2, R>;
         (t2: T2): RightCurriedFunction1<T1, R>;
+        (t1: T1, t2: __): RightCurriedFunction1<T2, R>;
         (t1: T1, t2: T2): R;
     }
+
     interface RightCurriedFunction3<T1, T2, T3, R> {
         (): RightCurriedFunction3<T1, T2, T3, R>;
         (t3: T3): RightCurriedFunction2<T1, T2, R>;
+        (t2: T2, t3: __): RightCurriedFunction2<T1, T3, R>;
         (t2: T2, t3: T3): RightCurriedFunction1<T1, R>;
+        (t1: T1, t2: __, t3: __): RightCurriedFunction2<T2, T3, R>;
+        (t1: T1, t2: T2, t3: __): RightCurriedFunction1<T3, R>;
+        (t1: T1, t2: __, t3: T3): RightCurriedFunction1<T2, R>;
         (t1: T1, t2: T2, t3: T3): R;
     }
+
     interface RightCurriedFunction4<T1, T2, T3, T4, R> {
         (): RightCurriedFunction4<T1, T2, T3, T4, R>;
         (t4: T4): RightCurriedFunction3<T1, T2, T3, R>;
+        (t3: T3, t4: __): RightCurriedFunction3<T1, T2, T4, R>;
         (t3: T3, t4: T4): RightCurriedFunction2<T1, T2, R>;
+        (t2: T2, t3: __, t4: __): RightCurriedFunction3<T1, T3, T4, R>;
+        (t2: T2, t3: T3, t4: __): RightCurriedFunction2<T1, T4, R>;
+        (t2: T2, t3: __, t4: T4): RightCurriedFunction2<T1, T3, R>;
         (t2: T2, t3: T3, t4: T4): RightCurriedFunction1<T1, R>;
+        (t1: T1, t2: __, t3: __, t4: __): RightCurriedFunction3<T2, T3, T4, R>;
+        (t1: T1, t2: T2, t3: __, t4: __): RightCurriedFunction2<T3, T4, R>;
+        (t1: T1, t2: __, t3: T3, t4: __): RightCurriedFunction2<T2, T4, R>;
+        (t1: T1, t2: __, t3: __, t4: T4): RightCurriedFunction2<T2, T3, R>;
+        (t1: T1, t2: T2, t3: T3, t4: __): RightCurriedFunction1<T4, R>;
+        (t1: T1, t2: T2, t3: __, t4: T4): RightCurriedFunction1<T3, R>;
+        (t1: T1, t2: __, t3: T3, t4: T4): RightCurriedFunction1<T2, R>;
         (t1: T1, t2: T2, t3: T3, t4: T4): R;
     }
+
     interface RightCurriedFunction5<T1, T2, T3, T4, T5, R> {
         (): RightCurriedFunction5<T1, T2, T3, T4, T5, R>;
         (t5: T5): RightCurriedFunction4<T1, T2, T3, T4, R>;
+        (t4: T4, t5: __): RightCurriedFunction4<T1, T2, T3, T5, R>;
         (t4: T4, t5: T5): RightCurriedFunction3<T1, T2, T3, R>;
+        (t3: T3, t4: __, t5: __): RightCurriedFunction4<T1, T2, T4, T5, R>;
+        (t3: T3, t4: T4, t5: __): RightCurriedFunction3<T1, T2, T5, R>;
+        (t3: T3, t4: __, t5: T5): RightCurriedFunction3<T1, T2, T4, R>;
         (t3: T3, t4: T4, t5: T5): RightCurriedFunction2<T1, T2, R>;
+        (t2: T2, t3: __, t4: __, t5: __): RightCurriedFunction4<T1, T3, T4, T5, R>;
+        (t2: T2, t3: T3, t4: __, t5: __): RightCurriedFunction3<T1, T4, T5, R>;
+        (t2: T2, t3: __, t4: T4, t5: __): RightCurriedFunction3<T1, T3, T5, R>;
+        (t2: T2, t3: __, t4: __, t5: T5): RightCurriedFunction3<T1, T3, T4, R>;
+        (t2: T2, t3: T3, t4: T4, t5: __): RightCurriedFunction2<T1, T5, R>;
+        (t2: T2, t3: T3, t4: __, t5: T5): RightCurriedFunction2<T1, T4, R>;
+        (t2: T2, t3: __, t4: T4, t5: T5): RightCurriedFunction2<T1, T3, R>;
         (t2: T2, t3: T3, t4: T4, t5: T5): RightCurriedFunction1<T1, R>;
+        (t1: T1, t2: __, t3: __, t4: __, t5: __): RightCurriedFunction4<T2, T3, T4, T5, R>;
+        (t1: T1, t2: T2, t3: __, t4: __, t5: __): RightCurriedFunction3<T3, T4, T5, R>;
+        (t1: T1, t2: __, t3: T3, t4: __, t5: __): RightCurriedFunction3<T2, T4, T5, R>;
+        (t1: T1, t2: __, t3: __, t4: T4, t5: __): RightCurriedFunction3<T2, T3, T5, R>;
+        (t1: T1, t2: __, t3: __, t4: __, t5: T5): RightCurriedFunction3<T2, T3, T4, R>;
+        (t1: T1, t2: T2, t3: T3, t4: __, t5: __): RightCurriedFunction2<T4, T5, R>;
+        (t1: T1, t2: T2, t3: __, t4: T4, t5: __): RightCurriedFunction2<T3, T5, R>;
+        (t1: T1, t2: T2, t3: __, t4: __, t5: T5): RightCurriedFunction2<T3, T4, R>;
+        (t1: T1, t2: __, t3: T3, t4: T4, t5: __): RightCurriedFunction2<T2, T5, R>;
+        (t1: T1, t2: __, t3: T3, t4: __, t5: T5): RightCurriedFunction2<T2, T4, R>;
+        (t1: T1, t2: __, t3: __, t4: T4, t5: T5): RightCurriedFunction2<T2, T3, R>;
+        (t1: T1, t2: T2, t3: T3, t4: T4, t5: __): RightCurriedFunction1<T5, R>;
+        (t1: T1, t2: T2, t3: T3, t4: __, t5: T5): RightCurriedFunction1<T4, R>;
+        (t1: T1, t2: T2, t3: __, t4: T4, t5: T5): RightCurriedFunction1<T3, R>;
+        (t1: T1, t2: __, t3: T3, t4: T4, t5: T5): RightCurriedFunction1<T2, R>;
         (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5): R;
     }
 
@@ -398,7 +493,7 @@ declare module "../index" {
 
     // curryRight
 
-    interface LoDashStatic {
+    interface CurryRight {
         /**
          * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
          * instead of _.partial.
@@ -406,7 +501,7 @@ declare module "../index" {
          * @param arity The arity of func.
          * @return Returns the new curried function.
          */
-        curryRight<T1, R>(func: (t1: T1) => R, arity?: number):
+        <T1, R>(func: (t1: T1) => R, arity?: number):
             RightCurriedFunction1<T1, R>;
         /**
          * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
@@ -415,7 +510,7 @@ declare module "../index" {
          * @param arity The arity of func.
          * @return Returns the new curried function.
          */
-        curryRight<T1, T2, R>(func: (t1: T1, t2: T2) => R, arity?: number):
+        <T1, T2, R>(func: (t1: T1, t2: T2) => R, arity?: number):
             RightCurriedFunction2<T1, T2, R>;
         /**
          * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
@@ -424,7 +519,7 @@ declare module "../index" {
          * @param arity The arity of func.
          * @return Returns the new curried function.
          */
-        curryRight<T1, T2, T3, R>(func: (t1: T1, t2: T2, t3: T3) => R, arity?: number):
+        <T1, T2, T3, R>(func: (t1: T1, t2: T2, t3: T3) => R, arity?: number):
             RightCurriedFunction3<T1, T2, T3, R>;
         /**
          * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
@@ -433,7 +528,7 @@ declare module "../index" {
          * @param arity The arity of func.
          * @return Returns the new curried function.
          */
-        curryRight<T1, T2, T3, T4, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4) => R, arity?: number):
+        <T1, T2, T3, T4, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4) => R, arity?: number):
             RightCurriedFunction4<T1, T2, T3, T4, R>;
         /**
          * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
@@ -442,7 +537,7 @@ declare module "../index" {
          * @param arity The arity of func.
          * @return Returns the new curried function.
          */
-        curryRight<T1, T2, T3, T4, T5, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5) => R, arity?: number):
+        <T1, T2, T3, T4, T5, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5) => R, arity?: number):
             RightCurriedFunction5<T1, T2, T3, T4, T5, R>;
         /**
          * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
@@ -451,7 +546,13 @@ declare module "../index" {
          * @param arity The arity of func.
          * @return Returns the new curried function.
          */
-        curryRight(func: (...args: any[]) => any, arity?: number): (...args: any[]) => any;
+        (func: (...args: any[]) => any, arity?: number): (...args: any[]) => any;
+
+        placeholder: __;
+    }
+
+    interface LoDashStatic {
+        curryRight: CurryRight;
     }
 
     interface LoDashImplicitWrapper<TValue> {
@@ -828,7 +929,8 @@ declare module "../index" {
         partial: ExplicitPartial;
     }
 
-    type PH = LoDashStatic;
+    /** The placeholder, to be used in curried functions */
+    type __ = LoDashStatic;
 
     type Function0<R> = () => R;
     type Function1<T1, R> = (t1: T1) => R;
@@ -845,36 +947,38 @@ declare module "../index" {
         // arity 2
         <T1, T2, R>(func: Function2<T1, T2, R>):                      Function2<T1, T2, R>;
         <T1, T2, R>(func: Function2<T1, T2, R>, arg1: T1):            Function1<    T2, R>;
-        <T1, T2, R>(func: Function2<T1, T2, R>, plc1: PH, arg2: T2):  Function1<T1,     R>;
+        <T1, T2, R>(func: Function2<T1, T2, R>, plc1: __, arg2: T2):  Function1<T1,     R>;
         <T1, T2, R>(func: Function2<T1, T2, R>, arg1: T1, arg2: T2):  Function0<        R>;
         // arity 3
         <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>):                                Function3<T1, T2, T3, R>;
         <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, arg1: T1):                      Function2<    T2, T3, R>;
-        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, plc1: PH, arg2: T2):            Function2<T1,     T3, R>;
+        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, plc1: __, arg2: T2):            Function2<T1,     T3, R>;
         <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, arg1: T1, arg2: T2):            Function1<        T3, R>;
-        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, plc1: PH, plc2: PH, arg3: T3):  Function2<T1, T2,     R>;
-        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, arg1: T1, plc2: PH, arg3: T3):  Function1<    T2,     R>;
-        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, plc1: PH, arg2: T2, arg3: T3):  Function1<T1,         R>;
+        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, plc1: __, plc2: __, arg3: T3):  Function2<T1, T2,     R>;
+        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, arg1: T1, plc2: __, arg3: T3):  Function1<    T2,     R>;
+        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, plc1: __, arg2: T2, arg3: T3):  Function1<T1,         R>;
         <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, arg1: T1, arg2: T2, arg3: T3):  Function0<            R>;
         // arity 4
         <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>):                                          Function4<T1, T2, T3, T4, R>;
         <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1):                                Function3<    T2, T3, T4, R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, plc1: PH, arg2: T2):                      Function3<T1,     T3, T4, R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, plc1: __, arg2: T2):                      Function3<T1,     T3, T4, R>;
         <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, arg2: T2):                      Function2<        T3, T4, R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, plc1: PH, plc2: PH, arg3: T3):            Function3<T1, T2,     T4, R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, plc2: PH, arg3: T3):            Function2<    T2,     T4, R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, plc1: PH, arg2: T2, arg3: T3):            Function2<T1,         T4, R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, plc1: __, plc2: __, arg3: T3):            Function3<T1, T2,     T4, R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, plc2: __, arg3: T3):            Function2<    T2,     T4, R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, plc1: __, arg2: T2, arg3: T3):            Function2<T1,         T4, R>;
         <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, arg2: T2, arg3: T3):            Function1<            T4, R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, plc1: PH, plc2: PH, plc3: PH, arg4: T4):  Function3<T1, T2, T3,     R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, plc2: PH, plc3: PH, arg4: T4):  Function2<    T2, T3,     R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, plc1: PH, arg2: T2, plc3: PH, arg4: T4):  Function2<T1,     T3,     R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, arg2: T2, plc3: PH, arg4: T4):  Function1<        T3,     R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, plc1: PH, plc2: PH, arg3: T3, arg4: T4):  Function2<T1, T2,         R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, plc2: PH, arg3: T3, arg4: T4):  Function1<    T2,         R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, plc1: PH, arg2: T2, arg3: T3, arg4: T4):  Function1<T1,             R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, plc1: __, plc2: __, plc3: __, arg4: T4):  Function3<T1, T2, T3,     R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, plc2: __, plc3: __, arg4: T4):  Function2<    T2, T3,     R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, plc1: __, arg2: T2, plc3: __, arg4: T4):  Function2<T1,     T3,     R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, arg2: T2, plc3: __, arg4: T4):  Function1<        T3,     R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, plc1: __, plc2: __, arg3: T3, arg4: T4):  Function2<T1, T2,         R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, plc2: __, arg3: T3, arg4: T4):  Function1<    T2,         R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, plc1: __, arg2: T2, arg3: T3, arg4: T4):  Function1<T1,             R>;
         <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, arg2: T2, arg3: T3, arg4: T4):  Function0<                R>;
         // catch-all
         (func: (...args: any[]) => any, ...args: any[]): (...args: any[]) => any;
+
+        placeholder: __;
     }
 
     interface ImplicitPartial {
@@ -886,33 +990,33 @@ declare module "../index" {
         // arity 2
         <T1, T2, R>(this: LoDashImplicitWrapper<Function2<T1, T2, R>>):                      LoDashImplicitWrapper<Function2<T1, T2, R>>;
         <T1, T2, R>(this: LoDashImplicitWrapper<Function2<T1, T2, R>>, arg1: T1):            LoDashImplicitWrapper<Function1<    T2, R>>;
-        <T1, T2, R>(this: LoDashImplicitWrapper<Function2<T1, T2, R>>, plc1: PH, arg2: T2):  LoDashImplicitWrapper<Function1<T1,     R>>;
+        <T1, T2, R>(this: LoDashImplicitWrapper<Function2<T1, T2, R>>, plc1: __, arg2: T2):  LoDashImplicitWrapper<Function1<T1,     R>>;
         <T1, T2, R>(this: LoDashImplicitWrapper<Function2<T1, T2, R>>, arg1: T1, arg2: T2):  LoDashImplicitWrapper<Function0<        R>>;
         // arity 3
         <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>):                                LoDashImplicitWrapper<Function3<T1, T2, T3, R>>;
         <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1):                      LoDashImplicitWrapper<Function2<    T2, T3, R>>;
-        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, plc1: PH, arg2: T2):            LoDashImplicitWrapper<Function2<T1,     T3, R>>;
+        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, plc1: __, arg2: T2):            LoDashImplicitWrapper<Function2<T1,     T3, R>>;
         <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, arg2: T2):            LoDashImplicitWrapper<Function1<        T3, R>>;
-        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, plc1: PH, plc2: PH, arg3: T3):  LoDashImplicitWrapper<Function2<T1, T2,     R>>;
-        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, plc2: PH, arg3: T3):  LoDashImplicitWrapper<Function1<    T2,     R>>;
-        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, plc1: PH, arg2: T2, arg3: T3):  LoDashImplicitWrapper<Function1<T1,         R>>;
+        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, plc1: __, plc2: __, arg3: T3):  LoDashImplicitWrapper<Function2<T1, T2,     R>>;
+        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, plc2: __, arg3: T3):  LoDashImplicitWrapper<Function1<    T2,     R>>;
+        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, plc1: __, arg2: T2, arg3: T3):  LoDashImplicitWrapper<Function1<T1,         R>>;
         <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, arg2: T2, arg3: T3):  LoDashImplicitWrapper<Function0<            R>>;
         // arity 4
         <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>):                                          LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>;
         <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1):                                LoDashImplicitWrapper<Function3<    T2, T3, T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, arg2: T2):                      LoDashImplicitWrapper<Function3<T1,     T3, T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: __, arg2: T2):                      LoDashImplicitWrapper<Function3<T1,     T3, T4, R>>;
         <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2):                      LoDashImplicitWrapper<Function2<        T3, T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, plc2: PH, arg3: T3):            LoDashImplicitWrapper<Function3<T1, T2,     T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, arg3: T3):            LoDashImplicitWrapper<Function2<    T2,     T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, arg2: T2, arg3: T3):            LoDashImplicitWrapper<Function2<T1,         T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: __, plc2: __, arg3: T3):            LoDashImplicitWrapper<Function3<T1, T2,     T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: __, arg3: T3):            LoDashImplicitWrapper<Function2<    T2,     T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: __, arg2: T2, arg3: T3):            LoDashImplicitWrapper<Function2<T1,         T4, R>>;
         <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, arg3: T3):            LoDashImplicitWrapper<Function1<            T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, plc2: PH, plc3: PH, arg4: T4):  LoDashImplicitWrapper<Function3<T1, T2, T3,     R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, plc3: PH, arg4: T4):  LoDashImplicitWrapper<Function2<    T2, T3,     R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, arg2: T2, plc3: PH, arg4: T4):  LoDashImplicitWrapper<Function2<T1,     T3,     R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, plc3: PH, arg4: T4):  LoDashImplicitWrapper<Function1<        T3,     R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, plc2: PH, arg3: T3, arg4: T4):  LoDashImplicitWrapper<Function2<T1, T2,         R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, arg3: T3, arg4: T4):  LoDashImplicitWrapper<Function1<    T2,         R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, arg2: T2, arg3: T3, arg4: T4):  LoDashImplicitWrapper<Function1<T1,             R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: __, plc2: __, plc3: __, arg4: T4):  LoDashImplicitWrapper<Function3<T1, T2, T3,     R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: __, plc3: __, arg4: T4):  LoDashImplicitWrapper<Function2<    T2, T3,     R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: __, arg2: T2, plc3: __, arg4: T4):  LoDashImplicitWrapper<Function2<T1,     T3,     R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, plc3: __, arg4: T4):  LoDashImplicitWrapper<Function1<        T3,     R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: __, plc2: __, arg3: T3, arg4: T4):  LoDashImplicitWrapper<Function2<T1, T2,         R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: __, arg3: T3, arg4: T4):  LoDashImplicitWrapper<Function1<    T2,         R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: __, arg2: T2, arg3: T3, arg4: T4):  LoDashImplicitWrapper<Function1<T1,             R>>;
         <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, arg3: T3, arg4: T4):  LoDashImplicitWrapper<Function0<                R>>;
         // catch-all
         (...args: any[]): LoDashImplicitWrapper<(...args: any[]) => any>;
@@ -927,33 +1031,33 @@ declare module "../index" {
         // arity 2
         <T1, T2, R>(this: LoDashExplicitWrapper<Function2<T1, T2, R>>):                      LoDashExplicitWrapper<Function2<T1, T2, R>>;
         <T1, T2, R>(this: LoDashExplicitWrapper<Function2<T1, T2, R>>, arg1: T1):            LoDashExplicitWrapper<Function1<    T2, R>>;
-        <T1, T2, R>(this: LoDashExplicitWrapper<Function2<T1, T2, R>>, plc1: PH, arg2: T2):  LoDashExplicitWrapper<Function1<T1,     R>>;
+        <T1, T2, R>(this: LoDashExplicitWrapper<Function2<T1, T2, R>>, plc1: __, arg2: T2):  LoDashExplicitWrapper<Function1<T1,     R>>;
         <T1, T2, R>(this: LoDashExplicitWrapper<Function2<T1, T2, R>>, arg1: T1, arg2: T2):  LoDashExplicitWrapper<Function0<        R>>;
         // arity 3
         <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>):                                LoDashExplicitWrapper<Function3<T1, T2, T3, R>>;
         <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1):                      LoDashExplicitWrapper<Function2<    T2, T3, R>>;
-        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, plc1: PH, arg2: T2):            LoDashExplicitWrapper<Function2<T1,     T3, R>>;
+        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, plc1: __, arg2: T2):            LoDashExplicitWrapper<Function2<T1,     T3, R>>;
         <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, arg2: T2):            LoDashExplicitWrapper<Function1<        T3, R>>;
-        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, plc1: PH, plc2: PH, arg3: T3):  LoDashExplicitWrapper<Function2<T1, T2,     R>>;
-        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, plc2: PH, arg3: T3):  LoDashExplicitWrapper<Function1<    T2,     R>>;
-        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, plc1: PH, arg2: T2, arg3: T3):  LoDashExplicitWrapper<Function1<T1,         R>>;
+        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, plc1: __, plc2: __, arg3: T3):  LoDashExplicitWrapper<Function2<T1, T2,     R>>;
+        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, plc2: __, arg3: T3):  LoDashExplicitWrapper<Function1<    T2,     R>>;
+        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, plc1: __, arg2: T2, arg3: T3):  LoDashExplicitWrapper<Function1<T1,         R>>;
         <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, arg2: T2, arg3: T3):  LoDashExplicitWrapper<Function0<            R>>;
         // arity 4
         <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>):                                          LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>;
         <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1):                                LoDashExplicitWrapper<Function3<    T2, T3, T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, arg2: T2):                      LoDashExplicitWrapper<Function3<T1,     T3, T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: __, arg2: T2):                      LoDashExplicitWrapper<Function3<T1,     T3, T4, R>>;
         <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2):                      LoDashExplicitWrapper<Function2<        T3, T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, plc2: PH, arg3: T3):            LoDashExplicitWrapper<Function3<T1, T2,     T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, arg3: T3):            LoDashExplicitWrapper<Function2<    T2,     T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, arg2: T2, arg3: T3):            LoDashExplicitWrapper<Function2<T1,         T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: __, plc2: __, arg3: T3):            LoDashExplicitWrapper<Function3<T1, T2,     T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: __, arg3: T3):            LoDashExplicitWrapper<Function2<    T2,     T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: __, arg2: T2, arg3: T3):            LoDashExplicitWrapper<Function2<T1,         T4, R>>;
         <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, arg3: T3):            LoDashExplicitWrapper<Function1<            T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, plc2: PH, plc3: PH, arg4: T4):  LoDashExplicitWrapper<Function3<T1, T2, T3,     R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, plc3: PH, arg4: T4):  LoDashExplicitWrapper<Function2<    T2, T3,     R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, arg2: T2, plc3: PH, arg4: T4):  LoDashExplicitWrapper<Function2<T1,     T3,     R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, plc3: PH, arg4: T4):  LoDashExplicitWrapper<Function1<        T3,     R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, plc2: PH, arg3: T3, arg4: T4):  LoDashExplicitWrapper<Function2<T1, T2,         R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, arg3: T3, arg4: T4):  LoDashExplicitWrapper<Function1<    T2,         R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: PH, arg2: T2, arg3: T3, arg4: T4):  LoDashExplicitWrapper<Function1<T1,             R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: __, plc2: __, plc3: __, arg4: T4):  LoDashExplicitWrapper<Function3<T1, T2, T3,     R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: __, plc3: __, arg4: T4):  LoDashExplicitWrapper<Function2<    T2, T3,     R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: __, arg2: T2, plc3: __, arg4: T4):  LoDashExplicitWrapper<Function2<T1,     T3,     R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, plc3: __, arg4: T4):  LoDashExplicitWrapper<Function1<        T3,     R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: __, plc2: __, arg3: T3, arg4: T4):  LoDashExplicitWrapper<Function2<T1, T2,         R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: __, arg3: T3, arg4: T4):  LoDashExplicitWrapper<Function1<    T2,         R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, plc1: __, arg2: T2, arg3: T3, arg4: T4):  LoDashExplicitWrapper<Function1<T1,             R>>;
         <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, arg3: T3, arg4: T4):  LoDashExplicitWrapper<Function0<                R>>;
         // catch-all
         (...args: any[]): LoDashExplicitWrapper<(...args: any[]) => any>;
@@ -994,37 +1098,39 @@ declare module "../index" {
         <T1, R>(func: Function1<T1, R>, arg1: T1): Function0<R>;
         // arity 2
         <T1, T2, R>(func: Function2<T1, T2, R>):                      Function2<T1, T2, R>;
-        <T1, T2, R>(func: Function2<T1, T2, R>, arg1: T1, plc2: PH):  Function1<    T2, R>;
+        <T1, T2, R>(func: Function2<T1, T2, R>, arg1: T1, plc2: __):  Function1<    T2, R>;
         <T1, T2, R>(func: Function2<T1, T2, R>,           arg2: T2):  Function1<T1,     R>;
         <T1, T2, R>(func: Function2<T1, T2, R>, arg1: T1, arg2: T2):  Function0<        R>;
         // arity 3
         <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>):                                Function3<T1, T2, T3, R>;
-        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, arg1: T1, plc2: PH, plc3: PH):  Function2<    T2, T3, R>;
-        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>,           arg2: T2, plc3: PH):  Function2<T1,     T3, R>;
-        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, arg1: T1, arg2: T2, plc3: PH):  Function1<        T3, R>;
+        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, arg1: T1, plc2: __, plc3: __):  Function2<    T2, T3, R>;
+        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>,           arg2: T2, plc3: __):  Function2<T1,     T3, R>;
+        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, arg1: T1, arg2: T2, plc3: __):  Function1<        T3, R>;
         <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>,                     arg3: T3):  Function2<T1, T2,     R>;
-        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, arg1: T1, plc2: PH, arg3: T3):  Function1<    T2,     R>;
+        <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, arg1: T1, plc2: __, arg3: T3):  Function1<    T2,     R>;
         <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>,           arg2: T2, arg3: T3):  Function1<T1,         R>;
         <T1, T2, T3, R>(func: Function3<T1, T2, T3, R>, arg1: T1, arg2: T2, arg3: T3):  Function0<            R>;
         // arity 4
         <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>):                                          Function4<T1, T2, T3, T4, R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, plc2: PH, plc3: PH, plc4: PH):  Function3<    T2, T3, T4, R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>,           arg2: T2, plc3: PH, plc4: PH):  Function3<T1,     T3, T4, R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, arg2: T2, plc3: PH, plc4: PH):  Function2<        T3, T4, R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>,                     arg3: T3, plc4: PH):  Function3<T1, T2,     T4, R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, plc2: PH, arg3: T3, plc4: PH):  Function2<    T2,     T4, R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>,           arg2: T2, arg3: T3, plc4: PH):  Function2<T1,         T4, R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, arg2: T2, arg3: T3, plc4: PH):  Function1<            T4, R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, plc2: __, plc3: __, plc4: __):  Function3<    T2, T3, T4, R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>,           arg2: T2, plc3: __, plc4: __):  Function3<T1,     T3, T4, R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, arg2: T2, plc3: __, plc4: __):  Function2<        T3, T4, R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>,                     arg3: T3, plc4: __):  Function3<T1, T2,     T4, R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, plc2: __, arg3: T3, plc4: __):  Function2<    T2,     T4, R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>,           arg2: T2, arg3: T3, plc4: __):  Function2<T1,         T4, R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, arg2: T2, arg3: T3, plc4: __):  Function1<            T4, R>;
         <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>,                               arg4: T4):  Function3<T1, T2, T3,     R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, plc2: PH, plc3: PH, arg4: T4):  Function2<    T2, T3,     R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>,           arg2: T2, plc3: PH, arg4: T4):  Function2<T1,     T3,     R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, arg2: T2, plc3: PH, arg4: T4):  Function1<        T3,     R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, plc2: __, plc3: __, arg4: T4):  Function2<    T2, T3,     R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>,           arg2: T2, plc3: __, arg4: T4):  Function2<T1,     T3,     R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, arg2: T2, plc3: __, arg4: T4):  Function1<        T3,     R>;
         <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>,                     arg3: T3, arg4: T4):  Function2<T1, T2,         R>;
-        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, plc2: PH, arg3: T3, arg4: T4):  Function1<    T2,         R>;
+        <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, plc2: __, arg3: T3, arg4: T4):  Function1<    T2,         R>;
         <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>,           arg2: T2, arg3: T3, arg4: T4):  Function1<T1,             R>;
         <T1, T2, T3, T4, R>(func: Function4<T1, T2, T3, T4, R>, arg1: T1, arg2: T2, arg3: T3, arg4: T4):  Function0<                R>;
         // catch-all
         (func: (...args: any[]) => any, ...args: any[]): (...args: any[]) => any;
+
+        placeholder: __;
     }
 
     interface ImplicitPartialRight {
@@ -1035,33 +1141,33 @@ declare module "../index" {
         <T1, R>(this: LoDashImplicitWrapper<Function1<T1, R>>, arg1: T1): LoDashImplicitWrapper<Function0<R>>;
         // arity 2
         <T1, T2, R>(this: LoDashImplicitWrapper<Function2<T1, T2, R>>):                      LoDashImplicitWrapper<Function2<T1, T2, R>>;
-        <T1, T2, R>(this: LoDashImplicitWrapper<Function2<T1, T2, R>>, arg1: T1, plc2: PH):  LoDashImplicitWrapper<Function1<    T2, R>>;
+        <T1, T2, R>(this: LoDashImplicitWrapper<Function2<T1, T2, R>>, arg1: T1, plc2: __):  LoDashImplicitWrapper<Function1<    T2, R>>;
         <T1, T2, R>(this: LoDashImplicitWrapper<Function2<T1, T2, R>>,           arg2: T2):  LoDashImplicitWrapper<Function1<T1,     R>>;
         <T1, T2, R>(this: LoDashImplicitWrapper<Function2<T1, T2, R>>, arg1: T1, arg2: T2):  LoDashImplicitWrapper<Function0<        R>>;
         // arity 3
         <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>):                                LoDashImplicitWrapper<Function3<T1, T2, T3, R>>;
-        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, plc2: PH, plc3: PH):  LoDashImplicitWrapper<Function2<    T2, T3, R>>;
-        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>,           arg2: T2, plc3: PH):  LoDashImplicitWrapper<Function2<T1,     T3, R>>;
-        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, arg2: T2, plc3: PH):  LoDashImplicitWrapper<Function1<        T3, R>>;
+        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, plc2: __, plc3: __):  LoDashImplicitWrapper<Function2<    T2, T3, R>>;
+        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>,           arg2: T2, plc3: __):  LoDashImplicitWrapper<Function2<T1,     T3, R>>;
+        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, arg2: T2, plc3: __):  LoDashImplicitWrapper<Function1<        T3, R>>;
         <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>,                     arg3: T3):  LoDashImplicitWrapper<Function2<T1, T2,     R>>;
-        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, plc2: PH, arg3: T3):  LoDashImplicitWrapper<Function1<    T2,     R>>;
+        <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, plc2: __, arg3: T3):  LoDashImplicitWrapper<Function1<    T2,     R>>;
         <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>,           arg2: T2, arg3: T3):  LoDashImplicitWrapper<Function1<T1,         R>>;
         <T1, T2, T3, R>(this: LoDashImplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, arg2: T2, arg3: T3):  LoDashImplicitWrapper<Function0<            R>>;
         // arity 4
         <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>):                                          LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, plc3: PH, plc4: PH):  LoDashImplicitWrapper<Function3<    T2, T3, T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>,           arg2: T2, plc3: PH, plc4: PH):  LoDashImplicitWrapper<Function3<T1,     T3, T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, plc3: PH, plc4: PH):  LoDashImplicitWrapper<Function2<        T3, T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>,                     arg3: T3, plc4: PH):  LoDashImplicitWrapper<Function3<T1, T2,     T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, arg3: T3, plc4: PH):  LoDashImplicitWrapper<Function2<    T2,     T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>,           arg2: T2, arg3: T3, plc4: PH):  LoDashImplicitWrapper<Function2<T1,         T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, arg3: T3, plc4: PH):  LoDashImplicitWrapper<Function1<            T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: __, plc3: __, plc4: __):  LoDashImplicitWrapper<Function3<    T2, T3, T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>,           arg2: T2, plc3: __, plc4: __):  LoDashImplicitWrapper<Function3<T1,     T3, T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, plc3: __, plc4: __):  LoDashImplicitWrapper<Function2<        T3, T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>,                     arg3: T3, plc4: __):  LoDashImplicitWrapper<Function3<T1, T2,     T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: __, arg3: T3, plc4: __):  LoDashImplicitWrapper<Function2<    T2,     T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>,           arg2: T2, arg3: T3, plc4: __):  LoDashImplicitWrapper<Function2<T1,         T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, arg3: T3, plc4: __):  LoDashImplicitWrapper<Function1<            T4, R>>;
         <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>,                               arg4: T4):  LoDashImplicitWrapper<Function3<T1, T2, T3,     R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, plc3: PH, arg4: T4):  LoDashImplicitWrapper<Function2<    T2, T3,     R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>,           arg2: T2, plc3: PH, arg4: T4):  LoDashImplicitWrapper<Function2<T1,     T3,     R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, plc3: PH, arg4: T4):  LoDashImplicitWrapper<Function1<        T3,     R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: __, plc3: __, arg4: T4):  LoDashImplicitWrapper<Function2<    T2, T3,     R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>,           arg2: T2, plc3: __, arg4: T4):  LoDashImplicitWrapper<Function2<T1,     T3,     R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, plc3: __, arg4: T4):  LoDashImplicitWrapper<Function1<        T3,     R>>;
         <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>,                     arg3: T3, arg4: T4):  LoDashImplicitWrapper<Function2<T1, T2,         R>>;
-        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, arg3: T3, arg4: T4):  LoDashImplicitWrapper<Function1<    T2,         R>>;
+        <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: __, arg3: T3, arg4: T4):  LoDashImplicitWrapper<Function1<    T2,         R>>;
         <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>,           arg2: T2, arg3: T3, arg4: T4):  LoDashImplicitWrapper<Function1<T1,             R>>;
         <T1, T2, T3, T4, R>(this: LoDashImplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, arg3: T3, arg4: T4):  LoDashImplicitWrapper<Function0<                R>>;
         // catch-all
@@ -1076,33 +1182,33 @@ declare module "../index" {
         <T1, R>(this: LoDashExplicitWrapper<Function1<T1, R>>, arg1: T1): LoDashExplicitWrapper<Function0<R>>;
         // arity 2
         <T1, T2, R>(this: LoDashExplicitWrapper<Function2<T1, T2, R>>):                      LoDashExplicitWrapper<Function2<T1, T2, R>>;
-        <T1, T2, R>(this: LoDashExplicitWrapper<Function2<T1, T2, R>>, arg1: T1, plc2: PH):  LoDashExplicitWrapper<Function1<    T2, R>>;
+        <T1, T2, R>(this: LoDashExplicitWrapper<Function2<T1, T2, R>>, arg1: T1, plc2: __):  LoDashExplicitWrapper<Function1<    T2, R>>;
         <T1, T2, R>(this: LoDashExplicitWrapper<Function2<T1, T2, R>>,           arg2: T2):  LoDashExplicitWrapper<Function1<T1,     R>>;
         <T1, T2, R>(this: LoDashExplicitWrapper<Function2<T1, T2, R>>, arg1: T1, arg2: T2):  LoDashExplicitWrapper<Function0<        R>>;
         // arity 3
         <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>):                                LoDashExplicitWrapper<Function3<T1, T2, T3, R>>;
-        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, plc2: PH, plc3: PH):  LoDashExplicitWrapper<Function2<    T2, T3, R>>;
-        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>,           arg2: T2, plc3: PH):  LoDashExplicitWrapper<Function2<T1,     T3, R>>;
-        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, arg2: T2, plc3: PH):  LoDashExplicitWrapper<Function1<        T3, R>>;
+        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, plc2: __, plc3: __):  LoDashExplicitWrapper<Function2<    T2, T3, R>>;
+        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>,           arg2: T2, plc3: __):  LoDashExplicitWrapper<Function2<T1,     T3, R>>;
+        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, arg2: T2, plc3: __):  LoDashExplicitWrapper<Function1<        T3, R>>;
         <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>,                     arg3: T3):  LoDashExplicitWrapper<Function2<T1, T2,     R>>;
-        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, plc2: PH, arg3: T3):  LoDashExplicitWrapper<Function1<    T2,     R>>;
+        <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, plc2: __, arg3: T3):  LoDashExplicitWrapper<Function1<    T2,     R>>;
         <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>,           arg2: T2, arg3: T3):  LoDashExplicitWrapper<Function1<T1,         R>>;
         <T1, T2, T3, R>(this: LoDashExplicitWrapper<Function3<T1, T2, T3, R>>, arg1: T1, arg2: T2, arg3: T3):  LoDashExplicitWrapper<Function0<            R>>;
         // arity 4
         <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>):                                          LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, plc3: PH, plc4: PH):  LoDashExplicitWrapper<Function3<    T2, T3, T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>,           arg2: T2, plc3: PH, plc4: PH):  LoDashExplicitWrapper<Function3<T1,     T3, T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, plc3: PH, plc4: PH):  LoDashExplicitWrapper<Function2<        T3, T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>,                     arg3: T3, plc4: PH):  LoDashExplicitWrapper<Function3<T1, T2,     T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, arg3: T3, plc4: PH):  LoDashExplicitWrapper<Function2<    T2,     T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>,           arg2: T2, arg3: T3, plc4: PH):  LoDashExplicitWrapper<Function2<T1,         T4, R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, arg3: T3, plc4: PH):  LoDashExplicitWrapper<Function1<            T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: __, plc3: __, plc4: __):  LoDashExplicitWrapper<Function3<    T2, T3, T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>,           arg2: T2, plc3: __, plc4: __):  LoDashExplicitWrapper<Function3<T1,     T3, T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, plc3: __, plc4: __):  LoDashExplicitWrapper<Function2<        T3, T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>,                     arg3: T3, plc4: __):  LoDashExplicitWrapper<Function3<T1, T2,     T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: __, arg3: T3, plc4: __):  LoDashExplicitWrapper<Function2<    T2,     T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>,           arg2: T2, arg3: T3, plc4: __):  LoDashExplicitWrapper<Function2<T1,         T4, R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, arg3: T3, plc4: __):  LoDashExplicitWrapper<Function1<            T4, R>>;
         <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>,                               arg4: T4):  LoDashExplicitWrapper<Function3<T1, T2, T3,     R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, plc3: PH, arg4: T4):  LoDashExplicitWrapper<Function2<    T2, T3,     R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>,           arg2: T2, plc3: PH, arg4: T4):  LoDashExplicitWrapper<Function2<T1,     T3,     R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, plc3: PH, arg4: T4):  LoDashExplicitWrapper<Function1<        T3,     R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: __, plc3: __, arg4: T4):  LoDashExplicitWrapper<Function2<    T2, T3,     R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>,           arg2: T2, plc3: __, arg4: T4):  LoDashExplicitWrapper<Function2<T1,     T3,     R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, plc3: __, arg4: T4):  LoDashExplicitWrapper<Function1<        T3,     R>>;
         <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>,                     arg3: T3, arg4: T4):  LoDashExplicitWrapper<Function2<T1, T2,         R>>;
-        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: PH, arg3: T3, arg4: T4):  LoDashExplicitWrapper<Function1<    T2,         R>>;
+        <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, plc2: __, arg3: T3, arg4: T4):  LoDashExplicitWrapper<Function1<    T2,         R>>;
         <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>,           arg2: T2, arg3: T3, arg4: T4):  LoDashExplicitWrapper<Function1<T1,             R>>;
         <T1, T2, T3, T4, R>(this: LoDashExplicitWrapper<Function4<T1, T2, T3, T4, R>>, arg1: T1, arg2: T2, arg3: T3, arg4: T4):  LoDashExplicitWrapper<Function0<                R>>;
         // catch-all
diff --git a/types/lodash/common/object.d.ts b/types/lodash/common/object.d.ts
index 4bedba42ae..4845e7f31b 100644
--- a/types/lodash/common/object.d.ts
+++ b/types/lodash/common/object.d.ts
@@ -3217,7 +3217,7 @@ declare module "../index" {
          * @param object The object to modify.
          * @param path The path of the property to set.
          * @param value The value to set.
-         * @parem customizer The function to customize assigned values.
+         * @param customizer The function to customize assigned values.
          * @return Returns object.
          */
         setWith<T extends object>(
diff --git a/types/lodash/common/util.d.ts b/types/lodash/common/util.d.ts
index 69fbc42cc0..8aad451ca1 100644
--- a/types/lodash/common/util.d.ts
+++ b/types/lodash/common/util.d.ts
@@ -1207,14 +1207,14 @@ declare module "../index" {
          * @param context The context object.
          * @return Returns a new lodash function.
          */
-        runInContext(context?: object): typeof _;
+        runInContext(context?: object): LoDashStatic;
     }
 
     interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.runInContext
          */
-        runInContext(): typeof _;
+        runInContext(): LoDashStatic;
     }
 
     // stubArray
diff --git a/types/lodash/fp.d.ts b/types/lodash/fp.d.ts
index 783a56a98f..725ee237aa 100644
--- a/types/lodash/fp.d.ts
+++ b/types/lodash/fp.d.ts
@@ -2,789 +2,4512 @@
 // If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
 // npm run fp
 
-import add = require("./fp/add");
-import after = require("./fp/after");
-import all = require("./fp/all");
-import allPass = require("./fp/allPass");
-import always = require("./fp/always");
-import any = require("./fp/any");
-import anyPass = require("./fp/anyPass");
-import apply = require("./fp/apply");
-import ary = require("./fp/ary");
-import assign = require("./fp/assign");
-import assignAll = require("./fp/assignAll");
-import assignAllWith = require("./fp/assignAllWith");
-import assignIn = require("./fp/assignIn");
-import assignInAll = require("./fp/assignInAll");
-import assignInAllWith = require("./fp/assignInAllWith");
-import assignInWith = require("./fp/assignInWith");
-import assignWith = require("./fp/assignWith");
-import assoc = require("./fp/assoc");
-import assocPath = require("./fp/assocPath");
-import at = require("./fp/at");
-import attempt = require("./fp/attempt");
-import before = require("./fp/before");
-import bind = require("./fp/bind");
-import bindAll = require("./fp/bindAll");
-import bindKey = require("./fp/bindKey");
-import camelCase = require("./fp/camelCase");
-import capitalize = require("./fp/capitalize");
-import castArray = require("./fp/castArray");
-import ceil = require("./fp/ceil");
-import chunk = require("./fp/chunk");
-import clamp = require("./fp/clamp");
-import clone = require("./fp/clone");
-import cloneDeep = require("./fp/cloneDeep");
-import cloneDeepWith = require("./fp/cloneDeepWith");
-import cloneWith = require("./fp/cloneWith");
-import compact = require("./fp/compact");
-import complement = require("./fp/complement");
-import compose = require("./fp/compose");
-import concat = require("./fp/concat");
-import cond = require("./fp/cond");
-import conforms = require("./fp/conforms");
-import conformsTo = require("./fp/conformsTo");
-import constant = require("./fp/constant");
-import contains = require("./fp/contains");
-import countBy = require("./fp/countBy");
-import create = require("./fp/create");
-import curry = require("./fp/curry");
-import curryN = require("./fp/curryN");
-import curryRight = require("./fp/curryRight");
-import curryRightN = require("./fp/curryRightN");
-import debounce = require("./fp/debounce");
-import deburr = require("./fp/deburr");
-import defaults = require("./fp/defaults");
-import defaultsAll = require("./fp/defaultsAll");
-import defaultsDeep = require("./fp/defaultsDeep");
-import defaultsDeepAll = require("./fp/defaultsDeepAll");
-import defaultTo = require("./fp/defaultTo");
-import defer = require("./fp/defer");
-import delay = require("./fp/delay");
-import difference = require("./fp/difference");
-import differenceBy = require("./fp/differenceBy");
-import differenceWith = require("./fp/differenceWith");
-import dissoc = require("./fp/dissoc");
-import dissocPath = require("./fp/dissocPath");
-import divide = require("./fp/divide");
-import drop = require("./fp/drop");
-import dropLast = require("./fp/dropLast");
-import dropLastWhile = require("./fp/dropLastWhile");
-import dropRight = require("./fp/dropRight");
-import dropRightWhile = require("./fp/dropRightWhile");
-import dropWhile = require("./fp/dropWhile");
-import each = require("./fp/each");
-import eachRight = require("./fp/eachRight");
-import endsWith = require("./fp/endsWith");
-import entries = require("./fp/entries");
-import entriesIn = require("./fp/entriesIn");
-import eq = require("./fp/eq");
-import equals = require("./fp/equals");
-import escape = require("./fp/escape");
-import escapeRegExp = require("./fp/escapeRegExp");
-import every = require("./fp/every");
-import extend = require("./fp/extend");
-import extendAll = require("./fp/extendAll");
-import extendAllWith = require("./fp/extendAllWith");
-import extendWith = require("./fp/extendWith");
-import F = require("./fp/F");
-import fill = require("./fp/fill");
-import filter = require("./fp/filter");
-import find = require("./fp/find");
-import findFrom = require("./fp/findFrom");
-import findIndex = require("./fp/findIndex");
-import findIndexFrom = require("./fp/findIndexFrom");
-import findKey = require("./fp/findKey");
-import findLast = require("./fp/findLast");
-import findLastFrom = require("./fp/findLastFrom");
-import findLastIndex = require("./fp/findLastIndex");
-import findLastIndexFrom = require("./fp/findLastIndexFrom");
-import findLastKey = require("./fp/findLastKey");
-import first = require("./fp/first");
-import flatMap = require("./fp/flatMap");
-import flatMapDeep = require("./fp/flatMapDeep");
-import flatMapDepth = require("./fp/flatMapDepth");
-import flatten = require("./fp/flatten");
-import flattenDeep = require("./fp/flattenDeep");
-import flattenDepth = require("./fp/flattenDepth");
-import flip = require("./fp/flip");
-import floor = require("./fp/floor");
-import flow = require("./fp/flow");
-import flowRight = require("./fp/flowRight");
-import forEach = require("./fp/forEach");
-import forEachRight = require("./fp/forEachRight");
-import forIn = require("./fp/forIn");
-import forInRight = require("./fp/forInRight");
-import forOwn = require("./fp/forOwn");
-import forOwnRight = require("./fp/forOwnRight");
-import fromPairs = require("./fp/fromPairs");
-import functions = require("./fp/functions");
-import functionsIn = require("./fp/functionsIn");
-import get = require("./fp/get");
-import getOr = require("./fp/getOr");
-import groupBy = require("./fp/groupBy");
-import gt = require("./fp/gt");
-import gte = require("./fp/gte");
-import has = require("./fp/has");
-import hasIn = require("./fp/hasIn");
-import head = require("./fp/head");
-import identical = require("./fp/identical");
-import identity = require("./fp/identity");
-import includes = require("./fp/includes");
-import includesFrom = require("./fp/includesFrom");
-import indexBy = require("./fp/indexBy");
-import indexOf = require("./fp/indexOf");
-import indexOfFrom = require("./fp/indexOfFrom");
-import init = require("./fp/init");
-import initial = require("./fp/initial");
-import inRange = require("./fp/inRange");
-import intersection = require("./fp/intersection");
-import intersectionBy = require("./fp/intersectionBy");
-import intersectionWith = require("./fp/intersectionWith");
-import invert = require("./fp/invert");
-import invertBy = require("./fp/invertBy");
-import invertObj = require("./fp/invertObj");
-import invoke = require("./fp/invoke");
-import invokeArgs = require("./fp/invokeArgs");
-import invokeArgsMap = require("./fp/invokeArgsMap");
-import invokeMap = require("./fp/invokeMap");
-import isArguments = require("./fp/isArguments");
-import isArray = require("./fp/isArray");
-import isArrayBuffer = require("./fp/isArrayBuffer");
-import isArrayLike = require("./fp/isArrayLike");
-import isArrayLikeObject = require("./fp/isArrayLikeObject");
-import isBoolean = require("./fp/isBoolean");
-import isBuffer = require("./fp/isBuffer");
-import isDate = require("./fp/isDate");
-import isElement = require("./fp/isElement");
-import isEmpty = require("./fp/isEmpty");
-import isEqual = require("./fp/isEqual");
-import isEqualWith = require("./fp/isEqualWith");
-import isError = require("./fp/isError");
-import isFinite = require("./fp/isFinite");
-import isFunction = require("./fp/isFunction");
-import isInteger = require("./fp/isInteger");
-import isLength = require("./fp/isLength");
-import isMap = require("./fp/isMap");
-import isMatch = require("./fp/isMatch");
-import isMatchWith = require("./fp/isMatchWith");
-import isNaN = require("./fp/isNaN");
-import isNative = require("./fp/isNative");
-import isNil = require("./fp/isNil");
-import isNull = require("./fp/isNull");
-import isNumber = require("./fp/isNumber");
-import isObject = require("./fp/isObject");
-import isObjectLike = require("./fp/isObjectLike");
-import isPlainObject = require("./fp/isPlainObject");
-import isRegExp = require("./fp/isRegExp");
-import isSafeInteger = require("./fp/isSafeInteger");
-import isSet = require("./fp/isSet");
-import isString = require("./fp/isString");
-import isSymbol = require("./fp/isSymbol");
-import isTypedArray = require("./fp/isTypedArray");
-import isUndefined = require("./fp/isUndefined");
-import isWeakMap = require("./fp/isWeakMap");
-import isWeakSet = require("./fp/isWeakSet");
-import iteratee = require("./fp/iteratee");
-import join = require("./fp/join");
-import juxt = require("./fp/juxt");
-import kebabCase = require("./fp/kebabCase");
-import keyBy = require("./fp/keyBy");
-import keys = require("./fp/keys");
-import keysIn = require("./fp/keysIn");
-import last = require("./fp/last");
-import lastIndexOf = require("./fp/lastIndexOf");
-import lastIndexOfFrom = require("./fp/lastIndexOfFrom");
-import lowerCase = require("./fp/lowerCase");
-import lowerFirst = require("./fp/lowerFirst");
-import lt = require("./fp/lt");
-import lte = require("./fp/lte");
-import map = require("./fp/map");
-import mapKeys = require("./fp/mapKeys");
-import mapValues = require("./fp/mapValues");
-import matches = require("./fp/matches");
-import matchesProperty = require("./fp/matchesProperty");
-import max = require("./fp/max");
-import maxBy = require("./fp/maxBy");
-import mean = require("./fp/mean");
-import meanBy = require("./fp/meanBy");
-import memoize = require("./fp/memoize");
-import merge = require("./fp/merge");
-import mergeAll = require("./fp/mergeAll");
-import mergeAllWith = require("./fp/mergeAllWith");
-import mergeWith = require("./fp/mergeWith");
-import method = require("./fp/method");
-import methodOf = require("./fp/methodOf");
-import min = require("./fp/min");
-import minBy = require("./fp/minBy");
-import multiply = require("./fp/multiply");
-import nAry = require("./fp/nAry");
-import negate = require("./fp/negate");
-import noConflict = require("./fp/noConflict");
-import noop = require("./fp/noop");
-import now = require("./fp/now");
-import nth = require("./fp/nth");
-import nthArg = require("./fp/nthArg");
-import omit = require("./fp/omit");
-import omitAll = require("./fp/omitAll");
-import omitBy = require("./fp/omitBy");
-import once = require("./fp/once");
-import orderBy = require("./fp/orderBy");
-import over = require("./fp/over");
-import overArgs = require("./fp/overArgs");
-import overEvery = require("./fp/overEvery");
-import overSome = require("./fp/overSome");
-import pad = require("./fp/pad");
-import padChars = require("./fp/padChars");
-import padCharsEnd = require("./fp/padCharsEnd");
-import padCharsStart = require("./fp/padCharsStart");
-import padEnd = require("./fp/padEnd");
-import padStart = require("./fp/padStart");
-import parseInt = require("./fp/parseInt");
-import partial = require("./fp/partial");
-import partialRight = require("./fp/partialRight");
-import partition = require("./fp/partition");
-import path = require("./fp/path");
-import pathEq = require("./fp/pathEq");
-import pathOr = require("./fp/pathOr");
-import paths = require("./fp/paths");
-import pick = require("./fp/pick");
-import pickAll = require("./fp/pickAll");
-import pickBy = require("./fp/pickBy");
-import pipe = require("./fp/pipe");
-import pluck = require("./fp/pluck");
-import prop = require("./fp/prop");
-import propEq = require("./fp/propEq");
-import property = require("./fp/property");
-import propertyOf = require("./fp/propertyOf");
-import propOr = require("./fp/propOr");
-import props = require("./fp/props");
-import pull = require("./fp/pull");
-import pullAll = require("./fp/pullAll");
-import pullAllBy = require("./fp/pullAllBy");
-import pullAllWith = require("./fp/pullAllWith");
-import pullAt = require("./fp/pullAt");
-import random = require("./fp/random");
-import range = require("./fp/range");
-import rangeRight = require("./fp/rangeRight");
-import rangeStep = require("./fp/rangeStep");
-import rangeStepRight = require("./fp/rangeStepRight");
-import rearg = require("./fp/rearg");
-import reduce = require("./fp/reduce");
-import reduceRight = require("./fp/reduceRight");
-import reject = require("./fp/reject");
-import remove = require("./fp/remove");
-import repeat = require("./fp/repeat");
-import replace = require("./fp/replace");
-import rest = require("./fp/rest");
-import restFrom = require("./fp/restFrom");
-import result = require("./fp/result");
-import reverse = require("./fp/reverse");
-import round = require("./fp/round");
-import runInContext = require("./fp/runInContext");
-import sample = require("./fp/sample");
-import sampleSize = require("./fp/sampleSize");
-import set = require("./fp/set");
-import setWith = require("./fp/setWith");
-import shuffle = require("./fp/shuffle");
-import size = require("./fp/size");
-import slice = require("./fp/slice");
-import snakeCase = require("./fp/snakeCase");
-import some = require("./fp/some");
-import sortBy = require("./fp/sortBy");
-import sortedIndex = require("./fp/sortedIndex");
-import sortedIndexBy = require("./fp/sortedIndexBy");
-import sortedIndexOf = require("./fp/sortedIndexOf");
-import sortedLastIndex = require("./fp/sortedLastIndex");
-import sortedLastIndexBy = require("./fp/sortedLastIndexBy");
-import sortedLastIndexOf = require("./fp/sortedLastIndexOf");
-import sortedUniq = require("./fp/sortedUniq");
-import sortedUniqBy = require("./fp/sortedUniqBy");
-import split = require("./fp/split");
-import spread = require("./fp/spread");
-import spreadFrom = require("./fp/spreadFrom");
-import startCase = require("./fp/startCase");
-import startsWith = require("./fp/startsWith");
-import stubArray = require("./fp/stubArray");
-import stubFalse = require("./fp/stubFalse");
-import stubObject = require("./fp/stubObject");
-import stubString = require("./fp/stubString");
-import stubTrue = require("./fp/stubTrue");
-import subtract = require("./fp/subtract");
-import sum = require("./fp/sum");
-import sumBy = require("./fp/sumBy");
-import symmetricDifference = require("./fp/symmetricDifference");
-import symmetricDifferenceBy = require("./fp/symmetricDifferenceBy");
-import symmetricDifferenceWith = require("./fp/symmetricDifferenceWith");
-import T = require("./fp/T");
-import tail = require("./fp/tail");
-import take = require("./fp/take");
-import takeLast = require("./fp/takeLast");
-import takeLastWhile = require("./fp/takeLastWhile");
-import takeRight = require("./fp/takeRight");
-import takeRightWhile = require("./fp/takeRightWhile");
-import takeWhile = require("./fp/takeWhile");
-import tap = require("./fp/tap");
-import template = require("./fp/template");
-import throttle = require("./fp/throttle");
-import thru = require("./fp/thru");
-import times = require("./fp/times");
-import toArray = require("./fp/toArray");
-import toFinite = require("./fp/toFinite");
-import toInteger = require("./fp/toInteger");
-import toLength = require("./fp/toLength");
-import toLower = require("./fp/toLower");
-import toNumber = require("./fp/toNumber");
-import toPairs = require("./fp/toPairs");
-import toPairsIn = require("./fp/toPairsIn");
-import toPath = require("./fp/toPath");
-import toPlainObject = require("./fp/toPlainObject");
-import toSafeInteger = require("./fp/toSafeInteger");
-import toString = require("./fp/toString");
-import toUpper = require("./fp/toUpper");
-import transform = require("./fp/transform");
-import trim = require("./fp/trim");
-import trimChars = require("./fp/trimChars");
-import trimCharsEnd = require("./fp/trimCharsEnd");
-import trimCharsStart = require("./fp/trimCharsStart");
-import trimEnd = require("./fp/trimEnd");
-import trimStart = require("./fp/trimStart");
-import truncate = require("./fp/truncate");
-import unapply = require("./fp/unapply");
-import unary = require("./fp/unary");
-import unescape = require("./fp/unescape");
-import union = require("./fp/union");
-import unionBy = require("./fp/unionBy");
-import unionWith = require("./fp/unionWith");
-import uniq = require("./fp/uniq");
-import uniqBy = require("./fp/uniqBy");
-import uniqueId = require("./fp/uniqueId");
-import uniqWith = require("./fp/uniqWith");
-import unnest = require("./fp/unnest");
-import unset = require("./fp/unset");
-import unzip = require("./fp/unzip");
-import unzipWith = require("./fp/unzipWith");
-import update = require("./fp/update");
-import updateWith = require("./fp/updateWith");
-import upperCase = require("./fp/upperCase");
-import upperFirst = require("./fp/upperFirst");
-import useWith = require("./fp/useWith");
-import values = require("./fp/values");
-import valuesIn = require("./fp/valuesIn");
-import where = require("./fp/where");
-import whereEq = require("./fp/whereEq");
-import without = require("./fp/without");
-import words = require("./fp/words");
-import wrap = require("./fp/wrap");
-import xor = require("./fp/xor");
-import xorBy = require("./fp/xorBy");
-import xorWith = require("./fp/xorWith");
-import zip = require("./fp/zip");
-import zipAll = require("./fp/zipAll");
-import zipObj = require("./fp/zipObj");
-import zipObject = require("./fp/zipObject");
-import zipObjectDeep = require("./fp/zipObjectDeep");
-import zipWith = require("./fp/zipWith");
+import lodash = require("./index");
 
 export = _;
 
 declare const _: _.LoDashFp;
 declare namespace _ {
+    interface LodashAdd {
+        (augend: number): LodashAdd1x1;
+        (augend: lodash.__, addend: number): LodashAdd1x2;
+        (augend: number, addend: number): number;
+    }
+    type LodashAdd1x1 = (addend: number) => number;
+    type LodashAdd1x2 = (augend: number) => number;
+    interface LodashAfter {
+        <TFunc extends (...args: any[]) => any>(func: TFunc): LodashAfter1x1<TFunc>;
+        (func: lodash.__, n: number): LodashAfter1x2;
+        <TFunc extends (...args: any[]) => any>(func: TFunc, n: number): TFunc;
+    }
+    type LodashAfter1x1<TFunc> = (n: number) => TFunc;
+    type LodashAfter1x2 = <TFunc extends (...args: any[]) => any>(func: TFunc) => TFunc;
+    interface LodashEvery {
+        <T>(predicate: lodash.ValueIterateeCustom<T, boolean>): LodashEvery1x1<T>;
+        <T>(predicate: lodash.__, collection: lodash.List<T> | null | undefined): LodashEvery1x2<T>;
+        <T>(predicate: lodash.ValueIterateeCustom<T, boolean>, collection: lodash.List<T> | null | undefined): boolean;
+        <T extends object>(predicate: lodash.__, collection: T | null | undefined): LodashEvery2x2<T>;
+        <T extends object>(predicate: lodash.ValueIterateeCustom<T[keyof T], boolean>, collection: T | null | undefined): boolean;
+    }
+    type LodashEvery1x1<T> = (collection: lodash.List<T> | object | null | undefined) => boolean;
+    type LodashEvery1x2<T> = (predicate: lodash.ValueIterateeCustom<T, boolean>) => boolean;
+    type LodashEvery2x2<T> = (predicate: lodash.ValueIterateeCustom<T[keyof T], boolean>) => boolean;
+    type LodashOverEvery = <T>(predicates: lodash.Many<(...args: T[]) => boolean>) => (...args: T[]) => boolean;
+    type LodashConstant = <T>(value: T) => () => T;
+    interface LodashSome {
+        <T>(predicate: lodash.ValueIterateeCustom<T, boolean>): LodashSome1x1<T>;
+        <T>(predicate: lodash.__, collection: lodash.List<T> | null | undefined): LodashSome1x2<T>;
+        <T>(predicate: lodash.ValueIterateeCustom<T, boolean>, collection: lodash.List<T> | null | undefined): boolean;
+        <T extends object>(predicate: lodash.__, collection: T | null | undefined): LodashSome2x2<T>;
+        <T extends object>(predicate: lodash.ValueIterateeCustom<T[keyof T], boolean>, collection: T | null | undefined): boolean;
+    }
+    type LodashSome1x1<T> = (collection: lodash.List<T> | object | null | undefined) => boolean;
+    type LodashSome1x2<T> = (predicate: lodash.ValueIterateeCustom<T, boolean>) => boolean;
+    type LodashSome2x2<T> = (predicate: lodash.ValueIterateeCustom<T[keyof T], boolean>) => boolean;
+    type LodashOverSome = <T>(predicates: lodash.Many<(...args: T[]) => boolean>) => (...args: T[]) => boolean;
+    type LodashApply = <TResult>(func: (...args: any[]) => TResult) => (...args: any[]) => TResult;
+    interface LodashAry {
+        (n: number): LodashAry1x1;
+        (n: lodash.__, func: (...args: any[]) => any): LodashAry1x2;
+        (n: number, func: (...args: any[]) => any): (...args: any[]) => any;
+    }
+    type LodashAry1x1 = (func: (...args: any[]) => any) => (...args: any[]) => any;
+    type LodashAry1x2 = (n: number) => (...args: any[]) => any;
+    interface LodashAssign {
+        <TObject>(object: TObject): LodashAssign1x1<TObject>;
+        <TSource>(object: lodash.__, source: TSource): LodashAssign1x2<TSource>;
+        <TObject, TSource>(object: TObject, source: TSource): TObject & TSource;
+    }
+    type LodashAssign1x1<TObject> = <TSource>(source: TSource) => TObject & TSource;
+    type LodashAssign1x2<TSource> = <TObject>(object: TObject) => TObject & TSource;
+    type LodashAssignAll = (object: ReadonlyArray<any>) => any;
+    interface LodashAssignAllWith {
+        (customizer: lodash.AssignCustomizer): LodashAssignAllWith1x1;
+        (customizer: lodash.__, args: ReadonlyArray<any>): LodashAssignAllWith1x2;
+        (customizer: lodash.AssignCustomizer, args: ReadonlyArray<any>): any;
+    }
+    type LodashAssignAllWith1x1 = (args: ReadonlyArray<any>) => any;
+    type LodashAssignAllWith1x2 = (customizer: lodash.AssignCustomizer) => any;
+    interface LodashAssignIn {
+        <TObject>(object: TObject): LodashAssignIn1x1<TObject>;
+        <TSource>(object: lodash.__, source: TSource): LodashAssignIn1x2<TSource>;
+        <TObject, TSource>(object: TObject, source: TSource): TObject & TSource;
+    }
+    type LodashAssignIn1x1<TObject> = <TSource>(source: TSource) => TObject & TSource;
+    type LodashAssignIn1x2<TSource> = <TObject>(object: TObject) => TObject & TSource;
+    type LodashAssignInAll = <TResult>(object: ReadonlyArray<any>) => TResult;
+    interface LodashAssignInAllWith {
+        (customizer: lodash.AssignCustomizer): LodashAssignInAllWith1x1;
+        (customizer: lodash.__, args: ReadonlyArray<any>): LodashAssignInAllWith1x2;
+        (customizer: lodash.AssignCustomizer, args: ReadonlyArray<any>): any;
+    }
+    type LodashAssignInAllWith1x1 = (args: ReadonlyArray<any>) => any;
+    type LodashAssignInAllWith1x2 = (customizer: lodash.AssignCustomizer) => any;
+    interface LodashAssignInWith {
+        (customizer: lodash.AssignCustomizer): LodashAssignInWith1x1;
+        <TObject>(customizer: lodash.__, object: TObject): LodashAssignInWith1x2<TObject>;
+        <TObject>(customizer: lodash.AssignCustomizer, object: TObject): LodashAssignInWith1x3<TObject>;
+        <TSource>(customizer: lodash.__, object: lodash.__, source: TSource): LodashAssignInWith1x4<TSource>;
+        <TSource>(customizer: lodash.AssignCustomizer, object: lodash.__, source: TSource): LodashAssignInWith1x5<TSource>;
+        <TObject, TSource>(customizer: lodash.__, object: TObject, source: TSource): LodashAssignInWith1x6<TObject, TSource>;
+        <TObject, TSource>(customizer: lodash.AssignCustomizer, object: TObject, source: TSource): TObject & TSource;
+    }
+    interface LodashAssignInWith1x1 {
+        <TObject>(object: TObject): LodashAssignInWith1x3<TObject>;
+        <TSource>(object: lodash.__, source: TSource): LodashAssignInWith1x5<TSource>;
+        <TObject, TSource>(object: TObject, source: TSource): TObject & TSource;
+    }
+    interface LodashAssignInWith1x2<TObject> {
+        (customizer: lodash.AssignCustomizer): LodashAssignInWith1x3<TObject>;
+        <TSource>(customizer: lodash.__, source: TSource): LodashAssignInWith1x6<TObject, TSource>;
+        <TSource>(customizer: lodash.AssignCustomizer, source: TSource): TObject & TSource;
+    }
+    type LodashAssignInWith1x3<TObject> = <TSource>(source: TSource) => TObject & TSource;
+    interface LodashAssignInWith1x4<TSource> {
+        (customizer: lodash.AssignCustomizer): LodashAssignInWith1x5<TSource>;
+        <TObject>(customizer: lodash.__, object: TObject): LodashAssignInWith1x6<TObject, TSource>;
+        <TObject>(customizer: lodash.AssignCustomizer, object: TObject): TObject & TSource;
+    }
+    type LodashAssignInWith1x5<TSource> = <TObject>(object: TObject) => TObject & TSource;
+    type LodashAssignInWith1x6<TObject, TSource> = (customizer: lodash.AssignCustomizer) => TObject & TSource;
+    interface LodashAssignWith {
+        (customizer: lodash.AssignCustomizer): LodashAssignWith1x1;
+        <TObject>(customizer: lodash.__, object: TObject): LodashAssignWith1x2<TObject>;
+        <TObject>(customizer: lodash.AssignCustomizer, object: TObject): LodashAssignWith1x3<TObject>;
+        <TSource>(customizer: lodash.__, object: lodash.__, source: TSource): LodashAssignWith1x4<TSource>;
+        <TSource>(customizer: lodash.AssignCustomizer, object: lodash.__, source: TSource): LodashAssignWith1x5<TSource>;
+        <TObject, TSource>(customizer: lodash.__, object: TObject, source: TSource): LodashAssignWith1x6<TObject, TSource>;
+        <TObject, TSource>(customizer: lodash.AssignCustomizer, object: TObject, source: TSource): TObject & TSource;
+    }
+    interface LodashAssignWith1x1 {
+        <TObject>(object: TObject): LodashAssignWith1x3<TObject>;
+        <TSource>(object: lodash.__, source: TSource): LodashAssignWith1x5<TSource>;
+        <TObject, TSource>(object: TObject, source: TSource): TObject & TSource;
+    }
+    interface LodashAssignWith1x2<TObject> {
+        (customizer: lodash.AssignCustomizer): LodashAssignWith1x3<TObject>;
+        <TSource>(customizer: lodash.__, source: TSource): LodashAssignWith1x6<TObject, TSource>;
+        <TSource>(customizer: lodash.AssignCustomizer, source: TSource): TObject & TSource;
+    }
+    type LodashAssignWith1x3<TObject> = <TSource>(source: TSource) => TObject & TSource;
+    interface LodashAssignWith1x4<TSource> {
+        (customizer: lodash.AssignCustomizer): LodashAssignWith1x5<TSource>;
+        <TObject>(customizer: lodash.__, object: TObject): LodashAssignWith1x6<TObject, TSource>;
+        <TObject>(customizer: lodash.AssignCustomizer, object: TObject): TObject & TSource;
+    }
+    type LodashAssignWith1x5<TSource> = <TObject>(object: TObject) => TObject & TSource;
+    type LodashAssignWith1x6<TObject, TSource> = (customizer: lodash.AssignCustomizer) => TObject & TSource;
+    interface LodashSet {
+        (path: lodash.PropertyPath): LodashSet1x1;
+        (path: lodash.__, value: any): LodashSet1x2;
+        (path: lodash.PropertyPath, value: any): LodashSet1x3;
+        <T extends object>(path: lodash.__, value: lodash.__, object: T): LodashSet1x4<T>;
+        <T extends object>(path: lodash.PropertyPath, value: lodash.__, object: T): LodashSet1x5<T>;
+        <T extends object>(path: lodash.__, value: any, object: T): LodashSet1x6<T>;
+        <T extends object>(path: lodash.PropertyPath, value: any, object: T): T;
+        (path: lodash.__, value: lodash.__, object: object): LodashSet2x4;
+        (path: lodash.PropertyPath, value: lodash.__, object: object): LodashSet2x5;
+        (path: lodash.__, value: any, object: object): LodashSet2x6;
+        <TResult>(path: lodash.PropertyPath, value: any, object: object): TResult;
+    }
+    interface LodashSet1x1 {
+        (value: any): LodashSet1x3;
+        <T extends object>(value: lodash.__, object: T): LodashSet1x5<T>;
+        <T extends object>(value: any, object: T): T;
+        (value: lodash.__, object: object): LodashSet2x5;
+        <TResult>(value: any, object: object): TResult;
+    }
+    interface LodashSet1x2 {
+        (path: lodash.PropertyPath): LodashSet1x3;
+        <T extends object>(path: lodash.__, object: T): LodashSet1x6<T>;
+        <T extends object>(path: lodash.PropertyPath, object: T): T;
+        (path: lodash.__, object: object): LodashSet2x6;
+        <TResult>(path: lodash.PropertyPath, object: object): TResult;
+    }
+    interface LodashSet1x3 {
+        <T extends object>(object: T): T;
+        <TResult>(object: object): TResult;
+    }
+    interface LodashSet1x4<T> {
+        (path: lodash.PropertyPath): LodashSet1x5<T>;
+        (path: lodash.__, value: any): LodashSet1x6<T>;
+        (path: lodash.PropertyPath, value: any): T;
+    }
+    type LodashSet1x5<T> = (value: any) => T;
+    type LodashSet1x6<T> = (path: lodash.PropertyPath) => T;
+    interface LodashSet2x4 {
+        (path: lodash.PropertyPath): LodashSet2x5;
+        (path: lodash.__, value: any): LodashSet2x6;
+        <TResult>(path: lodash.PropertyPath, value: any): TResult;
+    }
+    type LodashSet2x5 = <TResult>(value: any) => TResult;
+    type LodashSet2x6 = <TResult>(path: lodash.PropertyPath) => TResult;
+    interface LodashAt {
+        (props: lodash.PropertyPath): LodashAt1x1;
+        <T>(props: lodash.__, object: lodash.List<T> | lodash.Dictionary<T> | lodash.NumericDictionary<T> | null | undefined): LodashAt1x2<T>;
+        <T>(props: lodash.PropertyPath, object: lodash.List<T> | lodash.Dictionary<T> | lodash.NumericDictionary<T> | null | undefined): T[];
+        <T extends object>(props: lodash.Many<keyof T>): LodashAt2x1<T>;
+        <T extends object>(props: lodash.__, object: T | null | undefined): LodashAt2x2<T>;
+        <T extends object>(props: lodash.Many<keyof T>, object: T | null | undefined): Array<T[keyof T]>;
+    }
+    type LodashAt1x1 = <T>(object: lodash.List<T> | lodash.Dictionary<T> | lodash.NumericDictionary<T> | null | undefined) => T[];
+    type LodashAt1x2<T> = (props: lodash.PropertyPath) => T[];
+    type LodashAt2x1<T> = (object: T | null | undefined) => Array<T[keyof T]>;
+    type LodashAt2x2<T> = (props: lodash.Many<keyof T>) => Array<T[keyof T]>;
+    type LodashAttempt = <TResult>(func: (...args: any[]) => TResult) => TResult|Error;
+    interface LodashBefore {
+        <TFunc extends (...args: any[]) => any>(func: TFunc): LodashBefore1x1<TFunc>;
+        (func: lodash.__, n: number): LodashBefore1x2;
+        <TFunc extends (...args: any[]) => any>(func: TFunc, n: number): TFunc;
+    }
+    type LodashBefore1x1<TFunc> = (n: number) => TFunc;
+    type LodashBefore1x2 = <TFunc extends (...args: any[]) => any>(func: TFunc) => TFunc;
+    interface LodashBind {
+        (func: (...args: any[]) => any): LodashBind1x1;
+        (func: lodash.__, thisArg: any): LodashBind1x2;
+        (func: (...args: any[]) => any, thisArg: any): (...args: any[]) => any;
+        placeholder: lodash.__;
+    }
+    type LodashBind1x1 = (thisArg: any) => (...args: any[]) => any;
+    type LodashBind1x2 = (func: (...args: any[]) => any) => (...args: any[]) => any;
+    interface LodashBindAll {
+        (methodNames: lodash.Many<string>): LodashBindAll1x1;
+        <T>(methodNames: lodash.__, object: T): LodashBindAll1x2<T>;
+        <T>(methodNames: lodash.Many<string>, object: T): T;
+    }
+    type LodashBindAll1x1 = <T>(object: T) => T;
+    type LodashBindAll1x2<T> = (methodNames: lodash.Many<string>) => T;
+    interface LodashBindKey {
+        (object: object): LodashBindKey1x1;
+        (object: lodash.__, key: string): LodashBindKey1x2;
+        (object: object, key: string): (...args: any[]) => any;
+        placeholder: lodash.__;
+    }
+    type LodashBindKey1x1 = (key: string) => (...args: any[]) => any;
+    type LodashBindKey1x2 = (object: object) => (...args: any[]) => any;
+    type LodashCamelCase = (string: string) => string;
+    type LodashCapitalize = (string: string) => string;
+    type LodashCastArray = <T>(value: lodash.Many<T>) => T[];
+    type LodashCeil = (n: number) => number;
+    interface LodashChunk {
+        (size: number): LodashChunk1x1;
+        <T>(size: lodash.__, array: lodash.List<T> | null | undefined): LodashChunk1x2<T>;
+        <T>(size: number, array: lodash.List<T> | null | undefined): T[][];
+    }
+    type LodashChunk1x1 = <T>(array: lodash.List<T> | null | undefined) => T[][];
+    type LodashChunk1x2<T> = (size: number) => T[][];
+    interface LodashClamp {
+        (lower: number): LodashClamp1x1;
+        (lower: lodash.__, upper: number): LodashClamp1x2;
+        (lower: number, upper: number): LodashClamp1x3;
+        (lower: lodash.__, upper: lodash.__, number: number): LodashClamp1x4;
+        (lower: number, upper: lodash.__, number: number): LodashClamp1x5;
+        (lower: lodash.__, upper: number, number: number): LodashClamp1x6;
+        (lower: number, upper: number, number: number): number;
+    }
+    interface LodashClamp1x1 {
+        (upper: number): LodashClamp1x3;
+        (upper: lodash.__, number: number): LodashClamp1x5;
+        (upper: number, number: number): number;
+    }
+    interface LodashClamp1x2 {
+        (lower: number): LodashClamp1x3;
+        (lower: lodash.__, number: number): LodashClamp1x6;
+        (lower: number, number: number): number;
+    }
+    type LodashClamp1x3 = (number: number) => number;
+    interface LodashClamp1x4 {
+        (lower: number): LodashClamp1x5;
+        (lower: lodash.__, upper: number): LodashClamp1x6;
+        (lower: number, upper: number): number;
+    }
+    type LodashClamp1x5 = (upper: number) => number;
+    type LodashClamp1x6 = (lower: number) => number;
+    type LodashClone = <T>(value: T) => T;
+    type LodashCloneDeep = <T>(value: T) => T;
+    interface LodashCloneDeepWith {
+        <T>(customizer: lodash.CloneDeepWithCustomizer<T>): LodashCloneDeepWith1x1<T>;
+        <T>(customizer: lodash.__, value: T): LodashCloneDeepWith1x2<T>;
+        <T>(customizer: lodash.CloneDeepWithCustomizer<T>, value: T): any;
+    }
+    type LodashCloneDeepWith1x1<T> = (value: T) => any;
+    type LodashCloneDeepWith1x2<T> = (customizer: lodash.CloneDeepWithCustomizer<T>) => any;
+    interface LodashCloneWith {
+        <T, TResult extends object | string | number | boolean | null>(customizer: lodash.CloneWithCustomizer<T, TResult>): LodashCloneWith1x1<T, TResult>;
+        <T>(customizer: lodash.__, value: T): LodashCloneWith1x2<T>;
+        <T, TResult extends object | string | number | boolean | null>(customizer: lodash.CloneWithCustomizer<T, TResult>, value: T): TResult;
+        <T, TResult>(customizer: lodash.CloneWithCustomizer<T, TResult | undefined>): LodashCloneWith2x1<T, TResult>;
+        <T, TResult>(customizer: lodash.CloneWithCustomizer<T, TResult | undefined>, value: T): TResult | T;
+    }
+    type LodashCloneWith1x1<T, TResult> = (value: T) => TResult;
+    interface LodashCloneWith1x2<T> {
+        <TResult extends object | string | number | boolean | null>(customizer: lodash.CloneWithCustomizer<T, TResult>): TResult;
+        <TResult>(customizer: lodash.CloneWithCustomizer<T, TResult | undefined>): TResult | T;
+    }
+    type LodashCloneWith2x1<T, TResult> = (value: T) => TResult | T;
+    type LodashCompact = <T>(array: lodash.List<T | null | undefined | false | "" | 0> | null | undefined) => T[];
+    type LodashNegate = <T extends (...args: any[]) => any>(predicate: T) => T;
+    interface LodashFlowRight {
+        <R2, R1>(f2: (a: R1) => R2, f1: () => R1): () => R2;
+        <R3, R2, R1>(f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): () => R3;
+        <R4, R3, R2, R1>(f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): () => R4;
+        <R5, R4, R3, R2, R1>(f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): () => R5;
+        <R6, R5, R4, R3, R2, R1>(f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): () => R6;
+        <R7, R6, R5, R4, R3, R2, R1>(f7: (a: R6) => R7, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): () => R7;
+        <A1, R2, R1>(f2: (a: R1) => R2, f1: (a1: A1) => R1): (a1: A1) => R2;
+        <A1, R3, R2, R1>(f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): (a1: A1) => R3;
+        <A1, R4, R3, R2, R1>(f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): (a1: A1) => R4;
+        <A1, R5, R4, R3, R2, R1>(f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): (a1: A1) => R5;
+        <A1, R6, R5, R4, R3, R2, R1>(f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): (a1: A1) => R6;
+        <A1, R7, R6, R5, R4, R3, R2, R1>(f7: (a: R6) => R7, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): (a1: A1) => R7;
+        <A1, A2, R2, R1>(f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): (a1: A1, a2: A2) => R2;
+        <A1, A2, R3, R2, R1>(f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): (a1: A1, a2: A2) => R3;
+        <A1, A2, R4, R3, R2, R1>(f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): (a1: A1, a2: A2) => R4;
+        <A1, A2, R5, R4, R3, R2, R1>(f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): (a1: A1, a2: A2) => R5;
+        <A1, A2, R6, R5, R4, R3, R2, R1>(f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): (a1: A1, a2: A2) => R6;
+        <A1, A2, R7, R6, R5, R4, R3, R2, R1>(f7: (a: R6) => R7, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): (a1: A1, a2: A2) => R7;
+        <A1, A2, A3, R2, R1>(f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): (a1: A1, a2: A2, a3: A3) => R2;
+        <A1, A2, A3, R3, R2, R1>(f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): (a1: A1, a2: A2, a3: A3) => R3;
+        <A1, A2, A3, R4, R3, R2, R1>(f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): (a1: A1, a2: A2, a3: A3) => R4;
+        <A1, A2, A3, R5, R4, R3, R2, R1>(f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): (a1: A1, a2: A2, a3: A3) => R5;
+        <A1, A2, A3, R6, R5, R4, R3, R2, R1>(f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): (a1: A1, a2: A2, a3: A3) => R6;
+        <A1, A2, A3, R7, R6, R5, R4, R3, R2, R1>(f7: (a: R6) => R7, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): (a1: A1, a2: A2, a3: A3) => R7;
+        <A1, A2, A3, A4, R2, R1>(f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): (a1: A1, a2: A2, a3: A3, a4: A4) => R2;
+        <A1, A2, A3, A4, R3, R2, R1>(f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): (a1: A1, a2: A2, a3: A3, a4: A4) => R3;
+        <A1, A2, A3, A4, R4, R3, R2, R1>(f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): (a1: A1, a2: A2, a3: A3, a4: A4) => R4;
+        <A1, A2, A3, A4, R5, R4, R3, R2, R1>(f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): (a1: A1, a2: A2, a3: A3, a4: A4) => R5;
+        <A1, A2, A3, A4, R6, R5, R4, R3, R2, R1>(f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): (a1: A1, a2: A2, a3: A3, a4: A4) => R6;
+        <A1, A2, A3, A4, R7, R6, R5, R4, R3, R2, R1>(f7: (a: R6) => R7, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): (a1: A1, a2: A2, a3: A3, a4: A4) => R7;
+        <R2, R1>(f2: (a: R1) => R2, f1: (...args: any[]) => R1): (...args: any[]) => R2;
+        <R3, R2, R1>(f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): (...args: any[]) => R3;
+        <R4, R3, R2, R1>(f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): (...args: any[]) => R4;
+        <R5, R4, R3, R2, R1>(f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): (...args: any[]) => R5;
+        <R6, R5, R4, R3, R2, R1>(f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): (...args: any[]) => R6;
+        <R7, R6, R5, R4, R3, R2, R1>(f7: (a: R6) => R7, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): (...args: any[]) => R7;
+        (f7: (a: any) => any, f6: (a: any) => any, f5: (a: any) => any, f4: (a: any) => any, f3: (a: any) => any, f2: (a: any) => any, f1: () => any, ...funcs: Array<lodash.Many<(...args: any[]) => any>>): (...args: any[]) => any;
+        (funcs: Array<lodash.Many<(...args: any[]) => any>>): (...args: any[]) => any;
+    }
+    interface LodashConcat {
+        <T>(array: lodash.Many<T>): LodashConcat1x1<T>;
+        <T>(array: lodash.__, values: lodash.Many<T>): LodashConcat1x2<T>;
+        <T>(array: lodash.Many<T>, values: lodash.Many<T>): T[];
+    }
+    type LodashConcat1x1<T> = (values: lodash.Many<T>) => T[];
+    type LodashConcat1x2<T> = (array: lodash.Many<T>) => T[];
+    type LodashCond = <T, R>(pairs: Array<lodash.CondPair<T, R>>) => (Target: T) => R;
+    interface LodashConformsTo {
+        <T>(source: lodash.ConformsPredicateObject<T>): LodashConformsTo1x1<T>;
+        <T>(source: lodash.__, object: T): LodashConformsTo1x2<T>;
+        <T>(source: lodash.ConformsPredicateObject<T>, object: T): boolean;
+    }
+    type LodashConformsTo1x1<T> = (object: T) => boolean;
+    type LodashConformsTo1x2<T> = (source: lodash.ConformsPredicateObject<T>) => boolean;
+    interface LodashContains {
+        <T>(target: T): LodashContains1x1<T>;
+        <T>(target: lodash.__, collection: lodash.List<T> | lodash.Dictionary<T> | lodash.NumericDictionary<T> | null | undefined): LodashContains1x2<T>;
+        <T>(target: T, collection: lodash.List<T> | lodash.Dictionary<T> | lodash.NumericDictionary<T> | null | undefined): boolean;
+    }
+    type LodashContains1x1<T> = (collection: lodash.List<T> | lodash.Dictionary<T> | lodash.NumericDictionary<T> | null | undefined) => boolean;
+    type LodashContains1x2<T> = (target: T) => boolean;
+    interface LodashCountBy {
+        <T>(iteratee: (value: string) => T): LodashCountBy1x1;
+        (iteratee: lodash.__, collection: string | null | undefined): LodashCountBy1x2;
+        <T>(iteratee: (value: string) => T, collection: string | null | undefined): lodash.Dictionary<number>;
+        <T>(iteratee: lodash.ValueIteratee<T>): LodashCountBy2x1<T>;
+        <T>(iteratee: lodash.__, collection: lodash.List<T> | null | undefined): LodashCountBy2x2<T>;
+        <T>(iteratee: lodash.ValueIteratee<T>, collection: lodash.List<T> | null | undefined): lodash.Dictionary<number>;
+        <T extends object>(iteratee: lodash.__, collection: T | null | undefined): LodashCountBy3x2<T>;
+        <T extends object>(iteratee: lodash.ValueIteratee<T[keyof T]>, collection: T | null | undefined): lodash.Dictionary<number>;
+    }
+    type LodashCountBy1x1 = (collection: string | null | undefined) => lodash.Dictionary<number>;
+    type LodashCountBy1x2 = <T>(iteratee: (value: string) => T) => lodash.Dictionary<number>;
+    type LodashCountBy2x1<T> = (collection: lodash.List<T> | object | null | undefined) => lodash.Dictionary<number>;
+    type LodashCountBy2x2<T> = (iteratee: lodash.ValueIteratee<T>) => lodash.Dictionary<number>;
+    type LodashCountBy3x2<T> = (iteratee: lodash.ValueIteratee<T[keyof T]>) => lodash.Dictionary<number>;
+    type LodashCreate = <T extends object, U extends object>(prototype: T) => T & U;
+    interface LodashCurry {
+        <T1, R>(func: (t1: T1) => R): lodash.CurriedFunction1<T1, R>;
+        <T1, T2, R>(func: (t1: T1, t2: T2) => R): lodash.CurriedFunction2<T1, T2, R>;
+        <T1, T2, T3, R>(func: (t1: T1, t2: T2, t3: T3) => R): lodash.CurriedFunction3<T1, T2, T3, R>;
+        <T1, T2, T3, T4, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4) => R): lodash.CurriedFunction4<T1, T2, T3, T4, R>;
+        <T1, T2, T3, T4, T5, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5) => R): lodash.CurriedFunction5<T1, T2, T3, T4, T5, R>;
+        (func: (...args: any[]) => any): (...args: any[]) => any;
+        placeholder: lodash.__;
+    }
+    interface LodashCurryN {
+        (arity: number): LodashCurryN1x1;
+        <T1, R>(arity: lodash.__, func: (t1: T1) => R): LodashCurryN1x2<T1, R>;
+        <T1, R>(arity: number, func: (t1: T1) => R): lodash.CurriedFunction1<T1, R>;
+        <T1, T2, R>(arity: lodash.__, func: (t1: T1, t2: T2) => R): LodashCurryN2x2<T1, T2, R>;
+        <T1, T2, R>(arity: number, func: (t1: T1, t2: T2) => R): lodash.CurriedFunction2<T1, T2, R>;
+        <T1, T2, T3, R>(arity: lodash.__, func: (t1: T1, t2: T2, t3: T3) => R): LodashCurryN3x2<T1, T2, T3, R>;
+        <T1, T2, T3, R>(arity: number, func: (t1: T1, t2: T2, t3: T3) => R): lodash.CurriedFunction3<T1, T2, T3, R>;
+        <T1, T2, T3, T4, R>(arity: lodash.__, func: (t1: T1, t2: T2, t3: T3, t4: T4) => R): LodashCurryN4x2<T1, T2, T3, T4, R>;
+        <T1, T2, T3, T4, R>(arity: number, func: (t1: T1, t2: T2, t3: T3, t4: T4) => R): lodash.CurriedFunction4<T1, T2, T3, T4, R>;
+        <T1, T2, T3, T4, T5, R>(arity: lodash.__, func: (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5) => R): LodashCurryN5x2<T1, T2, T3, T4, T5, R>;
+        <T1, T2, T3, T4, T5, R>(arity: number, func: (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5) => R): lodash.CurriedFunction5<T1, T2, T3, T4, T5, R>;
+        (arity: lodash.__, func: (...args: any[]) => any): LodashCurryN6x2;
+        (arity: number, func: (...args: any[]) => any): (...args: any[]) => any;
+        placeholder: lodash.__;
+    }
+    interface LodashCurryN1x1 {
+        <T1, R>(func: (t1: T1) => R): lodash.CurriedFunction1<T1, R>;
+        <T1, T2, R>(func: (t1: T1, t2: T2) => R): lodash.CurriedFunction2<T1, T2, R>;
+        <T1, T2, T3, R>(func: (t1: T1, t2: T2, t3: T3) => R): lodash.CurriedFunction3<T1, T2, T3, R>;
+        <T1, T2, T3, T4, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4) => R): lodash.CurriedFunction4<T1, T2, T3, T4, R>;
+        <T1, T2, T3, T4, T5, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5) => R): lodash.CurriedFunction5<T1, T2, T3, T4, T5, R>;
+        (func: (...args: any[]) => any): (...args: any[]) => any;
+    }
+    type LodashCurryN1x2<T1, R> = (arity: number) => lodash.CurriedFunction1<T1, R>;
+    type LodashCurryN2x2<T1, T2, R> = (arity: number) => lodash.CurriedFunction2<T1, T2, R>;
+    type LodashCurryN3x2<T1, T2, T3, R> = (arity: number) => lodash.CurriedFunction3<T1, T2, T3, R>;
+    type LodashCurryN4x2<T1, T2, T3, T4, R> = (arity: number) => lodash.CurriedFunction4<T1, T2, T3, T4, R>;
+    type LodashCurryN5x2<T1, T2, T3, T4, T5, R> = (arity: number) => lodash.CurriedFunction5<T1, T2, T3, T4, T5, R>;
+    type LodashCurryN6x2 = (arity: number) => (...args: any[]) => any;
+    interface LodashCurryRight {
+        <T1, R>(func: (t1: T1) => R): lodash.RightCurriedFunction1<T1, R>;
+        <T1, T2, R>(func: (t1: T1, t2: T2) => R): lodash.RightCurriedFunction2<T1, T2, R>;
+        <T1, T2, T3, R>(func: (t1: T1, t2: T2, t3: T3) => R): lodash.RightCurriedFunction3<T1, T2, T3, R>;
+        <T1, T2, T3, T4, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4) => R): lodash.RightCurriedFunction4<T1, T2, T3, T4, R>;
+        <T1, T2, T3, T4, T5, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5) => R): lodash.RightCurriedFunction5<T1, T2, T3, T4, T5, R>;
+        (func: (...args: any[]) => any): (...args: any[]) => any;
+        placeholder: lodash.__;
+    }
+    interface LodashCurryRightN {
+        (arity: number): LodashCurryRightN1x1;
+        <T1, R>(arity: lodash.__, func: (t1: T1) => R): LodashCurryRightN1x2<T1, R>;
+        <T1, R>(arity: number, func: (t1: T1) => R): lodash.RightCurriedFunction1<T1, R>;
+        <T1, T2, R>(arity: lodash.__, func: (t1: T1, t2: T2) => R): LodashCurryRightN2x2<T1, T2, R>;
+        <T1, T2, R>(arity: number, func: (t1: T1, t2: T2) => R): lodash.RightCurriedFunction2<T1, T2, R>;
+        <T1, T2, T3, R>(arity: lodash.__, func: (t1: T1, t2: T2, t3: T3) => R): LodashCurryRightN3x2<T1, T2, T3, R>;
+        <T1, T2, T3, R>(arity: number, func: (t1: T1, t2: T2, t3: T3) => R): lodash.RightCurriedFunction3<T1, T2, T3, R>;
+        <T1, T2, T3, T4, R>(arity: lodash.__, func: (t1: T1, t2: T2, t3: T3, t4: T4) => R): LodashCurryRightN4x2<T1, T2, T3, T4, R>;
+        <T1, T2, T3, T4, R>(arity: number, func: (t1: T1, t2: T2, t3: T3, t4: T4) => R): lodash.RightCurriedFunction4<T1, T2, T3, T4, R>;
+        <T1, T2, T3, T4, T5, R>(arity: lodash.__, func: (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5) => R): LodashCurryRightN5x2<T1, T2, T3, T4, T5, R>;
+        <T1, T2, T3, T4, T5, R>(arity: number, func: (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5) => R): lodash.RightCurriedFunction5<T1, T2, T3, T4, T5, R>;
+        (arity: lodash.__, func: (...args: any[]) => any): LodashCurryRightN6x2;
+        (arity: number, func: (...args: any[]) => any): (...args: any[]) => any;
+        placeholder: lodash.__;
+    }
+    interface LodashCurryRightN1x1 {
+        <T1, R>(func: (t1: T1) => R): lodash.RightCurriedFunction1<T1, R>;
+        <T1, T2, R>(func: (t1: T1, t2: T2) => R): lodash.RightCurriedFunction2<T1, T2, R>;
+        <T1, T2, T3, R>(func: (t1: T1, t2: T2, t3: T3) => R): lodash.RightCurriedFunction3<T1, T2, T3, R>;
+        <T1, T2, T3, T4, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4) => R): lodash.RightCurriedFunction4<T1, T2, T3, T4, R>;
+        <T1, T2, T3, T4, T5, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5) => R): lodash.RightCurriedFunction5<T1, T2, T3, T4, T5, R>;
+        (func: (...args: any[]) => any): (...args: any[]) => any;
+    }
+    type LodashCurryRightN1x2<T1, R> = (arity: number) => lodash.RightCurriedFunction1<T1, R>;
+    type LodashCurryRightN2x2<T1, T2, R> = (arity: number) => lodash.RightCurriedFunction2<T1, T2, R>;
+    type LodashCurryRightN3x2<T1, T2, T3, R> = (arity: number) => lodash.RightCurriedFunction3<T1, T2, T3, R>;
+    type LodashCurryRightN4x2<T1, T2, T3, T4, R> = (arity: number) => lodash.RightCurriedFunction4<T1, T2, T3, T4, R>;
+    type LodashCurryRightN5x2<T1, T2, T3, T4, T5, R> = (arity: number) => lodash.RightCurriedFunction5<T1, T2, T3, T4, T5, R>;
+    type LodashCurryRightN6x2 = (arity: number) => (...args: any[]) => any;
+    interface LodashDebounce {
+        (wait: number): LodashDebounce1x1;
+        <T extends (...args: any[]) => any>(wait: lodash.__, func: T): LodashDebounce1x2<T>;
+        <T extends (...args: any[]) => any>(wait: number, func: T): T & lodash.Cancelable;
+    }
+    type LodashDebounce1x1 = <T extends (...args: any[]) => any>(func: T) => T & lodash.Cancelable;
+    type LodashDebounce1x2<T> = (wait: number) => T & lodash.Cancelable;
+    type LodashDeburr = (string: string) => string;
+    interface LodashDefaults {
+        <TSource>(source: TSource): LodashDefaults1x1<TSource>;
+        <TObject>(source: lodash.__, object: TObject): LodashDefaults1x2<TObject>;
+        <TObject, TSource>(source: TSource, object: TObject): TSource & TObject;
+    }
+    type LodashDefaults1x1<TSource> = <TObject>(object: TObject) => TSource & TObject;
+    type LodashDefaults1x2<TObject> = <TSource>(source: TSource) => TSource & TObject;
+    type LodashDefaultsAll = (object: ReadonlyArray<any>) => any;
+    interface LodashDefaultsDeep {
+        (sources: any): LodashDefaultsDeep1x1;
+        (sources: lodash.__, object: any): LodashDefaultsDeep1x2;
+        (sources: any, object: any): any;
+    }
+    type LodashDefaultsDeep1x1 = (object: any) => any;
+    type LodashDefaultsDeep1x2 = (sources: any) => any;
+    type LodashDefaultsDeepAll = (object: ReadonlyArray<any>) => any;
+    interface LodashDefaultTo {
+        <T>(defaultValue: T): LodashDefaultTo1x1<T>;
+        <T>(defaultValue: lodash.__, value: T | null | undefined): LodashDefaultTo1x2<T>;
+        <T>(defaultValue: T, value: T | null | undefined): T;
+        <TDefault>(defaultValue: TDefault): LodashDefaultTo2x1<TDefault>;
+        <T, TDefault>(defaultValue: TDefault, value: T | null | undefined): T | TDefault;
+    }
+    type LodashDefaultTo1x1<T> = (value: T | null | undefined) => T;
+    interface LodashDefaultTo1x2<T> {
+        (defaultValue: T): T;
+        <TDefault>(defaultValue: TDefault): T | TDefault;
+    }
+    type LodashDefaultTo2x1<TDefault> = <T>(value: T | null | undefined) => T | TDefault;
+    type LodashDefer = (func: (...args: any[]) => any, ...args: any[]) => number;
+    interface LodashDelay {
+        (wait: number): LodashDelay1x1;
+        (wait: lodash.__, func: (...args: any[]) => any): LodashDelay1x2;
+        (wait: number, func: (...args: any[]) => any): number;
+    }
+    type LodashDelay1x1 = (func: (...args: any[]) => any) => number;
+    type LodashDelay1x2 = (wait: number) => number;
+    interface LodashDifference {
+        <T>(array: lodash.List<T> | null | undefined): LodashDifference1x1<T>;
+        <T>(array: lodash.__, values: lodash.List<T>): LodashDifference1x2<T>;
+        <T>(array: lodash.List<T> | null | undefined, values: lodash.List<T>): T[];
+    }
+    type LodashDifference1x1<T> = (values: lodash.List<T>) => T[];
+    type LodashDifference1x2<T> = (array: lodash.List<T> | null | undefined) => T[];
+    interface LodashDifferenceBy {
+        <T1, T2>(iteratee: lodash.ValueIteratee<T1 | T2>): LodashDifferenceBy1x1<T1, T2>;
+        <T1>(iteratee: lodash.__, array: lodash.List<T1> | null | undefined): LodashDifferenceBy1x2<T1>;
+        <T1, T2>(iteratee: lodash.ValueIteratee<T1 | T2>, array: lodash.List<T1> | null | undefined): LodashDifferenceBy1x3<T1, T2>;
+        <T2>(iteratee: lodash.__, array: lodash.__, values: lodash.List<T2>): LodashDifferenceBy1x4<T2>;
+        <T1, T2>(iteratee: lodash.ValueIteratee<T1 | T2>, array: lodash.__, values: lodash.List<T2>): LodashDifferenceBy1x5<T1>;
+        <T1, T2>(iteratee: lodash.__, array: lodash.List<T1> | null | undefined, values: lodash.List<T2>): LodashDifferenceBy1x6<T1, T2>;
+        <T1, T2>(iteratee: lodash.ValueIteratee<T1 | T2>, array: lodash.List<T1> | null | undefined, values: lodash.List<T2>): T1[];
+    }
+    interface LodashDifferenceBy1x1<T1, T2> {
+        (array: lodash.List<T1> | null | undefined): LodashDifferenceBy1x3<T1, T2>;
+        (array: lodash.__, values: lodash.List<T2>): LodashDifferenceBy1x5<T1>;
+        (array: lodash.List<T1> | null | undefined, values: lodash.List<T2>): T1[];
+    }
+    interface LodashDifferenceBy1x2<T1> {
+        <T2>(iteratee: lodash.ValueIteratee<T1 | T2>): LodashDifferenceBy1x3<T1, T2>;
+        <T2>(iteratee: lodash.__, values: lodash.List<T2>): LodashDifferenceBy1x6<T1, T2>;
+        <T2>(iteratee: lodash.ValueIteratee<T1 | T2>, values: lodash.List<T2>): T1[];
+    }
+    type LodashDifferenceBy1x3<T1, T2> = (values: lodash.List<T2>) => T1[];
+    interface LodashDifferenceBy1x4<T2> {
+        <T1>(iteratee: lodash.ValueIteratee<T1 | T2>): LodashDifferenceBy1x5<T1>;
+        <T1>(iteratee: lodash.__, array: lodash.List<T1> | null | undefined): LodashDifferenceBy1x6<T1, T2>;
+        <T1>(iteratee: lodash.ValueIteratee<T1 | T2>, array: lodash.List<T1> | null | undefined): T1[];
+    }
+    type LodashDifferenceBy1x5<T1> = (array: lodash.List<T1> | null | undefined) => T1[];
+    type LodashDifferenceBy1x6<T1, T2> = (iteratee: lodash.ValueIteratee<T1 | T2>) => T1[];
+    interface LodashDifferenceWith {
+        <T1, T2>(comparator: lodash.Comparator2<T1, T2>): LodashDifferenceWith1x1<T1, T2>;
+        <T1>(comparator: lodash.__, array: lodash.List<T1> | null | undefined): LodashDifferenceWith1x2<T1>;
+        <T1, T2>(comparator: lodash.Comparator2<T1, T2>, array: lodash.List<T1> | null | undefined): LodashDifferenceWith1x3<T1, T2>;
+        <T2>(comparator: lodash.__, array: lodash.__, values: lodash.List<T2>): LodashDifferenceWith1x4<T2>;
+        <T1, T2>(comparator: lodash.Comparator2<T1, T2>, array: lodash.__, values: lodash.List<T2>): LodashDifferenceWith1x5<T1>;
+        <T1, T2>(comparator: lodash.__, array: lodash.List<T1> | null | undefined, values: lodash.List<T2>): LodashDifferenceWith1x6<T1, T2>;
+        <T1, T2>(comparator: lodash.Comparator2<T1, T2>, array: lodash.List<T1> | null | undefined, values: lodash.List<T2>): T1[];
+    }
+    interface LodashDifferenceWith1x1<T1, T2> {
+        (array: lodash.List<T1> | null | undefined): LodashDifferenceWith1x3<T1, T2>;
+        (array: lodash.__, values: lodash.List<T2>): LodashDifferenceWith1x5<T1>;
+        (array: lodash.List<T1> | null | undefined, values: lodash.List<T2>): T1[];
+    }
+    interface LodashDifferenceWith1x2<T1> {
+        <T2>(comparator: lodash.Comparator2<T1, T2>): LodashDifferenceWith1x3<T1, T2>;
+        <T2>(comparator: lodash.__, values: lodash.List<T2>): LodashDifferenceWith1x6<T1, T2>;
+        <T2>(comparator: lodash.Comparator2<T1, T2>, values: lodash.List<T2>): T1[];
+    }
+    type LodashDifferenceWith1x3<T1, T2> = (values: lodash.List<T2>) => T1[];
+    interface LodashDifferenceWith1x4<T2> {
+        <T1>(comparator: lodash.Comparator2<T1, T2>): LodashDifferenceWith1x5<T1>;
+        <T1>(comparator: lodash.__, array: lodash.List<T1> | null | undefined): LodashDifferenceWith1x6<T1, T2>;
+        <T1>(comparator: lodash.Comparator2<T1, T2>, array: lodash.List<T1> | null | undefined): T1[];
+    }
+    type LodashDifferenceWith1x5<T1> = (array: lodash.List<T1> | null | undefined) => T1[];
+    type LodashDifferenceWith1x6<T1, T2> = (comparator: lodash.Comparator2<T1, T2>) => T1[];
+    interface LodashUnset {
+        (path: lodash.PropertyPath): LodashUnset1x1;
+        (path: lodash.__, object: any): LodashUnset1x2;
+        (path: lodash.PropertyPath, object: any): boolean;
+    }
+    type LodashUnset1x1 = (object: any) => boolean;
+    type LodashUnset1x2 = (path: lodash.PropertyPath) => boolean;
+    interface LodashDivide {
+        (dividend: number): LodashDivide1x1;
+        (dividend: lodash.__, divisor: number): LodashDivide1x2;
+        (dividend: number, divisor: number): number;
+    }
+    type LodashDivide1x1 = (divisor: number) => number;
+    type LodashDivide1x2 = (dividend: number) => number;
+    interface LodashDrop {
+        (n: number): LodashDrop1x1;
+        <T>(n: lodash.__, array: lodash.List<T> | null | undefined): LodashDrop1x2<T>;
+        <T>(n: number, array: lodash.List<T> | null | undefined): T[];
+    }
+    type LodashDrop1x1 = <T>(array: lodash.List<T> | null | undefined) => T[];
+    type LodashDrop1x2<T> = (n: number) => T[];
+    interface LodashDropRight {
+        (n: number): LodashDropRight1x1;
+        <T>(n: lodash.__, array: lodash.List<T> | null | undefined): LodashDropRight1x2<T>;
+        <T>(n: number, array: lodash.List<T> | null | undefined): T[];
+    }
+    type LodashDropRight1x1 = <T>(array: lodash.List<T> | null | undefined) => T[];
+    type LodashDropRight1x2<T> = (n: number) => T[];
+    interface LodashDropRightWhile {
+        <T>(predicate: lodash.ValueIteratee<T>): LodashDropRightWhile1x1<T>;
+        <T>(predicate: lodash.__, array: lodash.List<T> | null | undefined): LodashDropRightWhile1x2<T>;
+        <T>(predicate: lodash.ValueIteratee<T>, array: lodash.List<T> | null | undefined): T[];
+    }
+    type LodashDropRightWhile1x1<T> = (array: lodash.List<T> | null | undefined) => T[];
+    type LodashDropRightWhile1x2<T> = (predicate: lodash.ValueIteratee<T>) => T[];
+    interface LodashDropWhile {
+        <T>(predicate: lodash.ValueIteratee<T>): LodashDropWhile1x1<T>;
+        <T>(predicate: lodash.__, array: lodash.List<T> | null | undefined): LodashDropWhile1x2<T>;
+        <T>(predicate: lodash.ValueIteratee<T>, array: lodash.List<T> | null | undefined): T[];
+    }
+    type LodashDropWhile1x1<T> = (array: lodash.List<T> | null | undefined) => T[];
+    type LodashDropWhile1x2<T> = (predicate: lodash.ValueIteratee<T>) => T[];
+    interface LodashForEach {
+        <T>(iteratee: (value: T) => any): LodashForEach1x1<T>;
+        <T>(iteratee: lodash.__, collection: ReadonlyArray<T>): LodashForEach1x2<T>;
+        <T>(iteratee: (value: T) => any, collection: ReadonlyArray<T>): T[];
+        (iteratee: (value: string) => any): LodashForEach2x1;
+        (iteratee: lodash.__, collection: string): LodashForEach2x2;
+        (iteratee: (value: string) => any, collection: string): string;
+        <T>(iteratee: lodash.__, collection: lodash.List<T>): LodashForEach3x2<T>;
+        <T>(iteratee: (value: T) => any, collection: lodash.List<T>): lodash.List<T>;
+        <T extends object>(iteratee: lodash.__, collection: T): LodashForEach4x2<T>;
+        <T extends object>(iteratee: (value: T[keyof T]) => any, collection: T): T;
+        <T, TArray extends T[] | null | undefined>(iteratee: lodash.__, collection: TArray & (T[] | null | undefined)): LodashForEach5x2<T, TArray>;
+        <T, TArray extends T[] | null | undefined>(iteratee: (value: T) => any, collection: TArray & (T[] | null | undefined)): TArray;
+        <TString extends string | null | undefined>(iteratee: lodash.__, collection: TString): LodashForEach6x2<TString>;
+        <TString extends string | null | undefined>(iteratee: (value: string) => any, collection: TString): TString;
+        <T, TList extends lodash.List<T> | null | undefined>(iteratee: lodash.__, collection: TList & (lodash.List<T> | null | undefined)): LodashForEach7x2<T, TList>;
+        <T, TList extends lodash.List<T> | null | undefined>(iteratee: (value: T) => any, collection: TList & (lodash.List<T> | null | undefined)): TList;
+        <T extends object>(iteratee: lodash.__, collection: T | null | undefined): LodashForEach8x2<T>;
+        <T extends object>(iteratee: (value: T[keyof T]) => any, collection: T | null | undefined): T | null | undefined;
+    }
+    interface LodashForEach1x1<T> {
+        (collection: ReadonlyArray<T>): T[];
+        (collection: lodash.List<T>): lodash.List<T>;
+        <T1 extends object>(collection: T1): T1;
+        <TArray extends T[] | null | undefined>(collection: TArray & (T[] | null | undefined)): TArray;
+        <TList extends lodash.List<T> | null | undefined>(collection: TList & (lodash.List<T> | null | undefined)): TList;
+        <T1 extends object>(collection: T1 | null | undefined): T1 | null | undefined;
+    }
+    type LodashForEach1x2<T> = (iteratee: (value: T) => any) => T[];
+    interface LodashForEach2x1 {
+        (collection: string): string;
+        <TString extends string | null | undefined>(collection: TString): TString;
+    }
+    type LodashForEach2x2 = (iteratee: (value: string) => any) => string;
+    type LodashForEach3x2<T> = (iteratee: (value: T) => any) => lodash.List<T>;
+    type LodashForEach4x2<T> = (iteratee: (value: T[keyof T]) => any) => T;
+    type LodashForEach5x2<T, TArray> = (iteratee: (value: T) => any) => TArray;
+    type LodashForEach6x2<TString> = (iteratee: (value: string) => any) => TString;
+    type LodashForEach7x2<T, TList> = (iteratee: (value: T) => any) => TList;
+    type LodashForEach8x2<T> = (iteratee: (value: T[keyof T]) => any) => T | null | undefined;
+    interface LodashForEachRight {
+        <T>(iteratee: (value: T) => any): LodashForEachRight1x1<T>;
+        <T>(iteratee: lodash.__, collection: ReadonlyArray<T>): LodashForEachRight1x2<T>;
+        <T>(iteratee: (value: T) => any, collection: ReadonlyArray<T>): T[];
+        (iteratee: (value: string) => any): LodashForEachRight2x1;
+        (iteratee: lodash.__, collection: string): LodashForEachRight2x2;
+        (iteratee: (value: string) => any, collection: string): string;
+        <T>(iteratee: lodash.__, collection: lodash.List<T>): LodashForEachRight3x2<T>;
+        <T>(iteratee: (value: T) => any, collection: lodash.List<T>): lodash.List<T>;
+        <T extends object>(iteratee: lodash.__, collection: T): LodashForEachRight4x2<T>;
+        <T extends object>(iteratee: (value: T[keyof T]) => any, collection: T): T;
+        <T, TArray extends T[] | null | undefined>(iteratee: lodash.__, collection: TArray & (T[] | null | undefined)): LodashForEachRight5x2<T, TArray>;
+        <T, TArray extends T[] | null | undefined>(iteratee: (value: T) => any, collection: TArray & (T[] | null | undefined)): TArray;
+        <TString extends string | null | undefined>(iteratee: lodash.__, collection: TString): LodashForEachRight6x2<TString>;
+        <TString extends string | null | undefined>(iteratee: (value: string) => any, collection: TString): TString;
+        <T, TList extends lodash.List<T> | null | undefined>(iteratee: lodash.__, collection: TList & (lodash.List<T> | null | undefined)): LodashForEachRight7x2<T, TList>;
+        <T, TList extends lodash.List<T> | null | undefined>(iteratee: (value: T) => any, collection: TList & (lodash.List<T> | null | undefined)): TList;
+        <T extends object>(iteratee: lodash.__, collection: T | null | undefined): LodashForEachRight8x2<T>;
+        <T extends object>(iteratee: (value: T[keyof T]) => any, collection: T | null | undefined): T | null | undefined;
+    }
+    interface LodashForEachRight1x1<T> {
+        (collection: ReadonlyArray<T>): T[];
+        (collection: lodash.List<T>): lodash.List<T>;
+        <T1 extends object>(collection: T1): T1;
+        <TArray extends T[] | null | undefined>(collection: TArray & (T[] | null | undefined)): TArray;
+        <TList extends lodash.List<T> | null | undefined>(collection: TList & (lodash.List<T> | null | undefined)): TList;
+        <T1 extends object>(collection: T1 | null | undefined): T1 | null | undefined;
+    }
+    type LodashForEachRight1x2<T> = (iteratee: (value: T) => any) => T[];
+    interface LodashForEachRight2x1 {
+        (collection: string): string;
+        <TString extends string | null | undefined>(collection: TString): TString;
+    }
+    type LodashForEachRight2x2 = (iteratee: (value: string) => any) => string;
+    type LodashForEachRight3x2<T> = (iteratee: (value: T) => any) => lodash.List<T>;
+    type LodashForEachRight4x2<T> = (iteratee: (value: T[keyof T]) => any) => T;
+    type LodashForEachRight5x2<T, TArray> = (iteratee: (value: T) => any) => TArray;
+    type LodashForEachRight6x2<TString> = (iteratee: (value: string) => any) => TString;
+    type LodashForEachRight7x2<T, TList> = (iteratee: (value: T) => any) => TList;
+    type LodashForEachRight8x2<T> = (iteratee: (value: T[keyof T]) => any) => T | null | undefined;
+    interface LodashEndsWith {
+        (target: string): LodashEndsWith1x1;
+        (target: lodash.__, string: string): LodashEndsWith1x2;
+        (target: string, string: string): boolean;
+    }
+    type LodashEndsWith1x1 = (string: string) => boolean;
+    type LodashEndsWith1x2 = (target: string) => boolean;
+    interface LodashToPairs {
+        <T>(object: lodash.Dictionary<T> | lodash.NumericDictionary<T>): Array<[string, T]>;
+        (object: object): Array<[string, any]>;
+    }
+    interface LodashToPairsIn {
+        <T>(object: lodash.Dictionary<T> | lodash.NumericDictionary<T>): Array<[string, T]>;
+        (object: object): Array<[string, any]>;
+    }
+    interface LodashEq {
+        (value: any): LodashEq1x1;
+        (value: lodash.__, other: any): LodashEq1x2;
+        (value: any, other: any): boolean;
+    }
+    type LodashEq1x1 = (other: any) => boolean;
+    type LodashEq1x2 = (value: any) => boolean;
+    interface LodashIsEqual {
+        (value: any): LodashIsEqual1x1;
+        (value: lodash.__, other: any): LodashIsEqual1x2;
+        (value: any, other: any): boolean;
+    }
+    type LodashIsEqual1x1 = (other: any) => boolean;
+    type LodashIsEqual1x2 = (value: any) => boolean;
+    type LodashEscape = (string: string) => string;
+    type LodashEscapeRegExp = (string: string) => string;
+    interface LodashExtend {
+        <TObject>(object: TObject): LodashExtend1x1<TObject>;
+        <TSource>(object: lodash.__, source: TSource): LodashExtend1x2<TSource>;
+        <TObject, TSource>(object: TObject, source: TSource): TObject & TSource;
+    }
+    type LodashExtend1x1<TObject> = <TSource>(source: TSource) => TObject & TSource;
+    type LodashExtend1x2<TSource> = <TObject>(object: TObject) => TObject & TSource;
+    type LodashExtendAll = <TResult>(object: ReadonlyArray<any>) => TResult;
+    interface LodashExtendAllWith {
+        (customizer: lodash.AssignCustomizer): LodashExtendAllWith1x1;
+        (customizer: lodash.__, args: ReadonlyArray<any>): LodashExtendAllWith1x2;
+        (customizer: lodash.AssignCustomizer, args: ReadonlyArray<any>): any;
+    }
+    type LodashExtendAllWith1x1 = (args: ReadonlyArray<any>) => any;
+    type LodashExtendAllWith1x2 = (customizer: lodash.AssignCustomizer) => any;
+    interface LodashExtendWith {
+        (customizer: lodash.AssignCustomizer): LodashExtendWith1x1;
+        <TObject>(customizer: lodash.__, object: TObject): LodashExtendWith1x2<TObject>;
+        <TObject>(customizer: lodash.AssignCustomizer, object: TObject): LodashExtendWith1x3<TObject>;
+        <TSource>(customizer: lodash.__, object: lodash.__, source: TSource): LodashExtendWith1x4<TSource>;
+        <TSource>(customizer: lodash.AssignCustomizer, object: lodash.__, source: TSource): LodashExtendWith1x5<TSource>;
+        <TObject, TSource>(customizer: lodash.__, object: TObject, source: TSource): LodashExtendWith1x6<TObject, TSource>;
+        <TObject, TSource>(customizer: lodash.AssignCustomizer, object: TObject, source: TSource): TObject & TSource;
+    }
+    interface LodashExtendWith1x1 {
+        <TObject>(object: TObject): LodashExtendWith1x3<TObject>;
+        <TSource>(object: lodash.__, source: TSource): LodashExtendWith1x5<TSource>;
+        <TObject, TSource>(object: TObject, source: TSource): TObject & TSource;
+    }
+    interface LodashExtendWith1x2<TObject> {
+        (customizer: lodash.AssignCustomizer): LodashExtendWith1x3<TObject>;
+        <TSource>(customizer: lodash.__, source: TSource): LodashExtendWith1x6<TObject, TSource>;
+        <TSource>(customizer: lodash.AssignCustomizer, source: TSource): TObject & TSource;
+    }
+    type LodashExtendWith1x3<TObject> = <TSource>(source: TSource) => TObject & TSource;
+    interface LodashExtendWith1x4<TSource> {
+        (customizer: lodash.AssignCustomizer): LodashExtendWith1x5<TSource>;
+        <TObject>(customizer: lodash.__, object: TObject): LodashExtendWith1x6<TObject, TSource>;
+        <TObject>(customizer: lodash.AssignCustomizer, object: TObject): TObject & TSource;
+    }
+    type LodashExtendWith1x5<TSource> = <TObject>(object: TObject) => TObject & TSource;
+    type LodashExtendWith1x6<TObject, TSource> = (customizer: lodash.AssignCustomizer) => TObject & TSource;
+    type LodashStubFalse = () => boolean;
+    interface LodashFill {
+        (start: number): LodashFill1x1;
+        (start: lodash.__, end: number): LodashFill1x2;
+        (start: number, end: number): LodashFill1x3;
+        <T>(start: lodash.__, end: lodash.__, value: T): LodashFill1x4<T>;
+        <T>(start: number, end: lodash.__, value: T): LodashFill1x5<T>;
+        <T>(start: lodash.__, end: number, value: T): LodashFill1x6<T>;
+        <T>(start: number, end: number, value: T): LodashFill1x7<T>;
+        <U>(start: lodash.__, end: lodash.__, value: lodash.__, array: U[] | null | undefined): LodashFill1x8<U>;
+        <U>(start: number, end: lodash.__, value: lodash.__, array: U[] | null | undefined): LodashFill1x9<U>;
+        <U>(start: lodash.__, end: number, value: lodash.__, array: U[] | null | undefined): LodashFill1x10<U>;
+        <U>(start: number, end: number, value: lodash.__, array: U[] | null | undefined): LodashFill1x11<U>;
+        <T, U>(start: lodash.__, end: lodash.__, value: T, array: U[] | null | undefined): LodashFill1x12<T, U>;
+        <T, U>(start: number, end: lodash.__, value: T, array: U[] | null | undefined): LodashFill1x13<T, U>;
+        <T, U>(start: lodash.__, end: number, value: T, array: U[] | null | undefined): LodashFill1x14<T, U>;
+        <T, U>(start: number, end: number, value: T, array: U[] | null | undefined): Array<T | U>;
+        <U>(start: lodash.__, end: lodash.__, value: lodash.__, array: lodash.List<U> | null | undefined): LodashFill2x8<U>;
+        <U>(start: number, end: lodash.__, value: lodash.__, array: lodash.List<U> | null | undefined): LodashFill2x9<U>;
+        <U>(start: lodash.__, end: number, value: lodash.__, array: lodash.List<U> | null | undefined): LodashFill2x10<U>;
+        <U>(start: number, end: number, value: lodash.__, array: lodash.List<U> | null | undefined): LodashFill2x11<U>;
+        <T, U>(start: lodash.__, end: lodash.__, value: T, array: lodash.List<U> | null | undefined): LodashFill2x12<T, U>;
+        <T, U>(start: number, end: lodash.__, value: T, array: lodash.List<U> | null | undefined): LodashFill2x13<T, U>;
+        <T, U>(start: lodash.__, end: number, value: T, array: lodash.List<U> | null | undefined): LodashFill2x14<T, U>;
+        <T, U>(start: number, end: number, value: T, array: lodash.List<U> | null | undefined): lodash.List<T | U>;
+    }
+    interface LodashFill1x1 {
+        (end: number): LodashFill1x3;
+        <T>(end: lodash.__, value: T): LodashFill1x5<T>;
+        <T>(end: number, value: T): LodashFill1x7<T>;
+        <U>(end: lodash.__, value: lodash.__, array: U[] | null | undefined): LodashFill1x9<U>;
+        <U>(end: number, value: lodash.__, array: U[] | null | undefined): LodashFill1x11<U>;
+        <T, U>(end: lodash.__, value: T, array: U[] | null | undefined): LodashFill1x13<T, U>;
+        <T, U>(end: number, value: T, array: U[] | null | undefined): Array<T | U>;
+        <U>(end: lodash.__, value: lodash.__, array: lodash.List<U> | null | undefined): LodashFill2x9<U>;
+        <U>(end: number, value: lodash.__, array: lodash.List<U> | null | undefined): LodashFill2x11<U>;
+        <T, U>(end: lodash.__, value: T, array: lodash.List<U> | null | undefined): LodashFill2x13<T, U>;
+        <T, U>(end: number, value: T, array: lodash.List<U> | null | undefined): lodash.List<T | U>;
+    }
+    interface LodashFill1x2 {
+        (start: number): LodashFill1x3;
+        <T>(start: lodash.__, value: T): LodashFill1x6<T>;
+        <T>(start: number, value: T): LodashFill1x7<T>;
+        <U>(start: lodash.__, value: lodash.__, array: U[] | null | undefined): LodashFill1x10<U>;
+        <U>(start: number, value: lodash.__, array: U[] | null | undefined): LodashFill1x11<U>;
+        <T, U>(start: lodash.__, value: T, array: U[] | null | undefined): LodashFill1x14<T, U>;
+        <T, U>(start: number, value: T, array: U[] | null | undefined): Array<T | U>;
+        <U>(start: lodash.__, value: lodash.__, array: lodash.List<U> | null | undefined): LodashFill2x10<U>;
+        <U>(start: number, value: lodash.__, array: lodash.List<U> | null | undefined): LodashFill2x11<U>;
+        <T, U>(start: lodash.__, value: T, array: lodash.List<U> | null | undefined): LodashFill2x14<T, U>;
+        <T, U>(start: number, value: T, array: lodash.List<U> | null | undefined): lodash.List<T | U>;
+    }
+    interface LodashFill1x3 {
+        <T>(value: T): LodashFill1x7<T>;
+        <U>(value: lodash.__, array: U[] | null | undefined): LodashFill1x11<U>;
+        <T, U>(value: T, array: U[] | null | undefined): Array<T | U>;
+        <U>(value: lodash.__, array: lodash.List<U> | null | undefined): LodashFill2x11<U>;
+        <T, U>(value: T, array: lodash.List<U> | null | undefined): lodash.List<T | U>;
+    }
+    interface LodashFill1x4<T> {
+        (start: number): LodashFill1x5<T>;
+        (start: lodash.__, end: number): LodashFill1x6<T>;
+        (start: number, end: number): LodashFill1x7<T>;
+        <U>(start: lodash.__, end: lodash.__, array: U[] | null | undefined): LodashFill1x12<T, U>;
+        <U>(start: number, end: lodash.__, array: U[] | null | undefined): LodashFill1x13<T, U>;
+        <U>(start: lodash.__, end: number, array: U[] | null | undefined): LodashFill1x14<T, U>;
+        <U>(start: number, end: number, array: U[] | null | undefined): Array<T | U>;
+        <U>(start: lodash.__, end: lodash.__, array: lodash.List<U> | null | undefined): LodashFill2x12<T, U>;
+        <U>(start: number, end: lodash.__, array: lodash.List<U> | null | undefined): LodashFill2x13<T, U>;
+        <U>(start: lodash.__, end: number, array: lodash.List<U> | null | undefined): LodashFill2x14<T, U>;
+        <U>(start: number, end: number, array: lodash.List<U> | null | undefined): lodash.List<T | U>;
+    }
+    interface LodashFill1x5<T> {
+        (end: number): LodashFill1x7<T>;
+        <U>(end: lodash.__, array: U[] | null | undefined): LodashFill1x13<T, U>;
+        <U>(end: number, array: U[] | null | undefined): Array<T | U>;
+        <U>(end: lodash.__, array: lodash.List<U> | null | undefined): LodashFill2x13<T, U>;
+        <U>(end: number, array: lodash.List<U> | null | undefined): lodash.List<T | U>;
+    }
+    interface LodashFill1x6<T> {
+        (start: number): LodashFill1x7<T>;
+        <U>(start: lodash.__, array: U[] | null | undefined): LodashFill1x14<T, U>;
+        <U>(start: number, array: U[] | null | undefined): Array<T | U>;
+        <U>(start: lodash.__, array: lodash.List<U> | null | undefined): LodashFill2x14<T, U>;
+        <U>(start: number, array: lodash.List<U> | null | undefined): lodash.List<T | U>;
+    }
+    interface LodashFill1x7<T> {
+        <U>(array: U[] | null | undefined): Array<T | U>;
+        <U>(array: lodash.List<U> | null | undefined): lodash.List<T | U>;
+    }
+    interface LodashFill1x8<U> {
+        (start: number): LodashFill1x9<U>;
+        (start: lodash.__, end: number): LodashFill1x10<U>;
+        (start: number, end: number): LodashFill1x11<U>;
+        <T>(start: lodash.__, end: lodash.__, value: T): LodashFill1x12<T, U>;
+        <T>(start: number, end: lodash.__, value: T): LodashFill1x13<T, U>;
+        <T>(start: lodash.__, end: number, value: T): LodashFill1x14<T, U>;
+        <T>(start: number, end: number, value: T): Array<T | U>;
+    }
+    interface LodashFill1x9<U> {
+        (end: number): LodashFill1x11<U>;
+        <T>(end: lodash.__, value: T): LodashFill1x13<T, U>;
+        <T>(end: number, value: T): Array<T | U>;
+    }
+    interface LodashFill1x10<U> {
+        (start: number): LodashFill1x11<U>;
+        <T>(start: lodash.__, value: T): LodashFill1x14<T, U>;
+        <T>(start: number, value: T): Array<T | U>;
+    }
+    type LodashFill1x11<U> = <T>(value: T) => Array<T | U>;
+    interface LodashFill1x12<T, U> {
+        (start: number): LodashFill1x13<T, U>;
+        (start: lodash.__, end: number): LodashFill1x14<T, U>;
+        (start: number, end: number): Array<T | U>;
+    }
+    type LodashFill1x13<T, U> = (end: number) => Array<T | U>;
+    type LodashFill1x14<T, U> = (start: number) => Array<T | U>;
+    interface LodashFill2x8<U> {
+        (start: number): LodashFill2x9<U>;
+        (start: lodash.__, end: number): LodashFill2x10<U>;
+        (start: number, end: number): LodashFill2x11<U>;
+        <T>(start: lodash.__, end: lodash.__, value: T): LodashFill2x12<T, U>;
+        <T>(start: number, end: lodash.__, value: T): LodashFill2x13<T, U>;
+        <T>(start: lodash.__, end: number, value: T): LodashFill2x14<T, U>;
+        <T>(start: number, end: number, value: T): lodash.List<T | U>;
+    }
+    interface LodashFill2x9<U> {
+        (end: number): LodashFill2x11<U>;
+        <T>(end: lodash.__, value: T): LodashFill2x13<T, U>;
+        <T>(end: number, value: T): lodash.List<T | U>;
+    }
+    interface LodashFill2x10<U> {
+        (start: number): LodashFill2x11<U>;
+        <T>(start: lodash.__, value: T): LodashFill2x14<T, U>;
+        <T>(start: number, value: T): lodash.List<T | U>;
+    }
+    type LodashFill2x11<U> = <T>(value: T) => lodash.List<T | U>;
+    interface LodashFill2x12<T, U> {
+        (start: number): LodashFill2x13<T, U>;
+        (start: lodash.__, end: number): LodashFill2x14<T, U>;
+        (start: number, end: number): lodash.List<T | U>;
+    }
+    type LodashFill2x13<T, U> = (end: number) => lodash.List<T | U>;
+    type LodashFill2x14<T, U> = (start: number) => lodash.List<T | U>;
+    interface LodashFilter {
+        (predicate: (value: string) => boolean): LodashFilter1x1;
+        (predicate: lodash.__, collection: string | null | undefined): LodashFilter1x2;
+        (predicate: (value: string) => boolean, collection: string | null | undefined): string[];
+        <T, S extends T>(predicate: lodash.ValueIteratorTypeGuard<T, S>): LodashFilter2x1<T, S>;
+        <T>(predicate: lodash.__, collection: lodash.List<T> | null | undefined): LodashFilter2x2<T>;
+        <T, S extends T>(predicate: lodash.ValueIteratorTypeGuard<T, S>, collection: lodash.List<T> | null | undefined): S[];
+        <T>(predicate: lodash.ValueIterateeCustom<T, boolean>): LodashFilter3x1<T>;
+        <T>(predicate: lodash.ValueIterateeCustom<T, boolean>, collection: lodash.List<T> | null | undefined): T[];
+        <T extends object, S extends T[keyof T]>(predicate: lodash.ValueIteratorTypeGuard<T[keyof T], S>): LodashFilter4x1<T, S>;
+        <T extends object>(predicate: lodash.__, collection: T | null | undefined): LodashFilter4x2<T>;
+        <T extends object, S extends T[keyof T]>(predicate: lodash.ValueIteratorTypeGuard<T[keyof T], S>, collection: T | null | undefined): S[];
+        <T extends object>(predicate: lodash.ValueIterateeCustom<T[keyof T], boolean>, collection: T | null | undefined): Array<T[keyof T]>;
+    }
+    type LodashFilter1x1 = (collection: string | null | undefined) => string[];
+    type LodashFilter1x2 = (predicate: (value: string) => boolean) => string[];
+    type LodashFilter2x1<T, S> = (collection: lodash.List<T> | null | undefined) => S[];
+    interface LodashFilter2x2<T> {
+        <S extends T>(predicate: lodash.ValueIteratorTypeGuard<T, S>): S[];
+        (predicate: lodash.ValueIterateeCustom<T, boolean>): T[];
+    }
+    type LodashFilter3x1<T> = (collection: lodash.List<T> | object | null | undefined) => T[];
+    type LodashFilter4x1<T, S> = (collection: T | null | undefined) => S[];
+    interface LodashFilter4x2<T> {
+        <S extends T[keyof T]>(predicate: lodash.ValueIteratorTypeGuard<T[keyof T], S>): S[];
+        (predicate: lodash.ValueIterateeCustom<T[keyof T], boolean>): Array<T[keyof T]>;
+    }
+    interface LodashFind {
+        <T, S extends T>(predicate: lodash.ValueIteratorTypeGuard<T, S>): LodashFind1x1<T, S>;
+        <T>(predicate: lodash.__, collection: lodash.List<T> | null | undefined): LodashFind1x2<T>;
+        <T, S extends T>(predicate: lodash.ValueIteratorTypeGuard<T, S>, collection: lodash.List<T> | null | undefined): S|undefined;
+        <T>(predicate: lodash.ValueIterateeCustom<T, boolean>): LodashFind2x1<T>;
+        <T>(predicate: lodash.ValueIterateeCustom<T, boolean>, collection: lodash.List<T> | null | undefined): T|undefined;
+        <T extends object, S extends T[keyof T]>(predicate: lodash.ValueIteratorTypeGuard<T[keyof T], S>): LodashFind3x1<T, S>;
+        <T extends object>(predicate: lodash.__, collection: T | null | undefined): LodashFind3x2<T>;
+        <T extends object, S extends T[keyof T]>(predicate: lodash.ValueIteratorTypeGuard<T[keyof T], S>, collection: T | null | undefined): S|undefined;
+        <T extends object>(predicate: lodash.ValueIterateeCustom<T[keyof T], boolean>, collection: T | null | undefined): T[keyof T]|undefined;
+    }
+    type LodashFind1x1<T, S> = (collection: lodash.List<T> | null | undefined) => S|undefined;
+    interface LodashFind1x2<T> {
+        <S extends T>(predicate: lodash.ValueIteratorTypeGuard<T, S>): S|undefined;
+        (predicate: lodash.ValueIterateeCustom<T, boolean>): T|undefined;
+    }
+    type LodashFind2x1<T> = (collection: lodash.List<T> | object | null | undefined) => T|undefined;
+    type LodashFind3x1<T, S> = (collection: T | null | undefined) => S|undefined;
+    interface LodashFind3x2<T> {
+        <S extends T[keyof T]>(predicate: lodash.ValueIteratorTypeGuard<T[keyof T], S>): S|undefined;
+        (predicate: lodash.ValueIterateeCustom<T[keyof T], boolean>): T[keyof T]|undefined;
+    }
+    interface LodashFindFrom {
+        <T, S extends T>(predicate: lodash.ValueIteratorTypeGuard<T, S>): LodashFindFrom1x1<T, S>;
+        (predicate: lodash.__, fromIndex: number): LodashFindFrom1x2;
+        <T, S extends T>(predicate: lodash.ValueIteratorTypeGuard<T, S>, fromIndex: number): LodashFindFrom1x3<T, S>;
+        <T>(predicate: lodash.__, fromIndex: lodash.__, collection: lodash.List<T> | null | undefined): LodashFindFrom1x4<T>;
+        <T, S extends T>(predicate: lodash.ValueIteratorTypeGuard<T, S>, fromIndex: lodash.__, collection: lodash.List<T> | null | undefined): LodashFindFrom1x5<S>;
+        <T>(predicate: lodash.__, fromIndex: number, collection: lodash.List<T> | null | undefined): LodashFindFrom1x6<T>;
+        <T, S extends T>(predicate: lodash.ValueIteratorTypeGuard<T, S>, fromIndex: number, collection: lodash.List<T> | null | undefined): S|undefined;
+        <T>(predicate: lodash.ValueIterateeCustom<T, boolean>): LodashFindFrom2x1<T>;
+        <T>(predicate: lodash.ValueIterateeCustom<T, boolean>, fromIndex: number): LodashFindFrom2x3<T>;
+        <T>(predicate: lodash.ValueIterateeCustom<T, boolean>, fromIndex: lodash.__, collection: lodash.List<T> | null | undefined): LodashFindFrom2x5<T>;
+        <T>(predicate: lodash.ValueIterateeCustom<T, boolean>, fromIndex: number, collection: lodash.List<T> | null | undefined): T|undefined;
+        <T extends object, S extends T[keyof T]>(predicate: lodash.ValueIteratorTypeGuard<T[keyof T], S>): LodashFindFrom3x1<T, S>;
+        <T extends object, S extends T[keyof T]>(predicate: lodash.ValueIteratorTypeGuard<T[keyof T], S>, fromIndex: number): LodashFindFrom3x3<T, S>;
+        <T extends object>(predicate: lodash.__, fromIndex: lodash.__, collection: T | null | undefined): LodashFindFrom3x4<T>;
+        <T extends object, S extends T[keyof T]>(predicate: lodash.ValueIteratorTypeGuard<T[keyof T], S>, fromIndex: lodash.__, collection: T | null | undefined): LodashFindFrom3x5<S>;
+        <T extends object>(predicate: lodash.__, fromIndex: number, collection: T | null | undefined): LodashFindFrom3x6<T>;
+        <T extends object, S extends T[keyof T]>(predicate: lodash.ValueIteratorTypeGuard<T[keyof T], S>, fromIndex: number, collection: T | null | undefined): S|undefined;
+        <T extends object>(predicate: lodash.ValueIterateeCustom<T[keyof T], boolean>, fromIndex: lodash.__, collection: T | null | undefined): LodashFindFrom4x5<T>;
+        <T extends object>(predicate: lodash.ValueIterateeCustom<T[keyof T], boolean>, fromIndex: number, collection: T | null | undefined): T[keyof T]|undefined;
+    }
+    interface LodashFindFrom1x1<T, S> {
+        (fromIndex: number): LodashFindFrom1x3<T, S>;
+        (fromIndex: lodash.__, collection: lodash.List<T> | null | undefined): LodashFindFrom1x5<S>;
+        (fromIndex: number, collection: lodash.List<T> | null | undefined): S|undefined;
+    }
+    interface LodashFindFrom1x2 {
+        <T, S extends T>(predicate: lodash.ValueIteratorTypeGuard<T, S>): LodashFindFrom1x3<T, S>;
+        <T>(predicate: lodash.__, collection: lodash.List<T> | null | undefined): LodashFindFrom1x6<T>;
+        <T, S extends T>(predicate: lodash.ValueIteratorTypeGuard<T, S>, collection: lodash.List<T> | null | undefined): S|undefined;
+        <T>(predicate: lodash.ValueIterateeCustom<T, boolean>): LodashFindFrom2x3<T>;
+        <T>(predicate: lodash.ValueIterateeCustom<T, boolean>, collection: lodash.List<T> | null | undefined): T|undefined;
+        <T extends object, S extends T[keyof T]>(predicate: lodash.ValueIteratorTypeGuard<T[keyof T], S>): LodashFindFrom3x3<T, S>;
+        <T extends object>(predicate: lodash.__, collection: T | null | undefined): LodashFindFrom3x6<T>;
+        <T extends object, S extends T[keyof T]>(predicate: lodash.ValueIteratorTypeGuard<T[keyof T], S>, collection: T | null | undefined): S|undefined;
+        <T extends object>(predicate: lodash.ValueIterateeCustom<T[keyof T], boolean>, collection: T | null | undefined): T[keyof T]|undefined;
+    }
+    type LodashFindFrom1x3<T, S> = (collection: lodash.List<T> | null | undefined) => S|undefined;
+    interface LodashFindFrom1x4<T> {
+        <S extends T>(predicate: lodash.ValueIteratorTypeGuard<T, S>): LodashFindFrom1x5<S>;
+        (predicate: lodash.__, fromIndex: number): LodashFindFrom1x6<T>;
+        <S extends T>(predicate: lodash.ValueIteratorTypeGuard<T, S>, fromIndex: number): S|undefined;
+        (predicate: lodash.ValueIterateeCustom<T, boolean>): LodashFindFrom2x5<T>;
+        (predicate: lodash.ValueIterateeCustom<T, boolean>, fromIndex: number): T|undefined;
+    }
+    type LodashFindFrom1x5<S> = (fromIndex: number) => S|undefined;
+    interface LodashFindFrom1x6<T> {
+        <S extends T>(predicate: lodash.ValueIteratorTypeGuard<T, S>): S|undefined;
+        (predicate: lodash.ValueIterateeCustom<T, boolean>): T|undefined;
+    }
+    interface LodashFindFrom2x1<T> {
+        (fromIndex: number): LodashFindFrom2x3<T>;
+        (fromIndex: lodash.__, collection: lodash.List<T> | null | undefined): LodashFindFrom2x5<T>;
+        (fromIndex: number, collection: lodash.List<T> | object | null | undefined): T|undefined;
+        <T1 extends object>(fromIndex: lodash.__, collection: T1 | null | undefined): LodashFindFrom4x5<T>;
+    }
+    interface LodashFindFrom2x3<T> {
+        (collection: lodash.List<T> | null | undefined): T|undefined;
+        (collection: object | null | undefined): object|undefined;
+    }
+    type LodashFindFrom2x5<T> = (fromIndex: number) => T|undefined;
+    interface LodashFindFrom3x1<T, S> {
+        (fromIndex: number): LodashFindFrom3x3<T, S>;
+        (fromIndex: lodash.__, collection: T | null | undefined): LodashFindFrom3x5<S>;
+        (fromIndex: number, collection: T | null | undefined): S|undefined;
+    }
+    type LodashFindFrom3x3<T, S> = (collection: T | null | undefined) => S|undefined;
+    interface LodashFindFrom3x4<T> {
+        <S extends T[keyof T]>(predicate: lodash.ValueIteratorTypeGuard<T[keyof T], S>): LodashFindFrom3x5<S>;
+        (predicate: lodash.__, fromIndex: number): LodashFindFrom3x6<T>;
+        <S extends T[keyof T]>(predicate: lodash.ValueIteratorTypeGuard<T[keyof T], S>, fromIndex: number): S|undefined;
+        (predicate: lodash.ValueIterateeCustom<T[keyof T], boolean>): LodashFindFrom4x5<T>;
+        (predicate: lodash.ValueIterateeCustom<T[keyof T], boolean>, fromIndex: number): T[keyof T]|undefined;
+    }
+    type LodashFindFrom3x5<S> = (fromIndex: number) => S|undefined;
+    interface LodashFindFrom3x6<T> {
+        <S extends T[keyof T]>(predicate: lodash.ValueIteratorTypeGuard<T[keyof T], S>): S|undefined;
+        (predicate: lodash.ValueIterateeCustom<T[keyof T], boolean>): T[keyof T]|undefined;
+    }
+    type LodashFindFrom4x5<T> = (fromIndex: number) => T[keyof T]|undefined;
+    interface LodashFindIndex {
+        <T>(predicate: lodash.ValueIterateeCustom<T, boolean>): LodashFindIndex1x1<T>;
+        <T>(predicate: lodash.__, array: lodash.List<T> | null | undefined): LodashFindIndex1x2<T>;
+        <T>(predicate: lodash.ValueIterateeCustom<T, boolean>, array: lodash.List<T> | null | undefined): number;
+    }
+    type LodashFindIndex1x1<T> = (array: lodash.List<T> | null | undefined) => number;
+    type LodashFindIndex1x2<T> = (predicate: lodash.ValueIterateeCustom<T, boolean>) => number;
+    interface LodashFindIndexFrom {
+        <T>(predicate: lodash.ValueIterateeCustom<T, boolean>): LodashFindIndexFrom1x1<T>;
+        (predicate: lodash.__, fromIndex: number): LodashFindIndexFrom1x2;
+        <T>(predicate: lodash.ValueIterateeCustom<T, boolean>, fromIndex: number): LodashFindIndexFrom1x3<T>;
+        <T>(predicate: lodash.__, fromIndex: lodash.__, array: lodash.List<T> | null | undefined): LodashFindIndexFrom1x4<T>;
+        <T>(predicate: lodash.ValueIterateeCustom<T, boolean>, fromIndex: lodash.__, array: lodash.List<T> | null | undefined): LodashFindIndexFrom1x5;
+        <T>(predicate: lodash.__, fromIndex: number, array: lodash.List<T> | null | undefined): LodashFindIndexFrom1x6<T>;
+        <T>(predicate: lodash.ValueIterateeCustom<T, boolean>, fromIndex: number, array: lodash.List<T> | null | undefined): number;
+    }
+    interface LodashFindIndexFrom1x1<T> {
+        (fromIndex: number): LodashFindIndexFrom1x3<T>;
+        (fromIndex: lodash.__, array: lodash.List<T> | null | undefined): LodashFindIndexFrom1x5;
+        (fromIndex: number, array: lodash.List<T> | null | undefined): number;
+    }
+    interface LodashFindIndexFrom1x2 {
+        <T>(predicate: lodash.ValueIterateeCustom<T, boolean>): LodashFindIndexFrom1x3<T>;
+        <T>(predicate: lodash.__, array: lodash.List<T> | null | undefined): LodashFindIndexFrom1x6<T>;
+        <T>(predicate: lodash.ValueIterateeCustom<T, boolean>, array: lodash.List<T> | null | undefined): number;
+    }
+    type LodashFindIndexFrom1x3<T> = (array: lodash.List<T> | null | undefined) => number;
+    interface LodashFindIndexFrom1x4<T> {
+        (predicate: lodash.ValueIterateeCustom<T, boolean>): LodashFindIndexFrom1x5;
+        (predicate: lodash.__, fromIndex: number): LodashFindIndexFrom1x6<T>;
+        (predicate: lodash.ValueIterateeCustom<T, boolean>, fromIndex: number): number;
+    }
+    type LodashFindIndexFrom1x5 = (fromIndex: number) => number;
+    type LodashFindIndexFrom1x6<T> = (predicate: lodash.ValueIterateeCustom<T, boolean>) => number;
+    interface LodashFindKey {
+        <T>(predicate: lodash.ValueIteratee<T>): LodashFindKey1x1<T>;
+        <T>(predicate: lodash.__, object: T | null | undefined): LodashFindKey1x2<T>;
+        <T>(predicate: lodash.ValueIteratee<T[keyof T]>, object: T | null | undefined): string | undefined;
+    }
+    type LodashFindKey1x1<T> = (object: object | null | undefined) => string | undefined;
+    type LodashFindKey1x2<T> = (predicate: lodash.ValueIteratee<T[keyof T]>) => string | undefined;
+    interface LodashFindLast {
+        <T, S extends T>(predicate: lodash.ValueIteratorTypeGuard<T, S>): LodashFindLast1x1<T, S>;
+        <T>(predicate: lodash.__, collection: lodash.List<T> | null | undefined): LodashFindLast1x2<T>;
+        <T, S extends T>(predicate: lodash.ValueIteratorTypeGuard<T, S>, collection: lodash.List<T> | null | undefined): S|undefined;
+        <T>(predicate: lodash.ValueIterateeCustom<T, boolean>): LodashFindLast2x1<T>;
+        <T>(predicate: lodash.ValueIterateeCustom<T, boolean>, collection: lodash.List<T> | null | undefined): T|undefined;
+        <T extends object, S extends T[keyof T]>(predicate: lodash.ValueIteratorTypeGuard<T[keyof T], S>): LodashFindLast3x1<T, S>;
+        <T extends object>(predicate: lodash.__, collection: T | null | undefined): LodashFindLast3x2<T>;
+        <T extends object, S extends T[keyof T]>(predicate: lodash.ValueIteratorTypeGuard<T[keyof T], S>, collection: T | null | undefined): S|undefined;
+        <T extends object>(predicate: lodash.ValueIterateeCustom<T[keyof T], boolean>, collection: T | null | undefined): T[keyof T]|undefined;
+    }
+    type LodashFindLast1x1<T, S> = (collection: lodash.List<T> | null | undefined) => S|undefined;
+    interface LodashFindLast1x2<T> {
+        <S extends T>(predicate: lodash.ValueIteratorTypeGuard<T, S>): S|undefined;
+        (predicate: lodash.ValueIterateeCustom<T, boolean>): T|undefined;
+    }
+    type LodashFindLast2x1<T> = (collection: lodash.List<T> | object | null | undefined) => T|undefined;
+    type LodashFindLast3x1<T, S> = (collection: T | null | undefined) => S|undefined;
+    interface LodashFindLast3x2<T> {
+        <S extends T[keyof T]>(predicate: lodash.ValueIteratorTypeGuard<T[keyof T], S>): S|undefined;
+        (predicate: lodash.ValueIterateeCustom<T[keyof T], boolean>): T[keyof T]|undefined;
+    }
+    interface LodashFindLastFrom {
+        <T, S extends T>(predicate: lodash.ValueIteratorTypeGuard<T, S>): LodashFindLastFrom1x1<T, S>;
+        (predicate: lodash.__, fromIndex: number): LodashFindLastFrom1x2;
+        <T, S extends T>(predicate: lodash.ValueIteratorTypeGuard<T, S>, fromIndex: number): LodashFindLastFrom1x3<T, S>;
+        <T>(predicate: lodash.__, fromIndex: lodash.__, collection: lodash.List<T> | null | undefined): LodashFindLastFrom1x4<T>;
+        <T, S extends T>(predicate: lodash.ValueIteratorTypeGuard<T, S>, fromIndex: lodash.__, collection: lodash.List<T> | null | undefined): LodashFindLastFrom1x5<S>;
+        <T>(predicate: lodash.__, fromIndex: number, collection: lodash.List<T> | null | undefined): LodashFindLastFrom1x6<T>;
+        <T, S extends T>(predicate: lodash.ValueIteratorTypeGuard<T, S>, fromIndex: number, collection: lodash.List<T> | null | undefined): S|undefined;
+        <T>(predicate: lodash.ValueIterateeCustom<T, boolean>): LodashFindLastFrom2x1<T>;
+        <T>(predicate: lodash.ValueIterateeCustom<T, boolean>, fromIndex: number): LodashFindLastFrom2x3<T>;
+        <T>(predicate: lodash.ValueIterateeCustom<T, boolean>, fromIndex: lodash.__, collection: lodash.List<T> | null | undefined): LodashFindLastFrom2x5<T>;
+        <T>(predicate: lodash.ValueIterateeCustom<T, boolean>, fromIndex: number, collection: lodash.List<T> | null | undefined): T|undefined;
+        <T extends object, S extends T[keyof T]>(predicate: lodash.ValueIteratorTypeGuard<T[keyof T], S>): LodashFindLastFrom3x1<T, S>;
+        <T extends object, S extends T[keyof T]>(predicate: lodash.ValueIteratorTypeGuard<T[keyof T], S>, fromIndex: number): LodashFindLastFrom3x3<T, S>;
+        <T extends object>(predicate: lodash.__, fromIndex: lodash.__, collection: T | null | undefined): LodashFindLastFrom3x4<T>;
+        <T extends object, S extends T[keyof T]>(predicate: lodash.ValueIteratorTypeGuard<T[keyof T], S>, fromIndex: lodash.__, collection: T | null | undefined): LodashFindLastFrom3x5<S>;
+        <T extends object>(predicate: lodash.__, fromIndex: number, collection: T | null | undefined): LodashFindLastFrom3x6<T>;
+        <T extends object, S extends T[keyof T]>(predicate: lodash.ValueIteratorTypeGuard<T[keyof T], S>, fromIndex: number, collection: T | null | undefined): S|undefined;
+        <T extends object>(predicate: lodash.ValueIterateeCustom<T[keyof T], boolean>, fromIndex: lodash.__, collection: T | null | undefined): LodashFindLastFrom4x5<T>;
+        <T extends object>(predicate: lodash.ValueIterateeCustom<T[keyof T], boolean>, fromIndex: number, collection: T | null | undefined): T[keyof T]|undefined;
+    }
+    interface LodashFindLastFrom1x1<T, S> {
+        (fromIndex: number): LodashFindLastFrom1x3<T, S>;
+        (fromIndex: lodash.__, collection: lodash.List<T> | null | undefined): LodashFindLastFrom1x5<S>;
+        (fromIndex: number, collection: lodash.List<T> | null | undefined): S|undefined;
+    }
+    interface LodashFindLastFrom1x2 {
+        <T, S extends T>(predicate: lodash.ValueIteratorTypeGuard<T, S>): LodashFindLastFrom1x3<T, S>;
+        <T>(predicate: lodash.__, collection: lodash.List<T> | null | undefined): LodashFindLastFrom1x6<T>;
+        <T, S extends T>(predicate: lodash.ValueIteratorTypeGuard<T, S>, collection: lodash.List<T> | null | undefined): S|undefined;
+        <T>(predicate: lodash.ValueIterateeCustom<T, boolean>): LodashFindLastFrom2x3<T>;
+        <T>(predicate: lodash.ValueIterateeCustom<T, boolean>, collection: lodash.List<T> | null | undefined): T|undefined;
+        <T extends object, S extends T[keyof T]>(predicate: lodash.ValueIteratorTypeGuard<T[keyof T], S>): LodashFindLastFrom3x3<T, S>;
+        <T extends object>(predicate: lodash.__, collection: T | null | undefined): LodashFindLastFrom3x6<T>;
+        <T extends object, S extends T[keyof T]>(predicate: lodash.ValueIteratorTypeGuard<T[keyof T], S>, collection: T | null | undefined): S|undefined;
+        <T extends object>(predicate: lodash.ValueIterateeCustom<T[keyof T], boolean>, collection: T | null | undefined): T[keyof T]|undefined;
+    }
+    type LodashFindLastFrom1x3<T, S> = (collection: lodash.List<T> | null | undefined) => S|undefined;
+    interface LodashFindLastFrom1x4<T> {
+        <S extends T>(predicate: lodash.ValueIteratorTypeGuard<T, S>): LodashFindLastFrom1x5<S>;
+        (predicate: lodash.__, fromIndex: number): LodashFindLastFrom1x6<T>;
+        <S extends T>(predicate: lodash.ValueIteratorTypeGuard<T, S>, fromIndex: number): S|undefined;
+        (predicate: lodash.ValueIterateeCustom<T, boolean>): LodashFindLastFrom2x5<T>;
+        (predicate: lodash.ValueIterateeCustom<T, boolean>, fromIndex: number): T|undefined;
+    }
+    type LodashFindLastFrom1x5<S> = (fromIndex: number) => S|undefined;
+    interface LodashFindLastFrom1x6<T> {
+        <S extends T>(predicate: lodash.ValueIteratorTypeGuard<T, S>): S|undefined;
+        (predicate: lodash.ValueIterateeCustom<T, boolean>): T|undefined;
+    }
+    interface LodashFindLastFrom2x1<T> {
+        (fromIndex: number): LodashFindLastFrom2x3<T>;
+        (fromIndex: lodash.__, collection: lodash.List<T> | null | undefined): LodashFindLastFrom2x5<T>;
+        (fromIndex: number, collection: lodash.List<T> | object | null | undefined): T|undefined;
+        <T1 extends object>(fromIndex: lodash.__, collection: T1 | null | undefined): LodashFindLastFrom4x5<T>;
+    }
+    interface LodashFindLastFrom2x3<T> {
+        (collection: lodash.List<T> | null | undefined): T|undefined;
+        (collection: object | null | undefined): object|undefined;
+    }
+    type LodashFindLastFrom2x5<T> = (fromIndex: number) => T|undefined;
+    interface LodashFindLastFrom3x1<T, S> {
+        (fromIndex: number): LodashFindLastFrom3x3<T, S>;
+        (fromIndex: lodash.__, collection: T | null | undefined): LodashFindLastFrom3x5<S>;
+        (fromIndex: number, collection: T | null | undefined): S|undefined;
+    }
+    type LodashFindLastFrom3x3<T, S> = (collection: T | null | undefined) => S|undefined;
+    interface LodashFindLastFrom3x4<T> {
+        <S extends T[keyof T]>(predicate: lodash.ValueIteratorTypeGuard<T[keyof T], S>): LodashFindLastFrom3x5<S>;
+        (predicate: lodash.__, fromIndex: number): LodashFindLastFrom3x6<T>;
+        <S extends T[keyof T]>(predicate: lodash.ValueIteratorTypeGuard<T[keyof T], S>, fromIndex: number): S|undefined;
+        (predicate: lodash.ValueIterateeCustom<T[keyof T], boolean>): LodashFindLastFrom4x5<T>;
+        (predicate: lodash.ValueIterateeCustom<T[keyof T], boolean>, fromIndex: number): T[keyof T]|undefined;
+    }
+    type LodashFindLastFrom3x5<S> = (fromIndex: number) => S|undefined;
+    interface LodashFindLastFrom3x6<T> {
+        <S extends T[keyof T]>(predicate: lodash.ValueIteratorTypeGuard<T[keyof T], S>): S|undefined;
+        (predicate: lodash.ValueIterateeCustom<T[keyof T], boolean>): T[keyof T]|undefined;
+    }
+    type LodashFindLastFrom4x5<T> = (fromIndex: number) => T[keyof T]|undefined;
+    interface LodashFindLastIndex {
+        <T>(predicate: lodash.ValueIterateeCustom<T, boolean>): LodashFindLastIndex1x1<T>;
+        <T>(predicate: lodash.__, array: lodash.List<T> | null | undefined): LodashFindLastIndex1x2<T>;
+        <T>(predicate: lodash.ValueIterateeCustom<T, boolean>, array: lodash.List<T> | null | undefined): number;
+    }
+    type LodashFindLastIndex1x1<T> = (array: lodash.List<T> | null | undefined) => number;
+    type LodashFindLastIndex1x2<T> = (predicate: lodash.ValueIterateeCustom<T, boolean>) => number;
+    interface LodashFindLastIndexFrom {
+        <T>(predicate: lodash.ValueIterateeCustom<T, boolean>): LodashFindLastIndexFrom1x1<T>;
+        (predicate: lodash.__, fromIndex: number): LodashFindLastIndexFrom1x2;
+        <T>(predicate: lodash.ValueIterateeCustom<T, boolean>, fromIndex: number): LodashFindLastIndexFrom1x3<T>;
+        <T>(predicate: lodash.__, fromIndex: lodash.__, array: lodash.List<T> | null | undefined): LodashFindLastIndexFrom1x4<T>;
+        <T>(predicate: lodash.ValueIterateeCustom<T, boolean>, fromIndex: lodash.__, array: lodash.List<T> | null | undefined): LodashFindLastIndexFrom1x5;
+        <T>(predicate: lodash.__, fromIndex: number, array: lodash.List<T> | null | undefined): LodashFindLastIndexFrom1x6<T>;
+        <T>(predicate: lodash.ValueIterateeCustom<T, boolean>, fromIndex: number, array: lodash.List<T> | null | undefined): number;
+    }
+    interface LodashFindLastIndexFrom1x1<T> {
+        (fromIndex: number): LodashFindLastIndexFrom1x3<T>;
+        (fromIndex: lodash.__, array: lodash.List<T> | null | undefined): LodashFindLastIndexFrom1x5;
+        (fromIndex: number, array: lodash.List<T> | null | undefined): number;
+    }
+    interface LodashFindLastIndexFrom1x2 {
+        <T>(predicate: lodash.ValueIterateeCustom<T, boolean>): LodashFindLastIndexFrom1x3<T>;
+        <T>(predicate: lodash.__, array: lodash.List<T> | null | undefined): LodashFindLastIndexFrom1x6<T>;
+        <T>(predicate: lodash.ValueIterateeCustom<T, boolean>, array: lodash.List<T> | null | undefined): number;
+    }
+    type LodashFindLastIndexFrom1x3<T> = (array: lodash.List<T> | null | undefined) => number;
+    interface LodashFindLastIndexFrom1x4<T> {
+        (predicate: lodash.ValueIterateeCustom<T, boolean>): LodashFindLastIndexFrom1x5;
+        (predicate: lodash.__, fromIndex: number): LodashFindLastIndexFrom1x6<T>;
+        (predicate: lodash.ValueIterateeCustom<T, boolean>, fromIndex: number): number;
+    }
+    type LodashFindLastIndexFrom1x5 = (fromIndex: number) => number;
+    type LodashFindLastIndexFrom1x6<T> = (predicate: lodash.ValueIterateeCustom<T, boolean>) => number;
+    interface LodashFindLastKey {
+        <T>(predicate: lodash.ValueIteratee<T>): LodashFindLastKey1x1<T>;
+        <T>(predicate: lodash.__, object: T | null | undefined): LodashFindLastKey1x2<T>;
+        <T>(predicate: lodash.ValueIteratee<T[keyof T]>, object: T | null | undefined): string | undefined;
+    }
+    type LodashFindLastKey1x1<T> = (object: object | null | undefined) => string | undefined;
+    type LodashFindLastKey1x2<T> = (predicate: lodash.ValueIteratee<T[keyof T]>) => string | undefined;
+    type LodashHead = <T>(array: lodash.List<T> | null | undefined) => T | undefined;
+    interface LodashFlatMap {
+        <T, TResult>(iteratee: (value: T) => lodash.Many<TResult>): LodashFlatMap1x1<T, TResult>;
+        <T>(iteratee: lodash.__, collection: lodash.List<T> | null | undefined): LodashFlatMap1x2<T>;
+        <T, TResult>(iteratee: (value: T) => lodash.Many<TResult>, collection: lodash.List<T> | null | undefined): TResult[];
+        <T extends object, TResult>(iteratee: (value: T[keyof T]) => lodash.Many<TResult>): LodashFlatMap2x1<T, TResult>;
+        <T extends object>(iteratee: lodash.__, collection: T | null | undefined): LodashFlatMap2x2<T>;
+        <T extends object, TResult>(iteratee: (value: T[keyof T]) => lodash.Many<TResult>, collection: T | null | undefined): TResult[];
+        (iteratee: string): LodashFlatMap3x1;
+        (iteratee: lodash.__, collection: object | null | undefined): LodashFlatMap3x2;
+        (iteratee: string, collection: object | null | undefined): any[];
+        (iteratee: object): LodashFlatMap4x1;
+        (iteratee: object, collection: object | null | undefined): boolean[];
+    }
+    type LodashFlatMap1x1<T, TResult> = (collection: lodash.List<T> | null | undefined) => TResult[];
+    type LodashFlatMap1x2<T> = <TResult>(iteratee: (value: T) => lodash.Many<TResult>) => TResult[];
+    type LodashFlatMap2x1<T, TResult> = (collection: T | null | undefined) => TResult[];
+    type LodashFlatMap2x2<T> = <TResult>(iteratee: (value: T[keyof T]) => lodash.Many<TResult>) => TResult[];
+    type LodashFlatMap3x1 = (collection: object | null | undefined) => any[];
+    interface LodashFlatMap3x2 {
+        (iteratee: string): any[];
+        (iteratee: object): boolean[];
+    }
+    type LodashFlatMap4x1 = (collection: object | null | undefined) => boolean[];
+    interface LodashFlatMapDeep {
+        <T, TResult>(iteratee: (value: T) => lodash.ListOfRecursiveArraysOrValues<TResult> | TResult): LodashFlatMapDeep1x1<T, TResult>;
+        <T>(iteratee: lodash.__, collection: lodash.List<T> | null | undefined): LodashFlatMapDeep1x2<T>;
+        <T, TResult>(iteratee: (value: T) => lodash.ListOfRecursiveArraysOrValues<TResult> | TResult, collection: lodash.List<T> | null | undefined): TResult[];
+        <T extends object, TResult>(iteratee: (value: T[keyof T]) => lodash.ListOfRecursiveArraysOrValues<TResult> | TResult): LodashFlatMapDeep2x1<T, TResult>;
+        <T extends object>(iteratee: lodash.__, collection: T | null | undefined): LodashFlatMapDeep2x2<T>;
+        <T extends object, TResult>(iteratee: (value: T[keyof T]) => lodash.ListOfRecursiveArraysOrValues<TResult> | TResult, collection: T | null | undefined): TResult[];
+        (iteratee: string): LodashFlatMapDeep3x1;
+        (iteratee: lodash.__, collection: object | null | undefined): LodashFlatMapDeep3x2;
+        (iteratee: string, collection: object | null | undefined): any[];
+        (iteratee: object): LodashFlatMapDeep4x1;
+        (iteratee: object, collection: object | null | undefined): boolean[];
+    }
+    type LodashFlatMapDeep1x1<T, TResult> = (collection: lodash.List<T> | null | undefined) => TResult[];
+    type LodashFlatMapDeep1x2<T> = <TResult>(iteratee: (value: T) => lodash.ListOfRecursiveArraysOrValues<TResult> | TResult) => TResult[];
+    type LodashFlatMapDeep2x1<T, TResult> = (collection: T | null | undefined) => TResult[];
+    type LodashFlatMapDeep2x2<T> = <TResult>(iteratee: (value: T[keyof T]) => lodash.ListOfRecursiveArraysOrValues<TResult> | TResult) => TResult[];
+    type LodashFlatMapDeep3x1 = (collection: object | null | undefined) => any[];
+    interface LodashFlatMapDeep3x2 {
+        (iteratee: string): any[];
+        (iteratee: object): boolean[];
+    }
+    type LodashFlatMapDeep4x1 = (collection: object | null | undefined) => boolean[];
+    interface LodashFlatMapDepth {
+        <T, TResult>(iteratee: (value: T) => lodash.ListOfRecursiveArraysOrValues<TResult> | TResult): LodashFlatMapDepth1x1<T, TResult>;
+        (iteratee: lodash.__, depth: number): LodashFlatMapDepth1x2;
+        <T, TResult>(iteratee: (value: T) => lodash.ListOfRecursiveArraysOrValues<TResult> | TResult, depth: number): LodashFlatMapDepth1x3<T, TResult>;
+        <T>(iteratee: lodash.__, depth: lodash.__, collection: lodash.List<T> | null | undefined): LodashFlatMapDepth1x4<T>;
+        <T, TResult>(iteratee: (value: T) => lodash.ListOfRecursiveArraysOrValues<TResult> | TResult, depth: lodash.__, collection: lodash.List<T> | null | undefined): LodashFlatMapDepth1x5<TResult>;
+        <T>(iteratee: lodash.__, depth: number, collection: lodash.List<T> | null | undefined): LodashFlatMapDepth1x6<T>;
+        <T, TResult>(iteratee: (value: T) => lodash.ListOfRecursiveArraysOrValues<TResult> | TResult, depth: number, collection: lodash.List<T> | null | undefined): TResult[];
+        <T extends object, TResult>(iteratee: (value: T[keyof T]) => lodash.ListOfRecursiveArraysOrValues<TResult> | TResult): LodashFlatMapDepth2x1<T, TResult>;
+        <T extends object, TResult>(iteratee: (value: T[keyof T]) => lodash.ListOfRecursiveArraysOrValues<TResult> | TResult, depth: number): LodashFlatMapDepth2x3<T, TResult>;
+        <T extends object>(iteratee: lodash.__, depth: lodash.__, collection: T | null | undefined): LodashFlatMapDepth2x4<T>;
+        <T extends object, TResult>(iteratee: (value: T[keyof T]) => lodash.ListOfRecursiveArraysOrValues<TResult> | TResult, depth: lodash.__, collection: T | null | undefined): LodashFlatMapDepth2x5<TResult>;
+        <T extends object>(iteratee: lodash.__, depth: number, collection: T | null | undefined): LodashFlatMapDepth2x6<T>;
+        <T extends object, TResult>(iteratee: (value: T[keyof T]) => lodash.ListOfRecursiveArraysOrValues<TResult> | TResult, depth: number, collection: T | null | undefined): TResult[];
+        (iteratee: string): LodashFlatMapDepth3x1;
+        (iteratee: string, depth: number): LodashFlatMapDepth3x3;
+        (iteratee: lodash.__, depth: lodash.__, collection: object | null | undefined): LodashFlatMapDepth3x4;
+        (iteratee: string, depth: lodash.__, collection: object | null | undefined): LodashFlatMapDepth3x5;
+        (iteratee: lodash.__, depth: number, collection: object | null | undefined): LodashFlatMapDepth3x6;
+        (iteratee: string, depth: number, collection: object | null | undefined): any[];
+        (iteratee: object): LodashFlatMapDepth4x1;
+        (iteratee: object, depth: number): LodashFlatMapDepth4x3;
+        (iteratee: object, depth: lodash.__, collection: object | null | undefined): LodashFlatMapDepth4x5;
+        (iteratee: object, depth: number, collection: object | null | undefined): boolean[];
+    }
+    interface LodashFlatMapDepth1x1<T, TResult> {
+        (depth: number): LodashFlatMapDepth1x3<T, TResult>;
+        (depth: lodash.__, collection: lodash.List<T> | null | undefined): LodashFlatMapDepth1x5<TResult>;
+        (depth: number, collection: lodash.List<T> | null | undefined): TResult[];
+    }
+    interface LodashFlatMapDepth1x2 {
+        <T, TResult>(iteratee: (value: T) => lodash.ListOfRecursiveArraysOrValues<TResult> | TResult): LodashFlatMapDepth1x3<T, TResult>;
+        <T>(iteratee: lodash.__, collection: lodash.List<T> | null | undefined): LodashFlatMapDepth1x6<T>;
+        <T, TResult>(iteratee: (value: T) => lodash.ListOfRecursiveArraysOrValues<TResult> | TResult, collection: lodash.List<T> | null | undefined): TResult[];
+        <T extends object, TResult>(iteratee: (value: T[keyof T]) => lodash.ListOfRecursiveArraysOrValues<TResult> | TResult): LodashFlatMapDepth2x3<T, TResult>;
+        <T extends object>(iteratee: lodash.__, collection: T | null | undefined): LodashFlatMapDepth2x6<T>;
+        <T extends object, TResult>(iteratee: (value: T[keyof T]) => lodash.ListOfRecursiveArraysOrValues<TResult> | TResult, collection: T | null | undefined): TResult[];
+        (iteratee: string): LodashFlatMapDepth3x3;
+        (iteratee: lodash.__, collection: object | null | undefined): LodashFlatMapDepth3x6;
+        (iteratee: string, collection: object | null | undefined): any[];
+        (iteratee: object): LodashFlatMapDepth4x3;
+        (iteratee: object, collection: object | null | undefined): boolean[];
+    }
+    type LodashFlatMapDepth1x3<T, TResult> = (collection: lodash.List<T> | null | undefined) => TResult[];
+    interface LodashFlatMapDepth1x4<T> {
+        <TResult>(iteratee: (value: T) => lodash.ListOfRecursiveArraysOrValues<TResult> | TResult): LodashFlatMapDepth1x5<TResult>;
+        (iteratee: lodash.__, depth: number): LodashFlatMapDepth1x6<T>;
+        <TResult>(iteratee: (value: T) => lodash.ListOfRecursiveArraysOrValues<TResult> | TResult, depth: number): TResult[];
+    }
+    type LodashFlatMapDepth1x5<TResult> = (depth: number) => TResult[];
+    type LodashFlatMapDepth1x6<T> = <TResult>(iteratee: (value: T) => lodash.ListOfRecursiveArraysOrValues<TResult> | TResult) => TResult[];
+    interface LodashFlatMapDepth2x1<T, TResult> {
+        (depth: number): LodashFlatMapDepth2x3<T, TResult>;
+        (depth: lodash.__, collection: T | null | undefined): LodashFlatMapDepth2x5<TResult>;
+        (depth: number, collection: T | null | undefined): TResult[];
+    }
+    type LodashFlatMapDepth2x3<T, TResult> = (collection: T | null | undefined) => TResult[];
+    interface LodashFlatMapDepth2x4<T> {
+        <TResult>(iteratee: (value: T[keyof T]) => lodash.ListOfRecursiveArraysOrValues<TResult> | TResult): LodashFlatMapDepth2x5<TResult>;
+        (iteratee: lodash.__, depth: number): LodashFlatMapDepth2x6<T>;
+        <TResult>(iteratee: (value: T[keyof T]) => lodash.ListOfRecursiveArraysOrValues<TResult> | TResult, depth: number): TResult[];
+    }
+    type LodashFlatMapDepth2x5<TResult> = (depth: number) => TResult[];
+    type LodashFlatMapDepth2x6<T> = <TResult>(iteratee: (value: T[keyof T]) => lodash.ListOfRecursiveArraysOrValues<TResult> | TResult) => TResult[];
+    interface LodashFlatMapDepth3x1 {
+        (depth: number): LodashFlatMapDepth3x3;
+        (depth: lodash.__, collection: object | null | undefined): LodashFlatMapDepth3x5;
+        (depth: number, collection: object | null | undefined): any[];
+    }
+    type LodashFlatMapDepth3x3 = (collection: object | null | undefined) => any[];
+    interface LodashFlatMapDepth3x4 {
+        (iteratee: string): LodashFlatMapDepth3x5;
+        (iteratee: lodash.__, depth: number): LodashFlatMapDepth3x6;
+        (iteratee: string, depth: number): any[];
+        (iteratee: object): LodashFlatMapDepth4x5;
+        (iteratee: object, depth: number): boolean[];
+    }
+    type LodashFlatMapDepth3x5 = (depth: number) => any[];
+    interface LodashFlatMapDepth3x6 {
+        (iteratee: string): any[];
+        (iteratee: object): boolean[];
+    }
+    interface LodashFlatMapDepth4x1 {
+        (depth: number): LodashFlatMapDepth4x3;
+        (depth: lodash.__, collection: object | null | undefined): LodashFlatMapDepth4x5;
+        (depth: number, collection: object | null | undefined): boolean[];
+    }
+    type LodashFlatMapDepth4x3 = (collection: object | null | undefined) => boolean[];
+    type LodashFlatMapDepth4x5 = (depth: number) => boolean[];
+    type LodashFlatten = <T>(array: lodash.List<lodash.Many<T>> | null | undefined) => T[];
+    type LodashFlattenDeep = <T>(array: lodash.ListOfRecursiveArraysOrValues<T> | null | undefined) => T[];
+    interface LodashFlattenDepth {
+        (depth: number): LodashFlattenDepth1x1;
+        <T>(depth: lodash.__, array: lodash.ListOfRecursiveArraysOrValues<T> | null | undefined): LodashFlattenDepth1x2<T>;
+        <T>(depth: number, array: lodash.ListOfRecursiveArraysOrValues<T> | null | undefined): T[];
+    }
+    type LodashFlattenDepth1x1 = <T>(array: lodash.ListOfRecursiveArraysOrValues<T> | null | undefined) => T[];
+    type LodashFlattenDepth1x2<T> = (depth: number) => T[];
+    type LodashFlip = <T extends (...args: any[]) => any>(func: T) => T;
+    type LodashFloor = (n: number) => number;
+    interface LodashFlow {
+        <R1, R2>(f1: () => R1, f2: (a: R1) => R2): () => R2;
+        <R1, R2, R3>(f1: () => R1, f2: (a: R1) => R2, f3: (a: R2) => R3): () => R3;
+        <R1, R2, R3, R4>(f1: () => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): () => R4;
+        <R1, R2, R3, R4, R5>(f1: () => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): () => R5;
+        <R1, R2, R3, R4, R5, R6>(f1: () => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): () => R6;
+        <R1, R2, R3, R4, R5, R6, R7>(f1: () => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): () => R7;
+        <R1, R2, R3, R4, R5, R6, R7>(f1: () => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<lodash.Many<(a: any) => any>>): () => any;
+        <A1, R1, R2>(f1: (a1: A1) => R1, f2: (a: R1) => R2): (a1: A1) => R2;
+        <A1, R1, R2, R3>(f1: (a1: A1) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3): (a1: A1) => R3;
+        <A1, R1, R2, R3, R4>(f1: (a1: A1) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): (a1: A1) => R4;
+        <A1, R1, R2, R3, R4, R5>(f1: (a1: A1) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): (a1: A1) => R5;
+        <A1, R1, R2, R3, R4, R5, R6>(f1: (a1: A1) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): (a1: A1) => R6;
+        <A1, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): (a1: A1) => R7;
+        <A1, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<lodash.Many<(a: any) => any>>): (a1: A1) => any;
+        <A1, A2, R1, R2>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2): (a1: A1, a2: A2) => R2;
+        <A1, A2, R1, R2, R3>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3): (a1: A1, a2: A2) => R3;
+        <A1, A2, R1, R2, R3, R4>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): (a1: A1, a2: A2) => R4;
+        <A1, A2, R1, R2, R3, R4, R5>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): (a1: A1, a2: A2) => R5;
+        <A1, A2, R1, R2, R3, R4, R5, R6>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): (a1: A1, a2: A2) => R6;
+        <A1, A2, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): (a1: A1, a2: A2) => R7;
+        <A1, A2, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<lodash.Many<(a: any) => any>>): (a1: A1, a2: A2) => any;
+        <A1, A2, A3, R1, R2>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2): (a1: A1, a2: A2, a3: A3) => R2;
+        <A1, A2, A3, R1, R2, R3>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3): (a1: A1, a2: A2, a3: A3) => R3;
+        <A1, A2, A3, R1, R2, R3, R4>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): (a1: A1, a2: A2, a3: A3) => R4;
+        <A1, A2, A3, R1, R2, R3, R4, R5>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): (a1: A1, a2: A2, a3: A3) => R5;
+        <A1, A2, A3, R1, R2, R3, R4, R5, R6>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): (a1: A1, a2: A2, a3: A3) => R6;
+        <A1, A2, A3, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): (a1: A1, a2: A2, a3: A3) => R7;
+        <A1, A2, A3, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<lodash.Many<(a: any) => any>>): (a1: A1, a2: A2, a3: A3) => any;
+        <A1, A2, A3, A4, R1, R2>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2): (a1: A1, a2: A2, a3: A3, a4: A4) => R2;
+        <A1, A2, A3, A4, R1, R2, R3>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3): (a1: A1, a2: A2, a3: A3, a4: A4) => R3;
+        <A1, A2, A3, A4, R1, R2, R3, R4>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): (a1: A1, a2: A2, a3: A3, a4: A4) => R4;
+        <A1, A2, A3, A4, R1, R2, R3, R4, R5>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): (a1: A1, a2: A2, a3: A3, a4: A4) => R5;
+        <A1, A2, A3, A4, R1, R2, R3, R4, R5, R6>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): (a1: A1, a2: A2, a3: A3, a4: A4) => R6;
+        <A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): (a1: A1, a2: A2, a3: A3, a4: A4) => R7;
+        <A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<lodash.Many<(a: any) => any>>): (a1: A1, a2: A2, a3: A3, a4: A4) => any;
+        <A1, A2, A3, A4, R1, R2>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R2;
+        <A1, A2, A3, A4, R1, R2, R3>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R3;
+        <A1, A2, A3, A4, R1, R2, R3, R4>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R4;
+        <A1, A2, A3, A4, R1, R2, R3, R4, R5>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R5;
+        <A1, A2, A3, A4, R1, R2, R3, R4, R5, R6>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R6;
+        <A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R7;
+        <A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<lodash.Many<(a: any) => any>>): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => any;
+        (funcs: Array<lodash.Many<(...args: any[]) => any>>): (...args: any[]) => any;
+    }
+    interface LodashForIn {
+        <T>(iteratee: (value: T) => any): LodashForIn1x1<T>;
+        <T>(iteratee: lodash.__, object: T): LodashForIn1x2<T>;
+        <T>(iteratee: (value: T[keyof T]) => any, object: T): T;
+        <T>(iteratee: lodash.__, object: T | null | undefined): LodashForIn2x2<T>;
+        <T>(iteratee: (value: T[keyof T]) => any, object: T | null | undefined): T | null | undefined;
+    }
+    interface LodashForIn1x1<T> {
+        <T1 extends object>(object: T1): T1;
+        <T1 extends object>(object: T1 | null | undefined): T1 | null | undefined;
+    }
+    type LodashForIn1x2<T> = (iteratee: (value: T[keyof T]) => any) => T;
+    type LodashForIn2x2<T> = (iteratee: (value: T[keyof T]) => any) => T | null | undefined;
+    interface LodashForInRight {
+        <T>(iteratee: (value: T) => any): LodashForInRight1x1<T>;
+        <T>(iteratee: lodash.__, object: T): LodashForInRight1x2<T>;
+        <T>(iteratee: (value: T[keyof T]) => any, object: T): T;
+        <T>(iteratee: lodash.__, object: T | null | undefined): LodashForInRight2x2<T>;
+        <T>(iteratee: (value: T[keyof T]) => any, object: T | null | undefined): T | null | undefined;
+    }
+    interface LodashForInRight1x1<T> {
+        <T1 extends object>(object: T1): T1;
+        <T1 extends object>(object: T1 | null | undefined): T1 | null | undefined;
+    }
+    type LodashForInRight1x2<T> = (iteratee: (value: T[keyof T]) => any) => T;
+    type LodashForInRight2x2<T> = (iteratee: (value: T[keyof T]) => any) => T | null | undefined;
+    interface LodashForOwn {
+        <T>(iteratee: (value: T) => any): LodashForOwn1x1<T>;
+        <T>(iteratee: lodash.__, object: T): LodashForOwn1x2<T>;
+        <T>(iteratee: (value: T[keyof T]) => any, object: T): T;
+        <T>(iteratee: lodash.__, object: T | null | undefined): LodashForOwn2x2<T>;
+        <T>(iteratee: (value: T[keyof T]) => any, object: T | null | undefined): T | null | undefined;
+    }
+    interface LodashForOwn1x1<T> {
+        <T1 extends object>(object: T1): T1;
+        <T1 extends object>(object: T1 | null | undefined): T1 | null | undefined;
+    }
+    type LodashForOwn1x2<T> = (iteratee: (value: T[keyof T]) => any) => T;
+    type LodashForOwn2x2<T> = (iteratee: (value: T[keyof T]) => any) => T | null | undefined;
+    interface LodashForOwnRight {
+        <T>(iteratee: (value: T) => any): LodashForOwnRight1x1<T>;
+        <T>(iteratee: lodash.__, object: T): LodashForOwnRight1x2<T>;
+        <T>(iteratee: (value: T[keyof T]) => any, object: T): T;
+        <T>(iteratee: lodash.__, object: T | null | undefined): LodashForOwnRight2x2<T>;
+        <T>(iteratee: (value: T[keyof T]) => any, object: T | null | undefined): T | null | undefined;
+    }
+    interface LodashForOwnRight1x1<T> {
+        <T1 extends object>(object: T1): T1;
+        <T1 extends object>(object: T1 | null | undefined): T1 | null | undefined;
+    }
+    type LodashForOwnRight1x2<T> = (iteratee: (value: T[keyof T]) => any) => T;
+    type LodashForOwnRight2x2<T> = (iteratee: (value: T[keyof T]) => any) => T | null | undefined;
+    interface LodashFromPairs {
+        <T>(pairs: lodash.List<[lodash.PropertyName, T]> | null | undefined): lodash.Dictionary<T>;
+        (pairs: lodash.List<any[]> | null | undefined): lodash.Dictionary<any>;
+    }
+    type LodashFunctions = (object: any) => string[];
+    type LodashFunctionsIn = (object: any) => string[];
+    interface LodashGet {
+        <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey]): LodashGet1x1<TObject, TKey>;
+        <TObject extends object>(path: lodash.__, object: TObject): LodashGet1x2<TObject>;
+        <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey], object: TObject): TObject[TKey];
+        <TObject extends object>(path: lodash.__, object: TObject | null | undefined): LodashGet2x2<TObject>;
+        <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey], object: TObject | null | undefined): TObject[TKey] | undefined;
+        (path: number): LodashGet3x1;
+        <T>(path: lodash.__, object: lodash.NumericDictionary<T>): LodashGet3x2<T>;
+        <T>(path: number, object: lodash.NumericDictionary<T>): T;
+        <T>(path: lodash.__, object: lodash.NumericDictionary<T> | null | undefined): LodashGet4x2<T>;
+        <T>(path: number, object: lodash.NumericDictionary<T> | null | undefined): T | undefined;
+        (path: lodash.PropertyPath): LodashGet5x1;
+        (path: lodash.__, object: null | undefined): LodashGet5x2;
+        (path: lodash.PropertyPath, object: null | undefined): undefined;
+        (path: lodash.__, object: any): LodashGet6x2;
+        (path: lodash.PropertyPath, object: any): any;
+    }
+    interface LodashGet1x1<TObject, TKey extends keyof TObject> {
+        (object: TObject): TObject[TKey];
+        (object: TObject | null | undefined): TObject[TKey] | undefined;
+    }
+    type LodashGet1x2<TObject> = <TKey extends keyof TObject>(path: TKey | [TKey]) => TObject[TKey];
+    type LodashGet2x2<TObject> = <TKey extends keyof TObject>(path: TKey | [TKey]) => TObject[TKey] | undefined;
+    interface LodashGet3x1 {
+        <T>(object: lodash.NumericDictionary<T>): T;
+        <T>(object: lodash.NumericDictionary<T> | null | undefined): T | undefined;
+    }
+    type LodashGet3x2<T> = (path: number) => T;
+    type LodashGet4x2<T> = (path: number) => T | undefined;
+    interface LodashGet5x1 {
+        (object: null | undefined): undefined;
+        (object: any): any;
+    }
+    type LodashGet5x2 = (path: lodash.PropertyPath) => undefined;
+    type LodashGet6x2 = (path: lodash.PropertyPath) => any;
+    interface LodashGetOr {
+        <TDefault>(defaultValue: TDefault): LodashGetOr1x1<TDefault>;
+        <TObject extends object, TKey extends keyof TObject>(defaultValue: lodash.__, path: TKey | [TKey]): LodashGetOr1x2<TObject, TKey>;
+        <TObject extends object, TKey extends keyof TObject, TDefault>(defaultValue: TDefault, path: TKey | [TKey]): LodashGetOr1x3<TObject, TKey, TDefault>;
+        <TObject extends object>(defaultValue: lodash.__, path: lodash.__, object: TObject | null | undefined): LodashGetOr1x4<TObject>;
+        <TObject extends object, TDefault>(defaultValue: TDefault, path: lodash.__, object: TObject | null | undefined): LodashGetOr1x5<TObject, TDefault>;
+        <TObject extends object, TKey extends keyof TObject>(defaultValue: lodash.__, path: TKey | [TKey], object: TObject | null | undefined): LodashGetOr1x6<TObject, TKey>;
+        <TObject extends object, TKey extends keyof TObject, TDefault>(defaultValue: TDefault, path: TKey | [TKey], object: TObject | null | undefined): TObject[TKey] | TDefault;
+        (defaultValue: lodash.__, path: number): LodashGetOr2x2;
+        <TDefault>(defaultValue: TDefault, path: number): LodashGetOr2x3<TDefault>;
+        <T>(defaultValue: lodash.__, path: lodash.__, object: lodash.NumericDictionary<T> | null | undefined): LodashGetOr2x4<T>;
+        <T, TDefault>(defaultValue: TDefault, path: lodash.__, object: lodash.NumericDictionary<T> | null | undefined): LodashGetOr2x5<T, TDefault>;
+        <T>(defaultValue: lodash.__, path: number, object: lodash.NumericDictionary<T> | null | undefined): LodashGetOr2x6<T>;
+        <T, TDefault>(defaultValue: TDefault, path: number, object: lodash.NumericDictionary<T> | null | undefined): T | TDefault;
+        (defaultValue: lodash.__, path: lodash.PropertyPath): LodashGetOr3x2;
+        <TDefault>(defaultValue: TDefault, path: lodash.PropertyPath): LodashGetOr3x3<TDefault>;
+        (defaultValue: lodash.__, path: lodash.__, object: null | undefined): LodashGetOr3x4;
+        <TDefault>(defaultValue: TDefault, path: lodash.__, object: null | undefined): LodashGetOr3x5<TDefault>;
+        (defaultValue: lodash.__, path: lodash.PropertyPath, object: null | undefined): LodashGetOr3x6;
+        <TDefault>(defaultValue: TDefault, path: lodash.PropertyPath, object: null | undefined): TDefault;
+        (defaultValue: any): LodashGetOr4x1;
+        (defaultValue: any, path: lodash.PropertyPath): LodashGetOr4x3;
+        (defaultValue: lodash.__, path: lodash.__, object: any): LodashGetOr4x4;
+        (defaultValue: any, path: lodash.__, object: any): LodashGetOr4x5;
+        (defaultValue: lodash.__, path: lodash.PropertyPath, object: any): LodashGetOr4x6;
+        (defaultValue: any, path: lodash.PropertyPath, object: any): any;
+    }
+    interface LodashGetOr1x1<TDefault> {
+        <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey]): LodashGetOr1x3<TObject, TKey, TDefault>;
+        <TObject extends object>(path: lodash.__, object: TObject | null | undefined): LodashGetOr1x5<TObject, TDefault>;
+        <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey], object: TObject | null | undefined): TObject[TKey] | TDefault;
+        (path: number): LodashGetOr2x3<TDefault>;
+        <T>(path: lodash.__, object: lodash.NumericDictionary<T> | null | undefined): LodashGetOr2x5<T, TDefault>;
+        <T>(path: number, object: lodash.NumericDictionary<T> | null | undefined): T | TDefault;
+        (path: lodash.PropertyPath): LodashGetOr3x3<TDefault>;
+        (path: lodash.__, object: null | undefined): LodashGetOr3x5<TDefault>;
+        (path: lodash.PropertyPath, object: null | undefined): TDefault;
+    }
+    interface LodashGetOr1x2<TObject, TKey extends keyof TObject> {
+        <TDefault>(defaultValue: TDefault): LodashGetOr1x3<TObject, TKey, TDefault>;
+        (defaultValue: lodash.__, object: TObject | null | undefined): LodashGetOr1x6<TObject, TKey>;
+        <TDefault>(defaultValue: TDefault, object: TObject | null | undefined): TObject[TKey] | TDefault;
+    }
+    type LodashGetOr1x3<TObject, TKey extends keyof TObject, TDefault> = (object: TObject | null | undefined) => TObject[TKey] | TDefault;
+    interface LodashGetOr1x4<TObject> {
+        <TDefault>(defaultValue: TDefault): LodashGetOr1x5<TObject, TDefault>;
+        <TKey extends keyof TObject>(defaultValue: lodash.__, path: TKey | [TKey]): LodashGetOr1x6<TObject, TKey>;
+        <TKey extends keyof TObject, TDefault>(defaultValue: TDefault, path: TKey | [TKey]): TObject[TKey] | TDefault;
+    }
+    type LodashGetOr1x5<TObject, TDefault> = <TKey extends keyof TObject>(path: TKey | [TKey]) => TObject[TKey] | TDefault;
+    type LodashGetOr1x6<TObject, TKey extends keyof TObject> = <TDefault>(defaultValue: TDefault) => TObject[TKey] | TDefault;
+    interface LodashGetOr2x2 {
+        <TDefault>(defaultValue: TDefault): LodashGetOr2x3<TDefault>;
+        <T>(defaultValue: lodash.__, object: lodash.NumericDictionary<T> | null | undefined): LodashGetOr2x6<T>;
+        <T, TDefault>(defaultValue: TDefault, object: lodash.NumericDictionary<T> | null | undefined): T | TDefault;
+    }
+    type LodashGetOr2x3<TDefault> = <T>(object: lodash.NumericDictionary<T> | null | undefined) => T | TDefault;
+    interface LodashGetOr2x4<T> {
+        <TDefault>(defaultValue: TDefault): LodashGetOr2x5<T, TDefault>;
+        (defaultValue: lodash.__, path: number): LodashGetOr2x6<T>;
+        <TDefault>(defaultValue: TDefault, path: number): T | TDefault;
+    }
+    type LodashGetOr2x5<T, TDefault> = (path: number) => T | TDefault;
+    type LodashGetOr2x6<T> = <TDefault>(defaultValue: TDefault) => T | TDefault;
+    interface LodashGetOr3x2 {
+        <TDefault>(defaultValue: TDefault): LodashGetOr3x3<TDefault>;
+        (defaultValue: lodash.__, object: null | undefined): LodashGetOr3x6;
+        <TDefault>(defaultValue: TDefault, object: null | undefined): TDefault;
+        (defaultValue: any): LodashGetOr4x3;
+        (defaultValue: lodash.__, object: any): LodashGetOr4x6;
+        (defaultValue: any, object: any): any;
+    }
+    type LodashGetOr3x3<TDefault> = (object: null | undefined) => TDefault;
+    interface LodashGetOr3x4 {
+        <TDefault>(defaultValue: TDefault): LodashGetOr3x5<TDefault>;
+        (defaultValue: lodash.__, path: lodash.PropertyPath): LodashGetOr3x6;
+        <TDefault>(defaultValue: TDefault, path: lodash.PropertyPath): TDefault;
+    }
+    type LodashGetOr3x5<TDefault> = (path: lodash.PropertyPath) => TDefault;
+    type LodashGetOr3x6 = <TDefault>(defaultValue: TDefault) => TDefault;
+    interface LodashGetOr4x1 {
+        (path: lodash.PropertyPath): LodashGetOr4x3;
+        (path: lodash.__, object: any): LodashGetOr4x5;
+        (path: lodash.PropertyPath, object: any): any;
+    }
+    type LodashGetOr4x3 = (object: any) => any;
+    interface LodashGetOr4x4 {
+        (defaultValue: any): LodashGetOr4x5;
+        (defaultValue: lodash.__, path: lodash.PropertyPath): LodashGetOr4x6;
+        (defaultValue: any, path: lodash.PropertyPath): any;
+    }
+    type LodashGetOr4x5 = (path: lodash.PropertyPath) => any;
+    type LodashGetOr4x6 = (defaultValue: any) => any;
+    interface LodashGroupBy {
+        (iteratee: (value: string) => lodash.NotVoid): LodashGroupBy1x1;
+        (iteratee: lodash.__, collection: string | null | undefined): LodashGroupBy1x2;
+        (iteratee: (value: string) => lodash.NotVoid, collection: string | null | undefined): lodash.Dictionary<string[]>;
+        <T>(iteratee: lodash.ValueIteratee<T>): LodashGroupBy2x1<T>;
+        <T>(iteratee: lodash.__, collection: lodash.List<T> | null | undefined): LodashGroupBy2x2<T>;
+        <T>(iteratee: lodash.ValueIteratee<T>, collection: lodash.List<T> | null | undefined): lodash.Dictionary<T[]>;
+        <T extends object>(iteratee: lodash.__, collection: T | null | undefined): LodashGroupBy3x2<T>;
+        <T extends object>(iteratee: lodash.ValueIteratee<T[keyof T]>, collection: T | null | undefined): lodash.Dictionary<Array<T[keyof T]>>;
+    }
+    type LodashGroupBy1x1 = (collection: string | null | undefined) => lodash.Dictionary<string[]>;
+    type LodashGroupBy1x2 = (iteratee: (value: string) => lodash.NotVoid) => lodash.Dictionary<string[]>;
+    type LodashGroupBy2x1<T> = (collection: lodash.List<T> | object | null | undefined) => lodash.Dictionary<T[]>;
+    type LodashGroupBy2x2<T> = (iteratee: lodash.ValueIteratee<T>) => lodash.Dictionary<T[]>;
+    type LodashGroupBy3x2<T> = (iteratee: lodash.ValueIteratee<T[keyof T]>) => lodash.Dictionary<Array<T[keyof T]>>;
+    interface LodashGt {
+        (value: any): LodashGt1x1;
+        (value: lodash.__, other: any): LodashGt1x2;
+        (value: any, other: any): boolean;
+    }
+    type LodashGt1x1 = (other: any) => boolean;
+    type LodashGt1x2 = (value: any) => boolean;
+    interface LodashGte {
+        (value: any): LodashGte1x1;
+        (value: lodash.__, other: any): LodashGte1x2;
+        (value: any, other: any): boolean;
+    }
+    type LodashGte1x1 = (other: any) => boolean;
+    type LodashGte1x2 = (value: any) => boolean;
+    interface LodashHas {
+        (path: lodash.PropertyPath): LodashHas1x1;
+        <T>(path: lodash.__, object: T): LodashHas1x2;
+        <T>(path: lodash.PropertyPath, object: T): boolean;
+    }
+    type LodashHas1x1 = <T>(object: T) => boolean;
+    type LodashHas1x2 = (path: lodash.PropertyPath) => boolean;
+    interface LodashHasIn {
+        (path: lodash.PropertyPath): LodashHasIn1x1;
+        <T>(path: lodash.__, object: T): LodashHasIn1x2;
+        <T>(path: lodash.PropertyPath, object: T): boolean;
+    }
+    type LodashHasIn1x1 = <T>(object: T) => boolean;
+    type LodashHasIn1x2 = (path: lodash.PropertyPath) => boolean;
+    interface LodashIdentity {
+        <T>(value: T): T;
+        (): undefined;
+    }
+    interface LodashIncludes {
+        <T>(target: T): LodashIncludes1x1<T>;
+        <T>(target: lodash.__, collection: lodash.List<T> | lodash.Dictionary<T> | lodash.NumericDictionary<T> | null | undefined): LodashIncludes1x2<T>;
+        <T>(target: T, collection: lodash.List<T> | lodash.Dictionary<T> | lodash.NumericDictionary<T> | null | undefined): boolean;
+    }
+    type LodashIncludes1x1<T> = (collection: lodash.List<T> | lodash.Dictionary<T> | lodash.NumericDictionary<T> | null | undefined) => boolean;
+    type LodashIncludes1x2<T> = (target: T) => boolean;
+    interface LodashIncludesFrom {
+        <T>(target: T): LodashIncludesFrom1x1<T>;
+        (target: lodash.__, fromIndex: number): LodashIncludesFrom1x2;
+        <T>(target: T, fromIndex: number): LodashIncludesFrom1x3<T>;
+        <T>(target: lodash.__, fromIndex: lodash.__, collection: lodash.List<T> | lodash.Dictionary<T> | lodash.NumericDictionary<T> | null | undefined): LodashIncludesFrom1x4<T>;
+        <T>(target: T, fromIndex: lodash.__, collection: lodash.List<T> | lodash.Dictionary<T> | lodash.NumericDictionary<T> | null | undefined): LodashIncludesFrom1x5;
+        <T>(target: lodash.__, fromIndex: number, collection: lodash.List<T> | lodash.Dictionary<T> | lodash.NumericDictionary<T> | null | undefined): LodashIncludesFrom1x6<T>;
+        <T>(target: T, fromIndex: number, collection: lodash.List<T> | lodash.Dictionary<T> | lodash.NumericDictionary<T> | null | undefined): boolean;
+    }
+    interface LodashIncludesFrom1x1<T> {
+        (fromIndex: number): LodashIncludesFrom1x3<T>;
+        (fromIndex: lodash.__, collection: lodash.List<T> | lodash.Dictionary<T> | lodash.NumericDictionary<T> | null | undefined): LodashIncludesFrom1x5;
+        (fromIndex: number, collection: lodash.List<T> | lodash.Dictionary<T> | lodash.NumericDictionary<T> | null | undefined): boolean;
+    }
+    interface LodashIncludesFrom1x2 {
+        <T>(target: T): LodashIncludesFrom1x3<T>;
+        <T>(target: lodash.__, collection: lodash.List<T> | lodash.Dictionary<T> | lodash.NumericDictionary<T> | null | undefined): LodashIncludesFrom1x6<T>;
+        <T>(target: T, collection: lodash.List<T> | lodash.Dictionary<T> | lodash.NumericDictionary<T> | null | undefined): boolean;
+    }
+    type LodashIncludesFrom1x3<T> = (collection: lodash.List<T> | lodash.Dictionary<T> | lodash.NumericDictionary<T> | null | undefined) => boolean;
+    interface LodashIncludesFrom1x4<T> {
+        (target: T): LodashIncludesFrom1x5;
+        (target: lodash.__, fromIndex: number): LodashIncludesFrom1x6<T>;
+        (target: T, fromIndex: number): boolean;
+    }
+    type LodashIncludesFrom1x5 = (fromIndex: number) => boolean;
+    type LodashIncludesFrom1x6<T> = (target: T) => boolean;
+    interface LodashKeyBy {
+        (iteratee: (value: string) => lodash.PropertyName): LodashKeyBy1x1;
+        (iteratee: lodash.__, collection: string | null | undefined): LodashKeyBy1x2;
+        (iteratee: (value: string) => lodash.PropertyName, collection: string | null | undefined): lodash.Dictionary<string>;
+        <T>(iteratee: lodash.ValueIterateeCustom<T, lodash.PropertyName>): LodashKeyBy2x1<T>;
+        <T>(iteratee: lodash.__, collection: lodash.List<T> | null | undefined): LodashKeyBy2x2<T>;
+        <T>(iteratee: lodash.ValueIterateeCustom<T, lodash.PropertyName>, collection: lodash.List<T> | null | undefined): lodash.Dictionary<T>;
+        <T extends object>(iteratee: lodash.__, collection: T | null | undefined): LodashKeyBy3x2<T>;
+        <T extends object>(iteratee: lodash.ValueIterateeCustom<T[keyof T], lodash.PropertyName>, collection: T | null | undefined): lodash.Dictionary<T[keyof T]>;
+    }
+    type LodashKeyBy1x1 = (collection: string | null | undefined) => lodash.Dictionary<string>;
+    type LodashKeyBy1x2 = (iteratee: (value: string) => lodash.PropertyName) => lodash.Dictionary<string>;
+    type LodashKeyBy2x1<T> = (collection: lodash.List<T> | object | null | undefined) => lodash.Dictionary<T>;
+    type LodashKeyBy2x2<T> = (iteratee: lodash.ValueIterateeCustom<T, lodash.PropertyName>) => lodash.Dictionary<T>;
+    type LodashKeyBy3x2<T> = (iteratee: lodash.ValueIterateeCustom<T[keyof T], lodash.PropertyName>) => lodash.Dictionary<T[keyof T]>;
+    interface LodashIndexOf {
+        <T>(value: T): LodashIndexOf1x1<T>;
+        <T>(value: lodash.__, array: lodash.List<T> | null | undefined): LodashIndexOf1x2<T>;
+        <T>(value: T, array: lodash.List<T> | null | undefined): number;
+    }
+    type LodashIndexOf1x1<T> = (array: lodash.List<T> | null | undefined) => number;
+    type LodashIndexOf1x2<T> = (value: T) => number;
+    interface LodashIndexOfFrom {
+        <T>(value: T): LodashIndexOfFrom1x1<T>;
+        (value: lodash.__, fromIndex: number): LodashIndexOfFrom1x2;
+        <T>(value: T, fromIndex: number): LodashIndexOfFrom1x3<T>;
+        <T>(value: lodash.__, fromIndex: lodash.__, array: lodash.List<T> | null | undefined): LodashIndexOfFrom1x4<T>;
+        <T>(value: T, fromIndex: lodash.__, array: lodash.List<T> | null | undefined): LodashIndexOfFrom1x5;
+        <T>(value: lodash.__, fromIndex: number, array: lodash.List<T> | null | undefined): LodashIndexOfFrom1x6<T>;
+        <T>(value: T, fromIndex: number, array: lodash.List<T> | null | undefined): number;
+    }
+    interface LodashIndexOfFrom1x1<T> {
+        (fromIndex: number): LodashIndexOfFrom1x3<T>;
+        (fromIndex: lodash.__, array: lodash.List<T> | null | undefined): LodashIndexOfFrom1x5;
+        (fromIndex: number, array: lodash.List<T> | null | undefined): number;
+    }
+    interface LodashIndexOfFrom1x2 {
+        <T>(value: T): LodashIndexOfFrom1x3<T>;
+        <T>(value: lodash.__, array: lodash.List<T> | null | undefined): LodashIndexOfFrom1x6<T>;
+        <T>(value: T, array: lodash.List<T> | null | undefined): number;
+    }
+    type LodashIndexOfFrom1x3<T> = (array: lodash.List<T> | null | undefined) => number;
+    interface LodashIndexOfFrom1x4<T> {
+        (value: T): LodashIndexOfFrom1x5;
+        (value: lodash.__, fromIndex: number): LodashIndexOfFrom1x6<T>;
+        (value: T, fromIndex: number): number;
+    }
+    type LodashIndexOfFrom1x5 = (fromIndex: number) => number;
+    type LodashIndexOfFrom1x6<T> = (value: T) => number;
+    type LodashInitial = <T>(array: lodash.List<T> | null | undefined) => T[];
+    interface LodashInRange {
+        (start: number): LodashInRange1x1;
+        (start: lodash.__, end: number): LodashInRange1x2;
+        (start: number, end: number): LodashInRange1x3;
+        (start: lodash.__, end: lodash.__, n: number): LodashInRange1x4;
+        (start: number, end: lodash.__, n: number): LodashInRange1x5;
+        (start: lodash.__, end: number, n: number): LodashInRange1x6;
+        (start: number, end: number, n: number): boolean;
+    }
+    interface LodashInRange1x1 {
+        (end: number): LodashInRange1x3;
+        (end: lodash.__, n: number): LodashInRange1x5;
+        (end: number, n: number): boolean;
+    }
+    interface LodashInRange1x2 {
+        (start: number): LodashInRange1x3;
+        (start: lodash.__, n: number): LodashInRange1x6;
+        (start: number, n: number): boolean;
+    }
+    type LodashInRange1x3 = (n: number) => boolean;
+    interface LodashInRange1x4 {
+        (start: number): LodashInRange1x5;
+        (start: lodash.__, end: number): LodashInRange1x6;
+        (start: number, end: number): boolean;
+    }
+    type LodashInRange1x5 = (end: number) => boolean;
+    type LodashInRange1x6 = (start: number) => boolean;
+    interface LodashIntersection {
+        <T>(arrays2: lodash.List<T>): LodashIntersection1x1<T>;
+        <T>(arrays2: lodash.__, arrays: lodash.List<T>): LodashIntersection1x2<T>;
+        <T>(arrays2: lodash.List<T>, arrays: lodash.List<T>): T[];
+    }
+    type LodashIntersection1x1<T> = (arrays: lodash.List<T>) => T[];
+    type LodashIntersection1x2<T> = (arrays2: lodash.List<T>) => T[];
+    interface LodashIntersectionBy {
+        <T1, T2>(iteratee: lodash.ValueIteratee<T1 | T2>): LodashIntersectionBy1x1<T1, T2>;
+        <T1>(iteratee: lodash.__, array: lodash.List<T1> | null): LodashIntersectionBy1x2<T1>;
+        <T1, T2>(iteratee: lodash.ValueIteratee<T1 | T2>, array: lodash.List<T1> | null): LodashIntersectionBy1x3<T1, T2>;
+        <T2>(iteratee: lodash.__, array: lodash.__, values: lodash.List<T2>): LodashIntersectionBy1x4<T2>;
+        <T1, T2>(iteratee: lodash.ValueIteratee<T1 | T2>, array: lodash.__, values: lodash.List<T2>): LodashIntersectionBy1x5<T1>;
+        <T1, T2>(iteratee: lodash.__, array: lodash.List<T1> | null, values: lodash.List<T2>): LodashIntersectionBy1x6<T1, T2>;
+        <T1, T2>(iteratee: lodash.ValueIteratee<T1 | T2>, array: lodash.List<T1> | null, values: lodash.List<T2>): T1[];
+    }
+    interface LodashIntersectionBy1x1<T1, T2> {
+        (array: lodash.List<T1> | null): LodashIntersectionBy1x3<T1, T2>;
+        (array: lodash.__, values: lodash.List<T2>): LodashIntersectionBy1x5<T1>;
+        (array: lodash.List<T1> | null, values: lodash.List<T2>): T1[];
+    }
+    interface LodashIntersectionBy1x2<T1> {
+        <T2>(iteratee: lodash.ValueIteratee<T1 | T2>): LodashIntersectionBy1x3<T1, T2>;
+        <T2>(iteratee: lodash.__, values: lodash.List<T2>): LodashIntersectionBy1x6<T1, T2>;
+        <T2>(iteratee: lodash.ValueIteratee<T1 | T2>, values: lodash.List<T2>): T1[];
+    }
+    type LodashIntersectionBy1x3<T1, T2> = (values: lodash.List<T2>) => T1[];
+    interface LodashIntersectionBy1x4<T2> {
+        <T1>(iteratee: lodash.ValueIteratee<T1 | T2>): LodashIntersectionBy1x5<T1>;
+        <T1>(iteratee: lodash.__, array: lodash.List<T1> | null): LodashIntersectionBy1x6<T1, T2>;
+        <T1>(iteratee: lodash.ValueIteratee<T1 | T2>, array: lodash.List<T1> | null): T1[];
+    }
+    type LodashIntersectionBy1x5<T1> = (array: lodash.List<T1> | null) => T1[];
+    type LodashIntersectionBy1x6<T1, T2> = (iteratee: lodash.ValueIteratee<T1 | T2>) => T1[];
+    interface LodashIntersectionWith {
+        <T1, T2>(comparator: lodash.Comparator2<T1, T2>): LodashIntersectionWith1x1<T1, T2>;
+        <T1>(comparator: lodash.__, array: lodash.List<T1> | null | undefined): LodashIntersectionWith1x2<T1>;
+        <T1, T2>(comparator: lodash.Comparator2<T1, T2>, array: lodash.List<T1> | null | undefined): LodashIntersectionWith1x3<T1, T2>;
+        <T2>(comparator: lodash.__, array: lodash.__, values: lodash.List<T2>): LodashIntersectionWith1x4<T2>;
+        <T1, T2>(comparator: lodash.Comparator2<T1, T2>, array: lodash.__, values: lodash.List<T2>): LodashIntersectionWith1x5<T1>;
+        <T1, T2>(comparator: lodash.__, array: lodash.List<T1> | null | undefined, values: lodash.List<T2>): LodashIntersectionWith1x6<T1, T2>;
+        <T1, T2>(comparator: lodash.Comparator2<T1, T2>, array: lodash.List<T1> | null | undefined, values: lodash.List<T2>): T1[];
+    }
+    interface LodashIntersectionWith1x1<T1, T2> {
+        (array: lodash.List<T1> | null | undefined): LodashIntersectionWith1x3<T1, T2>;
+        (array: lodash.__, values: lodash.List<T2>): LodashIntersectionWith1x5<T1>;
+        (array: lodash.List<T1> | null | undefined, values: lodash.List<T2>): T1[];
+    }
+    interface LodashIntersectionWith1x2<T1> {
+        <T2>(comparator: lodash.Comparator2<T1, T2>): LodashIntersectionWith1x3<T1, T2>;
+        <T2>(comparator: lodash.__, values: lodash.List<T2>): LodashIntersectionWith1x6<T1, T2>;
+        <T2>(comparator: lodash.Comparator2<T1, T2>, values: lodash.List<T2>): T1[];
+    }
+    type LodashIntersectionWith1x3<T1, T2> = (values: lodash.List<T2>) => T1[];
+    interface LodashIntersectionWith1x4<T2> {
+        <T1>(comparator: lodash.Comparator2<T1, T2>): LodashIntersectionWith1x5<T1>;
+        <T1>(comparator: lodash.__, array: lodash.List<T1> | null | undefined): LodashIntersectionWith1x6<T1, T2>;
+        <T1>(comparator: lodash.Comparator2<T1, T2>, array: lodash.List<T1> | null | undefined): T1[];
+    }
+    type LodashIntersectionWith1x5<T1> = (array: lodash.List<T1> | null | undefined) => T1[];
+    type LodashIntersectionWith1x6<T1, T2> = (comparator: lodash.Comparator2<T1, T2>) => T1[];
+    type LodashInvert = (object: object) => lodash.Dictionary<string>;
+    interface LodashInvertBy {
+        <T>(interatee: lodash.ValueIteratee<T>): LodashInvertBy1x1<T>;
+        <T>(interatee: lodash.__, object: lodash.List<T> | lodash.Dictionary<T> | lodash.NumericDictionary<T> | null | undefined): LodashInvertBy1x2<T>;
+        <T>(interatee: lodash.ValueIteratee<T>, object: lodash.List<T> | lodash.Dictionary<T> | lodash.NumericDictionary<T> | null | undefined): lodash.Dictionary<string[]>;
+        <T extends object>(interatee: lodash.__, object: T | null | undefined): LodashInvertBy2x2<T>;
+        <T extends object>(interatee: lodash.ValueIteratee<T[keyof T]>, object: T | null | undefined): lodash.Dictionary<string[]>;
+    }
+    type LodashInvertBy1x1<T> = (object: lodash.List<T> | lodash.Dictionary<T> | lodash.NumericDictionary<T> | object | null | undefined) => lodash.Dictionary<string[]>;
+    type LodashInvertBy1x2<T> = (interatee: lodash.ValueIteratee<T>) => lodash.Dictionary<string[]>;
+    type LodashInvertBy2x2<T> = (interatee: lodash.ValueIteratee<T[keyof T]>) => lodash.Dictionary<string[]>;
+    interface LodashInvoke {
+        (path: lodash.PropertyPath): LodashInvoke1x1;
+        (path: lodash.__, object: any): LodashInvoke1x2;
+        (path: lodash.PropertyPath, object: any): any;
+    }
+    type LodashInvoke1x1 = (object: any) => any;
+    type LodashInvoke1x2 = (path: lodash.PropertyPath) => any;
+    interface LodashInvokeArgs {
+        (path: lodash.PropertyPath): LodashInvokeArgs1x1;
+        (path: lodash.__, args: ReadonlyArray<any>): LodashInvokeArgs1x2;
+        (path: lodash.PropertyPath, args: ReadonlyArray<any>): LodashInvokeArgs1x3;
+        (path: lodash.__, args: lodash.__, object: any): LodashInvokeArgs1x4;
+        (path: lodash.PropertyPath, args: lodash.__, object: any): LodashInvokeArgs1x5;
+        (path: lodash.__, args: ReadonlyArray<any>, object: any): LodashInvokeArgs1x6;
+        (path: lodash.PropertyPath, args: ReadonlyArray<any>, object: any): any;
+    }
+    interface LodashInvokeArgs1x1 {
+        (args: ReadonlyArray<any>): LodashInvokeArgs1x3;
+        (args: lodash.__, object: any): LodashInvokeArgs1x5;
+        (args: ReadonlyArray<any>, object: any): any;
+    }
+    interface LodashInvokeArgs1x2 {
+        (path: lodash.PropertyPath): LodashInvokeArgs1x3;
+        (path: lodash.__, object: any): LodashInvokeArgs1x6;
+        (path: lodash.PropertyPath, object: any): any;
+    }
+    type LodashInvokeArgs1x3 = (object: any) => any;
+    interface LodashInvokeArgs1x4 {
+        (path: lodash.PropertyPath): LodashInvokeArgs1x5;
+        (path: lodash.__, args: ReadonlyArray<any>): LodashInvokeArgs1x6;
+        (path: lodash.PropertyPath, args: ReadonlyArray<any>): any;
+    }
+    type LodashInvokeArgs1x5 = (args: ReadonlyArray<any>) => any;
+    type LodashInvokeArgs1x6 = (path: lodash.PropertyPath) => any;
+    interface LodashInvokeArgsMap {
+        (methodName: string): LodashInvokeArgsMap1x1;
+        (methodNameOrMethod: lodash.__, args: ReadonlyArray<any>): LodashInvokeArgsMap1x2;
+        (methodName: string, args: ReadonlyArray<any>): LodashInvokeArgsMap1x3;
+        (methodNameOrMethod: lodash.__, args: lodash.__, collection: object | null | undefined): LodashInvokeArgsMap1x4;
+        (methodName: string, args: lodash.__, collection: object | null | undefined): LodashInvokeArgsMap1x5;
+        (methodNameOrMethod: lodash.__, args: ReadonlyArray<any>, collection: object | null | undefined): LodashInvokeArgsMap1x6;
+        (methodName: string, args: ReadonlyArray<any>, collection: object | null | undefined): any[];
+        <TResult>(method: (...args: any[]) => TResult): LodashInvokeArgsMap2x1<TResult>;
+        <TResult>(method: (...args: any[]) => TResult, args: ReadonlyArray<any>): LodashInvokeArgsMap2x3<TResult>;
+        <TResult>(method: (...args: any[]) => TResult, args: lodash.__, collection: object | null | undefined): LodashInvokeArgsMap2x5<TResult>;
+        <TResult>(method: (...args: any[]) => TResult, args: ReadonlyArray<any>, collection: object | null | undefined): TResult[];
+    }
+    interface LodashInvokeArgsMap1x1 {
+        (args: ReadonlyArray<any>): LodashInvokeArgsMap1x3;
+        (args: lodash.__, collection: object | null | undefined): LodashInvokeArgsMap1x5;
+        (args: ReadonlyArray<any>, collection: object | null | undefined): any[];
+    }
+    interface LodashInvokeArgsMap1x2 {
+        (methodName: string): LodashInvokeArgsMap1x3;
+        (methodNameOrMethod: lodash.__, collection: object | null | undefined): LodashInvokeArgsMap1x6;
+        (methodName: string, collection: object | null | undefined): any[];
+        <TResult>(method: (...args: any[]) => TResult): LodashInvokeArgsMap2x3<TResult>;
+        <TResult>(method: (...args: any[]) => TResult, collection: object | null | undefined): TResult[];
+    }
+    type LodashInvokeArgsMap1x3 = (collection: object | null | undefined) => any[];
+    interface LodashInvokeArgsMap1x4 {
+        (methodName: string): LodashInvokeArgsMap1x5;
+        (methodNameOrMethod: lodash.__, args: ReadonlyArray<any>): LodashInvokeArgsMap1x6;
+        (methodName: string, args: ReadonlyArray<any>): any[];
+        <TResult>(method: (...args: any[]) => TResult): LodashInvokeArgsMap2x5<TResult>;
+        <TResult>(method: (...args: any[]) => TResult, args: ReadonlyArray<any>): TResult[];
+    }
+    type LodashInvokeArgsMap1x5 = (args: ReadonlyArray<any>) => any[];
+    interface LodashInvokeArgsMap1x6 {
+        (methodName: string): any[];
+        <TResult>(method: (...args: any[]) => TResult): TResult[];
+    }
+    interface LodashInvokeArgsMap2x1<TResult> {
+        (args: ReadonlyArray<any>): LodashInvokeArgsMap2x3<TResult>;
+        (args: lodash.__, collection: object | null | undefined): LodashInvokeArgsMap2x5<TResult>;
+        (args: ReadonlyArray<any>, collection: object | null | undefined): TResult[];
+    }
+    type LodashInvokeArgsMap2x3<TResult> = (collection: object | null | undefined) => TResult[];
+    type LodashInvokeArgsMap2x5<TResult> = (args: ReadonlyArray<any>) => TResult[];
+    interface LodashInvokeMap {
+        (methodName: string): LodashInvokeMap1x1;
+        (methodNameOrMethod: lodash.__, collection: object | null | undefined): LodashInvokeMap1x2;
+        (methodName: string, collection: object | null | undefined): any[];
+        <TResult>(method: (...args: any[]) => TResult): LodashInvokeMap2x1<TResult>;
+        <TResult>(method: (...args: any[]) => TResult, collection: object | null | undefined): TResult[];
+    }
+    type LodashInvokeMap1x1 = (collection: object | null | undefined) => any[];
+    interface LodashInvokeMap1x2 {
+        (methodName: string): any[];
+        <TResult>(method: (...args: any[]) => TResult): TResult[];
+    }
+    type LodashInvokeMap2x1<TResult> = (collection: object | null | undefined) => TResult[];
+    type LodashIsArguments = (value: any) => value is IArguments;
+    type LodashIsArray = (value: any) => value is any[];
+    type LodashIsArrayBuffer = (value: any) => value is ArrayBuffer;
+    interface LodashIsArrayLike {
+        <T>(value: T & string & number): boolean;
+        (value: ((...args: any[]) => any) | null | undefined): value is never;
+        (value: any): value is { length: number };
+    }
+    interface LodashIsArrayLikeObject {
+        <T>(value: T & string & number): boolean;
+        // tslint:disable-next-line:ban-types (type guard doesn't seem to work correctly without the Function type)
+        (value: ((...args: any[]) => any) | Function | string | boolean | number | null | undefined): value is never;
+        // tslint:disable-next-line:ban-types (type guard doesn't seem to work correctly without the Function type)
+        <T extends object>(value: T | ((...args: any[]) => any) | Function | string | boolean | number | null | undefined): value is T & { length: number };
+    }
+    type LodashIsBoolean = (value: any) => value is boolean;
+    type LodashIsBuffer = (value: any) => boolean;
+    type LodashIsDate = (value: any) => value is Date;
+    type LodashIsElement = (value: any) => boolean;
+    type LodashIsEmpty = (value: any) => boolean;
+    interface LodashIsEqualWith {
+        (customizer: lodash.IsEqualCustomizer): LodashIsEqualWith1x1;
+        (customizer: lodash.__, value: any): LodashIsEqualWith1x2;
+        (customizer: lodash.IsEqualCustomizer, value: any): LodashIsEqualWith1x3;
+        (customizer: lodash.__, value: lodash.__, other: any): LodashIsEqualWith1x4;
+        (customizer: lodash.IsEqualCustomizer, value: lodash.__, other: any): LodashIsEqualWith1x5;
+        (customizer: lodash.__, value: any, other: any): LodashIsEqualWith1x6;
+        (customizer: lodash.IsEqualCustomizer, value: any, other: any): boolean;
+    }
+    interface LodashIsEqualWith1x1 {
+        (value: any): LodashIsEqualWith1x3;
+        (value: lodash.__, other: any): LodashIsEqualWith1x5;
+        (value: any, other: any): boolean;
+    }
+    interface LodashIsEqualWith1x2 {
+        (customizer: lodash.IsEqualCustomizer): LodashIsEqualWith1x3;
+        (customizer: lodash.__, other: any): LodashIsEqualWith1x6;
+        (customizer: lodash.IsEqualCustomizer, other: any): boolean;
+    }
+    type LodashIsEqualWith1x3 = (other: any) => boolean;
+    interface LodashIsEqualWith1x4 {
+        (customizer: lodash.IsEqualCustomizer): LodashIsEqualWith1x5;
+        (customizer: lodash.__, value: any): LodashIsEqualWith1x6;
+        (customizer: lodash.IsEqualCustomizer, value: any): boolean;
+    }
+    type LodashIsEqualWith1x5 = (value: any) => boolean;
+    type LodashIsEqualWith1x6 = (customizer: lodash.IsEqualCustomizer) => boolean;
+    type LodashIsError = (value: any) => value is Error;
+    type LodashIsFinite = (value: any) => boolean;
+    type LodashIsFunction = (value: any) => value is (...args: any[]) => any;
+    type LodashIsInteger = (value: any) => boolean;
+    type LodashIsLength = (value: any) => boolean;
+    type LodashIsMap = (value: any) => value is Map<any, any>;
+    interface LodashIsMatch {
+        (source: object): LodashIsMatch1x1;
+        (source: lodash.__, object: object): LodashIsMatch1x2;
+        (source: object, object: object): boolean;
+    }
+    type LodashIsMatch1x1 = (object: object) => boolean;
+    type LodashIsMatch1x2 = (source: object) => boolean;
+    interface LodashIsMatchWith {
+        (customizer: lodash.isMatchWithCustomizer): LodashIsMatchWith1x1;
+        (customizer: lodash.__, source: object): LodashIsMatchWith1x2;
+        (customizer: lodash.isMatchWithCustomizer, source: object): LodashIsMatchWith1x3;
+        (customizer: lodash.__, source: lodash.__, object: object): LodashIsMatchWith1x4;
+        (customizer: lodash.isMatchWithCustomizer, source: lodash.__, object: object): LodashIsMatchWith1x5;
+        (customizer: lodash.__, source: object, object: object): LodashIsMatchWith1x6;
+        (customizer: lodash.isMatchWithCustomizer, source: object, object: object): boolean;
+    }
+    interface LodashIsMatchWith1x1 {
+        (source: object): LodashIsMatchWith1x3;
+        (source: lodash.__, object: object): LodashIsMatchWith1x5;
+        (source: object, object: object): boolean;
+    }
+    interface LodashIsMatchWith1x2 {
+        (customizer: lodash.isMatchWithCustomizer): LodashIsMatchWith1x3;
+        (customizer: lodash.__, object: object): LodashIsMatchWith1x6;
+        (customizer: lodash.isMatchWithCustomizer, object: object): boolean;
+    }
+    type LodashIsMatchWith1x3 = (object: object) => boolean;
+    interface LodashIsMatchWith1x4 {
+        (customizer: lodash.isMatchWithCustomizer): LodashIsMatchWith1x5;
+        (customizer: lodash.__, source: object): LodashIsMatchWith1x6;
+        (customizer: lodash.isMatchWithCustomizer, source: object): boolean;
+    }
+    type LodashIsMatchWith1x5 = (source: object) => boolean;
+    type LodashIsMatchWith1x6 = (customizer: lodash.isMatchWithCustomizer) => boolean;
+    type LodashIsNaN = (value: any) => boolean;
+    type LodashIsNative = (value: any) => value is (...args: any[]) => any;
+    type LodashIsNil = (value: any) => value is null | undefined;
+    type LodashIsNull = (value: any) => value is null;
+    type LodashIsNumber = (value: any) => value is number;
+    type LodashIsObject = (value: any) => boolean;
+    type LodashIsObjectLike = (value: any) => boolean;
+    type LodashIsPlainObject = (value: any) => boolean;
+    type LodashIsRegExp = (value: any) => value is RegExp;
+    type LodashIsSafeInteger = (value: any) => boolean;
+    type LodashIsSet = (value: any) => value is Set<any>;
+    type LodashIsString = (value: any) => value is string;
+    type LodashIsSymbol = (value: any) => boolean;
+    type LodashIsTypedArray = (value: any) => boolean;
+    type LodashIsUndefined = (value: any) => value is undefined;
+    type LodashIsWeakMap = (value: any) => value is WeakMap<object, any>;
+    type LodashIsWeakSet = (value: any) => value is WeakSet<object>;
+    interface LodashIteratee {
+        <TFunction extends (...args: any[]) => any>(func: TFunction): TFunction;
+        (func: string | object): (...args: any[]) => any;
+    }
+    interface LodashJoin {
+        (separator: string): LodashJoin1x1;
+        (separator: lodash.__, array: lodash.List<any> | null | undefined): LodashJoin1x2;
+        (separator: string, array: lodash.List<any> | null | undefined): string;
+    }
+    type LodashJoin1x1 = (array: lodash.List<any> | null | undefined) => string;
+    type LodashJoin1x2 = (separator: string) => string;
+    type LodashOver = <TResult>(iteratees: lodash.Many<(...args: any[]) => TResult>) => (...args: any[]) => TResult[];
+    type LodashKebabCase = (string: string) => string;
+    type LodashKeys = (object: any) => string[];
+    type LodashKeysIn = (object: any) => string[];
+    type LodashLast = <T>(array: lodash.List<T> | null | undefined) => T | undefined;
+    interface LodashLastIndexOf {
+        <T>(value: T): LodashLastIndexOf1x1<T>;
+        <T>(value: lodash.__, array: lodash.List<T> | null | undefined): LodashLastIndexOf1x2<T>;
+        <T>(value: T, array: lodash.List<T> | null | undefined): number;
+    }
+    type LodashLastIndexOf1x1<T> = (array: lodash.List<T> | null | undefined) => number;
+    type LodashLastIndexOf1x2<T> = (value: T) => number;
+    interface LodashLastIndexOfFrom {
+        <T>(value: T): LodashLastIndexOfFrom1x1<T>;
+        (value: lodash.__, fromIndex: true|number): LodashLastIndexOfFrom1x2;
+        <T>(value: T, fromIndex: true|number): LodashLastIndexOfFrom1x3<T>;
+        <T>(value: lodash.__, fromIndex: lodash.__, array: lodash.List<T> | null | undefined): LodashLastIndexOfFrom1x4<T>;
+        <T>(value: T, fromIndex: lodash.__, array: lodash.List<T> | null | undefined): LodashLastIndexOfFrom1x5;
+        <T>(value: lodash.__, fromIndex: true|number, array: lodash.List<T> | null | undefined): LodashLastIndexOfFrom1x6<T>;
+        <T>(value: T, fromIndex: true|number, array: lodash.List<T> | null | undefined): number;
+    }
+    interface LodashLastIndexOfFrom1x1<T> {
+        (fromIndex: true|number): LodashLastIndexOfFrom1x3<T>;
+        (fromIndex: lodash.__, array: lodash.List<T> | null | undefined): LodashLastIndexOfFrom1x5;
+        (fromIndex: true|number, array: lodash.List<T> | null | undefined): number;
+    }
+    interface LodashLastIndexOfFrom1x2 {
+        <T>(value: T): LodashLastIndexOfFrom1x3<T>;
+        <T>(value: lodash.__, array: lodash.List<T> | null | undefined): LodashLastIndexOfFrom1x6<T>;
+        <T>(value: T, array: lodash.List<T> | null | undefined): number;
+    }
+    type LodashLastIndexOfFrom1x3<T> = (array: lodash.List<T> | null | undefined) => number;
+    interface LodashLastIndexOfFrom1x4<T> {
+        (value: T): LodashLastIndexOfFrom1x5;
+        (value: lodash.__, fromIndex: true|number): LodashLastIndexOfFrom1x6<T>;
+        (value: T, fromIndex: true|number): number;
+    }
+    type LodashLastIndexOfFrom1x5 = (fromIndex: true|number) => number;
+    type LodashLastIndexOfFrom1x6<T> = (value: T) => number;
+    type LodashLowerCase = (string: string) => string;
+    type LodashLowerFirst = (string: string) => string;
+    interface LodashLt {
+        (value: any): LodashLt1x1;
+        (value: lodash.__, other: any): LodashLt1x2;
+        (value: any, other: any): boolean;
+    }
+    type LodashLt1x1 = (other: any) => boolean;
+    type LodashLt1x2 = (value: any) => boolean;
+    interface LodashLte {
+        (value: any): LodashLte1x1;
+        (value: lodash.__, other: any): LodashLte1x2;
+        (value: any, other: any): boolean;
+    }
+    type LodashLte1x1 = (other: any) => boolean;
+    type LodashLte1x2 = (value: any) => boolean;
+    interface LodashMap {
+        <T, TResult>(iteratee: (value: T) => TResult): LodashMap1x1<T, TResult>;
+        <T>(iteratee: lodash.__, collection: T[] | null | undefined): LodashMap1x2<T>;
+        <T, TResult>(iteratee: (value: T) => TResult, collection: T[] | lodash.List<T> | null | undefined): TResult[];
+        <T>(iteratee: lodash.__, collection: lodash.List<T> | null | undefined): LodashMap2x2<T>;
+        <T extends object, TResult>(iteratee: (value: T[keyof T]) => TResult): LodashMap3x1<T, TResult>;
+        <T extends object>(iteratee: lodash.__, collection: T | null | undefined): LodashMap3x2<T>;
+        <T extends object, TResult>(iteratee: (value: T[keyof T]) => TResult, collection: T | null | undefined): TResult[];
+        <T, K extends keyof T>(iteratee: K): LodashMap4x1<T, K>;
+        <T>(iteratee: lodash.__, collection: lodash.List<T> | lodash.Dictionary<T> | lodash.NumericDictionary<T> | null | undefined): LodashMap4x2<T>;
+        <T, K extends keyof T>(iteratee: K, collection: lodash.List<T> | lodash.Dictionary<T> | lodash.NumericDictionary<T> | null | undefined): Array<T[K]>;
+        (iteratee: string): LodashMap5x1;
+        <T>(iteratee: string, collection: lodash.List<T> | lodash.Dictionary<T> | lodash.NumericDictionary<T> | null | undefined): any[];
+        (iteratee: object): LodashMap6x1;
+        <T>(iteratee: object, collection: lodash.List<T> | lodash.Dictionary<T> | lodash.NumericDictionary<T> | null | undefined): boolean[];
+    }
+    type LodashMap1x1<T, TResult> = (collection: T[] | lodash.List<T> | null | undefined) => TResult[];
+    type LodashMap1x2<T> = <TResult>(iteratee: (value: T) => TResult) => TResult[];
+    type LodashMap2x2<T> = <TResult>(iteratee: (value: T) => TResult) => TResult[];
+    type LodashMap3x1<T, TResult> = (collection: T | null | undefined) => TResult[];
+    type LodashMap3x2<T> = <TResult>(iteratee: (value: T[keyof T]) => TResult) => TResult[];
+    type LodashMap4x1<T, K extends keyof T> = (collection: lodash.List<T> | lodash.Dictionary<T> | lodash.NumericDictionary<T> | null | undefined) => Array<T[K]>;
+    interface LodashMap4x2<T> {
+        <K extends keyof T>(iteratee: K): Array<T[K]>;
+        (iteratee: string): any[];
+        (iteratee: object): boolean[];
+    }
+    type LodashMap5x1 = <T>(collection: lodash.List<T> | lodash.Dictionary<T> | lodash.NumericDictionary<T> | null | undefined) => any[];
+    type LodashMap6x1 = <T>(collection: lodash.List<T> | lodash.Dictionary<T> | lodash.NumericDictionary<T> | null | undefined) => boolean[];
+    interface LodashMapKeys {
+        (iteratee: lodash.ValueIteratee<number>): LodashMapKeys1x1;
+        <T>(iteratee: lodash.__, object: lodash.List<T> | null | undefined): LodashMapKeys1x2<T>;
+        <T>(iteratee: lodash.ValueIteratee<number>, object: lodash.List<T> | null | undefined): lodash.Dictionary<T>;
+        (iteratee: lodash.ValueIteratee<string>): LodashMapKeys2x1;
+        <T extends object>(iteratee: lodash.__, object: T | null | undefined): LodashMapKeys2x2<T>;
+        <T extends object>(iteratee: lodash.ValueIteratee<string>, object: T | null | undefined): lodash.Dictionary<T[keyof T]>;
+    }
+    type LodashMapKeys1x1 = <T>(object: lodash.List<T> | null | undefined) => lodash.Dictionary<T>;
+    type LodashMapKeys1x2<T> = (iteratee: lodash.ValueIteratee<number>) => lodash.Dictionary<T>;
+    type LodashMapKeys2x1 = <T extends object>(object: T | null | undefined) => lodash.Dictionary<T[keyof T]>;
+    type LodashMapKeys2x2<T> = (iteratee: lodash.ValueIteratee<string>) => lodash.Dictionary<T[keyof T]>;
+    interface LodashMapValues {
+        <TResult>(callback: (value: string) => TResult): LodashMapValues1x1<TResult>;
+        (callback: lodash.__, obj: string | null | undefined): LodashMapValues1x2;
+        <TResult>(callback: (value: string) => TResult, obj: string | null | undefined): lodash.NumericDictionary<TResult>;
+        <T, TResult>(callback: (value: T) => TResult): LodashMapValues2x1<T, TResult>;
+        <T>(callbackOrIterateeOrIterateeOrIteratee: lodash.__, obj: lodash.Dictionary<T> | lodash.NumericDictionary<T> | null | undefined): LodashMapValues2x2<T>;
+        <T, TResult>(callback: (value: T) => TResult, obj: lodash.Dictionary<T> | lodash.NumericDictionary<T> | null | undefined): lodash.Dictionary<TResult>;
+        <T extends object, TResult>(callback: (value: T[keyof T]) => TResult): LodashMapValues3x1<T, TResult>;
+        <T extends object>(callbackOrIterateeOrIteratee: lodash.__, obj: T | null | undefined): LodashMapValues3x2<T>;
+        <T extends object, TResult>(callback: (value: T[keyof T]) => TResult, obj: T | null | undefined): { [P in keyof T]: TResult };
+        (iteratee: object): LodashMapValues4x1;
+        <T>(iteratee: object, obj: lodash.Dictionary<T> | lodash.NumericDictionary<T> | null | undefined): lodash.Dictionary<boolean>;
+        <T extends object>(iteratee: object, obj: T | null | undefined): { [P in keyof T]: boolean };
+        <T, TKey extends keyof T>(iteratee: TKey): LodashMapValues6x1<T, TKey>;
+        <T, TKey extends keyof T>(iteratee: TKey, obj: lodash.Dictionary<T> | lodash.NumericDictionary<T> | null | undefined): lodash.Dictionary<T[TKey]>;
+        (iteratee: string): LodashMapValues7x1;
+        <T>(iteratee: string, obj: lodash.Dictionary<T> | lodash.NumericDictionary<T> | null | undefined): lodash.Dictionary<any>;
+        <T extends object>(iteratee: string, obj: T | null | undefined): { [P in keyof T]: any };
+    }
+    type LodashMapValues1x1<TResult> = (obj: string | null | undefined) => lodash.NumericDictionary<TResult>;
+    type LodashMapValues1x2 = <TResult>(callback: (value: string) => TResult) => lodash.NumericDictionary<TResult>;
+    type LodashMapValues2x1<T, TResult> = (obj: lodash.Dictionary<T> | lodash.NumericDictionary<T> | null | undefined) => lodash.Dictionary<TResult>;
+    interface LodashMapValues2x2<T> {
+        <TResult>(callback: (value: T) => TResult): lodash.Dictionary<TResult>;
+        (iteratee: object): lodash.Dictionary<boolean>;
+        <TKey extends keyof T>(iteratee: TKey): lodash.Dictionary<T[TKey]>;
+        (iteratee: string): lodash.Dictionary<any>;
+    }
+    type LodashMapValues3x1<T, TResult> = (obj: T | null | undefined) => { [P in keyof T]: TResult };
+    interface LodashMapValues3x2<T> {
+        <TResult>(callback: (value: T[keyof T]) => TResult): { [P in keyof T]: TResult };
+        (iteratee: object): { [P in keyof T]: boolean };
+        (iteratee: string): { [P in keyof T]: any };
+    }
+    interface LodashMapValues4x1 {
+        <T>(obj: lodash.Dictionary<T> | lodash.NumericDictionary<T> | null | undefined): lodash.Dictionary<boolean>;
+        <T extends object>(obj: T | null | undefined): { [P in keyof T]: boolean };
+    }
+    type LodashMapValues6x1<T, TKey extends keyof T> = (obj: lodash.Dictionary<T> | lodash.NumericDictionary<T> | null | undefined) => lodash.Dictionary<T[TKey]>;
+    interface LodashMapValues7x1 {
+        <T>(obj: lodash.Dictionary<T> | lodash.NumericDictionary<T> | null | undefined): lodash.Dictionary<any>;
+        <T extends object>(obj: T | null | undefined): { [P in keyof T]: any };
+    }
+    interface LodashMatchesProperty {
+        (path: lodash.PropertyPath): LodashMatchesProperty1x1;
+        <T>(path: lodash.__, srcValue: T): LodashMatchesProperty1x2;
+        <T>(path: lodash.PropertyPath, srcValue: T): (value: any) => boolean;
+    }
+    type LodashMatchesProperty1x1 = <T>(srcValue: T) => (value: any) => boolean;
+    type LodashMatchesProperty1x2 = (path: lodash.PropertyPath) => (value: any) => boolean;
+    type LodashMax = <T>(collection: lodash.List<T> | null | undefined) => T | undefined;
+    interface LodashMaxBy {
+        <T>(iteratee: lodash.ValueIteratee<T>): LodashMaxBy1x1<T>;
+        <T>(iteratee: lodash.__, collection: lodash.List<T> | null | undefined): LodashMaxBy1x2<T>;
+        <T>(iteratee: lodash.ValueIteratee<T>, collection: lodash.List<T> | null | undefined): T | undefined;
+    }
+    type LodashMaxBy1x1<T> = (collection: lodash.List<T> | null | undefined) => T | undefined;
+    type LodashMaxBy1x2<T> = (iteratee: lodash.ValueIteratee<T>) => T | undefined;
+    type LodashMean = (collection: lodash.List<any> | null | undefined) => number;
+    interface LodashMeanBy {
+        <T>(iteratee: lodash.ValueIteratee<T>): LodashMeanBy1x1<T>;
+        <T>(iteratee: lodash.__, collection: lodash.List<T> | null | undefined): LodashMeanBy1x2<T>;
+        <T>(iteratee: lodash.ValueIteratee<T>, collection: lodash.List<T> | null | undefined): number;
+    }
+    type LodashMeanBy1x1<T> = (collection: lodash.List<T> | null | undefined) => number;
+    type LodashMeanBy1x2<T> = (iteratee: lodash.ValueIteratee<T>) => number;
+    type LodashMemoize = <T extends (...args: any[]) => any>(func: T) => T & lodash.MemoizedFunction;
+    interface LodashMerge {
+        <TObject>(object: TObject): LodashMerge1x1<TObject>;
+        <TSource>(object: lodash.__, source: TSource): LodashMerge1x2<TSource>;
+        <TObject, TSource>(object: TObject, source: TSource): TObject & TSource;
+    }
+    type LodashMerge1x1<TObject> = <TSource>(source: TSource) => TObject & TSource;
+    type LodashMerge1x2<TSource> = <TObject>(object: TObject) => TObject & TSource;
+    type LodashMergeAll = (object: ReadonlyArray<any>) => any;
+    interface LodashMergeAllWith {
+        (customizer: lodash.MergeWithCustomizer): LodashMergeAllWith1x1;
+        (customizer: lodash.__, args: ReadonlyArray<any>): LodashMergeAllWith1x2;
+        (customizer: lodash.MergeWithCustomizer, args: ReadonlyArray<any>): any;
+    }
+    type LodashMergeAllWith1x1 = (args: ReadonlyArray<any>) => any;
+    type LodashMergeAllWith1x2 = (customizer: lodash.MergeWithCustomizer) => any;
+    interface LodashMergeWith {
+        (customizer: lodash.MergeWithCustomizer): LodashMergeWith1x1;
+        <TObject>(customizer: lodash.__, object: TObject): LodashMergeWith1x2<TObject>;
+        <TObject>(customizer: lodash.MergeWithCustomizer, object: TObject): LodashMergeWith1x3<TObject>;
+        <TSource>(customizer: lodash.__, object: lodash.__, source: TSource): LodashMergeWith1x4<TSource>;
+        <TSource>(customizer: lodash.MergeWithCustomizer, object: lodash.__, source: TSource): LodashMergeWith1x5<TSource>;
+        <TObject, TSource>(customizer: lodash.__, object: TObject, source: TSource): LodashMergeWith1x6<TObject, TSource>;
+        <TObject, TSource>(customizer: lodash.MergeWithCustomizer, object: TObject, source: TSource): TObject & TSource;
+    }
+    interface LodashMergeWith1x1 {
+        <TObject>(object: TObject): LodashMergeWith1x3<TObject>;
+        <TSource>(object: lodash.__, source: TSource): LodashMergeWith1x5<TSource>;
+        <TObject, TSource>(object: TObject, source: TSource): TObject & TSource;
+    }
+    interface LodashMergeWith1x2<TObject> {
+        (customizer: lodash.MergeWithCustomizer): LodashMergeWith1x3<TObject>;
+        <TSource>(customizer: lodash.__, source: TSource): LodashMergeWith1x6<TObject, TSource>;
+        <TSource>(customizer: lodash.MergeWithCustomizer, source: TSource): TObject & TSource;
+    }
+    type LodashMergeWith1x3<TObject> = <TSource>(source: TSource) => TObject & TSource;
+    interface LodashMergeWith1x4<TSource> {
+        (customizer: lodash.MergeWithCustomizer): LodashMergeWith1x5<TSource>;
+        <TObject>(customizer: lodash.__, object: TObject): LodashMergeWith1x6<TObject, TSource>;
+        <TObject>(customizer: lodash.MergeWithCustomizer, object: TObject): TObject & TSource;
+    }
+    type LodashMergeWith1x5<TSource> = <TObject>(object: TObject) => TObject & TSource;
+    type LodashMergeWith1x6<TObject, TSource> = (customizer: lodash.MergeWithCustomizer) => TObject & TSource;
+    type LodashMethod = (path: lodash.PropertyPath) => (object: any) => any;
+    type LodashMethodOf = (object: object) => (path: lodash.PropertyPath) => any;
+    type LodashMin = <T>(collection: lodash.List<T> | null | undefined) => T | undefined;
+    interface LodashMinBy {
+        <T>(iteratee: lodash.ValueIteratee<T>): LodashMinBy1x1<T>;
+        <T>(iteratee: lodash.__, collection: lodash.List<T> | null | undefined): LodashMinBy1x2<T>;
+        <T>(iteratee: lodash.ValueIteratee<T>, collection: lodash.List<T> | null | undefined): T | undefined;
+    }
+    type LodashMinBy1x1<T> = (collection: lodash.List<T> | null | undefined) => T | undefined;
+    type LodashMinBy1x2<T> = (iteratee: lodash.ValueIteratee<T>) => T | undefined;
+    interface LodashMultiply {
+        (multiplier: number): LodashMultiply1x1;
+        (multiplier: lodash.__, multiplicand: number): LodashMultiply1x2;
+        (multiplier: number, multiplicand: number): number;
+    }
+    type LodashMultiply1x1 = (multiplicand: number) => number;
+    type LodashMultiply1x2 = (multiplier: number) => number;
+    type LodashNoConflict = () => typeof _;
+    type LodashNoop = (...args: any[]) => void;
+    type LodashNow = () => number;
+    interface LodashNth {
+        (n: number): LodashNth1x1;
+        <T>(n: lodash.__, array: lodash.List<T> | null | undefined): LodashNth1x2<T>;
+        <T>(n: number, array: lodash.List<T> | null | undefined): T | undefined;
+    }
+    type LodashNth1x1 = <T>(array: lodash.List<T> | null | undefined) => T | undefined;
+    type LodashNth1x2<T> = (n: number) => T | undefined;
+    type LodashNthArg = (n: number) => (...args: any[]) => any;
+    interface LodashOmit {
+        (paths: lodash.PropertyPath): LodashOmit1x1;
+        <T extends lodash.AnyKindOfDictionary>(paths: lodash.__, object: T | null | undefined): LodashOmit1x2<T>;
+        <T extends lodash.AnyKindOfDictionary>(paths: lodash.PropertyPath, object: T | null | undefined): T;
+        <T extends object>(paths: lodash.__, object: T | null | undefined): LodashOmit2x2<T>;
+        <T extends object>(paths: lodash.PropertyPath, object: T | null | undefined): lodash.PartialObject<T>;
+    }
+    interface LodashOmit1x1 {
+        <T extends lodash.AnyKindOfDictionary>(object: T | null | undefined): T;
+        <T extends object>(object: T | null | undefined): lodash.PartialObject<T>;
+    }
+    type LodashOmit1x2<T> = (paths: lodash.PropertyPath) => T;
+    type LodashOmit2x2<T> = (paths: lodash.PropertyPath) => lodash.PartialObject<T>;
+    interface LodashOmitBy {
+        <T>(predicate: lodash.ValueKeyIteratee<T>): LodashOmitBy1x1<T>;
+        <T extends object>(predicate: lodash.__, object: T | null | undefined): LodashOmitBy1x2<T>;
+        <T extends object>(predicate: lodash.ValueKeyIteratee<T[keyof T]>, object: T | null | undefined): lodash.PartialObject<T>;
+    }
+    type LodashOmitBy1x1<T> = <T1 extends object>(object: T1 | null | undefined) => lodash.PartialObject<T1>;
+    type LodashOmitBy1x2<T> = (predicate: lodash.ValueKeyIteratee<T[keyof T]>) => lodash.PartialObject<T>;
+    type LodashOnce = <T extends (...args: any[]) => any>(func: T) => T;
+    interface LodashOrderBy {
+        <T>(iteratees: lodash.Many<(value: T) => lodash.NotVoid>): LodashOrderBy1x1<T>;
+        (iteratees: lodash.__, orders: lodash.Many<boolean|string>): LodashOrderBy1x2;
+        <T>(iteratees: lodash.Many<(value: T) => lodash.NotVoid>, orders: lodash.Many<boolean|string>): LodashOrderBy1x3<T>;
+        <T>(iteratees: lodash.__, orders: lodash.__, collection: lodash.List<T> | null | undefined): LodashOrderBy1x4<T>;
+        <T>(iteratees: lodash.Many<(value: T) => lodash.NotVoid>, orders: lodash.__, collection: lodash.List<T> | null | undefined): LodashOrderBy1x5<T>;
+        <T>(iteratees: lodash.__, orders: lodash.Many<boolean|string>, collection: lodash.List<T> | null | undefined): LodashOrderBy1x6<T>;
+        <T>(iteratees: lodash.Many<(value: T) => lodash.NotVoid> | lodash.Many<lodash.ValueIteratee<T>>, orders: lodash.Many<boolean | string>, collection: lodash.List<T> | null | undefined): T[];
+        <T>(iteratees: lodash.Many<lodash.ValueIteratee<T>>): LodashOrderBy2x1<T>;
+        <T>(iteratees: lodash.Many<lodash.ValueIteratee<T>>, orders: lodash.Many<boolean|string>): LodashOrderBy2x3<T>;
+        <T>(iteratees: lodash.Many<lodash.ValueIteratee<T>>, orders: lodash.__, collection: lodash.List<T> | null | undefined): LodashOrderBy2x5<T>;
+        <T extends object>(iteratees: lodash.__, orders: lodash.__, collection: T | null | undefined): LodashOrderBy3x4<T>;
+        <T extends object>(iteratees: lodash.Many<(value: T[keyof T]) => lodash.NotVoid>, orders: lodash.__, collection: T | null | undefined): LodashOrderBy3x5<T>;
+        <T extends object>(iteratees: lodash.__, orders: lodash.Many<boolean|string>, collection: T | null | undefined): LodashOrderBy3x6<T>;
+        <T extends object>(iteratees: lodash.Many<(value: T[keyof T]) => lodash.NotVoid> | lodash.Many<lodash.ValueIteratee<T[keyof T]>>, orders: lodash.Many<boolean | string>, collection: T | null | undefined): Array<T[keyof T]>;
+        <T extends object>(iteratees: lodash.Many<lodash.ValueIteratee<T[keyof T]>>, orders: lodash.__, collection: T | null | undefined): LodashOrderBy4x5<T>;
+    }
+    interface LodashOrderBy1x1<T> {
+        (orders: lodash.Many<boolean | string>): LodashOrderBy1x3<T>;
+        (orders: lodash.__, collection: lodash.List<T> | null | undefined): LodashOrderBy1x5<T>;
+        (orders: lodash.Many<boolean | string>, collection: lodash.List<T> | object | null | undefined): T[];
+        <T1 extends object>(orders: lodash.__, collection: T1 | null | undefined): LodashOrderBy3x5<T>;
+    }
+    interface LodashOrderBy1x2 {
+        <T>(iteratees: lodash.Many<(value: T) => lodash.NotVoid>): LodashOrderBy1x3<T>;
+        <T>(iteratees: lodash.__, collection: lodash.List<T> | null | undefined): LodashOrderBy1x6<T>;
+        <T>(iteratees: lodash.Many<(value: T) => lodash.NotVoid> | lodash.Many<lodash.ValueIteratee<T>>, collection: lodash.List<T> | null | undefined): T[];
+        <T>(iteratees: lodash.Many<lodash.ValueIteratee<T>>): LodashOrderBy2x3<T>;
+        <T extends object>(iteratees: lodash.__, collection: T | null | undefined): LodashOrderBy3x6<T>;
+        <T extends object>(iteratees: lodash.Many<(value: T[keyof T]) => lodash.NotVoid> | lodash.Many<lodash.ValueIteratee<T[keyof T]>>, collection: T | null | undefined): Array<T[keyof T]>;
+    }
+    interface LodashOrderBy1x3<T> {
+        (collection: lodash.List<T> | null | undefined): T[];
+        (collection: object | null | undefined): object[];
+    }
+    interface LodashOrderBy1x4<T> {
+        (iteratees: lodash.Many<(value: T) => lodash.NotVoid>): LodashOrderBy1x5<T>;
+        (iteratees: lodash.__, orders: lodash.Many<boolean | string>): LodashOrderBy1x6<T>;
+        (iteratees: lodash.Many<(value: T) => lodash.NotVoid> | lodash.Many<lodash.ValueIteratee<T>>, orders: lodash.Many<boolean | string>): T[];
+        (iteratees: lodash.Many<lodash.ValueIteratee<T>>): LodashOrderBy2x5<T>;
+    }
+    type LodashOrderBy1x5<T> = (orders: lodash.Many<boolean|string>) => T[];
+    type LodashOrderBy1x6<T> = (iteratees: lodash.Many<(value: T) => lodash.NotVoid> | lodash.Many<lodash.ValueIteratee<T>>) => T[];
+    interface LodashOrderBy2x1<T> {
+        (orders: lodash.Many<boolean | string>): LodashOrderBy2x3<T>;
+        (orders: lodash.__, collection: lodash.List<T> | null | undefined): LodashOrderBy2x5<T>;
+        (orders: lodash.Many<boolean | string>, collection: lodash.List<T> | object | null | undefined): T[];
+        <T1 extends object>(orders: lodash.__, collection: T1 | null | undefined): LodashOrderBy4x5<T>;
+    }
+    interface LodashOrderBy2x3<T> {
+        (collection: lodash.List<T> | null | undefined): T[];
+        (collection: object | null | undefined): object[];
+    }
+    type LodashOrderBy2x5<T> = (orders: lodash.Many<boolean|string>) => T[];
+    interface LodashOrderBy3x4<T> {
+        (iteratees: lodash.Many<(value: T[keyof T]) => lodash.NotVoid>): LodashOrderBy3x5<T>;
+        (iteratees: lodash.__, orders: lodash.Many<boolean | string>): LodashOrderBy3x6<T>;
+        (iteratees: lodash.Many<(value: T[keyof T]) => lodash.NotVoid> | lodash.Many<lodash.ValueIteratee<T[keyof T]>>, orders: lodash.Many<boolean | string>): Array<T[keyof T]>;
+        (iteratees: lodash.Many<lodash.ValueIteratee<T[keyof T]>>): LodashOrderBy4x5<T>;
+    }
+    type LodashOrderBy3x5<T> = (orders: lodash.Many<boolean|string>) => Array<T[keyof T]>;
+    type LodashOrderBy3x6<T> = (iteratees: lodash.Many<(value: T[keyof T]) => lodash.NotVoid> | lodash.Many<lodash.ValueIteratee<T[keyof T]>>) => Array<T[keyof T]>;
+    type LodashOrderBy4x5<T> = (orders: lodash.Many<boolean|string>) => Array<T[keyof T]>;
+    interface LodashOverArgs {
+        (func: (...args: any[]) => any): LodashOverArgs1x1;
+        (func: lodash.__, transforms: lodash.Many<(...args: any[]) => any>): LodashOverArgs1x2;
+        (func: (...args: any[]) => any, transforms: lodash.Many<(...args: any[]) => any>): (...args: any[]) => any;
+    }
+    type LodashOverArgs1x1 = (transforms: lodash.Many<(...args: any[]) => any>) => (...args: any[]) => any;
+    type LodashOverArgs1x2 = (func: (...args: any[]) => any) => (...args: any[]) => any;
+    interface LodashPad {
+        (length: number): LodashPad1x1;
+        (length: lodash.__, string: string): LodashPad1x2;
+        (length: number, string: string): string;
+    }
+    type LodashPad1x1 = (string: string) => string;
+    type LodashPad1x2 = (length: number) => string;
+    interface LodashPadChars {
+        (chars: string): LodashPadChars1x1;
+        (chars: lodash.__, length: number): LodashPadChars1x2;
+        (chars: string, length: number): LodashPadChars1x3;
+        (chars: lodash.__, length: lodash.__, string: string): LodashPadChars1x4;
+        (chars: string, length: lodash.__, string: string): LodashPadChars1x5;
+        (chars: lodash.__, length: number, string: string): LodashPadChars1x6;
+        (chars: string, length: number, string: string): string;
+    }
+    interface LodashPadChars1x1 {
+        (length: number): LodashPadChars1x3;
+        (length: lodash.__, string: string): LodashPadChars1x5;
+        (length: number, string: string): string;
+    }
+    interface LodashPadChars1x2 {
+        (chars: string): LodashPadChars1x3;
+        (chars: lodash.__, string: string): LodashPadChars1x6;
+        (chars: string, string: string): string;
+    }
+    type LodashPadChars1x3 = (string: string) => string;
+    interface LodashPadChars1x4 {
+        (chars: string): LodashPadChars1x5;
+        (chars: lodash.__, length: number): LodashPadChars1x6;
+        (chars: string, length: number): string;
+    }
+    type LodashPadChars1x5 = (length: number) => string;
+    type LodashPadChars1x6 = (chars: string) => string;
+    interface LodashPadCharsEnd {
+        (chars: string): LodashPadCharsEnd1x1;
+        (chars: lodash.__, length: number): LodashPadCharsEnd1x2;
+        (chars: string, length: number): LodashPadCharsEnd1x3;
+        (chars: lodash.__, length: lodash.__, string: string): LodashPadCharsEnd1x4;
+        (chars: string, length: lodash.__, string: string): LodashPadCharsEnd1x5;
+        (chars: lodash.__, length: number, string: string): LodashPadCharsEnd1x6;
+        (chars: string, length: number, string: string): string;
+    }
+    interface LodashPadCharsEnd1x1 {
+        (length: number): LodashPadCharsEnd1x3;
+        (length: lodash.__, string: string): LodashPadCharsEnd1x5;
+        (length: number, string: string): string;
+    }
+    interface LodashPadCharsEnd1x2 {
+        (chars: string): LodashPadCharsEnd1x3;
+        (chars: lodash.__, string: string): LodashPadCharsEnd1x6;
+        (chars: string, string: string): string;
+    }
+    type LodashPadCharsEnd1x3 = (string: string) => string;
+    interface LodashPadCharsEnd1x4 {
+        (chars: string): LodashPadCharsEnd1x5;
+        (chars: lodash.__, length: number): LodashPadCharsEnd1x6;
+        (chars: string, length: number): string;
+    }
+    type LodashPadCharsEnd1x5 = (length: number) => string;
+    type LodashPadCharsEnd1x6 = (chars: string) => string;
+    interface LodashPadCharsStart {
+        (chars: string): LodashPadCharsStart1x1;
+        (chars: lodash.__, length: number): LodashPadCharsStart1x2;
+        (chars: string, length: number): LodashPadCharsStart1x3;
+        (chars: lodash.__, length: lodash.__, string: string): LodashPadCharsStart1x4;
+        (chars: string, length: lodash.__, string: string): LodashPadCharsStart1x5;
+        (chars: lodash.__, length: number, string: string): LodashPadCharsStart1x6;
+        (chars: string, length: number, string: string): string;
+    }
+    interface LodashPadCharsStart1x1 {
+        (length: number): LodashPadCharsStart1x3;
+        (length: lodash.__, string: string): LodashPadCharsStart1x5;
+        (length: number, string: string): string;
+    }
+    interface LodashPadCharsStart1x2 {
+        (chars: string): LodashPadCharsStart1x3;
+        (chars: lodash.__, string: string): LodashPadCharsStart1x6;
+        (chars: string, string: string): string;
+    }
+    type LodashPadCharsStart1x3 = (string: string) => string;
+    interface LodashPadCharsStart1x4 {
+        (chars: string): LodashPadCharsStart1x5;
+        (chars: lodash.__, length: number): LodashPadCharsStart1x6;
+        (chars: string, length: number): string;
+    }
+    type LodashPadCharsStart1x5 = (length: number) => string;
+    type LodashPadCharsStart1x6 = (chars: string) => string;
+    interface LodashPadEnd {
+        (length: number): LodashPadEnd1x1;
+        (length: lodash.__, string: string): LodashPadEnd1x2;
+        (length: number, string: string): string;
+    }
+    type LodashPadEnd1x1 = (string: string) => string;
+    type LodashPadEnd1x2 = (length: number) => string;
+    interface LodashPadStart {
+        (length: number): LodashPadStart1x1;
+        (length: lodash.__, string: string): LodashPadStart1x2;
+        (length: number, string: string): string;
+    }
+    type LodashPadStart1x1 = (string: string) => string;
+    type LodashPadStart1x2 = (length: number) => string;
+    interface LodashParseInt {
+        (radix: number): LodashParseInt1x1;
+        (radix: lodash.__, string: string): LodashParseInt1x2;
+        (radix: number, string: string): number;
+    }
+    type LodashParseInt1x1 = (string: string) => number;
+    type LodashParseInt1x2 = (radix: number) => number;
+    interface LodashPartial {
+        (args: ReadonlyArray<any>): LodashPartial1x1;
+        (args: lodash.__, func: (...args: any[]) => any): LodashPartial1x2;
+        (args: ReadonlyArray<any>, func: (...args: any[]) => any): (...args: any[]) => any;
+        placeholder: lodash.__;
+    }
+    type LodashPartial1x1 = (func: (...args: any[]) => any) => (...args: any[]) => any;
+    type LodashPartial1x2 = (args: ReadonlyArray<any>) => (...args: any[]) => any;
+    interface LodashPartialRight {
+        (args: ReadonlyArray<any>): LodashPartialRight1x1;
+        (args: lodash.__, func: (...args: any[]) => any): LodashPartialRight1x2;
+        (args: ReadonlyArray<any>, func: (...args: any[]) => any): (...args: any[]) => any;
+        placeholder: lodash.__;
+    }
+    type LodashPartialRight1x1 = (func: (...args: any[]) => any) => (...args: any[]) => any;
+    type LodashPartialRight1x2 = (args: ReadonlyArray<any>) => (...args: any[]) => any;
+    interface LodashPartition {
+        <T>(callback: lodash.ValueIteratee<T>): LodashPartition1x1<T>;
+        <T>(callback: lodash.__, collection: lodash.List<T> | null | undefined): LodashPartition1x2<T>;
+        <T>(callback: lodash.ValueIteratee<T>, collection: lodash.List<T> | null | undefined): [T[], T[]];
+        <T extends object>(callback: lodash.__, collection: T | null | undefined): LodashPartition2x2<T>;
+        <T extends object>(callback: lodash.ValueIteratee<T[keyof T]>, collection: T | null | undefined): [Array<T[keyof T]>, Array<T[keyof T]>];
+    }
+    type LodashPartition1x1<T> = (collection: lodash.List<T> | object | null | undefined) => [T[], T[]];
+    type LodashPartition1x2<T> = (callback: lodash.ValueIteratee<T>) => [T[], T[]];
+    type LodashPartition2x2<T> = (callback: lodash.ValueIteratee<T[keyof T]>) => [Array<T[keyof T]>, Array<T[keyof T]>];
+    interface LodashPath {
+        <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey]): LodashPath1x1<TObject, TKey>;
+        <TObject extends object>(path: lodash.__, object: TObject): LodashPath1x2<TObject>;
+        <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey], object: TObject): TObject[TKey];
+        <TObject extends object>(path: lodash.__, object: TObject | null | undefined): LodashPath2x2<TObject>;
+        <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey], object: TObject | null | undefined): TObject[TKey] | undefined;
+        (path: number): LodashPath3x1;
+        <T>(path: lodash.__, object: lodash.NumericDictionary<T>): LodashPath3x2<T>;
+        <T>(path: number, object: lodash.NumericDictionary<T>): T;
+        <T>(path: lodash.__, object: lodash.NumericDictionary<T> | null | undefined): LodashPath4x2<T>;
+        <T>(path: number, object: lodash.NumericDictionary<T> | null | undefined): T | undefined;
+        (path: lodash.PropertyPath): LodashPath5x1;
+        (path: lodash.__, object: null | undefined): LodashPath5x2;
+        (path: lodash.PropertyPath, object: null | undefined): undefined;
+        (path: lodash.__, object: any): LodashPath6x2;
+        (path: lodash.PropertyPath, object: any): any;
+    }
+    interface LodashPath1x1<TObject, TKey extends keyof TObject> {
+        (object: TObject): TObject[TKey];
+        (object: TObject | null | undefined): TObject[TKey] | undefined;
+    }
+    type LodashPath1x2<TObject> = <TKey extends keyof TObject>(path: TKey | [TKey]) => TObject[TKey];
+    type LodashPath2x2<TObject> = <TKey extends keyof TObject>(path: TKey | [TKey]) => TObject[TKey] | undefined;
+    interface LodashPath3x1 {
+        <T>(object: lodash.NumericDictionary<T>): T;
+        <T>(object: lodash.NumericDictionary<T> | null | undefined): T | undefined;
+    }
+    type LodashPath3x2<T> = (path: number) => T;
+    type LodashPath4x2<T> = (path: number) => T | undefined;
+    interface LodashPath5x1 {
+        (object: null | undefined): undefined;
+        (object: any): any;
+    }
+    type LodashPath5x2 = (path: lodash.PropertyPath) => undefined;
+    type LodashPath6x2 = (path: lodash.PropertyPath) => any;
+    interface LodashPathOr {
+        <TDefault>(defaultValue: TDefault): LodashPathOr1x1<TDefault>;
+        <TObject extends object, TKey extends keyof TObject>(defaultValue: lodash.__, path: TKey | [TKey]): LodashPathOr1x2<TObject, TKey>;
+        <TObject extends object, TKey extends keyof TObject, TDefault>(defaultValue: TDefault, path: TKey | [TKey]): LodashPathOr1x3<TObject, TKey, TDefault>;
+        <TObject extends object>(defaultValue: lodash.__, path: lodash.__, object: TObject | null | undefined): LodashPathOr1x4<TObject>;
+        <TObject extends object, TDefault>(defaultValue: TDefault, path: lodash.__, object: TObject | null | undefined): LodashPathOr1x5<TObject, TDefault>;
+        <TObject extends object, TKey extends keyof TObject>(defaultValue: lodash.__, path: TKey | [TKey], object: TObject | null | undefined): LodashPathOr1x6<TObject, TKey>;
+        <TObject extends object, TKey extends keyof TObject, TDefault>(defaultValue: TDefault, path: TKey | [TKey], object: TObject | null | undefined): TObject[TKey] | TDefault;
+        (defaultValue: lodash.__, path: number): LodashPathOr2x2;
+        <TDefault>(defaultValue: TDefault, path: number): LodashPathOr2x3<TDefault>;
+        <T>(defaultValue: lodash.__, path: lodash.__, object: lodash.NumericDictionary<T> | null | undefined): LodashPathOr2x4<T>;
+        <T, TDefault>(defaultValue: TDefault, path: lodash.__, object: lodash.NumericDictionary<T> | null | undefined): LodashPathOr2x5<T, TDefault>;
+        <T>(defaultValue: lodash.__, path: number, object: lodash.NumericDictionary<T> | null | undefined): LodashPathOr2x6<T>;
+        <T, TDefault>(defaultValue: TDefault, path: number, object: lodash.NumericDictionary<T> | null | undefined): T | TDefault;
+        (defaultValue: lodash.__, path: lodash.PropertyPath): LodashPathOr3x2;
+        <TDefault>(defaultValue: TDefault, path: lodash.PropertyPath): LodashPathOr3x3<TDefault>;
+        (defaultValue: lodash.__, path: lodash.__, object: null | undefined): LodashPathOr3x4;
+        <TDefault>(defaultValue: TDefault, path: lodash.__, object: null | undefined): LodashPathOr3x5<TDefault>;
+        (defaultValue: lodash.__, path: lodash.PropertyPath, object: null | undefined): LodashPathOr3x6;
+        <TDefault>(defaultValue: TDefault, path: lodash.PropertyPath, object: null | undefined): TDefault;
+        (defaultValue: any): LodashPathOr4x1;
+        (defaultValue: any, path: lodash.PropertyPath): LodashPathOr4x3;
+        (defaultValue: lodash.__, path: lodash.__, object: any): LodashPathOr4x4;
+        (defaultValue: any, path: lodash.__, object: any): LodashPathOr4x5;
+        (defaultValue: lodash.__, path: lodash.PropertyPath, object: any): LodashPathOr4x6;
+        (defaultValue: any, path: lodash.PropertyPath, object: any): any;
+    }
+    interface LodashPathOr1x1<TDefault> {
+        <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey]): LodashPathOr1x3<TObject, TKey, TDefault>;
+        <TObject extends object>(path: lodash.__, object: TObject | null | undefined): LodashPathOr1x5<TObject, TDefault>;
+        <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey], object: TObject | null | undefined): TObject[TKey] | TDefault;
+        (path: number): LodashPathOr2x3<TDefault>;
+        <T>(path: lodash.__, object: lodash.NumericDictionary<T> | null | undefined): LodashPathOr2x5<T, TDefault>;
+        <T>(path: number, object: lodash.NumericDictionary<T> | null | undefined): T | TDefault;
+        (path: lodash.PropertyPath): LodashPathOr3x3<TDefault>;
+        (path: lodash.__, object: null | undefined): LodashPathOr3x5<TDefault>;
+        (path: lodash.PropertyPath, object: null | undefined): TDefault;
+    }
+    interface LodashPathOr1x2<TObject, TKey extends keyof TObject> {
+        <TDefault>(defaultValue: TDefault): LodashPathOr1x3<TObject, TKey, TDefault>;
+        (defaultValue: lodash.__, object: TObject | null | undefined): LodashPathOr1x6<TObject, TKey>;
+        <TDefault>(defaultValue: TDefault, object: TObject | null | undefined): TObject[TKey] | TDefault;
+    }
+    type LodashPathOr1x3<TObject, TKey extends keyof TObject, TDefault> = (object: TObject | null | undefined) => TObject[TKey] | TDefault;
+    interface LodashPathOr1x4<TObject> {
+        <TDefault>(defaultValue: TDefault): LodashPathOr1x5<TObject, TDefault>;
+        <TKey extends keyof TObject>(defaultValue: lodash.__, path: TKey | [TKey]): LodashPathOr1x6<TObject, TKey>;
+        <TKey extends keyof TObject, TDefault>(defaultValue: TDefault, path: TKey | [TKey]): TObject[TKey] | TDefault;
+    }
+    type LodashPathOr1x5<TObject, TDefault> = <TKey extends keyof TObject>(path: TKey | [TKey]) => TObject[TKey] | TDefault;
+    type LodashPathOr1x6<TObject, TKey extends keyof TObject> = <TDefault>(defaultValue: TDefault) => TObject[TKey] | TDefault;
+    interface LodashPathOr2x2 {
+        <TDefault>(defaultValue: TDefault): LodashPathOr2x3<TDefault>;
+        <T>(defaultValue: lodash.__, object: lodash.NumericDictionary<T> | null | undefined): LodashPathOr2x6<T>;
+        <T, TDefault>(defaultValue: TDefault, object: lodash.NumericDictionary<T> | null | undefined): T | TDefault;
+    }
+    type LodashPathOr2x3<TDefault> = <T>(object: lodash.NumericDictionary<T> | null | undefined) => T | TDefault;
+    interface LodashPathOr2x4<T> {
+        <TDefault>(defaultValue: TDefault): LodashPathOr2x5<T, TDefault>;
+        (defaultValue: lodash.__, path: number): LodashPathOr2x6<T>;
+        <TDefault>(defaultValue: TDefault, path: number): T | TDefault;
+    }
+    type LodashPathOr2x5<T, TDefault> = (path: number) => T | TDefault;
+    type LodashPathOr2x6<T> = <TDefault>(defaultValue: TDefault) => T | TDefault;
+    interface LodashPathOr3x2 {
+        <TDefault>(defaultValue: TDefault): LodashPathOr3x3<TDefault>;
+        (defaultValue: lodash.__, object: null | undefined): LodashPathOr3x6;
+        <TDefault>(defaultValue: TDefault, object: null | undefined): TDefault;
+        (defaultValue: any): LodashPathOr4x3;
+        (defaultValue: lodash.__, object: any): LodashPathOr4x6;
+        (defaultValue: any, object: any): any;
+    }
+    type LodashPathOr3x3<TDefault> = (object: null | undefined) => TDefault;
+    interface LodashPathOr3x4 {
+        <TDefault>(defaultValue: TDefault): LodashPathOr3x5<TDefault>;
+        (defaultValue: lodash.__, path: lodash.PropertyPath): LodashPathOr3x6;
+        <TDefault>(defaultValue: TDefault, path: lodash.PropertyPath): TDefault;
+    }
+    type LodashPathOr3x5<TDefault> = (path: lodash.PropertyPath) => TDefault;
+    type LodashPathOr3x6 = <TDefault>(defaultValue: TDefault) => TDefault;
+    interface LodashPathOr4x1 {
+        (path: lodash.PropertyPath): LodashPathOr4x3;
+        (path: lodash.__, object: any): LodashPathOr4x5;
+        (path: lodash.PropertyPath, object: any): any;
+    }
+    type LodashPathOr4x3 = (object: any) => any;
+    interface LodashPathOr4x4 {
+        (defaultValue: any): LodashPathOr4x5;
+        (defaultValue: lodash.__, path: lodash.PropertyPath): LodashPathOr4x6;
+        (defaultValue: any, path: lodash.PropertyPath): any;
+    }
+    type LodashPathOr4x5 = (path: lodash.PropertyPath) => any;
+    type LodashPathOr4x6 = (defaultValue: any) => any;
+    interface LodashPick {
+        <T extends object, U extends keyof T>(props: lodash.Many<U>): LodashPick1x1<T, U>;
+        <T extends object>(props: lodash.__, object: T): LodashPick1x2<T>;
+        <T extends object, U extends keyof T>(props: lodash.Many<U>, object: T): Pick<T, U>;
+        (props: lodash.PropertyPath): LodashPick2x1;
+        <T>(props: lodash.__, object: T | null | undefined): LodashPick2x2<T>;
+        <T>(props: lodash.PropertyPath, object: T | null | undefined): lodash.PartialDeep<T>;
+    }
+    type LodashPick1x1<T, U extends keyof T> = (object: T) => Pick<T, U>;
+    type LodashPick1x2<T> = <U extends keyof T>(props: lodash.Many<U>) => Pick<T, U>;
+    type LodashPick2x1 = <T>(object: T | null | undefined) => lodash.PartialDeep<T>;
+    type LodashPick2x2<T> = (props: lodash.PropertyPath) => lodash.PartialDeep<T>;
+    interface LodashPickBy {
+        <T>(predicate: lodash.ValueKeyIteratee<T>): LodashPickBy1x1<T>;
+        <T extends object>(predicate: lodash.__, object: T | null | undefined): LodashPickBy1x2<T>;
+        <T extends object>(predicate: lodash.ValueKeyIteratee<T[keyof T]>, object: T | null | undefined): lodash.PartialObject<T>;
+    }
+    type LodashPickBy1x1<T> = <T1 extends object>(object: T1 | null | undefined) => lodash.PartialObject<T1>;
+    type LodashPickBy1x2<T> = (predicate: lodash.ValueKeyIteratee<T[keyof T]>) => lodash.PartialObject<T>;
+    interface LodashProp {
+        <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey]): LodashProp1x1<TObject, TKey>;
+        <TObject extends object>(path: lodash.__, object: TObject): LodashProp1x2<TObject>;
+        <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey], object: TObject): TObject[TKey];
+        <TObject extends object>(path: lodash.__, object: TObject | null | undefined): LodashProp2x2<TObject>;
+        <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey], object: TObject | null | undefined): TObject[TKey] | undefined;
+        (path: number): LodashProp3x1;
+        <T>(path: lodash.__, object: lodash.NumericDictionary<T>): LodashProp3x2<T>;
+        <T>(path: number, object: lodash.NumericDictionary<T>): T;
+        <T>(path: lodash.__, object: lodash.NumericDictionary<T> | null | undefined): LodashProp4x2<T>;
+        <T>(path: number, object: lodash.NumericDictionary<T> | null | undefined): T | undefined;
+        (path: lodash.PropertyPath): LodashProp5x1;
+        (path: lodash.__, object: null | undefined): LodashProp5x2;
+        (path: lodash.PropertyPath, object: null | undefined): undefined;
+        (path: lodash.__, object: any): LodashProp6x2;
+        (path: lodash.PropertyPath, object: any): any;
+    }
+    interface LodashProp1x1<TObject, TKey extends keyof TObject> {
+        (object: TObject): TObject[TKey];
+        (object: TObject | null | undefined): TObject[TKey] | undefined;
+    }
+    type LodashProp1x2<TObject> = <TKey extends keyof TObject>(path: TKey | [TKey]) => TObject[TKey];
+    type LodashProp2x2<TObject> = <TKey extends keyof TObject>(path: TKey | [TKey]) => TObject[TKey] | undefined;
+    interface LodashProp3x1 {
+        <T>(object: lodash.NumericDictionary<T>): T;
+        <T>(object: lodash.NumericDictionary<T> | null | undefined): T | undefined;
+    }
+    type LodashProp3x2<T> = (path: number) => T;
+    type LodashProp4x2<T> = (path: number) => T | undefined;
+    interface LodashProp5x1 {
+        (object: null | undefined): undefined;
+        (object: any): any;
+    }
+    type LodashProp5x2 = (path: lodash.PropertyPath) => undefined;
+    type LodashProp6x2 = (path: lodash.PropertyPath) => any;
+    interface LodashProperty {
+        <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey]): LodashProperty1x1<TObject, TKey>;
+        <TObject extends object>(path: lodash.__, object: TObject): LodashProperty1x2<TObject>;
+        <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey], object: TObject): TObject[TKey];
+        <TObject extends object>(path: lodash.__, object: TObject | null | undefined): LodashProperty2x2<TObject>;
+        <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey], object: TObject | null | undefined): TObject[TKey] | undefined;
+        (path: number): LodashProperty3x1;
+        <T>(path: lodash.__, object: lodash.NumericDictionary<T>): LodashProperty3x2<T>;
+        <T>(path: number, object: lodash.NumericDictionary<T>): T;
+        <T>(path: lodash.__, object: lodash.NumericDictionary<T> | null | undefined): LodashProperty4x2<T>;
+        <T>(path: number, object: lodash.NumericDictionary<T> | null | undefined): T | undefined;
+        (path: lodash.PropertyPath): LodashProperty5x1;
+        (path: lodash.__, object: null | undefined): LodashProperty5x2;
+        (path: lodash.PropertyPath, object: null | undefined): undefined;
+        (path: lodash.__, object: any): LodashProperty6x2;
+        (path: lodash.PropertyPath, object: any): any;
+    }
+    interface LodashProperty1x1<TObject, TKey extends keyof TObject> {
+        (object: TObject): TObject[TKey];
+        (object: TObject | null | undefined): TObject[TKey] | undefined;
+    }
+    type LodashProperty1x2<TObject> = <TKey extends keyof TObject>(path: TKey | [TKey]) => TObject[TKey];
+    type LodashProperty2x2<TObject> = <TKey extends keyof TObject>(path: TKey | [TKey]) => TObject[TKey] | undefined;
+    interface LodashProperty3x1 {
+        <T>(object: lodash.NumericDictionary<T>): T;
+        <T>(object: lodash.NumericDictionary<T> | null | undefined): T | undefined;
+    }
+    type LodashProperty3x2<T> = (path: number) => T;
+    type LodashProperty4x2<T> = (path: number) => T | undefined;
+    interface LodashProperty5x1 {
+        (object: null | undefined): undefined;
+        (object: any): any;
+    }
+    type LodashProperty5x2 = (path: lodash.PropertyPath) => undefined;
+    type LodashProperty6x2 = (path: lodash.PropertyPath) => any;
+    interface LodashPropertyOf {
+        <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey]): LodashPropertyOf1x1<TObject, TKey>;
+        <TObject extends object>(path: lodash.__, object: TObject): LodashPropertyOf1x2<TObject>;
+        <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey], object: TObject): TObject[TKey];
+        <TObject extends object>(path: lodash.__, object: TObject | null | undefined): LodashPropertyOf2x2<TObject>;
+        <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey], object: TObject | null | undefined): TObject[TKey] | undefined;
+        (path: number): LodashPropertyOf3x1;
+        <T>(path: lodash.__, object: lodash.NumericDictionary<T>): LodashPropertyOf3x2<T>;
+        <T>(path: number, object: lodash.NumericDictionary<T>): T;
+        <T>(path: lodash.__, object: lodash.NumericDictionary<T> | null | undefined): LodashPropertyOf4x2<T>;
+        <T>(path: number, object: lodash.NumericDictionary<T> | null | undefined): T | undefined;
+        (path: lodash.PropertyPath): LodashPropertyOf5x1;
+        (path: lodash.__, object: null | undefined): LodashPropertyOf5x2;
+        (path: lodash.PropertyPath, object: null | undefined): undefined;
+        (path: lodash.__, object: any): LodashPropertyOf6x2;
+        (path: lodash.PropertyPath, object: any): any;
+    }
+    interface LodashPropertyOf1x1<TObject, TKey extends keyof TObject> {
+        (object: TObject): TObject[TKey];
+        (object: TObject | null | undefined): TObject[TKey] | undefined;
+    }
+    type LodashPropertyOf1x2<TObject> = <TKey extends keyof TObject>(path: TKey | [TKey]) => TObject[TKey];
+    type LodashPropertyOf2x2<TObject> = <TKey extends keyof TObject>(path: TKey | [TKey]) => TObject[TKey] | undefined;
+    interface LodashPropertyOf3x1 {
+        <T>(object: lodash.NumericDictionary<T>): T;
+        <T>(object: lodash.NumericDictionary<T> | null | undefined): T | undefined;
+    }
+    type LodashPropertyOf3x2<T> = (path: number) => T;
+    type LodashPropertyOf4x2<T> = (path: number) => T | undefined;
+    interface LodashPropertyOf5x1 {
+        (object: null | undefined): undefined;
+        (object: any): any;
+    }
+    type LodashPropertyOf5x2 = (path: lodash.PropertyPath) => undefined;
+    type LodashPropertyOf6x2 = (path: lodash.PropertyPath) => any;
+    interface LodashPropOr {
+        <TDefault>(defaultValue: TDefault): LodashPropOr1x1<TDefault>;
+        <TObject extends object, TKey extends keyof TObject>(defaultValue: lodash.__, path: TKey | [TKey]): LodashPropOr1x2<TObject, TKey>;
+        <TObject extends object, TKey extends keyof TObject, TDefault>(defaultValue: TDefault, path: TKey | [TKey]): LodashPropOr1x3<TObject, TKey, TDefault>;
+        <TObject extends object>(defaultValue: lodash.__, path: lodash.__, object: TObject | null | undefined): LodashPropOr1x4<TObject>;
+        <TObject extends object, TDefault>(defaultValue: TDefault, path: lodash.__, object: TObject | null | undefined): LodashPropOr1x5<TObject, TDefault>;
+        <TObject extends object, TKey extends keyof TObject>(defaultValue: lodash.__, path: TKey | [TKey], object: TObject | null | undefined): LodashPropOr1x6<TObject, TKey>;
+        <TObject extends object, TKey extends keyof TObject, TDefault>(defaultValue: TDefault, path: TKey | [TKey], object: TObject | null | undefined): TObject[TKey] | TDefault;
+        (defaultValue: lodash.__, path: number): LodashPropOr2x2;
+        <TDefault>(defaultValue: TDefault, path: number): LodashPropOr2x3<TDefault>;
+        <T>(defaultValue: lodash.__, path: lodash.__, object: lodash.NumericDictionary<T> | null | undefined): LodashPropOr2x4<T>;
+        <T, TDefault>(defaultValue: TDefault, path: lodash.__, object: lodash.NumericDictionary<T> | null | undefined): LodashPropOr2x5<T, TDefault>;
+        <T>(defaultValue: lodash.__, path: number, object: lodash.NumericDictionary<T> | null | undefined): LodashPropOr2x6<T>;
+        <T, TDefault>(defaultValue: TDefault, path: number, object: lodash.NumericDictionary<T> | null | undefined): T | TDefault;
+        (defaultValue: lodash.__, path: lodash.PropertyPath): LodashPropOr3x2;
+        <TDefault>(defaultValue: TDefault, path: lodash.PropertyPath): LodashPropOr3x3<TDefault>;
+        (defaultValue: lodash.__, path: lodash.__, object: null | undefined): LodashPropOr3x4;
+        <TDefault>(defaultValue: TDefault, path: lodash.__, object: null | undefined): LodashPropOr3x5<TDefault>;
+        (defaultValue: lodash.__, path: lodash.PropertyPath, object: null | undefined): LodashPropOr3x6;
+        <TDefault>(defaultValue: TDefault, path: lodash.PropertyPath, object: null | undefined): TDefault;
+        (defaultValue: any): LodashPropOr4x1;
+        (defaultValue: any, path: lodash.PropertyPath): LodashPropOr4x3;
+        (defaultValue: lodash.__, path: lodash.__, object: any): LodashPropOr4x4;
+        (defaultValue: any, path: lodash.__, object: any): LodashPropOr4x5;
+        (defaultValue: lodash.__, path: lodash.PropertyPath, object: any): LodashPropOr4x6;
+        (defaultValue: any, path: lodash.PropertyPath, object: any): any;
+    }
+    interface LodashPropOr1x1<TDefault> {
+        <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey]): LodashPropOr1x3<TObject, TKey, TDefault>;
+        <TObject extends object>(path: lodash.__, object: TObject | null | undefined): LodashPropOr1x5<TObject, TDefault>;
+        <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey], object: TObject | null | undefined): TObject[TKey] | TDefault;
+        (path: number): LodashPropOr2x3<TDefault>;
+        <T>(path: lodash.__, object: lodash.NumericDictionary<T> | null | undefined): LodashPropOr2x5<T, TDefault>;
+        <T>(path: number, object: lodash.NumericDictionary<T> | null | undefined): T | TDefault;
+        (path: lodash.PropertyPath): LodashPropOr3x3<TDefault>;
+        (path: lodash.__, object: null | undefined): LodashPropOr3x5<TDefault>;
+        (path: lodash.PropertyPath, object: null | undefined): TDefault;
+    }
+    interface LodashPropOr1x2<TObject, TKey extends keyof TObject> {
+        <TDefault>(defaultValue: TDefault): LodashPropOr1x3<TObject, TKey, TDefault>;
+        (defaultValue: lodash.__, object: TObject | null | undefined): LodashPropOr1x6<TObject, TKey>;
+        <TDefault>(defaultValue: TDefault, object: TObject | null | undefined): TObject[TKey] | TDefault;
+    }
+    type LodashPropOr1x3<TObject, TKey extends keyof TObject, TDefault> = (object: TObject | null | undefined) => TObject[TKey] | TDefault;
+    interface LodashPropOr1x4<TObject> {
+        <TDefault>(defaultValue: TDefault): LodashPropOr1x5<TObject, TDefault>;
+        <TKey extends keyof TObject>(defaultValue: lodash.__, path: TKey | [TKey]): LodashPropOr1x6<TObject, TKey>;
+        <TKey extends keyof TObject, TDefault>(defaultValue: TDefault, path: TKey | [TKey]): TObject[TKey] | TDefault;
+    }
+    type LodashPropOr1x5<TObject, TDefault> = <TKey extends keyof TObject>(path: TKey | [TKey]) => TObject[TKey] | TDefault;
+    type LodashPropOr1x6<TObject, TKey extends keyof TObject> = <TDefault>(defaultValue: TDefault) => TObject[TKey] | TDefault;
+    interface LodashPropOr2x2 {
+        <TDefault>(defaultValue: TDefault): LodashPropOr2x3<TDefault>;
+        <T>(defaultValue: lodash.__, object: lodash.NumericDictionary<T> | null | undefined): LodashPropOr2x6<T>;
+        <T, TDefault>(defaultValue: TDefault, object: lodash.NumericDictionary<T> | null | undefined): T | TDefault;
+    }
+    type LodashPropOr2x3<TDefault> = <T>(object: lodash.NumericDictionary<T> | null | undefined) => T | TDefault;
+    interface LodashPropOr2x4<T> {
+        <TDefault>(defaultValue: TDefault): LodashPropOr2x5<T, TDefault>;
+        (defaultValue: lodash.__, path: number): LodashPropOr2x6<T>;
+        <TDefault>(defaultValue: TDefault, path: number): T | TDefault;
+    }
+    type LodashPropOr2x5<T, TDefault> = (path: number) => T | TDefault;
+    type LodashPropOr2x6<T> = <TDefault>(defaultValue: TDefault) => T | TDefault;
+    interface LodashPropOr3x2 {
+        <TDefault>(defaultValue: TDefault): LodashPropOr3x3<TDefault>;
+        (defaultValue: lodash.__, object: null | undefined): LodashPropOr3x6;
+        <TDefault>(defaultValue: TDefault, object: null | undefined): TDefault;
+        (defaultValue: any): LodashPropOr4x3;
+        (defaultValue: lodash.__, object: any): LodashPropOr4x6;
+        (defaultValue: any, object: any): any;
+    }
+    type LodashPropOr3x3<TDefault> = (object: null | undefined) => TDefault;
+    interface LodashPropOr3x4 {
+        <TDefault>(defaultValue: TDefault): LodashPropOr3x5<TDefault>;
+        (defaultValue: lodash.__, path: lodash.PropertyPath): LodashPropOr3x6;
+        <TDefault>(defaultValue: TDefault, path: lodash.PropertyPath): TDefault;
+    }
+    type LodashPropOr3x5<TDefault> = (path: lodash.PropertyPath) => TDefault;
+    type LodashPropOr3x6 = <TDefault>(defaultValue: TDefault) => TDefault;
+    interface LodashPropOr4x1 {
+        (path: lodash.PropertyPath): LodashPropOr4x3;
+        (path: lodash.__, object: any): LodashPropOr4x5;
+        (path: lodash.PropertyPath, object: any): any;
+    }
+    type LodashPropOr4x3 = (object: any) => any;
+    interface LodashPropOr4x4 {
+        (defaultValue: any): LodashPropOr4x5;
+        (defaultValue: lodash.__, path: lodash.PropertyPath): LodashPropOr4x6;
+        (defaultValue: any, path: lodash.PropertyPath): any;
+    }
+    type LodashPropOr4x5 = (path: lodash.PropertyPath) => any;
+    type LodashPropOr4x6 = (defaultValue: any) => any;
+    interface LodashPull {
+        <T>(values: T): LodashPull1x1<T>;
+        <T>(values: lodash.__, array: ReadonlyArray<T>): LodashPull1x2<T>;
+        <T>(values: T, array: ReadonlyArray<T>): T[];
+        <T>(values: lodash.__, array: lodash.List<T>): LodashPull2x2<T>;
+        <T>(values: T, array: lodash.List<T>): lodash.List<T>;
+    }
+    interface LodashPull1x1<T> {
+        (array: ReadonlyArray<T>): T[];
+        (array: lodash.List<T>): lodash.List<T>;
+    }
+    type LodashPull1x2<T> = (values: T) => T[];
+    type LodashPull2x2<T> = (values: T) => lodash.List<T>;
+    interface LodashPullAll {
+        <T>(values: lodash.List<T>): LodashPullAll1x1<T>;
+        <T>(values: lodash.__, array: ReadonlyArray<T>): LodashPullAll1x2<T>;
+        <T>(values: lodash.List<T>, array: ReadonlyArray<T>): T[];
+        <T>(values: lodash.__, array: lodash.List<T>): LodashPullAll2x2<T>;
+        <T>(values: lodash.List<T>, array: lodash.List<T>): lodash.List<T>;
+    }
+    interface LodashPullAll1x1<T> {
+        (array: ReadonlyArray<T>): T[];
+        (array: lodash.List<T>): lodash.List<T>;
+    }
+    type LodashPullAll1x2<T> = (values: lodash.List<T>) => T[];
+    type LodashPullAll2x2<T> = (values: lodash.List<T>) => lodash.List<T>;
+    interface LodashPullAllBy {
+        <T>(iteratee: lodash.ValueIteratee<T>): LodashPullAllBy1x1<T>;
+        <T>(iteratee: lodash.__, values: lodash.List<T>): LodashPullAllBy1x2<T>;
+        <T>(iteratee: lodash.ValueIteratee<T>, values: lodash.List<T>): LodashPullAllBy1x3<T>;
+        <T>(iteratee: lodash.__, values: lodash.__, array: ReadonlyArray<T>): LodashPullAllBy1x4<T>;
+        <T>(iteratee: lodash.ValueIteratee<T>, values: lodash.__, array: ReadonlyArray<T>): LodashPullAllBy1x5<T>;
+        <T>(iteratee: lodash.__, values: lodash.List<T>, array: ReadonlyArray<T>): LodashPullAllBy1x6<T>;
+        <T>(iteratee: lodash.ValueIteratee<T>, values: lodash.List<T>, array: ReadonlyArray<T>): T[];
+        <T>(iteratee: lodash.__, values: lodash.__, array: lodash.List<T>): LodashPullAllBy2x4<T>;
+        <T>(iteratee: lodash.ValueIteratee<T>, values: lodash.__, array: lodash.List<T>): LodashPullAllBy2x5<T>;
+        <T>(iteratee: lodash.__, values: lodash.List<T>, array: lodash.List<T>): LodashPullAllBy2x6<T>;
+        <T>(iteratee: lodash.ValueIteratee<T>, values: lodash.List<T>, array: lodash.List<T>): lodash.List<T>;
+        <T1, T2>(iteratee: lodash.ValueIteratee<T1 | T2>): LodashPullAllBy3x1<T1, T2>;
+        <T2>(iteratee: lodash.__, values: lodash.List<T2>): LodashPullAllBy3x2<T2>;
+        <T1, T2>(iteratee: lodash.ValueIteratee<T1 | T2>, values: lodash.List<T2>): LodashPullAllBy3x3<T1>;
+        <T1>(iteratee: lodash.__, values: lodash.__, array: ReadonlyArray<T1>): LodashPullAllBy3x4<T1>;
+        <T1, T2>(iteratee: lodash.ValueIteratee<T1 | T2>, values: lodash.__, array: ReadonlyArray<T1>): LodashPullAllBy3x5<T1, T2>;
+        <T1, T2>(iteratee: lodash.__, values: lodash.List<T2>, array: ReadonlyArray<T1>): LodashPullAllBy3x6<T1, T2>;
+        <T1, T2>(iteratee: lodash.ValueIteratee<T1 | T2>, values: lodash.List<T2>, array: ReadonlyArray<T1>): T1[];
+        <T1>(iteratee: lodash.__, values: lodash.__, array: lodash.List<T1>): LodashPullAllBy4x4<T1>;
+        <T1, T2>(iteratee: lodash.ValueIteratee<T1 | T2>, values: lodash.__, array: lodash.List<T1>): LodashPullAllBy4x5<T1, T2>;
+        <T1, T2>(iteratee: lodash.__, values: lodash.List<T2>, array: lodash.List<T1>): LodashPullAllBy4x6<T1, T2>;
+        <T1, T2>(iteratee: lodash.ValueIteratee<T1 | T2>, values: lodash.List<T2>, array: lodash.List<T1>): lodash.List<T1>;
+    }
+    interface LodashPullAllBy1x1<T> {
+        (values: lodash.List<T>): LodashPullAllBy1x3<T>;
+        (values: lodash.__, array: ReadonlyArray<T>): LodashPullAllBy1x5<T>;
+        (values: lodash.List<T>, array: ReadonlyArray<T>): T[];
+        (values: lodash.__, array: lodash.List<T>): LodashPullAllBy2x5<T>;
+        (values: lodash.List<T>, array: lodash.List<T>): lodash.List<T>;
+    }
+    interface LodashPullAllBy1x2<T> {
+        (iteratee: lodash.ValueIteratee<T>): LodashPullAllBy1x3<T>;
+        (iteratee: lodash.__, array: ReadonlyArray<T>): LodashPullAllBy1x6<T>;
+        (iteratee: lodash.ValueIteratee<T>, array: ReadonlyArray<T>): T[];
+        (iteratee: lodash.__, array: lodash.List<T>): LodashPullAllBy2x6<T>;
+        (iteratee: lodash.ValueIteratee<T>, array: lodash.List<T>): lodash.List<T>;
+    }
+    interface LodashPullAllBy1x3<T> {
+        (array: ReadonlyArray<T>): T[];
+        (array: lodash.List<T>): lodash.List<T>;
+    }
+    interface LodashPullAllBy1x4<T> {
+        (iteratee: lodash.ValueIteratee<T>): LodashPullAllBy1x5<T>;
+        (iteratee: lodash.__, values: lodash.List<T>): LodashPullAllBy1x6<T>;
+        (iteratee: lodash.ValueIteratee<T>, values: lodash.List<T>): T[];
+    }
+    type LodashPullAllBy1x5<T> = (values: lodash.List<T>) => T[];
+    type LodashPullAllBy1x6<T> = (iteratee: lodash.ValueIteratee<T>) => T[];
+    interface LodashPullAllBy2x4<T> {
+        (iteratee: lodash.ValueIteratee<T>): LodashPullAllBy2x5<T>;
+        (iteratee: lodash.__, values: lodash.List<T>): LodashPullAllBy2x6<T>;
+        (iteratee: lodash.ValueIteratee<T>, values: lodash.List<T>): lodash.List<T>;
+    }
+    type LodashPullAllBy2x5<T> = (values: lodash.List<T>) => lodash.List<T>;
+    type LodashPullAllBy2x6<T> = (iteratee: lodash.ValueIteratee<T>) => lodash.List<T>;
+    interface LodashPullAllBy3x1<T1, T2> {
+        (values: lodash.List<T2>): LodashPullAllBy3x3<T1>;
+        (values: lodash.__, array: ReadonlyArray<T1>): LodashPullAllBy3x5<T1, T2>;
+        (values: lodash.List<T2>, array: ReadonlyArray<T1>): T1[];
+        (values: lodash.__, array: lodash.List<T1>): LodashPullAllBy4x5<T1, T2>;
+        (values: lodash.List<T2>, array: lodash.List<T1>): lodash.List<T1>;
+    }
+    interface LodashPullAllBy3x2<T2> {
+        <T1>(iteratee: lodash.ValueIteratee<T1 | T2>): LodashPullAllBy3x3<T1>;
+        <T1>(iteratee: lodash.__, array: ReadonlyArray<T1>): LodashPullAllBy3x6<T1, T2>;
+        <T1>(iteratee: lodash.ValueIteratee<T1 | T2>, array: ReadonlyArray<T1>): T1[];
+        <T1>(iteratee: lodash.__, array: lodash.List<T1>): LodashPullAllBy4x6<T1, T2>;
+        <T1>(iteratee: lodash.ValueIteratee<T1 | T2>, array: lodash.List<T1>): lodash.List<T1>;
+    }
+    interface LodashPullAllBy3x3<T1> {
+        (array: ReadonlyArray<T1>): T1[];
+        (array: lodash.List<T1>): lodash.List<T1>;
+    }
+    interface LodashPullAllBy3x4<T1> {
+        <T2>(iteratee: lodash.ValueIteratee<T1 | T2>): LodashPullAllBy3x5<T1, T2>;
+        <T2>(iteratee: lodash.__, values: lodash.List<T2>): LodashPullAllBy3x6<T1, T2>;
+        <T2>(iteratee: lodash.ValueIteratee<T1 | T2>, values: lodash.List<T2>): T1[];
+    }
+    type LodashPullAllBy3x5<T1, T2> = (values: lodash.List<T2>) => T1[];
+    type LodashPullAllBy3x6<T1, T2> = (iteratee: lodash.ValueIteratee<T1 | T2>) => T1[];
+    interface LodashPullAllBy4x4<T1> {
+        <T2>(iteratee: lodash.ValueIteratee<T1 | T2>): LodashPullAllBy4x5<T1, T2>;
+        <T2>(iteratee: lodash.__, values: lodash.List<T2>): LodashPullAllBy4x6<T1, T2>;
+        <T2>(iteratee: lodash.ValueIteratee<T1 | T2>, values: lodash.List<T2>): lodash.List<T1>;
+    }
+    type LodashPullAllBy4x5<T1, T2> = (values: lodash.List<T2>) => lodash.List<T1>;
+    type LodashPullAllBy4x6<T1, T2> = (iteratee: lodash.ValueIteratee<T1 | T2>) => lodash.List<T1>;
+    interface LodashPullAllWith {
+        <T>(comparator: lodash.Comparator<T>): LodashPullAllWith1x1<T>;
+        <T>(comparator: lodash.__, values: lodash.List<T>): LodashPullAllWith1x2<T>;
+        <T>(comparator: lodash.Comparator<T>, values: lodash.List<T>): LodashPullAllWith1x3<T>;
+        <T>(comparator: lodash.__, values: lodash.__, array: ReadonlyArray<T>): LodashPullAllWith1x4<T>;
+        <T>(comparator: lodash.Comparator<T>, values: lodash.__, array: ReadonlyArray<T>): LodashPullAllWith1x5<T>;
+        <T>(comparator: lodash.__, values: lodash.List<T>, array: ReadonlyArray<T>): LodashPullAllWith1x6<T>;
+        <T>(comparator: lodash.Comparator<T>, values: lodash.List<T>, array: ReadonlyArray<T>): T[];
+        <T>(comparator: lodash.__, values: lodash.__, array: lodash.List<T>): LodashPullAllWith2x4<T>;
+        <T>(comparator: lodash.Comparator<T>, values: lodash.__, array: lodash.List<T>): LodashPullAllWith2x5<T>;
+        <T>(comparator: lodash.__, values: lodash.List<T>, array: lodash.List<T>): LodashPullAllWith2x6<T>;
+        <T>(comparator: lodash.Comparator<T>, values: lodash.List<T>, array: lodash.List<T>): lodash.List<T>;
+        <T1, T2>(comparator: lodash.Comparator2<T1, T2>): LodashPullAllWith3x1<T1, T2>;
+        <T2>(comparator: lodash.__, values: lodash.List<T2>): LodashPullAllWith3x2<T2>;
+        <T1, T2>(comparator: lodash.Comparator2<T1, T2>, values: lodash.List<T2>): LodashPullAllWith3x3<T1>;
+        <T1>(comparator: lodash.__, values: lodash.__, array: ReadonlyArray<T1>): LodashPullAllWith3x4<T1>;
+        <T1, T2>(comparator: lodash.Comparator2<T1, T2>, values: lodash.__, array: ReadonlyArray<T1>): LodashPullAllWith3x5<T1, T2>;
+        <T1, T2>(comparator: lodash.__, values: lodash.List<T2>, array: ReadonlyArray<T1>): LodashPullAllWith3x6<T1, T2>;
+        <T1, T2>(comparator: lodash.Comparator2<T1, T2>, values: lodash.List<T2>, array: ReadonlyArray<T1>): T1[];
+        <T1>(comparator: lodash.__, values: lodash.__, array: lodash.List<T1>): LodashPullAllWith4x4<T1>;
+        <T1, T2>(comparator: lodash.Comparator2<T1, T2>, values: lodash.__, array: lodash.List<T1>): LodashPullAllWith4x5<T1, T2>;
+        <T1, T2>(comparator: lodash.__, values: lodash.List<T2>, array: lodash.List<T1>): LodashPullAllWith4x6<T1, T2>;
+        <T1, T2>(comparator: lodash.Comparator2<T1, T2>, values: lodash.List<T2>, array: lodash.List<T1>): lodash.List<T1>;
+    }
+    interface LodashPullAllWith1x1<T> {
+        (values: lodash.List<T>): LodashPullAllWith1x3<T>;
+        (values: lodash.__, array: ReadonlyArray<T>): LodashPullAllWith1x5<T>;
+        (values: lodash.List<T>, array: ReadonlyArray<T>): T[];
+        (values: lodash.__, array: lodash.List<T>): LodashPullAllWith2x5<T>;
+        (values: lodash.List<T>, array: lodash.List<T>): lodash.List<T>;
+    }
+    interface LodashPullAllWith1x2<T> {
+        (comparator: lodash.Comparator<T>): LodashPullAllWith1x3<T>;
+        (comparator: lodash.__, array: ReadonlyArray<T>): LodashPullAllWith1x6<T>;
+        (comparator: lodash.Comparator<T>, array: ReadonlyArray<T>): T[];
+        (comparator: lodash.__, array: lodash.List<T>): LodashPullAllWith2x6<T>;
+        (comparator: lodash.Comparator<T>, array: lodash.List<T>): lodash.List<T>;
+    }
+    interface LodashPullAllWith1x3<T> {
+        (array: ReadonlyArray<T>): T[];
+        (array: lodash.List<T>): lodash.List<T>;
+    }
+    interface LodashPullAllWith1x4<T> {
+        (comparator: lodash.Comparator<T>): LodashPullAllWith1x5<T>;
+        (comparator: lodash.__, values: lodash.List<T>): LodashPullAllWith1x6<T>;
+        (comparator: lodash.Comparator<T>, values: lodash.List<T>): T[];
+    }
+    type LodashPullAllWith1x5<T> = (values: lodash.List<T>) => T[];
+    type LodashPullAllWith1x6<T> = (comparator: lodash.Comparator<T>) => T[];
+    interface LodashPullAllWith2x4<T> {
+        (comparator: lodash.Comparator<T>): LodashPullAllWith2x5<T>;
+        (comparator: lodash.__, values: lodash.List<T>): LodashPullAllWith2x6<T>;
+        (comparator: lodash.Comparator<T>, values: lodash.List<T>): lodash.List<T>;
+    }
+    type LodashPullAllWith2x5<T> = (values: lodash.List<T>) => lodash.List<T>;
+    type LodashPullAllWith2x6<T> = (comparator: lodash.Comparator<T>) => lodash.List<T>;
+    interface LodashPullAllWith3x1<T1, T2> {
+        (values: lodash.List<T2>): LodashPullAllWith3x3<T1>;
+        (values: lodash.__, array: ReadonlyArray<T1>): LodashPullAllWith3x5<T1, T2>;
+        (values: lodash.List<T2>, array: ReadonlyArray<T1>): T1[];
+        (values: lodash.__, array: lodash.List<T1>): LodashPullAllWith4x5<T1, T2>;
+        (values: lodash.List<T2>, array: lodash.List<T1>): lodash.List<T1>;
+    }
+    interface LodashPullAllWith3x2<T2> {
+        <T1>(comparator: lodash.Comparator2<T1, T2>): LodashPullAllWith3x3<T1>;
+        <T1>(comparator: lodash.__, array: ReadonlyArray<T1>): LodashPullAllWith3x6<T1, T2>;
+        <T1>(comparator: lodash.Comparator2<T1, T2>, array: ReadonlyArray<T1>): T1[];
+        <T1>(comparator: lodash.__, array: lodash.List<T1>): LodashPullAllWith4x6<T1, T2>;
+        <T1>(comparator: lodash.Comparator2<T1, T2>, array: lodash.List<T1>): lodash.List<T1>;
+    }
+    interface LodashPullAllWith3x3<T1> {
+        (array: ReadonlyArray<T1>): T1[];
+        (array: lodash.List<T1>): lodash.List<T1>;
+    }
+    interface LodashPullAllWith3x4<T1> {
+        <T2>(comparator: lodash.Comparator2<T1, T2>): LodashPullAllWith3x5<T1, T2>;
+        <T2>(comparator: lodash.__, values: lodash.List<T2>): LodashPullAllWith3x6<T1, T2>;
+        <T2>(comparator: lodash.Comparator2<T1, T2>, values: lodash.List<T2>): T1[];
+    }
+    type LodashPullAllWith3x5<T1, T2> = (values: lodash.List<T2>) => T1[];
+    type LodashPullAllWith3x6<T1, T2> = (comparator: lodash.Comparator2<T1, T2>) => T1[];
+    interface LodashPullAllWith4x4<T1> {
+        <T2>(comparator: lodash.Comparator2<T1, T2>): LodashPullAllWith4x5<T1, T2>;
+        <T2>(comparator: lodash.__, values: lodash.List<T2>): LodashPullAllWith4x6<T1, T2>;
+        <T2>(comparator: lodash.Comparator2<T1, T2>, values: lodash.List<T2>): lodash.List<T1>;
+    }
+    type LodashPullAllWith4x5<T1, T2> = (values: lodash.List<T2>) => lodash.List<T1>;
+    type LodashPullAllWith4x6<T1, T2> = (comparator: lodash.Comparator2<T1, T2>) => lodash.List<T1>;
+    interface LodashPullAt {
+        (indexes: lodash.Many<number>): LodashPullAt1x1;
+        <T>(indexes: lodash.__, array: ReadonlyArray<T>): LodashPullAt1x2<T>;
+        <T>(indexes: lodash.Many<number>, array: ReadonlyArray<T>): T[];
+        <T>(indexes: lodash.__, array: lodash.List<T>): LodashPullAt2x2<T>;
+        <T>(indexes: lodash.Many<number>, array: lodash.List<T>): lodash.List<T>;
+    }
+    interface LodashPullAt1x1 {
+        <T>(array: ReadonlyArray<T>): T[];
+        <T>(array: lodash.List<T>): lodash.List<T>;
+    }
+    type LodashPullAt1x2<T> = (indexes: lodash.Many<number>) => T[];
+    type LodashPullAt2x2<T> = (indexes: lodash.Many<number>) => lodash.List<T>;
+    interface LodashRandom {
+        (maxOrMin: number): LodashRandom1x1;
+        (max: lodash.__, floating: boolean): LodashRandom1x2;
+        (maxOrMin: number, floatingOrMax: boolean | number): number;
+        (min: lodash.__, max: number): LodashRandom2x2;
+    }
+    type LodashRandom1x1 = (floatingOrMax: boolean | number) => number;
+    type LodashRandom1x2 = (max: number) => number;
+    type LodashRandom2x2 = (min: number) => number;
+    interface LodashRange {
+        (start: number): LodashRange1x1;
+        (start: lodash.__, end: number): LodashRange1x2;
+        (start: number, end: number): number[];
+    }
+    type LodashRange1x1 = (end: number) => number[];
+    type LodashRange1x2 = (start: number) => number[];
+    interface LodashRangeRight {
+        (start: number): LodashRangeRight1x1;
+        (start: lodash.__, end: number): LodashRangeRight1x2;
+        (start: number, end: number): number[];
+    }
+    type LodashRangeRight1x1 = (end: number) => number[];
+    type LodashRangeRight1x2 = (start: number) => number[];
+    interface LodashRangeStep {
+        (start: number): LodashRangeStep1x1;
+        (start: lodash.__, end: number): LodashRangeStep1x2;
+        (start: number, end: number): LodashRangeStep1x3;
+        (start: lodash.__, end: lodash.__, step: number): LodashRangeStep1x4;
+        (start: number, end: lodash.__, step: number): LodashRangeStep1x5;
+        (start: lodash.__, end: number, step: number): LodashRangeStep1x6;
+        (start: number, end: number, step: number): number[];
+    }
+    interface LodashRangeStep1x1 {
+        (end: number): LodashRangeStep1x3;
+        (end: lodash.__, step: number): LodashRangeStep1x5;
+        (end: number, step: number): number[];
+    }
+    interface LodashRangeStep1x2 {
+        (start: number): LodashRangeStep1x3;
+        (start: lodash.__, step: number): LodashRangeStep1x6;
+        (start: number, step: number): number[];
+    }
+    type LodashRangeStep1x3 = (step: number) => number[];
+    interface LodashRangeStep1x4 {
+        (start: number): LodashRangeStep1x5;
+        (start: lodash.__, end: number): LodashRangeStep1x6;
+        (start: number, end: number): number[];
+    }
+    type LodashRangeStep1x5 = (end: number) => number[];
+    type LodashRangeStep1x6 = (start: number) => number[];
+    interface LodashRangeStepRight {
+        (start: number): LodashRangeStepRight1x1;
+        (start: lodash.__, end: number): LodashRangeStepRight1x2;
+        (start: number, end: number): LodashRangeStepRight1x3;
+        (start: lodash.__, end: lodash.__, step: number): LodashRangeStepRight1x4;
+        (start: number, end: lodash.__, step: number): LodashRangeStepRight1x5;
+        (start: lodash.__, end: number, step: number): LodashRangeStepRight1x6;
+        (start: number, end: number, step: number): number[];
+    }
+    interface LodashRangeStepRight1x1 {
+        (end: number): LodashRangeStepRight1x3;
+        (end: lodash.__, step: number): LodashRangeStepRight1x5;
+        (end: number, step: number): number[];
+    }
+    interface LodashRangeStepRight1x2 {
+        (start: number): LodashRangeStepRight1x3;
+        (start: lodash.__, step: number): LodashRangeStepRight1x6;
+        (start: number, step: number): number[];
+    }
+    type LodashRangeStepRight1x3 = (step: number) => number[];
+    interface LodashRangeStepRight1x4 {
+        (start: number): LodashRangeStepRight1x5;
+        (start: lodash.__, end: number): LodashRangeStepRight1x6;
+        (start: number, end: number): number[];
+    }
+    type LodashRangeStepRight1x5 = (end: number) => number[];
+    type LodashRangeStepRight1x6 = (start: number) => number[];
+    interface LodashRearg {
+        (indexes: lodash.Many<number>): LodashRearg1x1;
+        (indexes: lodash.__, func: (...args: any[]) => any): LodashRearg1x2;
+        (indexes: lodash.Many<number>, func: (...args: any[]) => any): (...args: any[]) => any;
+    }
+    type LodashRearg1x1 = (func: (...args: any[]) => any) => (...args: any[]) => any;
+    type LodashRearg1x2 = (indexes: lodash.Many<number>) => (...args: any[]) => any;
+    interface LodashReduce {
+        <T, TResult>(callback: lodash.MemoIteratorCapped<T, TResult>): LodashReduce1x1<T, TResult>;
+        <TResult>(callback: lodash.__, accumulator: TResult): LodashReduce1x2<TResult>;
+        <T, TResult>(callback: lodash.MemoIteratorCapped<T, TResult>, accumulator: TResult): LodashReduce1x3<T, TResult>;
+        <T>(callback: lodash.__, accumulator: lodash.__, collection: T[] | null | undefined): LodashReduce1x4<T>;
+        <T, TResult>(callback: lodash.MemoIteratorCapped<T, TResult>, accumulator: lodash.__, collection: T[] | null | undefined): LodashReduce1x5<TResult>;
+        <T, TResult>(callback: lodash.__, accumulator: TResult, collection: T[] | null | undefined): LodashReduce1x6<T, TResult>;
+        <T, TResult>(callback: lodash.MemoIteratorCapped<T, TResult>, accumulator: TResult, collection: T[] | lodash.List<T> | null | undefined): TResult;
+        <T>(callback: lodash.__, accumulator: lodash.__, collection: lodash.List<T> | null | undefined): LodashReduce2x4<T>;
+        <T, TResult>(callback: lodash.MemoIteratorCapped<T, TResult>, accumulator: lodash.__, collection: lodash.List<T> | null | undefined): LodashReduce2x5<TResult>;
+        <T, TResult>(callback: lodash.__, accumulator: TResult, collection: lodash.List<T> | null | undefined): LodashReduce2x6<T, TResult>;
+        <T extends object, TResult>(callback: lodash.MemoIteratorCapped<T[keyof T], TResult>): LodashReduce3x1<T, TResult>;
+        <T extends object, TResult>(callback: lodash.MemoIteratorCapped<T[keyof T], TResult>, accumulator: TResult): LodashReduce3x3<T, TResult>;
+        <T extends object>(callback: lodash.__, accumulator: lodash.__, collection: T | null | undefined): LodashReduce3x4<T>;
+        <T extends object, TResult>(callback: lodash.MemoIteratorCapped<T[keyof T], TResult>, accumulator: lodash.__, collection: T | null | undefined): LodashReduce3x5<TResult>;
+        <T extends object, TResult>(callback: lodash.__, accumulator: TResult, collection: T | null | undefined): LodashReduce3x6<T, TResult>;
+        <T extends object, TResult>(callback: lodash.MemoIteratorCapped<T[keyof T], TResult>, accumulator: TResult, collection: T | null | undefined): TResult;
+    }
+    interface LodashReduce1x1<T, TResult> {
+        (accumulator: TResult): LodashReduce1x3<T, TResult>;
+        (accumulator: lodash.__, collection: T[] | null | undefined): LodashReduce1x5<TResult>;
+        (accumulator: TResult, collection: T[] | lodash.List<T> | null | undefined): TResult;
+        (accumulator: lodash.__, collection: lodash.List<T> | null | undefined): LodashReduce2x5<TResult>;
+    }
+    interface LodashReduce1x2<TResult> {
+        <T>(callback: lodash.MemoIteratorCapped<T, TResult>): LodashReduce1x3<T, TResult>;
+        <T>(callback: lodash.__, collection: T[] | null | undefined): LodashReduce1x6<T, TResult>;
+        <T>(callback: lodash.MemoIteratorCapped<T, TResult>, collection: T[] | lodash.List<T> | null | undefined): TResult;
+        <T>(callback: lodash.__, collection: lodash.List<T> | null | undefined): LodashReduce2x6<T, TResult>;
+        <T extends object>(callback: lodash.MemoIteratorCapped<T[keyof T], TResult>): LodashReduce3x3<T, TResult>;
+        <T extends object>(callback: lodash.__, collection: T | null | undefined): LodashReduce3x6<T, TResult>;
+        <T extends object>(callback: lodash.MemoIteratorCapped<T[keyof T], TResult>, collection: T | null | undefined): TResult;
+    }
+    type LodashReduce1x3<T, TResult> = (collection: T[] | lodash.List<T> | null | undefined) => TResult;
+    interface LodashReduce1x4<T> {
+        <TResult>(callback: lodash.MemoIteratorCapped<T, TResult>): LodashReduce1x5<TResult>;
+        <TResult>(callback: lodash.__, accumulator: TResult): LodashReduce1x6<T, TResult>;
+        <TResult>(callback: lodash.MemoIteratorCapped<T, TResult>, accumulator: TResult): TResult;
+    }
+    type LodashReduce1x5<TResult> = (accumulator: TResult) => TResult;
+    type LodashReduce1x6<T, TResult> = (callback: lodash.MemoIteratorCapped<T, TResult>) => TResult;
+    interface LodashReduce2x4<T> {
+        <TResult>(callback: lodash.MemoIteratorCapped<T, TResult>): LodashReduce2x5<TResult>;
+        <TResult>(callback: lodash.__, accumulator: TResult): LodashReduce2x6<T, TResult>;
+        <TResult>(callback: lodash.MemoIteratorCapped<T, TResult>, accumulator: TResult): TResult;
+    }
+    type LodashReduce2x5<TResult> = (accumulator: TResult) => TResult;
+    type LodashReduce2x6<T, TResult> = (callback: lodash.MemoIteratorCapped<T, TResult>) => TResult;
+    interface LodashReduce3x1<T, TResult> {
+        (accumulator: TResult): LodashReduce3x3<T, TResult>;
+        (accumulator: lodash.__, collection: T | null | undefined): LodashReduce3x5<TResult>;
+        (accumulator: TResult, collection: T | null | undefined): TResult;
+    }
+    type LodashReduce3x3<T, TResult> = (collection: T | null | undefined) => TResult;
+    interface LodashReduce3x4<T> {
+        <TResult>(callback: lodash.MemoIteratorCapped<T[keyof T], TResult>): LodashReduce3x5<TResult>;
+        <TResult>(callback: lodash.__, accumulator: TResult): LodashReduce3x6<T, TResult>;
+        <TResult>(callback: lodash.MemoIteratorCapped<T[keyof T], TResult>, accumulator: TResult): TResult;
+    }
+    type LodashReduce3x5<TResult> = (accumulator: TResult) => TResult;
+    type LodashReduce3x6<T, TResult> = (callback: lodash.MemoIteratorCapped<T[keyof T], TResult>) => TResult;
+    interface LodashReduceRight {
+        <T, TResult>(callback: lodash.MemoIteratorCappedRight<T, TResult>): LodashReduceRight1x1<T, TResult>;
+        <TResult>(callback: lodash.__, accumulator: TResult): LodashReduceRight1x2<TResult>;
+        <T, TResult>(callback: lodash.MemoIteratorCappedRight<T, TResult>, accumulator: TResult): LodashReduceRight1x3<T, TResult>;
+        <T>(callback: lodash.__, accumulator: lodash.__, collection: T[] | null | undefined): LodashReduceRight1x4<T>;
+        <T, TResult>(callback: lodash.MemoIteratorCappedRight<T, TResult>, accumulator: lodash.__, collection: T[] | null | undefined): LodashReduceRight1x5<TResult>;
+        <T, TResult>(callback: lodash.__, accumulator: TResult, collection: T[] | null | undefined): LodashReduceRight1x6<T, TResult>;
+        <T, TResult>(callback: lodash.MemoIteratorCappedRight<T, TResult>, accumulator: TResult, collection: T[] | lodash.List<T> | null | undefined): TResult;
+        <T>(callback: lodash.__, accumulator: lodash.__, collection: lodash.List<T> | null | undefined): LodashReduceRight2x4<T>;
+        <T, TResult>(callback: lodash.MemoIteratorCappedRight<T, TResult>, accumulator: lodash.__, collection: lodash.List<T> | null | undefined): LodashReduceRight2x5<TResult>;
+        <T, TResult>(callback: lodash.__, accumulator: TResult, collection: lodash.List<T> | null | undefined): LodashReduceRight2x6<T, TResult>;
+        <T extends object, TResult>(callback: lodash.MemoIteratorCappedRight<T[keyof T], TResult>): LodashReduceRight3x1<T, TResult>;
+        <T extends object, TResult>(callback: lodash.MemoIteratorCappedRight<T[keyof T], TResult>, accumulator: TResult): LodashReduceRight3x3<T, TResult>;
+        <T extends object>(callback: lodash.__, accumulator: lodash.__, collection: T | null | undefined): LodashReduceRight3x4<T>;
+        <T extends object, TResult>(callback: lodash.MemoIteratorCappedRight<T[keyof T], TResult>, accumulator: lodash.__, collection: T | null | undefined): LodashReduceRight3x5<TResult>;
+        <T extends object, TResult>(callback: lodash.__, accumulator: TResult, collection: T | null | undefined): LodashReduceRight3x6<T, TResult>;
+        <T extends object, TResult>(callback: lodash.MemoIteratorCappedRight<T[keyof T], TResult>, accumulator: TResult, collection: T | null | undefined): TResult;
+    }
+    interface LodashReduceRight1x1<T, TResult> {
+        (accumulator: TResult): LodashReduceRight1x3<T, TResult>;
+        (accumulator: lodash.__, collection: T[] | null | undefined): LodashReduceRight1x5<TResult>;
+        (accumulator: TResult, collection: T[] | lodash.List<T> | null | undefined): TResult;
+        (accumulator: lodash.__, collection: lodash.List<T> | null | undefined): LodashReduceRight2x5<TResult>;
+    }
+    interface LodashReduceRight1x2<TResult> {
+        <T>(callback: lodash.MemoIteratorCappedRight<T, TResult>): LodashReduceRight1x3<T, TResult>;
+        <T>(callback: lodash.__, collection: T[] | null | undefined): LodashReduceRight1x6<T, TResult>;
+        <T>(callback: lodash.MemoIteratorCappedRight<T, TResult>, collection: T[] | lodash.List<T> | null | undefined): TResult;
+        <T>(callback: lodash.__, collection: lodash.List<T> | null | undefined): LodashReduceRight2x6<T, TResult>;
+        <T extends object>(callback: lodash.MemoIteratorCappedRight<T[keyof T], TResult>): LodashReduceRight3x3<T, TResult>;
+        <T extends object>(callback: lodash.__, collection: T | null | undefined): LodashReduceRight3x6<T, TResult>;
+        <T extends object>(callback: lodash.MemoIteratorCappedRight<T[keyof T], TResult>, collection: T | null | undefined): TResult;
+    }
+    type LodashReduceRight1x3<T, TResult> = (collection: T[] | lodash.List<T> | null | undefined) => TResult;
+    interface LodashReduceRight1x4<T> {
+        <TResult>(callback: lodash.MemoIteratorCappedRight<T, TResult>): LodashReduceRight1x5<TResult>;
+        <TResult>(callback: lodash.__, accumulator: TResult): LodashReduceRight1x6<T, TResult>;
+        <TResult>(callback: lodash.MemoIteratorCappedRight<T, TResult>, accumulator: TResult): TResult;
+    }
+    type LodashReduceRight1x5<TResult> = (accumulator: TResult) => TResult;
+    type LodashReduceRight1x6<T, TResult> = (callback: lodash.MemoIteratorCappedRight<T, TResult>) => TResult;
+    interface LodashReduceRight2x4<T> {
+        <TResult>(callback: lodash.MemoIteratorCappedRight<T, TResult>): LodashReduceRight2x5<TResult>;
+        <TResult>(callback: lodash.__, accumulator: TResult): LodashReduceRight2x6<T, TResult>;
+        <TResult>(callback: lodash.MemoIteratorCappedRight<T, TResult>, accumulator: TResult): TResult;
+    }
+    type LodashReduceRight2x5<TResult> = (accumulator: TResult) => TResult;
+    type LodashReduceRight2x6<T, TResult> = (callback: lodash.MemoIteratorCappedRight<T, TResult>) => TResult;
+    interface LodashReduceRight3x1<T, TResult> {
+        (accumulator: TResult): LodashReduceRight3x3<T, TResult>;
+        (accumulator: lodash.__, collection: T | null | undefined): LodashReduceRight3x5<TResult>;
+        (accumulator: TResult, collection: T | null | undefined): TResult;
+    }
+    type LodashReduceRight3x3<T, TResult> = (collection: T | null | undefined) => TResult;
+    interface LodashReduceRight3x4<T> {
+        <TResult>(callback: lodash.MemoIteratorCappedRight<T[keyof T], TResult>): LodashReduceRight3x5<TResult>;
+        <TResult>(callback: lodash.__, accumulator: TResult): LodashReduceRight3x6<T, TResult>;
+        <TResult>(callback: lodash.MemoIteratorCappedRight<T[keyof T], TResult>, accumulator: TResult): TResult;
+    }
+    type LodashReduceRight3x5<TResult> = (accumulator: TResult) => TResult;
+    type LodashReduceRight3x6<T, TResult> = (callback: lodash.MemoIteratorCappedRight<T[keyof T], TResult>) => TResult;
+    interface LodashReject {
+        (predicate: (value: string) => boolean): LodashReject1x1;
+        (predicate: lodash.__, collection: string | null | undefined): LodashReject1x2;
+        (predicate: (value: string) => boolean, collection: string | null | undefined): string[];
+        <T>(predicate: lodash.ValueIterateeCustom<T, boolean>): LodashReject2x1<T>;
+        <T>(predicate: lodash.__, collection: lodash.List<T> | null | undefined): LodashReject2x2<T>;
+        <T>(predicate: lodash.ValueIterateeCustom<T, boolean>, collection: lodash.List<T> | null | undefined): T[];
+        <T extends object>(predicate: lodash.__, collection: T | null | undefined): LodashReject3x2<T>;
+        <T extends object>(predicate: lodash.ValueIterateeCustom<T[keyof T], boolean>, collection: T | null | undefined): Array<T[keyof T]>;
+    }
+    type LodashReject1x1 = (collection: string | null | undefined) => string[];
+    type LodashReject1x2 = (predicate: (value: string) => boolean) => string[];
+    type LodashReject2x1<T> = (collection: lodash.List<T> | object | null | undefined) => T[];
+    type LodashReject2x2<T> = (predicate: lodash.ValueIterateeCustom<T, boolean>) => T[];
+    type LodashReject3x2<T> = (predicate: lodash.ValueIterateeCustom<T[keyof T], boolean>) => Array<T[keyof T]>;
+    interface LodashRemove {
+        <T>(predicate: lodash.ValueIteratee<T>): LodashRemove1x1<T>;
+        <T>(predicate: lodash.__, array: lodash.List<T>): LodashRemove1x2<T>;
+        <T>(predicate: lodash.ValueIteratee<T>, array: lodash.List<T>): T[];
+    }
+    type LodashRemove1x1<T> = (array: lodash.List<T>) => T[];
+    type LodashRemove1x2<T> = (predicate: lodash.ValueIteratee<T>) => T[];
+    interface LodashRepeat {
+        (n: number): LodashRepeat1x1;
+        (n: lodash.__, string: string): LodashRepeat1x2;
+        (n: number, string: string): string;
+    }
+    type LodashRepeat1x1 = (string: string) => string;
+    type LodashRepeat1x2 = (n: number) => string;
+    interface LodashReplace {
+        (pattern: RegExp | string): LodashReplace1x1;
+        (pattern: lodash.__, replacement: lodash.ReplaceFunction | string): LodashReplace1x2;
+        (pattern: RegExp | string, replacement: lodash.ReplaceFunction | string): LodashReplace1x3;
+        (pattern: lodash.__, replacement: lodash.__, string: string): LodashReplace1x4;
+        (pattern: RegExp | string, replacement: lodash.__, string: string): LodashReplace1x5;
+        (pattern: lodash.__, replacement: lodash.ReplaceFunction | string, string: string): LodashReplace1x6;
+        (pattern: RegExp | string, replacement: lodash.ReplaceFunction | string, string: string): string;
+    }
+    interface LodashReplace1x1 {
+        (replacement: lodash.ReplaceFunction | string): LodashReplace1x3;
+        (replacement: lodash.__, string: string): LodashReplace1x5;
+        (replacement: lodash.ReplaceFunction | string, string: string): string;
+    }
+    interface LodashReplace1x2 {
+        (pattern: RegExp | string): LodashReplace1x3;
+        (pattern: lodash.__, string: string): LodashReplace1x6;
+        (pattern: RegExp | string, string: string): string;
+    }
+    type LodashReplace1x3 = (string: string) => string;
+    interface LodashReplace1x4 {
+        (pattern: RegExp | string): LodashReplace1x5;
+        (pattern: lodash.__, replacement: lodash.ReplaceFunction | string): LodashReplace1x6;
+        (pattern: RegExp | string, replacement: lodash.ReplaceFunction | string): string;
+    }
+    type LodashReplace1x5 = (replacement: lodash.ReplaceFunction | string) => string;
+    type LodashReplace1x6 = (pattern: RegExp | string) => string;
+    type LodashRest = (func: (...args: any[]) => any) => (...args: any[]) => any;
+    interface LodashRestFrom {
+        (start: number): LodashRestFrom1x1;
+        (start: lodash.__, func: (...args: any[]) => any): LodashRestFrom1x2;
+        (start: number, func: (...args: any[]) => any): (...args: any[]) => any;
+    }
+    type LodashRestFrom1x1 = (func: (...args: any[]) => any) => (...args: any[]) => any;
+    type LodashRestFrom1x2 = (start: number) => (...args: any[]) => any;
+    interface LodashResult {
+        (path: lodash.PropertyPath): LodashResult1x1;
+        (path: lodash.__, object: any): LodashResult1x2;
+        <TResult>(path: lodash.PropertyPath, object: any): TResult;
+    }
+    type LodashResult1x1 = <TResult>(object: any) => TResult;
+    type LodashResult1x2 = <TResult>(path: lodash.PropertyPath) => TResult;
+    type LodashReverse = <TList extends lodash.List<any>>(array: TList) => TList;
+    type LodashRound = (n: number) => number;
+    type LodashRunInContext = (context: object) => lodash.LoDashStatic;
+    interface LodashSample {
+        <T>(collection: lodash.List<T> | lodash.Dictionary<T> | lodash.NumericDictionary<T> | null | undefined): T | undefined;
+        <T extends object>(collection: T | null | undefined): T[keyof T] | undefined;
+    }
+    interface LodashSampleSize {
+        (n: number): LodashSampleSize1x1;
+        <T>(n: lodash.__, collection: lodash.List<T> | lodash.Dictionary<T> | lodash.NumericDictionary<T> | null | undefined): LodashSampleSize1x2<T>;
+        <T>(n: number, collection: lodash.List<T> | lodash.Dictionary<T> | lodash.NumericDictionary<T> | null | undefined): T[];
+        <T extends object>(n: lodash.__, collection: T | null | undefined): LodashSampleSize2x2<T>;
+        <T extends object>(n: number, collection: T | null | undefined): Array<T[keyof T]>;
+    }
+    interface LodashSampleSize1x1 {
+        <T>(collection: lodash.List<T> | lodash.Dictionary<T> | lodash.NumericDictionary<T> | null | undefined): T[];
+        <T extends object>(collection: T | null | undefined): Array<T[keyof T]>;
+    }
+    type LodashSampleSize1x2<T> = (n: number) => T[];
+    type LodashSampleSize2x2<T> = (n: number) => Array<T[keyof T]>;
+    interface LodashSetWith {
+        <T extends object>(customizer: lodash.SetWithCustomizer<T>): LodashSetWith1x1<T>;
+        (customizer: lodash.__, path: lodash.PropertyPath): LodashSetWith1x2;
+        <T extends object>(customizer: lodash.SetWithCustomizer<T>, path: lodash.PropertyPath): LodashSetWith1x3<T>;
+        (customizer: lodash.__, path: lodash.__, value: any): LodashSetWith1x4;
+        <T extends object>(customizer: lodash.SetWithCustomizer<T>, path: lodash.__, value: any): LodashSetWith1x5<T>;
+        (customizer: lodash.__, path: lodash.PropertyPath, value: any): LodashSetWith1x6;
+        <T extends object>(customizer: lodash.SetWithCustomizer<T>, path: lodash.PropertyPath, value: any): LodashSetWith1x7<T>;
+        <T extends object>(customizer: lodash.__, path: lodash.__, value: lodash.__, object: T): LodashSetWith1x8<T>;
+        <T extends object>(customizer: lodash.SetWithCustomizer<T>, path: lodash.__, value: lodash.__, object: T): LodashSetWith1x9<T>;
+        <T extends object>(customizer: lodash.__, path: lodash.PropertyPath, value: lodash.__, object: T): LodashSetWith1x10<T>;
+        <T extends object>(customizer: lodash.SetWithCustomizer<T>, path: lodash.PropertyPath, value: lodash.__, object: T): LodashSetWith1x11<T>;
+        <T extends object>(customizer: lodash.__, path: lodash.__, value: any, object: T): LodashSetWith1x12<T>;
+        <T extends object>(customizer: lodash.SetWithCustomizer<T>, path: lodash.__, value: any, object: T): LodashSetWith1x13<T>;
+        <T extends object>(customizer: lodash.__, path: lodash.PropertyPath, value: any, object: T): LodashSetWith1x14<T>;
+        <T extends object>(customizer: lodash.SetWithCustomizer<T>, path: lodash.PropertyPath, value: any, object: T): T;
+    }
+    interface LodashSetWith1x1<T> {
+        (path: lodash.PropertyPath): LodashSetWith1x3<T>;
+        (path: lodash.__, value: any): LodashSetWith1x5<T>;
+        (path: lodash.PropertyPath, value: any): LodashSetWith1x7<T>;
+        (path: lodash.__, value: lodash.__, object: T): LodashSetWith1x9<T>;
+        (path: lodash.PropertyPath, value: lodash.__, object: T): LodashSetWith1x11<T>;
+        (path: lodash.__, value: any, object: T): LodashSetWith1x13<T>;
+        (path: lodash.PropertyPath, value: any, object: T): T;
+    }
+    interface LodashSetWith1x2 {
+        <T extends object>(customizer: lodash.SetWithCustomizer<T>): LodashSetWith1x3<T>;
+        (customizer: lodash.__, value: any): LodashSetWith1x6;
+        <T extends object>(customizer: lodash.SetWithCustomizer<T>, value: any): LodashSetWith1x7<T>;
+        <T extends object>(customizer: lodash.__, value: lodash.__, object: T): LodashSetWith1x10<T>;
+        <T extends object>(customizer: lodash.SetWithCustomizer<T>, value: lodash.__, object: T): LodashSetWith1x11<T>;
+        <T extends object>(customizer: lodash.__, value: any, object: T): LodashSetWith1x14<T>;
+        <T extends object>(customizer: lodash.SetWithCustomizer<T>, value: any, object: T): T;
+    }
+    interface LodashSetWith1x3<T> {
+        (value: any): LodashSetWith1x7<T>;
+        (value: lodash.__, object: T): LodashSetWith1x11<T>;
+        (value: any, object: T): T;
+    }
+    interface LodashSetWith1x4 {
+        <T extends object>(customizer: lodash.SetWithCustomizer<T>): LodashSetWith1x5<T>;
+        (customizer: lodash.__, path: lodash.PropertyPath): LodashSetWith1x6;
+        <T extends object>(customizer: lodash.SetWithCustomizer<T>, path: lodash.PropertyPath): LodashSetWith1x7<T>;
+        <T extends object>(customizer: lodash.__, path: lodash.__, object: T): LodashSetWith1x12<T>;
+        <T extends object>(customizer: lodash.SetWithCustomizer<T>, path: lodash.__, object: T): LodashSetWith1x13<T>;
+        <T extends object>(customizer: lodash.__, path: lodash.PropertyPath, object: T): LodashSetWith1x14<T>;
+        <T extends object>(customizer: lodash.SetWithCustomizer<T>, path: lodash.PropertyPath, object: T): T;
+    }
+    interface LodashSetWith1x5<T> {
+        (path: lodash.PropertyPath): LodashSetWith1x7<T>;
+        (path: lodash.__, object: T): LodashSetWith1x13<T>;
+        (path: lodash.PropertyPath, object: T): T;
+    }
+    interface LodashSetWith1x6 {
+        <T extends object>(customizer: lodash.SetWithCustomizer<T>): LodashSetWith1x7<T>;
+        <T extends object>(customizer: lodash.__, object: T): LodashSetWith1x14<T>;
+        <T extends object>(customizer: lodash.SetWithCustomizer<T>, object: T): T;
+    }
+    type LodashSetWith1x7<T> = (object: T) => T;
+    interface LodashSetWith1x8<T> {
+        (customizer: lodash.SetWithCustomizer<T>): LodashSetWith1x9<T>;
+        (customizer: lodash.__, path: lodash.PropertyPath): LodashSetWith1x10<T>;
+        (customizer: lodash.SetWithCustomizer<T>, path: lodash.PropertyPath): LodashSetWith1x11<T>;
+        (customizer: lodash.__, path: lodash.__, value: any): LodashSetWith1x12<T>;
+        (customizer: lodash.SetWithCustomizer<T>, path: lodash.__, value: any): LodashSetWith1x13<T>;
+        (customizer: lodash.__, path: lodash.PropertyPath, value: any): LodashSetWith1x14<T>;
+        (customizer: lodash.SetWithCustomizer<T>, path: lodash.PropertyPath, value: any): T;
+    }
+    interface LodashSetWith1x9<T> {
+        (path: lodash.PropertyPath): LodashSetWith1x11<T>;
+        (path: lodash.__, value: any): LodashSetWith1x13<T>;
+        (path: lodash.PropertyPath, value: any): T;
+    }
+    interface LodashSetWith1x10<T> {
+        (customizer: lodash.SetWithCustomizer<T>): LodashSetWith1x11<T>;
+        (customizer: lodash.__, value: any): LodashSetWith1x14<T>;
+        (customizer: lodash.SetWithCustomizer<T>, value: any): T;
+    }
+    type LodashSetWith1x11<T> = (value: any) => T;
+    interface LodashSetWith1x12<T> {
+        (customizer: lodash.SetWithCustomizer<T>): LodashSetWith1x13<T>;
+        (customizer: lodash.__, path: lodash.PropertyPath): LodashSetWith1x14<T>;
+        (customizer: lodash.SetWithCustomizer<T>, path: lodash.PropertyPath): T;
+    }
+    type LodashSetWith1x13<T> = (path: lodash.PropertyPath) => T;
+    type LodashSetWith1x14<T> = (customizer: lodash.SetWithCustomizer<T>) => T;
+    interface LodashShuffle {
+        <T>(collection: lodash.List<T> | null | undefined): T[];
+        <T extends object>(collection: T | null | undefined): Array<T[keyof T]>;
+    }
+    type LodashSize = (collection: object | string | null | undefined) => number;
+    interface LodashSlice {
+        (start: number): LodashSlice1x1;
+        (start: lodash.__, end: number): LodashSlice1x2;
+        (start: number, end: number): LodashSlice1x3;
+        <T>(start: lodash.__, end: lodash.__, array: lodash.List<T> | null | undefined): LodashSlice1x4<T>;
+        <T>(start: number, end: lodash.__, array: lodash.List<T> | null | undefined): LodashSlice1x5<T>;
+        <T>(start: lodash.__, end: number, array: lodash.List<T> | null | undefined): LodashSlice1x6<T>;
+        <T>(start: number, end: number, array: lodash.List<T> | null | undefined): T[];
+    }
+    interface LodashSlice1x1 {
+        (end: number): LodashSlice1x3;
+        <T>(end: lodash.__, array: lodash.List<T> | null | undefined): LodashSlice1x5<T>;
+        <T>(end: number, array: lodash.List<T> | null | undefined): T[];
+    }
+    interface LodashSlice1x2 {
+        (start: number): LodashSlice1x3;
+        <T>(start: lodash.__, array: lodash.List<T> | null | undefined): LodashSlice1x6<T>;
+        <T>(start: number, array: lodash.List<T> | null | undefined): T[];
+    }
+    type LodashSlice1x3 = <T>(array: lodash.List<T> | null | undefined) => T[];
+    interface LodashSlice1x4<T> {
+        (start: number): LodashSlice1x5<T>;
+        (start: lodash.__, end: number): LodashSlice1x6<T>;
+        (start: number, end: number): T[];
+    }
+    type LodashSlice1x5<T> = (end: number) => T[];
+    type LodashSlice1x6<T> = (start: number) => T[];
+    type LodashSnakeCase = (string: string) => string;
+    interface LodashSortBy {
+        <T>(iteratees: lodash.Many<lodash.ValueIteratee<T>>): LodashSortBy1x1<T>;
+        <T>(iteratees: lodash.__, collection: lodash.List<T> | null | undefined): LodashSortBy1x2<T>;
+        <T>(iteratees: lodash.Many<lodash.ValueIteratee<T>>, collection: lodash.List<T> | null | undefined): T[];
+        <T extends object>(iteratees: lodash.__, collection: T | null | undefined): LodashSortBy2x2<T>;
+        <T extends object>(iteratees: lodash.Many<lodash.ValueIteratee<T[keyof T]>>, collection: T | null | undefined): Array<T[keyof T]>;
+    }
+    type LodashSortBy1x1<T> = (collection: lodash.List<T> | object | null | undefined) => T[];
+    type LodashSortBy1x2<T> = (iteratees: lodash.Many<lodash.ValueIteratee<T>>) => T[];
+    type LodashSortBy2x2<T> = (iteratees: lodash.Many<lodash.ValueIteratee<T[keyof T]>>) => Array<T[keyof T]>;
+    interface LodashSortedIndex {
+        <T>(value: T): LodashSortedIndex1x1<T>;
+        <T>(value: lodash.__, array: lodash.List<T> | null | undefined): LodashSortedIndex1x2<T>;
+        <T>(value: T, array: lodash.List<T> | null | undefined): number;
+    }
+    type LodashSortedIndex1x1<T> = (array: lodash.List<T> | null | undefined) => number;
+    type LodashSortedIndex1x2<T> = (value: T) => number;
+    interface LodashSortedIndexBy {
+        <T>(iteratee: lodash.ValueIteratee<T>): LodashSortedIndexBy1x1<T>;
+        <T>(iteratee: lodash.__, value: T): LodashSortedIndexBy1x2<T>;
+        <T>(iteratee: lodash.ValueIteratee<T>, value: T): LodashSortedIndexBy1x3<T>;
+        <T>(iteratee: lodash.__, value: lodash.__, array: lodash.List<T> | null | undefined): LodashSortedIndexBy1x4<T>;
+        <T>(iteratee: lodash.ValueIteratee<T>, value: lodash.__, array: lodash.List<T> | null | undefined): LodashSortedIndexBy1x5<T>;
+        <T>(iteratee: lodash.__, value: T, array: lodash.List<T> | null | undefined): LodashSortedIndexBy1x6<T>;
+        <T>(iteratee: lodash.ValueIteratee<T>, value: T, array: lodash.List<T> | null | undefined): number;
+    }
+    interface LodashSortedIndexBy1x1<T> {
+        (value: T): LodashSortedIndexBy1x3<T>;
+        (value: lodash.__, array: lodash.List<T> | null | undefined): LodashSortedIndexBy1x5<T>;
+        (value: T, array: lodash.List<T> | null | undefined): number;
+    }
+    interface LodashSortedIndexBy1x2<T> {
+        (iteratee: lodash.ValueIteratee<T>): LodashSortedIndexBy1x3<T>;
+        (iteratee: lodash.__, array: lodash.List<T> | null | undefined): LodashSortedIndexBy1x6<T>;
+        (iteratee: lodash.ValueIteratee<T>, array: lodash.List<T> | null | undefined): number;
+    }
+    type LodashSortedIndexBy1x3<T> = (array: lodash.List<T> | null | undefined) => number;
+    interface LodashSortedIndexBy1x4<T> {
+        (iteratee: lodash.ValueIteratee<T>): LodashSortedIndexBy1x5<T>;
+        (iteratee: lodash.__, value: T): LodashSortedIndexBy1x6<T>;
+        (iteratee: lodash.ValueIteratee<T>, value: T): number;
+    }
+    type LodashSortedIndexBy1x5<T> = (value: T) => number;
+    type LodashSortedIndexBy1x6<T> = (iteratee: lodash.ValueIteratee<T>) => number;
+    interface LodashSortedIndexOf {
+        <T>(value: T): LodashSortedIndexOf1x1<T>;
+        <T>(value: lodash.__, array: lodash.List<T> | null | undefined): LodashSortedIndexOf1x2<T>;
+        <T>(value: T, array: lodash.List<T> | null | undefined): number;
+    }
+    type LodashSortedIndexOf1x1<T> = (array: lodash.List<T> | null | undefined) => number;
+    type LodashSortedIndexOf1x2<T> = (value: T) => number;
+    interface LodashSortedLastIndex {
+        <T>(value: T): LodashSortedLastIndex1x1<T>;
+        <T>(value: lodash.__, array: lodash.List<T> | null | undefined): LodashSortedLastIndex1x2<T>;
+        <T>(value: T, array: lodash.List<T> | null | undefined): number;
+    }
+    type LodashSortedLastIndex1x1<T> = (array: lodash.List<T> | null | undefined) => number;
+    type LodashSortedLastIndex1x2<T> = (value: T) => number;
+    interface LodashSortedLastIndexBy {
+        <T>(iteratee: lodash.ValueIteratee<T>): LodashSortedLastIndexBy1x1<T>;
+        <T>(iteratee: lodash.__, value: T): LodashSortedLastIndexBy1x2<T>;
+        <T>(iteratee: lodash.ValueIteratee<T>, value: T): LodashSortedLastIndexBy1x3<T>;
+        <T>(iteratee: lodash.__, value: lodash.__, array: lodash.List<T> | null | undefined): LodashSortedLastIndexBy1x4<T>;
+        <T>(iteratee: lodash.ValueIteratee<T>, value: lodash.__, array: lodash.List<T> | null | undefined): LodashSortedLastIndexBy1x5<T>;
+        <T>(iteratee: lodash.__, value: T, array: lodash.List<T> | null | undefined): LodashSortedLastIndexBy1x6<T>;
+        <T>(iteratee: lodash.ValueIteratee<T>, value: T, array: lodash.List<T> | null | undefined): number;
+    }
+    interface LodashSortedLastIndexBy1x1<T> {
+        (value: T): LodashSortedLastIndexBy1x3<T>;
+        (value: lodash.__, array: lodash.List<T> | null | undefined): LodashSortedLastIndexBy1x5<T>;
+        (value: T, array: lodash.List<T> | null | undefined): number;
+    }
+    interface LodashSortedLastIndexBy1x2<T> {
+        (iteratee: lodash.ValueIteratee<T>): LodashSortedLastIndexBy1x3<T>;
+        (iteratee: lodash.__, array: lodash.List<T> | null | undefined): LodashSortedLastIndexBy1x6<T>;
+        (iteratee: lodash.ValueIteratee<T>, array: lodash.List<T> | null | undefined): number;
+    }
+    type LodashSortedLastIndexBy1x3<T> = (array: lodash.List<T> | null | undefined) => number;
+    interface LodashSortedLastIndexBy1x4<T> {
+        (iteratee: lodash.ValueIteratee<T>): LodashSortedLastIndexBy1x5<T>;
+        (iteratee: lodash.__, value: T): LodashSortedLastIndexBy1x6<T>;
+        (iteratee: lodash.ValueIteratee<T>, value: T): number;
+    }
+    type LodashSortedLastIndexBy1x5<T> = (value: T) => number;
+    type LodashSortedLastIndexBy1x6<T> = (iteratee: lodash.ValueIteratee<T>) => number;
+    interface LodashSortedLastIndexOf {
+        <T>(value: T): LodashSortedLastIndexOf1x1<T>;
+        <T>(value: lodash.__, array: lodash.List<T> | null | undefined): LodashSortedLastIndexOf1x2<T>;
+        <T>(value: T, array: lodash.List<T> | null | undefined): number;
+    }
+    type LodashSortedLastIndexOf1x1<T> = (array: lodash.List<T> | null | undefined) => number;
+    type LodashSortedLastIndexOf1x2<T> = (value: T) => number;
+    type LodashSortedUniq = <T>(array: lodash.List<T> | null | undefined) => T[];
+    interface LodashSortedUniqBy {
+        (iteratee: (value: string) => lodash.NotVoid): LodashSortedUniqBy1x1;
+        (iteratee: lodash.__, array: string | null | undefined): LodashSortedUniqBy1x2;
+        (iteratee: (value: string) => lodash.NotVoid, array: string | null | undefined): string[];
+        <T>(iteratee: lodash.ValueIteratee<T>): LodashSortedUniqBy2x1<T>;
+        <T>(iteratee: lodash.__, array: lodash.List<T> | null | undefined): LodashSortedUniqBy2x2<T>;
+        <T>(iteratee: lodash.ValueIteratee<T>, array: lodash.List<T> | null | undefined): T[];
+    }
+    type LodashSortedUniqBy1x1 = (array: string | null | undefined) => string[];
+    type LodashSortedUniqBy1x2 = (iteratee: (value: string) => lodash.NotVoid) => string[];
+    type LodashSortedUniqBy2x1<T> = (array: lodash.List<T> | null | undefined) => T[];
+    type LodashSortedUniqBy2x2<T> = (iteratee: lodash.ValueIteratee<T>) => T[];
+    interface LodashSplit {
+        (separator: RegExp|string): LodashSplit1x1;
+        (separator: lodash.__, string: string): LodashSplit1x2;
+        (separator: RegExp|string, string: string): string[];
+    }
+    type LodashSplit1x1 = (string: string) => string[];
+    type LodashSplit1x2 = (separator: RegExp|string) => string[];
+    type LodashSpread = <TResult>(func: (...args: any[]) => TResult) => (...args: any[]) => TResult;
+    interface LodashSpreadFrom {
+        (start: number): LodashSpreadFrom1x1;
+        <TResult>(start: lodash.__, func: (...args: any[]) => TResult): LodashSpreadFrom1x2<TResult>;
+        <TResult>(start: number, func: (...args: any[]) => TResult): (...args: any[]) => TResult;
+    }
+    type LodashSpreadFrom1x1 = <TResult>(func: (...args: any[]) => TResult) => (...args: any[]) => TResult;
+    type LodashSpreadFrom1x2<TResult> = (start: number) => (...args: any[]) => TResult;
+    type LodashStartCase = (string: string) => string;
+    interface LodashStartsWith {
+        (target: string): LodashStartsWith1x1;
+        (target: lodash.__, string: string): LodashStartsWith1x2;
+        (target: string, string: string): boolean;
+    }
+    type LodashStartsWith1x1 = (string: string) => boolean;
+    type LodashStartsWith1x2 = (target: string) => boolean;
+    type LodashStubArray = () => any[];
+    type LodashStubObject = () => any;
+    type LodashStubString = () => string;
+    type LodashStubTrue = () => boolean;
+    interface LodashSubtract {
+        (minuend: number): LodashSubtract1x1;
+        (minuend: lodash.__, subtrahend: number): LodashSubtract1x2;
+        (minuend: number, subtrahend: number): number;
+    }
+    type LodashSubtract1x1 = (subtrahend: number) => number;
+    type LodashSubtract1x2 = (minuend: number) => number;
+    type LodashSum = (collection: lodash.List<any> | null | undefined) => number;
+    interface LodashSumBy {
+        <T>(iteratee: ((value: T) => number) | string): LodashSumBy1x1<T>;
+        <T>(iteratee: lodash.__, collection: lodash.List<T> | null | undefined): LodashSumBy1x2<T>;
+        <T>(iteratee: ((value: T) => number) | string, collection: lodash.List<T> | null | undefined): number;
+    }
+    type LodashSumBy1x1<T> = (collection: lodash.List<T> | null | undefined) => number;
+    type LodashSumBy1x2<T> = (iteratee: ((value: T) => number) | string) => number;
+    interface LodashXor {
+        <T>(arrays2: lodash.List<T> | null | undefined): LodashXor1x1<T>;
+        <T>(arrays2: lodash.__, arrays: lodash.List<T> | null | undefined): LodashXor1x2<T>;
+        <T>(arrays2: lodash.List<T> | null | undefined, arrays: lodash.List<T> | null | undefined): T[];
+    }
+    type LodashXor1x1<T> = (arrays: lodash.List<T> | null | undefined) => T[];
+    type LodashXor1x2<T> = (arrays2: lodash.List<T> | null | undefined) => T[];
+    interface LodashXorBy {
+        <T>(iteratee: lodash.ValueIteratee<T>): LodashXorBy1x1<T>;
+        <T>(iteratee: lodash.__, arrays: lodash.List<T> | null | undefined): LodashXorBy1x2<T>;
+        <T>(iteratee: lodash.ValueIteratee<T>, arrays: lodash.List<T> | null | undefined): LodashXorBy1x3<T>;
+        <T>(iteratee: lodash.__, arrays: lodash.__, arrays2: lodash.List<T> | null | undefined): LodashXorBy1x4<T>;
+        <T>(iteratee: lodash.ValueIteratee<T>, arrays: lodash.__, arrays2: lodash.List<T> | null | undefined): LodashXorBy1x5<T>;
+        <T>(iteratee: lodash.__, arrays: lodash.List<T> | null | undefined, arrays2: lodash.List<T> | null | undefined): LodashXorBy1x6<T>;
+        <T>(iteratee: lodash.ValueIteratee<T>, arrays: lodash.List<T> | null | undefined, arrays2: lodash.List<T> | null | undefined): T[];
+    }
+    interface LodashXorBy1x1<T> {
+        (arrays: lodash.List<T> | null | undefined): LodashXorBy1x3<T>;
+        (arrays: lodash.__, arrays2: lodash.List<T> | null | undefined): LodashXorBy1x5<T>;
+        (arrays: lodash.List<T> | null | undefined, arrays2: lodash.List<T> | null | undefined): T[];
+    }
+    interface LodashXorBy1x2<T> {
+        (iteratee: lodash.ValueIteratee<T>): LodashXorBy1x3<T>;
+        (iteratee: lodash.__, arrays2: lodash.List<T> | null | undefined): LodashXorBy1x6<T>;
+        (iteratee: lodash.ValueIteratee<T>, arrays2: lodash.List<T> | null | undefined): T[];
+    }
+    type LodashXorBy1x3<T> = (arrays2: lodash.List<T> | null | undefined) => T[];
+    interface LodashXorBy1x4<T> {
+        (iteratee: lodash.ValueIteratee<T>): LodashXorBy1x5<T>;
+        (iteratee: lodash.__, arrays: lodash.List<T> | null | undefined): LodashXorBy1x6<T>;
+        (iteratee: lodash.ValueIteratee<T>, arrays: lodash.List<T> | null | undefined): T[];
+    }
+    type LodashXorBy1x5<T> = (arrays: lodash.List<T> | null | undefined) => T[];
+    type LodashXorBy1x6<T> = (iteratee: lodash.ValueIteratee<T>) => T[];
+    interface LodashXorWith {
+        <T>(comparator: lodash.Comparator<T>): LodashXorWith1x1<T>;
+        <T>(comparator: lodash.__, arrays: lodash.List<T> | null | undefined): LodashXorWith1x2<T>;
+        <T>(comparator: lodash.Comparator<T>, arrays: lodash.List<T> | null | undefined): LodashXorWith1x3<T>;
+        <T>(comparator: lodash.__, arrays: lodash.__, arrays2: lodash.List<T> | null | undefined): LodashXorWith1x4<T>;
+        <T>(comparator: lodash.Comparator<T>, arrays: lodash.__, arrays2: lodash.List<T> | null | undefined): LodashXorWith1x5<T>;
+        <T>(comparator: lodash.__, arrays: lodash.List<T> | null | undefined, arrays2: lodash.List<T> | null | undefined): LodashXorWith1x6<T>;
+        <T>(comparator: lodash.Comparator<T>, arrays: lodash.List<T> | null | undefined, arrays2: lodash.List<T> | null | undefined): T[];
+    }
+    interface LodashXorWith1x1<T> {
+        (arrays: lodash.List<T> | null | undefined): LodashXorWith1x3<T>;
+        (arrays: lodash.__, arrays2: lodash.List<T> | null | undefined): LodashXorWith1x5<T>;
+        (arrays: lodash.List<T> | null | undefined, arrays2: lodash.List<T> | null | undefined): T[];
+    }
+    interface LodashXorWith1x2<T> {
+        (comparator: lodash.Comparator<T>): LodashXorWith1x3<T>;
+        (comparator: lodash.__, arrays2: lodash.List<T> | null | undefined): LodashXorWith1x6<T>;
+        (comparator: lodash.Comparator<T>, arrays2: lodash.List<T> | null | undefined): T[];
+    }
+    type LodashXorWith1x3<T> = (arrays2: lodash.List<T> | null | undefined) => T[];
+    interface LodashXorWith1x4<T> {
+        (comparator: lodash.Comparator<T>): LodashXorWith1x5<T>;
+        (comparator: lodash.__, arrays: lodash.List<T> | null | undefined): LodashXorWith1x6<T>;
+        (comparator: lodash.Comparator<T>, arrays: lodash.List<T> | null | undefined): T[];
+    }
+    type LodashXorWith1x5<T> = (arrays: lodash.List<T> | null | undefined) => T[];
+    type LodashXorWith1x6<T> = (comparator: lodash.Comparator<T>) => T[];
+    type LodashTail = <T>(array: lodash.List<T> | null | undefined) => T[];
+    interface LodashTake {
+        (n: number): LodashTake1x1;
+        <T>(n: lodash.__, array: lodash.List<T> | null | undefined): LodashTake1x2<T>;
+        <T>(n: number, array: lodash.List<T> | null | undefined): T[];
+    }
+    type LodashTake1x1 = <T>(array: lodash.List<T> | null | undefined) => T[];
+    type LodashTake1x2<T> = (n: number) => T[];
+    interface LodashTakeRight {
+        (n: number): LodashTakeRight1x1;
+        <T>(n: lodash.__, array: lodash.List<T> | null | undefined): LodashTakeRight1x2<T>;
+        <T>(n: number, array: lodash.List<T> | null | undefined): T[];
+    }
+    type LodashTakeRight1x1 = <T>(array: lodash.List<T> | null | undefined) => T[];
+    type LodashTakeRight1x2<T> = (n: number) => T[];
+    interface LodashTakeRightWhile {
+        <T>(predicate: lodash.ValueIteratee<T>): LodashTakeRightWhile1x1<T>;
+        <T>(predicate: lodash.__, array: lodash.List<T> | null | undefined): LodashTakeRightWhile1x2<T>;
+        <T>(predicate: lodash.ValueIteratee<T>, array: lodash.List<T> | null | undefined): T[];
+    }
+    type LodashTakeRightWhile1x1<T> = (array: lodash.List<T> | null | undefined) => T[];
+    type LodashTakeRightWhile1x2<T> = (predicate: lodash.ValueIteratee<T>) => T[];
+    interface LodashTakeWhile {
+        <T>(predicate: lodash.ValueIteratee<T>): LodashTakeWhile1x1<T>;
+        <T>(predicate: lodash.__, array: lodash.List<T> | null | undefined): LodashTakeWhile1x2<T>;
+        <T>(predicate: lodash.ValueIteratee<T>, array: lodash.List<T> | null | undefined): T[];
+    }
+    type LodashTakeWhile1x1<T> = (array: lodash.List<T> | null | undefined) => T[];
+    type LodashTakeWhile1x2<T> = (predicate: lodash.ValueIteratee<T>) => T[];
+    interface LodashTap {
+        <T>(interceptor: (value: T) => void): LodashTap1x1<T>;
+        <T>(interceptor: lodash.__, value: T): LodashTap1x2<T>;
+        <T>(interceptor: (value: T) => void, value: T): T;
+    }
+    type LodashTap1x1<T> = (value: T) => T;
+    type LodashTap1x2<T> = (interceptor: (value: T) => void) => T;
+    type LodashTemplate = (string: string) => lodash.TemplateExecutor;
+    interface LodashThrottle {
+        (wait: number): LodashThrottle1x1;
+        <T extends (...args: any[]) => any>(wait: lodash.__, func: T): LodashThrottle1x2<T>;
+        <T extends (...args: any[]) => any>(wait: number, func: T): T & lodash.Cancelable;
+    }
+    type LodashThrottle1x1 = <T extends (...args: any[]) => any>(func: T) => T & lodash.Cancelable;
+    type LodashThrottle1x2<T> = (wait: number) => T & lodash.Cancelable;
+    interface LodashThru {
+        <T, TResult>(interceptor: (value: T) => TResult): LodashThru1x1<T, TResult>;
+        <T>(interceptor: lodash.__, value: T): LodashThru1x2<T>;
+        <T, TResult>(interceptor: (value: T) => TResult, value: T): TResult;
+    }
+    type LodashThru1x1<T, TResult> = (value: T) => TResult;
+    type LodashThru1x2<T> = <TResult>(interceptor: (value: T) => TResult) => TResult;
+    interface LodashTimes {
+        <TResult>(iteratee: (num: number) => TResult): LodashTimes1x1<TResult>;
+        (iteratee: lodash.__, n: number): LodashTimes1x2;
+        <TResult>(iteratee: (num: number) => TResult, n: number): TResult[];
+    }
+    type LodashTimes1x1<TResult> = (n: number) => TResult[];
+    type LodashTimes1x2 = <TResult>(iteratee: (num: number) => TResult) => TResult[];
+    interface LodashToArray {
+        <T>(value: lodash.List<T> | lodash.Dictionary<T> | lodash.NumericDictionary<T> | null | undefined): T[];
+        <T>(value: T): Array<T[keyof T]>;
+        (): any[];
+    }
+    type LodashToFinite = (value: any) => number;
+    type LodashToInteger = (value: any) => number;
+    type LodashToLength = (value: any) => number;
+    type LodashToLower = (string: string) => string;
+    type LodashToNumber = (value: any) => number;
+    type LodashToPath = (value: any) => string[];
+    type LodashToPlainObject = (value: any) => any;
+    type LodashToSafeInteger = (value: any) => number;
+    type LodashToString = (value: any) => string;
+    type LodashToUpper = (string: string) => string;
+    interface LodashTransform {
+        <T, TResult>(iteratee: lodash.MemoVoidIteratorCapped<T, TResult[]>): LodashTransform1x1<T, TResult>;
+        <TResult>(iteratee: lodash.__, accumulator: ReadonlyArray<TResult>): LodashTransform1x2<TResult>;
+        <T, TResult>(iteratee: lodash.MemoVoidIteratorCapped<T, TResult[]>, accumulator: ReadonlyArray<TResult>): LodashTransform1x3<T, TResult>;
+        <T>(iteratee: lodash.__, accumulator: lodash.__, object: ReadonlyArray<T>): LodashTransform1x4<T>;
+        <T, TResult>(iteratee: lodash.MemoVoidIteratorCapped<T, TResult[]>, accumulator: lodash.__, object: ReadonlyArray<T>): LodashTransform1x5<TResult>;
+        <T, TResult>(iteratee: lodash.__, accumulator: ReadonlyArray<TResult>, object: ReadonlyArray<T>): LodashTransform1x6<T, TResult>;
+        <T, TResult>(iteratee: lodash.MemoVoidIteratorCapped<T, TResult[]>, accumulator: ReadonlyArray<TResult>, object: ReadonlyArray<T> | lodash.Dictionary<T>): TResult[];
+        <T, TResult>(iteratee: lodash.MemoVoidIteratorCapped<T, lodash.Dictionary<TResult>>): LodashTransform2x1<T, TResult>;
+        <TResult>(iteratee: lodash.__, accumulator: lodash.Dictionary<TResult>): LodashTransform2x2<TResult>;
+        <T, TResult>(iteratee: lodash.MemoVoidIteratorCapped<T, lodash.Dictionary<TResult>>, accumulator: lodash.Dictionary<TResult>): LodashTransform2x3<T, TResult>;
+        <T, TResult>(iteratee: lodash.MemoVoidIteratorCapped<T, lodash.Dictionary<TResult>>, accumulator: lodash.__, object: ReadonlyArray<T>): LodashTransform2x5<TResult>;
+        <T, TResult>(iteratee: lodash.__, accumulator: lodash.Dictionary<TResult>, object: ReadonlyArray<T>): LodashTransform2x6<T, TResult>;
+        <T, TResult>(iteratee: lodash.MemoVoidIteratorCapped<T, lodash.Dictionary<TResult>>, accumulator: lodash.Dictionary<TResult>, object: ReadonlyArray<T> | lodash.Dictionary<T>): lodash.Dictionary<TResult>;
+        <T>(iteratee: lodash.__, accumulator: lodash.__, object: lodash.Dictionary<T>): LodashTransform3x4<T>;
+        <T, TResult>(iteratee: lodash.MemoVoidIteratorCapped<T, lodash.Dictionary<TResult>>, accumulator: lodash.__, object: lodash.Dictionary<T>): LodashTransform3x5<TResult>;
+        <T, TResult>(iteratee: lodash.__, accumulator: lodash.Dictionary<TResult>, object: lodash.Dictionary<T>): LodashTransform3x6<T, TResult>;
+        <T, TResult>(iteratee: lodash.MemoVoidIteratorCapped<T, TResult[]>, accumulator: lodash.__, object: lodash.Dictionary<T>): LodashTransform4x5<TResult>;
+        <T, TResult>(iteratee: lodash.__, accumulator: ReadonlyArray<TResult>, object: lodash.Dictionary<T>): LodashTransform4x6<T, TResult>;
+    }
+    interface LodashTransform1x1<T, TResult> {
+        (accumulator: ReadonlyArray<TResult>): LodashTransform1x3<T, TResult>;
+        (accumulator: lodash.__, object: ReadonlyArray<T>): LodashTransform1x5<TResult>;
+        (accumulator: ReadonlyArray<TResult>, object: ReadonlyArray<T> | lodash.Dictionary<T>): TResult[];
+        (accumulator: lodash.__, object: lodash.Dictionary<T>): LodashTransform4x5<TResult>;
+    }
+    interface LodashTransform1x2<TResult> {
+        <T>(iteratee: lodash.MemoVoidIteratorCapped<T, TResult[]>): LodashTransform1x3<T, TResult>;
+        <T>(iteratee: lodash.__, object: ReadonlyArray<T>): LodashTransform1x6<T, TResult>;
+        <T>(iteratee: lodash.MemoVoidIteratorCapped<T, TResult[]>, object: ReadonlyArray<T> | lodash.Dictionary<T>): TResult[];
+        <T>(iteratee: lodash.__, object: lodash.Dictionary<T>): LodashTransform4x6<T, TResult>;
+    }
+    type LodashTransform1x3<T, TResult> = (object: ReadonlyArray<T> | lodash.Dictionary<T>) => TResult[];
+    interface LodashTransform1x4<T> {
+        <TResult>(iteratee: lodash.MemoVoidIteratorCapped<T, TResult[]>): LodashTransform1x5<TResult>;
+        <TResult>(iteratee: lodash.__, accumulator: ReadonlyArray<TResult>): LodashTransform1x6<T, TResult>;
+        <TResult>(iteratee: lodash.MemoVoidIteratorCapped<T, TResult[]>, accumulator: ReadonlyArray<TResult>): TResult[];
+        <TResult>(iteratee: lodash.MemoVoidIteratorCapped<T, lodash.Dictionary<TResult>>): LodashTransform2x5<TResult>;
+        <TResult>(iteratee: lodash.__, accumulator: lodash.Dictionary<TResult>): LodashTransform2x6<T, TResult>;
+        <TResult>(iteratee: lodash.MemoVoidIteratorCapped<T, lodash.Dictionary<TResult>>, accumulator: lodash.Dictionary<TResult>): lodash.Dictionary<TResult>;
+    }
+    type LodashTransform1x5<TResult> = (accumulator: ReadonlyArray<TResult>) => TResult[];
+    type LodashTransform1x6<T, TResult> = (iteratee: lodash.MemoVoidIteratorCapped<T, TResult[]>) => TResult[];
+    interface LodashTransform2x1<T, TResult> {
+        (accumulator: lodash.Dictionary<TResult>): LodashTransform2x3<T, TResult>;
+        (accumulator: lodash.__, object: ReadonlyArray<T>): LodashTransform2x5<TResult>;
+        (accumulator: lodash.Dictionary<TResult>, object: ReadonlyArray<T> | lodash.Dictionary<T>): lodash.Dictionary<TResult>;
+        (accumulator: lodash.__, object: lodash.Dictionary<T>): LodashTransform3x5<TResult>;
+    }
+    interface LodashTransform2x2<TResult> {
+        <T>(iteratee: lodash.MemoVoidIteratorCapped<T, lodash.Dictionary<TResult>>): LodashTransform2x3<T, TResult>;
+        <T>(iteratee: lodash.__, object: ReadonlyArray<T>): LodashTransform2x6<T, TResult>;
+        <T>(iteratee: lodash.MemoVoidIteratorCapped<T, lodash.Dictionary<TResult>>, object: ReadonlyArray<T> | lodash.Dictionary<T>): lodash.Dictionary<TResult>;
+        <T>(iteratee: lodash.__, object: lodash.Dictionary<T>): LodashTransform3x6<T, TResult>;
+    }
+    type LodashTransform2x3<T, TResult> = (object: ReadonlyArray<T> | lodash.Dictionary<T>) => lodash.Dictionary<TResult>;
+    type LodashTransform2x5<TResult> = (accumulator: lodash.Dictionary<TResult>) => lodash.Dictionary<TResult>;
+    type LodashTransform2x6<T, TResult> = (iteratee: lodash.MemoVoidIteratorCapped<T, lodash.Dictionary<TResult>>) => lodash.Dictionary<TResult>;
+    interface LodashTransform3x4<T> {
+        <TResult>(iteratee: lodash.MemoVoidIteratorCapped<T, lodash.Dictionary<TResult>>): LodashTransform3x5<TResult>;
+        <TResult>(iteratee: lodash.__, accumulator: lodash.Dictionary<TResult>): LodashTransform3x6<T, TResult>;
+        <TResult>(iteratee: lodash.MemoVoidIteratorCapped<T, lodash.Dictionary<TResult>>, accumulator: lodash.Dictionary<TResult>): lodash.Dictionary<TResult>;
+        <TResult>(iteratee: lodash.MemoVoidIteratorCapped<T, TResult[]>): LodashTransform4x5<TResult>;
+        <TResult>(iteratee: lodash.__, accumulator: ReadonlyArray<TResult>): LodashTransform4x6<T, TResult>;
+        <TResult>(iteratee: lodash.MemoVoidIteratorCapped<T, TResult[]>, accumulator: ReadonlyArray<TResult>): TResult[];
+    }
+    type LodashTransform3x5<TResult> = (accumulator: lodash.Dictionary<TResult>) => lodash.Dictionary<TResult>;
+    type LodashTransform3x6<T, TResult> = (iteratee: lodash.MemoVoidIteratorCapped<T, lodash.Dictionary<TResult>>) => lodash.Dictionary<TResult>;
+    type LodashTransform4x5<TResult> = (accumulator: ReadonlyArray<TResult>) => TResult[];
+    type LodashTransform4x6<T, TResult> = (iteratee: lodash.MemoVoidIteratorCapped<T, TResult[]>) => TResult[];
+    type LodashTrim = (string: string) => string;
+    interface LodashTrimChars {
+        (chars: string): LodashTrimChars1x1;
+        (chars: lodash.__, string: string): LodashTrimChars1x2;
+        (chars: string, string: string): string;
+    }
+    type LodashTrimChars1x1 = (string: string) => string;
+    type LodashTrimChars1x2 = (chars: string) => string;
+    interface LodashTrimCharsEnd {
+        (chars: string): LodashTrimCharsEnd1x1;
+        (chars: lodash.__, string: string): LodashTrimCharsEnd1x2;
+        (chars: string, string: string): string;
+    }
+    type LodashTrimCharsEnd1x1 = (string: string) => string;
+    type LodashTrimCharsEnd1x2 = (chars: string) => string;
+    interface LodashTrimCharsStart {
+        (chars: string): LodashTrimCharsStart1x1;
+        (chars: lodash.__, string: string): LodashTrimCharsStart1x2;
+        (chars: string, string: string): string;
+    }
+    type LodashTrimCharsStart1x1 = (string: string) => string;
+    type LodashTrimCharsStart1x2 = (chars: string) => string;
+    type LodashTrimEnd = (string: string) => string;
+    type LodashTrimStart = (string: string) => string;
+    interface LodashTruncate {
+        (options: lodash.TruncateOptions): LodashTruncate1x1;
+        (options: lodash.__, string: string): LodashTruncate1x2;
+        (options: lodash.TruncateOptions, string: string): string;
+    }
+    type LodashTruncate1x1 = (string: string) => string;
+    type LodashTruncate1x2 = (options: lodash.TruncateOptions) => string;
+    type LodashUnapply = (func: (...args: any[]) => any) => (...args: any[]) => any;
+    type LodashUnary = <T, TResult>(func: (arg1: T, ...args: any[]) => TResult) => (arg1: T) => TResult;
+    type LodashUnescape = (string: string) => string;
+    interface LodashUnion {
+        <T>(arrays2: lodash.List<T> | null | undefined): LodashUnion1x1<T>;
+        <T>(arrays2: lodash.__, arrays: lodash.List<T> | null | undefined): LodashUnion1x2<T>;
+        <T>(arrays2: lodash.List<T> | null | undefined, arrays: lodash.List<T> | null | undefined): T[];
+    }
+    type LodashUnion1x1<T> = (arrays: lodash.List<T> | null | undefined) => T[];
+    type LodashUnion1x2<T> = (arrays2: lodash.List<T> | null | undefined) => T[];
+    interface LodashUnionBy {
+        <T>(iteratee: lodash.ValueIteratee<T>): LodashUnionBy1x1<T>;
+        <T>(iteratee: lodash.__, arrays1: lodash.List<T> | null | undefined): LodashUnionBy1x2<T>;
+        <T>(iteratee: lodash.ValueIteratee<T>, arrays1: lodash.List<T> | null | undefined): LodashUnionBy1x3<T>;
+        <T>(iteratee: lodash.__, arrays1: lodash.__, arrays2: lodash.List<T> | null | undefined): LodashUnionBy1x4<T>;
+        <T>(iteratee: lodash.ValueIteratee<T>, arrays1: lodash.__, arrays2: lodash.List<T> | null | undefined): LodashUnionBy1x5<T>;
+        <T>(iteratee: lodash.__, arrays1: lodash.List<T> | null | undefined, arrays2: lodash.List<T> | null | undefined): LodashUnionBy1x6<T>;
+        <T>(iteratee: lodash.ValueIteratee<T>, arrays1: lodash.List<T> | null | undefined, arrays2: lodash.List<T> | null | undefined): T[];
+    }
+    interface LodashUnionBy1x1<T> {
+        (arrays1: lodash.List<T> | null | undefined): LodashUnionBy1x3<T>;
+        (arrays1: lodash.__, arrays2: lodash.List<T> | null | undefined): LodashUnionBy1x5<T>;
+        (arrays1: lodash.List<T> | null | undefined, arrays2: lodash.List<T> | null | undefined): T[];
+    }
+    interface LodashUnionBy1x2<T> {
+        (iteratee: lodash.ValueIteratee<T>): LodashUnionBy1x3<T>;
+        (iteratee: lodash.__, arrays2: lodash.List<T> | null | undefined): LodashUnionBy1x6<T>;
+        (iteratee: lodash.ValueIteratee<T>, arrays2: lodash.List<T> | null | undefined): T[];
+    }
+    type LodashUnionBy1x3<T> = (arrays2: lodash.List<T> | null | undefined) => T[];
+    interface LodashUnionBy1x4<T> {
+        (iteratee: lodash.ValueIteratee<T>): LodashUnionBy1x5<T>;
+        (iteratee: lodash.__, arrays1: lodash.List<T> | null | undefined): LodashUnionBy1x6<T>;
+        (iteratee: lodash.ValueIteratee<T>, arrays1: lodash.List<T> | null | undefined): T[];
+    }
+    type LodashUnionBy1x5<T> = (arrays1: lodash.List<T> | null | undefined) => T[];
+    type LodashUnionBy1x6<T> = (iteratee: lodash.ValueIteratee<T>) => T[];
+    interface LodashUnionWith {
+        <T>(comparator: lodash.Comparator<T>): LodashUnionWith1x1<T>;
+        <T>(comparator: lodash.__, arrays: lodash.List<T> | null | undefined): LodashUnionWith1x2<T>;
+        <T>(comparator: lodash.Comparator<T>, arrays: lodash.List<T> | null | undefined): LodashUnionWith1x3<T>;
+        <T>(comparator: lodash.__, arrays: lodash.__, arrays2: lodash.List<T> | null | undefined): LodashUnionWith1x4<T>;
+        <T>(comparator: lodash.Comparator<T>, arrays: lodash.__, arrays2: lodash.List<T> | null | undefined): LodashUnionWith1x5<T>;
+        <T>(comparator: lodash.__, arrays: lodash.List<T> | null | undefined, arrays2: lodash.List<T> | null | undefined): LodashUnionWith1x6<T>;
+        <T>(comparator: lodash.Comparator<T>, arrays: lodash.List<T> | null | undefined, arrays2: lodash.List<T> | null | undefined): T[];
+    }
+    interface LodashUnionWith1x1<T> {
+        (arrays: lodash.List<T> | null | undefined): LodashUnionWith1x3<T>;
+        (arrays: lodash.__, arrays2: lodash.List<T> | null | undefined): LodashUnionWith1x5<T>;
+        (arrays: lodash.List<T> | null | undefined, arrays2: lodash.List<T> | null | undefined): T[];
+    }
+    interface LodashUnionWith1x2<T> {
+        (comparator: lodash.Comparator<T>): LodashUnionWith1x3<T>;
+        (comparator: lodash.__, arrays2: lodash.List<T> | null | undefined): LodashUnionWith1x6<T>;
+        (comparator: lodash.Comparator<T>, arrays2: lodash.List<T> | null | undefined): T[];
+    }
+    type LodashUnionWith1x3<T> = (arrays2: lodash.List<T> | null | undefined) => T[];
+    interface LodashUnionWith1x4<T> {
+        (comparator: lodash.Comparator<T>): LodashUnionWith1x5<T>;
+        (comparator: lodash.__, arrays: lodash.List<T> | null | undefined): LodashUnionWith1x6<T>;
+        (comparator: lodash.Comparator<T>, arrays: lodash.List<T> | null | undefined): T[];
+    }
+    type LodashUnionWith1x5<T> = (arrays: lodash.List<T> | null | undefined) => T[];
+    type LodashUnionWith1x6<T> = (comparator: lodash.Comparator<T>) => T[];
+    type LodashUniq = <T>(array: lodash.List<T> | null | undefined) => T[];
+    interface LodashUniqBy {
+        (iteratee: (value: string) => lodash.NotVoid): LodashUniqBy1x1;
+        (iteratee: lodash.__, array: string | null | undefined): LodashUniqBy1x2;
+        (iteratee: (value: string) => lodash.NotVoid, array: string | null | undefined): string[];
+        <T>(iteratee: lodash.ValueIteratee<T>): LodashUniqBy2x1<T>;
+        <T>(iteratee: lodash.__, array: lodash.List<T> | null | undefined): LodashUniqBy2x2<T>;
+        <T>(iteratee: lodash.ValueIteratee<T>, array: lodash.List<T> | null | undefined): T[];
+    }
+    type LodashUniqBy1x1 = (array: string | null | undefined) => string[];
+    type LodashUniqBy1x2 = (iteratee: (value: string) => lodash.NotVoid) => string[];
+    type LodashUniqBy2x1<T> = (array: lodash.List<T> | null | undefined) => T[];
+    type LodashUniqBy2x2<T> = (iteratee: lodash.ValueIteratee<T>) => T[];
+    type LodashUniqueId = (prefix: string) => string;
+    interface LodashUniqWith {
+        <T>(comparator: lodash.Comparator<T>): LodashUniqWith1x1<T>;
+        <T>(comparator: lodash.__, array: lodash.List<T> | null | undefined): LodashUniqWith1x2<T>;
+        <T>(comparator: lodash.Comparator<T>, array: lodash.List<T> | null | undefined): T[];
+    }
+    type LodashUniqWith1x1<T> = (array: lodash.List<T> | null | undefined) => T[];
+    type LodashUniqWith1x2<T> = (comparator: lodash.Comparator<T>) => T[];
+    type LodashUnzip = <T>(array: T[][] | lodash.List<lodash.List<T>> | null | undefined) => T[][];
+    interface LodashUnzipWith {
+        <T, TResult>(iteratee: (...values: T[]) => TResult): LodashUnzipWith1x1<T, TResult>;
+        <T>(iteratee: lodash.__, array: lodash.List<lodash.List<T>> | null | undefined): LodashUnzipWith1x2<T>;
+        <T, TResult>(iteratee: (...values: T[]) => TResult, array: lodash.List<lodash.List<T>> | null | undefined): TResult[];
+    }
+    type LodashUnzipWith1x1<T, TResult> = (array: lodash.List<lodash.List<T>> | null | undefined) => TResult[];
+    type LodashUnzipWith1x2<T> = <TResult>(iteratee: (...values: T[]) => TResult) => TResult[];
+    interface LodashUpdate {
+        (path: lodash.PropertyPath): LodashUpdate1x1;
+        (path: lodash.__, updater: (value: any) => any): LodashUpdate1x2;
+        (path: lodash.PropertyPath, updater: (value: any) => any): LodashUpdate1x3;
+        (path: lodash.__, updater: lodash.__, object: object): LodashUpdate1x4;
+        (path: lodash.PropertyPath, updater: lodash.__, object: object): LodashUpdate1x5;
+        (path: lodash.__, updater: (value: any) => any, object: object): LodashUpdate1x6;
+        (path: lodash.PropertyPath, updater: (value: any) => any, object: object): any;
+    }
+    interface LodashUpdate1x1 {
+        (updater: (value: any) => any): LodashUpdate1x3;
+        (updater: lodash.__, object: object): LodashUpdate1x5;
+        (updater: (value: any) => any, object: object): any;
+    }
+    interface LodashUpdate1x2 {
+        (path: lodash.PropertyPath): LodashUpdate1x3;
+        (path: lodash.__, object: object): LodashUpdate1x6;
+        (path: lodash.PropertyPath, object: object): any;
+    }
+    type LodashUpdate1x3 = (object: object) => any;
+    interface LodashUpdate1x4 {
+        (path: lodash.PropertyPath): LodashUpdate1x5;
+        (path: lodash.__, updater: (value: any) => any): LodashUpdate1x6;
+        (path: lodash.PropertyPath, updater: (value: any) => any): any;
+    }
+    type LodashUpdate1x5 = (updater: (value: any) => any) => any;
+    type LodashUpdate1x6 = (path: lodash.PropertyPath) => any;
+    interface LodashUpdateWith {
+        <T extends object>(customizer: lodash.SetWithCustomizer<T>): LodashUpdateWith1x1<T>;
+        (customizer: lodash.__, path: lodash.PropertyPath): LodashUpdateWith1x2;
+        <T extends object>(customizer: lodash.SetWithCustomizer<T>, path: lodash.PropertyPath): LodashUpdateWith1x3<T>;
+        (customizer: lodash.__, path: lodash.__, updater: (oldValue: any) => any): LodashUpdateWith1x4;
+        <T extends object>(customizer: lodash.SetWithCustomizer<T>, path: lodash.__, updater: (oldValue: any) => any): LodashUpdateWith1x5<T>;
+        (customizer: lodash.__, path: lodash.PropertyPath, updater: (oldValue: any) => any): LodashUpdateWith1x6;
+        <T extends object>(customizer: lodash.SetWithCustomizer<T>, path: lodash.PropertyPath, updater: (oldValue: any) => any): LodashUpdateWith1x7<T>;
+        <T extends object>(customizer: lodash.__, path: lodash.__, updater: lodash.__, object: T): LodashUpdateWith1x8<T>;
+        <T extends object>(customizer: lodash.SetWithCustomizer<T>, path: lodash.__, updater: lodash.__, object: T): LodashUpdateWith1x9<T>;
+        <T extends object>(customizer: lodash.__, path: lodash.PropertyPath, updater: lodash.__, object: T): LodashUpdateWith1x10<T>;
+        <T extends object>(customizer: lodash.SetWithCustomizer<T>, path: lodash.PropertyPath, updater: lodash.__, object: T): LodashUpdateWith1x11<T>;
+        <T extends object>(customizer: lodash.__, path: lodash.__, updater: (oldValue: any) => any, object: T): LodashUpdateWith1x12<T>;
+        <T extends object>(customizer: lodash.SetWithCustomizer<T>, path: lodash.__, updater: (oldValue: any) => any, object: T): LodashUpdateWith1x13<T>;
+        <T extends object>(customizer: lodash.__, path: lodash.PropertyPath, updater: (oldValue: any) => any, object: T): LodashUpdateWith1x14<T>;
+        <T extends object>(customizer: lodash.SetWithCustomizer<T>, path: lodash.PropertyPath, updater: (oldValue: any) => any, object: T): T;
+    }
+    interface LodashUpdateWith1x1<T> {
+        (path: lodash.PropertyPath): LodashUpdateWith1x3<T>;
+        (path: lodash.__, updater: (oldValue: any) => any): LodashUpdateWith1x5<T>;
+        (path: lodash.PropertyPath, updater: (oldValue: any) => any): LodashUpdateWith1x7<T>;
+        (path: lodash.__, updater: lodash.__, object: T): LodashUpdateWith1x9<T>;
+        (path: lodash.PropertyPath, updater: lodash.__, object: T): LodashUpdateWith1x11<T>;
+        (path: lodash.__, updater: (oldValue: any) => any, object: T): LodashUpdateWith1x13<T>;
+        (path: lodash.PropertyPath, updater: (oldValue: any) => any, object: T): T;
+    }
+    interface LodashUpdateWith1x2 {
+        <T extends object>(customizer: lodash.SetWithCustomizer<T>): LodashUpdateWith1x3<T>;
+        (customizer: lodash.__, updater: (oldValue: any) => any): LodashUpdateWith1x6;
+        <T extends object>(customizer: lodash.SetWithCustomizer<T>, updater: (oldValue: any) => any): LodashUpdateWith1x7<T>;
+        <T extends object>(customizer: lodash.__, updater: lodash.__, object: T): LodashUpdateWith1x10<T>;
+        <T extends object>(customizer: lodash.SetWithCustomizer<T>, updater: lodash.__, object: T): LodashUpdateWith1x11<T>;
+        <T extends object>(customizer: lodash.__, updater: (oldValue: any) => any, object: T): LodashUpdateWith1x14<T>;
+        <T extends object>(customizer: lodash.SetWithCustomizer<T>, updater: (oldValue: any) => any, object: T): T;
+    }
+    interface LodashUpdateWith1x3<T> {
+        (updater: (oldValue: any) => any): LodashUpdateWith1x7<T>;
+        (updater: lodash.__, object: T): LodashUpdateWith1x11<T>;
+        (updater: (oldValue: any) => any, object: T): T;
+    }
+    interface LodashUpdateWith1x4 {
+        <T extends object>(customizer: lodash.SetWithCustomizer<T>): LodashUpdateWith1x5<T>;
+        (customizer: lodash.__, path: lodash.PropertyPath): LodashUpdateWith1x6;
+        <T extends object>(customizer: lodash.SetWithCustomizer<T>, path: lodash.PropertyPath): LodashUpdateWith1x7<T>;
+        <T extends object>(customizer: lodash.__, path: lodash.__, object: T): LodashUpdateWith1x12<T>;
+        <T extends object>(customizer: lodash.SetWithCustomizer<T>, path: lodash.__, object: T): LodashUpdateWith1x13<T>;
+        <T extends object>(customizer: lodash.__, path: lodash.PropertyPath, object: T): LodashUpdateWith1x14<T>;
+        <T extends object>(customizer: lodash.SetWithCustomizer<T>, path: lodash.PropertyPath, object: T): T;
+    }
+    interface LodashUpdateWith1x5<T> {
+        (path: lodash.PropertyPath): LodashUpdateWith1x7<T>;
+        (path: lodash.__, object: T): LodashUpdateWith1x13<T>;
+        (path: lodash.PropertyPath, object: T): T;
+    }
+    interface LodashUpdateWith1x6 {
+        <T extends object>(customizer: lodash.SetWithCustomizer<T>): LodashUpdateWith1x7<T>;
+        <T extends object>(customizer: lodash.__, object: T): LodashUpdateWith1x14<T>;
+        <T extends object>(customizer: lodash.SetWithCustomizer<T>, object: T): T;
+    }
+    type LodashUpdateWith1x7<T> = (object: T) => T;
+    interface LodashUpdateWith1x8<T> {
+        (customizer: lodash.SetWithCustomizer<T>): LodashUpdateWith1x9<T>;
+        (customizer: lodash.__, path: lodash.PropertyPath): LodashUpdateWith1x10<T>;
+        (customizer: lodash.SetWithCustomizer<T>, path: lodash.PropertyPath): LodashUpdateWith1x11<T>;
+        (customizer: lodash.__, path: lodash.__, updater: (oldValue: any) => any): LodashUpdateWith1x12<T>;
+        (customizer: lodash.SetWithCustomizer<T>, path: lodash.__, updater: (oldValue: any) => any): LodashUpdateWith1x13<T>;
+        (customizer: lodash.__, path: lodash.PropertyPath, updater: (oldValue: any) => any): LodashUpdateWith1x14<T>;
+        (customizer: lodash.SetWithCustomizer<T>, path: lodash.PropertyPath, updater: (oldValue: any) => any): T;
+    }
+    interface LodashUpdateWith1x9<T> {
+        (path: lodash.PropertyPath): LodashUpdateWith1x11<T>;
+        (path: lodash.__, updater: (oldValue: any) => any): LodashUpdateWith1x13<T>;
+        (path: lodash.PropertyPath, updater: (oldValue: any) => any): T;
+    }
+    interface LodashUpdateWith1x10<T> {
+        (customizer: lodash.SetWithCustomizer<T>): LodashUpdateWith1x11<T>;
+        (customizer: lodash.__, updater: (oldValue: any) => any): LodashUpdateWith1x14<T>;
+        (customizer: lodash.SetWithCustomizer<T>, updater: (oldValue: any) => any): T;
+    }
+    type LodashUpdateWith1x11<T> = (updater: (oldValue: any) => any) => T;
+    interface LodashUpdateWith1x12<T> {
+        (customizer: lodash.SetWithCustomizer<T>): LodashUpdateWith1x13<T>;
+        (customizer: lodash.__, path: lodash.PropertyPath): LodashUpdateWith1x14<T>;
+        (customizer: lodash.SetWithCustomizer<T>, path: lodash.PropertyPath): T;
+    }
+    type LodashUpdateWith1x13<T> = (path: lodash.PropertyPath) => T;
+    type LodashUpdateWith1x14<T> = (customizer: lodash.SetWithCustomizer<T>) => T;
+    type LodashUpperCase = (string: string) => string;
+    type LodashUpperFirst = (string: string) => string;
+    interface LodashValues {
+        <T>(object: lodash.Dictionary<T> | lodash.NumericDictionary<T> | lodash.List<T> | null | undefined): T[];
+        <T extends object>(object: T | null | undefined): Array<T[keyof T]>;
+        (object: any): any[];
+    }
+    interface LodashValuesIn {
+        <T>(object: lodash.Dictionary<T>|lodash.NumericDictionary<T>|lodash.List<T> | null | undefined): T[];
+        <T extends object>(object: T | null | undefined): Array<T[keyof T]>;
+    }
+    interface LodashWithout {
+        <T>(values: ReadonlyArray<T>): LodashWithout1x1<T>;
+        <T>(values: lodash.__, array: lodash.List<T> | null | undefined): LodashWithout1x2<T>;
+        <T>(values: ReadonlyArray<T>, array: lodash.List<T> | null | undefined): T[];
+    }
+    type LodashWithout1x1<T> = (array: lodash.List<T> | null | undefined) => T[];
+    type LodashWithout1x2<T> = (values: ReadonlyArray<T>) => T[];
+    type LodashWords = (string: string) => string[];
+    interface LodashWrap {
+        <T, TArgs, TResult>(wrapper: (value: T, ...args: TArgs[]) => TResult): LodashWrap1x1<T, TArgs, TResult>;
+        <T>(wrapper: lodash.__, value: T): LodashWrap1x2<T>;
+        <T, TArgs, TResult>(wrapper: (value: T, ...args: TArgs[]) => TResult, value: T): (...args: TArgs[]) => TResult;
+        <T, TResult>(wrapper: (value: T, ...args: any[]) => TResult): LodashWrap2x1<T, TResult>;
+        <T, TResult>(wrapper: (value: T, ...args: any[]) => TResult, value: T): (...args: any[]) => TResult;
+    }
+    type LodashWrap1x1<T, TArgs, TResult> = (value: T) => (...args: TArgs[]) => TResult;
+    interface LodashWrap1x2<T> {
+        <TArgs, TResult>(wrapper: (value: T, ...args: TArgs[]) => TResult): (...args: TArgs[]) => TResult;
+        <TResult>(wrapper: (value: T, ...args: any[]) => TResult): (...args: any[]) => TResult;
+    }
+    type LodashWrap2x1<T, TResult> = (value: T) => (...args: any[]) => TResult;
+    interface LodashZip {
+        <T1>(arrays1: lodash.List<T1>): LodashZip1x1<T1>;
+        <T2>(arrays1: lodash.__, arrays2: lodash.List<T2>): LodashZip1x2<T2>;
+        <T1, T2>(arrays1: lodash.List<T1>, arrays2: lodash.List<T2>): Array<[T1 | undefined, T2 | undefined]>;
+    }
+    type LodashZip1x1<T1> = <T2>(arrays2: lodash.List<T2>) => Array<[T1 | undefined, T2 | undefined]>;
+    type LodashZip1x2<T2> = <T1>(arrays1: lodash.List<T1>) => Array<[T1 | undefined, T2 | undefined]>;
+    type LodashZipAll = <T>(arrays: ReadonlyArray<lodash.List<T> | null | undefined>) => Array<Array<T | undefined>>;
+    interface LodashZipObject {
+        (props: lodash.List<lodash.PropertyName>): LodashZipObject1x1;
+        <T>(props: lodash.__, values: lodash.List<T>): LodashZipObject1x2<T>;
+        <T>(props: lodash.List<lodash.PropertyName>, values: lodash.List<T>): lodash.Dictionary<T>;
+    }
+    type LodashZipObject1x1 = <T>(values: lodash.List<T>) => lodash.Dictionary<T>;
+    type LodashZipObject1x2<T> = (props: lodash.List<lodash.PropertyName>) => lodash.Dictionary<T>;
+    interface LodashZipObjectDeep {
+        (paths: lodash.List<lodash.PropertyPath>): LodashZipObjectDeep1x1;
+        (paths: lodash.__, values: lodash.List<any>): LodashZipObjectDeep1x2;
+        (paths: lodash.List<lodash.PropertyPath>, values: lodash.List<any>): object;
+    }
+    type LodashZipObjectDeep1x1 = (values: lodash.List<any>) => object;
+    type LodashZipObjectDeep1x2 = (paths: lodash.List<lodash.PropertyPath>) => object;
+    interface LodashZipWith {
+        <T1, T2, TResult>(iteratee: (value1: T1, value2: T2) => TResult): LodashZipWith1x1<T1, T2, TResult>;
+        <T1>(iteratee: lodash.__, arrays1: lodash.List<T1>): LodashZipWith1x2<T1>;
+        <T1, T2, TResult>(iteratee: (value1: T1, value2: T2) => TResult, arrays1: lodash.List<T1>): LodashZipWith1x3<T2, TResult>;
+        <T2>(iteratee: lodash.__, arrays1: lodash.__, arrays2: lodash.List<T2>): LodashZipWith1x4<T2>;
+        <T1, T2, TResult>(iteratee: (value1: T1, value2: T2) => TResult, arrays1: lodash.__, arrays2: lodash.List<T2>): LodashZipWith1x5<T1, TResult>;
+        <T1, T2>(iteratee: lodash.__, arrays1: lodash.List<T1>, arrays2: lodash.List<T2>): LodashZipWith1x6<T1, T2>;
+        <T1, T2, TResult>(iteratee: (value1: T1, value2: T2) => TResult, arrays1: lodash.List<T1>, arrays2: lodash.List<T2>): TResult[];
+    }
+    interface LodashZipWith1x1<T1, T2, TResult> {
+        (arrays1: lodash.List<T1>): LodashZipWith1x3<T2, TResult>;
+        (arrays1: lodash.__, arrays2: lodash.List<T2>): LodashZipWith1x5<T1, TResult>;
+        (arrays1: lodash.List<T1>, arrays2: lodash.List<T2>): TResult[];
+    }
+    interface LodashZipWith1x2<T1> {
+        <T2, TResult>(iteratee: (value1: T1, value2: T2) => TResult): LodashZipWith1x3<T2, TResult>;
+        <T2>(iteratee: lodash.__, arrays2: lodash.List<T2>): LodashZipWith1x6<T1, T2>;
+        <T2, TResult>(iteratee: (value1: T1, value2: T2) => TResult, arrays2: lodash.List<T2>): TResult[];
+    }
+    type LodashZipWith1x3<T2, TResult> = (arrays2: lodash.List<T2>) => TResult[];
+    interface LodashZipWith1x4<T2> {
+        <T1, TResult>(iteratee: (value1: T1, value2: T2) => TResult): LodashZipWith1x5<T1, TResult>;
+        <T1>(iteratee: lodash.__, arrays1: lodash.List<T1>): LodashZipWith1x6<T1, T2>;
+        <T1, TResult>(iteratee: (value1: T1, value2: T2) => TResult, arrays1: lodash.List<T1>): TResult[];
+    }
+    type LodashZipWith1x5<T1, TResult> = (arrays1: lodash.List<T1>) => TResult[];
+    type LodashZipWith1x6<T1, T2> = <TResult>(iteratee: (value1: T1, value2: T2) => TResult) => TResult[];
+
     interface LoDashFp {
-        add: typeof add;
-        after: typeof after;
-        all: typeof all;
-        allPass: typeof allPass;
-        always: typeof always;
-        any: typeof any;
-        anyPass: typeof anyPass;
-        apply: typeof apply;
-        ary: typeof ary;
-        assign: typeof assign;
-        assignAll: typeof assignAll;
-        assignAllWith: typeof assignAllWith;
-        assignIn: typeof assignIn;
-        assignInAll: typeof assignInAll;
-        assignInAllWith: typeof assignInAllWith;
-        assignInWith: typeof assignInWith;
-        assignWith: typeof assignWith;
-        assoc: typeof assoc;
-        assocPath: typeof assocPath;
-        at: typeof at;
-        attempt: typeof attempt;
-        before: typeof before;
-        bind: typeof bind;
-        bindAll: typeof bindAll;
-        bindKey: typeof bindKey;
-        camelCase: typeof camelCase;
-        capitalize: typeof capitalize;
-        castArray: typeof castArray;
-        ceil: typeof ceil;
-        chunk: typeof chunk;
-        clamp: typeof clamp;
-        clone: typeof clone;
-        cloneDeep: typeof cloneDeep;
-        cloneDeepWith: typeof cloneDeepWith;
-        cloneWith: typeof cloneWith;
-        compact: typeof compact;
-        complement: typeof complement;
-        compose: typeof compose;
-        concat: typeof concat;
-        cond: typeof cond;
-        conforms: typeof conforms;
-        conformsTo: typeof conformsTo;
-        constant: typeof constant;
-        contains: typeof contains;
-        countBy: typeof countBy;
-        create: typeof create;
-        curry: typeof curry;
-        curryN: typeof curryN;
-        curryRight: typeof curryRight;
-        curryRightN: typeof curryRightN;
-        debounce: typeof debounce;
-        deburr: typeof deburr;
-        defaults: typeof defaults;
-        defaultsAll: typeof defaultsAll;
-        defaultsDeep: typeof defaultsDeep;
-        defaultsDeepAll: typeof defaultsDeepAll;
-        defaultTo: typeof defaultTo;
-        defer: typeof defer;
-        delay: typeof delay;
-        difference: typeof difference;
-        differenceBy: typeof differenceBy;
-        differenceWith: typeof differenceWith;
-        dissoc: typeof dissoc;
-        dissocPath: typeof dissocPath;
-        divide: typeof divide;
-        drop: typeof drop;
-        dropLast: typeof dropLast;
-        dropLastWhile: typeof dropLastWhile;
-        dropRight: typeof dropRight;
-        dropRightWhile: typeof dropRightWhile;
-        dropWhile: typeof dropWhile;
-        each: typeof each;
-        eachRight: typeof eachRight;
-        endsWith: typeof endsWith;
-        entries: typeof entries;
-        entriesIn: typeof entriesIn;
-        eq: typeof eq;
-        equals: typeof equals;
-        escape: typeof escape;
-        escapeRegExp: typeof escapeRegExp;
-        every: typeof every;
-        extend: typeof extend;
-        extendAll: typeof extendAll;
-        extendAllWith: typeof extendAllWith;
-        extendWith: typeof extendWith;
-        F: typeof F;
-        fill: typeof fill;
-        filter: typeof filter;
-        find: typeof find;
-        findFrom: typeof findFrom;
-        findIndex: typeof findIndex;
-        findIndexFrom: typeof findIndexFrom;
-        findKey: typeof findKey;
-        findLast: typeof findLast;
-        findLastFrom: typeof findLastFrom;
-        findLastIndex: typeof findLastIndex;
-        findLastIndexFrom: typeof findLastIndexFrom;
-        findLastKey: typeof findLastKey;
-        first: typeof first;
-        flatMap: typeof flatMap;
-        flatMapDeep: typeof flatMapDeep;
-        flatMapDepth: typeof flatMapDepth;
-        flatten: typeof flatten;
-        flattenDeep: typeof flattenDeep;
-        flattenDepth: typeof flattenDepth;
-        flip: typeof flip;
-        floor: typeof floor;
-        flow: typeof flow;
-        flowRight: typeof flowRight;
-        forEach: typeof forEach;
-        forEachRight: typeof forEachRight;
-        forIn: typeof forIn;
-        forInRight: typeof forInRight;
-        forOwn: typeof forOwn;
-        forOwnRight: typeof forOwnRight;
-        fromPairs: typeof fromPairs;
-        functions: typeof functions;
-        functionsIn: typeof functionsIn;
-        get: typeof get;
-        getOr: typeof getOr;
-        groupBy: typeof groupBy;
-        gt: typeof gt;
-        gte: typeof gte;
-        has: typeof has;
-        hasIn: typeof hasIn;
-        head: typeof head;
-        identical: typeof identical;
-        identity: typeof identity;
-        includes: typeof includes;
-        includesFrom: typeof includesFrom;
-        indexBy: typeof indexBy;
-        indexOf: typeof indexOf;
-        indexOfFrom: typeof indexOfFrom;
-        init: typeof init;
-        initial: typeof initial;
-        inRange: typeof inRange;
-        intersection: typeof intersection;
-        intersectionBy: typeof intersectionBy;
-        intersectionWith: typeof intersectionWith;
-        invert: typeof invert;
-        invertBy: typeof invertBy;
-        invertObj: typeof invertObj;
-        invoke: typeof invoke;
-        invokeArgs: typeof invokeArgs;
-        invokeArgsMap: typeof invokeArgsMap;
-        invokeMap: typeof invokeMap;
-        isArguments: typeof isArguments;
-        isArray: typeof isArray;
-        isArrayBuffer: typeof isArrayBuffer;
-        isArrayLike: typeof isArrayLike;
-        isArrayLikeObject: typeof isArrayLikeObject;
-        isBoolean: typeof isBoolean;
-        isBuffer: typeof isBuffer;
-        isDate: typeof isDate;
-        isElement: typeof isElement;
-        isEmpty: typeof isEmpty;
-        isEqual: typeof isEqual;
-        isEqualWith: typeof isEqualWith;
-        isError: typeof isError;
-        isFinite: typeof isFinite;
-        isFunction: typeof isFunction;
-        isInteger: typeof isInteger;
-        isLength: typeof isLength;
-        isMap: typeof isMap;
-        isMatch: typeof isMatch;
-        isMatchWith: typeof isMatchWith;
-        isNaN: typeof isNaN;
-        isNative: typeof isNative;
-        isNil: typeof isNil;
-        isNull: typeof isNull;
-        isNumber: typeof isNumber;
-        isObject: typeof isObject;
-        isObjectLike: typeof isObjectLike;
-        isPlainObject: typeof isPlainObject;
-        isRegExp: typeof isRegExp;
-        isSafeInteger: typeof isSafeInteger;
-        isSet: typeof isSet;
-        isString: typeof isString;
-        isSymbol: typeof isSymbol;
-        isTypedArray: typeof isTypedArray;
-        isUndefined: typeof isUndefined;
-        isWeakMap: typeof isWeakMap;
-        isWeakSet: typeof isWeakSet;
-        iteratee: typeof iteratee;
-        join: typeof join;
-        juxt: typeof juxt;
-        kebabCase: typeof kebabCase;
-        keyBy: typeof keyBy;
-        keys: typeof keys;
-        keysIn: typeof keysIn;
-        last: typeof last;
-        lastIndexOf: typeof lastIndexOf;
-        lastIndexOfFrom: typeof lastIndexOfFrom;
-        lowerCase: typeof lowerCase;
-        lowerFirst: typeof lowerFirst;
-        lt: typeof lt;
-        lte: typeof lte;
-        map: typeof map;
-        mapKeys: typeof mapKeys;
-        mapValues: typeof mapValues;
-        matches: typeof matches;
-        matchesProperty: typeof matchesProperty;
-        max: typeof max;
-        maxBy: typeof maxBy;
-        mean: typeof mean;
-        meanBy: typeof meanBy;
-        memoize: typeof memoize;
-        merge: typeof merge;
-        mergeAll: typeof mergeAll;
-        mergeAllWith: typeof mergeAllWith;
-        mergeWith: typeof mergeWith;
-        method: typeof method;
-        methodOf: typeof methodOf;
-        min: typeof min;
-        minBy: typeof minBy;
-        multiply: typeof multiply;
-        nAry: typeof nAry;
-        negate: typeof negate;
-        noConflict: typeof noConflict;
-        noop: typeof noop;
-        now: typeof now;
-        nth: typeof nth;
-        nthArg: typeof nthArg;
-        omit: typeof omit;
-        omitAll: typeof omitAll;
-        omitBy: typeof omitBy;
-        once: typeof once;
-        orderBy: typeof orderBy;
-        over: typeof over;
-        overArgs: typeof overArgs;
-        overEvery: typeof overEvery;
-        overSome: typeof overSome;
-        pad: typeof pad;
-        padChars: typeof padChars;
-        padCharsEnd: typeof padCharsEnd;
-        padCharsStart: typeof padCharsStart;
-        padEnd: typeof padEnd;
-        padStart: typeof padStart;
-        parseInt: typeof parseInt;
-        partial: typeof partial;
-        partialRight: typeof partialRight;
-        partition: typeof partition;
-        path: typeof path;
-        pathEq: typeof pathEq;
-        pathOr: typeof pathOr;
-        paths: typeof paths;
-        pick: typeof pick;
-        pickAll: typeof pickAll;
-        pickBy: typeof pickBy;
-        pipe: typeof pipe;
-        pluck: typeof pluck;
-        prop: typeof prop;
-        propEq: typeof propEq;
-        property: typeof property;
-        propertyOf: typeof propertyOf;
-        propOr: typeof propOr;
-        props: typeof props;
-        pull: typeof pull;
-        pullAll: typeof pullAll;
-        pullAllBy: typeof pullAllBy;
-        pullAllWith: typeof pullAllWith;
-        pullAt: typeof pullAt;
-        random: typeof random;
-        range: typeof range;
-        rangeRight: typeof rangeRight;
-        rangeStep: typeof rangeStep;
-        rangeStepRight: typeof rangeStepRight;
-        rearg: typeof rearg;
-        reduce: typeof reduce;
-        reduceRight: typeof reduceRight;
-        reject: typeof reject;
-        remove: typeof remove;
-        repeat: typeof repeat;
-        replace: typeof replace;
-        rest: typeof rest;
-        restFrom: typeof restFrom;
-        result: typeof result;
-        reverse: typeof reverse;
-        round: typeof round;
-        runInContext: typeof runInContext;
-        sample: typeof sample;
-        sampleSize: typeof sampleSize;
-        set: typeof set;
-        setWith: typeof setWith;
-        shuffle: typeof shuffle;
-        size: typeof size;
-        slice: typeof slice;
-        snakeCase: typeof snakeCase;
-        some: typeof some;
-        sortBy: typeof sortBy;
-        sortedIndex: typeof sortedIndex;
-        sortedIndexBy: typeof sortedIndexBy;
-        sortedIndexOf: typeof sortedIndexOf;
-        sortedLastIndex: typeof sortedLastIndex;
-        sortedLastIndexBy: typeof sortedLastIndexBy;
-        sortedLastIndexOf: typeof sortedLastIndexOf;
-        sortedUniq: typeof sortedUniq;
-        sortedUniqBy: typeof sortedUniqBy;
-        split: typeof split;
-        spread: typeof spread;
-        spreadFrom: typeof spreadFrom;
-        startCase: typeof startCase;
-        startsWith: typeof startsWith;
-        stubArray: typeof stubArray;
-        stubFalse: typeof stubFalse;
-        stubObject: typeof stubObject;
-        stubString: typeof stubString;
-        stubTrue: typeof stubTrue;
-        subtract: typeof subtract;
-        sum: typeof sum;
-        sumBy: typeof sumBy;
-        symmetricDifference: typeof symmetricDifference;
-        symmetricDifferenceBy: typeof symmetricDifferenceBy;
-        symmetricDifferenceWith: typeof symmetricDifferenceWith;
-        T: typeof T;
-        tail: typeof tail;
-        take: typeof take;
-        takeLast: typeof takeLast;
-        takeLastWhile: typeof takeLastWhile;
-        takeRight: typeof takeRight;
-        takeRightWhile: typeof takeRightWhile;
-        takeWhile: typeof takeWhile;
-        tap: typeof tap;
-        template: typeof template;
-        throttle: typeof throttle;
-        thru: typeof thru;
-        times: typeof times;
-        toArray: typeof toArray;
-        toFinite: typeof toFinite;
-        toInteger: typeof toInteger;
-        toLength: typeof toLength;
-        toLower: typeof toLower;
-        toNumber: typeof toNumber;
-        toPairs: typeof toPairs;
-        toPairsIn: typeof toPairsIn;
-        toPath: typeof toPath;
-        toPlainObject: typeof toPlainObject;
-        toSafeInteger: typeof toSafeInteger;
-        toString: typeof toString;
-        toUpper: typeof toUpper;
-        transform: typeof transform;
-        trim: typeof trim;
-        trimChars: typeof trimChars;
-        trimCharsEnd: typeof trimCharsEnd;
-        trimCharsStart: typeof trimCharsStart;
-        trimEnd: typeof trimEnd;
-        trimStart: typeof trimStart;
-        truncate: typeof truncate;
-        unapply: typeof unapply;
-        unary: typeof unary;
-        unescape: typeof unescape;
-        union: typeof union;
-        unionBy: typeof unionBy;
-        unionWith: typeof unionWith;
-        uniq: typeof uniq;
-        uniqBy: typeof uniqBy;
-        uniqueId: typeof uniqueId;
-        uniqWith: typeof uniqWith;
-        unnest: typeof unnest;
-        unset: typeof unset;
-        unzip: typeof unzip;
-        unzipWith: typeof unzipWith;
-        update: typeof update;
-        updateWith: typeof updateWith;
-        upperCase: typeof upperCase;
-        upperFirst: typeof upperFirst;
-        useWith: typeof useWith;
-        values: typeof values;
-        valuesIn: typeof valuesIn;
-        where: typeof where;
-        whereEq: typeof whereEq;
-        without: typeof without;
-        words: typeof words;
-        wrap: typeof wrap;
-        xor: typeof xor;
-        xorBy: typeof xorBy;
-        xorWith: typeof xorWith;
-        zip: typeof zip;
-        zipAll: typeof zipAll;
-        zipObj: typeof zipObj;
-        zipObject: typeof zipObject;
-        zipObjectDeep: typeof zipObjectDeep;
-        zipWith: typeof zipWith;
+        add: LodashAdd;
+        after: LodashAfter;
+        all: LodashEvery;
+        allPass: LodashOverEvery;
+        always: LodashConstant;
+        any: LodashSome;
+        anyPass: LodashOverSome;
+        apply: LodashApply;
+        ary: LodashAry;
+        assign: LodashAssign;
+        assignAll: LodashAssignAll;
+        assignAllWith: LodashAssignAllWith;
+        assignIn: LodashAssignIn;
+        assignInAll: LodashAssignInAll;
+        assignInAllWith: LodashAssignInAllWith;
+        assignInWith: LodashAssignInWith;
+        assignWith: LodashAssignWith;
+        assoc: LodashSet;
+        assocPath: LodashSet;
+        at: LodashAt;
+        attempt: LodashAttempt;
+        before: LodashBefore;
+        bind: LodashBind;
+        bindAll: LodashBindAll;
+        bindKey: LodashBindKey;
+        camelCase: LodashCamelCase;
+        capitalize: LodashCapitalize;
+        castArray: LodashCastArray;
+        ceil: LodashCeil;
+        chunk: LodashChunk;
+        clamp: LodashClamp;
+        clone: LodashClone;
+        cloneDeep: LodashCloneDeep;
+        cloneDeepWith: LodashCloneDeepWith;
+        cloneWith: LodashCloneWith;
+        compact: LodashCompact;
+        complement: LodashNegate;
+        compose: LodashFlowRight;
+        concat: LodashConcat;
+        cond: LodashCond;
+        conforms: LodashConformsTo;
+        conformsTo: LodashConformsTo;
+        constant: LodashConstant;
+        contains: LodashContains;
+        countBy: LodashCountBy;
+        create: LodashCreate;
+        curry: LodashCurry;
+        curryN: LodashCurryN;
+        curryRight: LodashCurryRight;
+        curryRightN: LodashCurryRightN;
+        debounce: LodashDebounce;
+        deburr: LodashDeburr;
+        defaults: LodashDefaults;
+        defaultsAll: LodashDefaultsAll;
+        defaultsDeep: LodashDefaultsDeep;
+        defaultsDeepAll: LodashDefaultsDeepAll;
+        defaultTo: LodashDefaultTo;
+        defer: LodashDefer;
+        delay: LodashDelay;
+        difference: LodashDifference;
+        differenceBy: LodashDifferenceBy;
+        differenceWith: LodashDifferenceWith;
+        dissoc: LodashUnset;
+        dissocPath: LodashUnset;
+        divide: LodashDivide;
+        drop: LodashDrop;
+        dropLast: LodashDropRight;
+        dropLastWhile: LodashDropRightWhile;
+        dropRight: LodashDropRight;
+        dropRightWhile: LodashDropRightWhile;
+        dropWhile: LodashDropWhile;
+        each: LodashForEach;
+        eachRight: LodashForEachRight;
+        endsWith: LodashEndsWith;
+        entries: LodashToPairs;
+        entriesIn: LodashToPairsIn;
+        eq: LodashEq;
+        equals: LodashIsEqual;
+        escape: LodashEscape;
+        escapeRegExp: LodashEscapeRegExp;
+        every: LodashEvery;
+        extend: LodashExtend;
+        extendAll: LodashExtendAll;
+        extendAllWith: LodashExtendAllWith;
+        extendWith: LodashExtendWith;
+        F: LodashStubFalse;
+        fill: LodashFill;
+        filter: LodashFilter;
+        find: LodashFind;
+        findFrom: LodashFindFrom;
+        findIndex: LodashFindIndex;
+        findIndexFrom: LodashFindIndexFrom;
+        findKey: LodashFindKey;
+        findLast: LodashFindLast;
+        findLastFrom: LodashFindLastFrom;
+        findLastIndex: LodashFindLastIndex;
+        findLastIndexFrom: LodashFindLastIndexFrom;
+        findLastKey: LodashFindLastKey;
+        first: LodashHead;
+        flatMap: LodashFlatMap;
+        flatMapDeep: LodashFlatMapDeep;
+        flatMapDepth: LodashFlatMapDepth;
+        flatten: LodashFlatten;
+        flattenDeep: LodashFlattenDeep;
+        flattenDepth: LodashFlattenDepth;
+        flip: LodashFlip;
+        floor: LodashFloor;
+        flow: LodashFlow;
+        flowRight: LodashFlowRight;
+        forEach: LodashForEach;
+        forEachRight: LodashForEachRight;
+        forIn: LodashForIn;
+        forInRight: LodashForInRight;
+        forOwn: LodashForOwn;
+        forOwnRight: LodashForOwnRight;
+        fromPairs: LodashFromPairs;
+        functions: LodashFunctions;
+        functionsIn: LodashFunctionsIn;
+        get: LodashGet;
+        getOr: LodashGetOr;
+        groupBy: LodashGroupBy;
+        gt: LodashGt;
+        gte: LodashGte;
+        has: LodashHas;
+        hasIn: LodashHasIn;
+        head: LodashHead;
+        identical: LodashEq;
+        identity: LodashIdentity;
+        includes: LodashIncludes;
+        includesFrom: LodashIncludesFrom;
+        indexBy: LodashKeyBy;
+        indexOf: LodashIndexOf;
+        indexOfFrom: LodashIndexOfFrom;
+        init: LodashInitial;
+        initial: LodashInitial;
+        inRange: LodashInRange;
+        intersection: LodashIntersection;
+        intersectionBy: LodashIntersectionBy;
+        intersectionWith: LodashIntersectionWith;
+        invert: LodashInvert;
+        invertBy: LodashInvertBy;
+        invertObj: LodashInvert;
+        invoke: LodashInvoke;
+        invokeArgs: LodashInvokeArgs;
+        invokeArgsMap: LodashInvokeArgsMap;
+        invokeMap: LodashInvokeMap;
+        isArguments: LodashIsArguments;
+        isArray: LodashIsArray;
+        isArrayBuffer: LodashIsArrayBuffer;
+        isArrayLike: LodashIsArrayLike;
+        isArrayLikeObject: LodashIsArrayLikeObject;
+        isBoolean: LodashIsBoolean;
+        isBuffer: LodashIsBuffer;
+        isDate: LodashIsDate;
+        isElement: LodashIsElement;
+        isEmpty: LodashIsEmpty;
+        isEqual: LodashIsEqual;
+        isEqualWith: LodashIsEqualWith;
+        isError: LodashIsError;
+        isFinite: LodashIsFinite;
+        isFunction: LodashIsFunction;
+        isInteger: LodashIsInteger;
+        isLength: LodashIsLength;
+        isMap: LodashIsMap;
+        isMatch: LodashIsMatch;
+        isMatchWith: LodashIsMatchWith;
+        isNaN: LodashIsNaN;
+        isNative: LodashIsNative;
+        isNil: LodashIsNil;
+        isNull: LodashIsNull;
+        isNumber: LodashIsNumber;
+        isObject: LodashIsObject;
+        isObjectLike: LodashIsObjectLike;
+        isPlainObject: LodashIsPlainObject;
+        isRegExp: LodashIsRegExp;
+        isSafeInteger: LodashIsSafeInteger;
+        isSet: LodashIsSet;
+        isString: LodashIsString;
+        isSymbol: LodashIsSymbol;
+        isTypedArray: LodashIsTypedArray;
+        isUndefined: LodashIsUndefined;
+        isWeakMap: LodashIsWeakMap;
+        isWeakSet: LodashIsWeakSet;
+        iteratee: LodashIteratee;
+        join: LodashJoin;
+        juxt: LodashOver;
+        kebabCase: LodashKebabCase;
+        keyBy: LodashKeyBy;
+        keys: LodashKeys;
+        keysIn: LodashKeysIn;
+        last: LodashLast;
+        lastIndexOf: LodashLastIndexOf;
+        lastIndexOfFrom: LodashLastIndexOfFrom;
+        lowerCase: LodashLowerCase;
+        lowerFirst: LodashLowerFirst;
+        lt: LodashLt;
+        lte: LodashLte;
+        map: LodashMap;
+        mapKeys: LodashMapKeys;
+        mapValues: LodashMapValues;
+        matches: LodashIsMatch;
+        matchesProperty: LodashMatchesProperty;
+        max: LodashMax;
+        maxBy: LodashMaxBy;
+        mean: LodashMean;
+        meanBy: LodashMeanBy;
+        memoize: LodashMemoize;
+        merge: LodashMerge;
+        mergeAll: LodashMergeAll;
+        mergeAllWith: LodashMergeAllWith;
+        mergeWith: LodashMergeWith;
+        method: LodashMethod;
+        methodOf: LodashMethodOf;
+        min: LodashMin;
+        minBy: LodashMinBy;
+        multiply: LodashMultiply;
+        nAry: LodashAry;
+        negate: LodashNegate;
+        noConflict: LodashNoConflict;
+        noop: LodashNoop;
+        now: LodashNow;
+        nth: LodashNth;
+        nthArg: LodashNthArg;
+        omit: LodashOmit;
+        omitAll: LodashOmit;
+        omitBy: LodashOmitBy;
+        once: LodashOnce;
+        orderBy: LodashOrderBy;
+        over: LodashOver;
+        overArgs: LodashOverArgs;
+        overEvery: LodashOverEvery;
+        overSome: LodashOverSome;
+        pad: LodashPad;
+        padChars: LodashPadChars;
+        padCharsEnd: LodashPadCharsEnd;
+        padCharsStart: LodashPadCharsStart;
+        padEnd: LodashPadEnd;
+        padStart: LodashPadStart;
+        parseInt: LodashParseInt;
+        partial: LodashPartial;
+        partialRight: LodashPartialRight;
+        partition: LodashPartition;
+        path: LodashPath;
+        pathEq: LodashMatchesProperty;
+        pathOr: LodashPathOr;
+        paths: LodashAt;
+        pick: LodashPick;
+        pickAll: LodashPick;
+        pickBy: LodashPickBy;
+        pipe: LodashFlow;
+        pluck: LodashMap;
+        prop: LodashProp;
+        propEq: LodashMatchesProperty;
+        property: LodashProperty;
+        propertyOf: LodashPropertyOf;
+        propOr: LodashPropOr;
+        props: LodashAt;
+        pull: LodashPull;
+        pullAll: LodashPullAll;
+        pullAllBy: LodashPullAllBy;
+        pullAllWith: LodashPullAllWith;
+        pullAt: LodashPullAt;
+        random: LodashRandom;
+        range: LodashRange;
+        rangeRight: LodashRangeRight;
+        rangeStep: LodashRangeStep;
+        rangeStepRight: LodashRangeStepRight;
+        rearg: LodashRearg;
+        reduce: LodashReduce;
+        reduceRight: LodashReduceRight;
+        reject: LodashReject;
+        remove: LodashRemove;
+        repeat: LodashRepeat;
+        replace: LodashReplace;
+        rest: LodashRest;
+        restFrom: LodashRestFrom;
+        result: LodashResult;
+        reverse: LodashReverse;
+        round: LodashRound;
+        runInContext: LodashRunInContext;
+        sample: LodashSample;
+        sampleSize: LodashSampleSize;
+        set: LodashSet;
+        setWith: LodashSetWith;
+        shuffle: LodashShuffle;
+        size: LodashSize;
+        slice: LodashSlice;
+        snakeCase: LodashSnakeCase;
+        some: LodashSome;
+        sortBy: LodashSortBy;
+        sortedIndex: LodashSortedIndex;
+        sortedIndexBy: LodashSortedIndexBy;
+        sortedIndexOf: LodashSortedIndexOf;
+        sortedLastIndex: LodashSortedLastIndex;
+        sortedLastIndexBy: LodashSortedLastIndexBy;
+        sortedLastIndexOf: LodashSortedLastIndexOf;
+        sortedUniq: LodashSortedUniq;
+        sortedUniqBy: LodashSortedUniqBy;
+        split: LodashSplit;
+        spread: LodashSpread;
+        spreadFrom: LodashSpreadFrom;
+        startCase: LodashStartCase;
+        startsWith: LodashStartsWith;
+        stubArray: LodashStubArray;
+        stubFalse: LodashStubFalse;
+        stubObject: LodashStubObject;
+        stubString: LodashStubString;
+        stubTrue: LodashStubTrue;
+        subtract: LodashSubtract;
+        sum: LodashSum;
+        sumBy: LodashSumBy;
+        symmetricDifference: LodashXor;
+        symmetricDifferenceBy: LodashXorBy;
+        symmetricDifferenceWith: LodashXorWith;
+        T: LodashStubTrue;
+        tail: LodashTail;
+        take: LodashTake;
+        takeLast: LodashTakeRight;
+        takeLastWhile: LodashTakeRightWhile;
+        takeRight: LodashTakeRight;
+        takeRightWhile: LodashTakeRightWhile;
+        takeWhile: LodashTakeWhile;
+        tap: LodashTap;
+        template: LodashTemplate;
+        throttle: LodashThrottle;
+        thru: LodashThru;
+        times: LodashTimes;
+        toArray: LodashToArray;
+        toFinite: LodashToFinite;
+        toInteger: LodashToInteger;
+        toLength: LodashToLength;
+        toLower: LodashToLower;
+        toNumber: LodashToNumber;
+        toPairs: LodashToPairs;
+        toPairsIn: LodashToPairsIn;
+        toPath: LodashToPath;
+        toPlainObject: LodashToPlainObject;
+        toSafeInteger: LodashToSafeInteger;
+        toString: LodashToString;
+        toUpper: LodashToUpper;
+        transform: LodashTransform;
+        trim: LodashTrim;
+        trimChars: LodashTrimChars;
+        trimCharsEnd: LodashTrimCharsEnd;
+        trimCharsStart: LodashTrimCharsStart;
+        trimEnd: LodashTrimEnd;
+        trimStart: LodashTrimStart;
+        truncate: LodashTruncate;
+        unapply: LodashUnapply;
+        unary: LodashUnary;
+        unescape: LodashUnescape;
+        union: LodashUnion;
+        unionBy: LodashUnionBy;
+        unionWith: LodashUnionWith;
+        uniq: LodashUniq;
+        uniqBy: LodashUniqBy;
+        uniqueId: LodashUniqueId;
+        uniqWith: LodashUniqWith;
+        unnest: LodashFlatten;
+        unset: LodashUnset;
+        unzip: LodashUnzip;
+        unzipWith: LodashUnzipWith;
+        update: LodashUpdate;
+        updateWith: LodashUpdateWith;
+        upperCase: LodashUpperCase;
+        upperFirst: LodashUpperFirst;
+        useWith: LodashOverArgs;
+        values: LodashValues;
+        valuesIn: LodashValuesIn;
+        where: LodashConformsTo;
+        whereEq: LodashIsMatch;
+        without: LodashWithout;
+        words: LodashWords;
+        wrap: LodashWrap;
+        xor: LodashXor;
+        xorBy: LodashXorBy;
+        xorWith: LodashXorWith;
+        zip: LodashZip;
+        zipAll: LodashZipAll;
+        zipObj: LodashZipObject;
+        zipObject: LodashZipObject;
+        zipObjectDeep: LodashZipObjectDeep;
+        zipWith: LodashZipWith;
+        __: lodash.__;
+        placehodler: lodash.__;
     }
 }
-
-// Backward compatibility with --target es5
-declare global {
-    // tslint:disable-next-line:no-empty-interface
-    interface Set<T> { }
-    // tslint:disable-next-line:no-empty-interface
-    interface Map<K, V> { }
-    // tslint:disable-next-line:no-empty-interface
-    interface WeakSet<T> { }
-    // tslint:disable-next-line:no-empty-interface
-    interface WeakMap<K extends object, V> { }
-}
diff --git a/types/lodash/fp/F.d.ts b/types/lodash/fp/F.d.ts
index 8d7802efd8..33fc57930d 100644
--- a/types/lodash/fp/F.d.ts
+++ b/types/lodash/fp/F.d.ts
@@ -1,14 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type StubFalse =
-    /**
-     * This method returns `false`.
-     *
-     * @returns Returns `false`.
-     */
-    () => boolean;
-
-declare const F: StubFalse;
+import { F } from "../fp";
 export = F;
diff --git a/types/lodash/fp/T.d.ts b/types/lodash/fp/T.d.ts
index ea1dc32ee8..886606ef6f 100644
--- a/types/lodash/fp/T.d.ts
+++ b/types/lodash/fp/T.d.ts
@@ -1,14 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type StubTrue =
-    /**
-     * This method returns `true`.
-     *
-     * @returns Returns `true`.
-     */
-    () => boolean;
-
-declare const T: StubTrue;
+import { T } from "../fp";
 export = T;
diff --git a/types/lodash/fp/__.d.ts b/types/lodash/fp/__.d.ts
new file mode 100644
index 0000000000..aec0a51422
--- /dev/null
+++ b/types/lodash/fp/__.d.ts
@@ -0,0 +1,3 @@
+import _ = require("../index");
+declare const __: _.__;
+export = __;
diff --git a/types/lodash/fp/add.d.ts b/types/lodash/fp/add.d.ts
index 2977814de9..47c9c6a1a4 100644
--- a/types/lodash/fp/add.d.ts
+++ b/types/lodash/fp/add.d.ts
@@ -1,51 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface Add {
-    /**
-     * Adds two numbers.
-     *
-     * @param augend The first number to add.
-     * @param addend The second number to add.
-     * @return Returns the sum.
-     */
-    (): Add;
-    /**
-     * Adds two numbers.
-     *
-     * @param augend The first number to add.
-     * @param addend The second number to add.
-     * @return Returns the sum.
-     */
-    (augend: number): Add1x1;
-    /**
-     * Adds two numbers.
-     *
-     * @param augend The first number to add.
-     * @param addend The second number to add.
-     * @return Returns the sum.
-     */
-    (augend: number, addend: number): number;
-}
-interface Add1x1 {
-    /**
-     * Adds two numbers.
-     *
-     * @param augend The first number to add.
-     * @param addend The second number to add.
-     * @return Returns the sum.
-     */
-    (): Add1x1;
-    /**
-     * Adds two numbers.
-     *
-     * @param augend The first number to add.
-     * @param addend The second number to add.
-     * @return Returns the sum.
-     */
-    (addend: number): number;
-}
-
-declare const add: Add;
+import { add } from "../fp";
 export = add;
diff --git a/types/lodash/fp/after.d.ts b/types/lodash/fp/after.d.ts
index c6b21973d0..93863a5613 100644
--- a/types/lodash/fp/after.d.ts
+++ b/types/lodash/fp/after.d.ts
@@ -1,51 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface After {
-    /**
-     * The opposite of _.before; this method creates a function that invokes func once it’s called n or more times.
-     *
-     * @param n The number of calls before func is invoked.
-     * @param func The function to restrict.
-     * @return Returns the new restricted function.
-     */
-    (): After;
-    /**
-     * The opposite of _.before; this method creates a function that invokes func once it’s called n or more times.
-     *
-     * @param n The number of calls before func is invoked.
-     * @param func The function to restrict.
-     * @return Returns the new restricted function.
-     */
-    <TFunc extends (...args: any[]) => any>(func: TFunc): After1x1<TFunc>;
-    /**
-     * The opposite of _.before; this method creates a function that invokes func once it’s called n or more times.
-     *
-     * @param n The number of calls before func is invoked.
-     * @param func The function to restrict.
-     * @return Returns the new restricted function.
-     */
-    <TFunc extends (...args: any[]) => any>(func: TFunc, n: number): TFunc;
-}
-interface After1x1<TFunc extends (...args: any[]) => any> {
-    /**
-     * The opposite of _.before; this method creates a function that invokes func once it’s called n or more times.
-     *
-     * @param n The number of calls before func is invoked.
-     * @param func The function to restrict.
-     * @return Returns the new restricted function.
-     */
-    (): After1x1<TFunc>;
-    /**
-     * The opposite of _.before; this method creates a function that invokes func once it’s called n or more times.
-     *
-     * @param n The number of calls before func is invoked.
-     * @param func The function to restrict.
-     * @return Returns the new restricted function.
-     */
-    (n: number): TFunc;
-}
-
-declare const after: After;
+import { after } from "../fp";
 export = after;
diff --git a/types/lodash/fp/all.d.ts b/types/lodash/fp/all.d.ts
index 15f37bae09..5ca0f70736 100644
--- a/types/lodash/fp/all.d.ts
+++ b/types/lodash/fp/all.d.ts
@@ -1,67 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Every {
-    /**
-     * Checks if predicate returns truthy for all elements of collection. Iteration is stopped once predicate
-     * returns falsey. The predicate is invoked with three arguments: (value, index|key, collection).
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @return Returns true if all elements pass the predicate check, else false.
-     */
-    (): Every;
-    /**
-     * Checks if predicate returns truthy for all elements of collection. Iteration is stopped once predicate
-     * returns falsey. The predicate is invoked with three arguments: (value, index|key, collection).
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @return Returns true if all elements pass the predicate check, else false.
-     */
-    <T>(predicate: _.ValueIterateeCustom<T, boolean>): Every1x1<T>;
-    /**
-     * Checks if predicate returns truthy for all elements of collection. Iteration is stopped once predicate
-     * returns falsey. The predicate is invoked with three arguments: (value, index|key, collection).
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @return Returns true if all elements pass the predicate check, else false.
-     */
-    <T>(predicate: _.ValueIterateeCustom<T, boolean>, collection: _.List<T> | null | undefined): boolean;
-    /**
-     * Checks if predicate returns truthy for all elements of collection. Iteration is stopped once predicate
-     * returns falsey. The predicate is invoked with three arguments: (value, index|key, collection).
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @return Returns true if all elements pass the predicate check, else false.
-     */
-    <T extends object>(predicate: _.ValueIterateeCustom<T[keyof T], boolean>, collection: T | null | undefined): boolean;
-}
-interface Every1x1<T> {
-    /**
-     * Checks if predicate returns truthy for all elements of collection. Iteration is stopped once predicate
-     * returns falsey. The predicate is invoked with three arguments: (value, index|key, collection).
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @return Returns true if all elements pass the predicate check, else false.
-     */
-    (): Every1x1<T>;
-    /**
-     * Checks if predicate returns truthy for all elements of collection. Iteration is stopped once predicate
-     * returns falsey. The predicate is invoked with three arguments: (value, index|key, collection).
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @return Returns true if all elements pass the predicate check, else false.
-     */
-    (collection: _.List<T> | object | null | undefined): boolean;
-}
-
-declare const all: Every;
+import { all } from "../fp";
 export = all;
diff --git a/types/lodash/fp/allPass.d.ts b/types/lodash/fp/allPass.d.ts
index 564484494e..5013913efc 100644
--- a/types/lodash/fp/allPass.d.ts
+++ b/types/lodash/fp/allPass.d.ts
@@ -1,18 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-type OverEvery =
-    /**
-     * Creates a function that checks if all of the predicates return truthy when invoked with the arguments
-     * provided to the created function.
-     *
-     * @param predicates The predicates to check.
-     * @return Returns the new function.
-     */
-    <T>(predicates: _.Many<(...args: T[]) => boolean>) => (...args: T[]) => boolean;
-
-declare const allPass: OverEvery;
+import { allPass } from "../fp";
 export = allPass;
diff --git a/types/lodash/fp/always.d.ts b/types/lodash/fp/always.d.ts
index bd22aed21f..07bd82d47c 100644
--- a/types/lodash/fp/always.d.ts
+++ b/types/lodash/fp/always.d.ts
@@ -1,15 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type Constant =
-    /**
-     * Creates a function that returns value.
-     *
-     * @param value The value to return from the new function.
-     * @return Returns the new function.
-     */
-    <T>(value: T) => () => T;
-
-declare const always: Constant;
+import { always } from "../fp";
 export = always;
diff --git a/types/lodash/fp/any.d.ts b/types/lodash/fp/any.d.ts
index 32cf83d382..5d8c38f27c 100644
--- a/types/lodash/fp/any.d.ts
+++ b/types/lodash/fp/any.d.ts
@@ -1,67 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Some {
-    /**
-     * Checks if predicate returns truthy for any element of collection. Iteration is stopped once predicate
-     * returns truthy. The predicate is invoked with three arguments: (value, index|key, collection).
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @return Returns true if any element passes the predicate check, else false.
-     */
-    (): Some;
-    /**
-     * Checks if predicate returns truthy for any element of collection. Iteration is stopped once predicate
-     * returns truthy. The predicate is invoked with three arguments: (value, index|key, collection).
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @return Returns true if any element passes the predicate check, else false.
-     */
-    <T>(predicate: _.ValueIterateeCustom<T, boolean>): Some1x1<T>;
-    /**
-     * Checks if predicate returns truthy for any element of collection. Iteration is stopped once predicate
-     * returns truthy. The predicate is invoked with three arguments: (value, index|key, collection).
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @return Returns true if any element passes the predicate check, else false.
-     */
-    <T>(predicate: _.ValueIterateeCustom<T, boolean>, collection: _.List<T> | null | undefined): boolean;
-    /**
-     * Checks if predicate returns truthy for any element of collection. Iteration is stopped once predicate
-     * returns truthy. The predicate is invoked with three arguments: (value, index|key, collection).
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @return Returns true if any element passes the predicate check, else false.
-     */
-    <T extends object>(predicate: _.ValueIterateeCustom<T[keyof T], boolean>, collection: T | null | undefined): boolean;
-}
-interface Some1x1<T> {
-    /**
-     * Checks if predicate returns truthy for any element of collection. Iteration is stopped once predicate
-     * returns truthy. The predicate is invoked with three arguments: (value, index|key, collection).
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @return Returns true if any element passes the predicate check, else false.
-     */
-    (): Some1x1<T>;
-    /**
-     * Checks if predicate returns truthy for any element of collection. Iteration is stopped once predicate
-     * returns truthy. The predicate is invoked with three arguments: (value, index|key, collection).
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @return Returns true if any element passes the predicate check, else false.
-     */
-    (collection: _.List<T> | object | null | undefined): boolean;
-}
-
-declare const any: Some;
+import { any } from "../fp";
 export = any;
diff --git a/types/lodash/fp/anyPass.d.ts b/types/lodash/fp/anyPass.d.ts
index 0666de68ba..b69becfaf3 100644
--- a/types/lodash/fp/anyPass.d.ts
+++ b/types/lodash/fp/anyPass.d.ts
@@ -1,18 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-type OverSome =
-    /**
-     * Creates a function that checks if any of the predicates return truthy when invoked with the arguments
-     * provided to the created function.
-     *
-     * @param predicates The predicates to check.
-     * @return Returns the new function.
-     */
-    <T>(predicates: _.Many<(...args: T[]) => boolean>) => (...args: T[]) => boolean;
-
-declare const anyPass: OverSome;
+import { anyPass } from "../fp";
 export = anyPass;
diff --git a/types/lodash/fp/apply.d.ts b/types/lodash/fp/apply.d.ts
index 6a052218aa..e13c42c5de 100644
--- a/types/lodash/fp/apply.d.ts
+++ b/types/lodash/fp/apply.d.ts
@@ -1,18 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type Spread =
-    /**
-     * Creates a function that invokes func with the this binding of the created function and an array of arguments
-     * much like Function#apply.
-     *
-     * Note: This method is based on the spread operator.
-     *
-     * @param func The function to spread arguments over.
-     * @return Returns the new function.
-     */
-    <TResult>(func: (...args: any[]) => TResult) => (...args: any[]) => TResult;
-
-declare const apply: Spread;
+import { apply } from "../fp";
 export = apply;
diff --git a/types/lodash/fp/ary.d.ts b/types/lodash/fp/ary.d.ts
index c241921795..932d7f45f3 100644
--- a/types/lodash/fp/ary.d.ts
+++ b/types/lodash/fp/ary.d.ts
@@ -1,51 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface Ary {
-    /**
-     * Creates a function that accepts up to n arguments ignoring any additional arguments.
-     *
-     * @param func The function to cap arguments for.
-     * @param n The arity cap.
-     * @returns Returns the new function.
-     */
-    (): Ary;
-    /**
-     * Creates a function that accepts up to n arguments ignoring any additional arguments.
-     *
-     * @param func The function to cap arguments for.
-     * @param n The arity cap.
-     * @returns Returns the new function.
-     */
-    (n: number): Ary1x1;
-    /**
-     * Creates a function that accepts up to n arguments ignoring any additional arguments.
-     *
-     * @param func The function to cap arguments for.
-     * @param n The arity cap.
-     * @returns Returns the new function.
-     */
-    (n: number, func: (...args: any[]) => any): (...args: any[]) => any;
-}
-interface Ary1x1 {
-    /**
-     * Creates a function that accepts up to n arguments ignoring any additional arguments.
-     *
-     * @param func The function to cap arguments for.
-     * @param n The arity cap.
-     * @returns Returns the new function.
-     */
-    (): Ary1x1;
-    /**
-     * Creates a function that accepts up to n arguments ignoring any additional arguments.
-     *
-     * @param func The function to cap arguments for.
-     * @param n The arity cap.
-     * @returns Returns the new function.
-     */
-    (func: (...args: any[]) => any): (...args: any[]) => any;
-}
-
-declare const ary: Ary;
+import { ary } from "../fp";
 export = ary;
diff --git a/types/lodash/fp/assign.d.ts b/types/lodash/fp/assign.d.ts
index df05fbe118..cf173104ab 100644
--- a/types/lodash/fp/assign.d.ts
+++ b/types/lodash/fp/assign.d.ts
@@ -1,156 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface Assign {
-    /**
-     * Assigns own enumerable properties of source objects to the destination
-     * object. Source objects are applied from left to right. Subsequent sources
-     * overwrite property assignments of previous sources.
-     *
-     * **Note:** This method mutates `object` and is loosely based on
-     * [`Object.assign`](https://mdn.io/Object/assign).
-     *
-     * @category Object
-     * @param object The destination object.
-     * @param [sources] The source objects.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function Foo() {
-     *   this.c = 3;
-     * }
-     *
-     * function Bar() {
-     *   this.e = 5;
-     * }
-     *
-     * Foo.prototype.d = 4;
-     * Bar.prototype.f = 6;
-     *
-     * _.assign({ 'a': 1 }, new Foo, new Bar);
-     * // => { 'a': 1, 'c': 3, 'e': 5 }
-     */
-    (): Assign;
-    /**
-     * Assigns own enumerable properties of source objects to the destination
-     * object. Source objects are applied from left to right. Subsequent sources
-     * overwrite property assignments of previous sources.
-     *
-     * **Note:** This method mutates `object` and is loosely based on
-     * [`Object.assign`](https://mdn.io/Object/assign).
-     *
-     * @category Object
-     * @param object The destination object.
-     * @param [sources] The source objects.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function Foo() {
-     *   this.c = 3;
-     * }
-     *
-     * function Bar() {
-     *   this.e = 5;
-     * }
-     *
-     * Foo.prototype.d = 4;
-     * Bar.prototype.f = 6;
-     *
-     * _.assign({ 'a': 1 }, new Foo, new Bar);
-     * // => { 'a': 1, 'c': 3, 'e': 5 }
-     */
-    <TObject>(object: TObject): Assign1x1<TObject>;
-    /**
-     * Assigns own enumerable properties of source objects to the destination
-     * object. Source objects are applied from left to right. Subsequent sources
-     * overwrite property assignments of previous sources.
-     *
-     * **Note:** This method mutates `object` and is loosely based on
-     * [`Object.assign`](https://mdn.io/Object/assign).
-     *
-     * @category Object
-     * @param object The destination object.
-     * @param [sources] The source objects.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function Foo() {
-     *   this.c = 3;
-     * }
-     *
-     * function Bar() {
-     *   this.e = 5;
-     * }
-     *
-     * Foo.prototype.d = 4;
-     * Bar.prototype.f = 6;
-     *
-     * _.assign({ 'a': 1 }, new Foo, new Bar);
-     * // => { 'a': 1, 'c': 3, 'e': 5 }
-     */
-    <TObject, TSource>(object: TObject, source: TSource): TObject & TSource;
-}
-interface Assign1x1<TObject> {
-    /**
-     * Assigns own enumerable properties of source objects to the destination
-     * object. Source objects are applied from left to right. Subsequent sources
-     * overwrite property assignments of previous sources.
-     *
-     * **Note:** This method mutates `object` and is loosely based on
-     * [`Object.assign`](https://mdn.io/Object/assign).
-     *
-     * @category Object
-     * @param object The destination object.
-     * @param [sources] The source objects.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function Foo() {
-     *   this.c = 3;
-     * }
-     *
-     * function Bar() {
-     *   this.e = 5;
-     * }
-     *
-     * Foo.prototype.d = 4;
-     * Bar.prototype.f = 6;
-     *
-     * _.assign({ 'a': 1 }, new Foo, new Bar);
-     * // => { 'a': 1, 'c': 3, 'e': 5 }
-     */
-    (): Assign1x1<TObject>;
-    /**
-     * Assigns own enumerable properties of source objects to the destination
-     * object. Source objects are applied from left to right. Subsequent sources
-     * overwrite property assignments of previous sources.
-     *
-     * **Note:** This method mutates `object` and is loosely based on
-     * [`Object.assign`](https://mdn.io/Object/assign).
-     *
-     * @category Object
-     * @param object The destination object.
-     * @param [sources] The source objects.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function Foo() {
-     *   this.c = 3;
-     * }
-     *
-     * function Bar() {
-     *   this.e = 5;
-     * }
-     *
-     * Foo.prototype.d = 4;
-     * Bar.prototype.f = 6;
-     *
-     * _.assign({ 'a': 1 }, new Foo, new Bar);
-     * // => { 'a': 1, 'c': 3, 'e': 5 }
-     */
-    <TSource>(source: TSource): TObject & TSource;
-}
-
-declare const assign: Assign;
+import { assign } from "../fp";
 export = assign;
diff --git a/types/lodash/fp/assignAll.d.ts b/types/lodash/fp/assignAll.d.ts
index b6ba1dfba9..f95b06b475 100644
--- a/types/lodash/fp/assignAll.d.ts
+++ b/types/lodash/fp/assignAll.d.ts
@@ -1,37 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type Assign =
-    /**
-     * Assigns own enumerable properties of source objects to the destination
-     * object. Source objects are applied from left to right. Subsequent sources
-     * overwrite property assignments of previous sources.
-     *
-     * **Note:** This method mutates `object` and is loosely based on
-     * [`Object.assign`](https://mdn.io/Object/assign).
-     *
-     * @category Object
-     * @param object The destination object.
-     * @param [sources] The source objects.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function Foo() {
-     *   this.c = 3;
-     * }
-     *
-     * function Bar() {
-     *   this.e = 5;
-     * }
-     *
-     * Foo.prototype.d = 4;
-     * Bar.prototype.f = 6;
-     *
-     * _.assign({ 'a': 1 }, new Foo, new Bar);
-     * // => { 'a': 1, 'c': 3, 'e': 5 }
-     */
-    (object: ReadonlyArray<any>) => any;
-
-declare const assignAll: Assign;
+import { assignAll } from "../fp";
 export = assignAll;
diff --git a/types/lodash/fp/assignAllWith.d.ts b/types/lodash/fp/assignAllWith.d.ts
index 0f8d2d07ed..c2695a07a6 100644
--- a/types/lodash/fp/assignAllWith.d.ts
+++ b/types/lodash/fp/assignAllWith.d.ts
@@ -1,138 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface AssignWith {
-    /**
-     * This method is like `_.assign` except that it accepts `customizer` which
-     * is invoked to produce the assigned values. If `customizer` returns `undefined`
-     * assignment is handled by the method instead. The `customizer` is invoked
-     * with five arguments: (objValue, srcValue, key, object, source).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   return _.isUndefined(objValue) ? srcValue : objValue;
-     * }
-     *
-     * var defaults = _.partialRight(_.assignWith, customizer);
-     *
-     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
-     * // => { 'a': 1, 'b': 2 }
-     */
-    (): AssignWith;
-    /**
-     * This method is like `_.assign` except that it accepts `customizer` which
-     * is invoked to produce the assigned values. If `customizer` returns `undefined`
-     * assignment is handled by the method instead. The `customizer` is invoked
-     * with five arguments: (objValue, srcValue, key, object, source).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   return _.isUndefined(objValue) ? srcValue : objValue;
-     * }
-     *
-     * var defaults = _.partialRight(_.assignWith, customizer);
-     *
-     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
-     * // => { 'a': 1, 'b': 2 }
-     */
-    (customizer: _.AssignCustomizer): AssignWith1x1;
-    /**
-     * This method is like `_.assign` except that it accepts `customizer` which
-     * is invoked to produce the assigned values. If `customizer` returns `undefined`
-     * assignment is handled by the method instead. The `customizer` is invoked
-     * with five arguments: (objValue, srcValue, key, object, source).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   return _.isUndefined(objValue) ? srcValue : objValue;
-     * }
-     *
-     * var defaults = _.partialRight(_.assignWith, customizer);
-     *
-     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
-     * // => { 'a': 1, 'b': 2 }
-     */
-    (customizer: _.AssignCustomizer, args: ReadonlyArray<any>): any;
-}
-interface AssignWith1x1 {
-    /**
-     * This method is like `_.assign` except that it accepts `customizer` which
-     * is invoked to produce the assigned values. If `customizer` returns `undefined`
-     * assignment is handled by the method instead. The `customizer` is invoked
-     * with five arguments: (objValue, srcValue, key, object, source).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   return _.isUndefined(objValue) ? srcValue : objValue;
-     * }
-     *
-     * var defaults = _.partialRight(_.assignWith, customizer);
-     *
-     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
-     * // => { 'a': 1, 'b': 2 }
-     */
-    (): AssignWith1x1;
-    /**
-     * This method is like `_.assign` except that it accepts `customizer` which
-     * is invoked to produce the assigned values. If `customizer` returns `undefined`
-     * assignment is handled by the method instead. The `customizer` is invoked
-     * with five arguments: (objValue, srcValue, key, object, source).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   return _.isUndefined(objValue) ? srcValue : objValue;
-     * }
-     *
-     * var defaults = _.partialRight(_.assignWith, customizer);
-     *
-     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
-     * // => { 'a': 1, 'b': 2 }
-     */
-    (args: ReadonlyArray<any>): any;
-}
-
-declare const assignAllWith: AssignWith;
+import { assignAllWith } from "../fp";
 export = assignAllWith;
diff --git a/types/lodash/fp/assignIn.d.ts b/types/lodash/fp/assignIn.d.ts
index fcd201f901..f6cdee768b 100644
--- a/types/lodash/fp/assignIn.d.ts
+++ b/types/lodash/fp/assignIn.d.ts
@@ -1,151 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface AssignIn {
-    /**
-     * This method is like `_.assign` except that it iterates over own and
-     * inherited source properties.
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @alias extend
-     * @category Object
-     * @param object The destination object.
-     * @param [sources] The source objects.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function Foo() {
-     *   this.b = 2;
-     * }
-     *
-     * function Bar() {
-     *   this.d = 4;
-     * }
-     *
-     * Foo.prototype.c = 3;
-     * Bar.prototype.e = 5;
-     *
-     * _.assignIn({ 'a': 1 }, new Foo, new Bar);
-     * // => { 'a': 1, 'b': 2, 'c': 3, 'd': 4, 'e': 5 }
-     */
-    (): AssignIn;
-    /**
-     * This method is like `_.assign` except that it iterates over own and
-     * inherited source properties.
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @alias extend
-     * @category Object
-     * @param object The destination object.
-     * @param [sources] The source objects.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function Foo() {
-     *   this.b = 2;
-     * }
-     *
-     * function Bar() {
-     *   this.d = 4;
-     * }
-     *
-     * Foo.prototype.c = 3;
-     * Bar.prototype.e = 5;
-     *
-     * _.assignIn({ 'a': 1 }, new Foo, new Bar);
-     * // => { 'a': 1, 'b': 2, 'c': 3, 'd': 4, 'e': 5 }
-     */
-    <TObject>(object: TObject): AssignIn1x1<TObject>;
-    /**
-     * This method is like `_.assign` except that it iterates over own and
-     * inherited source properties.
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @alias extend
-     * @category Object
-     * @param object The destination object.
-     * @param [sources] The source objects.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function Foo() {
-     *   this.b = 2;
-     * }
-     *
-     * function Bar() {
-     *   this.d = 4;
-     * }
-     *
-     * Foo.prototype.c = 3;
-     * Bar.prototype.e = 5;
-     *
-     * _.assignIn({ 'a': 1 }, new Foo, new Bar);
-     * // => { 'a': 1, 'b': 2, 'c': 3, 'd': 4, 'e': 5 }
-     */
-    <TObject, TSource>(object: TObject, source: TSource): TObject & TSource;
-}
-interface AssignIn1x1<TObject> {
-    /**
-     * This method is like `_.assign` except that it iterates over own and
-     * inherited source properties.
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @alias extend
-     * @category Object
-     * @param object The destination object.
-     * @param [sources] The source objects.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function Foo() {
-     *   this.b = 2;
-     * }
-     *
-     * function Bar() {
-     *   this.d = 4;
-     * }
-     *
-     * Foo.prototype.c = 3;
-     * Bar.prototype.e = 5;
-     *
-     * _.assignIn({ 'a': 1 }, new Foo, new Bar);
-     * // => { 'a': 1, 'b': 2, 'c': 3, 'd': 4, 'e': 5 }
-     */
-    (): AssignIn1x1<TObject>;
-    /**
-     * This method is like `_.assign` except that it iterates over own and
-     * inherited source properties.
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @alias extend
-     * @category Object
-     * @param object The destination object.
-     * @param [sources] The source objects.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function Foo() {
-     *   this.b = 2;
-     * }
-     *
-     * function Bar() {
-     *   this.d = 4;
-     * }
-     *
-     * Foo.prototype.c = 3;
-     * Bar.prototype.e = 5;
-     *
-     * _.assignIn({ 'a': 1 }, new Foo, new Bar);
-     * // => { 'a': 1, 'b': 2, 'c': 3, 'd': 4, 'e': 5 }
-     */
-    <TSource>(source: TSource): TObject & TSource;
-}
-
-declare const assignIn: AssignIn;
+import { assignIn } from "../fp";
 export = assignIn;
diff --git a/types/lodash/fp/assignInAll.d.ts b/types/lodash/fp/assignInAll.d.ts
index 32290cc6cd..539344b67b 100644
--- a/types/lodash/fp/assignInAll.d.ts
+++ b/types/lodash/fp/assignInAll.d.ts
@@ -1,36 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type AssignIn =
-    /**
-     * This method is like `_.assign` except that it iterates over own and
-     * inherited source properties.
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @alias extend
-     * @category Object
-     * @param object The destination object.
-     * @param [sources] The source objects.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function Foo() {
-     *   this.b = 2;
-     * }
-     *
-     * function Bar() {
-     *   this.d = 4;
-     * }
-     *
-     * Foo.prototype.c = 3;
-     * Bar.prototype.e = 5;
-     *
-     * _.assignIn({ 'a': 1 }, new Foo, new Bar);
-     * // => { 'a': 1, 'b': 2, 'c': 3, 'd': 4, 'e': 5 }
-     */
-    <TResult>(object: ReadonlyArray<any>) => TResult;
-
-declare const assignInAll: AssignIn;
+import { assignInAll } from "../fp";
 export = assignInAll;
diff --git a/types/lodash/fp/assignInAllWith.d.ts b/types/lodash/fp/assignInAllWith.d.ts
index 631b28218a..3b421fb332 100644
--- a/types/lodash/fp/assignInAllWith.d.ts
+++ b/types/lodash/fp/assignInAllWith.d.ts
@@ -1,143 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface AssignInWith {
-    /**
-     * This method is like `_.assignIn` except that it accepts `customizer` which
-     * is invoked to produce the assigned values. If `customizer` returns `undefined`
-     * assignment is handled by the method instead. The `customizer` is invoked
-     * with five arguments: (objValue, srcValue, key, object, source).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @alias extendWith
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   return _.isUndefined(objValue) ? srcValue : objValue;
-     * }
-     *
-     * var defaults = _.partialRight(_.assignInWith, customizer);
-     *
-     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
-     * // => { 'a': 1, 'b': 2 }
-     */
-    (): AssignInWith;
-    /**
-     * This method is like `_.assignIn` except that it accepts `customizer` which
-     * is invoked to produce the assigned values. If `customizer` returns `undefined`
-     * assignment is handled by the method instead. The `customizer` is invoked
-     * with five arguments: (objValue, srcValue, key, object, source).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @alias extendWith
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   return _.isUndefined(objValue) ? srcValue : objValue;
-     * }
-     *
-     * var defaults = _.partialRight(_.assignInWith, customizer);
-     *
-     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
-     * // => { 'a': 1, 'b': 2 }
-     */
-    (customizer: _.AssignCustomizer): AssignInWith1x1;
-    /**
-     * This method is like `_.assignIn` except that it accepts `customizer` which
-     * is invoked to produce the assigned values. If `customizer` returns `undefined`
-     * assignment is handled by the method instead. The `customizer` is invoked
-     * with five arguments: (objValue, srcValue, key, object, source).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @alias extendWith
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   return _.isUndefined(objValue) ? srcValue : objValue;
-     * }
-     *
-     * var defaults = _.partialRight(_.assignInWith, customizer);
-     *
-     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
-     * // => { 'a': 1, 'b': 2 }
-     */
-    (customizer: _.AssignCustomizer, args: ReadonlyArray<any>): any;
-}
-interface AssignInWith1x1 {
-    /**
-     * This method is like `_.assignIn` except that it accepts `customizer` which
-     * is invoked to produce the assigned values. If `customizer` returns `undefined`
-     * assignment is handled by the method instead. The `customizer` is invoked
-     * with five arguments: (objValue, srcValue, key, object, source).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @alias extendWith
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   return _.isUndefined(objValue) ? srcValue : objValue;
-     * }
-     *
-     * var defaults = _.partialRight(_.assignInWith, customizer);
-     *
-     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
-     * // => { 'a': 1, 'b': 2 }
-     */
-    (): AssignInWith1x1;
-    /**
-     * This method is like `_.assignIn` except that it accepts `customizer` which
-     * is invoked to produce the assigned values. If `customizer` returns `undefined`
-     * assignment is handled by the method instead. The `customizer` is invoked
-     * with five arguments: (objValue, srcValue, key, object, source).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @alias extendWith
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   return _.isUndefined(objValue) ? srcValue : objValue;
-     * }
-     *
-     * var defaults = _.partialRight(_.assignInWith, customizer);
-     *
-     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
-     * // => { 'a': 1, 'b': 2 }
-     */
-    (args: ReadonlyArray<any>): any;
-}
-
-declare const assignInAllWith: AssignInWith;
+import { assignInAllWith } from "../fp";
 export = assignInAllWith;
diff --git a/types/lodash/fp/assignInWith.d.ts b/types/lodash/fp/assignInWith.d.ts
index d2f9dbba6f..c410091c62 100644
--- a/types/lodash/fp/assignInWith.d.ts
+++ b/types/lodash/fp/assignInWith.d.ts
@@ -1,249 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface AssignInWith {
-    /**
-     * This method is like `_.assignIn` except that it accepts `customizer` which
-     * is invoked to produce the assigned values. If `customizer` returns `undefined`
-     * assignment is handled by the method instead. The `customizer` is invoked
-     * with five arguments: (objValue, srcValue, key, object, source).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @alias extendWith
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   return _.isUndefined(objValue) ? srcValue : objValue;
-     * }
-     *
-     * var defaults = _.partialRight(_.assignInWith, customizer);
-     *
-     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
-     * // => { 'a': 1, 'b': 2 }
-     */
-    (): AssignInWith;
-    /**
-     * This method is like `_.assignIn` except that it accepts `customizer` which
-     * is invoked to produce the assigned values. If `customizer` returns `undefined`
-     * assignment is handled by the method instead. The `customizer` is invoked
-     * with five arguments: (objValue, srcValue, key, object, source).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @alias extendWith
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   return _.isUndefined(objValue) ? srcValue : objValue;
-     * }
-     *
-     * var defaults = _.partialRight(_.assignInWith, customizer);
-     *
-     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
-     * // => { 'a': 1, 'b': 2 }
-     */
-    (customizer: _.AssignCustomizer): AssignInWith1x1;
-    /**
-     * This method is like `_.assignIn` except that it accepts `customizer` which
-     * is invoked to produce the assigned values. If `customizer` returns `undefined`
-     * assignment is handled by the method instead. The `customizer` is invoked
-     * with five arguments: (objValue, srcValue, key, object, source).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @alias extendWith
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   return _.isUndefined(objValue) ? srcValue : objValue;
-     * }
-     *
-     * var defaults = _.partialRight(_.assignInWith, customizer);
-     *
-     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
-     * // => { 'a': 1, 'b': 2 }
-     */
-    <TObject>(customizer: _.AssignCustomizer, object: TObject): AssignInWith1x2<TObject>;
-    /**
-     * This method is like `_.assignIn` except that it accepts `customizer` which
-     * is invoked to produce the assigned values. If `customizer` returns `undefined`
-     * assignment is handled by the method instead. The `customizer` is invoked
-     * with five arguments: (objValue, srcValue, key, object, source).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @alias extendWith
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   return _.isUndefined(objValue) ? srcValue : objValue;
-     * }
-     *
-     * var defaults = _.partialRight(_.assignInWith, customizer);
-     *
-     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
-     * // => { 'a': 1, 'b': 2 }
-     */
-    <TObject, TSource>(customizer: _.AssignCustomizer, object: TObject, source: TSource): TObject & TSource;
-}
-interface AssignInWith1x1 {
-    /**
-     * This method is like `_.assignIn` except that it accepts `customizer` which
-     * is invoked to produce the assigned values. If `customizer` returns `undefined`
-     * assignment is handled by the method instead. The `customizer` is invoked
-     * with five arguments: (objValue, srcValue, key, object, source).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @alias extendWith
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   return _.isUndefined(objValue) ? srcValue : objValue;
-     * }
-     *
-     * var defaults = _.partialRight(_.assignInWith, customizer);
-     *
-     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
-     * // => { 'a': 1, 'b': 2 }
-     */
-    (): AssignInWith1x1;
-    /**
-     * This method is like `_.assignIn` except that it accepts `customizer` which
-     * is invoked to produce the assigned values. If `customizer` returns `undefined`
-     * assignment is handled by the method instead. The `customizer` is invoked
-     * with five arguments: (objValue, srcValue, key, object, source).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @alias extendWith
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   return _.isUndefined(objValue) ? srcValue : objValue;
-     * }
-     *
-     * var defaults = _.partialRight(_.assignInWith, customizer);
-     *
-     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
-     * // => { 'a': 1, 'b': 2 }
-     */
-    <TObject>(object: TObject): AssignInWith1x2<TObject>;
-    /**
-     * This method is like `_.assignIn` except that it accepts `customizer` which
-     * is invoked to produce the assigned values. If `customizer` returns `undefined`
-     * assignment is handled by the method instead. The `customizer` is invoked
-     * with five arguments: (objValue, srcValue, key, object, source).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @alias extendWith
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   return _.isUndefined(objValue) ? srcValue : objValue;
-     * }
-     *
-     * var defaults = _.partialRight(_.assignInWith, customizer);
-     *
-     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
-     * // => { 'a': 1, 'b': 2 }
-     */
-    <TObject, TSource>(object: TObject, source: TSource): TObject & TSource;
-}
-interface AssignInWith1x2<TObject> {
-    /**
-     * This method is like `_.assignIn` except that it accepts `customizer` which
-     * is invoked to produce the assigned values. If `customizer` returns `undefined`
-     * assignment is handled by the method instead. The `customizer` is invoked
-     * with five arguments: (objValue, srcValue, key, object, source).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @alias extendWith
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   return _.isUndefined(objValue) ? srcValue : objValue;
-     * }
-     *
-     * var defaults = _.partialRight(_.assignInWith, customizer);
-     *
-     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
-     * // => { 'a': 1, 'b': 2 }
-     */
-    (): AssignInWith1x2<TObject>;
-    /**
-     * This method is like `_.assignIn` except that it accepts `customizer` which
-     * is invoked to produce the assigned values. If `customizer` returns `undefined`
-     * assignment is handled by the method instead. The `customizer` is invoked
-     * with five arguments: (objValue, srcValue, key, object, source).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @alias extendWith
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   return _.isUndefined(objValue) ? srcValue : objValue;
-     * }
-     *
-     * var defaults = _.partialRight(_.assignInWith, customizer);
-     *
-     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
-     * // => { 'a': 1, 'b': 2 }
-     */
-    <TSource>(source: TSource): TObject & TSource;
-}
-
-declare const assignInWith: AssignInWith;
+import { assignInWith } from "../fp";
 export = assignInWith;
diff --git a/types/lodash/fp/assignWith.d.ts b/types/lodash/fp/assignWith.d.ts
index 2313bd2614..2205db0119 100644
--- a/types/lodash/fp/assignWith.d.ts
+++ b/types/lodash/fp/assignWith.d.ts
@@ -1,240 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface AssignWith {
-    /**
-     * This method is like `_.assign` except that it accepts `customizer` which
-     * is invoked to produce the assigned values. If `customizer` returns `undefined`
-     * assignment is handled by the method instead. The `customizer` is invoked
-     * with five arguments: (objValue, srcValue, key, object, source).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   return _.isUndefined(objValue) ? srcValue : objValue;
-     * }
-     *
-     * var defaults = _.partialRight(_.assignWith, customizer);
-     *
-     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
-     * // => { 'a': 1, 'b': 2 }
-     */
-    (): AssignWith;
-    /**
-     * This method is like `_.assign` except that it accepts `customizer` which
-     * is invoked to produce the assigned values. If `customizer` returns `undefined`
-     * assignment is handled by the method instead. The `customizer` is invoked
-     * with five arguments: (objValue, srcValue, key, object, source).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   return _.isUndefined(objValue) ? srcValue : objValue;
-     * }
-     *
-     * var defaults = _.partialRight(_.assignWith, customizer);
-     *
-     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
-     * // => { 'a': 1, 'b': 2 }
-     */
-    (customizer: _.AssignCustomizer): AssignWith1x1;
-    /**
-     * This method is like `_.assign` except that it accepts `customizer` which
-     * is invoked to produce the assigned values. If `customizer` returns `undefined`
-     * assignment is handled by the method instead. The `customizer` is invoked
-     * with five arguments: (objValue, srcValue, key, object, source).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   return _.isUndefined(objValue) ? srcValue : objValue;
-     * }
-     *
-     * var defaults = _.partialRight(_.assignWith, customizer);
-     *
-     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
-     * // => { 'a': 1, 'b': 2 }
-     */
-    <TObject>(customizer: _.AssignCustomizer, object: TObject): AssignWith1x2<TObject>;
-    /**
-     * This method is like `_.assign` except that it accepts `customizer` which
-     * is invoked to produce the assigned values. If `customizer` returns `undefined`
-     * assignment is handled by the method instead. The `customizer` is invoked
-     * with five arguments: (objValue, srcValue, key, object, source).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   return _.isUndefined(objValue) ? srcValue : objValue;
-     * }
-     *
-     * var defaults = _.partialRight(_.assignWith, customizer);
-     *
-     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
-     * // => { 'a': 1, 'b': 2 }
-     */
-    <TObject, TSource>(customizer: _.AssignCustomizer, object: TObject, source: TSource): TObject & TSource;
-}
-interface AssignWith1x1 {
-    /**
-     * This method is like `_.assign` except that it accepts `customizer` which
-     * is invoked to produce the assigned values. If `customizer` returns `undefined`
-     * assignment is handled by the method instead. The `customizer` is invoked
-     * with five arguments: (objValue, srcValue, key, object, source).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   return _.isUndefined(objValue) ? srcValue : objValue;
-     * }
-     *
-     * var defaults = _.partialRight(_.assignWith, customizer);
-     *
-     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
-     * // => { 'a': 1, 'b': 2 }
-     */
-    (): AssignWith1x1;
-    /**
-     * This method is like `_.assign` except that it accepts `customizer` which
-     * is invoked to produce the assigned values. If `customizer` returns `undefined`
-     * assignment is handled by the method instead. The `customizer` is invoked
-     * with five arguments: (objValue, srcValue, key, object, source).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   return _.isUndefined(objValue) ? srcValue : objValue;
-     * }
-     *
-     * var defaults = _.partialRight(_.assignWith, customizer);
-     *
-     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
-     * // => { 'a': 1, 'b': 2 }
-     */
-    <TObject>(object: TObject): AssignWith1x2<TObject>;
-    /**
-     * This method is like `_.assign` except that it accepts `customizer` which
-     * is invoked to produce the assigned values. If `customizer` returns `undefined`
-     * assignment is handled by the method instead. The `customizer` is invoked
-     * with five arguments: (objValue, srcValue, key, object, source).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   return _.isUndefined(objValue) ? srcValue : objValue;
-     * }
-     *
-     * var defaults = _.partialRight(_.assignWith, customizer);
-     *
-     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
-     * // => { 'a': 1, 'b': 2 }
-     */
-    <TObject, TSource>(object: TObject, source: TSource): TObject & TSource;
-}
-interface AssignWith1x2<TObject> {
-    /**
-     * This method is like `_.assign` except that it accepts `customizer` which
-     * is invoked to produce the assigned values. If `customizer` returns `undefined`
-     * assignment is handled by the method instead. The `customizer` is invoked
-     * with five arguments: (objValue, srcValue, key, object, source).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   return _.isUndefined(objValue) ? srcValue : objValue;
-     * }
-     *
-     * var defaults = _.partialRight(_.assignWith, customizer);
-     *
-     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
-     * // => { 'a': 1, 'b': 2 }
-     */
-    (): AssignWith1x2<TObject>;
-    /**
-     * This method is like `_.assign` except that it accepts `customizer` which
-     * is invoked to produce the assigned values. If `customizer` returns `undefined`
-     * assignment is handled by the method instead. The `customizer` is invoked
-     * with five arguments: (objValue, srcValue, key, object, source).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   return _.isUndefined(objValue) ? srcValue : objValue;
-     * }
-     *
-     * var defaults = _.partialRight(_.assignWith, customizer);
-     *
-     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
-     * // => { 'a': 1, 'b': 2 }
-     */
-    <TSource>(source: TSource): TObject & TSource;
-}
-
-declare const assignWith: AssignWith;
+import { assignWith } from "../fp";
 export = assignWith;
diff --git a/types/lodash/fp/assoc.d.ts b/types/lodash/fp/assoc.d.ts
index 41f176aaa9..2a2e29c6f0 100644
--- a/types/lodash/fp/assoc.d.ts
+++ b/types/lodash/fp/assoc.d.ts
@@ -1,147 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Set {
-    /**
-     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
-     * missing index properties while objects are created for all other missing properties. Use _.setWith to
-     * customize path creation.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @return Returns object.
-     */
-    (): Set;
-    /**
-     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
-     * missing index properties while objects are created for all other missing properties. Use _.setWith to
-     * customize path creation.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @return Returns object.
-     */
-    (path: _.PropertyPath): Set1x1;
-    /**
-     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
-     * missing index properties while objects are created for all other missing properties. Use _.setWith to
-     * customize path creation.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @return Returns object.
-     */
-    (path: _.PropertyPath, value: any): Set1x2;
-    /**
-     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
-     * missing index properties while objects are created for all other missing properties. Use _.setWith to
-     * customize path creation.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @return Returns object.
-     */
-    <T extends object>(path: _.PropertyPath, value: any, object: T): T;
-    /**
-     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
-     * missing index properties while objects are created for all other missing properties. Use _.setWith to
-     * customize path creation.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @return Returns object.
-     */
-    <TResult>(path: _.PropertyPath, value: any, object: object): TResult;
-}
-interface Set1x1 {
-    /**
-     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
-     * missing index properties while objects are created for all other missing properties. Use _.setWith to
-     * customize path creation.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @return Returns object.
-     */
-    (): Set1x1;
-    /**
-     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
-     * missing index properties while objects are created for all other missing properties. Use _.setWith to
-     * customize path creation.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @return Returns object.
-     */
-    (value: any): Set1x2;
-    /**
-     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
-     * missing index properties while objects are created for all other missing properties. Use _.setWith to
-     * customize path creation.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @return Returns object.
-     */
-    <T extends object>(value: any, object: T): T;
-    /**
-     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
-     * missing index properties while objects are created for all other missing properties. Use _.setWith to
-     * customize path creation.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @return Returns object.
-     */
-    <TResult>(value: any, object: object): TResult;
-}
-interface Set1x2 {
-    /**
-     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
-     * missing index properties while objects are created for all other missing properties. Use _.setWith to
-     * customize path creation.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @return Returns object.
-     */
-    (): Set1x2;
-    /**
-     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
-     * missing index properties while objects are created for all other missing properties. Use _.setWith to
-     * customize path creation.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @return Returns object.
-     */
-    <T extends object>(object: T): T;
-    /**
-     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
-     * missing index properties while objects are created for all other missing properties. Use _.setWith to
-     * customize path creation.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @return Returns object.
-     */
-    <TResult>(object: object): TResult;
-}
-
-declare const assoc: Set;
+import { assoc } from "../fp";
 export = assoc;
diff --git a/types/lodash/fp/assocPath.d.ts b/types/lodash/fp/assocPath.d.ts
index ebd0a30a6e..e2dd5179e3 100644
--- a/types/lodash/fp/assocPath.d.ts
+++ b/types/lodash/fp/assocPath.d.ts
@@ -1,147 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Set {
-    /**
-     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
-     * missing index properties while objects are created for all other missing properties. Use _.setWith to
-     * customize path creation.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @return Returns object.
-     */
-    (): Set;
-    /**
-     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
-     * missing index properties while objects are created for all other missing properties. Use _.setWith to
-     * customize path creation.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @return Returns object.
-     */
-    (path: _.PropertyPath): Set1x1;
-    /**
-     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
-     * missing index properties while objects are created for all other missing properties. Use _.setWith to
-     * customize path creation.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @return Returns object.
-     */
-    (path: _.PropertyPath, value: any): Set1x2;
-    /**
-     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
-     * missing index properties while objects are created for all other missing properties. Use _.setWith to
-     * customize path creation.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @return Returns object.
-     */
-    <T extends object>(path: _.PropertyPath, value: any, object: T): T;
-    /**
-     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
-     * missing index properties while objects are created for all other missing properties. Use _.setWith to
-     * customize path creation.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @return Returns object.
-     */
-    <TResult>(path: _.PropertyPath, value: any, object: object): TResult;
-}
-interface Set1x1 {
-    /**
-     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
-     * missing index properties while objects are created for all other missing properties. Use _.setWith to
-     * customize path creation.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @return Returns object.
-     */
-    (): Set1x1;
-    /**
-     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
-     * missing index properties while objects are created for all other missing properties. Use _.setWith to
-     * customize path creation.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @return Returns object.
-     */
-    (value: any): Set1x2;
-    /**
-     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
-     * missing index properties while objects are created for all other missing properties. Use _.setWith to
-     * customize path creation.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @return Returns object.
-     */
-    <T extends object>(value: any, object: T): T;
-    /**
-     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
-     * missing index properties while objects are created for all other missing properties. Use _.setWith to
-     * customize path creation.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @return Returns object.
-     */
-    <TResult>(value: any, object: object): TResult;
-}
-interface Set1x2 {
-    /**
-     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
-     * missing index properties while objects are created for all other missing properties. Use _.setWith to
-     * customize path creation.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @return Returns object.
-     */
-    (): Set1x2;
-    /**
-     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
-     * missing index properties while objects are created for all other missing properties. Use _.setWith to
-     * customize path creation.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @return Returns object.
-     */
-    <T extends object>(object: T): T;
-    /**
-     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
-     * missing index properties while objects are created for all other missing properties. Use _.setWith to
-     * customize path creation.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @return Returns object.
-     */
-    <TResult>(object: object): TResult;
-}
-
-declare const assocPath: Set;
+import { assocPath } from "../fp";
 export = assocPath;
diff --git a/types/lodash/fp/at.d.ts b/types/lodash/fp/at.d.ts
index c8777af286..beefa3343b 100644
--- a/types/lodash/fp/at.d.ts
+++ b/types/lodash/fp/at.d.ts
@@ -1,96 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface At {
-    /**
-     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
-     * specified as individual arguments or as arrays of keys.
-     *
-     * @param object The object to iterate over.
-     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
-     * @return Returns the new array of picked elements.
-     */
-    (): At;
-    /**
-     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
-     * specified as individual arguments or as arrays of keys.
-     *
-     * @param object The object to iterate over.
-     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
-     * @return Returns the new array of picked elements.
-     */
-    (props: _.PropertyPath): At1x1;
-    /**
-     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
-     * specified as individual arguments or as arrays of keys.
-     *
-     * @param object The object to iterate over.
-     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
-     * @return Returns the new array of picked elements.
-     */
-    <T>(props: _.PropertyPath, object: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): T[];
-    /**
-     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
-     * specified as individual arguments or as arrays of keys.
-     *
-     * @param object The object to iterate over.
-     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
-     * @return Returns the new array of picked elements.
-     */
-    <T extends object>(props: _.Many<keyof T>): At2x1<T>;
-    /**
-     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
-     * specified as individual arguments or as arrays of keys.
-     *
-     * @param object The object to iterate over.
-     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
-     * @return Returns the new array of picked elements.
-     */
-    <T extends object>(props: _.Many<keyof T>, object: T | null | undefined): Array<T[keyof T]>;
-}
-interface At1x1 {
-    /**
-     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
-     * specified as individual arguments or as arrays of keys.
-     *
-     * @param object The object to iterate over.
-     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
-     * @return Returns the new array of picked elements.
-     */
-    (): At1x1;
-    /**
-     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
-     * specified as individual arguments or as arrays of keys.
-     *
-     * @param object The object to iterate over.
-     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
-     * @return Returns the new array of picked elements.
-     */
-    <T>(object: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): T[];
-}
-interface At2x1<T extends object> {
-    /**
-     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
-     * specified as individual arguments or as arrays of keys.
-     *
-     * @param object The object to iterate over.
-     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
-     * @return Returns the new array of picked elements.
-     */
-    (): At2x1<T>;
-    /**
-     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
-     * specified as individual arguments or as arrays of keys.
-     *
-     * @param object The object to iterate over.
-     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
-     * @return Returns the new array of picked elements.
-     */
-    (object: T | null | undefined): Array<T[keyof T]>;
-}
-
-declare const at: At;
+import { at } from "../fp";
 export = at;
diff --git a/types/lodash/fp/attempt.d.ts b/types/lodash/fp/attempt.d.ts
index b2626b6112..72d60af08f 100644
--- a/types/lodash/fp/attempt.d.ts
+++ b/types/lodash/fp/attempt.d.ts
@@ -1,16 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type Attempt =
-    /**
-     * Attempts to invoke func, returning either the result or the caught error object. Any additional arguments
-     * are provided to func when it’s invoked.
-     *
-     * @param func The function to attempt.
-     * @return Returns the func result or error object.
-     */
-    <TResult>(func: (...args: any[]) => TResult) => TResult|Error;
-
-declare const attempt: Attempt;
+import { attempt } from "../fp";
 export = attempt;
diff --git a/types/lodash/fp/before.d.ts b/types/lodash/fp/before.d.ts
index f3e4591275..ead2869093 100644
--- a/types/lodash/fp/before.d.ts
+++ b/types/lodash/fp/before.d.ts
@@ -1,61 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface Before {
-    /**
-     * Creates a function that invokes func, with the this binding and arguments of the created function, while
-     * it’s called less than n times. Subsequent calls to the created function return the result of the last func
-     * invocation.
-     *
-     * @param n The number of calls at which func is no longer invoked.
-     * @param func The function to restrict.
-     * @return Returns the new restricted function.
-     */
-    (): Before;
-    /**
-     * Creates a function that invokes func, with the this binding and arguments of the created function, while
-     * it’s called less than n times. Subsequent calls to the created function return the result of the last func
-     * invocation.
-     *
-     * @param n The number of calls at which func is no longer invoked.
-     * @param func The function to restrict.
-     * @return Returns the new restricted function.
-     */
-    <TFunc extends (...args: any[]) => any>(func: TFunc): Before1x1<TFunc>;
-    /**
-     * Creates a function that invokes func, with the this binding and arguments of the created function, while
-     * it’s called less than n times. Subsequent calls to the created function return the result of the last func
-     * invocation.
-     *
-     * @param n The number of calls at which func is no longer invoked.
-     * @param func The function to restrict.
-     * @return Returns the new restricted function.
-     */
-    <TFunc extends (...args: any[]) => any>(func: TFunc, n: number): TFunc;
-}
-interface Before1x1<TFunc extends (...args: any[]) => any> {
-    /**
-     * Creates a function that invokes func, with the this binding and arguments of the created function, while
-     * it’s called less than n times. Subsequent calls to the created function return the result of the last func
-     * invocation.
-     *
-     * @param n The number of calls at which func is no longer invoked.
-     * @param func The function to restrict.
-     * @return Returns the new restricted function.
-     */
-    (): Before1x1<TFunc>;
-    /**
-     * Creates a function that invokes func, with the this binding and arguments of the created function, while
-     * it’s called less than n times. Subsequent calls to the created function return the result of the last func
-     * invocation.
-     *
-     * @param n The number of calls at which func is no longer invoked.
-     * @param func The function to restrict.
-     * @return Returns the new restricted function.
-     */
-    (n: number): TFunc;
-}
-
-declare const before: Before;
+import { before } from "../fp";
 export = before;
diff --git a/types/lodash/fp/bind.d.ts b/types/lodash/fp/bind.d.ts
index b62fb3de1f..a312192a31 100644
--- a/types/lodash/fp/bind.d.ts
+++ b/types/lodash/fp/bind.d.ts
@@ -1,86 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface Bind {
-    /**
-     * Creates a function that invokes func with the this binding of thisArg and prepends any additional _.bind
-     * arguments to those provided to the bound function.
-     *
-     * The _.bind.placeholder value, which defaults to _ in monolithic builds, may be used as a placeholder for
-     * partially applied arguments.
-     *
-     * Note: Unlike native Function#bind this method does not set the "length" property of bound functions.
-     *
-     * @param func The function to bind.
-     * @param thisArg The this binding of func.
-     * @param partials The arguments to be partially applied.
-     * @return Returns the new bound function.
-     */
-    (): Bind;
-    /**
-     * Creates a function that invokes func with the this binding of thisArg and prepends any additional _.bind
-     * arguments to those provided to the bound function.
-     *
-     * The _.bind.placeholder value, which defaults to _ in monolithic builds, may be used as a placeholder for
-     * partially applied arguments.
-     *
-     * Note: Unlike native Function#bind this method does not set the "length" property of bound functions.
-     *
-     * @param func The function to bind.
-     * @param thisArg The this binding of func.
-     * @param partials The arguments to be partially applied.
-     * @return Returns the new bound function.
-     */
-    (func: (...args: any[]) => any): Bind1x1;
-    /**
-     * Creates a function that invokes func with the this binding of thisArg and prepends any additional _.bind
-     * arguments to those provided to the bound function.
-     *
-     * The _.bind.placeholder value, which defaults to _ in monolithic builds, may be used as a placeholder for
-     * partially applied arguments.
-     *
-     * Note: Unlike native Function#bind this method does not set the "length" property of bound functions.
-     *
-     * @param func The function to bind.
-     * @param thisArg The this binding of func.
-     * @param partials The arguments to be partially applied.
-     * @return Returns the new bound function.
-     */
-    (func: (...args: any[]) => any, thisArg: any): (...args: any[]) => any;
-}
-interface Bind1x1 {
-    /**
-     * Creates a function that invokes func with the this binding of thisArg and prepends any additional _.bind
-     * arguments to those provided to the bound function.
-     *
-     * The _.bind.placeholder value, which defaults to _ in monolithic builds, may be used as a placeholder for
-     * partially applied arguments.
-     *
-     * Note: Unlike native Function#bind this method does not set the "length" property of bound functions.
-     *
-     * @param func The function to bind.
-     * @param thisArg The this binding of func.
-     * @param partials The arguments to be partially applied.
-     * @return Returns the new bound function.
-     */
-    (): Bind1x1;
-    /**
-     * Creates a function that invokes func with the this binding of thisArg and prepends any additional _.bind
-     * arguments to those provided to the bound function.
-     *
-     * The _.bind.placeholder value, which defaults to _ in monolithic builds, may be used as a placeholder for
-     * partially applied arguments.
-     *
-     * Note: Unlike native Function#bind this method does not set the "length" property of bound functions.
-     *
-     * @param func The function to bind.
-     * @param thisArg The this binding of func.
-     * @param partials The arguments to be partially applied.
-     * @return Returns the new bound function.
-     */
-    (thisArg: any): (...args: any[]) => any;
-}
-
-declare const bind: Bind;
+import { bind } from "../fp";
 export = bind;
diff --git a/types/lodash/fp/bindAll.d.ts b/types/lodash/fp/bindAll.d.ts
index 98275d8d79..4f7c7dbffc 100644
--- a/types/lodash/fp/bindAll.d.ts
+++ b/types/lodash/fp/bindAll.d.ts
@@ -1,78 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface BindAll {
-    /**
-     * Binds methods of an object to the object itself, overwriting the existing method. Method names may be
-     * specified as individual arguments or as arrays of method names. If no method names are provided all
-     * enumerable function properties, own and inherited, of object are bound.
-     *
-     * Note: This method does not set the "length" property of bound functions.
-     *
-     * @param object The object to bind and assign the bound methods to.
-     * @param methodNames The object method names to bind, specified as individual method names or arrays of
-     * method names.
-     * @return Returns object.
-     */
-    (): BindAll;
-    /**
-     * Binds methods of an object to the object itself, overwriting the existing method. Method names may be
-     * specified as individual arguments or as arrays of method names. If no method names are provided all
-     * enumerable function properties, own and inherited, of object are bound.
-     *
-     * Note: This method does not set the "length" property of bound functions.
-     *
-     * @param object The object to bind and assign the bound methods to.
-     * @param methodNames The object method names to bind, specified as individual method names or arrays of
-     * method names.
-     * @return Returns object.
-     */
-    (methodNames: _.Many<string>): BindAll1x1;
-    /**
-     * Binds methods of an object to the object itself, overwriting the existing method. Method names may be
-     * specified as individual arguments or as arrays of method names. If no method names are provided all
-     * enumerable function properties, own and inherited, of object are bound.
-     *
-     * Note: This method does not set the "length" property of bound functions.
-     *
-     * @param object The object to bind and assign the bound methods to.
-     * @param methodNames The object method names to bind, specified as individual method names or arrays of
-     * method names.
-     * @return Returns object.
-     */
-    <T>(methodNames: _.Many<string>, object: T): T;
-}
-interface BindAll1x1 {
-    /**
-     * Binds methods of an object to the object itself, overwriting the existing method. Method names may be
-     * specified as individual arguments or as arrays of method names. If no method names are provided all
-     * enumerable function properties, own and inherited, of object are bound.
-     *
-     * Note: This method does not set the "length" property of bound functions.
-     *
-     * @param object The object to bind and assign the bound methods to.
-     * @param methodNames The object method names to bind, specified as individual method names or arrays of
-     * method names.
-     * @return Returns object.
-     */
-    (): BindAll1x1;
-    /**
-     * Binds methods of an object to the object itself, overwriting the existing method. Method names may be
-     * specified as individual arguments or as arrays of method names. If no method names are provided all
-     * enumerable function properties, own and inherited, of object are bound.
-     *
-     * Note: This method does not set the "length" property of bound functions.
-     *
-     * @param object The object to bind and assign the bound methods to.
-     * @param methodNames The object method names to bind, specified as individual method names or arrays of
-     * method names.
-     * @return Returns object.
-     */
-    <T>(object: T): T;
-}
-
-declare const bindAll: BindAll;
+import { bindAll } from "../fp";
 export = bindAll;
diff --git a/types/lodash/fp/bindKey.d.ts b/types/lodash/fp/bindKey.d.ts
index c20c5b1901..8986b2f3a5 100644
--- a/types/lodash/fp/bindKey.d.ts
+++ b/types/lodash/fp/bindKey.d.ts
@@ -1,91 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface BindKey {
-    /**
-     * Creates a function that invokes the method at object[key] and prepends any additional _.bindKey arguments
-     * to those provided to the bound function.
-     *
-     * This method differs from _.bind by allowing bound functions to reference methods that may be redefined
-     * or don’t yet exist. See Peter Michaux’s article for more details.
-     *
-     * The _.bindKey.placeholder value, which defaults to _ in monolithic builds, may be used as a placeholder
-     * for partially applied arguments.
-     *
-     * @param object The object the method belongs to.
-     * @param key The key of the method.
-     * @param partials The arguments to be partially applied.
-     * @return Returns the new bound function.
-     */
-    (): BindKey;
-    /**
-     * Creates a function that invokes the method at object[key] and prepends any additional _.bindKey arguments
-     * to those provided to the bound function.
-     *
-     * This method differs from _.bind by allowing bound functions to reference methods that may be redefined
-     * or don’t yet exist. See Peter Michaux’s article for more details.
-     *
-     * The _.bindKey.placeholder value, which defaults to _ in monolithic builds, may be used as a placeholder
-     * for partially applied arguments.
-     *
-     * @param object The object the method belongs to.
-     * @param key The key of the method.
-     * @param partials The arguments to be partially applied.
-     * @return Returns the new bound function.
-     */
-    (object: object): BindKey1x1;
-    /**
-     * Creates a function that invokes the method at object[key] and prepends any additional _.bindKey arguments
-     * to those provided to the bound function.
-     *
-     * This method differs from _.bind by allowing bound functions to reference methods that may be redefined
-     * or don’t yet exist. See Peter Michaux’s article for more details.
-     *
-     * The _.bindKey.placeholder value, which defaults to _ in monolithic builds, may be used as a placeholder
-     * for partially applied arguments.
-     *
-     * @param object The object the method belongs to.
-     * @param key The key of the method.
-     * @param partials The arguments to be partially applied.
-     * @return Returns the new bound function.
-     */
-    (object: object, key: string): (...args: any[]) => any;
-}
-interface BindKey1x1 {
-    /**
-     * Creates a function that invokes the method at object[key] and prepends any additional _.bindKey arguments
-     * to those provided to the bound function.
-     *
-     * This method differs from _.bind by allowing bound functions to reference methods that may be redefined
-     * or don’t yet exist. See Peter Michaux’s article for more details.
-     *
-     * The _.bindKey.placeholder value, which defaults to _ in monolithic builds, may be used as a placeholder
-     * for partially applied arguments.
-     *
-     * @param object The object the method belongs to.
-     * @param key The key of the method.
-     * @param partials The arguments to be partially applied.
-     * @return Returns the new bound function.
-     */
-    (): BindKey1x1;
-    /**
-     * Creates a function that invokes the method at object[key] and prepends any additional _.bindKey arguments
-     * to those provided to the bound function.
-     *
-     * This method differs from _.bind by allowing bound functions to reference methods that may be redefined
-     * or don’t yet exist. See Peter Michaux’s article for more details.
-     *
-     * The _.bindKey.placeholder value, which defaults to _ in monolithic builds, may be used as a placeholder
-     * for partially applied arguments.
-     *
-     * @param object The object the method belongs to.
-     * @param key The key of the method.
-     * @param partials The arguments to be partially applied.
-     * @return Returns the new bound function.
-     */
-    (key: string): (...args: any[]) => any;
-}
-
-declare const bindKey: BindKey;
+import { bindKey } from "../fp";
 export = bindKey;
diff --git a/types/lodash/fp/camelCase.d.ts b/types/lodash/fp/camelCase.d.ts
index 81d33d61c7..be6628dd27 100644
--- a/types/lodash/fp/camelCase.d.ts
+++ b/types/lodash/fp/camelCase.d.ts
@@ -1,15 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type CamelCase =
-    /**
-     * Converts string to camel case.
-     *
-     * @param string The string to convert.
-     * @return Returns the camel cased string.
-     */
-    (string: string) => string;
-
-declare const camelCase: CamelCase;
+import { camelCase } from "../fp";
 export = camelCase;
diff --git a/types/lodash/fp/capitalize.d.ts b/types/lodash/fp/capitalize.d.ts
index 988421b101..7dc552f9e4 100644
--- a/types/lodash/fp/capitalize.d.ts
+++ b/types/lodash/fp/capitalize.d.ts
@@ -1,15 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type Capitalize =
-    /**
-     * Converts the first character of string to upper case and the remaining to lower case.
-     *
-     * @param string The string to capitalize.
-     * @return Returns the capitalized string.
-     */
-    (string: string) => string;
-
-declare const capitalize: Capitalize;
+import { capitalize } from "../fp";
 export = capitalize;
diff --git a/types/lodash/fp/castArray.d.ts b/types/lodash/fp/castArray.d.ts
index 9d5b5fc11b..a431805adf 100644
--- a/types/lodash/fp/castArray.d.ts
+++ b/types/lodash/fp/castArray.d.ts
@@ -1,17 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-type CastArray =
-    /**
-     * Casts value as an array if it’s not one.
-     *
-     * @param value The value to inspect.
-     * @return Returns the cast array.
-     */
-    <T>(value: _.Many<T>) => T[];
-
-declare const castArray: CastArray;
+import { castArray } from "../fp";
 export = castArray;
diff --git a/types/lodash/fp/ceil.d.ts b/types/lodash/fp/ceil.d.ts
index e360c5bc08..13cd7317b1 100644
--- a/types/lodash/fp/ceil.d.ts
+++ b/types/lodash/fp/ceil.d.ts
@@ -1,16 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type Ceil =
-    /**
-     * Calculates n rounded up to precision.
-     *
-     * @param n The number to round up.
-     * @param precision The precision to round up to.
-     * @return Returns the rounded up number.
-     */
-    (n: number) => number;
-
-declare const ceil: Ceil;
+import { ceil } from "../fp";
 export = ceil;
diff --git a/types/lodash/fp/chunk.d.ts b/types/lodash/fp/chunk.d.ts
index 8506a60c56..2e4066660b 100644
--- a/types/lodash/fp/chunk.d.ts
+++ b/types/lodash/fp/chunk.d.ts
@@ -1,58 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Chunk {
-    /**
-     * Creates an array of elements split into groups the length of size. If collection can’t be split evenly, the
-     * final chunk will be the remaining elements.
-     *
-     * @param array The array to process.
-     * @param size The length of each chunk.
-     * @return Returns the new array containing chunks.
-     */
-    (): Chunk;
-    /**
-     * Creates an array of elements split into groups the length of size. If collection can’t be split evenly, the
-     * final chunk will be the remaining elements.
-     *
-     * @param array The array to process.
-     * @param size The length of each chunk.
-     * @return Returns the new array containing chunks.
-     */
-    (size: number): Chunk1x1;
-    /**
-     * Creates an array of elements split into groups the length of size. If collection can’t be split evenly, the
-     * final chunk will be the remaining elements.
-     *
-     * @param array The array to process.
-     * @param size The length of each chunk.
-     * @return Returns the new array containing chunks.
-     */
-    <T>(size: number, array: _.List<T> | null | undefined): T[][];
-}
-interface Chunk1x1 {
-    /**
-     * Creates an array of elements split into groups the length of size. If collection can’t be split evenly, the
-     * final chunk will be the remaining elements.
-     *
-     * @param array The array to process.
-     * @param size The length of each chunk.
-     * @return Returns the new array containing chunks.
-     */
-    (): Chunk1x1;
-    /**
-     * Creates an array of elements split into groups the length of size. If collection can’t be split evenly, the
-     * final chunk will be the remaining elements.
-     *
-     * @param array The array to process.
-     * @param size The length of each chunk.
-     * @return Returns the new array containing chunks.
-     */
-    <T>(array: _.List<T> | null | undefined): T[][];
-}
-
-declare const chunk: Chunk;
+import { chunk } from "../fp";
 export = chunk;
diff --git a/types/lodash/fp/clamp.d.ts b/types/lodash/fp/clamp.d.ts
index 7683abc761..121c6f9b9c 100644
--- a/types/lodash/fp/clamp.d.ts
+++ b/types/lodash/fp/clamp.d.ts
@@ -1,166 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface Clamp {
-    /**
-     * Clamps `number` within the inclusive `lower` and `upper` bounds.
-     *
-     * @category Number
-     * @param number The number to clamp.
-     * @param [lower] The lower bound.
-     * @param upper The upper bound.
-     * @returns Returns the clamped number.
-     * @example
-     *
-     * _.clamp(-10, -5, 5);
-     * // => -5
-     *
-     * _.clamp(10, -5, 5);
-     * // => 5
-     */
-    (): Clamp;
-    /**
-     * Clamps `number` within the inclusive `lower` and `upper` bounds.
-     *
-     * @category Number
-     * @param number The number to clamp.
-     * @param [lower] The lower bound.
-     * @param upper The upper bound.
-     * @returns Returns the clamped number.
-     * @example
-     *
-     * _.clamp(-10, -5, 5);
-     * // => -5
-     *
-     * _.clamp(10, -5, 5);
-     * // => 5
-     */
-    (lower: number): Clamp1x1;
-    /**
-     * Clamps `number` within the inclusive `lower` and `upper` bounds.
-     *
-     * @category Number
-     * @param number The number to clamp.
-     * @param [lower] The lower bound.
-     * @param upper The upper bound.
-     * @returns Returns the clamped number.
-     * @example
-     *
-     * _.clamp(-10, -5, 5);
-     * // => -5
-     *
-     * _.clamp(10, -5, 5);
-     * // => 5
-     */
-    (lower: number, upper: number): Clamp1x2;
-    /**
-     * Clamps `number` within the inclusive `lower` and `upper` bounds.
-     *
-     * @category Number
-     * @param number The number to clamp.
-     * @param [lower] The lower bound.
-     * @param upper The upper bound.
-     * @returns Returns the clamped number.
-     * @example
-     *
-     * _.clamp(-10, -5, 5);
-     * // => -5
-     *
-     * _.clamp(10, -5, 5);
-     * // => 5
-     */
-    (lower: number, upper: number, number: number): number;
-}
-interface Clamp1x1 {
-    /**
-     * Clamps `number` within the inclusive `lower` and `upper` bounds.
-     *
-     * @category Number
-     * @param number The number to clamp.
-     * @param [lower] The lower bound.
-     * @param upper The upper bound.
-     * @returns Returns the clamped number.
-     * @example
-     *
-     * _.clamp(-10, -5, 5);
-     * // => -5
-     *
-     * _.clamp(10, -5, 5);
-     * // => 5
-     */
-    (): Clamp1x1;
-    /**
-     * Clamps `number` within the inclusive `lower` and `upper` bounds.
-     *
-     * @category Number
-     * @param number The number to clamp.
-     * @param [lower] The lower bound.
-     * @param upper The upper bound.
-     * @returns Returns the clamped number.
-     * @example
-     *
-     * _.clamp(-10, -5, 5);
-     * // => -5
-     *
-     * _.clamp(10, -5, 5);
-     * // => 5
-     */
-    (upper: number): Clamp1x2;
-    /**
-     * Clamps `number` within the inclusive `lower` and `upper` bounds.
-     *
-     * @category Number
-     * @param number The number to clamp.
-     * @param [lower] The lower bound.
-     * @param upper The upper bound.
-     * @returns Returns the clamped number.
-     * @example
-     *
-     * _.clamp(-10, -5, 5);
-     * // => -5
-     *
-     * _.clamp(10, -5, 5);
-     * // => 5
-     */
-    (upper: number, number: number): number;
-}
-interface Clamp1x2 {
-    /**
-     * Clamps `number` within the inclusive `lower` and `upper` bounds.
-     *
-     * @category Number
-     * @param number The number to clamp.
-     * @param [lower] The lower bound.
-     * @param upper The upper bound.
-     * @returns Returns the clamped number.
-     * @example
-     *
-     * _.clamp(-10, -5, 5);
-     * // => -5
-     *
-     * _.clamp(10, -5, 5);
-     * // => 5
-     */
-    (): Clamp1x2;
-    /**
-     * Clamps `number` within the inclusive `lower` and `upper` bounds.
-     *
-     * @category Number
-     * @param number The number to clamp.
-     * @param [lower] The lower bound.
-     * @param upper The upper bound.
-     * @returns Returns the clamped number.
-     * @example
-     *
-     * _.clamp(-10, -5, 5);
-     * // => -5
-     *
-     * _.clamp(10, -5, 5);
-     * // => 5
-     */
-    (number: number): number;
-}
-
-declare const clamp: Clamp;
+import { clamp } from "../fp";
 export = clamp;
diff --git a/types/lodash/fp/clone.d.ts b/types/lodash/fp/clone.d.ts
index b6b00ae301..9edf0c8d13 100644
--- a/types/lodash/fp/clone.d.ts
+++ b/types/lodash/fp/clone.d.ts
@@ -1,20 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type Clone =
-    /**
-     * Creates a shallow clone of value.
-     *
-     * Note: This method is loosely based on the structured clone algorithm and supports cloning arrays,
-     * array buffers, booleans, date objects, maps, numbers, Object objects, regexes, sets, strings, symbols,
-     * and typed arrays. The own enumerable properties of arguments objects are cloned as plain objects. An empty
-     * object is returned for uncloneable values such as error objects, functions, DOM nodes, and WeakMaps.
-     *
-     * @param value The value to clone.
-     * @return Returns the cloned value.
-     */
-    <T>(value: T) => T;
-
-declare const clone: Clone;
+import { clone } from "../fp";
 export = clone;
diff --git a/types/lodash/fp/cloneDeep.d.ts b/types/lodash/fp/cloneDeep.d.ts
index 85d7137e57..3bdab159ac 100644
--- a/types/lodash/fp/cloneDeep.d.ts
+++ b/types/lodash/fp/cloneDeep.d.ts
@@ -1,15 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type CloneDeep =
-    /**
-     * This method is like _.clone except that it recursively clones value.
-     *
-     * @param value The value to recursively clone.
-     * @return Returns the deep cloned value.
-     */
-    <T>(value: T) => T;
-
-declare const cloneDeep: CloneDeep;
+import { cloneDeep } from "../fp";
 export = cloneDeep;
diff --git a/types/lodash/fp/cloneDeepWith.d.ts b/types/lodash/fp/cloneDeepWith.d.ts
index caaeb278a7..57cf5af8bd 100644
--- a/types/lodash/fp/cloneDeepWith.d.ts
+++ b/types/lodash/fp/cloneDeepWith.d.ts
@@ -1,53 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface CloneDeepWith {
-    /**
-     * This method is like _.cloneWith except that it recursively clones value.
-     *
-     * @param value The value to recursively clone.
-     * @param customizer The function to customize cloning.
-     * @return Returns the deep cloned value.
-     */
-    (): CloneDeepWith;
-    /**
-     * This method is like _.cloneWith except that it recursively clones value.
-     *
-     * @param value The value to recursively clone.
-     * @param customizer The function to customize cloning.
-     * @return Returns the deep cloned value.
-     */
-    <T>(customizer: _.CloneDeepWithCustomizer<T>): CloneDeepWith1x1<T>;
-    /**
-     * This method is like _.cloneWith except that it recursively clones value.
-     *
-     * @param value The value to recursively clone.
-     * @param customizer The function to customize cloning.
-     * @return Returns the deep cloned value.
-     */
-    <T>(customizer: _.CloneDeepWithCustomizer<T>, value: T): any;
-}
-interface CloneDeepWith1x1<T> {
-    /**
-     * This method is like _.cloneWith except that it recursively clones value.
-     *
-     * @param value The value to recursively clone.
-     * @param customizer The function to customize cloning.
-     * @return Returns the deep cloned value.
-     */
-    (): CloneDeepWith1x1<T>;
-    /**
-     * This method is like _.cloneWith except that it recursively clones value.
-     *
-     * @param value The value to recursively clone.
-     * @param customizer The function to customize cloning.
-     * @return Returns the deep cloned value.
-     */
-    (value: T): any;
-}
-
-declare const cloneDeepWith: CloneDeepWith;
+import { cloneDeepWith } from "../fp";
 export = cloneDeepWith;
diff --git a/types/lodash/fp/cloneWith.d.ts b/types/lodash/fp/cloneWith.d.ts
index de29399631..9c63e13693 100644
--- a/types/lodash/fp/cloneWith.d.ts
+++ b/types/lodash/fp/cloneWith.d.ts
@@ -1,96 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface CloneWith {
-    /**
-     * This method is like _.clone except that it accepts customizer which is invoked to produce the cloned value.
-     * If customizer returns undefined cloning is handled by the method instead.
-     *
-     * @param value The value to clone.
-     * @param customizer The function to customize cloning.
-     * @return Returns the cloned value.
-     */
-    (): CloneWith;
-    /**
-     * This method is like _.clone except that it accepts customizer which is invoked to produce the cloned value.
-     * If customizer returns undefined cloning is handled by the method instead.
-     *
-     * @param value The value to clone.
-     * @param customizer The function to customize cloning.
-     * @return Returns the cloned value.
-     */
-    <T, TResult extends object | string | number | boolean | null>(customizer: _.CloneWithCustomizer<T, TResult>): CloneWith1x1<T, TResult>;
-    /**
-     * This method is like _.clone except that it accepts customizer which is invoked to produce the cloned value.
-     * If customizer returns undefined cloning is handled by the method instead.
-     *
-     * @param value The value to clone.
-     * @param customizer The function to customize cloning.
-     * @return Returns the cloned value.
-     */
-    <T, TResult extends object | string | number | boolean | null>(customizer: _.CloneWithCustomizer<T, TResult>, value: T): TResult;
-    /**
-     * This method is like _.clone except that it accepts customizer which is invoked to produce the cloned value.
-     * If customizer returns undefined cloning is handled by the method instead.
-     *
-     * @param value The value to clone.
-     * @param customizer The function to customize cloning.
-     * @return Returns the cloned value.
-     */
-    <T, TResult>(customizer: _.CloneWithCustomizer<T, TResult | undefined>): CloneWith2x1<T, TResult>;
-    /**
-     * This method is like _.clone except that it accepts customizer which is invoked to produce the cloned value.
-     * If customizer returns undefined cloning is handled by the method instead.
-     *
-     * @param value The value to clone.
-     * @param customizer The function to customize cloning.
-     * @return Returns the cloned value.
-     */
-    <T, TResult>(customizer: _.CloneWithCustomizer<T, TResult | undefined>, value: T): TResult | T;
-}
-interface CloneWith1x1<T, TResult extends object | string | number | boolean | null> {
-    /**
-     * This method is like _.clone except that it accepts customizer which is invoked to produce the cloned value.
-     * If customizer returns undefined cloning is handled by the method instead.
-     *
-     * @param value The value to clone.
-     * @param customizer The function to customize cloning.
-     * @return Returns the cloned value.
-     */
-    (): CloneWith1x1<T, TResult>;
-    /**
-     * This method is like _.clone except that it accepts customizer which is invoked to produce the cloned value.
-     * If customizer returns undefined cloning is handled by the method instead.
-     *
-     * @param value The value to clone.
-     * @param customizer The function to customize cloning.
-     * @return Returns the cloned value.
-     */
-    (value: T): TResult;
-}
-interface CloneWith2x1<T, TResult> {
-    /**
-     * This method is like _.clone except that it accepts customizer which is invoked to produce the cloned value.
-     * If customizer returns undefined cloning is handled by the method instead.
-     *
-     * @param value The value to clone.
-     * @param customizer The function to customize cloning.
-     * @return Returns the cloned value.
-     */
-    (): CloneWith2x1<T, TResult>;
-    /**
-     * This method is like _.clone except that it accepts customizer which is invoked to produce the cloned value.
-     * If customizer returns undefined cloning is handled by the method instead.
-     *
-     * @param value The value to clone.
-     * @param customizer The function to customize cloning.
-     * @return Returns the cloned value.
-     */
-    (value: T): TResult | T;
-}
-
-declare const cloneWith: CloneWith;
+import { cloneWith } from "../fp";
 export = cloneWith;
diff --git a/types/lodash/fp/compact.d.ts b/types/lodash/fp/compact.d.ts
index 4b1c509117..6ca1547040 100644
--- a/types/lodash/fp/compact.d.ts
+++ b/types/lodash/fp/compact.d.ts
@@ -1,18 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-type Compact =
-    /**
-     * Creates an array with all falsey values removed. The values false, null, 0, "", undefined, and NaN are
-     * falsey.
-     *
-     * @param array The array to compact.
-     * @return Returns the new array of filtered values.
-     */
-    <T>(array: _.List<T | null | undefined | false | "" | 0> | null | undefined) => T[];
-
-declare const compact: Compact;
+import { compact } from "../fp";
 export = compact;
diff --git a/types/lodash/fp/complement.d.ts b/types/lodash/fp/complement.d.ts
index 397bab4997..e4c3112534 100644
--- a/types/lodash/fp/complement.d.ts
+++ b/types/lodash/fp/complement.d.ts
@@ -1,16 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type Negate =
-    /**
-     * Creates a function that negates the result of the predicate func. The func predicate is invoked with
-     * the this binding and arguments of the created function.
-     *
-     * @param predicate The predicate to negate.
-     * @return Returns the new function.
-     */
-    <T extends (...args: any[]) => any>(predicate: T) => T;
-
-declare const complement: Negate;
+import { complement } from "../fp";
 export = complement;
diff --git a/types/lodash/fp/compose.d.ts b/types/lodash/fp/compose.d.ts
index 6d626496ae..7950c7c585 100644
--- a/types/lodash/fp/compose.d.ts
+++ b/types/lodash/fp/compose.d.ts
@@ -1,315 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface FlowRight {
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <R2, R1>(f2: (a: R1) => R2, f1: () => R1): () => R2;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <R3, R2, R1>(f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): () => R3;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <R4, R3, R2, R1>(f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): () => R4;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <R5, R4, R3, R2, R1>(f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): () => R5;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <R6, R5, R4, R3, R2, R1>(f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): () => R6;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <R7, R6, R5, R4, R3, R2, R1>(f7: (a: R6) => R7, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): () => R7;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, R2, R1>(f2: (a: R1) => R2, f1: (a1: A1) => R1): (a1: A1) => R2;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, R3, R2, R1>(f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): (a1: A1) => R3;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, R4, R3, R2, R1>(f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): (a1: A1) => R4;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, R5, R4, R3, R2, R1>(f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): (a1: A1) => R5;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, R6, R5, R4, R3, R2, R1>(f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): (a1: A1) => R6;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, R7, R6, R5, R4, R3, R2, R1>(f7: (a: R6) => R7, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): (a1: A1) => R7;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, R2, R1>(f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): (a1: A1, a2: A2) => R2;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, R3, R2, R1>(f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): (a1: A1, a2: A2) => R3;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, R4, R3, R2, R1>(f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): (a1: A1, a2: A2) => R4;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, R5, R4, R3, R2, R1>(f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): (a1: A1, a2: A2) => R5;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, R6, R5, R4, R3, R2, R1>(f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): (a1: A1, a2: A2) => R6;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, R7, R6, R5, R4, R3, R2, R1>(f7: (a: R6) => R7, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): (a1: A1, a2: A2) => R7;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, R2, R1>(f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): (a1: A1, a2: A2, a3: A3) => R2;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, R3, R2, R1>(f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): (a1: A1, a2: A2, a3: A3) => R3;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, R4, R3, R2, R1>(f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): (a1: A1, a2: A2, a3: A3) => R4;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, R5, R4, R3, R2, R1>(f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): (a1: A1, a2: A2, a3: A3) => R5;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, R6, R5, R4, R3, R2, R1>(f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): (a1: A1, a2: A2, a3: A3) => R6;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, R7, R6, R5, R4, R3, R2, R1>(f7: (a: R6) => R7, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): (a1: A1, a2: A2, a3: A3) => R7;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, A4, R2, R1>(f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): (a1: A1, a2: A2, a3: A3, a4: A4) => R2;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, A4, R3, R2, R1>(f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): (a1: A1, a2: A2, a3: A3, a4: A4) => R3;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, A4, R4, R3, R2, R1>(f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): (a1: A1, a2: A2, a3: A3, a4: A4) => R4;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, A4, R5, R4, R3, R2, R1>(f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): (a1: A1, a2: A2, a3: A3, a4: A4) => R5;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, A4, R6, R5, R4, R3, R2, R1>(f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): (a1: A1, a2: A2, a3: A3, a4: A4) => R6;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, A4, R7, R6, R5, R4, R3, R2, R1>(f7: (a: R6) => R7, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): (a1: A1, a2: A2, a3: A3, a4: A4) => R7;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <R2, R1>(f2: (a: R1) => R2, f1: (...args: any[]) => R1): (...args: any[]) => R2;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <R3, R2, R1>(f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): (...args: any[]) => R3;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <R4, R3, R2, R1>(f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): (...args: any[]) => R4;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <R5, R4, R3, R2, R1>(f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): (...args: any[]) => R5;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <R6, R5, R4, R3, R2, R1>(f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): (...args: any[]) => R6;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <R7, R6, R5, R4, R3, R2, R1>(f7: (a: R6) => R7, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): (...args: any[]) => R7;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    (f7: (a: any) => any, f6: (a: any) => any, f5: (a: any) => any, f4: (a: any) => any, f3: (a: any) => any, f2: (a: any) => any, f1: () => any, ...funcs: Array<_.Many<(...args: any[]) => any>>): (...args: any[]) => any;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    (funcs: Array<_.Many<(...args: any[]) => any>>): (...args: any[]) => any;
-}
-
-declare const compose: FlowRight;
+import { compose } from "../fp";
 export = compose;
diff --git a/types/lodash/fp/concat.d.ts b/types/lodash/fp/concat.d.ts
index a68dce878a..5e109d1daa 100644
--- a/types/lodash/fp/concat.d.ts
+++ b/types/lodash/fp/concat.d.ts
@@ -1,113 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Concat {
-    /**
-     * Creates a new array concatenating `array` with any additional arrays
-     * and/or values.
-     *
-     * @category Array
-     * @param array The array to concatenate.
-     * @param [values] The values to concatenate.
-     * @returns Returns the new concatenated array.
-     * @example
-     *
-     * var array = [1];
-     * var other = _.concat(array, 2, [3], [[4]]);
-     *
-     * console.log(other);
-     * // => [1, 2, 3, [4]]
-     *
-     * console.log(array);
-     * // => [1]
-     */
-    (): Concat;
-    /**
-     * Creates a new array concatenating `array` with any additional arrays
-     * and/or values.
-     *
-     * @category Array
-     * @param array The array to concatenate.
-     * @param [values] The values to concatenate.
-     * @returns Returns the new concatenated array.
-     * @example
-     *
-     * var array = [1];
-     * var other = _.concat(array, 2, [3], [[4]]);
-     *
-     * console.log(other);
-     * // => [1, 2, 3, [4]]
-     *
-     * console.log(array);
-     * // => [1]
-     */
-    <T>(array: _.Many<T>): Concat1x1<T>;
-    /**
-     * Creates a new array concatenating `array` with any additional arrays
-     * and/or values.
-     *
-     * @category Array
-     * @param array The array to concatenate.
-     * @param [values] The values to concatenate.
-     * @returns Returns the new concatenated array.
-     * @example
-     *
-     * var array = [1];
-     * var other = _.concat(array, 2, [3], [[4]]);
-     *
-     * console.log(other);
-     * // => [1, 2, 3, [4]]
-     *
-     * console.log(array);
-     * // => [1]
-     */
-    <T>(array: _.Many<T>, values: _.Many<T>): T[];
-}
-interface Concat1x1<T> {
-    /**
-     * Creates a new array concatenating `array` with any additional arrays
-     * and/or values.
-     *
-     * @category Array
-     * @param array The array to concatenate.
-     * @param [values] The values to concatenate.
-     * @returns Returns the new concatenated array.
-     * @example
-     *
-     * var array = [1];
-     * var other = _.concat(array, 2, [3], [[4]]);
-     *
-     * console.log(other);
-     * // => [1, 2, 3, [4]]
-     *
-     * console.log(array);
-     * // => [1]
-     */
-    (): Concat1x1<T>;
-    /**
-     * Creates a new array concatenating `array` with any additional arrays
-     * and/or values.
-     *
-     * @category Array
-     * @param array The array to concatenate.
-     * @param [values] The values to concatenate.
-     * @returns Returns the new concatenated array.
-     * @example
-     *
-     * var array = [1];
-     * var other = _.concat(array, 2, [3], [[4]]);
-     *
-     * console.log(other);
-     * // => [1, 2, 3, [4]]
-     *
-     * console.log(array);
-     * // => [1]
-     */
-    (values: _.Many<T>): T[];
-}
-
-declare const concat: Concat;
+import { concat } from "../fp";
 export = concat;
diff --git a/types/lodash/fp/cond.d.ts b/types/lodash/fp/cond.d.ts
index c5a18575a6..b9216e308f 100644
--- a/types/lodash/fp/cond.d.ts
+++ b/types/lodash/fp/cond.d.ts
@@ -1,38 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-type Cond =
-    /**
-     * Creates a function that iterates over `pairs` and invokes the corresponding
-     * function of the first predicate to return truthy. The predicate-function
-     * pairs are invoked with the `this` binding and arguments of the created
-     * function.
-     *
-     * @since 4.0.0
-     * @category Util
-     * @param pairs The predicate-function pairs.
-     * @returns Returns the new composite function.
-     * @example
-     *
-     * var func = _.cond([
-     *   [_.matches({ 'a': 1 }),   _.constant('matches A')],
-     *   [_.conforms({ 'b': _.isNumber }), _.constant('matches B')],
-     *   [_.stubTrue,  _.constant('no match')]
-     * ]);
-     *
-     * func({ 'a': 1, 'b': 2 });
-     * // => 'matches A'
-     *
-     * func({ 'a': 0, 'b': 1 });
-     * // => 'matches B'
-     *
-     * func({ 'a': '1', 'b': '2' });
-     * // => 'no match'
-     */
-    <T, R>(pairs: Array<_.CondPair<T, R>>) => (Target: T) => R;
-
-declare const cond: Cond;
+import { cond } from "../fp";
 export = cond;
diff --git a/types/lodash/fp/conforms.d.ts b/types/lodash/fp/conforms.d.ts
index 6499cccf55..9bd3353f44 100644
--- a/types/lodash/fp/conforms.d.ts
+++ b/types/lodash/fp/conforms.d.ts
@@ -1,48 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface ConformsTo {
-    /**
-     * Checks if object conforms to source by invoking the predicate properties of source with the
-     * corresponding property values of object.
-     *
-     * Note: This method is equivalent to _.conforms when source is partially applied.
-     */
-    (): ConformsTo;
-    /**
-     * Checks if object conforms to source by invoking the predicate properties of source with the
-     * corresponding property values of object.
-     *
-     * Note: This method is equivalent to _.conforms when source is partially applied.
-     */
-    <T>(source: _.ConformsPredicateObject<T>): ConformsTo1x1<T>;
-    /**
-     * Checks if object conforms to source by invoking the predicate properties of source with the
-     * corresponding property values of object.
-     *
-     * Note: This method is equivalent to _.conforms when source is partially applied.
-     */
-    <T>(source: _.ConformsPredicateObject<T>, object: T): boolean;
-}
-interface ConformsTo1x1<T> {
-    /**
-     * Checks if object conforms to source by invoking the predicate properties of source with the
-     * corresponding property values of object.
-     *
-     * Note: This method is equivalent to _.conforms when source is partially applied.
-     */
-    (): ConformsTo1x1<T>;
-    /**
-     * Checks if object conforms to source by invoking the predicate properties of source with the
-     * corresponding property values of object.
-     *
-     * Note: This method is equivalent to _.conforms when source is partially applied.
-     */
-    (object: T): boolean;
-}
-
-declare const conforms: ConformsTo;
+import { conforms } from "../fp";
 export = conforms;
diff --git a/types/lodash/fp/conformsTo.d.ts b/types/lodash/fp/conformsTo.d.ts
index 9512e4adf6..ad1728006d 100644
--- a/types/lodash/fp/conformsTo.d.ts
+++ b/types/lodash/fp/conformsTo.d.ts
@@ -1,48 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface ConformsTo {
-    /**
-     * Checks if object conforms to source by invoking the predicate properties of source with the
-     * corresponding property values of object.
-     *
-     * Note: This method is equivalent to _.conforms when source is partially applied.
-     */
-    (): ConformsTo;
-    /**
-     * Checks if object conforms to source by invoking the predicate properties of source with the
-     * corresponding property values of object.
-     *
-     * Note: This method is equivalent to _.conforms when source is partially applied.
-     */
-    <T>(source: _.ConformsPredicateObject<T>): ConformsTo1x1<T>;
-    /**
-     * Checks if object conforms to source by invoking the predicate properties of source with the
-     * corresponding property values of object.
-     *
-     * Note: This method is equivalent to _.conforms when source is partially applied.
-     */
-    <T>(source: _.ConformsPredicateObject<T>, object: T): boolean;
-}
-interface ConformsTo1x1<T> {
-    /**
-     * Checks if object conforms to source by invoking the predicate properties of source with the
-     * corresponding property values of object.
-     *
-     * Note: This method is equivalent to _.conforms when source is partially applied.
-     */
-    (): ConformsTo1x1<T>;
-    /**
-     * Checks if object conforms to source by invoking the predicate properties of source with the
-     * corresponding property values of object.
-     *
-     * Note: This method is equivalent to _.conforms when source is partially applied.
-     */
-    (object: T): boolean;
-}
-
-declare const conformsTo: ConformsTo;
+import { conformsTo } from "../fp";
 export = conformsTo;
diff --git a/types/lodash/fp/constant.d.ts b/types/lodash/fp/constant.d.ts
index 718805e17f..ef80ff57c3 100644
--- a/types/lodash/fp/constant.d.ts
+++ b/types/lodash/fp/constant.d.ts
@@ -1,15 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type Constant =
-    /**
-     * Creates a function that returns value.
-     *
-     * @param value The value to return from the new function.
-     * @return Returns the new function.
-     */
-    <T>(value: T) => () => T;
-
-declare const constant: Constant;
+import { constant } from "../fp";
 export = constant;
diff --git a/types/lodash/fp/contains.d.ts b/types/lodash/fp/contains.d.ts
index b80ca7f1fa..6c29e95f1a 100644
--- a/types/lodash/fp/contains.d.ts
+++ b/types/lodash/fp/contains.d.ts
@@ -1,63 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Includes {
-    /**
-     * Checks if target is in collection using SameValueZero for equality comparisons. If fromIndex is negative,
-     * it’s used as the offset from the end of collection.
-     *
-     * @param collection The collection to search.
-     * @param target The value to search for.
-     * @param fromIndex The index to search from.
-     * @return True if the target element is found, else false.
-     */
-    (): Includes;
-    /**
-     * Checks if target is in collection using SameValueZero for equality comparisons. If fromIndex is negative,
-     * it’s used as the offset from the end of collection.
-     *
-     * @param collection The collection to search.
-     * @param target The value to search for.
-     * @param fromIndex The index to search from.
-     * @return True if the target element is found, else false.
-     */
-    <T>(target: T): Includes1x1<T>;
-    /**
-     * Checks if target is in collection using SameValueZero for equality comparisons. If fromIndex is negative,
-     * it’s used as the offset from the end of collection.
-     *
-     * @param collection The collection to search.
-     * @param target The value to search for.
-     * @param fromIndex The index to search from.
-     * @return True if the target element is found, else false.
-     */
-    <T>(target: T, collection: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): boolean;
-}
-interface Includes1x1<T> {
-    /**
-     * Checks if target is in collection using SameValueZero for equality comparisons. If fromIndex is negative,
-     * it’s used as the offset from the end of collection.
-     *
-     * @param collection The collection to search.
-     * @param target The value to search for.
-     * @param fromIndex The index to search from.
-     * @return True if the target element is found, else false.
-     */
-    (): Includes1x1<T>;
-    /**
-     * Checks if target is in collection using SameValueZero for equality comparisons. If fromIndex is negative,
-     * it’s used as the offset from the end of collection.
-     *
-     * @param collection The collection to search.
-     * @param target The value to search for.
-     * @param fromIndex The index to search from.
-     * @return True if the target element is found, else false.
-     */
-    (collection: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): boolean;
-}
-
-declare const contains: Includes;
+import { contains } from "../fp";
 export = contains;
diff --git a/types/lodash/fp/countBy.d.ts b/types/lodash/fp/countBy.d.ts
index cca0ac3b02..e3725c3521 100644
--- a/types/lodash/fp/countBy.d.ts
+++ b/types/lodash/fp/countBy.d.ts
@@ -1,225 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface CountBy {
-    /**
-     * Creates an object composed of keys generated from the results of running each element of collection through
-     * iteratee. The corresponding value of each key is the number of times the key was returned by iteratee. The
-     * iteratee is bound to thisArg and invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the composed aggregate object.
-     */
-    (): CountBy;
-    /**
-     * Creates an object composed of keys generated from the results of running each element of collection through
-     * iteratee. The corresponding value of each key is the number of times the key was returned by iteratee. The
-     * iteratee is bound to thisArg and invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the composed aggregate object.
-     */
-    <T>(iteratee: (value: string) => T): CountBy1x1;
-    /**
-     * Creates an object composed of keys generated from the results of running each element of collection through
-     * iteratee. The corresponding value of each key is the number of times the key was returned by iteratee. The
-     * iteratee is bound to thisArg and invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the composed aggregate object.
-     */
-    <T>(iteratee: (value: string) => T, collection: string | null | undefined): _.Dictionary<number>;
-    /**
-     * Creates an object composed of keys generated from the results of running each element of collection through
-     * iteratee. The corresponding value of each key is the number of times the key was returned by iteratee. The
-     * iteratee is bound to thisArg and invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the composed aggregate object.
-     */
-    <T>(iteratee: _.ValueIteratee<T>): CountBy2x1<T>;
-    /**
-     * Creates an object composed of keys generated from the results of running each element of collection through
-     * iteratee. The corresponding value of each key is the number of times the key was returned by iteratee. The
-     * iteratee is bound to thisArg and invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the composed aggregate object.
-     */
-    <T>(iteratee: _.ValueIteratee<T>, collection: _.List<T> | null | undefined): _.Dictionary<number>;
-    /**
-     * Creates an object composed of keys generated from the results of running each element of collection through
-     * iteratee. The corresponding value of each key is the number of times the key was returned by iteratee. The
-     * iteratee is bound to thisArg and invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the composed aggregate object.
-     */
-    <T extends object>(iteratee: _.ValueIteratee<T[keyof T]>, collection: T | null | undefined): _.Dictionary<number>;
-}
-interface CountBy1x1 {
-    /**
-     * Creates an object composed of keys generated from the results of running each element of collection through
-     * iteratee. The corresponding value of each key is the number of times the key was returned by iteratee. The
-     * iteratee is bound to thisArg and invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the composed aggregate object.
-     */
-    (): CountBy1x1;
-    /**
-     * Creates an object composed of keys generated from the results of running each element of collection through
-     * iteratee. The corresponding value of each key is the number of times the key was returned by iteratee. The
-     * iteratee is bound to thisArg and invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the composed aggregate object.
-     */
-    <T>(collection: string | null | undefined): _.Dictionary<number>;
-}
-interface CountBy2x1<T> {
-    /**
-     * Creates an object composed of keys generated from the results of running each element of collection through
-     * iteratee. The corresponding value of each key is the number of times the key was returned by iteratee. The
-     * iteratee is bound to thisArg and invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the composed aggregate object.
-     */
-    (): CountBy2x1<T>;
-    /**
-     * Creates an object composed of keys generated from the results of running each element of collection through
-     * iteratee. The corresponding value of each key is the number of times the key was returned by iteratee. The
-     * iteratee is bound to thisArg and invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the composed aggregate object.
-     */
-    (collection: _.List<T> | object | null | undefined): _.Dictionary<number>;
-}
-
-declare const countBy: CountBy;
+import { countBy } from "../fp";
 export = countBy;
diff --git a/types/lodash/fp/create.d.ts b/types/lodash/fp/create.d.ts
index 6025931062..2818e10e8d 100644
--- a/types/lodash/fp/create.d.ts
+++ b/types/lodash/fp/create.d.ts
@@ -1,17 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type Create =
-    /**
-     * Creates an object that inherits from the given prototype object. If a properties object is provided its own
-     * enumerable properties are assigned to the created object.
-     *
-     * @param prototype The object to inherit from.
-     * @param properties The properties to assign to the object.
-     * @return Returns the new object.
-     */
-    <T extends object, U extends object>(prototype: T) => T & U;
-
-declare const create: Create;
+import { create } from "../fp";
 export = create;
diff --git a/types/lodash/fp/curry.d.ts b/types/lodash/fp/curry.d.ts
index 6c946bbf67..e8fcf1ded7 100644
--- a/types/lodash/fp/curry.d.ts
+++ b/types/lodash/fp/curry.d.ts
@@ -1,65 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Curry {
-    /**
-     * Creates a function that accepts one or more arguments of func that when called either invokes func returning
-     * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
-     * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
-     * @param func The function to curry.
-     * @param arity The arity of func.
-     * @return Returns the new curried function.
-     */
-    <T1, R>(func: (t1: T1) => R): _.CurriedFunction1<T1, R>;
-    /**
-     * Creates a function that accepts one or more arguments of func that when called either invokes func returning
-     * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
-     * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
-     * @param func The function to curry.
-     * @param arity The arity of func.
-     * @return Returns the new curried function.
-     */
-    <T1, T2, R>(func: (t1: T1, t2: T2) => R): _.CurriedFunction2<T1, T2, R>;
-    /**
-     * Creates a function that accepts one or more arguments of func that when called either invokes func returning
-     * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
-     * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
-     * @param func The function to curry.
-     * @param arity The arity of func.
-     * @return Returns the new curried function.
-     */
-    <T1, T2, T3, R>(func: (t1: T1, t2: T2, t3: T3) => R): _.CurriedFunction3<T1, T2, T3, R>;
-    /**
-     * Creates a function that accepts one or more arguments of func that when called either invokes func returning
-     * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
-     * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
-     * @param func The function to curry.
-     * @param arity The arity of func.
-     * @return Returns the new curried function.
-     */
-    <T1, T2, T3, T4, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4) => R): _.CurriedFunction4<T1, T2, T3, T4, R>;
-    /**
-     * Creates a function that accepts one or more arguments of func that when called either invokes func returning
-     * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
-     * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
-     * @param func The function to curry.
-     * @param arity The arity of func.
-     * @return Returns the new curried function.
-     */
-    <T1, T2, T3, T4, T5, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5) => R): _.CurriedFunction5<T1, T2, T3, T4, T5, R>;
-    /**
-     * Creates a function that accepts one or more arguments of func that when called either invokes func returning
-     * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
-     * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
-     * @param func The function to curry.
-     * @param arity The arity of func.
-     * @return Returns the new curried function.
-     */
-    (func: (...args: any[]) => any): (...args: any[]) => any;
-}
-
-declare const curry: Curry;
+import { curry } from "../fp";
 export = curry;
diff --git a/types/lodash/fp/curryN.d.ts b/types/lodash/fp/curryN.d.ts
index 4acbd81811..55b579b716 100644
--- a/types/lodash/fp/curryN.d.ts
+++ b/types/lodash/fp/curryN.d.ts
@@ -1,148 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Curry {
-    /**
-     * Creates a function that accepts one or more arguments of func that when called either invokes func returning
-     * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
-     * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
-     * @param func The function to curry.
-     * @param arity The arity of func.
-     * @return Returns the new curried function.
-     */
-    (): Curry;
-    /**
-     * Creates a function that accepts one or more arguments of func that when called either invokes func returning
-     * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
-     * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
-     * @param func The function to curry.
-     * @param arity The arity of func.
-     * @return Returns the new curried function.
-     */
-    (arity: number): Curry1x1;
-    /**
-     * Creates a function that accepts one or more arguments of func that when called either invokes func returning
-     * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
-     * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
-     * @param func The function to curry.
-     * @param arity The arity of func.
-     * @return Returns the new curried function.
-     */
-    <T1, R>(arity: number, func: (t1: T1) => R): _.CurriedFunction1<T1, R>;
-    /**
-     * Creates a function that accepts one or more arguments of func that when called either invokes func returning
-     * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
-     * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
-     * @param func The function to curry.
-     * @param arity The arity of func.
-     * @return Returns the new curried function.
-     */
-    <T1, T2, R>(arity: number, func: (t1: T1, t2: T2) => R): _.CurriedFunction2<T1, T2, R>;
-    /**
-     * Creates a function that accepts one or more arguments of func that when called either invokes func returning
-     * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
-     * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
-     * @param func The function to curry.
-     * @param arity The arity of func.
-     * @return Returns the new curried function.
-     */
-    <T1, T2, T3, R>(arity: number, func: (t1: T1, t2: T2, t3: T3) => R): _.CurriedFunction3<T1, T2, T3, R>;
-    /**
-     * Creates a function that accepts one or more arguments of func that when called either invokes func returning
-     * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
-     * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
-     * @param func The function to curry.
-     * @param arity The arity of func.
-     * @return Returns the new curried function.
-     */
-    <T1, T2, T3, T4, R>(arity: number, func: (t1: T1, t2: T2, t3: T3, t4: T4) => R): _.CurriedFunction4<T1, T2, T3, T4, R>;
-    /**
-     * Creates a function that accepts one or more arguments of func that when called either invokes func returning
-     * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
-     * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
-     * @param func The function to curry.
-     * @param arity The arity of func.
-     * @return Returns the new curried function.
-     */
-    <T1, T2, T3, T4, T5, R>(arity: number, func: (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5) => R): _.CurriedFunction5<T1, T2, T3, T4, T5, R>;
-    /**
-     * Creates a function that accepts one or more arguments of func that when called either invokes func returning
-     * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
-     * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
-     * @param func The function to curry.
-     * @param arity The arity of func.
-     * @return Returns the new curried function.
-     */
-    (arity: number, func: (...args: any[]) => any): (...args: any[]) => any;
-}
-interface Curry1x1 {
-    /**
-     * Creates a function that accepts one or more arguments of func that when called either invokes func returning
-     * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
-     * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
-     * @param func The function to curry.
-     * @param arity The arity of func.
-     * @return Returns the new curried function.
-     */
-    (): Curry1x1;
-    /**
-     * Creates a function that accepts one or more arguments of func that when called either invokes func returning
-     * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
-     * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
-     * @param func The function to curry.
-     * @param arity The arity of func.
-     * @return Returns the new curried function.
-     */
-    <T1, R>(func: (t1: T1) => R): _.CurriedFunction1<T1, R>;
-    /**
-     * Creates a function that accepts one or more arguments of func that when called either invokes func returning
-     * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
-     * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
-     * @param func The function to curry.
-     * @param arity The arity of func.
-     * @return Returns the new curried function.
-     */
-    <T1, T2, R>(func: (t1: T1, t2: T2) => R): _.CurriedFunction2<T1, T2, R>;
-    /**
-     * Creates a function that accepts one or more arguments of func that when called either invokes func returning
-     * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
-     * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
-     * @param func The function to curry.
-     * @param arity The arity of func.
-     * @return Returns the new curried function.
-     */
-    <T1, T2, T3, R>(func: (t1: T1, t2: T2, t3: T3) => R): _.CurriedFunction3<T1, T2, T3, R>;
-    /**
-     * Creates a function that accepts one or more arguments of func that when called either invokes func returning
-     * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
-     * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
-     * @param func The function to curry.
-     * @param arity The arity of func.
-     * @return Returns the new curried function.
-     */
-    <T1, T2, T3, T4, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4) => R): _.CurriedFunction4<T1, T2, T3, T4, R>;
-    /**
-     * Creates a function that accepts one or more arguments of func that when called either invokes func returning
-     * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
-     * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
-     * @param func The function to curry.
-     * @param arity The arity of func.
-     * @return Returns the new curried function.
-     */
-    <T1, T2, T3, T4, T5, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5) => R): _.CurriedFunction5<T1, T2, T3, T4, T5, R>;
-    /**
-     * Creates a function that accepts one or more arguments of func that when called either invokes func returning
-     * its result, if all func arguments have been provided, or returns a function that accepts one or more of the
-     * remaining func arguments, and so on. The arity of func may be specified if func.length is not sufficient.
-     * @param func The function to curry.
-     * @param arity The arity of func.
-     * @return Returns the new curried function.
-     */
-    (func: (...args: any[]) => any): (...args: any[]) => any;
-}
-
-declare const curryN: Curry;
+import { curryN } from "../fp";
 export = curryN;
diff --git a/types/lodash/fp/curryRight.d.ts b/types/lodash/fp/curryRight.d.ts
index 5ff81e2004..d431f3c673 100644
--- a/types/lodash/fp/curryRight.d.ts
+++ b/types/lodash/fp/curryRight.d.ts
@@ -1,59 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface CurryRight {
-    /**
-     * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
-     * instead of _.partial.
-     * @param func The function to curry.
-     * @param arity The arity of func.
-     * @return Returns the new curried function.
-     */
-    <T1, R>(func: (t1: T1) => R): _.RightCurriedFunction1<T1, R>;
-    /**
-     * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
-     * instead of _.partial.
-     * @param func The function to curry.
-     * @param arity The arity of func.
-     * @return Returns the new curried function.
-     */
-    <T1, T2, R>(func: (t1: T1, t2: T2) => R): _.RightCurriedFunction2<T1, T2, R>;
-    /**
-     * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
-     * instead of _.partial.
-     * @param func The function to curry.
-     * @param arity The arity of func.
-     * @return Returns the new curried function.
-     */
-    <T1, T2, T3, R>(func: (t1: T1, t2: T2, t3: T3) => R): _.RightCurriedFunction3<T1, T2, T3, R>;
-    /**
-     * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
-     * instead of _.partial.
-     * @param func The function to curry.
-     * @param arity The arity of func.
-     * @return Returns the new curried function.
-     */
-    <T1, T2, T3, T4, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4) => R): _.RightCurriedFunction4<T1, T2, T3, T4, R>;
-    /**
-     * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
-     * instead of _.partial.
-     * @param func The function to curry.
-     * @param arity The arity of func.
-     * @return Returns the new curried function.
-     */
-    <T1, T2, T3, T4, T5, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5) => R): _.RightCurriedFunction5<T1, T2, T3, T4, T5, R>;
-    /**
-     * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
-     * instead of _.partial.
-     * @param func The function to curry.
-     * @param arity The arity of func.
-     * @return Returns the new curried function.
-     */
-    (func: (...args: any[]) => any): (...args: any[]) => any;
-}
-
-declare const curryRight: CurryRight;
+import { curryRight } from "../fp";
 export = curryRight;
diff --git a/types/lodash/fp/curryRightN.d.ts b/types/lodash/fp/curryRightN.d.ts
index 98694df731..89866d16ae 100644
--- a/types/lodash/fp/curryRightN.d.ts
+++ b/types/lodash/fp/curryRightN.d.ts
@@ -1,133 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface CurryRight {
-    /**
-     * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
-     * instead of _.partial.
-     * @param func The function to curry.
-     * @param arity The arity of func.
-     * @return Returns the new curried function.
-     */
-    (): CurryRight;
-    /**
-     * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
-     * instead of _.partial.
-     * @param func The function to curry.
-     * @param arity The arity of func.
-     * @return Returns the new curried function.
-     */
-    (arity: number): CurryRight1x1;
-    /**
-     * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
-     * instead of _.partial.
-     * @param func The function to curry.
-     * @param arity The arity of func.
-     * @return Returns the new curried function.
-     */
-    <T1, R>(arity: number, func: (t1: T1) => R): _.RightCurriedFunction1<T1, R>;
-    /**
-     * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
-     * instead of _.partial.
-     * @param func The function to curry.
-     * @param arity The arity of func.
-     * @return Returns the new curried function.
-     */
-    <T1, T2, R>(arity: number, func: (t1: T1, t2: T2) => R): _.RightCurriedFunction2<T1, T2, R>;
-    /**
-     * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
-     * instead of _.partial.
-     * @param func The function to curry.
-     * @param arity The arity of func.
-     * @return Returns the new curried function.
-     */
-    <T1, T2, T3, R>(arity: number, func: (t1: T1, t2: T2, t3: T3) => R): _.RightCurriedFunction3<T1, T2, T3, R>;
-    /**
-     * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
-     * instead of _.partial.
-     * @param func The function to curry.
-     * @param arity The arity of func.
-     * @return Returns the new curried function.
-     */
-    <T1, T2, T3, T4, R>(arity: number, func: (t1: T1, t2: T2, t3: T3, t4: T4) => R): _.RightCurriedFunction4<T1, T2, T3, T4, R>;
-    /**
-     * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
-     * instead of _.partial.
-     * @param func The function to curry.
-     * @param arity The arity of func.
-     * @return Returns the new curried function.
-     */
-    <T1, T2, T3, T4, T5, R>(arity: number, func: (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5) => R): _.RightCurriedFunction5<T1, T2, T3, T4, T5, R>;
-    /**
-     * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
-     * instead of _.partial.
-     * @param func The function to curry.
-     * @param arity The arity of func.
-     * @return Returns the new curried function.
-     */
-    (arity: number, func: (...args: any[]) => any): (...args: any[]) => any;
-}
-interface CurryRight1x1 {
-    /**
-     * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
-     * instead of _.partial.
-     * @param func The function to curry.
-     * @param arity The arity of func.
-     * @return Returns the new curried function.
-     */
-    (): CurryRight1x1;
-    /**
-     * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
-     * instead of _.partial.
-     * @param func The function to curry.
-     * @param arity The arity of func.
-     * @return Returns the new curried function.
-     */
-    <T1, R>(func: (t1: T1) => R): _.RightCurriedFunction1<T1, R>;
-    /**
-     * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
-     * instead of _.partial.
-     * @param func The function to curry.
-     * @param arity The arity of func.
-     * @return Returns the new curried function.
-     */
-    <T1, T2, R>(func: (t1: T1, t2: T2) => R): _.RightCurriedFunction2<T1, T2, R>;
-    /**
-     * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
-     * instead of _.partial.
-     * @param func The function to curry.
-     * @param arity The arity of func.
-     * @return Returns the new curried function.
-     */
-    <T1, T2, T3, R>(func: (t1: T1, t2: T2, t3: T3) => R): _.RightCurriedFunction3<T1, T2, T3, R>;
-    /**
-     * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
-     * instead of _.partial.
-     * @param func The function to curry.
-     * @param arity The arity of func.
-     * @return Returns the new curried function.
-     */
-    <T1, T2, T3, T4, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4) => R): _.RightCurriedFunction4<T1, T2, T3, T4, R>;
-    /**
-     * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
-     * instead of _.partial.
-     * @param func The function to curry.
-     * @param arity The arity of func.
-     * @return Returns the new curried function.
-     */
-    <T1, T2, T3, T4, T5, R>(func: (t1: T1, t2: T2, t3: T3, t4: T4, t5: T5) => R): _.RightCurriedFunction5<T1, T2, T3, T4, T5, R>;
-    /**
-     * This method is like _.curry except that arguments are applied to func in the manner of _.partialRight
-     * instead of _.partial.
-     * @param func The function to curry.
-     * @param arity The arity of func.
-     * @return Returns the new curried function.
-     */
-    (func: (...args: any[]) => any): (...args: any[]) => any;
-}
-
-declare const curryRightN: CurryRight;
+import { curryRightN } from "../fp";
 export = curryRightN;
diff --git a/types/lodash/fp/debounce.d.ts b/types/lodash/fp/debounce.d.ts
index 6aa4ca891b..88b003cbb0 100644
--- a/types/lodash/fp/debounce.d.ts
+++ b/types/lodash/fp/debounce.d.ts
@@ -1,118 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Debounce {
-    /**
-     * Creates a debounced function that delays invoking func until after wait milliseconds have elapsed since
-     * the last time the debounced function was invoked. The debounced function comes with a cancel method to
-     * cancel delayed invocations and a flush method to immediately invoke them. Provide an options object to
-     * indicate that func should be invoked on the leading and/or trailing edge of the wait timeout. Subsequent
-     * calls to the debounced function return the result of the last func invocation.
-     *
-     * Note: If leading and trailing options are true, func is invoked on the trailing edge of the timeout only
-     * if the the debounced function is invoked more than once during the wait timeout.
-     *
-     * See David Corbacho’s article for details over the differences between _.debounce and _.throttle.
-     *
-     * @param func The function to debounce.
-     * @param wait The number of milliseconds to delay.
-     * @param options The options object.
-     * @param options.leading Specify invoking on the leading edge of the timeout.
-     * @param options.maxWait The maximum time func is allowed to be delayed before it’s invoked.
-     * @param options.trailing Specify invoking on the trailing edge of the timeout.
-     * @return Returns the new debounced function.
-     */
-    (): Debounce;
-    /**
-     * Creates a debounced function that delays invoking func until after wait milliseconds have elapsed since
-     * the last time the debounced function was invoked. The debounced function comes with a cancel method to
-     * cancel delayed invocations and a flush method to immediately invoke them. Provide an options object to
-     * indicate that func should be invoked on the leading and/or trailing edge of the wait timeout. Subsequent
-     * calls to the debounced function return the result of the last func invocation.
-     *
-     * Note: If leading and trailing options are true, func is invoked on the trailing edge of the timeout only
-     * if the the debounced function is invoked more than once during the wait timeout.
-     *
-     * See David Corbacho’s article for details over the differences between _.debounce and _.throttle.
-     *
-     * @param func The function to debounce.
-     * @param wait The number of milliseconds to delay.
-     * @param options The options object.
-     * @param options.leading Specify invoking on the leading edge of the timeout.
-     * @param options.maxWait The maximum time func is allowed to be delayed before it’s invoked.
-     * @param options.trailing Specify invoking on the trailing edge of the timeout.
-     * @return Returns the new debounced function.
-     */
-    (wait: number): Debounce1x1;
-    /**
-     * Creates a debounced function that delays invoking func until after wait milliseconds have elapsed since
-     * the last time the debounced function was invoked. The debounced function comes with a cancel method to
-     * cancel delayed invocations and a flush method to immediately invoke them. Provide an options object to
-     * indicate that func should be invoked on the leading and/or trailing edge of the wait timeout. Subsequent
-     * calls to the debounced function return the result of the last func invocation.
-     *
-     * Note: If leading and trailing options are true, func is invoked on the trailing edge of the timeout only
-     * if the the debounced function is invoked more than once during the wait timeout.
-     *
-     * See David Corbacho’s article for details over the differences between _.debounce and _.throttle.
-     *
-     * @param func The function to debounce.
-     * @param wait The number of milliseconds to delay.
-     * @param options The options object.
-     * @param options.leading Specify invoking on the leading edge of the timeout.
-     * @param options.maxWait The maximum time func is allowed to be delayed before it’s invoked.
-     * @param options.trailing Specify invoking on the trailing edge of the timeout.
-     * @return Returns the new debounced function.
-     */
-    <T extends (...args: any[]) => any>(wait: number, func: T): T & _.Cancelable;
-}
-interface Debounce1x1 {
-    /**
-     * Creates a debounced function that delays invoking func until after wait milliseconds have elapsed since
-     * the last time the debounced function was invoked. The debounced function comes with a cancel method to
-     * cancel delayed invocations and a flush method to immediately invoke them. Provide an options object to
-     * indicate that func should be invoked on the leading and/or trailing edge of the wait timeout. Subsequent
-     * calls to the debounced function return the result of the last func invocation.
-     *
-     * Note: If leading and trailing options are true, func is invoked on the trailing edge of the timeout only
-     * if the the debounced function is invoked more than once during the wait timeout.
-     *
-     * See David Corbacho’s article for details over the differences between _.debounce and _.throttle.
-     *
-     * @param func The function to debounce.
-     * @param wait The number of milliseconds to delay.
-     * @param options The options object.
-     * @param options.leading Specify invoking on the leading edge of the timeout.
-     * @param options.maxWait The maximum time func is allowed to be delayed before it’s invoked.
-     * @param options.trailing Specify invoking on the trailing edge of the timeout.
-     * @return Returns the new debounced function.
-     */
-    (): Debounce1x1;
-    /**
-     * Creates a debounced function that delays invoking func until after wait milliseconds have elapsed since
-     * the last time the debounced function was invoked. The debounced function comes with a cancel method to
-     * cancel delayed invocations and a flush method to immediately invoke them. Provide an options object to
-     * indicate that func should be invoked on the leading and/or trailing edge of the wait timeout. Subsequent
-     * calls to the debounced function return the result of the last func invocation.
-     *
-     * Note: If leading and trailing options are true, func is invoked on the trailing edge of the timeout only
-     * if the the debounced function is invoked more than once during the wait timeout.
-     *
-     * See David Corbacho’s article for details over the differences between _.debounce and _.throttle.
-     *
-     * @param func The function to debounce.
-     * @param wait The number of milliseconds to delay.
-     * @param options The options object.
-     * @param options.leading Specify invoking on the leading edge of the timeout.
-     * @param options.maxWait The maximum time func is allowed to be delayed before it’s invoked.
-     * @param options.trailing Specify invoking on the trailing edge of the timeout.
-     * @return Returns the new debounced function.
-     */
-    <T extends (...args: any[]) => any>(func: T): T & _.Cancelable;
-}
-
-declare const debounce: Debounce;
+import { debounce } from "../fp";
 export = debounce;
diff --git a/types/lodash/fp/deburr.d.ts b/types/lodash/fp/deburr.d.ts
index 582ef58205..769abfb504 100644
--- a/types/lodash/fp/deburr.d.ts
+++ b/types/lodash/fp/deburr.d.ts
@@ -1,16 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type Deburr =
-    /**
-     * Deburrs string by converting latin-1 supplementary letters to basic latin letters and removing combining
-     * diacritical marks.
-     *
-     * @param string The string to deburr.
-     * @return Returns the deburred string.
-     */
-    (string: string) => string;
-
-declare const deburr: Deburr;
+import { deburr } from "../fp";
 export = deburr;
diff --git a/types/lodash/fp/defaultTo.d.ts b/types/lodash/fp/defaultTo.d.ts
index 2137ee3307..e02cc46fed 100644
--- a/types/lodash/fp/defaultTo.d.ts
+++ b/types/lodash/fp/defaultTo.d.ts
@@ -1,103 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface DefaultTo {
-    /**
-     * 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;
-    /**
-     * 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.
-     */
-    <T>(defaultValue: T): DefaultTo1x1<T>;
-    /**
-     * 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.
-     */
-    <T>(defaultValue: T, value: T | null | undefined): T;
-    /**
-     * 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.
-     */
-    <TDefault>(defaultValue: TDefault): DefaultTo2x1<TDefault>;
-    /**
-     * 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.
-     */
-    <T, TDefault>(defaultValue: TDefault, value: T | null | undefined): T | TDefault;
-}
-interface DefaultTo1x1<T> {
-    /**
-     * 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.
-     */
-    (): DefaultTo1x1<T>;
-    /**
-     * 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.
-     */
-    (value: T | null | undefined): T;
-}
-interface DefaultTo2x1<TDefault> {
-    /**
-     * 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.
-     */
-    (): DefaultTo2x1<TDefault>;
-    /**
-     * 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.
-     */
-    <T>(value: T | null | undefined): T | TDefault;
-}
-
-declare const defaultTo: DefaultTo;
+import { defaultTo } from "../fp";
 export = defaultTo;
diff --git a/types/lodash/fp/defaults.d.ts b/types/lodash/fp/defaults.d.ts
index 306534d374..132e47ba2e 100644
--- a/types/lodash/fp/defaults.d.ts
+++ b/types/lodash/fp/defaults.d.ts
@@ -1,71 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface Defaults {
-    /**
-     * Assigns own enumerable properties of source object(s) to the destination object for all destination
-     * properties that resolve to undefined. Once a property is set, additional values of the same property are
-     * ignored.
-     *
-     * Note: This method mutates object.
-     *
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @return The destination object.
-     */
-    (): Defaults;
-    /**
-     * Assigns own enumerable properties of source object(s) to the destination object for all destination
-     * properties that resolve to undefined. Once a property is set, additional values of the same property are
-     * ignored.
-     *
-     * Note: This method mutates object.
-     *
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @return The destination object.
-     */
-    <TSource>(source: TSource): Defaults1x1<TSource>;
-    /**
-     * Assigns own enumerable properties of source object(s) to the destination object for all destination
-     * properties that resolve to undefined. Once a property is set, additional values of the same property are
-     * ignored.
-     *
-     * Note: This method mutates object.
-     *
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @return The destination object.
-     */
-    <TObject, TSource>(source: TSource, object: TObject): TSource & TObject;
-}
-interface Defaults1x1<TSource> {
-    /**
-     * Assigns own enumerable properties of source object(s) to the destination object for all destination
-     * properties that resolve to undefined. Once a property is set, additional values of the same property are
-     * ignored.
-     *
-     * Note: This method mutates object.
-     *
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @return The destination object.
-     */
-    (): Defaults1x1<TSource>;
-    /**
-     * Assigns own enumerable properties of source object(s) to the destination object for all destination
-     * properties that resolve to undefined. Once a property is set, additional values of the same property are
-     * ignored.
-     *
-     * Note: This method mutates object.
-     *
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @return The destination object.
-     */
-    <TObject>(object: TObject): TSource & TObject;
-}
-
-declare const defaults: Defaults;
+import { defaults } from "../fp";
 export = defaults;
diff --git a/types/lodash/fp/defaultsAll.d.ts b/types/lodash/fp/defaultsAll.d.ts
index 371f6db282..1f2a3309e7 100644
--- a/types/lodash/fp/defaultsAll.d.ts
+++ b/types/lodash/fp/defaultsAll.d.ts
@@ -1,20 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type Defaults =
-    /**
-     * Assigns own enumerable properties of source object(s) to the destination object for all destination
-     * properties that resolve to undefined. Once a property is set, additional values of the same property are
-     * ignored.
-     *
-     * Note: This method mutates object.
-     *
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @return The destination object.
-     */
-    (object: ReadonlyArray<any>) => any;
-
-declare const defaultsAll: Defaults;
+import { defaultsAll } from "../fp";
 export = defaultsAll;
diff --git a/types/lodash/fp/defaultsDeep.d.ts b/types/lodash/fp/defaultsDeep.d.ts
index 86eace1bb9..6268a02594 100644
--- a/types/lodash/fp/defaultsDeep.d.ts
+++ b/types/lodash/fp/defaultsDeep.d.ts
@@ -1,46 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface DefaultsDeep {
-    /**
-     * This method is like _.defaults except that it recursively assigns default properties.
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @return Returns object.
-     **/
-    (): DefaultsDeep;
-    /**
-     * This method is like _.defaults except that it recursively assigns default properties.
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @return Returns object.
-     **/
-    (sources: any): DefaultsDeep1x1;
-    /**
-     * This method is like _.defaults except that it recursively assigns default properties.
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @return Returns object.
-     **/
-    (sources: any, object: any): any;
-}
-interface DefaultsDeep1x1 {
-    /**
-     * This method is like _.defaults except that it recursively assigns default properties.
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @return Returns object.
-     **/
-    (): DefaultsDeep1x1;
-    /**
-     * This method is like _.defaults except that it recursively assigns default properties.
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @return Returns object.
-     **/
-    (object: any): any;
-}
-
-declare const defaultsDeep: DefaultsDeep;
+import { defaultsDeep } from "../fp";
 export = defaultsDeep;
diff --git a/types/lodash/fp/defaultsDeepAll.d.ts b/types/lodash/fp/defaultsDeepAll.d.ts
index cb6157662d..7791666232 100644
--- a/types/lodash/fp/defaultsDeepAll.d.ts
+++ b/types/lodash/fp/defaultsDeepAll.d.ts
@@ -1,15 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type DefaultsDeep =
-    /**
-     * This method is like _.defaults except that it recursively assigns default properties.
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @return Returns object.
-     **/
-    (object: ReadonlyArray<any>) => any;
-
-declare const defaultsDeepAll: DefaultsDeep;
+import { defaultsDeepAll } from "../fp";
 export = defaultsDeepAll;
diff --git a/types/lodash/fp/defer.d.ts b/types/lodash/fp/defer.d.ts
index a9bab80092..f8be4ae8e2 100644
--- a/types/lodash/fp/defer.d.ts
+++ b/types/lodash/fp/defer.d.ts
@@ -1,17 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type Defer =
-    /**
-     * Defers invoking the func until the current call stack has cleared. Any additional arguments are provided to
-     * func when it’s invoked.
-     *
-     * @param func The function to defer.
-     * @param args The arguments to invoke the function with.
-     * @return Returns the timer id.
-     */
-    (func: (...args: any[]) => any, ...args: any[]) => number;
-
-declare const defer: Defer;
+import { defer } from "../fp";
 export = defer;
diff --git a/types/lodash/fp/delay.d.ts b/types/lodash/fp/delay.d.ts
index 8709a9c0e2..2f0c39909f 100644
--- a/types/lodash/fp/delay.d.ts
+++ b/types/lodash/fp/delay.d.ts
@@ -1,56 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface Delay {
-    /**
-     * Invokes func after wait milliseconds. Any additional arguments are provided to func when it’s invoked.
-     *
-     * @param func The function to delay.
-     * @param wait The number of milliseconds to delay invocation.
-     * @param args The arguments to invoke the function with.
-     * @return Returns the timer id.
-     */
-    (): Delay;
-    /**
-     * Invokes func after wait milliseconds. Any additional arguments are provided to func when it’s invoked.
-     *
-     * @param func The function to delay.
-     * @param wait The number of milliseconds to delay invocation.
-     * @param args The arguments to invoke the function with.
-     * @return Returns the timer id.
-     */
-    (wait: number): Delay1x1;
-    /**
-     * Invokes func after wait milliseconds. Any additional arguments are provided to func when it’s invoked.
-     *
-     * @param func The function to delay.
-     * @param wait The number of milliseconds to delay invocation.
-     * @param args The arguments to invoke the function with.
-     * @return Returns the timer id.
-     */
-    (wait: number, func: (...args: any[]) => any): number;
-}
-interface Delay1x1 {
-    /**
-     * Invokes func after wait milliseconds. Any additional arguments are provided to func when it’s invoked.
-     *
-     * @param func The function to delay.
-     * @param wait The number of milliseconds to delay invocation.
-     * @param args The arguments to invoke the function with.
-     * @return Returns the timer id.
-     */
-    (): Delay1x1;
-    /**
-     * Invokes func after wait milliseconds. Any additional arguments are provided to func when it’s invoked.
-     *
-     * @param func The function to delay.
-     * @param wait The number of milliseconds to delay invocation.
-     * @param args The arguments to invoke the function with.
-     * @return Returns the timer id.
-     */
-    (func: (...args: any[]) => any): number;
-}
-
-declare const delay: Delay;
+import { delay } from "../fp";
 export = delay;
diff --git a/types/lodash/fp/difference.d.ts b/types/lodash/fp/difference.d.ts
index 774539bba7..9448085041 100644
--- a/types/lodash/fp/difference.d.ts
+++ b/types/lodash/fp/difference.d.ts
@@ -1,58 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Difference {
-    /**
-     * Creates an array of unique array values not included in the other provided arrays using SameValueZero for
-     * equality comparisons.
-     *
-     * @param array The array to inspect.
-     * @param values The arrays of values to exclude.
-     * @return Returns the new array of filtered values.
-     */
-    (): Difference;
-    /**
-     * Creates an array of unique array values not included in the other provided arrays using SameValueZero for
-     * equality comparisons.
-     *
-     * @param array The array to inspect.
-     * @param values The arrays of values to exclude.
-     * @return Returns the new array of filtered values.
-     */
-    <T>(array: _.List<T> | null | undefined): Difference1x1<T>;
-    /**
-     * Creates an array of unique array values not included in the other provided arrays using SameValueZero for
-     * equality comparisons.
-     *
-     * @param array The array to inspect.
-     * @param values The arrays of values to exclude.
-     * @return Returns the new array of filtered values.
-     */
-    <T>(array: _.List<T> | null | undefined, values: _.List<T>): T[];
-}
-interface Difference1x1<T> {
-    /**
-     * Creates an array of unique array values not included in the other provided arrays using SameValueZero for
-     * equality comparisons.
-     *
-     * @param array The array to inspect.
-     * @param values The arrays of values to exclude.
-     * @return Returns the new array of filtered values.
-     */
-    (): Difference1x1<T>;
-    /**
-     * Creates an array of unique array values not included in the other provided arrays using SameValueZero for
-     * equality comparisons.
-     *
-     * @param array The array to inspect.
-     * @param values The arrays of values to exclude.
-     * @return Returns the new array of filtered values.
-     */
-    (values: _.List<T>): T[];
-}
-
-declare const difference: Difference;
+import { difference } from "../fp";
 export = difference;
diff --git a/types/lodash/fp/differenceBy.d.ts b/types/lodash/fp/differenceBy.d.ts
index 64975c1b17..52ba5b80ac 100644
--- a/types/lodash/fp/differenceBy.d.ts
+++ b/types/lodash/fp/differenceBy.d.ts
@@ -1,114 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface DifferenceBy {
-    /**
-     * This method is like _.difference except that it accepts iteratee which is invoked for each element of array
-     * and values to generate the criterion by which uniqueness is computed. The iteratee is invoked with one
-     * argument: (value).
-     *
-     * @param array The array to inspect.
-     * @param values The values to exclude.
-     * @param iteratee The iteratee invoked per element.
-     * @returns Returns the new array of filtered values.
-     */
-    (): DifferenceBy;
-    /**
-     * This method is like _.difference except that it accepts iteratee which is invoked for each element of array
-     * and values to generate the criterion by which uniqueness is computed. The iteratee is invoked with one
-     * argument: (value).
-     *
-     * @param array The array to inspect.
-     * @param values The values to exclude.
-     * @param iteratee The iteratee invoked per element.
-     * @returns Returns the new array of filtered values.
-     */
-    <T1, T2>(iteratee: _.ValueIteratee<T1 | T2>): DifferenceBy1x1<T1, T2>;
-    /**
-     * This method is like _.difference except that it accepts iteratee which is invoked for each element of array
-     * and values to generate the criterion by which uniqueness is computed. The iteratee is invoked with one
-     * argument: (value).
-     *
-     * @param array The array to inspect.
-     * @param values The values to exclude.
-     * @param iteratee The iteratee invoked per element.
-     * @returns Returns the new array of filtered values.
-     */
-    <T1, T2>(iteratee: _.ValueIteratee<T1 | T2>, array: _.List<T1> | null | undefined): DifferenceBy1x2<T1, T2>;
-    /**
-     * This method is like _.difference except that it accepts iteratee which is invoked for each element of array
-     * and values to generate the criterion by which uniqueness is computed. The iteratee is invoked with one
-     * argument: (value).
-     *
-     * @param array The array to inspect.
-     * @param values The values to exclude.
-     * @param iteratee The iteratee invoked per element.
-     * @returns Returns the new array of filtered values.
-     */
-    <T1, T2>(iteratee: _.ValueIteratee<T1 | T2>, array: _.List<T1> | null | undefined, values: _.List<T2>): T1[];
-}
-interface DifferenceBy1x1<T1, T2> {
-    /**
-     * This method is like _.difference except that it accepts iteratee which is invoked for each element of array
-     * and values to generate the criterion by which uniqueness is computed. The iteratee is invoked with one
-     * argument: (value).
-     *
-     * @param array The array to inspect.
-     * @param values The values to exclude.
-     * @param iteratee The iteratee invoked per element.
-     * @returns Returns the new array of filtered values.
-     */
-    (): DifferenceBy1x1<T1, T2>;
-    /**
-     * This method is like _.difference except that it accepts iteratee which is invoked for each element of array
-     * and values to generate the criterion by which uniqueness is computed. The iteratee is invoked with one
-     * argument: (value).
-     *
-     * @param array The array to inspect.
-     * @param values The values to exclude.
-     * @param iteratee The iteratee invoked per element.
-     * @returns Returns the new array of filtered values.
-     */
-    (array: _.List<T1> | null | undefined): DifferenceBy1x2<T1, T2>;
-    /**
-     * This method is like _.difference except that it accepts iteratee which is invoked for each element of array
-     * and values to generate the criterion by which uniqueness is computed. The iteratee is invoked with one
-     * argument: (value).
-     *
-     * @param array The array to inspect.
-     * @param values The values to exclude.
-     * @param iteratee The iteratee invoked per element.
-     * @returns Returns the new array of filtered values.
-     */
-    (array: _.List<T1> | null | undefined, values: _.List<T2>): T1[];
-}
-interface DifferenceBy1x2<T1, T2> {
-    /**
-     * This method is like _.difference except that it accepts iteratee which is invoked for each element of array
-     * and values to generate the criterion by which uniqueness is computed. The iteratee is invoked with one
-     * argument: (value).
-     *
-     * @param array The array to inspect.
-     * @param values The values to exclude.
-     * @param iteratee The iteratee invoked per element.
-     * @returns Returns the new array of filtered values.
-     */
-    (): DifferenceBy1x2<T1, T2>;
-    /**
-     * This method is like _.difference except that it accepts iteratee which is invoked for each element of array
-     * and values to generate the criterion by which uniqueness is computed. The iteratee is invoked with one
-     * argument: (value).
-     *
-     * @param array The array to inspect.
-     * @param values The values to exclude.
-     * @param iteratee The iteratee invoked per element.
-     * @returns Returns the new array of filtered values.
-     */
-    (values: _.List<T2>): T1[];
-}
-
-declare const differenceBy: DifferenceBy;
+import { differenceBy } from "../fp";
 export = differenceBy;
diff --git a/types/lodash/fp/differenceWith.d.ts b/types/lodash/fp/differenceWith.d.ts
index 2ef1961ff7..fd3c9a2cd4 100644
--- a/types/lodash/fp/differenceWith.d.ts
+++ b/types/lodash/fp/differenceWith.d.ts
@@ -1,168 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface DifferenceWith {
-    /**
-     * Creates an array of unique `array` values not included in the other
-     * provided arrays using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-     * for equality comparisons.
-     *
-     * @category Array
-     * @param [values] The arrays to inspect.
-     * @param [comparator] The comparator invoked per element.
-     * @returns Returns the new array of filtered values.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-
-     * _.differenceWith(objects, [{ 'x': 1, 'y': 2 }], _.isEqual);
-     * // => [{ 'x': 2, 'y': 1 }]
-     */
-    (): DifferenceWith;
-    /**
-     * Creates an array of unique `array` values not included in the other
-     * provided arrays using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-     * for equality comparisons.
-     *
-     * @category Array
-     * @param [values] The arrays to inspect.
-     * @param [comparator] The comparator invoked per element.
-     * @returns Returns the new array of filtered values.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-
-     * _.differenceWith(objects, [{ 'x': 1, 'y': 2 }], _.isEqual);
-     * // => [{ 'x': 2, 'y': 1 }]
-     */
-    <T1, T2>(comparator: _.Comparator2<T1, T2>): DifferenceWith1x1<T1, T2>;
-    /**
-     * Creates an array of unique `array` values not included in the other
-     * provided arrays using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-     * for equality comparisons.
-     *
-     * @category Array
-     * @param [values] The arrays to inspect.
-     * @param [comparator] The comparator invoked per element.
-     * @returns Returns the new array of filtered values.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-
-     * _.differenceWith(objects, [{ 'x': 1, 'y': 2 }], _.isEqual);
-     * // => [{ 'x': 2, 'y': 1 }]
-     */
-    <T1, T2>(comparator: _.Comparator2<T1, T2>, array: _.List<T1> | null | undefined): DifferenceWith1x2<T1, T2>;
-    /**
-     * Creates an array of unique `array` values not included in the other
-     * provided arrays using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-     * for equality comparisons.
-     *
-     * @category Array
-     * @param [values] The arrays to inspect.
-     * @param [comparator] The comparator invoked per element.
-     * @returns Returns the new array of filtered values.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-
-     * _.differenceWith(objects, [{ 'x': 1, 'y': 2 }], _.isEqual);
-     * // => [{ 'x': 2, 'y': 1 }]
-     */
-    <T1, T2>(comparator: _.Comparator2<T1, T2>, array: _.List<T1> | null | undefined, values: _.List<T2>): T1[];
-}
-interface DifferenceWith1x1<T1, T2> {
-    /**
-     * Creates an array of unique `array` values not included in the other
-     * provided arrays using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-     * for equality comparisons.
-     *
-     * @category Array
-     * @param [values] The arrays to inspect.
-     * @param [comparator] The comparator invoked per element.
-     * @returns Returns the new array of filtered values.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-
-     * _.differenceWith(objects, [{ 'x': 1, 'y': 2 }], _.isEqual);
-     * // => [{ 'x': 2, 'y': 1 }]
-     */
-    (): DifferenceWith1x1<T1, T2>;
-    /**
-     * Creates an array of unique `array` values not included in the other
-     * provided arrays using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-     * for equality comparisons.
-     *
-     * @category Array
-     * @param [values] The arrays to inspect.
-     * @param [comparator] The comparator invoked per element.
-     * @returns Returns the new array of filtered values.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-
-     * _.differenceWith(objects, [{ 'x': 1, 'y': 2 }], _.isEqual);
-     * // => [{ 'x': 2, 'y': 1 }]
-     */
-    (array: _.List<T1> | null | undefined): DifferenceWith1x2<T1, T2>;
-    /**
-     * Creates an array of unique `array` values not included in the other
-     * provided arrays using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-     * for equality comparisons.
-     *
-     * @category Array
-     * @param [values] The arrays to inspect.
-     * @param [comparator] The comparator invoked per element.
-     * @returns Returns the new array of filtered values.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-
-     * _.differenceWith(objects, [{ 'x': 1, 'y': 2 }], _.isEqual);
-     * // => [{ 'x': 2, 'y': 1 }]
-     */
-    (array: _.List<T1> | null | undefined, values: _.List<T2>): T1[];
-}
-interface DifferenceWith1x2<T1, T2> {
-    /**
-     * Creates an array of unique `array` values not included in the other
-     * provided arrays using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-     * for equality comparisons.
-     *
-     * @category Array
-     * @param [values] The arrays to inspect.
-     * @param [comparator] The comparator invoked per element.
-     * @returns Returns the new array of filtered values.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-
-     * _.differenceWith(objects, [{ 'x': 1, 'y': 2 }], _.isEqual);
-     * // => [{ 'x': 2, 'y': 1 }]
-     */
-    (): DifferenceWith1x2<T1, T2>;
-    /**
-     * Creates an array of unique `array` values not included in the other
-     * provided arrays using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-     * for equality comparisons.
-     *
-     * @category Array
-     * @param [values] The arrays to inspect.
-     * @param [comparator] The comparator invoked per element.
-     * @returns Returns the new array of filtered values.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-
-     * _.differenceWith(objects, [{ 'x': 1, 'y': 2 }], _.isEqual);
-     * // => [{ 'x': 2, 'y': 1 }]
-     */
-    (values: _.List<T2>): T1[];
-}
-
-declare const differenceWith: DifferenceWith;
+import { differenceWith } from "../fp";
 export = differenceWith;
diff --git a/types/lodash/fp/dissoc.d.ts b/types/lodash/fp/dissoc.d.ts
index ad931b90da..9b0fd6bb90 100644
--- a/types/lodash/fp/dissoc.d.ts
+++ b/types/lodash/fp/dissoc.d.ts
@@ -1,63 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Unset {
-    /**
-     * Removes the property at path of object.
-     *
-     * Note: This method mutates object.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to unset.
-     * @return Returns true if the property is deleted, else false.
-     */
-    (): Unset;
-    /**
-     * Removes the property at path of object.
-     *
-     * Note: This method mutates object.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to unset.
-     * @return Returns true if the property is deleted, else false.
-     */
-    (path: _.PropertyPath): Unset1x1;
-    /**
-     * Removes the property at path of object.
-     *
-     * Note: This method mutates object.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to unset.
-     * @return Returns true if the property is deleted, else false.
-     */
-    (path: _.PropertyPath, object: any): boolean;
-}
-interface Unset1x1 {
-    /**
-     * Removes the property at path of object.
-     *
-     * Note: This method mutates object.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to unset.
-     * @return Returns true if the property is deleted, else false.
-     */
-    (): Unset1x1;
-    /**
-     * Removes the property at path of object.
-     *
-     * Note: This method mutates object.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to unset.
-     * @return Returns true if the property is deleted, else false.
-     */
-    (object: any): boolean;
-}
-
-declare const dissoc: Unset;
+import { dissoc } from "../fp";
 export = dissoc;
diff --git a/types/lodash/fp/dissocPath.d.ts b/types/lodash/fp/dissocPath.d.ts
index 8d98858a6c..a201aa4b88 100644
--- a/types/lodash/fp/dissocPath.d.ts
+++ b/types/lodash/fp/dissocPath.d.ts
@@ -1,63 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Unset {
-    /**
-     * Removes the property at path of object.
-     *
-     * Note: This method mutates object.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to unset.
-     * @return Returns true if the property is deleted, else false.
-     */
-    (): Unset;
-    /**
-     * Removes the property at path of object.
-     *
-     * Note: This method mutates object.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to unset.
-     * @return Returns true if the property is deleted, else false.
-     */
-    (path: _.PropertyPath): Unset1x1;
-    /**
-     * Removes the property at path of object.
-     *
-     * Note: This method mutates object.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to unset.
-     * @return Returns true if the property is deleted, else false.
-     */
-    (path: _.PropertyPath, object: any): boolean;
-}
-interface Unset1x1 {
-    /**
-     * Removes the property at path of object.
-     *
-     * Note: This method mutates object.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to unset.
-     * @return Returns true if the property is deleted, else false.
-     */
-    (): Unset1x1;
-    /**
-     * Removes the property at path of object.
-     *
-     * Note: This method mutates object.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to unset.
-     * @return Returns true if the property is deleted, else false.
-     */
-    (object: any): boolean;
-}
-
-declare const dissocPath: Unset;
+import { dissocPath } from "../fp";
 export = dissocPath;
diff --git a/types/lodash/fp/divide.d.ts b/types/lodash/fp/divide.d.ts
index 293acebb68..5cd02e49dc 100644
--- a/types/lodash/fp/divide.d.ts
+++ b/types/lodash/fp/divide.d.ts
@@ -1,51 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface Divide {
-    /**
-    * Divide two numbers.
-    *
-    * @param dividend The first number in a division.
-    * @param divisor The second number in a division.
-    * @returns Returns the quotient.
-    */
-    (): Divide;
-    /**
-    * Divide two numbers.
-    *
-    * @param dividend The first number in a division.
-    * @param divisor The second number in a division.
-    * @returns Returns the quotient.
-    */
-    (dividend: number): Divide1x1;
-    /**
-    * Divide two numbers.
-    *
-    * @param dividend The first number in a division.
-    * @param divisor The second number in a division.
-    * @returns Returns the quotient.
-    */
-    (dividend: number, divisor: number): number;
-}
-interface Divide1x1 {
-    /**
-    * Divide two numbers.
-    *
-    * @param dividend The first number in a division.
-    * @param divisor The second number in a division.
-    * @returns Returns the quotient.
-    */
-    (): Divide1x1;
-    /**
-    * Divide two numbers.
-    *
-    * @param dividend The first number in a division.
-    * @param divisor The second number in a division.
-    * @returns Returns the quotient.
-    */
-    (divisor: number): number;
-}
-
-declare const divide: Divide;
+import { divide } from "../fp";
 export = divide;
diff --git a/types/lodash/fp/drop.d.ts b/types/lodash/fp/drop.d.ts
index 3c524f1321..bc3b9b2049 100644
--- a/types/lodash/fp/drop.d.ts
+++ b/types/lodash/fp/drop.d.ts
@@ -1,53 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Drop {
-    /**
-     * Creates a slice of array with n elements dropped from the beginning.
-     *
-     * @param array The array to query.
-     * @param n The number of elements to drop.
-     * @return Returns the slice of array.
-     */
-    (): Drop;
-    /**
-     * Creates a slice of array with n elements dropped from the beginning.
-     *
-     * @param array The array to query.
-     * @param n The number of elements to drop.
-     * @return Returns the slice of array.
-     */
-    (n: number): Drop1x1;
-    /**
-     * Creates a slice of array with n elements dropped from the beginning.
-     *
-     * @param array The array to query.
-     * @param n The number of elements to drop.
-     * @return Returns the slice of array.
-     */
-    <T>(n: number, array: _.List<T> | null | undefined): T[];
-}
-interface Drop1x1 {
-    /**
-     * Creates a slice of array with n elements dropped from the beginning.
-     *
-     * @param array The array to query.
-     * @param n The number of elements to drop.
-     * @return Returns the slice of array.
-     */
-    (): Drop1x1;
-    /**
-     * Creates a slice of array with n elements dropped from the beginning.
-     *
-     * @param array The array to query.
-     * @param n The number of elements to drop.
-     * @return Returns the slice of array.
-     */
-    <T>(array: _.List<T> | null | undefined): T[];
-}
-
-declare const drop: Drop;
+import { drop } from "../fp";
 export = drop;
diff --git a/types/lodash/fp/dropLast.d.ts b/types/lodash/fp/dropLast.d.ts
index e0fb5db69e..1dd388ae15 100644
--- a/types/lodash/fp/dropLast.d.ts
+++ b/types/lodash/fp/dropLast.d.ts
@@ -1,53 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface DropRight {
-    /**
-     * Creates a slice of array with n elements dropped from the end.
-     *
-     * @param array The array to query.
-     * @param n The number of elements to drop.
-     * @return Returns the slice of array.
-     */
-    (): DropRight;
-    /**
-     * Creates a slice of array with n elements dropped from the end.
-     *
-     * @param array The array to query.
-     * @param n The number of elements to drop.
-     * @return Returns the slice of array.
-     */
-    (n: number): DropRight1x1;
-    /**
-     * Creates a slice of array with n elements dropped from the end.
-     *
-     * @param array The array to query.
-     * @param n The number of elements to drop.
-     * @return Returns the slice of array.
-     */
-    <T>(n: number, array: _.List<T> | null | undefined): T[];
-}
-interface DropRight1x1 {
-    /**
-     * Creates a slice of array with n elements dropped from the end.
-     *
-     * @param array The array to query.
-     * @param n The number of elements to drop.
-     * @return Returns the slice of array.
-     */
-    (): DropRight1x1;
-    /**
-     * Creates a slice of array with n elements dropped from the end.
-     *
-     * @param array The array to query.
-     * @param n The number of elements to drop.
-     * @return Returns the slice of array.
-     */
-    <T>(array: _.List<T> | null | undefined): T[];
-}
-
-declare const dropLast: DropRight;
+import { dropLast } from "../fp";
 export = dropLast;
diff --git a/types/lodash/fp/dropLastWhile.d.ts b/types/lodash/fp/dropLastWhile.d.ts
index 3d0d5634ef..97529a6a49 100644
--- a/types/lodash/fp/dropLastWhile.d.ts
+++ b/types/lodash/fp/dropLastWhile.d.ts
@@ -1,108 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface DropRightWhile {
-    /**
-     * Creates a slice of array excluding elements dropped from the end. Elements are dropped until predicate
-     * returns falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * match the properties of the given object, else false.
-     *
-     * @param array The array to query.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the slice of array.
-     */
-    (): DropRightWhile;
-    /**
-     * Creates a slice of array excluding elements dropped from the end. Elements are dropped until predicate
-     * returns falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * match the properties of the given object, else false.
-     *
-     * @param array The array to query.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the slice of array.
-     */
-    <T>(predicate: _.ValueIteratee<T>): DropRightWhile1x1<T>;
-    /**
-     * Creates a slice of array excluding elements dropped from the end. Elements are dropped until predicate
-     * returns falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * match the properties of the given object, else false.
-     *
-     * @param array The array to query.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the slice of array.
-     */
-    <T>(predicate: _.ValueIteratee<T>, array: _.List<T> | null | undefined): T[];
-}
-interface DropRightWhile1x1<T> {
-    /**
-     * Creates a slice of array excluding elements dropped from the end. Elements are dropped until predicate
-     * returns falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * match the properties of the given object, else false.
-     *
-     * @param array The array to query.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the slice of array.
-     */
-    (): DropRightWhile1x1<T>;
-    /**
-     * Creates a slice of array excluding elements dropped from the end. Elements are dropped until predicate
-     * returns falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * match the properties of the given object, else false.
-     *
-     * @param array The array to query.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the slice of array.
-     */
-    (array: _.List<T> | null | undefined): T[];
-}
-
-declare const dropLastWhile: DropRightWhile;
+import { dropLastWhile } from "../fp";
 export = dropLastWhile;
diff --git a/types/lodash/fp/dropRight.d.ts b/types/lodash/fp/dropRight.d.ts
index 4c07c3c8a5..a2740ff029 100644
--- a/types/lodash/fp/dropRight.d.ts
+++ b/types/lodash/fp/dropRight.d.ts
@@ -1,53 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface DropRight {
-    /**
-     * Creates a slice of array with n elements dropped from the end.
-     *
-     * @param array The array to query.
-     * @param n The number of elements to drop.
-     * @return Returns the slice of array.
-     */
-    (): DropRight;
-    /**
-     * Creates a slice of array with n elements dropped from the end.
-     *
-     * @param array The array to query.
-     * @param n The number of elements to drop.
-     * @return Returns the slice of array.
-     */
-    (n: number): DropRight1x1;
-    /**
-     * Creates a slice of array with n elements dropped from the end.
-     *
-     * @param array The array to query.
-     * @param n The number of elements to drop.
-     * @return Returns the slice of array.
-     */
-    <T>(n: number, array: _.List<T> | null | undefined): T[];
-}
-interface DropRight1x1 {
-    /**
-     * Creates a slice of array with n elements dropped from the end.
-     *
-     * @param array The array to query.
-     * @param n The number of elements to drop.
-     * @return Returns the slice of array.
-     */
-    (): DropRight1x1;
-    /**
-     * Creates a slice of array with n elements dropped from the end.
-     *
-     * @param array The array to query.
-     * @param n The number of elements to drop.
-     * @return Returns the slice of array.
-     */
-    <T>(array: _.List<T> | null | undefined): T[];
-}
-
-declare const dropRight: DropRight;
+import { dropRight } from "../fp";
 export = dropRight;
diff --git a/types/lodash/fp/dropRightWhile.d.ts b/types/lodash/fp/dropRightWhile.d.ts
index e346a77e97..1a5aa5fe3e 100644
--- a/types/lodash/fp/dropRightWhile.d.ts
+++ b/types/lodash/fp/dropRightWhile.d.ts
@@ -1,108 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface DropRightWhile {
-    /**
-     * Creates a slice of array excluding elements dropped from the end. Elements are dropped until predicate
-     * returns falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * match the properties of the given object, else false.
-     *
-     * @param array The array to query.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the slice of array.
-     */
-    (): DropRightWhile;
-    /**
-     * Creates a slice of array excluding elements dropped from the end. Elements are dropped until predicate
-     * returns falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * match the properties of the given object, else false.
-     *
-     * @param array The array to query.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the slice of array.
-     */
-    <T>(predicate: _.ValueIteratee<T>): DropRightWhile1x1<T>;
-    /**
-     * Creates a slice of array excluding elements dropped from the end. Elements are dropped until predicate
-     * returns falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * match the properties of the given object, else false.
-     *
-     * @param array The array to query.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the slice of array.
-     */
-    <T>(predicate: _.ValueIteratee<T>, array: _.List<T> | null | undefined): T[];
-}
-interface DropRightWhile1x1<T> {
-    /**
-     * Creates a slice of array excluding elements dropped from the end. Elements are dropped until predicate
-     * returns falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * match the properties of the given object, else false.
-     *
-     * @param array The array to query.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the slice of array.
-     */
-    (): DropRightWhile1x1<T>;
-    /**
-     * Creates a slice of array excluding elements dropped from the end. Elements are dropped until predicate
-     * returns falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * match the properties of the given object, else false.
-     *
-     * @param array The array to query.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the slice of array.
-     */
-    (array: _.List<T> | null | undefined): T[];
-}
-
-declare const dropRightWhile: DropRightWhile;
+import { dropRightWhile } from "../fp";
 export = dropRightWhile;
diff --git a/types/lodash/fp/dropWhile.d.ts b/types/lodash/fp/dropWhile.d.ts
index 056a06bc3e..2cab8d8698 100644
--- a/types/lodash/fp/dropWhile.d.ts
+++ b/types/lodash/fp/dropWhile.d.ts
@@ -1,108 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface DropWhile {
-    /**
-     * Creates a slice of array excluding elements dropped from the beginning. Elements are dropped until predicate
-     * returns falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param array The array to query.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the slice of array.
-     */
-    (): DropWhile;
-    /**
-     * Creates a slice of array excluding elements dropped from the beginning. Elements are dropped until predicate
-     * returns falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param array The array to query.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the slice of array.
-     */
-    <T>(predicate: _.ValueIteratee<T>): DropWhile1x1<T>;
-    /**
-     * Creates a slice of array excluding elements dropped from the beginning. Elements are dropped until predicate
-     * returns falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param array The array to query.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the slice of array.
-     */
-    <T>(predicate: _.ValueIteratee<T>, array: _.List<T> | null | undefined): T[];
-}
-interface DropWhile1x1<T> {
-    /**
-     * Creates a slice of array excluding elements dropped from the beginning. Elements are dropped until predicate
-     * returns falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param array The array to query.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the slice of array.
-     */
-    (): DropWhile1x1<T>;
-    /**
-     * Creates a slice of array excluding elements dropped from the beginning. Elements are dropped until predicate
-     * returns falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param array The array to query.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the slice of array.
-     */
-    (array: _.List<T> | null | undefined): T[];
-}
-
-declare const dropWhile: DropWhile;
+import { dropWhile } from "../fp";
 export = dropWhile;
diff --git a/types/lodash/fp/each.d.ts b/types/lodash/fp/each.d.ts
index df0afae30f..af1d3b20a6 100644
--- a/types/lodash/fp/each.d.ts
+++ b/types/lodash/fp/each.d.ts
@@ -1,330 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface ForEach {
-    /**
-     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
-     * and invoked with three arguments:
-     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
-     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
-     *
-     * @alias _.each
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     */
-    (): ForEach;
-    /**
-     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
-     * and invoked with three arguments:
-     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
-     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
-     *
-     * @alias _.each
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     */
-    <T>(iteratee: (value: T) => any): ForEach1x1<T>;
-    /**
-     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
-     * and invoked with three arguments:
-     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
-     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
-     *
-     * @alias _.each
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     */
-    <T>(iteratee: (value: T) => any, collection: ReadonlyArray<T>): T[];
-    /**
-     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
-     * and invoked with three arguments:
-     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
-     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
-     *
-     * @alias _.each
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     */
-    (iteratee: (value: string) => any): ForEach2x1;
-    /**
-     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
-     * and invoked with three arguments:
-     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
-     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
-     *
-     * @alias _.each
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     */
-    (iteratee: (value: string) => any, collection: string): string;
-    /**
-     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
-     * and invoked with three arguments:
-     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
-     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
-     *
-     * @alias _.each
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     */
-    <T>(iteratee: (value: T) => any, collection: _.List<T>): _.List<T>;
-    /**
-     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
-     * and invoked with three arguments:
-     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
-     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
-     *
-     * @alias _.each
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     */
-    <T extends object>(iteratee: (value: T[keyof T]) => any, collection: T): T;
-    /**
-     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
-     * and invoked with three arguments:
-     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
-     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
-     *
-     * @alias _.each
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     */
-    <T, TArray extends T[] | null | undefined>(iteratee: (value: T) => any, collection: TArray & (T[] | null | undefined)): TArray;
-    /**
-     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
-     * and invoked with three arguments:
-     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
-     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
-     *
-     * @alias _.each
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     */
-    <TString extends string | null | undefined>(iteratee: (value: string) => any, collection: TString): TString;
-    /**
-     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
-     * and invoked with three arguments:
-     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
-     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
-     *
-     * @alias _.each
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     */
-    <T, TList extends _.List<T> | null | undefined>(iteratee: (value: T) => any, collection: TList & (_.List<T> | null | undefined)): TList;
-    /**
-     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
-     * and invoked with three arguments:
-     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
-     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
-     *
-     * @alias _.each
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     */
-    <T extends object>(iteratee: (value: T[keyof T]) => any, collection: T | null | undefined): T | null | undefined;
-}
-interface ForEach1x1<T> {
-    /**
-     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
-     * and invoked with three arguments:
-     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
-     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
-     *
-     * @alias _.each
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     */
-    (): ForEach1x1<T>;
-    /**
-     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
-     * and invoked with three arguments:
-     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
-     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
-     *
-     * @alias _.each
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     */
-    (collection: ReadonlyArray<T>): T[];
-    /**
-     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
-     * and invoked with three arguments:
-     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
-     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
-     *
-     * @alias _.each
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     */
-    (collection: _.List<T>): _.List<T>;
-    /**
-     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
-     * and invoked with three arguments:
-     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
-     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
-     *
-     * @alias _.each
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     */
-    <T1 extends object>(collection: T1): T1;
-    /**
-     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
-     * and invoked with three arguments:
-     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
-     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
-     *
-     * @alias _.each
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     */
-    <TArray extends T[] | null | undefined>(collection: TArray & (T[] | null | undefined)): TArray;
-    /**
-     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
-     * and invoked with three arguments:
-     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
-     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
-     *
-     * @alias _.each
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     */
-    <TList extends _.List<T> | null | undefined>(collection: TList & (_.List<T> | null | undefined)): TList;
-    /**
-     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
-     * and invoked with three arguments:
-     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
-     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
-     *
-     * @alias _.each
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     */
-    <T1 extends object>(collection: T1 | null | undefined): T1 | null | undefined;
-}
-interface ForEach2x1 {
-    /**
-     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
-     * and invoked with three arguments:
-     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
-     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
-     *
-     * @alias _.each
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     */
-    (): ForEach2x1;
-    /**
-     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
-     * and invoked with three arguments:
-     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
-     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
-     *
-     * @alias _.each
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     */
-    (collection: string): string;
-    /**
-     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
-     * and invoked with three arguments:
-     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
-     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
-     *
-     * @alias _.each
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     */
-    <TString extends string | null | undefined>(collection: TString): TString;
-}
-
-declare const each: ForEach;
+import { each } from "../fp";
 export = each;
diff --git a/types/lodash/fp/eachRight.d.ts b/types/lodash/fp/eachRight.d.ts
index 06af73ca68..5ca2934abd 100644
--- a/types/lodash/fp/eachRight.d.ts
+++ b/types/lodash/fp/eachRight.d.ts
@@ -1,225 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface ForEachRight {
-    /**
-     * This method is like _.forEach except that it iterates over elements of collection from right to left.
-     *
-     * @alias _.eachRight
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function called per iteration.
-     * @param thisArg The this binding of callback.
-     */
-    (): ForEachRight;
-    /**
-     * This method is like _.forEach except that it iterates over elements of collection from right to left.
-     *
-     * @alias _.eachRight
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function called per iteration.
-     * @param thisArg The this binding of callback.
-     */
-    <T>(iteratee: (value: T) => any): ForEachRight1x1<T>;
-    /**
-     * This method is like _.forEach except that it iterates over elements of collection from right to left.
-     *
-     * @alias _.eachRight
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function called per iteration.
-     * @param thisArg The this binding of callback.
-     */
-    <T>(iteratee: (value: T) => any, collection: ReadonlyArray<T>): T[];
-    /**
-     * This method is like _.forEach except that it iterates over elements of collection from right to left.
-     *
-     * @alias _.eachRight
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function called per iteration.
-     * @param thisArg The this binding of callback.
-     */
-    (iteratee: (value: string) => any): ForEachRight2x1;
-    /**
-     * This method is like _.forEach except that it iterates over elements of collection from right to left.
-     *
-     * @alias _.eachRight
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function called per iteration.
-     * @param thisArg The this binding of callback.
-     */
-    (iteratee: (value: string) => any, collection: string): string;
-    /**
-     * This method is like _.forEach except that it iterates over elements of collection from right to left.
-     *
-     * @alias _.eachRight
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function called per iteration.
-     * @param thisArg The this binding of callback.
-     */
-    <T>(iteratee: (value: T) => any, collection: _.List<T>): _.List<T>;
-    /**
-     * This method is like _.forEach except that it iterates over elements of collection from right to left.
-     *
-     * @alias _.eachRight
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function called per iteration.
-     * @param thisArg The this binding of callback.
-     */
-    <T extends object>(iteratee: (value: T[keyof T]) => any, collection: T): T;
-    /**
-     * This method is like _.forEach except that it iterates over elements of collection from right to left.
-     *
-     * @alias _.eachRight
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function called per iteration.
-     * @param thisArg The this binding of callback.
-     */
-    <T, TArray extends T[] | null | undefined>(iteratee: (value: T) => any, collection: TArray & (T[] | null | undefined)): TArray;
-    /**
-     * This method is like _.forEach except that it iterates over elements of collection from right to left.
-     *
-     * @alias _.eachRight
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function called per iteration.
-     * @param thisArg The this binding of callback.
-     */
-    <TString extends string | null | undefined>(iteratee: (value: string) => any, collection: TString): TString;
-    /**
-     * This method is like _.forEach except that it iterates over elements of collection from right to left.
-     *
-     * @alias _.eachRight
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function called per iteration.
-     * @param thisArg The this binding of callback.
-     */
-    <T, TList extends _.List<T> | null | undefined>(iteratee: (value: T) => any, collection: TList & (_.List<T> | null | undefined)): TList;
-    /**
-     * This method is like _.forEach except that it iterates over elements of collection from right to left.
-     *
-     * @alias _.eachRight
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function called per iteration.
-     * @param thisArg The this binding of callback.
-     */
-    <T extends object>(iteratee: (value: T[keyof T]) => any, collection: T | null | undefined): T | null | undefined;
-}
-interface ForEachRight1x1<T> {
-    /**
-     * This method is like _.forEach except that it iterates over elements of collection from right to left.
-     *
-     * @alias _.eachRight
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function called per iteration.
-     * @param thisArg The this binding of callback.
-     */
-    (): ForEachRight1x1<T>;
-    /**
-     * This method is like _.forEach except that it iterates over elements of collection from right to left.
-     *
-     * @alias _.eachRight
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function called per iteration.
-     * @param thisArg The this binding of callback.
-     */
-    (collection: ReadonlyArray<T>): T[];
-    /**
-     * This method is like _.forEach except that it iterates over elements of collection from right to left.
-     *
-     * @alias _.eachRight
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function called per iteration.
-     * @param thisArg The this binding of callback.
-     */
-    (collection: _.List<T>): _.List<T>;
-    /**
-     * This method is like _.forEach except that it iterates over elements of collection from right to left.
-     *
-     * @alias _.eachRight
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function called per iteration.
-     * @param thisArg The this binding of callback.
-     */
-    <T1 extends object>(collection: T1): T1;
-    /**
-     * This method is like _.forEach except that it iterates over elements of collection from right to left.
-     *
-     * @alias _.eachRight
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function called per iteration.
-     * @param thisArg The this binding of callback.
-     */
-    <TArray extends T[] | null | undefined>(collection: TArray & (T[] | null | undefined)): TArray;
-    /**
-     * This method is like _.forEach except that it iterates over elements of collection from right to left.
-     *
-     * @alias _.eachRight
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function called per iteration.
-     * @param thisArg The this binding of callback.
-     */
-    <TList extends _.List<T> | null | undefined>(collection: TList & (_.List<T> | null | undefined)): TList;
-    /**
-     * This method is like _.forEach except that it iterates over elements of collection from right to left.
-     *
-     * @alias _.eachRight
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function called per iteration.
-     * @param thisArg The this binding of callback.
-     */
-    <T1 extends object>(collection: T1 | null | undefined): T1 | null | undefined;
-}
-interface ForEachRight2x1 {
-    /**
-     * This method is like _.forEach except that it iterates over elements of collection from right to left.
-     *
-     * @alias _.eachRight
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function called per iteration.
-     * @param thisArg The this binding of callback.
-     */
-    (): ForEachRight2x1;
-    /**
-     * This method is like _.forEach except that it iterates over elements of collection from right to left.
-     *
-     * @alias _.eachRight
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function called per iteration.
-     * @param thisArg The this binding of callback.
-     */
-    (collection: string): string;
-    /**
-     * This method is like _.forEach except that it iterates over elements of collection from right to left.
-     *
-     * @alias _.eachRight
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function called per iteration.
-     * @param thisArg The this binding of callback.
-     */
-    <TString extends string | null | undefined>(collection: TString): TString;
-}
-
-declare const eachRight: ForEachRight;
+import { eachRight } from "../fp";
 export = eachRight;
diff --git a/types/lodash/fp/endsWith.d.ts b/types/lodash/fp/endsWith.d.ts
index 5808870c50..7e1b243d6f 100644
--- a/types/lodash/fp/endsWith.d.ts
+++ b/types/lodash/fp/endsWith.d.ts
@@ -1,56 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface EndsWith {
-    /**
-     * Checks if string ends with the given target string.
-     *
-     * @param string The string to search.
-     * @param target The string to search for.
-     * @param position The position to search from.
-     * @return Returns true if string ends with target, else false.
-     */
-    (): EndsWith;
-    /**
-     * Checks if string ends with the given target string.
-     *
-     * @param string The string to search.
-     * @param target The string to search for.
-     * @param position The position to search from.
-     * @return Returns true if string ends with target, else false.
-     */
-    (target: string): EndsWith1x1;
-    /**
-     * Checks if string ends with the given target string.
-     *
-     * @param string The string to search.
-     * @param target The string to search for.
-     * @param position The position to search from.
-     * @return Returns true if string ends with target, else false.
-     */
-    (target: string, string: string): boolean;
-}
-interface EndsWith1x1 {
-    /**
-     * Checks if string ends with the given target string.
-     *
-     * @param string The string to search.
-     * @param target The string to search for.
-     * @param position The position to search from.
-     * @return Returns true if string ends with target, else false.
-     */
-    (): EndsWith1x1;
-    /**
-     * Checks if string ends with the given target string.
-     *
-     * @param string The string to search.
-     * @param target The string to search for.
-     * @param position The position to search from.
-     * @return Returns true if string ends with target, else false.
-     */
-    (string: string): boolean;
-}
-
-declare const endsWith: EndsWith;
+import { endsWith } from "../fp";
 export = endsWith;
diff --git a/types/lodash/fp/entries.d.ts b/types/lodash/fp/entries.d.ts
index 99b04076c7..534c7bda3d 100644
--- a/types/lodash/fp/entries.d.ts
+++ b/types/lodash/fp/entries.d.ts
@@ -1,25 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface ToPairs {
-    /**
-     * Creates an array of own enumerable key-value pairs for object.
-     *
-     * @param object The object to query.
-     * @return Returns the new array of key-value pairs.
-     */
-    <T>(object: _.Dictionary<T> | _.NumericDictionary<T>): Array<[string, T]>;
-    /**
-     * Creates an array of own enumerable key-value pairs for object.
-     *
-     * @param object The object to query.
-     * @return Returns the new array of key-value pairs.
-     */
-    (object: object): Array<[string, any]>;
-}
-
-declare const entries: ToPairs;
+import { entries } from "../fp";
 export = entries;
diff --git a/types/lodash/fp/entriesIn.d.ts b/types/lodash/fp/entriesIn.d.ts
index 3579959f84..932b17f625 100644
--- a/types/lodash/fp/entriesIn.d.ts
+++ b/types/lodash/fp/entriesIn.d.ts
@@ -1,25 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface ToPairsIn {
-    /**
-     * Creates an array of own and inherited enumerable key-value pairs for object.
-     *
-     * @param object The object to query.
-     * @return Returns the new array of key-value pairs.
-     */
-    <T>(object: _.Dictionary<T> | _.NumericDictionary<T>): Array<[string, T]>;
-    /**
-     * Creates an array of own and inherited enumerable key-value pairs for object.
-     *
-     * @param object The object to query.
-     * @return Returns the new array of key-value pairs.
-     */
-    (object: object): Array<[string, any]>;
-}
-
-declare const entriesIn: ToPairsIn;
+import { entriesIn } from "../fp";
 export = entriesIn;
diff --git a/types/lodash/fp/eq.d.ts b/types/lodash/fp/eq.d.ts
index 4c3278ae3d..4778846a30 100644
--- a/types/lodash/fp/eq.d.ts
+++ b/types/lodash/fp/eq.d.ts
@@ -1,156 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface Eq {
-    /**
-     * Performs a [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-     * comparison between two values to determine if they are equivalent.
-     *
-     * @category Lang
-     * @param value The value to compare.
-     * @param other The other value to compare.
-     * @returns Returns `true` if the values are equivalent, else `false`.
-     * @example
-     *
-     * var object = { 'user': 'fred' };
-     * var other = { 'user': 'fred' };
-     *
-     * _.eq(object, object);
-     * // => true
-     *
-     * _.eq(object, other);
-     * // => false
-     *
-     * _.eq('a', 'a');
-     * // => true
-     *
-     * _.eq('a', Object('a'));
-     * // => false
-     *
-     * _.eq(NaN, NaN);
-     * // => true
-     */
-    (): Eq;
-    /**
-     * Performs a [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-     * comparison between two values to determine if they are equivalent.
-     *
-     * @category Lang
-     * @param value The value to compare.
-     * @param other The other value to compare.
-     * @returns Returns `true` if the values are equivalent, else `false`.
-     * @example
-     *
-     * var object = { 'user': 'fred' };
-     * var other = { 'user': 'fred' };
-     *
-     * _.eq(object, object);
-     * // => true
-     *
-     * _.eq(object, other);
-     * // => false
-     *
-     * _.eq('a', 'a');
-     * // => true
-     *
-     * _.eq('a', Object('a'));
-     * // => false
-     *
-     * _.eq(NaN, NaN);
-     * // => true
-     */
-    (value: any): Eq1x1;
-    /**
-     * Performs a [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-     * comparison between two values to determine if they are equivalent.
-     *
-     * @category Lang
-     * @param value The value to compare.
-     * @param other The other value to compare.
-     * @returns Returns `true` if the values are equivalent, else `false`.
-     * @example
-     *
-     * var object = { 'user': 'fred' };
-     * var other = { 'user': 'fred' };
-     *
-     * _.eq(object, object);
-     * // => true
-     *
-     * _.eq(object, other);
-     * // => false
-     *
-     * _.eq('a', 'a');
-     * // => true
-     *
-     * _.eq('a', Object('a'));
-     * // => false
-     *
-     * _.eq(NaN, NaN);
-     * // => true
-     */
-    (value: any, other: any): boolean;
-}
-interface Eq1x1 {
-    /**
-     * Performs a [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-     * comparison between two values to determine if they are equivalent.
-     *
-     * @category Lang
-     * @param value The value to compare.
-     * @param other The other value to compare.
-     * @returns Returns `true` if the values are equivalent, else `false`.
-     * @example
-     *
-     * var object = { 'user': 'fred' };
-     * var other = { 'user': 'fred' };
-     *
-     * _.eq(object, object);
-     * // => true
-     *
-     * _.eq(object, other);
-     * // => false
-     *
-     * _.eq('a', 'a');
-     * // => true
-     *
-     * _.eq('a', Object('a'));
-     * // => false
-     *
-     * _.eq(NaN, NaN);
-     * // => true
-     */
-    (): Eq1x1;
-    /**
-     * Performs a [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-     * comparison between two values to determine if they are equivalent.
-     *
-     * @category Lang
-     * @param value The value to compare.
-     * @param other The other value to compare.
-     * @returns Returns `true` if the values are equivalent, else `false`.
-     * @example
-     *
-     * var object = { 'user': 'fred' };
-     * var other = { 'user': 'fred' };
-     *
-     * _.eq(object, object);
-     * // => true
-     *
-     * _.eq(object, other);
-     * // => false
-     *
-     * _.eq('a', 'a');
-     * // => true
-     *
-     * _.eq('a', Object('a'));
-     * // => false
-     *
-     * _.eq(NaN, NaN);
-     * // => true
-     */
-    (other: any): boolean;
-}
-
-declare const eq: Eq;
+import { eq } from "../fp";
 export = eq;
diff --git a/types/lodash/fp/equals.d.ts b/types/lodash/fp/equals.d.ts
index 3e3f9b1853..18ec108d66 100644
--- a/types/lodash/fp/equals.d.ts
+++ b/types/lodash/fp/equals.d.ts
@@ -1,141 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface IsEqual {
-    /**
-     * Performs a deep comparison between two values to determine if they are
-     * equivalent.
-     *
-     * **Note:** This method supports comparing arrays, array buffers, booleans,
-     * date objects, error objects, maps, numbers, `Object` objects, regexes,
-     * sets, strings, symbols, and typed arrays. `Object` objects are compared
-     * by their own, not inherited, enumerable properties. Functions and DOM
-     * nodes are **not** supported.
-     *
-     * @category Lang
-     * @param value The value to compare.
-     * @param other The other value to compare.
-     * @returns Returns `true` if the values are equivalent, else `false`.
-     * @example
-     *
-     * var object = { 'user': 'fred' };
-     * var other = { 'user': 'fred' };
-     *
-     * _.isEqual(object, other);
-     * // => true
-     *
-     * object === other;
-     * // => false
-     */
-    (): IsEqual;
-    /**
-     * Performs a deep comparison between two values to determine if they are
-     * equivalent.
-     *
-     * **Note:** This method supports comparing arrays, array buffers, booleans,
-     * date objects, error objects, maps, numbers, `Object` objects, regexes,
-     * sets, strings, symbols, and typed arrays. `Object` objects are compared
-     * by their own, not inherited, enumerable properties. Functions and DOM
-     * nodes are **not** supported.
-     *
-     * @category Lang
-     * @param value The value to compare.
-     * @param other The other value to compare.
-     * @returns Returns `true` if the values are equivalent, else `false`.
-     * @example
-     *
-     * var object = { 'user': 'fred' };
-     * var other = { 'user': 'fred' };
-     *
-     * _.isEqual(object, other);
-     * // => true
-     *
-     * object === other;
-     * // => false
-     */
-    (value: any): IsEqual1x1;
-    /**
-     * Performs a deep comparison between two values to determine if they are
-     * equivalent.
-     *
-     * **Note:** This method supports comparing arrays, array buffers, booleans,
-     * date objects, error objects, maps, numbers, `Object` objects, regexes,
-     * sets, strings, symbols, and typed arrays. `Object` objects are compared
-     * by their own, not inherited, enumerable properties. Functions and DOM
-     * nodes are **not** supported.
-     *
-     * @category Lang
-     * @param value The value to compare.
-     * @param other The other value to compare.
-     * @returns Returns `true` if the values are equivalent, else `false`.
-     * @example
-     *
-     * var object = { 'user': 'fred' };
-     * var other = { 'user': 'fred' };
-     *
-     * _.isEqual(object, other);
-     * // => true
-     *
-     * object === other;
-     * // => false
-     */
-    (value: any, other: any): boolean;
-}
-interface IsEqual1x1 {
-    /**
-     * Performs a deep comparison between two values to determine if they are
-     * equivalent.
-     *
-     * **Note:** This method supports comparing arrays, array buffers, booleans,
-     * date objects, error objects, maps, numbers, `Object` objects, regexes,
-     * sets, strings, symbols, and typed arrays. `Object` objects are compared
-     * by their own, not inherited, enumerable properties. Functions and DOM
-     * nodes are **not** supported.
-     *
-     * @category Lang
-     * @param value The value to compare.
-     * @param other The other value to compare.
-     * @returns Returns `true` if the values are equivalent, else `false`.
-     * @example
-     *
-     * var object = { 'user': 'fred' };
-     * var other = { 'user': 'fred' };
-     *
-     * _.isEqual(object, other);
-     * // => true
-     *
-     * object === other;
-     * // => false
-     */
-    (): IsEqual1x1;
-    /**
-     * Performs a deep comparison between two values to determine if they are
-     * equivalent.
-     *
-     * **Note:** This method supports comparing arrays, array buffers, booleans,
-     * date objects, error objects, maps, numbers, `Object` objects, regexes,
-     * sets, strings, symbols, and typed arrays. `Object` objects are compared
-     * by their own, not inherited, enumerable properties. Functions and DOM
-     * nodes are **not** supported.
-     *
-     * @category Lang
-     * @param value The value to compare.
-     * @param other The other value to compare.
-     * @returns Returns `true` if the values are equivalent, else `false`.
-     * @example
-     *
-     * var object = { 'user': 'fred' };
-     * var other = { 'user': 'fred' };
-     *
-     * _.isEqual(object, other);
-     * // => true
-     *
-     * object === other;
-     * // => false
-     */
-    (other: any): boolean;
-}
-
-declare const equals: IsEqual;
+import { equals } from "../fp";
 export = equals;
diff --git a/types/lodash/fp/escape.d.ts b/types/lodash/fp/escape.d.ts
index 18f704928d..36e7e87556 100644
--- a/types/lodash/fp/escape.d.ts
+++ b/types/lodash/fp/escape.d.ts
@@ -1,26 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type Escape =
-    /**
-     * Converts the characters "&", "<", ">", '"', "'", and "`" in string to their corresponding HTML entities.
-     *
-     * Note: No other characters are escaped. To escape additional characters use a third-party library like he.
-     *
-     * hough the ">" character is escaped for symmetry, characters like ">" and "/" don’t need escaping in HTML
-     * and have no special meaning unless they're part of a tag or unquoted attribute value. See Mathias Bynens’s
-     * article (under "semi-related fun fact") for more details.
-     *
-     * Backticks are escaped because in IE < 9, they can break out of attribute values or HTML comments. See #59,
-     * #102, #108, and #133 of the HTML5 Security Cheatsheet for more details.
-     *
-     * When working with HTML you should always quote attribute values to reduce XSS vectors.
-     *
-     * @param string The string to escape.
-     * @return Returns the escaped string.
-     */
-    (string: string) => string;
-
-declare const escape: Escape;
+import { escape } from "../fp";
 export = escape;
diff --git a/types/lodash/fp/escapeRegExp.d.ts b/types/lodash/fp/escapeRegExp.d.ts
index f66fa150c8..6adc20e806 100644
--- a/types/lodash/fp/escapeRegExp.d.ts
+++ b/types/lodash/fp/escapeRegExp.d.ts
@@ -1,16 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type EscapeRegExp =
-    /**
-     * Escapes the RegExp special characters "^", "$", "\", ".", "*", "+", "?", "(", ")", "[", "]",
-     * "{", "}", and "|" in string.
-     *
-     * @param string The string to escape.
-     * @return Returns the escaped string.
-     */
-    (string: string) => string;
-
-declare const escapeRegExp: EscapeRegExp;
+import { escapeRegExp } from "../fp";
 export = escapeRegExp;
diff --git a/types/lodash/fp/every.d.ts b/types/lodash/fp/every.d.ts
index fc60615c96..7fbeaf7b15 100644
--- a/types/lodash/fp/every.d.ts
+++ b/types/lodash/fp/every.d.ts
@@ -1,67 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Every {
-    /**
-     * Checks if predicate returns truthy for all elements of collection. Iteration is stopped once predicate
-     * returns falsey. The predicate is invoked with three arguments: (value, index|key, collection).
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @return Returns true if all elements pass the predicate check, else false.
-     */
-    (): Every;
-    /**
-     * Checks if predicate returns truthy for all elements of collection. Iteration is stopped once predicate
-     * returns falsey. The predicate is invoked with three arguments: (value, index|key, collection).
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @return Returns true if all elements pass the predicate check, else false.
-     */
-    <T>(predicate: _.ValueIterateeCustom<T, boolean>): Every1x1<T>;
-    /**
-     * Checks if predicate returns truthy for all elements of collection. Iteration is stopped once predicate
-     * returns falsey. The predicate is invoked with three arguments: (value, index|key, collection).
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @return Returns true if all elements pass the predicate check, else false.
-     */
-    <T>(predicate: _.ValueIterateeCustom<T, boolean>, collection: _.List<T> | null | undefined): boolean;
-    /**
-     * Checks if predicate returns truthy for all elements of collection. Iteration is stopped once predicate
-     * returns falsey. The predicate is invoked with three arguments: (value, index|key, collection).
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @return Returns true if all elements pass the predicate check, else false.
-     */
-    <T extends object>(predicate: _.ValueIterateeCustom<T[keyof T], boolean>, collection: T | null | undefined): boolean;
-}
-interface Every1x1<T> {
-    /**
-     * Checks if predicate returns truthy for all elements of collection. Iteration is stopped once predicate
-     * returns falsey. The predicate is invoked with three arguments: (value, index|key, collection).
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @return Returns true if all elements pass the predicate check, else false.
-     */
-    (): Every1x1<T>;
-    /**
-     * Checks if predicate returns truthy for all elements of collection. Iteration is stopped once predicate
-     * returns falsey. The predicate is invoked with three arguments: (value, index|key, collection).
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @return Returns true if all elements pass the predicate check, else false.
-     */
-    (collection: _.List<T> | object | null | undefined): boolean;
-}
-
-declare const every: Every;
+import { every } from "../fp";
 export = every;
diff --git a/types/lodash/fp/extend.d.ts b/types/lodash/fp/extend.d.ts
index ee0889f8ae..cbe294ee0b 100644
--- a/types/lodash/fp/extend.d.ts
+++ b/types/lodash/fp/extend.d.ts
@@ -1,151 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface AssignIn {
-    /**
-     * This method is like `_.assign` except that it iterates over own and
-     * inherited source properties.
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @alias extend
-     * @category Object
-     * @param object The destination object.
-     * @param [sources] The source objects.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function Foo() {
-     *   this.b = 2;
-     * }
-     *
-     * function Bar() {
-     *   this.d = 4;
-     * }
-     *
-     * Foo.prototype.c = 3;
-     * Bar.prototype.e = 5;
-     *
-     * _.assignIn({ 'a': 1 }, new Foo, new Bar);
-     * // => { 'a': 1, 'b': 2, 'c': 3, 'd': 4, 'e': 5 }
-     */
-    (): AssignIn;
-    /**
-     * This method is like `_.assign` except that it iterates over own and
-     * inherited source properties.
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @alias extend
-     * @category Object
-     * @param object The destination object.
-     * @param [sources] The source objects.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function Foo() {
-     *   this.b = 2;
-     * }
-     *
-     * function Bar() {
-     *   this.d = 4;
-     * }
-     *
-     * Foo.prototype.c = 3;
-     * Bar.prototype.e = 5;
-     *
-     * _.assignIn({ 'a': 1 }, new Foo, new Bar);
-     * // => { 'a': 1, 'b': 2, 'c': 3, 'd': 4, 'e': 5 }
-     */
-    <TObject>(object: TObject): AssignIn1x1<TObject>;
-    /**
-     * This method is like `_.assign` except that it iterates over own and
-     * inherited source properties.
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @alias extend
-     * @category Object
-     * @param object The destination object.
-     * @param [sources] The source objects.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function Foo() {
-     *   this.b = 2;
-     * }
-     *
-     * function Bar() {
-     *   this.d = 4;
-     * }
-     *
-     * Foo.prototype.c = 3;
-     * Bar.prototype.e = 5;
-     *
-     * _.assignIn({ 'a': 1 }, new Foo, new Bar);
-     * // => { 'a': 1, 'b': 2, 'c': 3, 'd': 4, 'e': 5 }
-     */
-    <TObject, TSource>(object: TObject, source: TSource): TObject & TSource;
-}
-interface AssignIn1x1<TObject> {
-    /**
-     * This method is like `_.assign` except that it iterates over own and
-     * inherited source properties.
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @alias extend
-     * @category Object
-     * @param object The destination object.
-     * @param [sources] The source objects.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function Foo() {
-     *   this.b = 2;
-     * }
-     *
-     * function Bar() {
-     *   this.d = 4;
-     * }
-     *
-     * Foo.prototype.c = 3;
-     * Bar.prototype.e = 5;
-     *
-     * _.assignIn({ 'a': 1 }, new Foo, new Bar);
-     * // => { 'a': 1, 'b': 2, 'c': 3, 'd': 4, 'e': 5 }
-     */
-    (): AssignIn1x1<TObject>;
-    /**
-     * This method is like `_.assign` except that it iterates over own and
-     * inherited source properties.
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @alias extend
-     * @category Object
-     * @param object The destination object.
-     * @param [sources] The source objects.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function Foo() {
-     *   this.b = 2;
-     * }
-     *
-     * function Bar() {
-     *   this.d = 4;
-     * }
-     *
-     * Foo.prototype.c = 3;
-     * Bar.prototype.e = 5;
-     *
-     * _.assignIn({ 'a': 1 }, new Foo, new Bar);
-     * // => { 'a': 1, 'b': 2, 'c': 3, 'd': 4, 'e': 5 }
-     */
-    <TSource>(source: TSource): TObject & TSource;
-}
-
-declare const extend: AssignIn;
+import { extend } from "../fp";
 export = extend;
diff --git a/types/lodash/fp/extendAll.d.ts b/types/lodash/fp/extendAll.d.ts
index a8168d774d..92cb3d6e0c 100644
--- a/types/lodash/fp/extendAll.d.ts
+++ b/types/lodash/fp/extendAll.d.ts
@@ -1,36 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type AssignIn =
-    /**
-     * This method is like `_.assign` except that it iterates over own and
-     * inherited source properties.
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @alias extend
-     * @category Object
-     * @param object The destination object.
-     * @param [sources] The source objects.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function Foo() {
-     *   this.b = 2;
-     * }
-     *
-     * function Bar() {
-     *   this.d = 4;
-     * }
-     *
-     * Foo.prototype.c = 3;
-     * Bar.prototype.e = 5;
-     *
-     * _.assignIn({ 'a': 1 }, new Foo, new Bar);
-     * // => { 'a': 1, 'b': 2, 'c': 3, 'd': 4, 'e': 5 }
-     */
-    <TResult>(object: ReadonlyArray<any>) => TResult;
-
-declare const extendAll: AssignIn;
+import { extendAll } from "../fp";
 export = extendAll;
diff --git a/types/lodash/fp/extendAllWith.d.ts b/types/lodash/fp/extendAllWith.d.ts
index 6e2d7602d3..712d1d8eea 100644
--- a/types/lodash/fp/extendAllWith.d.ts
+++ b/types/lodash/fp/extendAllWith.d.ts
@@ -1,143 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface AssignInWith {
-    /**
-     * This method is like `_.assignIn` except that it accepts `customizer` which
-     * is invoked to produce the assigned values. If `customizer` returns `undefined`
-     * assignment is handled by the method instead. The `customizer` is invoked
-     * with five arguments: (objValue, srcValue, key, object, source).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @alias extendWith
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   return _.isUndefined(objValue) ? srcValue : objValue;
-     * }
-     *
-     * var defaults = _.partialRight(_.assignInWith, customizer);
-     *
-     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
-     * // => { 'a': 1, 'b': 2 }
-     */
-    (): AssignInWith;
-    /**
-     * This method is like `_.assignIn` except that it accepts `customizer` which
-     * is invoked to produce the assigned values. If `customizer` returns `undefined`
-     * assignment is handled by the method instead. The `customizer` is invoked
-     * with five arguments: (objValue, srcValue, key, object, source).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @alias extendWith
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   return _.isUndefined(objValue) ? srcValue : objValue;
-     * }
-     *
-     * var defaults = _.partialRight(_.assignInWith, customizer);
-     *
-     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
-     * // => { 'a': 1, 'b': 2 }
-     */
-    (customizer: _.AssignCustomizer): AssignInWith1x1;
-    /**
-     * This method is like `_.assignIn` except that it accepts `customizer` which
-     * is invoked to produce the assigned values. If `customizer` returns `undefined`
-     * assignment is handled by the method instead. The `customizer` is invoked
-     * with five arguments: (objValue, srcValue, key, object, source).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @alias extendWith
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   return _.isUndefined(objValue) ? srcValue : objValue;
-     * }
-     *
-     * var defaults = _.partialRight(_.assignInWith, customizer);
-     *
-     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
-     * // => { 'a': 1, 'b': 2 }
-     */
-    (customizer: _.AssignCustomizer, args: ReadonlyArray<any>): any;
-}
-interface AssignInWith1x1 {
-    /**
-     * This method is like `_.assignIn` except that it accepts `customizer` which
-     * is invoked to produce the assigned values. If `customizer` returns `undefined`
-     * assignment is handled by the method instead. The `customizer` is invoked
-     * with five arguments: (objValue, srcValue, key, object, source).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @alias extendWith
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   return _.isUndefined(objValue) ? srcValue : objValue;
-     * }
-     *
-     * var defaults = _.partialRight(_.assignInWith, customizer);
-     *
-     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
-     * // => { 'a': 1, 'b': 2 }
-     */
-    (): AssignInWith1x1;
-    /**
-     * This method is like `_.assignIn` except that it accepts `customizer` which
-     * is invoked to produce the assigned values. If `customizer` returns `undefined`
-     * assignment is handled by the method instead. The `customizer` is invoked
-     * with five arguments: (objValue, srcValue, key, object, source).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @alias extendWith
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   return _.isUndefined(objValue) ? srcValue : objValue;
-     * }
-     *
-     * var defaults = _.partialRight(_.assignInWith, customizer);
-     *
-     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
-     * // => { 'a': 1, 'b': 2 }
-     */
-    (args: ReadonlyArray<any>): any;
-}
-
-declare const extendAllWith: AssignInWith;
+import { extendAllWith } from "../fp";
 export = extendAllWith;
diff --git a/types/lodash/fp/extendWith.d.ts b/types/lodash/fp/extendWith.d.ts
index 39b50e9ebf..9681360bbf 100644
--- a/types/lodash/fp/extendWith.d.ts
+++ b/types/lodash/fp/extendWith.d.ts
@@ -1,249 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface AssignInWith {
-    /**
-     * This method is like `_.assignIn` except that it accepts `customizer` which
-     * is invoked to produce the assigned values. If `customizer` returns `undefined`
-     * assignment is handled by the method instead. The `customizer` is invoked
-     * with five arguments: (objValue, srcValue, key, object, source).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @alias extendWith
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   return _.isUndefined(objValue) ? srcValue : objValue;
-     * }
-     *
-     * var defaults = _.partialRight(_.assignInWith, customizer);
-     *
-     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
-     * // => { 'a': 1, 'b': 2 }
-     */
-    (): AssignInWith;
-    /**
-     * This method is like `_.assignIn` except that it accepts `customizer` which
-     * is invoked to produce the assigned values. If `customizer` returns `undefined`
-     * assignment is handled by the method instead. The `customizer` is invoked
-     * with five arguments: (objValue, srcValue, key, object, source).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @alias extendWith
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   return _.isUndefined(objValue) ? srcValue : objValue;
-     * }
-     *
-     * var defaults = _.partialRight(_.assignInWith, customizer);
-     *
-     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
-     * // => { 'a': 1, 'b': 2 }
-     */
-    (customizer: _.AssignCustomizer): AssignInWith1x1;
-    /**
-     * This method is like `_.assignIn` except that it accepts `customizer` which
-     * is invoked to produce the assigned values. If `customizer` returns `undefined`
-     * assignment is handled by the method instead. The `customizer` is invoked
-     * with five arguments: (objValue, srcValue, key, object, source).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @alias extendWith
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   return _.isUndefined(objValue) ? srcValue : objValue;
-     * }
-     *
-     * var defaults = _.partialRight(_.assignInWith, customizer);
-     *
-     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
-     * // => { 'a': 1, 'b': 2 }
-     */
-    <TObject>(customizer: _.AssignCustomizer, object: TObject): AssignInWith1x2<TObject>;
-    /**
-     * This method is like `_.assignIn` except that it accepts `customizer` which
-     * is invoked to produce the assigned values. If `customizer` returns `undefined`
-     * assignment is handled by the method instead. The `customizer` is invoked
-     * with five arguments: (objValue, srcValue, key, object, source).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @alias extendWith
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   return _.isUndefined(objValue) ? srcValue : objValue;
-     * }
-     *
-     * var defaults = _.partialRight(_.assignInWith, customizer);
-     *
-     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
-     * // => { 'a': 1, 'b': 2 }
-     */
-    <TObject, TSource>(customizer: _.AssignCustomizer, object: TObject, source: TSource): TObject & TSource;
-}
-interface AssignInWith1x1 {
-    /**
-     * This method is like `_.assignIn` except that it accepts `customizer` which
-     * is invoked to produce the assigned values. If `customizer` returns `undefined`
-     * assignment is handled by the method instead. The `customizer` is invoked
-     * with five arguments: (objValue, srcValue, key, object, source).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @alias extendWith
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   return _.isUndefined(objValue) ? srcValue : objValue;
-     * }
-     *
-     * var defaults = _.partialRight(_.assignInWith, customizer);
-     *
-     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
-     * // => { 'a': 1, 'b': 2 }
-     */
-    (): AssignInWith1x1;
-    /**
-     * This method is like `_.assignIn` except that it accepts `customizer` which
-     * is invoked to produce the assigned values. If `customizer` returns `undefined`
-     * assignment is handled by the method instead. The `customizer` is invoked
-     * with five arguments: (objValue, srcValue, key, object, source).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @alias extendWith
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   return _.isUndefined(objValue) ? srcValue : objValue;
-     * }
-     *
-     * var defaults = _.partialRight(_.assignInWith, customizer);
-     *
-     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
-     * // => { 'a': 1, 'b': 2 }
-     */
-    <TObject>(object: TObject): AssignInWith1x2<TObject>;
-    /**
-     * This method is like `_.assignIn` except that it accepts `customizer` which
-     * is invoked to produce the assigned values. If `customizer` returns `undefined`
-     * assignment is handled by the method instead. The `customizer` is invoked
-     * with five arguments: (objValue, srcValue, key, object, source).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @alias extendWith
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   return _.isUndefined(objValue) ? srcValue : objValue;
-     * }
-     *
-     * var defaults = _.partialRight(_.assignInWith, customizer);
-     *
-     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
-     * // => { 'a': 1, 'b': 2 }
-     */
-    <TObject, TSource>(object: TObject, source: TSource): TObject & TSource;
-}
-interface AssignInWith1x2<TObject> {
-    /**
-     * This method is like `_.assignIn` except that it accepts `customizer` which
-     * is invoked to produce the assigned values. If `customizer` returns `undefined`
-     * assignment is handled by the method instead. The `customizer` is invoked
-     * with five arguments: (objValue, srcValue, key, object, source).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @alias extendWith
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   return _.isUndefined(objValue) ? srcValue : objValue;
-     * }
-     *
-     * var defaults = _.partialRight(_.assignInWith, customizer);
-     *
-     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
-     * // => { 'a': 1, 'b': 2 }
-     */
-    (): AssignInWith1x2<TObject>;
-    /**
-     * This method is like `_.assignIn` except that it accepts `customizer` which
-     * is invoked to produce the assigned values. If `customizer` returns `undefined`
-     * assignment is handled by the method instead. The `customizer` is invoked
-     * with five arguments: (objValue, srcValue, key, object, source).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @alias extendWith
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   return _.isUndefined(objValue) ? srcValue : objValue;
-     * }
-     *
-     * var defaults = _.partialRight(_.assignInWith, customizer);
-     *
-     * defaults({ 'a': 1 }, { 'b': 2 }, { 'a': 3 });
-     * // => { 'a': 1, 'b': 2 }
-     */
-    <TSource>(source: TSource): TObject & TSource;
-}
-
-declare const extendWith: AssignInWith;
+import { extendWith } from "../fp";
 export = extendWith;
diff --git a/types/lodash/fp/fill.d.ts b/types/lodash/fp/fill.d.ts
index 5349e8e067..577801504d 100644
--- a/types/lodash/fp/fill.d.ts
+++ b/types/lodash/fp/fill.d.ts
@@ -1,233 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Fill {
-    /**
-     * Fills elements of array with value from start up to, but not including, end.
-     *
-     * Note: This method mutates array.
-     *
-     * @param array The array to fill.
-     * @param value The value to fill array with.
-     * @param start The start position.
-     * @param end The end position.
-     * @return Returns array.
-     */
-    (): Fill;
-    /**
-     * Fills elements of array with value from start up to, but not including, end.
-     *
-     * Note: This method mutates array.
-     *
-     * @param array The array to fill.
-     * @param value The value to fill array with.
-     * @param start The start position.
-     * @param end The end position.
-     * @return Returns array.
-     */
-    (start: number): Fill1x1;
-    /**
-     * Fills elements of array with value from start up to, but not including, end.
-     *
-     * Note: This method mutates array.
-     *
-     * @param array The array to fill.
-     * @param value The value to fill array with.
-     * @param start The start position.
-     * @param end The end position.
-     * @return Returns array.
-     */
-    (start: number, end: number): Fill1x2;
-    /**
-     * Fills elements of array with value from start up to, but not including, end.
-     *
-     * Note: This method mutates array.
-     *
-     * @param array The array to fill.
-     * @param value The value to fill array with.
-     * @param start The start position.
-     * @param end The end position.
-     * @return Returns array.
-     */
-    <T>(start: number, end: number, value: T): Fill1x3<T>;
-    /**
-     * Fills elements of array with value from start up to, but not including, end.
-     *
-     * Note: This method mutates array.
-     *
-     * @param array The array to fill.
-     * @param value The value to fill array with.
-     * @param start The start position.
-     * @param end The end position.
-     * @return Returns array.
-     */
-    <T, U>(start: number, end: number, value: T, array: U[] | null | undefined): Array<T | U>;
-    /**
-     * Fills elements of array with value from start up to, but not including, end.
-     *
-     * Note: This method mutates array.
-     *
-     * @param array The array to fill.
-     * @param value The value to fill array with.
-     * @param start The start position.
-     * @param end The end position.
-     * @return Returns array.
-     */
-    <T, U>(start: number, end: number, value: T, array: _.List<U> | null | undefined): _.List<T | U>;
-}
-interface Fill1x1 {
-    /**
-     * Fills elements of array with value from start up to, but not including, end.
-     *
-     * Note: This method mutates array.
-     *
-     * @param array The array to fill.
-     * @param value The value to fill array with.
-     * @param start The start position.
-     * @param end The end position.
-     * @return Returns array.
-     */
-    (): Fill1x1;
-    /**
-     * Fills elements of array with value from start up to, but not including, end.
-     *
-     * Note: This method mutates array.
-     *
-     * @param array The array to fill.
-     * @param value The value to fill array with.
-     * @param start The start position.
-     * @param end The end position.
-     * @return Returns array.
-     */
-    (end: number): Fill1x2;
-    /**
-     * Fills elements of array with value from start up to, but not including, end.
-     *
-     * Note: This method mutates array.
-     *
-     * @param array The array to fill.
-     * @param value The value to fill array with.
-     * @param start The start position.
-     * @param end The end position.
-     * @return Returns array.
-     */
-    <T>(end: number, value: T): Fill1x3<T>;
-    /**
-     * Fills elements of array with value from start up to, but not including, end.
-     *
-     * Note: This method mutates array.
-     *
-     * @param array The array to fill.
-     * @param value The value to fill array with.
-     * @param start The start position.
-     * @param end The end position.
-     * @return Returns array.
-     */
-    <T, U>(end: number, value: T, array: U[] | null | undefined): Array<T | U>;
-    /**
-     * Fills elements of array with value from start up to, but not including, end.
-     *
-     * Note: This method mutates array.
-     *
-     * @param array The array to fill.
-     * @param value The value to fill array with.
-     * @param start The start position.
-     * @param end The end position.
-     * @return Returns array.
-     */
-    <T, U>(end: number, value: T, array: _.List<U> | null | undefined): _.List<T | U>;
-}
-interface Fill1x2 {
-    /**
-     * Fills elements of array with value from start up to, but not including, end.
-     *
-     * Note: This method mutates array.
-     *
-     * @param array The array to fill.
-     * @param value The value to fill array with.
-     * @param start The start position.
-     * @param end The end position.
-     * @return Returns array.
-     */
-    (): Fill1x2;
-    /**
-     * Fills elements of array with value from start up to, but not including, end.
-     *
-     * Note: This method mutates array.
-     *
-     * @param array The array to fill.
-     * @param value The value to fill array with.
-     * @param start The start position.
-     * @param end The end position.
-     * @return Returns array.
-     */
-    <T>(value: T): Fill1x3<T>;
-    /**
-     * Fills elements of array with value from start up to, but not including, end.
-     *
-     * Note: This method mutates array.
-     *
-     * @param array The array to fill.
-     * @param value The value to fill array with.
-     * @param start The start position.
-     * @param end The end position.
-     * @return Returns array.
-     */
-    <T, U>(value: T, array: U[] | null | undefined): Array<T | U>;
-    /**
-     * Fills elements of array with value from start up to, but not including, end.
-     *
-     * Note: This method mutates array.
-     *
-     * @param array The array to fill.
-     * @param value The value to fill array with.
-     * @param start The start position.
-     * @param end The end position.
-     * @return Returns array.
-     */
-    <T, U>(value: T, array: _.List<U> | null | undefined): _.List<T | U>;
-}
-interface Fill1x3<T> {
-    /**
-     * Fills elements of array with value from start up to, but not including, end.
-     *
-     * Note: This method mutates array.
-     *
-     * @param array The array to fill.
-     * @param value The value to fill array with.
-     * @param start The start position.
-     * @param end The end position.
-     * @return Returns array.
-     */
-    (): Fill1x3<T>;
-    /**
-     * Fills elements of array with value from start up to, but not including, end.
-     *
-     * Note: This method mutates array.
-     *
-     * @param array The array to fill.
-     * @param value The value to fill array with.
-     * @param start The start position.
-     * @param end The end position.
-     * @return Returns array.
-     */
-    <U>(array: U[] | null | undefined): Array<T | U>;
-    /**
-     * Fills elements of array with value from start up to, but not including, end.
-     *
-     * Note: This method mutates array.
-     *
-     * @param array The array to fill.
-     * @param value The value to fill array with.
-     * @param start The start position.
-     * @param end The end position.
-     * @return Returns array.
-     */
-    <U>(array: _.List<U> | null | undefined): _.List<T | U>;
-}
-
-declare const fill: Fill;
+import { fill } from "../fp";
 export = fill;
diff --git a/types/lodash/fp/filter.d.ts b/types/lodash/fp/filter.d.ts
index 289c0edcd5..8619741343 100644
--- a/types/lodash/fp/filter.d.ts
+++ b/types/lodash/fp/filter.d.ts
@@ -1,361 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Filter {
-    /**
-     * Iterates over elements of collection, returning an array of all elements predicate returns truthy for. The
-     * predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the new filtered array.
-     */
-    (): Filter;
-    /**
-     * Iterates over elements of collection, returning an array of all elements predicate returns truthy for. The
-     * predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the new filtered array.
-     */
-    (predicate: (value: string) => boolean): Filter1x1;
-    /**
-     * Iterates over elements of collection, returning an array of all elements predicate returns truthy for. The
-     * predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the new filtered array.
-     */
-    (predicate: (value: string) => boolean, collection: string | null | undefined): string[];
-    /**
-     * Iterates over elements of collection, returning an array of all elements predicate returns truthy for. The
-     * predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the new filtered array.
-     */
-    <T, S extends T>(predicate: _.ValueIteratorTypeGuard<T, S>): Filter2x1<T, S>;
-    /**
-     * Iterates over elements of collection, returning an array of all elements predicate returns truthy for. The
-     * predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the new filtered array.
-     */
-    <T, S extends T>(predicate: _.ValueIteratorTypeGuard<T, S>, collection: _.List<T> | null | undefined): S[];
-    /**
-     * Iterates over elements of collection, returning an array of all elements predicate returns truthy for. The
-     * predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the new filtered array.
-     */
-    <T>(predicate: _.ValueIterateeCustom<T, boolean>): Filter3x1<T>;
-    /**
-     * Iterates over elements of collection, returning an array of all elements predicate returns truthy for. The
-     * predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the new filtered array.
-     */
-    <T>(predicate: _.ValueIterateeCustom<T, boolean>, collection: _.List<T> | null | undefined): T[];
-    /**
-     * Iterates over elements of collection, returning an array of all elements predicate returns truthy for. The
-     * predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the new filtered array.
-     */
-    <T extends object, S extends T[keyof T]>(predicate: _.ValueIteratorTypeGuard<T[keyof T], S>): Filter4x1<T, S>;
-    /**
-     * Iterates over elements of collection, returning an array of all elements predicate returns truthy for. The
-     * predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the new filtered array.
-     */
-    <T extends object, S extends T[keyof T]>(predicate: _.ValueIteratorTypeGuard<T[keyof T], S>, collection: T | null | undefined): S[];
-    /**
-     * Iterates over elements of collection, returning an array of all elements predicate returns truthy for. The
-     * predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the new filtered array.
-     */
-    <T extends object>(predicate: _.ValueIterateeCustom<T[keyof T], boolean>, collection: T | null | undefined): Array<T[keyof T]>;
-}
-interface Filter1x1 {
-    /**
-     * Iterates over elements of collection, returning an array of all elements predicate returns truthy for. The
-     * predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the new filtered array.
-     */
-    (): Filter1x1;
-    /**
-     * Iterates over elements of collection, returning an array of all elements predicate returns truthy for. The
-     * predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the new filtered array.
-     */
-    (collection: string | null | undefined): string[];
-}
-interface Filter2x1<T, S extends T> {
-    /**
-     * Iterates over elements of collection, returning an array of all elements predicate returns truthy for. The
-     * predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the new filtered array.
-     */
-    (): Filter2x1<T, S>;
-    /**
-     * Iterates over elements of collection, returning an array of all elements predicate returns truthy for. The
-     * predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the new filtered array.
-     */
-    (collection: _.List<T> | null | undefined): S[];
-}
-interface Filter3x1<T> {
-    /**
-     * Iterates over elements of collection, returning an array of all elements predicate returns truthy for. The
-     * predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the new filtered array.
-     */
-    (): Filter3x1<T>;
-    /**
-     * Iterates over elements of collection, returning an array of all elements predicate returns truthy for. The
-     * predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the new filtered array.
-     */
-    (collection: _.List<T> | object | null | undefined): T[];
-}
-interface Filter4x1<T extends object, S extends T[keyof T]> {
-    /**
-     * Iterates over elements of collection, returning an array of all elements predicate returns truthy for. The
-     * predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the new filtered array.
-     */
-    (): Filter4x1<T, S>;
-    /**
-     * Iterates over elements of collection, returning an array of all elements predicate returns truthy for. The
-     * predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the new filtered array.
-     */
-    (collection: T | null | undefined): S[];
-}
-
-declare const filter: Filter;
+import { filter } from "../fp";
 export = filter;
diff --git a/types/lodash/fp/find.d.ts b/types/lodash/fp/find.d.ts
index d562ef3894..06418fb456 100644
--- a/types/lodash/fp/find.d.ts
+++ b/types/lodash/fp/find.d.ts
@@ -1,283 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Find {
-    /**
-     * Iterates over elements of collection, returning the first element predicate returns truthy for.
-     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to search.
-     * @param predicate The function invoked per iteration.
-     * @param fromIndex The index to search from.
-     * @return Returns the matched element, else undefined.
-     */
-    (): Find;
-    /**
-     * Iterates over elements of collection, returning the first element predicate returns truthy for.
-     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to search.
-     * @param predicate The function invoked per iteration.
-     * @param fromIndex The index to search from.
-     * @return Returns the matched element, else undefined.
-     */
-    <T, S extends T>(predicate: _.ValueIteratorTypeGuard<T, S>): Find1x1<T, S>;
-    /**
-     * Iterates over elements of collection, returning the first element predicate returns truthy for.
-     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to search.
-     * @param predicate The function invoked per iteration.
-     * @param fromIndex The index to search from.
-     * @return Returns the matched element, else undefined.
-     */
-    <T, S extends T>(predicate: _.ValueIteratorTypeGuard<T, S>, collection: _.List<T> | null | undefined): S|undefined;
-    /**
-     * Iterates over elements of collection, returning the first element predicate returns truthy for.
-     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to search.
-     * @param predicate The function invoked per iteration.
-     * @param fromIndex The index to search from.
-     * @return Returns the matched element, else undefined.
-     */
-    <T>(predicate: _.ValueIterateeCustom<T, boolean>): Find2x1<T>;
-    /**
-     * Iterates over elements of collection, returning the first element predicate returns truthy for.
-     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to search.
-     * @param predicate The function invoked per iteration.
-     * @param fromIndex The index to search from.
-     * @return Returns the matched element, else undefined.
-     */
-    <T>(predicate: _.ValueIterateeCustom<T, boolean>, collection: _.List<T> | null | undefined): T|undefined;
-    /**
-     * Iterates over elements of collection, returning the first element predicate returns truthy for.
-     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to search.
-     * @param predicate The function invoked per iteration.
-     * @param fromIndex The index to search from.
-     * @return Returns the matched element, else undefined.
-     */
-    <T extends object, S extends T[keyof T]>(predicate: _.ValueIteratorTypeGuard<T[keyof T], S>): Find3x1<T, S>;
-    /**
-     * Iterates over elements of collection, returning the first element predicate returns truthy for.
-     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to search.
-     * @param predicate The function invoked per iteration.
-     * @param fromIndex The index to search from.
-     * @return Returns the matched element, else undefined.
-     */
-    <T extends object, S extends T[keyof T]>(predicate: _.ValueIteratorTypeGuard<T[keyof T], S>, collection: T | null | undefined): S|undefined;
-    /**
-     * Iterates over elements of collection, returning the first element predicate returns truthy for.
-     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to search.
-     * @param predicate The function invoked per iteration.
-     * @param fromIndex The index to search from.
-     * @return Returns the matched element, else undefined.
-     */
-    <T extends object>(predicate: _.ValueIterateeCustom<T[keyof T], boolean>, collection: T | null | undefined): T[keyof T]|undefined;
-}
-interface Find1x1<T, S extends T> {
-    /**
-     * Iterates over elements of collection, returning the first element predicate returns truthy for.
-     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to search.
-     * @param predicate The function invoked per iteration.
-     * @param fromIndex The index to search from.
-     * @return Returns the matched element, else undefined.
-     */
-    (): Find1x1<T, S>;
-    /**
-     * Iterates over elements of collection, returning the first element predicate returns truthy for.
-     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to search.
-     * @param predicate The function invoked per iteration.
-     * @param fromIndex The index to search from.
-     * @return Returns the matched element, else undefined.
-     */
-    (collection: _.List<T> | null | undefined): S|undefined;
-}
-interface Find2x1<T> {
-    /**
-     * Iterates over elements of collection, returning the first element predicate returns truthy for.
-     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to search.
-     * @param predicate The function invoked per iteration.
-     * @param fromIndex The index to search from.
-     * @return Returns the matched element, else undefined.
-     */
-    (): Find2x1<T>;
-    /**
-     * Iterates over elements of collection, returning the first element predicate returns truthy for.
-     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to search.
-     * @param predicate The function invoked per iteration.
-     * @param fromIndex The index to search from.
-     * @return Returns the matched element, else undefined.
-     */
-    (collection: _.List<T> | object | null | undefined): T|undefined;
-}
-interface Find3x1<T extends object, S extends T[keyof T]> {
-    /**
-     * Iterates over elements of collection, returning the first element predicate returns truthy for.
-     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to search.
-     * @param predicate The function invoked per iteration.
-     * @param fromIndex The index to search from.
-     * @return Returns the matched element, else undefined.
-     */
-    (): Find3x1<T, S>;
-    /**
-     * Iterates over elements of collection, returning the first element predicate returns truthy for.
-     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to search.
-     * @param predicate The function invoked per iteration.
-     * @param fromIndex The index to search from.
-     * @return Returns the matched element, else undefined.
-     */
-    (collection: T | null | undefined): S|undefined;
-}
-
-declare const find: Find;
+import { find } from "../fp";
 export = find;
diff --git a/types/lodash/fp/findFrom.d.ts b/types/lodash/fp/findFrom.d.ts
index c2c83b5644..64275d0c83 100644
--- a/types/lodash/fp/findFrom.d.ts
+++ b/types/lodash/fp/findFrom.d.ts
@@ -1,517 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Find {
-    /**
-     * Iterates over elements of collection, returning the first element predicate returns truthy for.
-     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to search.
-     * @param predicate The function invoked per iteration.
-     * @param fromIndex The index to search from.
-     * @return Returns the matched element, else undefined.
-     */
-    (): Find;
-    /**
-     * Iterates over elements of collection, returning the first element predicate returns truthy for.
-     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to search.
-     * @param predicate The function invoked per iteration.
-     * @param fromIndex The index to search from.
-     * @return Returns the matched element, else undefined.
-     */
-    <T, S extends T>(predicate: _.ValueIteratorTypeGuard<T, S>): Find1x1<T, S>;
-    /**
-     * Iterates over elements of collection, returning the first element predicate returns truthy for.
-     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to search.
-     * @param predicate The function invoked per iteration.
-     * @param fromIndex The index to search from.
-     * @return Returns the matched element, else undefined.
-     */
-    <T, S extends T>(predicate: _.ValueIteratorTypeGuard<T, S>, fromIndex: number): Find1x2<T, S>;
-    /**
-     * Iterates over elements of collection, returning the first element predicate returns truthy for.
-     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to search.
-     * @param predicate The function invoked per iteration.
-     * @param fromIndex The index to search from.
-     * @return Returns the matched element, else undefined.
-     */
-    <T, S extends T>(predicate: _.ValueIteratorTypeGuard<T, S>, fromIndex: number, collection: _.List<T> | null | undefined): S|undefined;
-    /**
-     * Iterates over elements of collection, returning the first element predicate returns truthy for.
-     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to search.
-     * @param predicate The function invoked per iteration.
-     * @param fromIndex The index to search from.
-     * @return Returns the matched element, else undefined.
-     */
-    <T>(predicate: _.ValueIterateeCustom<T, boolean>): Find2x1<T>;
-    /**
-     * Iterates over elements of collection, returning the first element predicate returns truthy for.
-     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to search.
-     * @param predicate The function invoked per iteration.
-     * @param fromIndex The index to search from.
-     * @return Returns the matched element, else undefined.
-     */
-    <T>(predicate: _.ValueIterateeCustom<T, boolean>, fromIndex: number): Find2x2<T>;
-    /**
-     * Iterates over elements of collection, returning the first element predicate returns truthy for.
-     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to search.
-     * @param predicate The function invoked per iteration.
-     * @param fromIndex The index to search from.
-     * @return Returns the matched element, else undefined.
-     */
-    <T>(predicate: _.ValueIterateeCustom<T, boolean>, fromIndex: number, collection: _.List<T> | null | undefined): T|undefined;
-    /**
-     * Iterates over elements of collection, returning the first element predicate returns truthy for.
-     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to search.
-     * @param predicate The function invoked per iteration.
-     * @param fromIndex The index to search from.
-     * @return Returns the matched element, else undefined.
-     */
-    <T extends object, S extends T[keyof T]>(predicate: _.ValueIteratorTypeGuard<T[keyof T], S>): Find3x1<T, S>;
-    /**
-     * Iterates over elements of collection, returning the first element predicate returns truthy for.
-     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to search.
-     * @param predicate The function invoked per iteration.
-     * @param fromIndex The index to search from.
-     * @return Returns the matched element, else undefined.
-     */
-    <T extends object, S extends T[keyof T]>(predicate: _.ValueIteratorTypeGuard<T[keyof T], S>, fromIndex: number): Find3x2<T, S>;
-    /**
-     * Iterates over elements of collection, returning the first element predicate returns truthy for.
-     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to search.
-     * @param predicate The function invoked per iteration.
-     * @param fromIndex The index to search from.
-     * @return Returns the matched element, else undefined.
-     */
-    <T extends object, S extends T[keyof T]>(predicate: _.ValueIteratorTypeGuard<T[keyof T], S>, fromIndex: number, collection: T | null | undefined): S|undefined;
-    /**
-     * Iterates over elements of collection, returning the first element predicate returns truthy for.
-     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to search.
-     * @param predicate The function invoked per iteration.
-     * @param fromIndex The index to search from.
-     * @return Returns the matched element, else undefined.
-     */
-    <T extends object>(predicate: _.ValueIterateeCustom<T[keyof T], boolean>, fromIndex: number, collection: T | null | undefined): T[keyof T]|undefined;
-}
-interface Find1x1<T, S extends T> {
-    /**
-     * Iterates over elements of collection, returning the first element predicate returns truthy for.
-     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to search.
-     * @param predicate The function invoked per iteration.
-     * @param fromIndex The index to search from.
-     * @return Returns the matched element, else undefined.
-     */
-    (): Find1x1<T, S>;
-    /**
-     * Iterates over elements of collection, returning the first element predicate returns truthy for.
-     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to search.
-     * @param predicate The function invoked per iteration.
-     * @param fromIndex The index to search from.
-     * @return Returns the matched element, else undefined.
-     */
-    (fromIndex: number): Find1x2<T, S>;
-    /**
-     * Iterates over elements of collection, returning the first element predicate returns truthy for.
-     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to search.
-     * @param predicate The function invoked per iteration.
-     * @param fromIndex The index to search from.
-     * @return Returns the matched element, else undefined.
-     */
-    (fromIndex: number, collection: _.List<T> | null | undefined): S|undefined;
-}
-interface Find1x2<T, S extends T> {
-    /**
-     * Iterates over elements of collection, returning the first element predicate returns truthy for.
-     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to search.
-     * @param predicate The function invoked per iteration.
-     * @param fromIndex The index to search from.
-     * @return Returns the matched element, else undefined.
-     */
-    (): Find1x2<T, S>;
-    /**
-     * Iterates over elements of collection, returning the first element predicate returns truthy for.
-     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to search.
-     * @param predicate The function invoked per iteration.
-     * @param fromIndex The index to search from.
-     * @return Returns the matched element, else undefined.
-     */
-    (collection: _.List<T> | null | undefined): S|undefined;
-}
-interface Find2x1<T> {
-    /**
-     * Iterates over elements of collection, returning the first element predicate returns truthy for.
-     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to search.
-     * @param predicate The function invoked per iteration.
-     * @param fromIndex The index to search from.
-     * @return Returns the matched element, else undefined.
-     */
-    (): Find2x1<T>;
-    /**
-     * Iterates over elements of collection, returning the first element predicate returns truthy for.
-     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to search.
-     * @param predicate The function invoked per iteration.
-     * @param fromIndex The index to search from.
-     * @return Returns the matched element, else undefined.
-     */
-    (fromIndex: number): Find2x2<T>;
-    /**
-     * Iterates over elements of collection, returning the first element predicate returns truthy for.
-     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to search.
-     * @param predicate The function invoked per iteration.
-     * @param fromIndex The index to search from.
-     * @return Returns the matched element, else undefined.
-     */
-    (fromIndex: number, collection: _.List<T> | object | null | undefined): T|undefined;
-}
-interface Find2x2<T> {
-    /**
-     * Iterates over elements of collection, returning the first element predicate returns truthy for.
-     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to search.
-     * @param predicate The function invoked per iteration.
-     * @param fromIndex The index to search from.
-     * @return Returns the matched element, else undefined.
-     */
-    (): Find2x2<T>;
-    /**
-     * Iterates over elements of collection, returning the first element predicate returns truthy for.
-     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to search.
-     * @param predicate The function invoked per iteration.
-     * @param fromIndex The index to search from.
-     * @return Returns the matched element, else undefined.
-     */
-    (collection: _.List<T> | object | null | undefined): T|undefined;
-}
-interface Find3x1<T extends object, S extends T[keyof T]> {
-    /**
-     * Iterates over elements of collection, returning the first element predicate returns truthy for.
-     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to search.
-     * @param predicate The function invoked per iteration.
-     * @param fromIndex The index to search from.
-     * @return Returns the matched element, else undefined.
-     */
-    (): Find3x1<T, S>;
-    /**
-     * Iterates over elements of collection, returning the first element predicate returns truthy for.
-     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to search.
-     * @param predicate The function invoked per iteration.
-     * @param fromIndex The index to search from.
-     * @return Returns the matched element, else undefined.
-     */
-    (fromIndex: number): Find3x2<T, S>;
-    /**
-     * Iterates over elements of collection, returning the first element predicate returns truthy for.
-     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to search.
-     * @param predicate The function invoked per iteration.
-     * @param fromIndex The index to search from.
-     * @return Returns the matched element, else undefined.
-     */
-    (fromIndex: number, collection: T | null | undefined): S|undefined;
-}
-interface Find3x2<T extends object, S extends T[keyof T]> {
-    /**
-     * Iterates over elements of collection, returning the first element predicate returns truthy for.
-     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to search.
-     * @param predicate The function invoked per iteration.
-     * @param fromIndex The index to search from.
-     * @return Returns the matched element, else undefined.
-     */
-    (): Find3x2<T, S>;
-    /**
-     * Iterates over elements of collection, returning the first element predicate returns truthy for.
-     * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to search.
-     * @param predicate The function invoked per iteration.
-     * @param fromIndex The index to search from.
-     * @return Returns the matched element, else undefined.
-     */
-    (collection: T | null | undefined): S|undefined;
-}
-
-declare const findFrom: Find;
+import { findFrom } from "../fp";
 export = findFrom;
diff --git a/types/lodash/fp/findIndex.d.ts b/types/lodash/fp/findIndex.d.ts
index 18842b2513..77d1f7b6be 100644
--- a/types/lodash/fp/findIndex.d.ts
+++ b/types/lodash/fp/findIndex.d.ts
@@ -1,108 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface FindIndex {
-    /**
-     * This method is like _.find except that it returns the index of the first element predicate returns truthy
-     * for instead of the element itself.
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @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;
-    /**
-     * This method is like _.find except that it returns the index of the first element predicate returns truthy
-     * for instead of the element itself.
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @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.
-     */
-    <T>(predicate: _.ValueIterateeCustom<T, boolean>): FindIndex1x1<T>;
-    /**
-     * This method is like _.find except that it returns the index of the first element predicate returns truthy
-     * for instead of the element itself.
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @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.
-     */
-    <T>(predicate: _.ValueIterateeCustom<T, boolean>, array: _.List<T> | null | undefined): number;
-}
-interface FindIndex1x1<T> {
-    /**
-     * This method is like _.find except that it returns the index of the first element predicate returns truthy
-     * for instead of the element itself.
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @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.
-     */
-    (): FindIndex1x1<T>;
-    /**
-     * This method is like _.find except that it returns the index of the first element predicate returns truthy
-     * for instead of the element itself.
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @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.
-     */
-    (array: _.List<T> | null | undefined): number;
-}
-
-declare const findIndex: FindIndex;
+import { findIndex } from "../fp";
 export = findIndex;
diff --git a/types/lodash/fp/findIndexFrom.d.ts b/types/lodash/fp/findIndexFrom.d.ts
index fbc5f7bac1..22330adc53 100644
--- a/types/lodash/fp/findIndexFrom.d.ts
+++ b/types/lodash/fp/findIndexFrom.d.ts
@@ -1,186 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface FindIndex {
-    /**
-     * This method is like _.find except that it returns the index of the first element predicate returns truthy
-     * for instead of the element itself.
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @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;
-    /**
-     * This method is like _.find except that it returns the index of the first element predicate returns truthy
-     * for instead of the element itself.
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @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.
-     */
-    <T>(predicate: _.ValueIterateeCustom<T, boolean>): FindIndex1x1<T>;
-    /**
-     * This method is like _.find except that it returns the index of the first element predicate returns truthy
-     * for instead of the element itself.
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @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.
-     */
-    <T>(predicate: _.ValueIterateeCustom<T, boolean>, fromIndex: number): FindIndex1x2<T>;
-    /**
-     * This method is like _.find except that it returns the index of the first element predicate returns truthy
-     * for instead of the element itself.
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @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.
-     */
-    <T>(predicate: _.ValueIterateeCustom<T, boolean>, fromIndex: number, array: _.List<T> | null | undefined): number;
-}
-interface FindIndex1x1<T> {
-    /**
-     * This method is like _.find except that it returns the index of the first element predicate returns truthy
-     * for instead of the element itself.
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @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.
-     */
-    (): FindIndex1x1<T>;
-    /**
-     * This method is like _.find except that it returns the index of the first element predicate returns truthy
-     * for instead of the element itself.
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @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.
-     */
-    (fromIndex: number): FindIndex1x2<T>;
-    /**
-     * This method is like _.find except that it returns the index of the first element predicate returns truthy
-     * for instead of the element itself.
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @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.
-     */
-    (fromIndex: number, array: _.List<T> | null | undefined): number;
-}
-interface FindIndex1x2<T> {
-    /**
-     * This method is like _.find except that it returns the index of the first element predicate returns truthy
-     * for instead of the element itself.
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @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.
-     */
-    (): FindIndex1x2<T>;
-    /**
-     * This method is like _.find except that it returns the index of the first element predicate returns truthy
-     * for instead of the element itself.
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @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.
-     */
-    (array: _.List<T> | null | undefined): number;
-}
-
-declare const findIndexFrom: FindIndex;
+import { findIndexFrom } from "../fp";
 export = findIndexFrom;
diff --git a/types/lodash/fp/findKey.d.ts b/types/lodash/fp/findKey.d.ts
index a776272bc0..c5a225a776 100644
--- a/types/lodash/fp/findKey.d.ts
+++ b/types/lodash/fp/findKey.d.ts
@@ -1,108 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface FindKey {
-    /**
-     * This method is like _.find except that it returns the key of the first element predicate returns truthy for
-     * instead of the element itself.
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param object The object to search.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the key of the matched element, else undefined.
-     */
-    (): FindKey;
-    /**
-     * This method is like _.find except that it returns the key of the first element predicate returns truthy for
-     * instead of the element itself.
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param object The object to search.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the key of the matched element, else undefined.
-     */
-    <T>(predicate: _.ValueIteratee<T>): FindKey1x1<T>;
-    /**
-     * This method is like _.find except that it returns the key of the first element predicate returns truthy for
-     * instead of the element itself.
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param object The object to search.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the key of the matched element, else undefined.
-     */
-    <T>(predicate: _.ValueIteratee<T[keyof T]>, object: T | null | undefined): string | undefined;
-}
-interface FindKey1x1<T> {
-    /**
-     * This method is like _.find except that it returns the key of the first element predicate returns truthy for
-     * instead of the element itself.
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param object The object to search.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the key of the matched element, else undefined.
-     */
-    (): FindKey1x1<T>;
-    /**
-     * This method is like _.find except that it returns the key of the first element predicate returns truthy for
-     * instead of the element itself.
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param object The object to search.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the key of the matched element, else undefined.
-     */
-    (object: object | null | undefined): string | undefined;
-}
-
-declare const findKey: FindKey;
+import { findKey } from "../fp";
 export = findKey;
diff --git a/types/lodash/fp/findLast.d.ts b/types/lodash/fp/findLast.d.ts
index fb8c822bdf..b400c946b0 100644
--- a/types/lodash/fp/findLast.d.ts
+++ b/types/lodash/fp/findLast.d.ts
@@ -1,143 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface FindLast {
-    /**
-     * This method is like _.find except that it iterates over elements of a collection from
-     * right to left.
-     * @param collection Searches for a value in this list.
-     * @param predicate The function called per iteration.
-     * @param fromIndex The index to search from.
-     * @return The found element, else undefined.
-     */
-    (): FindLast;
-    /**
-     * This method is like _.find except that it iterates over elements of a collection from
-     * right to left.
-     * @param collection Searches for a value in this list.
-     * @param predicate The function called per iteration.
-     * @param fromIndex The index to search from.
-     * @return The found element, else undefined.
-     */
-    <T, S extends T>(predicate: _.ValueIteratorTypeGuard<T, S>): FindLast1x1<T, S>;
-    /**
-     * This method is like _.find except that it iterates over elements of a collection from
-     * right to left.
-     * @param collection Searches for a value in this list.
-     * @param predicate The function called per iteration.
-     * @param fromIndex The index to search from.
-     * @return The found element, else undefined.
-     */
-    <T, S extends T>(predicate: _.ValueIteratorTypeGuard<T, S>, collection: _.List<T> | null | undefined): S|undefined;
-    /**
-     * This method is like _.find except that it iterates over elements of a collection from
-     * right to left.
-     * @param collection Searches for a value in this list.
-     * @param predicate The function called per iteration.
-     * @param fromIndex The index to search from.
-     * @return The found element, else undefined.
-     */
-    <T>(predicate: _.ValueIterateeCustom<T, boolean>): FindLast2x1<T>;
-    /**
-     * This method is like _.find except that it iterates over elements of a collection from
-     * right to left.
-     * @param collection Searches for a value in this list.
-     * @param predicate The function called per iteration.
-     * @param fromIndex The index to search from.
-     * @return The found element, else undefined.
-     */
-    <T>(predicate: _.ValueIterateeCustom<T, boolean>, collection: _.List<T> | null | undefined): T|undefined;
-    /**
-     * This method is like _.find except that it iterates over elements of a collection from
-     * right to left.
-     * @param collection Searches for a value in this list.
-     * @param predicate The function called per iteration.
-     * @param fromIndex The index to search from.
-     * @return The found element, else undefined.
-     */
-    <T extends object, S extends T[keyof T]>(predicate: _.ValueIteratorTypeGuard<T[keyof T], S>): FindLast3x1<T, S>;
-    /**
-     * This method is like _.find except that it iterates over elements of a collection from
-     * right to left.
-     * @param collection Searches for a value in this list.
-     * @param predicate The function called per iteration.
-     * @param fromIndex The index to search from.
-     * @return The found element, else undefined.
-     */
-    <T extends object, S extends T[keyof T]>(predicate: _.ValueIteratorTypeGuard<T[keyof T], S>, collection: T | null | undefined): S|undefined;
-    /**
-     * This method is like _.find except that it iterates over elements of a collection from
-     * right to left.
-     * @param collection Searches for a value in this list.
-     * @param predicate The function called per iteration.
-     * @param fromIndex The index to search from.
-     * @return The found element, else undefined.
-     */
-    <T extends object>(predicate: _.ValueIterateeCustom<T[keyof T], boolean>, collection: T | null | undefined): T[keyof T]|undefined;
-}
-interface FindLast1x1<T, S extends T> {
-    /**
-     * This method is like _.find except that it iterates over elements of a collection from
-     * right to left.
-     * @param collection Searches for a value in this list.
-     * @param predicate The function called per iteration.
-     * @param fromIndex The index to search from.
-     * @return The found element, else undefined.
-     */
-    (): FindLast1x1<T, S>;
-    /**
-     * This method is like _.find except that it iterates over elements of a collection from
-     * right to left.
-     * @param collection Searches for a value in this list.
-     * @param predicate The function called per iteration.
-     * @param fromIndex The index to search from.
-     * @return The found element, else undefined.
-     */
-    (collection: _.List<T> | null | undefined): S|undefined;
-}
-interface FindLast2x1<T> {
-    /**
-     * This method is like _.find except that it iterates over elements of a collection from
-     * right to left.
-     * @param collection Searches for a value in this list.
-     * @param predicate The function called per iteration.
-     * @param fromIndex The index to search from.
-     * @return The found element, else undefined.
-     */
-    (): FindLast2x1<T>;
-    /**
-     * This method is like _.find except that it iterates over elements of a collection from
-     * right to left.
-     * @param collection Searches for a value in this list.
-     * @param predicate The function called per iteration.
-     * @param fromIndex The index to search from.
-     * @return The found element, else undefined.
-     */
-    (collection: _.List<T> | object | null | undefined): T|undefined;
-}
-interface FindLast3x1<T extends object, S extends T[keyof T]> {
-    /**
-     * This method is like _.find except that it iterates over elements of a collection from
-     * right to left.
-     * @param collection Searches for a value in this list.
-     * @param predicate The function called per iteration.
-     * @param fromIndex The index to search from.
-     * @return The found element, else undefined.
-     */
-    (): FindLast3x1<T, S>;
-    /**
-     * This method is like _.find except that it iterates over elements of a collection from
-     * right to left.
-     * @param collection Searches for a value in this list.
-     * @param predicate The function called per iteration.
-     * @param fromIndex The index to search from.
-     * @return The found element, else undefined.
-     */
-    (collection: T | null | undefined): S|undefined;
-}
-
-declare const findLast: FindLast;
+import { findLast } from "../fp";
 export = findLast;
diff --git a/types/lodash/fp/findLastFrom.d.ts b/types/lodash/fp/findLastFrom.d.ts
index bd6bed3043..1f034dfa88 100644
--- a/types/lodash/fp/findLastFrom.d.ts
+++ b/types/lodash/fp/findLastFrom.d.ts
@@ -1,257 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface FindLast {
-    /**
-     * This method is like _.find except that it iterates over elements of a collection from
-     * right to left.
-     * @param collection Searches for a value in this list.
-     * @param predicate The function called per iteration.
-     * @param fromIndex The index to search from.
-     * @return The found element, else undefined.
-     */
-    (): FindLast;
-    /**
-     * This method is like _.find except that it iterates over elements of a collection from
-     * right to left.
-     * @param collection Searches for a value in this list.
-     * @param predicate The function called per iteration.
-     * @param fromIndex The index to search from.
-     * @return The found element, else undefined.
-     */
-    <T, S extends T>(predicate: _.ValueIteratorTypeGuard<T, S>): FindLast1x1<T, S>;
-    /**
-     * This method is like _.find except that it iterates over elements of a collection from
-     * right to left.
-     * @param collection Searches for a value in this list.
-     * @param predicate The function called per iteration.
-     * @param fromIndex The index to search from.
-     * @return The found element, else undefined.
-     */
-    <T, S extends T>(predicate: _.ValueIteratorTypeGuard<T, S>, fromIndex: number): FindLast1x2<T, S>;
-    /**
-     * This method is like _.find except that it iterates over elements of a collection from
-     * right to left.
-     * @param collection Searches for a value in this list.
-     * @param predicate The function called per iteration.
-     * @param fromIndex The index to search from.
-     * @return The found element, else undefined.
-     */
-    <T, S extends T>(predicate: _.ValueIteratorTypeGuard<T, S>, fromIndex: number, collection: _.List<T> | null | undefined): S|undefined;
-    /**
-     * This method is like _.find except that it iterates over elements of a collection from
-     * right to left.
-     * @param collection Searches for a value in this list.
-     * @param predicate The function called per iteration.
-     * @param fromIndex The index to search from.
-     * @return The found element, else undefined.
-     */
-    <T>(predicate: _.ValueIterateeCustom<T, boolean>): FindLast2x1<T>;
-    /**
-     * This method is like _.find except that it iterates over elements of a collection from
-     * right to left.
-     * @param collection Searches for a value in this list.
-     * @param predicate The function called per iteration.
-     * @param fromIndex The index to search from.
-     * @return The found element, else undefined.
-     */
-    <T>(predicate: _.ValueIterateeCustom<T, boolean>, fromIndex: number): FindLast2x2<T>;
-    /**
-     * This method is like _.find except that it iterates over elements of a collection from
-     * right to left.
-     * @param collection Searches for a value in this list.
-     * @param predicate The function called per iteration.
-     * @param fromIndex The index to search from.
-     * @return The found element, else undefined.
-     */
-    <T>(predicate: _.ValueIterateeCustom<T, boolean>, fromIndex: number, collection: _.List<T> | null | undefined): T|undefined;
-    /**
-     * This method is like _.find except that it iterates over elements of a collection from
-     * right to left.
-     * @param collection Searches for a value in this list.
-     * @param predicate The function called per iteration.
-     * @param fromIndex The index to search from.
-     * @return The found element, else undefined.
-     */
-    <T extends object, S extends T[keyof T]>(predicate: _.ValueIteratorTypeGuard<T[keyof T], S>): FindLast3x1<T, S>;
-    /**
-     * This method is like _.find except that it iterates over elements of a collection from
-     * right to left.
-     * @param collection Searches for a value in this list.
-     * @param predicate The function called per iteration.
-     * @param fromIndex The index to search from.
-     * @return The found element, else undefined.
-     */
-    <T extends object, S extends T[keyof T]>(predicate: _.ValueIteratorTypeGuard<T[keyof T], S>, fromIndex: number): FindLast3x2<T, S>;
-    /**
-     * This method is like _.find except that it iterates over elements of a collection from
-     * right to left.
-     * @param collection Searches for a value in this list.
-     * @param predicate The function called per iteration.
-     * @param fromIndex The index to search from.
-     * @return The found element, else undefined.
-     */
-    <T extends object, S extends T[keyof T]>(predicate: _.ValueIteratorTypeGuard<T[keyof T], S>, fromIndex: number, collection: T | null | undefined): S|undefined;
-    /**
-     * This method is like _.find except that it iterates over elements of a collection from
-     * right to left.
-     * @param collection Searches for a value in this list.
-     * @param predicate The function called per iteration.
-     * @param fromIndex The index to search from.
-     * @return The found element, else undefined.
-     */
-    <T extends object>(predicate: _.ValueIterateeCustom<T[keyof T], boolean>, fromIndex: number, collection: T | null | undefined): T[keyof T]|undefined;
-}
-interface FindLast1x1<T, S extends T> {
-    /**
-     * This method is like _.find except that it iterates over elements of a collection from
-     * right to left.
-     * @param collection Searches for a value in this list.
-     * @param predicate The function called per iteration.
-     * @param fromIndex The index to search from.
-     * @return The found element, else undefined.
-     */
-    (): FindLast1x1<T, S>;
-    /**
-     * This method is like _.find except that it iterates over elements of a collection from
-     * right to left.
-     * @param collection Searches for a value in this list.
-     * @param predicate The function called per iteration.
-     * @param fromIndex The index to search from.
-     * @return The found element, else undefined.
-     */
-    (fromIndex: number): FindLast1x2<T, S>;
-    /**
-     * This method is like _.find except that it iterates over elements of a collection from
-     * right to left.
-     * @param collection Searches for a value in this list.
-     * @param predicate The function called per iteration.
-     * @param fromIndex The index to search from.
-     * @return The found element, else undefined.
-     */
-    (fromIndex: number, collection: _.List<T> | null | undefined): S|undefined;
-}
-interface FindLast1x2<T, S extends T> {
-    /**
-     * This method is like _.find except that it iterates over elements of a collection from
-     * right to left.
-     * @param collection Searches for a value in this list.
-     * @param predicate The function called per iteration.
-     * @param fromIndex The index to search from.
-     * @return The found element, else undefined.
-     */
-    (): FindLast1x2<T, S>;
-    /**
-     * This method is like _.find except that it iterates over elements of a collection from
-     * right to left.
-     * @param collection Searches for a value in this list.
-     * @param predicate The function called per iteration.
-     * @param fromIndex The index to search from.
-     * @return The found element, else undefined.
-     */
-    (collection: _.List<T> | null | undefined): S|undefined;
-}
-interface FindLast2x1<T> {
-    /**
-     * This method is like _.find except that it iterates over elements of a collection from
-     * right to left.
-     * @param collection Searches for a value in this list.
-     * @param predicate The function called per iteration.
-     * @param fromIndex The index to search from.
-     * @return The found element, else undefined.
-     */
-    (): FindLast2x1<T>;
-    /**
-     * This method is like _.find except that it iterates over elements of a collection from
-     * right to left.
-     * @param collection Searches for a value in this list.
-     * @param predicate The function called per iteration.
-     * @param fromIndex The index to search from.
-     * @return The found element, else undefined.
-     */
-    (fromIndex: number): FindLast2x2<T>;
-    /**
-     * This method is like _.find except that it iterates over elements of a collection from
-     * right to left.
-     * @param collection Searches for a value in this list.
-     * @param predicate The function called per iteration.
-     * @param fromIndex The index to search from.
-     * @return The found element, else undefined.
-     */
-    (fromIndex: number, collection: _.List<T> | object | null | undefined): T|undefined;
-}
-interface FindLast2x2<T> {
-    /**
-     * This method is like _.find except that it iterates over elements of a collection from
-     * right to left.
-     * @param collection Searches for a value in this list.
-     * @param predicate The function called per iteration.
-     * @param fromIndex The index to search from.
-     * @return The found element, else undefined.
-     */
-    (): FindLast2x2<T>;
-    /**
-     * This method is like _.find except that it iterates over elements of a collection from
-     * right to left.
-     * @param collection Searches for a value in this list.
-     * @param predicate The function called per iteration.
-     * @param fromIndex The index to search from.
-     * @return The found element, else undefined.
-     */
-    (collection: _.List<T> | object | null | undefined): T|undefined;
-}
-interface FindLast3x1<T extends object, S extends T[keyof T]> {
-    /**
-     * This method is like _.find except that it iterates over elements of a collection from
-     * right to left.
-     * @param collection Searches for a value in this list.
-     * @param predicate The function called per iteration.
-     * @param fromIndex The index to search from.
-     * @return The found element, else undefined.
-     */
-    (): FindLast3x1<T, S>;
-    /**
-     * This method is like _.find except that it iterates over elements of a collection from
-     * right to left.
-     * @param collection Searches for a value in this list.
-     * @param predicate The function called per iteration.
-     * @param fromIndex The index to search from.
-     * @return The found element, else undefined.
-     */
-    (fromIndex: number): FindLast3x2<T, S>;
-    /**
-     * This method is like _.find except that it iterates over elements of a collection from
-     * right to left.
-     * @param collection Searches for a value in this list.
-     * @param predicate The function called per iteration.
-     * @param fromIndex The index to search from.
-     * @return The found element, else undefined.
-     */
-    (fromIndex: number, collection: T | null | undefined): S|undefined;
-}
-interface FindLast3x2<T extends object, S extends T[keyof T]> {
-    /**
-     * This method is like _.find except that it iterates over elements of a collection from
-     * right to left.
-     * @param collection Searches for a value in this list.
-     * @param predicate The function called per iteration.
-     * @param fromIndex The index to search from.
-     * @return The found element, else undefined.
-     */
-    (): FindLast3x2<T, S>;
-    /**
-     * This method is like _.find except that it iterates over elements of a collection from
-     * right to left.
-     * @param collection Searches for a value in this list.
-     * @param predicate The function called per iteration.
-     * @param fromIndex The index to search from.
-     * @return The found element, else undefined.
-     */
-    (collection: T | null | undefined): S|undefined;
-}
-
-declare const findLastFrom: FindLast;
+import { findLastFrom } from "../fp";
 export = findLastFrom;
diff --git a/types/lodash/fp/findLastIndex.d.ts b/types/lodash/fp/findLastIndex.d.ts
index 230736f814..51ee410fb1 100644
--- a/types/lodash/fp/findLastIndex.d.ts
+++ b/types/lodash/fp/findLastIndex.d.ts
@@ -1,103 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface FindLastIndex {
-    /**
-     * This method is like _.findIndex except that it iterates over elements of collection from right to left.
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @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;
-    /**
-     * This method is like _.findIndex except that it iterates over elements of collection from right to left.
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @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.
-     */
-    <T>(predicate: _.ValueIterateeCustom<T, boolean>): FindLastIndex1x1<T>;
-    /**
-     * This method is like _.findIndex except that it iterates over elements of collection from right to left.
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @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.
-     */
-    <T>(predicate: _.ValueIterateeCustom<T, boolean>, array: _.List<T> | null | undefined): number;
-}
-interface FindLastIndex1x1<T> {
-    /**
-     * This method is like _.findIndex except that it iterates over elements of collection from right to left.
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @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.
-     */
-    (): FindLastIndex1x1<T>;
-    /**
-     * This method is like _.findIndex except that it iterates over elements of collection from right to left.
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @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.
-     */
-    (array: _.List<T> | null | undefined): number;
-}
-
-declare const findLastIndex: FindLastIndex;
+import { findLastIndex } from "../fp";
 export = findLastIndex;
diff --git a/types/lodash/fp/findLastIndexFrom.d.ts b/types/lodash/fp/findLastIndexFrom.d.ts
index df28dc685e..08bd53a087 100644
--- a/types/lodash/fp/findLastIndexFrom.d.ts
+++ b/types/lodash/fp/findLastIndexFrom.d.ts
@@ -1,177 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface FindLastIndex {
-    /**
-     * This method is like _.findIndex except that it iterates over elements of collection from right to left.
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @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;
-    /**
-     * This method is like _.findIndex except that it iterates over elements of collection from right to left.
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @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.
-     */
-    <T>(predicate: _.ValueIterateeCustom<T, boolean>): FindLastIndex1x1<T>;
-    /**
-     * This method is like _.findIndex except that it iterates over elements of collection from right to left.
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @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.
-     */
-    <T>(predicate: _.ValueIterateeCustom<T, boolean>, fromIndex: number): FindLastIndex1x2<T>;
-    /**
-     * This method is like _.findIndex except that it iterates over elements of collection from right to left.
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @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.
-     */
-    <T>(predicate: _.ValueIterateeCustom<T, boolean>, fromIndex: number, array: _.List<T> | null | undefined): number;
-}
-interface FindLastIndex1x1<T> {
-    /**
-     * This method is like _.findIndex except that it iterates over elements of collection from right to left.
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @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.
-     */
-    (): FindLastIndex1x1<T>;
-    /**
-     * This method is like _.findIndex except that it iterates over elements of collection from right to left.
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @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.
-     */
-    (fromIndex: number): FindLastIndex1x2<T>;
-    /**
-     * This method is like _.findIndex except that it iterates over elements of collection from right to left.
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @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.
-     */
-    (fromIndex: number, array: _.List<T> | null | undefined): number;
-}
-interface FindLastIndex1x2<T> {
-    /**
-     * This method is like _.findIndex except that it iterates over elements of collection from right to left.
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @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.
-     */
-    (): FindLastIndex1x2<T>;
-    /**
-     * This method is like _.findIndex except that it iterates over elements of collection from right to left.
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @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.
-     */
-    (array: _.List<T> | null | undefined): number;
-}
-
-declare const findLastIndexFrom: FindLastIndex;
+import { findLastIndexFrom } from "../fp";
 export = findLastIndexFrom;
diff --git a/types/lodash/fp/findLastKey.d.ts b/types/lodash/fp/findLastKey.d.ts
index 51e8d52ce1..7437a9ddda 100644
--- a/types/lodash/fp/findLastKey.d.ts
+++ b/types/lodash/fp/findLastKey.d.ts
@@ -1,103 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface FindLastKey {
-    /**
-     * This method is like _.findKey except that it iterates over elements of a collection in the opposite order.
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param object The object to search.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the key of the matched element, else undefined.
-     */
-    (): FindLastKey;
-    /**
-     * This method is like _.findKey except that it iterates over elements of a collection in the opposite order.
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param object The object to search.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the key of the matched element, else undefined.
-     */
-    <T>(predicate: _.ValueIteratee<T>): FindLastKey1x1<T>;
-    /**
-     * This method is like _.findKey except that it iterates over elements of a collection in the opposite order.
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param object The object to search.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the key of the matched element, else undefined.
-     */
-    <T>(predicate: _.ValueIteratee<T[keyof T]>, object: T | null | undefined): string | undefined;
-}
-interface FindLastKey1x1<T> {
-    /**
-     * This method is like _.findKey except that it iterates over elements of a collection in the opposite order.
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param object The object to search.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the key of the matched element, else undefined.
-     */
-    (): FindLastKey1x1<T>;
-    /**
-     * This method is like _.findKey except that it iterates over elements of a collection in the opposite order.
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param object The object to search.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the key of the matched element, else undefined.
-     */
-    (object: object | null | undefined): string | undefined;
-}
-
-declare const findLastKey: FindLastKey;
+import { findLastKey } from "../fp";
 export = findLastKey;
diff --git a/types/lodash/fp/first.d.ts b/types/lodash/fp/first.d.ts
index e93bdf4e4e..4554ad0e92 100644
--- a/types/lodash/fp/first.d.ts
+++ b/types/lodash/fp/first.d.ts
@@ -1,19 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-type Head =
-    /**
-     * Gets the first element of array.
-     *
-     * @alias _.first
-     *
-     * @param array The array to query.
-     * @return Returns the first element of array.
-     */
-    <T>(array: _.List<T> | null | undefined) => T | undefined;
-
-declare const first: Head;
+import { first } from "../fp";
 export = first;
diff --git a/types/lodash/fp/flatMap.d.ts b/types/lodash/fp/flatMap.d.ts
index a6713fe34d..eb6d80434f 100644
--- a/types/lodash/fp/flatMap.d.ts
+++ b/types/lodash/fp/flatMap.d.ts
@@ -1,189 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface FlatMap {
-    /**
-     * Creates an array of flattened values by running each element in collection through iteratee
-     * and concating its result to the other mapped values. The iteratee is invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @return Returns the new flattened array.
-     */
-    (): FlatMap;
-    /**
-     * Creates an array of flattened values by running each element in collection through iteratee
-     * and concating its result to the other mapped values. The iteratee is invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @return Returns the new flattened array.
-     */
-    <T, TResult>(iteratee: (value: T) => _.Many<TResult>): FlatMap1x1<T, TResult>;
-    /**
-     * Creates an array of flattened values by running each element in collection through iteratee
-     * and concating its result to the other mapped values. The iteratee is invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @return Returns the new flattened array.
-     */
-    <T, TResult>(iteratee: (value: T) => _.Many<TResult>, collection: _.List<T> | null | undefined): TResult[];
-    /**
-     * Creates an array of flattened values by running each element in collection through iteratee
-     * and concating its result to the other mapped values. The iteratee is invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @return Returns the new flattened array.
-     */
-    <T extends object, TResult>(iteratee: (value: T[keyof T]) => _.Many<TResult>): FlatMap2x1<T, TResult>;
-    /**
-     * Creates an array of flattened values by running each element in collection through iteratee
-     * and concating its result to the other mapped values. The iteratee is invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @return Returns the new flattened array.
-     */
-    <T extends object, TResult>(iteratee: (value: T[keyof T]) => _.Many<TResult>, collection: T | null | undefined): TResult[];
-    /**
-     * Creates an array of flattened values by running each element in collection through iteratee
-     * and concating its result to the other mapped values. The iteratee is invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @return Returns the new flattened array.
-     */
-    (iteratee: string): FlatMap3x1;
-    /**
-     * Creates an array of flattened values by running each element in collection through iteratee
-     * and concating its result to the other mapped values. The iteratee is invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @return Returns the new flattened array.
-     */
-    (iteratee: string, collection: object | null | undefined): any[];
-    /**
-     * Creates an array of flattened values by running each element in collection through iteratee
-     * and concating its result to the other mapped values. The iteratee is invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @return Returns the new flattened array.
-     */
-    (iteratee: object): FlatMap4x1;
-    /**
-     * Creates an array of flattened values by running each element in collection through iteratee
-     * and concating its result to the other mapped values. The iteratee is invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @return Returns the new flattened array.
-     */
-    (iteratee: object, collection: object | null | undefined): boolean[];
-}
-interface FlatMap1x1<T, TResult> {
-    /**
-     * Creates an array of flattened values by running each element in collection through iteratee
-     * and concating its result to the other mapped values. The iteratee is invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @return Returns the new flattened array.
-     */
-    (): FlatMap1x1<T, TResult>;
-    /**
-     * Creates an array of flattened values by running each element in collection through iteratee
-     * and concating its result to the other mapped values. The iteratee is invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @return Returns the new flattened array.
-     */
-    (collection: _.List<T> | null | undefined): TResult[];
-}
-interface FlatMap2x1<T extends object, TResult> {
-    /**
-     * Creates an array of flattened values by running each element in collection through iteratee
-     * and concating its result to the other mapped values. The iteratee is invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @return Returns the new flattened array.
-     */
-    (): FlatMap2x1<T, TResult>;
-    /**
-     * Creates an array of flattened values by running each element in collection through iteratee
-     * and concating its result to the other mapped values. The iteratee is invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @return Returns the new flattened array.
-     */
-    (collection: T | null | undefined): TResult[];
-}
-interface FlatMap3x1 {
-    /**
-     * Creates an array of flattened values by running each element in collection through iteratee
-     * and concating its result to the other mapped values. The iteratee is invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @return Returns the new flattened array.
-     */
-    (): FlatMap3x1;
-    /**
-     * Creates an array of flattened values by running each element in collection through iteratee
-     * and concating its result to the other mapped values. The iteratee is invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @return Returns the new flattened array.
-     */
-    (collection: object | null | undefined): any[];
-}
-interface FlatMap4x1 {
-    /**
-     * Creates an array of flattened values by running each element in collection through iteratee
-     * and concating its result to the other mapped values. The iteratee is invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @return Returns the new flattened array.
-     */
-    (): FlatMap4x1;
-    /**
-     * Creates an array of flattened values by running each element in collection through iteratee
-     * and concating its result to the other mapped values. The iteratee is invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @return Returns the new flattened array.
-     */
-    (collection: object | null | undefined): boolean[];
-}
-
-declare const flatMap: FlatMap;
+import { flatMap } from "../fp";
 export = flatMap;
diff --git a/types/lodash/fp/flatMapDeep.d.ts b/types/lodash/fp/flatMapDeep.d.ts
index 9dad165793..0ce4db4801 100644
--- a/types/lodash/fp/flatMapDeep.d.ts
+++ b/types/lodash/fp/flatMapDeep.d.ts
@@ -1,342 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface FlatMapDeep {
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results.
-     *
-     * @since 4.7.0
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratee=_.identity] The function invoked per iteration.
-     * @returns Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDeep([1, 2], duplicate);
-     * // => [1, 1, 2, 2]
-     */
-    (): FlatMapDeep;
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results.
-     *
-     * @since 4.7.0
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratee=_.identity] The function invoked per iteration.
-     * @returns Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDeep([1, 2], duplicate);
-     * // => [1, 1, 2, 2]
-     */
-    <T, TResult>(iteratee: (value: T) => _.ListOfRecursiveArraysOrValues<TResult> | TResult): FlatMapDeep1x1<T, TResult>;
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results.
-     *
-     * @since 4.7.0
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratee=_.identity] The function invoked per iteration.
-     * @returns Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDeep([1, 2], duplicate);
-     * // => [1, 1, 2, 2]
-     */
-    <T, TResult>(iteratee: (value: T) => _.ListOfRecursiveArraysOrValues<TResult> | TResult, collection: _.List<T> | null | undefined): TResult[];
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results.
-     *
-     * @since 4.7.0
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratee=_.identity] The function invoked per iteration.
-     * @returns Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDeep([1, 2], duplicate);
-     * // => [1, 1, 2, 2]
-     */
-    <T extends object, TResult>(iteratee: (value: T[keyof T]) => _.ListOfRecursiveArraysOrValues<TResult> | TResult): FlatMapDeep2x1<T, TResult>;
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results.
-     *
-     * @since 4.7.0
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratee=_.identity] The function invoked per iteration.
-     * @returns Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDeep([1, 2], duplicate);
-     * // => [1, 1, 2, 2]
-     */
-    <T extends object, TResult>(iteratee: (value: T[keyof T]) => _.ListOfRecursiveArraysOrValues<TResult> | TResult, collection: T | null | undefined): TResult[];
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results.
-     *
-     * @since 4.7.0
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratee=_.identity] The function invoked per iteration.
-     * @returns Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDeep([1, 2], duplicate);
-     * // => [1, 1, 2, 2]
-     */
-    (iteratee: string): FlatMapDeep3x1;
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results.
-     *
-     * @since 4.7.0
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratee=_.identity] The function invoked per iteration.
-     * @returns Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDeep([1, 2], duplicate);
-     * // => [1, 1, 2, 2]
-     */
-    (iteratee: string, collection: object | null | undefined): any[];
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results.
-     *
-     * @since 4.7.0
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratee=_.identity] The function invoked per iteration.
-     * @returns Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDeep([1, 2], duplicate);
-     * // => [1, 1, 2, 2]
-     */
-    (iteratee: object): FlatMapDeep4x1;
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results.
-     *
-     * @since 4.7.0
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratee=_.identity] The function invoked per iteration.
-     * @returns Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDeep([1, 2], duplicate);
-     * // => [1, 1, 2, 2]
-     */
-    (iteratee: object, collection: object | null | undefined): boolean[];
-}
-interface FlatMapDeep1x1<T, TResult> {
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results.
-     *
-     * @since 4.7.0
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratee=_.identity] The function invoked per iteration.
-     * @returns Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDeep([1, 2], duplicate);
-     * // => [1, 1, 2, 2]
-     */
-    (): FlatMapDeep1x1<T, TResult>;
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results.
-     *
-     * @since 4.7.0
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratee=_.identity] The function invoked per iteration.
-     * @returns Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDeep([1, 2], duplicate);
-     * // => [1, 1, 2, 2]
-     */
-    (collection: _.List<T> | null | undefined): TResult[];
-}
-interface FlatMapDeep2x1<T extends object, TResult> {
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results.
-     *
-     * @since 4.7.0
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratee=_.identity] The function invoked per iteration.
-     * @returns Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDeep([1, 2], duplicate);
-     * // => [1, 1, 2, 2]
-     */
-    (): FlatMapDeep2x1<T, TResult>;
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results.
-     *
-     * @since 4.7.0
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratee=_.identity] The function invoked per iteration.
-     * @returns Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDeep([1, 2], duplicate);
-     * // => [1, 1, 2, 2]
-     */
-    (collection: T | null | undefined): TResult[];
-}
-interface FlatMapDeep3x1 {
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results.
-     *
-     * @since 4.7.0
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratee=_.identity] The function invoked per iteration.
-     * @returns Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDeep([1, 2], duplicate);
-     * // => [1, 1, 2, 2]
-     */
-    (): FlatMapDeep3x1;
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results.
-     *
-     * @since 4.7.0
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratee=_.identity] The function invoked per iteration.
-     * @returns Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDeep([1, 2], duplicate);
-     * // => [1, 1, 2, 2]
-     */
-    (collection: object | null | undefined): any[];
-}
-interface FlatMapDeep4x1 {
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results.
-     *
-     * @since 4.7.0
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratee=_.identity] The function invoked per iteration.
-     * @returns Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDeep([1, 2], duplicate);
-     * // => [1, 1, 2, 2]
-     */
-    (): FlatMapDeep4x1;
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results.
-     *
-     * @since 4.7.0
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratee=_.identity] The function invoked per iteration.
-     * @returns Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDeep([1, 2], duplicate);
-     * // => [1, 1, 2, 2]
-     */
-    (collection: object | null | undefined): boolean[];
-}
-
-declare const flatMapDeep: FlatMapDeep;
+import { flatMapDeep } from "../fp";
 export = flatMapDeep;
diff --git a/types/lodash/fp/flatMapDepth.d.ts b/types/lodash/fp/flatMapDepth.d.ts
index d576c2a322..b60af92cc4 100644
--- a/types/lodash/fp/flatMapDepth.d.ts
+++ b/types/lodash/fp/flatMapDepth.d.ts
@@ -1,687 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface FlatMapDepth {
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results up to `depth` times.
-     *
-     * @since 4.7.0
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratee=_.identity] The function invoked per iteration.
-     * @param [depth=1] The maximum recursion depth.
-     * @returns Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDepth([1, 2], duplicate, 2);
-     * // => [[1, 1], [2, 2]]
-     */
-    (): FlatMapDepth;
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results up to `depth` times.
-     *
-     * @since 4.7.0
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratee=_.identity] The function invoked per iteration.
-     * @param [depth=1] The maximum recursion depth.
-     * @returns Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDepth([1, 2], duplicate, 2);
-     * // => [[1, 1], [2, 2]]
-     */
-    <T, TResult>(iteratee: (value: T) => _.ListOfRecursiveArraysOrValues<TResult> | TResult): FlatMapDepth1x1<T, TResult>;
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results up to `depth` times.
-     *
-     * @since 4.7.0
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratee=_.identity] The function invoked per iteration.
-     * @param [depth=1] The maximum recursion depth.
-     * @returns Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDepth([1, 2], duplicate, 2);
-     * // => [[1, 1], [2, 2]]
-     */
-    <T, TResult>(iteratee: (value: T) => _.ListOfRecursiveArraysOrValues<TResult> | TResult, depth: number): FlatMapDepth1x2<T, TResult>;
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results up to `depth` times.
-     *
-     * @since 4.7.0
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratee=_.identity] The function invoked per iteration.
-     * @param [depth=1] The maximum recursion depth.
-     * @returns Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDepth([1, 2], duplicate, 2);
-     * // => [[1, 1], [2, 2]]
-     */
-    <T, TResult>(iteratee: (value: T) => _.ListOfRecursiveArraysOrValues<TResult> | TResult, depth: number, collection: _.List<T> | null | undefined): TResult[];
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results up to `depth` times.
-     *
-     * @since 4.7.0
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratee=_.identity] The function invoked per iteration.
-     * @param [depth=1] The maximum recursion depth.
-     * @returns Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDepth([1, 2], duplicate, 2);
-     * // => [[1, 1], [2, 2]]
-     */
-    <T extends object, TResult>(iteratee: (value: T[keyof T]) => _.ListOfRecursiveArraysOrValues<TResult> | TResult): FlatMapDepth2x1<T, TResult>;
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results up to `depth` times.
-     *
-     * @since 4.7.0
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratee=_.identity] The function invoked per iteration.
-     * @param [depth=1] The maximum recursion depth.
-     * @returns Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDepth([1, 2], duplicate, 2);
-     * // => [[1, 1], [2, 2]]
-     */
-    <T extends object, TResult>(iteratee: (value: T[keyof T]) => _.ListOfRecursiveArraysOrValues<TResult> | TResult, depth: number): FlatMapDepth2x2<T, TResult>;
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results up to `depth` times.
-     *
-     * @since 4.7.0
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratee=_.identity] The function invoked per iteration.
-     * @param [depth=1] The maximum recursion depth.
-     * @returns Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDepth([1, 2], duplicate, 2);
-     * // => [[1, 1], [2, 2]]
-     */
-    <T extends object, TResult>(iteratee: (value: T[keyof T]) => _.ListOfRecursiveArraysOrValues<TResult> | TResult, depth: number, collection: T | null | undefined): TResult[];
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results up to `depth` times.
-     *
-     * @since 4.7.0
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratee=_.identity] The function invoked per iteration.
-     * @param [depth=1] The maximum recursion depth.
-     * @returns Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDepth([1, 2], duplicate, 2);
-     * // => [[1, 1], [2, 2]]
-     */
-    (iteratee: string): FlatMapDepth3x1;
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results up to `depth` times.
-     *
-     * @since 4.7.0
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratee=_.identity] The function invoked per iteration.
-     * @param [depth=1] The maximum recursion depth.
-     * @returns Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDepth([1, 2], duplicate, 2);
-     * // => [[1, 1], [2, 2]]
-     */
-    (iteratee: string, depth: number): FlatMapDepth3x2;
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results up to `depth` times.
-     *
-     * @since 4.7.0
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratee=_.identity] The function invoked per iteration.
-     * @param [depth=1] The maximum recursion depth.
-     * @returns Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDepth([1, 2], duplicate, 2);
-     * // => [[1, 1], [2, 2]]
-     */
-    (iteratee: string, depth: number, collection: object | null | undefined): any[];
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results up to `depth` times.
-     *
-     * @since 4.7.0
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratee=_.identity] The function invoked per iteration.
-     * @param [depth=1] The maximum recursion depth.
-     * @returns Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDepth([1, 2], duplicate, 2);
-     * // => [[1, 1], [2, 2]]
-     */
-    (iteratee: object): FlatMapDepth4x1;
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results up to `depth` times.
-     *
-     * @since 4.7.0
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratee=_.identity] The function invoked per iteration.
-     * @param [depth=1] The maximum recursion depth.
-     * @returns Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDepth([1, 2], duplicate, 2);
-     * // => [[1, 1], [2, 2]]
-     */
-    (iteratee: object, depth: number): FlatMapDepth4x2;
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results up to `depth` times.
-     *
-     * @since 4.7.0
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratee=_.identity] The function invoked per iteration.
-     * @param [depth=1] The maximum recursion depth.
-     * @returns Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDepth([1, 2], duplicate, 2);
-     * // => [[1, 1], [2, 2]]
-     */
-    (iteratee: object, depth: number, collection: object | null | undefined): boolean[];
-}
-interface FlatMapDepth1x1<T, TResult> {
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results up to `depth` times.
-     *
-     * @since 4.7.0
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratee=_.identity] The function invoked per iteration.
-     * @param [depth=1] The maximum recursion depth.
-     * @returns Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDepth([1, 2], duplicate, 2);
-     * // => [[1, 1], [2, 2]]
-     */
-    (): FlatMapDepth1x1<T, TResult>;
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results up to `depth` times.
-     *
-     * @since 4.7.0
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratee=_.identity] The function invoked per iteration.
-     * @param [depth=1] The maximum recursion depth.
-     * @returns Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDepth([1, 2], duplicate, 2);
-     * // => [[1, 1], [2, 2]]
-     */
-    (depth: number): FlatMapDepth1x2<T, TResult>;
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results up to `depth` times.
-     *
-     * @since 4.7.0
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratee=_.identity] The function invoked per iteration.
-     * @param [depth=1] The maximum recursion depth.
-     * @returns Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDepth([1, 2], duplicate, 2);
-     * // => [[1, 1], [2, 2]]
-     */
-    (depth: number, collection: _.List<T> | null | undefined): TResult[];
-}
-interface FlatMapDepth1x2<T, TResult> {
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results up to `depth` times.
-     *
-     * @since 4.7.0
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratee=_.identity] The function invoked per iteration.
-     * @param [depth=1] The maximum recursion depth.
-     * @returns Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDepth([1, 2], duplicate, 2);
-     * // => [[1, 1], [2, 2]]
-     */
-    (): FlatMapDepth1x2<T, TResult>;
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results up to `depth` times.
-     *
-     * @since 4.7.0
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratee=_.identity] The function invoked per iteration.
-     * @param [depth=1] The maximum recursion depth.
-     * @returns Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDepth([1, 2], duplicate, 2);
-     * // => [[1, 1], [2, 2]]
-     */
-    (collection: _.List<T> | null | undefined): TResult[];
-}
-interface FlatMapDepth2x1<T extends object, TResult> {
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results up to `depth` times.
-     *
-     * @since 4.7.0
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratee=_.identity] The function invoked per iteration.
-     * @param [depth=1] The maximum recursion depth.
-     * @returns Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDepth([1, 2], duplicate, 2);
-     * // => [[1, 1], [2, 2]]
-     */
-    (): FlatMapDepth2x1<T, TResult>;
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results up to `depth` times.
-     *
-     * @since 4.7.0
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratee=_.identity] The function invoked per iteration.
-     * @param [depth=1] The maximum recursion depth.
-     * @returns Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDepth([1, 2], duplicate, 2);
-     * // => [[1, 1], [2, 2]]
-     */
-    (depth: number): FlatMapDepth2x2<T, TResult>;
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results up to `depth` times.
-     *
-     * @since 4.7.0
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratee=_.identity] The function invoked per iteration.
-     * @param [depth=1] The maximum recursion depth.
-     * @returns Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDepth([1, 2], duplicate, 2);
-     * // => [[1, 1], [2, 2]]
-     */
-    (depth: number, collection: T | null | undefined): TResult[];
-}
-interface FlatMapDepth2x2<T extends object, TResult> {
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results up to `depth` times.
-     *
-     * @since 4.7.0
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratee=_.identity] The function invoked per iteration.
-     * @param [depth=1] The maximum recursion depth.
-     * @returns Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDepth([1, 2], duplicate, 2);
-     * // => [[1, 1], [2, 2]]
-     */
-    (): FlatMapDepth2x2<T, TResult>;
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results up to `depth` times.
-     *
-     * @since 4.7.0
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratee=_.identity] The function invoked per iteration.
-     * @param [depth=1] The maximum recursion depth.
-     * @returns Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDepth([1, 2], duplicate, 2);
-     * // => [[1, 1], [2, 2]]
-     */
-    (collection: T | null | undefined): TResult[];
-}
-interface FlatMapDepth3x1 {
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results up to `depth` times.
-     *
-     * @since 4.7.0
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratee=_.identity] The function invoked per iteration.
-     * @param [depth=1] The maximum recursion depth.
-     * @returns Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDepth([1, 2], duplicate, 2);
-     * // => [[1, 1], [2, 2]]
-     */
-    (): FlatMapDepth3x1;
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results up to `depth` times.
-     *
-     * @since 4.7.0
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratee=_.identity] The function invoked per iteration.
-     * @param [depth=1] The maximum recursion depth.
-     * @returns Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDepth([1, 2], duplicate, 2);
-     * // => [[1, 1], [2, 2]]
-     */
-    (depth: number): FlatMapDepth3x2;
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results up to `depth` times.
-     *
-     * @since 4.7.0
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratee=_.identity] The function invoked per iteration.
-     * @param [depth=1] The maximum recursion depth.
-     * @returns Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDepth([1, 2], duplicate, 2);
-     * // => [[1, 1], [2, 2]]
-     */
-    (depth: number, collection: object | null | undefined): any[];
-}
-interface FlatMapDepth3x2 {
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results up to `depth` times.
-     *
-     * @since 4.7.0
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratee=_.identity] The function invoked per iteration.
-     * @param [depth=1] The maximum recursion depth.
-     * @returns Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDepth([1, 2], duplicate, 2);
-     * // => [[1, 1], [2, 2]]
-     */
-    (): FlatMapDepth3x2;
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results up to `depth` times.
-     *
-     * @since 4.7.0
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratee=_.identity] The function invoked per iteration.
-     * @param [depth=1] The maximum recursion depth.
-     * @returns Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDepth([1, 2], duplicate, 2);
-     * // => [[1, 1], [2, 2]]
-     */
-    (collection: object | null | undefined): any[];
-}
-interface FlatMapDepth4x1 {
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results up to `depth` times.
-     *
-     * @since 4.7.0
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratee=_.identity] The function invoked per iteration.
-     * @param [depth=1] The maximum recursion depth.
-     * @returns Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDepth([1, 2], duplicate, 2);
-     * // => [[1, 1], [2, 2]]
-     */
-    (): FlatMapDepth4x1;
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results up to `depth` times.
-     *
-     * @since 4.7.0
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratee=_.identity] The function invoked per iteration.
-     * @param [depth=1] The maximum recursion depth.
-     * @returns Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDepth([1, 2], duplicate, 2);
-     * // => [[1, 1], [2, 2]]
-     */
-    (depth: number): FlatMapDepth4x2;
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results up to `depth` times.
-     *
-     * @since 4.7.0
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratee=_.identity] The function invoked per iteration.
-     * @param [depth=1] The maximum recursion depth.
-     * @returns Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDepth([1, 2], duplicate, 2);
-     * // => [[1, 1], [2, 2]]
-     */
-    (depth: number, collection: object | null | undefined): boolean[];
-}
-interface FlatMapDepth4x2 {
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results up to `depth` times.
-     *
-     * @since 4.7.0
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratee=_.identity] The function invoked per iteration.
-     * @param [depth=1] The maximum recursion depth.
-     * @returns Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDepth([1, 2], duplicate, 2);
-     * // => [[1, 1], [2, 2]]
-     */
-    (): FlatMapDepth4x2;
-    /**
-     * This method is like `_.flatMap` except that it recursively flattens the
-     * mapped results up to `depth` times.
-     *
-     * @since 4.7.0
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratee=_.identity] The function invoked per iteration.
-     * @param [depth=1] The maximum recursion depth.
-     * @returns Returns the new flattened array.
-     * @example
-     *
-     * function duplicate(n) {
-     *   return [[[n, n]]];
-     * }
-     *
-     * _.flatMapDepth([1, 2], duplicate, 2);
-     * // => [[1, 1], [2, 2]]
-     */
-    (collection: object | null | undefined): boolean[];
-}
-
-declare const flatMapDepth: FlatMapDepth;
+import { flatMapDepth } from "../fp";
 export = flatMapDepth;
diff --git a/types/lodash/fp/flatten.d.ts b/types/lodash/fp/flatten.d.ts
index 88c928c7b0..02c051ff0b 100644
--- a/types/lodash/fp/flatten.d.ts
+++ b/types/lodash/fp/flatten.d.ts
@@ -1,17 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-type Flatten =
-    /**
-     * Flattens `array` a single level deep.
-     *
-     * @param array The array to flatten.
-     * @return Returns the new flattened array.
-     */
-    <T>(array: _.List<_.Many<T>> | null | undefined) => T[];
-
-declare const flatten: Flatten;
+import { flatten } from "../fp";
 export = flatten;
diff --git a/types/lodash/fp/flattenDeep.d.ts b/types/lodash/fp/flattenDeep.d.ts
index 4cfb955e6b..44b40e3a1f 100644
--- a/types/lodash/fp/flattenDeep.d.ts
+++ b/types/lodash/fp/flattenDeep.d.ts
@@ -1,17 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-type FlattenDeep =
-    /**
-     * Recursively flattens a nested array.
-     *
-     * @param array The array to recursively flatten.
-     * @return Returns the new flattened array.
-     */
-    <T>(array: _.ListOfRecursiveArraysOrValues<T> | null | undefined) => T[];
-
-declare const flattenDeep: FlattenDeep;
+import { flattenDeep } from "../fp";
 export = flattenDeep;
diff --git a/types/lodash/fp/flattenDepth.d.ts b/types/lodash/fp/flattenDepth.d.ts
index f5516cf82e..f046f2086a 100644
--- a/types/lodash/fp/flattenDepth.d.ts
+++ b/types/lodash/fp/flattenDepth.d.ts
@@ -1,53 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface FlattenDepth {
-    /**
-       * Recursively flatten array up to depth times.
-       *
-       * @param array The array to recursively flatten.
-       * @param number The maximum recursion depth.
-       * @return Returns the new flattened array.
-       */
-    (): FlattenDepth;
-    /**
-       * Recursively flatten array up to depth times.
-       *
-       * @param array The array to recursively flatten.
-       * @param number The maximum recursion depth.
-       * @return Returns the new flattened array.
-       */
-    (depth: number): FlattenDepth1x1;
-    /**
-       * Recursively flatten array up to depth times.
-       *
-       * @param array The array to recursively flatten.
-       * @param number The maximum recursion depth.
-       * @return Returns the new flattened array.
-       */
-    <T>(depth: number, array: _.ListOfRecursiveArraysOrValues<T> | null | undefined): T[];
-}
-interface FlattenDepth1x1 {
-    /**
-       * Recursively flatten array up to depth times.
-       *
-       * @param array The array to recursively flatten.
-       * @param number The maximum recursion depth.
-       * @return Returns the new flattened array.
-       */
-    (): FlattenDepth1x1;
-    /**
-       * Recursively flatten array up to depth times.
-       *
-       * @param array The array to recursively flatten.
-       * @param number The maximum recursion depth.
-       * @return Returns the new flattened array.
-       */
-    <T>(array: _.ListOfRecursiveArraysOrValues<T> | null | undefined): T[];
-}
-
-declare const flattenDepth: FlattenDepth;
+import { flattenDepth } from "../fp";
 export = flattenDepth;
diff --git a/types/lodash/fp/flip.d.ts b/types/lodash/fp/flip.d.ts
index db73a17b1a..e5b3b7d4f9 100644
--- a/types/lodash/fp/flip.d.ts
+++ b/types/lodash/fp/flip.d.ts
@@ -1,24 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type Flip =
-    /**
-     * Creates a function that invokes `func` with arguments reversed.
-     *
-     * @category Function
-     * @param func The function to flip arguments for.
-     * @returns Returns the new function.
-     * @example
-     *
-     * var flipped = _.flip(function() {
-     *   return _.toArray(arguments);
-     * });
-     *
-     * flipped('a', 'b', 'c', 'd');
-     * // => ['d', 'c', 'b', 'a']
-     */
-    <T extends (...args: any[]) => any>(func: T) => T;
-
-declare const flip: Flip;
+import { flip } from "../fp";
 export = flip;
diff --git a/types/lodash/fp/floor.d.ts b/types/lodash/fp/floor.d.ts
index 3275466204..167ab95438 100644
--- a/types/lodash/fp/floor.d.ts
+++ b/types/lodash/fp/floor.d.ts
@@ -1,16 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type Floor =
-    /**
-     * Calculates n rounded down to precision.
-     *
-     * @param n The number to round down.
-     * @param precision The precision to round down to.
-     * @return Returns the rounded down number.
-     */
-    (n: number) => number;
-
-declare const floor: Floor;
+import { floor } from "../fp";
 export = floor;
diff --git a/types/lodash/fp/flow.d.ts b/types/lodash/fp/flow.d.ts
index 843b0180f8..97f0fb82b2 100644
--- a/types/lodash/fp/flow.d.ts
+++ b/types/lodash/fp/flow.d.ts
@@ -1,355 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Flow {
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <R1, R2>(f1: () => R1, f2: (a: R1) => R2): () => R2;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <R1, R2, R3>(f1: () => R1, f2: (a: R1) => R2, f3: (a: R2) => R3): () => R3;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <R1, R2, R3, R4>(f1: () => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): () => R4;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <R1, R2, R3, R4, R5>(f1: () => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): () => R5;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <R1, R2, R3, R4, R5, R6>(f1: () => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): () => R6;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <R1, R2, R3, R4, R5, R6, R7>(f1: () => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): () => R7;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <R1, R2, R3, R4, R5, R6, R7>(f1: () => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<_.Many<(a: any) => any>>): () => any;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, R1, R2>(f1: (a1: A1) => R1, f2: (a: R1) => R2): (a1: A1) => R2;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, R1, R2, R3>(f1: (a1: A1) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3): (a1: A1) => R3;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, R1, R2, R3, R4>(f1: (a1: A1) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): (a1: A1) => R4;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, R1, R2, R3, R4, R5>(f1: (a1: A1) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): (a1: A1) => R5;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, R1, R2, R3, R4, R5, R6>(f1: (a1: A1) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): (a1: A1) => R6;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): (a1: A1) => R7;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<_.Many<(a: any) => any>>): (a1: A1) => any;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, R1, R2>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2): (a1: A1, a2: A2) => R2;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, R1, R2, R3>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3): (a1: A1, a2: A2) => R3;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, R1, R2, R3, R4>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): (a1: A1, a2: A2) => R4;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, R1, R2, R3, R4, R5>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): (a1: A1, a2: A2) => R5;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, R1, R2, R3, R4, R5, R6>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): (a1: A1, a2: A2) => R6;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): (a1: A1, a2: A2) => R7;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<_.Many<(a: any) => any>>): (a1: A1, a2: A2) => any;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, R1, R2>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2): (a1: A1, a2: A2, a3: A3) => R2;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, R1, R2, R3>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3): (a1: A1, a2: A2, a3: A3) => R3;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, R1, R2, R3, R4>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): (a1: A1, a2: A2, a3: A3) => R4;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, R1, R2, R3, R4, R5>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): (a1: A1, a2: A2, a3: A3) => R5;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, R1, R2, R3, R4, R5, R6>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): (a1: A1, a2: A2, a3: A3) => R6;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): (a1: A1, a2: A2, a3: A3) => R7;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<_.Many<(a: any) => any>>): (a1: A1, a2: A2, a3: A3) => any;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, A4, R1, R2>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2): (a1: A1, a2: A2, a3: A3, a4: A4) => R2;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, A4, R1, R2, R3>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3): (a1: A1, a2: A2, a3: A3, a4: A4) => R3;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, A4, R1, R2, R3, R4>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): (a1: A1, a2: A2, a3: A3, a4: A4) => R4;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, A4, R1, R2, R3, R4, R5>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): (a1: A1, a2: A2, a3: A3, a4: A4) => R5;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, A4, R1, R2, R3, R4, R5, R6>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): (a1: A1, a2: A2, a3: A3, a4: A4) => R6;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): (a1: A1, a2: A2, a3: A3, a4: A4) => R7;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<_.Many<(a: any) => any>>): (a1: A1, a2: A2, a3: A3, a4: A4) => any;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, A4, R1, R2>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R2;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, A4, R1, R2, R3>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R3;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, A4, R1, R2, R3, R4>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R4;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, A4, R1, R2, R3, R4, R5>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R5;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, A4, R1, R2, R3, R4, R5, R6>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R6;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R7;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<_.Many<(a: any) => any>>): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => any;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    (funcs: Array<_.Many<(...args: any[]) => any>>): (...args: any[]) => any;
-}
-
-declare const flow: Flow;
+import { flow } from "../fp";
 export = flow;
diff --git a/types/lodash/fp/flowRight.d.ts b/types/lodash/fp/flowRight.d.ts
index 16f5f2f031..f148feaad9 100644
--- a/types/lodash/fp/flowRight.d.ts
+++ b/types/lodash/fp/flowRight.d.ts
@@ -1,315 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface FlowRight {
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <R2, R1>(f2: (a: R1) => R2, f1: () => R1): () => R2;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <R3, R2, R1>(f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): () => R3;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <R4, R3, R2, R1>(f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): () => R4;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <R5, R4, R3, R2, R1>(f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): () => R5;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <R6, R5, R4, R3, R2, R1>(f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): () => R6;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <R7, R6, R5, R4, R3, R2, R1>(f7: (a: R6) => R7, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): () => R7;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, R2, R1>(f2: (a: R1) => R2, f1: (a1: A1) => R1): (a1: A1) => R2;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, R3, R2, R1>(f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): (a1: A1) => R3;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, R4, R3, R2, R1>(f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): (a1: A1) => R4;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, R5, R4, R3, R2, R1>(f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): (a1: A1) => R5;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, R6, R5, R4, R3, R2, R1>(f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): (a1: A1) => R6;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, R7, R6, R5, R4, R3, R2, R1>(f7: (a: R6) => R7, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1) => R1): (a1: A1) => R7;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, R2, R1>(f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): (a1: A1, a2: A2) => R2;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, R3, R2, R1>(f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): (a1: A1, a2: A2) => R3;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, R4, R3, R2, R1>(f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): (a1: A1, a2: A2) => R4;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, R5, R4, R3, R2, R1>(f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): (a1: A1, a2: A2) => R5;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, R6, R5, R4, R3, R2, R1>(f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): (a1: A1, a2: A2) => R6;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, R7, R6, R5, R4, R3, R2, R1>(f7: (a: R6) => R7, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2) => R1): (a1: A1, a2: A2) => R7;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, R2, R1>(f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): (a1: A1, a2: A2, a3: A3) => R2;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, R3, R2, R1>(f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): (a1: A1, a2: A2, a3: A3) => R3;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, R4, R3, R2, R1>(f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): (a1: A1, a2: A2, a3: A3) => R4;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, R5, R4, R3, R2, R1>(f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): (a1: A1, a2: A2, a3: A3) => R5;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, R6, R5, R4, R3, R2, R1>(f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): (a1: A1, a2: A2, a3: A3) => R6;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, R7, R6, R5, R4, R3, R2, R1>(f7: (a: R6) => R7, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3) => R1): (a1: A1, a2: A2, a3: A3) => R7;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, A4, R2, R1>(f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): (a1: A1, a2: A2, a3: A3, a4: A4) => R2;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, A4, R3, R2, R1>(f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): (a1: A1, a2: A2, a3: A3, a4: A4) => R3;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, A4, R4, R3, R2, R1>(f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): (a1: A1, a2: A2, a3: A3, a4: A4) => R4;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, A4, R5, R4, R3, R2, R1>(f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): (a1: A1, a2: A2, a3: A3, a4: A4) => R5;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, A4, R6, R5, R4, R3, R2, R1>(f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): (a1: A1, a2: A2, a3: A3, a4: A4) => R6;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, A4, R7, R6, R5, R4, R3, R2, R1>(f7: (a: R6) => R7, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1): (a1: A1, a2: A2, a3: A3, a4: A4) => R7;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <R2, R1>(f2: (a: R1) => R2, f1: (...args: any[]) => R1): (...args: any[]) => R2;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <R3, R2, R1>(f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): (...args: any[]) => R3;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <R4, R3, R2, R1>(f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): (...args: any[]) => R4;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <R5, R4, R3, R2, R1>(f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): (...args: any[]) => R5;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <R6, R5, R4, R3, R2, R1>(f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): (...args: any[]) => R6;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <R7, R6, R5, R4, R3, R2, R1>(f7: (a: R6) => R7, f6: (a: R5) => R6, f5: (a: R4) => R5, f4: (a: R3) => R4, f3: (a: R2) => R3, f2: (a: R1) => R2, f1: (...args: any[]) => R1): (...args: any[]) => R7;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    (f7: (a: any) => any, f6: (a: any) => any, f5: (a: any) => any, f4: (a: any) => any, f3: (a: any) => any, f2: (a: any) => any, f1: () => any, ...funcs: Array<_.Many<(...args: any[]) => any>>): (...args: any[]) => any;
-    /**
-     * This method is like _.flow except that it creates a function that invokes the provided functions from right
-     * to left.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    (funcs: Array<_.Many<(...args: any[]) => any>>): (...args: any[]) => any;
-}
-
-declare const flowRight: FlowRight;
+import { flowRight } from "../fp";
 export = flowRight;
diff --git a/types/lodash/fp/forEach.d.ts b/types/lodash/fp/forEach.d.ts
index 50b4a45bf4..f8aa7a4a1a 100644
--- a/types/lodash/fp/forEach.d.ts
+++ b/types/lodash/fp/forEach.d.ts
@@ -1,330 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface ForEach {
-    /**
-     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
-     * and invoked with three arguments:
-     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
-     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
-     *
-     * @alias _.each
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     */
-    (): ForEach;
-    /**
-     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
-     * and invoked with three arguments:
-     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
-     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
-     *
-     * @alias _.each
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     */
-    <T>(iteratee: (value: T) => any): ForEach1x1<T>;
-    /**
-     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
-     * and invoked with three arguments:
-     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
-     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
-     *
-     * @alias _.each
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     */
-    <T>(iteratee: (value: T) => any, collection: ReadonlyArray<T>): T[];
-    /**
-     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
-     * and invoked with three arguments:
-     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
-     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
-     *
-     * @alias _.each
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     */
-    (iteratee: (value: string) => any): ForEach2x1;
-    /**
-     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
-     * and invoked with three arguments:
-     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
-     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
-     *
-     * @alias _.each
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     */
-    (iteratee: (value: string) => any, collection: string): string;
-    /**
-     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
-     * and invoked with three arguments:
-     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
-     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
-     *
-     * @alias _.each
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     */
-    <T>(iteratee: (value: T) => any, collection: _.List<T>): _.List<T>;
-    /**
-     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
-     * and invoked with three arguments:
-     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
-     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
-     *
-     * @alias _.each
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     */
-    <T extends object>(iteratee: (value: T[keyof T]) => any, collection: T): T;
-    /**
-     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
-     * and invoked with three arguments:
-     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
-     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
-     *
-     * @alias _.each
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     */
-    <T, TArray extends T[] | null | undefined>(iteratee: (value: T) => any, collection: TArray & (T[] | null | undefined)): TArray;
-    /**
-     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
-     * and invoked with three arguments:
-     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
-     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
-     *
-     * @alias _.each
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     */
-    <TString extends string | null | undefined>(iteratee: (value: string) => any, collection: TString): TString;
-    /**
-     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
-     * and invoked with three arguments:
-     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
-     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
-     *
-     * @alias _.each
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     */
-    <T, TList extends _.List<T> | null | undefined>(iteratee: (value: T) => any, collection: TList & (_.List<T> | null | undefined)): TList;
-    /**
-     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
-     * and invoked with three arguments:
-     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
-     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
-     *
-     * @alias _.each
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     */
-    <T extends object>(iteratee: (value: T[keyof T]) => any, collection: T | null | undefined): T | null | undefined;
-}
-interface ForEach1x1<T> {
-    /**
-     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
-     * and invoked with three arguments:
-     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
-     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
-     *
-     * @alias _.each
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     */
-    (): ForEach1x1<T>;
-    /**
-     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
-     * and invoked with three arguments:
-     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
-     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
-     *
-     * @alias _.each
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     */
-    (collection: ReadonlyArray<T>): T[];
-    /**
-     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
-     * and invoked with three arguments:
-     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
-     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
-     *
-     * @alias _.each
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     */
-    (collection: _.List<T>): _.List<T>;
-    /**
-     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
-     * and invoked with three arguments:
-     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
-     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
-     *
-     * @alias _.each
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     */
-    <T1 extends object>(collection: T1): T1;
-    /**
-     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
-     * and invoked with three arguments:
-     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
-     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
-     *
-     * @alias _.each
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     */
-    <TArray extends T[] | null | undefined>(collection: TArray & (T[] | null | undefined)): TArray;
-    /**
-     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
-     * and invoked with three arguments:
-     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
-     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
-     *
-     * @alias _.each
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     */
-    <TList extends _.List<T> | null | undefined>(collection: TList & (_.List<T> | null | undefined)): TList;
-    /**
-     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
-     * and invoked with three arguments:
-     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
-     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
-     *
-     * @alias _.each
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     */
-    <T1 extends object>(collection: T1 | null | undefined): T1 | null | undefined;
-}
-interface ForEach2x1 {
-    /**
-     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
-     * and invoked with three arguments:
-     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
-     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
-     *
-     * @alias _.each
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     */
-    (): ForEach2x1;
-    /**
-     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
-     * and invoked with three arguments:
-     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
-     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
-     *
-     * @alias _.each
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     */
-    (collection: string): string;
-    /**
-     * Iterates over elements of collection invoking iteratee for each element. The iteratee is bound to thisArg
-     * and invoked with three arguments:
-     * (value, index|key, collection). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * Note: As with other "Collections" methods, objects with a "length" property are iterated like arrays. To
-     * avoid this behavior _.forIn or _.forOwn may be used for object iteration.
-     *
-     * @alias _.each
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     */
-    <TString extends string | null | undefined>(collection: TString): TString;
-}
-
-declare const forEach: ForEach;
+import { forEach } from "../fp";
 export = forEach;
diff --git a/types/lodash/fp/forEachRight.d.ts b/types/lodash/fp/forEachRight.d.ts
index 75ed3e7fab..135a4243a9 100644
--- a/types/lodash/fp/forEachRight.d.ts
+++ b/types/lodash/fp/forEachRight.d.ts
@@ -1,225 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface ForEachRight {
-    /**
-     * This method is like _.forEach except that it iterates over elements of collection from right to left.
-     *
-     * @alias _.eachRight
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function called per iteration.
-     * @param thisArg The this binding of callback.
-     */
-    (): ForEachRight;
-    /**
-     * This method is like _.forEach except that it iterates over elements of collection from right to left.
-     *
-     * @alias _.eachRight
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function called per iteration.
-     * @param thisArg The this binding of callback.
-     */
-    <T>(iteratee: (value: T) => any): ForEachRight1x1<T>;
-    /**
-     * This method is like _.forEach except that it iterates over elements of collection from right to left.
-     *
-     * @alias _.eachRight
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function called per iteration.
-     * @param thisArg The this binding of callback.
-     */
-    <T>(iteratee: (value: T) => any, collection: ReadonlyArray<T>): T[];
-    /**
-     * This method is like _.forEach except that it iterates over elements of collection from right to left.
-     *
-     * @alias _.eachRight
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function called per iteration.
-     * @param thisArg The this binding of callback.
-     */
-    (iteratee: (value: string) => any): ForEachRight2x1;
-    /**
-     * This method is like _.forEach except that it iterates over elements of collection from right to left.
-     *
-     * @alias _.eachRight
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function called per iteration.
-     * @param thisArg The this binding of callback.
-     */
-    (iteratee: (value: string) => any, collection: string): string;
-    /**
-     * This method is like _.forEach except that it iterates over elements of collection from right to left.
-     *
-     * @alias _.eachRight
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function called per iteration.
-     * @param thisArg The this binding of callback.
-     */
-    <T>(iteratee: (value: T) => any, collection: _.List<T>): _.List<T>;
-    /**
-     * This method is like _.forEach except that it iterates over elements of collection from right to left.
-     *
-     * @alias _.eachRight
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function called per iteration.
-     * @param thisArg The this binding of callback.
-     */
-    <T extends object>(iteratee: (value: T[keyof T]) => any, collection: T): T;
-    /**
-     * This method is like _.forEach except that it iterates over elements of collection from right to left.
-     *
-     * @alias _.eachRight
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function called per iteration.
-     * @param thisArg The this binding of callback.
-     */
-    <T, TArray extends T[] | null | undefined>(iteratee: (value: T) => any, collection: TArray & (T[] | null | undefined)): TArray;
-    /**
-     * This method is like _.forEach except that it iterates over elements of collection from right to left.
-     *
-     * @alias _.eachRight
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function called per iteration.
-     * @param thisArg The this binding of callback.
-     */
-    <TString extends string | null | undefined>(iteratee: (value: string) => any, collection: TString): TString;
-    /**
-     * This method is like _.forEach except that it iterates over elements of collection from right to left.
-     *
-     * @alias _.eachRight
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function called per iteration.
-     * @param thisArg The this binding of callback.
-     */
-    <T, TList extends _.List<T> | null | undefined>(iteratee: (value: T) => any, collection: TList & (_.List<T> | null | undefined)): TList;
-    /**
-     * This method is like _.forEach except that it iterates over elements of collection from right to left.
-     *
-     * @alias _.eachRight
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function called per iteration.
-     * @param thisArg The this binding of callback.
-     */
-    <T extends object>(iteratee: (value: T[keyof T]) => any, collection: T | null | undefined): T | null | undefined;
-}
-interface ForEachRight1x1<T> {
-    /**
-     * This method is like _.forEach except that it iterates over elements of collection from right to left.
-     *
-     * @alias _.eachRight
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function called per iteration.
-     * @param thisArg The this binding of callback.
-     */
-    (): ForEachRight1x1<T>;
-    /**
-     * This method is like _.forEach except that it iterates over elements of collection from right to left.
-     *
-     * @alias _.eachRight
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function called per iteration.
-     * @param thisArg The this binding of callback.
-     */
-    (collection: ReadonlyArray<T>): T[];
-    /**
-     * This method is like _.forEach except that it iterates over elements of collection from right to left.
-     *
-     * @alias _.eachRight
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function called per iteration.
-     * @param thisArg The this binding of callback.
-     */
-    (collection: _.List<T>): _.List<T>;
-    /**
-     * This method is like _.forEach except that it iterates over elements of collection from right to left.
-     *
-     * @alias _.eachRight
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function called per iteration.
-     * @param thisArg The this binding of callback.
-     */
-    <T1 extends object>(collection: T1): T1;
-    /**
-     * This method is like _.forEach except that it iterates over elements of collection from right to left.
-     *
-     * @alias _.eachRight
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function called per iteration.
-     * @param thisArg The this binding of callback.
-     */
-    <TArray extends T[] | null | undefined>(collection: TArray & (T[] | null | undefined)): TArray;
-    /**
-     * This method is like _.forEach except that it iterates over elements of collection from right to left.
-     *
-     * @alias _.eachRight
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function called per iteration.
-     * @param thisArg The this binding of callback.
-     */
-    <TList extends _.List<T> | null | undefined>(collection: TList & (_.List<T> | null | undefined)): TList;
-    /**
-     * This method is like _.forEach except that it iterates over elements of collection from right to left.
-     *
-     * @alias _.eachRight
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function called per iteration.
-     * @param thisArg The this binding of callback.
-     */
-    <T1 extends object>(collection: T1 | null | undefined): T1 | null | undefined;
-}
-interface ForEachRight2x1 {
-    /**
-     * This method is like _.forEach except that it iterates over elements of collection from right to left.
-     *
-     * @alias _.eachRight
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function called per iteration.
-     * @param thisArg The this binding of callback.
-     */
-    (): ForEachRight2x1;
-    /**
-     * This method is like _.forEach except that it iterates over elements of collection from right to left.
-     *
-     * @alias _.eachRight
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function called per iteration.
-     * @param thisArg The this binding of callback.
-     */
-    (collection: string): string;
-    /**
-     * This method is like _.forEach except that it iterates over elements of collection from right to left.
-     *
-     * @alias _.eachRight
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function called per iteration.
-     * @param thisArg The this binding of callback.
-     */
-    <TString extends string | null | undefined>(collection: TString): TString;
-}
-
-declare const forEachRight: ForEachRight;
+import { forEachRight } from "../fp";
 export = forEachRight;
diff --git a/types/lodash/fp/forIn.d.ts b/types/lodash/fp/forIn.d.ts
index added8f66b..dab37b1075 100644
--- a/types/lodash/fp/forIn.d.ts
+++ b/types/lodash/fp/forIn.d.ts
@@ -1,88 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface ForIn {
-    /**
-     * Iterates over own and inherited enumerable properties of an object invoking iteratee for each property. The
-     * iteratee is bound to thisArg and invoked with three arguments: (value, key, object). Iteratee functions may
-     * exit iteration early by explicitly returning false.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns object.
-     */
-    (): ForIn;
-    /**
-     * Iterates over own and inherited enumerable properties of an object invoking iteratee for each property. The
-     * iteratee is bound to thisArg and invoked with three arguments: (value, key, object). Iteratee functions may
-     * exit iteration early by explicitly returning false.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns object.
-     */
-    <T>(iteratee: (value: T) => any): ForIn1x1<T>;
-    /**
-     * Iterates over own and inherited enumerable properties of an object invoking iteratee for each property. The
-     * iteratee is bound to thisArg and invoked with three arguments: (value, key, object). Iteratee functions may
-     * exit iteration early by explicitly returning false.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns object.
-     */
-    <T>(iteratee: (value: T[keyof T]) => any, object: T): T;
-    /**
-     * Iterates over own and inherited enumerable properties of an object invoking iteratee for each property. The
-     * iteratee is bound to thisArg and invoked with three arguments: (value, key, object). Iteratee functions may
-     * exit iteration early by explicitly returning false.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns object.
-     */
-    <T>(iteratee: (value: T[keyof T]) => any, object: T | null | undefined): T | null | undefined;
-}
-interface ForIn1x1<T> {
-    /**
-     * Iterates over own and inherited enumerable properties of an object invoking iteratee for each property. The
-     * iteratee is bound to thisArg and invoked with three arguments: (value, key, object). Iteratee functions may
-     * exit iteration early by explicitly returning false.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns object.
-     */
-    (): ForIn1x1<T>;
-    /**
-     * Iterates over own and inherited enumerable properties of an object invoking iteratee for each property. The
-     * iteratee is bound to thisArg and invoked with three arguments: (value, key, object). Iteratee functions may
-     * exit iteration early by explicitly returning false.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns object.
-     */
-    <T1 extends object>(object: T1): T1;
-    /**
-     * Iterates over own and inherited enumerable properties of an object invoking iteratee for each property. The
-     * iteratee is bound to thisArg and invoked with three arguments: (value, key, object). Iteratee functions may
-     * exit iteration early by explicitly returning false.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns object.
-     */
-    <T1 extends object>(object: T1 | null | undefined): T1 | null | undefined;
-}
-
-declare const forIn: ForIn;
+import { forIn } from "../fp";
 export = forIn;
diff --git a/types/lodash/fp/forInRight.d.ts b/types/lodash/fp/forInRight.d.ts
index 0525b46d07..c560df0cef 100644
--- a/types/lodash/fp/forInRight.d.ts
+++ b/types/lodash/fp/forInRight.d.ts
@@ -1,74 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface ForInRight {
-    /**
-     * This method is like _.forIn except that it iterates over properties of object in the opposite order.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns object.
-     */
-    (): ForInRight;
-    /**
-     * This method is like _.forIn except that it iterates over properties of object in the opposite order.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns object.
-     */
-    <T>(iteratee: (value: T) => any): ForInRight1x1<T>;
-    /**
-     * This method is like _.forIn except that it iterates over properties of object in the opposite order.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns object.
-     */
-    <T>(iteratee: (value: T[keyof T]) => any, object: T): T;
-    /**
-     * This method is like _.forIn except that it iterates over properties of object in the opposite order.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns object.
-     */
-    <T>(iteratee: (value: T[keyof T]) => any, object: T | null | undefined): T | null | undefined;
-}
-interface ForInRight1x1<T> {
-    /**
-     * This method is like _.forIn except that it iterates over properties of object in the opposite order.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns object.
-     */
-    (): ForInRight1x1<T>;
-    /**
-     * This method is like _.forIn except that it iterates over properties of object in the opposite order.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns object.
-     */
-    <T1 extends object>(object: T1): T1;
-    /**
-     * This method is like _.forIn except that it iterates over properties of object in the opposite order.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns object.
-     */
-    <T1 extends object>(object: T1 | null | undefined): T1 | null | undefined;
-}
-
-declare const forInRight: ForInRight;
+import { forInRight } from "../fp";
 export = forInRight;
diff --git a/types/lodash/fp/forOwn.d.ts b/types/lodash/fp/forOwn.d.ts
index 222463960f..7099c48a9d 100644
--- a/types/lodash/fp/forOwn.d.ts
+++ b/types/lodash/fp/forOwn.d.ts
@@ -1,88 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface ForOwn {
-    /**
-     * Iterates over own enumerable properties of an object invoking iteratee for each property. The iteratee is
-     * bound to thisArg and invoked with three arguments: (value, key, object). Iteratee functions may exit
-     * iteration early by explicitly returning false.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns object.
-     */
-    (): ForOwn;
-    /**
-     * Iterates over own enumerable properties of an object invoking iteratee for each property. The iteratee is
-     * bound to thisArg and invoked with three arguments: (value, key, object). Iteratee functions may exit
-     * iteration early by explicitly returning false.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns object.
-     */
-    <T>(iteratee: (value: T) => any): ForOwn1x1<T>;
-    /**
-     * Iterates over own enumerable properties of an object invoking iteratee for each property. The iteratee is
-     * bound to thisArg and invoked with three arguments: (value, key, object). Iteratee functions may exit
-     * iteration early by explicitly returning false.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns object.
-     */
-    <T>(iteratee: (value: T[keyof T]) => any, object: T): T;
-    /**
-     * Iterates over own enumerable properties of an object invoking iteratee for each property. The iteratee is
-     * bound to thisArg and invoked with three arguments: (value, key, object). Iteratee functions may exit
-     * iteration early by explicitly returning false.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns object.
-     */
-    <T>(iteratee: (value: T[keyof T]) => any, object: T | null | undefined): T | null | undefined;
-}
-interface ForOwn1x1<T> {
-    /**
-     * Iterates over own enumerable properties of an object invoking iteratee for each property. The iteratee is
-     * bound to thisArg and invoked with three arguments: (value, key, object). Iteratee functions may exit
-     * iteration early by explicitly returning false.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns object.
-     */
-    (): ForOwn1x1<T>;
-    /**
-     * Iterates over own enumerable properties of an object invoking iteratee for each property. The iteratee is
-     * bound to thisArg and invoked with three arguments: (value, key, object). Iteratee functions may exit
-     * iteration early by explicitly returning false.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns object.
-     */
-    <T1 extends object>(object: T1): T1;
-    /**
-     * Iterates over own enumerable properties of an object invoking iteratee for each property. The iteratee is
-     * bound to thisArg and invoked with three arguments: (value, key, object). Iteratee functions may exit
-     * iteration early by explicitly returning false.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns object.
-     */
-    <T1 extends object>(object: T1 | null | undefined): T1 | null | undefined;
-}
-
-declare const forOwn: ForOwn;
+import { forOwn } from "../fp";
 export = forOwn;
diff --git a/types/lodash/fp/forOwnRight.d.ts b/types/lodash/fp/forOwnRight.d.ts
index 310b720ace..f1e3928866 100644
--- a/types/lodash/fp/forOwnRight.d.ts
+++ b/types/lodash/fp/forOwnRight.d.ts
@@ -1,74 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface ForOwnRight {
-    /**
-     * This method is like _.forOwn except that it iterates over properties of object in the opposite order.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns object.
-     */
-    (): ForOwnRight;
-    /**
-     * This method is like _.forOwn except that it iterates over properties of object in the opposite order.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns object.
-     */
-    <T>(iteratee: (value: T) => any): ForOwnRight1x1<T>;
-    /**
-     * This method is like _.forOwn except that it iterates over properties of object in the opposite order.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns object.
-     */
-    <T>(iteratee: (value: T[keyof T]) => any, object: T): T;
-    /**
-     * This method is like _.forOwn except that it iterates over properties of object in the opposite order.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns object.
-     */
-    <T>(iteratee: (value: T[keyof T]) => any, object: T | null | undefined): T | null | undefined;
-}
-interface ForOwnRight1x1<T> {
-    /**
-     * This method is like _.forOwn except that it iterates over properties of object in the opposite order.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns object.
-     */
-    (): ForOwnRight1x1<T>;
-    /**
-     * This method is like _.forOwn except that it iterates over properties of object in the opposite order.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns object.
-     */
-    <T1 extends object>(object: T1): T1;
-    /**
-     * This method is like _.forOwn except that it iterates over properties of object in the opposite order.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns object.
-     */
-    <T1 extends object>(object: T1 | null | undefined): T1 | null | undefined;
-}
-
-declare const forOwnRight: ForOwnRight;
+import { forOwnRight } from "../fp";
 export = forOwnRight;
diff --git a/types/lodash/fp/fromPairs.d.ts b/types/lodash/fp/fromPairs.d.ts
index 5412865d75..b0d0082a59 100644
--- a/types/lodash/fp/fromPairs.d.ts
+++ b/types/lodash/fp/fromPairs.d.ts
@@ -1,37 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface FromPairs {
-    /**
-     * The inverse of `_.toPairs`; this method returns an object composed
-     * from key-value `pairs`.
-     *
-     * @category Array
-     * @param pairs The key-value pairs.
-     * @returns Returns the new object.
-     * @example
-     *
-     * _.fromPairs([['fred', 30], ['barney', 40]]);
-     * // => { 'fred': 30, 'barney': 40 }
-     */
-    <T>(pairs: _.List<[_.PropertyName, T]> | null | undefined): _.Dictionary<T>;
-    /**
-     * The inverse of `_.toPairs`; this method returns an object composed
-     * from key-value `pairs`.
-     *
-     * @category Array
-     * @param pairs The key-value pairs.
-     * @returns Returns the new object.
-     * @example
-     *
-     * _.fromPairs([['fred', 30], ['barney', 40]]);
-     * // => { 'fred': 30, 'barney': 40 }
-     */
-    (pairs: _.List<any[]> | null | undefined): _.Dictionary<any>;
-}
-
-declare const fromPairs: FromPairs;
+import { fromPairs } from "../fp";
 export = fromPairs;
diff --git a/types/lodash/fp/functions.d.ts b/types/lodash/fp/functions.d.ts
index bc5cb94ab1..727d68e138 100644
--- a/types/lodash/fp/functions.d.ts
+++ b/types/lodash/fp/functions.d.ts
@@ -1,28 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type Functions =
-    /**
-     * Creates an array of function property names from own enumerable properties
-     * of `object`.
-     *
-     * @category Object
-     * @param object The object to inspect.
-     * @returns Returns the new array of property names.
-     * @example
-     *
-     * function Foo() {
-     *   this.a = _.constant('a');
-     *   this.b = _.constant('b');
-     * }
-     *
-     * Foo.prototype.c = _.constant('c');
-     *
-     * _.functions(new Foo);
-     * // => ['a', 'b']
-     */
-    (object: any) => string[];
-
-declare const functions: Functions;
+import { functions } from "../fp";
 export = functions;
diff --git a/types/lodash/fp/functionsIn.d.ts b/types/lodash/fp/functionsIn.d.ts
index 0189c213d6..448746e619 100644
--- a/types/lodash/fp/functionsIn.d.ts
+++ b/types/lodash/fp/functionsIn.d.ts
@@ -1,28 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type FunctionsIn =
-    /**
-     * Creates an array of function property names from own and inherited
-     * enumerable properties of `object`.
-     *
-     * @category Object
-     * @param object The object to inspect.
-     * @returns Returns the new array of property names.
-     * @example
-     *
-     * function Foo() {
-     *   this.a = _.constant('a');
-     *   this.b = _.constant('b');
-     * }
-     *
-     * Foo.prototype.c = _.constant('c');
-     *
-     * _.functionsIn(new Foo);
-     * // => ['a', 'b', 'c']
-     */
-    (object: any) => string[];
-
-declare const functionsIn: FunctionsIn;
+import { functionsIn } from "../fp";
 export = functionsIn;
diff --git a/types/lodash/fp/get.d.ts b/types/lodash/fp/get.d.ts
index 085f3d935f..ff3ab8b09d 100644
--- a/types/lodash/fp/get.d.ts
+++ b/types/lodash/fp/get.d.ts
@@ -1,207 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Get {
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (): Get;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey]): Get1x1<TObject, TKey>;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey], object: TObject): TObject[TKey];
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey], object: TObject | null | undefined): TObject[TKey] | undefined;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (path: number): Get3x1;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <T>(path: number, object: _.NumericDictionary<T>): T;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <T>(path: number, object: _.NumericDictionary<T> | null | undefined): T | undefined;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (path: _.PropertyPath): Get5x1;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (path: _.PropertyPath, object: null | undefined): undefined;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (path: _.PropertyPath, object: any): any;
-}
-interface Get1x1<TObject extends object, TKey extends keyof TObject> {
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (): Get1x1<TObject, TKey>;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (object: TObject): TObject[TKey];
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (object: TObject | null | undefined): TObject[TKey] | undefined;
-}
-interface Get3x1 {
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (): Get3x1;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <T>(object: _.NumericDictionary<T>): T;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <T>(object: _.NumericDictionary<T> | null | undefined): T | undefined;
-}
-interface Get5x1 {
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (): Get5x1;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (object: null | undefined): undefined;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (object: any): any;
-}
-
-declare const get: Get;
+import { get } from "../fp";
 export = get;
diff --git a/types/lodash/fp/getOr.d.ts b/types/lodash/fp/getOr.d.ts
index db63bd4b1a..ce3d5bba31 100644
--- a/types/lodash/fp/getOr.d.ts
+++ b/types/lodash/fp/getOr.d.ts
@@ -1,313 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Get {
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (): Get;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <TDefault>(defaultValue: TDefault): Get1x1<TDefault>;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <TObject extends object, TKey extends keyof TObject, TDefault>(defaultValue: TDefault, path: TKey | [TKey]): Get1x2<TObject, TKey, TDefault>;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <TObject extends object, TKey extends keyof TObject, TDefault>(defaultValue: TDefault, path: TKey | [TKey], object: TObject | null | undefined): TObject[TKey] | TDefault;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <TDefault>(defaultValue: TDefault, path: number): Get2x2<TDefault>;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <T, TDefault>(defaultValue: TDefault, path: number, object: _.NumericDictionary<T> | null | undefined): T | TDefault;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <TDefault>(defaultValue: TDefault, path: _.PropertyPath): Get3x2<TDefault>;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <TDefault>(defaultValue: TDefault, path: _.PropertyPath, object: null | undefined): TDefault;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (defaultValue: any): Get4x1;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (defaultValue: any, path: _.PropertyPath): Get4x2;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (defaultValue: any, path: _.PropertyPath, object: any): any;
-}
-interface Get1x1<TDefault> {
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (): Get1x1<TDefault>;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey]): Get1x2<TObject, TKey, TDefault>;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey], object: TObject | null | undefined): TObject[TKey] | TDefault;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (path: number): Get2x2<TDefault>;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <T>(path: number, object: _.NumericDictionary<T> | null | undefined): T | TDefault;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (path: _.PropertyPath): Get3x2<TDefault>;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (path: _.PropertyPath, object: null | undefined): TDefault;
-}
-interface Get1x2<TObject extends object, TKey extends keyof TObject, TDefault> {
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (): Get1x2<TObject, TKey, TDefault>;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (object: TObject | null | undefined): TObject[TKey] | TDefault;
-}
-interface Get2x2<TDefault> {
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (): Get2x2<TDefault>;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <T>(object: _.NumericDictionary<T> | null | undefined): T | TDefault;
-}
-interface Get3x2<TDefault> {
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (): Get3x2<TDefault>;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (object: null | undefined): TDefault;
-}
-interface Get4x1 {
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (): Get4x1;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (path: _.PropertyPath): Get4x2;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (path: _.PropertyPath, object: any): any;
-}
-interface Get4x2 {
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (): Get4x2;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (object: any): any;
-}
-
-declare const getOr: Get;
+import { getOr } from "../fp";
 export = getOr;
diff --git a/types/lodash/fp/groupBy.d.ts b/types/lodash/fp/groupBy.d.ts
index 49f6946225..813830aa0e 100644
--- a/types/lodash/fp/groupBy.d.ts
+++ b/types/lodash/fp/groupBy.d.ts
@@ -1,225 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface GroupBy {
-    /**
-     * Creates an object composed of keys generated from the results of running each element of collection through
-     * iteratee. The corresponding value of each key is an array of the elements responsible for generating the
-     * key. The iteratee is bound to thisArg and invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the composed aggregate object.
-     */
-    (): GroupBy;
-    /**
-     * Creates an object composed of keys generated from the results of running each element of collection through
-     * iteratee. The corresponding value of each key is an array of the elements responsible for generating the
-     * key. The iteratee is bound to thisArg and invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the composed aggregate object.
-     */
-    (iteratee: (value: string) => _.NotVoid): GroupBy1x1;
-    /**
-     * Creates an object composed of keys generated from the results of running each element of collection through
-     * iteratee. The corresponding value of each key is an array of the elements responsible for generating the
-     * key. The iteratee is bound to thisArg and invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the composed aggregate object.
-     */
-    (iteratee: (value: string) => _.NotVoid, collection: string | null | undefined): _.Dictionary<string[]>;
-    /**
-     * Creates an object composed of keys generated from the results of running each element of collection through
-     * iteratee. The corresponding value of each key is an array of the elements responsible for generating the
-     * key. The iteratee is bound to thisArg and invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the composed aggregate object.
-     */
-    <T>(iteratee: _.ValueIteratee<T>): GroupBy2x1<T>;
-    /**
-     * Creates an object composed of keys generated from the results of running each element of collection through
-     * iteratee. The corresponding value of each key is an array of the elements responsible for generating the
-     * key. The iteratee is bound to thisArg and invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the composed aggregate object.
-     */
-    <T>(iteratee: _.ValueIteratee<T>, collection: _.List<T> | null | undefined): _.Dictionary<T[]>;
-    /**
-     * Creates an object composed of keys generated from the results of running each element of collection through
-     * iteratee. The corresponding value of each key is an array of the elements responsible for generating the
-     * key. The iteratee is bound to thisArg and invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the composed aggregate object.
-     */
-    <T extends object>(iteratee: _.ValueIteratee<T[keyof T]>, collection: T | null | undefined): _.Dictionary<Array<T[keyof T]>>;
-}
-interface GroupBy1x1 {
-    /**
-     * Creates an object composed of keys generated from the results of running each element of collection through
-     * iteratee. The corresponding value of each key is an array of the elements responsible for generating the
-     * key. The iteratee is bound to thisArg and invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the composed aggregate object.
-     */
-    (): GroupBy1x1;
-    /**
-     * Creates an object composed of keys generated from the results of running each element of collection through
-     * iteratee. The corresponding value of each key is an array of the elements responsible for generating the
-     * key. The iteratee is bound to thisArg and invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the composed aggregate object.
-     */
-    (collection: string | null | undefined): _.Dictionary<string[]>;
-}
-interface GroupBy2x1<T> {
-    /**
-     * Creates an object composed of keys generated from the results of running each element of collection through
-     * iteratee. The corresponding value of each key is an array of the elements responsible for generating the
-     * key. The iteratee is bound to thisArg and invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the composed aggregate object.
-     */
-    (): GroupBy2x1<T>;
-    /**
-     * Creates an object composed of keys generated from the results of running each element of collection through
-     * iteratee. The corresponding value of each key is an array of the elements responsible for generating the
-     * key. The iteratee is bound to thisArg and invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the composed aggregate object.
-     */
-    (collection: _.List<T> | object | null | undefined): _.Dictionary<T[]>;
-}
-
-declare const groupBy: GroupBy;
+import { groupBy } from "../fp";
 export = groupBy;
diff --git a/types/lodash/fp/gt.d.ts b/types/lodash/fp/gt.d.ts
index 8102922aee..517071f511 100644
--- a/types/lodash/fp/gt.d.ts
+++ b/types/lodash/fp/gt.d.ts
@@ -1,51 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface Gt {
-    /**
-     * Checks if value is greater than other.
-     *
-     * @param value The value to compare.
-     * @param other The other value to compare.
-     * @return Returns true if value is greater than other, else false.
-     */
-    (): Gt;
-    /**
-     * Checks if value is greater than other.
-     *
-     * @param value The value to compare.
-     * @param other The other value to compare.
-     * @return Returns true if value is greater than other, else false.
-     */
-    (value: any): Gt1x1;
-    /**
-     * Checks if value is greater than other.
-     *
-     * @param value The value to compare.
-     * @param other The other value to compare.
-     * @return Returns true if value is greater than other, else false.
-     */
-    (value: any, other: any): boolean;
-}
-interface Gt1x1 {
-    /**
-     * Checks if value is greater than other.
-     *
-     * @param value The value to compare.
-     * @param other The other value to compare.
-     * @return Returns true if value is greater than other, else false.
-     */
-    (): Gt1x1;
-    /**
-     * Checks if value is greater than other.
-     *
-     * @param value The value to compare.
-     * @param other The other value to compare.
-     * @return Returns true if value is greater than other, else false.
-     */
-    (other: any): boolean;
-}
-
-declare const gt: Gt;
+import { gt } from "../fp";
 export = gt;
diff --git a/types/lodash/fp/gte.d.ts b/types/lodash/fp/gte.d.ts
index df663c4438..5f6d85c7f0 100644
--- a/types/lodash/fp/gte.d.ts
+++ b/types/lodash/fp/gte.d.ts
@@ -1,51 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface Gte {
-    /**
-     * Checks if value is greater than or equal to other.
-     *
-     * @param value The value to compare.
-     * @param other The other value to compare.
-     * @return Returns true if value is greater than or equal to other, else false.
-     */
-    (): Gte;
-    /**
-     * Checks if value is greater than or equal to other.
-     *
-     * @param value The value to compare.
-     * @param other The other value to compare.
-     * @return Returns true if value is greater than or equal to other, else false.
-     */
-    (value: any): Gte1x1;
-    /**
-     * Checks if value is greater than or equal to other.
-     *
-     * @param value The value to compare.
-     * @param other The other value to compare.
-     * @return Returns true if value is greater than or equal to other, else false.
-     */
-    (value: any, other: any): boolean;
-}
-interface Gte1x1 {
-    /**
-     * Checks if value is greater than or equal to other.
-     *
-     * @param value The value to compare.
-     * @param other The other value to compare.
-     * @return Returns true if value is greater than or equal to other, else false.
-     */
-    (): Gte1x1;
-    /**
-     * Checks if value is greater than or equal to other.
-     *
-     * @param value The value to compare.
-     * @param other The other value to compare.
-     * @return Returns true if value is greater than or equal to other, else false.
-     */
-    (other: any): boolean;
-}
-
-declare const gte: Gte;
+import { gte } from "../fp";
 export = gte;
diff --git a/types/lodash/fp/has.d.ts b/types/lodash/fp/has.d.ts
index 950a57a43b..8cbda7fb8c 100644
--- a/types/lodash/fp/has.d.ts
+++ b/types/lodash/fp/has.d.ts
@@ -1,138 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Has {
-    /**
-     * Checks if `path` is a direct property of `object`.
-     *
-     * @category Object
-     * @param object The object to query.
-     * @param path The path to check.
-     * @returns Returns `true` if `path` exists, else `false`.
-     * @example
-     *
-     * var object = { 'a': { 'b': { 'c': 3 } } };
-     * var other = _.create({ 'a': _.create({ 'b': _.create({ 'c': 3 }) }) });
-     *
-     * _.has(object, 'a');
-     * // => true
-     *
-     * _.has(object, 'a.b.c');
-     * // => true
-     *
-     * _.has(object, ['a', 'b', 'c']);
-     * // => true
-     *
-     * _.has(other, 'a');
-     * // => false
-     */
-    (): Has;
-    /**
-     * Checks if `path` is a direct property of `object`.
-     *
-     * @category Object
-     * @param object The object to query.
-     * @param path The path to check.
-     * @returns Returns `true` if `path` exists, else `false`.
-     * @example
-     *
-     * var object = { 'a': { 'b': { 'c': 3 } } };
-     * var other = _.create({ 'a': _.create({ 'b': _.create({ 'c': 3 }) }) });
-     *
-     * _.has(object, 'a');
-     * // => true
-     *
-     * _.has(object, 'a.b.c');
-     * // => true
-     *
-     * _.has(object, ['a', 'b', 'c']);
-     * // => true
-     *
-     * _.has(other, 'a');
-     * // => false
-     */
-    (path: _.PropertyPath): Has1x1;
-    /**
-     * Checks if `path` is a direct property of `object`.
-     *
-     * @category Object
-     * @param object The object to query.
-     * @param path The path to check.
-     * @returns Returns `true` if `path` exists, else `false`.
-     * @example
-     *
-     * var object = { 'a': { 'b': { 'c': 3 } } };
-     * var other = _.create({ 'a': _.create({ 'b': _.create({ 'c': 3 }) }) });
-     *
-     * _.has(object, 'a');
-     * // => true
-     *
-     * _.has(object, 'a.b.c');
-     * // => true
-     *
-     * _.has(object, ['a', 'b', 'c']);
-     * // => true
-     *
-     * _.has(other, 'a');
-     * // => false
-     */
-    <T>(path: _.PropertyPath, object: T): boolean;
-}
-interface Has1x1 {
-    /**
-     * Checks if `path` is a direct property of `object`.
-     *
-     * @category Object
-     * @param object The object to query.
-     * @param path The path to check.
-     * @returns Returns `true` if `path` exists, else `false`.
-     * @example
-     *
-     * var object = { 'a': { 'b': { 'c': 3 } } };
-     * var other = _.create({ 'a': _.create({ 'b': _.create({ 'c': 3 }) }) });
-     *
-     * _.has(object, 'a');
-     * // => true
-     *
-     * _.has(object, 'a.b.c');
-     * // => true
-     *
-     * _.has(object, ['a', 'b', 'c']);
-     * // => true
-     *
-     * _.has(other, 'a');
-     * // => false
-     */
-    (): Has1x1;
-    /**
-     * Checks if `path` is a direct property of `object`.
-     *
-     * @category Object
-     * @param object The object to query.
-     * @param path The path to check.
-     * @returns Returns `true` if `path` exists, else `false`.
-     * @example
-     *
-     * var object = { 'a': { 'b': { 'c': 3 } } };
-     * var other = _.create({ 'a': _.create({ 'b': _.create({ 'c': 3 }) }) });
-     *
-     * _.has(object, 'a');
-     * // => true
-     *
-     * _.has(object, 'a.b.c');
-     * // => true
-     *
-     * _.has(object, ['a', 'b', 'c']);
-     * // => true
-     *
-     * _.has(other, 'a');
-     * // => false
-     */
-    <T>(object: T): boolean;
-}
-
-declare const has: Has;
+import { has } from "../fp";
 export = has;
diff --git a/types/lodash/fp/hasIn.d.ts b/types/lodash/fp/hasIn.d.ts
index a5ffb7ae4e..7e06a87ae3 100644
--- a/types/lodash/fp/hasIn.d.ts
+++ b/types/lodash/fp/hasIn.d.ts
@@ -1,133 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface HasIn {
-    /**
-     * Checks if `path` is a direct or inherited property of `object`.
-     *
-     * @category Object
-     * @param object The object to query.
-     * @param path The path to check.
-     * @returns Returns `true` if `path` exists, else `false`.
-     * @example
-     *
-     * var object = _.create({ 'a': _.create({ 'b': _.create({ 'c': 3 }) }) });
-     *
-     * _.hasIn(object, 'a');
-     * // => true
-     *
-     * _.hasIn(object, 'a.b.c');
-     * // => true
-     *
-     * _.hasIn(object, ['a', 'b', 'c']);
-     * // => true
-     *
-     * _.hasIn(object, 'b');
-     * // => false
-     */
-    (): HasIn;
-    /**
-     * Checks if `path` is a direct or inherited property of `object`.
-     *
-     * @category Object
-     * @param object The object to query.
-     * @param path The path to check.
-     * @returns Returns `true` if `path` exists, else `false`.
-     * @example
-     *
-     * var object = _.create({ 'a': _.create({ 'b': _.create({ 'c': 3 }) }) });
-     *
-     * _.hasIn(object, 'a');
-     * // => true
-     *
-     * _.hasIn(object, 'a.b.c');
-     * // => true
-     *
-     * _.hasIn(object, ['a', 'b', 'c']);
-     * // => true
-     *
-     * _.hasIn(object, 'b');
-     * // => false
-     */
-    (path: _.PropertyPath): HasIn1x1;
-    /**
-     * Checks if `path` is a direct or inherited property of `object`.
-     *
-     * @category Object
-     * @param object The object to query.
-     * @param path The path to check.
-     * @returns Returns `true` if `path` exists, else `false`.
-     * @example
-     *
-     * var object = _.create({ 'a': _.create({ 'b': _.create({ 'c': 3 }) }) });
-     *
-     * _.hasIn(object, 'a');
-     * // => true
-     *
-     * _.hasIn(object, 'a.b.c');
-     * // => true
-     *
-     * _.hasIn(object, ['a', 'b', 'c']);
-     * // => true
-     *
-     * _.hasIn(object, 'b');
-     * // => false
-     */
-    <T>(path: _.PropertyPath, object: T): boolean;
-}
-interface HasIn1x1 {
-    /**
-     * Checks if `path` is a direct or inherited property of `object`.
-     *
-     * @category Object
-     * @param object The object to query.
-     * @param path The path to check.
-     * @returns Returns `true` if `path` exists, else `false`.
-     * @example
-     *
-     * var object = _.create({ 'a': _.create({ 'b': _.create({ 'c': 3 }) }) });
-     *
-     * _.hasIn(object, 'a');
-     * // => true
-     *
-     * _.hasIn(object, 'a.b.c');
-     * // => true
-     *
-     * _.hasIn(object, ['a', 'b', 'c']);
-     * // => true
-     *
-     * _.hasIn(object, 'b');
-     * // => false
-     */
-    (): HasIn1x1;
-    /**
-     * Checks if `path` is a direct or inherited property of `object`.
-     *
-     * @category Object
-     * @param object The object to query.
-     * @param path The path to check.
-     * @returns Returns `true` if `path` exists, else `false`.
-     * @example
-     *
-     * var object = _.create({ 'a': _.create({ 'b': _.create({ 'c': 3 }) }) });
-     *
-     * _.hasIn(object, 'a');
-     * // => true
-     *
-     * _.hasIn(object, 'a.b.c');
-     * // => true
-     *
-     * _.hasIn(object, ['a', 'b', 'c']);
-     * // => true
-     *
-     * _.hasIn(object, 'b');
-     * // => false
-     */
-    <T>(object: T): boolean;
-}
-
-declare const hasIn: HasIn;
+import { hasIn } from "../fp";
 export = hasIn;
diff --git a/types/lodash/fp/head.d.ts b/types/lodash/fp/head.d.ts
index 618e7ca561..4a7d5e59cd 100644
--- a/types/lodash/fp/head.d.ts
+++ b/types/lodash/fp/head.d.ts
@@ -1,19 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-type Head =
-    /**
-     * Gets the first element of array.
-     *
-     * @alias _.first
-     *
-     * @param array The array to query.
-     * @return Returns the first element of array.
-     */
-    <T>(array: _.List<T> | null | undefined) => T | undefined;
-
-declare const head: Head;
+import { head } from "../fp";
 export = head;
diff --git a/types/lodash/fp/identical.d.ts b/types/lodash/fp/identical.d.ts
index 689227ac95..954dff5569 100644
--- a/types/lodash/fp/identical.d.ts
+++ b/types/lodash/fp/identical.d.ts
@@ -1,156 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface Eq {
-    /**
-     * Performs a [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-     * comparison between two values to determine if they are equivalent.
-     *
-     * @category Lang
-     * @param value The value to compare.
-     * @param other The other value to compare.
-     * @returns Returns `true` if the values are equivalent, else `false`.
-     * @example
-     *
-     * var object = { 'user': 'fred' };
-     * var other = { 'user': 'fred' };
-     *
-     * _.eq(object, object);
-     * // => true
-     *
-     * _.eq(object, other);
-     * // => false
-     *
-     * _.eq('a', 'a');
-     * // => true
-     *
-     * _.eq('a', Object('a'));
-     * // => false
-     *
-     * _.eq(NaN, NaN);
-     * // => true
-     */
-    (): Eq;
-    /**
-     * Performs a [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-     * comparison between two values to determine if they are equivalent.
-     *
-     * @category Lang
-     * @param value The value to compare.
-     * @param other The other value to compare.
-     * @returns Returns `true` if the values are equivalent, else `false`.
-     * @example
-     *
-     * var object = { 'user': 'fred' };
-     * var other = { 'user': 'fred' };
-     *
-     * _.eq(object, object);
-     * // => true
-     *
-     * _.eq(object, other);
-     * // => false
-     *
-     * _.eq('a', 'a');
-     * // => true
-     *
-     * _.eq('a', Object('a'));
-     * // => false
-     *
-     * _.eq(NaN, NaN);
-     * // => true
-     */
-    (value: any): Eq1x1;
-    /**
-     * Performs a [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-     * comparison between two values to determine if they are equivalent.
-     *
-     * @category Lang
-     * @param value The value to compare.
-     * @param other The other value to compare.
-     * @returns Returns `true` if the values are equivalent, else `false`.
-     * @example
-     *
-     * var object = { 'user': 'fred' };
-     * var other = { 'user': 'fred' };
-     *
-     * _.eq(object, object);
-     * // => true
-     *
-     * _.eq(object, other);
-     * // => false
-     *
-     * _.eq('a', 'a');
-     * // => true
-     *
-     * _.eq('a', Object('a'));
-     * // => false
-     *
-     * _.eq(NaN, NaN);
-     * // => true
-     */
-    (value: any, other: any): boolean;
-}
-interface Eq1x1 {
-    /**
-     * Performs a [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-     * comparison between two values to determine if they are equivalent.
-     *
-     * @category Lang
-     * @param value The value to compare.
-     * @param other The other value to compare.
-     * @returns Returns `true` if the values are equivalent, else `false`.
-     * @example
-     *
-     * var object = { 'user': 'fred' };
-     * var other = { 'user': 'fred' };
-     *
-     * _.eq(object, object);
-     * // => true
-     *
-     * _.eq(object, other);
-     * // => false
-     *
-     * _.eq('a', 'a');
-     * // => true
-     *
-     * _.eq('a', Object('a'));
-     * // => false
-     *
-     * _.eq(NaN, NaN);
-     * // => true
-     */
-    (): Eq1x1;
-    /**
-     * Performs a [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-     * comparison between two values to determine if they are equivalent.
-     *
-     * @category Lang
-     * @param value The value to compare.
-     * @param other The other value to compare.
-     * @returns Returns `true` if the values are equivalent, else `false`.
-     * @example
-     *
-     * var object = { 'user': 'fred' };
-     * var other = { 'user': 'fred' };
-     *
-     * _.eq(object, object);
-     * // => true
-     *
-     * _.eq(object, other);
-     * // => false
-     *
-     * _.eq('a', 'a');
-     * // => true
-     *
-     * _.eq('a', Object('a'));
-     * // => false
-     *
-     * _.eq(NaN, NaN);
-     * // => true
-     */
-    (other: any): boolean;
-}
-
-declare const identical: Eq;
+import { identical } from "../fp";
 export = identical;
diff --git a/types/lodash/fp/identity.d.ts b/types/lodash/fp/identity.d.ts
index 46411f1db1..97e613c6c8 100644
--- a/types/lodash/fp/identity.d.ts
+++ b/types/lodash/fp/identity.d.ts
@@ -1,23 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface Identity {
-    /**
-     * This method returns the first argument provided to it.
-     *
-     * @param value Any value.
-     * @return Returns value.
-     */
-    <T>(value: T): T;
-    /**
-     * This method returns the first argument provided to it.
-     *
-     * @param value Any value.
-     * @return Returns value.
-     */
-    (): undefined;
-}
-
-declare const identity: Identity;
+import { identity } from "../fp";
 export = identity;
diff --git a/types/lodash/fp/inRange.d.ts b/types/lodash/fp/inRange.d.ts
index 564ed81a4e..06ed312687 100644
--- a/types/lodash/fp/inRange.d.ts
+++ b/types/lodash/fp/inRange.d.ts
@@ -1,103 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface InRange {
-    /**
-     * Checks if n is between start and up to but not including, end. If end is not specified it’s set to start
-     * with start then set to 0.
-     *
-     * @param n The number to check.
-     * @param start The start of the range.
-     * @param end The end of the range.
-     * @return Returns true if n is in the range, else false.
-     */
-    (): InRange;
-    /**
-     * Checks if n is between start and up to but not including, end. If end is not specified it’s set to start
-     * with start then set to 0.
-     *
-     * @param n The number to check.
-     * @param start The start of the range.
-     * @param end The end of the range.
-     * @return Returns true if n is in the range, else false.
-     */
-    (start: number): InRange1x1;
-    /**
-     * Checks if n is between start and up to but not including, end. If end is not specified it’s set to start
-     * with start then set to 0.
-     *
-     * @param n The number to check.
-     * @param start The start of the range.
-     * @param end The end of the range.
-     * @return Returns true if n is in the range, else false.
-     */
-    (start: number, end: number): InRange1x2;
-    /**
-     * Checks if n is between start and up to but not including, end. If end is not specified it’s set to start
-     * with start then set to 0.
-     *
-     * @param n The number to check.
-     * @param start The start of the range.
-     * @param end The end of the range.
-     * @return Returns true if n is in the range, else false.
-     */
-    (start: number, end: number, n: number): boolean;
-}
-interface InRange1x1 {
-    /**
-     * Checks if n is between start and up to but not including, end. If end is not specified it’s set to start
-     * with start then set to 0.
-     *
-     * @param n The number to check.
-     * @param start The start of the range.
-     * @param end The end of the range.
-     * @return Returns true if n is in the range, else false.
-     */
-    (): InRange1x1;
-    /**
-     * Checks if n is between start and up to but not including, end. If end is not specified it’s set to start
-     * with start then set to 0.
-     *
-     * @param n The number to check.
-     * @param start The start of the range.
-     * @param end The end of the range.
-     * @return Returns true if n is in the range, else false.
-     */
-    (end: number): InRange1x2;
-    /**
-     * Checks if n is between start and up to but not including, end. If end is not specified it’s set to start
-     * with start then set to 0.
-     *
-     * @param n The number to check.
-     * @param start The start of the range.
-     * @param end The end of the range.
-     * @return Returns true if n is in the range, else false.
-     */
-    (end: number, n: number): boolean;
-}
-interface InRange1x2 {
-    /**
-     * Checks if n is between start and up to but not including, end. If end is not specified it’s set to start
-     * with start then set to 0.
-     *
-     * @param n The number to check.
-     * @param start The start of the range.
-     * @param end The end of the range.
-     * @return Returns true if n is in the range, else false.
-     */
-    (): InRange1x2;
-    /**
-     * Checks if n is between start and up to but not including, end. If end is not specified it’s set to start
-     * with start then set to 0.
-     *
-     * @param n The number to check.
-     * @param start The start of the range.
-     * @param end The end of the range.
-     * @return Returns true if n is in the range, else false.
-     */
-    (n: number): boolean;
-}
-
-declare const inRange: InRange;
+import { inRange } from "../fp";
 export = inRange;
diff --git a/types/lodash/fp/includes.d.ts b/types/lodash/fp/includes.d.ts
index b498f0e8aa..afc9984286 100644
--- a/types/lodash/fp/includes.d.ts
+++ b/types/lodash/fp/includes.d.ts
@@ -1,63 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Includes {
-    /**
-     * Checks if target is in collection using SameValueZero for equality comparisons. If fromIndex is negative,
-     * it’s used as the offset from the end of collection.
-     *
-     * @param collection The collection to search.
-     * @param target The value to search for.
-     * @param fromIndex The index to search from.
-     * @return True if the target element is found, else false.
-     */
-    (): Includes;
-    /**
-     * Checks if target is in collection using SameValueZero for equality comparisons. If fromIndex is negative,
-     * it’s used as the offset from the end of collection.
-     *
-     * @param collection The collection to search.
-     * @param target The value to search for.
-     * @param fromIndex The index to search from.
-     * @return True if the target element is found, else false.
-     */
-    <T>(target: T): Includes1x1<T>;
-    /**
-     * Checks if target is in collection using SameValueZero for equality comparisons. If fromIndex is negative,
-     * it’s used as the offset from the end of collection.
-     *
-     * @param collection The collection to search.
-     * @param target The value to search for.
-     * @param fromIndex The index to search from.
-     * @return True if the target element is found, else false.
-     */
-    <T>(target: T, collection: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): boolean;
-}
-interface Includes1x1<T> {
-    /**
-     * Checks if target is in collection using SameValueZero for equality comparisons. If fromIndex is negative,
-     * it’s used as the offset from the end of collection.
-     *
-     * @param collection The collection to search.
-     * @param target The value to search for.
-     * @param fromIndex The index to search from.
-     * @return True if the target element is found, else false.
-     */
-    (): Includes1x1<T>;
-    /**
-     * Checks if target is in collection using SameValueZero for equality comparisons. If fromIndex is negative,
-     * it’s used as the offset from the end of collection.
-     *
-     * @param collection The collection to search.
-     * @param target The value to search for.
-     * @param fromIndex The index to search from.
-     * @return True if the target element is found, else false.
-     */
-    (collection: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): boolean;
-}
-
-declare const includes: Includes;
+import { includes } from "../fp";
 export = includes;
diff --git a/types/lodash/fp/includesFrom.d.ts b/types/lodash/fp/includesFrom.d.ts
index 45d2f6bab8..13042d029a 100644
--- a/types/lodash/fp/includesFrom.d.ts
+++ b/types/lodash/fp/includesFrom.d.ts
@@ -1,105 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Includes {
-    /**
-     * Checks if target is in collection using SameValueZero for equality comparisons. If fromIndex is negative,
-     * it’s used as the offset from the end of collection.
-     *
-     * @param collection The collection to search.
-     * @param target The value to search for.
-     * @param fromIndex The index to search from.
-     * @return True if the target element is found, else false.
-     */
-    (): Includes;
-    /**
-     * Checks if target is in collection using SameValueZero for equality comparisons. If fromIndex is negative,
-     * it’s used as the offset from the end of collection.
-     *
-     * @param collection The collection to search.
-     * @param target The value to search for.
-     * @param fromIndex The index to search from.
-     * @return True if the target element is found, else false.
-     */
-    <T>(target: T): Includes1x1<T>;
-    /**
-     * Checks if target is in collection using SameValueZero for equality comparisons. If fromIndex is negative,
-     * it’s used as the offset from the end of collection.
-     *
-     * @param collection The collection to search.
-     * @param target The value to search for.
-     * @param fromIndex The index to search from.
-     * @return True if the target element is found, else false.
-     */
-    <T>(target: T, fromIndex: number): Includes1x2<T>;
-    /**
-     * Checks if target is in collection using SameValueZero for equality comparisons. If fromIndex is negative,
-     * it’s used as the offset from the end of collection.
-     *
-     * @param collection The collection to search.
-     * @param target The value to search for.
-     * @param fromIndex The index to search from.
-     * @return True if the target element is found, else false.
-     */
-    <T>(target: T, fromIndex: number, collection: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): boolean;
-}
-interface Includes1x1<T> {
-    /**
-     * Checks if target is in collection using SameValueZero for equality comparisons. If fromIndex is negative,
-     * it’s used as the offset from the end of collection.
-     *
-     * @param collection The collection to search.
-     * @param target The value to search for.
-     * @param fromIndex The index to search from.
-     * @return True if the target element is found, else false.
-     */
-    (): Includes1x1<T>;
-    /**
-     * Checks if target is in collection using SameValueZero for equality comparisons. If fromIndex is negative,
-     * it’s used as the offset from the end of collection.
-     *
-     * @param collection The collection to search.
-     * @param target The value to search for.
-     * @param fromIndex The index to search from.
-     * @return True if the target element is found, else false.
-     */
-    (fromIndex: number): Includes1x2<T>;
-    /**
-     * Checks if target is in collection using SameValueZero for equality comparisons. If fromIndex is negative,
-     * it’s used as the offset from the end of collection.
-     *
-     * @param collection The collection to search.
-     * @param target The value to search for.
-     * @param fromIndex The index to search from.
-     * @return True if the target element is found, else false.
-     */
-    (fromIndex: number, collection: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): boolean;
-}
-interface Includes1x2<T> {
-    /**
-     * Checks if target is in collection using SameValueZero for equality comparisons. If fromIndex is negative,
-     * it’s used as the offset from the end of collection.
-     *
-     * @param collection The collection to search.
-     * @param target The value to search for.
-     * @param fromIndex The index to search from.
-     * @return True if the target element is found, else false.
-     */
-    (): Includes1x2<T>;
-    /**
-     * Checks if target is in collection using SameValueZero for equality comparisons. If fromIndex is negative,
-     * it’s used as the offset from the end of collection.
-     *
-     * @param collection The collection to search.
-     * @param target The value to search for.
-     * @param fromIndex The index to search from.
-     * @return True if the target element is found, else false.
-     */
-    (collection: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): boolean;
-}
-
-declare const includesFrom: Includes;
+import { includesFrom } from "../fp";
 export = includesFrom;
diff --git a/types/lodash/fp/indexBy.d.ts b/types/lodash/fp/indexBy.d.ts
index 22a9e62a3b..f3f75a41fa 100644
--- a/types/lodash/fp/indexBy.d.ts
+++ b/types/lodash/fp/indexBy.d.ts
@@ -1,225 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface KeyBy {
-    /**
-     * Creates an object composed of keys generated from the results of running each element of collection through
-     * iteratee. The corresponding value of each key is the last element responsible for generating the key. The
-     * iteratee function is bound to thisArg and invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the composed aggregate object.
-     */
-    (): KeyBy;
-    /**
-     * Creates an object composed of keys generated from the results of running each element of collection through
-     * iteratee. The corresponding value of each key is the last element responsible for generating the key. The
-     * iteratee function is bound to thisArg and invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the composed aggregate object.
-     */
-    (iteratee: (value: string) => _.PropertyName): KeyBy1x1;
-    /**
-     * Creates an object composed of keys generated from the results of running each element of collection through
-     * iteratee. The corresponding value of each key is the last element responsible for generating the key. The
-     * iteratee function is bound to thisArg and invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the composed aggregate object.
-     */
-    (iteratee: (value: string) => _.PropertyName, collection: string | null | undefined): _.Dictionary<string>;
-    /**
-     * Creates an object composed of keys generated from the results of running each element of collection through
-     * iteratee. The corresponding value of each key is the last element responsible for generating the key. The
-     * iteratee function is bound to thisArg and invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the composed aggregate object.
-     */
-    <T>(iteratee: _.ValueIterateeCustom<T, _.PropertyName>): KeyBy2x1<T>;
-    /**
-     * Creates an object composed of keys generated from the results of running each element of collection through
-     * iteratee. The corresponding value of each key is the last element responsible for generating the key. The
-     * iteratee function is bound to thisArg and invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the composed aggregate object.
-     */
-    <T>(iteratee: _.ValueIterateeCustom<T, _.PropertyName>, collection: _.List<T> | null | undefined): _.Dictionary<T>;
-    /**
-     * Creates an object composed of keys generated from the results of running each element of collection through
-     * iteratee. The corresponding value of each key is the last element responsible for generating the key. The
-     * iteratee function is bound to thisArg and invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the composed aggregate object.
-     */
-    <T extends object>(iteratee: _.ValueIterateeCustom<T[keyof T], _.PropertyName>, collection: T | null | undefined): _.Dictionary<T[keyof T]>;
-}
-interface KeyBy1x1 {
-    /**
-     * Creates an object composed of keys generated from the results of running each element of collection through
-     * iteratee. The corresponding value of each key is the last element responsible for generating the key. The
-     * iteratee function is bound to thisArg and invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the composed aggregate object.
-     */
-    (): KeyBy1x1;
-    /**
-     * Creates an object composed of keys generated from the results of running each element of collection through
-     * iteratee. The corresponding value of each key is the last element responsible for generating the key. The
-     * iteratee function is bound to thisArg and invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the composed aggregate object.
-     */
-    (collection: string | null | undefined): _.Dictionary<string>;
-}
-interface KeyBy2x1<T> {
-    /**
-     * Creates an object composed of keys generated from the results of running each element of collection through
-     * iteratee. The corresponding value of each key is the last element responsible for generating the key. The
-     * iteratee function is bound to thisArg and invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the composed aggregate object.
-     */
-    (): KeyBy2x1<T>;
-    /**
-     * Creates an object composed of keys generated from the results of running each element of collection through
-     * iteratee. The corresponding value of each key is the last element responsible for generating the key. The
-     * iteratee function is bound to thisArg and invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the composed aggregate object.
-     */
-    (collection: _.List<T> | object | null | undefined): _.Dictionary<T>;
-}
-
-declare const indexBy: KeyBy;
+import { indexBy } from "../fp";
 export = indexBy;
diff --git a/types/lodash/fp/indexOf.d.ts b/types/lodash/fp/indexOf.d.ts
index 71c684508f..8078c468fd 100644
--- a/types/lodash/fp/indexOf.d.ts
+++ b/types/lodash/fp/indexOf.d.ts
@@ -1,118 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface IndexOf {
-    /**
-     * Gets the index at which the first occurrence of `value` is found in `array`
-     * using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-     * for equality comparisons. If `fromIndex` is negative, it's used as the offset
-     * from the end of `array`.
-     *
-     * @category Array
-     * @param array The array to search.
-     * @param value The value to search for.
-     * @param [fromIndex=0] The index to search from.
-     * @returns Returns the index of the matched value, else `-1`.
-     * @example
-     *
-     * _.indexOf([1, 2, 1, 2], 2);
-     * // => 1
-     *
-     * // using `fromIndex`
-     * _.indexOf([1, 2, 1, 2], 2, 2);
-     * // => 3
-     */
-    (): IndexOf;
-    /**
-     * Gets the index at which the first occurrence of `value` is found in `array`
-     * using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-     * for equality comparisons. If `fromIndex` is negative, it's used as the offset
-     * from the end of `array`.
-     *
-     * @category Array
-     * @param array The array to search.
-     * @param value The value to search for.
-     * @param [fromIndex=0] The index to search from.
-     * @returns Returns the index of the matched value, else `-1`.
-     * @example
-     *
-     * _.indexOf([1, 2, 1, 2], 2);
-     * // => 1
-     *
-     * // using `fromIndex`
-     * _.indexOf([1, 2, 1, 2], 2, 2);
-     * // => 3
-     */
-    <T>(value: T): IndexOf1x1<T>;
-    /**
-     * Gets the index at which the first occurrence of `value` is found in `array`
-     * using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-     * for equality comparisons. If `fromIndex` is negative, it's used as the offset
-     * from the end of `array`.
-     *
-     * @category Array
-     * @param array The array to search.
-     * @param value The value to search for.
-     * @param [fromIndex=0] The index to search from.
-     * @returns Returns the index of the matched value, else `-1`.
-     * @example
-     *
-     * _.indexOf([1, 2, 1, 2], 2);
-     * // => 1
-     *
-     * // using `fromIndex`
-     * _.indexOf([1, 2, 1, 2], 2, 2);
-     * // => 3
-     */
-    <T>(value: T, array: _.List<T> | null | undefined): number;
-}
-interface IndexOf1x1<T> {
-    /**
-     * Gets the index at which the first occurrence of `value` is found in `array`
-     * using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-     * for equality comparisons. If `fromIndex` is negative, it's used as the offset
-     * from the end of `array`.
-     *
-     * @category Array
-     * @param array The array to search.
-     * @param value The value to search for.
-     * @param [fromIndex=0] The index to search from.
-     * @returns Returns the index of the matched value, else `-1`.
-     * @example
-     *
-     * _.indexOf([1, 2, 1, 2], 2);
-     * // => 1
-     *
-     * // using `fromIndex`
-     * _.indexOf([1, 2, 1, 2], 2, 2);
-     * // => 3
-     */
-    (): IndexOf1x1<T>;
-    /**
-     * Gets the index at which the first occurrence of `value` is found in `array`
-     * using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-     * for equality comparisons. If `fromIndex` is negative, it's used as the offset
-     * from the end of `array`.
-     *
-     * @category Array
-     * @param array The array to search.
-     * @param value The value to search for.
-     * @param [fromIndex=0] The index to search from.
-     * @returns Returns the index of the matched value, else `-1`.
-     * @example
-     *
-     * _.indexOf([1, 2, 1, 2], 2);
-     * // => 1
-     *
-     * // using `fromIndex`
-     * _.indexOf([1, 2, 1, 2], 2, 2);
-     * // => 3
-     */
-    (array: _.List<T> | null | undefined): number;
-}
-
-declare const indexOf: IndexOf;
+import { indexOf } from "../fp";
 export = indexOf;
diff --git a/types/lodash/fp/indexOfFrom.d.ts b/types/lodash/fp/indexOfFrom.d.ts
index 22c8315ae5..fe66609f7a 100644
--- a/types/lodash/fp/indexOfFrom.d.ts
+++ b/types/lodash/fp/indexOfFrom.d.ts
@@ -1,204 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface IndexOf {
-    /**
-     * Gets the index at which the first occurrence of `value` is found in `array`
-     * using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-     * for equality comparisons. If `fromIndex` is negative, it's used as the offset
-     * from the end of `array`.
-     *
-     * @category Array
-     * @param array The array to search.
-     * @param value The value to search for.
-     * @param [fromIndex=0] The index to search from.
-     * @returns Returns the index of the matched value, else `-1`.
-     * @example
-     *
-     * _.indexOf([1, 2, 1, 2], 2);
-     * // => 1
-     *
-     * // using `fromIndex`
-     * _.indexOf([1, 2, 1, 2], 2, 2);
-     * // => 3
-     */
-    (): IndexOf;
-    /**
-     * Gets the index at which the first occurrence of `value` is found in `array`
-     * using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-     * for equality comparisons. If `fromIndex` is negative, it's used as the offset
-     * from the end of `array`.
-     *
-     * @category Array
-     * @param array The array to search.
-     * @param value The value to search for.
-     * @param [fromIndex=0] The index to search from.
-     * @returns Returns the index of the matched value, else `-1`.
-     * @example
-     *
-     * _.indexOf([1, 2, 1, 2], 2);
-     * // => 1
-     *
-     * // using `fromIndex`
-     * _.indexOf([1, 2, 1, 2], 2, 2);
-     * // => 3
-     */
-    <T>(value: T): IndexOf1x1<T>;
-    /**
-     * Gets the index at which the first occurrence of `value` is found in `array`
-     * using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-     * for equality comparisons. If `fromIndex` is negative, it's used as the offset
-     * from the end of `array`.
-     *
-     * @category Array
-     * @param array The array to search.
-     * @param value The value to search for.
-     * @param [fromIndex=0] The index to search from.
-     * @returns Returns the index of the matched value, else `-1`.
-     * @example
-     *
-     * _.indexOf([1, 2, 1, 2], 2);
-     * // => 1
-     *
-     * // using `fromIndex`
-     * _.indexOf([1, 2, 1, 2], 2, 2);
-     * // => 3
-     */
-    <T>(value: T, fromIndex: number): IndexOf1x2<T>;
-    /**
-     * Gets the index at which the first occurrence of `value` is found in `array`
-     * using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-     * for equality comparisons. If `fromIndex` is negative, it's used as the offset
-     * from the end of `array`.
-     *
-     * @category Array
-     * @param array The array to search.
-     * @param value The value to search for.
-     * @param [fromIndex=0] The index to search from.
-     * @returns Returns the index of the matched value, else `-1`.
-     * @example
-     *
-     * _.indexOf([1, 2, 1, 2], 2);
-     * // => 1
-     *
-     * // using `fromIndex`
-     * _.indexOf([1, 2, 1, 2], 2, 2);
-     * // => 3
-     */
-    <T>(value: T, fromIndex: number, array: _.List<T> | null | undefined): number;
-}
-interface IndexOf1x1<T> {
-    /**
-     * Gets the index at which the first occurrence of `value` is found in `array`
-     * using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-     * for equality comparisons. If `fromIndex` is negative, it's used as the offset
-     * from the end of `array`.
-     *
-     * @category Array
-     * @param array The array to search.
-     * @param value The value to search for.
-     * @param [fromIndex=0] The index to search from.
-     * @returns Returns the index of the matched value, else `-1`.
-     * @example
-     *
-     * _.indexOf([1, 2, 1, 2], 2);
-     * // => 1
-     *
-     * // using `fromIndex`
-     * _.indexOf([1, 2, 1, 2], 2, 2);
-     * // => 3
-     */
-    (): IndexOf1x1<T>;
-    /**
-     * Gets the index at which the first occurrence of `value` is found in `array`
-     * using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-     * for equality comparisons. If `fromIndex` is negative, it's used as the offset
-     * from the end of `array`.
-     *
-     * @category Array
-     * @param array The array to search.
-     * @param value The value to search for.
-     * @param [fromIndex=0] The index to search from.
-     * @returns Returns the index of the matched value, else `-1`.
-     * @example
-     *
-     * _.indexOf([1, 2, 1, 2], 2);
-     * // => 1
-     *
-     * // using `fromIndex`
-     * _.indexOf([1, 2, 1, 2], 2, 2);
-     * // => 3
-     */
-    (fromIndex: number): IndexOf1x2<T>;
-    /**
-     * Gets the index at which the first occurrence of `value` is found in `array`
-     * using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-     * for equality comparisons. If `fromIndex` is negative, it's used as the offset
-     * from the end of `array`.
-     *
-     * @category Array
-     * @param array The array to search.
-     * @param value The value to search for.
-     * @param [fromIndex=0] The index to search from.
-     * @returns Returns the index of the matched value, else `-1`.
-     * @example
-     *
-     * _.indexOf([1, 2, 1, 2], 2);
-     * // => 1
-     *
-     * // using `fromIndex`
-     * _.indexOf([1, 2, 1, 2], 2, 2);
-     * // => 3
-     */
-    (fromIndex: number, array: _.List<T> | null | undefined): number;
-}
-interface IndexOf1x2<T> {
-    /**
-     * Gets the index at which the first occurrence of `value` is found in `array`
-     * using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-     * for equality comparisons. If `fromIndex` is negative, it's used as the offset
-     * from the end of `array`.
-     *
-     * @category Array
-     * @param array The array to search.
-     * @param value The value to search for.
-     * @param [fromIndex=0] The index to search from.
-     * @returns Returns the index of the matched value, else `-1`.
-     * @example
-     *
-     * _.indexOf([1, 2, 1, 2], 2);
-     * // => 1
-     *
-     * // using `fromIndex`
-     * _.indexOf([1, 2, 1, 2], 2, 2);
-     * // => 3
-     */
-    (): IndexOf1x2<T>;
-    /**
-     * Gets the index at which the first occurrence of `value` is found in `array`
-     * using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-     * for equality comparisons. If `fromIndex` is negative, it's used as the offset
-     * from the end of `array`.
-     *
-     * @category Array
-     * @param array The array to search.
-     * @param value The value to search for.
-     * @param [fromIndex=0] The index to search from.
-     * @returns Returns the index of the matched value, else `-1`.
-     * @example
-     *
-     * _.indexOf([1, 2, 1, 2], 2);
-     * // => 1
-     *
-     * // using `fromIndex`
-     * _.indexOf([1, 2, 1, 2], 2, 2);
-     * // => 3
-     */
-    (array: _.List<T> | null | undefined): number;
-}
-
-declare const indexOfFrom: IndexOf;
+import { indexOfFrom } from "../fp";
 export = indexOfFrom;
diff --git a/types/lodash/fp/init.d.ts b/types/lodash/fp/init.d.ts
index 3c22717976..2f37ecd284 100644
--- a/types/lodash/fp/init.d.ts
+++ b/types/lodash/fp/init.d.ts
@@ -1,17 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-type Initial =
-    /**
-     * Gets all but the last element of array.
-     *
-     * @param array The array to query.
-     * @return Returns the slice of array.
-     */
-    <T>(array: _.List<T> | null | undefined) => T[];
-
-declare const init: Initial;
+import { init } from "../fp";
 export = init;
diff --git a/types/lodash/fp/initial.d.ts b/types/lodash/fp/initial.d.ts
index e4d10ae946..446da0678b 100644
--- a/types/lodash/fp/initial.d.ts
+++ b/types/lodash/fp/initial.d.ts
@@ -1,17 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-type Initial =
-    /**
-     * Gets all but the last element of array.
-     *
-     * @param array The array to query.
-     * @return Returns the slice of array.
-     */
-    <T>(array: _.List<T> | null | undefined) => T[];
-
-declare const initial: Initial;
+import { initial } from "../fp";
 export = initial;
diff --git a/types/lodash/fp/intersection.d.ts b/types/lodash/fp/intersection.d.ts
index ad290ebd3e..41d7915841 100644
--- a/types/lodash/fp/intersection.d.ts
+++ b/types/lodash/fp/intersection.d.ts
@@ -1,53 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Intersection {
-    /**
-     * Creates an array of unique values that are included in all of the provided arrays using SameValueZero for
-     * equality comparisons.
-     *
-     * @param arrays The arrays to inspect.
-     * @return Returns the new array of shared values.
-     */
-    (): Intersection;
-    /**
-     * Creates an array of unique values that are included in all of the provided arrays using SameValueZero for
-     * equality comparisons.
-     *
-     * @param arrays The arrays to inspect.
-     * @return Returns the new array of shared values.
-     */
-    <T>(arrays2: _.List<T>): Intersection1x1<T>;
-    /**
-     * Creates an array of unique values that are included in all of the provided arrays using SameValueZero for
-     * equality comparisons.
-     *
-     * @param arrays The arrays to inspect.
-     * @return Returns the new array of shared values.
-     */
-    <T>(arrays2: _.List<T>, arrays: _.List<T>): T[];
-}
-interface Intersection1x1<T> {
-    /**
-     * Creates an array of unique values that are included in all of the provided arrays using SameValueZero for
-     * equality comparisons.
-     *
-     * @param arrays The arrays to inspect.
-     * @return Returns the new array of shared values.
-     */
-    (): Intersection1x1<T>;
-    /**
-     * Creates an array of unique values that are included in all of the provided arrays using SameValueZero for
-     * equality comparisons.
-     *
-     * @param arrays The arrays to inspect.
-     * @return Returns the new array of shared values.
-     */
-    (arrays: _.List<T>): T[];
-}
-
-declare const intersection: Intersection;
+import { intersection } from "../fp";
 export = intersection;
diff --git a/types/lodash/fp/intersectionBy.d.ts b/types/lodash/fp/intersectionBy.d.ts
index 6b94ad98f7..a123ddda0d 100644
--- a/types/lodash/fp/intersectionBy.d.ts
+++ b/types/lodash/fp/intersectionBy.d.ts
@@ -1,186 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface IntersectionBy {
-    /**
-     * This method is like `_.intersection` except that it accepts `iteratee`
-     * which is invoked for each element of each `arrays` to generate the criterion
-     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the new array of shared values.
-     * @example
-     *
-     * _.intersectionBy([2.1, 1.2], [4.3, 2.4], Math.floor);
-     * // => [2.1]
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.intersectionBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
-     * // => [{ 'x': 1 }]
-     */
-    (): IntersectionBy;
-    /**
-     * This method is like `_.intersection` except that it accepts `iteratee`
-     * which is invoked for each element of each `arrays` to generate the criterion
-     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the new array of shared values.
-     * @example
-     *
-     * _.intersectionBy([2.1, 1.2], [4.3, 2.4], Math.floor);
-     * // => [2.1]
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.intersectionBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
-     * // => [{ 'x': 1 }]
-     */
-    <T1, T2>(iteratee: _.ValueIteratee<T1 | T2>): IntersectionBy1x1<T1, T2>;
-    /**
-     * This method is like `_.intersection` except that it accepts `iteratee`
-     * which is invoked for each element of each `arrays` to generate the criterion
-     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the new array of shared values.
-     * @example
-     *
-     * _.intersectionBy([2.1, 1.2], [4.3, 2.4], Math.floor);
-     * // => [2.1]
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.intersectionBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
-     * // => [{ 'x': 1 }]
-     */
-    <T1, T2>(iteratee: _.ValueIteratee<T1 | T2>, array: _.List<T1> | null): IntersectionBy1x2<T1, T2>;
-    /**
-     * This method is like `_.intersection` except that it accepts `iteratee`
-     * which is invoked for each element of each `arrays` to generate the criterion
-     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the new array of shared values.
-     * @example
-     *
-     * _.intersectionBy([2.1, 1.2], [4.3, 2.4], Math.floor);
-     * // => [2.1]
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.intersectionBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
-     * // => [{ 'x': 1 }]
-     */
-    <T1, T2>(iteratee: _.ValueIteratee<T1 | T2>, array: _.List<T1> | null, values: _.List<T2>): T1[];
-}
-interface IntersectionBy1x1<T1, T2> {
-    /**
-     * This method is like `_.intersection` except that it accepts `iteratee`
-     * which is invoked for each element of each `arrays` to generate the criterion
-     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the new array of shared values.
-     * @example
-     *
-     * _.intersectionBy([2.1, 1.2], [4.3, 2.4], Math.floor);
-     * // => [2.1]
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.intersectionBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
-     * // => [{ 'x': 1 }]
-     */
-    (): IntersectionBy1x1<T1, T2>;
-    /**
-     * This method is like `_.intersection` except that it accepts `iteratee`
-     * which is invoked for each element of each `arrays` to generate the criterion
-     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the new array of shared values.
-     * @example
-     *
-     * _.intersectionBy([2.1, 1.2], [4.3, 2.4], Math.floor);
-     * // => [2.1]
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.intersectionBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
-     * // => [{ 'x': 1 }]
-     */
-    (array: _.List<T1> | null): IntersectionBy1x2<T1, T2>;
-    /**
-     * This method is like `_.intersection` except that it accepts `iteratee`
-     * which is invoked for each element of each `arrays` to generate the criterion
-     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the new array of shared values.
-     * @example
-     *
-     * _.intersectionBy([2.1, 1.2], [4.3, 2.4], Math.floor);
-     * // => [2.1]
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.intersectionBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
-     * // => [{ 'x': 1 }]
-     */
-    (array: _.List<T1> | null, values: _.List<T2>): T1[];
-}
-interface IntersectionBy1x2<T1, T2> {
-    /**
-     * This method is like `_.intersection` except that it accepts `iteratee`
-     * which is invoked for each element of each `arrays` to generate the criterion
-     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the new array of shared values.
-     * @example
-     *
-     * _.intersectionBy([2.1, 1.2], [4.3, 2.4], Math.floor);
-     * // => [2.1]
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.intersectionBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
-     * // => [{ 'x': 1 }]
-     */
-    (): IntersectionBy1x2<T1, T2>;
-    /**
-     * This method is like `_.intersection` except that it accepts `iteratee`
-     * which is invoked for each element of each `arrays` to generate the criterion
-     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the new array of shared values.
-     * @example
-     *
-     * _.intersectionBy([2.1, 1.2], [4.3, 2.4], Math.floor);
-     * // => [2.1]
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.intersectionBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
-     * // => [{ 'x': 1 }]
-     */
-    (values: _.List<T2>): T1[];
-}
-
-declare const intersectionBy: IntersectionBy;
+import { intersectionBy } from "../fp";
 export = intersectionBy;
diff --git a/types/lodash/fp/intersectionWith.d.ts b/types/lodash/fp/intersectionWith.d.ts
index 275d2fb3a9..9ad9941570 100644
--- a/types/lodash/fp/intersectionWith.d.ts
+++ b/types/lodash/fp/intersectionWith.d.ts
@@ -1,177 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface IntersectionWith {
-    /**
-     * Creates an array of unique `array` values not included in the other
-     * provided arrays using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-     * for equality comparisons.
-     *
-     * @category Array
-     * @param [values] The arrays to inspect.
-     * @param [comparator] The comparator invoked per element.
-     * @returns Returns the new array of filtered values.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
-
-     * _.intersectionWith(objects, others, _.isEqual);
-     * // => [{ 'x': 1, 'y': 2 }]
-     */
-    (): IntersectionWith;
-    /**
-     * Creates an array of unique `array` values not included in the other
-     * provided arrays using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-     * for equality comparisons.
-     *
-     * @category Array
-     * @param [values] The arrays to inspect.
-     * @param [comparator] The comparator invoked per element.
-     * @returns Returns the new array of filtered values.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
-
-     * _.intersectionWith(objects, others, _.isEqual);
-     * // => [{ 'x': 1, 'y': 2 }]
-     */
-    <T1, T2>(comparator: _.Comparator2<T1, T2>): IntersectionWith1x1<T1, T2>;
-    /**
-     * Creates an array of unique `array` values not included in the other
-     * provided arrays using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-     * for equality comparisons.
-     *
-     * @category Array
-     * @param [values] The arrays to inspect.
-     * @param [comparator] The comparator invoked per element.
-     * @returns Returns the new array of filtered values.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
-
-     * _.intersectionWith(objects, others, _.isEqual);
-     * // => [{ 'x': 1, 'y': 2 }]
-     */
-    <T1, T2>(comparator: _.Comparator2<T1, T2>, array: _.List<T1> | null | undefined): IntersectionWith1x2<T1, T2>;
-    /**
-     * Creates an array of unique `array` values not included in the other
-     * provided arrays using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-     * for equality comparisons.
-     *
-     * @category Array
-     * @param [values] The arrays to inspect.
-     * @param [comparator] The comparator invoked per element.
-     * @returns Returns the new array of filtered values.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
-
-     * _.intersectionWith(objects, others, _.isEqual);
-     * // => [{ 'x': 1, 'y': 2 }]
-     */
-    <T1, T2>(comparator: _.Comparator2<T1, T2>, array: _.List<T1> | null | undefined, values: _.List<T2>): T1[];
-}
-interface IntersectionWith1x1<T1, T2> {
-    /**
-     * Creates an array of unique `array` values not included in the other
-     * provided arrays using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-     * for equality comparisons.
-     *
-     * @category Array
-     * @param [values] The arrays to inspect.
-     * @param [comparator] The comparator invoked per element.
-     * @returns Returns the new array of filtered values.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
-
-     * _.intersectionWith(objects, others, _.isEqual);
-     * // => [{ 'x': 1, 'y': 2 }]
-     */
-    (): IntersectionWith1x1<T1, T2>;
-    /**
-     * Creates an array of unique `array` values not included in the other
-     * provided arrays using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-     * for equality comparisons.
-     *
-     * @category Array
-     * @param [values] The arrays to inspect.
-     * @param [comparator] The comparator invoked per element.
-     * @returns Returns the new array of filtered values.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
-
-     * _.intersectionWith(objects, others, _.isEqual);
-     * // => [{ 'x': 1, 'y': 2 }]
-     */
-    (array: _.List<T1> | null | undefined): IntersectionWith1x2<T1, T2>;
-    /**
-     * Creates an array of unique `array` values not included in the other
-     * provided arrays using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-     * for equality comparisons.
-     *
-     * @category Array
-     * @param [values] The arrays to inspect.
-     * @param [comparator] The comparator invoked per element.
-     * @returns Returns the new array of filtered values.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
-
-     * _.intersectionWith(objects, others, _.isEqual);
-     * // => [{ 'x': 1, 'y': 2 }]
-     */
-    (array: _.List<T1> | null | undefined, values: _.List<T2>): T1[];
-}
-interface IntersectionWith1x2<T1, T2> {
-    /**
-     * Creates an array of unique `array` values not included in the other
-     * provided arrays using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-     * for equality comparisons.
-     *
-     * @category Array
-     * @param [values] The arrays to inspect.
-     * @param [comparator] The comparator invoked per element.
-     * @returns Returns the new array of filtered values.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
-
-     * _.intersectionWith(objects, others, _.isEqual);
-     * // => [{ 'x': 1, 'y': 2 }]
-     */
-    (): IntersectionWith1x2<T1, T2>;
-    /**
-     * Creates an array of unique `array` values not included in the other
-     * provided arrays using [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-     * for equality comparisons.
-     *
-     * @category Array
-     * @param [values] The arrays to inspect.
-     * @param [comparator] The comparator invoked per element.
-     * @returns Returns the new array of filtered values.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
-
-     * _.intersectionWith(objects, others, _.isEqual);
-     * // => [{ 'x': 1, 'y': 2 }]
-     */
-    (values: _.List<T2>): T1[];
-}
-
-declare const intersectionWith: IntersectionWith;
+import { intersectionWith } from "../fp";
 export = intersectionWith;
diff --git a/types/lodash/fp/invert.d.ts b/types/lodash/fp/invert.d.ts
index fa6e62340e..a41c2bc244 100644
--- a/types/lodash/fp/invert.d.ts
+++ b/types/lodash/fp/invert.d.ts
@@ -1,19 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-type Invert =
-    /**
-     * Creates an object composed of the inverted keys and values of object. If object contains duplicate values,
-     * subsequent values overwrite property assignments of previous values unless multiValue is true.
-     *
-     * @param object The object to invert.
-     * @param multiValue Allow multiple values per key.
-     * @return Returns the new inverted object.
-     */
-    (object: object) => _.Dictionary<string>;
-
-declare const invert: Invert;
+import { invert } from "../fp";
 export = invert;
diff --git a/types/lodash/fp/invertBy.d.ts b/types/lodash/fp/invertBy.d.ts
index 5a386385ae..e28f7135f4 100644
--- a/types/lodash/fp/invertBy.d.ts
+++ b/types/lodash/fp/invertBy.d.ts
@@ -1,73 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface InvertBy {
-    /**
-     * This method is like _.invert except that the inverted object is generated from the results of running each
-     * element of object through iteratee. The corresponding inverted value of each inverted key is an array of
-     * keys responsible for generating the inverted value. The iteratee is invoked with one argument: (value).
-     *
-     * @param object The object to invert.
-     * @param interatee The iteratee invoked per element.
-     * @return Returns the new inverted object.
-     */
-    (): InvertBy;
-    /**
-     * This method is like _.invert except that the inverted object is generated from the results of running each
-     * element of object through iteratee. The corresponding inverted value of each inverted key is an array of
-     * keys responsible for generating the inverted value. The iteratee is invoked with one argument: (value).
-     *
-     * @param object The object to invert.
-     * @param interatee The iteratee invoked per element.
-     * @return Returns the new inverted object.
-     */
-    <T>(interatee: _.ValueIteratee<T>): InvertBy1x1<T>;
-    /**
-     * This method is like _.invert except that the inverted object is generated from the results of running each
-     * element of object through iteratee. The corresponding inverted value of each inverted key is an array of
-     * keys responsible for generating the inverted value. The iteratee is invoked with one argument: (value).
-     *
-     * @param object The object to invert.
-     * @param interatee The iteratee invoked per element.
-     * @return Returns the new inverted object.
-     */
-    <T>(interatee: _.ValueIteratee<T>, object: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): _.Dictionary<string[]>;
-    /**
-     * This method is like _.invert except that the inverted object is generated from the results of running each
-     * element of object through iteratee. The corresponding inverted value of each inverted key is an array of
-     * keys responsible for generating the inverted value. The iteratee is invoked with one argument: (value).
-     *
-     * @param object The object to invert.
-     * @param interatee The iteratee invoked per element.
-     * @return Returns the new inverted object.
-     */
-    <T extends object>(interatee: _.ValueIteratee<T[keyof T]>, object: T | null | undefined): _.Dictionary<string[]>;
-}
-interface InvertBy1x1<T> {
-    /**
-     * This method is like _.invert except that the inverted object is generated from the results of running each
-     * element of object through iteratee. The corresponding inverted value of each inverted key is an array of
-     * keys responsible for generating the inverted value. The iteratee is invoked with one argument: (value).
-     *
-     * @param object The object to invert.
-     * @param interatee The iteratee invoked per element.
-     * @return Returns the new inverted object.
-     */
-    (): InvertBy1x1<T>;
-    /**
-     * This method is like _.invert except that the inverted object is generated from the results of running each
-     * element of object through iteratee. The corresponding inverted value of each inverted key is an array of
-     * keys responsible for generating the inverted value. The iteratee is invoked with one argument: (value).
-     *
-     * @param object The object to invert.
-     * @param interatee The iteratee invoked per element.
-     * @return Returns the new inverted object.
-     */
-    (object: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | object | null | undefined): _.Dictionary<string[]>;
-}
-
-declare const invertBy: InvertBy;
+import { invertBy } from "../fp";
 export = invertBy;
diff --git a/types/lodash/fp/invertObj.d.ts b/types/lodash/fp/invertObj.d.ts
index aeeb28ca48..2e16c4f8fb 100644
--- a/types/lodash/fp/invertObj.d.ts
+++ b/types/lodash/fp/invertObj.d.ts
@@ -1,19 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-type Invert =
-    /**
-     * Creates an object composed of the inverted keys and values of object. If object contains duplicate values,
-     * subsequent values overwrite property assignments of previous values unless multiValue is true.
-     *
-     * @param object The object to invert.
-     * @param multiValue Allow multiple values per key.
-     * @return Returns the new inverted object.
-     */
-    (object: object) => _.Dictionary<string>;
-
-declare const invertObj: Invert;
+import { invertObj } from "../fp";
 export = invertObj;
diff --git a/types/lodash/fp/invoke.d.ts b/types/lodash/fp/invoke.d.ts
index 9a72390f8e..1a9ce3b355 100644
--- a/types/lodash/fp/invoke.d.ts
+++ b/types/lodash/fp/invoke.d.ts
@@ -1,48 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Invoke {
-    /**
-    * Invokes the method at path of object.
-    * @param object The object to query.
-    * @param path The path of the method to invoke.
-    * @param args The arguments to invoke the method with.
-    **/
-    (): Invoke;
-    /**
-    * Invokes the method at path of object.
-    * @param object The object to query.
-    * @param path The path of the method to invoke.
-    * @param args The arguments to invoke the method with.
-    **/
-    (path: _.PropertyPath): Invoke1x1;
-    /**
-    * Invokes the method at path of object.
-    * @param object The object to query.
-    * @param path The path of the method to invoke.
-    * @param args The arguments to invoke the method with.
-    **/
-    (path: _.PropertyPath, object: any): any;
-}
-interface Invoke1x1 {
-    /**
-    * Invokes the method at path of object.
-    * @param object The object to query.
-    * @param path The path of the method to invoke.
-    * @param args The arguments to invoke the method with.
-    **/
-    (): Invoke1x1;
-    /**
-    * Invokes the method at path of object.
-    * @param object The object to query.
-    * @param path The path of the method to invoke.
-    * @param args The arguments to invoke the method with.
-    **/
-    (object: any): any;
-}
-
-declare const invoke: Invoke;
+import { invoke } from "../fp";
 export = invoke;
diff --git a/types/lodash/fp/invokeArgs.d.ts b/types/lodash/fp/invokeArgs.d.ts
index 5c385579fd..8b498e0ec1 100644
--- a/types/lodash/fp/invokeArgs.d.ts
+++ b/types/lodash/fp/invokeArgs.d.ts
@@ -1,78 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Invoke {
-    /**
-    * Invokes the method at path of object.
-    * @param object The object to query.
-    * @param path The path of the method to invoke.
-    * @param args The arguments to invoke the method with.
-    **/
-    (): Invoke;
-    /**
-    * Invokes the method at path of object.
-    * @param object The object to query.
-    * @param path The path of the method to invoke.
-    * @param args The arguments to invoke the method with.
-    **/
-    (path: _.PropertyPath): Invoke1x1;
-    /**
-    * Invokes the method at path of object.
-    * @param object The object to query.
-    * @param path The path of the method to invoke.
-    * @param args The arguments to invoke the method with.
-    **/
-    (path: _.PropertyPath, args: ReadonlyArray<any>): Invoke1x2;
-    /**
-    * Invokes the method at path of object.
-    * @param object The object to query.
-    * @param path The path of the method to invoke.
-    * @param args The arguments to invoke the method with.
-    **/
-    (path: _.PropertyPath, args: ReadonlyArray<any>, object: any): any;
-}
-interface Invoke1x1 {
-    /**
-    * Invokes the method at path of object.
-    * @param object The object to query.
-    * @param path The path of the method to invoke.
-    * @param args The arguments to invoke the method with.
-    **/
-    (): Invoke1x1;
-    /**
-    * Invokes the method at path of object.
-    * @param object The object to query.
-    * @param path The path of the method to invoke.
-    * @param args The arguments to invoke the method with.
-    **/
-    (args: ReadonlyArray<any>): Invoke1x2;
-    /**
-    * Invokes the method at path of object.
-    * @param object The object to query.
-    * @param path The path of the method to invoke.
-    * @param args The arguments to invoke the method with.
-    **/
-    (args: ReadonlyArray<any>, object: any): any;
-}
-interface Invoke1x2 {
-    /**
-    * Invokes the method at path of object.
-    * @param object The object to query.
-    * @param path The path of the method to invoke.
-    * @param args The arguments to invoke the method with.
-    **/
-    (): Invoke1x2;
-    /**
-    * Invokes the method at path of object.
-    * @param object The object to query.
-    * @param path The path of the method to invoke.
-    * @param args The arguments to invoke the method with.
-    **/
-    (object: any): any;
-}
-
-declare const invokeArgs: Invoke;
+import { invokeArgs } from "../fp";
 export = invokeArgs;
diff --git a/types/lodash/fp/invokeArgsMap.d.ts b/types/lodash/fp/invokeArgsMap.d.ts
index 59e6170594..f5ba3e7ec5 100644
--- a/types/lodash/fp/invokeArgsMap.d.ts
+++ b/types/lodash/fp/invokeArgsMap.d.ts
@@ -1,187 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface InvokeMap {
-    /**
-    * Invokes the method named by methodName on each element in the collection returning
-    * an array of the results of each invoked method. Additional arguments will be provided
-    * to each invoked method. If methodName is a function it will be invoked for, and this
-    * bound to, each element in the collection.
-    * @param collection The collection to iterate over.
-    * @param methodName The name of the method to invoke.
-    * @param args Arguments to invoke the method with.
-    **/
-    (): InvokeMap;
-    /**
-    * Invokes the method named by methodName on each element in the collection returning
-    * an array of the results of each invoked method. Additional arguments will be provided
-    * to each invoked method. If methodName is a function it will be invoked for, and this
-    * bound to, each element in the collection.
-    * @param collection The collection to iterate over.
-    * @param methodName The name of the method to invoke.
-    * @param args Arguments to invoke the method with.
-    **/
-    (methodName: string): InvokeMap1x1;
-    /**
-    * Invokes the method named by methodName on each element in the collection returning
-    * an array of the results of each invoked method. Additional arguments will be provided
-    * to each invoked method. If methodName is a function it will be invoked for, and this
-    * bound to, each element in the collection.
-    * @param collection The collection to iterate over.
-    * @param methodName The name of the method to invoke.
-    * @param args Arguments to invoke the method with.
-    **/
-    (methodName: string, args: ReadonlyArray<any>): InvokeMap1x2;
-    /**
-    * Invokes the method named by methodName on each element in the collection returning
-    * an array of the results of each invoked method. Additional arguments will be provided
-    * to each invoked method. If methodName is a function it will be invoked for, and this
-    * bound to, each element in the collection.
-    * @param collection The collection to iterate over.
-    * @param methodName The name of the method to invoke.
-    * @param args Arguments to invoke the method with.
-    **/
-    (methodName: string, args: ReadonlyArray<any>, collection: object | null | undefined): any[];
-    /**
-    * Invokes the method named by methodName on each element in the collection returning
-    * an array of the results of each invoked method. Additional arguments will be provided
-    * to each invoked method. If methodName is a function it will be invoked for, and this
-    * bound to, each element in the collection.
-    * @param collection The collection to iterate over.
-    * @param methodName The name of the method to invoke.
-    * @param args Arguments to invoke the method with.
-    **/
-    <TResult>(method: (...args: any[]) => TResult): InvokeMap2x1<TResult>;
-    /**
-    * Invokes the method named by methodName on each element in the collection returning
-    * an array of the results of each invoked method. Additional arguments will be provided
-    * to each invoked method. If methodName is a function it will be invoked for, and this
-    * bound to, each element in the collection.
-    * @param collection The collection to iterate over.
-    * @param methodName The name of the method to invoke.
-    * @param args Arguments to invoke the method with.
-    **/
-    <TResult>(method: (...args: any[]) => TResult, args: ReadonlyArray<any>): InvokeMap2x2<TResult>;
-    /**
-    * Invokes the method named by methodName on each element in the collection returning
-    * an array of the results of each invoked method. Additional arguments will be provided
-    * to each invoked method. If methodName is a function it will be invoked for, and this
-    * bound to, each element in the collection.
-    * @param collection The collection to iterate over.
-    * @param methodName The name of the method to invoke.
-    * @param args Arguments to invoke the method with.
-    **/
-    <TResult>(method: (...args: any[]) => TResult, args: ReadonlyArray<any>, collection: object | null | undefined): TResult[];
-}
-interface InvokeMap1x1 {
-    /**
-    * Invokes the method named by methodName on each element in the collection returning
-    * an array of the results of each invoked method. Additional arguments will be provided
-    * to each invoked method. If methodName is a function it will be invoked for, and this
-    * bound to, each element in the collection.
-    * @param collection The collection to iterate over.
-    * @param methodName The name of the method to invoke.
-    * @param args Arguments to invoke the method with.
-    **/
-    (): InvokeMap1x1;
-    /**
-    * Invokes the method named by methodName on each element in the collection returning
-    * an array of the results of each invoked method. Additional arguments will be provided
-    * to each invoked method. If methodName is a function it will be invoked for, and this
-    * bound to, each element in the collection.
-    * @param collection The collection to iterate over.
-    * @param methodName The name of the method to invoke.
-    * @param args Arguments to invoke the method with.
-    **/
-    (args: ReadonlyArray<any>): InvokeMap1x2;
-    /**
-    * Invokes the method named by methodName on each element in the collection returning
-    * an array of the results of each invoked method. Additional arguments will be provided
-    * to each invoked method. If methodName is a function it will be invoked for, and this
-    * bound to, each element in the collection.
-    * @param collection The collection to iterate over.
-    * @param methodName The name of the method to invoke.
-    * @param args Arguments to invoke the method with.
-    **/
-    (args: ReadonlyArray<any>, collection: object | null | undefined): any[];
-}
-interface InvokeMap1x2 {
-    /**
-    * Invokes the method named by methodName on each element in the collection returning
-    * an array of the results of each invoked method. Additional arguments will be provided
-    * to each invoked method. If methodName is a function it will be invoked for, and this
-    * bound to, each element in the collection.
-    * @param collection The collection to iterate over.
-    * @param methodName The name of the method to invoke.
-    * @param args Arguments to invoke the method with.
-    **/
-    (): InvokeMap1x2;
-    /**
-    * Invokes the method named by methodName on each element in the collection returning
-    * an array of the results of each invoked method. Additional arguments will be provided
-    * to each invoked method. If methodName is a function it will be invoked for, and this
-    * bound to, each element in the collection.
-    * @param collection The collection to iterate over.
-    * @param methodName The name of the method to invoke.
-    * @param args Arguments to invoke the method with.
-    **/
-    (collection: object | null | undefined): any[];
-}
-interface InvokeMap2x1<TResult> {
-    /**
-    * Invokes the method named by methodName on each element in the collection returning
-    * an array of the results of each invoked method. Additional arguments will be provided
-    * to each invoked method. If methodName is a function it will be invoked for, and this
-    * bound to, each element in the collection.
-    * @param collection The collection to iterate over.
-    * @param methodName The name of the method to invoke.
-    * @param args Arguments to invoke the method with.
-    **/
-    (): InvokeMap2x1<TResult>;
-    /**
-    * Invokes the method named by methodName on each element in the collection returning
-    * an array of the results of each invoked method. Additional arguments will be provided
-    * to each invoked method. If methodName is a function it will be invoked for, and this
-    * bound to, each element in the collection.
-    * @param collection The collection to iterate over.
-    * @param methodName The name of the method to invoke.
-    * @param args Arguments to invoke the method with.
-    **/
-    (args: ReadonlyArray<any>): InvokeMap2x2<TResult>;
-    /**
-    * Invokes the method named by methodName on each element in the collection returning
-    * an array of the results of each invoked method. Additional arguments will be provided
-    * to each invoked method. If methodName is a function it will be invoked for, and this
-    * bound to, each element in the collection.
-    * @param collection The collection to iterate over.
-    * @param methodName The name of the method to invoke.
-    * @param args Arguments to invoke the method with.
-    **/
-    (args: ReadonlyArray<any>, collection: object | null | undefined): TResult[];
-}
-interface InvokeMap2x2<TResult> {
-    /**
-    * Invokes the method named by methodName on each element in the collection returning
-    * an array of the results of each invoked method. Additional arguments will be provided
-    * to each invoked method. If methodName is a function it will be invoked for, and this
-    * bound to, each element in the collection.
-    * @param collection The collection to iterate over.
-    * @param methodName The name of the method to invoke.
-    * @param args Arguments to invoke the method with.
-    **/
-    (): InvokeMap2x2<TResult>;
-    /**
-    * Invokes the method named by methodName on each element in the collection returning
-    * an array of the results of each invoked method. Additional arguments will be provided
-    * to each invoked method. If methodName is a function it will be invoked for, and this
-    * bound to, each element in the collection.
-    * @param collection The collection to iterate over.
-    * @param methodName The name of the method to invoke.
-    * @param args Arguments to invoke the method with.
-    **/
-    (collection: object | null | undefined): TResult[];
-}
-
-declare const invokeArgsMap: InvokeMap;
+import { invokeArgsMap } from "../fp";
 export = invokeArgsMap;
diff --git a/types/lodash/fp/invokeMap.d.ts b/types/lodash/fp/invokeMap.d.ts
index 3bb1072954..9f0aea9c11 100644
--- a/types/lodash/fp/invokeMap.d.ts
+++ b/types/lodash/fp/invokeMap.d.ts
@@ -1,103 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface InvokeMap {
-    /**
-    * Invokes the method named by methodName on each element in the collection returning
-    * an array of the results of each invoked method. Additional arguments will be provided
-    * to each invoked method. If methodName is a function it will be invoked for, and this
-    * bound to, each element in the collection.
-    * @param collection The collection to iterate over.
-    * @param methodName The name of the method to invoke.
-    * @param args Arguments to invoke the method with.
-    **/
-    (): InvokeMap;
-    /**
-    * Invokes the method named by methodName on each element in the collection returning
-    * an array of the results of each invoked method. Additional arguments will be provided
-    * to each invoked method. If methodName is a function it will be invoked for, and this
-    * bound to, each element in the collection.
-    * @param collection The collection to iterate over.
-    * @param methodName The name of the method to invoke.
-    * @param args Arguments to invoke the method with.
-    **/
-    (methodName: string): InvokeMap1x1;
-    /**
-    * Invokes the method named by methodName on each element in the collection returning
-    * an array of the results of each invoked method. Additional arguments will be provided
-    * to each invoked method. If methodName is a function it will be invoked for, and this
-    * bound to, each element in the collection.
-    * @param collection The collection to iterate over.
-    * @param methodName The name of the method to invoke.
-    * @param args Arguments to invoke the method with.
-    **/
-    (methodName: string, collection: object | null | undefined): any[];
-    /**
-    * Invokes the method named by methodName on each element in the collection returning
-    * an array of the results of each invoked method. Additional arguments will be provided
-    * to each invoked method. If methodName is a function it will be invoked for, and this
-    * bound to, each element in the collection.
-    * @param collection The collection to iterate over.
-    * @param methodName The name of the method to invoke.
-    * @param args Arguments to invoke the method with.
-    **/
-    <TResult>(method: (...args: any[]) => TResult): InvokeMap2x1<TResult>;
-    /**
-    * Invokes the method named by methodName on each element in the collection returning
-    * an array of the results of each invoked method. Additional arguments will be provided
-    * to each invoked method. If methodName is a function it will be invoked for, and this
-    * bound to, each element in the collection.
-    * @param collection The collection to iterate over.
-    * @param methodName The name of the method to invoke.
-    * @param args Arguments to invoke the method with.
-    **/
-    <TResult>(method: (...args: any[]) => TResult, collection: object | null | undefined): TResult[];
-}
-interface InvokeMap1x1 {
-    /**
-    * Invokes the method named by methodName on each element in the collection returning
-    * an array of the results of each invoked method. Additional arguments will be provided
-    * to each invoked method. If methodName is a function it will be invoked for, and this
-    * bound to, each element in the collection.
-    * @param collection The collection to iterate over.
-    * @param methodName The name of the method to invoke.
-    * @param args Arguments to invoke the method with.
-    **/
-    (): InvokeMap1x1;
-    /**
-    * Invokes the method named by methodName on each element in the collection returning
-    * an array of the results of each invoked method. Additional arguments will be provided
-    * to each invoked method. If methodName is a function it will be invoked for, and this
-    * bound to, each element in the collection.
-    * @param collection The collection to iterate over.
-    * @param methodName The name of the method to invoke.
-    * @param args Arguments to invoke the method with.
-    **/
-    (collection: object | null | undefined): any[];
-}
-interface InvokeMap2x1<TResult> {
-    /**
-    * Invokes the method named by methodName on each element in the collection returning
-    * an array of the results of each invoked method. Additional arguments will be provided
-    * to each invoked method. If methodName is a function it will be invoked for, and this
-    * bound to, each element in the collection.
-    * @param collection The collection to iterate over.
-    * @param methodName The name of the method to invoke.
-    * @param args Arguments to invoke the method with.
-    **/
-    (): InvokeMap2x1<TResult>;
-    /**
-    * Invokes the method named by methodName on each element in the collection returning
-    * an array of the results of each invoked method. Additional arguments will be provided
-    * to each invoked method. If methodName is a function it will be invoked for, and this
-    * bound to, each element in the collection.
-    * @param collection The collection to iterate over.
-    * @param methodName The name of the method to invoke.
-    * @param args Arguments to invoke the method with.
-    **/
-    (collection: object | null | undefined): TResult[];
-}
-
-declare const invokeMap: InvokeMap;
+import { invokeMap } from "../fp";
 export = invokeMap;
diff --git a/types/lodash/fp/isArguments.d.ts b/types/lodash/fp/isArguments.d.ts
index 53841e17fc..23c438c0a5 100644
--- a/types/lodash/fp/isArguments.d.ts
+++ b/types/lodash/fp/isArguments.d.ts
@@ -1,15 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type IsArguments =
-    /**
-     * Checks if value is classified as an arguments object.
-     *
-     * @param value The value to check.
-     * @return Returns true if value is correctly classified, else false.
-     */
-    (value: any) => value is IArguments;
-
-declare const isArguments: IsArguments;
+import { isArguments } from "../fp";
 export = isArguments;
diff --git a/types/lodash/fp/isArray.d.ts b/types/lodash/fp/isArray.d.ts
index 6f96cdbe55..dadecce65f 100644
--- a/types/lodash/fp/isArray.d.ts
+++ b/types/lodash/fp/isArray.d.ts
@@ -1,15 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type IsArray =
-    /**
-     * Checks if value is classified as an Array object.
-     * @param value The value to check.
-     *
-     * @return Returns true if value is correctly classified, else false.
-     */
-    (value: any) => value is any[];
-
-declare const isArray: IsArray;
+import { isArray } from "../fp";
 export = isArray;
diff --git a/types/lodash/fp/isArrayBuffer.d.ts b/types/lodash/fp/isArrayBuffer.d.ts
index a9fab817ec..32018346ba 100644
--- a/types/lodash/fp/isArrayBuffer.d.ts
+++ b/types/lodash/fp/isArrayBuffer.d.ts
@@ -1,15 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type IsArrayBuffer =
-    /**
-     * Checks if value is classified as an ArrayBuffer object.
-     *
-     * @param value The value to check.
-     * @return Returns true if value is correctly classified, else false.
-     */
-    (value: any) => value is ArrayBuffer;
-
-declare const isArrayBuffer: IsArrayBuffer;
+import { isArrayBuffer } from "../fp";
 export = isArrayBuffer;
diff --git a/types/lodash/fp/isArrayLike.d.ts b/types/lodash/fp/isArrayLike.d.ts
index 4d99172433..2be9b54c93 100644
--- a/types/lodash/fp/isArrayLike.d.ts
+++ b/types/lodash/fp/isArrayLike.d.ts
@@ -1,78 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface IsArrayLike {
-    /**
-     * Checks if `value` is array-like. A value is considered array-like if it's
-     * not a function and has a `value.length` that's an integer greater than or
-     * equal to `0` and less than or equal to `Number.MAX_SAFE_INTEGER`.
-     *
-     * @category Lang
-     * @param value The value to check.
-     * @returns Returns `true` if `value` is array-like, else `false`.
-     * @example
-     *
-     * _.isArrayLike([1, 2, 3]);
-     * // => true
-     *
-     * _.isArrayLike(document.body.children);
-     * // => true
-     *
-     * _.isArrayLike('abc');
-     * // => true
-     *
-     * _.isArrayLike(_.noop);
-     * // => false
-     */
-    <T>(value: T & string & number): boolean;
-    /**
-     * Checks if `value` is array-like. A value is considered array-like if it's
-     * not a function and has a `value.length` that's an integer greater than or
-     * equal to `0` and less than or equal to `Number.MAX_SAFE_INTEGER`.
-     *
-     * @category Lang
-     * @param value The value to check.
-     * @returns Returns `true` if `value` is array-like, else `false`.
-     * @example
-     *
-     * _.isArrayLike([1, 2, 3]);
-     * // => true
-     *
-     * _.isArrayLike(document.body.children);
-     * // => true
-     *
-     * _.isArrayLike('abc');
-     * // => true
-     *
-     * _.isArrayLike(_.noop);
-     * // => false
-     */
-    (value: ((...args: any[]) => any) | null | undefined): value is never;
-    /**
-     * Checks if `value` is array-like. A value is considered array-like if it's
-     * not a function and has a `value.length` that's an integer greater than or
-     * equal to `0` and less than or equal to `Number.MAX_SAFE_INTEGER`.
-     *
-     * @category Lang
-     * @param value The value to check.
-     * @returns Returns `true` if `value` is array-like, else `false`.
-     * @example
-     *
-     * _.isArrayLike([1, 2, 3]);
-     * // => true
-     *
-     * _.isArrayLike(document.body.children);
-     * // => true
-     *
-     * _.isArrayLike('abc');
-     * // => true
-     *
-     * _.isArrayLike(_.noop);
-     * // => false
-     */
-    (value: any): value is { length: number };
-}
-
-declare const isArrayLike: IsArrayLike;
+import { isArrayLike } from "../fp";
 export = isArrayLike;
diff --git a/types/lodash/fp/isArrayLikeObject.d.ts b/types/lodash/fp/isArrayLikeObject.d.ts
index f21c1f6836..709f5135fe 100644
--- a/types/lodash/fp/isArrayLikeObject.d.ts
+++ b/types/lodash/fp/isArrayLikeObject.d.ts
@@ -1,77 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface IsArrayLikeObject {
-    /**
-     * This method is like `_.isArrayLike` except that it also checks if `value`
-     * is an object.
-     *
-     * @category Lang
-     * @param value The value to check.
-     * @returns Returns `true` if `value` is an array-like object, else `false`.
-     * @example
-     *
-     * _.isArrayLikeObject([1, 2, 3]);
-     * // => true
-     *
-     * _.isArrayLikeObject(document.body.children);
-     * // => true
-     *
-     * _.isArrayLikeObject('abc');
-     * // => false
-     *
-     * _.isArrayLikeObject(_.noop);
-     * // => false
-     */
-    <T>(value: T & string & number): boolean;
-    /**
-     * This method is like `_.isArrayLike` except that it also checks if `value`
-     * is an object.
-     *
-     * @category Lang
-     * @param value The value to check.
-     * @returns Returns `true` if `value` is an array-like object, else `false`.
-     * @example
-     *
-     * _.isArrayLikeObject([1, 2, 3]);
-     * // => true
-     *
-     * _.isArrayLikeObject(document.body.children);
-     * // => true
-     *
-     * _.isArrayLikeObject('abc');
-     * // => false
-     *
-     * _.isArrayLikeObject(_.noop);
-     * // => false
-     */
-    // tslint:disable-next-line:ban-types (type guard doesn't seem to work correctly without the Function type)
-    (value: ((...args: any[]) => any) | Function | string | boolean | number | null | undefined): value is never;
-    /**
-     * This method is like `_.isArrayLike` except that it also checks if `value`
-     * is an object.
-     *
-     * @category Lang
-     * @param value The value to check.
-     * @returns Returns `true` if `value` is an array-like object, else `false`.
-     * @example
-     *
-     * _.isArrayLikeObject([1, 2, 3]);
-     * // => true
-     *
-     * _.isArrayLikeObject(document.body.children);
-     * // => true
-     *
-     * _.isArrayLikeObject('abc');
-     * // => false
-     *
-     * _.isArrayLikeObject(_.noop);
-     * // => false
-     */
-    // tslint:disable-next-line:ban-types (type guard doesn't seem to work correctly without the Function type)
-    <T extends object>(value: T | ((...args: any[]) => any) | Function | string | boolean | number | null | undefined): value is T & { length: number };
-}
-
-declare const isArrayLikeObject: IsArrayLikeObject;
+import { isArrayLikeObject } from "../fp";
 export = isArrayLikeObject;
diff --git a/types/lodash/fp/isBoolean.d.ts b/types/lodash/fp/isBoolean.d.ts
index 45aaa6d2f9..605cb2cb7e 100644
--- a/types/lodash/fp/isBoolean.d.ts
+++ b/types/lodash/fp/isBoolean.d.ts
@@ -1,15 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type IsBoolean =
-    /**
-     * Checks if value is classified as a boolean primitive or object.
-     *
-     * @param value The value to check.
-     * @return Returns true if value is correctly classified, else false.
-     */
-    (value: any) => value is boolean;
-
-declare const isBoolean: IsBoolean;
+import { isBoolean } from "../fp";
 export = isBoolean;
diff --git a/types/lodash/fp/isBuffer.d.ts b/types/lodash/fp/isBuffer.d.ts
index a603cf2d68..3d06b548c1 100644
--- a/types/lodash/fp/isBuffer.d.ts
+++ b/types/lodash/fp/isBuffer.d.ts
@@ -1,15 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type IsBuffer =
-    /**
-     * Checks if value is a buffer.
-     *
-     * @param value The value to check.
-     * @return Returns true if value is a buffer, else false.
-     */
-    (value: any) => boolean;
-
-declare const isBuffer: IsBuffer;
+import { isBuffer } from "../fp";
 export = isBuffer;
diff --git a/types/lodash/fp/isDate.d.ts b/types/lodash/fp/isDate.d.ts
index a602131f26..979594f995 100644
--- a/types/lodash/fp/isDate.d.ts
+++ b/types/lodash/fp/isDate.d.ts
@@ -1,15 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type IsDate =
-    /**
-     * Checks if value is classified as a Date object.
-     * @param value The value to check.
-     *
-     * @return Returns true if value is correctly classified, else false.
-     */
-    (value: any) => value is Date;
-
-declare const isDate: IsDate;
+import { isDate } from "../fp";
 export = isDate;
diff --git a/types/lodash/fp/isElement.d.ts b/types/lodash/fp/isElement.d.ts
index 56fe27d3a6..26739ad952 100644
--- a/types/lodash/fp/isElement.d.ts
+++ b/types/lodash/fp/isElement.d.ts
@@ -1,15 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type IsElement =
-    /**
-     * Checks if value is a DOM element.
-     *
-     * @param value The value to check.
-     * @return Returns true if value is a DOM element, else false.
-     */
-    (value: any) => boolean;
-
-declare const isElement: IsElement;
+import { isElement } from "../fp";
 export = isElement;
diff --git a/types/lodash/fp/isEmpty.d.ts b/types/lodash/fp/isEmpty.d.ts
index b24d33f88e..ed9b33f822 100644
--- a/types/lodash/fp/isEmpty.d.ts
+++ b/types/lodash/fp/isEmpty.d.ts
@@ -1,16 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type IsEmpty =
-    /**
-     * Checks if value is empty. A value is considered empty unless it’s an arguments object, array, string, or
-     * jQuery-like collection with a length greater than 0 or an object with own enumerable properties.
-     *
-     * @param value The value to inspect.
-     * @return Returns true if value is empty, else false.
-     */
-    (value: any) => boolean;
-
-declare const isEmpty: IsEmpty;
+import { isEmpty } from "../fp";
 export = isEmpty;
diff --git a/types/lodash/fp/isEqual.d.ts b/types/lodash/fp/isEqual.d.ts
index 225f90f914..0a51c5c80d 100644
--- a/types/lodash/fp/isEqual.d.ts
+++ b/types/lodash/fp/isEqual.d.ts
@@ -1,141 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface IsEqual {
-    /**
-     * Performs a deep comparison between two values to determine if they are
-     * equivalent.
-     *
-     * **Note:** This method supports comparing arrays, array buffers, booleans,
-     * date objects, error objects, maps, numbers, `Object` objects, regexes,
-     * sets, strings, symbols, and typed arrays. `Object` objects are compared
-     * by their own, not inherited, enumerable properties. Functions and DOM
-     * nodes are **not** supported.
-     *
-     * @category Lang
-     * @param value The value to compare.
-     * @param other The other value to compare.
-     * @returns Returns `true` if the values are equivalent, else `false`.
-     * @example
-     *
-     * var object = { 'user': 'fred' };
-     * var other = { 'user': 'fred' };
-     *
-     * _.isEqual(object, other);
-     * // => true
-     *
-     * object === other;
-     * // => false
-     */
-    (): IsEqual;
-    /**
-     * Performs a deep comparison between two values to determine if they are
-     * equivalent.
-     *
-     * **Note:** This method supports comparing arrays, array buffers, booleans,
-     * date objects, error objects, maps, numbers, `Object` objects, regexes,
-     * sets, strings, symbols, and typed arrays. `Object` objects are compared
-     * by their own, not inherited, enumerable properties. Functions and DOM
-     * nodes are **not** supported.
-     *
-     * @category Lang
-     * @param value The value to compare.
-     * @param other The other value to compare.
-     * @returns Returns `true` if the values are equivalent, else `false`.
-     * @example
-     *
-     * var object = { 'user': 'fred' };
-     * var other = { 'user': 'fred' };
-     *
-     * _.isEqual(object, other);
-     * // => true
-     *
-     * object === other;
-     * // => false
-     */
-    (value: any): IsEqual1x1;
-    /**
-     * Performs a deep comparison between two values to determine if they are
-     * equivalent.
-     *
-     * **Note:** This method supports comparing arrays, array buffers, booleans,
-     * date objects, error objects, maps, numbers, `Object` objects, regexes,
-     * sets, strings, symbols, and typed arrays. `Object` objects are compared
-     * by their own, not inherited, enumerable properties. Functions and DOM
-     * nodes are **not** supported.
-     *
-     * @category Lang
-     * @param value The value to compare.
-     * @param other The other value to compare.
-     * @returns Returns `true` if the values are equivalent, else `false`.
-     * @example
-     *
-     * var object = { 'user': 'fred' };
-     * var other = { 'user': 'fred' };
-     *
-     * _.isEqual(object, other);
-     * // => true
-     *
-     * object === other;
-     * // => false
-     */
-    (value: any, other: any): boolean;
-}
-interface IsEqual1x1 {
-    /**
-     * Performs a deep comparison between two values to determine if they are
-     * equivalent.
-     *
-     * **Note:** This method supports comparing arrays, array buffers, booleans,
-     * date objects, error objects, maps, numbers, `Object` objects, regexes,
-     * sets, strings, symbols, and typed arrays. `Object` objects are compared
-     * by their own, not inherited, enumerable properties. Functions and DOM
-     * nodes are **not** supported.
-     *
-     * @category Lang
-     * @param value The value to compare.
-     * @param other The other value to compare.
-     * @returns Returns `true` if the values are equivalent, else `false`.
-     * @example
-     *
-     * var object = { 'user': 'fred' };
-     * var other = { 'user': 'fred' };
-     *
-     * _.isEqual(object, other);
-     * // => true
-     *
-     * object === other;
-     * // => false
-     */
-    (): IsEqual1x1;
-    /**
-     * Performs a deep comparison between two values to determine if they are
-     * equivalent.
-     *
-     * **Note:** This method supports comparing arrays, array buffers, booleans,
-     * date objects, error objects, maps, numbers, `Object` objects, regexes,
-     * sets, strings, symbols, and typed arrays. `Object` objects are compared
-     * by their own, not inherited, enumerable properties. Functions and DOM
-     * nodes are **not** supported.
-     *
-     * @category Lang
-     * @param value The value to compare.
-     * @param other The other value to compare.
-     * @returns Returns `true` if the values are equivalent, else `false`.
-     * @example
-     *
-     * var object = { 'user': 'fred' };
-     * var other = { 'user': 'fred' };
-     *
-     * _.isEqual(object, other);
-     * // => true
-     *
-     * object === other;
-     * // => false
-     */
-    (other: any): boolean;
-}
-
-declare const isEqual: IsEqual;
+import { isEqual } from "../fp";
 export = isEqual;
diff --git a/types/lodash/fp/isEqualWith.d.ts b/types/lodash/fp/isEqualWith.d.ts
index 832c80829c..27fa4414cb 100644
--- a/types/lodash/fp/isEqualWith.d.ts
+++ b/types/lodash/fp/isEqualWith.d.ts
@@ -1,285 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface IsEqualWith {
-    /**
-     * This method is like `_.isEqual` except that it accepts `customizer` which is
-     * invoked to compare values. If `customizer` returns `undefined` comparisons are
-     * handled by the method instead. The `customizer` is invoked with up to seven arguments:
-     * (objValue, othValue [, index|key, object, other, stack]).
-     *
-     * @category Lang
-     * @param value The value to compare.
-     * @param other The other value to compare.
-     * @param [customizer] The function to customize comparisons.
-     * @returns Returns `true` if the values are equivalent, else `false`.
-     * @example
-     *
-     * function isGreeting(value) {
-     *   return /^h(?:i|ello)$/.test(value);
-     * }
-     *
-     * function customizer(objValue, othValue) {
-     *   if (isGreeting(objValue) && isGreeting(othValue)) {
-     * return true;
-     *   }
-     * }
-     *
-     * var array = ['hello', 'goodbye'];
-     * var other = ['hi', 'goodbye'];
-     *
-     * _.isEqualWith(array, other, customizer);
-     * // => true
-     */
-    (): IsEqualWith;
-    /**
-     * This method is like `_.isEqual` except that it accepts `customizer` which is
-     * invoked to compare values. If `customizer` returns `undefined` comparisons are
-     * handled by the method instead. The `customizer` is invoked with up to seven arguments:
-     * (objValue, othValue [, index|key, object, other, stack]).
-     *
-     * @category Lang
-     * @param value The value to compare.
-     * @param other The other value to compare.
-     * @param [customizer] The function to customize comparisons.
-     * @returns Returns `true` if the values are equivalent, else `false`.
-     * @example
-     *
-     * function isGreeting(value) {
-     *   return /^h(?:i|ello)$/.test(value);
-     * }
-     *
-     * function customizer(objValue, othValue) {
-     *   if (isGreeting(objValue) && isGreeting(othValue)) {
-     * return true;
-     *   }
-     * }
-     *
-     * var array = ['hello', 'goodbye'];
-     * var other = ['hi', 'goodbye'];
-     *
-     * _.isEqualWith(array, other, customizer);
-     * // => true
-     */
-    (customizer: _.IsEqualCustomizer): IsEqualWith1x1;
-    /**
-     * This method is like `_.isEqual` except that it accepts `customizer` which is
-     * invoked to compare values. If `customizer` returns `undefined` comparisons are
-     * handled by the method instead. The `customizer` is invoked with up to seven arguments:
-     * (objValue, othValue [, index|key, object, other, stack]).
-     *
-     * @category Lang
-     * @param value The value to compare.
-     * @param other The other value to compare.
-     * @param [customizer] The function to customize comparisons.
-     * @returns Returns `true` if the values are equivalent, else `false`.
-     * @example
-     *
-     * function isGreeting(value) {
-     *   return /^h(?:i|ello)$/.test(value);
-     * }
-     *
-     * function customizer(objValue, othValue) {
-     *   if (isGreeting(objValue) && isGreeting(othValue)) {
-     * return true;
-     *   }
-     * }
-     *
-     * var array = ['hello', 'goodbye'];
-     * var other = ['hi', 'goodbye'];
-     *
-     * _.isEqualWith(array, other, customizer);
-     * // => true
-     */
-    (customizer: _.IsEqualCustomizer, value: any): IsEqualWith1x2;
-    /**
-     * This method is like `_.isEqual` except that it accepts `customizer` which is
-     * invoked to compare values. If `customizer` returns `undefined` comparisons are
-     * handled by the method instead. The `customizer` is invoked with up to seven arguments:
-     * (objValue, othValue [, index|key, object, other, stack]).
-     *
-     * @category Lang
-     * @param value The value to compare.
-     * @param other The other value to compare.
-     * @param [customizer] The function to customize comparisons.
-     * @returns Returns `true` if the values are equivalent, else `false`.
-     * @example
-     *
-     * function isGreeting(value) {
-     *   return /^h(?:i|ello)$/.test(value);
-     * }
-     *
-     * function customizer(objValue, othValue) {
-     *   if (isGreeting(objValue) && isGreeting(othValue)) {
-     * return true;
-     *   }
-     * }
-     *
-     * var array = ['hello', 'goodbye'];
-     * var other = ['hi', 'goodbye'];
-     *
-     * _.isEqualWith(array, other, customizer);
-     * // => true
-     */
-    (customizer: _.IsEqualCustomizer, value: any, other: any): boolean;
-}
-interface IsEqualWith1x1 {
-    /**
-     * This method is like `_.isEqual` except that it accepts `customizer` which is
-     * invoked to compare values. If `customizer` returns `undefined` comparisons are
-     * handled by the method instead. The `customizer` is invoked with up to seven arguments:
-     * (objValue, othValue [, index|key, object, other, stack]).
-     *
-     * @category Lang
-     * @param value The value to compare.
-     * @param other The other value to compare.
-     * @param [customizer] The function to customize comparisons.
-     * @returns Returns `true` if the values are equivalent, else `false`.
-     * @example
-     *
-     * function isGreeting(value) {
-     *   return /^h(?:i|ello)$/.test(value);
-     * }
-     *
-     * function customizer(objValue, othValue) {
-     *   if (isGreeting(objValue) && isGreeting(othValue)) {
-     * return true;
-     *   }
-     * }
-     *
-     * var array = ['hello', 'goodbye'];
-     * var other = ['hi', 'goodbye'];
-     *
-     * _.isEqualWith(array, other, customizer);
-     * // => true
-     */
-    (): IsEqualWith1x1;
-    /**
-     * This method is like `_.isEqual` except that it accepts `customizer` which is
-     * invoked to compare values. If `customizer` returns `undefined` comparisons are
-     * handled by the method instead. The `customizer` is invoked with up to seven arguments:
-     * (objValue, othValue [, index|key, object, other, stack]).
-     *
-     * @category Lang
-     * @param value The value to compare.
-     * @param other The other value to compare.
-     * @param [customizer] The function to customize comparisons.
-     * @returns Returns `true` if the values are equivalent, else `false`.
-     * @example
-     *
-     * function isGreeting(value) {
-     *   return /^h(?:i|ello)$/.test(value);
-     * }
-     *
-     * function customizer(objValue, othValue) {
-     *   if (isGreeting(objValue) && isGreeting(othValue)) {
-     * return true;
-     *   }
-     * }
-     *
-     * var array = ['hello', 'goodbye'];
-     * var other = ['hi', 'goodbye'];
-     *
-     * _.isEqualWith(array, other, customizer);
-     * // => true
-     */
-    (value: any): IsEqualWith1x2;
-    /**
-     * This method is like `_.isEqual` except that it accepts `customizer` which is
-     * invoked to compare values. If `customizer` returns `undefined` comparisons are
-     * handled by the method instead. The `customizer` is invoked with up to seven arguments:
-     * (objValue, othValue [, index|key, object, other, stack]).
-     *
-     * @category Lang
-     * @param value The value to compare.
-     * @param other The other value to compare.
-     * @param [customizer] The function to customize comparisons.
-     * @returns Returns `true` if the values are equivalent, else `false`.
-     * @example
-     *
-     * function isGreeting(value) {
-     *   return /^h(?:i|ello)$/.test(value);
-     * }
-     *
-     * function customizer(objValue, othValue) {
-     *   if (isGreeting(objValue) && isGreeting(othValue)) {
-     * return true;
-     *   }
-     * }
-     *
-     * var array = ['hello', 'goodbye'];
-     * var other = ['hi', 'goodbye'];
-     *
-     * _.isEqualWith(array, other, customizer);
-     * // => true
-     */
-    (value: any, other: any): boolean;
-}
-interface IsEqualWith1x2 {
-    /**
-     * This method is like `_.isEqual` except that it accepts `customizer` which is
-     * invoked to compare values. If `customizer` returns `undefined` comparisons are
-     * handled by the method instead. The `customizer` is invoked with up to seven arguments:
-     * (objValue, othValue [, index|key, object, other, stack]).
-     *
-     * @category Lang
-     * @param value The value to compare.
-     * @param other The other value to compare.
-     * @param [customizer] The function to customize comparisons.
-     * @returns Returns `true` if the values are equivalent, else `false`.
-     * @example
-     *
-     * function isGreeting(value) {
-     *   return /^h(?:i|ello)$/.test(value);
-     * }
-     *
-     * function customizer(objValue, othValue) {
-     *   if (isGreeting(objValue) && isGreeting(othValue)) {
-     * return true;
-     *   }
-     * }
-     *
-     * var array = ['hello', 'goodbye'];
-     * var other = ['hi', 'goodbye'];
-     *
-     * _.isEqualWith(array, other, customizer);
-     * // => true
-     */
-    (): IsEqualWith1x2;
-    /**
-     * This method is like `_.isEqual` except that it accepts `customizer` which is
-     * invoked to compare values. If `customizer` returns `undefined` comparisons are
-     * handled by the method instead. The `customizer` is invoked with up to seven arguments:
-     * (objValue, othValue [, index|key, object, other, stack]).
-     *
-     * @category Lang
-     * @param value The value to compare.
-     * @param other The other value to compare.
-     * @param [customizer] The function to customize comparisons.
-     * @returns Returns `true` if the values are equivalent, else `false`.
-     * @example
-     *
-     * function isGreeting(value) {
-     *   return /^h(?:i|ello)$/.test(value);
-     * }
-     *
-     * function customizer(objValue, othValue) {
-     *   if (isGreeting(objValue) && isGreeting(othValue)) {
-     * return true;
-     *   }
-     * }
-     *
-     * var array = ['hello', 'goodbye'];
-     * var other = ['hi', 'goodbye'];
-     *
-     * _.isEqualWith(array, other, customizer);
-     * // => true
-     */
-    (other: any): boolean;
-}
-
-declare const isEqualWith: IsEqualWith;
+import { isEqualWith } from "../fp";
 export = isEqualWith;
diff --git a/types/lodash/fp/isError.d.ts b/types/lodash/fp/isError.d.ts
index 6c6f429fdf..4adb9885ca 100644
--- a/types/lodash/fp/isError.d.ts
+++ b/types/lodash/fp/isError.d.ts
@@ -1,16 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type IsError =
-    /**
-     * Checks if value is an Error, EvalError, RangeError, ReferenceError, SyntaxError, TypeError, or URIError
-     * object.
-     *
-     * @param value The value to check.
-     * @return Returns true if value is an error object, else false.
-     */
-    (value: any) => value is Error;
-
-declare const isError: IsError;
+import { isError } from "../fp";
 export = isError;
diff --git a/types/lodash/fp/isFinite.d.ts b/types/lodash/fp/isFinite.d.ts
index 544f4c3fd5..5641edc0ae 100644
--- a/types/lodash/fp/isFinite.d.ts
+++ b/types/lodash/fp/isFinite.d.ts
@@ -1,17 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type IsFinite =
-    /**
-     * Checks if value is a finite primitive number.
-     *
-     * Note: This method is based on Number.isFinite.
-     *
-     * @param value The value to check.
-     * @return Returns true if value is a finite number, else false.
-     */
-    (value: any) => boolean;
-
-declare const isFinite: IsFinite;
+import { isFinite } from "../fp";
 export = isFinite;
diff --git a/types/lodash/fp/isFunction.d.ts b/types/lodash/fp/isFunction.d.ts
index 7a85054a1f..3404e74871 100644
--- a/types/lodash/fp/isFunction.d.ts
+++ b/types/lodash/fp/isFunction.d.ts
@@ -1,15 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type IsFunction =
-    /**
-     * Checks if value is a callable function.
-     *
-     * @param value The value to check.
-     * @return Returns true if value is correctly classified, else false.
-     */
-    (value: any) => value is (...args: any[]) => any;
-
-declare const isFunction: IsFunction;
+import { isFunction } from "../fp";
 export = isFunction;
diff --git a/types/lodash/fp/isInteger.d.ts b/types/lodash/fp/isInteger.d.ts
index d04a6f5cce..310df93478 100644
--- a/types/lodash/fp/isInteger.d.ts
+++ b/types/lodash/fp/isInteger.d.ts
@@ -1,31 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type IsInteger =
-    /**
-     * Checks if `value` is an integer.
-     *
-     * **Note:** This method is based on [`Number.isInteger`](https://mdn.io/Number/isInteger).
-     *
-     * @category Lang
-     * @param value The value to check.
-     * @returns Returns `true` if `value` is an integer, else `false`.
-     * @example
-     *
-     * _.isInteger(3);
-     * // => true
-     *
-     * _.isInteger(Number.MIN_VALUE);
-     * // => false
-     *
-     * _.isInteger(Infinity);
-     * // => false
-     *
-     * _.isInteger('3');
-     * // => false
-     */
-    (value: any) => boolean;
-
-declare const isInteger: IsInteger;
+import { isInteger } from "../fp";
 export = isInteger;
diff --git a/types/lodash/fp/isLength.d.ts b/types/lodash/fp/isLength.d.ts
index a48a867820..3073b672b6 100644
--- a/types/lodash/fp/isLength.d.ts
+++ b/types/lodash/fp/isLength.d.ts
@@ -1,31 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type IsLength =
-    /**
-     * Checks if `value` is a valid array-like length.
-     *
-     * **Note:** This function is loosely based on [`ToLength`](http://ecma-international.org/ecma-262/6.0/#sec-tolength).
-     *
-     * @category Lang
-     * @param value The value to check.
-     * @returns Returns `true` if `value` is a valid length, else `false`.
-     * @example
-     *
-     * _.isLength(3);
-     * // => true
-     *
-     * _.isLength(Number.MIN_VALUE);
-     * // => false
-     *
-     * _.isLength(Infinity);
-     * // => false
-     *
-     * _.isLength('3');
-     * // => false
-     */
-    (value: any) => boolean;
-
-declare const isLength: IsLength;
+import { isLength } from "../fp";
 export = isLength;
diff --git a/types/lodash/fp/isMap.d.ts b/types/lodash/fp/isMap.d.ts
index 940cb8a4ad..e76745c1e2 100644
--- a/types/lodash/fp/isMap.d.ts
+++ b/types/lodash/fp/isMap.d.ts
@@ -1,15 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type IsMap =
-    /**
-     * Checks if value is classified as a Map object.
-     *
-     * @param value The value to check.
-     * @returns Returns true if value is correctly classified, else false.
-     */
-    (value: any) => value is Map<any, any>;
-
-declare const isMap: IsMap;
+import { isMap } from "../fp";
 export = isMap;
diff --git a/types/lodash/fp/isMatch.d.ts b/types/lodash/fp/isMatch.d.ts
index 231362c358..58a0a2db95 100644
--- a/types/lodash/fp/isMatch.d.ts
+++ b/types/lodash/fp/isMatch.d.ts
@@ -1,116 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface IsMatch {
-    /**
-     * Performs a deep comparison between `object` and `source` to determine if
-     * `object` contains equivalent property values.
-     *
-     * **Note:** This method supports comparing the same values as `_.isEqual`.
-     *
-     * @category Lang
-     * @param object The object to inspect.
-     * @param source The object of property values to match.
-     * @returns Returns `true` if `object` is a match, else `false`.
-     * @example
-     *
-     * var object = { 'user': 'fred', 'age': 40 };
-     *
-     * _.isMatch(object, { 'age': 40 });
-     * // => true
-     *
-     * _.isMatch(object, { 'age': 36 });
-     * // => false
-     */
-    (): IsMatch;
-    /**
-     * Performs a deep comparison between `object` and `source` to determine if
-     * `object` contains equivalent property values.
-     *
-     * **Note:** This method supports comparing the same values as `_.isEqual`.
-     *
-     * @category Lang
-     * @param object The object to inspect.
-     * @param source The object of property values to match.
-     * @returns Returns `true` if `object` is a match, else `false`.
-     * @example
-     *
-     * var object = { 'user': 'fred', 'age': 40 };
-     *
-     * _.isMatch(object, { 'age': 40 });
-     * // => true
-     *
-     * _.isMatch(object, { 'age': 36 });
-     * // => false
-     */
-    (source: object): IsMatch1x1;
-    /**
-     * Performs a deep comparison between `object` and `source` to determine if
-     * `object` contains equivalent property values.
-     *
-     * **Note:** This method supports comparing the same values as `_.isEqual`.
-     *
-     * @category Lang
-     * @param object The object to inspect.
-     * @param source The object of property values to match.
-     * @returns Returns `true` if `object` is a match, else `false`.
-     * @example
-     *
-     * var object = { 'user': 'fred', 'age': 40 };
-     *
-     * _.isMatch(object, { 'age': 40 });
-     * // => true
-     *
-     * _.isMatch(object, { 'age': 36 });
-     * // => false
-     */
-    (source: object, object: object): boolean;
-}
-interface IsMatch1x1 {
-    /**
-     * Performs a deep comparison between `object` and `source` to determine if
-     * `object` contains equivalent property values.
-     *
-     * **Note:** This method supports comparing the same values as `_.isEqual`.
-     *
-     * @category Lang
-     * @param object The object to inspect.
-     * @param source The object of property values to match.
-     * @returns Returns `true` if `object` is a match, else `false`.
-     * @example
-     *
-     * var object = { 'user': 'fred', 'age': 40 };
-     *
-     * _.isMatch(object, { 'age': 40 });
-     * // => true
-     *
-     * _.isMatch(object, { 'age': 36 });
-     * // => false
-     */
-    (): IsMatch1x1;
-    /**
-     * Performs a deep comparison between `object` and `source` to determine if
-     * `object` contains equivalent property values.
-     *
-     * **Note:** This method supports comparing the same values as `_.isEqual`.
-     *
-     * @category Lang
-     * @param object The object to inspect.
-     * @param source The object of property values to match.
-     * @returns Returns `true` if `object` is a match, else `false`.
-     * @example
-     *
-     * var object = { 'user': 'fred', 'age': 40 };
-     *
-     * _.isMatch(object, { 'age': 40 });
-     * // => true
-     *
-     * _.isMatch(object, { 'age': 36 });
-     * // => false
-     */
-    (object: object): boolean;
-}
-
-declare const isMatch: IsMatch;
+import { isMatch } from "../fp";
 export = isMatch;
diff --git a/types/lodash/fp/isMatchWith.d.ts b/types/lodash/fp/isMatchWith.d.ts
index 5345ad3863..40ff3a691b 100644
--- a/types/lodash/fp/isMatchWith.d.ts
+++ b/types/lodash/fp/isMatchWith.d.ts
@@ -1,285 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface IsMatchWith {
-    /**
-     * This method is like `_.isMatch` except that it accepts `customizer` which
-     * is invoked to compare values. If `customizer` returns `undefined` comparisons
-     * are handled by the method instead. The `customizer` is invoked with three
-     * arguments: (objValue, srcValue, index|key, object, source).
-     *
-     * @category Lang
-     * @param object The object to inspect.
-     * @param source The object of property values to match.
-     * @param [customizer] The function to customize comparisons.
-     * @returns Returns `true` if `object` is a match, else `false`.
-     * @example
-     *
-     * function isGreeting(value) {
-     *   return /^h(?:i|ello)$/.test(value);
-     * }
-     *
-     * function customizer(objValue, srcValue) {
-     *   if (isGreeting(objValue) && isGreeting(srcValue)) {
-     * return true;
-     *   }
-     * }
-     *
-     * var object = { 'greeting': 'hello' };
-     * var source = { 'greeting': 'hi' };
-     *
-     * _.isMatchWith(object, source, customizer);
-     * // => true
-     */
-    (): IsMatchWith;
-    /**
-     * This method is like `_.isMatch` except that it accepts `customizer` which
-     * is invoked to compare values. If `customizer` returns `undefined` comparisons
-     * are handled by the method instead. The `customizer` is invoked with three
-     * arguments: (objValue, srcValue, index|key, object, source).
-     *
-     * @category Lang
-     * @param object The object to inspect.
-     * @param source The object of property values to match.
-     * @param [customizer] The function to customize comparisons.
-     * @returns Returns `true` if `object` is a match, else `false`.
-     * @example
-     *
-     * function isGreeting(value) {
-     *   return /^h(?:i|ello)$/.test(value);
-     * }
-     *
-     * function customizer(objValue, srcValue) {
-     *   if (isGreeting(objValue) && isGreeting(srcValue)) {
-     * return true;
-     *   }
-     * }
-     *
-     * var object = { 'greeting': 'hello' };
-     * var source = { 'greeting': 'hi' };
-     *
-     * _.isMatchWith(object, source, customizer);
-     * // => true
-     */
-    (customizer: _.isMatchWithCustomizer): IsMatchWith1x1;
-    /**
-     * This method is like `_.isMatch` except that it accepts `customizer` which
-     * is invoked to compare values. If `customizer` returns `undefined` comparisons
-     * are handled by the method instead. The `customizer` is invoked with three
-     * arguments: (objValue, srcValue, index|key, object, source).
-     *
-     * @category Lang
-     * @param object The object to inspect.
-     * @param source The object of property values to match.
-     * @param [customizer] The function to customize comparisons.
-     * @returns Returns `true` if `object` is a match, else `false`.
-     * @example
-     *
-     * function isGreeting(value) {
-     *   return /^h(?:i|ello)$/.test(value);
-     * }
-     *
-     * function customizer(objValue, srcValue) {
-     *   if (isGreeting(objValue) && isGreeting(srcValue)) {
-     * return true;
-     *   }
-     * }
-     *
-     * var object = { 'greeting': 'hello' };
-     * var source = { 'greeting': 'hi' };
-     *
-     * _.isMatchWith(object, source, customizer);
-     * // => true
-     */
-    (customizer: _.isMatchWithCustomizer, source: object): IsMatchWith1x2;
-    /**
-     * This method is like `_.isMatch` except that it accepts `customizer` which
-     * is invoked to compare values. If `customizer` returns `undefined` comparisons
-     * are handled by the method instead. The `customizer` is invoked with three
-     * arguments: (objValue, srcValue, index|key, object, source).
-     *
-     * @category Lang
-     * @param object The object to inspect.
-     * @param source The object of property values to match.
-     * @param [customizer] The function to customize comparisons.
-     * @returns Returns `true` if `object` is a match, else `false`.
-     * @example
-     *
-     * function isGreeting(value) {
-     *   return /^h(?:i|ello)$/.test(value);
-     * }
-     *
-     * function customizer(objValue, srcValue) {
-     *   if (isGreeting(objValue) && isGreeting(srcValue)) {
-     * return true;
-     *   }
-     * }
-     *
-     * var object = { 'greeting': 'hello' };
-     * var source = { 'greeting': 'hi' };
-     *
-     * _.isMatchWith(object, source, customizer);
-     * // => true
-     */
-    (customizer: _.isMatchWithCustomizer, source: object, object: object): boolean;
-}
-interface IsMatchWith1x1 {
-    /**
-     * This method is like `_.isMatch` except that it accepts `customizer` which
-     * is invoked to compare values. If `customizer` returns `undefined` comparisons
-     * are handled by the method instead. The `customizer` is invoked with three
-     * arguments: (objValue, srcValue, index|key, object, source).
-     *
-     * @category Lang
-     * @param object The object to inspect.
-     * @param source The object of property values to match.
-     * @param [customizer] The function to customize comparisons.
-     * @returns Returns `true` if `object` is a match, else `false`.
-     * @example
-     *
-     * function isGreeting(value) {
-     *   return /^h(?:i|ello)$/.test(value);
-     * }
-     *
-     * function customizer(objValue, srcValue) {
-     *   if (isGreeting(objValue) && isGreeting(srcValue)) {
-     * return true;
-     *   }
-     * }
-     *
-     * var object = { 'greeting': 'hello' };
-     * var source = { 'greeting': 'hi' };
-     *
-     * _.isMatchWith(object, source, customizer);
-     * // => true
-     */
-    (): IsMatchWith1x1;
-    /**
-     * This method is like `_.isMatch` except that it accepts `customizer` which
-     * is invoked to compare values. If `customizer` returns `undefined` comparisons
-     * are handled by the method instead. The `customizer` is invoked with three
-     * arguments: (objValue, srcValue, index|key, object, source).
-     *
-     * @category Lang
-     * @param object The object to inspect.
-     * @param source The object of property values to match.
-     * @param [customizer] The function to customize comparisons.
-     * @returns Returns `true` if `object` is a match, else `false`.
-     * @example
-     *
-     * function isGreeting(value) {
-     *   return /^h(?:i|ello)$/.test(value);
-     * }
-     *
-     * function customizer(objValue, srcValue) {
-     *   if (isGreeting(objValue) && isGreeting(srcValue)) {
-     * return true;
-     *   }
-     * }
-     *
-     * var object = { 'greeting': 'hello' };
-     * var source = { 'greeting': 'hi' };
-     *
-     * _.isMatchWith(object, source, customizer);
-     * // => true
-     */
-    (source: object): IsMatchWith1x2;
-    /**
-     * This method is like `_.isMatch` except that it accepts `customizer` which
-     * is invoked to compare values. If `customizer` returns `undefined` comparisons
-     * are handled by the method instead. The `customizer` is invoked with three
-     * arguments: (objValue, srcValue, index|key, object, source).
-     *
-     * @category Lang
-     * @param object The object to inspect.
-     * @param source The object of property values to match.
-     * @param [customizer] The function to customize comparisons.
-     * @returns Returns `true` if `object` is a match, else `false`.
-     * @example
-     *
-     * function isGreeting(value) {
-     *   return /^h(?:i|ello)$/.test(value);
-     * }
-     *
-     * function customizer(objValue, srcValue) {
-     *   if (isGreeting(objValue) && isGreeting(srcValue)) {
-     * return true;
-     *   }
-     * }
-     *
-     * var object = { 'greeting': 'hello' };
-     * var source = { 'greeting': 'hi' };
-     *
-     * _.isMatchWith(object, source, customizer);
-     * // => true
-     */
-    (source: object, object: object): boolean;
-}
-interface IsMatchWith1x2 {
-    /**
-     * This method is like `_.isMatch` except that it accepts `customizer` which
-     * is invoked to compare values. If `customizer` returns `undefined` comparisons
-     * are handled by the method instead. The `customizer` is invoked with three
-     * arguments: (objValue, srcValue, index|key, object, source).
-     *
-     * @category Lang
-     * @param object The object to inspect.
-     * @param source The object of property values to match.
-     * @param [customizer] The function to customize comparisons.
-     * @returns Returns `true` if `object` is a match, else `false`.
-     * @example
-     *
-     * function isGreeting(value) {
-     *   return /^h(?:i|ello)$/.test(value);
-     * }
-     *
-     * function customizer(objValue, srcValue) {
-     *   if (isGreeting(objValue) && isGreeting(srcValue)) {
-     * return true;
-     *   }
-     * }
-     *
-     * var object = { 'greeting': 'hello' };
-     * var source = { 'greeting': 'hi' };
-     *
-     * _.isMatchWith(object, source, customizer);
-     * // => true
-     */
-    (): IsMatchWith1x2;
-    /**
-     * This method is like `_.isMatch` except that it accepts `customizer` which
-     * is invoked to compare values. If `customizer` returns `undefined` comparisons
-     * are handled by the method instead. The `customizer` is invoked with three
-     * arguments: (objValue, srcValue, index|key, object, source).
-     *
-     * @category Lang
-     * @param object The object to inspect.
-     * @param source The object of property values to match.
-     * @param [customizer] The function to customize comparisons.
-     * @returns Returns `true` if `object` is a match, else `false`.
-     * @example
-     *
-     * function isGreeting(value) {
-     *   return /^h(?:i|ello)$/.test(value);
-     * }
-     *
-     * function customizer(objValue, srcValue) {
-     *   if (isGreeting(objValue) && isGreeting(srcValue)) {
-     * return true;
-     *   }
-     * }
-     *
-     * var object = { 'greeting': 'hello' };
-     * var source = { 'greeting': 'hi' };
-     *
-     * _.isMatchWith(object, source, customizer);
-     * // => true
-     */
-    (object: object): boolean;
-}
-
-declare const isMatchWith: IsMatchWith;
+import { isMatchWith } from "../fp";
 export = isMatchWith;
diff --git a/types/lodash/fp/isNaN.d.ts b/types/lodash/fp/isNaN.d.ts
index f227cd2061..2f92885d09 100644
--- a/types/lodash/fp/isNaN.d.ts
+++ b/types/lodash/fp/isNaN.d.ts
@@ -1,17 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type IsNaN =
-    /**
-     * Checks if value is NaN.
-     *
-     * Note: This method is not the same as isNaN which returns true for undefined and other non-numeric values.
-     *
-     * @param value The value to check.
-     * @return Returns true if value is NaN, else false.
-     */
-    (value: any) => boolean;
-
-declare const isNaN: IsNaN;
+import { isNaN } from "../fp";
 export = isNaN;
diff --git a/types/lodash/fp/isNative.d.ts b/types/lodash/fp/isNative.d.ts
index 9dd6543388..6e189a8e52 100644
--- a/types/lodash/fp/isNative.d.ts
+++ b/types/lodash/fp/isNative.d.ts
@@ -1,15 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type IsNative =
-    /**
-     * Checks if value is a native function.
-     * @param value The value to check.
-     *
-     * @retrun Returns true if value is a native function, else false.
-     */
-    (value: any) => value is (...args: any[]) => any;
-
-declare const isNative: IsNative;
+import { isNative } from "../fp";
 export = isNative;
diff --git a/types/lodash/fp/isNil.d.ts b/types/lodash/fp/isNil.d.ts
index 07005f1fa1..0baee7ff8b 100644
--- a/types/lodash/fp/isNil.d.ts
+++ b/types/lodash/fp/isNil.d.ts
@@ -1,26 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type IsNil =
-    /**
-     * Checks if `value` is `null` or `undefined`.
-     *
-     * @category Lang
-     * @param value The value to check.
-     * @returns Returns `true` if `value` is nullish, else `false`.
-     * @example
-     *
-     * _.isNil(null);
-     * // => true
-     *
-     * _.isNil(void 0);
-     * // => true
-     *
-     * _.isNil(NaN);
-     * // => false
-     */
-    (value: any) => value is null | undefined;
-
-declare const isNil: IsNil;
+import { isNil } from "../fp";
 export = isNil;
diff --git a/types/lodash/fp/isNull.d.ts b/types/lodash/fp/isNull.d.ts
index b1d5b53e0b..5e5fad5575 100644
--- a/types/lodash/fp/isNull.d.ts
+++ b/types/lodash/fp/isNull.d.ts
@@ -1,15 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type IsNull =
-    /**
-     * Checks if value is null.
-     *
-     * @param value The value to check.
-     * @return Returns true if value is null, else false.
-     */
-    (value: any) => value is null;
-
-declare const isNull: IsNull;
+import { isNull } from "../fp";
 export = isNull;
diff --git a/types/lodash/fp/isNumber.d.ts b/types/lodash/fp/isNumber.d.ts
index fda5cca1b8..93368f1726 100644
--- a/types/lodash/fp/isNumber.d.ts
+++ b/types/lodash/fp/isNumber.d.ts
@@ -1,17 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type IsNumber =
-    /**
-     * Checks if value is classified as a Number primitive or object.
-     *
-     * Note: To exclude Infinity, -Infinity, and NaN, which are classified as numbers, use the _.isFinite method.
-     *
-     * @param value The value to check.
-     * @return Returns true if value is correctly classified, else false.
-     */
-    (value: any) => value is number;
-
-declare const isNumber: IsNumber;
+import { isNumber } from "../fp";
 export = isNumber;
diff --git a/types/lodash/fp/isObject.d.ts b/types/lodash/fp/isObject.d.ts
index 9f55786107..7e9e2575ab 100644
--- a/types/lodash/fp/isObject.d.ts
+++ b/types/lodash/fp/isObject.d.ts
@@ -1,16 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type IsObject =
-    /**
-     * Checks if value is the language type of Object. (e.g. arrays, functions, objects, regexes, new Number(0),
-     * and new String(''))
-     *
-     * @param value The value to check.
-     * @return Returns true if value is an object, else false.
-     */
-    (value: any) => boolean;
-
-declare const isObject: IsObject;
+import { isObject } from "../fp";
 export = isObject;
diff --git a/types/lodash/fp/isObjectLike.d.ts b/types/lodash/fp/isObjectLike.d.ts
index 17fc948a2d..ba03ddc0f7 100644
--- a/types/lodash/fp/isObjectLike.d.ts
+++ b/types/lodash/fp/isObjectLike.d.ts
@@ -1,30 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type IsObjectLike =
-    /**
-     * Checks if `value` is object-like. A value is object-like if it's not `null`
-     * and has a `typeof` result of "object".
-     *
-     * @category Lang
-     * @param value The value to check.
-     * @returns Returns `true` if `value` is object-like, else `false`.
-     * @example
-     *
-     * _.isObjectLike({});
-     * // => true
-     *
-     * _.isObjectLike([1, 2, 3]);
-     * // => true
-     *
-     * _.isObjectLike(_.noop);
-     * // => false
-     *
-     * _.isObjectLike(null);
-     * // => false
-     */
-    (value: any) => boolean;
-
-declare const isObjectLike: IsObjectLike;
+import { isObjectLike } from "../fp";
 export = isObjectLike;
diff --git a/types/lodash/fp/isPlainObject.d.ts b/types/lodash/fp/isPlainObject.d.ts
index e4cadb9806..87da4bdb47 100644
--- a/types/lodash/fp/isPlainObject.d.ts
+++ b/types/lodash/fp/isPlainObject.d.ts
@@ -1,18 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type IsPlainObject =
-    /**
-     * Checks if value is a plain object, that is, an object created by the Object constructor or one with a
-     * [[Prototype]] of null.
-     *
-     * Note: This method assumes objects created by the Object constructor have no inherited enumerable properties.
-     *
-     * @param value The value to check.
-     * @return Returns true if value is a plain object, else false.
-     */
-    (value: any) => boolean;
-
-declare const isPlainObject: IsPlainObject;
+import { isPlainObject } from "../fp";
 export = isPlainObject;
diff --git a/types/lodash/fp/isRegExp.d.ts b/types/lodash/fp/isRegExp.d.ts
index 98adef2e36..47edf50a1f 100644
--- a/types/lodash/fp/isRegExp.d.ts
+++ b/types/lodash/fp/isRegExp.d.ts
@@ -1,15 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type IsRegExp =
-    /**
-     * Checks if value is classified as a RegExp object.
-     * @param value The value to check.
-     *
-     * @return Returns true if value is correctly classified, else false.
-     */
-    (value: any) => value is RegExp;
-
-declare const isRegExp: IsRegExp;
+import { isRegExp } from "../fp";
 export = isRegExp;
diff --git a/types/lodash/fp/isSafeInteger.d.ts b/types/lodash/fp/isSafeInteger.d.ts
index 60d49e1be8..a32b12cfd8 100644
--- a/types/lodash/fp/isSafeInteger.d.ts
+++ b/types/lodash/fp/isSafeInteger.d.ts
@@ -1,32 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type IsSafeInteger =
-    /**
-     * Checks if `value` is a safe integer. An integer is safe if it's an IEEE-754
-     * double precision number which isn't the result of a rounded unsafe integer.
-     *
-     * **Note:** This method is based on [`Number.isSafeInteger`](https://mdn.io/Number/isSafeInteger).
-     *
-     * @category Lang
-     * @param value The value to check.
-     * @returns Returns `true` if `value` is a safe integer, else `false`.
-     * @example
-     *
-     * _.isSafeInteger(3);
-     * // => true
-     *
-     * _.isSafeInteger(Number.MIN_VALUE);
-     * // => false
-     *
-     * _.isSafeInteger(Infinity);
-     * // => false
-     *
-     * _.isSafeInteger('3');
-     * // => false
-     */
-    (value: any) => boolean;
-
-declare const isSafeInteger: IsSafeInteger;
+import { isSafeInteger } from "../fp";
 export = isSafeInteger;
diff --git a/types/lodash/fp/isSet.d.ts b/types/lodash/fp/isSet.d.ts
index 7be7de7600..85e493338e 100644
--- a/types/lodash/fp/isSet.d.ts
+++ b/types/lodash/fp/isSet.d.ts
@@ -1,15 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type IsSet =
-    /**
-     * Checks if value is classified as a Set object.
-     *
-     * @param value The value to check.
-     * @returns Returns true if value is correctly classified, else false.
-     */
-    (value: any) => value is Set<any>;
-
-declare const isSet: IsSet;
+import { isSet } from "../fp";
 export = isSet;
diff --git a/types/lodash/fp/isString.d.ts b/types/lodash/fp/isString.d.ts
index fea109178e..9a2149451d 100644
--- a/types/lodash/fp/isString.d.ts
+++ b/types/lodash/fp/isString.d.ts
@@ -1,15 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type IsString =
-    /**
-     * Checks if value is classified as a String primitive or object.
-     *
-     * @param value The value to check.
-     * @return Returns true if value is correctly classified, else false.
-     */
-    (value: any) => value is string;
-
-declare const isString: IsString;
+import { isString } from "../fp";
 export = isString;
diff --git a/types/lodash/fp/isSymbol.d.ts b/types/lodash/fp/isSymbol.d.ts
index fe30bad576..3d82e9719c 100644
--- a/types/lodash/fp/isSymbol.d.ts
+++ b/types/lodash/fp/isSymbol.d.ts
@@ -1,23 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type IsSymbol =
-    /**
-     * Checks if `value` is classified as a `Symbol` primitive or object.
-     *
-     * @category Lang
-     * @param value The value to check.
-     * @returns Returns `true` if `value` is correctly classified, else `false`.
-     * @example
-     *
-     * _.isSymbol(Symbol.iterator);
-     * // => true
-     *
-     * _.isSymbol('abc');
-     * // => false
-     */
-    (value: any) => boolean;
-
-declare const isSymbol: IsSymbol;
+import { isSymbol } from "../fp";
 export = isSymbol;
diff --git a/types/lodash/fp/isTypedArray.d.ts b/types/lodash/fp/isTypedArray.d.ts
index 076fb84e05..fce6c44a69 100644
--- a/types/lodash/fp/isTypedArray.d.ts
+++ b/types/lodash/fp/isTypedArray.d.ts
@@ -1,15 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type IsTypedArray =
-    /**
-     * Checks if value is classified as a typed array.
-     *
-     * @param value The value to check.
-     * @return Returns true if value is correctly classified, else false.
-     */
-    (value: any) => boolean;
-
-declare const isTypedArray: IsTypedArray;
+import { isTypedArray } from "../fp";
 export = isTypedArray;
diff --git a/types/lodash/fp/isUndefined.d.ts b/types/lodash/fp/isUndefined.d.ts
index 3980dd5742..ccb010033b 100644
--- a/types/lodash/fp/isUndefined.d.ts
+++ b/types/lodash/fp/isUndefined.d.ts
@@ -1,15 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type IsUndefined =
-    /**
-     * Checks if value is undefined.
-     *
-     * @param value The value to check.
-     * @return Returns true if value is undefined, else false.
-     */
-    (value: any) => value is undefined;
-
-declare const isUndefined: IsUndefined;
+import { isUndefined } from "../fp";
 export = isUndefined;
diff --git a/types/lodash/fp/isWeakMap.d.ts b/types/lodash/fp/isWeakMap.d.ts
index 9edb2fbb71..11edaab05d 100644
--- a/types/lodash/fp/isWeakMap.d.ts
+++ b/types/lodash/fp/isWeakMap.d.ts
@@ -1,15 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type IsWeakMap =
-    /**
-     * Checks if value is classified as a WeakMap object.
-     *
-     * @param value The value to check.
-     * @returns Returns true if value is correctly classified, else false.
-     */
-    (value: any) => value is WeakMap<object, any>;
-
-declare const isWeakMap: IsWeakMap;
+import { isWeakMap } from "../fp";
 export = isWeakMap;
diff --git a/types/lodash/fp/isWeakSet.d.ts b/types/lodash/fp/isWeakSet.d.ts
index cf7bd7cf01..6d877e9e23 100644
--- a/types/lodash/fp/isWeakSet.d.ts
+++ b/types/lodash/fp/isWeakSet.d.ts
@@ -1,15 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type IsWeakSet =
-    /**
-     * Checks if value is classified as a WeakSet object.
-     *
-     * @param value The value to check.
-     * @returns Returns true if value is correctly classified, else false.
-     */
-    (value: any) => value is WeakSet<object>;
-
-declare const isWeakSet: IsWeakSet;
+import { isWeakSet } from "../fp";
 export = isWeakSet;
diff --git a/types/lodash/fp/iteratee.d.ts b/types/lodash/fp/iteratee.d.ts
index 669d1d92d5..0ec2832c84 100644
--- a/types/lodash/fp/iteratee.d.ts
+++ b/types/lodash/fp/iteratee.d.ts
@@ -1,65 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface Iteratee {
-    /**
-     * Creates a function that invokes `func` with the arguments of the created
-     * function. If `func` is a property name the created callback returns the
-     * property value for a given element. If `func` is an object the created
-     * callback returns `true` for elements that contain the equivalent object properties, otherwise it returns `false`.
-     *
-     * @category Util
-     * @param [func=_.identity] The value to convert to a callback.
-     * @returns Returns the callback.
-     * @example
-     *
-     * var users = [
-     *   { 'user': 'barney', 'age': 36 },
-     *   { 'user': 'fred',   'age': 40 }
-     * ];
-     *
-     * // create custom iteratee shorthands
-     * _.iteratee = _.wrap(_.iteratee, function(callback, func) {
-     *   var p = /^(\S+)\s*([<>])\s*(\S+)$/.exec(func);
-     *   return !p ? callback(func) : function(object) {
-     * return (p[2] == '>' ? object[p[1]] > p[3] : object[p[1]] < p[3]);
-     *   };
-     * });
-     *
-     * _.filter(users, 'age > 36');
-     * // => [{ 'user': 'fred', 'age': 40 }]
-     */
-    <TFunction extends (...args: any[]) => any>(func: TFunction): TFunction;
-    /**
-     * Creates a function that invokes `func` with the arguments of the created
-     * function. If `func` is a property name the created callback returns the
-     * property value for a given element. If `func` is an object the created
-     * callback returns `true` for elements that contain the equivalent object properties, otherwise it returns `false`.
-     *
-     * @category Util
-     * @param [func=_.identity] The value to convert to a callback.
-     * @returns Returns the callback.
-     * @example
-     *
-     * var users = [
-     *   { 'user': 'barney', 'age': 36 },
-     *   { 'user': 'fred',   'age': 40 }
-     * ];
-     *
-     * // create custom iteratee shorthands
-     * _.iteratee = _.wrap(_.iteratee, function(callback, func) {
-     *   var p = /^(\S+)\s*([<>])\s*(\S+)$/.exec(func);
-     *   return !p ? callback(func) : function(object) {
-     * return (p[2] == '>' ? object[p[1]] > p[3] : object[p[1]] < p[3]);
-     *   };
-     * });
-     *
-     * _.filter(users, 'age > 36');
-     * // => [{ 'user': 'fred', 'age': 40 }]
-     */
-    (func: string | object): (...args: any[]) => any;
-}
-
-declare const iteratee: Iteratee;
+import { iteratee } from "../fp";
 export = iteratee;
diff --git a/types/lodash/fp/join.d.ts b/types/lodash/fp/join.d.ts
index 7b678d0738..beee04ccf5 100644
--- a/types/lodash/fp/join.d.ts
+++ b/types/lodash/fp/join.d.ts
@@ -1,53 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Join {
-    /**
-     * Converts all elements in `array` into a string separated by `separator`.
-     *
-     * @param array The array to convert.
-     * @param separator The element separator.
-     * @returns Returns the joined string.
-     */
-    (): Join;
-    /**
-     * Converts all elements in `array` into a string separated by `separator`.
-     *
-     * @param array The array to convert.
-     * @param separator The element separator.
-     * @returns Returns the joined string.
-     */
-    (separator: string): Join1x1;
-    /**
-     * Converts all elements in `array` into a string separated by `separator`.
-     *
-     * @param array The array to convert.
-     * @param separator The element separator.
-     * @returns Returns the joined string.
-     */
-    (separator: string, array: _.List<any> | null | undefined): string;
-}
-interface Join1x1 {
-    /**
-     * Converts all elements in `array` into a string separated by `separator`.
-     *
-     * @param array The array to convert.
-     * @param separator The element separator.
-     * @returns Returns the joined string.
-     */
-    (): Join1x1;
-    /**
-     * Converts all elements in `array` into a string separated by `separator`.
-     *
-     * @param array The array to convert.
-     * @param separator The element separator.
-     * @returns Returns the joined string.
-     */
-    (array: _.List<any> | null | undefined): string;
-}
-
-declare const join: Join;
+import { join } from "../fp";
 export = join;
diff --git a/types/lodash/fp/juxt.d.ts b/types/lodash/fp/juxt.d.ts
index 9131ad7914..5e972d4488 100644
--- a/types/lodash/fp/juxt.d.ts
+++ b/types/lodash/fp/juxt.d.ts
@@ -1,18 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-type Over =
-    /**
-     * Creates a function that invokes iteratees with the arguments provided to the created function and returns
-     * their results.
-     *
-     * @param iteratees The iteratees to invoke.
-     * @return Returns the new function.
-     */
-    <TResult>(iteratees: _.Many<(...args: any[]) => TResult>) => (...args: any[]) => TResult[];
-
-declare const juxt: Over;
+import { juxt } from "../fp";
 export = juxt;
diff --git a/types/lodash/fp/kebabCase.d.ts b/types/lodash/fp/kebabCase.d.ts
index 6a46ada134..8231b1593a 100644
--- a/types/lodash/fp/kebabCase.d.ts
+++ b/types/lodash/fp/kebabCase.d.ts
@@ -1,15 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type KebabCase =
-    /**
-     * Converts string to kebab case.
-     *
-     * @param string The string to convert.
-     * @return Returns the kebab cased string.
-     */
-    (string: string) => string;
-
-declare const kebabCase: KebabCase;
+import { kebabCase } from "../fp";
 export = kebabCase;
diff --git a/types/lodash/fp/keyBy.d.ts b/types/lodash/fp/keyBy.d.ts
index d9ebba52bf..e4b1381096 100644
--- a/types/lodash/fp/keyBy.d.ts
+++ b/types/lodash/fp/keyBy.d.ts
@@ -1,225 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface KeyBy {
-    /**
-     * Creates an object composed of keys generated from the results of running each element of collection through
-     * iteratee. The corresponding value of each key is the last element responsible for generating the key. The
-     * iteratee function is bound to thisArg and invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the composed aggregate object.
-     */
-    (): KeyBy;
-    /**
-     * Creates an object composed of keys generated from the results of running each element of collection through
-     * iteratee. The corresponding value of each key is the last element responsible for generating the key. The
-     * iteratee function is bound to thisArg and invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the composed aggregate object.
-     */
-    (iteratee: (value: string) => _.PropertyName): KeyBy1x1;
-    /**
-     * Creates an object composed of keys generated from the results of running each element of collection through
-     * iteratee. The corresponding value of each key is the last element responsible for generating the key. The
-     * iteratee function is bound to thisArg and invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the composed aggregate object.
-     */
-    (iteratee: (value: string) => _.PropertyName, collection: string | null | undefined): _.Dictionary<string>;
-    /**
-     * Creates an object composed of keys generated from the results of running each element of collection through
-     * iteratee. The corresponding value of each key is the last element responsible for generating the key. The
-     * iteratee function is bound to thisArg and invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the composed aggregate object.
-     */
-    <T>(iteratee: _.ValueIterateeCustom<T, _.PropertyName>): KeyBy2x1<T>;
-    /**
-     * Creates an object composed of keys generated from the results of running each element of collection through
-     * iteratee. The corresponding value of each key is the last element responsible for generating the key. The
-     * iteratee function is bound to thisArg and invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the composed aggregate object.
-     */
-    <T>(iteratee: _.ValueIterateeCustom<T, _.PropertyName>, collection: _.List<T> | null | undefined): _.Dictionary<T>;
-    /**
-     * Creates an object composed of keys generated from the results of running each element of collection through
-     * iteratee. The corresponding value of each key is the last element responsible for generating the key. The
-     * iteratee function is bound to thisArg and invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the composed aggregate object.
-     */
-    <T extends object>(iteratee: _.ValueIterateeCustom<T[keyof T], _.PropertyName>, collection: T | null | undefined): _.Dictionary<T[keyof T]>;
-}
-interface KeyBy1x1 {
-    /**
-     * Creates an object composed of keys generated from the results of running each element of collection through
-     * iteratee. The corresponding value of each key is the last element responsible for generating the key. The
-     * iteratee function is bound to thisArg and invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the composed aggregate object.
-     */
-    (): KeyBy1x1;
-    /**
-     * Creates an object composed of keys generated from the results of running each element of collection through
-     * iteratee. The corresponding value of each key is the last element responsible for generating the key. The
-     * iteratee function is bound to thisArg and invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the composed aggregate object.
-     */
-    (collection: string | null | undefined): _.Dictionary<string>;
-}
-interface KeyBy2x1<T> {
-    /**
-     * Creates an object composed of keys generated from the results of running each element of collection through
-     * iteratee. The corresponding value of each key is the last element responsible for generating the key. The
-     * iteratee function is bound to thisArg and invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the composed aggregate object.
-     */
-    (): KeyBy2x1<T>;
-    /**
-     * Creates an object composed of keys generated from the results of running each element of collection through
-     * iteratee. The corresponding value of each key is the last element responsible for generating the key. The
-     * iteratee function is bound to thisArg and invoked with three arguments:
-     * (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the composed aggregate object.
-     */
-    (collection: _.List<T> | object | null | undefined): _.Dictionary<T>;
-}
-
-declare const keyBy: KeyBy;
+import { keyBy } from "../fp";
 export = keyBy;
diff --git a/types/lodash/fp/keys.d.ts b/types/lodash/fp/keys.d.ts
index 0cfa0ac21e..0323484453 100644
--- a/types/lodash/fp/keys.d.ts
+++ b/types/lodash/fp/keys.d.ts
@@ -1,17 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type Keys =
-    /**
-     * Creates an array of the own enumerable property names of object.
-     *
-     * Note: Non-object values are coerced to objects. See the ES spec for more details.
-     *
-     * @param object The object to query.
-     * @return Returns the array of property names.
-     */
-    (object: any) => string[];
-
-declare const keys: Keys;
+import { keys } from "../fp";
 export = keys;
diff --git a/types/lodash/fp/keysIn.d.ts b/types/lodash/fp/keysIn.d.ts
index 827f1edbaa..f6f3482852 100644
--- a/types/lodash/fp/keysIn.d.ts
+++ b/types/lodash/fp/keysIn.d.ts
@@ -1,17 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type KeysIn =
-    /**
-     * Creates an array of the own and inherited enumerable property names of object.
-     *
-     * Note: Non-object values are coerced to objects.
-     *
-     * @param object The object to query.
-     * @return An array of property names.
-     */
-    (object: any) => string[];
-
-declare const keysIn: KeysIn;
+import { keysIn } from "../fp";
 export = keysIn;
diff --git a/types/lodash/fp/last.d.ts b/types/lodash/fp/last.d.ts
index 4473a221f9..f74171a309 100644
--- a/types/lodash/fp/last.d.ts
+++ b/types/lodash/fp/last.d.ts
@@ -1,17 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-type Last =
-    /**
-     * Gets the last element of array.
-     *
-     * @param array The array to query.
-     * @return Returns the last element of array.
-     */
-    <T>(array: _.List<T> | null | undefined) => T | undefined;
-
-declare const last: Last;
+import { last } from "../fp";
 export = last;
diff --git a/types/lodash/fp/lastIndexOf.d.ts b/types/lodash/fp/lastIndexOf.d.ts
index a21af0a596..2d60e64837 100644
--- a/types/lodash/fp/lastIndexOf.d.ts
+++ b/types/lodash/fp/lastIndexOf.d.ts
@@ -1,58 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface LastIndexOf {
-    /**
-     * This method is like _.indexOf except that it iterates over elements of array from right to left.
-     *
-     * @param array The array to search.
-     * @param value The value to search for.
-     * @param fromIndex The index to search from or true to perform a binary search on a sorted array.
-     * @return Returns the index of the matched value, else -1.
-     */
-    (): LastIndexOf;
-    /**
-     * This method is like _.indexOf except that it iterates over elements of array from right to left.
-     *
-     * @param array The array to search.
-     * @param value The value to search for.
-     * @param fromIndex The index to search from or true to perform a binary search on a sorted array.
-     * @return Returns the index of the matched value, else -1.
-     */
-    <T>(value: T): LastIndexOf1x1<T>;
-    /**
-     * This method is like _.indexOf except that it iterates over elements of array from right to left.
-     *
-     * @param array The array to search.
-     * @param value The value to search for.
-     * @param fromIndex The index to search from or true to perform a binary search on a sorted array.
-     * @return Returns the index of the matched value, else -1.
-     */
-    <T>(value: T, array: _.List<T> | null | undefined): number;
-}
-interface LastIndexOf1x1<T> {
-    /**
-     * This method is like _.indexOf except that it iterates over elements of array from right to left.
-     *
-     * @param array The array to search.
-     * @param value The value to search for.
-     * @param fromIndex The index to search from or true to perform a binary search on a sorted array.
-     * @return Returns the index of the matched value, else -1.
-     */
-    (): LastIndexOf1x1<T>;
-    /**
-     * This method is like _.indexOf except that it iterates over elements of array from right to left.
-     *
-     * @param array The array to search.
-     * @param value The value to search for.
-     * @param fromIndex The index to search from or true to perform a binary search on a sorted array.
-     * @return Returns the index of the matched value, else -1.
-     */
-    (array: _.List<T> | null | undefined): number;
-}
-
-declare const lastIndexOf: LastIndexOf;
+import { lastIndexOf } from "../fp";
 export = lastIndexOf;
diff --git a/types/lodash/fp/lastIndexOfFrom.d.ts b/types/lodash/fp/lastIndexOfFrom.d.ts
index 0bea8e22c7..7a2f23e5ae 100644
--- a/types/lodash/fp/lastIndexOfFrom.d.ts
+++ b/types/lodash/fp/lastIndexOfFrom.d.ts
@@ -1,96 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface LastIndexOf {
-    /**
-     * This method is like _.indexOf except that it iterates over elements of array from right to left.
-     *
-     * @param array The array to search.
-     * @param value The value to search for.
-     * @param fromIndex The index to search from or true to perform a binary search on a sorted array.
-     * @return Returns the index of the matched value, else -1.
-     */
-    (): LastIndexOf;
-    /**
-     * This method is like _.indexOf except that it iterates over elements of array from right to left.
-     *
-     * @param array The array to search.
-     * @param value The value to search for.
-     * @param fromIndex The index to search from or true to perform a binary search on a sorted array.
-     * @return Returns the index of the matched value, else -1.
-     */
-    <T>(value: T): LastIndexOf1x1<T>;
-    /**
-     * This method is like _.indexOf except that it iterates over elements of array from right to left.
-     *
-     * @param array The array to search.
-     * @param value The value to search for.
-     * @param fromIndex The index to search from or true to perform a binary search on a sorted array.
-     * @return Returns the index of the matched value, else -1.
-     */
-    <T>(value: T, fromIndex: true|number): LastIndexOf1x2<T>;
-    /**
-     * This method is like _.indexOf except that it iterates over elements of array from right to left.
-     *
-     * @param array The array to search.
-     * @param value The value to search for.
-     * @param fromIndex The index to search from or true to perform a binary search on a sorted array.
-     * @return Returns the index of the matched value, else -1.
-     */
-    <T>(value: T, fromIndex: true|number, array: _.List<T> | null | undefined): number;
-}
-interface LastIndexOf1x1<T> {
-    /**
-     * This method is like _.indexOf except that it iterates over elements of array from right to left.
-     *
-     * @param array The array to search.
-     * @param value The value to search for.
-     * @param fromIndex The index to search from or true to perform a binary search on a sorted array.
-     * @return Returns the index of the matched value, else -1.
-     */
-    (): LastIndexOf1x1<T>;
-    /**
-     * This method is like _.indexOf except that it iterates over elements of array from right to left.
-     *
-     * @param array The array to search.
-     * @param value The value to search for.
-     * @param fromIndex The index to search from or true to perform a binary search on a sorted array.
-     * @return Returns the index of the matched value, else -1.
-     */
-    (fromIndex: true|number): LastIndexOf1x2<T>;
-    /**
-     * This method is like _.indexOf except that it iterates over elements of array from right to left.
-     *
-     * @param array The array to search.
-     * @param value The value to search for.
-     * @param fromIndex The index to search from or true to perform a binary search on a sorted array.
-     * @return Returns the index of the matched value, else -1.
-     */
-    (fromIndex: true|number, array: _.List<T> | null | undefined): number;
-}
-interface LastIndexOf1x2<T> {
-    /**
-     * This method is like _.indexOf except that it iterates over elements of array from right to left.
-     *
-     * @param array The array to search.
-     * @param value The value to search for.
-     * @param fromIndex The index to search from or true to perform a binary search on a sorted array.
-     * @return Returns the index of the matched value, else -1.
-     */
-    (): LastIndexOf1x2<T>;
-    /**
-     * This method is like _.indexOf except that it iterates over elements of array from right to left.
-     *
-     * @param array The array to search.
-     * @param value The value to search for.
-     * @param fromIndex The index to search from or true to perform a binary search on a sorted array.
-     * @return Returns the index of the matched value, else -1.
-     */
-    (array: _.List<T> | null | undefined): number;
-}
-
-declare const lastIndexOfFrom: LastIndexOf;
+import { lastIndexOfFrom } from "../fp";
 export = lastIndexOfFrom;
diff --git a/types/lodash/fp/lowerCase.d.ts b/types/lodash/fp/lowerCase.d.ts
index 628744e48b..1a5360fdbc 100644
--- a/types/lodash/fp/lowerCase.d.ts
+++ b/types/lodash/fp/lowerCase.d.ts
@@ -1,15 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type LowerCase =
-    /**
-     * Converts `string`, as space separated words, to lower case.
-     *
-     * @param string The string to convert.
-     * @return Returns the lower cased string.
-     */
-    (string: string) => string;
-
-declare const lowerCase: LowerCase;
+import { lowerCase } from "../fp";
 export = lowerCase;
diff --git a/types/lodash/fp/lowerFirst.d.ts b/types/lodash/fp/lowerFirst.d.ts
index a88e572706..23ce92585d 100644
--- a/types/lodash/fp/lowerFirst.d.ts
+++ b/types/lodash/fp/lowerFirst.d.ts
@@ -1,15 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type LowerFirst =
-    /**
-     * Converts the first character of `string` to lower case.
-     *
-     * @param string The string to convert.
-     * @return Returns the converted string.
-     */
-    (string: string) => string;
-
-declare const lowerFirst: LowerFirst;
+import { lowerFirst } from "../fp";
 export = lowerFirst;
diff --git a/types/lodash/fp/lt.d.ts b/types/lodash/fp/lt.d.ts
index 8259c6d845..a309bdce1a 100644
--- a/types/lodash/fp/lt.d.ts
+++ b/types/lodash/fp/lt.d.ts
@@ -1,51 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface Lt {
-    /**
-     * Checks if value is less than other.
-     *
-     * @param value The value to compare.
-     * @param other The other value to compare.
-     * @return Returns true if value is less than other, else false.
-     */
-    (): Lt;
-    /**
-     * Checks if value is less than other.
-     *
-     * @param value The value to compare.
-     * @param other The other value to compare.
-     * @return Returns true if value is less than other, else false.
-     */
-    (value: any): Lt1x1;
-    /**
-     * Checks if value is less than other.
-     *
-     * @param value The value to compare.
-     * @param other The other value to compare.
-     * @return Returns true if value is less than other, else false.
-     */
-    (value: any, other: any): boolean;
-}
-interface Lt1x1 {
-    /**
-     * Checks if value is less than other.
-     *
-     * @param value The value to compare.
-     * @param other The other value to compare.
-     * @return Returns true if value is less than other, else false.
-     */
-    (): Lt1x1;
-    /**
-     * Checks if value is less than other.
-     *
-     * @param value The value to compare.
-     * @param other The other value to compare.
-     * @return Returns true if value is less than other, else false.
-     */
-    (other: any): boolean;
-}
-
-declare const lt: Lt;
+import { lt } from "../fp";
 export = lt;
diff --git a/types/lodash/fp/lte.d.ts b/types/lodash/fp/lte.d.ts
index e3ac6503f7..0d4af2cbe3 100644
--- a/types/lodash/fp/lte.d.ts
+++ b/types/lodash/fp/lte.d.ts
@@ -1,51 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface Lte {
-    /**
-     * Checks if value is less than or equal to other.
-     *
-     * @param value The value to compare.
-     * @param other The other value to compare.
-     * @return Returns true if value is less than or equal to other, else false.
-     */
-    (): Lte;
-    /**
-     * Checks if value is less than or equal to other.
-     *
-     * @param value The value to compare.
-     * @param other The other value to compare.
-     * @return Returns true if value is less than or equal to other, else false.
-     */
-    (value: any): Lte1x1;
-    /**
-     * Checks if value is less than or equal to other.
-     *
-     * @param value The value to compare.
-     * @param other The other value to compare.
-     * @return Returns true if value is less than or equal to other, else false.
-     */
-    (value: any, other: any): boolean;
-}
-interface Lte1x1 {
-    /**
-     * Checks if value is less than or equal to other.
-     *
-     * @param value The value to compare.
-     * @param other The other value to compare.
-     * @return Returns true if value is less than or equal to other, else false.
-     */
-    (): Lte1x1;
-    /**
-     * Checks if value is less than or equal to other.
-     *
-     * @param value The value to compare.
-     * @param other The other value to compare.
-     * @return Returns true if value is less than or equal to other, else false.
-     */
-    (other: any): boolean;
-}
-
-declare const lte: Lte;
+import { lte } from "../fp";
 export = lte;
diff --git a/types/lodash/fp/map.d.ts b/types/lodash/fp/map.d.ts
index 900e11d0d0..17d014caf4 100644
--- a/types/lodash/fp/map.d.ts
+++ b/types/lodash/fp/map.d.ts
@@ -1,588 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Map {
-    /**
-     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
-     * thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property value
-     * of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
-     * _.reject, and _.some.
-     *
-     * The guarded methods are:
-     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
-     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
-     * sample, some, sum, uniq, and words
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped array.
-     */
-    (): Map;
-    /**
-     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
-     * thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property value
-     * of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
-     * _.reject, and _.some.
-     *
-     * The guarded methods are:
-     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
-     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
-     * sample, some, sum, uniq, and words
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped array.
-     */
-    <T, TResult>(iteratee: (value: T) => TResult): Map1x1<T, TResult>;
-    /**
-     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
-     * thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property value
-     * of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
-     * _.reject, and _.some.
-     *
-     * The guarded methods are:
-     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
-     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
-     * sample, some, sum, uniq, and words
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped array.
-     */
-    <T, TResult>(iteratee: (value: T) => TResult, collection: T[] | _.List<T> | null | undefined): TResult[];
-    /**
-     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
-     * thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property value
-     * of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
-     * _.reject, and _.some.
-     *
-     * The guarded methods are:
-     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
-     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
-     * sample, some, sum, uniq, and words
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped array.
-     */
-    <T extends object, TResult>(iteratee: (value: T[keyof T]) => TResult): Map3x1<T, TResult>;
-    /**
-     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
-     * thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property value
-     * of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
-     * _.reject, and _.some.
-     *
-     * The guarded methods are:
-     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
-     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
-     * sample, some, sum, uniq, and words
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped array.
-     */
-    <T extends object, TResult>(iteratee: (value: T[keyof T]) => TResult, collection: T | null | undefined): TResult[];
-    /**
-     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
-     * thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property value
-     * of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
-     * _.reject, and _.some.
-     *
-     * The guarded methods are:
-     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
-     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
-     * sample, some, sum, uniq, and words
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped array.
-     */
-    <T, K extends keyof T>(iteratee: K): Map4x1<T, K>;
-    /**
-     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
-     * thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property value
-     * of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
-     * _.reject, and _.some.
-     *
-     * The guarded methods are:
-     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
-     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
-     * sample, some, sum, uniq, and words
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped array.
-     */
-    <T, K extends keyof T>(iteratee: K, collection: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): Array<T[K]>;
-    /**
-     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
-     * thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property value
-     * of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
-     * _.reject, and _.some.
-     *
-     * The guarded methods are:
-     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
-     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
-     * sample, some, sum, uniq, and words
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped array.
-     */
-    (iteratee: string): Map5x1;
-    /**
-     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
-     * thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property value
-     * of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
-     * _.reject, and _.some.
-     *
-     * The guarded methods are:
-     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
-     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
-     * sample, some, sum, uniq, and words
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped array.
-     */
-    <T>(iteratee: string, collection: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): any[];
-    /**
-     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
-     * thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property value
-     * of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
-     * _.reject, and _.some.
-     *
-     * The guarded methods are:
-     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
-     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
-     * sample, some, sum, uniq, and words
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped array.
-     */
-    (iteratee: object): Map6x1;
-    /**
-     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
-     * thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property value
-     * of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
-     * _.reject, and _.some.
-     *
-     * The guarded methods are:
-     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
-     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
-     * sample, some, sum, uniq, and words
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped array.
-     */
-    <T>(iteratee: object, collection: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): boolean[];
-}
-interface Map1x1<T, TResult> {
-    /**
-     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
-     * thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property value
-     * of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
-     * _.reject, and _.some.
-     *
-     * The guarded methods are:
-     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
-     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
-     * sample, some, sum, uniq, and words
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped array.
-     */
-    (): Map1x1<T, TResult>;
-    /**
-     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
-     * thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property value
-     * of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
-     * _.reject, and _.some.
-     *
-     * The guarded methods are:
-     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
-     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
-     * sample, some, sum, uniq, and words
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped array.
-     */
-    (collection: T[] | _.List<T> | null | undefined): TResult[];
-}
-interface Map3x1<T extends object, TResult> {
-    /**
-     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
-     * thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property value
-     * of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
-     * _.reject, and _.some.
-     *
-     * The guarded methods are:
-     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
-     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
-     * sample, some, sum, uniq, and words
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped array.
-     */
-    (): Map3x1<T, TResult>;
-    /**
-     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
-     * thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property value
-     * of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
-     * _.reject, and _.some.
-     *
-     * The guarded methods are:
-     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
-     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
-     * sample, some, sum, uniq, and words
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped array.
-     */
-    (collection: T | null | undefined): TResult[];
-}
-interface Map4x1<T, K extends keyof T> {
-    /**
-     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
-     * thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property value
-     * of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
-     * _.reject, and _.some.
-     *
-     * The guarded methods are:
-     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
-     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
-     * sample, some, sum, uniq, and words
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped array.
-     */
-    (): Map4x1<T, K>;
-    /**
-     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
-     * thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property value
-     * of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
-     * _.reject, and _.some.
-     *
-     * The guarded methods are:
-     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
-     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
-     * sample, some, sum, uniq, and words
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped array.
-     */
-    (collection: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): Array<T[K]>;
-}
-interface Map5x1 {
-    /**
-     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
-     * thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property value
-     * of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
-     * _.reject, and _.some.
-     *
-     * The guarded methods are:
-     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
-     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
-     * sample, some, sum, uniq, and words
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped array.
-     */
-    (): Map5x1;
-    /**
-     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
-     * thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property value
-     * of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
-     * _.reject, and _.some.
-     *
-     * The guarded methods are:
-     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
-     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
-     * sample, some, sum, uniq, and words
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped array.
-     */
-    <T>(collection: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): any[];
-}
-interface Map6x1 {
-    /**
-     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
-     * thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property value
-     * of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
-     * _.reject, and _.some.
-     *
-     * The guarded methods are:
-     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
-     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
-     * sample, some, sum, uniq, and words
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped array.
-     */
-    (): Map6x1;
-    /**
-     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
-     * thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property value
-     * of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
-     * _.reject, and _.some.
-     *
-     * The guarded methods are:
-     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
-     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
-     * sample, some, sum, uniq, and words
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped array.
-     */
-    <T>(collection: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): boolean[];
-}
-
-declare const map: Map;
+import { map } from "../fp";
 export = map;
diff --git a/types/lodash/fp/mapKeys.d.ts b/types/lodash/fp/mapKeys.d.ts
index 348fdff591..acc6d752d8 100644
--- a/types/lodash/fp/mapKeys.d.ts
+++ b/types/lodash/fp/mapKeys.d.ts
@@ -1,105 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface MapKeys {
-    /**
-     * The opposite of _.mapValues; this method creates an object with the same values as object and keys generated
-     * by running each own enumerable property of object through iteratee.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped object.
-     */
-    (): MapKeys;
-    /**
-     * The opposite of _.mapValues; this method creates an object with the same values as object and keys generated
-     * by running each own enumerable property of object through iteratee.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped object.
-     */
-    (iteratee: _.ValueIteratee<number>): MapKeys1x1;
-    /**
-     * The opposite of _.mapValues; this method creates an object with the same values as object and keys generated
-     * by running each own enumerable property of object through iteratee.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped object.
-     */
-    <T>(iteratee: _.ValueIteratee<number>, object: _.List<T> | null | undefined): _.Dictionary<T>;
-    /**
-     * The opposite of _.mapValues; this method creates an object with the same values as object and keys generated
-     * by running each own enumerable property of object through iteratee.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped object.
-     */
-    (iteratee: _.ValueIteratee<string>): MapKeys2x1;
-    /**
-     * The opposite of _.mapValues; this method creates an object with the same values as object and keys generated
-     * by running each own enumerable property of object through iteratee.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped object.
-     */
-    <T extends object>(iteratee: _.ValueIteratee<string>, object: T | null | undefined): _.Dictionary<T[keyof T]>;
-}
-interface MapKeys1x1 {
-    /**
-     * The opposite of _.mapValues; this method creates an object with the same values as object and keys generated
-     * by running each own enumerable property of object through iteratee.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped object.
-     */
-    (): MapKeys1x1;
-    /**
-     * The opposite of _.mapValues; this method creates an object with the same values as object and keys generated
-     * by running each own enumerable property of object through iteratee.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped object.
-     */
-    <T>(object: _.List<T> | null | undefined): _.Dictionary<T>;
-}
-interface MapKeys2x1 {
-    /**
-     * The opposite of _.mapValues; this method creates an object with the same values as object and keys generated
-     * by running each own enumerable property of object through iteratee.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped object.
-     */
-    (): MapKeys2x1;
-    /**
-     * The opposite of _.mapValues; this method creates an object with the same values as object and keys generated
-     * by running each own enumerable property of object through iteratee.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped object.
-     */
-    <T extends object>(object: T | null | undefined): _.Dictionary<T[keyof T]>;
-}
-
-declare const mapKeys: MapKeys;
+import { mapKeys } from "../fp";
 export = mapKeys;
diff --git a/types/lodash/fp/mapValues.d.ts b/types/lodash/fp/mapValues.d.ts
index ce44dda737..abef821aab 100644
--- a/types/lodash/fp/mapValues.d.ts
+++ b/types/lodash/fp/mapValues.d.ts
@@ -1,603 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface MapValues {
-    /**
-    * Creates an object with the same keys as object and values generated by running each own
-    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
-    * and invoked with three arguments: (value, key, object).
-    *
-    * If a property name is provided iteratee the created "_.property" style callback returns
-    * the property value of the given element.
-    *
-    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
-    * true for elements that have a matching property value, else false;.
-    *
-    * If an object is provided for iteratee the created "_.matches" style callback returns true
-    * for elements that have the properties of the given object, else false.
-    *
-    * @param object The object to iterate over.
-    * @param [iteratee=_.identity]  The function invoked per iteration.
-    * @param [thisArg] The `this` binding of `iteratee`.
-    * @return Returns the new mapped object.
-    */
-    (): MapValues;
-    /**
-    * Creates an object with the same keys as object and values generated by running each own
-    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
-    * and invoked with three arguments: (value, key, object).
-    *
-    * If a property name is provided iteratee the created "_.property" style callback returns
-    * the property value of the given element.
-    *
-    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
-    * true for elements that have a matching property value, else false;.
-    *
-    * If an object is provided for iteratee the created "_.matches" style callback returns true
-    * for elements that have the properties of the given object, else false.
-    *
-    * @param object The object to iterate over.
-    * @param [iteratee=_.identity]  The function invoked per iteration.
-    * @param [thisArg] The `this` binding of `iteratee`.
-    * @return Returns the new mapped object.
-    */
-    <TResult>(callback: (value: string) => TResult): MapValues1x1<TResult>;
-    /**
-    * Creates an object with the same keys as object and values generated by running each own
-    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
-    * and invoked with three arguments: (value, key, object).
-    *
-    * If a property name is provided iteratee the created "_.property" style callback returns
-    * the property value of the given element.
-    *
-    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
-    * true for elements that have a matching property value, else false;.
-    *
-    * If an object is provided for iteratee the created "_.matches" style callback returns true
-    * for elements that have the properties of the given object, else false.
-    *
-    * @param object The object to iterate over.
-    * @param [iteratee=_.identity]  The function invoked per iteration.
-    * @param [thisArg] The `this` binding of `iteratee`.
-    * @return Returns the new mapped object.
-    */
-    <TResult>(callback: (value: string) => TResult, obj: string | null | undefined): _.NumericDictionary<TResult>;
-    /**
-    * Creates an object with the same keys as object and values generated by running each own
-    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
-    * and invoked with three arguments: (value, key, object).
-    *
-    * If a property name is provided iteratee the created "_.property" style callback returns
-    * the property value of the given element.
-    *
-    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
-    * true for elements that have a matching property value, else false;.
-    *
-    * If an object is provided for iteratee the created "_.matches" style callback returns true
-    * for elements that have the properties of the given object, else false.
-    *
-    * @param object The object to iterate over.
-    * @param [iteratee=_.identity]  The function invoked per iteration.
-    * @param [thisArg] The `this` binding of `iteratee`.
-    * @return Returns the new mapped object.
-    */
-    <T, TResult>(callback: (value: T) => TResult): MapValues2x1<T, TResult>;
-    /**
-    * Creates an object with the same keys as object and values generated by running each own
-    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
-    * and invoked with three arguments: (value, key, object).
-    *
-    * If a property name is provided iteratee the created "_.property" style callback returns
-    * the property value of the given element.
-    *
-    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
-    * true for elements that have a matching property value, else false;.
-    *
-    * If an object is provided for iteratee the created "_.matches" style callback returns true
-    * for elements that have the properties of the given object, else false.
-    *
-    * @param object The object to iterate over.
-    * @param [iteratee=_.identity]  The function invoked per iteration.
-    * @param [thisArg] The `this` binding of `iteratee`.
-    * @return Returns the new mapped object.
-    */
-    <T, TResult>(callback: (value: T) => TResult, obj: _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): _.Dictionary<TResult>;
-    /**
-    * Creates an object with the same keys as object and values generated by running each own
-    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
-    * and invoked with three arguments: (value, key, object).
-    *
-    * If a property name is provided iteratee the created "_.property" style callback returns
-    * the property value of the given element.
-    *
-    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
-    * true for elements that have a matching property value, else false;.
-    *
-    * If an object is provided for iteratee the created "_.matches" style callback returns true
-    * for elements that have the properties of the given object, else false.
-    *
-    * @param object The object to iterate over.
-    * @param [iteratee=_.identity]  The function invoked per iteration.
-    * @param [thisArg] The `this` binding of `iteratee`.
-    * @return Returns the new mapped object.
-    */
-    <T extends object, TResult>(callback: (value: T[keyof T]) => TResult): MapValues3x1<T, TResult>;
-    /**
-    * Creates an object with the same keys as object and values generated by running each own
-    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
-    * and invoked with three arguments: (value, key, object).
-    *
-    * If a property name is provided iteratee the created "_.property" style callback returns
-    * the property value of the given element.
-    *
-    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
-    * true for elements that have a matching property value, else false;.
-    *
-    * If an object is provided for iteratee the created "_.matches" style callback returns true
-    * for elements that have the properties of the given object, else false.
-    *
-    * @param object The object to iterate over.
-    * @param [iteratee=_.identity]  The function invoked per iteration.
-    * @param [thisArg] The `this` binding of `iteratee`.
-    * @return Returns the new mapped object.
-    */
-    <T extends object, TResult>(callback: (value: T[keyof T]) => TResult, obj: T | null | undefined): { [P in keyof T]: TResult };
-    /**
-    * Creates an object with the same keys as object and values generated by running each own
-    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
-    * and invoked with three arguments: (value, key, object).
-    *
-    * If a property name is provided iteratee the created "_.property" style callback returns
-    * the property value of the given element.
-    *
-    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
-    * true for elements that have a matching property value, else false;.
-    *
-    * If an object is provided for iteratee the created "_.matches" style callback returns true
-    * for elements that have the properties of the given object, else false.
-    *
-    * @param object The object to iterate over.
-    * @param [iteratee=_.identity]  The function invoked per iteration.
-    * @param [thisArg] The `this` binding of `iteratee`.
-    * @return Returns the new mapped object.
-    */
-    (iteratee: object): MapValues4x1;
-    /**
-    * Creates an object with the same keys as object and values generated by running each own
-    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
-    * and invoked with three arguments: (value, key, object).
-    *
-    * If a property name is provided iteratee the created "_.property" style callback returns
-    * the property value of the given element.
-    *
-    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
-    * true for elements that have a matching property value, else false;.
-    *
-    * If an object is provided for iteratee the created "_.matches" style callback returns true
-    * for elements that have the properties of the given object, else false.
-    *
-    * @param object The object to iterate over.
-    * @param [iteratee=_.identity]  The function invoked per iteration.
-    * @param [thisArg] The `this` binding of `iteratee`.
-    * @return Returns the new mapped object.
-    */
-    <T>(iteratee: object, obj: _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): _.Dictionary<boolean>;
-    /**
-    * Creates an object with the same keys as object and values generated by running each own
-    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
-    * and invoked with three arguments: (value, key, object).
-    *
-    * If a property name is provided iteratee the created "_.property" style callback returns
-    * the property value of the given element.
-    *
-    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
-    * true for elements that have a matching property value, else false;.
-    *
-    * If an object is provided for iteratee the created "_.matches" style callback returns true
-    * for elements that have the properties of the given object, else false.
-    *
-    * @param object The object to iterate over.
-    * @param [iteratee=_.identity]  The function invoked per iteration.
-    * @param [thisArg] The `this` binding of `iteratee`.
-    * @return Returns the new mapped object.
-    */
-    <T extends object>(iteratee: object, obj: T | null | undefined): { [P in keyof T]: boolean };
-    /**
-    * Creates an object with the same keys as object and values generated by running each own
-    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
-    * and invoked with three arguments: (value, key, object).
-    *
-    * If a property name is provided iteratee the created "_.property" style callback returns
-    * the property value of the given element.
-    *
-    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
-    * true for elements that have a matching property value, else false;.
-    *
-    * If an object is provided for iteratee the created "_.matches" style callback returns true
-    * for elements that have the properties of the given object, else false.
-    *
-    * @param object The object to iterate over.
-    * @param [iteratee=_.identity]  The function invoked per iteration.
-    * @param [thisArg] The `this` binding of `iteratee`.
-    * @return Returns the new mapped object.
-    */
-    <T, TKey extends keyof T>(iteratee: TKey): MapValues6x1<T, TKey>;
-    /**
-    * Creates an object with the same keys as object and values generated by running each own
-    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
-    * and invoked with three arguments: (value, key, object).
-    *
-    * If a property name is provided iteratee the created "_.property" style callback returns
-    * the property value of the given element.
-    *
-    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
-    * true for elements that have a matching property value, else false;.
-    *
-    * If an object is provided for iteratee the created "_.matches" style callback returns true
-    * for elements that have the properties of the given object, else false.
-    *
-    * @param object The object to iterate over.
-    * @param [iteratee=_.identity]  The function invoked per iteration.
-    * @param [thisArg] The `this` binding of `iteratee`.
-    * @return Returns the new mapped object.
-    */
-    <T, TKey extends keyof T>(iteratee: TKey, obj: _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): _.Dictionary<T[TKey]>;
-    /**
-    * Creates an object with the same keys as object and values generated by running each own
-    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
-    * and invoked with three arguments: (value, key, object).
-    *
-    * If a property name is provided iteratee the created "_.property" style callback returns
-    * the property value of the given element.
-    *
-    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
-    * true for elements that have a matching property value, else false;.
-    *
-    * If an object is provided for iteratee the created "_.matches" style callback returns true
-    * for elements that have the properties of the given object, else false.
-    *
-    * @param object The object to iterate over.
-    * @param [iteratee=_.identity]  The function invoked per iteration.
-    * @param [thisArg] The `this` binding of `iteratee`.
-    * @return Returns the new mapped object.
-    */
-    (iteratee: string): MapValues7x1;
-    /**
-    * Creates an object with the same keys as object and values generated by running each own
-    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
-    * and invoked with three arguments: (value, key, object).
-    *
-    * If a property name is provided iteratee the created "_.property" style callback returns
-    * the property value of the given element.
-    *
-    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
-    * true for elements that have a matching property value, else false;.
-    *
-    * If an object is provided for iteratee the created "_.matches" style callback returns true
-    * for elements that have the properties of the given object, else false.
-    *
-    * @param object The object to iterate over.
-    * @param [iteratee=_.identity]  The function invoked per iteration.
-    * @param [thisArg] The `this` binding of `iteratee`.
-    * @return Returns the new mapped object.
-    */
-    <T>(iteratee: string, obj: _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): _.Dictionary<any>;
-    /**
-    * Creates an object with the same keys as object and values generated by running each own
-    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
-    * and invoked with three arguments: (value, key, object).
-    *
-    * If a property name is provided iteratee the created "_.property" style callback returns
-    * the property value of the given element.
-    *
-    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
-    * true for elements that have a matching property value, else false;.
-    *
-    * If an object is provided for iteratee the created "_.matches" style callback returns true
-    * for elements that have the properties of the given object, else false.
-    *
-    * @param object The object to iterate over.
-    * @param [iteratee=_.identity]  The function invoked per iteration.
-    * @param [thisArg] The `this` binding of `iteratee`.
-    * @return Returns the new mapped object.
-    */
-    <T extends object>(iteratee: string, obj: T | null | undefined): { [P in keyof T]: any };
-}
-interface MapValues1x1<TResult> {
-    /**
-    * Creates an object with the same keys as object and values generated by running each own
-    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
-    * and invoked with three arguments: (value, key, object).
-    *
-    * If a property name is provided iteratee the created "_.property" style callback returns
-    * the property value of the given element.
-    *
-    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
-    * true for elements that have a matching property value, else false;.
-    *
-    * If an object is provided for iteratee the created "_.matches" style callback returns true
-    * for elements that have the properties of the given object, else false.
-    *
-    * @param object The object to iterate over.
-    * @param [iteratee=_.identity]  The function invoked per iteration.
-    * @param [thisArg] The `this` binding of `iteratee`.
-    * @return Returns the new mapped object.
-    */
-    (): MapValues1x1<TResult>;
-    /**
-    * Creates an object with the same keys as object and values generated by running each own
-    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
-    * and invoked with three arguments: (value, key, object).
-    *
-    * If a property name is provided iteratee the created "_.property" style callback returns
-    * the property value of the given element.
-    *
-    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
-    * true for elements that have a matching property value, else false;.
-    *
-    * If an object is provided for iteratee the created "_.matches" style callback returns true
-    * for elements that have the properties of the given object, else false.
-    *
-    * @param object The object to iterate over.
-    * @param [iteratee=_.identity]  The function invoked per iteration.
-    * @param [thisArg] The `this` binding of `iteratee`.
-    * @return Returns the new mapped object.
-    */
-    (obj: string | null | undefined): _.NumericDictionary<TResult>;
-}
-interface MapValues2x1<T, TResult> {
-    /**
-    * Creates an object with the same keys as object and values generated by running each own
-    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
-    * and invoked with three arguments: (value, key, object).
-    *
-    * If a property name is provided iteratee the created "_.property" style callback returns
-    * the property value of the given element.
-    *
-    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
-    * true for elements that have a matching property value, else false;.
-    *
-    * If an object is provided for iteratee the created "_.matches" style callback returns true
-    * for elements that have the properties of the given object, else false.
-    *
-    * @param object The object to iterate over.
-    * @param [iteratee=_.identity]  The function invoked per iteration.
-    * @param [thisArg] The `this` binding of `iteratee`.
-    * @return Returns the new mapped object.
-    */
-    (): MapValues2x1<T, TResult>;
-    /**
-    * Creates an object with the same keys as object and values generated by running each own
-    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
-    * and invoked with three arguments: (value, key, object).
-    *
-    * If a property name is provided iteratee the created "_.property" style callback returns
-    * the property value of the given element.
-    *
-    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
-    * true for elements that have a matching property value, else false;.
-    *
-    * If an object is provided for iteratee the created "_.matches" style callback returns true
-    * for elements that have the properties of the given object, else false.
-    *
-    * @param object The object to iterate over.
-    * @param [iteratee=_.identity]  The function invoked per iteration.
-    * @param [thisArg] The `this` binding of `iteratee`.
-    * @return Returns the new mapped object.
-    */
-    (obj: _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): _.Dictionary<TResult>;
-}
-interface MapValues3x1<T extends object, TResult> {
-    /**
-    * Creates an object with the same keys as object and values generated by running each own
-    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
-    * and invoked with three arguments: (value, key, object).
-    *
-    * If a property name is provided iteratee the created "_.property" style callback returns
-    * the property value of the given element.
-    *
-    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
-    * true for elements that have a matching property value, else false;.
-    *
-    * If an object is provided for iteratee the created "_.matches" style callback returns true
-    * for elements that have the properties of the given object, else false.
-    *
-    * @param object The object to iterate over.
-    * @param [iteratee=_.identity]  The function invoked per iteration.
-    * @param [thisArg] The `this` binding of `iteratee`.
-    * @return Returns the new mapped object.
-    */
-    (): MapValues3x1<T, TResult>;
-    /**
-    * Creates an object with the same keys as object and values generated by running each own
-    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
-    * and invoked with three arguments: (value, key, object).
-    *
-    * If a property name is provided iteratee the created "_.property" style callback returns
-    * the property value of the given element.
-    *
-    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
-    * true for elements that have a matching property value, else false;.
-    *
-    * If an object is provided for iteratee the created "_.matches" style callback returns true
-    * for elements that have the properties of the given object, else false.
-    *
-    * @param object The object to iterate over.
-    * @param [iteratee=_.identity]  The function invoked per iteration.
-    * @param [thisArg] The `this` binding of `iteratee`.
-    * @return Returns the new mapped object.
-    */
-    (obj: T | null | undefined): { [P in keyof T]: TResult };
-}
-interface MapValues4x1 {
-    /**
-    * Creates an object with the same keys as object and values generated by running each own
-    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
-    * and invoked with three arguments: (value, key, object).
-    *
-    * If a property name is provided iteratee the created "_.property" style callback returns
-    * the property value of the given element.
-    *
-    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
-    * true for elements that have a matching property value, else false;.
-    *
-    * If an object is provided for iteratee the created "_.matches" style callback returns true
-    * for elements that have the properties of the given object, else false.
-    *
-    * @param object The object to iterate over.
-    * @param [iteratee=_.identity]  The function invoked per iteration.
-    * @param [thisArg] The `this` binding of `iteratee`.
-    * @return Returns the new mapped object.
-    */
-    (): MapValues4x1;
-    /**
-    * Creates an object with the same keys as object and values generated by running each own
-    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
-    * and invoked with three arguments: (value, key, object).
-    *
-    * If a property name is provided iteratee the created "_.property" style callback returns
-    * the property value of the given element.
-    *
-    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
-    * true for elements that have a matching property value, else false;.
-    *
-    * If an object is provided for iteratee the created "_.matches" style callback returns true
-    * for elements that have the properties of the given object, else false.
-    *
-    * @param object The object to iterate over.
-    * @param [iteratee=_.identity]  The function invoked per iteration.
-    * @param [thisArg] The `this` binding of `iteratee`.
-    * @return Returns the new mapped object.
-    */
-    <T>(obj: _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): _.Dictionary<boolean>;
-    /**
-    * Creates an object with the same keys as object and values generated by running each own
-    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
-    * and invoked with three arguments: (value, key, object).
-    *
-    * If a property name is provided iteratee the created "_.property" style callback returns
-    * the property value of the given element.
-    *
-    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
-    * true for elements that have a matching property value, else false;.
-    *
-    * If an object is provided for iteratee the created "_.matches" style callback returns true
-    * for elements that have the properties of the given object, else false.
-    *
-    * @param object The object to iterate over.
-    * @param [iteratee=_.identity]  The function invoked per iteration.
-    * @param [thisArg] The `this` binding of `iteratee`.
-    * @return Returns the new mapped object.
-    */
-    <T extends object>(obj: T | null | undefined): { [P in keyof T]: boolean };
-}
-interface MapValues6x1<T, TKey extends keyof T> {
-    /**
-    * Creates an object with the same keys as object and values generated by running each own
-    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
-    * and invoked with three arguments: (value, key, object).
-    *
-    * If a property name is provided iteratee the created "_.property" style callback returns
-    * the property value of the given element.
-    *
-    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
-    * true for elements that have a matching property value, else false;.
-    *
-    * If an object is provided for iteratee the created "_.matches" style callback returns true
-    * for elements that have the properties of the given object, else false.
-    *
-    * @param object The object to iterate over.
-    * @param [iteratee=_.identity]  The function invoked per iteration.
-    * @param [thisArg] The `this` binding of `iteratee`.
-    * @return Returns the new mapped object.
-    */
-    (): MapValues6x1<T, TKey>;
-    /**
-    * Creates an object with the same keys as object and values generated by running each own
-    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
-    * and invoked with three arguments: (value, key, object).
-    *
-    * If a property name is provided iteratee the created "_.property" style callback returns
-    * the property value of the given element.
-    *
-    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
-    * true for elements that have a matching property value, else false;.
-    *
-    * If an object is provided for iteratee the created "_.matches" style callback returns true
-    * for elements that have the properties of the given object, else false.
-    *
-    * @param object The object to iterate over.
-    * @param [iteratee=_.identity]  The function invoked per iteration.
-    * @param [thisArg] The `this` binding of `iteratee`.
-    * @return Returns the new mapped object.
-    */
-    (obj: _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): _.Dictionary<T[TKey]>;
-}
-interface MapValues7x1 {
-    /**
-    * Creates an object with the same keys as object and values generated by running each own
-    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
-    * and invoked with three arguments: (value, key, object).
-    *
-    * If a property name is provided iteratee the created "_.property" style callback returns
-    * the property value of the given element.
-    *
-    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
-    * true for elements that have a matching property value, else false;.
-    *
-    * If an object is provided for iteratee the created "_.matches" style callback returns true
-    * for elements that have the properties of the given object, else false.
-    *
-    * @param object The object to iterate over.
-    * @param [iteratee=_.identity]  The function invoked per iteration.
-    * @param [thisArg] The `this` binding of `iteratee`.
-    * @return Returns the new mapped object.
-    */
-    (): MapValues7x1;
-    /**
-    * Creates an object with the same keys as object and values generated by running each own
-    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
-    * and invoked with three arguments: (value, key, object).
-    *
-    * If a property name is provided iteratee the created "_.property" style callback returns
-    * the property value of the given element.
-    *
-    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
-    * true for elements that have a matching property value, else false;.
-    *
-    * If an object is provided for iteratee the created "_.matches" style callback returns true
-    * for elements that have the properties of the given object, else false.
-    *
-    * @param object The object to iterate over.
-    * @param [iteratee=_.identity]  The function invoked per iteration.
-    * @param [thisArg] The `this` binding of `iteratee`.
-    * @return Returns the new mapped object.
-    */
-    <T>(obj: _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): _.Dictionary<any>;
-    /**
-    * Creates an object with the same keys as object and values generated by running each own
-    * enumerable property of object through iteratee. The iteratee function is bound to thisArg
-    * and invoked with three arguments: (value, key, object).
-    *
-    * If a property name is provided iteratee the created "_.property" style callback returns
-    * the property value of the given element.
-    *
-    * If a value is also provided for thisArg the creted "_.matchesProperty" style callback returns
-    * true for elements that have a matching property value, else false;.
-    *
-    * If an object is provided for iteratee the created "_.matches" style callback returns true
-    * for elements that have the properties of the given object, else false.
-    *
-    * @param object The object to iterate over.
-    * @param [iteratee=_.identity]  The function invoked per iteration.
-    * @param [thisArg] The `this` binding of `iteratee`.
-    * @return Returns the new mapped object.
-    */
-    <T extends object>(obj: T | null | undefined): { [P in keyof T]: any };
-}
-
-declare const mapValues: MapValues;
+import { mapValues } from "../fp";
 export = mapValues;
diff --git a/types/lodash/fp/matches.d.ts b/types/lodash/fp/matches.d.ts
index e197d6b711..e9796de4fb 100644
--- a/types/lodash/fp/matches.d.ts
+++ b/types/lodash/fp/matches.d.ts
@@ -1,116 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface IsMatch {
-    /**
-     * Performs a deep comparison between `object` and `source` to determine if
-     * `object` contains equivalent property values.
-     *
-     * **Note:** This method supports comparing the same values as `_.isEqual`.
-     *
-     * @category Lang
-     * @param object The object to inspect.
-     * @param source The object of property values to match.
-     * @returns Returns `true` if `object` is a match, else `false`.
-     * @example
-     *
-     * var object = { 'user': 'fred', 'age': 40 };
-     *
-     * _.isMatch(object, { 'age': 40 });
-     * // => true
-     *
-     * _.isMatch(object, { 'age': 36 });
-     * // => false
-     */
-    (): IsMatch;
-    /**
-     * Performs a deep comparison between `object` and `source` to determine if
-     * `object` contains equivalent property values.
-     *
-     * **Note:** This method supports comparing the same values as `_.isEqual`.
-     *
-     * @category Lang
-     * @param object The object to inspect.
-     * @param source The object of property values to match.
-     * @returns Returns `true` if `object` is a match, else `false`.
-     * @example
-     *
-     * var object = { 'user': 'fred', 'age': 40 };
-     *
-     * _.isMatch(object, { 'age': 40 });
-     * // => true
-     *
-     * _.isMatch(object, { 'age': 36 });
-     * // => false
-     */
-    (source: object): IsMatch1x1;
-    /**
-     * Performs a deep comparison between `object` and `source` to determine if
-     * `object` contains equivalent property values.
-     *
-     * **Note:** This method supports comparing the same values as `_.isEqual`.
-     *
-     * @category Lang
-     * @param object The object to inspect.
-     * @param source The object of property values to match.
-     * @returns Returns `true` if `object` is a match, else `false`.
-     * @example
-     *
-     * var object = { 'user': 'fred', 'age': 40 };
-     *
-     * _.isMatch(object, { 'age': 40 });
-     * // => true
-     *
-     * _.isMatch(object, { 'age': 36 });
-     * // => false
-     */
-    (source: object, object: object): boolean;
-}
-interface IsMatch1x1 {
-    /**
-     * Performs a deep comparison between `object` and `source` to determine if
-     * `object` contains equivalent property values.
-     *
-     * **Note:** This method supports comparing the same values as `_.isEqual`.
-     *
-     * @category Lang
-     * @param object The object to inspect.
-     * @param source The object of property values to match.
-     * @returns Returns `true` if `object` is a match, else `false`.
-     * @example
-     *
-     * var object = { 'user': 'fred', 'age': 40 };
-     *
-     * _.isMatch(object, { 'age': 40 });
-     * // => true
-     *
-     * _.isMatch(object, { 'age': 36 });
-     * // => false
-     */
-    (): IsMatch1x1;
-    /**
-     * Performs a deep comparison between `object` and `source` to determine if
-     * `object` contains equivalent property values.
-     *
-     * **Note:** This method supports comparing the same values as `_.isEqual`.
-     *
-     * @category Lang
-     * @param object The object to inspect.
-     * @param source The object of property values to match.
-     * @returns Returns `true` if `object` is a match, else `false`.
-     * @example
-     *
-     * var object = { 'user': 'fred', 'age': 40 };
-     *
-     * _.isMatch(object, { 'age': 40 });
-     * // => true
-     *
-     * _.isMatch(object, { 'age': 36 });
-     * // => false
-     */
-    (object: object): boolean;
-}
-
-declare const matches: IsMatch;
+import { matches } from "../fp";
 export = matches;
diff --git a/types/lodash/fp/matchesProperty.d.ts b/types/lodash/fp/matchesProperty.d.ts
index 8fec785733..81db8f75da 100644
--- a/types/lodash/fp/matchesProperty.d.ts
+++ b/types/lodash/fp/matchesProperty.d.ts
@@ -1,90 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface MatchesProperty {
-    /**
-     * Creates a function that compares the property value of path on a given object to value.
-     *
-     * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
-     * strings. Objects are compared by their own, not inherited, enumerable properties.
-     *
-     * @param path The path of the property to get.
-     * @param srcValue The value to match.
-     * @return Returns the new function.
-     */
-    (): MatchesProperty;
-    /**
-     * Creates a function that compares the property value of path on a given object to value.
-     *
-     * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
-     * strings. Objects are compared by their own, not inherited, enumerable properties.
-     *
-     * @param path The path of the property to get.
-     * @param srcValue The value to match.
-     * @return Returns the new function.
-     */
-    (path: _.PropertyPath): MatchesProperty1x1;
-    /**
-     * Creates a function that compares the property value of path on a given object to value.
-     *
-     * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
-     * strings. Objects are compared by their own, not inherited, enumerable properties.
-     *
-     * @param path The path of the property to get.
-     * @param srcValue The value to match.
-     * @return Returns the new function.
-     */
-    <T>(path: _.PropertyPath, srcValue: T): (value: any) => boolean;
-    /**
-     * Creates a function that compares the property value of path on a given object to value.
-     *
-     * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
-     * strings. Objects are compared by their own, not inherited, enumerable properties.
-     *
-     * @param path The path of the property to get.
-     * @param srcValue The value to match.
-     * @return Returns the new function.
-     */
-    <T, V>(path: _.PropertyPath, srcValue: T): (value: V) => boolean;
-}
-interface MatchesProperty1x1 {
-    /**
-     * Creates a function that compares the property value of path on a given object to value.
-     *
-     * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
-     * strings. Objects are compared by their own, not inherited, enumerable properties.
-     *
-     * @param path The path of the property to get.
-     * @param srcValue The value to match.
-     * @return Returns the new function.
-     */
-    (): MatchesProperty1x1;
-    /**
-     * Creates a function that compares the property value of path on a given object to value.
-     *
-     * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
-     * strings. Objects are compared by their own, not inherited, enumerable properties.
-     *
-     * @param path The path of the property to get.
-     * @param srcValue The value to match.
-     * @return Returns the new function.
-     */
-    <T>(srcValue: T): (value: any) => boolean;
-    /**
-     * Creates a function that compares the property value of path on a given object to value.
-     *
-     * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
-     * strings. Objects are compared by their own, not inherited, enumerable properties.
-     *
-     * @param path The path of the property to get.
-     * @param srcValue The value to match.
-     * @return Returns the new function.
-     */
-    <T, V>(srcValue: T): (value: V) => boolean;
-}
-
-declare const matchesProperty: MatchesProperty;
+import { matchesProperty } from "../fp";
 export = matchesProperty;
diff --git a/types/lodash/fp/max.d.ts b/types/lodash/fp/max.d.ts
index 138dba542d..7b08dc52c6 100644
--- a/types/lodash/fp/max.d.ts
+++ b/types/lodash/fp/max.d.ts
@@ -1,19 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-type Max =
-    /**
-      * Computes the maximum value of `array`. If `array` is empty or falsey
-      * `undefined` is returned.
-      *
-      * @category Math
-      * @param array The array to iterate over.
-      * @returns Returns the maximum value.
-      */
-    <T>(collection: _.List<T> | null | undefined) => T | undefined;
-
-declare const max: Max;
+import { max } from "../fp";
 export = max;
diff --git a/types/lodash/fp/maxBy.d.ts b/types/lodash/fp/maxBy.d.ts
index 44fb2ff7b1..68f30dd896 100644
--- a/types/lodash/fp/maxBy.d.ts
+++ b/types/lodash/fp/maxBy.d.ts
@@ -1,118 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface MaxBy {
-    /**
-     * This method is like `_.max` except that it accepts `iteratee` which is
-     * invoked for each element in `array` to generate the criterion by which
-     * the value is ranked. The iteratee is invoked with one argument: (value).
-     *
-     * @category Math
-     * @param array The array to iterate over.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the maximum value.
-     * @example
-     *
-     * var objects = [{ 'n': 1 }, { 'n': 2 }];
-     *
-     * _.maxBy(objects, function(o) { return o.a; });
-     * // => { 'n': 2 }
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.maxBy(objects, 'n');
-     * // => { 'n': 2 }
-     */
-    (): MaxBy;
-    /**
-     * This method is like `_.max` except that it accepts `iteratee` which is
-     * invoked for each element in `array` to generate the criterion by which
-     * the value is ranked. The iteratee is invoked with one argument: (value).
-     *
-     * @category Math
-     * @param array The array to iterate over.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the maximum value.
-     * @example
-     *
-     * var objects = [{ 'n': 1 }, { 'n': 2 }];
-     *
-     * _.maxBy(objects, function(o) { return o.a; });
-     * // => { 'n': 2 }
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.maxBy(objects, 'n');
-     * // => { 'n': 2 }
-     */
-    <T>(iteratee: _.ValueIteratee<T>): MaxBy1x1<T>;
-    /**
-     * This method is like `_.max` except that it accepts `iteratee` which is
-     * invoked for each element in `array` to generate the criterion by which
-     * the value is ranked. The iteratee is invoked with one argument: (value).
-     *
-     * @category Math
-     * @param array The array to iterate over.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the maximum value.
-     * @example
-     *
-     * var objects = [{ 'n': 1 }, { 'n': 2 }];
-     *
-     * _.maxBy(objects, function(o) { return o.a; });
-     * // => { 'n': 2 }
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.maxBy(objects, 'n');
-     * // => { 'n': 2 }
-     */
-    <T>(iteratee: _.ValueIteratee<T>, collection: _.List<T> | null | undefined): T | undefined;
-}
-interface MaxBy1x1<T> {
-    /**
-     * This method is like `_.max` except that it accepts `iteratee` which is
-     * invoked for each element in `array` to generate the criterion by which
-     * the value is ranked. The iteratee is invoked with one argument: (value).
-     *
-     * @category Math
-     * @param array The array to iterate over.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the maximum value.
-     * @example
-     *
-     * var objects = [{ 'n': 1 }, { 'n': 2 }];
-     *
-     * _.maxBy(objects, function(o) { return o.a; });
-     * // => { 'n': 2 }
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.maxBy(objects, 'n');
-     * // => { 'n': 2 }
-     */
-    (): MaxBy1x1<T>;
-    /**
-     * This method is like `_.max` except that it accepts `iteratee` which is
-     * invoked for each element in `array` to generate the criterion by which
-     * the value is ranked. The iteratee is invoked with one argument: (value).
-     *
-     * @category Math
-     * @param array The array to iterate over.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the maximum value.
-     * @example
-     *
-     * var objects = [{ 'n': 1 }, { 'n': 2 }];
-     *
-     * _.maxBy(objects, function(o) { return o.a; });
-     * // => { 'n': 2 }
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.maxBy(objects, 'n');
-     * // => { 'n': 2 }
-     */
-    (collection: _.List<T> | null | undefined): T | undefined;
-}
-
-declare const maxBy: MaxBy;
+import { maxBy } from "../fp";
 export = maxBy;
diff --git a/types/lodash/fp/mean.d.ts b/types/lodash/fp/mean.d.ts
index 0e37afaeaf..a0b7e22e5b 100644
--- a/types/lodash/fp/mean.d.ts
+++ b/types/lodash/fp/mean.d.ts
@@ -1,22 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-type Mean =
-    /**
-     * Computes the mean of the values in `array`.
-     *
-     * @category Math
-     * @param array The array to iterate over.
-     * @returns Returns the mean.
-     * @example
-     *
-     * _.mean([4, 2, 8, 6]);
-     * // => 5
-     */
-    (collection: _.List<any> | null | undefined) => number;
-
-declare const mean: Mean;
+import { mean } from "../fp";
 export = mean;
diff --git a/types/lodash/fp/meanBy.d.ts b/types/lodash/fp/meanBy.d.ts
index 7ae670a7b5..d76afd77c1 100644
--- a/types/lodash/fp/meanBy.d.ts
+++ b/types/lodash/fp/meanBy.d.ts
@@ -1,78 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface MeanBy {
-    /**
-       * Computes the mean of the provided propties of the objects in the `array`
-       *
-       * @category Math
-       * @param array The array to iterate over.
-       * @param [iteratee=_.identity] The iteratee invoked per element.
-       * @returns Returns the mean.
-       * @example
-       *
-       * _.mean([{ 'n': 4 }, { 'n': 2 }, { 'n': 8 }, { 'n': 6 }], 'n');
-       * // => 5
-       */
-    (): MeanBy;
-    /**
-       * Computes the mean of the provided propties of the objects in the `array`
-       *
-       * @category Math
-       * @param array The array to iterate over.
-       * @param [iteratee=_.identity] The iteratee invoked per element.
-       * @returns Returns the mean.
-       * @example
-       *
-       * _.mean([{ 'n': 4 }, { 'n': 2 }, { 'n': 8 }, { 'n': 6 }], 'n');
-       * // => 5
-       */
-    <T>(iteratee: _.ValueIteratee<T>): MeanBy1x1<T>;
-    /**
-       * Computes the mean of the provided propties of the objects in the `array`
-       *
-       * @category Math
-       * @param array The array to iterate over.
-       * @param [iteratee=_.identity] The iteratee invoked per element.
-       * @returns Returns the mean.
-       * @example
-       *
-       * _.mean([{ 'n': 4 }, { 'n': 2 }, { 'n': 8 }, { 'n': 6 }], 'n');
-       * // => 5
-       */
-    <T>(iteratee: _.ValueIteratee<T>, collection: _.List<T> | null | undefined): number;
-}
-interface MeanBy1x1<T> {
-    /**
-       * Computes the mean of the provided propties of the objects in the `array`
-       *
-       * @category Math
-       * @param array The array to iterate over.
-       * @param [iteratee=_.identity] The iteratee invoked per element.
-       * @returns Returns the mean.
-       * @example
-       *
-       * _.mean([{ 'n': 4 }, { 'n': 2 }, { 'n': 8 }, { 'n': 6 }], 'n');
-       * // => 5
-       */
-    (): MeanBy1x1<T>;
-    /**
-       * Computes the mean of the provided propties of the objects in the `array`
-       *
-       * @category Math
-       * @param array The array to iterate over.
-       * @param [iteratee=_.identity] The iteratee invoked per element.
-       * @returns Returns the mean.
-       * @example
-       *
-       * _.mean([{ 'n': 4 }, { 'n': 2 }, { 'n': 8 }, { 'n': 6 }], 'n');
-       * // => 5
-       */
-    (collection: _.List<T> | null | undefined): number;
-}
-
-declare const meanBy: MeanBy;
+import { meanBy } from "../fp";
 export = meanBy;
diff --git a/types/lodash/fp/memoize.d.ts b/types/lodash/fp/memoize.d.ts
index c694ae0909..a60b79cafa 100644
--- a/types/lodash/fp/memoize.d.ts
+++ b/types/lodash/fp/memoize.d.ts
@@ -1,21 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-type Memoize =
-    /**
-     * Creates a function that memoizes the result of func. If resolver is provided it determines the cache key for
-     * storing the result based on the arguments provided to the memoized function. By default, the first argument
-     * provided to the memoized function is coerced to a string and used as the cache key. The func is invoked with
-     * the this binding of the memoized function.
-     *
-     * @param func The function to have its output memoized.
-     * @param resolver The function to resolve the cache key.
-     * @return Returns the new memoizing function.
-     */
-    <T extends (...args: any[]) => any>(func: T) => T & _.MemoizedFunction;
-
-declare const memoize: Memoize;
+import { memoize } from "../fp";
 export = memoize;
diff --git a/types/lodash/fp/merge.d.ts b/types/lodash/fp/merge.d.ts
index fe05c22488..f80117b7e9 100644
--- a/types/lodash/fp/merge.d.ts
+++ b/types/lodash/fp/merge.d.ts
@@ -1,151 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface Merge {
-    /**
-     * Recursively merges own and inherited enumerable properties of source
-     * objects into the destination object, skipping source properties that resolve
-     * to `undefined`. Array and plain object properties are merged recursively.
-     * Other objects and value types are overridden by assignment. Source objects
-     * are applied from left to right. Subsequent sources overwrite property
-     * assignments of previous sources.
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @category Object
-     * @param object The destination object.
-     * @param [sources] The source objects.
-     * @returns Returns `object`.
-     * @example
-     *
-     * var users = {
-     *   'data': [{ 'user': 'barney' }, { 'user': 'fred' }]
-     * };
-     *
-     * var ages = {
-     *   'data': [{ 'age': 36 }, { 'age': 40 }]
-     * };
-     *
-     * _.merge(users, ages);
-     * // => { 'data': [{ 'user': 'barney', 'age': 36 }, { 'user': 'fred', 'age': 40 }] }
-     */
-    (): Merge;
-    /**
-     * Recursively merges own and inherited enumerable properties of source
-     * objects into the destination object, skipping source properties that resolve
-     * to `undefined`. Array and plain object properties are merged recursively.
-     * Other objects and value types are overridden by assignment. Source objects
-     * are applied from left to right. Subsequent sources overwrite property
-     * assignments of previous sources.
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @category Object
-     * @param object The destination object.
-     * @param [sources] The source objects.
-     * @returns Returns `object`.
-     * @example
-     *
-     * var users = {
-     *   'data': [{ 'user': 'barney' }, { 'user': 'fred' }]
-     * };
-     *
-     * var ages = {
-     *   'data': [{ 'age': 36 }, { 'age': 40 }]
-     * };
-     *
-     * _.merge(users, ages);
-     * // => { 'data': [{ 'user': 'barney', 'age': 36 }, { 'user': 'fred', 'age': 40 }] }
-     */
-    <TObject>(object: TObject): Merge1x1<TObject>;
-    /**
-     * Recursively merges own and inherited enumerable properties of source
-     * objects into the destination object, skipping source properties that resolve
-     * to `undefined`. Array and plain object properties are merged recursively.
-     * Other objects and value types are overridden by assignment. Source objects
-     * are applied from left to right. Subsequent sources overwrite property
-     * assignments of previous sources.
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @category Object
-     * @param object The destination object.
-     * @param [sources] The source objects.
-     * @returns Returns `object`.
-     * @example
-     *
-     * var users = {
-     *   'data': [{ 'user': 'barney' }, { 'user': 'fred' }]
-     * };
-     *
-     * var ages = {
-     *   'data': [{ 'age': 36 }, { 'age': 40 }]
-     * };
-     *
-     * _.merge(users, ages);
-     * // => { 'data': [{ 'user': 'barney', 'age': 36 }, { 'user': 'fred', 'age': 40 }] }
-     */
-    <TObject, TSource>(object: TObject, source: TSource): TObject & TSource;
-}
-interface Merge1x1<TObject> {
-    /**
-     * Recursively merges own and inherited enumerable properties of source
-     * objects into the destination object, skipping source properties that resolve
-     * to `undefined`. Array and plain object properties are merged recursively.
-     * Other objects and value types are overridden by assignment. Source objects
-     * are applied from left to right. Subsequent sources overwrite property
-     * assignments of previous sources.
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @category Object
-     * @param object The destination object.
-     * @param [sources] The source objects.
-     * @returns Returns `object`.
-     * @example
-     *
-     * var users = {
-     *   'data': [{ 'user': 'barney' }, { 'user': 'fred' }]
-     * };
-     *
-     * var ages = {
-     *   'data': [{ 'age': 36 }, { 'age': 40 }]
-     * };
-     *
-     * _.merge(users, ages);
-     * // => { 'data': [{ 'user': 'barney', 'age': 36 }, { 'user': 'fred', 'age': 40 }] }
-     */
-    (): Merge1x1<TObject>;
-    /**
-     * Recursively merges own and inherited enumerable properties of source
-     * objects into the destination object, skipping source properties that resolve
-     * to `undefined`. Array and plain object properties are merged recursively.
-     * Other objects and value types are overridden by assignment. Source objects
-     * are applied from left to right. Subsequent sources overwrite property
-     * assignments of previous sources.
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @category Object
-     * @param object The destination object.
-     * @param [sources] The source objects.
-     * @returns Returns `object`.
-     * @example
-     *
-     * var users = {
-     *   'data': [{ 'user': 'barney' }, { 'user': 'fred' }]
-     * };
-     *
-     * var ages = {
-     *   'data': [{ 'age': 36 }, { 'age': 40 }]
-     * };
-     *
-     * _.merge(users, ages);
-     * // => { 'data': [{ 'user': 'barney', 'age': 36 }, { 'user': 'fred', 'age': 40 }] }
-     */
-    <TSource>(source: TSource): TObject & TSource;
-}
-
-declare const merge: Merge;
+import { merge } from "../fp";
 export = merge;
diff --git a/types/lodash/fp/mergeAll.d.ts b/types/lodash/fp/mergeAll.d.ts
index 350ef6110c..6b462d85cb 100644
--- a/types/lodash/fp/mergeAll.d.ts
+++ b/types/lodash/fp/mergeAll.d.ts
@@ -1,36 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type Merge =
-    /**
-     * Recursively merges own and inherited enumerable properties of source
-     * objects into the destination object, skipping source properties that resolve
-     * to `undefined`. Array and plain object properties are merged recursively.
-     * Other objects and value types are overridden by assignment. Source objects
-     * are applied from left to right. Subsequent sources overwrite property
-     * assignments of previous sources.
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @category Object
-     * @param object The destination object.
-     * @param [sources] The source objects.
-     * @returns Returns `object`.
-     * @example
-     *
-     * var users = {
-     *   'data': [{ 'user': 'barney' }, { 'user': 'fred' }]
-     * };
-     *
-     * var ages = {
-     *   'data': [{ 'age': 36 }, { 'age': 40 }]
-     * };
-     *
-     * _.merge(users, ages);
-     * // => { 'data': [{ 'user': 'barney', 'age': 36 }, { 'user': 'fred', 'age': 40 }] }
-     */
-    (object: ReadonlyArray<any>) => any;
-
-declare const mergeAll: Merge;
+import { mergeAll } from "../fp";
 export = mergeAll;
diff --git a/types/lodash/fp/mergeAllWith.d.ts b/types/lodash/fp/mergeAllWith.d.ts
index 96be3f4db9..3d2f7f296e 100644
--- a/types/lodash/fp/mergeAllWith.d.ts
+++ b/types/lodash/fp/mergeAllWith.d.ts
@@ -1,183 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface MergeWith {
-    /**
-     * This method is like `_.merge` except that it accepts `customizer` which
-     * is invoked to produce the merged values of the destination and source
-     * properties. If `customizer` returns `undefined` merging is handled by the
-     * method instead. The `customizer` is invoked with seven arguments:
-     * (objValue, srcValue, key, object, source, stack).
-     *
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param customizer The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   if (_.isArray(objValue)) {
-     * return objValue.concat(srcValue);
-     *   }
-     * }
-     *
-     * var object = {
-     *   'fruits': ['apple'],
-     *   'vegetables': ['beet']
-     * };
-     *
-     * var other = {
-     *   'fruits': ['banana'],
-     *   'vegetables': ['carrot']
-     * };
-     *
-     * _.merge(object, other, customizer);
-     * // => { 'fruits': ['apple', 'banana'], 'vegetables': ['beet', 'carrot'] }
-     */
-    (): MergeWith;
-    /**
-     * This method is like `_.merge` except that it accepts `customizer` which
-     * is invoked to produce the merged values of the destination and source
-     * properties. If `customizer` returns `undefined` merging is handled by the
-     * method instead. The `customizer` is invoked with seven arguments:
-     * (objValue, srcValue, key, object, source, stack).
-     *
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param customizer The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   if (_.isArray(objValue)) {
-     * return objValue.concat(srcValue);
-     *   }
-     * }
-     *
-     * var object = {
-     *   'fruits': ['apple'],
-     *   'vegetables': ['beet']
-     * };
-     *
-     * var other = {
-     *   'fruits': ['banana'],
-     *   'vegetables': ['carrot']
-     * };
-     *
-     * _.merge(object, other, customizer);
-     * // => { 'fruits': ['apple', 'banana'], 'vegetables': ['beet', 'carrot'] }
-     */
-    (customizer: _.MergeWithCustomizer): MergeWith1x1;
-    /**
-     * This method is like `_.merge` except that it accepts `customizer` which
-     * is invoked to produce the merged values of the destination and source
-     * properties. If `customizer` returns `undefined` merging is handled by the
-     * method instead. The `customizer` is invoked with seven arguments:
-     * (objValue, srcValue, key, object, source, stack).
-     *
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param customizer The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   if (_.isArray(objValue)) {
-     * return objValue.concat(srcValue);
-     *   }
-     * }
-     *
-     * var object = {
-     *   'fruits': ['apple'],
-     *   'vegetables': ['beet']
-     * };
-     *
-     * var other = {
-     *   'fruits': ['banana'],
-     *   'vegetables': ['carrot']
-     * };
-     *
-     * _.merge(object, other, customizer);
-     * // => { 'fruits': ['apple', 'banana'], 'vegetables': ['beet', 'carrot'] }
-     */
-    (customizer: _.MergeWithCustomizer, args: ReadonlyArray<any>): any;
-}
-interface MergeWith1x1 {
-    /**
-     * This method is like `_.merge` except that it accepts `customizer` which
-     * is invoked to produce the merged values of the destination and source
-     * properties. If `customizer` returns `undefined` merging is handled by the
-     * method instead. The `customizer` is invoked with seven arguments:
-     * (objValue, srcValue, key, object, source, stack).
-     *
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param customizer The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   if (_.isArray(objValue)) {
-     * return objValue.concat(srcValue);
-     *   }
-     * }
-     *
-     * var object = {
-     *   'fruits': ['apple'],
-     *   'vegetables': ['beet']
-     * };
-     *
-     * var other = {
-     *   'fruits': ['banana'],
-     *   'vegetables': ['carrot']
-     * };
-     *
-     * _.merge(object, other, customizer);
-     * // => { 'fruits': ['apple', 'banana'], 'vegetables': ['beet', 'carrot'] }
-     */
-    (): MergeWith1x1;
-    /**
-     * This method is like `_.merge` except that it accepts `customizer` which
-     * is invoked to produce the merged values of the destination and source
-     * properties. If `customizer` returns `undefined` merging is handled by the
-     * method instead. The `customizer` is invoked with seven arguments:
-     * (objValue, srcValue, key, object, source, stack).
-     *
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param customizer The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   if (_.isArray(objValue)) {
-     * return objValue.concat(srcValue);
-     *   }
-     * }
-     *
-     * var object = {
-     *   'fruits': ['apple'],
-     *   'vegetables': ['beet']
-     * };
-     *
-     * var other = {
-     *   'fruits': ['banana'],
-     *   'vegetables': ['carrot']
-     * };
-     *
-     * _.merge(object, other, customizer);
-     * // => { 'fruits': ['apple', 'banana'], 'vegetables': ['beet', 'carrot'] }
-     */
-    (args: ReadonlyArray<any>): any;
-}
-
-declare const mergeAllWith: MergeWith;
+import { mergeAllWith } from "../fp";
 export = mergeAllWith;
diff --git a/types/lodash/fp/mergeWith.d.ts b/types/lodash/fp/mergeWith.d.ts
index 64556114df..d1f541e81b 100644
--- a/types/lodash/fp/mergeWith.d.ts
+++ b/types/lodash/fp/mergeWith.d.ts
@@ -1,321 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface MergeWith {
-    /**
-     * This method is like `_.merge` except that it accepts `customizer` which
-     * is invoked to produce the merged values of the destination and source
-     * properties. If `customizer` returns `undefined` merging is handled by the
-     * method instead. The `customizer` is invoked with seven arguments:
-     * (objValue, srcValue, key, object, source, stack).
-     *
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param customizer The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   if (_.isArray(objValue)) {
-     * return objValue.concat(srcValue);
-     *   }
-     * }
-     *
-     * var object = {
-     *   'fruits': ['apple'],
-     *   'vegetables': ['beet']
-     * };
-     *
-     * var other = {
-     *   'fruits': ['banana'],
-     *   'vegetables': ['carrot']
-     * };
-     *
-     * _.merge(object, other, customizer);
-     * // => { 'fruits': ['apple', 'banana'], 'vegetables': ['beet', 'carrot'] }
-     */
-    (): MergeWith;
-    /**
-     * This method is like `_.merge` except that it accepts `customizer` which
-     * is invoked to produce the merged values of the destination and source
-     * properties. If `customizer` returns `undefined` merging is handled by the
-     * method instead. The `customizer` is invoked with seven arguments:
-     * (objValue, srcValue, key, object, source, stack).
-     *
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param customizer The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   if (_.isArray(objValue)) {
-     * return objValue.concat(srcValue);
-     *   }
-     * }
-     *
-     * var object = {
-     *   'fruits': ['apple'],
-     *   'vegetables': ['beet']
-     * };
-     *
-     * var other = {
-     *   'fruits': ['banana'],
-     *   'vegetables': ['carrot']
-     * };
-     *
-     * _.merge(object, other, customizer);
-     * // => { 'fruits': ['apple', 'banana'], 'vegetables': ['beet', 'carrot'] }
-     */
-    (customizer: _.MergeWithCustomizer): MergeWith1x1;
-    /**
-     * This method is like `_.merge` except that it accepts `customizer` which
-     * is invoked to produce the merged values of the destination and source
-     * properties. If `customizer` returns `undefined` merging is handled by the
-     * method instead. The `customizer` is invoked with seven arguments:
-     * (objValue, srcValue, key, object, source, stack).
-     *
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param customizer The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   if (_.isArray(objValue)) {
-     * return objValue.concat(srcValue);
-     *   }
-     * }
-     *
-     * var object = {
-     *   'fruits': ['apple'],
-     *   'vegetables': ['beet']
-     * };
-     *
-     * var other = {
-     *   'fruits': ['banana'],
-     *   'vegetables': ['carrot']
-     * };
-     *
-     * _.merge(object, other, customizer);
-     * // => { 'fruits': ['apple', 'banana'], 'vegetables': ['beet', 'carrot'] }
-     */
-    <TObject>(customizer: _.MergeWithCustomizer, object: TObject): MergeWith1x2<TObject>;
-    /**
-     * This method is like `_.merge` except that it accepts `customizer` which
-     * is invoked to produce the merged values of the destination and source
-     * properties. If `customizer` returns `undefined` merging is handled by the
-     * method instead. The `customizer` is invoked with seven arguments:
-     * (objValue, srcValue, key, object, source, stack).
-     *
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param customizer The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   if (_.isArray(objValue)) {
-     * return objValue.concat(srcValue);
-     *   }
-     * }
-     *
-     * var object = {
-     *   'fruits': ['apple'],
-     *   'vegetables': ['beet']
-     * };
-     *
-     * var other = {
-     *   'fruits': ['banana'],
-     *   'vegetables': ['carrot']
-     * };
-     *
-     * _.merge(object, other, customizer);
-     * // => { 'fruits': ['apple', 'banana'], 'vegetables': ['beet', 'carrot'] }
-     */
-    <TObject, TSource>(customizer: _.MergeWithCustomizer, object: TObject, source: TSource): TObject & TSource;
-}
-interface MergeWith1x1 {
-    /**
-     * This method is like `_.merge` except that it accepts `customizer` which
-     * is invoked to produce the merged values of the destination and source
-     * properties. If `customizer` returns `undefined` merging is handled by the
-     * method instead. The `customizer` is invoked with seven arguments:
-     * (objValue, srcValue, key, object, source, stack).
-     *
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param customizer The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   if (_.isArray(objValue)) {
-     * return objValue.concat(srcValue);
-     *   }
-     * }
-     *
-     * var object = {
-     *   'fruits': ['apple'],
-     *   'vegetables': ['beet']
-     * };
-     *
-     * var other = {
-     *   'fruits': ['banana'],
-     *   'vegetables': ['carrot']
-     * };
-     *
-     * _.merge(object, other, customizer);
-     * // => { 'fruits': ['apple', 'banana'], 'vegetables': ['beet', 'carrot'] }
-     */
-    (): MergeWith1x1;
-    /**
-     * This method is like `_.merge` except that it accepts `customizer` which
-     * is invoked to produce the merged values of the destination and source
-     * properties. If `customizer` returns `undefined` merging is handled by the
-     * method instead. The `customizer` is invoked with seven arguments:
-     * (objValue, srcValue, key, object, source, stack).
-     *
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param customizer The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   if (_.isArray(objValue)) {
-     * return objValue.concat(srcValue);
-     *   }
-     * }
-     *
-     * var object = {
-     *   'fruits': ['apple'],
-     *   'vegetables': ['beet']
-     * };
-     *
-     * var other = {
-     *   'fruits': ['banana'],
-     *   'vegetables': ['carrot']
-     * };
-     *
-     * _.merge(object, other, customizer);
-     * // => { 'fruits': ['apple', 'banana'], 'vegetables': ['beet', 'carrot'] }
-     */
-    <TObject>(object: TObject): MergeWith1x2<TObject>;
-    /**
-     * This method is like `_.merge` except that it accepts `customizer` which
-     * is invoked to produce the merged values of the destination and source
-     * properties. If `customizer` returns `undefined` merging is handled by the
-     * method instead. The `customizer` is invoked with seven arguments:
-     * (objValue, srcValue, key, object, source, stack).
-     *
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param customizer The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   if (_.isArray(objValue)) {
-     * return objValue.concat(srcValue);
-     *   }
-     * }
-     *
-     * var object = {
-     *   'fruits': ['apple'],
-     *   'vegetables': ['beet']
-     * };
-     *
-     * var other = {
-     *   'fruits': ['banana'],
-     *   'vegetables': ['carrot']
-     * };
-     *
-     * _.merge(object, other, customizer);
-     * // => { 'fruits': ['apple', 'banana'], 'vegetables': ['beet', 'carrot'] }
-     */
-    <TObject, TSource>(object: TObject, source: TSource): TObject & TSource;
-}
-interface MergeWith1x2<TObject> {
-    /**
-     * This method is like `_.merge` except that it accepts `customizer` which
-     * is invoked to produce the merged values of the destination and source
-     * properties. If `customizer` returns `undefined` merging is handled by the
-     * method instead. The `customizer` is invoked with seven arguments:
-     * (objValue, srcValue, key, object, source, stack).
-     *
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param customizer The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   if (_.isArray(objValue)) {
-     * return objValue.concat(srcValue);
-     *   }
-     * }
-     *
-     * var object = {
-     *   'fruits': ['apple'],
-     *   'vegetables': ['beet']
-     * };
-     *
-     * var other = {
-     *   'fruits': ['banana'],
-     *   'vegetables': ['carrot']
-     * };
-     *
-     * _.merge(object, other, customizer);
-     * // => { 'fruits': ['apple', 'banana'], 'vegetables': ['beet', 'carrot'] }
-     */
-    (): MergeWith1x2<TObject>;
-    /**
-     * This method is like `_.merge` except that it accepts `customizer` which
-     * is invoked to produce the merged values of the destination and source
-     * properties. If `customizer` returns `undefined` merging is handled by the
-     * method instead. The `customizer` is invoked with seven arguments:
-     * (objValue, srcValue, key, object, source, stack).
-     *
-     * @category Object
-     * @param object The destination object.
-     * @param sources The source objects.
-     * @param customizer The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * function customizer(objValue, srcValue) {
-     *   if (_.isArray(objValue)) {
-     * return objValue.concat(srcValue);
-     *   }
-     * }
-     *
-     * var object = {
-     *   'fruits': ['apple'],
-     *   'vegetables': ['beet']
-     * };
-     *
-     * var other = {
-     *   'fruits': ['banana'],
-     *   'vegetables': ['carrot']
-     * };
-     *
-     * _.merge(object, other, customizer);
-     * // => { 'fruits': ['apple', 'banana'], 'vegetables': ['beet', 'carrot'] }
-     */
-    <TSource>(source: TSource): TObject & TSource;
-}
-
-declare const mergeWith: MergeWith;
+import { mergeWith } from "../fp";
 export = mergeWith;
diff --git a/types/lodash/fp/method.d.ts b/types/lodash/fp/method.d.ts
index e44efd9f07..f9f2ee8795 100644
--- a/types/lodash/fp/method.d.ts
+++ b/types/lodash/fp/method.d.ts
@@ -1,19 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-type Method =
-    /**
-     * Creates a function that invokes the method at path on a given object. Any additional arguments are provided
-     * to the invoked method.
-     *
-     * @param path The path of the method to invoke.
-     * @param args The arguments to invoke the method with.
-     * @return Returns the new function.
-     */
-    (path: _.PropertyPath) => (object: any) => any;
-
-declare const method: Method;
+import { method } from "../fp";
 export = method;
diff --git a/types/lodash/fp/methodOf.d.ts b/types/lodash/fp/methodOf.d.ts
index 6a1a908de7..a9e0e4fe14 100644
--- a/types/lodash/fp/methodOf.d.ts
+++ b/types/lodash/fp/methodOf.d.ts
@@ -1,19 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-type MethodOf =
-    /**
-     * The opposite of _.method; this method creates a function that invokes the method at a given path on object.
-     * Any additional arguments are provided to the invoked method.
-     *
-     * @param object The object to query.
-     * @param args The arguments to invoke the method with.
-     * @return Returns the new function.
-     */
-    (object: object) => (path: _.PropertyPath) => any;
-
-declare const methodOf: MethodOf;
+import { methodOf } from "../fp";
 export = methodOf;
diff --git a/types/lodash/fp/min.d.ts b/types/lodash/fp/min.d.ts
index f637f397ac..7c80ab0ff9 100644
--- a/types/lodash/fp/min.d.ts
+++ b/types/lodash/fp/min.d.ts
@@ -1,19 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-type Min =
-    /**
-     * Computes the minimum value of `array`. If `array` is empty or falsey
-     * `undefined` is returned.
-     *
-     * @category Math
-     * @param array The array to iterate over.
-     * @returns Returns the minimum value.
-     */
-    <T>(collection: _.List<T> | null | undefined) => T | undefined;
-
-declare const min: Min;
+import { min } from "../fp";
 export = min;
diff --git a/types/lodash/fp/minBy.d.ts b/types/lodash/fp/minBy.d.ts
index b9bdebecd8..020a8f506c 100644
--- a/types/lodash/fp/minBy.d.ts
+++ b/types/lodash/fp/minBy.d.ts
@@ -1,118 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface MinBy {
-    /**
-     * This method is like `_.min` except that it accepts `iteratee` which is
-     * invoked for each element in `array` to generate the criterion by which
-     * the value is ranked. The iteratee is invoked with one argument: (value).
-     *
-     * @category Math
-     * @param array The array to iterate over.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the minimum value.
-     * @example
-     *
-     * var objects = [{ 'n': 1 }, { 'n': 2 }];
-     *
-     * _.minBy(objects, function(o) { return o.a; });
-     * // => { 'n': 1 }
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.minBy(objects, 'n');
-     * // => { 'n': 1 }
-     */
-    (): MinBy;
-    /**
-     * This method is like `_.min` except that it accepts `iteratee` which is
-     * invoked for each element in `array` to generate the criterion by which
-     * the value is ranked. The iteratee is invoked with one argument: (value).
-     *
-     * @category Math
-     * @param array The array to iterate over.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the minimum value.
-     * @example
-     *
-     * var objects = [{ 'n': 1 }, { 'n': 2 }];
-     *
-     * _.minBy(objects, function(o) { return o.a; });
-     * // => { 'n': 1 }
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.minBy(objects, 'n');
-     * // => { 'n': 1 }
-     */
-    <T>(iteratee: _.ValueIteratee<T>): MinBy1x1<T>;
-    /**
-     * This method is like `_.min` except that it accepts `iteratee` which is
-     * invoked for each element in `array` to generate the criterion by which
-     * the value is ranked. The iteratee is invoked with one argument: (value).
-     *
-     * @category Math
-     * @param array The array to iterate over.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the minimum value.
-     * @example
-     *
-     * var objects = [{ 'n': 1 }, { 'n': 2 }];
-     *
-     * _.minBy(objects, function(o) { return o.a; });
-     * // => { 'n': 1 }
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.minBy(objects, 'n');
-     * // => { 'n': 1 }
-     */
-    <T>(iteratee: _.ValueIteratee<T>, collection: _.List<T> | null | undefined): T | undefined;
-}
-interface MinBy1x1<T> {
-    /**
-     * This method is like `_.min` except that it accepts `iteratee` which is
-     * invoked for each element in `array` to generate the criterion by which
-     * the value is ranked. The iteratee is invoked with one argument: (value).
-     *
-     * @category Math
-     * @param array The array to iterate over.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the minimum value.
-     * @example
-     *
-     * var objects = [{ 'n': 1 }, { 'n': 2 }];
-     *
-     * _.minBy(objects, function(o) { return o.a; });
-     * // => { 'n': 1 }
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.minBy(objects, 'n');
-     * // => { 'n': 1 }
-     */
-    (): MinBy1x1<T>;
-    /**
-     * This method is like `_.min` except that it accepts `iteratee` which is
-     * invoked for each element in `array` to generate the criterion by which
-     * the value is ranked. The iteratee is invoked with one argument: (value).
-     *
-     * @category Math
-     * @param array The array to iterate over.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the minimum value.
-     * @example
-     *
-     * var objects = [{ 'n': 1 }, { 'n': 2 }];
-     *
-     * _.minBy(objects, function(o) { return o.a; });
-     * // => { 'n': 1 }
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.minBy(objects, 'n');
-     * // => { 'n': 1 }
-     */
-    (collection: _.List<T> | null | undefined): T | undefined;
-}
-
-declare const minBy: MinBy;
+import { minBy } from "../fp";
 export = minBy;
diff --git a/types/lodash/fp/multiply.d.ts b/types/lodash/fp/multiply.d.ts
index a335372aac..b3e5f3abd9 100644
--- a/types/lodash/fp/multiply.d.ts
+++ b/types/lodash/fp/multiply.d.ts
@@ -1,46 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface Multiply {
-    /**
-     * Multiply two numbers.
-     * @param multiplier The first number in a multiplication.
-     * @param multiplicand The second number in a multiplication.
-     * @returns Returns the product.
-     */
-    (): Multiply;
-    /**
-     * Multiply two numbers.
-     * @param multiplier The first number in a multiplication.
-     * @param multiplicand The second number in a multiplication.
-     * @returns Returns the product.
-     */
-    (multiplier: number): Multiply1x1;
-    /**
-     * Multiply two numbers.
-     * @param multiplier The first number in a multiplication.
-     * @param multiplicand The second number in a multiplication.
-     * @returns Returns the product.
-     */
-    (multiplier: number, multiplicand: number): number;
-}
-interface Multiply1x1 {
-    /**
-     * Multiply two numbers.
-     * @param multiplier The first number in a multiplication.
-     * @param multiplicand The second number in a multiplication.
-     * @returns Returns the product.
-     */
-    (): Multiply1x1;
-    /**
-     * Multiply two numbers.
-     * @param multiplier The first number in a multiplication.
-     * @param multiplicand The second number in a multiplication.
-     * @returns Returns the product.
-     */
-    (multiplicand: number): number;
-}
-
-declare const multiply: Multiply;
+import { multiply } from "../fp";
 export = multiply;
diff --git a/types/lodash/fp/nAry.d.ts b/types/lodash/fp/nAry.d.ts
index daede14899..882e4a37d6 100644
--- a/types/lodash/fp/nAry.d.ts
+++ b/types/lodash/fp/nAry.d.ts
@@ -1,51 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface Ary {
-    /**
-     * Creates a function that accepts up to n arguments ignoring any additional arguments.
-     *
-     * @param func The function to cap arguments for.
-     * @param n The arity cap.
-     * @returns Returns the new function.
-     */
-    (): Ary;
-    /**
-     * Creates a function that accepts up to n arguments ignoring any additional arguments.
-     *
-     * @param func The function to cap arguments for.
-     * @param n The arity cap.
-     * @returns Returns the new function.
-     */
-    (n: number): Ary1x1;
-    /**
-     * Creates a function that accepts up to n arguments ignoring any additional arguments.
-     *
-     * @param func The function to cap arguments for.
-     * @param n The arity cap.
-     * @returns Returns the new function.
-     */
-    (n: number, func: (...args: any[]) => any): (...args: any[]) => any;
-}
-interface Ary1x1 {
-    /**
-     * Creates a function that accepts up to n arguments ignoring any additional arguments.
-     *
-     * @param func The function to cap arguments for.
-     * @param n The arity cap.
-     * @returns Returns the new function.
-     */
-    (): Ary1x1;
-    /**
-     * Creates a function that accepts up to n arguments ignoring any additional arguments.
-     *
-     * @param func The function to cap arguments for.
-     * @param n The arity cap.
-     * @returns Returns the new function.
-     */
-    (func: (...args: any[]) => any): (...args: any[]) => any;
-}
-
-declare const nAry: Ary;
+import { nAry } from "../fp";
 export = nAry;
diff --git a/types/lodash/fp/negate.d.ts b/types/lodash/fp/negate.d.ts
index 681c5be961..a7693c1928 100644
--- a/types/lodash/fp/negate.d.ts
+++ b/types/lodash/fp/negate.d.ts
@@ -1,16 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type Negate =
-    /**
-     * Creates a function that negates the result of the predicate func. The func predicate is invoked with
-     * the this binding and arguments of the created function.
-     *
-     * @param predicate The predicate to negate.
-     * @return Returns the new function.
-     */
-    <T extends (...args: any[]) => any>(predicate: T) => T;
-
-declare const negate: Negate;
+import { negate } from "../fp";
 export = negate;
diff --git a/types/lodash/fp/noConflict.d.ts b/types/lodash/fp/noConflict.d.ts
index 2b1a6c71c9..7694f5aa5a 100644
--- a/types/lodash/fp/noConflict.d.ts
+++ b/types/lodash/fp/noConflict.d.ts
@@ -1,16 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-type NoConflict =
-    /**
-     * Reverts the _ variable to its previous value and returns a reference to the lodash function.
-     *
-     * @return Returns the lodash function.
-     */
-    () => typeof _;
-
-declare const noConflict: NoConflict;
+import { noConflict } from "../fp";
 export = noConflict;
diff --git a/types/lodash/fp/noop.d.ts b/types/lodash/fp/noop.d.ts
index 29ce7267ea..5b6a27b61a 100644
--- a/types/lodash/fp/noop.d.ts
+++ b/types/lodash/fp/noop.d.ts
@@ -1,14 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type Noop =
-    /**
-     * A no-operation function that returns undefined regardless of the arguments it receives.
-     *
-     * @return undefined
-     */
-    (...args: any[]) => void;
-
-declare const noop: Noop;
+import { noop } from "../fp";
 export = noop;
diff --git a/types/lodash/fp/now.d.ts b/types/lodash/fp/now.d.ts
index d450c76116..fdbbd2bcf7 100644
--- a/types/lodash/fp/now.d.ts
+++ b/types/lodash/fp/now.d.ts
@@ -1,14 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type Now =
-    /**
-     * Gets the number of milliseconds that have elapsed since the Unix epoch (1 January 1970 00:00:00 UTC).
-     *
-     * @return The number of milliseconds.
-     */
-    () => number;
-
-declare const now: Now;
+import { now } from "../fp";
 export = now;
diff --git a/types/lodash/fp/nth.d.ts b/types/lodash/fp/nth.d.ts
index a1fbedb1bf..e3987e17cb 100644
--- a/types/lodash/fp/nth.d.ts
+++ b/types/lodash/fp/nth.d.ts
@@ -1,53 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Nth {
-    /**
-     * Gets the element at index `n` of `array`. If `n` is negative, the nth element from the end is returned.
-     *
-     * @param array array The array to query.
-     * @param value The index of the element to return.
-     * @return Returns the nth element of `array`.
-     */
-    (): Nth;
-    /**
-     * Gets the element at index `n` of `array`. If `n` is negative, the nth element from the end is returned.
-     *
-     * @param array array The array to query.
-     * @param value The index of the element to return.
-     * @return Returns the nth element of `array`.
-     */
-    (n: number): Nth1x1;
-    /**
-     * Gets the element at index `n` of `array`. If `n` is negative, the nth element from the end is returned.
-     *
-     * @param array array The array to query.
-     * @param value The index of the element to return.
-     * @return Returns the nth element of `array`.
-     */
-    <T>(n: number, array: _.List<T> | null | undefined): T | undefined;
-}
-interface Nth1x1 {
-    /**
-     * Gets the element at index `n` of `array`. If `n` is negative, the nth element from the end is returned.
-     *
-     * @param array array The array to query.
-     * @param value The index of the element to return.
-     * @return Returns the nth element of `array`.
-     */
-    (): Nth1x1;
-    /**
-     * Gets the element at index `n` of `array`. If `n` is negative, the nth element from the end is returned.
-     *
-     * @param array array The array to query.
-     * @param value The index of the element to return.
-     * @return Returns the nth element of `array`.
-     */
-    <T>(array: _.List<T> | null | undefined): T | undefined;
-}
-
-declare const nth: Nth;
+import { nth } from "../fp";
 export = nth;
diff --git a/types/lodash/fp/nthArg.d.ts b/types/lodash/fp/nthArg.d.ts
index 5e8335943b..216c9bbab2 100644
--- a/types/lodash/fp/nthArg.d.ts
+++ b/types/lodash/fp/nthArg.d.ts
@@ -1,15 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type NthArg =
-    /**
-     * Creates a function that returns its nth argument.
-     *
-     * @param n The index of the argument to return.
-     * @return Returns the new function.
-     */
-    (n: number) => (...args: any[]) => any;
-
-declare const nthArg: NthArg;
+import { nthArg } from "../fp";
 export = nthArg;
diff --git a/types/lodash/fp/omit.d.ts b/types/lodash/fp/omit.d.ts
index 5c7a553b9f..1cd1b7fcc3 100644
--- a/types/lodash/fp/omit.d.ts
+++ b/types/lodash/fp/omit.d.ts
@@ -1,132 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Omit {
-    /**
-     * The opposite of `_.pick`; this method creates an object composed of the
-     * own and inherited enumerable properties of `object` that are not omitted.
-     *
-     * @category Object
-     * @param object The source object.
-     * @param [paths] The property names to omit, specified
-     *  individually or in arrays..
-     * @returns Returns the new object.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': '2', 'c': 3 };
-     *
-     * _.omit(object, ['a', 'c']);
-     * // => { 'b': '2' }
-     */
-    (): Omit;
-    /**
-     * The opposite of `_.pick`; this method creates an object composed of the
-     * own and inherited enumerable properties of `object` that are not omitted.
-     *
-     * @category Object
-     * @param object The source object.
-     * @param [paths] The property names to omit, specified
-     *  individually or in arrays..
-     * @returns Returns the new object.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': '2', 'c': 3 };
-     *
-     * _.omit(object, ['a', 'c']);
-     * // => { 'b': '2' }
-     */
-    (paths: _.PropertyPath): Omit1x1;
-    /**
-     * The opposite of `_.pick`; this method creates an object composed of the
-     * own and inherited enumerable properties of `object` that are not omitted.
-     *
-     * @category Object
-     * @param object The source object.
-     * @param [paths] The property names to omit, specified
-     *  individually or in arrays..
-     * @returns Returns the new object.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': '2', 'c': 3 };
-     *
-     * _.omit(object, ['a', 'c']);
-     * // => { 'b': '2' }
-     */
-    <T extends _.AnyKindOfDictionary>(paths: _.PropertyPath, object: T | null | undefined): T;
-    /**
-     * The opposite of `_.pick`; this method creates an object composed of the
-     * own and inherited enumerable properties of `object` that are not omitted.
-     *
-     * @category Object
-     * @param object The source object.
-     * @param [paths] The property names to omit, specified
-     *  individually or in arrays..
-     * @returns Returns the new object.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': '2', 'c': 3 };
-     *
-     * _.omit(object, ['a', 'c']);
-     * // => { 'b': '2' }
-     */
-    <T extends object>(paths: _.PropertyPath, object: T | null | undefined): _.PartialObject<T>;
-}
-interface Omit1x1 {
-    /**
-     * The opposite of `_.pick`; this method creates an object composed of the
-     * own and inherited enumerable properties of `object` that are not omitted.
-     *
-     * @category Object
-     * @param object The source object.
-     * @param [paths] The property names to omit, specified
-     *  individually or in arrays..
-     * @returns Returns the new object.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': '2', 'c': 3 };
-     *
-     * _.omit(object, ['a', 'c']);
-     * // => { 'b': '2' }
-     */
-    (): Omit1x1;
-    /**
-     * The opposite of `_.pick`; this method creates an object composed of the
-     * own and inherited enumerable properties of `object` that are not omitted.
-     *
-     * @category Object
-     * @param object The source object.
-     * @param [paths] The property names to omit, specified
-     *  individually or in arrays..
-     * @returns Returns the new object.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': '2', 'c': 3 };
-     *
-     * _.omit(object, ['a', 'c']);
-     * // => { 'b': '2' }
-     */
-    <T extends _.AnyKindOfDictionary>(object: T | null | undefined): T;
-    /**
-     * The opposite of `_.pick`; this method creates an object composed of the
-     * own and inherited enumerable properties of `object` that are not omitted.
-     *
-     * @category Object
-     * @param object The source object.
-     * @param [paths] The property names to omit, specified
-     *  individually or in arrays..
-     * @returns Returns the new object.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': '2', 'c': 3 };
-     *
-     * _.omit(object, ['a', 'c']);
-     * // => { 'b': '2' }
-     */
-    <T extends object>(object: T | null | undefined): _.PartialObject<T>;
-}
-
-declare const omit: Omit;
+import { omit } from "../fp";
 export = omit;
diff --git a/types/lodash/fp/omitAll.d.ts b/types/lodash/fp/omitAll.d.ts
index a3aec48c5f..dab5cfa5fc 100644
--- a/types/lodash/fp/omitAll.d.ts
+++ b/types/lodash/fp/omitAll.d.ts
@@ -1,132 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Omit {
-    /**
-     * The opposite of `_.pick`; this method creates an object composed of the
-     * own and inherited enumerable properties of `object` that are not omitted.
-     *
-     * @category Object
-     * @param object The source object.
-     * @param [paths] The property names to omit, specified
-     *  individually or in arrays..
-     * @returns Returns the new object.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': '2', 'c': 3 };
-     *
-     * _.omit(object, ['a', 'c']);
-     * // => { 'b': '2' }
-     */
-    (): Omit;
-    /**
-     * The opposite of `_.pick`; this method creates an object composed of the
-     * own and inherited enumerable properties of `object` that are not omitted.
-     *
-     * @category Object
-     * @param object The source object.
-     * @param [paths] The property names to omit, specified
-     *  individually or in arrays..
-     * @returns Returns the new object.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': '2', 'c': 3 };
-     *
-     * _.omit(object, ['a', 'c']);
-     * // => { 'b': '2' }
-     */
-    (paths: _.PropertyPath): Omit1x1;
-    /**
-     * The opposite of `_.pick`; this method creates an object composed of the
-     * own and inherited enumerable properties of `object` that are not omitted.
-     *
-     * @category Object
-     * @param object The source object.
-     * @param [paths] The property names to omit, specified
-     *  individually or in arrays..
-     * @returns Returns the new object.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': '2', 'c': 3 };
-     *
-     * _.omit(object, ['a', 'c']);
-     * // => { 'b': '2' }
-     */
-    <T extends _.AnyKindOfDictionary>(paths: _.PropertyPath, object: T | null | undefined): T;
-    /**
-     * The opposite of `_.pick`; this method creates an object composed of the
-     * own and inherited enumerable properties of `object` that are not omitted.
-     *
-     * @category Object
-     * @param object The source object.
-     * @param [paths] The property names to omit, specified
-     *  individually or in arrays..
-     * @returns Returns the new object.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': '2', 'c': 3 };
-     *
-     * _.omit(object, ['a', 'c']);
-     * // => { 'b': '2' }
-     */
-    <T extends object>(paths: _.PropertyPath, object: T | null | undefined): _.PartialObject<T>;
-}
-interface Omit1x1 {
-    /**
-     * The opposite of `_.pick`; this method creates an object composed of the
-     * own and inherited enumerable properties of `object` that are not omitted.
-     *
-     * @category Object
-     * @param object The source object.
-     * @param [paths] The property names to omit, specified
-     *  individually or in arrays..
-     * @returns Returns the new object.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': '2', 'c': 3 };
-     *
-     * _.omit(object, ['a', 'c']);
-     * // => { 'b': '2' }
-     */
-    (): Omit1x1;
-    /**
-     * The opposite of `_.pick`; this method creates an object composed of the
-     * own and inherited enumerable properties of `object` that are not omitted.
-     *
-     * @category Object
-     * @param object The source object.
-     * @param [paths] The property names to omit, specified
-     *  individually or in arrays..
-     * @returns Returns the new object.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': '2', 'c': 3 };
-     *
-     * _.omit(object, ['a', 'c']);
-     * // => { 'b': '2' }
-     */
-    <T extends _.AnyKindOfDictionary>(object: T | null | undefined): T;
-    /**
-     * The opposite of `_.pick`; this method creates an object composed of the
-     * own and inherited enumerable properties of `object` that are not omitted.
-     *
-     * @category Object
-     * @param object The source object.
-     * @param [paths] The property names to omit, specified
-     *  individually or in arrays..
-     * @returns Returns the new object.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': '2', 'c': 3 };
-     *
-     * _.omit(object, ['a', 'c']);
-     * // => { 'b': '2' }
-     */
-    <T extends object>(object: T | null | undefined): _.PartialObject<T>;
-}
-
-declare const omitAll: Omit;
+import { omitAll } from "../fp";
 export = omitAll;
diff --git a/types/lodash/fp/omitBy.d.ts b/types/lodash/fp/omitBy.d.ts
index b0bf665afc..8be4f5b40b 100644
--- a/types/lodash/fp/omitBy.d.ts
+++ b/types/lodash/fp/omitBy.d.ts
@@ -1,98 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface OmitBy {
-    /**
-     * The opposite of `_.pickBy`; this method creates an object composed of the
-     * own and inherited enumerable properties of `object` that `predicate`
-     * doesn't return truthy for.
-     *
-     * @category Object
-     * @param object The source object.
-     * @param [predicate=_.identity] The function invoked per property.
-     * @returns Returns the new object.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': '2', 'c': 3 };
-     *
-     * _.omitBy(object, _.isNumber);
-     * // => { 'b': '2' }
-     */
-    (): OmitBy;
-    /**
-     * The opposite of `_.pickBy`; this method creates an object composed of the
-     * own and inherited enumerable properties of `object` that `predicate`
-     * doesn't return truthy for.
-     *
-     * @category Object
-     * @param object The source object.
-     * @param [predicate=_.identity] The function invoked per property.
-     * @returns Returns the new object.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': '2', 'c': 3 };
-     *
-     * _.omitBy(object, _.isNumber);
-     * // => { 'b': '2' }
-     */
-    <T>(predicate: _.ValueKeyIteratee<T>): OmitBy1x1<T>;
-    /**
-     * The opposite of `_.pickBy`; this method creates an object composed of the
-     * own and inherited enumerable properties of `object` that `predicate`
-     * doesn't return truthy for.
-     *
-     * @category Object
-     * @param object The source object.
-     * @param [predicate=_.identity] The function invoked per property.
-     * @returns Returns the new object.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': '2', 'c': 3 };
-     *
-     * _.omitBy(object, _.isNumber);
-     * // => { 'b': '2' }
-     */
-    <T extends object>(predicate: _.ValueKeyIteratee<T[keyof T]>, object: T | null | undefined): _.PartialObject<T>;
-}
-interface OmitBy1x1<T> {
-    /**
-     * The opposite of `_.pickBy`; this method creates an object composed of the
-     * own and inherited enumerable properties of `object` that `predicate`
-     * doesn't return truthy for.
-     *
-     * @category Object
-     * @param object The source object.
-     * @param [predicate=_.identity] The function invoked per property.
-     * @returns Returns the new object.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': '2', 'c': 3 };
-     *
-     * _.omitBy(object, _.isNumber);
-     * // => { 'b': '2' }
-     */
-    (): OmitBy1x1<T>;
-    /**
-     * The opposite of `_.pickBy`; this method creates an object composed of the
-     * own and inherited enumerable properties of `object` that `predicate`
-     * doesn't return truthy for.
-     *
-     * @category Object
-     * @param object The source object.
-     * @param [predicate=_.identity] The function invoked per property.
-     * @returns Returns the new object.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': '2', 'c': 3 };
-     *
-     * _.omitBy(object, _.isNumber);
-     * // => { 'b': '2' }
-     */
-    <T1 extends object>(object: T1 | null | undefined): _.PartialObject<T1>;
-}
-
-declare const omitBy: OmitBy;
+import { omitBy } from "../fp";
 export = omitBy;
diff --git a/types/lodash/fp/once.d.ts b/types/lodash/fp/once.d.ts
index f97a08a13e..24d859cc53 100644
--- a/types/lodash/fp/once.d.ts
+++ b/types/lodash/fp/once.d.ts
@@ -1,16 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type Once =
-    /**
-     * Creates a function that is restricted to invoking func once. Repeat calls to the function return the value
-     * of the first call. The func is invoked with the this binding and arguments of the created function.
-     *
-     * @param func The function to restrict.
-     * @return Returns the new restricted function.
-     */
-    <T extends (...args: any[]) => any>(func: T) => T;
-
-declare const once: Once;
+import { once } from "../fp";
 export = once;
diff --git a/types/lodash/fp/orderBy.d.ts b/types/lodash/fp/orderBy.d.ts
index 4cf7048978..9443fcfc22 100644
--- a/types/lodash/fp/orderBy.d.ts
+++ b/types/lodash/fp/orderBy.d.ts
@@ -1,461 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface OrderBy {
-    /**
-     * This method is like `_.sortBy` except that it allows specifying the sort
-     * orders of the iteratees to sort by. If `orders` is unspecified, all values
-     * are sorted in ascending order. Otherwise, specify an order of "desc" for
-     * descending or "asc" for ascending sort order of corresponding values.
-     *
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratees=[_.identity]] The iteratees to sort by.
-     * @param [orders] The sort orders of `iteratees`.
-     * @param- {Object} [guard] Enables use as an iteratee for functions like `_.reduce`.
-     * @returns Returns the new sorted array.
-     * @example
-     *
-     * var users = [
-     *   { 'user': 'fred',   'age': 48 },
-     *   { 'user': 'barney', 'age': 34 },
-     *   { 'user': 'fred',   'age': 42 },
-     *   { 'user': 'barney', 'age': 36 }
-     * ];
-     *
-     * // sort by `user` in ascending order and by `age` in descending order
-     * _.orderBy(users, ['user', 'age'], ['asc', 'desc']);
-     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
-     */
-    (): OrderBy;
-    /**
-     * This method is like `_.sortBy` except that it allows specifying the sort
-     * orders of the iteratees to sort by. If `orders` is unspecified, all values
-     * are sorted in ascending order. Otherwise, specify an order of "desc" for
-     * descending or "asc" for ascending sort order of corresponding values.
-     *
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratees=[_.identity]] The iteratees to sort by.
-     * @param [orders] The sort orders of `iteratees`.
-     * @param- {Object} [guard] Enables use as an iteratee for functions like `_.reduce`.
-     * @returns Returns the new sorted array.
-     * @example
-     *
-     * var users = [
-     *   { 'user': 'fred',   'age': 48 },
-     *   { 'user': 'barney', 'age': 34 },
-     *   { 'user': 'fred',   'age': 42 },
-     *   { 'user': 'barney', 'age': 36 }
-     * ];
-     *
-     * // sort by `user` in ascending order and by `age` in descending order
-     * _.orderBy(users, ['user', 'age'], ['asc', 'desc']);
-     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
-     */
-    <T>(iteratees: _.Many<(value: T) => _.NotVoid>): OrderBy1x1<T>;
-    /**
-     * This method is like `_.sortBy` except that it allows specifying the sort
-     * orders of the iteratees to sort by. If `orders` is unspecified, all values
-     * are sorted in ascending order. Otherwise, specify an order of "desc" for
-     * descending or "asc" for ascending sort order of corresponding values.
-     *
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratees=[_.identity]] The iteratees to sort by.
-     * @param [orders] The sort orders of `iteratees`.
-     * @param- {Object} [guard] Enables use as an iteratee for functions like `_.reduce`.
-     * @returns Returns the new sorted array.
-     * @example
-     *
-     * var users = [
-     *   { 'user': 'fred',   'age': 48 },
-     *   { 'user': 'barney', 'age': 34 },
-     *   { 'user': 'fred',   'age': 42 },
-     *   { 'user': 'barney', 'age': 36 }
-     * ];
-     *
-     * // sort by `user` in ascending order and by `age` in descending order
-     * _.orderBy(users, ['user', 'age'], ['asc', 'desc']);
-     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
-     */
-    <T>(iteratees: _.Many<(value: T) => _.NotVoid>, orders: _.Many<boolean|string>): OrderBy1x2<T>;
-    /**
-     * This method is like `_.sortBy` except that it allows specifying the sort
-     * orders of the iteratees to sort by. If `orders` is unspecified, all values
-     * are sorted in ascending order. Otherwise, specify an order of "desc" for
-     * descending or "asc" for ascending sort order of corresponding values.
-     *
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratees=[_.identity]] The iteratees to sort by.
-     * @param [orders] The sort orders of `iteratees`.
-     * @param- {Object} [guard] Enables use as an iteratee for functions like `_.reduce`.
-     * @returns Returns the new sorted array.
-     * @example
-     *
-     * var users = [
-     *   { 'user': 'fred',   'age': 48 },
-     *   { 'user': 'barney', 'age': 34 },
-     *   { 'user': 'fred',   'age': 42 },
-     *   { 'user': 'barney', 'age': 36 }
-     * ];
-     *
-     * // sort by `user` in ascending order and by `age` in descending order
-     * _.orderBy(users, ['user', 'age'], ['asc', 'desc']);
-     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
-     */
-    <T>(iteratees: _.Many<(value: T) => _.NotVoid> | _.Many<_.ValueIteratee<T>>, orders: _.Many<boolean | string>, collection: _.List<T> | null | undefined): T[];
-    /**
-     * This method is like `_.sortBy` except that it allows specifying the sort
-     * orders of the iteratees to sort by. If `orders` is unspecified, all values
-     * are sorted in ascending order. Otherwise, specify an order of "desc" for
-     * descending or "asc" for ascending sort order of corresponding values.
-     *
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratees=[_.identity]] The iteratees to sort by.
-     * @param [orders] The sort orders of `iteratees`.
-     * @param- {Object} [guard] Enables use as an iteratee for functions like `_.reduce`.
-     * @returns Returns the new sorted array.
-     * @example
-     *
-     * var users = [
-     *   { 'user': 'fred',   'age': 48 },
-     *   { 'user': 'barney', 'age': 34 },
-     *   { 'user': 'fred',   'age': 42 },
-     *   { 'user': 'barney', 'age': 36 }
-     * ];
-     *
-     * // sort by `user` in ascending order and by `age` in descending order
-     * _.orderBy(users, ['user', 'age'], ['asc', 'desc']);
-     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
-     */
-    <T>(iteratees: _.Many<_.ValueIteratee<T>>): OrderBy2x1<T>;
-    /**
-     * This method is like `_.sortBy` except that it allows specifying the sort
-     * orders of the iteratees to sort by. If `orders` is unspecified, all values
-     * are sorted in ascending order. Otherwise, specify an order of "desc" for
-     * descending or "asc" for ascending sort order of corresponding values.
-     *
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratees=[_.identity]] The iteratees to sort by.
-     * @param [orders] The sort orders of `iteratees`.
-     * @param- {Object} [guard] Enables use as an iteratee for functions like `_.reduce`.
-     * @returns Returns the new sorted array.
-     * @example
-     *
-     * var users = [
-     *   { 'user': 'fred',   'age': 48 },
-     *   { 'user': 'barney', 'age': 34 },
-     *   { 'user': 'fred',   'age': 42 },
-     *   { 'user': 'barney', 'age': 36 }
-     * ];
-     *
-     * // sort by `user` in ascending order and by `age` in descending order
-     * _.orderBy(users, ['user', 'age'], ['asc', 'desc']);
-     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
-     */
-    <T>(iteratees: _.Many<_.ValueIteratee<T>>, orders: _.Many<boolean|string>): OrderBy2x2<T>;
-    /**
-     * This method is like `_.sortBy` except that it allows specifying the sort
-     * orders of the iteratees to sort by. If `orders` is unspecified, all values
-     * are sorted in ascending order. Otherwise, specify an order of "desc" for
-     * descending or "asc" for ascending sort order of corresponding values.
-     *
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratees=[_.identity]] The iteratees to sort by.
-     * @param [orders] The sort orders of `iteratees`.
-     * @param- {Object} [guard] Enables use as an iteratee for functions like `_.reduce`.
-     * @returns Returns the new sorted array.
-     * @example
-     *
-     * var users = [
-     *   { 'user': 'fred',   'age': 48 },
-     *   { 'user': 'barney', 'age': 34 },
-     *   { 'user': 'fred',   'age': 42 },
-     *   { 'user': 'barney', 'age': 36 }
-     * ];
-     *
-     * // sort by `user` in ascending order and by `age` in descending order
-     * _.orderBy(users, ['user', 'age'], ['asc', 'desc']);
-     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
-     */
-    <T extends object>(iteratees: _.Many<(value: T[keyof T]) => _.NotVoid> | _.Many<_.ValueIteratee<T[keyof T]>>, orders: _.Many<boolean | string>, collection: T | null | undefined): Array<T[keyof T]>;
-}
-interface OrderBy1x1<T> {
-    /**
-     * This method is like `_.sortBy` except that it allows specifying the sort
-     * orders of the iteratees to sort by. If `orders` is unspecified, all values
-     * are sorted in ascending order. Otherwise, specify an order of "desc" for
-     * descending or "asc" for ascending sort order of corresponding values.
-     *
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratees=[_.identity]] The iteratees to sort by.
-     * @param [orders] The sort orders of `iteratees`.
-     * @param- {Object} [guard] Enables use as an iteratee for functions like `_.reduce`.
-     * @returns Returns the new sorted array.
-     * @example
-     *
-     * var users = [
-     *   { 'user': 'fred',   'age': 48 },
-     *   { 'user': 'barney', 'age': 34 },
-     *   { 'user': 'fred',   'age': 42 },
-     *   { 'user': 'barney', 'age': 36 }
-     * ];
-     *
-     * // sort by `user` in ascending order and by `age` in descending order
-     * _.orderBy(users, ['user', 'age'], ['asc', 'desc']);
-     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
-     */
-    (): OrderBy1x1<T>;
-    /**
-     * This method is like `_.sortBy` except that it allows specifying the sort
-     * orders of the iteratees to sort by. If `orders` is unspecified, all values
-     * are sorted in ascending order. Otherwise, specify an order of "desc" for
-     * descending or "asc" for ascending sort order of corresponding values.
-     *
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratees=[_.identity]] The iteratees to sort by.
-     * @param [orders] The sort orders of `iteratees`.
-     * @param- {Object} [guard] Enables use as an iteratee for functions like `_.reduce`.
-     * @returns Returns the new sorted array.
-     * @example
-     *
-     * var users = [
-     *   { 'user': 'fred',   'age': 48 },
-     *   { 'user': 'barney', 'age': 34 },
-     *   { 'user': 'fred',   'age': 42 },
-     *   { 'user': 'barney', 'age': 36 }
-     * ];
-     *
-     * // sort by `user` in ascending order and by `age` in descending order
-     * _.orderBy(users, ['user', 'age'], ['asc', 'desc']);
-     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
-     */
-    (orders: _.Many<boolean | string>): OrderBy1x2<T>;
-    /**
-     * This method is like `_.sortBy` except that it allows specifying the sort
-     * orders of the iteratees to sort by. If `orders` is unspecified, all values
-     * are sorted in ascending order. Otherwise, specify an order of "desc" for
-     * descending or "asc" for ascending sort order of corresponding values.
-     *
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratees=[_.identity]] The iteratees to sort by.
-     * @param [orders] The sort orders of `iteratees`.
-     * @param- {Object} [guard] Enables use as an iteratee for functions like `_.reduce`.
-     * @returns Returns the new sorted array.
-     * @example
-     *
-     * var users = [
-     *   { 'user': 'fred',   'age': 48 },
-     *   { 'user': 'barney', 'age': 34 },
-     *   { 'user': 'fred',   'age': 42 },
-     *   { 'user': 'barney', 'age': 36 }
-     * ];
-     *
-     * // sort by `user` in ascending order and by `age` in descending order
-     * _.orderBy(users, ['user', 'age'], ['asc', 'desc']);
-     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
-     */
-    (orders: _.Many<boolean | string>, collection: _.List<T> | object | null | undefined): T[];
-}
-interface OrderBy1x2<T> {
-    /**
-     * This method is like `_.sortBy` except that it allows specifying the sort
-     * orders of the iteratees to sort by. If `orders` is unspecified, all values
-     * are sorted in ascending order. Otherwise, specify an order of "desc" for
-     * descending or "asc" for ascending sort order of corresponding values.
-     *
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratees=[_.identity]] The iteratees to sort by.
-     * @param [orders] The sort orders of `iteratees`.
-     * @param- {Object} [guard] Enables use as an iteratee for functions like `_.reduce`.
-     * @returns Returns the new sorted array.
-     * @example
-     *
-     * var users = [
-     *   { 'user': 'fred',   'age': 48 },
-     *   { 'user': 'barney', 'age': 34 },
-     *   { 'user': 'fred',   'age': 42 },
-     *   { 'user': 'barney', 'age': 36 }
-     * ];
-     *
-     * // sort by `user` in ascending order and by `age` in descending order
-     * _.orderBy(users, ['user', 'age'], ['asc', 'desc']);
-     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
-     */
-    (): OrderBy1x2<T>;
-    /**
-     * This method is like `_.sortBy` except that it allows specifying the sort
-     * orders of the iteratees to sort by. If `orders` is unspecified, all values
-     * are sorted in ascending order. Otherwise, specify an order of "desc" for
-     * descending or "asc" for ascending sort order of corresponding values.
-     *
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratees=[_.identity]] The iteratees to sort by.
-     * @param [orders] The sort orders of `iteratees`.
-     * @param- {Object} [guard] Enables use as an iteratee for functions like `_.reduce`.
-     * @returns Returns the new sorted array.
-     * @example
-     *
-     * var users = [
-     *   { 'user': 'fred',   'age': 48 },
-     *   { 'user': 'barney', 'age': 34 },
-     *   { 'user': 'fred',   'age': 42 },
-     *   { 'user': 'barney', 'age': 36 }
-     * ];
-     *
-     * // sort by `user` in ascending order and by `age` in descending order
-     * _.orderBy(users, ['user', 'age'], ['asc', 'desc']);
-     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
-     */
-    (collection: _.List<T> | object | null | undefined): T[];
-}
-interface OrderBy2x1<T> {
-    /**
-     * This method is like `_.sortBy` except that it allows specifying the sort
-     * orders of the iteratees to sort by. If `orders` is unspecified, all values
-     * are sorted in ascending order. Otherwise, specify an order of "desc" for
-     * descending or "asc" for ascending sort order of corresponding values.
-     *
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratees=[_.identity]] The iteratees to sort by.
-     * @param [orders] The sort orders of `iteratees`.
-     * @param- {Object} [guard] Enables use as an iteratee for functions like `_.reduce`.
-     * @returns Returns the new sorted array.
-     * @example
-     *
-     * var users = [
-     *   { 'user': 'fred',   'age': 48 },
-     *   { 'user': 'barney', 'age': 34 },
-     *   { 'user': 'fred',   'age': 42 },
-     *   { 'user': 'barney', 'age': 36 }
-     * ];
-     *
-     * // sort by `user` in ascending order and by `age` in descending order
-     * _.orderBy(users, ['user', 'age'], ['asc', 'desc']);
-     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
-     */
-    (): OrderBy2x1<T>;
-    /**
-     * This method is like `_.sortBy` except that it allows specifying the sort
-     * orders of the iteratees to sort by. If `orders` is unspecified, all values
-     * are sorted in ascending order. Otherwise, specify an order of "desc" for
-     * descending or "asc" for ascending sort order of corresponding values.
-     *
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratees=[_.identity]] The iteratees to sort by.
-     * @param [orders] The sort orders of `iteratees`.
-     * @param- {Object} [guard] Enables use as an iteratee for functions like `_.reduce`.
-     * @returns Returns the new sorted array.
-     * @example
-     *
-     * var users = [
-     *   { 'user': 'fred',   'age': 48 },
-     *   { 'user': 'barney', 'age': 34 },
-     *   { 'user': 'fred',   'age': 42 },
-     *   { 'user': 'barney', 'age': 36 }
-     * ];
-     *
-     * // sort by `user` in ascending order and by `age` in descending order
-     * _.orderBy(users, ['user', 'age'], ['asc', 'desc']);
-     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
-     */
-    (orders: _.Many<boolean | string>): OrderBy2x2<T>;
-    /**
-     * This method is like `_.sortBy` except that it allows specifying the sort
-     * orders of the iteratees to sort by. If `orders` is unspecified, all values
-     * are sorted in ascending order. Otherwise, specify an order of "desc" for
-     * descending or "asc" for ascending sort order of corresponding values.
-     *
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratees=[_.identity]] The iteratees to sort by.
-     * @param [orders] The sort orders of `iteratees`.
-     * @param- {Object} [guard] Enables use as an iteratee for functions like `_.reduce`.
-     * @returns Returns the new sorted array.
-     * @example
-     *
-     * var users = [
-     *   { 'user': 'fred',   'age': 48 },
-     *   { 'user': 'barney', 'age': 34 },
-     *   { 'user': 'fred',   'age': 42 },
-     *   { 'user': 'barney', 'age': 36 }
-     * ];
-     *
-     * // sort by `user` in ascending order and by `age` in descending order
-     * _.orderBy(users, ['user', 'age'], ['asc', 'desc']);
-     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
-     */
-    (orders: _.Many<boolean | string>, collection: _.List<T> | object | null | undefined): T[];
-}
-interface OrderBy2x2<T> {
-    /**
-     * This method is like `_.sortBy` except that it allows specifying the sort
-     * orders of the iteratees to sort by. If `orders` is unspecified, all values
-     * are sorted in ascending order. Otherwise, specify an order of "desc" for
-     * descending or "asc" for ascending sort order of corresponding values.
-     *
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratees=[_.identity]] The iteratees to sort by.
-     * @param [orders] The sort orders of `iteratees`.
-     * @param- {Object} [guard] Enables use as an iteratee for functions like `_.reduce`.
-     * @returns Returns the new sorted array.
-     * @example
-     *
-     * var users = [
-     *   { 'user': 'fred',   'age': 48 },
-     *   { 'user': 'barney', 'age': 34 },
-     *   { 'user': 'fred',   'age': 42 },
-     *   { 'user': 'barney', 'age': 36 }
-     * ];
-     *
-     * // sort by `user` in ascending order and by `age` in descending order
-     * _.orderBy(users, ['user', 'age'], ['asc', 'desc']);
-     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
-     */
-    (): OrderBy2x2<T>;
-    /**
-     * This method is like `_.sortBy` except that it allows specifying the sort
-     * orders of the iteratees to sort by. If `orders` is unspecified, all values
-     * are sorted in ascending order. Otherwise, specify an order of "desc" for
-     * descending or "asc" for ascending sort order of corresponding values.
-     *
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratees=[_.identity]] The iteratees to sort by.
-     * @param [orders] The sort orders of `iteratees`.
-     * @param- {Object} [guard] Enables use as an iteratee for functions like `_.reduce`.
-     * @returns Returns the new sorted array.
-     * @example
-     *
-     * var users = [
-     *   { 'user': 'fred',   'age': 48 },
-     *   { 'user': 'barney', 'age': 34 },
-     *   { 'user': 'fred',   'age': 42 },
-     *   { 'user': 'barney', 'age': 36 }
-     * ];
-     *
-     * // sort by `user` in ascending order and by `age` in descending order
-     * _.orderBy(users, ['user', 'age'], ['asc', 'desc']);
-     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
-     */
-    (collection: _.List<T> | object | null | undefined): T[];
-}
-
-declare const orderBy: OrderBy;
+import { orderBy } from "../fp";
 export = orderBy;
diff --git a/types/lodash/fp/over.d.ts b/types/lodash/fp/over.d.ts
index 4bd1803827..1bd2502fdc 100644
--- a/types/lodash/fp/over.d.ts
+++ b/types/lodash/fp/over.d.ts
@@ -1,18 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-type Over =
-    /**
-     * Creates a function that invokes iteratees with the arguments provided to the created function and returns
-     * their results.
-     *
-     * @param iteratees The iteratees to invoke.
-     * @return Returns the new function.
-     */
-    <TResult>(iteratees: _.Many<(...args: any[]) => TResult>) => (...args: any[]) => TResult[];
-
-declare const over: Over;
+import { over } from "../fp";
 export = over;
diff --git a/types/lodash/fp/overArgs.d.ts b/types/lodash/fp/overArgs.d.ts
index 84241e3e58..c054c92707 100644
--- a/types/lodash/fp/overArgs.d.ts
+++ b/types/lodash/fp/overArgs.d.ts
@@ -1,58 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface OverArgs {
-    /**
-     * Creates a function that runs each argument through a corresponding transform function.
-     *
-     * @param func The function to wrap.
-     * @param transforms The functions to transform arguments, specified as individual functions or arrays
-     * of functions.
-     * @return Returns the new function.
-     */
-    (): OverArgs;
-    /**
-     * Creates a function that runs each argument through a corresponding transform function.
-     *
-     * @param func The function to wrap.
-     * @param transforms The functions to transform arguments, specified as individual functions or arrays
-     * of functions.
-     * @return Returns the new function.
-     */
-    (func: (...args: any[]) => any): OverArgs1x1;
-    /**
-     * Creates a function that runs each argument through a corresponding transform function.
-     *
-     * @param func The function to wrap.
-     * @param transforms The functions to transform arguments, specified as individual functions or arrays
-     * of functions.
-     * @return Returns the new function.
-     */
-    (func: (...args: any[]) => any, transforms: _.Many<(...args: any[]) => any>): (...args: any[]) => any;
-}
-interface OverArgs1x1 {
-    /**
-     * Creates a function that runs each argument through a corresponding transform function.
-     *
-     * @param func The function to wrap.
-     * @param transforms The functions to transform arguments, specified as individual functions or arrays
-     * of functions.
-     * @return Returns the new function.
-     */
-    (): OverArgs1x1;
-    /**
-     * Creates a function that runs each argument through a corresponding transform function.
-     *
-     * @param func The function to wrap.
-     * @param transforms The functions to transform arguments, specified as individual functions or arrays
-     * of functions.
-     * @return Returns the new function.
-     */
-    (transforms: _.Many<(...args: any[]) => any>): (...args: any[]) => any;
-}
-
-declare const overArgs: OverArgs;
+import { overArgs } from "../fp";
 export = overArgs;
diff --git a/types/lodash/fp/overEvery.d.ts b/types/lodash/fp/overEvery.d.ts
index 3ebf8e2abf..1cf8b4061b 100644
--- a/types/lodash/fp/overEvery.d.ts
+++ b/types/lodash/fp/overEvery.d.ts
@@ -1,18 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-type OverEvery =
-    /**
-     * Creates a function that checks if all of the predicates return truthy when invoked with the arguments
-     * provided to the created function.
-     *
-     * @param predicates The predicates to check.
-     * @return Returns the new function.
-     */
-    <T>(predicates: _.Many<(...args: T[]) => boolean>) => (...args: T[]) => boolean;
-
-declare const overEvery: OverEvery;
+import { overEvery } from "../fp";
 export = overEvery;
diff --git a/types/lodash/fp/overSome.d.ts b/types/lodash/fp/overSome.d.ts
index 75315b07d0..6b098b73b3 100644
--- a/types/lodash/fp/overSome.d.ts
+++ b/types/lodash/fp/overSome.d.ts
@@ -1,18 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-type OverSome =
-    /**
-     * Creates a function that checks if any of the predicates return truthy when invoked with the arguments
-     * provided to the created function.
-     *
-     * @param predicates The predicates to check.
-     * @return Returns the new function.
-     */
-    <T>(predicates: _.Many<(...args: T[]) => boolean>) => (...args: T[]) => boolean;
-
-declare const overSome: OverSome;
+import { overSome } from "../fp";
 export = overSome;
diff --git a/types/lodash/fp/pad.d.ts b/types/lodash/fp/pad.d.ts
index e6581046a2..a5519771dd 100644
--- a/types/lodash/fp/pad.d.ts
+++ b/types/lodash/fp/pad.d.ts
@@ -1,61 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface Pad {
-    /**
-     * Pads string on the left and right sides if it’s shorter than length. Padding characters are truncated if
-     * they can’t be evenly divided by length.
-     *
-     * @param string The string to pad.
-     * @param length The padding length.
-     * @param chars The string used as padding.
-     * @return Returns the padded string.
-     */
-    (): Pad;
-    /**
-     * Pads string on the left and right sides if it’s shorter than length. Padding characters are truncated if
-     * they can’t be evenly divided by length.
-     *
-     * @param string The string to pad.
-     * @param length The padding length.
-     * @param chars The string used as padding.
-     * @return Returns the padded string.
-     */
-    (length: number): Pad1x1;
-    /**
-     * Pads string on the left and right sides if it’s shorter than length. Padding characters are truncated if
-     * they can’t be evenly divided by length.
-     *
-     * @param string The string to pad.
-     * @param length The padding length.
-     * @param chars The string used as padding.
-     * @return Returns the padded string.
-     */
-    (length: number, string: string): string;
-}
-interface Pad1x1 {
-    /**
-     * Pads string on the left and right sides if it’s shorter than length. Padding characters are truncated if
-     * they can’t be evenly divided by length.
-     *
-     * @param string The string to pad.
-     * @param length The padding length.
-     * @param chars The string used as padding.
-     * @return Returns the padded string.
-     */
-    (): Pad1x1;
-    /**
-     * Pads string on the left and right sides if it’s shorter than length. Padding characters are truncated if
-     * they can’t be evenly divided by length.
-     *
-     * @param string The string to pad.
-     * @param length The padding length.
-     * @param chars The string used as padding.
-     * @return Returns the padded string.
-     */
-    (string: string): string;
-}
-
-declare const pad: Pad;
+import { pad } from "../fp";
 export = pad;
diff --git a/types/lodash/fp/padChars.d.ts b/types/lodash/fp/padChars.d.ts
index 11d797db06..74d1aabbbf 100644
--- a/types/lodash/fp/padChars.d.ts
+++ b/types/lodash/fp/padChars.d.ts
@@ -1,103 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface Pad {
-    /**
-     * Pads string on the left and right sides if it’s shorter than length. Padding characters are truncated if
-     * they can’t be evenly divided by length.
-     *
-     * @param string The string to pad.
-     * @param length The padding length.
-     * @param chars The string used as padding.
-     * @return Returns the padded string.
-     */
-    (): Pad;
-    /**
-     * Pads string on the left and right sides if it’s shorter than length. Padding characters are truncated if
-     * they can’t be evenly divided by length.
-     *
-     * @param string The string to pad.
-     * @param length The padding length.
-     * @param chars The string used as padding.
-     * @return Returns the padded string.
-     */
-    (chars: string): Pad1x1;
-    /**
-     * Pads string on the left and right sides if it’s shorter than length. Padding characters are truncated if
-     * they can’t be evenly divided by length.
-     *
-     * @param string The string to pad.
-     * @param length The padding length.
-     * @param chars The string used as padding.
-     * @return Returns the padded string.
-     */
-    (chars: string, length: number): Pad1x2;
-    /**
-     * Pads string on the left and right sides if it’s shorter than length. Padding characters are truncated if
-     * they can’t be evenly divided by length.
-     *
-     * @param string The string to pad.
-     * @param length The padding length.
-     * @param chars The string used as padding.
-     * @return Returns the padded string.
-     */
-    (chars: string, length: number, string: string): string;
-}
-interface Pad1x1 {
-    /**
-     * Pads string on the left and right sides if it’s shorter than length. Padding characters are truncated if
-     * they can’t be evenly divided by length.
-     *
-     * @param string The string to pad.
-     * @param length The padding length.
-     * @param chars The string used as padding.
-     * @return Returns the padded string.
-     */
-    (): Pad1x1;
-    /**
-     * Pads string on the left and right sides if it’s shorter than length. Padding characters are truncated if
-     * they can’t be evenly divided by length.
-     *
-     * @param string The string to pad.
-     * @param length The padding length.
-     * @param chars The string used as padding.
-     * @return Returns the padded string.
-     */
-    (length: number): Pad1x2;
-    /**
-     * Pads string on the left and right sides if it’s shorter than length. Padding characters are truncated if
-     * they can’t be evenly divided by length.
-     *
-     * @param string The string to pad.
-     * @param length The padding length.
-     * @param chars The string used as padding.
-     * @return Returns the padded string.
-     */
-    (length: number, string: string): string;
-}
-interface Pad1x2 {
-    /**
-     * Pads string on the left and right sides if it’s shorter than length. Padding characters are truncated if
-     * they can’t be evenly divided by length.
-     *
-     * @param string The string to pad.
-     * @param length The padding length.
-     * @param chars The string used as padding.
-     * @return Returns the padded string.
-     */
-    (): Pad1x2;
-    /**
-     * Pads string on the left and right sides if it’s shorter than length. Padding characters are truncated if
-     * they can’t be evenly divided by length.
-     *
-     * @param string The string to pad.
-     * @param length The padding length.
-     * @param chars The string used as padding.
-     * @return Returns the padded string.
-     */
-    (string: string): string;
-}
-
-declare const padChars: Pad;
+import { padChars } from "../fp";
 export = padChars;
diff --git a/types/lodash/fp/padCharsEnd.d.ts b/types/lodash/fp/padCharsEnd.d.ts
index 01ec387810..3a468dc11f 100644
--- a/types/lodash/fp/padCharsEnd.d.ts
+++ b/types/lodash/fp/padCharsEnd.d.ts
@@ -1,103 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface PadEnd {
-    /**
-     * Pads string on the right side if it’s shorter than length. Padding characters are truncated if they exceed
-     * length.
-     *
-     * @param string The string to pad.
-     * @param length The padding length.
-     * @param chars The string used as padding.
-     * @return Returns the padded string.
-     */
-    (): PadEnd;
-    /**
-     * Pads string on the right side if it’s shorter than length. Padding characters are truncated if they exceed
-     * length.
-     *
-     * @param string The string to pad.
-     * @param length The padding length.
-     * @param chars The string used as padding.
-     * @return Returns the padded string.
-     */
-    (chars: string): PadEnd1x1;
-    /**
-     * Pads string on the right side if it’s shorter than length. Padding characters are truncated if they exceed
-     * length.
-     *
-     * @param string The string to pad.
-     * @param length The padding length.
-     * @param chars The string used as padding.
-     * @return Returns the padded string.
-     */
-    (chars: string, length: number): PadEnd1x2;
-    /**
-     * Pads string on the right side if it’s shorter than length. Padding characters are truncated if they exceed
-     * length.
-     *
-     * @param string The string to pad.
-     * @param length The padding length.
-     * @param chars The string used as padding.
-     * @return Returns the padded string.
-     */
-    (chars: string, length: number, string: string): string;
-}
-interface PadEnd1x1 {
-    /**
-     * Pads string on the right side if it’s shorter than length. Padding characters are truncated if they exceed
-     * length.
-     *
-     * @param string The string to pad.
-     * @param length The padding length.
-     * @param chars The string used as padding.
-     * @return Returns the padded string.
-     */
-    (): PadEnd1x1;
-    /**
-     * Pads string on the right side if it’s shorter than length. Padding characters are truncated if they exceed
-     * length.
-     *
-     * @param string The string to pad.
-     * @param length The padding length.
-     * @param chars The string used as padding.
-     * @return Returns the padded string.
-     */
-    (length: number): PadEnd1x2;
-    /**
-     * Pads string on the right side if it’s shorter than length. Padding characters are truncated if they exceed
-     * length.
-     *
-     * @param string The string to pad.
-     * @param length The padding length.
-     * @param chars The string used as padding.
-     * @return Returns the padded string.
-     */
-    (length: number, string: string): string;
-}
-interface PadEnd1x2 {
-    /**
-     * Pads string on the right side if it’s shorter than length. Padding characters are truncated if they exceed
-     * length.
-     *
-     * @param string The string to pad.
-     * @param length The padding length.
-     * @param chars The string used as padding.
-     * @return Returns the padded string.
-     */
-    (): PadEnd1x2;
-    /**
-     * Pads string on the right side if it’s shorter than length. Padding characters are truncated if they exceed
-     * length.
-     *
-     * @param string The string to pad.
-     * @param length The padding length.
-     * @param chars The string used as padding.
-     * @return Returns the padded string.
-     */
-    (string: string): string;
-}
-
-declare const padCharsEnd: PadEnd;
+import { padCharsEnd } from "../fp";
 export = padCharsEnd;
diff --git a/types/lodash/fp/padCharsStart.d.ts b/types/lodash/fp/padCharsStart.d.ts
index cc760b7d0a..a22523505f 100644
--- a/types/lodash/fp/padCharsStart.d.ts
+++ b/types/lodash/fp/padCharsStart.d.ts
@@ -1,103 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface PadStart {
-    /**
-     * Pads string on the left side if it’s shorter than length. Padding characters are truncated if they exceed
-     * length.
-     *
-     * @param string The string to pad.
-     * @param length The padding length.
-     * @param chars The string used as padding.
-     * @return Returns the padded string.
-     */
-    (): PadStart;
-    /**
-     * Pads string on the left side if it’s shorter than length. Padding characters are truncated if they exceed
-     * length.
-     *
-     * @param string The string to pad.
-     * @param length The padding length.
-     * @param chars The string used as padding.
-     * @return Returns the padded string.
-     */
-    (chars: string): PadStart1x1;
-    /**
-     * Pads string on the left side if it’s shorter than length. Padding characters are truncated if they exceed
-     * length.
-     *
-     * @param string The string to pad.
-     * @param length The padding length.
-     * @param chars The string used as padding.
-     * @return Returns the padded string.
-     */
-    (chars: string, length: number): PadStart1x2;
-    /**
-     * Pads string on the left side if it’s shorter than length. Padding characters are truncated if they exceed
-     * length.
-     *
-     * @param string The string to pad.
-     * @param length The padding length.
-     * @param chars The string used as padding.
-     * @return Returns the padded string.
-     */
-    (chars: string, length: number, string: string): string;
-}
-interface PadStart1x1 {
-    /**
-     * Pads string on the left side if it’s shorter than length. Padding characters are truncated if they exceed
-     * length.
-     *
-     * @param string The string to pad.
-     * @param length The padding length.
-     * @param chars The string used as padding.
-     * @return Returns the padded string.
-     */
-    (): PadStart1x1;
-    /**
-     * Pads string on the left side if it’s shorter than length. Padding characters are truncated if they exceed
-     * length.
-     *
-     * @param string The string to pad.
-     * @param length The padding length.
-     * @param chars The string used as padding.
-     * @return Returns the padded string.
-     */
-    (length: number): PadStart1x2;
-    /**
-     * Pads string on the left side if it’s shorter than length. Padding characters are truncated if they exceed
-     * length.
-     *
-     * @param string The string to pad.
-     * @param length The padding length.
-     * @param chars The string used as padding.
-     * @return Returns the padded string.
-     */
-    (length: number, string: string): string;
-}
-interface PadStart1x2 {
-    /**
-     * Pads string on the left side if it’s shorter than length. Padding characters are truncated if they exceed
-     * length.
-     *
-     * @param string The string to pad.
-     * @param length The padding length.
-     * @param chars The string used as padding.
-     * @return Returns the padded string.
-     */
-    (): PadStart1x2;
-    /**
-     * Pads string on the left side if it’s shorter than length. Padding characters are truncated if they exceed
-     * length.
-     *
-     * @param string The string to pad.
-     * @param length The padding length.
-     * @param chars The string used as padding.
-     * @return Returns the padded string.
-     */
-    (string: string): string;
-}
-
-declare const padCharsStart: PadStart;
+import { padCharsStart } from "../fp";
 export = padCharsStart;
diff --git a/types/lodash/fp/padEnd.d.ts b/types/lodash/fp/padEnd.d.ts
index aefc8b35ff..5c4e4d80ba 100644
--- a/types/lodash/fp/padEnd.d.ts
+++ b/types/lodash/fp/padEnd.d.ts
@@ -1,61 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface PadEnd {
-    /**
-     * Pads string on the right side if it’s shorter than length. Padding characters are truncated if they exceed
-     * length.
-     *
-     * @param string The string to pad.
-     * @param length The padding length.
-     * @param chars The string used as padding.
-     * @return Returns the padded string.
-     */
-    (): PadEnd;
-    /**
-     * Pads string on the right side if it’s shorter than length. Padding characters are truncated if they exceed
-     * length.
-     *
-     * @param string The string to pad.
-     * @param length The padding length.
-     * @param chars The string used as padding.
-     * @return Returns the padded string.
-     */
-    (length: number): PadEnd1x1;
-    /**
-     * Pads string on the right side if it’s shorter than length. Padding characters are truncated if they exceed
-     * length.
-     *
-     * @param string The string to pad.
-     * @param length The padding length.
-     * @param chars The string used as padding.
-     * @return Returns the padded string.
-     */
-    (length: number, string: string): string;
-}
-interface PadEnd1x1 {
-    /**
-     * Pads string on the right side if it’s shorter than length. Padding characters are truncated if they exceed
-     * length.
-     *
-     * @param string The string to pad.
-     * @param length The padding length.
-     * @param chars The string used as padding.
-     * @return Returns the padded string.
-     */
-    (): PadEnd1x1;
-    /**
-     * Pads string on the right side if it’s shorter than length. Padding characters are truncated if they exceed
-     * length.
-     *
-     * @param string The string to pad.
-     * @param length The padding length.
-     * @param chars The string used as padding.
-     * @return Returns the padded string.
-     */
-    (string: string): string;
-}
-
-declare const padEnd: PadEnd;
+import { padEnd } from "../fp";
 export = padEnd;
diff --git a/types/lodash/fp/padStart.d.ts b/types/lodash/fp/padStart.d.ts
index a40e611e8c..a4fca5d1ec 100644
--- a/types/lodash/fp/padStart.d.ts
+++ b/types/lodash/fp/padStart.d.ts
@@ -1,61 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface PadStart {
-    /**
-     * Pads string on the left side if it’s shorter than length. Padding characters are truncated if they exceed
-     * length.
-     *
-     * @param string The string to pad.
-     * @param length The padding length.
-     * @param chars The string used as padding.
-     * @return Returns the padded string.
-     */
-    (): PadStart;
-    /**
-     * Pads string on the left side if it’s shorter than length. Padding characters are truncated if they exceed
-     * length.
-     *
-     * @param string The string to pad.
-     * @param length The padding length.
-     * @param chars The string used as padding.
-     * @return Returns the padded string.
-     */
-    (length: number): PadStart1x1;
-    /**
-     * Pads string on the left side if it’s shorter than length. Padding characters are truncated if they exceed
-     * length.
-     *
-     * @param string The string to pad.
-     * @param length The padding length.
-     * @param chars The string used as padding.
-     * @return Returns the padded string.
-     */
-    (length: number, string: string): string;
-}
-interface PadStart1x1 {
-    /**
-     * Pads string on the left side if it’s shorter than length. Padding characters are truncated if they exceed
-     * length.
-     *
-     * @param string The string to pad.
-     * @param length The padding length.
-     * @param chars The string used as padding.
-     * @return Returns the padded string.
-     */
-    (): PadStart1x1;
-    /**
-     * Pads string on the left side if it’s shorter than length. Padding characters are truncated if they exceed
-     * length.
-     *
-     * @param string The string to pad.
-     * @param length The padding length.
-     * @param chars The string used as padding.
-     * @return Returns the padded string.
-     */
-    (string: string): string;
-}
-
-declare const padStart: PadStart;
+import { padStart } from "../fp";
 export = padStart;
diff --git a/types/lodash/fp/parseInt.d.ts b/types/lodash/fp/parseInt.d.ts
index b4257213bd..47aff97b71 100644
--- a/types/lodash/fp/parseInt.d.ts
+++ b/types/lodash/fp/parseInt.d.ts
@@ -1,66 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface ParseInt {
-    /**
-     * Converts string to an integer of the specified radix. If radix is undefined or 0, a radix of 10 is used
-     * unless value is a hexadecimal, in which case a radix of 16 is used.
-     *
-     * Note: This method aligns with the ES5 implementation of parseInt.
-     *
-     * @param string The string to convert.
-     * @param radix The radix to interpret value by.
-     * @return Returns the converted integer.
-     */
-    (): ParseInt;
-    /**
-     * Converts string to an integer of the specified radix. If radix is undefined or 0, a radix of 10 is used
-     * unless value is a hexadecimal, in which case a radix of 16 is used.
-     *
-     * Note: This method aligns with the ES5 implementation of parseInt.
-     *
-     * @param string The string to convert.
-     * @param radix The radix to interpret value by.
-     * @return Returns the converted integer.
-     */
-    (radix: number): ParseInt1x1;
-    /**
-     * Converts string to an integer of the specified radix. If radix is undefined or 0, a radix of 10 is used
-     * unless value is a hexadecimal, in which case a radix of 16 is used.
-     *
-     * Note: This method aligns with the ES5 implementation of parseInt.
-     *
-     * @param string The string to convert.
-     * @param radix The radix to interpret value by.
-     * @return Returns the converted integer.
-     */
-    (radix: number, string: string): number;
-}
-interface ParseInt1x1 {
-    /**
-     * Converts string to an integer of the specified radix. If radix is undefined or 0, a radix of 10 is used
-     * unless value is a hexadecimal, in which case a radix of 16 is used.
-     *
-     * Note: This method aligns with the ES5 implementation of parseInt.
-     *
-     * @param string The string to convert.
-     * @param radix The radix to interpret value by.
-     * @return Returns the converted integer.
-     */
-    (): ParseInt1x1;
-    /**
-     * Converts string to an integer of the specified radix. If radix is undefined or 0, a radix of 10 is used
-     * unless value is a hexadecimal, in which case a radix of 16 is used.
-     *
-     * Note: This method aligns with the ES5 implementation of parseInt.
-     *
-     * @param string The string to convert.
-     * @param radix The radix to interpret value by.
-     * @return Returns the converted integer.
-     */
-    (string: string): number;
-}
-
-declare const parseInt: ParseInt;
+import { parseInt } from "../fp";
 export = parseInt;
diff --git a/types/lodash/fp/partial.d.ts b/types/lodash/fp/partial.d.ts
index 37c796b0b8..f5ebd726e5 100644
--- a/types/lodash/fp/partial.d.ts
+++ b/types/lodash/fp/partial.d.ts
@@ -1,56 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface Partial {
-    /**
-    * Creates a function that, when called, invokes func with any additional partial arguments
-    * prepended to those provided to the new function. This method is similar to _.bind except
-    * it does not alter the this binding.
-    * @param func The function to partially apply arguments to.
-    * @param args Arguments to be partially applied.
-    * @return The new partially applied function.
-    **/
-    (): Partial;
-    /**
-    * Creates a function that, when called, invokes func with any additional partial arguments
-    * prepended to those provided to the new function. This method is similar to _.bind except
-    * it does not alter the this binding.
-    * @param func The function to partially apply arguments to.
-    * @param args Arguments to be partially applied.
-    * @return The new partially applied function.
-    **/
-    (args: ReadonlyArray<any>): Partial1x1;
-    /**
-    * Creates a function that, when called, invokes func with any additional partial arguments
-    * prepended to those provided to the new function. This method is similar to _.bind except
-    * it does not alter the this binding.
-    * @param func The function to partially apply arguments to.
-    * @param args Arguments to be partially applied.
-    * @return The new partially applied function.
-    **/
-    (args: ReadonlyArray<any>, func: (...args: any[]) => any): (...args: any[]) => any;
-}
-interface Partial1x1 {
-    /**
-    * Creates a function that, when called, invokes func with any additional partial arguments
-    * prepended to those provided to the new function. This method is similar to _.bind except
-    * it does not alter the this binding.
-    * @param func The function to partially apply arguments to.
-    * @param args Arguments to be partially applied.
-    * @return The new partially applied function.
-    **/
-    (): Partial1x1;
-    /**
-    * Creates a function that, when called, invokes func with any additional partial arguments
-    * prepended to those provided to the new function. This method is similar to _.bind except
-    * it does not alter the this binding.
-    * @param func The function to partially apply arguments to.
-    * @param args Arguments to be partially applied.
-    * @return The new partially applied function.
-    **/
-    (func: (...args: any[]) => any): (...args: any[]) => any;
-}
-
-declare const partial: Partial;
+import { partial } from "../fp";
 export = partial;
diff --git a/types/lodash/fp/partialRight.d.ts b/types/lodash/fp/partialRight.d.ts
index d148198d3b..bc0fa1b9c6 100644
--- a/types/lodash/fp/partialRight.d.ts
+++ b/types/lodash/fp/partialRight.d.ts
@@ -1,51 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface PartialRight {
-    /**
-    * This method is like _.partial except that partial arguments are appended to those provided
-    * to the new function.
-    * @param func The function to partially apply arguments to.
-    * @param args Arguments to be partially applied.
-    * @return The new partially applied function.
-    **/
-    (): PartialRight;
-    /**
-    * This method is like _.partial except that partial arguments are appended to those provided
-    * to the new function.
-    * @param func The function to partially apply arguments to.
-    * @param args Arguments to be partially applied.
-    * @return The new partially applied function.
-    **/
-    (args: ReadonlyArray<any>): PartialRight1x1;
-    /**
-    * This method is like _.partial except that partial arguments are appended to those provided
-    * to the new function.
-    * @param func The function to partially apply arguments to.
-    * @param args Arguments to be partially applied.
-    * @return The new partially applied function.
-    **/
-    (args: ReadonlyArray<any>, func: (...args: any[]) => any): (...args: any[]) => any;
-}
-interface PartialRight1x1 {
-    /**
-    * This method is like _.partial except that partial arguments are appended to those provided
-    * to the new function.
-    * @param func The function to partially apply arguments to.
-    * @param args Arguments to be partially applied.
-    * @return The new partially applied function.
-    **/
-    (): PartialRight1x1;
-    /**
-    * This method is like _.partial except that partial arguments are appended to those provided
-    * to the new function.
-    * @param func The function to partially apply arguments to.
-    * @param args Arguments to be partially applied.
-    * @return The new partially applied function.
-    **/
-    (func: (...args: any[]) => any): (...args: any[]) => any;
-}
-
-declare const partialRight: PartialRight;
+import { partialRight } from "../fp";
 export = partialRight;
diff --git a/types/lodash/fp/partition.d.ts b/types/lodash/fp/partition.d.ts
index 5e97fd95de..6ad41cd7db 100644
--- a/types/lodash/fp/partition.d.ts
+++ b/types/lodash/fp/partition.d.ts
@@ -1,133 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Partition {
-    /**
-    * Creates an array of elements split into two groups, the first of which contains elements predicate returns truthy for,
-    * while the second of which contains elements predicate returns falsey for.
-    * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-    *
-    * If a property name is provided for predicate the created _.property style callback
-    * returns the property value of the given element.
-    *
-    * If a value is also provided for thisArg the created _.matchesProperty style callback
-    * returns true for elements that have a matching property value, else false.
-    *
-    * If an object is provided for predicate the created _.matches style callback returns
-    * true for elements that have the properties of the given object, else false.
-    *
-    * @param collection The collection to iterate over.
-    * @param callback The function called per iteration.
-    * @param thisArg The this binding of predicate.
-    * @return Returns the array of grouped elements.
-    **/
-    (): Partition;
-    /**
-    * Creates an array of elements split into two groups, the first of which contains elements predicate returns truthy for,
-    * while the second of which contains elements predicate returns falsey for.
-    * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-    *
-    * If a property name is provided for predicate the created _.property style callback
-    * returns the property value of the given element.
-    *
-    * If a value is also provided for thisArg the created _.matchesProperty style callback
-    * returns true for elements that have a matching property value, else false.
-    *
-    * If an object is provided for predicate the created _.matches style callback returns
-    * true for elements that have the properties of the given object, else false.
-    *
-    * @param collection The collection to iterate over.
-    * @param callback The function called per iteration.
-    * @param thisArg The this binding of predicate.
-    * @return Returns the array of grouped elements.
-    **/
-    <T>(callback: _.ValueIteratee<T>): Partition1x1<T>;
-    /**
-    * Creates an array of elements split into two groups, the first of which contains elements predicate returns truthy for,
-    * while the second of which contains elements predicate returns falsey for.
-    * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-    *
-    * If a property name is provided for predicate the created _.property style callback
-    * returns the property value of the given element.
-    *
-    * If a value is also provided for thisArg the created _.matchesProperty style callback
-    * returns true for elements that have a matching property value, else false.
-    *
-    * If an object is provided for predicate the created _.matches style callback returns
-    * true for elements that have the properties of the given object, else false.
-    *
-    * @param collection The collection to iterate over.
-    * @param callback The function called per iteration.
-    * @param thisArg The this binding of predicate.
-    * @return Returns the array of grouped elements.
-    **/
-    <T>(callback: _.ValueIteratee<T>, collection: _.List<T> | null | undefined): [T[], T[]];
-    /**
-    * Creates an array of elements split into two groups, the first of which contains elements predicate returns truthy for,
-    * while the second of which contains elements predicate returns falsey for.
-    * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-    *
-    * If a property name is provided for predicate the created _.property style callback
-    * returns the property value of the given element.
-    *
-    * If a value is also provided for thisArg the created _.matchesProperty style callback
-    * returns true for elements that have a matching property value, else false.
-    *
-    * If an object is provided for predicate the created _.matches style callback returns
-    * true for elements that have the properties of the given object, else false.
-    *
-    * @param collection The collection to iterate over.
-    * @param callback The function called per iteration.
-    * @param thisArg The this binding of predicate.
-    * @return Returns the array of grouped elements.
-    **/
-    <T extends object>(callback: _.ValueIteratee<T[keyof T]>, collection: T | null | undefined): [Array<T[keyof T]>, Array<T[keyof T]>];
-}
-interface Partition1x1<T> {
-    /**
-    * Creates an array of elements split into two groups, the first of which contains elements predicate returns truthy for,
-    * while the second of which contains elements predicate returns falsey for.
-    * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-    *
-    * If a property name is provided for predicate the created _.property style callback
-    * returns the property value of the given element.
-    *
-    * If a value is also provided for thisArg the created _.matchesProperty style callback
-    * returns true for elements that have a matching property value, else false.
-    *
-    * If an object is provided for predicate the created _.matches style callback returns
-    * true for elements that have the properties of the given object, else false.
-    *
-    * @param collection The collection to iterate over.
-    * @param callback The function called per iteration.
-    * @param thisArg The this binding of predicate.
-    * @return Returns the array of grouped elements.
-    **/
-    (): Partition1x1<T>;
-    /**
-    * Creates an array of elements split into two groups, the first of which contains elements predicate returns truthy for,
-    * while the second of which contains elements predicate returns falsey for.
-    * The predicate is bound to thisArg and invoked with three arguments: (value, index|key, collection).
-    *
-    * If a property name is provided for predicate the created _.property style callback
-    * returns the property value of the given element.
-    *
-    * If a value is also provided for thisArg the created _.matchesProperty style callback
-    * returns true for elements that have a matching property value, else false.
-    *
-    * If an object is provided for predicate the created _.matches style callback returns
-    * true for elements that have the properties of the given object, else false.
-    *
-    * @param collection The collection to iterate over.
-    * @param callback The function called per iteration.
-    * @param thisArg The this binding of predicate.
-    * @return Returns the array of grouped elements.
-    **/
-    (collection: _.List<T> | object | null | undefined): [T[], T[]];
-}
-
-declare const partition: Partition;
+import { partition } from "../fp";
 export = partition;
diff --git a/types/lodash/fp/path.d.ts b/types/lodash/fp/path.d.ts
index cb8b94efaf..db86d6023d 100644
--- a/types/lodash/fp/path.d.ts
+++ b/types/lodash/fp/path.d.ts
@@ -1,207 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Get {
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (): Get;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey]): Get1x1<TObject, TKey>;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey], object: TObject): TObject[TKey];
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey], object: TObject | null | undefined): TObject[TKey] | undefined;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (path: number): Get3x1;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <T>(path: number, object: _.NumericDictionary<T>): T;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <T>(path: number, object: _.NumericDictionary<T> | null | undefined): T | undefined;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (path: _.PropertyPath): Get5x1;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (path: _.PropertyPath, object: null | undefined): undefined;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (path: _.PropertyPath, object: any): any;
-}
-interface Get1x1<TObject extends object, TKey extends keyof TObject> {
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (): Get1x1<TObject, TKey>;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (object: TObject): TObject[TKey];
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (object: TObject | null | undefined): TObject[TKey] | undefined;
-}
-interface Get3x1 {
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (): Get3x1;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <T>(object: _.NumericDictionary<T>): T;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <T>(object: _.NumericDictionary<T> | null | undefined): T | undefined;
-}
-interface Get5x1 {
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (): Get5x1;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (object: null | undefined): undefined;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (object: any): any;
-}
-
-declare const path: Get;
+import { path } from "../fp";
 export = path;
diff --git a/types/lodash/fp/pathEq.d.ts b/types/lodash/fp/pathEq.d.ts
index 569fffabf8..9f328756c3 100644
--- a/types/lodash/fp/pathEq.d.ts
+++ b/types/lodash/fp/pathEq.d.ts
@@ -1,90 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface MatchesProperty {
-    /**
-     * Creates a function that compares the property value of path on a given object to value.
-     *
-     * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
-     * strings. Objects are compared by their own, not inherited, enumerable properties.
-     *
-     * @param path The path of the property to get.
-     * @param srcValue The value to match.
-     * @return Returns the new function.
-     */
-    (): MatchesProperty;
-    /**
-     * Creates a function that compares the property value of path on a given object to value.
-     *
-     * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
-     * strings. Objects are compared by their own, not inherited, enumerable properties.
-     *
-     * @param path The path of the property to get.
-     * @param srcValue The value to match.
-     * @return Returns the new function.
-     */
-    (path: _.PropertyPath): MatchesProperty1x1;
-    /**
-     * Creates a function that compares the property value of path on a given object to value.
-     *
-     * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
-     * strings. Objects are compared by their own, not inherited, enumerable properties.
-     *
-     * @param path The path of the property to get.
-     * @param srcValue The value to match.
-     * @return Returns the new function.
-     */
-    <T>(path: _.PropertyPath, srcValue: T): (value: any) => boolean;
-    /**
-     * Creates a function that compares the property value of path on a given object to value.
-     *
-     * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
-     * strings. Objects are compared by their own, not inherited, enumerable properties.
-     *
-     * @param path The path of the property to get.
-     * @param srcValue The value to match.
-     * @return Returns the new function.
-     */
-    <T, V>(path: _.PropertyPath, srcValue: T): (value: V) => boolean;
-}
-interface MatchesProperty1x1 {
-    /**
-     * Creates a function that compares the property value of path on a given object to value.
-     *
-     * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
-     * strings. Objects are compared by their own, not inherited, enumerable properties.
-     *
-     * @param path The path of the property to get.
-     * @param srcValue The value to match.
-     * @return Returns the new function.
-     */
-    (): MatchesProperty1x1;
-    /**
-     * Creates a function that compares the property value of path on a given object to value.
-     *
-     * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
-     * strings. Objects are compared by their own, not inherited, enumerable properties.
-     *
-     * @param path The path of the property to get.
-     * @param srcValue The value to match.
-     * @return Returns the new function.
-     */
-    <T>(srcValue: T): (value: any) => boolean;
-    /**
-     * Creates a function that compares the property value of path on a given object to value.
-     *
-     * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
-     * strings. Objects are compared by their own, not inherited, enumerable properties.
-     *
-     * @param path The path of the property to get.
-     * @param srcValue The value to match.
-     * @return Returns the new function.
-     */
-    <T, V>(srcValue: T): (value: V) => boolean;
-}
-
-declare const pathEq: MatchesProperty;
+import { pathEq } from "../fp";
 export = pathEq;
diff --git a/types/lodash/fp/pathOr.d.ts b/types/lodash/fp/pathOr.d.ts
index a62252ce03..6cad6b1836 100644
--- a/types/lodash/fp/pathOr.d.ts
+++ b/types/lodash/fp/pathOr.d.ts
@@ -1,313 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Get {
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (): Get;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <TDefault>(defaultValue: TDefault): Get1x1<TDefault>;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <TObject extends object, TKey extends keyof TObject, TDefault>(defaultValue: TDefault, path: TKey | [TKey]): Get1x2<TObject, TKey, TDefault>;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <TObject extends object, TKey extends keyof TObject, TDefault>(defaultValue: TDefault, path: TKey | [TKey], object: TObject | null | undefined): TObject[TKey] | TDefault;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <TDefault>(defaultValue: TDefault, path: number): Get2x2<TDefault>;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <T, TDefault>(defaultValue: TDefault, path: number, object: _.NumericDictionary<T> | null | undefined): T | TDefault;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <TDefault>(defaultValue: TDefault, path: _.PropertyPath): Get3x2<TDefault>;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <TDefault>(defaultValue: TDefault, path: _.PropertyPath, object: null | undefined): TDefault;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (defaultValue: any): Get4x1;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (defaultValue: any, path: _.PropertyPath): Get4x2;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (defaultValue: any, path: _.PropertyPath, object: any): any;
-}
-interface Get1x1<TDefault> {
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (): Get1x1<TDefault>;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey]): Get1x2<TObject, TKey, TDefault>;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey], object: TObject | null | undefined): TObject[TKey] | TDefault;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (path: number): Get2x2<TDefault>;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <T>(path: number, object: _.NumericDictionary<T> | null | undefined): T | TDefault;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (path: _.PropertyPath): Get3x2<TDefault>;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (path: _.PropertyPath, object: null | undefined): TDefault;
-}
-interface Get1x2<TObject extends object, TKey extends keyof TObject, TDefault> {
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (): Get1x2<TObject, TKey, TDefault>;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (object: TObject | null | undefined): TObject[TKey] | TDefault;
-}
-interface Get2x2<TDefault> {
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (): Get2x2<TDefault>;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <T>(object: _.NumericDictionary<T> | null | undefined): T | TDefault;
-}
-interface Get3x2<TDefault> {
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (): Get3x2<TDefault>;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (object: null | undefined): TDefault;
-}
-interface Get4x1 {
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (): Get4x1;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (path: _.PropertyPath): Get4x2;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (path: _.PropertyPath, object: any): any;
-}
-interface Get4x2 {
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (): Get4x2;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (object: any): any;
-}
-
-declare const pathOr: Get;
+import { pathOr } from "../fp";
 export = pathOr;
diff --git a/types/lodash/fp/paths.d.ts b/types/lodash/fp/paths.d.ts
index 6aa6bcb6e5..1e6eb8908f 100644
--- a/types/lodash/fp/paths.d.ts
+++ b/types/lodash/fp/paths.d.ts
@@ -1,96 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface At {
-    /**
-     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
-     * specified as individual arguments or as arrays of keys.
-     *
-     * @param object The object to iterate over.
-     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
-     * @return Returns the new array of picked elements.
-     */
-    (): At;
-    /**
-     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
-     * specified as individual arguments or as arrays of keys.
-     *
-     * @param object The object to iterate over.
-     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
-     * @return Returns the new array of picked elements.
-     */
-    (props: _.PropertyPath): At1x1;
-    /**
-     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
-     * specified as individual arguments or as arrays of keys.
-     *
-     * @param object The object to iterate over.
-     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
-     * @return Returns the new array of picked elements.
-     */
-    <T>(props: _.PropertyPath, object: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): T[];
-    /**
-     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
-     * specified as individual arguments or as arrays of keys.
-     *
-     * @param object The object to iterate over.
-     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
-     * @return Returns the new array of picked elements.
-     */
-    <T extends object>(props: _.Many<keyof T>): At2x1<T>;
-    /**
-     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
-     * specified as individual arguments or as arrays of keys.
-     *
-     * @param object The object to iterate over.
-     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
-     * @return Returns the new array of picked elements.
-     */
-    <T extends object>(props: _.Many<keyof T>, object: T | null | undefined): Array<T[keyof T]>;
-}
-interface At1x1 {
-    /**
-     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
-     * specified as individual arguments or as arrays of keys.
-     *
-     * @param object The object to iterate over.
-     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
-     * @return Returns the new array of picked elements.
-     */
-    (): At1x1;
-    /**
-     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
-     * specified as individual arguments or as arrays of keys.
-     *
-     * @param object The object to iterate over.
-     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
-     * @return Returns the new array of picked elements.
-     */
-    <T>(object: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): T[];
-}
-interface At2x1<T extends object> {
-    /**
-     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
-     * specified as individual arguments or as arrays of keys.
-     *
-     * @param object The object to iterate over.
-     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
-     * @return Returns the new array of picked elements.
-     */
-    (): At2x1<T>;
-    /**
-     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
-     * specified as individual arguments or as arrays of keys.
-     *
-     * @param object The object to iterate over.
-     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
-     * @return Returns the new array of picked elements.
-     */
-    (object: T | null | undefined): Array<T[keyof T]>;
-}
-
-declare const paths: At;
+import { paths } from "../fp";
 export = paths;
diff --git a/types/lodash/fp/pick.d.ts b/types/lodash/fp/pick.d.ts
index d90def9925..4772ecacc3 100644
--- a/types/lodash/fp/pick.d.ts
+++ b/types/lodash/fp/pick.d.ts
@@ -1,159 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface LodashPick {
-    /**
-     * Creates an object composed of the picked `object` properties.
-     *
-     * @category Object
-     * @param object The source object.
-     * @param [props] The property names to pick, specified
-     *  individually or in arrays.
-     * @returns Returns the new object.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': '2', 'c': 3 };
-     *
-     * _.pick(object, ['a', 'c']);
-     * // => { 'a': 1, 'c': 3 }
-     */
-    (): LodashPick;
-    /**
-     * Creates an object composed of the picked `object` properties.
-     *
-     * @category Object
-     * @param object The source object.
-     * @param [props] The property names to pick, specified
-     *  individually or in arrays.
-     * @returns Returns the new object.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': '2', 'c': 3 };
-     *
-     * _.pick(object, ['a', 'c']);
-     * // => { 'a': 1, 'c': 3 }
-     */
-    <T extends object, U extends keyof T>(props: _.Many<U>): LodashPick1x1<T, U>;
-    /**
-     * Creates an object composed of the picked `object` properties.
-     *
-     * @category Object
-     * @param object The source object.
-     * @param [props] The property names to pick, specified
-     *  individually or in arrays.
-     * @returns Returns the new object.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': '2', 'c': 3 };
-     *
-     * _.pick(object, ['a', 'c']);
-     * // => { 'a': 1, 'c': 3 }
-     */
-    <T extends object, U extends keyof T>(props: _.Many<U>, object: T): Pick<T, U>;
-    /**
-     * Creates an object composed of the picked `object` properties.
-     *
-     * @category Object
-     * @param object The source object.
-     * @param [props] The property names to pick, specified
-     *  individually or in arrays.
-     * @returns Returns the new object.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': '2', 'c': 3 };
-     *
-     * _.pick(object, ['a', 'c']);
-     * // => { 'a': 1, 'c': 3 }
-     */
-    (props: _.PropertyPath): LodashPick2x1;
-    /**
-     * Creates an object composed of the picked `object` properties.
-     *
-     * @category Object
-     * @param object The source object.
-     * @param [props] The property names to pick, specified
-     *  individually or in arrays.
-     * @returns Returns the new object.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': '2', 'c': 3 };
-     *
-     * _.pick(object, ['a', 'c']);
-     * // => { 'a': 1, 'c': 3 }
-     */
-    <T>(props: _.PropertyPath, object: T | null | undefined): _.PartialDeep<T>;
-}
-interface LodashPick1x1<T extends object, U extends keyof T> {
-    /**
-     * Creates an object composed of the picked `object` properties.
-     *
-     * @category Object
-     * @param object The source object.
-     * @param [props] The property names to pick, specified
-     *  individually or in arrays.
-     * @returns Returns the new object.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': '2', 'c': 3 };
-     *
-     * _.pick(object, ['a', 'c']);
-     * // => { 'a': 1, 'c': 3 }
-     */
-    (): LodashPick1x1<T, U>;
-    /**
-     * Creates an object composed of the picked `object` properties.
-     *
-     * @category Object
-     * @param object The source object.
-     * @param [props] The property names to pick, specified
-     *  individually or in arrays.
-     * @returns Returns the new object.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': '2', 'c': 3 };
-     *
-     * _.pick(object, ['a', 'c']);
-     * // => { 'a': 1, 'c': 3 }
-     */
-    (object: T): Pick<T, U>;
-}
-interface LodashPick2x1 {
-    /**
-     * Creates an object composed of the picked `object` properties.
-     *
-     * @category Object
-     * @param object The source object.
-     * @param [props] The property names to pick, specified
-     *  individually or in arrays.
-     * @returns Returns the new object.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': '2', 'c': 3 };
-     *
-     * _.pick(object, ['a', 'c']);
-     * // => { 'a': 1, 'c': 3 }
-     */
-    (): LodashPick2x1;
-    /**
-     * Creates an object composed of the picked `object` properties.
-     *
-     * @category Object
-     * @param object The source object.
-     * @param [props] The property names to pick, specified
-     *  individually or in arrays.
-     * @returns Returns the new object.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': '2', 'c': 3 };
-     *
-     * _.pick(object, ['a', 'c']);
-     * // => { 'a': 1, 'c': 3 }
-     */
-    <T>(object: T | null | undefined): _.PartialDeep<T>;
-}
-
-declare const pick: LodashPick;
+import { pick } from "../fp";
 export = pick;
diff --git a/types/lodash/fp/pickAll.d.ts b/types/lodash/fp/pickAll.d.ts
index 0b103c02b7..38d2e3fe2b 100644
--- a/types/lodash/fp/pickAll.d.ts
+++ b/types/lodash/fp/pickAll.d.ts
@@ -1,159 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface LodashPick {
-    /**
-     * Creates an object composed of the picked `object` properties.
-     *
-     * @category Object
-     * @param object The source object.
-     * @param [props] The property names to pick, specified
-     *  individually or in arrays.
-     * @returns Returns the new object.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': '2', 'c': 3 };
-     *
-     * _.pick(object, ['a', 'c']);
-     * // => { 'a': 1, 'c': 3 }
-     */
-    (): LodashPick;
-    /**
-     * Creates an object composed of the picked `object` properties.
-     *
-     * @category Object
-     * @param object The source object.
-     * @param [props] The property names to pick, specified
-     *  individually or in arrays.
-     * @returns Returns the new object.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': '2', 'c': 3 };
-     *
-     * _.pick(object, ['a', 'c']);
-     * // => { 'a': 1, 'c': 3 }
-     */
-    <T extends object, U extends keyof T>(props: _.Many<U>): LodashPick1x1<T, U>;
-    /**
-     * Creates an object composed of the picked `object` properties.
-     *
-     * @category Object
-     * @param object The source object.
-     * @param [props] The property names to pick, specified
-     *  individually or in arrays.
-     * @returns Returns the new object.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': '2', 'c': 3 };
-     *
-     * _.pick(object, ['a', 'c']);
-     * // => { 'a': 1, 'c': 3 }
-     */
-    <T extends object, U extends keyof T>(props: _.Many<U>, object: T): Pick<T, U>;
-    /**
-     * Creates an object composed of the picked `object` properties.
-     *
-     * @category Object
-     * @param object The source object.
-     * @param [props] The property names to pick, specified
-     *  individually or in arrays.
-     * @returns Returns the new object.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': '2', 'c': 3 };
-     *
-     * _.pick(object, ['a', 'c']);
-     * // => { 'a': 1, 'c': 3 }
-     */
-    (props: _.PropertyPath): LodashPick2x1;
-    /**
-     * Creates an object composed of the picked `object` properties.
-     *
-     * @category Object
-     * @param object The source object.
-     * @param [props] The property names to pick, specified
-     *  individually or in arrays.
-     * @returns Returns the new object.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': '2', 'c': 3 };
-     *
-     * _.pick(object, ['a', 'c']);
-     * // => { 'a': 1, 'c': 3 }
-     */
-    <T>(props: _.PropertyPath, object: T | null | undefined): _.PartialDeep<T>;
-}
-interface LodashPick1x1<T extends object, U extends keyof T> {
-    /**
-     * Creates an object composed of the picked `object` properties.
-     *
-     * @category Object
-     * @param object The source object.
-     * @param [props] The property names to pick, specified
-     *  individually or in arrays.
-     * @returns Returns the new object.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': '2', 'c': 3 };
-     *
-     * _.pick(object, ['a', 'c']);
-     * // => { 'a': 1, 'c': 3 }
-     */
-    (): LodashPick1x1<T, U>;
-    /**
-     * Creates an object composed of the picked `object` properties.
-     *
-     * @category Object
-     * @param object The source object.
-     * @param [props] The property names to pick, specified
-     *  individually or in arrays.
-     * @returns Returns the new object.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': '2', 'c': 3 };
-     *
-     * _.pick(object, ['a', 'c']);
-     * // => { 'a': 1, 'c': 3 }
-     */
-    (object: T): Pick<T, U>;
-}
-interface LodashPick2x1 {
-    /**
-     * Creates an object composed of the picked `object` properties.
-     *
-     * @category Object
-     * @param object The source object.
-     * @param [props] The property names to pick, specified
-     *  individually or in arrays.
-     * @returns Returns the new object.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': '2', 'c': 3 };
-     *
-     * _.pick(object, ['a', 'c']);
-     * // => { 'a': 1, 'c': 3 }
-     */
-    (): LodashPick2x1;
-    /**
-     * Creates an object composed of the picked `object` properties.
-     *
-     * @category Object
-     * @param object The source object.
-     * @param [props] The property names to pick, specified
-     *  individually or in arrays.
-     * @returns Returns the new object.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': '2', 'c': 3 };
-     *
-     * _.pick(object, ['a', 'c']);
-     * // => { 'a': 1, 'c': 3 }
-     */
-    <T>(object: T | null | undefined): _.PartialDeep<T>;
-}
-
-declare const pickAll: LodashPick;
+import { pickAll } from "../fp";
 export = pickAll;
diff --git a/types/lodash/fp/pickBy.d.ts b/types/lodash/fp/pickBy.d.ts
index 189084f980..0b192629e0 100644
--- a/types/lodash/fp/pickBy.d.ts
+++ b/types/lodash/fp/pickBy.d.ts
@@ -1,93 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface PickBy {
-    /**
-     * Creates an object composed of the `object` properties `predicate` returns
-     * truthy for. The predicate is invoked with two arguments: (value, key).
-     *
-     * @category Object
-     * @param object The source object.
-     * @param [predicate=_.identity] The function invoked per property.
-     * @returns Returns the new object.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': '2', 'c': 3 };
-     *
-     * _.pickBy(object, _.isNumber);
-     * // => { 'a': 1, 'c': 3 }
-     */
-    (): PickBy;
-    /**
-     * Creates an object composed of the `object` properties `predicate` returns
-     * truthy for. The predicate is invoked with two arguments: (value, key).
-     *
-     * @category Object
-     * @param object The source object.
-     * @param [predicate=_.identity] The function invoked per property.
-     * @returns Returns the new object.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': '2', 'c': 3 };
-     *
-     * _.pickBy(object, _.isNumber);
-     * // => { 'a': 1, 'c': 3 }
-     */
-    <T>(predicate: _.ValueKeyIteratee<T>): PickBy1x1<T>;
-    /**
-     * Creates an object composed of the `object` properties `predicate` returns
-     * truthy for. The predicate is invoked with two arguments: (value, key).
-     *
-     * @category Object
-     * @param object The source object.
-     * @param [predicate=_.identity] The function invoked per property.
-     * @returns Returns the new object.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': '2', 'c': 3 };
-     *
-     * _.pickBy(object, _.isNumber);
-     * // => { 'a': 1, 'c': 3 }
-     */
-    <T extends object>(predicate: _.ValueKeyIteratee<T[keyof T]>, object: T | null | undefined): _.PartialObject<T>;
-}
-interface PickBy1x1<T> {
-    /**
-     * Creates an object composed of the `object` properties `predicate` returns
-     * truthy for. The predicate is invoked with two arguments: (value, key).
-     *
-     * @category Object
-     * @param object The source object.
-     * @param [predicate=_.identity] The function invoked per property.
-     * @returns Returns the new object.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': '2', 'c': 3 };
-     *
-     * _.pickBy(object, _.isNumber);
-     * // => { 'a': 1, 'c': 3 }
-     */
-    (): PickBy1x1<T>;
-    /**
-     * Creates an object composed of the `object` properties `predicate` returns
-     * truthy for. The predicate is invoked with two arguments: (value, key).
-     *
-     * @category Object
-     * @param object The source object.
-     * @param [predicate=_.identity] The function invoked per property.
-     * @returns Returns the new object.
-     * @example
-     *
-     * var object = { 'a': 1, 'b': '2', 'c': 3 };
-     *
-     * _.pickBy(object, _.isNumber);
-     * // => { 'a': 1, 'c': 3 }
-     */
-    <T1 extends object>(object: T1 | null | undefined): _.PartialObject<T1>;
-}
-
-declare const pickBy: PickBy;
+import { pickBy } from "../fp";
 export = pickBy;
diff --git a/types/lodash/fp/pipe.d.ts b/types/lodash/fp/pipe.d.ts
index d5fae221ec..a53a04823b 100644
--- a/types/lodash/fp/pipe.d.ts
+++ b/types/lodash/fp/pipe.d.ts
@@ -1,355 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Flow {
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <R1, R2>(f1: () => R1, f2: (a: R1) => R2): () => R2;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <R1, R2, R3>(f1: () => R1, f2: (a: R1) => R2, f3: (a: R2) => R3): () => R3;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <R1, R2, R3, R4>(f1: () => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): () => R4;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <R1, R2, R3, R4, R5>(f1: () => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): () => R5;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <R1, R2, R3, R4, R5, R6>(f1: () => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): () => R6;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <R1, R2, R3, R4, R5, R6, R7>(f1: () => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): () => R7;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <R1, R2, R3, R4, R5, R6, R7>(f1: () => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<_.Many<(a: any) => any>>): () => any;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, R1, R2>(f1: (a1: A1) => R1, f2: (a: R1) => R2): (a1: A1) => R2;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, R1, R2, R3>(f1: (a1: A1) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3): (a1: A1) => R3;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, R1, R2, R3, R4>(f1: (a1: A1) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): (a1: A1) => R4;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, R1, R2, R3, R4, R5>(f1: (a1: A1) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): (a1: A1) => R5;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, R1, R2, R3, R4, R5, R6>(f1: (a1: A1) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): (a1: A1) => R6;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): (a1: A1) => R7;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<_.Many<(a: any) => any>>): (a1: A1) => any;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, R1, R2>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2): (a1: A1, a2: A2) => R2;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, R1, R2, R3>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3): (a1: A1, a2: A2) => R3;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, R1, R2, R3, R4>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): (a1: A1, a2: A2) => R4;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, R1, R2, R3, R4, R5>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): (a1: A1, a2: A2) => R5;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, R1, R2, R3, R4, R5, R6>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): (a1: A1, a2: A2) => R6;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): (a1: A1, a2: A2) => R7;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<_.Many<(a: any) => any>>): (a1: A1, a2: A2) => any;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, R1, R2>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2): (a1: A1, a2: A2, a3: A3) => R2;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, R1, R2, R3>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3): (a1: A1, a2: A2, a3: A3) => R3;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, R1, R2, R3, R4>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): (a1: A1, a2: A2, a3: A3) => R4;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, R1, R2, R3, R4, R5>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): (a1: A1, a2: A2, a3: A3) => R5;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, R1, R2, R3, R4, R5, R6>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): (a1: A1, a2: A2, a3: A3) => R6;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): (a1: A1, a2: A2, a3: A3) => R7;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2, a3: A3) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<_.Many<(a: any) => any>>): (a1: A1, a2: A2, a3: A3) => any;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, A4, R1, R2>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2): (a1: A1, a2: A2, a3: A3, a4: A4) => R2;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, A4, R1, R2, R3>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3): (a1: A1, a2: A2, a3: A3, a4: A4) => R3;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, A4, R1, R2, R3, R4>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): (a1: A1, a2: A2, a3: A3, a4: A4) => R4;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, A4, R1, R2, R3, R4, R5>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): (a1: A1, a2: A2, a3: A3, a4: A4) => R5;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, A4, R1, R2, R3, R4, R5, R6>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): (a1: A1, a2: A2, a3: A3, a4: A4) => R6;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): (a1: A1, a2: A2, a3: A3, a4: A4) => R7;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2, a3: A3, a4: A4) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<_.Many<(a: any) => any>>): (a1: A1, a2: A2, a3: A3, a4: A4) => any;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, A4, R1, R2>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R2;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, A4, R1, R2, R3>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R3;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, A4, R1, R2, R3, R4>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R4;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, A4, R1, R2, R3, R4, R5>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R5;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, A4, R1, R2, R3, R4, R5, R6>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R6;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R7;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    <A1, A2, A3, A4, R1, R2, R3, R4, R5, R6, R7>(f1: (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4, f5: (a: R4) => R5, f6: (a: R5) => R6, f7: (a: R6) => R7, ...funcs: Array<_.Many<(a: any) => any>>): (a1: A1, a2: A2, a3: A3, a4: A4, ...args: any[]) => any;
-    /**
-     * Creates a function that returns the result of invoking the provided functions with the this binding of the
-     * created function, where each successive invocation is supplied the return value of the previous.
-     *
-     * @param funcs Functions to invoke.
-     * @return Returns the new function.
-     */
-    (funcs: Array<_.Many<(...args: any[]) => any>>): (...args: any[]) => any;
-}
-
-declare const pipe: Flow;
+import { pipe } from "../fp";
 export = pipe;
diff --git a/types/lodash/fp/placeholder.d.ts b/types/lodash/fp/placeholder.d.ts
new file mode 100644
index 0000000000..ddaed8ed1b
--- /dev/null
+++ b/types/lodash/fp/placeholder.d.ts
@@ -0,0 +1,3 @@
+import _ = require("../index");
+declare const placeholder: _.__;
+export = placeholder;
diff --git a/types/lodash/fp/pluck.d.ts b/types/lodash/fp/pluck.d.ts
index eec49c3f59..c5c916f814 100644
--- a/types/lodash/fp/pluck.d.ts
+++ b/types/lodash/fp/pluck.d.ts
@@ -1,588 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Map {
-    /**
-     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
-     * thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property value
-     * of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
-     * _.reject, and _.some.
-     *
-     * The guarded methods are:
-     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
-     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
-     * sample, some, sum, uniq, and words
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped array.
-     */
-    (): Map;
-    /**
-     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
-     * thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property value
-     * of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
-     * _.reject, and _.some.
-     *
-     * The guarded methods are:
-     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
-     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
-     * sample, some, sum, uniq, and words
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped array.
-     */
-    <T, TResult>(iteratee: (value: T) => TResult): Map1x1<T, TResult>;
-    /**
-     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
-     * thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property value
-     * of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
-     * _.reject, and _.some.
-     *
-     * The guarded methods are:
-     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
-     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
-     * sample, some, sum, uniq, and words
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped array.
-     */
-    <T, TResult>(iteratee: (value: T) => TResult, collection: T[] | _.List<T> | null | undefined): TResult[];
-    /**
-     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
-     * thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property value
-     * of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
-     * _.reject, and _.some.
-     *
-     * The guarded methods are:
-     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
-     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
-     * sample, some, sum, uniq, and words
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped array.
-     */
-    <T extends object, TResult>(iteratee: (value: T[keyof T]) => TResult): Map3x1<T, TResult>;
-    /**
-     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
-     * thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property value
-     * of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
-     * _.reject, and _.some.
-     *
-     * The guarded methods are:
-     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
-     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
-     * sample, some, sum, uniq, and words
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped array.
-     */
-    <T extends object, TResult>(iteratee: (value: T[keyof T]) => TResult, collection: T | null | undefined): TResult[];
-    /**
-     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
-     * thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property value
-     * of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
-     * _.reject, and _.some.
-     *
-     * The guarded methods are:
-     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
-     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
-     * sample, some, sum, uniq, and words
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped array.
-     */
-    <T, K extends keyof T>(iteratee: K): Map4x1<T, K>;
-    /**
-     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
-     * thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property value
-     * of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
-     * _.reject, and _.some.
-     *
-     * The guarded methods are:
-     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
-     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
-     * sample, some, sum, uniq, and words
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped array.
-     */
-    <T, K extends keyof T>(iteratee: K, collection: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): Array<T[K]>;
-    /**
-     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
-     * thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property value
-     * of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
-     * _.reject, and _.some.
-     *
-     * The guarded methods are:
-     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
-     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
-     * sample, some, sum, uniq, and words
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped array.
-     */
-    (iteratee: string): Map5x1;
-    /**
-     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
-     * thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property value
-     * of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
-     * _.reject, and _.some.
-     *
-     * The guarded methods are:
-     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
-     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
-     * sample, some, sum, uniq, and words
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped array.
-     */
-    <T>(iteratee: string, collection: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): any[];
-    /**
-     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
-     * thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property value
-     * of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
-     * _.reject, and _.some.
-     *
-     * The guarded methods are:
-     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
-     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
-     * sample, some, sum, uniq, and words
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped array.
-     */
-    (iteratee: object): Map6x1;
-    /**
-     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
-     * thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property value
-     * of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
-     * _.reject, and _.some.
-     *
-     * The guarded methods are:
-     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
-     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
-     * sample, some, sum, uniq, and words
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped array.
-     */
-    <T>(iteratee: object, collection: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): boolean[];
-}
-interface Map1x1<T, TResult> {
-    /**
-     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
-     * thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property value
-     * of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
-     * _.reject, and _.some.
-     *
-     * The guarded methods are:
-     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
-     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
-     * sample, some, sum, uniq, and words
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped array.
-     */
-    (): Map1x1<T, TResult>;
-    /**
-     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
-     * thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property value
-     * of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
-     * _.reject, and _.some.
-     *
-     * The guarded methods are:
-     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
-     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
-     * sample, some, sum, uniq, and words
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped array.
-     */
-    (collection: T[] | _.List<T> | null | undefined): TResult[];
-}
-interface Map3x1<T extends object, TResult> {
-    /**
-     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
-     * thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property value
-     * of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
-     * _.reject, and _.some.
-     *
-     * The guarded methods are:
-     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
-     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
-     * sample, some, sum, uniq, and words
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped array.
-     */
-    (): Map3x1<T, TResult>;
-    /**
-     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
-     * thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property value
-     * of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
-     * _.reject, and _.some.
-     *
-     * The guarded methods are:
-     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
-     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
-     * sample, some, sum, uniq, and words
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped array.
-     */
-    (collection: T | null | undefined): TResult[];
-}
-interface Map4x1<T, K extends keyof T> {
-    /**
-     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
-     * thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property value
-     * of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
-     * _.reject, and _.some.
-     *
-     * The guarded methods are:
-     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
-     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
-     * sample, some, sum, uniq, and words
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped array.
-     */
-    (): Map4x1<T, K>;
-    /**
-     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
-     * thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property value
-     * of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
-     * _.reject, and _.some.
-     *
-     * The guarded methods are:
-     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
-     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
-     * sample, some, sum, uniq, and words
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped array.
-     */
-    (collection: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): Array<T[K]>;
-}
-interface Map5x1 {
-    /**
-     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
-     * thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property value
-     * of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
-     * _.reject, and _.some.
-     *
-     * The guarded methods are:
-     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
-     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
-     * sample, some, sum, uniq, and words
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped array.
-     */
-    (): Map5x1;
-    /**
-     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
-     * thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property value
-     * of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
-     * _.reject, and _.some.
-     *
-     * The guarded methods are:
-     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
-     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
-     * sample, some, sum, uniq, and words
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped array.
-     */
-    <T>(collection: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): any[];
-}
-interface Map6x1 {
-    /**
-     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
-     * thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property value
-     * of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
-     * _.reject, and _.some.
-     *
-     * The guarded methods are:
-     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
-     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
-     * sample, some, sum, uniq, and words
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped array.
-     */
-    (): Map6x1;
-    /**
-     * Creates an array of values by running each element in collection through iteratee. The iteratee is bound to
-     * thisArg and invoked with three arguments: (value, index|key, collection).
-     *
-     * If a property name is provided for iteratee the created _.property style callback returns the property value
-     * of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for iteratee the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * _.Many lodash methods are guarded to work as iteratees for methods like _.every, _.filter, _.map, _.mapValues,
-     * _.reject, and _.some.
-     *
-     * The guarded methods are:
-     * ary, callback, chunk, clone, create, curry, curryRight, drop, dropRight, every, fill, flatten, invert, max,
-     * min, parseInt, slice, sortBy, take, takeRight, template, trim, trimLeft, trimRight, trunc, random, range,
-     * sample, some, sum, uniq, and words
-     *
-     * @param collection The collection to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new mapped array.
-     */
-    <T>(collection: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): boolean[];
-}
-
-declare const pluck: Map;
+import { pluck } from "../fp";
 export = pluck;
diff --git a/types/lodash/fp/prop.d.ts b/types/lodash/fp/prop.d.ts
index c7d097d000..f2061e7d61 100644
--- a/types/lodash/fp/prop.d.ts
+++ b/types/lodash/fp/prop.d.ts
@@ -1,207 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Get {
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (): Get;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey]): Get1x1<TObject, TKey>;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey], object: TObject): TObject[TKey];
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey], object: TObject | null | undefined): TObject[TKey] | undefined;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (path: number): Get3x1;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <T>(path: number, object: _.NumericDictionary<T>): T;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <T>(path: number, object: _.NumericDictionary<T> | null | undefined): T | undefined;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (path: _.PropertyPath): Get5x1;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (path: _.PropertyPath, object: null | undefined): undefined;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (path: _.PropertyPath, object: any): any;
-}
-interface Get1x1<TObject extends object, TKey extends keyof TObject> {
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (): Get1x1<TObject, TKey>;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (object: TObject): TObject[TKey];
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (object: TObject | null | undefined): TObject[TKey] | undefined;
-}
-interface Get3x1 {
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (): Get3x1;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <T>(object: _.NumericDictionary<T>): T;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <T>(object: _.NumericDictionary<T> | null | undefined): T | undefined;
-}
-interface Get5x1 {
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (): Get5x1;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (object: null | undefined): undefined;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (object: any): any;
-}
-
-declare const prop: Get;
+import { prop } from "../fp";
 export = prop;
diff --git a/types/lodash/fp/propEq.d.ts b/types/lodash/fp/propEq.d.ts
index 64175cc00a..5e3f4b413f 100644
--- a/types/lodash/fp/propEq.d.ts
+++ b/types/lodash/fp/propEq.d.ts
@@ -1,90 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface MatchesProperty {
-    /**
-     * Creates a function that compares the property value of path on a given object to value.
-     *
-     * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
-     * strings. Objects are compared by their own, not inherited, enumerable properties.
-     *
-     * @param path The path of the property to get.
-     * @param srcValue The value to match.
-     * @return Returns the new function.
-     */
-    (): MatchesProperty;
-    /**
-     * Creates a function that compares the property value of path on a given object to value.
-     *
-     * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
-     * strings. Objects are compared by their own, not inherited, enumerable properties.
-     *
-     * @param path The path of the property to get.
-     * @param srcValue The value to match.
-     * @return Returns the new function.
-     */
-    (path: _.PropertyPath): MatchesProperty1x1;
-    /**
-     * Creates a function that compares the property value of path on a given object to value.
-     *
-     * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
-     * strings. Objects are compared by their own, not inherited, enumerable properties.
-     *
-     * @param path The path of the property to get.
-     * @param srcValue The value to match.
-     * @return Returns the new function.
-     */
-    <T>(path: _.PropertyPath, srcValue: T): (value: any) => boolean;
-    /**
-     * Creates a function that compares the property value of path on a given object to value.
-     *
-     * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
-     * strings. Objects are compared by their own, not inherited, enumerable properties.
-     *
-     * @param path The path of the property to get.
-     * @param srcValue The value to match.
-     * @return Returns the new function.
-     */
-    <T, V>(path: _.PropertyPath, srcValue: T): (value: V) => boolean;
-}
-interface MatchesProperty1x1 {
-    /**
-     * Creates a function that compares the property value of path on a given object to value.
-     *
-     * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
-     * strings. Objects are compared by their own, not inherited, enumerable properties.
-     *
-     * @param path The path of the property to get.
-     * @param srcValue The value to match.
-     * @return Returns the new function.
-     */
-    (): MatchesProperty1x1;
-    /**
-     * Creates a function that compares the property value of path on a given object to value.
-     *
-     * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
-     * strings. Objects are compared by their own, not inherited, enumerable properties.
-     *
-     * @param path The path of the property to get.
-     * @param srcValue The value to match.
-     * @return Returns the new function.
-     */
-    <T>(srcValue: T): (value: any) => boolean;
-    /**
-     * Creates a function that compares the property value of path on a given object to value.
-     *
-     * Note: This method supports comparing arrays, booleans, Date objects, numbers, Object objects, regexes, and
-     * strings. Objects are compared by their own, not inherited, enumerable properties.
-     *
-     * @param path The path of the property to get.
-     * @param srcValue The value to match.
-     * @return Returns the new function.
-     */
-    <T, V>(srcValue: T): (value: V) => boolean;
-}
-
-declare const propEq: MatchesProperty;
+import { propEq } from "../fp";
 export = propEq;
diff --git a/types/lodash/fp/propOr.d.ts b/types/lodash/fp/propOr.d.ts
index cfe67fc51c..feabcf6e95 100644
--- a/types/lodash/fp/propOr.d.ts
+++ b/types/lodash/fp/propOr.d.ts
@@ -1,313 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Get {
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (): Get;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <TDefault>(defaultValue: TDefault): Get1x1<TDefault>;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <TObject extends object, TKey extends keyof TObject, TDefault>(defaultValue: TDefault, path: TKey | [TKey]): Get1x2<TObject, TKey, TDefault>;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <TObject extends object, TKey extends keyof TObject, TDefault>(defaultValue: TDefault, path: TKey | [TKey], object: TObject | null | undefined): TObject[TKey] | TDefault;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <TDefault>(defaultValue: TDefault, path: number): Get2x2<TDefault>;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <T, TDefault>(defaultValue: TDefault, path: number, object: _.NumericDictionary<T> | null | undefined): T | TDefault;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <TDefault>(defaultValue: TDefault, path: _.PropertyPath): Get3x2<TDefault>;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <TDefault>(defaultValue: TDefault, path: _.PropertyPath, object: null | undefined): TDefault;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (defaultValue: any): Get4x1;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (defaultValue: any, path: _.PropertyPath): Get4x2;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (defaultValue: any, path: _.PropertyPath, object: any): any;
-}
-interface Get1x1<TDefault> {
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (): Get1x1<TDefault>;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey]): Get1x2<TObject, TKey, TDefault>;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey], object: TObject | null | undefined): TObject[TKey] | TDefault;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (path: number): Get2x2<TDefault>;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <T>(path: number, object: _.NumericDictionary<T> | null | undefined): T | TDefault;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (path: _.PropertyPath): Get3x2<TDefault>;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (path: _.PropertyPath, object: null | undefined): TDefault;
-}
-interface Get1x2<TObject extends object, TKey extends keyof TObject, TDefault> {
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (): Get1x2<TObject, TKey, TDefault>;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (object: TObject | null | undefined): TObject[TKey] | TDefault;
-}
-interface Get2x2<TDefault> {
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (): Get2x2<TDefault>;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <T>(object: _.NumericDictionary<T> | null | undefined): T | TDefault;
-}
-interface Get3x2<TDefault> {
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (): Get3x2<TDefault>;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (object: null | undefined): TDefault;
-}
-interface Get4x1 {
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (): Get4x1;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (path: _.PropertyPath): Get4x2;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (path: _.PropertyPath, object: any): any;
-}
-interface Get4x2 {
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (): Get4x2;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (object: any): any;
-}
-
-declare const propOr: Get;
+import { propOr } from "../fp";
 export = propOr;
diff --git a/types/lodash/fp/property.d.ts b/types/lodash/fp/property.d.ts
index 47a4285028..aaa6c25711 100644
--- a/types/lodash/fp/property.d.ts
+++ b/types/lodash/fp/property.d.ts
@@ -1,207 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Get {
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (): Get;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey]): Get1x1<TObject, TKey>;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey], object: TObject): TObject[TKey];
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey], object: TObject | null | undefined): TObject[TKey] | undefined;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (path: number): Get3x1;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <T>(path: number, object: _.NumericDictionary<T>): T;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <T>(path: number, object: _.NumericDictionary<T> | null | undefined): T | undefined;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (path: _.PropertyPath): Get5x1;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (path: _.PropertyPath, object: null | undefined): undefined;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (path: _.PropertyPath, object: any): any;
-}
-interface Get1x1<TObject extends object, TKey extends keyof TObject> {
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (): Get1x1<TObject, TKey>;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (object: TObject): TObject[TKey];
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (object: TObject | null | undefined): TObject[TKey] | undefined;
-}
-interface Get3x1 {
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (): Get3x1;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <T>(object: _.NumericDictionary<T>): T;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <T>(object: _.NumericDictionary<T> | null | undefined): T | undefined;
-}
-interface Get5x1 {
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (): Get5x1;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (object: null | undefined): undefined;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (object: any): any;
-}
-
-declare const property: Get;
+import { property } from "../fp";
 export = property;
diff --git a/types/lodash/fp/propertyOf.d.ts b/types/lodash/fp/propertyOf.d.ts
index 66e2afdaf8..a4d55130c6 100644
--- a/types/lodash/fp/propertyOf.d.ts
+++ b/types/lodash/fp/propertyOf.d.ts
@@ -1,207 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Get {
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (): Get;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey]): Get1x1<TObject, TKey>;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey], object: TObject): TObject[TKey];
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey], object: TObject | null | undefined): TObject[TKey] | undefined;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (path: number): Get3x1;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <T>(path: number, object: _.NumericDictionary<T>): T;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <T>(path: number, object: _.NumericDictionary<T> | null | undefined): T | undefined;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (path: _.PropertyPath): Get5x1;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (path: _.PropertyPath, object: null | undefined): undefined;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (path: _.PropertyPath, object: any): any;
-}
-interface Get1x1<TObject extends object, TKey extends keyof TObject> {
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (): Get1x1<TObject, TKey>;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (object: TObject): TObject[TKey];
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (object: TObject | null | undefined): TObject[TKey] | undefined;
-}
-interface Get3x1 {
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (): Get3x1;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <T>(object: _.NumericDictionary<T>): T;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <T>(object: _.NumericDictionary<T> | null | undefined): T | undefined;
-}
-interface Get5x1 {
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (): Get5x1;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (object: null | undefined): undefined;
-    /**
-     * Gets the property value at path of object. If the resolved value is undefined the defaultValue is used
-     * in its place.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to get.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (object: any): any;
-}
-
-declare const propertyOf: Get;
+import { propertyOf } from "../fp";
 export = propertyOf;
diff --git a/types/lodash/fp/props.d.ts b/types/lodash/fp/props.d.ts
index 2b22346229..46addba7ad 100644
--- a/types/lodash/fp/props.d.ts
+++ b/types/lodash/fp/props.d.ts
@@ -1,96 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface At {
-    /**
-     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
-     * specified as individual arguments or as arrays of keys.
-     *
-     * @param object The object to iterate over.
-     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
-     * @return Returns the new array of picked elements.
-     */
-    (): At;
-    /**
-     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
-     * specified as individual arguments or as arrays of keys.
-     *
-     * @param object The object to iterate over.
-     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
-     * @return Returns the new array of picked elements.
-     */
-    (props: _.PropertyPath): At1x1;
-    /**
-     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
-     * specified as individual arguments or as arrays of keys.
-     *
-     * @param object The object to iterate over.
-     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
-     * @return Returns the new array of picked elements.
-     */
-    <T>(props: _.PropertyPath, object: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): T[];
-    /**
-     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
-     * specified as individual arguments or as arrays of keys.
-     *
-     * @param object The object to iterate over.
-     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
-     * @return Returns the new array of picked elements.
-     */
-    <T extends object>(props: _.Many<keyof T>): At2x1<T>;
-    /**
-     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
-     * specified as individual arguments or as arrays of keys.
-     *
-     * @param object The object to iterate over.
-     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
-     * @return Returns the new array of picked elements.
-     */
-    <T extends object>(props: _.Many<keyof T>, object: T | null | undefined): Array<T[keyof T]>;
-}
-interface At1x1 {
-    /**
-     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
-     * specified as individual arguments or as arrays of keys.
-     *
-     * @param object The object to iterate over.
-     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
-     * @return Returns the new array of picked elements.
-     */
-    (): At1x1;
-    /**
-     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
-     * specified as individual arguments or as arrays of keys.
-     *
-     * @param object The object to iterate over.
-     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
-     * @return Returns the new array of picked elements.
-     */
-    <T>(object: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): T[];
-}
-interface At2x1<T extends object> {
-    /**
-     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
-     * specified as individual arguments or as arrays of keys.
-     *
-     * @param object The object to iterate over.
-     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
-     * @return Returns the new array of picked elements.
-     */
-    (): At2x1<T>;
-    /**
-     * Creates an array of elements corresponding to the given keys, or indexes, of collection. Keys may be
-     * specified as individual arguments or as arrays of keys.
-     *
-     * @param object The object to iterate over.
-     * @param props The property names or indexes of elements to pick, specified individually or in arrays.
-     * @return Returns the new array of picked elements.
-     */
-    (object: T | null | undefined): Array<T[keyof T]>;
-}
-
-declare const props: At;
+import { props } from "../fp";
 export = props;
diff --git a/types/lodash/fp/pull.d.ts b/types/lodash/fp/pull.d.ts
index 3ae9a76b4c..801cf33771 100644
--- a/types/lodash/fp/pull.d.ts
+++ b/types/lodash/fp/pull.d.ts
@@ -1,83 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Pull {
-    /**
-     * Removes all provided values from array using SameValueZero for equality comparisons.
-     *
-     * Note: Unlike _.without, this method mutates array.
-     *
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @return Returns array.
-     */
-    (): Pull;
-    /**
-     * Removes all provided values from array using SameValueZero for equality comparisons.
-     *
-     * Note: Unlike _.without, this method mutates array.
-     *
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @return Returns array.
-     */
-    <T>(values: T): Pull1x1<T>;
-    /**
-     * Removes all provided values from array using SameValueZero for equality comparisons.
-     *
-     * Note: Unlike _.without, this method mutates array.
-     *
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @return Returns array.
-     */
-    <T>(values: T, array: ReadonlyArray<T>): T[];
-    /**
-     * Removes all provided values from array using SameValueZero for equality comparisons.
-     *
-     * Note: Unlike _.without, this method mutates array.
-     *
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @return Returns array.
-     */
-    <T>(values: T, array: _.List<T>): _.List<T>;
-}
-interface Pull1x1<T> {
-    /**
-     * Removes all provided values from array using SameValueZero for equality comparisons.
-     *
-     * Note: Unlike _.without, this method mutates array.
-     *
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @return Returns array.
-     */
-    (): Pull1x1<T>;
-    /**
-     * Removes all provided values from array using SameValueZero for equality comparisons.
-     *
-     * Note: Unlike _.without, this method mutates array.
-     *
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @return Returns array.
-     */
-    (array: ReadonlyArray<T>): T[];
-    /**
-     * Removes all provided values from array using SameValueZero for equality comparisons.
-     *
-     * Note: Unlike _.without, this method mutates array.
-     *
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @return Returns array.
-     */
-    (array: _.List<T>): _.List<T>;
-}
-
-declare const pull: Pull;
+import { pull } from "../fp";
 export = pull;
diff --git a/types/lodash/fp/pullAll.d.ts b/types/lodash/fp/pullAll.d.ts
index 6df0d3fbe6..042fe89ac1 100644
--- a/types/lodash/fp/pullAll.d.ts
+++ b/types/lodash/fp/pullAll.d.ts
@@ -1,139 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface PullAll {
-    /**
-     * This method is like `_.pull` except that it accepts an array of values to remove.
-     *
-     * **Note:** Unlike `_.difference`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [1, 2, 3, 1, 2, 3];
-     *
-     * _.pull(array, [2, 3]);
-     * console.log(array);
-     * // => [1, 1]
-     */
-    (): PullAll;
-    /**
-     * This method is like `_.pull` except that it accepts an array of values to remove.
-     *
-     * **Note:** Unlike `_.difference`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [1, 2, 3, 1, 2, 3];
-     *
-     * _.pull(array, [2, 3]);
-     * console.log(array);
-     * // => [1, 1]
-     */
-    <T>(values: _.List<T>): PullAll1x1<T>;
-    /**
-     * This method is like `_.pull` except that it accepts an array of values to remove.
-     *
-     * **Note:** Unlike `_.difference`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [1, 2, 3, 1, 2, 3];
-     *
-     * _.pull(array, [2, 3]);
-     * console.log(array);
-     * // => [1, 1]
-     */
-    <T>(values: _.List<T>, array: ReadonlyArray<T>): T[];
-    /**
-     * This method is like `_.pull` except that it accepts an array of values to remove.
-     *
-     * **Note:** Unlike `_.difference`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [1, 2, 3, 1, 2, 3];
-     *
-     * _.pull(array, [2, 3]);
-     * console.log(array);
-     * // => [1, 1]
-     */
-    <T>(values: _.List<T>, array: _.List<T>): _.List<T>;
-}
-interface PullAll1x1<T> {
-    /**
-     * This method is like `_.pull` except that it accepts an array of values to remove.
-     *
-     * **Note:** Unlike `_.difference`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [1, 2, 3, 1, 2, 3];
-     *
-     * _.pull(array, [2, 3]);
-     * console.log(array);
-     * // => [1, 1]
-     */
-    (): PullAll1x1<T>;
-    /**
-     * This method is like `_.pull` except that it accepts an array of values to remove.
-     *
-     * **Note:** Unlike `_.difference`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [1, 2, 3, 1, 2, 3];
-     *
-     * _.pull(array, [2, 3]);
-     * console.log(array);
-     * // => [1, 1]
-     */
-    (array: ReadonlyArray<T>): T[];
-    /**
-     * This method is like `_.pull` except that it accepts an array of values to remove.
-     *
-     * **Note:** Unlike `_.difference`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [1, 2, 3, 1, 2, 3];
-     *
-     * _.pull(array, [2, 3]);
-     * console.log(array);
-     * // => [1, 1]
-     */
-    (array: _.List<T>): _.List<T>;
-}
-
-declare const pullAll: PullAll;
+import { pullAll } from "../fp";
 export = pullAll;
diff --git a/types/lodash/fp/pullAllBy.d.ts b/types/lodash/fp/pullAllBy.d.ts
index 05a528de2d..5e5de1fc07 100644
--- a/types/lodash/fp/pullAllBy.d.ts
+++ b/types/lodash/fp/pullAllBy.d.ts
@@ -1,502 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface PullAllBy {
-    /**
-     * This method is like `_.pullAll` except that it accepts `iteratee` which is
-     * invoked for each element of `array` and `values` to to generate the criterion
-     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
-     *
-     * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
-     * console.log(array);
-     * // => [{ 'x': 2 }]
-     */
-    (): PullAllBy;
-    /**
-     * This method is like `_.pullAll` except that it accepts `iteratee` which is
-     * invoked for each element of `array` and `values` to to generate the criterion
-     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
-     *
-     * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
-     * console.log(array);
-     * // => [{ 'x': 2 }]
-     */
-    <T>(iteratee: _.ValueIteratee<T>): PullAllBy1x1<T>;
-    /**
-     * This method is like `_.pullAll` except that it accepts `iteratee` which is
-     * invoked for each element of `array` and `values` to to generate the criterion
-     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
-     *
-     * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
-     * console.log(array);
-     * // => [{ 'x': 2 }]
-     */
-    <T>(iteratee: _.ValueIteratee<T>, values: _.List<T>): PullAllBy1x2<T>;
-    /**
-     * This method is like `_.pullAll` except that it accepts `iteratee` which is
-     * invoked for each element of `array` and `values` to to generate the criterion
-     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
-     *
-     * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
-     * console.log(array);
-     * // => [{ 'x': 2 }]
-     */
-    <T>(iteratee: _.ValueIteratee<T>, values: _.List<T>, array: ReadonlyArray<T>): T[];
-    /**
-     * This method is like `_.pullAll` except that it accepts `iteratee` which is
-     * invoked for each element of `array` and `values` to to generate the criterion
-     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
-     *
-     * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
-     * console.log(array);
-     * // => [{ 'x': 2 }]
-     */
-    <T>(iteratee: _.ValueIteratee<T>, values: _.List<T>, array: _.List<T>): _.List<T>;
-    /**
-     * This method is like `_.pullAll` except that it accepts `iteratee` which is
-     * invoked for each element of `array` and `values` to to generate the criterion
-     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
-     *
-     * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
-     * console.log(array);
-     * // => [{ 'x': 2 }]
-     */
-    <T1, T2>(iteratee: _.ValueIteratee<T1 | T2>): PullAllBy3x1<T1, T2>;
-    /**
-     * This method is like `_.pullAll` except that it accepts `iteratee` which is
-     * invoked for each element of `array` and `values` to to generate the criterion
-     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
-     *
-     * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
-     * console.log(array);
-     * // => [{ 'x': 2 }]
-     */
-    <T1, T2>(iteratee: _.ValueIteratee<T1 | T2>, values: _.List<T2>): PullAllBy3x2<T1>;
-    /**
-     * This method is like `_.pullAll` except that it accepts `iteratee` which is
-     * invoked for each element of `array` and `values` to to generate the criterion
-     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
-     *
-     * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
-     * console.log(array);
-     * // => [{ 'x': 2 }]
-     */
-    <T1, T2>(iteratee: _.ValueIteratee<T1 | T2>, values: _.List<T2>, array: ReadonlyArray<T1>): T1[];
-    /**
-     * This method is like `_.pullAll` except that it accepts `iteratee` which is
-     * invoked for each element of `array` and `values` to to generate the criterion
-     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
-     *
-     * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
-     * console.log(array);
-     * // => [{ 'x': 2 }]
-     */
-    <T1, T2>(iteratee: _.ValueIteratee<T1 | T2>, values: _.List<T2>, array: _.List<T1>): _.List<T1>;
-}
-interface PullAllBy1x1<T> {
-    /**
-     * This method is like `_.pullAll` except that it accepts `iteratee` which is
-     * invoked for each element of `array` and `values` to to generate the criterion
-     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
-     *
-     * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
-     * console.log(array);
-     * // => [{ 'x': 2 }]
-     */
-    (): PullAllBy1x1<T>;
-    /**
-     * This method is like `_.pullAll` except that it accepts `iteratee` which is
-     * invoked for each element of `array` and `values` to to generate the criterion
-     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
-     *
-     * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
-     * console.log(array);
-     * // => [{ 'x': 2 }]
-     */
-    (values: _.List<T>): PullAllBy1x2<T>;
-    /**
-     * This method is like `_.pullAll` except that it accepts `iteratee` which is
-     * invoked for each element of `array` and `values` to to generate the criterion
-     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
-     *
-     * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
-     * console.log(array);
-     * // => [{ 'x': 2 }]
-     */
-    (values: _.List<T>, array: ReadonlyArray<T>): T[];
-    /**
-     * This method is like `_.pullAll` except that it accepts `iteratee` which is
-     * invoked for each element of `array` and `values` to to generate the criterion
-     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
-     *
-     * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
-     * console.log(array);
-     * // => [{ 'x': 2 }]
-     */
-    (values: _.List<T>, array: _.List<T>): _.List<T>;
-}
-interface PullAllBy1x2<T> {
-    /**
-     * This method is like `_.pullAll` except that it accepts `iteratee` which is
-     * invoked for each element of `array` and `values` to to generate the criterion
-     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
-     *
-     * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
-     * console.log(array);
-     * // => [{ 'x': 2 }]
-     */
-    (): PullAllBy1x2<T>;
-    /**
-     * This method is like `_.pullAll` except that it accepts `iteratee` which is
-     * invoked for each element of `array` and `values` to to generate the criterion
-     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
-     *
-     * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
-     * console.log(array);
-     * // => [{ 'x': 2 }]
-     */
-    (array: ReadonlyArray<T>): T[];
-    /**
-     * This method is like `_.pullAll` except that it accepts `iteratee` which is
-     * invoked for each element of `array` and `values` to to generate the criterion
-     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
-     *
-     * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
-     * console.log(array);
-     * // => [{ 'x': 2 }]
-     */
-    (array: _.List<T>): _.List<T>;
-}
-interface PullAllBy3x1<T1, T2> {
-    /**
-     * This method is like `_.pullAll` except that it accepts `iteratee` which is
-     * invoked for each element of `array` and `values` to to generate the criterion
-     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
-     *
-     * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
-     * console.log(array);
-     * // => [{ 'x': 2 }]
-     */
-    (): PullAllBy3x1<T1, T2>;
-    /**
-     * This method is like `_.pullAll` except that it accepts `iteratee` which is
-     * invoked for each element of `array` and `values` to to generate the criterion
-     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
-     *
-     * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
-     * console.log(array);
-     * // => [{ 'x': 2 }]
-     */
-    (values: _.List<T2>): PullAllBy3x2<T1>;
-    /**
-     * This method is like `_.pullAll` except that it accepts `iteratee` which is
-     * invoked for each element of `array` and `values` to to generate the criterion
-     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
-     *
-     * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
-     * console.log(array);
-     * // => [{ 'x': 2 }]
-     */
-    (values: _.List<T2>, array: ReadonlyArray<T1>): T1[];
-    /**
-     * This method is like `_.pullAll` except that it accepts `iteratee` which is
-     * invoked for each element of `array` and `values` to to generate the criterion
-     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
-     *
-     * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
-     * console.log(array);
-     * // => [{ 'x': 2 }]
-     */
-    (values: _.List<T2>, array: _.List<T1>): _.List<T1>;
-}
-interface PullAllBy3x2<T1> {
-    /**
-     * This method is like `_.pullAll` except that it accepts `iteratee` which is
-     * invoked for each element of `array` and `values` to to generate the criterion
-     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
-     *
-     * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
-     * console.log(array);
-     * // => [{ 'x': 2 }]
-     */
-    (): PullAllBy3x2<T1>;
-    /**
-     * This method is like `_.pullAll` except that it accepts `iteratee` which is
-     * invoked for each element of `array` and `values` to to generate the criterion
-     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
-     *
-     * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
-     * console.log(array);
-     * // => [{ 'x': 2 }]
-     */
-    <T2>(array: ReadonlyArray<T1>): T1[];
-    /**
-     * This method is like `_.pullAll` except that it accepts `iteratee` which is
-     * invoked for each element of `array` and `values` to to generate the criterion
-     * by which uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * **Note:** Unlike `_.differenceBy`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [{ 'x': 1 }, { 'x': 2 }, { 'x': 3 }, { 'x': 1 }];
-     *
-     * _.pullAllBy(array, [{ 'x': 1 }, { 'x': 3 }], 'x');
-     * console.log(array);
-     * // => [{ 'x': 2 }]
-     */
-    <T2>(array: _.List<T1>): _.List<T1>;
-}
-
-declare const pullAllBy: PullAllBy;
+import { pullAllBy } from "../fp";
 export = pullAllBy;
diff --git a/types/lodash/fp/pullAllWith.d.ts b/types/lodash/fp/pullAllWith.d.ts
index 566eb5ae84..0c448bf8c8 100644
--- a/types/lodash/fp/pullAllWith.d.ts
+++ b/types/lodash/fp/pullAllWith.d.ts
@@ -1,502 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface PullAllWith {
-    /**
-     * This method is like `_.pullAll` except that it accepts `comparator` which is
-     * invoked to compare elements of array to values. The comparator is invoked with
-     * two arguments: (arrVal, othVal).
-     *
-     * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
-     *
-     * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
-     * console.log(array);
-     * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
-     */
-    (): PullAllWith;
-    /**
-     * This method is like `_.pullAll` except that it accepts `comparator` which is
-     * invoked to compare elements of array to values. The comparator is invoked with
-     * two arguments: (arrVal, othVal).
-     *
-     * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
-     *
-     * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
-     * console.log(array);
-     * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
-     */
-    <T>(comparator: _.Comparator<T>): PullAllWith1x1<T>;
-    /**
-     * This method is like `_.pullAll` except that it accepts `comparator` which is
-     * invoked to compare elements of array to values. The comparator is invoked with
-     * two arguments: (arrVal, othVal).
-     *
-     * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
-     *
-     * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
-     * console.log(array);
-     * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
-     */
-    <T>(comparator: _.Comparator<T>, values: _.List<T>): PullAllWith1x2<T>;
-    /**
-     * This method is like `_.pullAll` except that it accepts `comparator` which is
-     * invoked to compare elements of array to values. The comparator is invoked with
-     * two arguments: (arrVal, othVal).
-     *
-     * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
-     *
-     * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
-     * console.log(array);
-     * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
-     */
-    <T>(comparator: _.Comparator<T>, values: _.List<T>, array: ReadonlyArray<T>): T[];
-    /**
-     * This method is like `_.pullAll` except that it accepts `comparator` which is
-     * invoked to compare elements of array to values. The comparator is invoked with
-     * two arguments: (arrVal, othVal).
-     *
-     * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
-     *
-     * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
-     * console.log(array);
-     * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
-     */
-    <T>(comparator: _.Comparator<T>, values: _.List<T>, array: _.List<T>): _.List<T>;
-    /**
-     * This method is like `_.pullAll` except that it accepts `comparator` which is
-     * invoked to compare elements of array to values. The comparator is invoked with
-     * two arguments: (arrVal, othVal).
-     *
-     * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
-     *
-     * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
-     * console.log(array);
-     * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
-     */
-    <T1, T2>(comparator: _.Comparator2<T1, T2>): PullAllWith3x1<T1, T2>;
-    /**
-     * This method is like `_.pullAll` except that it accepts `comparator` which is
-     * invoked to compare elements of array to values. The comparator is invoked with
-     * two arguments: (arrVal, othVal).
-     *
-     * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
-     *
-     * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
-     * console.log(array);
-     * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
-     */
-    <T1, T2>(comparator: _.Comparator2<T1, T2>, values: _.List<T2>): PullAllWith3x2<T1>;
-    /**
-     * This method is like `_.pullAll` except that it accepts `comparator` which is
-     * invoked to compare elements of array to values. The comparator is invoked with
-     * two arguments: (arrVal, othVal).
-     *
-     * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
-     *
-     * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
-     * console.log(array);
-     * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
-     */
-    <T1, T2>(comparator: _.Comparator2<T1, T2>, values: _.List<T2>, array: ReadonlyArray<T1>): T1[];
-    /**
-     * This method is like `_.pullAll` except that it accepts `comparator` which is
-     * invoked to compare elements of array to values. The comparator is invoked with
-     * two arguments: (arrVal, othVal).
-     *
-     * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
-     *
-     * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
-     * console.log(array);
-     * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
-     */
-    <T1, T2>(comparator: _.Comparator2<T1, T2>, values: _.List<T2>, array: _.List<T1>): _.List<T1>;
-}
-interface PullAllWith1x1<T> {
-    /**
-     * This method is like `_.pullAll` except that it accepts `comparator` which is
-     * invoked to compare elements of array to values. The comparator is invoked with
-     * two arguments: (arrVal, othVal).
-     *
-     * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
-     *
-     * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
-     * console.log(array);
-     * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
-     */
-    (): PullAllWith1x1<T>;
-    /**
-     * This method is like `_.pullAll` except that it accepts `comparator` which is
-     * invoked to compare elements of array to values. The comparator is invoked with
-     * two arguments: (arrVal, othVal).
-     *
-     * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
-     *
-     * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
-     * console.log(array);
-     * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
-     */
-    (values: _.List<T>): PullAllWith1x2<T>;
-    /**
-     * This method is like `_.pullAll` except that it accepts `comparator` which is
-     * invoked to compare elements of array to values. The comparator is invoked with
-     * two arguments: (arrVal, othVal).
-     *
-     * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
-     *
-     * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
-     * console.log(array);
-     * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
-     */
-    (values: _.List<T>, array: ReadonlyArray<T>): T[];
-    /**
-     * This method is like `_.pullAll` except that it accepts `comparator` which is
-     * invoked to compare elements of array to values. The comparator is invoked with
-     * two arguments: (arrVal, othVal).
-     *
-     * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
-     *
-     * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
-     * console.log(array);
-     * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
-     */
-    (values: _.List<T>, array: _.List<T>): _.List<T>;
-}
-interface PullAllWith1x2<T> {
-    /**
-     * This method is like `_.pullAll` except that it accepts `comparator` which is
-     * invoked to compare elements of array to values. The comparator is invoked with
-     * two arguments: (arrVal, othVal).
-     *
-     * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
-     *
-     * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
-     * console.log(array);
-     * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
-     */
-    (): PullAllWith1x2<T>;
-    /**
-     * This method is like `_.pullAll` except that it accepts `comparator` which is
-     * invoked to compare elements of array to values. The comparator is invoked with
-     * two arguments: (arrVal, othVal).
-     *
-     * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
-     *
-     * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
-     * console.log(array);
-     * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
-     */
-    (array: ReadonlyArray<T>): T[];
-    /**
-     * This method is like `_.pullAll` except that it accepts `comparator` which is
-     * invoked to compare elements of array to values. The comparator is invoked with
-     * two arguments: (arrVal, othVal).
-     *
-     * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
-     *
-     * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
-     * console.log(array);
-     * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
-     */
-    (array: _.List<T>): _.List<T>;
-}
-interface PullAllWith3x1<T1, T2> {
-    /**
-     * This method is like `_.pullAll` except that it accepts `comparator` which is
-     * invoked to compare elements of array to values. The comparator is invoked with
-     * two arguments: (arrVal, othVal).
-     *
-     * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
-     *
-     * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
-     * console.log(array);
-     * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
-     */
-    (): PullAllWith3x1<T1, T2>;
-    /**
-     * This method is like `_.pullAll` except that it accepts `comparator` which is
-     * invoked to compare elements of array to values. The comparator is invoked with
-     * two arguments: (arrVal, othVal).
-     *
-     * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
-     *
-     * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
-     * console.log(array);
-     * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
-     */
-    (values: _.List<T2>): PullAllWith3x2<T1>;
-    /**
-     * This method is like `_.pullAll` except that it accepts `comparator` which is
-     * invoked to compare elements of array to values. The comparator is invoked with
-     * two arguments: (arrVal, othVal).
-     *
-     * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
-     *
-     * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
-     * console.log(array);
-     * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
-     */
-    (values: _.List<T2>, array: ReadonlyArray<T1>): T1[];
-    /**
-     * This method is like `_.pullAll` except that it accepts `comparator` which is
-     * invoked to compare elements of array to values. The comparator is invoked with
-     * two arguments: (arrVal, othVal).
-     *
-     * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
-     *
-     * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
-     * console.log(array);
-     * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
-     */
-    (values: _.List<T2>, array: _.List<T1>): _.List<T1>;
-}
-interface PullAllWith3x2<T1> {
-    /**
-     * This method is like `_.pullAll` except that it accepts `comparator` which is
-     * invoked to compare elements of array to values. The comparator is invoked with
-     * two arguments: (arrVal, othVal).
-     *
-     * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
-     *
-     * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
-     * console.log(array);
-     * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
-     */
-    (): PullAllWith3x2<T1>;
-    /**
-     * This method is like `_.pullAll` except that it accepts `comparator` which is
-     * invoked to compare elements of array to values. The comparator is invoked with
-     * two arguments: (arrVal, othVal).
-     *
-     * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
-     *
-     * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
-     * console.log(array);
-     * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
-     */
-    <T2>(array: ReadonlyArray<T1>): T1[];
-    /**
-     * This method is like `_.pullAll` except that it accepts `comparator` which is
-     * invoked to compare elements of array to values. The comparator is invoked with
-     * two arguments: (arrVal, othVal).
-     *
-     * **Note:** Unlike `_.differenceWith`, this method mutates `array`.
-     *
-     * @category Array
-     * @param array The array to modify.
-     * @param values The values to remove.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [{ 'x': 1, 'y': 2 }, { 'x': 3, 'y': 4 }, { 'x': 5, 'y': 6 }];
-     *
-     * _.pullAllWith(array, [{ 'x': 3, 'y': 4 }], _.isEqual);
-     * console.log(array);
-     * // => [{ 'x': 1, 'y': 2 }, { 'x': 5, 'y': 6 }]
-     */
-    <T2>(array: _.List<T1>): _.List<T1>;
-}
-
-declare const pullAllWith: PullAllWith;
+import { pullAllWith } from "../fp";
 export = pullAllWith;
diff --git a/types/lodash/fp/pullAt.d.ts b/types/lodash/fp/pullAt.d.ts
index 61d6fd04f0..4bdffd993f 100644
--- a/types/lodash/fp/pullAt.d.ts
+++ b/types/lodash/fp/pullAt.d.ts
@@ -1,90 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface PullAt {
-    /**
-     * Removes elements from array corresponding to the given indexes and returns an array of the removed elements.
-     * Indexes may be specified as an array of indexes or as individual arguments.
-     *
-     * Note: Unlike _.at, this method mutates array.
-     *
-     * @param array The array to modify.
-     * @param indexes The indexes of elements to remove, specified as individual indexes or arrays of indexes.
-     * @return Returns the new array of removed elements.
-     */
-    (): PullAt;
-    /**
-     * Removes elements from array corresponding to the given indexes and returns an array of the removed elements.
-     * Indexes may be specified as an array of indexes or as individual arguments.
-     *
-     * Note: Unlike _.at, this method mutates array.
-     *
-     * @param array The array to modify.
-     * @param indexes The indexes of elements to remove, specified as individual indexes or arrays of indexes.
-     * @return Returns the new array of removed elements.
-     */
-    (indexes: _.Many<number>): PullAt1x1;
-    /**
-     * Removes elements from array corresponding to the given indexes and returns an array of the removed elements.
-     * Indexes may be specified as an array of indexes or as individual arguments.
-     *
-     * Note: Unlike _.at, this method mutates array.
-     *
-     * @param array The array to modify.
-     * @param indexes The indexes of elements to remove, specified as individual indexes or arrays of indexes.
-     * @return Returns the new array of removed elements.
-     */
-    <T>(indexes: _.Many<number>, array: ReadonlyArray<T>): T[];
-    /**
-     * Removes elements from array corresponding to the given indexes and returns an array of the removed elements.
-     * Indexes may be specified as an array of indexes or as individual arguments.
-     *
-     * Note: Unlike _.at, this method mutates array.
-     *
-     * @param array The array to modify.
-     * @param indexes The indexes of elements to remove, specified as individual indexes or arrays of indexes.
-     * @return Returns the new array of removed elements.
-     */
-    <T>(indexes: _.Many<number>, array: _.List<T>): _.List<T>;
-}
-interface PullAt1x1 {
-    /**
-     * Removes elements from array corresponding to the given indexes and returns an array of the removed elements.
-     * Indexes may be specified as an array of indexes or as individual arguments.
-     *
-     * Note: Unlike _.at, this method mutates array.
-     *
-     * @param array The array to modify.
-     * @param indexes The indexes of elements to remove, specified as individual indexes or arrays of indexes.
-     * @return Returns the new array of removed elements.
-     */
-    (): PullAt1x1;
-    /**
-     * Removes elements from array corresponding to the given indexes and returns an array of the removed elements.
-     * Indexes may be specified as an array of indexes or as individual arguments.
-     *
-     * Note: Unlike _.at, this method mutates array.
-     *
-     * @param array The array to modify.
-     * @param indexes The indexes of elements to remove, specified as individual indexes or arrays of indexes.
-     * @return Returns the new array of removed elements.
-     */
-    <T>(array: ReadonlyArray<T>): T[];
-    /**
-     * Removes elements from array corresponding to the given indexes and returns an array of the removed elements.
-     * Indexes may be specified as an array of indexes or as individual arguments.
-     *
-     * Note: Unlike _.at, this method mutates array.
-     *
-     * @param array The array to modify.
-     * @param indexes The indexes of elements to remove, specified as individual indexes or arrays of indexes.
-     * @return Returns the new array of removed elements.
-     */
-    <T>(array: _.List<T>): _.List<T>;
-}
-
-declare const pullAt: PullAt;
+import { pullAt } from "../fp";
 export = pullAt;
diff --git a/types/lodash/fp/random.d.ts b/types/lodash/fp/random.d.ts
index 075b54b2e4..a69555ca16 100644
--- a/types/lodash/fp/random.d.ts
+++ b/types/lodash/fp/random.d.ts
@@ -1,66 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface Random {
-    /**
-     * Produces a random number between min and max (inclusive). If only one argument is provided a number between
-     * 0 and the given number is returned. If floating is true, or either min or max are floats, a floating-point
-     * number is returned instead of an integer.
-     *
-     * @param min The minimum possible value.
-     * @param max The maximum possible value.
-     * @param floating Specify returning a floating-point number.
-     * @return Returns the random number.
-     */
-    (): Random;
-    /**
-     * Produces a random number between min and max (inclusive). If only one argument is provided a number between
-     * 0 and the given number is returned. If floating is true, or either min or max are floats, a floating-point
-     * number is returned instead of an integer.
-     *
-     * @param min The minimum possible value.
-     * @param max The maximum possible value.
-     * @param floating Specify returning a floating-point number.
-     * @return Returns the random number.
-     */
-    (maxOrMin: number): Random1x1;
-    /**
-     * Produces a random number between min and max (inclusive). If only one argument is provided a number between
-     * 0 and the given number is returned. If floating is true, or either min or max are floats, a floating-point
-     * number is returned instead of an integer.
-     *
-     * @param min The minimum possible value.
-     * @param max The maximum possible value.
-     * @param floating Specify returning a floating-point number.
-     * @return Returns the random number.
-     */
-    (maxOrMin: number, floatingOrMax: boolean | number): number;
-}
-interface Random1x1 {
-    /**
-     * Produces a random number between min and max (inclusive). If only one argument is provided a number between
-     * 0 and the given number is returned. If floating is true, or either min or max are floats, a floating-point
-     * number is returned instead of an integer.
-     *
-     * @param min The minimum possible value.
-     * @param max The maximum possible value.
-     * @param floating Specify returning a floating-point number.
-     * @return Returns the random number.
-     */
-    (): Random1x1;
-    /**
-     * Produces a random number between min and max (inclusive). If only one argument is provided a number between
-     * 0 and the given number is returned. If floating is true, or either min or max are floats, a floating-point
-     * number is returned instead of an integer.
-     *
-     * @param min The minimum possible value.
-     * @param max The maximum possible value.
-     * @param floating Specify returning a floating-point number.
-     * @return Returns the random number.
-     */
-    (floatingOrMax: boolean | number): number;
-}
-
-declare const random: Random;
+import { random } from "../fp";
 export = random;
diff --git a/types/lodash/fp/range.d.ts b/types/lodash/fp/range.d.ts
index 7526d40e03..ace50ce46b 100644
--- a/types/lodash/fp/range.d.ts
+++ b/types/lodash/fp/range.d.ts
@@ -1,66 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface Range {
-    /**
-     * Creates an array of numbers (positive and/or negative) progressing from start up to, but not including, end.
-     * If end is not specified it’s set to start with start then set to 0. If end is less than start a zero-length
-     * range is created unless a negative step is specified.
-     *
-     * @param start The start of the range.
-     * @param end The end of the range.
-     * @param step The value to increment or decrement by.
-     * @return Returns a new range array.
-     */
-    (): Range;
-    /**
-     * Creates an array of numbers (positive and/or negative) progressing from start up to, but not including, end.
-     * If end is not specified it’s set to start with start then set to 0. If end is less than start a zero-length
-     * range is created unless a negative step is specified.
-     *
-     * @param start The start of the range.
-     * @param end The end of the range.
-     * @param step The value to increment or decrement by.
-     * @return Returns a new range array.
-     */
-    (start: number): Range1x1;
-    /**
-     * Creates an array of numbers (positive and/or negative) progressing from start up to, but not including, end.
-     * If end is not specified it’s set to start with start then set to 0. If end is less than start a zero-length
-     * range is created unless a negative step is specified.
-     *
-     * @param start The start of the range.
-     * @param end The end of the range.
-     * @param step The value to increment or decrement by.
-     * @return Returns a new range array.
-     */
-    (start: number, end: number): number[];
-}
-interface Range1x1 {
-    /**
-     * Creates an array of numbers (positive and/or negative) progressing from start up to, but not including, end.
-     * If end is not specified it’s set to start with start then set to 0. If end is less than start a zero-length
-     * range is created unless a negative step is specified.
-     *
-     * @param start The start of the range.
-     * @param end The end of the range.
-     * @param step The value to increment or decrement by.
-     * @return Returns a new range array.
-     */
-    (): Range1x1;
-    /**
-     * Creates an array of numbers (positive and/or negative) progressing from start up to, but not including, end.
-     * If end is not specified it’s set to start with start then set to 0. If end is less than start a zero-length
-     * range is created unless a negative step is specified.
-     *
-     * @param start The start of the range.
-     * @param end The end of the range.
-     * @param step The value to increment or decrement by.
-     * @return Returns a new range array.
-     */
-    (end: number): number[];
-}
-
-declare const range: Range;
+import { range } from "../fp";
 export = range;
diff --git a/types/lodash/fp/rangeRight.d.ts b/types/lodash/fp/rangeRight.d.ts
index 89337d055a..20c8baefaa 100644
--- a/types/lodash/fp/rangeRight.d.ts
+++ b/types/lodash/fp/rangeRight.d.ts
@@ -1,176 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface RangeRight {
-    /**
-     * This method is like `_.range` except that it populates values in
-     * descending order.
-     *
-     * @category Util
-     * @param start The start of the range.
-     * @param end The end of the range.
-     * @param step The value to increment or decrement by.
-     * @returns Returns the new array of numbers.
-     * @example
-     *
-     * _.rangeRight(4);
-     * // => [3, 2, 1, 0]
-     *
-     * _.rangeRight(-4);
-     * // => [-3, -2, -1, 0]
-     *
-     * _.rangeRight(1, 5);
-     * // => [4, 3, 2, 1]
-     *
-     * _.rangeRight(0, 20, 5);
-     * // => [15, 10, 5, 0]
-     *
-     * _.rangeRight(0, -4, -1);
-     * // => [-3, -2, -1, 0]
-     *
-     * _.rangeRight(1, 4, 0);
-     * // => [1, 1, 1]
-     *
-     * _.rangeRight(0);
-     * // => []
-     */
-    (): RangeRight;
-    /**
-     * This method is like `_.range` except that it populates values in
-     * descending order.
-     *
-     * @category Util
-     * @param start The start of the range.
-     * @param end The end of the range.
-     * @param step The value to increment or decrement by.
-     * @returns Returns the new array of numbers.
-     * @example
-     *
-     * _.rangeRight(4);
-     * // => [3, 2, 1, 0]
-     *
-     * _.rangeRight(-4);
-     * // => [-3, -2, -1, 0]
-     *
-     * _.rangeRight(1, 5);
-     * // => [4, 3, 2, 1]
-     *
-     * _.rangeRight(0, 20, 5);
-     * // => [15, 10, 5, 0]
-     *
-     * _.rangeRight(0, -4, -1);
-     * // => [-3, -2, -1, 0]
-     *
-     * _.rangeRight(1, 4, 0);
-     * // => [1, 1, 1]
-     *
-     * _.rangeRight(0);
-     * // => []
-     */
-    (start: number): RangeRight1x1;
-    /**
-     * This method is like `_.range` except that it populates values in
-     * descending order.
-     *
-     * @category Util
-     * @param start The start of the range.
-     * @param end The end of the range.
-     * @param step The value to increment or decrement by.
-     * @returns Returns the new array of numbers.
-     * @example
-     *
-     * _.rangeRight(4);
-     * // => [3, 2, 1, 0]
-     *
-     * _.rangeRight(-4);
-     * // => [-3, -2, -1, 0]
-     *
-     * _.rangeRight(1, 5);
-     * // => [4, 3, 2, 1]
-     *
-     * _.rangeRight(0, 20, 5);
-     * // => [15, 10, 5, 0]
-     *
-     * _.rangeRight(0, -4, -1);
-     * // => [-3, -2, -1, 0]
-     *
-     * _.rangeRight(1, 4, 0);
-     * // => [1, 1, 1]
-     *
-     * _.rangeRight(0);
-     * // => []
-     */
-    (start: number, end: number): number[];
-}
-interface RangeRight1x1 {
-    /**
-     * This method is like `_.range` except that it populates values in
-     * descending order.
-     *
-     * @category Util
-     * @param start The start of the range.
-     * @param end The end of the range.
-     * @param step The value to increment or decrement by.
-     * @returns Returns the new array of numbers.
-     * @example
-     *
-     * _.rangeRight(4);
-     * // => [3, 2, 1, 0]
-     *
-     * _.rangeRight(-4);
-     * // => [-3, -2, -1, 0]
-     *
-     * _.rangeRight(1, 5);
-     * // => [4, 3, 2, 1]
-     *
-     * _.rangeRight(0, 20, 5);
-     * // => [15, 10, 5, 0]
-     *
-     * _.rangeRight(0, -4, -1);
-     * // => [-3, -2, -1, 0]
-     *
-     * _.rangeRight(1, 4, 0);
-     * // => [1, 1, 1]
-     *
-     * _.rangeRight(0);
-     * // => []
-     */
-    (): RangeRight1x1;
-    /**
-     * This method is like `_.range` except that it populates values in
-     * descending order.
-     *
-     * @category Util
-     * @param start The start of the range.
-     * @param end The end of the range.
-     * @param step The value to increment or decrement by.
-     * @returns Returns the new array of numbers.
-     * @example
-     *
-     * _.rangeRight(4);
-     * // => [3, 2, 1, 0]
-     *
-     * _.rangeRight(-4);
-     * // => [-3, -2, -1, 0]
-     *
-     * _.rangeRight(1, 5);
-     * // => [4, 3, 2, 1]
-     *
-     * _.rangeRight(0, 20, 5);
-     * // => [15, 10, 5, 0]
-     *
-     * _.rangeRight(0, -4, -1);
-     * // => [-3, -2, -1, 0]
-     *
-     * _.rangeRight(1, 4, 0);
-     * // => [1, 1, 1]
-     *
-     * _.rangeRight(0);
-     * // => []
-     */
-    (end: number): number[];
-}
-
-declare const rangeRight: RangeRight;
+import { rangeRight } from "../fp";
 export = rangeRight;
diff --git a/types/lodash/fp/rangeStep.d.ts b/types/lodash/fp/rangeStep.d.ts
index 1bd70ebf55..e5f4c891ce 100644
--- a/types/lodash/fp/rangeStep.d.ts
+++ b/types/lodash/fp/rangeStep.d.ts
@@ -1,112 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface Range {
-    /**
-     * Creates an array of numbers (positive and/or negative) progressing from start up to, but not including, end.
-     * If end is not specified it’s set to start with start then set to 0. If end is less than start a zero-length
-     * range is created unless a negative step is specified.
-     *
-     * @param start The start of the range.
-     * @param end The end of the range.
-     * @param step The value to increment or decrement by.
-     * @return Returns a new range array.
-     */
-    (): Range;
-    /**
-     * Creates an array of numbers (positive and/or negative) progressing from start up to, but not including, end.
-     * If end is not specified it’s set to start with start then set to 0. If end is less than start a zero-length
-     * range is created unless a negative step is specified.
-     *
-     * @param start The start of the range.
-     * @param end The end of the range.
-     * @param step The value to increment or decrement by.
-     * @return Returns a new range array.
-     */
-    (start: number): Range1x1;
-    /**
-     * Creates an array of numbers (positive and/or negative) progressing from start up to, but not including, end.
-     * If end is not specified it’s set to start with start then set to 0. If end is less than start a zero-length
-     * range is created unless a negative step is specified.
-     *
-     * @param start The start of the range.
-     * @param end The end of the range.
-     * @param step The value to increment or decrement by.
-     * @return Returns a new range array.
-     */
-    (start: number, end: number): Range1x2;
-    /**
-     * Creates an array of numbers (positive and/or negative) progressing from start up to, but not including, end.
-     * If end is not specified it’s set to start with start then set to 0. If end is less than start a zero-length
-     * range is created unless a negative step is specified.
-     *
-     * @param start The start of the range.
-     * @param end The end of the range.
-     * @param step The value to increment or decrement by.
-     * @return Returns a new range array.
-     */
-    (start: number, end: number, step: number): number[];
-}
-interface Range1x1 {
-    /**
-     * Creates an array of numbers (positive and/or negative) progressing from start up to, but not including, end.
-     * If end is not specified it’s set to start with start then set to 0. If end is less than start a zero-length
-     * range is created unless a negative step is specified.
-     *
-     * @param start The start of the range.
-     * @param end The end of the range.
-     * @param step The value to increment or decrement by.
-     * @return Returns a new range array.
-     */
-    (): Range1x1;
-    /**
-     * Creates an array of numbers (positive and/or negative) progressing from start up to, but not including, end.
-     * If end is not specified it’s set to start with start then set to 0. If end is less than start a zero-length
-     * range is created unless a negative step is specified.
-     *
-     * @param start The start of the range.
-     * @param end The end of the range.
-     * @param step The value to increment or decrement by.
-     * @return Returns a new range array.
-     */
-    (end: number): Range1x2;
-    /**
-     * Creates an array of numbers (positive and/or negative) progressing from start up to, but not including, end.
-     * If end is not specified it’s set to start with start then set to 0. If end is less than start a zero-length
-     * range is created unless a negative step is specified.
-     *
-     * @param start The start of the range.
-     * @param end The end of the range.
-     * @param step The value to increment or decrement by.
-     * @return Returns a new range array.
-     */
-    (end: number, step: number): number[];
-}
-interface Range1x2 {
-    /**
-     * Creates an array of numbers (positive and/or negative) progressing from start up to, but not including, end.
-     * If end is not specified it’s set to start with start then set to 0. If end is less than start a zero-length
-     * range is created unless a negative step is specified.
-     *
-     * @param start The start of the range.
-     * @param end The end of the range.
-     * @param step The value to increment or decrement by.
-     * @return Returns a new range array.
-     */
-    (): Range1x2;
-    /**
-     * Creates an array of numbers (positive and/or negative) progressing from start up to, but not including, end.
-     * If end is not specified it’s set to start with start then set to 0. If end is less than start a zero-length
-     * range is created unless a negative step is specified.
-     *
-     * @param start The start of the range.
-     * @param end The end of the range.
-     * @param step The value to increment or decrement by.
-     * @return Returns a new range array.
-     */
-    (step: number): number[];
-}
-
-declare const rangeStep: Range;
+import { rangeStep } from "../fp";
 export = rangeStep;
diff --git a/types/lodash/fp/rangeStepRight.d.ts b/types/lodash/fp/rangeStepRight.d.ts
index dcc223f569..6c7add468d 100644
--- a/types/lodash/fp/rangeStepRight.d.ts
+++ b/types/lodash/fp/rangeStepRight.d.ts
@@ -1,310 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface RangeRight {
-    /**
-     * This method is like `_.range` except that it populates values in
-     * descending order.
-     *
-     * @category Util
-     * @param start The start of the range.
-     * @param end The end of the range.
-     * @param step The value to increment or decrement by.
-     * @returns Returns the new array of numbers.
-     * @example
-     *
-     * _.rangeRight(4);
-     * // => [3, 2, 1, 0]
-     *
-     * _.rangeRight(-4);
-     * // => [-3, -2, -1, 0]
-     *
-     * _.rangeRight(1, 5);
-     * // => [4, 3, 2, 1]
-     *
-     * _.rangeRight(0, 20, 5);
-     * // => [15, 10, 5, 0]
-     *
-     * _.rangeRight(0, -4, -1);
-     * // => [-3, -2, -1, 0]
-     *
-     * _.rangeRight(1, 4, 0);
-     * // => [1, 1, 1]
-     *
-     * _.rangeRight(0);
-     * // => []
-     */
-    (): RangeRight;
-    /**
-     * This method is like `_.range` except that it populates values in
-     * descending order.
-     *
-     * @category Util
-     * @param start The start of the range.
-     * @param end The end of the range.
-     * @param step The value to increment or decrement by.
-     * @returns Returns the new array of numbers.
-     * @example
-     *
-     * _.rangeRight(4);
-     * // => [3, 2, 1, 0]
-     *
-     * _.rangeRight(-4);
-     * // => [-3, -2, -1, 0]
-     *
-     * _.rangeRight(1, 5);
-     * // => [4, 3, 2, 1]
-     *
-     * _.rangeRight(0, 20, 5);
-     * // => [15, 10, 5, 0]
-     *
-     * _.rangeRight(0, -4, -1);
-     * // => [-3, -2, -1, 0]
-     *
-     * _.rangeRight(1, 4, 0);
-     * // => [1, 1, 1]
-     *
-     * _.rangeRight(0);
-     * // => []
-     */
-    (start: number): RangeRight1x1;
-    /**
-     * This method is like `_.range` except that it populates values in
-     * descending order.
-     *
-     * @category Util
-     * @param start The start of the range.
-     * @param end The end of the range.
-     * @param step The value to increment or decrement by.
-     * @returns Returns the new array of numbers.
-     * @example
-     *
-     * _.rangeRight(4);
-     * // => [3, 2, 1, 0]
-     *
-     * _.rangeRight(-4);
-     * // => [-3, -2, -1, 0]
-     *
-     * _.rangeRight(1, 5);
-     * // => [4, 3, 2, 1]
-     *
-     * _.rangeRight(0, 20, 5);
-     * // => [15, 10, 5, 0]
-     *
-     * _.rangeRight(0, -4, -1);
-     * // => [-3, -2, -1, 0]
-     *
-     * _.rangeRight(1, 4, 0);
-     * // => [1, 1, 1]
-     *
-     * _.rangeRight(0);
-     * // => []
-     */
-    (start: number, end: number): RangeRight1x2;
-    /**
-     * This method is like `_.range` except that it populates values in
-     * descending order.
-     *
-     * @category Util
-     * @param start The start of the range.
-     * @param end The end of the range.
-     * @param step The value to increment or decrement by.
-     * @returns Returns the new array of numbers.
-     * @example
-     *
-     * _.rangeRight(4);
-     * // => [3, 2, 1, 0]
-     *
-     * _.rangeRight(-4);
-     * // => [-3, -2, -1, 0]
-     *
-     * _.rangeRight(1, 5);
-     * // => [4, 3, 2, 1]
-     *
-     * _.rangeRight(0, 20, 5);
-     * // => [15, 10, 5, 0]
-     *
-     * _.rangeRight(0, -4, -1);
-     * // => [-3, -2, -1, 0]
-     *
-     * _.rangeRight(1, 4, 0);
-     * // => [1, 1, 1]
-     *
-     * _.rangeRight(0);
-     * // => []
-     */
-    (start: number, end: number, step: number): number[];
-}
-interface RangeRight1x1 {
-    /**
-     * This method is like `_.range` except that it populates values in
-     * descending order.
-     *
-     * @category Util
-     * @param start The start of the range.
-     * @param end The end of the range.
-     * @param step The value to increment or decrement by.
-     * @returns Returns the new array of numbers.
-     * @example
-     *
-     * _.rangeRight(4);
-     * // => [3, 2, 1, 0]
-     *
-     * _.rangeRight(-4);
-     * // => [-3, -2, -1, 0]
-     *
-     * _.rangeRight(1, 5);
-     * // => [4, 3, 2, 1]
-     *
-     * _.rangeRight(0, 20, 5);
-     * // => [15, 10, 5, 0]
-     *
-     * _.rangeRight(0, -4, -1);
-     * // => [-3, -2, -1, 0]
-     *
-     * _.rangeRight(1, 4, 0);
-     * // => [1, 1, 1]
-     *
-     * _.rangeRight(0);
-     * // => []
-     */
-    (): RangeRight1x1;
-    /**
-     * This method is like `_.range` except that it populates values in
-     * descending order.
-     *
-     * @category Util
-     * @param start The start of the range.
-     * @param end The end of the range.
-     * @param step The value to increment or decrement by.
-     * @returns Returns the new array of numbers.
-     * @example
-     *
-     * _.rangeRight(4);
-     * // => [3, 2, 1, 0]
-     *
-     * _.rangeRight(-4);
-     * // => [-3, -2, -1, 0]
-     *
-     * _.rangeRight(1, 5);
-     * // => [4, 3, 2, 1]
-     *
-     * _.rangeRight(0, 20, 5);
-     * // => [15, 10, 5, 0]
-     *
-     * _.rangeRight(0, -4, -1);
-     * // => [-3, -2, -1, 0]
-     *
-     * _.rangeRight(1, 4, 0);
-     * // => [1, 1, 1]
-     *
-     * _.rangeRight(0);
-     * // => []
-     */
-    (end: number): RangeRight1x2;
-    /**
-     * This method is like `_.range` except that it populates values in
-     * descending order.
-     *
-     * @category Util
-     * @param start The start of the range.
-     * @param end The end of the range.
-     * @param step The value to increment or decrement by.
-     * @returns Returns the new array of numbers.
-     * @example
-     *
-     * _.rangeRight(4);
-     * // => [3, 2, 1, 0]
-     *
-     * _.rangeRight(-4);
-     * // => [-3, -2, -1, 0]
-     *
-     * _.rangeRight(1, 5);
-     * // => [4, 3, 2, 1]
-     *
-     * _.rangeRight(0, 20, 5);
-     * // => [15, 10, 5, 0]
-     *
-     * _.rangeRight(0, -4, -1);
-     * // => [-3, -2, -1, 0]
-     *
-     * _.rangeRight(1, 4, 0);
-     * // => [1, 1, 1]
-     *
-     * _.rangeRight(0);
-     * // => []
-     */
-    (end: number, step: number): number[];
-}
-interface RangeRight1x2 {
-    /**
-     * This method is like `_.range` except that it populates values in
-     * descending order.
-     *
-     * @category Util
-     * @param start The start of the range.
-     * @param end The end of the range.
-     * @param step The value to increment or decrement by.
-     * @returns Returns the new array of numbers.
-     * @example
-     *
-     * _.rangeRight(4);
-     * // => [3, 2, 1, 0]
-     *
-     * _.rangeRight(-4);
-     * // => [-3, -2, -1, 0]
-     *
-     * _.rangeRight(1, 5);
-     * // => [4, 3, 2, 1]
-     *
-     * _.rangeRight(0, 20, 5);
-     * // => [15, 10, 5, 0]
-     *
-     * _.rangeRight(0, -4, -1);
-     * // => [-3, -2, -1, 0]
-     *
-     * _.rangeRight(1, 4, 0);
-     * // => [1, 1, 1]
-     *
-     * _.rangeRight(0);
-     * // => []
-     */
-    (): RangeRight1x2;
-    /**
-     * This method is like `_.range` except that it populates values in
-     * descending order.
-     *
-     * @category Util
-     * @param start The start of the range.
-     * @param end The end of the range.
-     * @param step The value to increment or decrement by.
-     * @returns Returns the new array of numbers.
-     * @example
-     *
-     * _.rangeRight(4);
-     * // => [3, 2, 1, 0]
-     *
-     * _.rangeRight(-4);
-     * // => [-3, -2, -1, 0]
-     *
-     * _.rangeRight(1, 5);
-     * // => [4, 3, 2, 1]
-     *
-     * _.rangeRight(0, 20, 5);
-     * // => [15, 10, 5, 0]
-     *
-     * _.rangeRight(0, -4, -1);
-     * // => [-3, -2, -1, 0]
-     *
-     * _.rangeRight(1, 4, 0);
-     * // => [1, 1, 1]
-     *
-     * _.rangeRight(0);
-     * // => []
-     */
-    (step: number): number[];
-}
-
-declare const rangeStepRight: RangeRight;
+import { rangeStepRight } from "../fp";
 export = rangeStepRight;
diff --git a/types/lodash/fp/rearg.d.ts b/types/lodash/fp/rearg.d.ts
index 9ff0dbccfb..5c407d13a4 100644
--- a/types/lodash/fp/rearg.d.ts
+++ b/types/lodash/fp/rearg.d.ts
@@ -1,58 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Rearg {
-    /**
-     * Creates a function that invokes func with arguments arranged according to the specified indexes where the
-     * argument value at the first index is provided as the first argument, the argument value at the second index
-     * is provided as the second argument, and so on.
-     * @param func The function to rearrange arguments for.
-     * @param indexes The arranged argument indexes, specified as individual indexes or arrays of indexes.
-     * @return Returns the new function.
-     */
-    (): Rearg;
-    /**
-     * Creates a function that invokes func with arguments arranged according to the specified indexes where the
-     * argument value at the first index is provided as the first argument, the argument value at the second index
-     * is provided as the second argument, and so on.
-     * @param func The function to rearrange arguments for.
-     * @param indexes The arranged argument indexes, specified as individual indexes or arrays of indexes.
-     * @return Returns the new function.
-     */
-    (indexes: _.Many<number>): Rearg1x1;
-    /**
-     * Creates a function that invokes func with arguments arranged according to the specified indexes where the
-     * argument value at the first index is provided as the first argument, the argument value at the second index
-     * is provided as the second argument, and so on.
-     * @param func The function to rearrange arguments for.
-     * @param indexes The arranged argument indexes, specified as individual indexes or arrays of indexes.
-     * @return Returns the new function.
-     */
-    (indexes: _.Many<number>, func: (...args: any[]) => any): (...args: any[]) => any;
-}
-interface Rearg1x1 {
-    /**
-     * Creates a function that invokes func with arguments arranged according to the specified indexes where the
-     * argument value at the first index is provided as the first argument, the argument value at the second index
-     * is provided as the second argument, and so on.
-     * @param func The function to rearrange arguments for.
-     * @param indexes The arranged argument indexes, specified as individual indexes or arrays of indexes.
-     * @return Returns the new function.
-     */
-    (): Rearg1x1;
-    /**
-     * Creates a function that invokes func with arguments arranged according to the specified indexes where the
-     * argument value at the first index is provided as the first argument, the argument value at the second index
-     * is provided as the second argument, and so on.
-     * @param func The function to rearrange arguments for.
-     * @param indexes The arranged argument indexes, specified as individual indexes or arrays of indexes.
-     * @return Returns the new function.
-     */
-    (func: (...args: any[]) => any): (...args: any[]) => any;
-}
-
-declare const rearg: Rearg;
+import { rearg } from "../fp";
 export = rearg;
diff --git a/types/lodash/fp/reduce.d.ts b/types/lodash/fp/reduce.d.ts
index 70071a64e3..e262f39370 100644
--- a/types/lodash/fp/reduce.d.ts
+++ b/types/lodash/fp/reduce.d.ts
@@ -1,223 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Reduce {
-    /**
-    * Reduces a collection to a value which is the accumulated result of running each
-    * element in the collection through the callback, where each successive callback execution
-    * consumes the return value of the previous execution. If accumulator is not provided the
-    * first element of the collection will be used as the initial accumulator value. The callback
-    * is bound to thisArg and invoked with four arguments; (accumulator, value, index|key, collection).
-    * @param collection The collection to iterate over.
-    * @param callback The function called per iteration.
-    * @param accumulator Initial value of the accumulator.
-    * @return Returns the accumulated value.
-    **/
-    (): Reduce;
-    /**
-    * Reduces a collection to a value which is the accumulated result of running each
-    * element in the collection through the callback, where each successive callback execution
-    * consumes the return value of the previous execution. If accumulator is not provided the
-    * first element of the collection will be used as the initial accumulator value. The callback
-    * is bound to thisArg and invoked with four arguments; (accumulator, value, index|key, collection).
-    * @param collection The collection to iterate over.
-    * @param callback The function called per iteration.
-    * @param accumulator Initial value of the accumulator.
-    * @return Returns the accumulated value.
-    **/
-    <T, TResult>(callback: _.MemoIteratorCapped<T, TResult>): Reduce1x1<T, TResult>;
-    /**
-    * Reduces a collection to a value which is the accumulated result of running each
-    * element in the collection through the callback, where each successive callback execution
-    * consumes the return value of the previous execution. If accumulator is not provided the
-    * first element of the collection will be used as the initial accumulator value. The callback
-    * is bound to thisArg and invoked with four arguments; (accumulator, value, index|key, collection).
-    * @param collection The collection to iterate over.
-    * @param callback The function called per iteration.
-    * @param accumulator Initial value of the accumulator.
-    * @return Returns the accumulated value.
-    **/
-    <T, TResult>(callback: _.MemoIteratorCapped<T, TResult>, accumulator: TResult): Reduce1x2<T, TResult>;
-    /**
-    * Reduces a collection to a value which is the accumulated result of running each
-    * element in the collection through the callback, where each successive callback execution
-    * consumes the return value of the previous execution. If accumulator is not provided the
-    * first element of the collection will be used as the initial accumulator value. The callback
-    * is bound to thisArg and invoked with four arguments; (accumulator, value, index|key, collection).
-    * @param collection The collection to iterate over.
-    * @param callback The function called per iteration.
-    * @param accumulator Initial value of the accumulator.
-    * @return Returns the accumulated value.
-    **/
-    <T, TResult>(callback: _.MemoIteratorCapped<T, TResult>, accumulator: TResult, collection: T[] | _.List<T> | null | undefined): TResult;
-    /**
-    * Reduces a collection to a value which is the accumulated result of running each
-    * element in the collection through the callback, where each successive callback execution
-    * consumes the return value of the previous execution. If accumulator is not provided the
-    * first element of the collection will be used as the initial accumulator value. The callback
-    * is bound to thisArg and invoked with four arguments; (accumulator, value, index|key, collection).
-    * @param collection The collection to iterate over.
-    * @param callback The function called per iteration.
-    * @param accumulator Initial value of the accumulator.
-    * @return Returns the accumulated value.
-    **/
-    <T extends object, TResult>(callback: _.MemoIteratorCapped<T[keyof T], TResult>): Reduce3x1<T, TResult>;
-    /**
-    * Reduces a collection to a value which is the accumulated result of running each
-    * element in the collection through the callback, where each successive callback execution
-    * consumes the return value of the previous execution. If accumulator is not provided the
-    * first element of the collection will be used as the initial accumulator value. The callback
-    * is bound to thisArg and invoked with four arguments; (accumulator, value, index|key, collection).
-    * @param collection The collection to iterate over.
-    * @param callback The function called per iteration.
-    * @param accumulator Initial value of the accumulator.
-    * @return Returns the accumulated value.
-    **/
-    <T extends object, TResult>(callback: _.MemoIteratorCapped<T[keyof T], TResult>, accumulator: TResult): Reduce3x2<T, TResult>;
-    /**
-    * Reduces a collection to a value which is the accumulated result of running each
-    * element in the collection through the callback, where each successive callback execution
-    * consumes the return value of the previous execution. If accumulator is not provided the
-    * first element of the collection will be used as the initial accumulator value. The callback
-    * is bound to thisArg and invoked with four arguments; (accumulator, value, index|key, collection).
-    * @param collection The collection to iterate over.
-    * @param callback The function called per iteration.
-    * @param accumulator Initial value of the accumulator.
-    * @return Returns the accumulated value.
-    **/
-    <T extends object, TResult>(callback: _.MemoIteratorCapped<T[keyof T], TResult>, accumulator: TResult, collection: T | null | undefined): TResult;
-}
-interface Reduce1x1<T, TResult> {
-    /**
-    * Reduces a collection to a value which is the accumulated result of running each
-    * element in the collection through the callback, where each successive callback execution
-    * consumes the return value of the previous execution. If accumulator is not provided the
-    * first element of the collection will be used as the initial accumulator value. The callback
-    * is bound to thisArg and invoked with four arguments; (accumulator, value, index|key, collection).
-    * @param collection The collection to iterate over.
-    * @param callback The function called per iteration.
-    * @param accumulator Initial value of the accumulator.
-    * @return Returns the accumulated value.
-    **/
-    (): Reduce1x1<T, TResult>;
-    /**
-    * Reduces a collection to a value which is the accumulated result of running each
-    * element in the collection through the callback, where each successive callback execution
-    * consumes the return value of the previous execution. If accumulator is not provided the
-    * first element of the collection will be used as the initial accumulator value. The callback
-    * is bound to thisArg and invoked with four arguments; (accumulator, value, index|key, collection).
-    * @param collection The collection to iterate over.
-    * @param callback The function called per iteration.
-    * @param accumulator Initial value of the accumulator.
-    * @return Returns the accumulated value.
-    **/
-    (accumulator: TResult): Reduce1x2<T, TResult>;
-    /**
-    * Reduces a collection to a value which is the accumulated result of running each
-    * element in the collection through the callback, where each successive callback execution
-    * consumes the return value of the previous execution. If accumulator is not provided the
-    * first element of the collection will be used as the initial accumulator value. The callback
-    * is bound to thisArg and invoked with four arguments; (accumulator, value, index|key, collection).
-    * @param collection The collection to iterate over.
-    * @param callback The function called per iteration.
-    * @param accumulator Initial value of the accumulator.
-    * @return Returns the accumulated value.
-    **/
-    (accumulator: TResult, collection: T[] | _.List<T> | null | undefined): TResult;
-}
-interface Reduce1x2<T, TResult> {
-    /**
-    * Reduces a collection to a value which is the accumulated result of running each
-    * element in the collection through the callback, where each successive callback execution
-    * consumes the return value of the previous execution. If accumulator is not provided the
-    * first element of the collection will be used as the initial accumulator value. The callback
-    * is bound to thisArg and invoked with four arguments; (accumulator, value, index|key, collection).
-    * @param collection The collection to iterate over.
-    * @param callback The function called per iteration.
-    * @param accumulator Initial value of the accumulator.
-    * @return Returns the accumulated value.
-    **/
-    (): Reduce1x2<T, TResult>;
-    /**
-    * Reduces a collection to a value which is the accumulated result of running each
-    * element in the collection through the callback, where each successive callback execution
-    * consumes the return value of the previous execution. If accumulator is not provided the
-    * first element of the collection will be used as the initial accumulator value. The callback
-    * is bound to thisArg and invoked with four arguments; (accumulator, value, index|key, collection).
-    * @param collection The collection to iterate over.
-    * @param callback The function called per iteration.
-    * @param accumulator Initial value of the accumulator.
-    * @return Returns the accumulated value.
-    **/
-    (collection: T[] | _.List<T> | null | undefined): TResult;
-}
-interface Reduce3x1<T extends object, TResult> {
-    /**
-    * Reduces a collection to a value which is the accumulated result of running each
-    * element in the collection through the callback, where each successive callback execution
-    * consumes the return value of the previous execution. If accumulator is not provided the
-    * first element of the collection will be used as the initial accumulator value. The callback
-    * is bound to thisArg and invoked with four arguments; (accumulator, value, index|key, collection).
-    * @param collection The collection to iterate over.
-    * @param callback The function called per iteration.
-    * @param accumulator Initial value of the accumulator.
-    * @return Returns the accumulated value.
-    **/
-    (): Reduce3x1<T, TResult>;
-    /**
-    * Reduces a collection to a value which is the accumulated result of running each
-    * element in the collection through the callback, where each successive callback execution
-    * consumes the return value of the previous execution. If accumulator is not provided the
-    * first element of the collection will be used as the initial accumulator value. The callback
-    * is bound to thisArg and invoked with four arguments; (accumulator, value, index|key, collection).
-    * @param collection The collection to iterate over.
-    * @param callback The function called per iteration.
-    * @param accumulator Initial value of the accumulator.
-    * @return Returns the accumulated value.
-    **/
-    (accumulator: TResult): Reduce3x2<T, TResult>;
-    /**
-    * Reduces a collection to a value which is the accumulated result of running each
-    * element in the collection through the callback, where each successive callback execution
-    * consumes the return value of the previous execution. If accumulator is not provided the
-    * first element of the collection will be used as the initial accumulator value. The callback
-    * is bound to thisArg and invoked with four arguments; (accumulator, value, index|key, collection).
-    * @param collection The collection to iterate over.
-    * @param callback The function called per iteration.
-    * @param accumulator Initial value of the accumulator.
-    * @return Returns the accumulated value.
-    **/
-    (accumulator: TResult, collection: T | null | undefined): TResult;
-}
-interface Reduce3x2<T extends object, TResult> {
-    /**
-    * Reduces a collection to a value which is the accumulated result of running each
-    * element in the collection through the callback, where each successive callback execution
-    * consumes the return value of the previous execution. If accumulator is not provided the
-    * first element of the collection will be used as the initial accumulator value. The callback
-    * is bound to thisArg and invoked with four arguments; (accumulator, value, index|key, collection).
-    * @param collection The collection to iterate over.
-    * @param callback The function called per iteration.
-    * @param accumulator Initial value of the accumulator.
-    * @return Returns the accumulated value.
-    **/
-    (): Reduce3x2<T, TResult>;
-    /**
-    * Reduces a collection to a value which is the accumulated result of running each
-    * element in the collection through the callback, where each successive callback execution
-    * consumes the return value of the previous execution. If accumulator is not provided the
-    * first element of the collection will be used as the initial accumulator value. The callback
-    * is bound to thisArg and invoked with four arguments; (accumulator, value, index|key, collection).
-    * @param collection The collection to iterate over.
-    * @param callback The function called per iteration.
-    * @param accumulator Initial value of the accumulator.
-    * @return Returns the accumulated value.
-    **/
-    (collection: T | null | undefined): TResult;
-}
-
-declare const reduce: Reduce;
+import { reduce } from "../fp";
 export = reduce;
diff --git a/types/lodash/fp/reduceRight.d.ts b/types/lodash/fp/reduceRight.d.ts
index 0c8813aa01..fa54fa3a5e 100644
--- a/types/lodash/fp/reduceRight.d.ts
+++ b/types/lodash/fp/reduceRight.d.ts
@@ -1,172 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface ReduceRight {
-    /**
-    * This method is like _.reduce except that it iterates over elements of a collection from
-    * right to left.
-    * @param collection The collection to iterate over.
-    * @param callback The function called per iteration.
-    * @param accumulator Initial value of the accumulator.
-    * @return The accumulated value.
-    **/
-    (): ReduceRight;
-    /**
-    * This method is like _.reduce except that it iterates over elements of a collection from
-    * right to left.
-    * @param collection The collection to iterate over.
-    * @param callback The function called per iteration.
-    * @param accumulator Initial value of the accumulator.
-    * @return The accumulated value.
-    **/
-    <T, TResult>(callback: _.MemoIteratorCappedRight<T, TResult>): ReduceRight1x1<T, TResult>;
-    /**
-    * This method is like _.reduce except that it iterates over elements of a collection from
-    * right to left.
-    * @param collection The collection to iterate over.
-    * @param callback The function called per iteration.
-    * @param accumulator Initial value of the accumulator.
-    * @return The accumulated value.
-    **/
-    <T, TResult>(callback: _.MemoIteratorCappedRight<T, TResult>, accumulator: TResult): ReduceRight1x2<T, TResult>;
-    /**
-    * This method is like _.reduce except that it iterates over elements of a collection from
-    * right to left.
-    * @param collection The collection to iterate over.
-    * @param callback The function called per iteration.
-    * @param accumulator Initial value of the accumulator.
-    * @return The accumulated value.
-    **/
-    <T, TResult>(callback: _.MemoIteratorCappedRight<T, TResult>, accumulator: TResult, collection: T[] | _.List<T> | null | undefined): TResult;
-    /**
-    * This method is like _.reduce except that it iterates over elements of a collection from
-    * right to left.
-    * @param collection The collection to iterate over.
-    * @param callback The function called per iteration.
-    * @param accumulator Initial value of the accumulator.
-    * @return The accumulated value.
-    **/
-    <T extends object, TResult>(callback: _.MemoIteratorCappedRight<T[keyof T], TResult>): ReduceRight3x1<T, TResult>;
-    /**
-    * This method is like _.reduce except that it iterates over elements of a collection from
-    * right to left.
-    * @param collection The collection to iterate over.
-    * @param callback The function called per iteration.
-    * @param accumulator Initial value of the accumulator.
-    * @return The accumulated value.
-    **/
-    <T extends object, TResult>(callback: _.MemoIteratorCappedRight<T[keyof T], TResult>, accumulator: TResult): ReduceRight3x2<T, TResult>;
-    /**
-    * This method is like _.reduce except that it iterates over elements of a collection from
-    * right to left.
-    * @param collection The collection to iterate over.
-    * @param callback The function called per iteration.
-    * @param accumulator Initial value of the accumulator.
-    * @return The accumulated value.
-    **/
-    <T extends object, TResult>(callback: _.MemoIteratorCappedRight<T[keyof T], TResult>, accumulator: TResult, collection: T | null | undefined): TResult;
-}
-interface ReduceRight1x1<T, TResult> {
-    /**
-    * This method is like _.reduce except that it iterates over elements of a collection from
-    * right to left.
-    * @param collection The collection to iterate over.
-    * @param callback The function called per iteration.
-    * @param accumulator Initial value of the accumulator.
-    * @return The accumulated value.
-    **/
-    (): ReduceRight1x1<T, TResult>;
-    /**
-    * This method is like _.reduce except that it iterates over elements of a collection from
-    * right to left.
-    * @param collection The collection to iterate over.
-    * @param callback The function called per iteration.
-    * @param accumulator Initial value of the accumulator.
-    * @return The accumulated value.
-    **/
-    (accumulator: TResult): ReduceRight1x2<T, TResult>;
-    /**
-    * This method is like _.reduce except that it iterates over elements of a collection from
-    * right to left.
-    * @param collection The collection to iterate over.
-    * @param callback The function called per iteration.
-    * @param accumulator Initial value of the accumulator.
-    * @return The accumulated value.
-    **/
-    (accumulator: TResult, collection: T[] | _.List<T> | null | undefined): TResult;
-}
-interface ReduceRight1x2<T, TResult> {
-    /**
-    * This method is like _.reduce except that it iterates over elements of a collection from
-    * right to left.
-    * @param collection The collection to iterate over.
-    * @param callback The function called per iteration.
-    * @param accumulator Initial value of the accumulator.
-    * @return The accumulated value.
-    **/
-    (): ReduceRight1x2<T, TResult>;
-    /**
-    * This method is like _.reduce except that it iterates over elements of a collection from
-    * right to left.
-    * @param collection The collection to iterate over.
-    * @param callback The function called per iteration.
-    * @param accumulator Initial value of the accumulator.
-    * @return The accumulated value.
-    **/
-    (collection: T[] | _.List<T> | null | undefined): TResult;
-}
-interface ReduceRight3x1<T extends object, TResult> {
-    /**
-    * This method is like _.reduce except that it iterates over elements of a collection from
-    * right to left.
-    * @param collection The collection to iterate over.
-    * @param callback The function called per iteration.
-    * @param accumulator Initial value of the accumulator.
-    * @return The accumulated value.
-    **/
-    (): ReduceRight3x1<T, TResult>;
-    /**
-    * This method is like _.reduce except that it iterates over elements of a collection from
-    * right to left.
-    * @param collection The collection to iterate over.
-    * @param callback The function called per iteration.
-    * @param accumulator Initial value of the accumulator.
-    * @return The accumulated value.
-    **/
-    (accumulator: TResult): ReduceRight3x2<T, TResult>;
-    /**
-    * This method is like _.reduce except that it iterates over elements of a collection from
-    * right to left.
-    * @param collection The collection to iterate over.
-    * @param callback The function called per iteration.
-    * @param accumulator Initial value of the accumulator.
-    * @return The accumulated value.
-    **/
-    (accumulator: TResult, collection: T | null | undefined): TResult;
-}
-interface ReduceRight3x2<T extends object, TResult> {
-    /**
-    * This method is like _.reduce except that it iterates over elements of a collection from
-    * right to left.
-    * @param collection The collection to iterate over.
-    * @param callback The function called per iteration.
-    * @param accumulator Initial value of the accumulator.
-    * @return The accumulated value.
-    **/
-    (): ReduceRight3x2<T, TResult>;
-    /**
-    * This method is like _.reduce except that it iterates over elements of a collection from
-    * right to left.
-    * @param collection The collection to iterate over.
-    * @param callback The function called per iteration.
-    * @param accumulator Initial value of the accumulator.
-    * @return The accumulated value.
-    **/
-    (collection: T | null | undefined): TResult;
-}
-
-declare const reduceRight: ReduceRight;
+import { reduceRight } from "../fp";
 export = reduceRight;
diff --git a/types/lodash/fp/reject.d.ts b/types/lodash/fp/reject.d.ts
index 74a93c3783..d0a12af963 100644
--- a/types/lodash/fp/reject.d.ts
+++ b/types/lodash/fp/reject.d.ts
@@ -1,115 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Reject {
-    /**
-     * The opposite of _.filter; this method returns the elements of collection that predicate does not return
-     * truthy for.
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the new filtered array.
-     */
-    (): Reject;
-    /**
-     * The opposite of _.filter; this method returns the elements of collection that predicate does not return
-     * truthy for.
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the new filtered array.
-     */
-    (predicate: (value: string) => boolean): Reject1x1;
-    /**
-     * The opposite of _.filter; this method returns the elements of collection that predicate does not return
-     * truthy for.
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the new filtered array.
-     */
-    (predicate: (value: string) => boolean, collection: string | null | undefined): string[];
-    /**
-     * The opposite of _.filter; this method returns the elements of collection that predicate does not return
-     * truthy for.
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the new filtered array.
-     */
-    <T>(predicate: _.ValueIterateeCustom<T, boolean>): Reject2x1<T>;
-    /**
-     * The opposite of _.filter; this method returns the elements of collection that predicate does not return
-     * truthy for.
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the new filtered array.
-     */
-    <T>(predicate: _.ValueIterateeCustom<T, boolean>, collection: _.List<T> | null | undefined): T[];
-    /**
-     * The opposite of _.filter; this method returns the elements of collection that predicate does not return
-     * truthy for.
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the new filtered array.
-     */
-    <T extends object>(predicate: _.ValueIterateeCustom<T[keyof T], boolean>, collection: T | null | undefined): Array<T[keyof T]>;
-}
-interface Reject1x1 {
-    /**
-     * The opposite of _.filter; this method returns the elements of collection that predicate does not return
-     * truthy for.
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the new filtered array.
-     */
-    (): Reject1x1;
-    /**
-     * The opposite of _.filter; this method returns the elements of collection that predicate does not return
-     * truthy for.
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the new filtered array.
-     */
-    (collection: string | null | undefined): string[];
-}
-interface Reject2x1<T> {
-    /**
-     * The opposite of _.filter; this method returns the elements of collection that predicate does not return
-     * truthy for.
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the new filtered array.
-     */
-    (): Reject2x1<T>;
-    /**
-     * The opposite of _.filter; this method returns the elements of collection that predicate does not return
-     * truthy for.
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the new filtered array.
-     */
-    (collection: _.List<T> | object | null | undefined): T[];
-}
-
-declare const reject: Reject;
+import { reject } from "../fp";
 export = reject;
diff --git a/types/lodash/fp/remove.d.ts b/types/lodash/fp/remove.d.ts
index 51ac8aecf8..e0da9b147c 100644
--- a/types/lodash/fp/remove.d.ts
+++ b/types/lodash/fp/remove.d.ts
@@ -1,118 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Remove {
-    /**
-     * Removes all elements from array that predicate returns truthy for and returns an array of the removed
-     * elements. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * Note: Unlike _.filter, this method mutates array.
-     *
-     * @param array The array to modify.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the new array of removed elements.
-     */
-    (): Remove;
-    /**
-     * Removes all elements from array that predicate returns truthy for and returns an array of the removed
-     * elements. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * Note: Unlike _.filter, this method mutates array.
-     *
-     * @param array The array to modify.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the new array of removed elements.
-     */
-    <T>(predicate: _.ValueIteratee<T>): Remove1x1<T>;
-    /**
-     * Removes all elements from array that predicate returns truthy for and returns an array of the removed
-     * elements. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * Note: Unlike _.filter, this method mutates array.
-     *
-     * @param array The array to modify.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the new array of removed elements.
-     */
-    <T>(predicate: _.ValueIteratee<T>, array: _.List<T>): T[];
-}
-interface Remove1x1<T> {
-    /**
-     * Removes all elements from array that predicate returns truthy for and returns an array of the removed
-     * elements. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * Note: Unlike _.filter, this method mutates array.
-     *
-     * @param array The array to modify.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the new array of removed elements.
-     */
-    (): Remove1x1<T>;
-    /**
-     * Removes all elements from array that predicate returns truthy for and returns an array of the removed
-     * elements. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * Note: Unlike _.filter, this method mutates array.
-     *
-     * @param array The array to modify.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the new array of removed elements.
-     */
-    (array: _.List<T>): T[];
-}
-
-declare const remove: Remove;
+import { remove } from "../fp";
 export = remove;
diff --git a/types/lodash/fp/repeat.d.ts b/types/lodash/fp/repeat.d.ts
index 4ba7cd4e17..1f757a2778 100644
--- a/types/lodash/fp/repeat.d.ts
+++ b/types/lodash/fp/repeat.d.ts
@@ -1,51 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface Repeat {
-    /**
-     * Repeats the given string n times.
-     *
-     * @param string The string to repeat.
-     * @param n The number of times to repeat the string.
-     * @return Returns the repeated string.
-     */
-    (): Repeat;
-    /**
-     * Repeats the given string n times.
-     *
-     * @param string The string to repeat.
-     * @param n The number of times to repeat the string.
-     * @return Returns the repeated string.
-     */
-    (n: number): Repeat1x1;
-    /**
-     * Repeats the given string n times.
-     *
-     * @param string The string to repeat.
-     * @param n The number of times to repeat the string.
-     * @return Returns the repeated string.
-     */
-    (n: number, string: string): string;
-}
-interface Repeat1x1 {
-    /**
-     * Repeats the given string n times.
-     *
-     * @param string The string to repeat.
-     * @param n The number of times to repeat the string.
-     * @return Returns the repeated string.
-     */
-    (): Repeat1x1;
-    /**
-     * Repeats the given string n times.
-     *
-     * @param string The string to repeat.
-     * @param n The number of times to repeat the string.
-     * @return Returns the repeated string.
-     */
-    (string: string): string;
-}
-
-declare const repeat: Repeat;
+import { repeat } from "../fp";
 export = repeat;
diff --git a/types/lodash/fp/replace.d.ts b/types/lodash/fp/replace.d.ts
index 18e76a4388..c7a75d1fa1 100644
--- a/types/lodash/fp/replace.d.ts
+++ b/types/lodash/fp/replace.d.ts
@@ -1,87 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Replace {
-    /**
-     * Replaces matches for pattern in string with replacement.
-     *
-     * Note: This method is based on String#replace.
-     *
-     * @return Returns the modified string.
-     */
-    (): Replace;
-    /**
-     * Replaces matches for pattern in string with replacement.
-     *
-     * Note: This method is based on String#replace.
-     *
-     * @return Returns the modified string.
-     */
-    (pattern: RegExp | string): Replace1x1;
-    /**
-     * Replaces matches for pattern in string with replacement.
-     *
-     * Note: This method is based on String#replace.
-     *
-     * @return Returns the modified string.
-     */
-    (pattern: RegExp | string, replacement: _.ReplaceFunction | string): Replace1x2;
-    /**
-     * Replaces matches for pattern in string with replacement.
-     *
-     * Note: This method is based on String#replace.
-     *
-     * @return Returns the modified string.
-     */
-    (pattern: RegExp | string, replacement: _.ReplaceFunction | string, string: string): string;
-}
-interface Replace1x1 {
-    /**
-     * Replaces matches for pattern in string with replacement.
-     *
-     * Note: This method is based on String#replace.
-     *
-     * @return Returns the modified string.
-     */
-    (): Replace1x1;
-    /**
-     * Replaces matches for pattern in string with replacement.
-     *
-     * Note: This method is based on String#replace.
-     *
-     * @return Returns the modified string.
-     */
-    (replacement: _.ReplaceFunction | string): Replace1x2;
-    /**
-     * Replaces matches for pattern in string with replacement.
-     *
-     * Note: This method is based on String#replace.
-     *
-     * @return Returns the modified string.
-     */
-    (replacement: _.ReplaceFunction | string, string: string): string;
-}
-interface Replace1x2 {
-    /**
-     * Replaces matches for pattern in string with replacement.
-     *
-     * Note: This method is based on String#replace.
-     *
-     * @return Returns the modified string.
-     */
-    (): Replace1x2;
-    /**
-     * Replaces matches for pattern in string with replacement.
-     *
-     * Note: This method is based on String#replace.
-     *
-     * @return Returns the modified string.
-     */
-    (string: string): string;
-}
-
-declare const replace: Replace;
+import { replace } from "../fp";
 export = replace;
diff --git a/types/lodash/fp/rest.d.ts b/types/lodash/fp/rest.d.ts
index b92f5adb85..b059d673e1 100644
--- a/types/lodash/fp/rest.d.ts
+++ b/types/lodash/fp/rest.d.ts
@@ -1,19 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type Rest =
-    /**
-     * Creates a function that invokes func with the this binding of the created function and arguments from start
-     * and beyond provided as an array.
-     *
-     * Note: This method is based on the rest parameter.
-     *
-     * @param func The function to apply a rest parameter to.
-     * @param start The start position of the rest parameter.
-     * @return Returns the new function.
-     */
-    (func: (...args: any[]) => any) => (...args: any[]) => any;
-
-declare const rest: Rest;
+import { rest } from "../fp";
 export = rest;
diff --git a/types/lodash/fp/restFrom.d.ts b/types/lodash/fp/restFrom.d.ts
index 3ca5389f0e..218edbd5a3 100644
--- a/types/lodash/fp/restFrom.d.ts
+++ b/types/lodash/fp/restFrom.d.ts
@@ -1,66 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface Rest {
-    /**
-     * Creates a function that invokes func with the this binding of the created function and arguments from start
-     * and beyond provided as an array.
-     *
-     * Note: This method is based on the rest parameter.
-     *
-     * @param func The function to apply a rest parameter to.
-     * @param start The start position of the rest parameter.
-     * @return Returns the new function.
-     */
-    (): Rest;
-    /**
-     * Creates a function that invokes func with the this binding of the created function and arguments from start
-     * and beyond provided as an array.
-     *
-     * Note: This method is based on the rest parameter.
-     *
-     * @param func The function to apply a rest parameter to.
-     * @param start The start position of the rest parameter.
-     * @return Returns the new function.
-     */
-    (start: number): Rest1x1;
-    /**
-     * Creates a function that invokes func with the this binding of the created function and arguments from start
-     * and beyond provided as an array.
-     *
-     * Note: This method is based on the rest parameter.
-     *
-     * @param func The function to apply a rest parameter to.
-     * @param start The start position of the rest parameter.
-     * @return Returns the new function.
-     */
-    (start: number, func: (...args: any[]) => any): (...args: any[]) => any;
-}
-interface Rest1x1 {
-    /**
-     * Creates a function that invokes func with the this binding of the created function and arguments from start
-     * and beyond provided as an array.
-     *
-     * Note: This method is based on the rest parameter.
-     *
-     * @param func The function to apply a rest parameter to.
-     * @param start The start position of the rest parameter.
-     * @return Returns the new function.
-     */
-    (): Rest1x1;
-    /**
-     * Creates a function that invokes func with the this binding of the created function and arguments from start
-     * and beyond provided as an array.
-     *
-     * Note: This method is based on the rest parameter.
-     *
-     * @param func The function to apply a rest parameter to.
-     * @param start The start position of the rest parameter.
-     * @return Returns the new function.
-     */
-    (func: (...args: any[]) => any): (...args: any[]) => any;
-}
-
-declare const restFrom: Rest;
+import { restFrom } from "../fp";
 export = restFrom;
diff --git a/types/lodash/fp/result.d.ts b/types/lodash/fp/result.d.ts
index de99d91ff9..5a919dd455 100644
--- a/types/lodash/fp/result.d.ts
+++ b/types/lodash/fp/result.d.ts
@@ -1,63 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Result {
-    /**
-     * This method is like _.get except that if the resolved value is a function it’s invoked with the this binding
-     * of its parent object and its result is returned.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to resolve.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (): Result;
-    /**
-     * This method is like _.get except that if the resolved value is a function it’s invoked with the this binding
-     * of its parent object and its result is returned.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to resolve.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (path: _.PropertyPath): Result1x1;
-    /**
-     * This method is like _.get except that if the resolved value is a function it’s invoked with the this binding
-     * of its parent object and its result is returned.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to resolve.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <TResult>(path: _.PropertyPath, object: any): TResult;
-}
-interface Result1x1 {
-    /**
-     * This method is like _.get except that if the resolved value is a function it’s invoked with the this binding
-     * of its parent object and its result is returned.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to resolve.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    (): Result1x1;
-    /**
-     * This method is like _.get except that if the resolved value is a function it’s invoked with the this binding
-     * of its parent object and its result is returned.
-     *
-     * @param object The object to query.
-     * @param path The path of the property to resolve.
-     * @param defaultValue The value returned if the resolved value is undefined.
-     * @return Returns the resolved value.
-     */
-    <TResult>(object: any): TResult;
-}
-
-declare const result: Result;
+import { result } from "../fp";
 export = result;
diff --git a/types/lodash/fp/reverse.d.ts b/types/lodash/fp/reverse.d.ts
index 5aa826c5eb..f754d6aac6 100644
--- a/types/lodash/fp/reverse.d.ts
+++ b/types/lodash/fp/reverse.d.ts
@@ -1,30 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-type Reverse =
-    /**
-     * Reverses `array` so that the first element becomes the last, the second
-     * element becomes the second to last, and so on.
-     *
-     * **Note:** This method mutates `array` and is based on
-     * [`Array#reverse`](https://mdn.io/Array/reverse).
-     *
-     * @category Array
-     * @returns Returns `array`.
-     * @example
-     *
-     * var array = [1, 2, 3];
-     *
-     * _.reverse(array);
-     * // => [3, 2, 1]
-     *
-     * console.log(array);
-     * // => [3, 2, 1]
-     */
-    <TList extends _.List<any>>(array: TList) => TList;
-
-declare const reverse: Reverse;
+import { reverse } from "../fp";
 export = reverse;
diff --git a/types/lodash/fp/round.d.ts b/types/lodash/fp/round.d.ts
index 359693f99e..02f4e6f300 100644
--- a/types/lodash/fp/round.d.ts
+++ b/types/lodash/fp/round.d.ts
@@ -1,16 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type Round =
-    /**
-     * Calculates n rounded to precision.
-     *
-     * @param n The number to round.
-     * @param precision The precision to round to.
-     * @return Returns the rounded number.
-     */
-    (n: number) => number;
-
-declare const round: Round;
+import { round } from "../fp";
 export = round;
diff --git a/types/lodash/fp/runInContext.d.ts b/types/lodash/fp/runInContext.d.ts
index a09369abec..6041db7053 100644
--- a/types/lodash/fp/runInContext.d.ts
+++ b/types/lodash/fp/runInContext.d.ts
@@ -1,17 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-type RunInContext =
-    /**
-     * Create a new pristine lodash function using the given context object.
-     *
-     * @param context The context object.
-     * @return Returns a new lodash function.
-     */
-    (context: object) => typeof _;
-
-declare const runInContext: RunInContext;
+import { runInContext } from "../fp";
 export = runInContext;
diff --git a/types/lodash/fp/sample.d.ts b/types/lodash/fp/sample.d.ts
index 3ba7c5b6e2..f2fcf1ac03 100644
--- a/types/lodash/fp/sample.d.ts
+++ b/types/lodash/fp/sample.d.ts
@@ -1,25 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Sample {
-    /**
-     * Gets a random element from collection.
-     *
-     * @param collection The collection to sample.
-     * @return Returns the random element.
-     */
-    <T>(collection: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): T | undefined;
-    /**
-     * Gets a random element from collection.
-     *
-     * @param collection The collection to sample.
-     * @return Returns the random element.
-     */
-    <T extends object>(collection: T | null | undefined): T[keyof T] | undefined;
-}
-
-declare const sample: Sample;
+import { sample } from "../fp";
 export = sample;
diff --git a/types/lodash/fp/sampleSize.d.ts b/types/lodash/fp/sampleSize.d.ts
index 17ec045353..41a3cabf92 100644
--- a/types/lodash/fp/sampleSize.d.ts
+++ b/types/lodash/fp/sampleSize.d.ts
@@ -1,69 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface SampleSize {
-    /**
-     * Gets n random elements at unique keys from collection up to the size of collection.
-     *
-     * @param collection The collection to sample.
-     * @param n The number of elements to sample.
-     * @return Returns the random elements.
-     */
-    (): SampleSize;
-    /**
-     * Gets n random elements at unique keys from collection up to the size of collection.
-     *
-     * @param collection The collection to sample.
-     * @param n The number of elements to sample.
-     * @return Returns the random elements.
-     */
-    (n: number): SampleSize1x1;
-    /**
-     * Gets n random elements at unique keys from collection up to the size of collection.
-     *
-     * @param collection The collection to sample.
-     * @param n The number of elements to sample.
-     * @return Returns the random elements.
-     */
-    <T>(n: number, collection: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): T[];
-    /**
-     * Gets n random elements at unique keys from collection up to the size of collection.
-     *
-     * @param collection The collection to sample.
-     * @param n The number of elements to sample.
-     * @return Returns the random elements.
-     */
-    <T extends object>(n: number, collection: T | null | undefined): Array<T[keyof T]>;
-}
-interface SampleSize1x1 {
-    /**
-     * Gets n random elements at unique keys from collection up to the size of collection.
-     *
-     * @param collection The collection to sample.
-     * @param n The number of elements to sample.
-     * @return Returns the random elements.
-     */
-    (): SampleSize1x1;
-    /**
-     * Gets n random elements at unique keys from collection up to the size of collection.
-     *
-     * @param collection The collection to sample.
-     * @param n The number of elements to sample.
-     * @return Returns the random elements.
-     */
-    <T>(collection: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): T[];
-    /**
-     * Gets n random elements at unique keys from collection up to the size of collection.
-     *
-     * @param collection The collection to sample.
-     * @param n The number of elements to sample.
-     * @return Returns the random elements.
-     */
-    <T extends object>(collection: T | null | undefined): Array<T[keyof T]>;
-}
-
-declare const sampleSize: SampleSize;
+import { sampleSize } from "../fp";
 export = sampleSize;
diff --git a/types/lodash/fp/set.d.ts b/types/lodash/fp/set.d.ts
index ea13605dcc..57960cba78 100644
--- a/types/lodash/fp/set.d.ts
+++ b/types/lodash/fp/set.d.ts
@@ -1,147 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Set {
-    /**
-     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
-     * missing index properties while objects are created for all other missing properties. Use _.setWith to
-     * customize path creation.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @return Returns object.
-     */
-    (): Set;
-    /**
-     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
-     * missing index properties while objects are created for all other missing properties. Use _.setWith to
-     * customize path creation.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @return Returns object.
-     */
-    (path: _.PropertyPath): Set1x1;
-    /**
-     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
-     * missing index properties while objects are created for all other missing properties. Use _.setWith to
-     * customize path creation.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @return Returns object.
-     */
-    (path: _.PropertyPath, value: any): Set1x2;
-    /**
-     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
-     * missing index properties while objects are created for all other missing properties. Use _.setWith to
-     * customize path creation.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @return Returns object.
-     */
-    <T extends object>(path: _.PropertyPath, value: any, object: T): T;
-    /**
-     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
-     * missing index properties while objects are created for all other missing properties. Use _.setWith to
-     * customize path creation.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @return Returns object.
-     */
-    <TResult>(path: _.PropertyPath, value: any, object: object): TResult;
-}
-interface Set1x1 {
-    /**
-     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
-     * missing index properties while objects are created for all other missing properties. Use _.setWith to
-     * customize path creation.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @return Returns object.
-     */
-    (): Set1x1;
-    /**
-     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
-     * missing index properties while objects are created for all other missing properties. Use _.setWith to
-     * customize path creation.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @return Returns object.
-     */
-    (value: any): Set1x2;
-    /**
-     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
-     * missing index properties while objects are created for all other missing properties. Use _.setWith to
-     * customize path creation.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @return Returns object.
-     */
-    <T extends object>(value: any, object: T): T;
-    /**
-     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
-     * missing index properties while objects are created for all other missing properties. Use _.setWith to
-     * customize path creation.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @return Returns object.
-     */
-    <TResult>(value: any, object: object): TResult;
-}
-interface Set1x2 {
-    /**
-     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
-     * missing index properties while objects are created for all other missing properties. Use _.setWith to
-     * customize path creation.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @return Returns object.
-     */
-    (): Set1x2;
-    /**
-     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
-     * missing index properties while objects are created for all other missing properties. Use _.setWith to
-     * customize path creation.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @return Returns object.
-     */
-    <T extends object>(object: T): T;
-    /**
-     * Sets the value at path of object. If a portion of path doesn’t exist it’s created. Arrays are created for
-     * missing index properties while objects are created for all other missing properties. Use _.setWith to
-     * customize path creation.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @return Returns object.
-     */
-    <TResult>(object: object): TResult;
-}
-
-declare const set: Set;
+import { set } from "../fp";
 export = set;
diff --git a/types/lodash/fp/setWith.d.ts b/types/lodash/fp/setWith.d.ts
index d26b1a88a1..800a49429c 100644
--- a/types/lodash/fp/setWith.d.ts
+++ b/types/lodash/fp/setWith.d.ts
@@ -1,233 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface SetWith {
-    /**
-     * This method is like _.set except that it accepts customizer which is invoked to produce the objects of
-     * path. If customizer returns undefined path creation is handled by the method instead. The customizer is
-     * invoked with three arguments: (nsValue, key, nsObject).
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @parem customizer The function to customize assigned values.
-     * @return Returns object.
-     */
-    (): SetWith;
-    /**
-     * This method is like _.set except that it accepts customizer which is invoked to produce the objects of
-     * path. If customizer returns undefined path creation is handled by the method instead. The customizer is
-     * invoked with three arguments: (nsValue, key, nsObject).
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @parem customizer The function to customize assigned values.
-     * @return Returns object.
-     */
-    <T extends object>(customizer: _.SetWithCustomizer<T>): SetWith1x1<T>;
-    /**
-     * This method is like _.set except that it accepts customizer which is invoked to produce the objects of
-     * path. If customizer returns undefined path creation is handled by the method instead. The customizer is
-     * invoked with three arguments: (nsValue, key, nsObject).
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @parem customizer The function to customize assigned values.
-     * @return Returns object.
-     */
-    <T extends object>(customizer: _.SetWithCustomizer<T>, path: _.PropertyPath): SetWith1x2<T>;
-    /**
-     * This method is like _.set except that it accepts customizer which is invoked to produce the objects of
-     * path. If customizer returns undefined path creation is handled by the method instead. The customizer is
-     * invoked with three arguments: (nsValue, key, nsObject).
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @parem customizer The function to customize assigned values.
-     * @return Returns object.
-     */
-    <T extends object>(customizer: _.SetWithCustomizer<T>, path: _.PropertyPath, value: any): SetWith1x3<T>;
-    /**
-     * This method is like _.set except that it accepts customizer which is invoked to produce the objects of
-     * path. If customizer returns undefined path creation is handled by the method instead. The customizer is
-     * invoked with three arguments: (nsValue, key, nsObject).
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @parem customizer The function to customize assigned values.
-     * @return Returns object.
-     */
-    <T extends object>(customizer: _.SetWithCustomizer<T>, path: _.PropertyPath, value: any, object: T): T;
-    /**
-     * This method is like _.set except that it accepts customizer which is invoked to produce the objects of
-     * path. If customizer returns undefined path creation is handled by the method instead. The customizer is
-     * invoked with three arguments: (nsValue, key, nsObject).
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @parem customizer The function to customize assigned values.
-     * @return Returns object.
-     */
-    <T extends object, TResult>(customizer: _.SetWithCustomizer<T>, path: _.PropertyPath, value: any, object: T): TResult;
-}
-interface SetWith1x1<T extends object> {
-    /**
-     * This method is like _.set except that it accepts customizer which is invoked to produce the objects of
-     * path. If customizer returns undefined path creation is handled by the method instead. The customizer is
-     * invoked with three arguments: (nsValue, key, nsObject).
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @parem customizer The function to customize assigned values.
-     * @return Returns object.
-     */
-    (): SetWith1x1<T>;
-    /**
-     * This method is like _.set except that it accepts customizer which is invoked to produce the objects of
-     * path. If customizer returns undefined path creation is handled by the method instead. The customizer is
-     * invoked with three arguments: (nsValue, key, nsObject).
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @parem customizer The function to customize assigned values.
-     * @return Returns object.
-     */
-    (path: _.PropertyPath): SetWith1x2<T>;
-    /**
-     * This method is like _.set except that it accepts customizer which is invoked to produce the objects of
-     * path. If customizer returns undefined path creation is handled by the method instead. The customizer is
-     * invoked with three arguments: (nsValue, key, nsObject).
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @parem customizer The function to customize assigned values.
-     * @return Returns object.
-     */
-    (path: _.PropertyPath, value: any): SetWith1x3<T>;
-    /**
-     * This method is like _.set except that it accepts customizer which is invoked to produce the objects of
-     * path. If customizer returns undefined path creation is handled by the method instead. The customizer is
-     * invoked with three arguments: (nsValue, key, nsObject).
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @parem customizer The function to customize assigned values.
-     * @return Returns object.
-     */
-    (path: _.PropertyPath, value: any, object: T): T;
-    /**
-     * This method is like _.set except that it accepts customizer which is invoked to produce the objects of
-     * path. If customizer returns undefined path creation is handled by the method instead. The customizer is
-     * invoked with three arguments: (nsValue, key, nsObject).
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @parem customizer The function to customize assigned values.
-     * @return Returns object.
-     */
-    <TResult>(path: _.PropertyPath, value: any, object: T): TResult;
-}
-interface SetWith1x2<T extends object> {
-    /**
-     * This method is like _.set except that it accepts customizer which is invoked to produce the objects of
-     * path. If customizer returns undefined path creation is handled by the method instead. The customizer is
-     * invoked with three arguments: (nsValue, key, nsObject).
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @parem customizer The function to customize assigned values.
-     * @return Returns object.
-     */
-    (): SetWith1x2<T>;
-    /**
-     * This method is like _.set except that it accepts customizer which is invoked to produce the objects of
-     * path. If customizer returns undefined path creation is handled by the method instead. The customizer is
-     * invoked with three arguments: (nsValue, key, nsObject).
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @parem customizer The function to customize assigned values.
-     * @return Returns object.
-     */
-    (value: any): SetWith1x3<T>;
-    /**
-     * This method is like _.set except that it accepts customizer which is invoked to produce the objects of
-     * path. If customizer returns undefined path creation is handled by the method instead. The customizer is
-     * invoked with three arguments: (nsValue, key, nsObject).
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @parem customizer The function to customize assigned values.
-     * @return Returns object.
-     */
-    (value: any, object: T): T;
-    /**
-     * This method is like _.set except that it accepts customizer which is invoked to produce the objects of
-     * path. If customizer returns undefined path creation is handled by the method instead. The customizer is
-     * invoked with three arguments: (nsValue, key, nsObject).
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @parem customizer The function to customize assigned values.
-     * @return Returns object.
-     */
-    <TResult>(value: any, object: T): TResult;
-}
-interface SetWith1x3<T extends object> {
-    /**
-     * This method is like _.set except that it accepts customizer which is invoked to produce the objects of
-     * path. If customizer returns undefined path creation is handled by the method instead. The customizer is
-     * invoked with three arguments: (nsValue, key, nsObject).
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @parem customizer The function to customize assigned values.
-     * @return Returns object.
-     */
-    (): SetWith1x3<T>;
-    /**
-     * This method is like _.set except that it accepts customizer which is invoked to produce the objects of
-     * path. If customizer returns undefined path creation is handled by the method instead. The customizer is
-     * invoked with three arguments: (nsValue, key, nsObject).
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @parem customizer The function to customize assigned values.
-     * @return Returns object.
-     */
-    (object: T): T;
-    /**
-     * This method is like _.set except that it accepts customizer which is invoked to produce the objects of
-     * path. If customizer returns undefined path creation is handled by the method instead. The customizer is
-     * invoked with three arguments: (nsValue, key, nsObject).
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param value The value to set.
-     * @parem customizer The function to customize assigned values.
-     * @return Returns object.
-     */
-    <TResult>(object: T): TResult;
-}
-
-declare const setWith: SetWith;
+import { setWith } from "../fp";
 export = setWith;
diff --git a/types/lodash/fp/shuffle.d.ts b/types/lodash/fp/shuffle.d.ts
index b49c3d10dc..7f07282642 100644
--- a/types/lodash/fp/shuffle.d.ts
+++ b/types/lodash/fp/shuffle.d.ts
@@ -1,25 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Shuffle {
-    /**
-     * Creates an array of shuffled values, using a version of the Fisher-Yates shuffle.
-     *
-     * @param collection The collection to shuffle.
-     * @return Returns the new shuffled array.
-     */
-    <T>(collection: _.List<T> | null | undefined): T[];
-    /**
-     * Creates an array of shuffled values, using a version of the Fisher-Yates shuffle.
-     *
-     * @param collection The collection to shuffle.
-     * @return Returns the new shuffled array.
-     */
-    <T extends object>(collection: T | null | undefined): Array<T[keyof T]>;
-}
-
-declare const shuffle: Shuffle;
+import { shuffle } from "../fp";
 export = shuffle;
diff --git a/types/lodash/fp/size.d.ts b/types/lodash/fp/size.d.ts
index cf4ca2d03b..657c8b7c20 100644
--- a/types/lodash/fp/size.d.ts
+++ b/types/lodash/fp/size.d.ts
@@ -1,16 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type Size =
-    /**
-     * Gets the size of collection by returning its length for array-like values or the number of own enumerable
-     * properties for objects.
-     *
-     * @param collection The collection to inspect.
-     * @return Returns the size of collection.
-     */
-    (collection: object | string | null | undefined) => number;
-
-declare const size: Size;
+import { size } from "../fp";
 export = size;
diff --git a/types/lodash/fp/slice.d.ts b/types/lodash/fp/slice.d.ts
index e602154fa1..fabbbe0eeb 100644
--- a/types/lodash/fp/slice.d.ts
+++ b/types/lodash/fp/slice.d.ts
@@ -1,96 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Slice {
-    /**
-     * Creates a slice of array from start up to, but not including, end.
-     *
-     * @param array The array to slice.
-     * @param start The start position.
-     * @param end The end position.
-     * @return Returns the slice of array.
-     */
-    (): Slice;
-    /**
-     * Creates a slice of array from start up to, but not including, end.
-     *
-     * @param array The array to slice.
-     * @param start The start position.
-     * @param end The end position.
-     * @return Returns the slice of array.
-     */
-    (start: number): Slice1x1;
-    /**
-     * Creates a slice of array from start up to, but not including, end.
-     *
-     * @param array The array to slice.
-     * @param start The start position.
-     * @param end The end position.
-     * @return Returns the slice of array.
-     */
-    (start: number, end: number): Slice1x2;
-    /**
-     * Creates a slice of array from start up to, but not including, end.
-     *
-     * @param array The array to slice.
-     * @param start The start position.
-     * @param end The end position.
-     * @return Returns the slice of array.
-     */
-    <T>(start: number, end: number, array: _.List<T> | null | undefined): T[];
-}
-interface Slice1x1 {
-    /**
-     * Creates a slice of array from start up to, but not including, end.
-     *
-     * @param array The array to slice.
-     * @param start The start position.
-     * @param end The end position.
-     * @return Returns the slice of array.
-     */
-    (): Slice1x1;
-    /**
-     * Creates a slice of array from start up to, but not including, end.
-     *
-     * @param array The array to slice.
-     * @param start The start position.
-     * @param end The end position.
-     * @return Returns the slice of array.
-     */
-    (end: number): Slice1x2;
-    /**
-     * Creates a slice of array from start up to, but not including, end.
-     *
-     * @param array The array to slice.
-     * @param start The start position.
-     * @param end The end position.
-     * @return Returns the slice of array.
-     */
-    <T>(end: number, array: _.List<T> | null | undefined): T[];
-}
-interface Slice1x2 {
-    /**
-     * Creates a slice of array from start up to, but not including, end.
-     *
-     * @param array The array to slice.
-     * @param start The start position.
-     * @param end The end position.
-     * @return Returns the slice of array.
-     */
-    (): Slice1x2;
-    /**
-     * Creates a slice of array from start up to, but not including, end.
-     *
-     * @param array The array to slice.
-     * @param start The start position.
-     * @param end The end position.
-     * @return Returns the slice of array.
-     */
-    <T>(array: _.List<T> | null | undefined): T[];
-}
-
-declare const slice: Slice;
+import { slice } from "../fp";
 export = slice;
diff --git a/types/lodash/fp/snakeCase.d.ts b/types/lodash/fp/snakeCase.d.ts
index ef35bad608..a06ac452fe 100644
--- a/types/lodash/fp/snakeCase.d.ts
+++ b/types/lodash/fp/snakeCase.d.ts
@@ -1,15 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type SnakeCase =
-    /**
-     * Converts string to snake case.
-     *
-     * @param string The string to convert.
-     * @return Returns the snake cased string.
-     */
-    (string: string) => string;
-
-declare const snakeCase: SnakeCase;
+import { snakeCase } from "../fp";
 export = snakeCase;
diff --git a/types/lodash/fp/some.d.ts b/types/lodash/fp/some.d.ts
index f554e380c5..870b23160d 100644
--- a/types/lodash/fp/some.d.ts
+++ b/types/lodash/fp/some.d.ts
@@ -1,67 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Some {
-    /**
-     * Checks if predicate returns truthy for any element of collection. Iteration is stopped once predicate
-     * returns truthy. The predicate is invoked with three arguments: (value, index|key, collection).
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @return Returns true if any element passes the predicate check, else false.
-     */
-    (): Some;
-    /**
-     * Checks if predicate returns truthy for any element of collection. Iteration is stopped once predicate
-     * returns truthy. The predicate is invoked with three arguments: (value, index|key, collection).
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @return Returns true if any element passes the predicate check, else false.
-     */
-    <T>(predicate: _.ValueIterateeCustom<T, boolean>): Some1x1<T>;
-    /**
-     * Checks if predicate returns truthy for any element of collection. Iteration is stopped once predicate
-     * returns truthy. The predicate is invoked with three arguments: (value, index|key, collection).
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @return Returns true if any element passes the predicate check, else false.
-     */
-    <T>(predicate: _.ValueIterateeCustom<T, boolean>, collection: _.List<T> | null | undefined): boolean;
-    /**
-     * Checks if predicate returns truthy for any element of collection. Iteration is stopped once predicate
-     * returns truthy. The predicate is invoked with three arguments: (value, index|key, collection).
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @return Returns true if any element passes the predicate check, else false.
-     */
-    <T extends object>(predicate: _.ValueIterateeCustom<T[keyof T], boolean>, collection: T | null | undefined): boolean;
-}
-interface Some1x1<T> {
-    /**
-     * Checks if predicate returns truthy for any element of collection. Iteration is stopped once predicate
-     * returns truthy. The predicate is invoked with three arguments: (value, index|key, collection).
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @return Returns true if any element passes the predicate check, else false.
-     */
-    (): Some1x1<T>;
-    /**
-     * Checks if predicate returns truthy for any element of collection. Iteration is stopped once predicate
-     * returns truthy. The predicate is invoked with three arguments: (value, index|key, collection).
-     *
-     * @param collection The collection to iterate over.
-     * @param predicate The function invoked per iteration.
-     * @return Returns true if any element passes the predicate check, else false.
-     */
-    (collection: _.List<T> | object | null | undefined): boolean;
-}
-
-declare const some: Some;
+import { some } from "../fp";
 export = some;
diff --git a/types/lodash/fp/sortBy.d.ts b/types/lodash/fp/sortBy.d.ts
index 3b0a1c128c..72c5799b36 100644
--- a/types/lodash/fp/sortBy.d.ts
+++ b/types/lodash/fp/sortBy.d.ts
@@ -1,205 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface SortBy {
-    /**
-     * Creates an array of elements, sorted in ascending order by the results of
-     * running each element in a collection through each iteratee. This method
-     * performs a stable sort, that is, it preserves the original sort order of
-     * equal elements. The iteratees are invoked with one argument: (value).
-     *
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratees=[_.identity]]
-     *  The iteratees to sort by, specified individually or in arrays.
-     * @returns Returns the new sorted array.
-     * @example
-     *
-     * var users = [
-     *   { 'user': 'fred',   'age': 48 },
-     *   { 'user': 'barney', 'age': 36 },
-     *   { 'user': 'fred',   'age': 42 },
-     *   { 'user': 'barney', 'age': 34 }
-     * ];
-     *
-     * _.sortBy(users, function(o) { return o.user; });
-     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
-     *
-     * _.sortBy(users, ['user', 'age']);
-     * // => objects for [['barney', 34], ['barney', 36], ['fred', 42], ['fred', 48]]
-     *
-     * _.sortBy(users, 'user', function(o) {
-     *   return Math.floor(o.age / 10);
-     * });
-     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
-     */
-    (): SortBy;
-    /**
-     * Creates an array of elements, sorted in ascending order by the results of
-     * running each element in a collection through each iteratee. This method
-     * performs a stable sort, that is, it preserves the original sort order of
-     * equal elements. The iteratees are invoked with one argument: (value).
-     *
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratees=[_.identity]]
-     *  The iteratees to sort by, specified individually or in arrays.
-     * @returns Returns the new sorted array.
-     * @example
-     *
-     * var users = [
-     *   { 'user': 'fred',   'age': 48 },
-     *   { 'user': 'barney', 'age': 36 },
-     *   { 'user': 'fred',   'age': 42 },
-     *   { 'user': 'barney', 'age': 34 }
-     * ];
-     *
-     * _.sortBy(users, function(o) { return o.user; });
-     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
-     *
-     * _.sortBy(users, ['user', 'age']);
-     * // => objects for [['barney', 34], ['barney', 36], ['fred', 42], ['fred', 48]]
-     *
-     * _.sortBy(users, 'user', function(o) {
-     *   return Math.floor(o.age / 10);
-     * });
-     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
-     */
-    <T>(iteratees: _.Many<_.ValueIteratee<T>>): SortBy1x1<T>;
-    /**
-     * Creates an array of elements, sorted in ascending order by the results of
-     * running each element in a collection through each iteratee. This method
-     * performs a stable sort, that is, it preserves the original sort order of
-     * equal elements. The iteratees are invoked with one argument: (value).
-     *
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratees=[_.identity]]
-     *  The iteratees to sort by, specified individually or in arrays.
-     * @returns Returns the new sorted array.
-     * @example
-     *
-     * var users = [
-     *   { 'user': 'fred',   'age': 48 },
-     *   { 'user': 'barney', 'age': 36 },
-     *   { 'user': 'fred',   'age': 42 },
-     *   { 'user': 'barney', 'age': 34 }
-     * ];
-     *
-     * _.sortBy(users, function(o) { return o.user; });
-     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
-     *
-     * _.sortBy(users, ['user', 'age']);
-     * // => objects for [['barney', 34], ['barney', 36], ['fred', 42], ['fred', 48]]
-     *
-     * _.sortBy(users, 'user', function(o) {
-     *   return Math.floor(o.age / 10);
-     * });
-     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
-     */
-    <T>(iteratees: _.Many<_.ValueIteratee<T>>, collection: _.List<T> | null | undefined): T[];
-    /**
-     * Creates an array of elements, sorted in ascending order by the results of
-     * running each element in a collection through each iteratee. This method
-     * performs a stable sort, that is, it preserves the original sort order of
-     * equal elements. The iteratees are invoked with one argument: (value).
-     *
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratees=[_.identity]]
-     *  The iteratees to sort by, specified individually or in arrays.
-     * @returns Returns the new sorted array.
-     * @example
-     *
-     * var users = [
-     *   { 'user': 'fred',   'age': 48 },
-     *   { 'user': 'barney', 'age': 36 },
-     *   { 'user': 'fred',   'age': 42 },
-     *   { 'user': 'barney', 'age': 34 }
-     * ];
-     *
-     * _.sortBy(users, function(o) { return o.user; });
-     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
-     *
-     * _.sortBy(users, ['user', 'age']);
-     * // => objects for [['barney', 34], ['barney', 36], ['fred', 42], ['fred', 48]]
-     *
-     * _.sortBy(users, 'user', function(o) {
-     *   return Math.floor(o.age / 10);
-     * });
-     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
-     */
-    <T extends object>(iteratees: _.Many<_.ValueIteratee<T[keyof T]>>, collection: T | null | undefined): Array<T[keyof T]>;
-}
-interface SortBy1x1<T> {
-    /**
-     * Creates an array of elements, sorted in ascending order by the results of
-     * running each element in a collection through each iteratee. This method
-     * performs a stable sort, that is, it preserves the original sort order of
-     * equal elements. The iteratees are invoked with one argument: (value).
-     *
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratees=[_.identity]]
-     *  The iteratees to sort by, specified individually or in arrays.
-     * @returns Returns the new sorted array.
-     * @example
-     *
-     * var users = [
-     *   { 'user': 'fred',   'age': 48 },
-     *   { 'user': 'barney', 'age': 36 },
-     *   { 'user': 'fred',   'age': 42 },
-     *   { 'user': 'barney', 'age': 34 }
-     * ];
-     *
-     * _.sortBy(users, function(o) { return o.user; });
-     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
-     *
-     * _.sortBy(users, ['user', 'age']);
-     * // => objects for [['barney', 34], ['barney', 36], ['fred', 42], ['fred', 48]]
-     *
-     * _.sortBy(users, 'user', function(o) {
-     *   return Math.floor(o.age / 10);
-     * });
-     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
-     */
-    (): SortBy1x1<T>;
-    /**
-     * Creates an array of elements, sorted in ascending order by the results of
-     * running each element in a collection through each iteratee. This method
-     * performs a stable sort, that is, it preserves the original sort order of
-     * equal elements. The iteratees are invoked with one argument: (value).
-     *
-     * @category Collection
-     * @param collection The collection to iterate over.
-     * @param [iteratees=[_.identity]]
-     *  The iteratees to sort by, specified individually or in arrays.
-     * @returns Returns the new sorted array.
-     * @example
-     *
-     * var users = [
-     *   { 'user': 'fred',   'age': 48 },
-     *   { 'user': 'barney', 'age': 36 },
-     *   { 'user': 'fred',   'age': 42 },
-     *   { 'user': 'barney', 'age': 34 }
-     * ];
-     *
-     * _.sortBy(users, function(o) { return o.user; });
-     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
-     *
-     * _.sortBy(users, ['user', 'age']);
-     * // => objects for [['barney', 34], ['barney', 36], ['fred', 42], ['fred', 48]]
-     *
-     * _.sortBy(users, 'user', function(o) {
-     *   return Math.floor(o.age / 10);
-     * });
-     * // => objects for [['barney', 36], ['barney', 34], ['fred', 48], ['fred', 42]]
-     */
-    (collection: _.List<T> | object | null | undefined): T[];
-}
-
-declare const sortBy: SortBy;
+import { sortBy } from "../fp";
 export = sortBy;
diff --git a/types/lodash/fp/sortedIndex.d.ts b/types/lodash/fp/sortedIndex.d.ts
index c230bd6858..35b57feed2 100644
--- a/types/lodash/fp/sortedIndex.d.ts
+++ b/types/lodash/fp/sortedIndex.d.ts
@@ -1,98 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface SortedIndex {
-    /**
-     * Uses a binary search to determine the lowest index at which `value` should
-     * be inserted into `array` in order to maintain its sort order.
-     *
-     * @category Array
-     * @param array The sorted array to inspect.
-     * @param value The value to evaluate.
-     * @returns Returns the index at which `value` should be inserted into `array`.
-     * @example
-     *
-     * _.sortedIndex([30, 50], 40);
-     * // => 1
-     *
-     * _.sortedIndex([4, 5], 4);
-     * // => 0
-     */
-    (): SortedIndex;
-    /**
-     * Uses a binary search to determine the lowest index at which `value` should
-     * be inserted into `array` in order to maintain its sort order.
-     *
-     * @category Array
-     * @param array The sorted array to inspect.
-     * @param value The value to evaluate.
-     * @returns Returns the index at which `value` should be inserted into `array`.
-     * @example
-     *
-     * _.sortedIndex([30, 50], 40);
-     * // => 1
-     *
-     * _.sortedIndex([4, 5], 4);
-     * // => 0
-     */
-    <T>(value: T): SortedIndex1x1<T>;
-    /**
-     * Uses a binary search to determine the lowest index at which `value` should
-     * be inserted into `array` in order to maintain its sort order.
-     *
-     * @category Array
-     * @param array The sorted array to inspect.
-     * @param value The value to evaluate.
-     * @returns Returns the index at which `value` should be inserted into `array`.
-     * @example
-     *
-     * _.sortedIndex([30, 50], 40);
-     * // => 1
-     *
-     * _.sortedIndex([4, 5], 4);
-     * // => 0
-     */
-    <T>(value: T, array: _.List<T> | null | undefined): number;
-}
-interface SortedIndex1x1<T> {
-    /**
-     * Uses a binary search to determine the lowest index at which `value` should
-     * be inserted into `array` in order to maintain its sort order.
-     *
-     * @category Array
-     * @param array The sorted array to inspect.
-     * @param value The value to evaluate.
-     * @returns Returns the index at which `value` should be inserted into `array`.
-     * @example
-     *
-     * _.sortedIndex([30, 50], 40);
-     * // => 1
-     *
-     * _.sortedIndex([4, 5], 4);
-     * // => 0
-     */
-    (): SortedIndex1x1<T>;
-    /**
-     * Uses a binary search to determine the lowest index at which `value` should
-     * be inserted into `array` in order to maintain its sort order.
-     *
-     * @category Array
-     * @param array The sorted array to inspect.
-     * @param value The value to evaluate.
-     * @returns Returns the index at which `value` should be inserted into `array`.
-     * @example
-     *
-     * _.sortedIndex([30, 50], 40);
-     * // => 1
-     *
-     * _.sortedIndex([4, 5], 4);
-     * // => 0
-     */
-    (array: _.List<T> | null | undefined): number;
-}
-
-declare const sortedIndex: SortedIndex;
+import { sortedIndex } from "../fp";
 export = sortedIndex;
diff --git a/types/lodash/fp/sortedIndexBy.d.ts b/types/lodash/fp/sortedIndexBy.d.ts
index 02a1ffbae6..f6968df691 100644
--- a/types/lodash/fp/sortedIndexBy.d.ts
+++ b/types/lodash/fp/sortedIndexBy.d.ts
@@ -1,213 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface SortedIndexBy {
-    /**
-     * This method is like `_.sortedIndex` except that it accepts `iteratee`
-     * which is invoked for `value` and each element of `array` to compute their
-     * sort ranking. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param array The sorted array to inspect.
-     * @param value The value to evaluate.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the index at which `value` should be inserted into `array`.
-     * @example
-     *
-     * var dict = { 'thirty': 30, 'forty': 40, 'fifty': 50 };
-     *
-     * _.sortedIndexBy(['thirty', 'fifty'], 'forty', _.propertyOf(dict));
-     * // => 1
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.sortedIndexBy([{ 'x': 4 }, { 'x': 5 }], { 'x': 4 }, 'x');
-     * // => 0
-     */
-    (): SortedIndexBy;
-    /**
-     * This method is like `_.sortedIndex` except that it accepts `iteratee`
-     * which is invoked for `value` and each element of `array` to compute their
-     * sort ranking. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param array The sorted array to inspect.
-     * @param value The value to evaluate.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the index at which `value` should be inserted into `array`.
-     * @example
-     *
-     * var dict = { 'thirty': 30, 'forty': 40, 'fifty': 50 };
-     *
-     * _.sortedIndexBy(['thirty', 'fifty'], 'forty', _.propertyOf(dict));
-     * // => 1
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.sortedIndexBy([{ 'x': 4 }, { 'x': 5 }], { 'x': 4 }, 'x');
-     * // => 0
-     */
-    <T>(iteratee: _.ValueIteratee<T>): SortedIndexBy1x1<T>;
-    /**
-     * This method is like `_.sortedIndex` except that it accepts `iteratee`
-     * which is invoked for `value` and each element of `array` to compute their
-     * sort ranking. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param array The sorted array to inspect.
-     * @param value The value to evaluate.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the index at which `value` should be inserted into `array`.
-     * @example
-     *
-     * var dict = { 'thirty': 30, 'forty': 40, 'fifty': 50 };
-     *
-     * _.sortedIndexBy(['thirty', 'fifty'], 'forty', _.propertyOf(dict));
-     * // => 1
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.sortedIndexBy([{ 'x': 4 }, { 'x': 5 }], { 'x': 4 }, 'x');
-     * // => 0
-     */
-    <T>(iteratee: _.ValueIteratee<T>, value: T): SortedIndexBy1x2<T>;
-    /**
-     * This method is like `_.sortedIndex` except that it accepts `iteratee`
-     * which is invoked for `value` and each element of `array` to compute their
-     * sort ranking. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param array The sorted array to inspect.
-     * @param value The value to evaluate.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the index at which `value` should be inserted into `array`.
-     * @example
-     *
-     * var dict = { 'thirty': 30, 'forty': 40, 'fifty': 50 };
-     *
-     * _.sortedIndexBy(['thirty', 'fifty'], 'forty', _.propertyOf(dict));
-     * // => 1
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.sortedIndexBy([{ 'x': 4 }, { 'x': 5 }], { 'x': 4 }, 'x');
-     * // => 0
-     */
-    <T>(iteratee: _.ValueIteratee<T>, value: T, array: _.List<T> | null | undefined): number;
-}
-interface SortedIndexBy1x1<T> {
-    /**
-     * This method is like `_.sortedIndex` except that it accepts `iteratee`
-     * which is invoked for `value` and each element of `array` to compute their
-     * sort ranking. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param array The sorted array to inspect.
-     * @param value The value to evaluate.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the index at which `value` should be inserted into `array`.
-     * @example
-     *
-     * var dict = { 'thirty': 30, 'forty': 40, 'fifty': 50 };
-     *
-     * _.sortedIndexBy(['thirty', 'fifty'], 'forty', _.propertyOf(dict));
-     * // => 1
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.sortedIndexBy([{ 'x': 4 }, { 'x': 5 }], { 'x': 4 }, 'x');
-     * // => 0
-     */
-    (): SortedIndexBy1x1<T>;
-    /**
-     * This method is like `_.sortedIndex` except that it accepts `iteratee`
-     * which is invoked for `value` and each element of `array` to compute their
-     * sort ranking. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param array The sorted array to inspect.
-     * @param value The value to evaluate.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the index at which `value` should be inserted into `array`.
-     * @example
-     *
-     * var dict = { 'thirty': 30, 'forty': 40, 'fifty': 50 };
-     *
-     * _.sortedIndexBy(['thirty', 'fifty'], 'forty', _.propertyOf(dict));
-     * // => 1
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.sortedIndexBy([{ 'x': 4 }, { 'x': 5 }], { 'x': 4 }, 'x');
-     * // => 0
-     */
-    (value: T): SortedIndexBy1x2<T>;
-    /**
-     * This method is like `_.sortedIndex` except that it accepts `iteratee`
-     * which is invoked for `value` and each element of `array` to compute their
-     * sort ranking. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param array The sorted array to inspect.
-     * @param value The value to evaluate.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the index at which `value` should be inserted into `array`.
-     * @example
-     *
-     * var dict = { 'thirty': 30, 'forty': 40, 'fifty': 50 };
-     *
-     * _.sortedIndexBy(['thirty', 'fifty'], 'forty', _.propertyOf(dict));
-     * // => 1
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.sortedIndexBy([{ 'x': 4 }, { 'x': 5 }], { 'x': 4 }, 'x');
-     * // => 0
-     */
-    (value: T, array: _.List<T> | null | undefined): number;
-}
-interface SortedIndexBy1x2<T> {
-    /**
-     * This method is like `_.sortedIndex` except that it accepts `iteratee`
-     * which is invoked for `value` and each element of `array` to compute their
-     * sort ranking. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param array The sorted array to inspect.
-     * @param value The value to evaluate.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the index at which `value` should be inserted into `array`.
-     * @example
-     *
-     * var dict = { 'thirty': 30, 'forty': 40, 'fifty': 50 };
-     *
-     * _.sortedIndexBy(['thirty', 'fifty'], 'forty', _.propertyOf(dict));
-     * // => 1
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.sortedIndexBy([{ 'x': 4 }, { 'x': 5 }], { 'x': 4 }, 'x');
-     * // => 0
-     */
-    (): SortedIndexBy1x2<T>;
-    /**
-     * This method is like `_.sortedIndex` except that it accepts `iteratee`
-     * which is invoked for `value` and each element of `array` to compute their
-     * sort ranking. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param array The sorted array to inspect.
-     * @param value The value to evaluate.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the index at which `value` should be inserted into `array`.
-     * @example
-     *
-     * var dict = { 'thirty': 30, 'forty': 40, 'fifty': 50 };
-     *
-     * _.sortedIndexBy(['thirty', 'fifty'], 'forty', _.propertyOf(dict));
-     * // => 1
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.sortedIndexBy([{ 'x': 4 }, { 'x': 5 }], { 'x': 4 }, 'x');
-     * // => 0
-     */
-    (array: _.List<T> | null | undefined): number;
-}
-
-declare const sortedIndexBy: SortedIndexBy;
+import { sortedIndexBy } from "../fp";
 export = sortedIndexBy;
diff --git a/types/lodash/fp/sortedIndexOf.d.ts b/types/lodash/fp/sortedIndexOf.d.ts
index 0b9f5503ab..beeb6db0ca 100644
--- a/types/lodash/fp/sortedIndexOf.d.ts
+++ b/types/lodash/fp/sortedIndexOf.d.ts
@@ -1,83 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface SortedIndexOf {
-    /**
-     * This method is like `_.indexOf` except that it performs a binary
-     * search on a sorted `array`.
-     *
-     * @category Array
-     * @param array The array to search.
-     * @param value The value to search for.
-     * @returns Returns the index of the matched value, else `-1`.
-     * @example
-     *
-     * _.sortedIndexOf([1, 1, 2, 2], 2);
-     * // => 2
-     */
-    (): SortedIndexOf;
-    /**
-     * This method is like `_.indexOf` except that it performs a binary
-     * search on a sorted `array`.
-     *
-     * @category Array
-     * @param array The array to search.
-     * @param value The value to search for.
-     * @returns Returns the index of the matched value, else `-1`.
-     * @example
-     *
-     * _.sortedIndexOf([1, 1, 2, 2], 2);
-     * // => 2
-     */
-    <T>(value: T): SortedIndexOf1x1<T>;
-    /**
-     * This method is like `_.indexOf` except that it performs a binary
-     * search on a sorted `array`.
-     *
-     * @category Array
-     * @param array The array to search.
-     * @param value The value to search for.
-     * @returns Returns the index of the matched value, else `-1`.
-     * @example
-     *
-     * _.sortedIndexOf([1, 1, 2, 2], 2);
-     * // => 2
-     */
-    <T>(value: T, array: _.List<T> | null | undefined): number;
-}
-interface SortedIndexOf1x1<T> {
-    /**
-     * This method is like `_.indexOf` except that it performs a binary
-     * search on a sorted `array`.
-     *
-     * @category Array
-     * @param array The array to search.
-     * @param value The value to search for.
-     * @returns Returns the index of the matched value, else `-1`.
-     * @example
-     *
-     * _.sortedIndexOf([1, 1, 2, 2], 2);
-     * // => 2
-     */
-    (): SortedIndexOf1x1<T>;
-    /**
-     * This method is like `_.indexOf` except that it performs a binary
-     * search on a sorted `array`.
-     *
-     * @category Array
-     * @param array The array to search.
-     * @param value The value to search for.
-     * @returns Returns the index of the matched value, else `-1`.
-     * @example
-     *
-     * _.sortedIndexOf([1, 1, 2, 2], 2);
-     * // => 2
-     */
-    (array: _.List<T> | null | undefined): number;
-}
-
-declare const sortedIndexOf: SortedIndexOf;
+import { sortedIndexOf } from "../fp";
 export = sortedIndexOf;
diff --git a/types/lodash/fp/sortedLastIndex.d.ts b/types/lodash/fp/sortedLastIndex.d.ts
index 26b45fe1df..eea77a0382 100644
--- a/types/lodash/fp/sortedLastIndex.d.ts
+++ b/types/lodash/fp/sortedLastIndex.d.ts
@@ -1,88 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface SortedLastIndex {
-    /**
-     * This method is like `_.sortedIndex` except that it returns the highest
-     * index at which `value` should be inserted into `array` in order to
-     * maintain its sort order.
-     *
-     * @category Array
-     * @param array The sorted array to inspect.
-     * @param value The value to evaluate.
-     * @returns Returns the index at which `value` should be inserted into `array`.
-     * @example
-     *
-     * _.sortedLastIndex([4, 5], 4);
-     * // => 1
-     */
-    (): SortedLastIndex;
-    /**
-     * This method is like `_.sortedIndex` except that it returns the highest
-     * index at which `value` should be inserted into `array` in order to
-     * maintain its sort order.
-     *
-     * @category Array
-     * @param array The sorted array to inspect.
-     * @param value The value to evaluate.
-     * @returns Returns the index at which `value` should be inserted into `array`.
-     * @example
-     *
-     * _.sortedLastIndex([4, 5], 4);
-     * // => 1
-     */
-    <T>(value: T): SortedLastIndex1x1<T>;
-    /**
-     * This method is like `_.sortedIndex` except that it returns the highest
-     * index at which `value` should be inserted into `array` in order to
-     * maintain its sort order.
-     *
-     * @category Array
-     * @param array The sorted array to inspect.
-     * @param value The value to evaluate.
-     * @returns Returns the index at which `value` should be inserted into `array`.
-     * @example
-     *
-     * _.sortedLastIndex([4, 5], 4);
-     * // => 1
-     */
-    <T>(value: T, array: _.List<T> | null | undefined): number;
-}
-interface SortedLastIndex1x1<T> {
-    /**
-     * This method is like `_.sortedIndex` except that it returns the highest
-     * index at which `value` should be inserted into `array` in order to
-     * maintain its sort order.
-     *
-     * @category Array
-     * @param array The sorted array to inspect.
-     * @param value The value to evaluate.
-     * @returns Returns the index at which `value` should be inserted into `array`.
-     * @example
-     *
-     * _.sortedLastIndex([4, 5], 4);
-     * // => 1
-     */
-    (): SortedLastIndex1x1<T>;
-    /**
-     * This method is like `_.sortedIndex` except that it returns the highest
-     * index at which `value` should be inserted into `array` in order to
-     * maintain its sort order.
-     *
-     * @category Array
-     * @param array The sorted array to inspect.
-     * @param value The value to evaluate.
-     * @returns Returns the index at which `value` should be inserted into `array`.
-     * @example
-     *
-     * _.sortedLastIndex([4, 5], 4);
-     * // => 1
-     */
-    (array: _.List<T> | null | undefined): number;
-}
-
-declare const sortedLastIndex: SortedLastIndex;
+import { sortedLastIndex } from "../fp";
 export = sortedLastIndex;
diff --git a/types/lodash/fp/sortedLastIndexBy.d.ts b/types/lodash/fp/sortedLastIndexBy.d.ts
index 6f00b9c982..6c8e4ee545 100644
--- a/types/lodash/fp/sortedLastIndexBy.d.ts
+++ b/types/lodash/fp/sortedLastIndexBy.d.ts
@@ -1,168 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface SortedLastIndexBy {
-    /**
-     * This method is like `_.sortedLastIndex` except that it accepts `iteratee`
-     * which is invoked for `value` and each element of `array` to compute their
-     * sort ranking. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param array The sorted array to inspect.
-     * @param value The value to evaluate.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the index at which `value` should be inserted into `array`.
-     * @example
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.sortedLastIndexBy([{ 'x': 4 }, { 'x': 5 }], { 'x': 4 }, 'x');
-     * // => 1
-     */
-    (): SortedLastIndexBy;
-    /**
-     * This method is like `_.sortedLastIndex` except that it accepts `iteratee`
-     * which is invoked for `value` and each element of `array` to compute their
-     * sort ranking. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param array The sorted array to inspect.
-     * @param value The value to evaluate.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the index at which `value` should be inserted into `array`.
-     * @example
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.sortedLastIndexBy([{ 'x': 4 }, { 'x': 5 }], { 'x': 4 }, 'x');
-     * // => 1
-     */
-    <T>(iteratee: _.ValueIteratee<T>): SortedLastIndexBy1x1<T>;
-    /**
-     * This method is like `_.sortedLastIndex` except that it accepts `iteratee`
-     * which is invoked for `value` and each element of `array` to compute their
-     * sort ranking. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param array The sorted array to inspect.
-     * @param value The value to evaluate.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the index at which `value` should be inserted into `array`.
-     * @example
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.sortedLastIndexBy([{ 'x': 4 }, { 'x': 5 }], { 'x': 4 }, 'x');
-     * // => 1
-     */
-    <T>(iteratee: _.ValueIteratee<T>, value: T): SortedLastIndexBy1x2<T>;
-    /**
-     * This method is like `_.sortedLastIndex` except that it accepts `iteratee`
-     * which is invoked for `value` and each element of `array` to compute their
-     * sort ranking. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param array The sorted array to inspect.
-     * @param value The value to evaluate.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the index at which `value` should be inserted into `array`.
-     * @example
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.sortedLastIndexBy([{ 'x': 4 }, { 'x': 5 }], { 'x': 4 }, 'x');
-     * // => 1
-     */
-    <T>(iteratee: _.ValueIteratee<T>, value: T, array: _.List<T> | null | undefined): number;
-}
-interface SortedLastIndexBy1x1<T> {
-    /**
-     * This method is like `_.sortedLastIndex` except that it accepts `iteratee`
-     * which is invoked for `value` and each element of `array` to compute their
-     * sort ranking. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param array The sorted array to inspect.
-     * @param value The value to evaluate.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the index at which `value` should be inserted into `array`.
-     * @example
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.sortedLastIndexBy([{ 'x': 4 }, { 'x': 5 }], { 'x': 4 }, 'x');
-     * // => 1
-     */
-    (): SortedLastIndexBy1x1<T>;
-    /**
-     * This method is like `_.sortedLastIndex` except that it accepts `iteratee`
-     * which is invoked for `value` and each element of `array` to compute their
-     * sort ranking. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param array The sorted array to inspect.
-     * @param value The value to evaluate.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the index at which `value` should be inserted into `array`.
-     * @example
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.sortedLastIndexBy([{ 'x': 4 }, { 'x': 5 }], { 'x': 4 }, 'x');
-     * // => 1
-     */
-    (value: T): SortedLastIndexBy1x2<T>;
-    /**
-     * This method is like `_.sortedLastIndex` except that it accepts `iteratee`
-     * which is invoked for `value` and each element of `array` to compute their
-     * sort ranking. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param array The sorted array to inspect.
-     * @param value The value to evaluate.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the index at which `value` should be inserted into `array`.
-     * @example
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.sortedLastIndexBy([{ 'x': 4 }, { 'x': 5 }], { 'x': 4 }, 'x');
-     * // => 1
-     */
-    (value: T, array: _.List<T> | null | undefined): number;
-}
-interface SortedLastIndexBy1x2<T> {
-    /**
-     * This method is like `_.sortedLastIndex` except that it accepts `iteratee`
-     * which is invoked for `value` and each element of `array` to compute their
-     * sort ranking. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param array The sorted array to inspect.
-     * @param value The value to evaluate.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the index at which `value` should be inserted into `array`.
-     * @example
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.sortedLastIndexBy([{ 'x': 4 }, { 'x': 5 }], { 'x': 4 }, 'x');
-     * // => 1
-     */
-    (): SortedLastIndexBy1x2<T>;
-    /**
-     * This method is like `_.sortedLastIndex` except that it accepts `iteratee`
-     * which is invoked for `value` and each element of `array` to compute their
-     * sort ranking. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param array The sorted array to inspect.
-     * @param value The value to evaluate.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the index at which `value` should be inserted into `array`.
-     * @example
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.sortedLastIndexBy([{ 'x': 4 }, { 'x': 5 }], { 'x': 4 }, 'x');
-     * // => 1
-     */
-    (array: _.List<T> | null | undefined): number;
-}
-
-declare const sortedLastIndexBy: SortedLastIndexBy;
+import { sortedLastIndexBy } from "../fp";
 export = sortedLastIndexBy;
diff --git a/types/lodash/fp/sortedLastIndexOf.d.ts b/types/lodash/fp/sortedLastIndexOf.d.ts
index 3fb6d2d77b..a02caf3ce5 100644
--- a/types/lodash/fp/sortedLastIndexOf.d.ts
+++ b/types/lodash/fp/sortedLastIndexOf.d.ts
@@ -1,83 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface SortedLastIndexOf {
-    /**
-     * This method is like `_.lastIndexOf` except that it performs a binary
-     * search on a sorted `array`.
-     *
-     * @category Array
-     * @param array The array to search.
-     * @param value The value to search for.
-     * @returns Returns the index of the matched value, else `-1`.
-     * @example
-     *
-     * _.sortedLastIndexOf([1, 1, 2, 2], 2);
-     * // => 3
-     */
-    (): SortedLastIndexOf;
-    /**
-     * This method is like `_.lastIndexOf` except that it performs a binary
-     * search on a sorted `array`.
-     *
-     * @category Array
-     * @param array The array to search.
-     * @param value The value to search for.
-     * @returns Returns the index of the matched value, else `-1`.
-     * @example
-     *
-     * _.sortedLastIndexOf([1, 1, 2, 2], 2);
-     * // => 3
-     */
-    <T>(value: T): SortedLastIndexOf1x1<T>;
-    /**
-     * This method is like `_.lastIndexOf` except that it performs a binary
-     * search on a sorted `array`.
-     *
-     * @category Array
-     * @param array The array to search.
-     * @param value The value to search for.
-     * @returns Returns the index of the matched value, else `-1`.
-     * @example
-     *
-     * _.sortedLastIndexOf([1, 1, 2, 2], 2);
-     * // => 3
-     */
-    <T>(value: T, array: _.List<T> | null | undefined): number;
-}
-interface SortedLastIndexOf1x1<T> {
-    /**
-     * This method is like `_.lastIndexOf` except that it performs a binary
-     * search on a sorted `array`.
-     *
-     * @category Array
-     * @param array The array to search.
-     * @param value The value to search for.
-     * @returns Returns the index of the matched value, else `-1`.
-     * @example
-     *
-     * _.sortedLastIndexOf([1, 1, 2, 2], 2);
-     * // => 3
-     */
-    (): SortedLastIndexOf1x1<T>;
-    /**
-     * This method is like `_.lastIndexOf` except that it performs a binary
-     * search on a sorted `array`.
-     *
-     * @category Array
-     * @param array The array to search.
-     * @param value The value to search for.
-     * @returns Returns the index of the matched value, else `-1`.
-     * @example
-     *
-     * _.sortedLastIndexOf([1, 1, 2, 2], 2);
-     * // => 3
-     */
-    (array: _.List<T> | null | undefined): number;
-}
-
-declare const sortedLastIndexOf: SortedLastIndexOf;
+import { sortedLastIndexOf } from "../fp";
 export = sortedLastIndexOf;
diff --git a/types/lodash/fp/sortedUniq.d.ts b/types/lodash/fp/sortedUniq.d.ts
index ae5c6a826b..03d8e691e0 100644
--- a/types/lodash/fp/sortedUniq.d.ts
+++ b/types/lodash/fp/sortedUniq.d.ts
@@ -1,23 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-type SortedUniq =
-    /**
-     * This method is like `_.uniq` except that it's designed and optimized
-     * for sorted arrays.
-     *
-     * @category Array
-     * @param array The array to inspect.
-     * @returns Returns the new duplicate free array.
-     * @example
-     *
-     * _.sortedUniq([1, 1, 2]);
-     * // => [1, 2]
-     */
-    <T>(array: _.List<T> | null | undefined) => T[];
-
-declare const sortedUniq: SortedUniq;
+import { sortedUniq } from "../fp";
 export = sortedUniq;
diff --git a/types/lodash/fp/sortedUniqBy.d.ts b/types/lodash/fp/sortedUniqBy.d.ts
index 9300e80b75..466981a264 100644
--- a/types/lodash/fp/sortedUniqBy.d.ts
+++ b/types/lodash/fp/sortedUniqBy.d.ts
@@ -1,141 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface SortedUniqBy {
-    /**
-     * This method is like `_.uniqBy` except that it's designed and optimized
-     * for sorted arrays.
-     *
-     * @category Array
-     * @param array The array to inspect.
-     * @param [iteratee] The iteratee invoked per element.
-     * @returns Returns the new duplicate free array.
-     * @example
-     *
-     * _.sortedUniqBy([1.1, 1.2, 2.3, 2.4], Math.floor);
-     * // => [1.1, 2.2]
-     */
-    (): SortedUniqBy;
-    /**
-     * This method is like `_.uniqBy` except that it's designed and optimized
-     * for sorted arrays.
-     *
-     * @category Array
-     * @param array The array to inspect.
-     * @param [iteratee] The iteratee invoked per element.
-     * @returns Returns the new duplicate free array.
-     * @example
-     *
-     * _.sortedUniqBy([1.1, 1.2, 2.3, 2.4], Math.floor);
-     * // => [1.1, 2.2]
-     */
-    (iteratee: (value: string) => _.NotVoid): SortedUniqBy1x1;
-    /**
-     * This method is like `_.uniqBy` except that it's designed and optimized
-     * for sorted arrays.
-     *
-     * @category Array
-     * @param array The array to inspect.
-     * @param [iteratee] The iteratee invoked per element.
-     * @returns Returns the new duplicate free array.
-     * @example
-     *
-     * _.sortedUniqBy([1.1, 1.2, 2.3, 2.4], Math.floor);
-     * // => [1.1, 2.2]
-     */
-    (iteratee: (value: string) => _.NotVoid, array: string | null | undefined): string[];
-    /**
-     * This method is like `_.uniqBy` except that it's designed and optimized
-     * for sorted arrays.
-     *
-     * @category Array
-     * @param array The array to inspect.
-     * @param [iteratee] The iteratee invoked per element.
-     * @returns Returns the new duplicate free array.
-     * @example
-     *
-     * _.sortedUniqBy([1.1, 1.2, 2.3, 2.4], Math.floor);
-     * // => [1.1, 2.2]
-     */
-    <T>(iteratee: _.ValueIteratee<T>): SortedUniqBy2x1<T>;
-    /**
-     * This method is like `_.uniqBy` except that it's designed and optimized
-     * for sorted arrays.
-     *
-     * @category Array
-     * @param array The array to inspect.
-     * @param [iteratee] The iteratee invoked per element.
-     * @returns Returns the new duplicate free array.
-     * @example
-     *
-     * _.sortedUniqBy([1.1, 1.2, 2.3, 2.4], Math.floor);
-     * // => [1.1, 2.2]
-     */
-    <T>(iteratee: _.ValueIteratee<T>, array: _.List<T> | null | undefined): T[];
-}
-interface SortedUniqBy1x1 {
-    /**
-     * This method is like `_.uniqBy` except that it's designed and optimized
-     * for sorted arrays.
-     *
-     * @category Array
-     * @param array The array to inspect.
-     * @param [iteratee] The iteratee invoked per element.
-     * @returns Returns the new duplicate free array.
-     * @example
-     *
-     * _.sortedUniqBy([1.1, 1.2, 2.3, 2.4], Math.floor);
-     * // => [1.1, 2.2]
-     */
-    (): SortedUniqBy1x1;
-    /**
-     * This method is like `_.uniqBy` except that it's designed and optimized
-     * for sorted arrays.
-     *
-     * @category Array
-     * @param array The array to inspect.
-     * @param [iteratee] The iteratee invoked per element.
-     * @returns Returns the new duplicate free array.
-     * @example
-     *
-     * _.sortedUniqBy([1.1, 1.2, 2.3, 2.4], Math.floor);
-     * // => [1.1, 2.2]
-     */
-    (array: string | null | undefined): string[];
-}
-interface SortedUniqBy2x1<T> {
-    /**
-     * This method is like `_.uniqBy` except that it's designed and optimized
-     * for sorted arrays.
-     *
-     * @category Array
-     * @param array The array to inspect.
-     * @param [iteratee] The iteratee invoked per element.
-     * @returns Returns the new duplicate free array.
-     * @example
-     *
-     * _.sortedUniqBy([1.1, 1.2, 2.3, 2.4], Math.floor);
-     * // => [1.1, 2.2]
-     */
-    (): SortedUniqBy2x1<T>;
-    /**
-     * This method is like `_.uniqBy` except that it's designed and optimized
-     * for sorted arrays.
-     *
-     * @category Array
-     * @param array The array to inspect.
-     * @param [iteratee] The iteratee invoked per element.
-     * @returns Returns the new duplicate free array.
-     * @example
-     *
-     * _.sortedUniqBy([1.1, 1.2, 2.3, 2.4], Math.floor);
-     * // => [1.1, 2.2]
-     */
-    (array: _.List<T> | null | undefined): T[];
-}
-
-declare const sortedUniqBy: SortedUniqBy;
+import { sortedUniqBy } from "../fp";
 export = sortedUniqBy;
diff --git a/types/lodash/fp/split.d.ts b/types/lodash/fp/split.d.ts
index 50ad820360..8274d4081f 100644
--- a/types/lodash/fp/split.d.ts
+++ b/types/lodash/fp/split.d.ts
@@ -1,66 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface Split {
-    /**
-     * Splits string by separator.
-     *
-     * Note: This method is based on String#split.
-     *
-     * @param string The string to trim.
-     * @param separator The separator pattern to split by.
-     * @param limit The length to truncate results to.
-     * @return Returns the new array of string segments.
-     */
-    (): Split;
-    /**
-     * Splits string by separator.
-     *
-     * Note: This method is based on String#split.
-     *
-     * @param string The string to trim.
-     * @param separator The separator pattern to split by.
-     * @param limit The length to truncate results to.
-     * @return Returns the new array of string segments.
-     */
-    (separator: RegExp|string): Split1x1;
-    /**
-     * Splits string by separator.
-     *
-     * Note: This method is based on String#split.
-     *
-     * @param string The string to trim.
-     * @param separator The separator pattern to split by.
-     * @param limit The length to truncate results to.
-     * @return Returns the new array of string segments.
-     */
-    (separator: RegExp|string, string: string): string[];
-}
-interface Split1x1 {
-    /**
-     * Splits string by separator.
-     *
-     * Note: This method is based on String#split.
-     *
-     * @param string The string to trim.
-     * @param separator The separator pattern to split by.
-     * @param limit The length to truncate results to.
-     * @return Returns the new array of string segments.
-     */
-    (): Split1x1;
-    /**
-     * Splits string by separator.
-     *
-     * Note: This method is based on String#split.
-     *
-     * @param string The string to trim.
-     * @param separator The separator pattern to split by.
-     * @param limit The length to truncate results to.
-     * @return Returns the new array of string segments.
-     */
-    (string: string): string[];
-}
-
-declare const split: Split;
+import { split } from "../fp";
 export = split;
diff --git a/types/lodash/fp/spread.d.ts b/types/lodash/fp/spread.d.ts
index 197c49278d..44eb90cd21 100644
--- a/types/lodash/fp/spread.d.ts
+++ b/types/lodash/fp/spread.d.ts
@@ -1,18 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type Spread =
-    /**
-     * Creates a function that invokes func with the this binding of the created function and an array of arguments
-     * much like Function#apply.
-     *
-     * Note: This method is based on the spread operator.
-     *
-     * @param func The function to spread arguments over.
-     * @return Returns the new function.
-     */
-    <TResult>(func: (...args: any[]) => TResult) => (...args: any[]) => TResult;
-
-declare const spread: Spread;
+import { spread } from "../fp";
 export = spread;
diff --git a/types/lodash/fp/spreadFrom.d.ts b/types/lodash/fp/spreadFrom.d.ts
index 7ac31bc9fe..7eb840b036 100644
--- a/types/lodash/fp/spreadFrom.d.ts
+++ b/types/lodash/fp/spreadFrom.d.ts
@@ -1,61 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface Spread {
-    /**
-     * Creates a function that invokes func with the this binding of the created function and an array of arguments
-     * much like Function#apply.
-     *
-     * Note: This method is based on the spread operator.
-     *
-     * @param func The function to spread arguments over.
-     * @return Returns the new function.
-     */
-    (): Spread;
-    /**
-     * Creates a function that invokes func with the this binding of the created function and an array of arguments
-     * much like Function#apply.
-     *
-     * Note: This method is based on the spread operator.
-     *
-     * @param func The function to spread arguments over.
-     * @return Returns the new function.
-     */
-    (start: number): Spread1x1;
-    /**
-     * Creates a function that invokes func with the this binding of the created function and an array of arguments
-     * much like Function#apply.
-     *
-     * Note: This method is based on the spread operator.
-     *
-     * @param func The function to spread arguments over.
-     * @return Returns the new function.
-     */
-    <TResult>(start: number, func: (...args: any[]) => TResult): (...args: any[]) => TResult;
-}
-interface Spread1x1 {
-    /**
-     * Creates a function that invokes func with the this binding of the created function and an array of arguments
-     * much like Function#apply.
-     *
-     * Note: This method is based on the spread operator.
-     *
-     * @param func The function to spread arguments over.
-     * @return Returns the new function.
-     */
-    (): Spread1x1;
-    /**
-     * Creates a function that invokes func with the this binding of the created function and an array of arguments
-     * much like Function#apply.
-     *
-     * Note: This method is based on the spread operator.
-     *
-     * @param func The function to spread arguments over.
-     * @return Returns the new function.
-     */
-    <TResult>(func: (...args: any[]) => TResult): (...args: any[]) => TResult;
-}
-
-declare const spreadFrom: Spread;
+import { spreadFrom } from "../fp";
 export = spreadFrom;
diff --git a/types/lodash/fp/startCase.d.ts b/types/lodash/fp/startCase.d.ts
index ca27b6b47f..4f580aa5d0 100644
--- a/types/lodash/fp/startCase.d.ts
+++ b/types/lodash/fp/startCase.d.ts
@@ -1,15 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type StartCase =
-    /**
-     * Converts string to start case.
-     *
-     * @param string The string to convert.
-     * @return Returns the start cased string.
-     */
-    (string: string) => string;
-
-declare const startCase: StartCase;
+import { startCase } from "../fp";
 export = startCase;
diff --git a/types/lodash/fp/startsWith.d.ts b/types/lodash/fp/startsWith.d.ts
index 962f880742..f84397dc68 100644
--- a/types/lodash/fp/startsWith.d.ts
+++ b/types/lodash/fp/startsWith.d.ts
@@ -1,56 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface StartsWith {
-    /**
-     * Checks if string starts with the given target string.
-     *
-     * @param string The string to search.
-     * @param target The string to search for.
-     * @param position The position to search from.
-     * @return Returns true if string starts with target, else false.
-     */
-    (): StartsWith;
-    /**
-     * Checks if string starts with the given target string.
-     *
-     * @param string The string to search.
-     * @param target The string to search for.
-     * @param position The position to search from.
-     * @return Returns true if string starts with target, else false.
-     */
-    (target: string): StartsWith1x1;
-    /**
-     * Checks if string starts with the given target string.
-     *
-     * @param string The string to search.
-     * @param target The string to search for.
-     * @param position The position to search from.
-     * @return Returns true if string starts with target, else false.
-     */
-    (target: string, string: string): boolean;
-}
-interface StartsWith1x1 {
-    /**
-     * Checks if string starts with the given target string.
-     *
-     * @param string The string to search.
-     * @param target The string to search for.
-     * @param position The position to search from.
-     * @return Returns true if string starts with target, else false.
-     */
-    (): StartsWith1x1;
-    /**
-     * Checks if string starts with the given target string.
-     *
-     * @param string The string to search.
-     * @param target The string to search for.
-     * @param position The position to search from.
-     * @return Returns true if string starts with target, else false.
-     */
-    (string: string): boolean;
-}
-
-declare const startsWith: StartsWith;
+import { startsWith } from "../fp";
 export = startsWith;
diff --git a/types/lodash/fp/stubArray.d.ts b/types/lodash/fp/stubArray.d.ts
index 1dd9667827..8ff910e591 100644
--- a/types/lodash/fp/stubArray.d.ts
+++ b/types/lodash/fp/stubArray.d.ts
@@ -1,14 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type StubArray =
-    /**
-     * This method returns a new empty array.
-     *
-     * @returns Returns the new empty array.
-     */
-    () => any[];
-
-declare const stubArray: StubArray;
+import { stubArray } from "../fp";
 export = stubArray;
diff --git a/types/lodash/fp/stubFalse.d.ts b/types/lodash/fp/stubFalse.d.ts
index abea160b5f..4cc041482d 100644
--- a/types/lodash/fp/stubFalse.d.ts
+++ b/types/lodash/fp/stubFalse.d.ts
@@ -1,14 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type StubFalse =
-    /**
-     * This method returns `false`.
-     *
-     * @returns Returns `false`.
-     */
-    () => boolean;
-
-declare const stubFalse: StubFalse;
+import { stubFalse } from "../fp";
 export = stubFalse;
diff --git a/types/lodash/fp/stubObject.d.ts b/types/lodash/fp/stubObject.d.ts
index 6765c18b5a..d7c826997f 100644
--- a/types/lodash/fp/stubObject.d.ts
+++ b/types/lodash/fp/stubObject.d.ts
@@ -1,14 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type StubObject =
-    /**
-     * This method returns a new empty object.
-     *
-     * @returns Returns the new empty object.
-     */
-    () => any;
-
-declare const stubObject: StubObject;
+import { stubObject } from "../fp";
 export = stubObject;
diff --git a/types/lodash/fp/stubString.d.ts b/types/lodash/fp/stubString.d.ts
index 66da9843e9..cbfa449758 100644
--- a/types/lodash/fp/stubString.d.ts
+++ b/types/lodash/fp/stubString.d.ts
@@ -1,14 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type StubString =
-    /**
-     * This method returns an empty string.
-     *
-     * @returns Returns the empty string.
-     */
-    () => string;
-
-declare const stubString: StubString;
+import { stubString } from "../fp";
 export = stubString;
diff --git a/types/lodash/fp/stubTrue.d.ts b/types/lodash/fp/stubTrue.d.ts
index 25cba4fcde..0ed7e5b927 100644
--- a/types/lodash/fp/stubTrue.d.ts
+++ b/types/lodash/fp/stubTrue.d.ts
@@ -1,14 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type StubTrue =
-    /**
-     * This method returns `true`.
-     *
-     * @returns Returns `true`.
-     */
-    () => boolean;
-
-declare const stubTrue: StubTrue;
+import { stubTrue } from "../fp";
 export = stubTrue;
diff --git a/types/lodash/fp/subtract.d.ts b/types/lodash/fp/subtract.d.ts
index b19ddb1f7e..201301b300 100644
--- a/types/lodash/fp/subtract.d.ts
+++ b/types/lodash/fp/subtract.d.ts
@@ -1,76 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface Subtract {
-    /**
-     * Subtract two numbers.
-     *
-     * @category Math
-     * @param minuend The first number in a subtraction.
-     * @param subtrahend The second number in a subtraction.
-     * @returns Returns the difference.
-     * @example
-     *
-     * _.subtract(6, 4);
-     * // => 2
-     */
-    (): Subtract;
-    /**
-     * Subtract two numbers.
-     *
-     * @category Math
-     * @param minuend The first number in a subtraction.
-     * @param subtrahend The second number in a subtraction.
-     * @returns Returns the difference.
-     * @example
-     *
-     * _.subtract(6, 4);
-     * // => 2
-     */
-    (minuend: number): Subtract1x1;
-    /**
-     * Subtract two numbers.
-     *
-     * @category Math
-     * @param minuend The first number in a subtraction.
-     * @param subtrahend The second number in a subtraction.
-     * @returns Returns the difference.
-     * @example
-     *
-     * _.subtract(6, 4);
-     * // => 2
-     */
-    (minuend: number, subtrahend: number): number;
-}
-interface Subtract1x1 {
-    /**
-     * Subtract two numbers.
-     *
-     * @category Math
-     * @param minuend The first number in a subtraction.
-     * @param subtrahend The second number in a subtraction.
-     * @returns Returns the difference.
-     * @example
-     *
-     * _.subtract(6, 4);
-     * // => 2
-     */
-    (): Subtract1x1;
-    /**
-     * Subtract two numbers.
-     *
-     * @category Math
-     * @param minuend The first number in a subtraction.
-     * @param subtrahend The second number in a subtraction.
-     * @returns Returns the difference.
-     * @example
-     *
-     * _.subtract(6, 4);
-     * // => 2
-     */
-    (subtrahend: number): number;
-}
-
-declare const subtract: Subtract;
+import { subtract } from "../fp";
 export = subtract;
diff --git a/types/lodash/fp/sum.d.ts b/types/lodash/fp/sum.d.ts
index 84f6849067..6d7d02026e 100644
--- a/types/lodash/fp/sum.d.ts
+++ b/types/lodash/fp/sum.d.ts
@@ -1,22 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-type Sum =
-    /**
-     * Computes the sum of the values in `array`.
-     *
-     * @category Math
-     * @param array The array to iterate over.
-     * @returns Returns the sum.
-     * @example
-     *
-     * _.sum([4, 2, 8, 6]);
-     * // => 20
-     */
-    (collection: _.List<any> | null | undefined) => number;
-
-declare const sum: Sum;
+import { sum } from "../fp";
 export = sum;
diff --git a/types/lodash/fp/sumBy.d.ts b/types/lodash/fp/sumBy.d.ts
index 93d6be33f7..3f44c3f6c5 100644
--- a/types/lodash/fp/sumBy.d.ts
+++ b/types/lodash/fp/sumBy.d.ts
@@ -1,118 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface SumBy {
-    /**
-     * This method is like `_.sum` except that it accepts `iteratee` which is
-     * invoked for each element in `array` to generate the value to be summed.
-     * The iteratee is invoked with one argument: (value).
-     *
-     * @category Math
-     * @param array The array to iterate over.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the sum.
-     * @example
-     *
-     * var objects = [{ 'n': 4 }, { 'n': 2 }, { 'n': 8 }, { 'n': 6 }];
-     *
-     * _.sumBy(objects, function(o) { return o.n; });
-     * // => 20
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.sumBy(objects, 'n');
-     * // => 20
-     */
-    (): SumBy;
-    /**
-     * This method is like `_.sum` except that it accepts `iteratee` which is
-     * invoked for each element in `array` to generate the value to be summed.
-     * The iteratee is invoked with one argument: (value).
-     *
-     * @category Math
-     * @param array The array to iterate over.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the sum.
-     * @example
-     *
-     * var objects = [{ 'n': 4 }, { 'n': 2 }, { 'n': 8 }, { 'n': 6 }];
-     *
-     * _.sumBy(objects, function(o) { return o.n; });
-     * // => 20
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.sumBy(objects, 'n');
-     * // => 20
-     */
-    <T>(iteratee: ((value: T) => number) | string): SumBy1x1<T>;
-    /**
-     * This method is like `_.sum` except that it accepts `iteratee` which is
-     * invoked for each element in `array` to generate the value to be summed.
-     * The iteratee is invoked with one argument: (value).
-     *
-     * @category Math
-     * @param array The array to iterate over.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the sum.
-     * @example
-     *
-     * var objects = [{ 'n': 4 }, { 'n': 2 }, { 'n': 8 }, { 'n': 6 }];
-     *
-     * _.sumBy(objects, function(o) { return o.n; });
-     * // => 20
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.sumBy(objects, 'n');
-     * // => 20
-     */
-    <T>(iteratee: ((value: T) => number) | string, collection: _.List<T> | null | undefined): number;
-}
-interface SumBy1x1<T> {
-    /**
-     * This method is like `_.sum` except that it accepts `iteratee` which is
-     * invoked for each element in `array` to generate the value to be summed.
-     * The iteratee is invoked with one argument: (value).
-     *
-     * @category Math
-     * @param array The array to iterate over.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the sum.
-     * @example
-     *
-     * var objects = [{ 'n': 4 }, { 'n': 2 }, { 'n': 8 }, { 'n': 6 }];
-     *
-     * _.sumBy(objects, function(o) { return o.n; });
-     * // => 20
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.sumBy(objects, 'n');
-     * // => 20
-     */
-    (): SumBy1x1<T>;
-    /**
-     * This method is like `_.sum` except that it accepts `iteratee` which is
-     * invoked for each element in `array` to generate the value to be summed.
-     * The iteratee is invoked with one argument: (value).
-     *
-     * @category Math
-     * @param array The array to iterate over.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the sum.
-     * @example
-     *
-     * var objects = [{ 'n': 4 }, { 'n': 2 }, { 'n': 8 }, { 'n': 6 }];
-     *
-     * _.sumBy(objects, function(o) { return o.n; });
-     * // => 20
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.sumBy(objects, 'n');
-     * // => 20
-     */
-    (collection: _.List<T> | null | undefined): number;
-}
-
-declare const sumBy: SumBy;
+import { sumBy } from "../fp";
 export = sumBy;
diff --git a/types/lodash/fp/symmetricDifference.d.ts b/types/lodash/fp/symmetricDifference.d.ts
index 8d09e4f1a3..cba1d1f70d 100644
--- a/types/lodash/fp/symmetricDifference.d.ts
+++ b/types/lodash/fp/symmetricDifference.d.ts
@@ -1,48 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Xor {
-    /**
-     * Creates an array of unique values that is the symmetric difference of the provided arrays.
-     *
-     * @param arrays The arrays to inspect.
-     * @return Returns the new array of values.
-     */
-    (): Xor;
-    /**
-     * Creates an array of unique values that is the symmetric difference of the provided arrays.
-     *
-     * @param arrays The arrays to inspect.
-     * @return Returns the new array of values.
-     */
-    <T>(arrays2: _.List<T> | null | undefined): Xor1x1<T>;
-    /**
-     * Creates an array of unique values that is the symmetric difference of the provided arrays.
-     *
-     * @param arrays The arrays to inspect.
-     * @return Returns the new array of values.
-     */
-    <T>(arrays2: _.List<T> | null | undefined, arrays: _.List<T> | null | undefined): T[];
-}
-interface Xor1x1<T> {
-    /**
-     * Creates an array of unique values that is the symmetric difference of the provided arrays.
-     *
-     * @param arrays The arrays to inspect.
-     * @return Returns the new array of values.
-     */
-    (): Xor1x1<T>;
-    /**
-     * Creates an array of unique values that is the symmetric difference of the provided arrays.
-     *
-     * @param arrays The arrays to inspect.
-     * @return Returns the new array of values.
-     */
-    (arrays: _.List<T> | null | undefined): T[];
-}
-
-declare const symmetricDifference: Xor;
+import { symmetricDifference } from "../fp";
 export = symmetricDifference;
diff --git a/types/lodash/fp/symmetricDifferenceBy.d.ts b/types/lodash/fp/symmetricDifferenceBy.d.ts
index 1bfeb6c6cd..8e9316cf42 100644
--- a/types/lodash/fp/symmetricDifferenceBy.d.ts
+++ b/types/lodash/fp/symmetricDifferenceBy.d.ts
@@ -1,186 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface XorBy {
-    /**
-     * This method is like `_.xor` except that it accepts `iteratee` which is
-     * invoked for each element of each `arrays` to generate the criterion by which
-     * uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the new array of values.
-     * @example
-     *
-     * _.xorBy([2.1, 1.2], [4.3, 2.4], Math.floor);
-     * // => [1.2, 4.3]
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.xorBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
-     * // => [{ 'x': 2 }]
-     */
-    (): XorBy;
-    /**
-     * This method is like `_.xor` except that it accepts `iteratee` which is
-     * invoked for each element of each `arrays` to generate the criterion by which
-     * uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the new array of values.
-     * @example
-     *
-     * _.xorBy([2.1, 1.2], [4.3, 2.4], Math.floor);
-     * // => [1.2, 4.3]
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.xorBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
-     * // => [{ 'x': 2 }]
-     */
-    <T>(iteratee: _.ValueIteratee<T>): XorBy1x1<T>;
-    /**
-     * This method is like `_.xor` except that it accepts `iteratee` which is
-     * invoked for each element of each `arrays` to generate the criterion by which
-     * uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the new array of values.
-     * @example
-     *
-     * _.xorBy([2.1, 1.2], [4.3, 2.4], Math.floor);
-     * // => [1.2, 4.3]
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.xorBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
-     * // => [{ 'x': 2 }]
-     */
-    <T>(iteratee: _.ValueIteratee<T>, arrays: _.List<T> | null | undefined): XorBy1x2<T>;
-    /**
-     * This method is like `_.xor` except that it accepts `iteratee` which is
-     * invoked for each element of each `arrays` to generate the criterion by which
-     * uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the new array of values.
-     * @example
-     *
-     * _.xorBy([2.1, 1.2], [4.3, 2.4], Math.floor);
-     * // => [1.2, 4.3]
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.xorBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
-     * // => [{ 'x': 2 }]
-     */
-    <T>(iteratee: _.ValueIteratee<T>, arrays: _.List<T> | null | undefined, arrays2: _.List<T> | null | undefined): T[];
-}
-interface XorBy1x1<T> {
-    /**
-     * This method is like `_.xor` except that it accepts `iteratee` which is
-     * invoked for each element of each `arrays` to generate the criterion by which
-     * uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the new array of values.
-     * @example
-     *
-     * _.xorBy([2.1, 1.2], [4.3, 2.4], Math.floor);
-     * // => [1.2, 4.3]
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.xorBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
-     * // => [{ 'x': 2 }]
-     */
-    (): XorBy1x1<T>;
-    /**
-     * This method is like `_.xor` except that it accepts `iteratee` which is
-     * invoked for each element of each `arrays` to generate the criterion by which
-     * uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the new array of values.
-     * @example
-     *
-     * _.xorBy([2.1, 1.2], [4.3, 2.4], Math.floor);
-     * // => [1.2, 4.3]
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.xorBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
-     * // => [{ 'x': 2 }]
-     */
-    (arrays: _.List<T> | null | undefined): XorBy1x2<T>;
-    /**
-     * This method is like `_.xor` except that it accepts `iteratee` which is
-     * invoked for each element of each `arrays` to generate the criterion by which
-     * uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the new array of values.
-     * @example
-     *
-     * _.xorBy([2.1, 1.2], [4.3, 2.4], Math.floor);
-     * // => [1.2, 4.3]
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.xorBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
-     * // => [{ 'x': 2 }]
-     */
-    (arrays: _.List<T> | null | undefined, arrays2: _.List<T> | null | undefined): T[];
-}
-interface XorBy1x2<T> {
-    /**
-     * This method is like `_.xor` except that it accepts `iteratee` which is
-     * invoked for each element of each `arrays` to generate the criterion by which
-     * uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the new array of values.
-     * @example
-     *
-     * _.xorBy([2.1, 1.2], [4.3, 2.4], Math.floor);
-     * // => [1.2, 4.3]
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.xorBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
-     * // => [{ 'x': 2 }]
-     */
-    (): XorBy1x2<T>;
-    /**
-     * This method is like `_.xor` except that it accepts `iteratee` which is
-     * invoked for each element of each `arrays` to generate the criterion by which
-     * uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the new array of values.
-     * @example
-     *
-     * _.xorBy([2.1, 1.2], [4.3, 2.4], Math.floor);
-     * // => [1.2, 4.3]
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.xorBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
-     * // => [{ 'x': 2 }]
-     */
-    (arrays2: _.List<T> | null | undefined): T[];
-}
-
-declare const symmetricDifferenceBy: XorBy;
+import { symmetricDifferenceBy } from "../fp";
 export = symmetricDifferenceBy;
diff --git a/types/lodash/fp/symmetricDifferenceWith.d.ts b/types/lodash/fp/symmetricDifferenceWith.d.ts
index 0aa1d417fb..864ec01b50 100644
--- a/types/lodash/fp/symmetricDifferenceWith.d.ts
+++ b/types/lodash/fp/symmetricDifferenceWith.d.ts
@@ -1,177 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface XorWith {
-    /**
-     * This method is like `_.xor` except that it accepts `comparator` which is
-     * invoked to compare elements of `arrays`. The comparator is invoked with
-     * two arguments: (arrVal, othVal).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [comparator] The comparator invoked per element.
-     * @returns Returns the new array of values.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
-     *
-     * _.xorWith(objects, others, _.isEqual);
-     * // => [{ 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
-     */
-    (): XorWith;
-    /**
-     * This method is like `_.xor` except that it accepts `comparator` which is
-     * invoked to compare elements of `arrays`. The comparator is invoked with
-     * two arguments: (arrVal, othVal).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [comparator] The comparator invoked per element.
-     * @returns Returns the new array of values.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
-     *
-     * _.xorWith(objects, others, _.isEqual);
-     * // => [{ 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
-     */
-    <T>(comparator: _.Comparator<T>): XorWith1x1<T>;
-    /**
-     * This method is like `_.xor` except that it accepts `comparator` which is
-     * invoked to compare elements of `arrays`. The comparator is invoked with
-     * two arguments: (arrVal, othVal).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [comparator] The comparator invoked per element.
-     * @returns Returns the new array of values.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
-     *
-     * _.xorWith(objects, others, _.isEqual);
-     * // => [{ 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
-     */
-    <T>(comparator: _.Comparator<T>, arrays: _.List<T> | null | undefined): XorWith1x2<T>;
-    /**
-     * This method is like `_.xor` except that it accepts `comparator` which is
-     * invoked to compare elements of `arrays`. The comparator is invoked with
-     * two arguments: (arrVal, othVal).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [comparator] The comparator invoked per element.
-     * @returns Returns the new array of values.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
-     *
-     * _.xorWith(objects, others, _.isEqual);
-     * // => [{ 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
-     */
-    <T>(comparator: _.Comparator<T>, arrays: _.List<T> | null | undefined, arrays2: _.List<T> | null | undefined): T[];
-}
-interface XorWith1x1<T> {
-    /**
-     * This method is like `_.xor` except that it accepts `comparator` which is
-     * invoked to compare elements of `arrays`. The comparator is invoked with
-     * two arguments: (arrVal, othVal).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [comparator] The comparator invoked per element.
-     * @returns Returns the new array of values.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
-     *
-     * _.xorWith(objects, others, _.isEqual);
-     * // => [{ 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
-     */
-    (): XorWith1x1<T>;
-    /**
-     * This method is like `_.xor` except that it accepts `comparator` which is
-     * invoked to compare elements of `arrays`. The comparator is invoked with
-     * two arguments: (arrVal, othVal).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [comparator] The comparator invoked per element.
-     * @returns Returns the new array of values.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
-     *
-     * _.xorWith(objects, others, _.isEqual);
-     * // => [{ 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
-     */
-    (arrays: _.List<T> | null | undefined): XorWith1x2<T>;
-    /**
-     * This method is like `_.xor` except that it accepts `comparator` which is
-     * invoked to compare elements of `arrays`. The comparator is invoked with
-     * two arguments: (arrVal, othVal).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [comparator] The comparator invoked per element.
-     * @returns Returns the new array of values.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
-     *
-     * _.xorWith(objects, others, _.isEqual);
-     * // => [{ 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
-     */
-    (arrays: _.List<T> | null | undefined, arrays2: _.List<T> | null | undefined): T[];
-}
-interface XorWith1x2<T> {
-    /**
-     * This method is like `_.xor` except that it accepts `comparator` which is
-     * invoked to compare elements of `arrays`. The comparator is invoked with
-     * two arguments: (arrVal, othVal).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [comparator] The comparator invoked per element.
-     * @returns Returns the new array of values.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
-     *
-     * _.xorWith(objects, others, _.isEqual);
-     * // => [{ 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
-     */
-    (): XorWith1x2<T>;
-    /**
-     * This method is like `_.xor` except that it accepts `comparator` which is
-     * invoked to compare elements of `arrays`. The comparator is invoked with
-     * two arguments: (arrVal, othVal).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [comparator] The comparator invoked per element.
-     * @returns Returns the new array of values.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
-     *
-     * _.xorWith(objects, others, _.isEqual);
-     * // => [{ 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
-     */
-    (arrays2: _.List<T> | null | undefined): T[];
-}
-
-declare const symmetricDifferenceWith: XorWith;
+import { symmetricDifferenceWith } from "../fp";
 export = symmetricDifferenceWith;
diff --git a/types/lodash/fp/tail.d.ts b/types/lodash/fp/tail.d.ts
index 1f4e5baea5..df9bcdcd57 100644
--- a/types/lodash/fp/tail.d.ts
+++ b/types/lodash/fp/tail.d.ts
@@ -1,17 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-type Tail =
-    /**
-     * Gets all but the first element of array.
-     *
-     * @param array The array to query.
-     * @return Returns the slice of array.
-     */
-    <T>(array: _.List<T> | null | undefined) => T[];
-
-declare const tail: Tail;
+import { tail } from "../fp";
 export = tail;
diff --git a/types/lodash/fp/take.d.ts b/types/lodash/fp/take.d.ts
index 8c64452d27..ab46aca056 100644
--- a/types/lodash/fp/take.d.ts
+++ b/types/lodash/fp/take.d.ts
@@ -1,53 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Take {
-    /**
-     * Creates a slice of array with n elements taken from the beginning.
-     *
-     * @param array The array to query.
-     * @param n The number of elements to take.
-     * @return Returns the slice of array.
-     */
-    (): Take;
-    /**
-     * Creates a slice of array with n elements taken from the beginning.
-     *
-     * @param array The array to query.
-     * @param n The number of elements to take.
-     * @return Returns the slice of array.
-     */
-    (n: number): Take1x1;
-    /**
-     * Creates a slice of array with n elements taken from the beginning.
-     *
-     * @param array The array to query.
-     * @param n The number of elements to take.
-     * @return Returns the slice of array.
-     */
-    <T>(n: number, array: _.List<T> | null | undefined): T[];
-}
-interface Take1x1 {
-    /**
-     * Creates a slice of array with n elements taken from the beginning.
-     *
-     * @param array The array to query.
-     * @param n The number of elements to take.
-     * @return Returns the slice of array.
-     */
-    (): Take1x1;
-    /**
-     * Creates a slice of array with n elements taken from the beginning.
-     *
-     * @param array The array to query.
-     * @param n The number of elements to take.
-     * @return Returns the slice of array.
-     */
-    <T>(array: _.List<T> | null | undefined): T[];
-}
-
-declare const take: Take;
+import { take } from "../fp";
 export = take;
diff --git a/types/lodash/fp/takeLast.d.ts b/types/lodash/fp/takeLast.d.ts
index 6677d06e16..027dcda5ee 100644
--- a/types/lodash/fp/takeLast.d.ts
+++ b/types/lodash/fp/takeLast.d.ts
@@ -1,53 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface TakeRight {
-    /**
-     * Creates a slice of array with n elements taken from the end.
-     *
-     * @param array The array to query.
-     * @param n The number of elements to take.
-     * @return Returns the slice of array.
-     */
-    (): TakeRight;
-    /**
-     * Creates a slice of array with n elements taken from the end.
-     *
-     * @param array The array to query.
-     * @param n The number of elements to take.
-     * @return Returns the slice of array.
-     */
-    (n: number): TakeRight1x1;
-    /**
-     * Creates a slice of array with n elements taken from the end.
-     *
-     * @param array The array to query.
-     * @param n The number of elements to take.
-     * @return Returns the slice of array.
-     */
-    <T>(n: number, array: _.List<T> | null | undefined): T[];
-}
-interface TakeRight1x1 {
-    /**
-     * Creates a slice of array with n elements taken from the end.
-     *
-     * @param array The array to query.
-     * @param n The number of elements to take.
-     * @return Returns the slice of array.
-     */
-    (): TakeRight1x1;
-    /**
-     * Creates a slice of array with n elements taken from the end.
-     *
-     * @param array The array to query.
-     * @param n The number of elements to take.
-     * @return Returns the slice of array.
-     */
-    <T>(array: _.List<T> | null | undefined): T[];
-}
-
-declare const takeLast: TakeRight;
+import { takeLast } from "../fp";
 export = takeLast;
diff --git a/types/lodash/fp/takeLastWhile.d.ts b/types/lodash/fp/takeLastWhile.d.ts
index 4e2cd0a933..c6729c3529 100644
--- a/types/lodash/fp/takeLastWhile.d.ts
+++ b/types/lodash/fp/takeLastWhile.d.ts
@@ -1,108 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface TakeRightWhile {
-    /**
-     * Creates a slice of array with elements taken from the end. Elements are taken until predicate returns
-     * falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param array The array to query.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the slice of array.
-     */
-    (): TakeRightWhile;
-    /**
-     * Creates a slice of array with elements taken from the end. Elements are taken until predicate returns
-     * falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param array The array to query.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the slice of array.
-     */
-    <T>(predicate: _.ValueIteratee<T>): TakeRightWhile1x1<T>;
-    /**
-     * Creates a slice of array with elements taken from the end. Elements are taken until predicate returns
-     * falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param array The array to query.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the slice of array.
-     */
-    <T>(predicate: _.ValueIteratee<T>, array: _.List<T> | null | undefined): T[];
-}
-interface TakeRightWhile1x1<T> {
-    /**
-     * Creates a slice of array with elements taken from the end. Elements are taken until predicate returns
-     * falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param array The array to query.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the slice of array.
-     */
-    (): TakeRightWhile1x1<T>;
-    /**
-     * Creates a slice of array with elements taken from the end. Elements are taken until predicate returns
-     * falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param array The array to query.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the slice of array.
-     */
-    (array: _.List<T> | null | undefined): T[];
-}
-
-declare const takeLastWhile: TakeRightWhile;
+import { takeLastWhile } from "../fp";
 export = takeLastWhile;
diff --git a/types/lodash/fp/takeRight.d.ts b/types/lodash/fp/takeRight.d.ts
index 385f447919..162c5166e4 100644
--- a/types/lodash/fp/takeRight.d.ts
+++ b/types/lodash/fp/takeRight.d.ts
@@ -1,53 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface TakeRight {
-    /**
-     * Creates a slice of array with n elements taken from the end.
-     *
-     * @param array The array to query.
-     * @param n The number of elements to take.
-     * @return Returns the slice of array.
-     */
-    (): TakeRight;
-    /**
-     * Creates a slice of array with n elements taken from the end.
-     *
-     * @param array The array to query.
-     * @param n The number of elements to take.
-     * @return Returns the slice of array.
-     */
-    (n: number): TakeRight1x1;
-    /**
-     * Creates a slice of array with n elements taken from the end.
-     *
-     * @param array The array to query.
-     * @param n The number of elements to take.
-     * @return Returns the slice of array.
-     */
-    <T>(n: number, array: _.List<T> | null | undefined): T[];
-}
-interface TakeRight1x1 {
-    /**
-     * Creates a slice of array with n elements taken from the end.
-     *
-     * @param array The array to query.
-     * @param n The number of elements to take.
-     * @return Returns the slice of array.
-     */
-    (): TakeRight1x1;
-    /**
-     * Creates a slice of array with n elements taken from the end.
-     *
-     * @param array The array to query.
-     * @param n The number of elements to take.
-     * @return Returns the slice of array.
-     */
-    <T>(array: _.List<T> | null | undefined): T[];
-}
-
-declare const takeRight: TakeRight;
+import { takeRight } from "../fp";
 export = takeRight;
diff --git a/types/lodash/fp/takeRightWhile.d.ts b/types/lodash/fp/takeRightWhile.d.ts
index b2a8934a14..b23f7a4608 100644
--- a/types/lodash/fp/takeRightWhile.d.ts
+++ b/types/lodash/fp/takeRightWhile.d.ts
@@ -1,108 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface TakeRightWhile {
-    /**
-     * Creates a slice of array with elements taken from the end. Elements are taken until predicate returns
-     * falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param array The array to query.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the slice of array.
-     */
-    (): TakeRightWhile;
-    /**
-     * Creates a slice of array with elements taken from the end. Elements are taken until predicate returns
-     * falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param array The array to query.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the slice of array.
-     */
-    <T>(predicate: _.ValueIteratee<T>): TakeRightWhile1x1<T>;
-    /**
-     * Creates a slice of array with elements taken from the end. Elements are taken until predicate returns
-     * falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param array The array to query.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the slice of array.
-     */
-    <T>(predicate: _.ValueIteratee<T>, array: _.List<T> | null | undefined): T[];
-}
-interface TakeRightWhile1x1<T> {
-    /**
-     * Creates a slice of array with elements taken from the end. Elements are taken until predicate returns
-     * falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param array The array to query.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the slice of array.
-     */
-    (): TakeRightWhile1x1<T>;
-    /**
-     * Creates a slice of array with elements taken from the end. Elements are taken until predicate returns
-     * falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param array The array to query.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the slice of array.
-     */
-    (array: _.List<T> | null | undefined): T[];
-}
-
-declare const takeRightWhile: TakeRightWhile;
+import { takeRightWhile } from "../fp";
 export = takeRightWhile;
diff --git a/types/lodash/fp/takeWhile.d.ts b/types/lodash/fp/takeWhile.d.ts
index 3082de833b..b8cb517606 100644
--- a/types/lodash/fp/takeWhile.d.ts
+++ b/types/lodash/fp/takeWhile.d.ts
@@ -1,108 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface TakeWhile {
-    /**
-     * Creates a slice of array with elements taken from the beginning. Elements are taken until predicate returns
-     * falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param array The array to query.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the slice of array.
-     */
-    (): TakeWhile;
-    /**
-     * Creates a slice of array with elements taken from the beginning. Elements are taken until predicate returns
-     * falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param array The array to query.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the slice of array.
-     */
-    <T>(predicate: _.ValueIteratee<T>): TakeWhile1x1<T>;
-    /**
-     * Creates a slice of array with elements taken from the beginning. Elements are taken until predicate returns
-     * falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param array The array to query.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the slice of array.
-     */
-    <T>(predicate: _.ValueIteratee<T>, array: _.List<T> | null | undefined): T[];
-}
-interface TakeWhile1x1<T> {
-    /**
-     * Creates a slice of array with elements taken from the beginning. Elements are taken until predicate returns
-     * falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param array The array to query.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the slice of array.
-     */
-    (): TakeWhile1x1<T>;
-    /**
-     * Creates a slice of array with elements taken from the beginning. Elements are taken until predicate returns
-     * falsey. The predicate is bound to thisArg and invoked with three arguments: (value, index, array).
-     *
-     * If a property name is provided for predicate the created _.property style callback returns the property
-     * value of the given element.
-     *
-     * If a value is also provided for thisArg the created _.matchesProperty style callback returns true for
-     * elements that have a matching property value, else false.
-     *
-     * If an object is provided for predicate the created _.matches style callback returns true for elements that
-     * have the properties of the given object, else false.
-     *
-     * @param array The array to query.
-     * @param predicate The function invoked per iteration.
-     * @param thisArg The this binding of predicate.
-     * @return Returns the slice of array.
-     */
-    (array: _.List<T> | null | undefined): T[];
-}
-
-declare const takeWhile: TakeWhile;
+import { takeWhile } from "../fp";
 export = takeWhile;
diff --git a/types/lodash/fp/tap.d.ts b/types/lodash/fp/tap.d.ts
index 2091f9301a..8ffbbd7f23 100644
--- a/types/lodash/fp/tap.d.ts
+++ b/types/lodash/fp/tap.d.ts
@@ -1,66 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface Tap {
-    /**
-     * This method invokes interceptor and returns value. The interceptor is bound to thisArg and invoked with one
-     * argument; (value). The purpose of this method is to "tap into" a method chain in order to perform operations
-     * on intermediate results within the chain.
-     *
-     * @param value The value to provide to interceptor.
-     * @param interceptor The function to invoke.
-     * @parem thisArg The this binding of interceptor.
-     * @return Returns value.
-     **/
-    (): Tap;
-    /**
-     * This method invokes interceptor and returns value. The interceptor is bound to thisArg and invoked with one
-     * argument; (value). The purpose of this method is to "tap into" a method chain in order to perform operations
-     * on intermediate results within the chain.
-     *
-     * @param value The value to provide to interceptor.
-     * @param interceptor The function to invoke.
-     * @parem thisArg The this binding of interceptor.
-     * @return Returns value.
-     **/
-    <T>(interceptor: (value: T) => void): Tap1x1<T>;
-    /**
-     * This method invokes interceptor and returns value. The interceptor is bound to thisArg and invoked with one
-     * argument; (value). The purpose of this method is to "tap into" a method chain in order to perform operations
-     * on intermediate results within the chain.
-     *
-     * @param value The value to provide to interceptor.
-     * @param interceptor The function to invoke.
-     * @parem thisArg The this binding of interceptor.
-     * @return Returns value.
-     **/
-    <T>(interceptor: (value: T) => void, value: T): T;
-}
-interface Tap1x1<T> {
-    /**
-     * This method invokes interceptor and returns value. The interceptor is bound to thisArg and invoked with one
-     * argument; (value). The purpose of this method is to "tap into" a method chain in order to perform operations
-     * on intermediate results within the chain.
-     *
-     * @param value The value to provide to interceptor.
-     * @param interceptor The function to invoke.
-     * @parem thisArg The this binding of interceptor.
-     * @return Returns value.
-     **/
-    (): Tap1x1<T>;
-    /**
-     * This method invokes interceptor and returns value. The interceptor is bound to thisArg and invoked with one
-     * argument; (value). The purpose of this method is to "tap into" a method chain in order to perform operations
-     * on intermediate results within the chain.
-     *
-     * @param value The value to provide to interceptor.
-     * @param interceptor The function to invoke.
-     * @parem thisArg The this binding of interceptor.
-     * @return Returns value.
-     **/
-    (value: T): T;
-}
-
-declare const tap: Tap;
+import { tap } from "../fp";
 export = tap;
diff --git a/types/lodash/fp/template.d.ts b/types/lodash/fp/template.d.ts
index f913171374..3a37ed1af7 100644
--- a/types/lodash/fp/template.d.ts
+++ b/types/lodash/fp/template.d.ts
@@ -1,37 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-type Template =
-    /**
-     * Creates a compiled template function that can interpolate data properties in "interpolate" delimiters,
-     * HTML-escape interpolated data properties in "escape" delimiters, and execute JavaScript in "evaluate"
-     * delimiters. Data properties may be accessed as free variables in the template. If a setting object is
-     * provided it takes precedence over _.templateSettings values.
-     *
-     * Note: In the development build _.template utilizes
-     * [sourceURLs](http://www.html5rocks.com/en/tutorials/developertools/sourcemaps/#toc-sourceurl) for easier
-     * debugging.
-     *
-     * For more information on precompiling templates see
-     * [lodash's custom builds documentation](https://lodash.com/custom-builds).
-     *
-     * For more information on Chrome extension sandboxes see
-     * [Chrome's extensions documentation](https://developer.chrome.com/extensions/sandboxingEval).
-     *
-     * @param string The template string.
-     * @param options The options object.
-     * @param options.escape The HTML "escape" delimiter.
-     * @param options.evaluate The "evaluate" delimiter.
-     * @param options.imports An object to import into the template as free variables.
-     * @param options.interpolate The "interpolate" delimiter.
-     * @param options.sourceURL The sourceURL of the template's compiled source.
-     * @param options.variable The data object variable name.
-     * @return Returns the compiled template function.
-     */
-    (string: string) => _.TemplateExecutor;
-
-declare const template: Template;
+import { template } from "../fp";
 export = template;
diff --git a/types/lodash/fp/throttle.d.ts b/types/lodash/fp/throttle.d.ts
index 7644c669e4..24d8b7f4ef 100644
--- a/types/lodash/fp/throttle.d.ts
+++ b/types/lodash/fp/throttle.d.ts
@@ -1,98 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Throttle {
-    /**
-     * Creates a throttled function that only invokes func at most once per every wait milliseconds. The throttled
-     * function comes with a cancel method to cancel delayed invocations and a flush method to immediately invoke
-     * them. Provide an options object to indicate that func should be invoked on the leading and/or trailing edge
-     * of the wait timeout. Subsequent calls to the throttled function return the result of the last func call.
-     *
-     * Note: If leading and trailing options are true, func is invoked on the trailing edge of the timeout only if
-     * the the throttled function is invoked more than once during the wait timeout.
-     *
-     * @param func The function to throttle.
-     * @param wait The number of milliseconds to throttle invocations to.
-     * @param options The options object.
-     * @param options.leading Specify invoking on the leading edge of the timeout.
-     * @param options.trailing Specify invoking on the trailing edge of the timeout.
-     * @return Returns the new throttled function.
-     */
-    (): Throttle;
-    /**
-     * Creates a throttled function that only invokes func at most once per every wait milliseconds. The throttled
-     * function comes with a cancel method to cancel delayed invocations and a flush method to immediately invoke
-     * them. Provide an options object to indicate that func should be invoked on the leading and/or trailing edge
-     * of the wait timeout. Subsequent calls to the throttled function return the result of the last func call.
-     *
-     * Note: If leading and trailing options are true, func is invoked on the trailing edge of the timeout only if
-     * the the throttled function is invoked more than once during the wait timeout.
-     *
-     * @param func The function to throttle.
-     * @param wait The number of milliseconds to throttle invocations to.
-     * @param options The options object.
-     * @param options.leading Specify invoking on the leading edge of the timeout.
-     * @param options.trailing Specify invoking on the trailing edge of the timeout.
-     * @return Returns the new throttled function.
-     */
-    (wait: number): Throttle1x1;
-    /**
-     * Creates a throttled function that only invokes func at most once per every wait milliseconds. The throttled
-     * function comes with a cancel method to cancel delayed invocations and a flush method to immediately invoke
-     * them. Provide an options object to indicate that func should be invoked on the leading and/or trailing edge
-     * of the wait timeout. Subsequent calls to the throttled function return the result of the last func call.
-     *
-     * Note: If leading and trailing options are true, func is invoked on the trailing edge of the timeout only if
-     * the the throttled function is invoked more than once during the wait timeout.
-     *
-     * @param func The function to throttle.
-     * @param wait The number of milliseconds to throttle invocations to.
-     * @param options The options object.
-     * @param options.leading Specify invoking on the leading edge of the timeout.
-     * @param options.trailing Specify invoking on the trailing edge of the timeout.
-     * @return Returns the new throttled function.
-     */
-    <T extends (...args: any[]) => any>(wait: number, func: T): T & _.Cancelable;
-}
-interface Throttle1x1 {
-    /**
-     * Creates a throttled function that only invokes func at most once per every wait milliseconds. The throttled
-     * function comes with a cancel method to cancel delayed invocations and a flush method to immediately invoke
-     * them. Provide an options object to indicate that func should be invoked on the leading and/or trailing edge
-     * of the wait timeout. Subsequent calls to the throttled function return the result of the last func call.
-     *
-     * Note: If leading and trailing options are true, func is invoked on the trailing edge of the timeout only if
-     * the the throttled function is invoked more than once during the wait timeout.
-     *
-     * @param func The function to throttle.
-     * @param wait The number of milliseconds to throttle invocations to.
-     * @param options The options object.
-     * @param options.leading Specify invoking on the leading edge of the timeout.
-     * @param options.trailing Specify invoking on the trailing edge of the timeout.
-     * @return Returns the new throttled function.
-     */
-    (): Throttle1x1;
-    /**
-     * Creates a throttled function that only invokes func at most once per every wait milliseconds. The throttled
-     * function comes with a cancel method to cancel delayed invocations and a flush method to immediately invoke
-     * them. Provide an options object to indicate that func should be invoked on the leading and/or trailing edge
-     * of the wait timeout. Subsequent calls to the throttled function return the result of the last func call.
-     *
-     * Note: If leading and trailing options are true, func is invoked on the trailing edge of the timeout only if
-     * the the throttled function is invoked more than once during the wait timeout.
-     *
-     * @param func The function to throttle.
-     * @param wait The number of milliseconds to throttle invocations to.
-     * @param options The options object.
-     * @param options.leading Specify invoking on the leading edge of the timeout.
-     * @param options.trailing Specify invoking on the trailing edge of the timeout.
-     * @return Returns the new throttled function.
-     */
-    <T extends (...args: any[]) => any>(func: T): T & _.Cancelable;
-}
-
-declare const throttle: Throttle;
+import { throttle } from "../fp";
 export = throttle;
diff --git a/types/lodash/fp/thru.d.ts b/types/lodash/fp/thru.d.ts
index d7f60ba8d0..b9725820ad 100644
--- a/types/lodash/fp/thru.d.ts
+++ b/types/lodash/fp/thru.d.ts
@@ -1,56 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface Thru {
-    /**
-     * This method is like _.tap except that it returns the result of interceptor.
-     *
-     * @param value The value to provide to interceptor.
-     * @param interceptor The function to invoke.
-     * @param thisArg The this binding of interceptor.
-     * @return Returns the result of interceptor.
-     */
-    (): Thru;
-    /**
-     * This method is like _.tap except that it returns the result of interceptor.
-     *
-     * @param value The value to provide to interceptor.
-     * @param interceptor The function to invoke.
-     * @param thisArg The this binding of interceptor.
-     * @return Returns the result of interceptor.
-     */
-    <T, TResult>(interceptor: (value: T) => TResult): Thru1x1<T, TResult>;
-    /**
-     * This method is like _.tap except that it returns the result of interceptor.
-     *
-     * @param value The value to provide to interceptor.
-     * @param interceptor The function to invoke.
-     * @param thisArg The this binding of interceptor.
-     * @return Returns the result of interceptor.
-     */
-    <T, TResult>(interceptor: (value: T) => TResult, value: T): TResult;
-}
-interface Thru1x1<T, TResult> {
-    /**
-     * This method is like _.tap except that it returns the result of interceptor.
-     *
-     * @param value The value to provide to interceptor.
-     * @param interceptor The function to invoke.
-     * @param thisArg The this binding of interceptor.
-     * @return Returns the result of interceptor.
-     */
-    (): Thru1x1<T, TResult>;
-    /**
-     * This method is like _.tap except that it returns the result of interceptor.
-     *
-     * @param value The value to provide to interceptor.
-     * @param interceptor The function to invoke.
-     * @param thisArg The this binding of interceptor.
-     * @return Returns the result of interceptor.
-     */
-    (value: T): TResult;
-}
-
-declare const thru: Thru;
+import { thru } from "../fp";
 export = thru;
diff --git a/types/lodash/fp/times.d.ts b/types/lodash/fp/times.d.ts
index 777f7423fc..3d9f0c6077 100644
--- a/types/lodash/fp/times.d.ts
+++ b/types/lodash/fp/times.d.ts
@@ -1,56 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface Times {
-    /**
-     * Invokes the iteratee function n times, returning an array of the results of each invocation. The iteratee
-     * is invoked with one argument; (index).
-     *
-     * @param n The number of times to invoke iteratee.
-     * @param iteratee The function invoked per iteration.
-     * @return Returns the array of results.
-     */
-    (): Times;
-    /**
-     * Invokes the iteratee function n times, returning an array of the results of each invocation. The iteratee
-     * is invoked with one argument; (index).
-     *
-     * @param n The number of times to invoke iteratee.
-     * @param iteratee The function invoked per iteration.
-     * @return Returns the array of results.
-     */
-    <TResult>(iteratee: (num: number) => TResult): Times1x1<TResult>;
-    /**
-     * Invokes the iteratee function n times, returning an array of the results of each invocation. The iteratee
-     * is invoked with one argument; (index).
-     *
-     * @param n The number of times to invoke iteratee.
-     * @param iteratee The function invoked per iteration.
-     * @return Returns the array of results.
-     */
-    <TResult>(iteratee: (num: number) => TResult, n: number): TResult[];
-}
-interface Times1x1<TResult> {
-    /**
-     * Invokes the iteratee function n times, returning an array of the results of each invocation. The iteratee
-     * is invoked with one argument; (index).
-     *
-     * @param n The number of times to invoke iteratee.
-     * @param iteratee The function invoked per iteration.
-     * @return Returns the array of results.
-     */
-    (): Times1x1<TResult>;
-    /**
-     * Invokes the iteratee function n times, returning an array of the results of each invocation. The iteratee
-     * is invoked with one argument; (index).
-     *
-     * @param n The number of times to invoke iteratee.
-     * @param iteratee The function invoked per iteration.
-     * @return Returns the array of results.
-     */
-    (n: number): TResult[];
-}
-
-declare const times: Times;
+import { times } from "../fp";
 export = times;
diff --git a/types/lodash/fp/toArray.d.ts b/types/lodash/fp/toArray.d.ts
index 78d50b3fe3..4b18ce6d55 100644
--- a/types/lodash/fp/toArray.d.ts
+++ b/types/lodash/fp/toArray.d.ts
@@ -1,32 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface ToArray {
-    /**
-     * Converts value to an array.
-     *
-     * @param value The value to convert.
-     * @return Returns the converted array.
-     */
-    <T>(value: _.List<T> | _.Dictionary<T> | _.NumericDictionary<T> | null | undefined): T[];
-    /**
-     * Converts value to an array.
-     *
-     * @param value The value to convert.
-     * @return Returns the converted array.
-     */
-    <T>(value: T): Array<T[keyof T]>;
-    /**
-     * Converts value to an array.
-     *
-     * @param value The value to convert.
-     * @return Returns the converted array.
-     */
-    (): any[];
-}
-
-declare const toArray: ToArray;
+import { toArray } from "../fp";
 export = toArray;
diff --git a/types/lodash/fp/toFinite.d.ts b/types/lodash/fp/toFinite.d.ts
index 7f28cb70da..1d41996182 100644
--- a/types/lodash/fp/toFinite.d.ts
+++ b/types/lodash/fp/toFinite.d.ts
@@ -1,30 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type ToFinite =
-    /**
-     * Converts `value` to a finite number.
-     *
-     * @since 4.12.0
-     * @category Lang
-     * @param value The value to convert.
-     * @returns Returns the converted number.
-     * @example
-     *
-     * _.toFinite(3.2);
-     * // => 3.2
-     *
-     * _.toFinite(Number.MIN_VALUE);
-     * // => 5e-324
-     *
-     * _.toFinite(Infinity);
-     * // => 1.7976931348623157e+308
-     *
-     * _.toFinite('3.2');
-     * // => 3.2
-     */
-    (value: any) => number;
-
-declare const toFinite: ToFinite;
+import { toFinite } from "../fp";
 export = toFinite;
diff --git a/types/lodash/fp/toInteger.d.ts b/types/lodash/fp/toInteger.d.ts
index 7eb32253d7..46ccaf945b 100644
--- a/types/lodash/fp/toInteger.d.ts
+++ b/types/lodash/fp/toInteger.d.ts
@@ -1,31 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type ToInteger =
-    /**
-     * Converts `value` to an integer.
-     *
-     * **Note:** This function is loosely based on [`ToInteger`](http://www.ecma-international.org/ecma-262/6.0/#sec-tointeger).
-     *
-     * @category Lang
-     * @param value The value to convert.
-     * @returns Returns the converted integer.
-     * @example
-     *
-     * _.toInteger(3);
-     * // => 3
-     *
-     * _.toInteger(Number.MIN_VALUE);
-     * // => 0
-     *
-     * _.toInteger(Infinity);
-     * // => 1.7976931348623157e+308
-     *
-     * _.toInteger('3');
-     * // => 3
-     */
-    (value: any) => number;
-
-declare const toInteger: ToInteger;
+import { toInteger } from "../fp";
 export = toInteger;
diff --git a/types/lodash/fp/toLength.d.ts b/types/lodash/fp/toLength.d.ts
index 9df6af979b..bb62924318 100644
--- a/types/lodash/fp/toLength.d.ts
+++ b/types/lodash/fp/toLength.d.ts
@@ -1,32 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type ToLength =
-    /**
-     * Converts `value` to an integer suitable for use as the length of an
-     * array-like object.
-     *
-     * **Note:** This method is based on [`ToLength`](http://ecma-international.org/ecma-262/6.0/#sec-tolength).
-     *
-     * @category Lang
-     * @param value The value to convert.
-     * @return Returns the converted integer.
-     * @example
-     *
-     * _.toLength(3);
-     * // => 3
-     *
-     * _.toLength(Number.MIN_VALUE);
-     * // => 0
-     *
-     * _.toLength(Infinity);
-     * // => 4294967295
-     *
-     * _.toLength('3');
-     * // => 3
-     */
-    (value: any) => number;
-
-declare const toLength: ToLength;
+import { toLength } from "../fp";
 export = toLength;
diff --git a/types/lodash/fp/toLower.d.ts b/types/lodash/fp/toLower.d.ts
index 6423a579b2..64e6e364d0 100644
--- a/types/lodash/fp/toLower.d.ts
+++ b/types/lodash/fp/toLower.d.ts
@@ -1,15 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type ToLower =
-    /**
-     * Converts `string`, as a whole, to lower case.
-     *
-     * @param string The string to convert.
-     * @return Returns the lower cased string.
-     */
-    (string: string) => string;
-
-declare const toLower: ToLower;
+import { toLower } from "../fp";
 export = toLower;
diff --git a/types/lodash/fp/toNumber.d.ts b/types/lodash/fp/toNumber.d.ts
index 346ded8778..262b91c52d 100644
--- a/types/lodash/fp/toNumber.d.ts
+++ b/types/lodash/fp/toNumber.d.ts
@@ -1,29 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type ToNumber =
-    /**
-     * Converts `value` to a number.
-     *
-     * @category Lang
-     * @param value The value to process.
-     * @returns Returns the number.
-     * @example
-     *
-     * _.toNumber(3);
-     * // => 3
-     *
-     * _.toNumber(Number.MIN_VALUE);
-     * // => 5e-324
-     *
-     * _.toNumber(Infinity);
-     * // => Infinity
-     *
-     * _.toNumber('3');
-     * // => 3
-     */
-    (value: any) => number;
-
-declare const toNumber: ToNumber;
+import { toNumber } from "../fp";
 export = toNumber;
diff --git a/types/lodash/fp/toPairs.d.ts b/types/lodash/fp/toPairs.d.ts
index 4097690ac8..89334fcb5d 100644
--- a/types/lodash/fp/toPairs.d.ts
+++ b/types/lodash/fp/toPairs.d.ts
@@ -1,25 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface ToPairs {
-    /**
-     * Creates an array of own enumerable key-value pairs for object.
-     *
-     * @param object The object to query.
-     * @return Returns the new array of key-value pairs.
-     */
-    <T>(object: _.Dictionary<T> | _.NumericDictionary<T>): Array<[string, T]>;
-    /**
-     * Creates an array of own enumerable key-value pairs for object.
-     *
-     * @param object The object to query.
-     * @return Returns the new array of key-value pairs.
-     */
-    (object: object): Array<[string, any]>;
-}
-
-declare const toPairs: ToPairs;
+import { toPairs } from "../fp";
 export = toPairs;
diff --git a/types/lodash/fp/toPairsIn.d.ts b/types/lodash/fp/toPairsIn.d.ts
index 80859cc318..278ff0b1df 100644
--- a/types/lodash/fp/toPairsIn.d.ts
+++ b/types/lodash/fp/toPairsIn.d.ts
@@ -1,25 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface ToPairsIn {
-    /**
-     * Creates an array of own and inherited enumerable key-value pairs for object.
-     *
-     * @param object The object to query.
-     * @return Returns the new array of key-value pairs.
-     */
-    <T>(object: _.Dictionary<T> | _.NumericDictionary<T>): Array<[string, T]>;
-    /**
-     * Creates an array of own and inherited enumerable key-value pairs for object.
-     *
-     * @param object The object to query.
-     * @return Returns the new array of key-value pairs.
-     */
-    (object: object): Array<[string, any]>;
-}
-
-declare const toPairsIn: ToPairsIn;
+import { toPairsIn } from "../fp";
 export = toPairsIn;
diff --git a/types/lodash/fp/toPath.d.ts b/types/lodash/fp/toPath.d.ts
index a501811e14..9f2287ceae 100644
--- a/types/lodash/fp/toPath.d.ts
+++ b/types/lodash/fp/toPath.d.ts
@@ -1,32 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type ToPath =
-    /**
-     * Converts `value` to a property path array.
-     *
-     * @category Util
-     * @param value The value to convert.
-     * @returns Returns the new property path array.
-     * @example
-     *
-     * _.toPath('a.b.c');
-     * // => ['a', 'b', 'c']
-     *
-     * _.toPath('a[0].b.c');
-     * // => ['a', '0', 'b', 'c']
-     *
-     * var path = ['a', 'b', 'c'],
-     * newPath = _.toPath(path);
-     *
-     * console.log(newPath);
-     * // => ['a', 'b', 'c']
-     *
-     * console.log(path === newPath);
-     * // => false
-     */
-    (value: any) => string[];
-
-declare const toPath: ToPath;
+import { toPath } from "../fp";
 export = toPath;
diff --git a/types/lodash/fp/toPlainObject.d.ts b/types/lodash/fp/toPlainObject.d.ts
index 18b2eada62..22fa070387 100644
--- a/types/lodash/fp/toPlainObject.d.ts
+++ b/types/lodash/fp/toPlainObject.d.ts
@@ -1,16 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type ToPlainObject =
-    /**
-     * Converts value to a plain object flattening inherited enumerable properties of value to own properties
-     * of the plain object.
-     *
-     * @param value The value to convert.
-     * @return Returns the converted plain object.
-     */
-    (value: any) => any;
-
-declare const toPlainObject: ToPlainObject;
+import { toPlainObject } from "../fp";
 export = toPlainObject;
diff --git a/types/lodash/fp/toSafeInteger.d.ts b/types/lodash/fp/toSafeInteger.d.ts
index 9ddc6a79a1..2f85078fcb 100644
--- a/types/lodash/fp/toSafeInteger.d.ts
+++ b/types/lodash/fp/toSafeInteger.d.ts
@@ -1,30 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type ToSafeInteger =
-    /**
-     * Converts `value` to a safe integer. A safe integer can be compared and
-     * represented correctly.
-     *
-     * @category Lang
-     * @param value The value to convert.
-     * @returns Returns the converted integer.
-     * @example
-     *
-     * _.toSafeInteger(3);
-     * // => 3
-     *
-     * _.toSafeInteger(Number.MIN_VALUE);
-     * // => 0
-     *
-     * _.toSafeInteger(Infinity);
-     * // => 9007199254740991
-     *
-     * _.toSafeInteger('3');
-     * // => 3
-     */
-    (value: any) => number;
-
-declare const toSafeInteger: ToSafeInteger;
+import { toSafeInteger } from "../fp";
 export = toSafeInteger;
diff --git a/types/lodash/fp/toString.d.ts b/types/lodash/fp/toString.d.ts
index 0dcf51fecf..ee6703c068 100644
--- a/types/lodash/fp/toString.d.ts
+++ b/types/lodash/fp/toString.d.ts
@@ -1,27 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type ToString =
-    /**
-     * Converts `value` to a string if it's not one. An empty string is returned
-     * for `null` and `undefined` values. The sign of `-0` is preserved.
-     *
-     * @category Lang
-     * @param value The value to process.
-     * @returns Returns the string.
-     * @example
-     *
-     * _.toString(null);
-     * // => ''
-     *
-     * _.toString(-0);
-     * // => '-0'
-     *
-     * _.toString([1, 2, 3]);
-     * // => '1,2,3'
-     */
-    (value: any) => string;
-
-declare const toString: ToString;
+import { toString } from "../fp";
 export = toString;
diff --git a/types/lodash/fp/toUpper.d.ts b/types/lodash/fp/toUpper.d.ts
index af46b1dba8..6bf21c1fce 100644
--- a/types/lodash/fp/toUpper.d.ts
+++ b/types/lodash/fp/toUpper.d.ts
@@ -1,15 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type ToUpper =
-    /**
-     * Converts `string`, as a whole, to upper case.
-     *
-     * @param string The string to convert.
-     * @return Returns the upper cased string.
-     */
-    (string: string) => string;
-
-declare const toUpper: ToUpper;
+import { toUpper } from "../fp";
 export = toUpper;
diff --git a/types/lodash/fp/transform.d.ts b/types/lodash/fp/transform.d.ts
index 420258c514..ab0653cb7c 100644
--- a/types/lodash/fp/transform.d.ts
+++ b/types/lodash/fp/transform.d.ts
@@ -1,240 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Transform {
-    /**
-     * An alternative to _.reduce; this method transforms object to a new accumulator object which is the result of
-     * running each of its own enumerable properties through iteratee, with each invocation potentially mutating
-     * the accumulator object. The iteratee is bound to thisArg and invoked with four arguments: (accumulator,
-     * value, key, object). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param accumulator The custom accumulator value.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the accumulated value.
-     */
-    (): Transform;
-    /**
-     * An alternative to _.reduce; this method transforms object to a new accumulator object which is the result of
-     * running each of its own enumerable properties through iteratee, with each invocation potentially mutating
-     * the accumulator object. The iteratee is bound to thisArg and invoked with four arguments: (accumulator,
-     * value, key, object). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param accumulator The custom accumulator value.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the accumulated value.
-     */
-    <T, TResult>(iteratee: _.MemoVoidIteratorCapped<T, TResult[]>): Transform1x1<T, TResult>;
-    /**
-     * An alternative to _.reduce; this method transforms object to a new accumulator object which is the result of
-     * running each of its own enumerable properties through iteratee, with each invocation potentially mutating
-     * the accumulator object. The iteratee is bound to thisArg and invoked with four arguments: (accumulator,
-     * value, key, object). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param accumulator The custom accumulator value.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the accumulated value.
-     */
-    <T, TResult>(iteratee: _.MemoVoidIteratorCapped<T, TResult[]>, accumulator: ReadonlyArray<TResult>): Transform1x2<T, TResult>;
-    /**
-     * An alternative to _.reduce; this method transforms object to a new accumulator object which is the result of
-     * running each of its own enumerable properties through iteratee, with each invocation potentially mutating
-     * the accumulator object. The iteratee is bound to thisArg and invoked with four arguments: (accumulator,
-     * value, key, object). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param accumulator The custom accumulator value.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the accumulated value.
-     */
-    <T, TResult>(iteratee: _.MemoVoidIteratorCapped<T, TResult[]>, accumulator: ReadonlyArray<TResult>, object: ReadonlyArray<T> | _.Dictionary<T>): TResult[];
-    /**
-     * An alternative to _.reduce; this method transforms object to a new accumulator object which is the result of
-     * running each of its own enumerable properties through iteratee, with each invocation potentially mutating
-     * the accumulator object. The iteratee is bound to thisArg and invoked with four arguments: (accumulator,
-     * value, key, object). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param accumulator The custom accumulator value.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the accumulated value.
-     */
-    <T, TResult>(iteratee: _.MemoVoidIteratorCapped<T, _.Dictionary<TResult>>): Transform2x1<T, TResult>;
-    /**
-     * An alternative to _.reduce; this method transforms object to a new accumulator object which is the result of
-     * running each of its own enumerable properties through iteratee, with each invocation potentially mutating
-     * the accumulator object. The iteratee is bound to thisArg and invoked with four arguments: (accumulator,
-     * value, key, object). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param accumulator The custom accumulator value.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the accumulated value.
-     */
-    <T, TResult>(iteratee: _.MemoVoidIteratorCapped<T, _.Dictionary<TResult>>, accumulator: _.Dictionary<TResult>): Transform2x2<T, TResult>;
-    /**
-     * An alternative to _.reduce; this method transforms object to a new accumulator object which is the result of
-     * running each of its own enumerable properties through iteratee, with each invocation potentially mutating
-     * the accumulator object. The iteratee is bound to thisArg and invoked with four arguments: (accumulator,
-     * value, key, object). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param accumulator The custom accumulator value.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the accumulated value.
-     */
-    <T, TResult>(iteratee: _.MemoVoidIteratorCapped<T, _.Dictionary<TResult>>, accumulator: _.Dictionary<TResult>, object: ReadonlyArray<T> | _.Dictionary<T>): _.Dictionary<TResult>;
-}
-interface Transform1x1<T, TResult> {
-    /**
-     * An alternative to _.reduce; this method transforms object to a new accumulator object which is the result of
-     * running each of its own enumerable properties through iteratee, with each invocation potentially mutating
-     * the accumulator object. The iteratee is bound to thisArg and invoked with four arguments: (accumulator,
-     * value, key, object). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param accumulator The custom accumulator value.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the accumulated value.
-     */
-    (): Transform1x1<T, TResult>;
-    /**
-     * An alternative to _.reduce; this method transforms object to a new accumulator object which is the result of
-     * running each of its own enumerable properties through iteratee, with each invocation potentially mutating
-     * the accumulator object. The iteratee is bound to thisArg and invoked with four arguments: (accumulator,
-     * value, key, object). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param accumulator The custom accumulator value.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the accumulated value.
-     */
-    (accumulator: ReadonlyArray<TResult>): Transform1x2<T, TResult>;
-    /**
-     * An alternative to _.reduce; this method transforms object to a new accumulator object which is the result of
-     * running each of its own enumerable properties through iteratee, with each invocation potentially mutating
-     * the accumulator object. The iteratee is bound to thisArg and invoked with four arguments: (accumulator,
-     * value, key, object). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param accumulator The custom accumulator value.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the accumulated value.
-     */
-    (accumulator: ReadonlyArray<TResult>, object: ReadonlyArray<T> | _.Dictionary<T>): TResult[];
-}
-interface Transform1x2<T, TResult> {
-    /**
-     * An alternative to _.reduce; this method transforms object to a new accumulator object which is the result of
-     * running each of its own enumerable properties through iteratee, with each invocation potentially mutating
-     * the accumulator object. The iteratee is bound to thisArg and invoked with four arguments: (accumulator,
-     * value, key, object). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param accumulator The custom accumulator value.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the accumulated value.
-     */
-    (): Transform1x2<T, TResult>;
-    /**
-     * An alternative to _.reduce; this method transforms object to a new accumulator object which is the result of
-     * running each of its own enumerable properties through iteratee, with each invocation potentially mutating
-     * the accumulator object. The iteratee is bound to thisArg and invoked with four arguments: (accumulator,
-     * value, key, object). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param accumulator The custom accumulator value.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the accumulated value.
-     */
-    (object: ReadonlyArray<T> | _.Dictionary<T>): TResult[];
-}
-interface Transform2x1<T, TResult> {
-    /**
-     * An alternative to _.reduce; this method transforms object to a new accumulator object which is the result of
-     * running each of its own enumerable properties through iteratee, with each invocation potentially mutating
-     * the accumulator object. The iteratee is bound to thisArg and invoked with four arguments: (accumulator,
-     * value, key, object). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param accumulator The custom accumulator value.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the accumulated value.
-     */
-    (): Transform2x1<T, TResult>;
-    /**
-     * An alternative to _.reduce; this method transforms object to a new accumulator object which is the result of
-     * running each of its own enumerable properties through iteratee, with each invocation potentially mutating
-     * the accumulator object. The iteratee is bound to thisArg and invoked with four arguments: (accumulator,
-     * value, key, object). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param accumulator The custom accumulator value.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the accumulated value.
-     */
-    (accumulator: _.Dictionary<TResult>): Transform2x2<T, TResult>;
-    /**
-     * An alternative to _.reduce; this method transforms object to a new accumulator object which is the result of
-     * running each of its own enumerable properties through iteratee, with each invocation potentially mutating
-     * the accumulator object. The iteratee is bound to thisArg and invoked with four arguments: (accumulator,
-     * value, key, object). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param accumulator The custom accumulator value.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the accumulated value.
-     */
-    (accumulator: _.Dictionary<TResult>, object: ReadonlyArray<T> | _.Dictionary<T>): _.Dictionary<TResult>;
-}
-interface Transform2x2<T, TResult> {
-    /**
-     * An alternative to _.reduce; this method transforms object to a new accumulator object which is the result of
-     * running each of its own enumerable properties through iteratee, with each invocation potentially mutating
-     * the accumulator object. The iteratee is bound to thisArg and invoked with four arguments: (accumulator,
-     * value, key, object). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param accumulator The custom accumulator value.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the accumulated value.
-     */
-    (): Transform2x2<T, TResult>;
-    /**
-     * An alternative to _.reduce; this method transforms object to a new accumulator object which is the result of
-     * running each of its own enumerable properties through iteratee, with each invocation potentially mutating
-     * the accumulator object. The iteratee is bound to thisArg and invoked with four arguments: (accumulator,
-     * value, key, object). Iteratee functions may exit iteration early by explicitly returning false.
-     *
-     * @param object The object to iterate over.
-     * @param iteratee The function invoked per iteration.
-     * @param accumulator The custom accumulator value.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the accumulated value.
-     */
-    (object: ReadonlyArray<T> | _.Dictionary<T>): _.Dictionary<TResult>;
-}
-
-declare const transform: Transform;
+import { transform } from "../fp";
 export = transform;
diff --git a/types/lodash/fp/trim.d.ts b/types/lodash/fp/trim.d.ts
index 7b1c8696b4..f0f9b905d0 100644
--- a/types/lodash/fp/trim.d.ts
+++ b/types/lodash/fp/trim.d.ts
@@ -1,16 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type Trim =
-    /**
-     * Removes leading and trailing whitespace or specified characters from string.
-     *
-     * @param string The string to trim.
-     * @param chars The characters to trim.
-     * @return Returns the trimmed string.
-     */
-    (string: string) => string;
-
-declare const trim: Trim;
+import { trim } from "../fp";
 export = trim;
diff --git a/types/lodash/fp/trimChars.d.ts b/types/lodash/fp/trimChars.d.ts
index 8c0a97e9f5..929a49300e 100644
--- a/types/lodash/fp/trimChars.d.ts
+++ b/types/lodash/fp/trimChars.d.ts
@@ -1,51 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface Trim {
-    /**
-     * Removes leading and trailing whitespace or specified characters from string.
-     *
-     * @param string The string to trim.
-     * @param chars The characters to trim.
-     * @return Returns the trimmed string.
-     */
-    (): Trim;
-    /**
-     * Removes leading and trailing whitespace or specified characters from string.
-     *
-     * @param string The string to trim.
-     * @param chars The characters to trim.
-     * @return Returns the trimmed string.
-     */
-    (chars: string): Trim1x1;
-    /**
-     * Removes leading and trailing whitespace or specified characters from string.
-     *
-     * @param string The string to trim.
-     * @param chars The characters to trim.
-     * @return Returns the trimmed string.
-     */
-    (chars: string, string: string): string;
-}
-interface Trim1x1 {
-    /**
-     * Removes leading and trailing whitespace or specified characters from string.
-     *
-     * @param string The string to trim.
-     * @param chars The characters to trim.
-     * @return Returns the trimmed string.
-     */
-    (): Trim1x1;
-    /**
-     * Removes leading and trailing whitespace or specified characters from string.
-     *
-     * @param string The string to trim.
-     * @param chars The characters to trim.
-     * @return Returns the trimmed string.
-     */
-    (string: string): string;
-}
-
-declare const trimChars: Trim;
+import { trimChars } from "../fp";
 export = trimChars;
diff --git a/types/lodash/fp/trimCharsEnd.d.ts b/types/lodash/fp/trimCharsEnd.d.ts
index f8b74c9c5a..2f5609ae2d 100644
--- a/types/lodash/fp/trimCharsEnd.d.ts
+++ b/types/lodash/fp/trimCharsEnd.d.ts
@@ -1,51 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface TrimEnd {
-    /**
-     * Removes trailing whitespace or specified characters from string.
-     *
-     * @param string The string to trim.
-     * @param chars The characters to trim.
-     * @return Returns the trimmed string.
-     */
-    (): TrimEnd;
-    /**
-     * Removes trailing whitespace or specified characters from string.
-     *
-     * @param string The string to trim.
-     * @param chars The characters to trim.
-     * @return Returns the trimmed string.
-     */
-    (chars: string): TrimEnd1x1;
-    /**
-     * Removes trailing whitespace or specified characters from string.
-     *
-     * @param string The string to trim.
-     * @param chars The characters to trim.
-     * @return Returns the trimmed string.
-     */
-    (chars: string, string: string): string;
-}
-interface TrimEnd1x1 {
-    /**
-     * Removes trailing whitespace or specified characters from string.
-     *
-     * @param string The string to trim.
-     * @param chars The characters to trim.
-     * @return Returns the trimmed string.
-     */
-    (): TrimEnd1x1;
-    /**
-     * Removes trailing whitespace or specified characters from string.
-     *
-     * @param string The string to trim.
-     * @param chars The characters to trim.
-     * @return Returns the trimmed string.
-     */
-    (string: string): string;
-}
-
-declare const trimCharsEnd: TrimEnd;
+import { trimCharsEnd } from "../fp";
 export = trimCharsEnd;
diff --git a/types/lodash/fp/trimCharsStart.d.ts b/types/lodash/fp/trimCharsStart.d.ts
index 5b4da3996d..fb998f7e50 100644
--- a/types/lodash/fp/trimCharsStart.d.ts
+++ b/types/lodash/fp/trimCharsStart.d.ts
@@ -1,51 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface TrimStart {
-    /**
-     * Removes leading whitespace or specified characters from string.
-     *
-     * @param string The string to trim.
-     * @param chars The characters to trim.
-     * @return Returns the trimmed string.
-     */
-    (): TrimStart;
-    /**
-     * Removes leading whitespace or specified characters from string.
-     *
-     * @param string The string to trim.
-     * @param chars The characters to trim.
-     * @return Returns the trimmed string.
-     */
-    (chars: string): TrimStart1x1;
-    /**
-     * Removes leading whitespace or specified characters from string.
-     *
-     * @param string The string to trim.
-     * @param chars The characters to trim.
-     * @return Returns the trimmed string.
-     */
-    (chars: string, string: string): string;
-}
-interface TrimStart1x1 {
-    /**
-     * Removes leading whitespace or specified characters from string.
-     *
-     * @param string The string to trim.
-     * @param chars The characters to trim.
-     * @return Returns the trimmed string.
-     */
-    (): TrimStart1x1;
-    /**
-     * Removes leading whitespace or specified characters from string.
-     *
-     * @param string The string to trim.
-     * @param chars The characters to trim.
-     * @return Returns the trimmed string.
-     */
-    (string: string): string;
-}
-
-declare const trimCharsStart: TrimStart;
+import { trimCharsStart } from "../fp";
 export = trimCharsStart;
diff --git a/types/lodash/fp/trimEnd.d.ts b/types/lodash/fp/trimEnd.d.ts
index 02754779a2..b666494483 100644
--- a/types/lodash/fp/trimEnd.d.ts
+++ b/types/lodash/fp/trimEnd.d.ts
@@ -1,16 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type TrimEnd =
-    /**
-     * Removes trailing whitespace or specified characters from string.
-     *
-     * @param string The string to trim.
-     * @param chars The characters to trim.
-     * @return Returns the trimmed string.
-     */
-    (string: string) => string;
-
-declare const trimEnd: TrimEnd;
+import { trimEnd } from "../fp";
 export = trimEnd;
diff --git a/types/lodash/fp/trimStart.d.ts b/types/lodash/fp/trimStart.d.ts
index 567dc22e5e..988227ca74 100644
--- a/types/lodash/fp/trimStart.d.ts
+++ b/types/lodash/fp/trimStart.d.ts
@@ -1,16 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type TrimStart =
-    /**
-     * Removes leading whitespace or specified characters from string.
-     *
-     * @param string The string to trim.
-     * @param chars The characters to trim.
-     * @return Returns the trimmed string.
-     */
-    (string: string) => string;
-
-declare const trimStart: TrimStart;
+import { trimStart } from "../fp";
 export = trimStart;
diff --git a/types/lodash/fp/truncate.d.ts b/types/lodash/fp/truncate.d.ts
index 6645f41697..d38b7b18b6 100644
--- a/types/lodash/fp/truncate.d.ts
+++ b/types/lodash/fp/truncate.d.ts
@@ -1,58 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Truncate {
-    /**
-     * Truncates string if it’s longer than the given maximum string length. The last characters of the truncated
-     * string are replaced with the omission string which defaults to "…".
-     *
-     * @param string The string to truncate.
-     * @param options The options object or maximum string length.
-     * @return Returns the truncated string.
-     */
-    (): Truncate;
-    /**
-     * Truncates string if it’s longer than the given maximum string length. The last characters of the truncated
-     * string are replaced with the omission string which defaults to "…".
-     *
-     * @param string The string to truncate.
-     * @param options The options object or maximum string length.
-     * @return Returns the truncated string.
-     */
-    (options: _.TruncateOptions): Truncate1x1;
-    /**
-     * Truncates string if it’s longer than the given maximum string length. The last characters of the truncated
-     * string are replaced with the omission string which defaults to "…".
-     *
-     * @param string The string to truncate.
-     * @param options The options object or maximum string length.
-     * @return Returns the truncated string.
-     */
-    (options: _.TruncateOptions, string: string): string;
-}
-interface Truncate1x1 {
-    /**
-     * Truncates string if it’s longer than the given maximum string length. The last characters of the truncated
-     * string are replaced with the omission string which defaults to "…".
-     *
-     * @param string The string to truncate.
-     * @param options The options object or maximum string length.
-     * @return Returns the truncated string.
-     */
-    (): Truncate1x1;
-    /**
-     * Truncates string if it’s longer than the given maximum string length. The last characters of the truncated
-     * string are replaced with the omission string which defaults to "…".
-     *
-     * @param string The string to truncate.
-     * @param options The options object or maximum string length.
-     * @return Returns the truncated string.
-     */
-    (string: string): string;
-}
-
-declare const truncate: Truncate;
+import { truncate } from "../fp";
 export = truncate;
diff --git a/types/lodash/fp/unapply.d.ts b/types/lodash/fp/unapply.d.ts
index 8bde142263..c59b6b2a19 100644
--- a/types/lodash/fp/unapply.d.ts
+++ b/types/lodash/fp/unapply.d.ts
@@ -1,19 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type Rest =
-    /**
-     * Creates a function that invokes func with the this binding of the created function and arguments from start
-     * and beyond provided as an array.
-     *
-     * Note: This method is based on the rest parameter.
-     *
-     * @param func The function to apply a rest parameter to.
-     * @param start The start position of the rest parameter.
-     * @return Returns the new function.
-     */
-    (func: (...args: any[]) => any) => (...args: any[]) => any;
-
-declare const unapply: Rest;
+import { unapply } from "../fp";
 export = unapply;
diff --git a/types/lodash/fp/unary.d.ts b/types/lodash/fp/unary.d.ts
index 19e2946e96..02e319576a 100644
--- a/types/lodash/fp/unary.d.ts
+++ b/types/lodash/fp/unary.d.ts
@@ -1,21 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type Unary =
-    /**
-     * Creates a function that accepts up to one argument, ignoring any
-     * additional arguments.
-     *
-     * @category Function
-     * @param func The function to cap arguments for.
-     * @returns Returns the new function.
-     * @example
-     *
-     * _.map(['6', '8', '10'], _.unary(parseInt));
-     * // => [6, 8, 10]
-     */
-    <T, TResult>(func: (arg1: T, ...args: any[]) => TResult) => (arg1: T) => TResult;
-
-declare const unary: Unary;
+import { unary } from "../fp";
 export = unary;
diff --git a/types/lodash/fp/unescape.d.ts b/types/lodash/fp/unescape.d.ts
index 20b602a298..efcccf2a51 100644
--- a/types/lodash/fp/unescape.d.ts
+++ b/types/lodash/fp/unescape.d.ts
@@ -1,19 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type Unescape =
-    /**
-     * The inverse of _.escape; this method converts the HTML entities &amp;, &lt;, &gt;, &quot;, &#39;, and &#96;
-     * in string to their corresponding characters.
-     *
-     * Note: No other HTML entities are unescaped. To unescape additional HTML entities use a third-party library
-     * like he.
-     *
-     * @param string The string to unescape.
-     * @return Returns the unescaped string.
-     */
-    (string: string) => string;
-
-declare const unescape: Unescape;
+import { unescape } from "../fp";
 export = unescape;
diff --git a/types/lodash/fp/union.d.ts b/types/lodash/fp/union.d.ts
index 99c9e3d4ff..8e098ee7f6 100644
--- a/types/lodash/fp/union.d.ts
+++ b/types/lodash/fp/union.d.ts
@@ -1,53 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Union {
-    /**
-     * Creates an array of unique values, in order, from all of the provided arrays using SameValueZero for
-     * equality comparisons.
-     *
-     * @param arrays The arrays to inspect.
-     * @return Returns the new array of combined values.
-     */
-    (): Union;
-    /**
-     * Creates an array of unique values, in order, from all of the provided arrays using SameValueZero for
-     * equality comparisons.
-     *
-     * @param arrays The arrays to inspect.
-     * @return Returns the new array of combined values.
-     */
-    <T>(arrays2: _.List<T> | null | undefined): Union1x1<T>;
-    /**
-     * Creates an array of unique values, in order, from all of the provided arrays using SameValueZero for
-     * equality comparisons.
-     *
-     * @param arrays The arrays to inspect.
-     * @return Returns the new array of combined values.
-     */
-    <T>(arrays2: _.List<T> | null | undefined, arrays: _.List<T> | null | undefined): T[];
-}
-interface Union1x1<T> {
-    /**
-     * Creates an array of unique values, in order, from all of the provided arrays using SameValueZero for
-     * equality comparisons.
-     *
-     * @param arrays The arrays to inspect.
-     * @return Returns the new array of combined values.
-     */
-    (): Union1x1<T>;
-    /**
-     * Creates an array of unique values, in order, from all of the provided arrays using SameValueZero for
-     * equality comparisons.
-     *
-     * @param arrays The arrays to inspect.
-     * @return Returns the new array of combined values.
-     */
-    (arrays: _.List<T> | null | undefined): T[];
-}
-
-declare const union: Union;
+import { union } from "../fp";
 export = union;
diff --git a/types/lodash/fp/unionBy.d.ts b/types/lodash/fp/unionBy.d.ts
index 42db2e6352..f3882c6b4a 100644
--- a/types/lodash/fp/unionBy.d.ts
+++ b/types/lodash/fp/unionBy.d.ts
@@ -1,105 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface UnionBy {
-    /**
-     * This method is like `_.union` except that it accepts `iteratee` which is
-     * invoked for each element of each `arrays` to generate the criterion by which
-     * uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * @param arrays The arrays to inspect.
-     * @param iteratee The iteratee invoked per element.
-     * @return Returns the new array of combined values.
-     */
-    (): UnionBy;
-    /**
-     * This method is like `_.union` except that it accepts `iteratee` which is
-     * invoked for each element of each `arrays` to generate the criterion by which
-     * uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * @param arrays The arrays to inspect.
-     * @param iteratee The iteratee invoked per element.
-     * @return Returns the new array of combined values.
-     */
-    <T>(iteratee: _.ValueIteratee<T>): UnionBy1x1<T>;
-    /**
-     * This method is like `_.union` except that it accepts `iteratee` which is
-     * invoked for each element of each `arrays` to generate the criterion by which
-     * uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * @param arrays The arrays to inspect.
-     * @param iteratee The iteratee invoked per element.
-     * @return Returns the new array of combined values.
-     */
-    <T>(iteratee: _.ValueIteratee<T>, arrays1: _.List<T> | null | undefined): UnionBy1x2<T>;
-    /**
-     * This method is like `_.union` except that it accepts `iteratee` which is
-     * invoked for each element of each `arrays` to generate the criterion by which
-     * uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * @param arrays The arrays to inspect.
-     * @param iteratee The iteratee invoked per element.
-     * @return Returns the new array of combined values.
-     */
-    <T>(iteratee: _.ValueIteratee<T>, arrays1: _.List<T> | null | undefined, arrays2: _.List<T> | null | undefined): T[];
-}
-interface UnionBy1x1<T> {
-    /**
-     * This method is like `_.union` except that it accepts `iteratee` which is
-     * invoked for each element of each `arrays` to generate the criterion by which
-     * uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * @param arrays The arrays to inspect.
-     * @param iteratee The iteratee invoked per element.
-     * @return Returns the new array of combined values.
-     */
-    (): UnionBy1x1<T>;
-    /**
-     * This method is like `_.union` except that it accepts `iteratee` which is
-     * invoked for each element of each `arrays` to generate the criterion by which
-     * uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * @param arrays The arrays to inspect.
-     * @param iteratee The iteratee invoked per element.
-     * @return Returns the new array of combined values.
-     */
-    (arrays1: _.List<T> | null | undefined): UnionBy1x2<T>;
-    /**
-     * This method is like `_.union` except that it accepts `iteratee` which is
-     * invoked for each element of each `arrays` to generate the criterion by which
-     * uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * @param arrays The arrays to inspect.
-     * @param iteratee The iteratee invoked per element.
-     * @return Returns the new array of combined values.
-     */
-    (arrays1: _.List<T> | null | undefined, arrays2: _.List<T> | null | undefined): T[];
-}
-interface UnionBy1x2<T> {
-    /**
-     * This method is like `_.union` except that it accepts `iteratee` which is
-     * invoked for each element of each `arrays` to generate the criterion by which
-     * uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * @param arrays The arrays to inspect.
-     * @param iteratee The iteratee invoked per element.
-     * @return Returns the new array of combined values.
-     */
-    (): UnionBy1x2<T>;
-    /**
-     * This method is like `_.union` except that it accepts `iteratee` which is
-     * invoked for each element of each `arrays` to generate the criterion by which
-     * uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * @param arrays The arrays to inspect.
-     * @param iteratee The iteratee invoked per element.
-     * @return Returns the new array of combined values.
-     */
-    (arrays2: _.List<T> | null | undefined): T[];
-}
-
-declare const unionBy: UnionBy;
+import { unionBy } from "../fp";
 export = unionBy;
diff --git a/types/lodash/fp/unionWith.d.ts b/types/lodash/fp/unionWith.d.ts
index 89a5066ec0..46e19fd176 100644
--- a/types/lodash/fp/unionWith.d.ts
+++ b/types/lodash/fp/unionWith.d.ts
@@ -1,177 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface UnionWith {
-    /**
-     * This method is like `_.union` except that it accepts `comparator` which
-     * is invoked to compare elements of `arrays`. The comparator is invoked
-     * with two arguments: (arrVal, othVal).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [comparator] The comparator invoked per element.
-     * @returns Returns the new array of combined values.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
-     *
-     * _.unionWith(objects, others, _.isEqual);
-     * // => [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
-     */
-    (): UnionWith;
-    /**
-     * This method is like `_.union` except that it accepts `comparator` which
-     * is invoked to compare elements of `arrays`. The comparator is invoked
-     * with two arguments: (arrVal, othVal).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [comparator] The comparator invoked per element.
-     * @returns Returns the new array of combined values.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
-     *
-     * _.unionWith(objects, others, _.isEqual);
-     * // => [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
-     */
-    <T>(comparator: _.Comparator<T>): UnionWith1x1<T>;
-    /**
-     * This method is like `_.union` except that it accepts `comparator` which
-     * is invoked to compare elements of `arrays`. The comparator is invoked
-     * with two arguments: (arrVal, othVal).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [comparator] The comparator invoked per element.
-     * @returns Returns the new array of combined values.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
-     *
-     * _.unionWith(objects, others, _.isEqual);
-     * // => [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
-     */
-    <T>(comparator: _.Comparator<T>, arrays: _.List<T> | null | undefined): UnionWith1x2<T>;
-    /**
-     * This method is like `_.union` except that it accepts `comparator` which
-     * is invoked to compare elements of `arrays`. The comparator is invoked
-     * with two arguments: (arrVal, othVal).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [comparator] The comparator invoked per element.
-     * @returns Returns the new array of combined values.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
-     *
-     * _.unionWith(objects, others, _.isEqual);
-     * // => [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
-     */
-    <T>(comparator: _.Comparator<T>, arrays: _.List<T> | null | undefined, arrays2: _.List<T> | null | undefined): T[];
-}
-interface UnionWith1x1<T> {
-    /**
-     * This method is like `_.union` except that it accepts `comparator` which
-     * is invoked to compare elements of `arrays`. The comparator is invoked
-     * with two arguments: (arrVal, othVal).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [comparator] The comparator invoked per element.
-     * @returns Returns the new array of combined values.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
-     *
-     * _.unionWith(objects, others, _.isEqual);
-     * // => [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
-     */
-    (): UnionWith1x1<T>;
-    /**
-     * This method is like `_.union` except that it accepts `comparator` which
-     * is invoked to compare elements of `arrays`. The comparator is invoked
-     * with two arguments: (arrVal, othVal).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [comparator] The comparator invoked per element.
-     * @returns Returns the new array of combined values.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
-     *
-     * _.unionWith(objects, others, _.isEqual);
-     * // => [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
-     */
-    (arrays: _.List<T> | null | undefined): UnionWith1x2<T>;
-    /**
-     * This method is like `_.union` except that it accepts `comparator` which
-     * is invoked to compare elements of `arrays`. The comparator is invoked
-     * with two arguments: (arrVal, othVal).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [comparator] The comparator invoked per element.
-     * @returns Returns the new array of combined values.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
-     *
-     * _.unionWith(objects, others, _.isEqual);
-     * // => [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
-     */
-    (arrays: _.List<T> | null | undefined, arrays2: _.List<T> | null | undefined): T[];
-}
-interface UnionWith1x2<T> {
-    /**
-     * This method is like `_.union` except that it accepts `comparator` which
-     * is invoked to compare elements of `arrays`. The comparator is invoked
-     * with two arguments: (arrVal, othVal).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [comparator] The comparator invoked per element.
-     * @returns Returns the new array of combined values.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
-     *
-     * _.unionWith(objects, others, _.isEqual);
-     * // => [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
-     */
-    (): UnionWith1x2<T>;
-    /**
-     * This method is like `_.union` except that it accepts `comparator` which
-     * is invoked to compare elements of `arrays`. The comparator is invoked
-     * with two arguments: (arrVal, othVal).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [comparator] The comparator invoked per element.
-     * @returns Returns the new array of combined values.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
-     *
-     * _.unionWith(objects, others, _.isEqual);
-     * // => [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
-     */
-    (arrays2: _.List<T> | null | undefined): T[];
-}
-
-declare const unionWith: UnionWith;
+import { unionWith } from "../fp";
 export = unionWith;
diff --git a/types/lodash/fp/uniq.d.ts b/types/lodash/fp/uniq.d.ts
index a627214680..877d0d94d9 100644
--- a/types/lodash/fp/uniq.d.ts
+++ b/types/lodash/fp/uniq.d.ts
@@ -1,25 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-type Uniq =
-    /**
-     * Creates a duplicate-free version of an array, using
-     * [`SameValueZero`](http://ecma-international.org/ecma-262/6.0/#sec-samevaluezero)
-     * for equality comparisons, in which only the first occurrence of each element
-     * is kept.
-     *
-     * @category Array
-     * @param array The array to inspect.
-     * @returns Returns the new duplicate free array.
-     * @example
-     *
-     * _.uniq([2, 1, 2]);
-     * // => [2, 1]
-     */
-    <T>(array: _.List<T> | null | undefined) => T[];
-
-declare const uniq: Uniq;
+import { uniq } from "../fp";
 export = uniq;
diff --git a/types/lodash/fp/uniqBy.d.ts b/types/lodash/fp/uniqBy.d.ts
index d89b8908c5..0e6522d704 100644
--- a/types/lodash/fp/uniqBy.d.ts
+++ b/types/lodash/fp/uniqBy.d.ts
@@ -1,186 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface UniqBy {
-    /**
-     * This method is like `_.uniq` except that it accepts `iteratee` which is
-     * invoked for each element in `array` to generate the criterion by which
-     * uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param array The array to inspect.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the new duplicate free array.
-     * @example
-     *
-     * _.uniqBy([2.1, 1.2, 2.3], Math.floor);
-     * // => [2.1, 1.2]
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.uniqBy([{ 'x': 1 }, { 'x': 2 }, { 'x': 1 }], 'x');
-     * // => [{ 'x': 1 }, { 'x': 2 }]
-     */
-    (): UniqBy;
-    /**
-     * This method is like `_.uniq` except that it accepts `iteratee` which is
-     * invoked for each element in `array` to generate the criterion by which
-     * uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param array The array to inspect.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the new duplicate free array.
-     * @example
-     *
-     * _.uniqBy([2.1, 1.2, 2.3], Math.floor);
-     * // => [2.1, 1.2]
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.uniqBy([{ 'x': 1 }, { 'x': 2 }, { 'x': 1 }], 'x');
-     * // => [{ 'x': 1 }, { 'x': 2 }]
-     */
-    (iteratee: (value: string) => _.NotVoid): UniqBy1x1;
-    /**
-     * This method is like `_.uniq` except that it accepts `iteratee` which is
-     * invoked for each element in `array` to generate the criterion by which
-     * uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param array The array to inspect.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the new duplicate free array.
-     * @example
-     *
-     * _.uniqBy([2.1, 1.2, 2.3], Math.floor);
-     * // => [2.1, 1.2]
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.uniqBy([{ 'x': 1 }, { 'x': 2 }, { 'x': 1 }], 'x');
-     * // => [{ 'x': 1 }, { 'x': 2 }]
-     */
-    (iteratee: (value: string) => _.NotVoid, array: string | null | undefined): string[];
-    /**
-     * This method is like `_.uniq` except that it accepts `iteratee` which is
-     * invoked for each element in `array` to generate the criterion by which
-     * uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param array The array to inspect.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the new duplicate free array.
-     * @example
-     *
-     * _.uniqBy([2.1, 1.2, 2.3], Math.floor);
-     * // => [2.1, 1.2]
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.uniqBy([{ 'x': 1 }, { 'x': 2 }, { 'x': 1 }], 'x');
-     * // => [{ 'x': 1 }, { 'x': 2 }]
-     */
-    <T>(iteratee: _.ValueIteratee<T>): UniqBy2x1<T>;
-    /**
-     * This method is like `_.uniq` except that it accepts `iteratee` which is
-     * invoked for each element in `array` to generate the criterion by which
-     * uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param array The array to inspect.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the new duplicate free array.
-     * @example
-     *
-     * _.uniqBy([2.1, 1.2, 2.3], Math.floor);
-     * // => [2.1, 1.2]
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.uniqBy([{ 'x': 1 }, { 'x': 2 }, { 'x': 1 }], 'x');
-     * // => [{ 'x': 1 }, { 'x': 2 }]
-     */
-    <T>(iteratee: _.ValueIteratee<T>, array: _.List<T> | null | undefined): T[];
-}
-interface UniqBy1x1 {
-    /**
-     * This method is like `_.uniq` except that it accepts `iteratee` which is
-     * invoked for each element in `array` to generate the criterion by which
-     * uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param array The array to inspect.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the new duplicate free array.
-     * @example
-     *
-     * _.uniqBy([2.1, 1.2, 2.3], Math.floor);
-     * // => [2.1, 1.2]
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.uniqBy([{ 'x': 1 }, { 'x': 2 }, { 'x': 1 }], 'x');
-     * // => [{ 'x': 1 }, { 'x': 2 }]
-     */
-    (): UniqBy1x1;
-    /**
-     * This method is like `_.uniq` except that it accepts `iteratee` which is
-     * invoked for each element in `array` to generate the criterion by which
-     * uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param array The array to inspect.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the new duplicate free array.
-     * @example
-     *
-     * _.uniqBy([2.1, 1.2, 2.3], Math.floor);
-     * // => [2.1, 1.2]
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.uniqBy([{ 'x': 1 }, { 'x': 2 }, { 'x': 1 }], 'x');
-     * // => [{ 'x': 1 }, { 'x': 2 }]
-     */
-    (array: string | null | undefined): string[];
-}
-interface UniqBy2x1<T> {
-    /**
-     * This method is like `_.uniq` except that it accepts `iteratee` which is
-     * invoked for each element in `array` to generate the criterion by which
-     * uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param array The array to inspect.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the new duplicate free array.
-     * @example
-     *
-     * _.uniqBy([2.1, 1.2, 2.3], Math.floor);
-     * // => [2.1, 1.2]
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.uniqBy([{ 'x': 1 }, { 'x': 2 }, { 'x': 1 }], 'x');
-     * // => [{ 'x': 1 }, { 'x': 2 }]
-     */
-    (): UniqBy2x1<T>;
-    /**
-     * This method is like `_.uniq` except that it accepts `iteratee` which is
-     * invoked for each element in `array` to generate the criterion by which
-     * uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param array The array to inspect.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the new duplicate free array.
-     * @example
-     *
-     * _.uniqBy([2.1, 1.2, 2.3], Math.floor);
-     * // => [2.1, 1.2]
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.uniqBy([{ 'x': 1 }, { 'x': 2 }, { 'x': 1 }], 'x');
-     * // => [{ 'x': 1 }, { 'x': 2 }]
-     */
-    (array: _.List<T> | null | undefined): T[];
-}
-
-declare const uniqBy: UniqBy;
+import { uniqBy } from "../fp";
 export = uniqBy;
diff --git a/types/lodash/fp/uniqWith.d.ts b/types/lodash/fp/uniqWith.d.ts
index f0e6de90ff..165f45f1e3 100644
--- a/types/lodash/fp/uniqWith.d.ts
+++ b/types/lodash/fp/uniqWith.d.ts
@@ -1,98 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface UniqWith {
-    /**
-     * This method is like `_.uniq` except that it accepts `comparator` which
-     * is invoked to compare elements of `array`. The comparator is invoked with
-     * two arguments: (arrVal, othVal).
-     *
-     * @category Array
-     * @param array The array to inspect.
-     * @param [comparator] The comparator invoked per element.
-     * @returns Returns the new duplicate free array.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 },  { 'x': 1, 'y': 2 }];
-     *
-     * _.uniqWith(objects, _.isEqual);
-     * // => [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }]
-     */
-    (): UniqWith;
-    /**
-     * This method is like `_.uniq` except that it accepts `comparator` which
-     * is invoked to compare elements of `array`. The comparator is invoked with
-     * two arguments: (arrVal, othVal).
-     *
-     * @category Array
-     * @param array The array to inspect.
-     * @param [comparator] The comparator invoked per element.
-     * @returns Returns the new duplicate free array.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 },  { 'x': 1, 'y': 2 }];
-     *
-     * _.uniqWith(objects, _.isEqual);
-     * // => [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }]
-     */
-    <T>(comparator: _.Comparator<T>): UniqWith1x1<T>;
-    /**
-     * This method is like `_.uniq` except that it accepts `comparator` which
-     * is invoked to compare elements of `array`. The comparator is invoked with
-     * two arguments: (arrVal, othVal).
-     *
-     * @category Array
-     * @param array The array to inspect.
-     * @param [comparator] The comparator invoked per element.
-     * @returns Returns the new duplicate free array.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 },  { 'x': 1, 'y': 2 }];
-     *
-     * _.uniqWith(objects, _.isEqual);
-     * // => [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }]
-     */
-    <T>(comparator: _.Comparator<T>, array: _.List<T> | null | undefined): T[];
-}
-interface UniqWith1x1<T> {
-    /**
-     * This method is like `_.uniq` except that it accepts `comparator` which
-     * is invoked to compare elements of `array`. The comparator is invoked with
-     * two arguments: (arrVal, othVal).
-     *
-     * @category Array
-     * @param array The array to inspect.
-     * @param [comparator] The comparator invoked per element.
-     * @returns Returns the new duplicate free array.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 },  { 'x': 1, 'y': 2 }];
-     *
-     * _.uniqWith(objects, _.isEqual);
-     * // => [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }]
-     */
-    (): UniqWith1x1<T>;
-    /**
-     * This method is like `_.uniq` except that it accepts `comparator` which
-     * is invoked to compare elements of `array`. The comparator is invoked with
-     * two arguments: (arrVal, othVal).
-     *
-     * @category Array
-     * @param array The array to inspect.
-     * @param [comparator] The comparator invoked per element.
-     * @returns Returns the new duplicate free array.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 },  { 'x': 1, 'y': 2 }];
-     *
-     * _.uniqWith(objects, _.isEqual);
-     * // => [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }]
-     */
-    (array: _.List<T> | null | undefined): T[];
-}
-
-declare const uniqWith: UniqWith;
+import { uniqWith } from "../fp";
 export = uniqWith;
diff --git a/types/lodash/fp/uniqueId.d.ts b/types/lodash/fp/uniqueId.d.ts
index d9ba028d53..57736d9ccd 100644
--- a/types/lodash/fp/uniqueId.d.ts
+++ b/types/lodash/fp/uniqueId.d.ts
@@ -1,15 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type UniqueId =
-    /**
-     * Generates a unique ID. If prefix is provided the ID is appended to it.
-     *
-     * @param prefix The value to prefix the ID with.
-     * @return Returns the unique ID.
-     */
-    (prefix: string) => string;
-
-declare const uniqueId: UniqueId;
+import { uniqueId } from "../fp";
 export = uniqueId;
diff --git a/types/lodash/fp/unnest.d.ts b/types/lodash/fp/unnest.d.ts
index fc05e923c5..852e9a1367 100644
--- a/types/lodash/fp/unnest.d.ts
+++ b/types/lodash/fp/unnest.d.ts
@@ -1,17 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-type Flatten =
-    /**
-     * Flattens `array` a single level deep.
-     *
-     * @param array The array to flatten.
-     * @return Returns the new flattened array.
-     */
-    <T>(array: _.List<_.Many<T>> | null | undefined) => T[];
-
-declare const unnest: Flatten;
+import { unnest } from "../fp";
 export = unnest;
diff --git a/types/lodash/fp/unset.d.ts b/types/lodash/fp/unset.d.ts
index 12199c061a..3e99247714 100644
--- a/types/lodash/fp/unset.d.ts
+++ b/types/lodash/fp/unset.d.ts
@@ -1,63 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Unset {
-    /**
-     * Removes the property at path of object.
-     *
-     * Note: This method mutates object.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to unset.
-     * @return Returns true if the property is deleted, else false.
-     */
-    (): Unset;
-    /**
-     * Removes the property at path of object.
-     *
-     * Note: This method mutates object.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to unset.
-     * @return Returns true if the property is deleted, else false.
-     */
-    (path: _.PropertyPath): Unset1x1;
-    /**
-     * Removes the property at path of object.
-     *
-     * Note: This method mutates object.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to unset.
-     * @return Returns true if the property is deleted, else false.
-     */
-    (path: _.PropertyPath, object: any): boolean;
-}
-interface Unset1x1 {
-    /**
-     * Removes the property at path of object.
-     *
-     * Note: This method mutates object.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to unset.
-     * @return Returns true if the property is deleted, else false.
-     */
-    (): Unset1x1;
-    /**
-     * Removes the property at path of object.
-     *
-     * Note: This method mutates object.
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to unset.
-     * @return Returns true if the property is deleted, else false.
-     */
-    (object: any): boolean;
-}
-
-declare const unset: Unset;
+import { unset } from "../fp";
 export = unset;
diff --git a/types/lodash/fp/unzip.d.ts b/types/lodash/fp/unzip.d.ts
index e6ce334d48..ba9d4cd709 100644
--- a/types/lodash/fp/unzip.d.ts
+++ b/types/lodash/fp/unzip.d.ts
@@ -1,18 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-type Unzip =
-    /**
-     * This method is like _.zip except that it accepts an array of grouped elements and creates an array
-     * regrouping the elements to their pre-zip configuration.
-     *
-     * @param array The array of grouped elements to process.
-     * @return Returns the new array of regrouped elements.
-     */
-    <T>(array: T[][] | _.List<_.List<T>> | null | undefined) => T[][];
-
-declare const unzip: Unzip;
+import { unzip } from "../fp";
 export = unzip;
diff --git a/types/lodash/fp/unzipWith.d.ts b/types/lodash/fp/unzipWith.d.ts
index 36fd2e6bf0..599eadb355 100644
--- a/types/lodash/fp/unzipWith.d.ts
+++ b/types/lodash/fp/unzipWith.d.ts
@@ -1,68 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface UnzipWith {
-    /**
-     * This method is like _.unzip except that it accepts an iteratee to specify how regrouped values should be
-     * combined. The iteratee is bound to thisArg and invoked with four arguments: (accumulator, value, index,
-     * group).
-     *
-     * @param array The array of grouped elements to process.
-     * @param iteratee The function to combine regrouped values.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new array of regrouped elements.
-     */
-    (): UnzipWith;
-    /**
-     * This method is like _.unzip except that it accepts an iteratee to specify how regrouped values should be
-     * combined. The iteratee is bound to thisArg and invoked with four arguments: (accumulator, value, index,
-     * group).
-     *
-     * @param array The array of grouped elements to process.
-     * @param iteratee The function to combine regrouped values.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new array of regrouped elements.
-     */
-    <T, TResult>(iteratee: (...values: T[]) => TResult): UnzipWith1x1<T, TResult>;
-    /**
-     * This method is like _.unzip except that it accepts an iteratee to specify how regrouped values should be
-     * combined. The iteratee is bound to thisArg and invoked with four arguments: (accumulator, value, index,
-     * group).
-     *
-     * @param array The array of grouped elements to process.
-     * @param iteratee The function to combine regrouped values.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new array of regrouped elements.
-     */
-    <T, TResult>(iteratee: (...values: T[]) => TResult, array: _.List<_.List<T>> | null | undefined): TResult[];
-}
-interface UnzipWith1x1<T, TResult> {
-    /**
-     * This method is like _.unzip except that it accepts an iteratee to specify how regrouped values should be
-     * combined. The iteratee is bound to thisArg and invoked with four arguments: (accumulator, value, index,
-     * group).
-     *
-     * @param array The array of grouped elements to process.
-     * @param iteratee The function to combine regrouped values.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new array of regrouped elements.
-     */
-    (): UnzipWith1x1<T, TResult>;
-    /**
-     * This method is like _.unzip except that it accepts an iteratee to specify how regrouped values should be
-     * combined. The iteratee is bound to thisArg and invoked with four arguments: (accumulator, value, index,
-     * group).
-     *
-     * @param array The array of grouped elements to process.
-     * @param iteratee The function to combine regrouped values.
-     * @param thisArg The this binding of iteratee.
-     * @return Returns the new array of regrouped elements.
-     */
-    (array: _.List<_.List<T>> | null | undefined): TResult[];
-}
-
-declare const unzipWith: UnzipWith;
+import { unzipWith } from "../fp";
 export = unzipWith;
diff --git a/types/lodash/fp/update.d.ts b/types/lodash/fp/update.d.ts
index 011a8ea61e..76dfe482f8 100644
--- a/types/lodash/fp/update.d.ts
+++ b/types/lodash/fp/update.d.ts
@@ -1,105 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Update {
-    /**
-     * This method is like _.set except that accepts updater to produce the value to set. Use _.updateWith to
-     * customize path creation. The updater is invoked with one argument: (value).
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param updater The function to produce the updated value.
-     * @return Returns object.
-     */
-    (): Update;
-    /**
-     * This method is like _.set except that accepts updater to produce the value to set. Use _.updateWith to
-     * customize path creation. The updater is invoked with one argument: (value).
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param updater The function to produce the updated value.
-     * @return Returns object.
-     */
-    (path: _.PropertyPath): Update1x1;
-    /**
-     * This method is like _.set except that accepts updater to produce the value to set. Use _.updateWith to
-     * customize path creation. The updater is invoked with one argument: (value).
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param updater The function to produce the updated value.
-     * @return Returns object.
-     */
-    (path: _.PropertyPath, updater: (value: any) => any): Update1x2;
-    /**
-     * This method is like _.set except that accepts updater to produce the value to set. Use _.updateWith to
-     * customize path creation. The updater is invoked with one argument: (value).
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param updater The function to produce the updated value.
-     * @return Returns object.
-     */
-    (path: _.PropertyPath, updater: (value: any) => any, object: object): any;
-}
-interface Update1x1 {
-    /**
-     * This method is like _.set except that accepts updater to produce the value to set. Use _.updateWith to
-     * customize path creation. The updater is invoked with one argument: (value).
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param updater The function to produce the updated value.
-     * @return Returns object.
-     */
-    (): Update1x1;
-    /**
-     * This method is like _.set except that accepts updater to produce the value to set. Use _.updateWith to
-     * customize path creation. The updater is invoked with one argument: (value).
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param updater The function to produce the updated value.
-     * @return Returns object.
-     */
-    (updater: (value: any) => any): Update1x2;
-    /**
-     * This method is like _.set except that accepts updater to produce the value to set. Use _.updateWith to
-     * customize path creation. The updater is invoked with one argument: (value).
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param updater The function to produce the updated value.
-     * @return Returns object.
-     */
-    (updater: (value: any) => any, object: object): any;
-}
-interface Update1x2 {
-    /**
-     * This method is like _.set except that accepts updater to produce the value to set. Use _.updateWith to
-     * customize path creation. The updater is invoked with one argument: (value).
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param updater The function to produce the updated value.
-     * @return Returns object.
-     */
-    (): Update1x2;
-    /**
-     * This method is like _.set except that accepts updater to produce the value to set. Use _.updateWith to
-     * customize path creation. The updater is invoked with one argument: (value).
-     *
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param updater The function to produce the updated value.
-     * @return Returns object.
-     */
-    (object: object): any;
-}
-
-declare const update: Update;
+import { update } from "../fp";
 export = update;
diff --git a/types/lodash/fp/updateWith.d.ts b/types/lodash/fp/updateWith.d.ts
index e26ed161d2..6d6331d1b5 100644
--- a/types/lodash/fp/updateWith.d.ts
+++ b/types/lodash/fp/updateWith.d.ts
@@ -1,431 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface UpdateWith {
-    /**
-     * This method is like `_.update` except that it accepts `customizer` which is
-     * invoked to produce the objects of `path`.  If `customizer` returns `undefined`
-     * path creation is handled by the method instead. The `customizer` is invoked
-     * with three arguments: (nsValue, key, nsObject).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @since 4.6.0
-     * @category Object
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param updater The function to produce the updated value.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * var object = {};
-     *
-     * _.updateWith(object, '[0][1]', _.constant('a'), Object);
-     * // => { '0': { '1': 'a' } }
-     */
-    (): UpdateWith;
-    /**
-     * This method is like `_.update` except that it accepts `customizer` which is
-     * invoked to produce the objects of `path`.  If `customizer` returns `undefined`
-     * path creation is handled by the method instead. The `customizer` is invoked
-     * with three arguments: (nsValue, key, nsObject).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @since 4.6.0
-     * @category Object
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param updater The function to produce the updated value.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * var object = {};
-     *
-     * _.updateWith(object, '[0][1]', _.constant('a'), Object);
-     * // => { '0': { '1': 'a' } }
-     */
-    <T extends object>(customizer: _.SetWithCustomizer<T>): UpdateWith1x1<T>;
-    /**
-     * This method is like `_.update` except that it accepts `customizer` which is
-     * invoked to produce the objects of `path`.  If `customizer` returns `undefined`
-     * path creation is handled by the method instead. The `customizer` is invoked
-     * with three arguments: (nsValue, key, nsObject).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @since 4.6.0
-     * @category Object
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param updater The function to produce the updated value.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * var object = {};
-     *
-     * _.updateWith(object, '[0][1]', _.constant('a'), Object);
-     * // => { '0': { '1': 'a' } }
-     */
-    <T extends object>(customizer: _.SetWithCustomizer<T>, path: _.PropertyPath): UpdateWith1x2<T>;
-    /**
-     * This method is like `_.update` except that it accepts `customizer` which is
-     * invoked to produce the objects of `path`.  If `customizer` returns `undefined`
-     * path creation is handled by the method instead. The `customizer` is invoked
-     * with three arguments: (nsValue, key, nsObject).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @since 4.6.0
-     * @category Object
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param updater The function to produce the updated value.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * var object = {};
-     *
-     * _.updateWith(object, '[0][1]', _.constant('a'), Object);
-     * // => { '0': { '1': 'a' } }
-     */
-    <T extends object>(customizer: _.SetWithCustomizer<T>, path: _.PropertyPath, updater: (oldValue: any) => any): UpdateWith1x3<T>;
-    /**
-     * This method is like `_.update` except that it accepts `customizer` which is
-     * invoked to produce the objects of `path`.  If `customizer` returns `undefined`
-     * path creation is handled by the method instead. The `customizer` is invoked
-     * with three arguments: (nsValue, key, nsObject).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @since 4.6.0
-     * @category Object
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param updater The function to produce the updated value.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * var object = {};
-     *
-     * _.updateWith(object, '[0][1]', _.constant('a'), Object);
-     * // => { '0': { '1': 'a' } }
-     */
-    <T extends object>(customizer: _.SetWithCustomizer<T>, path: _.PropertyPath, updater: (oldValue: any) => any, object: T): T;
-    /**
-     * This method is like `_.update` except that it accepts `customizer` which is
-     * invoked to produce the objects of `path`.  If `customizer` returns `undefined`
-     * path creation is handled by the method instead. The `customizer` is invoked
-     * with three arguments: (nsValue, key, nsObject).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @since 4.6.0
-     * @category Object
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param updater The function to produce the updated value.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * var object = {};
-     *
-     * _.updateWith(object, '[0][1]', _.constant('a'), Object);
-     * // => { '0': { '1': 'a' } }
-     */
-    <T extends object, TResult>(customizer: _.SetWithCustomizer<T>, path: _.PropertyPath, updater: (oldValue: any) => any, object: T): TResult;
-}
-interface UpdateWith1x1<T extends object> {
-    /**
-     * This method is like `_.update` except that it accepts `customizer` which is
-     * invoked to produce the objects of `path`.  If `customizer` returns `undefined`
-     * path creation is handled by the method instead. The `customizer` is invoked
-     * with three arguments: (nsValue, key, nsObject).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @since 4.6.0
-     * @category Object
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param updater The function to produce the updated value.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * var object = {};
-     *
-     * _.updateWith(object, '[0][1]', _.constant('a'), Object);
-     * // => { '0': { '1': 'a' } }
-     */
-    (): UpdateWith1x1<T>;
-    /**
-     * This method is like `_.update` except that it accepts `customizer` which is
-     * invoked to produce the objects of `path`.  If `customizer` returns `undefined`
-     * path creation is handled by the method instead. The `customizer` is invoked
-     * with three arguments: (nsValue, key, nsObject).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @since 4.6.0
-     * @category Object
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param updater The function to produce the updated value.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * var object = {};
-     *
-     * _.updateWith(object, '[0][1]', _.constant('a'), Object);
-     * // => { '0': { '1': 'a' } }
-     */
-    (path: _.PropertyPath): UpdateWith1x2<T>;
-    /**
-     * This method is like `_.update` except that it accepts `customizer` which is
-     * invoked to produce the objects of `path`.  If `customizer` returns `undefined`
-     * path creation is handled by the method instead. The `customizer` is invoked
-     * with three arguments: (nsValue, key, nsObject).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @since 4.6.0
-     * @category Object
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param updater The function to produce the updated value.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * var object = {};
-     *
-     * _.updateWith(object, '[0][1]', _.constant('a'), Object);
-     * // => { '0': { '1': 'a' } }
-     */
-    (path: _.PropertyPath, updater: (oldValue: any) => any): UpdateWith1x3<T>;
-    /**
-     * This method is like `_.update` except that it accepts `customizer` which is
-     * invoked to produce the objects of `path`.  If `customizer` returns `undefined`
-     * path creation is handled by the method instead. The `customizer` is invoked
-     * with three arguments: (nsValue, key, nsObject).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @since 4.6.0
-     * @category Object
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param updater The function to produce the updated value.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * var object = {};
-     *
-     * _.updateWith(object, '[0][1]', _.constant('a'), Object);
-     * // => { '0': { '1': 'a' } }
-     */
-    (path: _.PropertyPath, updater: (oldValue: any) => any, object: T): T;
-    /**
-     * This method is like `_.update` except that it accepts `customizer` which is
-     * invoked to produce the objects of `path`.  If `customizer` returns `undefined`
-     * path creation is handled by the method instead. The `customizer` is invoked
-     * with three arguments: (nsValue, key, nsObject).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @since 4.6.0
-     * @category Object
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param updater The function to produce the updated value.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * var object = {};
-     *
-     * _.updateWith(object, '[0][1]', _.constant('a'), Object);
-     * // => { '0': { '1': 'a' } }
-     */
-    <TResult>(path: _.PropertyPath, updater: (oldValue: any) => any, object: T): TResult;
-}
-interface UpdateWith1x2<T extends object> {
-    /**
-     * This method is like `_.update` except that it accepts `customizer` which is
-     * invoked to produce the objects of `path`.  If `customizer` returns `undefined`
-     * path creation is handled by the method instead. The `customizer` is invoked
-     * with three arguments: (nsValue, key, nsObject).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @since 4.6.0
-     * @category Object
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param updater The function to produce the updated value.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * var object = {};
-     *
-     * _.updateWith(object, '[0][1]', _.constant('a'), Object);
-     * // => { '0': { '1': 'a' } }
-     */
-    (): UpdateWith1x2<T>;
-    /**
-     * This method is like `_.update` except that it accepts `customizer` which is
-     * invoked to produce the objects of `path`.  If `customizer` returns `undefined`
-     * path creation is handled by the method instead. The `customizer` is invoked
-     * with three arguments: (nsValue, key, nsObject).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @since 4.6.0
-     * @category Object
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param updater The function to produce the updated value.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * var object = {};
-     *
-     * _.updateWith(object, '[0][1]', _.constant('a'), Object);
-     * // => { '0': { '1': 'a' } }
-     */
-    (updater: (oldValue: any) => any): UpdateWith1x3<T>;
-    /**
-     * This method is like `_.update` except that it accepts `customizer` which is
-     * invoked to produce the objects of `path`.  If `customizer` returns `undefined`
-     * path creation is handled by the method instead. The `customizer` is invoked
-     * with three arguments: (nsValue, key, nsObject).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @since 4.6.0
-     * @category Object
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param updater The function to produce the updated value.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * var object = {};
-     *
-     * _.updateWith(object, '[0][1]', _.constant('a'), Object);
-     * // => { '0': { '1': 'a' } }
-     */
-    (updater: (oldValue: any) => any, object: T): T;
-    /**
-     * This method is like `_.update` except that it accepts `customizer` which is
-     * invoked to produce the objects of `path`.  If `customizer` returns `undefined`
-     * path creation is handled by the method instead. The `customizer` is invoked
-     * with three arguments: (nsValue, key, nsObject).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @since 4.6.0
-     * @category Object
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param updater The function to produce the updated value.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * var object = {};
-     *
-     * _.updateWith(object, '[0][1]', _.constant('a'), Object);
-     * // => { '0': { '1': 'a' } }
-     */
-    <TResult>(updater: (oldValue: any) => any, object: T): TResult;
-}
-interface UpdateWith1x3<T extends object> {
-    /**
-     * This method is like `_.update` except that it accepts `customizer` which is
-     * invoked to produce the objects of `path`.  If `customizer` returns `undefined`
-     * path creation is handled by the method instead. The `customizer` is invoked
-     * with three arguments: (nsValue, key, nsObject).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @since 4.6.0
-     * @category Object
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param updater The function to produce the updated value.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * var object = {};
-     *
-     * _.updateWith(object, '[0][1]', _.constant('a'), Object);
-     * // => { '0': { '1': 'a' } }
-     */
-    (): UpdateWith1x3<T>;
-    /**
-     * This method is like `_.update` except that it accepts `customizer` which is
-     * invoked to produce the objects of `path`.  If `customizer` returns `undefined`
-     * path creation is handled by the method instead. The `customizer` is invoked
-     * with three arguments: (nsValue, key, nsObject).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @since 4.6.0
-     * @category Object
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param updater The function to produce the updated value.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * var object = {};
-     *
-     * _.updateWith(object, '[0][1]', _.constant('a'), Object);
-     * // => { '0': { '1': 'a' } }
-     */
-    (object: T): T;
-    /**
-     * This method is like `_.update` except that it accepts `customizer` which is
-     * invoked to produce the objects of `path`.  If `customizer` returns `undefined`
-     * path creation is handled by the method instead. The `customizer` is invoked
-     * with three arguments: (nsValue, key, nsObject).
-     *
-     * **Note:** This method mutates `object`.
-     *
-     * @since 4.6.0
-     * @category Object
-     * @param object The object to modify.
-     * @param path The path of the property to set.
-     * @param updater The function to produce the updated value.
-     * @param [customizer] The function to customize assigned values.
-     * @returns Returns `object`.
-     * @example
-     *
-     * var object = {};
-     *
-     * _.updateWith(object, '[0][1]', _.constant('a'), Object);
-     * // => { '0': { '1': 'a' } }
-     */
-    <TResult>(object: T): TResult;
-}
-
-declare const updateWith: UpdateWith;
+import { updateWith } from "../fp";
 export = updateWith;
diff --git a/types/lodash/fp/upperCase.d.ts b/types/lodash/fp/upperCase.d.ts
index 5e6cab91bf..10aadb28ec 100644
--- a/types/lodash/fp/upperCase.d.ts
+++ b/types/lodash/fp/upperCase.d.ts
@@ -1,15 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type UpperCase =
-    /**
-     * Converts `string`, as space separated words, to upper case.
-     *
-     * @param string The string to convert.
-     * @return Returns the upper cased string.
-     */
-    (string: string) => string;
-
-declare const upperCase: UpperCase;
+import { upperCase } from "../fp";
 export = upperCase;
diff --git a/types/lodash/fp/upperFirst.d.ts b/types/lodash/fp/upperFirst.d.ts
index 54a442030e..e2c9adfd57 100644
--- a/types/lodash/fp/upperFirst.d.ts
+++ b/types/lodash/fp/upperFirst.d.ts
@@ -1,15 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type UpperFirst =
-    /**
-     * Converts the first character of `string` to upper case.
-     *
-     * @param string The string to convert.
-     * @return Returns the converted string.
-     */
-    (string: string) => string;
-
-declare const upperFirst: UpperFirst;
+import { upperFirst } from "../fp";
 export = upperFirst;
diff --git a/types/lodash/fp/useWith.d.ts b/types/lodash/fp/useWith.d.ts
index 1196dfbade..991905a402 100644
--- a/types/lodash/fp/useWith.d.ts
+++ b/types/lodash/fp/useWith.d.ts
@@ -1,58 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface OverArgs {
-    /**
-     * Creates a function that runs each argument through a corresponding transform function.
-     *
-     * @param func The function to wrap.
-     * @param transforms The functions to transform arguments, specified as individual functions or arrays
-     * of functions.
-     * @return Returns the new function.
-     */
-    (): OverArgs;
-    /**
-     * Creates a function that runs each argument through a corresponding transform function.
-     *
-     * @param func The function to wrap.
-     * @param transforms The functions to transform arguments, specified as individual functions or arrays
-     * of functions.
-     * @return Returns the new function.
-     */
-    (func: (...args: any[]) => any): OverArgs1x1;
-    /**
-     * Creates a function that runs each argument through a corresponding transform function.
-     *
-     * @param func The function to wrap.
-     * @param transforms The functions to transform arguments, specified as individual functions or arrays
-     * of functions.
-     * @return Returns the new function.
-     */
-    (func: (...args: any[]) => any, transforms: _.Many<(...args: any[]) => any>): (...args: any[]) => any;
-}
-interface OverArgs1x1 {
-    /**
-     * Creates a function that runs each argument through a corresponding transform function.
-     *
-     * @param func The function to wrap.
-     * @param transforms The functions to transform arguments, specified as individual functions or arrays
-     * of functions.
-     * @return Returns the new function.
-     */
-    (): OverArgs1x1;
-    /**
-     * Creates a function that runs each argument through a corresponding transform function.
-     *
-     * @param func The function to wrap.
-     * @param transforms The functions to transform arguments, specified as individual functions or arrays
-     * of functions.
-     * @return Returns the new function.
-     */
-    (transforms: _.Many<(...args: any[]) => any>): (...args: any[]) => any;
-}
-
-declare const useWith: OverArgs;
+import { useWith } from "../fp";
 export = useWith;
diff --git a/types/lodash/fp/values.d.ts b/types/lodash/fp/values.d.ts
index ec0ef37c08..75ec6fb4e5 100644
--- a/types/lodash/fp/values.d.ts
+++ b/types/lodash/fp/values.d.ts
@@ -1,32 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Values {
-    /**
-     * Creates an array of the own enumerable property values of object.
-     *
-     * @param object The object to query.
-     * @return Returns an array of property values.
-     */
-    <T>(object: _.Dictionary<T> | _.NumericDictionary<T> | _.List<T> | null | undefined): T[];
-    /**
-     * Creates an array of the own enumerable property values of object.
-     *
-     * @param object The object to query.
-     * @return Returns an array of property values.
-     */
-    <T extends object>(object: T | null | undefined): Array<T[keyof T]>;
-    /**
-     * Creates an array of the own enumerable property values of object.
-     *
-     * @param object The object to query.
-     * @return Returns an array of property values.
-     */
-    (object: any): any[];
-}
-
-declare const values: Values;
+import { values } from "../fp";
 export = values;
diff --git a/types/lodash/fp/valuesIn.d.ts b/types/lodash/fp/valuesIn.d.ts
index 35e9073535..6f4f3b43bb 100644
--- a/types/lodash/fp/valuesIn.d.ts
+++ b/types/lodash/fp/valuesIn.d.ts
@@ -1,25 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface ValuesIn {
-    /**
-     * Creates an array of the own and inherited enumerable property values of object.
-     *
-     * @param object The object to query.
-     * @return Returns the array of property values.
-     */
-    <T>(object: _.Dictionary<T>|_.NumericDictionary<T>|_.List<T> | null | undefined): T[];
-    /**
-     * Creates an array of the own and inherited enumerable property values of object.
-     *
-     * @param object The object to query.
-     * @return Returns the array of property values.
-     */
-    <T extends object>(object: T | null | undefined): Array<T[keyof T]>;
-}
-
-declare const valuesIn: ValuesIn;
+import { valuesIn } from "../fp";
 export = valuesIn;
diff --git a/types/lodash/fp/where.d.ts b/types/lodash/fp/where.d.ts
index 4270edf2e4..41e21ec8ac 100644
--- a/types/lodash/fp/where.d.ts
+++ b/types/lodash/fp/where.d.ts
@@ -1,48 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface ConformsTo {
-    /**
-     * Checks if object conforms to source by invoking the predicate properties of source with the
-     * corresponding property values of object.
-     *
-     * Note: This method is equivalent to _.conforms when source is partially applied.
-     */
-    (): ConformsTo;
-    /**
-     * Checks if object conforms to source by invoking the predicate properties of source with the
-     * corresponding property values of object.
-     *
-     * Note: This method is equivalent to _.conforms when source is partially applied.
-     */
-    <T>(source: _.ConformsPredicateObject<T>): ConformsTo1x1<T>;
-    /**
-     * Checks if object conforms to source by invoking the predicate properties of source with the
-     * corresponding property values of object.
-     *
-     * Note: This method is equivalent to _.conforms when source is partially applied.
-     */
-    <T>(source: _.ConformsPredicateObject<T>, object: T): boolean;
-}
-interface ConformsTo1x1<T> {
-    /**
-     * Checks if object conforms to source by invoking the predicate properties of source with the
-     * corresponding property values of object.
-     *
-     * Note: This method is equivalent to _.conforms when source is partially applied.
-     */
-    (): ConformsTo1x1<T>;
-    /**
-     * Checks if object conforms to source by invoking the predicate properties of source with the
-     * corresponding property values of object.
-     *
-     * Note: This method is equivalent to _.conforms when source is partially applied.
-     */
-    (object: T): boolean;
-}
-
-declare const where: ConformsTo;
+import { where } from "../fp";
 export = where;
diff --git a/types/lodash/fp/whereEq.d.ts b/types/lodash/fp/whereEq.d.ts
index 1a660655f8..893316d625 100644
--- a/types/lodash/fp/whereEq.d.ts
+++ b/types/lodash/fp/whereEq.d.ts
@@ -1,116 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface IsMatch {
-    /**
-     * Performs a deep comparison between `object` and `source` to determine if
-     * `object` contains equivalent property values.
-     *
-     * **Note:** This method supports comparing the same values as `_.isEqual`.
-     *
-     * @category Lang
-     * @param object The object to inspect.
-     * @param source The object of property values to match.
-     * @returns Returns `true` if `object` is a match, else `false`.
-     * @example
-     *
-     * var object = { 'user': 'fred', 'age': 40 };
-     *
-     * _.isMatch(object, { 'age': 40 });
-     * // => true
-     *
-     * _.isMatch(object, { 'age': 36 });
-     * // => false
-     */
-    (): IsMatch;
-    /**
-     * Performs a deep comparison between `object` and `source` to determine if
-     * `object` contains equivalent property values.
-     *
-     * **Note:** This method supports comparing the same values as `_.isEqual`.
-     *
-     * @category Lang
-     * @param object The object to inspect.
-     * @param source The object of property values to match.
-     * @returns Returns `true` if `object` is a match, else `false`.
-     * @example
-     *
-     * var object = { 'user': 'fred', 'age': 40 };
-     *
-     * _.isMatch(object, { 'age': 40 });
-     * // => true
-     *
-     * _.isMatch(object, { 'age': 36 });
-     * // => false
-     */
-    (source: object): IsMatch1x1;
-    /**
-     * Performs a deep comparison between `object` and `source` to determine if
-     * `object` contains equivalent property values.
-     *
-     * **Note:** This method supports comparing the same values as `_.isEqual`.
-     *
-     * @category Lang
-     * @param object The object to inspect.
-     * @param source The object of property values to match.
-     * @returns Returns `true` if `object` is a match, else `false`.
-     * @example
-     *
-     * var object = { 'user': 'fred', 'age': 40 };
-     *
-     * _.isMatch(object, { 'age': 40 });
-     * // => true
-     *
-     * _.isMatch(object, { 'age': 36 });
-     * // => false
-     */
-    (source: object, object: object): boolean;
-}
-interface IsMatch1x1 {
-    /**
-     * Performs a deep comparison between `object` and `source` to determine if
-     * `object` contains equivalent property values.
-     *
-     * **Note:** This method supports comparing the same values as `_.isEqual`.
-     *
-     * @category Lang
-     * @param object The object to inspect.
-     * @param source The object of property values to match.
-     * @returns Returns `true` if `object` is a match, else `false`.
-     * @example
-     *
-     * var object = { 'user': 'fred', 'age': 40 };
-     *
-     * _.isMatch(object, { 'age': 40 });
-     * // => true
-     *
-     * _.isMatch(object, { 'age': 36 });
-     * // => false
-     */
-    (): IsMatch1x1;
-    /**
-     * Performs a deep comparison between `object` and `source` to determine if
-     * `object` contains equivalent property values.
-     *
-     * **Note:** This method supports comparing the same values as `_.isEqual`.
-     *
-     * @category Lang
-     * @param object The object to inspect.
-     * @param source The object of property values to match.
-     * @returns Returns `true` if `object` is a match, else `false`.
-     * @example
-     *
-     * var object = { 'user': 'fred', 'age': 40 };
-     *
-     * _.isMatch(object, { 'age': 40 });
-     * // => true
-     *
-     * _.isMatch(object, { 'age': 36 });
-     * // => false
-     */
-    (object: object): boolean;
-}
-
-declare const whereEq: IsMatch;
+import { whereEq } from "../fp";
 export = whereEq;
diff --git a/types/lodash/fp/without.d.ts b/types/lodash/fp/without.d.ts
index 9c30e47289..600890a400 100644
--- a/types/lodash/fp/without.d.ts
+++ b/types/lodash/fp/without.d.ts
@@ -1,53 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Without {
-    /**
-     * Creates an array excluding all provided values using SameValueZero for equality comparisons.
-     *
-     * @param array The array to filter.
-     * @param values The values to exclude.
-     * @return Returns the new array of filtered values.
-     */
-    (): Without;
-    /**
-     * Creates an array excluding all provided values using SameValueZero for equality comparisons.
-     *
-     * @param array The array to filter.
-     * @param values The values to exclude.
-     * @return Returns the new array of filtered values.
-     */
-    <T>(values: ReadonlyArray<T>): Without1x1<T>;
-    /**
-     * Creates an array excluding all provided values using SameValueZero for equality comparisons.
-     *
-     * @param array The array to filter.
-     * @param values The values to exclude.
-     * @return Returns the new array of filtered values.
-     */
-    <T>(values: ReadonlyArray<T>, array: _.List<T> | null | undefined): T[];
-}
-interface Without1x1<T> {
-    /**
-     * Creates an array excluding all provided values using SameValueZero for equality comparisons.
-     *
-     * @param array The array to filter.
-     * @param values The values to exclude.
-     * @return Returns the new array of filtered values.
-     */
-    (): Without1x1<T>;
-    /**
-     * Creates an array excluding all provided values using SameValueZero for equality comparisons.
-     *
-     * @param array The array to filter.
-     * @param values The values to exclude.
-     * @return Returns the new array of filtered values.
-     */
-    (array: _.List<T> | null | undefined): T[];
-}
-
-declare const without: Without;
+import { without } from "../fp";
 export = without;
diff --git a/types/lodash/fp/words.d.ts b/types/lodash/fp/words.d.ts
index c827eafb15..2b06b26368 100644
--- a/types/lodash/fp/words.d.ts
+++ b/types/lodash/fp/words.d.ts
@@ -1,16 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-type Words =
-    /**
-     * Splits `string` into an array of its words.
-     *
-     * @param string The string to inspect.
-     * @param pattern The pattern to match words.
-     * @return Returns the words of `string`.
-     */
-    (string: string) => string[];
-
-declare const words: Words;
+import { words } from "../fp";
 export = words;
diff --git a/types/lodash/fp/wrap.d.ts b/types/lodash/fp/wrap.d.ts
index a906abe0f2..d9c2a283e2 100644
--- a/types/lodash/fp/wrap.d.ts
+++ b/types/lodash/fp/wrap.d.ts
@@ -1,103 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-interface Wrap {
-    /**
-     * Creates a function that provides value to the wrapper function as its first argument. Any additional
-     * arguments provided to the function are appended to those provided to the wrapper function. The wrapper is
-     * invoked with the this binding of the created function.
-     *
-     * @param value The value to wrap.
-     * @param wrapper The wrapper function.
-     * @return Returns the new function.
-     */
-    (): Wrap;
-    /**
-     * Creates a function that provides value to the wrapper function as its first argument. Any additional
-     * arguments provided to the function are appended to those provided to the wrapper function. The wrapper is
-     * invoked with the this binding of the created function.
-     *
-     * @param value The value to wrap.
-     * @param wrapper The wrapper function.
-     * @return Returns the new function.
-     */
-    <T, TArgs, TResult>(wrapper: (value: T, ...args: TArgs[]) => TResult): Wrap1x1<T, TArgs, TResult>;
-    /**
-     * Creates a function that provides value to the wrapper function as its first argument. Any additional
-     * arguments provided to the function are appended to those provided to the wrapper function. The wrapper is
-     * invoked with the this binding of the created function.
-     *
-     * @param value The value to wrap.
-     * @param wrapper The wrapper function.
-     * @return Returns the new function.
-     */
-    <T, TArgs, TResult>(wrapper: (value: T, ...args: TArgs[]) => TResult, value: T): (...args: TArgs[]) => TResult;
-    /**
-     * Creates a function that provides value to the wrapper function as its first argument. Any additional
-     * arguments provided to the function are appended to those provided to the wrapper function. The wrapper is
-     * invoked with the this binding of the created function.
-     *
-     * @param value The value to wrap.
-     * @param wrapper The wrapper function.
-     * @return Returns the new function.
-     */
-    <T, TResult>(wrapper: (value: T, ...args: any[]) => TResult): Wrap2x1<T, TResult>;
-    /**
-     * Creates a function that provides value to the wrapper function as its first argument. Any additional
-     * arguments provided to the function are appended to those provided to the wrapper function. The wrapper is
-     * invoked with the this binding of the created function.
-     *
-     * @param value The value to wrap.
-     * @param wrapper The wrapper function.
-     * @return Returns the new function.
-     */
-    <T, TResult>(wrapper: (value: T, ...args: any[]) => TResult, value: T): (...args: any[]) => TResult;
-}
-interface Wrap1x1<T, TArgs, TResult> {
-    /**
-     * Creates a function that provides value to the wrapper function as its first argument. Any additional
-     * arguments provided to the function are appended to those provided to the wrapper function. The wrapper is
-     * invoked with the this binding of the created function.
-     *
-     * @param value The value to wrap.
-     * @param wrapper The wrapper function.
-     * @return Returns the new function.
-     */
-    (): Wrap1x1<T, TArgs, TResult>;
-    /**
-     * Creates a function that provides value to the wrapper function as its first argument. Any additional
-     * arguments provided to the function are appended to those provided to the wrapper function. The wrapper is
-     * invoked with the this binding of the created function.
-     *
-     * @param value The value to wrap.
-     * @param wrapper The wrapper function.
-     * @return Returns the new function.
-     */
-    (value: T): (...args: TArgs[]) => TResult;
-}
-interface Wrap2x1<T, TResult> {
-    /**
-     * Creates a function that provides value to the wrapper function as its first argument. Any additional
-     * arguments provided to the function are appended to those provided to the wrapper function. The wrapper is
-     * invoked with the this binding of the created function.
-     *
-     * @param value The value to wrap.
-     * @param wrapper The wrapper function.
-     * @return Returns the new function.
-     */
-    (): Wrap2x1<T, TResult>;
-    /**
-     * Creates a function that provides value to the wrapper function as its first argument. Any additional
-     * arguments provided to the function are appended to those provided to the wrapper function. The wrapper is
-     * invoked with the this binding of the created function.
-     *
-     * @param value The value to wrap.
-     * @param wrapper The wrapper function.
-     * @return Returns the new function.
-     */
-    (value: T): (...args: any[]) => TResult;
-}
-
-declare const wrap: Wrap;
+import { wrap } from "../fp";
 export = wrap;
diff --git a/types/lodash/fp/xor.d.ts b/types/lodash/fp/xor.d.ts
index d3e250cb5a..ac69bde236 100644
--- a/types/lodash/fp/xor.d.ts
+++ b/types/lodash/fp/xor.d.ts
@@ -1,48 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Xor {
-    /**
-     * Creates an array of unique values that is the symmetric difference of the provided arrays.
-     *
-     * @param arrays The arrays to inspect.
-     * @return Returns the new array of values.
-     */
-    (): Xor;
-    /**
-     * Creates an array of unique values that is the symmetric difference of the provided arrays.
-     *
-     * @param arrays The arrays to inspect.
-     * @return Returns the new array of values.
-     */
-    <T>(arrays2: _.List<T> | null | undefined): Xor1x1<T>;
-    /**
-     * Creates an array of unique values that is the symmetric difference of the provided arrays.
-     *
-     * @param arrays The arrays to inspect.
-     * @return Returns the new array of values.
-     */
-    <T>(arrays2: _.List<T> | null | undefined, arrays: _.List<T> | null | undefined): T[];
-}
-interface Xor1x1<T> {
-    /**
-     * Creates an array of unique values that is the symmetric difference of the provided arrays.
-     *
-     * @param arrays The arrays to inspect.
-     * @return Returns the new array of values.
-     */
-    (): Xor1x1<T>;
-    /**
-     * Creates an array of unique values that is the symmetric difference of the provided arrays.
-     *
-     * @param arrays The arrays to inspect.
-     * @return Returns the new array of values.
-     */
-    (arrays: _.List<T> | null | undefined): T[];
-}
-
-declare const xor: Xor;
+import { xor } from "../fp";
 export = xor;
diff --git a/types/lodash/fp/xorBy.d.ts b/types/lodash/fp/xorBy.d.ts
index 8d5b2fd05a..1232972323 100644
--- a/types/lodash/fp/xorBy.d.ts
+++ b/types/lodash/fp/xorBy.d.ts
@@ -1,186 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface XorBy {
-    /**
-     * This method is like `_.xor` except that it accepts `iteratee` which is
-     * invoked for each element of each `arrays` to generate the criterion by which
-     * uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the new array of values.
-     * @example
-     *
-     * _.xorBy([2.1, 1.2], [4.3, 2.4], Math.floor);
-     * // => [1.2, 4.3]
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.xorBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
-     * // => [{ 'x': 2 }]
-     */
-    (): XorBy;
-    /**
-     * This method is like `_.xor` except that it accepts `iteratee` which is
-     * invoked for each element of each `arrays` to generate the criterion by which
-     * uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the new array of values.
-     * @example
-     *
-     * _.xorBy([2.1, 1.2], [4.3, 2.4], Math.floor);
-     * // => [1.2, 4.3]
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.xorBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
-     * // => [{ 'x': 2 }]
-     */
-    <T>(iteratee: _.ValueIteratee<T>): XorBy1x1<T>;
-    /**
-     * This method is like `_.xor` except that it accepts `iteratee` which is
-     * invoked for each element of each `arrays` to generate the criterion by which
-     * uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the new array of values.
-     * @example
-     *
-     * _.xorBy([2.1, 1.2], [4.3, 2.4], Math.floor);
-     * // => [1.2, 4.3]
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.xorBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
-     * // => [{ 'x': 2 }]
-     */
-    <T>(iteratee: _.ValueIteratee<T>, arrays: _.List<T> | null | undefined): XorBy1x2<T>;
-    /**
-     * This method is like `_.xor` except that it accepts `iteratee` which is
-     * invoked for each element of each `arrays` to generate the criterion by which
-     * uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the new array of values.
-     * @example
-     *
-     * _.xorBy([2.1, 1.2], [4.3, 2.4], Math.floor);
-     * // => [1.2, 4.3]
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.xorBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
-     * // => [{ 'x': 2 }]
-     */
-    <T>(iteratee: _.ValueIteratee<T>, arrays: _.List<T> | null | undefined, arrays2: _.List<T> | null | undefined): T[];
-}
-interface XorBy1x1<T> {
-    /**
-     * This method is like `_.xor` except that it accepts `iteratee` which is
-     * invoked for each element of each `arrays` to generate the criterion by which
-     * uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the new array of values.
-     * @example
-     *
-     * _.xorBy([2.1, 1.2], [4.3, 2.4], Math.floor);
-     * // => [1.2, 4.3]
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.xorBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
-     * // => [{ 'x': 2 }]
-     */
-    (): XorBy1x1<T>;
-    /**
-     * This method is like `_.xor` except that it accepts `iteratee` which is
-     * invoked for each element of each `arrays` to generate the criterion by which
-     * uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the new array of values.
-     * @example
-     *
-     * _.xorBy([2.1, 1.2], [4.3, 2.4], Math.floor);
-     * // => [1.2, 4.3]
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.xorBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
-     * // => [{ 'x': 2 }]
-     */
-    (arrays: _.List<T> | null | undefined): XorBy1x2<T>;
-    /**
-     * This method is like `_.xor` except that it accepts `iteratee` which is
-     * invoked for each element of each `arrays` to generate the criterion by which
-     * uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the new array of values.
-     * @example
-     *
-     * _.xorBy([2.1, 1.2], [4.3, 2.4], Math.floor);
-     * // => [1.2, 4.3]
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.xorBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
-     * // => [{ 'x': 2 }]
-     */
-    (arrays: _.List<T> | null | undefined, arrays2: _.List<T> | null | undefined): T[];
-}
-interface XorBy1x2<T> {
-    /**
-     * This method is like `_.xor` except that it accepts `iteratee` which is
-     * invoked for each element of each `arrays` to generate the criterion by which
-     * uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the new array of values.
-     * @example
-     *
-     * _.xorBy([2.1, 1.2], [4.3, 2.4], Math.floor);
-     * // => [1.2, 4.3]
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.xorBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
-     * // => [{ 'x': 2 }]
-     */
-    (): XorBy1x2<T>;
-    /**
-     * This method is like `_.xor` except that it accepts `iteratee` which is
-     * invoked for each element of each `arrays` to generate the criterion by which
-     * uniqueness is computed. The iteratee is invoked with one argument: (value).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [iteratee=_.identity] The iteratee invoked per element.
-     * @returns Returns the new array of values.
-     * @example
-     *
-     * _.xorBy([2.1, 1.2], [4.3, 2.4], Math.floor);
-     * // => [1.2, 4.3]
-     *
-     * // using the `_.property` iteratee shorthand
-     * _.xorBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x');
-     * // => [{ 'x': 2 }]
-     */
-    (arrays2: _.List<T> | null | undefined): T[];
-}
-
-declare const xorBy: XorBy;
+import { xorBy } from "../fp";
 export = xorBy;
diff --git a/types/lodash/fp/xorWith.d.ts b/types/lodash/fp/xorWith.d.ts
index 6bdcabdbd2..ec93e40b30 100644
--- a/types/lodash/fp/xorWith.d.ts
+++ b/types/lodash/fp/xorWith.d.ts
@@ -1,177 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface XorWith {
-    /**
-     * This method is like `_.xor` except that it accepts `comparator` which is
-     * invoked to compare elements of `arrays`. The comparator is invoked with
-     * two arguments: (arrVal, othVal).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [comparator] The comparator invoked per element.
-     * @returns Returns the new array of values.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
-     *
-     * _.xorWith(objects, others, _.isEqual);
-     * // => [{ 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
-     */
-    (): XorWith;
-    /**
-     * This method is like `_.xor` except that it accepts `comparator` which is
-     * invoked to compare elements of `arrays`. The comparator is invoked with
-     * two arguments: (arrVal, othVal).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [comparator] The comparator invoked per element.
-     * @returns Returns the new array of values.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
-     *
-     * _.xorWith(objects, others, _.isEqual);
-     * // => [{ 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
-     */
-    <T>(comparator: _.Comparator<T>): XorWith1x1<T>;
-    /**
-     * This method is like `_.xor` except that it accepts `comparator` which is
-     * invoked to compare elements of `arrays`. The comparator is invoked with
-     * two arguments: (arrVal, othVal).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [comparator] The comparator invoked per element.
-     * @returns Returns the new array of values.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
-     *
-     * _.xorWith(objects, others, _.isEqual);
-     * // => [{ 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
-     */
-    <T>(comparator: _.Comparator<T>, arrays: _.List<T> | null | undefined): XorWith1x2<T>;
-    /**
-     * This method is like `_.xor` except that it accepts `comparator` which is
-     * invoked to compare elements of `arrays`. The comparator is invoked with
-     * two arguments: (arrVal, othVal).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [comparator] The comparator invoked per element.
-     * @returns Returns the new array of values.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
-     *
-     * _.xorWith(objects, others, _.isEqual);
-     * // => [{ 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
-     */
-    <T>(comparator: _.Comparator<T>, arrays: _.List<T> | null | undefined, arrays2: _.List<T> | null | undefined): T[];
-}
-interface XorWith1x1<T> {
-    /**
-     * This method is like `_.xor` except that it accepts `comparator` which is
-     * invoked to compare elements of `arrays`. The comparator is invoked with
-     * two arguments: (arrVal, othVal).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [comparator] The comparator invoked per element.
-     * @returns Returns the new array of values.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
-     *
-     * _.xorWith(objects, others, _.isEqual);
-     * // => [{ 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
-     */
-    (): XorWith1x1<T>;
-    /**
-     * This method is like `_.xor` except that it accepts `comparator` which is
-     * invoked to compare elements of `arrays`. The comparator is invoked with
-     * two arguments: (arrVal, othVal).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [comparator] The comparator invoked per element.
-     * @returns Returns the new array of values.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
-     *
-     * _.xorWith(objects, others, _.isEqual);
-     * // => [{ 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
-     */
-    (arrays: _.List<T> | null | undefined): XorWith1x2<T>;
-    /**
-     * This method is like `_.xor` except that it accepts `comparator` which is
-     * invoked to compare elements of `arrays`. The comparator is invoked with
-     * two arguments: (arrVal, othVal).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [comparator] The comparator invoked per element.
-     * @returns Returns the new array of values.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
-     *
-     * _.xorWith(objects, others, _.isEqual);
-     * // => [{ 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
-     */
-    (arrays: _.List<T> | null | undefined, arrays2: _.List<T> | null | undefined): T[];
-}
-interface XorWith1x2<T> {
-    /**
-     * This method is like `_.xor` except that it accepts `comparator` which is
-     * invoked to compare elements of `arrays`. The comparator is invoked with
-     * two arguments: (arrVal, othVal).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [comparator] The comparator invoked per element.
-     * @returns Returns the new array of values.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
-     *
-     * _.xorWith(objects, others, _.isEqual);
-     * // => [{ 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
-     */
-    (): XorWith1x2<T>;
-    /**
-     * This method is like `_.xor` except that it accepts `comparator` which is
-     * invoked to compare elements of `arrays`. The comparator is invoked with
-     * two arguments: (arrVal, othVal).
-     *
-     * @category Array
-     * @param [arrays] The arrays to inspect.
-     * @param [comparator] The comparator invoked per element.
-     * @returns Returns the new array of values.
-     * @example
-     *
-     * var objects = [{ 'x': 1, 'y': 2 }, { 'x': 2, 'y': 1 }];
-     * var others = [{ 'x': 1, 'y': 1 }, { 'x': 1, 'y': 2 }];
-     *
-     * _.xorWith(objects, others, _.isEqual);
-     * // => [{ 'x': 2, 'y': 1 }, { 'x': 1, 'y': 1 }]
-     */
-    (arrays2: _.List<T> | null | undefined): T[];
-}
-
-declare const xorWith: XorWith;
+import { xorWith } from "../fp";
 export = xorWith;
diff --git a/types/lodash/fp/zip.d.ts b/types/lodash/fp/zip.d.ts
index dd4e6a1e3c..2a83e733b6 100644
--- a/types/lodash/fp/zip.d.ts
+++ b/types/lodash/fp/zip.d.ts
@@ -1,53 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface Zip {
-    /**
-     * Creates an array of grouped elements, the first of which contains the first elements of the given arrays,
-     * the second of which contains the second elements of the given arrays, and so on.
-     *
-     * @param arrays The arrays to process.
-     * @return Returns the new array of grouped elements.
-     */
-    (): Zip;
-    /**
-     * Creates an array of grouped elements, the first of which contains the first elements of the given arrays,
-     * the second of which contains the second elements of the given arrays, and so on.
-     *
-     * @param arrays The arrays to process.
-     * @return Returns the new array of grouped elements.
-     */
-    <T1>(arrays1: _.List<T1>): Zip1x1<T1>;
-    /**
-     * Creates an array of grouped elements, the first of which contains the first elements of the given arrays,
-     * the second of which contains the second elements of the given arrays, and so on.
-     *
-     * @param arrays The arrays to process.
-     * @return Returns the new array of grouped elements.
-     */
-    <T1, T2>(arrays1: _.List<T1>, arrays2: _.List<T2>): Array<[T1 | undefined, T2 | undefined]>;
-}
-interface Zip1x1<T1> {
-    /**
-     * Creates an array of grouped elements, the first of which contains the first elements of the given arrays,
-     * the second of which contains the second elements of the given arrays, and so on.
-     *
-     * @param arrays The arrays to process.
-     * @return Returns the new array of grouped elements.
-     */
-    (): Zip1x1<T1>;
-    /**
-     * Creates an array of grouped elements, the first of which contains the first elements of the given arrays,
-     * the second of which contains the second elements of the given arrays, and so on.
-     *
-     * @param arrays The arrays to process.
-     * @return Returns the new array of grouped elements.
-     */
-    <T2>(arrays2: _.List<T2>): Array<[T1 | undefined, T2 | undefined]>;
-}
-
-declare const zip: Zip;
+import { zip } from "../fp";
 export = zip;
diff --git a/types/lodash/fp/zipAll.d.ts b/types/lodash/fp/zipAll.d.ts
index 62cf6eb647..af0b3ed3f5 100644
--- a/types/lodash/fp/zipAll.d.ts
+++ b/types/lodash/fp/zipAll.d.ts
@@ -1,18 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-type Zip =
-    /**
-     * Creates an array of grouped elements, the first of which contains the first elements of the given arrays,
-     * the second of which contains the second elements of the given arrays, and so on.
-     *
-     * @param arrays The arrays to process.
-     * @return Returns the new array of grouped elements.
-     */
-    <T>(arrays: ReadonlyArray<_.List<T> | null | undefined>) => Array<Array<T | undefined>>;
-
-declare const zipAll: Zip;
+import { zipAll } from "../fp";
 export = zipAll;
diff --git a/types/lodash/fp/zipObj.d.ts b/types/lodash/fp/zipObj.d.ts
index 7b1c5bb91a..4f4c19a87d 100644
--- a/types/lodash/fp/zipObj.d.ts
+++ b/types/lodash/fp/zipObj.d.ts
@@ -1,58 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface ZipObject {
-    /**
-     * This method is like _.fromPairs except that it accepts two arrays, one of property
-     * identifiers and one of corresponding values.
-     *
-     * @param props The property names.
-     * @param values The property values.
-     * @return Returns the new object.
-     */
-    (): ZipObject;
-    /**
-     * This method is like _.fromPairs except that it accepts two arrays, one of property
-     * identifiers and one of corresponding values.
-     *
-     * @param props The property names.
-     * @param values The property values.
-     * @return Returns the new object.
-     */
-    (props: _.List<_.PropertyName>): ZipObject1x1;
-    /**
-     * This method is like _.fromPairs except that it accepts two arrays, one of property
-     * identifiers and one of corresponding values.
-     *
-     * @param props The property names.
-     * @param values The property values.
-     * @return Returns the new object.
-     */
-    <T>(props: _.List<_.PropertyName>, values: _.List<T>): _.Dictionary<T>;
-}
-interface ZipObject1x1 {
-    /**
-     * This method is like _.fromPairs except that it accepts two arrays, one of property
-     * identifiers and one of corresponding values.
-     *
-     * @param props The property names.
-     * @param values The property values.
-     * @return Returns the new object.
-     */
-    (): ZipObject1x1;
-    /**
-     * This method is like _.fromPairs except that it accepts two arrays, one of property
-     * identifiers and one of corresponding values.
-     *
-     * @param props The property names.
-     * @param values The property values.
-     * @return Returns the new object.
-     */
-    <T>(values: _.List<T>): _.Dictionary<T>;
-}
-
-declare const zipObj: ZipObject;
+import { zipObj } from "../fp";
 export = zipObj;
diff --git a/types/lodash/fp/zipObject.d.ts b/types/lodash/fp/zipObject.d.ts
index 61f5d04e79..f302d7b155 100644
--- a/types/lodash/fp/zipObject.d.ts
+++ b/types/lodash/fp/zipObject.d.ts
@@ -1,58 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface ZipObject {
-    /**
-     * This method is like _.fromPairs except that it accepts two arrays, one of property
-     * identifiers and one of corresponding values.
-     *
-     * @param props The property names.
-     * @param values The property values.
-     * @return Returns the new object.
-     */
-    (): ZipObject;
-    /**
-     * This method is like _.fromPairs except that it accepts two arrays, one of property
-     * identifiers and one of corresponding values.
-     *
-     * @param props The property names.
-     * @param values The property values.
-     * @return Returns the new object.
-     */
-    (props: _.List<_.PropertyName>): ZipObject1x1;
-    /**
-     * This method is like _.fromPairs except that it accepts two arrays, one of property
-     * identifiers and one of corresponding values.
-     *
-     * @param props The property names.
-     * @param values The property values.
-     * @return Returns the new object.
-     */
-    <T>(props: _.List<_.PropertyName>, values: _.List<T>): _.Dictionary<T>;
-}
-interface ZipObject1x1 {
-    /**
-     * This method is like _.fromPairs except that it accepts two arrays, one of property
-     * identifiers and one of corresponding values.
-     *
-     * @param props The property names.
-     * @param values The property values.
-     * @return Returns the new object.
-     */
-    (): ZipObject1x1;
-    /**
-     * This method is like _.fromPairs except that it accepts two arrays, one of property
-     * identifiers and one of corresponding values.
-     *
-     * @param props The property names.
-     * @param values The property values.
-     * @return Returns the new object.
-     */
-    <T>(values: _.List<T>): _.Dictionary<T>;
-}
-
-declare const zipObject: ZipObject;
+import { zipObject } from "../fp";
 export = zipObject;
diff --git a/types/lodash/fp/zipObjectDeep.d.ts b/types/lodash/fp/zipObjectDeep.d.ts
index 0fd3f218ab..601063489d 100644
--- a/types/lodash/fp/zipObjectDeep.d.ts
+++ b/types/lodash/fp/zipObjectDeep.d.ts
@@ -1,53 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface ZipObjectDeep {
-    /**
-     * This method is like _.zipObject except that it supports property paths.
-     *
-     * @param paths The property names.
-     * @param values The property values.
-     * @return Returns the new object.
-     */
-    (): ZipObjectDeep;
-    /**
-     * This method is like _.zipObject except that it supports property paths.
-     *
-     * @param paths The property names.
-     * @param values The property values.
-     * @return Returns the new object.
-     */
-    (paths: _.List<_.PropertyPath>): ZipObjectDeep1x1;
-    /**
-     * This method is like _.zipObject except that it supports property paths.
-     *
-     * @param paths The property names.
-     * @param values The property values.
-     * @return Returns the new object.
-     */
-    (paths: _.List<_.PropertyPath>, values: _.List<any>): object;
-}
-interface ZipObjectDeep1x1 {
-    /**
-     * This method is like _.zipObject except that it supports property paths.
-     *
-     * @param paths The property names.
-     * @param values The property values.
-     * @return Returns the new object.
-     */
-    (): ZipObjectDeep1x1;
-    /**
-     * This method is like _.zipObject except that it supports property paths.
-     *
-     * @param paths The property names.
-     * @param values The property values.
-     * @return Returns the new object.
-     */
-    (values: _.List<any>): object;
-}
-
-declare const zipObjectDeep: ZipObjectDeep;
+import { zipObjectDeep } from "../fp";
 export = zipObjectDeep;
diff --git a/types/lodash/fp/zipWith.d.ts b/types/lodash/fp/zipWith.d.ts
index 36c02c053c..9faaf3c589 100644
--- a/types/lodash/fp/zipWith.d.ts
+++ b/types/lodash/fp/zipWith.d.ts
@@ -1,105 +1,2 @@
-// AUTO-GENERATED: do not modify this file directly.
-// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:
-// npm run fp
-
-import _ = require("../index");
-
-interface ZipWith {
-    /**
-     * This method is like _.zip except that it accepts an iteratee to specify how grouped values should be
-     * combined. The iteratee is bound to thisArg and invoked with four arguments: (accumulator, value, index,
-     * group).
-     * @param [arrays] The arrays to process.
-     * @param [iteratee] The function to combine grouped values.
-     * @param [thisArg] The `this` binding of `iteratee`.
-     * @return Returns the new array of grouped elements.
-     */
-    (): ZipWith;
-    /**
-     * This method is like _.zip except that it accepts an iteratee to specify how grouped values should be
-     * combined. The iteratee is bound to thisArg and invoked with four arguments: (accumulator, value, index,
-     * group).
-     * @param [arrays] The arrays to process.
-     * @param [iteratee] The function to combine grouped values.
-     * @param [thisArg] The `this` binding of `iteratee`.
-     * @return Returns the new array of grouped elements.
-     */
-    <T1, T2, TResult>(iteratee: (value1: T1, value2: T2) => TResult): ZipWith1x1<T1, T2, TResult>;
-    /**
-     * This method is like _.zip except that it accepts an iteratee to specify how grouped values should be
-     * combined. The iteratee is bound to thisArg and invoked with four arguments: (accumulator, value, index,
-     * group).
-     * @param [arrays] The arrays to process.
-     * @param [iteratee] The function to combine grouped values.
-     * @param [thisArg] The `this` binding of `iteratee`.
-     * @return Returns the new array of grouped elements.
-     */
-    <T1, T2, TResult>(iteratee: (value1: T1, value2: T2) => TResult, arrays1: _.List<T1>): ZipWith1x2<T2, TResult>;
-    /**
-     * This method is like _.zip except that it accepts an iteratee to specify how grouped values should be
-     * combined. The iteratee is bound to thisArg and invoked with four arguments: (accumulator, value, index,
-     * group).
-     * @param [arrays] The arrays to process.
-     * @param [iteratee] The function to combine grouped values.
-     * @param [thisArg] The `this` binding of `iteratee`.
-     * @return Returns the new array of grouped elements.
-     */
-    <T1, T2, TResult>(iteratee: (value1: T1, value2: T2) => TResult, arrays1: _.List<T1>, arrays2: _.List<T2>): TResult[];
-}
-interface ZipWith1x1<T1, T2, TResult> {
-    /**
-     * This method is like _.zip except that it accepts an iteratee to specify how grouped values should be
-     * combined. The iteratee is bound to thisArg and invoked with four arguments: (accumulator, value, index,
-     * group).
-     * @param [arrays] The arrays to process.
-     * @param [iteratee] The function to combine grouped values.
-     * @param [thisArg] The `this` binding of `iteratee`.
-     * @return Returns the new array of grouped elements.
-     */
-    (): ZipWith1x1<T1, T2, TResult>;
-    /**
-     * This method is like _.zip except that it accepts an iteratee to specify how grouped values should be
-     * combined. The iteratee is bound to thisArg and invoked with four arguments: (accumulator, value, index,
-     * group).
-     * @param [arrays] The arrays to process.
-     * @param [iteratee] The function to combine grouped values.
-     * @param [thisArg] The `this` binding of `iteratee`.
-     * @return Returns the new array of grouped elements.
-     */
-    (arrays1: _.List<T1>): ZipWith1x2<T2, TResult>;
-    /**
-     * This method is like _.zip except that it accepts an iteratee to specify how grouped values should be
-     * combined. The iteratee is bound to thisArg and invoked with four arguments: (accumulator, value, index,
-     * group).
-     * @param [arrays] The arrays to process.
-     * @param [iteratee] The function to combine grouped values.
-     * @param [thisArg] The `this` binding of `iteratee`.
-     * @return Returns the new array of grouped elements.
-     */
-    (arrays1: _.List<T1>, arrays2: _.List<T2>): TResult[];
-}
-interface ZipWith1x2<T2, TResult> {
-    /**
-     * This method is like _.zip except that it accepts an iteratee to specify how grouped values should be
-     * combined. The iteratee is bound to thisArg and invoked with four arguments: (accumulator, value, index,
-     * group).
-     * @param [arrays] The arrays to process.
-     * @param [iteratee] The function to combine grouped values.
-     * @param [thisArg] The `this` binding of `iteratee`.
-     * @return Returns the new array of grouped elements.
-     */
-    (): ZipWith1x2<T2, TResult>;
-    /**
-     * This method is like _.zip except that it accepts an iteratee to specify how grouped values should be
-     * combined. The iteratee is bound to thisArg and invoked with four arguments: (accumulator, value, index,
-     * group).
-     * @param [arrays] The arrays to process.
-     * @param [iteratee] The function to combine grouped values.
-     * @param [thisArg] The `this` binding of `iteratee`.
-     * @return Returns the new array of grouped elements.
-     */
-    <T1>(arrays2: _.List<T2>): TResult[];
-}
-
-declare const zipWith: ZipWith;
+import { zipWith } from "../fp";
 export = zipWith;
diff --git a/types/lodash/lodash-tests.ts b/types/lodash/lodash-tests.ts
index 28d2967c86..ee86770a2a 100644
--- a/types/lodash/lodash-tests.ts
+++ b/types/lodash/lodash-tests.ts
@@ -26,6 +26,10 @@ _.chain([1, 2, 3, 4]).splice(1); // $ExpectType LoDashExplicitWrapper<number[]>
 _.chain([1, 2, 3, 4]).splice(1, 2, 5, 6); // $ExpectType LoDashExplicitWrapper<number[]>
 _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number[]>
 
+/*********
+ * Array *
+ *********/
+
 // _.chunk
 {
     const list: _.List<AbcObject> | null | undefined = anything;
@@ -41,7 +45,7 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
 
     fp.chunk(42, list); // $ExpectType AbcObject[][]
     fp.chunk(42)(list); // $ExpectType AbcObject[][]
-    fp.chunk()(42)()(list); // $ExpectType AbcObject[][]
+    fp.chunk(fp.__, list)(42); // $ExpectType AbcObject[][]
 }
 
 // _.compact
@@ -3527,6 +3531,11 @@ fp.now(); // $ExpectType number
     _.curry(testCurry)("1")(2); // $ExpectType CurriedFunction1<boolean, [string, number, boolean]>
     _.curry(testCurry)("1"); // $ExpectType CurriedFunction2<number, boolean, [string, number, boolean]>
     _.curry(testCurry); // $ExpectType CurriedFunction3<string, number, boolean, [string, number, boolean]>
+    _.curry(testCurry)(_, 2, true)("1"); // $ExpectType [string, number, boolean]
+    _.curry(testCurry)(_.curry.placeholder, 2, true)("1"); // $ExpectType [string, number, boolean]
+    _.curry(testCurry)("1", _, true)(2); // $ExpectType [string, number, boolean]
+    _.curry(testCurry)(_, 2)("1", true); // $ExpectType [string, number, boolean]
+    _.curry(testCurry)(_.curry.placeholder, 2)("1", true); // $ExpectType [string, number, boolean]
     _(testCurry).curry(); // $ExpectType LoDashImplicitWrapper<CurriedFunction3<string, number, boolean, [string, number, boolean]>>
     _.chain(testCurry).curry(); // $ExpectType LoDashExplicitWrapper<CurriedFunction3<string, number, boolean, [string, number, boolean]>>
 
@@ -3538,6 +3547,9 @@ fp.now(); // $ExpectType number
     fp.curry(testCurry)("1")(2); // $ExpectType CurriedFunction1<boolean, [string, number, boolean]>
     fp.curry(testCurry)("1"); // $ExpectType CurriedFunction2<number, boolean, [string, number, boolean]>
     fp.curry(testCurry); // $ExpectType CurriedFunction3<string, number, boolean, [string, number, boolean]>
+    fp.curry(testCurry)(fp.__, 2, true)("1"); // $ExpectType [string, number, boolean]
+    fp.curry(testCurry)(fp.curry.placeholder, 2, true)("1"); // $ExpectType [string, number, boolean]
+    fp.curryN(3)(testCurry)(fp.curryN.placeholder, 2, true)("1"); // $ExpectType [string, number, boolean]
 
     // _.curryRight
     _.curryRight(testCurry)("1", 2, true); // $ExpectType [string, number, boolean]
@@ -3548,6 +3560,10 @@ fp.now(); // $ExpectType number
     _.curryRight(testCurry)(true)(2); // $ExpectType RightCurriedFunction1<string, [string, number, boolean]>
     _.curryRight(testCurry)(true); // $ExpectType RightCurriedFunction2<string, number, [string, number, boolean]>
     _.curryRight(testCurry); // $ExpectType RightCurriedFunction3<string, number, boolean, [string, number, boolean]>
+    _.curryRight(testCurry)("1", _, true)(2); // $ExpectType [string, number, boolean]
+    _.curryRight(testCurry)("1", _.curryRight.placeholder, true)(2); // $ExpectType [string, number, boolean]
+    _.curryRight(testCurry)(true)("1", _)(2); // $ExpectType [string, number, boolean]
+    _.curryRight(testCurry)(true)("1", _.curryRight.placeholder)(2); // $ExpectType [string, number, boolean]
     _(testCurry).curryRight(); // $ExpectType LoDashImplicitWrapper<RightCurriedFunction3<string, number, boolean, [string, number, boolean]>>
     _.chain(testCurry).curryRight(); // $ExpectType LoDashExplicitWrapper<RightCurriedFunction3<string, number, boolean, [string, number, boolean]>>
 
@@ -3559,6 +3575,9 @@ fp.now(); // $ExpectType number
     fp.curryRight(testCurry)(true)(2); // $ExpectType RightCurriedFunction1<string, [string, number, boolean]>
     fp.curryRight(testCurry)(true); // $ExpectType RightCurriedFunction2<string, number, [string, number, boolean]>
     fp.curryRight(testCurry); // $ExpectType RightCurriedFunction3<string, number, boolean, [string, number, boolean]>
+    fp.curryRight(testCurry)("1", fp.__, true)(2); // $ExpectType [string, number, boolean]
+    fp.curryRight(testCurry)("1", fp.curryRight.placeholder, true)(2); // $ExpectType [string, number, boolean]
+    fp.curryRightN(3)(testCurry)("1", fp.curryRightN.placeholder, true)(2); // $ExpectType [string, number, boolean]
 }
 
 // _.debounce
@@ -6960,7 +6979,7 @@ fp.now(); // $ExpectType number
     _.noConflict(); // $ExpectType LoDashStatic
     _(42).noConflict(); // $ExpectType LoDashStatic
     _.chain(42).noConflict(); // $ExpectType LoDashExplicitWrapper<LoDashStatic>
-    fp.noConflict(); // $ExpectType LoDashStatic
+    fp.noConflict(); // $ExpectType LoDashFp
 }
 
 // _.noop
@@ -7218,6 +7237,7 @@ _.templateSettings; // $ExpectType TemplateSettings
     _.partial(func2); // $ExpectType Function2<number, string, number>
     _.partial(func2, 42); // $ExpectType Function1<string, number>
     _.partial(func2,  _, "foo"); // $ExpectType Function1<number, number>
+    _.partial(func2, _.partial.placeholder, "foo"); // $ExpectType Function1<number, number>
     _.partial(func2, 42, "foo"); // $ExpectType Function0<number>
     // with arity 3 function
     _.partial(func3, 42,     _, true);
@@ -7230,6 +7250,7 @@ _.templateSettings; // $ExpectType TemplateSettings
     // with arity 2 function
     _.partialRight(func2); // $ExpectType Function2<number, string, number>
     _.partialRight(func2, 42,     _); // $ExpectType Function1<string, number>
+    _.partialRight(func2, 42, _.partialRight.placeholder); // $ExpectType Function1<string, number>
     _.partialRight(func2,     "foo"); // $ExpectType Function1<number, number>
     _.partialRight(func2, 42, "foo"); // $ExpectType Function0<number>
     // with arity 3 function
@@ -7238,6 +7259,8 @@ _.templateSettings; // $ExpectType TemplateSettings
     fp.partial([], func0); // $ExpectType (...args: any[]) => any
     fp.partial([])(func0); // $ExpectType (...args: any[]) => any
     fp.partial([42])(func1); // $ExpectType (...args: any[]) => any
+    fp.partial([fp.partial.placeholder, "foo"])(func2);
     fp.partialRight([])(func0); // $ExpectType (...args: any[]) => any
     fp.partialRight([42])(func1); // $ExpectType (...args: any[]) => any
+    fp.partialRight([fp.partialRight.placeholder, "foo"])(func2);
 }
diff --git a/types/lodash/scripts/generate-fp.ts b/types/lodash/scripts/generate-fp.ts
index bbe648c6cd..3b8320b59c 100644
--- a/types/lodash/scripts/generate-fp.ts
+++ b/types/lodash/scripts/generate-fp.ts
@@ -1,4 +1,4 @@
-// Script for converting the lodash types into unctional programming (FP) format.
+// Script for converting the lodash types into functional programming (FP) format.
 // The convertion is done based on this guide: https://github.com/lodash/lodash/wiki/FP-Guide
 
 // Assumptions:
@@ -17,12 +17,18 @@ import path from "path";
 interface Definition {
     name: string;
     overloads: Overload[];
+    constants: string[];
     jsdoc: string;
 }
+interface InterfaceGroup {
+    functionName: string;
+    interfaces: Interface[];
+}
 interface Interface {
     name: string;
     typeParams: TypeParam[];
     overloads: Overload[];
+    constants: string[];
 }
 interface Overload {
     typeParams: TypeParam[];
@@ -46,9 +52,9 @@ async function main() {
 
     // Read each function definition and fp-ify it
     const subfolders = ["common"];
-    const promises: Array<Promise<string[]>> = [];
+    const promises: Array<Promise<InterfaceGroup[]>> = [];
     for (const subfolder of subfolders) {
-        promises.push(new Promise<string[]>((resolve, reject) => {
+        promises.push(new Promise<InterfaceGroup[]>((resolve, reject) => {
             fs.readdir(path.join("..", subfolder), (err, files) => {
                 if (err) {
                     console.error(`failed to list directory contents for '${subfolder}': `, err);
@@ -66,40 +72,55 @@ async function main() {
         }));
     }
 
-    let functionNames: string[];
+    let interfaceGroups: InterfaceGroup[];
     try {
-        functionNames = _.flatten(await Promise.all(promises));
+        interfaceGroups = _.flatten(await Promise.all(promises));
     } catch (err) {
         console.error("Failed to parse all functions: ", err);
         return;
     }
-    functionNames = _.sortedUniq(_.sortBy(functionNames, _.toLower));
+    interfaceGroups = _.sortBy(interfaceGroups, g => _.toLower(g.functionName));
+    for (const interfaceGroup of interfaceGroups) {
+        // Rename interfaces for different versions of the same function with different arity (to avoid name conflicts).
+        // Don't rename aliases - instead they will be removed from the output when interfaces are written.
+        const interfaceName = interfaceGroup.interfaces[0].name;
+        const conflicts = interfaceGroups.filter(g => g.interfaces[0].name === interfaceName);
+        if (conflicts.length > 1 && _.some(conflicts, c => !_.isEqual(c.interfaces, conflicts[0].interfaces))) {
+            for (const conflict of conflicts) {
+                const oldName = conflict.interfaces[0].name;
+                const newName = getInterfaceBaseName(conflict.functionName);
+                for (const interfaceDef of conflict.interfaces) {
+                    interfaceDef.name = interfaceDef.name.replace(oldName, newName);
+                    for (const overload of interfaceDef.overloads)
+                        overload.returnType = overload.returnType.replace(oldName, newName);
+                }
+            }
+        }
+    }
+    const interfaces = _.uniqBy(_.flatMap(interfaceGroups, g => g.interfaces), i => i.name);
+    const commonTypeSearch = new RegExp(`\\b(${commonTypes.join("|")})\\b`, "g");
+    const interfaceStrings = _(interfaces)
+        .map(i => tab(interfaceToString(i), 1))
+        .join(lineBreak)
+        .replace(commonTypeSearch, match => `lodash.${match}`);
     const fpFile = [
         "// AUTO-GENERATED: do not modify this file directly.",
         "// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:",
         "// npm run fp",
         "",
-        ...functionNames.map(f => `import ${f} = require("./fp/${f}");`),
+        'import lodash = require("./index");',
         "",
         "export = _;",
         "",
         "declare const _: _.LoDashFp;",
         "declare namespace _ {",
-        "    interface LoDashFp {",
-        ...functionNames.map(f => `        ${f}: typeof ${f};`),
-        "    }",
-        "}",
+        interfaceStrings,
         "",
-        "// Backward compatibility with --target es5",
-        "declare global {",
-        "    // tslint:disable-next-line:no-empty-interface",
-        "    interface Set<T> { }",
-        "    // tslint:disable-next-line:no-empty-interface",
-        "    interface Map<K, V> { }",
-        "    // tslint:disable-next-line:no-empty-interface",
-        "    interface WeakSet<T> { }",
-        "    // tslint:disable-next-line:no-empty-interface",
-        "    interface WeakMap<K extends object, V> { }",
+        "    interface LoDashFp {",
+        ...interfaceGroups.map(g => `        ${g.functionName}: ${g.interfaces[0].name};`),
+        "        __: lodash.__;",
+        "        placehodler: lodash.__;",
+        "    }",
         "}",
         "",
     ].join(lineBreak);
@@ -110,7 +131,8 @@ async function main() {
 
     // Make sure the generated files are listed in tsconfig.json, so they are included in the lint checks
     const tsconfig = tsconfigFile.split(lineBreak).filter(row => !row.includes("fp/") || row.includes("fp/convert.d.ts"));
-    const newRows = functionNames.map(f => `        "fp/${f}.d.ts",`);
+    const newRows = interfaceGroups.map(g => `        "fp/${g.functionName}.d.ts",`)
+        .concat(["__", "placeholder"].map(p => `        "fp/${p}.d.ts",`));
     newRows[newRows.length - 1] = newRows[newRows.length - 1].replace(",", "");
 
     const insertIndex = _.findLastIndex(tsconfig, row => row.trim() === "]"); // Assume "files" is the last array
@@ -140,17 +162,17 @@ function readFile(filePath: string): Promise<string> {
     });
 }
 
-async function processDefinitions(filePaths: string[], commonTypes: string[]): Promise<string[]> {
+async function processDefinitions(filePaths: string[], commonTypes: string[]): Promise<InterfaceGroup[]> {
     const builder: { [name: string]: (...args: number[][]) => () => Interface[] } = {};
     const unconvertedBuilder: { [name: string]: (...args: number[][]) => () => Interface[] } = {};
     for (const filePath of filePaths) {
         const definitions = await parseFile(filePath, commonTypes);
         for (const definition of definitions) {
-            if (definition.overloads.every(o => o.params.length <= 1 && o.returnType === "typeof _")) {
+            if (definition.overloads.every(o => o.params.length <= 1 && (o.returnType === "typeof _" || o.returnType === "LoDashStatic"))) {
                 // Our convert technique doesn't work well on "typeof _" functions (or at least runInContext)
                 // Plus, if there are 0-1 parameters, there's nothing to curry anyways.
                 unconvertedBuilder[definition.name] = (...args: number[][]) => {
-                    return () => curryOverloads(definition.overloads, definition.name, args[0] || [], -1, false);
+                    return () => curryDefinition(definition, args[0] || [], -1, false);
                 };
             } else {
                 builder[definition.name] = (...args: Array<number | number[]>) => {
@@ -177,7 +199,7 @@ async function processDefinitions(filePaths: string[], commonTypes: string[]): P
                             args = _.sortBy(args as number[][], (a: number[]) => a[0]);
                     }
 
-                    return () => curryOverloads(definition.overloads, definition.name, _.flatten(args), spreadIndex, isFixed);
+                    return () => curryDefinition(definition, _.flatten(args), spreadIndex, isFixed);
                 };
             }
         }
@@ -188,31 +210,14 @@ async function processDefinitions(filePaths: string[], commonTypes: string[]): P
     _.defaults(builderFp, unconvertedBuilder);
 
     const functionNames = Object.keys(builderFp).filter(key => key !== "convert" && typeof builderFp[key] === "function");
-    for (const functionName of functionNames) {
+    const interfaceGroups: InterfaceGroup[] = functionNames.map((functionName): InterfaceGroup => ({
+        functionName,
         // Assuming the maximum arity is 4. Pass one more arg than the max arity so we can detect if arguments weren't fixed.
-        const outputFn: (...args: any[]) => Interface[] = builderFp[functionName]([0], [1], [2], [3], [4]);
-        const commonTypeSearch = new RegExp(`\\b(${commonTypes.join("|")})\\b`, "g");
-        commonTypeSearch.lastIndex;
-        let importCommon = false;
-        let output = outputFn([0], [1], [2], [3], [4])
-            .map(interfaceToString)
-            .join(lineBreak)
-            .replace(commonTypeSearch, match => {
-                importCommon = true;
-                return `_.${match}`;
-            });
-        if (!importCommon && output.includes("typeof _"))
-            importCommon = true;
-        const interfaceNameMatch = output.match(/(?:interface|type) ([A-Za-z0-9]+)/);
-        const interfaceName = (interfaceNameMatch ? interfaceNameMatch[1] : undefined) || _.upperFirst(functionName);
-        output = [
-            "// AUTO-GENERATED: do not modify this file directly.",
-            "// If you need to make changes, modify generate-fp.ts (if necessary), then open a terminal in types/lodash/scripts, and do:",
-            "// npm run fp",
-            importCommon ? `${lineBreak}import _ = require("../index");${lineBreak}` : '',
-            output,
-            "",
-            `declare const ${functionName}: ${interfaceName};`,
+        interfaces: builderFp[functionName]([0], [1], [2], [3], [4])([0], [1], [2], [3], [4]),
+    }));
+    for (const functionName of functionNames) {
+        const output = [
+            `import { ${functionName} } from "../fp";`,
             `export = ${functionName};`,
             "",
         ].join(lineBreak);
@@ -222,12 +227,12 @@ async function processDefinitions(filePaths: string[], commonTypes: string[]): P
                 console.error(`failed to write file: ${targetFile}`, err);
         });
     }
-    return functionNames;
+    return interfaceGroups;
 }
 
 async function parseFile(filePath: string, commonTypes: string[]): Promise<Definition[]> {
     const definitionString = await readFile(filePath);
-    const newCommonTypeRegExp = /    (?:type|interface) ([A-Za-z0-9]+)/g;
+    const newCommonTypeRegExp = /    (?:type|interface) ([A-Za-z0-9_]+)/g;
     let newCommonType = newCommonTypeRegExp.exec(definitionString);
     while (newCommonType) {
         if (!commonTypes.includes(newCommonType[1]))
@@ -246,14 +251,16 @@ async function parseFile(filePath: string, commonTypes: string[]): Promise<Defin
             console.warn(`Failed to find end of interface 'LoDashStatic' (starting at ${filePath} line ${lineNumber}).`);
             break;
         }
-        const definitions = parseDefinitions(definitionString, startIndex + lodashStaticMatch[0].length, endIndex, filePath, commonTypes);
-        definitons.push(...definitions);
+        const parsedDefinitions = parseDefinitions(definitionString, startIndex + lodashStaticMatch[0].length, endIndex, filePath, commonTypes);
+        definitons.push(...parsedDefinitions);
         lodashStaticMatch = lodashStaticRegExp.exec(definitionString);
     }
+    const __test = definitons.filter(d => !_.isEmpty(d.constants));
     return definitons;
 }
 
 function parseDefinitions(definitionString: string, startIndex: number, endIndex: number, filePath: string, commonTypes: string[], name?: string): Definition[] {
+    const parentName = name;
     const overloadRegExp = name ? /     [<(]/g : /     (\w+)[<(:]/g;
     overloadRegExp.lastIndex = startIndex;
     let overloadMatch = overloadRegExp.exec(definitionString);
@@ -271,7 +278,7 @@ function parseDefinitions(definitionString: string, startIndex: number, endIndex
         if (!currentDefinition || name !== currentDefinition.name) {
             if (currentDefinition && !_.isEmpty(currentDefinition.overloads))
                 definitons.push(currentDefinition);
-            currentDefinition = { name, overloads: [], jsdoc: "" };
+            currentDefinition = { name, overloads: [], constants: [], jsdoc: "" };
             const jsdocStartIndex = definitionString.lastIndexOf("/**", overloadStartIndex);
             const jsdocEndIndex = definitionString.indexOf("*/", jsdocStartIndex);
             if (jsdocStartIndex !== -1 && jsdocStartIndex > startIndex && jsdocEndIndex !== -1 && jsdocEndIndex < overloadStartIndex) {
@@ -382,31 +389,43 @@ function parseDefinitions(definitionString: string, startIndex: number, endIndex
             }
             const [definition] = parseDefinitions(definitionString, interfaceStartIndex, interfaceEndIndex, filePath, commonTypes, name);
             if (definition) {
-                for (const overload of definition.overloads)
-                    overload.jsdoc = currentDefinition.jsdoc;
+                if (currentDefinition.jsdoc)
+                    for (const overload of definition.overloads)
+                        overload.jsdoc = currentDefinition.jsdoc;
                 currentDefinition.overloads.push(...definition.overloads);
+                currentDefinition.constants.push(...definition.constants);
             }
         }
     }
+    if (parentName && currentDefinition) {
+        const constantRexExp = /    (\w+): *([^()\r\n]+);[\r\n]/g;
+        constantRexExp.lastIndex = startIndex;
+        for (let constantMatch = constantRexExp.exec(definitionString); constantMatch && constantMatch.index < endIndex; constantMatch = constantRexExp.exec(definitionString)) {
+            currentDefinition.constants.push(`${constantMatch[1]}: ${constantMatch[2]}`);
+        }
+    }
+
     if (currentDefinition && !_.isEmpty(currentDefinition.overloads))
         definitons.push(currentDefinition);
     return definitons;
 }
 
-function curryOverloads(overloads: Overload[], functionName: string, paramOrder: number[], spreadIndex: number, isFixed: boolean): Interface[] {
-    overloads = _.cloneDeep(overloads);
-
+function curryDefinition(definition: Definition, paramOrder: number[], spreadIndex: number, isFixed: boolean): Interface[] {
+    // Remove any duplicate/redundant overloads
+    let overloads = _.uniqWith(_.cloneDeep(definition.overloads),
+        (a, b) => _.isEqual(a.params, b.params) && _.isEqual(getUsedTypeParams(a.params, a.typeParams), getUsedTypeParams(b.params, b.typeParams)));
+    const functionName = definition.name;
     // Remove unused type parameters
     for (const overload of overloads) {
         for (let i = 0; i < overload.typeParams.length; ++i) {
-            const search = new RegExp(`\\b${overload.typeParams[i].name}\\b`);
+            const typeParam = overload.typeParams[i];
+            const search = new RegExp(`\\b${typeParam.name}\\b`);
             if (overload.params.every(p => !search.test(p)) && !search.test(overload.returnType)) {
+                // overload.returnType = overload.returnType.replace(search, typeParam.extends || "any");
                 overload.typeParams.splice(i, 1);
                 --i;
             }
         }
-        if (overloads.some(o => o !== overload && _.isEqual(o, overload)))
-            _.pull(overloads, overload);
     }
 
     if (!isFixed) {
@@ -414,9 +433,10 @@ function curryOverloads(overloads: Overload[], functionName: string, paramOrder:
         for (const overload of overloads)
             overload.params = overload.params.map(p => p.replace(/\?:/g, ":")); // No optional parameters
         return [{
-            name: _.upperFirst(functionName),
+            name: getInterfaceBaseName(functionName),
             typeParams: [],
             overloads,
+            constants: definition.constants,
         }];
     }
     paramOrder = paramOrder.filter(p => typeof p === "number");
@@ -540,6 +560,7 @@ function curryOverloads(overloads: Overload[], functionName: string, paramOrder:
     }
     for (const interfaceDef of interfaces)
         interfaceDef.overloads = mergeSimilarOverloads(interfaceDef.overloads);
+    interfaces[0].constants = definition.constants;
     return interfaces;
 }
 
@@ -552,6 +573,10 @@ function getParamType(param: string) {
     return index !== -1 ? param.substring(index + 1).trim() : "any";
 }
 
+function isPlaceholder(param: string) {
+    return param.endsWith("__");
+}
+
 function preProcessOverload(overload: Overload, functionName: string, arity: number): void {
     overload.params = overload.params
             .slice(0, arity)
@@ -601,41 +626,26 @@ function capCallback(parameter: string, functionName: string): string {
 }
 
 function curryOverload(overload: Overload, functionName: string, overloadId: number): Interface[] {
-    let baseName = _.upperFirst(functionName);
-    if (baseName === "Pick") // A type called "Pick" already exists, so rename to avoid conflicts
-        baseName = "Lodash" + baseName;
+    const baseName = getInterfaceBaseName(functionName);
     if (overload.params.length <= 1) {
         // Functions with 0 or 1 arguments are not curried. Just use a basic function type.
         return [{
             name: baseName,
             overloads: [overload],
             typeParams: [],
+            constants: [],
         }];
     }
 
+    // Create a separate interface for each possible combination of parameters that could be passed.
+    // i = binary representation of which parameters were passed to result in this interface (reversed), e.g.
+    //   1 = 0001 = 1st parameter was passed; 2nd-4th remain
+    //   6 = 1010 = 2nd and 4th parameters were passed; 1st and 3rd remain
     const interfaces: Interface[] = [];
-    let passTypeParams: TypeParam[] = [];
-    for (let i = 0; i < overload.params.length; ++i) {
-        const interfaceDef = {
-            name: getInterfaceName(baseName, overloadId, i, []),
-            typeParams: _.cloneDeep(passTypeParams),
-            overloads: curryParams(
-                overload.params.slice(i),
-                _.without(overload.typeParams, ...passTypeParams),
-                overload.returnType,
-                baseName,
-                passTypeParams,
-                overloadId,
-                i,
-                overload.jsdoc,
-            ),
-        };
+    const interfaceCount = (1 << overload.params.length) - 1;
+    for (let i = 0; i < interfaceCount; ++i) {
+        const interfaceDef = curryParams(baseName, overloadId, overload, i);
         interfaces.push(interfaceDef);
-        const currentParams = overload.params.slice(0, i + 1);
-        const usedTypeParams = overload.typeParams.filter(tp => currentParams.some(p => new RegExp(`\\b${tp.name}\\b`).test(p)));
-        usedTypeParams.unshift(...overload.typeParams.filter(tp => !usedTypeParams.includes(tp) && usedTypeParams.some(tp2 => !!tp2.extends && new RegExp(`\\b${tp.name}\\b`).test(tp2.extends))));
-        const unusedParams = overload.params.slice(i + 1).concat(overload.returnType);
-        passTypeParams = usedTypeParams.filter(tp => unusedParams.some(p => new RegExp(`\\b${tp.name}\\b`).test(p)));
     }
     // The T[keyof T] constraint doesn't work so well if it's the only constraint. Convert to a plain old T constraint so it can be merged with
     // other ValueIteratee<T> overloads
@@ -687,38 +697,87 @@ function curryOverload(overload: Overload, functionName: string, overloadId: num
 }
 
 function curryParams(
-    params: string[],
-    typeParams: TypeParam[],
-    returnType: string,
     baseName: string,
-    interfaceTypeParams: TypeParam[],
-    overloadId: number,
-    index: number,
-    jsdoc: string,
-): Overload[] {
-    // Assume params.length >= 1
-    const overloads: Overload[] = [{
+    sourceOverloadId: number,
+    sourceOverload: Overload,
+    interfaceIndex: number,
+): Interface {
+    const params = getInterfaceParams(sourceOverload, interfaceIndex);
+    const interfaceTypeParams = getInterfaceTypeParams(sourceOverload, interfaceIndex);
+
+    const prevParams = _.without(sourceOverload.params, ...params);
+    const prevTypeParams = getUsedTypeParams(prevParams, sourceOverload.typeParams);
+    const typeParams = _.without(sourceOverload.typeParams, ...prevTypeParams);
+    // 1st overload takes no parameters and just returns the same interface (effectively a no-op)
+    // HACK: omit the parameterless overload because it's not very useful, and it causes the build to run out of memory
+    // This assumes params.length > 0, which is true because curryParams is only called when params.length >= 2.
+    /*const overloads: Overload[] = [{
         typeParams: [],
         params: [],
-        returnType: getInterfaceName(baseName, overloadId, index, interfaceTypeParams),
-        jsdoc,
-    }];
-    for (let i = 1; i <= params.length; ++i) {
-        const currentParams = params.slice(0, i);
-        const usedTypeParams = i < params.length ? typeParams.filter(tp => currentParams.some(p => new RegExp(`\\b${tp.name}\\b`).test(p))) : typeParams;
-        usedTypeParams.unshift(...typeParams.filter(tp => !usedTypeParams.includes(tp) && usedTypeParams.some(tp2 => !!tp2.extends && new RegExp(`\\b${tp.name}\\b`).test(tp2.extends))));
-        const unusedParams = params.slice(i).concat(returnType);
-        const passTypeParams = usedTypeParams.concat(interfaceTypeParams).filter(tp => unusedParams.some(p => new RegExp(`\\b${tp.name}\\b`).test(p)));
-        const currentReturnType = i < params.length ? getInterfaceName(baseName, overloadId, index + i, passTypeParams) : returnType;
+        returnType: getInterfaceName(baseName, sourceOverloadId, interfaceIndex, interfaceTypeParams),
+        jsdoc: sourceOverload.jsdoc,
+    }];*/
+    const overloads: Overload[] = [];
+    const lastOverload = (1 << params.length) - 1;
+    for (let i = 1; i <= lastOverload; ++i) {
+        // xxxx i = number of parameters used by this overload
+        // const totalCombinations = nCk(params.length, i);
+        // i = binary representation of which parameters are used for this overload (reversed), e.g.
+        //   1 = 0001 -> 1000 = 1st parameter
+        //   6 = 1010 -> 0101 = 2nd and 4th parameters
+        const currentParams = params.map((p, j) => (i & (1 << j)) ? p : `${getParamName(p)}: __`);
+        while (currentParams.length > 0 && _.last(currentParams)!.endsWith("__"))
+            currentParams.pop(); // There's no point in passing a placeholder as the last parameter, so don't allow it.
+
+        const usedTypeParams = i < lastOverload ? getUsedTypeParams(currentParams, typeParams) : typeParams;
+        const combinedIndex = combineIndexes(interfaceIndex, i);
+        const passTypeParams = getInterfaceTypeParams(sourceOverload, combinedIndex);
+        const currentReturnType = i < lastOverload ? getInterfaceName(baseName, sourceOverloadId, combinedIndex, passTypeParams) : sourceOverload.returnType;
 
         overloads.push({
             typeParams: _.cloneDeep(usedTypeParams),
             params: currentParams,
             returnType: currentReturnType,
-            jsdoc,
+            jsdoc: interfaceIndex === 0 ? sourceOverload.jsdoc : "",
         });
     }
-    return overloads;
+    const interfaceDef: Interface = {
+        name: getInterfaceName(baseName, sourceOverloadId, interfaceIndex, []),
+        typeParams: _.cloneDeep(interfaceTypeParams),
+        overloads,
+        constants: [],
+    };
+    // Remove the `extends` constraint from interface type parameters, because sometimes they extend things that aren't passed to the interface.
+    for (const typeParam of interfaceDef.typeParams) {
+        if (!_.startsWith(typeParam.extends, "keyof ")) // We need to keep `extends keyof` constraints, because they're needed for TObject[TKey] to work.
+            delete typeParam.extends;
+    }
+    return interfaceDef;
+}
+
+function getInterfaceBaseName(functionName: string) {
+    return "Lodash" + _.upperFirst(functionName);
+}
+
+function getInterfaceParams(overload: Overload, interfaceIndex: number) {
+    return overload.params.filter((p, j) => !(interfaceIndex & (1 << j)));
+}
+
+function getUsedTypeParams(params: string[], typeParams: TypeParam[]) {
+    const usedTypeParams = typeParams.filter(tp => params.some(p => new RegExp(`\\b${tp.name}\\b`).test(p)));
+    usedTypeParams.unshift(...typeParams.filter(tp =>
+        !usedTypeParams.includes(tp) && usedTypeParams.some(tp2 => !!tp2.extends && new RegExp(`\\b${tp.name}\\b`).test(tp2.extends))));
+    return usedTypeParams;
+}
+
+function getInterfaceTypeParams(overload: Overload, interfaceIndex: number) {
+    const currentParams = getInterfaceParams(overload, interfaceIndex);
+    const passedParams = _.without(overload.params, ...currentParams);
+    const passedTypeParams = getUsedTypeParams(passedParams, overload.typeParams);
+    const interfaceTypeParams = passedTypeParams.filter(tp => currentParams.concat(overload.returnType).some(p => new RegExp(`\\b${tp.name}\\b`).test(p)));
+    interfaceTypeParams.unshift(...overload.typeParams.filter(tp =>
+        !interfaceTypeParams.includes(tp) && interfaceTypeParams.some(tp2 => !!tp2.extends && new RegExp(`^keyof ${tp.name}\\b`).test(tp2.extends))));
+    return interfaceTypeParams;
 }
 
 function mergeInterfaces(interfaces: Interface[]): void {
@@ -732,10 +791,12 @@ function mergeSimilarOverloads(overloads: Overload[]): Overload[] {
     const newOverloads = _.cloneDeep(overloads);
     for (const overload of newOverloads) {
         // We can merge if all param types are the same except one, and the return types are the same.
+        // Also, we can't merge a placeholder param with a non-placeholder.
         const others = newOverloads.filter(o2 => o2 !== overload
             && _.isEqual(overload.typeParams, o2.typeParams)
             && overload.params.length === o2.params.length
             && overload.params.length >= 1
+            && overload.params.every((p, i) => isPlaceholder(p) === isPlaceholder(o2.params[i]))
             && overload.params.filter((p, i) => getParamType(p) !== getParamType(o2.params[i])).length <= 1
             && overload.returnType === o2.returnType);
         if (_.isEmpty(others))
@@ -748,8 +809,8 @@ function mergeSimilarOverloads(overloads: Overload[]): Overload[] {
             .value();
         if (differingParamIndexes.length > 1)
             continue; // Only one param is different, but it's a different param for some overloads, so we can't merge
+        const similarOverloads = [overload].concat(others);
         for (let i = 0; i < overload.params.length; ++i) {
-            const similarOverloads = [overload].concat(others);
             const paramNames = _.uniq(similarOverloads.map(o => getParamName(o.params[i])));
             const newParamName = (paramNames.length > 1) ? `${paramNames[0]}Or${paramNames.slice(1).map(_.upperFirst).join("Or")}` : paramNames[0];
 
@@ -767,6 +828,19 @@ function mergeSimilarOverloads(overloads: Overload[]): Overload[] {
     return newOverloads;
 }
 
+function combineIndexes(i1: number, i2: number): number {
+    let result = i1;
+    let resultMask = 1;
+    for (let i2mask = 1; i2mask <= i2; i2mask <<= 1) {
+        while (result & resultMask)
+            resultMask <<= 1;
+        if (i2 & i2mask)
+            result += resultMask;
+        resultMask <<= 1;
+    }
+    return result;
+}
+
 function getInterfaceName(baseName: string, overloadId: number, index: number, typeParams: TypeParam[]): string {
     let interfaceName = baseName;
     if (index > 0)
@@ -775,25 +849,31 @@ function getInterfaceName(baseName: string, overloadId: number, index: number, t
 }
 
 function interfaceToString(interfaceDef: Interface): string {
-    if (interfaceDef.overloads.length === 0) {
+    if (_.isEmpty(interfaceDef.overloads)) {
         // No point in creating an empty interface
         return "";
-    } else if (interfaceDef.overloads.length === 1) {
+    } else if (interfaceDef.overloads.length === 1 && _.isEmpty(interfaceDef.constants)) {
         // Don't create an interface for a single type. Instead use a basic type def.
-        let jsdoc = interfaceDef.overloads[0].jsdoc;
-        if (jsdoc)
-            jsdoc += lineBreak;
-        interfaceDef.overloads[0].jsdoc = "";
-        return `type ${interfaceDef.name}${typeParamsToString(interfaceDef.typeParams)} =${lineBreak}${tab(jsdoc + overloadToString(interfaceDef.overloads[0], true), 1)}`;
+        const overload = interfaceDef.overloads[0];
+        // HACK: omit jsdoc comments because they cause the build to run out of memory
+        // const jsdoc = overload.jsdoc;
+        const jsdoc = "";
+        overload.jsdoc = "";
+        let overloadString = overloadToString(overload, true);
+        overloadString = jsdoc ? lineBreak + tab(jsdoc + lineBreak + overloadString, 1) : " " + overloadString;
+        return `type ${interfaceDef.name}${typeParamsToString(interfaceDef.typeParams)} =${overloadString}`;
     } else {
-        const overloadStrings = interfaceDef.overloads.map(o => lineBreak + tab(overloadToString(o), 1)).join("");
+        const overloadStrings = interfaceDef.overloads.map(o => lineBreak + tab(overloadToString(o), 1)).join("")
+            + interfaceDef.constants.map(c => `${lineBreak}${tab(c, 1)};`).join("");
         return `interface ${interfaceDef.name}${typeParamsToString(interfaceDef.typeParams)} {${overloadStrings}${lineBreak}}`;
     }
 }
 
 function overloadToString(overload: Overload, arrowSyntax = false): string {
     const joinedParams = overload.params.join(", ");
-    let jsdoc = overload.jsdoc;
+    // HACK: omit jsdoc comments because they cause the build to run out of memory
+    // let jsdoc = overload.jsdoc;
+    let jsdoc = "";
     if (jsdoc)
         jsdoc += lineBreak;
     if (overload.tslintDisable)
@@ -825,7 +905,7 @@ function getLineNumber(fileContents: string, index: number) {
 
 function tab(s: string, count: number) {
     const prepend: string = " ".repeat(count * 4);
-    return prepend + s.replace(/(?:\r\n|\n|\r)(.)/g, `${lineBreak}${prepend}$1`);
+    return (s[0] === "\n" || s[0] === "\r" ? "" : prepend) + s.replace(/(?:\r\n|\n|\r)(.)/g, `${lineBreak}${prepend}$1`);
 }
 
 function indexOfAny(source: string, values: string[], position?: number): number {
diff --git a/types/lodash/tsconfig.json b/types/lodash/tsconfig.json
index 926c4217d7..60a2e8323c 100644
--- a/types/lodash/tsconfig.json
+++ b/types/lodash/tsconfig.json
@@ -19,7 +19,6 @@
     },
     "files": [
         "index.d.ts",
-        "common/common.d.ts",
         "lodash-tests.ts",
         "add.d.ts",
         "after.d.ts",
@@ -715,6 +714,8 @@
         "fp/zipObj.d.ts",
         "fp/zipObject.d.ts",
         "fp/zipObjectDeep.d.ts",
-        "fp/zipWith.d.ts"
+        "fp/zipWith.d.ts",
+        "fp/__.d.ts",
+        "fp/placeholder.d.ts"
     ]
 }
\ No newline at end of file

From 7f0811ae8e865a8f2f9c1cdbbe4ba1ea9b82e250 Mon Sep 17 00:00:00 2001
From: Florent Cailhol <florent.cailhol@gmail.com>
Date: Sun, 15 Apr 2018 01:05:04 +0200
Subject: [PATCH 1286/1382] Fix tapable definition (#24996)

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

diff --git a/types/tapable/index.d.ts b/types/tapable/index.d.ts
index 502b408e9e..7fd0e6f08d 100644
--- a/types/tapable/index.d.ts
+++ b/types/tapable/index.d.ts
@@ -276,6 +276,7 @@ export class HookInterceptor {
     tap: (tap: Tap) => void;
     register: (tap: Tap) => Tap | undefined;
     context: boolean;
+    name: string;
 }
 
 /** A HookMap is a helper class for a Map with Hooks */

From 2053e1cb8c92f6079ed3bac7cb5d630b52db6a57 Mon Sep 17 00:00:00 2001
From: Sean Scally <scally@users.noreply.github.com>
Date: Mon, 16 Apr 2018 05:37:41 -0700
Subject: [PATCH 1287/1382] Add new RenderProps-style Context from React 16.3
 (#24509)

* Add new RenderProps-style Context from React 16.3

React 16.3 has a new recommended API for Context, with new Context, Provider, and Consumer typings.

* Add overload for createContext() to be called with no arguments

* Fix syntax

* Refactor out Props for Consumer & Provider
---
 types/react/index.d.ts   | 23 +++++++++++++++++++++++
 types/react/test/tsx.tsx |  3 +++
 2 files changed, 26 insertions(+)

diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index 1083f4afe2..b766eee600 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -240,6 +240,29 @@ declare namespace React {
         props?: Partial<P> & Attributes,
         ...children: ReactNode[]): ReactElement<P>;
 
+    // Context via RenderProps
+    interface ProviderProps<T> {
+        value: T;
+        children?: ReactNode;
+    }
+
+    interface ConsumerProps<T> {
+        children: (value: T) => ReactNode;
+        unstable_observedBits?: number;
+    }
+
+    type Provider<T> = ComponentType<ProviderProps<T>>;
+    type Consumer<T> = ComponentType<ConsumerProps<T>>;
+    interface Context<T> {
+        Provider: Provider<T>;
+        Consumer: Consumer<T>;
+    }
+    function createContext<T>(
+        defaultValue: T,
+        calculateChangedBits?: (prev: T, next: T) => number
+    ): Context<T>;
+    function createContext<T>(): Context<T | undefined>;
+
     function isValidElement<P>(object: {} | null | undefined): object is ReactElement<P>;
 
     const Children: ReactChildren;
diff --git a/types/react/test/tsx.tsx b/types/react/test/tsx.tsx
index 760a625cfd..dca7a1f814 100644
--- a/types/react/test/tsx.tsx
+++ b/types/react/test/tsx.tsx
@@ -75,6 +75,9 @@ const StatelessComponentWithoutProps: React.SFC = (props) => {
 };
 <StatelessComponentWithoutProps />;
 
+// React.createContext
+const ContextWithRenderProps = React.createContext('defaultValue');
+
 // Fragments
 <div>
     <React.Fragment>

From fe483b7d272a039fe5ebe3a0e7536a8713a1edb9 Mon Sep 17 00:00:00 2001
From: Vitya <sexsportandrocknroll@gmail.com>
Date: Tue, 17 Apr 2018 01:12:27 +0300
Subject: [PATCH 1288/1382] [@types/grid-styled] unstrict typings for
 grid-styled (#25024)

---
 types/grid-styled/index.d.ts | 65 ++++++++++++++++++------------------
 1 file changed, 33 insertions(+), 32 deletions(-)

diff --git a/types/grid-styled/index.d.ts b/types/grid-styled/index.d.ts
index dec3fd34f2..8cce111478 100644
--- a/types/grid-styled/index.d.ts
+++ b/types/grid-styled/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for grid-styled 3.2
 // Project: https://github.com/jxnblk/grid-styled
 // Definitions by: Anton Vasin <https://github.com/antonvasin>
+//                 Victor Orlov <https://github.com/vittorio>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -15,44 +16,44 @@ import { StyledComponentClass } from "styled-components";
 export type ResponsiveProp = number | string | Array<string | number>;
 
 export interface CommonProps {
-    width: ResponsiveProp;
-    fontSize: ResponsiveProp;
-    color: ResponsiveProp;
-    bg: ResponsiveProp;
-    m: ResponsiveProp;
-    mt: ResponsiveProp;
-    mr: ResponsiveProp;
-    mb: ResponsiveProp;
-    ml: ResponsiveProp;
-    mx: ResponsiveProp;
-    my: ResponsiveProp;
-    p: ResponsiveProp;
-    pt: ResponsiveProp;
-    pr: ResponsiveProp;
-    pb: ResponsiveProp;
-    pl: ResponsiveProp;
-    px: ResponsiveProp;
-    py: ResponsiveProp;
-    theme: any;
+    width?: ResponsiveProp;
+    fontSize?: ResponsiveProp;
+    color?: ResponsiveProp;
+    bg?: ResponsiveProp;
+    m?: ResponsiveProp;
+    mt?: ResponsiveProp;
+    mr?: ResponsiveProp;
+    mb?: ResponsiveProp;
+    ml?: ResponsiveProp;
+    mx?: ResponsiveProp;
+    my?: ResponsiveProp;
+    p?: ResponsiveProp;
+    pt?: ResponsiveProp;
+    pr?: ResponsiveProp;
+    pb?: ResponsiveProp;
+    pl?: ResponsiveProp;
+    px?: ResponsiveProp;
+    py?: ResponsiveProp;
+    theme?: any;
 }
 
 export interface BoxProps
     extends Omit<React.HTMLProps<HTMLDivElement>, "width" | "wrap" | "is"> {
-    flex: ResponsiveProp;
-    order: ResponsiveProp;
-    is: string | ComponentClass<any>;
+    flex?: ResponsiveProp;
+    order?: ResponsiveProp;
+    is?: string | ComponentClass<any>;
 }
 
 export interface FlexProps extends BoxProps {
-    alignItems: ResponsiveProp;
-    justifyContent: ResponsiveProp;
-    flexDirection: ResponsiveProp;
-    flexWrap: ResponsiveProp;
+    alignItems?: ResponsiveProp;
+    justifyContent?: ResponsiveProp;
+    flexDirection?: ResponsiveProp;
+    flexWrap?: ResponsiveProp;
 
     // legacy aliases https://github.com/jxnblk/styled-system/releases/tag/v2.0.0
-    justify: ResponsiveProp;
-    align: ResponsiveProp;
-    wrap: ResponsiveProp | boolean;
+    justify?: ResponsiveProp;
+    align?: ResponsiveProp;
+    wrap?: ResponsiveProp | boolean;
 }
 
 export type BoxComponent = StyledComponentClass<
@@ -67,14 +68,14 @@ export type FlexComponent = StyledComponentClass<
 
 export interface Theme {
     breakpoints: string[];
-    space: number[];
-    fontSizes: number[];
+    space?: number[];
+    fontSizes?: number[];
 }
 
 export const Box: BoxComponent;
 export const Flex: FlexComponent;
 export const theme: Theme;
 export type DivProps = Omit<React.HTMLProps<HTMLDivElement>, "ref"> & {
-    innerRef: (el: HTMLDivElement) => any;
+    innerRef?: (el: HTMLDivElement) => any;
 };
 export const div: ComponentClass<DivProps>;

From b3cea7a6bbfad7520b5cc1da72887e0e5d45d0f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20=C5=98i=C4=8Da=C5=99?= <jakub.ricar@gmail.com>
Date: Tue, 17 Apr 2018 00:13:00 +0200
Subject: [PATCH 1289/1382] Add missing isCustomDate into Settings (#25042)

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

diff --git a/types/daterangepicker/index.d.ts b/types/daterangepicker/index.d.ts
index 4d777b17b6..5a82950ca9 100644
--- a/types/daterangepicker/index.d.ts
+++ b/types/daterangepicker/index.d.ts
@@ -135,6 +135,10 @@ declare namespace daterangepicker {
          * A function that is passed each date in the two calendars before they are displayed, and may return true or false to indicate whether that date should be available for selection or not.
          */
         isInvalidDate?(startDate: string | moment.Moment | Date, endDate?: string | moment.Moment | Date): boolean;
+        /**
+         * A function that is passed each date in the two calendars before they are displayed, and may return a string or array of CSS class names to apply to that date's calendar cell.
+         */
+        isCustomDate?(date: string | moment.Moment | Date): string | string[] | undefined;
         /**
          * Indicates whether the date range picker should automatically update the value of an < input > element it's attached to at initialization and when the selected dates change.
          */

From 9de8070a6b684a425f238b2a00bff3485f70e1be Mon Sep 17 00:00:00 2001
From: DanRegazzi <danregazzi@gmail.com>
Date: Mon, 16 Apr 2018 18:13:56 -0400
Subject: [PATCH 1290/1382] Update type react-toastr: Allow JSX to be used for
 title and message content. (#24910)

* Updated the typings to allow JSX elements in addition to strings for the toast message content.
Refer to https://tomchentw.github.io/react-toastr/

* Update version number of react-toastr type definition.

* Revert version number to match toastr's version number
Change toast notify functions to use string or ReactNode types explicitly
Revert change to options override type

* ReactNode includes string.
---
 types/react-toastr/index.d.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/types/react-toastr/index.d.ts b/types/react-toastr/index.d.ts
index 2ccc8452fe..8320244d7f 100644
--- a/types/react-toastr/index.d.ts
+++ b/types/react-toastr/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for react-toastr 3.0
 // Project: https://github.com/tomchentw/react-toastr
-// Definitions by: Josh Holmer <https://github.com/shssoichiro>
+// Definitions by: Josh Holmer <https://github.com/shssoichiro>, Dan Regazzi <https://github.com/DanRegazzi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -10,10 +10,10 @@ export class ToastContainer extends Component<{
     toastMessageFactory: any;
     className?: string;
 }> {
-    error: (message: string, title: string, optionsOverride?: {}) => void;
-    info: (message: string, title: string, optionsOverride?: {}) => void;
-    success: (message: string, title: string, optionsOverride?: {}) => void;
-    warning: (message: string, title: string, optionsOverride?: {}) => void;
+    error: (message: React.ReactNode, title: React.ReactNode, optionsOverride?: {}) => void;
+    info: (message: React.ReactNode, title: React.ReactNode, optionsOverride?: {}) => void;
+    success: (message: React.ReactNode, title: React.ReactNode, optionsOverride?: {}) => void;
+    warning: (message: React.ReactNode, title: React.ReactNode, optionsOverride?: {}) => void;
     clear: () => void;
 }
 export const ToastMessageAnimated: keyof ReactHTML;

From 4baec539b71a3fe5c099b2510fe807b7667b4b25 Mon Sep 17 00:00:00 2001
From: Henrik Raitasola <henrik.raitasola@gmail.com>
Date: Tue, 17 Apr 2018 01:16:21 +0300
Subject: [PATCH 1291/1382] Add missing argument for Screen
 (react-native-navigation) (#25022)

* Add missing prop to Screen

* Use new prop in tests
---
 types/react-native-navigation/index.d.ts                        | 1 +
 types/react-native-navigation/react-native-navigation-tests.tsx | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/react-native-navigation/index.d.ts b/types/react-native-navigation/index.d.ts
index 5541f207c7..86fee24d55 100644
--- a/types/react-native-navigation/index.d.ts
+++ b/types/react-native-navigation/index.d.ts
@@ -70,6 +70,7 @@ export interface Screen {
     title?: string;
     navigatorStyle?: NavigatorStyle;
     navigatorButtons?: NavigatorButtons;
+    overrideBackPress?: boolean;
 }
 
 export interface ModalScreen extends Screen {
diff --git a/types/react-native-navigation/react-native-navigation-tests.tsx b/types/react-native-navigation/react-native-navigation-tests.tsx
index 6feb7bc397..fb3e86cc65 100644
--- a/types/react-native-navigation/react-native-navigation-tests.tsx
+++ b/types/react-native-navigation/react-native-navigation-tests.tsx
@@ -10,7 +10,7 @@ class Screen1 extends React.Component<NavigationComponentProps & { height: numbe
     };
 
     componentDidMount() {
-        this.props.navigator.push({ screen: 'example.Screen2' });
+        this.props.navigator.push({ screen: 'example.Screen2', overrideBackPress: false });
         this.props.navigator.setTabBadge({ badge: null });
     }
 

From b77a6a04ba67dfb37ece07b1d4d22b996f72d612 Mon Sep 17 00:00:00 2001
From: denisname <denisname@users.noreply.github.com>
Date: Tue, 17 Apr 2018 00:16:58 +0200
Subject: [PATCH 1292/1382] Activate strict null check in d3-format (#25015)

---
 types/d3-format/d3-format-tests.ts | 30 +++++++++++++++----
 types/d3-format/index.d.ts         | 46 ++++++++++++++++++------------
 types/d3-format/tsconfig.json      |  2 +-
 3 files changed, 53 insertions(+), 25 deletions(-)

diff --git a/types/d3-format/d3-format-tests.ts b/types/d3-format/d3-format-tests.ts
index def8994b70..5ab53a45a7 100644
--- a/types/d3-format/d3-format-tests.ts
+++ b/types/d3-format/d3-format-tests.ts
@@ -12,6 +12,20 @@ import * as d3Format from 'd3-format';
 // Preparatory Steps
 // ----------------------------------------------------------------------
 
+class NumCoercible {
+  a: number;
+
+  constructor(a: number) {
+    this.a = a;
+  }
+
+  valueOf() {
+    return this.a;
+  }
+}
+
+const numeric: NumCoercible = new NumCoercible(10);
+
 let num: number;
 
 let formatFn: (n: number) => string;
@@ -30,6 +44,12 @@ formatFn = d3Format.format('.0%');
 
 formatFn = d3Format.formatPrefix(',.0', 1e-6);
 
+d3Format.format('.0%')(10);
+d3Format.format('.0%')(numeric);
+
+d3Format.formatPrefix(',.0', 1e-6)(10);
+d3Format.formatPrefix(',.0', 1e-6)(numeric);
+
 // ----------------------------------------------------------------------
 // Test Format Specifier
 // ----------------------------------------------------------------------
@@ -43,7 +63,7 @@ const symbol: '$' | '#' | '' = specifier.symbol;
 const zero: boolean = specifier.zero;
 const width: number | undefined = specifier.width;
 const comma: boolean = specifier.comma;
-const precision: number = specifier.precision;
+const precision: number | undefined = specifier.precision;
 const type: 'e' | 'f' | 'g' | 'r' | 's' | '%' | 'p' | 'b' | 'o' | 'd' | 'x' | 'X' | 'c' | '' | 'n' = specifier.type;
 
 const formatString: string = specifier.toString();
@@ -63,10 +83,10 @@ num = d3Format.precisionRound(0.0005, 3000);
 // ----------------------------------------------------------------------
 
 localeDef = {
-    decimal: ',',
-    thousands: '.',
-    grouping: [3],
-    currency: ['EUR', '']
+  decimal: ',',
+  thousands: '.',
+  grouping: [3],
+  currency: ['EUR', '']
 };
 
 localeDef = {
diff --git a/types/d3-format/index.d.ts b/types/d3-format/index.d.ts
index 6592756ef1..bb0473a4fb 100644
--- a/types/d3-format/index.d.ts
+++ b/types/d3-format/index.d.ts
@@ -1,6 +1,9 @@
 // Type definitions for D3JS d3-format module 1.2
 // Project: https://github.com/d3/d3-format/
-// Definitions by: Tom Wanzek <https://github.com/tomwanzek>, Alex Ford <https://github.com/gustavderdrache>, Boris Yankov <https://github.com/borisyankov>
+// Definitions by: Tom Wanzek <https://github.com/tomwanzek>
+//             Alex Ford <https://github.com/gustavderdrache>
+//             Boris Yankov <https://github.com/borisyankov>
+//             denisname <https://github.com/denisname>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 // Last module patch version validated against: 1.2.0
@@ -23,7 +26,7 @@ export interface FormatLocaleDefinition {
      */
     grouping: number[];
     /**
-     * The currency prefix and suffix (e.g., ["$", ""])
+     * The currency prefix and suffix (e.g., ["$", ""]).
      */
     currency: [string, string];
     /**
@@ -31,7 +34,7 @@ export interface FormatLocaleDefinition {
      */
     numerals?: string[];
     /**
-     * An optional symbol to replace the `percent` suffix; the percent suffix (defaults to "%")
+     * An optional symbol to replace the `percent` suffix; the percent suffix (defaults to "%").
      */
     percent?: string;
 }
@@ -44,9 +47,10 @@ export interface FormatLocaleObject {
      * Returns a new format function for the given string specifier. The returned function
      * takes a number as the only argument, and returns a string representing the formatted number.
      *
-     * @param specifier A Specifier string
+     * @param specifier A Specifier string.
+     * @throws Error on invalid format specifier.
      */
-    format(specifier: string): (n: number) => string;
+    format(specifier: string): (n: number | { valueOf(): number }) => string;
 
     /**
      * Returns a new format function for the given string specifier. The returned function
@@ -54,10 +58,11 @@ export interface FormatLocaleObject {
      * The returned function will convert values to the units of the appropriate SI prefix for the
      * specified numeric reference value before formatting in fixed point notation.
      *
-     * @param specifier A Specifier string
+     * @param specifier A Specifier string.
      * @param value The reference value to determine the appropriate SI prefix.
+     * @throws Error on invalid format specifier.
      */
-    formatPrefix(specifier: string, value: number): (n: number) => string;
+    formatPrefix(specifier: string, value: number): (n: number | { valueOf(): number }) => string;
 }
 
 /**
@@ -71,7 +76,7 @@ export interface FormatSpecifier {
      */
     fill: string;
     /**
-     * Alignment used for format, as set by choosing one of the following
+     * Alignment used for format, as set by choosing one of the following:
      *
      * '>' - Forces the field to be right-aligned within the available space. (Default behavior).
      * '<' - Forces the field to be left-aligned within the available space.
@@ -83,9 +88,9 @@ export interface FormatSpecifier {
      * The sign can be:
      *
      * '-' - nothing for positive and a minus sign for negative. (Default behavior.)
-     * '+' -  a plus sign for positive and a minus sign for negative.
+     * '+' - a plus sign for positive and a minus sign for negative.
      * '(' - nothing for positive and parentheses for negative.
-     * ' '(space) -  a space for positive and a minus sign for negative.
+     * ' ' (space) - a space for positive and a minus sign for negative.
      *
      */
     sign: '-' | '+' | '(' | ' ';
@@ -94,7 +99,7 @@ export interface FormatSpecifier {
      *
      * '$' - apply currency symbols per the locale definition.
      * '#' - for binary, octal, or hexadecimal notation, prefix by 0b, 0o, or 0x, respectively.
-     * ''(none) - no symbol.
+     * '' (none) - no symbol. (Default behavior.)
      */
     symbol: '$' | '#' | '';
     /**
@@ -116,9 +121,9 @@ export interface FormatSpecifier {
      * it defaults to 6 for all types except '' (none), which defaults to 12.
      * Precision is ignored for integer formats (types 'b', 'o', 'd', 'x', 'X' and 'c').
      *
-     * See precisionFixed and precisionRound for help picking an appropriate precision
+     * See precisionFixed and precisionRound for help picking an appropriate precision.
      */
-    precision: number;
+    precision: number | undefined;
     /**
      * The available type values are:
      *
@@ -137,7 +142,7 @@ export interface FormatSpecifier {
      * 'c' - converts the integer to the corresponding unicode character before printing.
      * '' (none) - like g, but trim insignificant trailing zeros.
      *
-     * The type 'n' is also supported as shorthand for ',g'. For the 'g', 'n' and ''(none) types,
+     * The type 'n' is also supported as shorthand for ',g'. For the 'g', 'n' and '' (none) types,
      * decimal notation is used if the resulting string would have precision or fewer digits; otherwise, exponent notation is used.
      */
     type: 'e' | 'f' | 'g' | 'r' | 's' | '%' | 'p' | 'b' | 'o' | 'd' | 'x' | 'X' | 'c' | '' | 'n';
@@ -173,9 +178,10 @@ export function formatDefaultLocale(defaultLocale: FormatLocaleDefinition): Form
  * The general form of a specifier is [[fill]align][sign][symbol][0][width][,][.precision][type].
  * For reference, an explanation of the segments of the specifier string, refer to the FormatSpecifier interface properties.
  *
- * @param specifier A Specifier string
+ * @param specifier A Specifier string.
+ * @throws Error on invalid format specifier.
  */
-export function format(specifier: string): (n: number) => string;
+export function format(specifier: string): (n: number | { valueOf(): number }) => string;
 
 /**
  * Returns a new format function for the given string specifier. The returned function
@@ -183,15 +189,16 @@ export function format(specifier: string): (n: number) => string;
  * The returned function will convert values to the units of the appropriate SI prefix for the
  * specified numeric reference value before formatting in fixed point notation.
  *
- *  Uses the current default locale.
+ * Uses the current default locale.
  *
  * The general form of a specifier is [[fill]align][sign][symbol][0][width][,][.precision][type].
  * For reference, an explanation of the segments of the specifier string, refer to the FormatSpecifier interface properties.
  *
- * @param specifier A Specifier string
+ * @param specifier A Specifier string.
  * @param value The reference value to determine the appropriate SI prefix.
+ * @throws Error on invalid format specifier.
  */
-export function formatPrefix(specifier: string, value: number): (n: number) => string;
+export function formatPrefix(specifier: string, value: number): (n: number | { valueOf(): number }) => string;
 
 /**
  * Parses the specified specifier, returning an object with exposed fields that correspond to the
@@ -201,6 +208,7 @@ export function formatPrefix(specifier: string, value: number): (n: number) => s
  * For reference, an explanation of the segments of the specifier string, refer to the FormatSpecifier interface properties.
  *
  * @param specifier A specifier string.
+ * @throws Error on invalid format specifier.
  */
 export function formatSpecifier(specifier: string): FormatSpecifier;
 
diff --git a/types/d3-format/tsconfig.json b/types/d3-format/tsconfig.json
index 6017e0916f..078df0d2f2 100644
--- a/types/d3-format/tsconfig.json
+++ b/types/d3-format/tsconfig.json
@@ -6,7 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [

From c78f4617d82d8381d60ed96536a00cbdb972c353 Mon Sep 17 00:00:00 2001
From: Fabio Berta <fnberta@gmail.com>
Date: Tue, 17 Apr 2018 00:17:14 +0200
Subject: [PATCH 1293/1382] narrow down some types and add more (#25007)

---
 types/react-map-gl/index.d.ts | 215 +++++++++++++++++++++++++++++-----
 1 file changed, 187 insertions(+), 28 deletions(-)

diff --git a/types/react-map-gl/index.d.ts b/types/react-map-gl/index.d.ts
index 9f99433cfa..e0e78c6e75 100644
--- a/types/react-map-gl/index.d.ts
+++ b/types/react-map-gl/index.d.ts
@@ -8,19 +8,35 @@ import * as React from "react";
 import * as MapboxGL from "mapbox-gl";
 import * as GeoJSON from "geojson";
 
+export type EasingFunction = (t: number) => number;
+
 export interface Viewport {
-    bearing: number;
-    isDragging: boolean;
-    latitude: number;
-    longitude: number;
-    pitch?: number;
-    startBearing?: number;
-    startDragLngLat?: number[];
-    startPitch?: number;
-    zoom: number;
+  latitude: number;
+  longitude: number;
+  zoom: number;
+  isDragging?: boolean;
+  bearing?: number;
+  pitch?: number;
+  startBearing?: number;
+  startDragLngLat?: number[];
+  startPitch?: number;
+  transitionDuration?: number;
+  transitionInterpolator?: TransitionInterpolator;
+  transitionInterruption?: number;
+  transitionEasing?: EasingFunction;
 }
 
-export interface StaticMapProps {
+export interface MapError {
+  message: string;
+}
+
+export interface MapRequest {
+  url: string;
+  headers: {};
+  credentials: string;
+}
+
+export interface StaticMapProps extends Viewport {
     /**
      *  Mapbox API access token for MapboxGL.
      *  Required when using Mapbox vector tiles/styles Mapbox WebGL context creation option.
@@ -29,7 +45,7 @@ export interface StaticMapProps {
     mapboxApiAccessToken: string;
 
     /** The Mapbox style. A string url or a MapboxGL style object (regular JS object or Immutable.Map). */
-    mapStyle?: string; // TODO can also be immutable map
+    mapStyle?: string | {}; // TODO can also be immutable map
 
     /** The width of the map. */
     width: number;
@@ -37,16 +53,6 @@ export interface StaticMapProps {
     height: number;
     /** The latitude of the center of the map. */
 
-    latitude: number;
-    /** The longitude of the center of the map. */
-    longitude: number;
-    /** The tile zoom level of the map. Bounded implicitly by default minZoom and maxZoom of MapboxGL. */
-
-    zoom: number;
-    /** Specify the bearing of the viewport */
-    bearing?: number;
-    /** Specify the pitch of the viewport */
-    pitch?: number;
     /** Altitude of the viewport camera. Default 1.5 "screen heights" */
     altitude?: number; // Note: Non-public API, see https://github.com/mapbox/mapbox-gl-js/issues/1137
 
@@ -95,7 +101,14 @@ export interface StaticMapProps {
     /**
      * A callback run when the map emits an error event.
      */
-    onError?: () => void;
+    onError?: (e: MapError) => void;
+
+    transformRequest?: () => MapRequest;
+}
+
+export interface QueryRenderedFeaturesParams {
+  layers?: string[];
+  filter?: any[];
 }
 
 export class StaticMap extends React.Component<StaticMapProps> {
@@ -108,7 +121,17 @@ export class StaticMap extends React.Component<StaticMapProps> {
      * Use Mapbox's queryRenderedFeatures API to find features at point or in a bounding box.
      * If the parameters argument is not specified, only queries the layers with the interactive property in the layer style.
      */
-    queryRenderedFeatures(geometry?: MapboxGL.PointLike | MapboxGL.PointLike[], parameters?: { layers?: string[], filter?: any[] }): Array<GeoJSON.Feature<GeoJSON.GeometryObject>>;
+    queryRenderedFeatures(geometry?: MapboxGL.PointLike | MapboxGL.PointLike[], parameters?: QueryRenderedFeaturesParams): Array<GeoJSON.Feature<GeoJSON.GeometryObject>>;
+}
+
+export interface InteractiveMapState {
+  isDragging: boolean;
+  isHovering: boolean;
+}
+
+export interface MapEvent {
+  lngLat: [number, number];
+  features: Array<{}>;
 }
 
 export interface InteractiveMapProps extends StaticMapProps {
@@ -136,6 +159,18 @@ export interface InteractiveMapProps extends StaticMapProps {
     /** Radius to detect features around a clicked point */
     clickRadius?: number;
 
+    mapControls?: {
+      events: string[];
+      handleEvent: (event: MapEvent, context: any) => void;
+    };
+
+    visibilityConstraints?: {
+      minZoom: number;
+      maxZoom: number;
+      minPitch: number;
+      maxPitch: number;
+    };
+
     /**
      * Callback that is fired when the user interacted with the map.
      * The object passed to the callback contains viewport properties such as longitude, latitude, zoom etc.
@@ -155,7 +190,7 @@ export interface InteractiveMapProps extends StaticMapProps {
      * layer style to `true`. See Mapbox's style spec
      * https://www.mapbox.com/mapbox-gl-style-spec/#layer-interactive
      */
-    onHover?: (event: any, lngLat: number[], features: any) => void;
+    onHover?: (event: MapEvent, lngLat: number[], features: any) => void;
 
     /**
      * Called when the map is clicked.
@@ -165,17 +200,25 @@ export interface InteractiveMapProps extends StaticMapProps {
      * layer style to `true`. See Mapbox's style spec
      * https://www.mapbox.com/mapbox-gl-style-spec/#layer-interactive
      */
-    onClick?: (event: any, lngLat: number[], features: any) => void;
+    onClick?: (event: MapEvent, lngLat: number[], features: any) => void;
 
     /** Accessor that returns a cursor style to show interactive state */
-    getCursor?: () => any;
+    getCursor?: (state: InteractiveMapState) => void;
+
+    onTransitionStart?: () => void;
+    onTransitionInterrupt?: () => void;
+    onTransitionEnd?: () => void;
 }
 
 export class InteractiveMap extends React.Component<InteractiveMapProps> {
-    _map: MapboxGL.Map;
-
     /** Returns the Mapbox Map Instance */
     getMap(): MapboxGL.Map;
+
+    /**
+     * Use Mapbox's queryRenderedFeatures API to find features at point or in a bounding box.
+     * If the parameters argument is not specified, only queries the layers with the interactive property in the layer style.
+     */
+    queryRenderedFeatures(geometry?: MapboxGL.PointLike | MapboxGL.PointLike[], parameters?: QueryRenderedFeaturesParams): Array<GeoJSON.Feature<GeoJSON.GeometryObject>>;
 }
 
 /**
@@ -255,3 +298,119 @@ export interface SVGOverlayProps extends BaseControlProps {
     /** Additional css styles of the svg container. */
     style?: React.CSSProperties;
 }
+
+export interface MarkerProps extends BaseControlProps {
+    className?: string;
+    longitude: number;
+    latitude: number;
+    offsetLeft?: number;
+    offsetTop?: number;
+  }
+
+  export class Marker extends BaseControl<MarkerProps> {}
+
+  export interface PopupProps extends BaseControlProps {
+    className?: string;
+    longitude: number;
+    latitude: number;
+    offsetLeft?: number;
+    offsetTop?: number;
+    tipSize?: number;
+    closeButton?: boolean;
+    closeOnClick?: boolean;
+    anchor?: 'top' | 'top-left' | 'top-right' | 'bottom' | 'bottom-left' | 'bottom-right' | 'left' | 'right';
+    dynamicPosition?: boolean;
+    onClose?: () => void;
+  }
+
+  export class Popup extends BaseControl<PopupProps> {}
+
+  export interface NavigationControlProps extends BaseControlProps {
+    onViewportChange: (viewport: Viewport) => void;
+    showZoom?: boolean;
+    showCompass?: boolean;
+  }
+
+  export class NavigationControl extends BaseControl<NavigationControlProps> {}
+
+  export class TransitionInterpolator {}
+
+  export class LinearInterpolator extends TransitionInterpolator {
+    constructor(transitionProps?: string[]);
+  }
+
+  export class FlyToInterpolator extends TransitionInterpolator {}
+
+  export interface Center {
+    x: number;
+    y: number;
+  }
+
+  export interface MapControlEvent {
+    type: string;
+    center: Center;
+    offsetCenter: Center;
+    target: any;
+    srcEvent: any;
+    key?: number;
+    leftButton?: boolean;
+    middleButton?: boolean;
+    rightButton?: boolean;
+    pointerType?: string;
+    delta?: number;
+  }
+
+  export interface MapState {
+    width: number;
+    height: number;
+    latitude: number;
+    longitude: number;
+    zoom: number;
+    bearing?: number;
+    pitch?: number;
+    altitude?: number;
+    maxZoom?: number;
+    minZoom?: number;
+    maxPitch?: number;
+    minPitch?: number;
+    startPanLngLat?: [number, number];
+    startZoomLngLat?: [number, number];
+    startBearing?: number;
+    startPitch?: number;
+    startZoom?: number;
+  }
+
+  export interface Options {
+    // TODO(deprecate): remove this when `onChangeViewport` gets deprecated
+    onChangeViewport?: (viewport: Viewport) => void;
+    // TODO(deprecate): remove this when `touchZoomRotate` gets deprecated
+    touchZoomRotate?: boolean;
+    onViewportChange?: (viewport: Viewport) => void;
+    onStateChange?: (state: MapState) => void;
+    eventManager?: any;
+    scrollZoom?: boolean;
+    dragPan?: boolean;
+    dragRotate?: boolean;
+    doubleClickZoom?: boolean;
+    touchZoom?: boolean;
+    touchRotate?: boolean;
+    keyboard?: boolean;
+  }
+
+  export class MapControls {
+    events: string[];
+    handleEvent: (event: MapControlEvent) => void;
+    getMapState(overrides: Partial<MapState>): MapState;
+    setOptions(options: Options): void;
+    setState(newState: MapState): void;
+    updateViewport(newMapState: MapState, extraProps: any, extraState: InteractiveMapState): void;
+  }
+
+  export function autobind(obj: any): void;
+
+  export interface Experimental {
+    MapControls: MapControls;
+    autobind: typeof autobind;
+  }
+
+  export const experimental: Experimental;

From 9f0ef7e76e186c9a5aa5ccc0e6802dcf72bace5e Mon Sep 17 00:00:00 2001
From: Edo Rivai <edo.rivai@gmail.com>
Date: Tue, 17 Apr 2018 00:17:54 +0200
Subject: [PATCH 1294/1382] [knex] Enable named bindings in *Raw methods
 (#25028)

---
 types/knex/index.d.ts    | 5 +++--
 types/knex/knex-tests.ts | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/types/knex/index.d.ts b/types/knex/index.d.ts
index 9c07f69f9b..34715ec6cc 100644
--- a/types/knex/index.d.ts
+++ b/types/knex/index.d.ts
@@ -18,6 +18,7 @@ import Bluebird = require("bluebird");
 type Callback = Function;
 type Client = Function;
 type Value = string | number | boolean | Date | Array<string> | Array<number> | Array<Date> | Array<boolean> | Buffer | Knex.Raw;
+type ValueMap = { [key: string]: Value };
 type ColumnName = string | Knex.Raw | Knex.QueryBuilder | {[key: string]: string };
 type TableName = string | Knex.Raw | Knex.QueryBuilder;
 
@@ -338,7 +339,7 @@ declare namespace Knex {
 
     interface RawQueryBuilder {
         (sql: string, ...bindings: Value[]): QueryBuilder;
-        (sql: string, bindings: Value[]): QueryBuilder;
+        (sql: string, bindings: Value[] | ValueMap): QueryBuilder;
         (raw: Raw): QueryBuilder;
     }
 
@@ -352,7 +353,7 @@ declare namespace Knex {
         (value: Value): Raw;
         (sql: string, ...bindings: Value[]): Raw;
         (sql: string, bindings: Value[]): Raw;
-        (sql: string, bindings: Object): Raw;
+        (sql: string, bindings: ValueMap): Raw;
     }
 
     //
diff --git a/types/knex/knex-tests.ts b/types/knex/knex-tests.ts
index 1afd65ef6d..112732a2e5 100644
--- a/types/knex/knex-tests.ts
+++ b/types/knex/knex-tests.ts
@@ -246,6 +246,7 @@ knex('users').whereBetween('votes', [1, 100]);
 knex('users').whereNotBetween('votes', [1, 100]);
 
 knex('users').whereRaw('id = ?', [1]);
+knex('users').whereRaw('id = :id', { id: 1 });
 
 // Join methods
 knex('users')

From b74166a77223d320a8ef4687fe0fcc483aa3c85c Mon Sep 17 00:00:00 2001
From: Ferdi Armbruster <fx88@me.com>
Date: Tue, 17 Apr 2018 00:18:24 +0200
Subject: [PATCH 1295/1382] [@types/heremaps] Adding draggable property to
 AbstractMarker in heremaps (#25017)

* Adding draggable property to AbstractMarker in heremaps

* Fix jsdoc and optional for draggable property to AbstractMarker in heremaps

* Fix jsdoc description for draggable property to AbstractMarker in heremaps
---
 types/heremaps/index.d.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/types/heremaps/index.d.ts b/types/heremaps/index.d.ts
index 1fd1f3da29..918e464c09 100644
--- a/types/heremaps/index.d.ts
+++ b/types/heremaps/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://developer.here.com/
 // Definitions by: Joshua Efiong <https://github.com/Josh-ES>
 //                 Bernd Hacker <https://github.com/denyo>
+//                 Ferdinand Armbruster <https://github.com/fx88>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
@@ -1634,6 +1635,12 @@ declare namespace H {
              * @returns {H.map.AbstractMarker} - the marker itself
              */
             setIcon(icon: (H.map.Icon | H.map.DomIcon)): H.map.AbstractMarker;
+
+            /**
+             * @property draggable
+             * @description This property ensure that the marker can receive drag events.
+             */
+            draggable?: boolean;
         }
 
         namespace AbstractMarker {

From af9cce1db3939fdbcbdb0b1f920a7713237ad292 Mon Sep 17 00:00:00 2001
From: Anish Patel <anishpateluk@users.noreply.github.com>
Date: Mon, 16 Apr 2018 23:18:47 +0100
Subject: [PATCH 1296/1382] @feathersjs/authentication-oauth2 - renamed
 OAuth2Verifier to Verifier to match source package (#25026)

* renamed exported class from OAuth2Verifier to Verifier to match export in @feathersjs/authentication-oauth2 package

* fixed linting
---
 .../feathersjs__authentication-oauth2-tests.ts            | 8 +++++++-
 types/feathersjs__authentication-oauth2/index.d.ts        | 4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/types/feathersjs__authentication-oauth2/feathersjs__authentication-oauth2-tests.ts b/types/feathersjs__authentication-oauth2/feathersjs__authentication-oauth2-tests.ts
index f5ebaa4c1a..34dba17062 100644
--- a/types/feathersjs__authentication-oauth2/feathersjs__authentication-oauth2-tests.ts
+++ b/types/feathersjs__authentication-oauth2/feathersjs__authentication-oauth2-tests.ts
@@ -1,4 +1,10 @@
 import feathers, { Application } from '@feathersjs/feathers';
-import feathersAuthenticationOAuth2 from '@feathersjs/authentication-oauth2';
+import feathersAuthenticationOAuth2, { Verifier } from '@feathersjs/authentication-oauth2';
 
 const app: Application<{}> = feathers().configure(feathersAuthenticationOAuth2());
+
+class CustomVerifier extends Verifier {
+    constructor(app: Application<{}>, options: any = {}) {
+        super(app, options);
+    }
+}
diff --git a/types/feathersjs__authentication-oauth2/index.d.ts b/types/feathersjs__authentication-oauth2/index.d.ts
index 3037c1c47a..b2bf133c68 100644
--- a/types/feathersjs__authentication-oauth2/index.d.ts
+++ b/types/feathersjs__authentication-oauth2/index.d.ts
@@ -60,10 +60,10 @@ export interface FeathersAuthenticationOAuth2Options {
     /**
      * A Verifier class. Defaults to the built-in one but can be a custom one. See below for details.
      */
-    Verifier: OAuth2Verifier;
+    Verifier: Verifier;
 }
 
-export class OAuth2Verifier {
+export class Verifier {
     constructor(app: Application, options: any)
 
     _updateEntity(entity: any, data: { profile: any, accessToken: string, refreshToken: string }): Promise<any>; // updates an existing entity

From 3e9fdd529c5cc6e5e239c398b4c85006f21c28e6 Mon Sep 17 00:00:00 2001
From: Sasha Koss <kossnocorp@gmail.com>
Date: Tue, 17 Apr 2018 04:19:05 +0600
Subject: [PATCH 1297/1382] Fix a signature for @google-cloud/pubsub (#24995)

Fix Publisher#publish signature, so that it returns a promise
to messageId (string): https://cloud.google.com/nodejs/docs/reference/pubsub/0.18.x/Publisher#publish
---
 types/google-cloud__pubsub/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/google-cloud__pubsub/index.d.ts b/types/google-cloud__pubsub/index.d.ts
index 7c9014b7d3..2cadd026cd 100644
--- a/types/google-cloud__pubsub/index.d.ts
+++ b/types/google-cloud__pubsub/index.d.ts
@@ -111,7 +111,7 @@ declare namespace PubSub {
     interface Publisher {
         publish(data: Buffer, callback: Publisher.PublishCallback): void;
         publish(data: Buffer, attributes: object, callback: Publisher.PublishCallback): void;
-        publish(data: Buffer, attributes?: object): Promise<any[]>;
+        publish(data: Buffer, attributes?: object): Promise<string>;
     }
     namespace Publisher {
         type PublishCallback = (error: Error | null, messageId: string) => void;

From 3d822ec7e66be810e1b76a1cd56fdd5b3d9d7e48 Mon Sep 17 00:00:00 2001
From: Kyle Roach <kroach.work@gmail.com>
Date: Mon, 16 Apr 2018 18:21:28 -0400
Subject: [PATCH 1298/1382] Remove react-native-collapsible (#25011)

---
 notNeededPackages.json                        |  6 ++
 types/react-native-collapsible/Accordion.d.ts | 64 ---------------
 types/react-native-collapsible/index.d.ts     | 80 -------------------
 .../react-native-collapsible-tests.tsx        | 62 --------------
 types/react-native-collapsible/tsconfig.json  | 26 ------
 types/react-native-collapsible/tslint.json    |  7 --
 6 files changed, 6 insertions(+), 239 deletions(-)
 delete mode 100644 types/react-native-collapsible/Accordion.d.ts
 delete mode 100644 types/react-native-collapsible/index.d.ts
 delete mode 100644 types/react-native-collapsible/react-native-collapsible-tests.tsx
 delete mode 100644 types/react-native-collapsible/tsconfig.json
 delete mode 100644 types/react-native-collapsible/tslint.json

diff --git a/notNeededPackages.json b/notNeededPackages.json
index 0f318582a8..2b9e1fcde0 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -1152,6 +1152,12 @@
             "sourceRepoURL": "https://github.com/react-ga/react-ga",
             "asOfVersion": "2.3.0"
         },
+        {
+            "libraryName": "react-native-collapsible",
+            "typingsPackageName": "react-native-collapsible",
+            "sourceRepoURL": "https://github.com/oblador/react-native-collapsible",
+            "asOfVersion": "0.11.0"
+        },
         {
             "libraryName": "react-native-elements",
             "typingsPackageName": "react-native-elements",
diff --git a/types/react-native-collapsible/Accordion.d.ts b/types/react-native-collapsible/Accordion.d.ts
deleted file mode 100644
index d4f3ae0dab..0000000000
--- a/types/react-native-collapsible/Accordion.d.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import * as React from 'react';
-import { EasingMode } from './index';
-
-export interface AccordionProps {
-  /**
-   * An array of sections passed to the render methods
-   */
-  sections: any[];
-
-  /**
-   * A function that should return a renderable representing the header
-   */
-  renderHeader(content: any, index: number, isActive: boolean): JSX.Element;
-
-  /**
-   * A function that should return a renderable representing the content
-   */
-  renderContent(content: any, index: number, isActive: boolean): JSX.Element;
-
-  /**
-   * An optional function that is called when currently active section is changed, index === false when collapsed
-   */
-  onChange?(index: number): void;
-
-  /**
-   * Set which index in the sections array is initially open. Defaults to none.
-   */
-  initiallyActiveSection?: number;
-
-  /**
-   * Control which index in the sections array is currently open. Defaults to none. If false, closes all sections.
-   */
-  activeSection?: boolean | number;
-
-  /**
-   * The color of the underlay that will show through when tapping on headers.
-   *
-   * @default black
-   */
-  underlayColor?: string;
-
-  /**
-   * Alignment of the content when transitioning, can be top, center or bottom
-   *
-   * @default top
-   */
-  align?: 'top' | 'center' | 'bottom';
-
-  /**
-   * Duration of transition in milliseconds
-   *
-   * @default 300
-   */
-  duration?: number;
-
-  /**
-   * Function or function name from Easing (or tween-functions if < RN 0.8). Collapsible will try to combine Easing functions for you if you name them like tween-functions.
-   *
-   * @default easeOutCubic
-   */
-  easing?: EasingMode | any;
-}
-
-export default class Accordion extends React.Component<AccordionProps, any> {}
diff --git a/types/react-native-collapsible/index.d.ts b/types/react-native-collapsible/index.d.ts
deleted file mode 100644
index bc107f140a..0000000000
--- a/types/react-native-collapsible/index.d.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-// Type definitions for react-native-collapsible 0.8
-// Project: https://github.com/oblador/react-native-collapsible
-// Definitions by: Kyle Roach <https://github.com/iRoachie>
-//                 Umidbek Karimov <https://github.com/umidbekkarimov>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
-
-import * as React from 'react';
-
-export type EasingMode =
-'linear' |
-'easeInQuad' |
-'easeOutQuad' |
-'easeInOutQuad' |
-'easeInCubic' |
-'easeOutCubic' |
-'easeInOutCubic' |
-'easeInQuart' |
-'easeOutQuart' |
-'easeInOutQuart' |
-'easeInQuint' |
-'easeOutQuint' |
-'easeInOutQuint' |
-'easeInSine' |
-'easeOutSine' |
-'easeInOutSine' |
-'easeInExpo' |
-'easeOutExpo' |
-'easeInOutExpo' |
-'easeInCirc' |
-'easeOutCirc' |
-'easeInOutCirc' |
-'easeInElastic' |
-'easeOutElastic' |
-'easeInOutElastic' |
-'easeInBack' |
-'easeOutBack' |
-'easeInOutBack' |
-'easeInBounce' |
-'easeOutBounce' |
-'easeInOutBounce';
-
-export interface CollapsibleProps {
-    /**
-     * Alignment of the content when transitioning, can be top, center or bottom
-     *
-     * @default top
-     */
-    align?: 'top' | 'center' | 'bottom';
-
-    /**
-     * Whether to show the child components or not
-     *
-     * @default true
-     */
-    collapsed?: boolean;
-
-    /**
-     * Which height should the component collapse to
-     *
-     * @default 0
-     */
-    collapsedHeight?: number;
-
-    /**
-     * Duration of transition in milliseconds
-     *
-     * @default 300
-     */
-    duration?: number;
-
-    /**
-     * Function or function name from Easing (or tween-functions if < RN 0.8). Collapsible will try to combine Easing functions for you if you name them like tween-functions
-     *
-     * @default easeOutCubic
-     */
-    easing?: EasingMode | any;
-}
-
-export default class Collapsible extends React.Component<CollapsibleProps, any> {}
diff --git a/types/react-native-collapsible/react-native-collapsible-tests.tsx b/types/react-native-collapsible/react-native-collapsible-tests.tsx
deleted file mode 100644
index 65dd0015b8..0000000000
--- a/types/react-native-collapsible/react-native-collapsible-tests.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-import * as React from 'react';
-import { View } from 'react-native';
-import Collapsible from 'react-native-collapsible';
-import Accordion from 'react-native-collapsible/Accordion';
-
-class CollapsibleTest extends React.Component<any, any> {
-  render() {
-    return (
-      <Collapsible collapsed={true}>
-        <View />
-      </Collapsible>
-    );
-  }
-}
-
-class AccordianTest extends React.Component<any, any> {
-  _renderHeader() {
-    return (
-      <View />
-    );
-  }
-
-  _renderContent() {
-    return (
-      <View />
-    );
-  }
-
-  render() {
-    return (
-      <Accordion
-        sections={['Section 1', 'Section 2', 'Section 3']}
-        renderHeader={this._renderHeader}
-        renderContent={this._renderContent}
-      />
-    );
-  }
-}
-
-class AccordionComplexTest extends React.Component<any, any> {
-    _renderHeader() {
-        return (
-            <View />
-        );
-    }
-
-    _renderContent() {
-        return (
-            <View />
-        );
-    }
-
-    render() {
-        return (
-            <Accordion
-                sections={[{icon: 'foo', title: 'Section 1'}, {icon: 'bar', title: 'Section 2'}, {icon: 'baz', title: 'Section 3'}]}
-                renderHeader={this._renderHeader}
-                renderContent={this._renderContent}
-            />
-        );
-    }
-}
diff --git a/types/react-native-collapsible/tsconfig.json b/types/react-native-collapsible/tsconfig.json
deleted file mode 100644
index 7b0c98aa63..0000000000
--- a/types/react-native-collapsible/tsconfig.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "dom",
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true,
-        "jsx": "react"
-    },
-    "files": [
-        "index.d.ts",
-        "Accordion.d.ts",
-        "react-native-collapsible-tests.tsx"
-    ]
-}
diff --git a/types/react-native-collapsible/tslint.json b/types/react-native-collapsible/tslint.json
deleted file mode 100644
index b1439230db..0000000000
--- a/types/react-native-collapsible/tslint.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-        // TODO
-        "no-any-union": false
-    }
-}

From f6c0808e26fe78e52dc5f160f053422752fdc931 Mon Sep 17 00:00:00 2001
From: lincoln <37287480+lincoln2018@users.noreply.github.com>
Date: Tue, 17 Apr 2018 06:23:39 +0800
Subject: [PATCH 1299/1382] update interface (#25014)

* fix bugs with types

* fixed type errors

* more type errors fixed

* fixed errors and added missing type definitions

* fix all typos and added all missing ones

* change inappropriate names

* Updated names to be more accurate.

* adds EnumDWT_ConvertMode to make compatible with the old enum

* Remove type for sync use of ConvertToBase64 which isn't supported for now

* adding new line at the end
---
 types/dwt/addon.pdf.d.ts |   9 +-
 types/dwt/index.d.ts     | 207 +++++++++++++++++++++++++++------------
 2 files changed, 151 insertions(+), 65 deletions(-)

diff --git a/types/dwt/addon.pdf.d.ts b/types/dwt/addon.pdf.d.ts
index 87097471b0..2e7b1d5a84 100644
--- a/types/dwt/addon.pdf.d.ts
+++ b/types/dwt/addon.pdf.d.ts
@@ -14,6 +14,11 @@ declare enum EnumDWT_ConvertMode {
     CM_RENDERALL = 1
 }
 
+declare enum EnumDWT_ConverMode {
+    CM_DEFAULT = 0,
+    CM_RENDERALL = 1
+}
+
 /**
  * @class
  */
@@ -43,10 +48,10 @@ interface PDF {
     /**
      *  Set the image convert mode for PDF Rasterizer in Dynamic Web TWAIN.
      * @method Dynamsoft.WebTwain#SetConvertMode
-     * @param {EnumDWT_ConvertMode} convertMode Specifies the image convert mode.
+     * @param {EnumDWT_ConvertMode | EnumDWT_ConverMode} convertMode Specifies the image convert mode.
      * @return {boolean}
      */
-    SetConvertMode(convertMode: EnumDWT_ConvertMode): boolean;
+    SetConvertMode(convertMode: EnumDWT_ConvertMode | EnumDWT_ConverMode): boolean;
 
     /**
      *  Set the output resolution for the PDF Rasterizer in Dynamic Web TWAIN.
diff --git a/types/dwt/index.d.ts b/types/dwt/index.d.ts
index be362e680b..0656236f08 100644
--- a/types/dwt/index.d.ts
+++ b/types/dwt/index.d.ts
@@ -48,7 +48,7 @@ declare namespace Dynamsoft {
             bChrome: boolean, bEdge: boolean, bFileSystem: boolean, bFirefox: boolean,
             bIE: boolean, bLinux: boolean, bMac: boolean, bSafari: boolean, bWin: boolean, bWin64: boolean,
             basePath: string, iPluginLength: number, isX64: boolean, pathType: number,
-            strChromeVersion: number, strFirefoxVersion: string, strIEVersion: string
+            strChromeVersion: string, strFirefoxVersion: string, strIEVersion: string
         };
 
         /*ignored
@@ -103,8 +103,8 @@ declare namespace Dynamsoft {
         function ShowDialog(_dialogWidth: number, _dialogHeight: number, _strDialogMessageWithHtmlFormat: string, _bChangeImage: boolean, bHideCloseButton: boolean): void;
         let Trial: boolean;
         function Unload(): void;
-        let UseDefaultInstallUI: string;
-        let initQueue: number[];
+        let UseDefaultInstallUI: boolean;
+        let initQueue: any[];
         let inited: boolean;
     }
 }
@@ -1372,13 +1372,48 @@ declare enum EnumDWT_UploadDataFormat {
     Base64 = 1
 }
 
-/** interface for a DWT container which basically defines a DIV on the page */
+/** 
+ * interface for a DWT container which basically defines a DIV on the page
+ */
 interface Container {
     ContainerId: string;
     Width: string | number;
     Height: string | number;
 }
 
+/** 
+ * interface for a base64 result
+ */
+interface Base64Result {
+    getLength(): number;
+    getData(offset: number, length: number): string;
+    getMD5(): string;
+}
+
+/**
+ * Copied from lib.d.ts (Typescript)
+ */
+interface Blob {
+    readonly size: number;
+    readonly type: string;
+    msClose(): void;
+    msDetachStream(): any;
+    slice(start?: number, end?: number, contentType?: string): Blob;
+}
+
+/**
+ * Details for each license
+ */
+interface LicenseDetailItem {
+    readonly Browser: string;
+    readonly EnumLicenseType: string;
+    readonly ExpireDate: string;
+    readonly LicenseType: string;
+    readonly OS: string;
+    readonly Trial: string;
+    readonly Version: string;
+}
+
 /**
  * @class
  */
@@ -1453,7 +1488,7 @@ interface WebTwain {
      * Returns the current deviation of the pixels in the image.
      * @type {number}
      */
-    BlankImageCurrentStdDev: number;
+    readonly BlankImageCurrentStdDev: number;
 
     /**
      * Returns or sets the standard deviation of the pixels in the image.
@@ -1507,7 +1542,7 @@ interface WebTwain {
      * Returns the index (0-based) of a list to indicate the Default Value when the value of the CapType property is TWON_ENUMERATION. If the data type of the capability is String, the list is in CapItemsString property. For other data types, the list is in CapItems property. This is a runtime, read-only property.
      * @type {number}
      */
-    CapDefaultIndex: number;
+    readonly CapDefaultIndex: number;
 
     /**
      * Returns the default value in a range when the value of the CapType property is TWON_RANGE. This is a runtime, read-only property.
@@ -1591,25 +1626,25 @@ interface WebTwain {
      * Returns the device name of current source. This is a runtime, read-only property.
      * @type {string}
      */
-    CurrentSourceName: string;
+    readonly CurrentSourceName: string;
 
     /**
      * Returns the value indicating the data source status. This is a runtime, read-only property.
      * @type {number}
      */
-    DataSourceStatus: number;
+    readonly DataSourceStatus: number;
 
     /**
      * Returns the device name of default source. This is a runtime, read-only property.
      * @type {string}
      */
-    DefaultSourceName: string;
+    readonly DefaultSourceName: string;
 
     /**
      * Returns whether the source supports duplex. If so, it further returns the level of duplex the Source supports (one pass or two pass duplex). This is a runtime, read-only property.
-     * @type {number}
+     * @type {EnumDWT_DUPLEX}
      */
-    Duplex: number;
+    readonly Duplex: EnumDWT_DUPLEX;
 
     /**
      * [Deprecated.] Returns or sets whether the user can zoom image using hot key.
@@ -1621,13 +1656,13 @@ interface WebTwain {
      * Returns the error code. This is a runtime, read-only property.
      * @type {number}
      */
-    ErrorCode: number;
+    readonly ErrorCode: number;
 
     /**
      * Returns the error string. This is a runtime, read-only property.
      * @type {string}
      */
-    ErrorString: string;
+    readonly ErrorString: string;
 
     /**
      * Returns or sets the password used to log into the FTP server.
@@ -1657,7 +1692,7 @@ interface WebTwain {
      * Returns the response string from the HTTP server if an error occurs for HTTPUploadThroughPost() method. This is a runtime, read-only property.
      * @type {string}
      */
-    HTTPPostResponseString: string;
+    readonly HTTPPostResponseString: string;
 
     /**
      * Returns whether a HTTP request has credentials
@@ -1675,7 +1710,7 @@ interface WebTwain {
      * Returns how many images are in buffer. This is a runtime, read-only property.
      * @type {number}
      */
-    HowManyImagesInBuffer: number;
+    readonly HowManyImagesInBuffer: number;
 
     /**
      * Specifies the content type of a http upload.
@@ -1783,7 +1818,7 @@ interface WebTwain {
      * Returns whether or not there are documents loaded in the Source's feeder when IfFeederEnabled and IfPaperDetectable are TRUE. This is a runtime, read-only property.
      * @type {boolean}
      */
-    IfFeederLoaded: boolean;
+    readonly IfFeederLoaded: boolean;
 
     /**
      * Returns or sets whether to resize the image to fit the size of window when the view mode is set to -1 by -1. You can use SetViewMode method to set the view mode.
@@ -1813,7 +1848,7 @@ interface WebTwain {
      * Returns the value whether the Source has a paper sensor that can detect documents on the ADF or Flatbed. This is a runtime, read-only property.
      * @type {boolean}
      */
-    IfPaperDetectable: boolean;
+    readonly IfPaperDetectable: boolean;
 
     /**
      * Returns or sets whether SSL is used when uploading or downloading images.
@@ -1879,7 +1914,7 @@ interface WebTwain {
      * Returns whether the Source supports acquisition with the UI (User Interface) disabled. If FALSE, indicates that this Source can only support acquisition with the UI enabled. This is a runtime, read-only property.
      * @type {boolean}
      */
-    IfUIControllable: boolean;
+    readonly IfUIControllable: boolean;
 
     /**
      * Sets or returns whether Dynamic Web TWAIN uses the new TWAIN Data Source Manager (TWAINDSM.dll) when acquiring images from TWAIN devices.
@@ -1927,43 +1962,43 @@ interface WebTwain {
      * Returns the document number of the current image. This is a runtime, read-only property.
      * @type {number}
      */
-    ImageLayoutDocumentNumber: number;
+    readonly ImageLayoutDocumentNumber: number;
 
     /**
      * Returns the value of the bottom-most edge of the current image frame (in Unit). This is a read-only runtime property.
      * @type {number}
      */
-    ImageLayoutFrameBottom: number;
+    readonly ImageLayoutFrameBottom: number;
 
     /**
      * Returns the value of the left-most edge of the current image frame (in Unit). This is a runtime, read-only property.
      * @type {number}
      */
-    ImageLayoutFrameLeft: number;
+    readonly ImageLayoutFrameLeft: number;
 
     /**
      * Returns the frame number of the current image. This is a runtime, read-only property.
      * @type {number}
      */
-    ImageLayoutFrameNumber: number;
+    readonly ImageLayoutFrameNumber: number;
 
     /**
      * Returns the value of the right-most edge of the current image frame (in Unit). This is a runtime, read-only property.
      * @type {number}
      */
-    ImageLayoutFrameRight: number;
+    readonly ImageLayoutFrameRight: number;
 
     /**
      * Returns the value of the top-most edge of the current image frame (in Unit). This is a runtime, read-only property.
      * @type {number}
      */
-    ImageLayoutFrameTop: number;
+    readonly ImageLayoutFrameTop: number;
 
     /**
      * Returns the page number of the current image. This is a runtime, read-only property.
      * @type {Long}
      */
-    ImageLayoutPageNumber: number;
+    readonly ImageLayoutPageNumber: number;
 
     /**
      * [Deprecated.] Returns how tall/long, in pixels, the image is. This is a runtime, read-only property.
@@ -1981,7 +2016,7 @@ interface WebTwain {
      * Returns the pixel type of the current image. This is a runtime, read-only property. Please note the property is only valid in OnPreTransfer and OnPostTransfer event.
      * @type {EnumDWT_PixelType}
      */
-    ImagePixelType: EnumDWT_PixelType;
+    readonly ImagePixelType: EnumDWT_PixelType;
 
     /**
      * [Deprecated.] Returns how width, in pixels, the image is. This is a runtime, read-only property.
@@ -2017,13 +2052,13 @@ interface WebTwain {
      * Return the magnetic data if the scanner support magnetic data recognition.
      * @type {string}
      */
-    MagData: string;
+    readonly MagData: string;
 
     /**
      * Return the magnetic type if the scanner support magnetic data recognition.
      * @type {number}
      */
-    MagType: number;
+    readonly MagType: number;
 
     /**
      * Sets or returns the manufacture string for the application identity.
@@ -2059,13 +2094,13 @@ interface WebTwain {
      * Returns the X co-ordinate of the mouse. This is a runtime property.
      * @type {number}
      */
-    MouseX: number;
+    readonly MouseX: number;
 
     /**
      * Returns the Y co-ordinate of the mouse. This is a runtime property.
      * @type {number}
      */
-    MouseY: number;
+    readonly MouseY: number;
 
     /**
      * Returns or sets the name of the person who creates the PDF document.
@@ -2129,15 +2164,15 @@ interface WebTwain {
 
     /**
      * Returns or sets the page size(s) the Source can/should use to acquire image data. This is a runtime property.
-     * @type {number}
+     * @type {EnumDWT_CapSupportedSizes}
      */
-    PageSize: number;
+    PageSize: EnumDWT_CapSupportedSizes;
 
     /**
      * Returns the number of transfers the Source is ready to supply, upon demand. This is a runtime, read-only property.
      * @type {number}
      */
-    PendingXfers: number;
+    readonly PendingXfers: number;
 
     /**
      * Returns or sets the pixel flavor for acquired images. This is a runtime property.
@@ -2209,7 +2244,7 @@ interface WebTwain {
      * Returns how many sources are installed in the system. This is a runtime, read-only property.
      * @type {number}
      */
-    SourceCount: number;
+    readonly SourceCount: number;
 
     /**
      * Returns or sets the compression type of TIFF files. This is a runtime property.
@@ -2225,9 +2260,9 @@ interface WebTwain {
 
     /**
      * Returns or sets the unit of measure. This is a runtime property.
-     * @type {number}
+     * @type {EnumDWT_UnitType}
      */
-    Unit: number;
+    Unit: EnumDWT_UnitType;
 
     /**
      * Specifies whether to show the vertical scroll bar
@@ -2239,7 +2274,7 @@ interface WebTwain {
      * Sets or returns the version info string for the application identity.
      * @type {string}
      */
-    VersionInfo: string;
+    readonly VersionInfo: string;
 
     /**
      * Returns or sets the width of the dwt object viewer
@@ -2450,18 +2485,17 @@ interface WebTwain {
     CloseWorkingProcess(): boolean;
 
     /**
-     * Converts the images specified by the indices to base64.
+     * Converts the images specified by the indices to base64 synchronously.
      * @method WebTwain#ConvertToBase64
      * @param {Array} indices indices specifies which images are to be converted to base64.
      * @param {EnumDWT_ImageType} enumImageType the image format in which the images are to be converted to base64.
-     * @param {function} asyncSuccessFunc the function to call when the upload succeeds. Please refer to the function prototype OnSuccess.
-     * @param {function} asyncFailureFunc the function to call when the upload fails. Please refer to the function prototype OnFailure.
-     * @return {boolean}
-     */
-    ConvertToBase64(indices: number[], enumImageType: EnumDWT_ImageType, optionalAsyncSuccessFunc?: (result: any) => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
+     * @return {Base64Result}
+ 
+    ConvertToBase64(indices: number[], enumImageType: EnumDWT_ImageType): Base64Result;
+    */
 
     /**
-     * Converts the images specified by the indices to base64.
+     * Converts the images specified by the indices to base64 asynchronously.
      * @method WebTwain#ConvertToBase64
      * @param {Array} indices indices specifies which images are to be converted to base64.
      * @param {EnumDWT_ImageType} enumImageType the image format in which the images are to be converted to base64.
@@ -2469,7 +2503,27 @@ interface WebTwain {
      * @param {function} asyncFailureFunc the function to call when the upload fails. Please refer to the function prototype OnFailure.
      * @return {boolean}
      */
-    ConvertToBlob(indices: number[], enumImageType: EnumDWT_ImageType, optionalAsyncSuccessFunc?: (result: any) => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string) => void): boolean;
+    ConvertToBase64(indices: number[], enumImageType: EnumDWT_ImageType, asyncSuccessFunc: (result: Base64Result) => void, asyncFailureFunc: (errorCode: number, errorString: string) => void): boolean;
+
+    /**
+     * Converts the images specified by the indices to blob synchronously.
+     * @method WebTwain#ConvertToBlob
+     * @param {Array} indices indices specifies which images are to be converted to base64.
+     * @param {EnumDWT_ImageType} enumImageType the image format in which the images are to be converted to base64.
+     * @return {Blob}
+     */
+    ConvertToBlob(indices: number[], enumImageType: EnumDWT_ImageType): Blob;
+
+    /**
+     * Converts the images specified by the indices to blob asynchronously.
+     * @method WebTwain#ConvertToBlob
+     * @param {Array} indices indices specifies which images are to be converted to base64.
+     * @param {EnumDWT_ImageType} enumImageType the image format in which the images are to be converted to base64.
+     * @param {function} asyncSuccessFunc the function to call when the upload succeeds. Please refer to the function prototype OnSuccess.
+     * @param {function} asyncFailureFunc the function to call when the upload fails. Please refer to the function prototype OnFailure.
+     * @return {boolean}
+     */
+    ConvertToBlob(indices: number[], enumImageType: EnumDWT_ImageType, asyncSuccessFunc: (result: any) => void, asyncFailureFunc: (errorCode: number, errorString: string) => void): boolean;
 
     /**
      * Changes a specified image to gray scale.
@@ -2737,9 +2791,9 @@ interface WebTwain {
     /**
      * Gets custom DS data, the returned string is base64 encoded.
      * @method WebTwain#GetCustomDSDataEx
-     * @return {string}
+     * @return {string | boolean}
      */
-    GetCustomDSDataEx(): string;
+    GetCustomDSDataEx(): string | boolean;
 
     // Get custom DS data, and save the data to the specified file
     /**
@@ -2753,9 +2807,9 @@ interface WebTwain {
     /**
      * Retrieve the device type of the currently selected data source, it might be a scanner, a web camera, etc.
      * @method WebTwain#GetDeviceType
-     * @return {number}
+     * @return {number | boolean}
      */
-    GetDeviceType(): number;
+    GetDeviceType(): number | boolean;
 
     /**
      * Returns the pixel bit depth of the selected image.
@@ -2773,9 +2827,15 @@ interface WebTwain {
      */
     GetImageHeight(sImageIndex: number): number;
 
-    /*work on
-    GetImagePartURL
-    */
+    /**
+     * Returns the direct URL of an image specified by index, if iWidth and iHeight are not specified, you get the original image, otherwise you get the image with specified iWidth or iHeight while keeping the same aspect ratio. The returned string is like this 'dwt://dwt_trial_13000404/img?id=306159652&index=0&t=1502184632022'
+     * @method WebTwain#GetImagePartURL
+     * @param {number} index the index of the image.
+     * @param {number} iWidth the width of the image, it must be 150 or bigger
+     * @param {number} iHeight the height of the image, it must be 150 or bigger
+     * @return {string}
+     */
+    GetImagePartURL(index: number, iWidth?: number, iHeight?: number): string;
 
     /**
      * Returns the file size of the new image resized from the image of a specified index in buffer.
@@ -2791,10 +2851,10 @@ interface WebTwain {
      * Pre-calculate the file size of the local image file that is saved from an image of a specified index in buffer.
      * @method WebTwain#GetImageSizeWithSpecifiedType
      * @param {number} sImageIndex specifies the index of image in buffer. The index is 0-based.
-     * @param {number} sImageType specifies the type of an image file..
+     * @param {EnumDWT_ImageType} sImageType specifies the type of an image file..
      * @return {number}
      */
-    GetImageSizeWithSpecifiedType(sImageIndex: number, sImageType: number): number;
+    GetImageSizeWithSpecifiedType(sImageIndex: number, sImageType: EnumDWT_ImageType): number;
 
     /**
      * Returns the direct URL of an image specified by index, if iWidth or iHeight is set to -1, you get the original image, otherwise you get the image with specified iWidth or iHeight while keeping the same aspect ratio.
@@ -2834,7 +2894,7 @@ interface WebTwain {
      * Return the runtime license info.
      * @method WebTwain#GetLicenseInfo
      */
-    GetLicenseInfo(): { Domain: string, Detail: any[] };
+    GetLicenseInfo(): { Domain: string, Detail: LicenseDetailItem[] };
 
     /**
      * Returns the index of the selected image.
@@ -2847,10 +2907,10 @@ interface WebTwain {
     /**
      * Pre-calculate the file size of the local image file that is saved from the selected images in buffer.
      * @method WebTwain#GetSelectedImagesSize
-     * @param {number} iImageType specifies the type of an image file.
+     * @param {EnumDWT_ImageType} iImageType specifies the type of an image file.
      * @return {number}
      */
-    GetSelectedImagesSize(iImageType: number): number;
+    GetSelectedImagesSize(iImageType: EnumDWT_ImageType): number;
 
     /**
      * Check the skew angle of an image by its index in buffer.
@@ -2938,6 +2998,16 @@ interface WebTwain {
      */
     HTTPDownloadThroughPost(HTTPServer: string, HTTPRemoteFile: string, lImageType: EnumDWT_ImageType, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string, httppostresponsestring: string) => void): boolean;
 
+    /**
+     * Uploads just a form created by SetHTTPFormField and SetHTTPHeader
+     * @method WebTwain#HTTPUpload
+     * @param {string} url the url where the images are sent in a POST request.
+     * @param {function} asyncSuccessFunc the function to call when the upload succeeds. Please refer to the function prototype OnSuccess.
+     * @param {function} asyncFailureFunc the function to call when the upload fails. Please refer to the function prototype OnFailure.
+     * @return {boolean}
+     */
+    HTTPUpload(url: string, asyncSuccessFunc: (httppostresponsestring: string) => void, asyncFailureFunc: (errorCode: number, errorString: string, httppostresponsestring: string) => void): boolean;
+
     /**
      * Uploads the images specified by the indices to the HTTP server.
      * @method WebTwain#HTTPUpload
@@ -2949,7 +3019,7 @@ interface WebTwain {
      * @param {function} asyncFailureFunc the function to call when the upload fails. Please refer to the function prototype OnFailure.
      * @return {boolean}
      */
-    HTTPUpload(url: string, indices: number[], enumImageType: EnumDWT_ImageType, dataFormat: EnumDWT_UploadDataFormat, optionalAsyncSuccessFunc?: () => void, optionalAsyncFailureFunc?: (errorCode: number, errorString: string, httppostresponsestring: string) => void): boolean;
+    HTTPUpload(url: string, indices: number[], enumImageType: EnumDWT_ImageType, dataFormat: EnumDWT_UploadDataFormat, asyncSuccessFunc: (httppostresponsestring: string) => void, asyncFailureFunc: (errorCode: number, errorString: string, httppostresponsestring: string) => void): boolean;
 
     /**
      * Uploads all images in the buffer to the HTTP server through the HTTP Post method as a Multi-Page TIFF.
@@ -3256,9 +3326,10 @@ interface WebTwain {
     /**
      * Shows the GUI of Image Printer.
      * @method WebTwain#Print
+     * @param {boolean} bUseSystemDefaultPrintUI specifies whether to use the system Print UI or not.
      * @return {boolean}
      */
-    Print(): boolean;
+    Print(bUseSystemDefaultPrintUI: boolean): boolean;
 
     /**
      * Binds a specified function to an event, so that the function gets called whenever the event fires.
@@ -3272,9 +3343,9 @@ interface WebTwain {
     /**
      * Removes all images in buffer.
      * @method WebTwain#RemoveAllImages
-     * @return {void}
+     * @return {boolean}
      */
-    RemoveAllImages(): void;
+    RemoveAllImages(): boolean;
 
     /**
      * Removes selected images in buffer.
@@ -3542,6 +3613,16 @@ interface WebTwain {
      */
     SetHTTPFormField(FieldName: string, FieldValue: string): boolean;
 
+    /**
+     * Sets a text parameter as a filed in a web form. This form is maintained by the component itself (meaning it's not on the page). All fields in this form will be passed to the server when uploading images.
+     * @method WebTwain#SetHTTPFormField
+     * @param {string} FieldName specifies the name of the field which could later be used to retrieve the blob
+     * @param {Blob} blobValue specifies the blob to be put in the form.
+     * @param {string} optionalFileName specifies the file name for the blob
+     * @return {boolean}
+     */
+    SetHTTPFormField(FieldName: string, blobValue: Blob, optionalFileName?: string): boolean;
+
     /**
      * Sets a header for the current HTTP Post request.
      * @method WebTwain#SetHTTPHeader
@@ -3604,9 +3685,9 @@ interface WebTwain {
      * @method WebTwain#SetSelectedImageIndex
      * @param {number} sSelectedIndex this is the index of an array that holds the indices of selected images.
      * @param {number} newVal specifies the index of an image that you want to select.
-     * @return {void}
+     * @return {boolean}
      */
-    SetSelectedImageIndex(selectedIndex: number, newVal: number): void;
+    SetSelectedImageIndex(selectedIndex: number, newVal: number): boolean;
 
     /**
      * Sets a custom tiff tag. Currently you can set up to 32 tags. The string to be set in a tag can be encoded with base64.

From ed2cf925b39b5bdca9527b41541696d8e4bf58fa Mon Sep 17 00:00:00 2001
From: Keagan McClelland <keagan.mcclelland@gmail.com>
Date: Mon, 16 Apr 2018 16:24:02 -0600
Subject: [PATCH 1300/1382] fixed ramda type inference errors (#24942)

---
 types/ramda/index.d.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/types/ramda/index.d.ts b/types/ramda/index.d.ts
index eb4b4569c6..017839933a 100644
--- a/types/ramda/index.d.ts
+++ b/types/ramda/index.d.ts
@@ -16,6 +16,7 @@
 //                 Nikita Moshensky <https://github.com/moshensky>
 //                 Ethan Resnick <https://github.com/ethanresnick>
 //                 Jack Leigh <https://github.com/leighman>
+//                 Keagan McClelland <https://github.com/CaptJakk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -951,10 +952,11 @@ declare namespace R {
          * Returns a new list, constructed by applying the supplied function to every element of the supplied list.
          */
         map<T, U>(fn: (x: T) => U, list: ReadonlyArray<T>): U[];
-        map<T, U>(fn: (x: T) => U, obj: Functor<T>): Functor<U>; // used in functors
         map<T, U>(fn: (x: T) => U): (list: ReadonlyArray<T>) => U[];
-        map<T extends object, U extends {[P in keyof T]: U[P]}>(fn: (x: T[keyof T]) => U[keyof T], obj: T): U;
-        map<T extends object, U extends {[P in keyof T]: U[P]}>(fn: (x: T[keyof T]) => U[keyof T]): (obj: T) => U;
+        map<T, U>(fn: (x: T[keyof T & keyof U]) => U[keyof T & keyof U], list: T): U;
+        map<T, U>(fn: (x: T[keyof T & keyof U]) => U[keyof T & keyof U]): (list: T) => U;
+        map<T, U>(fn: (x: T) => U, obj: Functor<T>): Functor<U>; // used in functors
+        map<T, U>(fn: (x: T) => U): (obj: Functor<T>) => Functor<U>; // used in functors
 
         /**
          * The mapAccum function behaves like a combination of map and reduce.

From a7f56fc5ce4255c9a456492aa72af41e1d692845 Mon Sep 17 00:00:00 2001
From: "James C. Davis" <james@cos.io>
Date: Mon, 16 Apr 2018 18:24:28 -0400
Subject: [PATCH 1301/1382] Add Ember.CoreObject constructor with initial
 properties arg (#24997)

---
 types/ember/index.d.ts     | 10 ++++++++--
 types/ember/test/object.ts | 12 ++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/types/ember/index.d.ts b/types/ember/index.d.ts
index c825647e49..cd4ba0f85f 100755
--- a/types/ember/index.d.ts
+++ b/types/ember/index.d.ts
@@ -71,13 +71,13 @@ declare module 'ember' {
      *
      * Generally you would use `EmberClass.create()` instead of `new EmberClass()`.
      *
-     * The no-arg constructor is required by the typescript compiler.
+     * The single-arg constructor is required by the typescript compiler.
      * The multi-arg constructor is included for better ergonomics.
      *
      * Implementation is carefully chosen for the reasons described in
      * https://github.com/typed-ember/ember-typings/pull/29
      */
-    type EmberClassConstructor<T> = (new () => T) & (new (...args: any[]) => T);
+    type EmberClassConstructor<T> = (new (properties?: object) => T) & (new (...args: any[]) => T);
 
     type ComputedPropertyGetterFunction<T> = (this: any, key: string) => T;
 
@@ -761,6 +761,12 @@ declare module 'ember' {
         }
         const Copyable: Ember.Mixin<Copyable>;
         class CoreObject {
+            /**
+             * As of Ember 3.1, CoreObject constructor takes initial object properties as an argument.
+             * See: https://github.com/emberjs/ember.js/commit/4709935854d4c29b0d2c054614d53fa2c55309b1
+             **/
+            constructor(properties?: object);
+
             _super(...args: any[]): any;
 
             /**
diff --git a/types/ember/test/object.ts b/types/ember/test/object.ts
index cfe2c9380f..e1eefb75e9 100755
--- a/types/ember/test/object.ts
+++ b/types/ember/test/object.ts
@@ -13,3 +13,15 @@ const LifetimeHooks = Ember.Object.extend({
         this._super();
     }
 });
+
+class MyObject30 extends Ember.Object {
+    constructor() {
+        super();
+    }
+}
+
+class MyObject31 extends Ember.Object {
+    constructor(properties: object) {
+        super(properties);
+    }
+}

From 080eb8f130a06557437ed194a79c53b562ab9257 Mon Sep 17 00:00:00 2001
From: Mikhail Vasin <vasin@cloud-tv.ru>
Date: Tue, 17 Apr 2018 01:24:47 +0300
Subject: [PATCH 1302/1382] Change TransitionPlainStyle key type to string
 (#25003)

According to https://github.com/chenglou/react-motion/blob/master/src/Types.js#L56
---
 types/react-motion/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/react-motion/index.d.ts b/types/react-motion/index.d.ts
index 2c2958a62e..f4f94095a8 100644
--- a/types/react-motion/index.d.ts
+++ b/types/react-motion/index.d.ts
@@ -94,7 +94,7 @@ interface TransitionStyle {
  * Default style for transition
  */
 interface TransitionPlainStyle {
-    key: any;
+    key: string;
     data?: any;
     // same as TransitionStyle, passed as argument to style/children function
     style: PlainStyle;

From 5c5ffcc7c9a84f884db5fdea7b36dda3d709c386 Mon Sep 17 00:00:00 2001
From: ufolux <richadlu001@gmail.com>
Date: Tue, 17 Apr 2018 06:25:09 +0800
Subject: [PATCH 1303/1382] add missing property for ReduxLoggerOptions
 (#24991)

* add missing property for ReduxLoggerOptions

add titleFormatter property type definition for ReduxLoggerOptions

* fix ci error

fix no-trailing-whitespace error
---
 types/redux-logger/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/redux-logger/index.d.ts b/types/redux-logger/index.d.ts
index c8ca66eda0..0d4d1ec386 100644
--- a/types/redux-logger/index.d.ts
+++ b/types/redux-logger/index.d.ts
@@ -50,6 +50,7 @@ export interface ReduxLoggerOptions {
     duration?: boolean;
     timestamp?: boolean;
     colors?: ColorsObject | false;
+    titleFormatter?(formattedAction: any, formattedTime: string, took: number): string;
     logger?: any;
     logErrors?: boolean;
     collapsed?: boolean | LoggerPredicate;

From 8030410d9be2dbdd2851ed0f199ed3c869bad61d Mon Sep 17 00:00:00 2001
From: heroboy <yangweiqin@gmail.com>
Date: Tue, 17 Apr 2018 06:25:29 +0800
Subject: [PATCH 1304/1382] Update three-core.d.ts (#24989)

add `optionalTarget` parameter
---
 types/three/three-core.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/three/three-core.d.ts b/types/three/three-core.d.ts
index 2ec61c82cd..d08d7ad1db 100644
--- a/types/three/three-core.d.ts
+++ b/types/three/three-core.d.ts
@@ -6586,13 +6586,13 @@ export class Curve<T extends Vector> {
      * Returns a vector for point t of the curve where t is between 0 and 1
      * getPoint(t: number): T;
      */
-    getPoint(t: number): T;
+    getPoint(t: number, optionalTarget?: T): T;
 
     /**
      * Returns a vector for point at relative position in curve according to arc length
      * getPointAt(u: number): T;
      */
-    getPointAt(u: number): T;
+    getPointAt(u: number, optionalTarget?: T): T;
 
     /**
      * Get sequence of points using getPoint( t )

From 57381ed4fe104217a15890551234a993d8609e0a Mon Sep 17 00:00:00 2001
From: Curtis Maddalozzo <cmaddalozzo@users.noreply.github.com>
Date: Mon, 16 Apr 2018 23:26:17 +0100
Subject: [PATCH 1305/1382] raven: Add definitions for transports (#24918)

* Add definitions for transports

* Fix transport option. Add tests.

* Bump version

* Fix linting error
---
 types/raven/index.d.ts     | 46 +++++++++++++++++++++++++++++++++-----
 types/raven/raven-tests.ts |  5 ++++-
 2 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/types/raven/index.d.ts b/types/raven/index.d.ts
index db59721513..5d478a496b 100644
--- a/types/raven/index.d.ts
+++ b/types/raven/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for raven 2.1
+// Type definitions for raven 2.5
 // Project: https://github.com/getsentry/raven-node
 // Definitions by: Scott Cooper <https://github.com/scttcper>
 //                 Dmitrii Sorin <https://github.com/1999>
@@ -7,7 +7,9 @@
 
 /// <reference types="node" />
 
-import { IncomingMessage, ServerResponse } from 'http';
+import {
+  IncomingMessage, ServerResponse, OutgoingHttpHeaders, Agent, ClientRequest
+} from 'http';
 import { EventEmitter } from 'events';
 
 // expose all methods of `Client` class since raven exposes a singleton instance
@@ -81,7 +83,7 @@ export interface ConstructorOptions {
     sampleRate?: number;
     sendTimeout?: number;
     shouldSendCallback?: ShouldSendCallback;
-    transport?: TransportCallback;
+    transport?: transports.Transport;
     captureUnhandledRejections?: boolean;
     maxBreadcrumbs?: number;
     autoBreadcrumbs?: boolean | { [breadcrumbType: string]: boolean };
@@ -113,8 +115,6 @@ export type DataCallback = (data: { [key: string]: any }) => any;
 
 export type ShouldSendCallback = (data: { [key: string]: any }) => boolean;
 
-export type TransportCallback = (options: { [key: string]: any }) => void;
-
 export interface CaptureOptions {
     tags?: { [key: string]: string };
     extra?: { [key: string]: any };
@@ -123,3 +123,39 @@ export interface CaptureOptions {
     req?: IncomingMessage;
     user?: any;
 }
+
+export namespace transports {
+  interface HTTPTransportOptions {
+    hostname?: string;
+    path?: string;
+    headers?: OutgoingHttpHeaders;
+    method?: 'POST' | 'GET';
+    port?: number;
+    ca?: string;
+    agent?: Agent;
+  }
+  abstract class Transport extends EventEmitter {
+    abstract send(
+      client: Client,
+      message: any,
+      headers: OutgoingHttpHeaders,
+      eventId: string,
+      cb: CaptureCallback
+    ): void;
+  }
+  class HTTPTransport extends Transport {
+    defaultPort: string;
+    options: HTTPTransportOptions;
+    agent: Agent;
+    constructor(options?: HTTPTransportOptions);
+    send(
+      client: Client,
+      message: any,
+      headers: OutgoingHttpHeaders,
+      eventId: string,
+      cb: CaptureCallback
+    ): void;
+  }
+  class HTTPSTransport extends HTTPTransport {
+  }
+}
diff --git a/types/raven/raven-tests.ts b/types/raven/raven-tests.ts
index 927125f84f..6191f8f89d 100644
--- a/types/raven/raven-tests.ts
+++ b/types/raven/raven-tests.ts
@@ -10,8 +10,11 @@ Raven.config(dsn, {
 });
 console.log(Raven.version);
 
+const transport = new Raven.transports.HTTPTransport();
+
 Raven.config({
-    release: 'foobar'
+    release: 'foobar',
+    transport
 });
 client.setContext({});
 client.on('logged', () => { });

From 9840f8c2e4f43c40c6f5068e953b5ba4661b53c5 Mon Sep 17 00:00:00 2001
From: Jarom Loveridge <jarom@timpnet.net>
Date: Mon, 16 Apr 2018 16:35:32 -0600
Subject: [PATCH 1306/1382] Add types for `muri` (#25039)

* Add muri types.

* Resolve linting issues.

* Remove unnecessary TypeScript version specification.
---
 types/muri/index.d.ts    | 31 +++++++++++++++++++++++++++++++
 types/muri/muri-tests.ts | 20 ++++++++++++++++++++
 types/muri/tsconfig.json | 23 +++++++++++++++++++++++
 types/muri/tslint.json   |  1 +
 4 files changed, 75 insertions(+)
 create mode 100644 types/muri/index.d.ts
 create mode 100644 types/muri/muri-tests.ts
 create mode 100644 types/muri/tsconfig.json
 create mode 100644 types/muri/tslint.json

diff --git a/types/muri/index.d.ts b/types/muri/index.d.ts
new file mode 100644
index 0000000000..1e3658fa61
--- /dev/null
+++ b/types/muri/index.d.ts
@@ -0,0 +1,31 @@
+// Type definitions for muri 1.3
+// Project: https://github.com/aheckmann/muri
+// Definitions by: jloveridge <https://github.com/jloveridge>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = Muri;
+
+declare function Muri(uri: string): Muri.ParsedUri;
+
+declare namespace Muri {
+    interface ParsedUri {
+        db: string;
+        hosts: Host[];
+        options: any;
+        auth?: {
+            user: string;
+            pass?: string;
+        };
+    }
+
+    interface DefaultHost {
+        host: string;
+        port: number;
+    }
+
+    interface SocketHost {
+        ipc: string;
+    }
+
+    type Host = DefaultHost | SocketHost;
+}
diff --git a/types/muri/muri-tests.ts b/types/muri/muri-tests.ts
new file mode 100644
index 0000000000..28c843bd36
--- /dev/null
+++ b/types/muri/muri-tests.ts
@@ -0,0 +1,20 @@
+import muri = require('muri');
+
+const parsed = {
+    authenticated: {
+        default: muri('mongodb://admin@locahost'),
+        user: muri('mongodb://admin@localhost:27017/test'),
+        userAndPass: muri('mongodb://admin:password@localhost:27017/test'),
+    },
+    replset: {
+        default: muri('mongodb://localhost:27017,localhost:27018,localhost:27019/test?replicaSet=replset'),
+        ssl: muri('mongodb://localhost:27017,localhost:27018,localhost:27019/test?replicaSet=replset&ssl=true'),
+    },
+    simple: {
+        default: muri('mongodb://localhost'),
+        portSpecified: muri('mongodb://localhost:27017/test'),
+    },
+    unixSocket: {
+        default: muri('mongodb://local.sock'),
+    },
+};
diff --git a/types/muri/tsconfig.json b/types/muri/tsconfig.json
new file mode 100644
index 0000000000..737fc3a1f2
--- /dev/null
+++ b/types/muri/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "muri-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/muri/tslint.json b/types/muri/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/muri/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From a67c35269ab4a94ea9278c7edf0d86ad426bc8c3 Mon Sep 17 00:00:00 2001
From: Tomislav Fabeta <tomislav.fabeta@gmail.com>
Date: Tue, 17 Apr 2018 00:38:18 +0200
Subject: [PATCH 1307/1382] Type for schema-registry (#25032)

* added schema-registry types

* added few more tests

* cleaned

* removed declare module
---
 types/schema-registry/index.d.ts              |  56 ++++++++++
 .../schema-registry/schema-registry-tests.ts  | 102 ++++++++++++++++++
 types/schema-registry/tsconfig.json           |  23 ++++
 types/schema-registry/tslint.json             |   1 +
 4 files changed, 182 insertions(+)
 create mode 100644 types/schema-registry/index.d.ts
 create mode 100644 types/schema-registry/schema-registry-tests.ts
 create mode 100644 types/schema-registry/tsconfig.json
 create mode 100644 types/schema-registry/tslint.json

diff --git a/types/schema-registry/index.d.ts b/types/schema-registry/index.d.ts
new file mode 100644
index 0000000000..0b37f6522f
--- /dev/null
+++ b/types/schema-registry/index.d.ts
@@ -0,0 +1,56 @@
+// Type definitions for schema-registry 1.17
+// Project: https://github.com/nodefluent/schema-registry#readme
+// Definitions by: Tomislav Fabeta <https://github.com/bonzzy>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+/// <reference types="node" />
+export interface RegistryClientConfig {
+    host: string;
+    port: number;
+    protocol?: string;
+    logger?: object;
+    type?: string;
+}
+
+export interface AvroSchemaResponseInterface {
+    subject: string;
+    version: number;
+    id: number;
+    schema: any;
+}
+
+export type RegistryRequest = Promise<AvroSchemaResponseInterface>;
+
+export class LivingAvroSchema extends RegistryClient {
+    fetch: (poll?: boolean) => RegistryRequest;
+    toBuffer: (object: object) => Buffer;
+    fromBuffer: (buffer: Buffer) => any;
+    on: (...args: any[]) => undefined;
+    removeListener: (...args: any[]) => undefined;
+    stop: () => undefined;
+    constructor(subject: string, version: string, config: RegistryClientConfig);
+}
+
+export class RegistryClient {
+    host: string;
+    port: number;
+    protocol: string;
+    type: string;
+    logger: object;
+
+    request: (options: object, expectedStatusCode: number) => RegistryRequest;
+    isAlive: () => RegistryRequest;
+    registerSubjectVersion: (subject: string, schema: object) => RegistryRequest;
+    getVersionsForSubject: (subject: string) => RegistryRequest;
+    getConfig: () => RegistryRequest;
+    setConfig: (config: object) => RegistryRequest;
+    setSubjectConfig: (subject: string, config: object) => RegistryRequest;
+    getSubjectConfig: (subject: string) => RegistryRequest;
+    getSchemaById: (id: number) => RegistryRequest;
+    getSubjects: () => RegistryRequest;
+    getSubjectSchemaForVersion: (subject: string, version: number) => RegistryRequest;
+    getLatestSubjectSchema: (subject: string) => RegistryRequest;
+    checkSubjectRegistration: (subject: string, schema: object) => RegistryRequest;
+    constructor(config: RegistryClientConfig);
+}
diff --git a/types/schema-registry/schema-registry-tests.ts b/types/schema-registry/schema-registry-tests.ts
new file mode 100644
index 0000000000..fc20fd5bdc
--- /dev/null
+++ b/types/schema-registry/schema-registry-tests.ts
@@ -0,0 +1,102 @@
+import { RegistryClient, RegistryRequest, LivingAvroSchema } from "schema-registry";
+
+const config = {
+    host: "host", port: 2,
+};
+const registryClient = new RegistryClient(config);
+const livingAvroSchema = new LivingAvroSchema("subject", "version", {
+    host: "host", port: 2,
+});
+
+// $ExpectType Promise<AvroSchemaResponseInterface>
+registryClient.request({}, 2);
+// $ExpectError
+registryClient.request();
+// $ExpectError
+registryClient.request({});
+// $ExpectError
+registryClient.request('a');
+// $ExpectError
+registryClient.request({}, 'a');
+// $ExpectError
+registryClient.request({}, {});
+
+// $ExpectType Promise<AvroSchemaResponseInterface>
+registryClient.isAlive();
+
+// $ExpectType Promise<AvroSchemaResponseInterface>
+registryClient.registerSubjectVersion("string", {});
+// $ExpectError
+registryClient.registerSubjectVersion();
+// $ExpectError
+registryClient.registerSubjectVersion("string");
+
+// $ExpectType Promise<AvroSchemaResponseInterface>
+registryClient.getVersionsForSubject("string");
+// $ExpectError
+registryClient.getVersionsForSubject();
+// $ExpectError
+registryClient.getVersionsForSubject({});
+
+// $ExpectType Promise<AvroSchemaResponseInterface>
+registryClient.getConfig();
+
+// $ExpectType Promise<AvroSchemaResponseInterface>
+registryClient.setConfig({});
+// $ExpectError
+registryClient.setConfig();
+// $ExpectError
+registryClient.setConfig("string");
+
+// $ExpectType Promise<AvroSchemaResponseInterface>
+registryClient.setSubjectConfig("string", {});
+// $ExpectError
+registryClient.setSubjectConfig();
+// $ExpectError
+registryClient.setSubjectConfig("string");
+
+// $ExpectType Promise<AvroSchemaResponseInterface>
+registryClient.getSubjectConfig("string");
+// $ExpectError
+registryClient.getSubjectConfig();
+// $ExpectError
+registryClient.getSubjectConfig({});
+
+// $ExpectType Promise<AvroSchemaResponseInterface>
+registryClient.getSchemaById(2);
+// $ExpectError
+registryClient.getSchemaById();
+// $ExpectError
+registryClient.getSchemaById('a');
+// $ExpectError
+registryClient.getSchemaById({});
+
+// $ExpectType Promise<AvroSchemaResponseInterface>
+registryClient.getSubjects();
+
+// $ExpectType Promise<AvroSchemaResponseInterface>
+registryClient.getSubjectSchemaForVersion("string", 2);
+// $ExpectError
+registryClient.getSubjectSchemaForVersion("string", {});
+// $ExpectError
+registryClient.getSubjectSchemaForVersion("string");
+// $ExpectError
+registryClient.getSubjectSchemaForVersion({});
+
+// $ExpectType Promise<AvroSchemaResponseInterface>
+registryClient.getLatestSubjectSchema("string");
+// $ExpectError
+registryClient.getLatestSubjectSchema({});
+// $ExpectError
+registryClient.getLatestSubjectSchema(2);
+// $ExpectError
+registryClient.getLatestSubjectSchema();
+
+// $ExpectType Promise<AvroSchemaResponseInterface>
+registryClient.checkSubjectRegistration("string", {});
+// $ExpectError
+registryClient.checkSubjectRegistration("string");
+// $ExpectError
+registryClient.checkSubjectRegistration(2);
+// $ExpectError
+registryClient.checkSubjectRegistration();
diff --git a/types/schema-registry/tsconfig.json b/types/schema-registry/tsconfig.json
new file mode 100644
index 0000000000..f8997b0fa3
--- /dev/null
+++ b/types/schema-registry/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "schema-registry-tests.ts"
+    ]
+}
diff --git a/types/schema-registry/tslint.json b/types/schema-registry/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/schema-registry/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From bbca3b76faabe3ec8cc86ce5f9996251babd04bd Mon Sep 17 00:00:00 2001
From: anderswestberg <anders.westberg@diginet.se>
Date: Tue, 17 Apr 2018 00:39:06 +0200
Subject: [PATCH 1308/1382] Added typings for network-interfaces (#25027)

* Added typings for network-interfaces

* Added typings for network-interfaces

* Corrected build errors
---
 types/network-interfaces/index.d.ts           | 10 ++++++++
 .../network-interfaces-tests.ts               | 22 ++++++++++++++++++
 types/network-interfaces/tsconfig.json        | 23 +++++++++++++++++++
 types/network-interfaces/tslint.json          |  1 +
 4 files changed, 56 insertions(+)
 create mode 100644 types/network-interfaces/index.d.ts
 create mode 100644 types/network-interfaces/network-interfaces-tests.ts
 create mode 100644 types/network-interfaces/tsconfig.json
 create mode 100644 types/network-interfaces/tslint.json

diff --git a/types/network-interfaces/index.d.ts b/types/network-interfaces/index.d.ts
new file mode 100644
index 0000000000..99b58a23aa
--- /dev/null
+++ b/types/network-interfaces/index.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for network-interfaces 1.1
+// Project: https://github.com/Wizcorp/network-interfaces#readme
+// Definitions by: Anders Westberg <https://github.com/anderswestberg>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export function toIp(interfaceName: string, options: {}): string;
+export function toIps(interfaceName: string, options: {}): string[];
+export function fromIp(ip: string, options: {}): string;
+export function getInterface(options: {}): string;
+export function getInterfaces(options: {}): string[];
diff --git a/types/network-interfaces/network-interfaces-tests.ts b/types/network-interfaces/network-interfaces-tests.ts
new file mode 100644
index 0000000000..a4cb71104a
--- /dev/null
+++ b/types/network-interfaces/network-interfaces-tests.ts
@@ -0,0 +1,22 @@
+/// <reference types="node" />
+import * as ni from "network-interfaces";
+import * as os from "os";
+
+const options = {
+    internal: false, // boolean: only acknowledge internal or external addresses (undefined: both)
+    ipVersion: 4     // integer (4 or 6): only acknowledge addresses of this IP address family (undefined: both)
+};
+
+function test() {
+    try {
+        const ifcName = os.platform() !== "win32" ? "eth0" : "Ethernet";
+        const ip = ni.toIp(ifcName, options);
+        const ipList = ni.toIps(ifcName, options);
+        let ifc = ni.getInterface(options);
+        const ifcList = ni.getInterfaces(ifcName);
+        ifc = ni.fromIp(ip, options);
+    } catch (e) {
+    }
+}
+
+test();
diff --git a/types/network-interfaces/tsconfig.json b/types/network-interfaces/tsconfig.json
new file mode 100644
index 0000000000..f7067486d8
--- /dev/null
+++ b/types/network-interfaces/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "network-interfaces-tests.ts"
+    ]
+}
diff --git a/types/network-interfaces/tslint.json b/types/network-interfaces/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/network-interfaces/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 600f6819133666a347a147798cd7c5650313d0d0 Mon Sep 17 00:00:00 2001
From: Arne Schubert <atd.schubert@gmail.com>
Date: Tue, 17 Apr 2018 00:50:56 +0200
Subject: [PATCH 1309/1382] Add type definition for is-ci (#25016)

* Add type defintions for the is-ci package

* Apply settings from generator

* Merge changes from generator

* Set strictFunctionChecks to true
---
 types/is-ci/index.d.ts     |  8 ++++++++
 types/is-ci/is-ci-tests.ts |  5 +++++
 types/is-ci/tsconfig.json  | 23 +++++++++++++++++++++++
 types/is-ci/tslint.json    |  1 +
 4 files changed, 37 insertions(+)
 create mode 100644 types/is-ci/index.d.ts
 create mode 100644 types/is-ci/is-ci-tests.ts
 create mode 100644 types/is-ci/tsconfig.json
 create mode 100644 types/is-ci/tslint.json

diff --git a/types/is-ci/index.d.ts b/types/is-ci/index.d.ts
new file mode 100644
index 0000000000..6e9e3a7b5b
--- /dev/null
+++ b/types/is-ci/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for is-ci 1.1
+// Project: https://github.com/watson/is-ci
+// Definitions by: Arne Schubert <https://github.com/atd-schubert>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = is_ci;
+
+declare const is_ci: boolean;
diff --git a/types/is-ci/is-ci-tests.ts b/types/is-ci/is-ci-tests.ts
new file mode 100644
index 0000000000..a4f5a7c32c
--- /dev/null
+++ b/types/is-ci/is-ci-tests.ts
@@ -0,0 +1,5 @@
+import isCi = require('is-ci');
+
+let booleanValue: boolean;
+
+booleanValue = isCi;
diff --git a/types/is-ci/tsconfig.json b/types/is-ci/tsconfig.json
new file mode 100644
index 0000000000..5fed6d1779
--- /dev/null
+++ b/types/is-ci/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "is-ci-tests.ts"
+    ]
+}
diff --git a/types/is-ci/tslint.json b/types/is-ci/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/is-ci/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 521725e9abe7bab8423b72d620c8665f086da4af Mon Sep 17 00:00:00 2001
From: Mtsg <mtsg@users.noreply.github.com>
Date: Tue, 17 Apr 2018 07:51:24 +0900
Subject: [PATCH 1310/1382] Add type definitions for react-router-param-link.
 (#25004)

* Add type definitions for react-router-param-link.

* Declare TypeScript version.
---
 types/react-router-param-link/index.d.ts      | 10 ++++++++
 .../react-router-param-link-tests.tsx         |  5 ++++
 types/react-router-param-link/tsconfig.json   | 25 +++++++++++++++++++
 types/react-router-param-link/tslint.json     |  3 +++
 4 files changed, 43 insertions(+)
 create mode 100644 types/react-router-param-link/index.d.ts
 create mode 100644 types/react-router-param-link/react-router-param-link-tests.tsx
 create mode 100644 types/react-router-param-link/tsconfig.json
 create mode 100644 types/react-router-param-link/tslint.json

diff --git a/types/react-router-param-link/index.d.ts b/types/react-router-param-link/index.d.ts
new file mode 100644
index 0000000000..1b168839f5
--- /dev/null
+++ b/types/react-router-param-link/index.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for react-router-param-link 1.0
+// Project: https://github.com/mtsg/react-router-param-link
+// Definitions by: Motosugi Murata <https://github.com/mtsg>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+import * as React from "react";
+import { LinkProps } from "react-router-dom";
+
+export class ParamLink extends React.Component<LinkProps, any> { }
diff --git a/types/react-router-param-link/react-router-param-link-tests.tsx b/types/react-router-param-link/react-router-param-link-tests.tsx
new file mode 100644
index 0000000000..6de0efaef9
--- /dev/null
+++ b/types/react-router-param-link/react-router-param-link-tests.tsx
@@ -0,0 +1,5 @@
+import * as React from "react";
+import { ParamLink } from "react-router-param-link";
+
+<ParamLink to={"path"} />;
+<ParamLink to={"path/:param"} />;
diff --git a/types/react-router-param-link/tsconfig.json b/types/react-router-param-link/tsconfig.json
new file mode 100644
index 0000000000..372a4076a5
--- /dev/null
+++ b/types/react-router-param-link/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "jsx": "react",
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "forceConsistentCasingInFileNames": true,
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-router-param-link-tests.tsx"
+    ]
+}
diff --git a/types/react-router-param-link/tslint.json b/types/react-router-param-link/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/react-router-param-link/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}

From bca34de857ac0efcc4e52319a097bfe14c8d69bf Mon Sep 17 00:00:00 2001
From: Tareq El-Masri <Masriapps@gmail.com>
Date: Tue, 17 Apr 2018 00:52:31 +0200
Subject: [PATCH 1311/1382] [ADD] Typings for wix/detox (#25005)

* [ADD] Wix Detox Types

* [FIX] Detox Definiations lint error

* [FIX] Lint issues
---
 types/detox/detox-tests.ts |  22 ++
 types/detox/index.d.ts     | 408 +++++++++++++++++++++++++++++++++++++
 types/detox/tsconfig.json  |  24 +++
 types/detox/tslint.json    |   3 +
 4 files changed, 457 insertions(+)
 create mode 100644 types/detox/detox-tests.ts
 create mode 100644 types/detox/index.d.ts
 create mode 100644 types/detox/tsconfig.json
 create mode 100644 types/detox/tslint.json

diff --git a/types/detox/detox-tests.ts b/types/detox/detox-tests.ts
new file mode 100644
index 0000000000..82e3a62d3a
--- /dev/null
+++ b/types/detox/detox-tests.ts
@@ -0,0 +1,22 @@
+declare var describe: (test: string, callback: () => void) => void;
+declare var beforeAll: (callback: () => void) => void;
+declare var afterAll: (callback: () => void) => void;
+declare var test: (test: string, callback: () => void) => void;
+
+describe('Test', () => {
+    beforeAll(async () => {
+        await device.reloadReactNative();
+    });
+
+    afterAll(async () => {
+        await element(by.id('element')).clearText();
+    });
+
+    test('Test', async () => {
+        await element(by.id('element')).replaceText('text');
+        await element(by.id('element')).tap();
+        await expect(element(by.id('element')).atIndex(0)).toNotExist();
+
+        await waitFor(element(by.id('element'))).toBeVisible().withTimeout(2000);
+    });
+});
diff --git a/types/detox/index.d.ts b/types/detox/index.d.ts
new file mode 100644
index 0000000000..f4479ff4db
--- /dev/null
+++ b/types/detox/index.d.ts
@@ -0,0 +1,408 @@
+// Type definitions for detox 7.3
+// Project: https://github.com/wix/detox
+// Definitions by: Tareq El-Masri <https://github.com/TareqElMasri>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare const detox: Detox.Detox;
+declare const device: Detox.Device;
+declare const element: Detox.Element;
+declare const waitFor: Detox.WaitFor;
+declare const expect: Detox.Expect<Detox.Expect<any>>;
+declare const by: Detox.Matchers;
+
+declare namespace Detox {
+    interface Detox {
+        /**
+         * The setup phase happens inside detox.init(). This is the phase where detox reads its configuration, starts a server, loads its expection library and starts a simulator
+         * @param config
+         * @param options
+         * @example const config = require('../package.json').detox;
+         *
+         * before(async () => {
+         *      await detox.init(config);
+         * });
+         */
+        init(config: any, options: DetoxInitOptions): Promise<void>;
+        /**
+         * Artifacts currently include only logs from the app process before each task
+         * @param args
+         */
+        beforeEach(...args: any[]): Promise<void>;
+        /**
+         * Artifacts currently include only logs from the app process after each task
+         * @param args
+         */
+        afterEach(...args: any[]): Promise<void>;
+        /**
+         * The cleanup phase should happen after all the tests have finished. This is the phase where detox-server shuts down.
+         * @example after(async () => {
+         *  await detox.cleanup();
+         * });
+         */
+        cleanup(): Promise<void>;
+    }
+    interface Device {
+        /**
+         * Launch the app
+         * @param config
+         * @example // Terminate the app and launch it again. If set to false, the simulator will try to bring app from background,
+         * // if the app isn't running, it will launch a new instance. default is false
+         * await device.launchApp({newInstance: true});
+         * // Grant or deny runtime permissions for your application.
+         * await device.launchApp({permissions: {calendar: 'YES'}});
+         * // Mock opening the app from URL to test your app's deep link handling mechanism.
+         * await device.launchApp({url: url});
+         */
+        launchApp(config: DeviceLanchAppConfig): Promise<void>;
+        /**
+         * By default, terminateApp() with no params will terminate the app
+         * To terminate another app, specify its bundle id
+         * @param bundle
+         * @example await device.terminateApp('other.bundle.id');
+         */
+        terminateApp(bundle?: string): Promise<void>;
+        /**
+         * Send application to background by bringing com.apple.springboard to the foreground.
+         * Combining sendToHome() with launchApp({newInstance: false}) will simulate app coming back from background.
+         * @example await device.sendToHome();
+         * await device.launchApp({newInstance: false});
+         */
+        sendToHome(): Promise<void>;
+        /**
+         * If this is a React Native app, reload the React Native JS bundle. This action is much faster than device.launchApp(), and can be used if you just need to reset your React Native logic.
+         * @example await device.reloadReactNative()
+         */
+        reloadReactNative(): Promise<void>;
+        /**
+         * By default, installApp() with no params will install the app file defined in the current configuration.
+         * To install another app, specify its path
+         * @param path
+         * @example await device.installApp('path/to/other/app');
+         */
+        installApp(path?: any): Promise<void>;
+        /**
+         * By default, uninstallApp() with no params will uninstall the app defined in the current configuration.
+         * To uninstall another app, specify its bundle id
+         * @param bundle
+         * @example await device.installApp('other.bundle.id');
+         */
+        uninstallApp(bundle?: string): Promise<void>;
+        /**
+         * Mock opening the app from URL. sourceApp is an optional parameter to specify source application bundle id.
+         * @param url
+         */
+        openURL(url: {url: string, sourceApp?: string}): Promise<void>;
+        /**
+         * Mock handling of received user notification when app is in foreground.
+         * @param params
+         */
+        sendUserNotification(...params: any[]): Promise<void>;
+        /**
+         * Mock handling of received user activity when app is in foreground.
+         * @param params
+         */
+        sendUserActivity(...params: any[]): Promise<void>;
+        /**
+         * Takes "portrait" or "landscape" and rotates the device to the given orientation. Currently only available in the iOS Simulator.
+         * @param orientation
+         */
+        setOrientation(orientation: Orientation): Promise<void>;
+        /**
+         * Note: setLocation is dependent on fbsimctl. if fbsimctl is not installed, the command will fail, it must be installed. Sets the simulator location to the given latitude and longitude.
+         * @param lat
+         * @param lon
+         * @example await device.setLocation(32.0853, 34.7818);
+         */
+        setLocation(lat: number, lon: number): Promise<void>;
+        /**
+         * Disable EarlGrey's network synchronization mechanism on preffered endpoints. Usful if you want to on skip over synchronizing on certain URLs.
+         * @param urls
+         * @example await device.setURLBlacklist(['.*127.0.0.1.*']);
+         */
+        setURLBlacklist(urls: string[]): Promise<void>;
+        /**
+         * Enable EarlGrey's synchronization mechanism (enabled by default). This is being reset on every new instance of the app.
+         * @example await device.enableSynchronization();
+         */
+        enableSynchronization(): Promise<void>;
+        /**
+         * Disable EarlGrey's synchronization mechanism (enabled by default) This is being reset on every new instance of the app.
+         * @example await device.disableSynchronization();
+         */
+        disableSynchronization(): Promise<void>;
+        /**
+         * Resets the Simulator to clean state (like the Simulator > Reset Content and Settings... menu item), especially removing previously set permissions.
+         * @example await device.resetContentAndSettings();
+         */
+        resetContentAndSettings(): Promise<void>;
+        /**
+         * Returns the current device, ios or android.
+         * @example if (device.getPlatform() === 'ios') {
+         *     await expect(loopSwitch).toHaveValue('1');
+         * }
+         */
+        getPlatform(): "ios" | "android";
+        /**
+         * Simulate shake (iOS Only)
+         */
+        shake(): Promise<void>;
+    }
+
+    type DetoxAny = Element & Actions<any> & WaitFor;
+
+    interface Element {
+        (by: Matchers): DetoxAny;
+
+        /**
+         * Select by parent element
+         * @param parent
+         * @example await element(by.id('Grandson883').withAncestor(by.id('Son883')));
+         */
+        withAncestor(parent: Element): DetoxAny;
+        /**
+         * Select by child element
+         * @param parent
+         * @example await element(by.id('Son883').withDescendant(by.id('Grandson883')));
+         */
+        withDescendant(child: Element): DetoxAny;
+        /**
+         * Choose from multiple elements matching the same matcher using index
+         * @param index
+         * @example await element(by.text('Product')).atIndex(2);
+         */
+        atIndex(index: number): DetoxAny;
+    }
+    interface Matchers {
+        /**
+         * by.id will match an id that is given to the view via testID prop.
+         * @param id
+         * @example // In a React Native component add testID like so:
+         * <TouchableOpacity testID={'tap_me'}>
+         * // Then match with by.id:
+         * await element(by.id('tap_me'));
+         */
+        id(id: string): Matchers;
+        /**
+         * Find an element by text, useful for text fields, buttons.
+         * @param text
+         * @example await element(by.text('Tap Me'));
+         */
+        text(text: string): Matchers;
+        /**
+         * Find an element by accessibilityLabel on iOS, or by contentDescription on Android.
+         * @param label
+         * @example await element(by.label('Welcome'));
+         */
+        label(label: string): Matchers;
+        /**
+         * Find an element by native view type.
+         * @param nativeViewType
+         * @example await element(by.type('RCTImageView'));
+         */
+        type(nativeViewType: string): Matchers;
+        /**
+         * Find an element with an accessibility trait. (iOS only)
+         * @example await element(by.traits(['button']));
+         */
+        traits(traits: string[]): Matchers;
+    }
+    interface Expect<R> {
+        (element: Element): Expect<any>;
+        /**
+         * Expect the view to be at least 75% visible.
+         * @example await expect(element(by.id('UniqueId204'))).toBeVisible();
+         */
+        toBeVisible(): R;
+        /**
+         * Expect the view to not be visible.
+         * @example await expect(element(by.id('UniqueId205'))).toBeNotVisible();
+         */
+        toBeNotVisible(): R;
+        /**
+         * Expect the view to exist in the UI hierarchy.
+         * @example await expect(element(by.id('UniqueId205'))).toExist();
+         */
+        toExist(): R;
+        /**
+         * Expect the view to not exist in the UI hierarchy.
+         * @example await expect(element(by.id('RandomJunk959'))).toNotExist();
+         */
+        toNotExist(): R;
+        /**
+         * In React Native apps, expect UI component of type <Text> to have text.
+         * In native iOS apps, expect UI elements of type UIButton, UILabel, UITextField or UITextViewIn to have inputText with text.
+         * @param text
+         * @example await expect(element(by.id('UniqueId204'))).toHaveText('I contain some text');
+         */
+        toHaveText(text: string): R;
+        /**
+         * It searches by accessibilityLabel on iOS, or by contentDescription on Android.
+         * In React Native it can be set for both platforms by defining an accessibilityLabel on the view.
+         * @param label
+         * @example await expect(element(by.id('UniqueId204'))).toHaveLabel('Done');
+         */
+        toHaveLabel(label: string): R;
+        /**
+         * In React Native apps, expect UI component to have testID with that id.
+         * In native iOS apps, expect UI element to have accesibilityIdentifier with that id.
+         * @param id
+         * @example await expect(element(by.text('I contain some text'))).toHaveId('UniqueId204');
+         */
+        toHaveId(id: string): R;
+        /**
+         * Expect components like a Switch to have a value ('0' for off, '1' for on).
+         * @param value
+         * @example await expect(element(by.id('UniqueId533'))).toHaveValue('0');
+         */
+        toHaveValue(value: any): R;
+    }
+    interface WaitFor {
+        /**
+         * This API polls using the given expectation continuously until the expectation is met. Use manual synchronization with waitFor only as a last resort.
+         * NOTE: Every waitFor call must set a timeout using withTimeout(). Calling waitFor without setting a timeout will do nothing.
+         * @example await waitFor(element(by.id('UniqueId336'))).toExist().withTimeout(2000);
+         */
+        (element: Element): Expect<WaitFor>;
+        /**
+         * Waits for the condition to be met until the specified time (millis) have elapsed.
+         * @param millis number
+         * @example await waitFor(element(by.id('UniqueId336'))).toExist().withTimeout(2000);
+         */
+        withTimeout(millis: number): Promise<void>;
+        /**
+         * Performs the action repeatedly on the element until an expectation is met
+         * @param element
+         * @example await waitFor(element(by.text('Text5'))).toBeVisible().whileElement(by.id('ScrollView630')).scroll(50, 'down');
+         */
+        whileElement(by: Matchers): Element;
+    }
+    interface Actions<R> {
+        /**
+         * Simulate tap on an element
+         * @example await element(by.id('tappable')).tap();
+         */
+        tap(): Promise<Actions<R>>;
+        /**
+         * Simulate long press on an element
+         * @example await element(by.id('tappable')).longPress();
+         */
+        longPress(): Promise<Actions<R>>;
+        /**
+         * Simulate multiple taps on an element.
+         * @param times number
+         * @example await element(by.id('tappable')).multiTap(3);
+         */
+        multiTap(times: number): Promise<Actions<R>>;
+        /**
+         * Simulate tap at a specific point on an element.
+         * Note: The point coordinates are relative to the matched element and the element size could changes on different devices or even when changing the device font size.
+         * @param point
+         * @example await element(by.id('tappable')).tapAtPoint({ x:5, y:10 });
+         */
+        tapAtPoint(point: { x: number, y: number }): Promise<Actions<R>>;
+        /**
+         * Use the builtin keyboard to type text into a text field.
+         * @param text
+         * @example await element(by.id('textField')).typeText('passcode');
+         */
+        typeText(text: string): Promise<Actions<R>>;
+        /**
+         * Paste text into a text field.
+         * @param text
+         * @example await element(by.id('textField')).replaceText('passcode again');
+         */
+        replaceText(text: string): Promise<Actions<R>>;
+        /**
+         * Clear text from a text field.
+         * @example await element(by.id('textField')).clearText();
+         */
+        clearText(): Promise<Actions<R>>;
+        /**
+         *
+         * @param pixels
+         * @param direction
+         * @example
+         * await element(by.id('scrollView')).scroll(100, 'down');
+         * await element(by.id('scrollView')).scroll(100, 'up');
+         */
+        scroll(pixels: number, direction: Direction): Actions<Promise<R>>;
+        /**
+         * Scroll to edge.
+         * @param edge
+         * @example await element(by.id('scrollView')).scrollTo('bottom');
+         * await element(by.id('scrollView')).scrollTo('top');
+         */
+        scrollTo(edge: Direction): Actions<Promise<R>>;
+        /**
+         *
+         * @param direction
+         * @param speed
+         * @param percentage
+         * @example await element(by.id('scrollView')).swipe('down');
+         * await element(by.id('scrollView')).swipe('down', 'fast');
+         * await element(by.id('scrollView')).swipe('down', 'fast', 0.5);
+         */
+        swipe(direction: Direction, speed?: Speed, percentage?: number): Actions<Promise<R>>;
+        /**
+         * (iOS Only) column - number of datepicker column (starts from 0) value - string value in setted column (must be correct)
+         * @param column
+         * @param value
+         * @example await expect(element(by.type('UIPickerView'))).toBeVisible();
+         * await element(by.type('UIPickerView')).setColumnToValue(1,"6");
+         * await element(by.type('UIPickerView')).setColumnToValue(2,"34");
+         */
+        setColumnToValue(column: number, value: string): Actions<Promise<R>>;
+    }
+
+    type Direction = "left" | "right" | "top" | "bottom" | "up" | "down";
+    type Orientation = "portrait" | "landscape";
+    type Speed = "fast" | "slow";
+
+    interface DetoxInitOptions {
+        /**
+         * Detox exports device, expect, element, by and waitFor as globals by default, if you want to control their initialization manually, set init detox with initGlobals set to false.
+         * This is useful when during E2E tests you also need to run regular expectations in node. jest Expect for instance, will not be overriden by Detox when this option is used.
+         */
+        initGlobals?: boolean;
+        /**
+         * By default await detox.init(config); will launch the installed app. If you wish to control when your app is launched, add {launchApp: false} param to your init.
+         */
+        launchApp?: boolean;
+    }
+
+    interface DeviceLanchAppConfig {
+        /**
+         * Restart the app
+         * Terminate the app and launch it again. If set to false, the simulator will try to bring app from background, if the app isn't running, it will launch a new instance. default is false
+         */
+        newInstance?: boolean;
+        /**
+         * Set runtime permissions
+         * Grant or deny runtime permissions for your application.
+         */
+        permissions?: any;
+        /**
+         * Launch from URL
+         * Mock opening the app from URL to test your app's deep link handling mechanism.
+         */
+        url?: any;
+        /**
+         * Launch with user notifications
+         */
+        userNotification?: any;
+        /**
+         * Launch with user activity
+         */
+        userActivity?: any;
+        /**
+         * Launch into a fresh installation
+         * A flag that enables relaunching into a fresh installation of the app (it will uninstall and install the binary again), default is false.
+         */
+        delete?: boolean;
+        /**
+         * Detox can start the app with additional launch arguments
+         * The added launchArgs will be passed through the launch command to the device and be accessible via [[NSProcessInfo processInfo] arguments]
+         */
+        launchArgs?: any;
+    }
+}
diff --git a/types/detox/tsconfig.json b/types/detox/tsconfig.json
new file mode 100644
index 0000000000..2d1a22fb79
--- /dev/null
+++ b/types/detox/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "target": "ES2015",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "detox-tests.ts"
+    ]
+}
diff --git a/types/detox/tslint.json b/types/detox/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/detox/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}

From 228dd564c076177351aaaf783f5c90bf1e7856fb Mon Sep 17 00:00:00 2001
From: Pine Mizune <pinemz@gmail.com>
Date: Tue, 17 Apr 2018 09:40:11 +0900
Subject: [PATCH 1312/1382] add `event-hooks-webpack-plugin` (#24998)

---
 .../event-hooks-webpack-plugin-tests.ts       | 32 ++++++++++++++
 types/event-hooks-webpack-plugin/index.d.ts   | 42 +++++++++++++++++++
 .../event-hooks-webpack-plugin/tsconfig.json  | 23 ++++++++++
 types/event-hooks-webpack-plugin/tslint.json  |  1 +
 4 files changed, 98 insertions(+)
 create mode 100644 types/event-hooks-webpack-plugin/event-hooks-webpack-plugin-tests.ts
 create mode 100644 types/event-hooks-webpack-plugin/index.d.ts
 create mode 100644 types/event-hooks-webpack-plugin/tsconfig.json
 create mode 100644 types/event-hooks-webpack-plugin/tslint.json

diff --git a/types/event-hooks-webpack-plugin/event-hooks-webpack-plugin-tests.ts b/types/event-hooks-webpack-plugin/event-hooks-webpack-plugin-tests.ts
new file mode 100644
index 0000000000..b55f55d85f
--- /dev/null
+++ b/types/event-hooks-webpack-plugin/event-hooks-webpack-plugin-tests.ts
@@ -0,0 +1,32 @@
+import EventHooksPlugin = require('event-hooks-webpack-plugin');
+
+new EventHooksPlugin({});
+new EventHooksPlugin({
+    done: () => {},
+});
+new EventHooksPlugin({
+    shouldEmit: () => {},
+    done: () => {},
+    additionalPass: () => {},
+    beforeRun: () => {},
+    run: () => {},
+    emit: () => {},
+    afterEmit: () => {},
+    thisCompilation: () => {},
+    compilation: () => {},
+    normalModuleFactory: () => {},
+    contextModuleFactory: () => {},
+    beforeCompile: () => {},
+    compile: () => {},
+    make: () => {},
+    afterCompile: () => {},
+    watchRun: () => {},
+    failed: () => {},
+    invalid: () => {},
+    watchClose: () => {},
+    environment: () => {},
+    afterEnvironment: () => {},
+    afterPlugins: () => {},
+    afterResolvers: () => {},
+    entryOption: () => {},
+});
diff --git a/types/event-hooks-webpack-plugin/index.d.ts b/types/event-hooks-webpack-plugin/index.d.ts
new file mode 100644
index 0000000000..ceb78cd3e6
--- /dev/null
+++ b/types/event-hooks-webpack-plugin/index.d.ts
@@ -0,0 +1,42 @@
+// Type definitions for event-hooks-webpack-plugin 2.0
+// Project: https://github.com/cascornelissen/event-hooks-webpack-plugin
+// Definitions by: Pine Mizune <https://github.com/pine>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { Plugin } from 'webpack';
+
+export = EventHooksPlugin;
+
+declare namespace EventHooksPlugin {
+    interface Options {
+        shouldEmit?: () => void;
+        done?: () => void;
+        additionalPass?: () => void;
+        beforeRun?: () => void;
+        run?: () => void;
+        emit?: () => void;
+        afterEmit?: () => void;
+        thisCompilation?: () => void;
+        compilation?: () => void;
+        normalModuleFactory?: () => void;
+        contextModuleFactory?: () => void;
+        beforeCompile?: () => void;
+        compile?: () => void;
+        make?: () => void;
+        afterCompile?: () => void;
+        watchRun?: () => void;
+        failed?: () => void;
+        invalid?: () => void;
+        watchClose?: () => void;
+        environment?: () => void;
+        afterEnvironment?: () => void;
+        afterPlugins?: () => void;
+        afterResolvers?: () => void;
+        entryOption?: () => void;
+    }
+}
+
+declare class EventHooksPlugin extends Plugin {
+    constructor(options?: EventHooksPlugin.Options);
+}
diff --git a/types/event-hooks-webpack-plugin/tsconfig.json b/types/event-hooks-webpack-plugin/tsconfig.json
new file mode 100644
index 0000000000..51562ab223
--- /dev/null
+++ b/types/event-hooks-webpack-plugin/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "event-hooks-webpack-plugin-tests.ts"
+    ]
+}
diff --git a/types/event-hooks-webpack-plugin/tslint.json b/types/event-hooks-webpack-plugin/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/event-hooks-webpack-plugin/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 0bab723bac6ce966d1364b694029d74908851d9a Mon Sep 17 00:00:00 2001
From: Eugene Matseruk <36712576+ematseruk@users.noreply.github.com>
Date: Tue, 17 Apr 2018 03:41:11 +0300
Subject: [PATCH 1313/1382] Implement typings for v4.2 of
 http://idangero.us/swiper (#24898)

- Move typings for v3 to the separate v3 folder
 - Implement typings for v4.2
 - Implement tests for typings
---
 types/swiper/index.d.ts         | 670 +++++++++++++---------
 types/swiper/swiper-tests.ts    | 980 +++++++++++++++++++-------------
 types/swiper/tsconfig.json      |   2 +-
 types/swiper/v3/index.d.ts      | 339 +++++++++++
 types/swiper/v3/swiper-tests.ts | 563 ++++++++++++++++++
 types/swiper/v3/tsconfig.json   |  33 ++
 types/swiper/v3/tslint.json     |   8 +
 7 files changed, 1919 insertions(+), 676 deletions(-)
 create mode 100644 types/swiper/v3/index.d.ts
 create mode 100644 types/swiper/v3/swiper-tests.ts
 create mode 100644 types/swiper/v3/tsconfig.json
 create mode 100644 types/swiper/v3/tslint.json

diff --git a/types/swiper/index.d.ts b/types/swiper/index.d.ts
index 65872facd2..19c381fe28 100644
--- a/types/swiper/index.d.ts
+++ b/types/swiper/index.d.ts
@@ -1,12 +1,195 @@
-// Type definitions for Swiper 3.4
+// Type definitions for Swiper 4.2
 // Project: https://github.com/nolimits4web/Swiper
-// Definitions by: Sebastián Galiano <https://github.com/sgaliano>, Luca Trazzi <https://github.com/lucax88x>
+// Definitions by: Sebastián Galiano <https://github.com/sgaliano>, Luca Trazzi <https://github.com/lucax88x>, Eugene Matseruk <https://github.com/ematseruk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.7
+
+type CommonEvent =
+    | 'init'
+    | 'beforeDestroy'
+    | 'slideChange'
+    | 'slideChangeTransitionStart'
+    | 'slideChangeTransitionEnd'
+    | 'slideNextTransitionStart'
+    | 'slideNextTransitionEnd'
+    | 'slidePrevTransitionStart'
+    | 'slidePrevTransitionEnd'
+    | 'transitionStart'
+    | 'transitionEnd'
+    | 'touchStart'
+    | 'touchMove'
+    | 'touchMoveOpposite'
+    | 'sliderMove'
+    | 'touchEnd'
+    | 'click'
+    | 'tap'
+    | 'doubleTap'
+    | 'imagesReady'
+    | 'progress'
+    | 'reachBeginning'
+    | 'reachEnd'
+    | 'fromEdge'
+    | 'setTranslate'
+    | 'setTransition'
+    | 'resize';
+
+type PaginationEvent = 'paginationRender' | 'paginationUpdate';
+type AutoplayEvent = 'autoplayStart' | 'autoplayStop' | 'autoplay';
+type LazyLoadingEvent = 'lazyImageLoad' | 'lazyImageReady';
+
+type SwiperEvent = CommonEvent | PaginationEvent | AutoplayEvent | LazyLoadingEvent;
+
+interface NavigationOptions {
+    nextEl?: string | HTMLElement;
+    prevEl?: string | HTMLElement;
+    hideOnClick?: boolean;
+    disabledClass?: string;
+    hiddenClass?: string;
+}
+
+interface PaginationOptions {
+    el?: string;
+    type?: 'bullets' | 'fraction' | 'progressbar' | 'custom';
+    bulletElement?: string;
+    dynamicBullets?: boolean;
+    dynamicMainBullets?: number;
+    hideOnClick?: boolean;
+    clickable?: boolean;
+    progressbarOpposite?: boolean;
+
+    bulletClass?: string;
+    bulletActiveClass?: string;
+    modifierClass?: string;
+    currentClass?: string;
+    totalClass?: string;
+    hiddenClass?: string;
+    progressbarFillClass?: string;
+    clickableClass?: string;
+
+    renderBullet?: (index: number, className: string) => void;
+    renderFraction?: (currentClass: string, totalClass: string) => void;
+    renderProgressbar?: (progressbarFillClass: string) => void;
+    renderCustom?: (swiper: Swiper, current: number, total: number) => void;
+}
+
+interface ScrollbarOptions {
+    el?: string | HTMLElement;
+    hide?: boolean;
+    draggable?: boolean;
+    snapOnRelease?: boolean;
+    dragSize?: 'auto' | number;
+    lockClass?: 'string';
+    dragClass?: 'string';
+}
+
+interface AutoplayOptions {
+    delay?: number;
+    stopOnLastSlide?: boolean;
+    disableOnInteraction?: boolean;
+    reverseDirection?: boolean;
+    waitForTransition?: boolean;
+}
+
+interface LazyLoadingOptions {
+    loadPrevNext?: string;
+    loadPrevNextAmount?: number;
+    loadOnTransitionStart?: boolean;
+    elementClass?: string;
+    loadingClass?: string;
+    loadedClass?: string;
+    preloaderClass?: string;
+}
+
+interface FadeEffectOptions {
+    crossFade: boolean;
+}
+
+interface CoverflowEffectOptions {
+    slideShadows?: boolean;
+    rotate?: number;
+    stretch?: number;
+    depth?: number;
+    modifier?: number;
+}
+
+interface FlipEffectOptions {
+    slideShadows?: boolean;
+    limitRotation?: boolean;
+}
+
+interface CubeEffectOptions {
+    slideShadows?: boolean;
+    shadow?: boolean;
+    shadowOffset: number;
+    shadowScale: number;
+}
+
+interface ZoomOptions {
+    maxRatio?: number;
+    minRatio?: number;
+    toggle?: boolean;
+    containerClass?: string;
+    zoomedSlideClass?: string;
+}
+
+interface KeyboardControlOptions {
+    enabled?: boolean;
+    onlyInViewport?: boolean;
+}
+
+interface MouseWheelControlOptions {
+    forceToAxis?: boolean;
+    releaseOnEdges?: boolean;
+    invert?: boolean;
+    sensitivity?: number;
+    eventsTarged?: string | HTMLElement;
+}
+
+interface VirtualSlidesRenderExternalData {
+    offset: number;
+    from: number;
+    to: number;
+    slides: any[];
+}
+
+interface VirtualSlidesOptions {
+    slides?: any[];
+    cache?: boolean;
+    renderSlide?: (slide: any, index: number) => void;
+    renderExternal?: (data: VirtualSlidesRenderExternalData) => void;
+}
+
+interface HashNavigationOptions {
+    watchState?: boolean;
+    replaceState?: boolean;
+}
+
+interface HistoryNavigationOptions {
+    replaceState?: boolean;
+    key?: string;
+}
+
+interface ControllerOptions {
+    control: Swiper;
+    inverse: boolean;
+    by: 'slide' | 'container';
+}
+
+interface AccessibilityOptions {
+    enabled?: boolean;
+    prevSlideMessage?: string;
+    nextSlideMessage?: string;
+    firstSlideMessage?: string;
+    lastSlideMessage?: string;
+    paginationBulletMessage?: string;
+    notificationClass?: string;
+}
 
 interface SwiperOptions {
+    // General parameters
+    init?: boolean;
     initialSlide?: number;
-    direction?: string;
+    direction?: 'horizontal' | 'vertical';
     speed?: number;
     setWrapperSize?: boolean;
     virtualTranslate?: boolean;
@@ -15,15 +198,61 @@ interface SwiperOptions {
     autoHeight?: boolean;
     roundLengths?: boolean;
     nested?: boolean;
+    uniqueNavElements?: boolean;
+    effect?: 'slide' | 'fade' | 'cube' | 'coverflow' | 'flip';
+    runCallbacksOnInit?: boolean;
+    watchOverflow?: boolean;
+    on?: {[key in SwiperEvent]?: () => void };
 
-    // Autoplay
-    autoplay?: number;
-    autoplayStopOnLast?: boolean;
-    autoplayDisableOnInteraction?: boolean;
+    // Slides grid
+    spaceBetween?: number;
+    slidesPerView?: 'auto' | number;
+    slidesPerColumn?: number;
+    slidesPerColumnFill?: 'row' | 'column';
+    slidesPerGroup?: number;
+    centeredSlides?: boolean;
+    slidesOffsetBefore?: number;
+    slidesOffsetAfter?: number;
+    normalizeSlideIndex?: boolean;
 
-    // Progress
-    watchSlidesProgress?: boolean;
-    watchSlidesVisibility?: boolean;
+    // Grab cursor
+    grabCursor?: boolean;
+
+    // Touches
+    touchEventsTarget?: 'container' | 'wrapper';
+    touchRatio?: number;
+    touchAngle?: number;
+    simulateTouch?: boolean;
+    shortSwipes?: boolean;
+    longSwipes?: boolean;
+    longSwipesRatio?: number;
+    longSwipesMs?: number;
+    followFinger?: boolean;
+    allowTouchMove?: boolean;
+    threshold?: number;
+    touchMoveStopPropagation?: boolean;
+    iOSEdgeSwipeDetection?: boolean;
+    iOSEdgeSwipeThreshold?: number;
+    touchReleaseOnEdges?: boolean;
+    passiveListeners?: boolean;
+
+    // Touch Resistance
+    resistance?: boolean;
+    resistanceRatio?: number;
+
+    // Swiping / No swiping
+    preventIntercationOnTransition?: boolean;
+    allowSlidePrev?: boolean;
+    allowSlideNext?: boolean;
+    noSwiping?: boolean;
+    noSwipingClass?: string;
+    noSwipingSelector?: string;
+    swipeHandler?: string | HTMLElement;
+
+    // Clicks
+    preventClicks?: boolean;
+    preventClicksPropagation?: boolean;
+    slideToClickedSlide?: boolean;
 
     // Freemode
     freeMode?: boolean;
@@ -35,305 +264,198 @@ interface SwiperOptions {
     freeModeMinimumVelocity?: number;
     freeModeSticky?: boolean;
 
-    // Effects
-    effect?: string;
-    fade?: {};
-    cube?: {};
-    coverflow?: {};
-    flip?: {};
-
-    // Parallax
-    parallax?: boolean;
-
-    // Slides grid
-    spaceBetween?: number;
-    slidesPerView?: number | string;
-    slidesPerColumn?: number;
-    slidesPerColumnFill?: string;
-    slidesPerGroup?: number;
-    centeredSlides?: boolean;
-    slidesOffsetBefore?: number;
-    slidesOffsetAfter?: number;
-
-    // Grab Cursor
-    grabCursor?: boolean;
-
-    // Touches
-    touchEventsTarget?: string;
-    touchRatio?: number;
-    touchAngle?: number;
-    simulateTouch?: boolean;
-    shortSwipes?: boolean;
-    longSwipes?: boolean;
-    longSwipesRatio?: number;
-    longSwipesMs?: number;
-    followFinger?: boolean;
-    onlyExternal?: boolean;
-    threshold?: number;
-    touchMoveStopPropagation?: boolean;
-    iOSEdgeSwipeDetection?: boolean;
-    iOSEdgeSwipeThreshold?: number;
-
-    // Touch Resistance
-    resistance?: boolean;
-    resistanceRatio?: number;
-
-    // Clicks
-    preventClicks?: boolean;
-    preventClicksPropagation?: boolean;
-    slideToClickedSlide?: boolean;
-
-    // Swiping / No swiping
-    allowSwipeToPrev?: boolean;
-    allowSwipeToNext?: boolean;
-    noSwiping?: boolean;
-    noSwipingClass?: string;
-    swipeHandler?: string | Element;
-
-    // Navigation Controls
-    uniqueNavElements?: boolean;
-
-    // Pagination
-    pagination?: string | Element;
-    paginationType?: string;
-    paginationHide?: boolean;
-    paginationClickable?: boolean;
-    paginationElement?: string;
-    paginationBulletRender?(swiper: Swiper, index: number, className: string): void;
-    paginationFractionRender?(swiper: Swiper, currentClassName: string, totalClassName: string): void;
-    paginationProgressRender?(swiper: Swiper, progressbarClass: string): void;
-    paginationCustomRender?(swiper: Swiper, current: number, total: number): void;
-
-    // Navigation Buttons
-    nextButton?: string | Element;
-    prevButton?: string | Element;
-
-    // Scollbar
-    scrollbar?: string | Element | SwiperScrollbarOptions;
-    scrollbarHide?: boolean;
-    scrollbarDraggable?: boolean;
-    scrollbarSnapOnRelease?: boolean;
-
-    // Accessibility
-    a11y?: boolean;
-    prevSlideMessage?: string;
-    nextSlideMessage?: string;
-    firstSlideMessage?: string;
-    lastSlideMessage?: string;
-    paginationBulletMessage?: string;
-
-    // Keyboard / Mousewheel
-    keyboardControl?: boolean;
-    mousewheelControl?: boolean;
-    mousewheelForceToAxis?: boolean;
-    mousewheelReleaseOnEdges?: boolean;
-    mousewheelInvert?: boolean;
-    mousewheelSensitivity?: number;
-
-    // Hash Navigation
-    hashnav?: boolean;
-    hashnavWatchState?: boolean;
-    history?: string;
+    // Progress
+    watchSlidesProgress?: boolean;
+    watchSlidesVisibility?: boolean;
 
     // Images
     preloadImages?: boolean;
     updateOnImagesReady?: boolean;
-    lazyLoading?: boolean;
-    lazyLoadingInPrevNext?: boolean;
-    lazyLoadingInPrevNextAmount?: number;
-    lazyLoadingOnTransitionStart?: boolean;
-
     // Loop
     loop?: boolean;
     loopAdditionalSlides?: number;
     loopedSlides?: number;
+    loopFillGroupWithBlank?: boolean;
 
-    zoom?: boolean;
-
-    // Controller
-    control?: Swiper;
-    controlInverse?: boolean;
-    controlBy?: string;
+    // Breakpoints
+    breakpoints?: {
+        // TODO: extract possible parameters for breakpoints to separate interface
+        [index: number]: any;
+    };
 
     // Observer
     observer?: boolean;
     observeParents?: boolean;
 
-    // Breakpoints
-    breakpoints?: {};
-
-    // Callbacks
-    runCallbacksOnInit?: boolean;
-    onInit?(swiper: Swiper): void;
-    onSlideChangeStart?(swiper: Swiper): void;
-    onSlideChangeEnd?(swiper: Swiper): void;
-    onSlideNextStart?(swiper: Swiper): void;
-    onSlideNextEnd?(swiper: Swiper): void;
-    onSlidePrevStart?(swiper: Swiper): void;
-    onSlidePrevEnd?(swiper: Swiper): void;
-    onTransitionStart?(swiper: Swiper): void;
-    onTransitionEnd?(swiper: Swiper): void;
-    onTouchStart?(swiper: Swiper, event: Event): void;
-    onTouchMove?(swiper: Swiper, event: Event): void;
-    onTouchMoveOpposite?(swiper: Swiper, event: Event): void;
-    onSliderMove?(swiper: Swiper, event: Event): void;
-    onTouchEnd?(swiper: Swiper, event: Event): void;
-    onClick?(swiper: Swiper, event: Event): void;
-    onTap?(swiper: Swiper, event: Event): void;
-    onDoubleTap?(swiper: Swiper, event: Event): void;
-    onImagesReady?(swiper: Swiper): void;
-    onProgress?(swiper: Swiper, progress: number): void;
-    onReachBeginning?(swiper: Swiper): void;
-    onReachEnd?(swiper: Swiper): void;
-    onDestroy?(swiper: Swiper): void;
-    onSetTranslate?(swiper: Swiper, translate: any): void;
-    onSetTransition?(swiper: Swiper, transition: any): void;
-    onAutoplay?(swiper: Swiper): void;
-    onAutoplayStart?(swiper: Swiper): void;
-    onAutoplayStop?(swiper: Swiper): void;
-    onLazyImageLoad?(swiper: Swiper, slide: any, image: any): void;
-    onLazyImageReady?(swiper: Swiper, slide: any, image: any): void;
-    onPaginationRendered?(swiper: Swiper, paginationContainer: any): void;
-    onScroll?(swiper: Swiper, event: Event): void;
-    onBeforeResize?(swiper: Swiper): void;
-    onAfterResize?(swiper: Swiper): void;
-    onKeyPress?(swiper: Swiper, kc: any): void;
-
     // Namespace
+    containerModifierClass?: string;
     slideClass?: string;
     slideActiveClass?: string;
+    slideDuplicatedActiveClass?: string;
     slideVisibleClass?: string;
     slideDuplicateClass?: string;
     slideNextClass?: string;
+    slideDuplicatedNextClass?: string;
     slidePrevClass?: string;
+    slideDuplicatedPrevClass?: string;
     wrapperClass?: string;
-    bulletClass?: string;
-    bulletActiveClass?: string;
-    paginationHiddenClass?: string;
-    paginationCurrentClass?: string;
-    paginationTotalClass?: string;
-    paginationProgressbarClass?: string;
-    buttonDisabledClass?: string;
+
+    // Components
+    navigation?: NavigationOptions;
+    pagination?: PaginationOptions;
+    scrollbar?: ScrollbarOptions;
+    autoplay?: AutoplayOptions;
+    parallax?: boolean;
+    lazy?: LazyLoadingOptions | boolean;
+    fadeEffect?: FadeEffectOptions;
+    coverflowEffect?: CoverflowEffectOptions;
+    flipEffect?: FlipEffectOptions;
+    cubeEffect?: CubeEffectOptions;
+    zoom?: ZoomOptions | boolean;
+    keyboard?: KeyboardControlOptions | boolean;
+    mousewheel?: MouseWheelControlOptions | boolean;
+    virtual?: VirtualSlidesOptions;
+    hashNavigation?: HashNavigationOptions;
+    history?: HistoryNavigationOptions;
+    controller?: ControllerOptions;
+    a11y?: AccessibilityOptions;
 }
 
-interface SwiperScrollbarOptions {
-    container: string;          // Default: '.swiper-scrollbar'
-    draggable?: boolean;        // Default: true
-    hide?: boolean;             // Default: true
-    snapOnRelease?: boolean;    // Default: false
+interface Navigation {
+    nextEl: HTMLElement;
+    prevEl: HTMLElement;
+    update: () => void;
+}
+interface Pagination {
+    el: HTMLElement;
+    // TODO: dom7 like array
+    bullets: any[];
+
+    render: () => void;
+    update: () => void;
 }
 
-declare class SwiperSlide {
-    append(): SwiperSlide;
-    clone(): SwiperSlide;
-    getWidth(): number;
-    getHeight(): number;
-    getOffset(): { top: number; left: number; };
-    insertAfter(index: number): SwiperSlide;
-    prepend(): SwiperSlide;
-    remove(): void;
+interface Scrollbar {
+    eL: HTMLElement;
+    dragEl: HTMLElement;
+
+    updateSize: () => void;
+}
+
+interface Autoplay {
+    running: boolean;
+
+    start: () => void;
+    stop: () => void;
+}
+
+interface LazyLoading {
+    load: () => void;
+    loadInSlide: (index: number) => void;
+}
+
+interface Zoom {
+    enabled: boolean;
+    scale: number;
+
+    enable: () => void;
+    disable: () => void;
+    in: () => void;
+    out: () => void;
+    toggle: () => void;
+}
+
+// Keyboard and Mousewheel control
+interface Control {
+    enabled: boolean;
+
+    enable: () => void;
+    disable: () => void;
+}
+
+interface VirtualSlides {
+    cache: any;
+    from: number;
+    to: number;
+    slides: any[];
+
+    appendSlide: (slide: any) => void;
+    prependSlide: (slide: any) => void;
+    update: () => void;
+}
+
+interface Controller {
+    control: Swiper;
 }
 
 declare class Swiper {
-    constructor(container: string | Element, options?: SwiperOptions);
+    constructor(container: string | Element, parameters?: SwiperOptions);
 
     // Properties
+    params: SwiperOptions;
+    // TODO: dom7 element
+    $el: any;
+    // TODO: dom7 element
+    $wrapperEl: any;
+    slides: HTMLElement[];
     width: number;
     height: number;
-    params: any;
-    positions: any;
-    wrapper: any;
-    virtualSize: number;
-
-    // Feature detection
-    support: {
-        touch: boolean;
-        transforms: boolean;
-        transforms3d: boolean;
-        transitions: boolean;
-    };
-
-    // Browser detection
-    browser: {
-        ie8: boolean;
-        ie10: boolean;
-    };
-
-    // Navigation
+    translate: number;
+    progress: number;
     activeIndex: number;
-    activeLoopIndex: number;
-    activeLoaderIndex: number;
+    realIndex: number;
     previousIndex: number;
-    swipeNext(internal?: boolean): boolean;
-    swipePrev(internal?: boolean): boolean;
-    swipeReset(): boolean;
-    swipeTo(index: number, speed?: number, runCallbacks?: boolean): boolean;
-    activeSlide(): SwiperSlide;
-    updateActiveSlide(index: number): void;
-
-    // Events
-    touches: any;
-    isTouched: boolean;
-    clickedSlideIndex: number;
-    clickedSlide: SwiperSlide;
-    wrapperTransitionEnd(callback: () => void, permanent: boolean): void;
-
-    // Init/reset
-    destroy(deleteInstance: boolean, cleanupStyles: boolean): void;
-    reInit(forceCalcSlides?: boolean): void;
-    resizeFix(reInit?: boolean): void;
-
-    // Autoplaying
-    autoplay: boolean;
-    startAutoplay(): void;
-    stopAutoplay(): void;
-
-    // Other methods
-    getWrapperTranslate(axis: string): number;  // 'x' or 'y'
-    setWrapperTranslate(x: number, y: number, z: number): void;
-    setWrapperTransition(duration: any): void;
-
-    // Slides API
-
-    slides: SwiperSlide[];
-
-    slidePrev(runCallbacks?: boolean, speed?: number): void;
-    slideNext(runCallbacks?: boolean, speed?: number): void;
-    slideTo(index: number, speed?: number, runCallbacks?: boolean): void;
-    update(updateTranslate?: boolean): void;
-    onResize(): void;
-    detachEvents(): void;
-    attachEvents(): void;
-
-    appendSlide(slides: HTMLElement | string | string[]): void;
-    prependSlide(slides: HTMLElement | string | string[]): void;
-    removeSlide(slideIndex: number): void;
-    removeAllSlides(): void;
-
-    lockSwipeToNext(): void;
-    unlockSwipeToNext(): void;
-    lockSwipeToPrev(): void;
-    unlockSwipeToPrev(): void;
-    lockSwipes(): void;
-    unlockSwipes(): void;
-    disableMousewheelControl(): void;
-    enableMousewheelControl(): void;
-    disableKeyboardControl(): void;
-    enableKeyboardControl(): void;
-    disableTouchControl(): void;
-    enableTouchControl(): void;
-    unsetGrabCursor(): void;
-    setGrabCursor(): void;
-
-    plugins?: {
-        debugger?(swiper: any, params: any): void;
+    isBeginning: boolean;
+    isEnd: boolean;
+    animating: boolean;
+    touches: {
+        startX: number;
+        startY: number;
+        currentX: number;
+        currentY: number;
+        diff: number;
     };
+    clickedIndex: number;
+    clickedSlide: HTMLElement;
+    allowSlideNext: boolean;
+    allowSlidePrev: boolean;
+    allowTouchMove: boolean;
+
+    slideNext: (speed?: number, runCallbacks?: boolean) => void;
+    slidePrev: (speed?: number, runCallbacks?: boolean) => void;
+    slideTo: (index: number, speed?: number, runCallbacks?: boolean) => void;
+    slideToLoop: (index: number, speed?: number, runCallbacks?: boolean) => void;
+    slideReset: (speed?: number, runCallbacks?: boolean) => void;
+    slideToClosest: (speed?: number, runCallbacks?: boolean) => void;
+    updateAutoHeight: (speed?: number) => void;
+    update: () => void;
+    detachEvents: () => void;
+    attachEvents: () => void;
+    destroy: (deleteInstance?: boolean, cleanStyles?: boolean) => void;
+    appendSlide: (slides: Array<(HTMLElement | string)> | string | HTMLElement) => void;
+    prependSlide: (slides: Array<(HTMLElement | string)> | string | HTMLElement) => void;
+    removeSlide: (index: number) => void;
+    removeAllSlides: () => void;
+    setTranslate: (translate: number) => void;
+    getTranslate: () => void;
+    on: (event: SwiperEvent, handler: () => void) => void;
+    once: (event: SwiperEvent, handler: () => void) => void;
+    off: (event: SwiperEvent, handler?: () => void) => void;
+    unsetGrabCursor: () => void;
+    setGrabCursor: () => void;
+
+    // components
+    navigation: Navigation;
+    pagination: Pagination;
+    scrollbar: Scrollbar;
+    autoplay: Autoplay;
+    zoom: Zoom;
+    keyboard: Control;
+    mousewheel: Control;
+    virtual: VirtualSlides;
+    controller: Controller;
 }
 
-declare module "swiper" {
-    const swiper: {
-        new (element: Element | string, options?: SwiperOptions): Swiper;
-    };
-
-    export = swiper;
+declare module 'swiper' {
+    export = Swiper;
 }
diff --git a/types/swiper/swiper-tests.ts b/types/swiper/swiper-tests.ts
index 9ba47c2aba..dfb7df8eb2 100644
--- a/types/swiper/swiper-tests.ts
+++ b/types/swiper/swiper-tests.ts
@@ -1,563 +1,741 @@
-/// <reference types="jquery" />
+/**
+ * Main demos
+ * for more details, please see http://idangero.us/swiper/demos/
+ * @author Eugene Matseruk
+ */
 
-//
-// Main demos
-//
-
-// 01-default.html
+/**
+ *  010-default
+ */
 function defaultDemo() {
     const swiper = new Swiper('.swiper-container');
 }
-// 02-responsive.html
-function responsive() {
+/**
+ * 020-navigation
+ */
+function navigation() {
     const swiper = new Swiper('.swiper-container', {
-        pagination: '.swiper-pagination',
-        paginationClickable: true
+        navigation: {
+            nextEl: '.swiper-button-next',
+            prevEl: '.swiper-button-prev',
+        },
     });
 }
-// 03-vertical.html
-function vertical() {
+
+/**
+ * 030-pagination
+ */
+function pagination() {
     const swiper = new Swiper('.swiper-container', {
-        pagination: '.swiper-pagination',
-        paginationClickable: true,
-        direction: 'vertical'
+        pagination: {
+            el: '.swiper-pagination',
+        },
     });
 }
-// 04-space-between.html
-function spaceBetween() {
+
+/**
+ * 040-pagination-dynamic
+ */
+function paginationDynamic() {
     const swiper = new Swiper('.swiper-container', {
-        pagination: '.swiper-pagination',
-        paginationClickable: true,
-        spaceBetween: 30,
+        pagination: {
+            el: '.swiper-pagination',
+            dynamicBullets: true,
+        },
     });
 }
-// 05-slides-per-view.html
-function slidesPerView() {
+
+/**
+ * 050-progress-pagination
+ */
+function paginationProgress() {
     const swiper = new Swiper('.swiper-container', {
-        pagination: '.swiper-pagination',
-        slidesPerView: 3,
-        paginationClickable: true,
-        spaceBetween: 30
+        pagination: {
+            el: '.swiper-pagination',
+            type: 'progressbar',
+        },
+        navigation: {
+            nextEl: '.swiper-button-next',
+            prevEl: '.swiper-button-prev',
+        },
     });
 }
-// 06-slides-per-view-auto.html
-function slidesPerViewAuto() {
+
+/**
+ * 060-pagination-fraction
+ */
+function paginationFraction() {
     const swiper = new Swiper('.swiper-container', {
-        pagination: '.swiper-pagination',
-        slidesPerView: 'auto',
-        paginationClickable: true,
-        spaceBetween: 30
+        pagination: {
+            el: '.swiper-pagination',
+            type: 'fraction',
+        },
+        navigation: {
+            nextEl: '.swiper-button-next',
+            prevEl: '.swiper-button-prev',
+        },
     });
 }
-// 07-centered.html
-function centered() {
+
+/**
+ * 070-pagination-custom
+ */
+function paginationCustom() {
     const swiper = new Swiper('.swiper-container', {
-        pagination: '.swiper-pagination',
-        slidesPerView: 4,
-        centeredSlides: true,
-        paginationClickable: true,
-        spaceBetween: 30
+        pagination: {
+            el: '.swiper-pagination',
+            clickable: true,
+            renderBullet: (index, className) => {
+                return `<span class="${className}">${index + 1}</span>`;
+            },
+        },
     });
 }
-// 08-centered-auto.html
-function centeredAuto() {
-    const swiper = new Swiper('.swiper-container', {
-        pagination: '.swiper-pagination',
-        slidesPerView: 'auto',
-        centeredSlides: true,
-        paginationClickable: true,
-        spaceBetween: 30
-    });
-}
-// 09-freemode.html
-function freemode() {
-    const swiper = new Swiper('.swiper-container', {
-        pagination: '.swiper-pagination',
-        slidesPerView: 3,
-        paginationClickable: true,
-        spaceBetween: 30,
-        freeMode: true
-    });
-}
-// 10-slides-per-column.html
-function slidesPerColumn() {
-    const swiper = new Swiper('.swiper-container', {
-        pagination: '.swiper-pagination',
-        slidesPerView: 3,
-        slidesPerColumn: 2,
-        paginationClickable: true,
-        spaceBetween: 30
-    });
-}
-// 11-nested.html
-function nested() {
-    const swiperH = new Swiper('.swiper-container-h', {
-        pagination: '.swiper-pagination-h',
-        paginationClickable: true,
-        spaceBetween: 50
-    });
-    const swiperV = new Swiper('.swiper-container-v', {
-        pagination: '.swiper-pagination-v',
-        paginationClickable: true,
-        direction: 'vertical',
-        spaceBetween: 50
-    });
-}
-// 12-grab-cursor.html
-function grabCursor() {
-    const swiper = new Swiper('.swiper-container', {
-        pagination: '.swiper-pagination',
-        slidesPerView: 4,
-        centeredSlides: true,
-        paginationClickable: true,
-        spaceBetween: 30,
-        grabCursor: true
-    });
-}
-// 13-scrollbar.html
+
+/**
+ * 080-scrollbar
+ */
 function scrollbar() {
     const swiper = new Swiper('.swiper-container', {
-        scrollbar: '.swiper-scrollbar',
-        scrollbarHide: true,
+        scrollbar: {
+            el: '.swiper-scrollbar',
+            hide: true,
+        },
+    });
+}
+
+/**
+ * Vertical Slider
+ */
+function verticalSlider() {
+    const swiper = new Swiper('.swiper-container', {
+        direction: 'vertical',
+        pagination: {
+            el: '.swiper-pagination',
+            clickable: true,
+        },
+    });
+}
+
+/**
+ * Space Between Slides
+ */
+function spaceBetween() {
+    const swiper = new Swiper('.swiper-container', {
+        spaceBetween: 30,
+        pagination: {
+            el: '.swiper-pagination',
+            clickable: true,
+        },
+    });
+}
+
+/**
+ * Multiple Slides Per View
+ */
+function multipleSlidesPerView() {
+    const swiper = new Swiper('.swiper-container', {
+        slidesPerView: 3,
+        spaceBetween: 30,
+        pagination: {
+            el: '.swiper-pagination',
+            clickable: true,
+        },
+    });
+}
+
+/**
+ * Auto Slides Per View / Carousel Mode
+ */
+function autoSlidesPerViewAndCarouserMode() {
+    const swiper = new Swiper('.swiper-container', {
+        slidesPerView: 'auto',
+        spaceBetween: 30,
+        pagination: {
+            el: '.swiper-pagination',
+            clickable: true,
+        },
+    });
+}
+
+/**
+ * Centered Slides
+ */
+function centeredSlides() {
+    const swiper = new Swiper('.swiper-container', {
+        slidesPerView: 4,
+        spaceBetween: 30,
+        centeredSlides: true,
+        pagination: {
+            el: '.swiper-pagination',
+            clickable: true,
+        },
+    });
+}
+
+/**
+ * Centered Slides + Auto Slides Per View
+ */
+function centeredSlidesAndAutoSlidesPerView() {
+    const swiper = new Swiper('.swiper-container', {
         slidesPerView: 'auto',
         centeredSlides: true,
         spaceBetween: 30,
-        grabCursor: true
+        pagination: {
+            el: '.swiper-pagination',
+            clickable: true,
+        },
     });
 }
-// 14-nav-arrows.html
-function navArrows() {
+
+/**
+ * Free Mode / No Fixed Positions
+ */
+function freeModeAndNoFixedPositions() {
     const swiper = new Swiper('.swiper-container', {
-        pagination: '.swiper-pagination',
-        paginationClickable: true,
-        nextButton: '.swiper-button-next',
-        prevButton: '.swiper-button-prev',
-        spaceBetween: 30
+        slidesPerView: 3,
+        spaceBetween: 30,
+        freeMode: true,
+        pagination: {
+            el: '.swiper-pagination',
+            clickable: true,
+        },
     });
 }
-// 15-infinite-loop.html
-function infiniteLoop() {
+
+/**
+ * Scroll Container
+ */
+function scrollContainer() {
+    const swiper = new Swiper('.swiper-container', {
+        direction: 'vertical',
+        slidesPerView: 'auto',
+        freeMode: true,
+        scrollbar: {
+            el: '.swiper-scrollbar',
+        },
+        mousewheel: true,
+    });
+}
+
+/**
+ * Multi Row Slides Layout
+ */
+function multiRowSlides() {
+    const swiper = new Swiper('.swiper-container', {
+        slidesPerView: 3,
+        slidesPerColumn: 2,
+        spaceBetween: 30,
+        pagination: {
+            el: '.swiper-pagination',
+            clickable: true,
+        },
+    });
+}
+
+/**
+ * Nested Swipers
+ */
+function nestedSwipers() {
+    const swiperH = new Swiper('.swiper-container-h', {
+        spaceBetween: 50,
+        pagination: {
+            el: '.swiper-pagination-h',
+            clickable: true,
+        },
+    });
+    const swiperV = new Swiper('.swiper-container-v', {
+        direction: 'vertical',
+        spaceBetween: 50,
+        pagination: {
+            el: '.swiper-pagination-v',
+            clickable: true,
+        },
+    });
+}
+/**
+ * Grab Cursor
+ */
+function grabCursor() {
+    const swiper = new Swiper('.swiper-container', {
+        slidesPerView: 4,
+        centeredSlides: true,
+        spaceBetween: 30,
+        grabCursor: true,
+        pagination: {
+            el: '.swiper-pagination',
+            clickable: true,
+        },
+    });
+}
+
+/**
+ * Loop Mode / Infinite Loop
+ */
+function loopMode() {
     const swiper = new Swiper('.swiper-container', {
-        pagination: '.swiper-pagination',
-        nextButton: '.swiper-button-next',
-        prevButton: '.swiper-button-prev',
         slidesPerView: 1,
-        paginationClickable: true,
         spaceBetween: 30,
-        loop: true
+        loop: true,
+        pagination: {
+            el: '.swiper-pagination',
+            clickable: true,
+        },
+        navigation: {
+            nextEl: '.swiper-button-next',
+            prevEl: '.swiper-button-prev',
+        },
     });
 }
-// 16-effect-fade.html
-function effectFade() {
+
+/**
+ * Loop Mode with Multiple Slides Per Group
+ */
+function loopModeWithMultipleSlides() {
     const swiper = new Swiper('.swiper-container', {
-        pagination: '.swiper-pagination',
-        paginationClickable: true,
-        nextButton: '.swiper-button-next',
-        prevButton: '.swiper-button-prev',
+        slidesPerView: 3,
         spaceBetween: 30,
-        effect: 'fade'
+        slidesPerGroup: 3,
+        loop: true,
+        loopFillGroupWithBlank: true,
+        pagination: {
+            el: '.swiper-pagination',
+            clickable: true,
+        },
+        navigation: {
+            nextEl: '.swiper-button-next',
+            prevEl: '.swiper-button-prev',
+        },
     });
 }
-// 17-effect-cube.html
-function effectCube() {
+
+/**
+ * Fade Effect
+ */
+function fadeEffect() {
+    const swiper = new Swiper('.swiper-container', {
+        spaceBetween: 30,
+        effect: 'fade',
+        pagination: {
+            el: '.swiper-pagination',
+            clickable: true,
+        },
+        navigation: {
+            nextEl: '.swiper-button-next',
+            prevEl: '.swiper-button-prev',
+        },
+    });
+}
+
+/**
+ * 3D Cube Effect
+ */
+function cube3dEffect() {
     const swiper = new Swiper('.swiper-container', {
-        pagination: '.swiper-pagination',
         effect: 'cube',
         grabCursor: true,
-        cube: {
+        cubeEffect: {
             shadow: true,
             slideShadows: true,
             shadowOffset: 20,
-            shadowScale: 0.94
-        }
+            shadowScale: 0.94,
+        },
+        pagination: {
+            el: '.swiper-pagination',
+        },
     });
 }
-// 18-effect-coverflow.html
-function effectCoverflow() {
+
+/**
+ * 3D Coverflow Effect
+ */
+function coverflow3dEffect() {
     const swiper = new Swiper('.swiper-container', {
-        pagination: '.swiper-pagination',
         effect: 'coverflow',
         grabCursor: true,
         centeredSlides: true,
         slidesPerView: 'auto',
-        coverflow: {
+        coverflowEffect: {
             rotate: 50,
             stretch: 0,
             depth: 100,
             modifier: 1,
-            slideShadows: true
-        }
+            slideShadows: true,
+        },
+        pagination: {
+            el: '.swiper-pagination',
+        },
     });
 }
-// 19-keyboard-control.html
+
+/**
+ * 3D Flip Effect
+ */
+function flip3dEffect() {
+    const swiper = new Swiper('.swiper-container', {
+        effect: 'flip',
+        grabCursor: true,
+        pagination: {
+            el: '.swiper-pagination',
+        },
+        navigation: {
+            nextEl: '.swiper-button-next',
+            prevEl: '.swiper-button-prev',
+        },
+    });
+}
+
+/**
+ * Keyboard Control (Open in new window)
+ */
 function keyboardControl() {
     const swiper = new Swiper('.swiper-container', {
-        pagination: '.swiper-pagination',
         slidesPerView: 1,
-        paginationClickable: true,
         spaceBetween: 30,
-        keyboardControl: true,
-        nextButton: '.swiper-button-next',
-        prevButton: '.swiper-button-prev',
+        keyboard: {
+            enabled: true,
+        },
+        pagination: {
+            el: '.swiper-pagination',
+            clickable: true,
+        },
+        navigation: {
+            nextEl: '.swiper-button-next',
+            prevEl: '.swiper-button-prev',
+        },
     });
 }
-// 20-mousewheel-control.html
-function mousewheelControl() {
+
+/**
+ * Mousewheel Control
+ */
+function mouseWheelControl() {
     const swiper = new Swiper('.swiper-container', {
-        pagination: '.swiper-pagination',
         direction: 'vertical',
         slidesPerView: 1,
-        paginationClickable: true,
         spaceBetween: 30,
-        mousewheelControl: true
+        mousewheel: true,
+        pagination: {
+            el: '.swiper-pagination',
+            clickable: true,
+        },
     });
 }
-// 21-autoplay.html
+
+/**
+ * Autoplay
+ */
 function autoplay() {
     const swiper = new Swiper('.swiper-container', {
-        pagination: '.swiper-pagination',
-        nextButton: '.swiper-button-next',
-        prevButton: '.swiper-button-prev',
-        paginationClickable: true,
         spaceBetween: 30,
         centeredSlides: true,
-        autoplay: 2500,
-        autoplayDisableOnInteraction: false
+        autoplay: {
+            delay: 2500,
+            disableOnInteraction: false,
+        },
+        pagination: {
+            el: '.swiper-pagination',
+            clickable: true,
+        },
+        navigation: {
+            nextEl: '.swiper-button-next',
+            prevEl: '.swiper-button-prev',
+        },
     });
 }
-// 22-dynamic-slides.html
+
+/**
+ * Dynamic Slides
+ */
 function dynamicSlides() {
     let appendNumber = 4;
     let prependNumber = 1;
     const swiper = new Swiper('.swiper-container', {
-        pagination: '.swiper-pagination',
-        nextButton: '.swiper-button-next',
-        prevButton: '.swiper-button-prev',
         slidesPerView: 3,
         centeredSlides: true,
-        paginationClickable: true,
         spaceBetween: 30,
+        pagination: {
+            el: '.swiper-pagination',
+            clickable: true,
+        },
+        navigation: {
+            nextEl: '.swiper-button-next',
+            prevEl: '.swiper-button-prev',
+        },
     });
-    document.querySelector('.prepend-2-slides').addEventListener('click', e => {
+    document.querySelector('.prepend-2-slides').addEventListener('click', (e) => {
         e.preventDefault();
         swiper.prependSlide([
             `<div class="swiper-slide">Slide ${--prependNumber}</div>`,
-            `<div class="swiper-slide">Slide ${--prependNumber}</div>`
+            `<div class="swiper-slide">Slide ${--prependNumber}</div>`,
         ]);
     });
-    document.querySelector('.prepend-slide').addEventListener('click', e => {
+    document.querySelector('.prepend-slide').addEventListener('click', (e) => {
         e.preventDefault();
         swiper.prependSlide(`<div class="swiper-slide">Slide ${--prependNumber}</div>`);
     });
-    document.querySelector('.append-slide').addEventListener('click', e => {
+    document.querySelector('.append-slide').addEventListener('click', (e) => {
         e.preventDefault();
-        swiper.appendSlide(`<div class="swiper-slide">Slide ${++appendNumber}</div>`);
+        swiper.appendSlide(`<div class="swiper-slide">Slide ${--appendNumber}</div>`);
     });
-    document.querySelector('.append-2-slides').addEventListener('click', e => {
+    document.querySelector('.append-2-slides').addEventListener('click', (e) => {
         e.preventDefault();
         swiper.appendSlide([
-            `<div class="swiper-slide">Slide ${++appendNumber}</div>`,
-            `<div class="swiper-slide">Slide ${++appendNumber}</div>`
+            `<div class="swiper-slide">Slide ${--appendNumber}</div>`,
+            `<div class="swiper-slide">Slide ${--appendNumber}</div>`
         ]);
     });
 }
-// 23-thumbs-gallery-loop.html
-function thumbsGalleryLoop() {
+
+/**
+ * Thumbs Gallery With Two-way Control
+ */
+function thumbsGalleryWithTwoWayControl() {
     const galleryTop = new Swiper('.gallery-top', {
-        nextButton: '.swiper-button-next',
-        prevButton: '.swiper-button-prev',
-        spaceBetween: 10,
-        loop: true,
-        loopedSlides: 5, // looped slides should be the same
-    });
-    const galleryThumbs = new Swiper('.gallery-thumbs', {
-        spaceBetween: 10,
-        slidesPerView: 4,
-        touchRatio: 0.2,
-        loop: true,
-        loopedSlides: 5, // looped slides should be the same
-        slideToClickedSlide: true
-    });
-    galleryTop.params.control = galleryThumbs;
-    galleryThumbs.params.control = galleryTop;
-}
-// 23-thumbs-gallery.html
-function thumbsGallery() {
-    const galleryTop = new Swiper('.gallery-top', {
-        nextButton: '.swiper-button-next',
-        prevButton: '.swiper-button-prev',
         spaceBetween: 10,
+        navigation: {
+            nextEl: '.swiper-button-next',
+            prevEl: '.swiper-button-prev',
+        },
     });
     const galleryThumbs = new Swiper('.gallery-thumbs', {
         spaceBetween: 10,
         centeredSlides: true,
         slidesPerView: 'auto',
         touchRatio: 0.2,
-        slideToClickedSlide: true
+        slideToClickedSlide: true,
     });
-    galleryTop.params.control = galleryThumbs;
-    galleryThumbs.params.control = galleryTop;
+    galleryTop.controller.control = galleryThumbs;
+    galleryThumbs.controller.control = galleryTop;
 }
-// 24-multiple-swipers.html
-function multipleSwipers() {
-    const swiper1 = new Swiper('.swiper1', {
-        pagination: '.swiper-pagination1',
-        paginationClickable: true,
-        spaceBetween: 30,
-    });
-    const swiper2 = new Swiper('.swiper2', {
-        pagination: '.swiper-pagination2',
-        paginationClickable: true,
-        spaceBetween: 30,
-    });
-    const swiper3 = new Swiper('.swiper3', {
-        pagination: '.swiper-pagination3',
-        paginationClickable: true,
-        spaceBetween: 30,
-    });
-}
-// 25-hash-navigation.html
+
+/**
+ * Hash Navigation (Open in new window)
+ */
 function hashNavigation() {
     const swiper = new Swiper('.swiper-container', {
-        pagination: '.swiper-pagination',
-        paginationClickable: true,
-        nextButton: '.swiper-button-next',
-        prevButton: '.swiper-button-prev',
         spaceBetween: 30,
-        hashnav: true,
-        hashnavWatchState: true
+        hashNavigation: {
+            watchState: true,
+        },
+        pagination: {
+            el: '.swiper-pagination',
+            clickable: true,
+        },
+        navigation: {
+            nextEl: '.swiper-button-next',
+            prevEl: '.swiper-button-prev',
+        },
     });
 }
-// 26-rtl.html
-function rtl() {
+
+/**
+ * History API (Open in new window)
+ */
+function historyApi() {
     const swiper = new Swiper('.swiper-container', {
-        pagination: '.swiper-pagination',
-        paginationClickable: true,
-        nextButton: '.swiper-button-next',
-        prevButton: '.swiper-button-prev'
+        spaceBetween: 50,
+        slidesPerView: 1,
+        navigation: {
+            nextEl: '.swiper-button-next',
+            prevEl: '.swiper-button-prev',
+        },
+        pagination: {
+            el: '.swiper-pagination',
+        },
+        history: {
+            key: 'slide',
+        },
     });
 }
-// 27-jquery.html
-function jquery() {
+
+/**
+ * RTL Layout
+ */
+function rtlLayout() {
     const swiper = new Swiper('.swiper-container', {
-        pagination: '.swiper-pagination',
-        paginationClickable: true,
-        nextButton: '.swiper-button-next',
-        prevButton: '.swiper-button-prev'
+        pagination: {
+            el: '.swiper-pagination',
+            clickable: true,
+        },
+        navigation: {
+            nextEl: '.swiper-button-next',
+            prevEl: '.swiper-button-prev',
+        },
     });
 }
-// 28-parallax.html
+
+/**
+ * Parallax
+ */
 function parallax() {
     const swiper = new Swiper('.swiper-container', {
-        pagination: '.swiper-pagination',
-        paginationClickable: true,
-        nextButton: '.swiper-button-next',
-        prevButton: '.swiper-button-prev',
-        parallax: true,
         speed: 600,
+        parallax: true,
+        pagination: {
+            el: '.swiper-pagination',
+            clickable: true,
+        },
+        navigation: {
+            nextEl: '.swiper-button-next',
+            prevEl: '.swiper-button-prev',
+        },
     });
 }
-// 29-custom-pagination.html
-function customPagination() {
+
+/**
+ * Lazy Loading Images
+ */
+function lazyLoadingImages() {
     const swiper = new Swiper('.swiper-container', {
-        pagination: '.swiper-pagination',
-        paginationClickable: true,
-        paginationBulletRender(swiper, index, className) {
-            return `<span class="${className}">${index + 1}</span>`;
-        }
-    });
-}
-// 30-lazy-load-images.html
-function lazyLoadImages() {
-    const swiper = new Swiper('.swiper-container', {
-        nextButton: '.swiper-button-next',
-        prevButton: '.swiper-button-prev',
-        pagination: '.swiper-pagination',
-        paginationClickable: true,
-        // Disable preloading of all images
-        preloadImages: false,
         // Enable lazy loading
-        lazyLoading: true
-    });
-}
-// 31-custom-plugin.html
-function customPlugin() {
-    /* ========
-    Debugger plugin, simple demo plugin to console.log some of callbacks
-    ======== */
-    Swiper.prototype.plugins.debugger = (swiper: any, params: any) => {
-        if (!params) return;
-        // Need to return object with properties that names are the same as callbacks
-        return {
-            onInit(swiper: any) {
-                console.log('onInit');
-            },
-            onClick(swiper: any, e: any) {
-                console.log('onClick');
-            },
-            onTap(swiper: any, e: any) {
-                console.log('onTap');
-            },
-            onDoubleTap(swiper: any, e: any) {
-                console.log('onDoubleTap');
-            },
-            onSliderMove(swiper: any, e: any) {
-                console.log('onSliderMove');
-            },
-            onSlideChangeStart(swiper: any) {
-                console.log('onSlideChangeStart');
-            },
-            onSlideChangeEnd(swiper: any) {
-                console.log('onSlideChangeEnd');
-            },
-            onTransitionStart(swiper: any) {
-                console.log('onTransitionStart');
-            },
-            onTransitionEnd(swiper: any) {
-                console.log('onTransitionEnd');
-            },
-            onReachBeginning(swiper: any) {
-                console.log('onReachBeginning');
-            },
-            onReachEnd(swiper: any) {
-                console.log('onReachEnd');
-            }
-        };
-    };
-}
-// 32-scroll-container.html
-function scrollContainer() {
-    const swiper = new Swiper('.swiper-container', {
-        scrollbar: '.swiper-scrollbar',
-        direction: 'vertical',
-        slidesPerView: 'auto',
-        mousewheelControl: true,
-        freeMode: true
-    });
-}
-// 32-slideable-menu.html
-function slideableMenu() {
-    const toggleMenu = () => {
-        if (swiper.previousIndex === 0)
-            swiper.slidePrev();
-    };
-    const menuButton = document.getElementsByClassName('menu-button')[0];
-    const swiper = new Swiper('.swiper-container', {
-        slidesPerView: 'auto',
-        initialSlide: 1,
-        resistanceRatio: .00000000000001,
-        onSlideChangeStart: (slider) => {
-            if (slider.activeIndex === 0) {
-                menuButton.classList.add('cross');
-                menuButton.removeEventListener('click', toggleMenu, false);
-            } else
-                menuButton.classList.remove('cross');
+        lazy: true,
+        pagination: {
+            el: '.swiper-pagination',
+            clickable: true,
         },
-        onSlideChangeEnd: (slider) => {
-            if (slider.activeIndex === 0)
-                menuButton.removeEventListener('click', toggleMenu, false);
-            else
-                menuButton.addEventListener('click', toggleMenu, false);
+        navigation: {
+            nextEl: '.swiper-button-next',
+            prevEl: '.swiper-button-prev',
         },
-        slideToClickedSlide: true
     });
 }
-// 33-responsive-breakpoints.html
+
+/**
+ * Responsive Breakpoints
+ */
 function responsiveBreakpoints() {
     const swiper = new Swiper('.swiper-container', {
-        pagination: '.swiper-pagination',
-        paginationClickable: true,
         slidesPerView: 5,
         spaceBetween: 50,
+        // init: false,
+        pagination: {
+            el: '.swiper-pagination',
+            clickable: true,
+        },
         breakpoints: {
             1024: {
                 slidesPerView: 4,
-                spaceBetween: 40
+                spaceBetween: 40,
             },
             768: {
                 slidesPerView: 3,
-                spaceBetween: 30
+                spaceBetween: 30,
             },
             640: {
                 slidesPerView: 2,
-                spaceBetween: 20
+                spaceBetween: 20,
             },
             320: {
                 slidesPerView: 1,
-                spaceBetween: 10
+                spaceBetween: 10,
             }
         }
     });
 }
-// 34-autoheight.html
-function autoheight() {
+
+/**
+ * Auto Height
+ */
+function autoHeight() {
     const swiper = new Swiper('.swiper-container', {
-        pagination: '.swiper-pagination',
-        paginationClickable: true,
-        nextButton: '.swiper-button-next',
-        prevButton: '.swiper-button-prev',
         autoHeight: true, // enable auto height
+        spaceBetween: 20,
+        pagination: {
+            el: '.swiper-pagination',
+            clickable: true,
+        },
+        navigation: {
+            nextEl: '.swiper-button-next',
+            prevEl: '.swiper-button-prev',
+        },
     });
 }
-// 35-effect-flip.html
-function effectFlip() {
-    const swiper = new Swiper('.swiper-container', {
-        pagination: '.swiper-pagination',
-        effect: 'flip',
-        grabCursor: true,
-        nextButton: '.swiper-button-next',
-        prevButton: '.swiper-button-prev'
-    });
-}
-// 36-pagination-fraction.html
-function paginationFraction() {
-    const swiper = new Swiper('.swiper-container', {
-        nextButton: '.swiper-button-next',
-        prevButton: '.swiper-button-prev',
-        pagination: '.swiper-pagination',
-        paginationType: 'fraction'
-    });
-}
-// 37-pagination-progress.html
-function paginationProgress() {
-    const swiper = new Swiper('.swiper-container', {
-        nextButton: '.swiper-button-next',
-        prevButton: '.swiper-button-prev',
-        pagination: '.swiper-pagination',
-        paginationType: 'progress'
-    });
-}
-// 38-history.html
-function historyDemo() {
-    const swiper = new Swiper('.swiper-container', {
-        spaceBetween: 50,
-        slidesPerView: 2,
-        centeredSlides: true,
-        slideToClickedSlide: true,
-        grabCursor: true,
-        nextButton: '.swiper-button-next',
-        prevButton: '.swiper-button-prev',
-        scrollbar: '.swiper-scrollbar',
-        pagination: '.swiper-pagination',
-        history: 'slide',
-    });
-}
-// 38-jquery-ie9-loop.html
-function jqueryIe9Loop() {
-    const swiper = new Swiper('.swiper-container', {
-        loop: true,
-        pagination: '.swiper-pagination',
-        paginationClickable: true,
-        nextButton: '.swiper-button-next',
-        prevButton: '.swiper-button-prev'
-    });
-}
-// 39-zoom.html
+
+/**
+ * Zoom
+ */
 function zoom() {
     const swiper = new Swiper('.swiper-container', {
         zoom: true,
-        pagination: '.swiper-pagination',
-        nextButton: '.swiper-button-next',
-        prevButton: '.swiper-button-prev'
+        pagination: {
+            el: '.swiper-pagination',
+        },
+        navigation: {
+            nextEl: '.swiper-button-next',
+            prevEl: '.swiper-button-prev',
+        },
+    });
+}
+
+/**
+ * Virtual Slides
+ */
+function virtualSlides() {
+    const slides = [];
+    for (let i = 0; i < 600; i += 1) {
+        slides.push('Slide ' + (i + 1));
+    }
+
+    const swiper = new Swiper('.swiper-container', {
+        slidesPerView: 3,
+        centeredSlides: true,
+        spaceBetween: 30,
+        pagination: {
+            el: '.swiper-pagination',
+            type: 'fraction',
+        },
+        navigation: {
+            nextEl: '.swiper-button-next',
+            prevEl: '.swiper-button-prev',
+        },
+        virtual: {
+            slides
+        },
+    });
+    document.querySelector('.slide-1').addEventListener('click', (e) => {
+        e.preventDefault();
+        swiper.slideTo(0, 0);
+    });
+    document.querySelector('.slide-250').addEventListener('click', (e) => {
+        e.preventDefault();
+        swiper.slideTo(249, 0);
+    });
+    document.querySelector('.slide-500').addEventListener('click', (e) => {
+        e.preventDefault();
+        swiper.slideTo(499, 0);
+    });
+}
+
+/**
+ * Slideable Navigation Drawer
+ */
+function slideableNavigation() {
+    const menuButton = document.querySelector('.menu-button');
+    const swiper = new Swiper('.swiper-container', {
+        slidesPerView: 'auto',
+        initialSlide: 1,
+        resistanceRatio: 0,
+        slideToClickedSlide: true,
+        on: {
+            init: () => {
+                const slider = this;
+                menuButton.addEventListener('click', () => {
+                    if (slider.activeIndex === 0) {
+                        slider.slideNext();
+                    } else {
+                        slider.slidePrev();
+                    }
+                }, true);
+            },
+            slideChange: () => {
+                const slider = this;
+                if (slider.activeIndex === 0) {
+                    menuButton.classList.add('cross');
+                } else {
+                    menuButton.classList.remove('cross');
+                }
+            },
+        }
     });
 }
diff --git a/types/swiper/tsconfig.json b/types/swiper/tsconfig.json
index 8bde882886..2db3d1376f 100644
--- a/types/swiper/tsconfig.json
+++ b/types/swiper/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "swiper-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/swiper/v3/index.d.ts b/types/swiper/v3/index.d.ts
new file mode 100644
index 0000000000..65872facd2
--- /dev/null
+++ b/types/swiper/v3/index.d.ts
@@ -0,0 +1,339 @@
+// Type definitions for Swiper 3.4
+// Project: https://github.com/nolimits4web/Swiper
+// Definitions by: Sebastián Galiano <https://github.com/sgaliano>, Luca Trazzi <https://github.com/lucax88x>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+interface SwiperOptions {
+    initialSlide?: number;
+    direction?: string;
+    speed?: number;
+    setWrapperSize?: boolean;
+    virtualTranslate?: boolean;
+    width?: number;
+    height?: number;
+    autoHeight?: boolean;
+    roundLengths?: boolean;
+    nested?: boolean;
+
+    // Autoplay
+    autoplay?: number;
+    autoplayStopOnLast?: boolean;
+    autoplayDisableOnInteraction?: boolean;
+
+    // Progress
+    watchSlidesProgress?: boolean;
+    watchSlidesVisibility?: boolean;
+
+    // Freemode
+    freeMode?: boolean;
+    freeModeMomentum?: boolean;
+    freeModeMomentumRatio?: number;
+    freeModeMomentumVelocityRatio?: number;
+    freeModeMomentumBounce?: boolean;
+    freeModeMomentumBounceRatio?: number;
+    freeModeMinimumVelocity?: number;
+    freeModeSticky?: boolean;
+
+    // Effects
+    effect?: string;
+    fade?: {};
+    cube?: {};
+    coverflow?: {};
+    flip?: {};
+
+    // Parallax
+    parallax?: boolean;
+
+    // Slides grid
+    spaceBetween?: number;
+    slidesPerView?: number | string;
+    slidesPerColumn?: number;
+    slidesPerColumnFill?: string;
+    slidesPerGroup?: number;
+    centeredSlides?: boolean;
+    slidesOffsetBefore?: number;
+    slidesOffsetAfter?: number;
+
+    // Grab Cursor
+    grabCursor?: boolean;
+
+    // Touches
+    touchEventsTarget?: string;
+    touchRatio?: number;
+    touchAngle?: number;
+    simulateTouch?: boolean;
+    shortSwipes?: boolean;
+    longSwipes?: boolean;
+    longSwipesRatio?: number;
+    longSwipesMs?: number;
+    followFinger?: boolean;
+    onlyExternal?: boolean;
+    threshold?: number;
+    touchMoveStopPropagation?: boolean;
+    iOSEdgeSwipeDetection?: boolean;
+    iOSEdgeSwipeThreshold?: number;
+
+    // Touch Resistance
+    resistance?: boolean;
+    resistanceRatio?: number;
+
+    // Clicks
+    preventClicks?: boolean;
+    preventClicksPropagation?: boolean;
+    slideToClickedSlide?: boolean;
+
+    // Swiping / No swiping
+    allowSwipeToPrev?: boolean;
+    allowSwipeToNext?: boolean;
+    noSwiping?: boolean;
+    noSwipingClass?: string;
+    swipeHandler?: string | Element;
+
+    // Navigation Controls
+    uniqueNavElements?: boolean;
+
+    // Pagination
+    pagination?: string | Element;
+    paginationType?: string;
+    paginationHide?: boolean;
+    paginationClickable?: boolean;
+    paginationElement?: string;
+    paginationBulletRender?(swiper: Swiper, index: number, className: string): void;
+    paginationFractionRender?(swiper: Swiper, currentClassName: string, totalClassName: string): void;
+    paginationProgressRender?(swiper: Swiper, progressbarClass: string): void;
+    paginationCustomRender?(swiper: Swiper, current: number, total: number): void;
+
+    // Navigation Buttons
+    nextButton?: string | Element;
+    prevButton?: string | Element;
+
+    // Scollbar
+    scrollbar?: string | Element | SwiperScrollbarOptions;
+    scrollbarHide?: boolean;
+    scrollbarDraggable?: boolean;
+    scrollbarSnapOnRelease?: boolean;
+
+    // Accessibility
+    a11y?: boolean;
+    prevSlideMessage?: string;
+    nextSlideMessage?: string;
+    firstSlideMessage?: string;
+    lastSlideMessage?: string;
+    paginationBulletMessage?: string;
+
+    // Keyboard / Mousewheel
+    keyboardControl?: boolean;
+    mousewheelControl?: boolean;
+    mousewheelForceToAxis?: boolean;
+    mousewheelReleaseOnEdges?: boolean;
+    mousewheelInvert?: boolean;
+    mousewheelSensitivity?: number;
+
+    // Hash Navigation
+    hashnav?: boolean;
+    hashnavWatchState?: boolean;
+    history?: string;
+
+    // Images
+    preloadImages?: boolean;
+    updateOnImagesReady?: boolean;
+    lazyLoading?: boolean;
+    lazyLoadingInPrevNext?: boolean;
+    lazyLoadingInPrevNextAmount?: number;
+    lazyLoadingOnTransitionStart?: boolean;
+
+    // Loop
+    loop?: boolean;
+    loopAdditionalSlides?: number;
+    loopedSlides?: number;
+
+    zoom?: boolean;
+
+    // Controller
+    control?: Swiper;
+    controlInverse?: boolean;
+    controlBy?: string;
+
+    // Observer
+    observer?: boolean;
+    observeParents?: boolean;
+
+    // Breakpoints
+    breakpoints?: {};
+
+    // Callbacks
+    runCallbacksOnInit?: boolean;
+    onInit?(swiper: Swiper): void;
+    onSlideChangeStart?(swiper: Swiper): void;
+    onSlideChangeEnd?(swiper: Swiper): void;
+    onSlideNextStart?(swiper: Swiper): void;
+    onSlideNextEnd?(swiper: Swiper): void;
+    onSlidePrevStart?(swiper: Swiper): void;
+    onSlidePrevEnd?(swiper: Swiper): void;
+    onTransitionStart?(swiper: Swiper): void;
+    onTransitionEnd?(swiper: Swiper): void;
+    onTouchStart?(swiper: Swiper, event: Event): void;
+    onTouchMove?(swiper: Swiper, event: Event): void;
+    onTouchMoveOpposite?(swiper: Swiper, event: Event): void;
+    onSliderMove?(swiper: Swiper, event: Event): void;
+    onTouchEnd?(swiper: Swiper, event: Event): void;
+    onClick?(swiper: Swiper, event: Event): void;
+    onTap?(swiper: Swiper, event: Event): void;
+    onDoubleTap?(swiper: Swiper, event: Event): void;
+    onImagesReady?(swiper: Swiper): void;
+    onProgress?(swiper: Swiper, progress: number): void;
+    onReachBeginning?(swiper: Swiper): void;
+    onReachEnd?(swiper: Swiper): void;
+    onDestroy?(swiper: Swiper): void;
+    onSetTranslate?(swiper: Swiper, translate: any): void;
+    onSetTransition?(swiper: Swiper, transition: any): void;
+    onAutoplay?(swiper: Swiper): void;
+    onAutoplayStart?(swiper: Swiper): void;
+    onAutoplayStop?(swiper: Swiper): void;
+    onLazyImageLoad?(swiper: Swiper, slide: any, image: any): void;
+    onLazyImageReady?(swiper: Swiper, slide: any, image: any): void;
+    onPaginationRendered?(swiper: Swiper, paginationContainer: any): void;
+    onScroll?(swiper: Swiper, event: Event): void;
+    onBeforeResize?(swiper: Swiper): void;
+    onAfterResize?(swiper: Swiper): void;
+    onKeyPress?(swiper: Swiper, kc: any): void;
+
+    // Namespace
+    slideClass?: string;
+    slideActiveClass?: string;
+    slideVisibleClass?: string;
+    slideDuplicateClass?: string;
+    slideNextClass?: string;
+    slidePrevClass?: string;
+    wrapperClass?: string;
+    bulletClass?: string;
+    bulletActiveClass?: string;
+    paginationHiddenClass?: string;
+    paginationCurrentClass?: string;
+    paginationTotalClass?: string;
+    paginationProgressbarClass?: string;
+    buttonDisabledClass?: string;
+}
+
+interface SwiperScrollbarOptions {
+    container: string;          // Default: '.swiper-scrollbar'
+    draggable?: boolean;        // Default: true
+    hide?: boolean;             // Default: true
+    snapOnRelease?: boolean;    // Default: false
+}
+
+declare class SwiperSlide {
+    append(): SwiperSlide;
+    clone(): SwiperSlide;
+    getWidth(): number;
+    getHeight(): number;
+    getOffset(): { top: number; left: number; };
+    insertAfter(index: number): SwiperSlide;
+    prepend(): SwiperSlide;
+    remove(): void;
+}
+
+declare class Swiper {
+    constructor(container: string | Element, options?: SwiperOptions);
+
+    // Properties
+    width: number;
+    height: number;
+    params: any;
+    positions: any;
+    wrapper: any;
+    virtualSize: number;
+
+    // Feature detection
+    support: {
+        touch: boolean;
+        transforms: boolean;
+        transforms3d: boolean;
+        transitions: boolean;
+    };
+
+    // Browser detection
+    browser: {
+        ie8: boolean;
+        ie10: boolean;
+    };
+
+    // Navigation
+    activeIndex: number;
+    activeLoopIndex: number;
+    activeLoaderIndex: number;
+    previousIndex: number;
+    swipeNext(internal?: boolean): boolean;
+    swipePrev(internal?: boolean): boolean;
+    swipeReset(): boolean;
+    swipeTo(index: number, speed?: number, runCallbacks?: boolean): boolean;
+    activeSlide(): SwiperSlide;
+    updateActiveSlide(index: number): void;
+
+    // Events
+    touches: any;
+    isTouched: boolean;
+    clickedSlideIndex: number;
+    clickedSlide: SwiperSlide;
+    wrapperTransitionEnd(callback: () => void, permanent: boolean): void;
+
+    // Init/reset
+    destroy(deleteInstance: boolean, cleanupStyles: boolean): void;
+    reInit(forceCalcSlides?: boolean): void;
+    resizeFix(reInit?: boolean): void;
+
+    // Autoplaying
+    autoplay: boolean;
+    startAutoplay(): void;
+    stopAutoplay(): void;
+
+    // Other methods
+    getWrapperTranslate(axis: string): number;  // 'x' or 'y'
+    setWrapperTranslate(x: number, y: number, z: number): void;
+    setWrapperTransition(duration: any): void;
+
+    // Slides API
+
+    slides: SwiperSlide[];
+
+    slidePrev(runCallbacks?: boolean, speed?: number): void;
+    slideNext(runCallbacks?: boolean, speed?: number): void;
+    slideTo(index: number, speed?: number, runCallbacks?: boolean): void;
+    update(updateTranslate?: boolean): void;
+    onResize(): void;
+    detachEvents(): void;
+    attachEvents(): void;
+
+    appendSlide(slides: HTMLElement | string | string[]): void;
+    prependSlide(slides: HTMLElement | string | string[]): void;
+    removeSlide(slideIndex: number): void;
+    removeAllSlides(): void;
+
+    lockSwipeToNext(): void;
+    unlockSwipeToNext(): void;
+    lockSwipeToPrev(): void;
+    unlockSwipeToPrev(): void;
+    lockSwipes(): void;
+    unlockSwipes(): void;
+    disableMousewheelControl(): void;
+    enableMousewheelControl(): void;
+    disableKeyboardControl(): void;
+    enableKeyboardControl(): void;
+    disableTouchControl(): void;
+    enableTouchControl(): void;
+    unsetGrabCursor(): void;
+    setGrabCursor(): void;
+
+    plugins?: {
+        debugger?(swiper: any, params: any): void;
+    };
+}
+
+declare module "swiper" {
+    const swiper: {
+        new (element: Element | string, options?: SwiperOptions): Swiper;
+    };
+
+    export = swiper;
+}
diff --git a/types/swiper/v3/swiper-tests.ts b/types/swiper/v3/swiper-tests.ts
new file mode 100644
index 0000000000..9ba47c2aba
--- /dev/null
+++ b/types/swiper/v3/swiper-tests.ts
@@ -0,0 +1,563 @@
+/// <reference types="jquery" />
+
+//
+// Main demos
+//
+
+// 01-default.html
+function defaultDemo() {
+    const swiper = new Swiper('.swiper-container');
+}
+// 02-responsive.html
+function responsive() {
+    const swiper = new Swiper('.swiper-container', {
+        pagination: '.swiper-pagination',
+        paginationClickable: true
+    });
+}
+// 03-vertical.html
+function vertical() {
+    const swiper = new Swiper('.swiper-container', {
+        pagination: '.swiper-pagination',
+        paginationClickable: true,
+        direction: 'vertical'
+    });
+}
+// 04-space-between.html
+function spaceBetween() {
+    const swiper = new Swiper('.swiper-container', {
+        pagination: '.swiper-pagination',
+        paginationClickable: true,
+        spaceBetween: 30,
+    });
+}
+// 05-slides-per-view.html
+function slidesPerView() {
+    const swiper = new Swiper('.swiper-container', {
+        pagination: '.swiper-pagination',
+        slidesPerView: 3,
+        paginationClickable: true,
+        spaceBetween: 30
+    });
+}
+// 06-slides-per-view-auto.html
+function slidesPerViewAuto() {
+    const swiper = new Swiper('.swiper-container', {
+        pagination: '.swiper-pagination',
+        slidesPerView: 'auto',
+        paginationClickable: true,
+        spaceBetween: 30
+    });
+}
+// 07-centered.html
+function centered() {
+    const swiper = new Swiper('.swiper-container', {
+        pagination: '.swiper-pagination',
+        slidesPerView: 4,
+        centeredSlides: true,
+        paginationClickable: true,
+        spaceBetween: 30
+    });
+}
+// 08-centered-auto.html
+function centeredAuto() {
+    const swiper = new Swiper('.swiper-container', {
+        pagination: '.swiper-pagination',
+        slidesPerView: 'auto',
+        centeredSlides: true,
+        paginationClickable: true,
+        spaceBetween: 30
+    });
+}
+// 09-freemode.html
+function freemode() {
+    const swiper = new Swiper('.swiper-container', {
+        pagination: '.swiper-pagination',
+        slidesPerView: 3,
+        paginationClickable: true,
+        spaceBetween: 30,
+        freeMode: true
+    });
+}
+// 10-slides-per-column.html
+function slidesPerColumn() {
+    const swiper = new Swiper('.swiper-container', {
+        pagination: '.swiper-pagination',
+        slidesPerView: 3,
+        slidesPerColumn: 2,
+        paginationClickable: true,
+        spaceBetween: 30
+    });
+}
+// 11-nested.html
+function nested() {
+    const swiperH = new Swiper('.swiper-container-h', {
+        pagination: '.swiper-pagination-h',
+        paginationClickable: true,
+        spaceBetween: 50
+    });
+    const swiperV = new Swiper('.swiper-container-v', {
+        pagination: '.swiper-pagination-v',
+        paginationClickable: true,
+        direction: 'vertical',
+        spaceBetween: 50
+    });
+}
+// 12-grab-cursor.html
+function grabCursor() {
+    const swiper = new Swiper('.swiper-container', {
+        pagination: '.swiper-pagination',
+        slidesPerView: 4,
+        centeredSlides: true,
+        paginationClickable: true,
+        spaceBetween: 30,
+        grabCursor: true
+    });
+}
+// 13-scrollbar.html
+function scrollbar() {
+    const swiper = new Swiper('.swiper-container', {
+        scrollbar: '.swiper-scrollbar',
+        scrollbarHide: true,
+        slidesPerView: 'auto',
+        centeredSlides: true,
+        spaceBetween: 30,
+        grabCursor: true
+    });
+}
+// 14-nav-arrows.html
+function navArrows() {
+    const swiper = new Swiper('.swiper-container', {
+        pagination: '.swiper-pagination',
+        paginationClickable: true,
+        nextButton: '.swiper-button-next',
+        prevButton: '.swiper-button-prev',
+        spaceBetween: 30
+    });
+}
+// 15-infinite-loop.html
+function infiniteLoop() {
+    const swiper = new Swiper('.swiper-container', {
+        pagination: '.swiper-pagination',
+        nextButton: '.swiper-button-next',
+        prevButton: '.swiper-button-prev',
+        slidesPerView: 1,
+        paginationClickable: true,
+        spaceBetween: 30,
+        loop: true
+    });
+}
+// 16-effect-fade.html
+function effectFade() {
+    const swiper = new Swiper('.swiper-container', {
+        pagination: '.swiper-pagination',
+        paginationClickable: true,
+        nextButton: '.swiper-button-next',
+        prevButton: '.swiper-button-prev',
+        spaceBetween: 30,
+        effect: 'fade'
+    });
+}
+// 17-effect-cube.html
+function effectCube() {
+    const swiper = new Swiper('.swiper-container', {
+        pagination: '.swiper-pagination',
+        effect: 'cube',
+        grabCursor: true,
+        cube: {
+            shadow: true,
+            slideShadows: true,
+            shadowOffset: 20,
+            shadowScale: 0.94
+        }
+    });
+}
+// 18-effect-coverflow.html
+function effectCoverflow() {
+    const swiper = new Swiper('.swiper-container', {
+        pagination: '.swiper-pagination',
+        effect: 'coverflow',
+        grabCursor: true,
+        centeredSlides: true,
+        slidesPerView: 'auto',
+        coverflow: {
+            rotate: 50,
+            stretch: 0,
+            depth: 100,
+            modifier: 1,
+            slideShadows: true
+        }
+    });
+}
+// 19-keyboard-control.html
+function keyboardControl() {
+    const swiper = new Swiper('.swiper-container', {
+        pagination: '.swiper-pagination',
+        slidesPerView: 1,
+        paginationClickable: true,
+        spaceBetween: 30,
+        keyboardControl: true,
+        nextButton: '.swiper-button-next',
+        prevButton: '.swiper-button-prev',
+    });
+}
+// 20-mousewheel-control.html
+function mousewheelControl() {
+    const swiper = new Swiper('.swiper-container', {
+        pagination: '.swiper-pagination',
+        direction: 'vertical',
+        slidesPerView: 1,
+        paginationClickable: true,
+        spaceBetween: 30,
+        mousewheelControl: true
+    });
+}
+// 21-autoplay.html
+function autoplay() {
+    const swiper = new Swiper('.swiper-container', {
+        pagination: '.swiper-pagination',
+        nextButton: '.swiper-button-next',
+        prevButton: '.swiper-button-prev',
+        paginationClickable: true,
+        spaceBetween: 30,
+        centeredSlides: true,
+        autoplay: 2500,
+        autoplayDisableOnInteraction: false
+    });
+}
+// 22-dynamic-slides.html
+function dynamicSlides() {
+    let appendNumber = 4;
+    let prependNumber = 1;
+    const swiper = new Swiper('.swiper-container', {
+        pagination: '.swiper-pagination',
+        nextButton: '.swiper-button-next',
+        prevButton: '.swiper-button-prev',
+        slidesPerView: 3,
+        centeredSlides: true,
+        paginationClickable: true,
+        spaceBetween: 30,
+    });
+    document.querySelector('.prepend-2-slides').addEventListener('click', e => {
+        e.preventDefault();
+        swiper.prependSlide([
+            `<div class="swiper-slide">Slide ${--prependNumber}</div>`,
+            `<div class="swiper-slide">Slide ${--prependNumber}</div>`
+        ]);
+    });
+    document.querySelector('.prepend-slide').addEventListener('click', e => {
+        e.preventDefault();
+        swiper.prependSlide(`<div class="swiper-slide">Slide ${--prependNumber}</div>`);
+    });
+    document.querySelector('.append-slide').addEventListener('click', e => {
+        e.preventDefault();
+        swiper.appendSlide(`<div class="swiper-slide">Slide ${++appendNumber}</div>`);
+    });
+    document.querySelector('.append-2-slides').addEventListener('click', e => {
+        e.preventDefault();
+        swiper.appendSlide([
+            `<div class="swiper-slide">Slide ${++appendNumber}</div>`,
+            `<div class="swiper-slide">Slide ${++appendNumber}</div>`
+        ]);
+    });
+}
+// 23-thumbs-gallery-loop.html
+function thumbsGalleryLoop() {
+    const galleryTop = new Swiper('.gallery-top', {
+        nextButton: '.swiper-button-next',
+        prevButton: '.swiper-button-prev',
+        spaceBetween: 10,
+        loop: true,
+        loopedSlides: 5, // looped slides should be the same
+    });
+    const galleryThumbs = new Swiper('.gallery-thumbs', {
+        spaceBetween: 10,
+        slidesPerView: 4,
+        touchRatio: 0.2,
+        loop: true,
+        loopedSlides: 5, // looped slides should be the same
+        slideToClickedSlide: true
+    });
+    galleryTop.params.control = galleryThumbs;
+    galleryThumbs.params.control = galleryTop;
+}
+// 23-thumbs-gallery.html
+function thumbsGallery() {
+    const galleryTop = new Swiper('.gallery-top', {
+        nextButton: '.swiper-button-next',
+        prevButton: '.swiper-button-prev',
+        spaceBetween: 10,
+    });
+    const galleryThumbs = new Swiper('.gallery-thumbs', {
+        spaceBetween: 10,
+        centeredSlides: true,
+        slidesPerView: 'auto',
+        touchRatio: 0.2,
+        slideToClickedSlide: true
+    });
+    galleryTop.params.control = galleryThumbs;
+    galleryThumbs.params.control = galleryTop;
+}
+// 24-multiple-swipers.html
+function multipleSwipers() {
+    const swiper1 = new Swiper('.swiper1', {
+        pagination: '.swiper-pagination1',
+        paginationClickable: true,
+        spaceBetween: 30,
+    });
+    const swiper2 = new Swiper('.swiper2', {
+        pagination: '.swiper-pagination2',
+        paginationClickable: true,
+        spaceBetween: 30,
+    });
+    const swiper3 = new Swiper('.swiper3', {
+        pagination: '.swiper-pagination3',
+        paginationClickable: true,
+        spaceBetween: 30,
+    });
+}
+// 25-hash-navigation.html
+function hashNavigation() {
+    const swiper = new Swiper('.swiper-container', {
+        pagination: '.swiper-pagination',
+        paginationClickable: true,
+        nextButton: '.swiper-button-next',
+        prevButton: '.swiper-button-prev',
+        spaceBetween: 30,
+        hashnav: true,
+        hashnavWatchState: true
+    });
+}
+// 26-rtl.html
+function rtl() {
+    const swiper = new Swiper('.swiper-container', {
+        pagination: '.swiper-pagination',
+        paginationClickable: true,
+        nextButton: '.swiper-button-next',
+        prevButton: '.swiper-button-prev'
+    });
+}
+// 27-jquery.html
+function jquery() {
+    const swiper = new Swiper('.swiper-container', {
+        pagination: '.swiper-pagination',
+        paginationClickable: true,
+        nextButton: '.swiper-button-next',
+        prevButton: '.swiper-button-prev'
+    });
+}
+// 28-parallax.html
+function parallax() {
+    const swiper = new Swiper('.swiper-container', {
+        pagination: '.swiper-pagination',
+        paginationClickable: true,
+        nextButton: '.swiper-button-next',
+        prevButton: '.swiper-button-prev',
+        parallax: true,
+        speed: 600,
+    });
+}
+// 29-custom-pagination.html
+function customPagination() {
+    const swiper = new Swiper('.swiper-container', {
+        pagination: '.swiper-pagination',
+        paginationClickable: true,
+        paginationBulletRender(swiper, index, className) {
+            return `<span class="${className}">${index + 1}</span>`;
+        }
+    });
+}
+// 30-lazy-load-images.html
+function lazyLoadImages() {
+    const swiper = new Swiper('.swiper-container', {
+        nextButton: '.swiper-button-next',
+        prevButton: '.swiper-button-prev',
+        pagination: '.swiper-pagination',
+        paginationClickable: true,
+        // Disable preloading of all images
+        preloadImages: false,
+        // Enable lazy loading
+        lazyLoading: true
+    });
+}
+// 31-custom-plugin.html
+function customPlugin() {
+    /* ========
+    Debugger plugin, simple demo plugin to console.log some of callbacks
+    ======== */
+    Swiper.prototype.plugins.debugger = (swiper: any, params: any) => {
+        if (!params) return;
+        // Need to return object with properties that names are the same as callbacks
+        return {
+            onInit(swiper: any) {
+                console.log('onInit');
+            },
+            onClick(swiper: any, e: any) {
+                console.log('onClick');
+            },
+            onTap(swiper: any, e: any) {
+                console.log('onTap');
+            },
+            onDoubleTap(swiper: any, e: any) {
+                console.log('onDoubleTap');
+            },
+            onSliderMove(swiper: any, e: any) {
+                console.log('onSliderMove');
+            },
+            onSlideChangeStart(swiper: any) {
+                console.log('onSlideChangeStart');
+            },
+            onSlideChangeEnd(swiper: any) {
+                console.log('onSlideChangeEnd');
+            },
+            onTransitionStart(swiper: any) {
+                console.log('onTransitionStart');
+            },
+            onTransitionEnd(swiper: any) {
+                console.log('onTransitionEnd');
+            },
+            onReachBeginning(swiper: any) {
+                console.log('onReachBeginning');
+            },
+            onReachEnd(swiper: any) {
+                console.log('onReachEnd');
+            }
+        };
+    };
+}
+// 32-scroll-container.html
+function scrollContainer() {
+    const swiper = new Swiper('.swiper-container', {
+        scrollbar: '.swiper-scrollbar',
+        direction: 'vertical',
+        slidesPerView: 'auto',
+        mousewheelControl: true,
+        freeMode: true
+    });
+}
+// 32-slideable-menu.html
+function slideableMenu() {
+    const toggleMenu = () => {
+        if (swiper.previousIndex === 0)
+            swiper.slidePrev();
+    };
+    const menuButton = document.getElementsByClassName('menu-button')[0];
+    const swiper = new Swiper('.swiper-container', {
+        slidesPerView: 'auto',
+        initialSlide: 1,
+        resistanceRatio: .00000000000001,
+        onSlideChangeStart: (slider) => {
+            if (slider.activeIndex === 0) {
+                menuButton.classList.add('cross');
+                menuButton.removeEventListener('click', toggleMenu, false);
+            } else
+                menuButton.classList.remove('cross');
+        },
+        onSlideChangeEnd: (slider) => {
+            if (slider.activeIndex === 0)
+                menuButton.removeEventListener('click', toggleMenu, false);
+            else
+                menuButton.addEventListener('click', toggleMenu, false);
+        },
+        slideToClickedSlide: true
+    });
+}
+// 33-responsive-breakpoints.html
+function responsiveBreakpoints() {
+    const swiper = new Swiper('.swiper-container', {
+        pagination: '.swiper-pagination',
+        paginationClickable: true,
+        slidesPerView: 5,
+        spaceBetween: 50,
+        breakpoints: {
+            1024: {
+                slidesPerView: 4,
+                spaceBetween: 40
+            },
+            768: {
+                slidesPerView: 3,
+                spaceBetween: 30
+            },
+            640: {
+                slidesPerView: 2,
+                spaceBetween: 20
+            },
+            320: {
+                slidesPerView: 1,
+                spaceBetween: 10
+            }
+        }
+    });
+}
+// 34-autoheight.html
+function autoheight() {
+    const swiper = new Swiper('.swiper-container', {
+        pagination: '.swiper-pagination',
+        paginationClickable: true,
+        nextButton: '.swiper-button-next',
+        prevButton: '.swiper-button-prev',
+        autoHeight: true, // enable auto height
+    });
+}
+// 35-effect-flip.html
+function effectFlip() {
+    const swiper = new Swiper('.swiper-container', {
+        pagination: '.swiper-pagination',
+        effect: 'flip',
+        grabCursor: true,
+        nextButton: '.swiper-button-next',
+        prevButton: '.swiper-button-prev'
+    });
+}
+// 36-pagination-fraction.html
+function paginationFraction() {
+    const swiper = new Swiper('.swiper-container', {
+        nextButton: '.swiper-button-next',
+        prevButton: '.swiper-button-prev',
+        pagination: '.swiper-pagination',
+        paginationType: 'fraction'
+    });
+}
+// 37-pagination-progress.html
+function paginationProgress() {
+    const swiper = new Swiper('.swiper-container', {
+        nextButton: '.swiper-button-next',
+        prevButton: '.swiper-button-prev',
+        pagination: '.swiper-pagination',
+        paginationType: 'progress'
+    });
+}
+// 38-history.html
+function historyDemo() {
+    const swiper = new Swiper('.swiper-container', {
+        spaceBetween: 50,
+        slidesPerView: 2,
+        centeredSlides: true,
+        slideToClickedSlide: true,
+        grabCursor: true,
+        nextButton: '.swiper-button-next',
+        prevButton: '.swiper-button-prev',
+        scrollbar: '.swiper-scrollbar',
+        pagination: '.swiper-pagination',
+        history: 'slide',
+    });
+}
+// 38-jquery-ie9-loop.html
+function jqueryIe9Loop() {
+    const swiper = new Swiper('.swiper-container', {
+        loop: true,
+        pagination: '.swiper-pagination',
+        paginationClickable: true,
+        nextButton: '.swiper-button-next',
+        prevButton: '.swiper-button-prev'
+    });
+}
+// 39-zoom.html
+function zoom() {
+    const swiper = new Swiper('.swiper-container', {
+        zoom: true,
+        pagination: '.swiper-pagination',
+        nextButton: '.swiper-button-next',
+        prevButton: '.swiper-button-prev'
+    });
+}
diff --git a/types/swiper/v3/tsconfig.json b/types/swiper/v3/tsconfig.json
new file mode 100644
index 0000000000..a06951e219
--- /dev/null
+++ b/types/swiper/v3/tsconfig.json
@@ -0,0 +1,33 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": false,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "types": [],
+        "paths": {
+            "swiper": [
+                "swiper/v3"
+            ],
+            "swiper/*": [
+                "swiper/v3/*"
+            ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "swiper-tests.ts"
+    ]
+}
diff --git a/types/swiper/v3/tslint.json b/types/swiper/v3/tslint.json
new file mode 100644
index 0000000000..b236115191
--- /dev/null
+++ b/types/swiper/v3/tslint.json
@@ -0,0 +1,8 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        // TODOs
+        "no-declare-current-package": false,
+        "no-single-declare-module": false
+    }
+}

From ed43fdd5b75c44831f29480243fe04ece531f0a2 Mon Sep 17 00:00:00 2001
From: Arne Schubert <atd.schubert@gmail.com>
Date: Tue, 17 Apr 2018 02:43:33 +0200
Subject: [PATCH 1314/1382] Enhance definition for heapdump (#24927)

* Enhance definition and according tests for heapdump

* Add changes to fix the CI
---
 types/heapdump/heapdump-tests.ts | 23 +++++++++++++++++------
 types/heapdump/index.d.ts        |  4 +++-
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/types/heapdump/heapdump-tests.ts b/types/heapdump/heapdump-tests.ts
index 49019f83fc..80306b9d32 100644
--- a/types/heapdump/heapdump-tests.ts
+++ b/types/heapdump/heapdump-tests.ts
@@ -1,9 +1,20 @@
 import * as heapdump from 'heapdump';
 
-heapdump.writeSnapshot('/tmp/myDump', (err) => {
-  if (err) {
-    console.log('Failed to dump heap: ' + err);
-  } else {
-    console.log('Successfully dumped heap!');
-  }
+let strValue = "";
+let errValue = new Error(strValue);
+let nullValue = null;
+let undefinedValue;
+
+heapdump.writeSnapshot(strValue, (err, filename) => {
+  errValue = err as Error;
+  nullValue = err as null;
+  strValue = filename as string;
+  undefinedValue = filename as undefined;
+});
+
+heapdump.writeSnapshot((err, filename) => {
+  errValue = err as Error;
+  nullValue = err as null;
+  strValue = filename as string;
+  undefinedValue = filename as undefined;
 });
diff --git a/types/heapdump/index.d.ts b/types/heapdump/index.d.ts
index d4e0477a32..1473ebb70a 100644
--- a/types/heapdump/index.d.ts
+++ b/types/heapdump/index.d.ts
@@ -2,5 +2,7 @@
 // Project: https://github.com/bnoordhuis/node-heapdump
 // Definitions by: weekens <https://github.com/weekens>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
 
-export function writeSnapshot(dumpFileName: string, callback: (err?: Error) => void): void;
+export function writeSnapshot(dumpFileName?: string, callback?: (err: Error | null, filename: string | undefined) => void): void;
+export function writeSnapshot(callback: (err: Error | null, filename: string | undefined) => void): void;

From 23c8bbf227ffec759d835f29c126f25298dfb2b7 Mon Sep 17 00:00:00 2001
From: Evan Hahn <me@evanhahn.com>
Date: Mon, 16 Apr 2018 17:45:19 -0700
Subject: [PATCH 1315/1382] connect: Add `NextFunction` for `next`, fix `err`
 parameter (#24883)

---
 types/connect/connect-tests.ts | 19 +++++++++++++++++--
 types/connect/index.d.ts       |  7 +++++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/types/connect/connect-tests.ts b/types/connect/connect-tests.ts
index 5a7590a9a0..669a146a28 100644
--- a/types/connect/connect-tests.ts
+++ b/types/connect/connect-tests.ts
@@ -4,13 +4,23 @@ import connect = require("connect");
 const app = connect();
 
 // log all requests
-app.use((req: http.IncomingMessage, res: http.ServerResponse, next: Function) => {
+app.use((req: http.IncomingMessage, res: http.ServerResponse, next: connect.NextFunction) => {
     console.log(req, res);
     next();
 });
 
+// "Throw" an Error
+app.use((req: http.IncomingMessage, res: http.ServerResponse, next: connect.NextFunction) => {
+    next(new Error("Something went wrong!"));
+});
+
+// "Throw" a number
+app.use((req: http.IncomingMessage, res: http.ServerResponse, next: connect.NextFunction) => {
+    next(404);
+});
+
 // Stop on errors
-app.use((err: Error, req: http.IncomingMessage, res: http.ServerResponse, next: Function) => {
+app.use((err: any, req: http.IncomingMessage, res: http.ServerResponse, next: connect.NextFunction) => {
     if (err) {
         return res.end(`Error: ${err}`);
     }
@@ -18,6 +28,11 @@ app.use((err: Error, req: http.IncomingMessage, res: http.ServerResponse, next:
     next();
 });
 
+// Use legacy `Function` for `next` parameter.
+app.use((req: http.IncomingMessage, res: http.ServerResponse, next: Function) => {
+    next();
+});
+
 // respond to all requests
 app.use((req: http.IncomingMessage, res: http.ServerResponse) => {
     res.end("Hello from Connect!\n");
diff --git a/types/connect/index.d.ts b/types/connect/index.d.ts
index 8cebd6ba78..4efddb1e7f 100644
--- a/types/connect/index.d.ts
+++ b/types/connect/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for connect v3.4.0
 // Project: https://github.com/senchalabs/connect
 // Definitions by: Maxime LUCE <https://github.com/SomaticIT>
+//                 Evan Hahn <https://github.com/EvanHahn>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -17,9 +18,11 @@ declare function createServer(): createServer.Server;
 declare namespace createServer {
     export type ServerHandle = HandleFunction | http.Server;
 
+    type NextFunction = (err?: any) => void;
+
     export type SimpleHandleFunction = (req: http.IncomingMessage, res: http.ServerResponse) => void;
-    export type NextHandleFunction = (req: http.IncomingMessage, res: http.ServerResponse, next: Function) => void;
-    export type ErrorHandleFunction = (err: Error, req: http.IncomingMessage, res: http.ServerResponse, next: Function) => void;
+    export type NextHandleFunction = (req: http.IncomingMessage, res: http.ServerResponse, next: NextFunction) => void;
+    export type ErrorHandleFunction = (err: any, req: http.IncomingMessage, res: http.ServerResponse, next: NextFunction) => void;
     export type HandleFunction = SimpleHandleFunction | NextHandleFunction | ErrorHandleFunction;
 
     export interface ServerStackItem {

From 24805d40238fa5a3ff18f62b78e6096a8259bcc7 Mon Sep 17 00:00:00 2001
From: earshinov <earshinov@gmail.com>
Date: Tue, 17 Apr 2018 03:55:15 +0300
Subject: [PATCH 1316/1382] [ckeditor] Various additions to the typings
 (#24856)

* Declare that `CKEDITOR` has event subscription interface for global events like `"instanceCreated"`.

Documentation link: https://docs.ckeditor.com/ckeditor4/latest/api/CKEDITOR.html#Events

* Declare `CKEDITOR.editor.getSelectedHtml` with overloads.

Documentation link: https://docs.ckeditor.com/ckeditor4/docs/#!/api/CKEDITOR.editor-method-getSelectedHtml

* Declare some arguments as optional

Documentation links:

* https://docs.ckeditor.com/ckeditor4/docs/#!/api/CKEDITOR.dom.event-method-preventDefault
* https://docs.ckeditor.com/ckeditor4/docs/#!/api/CKEDITOR.dom.range-method-createBookmark2
* https://docs.ckeditor.com/ckeditor4/latest/api/CKEDITOR_dom_node.html#method-getAddress
* https://docs.ckeditor.com/ckeditor4/docs/#!/api/CKEDITOR.dom.range-method-getCommonAncestor

* Fix typings of `createBookmark[s][2]`:

* Properly declare methods `createBookmarks[2]` instead of `createBookmark[2]` on `CKEDITOR.dom.rangeList`.

Documentation link: https://docs.ckeditor.com/ckeditor4/latest/api/CKEDITOR_dom_rangeList.html#method-createBookmarks

* Use return type of `bookmark[]` for "intrusive bookmarks" everywhere as in `CKEDITOR.dom.range.createBookmark`.

* Declare parameters of `CKEDITOR.dom.selection.createBoomarks[2]` as required `Object`'s to follow the documentation.

Documentation link: https://docs.ckeditor.com/ckeditor4/latest/api/CKEDITOR_dom_selection.html#method-createBookmarks

* Declare method `CKEDITOR.dom.node.remove` mistakenly named `move` in the typings.

* Declare `CKEDITOR.dom.range.setEnd{Before,After}` in addition to `setStart{Before,After}`.

Documentation links:

* https://docs.ckeditor.com/ckeditor4/docs/#!/api/CKEDITOR.dom.range-method-setEndAfter
* https://docs.ckeditor.com/ckeditor4/docs/#!/api/CKEDITOR.dom.range-method-setEndBefore

* Declare some `CKEDITOR.tools`

Documentation links:

* https://docs.ckeditor.com/ckeditor4/docs/#!/api/CKEDITOR.tools-method-copy
* https://docs.ckeditor.com/ckeditor4/docs/#!/api/CKEDITOR.tools-method-isArray
* https://docs.ckeditor.com/ckeditor4/docs/#!/api/CKEDITOR.tools-method-override
* https://docs.ckeditor.com/ckeditor4/docs/#!/api/CKEDITOR.tools-method-prototypedCopy

* Declare `CKEDITOR.plugins.registered`.

Documentation link: https://docs.ckeditor.com/ckeditor4/docs/#!/api/CKEDITOR.resourceManager-property-registered

* Declare `CKEDITOR.htmlParser.element.addClass` in addition to `removeClass` and `hasClass`.

Documentation link: https://docs.ckeditor.com/ckeditor4/docs/#!/api/CKEDITOR.htmlParser.element-method-addClass

* Declare `CKEDITOR.htmlParser.{element,fragment}.forEach`.

Documentation links:

* https://docs.ckeditor.com/ckeditor4/docs/#!/api/CKEDITOR.htmlParser.element-method-forEach
* https://docs.ckeditor.com/ckeditor4/docs/#!/api/CKEDITOR.htmlParser.fragment-method-forEach

* Coding style: Convert to single quotes and spaces for indentation.

* Make `fileName` parameter of `CKEDITOR.plugins.addExternal` optional.

Documentation link: https://docs.ckeditor.com/ckeditor4/latest/api/CKEDITOR_plugins.html#method-addExternal

* Make `editable` as a class and declare its constructor.

Documentation link: https://docs.ckeditor.com/ckeditor4/latest/api/CKEDITOR_editable.html#method-constructor
---
 types/ckeditor/ckeditor-tests.ts | 116 ++++++++++++++++++++++++++-----
 types/ckeditor/index.d.ts        |  50 +++++++++----
 2 files changed, 136 insertions(+), 30 deletions(-)

diff --git a/types/ckeditor/ckeditor-tests.ts b/types/ckeditor/ckeditor-tests.ts
index 03f8a1ab3e..1a906bc26e 100644
--- a/types/ckeditor/ckeditor-tests.ts
+++ b/types/ckeditor/ckeditor-tests.ts
@@ -37,6 +37,13 @@ function test_CKEDITOR() {
     CKEDITOR.replaceAll((textarea, config) => false);
 }
 
+function test_CKEDITOR_events() {
+    CKEDITOR.on('instanceCreated', function(event) {
+        // $ExpectType editor
+        event.editor;
+    });
+}
+
 function test_config() {
     var config1: CKEDITOR.config = {
         toolbar: 'basic',
@@ -55,18 +62,18 @@ function test_config() {
     var config3: CKEDITOR.config = {
         toolbarGroups: [
             { name: 'clipboard', groups: [ 'clipboard', 'undo' ] },
-		    { name: 'editing', groups: [ 'find', 'selection', 'spellchecker', 'editing' ] },
-		    { name: 'links', groups: [ 'links' ] },
-		    { name: 'insert', groups: [ 'insert' ] },
-		    { name: 'tools', groups: [ 'tools' ] },
-		    { name: 'document', groups: [ 'mode' ] },
-		    { name: 'about', groups: [ 'about' ] },
-		    '/',
-		    { name: 'basicstyles', groups: [ 'basicstyles', 'cleanup' ] },
-		    { name: 'paragraph', groups: [ 'list', 'indent', 'blocks', 'align', 'paragraph' ] },
-		    '/',
-		    { name: 'styles', groups: [ 'styles' ] },
-		    { name: 'colors', groups: [ 'colors' ] },
+            { name: 'editing', groups: [ 'find', 'selection', 'spellchecker', 'editing' ] },
+            { name: 'links', groups: [ 'links' ] },
+            { name: 'insert', groups: [ 'insert' ] },
+            { name: 'tools', groups: [ 'tools' ] },
+            { name: 'document', groups: [ 'mode' ] },
+            { name: 'about', groups: [ 'about' ] },
+            '/',
+            { name: 'basicstyles', groups: [ 'basicstyles', 'cleanup' ] },
+            { name: 'paragraph', groups: [ 'list', 'indent', 'blocks', 'align', 'paragraph' ] },
+            '/',
+            { name: 'styles', groups: [ 'styles' ] },
+            { name: 'colors', groups: [ 'colors' ] },
         ],
     }
 }
@@ -211,7 +218,7 @@ function test_dom_event() {
         domEvent.getTarget().addClass('clicked');
     });
     element.on('click', ev=> {
-        var domEvent = ev.data;
+        var domEvent = ev.data as CKEDITOR.dom.event;
         domEvent.preventDefault();
     });
 }
@@ -344,12 +351,14 @@ function test_adding_dialog_by_definition() {
     });
 }
 
-function test_adding_plugin() {
+function test_plugins() {
     CKEDITOR.plugins.add( 'abbr', {
         init: function( editor: CKEDITOR.editor ) {
             // empty logic
         }
     });
+
+    console.log(CKEDITOR.plugins.registered['abbr']);
 }
 
 function test_adding_widget() {
@@ -512,7 +521,80 @@ function test_editor_instance_event() {
 }
 
 function test_dtd() {
-    var brConsideredEmptyTag = CKEDITOR.dtd.$empty["br"];
-    var spanCanContainText = CKEDITOR.dtd["span"]["#"];
-    var divCanContainSpan = CKEDITOR.dtd["div"]["span"];
+    var brConsideredEmptyTag = CKEDITOR.dtd.$empty['br'];
+    var spanCanContainText = CKEDITOR.dtd['span']['#'];
+    var divCanContainSpan = CKEDITOR.dtd['div']['span'];
+}
+
+function test_getSelectedHtml() {
+    var textarea = document.createElement('textarea');
+    var editor = CKEDITOR.replace(textarea);
+
+    // $ExpectType documentFragment
+    var sel1 = editor.getSelectedHtml();
+    console.log(sel1);
+
+    // $ExpectType documentFragment
+    var sel2 = editor.getSelectedHtml(false);
+    console.log(sel2);
+
+    // $ExpectType string
+    var sel3 = editor.getSelectedHtml(true);
+    console.log(sel3);
+
+    // $ExpectType string | documentFragment
+    var sel4 = editor.getSelectedHtml(Math.random() > 0.5);
+    console.log(sel4);
+}
+
+function test_element() {
+    var el = CKEDITOR.document.getById('myElement');
+    el.addClass('class');
+    console.log(el.hasClass('class'));
+    el.removeClass('class');
+}
+
+function test_selection() {
+    var editor = new CKEDITOR.editor();
+    var testNode = CKEDITOR.document.getById('myElement');
+
+    var selection = editor.getSelection();
+    var ranges = selection.getRanges();
+    for (var i = 0, c = ranges.length; i < c; i++) {
+        var range = ranges[i];
+        range.setStartBefore(testNode);
+        range.setStartAfter(testNode);
+        range.setEndBefore(testNode);
+        range.setEndAfter(testNode);
+    }
+}
+
+function test_tools() {
+    var obj = { key: 'value' };
+    CKEDITOR.tools.clone(obj);
+    CKEDITOR.tools.copy(obj);
+    CKEDITOR.tools.prototypedCopy(obj);
+
+    console.log(CKEDITOR.tools.isArray([1])); // true
+    console.log(CKEDITOR.tools.isArray(obj)); // false
+    console.log(CKEDITOR.tools.isArray(null)); // false
+    console.log(CKEDITOR.tools.isArray(undefined)); // false
+
+    CKEDITOR.tools.override(parseInt, function(_parseInt) {
+        return function(value: any, radix?: number) {
+            return _parseInt(value, radix);
+        };
+    });
+}
+
+function test_htmlParser() {
+    var html = '<div><span>text</span></div>';
+    var fragment = CKEDITOR.htmlParser.fragment.fromHtml(html);
+    fragment.forEach(function(node) {
+        if (node instanceof CKEDITOR.htmlParser.element) {
+            node.forEach(function(node) {
+                console.log(node);
+            });
+        }
+    }, CKEDITOR.NODE_ELEMENT, true);
 }
diff --git a/types/ckeditor/index.d.ts b/types/ckeditor/index.d.ts
index e26abd16b4..3370479bff 100644
--- a/types/ckeditor/index.d.ts
+++ b/types/ckeditor/index.d.ts
@@ -80,7 +80,6 @@ declare namespace CKEDITOR {
     var version: string;
     var config: config;
 
-
     // Methods
     function add(editor: editor): void;
     function addCss(css: string): void;
@@ -101,6 +100,17 @@ declare namespace CKEDITOR {
     function replaceAll(className?: string): void;
     function replaceAll(assertionFunction: (textarea: HTMLTextAreaElement, config: config) => boolean): void;
 
+    // Event interface
+    function capture(): void;
+    function define(name: string, meta: Object): void;
+    function fire(eventName: string, data?: Object, editor?: editor): any;
+    function fireOnce(eventName: string, data?: Object, editor?: editor): any;
+    function hasListeners(eventName: string): boolean;
+    function on(eventName: string, listenerFunction: (eventInfo: eventInfo) => void, scopeObj?: Object, listenerData?: Object, priority?: number): void;
+    function once(eventName: string, listenerFunction: (eventInfo: eventInfo) => void, scopeObj?: Object, listenerData?: Object, priority?: number): void;
+    function removeAllListeners(): void;
+    function removeListener(eventName: string, listenerFunction: (eventInfo: eventInfo) => void): void;
+
     type listenerRegistration = {
         removeListener: () => void;
     }
@@ -321,11 +331,11 @@ declare namespace CKEDITOR {
             deleteContents(mergeThen?: boolean): void;
             extractContents(mergeThen?: boolean): documentFragment;
             createBookmark(serializable?: boolean): bookmark;
-            createBookmark2(normalized: boolean): Object;
+            createBookmark2(normalized?: boolean): Object;
             createIterator(): iterator;
             moveToBookmark(bookmark: Object): void;
             getBoundaryNodes(): { startNode: node; endNode: node; };
-            getCommonAncestor(includeSelf: boolean, ignoreTextNode: boolean): element;
+            getCommonAncestor(includeSelf?: boolean, ignoreTextNode?: boolean): element;
             optimize(): void;
             optimizeBookmark(): void;
             trim(ignoreStart?: boolean, ignoreEnd?: boolean): void;
@@ -337,6 +347,8 @@ declare namespace CKEDITOR {
             selectNodeContents(node: node): void;
             setStart(startNode: node, startOffset: number): void;
             setEnd(endNode: node, endOffset: number): void;
+            setEndAfter(node: node): void;
+            setEndBefore(node: node): void;
             setStartAfter(node: node): void;
             setStartBefore(node: node): void;
             setStartAt(node: node, position: number): void;
@@ -380,8 +392,8 @@ declare namespace CKEDITOR {
             constructor(target: document);
             constructor(target: element);
             constructor(target: selection);
-            createBookmarks(serializable: Object): any[];
-            createBookmarks2(normalized?: Object): any[];
+            createBookmarks(serializable: Object): bookmark[];
+            createBookmarks2(normalized: Object): Object[];
             fake(element: element): void;
             getCommonAncestor(): element;
             getNative(): Object;
@@ -406,8 +418,8 @@ declare namespace CKEDITOR {
             constructor(ranges: range[]);
             constructor(range: range);
             createIterator(): rangeListIterator;
-            createBokmark(serializable: boolean): Object[];
-            createBookmark2(normalized: boolean): Object[];
+            createBokmarks(serializable?: boolean): bookmark[];
+            createBookmarks2(normalized?: boolean): Object[];
             moveToBookmark(bookmarks: Object[]): void;
         }
 
@@ -431,7 +443,7 @@ declare namespace CKEDITOR {
             insertAfter(node: node): node;
             insertBefore(node: node): node;
             insertBeforeMe(node: node): node;
-            getAddress(normalized: boolean): Object[];
+            getAddress(normalized?: boolean): Object[];
             getDocument(): document;
             getIndex(normalized?: boolean): number;
             getNextSourceNode(startFromSibling: Object, nodeType: Object, guard: Object): void;
@@ -444,7 +456,7 @@ declare namespace CKEDITOR {
             getPosition(otherNode: Object): void;
             getAscendant(reference: string, includeSelf?: boolean): node;
             hasAscendant(name: Object, includeSelf: any): boolean;
-            move(preserveChildren?: boolean): node;
+            remove(preserveChildren?: boolean): node;
             replace(nodeToReplace: node): void;
             trim(): void;
             ltrim(): void;
@@ -464,7 +476,7 @@ declare namespace CKEDITOR {
             constructor(domEvent: Event);
             getKey(): number;
             getKeystroke(): number;
-            preventDefault(stopPropagation: boolean): void;
+            preventDefault(stopPropagation?: boolean): void;
             stopPropagation(): void;
             getTarget(): node;
             getPhase(): number;
@@ -878,7 +890,8 @@ declare namespace CKEDITOR {
         applyToRange(range: Range, editor: editor): void;
     }
 
-    interface editable extends dom.element {
+    class editable extends dom.element {
+        constructor(editor: editor, element: HTMLElement | dom.element);
         hasFocus: boolean;
         attachListener(obj: event | editable, eventName: string, listenerFunction: (ei: eventInfo) => void,
             scopeobj?: {}, listenerData?: any, priority?: number): listenerRegistration;
@@ -1077,13 +1090,13 @@ declare namespace CKEDITOR {
 
         function add(name: string, definition: IPluginDefinition): void;
         function add(name: string): void;
-        function addExternal(name: string, path: string, fileName: string): void;
+        function addExternal(name: string, path: string, fileName?: string): void;
         function get(name: string): any;
         function getFilePath(name: string): string;
         function getPath(name: string): string;
         function load(name: string, callback: Function, scope?: Object): void;
         function setLang(pluginName: string, languageCode: string, languageEntries: any): void;
-
+        var registered: {[key: string]: IPluginDefinition};
     }
 
     interface IMenuItemDefinition {
@@ -1155,6 +1168,9 @@ declare namespace CKEDITOR {
         getData(noEvents?: Object): string;
         getMenuItem(name: string): Object;
         getResizable(forContents: boolean): dom.element;
+        getSelectedHtml(toString?: false): dom.documentFragment;
+        getSelectedHtml(toString: true): string;
+        getSelectedHtml(toString?: boolean): CKEDITOR.dom.documentFragment | string;
         getSelection(forceRealSelection?: boolean): dom.selection;
         getSnapshot(): string;
         getStylesSet(callback: Function): void;
@@ -1839,9 +1855,11 @@ declare namespace CKEDITOR {
             type: number;
             add(node: node): number;
             add(node: node, index: number): void;
+            addClass(className: string): void;
             clone(): element;
             filter(filter: filter): boolean;
             filterChildren(filter: filter): void;
+            forEach(callback: (node: node, type?: number) => void|false, type?: number, skipRoot?: boolean): void;
             writeHtml(writer: basicWriter, filter: filter): void;
             writeChildrenHtml(writer: basicWriter, filter: filter): void;
             replaceWithChildren(): void;
@@ -1872,6 +1890,7 @@ declare namespace CKEDITOR {
             add(node: node, index?: number): void;
             filter(filter: filter): void;
             filterChildren(filter: filter, filterRoot?: boolean): void;
+            forEach(callback: (node: node, type?: number) => void|false, type?: number, skipRoot?: boolean): void;
             writeHtml(writer: basicWriter, filter?: filter): void;
             writeChildrenHtml(writer: basicWriter, filter?: filter, filterRoot?: boolean): void;
             forEach(callback: (node: node, type?: number) => boolean, type?: number, skipRoot?: boolean): void;
@@ -1909,8 +1928,13 @@ declare namespace CKEDITOR {
 
     namespace tools {
         var callFunction: Function;
+        function clone(source: Object): Object;
+        function copy(source: Object): Object;
         function enableHtml5Elements(doc: Object, withAppend?: Boolean): void;
+        function isArray<T>(object: any|null|undefined): object is T[];
+        function override<T extends Function>(originalFunction: T, functionBuilder: (originalFunction: T) => T): T;
         function parseCssText(styleText: string, normalize?: Boolean, nativeNormalize?: Boolean): { [key: string]: string }
+        function prototypedCopy(source: Object): Object;
         function writeCssText(style: { [key: string]: string }, sort?: Boolean): string;
     }
 

From 92477a4d52a9675db636227c1934037355930191 Mon Sep 17 00:00:00 2001
From: Konrad Mattheis <konne@users.noreply.github.com>
Date: Tue, 17 Apr 2018 02:56:24 +0200
Subject: [PATCH 1317/1382] fix functions that have a object with multiple
 return values like GetHyperCubeContinuousData (#25010)

Signed-off-by: Konrad Mattheis <konrad.mattheis@akquinet.de>
---
 types/qlik-engineapi/index.d.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/types/qlik-engineapi/index.d.ts b/types/qlik-engineapi/index.d.ts
index 309a30f2b0..f0f95301c3 100644
--- a/types/qlik-engineapi/index.d.ts
+++ b/types/qlik-engineapi/index.d.ts
@@ -3007,7 +3007,7 @@ declare namespace EngineAPI {
          * @param qTable - Name of the table. This parameter must be set for XLS, XLSX, HTML and XML files.
          * @returns - return a Promise Array of DataField or String.
          */
-        getFileTableFields(qConnectionId: string, qDataFormat: IFileDataFormat, qTable: string, qRelativePath?: string): Promise<IDataField[]> | Promise<string>;
+        getFileTableFields(qConnectionId: string, qDataFormat: IFileDataFormat, qTable: string, qRelativePath?: string): Promise<{qFields: IDataField[], qFormatSpec: string}>;
 
         /**
          * Lists the values in a table for a folder connection.
@@ -3017,7 +3017,7 @@ declare namespace EngineAPI {
          * @param qTable - Name of the table. This parameter must be set for XLS, XLSX, HTML and XML files.
          * @returns - return a Promise <Array of DataField> or <String>.
          */
-        getFileTablePreview(qConnectionId: string, qRelativePath: string, qDataFormat: IFileDataFormat, qTable: string): Promise<IDataRecord[]> | Promise<string>;
+        getFileTablePreview(qConnectionId: string, qRelativePath: string, qDataFormat: IFileDataFormat, qTable: string): Promise<{qPreview: IDataRecord[], qFormatSpec: string}>;
 
         /**
          * Lists the tables and fields of a JSON or XML file for a folder connection.
@@ -3111,7 +3111,7 @@ declare namespace EngineAPI {
          * Note: This method is deprecated (not recommended to use). Use GetLibraryContent method instead.
          * @returns - return a Promise Boolean or MediaList
          */
-        getMediaList(): Promise<MediaList[]> | Promise<boolean>;
+        getMediaList(): Promise<MediaList[]>;
 
         /**
          * Returns the handle of a measure.
@@ -3193,7 +3193,7 @@ declare namespace EngineAPI {
          * @param qIncludeSysVars - If set to true, the system variables are included.
          * @returns - return a Promise <Array of TableRecord> or <Array of SourceKeyRecord>
          */
-        getTablesAndKeys(qWindowSize: ISize, qNullSize: ISize, qCellHeight: number, qSyntheticMode: boolean, qIncludeSysVars: boolean): Promise<ITableRecord[]> | Promise<ISourceKeyRecord[]>;
+        getTablesAndKeys(qWindowSize: ISize, qNullSize: ISize, qCellHeight: number, qSyntheticMode: boolean, qIncludeSysVars: boolean): Promise<{qtr: ITableRecord[], qk: ISourceKeyRecord[]}>;
 
         /**
          * Fetches updated variables after a statement execution.
@@ -5458,7 +5458,7 @@ declare namespace EngineAPI {
          * Options.MaxNbrTicks - maximum number of ticks.
          * @returns - A Promise <Boolean> or <Array of NxDataPage> or <Array of NxAxisData>
          */
-        getHyperCubeContinuousData(qPath: string, qOptions: IContinuousDataOptions[]): Promise<boolean> | Promise<INxDataPage[]> | Promise<INxAxisData[]>;
+        getHyperCubeContinuousData(qPath: string, qOptions: IContinuousDataOptions[]): Promise<{qDataPages: INxDataPage[], qAxisData: INxAxisData[]}>;
 
         /**
          * Retrieves the values of a chart, a table, or a scatter plot. It is possible to retrieve specific pages of data.
@@ -5586,7 +5586,7 @@ declare namespace EngineAPI {
          * - Options.MaxNbrTicks - maximum number of ticks.
          * @returns - A data set Array of (NxDataPage) or (NxAxisData)
          */
-        getListObjectContinuousData(qPath: string, qOptions: IContinuousDataOptions): Promise<INxDataPage[]> | Promise<INxAxisData[]>;
+        getListObjectContinuousData(qPath: string, qOptions: IContinuousDataOptions): Promise<{qDataPages: INxDataPage, qAxisData: INxAxisData[]}>;
 
         /**
          * Retrieves the values of a list object.

From f929c81119f6103fe7e2ce8ee16102a3d6d832ee Mon Sep 17 00:00:00 2001
From: Juanjo Diaz <juanjo.diazmo@gmail.com>
Date: Tue, 17 Apr 2018 03:56:41 +0300
Subject: [PATCH 1318/1382] Add new unwindBlank to json2csv (#25043)

---
 types/json2csv/JSON2CSVBase.d.ts | 1 +
 types/json2csv/index.d.ts        | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/json2csv/JSON2CSVBase.d.ts b/types/json2csv/JSON2CSVBase.d.ts
index d65a3cc297..c5f328db1f 100644
--- a/types/json2csv/JSON2CSVBase.d.ts
+++ b/types/json2csv/JSON2CSVBase.d.ts
@@ -13,6 +13,7 @@ export declare namespace json2csv {
         fields?: Array<string | FieldInfo<T>>;
         ndjson?: boolean;
         unwind?: string | Array<string>;
+        unwindBlank?: boolean;
         flatten?: boolean;
         defaultValue?: string;
         quote?: string;
diff --git a/types/json2csv/index.d.ts b/types/json2csv/index.d.ts
index 159dec6eb1..55a1829625 100644
--- a/types/json2csv/index.d.ts
+++ b/types/json2csv/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for json2csv 4.0
+// Type definitions for json2csv 4.1
 // Project: https://github.com/zemirco/json2csv
 // Definitions by: Juanjo Diaz <https://github.com/juanjoDiaz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

From 0b0483cf788fab26a93e907a0ef6c329cdcba20e Mon Sep 17 00:00:00 2001
From: Shayne Hartford <ShayneEHartford@Gmail.Com>
Date: Tue, 17 Apr 2018 10:57:59 -0400
Subject: [PATCH 1319/1382] @types/snekfetch: Added optional
 Snekfetch.SnekfetchOptions (#24754)

* Edited version

* Because travis succ

* Added friend's suggestions

* Fixed

* Upgraded typescript version
---
 types/snekfetch/index.d.ts | 78 +++++++++++++++++++-------------------
 1 file changed, 40 insertions(+), 38 deletions(-)

diff --git a/types/snekfetch/index.d.ts b/types/snekfetch/index.d.ts
index 71ef08d9a1..ac77f8a572 100644
--- a/types/snekfetch/index.d.ts
+++ b/types/snekfetch/index.d.ts
@@ -1,8 +1,10 @@
-// Type definitions for snekfetch 3.1
+// Type definitions for snekfetch 3.6
 // Project: https://github.com/GusCaplan/snekfetch
 // Definitions by: Iker Pérez Brunelli <https://github.com/DarkerTV>
+//                 Shayne Hartford <https://github.com/ShayBox>
+//                 Yukine <https://github.com/Dev-Yukine>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.4
 
 /// <reference types="node" />
 
@@ -71,48 +73,48 @@ declare class Snekfetch extends Readable {
 
     constructor(method: Snekfetch.methods, url: string, opts?: Snekfetch.SnekfetchOptions);
 
-    static acl(url: string): Snekfetch;
-    static bind(url: string): Snekfetch;
-    static checkout(url: string): Snekfetch;
-    static connect(url: string): Snekfetch;
-    static copy(url: string): Snekfetch;
-    static delete(url: string): Snekfetch;
-    static get(url: string): Snekfetch;
-    static head(url: string): Snekfetch;
-    static link(url: string): Snekfetch;
-    static lock(url: string): Snekfetch;
-    static msearch(url: string): Snekfetch;
-    static merge(url: string): Snekfetch;
-    static mkactivity(url: string): Snekfetch;
-    static mkcalendar(url: string): Snekfetch;
-    static mkcol(url: string): Snekfetch;
-    static move(url: string): Snekfetch;
-    static notify(url: string): Snekfetch;
-    static options(url: string): Snekfetch;
-    static patch(url: string): Snekfetch;
-    static post(url: string): Snekfetch;
-    static propfind(url: string): Snekfetch;
-    static proppatch(url: string): Snekfetch;
-    static purge(url: string): Snekfetch;
-    static put(url: string): Snekfetch;
-    static rebind(url: string): Snekfetch;
-    static report(url: string): Snekfetch;
-    static search(url: string): Snekfetch;
-    static subscribe(url: string): Snekfetch;
-    static trace(url: string): Snekfetch;
-    static unbind(url: string): Snekfetch;
-    static unlink(url: string): Snekfetch;
-    static unlock(url: string): Snekfetch;
-    static unsubscribe(url: string): Snekfetch;
-    static brew(url: string): Snekfetch;
+    static acl(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
+    static bind(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
+    static checkout(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
+    static connect(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
+    static copy(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
+    static delete(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
+    static get(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
+    static head(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
+    static link(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
+    static lock(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
+    static msearch(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
+    static merge(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
+    static mkactivity(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
+    static mkcalendar(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
+    static mkcol(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
+    static move(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
+    static notify(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
+    static options(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
+    static patch(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
+    static post(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
+    static propfind(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
+    static proppatch(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
+    static purge(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
+    static put(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
+    static rebind(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
+    static report(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
+    static search(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
+    static subscribe(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
+    static trace(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
+    static unbind(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
+    static unlink(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
+    static unlock(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
+    static unsubscribe(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
+    static brew(url: string, opts?: Snekfetch.SnekfetchOptions): Snekfetch;
 
-    query(name: string, value: string): Snekfetch;
+    query(name: string | { [key: string]: string | string[] }, value?: string): Snekfetch;
 
     set(name: string | { [key: string]: string | string[] }, value?: string | string[]): Snekfetch;
 
     attach(name: string, data: string | object | Buffer, filename?: string): Snekfetch;
 
-    send(data?: any): Snekfetch;
+    send(data?: string|Buffer|object): Snekfetch;
 
     then(): Promise<Snekfetch.Result>;
     then<T>(resolver: (res: Snekfetch.Result) => T, rejector?: (err: Error) => any): Promise<T>;

From 33babb4010b71099f0fe6b05bad7527eb35ad149 Mon Sep 17 00:00:00 2001
From: Aneil Mallavarapu <aneilmallavar@gmail.com>
Date: Tue, 17 Apr 2018 07:58:44 -0700
Subject: [PATCH 1320/1382] Add types/jsonwebtokens-promisified (#25038)

* Add jsonwebtoken-promisified

* Add types/jsonwebtoken-promisified

* Remove tslint ignore statements & fix issues
---
 .github/CODEOWNERS                            |   1 +
 types/jsonwebtoken-promisified/index.d.ts     | 188 ++++++++++++++++++
 .../jsonwebtoken-promisified-tests.ts         | 148 ++++++++++++++
 types/jsonwebtoken-promisified/tsconfig.json  |  23 +++
 types/jsonwebtoken-promisified/tslint.json    |   3 +
 5 files changed, 363 insertions(+)
 create mode 100644 types/jsonwebtoken-promisified/index.d.ts
 create mode 100644 types/jsonwebtoken-promisified/jsonwebtoken-promisified-tests.ts
 create mode 100644 types/jsonwebtoken-promisified/tsconfig.json
 create mode 100644 types/jsonwebtoken-promisified/tslint.json

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index f3343415f0..7f3c8671de 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1858,6 +1858,7 @@
 /types/jsonstream/                              @Bartvds
 /types/jsontoxml/                               @benstevens48
 /types/jsonwebtoken/                            @SomaticIT @danielheim @brikou
+/types/jsonwebtoken-promisified                 @aneilbaboo
 /types/jspdf/                                   @amberjs
 /types/jsqrcode/                                @lordazzi
 /types/jsrender/                                @zakki
diff --git a/types/jsonwebtoken-promisified/index.d.ts b/types/jsonwebtoken-promisified/index.d.ts
new file mode 100644
index 0000000000..80f28e6528
--- /dev/null
+++ b/types/jsonwebtoken-promisified/index.d.ts
@@ -0,0 +1,188 @@
+// Type definitions for jsonwebtoken-promisified 1.0
+// Project: https://github.com/joepie91/node-jsonwebtoken-promisified
+// Definitions by: Maxime LUCE <https://github.com/SomaticIT>,
+//                 Daniel Heim <https://github.com/danielheim>,
+//                 Brice BERNARD <https://github.com/brikou>
+//                 Aneil Mallavarapu <https://github.com/aneilbaboo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/// <reference types="node" />
+
+export class JsonWebTokenError extends Error {
+    inner: Error;
+
+    constructor(message: string, error?: Error);
+}
+
+export class TokenExpiredError extends JsonWebTokenError {
+    expiredAt: number;
+
+    constructor(message: string, expiredAt: number);
+}
+
+export class NotBeforeError extends JsonWebTokenError {
+    date: Date;
+
+    constructor(message: string, date: Date);
+}
+
+export interface SignOptions {
+    /**
+     * Signature algorithm. Could be one of these values :
+     * - HS256:    HMAC using SHA-256 hash algorithm (default)
+     * - HS384:    HMAC using SHA-384 hash algorithm
+     * - HS512:    HMAC using SHA-512 hash algorithm
+     * - RS256:    RSASSA using SHA-256 hash algorithm
+     * - RS384:    RSASSA using SHA-384 hash algorithm
+     * - RS512:    RSASSA using SHA-512 hash algorithm
+     * - ES256:    ECDSA using P-256 curve and SHA-256 hash algorithm
+     * - ES384:    ECDSA using P-384 curve and SHA-384 hash algorithm
+     * - ES512:    ECDSA using P-521 curve and SHA-512 hash algorithm
+     * - none:     No digital signature or MAC value included
+     */
+    algorithm?: string;
+    keyid?: string;
+    /** {string} - expressed in seconds or a string describing a time span [zeit/ms](https://github.com/zeit/ms.js).  Eg: 60, "2 days", "10h", "7d" */
+    expiresIn?: string | number;
+    /** {string} - expressed in seconds or a string describing a time span [zeit/ms](https://github.com/zeit/ms.js).  Eg: 60, "2 days", "10h", "7d" */
+    notBefore?: string | number;
+    audience?: string | string[];
+    subject?: string;
+    issuer?: string;
+    jwtid?: string;
+    noTimestamp?: boolean;
+    header?: object;
+    encoding?: string;
+}
+
+export interface VerifyOptions {
+    algorithms?: string[];
+    audience?: string | string[];
+    clockTimestamp?: number;
+    clockTolerance?: number;
+    issuer?: string | string[];
+    ignoreExpiration?: boolean;
+    ignoreNotBefore?: boolean;
+    jwtid?: string;
+    subject?: string;
+    /**
+     * @deprecated
+     * {string} - Max age of token
+     */
+    maxAge?: string;
+}
+
+export interface DecodeOptions {
+    complete?: boolean;
+    json?: boolean;
+}
+
+export type VerifyCallback = (
+    err: JsonWebTokenError | NotBeforeError | TokenExpiredError,
+    decoded: object | string
+) => void;
+
+export type SignCallback = (err: Error, encoded: string) => void;
+
+export type Secret = string | Buffer | { key: string; passphrase: string };
+
+/**
+ * Synchronously sign the given payload into a JSON Web Token string
+ * @param payload - Payload to sign, could be an literal, buffer or string
+ * @param secretOrPrivateKey - Either the secret for HMAC algorithms, or the PEM encoded private key for RSA and ECDSA.
+ * @param [options] - Options for the signature
+ * @returns The JSON Web Token string
+ */
+export function sign(
+    payload: string | Buffer | object,
+    secretOrPrivateKey: Secret,
+    options?: SignOptions,
+): string;
+
+/**
+ * Sign the given payload into a JSON Web Token string
+ * @param payload - Payload to sign, could be an literal, buffer or string
+ * @param secretOrPrivateKey - Either the secret for HMAC algorithms, or the PEM encoded private key for RSA and ECDSA.
+ * @param options - Options for the signature
+ * @param callback - Callback to get the encoded token on
+ */
+export function sign(
+    payload: string | Buffer | object,
+    secretOrPrivateKey: Secret,
+    callback: SignCallback,
+): void;
+export function sign(
+    payload: string | Buffer | object,
+    secretOrPrivateKey: Secret,
+    options: SignOptions,
+    callback: SignCallback,
+): void;
+
+/**
+ * Sign the given payload asynchronously into a JSON Web Token String
+ * @param payload - Payload to sign, could be an literal, buffer or string
+ * @param secretOrPrivateKey - Either the secret for HMAC algorithms, or the PEM encoded private key for RSA and ECDSA.
+ * @param [options] - Options for the signature
+ * @returns A promise providing JSON Web Token string
+ */
+export function signAsync(
+    payload: string | Buffer | object,
+    secretOrPrivateKey: Secret,
+    options?: SignOptions
+): Promise<string>;
+
+/**
+ * Synchronously verify given token using a secret or a public key to get a decoded token
+ * @param token - JWT string to verify
+ * @param secretOrPublicKey - Either the secret for HMAC algorithms, or the PEM encoded public key for RSA and ECDSA.
+ * @param [options] - Options for the verification
+ * @returns The decoded token.
+ */
+export function verify(
+    token: string,
+    secretOrPublicKey: string | Buffer,
+    options?: VerifyOptions,
+): object | string;
+
+/**
+ * Asynchronously verify given token using a secret or a public key to get a decoded token
+ * @param token - JWT string to verify
+ * @param secretOrPublicKey - Either the secret for HMAC algorithms, or the PEM encoded public key for RSA and ECDSA.
+ * @param options - Options for the verification
+ * @param callback - Callback to get the decoded token on
+ */
+export function verify(
+    token: string,
+    secretOrPublicKey: string | Buffer,
+    callback?: VerifyCallback
+): void;
+export function verify(
+    token: string,
+    secretOrPublicKey: string | Buffer,
+    options: VerifyOptions,
+    callback?: VerifyCallback
+): void;
+
+/**
+ * Asynchronously verify given token using a secret or a public key to get a decoded token
+ * @param token - the JWT string to verify
+ * @param secretOrPublicKey - Either the secret for HMAC algorithms, or the PEM encoded public key for RSA and ECDSA.
+ * @returns - Promise returning the decoded token
+ */
+export function verifyAsync(
+    token: string,
+    secretOrPublicKey: string | Buffer,
+    options?: VerifyOptions
+): Promise<object|string>;
+
+/**
+ * Returns the decoded payload without verifying if the signature is valid.
+ * @param token - JWT string to decode
+ * @param [options] - Options for decoding
+ * @returns The decoded Token
+ */
+export function decode(
+    token: string,
+    options?: DecodeOptions,
+): null | { [key: string]: any } | string;
diff --git a/types/jsonwebtoken-promisified/jsonwebtoken-promisified-tests.ts b/types/jsonwebtoken-promisified/jsonwebtoken-promisified-tests.ts
new file mode 100644
index 0000000000..bfa282bdee
--- /dev/null
+++ b/types/jsonwebtoken-promisified/jsonwebtoken-promisified-tests.ts
@@ -0,0 +1,148 @@
+/**
+ * Test suite created by Maxime LUCE <https://github.com/SomaticIT>
+ *
+ * Created by using code samples from https://github.com/auth0/node-jsonwebtoken.
+ */
+
+import jwt = require("jsonwebtoken-promisified");
+import fs = require("fs");
+
+let token: string;
+let cert: Buffer;
+
+interface TestObject {
+    foo: string;
+}
+
+const testObject = { foo: "bar" };
+
+/**
+ * jwt.sign
+ * https://github.com/auth0/node-jsonwebtoken#usage
+ */
+// sign with default (HMAC SHA256)
+token = jwt.sign(testObject, "shhhhh");
+
+// sign with default (HMAC SHA256) and single audience
+token = jwt.sign(testObject, "shhhhh", { audience: "theAudience" });
+
+// sign with default (HMAC SHA256) and multiple audiences
+token = jwt.sign(testObject, "shhhhh", {
+    audience: ["audience1", "audience2"],
+});
+
+// sign with default (HMAC SHA256) and a keyid
+token = jwt.sign(testObject, "shhhhh", { keyid: "theKeyId" });
+
+// sign with RSA SHA256
+cert = fs.readFileSync("private.key"); // get private key
+token = jwt.sign(testObject, cert, { algorithm: "RS256" });
+
+// sign with encrypted RSA SHA256 private key (only PEM encoding is supported)
+const privKey: Buffer = fs.readFileSync("encrypted_private.key"); // get private key
+const secret = { key: privKey.toString(), passphrase: "keypwd" };
+token = jwt.sign(testObject, secret, { algorithm: "RS256" }); // the algorithm option is mandatory in this case
+
+// sign asynchronously
+jwt.sign(testObject, cert, { algorithm: "RS256" }, (
+    err: Error,
+    token: string,
+) => {
+    console.log(token);
+});
+
+jwt.signAsync(testObject, cert, { algorithm: "RS256" }).then(
+    (token: string) => console.log(token)
+);
+/**
+ * jwt.verify
+ * https://github.com/auth0/node-jsonwebtoken#jwtverifytoken-secretorpublickey-options-callback
+ */
+// verify a token symmetric
+jwt.verify(token, "shhhhh", (
+    err: jwt.JsonWebTokenError | jwt.NotBeforeError | jwt.TokenExpiredError,
+    decoded: object | string
+) => {
+    const result = decoded as TestObject;
+
+    console.log(result.foo); // bar
+});
+jwt.verifyAsync(token, "shhhhh").then(decoded => {
+    const result = decoded as TestObject;
+
+    console.log(result.foo); // bar
+});
+
+// use external time for verifying
+jwt.verify(token, 'shhhhh', { clockTimestamp: 1 }, (err, decoded) => {
+  const result = decoded as TestObject;
+
+  console.log(result.foo); // bar
+});
+jwt.verifyAsync(token, 'shhhhh', { clockTimestamp: 1 }).then(decoded => {
+    const result = decoded as TestObject;
+
+    console.log(result.foo); // bar
+});
+
+// invalid token
+jwt.verify(token, "wrong-secret", (err, decoded) => {
+    // err
+    // decoded undefined
+});
+
+// verify a token asymmetric
+cert = fs.readFileSync("public.pem"); // get public key
+jwt.verify(token, cert, (err, decoded) => {
+    const result = decoded as TestObject;
+
+    console.log(result.foo); // bar
+});
+
+jwt.verifyAsync(token, cert).then(decoded => {
+    const result = decoded as TestObject;
+    console.log(result.foo); // bar
+});
+
+// verify audience
+cert = fs.readFileSync("public.pem"); // get public key
+jwt.verify(token, cert, { audience: "urn:foo" }, (err, decoded) => {
+    // if audience mismatch, err == invalid audience
+});
+
+// verify issuer
+cert = fs.readFileSync("public.pem"); // get public key
+jwt.verify(token, cert, { audience: "urn:foo", issuer: "urn:issuer" }, (
+    err,
+    decoded,
+) => {
+    // if issuer mismatch, err == invalid issuer
+});
+
+// verify algorithm
+cert = fs.readFileSync("public.pem"); // get public key
+jwt.verify(token, cert, { algorithms: ["RS256"] }, (err, decoded) => {
+    // if algorithm mismatch, err == invalid algorithm
+});
+
+// verify without expiration check
+cert = fs.readFileSync("public.pem"); // get public key
+jwt.verify(token, cert, { ignoreExpiration: true }, (err, decoded) => {
+    // if ignoreExpration == false and token is expired, err == expired token
+});
+
+/**
+ * jwt.decode
+ * https://github.com/auth0/node-jsonwebtoken#jwtdecodetoken
+ */
+let decoded = jwt.decode(token);
+
+decoded = jwt.decode(token, { complete: false });
+
+if (decoded !== null && typeof decoded === "object") {
+    console.log(decoded.foo);
+}
+
+decoded = jwt.decode(token, { json: false });
+
+decoded = jwt.decode(token, { complete: false, json: false });
diff --git a/types/jsonwebtoken-promisified/tsconfig.json b/types/jsonwebtoken-promisified/tsconfig.json
new file mode 100644
index 0000000000..0b6053d82b
--- /dev/null
+++ b/types/jsonwebtoken-promisified/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "jsonwebtoken-promisified-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/jsonwebtoken-promisified/tslint.json b/types/jsonwebtoken-promisified/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/jsonwebtoken-promisified/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}

From f8b7232c91464659e706ad10f135dbb63423b6e8 Mon Sep 17 00:00:00 2001
From: Arne Schubert <atd.schubert@gmail.com>
Date: Tue, 17 Apr 2018 16:59:02 +0200
Subject: [PATCH 1321/1382] Add new type definition for toobusy-js (#25019)

* Add new definitions for toobusy-js

* Change import according to the change-request
---
 types/toobusy-js/index.d.ts          | 19 +++++++++++++++++++
 types/toobusy-js/toobusy-js-tests.ts | 17 +++++++++++++++++
 types/toobusy-js/tsconfig.json       | 23 +++++++++++++++++++++++
 types/toobusy-js/tslint.json         |  1 +
 4 files changed, 60 insertions(+)
 create mode 100644 types/toobusy-js/index.d.ts
 create mode 100644 types/toobusy-js/toobusy-js-tests.ts
 create mode 100644 types/toobusy-js/tsconfig.json
 create mode 100644 types/toobusy-js/tslint.json

diff --git a/types/toobusy-js/index.d.ts b/types/toobusy-js/index.d.ts
new file mode 100644
index 0000000000..bfa462228a
--- /dev/null
+++ b/types/toobusy-js/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for toobusy-js 0.5
+// Project: https://github.com/STRML/node-toobusy
+// Definitions by: Arne Schubert <https://github.com/atd-schubert>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = toobusy_js;
+
+declare function toobusy_js(): boolean;
+
+declare namespace toobusy_js {
+    function interval(newInterval: number): number;
+    function lag(): number;
+    function maxLag(newLag: number): number;
+    function smmothingFactor(newFactor: number): number;
+    function shutdown(): void;
+    function onLag(fn: (lag: number) => void, threshold?: number): void;
+
+    function started(): boolean;
+}
diff --git a/types/toobusy-js/toobusy-js-tests.ts b/types/toobusy-js/toobusy-js-tests.ts
new file mode 100644
index 0000000000..cf688a1911
--- /dev/null
+++ b/types/toobusy-js/toobusy-js-tests.ts
@@ -0,0 +1,17 @@
+import toobusy = require("toobusy-js");
+
+let numberValue = 1;
+let booleanValue = true;
+
+booleanValue = toobusy();
+booleanValue = toobusy.started();
+
+numberValue = toobusy.interval(numberValue);
+numberValue = toobusy.lag();
+numberValue = toobusy.maxLag(numberValue);
+numberValue = toobusy.smmothingFactor(numberValue);
+
+toobusy.onLag((duration: number) => {});
+toobusy.onLag((duration: number) => {}, numberValue);
+
+toobusy.shutdown();
diff --git a/types/toobusy-js/tsconfig.json b/types/toobusy-js/tsconfig.json
new file mode 100644
index 0000000000..061f0890c9
--- /dev/null
+++ b/types/toobusy-js/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "toobusy-js-tests.ts"
+    ]
+}
diff --git a/types/toobusy-js/tslint.json b/types/toobusy-js/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/toobusy-js/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 1f555b0b4f8e1090da4fc59e7b50a58473b4e015 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20=C5=98i=C4=8Da=C5=99?= <jakub.ricar@gmail.com>
Date: Tue, 17 Apr 2018 17:35:05 +0200
Subject: [PATCH 1322/1382] [react-virtualized] Grid - add
 onScrollbarPresenceChange to GridCoreProps (#25040)

* Grid - add onScrollbarPresenceChange to GridCoreProps

* Fix irregular whitespace
---
 types/react-virtualized/dist/es/Grid.d.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/types/react-virtualized/dist/es/Grid.d.ts b/types/react-virtualized/dist/es/Grid.d.ts
index 86055132aa..593e594128 100644
--- a/types/react-virtualized/dist/es/Grid.d.ts
+++ b/types/react-virtualized/dist/es/Grid.d.ts
@@ -54,6 +54,11 @@ export type ScrollParams = {
     scrollTop: number;
     scrollWidth: number;
 };
+export type ScrollbarPresenceParams = {
+    horizontal: boolean;
+    size: number;
+    vertical: boolean;
+};
 export type SectionRenderedParams = RenderedSection;
 export type SCROLL_DIRECTION_HORIZONTAL = "horizontal";
 export type SCROLL_DIRECTION_VERTICAL = "vertical";
@@ -237,6 +242,11 @@ export type GridCoreProps = {
      * ({ clientHeight, clientWidth, scrollHeight, scrollLeft, scrollTop, scrollWidth }): void
      */
     onScroll?: (params: ScrollParams) => any;
+    /**
+     * Called whenever a horizontal or vertical scrollbar is added or removed.
+     * ({ horizontal: boolean, size: number, vertical: boolean }): void
+     */
+    onScrollbarPresenceChange?: (params: ScrollbarPresenceParams) => any;
     /**
      * Callback invoked with information about the section of the Grid that was just rendered.
      * ({ columnStartIndex, columnStopIndex, rowStartIndex, rowStopIndex }): void

From e460cfa0a3ac6d24a9a2ac9897054a71f1f1b04f Mon Sep 17 00:00:00 2001
From: Kyle Roach <kroach.work@gmail.com>
Date: Tue, 17 Apr 2018 11:35:25 -0400
Subject: [PATCH 1323/1382] (react-native) Adds SectionList scrollToLocation
 (#25050)

---
 types/react-native/index.d.ts | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index 288dfada20..4e48a85ba2 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -3736,6 +3736,14 @@ export interface SectionListData<ItemT> extends SectionBase<ItemT> {
     [key: string]: any;
 }
 
+export interface SectionListScrollParams {
+    animated?: boolean;
+    itemIndex: number;
+    sectionIndex: number;
+    viewOffset?: number;
+    viewPosition?: number;
+}
+
 export interface SectionListProperties<ItemT> extends ScrollViewProperties {
     /**
      * Rendered in between adjacent Items within each section.
@@ -3844,6 +3852,13 @@ export interface SectionListProperties<ItemT> extends ScrollViewProperties {
      * Only enabled by default on iOS because that is the platform standard there.
      */
     stickySectionHeadersEnabled?: boolean;
+
+    /**
+     * Scrolls to the item at the specified sectionIndex and itemIndex (within the section)
+     * positioned in the viewable area such that viewPosition 0 places it at the top
+     * (and may be covered by a sticky header), 1 at the bottom, and 0.5 centered in the middle.
+     */
+    scrollToLocation?(params: SectionListScrollParams): void;
 }
 
 export interface SectionListStatic<SectionT> extends React.ComponentClass<SectionListProperties<SectionT>> {}

From 2b5e8a5dd3d49bac33249726ba5b9cf5ea6b25cd Mon Sep 17 00:00:00 2001
From: Omar Diab <me@omardiab.com>
Date: Tue, 17 Apr 2018 10:36:39 -0500
Subject: [PATCH 1324/1382] Fix missing splat in react-intl types (#25046)

---
 types/react-intl/index.d.ts           |  2 +-
 types/react-intl/react-intl-tests.tsx | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/types/react-intl/index.d.ts b/types/react-intl/index.d.ts
index 7da9dbd487..c6a06d39aa 100644
--- a/types/react-intl/index.d.ts
+++ b/types/react-intl/index.d.ts
@@ -142,7 +142,7 @@ declare namespace ReactIntl {
         interface Props extends MessageDescriptor {
             values?: {[key: string]: MessageValue | JSX.Element};
             tagName?: string;
-            children?: (formattedMessage: string[]) => React.ReactNode;
+            children?: (...formattedMessage: string[]) => React.ReactNode;
         }
     }
     class FormattedMessage extends React.Component<FormattedMessage.Props> { }
diff --git a/types/react-intl/react-intl-tests.tsx b/types/react-intl/react-intl-tests.tsx
index 75490a5ca1..51d5065fe3 100644
--- a/types/react-intl/react-intl-tests.tsx
+++ b/types/react-intl/react-intl-tests.tsx
@@ -150,6 +150,20 @@ class SomeComponent extends React.Component<SomeComponentProps & InjectedIntlPro
                 {(text) => <div className="messageDiv">{text}</div>}
             </FormattedMessage>
 
+            <FormattedMessage
+                id="test"
+                description="Test"
+            >
+                {(text) => <input placeholder={text} />}
+            </FormattedMessage>
+
+            <FormattedMessage
+                id="test"
+                description="Test"
+            >
+                {(...text) => <ul>{text.map(t => <li>{t}</li>)}</ul>}
+            </FormattedMessage>
+
             <FormattedHTMLMessage
                 id="test"
                 description="Test"

From d12aef03dffe37c9bca266bc253250078253e5c7 Mon Sep 17 00:00:00 2001
From: Dylan Scott <dylan.scott@gmail.com>
Date: Tue, 17 Apr 2018 08:37:05 -0700
Subject: [PATCH 1325/1382] express-winston: relax types on meta object
 (#25036)

* express-winston: relax types on meta object

* express-winston: change meta object type to
---
 types/express-winston/express-winston-tests.ts |  4 ++--
 types/express-winston/index.d.ts               | 10 +++-------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/types/express-winston/express-winston-tests.ts b/types/express-winston/express-winston-tests.ts
index 7fd41cfd5c..5671160de0 100644
--- a/types/express-winston/express-winston-tests.ts
+++ b/types/express-winston/express-winston-tests.ts
@@ -6,7 +6,7 @@ const app = express();
 
 // Logger with all options
 app.use(expressWinston.logger({
-  baseMeta: { foo: 'foo' },
+  baseMeta: { foo: 'foo', nested: { bar: 'baz' } },
   bodyBlacklist: ['foo'],
   bodyWhitelist: ['bar'],
   colorize: true,
@@ -47,7 +47,7 @@ app.use(expressWinston.logger({
 
 // Error Logger with all options
 app.use(expressWinston.errorLogger({
-  baseMeta: { foo: 'foo' },
+  baseMeta: { foo: 'foo', nested: { bar: 'baz' } },
   dynamicMeta: (req, res, err) => ({ foo: 'bar' }),
   level: (req, res) => 'level',
   metaField: 'metaField',
diff --git a/types/express-winston/index.d.ts b/types/express-winston/index.d.ts
index 6dac70c1b6..e6184f64b9 100644
--- a/types/express-winston/index.d.ts
+++ b/types/express-winston/index.d.ts
@@ -7,18 +7,14 @@
 import { ErrorRequestHandler, Handler, Request, Response } from 'express';
 import { TransportInstance, Winston } from 'winston';
 
-export interface MetaObject {
-  [field: string]: string;
-}
-
-export type DynamicMetaFunction = (req: Request, res: Response, err: Error) => MetaObject | undefined;
+export type DynamicMetaFunction = (req: Request, res: Response, err: Error) => object;
 export type DynamicLevelFunction = (req: Request, res: Response, err: Error) => string;
 export type RequestFilter = (req: Request, propName: string) => boolean;
 export type ResponseFilter = (res: Response, propName: string) => boolean;
 export type RouteFilter = (req: Request, res: Response) => boolean;
 
 export interface BaseLoggerOptions {
-  baseMeta?: MetaObject;
+  baseMeta?: object;
   bodyBlacklist?: string[];
   bodyWhitelist?: string[];
   colorize?: boolean;
@@ -55,7 +51,7 @@ export type LoggerOptions = LoggerOptionsWithTransports | LoggerOptionsWithWinst
 export function logger(options: LoggerOptions): Handler;
 
 export interface BaseErrorLoggerOptions {
-  baseMeta?: MetaObject;
+  baseMeta?: object;
   dynamicMeta?: DynamicMetaFunction;
   level?: string | DynamicLevelFunction;
   metaField?: string;

From bb51a7bf5054a26aa91fbf7f94fe57781912204a Mon Sep 17 00:00:00 2001
From: Masahiko Okada <moqada@gmail.com>
Date: Wed, 18 Apr 2018 00:37:36 +0900
Subject: [PATCH 1326/1382] Fix JsonSchema.type definition in tv4 (#25020)

---
 types/tv4/index.d.ts   | 2 +-
 types/tv4/tv4-tests.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/tv4/index.d.ts b/types/tv4/index.d.ts
index 52b4121c67..924b7e586a 100644
--- a/types/tv4/index.d.ts
+++ b/types/tv4/index.d.ts
@@ -12,7 +12,7 @@ declare namespace tv4 {
         description?: string;    // used for humans only, and not used for computation
         id?: string;
         $schema?: string;
-        type?: string;
+        type?: string | string[];
         items?: any;
         properties?: any;
         patternProperties?: any;
diff --git a/types/tv4/tv4-tests.ts b/types/tv4/tv4-tests.ts
index f1cf61171c..e8bee67b5a 100644
--- a/types/tv4/tv4-tests.ts
+++ b/types/tv4/tv4-tests.ts
@@ -129,7 +129,7 @@ schema = {
     alert("data 2 error: " + JSON.stringify(validator.error, null, 4));
 
     schema = {
-        "type": "array",
+        "type": ["array"],
         "items": {"$ref": "#"}
     };
 }

From 5544c3749b949c579198ff332c3a0b1f258225ca Mon Sep 17 00:00:00 2001
From: Keagan McClelland <keagan.mcclelland@gmail.com>
Date: Tue, 17 Apr 2018 09:38:44 -0600
Subject: [PATCH 1327/1382] [Ramda]: fixed pick and omit type signatures to
 reflect projections (#24936)

* fixed pick and omit type signatures to be more helpful

* changed pick to try and pass tests, tsnext still complaining

* added CaptJakk to contributors

* changed keyof index signatures to just strings

* simplified Omit type signature
---
 types/ramda/index.d.ts | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/types/ramda/index.d.ts b/types/ramda/index.d.ts
index 017839933a..70200aae41 100644
--- a/types/ramda/index.d.ts
+++ b/types/ramda/index.d.ts
@@ -23,6 +23,9 @@
 declare let R: R.Static;
 
 declare namespace R {
+    type Diff<T extends string, U extends string> = ({[P in T]: P } & {[P in U]: never } & { [x: string]: never })[T];
+    type Omit<T, K extends string> = Pick<T, Diff<keyof T, K>>;
+
     type Ord = number | string | boolean;
 
     type Path = ReadonlyArray<(number | string)>;
@@ -1174,8 +1177,8 @@ declare namespace R {
         /**
          * Returns a partial copy of an object omitting the keys specified.
          */
-        omit<T>(names: ReadonlyArray<string>, obj: T): T;
-        omit(names: ReadonlyArray<string>): <T>(obj: T) => T;
+        omit<T, K extends string>(names: ReadonlyArray<K>, obj: T): Omit<T, K>;
+        omit<K extends string>(names: ReadonlyArray<K>): <T>(obj: T) => Omit<T, K>;
 
         /**
          * Accepts a function fn and returns a function that guards invocation of fn such that fn can only ever be
@@ -1285,8 +1288,8 @@ declare namespace R {
          * Returns a partial copy of an object containing only the keys specified.  If the key does not exist, the
          * property is ignored.
          */
-        pick<T, K extends keyof T>(names: ReadonlyArray<K | string>, obj: T): Pick<T, K>;
-        pick(names: ReadonlyArray<string>): <T, U>(obj: T) => U;
+        pick<T, K extends string>(names: ReadonlyArray<K>, obj: T): Pick<T, Diff<keyof T, keyof Omit<T, K>>>;
+        pick<K extends string>(names: ReadonlyArray<K>): <T>(obj: T) => Pick<T, Diff<keyof T, keyof Omit<T, K>>>;
 
         /**
          * Similar to `pick` except that this one includes a `key: undefined` pair for properties that don't exist.

From d0e265975b52272e32e0cb94315b6ec378d93add Mon Sep 17 00:00:00 2001
From: Aankhen <Aankhen@users.noreply.github.com>
Date: Tue, 17 Apr 2018 22:09:52 +0530
Subject: [PATCH 1328/1382] Add `promise-timeout` types (#25062)

---
 types/promise-timeout/index.d.ts              |  8 +++++++
 .../promise-timeout/promise-timeout-tests.ts  | 10 ++++++++
 types/promise-timeout/tsconfig.json           | 23 +++++++++++++++++++
 types/promise-timeout/tslint.json             |  1 +
 4 files changed, 42 insertions(+)
 create mode 100644 types/promise-timeout/index.d.ts
 create mode 100644 types/promise-timeout/promise-timeout-tests.ts
 create mode 100644 types/promise-timeout/tsconfig.json
 create mode 100644 types/promise-timeout/tslint.json

diff --git a/types/promise-timeout/index.d.ts b/types/promise-timeout/index.d.ts
new file mode 100644
index 0000000000..1b49997edb
--- /dev/null
+++ b/types/promise-timeout/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for promise-timeout 1.3
+// Project: https://github.com/building5/promise-timeout#readme
+// Definitions by: Aankhen <https://github.com/Aankhen>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export function timeout<T>(promise: Promise<T>, timeoutMillis: number): Promise<T>;
+
+export class TimeoutError extends Error { }
diff --git a/types/promise-timeout/promise-timeout-tests.ts b/types/promise-timeout/promise-timeout-tests.ts
new file mode 100644
index 0000000000..60c4597a15
--- /dev/null
+++ b/types/promise-timeout/promise-timeout-tests.ts
@@ -0,0 +1,10 @@
+import { timeout, TimeoutError } from "promise-timeout";
+
+function acceptError(e: Error) { }
+
+acceptError(new TimeoutError());
+
+timeout();                       // $ExpectError
+timeout(new Promise(() => { })); // $ExpectError
+
+timeout(new Promise(() => { }), 1000); // $ExpectType Promise<{}>
diff --git a/types/promise-timeout/tsconfig.json b/types/promise-timeout/tsconfig.json
new file mode 100644
index 0000000000..08cb23a1da
--- /dev/null
+++ b/types/promise-timeout/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+      "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "promise-timeout-tests.ts"
+    ]
+}
diff --git a/types/promise-timeout/tslint.json b/types/promise-timeout/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/promise-timeout/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From 3540de43f92dfdc42a8f4a91aad272bf6901c30d Mon Sep 17 00:00:00 2001
From: NN <nn1436401@gmail.com>
Date: Tue, 17 Apr 2018 19:43:25 +0300
Subject: [PATCH 1329/1382] Define ResourceType as type union. (#25060)

---
 types/chrome/index.d.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/types/chrome/index.d.ts b/types/chrome/index.d.ts
index 8c953aaca1..466f09107d 100644
--- a/types/chrome/index.d.ts
+++ b/types/chrome/index.d.ts
@@ -7236,6 +7236,9 @@ declare namespace chrome.webNavigation {
  * @since Chrome 17.
  */
 declare namespace chrome.webRequest {
+    /** How the requested resource will be used. */
+    export type ResourceType = "main_frame" | "sub_frame" | "stylesheet" | "script" | "image" | "font" | "object" | "xmlhttprequest" | "ping" | "csp_report" | "media" | "websocket" | "other";
+
     export interface AuthCredentials {
         username: string;
         password: string;
@@ -7277,9 +7280,8 @@ declare namespace chrome.webRequest {
         tabId?: number;
         /**
          * A list of request types. Requests that cannot match any of the types will be filtered out.
-         * Each element one of: "main_frame", "sub_frame", "stylesheet", "script", "image", "object", "xmlhttprequest", or "other"
          */
-        types?: string[];
+        types?: ResourceType[];
         /** A list of URLs or URL patterns. Requests that cannot match any of the URLs will be filtered out. */
         urls: string[];
 
@@ -7330,9 +7332,8 @@ declare namespace chrome.webRequest {
         tabId: number;
         /**
          * How the requested resource will be used.
-         * One of: "main_frame", "sub_frame", "stylesheet", "script", "image", "object", "xmlhttprequest", or "other"
          */
-        type: string;
+        type: ResourceType;
         /** The time when this signal is triggered, in milliseconds since the epoch. */
         timeStamp: number;
     }

From e4980869127654c4bebaefda8be8566c2d238016 Mon Sep 17 00:00:00 2001
From: Deyan Kamburov <dkamburov@users.noreply.github.com>
Date: Tue, 17 Apr 2018 19:45:59 +0300
Subject: [PATCH 1330/1382] [ignite-ui] Update Ignite UI typing to 18.1 release
 version (#24950)

---
 types/ignite-ui/index.d.ts | 25542 ++++++++++++++++++++++++++++-------
 1 file changed, 20729 insertions(+), 4813 deletions(-)

diff --git a/types/ignite-ui/index.d.ts b/types/ignite-ui/index.d.ts
index bff55ec33d..a57a3606fe 100644
--- a/types/ignite-ui/index.d.ts
+++ b/types/ignite-ui/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Ignite UI 17.2
+// Type definitions for Ignite UI 18.1
 // Project: https://github.com/IgniteUI/ignite-ui
 // Definitions by: Ignite UI <https://github.com/IgniteUI>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -6,12 +6,14 @@
 interface DataSourceSettingsPaging {
 	/**
 	 * Paging is not enabled by default
+	 *
 	 */
 	enabled?: boolean;
 
 	/**
 	 * Type for the paging operation
 	 *
+	 *
 	 * Valid values:
 	 * "local" Data is paged client-side.
 	 * "remote" A remote request is done and URL params encoded
@@ -20,26 +22,31 @@ interface DataSourceSettingsPaging {
 
 	/**
 	 * Number of records on each page
+	 *
 	 */
 	pageSize?: number;
 
 	/**
 	 * Denotes the name of the encoded URL parameter that will state what is the currently requested page size
+	 *
 	 */
 	pageSizeUrlKey?: string;
 
 	/**
 	 * Denotes the name of the encoded URL parameter that will state what is the currently requested page index
+	 *
 	 */
 	pageIndexUrlKey?: string;
 
 	/**
 	 * Current page index
+	 *
 	 */
 	pageIndex?: number;
 
 	/**
 	 * Whether when a new page of data is requested we should append the new data to the existing data
+	 *
 	 */
 	appendPage?: boolean;
 
@@ -61,46 +68,55 @@ interface DataSourceSettingsFiltering {
 
 	/**
 	 * Enables or disables case sensitive filtering on the data. Works only for local filtering
+	 *
 	 */
 	caseSensitive?: boolean;
 
 	/**
 	 * If the type of paging/sorting/filtering is local and applyToAllData is true, filtering will be performed on the whole data source that's present locally, otherwise only on the current dataView. if type is remote, this setting doesn't have any effect.
+	 *
 	 */
 	applyToAllData?: boolean;
 
 	/**
 	 * Can point to either a string or a function object. The parameters that are passed are 1) the data array to be filtered, 2) the filtering expression definitions. Should return an array of the filtered data
+	 *
 	 */
 	customFunc?: any;
 
 	/**
 	 * Url key that will be encoded in the request if remote filtering is performed. Default value of null implies OData-style URL encoding. Please see http://www.odata.org/developers/protocols/uri-conventions for details
+	 *
 	 */
 	filterExprUrlKey?: string;
 
 	/**
 	 * Url key that will be encoded in the request, specifying if the filtering logic will be AND or OR
+	 *
 	 */
 	filterLogicUrlKey?: string;
 
 	/**
 	 * Data will be initially filtered accordingly, directly after dataBind()
+	 *
 	 */
 	defaultFields?: any[];
 
 	/**
 	 * A list of expression objects, containing the following key-value pairs: fieldName, expression (search string), condition , and logic (AND/OR)
+	 *
 	 */
 	expressions?: any[];
 
 	/**
 	 * An "SQL-like' encoded expressions string. Takes precedence over "expressions". Example: col2 > 100; col2 LIKE %test%
+	 *
 	 */
 	exprString?: string;
 
 	/**
 	 * An object containing custom defined filtering conditions as objects.
+	 *
 	 */
 	customConditions?: any;
 
@@ -114,6 +130,7 @@ interface DataSourceSettingsSorting {
 	/**
 	 * Sorting direction
 	 *
+	 *
 	 * Valid values:
 	 * "none"
 	 * "asc"
@@ -123,32 +140,38 @@ interface DataSourceSettingsSorting {
 
 	/**
 	 * When defaultDirection is different than "none", and defaultFields is specified, data will be initially sorted accordingly, directly after dataBind()
+	 *
 	 */
 	defaultFields?: any[];
 
 	/**
 	 * If the sorting type is local and applyToAllData is true, sorting will be performed on the whole data source that's present locally, otherwise only on the current dataView. If sorting type is remote, this setting doesn't have any effect.
+	 *
 	 */
 	applyToAllData?: boolean;
 
 	/**
 	 * Custom sorting function that can point to either a string or a function object. When the function is called, the following arguments are passed: data array, fields (array of field definitions) , direction ("asc" or "desc"). The function should return a sorted data array
+	 *
 	 */
 	customFunc?: any;
 
 	/**
 	 * Custom comparison sorting function. Accepts the following arguments: fields, schema, booleand value whether sorting is ascending , convert function(please check option for customConvertFunc) and returns a value 0 indicating that values are equal, 1 indicating that val1 > val2 and -1 indicating that val1 < val2
+	 *
 	 */
 	compareFunc?: any;
 
 	/**
 	 * Custom data value conversion function(called from sorting function). Accepts a value of the data cell and column key and should return the converted value
+	 *
 	 */
 	customConvertFunc?: any;
 
 	/**
 	 * Specifies whether sorting will be applied locally or remotely (via a remote request)
 	 *
+	 *
 	 * Valid values:
 	 * "remote"
 	 * "local"
@@ -157,31 +180,37 @@ interface DataSourceSettingsSorting {
 
 	/**
 	 * Specifies if sorting will be case sensitive or not. Works only for local sorting
+	 *
 	 */
 	caseSensitive?: boolean;
 
 	/**
 	 * URL param name which specifies how sorting expressions will be encoded in the URL. Default is null and uses OData conventions
+	 *
 	 */
 	sortUrlKey?: string;
 
 	/**
 	 * URL param value for ascending type of sorting. Default is null and uses OData conventions
+	 *
 	 */
 	sortUrlAscValueKey?: string;
 
 	/**
 	 * URL param value for descending type of sorting. Default is null and uses OData conventions
+	 *
 	 */
 	sortUrlDescValueKey?: string;
 
 	/**
 	 * A list of sorting expressions , consisting of the following keys (and their respective values): fieldName, direction and compareFunc (optional)
+	 *
 	 */
 	expressions?: any[];
 
 	/**
 	 * Takes precedence over experssions, an "SQL-like" encoded expressions string  : see sort(). Example col2 > 100 ORDER BY asc
+	 *
 	 */
 	exprString?: string;
 
@@ -194,28 +223,33 @@ interface DataSourceSettingsSorting {
 interface DataSourceSettingsGroupby {
 	/**
 	 * Default collapse state
+	 *
 	 */
 	defaultCollapseState?: boolean;
 
 	/**
 	 * The name of the property that determines whether a record from the group data view is a group record.
+	 *
 	 */
 	groupRecordKey?: string;
 
 	/**
 	 * The name of the property that determines whether a record from the group data view is a summary group record.
+	 *
 	 */
 	groupSummaryRecordKey?: string;
 
 	/**
 	 * Array of objects containing the summaries for each field.
 	 * Each summary object has the following format { field:"fieldName", summaryFunctions: [] }, where the summaryFunctions arrays can contain either a summary name (avg, sum, count etc.) or a custom function for caclulating a custom summary.
+	 *
 	 */
 	summaries?: any[];
 
 	/**
 	 * Specifies the postion for the summaries for each field inside each group.
 	 *
+	 *
 	 * Valid values:
 	 * "top" One summary row will be displayed at the top for each group
 	 * "bottom"  One summary row will be displayed at the bottom for each group
@@ -226,6 +260,7 @@ interface DataSourceSettingsGroupby {
 	/**
 	 * . Specifies how paging should be applied when there is at least one grouped column
 	 *
+	 *
 	 * Valid values:
 	 * "allRecords" Paging is applied for all records - data and non-data records(like group-by records)
 	 * "dataRecordsOnly" Paging is applied ONLY for data records. Non-data records are disregarded in paging calculations.
@@ -242,6 +277,7 @@ interface DataSourceSettingsSummaries {
 	/**
 	 * Specifies whether summaries will be applied locally or remotely (via a remote request)
 	 *
+	 *
 	 * Valid values:
 	 * "remote" A remote request is done and URL params encoded
 	 * "local" Data is paged client-side.
@@ -250,17 +286,20 @@ interface DataSourceSettingsSummaries {
 
 	/**
 	 * Url key for retrieving data from response - used only when summaries are remote
+	 *
 	 */
 	summaryExprUrlKey?: string;
 
 	/**
 	 * Key for retrieving data from the summaries response - used only when summaries are remote
+	 *
 	 */
 	summariesResponseKey?: string;
 
 	/**
 	 * Determines when the summary values are calculated
 	 *
+	 *
 	 * Valid values:
 	 * "priortofilteringandpaging"
 	 * "afterfilteringbeforepaging"
@@ -270,6 +309,7 @@ interface DataSourceSettingsSummaries {
 
 	/**
 	 * A list of column settings that specifies custom summaries options per column basis
+	 *
 	 */
 	columnSettings?: any[];
 
@@ -282,52 +322,62 @@ interface DataSourceSettingsSummaries {
 interface DataSourceSettings {
 	/**
 	 * Setting this is only necessary when the data source is set to a table in string format. we need to create an invisible dummy data container in the body and append the table data to it
+	 *
 	 */
 	id?: string;
 
 	/**
 	 * This is the property in the dataView where actual resulting records will be put. (So the dataView will not be array but an object if this is defined), after the potential data source transformation
+	 *
 	 */
 	outputResultsName?: string;
 
 	/**
 	 * Callback function to call when data binding is complete
+	 *
 	 */
 	callback?: Function;
 
 	/**
 	 * Object on which to invoke the callback function
+	 *
 	 */
 	callee?: any;
 
 	/**
 	 * This is the normalized (transformed) resulting data, after it's fetched from the data source
+	 *
 	 */
 	data?: any[];
 
 	/**
 	 * This is the source of data - non normalized. Can be an array, can be reference to some JSON object, can be a DOM element for a HTML TABLE, or a function
+	 *
 	 */
 	dataSource?: any;
 
 	/**
 	 * Client-side dataBinding event. Can be a string pointing to a function name, or an object pointing to a function
+	 *
 	 */
 	dataBinding?: any;
 
 	/**
 	 * Client-side dataBound event. Can be a string pointing to a function name, or an object pointing to a function
+	 *
 	 */
 	dataBound?: any;
 
 	/**
 	 * Specifies the HTTP verb to be used to issue the request
+	 *
 	 */
 	requestType?: string;
 
 	/**
 	 * Type of the data source
 	 *
+	 *
 	 * Valid values:
 	 * "json" Specifies that the data source is an already evaluated JSON (JavaScript object/array) or a string that can be evaluated to JSON
 	 * "xml" Specifies that the data source is a XML Document object or a string that can be evaluated to XML
@@ -347,27 +397,32 @@ interface DataSourceSettings {
 
 	/**
 	 * A schema object that defines which fields from the data to bind to
+	 *
 	 */
 	schema?: any;
 
 	/**
 	 * The unique field identifier
+	 *
 	 */
 	primaryKey?: string;
 
 	/**
 	 * Property in the response which specifies the total number of records in the backend (this is needed for paging)
+	 *
 	 */
 	responseTotalRecCountKey?: string;
 
 	/**
 	 * Property in the response which specifies where the data records array will be held (if the response is wrapped)
+	 *
 	 */
 	responseDataKey?: string;
 
 	/**
 	 * Response type when a URL is set as the data source. See http://api.jquery.com/jQuery.ajax/ => dataType
 	 *
+	 *
 	 * Valid values:
 	 * "json"
 	 * "xml"
@@ -380,46 +435,55 @@ interface DataSourceSettings {
 
 	/**
 	 * Content type of the response. See http://api.jquery.com/jQuery.ajax/ => contentType
+	 *
 	 */
 	responseContentType?: string;
 
 	/**
 	 * If set to false will disable transformations on schema, even if it is defined locally in the javascript code
+	 *
 	 */
 	localSchemaTransform?: boolean;
 
 	/**
 	 * Event that is fired before URL parameters are encoded. Can point to a function name or the function object itself
+	 *
 	 */
 	urlParamsEncoding?: any;
 
 	/**
 	 * Event that is fired after URL parameters are encoded (When a remote request is done). Can point to a function name or the function object itself
+	 *
 	 */
 	urlParamsEncoded?: any;
 
 	/**
 	 * Settings related to built-in paging functionality
+	 *
 	 */
 	paging?: DataSourceSettingsPaging;
 
 	/**
 	 * Settings related to built-in filtering functionality
+	 *
 	 */
 	filtering?: DataSourceSettingsFiltering;
 
 	/**
 	 * Settings related to built-in sorting functionality
+	 *
 	 */
 	sorting?: DataSourceSettingsSorting;
 
 	/**
 	 * Settings related to built-in group by functionality
+	 *
 	 */
 	groupby?: DataSourceSettingsGroupby;
 
 	/**
 	 * Settings related to built-in summaries functionality
+	 *
 	 */
 	summaries?: DataSourceSettingsSummaries;
 
@@ -427,11 +491,13 @@ interface DataSourceSettings {
 	 * *** IMPORTANT DEPRECATED ***
 	 * A list of field definitions specifying the schema of the data source.
 	 * Field objects description: {name, [type], [xpath]}
+	 *
 	 */
 	fields?: any[];
 
 	/**
 	 * If true, will serialize the transaction log of updated values - if any - whenever commit is performed via a remote request.
+	 *
 	 */
 	serializeTransactionLog?: boolean;
 
@@ -440,16 +506,19 @@ interface DataSourceSettings {
 	 * if a new row is added, and then deleted, there will be no transaction added to the log
 	 * if an edit is made to a row or cell, then the value is brought back to its original value, the transaction should be removed
 	 * Note: This option takes effect only when autoCommit is set to false.
+	 *
 	 */
 	aggregateTransactions?: boolean;
 
 	/**
 	 * If auto commit is true, data will be automatically commited to the data source, once a value or a batch of values are updated via saveChanges()
+	 *
 	 */
 	autoCommit?: boolean;
 
 	/**
 	 * Specifies an update remote URL, to which an AJAX request will be made as soon as saveChages() is called.
+	 *
 	 */
 	updateUrl?: string;
 
@@ -459,6 +528,7 @@ interface DataSourceSettings {
 	 * Use item.row to obtain reference to the added row.
 	 * Use item.rowId to get the row ID.
 	 * Use dataSource to obtain reference to $.ig.DataSource.
+	 *
 	 */
 	rowAdded?: Function;
 
@@ -469,6 +539,7 @@ interface DataSourceSettings {
 	 * Use item.newRow to obtain reference to the updated row.
 	 * Use item.oldRow to obtain reference to the row that was updated.
 	 * Use dataSource to obtain reference to $.ig.DataSource.
+	 *
 	 */
 	rowUpdated?: Function;
 
@@ -479,6 +550,7 @@ interface DataSourceSettings {
 	 * Use item.rowId to get the row ID.
 	 * Use item.rowIndex to get the row index.
 	 * Use dataSource to obtain reference to $.ig.DataSource.
+	 *
 	 */
 	rowInserted?: Function;
 
@@ -488,6 +560,7 @@ interface DataSourceSettings {
 	 * Use item.rowId to get the row ID.
 	 * Use item.rowIndex to get the row index.
 	 * Use dataSource to obtain reference to $.ig.DataSource.
+	 *
 	 */
 	rowDeleted?: Function;
 
@@ -528,6 +601,8 @@ class DataSource {
 	 * 1. Before paging and filtering
 	 * 2. After filtering before paging
 	 * 3. After filtering and paging
+	 *
+	 * @param transformedExecution
 	 */
 	transformedData(transformedExecution: Object): Object;
 
@@ -574,12 +649,15 @@ class DataSource {
 
 	/**
 	 * Gets/sets the dataSource setting. If no parameter is specified, returns settings.dataSource
+	 *
+	 * @param ds
 	 */
 	dataSource(ds?: Object): Object;
 
 	/**
 	 * Gets/sets the type of the dataSource. If no parameter is specified, returns settings.type
 	 *
+	 * @param t
 	 * @return json|xml|unknown|array|function|htmlTableString|htmlTableId|htmlTableDom|invalid|remoteUrl|empty
 	 */
 	type(t?: Object): string;
@@ -591,12 +669,13 @@ class DataSource {
 	 * @param ds the data source in which to search for the record. When not set it will use the current data source.
 	 * @param objPath Not used in $.ig.DataSource
 	 */
-	findRecordByKey(key: string, ds?: string, objPath?: string): Object;
+	findRecordByKey(key: Object, ds?: string, objPath?: string): Object;
 
 	/**
 	 * Removes a specific record denoted by the primaryKey of the passed key parameter from the data source
 	 *
 	 * @param key primary key of the record
+	 * @param origDs
 	 */
 	removeRecordByKey(key: Object, origDs: Object): void;
 
@@ -604,6 +683,7 @@ class DataSource {
 	 * Removes a record from the data source at specific index.
 	 *
 	 * @param index index of record
+	 * @param origDs
 	 */
 	removeRecordByIndex(index: number, origDs: Object): void;
 
@@ -816,6 +896,9 @@ class DataSource {
 	 * match the number of records that exists on the client
 	 *
 	 * @param count the total number of records
+	 * @param key
+	 * @param dsObj
+	 * @param context
 	 */
 	totalRecordsCount(count?: number, key?: Object, dsObj?: Object, context?: Object): number;
 
@@ -876,6 +959,8 @@ class DataSource {
 
 	/**
 	 * For internal use
+	 *
+	 * @param dirty
 	 */
 	pageSizeDirty(dirty: Object): void;
 
@@ -955,6 +1040,8 @@ class TypeParser {
 
 	/**
 	 * L.A. 18 June 2012 Fixing bug #113265 Column 'date' shows empty values as 'NaN'
+	 *
+	 * @param obj
 	 */
 	toDate(obj: Object): void;
 	toNumber(obj: Object): void;
@@ -977,6 +1064,7 @@ interface DataSchemaSchemaFields {
 	 * bool
 	 * date
 	 * object
+	 *
 	 */
 	type?: string|number|boolean|Date|Object;
 
@@ -1018,6 +1106,11 @@ interface DataSchemaSchema {
 	 */
 	outputResultsName?: string;
 
+	/**
+	 * This is the property (xpath) in the data source where the child records of a record are located. Used in XML binding.
+	 */
+	childDataProperty?: string;
+
 	/**
 	 * Option for DataSchemaSchema
 	 */
@@ -1091,6 +1184,8 @@ class RemoteDataSource {
 	 * 1. Before paging and filtering
 	 * 2. After filtering before paging
 	 * 3. After filtering and paging
+	 *
+	 * @param transformedExecution
 	 */
 	transformedData(transformedExecution: Object): Object;
 
@@ -1137,12 +1232,15 @@ class RemoteDataSource {
 
 	/**
 	 * Gets/sets the dataSource setting. If no parameter is specified, returns settings.dataSource
+	 *
+	 * @param ds
 	 */
 	dataSource(ds?: Object): Object;
 
 	/**
 	 * Gets/sets the type of the dataSource. If no parameter is specified, returns settings.type
 	 *
+	 * @param t
 	 * @return json|xml|unknown|array|function|htmlTableString|htmlTableId|htmlTableDom|invalid|remoteUrl|empty
 	 */
 	type(t?: Object): string;
@@ -1154,12 +1252,13 @@ class RemoteDataSource {
 	 * @param ds the data source in which to search for the record. When not set it will use the current data source.
 	 * @param objPath Not used in $.ig.DataSource
 	 */
-	findRecordByKey(key: string, ds?: string, objPath?: string): Object;
+	findRecordByKey(key: Object, ds?: string, objPath?: string): Object;
 
 	/**
 	 * Removes a specific record denoted by the primaryKey of the passed key parameter from the data source
 	 *
 	 * @param key primary key of the record
+	 * @param origDs
 	 */
 	removeRecordByKey(key: Object, origDs: Object): void;
 
@@ -1167,6 +1266,7 @@ class RemoteDataSource {
 	 * Removes a record from the data source at specific index.
 	 *
 	 * @param index index of record
+	 * @param origDs
 	 */
 	removeRecordByIndex(index: number, origDs: Object): void;
 
@@ -1379,6 +1479,9 @@ class RemoteDataSource {
 	 * match the number of records that exists on the client
 	 *
 	 * @param count the total number of records
+	 * @param key
+	 * @param dsObj
+	 * @param context
 	 */
 	totalRecordsCount(count?: number, key?: Object, dsObj?: Object, context?: Object): number;
 
@@ -1439,6 +1542,8 @@ class RemoteDataSource {
 
 	/**
 	 * For internal use
+	 *
+	 * @param dirty
 	 */
 	pageSizeDirty(dirty: Object): void;
 
@@ -1555,6 +1660,8 @@ class JSONDataSource {
 	 * 1. Before paging and filtering
 	 * 2. After filtering before paging
 	 * 3. After filtering and paging
+	 *
+	 * @param transformedExecution
 	 */
 	transformedData(transformedExecution: Object): Object;
 
@@ -1601,12 +1708,15 @@ class JSONDataSource {
 
 	/**
 	 * Gets/sets the dataSource setting. If no parameter is specified, returns settings.dataSource
+	 *
+	 * @param ds
 	 */
 	dataSource(ds?: Object): Object;
 
 	/**
 	 * Gets/sets the type of the dataSource. If no parameter is specified, returns settings.type
 	 *
+	 * @param t
 	 * @return json|xml|unknown|array|function|htmlTableString|htmlTableId|htmlTableDom|invalid|remoteUrl|empty
 	 */
 	type(t?: Object): string;
@@ -1618,12 +1728,13 @@ class JSONDataSource {
 	 * @param ds the data source in which to search for the record. When not set it will use the current data source.
 	 * @param objPath Not used in $.ig.DataSource
 	 */
-	findRecordByKey(key: string, ds?: string, objPath?: string): Object;
+	findRecordByKey(key: Object, ds?: string, objPath?: string): Object;
 
 	/**
 	 * Removes a specific record denoted by the primaryKey of the passed key parameter from the data source
 	 *
 	 * @param key primary key of the record
+	 * @param origDs
 	 */
 	removeRecordByKey(key: Object, origDs: Object): void;
 
@@ -1631,6 +1742,7 @@ class JSONDataSource {
 	 * Removes a record from the data source at specific index.
 	 *
 	 * @param index index of record
+	 * @param origDs
 	 */
 	removeRecordByIndex(index: number, origDs: Object): void;
 
@@ -1843,6 +1955,9 @@ class JSONDataSource {
 	 * match the number of records that exists on the client
 	 *
 	 * @param count the total number of records
+	 * @param key
+	 * @param dsObj
+	 * @param context
 	 */
 	totalRecordsCount(count?: number, key?: Object, dsObj?: Object, context?: Object): number;
 
@@ -1903,6 +2018,8 @@ class JSONDataSource {
 
 	/**
 	 * For internal use
+	 *
+	 * @param dirty
 	 */
 	pageSizeDirty(dirty: Object): void;
 
@@ -2097,6 +2214,9 @@ class RESTDataSource {
 
 	/**
 	 * Posts to the restSettings urls using $.ajax, by serializing the changes as url params.
+	 *
+	 * @param success
+	 * @param error
 	 */
 	saveChanges(success: Object, error: Object): void;
 
@@ -2127,6 +2247,8 @@ class RESTDataSource {
 	 * 1. Before paging and filtering
 	 * 2. After filtering before paging
 	 * 3. After filtering and paging
+	 *
+	 * @param transformedExecution
 	 */
 	transformedData(transformedExecution: Object): Object;
 
@@ -2173,12 +2295,15 @@ class RESTDataSource {
 
 	/**
 	 * Gets/sets the dataSource setting. If no parameter is specified, returns settings.dataSource
+	 *
+	 * @param ds
 	 */
 	dataSource(ds?: Object): Object;
 
 	/**
 	 * Gets/sets the type of the dataSource. If no parameter is specified, returns settings.type
 	 *
+	 * @param t
 	 * @return json|xml|unknown|array|function|htmlTableString|htmlTableId|htmlTableDom|invalid|remoteUrl|empty
 	 */
 	type(t?: Object): string;
@@ -2190,12 +2315,13 @@ class RESTDataSource {
 	 * @param ds the data source in which to search for the record. When not set it will use the current data source.
 	 * @param objPath Not used in $.ig.DataSource
 	 */
-	findRecordByKey(key: string, ds?: string, objPath?: string): Object;
+	findRecordByKey(key: Object, ds?: string, objPath?: string): Object;
 
 	/**
 	 * Removes a specific record denoted by the primaryKey of the passed key parameter from the data source
 	 *
 	 * @param key primary key of the record
+	 * @param origDs
 	 */
 	removeRecordByKey(key: Object, origDs: Object): void;
 
@@ -2203,6 +2329,7 @@ class RESTDataSource {
 	 * Removes a record from the data source at specific index.
 	 *
 	 * @param index index of record
+	 * @param origDs
 	 */
 	removeRecordByIndex(index: number, origDs: Object): void;
 
@@ -2407,6 +2534,9 @@ class RESTDataSource {
 	 * match the number of records that exists on the client
 	 *
 	 * @param count the total number of records
+	 * @param key
+	 * @param dsObj
+	 * @param context
 	 */
 	totalRecordsCount(count?: number, key?: Object, dsObj?: Object, context?: Object): number;
 
@@ -2467,6 +2597,8 @@ class RESTDataSource {
 
 	/**
 	 * For internal use
+	 *
+	 * @param dirty
 	 */
 	pageSizeDirty(dirty: Object): void;
 
@@ -2543,6 +2675,7 @@ RESTDataSource: typeof Infragistics.RESTDataSource;
 interface JSONPDataSourceSettings {
 	/**
 	 * Override the callback function name in a jsonp request. Sets option jsonp in $.ajax functionbool Setting the jsonp option to false prevents jQuery from adding the "?callback" string to the URL or attempting to use "=?" for transformation
+	 *
 	 */
 	jsonp?: string|boolean;
 
@@ -2593,6 +2726,8 @@ class JSONPDataSource {
 	 * 1. Before paging and filtering
 	 * 2. After filtering before paging
 	 * 3. After filtering and paging
+	 *
+	 * @param transformedExecution
 	 */
 	transformedData(transformedExecution: Object): Object;
 
@@ -2639,12 +2774,15 @@ class JSONPDataSource {
 
 	/**
 	 * Gets/sets the dataSource setting. If no parameter is specified, returns settings.dataSource
+	 *
+	 * @param ds
 	 */
 	dataSource(ds?: Object): Object;
 
 	/**
 	 * Gets/sets the type of the dataSource. If no parameter is specified, returns settings.type
 	 *
+	 * @param t
 	 * @return json|xml|unknown|array|function|htmlTableString|htmlTableId|htmlTableDom|invalid|remoteUrl|empty
 	 */
 	type(t?: Object): string;
@@ -2656,12 +2794,13 @@ class JSONPDataSource {
 	 * @param ds the data source in which to search for the record. When not set it will use the current data source.
 	 * @param objPath Not used in $.ig.DataSource
 	 */
-	findRecordByKey(key: string, ds?: string, objPath?: string): Object;
+	findRecordByKey(key: Object, ds?: string, objPath?: string): Object;
 
 	/**
 	 * Removes a specific record denoted by the primaryKey of the passed key parameter from the data source
 	 *
 	 * @param key primary key of the record
+	 * @param origDs
 	 */
 	removeRecordByKey(key: Object, origDs: Object): void;
 
@@ -2669,6 +2808,7 @@ class JSONPDataSource {
 	 * Removes a record from the data source at specific index.
 	 *
 	 * @param index index of record
+	 * @param origDs
 	 */
 	removeRecordByIndex(index: number, origDs: Object): void;
 
@@ -2881,6 +3021,9 @@ class JSONPDataSource {
 	 * match the number of records that exists on the client
 	 *
 	 * @param count the total number of records
+	 * @param key
+	 * @param dsObj
+	 * @param context
 	 */
 	totalRecordsCount(count?: number, key?: Object, dsObj?: Object, context?: Object): number;
 
@@ -2941,6 +3084,8 @@ class JSONPDataSource {
 
 	/**
 	 * For internal use
+	 *
+	 * @param dirty
 	 */
 	pageSizeDirty(dirty: Object): void;
 
@@ -3045,6 +3190,8 @@ class XmlDataSource {
 	 * 1. Before paging and filtering
 	 * 2. After filtering before paging
 	 * 3. After filtering and paging
+	 *
+	 * @param transformedExecution
 	 */
 	transformedData(transformedExecution: Object): Object;
 
@@ -3091,12 +3238,15 @@ class XmlDataSource {
 
 	/**
 	 * Gets/sets the dataSource setting. If no parameter is specified, returns settings.dataSource
+	 *
+	 * @param ds
 	 */
 	dataSource(ds?: Object): Object;
 
 	/**
 	 * Gets/sets the type of the dataSource. If no parameter is specified, returns settings.type
 	 *
+	 * @param t
 	 * @return json|xml|unknown|array|function|htmlTableString|htmlTableId|htmlTableDom|invalid|remoteUrl|empty
 	 */
 	type(t?: Object): string;
@@ -3108,12 +3258,13 @@ class XmlDataSource {
 	 * @param ds the data source in which to search for the record. When not set it will use the current data source.
 	 * @param objPath Not used in $.ig.DataSource
 	 */
-	findRecordByKey(key: string, ds?: string, objPath?: string): Object;
+	findRecordByKey(key: Object, ds?: string, objPath?: string): Object;
 
 	/**
 	 * Removes a specific record denoted by the primaryKey of the passed key parameter from the data source
 	 *
 	 * @param key primary key of the record
+	 * @param origDs
 	 */
 	removeRecordByKey(key: Object, origDs: Object): void;
 
@@ -3121,6 +3272,7 @@ class XmlDataSource {
 	 * Removes a record from the data source at specific index.
 	 *
 	 * @param index index of record
+	 * @param origDs
 	 */
 	removeRecordByIndex(index: number, origDs: Object): void;
 
@@ -3333,6 +3485,9 @@ class XmlDataSource {
 	 * match the number of records that exists on the client
 	 *
 	 * @param count the total number of records
+	 * @param key
+	 * @param dsObj
+	 * @param context
 	 */
 	totalRecordsCount(count?: number, key?: Object, dsObj?: Object, context?: Object): number;
 
@@ -3393,6 +3548,8 @@ class XmlDataSource {
 
 	/**
 	 * For internal use
+	 *
+	 * @param dirty
 	 */
 	pageSizeDirty(dirty: Object): void;
 
@@ -3509,6 +3666,8 @@ class FunctionDataSource {
 	 * 1. Before paging and filtering
 	 * 2. After filtering before paging
 	 * 3. After filtering and paging
+	 *
+	 * @param transformedExecution
 	 */
 	transformedData(transformedExecution: Object): Object;
 
@@ -3555,12 +3714,15 @@ class FunctionDataSource {
 
 	/**
 	 * Gets/sets the dataSource setting. If no parameter is specified, returns settings.dataSource
+	 *
+	 * @param ds
 	 */
 	dataSource(ds?: Object): Object;
 
 	/**
 	 * Gets/sets the type of the dataSource. If no parameter is specified, returns settings.type
 	 *
+	 * @param t
 	 * @return json|xml|unknown|array|function|htmlTableString|htmlTableId|htmlTableDom|invalid|remoteUrl|empty
 	 */
 	type(t?: Object): string;
@@ -3572,12 +3734,13 @@ class FunctionDataSource {
 	 * @param ds the data source in which to search for the record. When not set it will use the current data source.
 	 * @param objPath Not used in $.ig.DataSource
 	 */
-	findRecordByKey(key: string, ds?: string, objPath?: string): Object;
+	findRecordByKey(key: Object, ds?: string, objPath?: string): Object;
 
 	/**
 	 * Removes a specific record denoted by the primaryKey of the passed key parameter from the data source
 	 *
 	 * @param key primary key of the record
+	 * @param origDs
 	 */
 	removeRecordByKey(key: Object, origDs: Object): void;
 
@@ -3585,6 +3748,7 @@ class FunctionDataSource {
 	 * Removes a record from the data source at specific index.
 	 *
 	 * @param index index of record
+	 * @param origDs
 	 */
 	removeRecordByIndex(index: number, origDs: Object): void;
 
@@ -3797,6 +3961,9 @@ class FunctionDataSource {
 	 * match the number of records that exists on the client
 	 *
 	 * @param count the total number of records
+	 * @param key
+	 * @param dsObj
+	 * @param context
 	 */
 	totalRecordsCount(count?: number, key?: Object, dsObj?: Object, context?: Object): number;
 
@@ -3857,6 +4024,8 @@ class FunctionDataSource {
 
 	/**
 	 * For internal use
+	 *
+	 * @param dirty
 	 */
 	pageSizeDirty(dirty: Object): void;
 
@@ -3973,6 +4142,8 @@ class HtmlTableDataSource {
 	 * 1. Before paging and filtering
 	 * 2. After filtering before paging
 	 * 3. After filtering and paging
+	 *
+	 * @param transformedExecution
 	 */
 	transformedData(transformedExecution: Object): Object;
 
@@ -4019,12 +4190,15 @@ class HtmlTableDataSource {
 
 	/**
 	 * Gets/sets the dataSource setting. If no parameter is specified, returns settings.dataSource
+	 *
+	 * @param ds
 	 */
 	dataSource(ds?: Object): Object;
 
 	/**
 	 * Gets/sets the type of the dataSource. If no parameter is specified, returns settings.type
 	 *
+	 * @param t
 	 * @return json|xml|unknown|array|function|htmlTableString|htmlTableId|htmlTableDom|invalid|remoteUrl|empty
 	 */
 	type(t?: Object): string;
@@ -4036,12 +4210,13 @@ class HtmlTableDataSource {
 	 * @param ds the data source in which to search for the record. When not set it will use the current data source.
 	 * @param objPath Not used in $.ig.DataSource
 	 */
-	findRecordByKey(key: string, ds?: string, objPath?: string): Object;
+	findRecordByKey(key: Object, ds?: string, objPath?: string): Object;
 
 	/**
 	 * Removes a specific record denoted by the primaryKey of the passed key parameter from the data source
 	 *
 	 * @param key primary key of the record
+	 * @param origDs
 	 */
 	removeRecordByKey(key: Object, origDs: Object): void;
 
@@ -4049,6 +4224,7 @@ class HtmlTableDataSource {
 	 * Removes a record from the data source at specific index.
 	 *
 	 * @param index index of record
+	 * @param origDs
 	 */
 	removeRecordByIndex(index: number, origDs: Object): void;
 
@@ -4261,6 +4437,9 @@ class HtmlTableDataSource {
 	 * match the number of records that exists on the client
 	 *
 	 * @param count the total number of records
+	 * @param key
+	 * @param dsObj
+	 * @param context
 	 */
 	totalRecordsCount(count?: number, key?: Object, dsObj?: Object, context?: Object): number;
 
@@ -4321,6 +4500,8 @@ class HtmlTableDataSource {
 
 	/**
 	 * For internal use
+	 *
+	 * @param dirty
 	 */
 	pageSizeDirty(dirty: Object): void;
 
@@ -4425,6 +4606,8 @@ class ArrayDataSource {
 	 * 1. Before paging and filtering
 	 * 2. After filtering before paging
 	 * 3. After filtering and paging
+	 *
+	 * @param transformedExecution
 	 */
 	transformedData(transformedExecution: Object): Object;
 
@@ -4471,12 +4654,15 @@ class ArrayDataSource {
 
 	/**
 	 * Gets/sets the dataSource setting. If no parameter is specified, returns settings.dataSource
+	 *
+	 * @param ds
 	 */
 	dataSource(ds?: Object): Object;
 
 	/**
 	 * Gets/sets the type of the dataSource. If no parameter is specified, returns settings.type
 	 *
+	 * @param t
 	 * @return json|xml|unknown|array|function|htmlTableString|htmlTableId|htmlTableDom|invalid|remoteUrl|empty
 	 */
 	type(t?: Object): string;
@@ -4488,12 +4674,13 @@ class ArrayDataSource {
 	 * @param ds the data source in which to search for the record. When not set it will use the current data source.
 	 * @param objPath Not used in $.ig.DataSource
 	 */
-	findRecordByKey(key: string, ds?: string, objPath?: string): Object;
+	findRecordByKey(key: Object, ds?: string, objPath?: string): Object;
 
 	/**
 	 * Removes a specific record denoted by the primaryKey of the passed key parameter from the data source
 	 *
 	 * @param key primary key of the record
+	 * @param origDs
 	 */
 	removeRecordByKey(key: Object, origDs: Object): void;
 
@@ -4501,6 +4688,7 @@ class ArrayDataSource {
 	 * Removes a record from the data source at specific index.
 	 *
 	 * @param index index of record
+	 * @param origDs
 	 */
 	removeRecordByIndex(index: number, origDs: Object): void;
 
@@ -4713,6 +4901,9 @@ class ArrayDataSource {
 	 * match the number of records that exists on the client
 	 *
 	 * @param count the total number of records
+	 * @param key
+	 * @param dsObj
+	 * @param context
 	 */
 	totalRecordsCount(count?: number, key?: Object, dsObj?: Object, context?: Object): number;
 
@@ -4773,6 +4964,8 @@ class ArrayDataSource {
 
 	/**
 	 * For internal use
+	 *
+	 * @param dirty
 	 */
 	pageSizeDirty(dirty: Object): void;
 
@@ -4940,6 +5133,8 @@ class MashupDataSource {
 	 * 1. Before paging and filtering
 	 * 2. After filtering before paging
 	 * 3. After filtering and paging
+	 *
+	 * @param transformedExecution
 	 */
 	transformedData(transformedExecution: Object): Object;
 
@@ -4986,12 +5181,15 @@ class MashupDataSource {
 
 	/**
 	 * Gets/sets the dataSource setting. If no parameter is specified, returns settings.dataSource
+	 *
+	 * @param ds
 	 */
 	dataSource(ds?: Object): Object;
 
 	/**
 	 * Gets/sets the type of the dataSource. If no parameter is specified, returns settings.type
 	 *
+	 * @param t
 	 * @return json|xml|unknown|array|function|htmlTableString|htmlTableId|htmlTableDom|invalid|remoteUrl|empty
 	 */
 	type(t?: Object): string;
@@ -5003,12 +5201,13 @@ class MashupDataSource {
 	 * @param ds the data source in which to search for the record. When not set it will use the current data source.
 	 * @param objPath Not used in $.ig.DataSource
 	 */
-	findRecordByKey(key: string, ds?: string, objPath?: string): Object;
+	findRecordByKey(key: Object, ds?: string, objPath?: string): Object;
 
 	/**
 	 * Removes a specific record denoted by the primaryKey of the passed key parameter from the data source
 	 *
 	 * @param key primary key of the record
+	 * @param origDs
 	 */
 	removeRecordByKey(key: Object, origDs: Object): void;
 
@@ -5016,6 +5215,7 @@ class MashupDataSource {
 	 * Removes a record from the data source at specific index.
 	 *
 	 * @param index index of record
+	 * @param origDs
 	 */
 	removeRecordByIndex(index: number, origDs: Object): void;
 
@@ -5167,6 +5367,9 @@ class MashupDataSource {
 	 * match the number of records that exists on the client
 	 *
 	 * @param count the total number of records
+	 * @param key
+	 * @param dsObj
+	 * @param context
 	 */
 	totalRecordsCount(count?: number, key?: Object, dsObj?: Object, context?: Object): number;
 
@@ -5227,6 +5430,8 @@ class MashupDataSource {
 
 	/**
 	 * For internal use
+	 *
+	 * @param dirty
 	 */
 	pageSizeDirty(dirty: Object): void;
 
@@ -5435,6 +5640,7 @@ interface TreeHierarchicalDataSourceSettingsTreeDSPaging {
 	/**
 	 * When data flows to the next page there are a couple of different modes that can help communicate the context of a leaf level row. When mode option is 'rootLevelOnly' then the context row always shows the value of the contextRowRootText option.
 	 *
+	 *
 	 * Valid values:
 	 * "none" Does not render the contextual row
 	 * "parent" Renders a read-only representation of the immediate parent row
@@ -5513,16 +5719,19 @@ interface TreeHierarchicalDataSourceSettingsTreeDS {
 
 	/**
 	 * If set to TRUE it is expected that the source of data is normalized and transformed(has set dataLevel and expansion state). The source of data is used as flatDataView. Usually used when the paging is remote and paging mode is allLevels, or features are remote(and the processing of the returned result should be made on the server)
+	 *
 	 */
 	initialFlatDataView?: boolean;
 
 	/**
 	 * Specifies a custom function to be called when requesting data to the server - usually when expanding/collapsing record. If set the function should return the encoded URL. It takes as parameters: data record(type: object), expand - (type: bool).
+	 *
 	 */
 	customEncodeUrlFunc?: Function;
 
 	/**
 	 * If true save expansion states in internal list and send it to the server. Applying to one of the main constraint of the REST architecture  Stateless Interactions - client specific data(like expansion states) should NOT be stored on the server
+	 *
 	 */
 	persistExpansionStates?: boolean;
 
@@ -5764,6 +5973,7 @@ class TreeHierarchicalDataSource {
 	 * @param fieldExpressions a list of field expression definitions
 	 * @param boolLogic boolean logic. Accepted values are AND and OR.
 	 * @param keepFilterState if keepFilterState is set to true, it will not discard previous filtering expressions
+	 * @param fieldExpressionsOnStrings
 	 */
 	filter(fieldExpressions: Object, boolLogic: Object, keepFilterState: boolean, fieldExpressionsOnStrings: Object): void;
 
@@ -5796,6 +6006,8 @@ class TreeHierarchicalDataSource {
 
 	/**
 	 * Gets the path of a record by the record or the record's key
+	 *
+	 * @param record
 	 */
 	getPathBy(record: Object): string;
 
@@ -5812,6 +6024,7 @@ class TreeHierarchicalDataSource {
 	 * Removes a specific record denoted by the primaryKey of the passed key parameter from the data source
 	 *
 	 * @param key primary key of the record
+	 * @param origDs
 	 */
 	removeRecordByKey(key: Object, origDs: Object): void;
 
@@ -5869,6 +6082,8 @@ class TreeHierarchicalDataSource {
 	 * 1. Before paging and filtering
 	 * 2. After filtering before paging
 	 * 3. After filtering and paging
+	 *
+	 * @param transformedExecution
 	 */
 	transformedData(transformedExecution: Object): Object;
 
@@ -5915,12 +6130,15 @@ class TreeHierarchicalDataSource {
 
 	/**
 	 * Gets/sets the dataSource setting. If no parameter is specified, returns settings.dataSource
+	 *
+	 * @param ds
 	 */
 	dataSource(ds?: Object): Object;
 
 	/**
 	 * Gets/sets the type of the dataSource. If no parameter is specified, returns settings.type
 	 *
+	 * @param t
 	 * @return json|xml|unknown|array|function|htmlTableString|htmlTableId|htmlTableDom|invalid|remoteUrl|empty
 	 */
 	type(t?: Object): string;
@@ -5929,6 +6147,7 @@ class TreeHierarchicalDataSource {
 	 * Removes a record from the data source at specific index.
 	 *
 	 * @param index index of record
+	 * @param origDs
 	 */
 	removeRecordByIndex(index: number, origDs: Object): void;
 
@@ -6063,6 +6282,9 @@ class TreeHierarchicalDataSource {
 	 * match the number of records that exists on the client
 	 *
 	 * @param count the total number of records
+	 * @param key
+	 * @param dsObj
+	 * @param context
 	 */
 	totalRecordsCount(count?: number, key?: Object, dsObj?: Object, context?: Object): number;
 
@@ -6113,6 +6335,8 @@ class TreeHierarchicalDataSource {
 
 	/**
 	 * For internal use
+	 *
+	 * @param dirty
 	 */
 	pageSizeDirty(dirty: Object): void;
 
@@ -6221,9 +6445,147 @@ interface IgniteUIStatic {
 SimpleTextMarkerTemplate: typeof Infragistics.SimpleTextMarkerTemplate;
 }
 
+interface ShapeDataSourceSettings {
+	/**
+	 * The unique identifier.
+	 */
+	id?: string;
+
+	/**
+	 * The Uri of the .shp portion of the Shapefile.
+	 */
+	shapefileSource?: string;
+
+	/**
+	 * The Uri of the .dbf portion of the Shapefile.
+	 */
+	databaseSource?: string;
+
+	/**
+	 * Callback function to call when data binding is complete.
+	 */
+	callback?: Function;
+
+	/**
+	 * Object on which to invoke the callback function.
+	 */
+	callee?: any;
+
+	/**
+	 * Callback function to call to allow shape records to be transformed.
+	 * paramType="object" the shape record to be transformed.
+	 */
+	transformRecord?: Function;
+
+	/**
+	 * Callback function to call to allow points in the shape records to be transformed.
+	 * paramType="object" the point to be transformed in place. The object will look like { x: value, y: value2 }
+	 */
+	transformPoint?: Function;
+
+	/**
+	 * Callback function to call to allow the bounds of the shape data source to be transformed.
+	 * paramType="object" the bounds of the shape datasource to be transformed in place. The object will look like { top: value, left: value, width: value, height: value }
+	 */
+	transformBounds?: Function;
+
+	/**
+	 * Callback function to call when the import process has been completed
+	 * paramType="object" the ShapeDataSource instance
+	 */
+	importCompleted?: Function;
+
+	/**
+	 * Option for ShapeDataSourceSettings
+	 */
+	[optionName: string]: any;
+}
+
+declare namespace Infragistics {
+class ShapeDataSource {
+	constructor(settings: ShapeDataSourceSettings);
+
+	/**
+	 * Loads to the current data source
+	 */
+	dataBind(): void;
+
+	/**
+	 * Returns true if data is loaded
+	 */
+	isBound(): boolean;
+	dataView(): void;
+
+	/**
+	 * Returns the current converter instance
+	 */
+	converter(): Object;
+}
+}
+interface IgniteUIStatic {
+ShapeDataSource: typeof Infragistics.ShapeDataSource;
+}
+
+interface TriangulationDataSourceSettings {
+	/**
+	 * The unique identifier.
+	 */
+	id?: string;
+
+	/**
+	 * A Uri specifying the location of the Itf file.
+	 */
+	source?: string;
+
+	/**
+	 * The TriangulationSource which is typically created after importing the Itf from the Source Uri.
+	 */
+	triangulationSource?: string;
+
+	/**
+	 * Callback function to call when data binding is complete
+	 */
+	callback?: Function;
+
+	/**
+	 * Object on which to invoke the callback function
+	 */
+	callee?: any;
+
+	/**
+	 * Option for TriangulationDataSourceSettings
+	 */
+	[optionName: string]: any;
+}
+
+declare namespace Infragistics {
+class TriangulationDataSource {
+	constructor(settings: TriangulationDataSourceSettings);
+
+	/**
+	 * Loads to the current data source
+	 */
+	dataBind(): void;
+
+	/**
+	 * Returns true if data is loaded
+	 */
+	isBound(): boolean;
+	dataView(): void;
+
+	/**
+	 * Returns the current converter instance
+	 */
+	converter(): Object;
+}
+}
+interface IgniteUIStatic {
+TriangulationDataSource: typeof Infragistics.TriangulationDataSource;
+}
+
 interface GridExcelExporterCallbacks {
 	/**
-	 * Set a callback that is fired after the cell is exported.
+	 * A function to call after the cell is exported.
 	 * Function takes arguments sender and args.
 	 * Use args.columnKey to get the igGrid column key of the cell.
 	 * Use args.columnIndex to get the igGrid column index of the cell.
@@ -6231,11 +6593,12 @@ interface GridExcelExporterCallbacks {
 	 * Use args.rowId to get key or index of row.
 	 * Use args.xlRow to get reference to the worksheet row.
 	 * Use args.grid to get reference to the igGrid widget.
+	 *
 	 */
 	cellExported?: Function;
 
 	/**
-	 * Cancel="true" Set a callback that is fired before the cell exporting.
+	 * Cancel="true" A function to call before the cell is exported.
 	 * Function takes arguments sender and args.
 	 * Use args.columnKey to get the igGrid column key of the cell.
 	 * Use args.columnIndex to get the igGrid column index of the cell.
@@ -6243,96 +6606,113 @@ interface GridExcelExporterCallbacks {
 	 * Use args.rowId to get key or index of row.
 	 * Use args.xlRow to get reference to the worksheet row.
 	 * Use args.grid to get reference to the igGrid widget.
+	 * Return false in order to cancel exporting the cell.
+	 *
 	 */
 	cellExporting?: Function;
 
 	/**
-	 * Set a callback that is fired when exporting fails.
-	 * Use error to get the reference of error object.
+	 * A function to call when exporting fails.
+	 * Use error to obtain reference of the error object.
+	 *
 	 */
 	error?: Function;
 
 	/**
-	 * Cancel="true" Set a callback that is fired when export is ending, but the document is not saved.
+	 * A function to call before the Excel file is downloaded.
 	 * Function takes arguments sender and args.
 	 * Use args.grid to get reference to the igGrid widget.
-	 * Use args.workbook to get reference to the excel workbook.
-	 * Use args.worksheet to get reference to the excel worksheet.
+	 * Use args.workbook to get reference to the Excel workbook.
+	 * Use args.worksheet to get reference to the Excel worksheet.
+	 * Return false in order to cancel downloading the file.
+	 *
 	 */
 	exportEnding?: Function;
 
 	/**
-	 * Cancel="true" Set a callback that is fired when the exporting has started.
+	 * Cancel="true" A function to call before exporting starts.
 	 * Function takes arguments sender and args.
 	 * Use args.grid to get reference to igGrid widget.
+	 * Return false in order to cancel exporting.
+	 *
 	 */
 	exportStarting?: Function;
 
 	/**
-	 * Set a callback that is fired after the header cell is exported.
+	 * A function to call after a header cell is exported.
 	 * Function takes arguments sender and args.
-	 * Use args.headerText to get the igGrid column key of the header cell.
-	 * Use args.columnKey to get the igGrid column key of the header cell.
-	 * Use args.columnIndex to get the igGrid column index of the header cell.
+	 * Use args.headerText to get the igGrid column header text.
+	 * Use args.columnKey to get the igGrid column key.
+	 * Use args.columnIndex to get the igGrid column index.
+	 *
 	 */
 	headerCellExported?: Function;
 
 	/**
-	 * Cancel="true" Set a callback that is fired before the header cell exporting.
+	 * A function to call before the header cell is exported.
 	 * Function takes arguments sender and args.
-	 * Use args.headerText to get or set the igGrid column key of the header cell.
-	 * Use args.columnKey to get the igGrid column key of the header cell.
-	 * Use args.columnIndex to get the igGrid column index of the header cell.
+	 * Use args.headerText to get or set the igGrid column header text.
+	 * Use args.columnKey to get the igGrid column key.
+	 * Use args.columnIndex to get the igGrid column index.
+	 * Return false in order to cancel exporting the cell.
+	 *
 	 */
 	headerCellExporting?: Function;
 
 	/**
-	 * Cancel="true" Set a callback that is fired after the row is exported.
+	 * Cancel="true" A function to call after the row is exported.
 	 * Function takes arguments sender and args.
 	 * Use args.rowId to get key or index of row.
 	 * Use args.element to get row TR element.
 	 * Use args.xlRow to get reference to the worksheet row.
 	 * Use args.grid to get reference to the igGrid widget.
-	 * Note: When exporting an igHierarchicalGrid this callback is available only for the root grid rows.
+	 * Note: When exporting igHierarchicalGrid this callback is available only for the root grid rows.
+	 *
 	 */
 	rowExported?: Function;
 
 	/**
-	 * Cancel="true" Set a callback that is fired before the row exporting.
+	 * A function to call before the row is exported.
 	 * Function takes arguments sender and args.
 	 * Use args.rowId to get key or index of row.
 	 * Use args.element to get row TR element.
 	 * Use args.xlRow to get reference to the worksheet row.
 	 * Use args.grid to get reference to the igGrid widget.
-	 * Note: When exporting an igHierarchicalGrid this callback is available only for the root grid rows.
+	 * Return false in order to cancel exporting the row.
+	 * Note: When exporting igHierarchicalGrid this callback is available only for the root grid rows.
+	 *
 	 */
 	rowExporting?: Function;
 
 	/**
-	 * Set a callback that is fired when exporting is successful.
+	 * A function to call when saving the file succeeds.
 	 * Use data to get the reference of saved object.
+	 *
 	 */
 	success?: Function;
 
 	/**
-	 * Set a callback that is fired after the summary is exported.
+	 * A function to call after the summary is exported.
 	 * Function takes arguments sender and args.
 	 * Use args.headerText to get the igGrid column header text.
 	 * Use args.columnKey to get the igGrid column key.
 	 * Use args.columnIndex to get the igGrid column index.
 	 * Use args.summary to get a reference to the summary object.
-	 * Use args.xlRowIndex to get the worksheet row index.
+	 * Use args.xlRowIndex to get the Excel worksheet row index.
+	 *
 	 */
 	summaryExported?: Function;
 
 	/**
-	 * Cancel="true" Set a callback that is fired before the summary exporting.
+	 * A function to call before the summary is exported.
 	 * Function takes arguments sender and args.
 	 * Use args.headerText to get the igGrid column header text.
 	 * Use args.columnKey to get the igGrid column key.
 	 * Use args.columnIndex to get the igGrid column index.
 	 * Use args.summary to get a reference to the summary object.
 	 * Use args.xlRowIndex to get reference to worksheet row index.
+	 * Return false in order to cancel exporting the summary.
+	 *
 	 */
 	summaryExporting?: Function;
 
@@ -6346,6 +6726,7 @@ interface GridExcelExporterSettingsGridFeatureOptions {
 	/**
 	 * Indicates whether fixed columns will be applied in the exported table. This is set to none by default, but will change to applied if column fixing feature is defined in the igGrid.
 	 *
+	 *
 	 * Valid values:
 	 * "none" No column fixing will be applied in the excel document.
 	 * "applied" Column fixing will be applied in the excel document.
@@ -6355,6 +6736,7 @@ interface GridExcelExporterSettingsGridFeatureOptions {
 	/**
 	 * Indicates whether filtering will be applied in the exported table. this is set to none by default, but will change to applied if filtering feature is defined in the igGrid.
 	 *
+	 *
 	 * Valid values:
 	 * "none" No filtering will be applied in the excel document.
 	 * "applied" Filtering will be applied in the excel document.
@@ -6365,6 +6747,7 @@ interface GridExcelExporterSettingsGridFeatureOptions {
 	/**
 	 * Indicates whether hidden columns will be removed from the exported table. This is set to none by default, but will change to applied if hiding feature is defined in the igGrid.
 	 *
+	 *
 	 * Valid values:
 	 * "none" All hidden columns will be exported to the excel document.
 	 * "applied" Hidden columns will be exported as hidden in the excel document.
@@ -6375,6 +6758,7 @@ interface GridExcelExporterSettingsGridFeatureOptions {
 	/**
 	 * Indicates whether the rows on the current page or entire data will exported.
 	 *
+	 *
 	 * Valid values:
 	 * "currentPage" Only current page will be exported to the excel document.
 	 * "allRows" All pages will be exported to the excel document.
@@ -6384,6 +6768,7 @@ interface GridExcelExporterSettingsGridFeatureOptions {
 	/**
 	 * Indicates whether sorting will be applied in the exported table. This is set_ to none by default, but will change to applied if sorting feature is defined in the igGrid.
 	 *
+	 *
 	 * Valid values:
 	 * "none" No sorting will be applied in the excel document.
 	 * "applied" Sorting will be applied in the excel document.
@@ -6393,6 +6778,7 @@ interface GridExcelExporterSettingsGridFeatureOptions {
 	/**
 	 * Indicates whether summaries will be added in the exported table. This is set to none by default, but will change to applied if summaries feature is defined in the igGrid.
 	 *
+	 *
 	 * Valid values:
 	 * "none" No summaries will be exported to the excel document.
 	 * "applied" Summaries will be exported to the excel document.
@@ -6407,13 +6793,15 @@ interface GridExcelExporterSettingsGridFeatureOptions {
 
 interface GridExcelExporterSettings {
 	/**
-	 * List of strings containing the keys for the columns that will not be exported.
+	 * An array of strings containing the keys for the columns that will not be exported.
+	 *
 	 */
 	columnsToSkip?: any[];
 
 	/**
 	 * Indicates whether all sublevel data will be exported, or only data under expanded rows.
 	 *
+	 *
 	 * Valid values:
 	 * "allRows" All sublevel data will be exported.
 	 * "expandedRows" Only data under expanded rows will be exported.
@@ -6422,6 +6810,7 @@ interface GridExcelExporterSettings {
 
 	/**
 	 * Specifies the name of the excel file that will be generated.
+	 *
 	 */
 	fileName?: string;
 
@@ -6433,6 +6822,7 @@ interface GridExcelExporterSettings {
 	/**
 	 * Indicates whether excel table styles will be the same as grid styles. This is set to applied by default. Custom grid themes are not supported.
 	 *
+	 *
 	 * Valid values:
 	 * "none" The styles from the grid are not applied to the table region.
 	 * "applied" The styles from the grid are applied to the table region.
@@ -6441,20 +6831,22 @@ interface GridExcelExporterSettings {
 
 	/**
 	 * List of strings containing the keys for the worksheet columns which will not be applied any filtering
+	 *
 	 */
 	skipFilteringOn?: any[];
 
 	/**
-	 * Specifies the excel table style region.
-	 * You can set the following table style
+	 * Specifies the excel table style region. The following table styles are available:
 	 * TableStyleMedium[1-28]
 	 * TableStyleLight[1-21]
 	 * TableStyleDark[1-11]
+	 *
 	 */
 	tableStyle?: string;
 
 	/**
-	 * Specifies the name of workbook where the igGrid will be exported.
+	 * Specifies the worksheet name where the igGrid will be exported.
+	 *
 	 */
 	worksheetName?: string;
 
@@ -6473,7 +6865,7 @@ class GridExcelExporter {
 	/**
 	 * Exports the provided igGrid to Excel document.
 	 *
-	 * @param grid Grid to be exported.
+	 * @param grid jQuery element of the igGrid.
 	 * @param userSettings Settings for exporting the grid.
 	 * @param userCallbacks Callbacks for the events.
 	 */
@@ -6608,6 +7000,11 @@ interface OlapXmlaDataSourceOptions {
 	 */
 	mdxSettings?: OlapXmlaDataSourceOptionsMdxSettings;
 
+	/**
+	 * Specifies if the data is to be served by a XMLA remote provider.
+	 */
+	isRemote?: boolean;
+
 	/**
 	 * Option for OlapXmlaDataSourceOptions
 	 */
@@ -7528,16 +7925,27 @@ class OlapResultView {
 
 	/**
 	 * Creates a new $.ig.OlapResultView object with result object having the same structure as the original one and new visibleResult where the tuples which appear as children under specified tuple and member index are no longer present.
+	 *
+	 * @param axisName
+	 * @param tupleIndex
+	 * @param memberIndex
 	 */
 	collapseTupleMember(axisName: Object, tupleIndex: Object, memberIndex: Object): Object;
 
 	/**
 	 * Creates a $.ig.OlapResultView view object with result object having the same structure as the original one and new visibleResult where the tuples which appear as children under specified tuple and member index are accessible as part of the visibleResult.
+	 *
+	 * @param axisName
+	 * @param tupleIndex
+	 * @param memberIndex
 	 */
 	expandTupleMember(axisName: Object, tupleIndex: Object, memberIndex: Object): Object;
 
 	/**
 	 * Creates a new $.ig.OlapResultView object as the axis specified by axisName of the original result object is extended with the tuples of the same axis found into supplied partialResult object.
+	 *
+	 * @param partialResult
+	 * @param axisName
 	 */
 	extend(partialResult: Object, axisName: Object): Object;
 }
@@ -7767,21 +8175,29 @@ declare namespace Infragistics {
 class Catalog {
 	/**
 	 * Returns the name of the catalog.
+	 *
+	 * @param value
 	 */
 	name(value: Object): string;
 
 	/**
 	 * Returns the unique name of the catalog.
+	 *
+	 * @param value
 	 */
 	uniqueName(value: Object): string;
 
 	/**
 	 * Returns the caption of the catalog used when displaying the name of the catalog to the user.
+	 *
+	 * @param value
 	 */
 	caption(value: Object): string;
 
 	/**
 	 * Returns the description of the catalog which is a human-readable description of the catalog
+	 *
+	 * @param value
 	 */
 	description(value: Object): string;
 }
@@ -7791,21 +8207,29 @@ declare namespace Infragistics {
 class Cube {
 	/**
 	 * Returns the name of the cube.
+	 *
+	 * @param value
 	 */
 	name(value: Object): string;
 
 	/**
 	 * Returns the unique name of the cube.
+	 *
+	 * @param value
 	 */
 	uniqueName(value: Object): string;
 
 	/**
 	 * Returns the caption of the cube used when displaying the name of the cube to the user.
+	 *
+	 * @param value
 	 */
 	caption(value: Object): string;
 
 	/**
 	 * Returns a user-friendly description of the cube.
+	 *
+	 * @param value
 	 */
 	description(value: Object): string;
 
@@ -7815,16 +8239,22 @@ class Cube {
 	 *             $.ig.CubeType.prototype.cube = 0;
 	 *             $.ig.CubeType.prototype.dimension = 1;
 	 *             $.ig.CubeType.prototype.unknown = 2;
+	 *
+	 * @param value
 	 */
 	cubeType(value: Object): number;
 
 	/**
 	 * Returns the date and time on which the cube was last processed.
+	 *
+	 * @param value
 	 */
 	lastProcessed(value: Object): Object;
 
 	/**
 	 * Returns the date and time on which the cube was last updated.
+	 *
+	 * @param value
 	 */
 	lastUpdated(value: Object): Object;
 }
@@ -7834,21 +8264,29 @@ declare namespace Infragistics {
 class Dimension {
 	/**
 	 * Returns the name of the dimension.
+	 *
+	 * @param value
 	 */
 	name(value: Object): string;
 
 	/**
 	 * Returns the unique name of the dimension.
+	 *
+	 * @param value
 	 */
 	uniqueName(value: Object): string;
 
 	/**
 	 * Returns the caption of the dimension used when displaying the name of the dimension to the user.
+	 *
+	 * @param value
 	 */
 	caption(value: Object): string;
 
 	/**
 	 * Returns a user-friendly description of the dimension.
+	 *
+	 * @param value
 	 */
 	description(value: Object): string;
 
@@ -7872,6 +8310,8 @@ class Dimension {
 	 *             $.ig.DimensionType.prototype.organization = 15;
 	 *             $.ig.DimensionType.prototype.billOfMaterials = 16;
 	 *             $.ig.DimensionType.prototype.geography = 17;
+	 *
+	 * @param value
 	 */
 	dimensionType(value: Object): number;
 }
@@ -7881,36 +8321,50 @@ declare namespace Infragistics {
 class Hierarchy {
 	/**
 	 * Returns the name of the hierarchy.
+	 *
+	 * @param value
 	 */
 	name(value: Object): string;
 
 	/**
 	 * Returns the unique name of the hierarchy.
+	 *
+	 * @param value
 	 */
 	uniqueName(value: Object): string;
 
 	/**
 	 * Returns the caption of the hierarchy used when displaying the name of the hierarchy to the user.
+	 *
+	 * @param value
 	 */
 	caption(value: Object): string;
 
 	/**
 	 * Returns a user-friendly description of the hierarchy.
+	 *
+	 * @param value
 	 */
 	description(value: Object): string;
 
 	/**
 	 * Returns the unique name of the default member for the hierarchy.
+	 *
+	 * @param value
 	 */
 	defaultMember(value: Object): string;
 
 	/**
 	 * Returns the unique name of the 'All' member for the hierarchy.
+	 *
+	 * @param value
 	 */
 	allMember(value: Object): string;
 
 	/**
 	 * Returns the unique name of the dimension that contains the hierarchy.
+	 *
+	 * @param value
 	 */
 	dimensionUniqueName(value: Object): string;
 
@@ -7925,12 +8379,16 @@ class Hierarchy {
 	 *
 	 *             $.ig.HierarchyOrigin.prototype.systemInternal = 4;
 	 *             Identifies attributes with no attribute .
+	 *
+	 * @param value
 	 */
 	hierarchyOrigin(value: Object): number;
 
 	/**
 	 * Returns the hierarchy display folder path to be used when displaying the hierarchy in the user interface.
 	 *             Folder names will be separated by a semicolon (;). Nested folders are indicated by a backslash (\).
+	 *
+	 * @param value
 	 */
 	hierarchyDisplayFolder(value: Object): string;
 }
@@ -7940,26 +8398,36 @@ declare namespace Infragistics {
 class Measure {
 	/**
 	 * Returns the name of the measure.
+	 *
+	 * @param value
 	 */
 	name(value: Object): string;
 
 	/**
 	 * Returns the unique name of the measure.
+	 *
+	 * @param value
 	 */
 	uniqueName(value: Object): string;
 
 	/**
 	 * Returns the caption of the measure used when displaying the name of the measure to the user.
+	 *
+	 * @param value
 	 */
 	caption(value: Object): string;
 
 	/**
 	 * Returns a user-friendly description of the measure.
+	 *
+	 * @param value
 	 */
 	description(value: Object): string;
 
 	/**
 	 * Returns the name of the measure group this measure belongs to.
+	 *
+	 * @param value
 	 */
 	measureGroupName(value: Object): string;
 
@@ -8010,17 +8478,23 @@ class Measure {
 	 *
 	 *             $.ig.AggregatorType.prototype.calculated = 127;
 	 *             The aggregated function will returns the result derived from a formula.
+	 *
+	 * @param value
 	 */
 	aggregatorType(value: Object): number;
 
 	/**
 	 * Returns the default format string for the measure.
+	 *
+	 * @param value
 	 */
 	defaultFormatString(value: Object): string;
 
 	/**
 	 * Returns the measure display folder path to be used when displaying the measure in the user interface.
 	 *             Folder names will be separated by a semicolon (;). Nested folders are indicated by a backslash (\).
+	 *
+	 * @param value
 	 */
 	measureDisplayFolder(value: Object): string;
 }
@@ -8030,51 +8504,71 @@ declare namespace Infragistics {
 class Level {
 	/**
 	 * Returns the name of the level.
+	 *
+	 * @param value
 	 */
 	name(value: Object): string;
 
 	/**
 	 * Returns the unique name of the level.
+	 *
+	 * @param value
 	 */
 	uniqueName(value: Object): string;
 
 	/**
 	 * Returns the caption of the level used when displaying the name of the level to the user.
+	 *
+	 * @param value
 	 */
 	caption(value: Object): string;
 
 	/**
 	 * Returns a user-friendly description of the level.
+	 *
+	 * @param value
 	 */
 	description(value: Object): string;
 
 	/**
 	 * Returns the distance of the level from the root of the level. Root level is zero (0)
+	 *
+	 * @param value
 	 */
 	depth(value: Object): number;
 
 	/**
 	 * Returns the unique name of the hierarchy that contains the level.
+	 *
+	 * @param value
 	 */
 	hierarchyUniqueName(value: Object): string;
 
 	/**
 	 * Returns the unique name of the dimension that contains the level.
+	 *
+	 * @param value
 	 */
 	dimensionUniqueName(value: Object): string;
 
 	/**
 	 * Returns the count of all members in the level.
+	 *
+	 * @param value
 	 */
 	membersCount(value: Object): number;
 
 	/**
 	 * Returns a value that defines how the level was sourced.
+	 *
+	 * @param value
 	 */
 	levelOrigin(value: Object): number;
 
 	/**
 	 * Returns the ID of the attribute that the level is sorted on.
+	 *
+	 * @param value
 	 */
 	levelOrderingProperty(value: Object): number;
 }
@@ -8084,26 +8578,36 @@ declare namespace Infragistics {
 class MeasureGroup {
 	/**
 	 * Returns the name of the measure group.
+	 *
+	 * @param value
 	 */
 	name(value: Object): string;
 
 	/**
 	 * Returns the caption of the measure group used when displaying the name of the measure group to the user.
+	 *
+	 * @param value
 	 */
 	caption(value: Object): string;
 
 	/**
 	 * Returns a user-friendly description of the measure group.
+	 *
+	 * @param value
 	 */
 	description(value: Object): string;
 
 	/**
 	 * Returns the name of the catalog to which this measure group belongs.
+	 *
+	 * @param value
 	 */
 	catalogName(value: Object): string;
 
 	/**
 	 * Returns the name of the cube to which this measure group belongs
+	 *
+	 * @param value
 	 */
 	cubeName(value: Object): string;
 }
@@ -8113,11 +8617,15 @@ declare namespace Infragistics {
 class MeasureList {
 	/**
 	 * Returns the caption of the measure list used when displaying the name of the measure list to the user.
+	 *
+	 * @param value
 	 */
 	caption(value: Object): string;
 
 	/**
 	 * Returns an array of $.ig.Measure objects this measure list is grouping.
+	 *
+	 * @param value
 	 */
 	measures(value: Object): any[];
 }
@@ -8127,16 +8635,22 @@ declare namespace Infragistics {
 class OlapResult {
 	/**
 	 * Returns a value indicating whether the result object contains any data.
+	 *
+	 * @param value
 	 */
 	isEmpty(value: Object): boolean;
 
 	/**
 	 * Returns an array of $.ig.OlapResultAxis objects this result is built on.
+	 *
+	 * @param value
 	 */
 	axes(value: Object): any[];
 
 	/**
 	 * Returns an array of $.ig.OlapResultCell objects which hold the result data.
+	 *
+	 * @param value
 	 */
 	cells(value: Object): any[];
 }
@@ -8208,51 +8722,71 @@ declare namespace Infragistics {
 class OlapResultAxisMember {
 	/**
 	 * Returns the unique name of the axis member.
+	 *
+	 * @param value
 	 */
 	uniqueName(value: Object): string;
 
 	/**
 	 * Returns the caption of the axis member used when displaying the name of the axis member to the user.
+	 *
+	 * @param value
 	 */
 	caption(value: Object): string;
 
 	/**
 	 * Returns the unique name of the level this member belongs to.
+	 *
+	 * @param value
 	 */
 	levelUniqueName(value: Object): string;
 
 	/**
 	 * Returns the unique name of the hierarchy that contains the level.
+	 *
+	 * @param value
 	 */
 	hierarchyUniqueName(value: Object): string;
 
 	/**
 	 * Returns the distance of member parent level from the root of the level. Root level is zero (0)
+	 *
+	 * @param value
 	 */
 	levelNumber(value: Object): number;
 
 	/**
 	 * A bitmap of the information projected by childCount, drilledDown and parentSameAsPrev properties.
+	 *
+	 * @param value
 	 */
 	displayInfo(value: Object): number;
 
 	/**
 	 * Returns the count of children members this member has.
+	 *
+	 * @param value
 	 */
 	childCount(value: Object): number;
 
 	/**
 	 * Returns a value that indicates whether at least one child of this member appears on the axis, immediately following all occurrences of that member. This can be used by applications to display a "+" or a "-" next to the member.
+	 *
+	 * @param value
 	 */
 	drilledDown(value: Object): boolean;
 
 	/**
 	 * Returns a value that indicates whether the parent of this member is the same as the parent of the member preceding all occurrences of the current member.
+	 *
+	 * @param value
 	 */
 	parentSameAsPrev(value: Object): boolean;
 
 	/**
 	 * Returns a key value map of the members' properties. By default only 'PARENT_UNIQUE_NAME' and 'CHILDREN_CARDINALITY' properties are available.
+	 *
+	 * @param value
 	 */
 	properties(value: Object): Object;
 }
@@ -8262,11 +8796,15 @@ declare namespace Infragistics {
 class OlapResultCell {
 	/**
 	 * Returns the position of the cell when cells are iterated row by row.
+	 *
+	 * @param value
 	 */
 	cellOrdinal(value: Object): number;
 
 	/**
 	 * Returns a key value map of the cell's properties. Currently only 'Value' and 'FmtValue' properties are available.
+	 *
+	 * @param value
 	 */
 	properties(value: Object): Object;
 }
@@ -9296,6 +9834,24 @@ interface IgBulletGraph {
 	 */
 	pixelScalingRatio?: number;
 
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	locale?: any;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	language?: string;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+	regional?: string|Object;
+
 	/**
 	 * Event which is raised when a label of the bullet graph is formatted.
 	 * Function takes first argument evt and second argument ui.
@@ -9373,6 +9929,24 @@ interface IgBulletGraphMethods {
 	 * Re-polls the css styles for the widget. Use this method when the css styles have been modified.
 	 */
 	styleUpdated(): void;
+
+	/**
+	 * Changes the all locales contained into a specified container to the language specified in [options.language](ui.igwidget#options:language)
+	 * Note that this method is for rare scenarios, use [language](ui.igwidget#options:language) or [locale](ui.igwidget#options:locale) option setter
+	 *
+	 * @param $container Optional parameter - if not set it would use the element of the widget as $container
+	 */
+	changeLocale($container: Object): void;
+
+	/**
+	 * Changes the widget language to global language. Global language is the value in $.ig.util.language
+	 */
+	changeGlobalLanguage(): void;
+
+	/**
+	 * Changes the widget regional settins to global regional settings. Global regional settings are container in $.ig.util.regional
+	 */
+	changeGlobalRegional(): void;
 }
 interface JQuery {
 	data(propertyName: "igBulletGraph"): IgBulletGraphMethods;
@@ -9387,6 +9961,9 @@ interface JQuery {
 	igBulletGraph(methodName: "flush"): void;
 	igBulletGraph(methodName: "destroy"): void;
 	igBulletGraph(methodName: "styleUpdated"): void;
+	igBulletGraph(methodName: "changeLocale", $container: Object): void;
+	igBulletGraph(methodName: "changeGlobalLanguage"): void;
+	igBulletGraph(methodName: "changeGlobalRegional"): void;
 
 	/**
 	 * The width of the gauge. It can be set as a number in pixels, string (px) or percentage (%).
@@ -10162,6 +10739,50 @@ interface JQuery {
 	 */
 	igBulletGraph(optionLiteral: 'option', optionName: "pixelScalingRatio", optionValue: number): void;
 
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	igBulletGraph(optionLiteral: 'option', optionName: "locale"): any;
+
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igBulletGraph(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	igBulletGraph(optionLiteral: 'option', optionName: "language"): string;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igBulletGraph(optionLiteral: 'option', optionName: "language", optionValue: string): void;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+
+	igBulletGraph(optionLiteral: 'option', optionName: "regional"): string|Object;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igBulletGraph(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
+
 	/**
 	 * Event which is raised when a label of the bullet graph is formatted.
 	 * Function takes first argument evt and second argument ui.
@@ -10241,26 +10862,46 @@ interface SeriesRemovedEvent {
 
 interface SeriesRemovedEventUIParam {}
 
+interface SeriesPointerEnterEvent {
+	(event: Event, ui: SeriesPointerEnterEventUIParam): void;
+}
+
+interface SeriesPointerEnterEventUIParam {}
+
+interface SeriesPointerLeaveEvent {
+	(event: Event, ui: SeriesPointerLeaveEventUIParam): void;
+}
+
+interface SeriesPointerLeaveEventUIParam {}
+
+interface SeriesPointerMoveEvent {
+	(event: Event, ui: SeriesPointerMoveEventUIParam): void;
+}
+
+interface SeriesPointerMoveEventUIParam {}
+
+interface SeriesPointerDownEvent {
+	(event: Event, ui: SeriesPointerDownEventUIParam): void;
+}
+
+interface SeriesPointerDownEventUIParam {}
+
+interface SeriesPointerUpEvent {
+	(event: Event, ui: SeriesPointerUpEventUIParam): void;
+}
+
+interface SeriesPointerUpEventUIParam {}
+
 interface IgCategoryChart {
 	/**
-	 * Gets or sets the data value corresponding to the minimum value of the Y-axis.
+	 * Gets or sets the id of a template element to use for tooltips, or markup representing the tooltip template.
 	 */
-	yAxisMinimumValue?: number;
+	tooltipTemplate?: any;
 
 	/**
-	 * Gets or sets the data value corresponding to the maximum value of the Y-axis.
+	 * Gets or sets the names of tooltip templates
 	 */
-	yAxisMaximumValue?: number;
-
-	/**
-	 * Gets or sets the distance between the X-axis and the bottom of the chart.
-	 */
-	xAxisExtent?: number;
-
-	/**
-	 * Gets or sets the distance between the Y-axis and the left edge of the chart.
-	 */
-	yAxisExtent?: number;
+	tooltipTemplates?: any;
 
 	/**
 	 * Gets or sets the left margin of chart title
@@ -10282,78 +10923,6 @@ interface IgCategoryChart {
 	 */
 	titleBottomMargin?: number;
 
-	/**
-	 * Gets or sets the duration used for animating series plots when the chart is loading into view
-	 */
-	transitionInDuration?: number;
-
-	/**
-	 * Gets or sets the duration used for animating series plots when the data is changing
-	 */
-	transitionDuration?: number;
-
-	/**
-	 * Gets or sets the easing function used for animating series plots when the chart is loading into view
-	 * This can be set to one of the known values "linear" or "cubic," or it can be set to an easing function which takes a single numeric parameter and returns a number.
-	 */
-	transitionInEasingFunction?: any;
-
-	/**
-	 * Gets or sets the easing function used for animating series plots when the data is changing.
-	 * This can be set to one of the known values "linear" or "cubic," or it can be set to an easing function which takes a single numeric parameter and returns a number.
-	 */
-	transitionEasingFunction?: any;
-
-	/**
-	 * Gets or sets the left margin of labels on the X-axis
-	 */
-	xAxisLabelLeftMargin?: number;
-
-	/**
-	 * Gets or sets the top margin of labels on the X-axis
-	 */
-	xAxisLabelTopMargin?: number;
-
-	/**
-	 * Gets or sets the right margin of labels on the X-axis
-	 */
-	xAxisLabelRightMargin?: number;
-
-	/**
-	 * Gets or sets the bottom margin of labels on the X-axis
-	 */
-	xAxisLabelBottomMargin?: number;
-
-	/**
-	 * Gets or sets the left margin of labels on the Y-axis
-	 */
-	yAxisLabelLeftMargin?: number;
-
-	/**
-	 * Gets or sets the top margin of labels on the Y-axis
-	 */
-	yAxisLabelTopMargin?: number;
-
-	/**
-	 * Gets or sets the right margin of labels on the Y-axis
-	 */
-	yAxisLabelRightMargin?: number;
-
-	/**
-	 * Gets or sets the bottom margin of labels on the Y-axis
-	 */
-	yAxisLabelBottomMargin?: number;
-
-	/**
-	 * Gets or sets color of labels on the X-axis
-	 */
-	xAxisLabelTextColor?: string;
-
-	/**
-	 * Gets or sets color of labels on the Y-axis
-	 */
-	yAxisLabelTextColor?: string;
-
 	/**
 	 * Gets or sets the left margin of chart subtitle
 	 */
@@ -10404,6 +10973,273 @@ interface IgCategoryChart {
 	 */
 	bottomMargin?: number;
 
+	/**
+	 * Gets or sets the duration used for animating series plots when the data is changing
+	 */
+	transitionDuration?: number;
+
+	/**
+	 * Gets or sets the easing function used for animating series plots when the data is changing.
+	 * This can be set to one of the known values "linear" or "cubic," or it can be set to an easing function which takes a single numeric parameter and returns a number.
+	 */
+	transitionEasingFunction?: any;
+
+	/**
+	 * Gets or sets a function for creating wrapped tooltip
+	 */
+	createWrappedTooltip?: any;
+
+	/**
+	 * Gets or sets the widget of this control
+	 */
+	widget?: any;
+
+	/**
+	 * Gets or sets CSS font property for the chart subtitle
+	 */
+	subtitleTextStyle?: string;
+
+	/**
+	 * Gets or sets CSS font property for the chart title
+	 */
+	titleTextStyle?: string;
+
+	/**
+	 * Gets or sets a collection of data items used to generate the chart.
+	 * The ItemsSource of this chart can be a list of objects containing one or more numeric properties.
+	 * Additionally, if the objects in the list implement the IEnumerable interface,
+	 * the Chart will attempt to delve into the sub-collections when reading through the data source.
+	 * Databinding can be further configured by attributing the data item classes
+	 * with the DataSeriesMemberIntentAttribute.
+	 */
+	itemsSource?: any;
+
+	/**
+	 * Gets or sets a set of property paths that should be included for consideration by the category chart, leaving the remainder excluded. If null, all properties will be considered.
+	 */
+	includedProperties?: any;
+
+	/**
+	 * Gets or sets a set of property paths that should be excluded from consideration by the category chart.
+	 */
+	excludedProperties?: any;
+
+	/**
+	 * Gets or sets the palette of brushes to use for coloring the chart series.
+	 * The value provided should be an array of CSS color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 */
+	brushes?: any;
+
+	/**
+	 * Gets or sets the palette of brushes to use for outlines on the chart series.
+	 * The value provided should be an array of CSS color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 */
+	outlines?: any;
+
+	/**
+	 * Gets or sets the legend to connect this chart to.
+	 * When the legend property is set, the chart will use it to display information about its series.  Legends can be shared by multiple chart controls.
+	 */
+	legend?: any;
+
+	/**
+	 * Gets or sets whether the chart can be horizontally zoomed through user interactions.
+	 */
+	isHorizontalZoomEnabled?: boolean;
+
+	/**
+	 * Gets or sets whether the chart can be vertically zoomed through user interactions.
+	 */
+	isVerticalZoomEnabled?: boolean;
+
+	/**
+	 * Gets or sets the rectangle representing the current scroll and zoom state of the chart.
+	 * WindowRect is expressed as a Rectangle with coordinates and sizes between 0 and 1.
+	 * The provided object should have numeric properties called left, top, width and height.
+	 */
+	windowRect?: any;
+
+	/**
+	 * Gets or sets text to display above the plot area.
+	 */
+	title?: string;
+
+	/**
+	 * Gets or sets text to display below the Title, above the plot area.
+	 */
+	subtitle?: string;
+
+	/**
+	 * Gets or sets horizontal alignment which determines the title position, relative to the left and right edges of the control.
+	 *
+	 * Valid values:
+	 * "left" Align the item to the left
+	 * "center" Center the item
+	 * "right" Align the item to the right
+	 * "stretch" Stretch the item to the full width
+	 */
+	titleAlignment?: string;
+
+	/**
+	 * Gets or sets horizontal alignment which determines the subtitle position, relative to the left and right edges of the control.
+	 *
+	 * Valid values:
+	 * "left" Align the item to the left
+	 * "center" Center the item
+	 * "right" Align the item to the right
+	 * "stretch" Stretch the item to the full width
+	 */
+	subtitleAlignment?: string;
+
+	/**
+	 * Gets or sets the behavior that determines how unknown values will be plotted on the chart.Null and Double.NaN are two examples of unknown values.
+	 *
+	 *
+	 * Valid values:
+	 * "linearInterpolate" Plot the unknown value as the midpoint between surrounding known values using linear interpolation.
+	 * "dontPlot" Do not plot the unknown value on the chart.
+	 */
+	unknownValuePlotting?: string;
+
+	/**
+	 * Gets or sets the rendering resolution for all series in this chart.
+	 * Where n = Resolution, for every n horizontal pixels, combine all items into a single datapoint.  When Resolution = 0, all datapoints will be rendered as graphical objects.  Charts with a higher resolution will have faster performance.
+	 */
+	resolution?: number;
+
+	/**
+	 * Gets or sets the thickness for all series in this chart. Depending on the ChartType, this can be the main brush used, or just the outline.
+	 */
+	thickness?: number;
+
+	/**
+	 * Gets or sets the marker shapes used for indicating location of data points in this chart.
+	 * This property applies only to these chart types: point, line, spline, bubble, and polygon
+	 */
+	markerTypes?: any;
+
+	/**
+	 * Gets or sets the palette of brushes used for rendering fill area of data point markers.
+	 * This property applies only to these chart types: point, line, spline, bubble, and polygon
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 */
+	markerBrushes?: any;
+
+	/**
+	 * Gets or sets the palette of brushes used for rendering outlines of data point markers.
+	 * This property applies only to these chart types: point, line, spline, bubble, and polygon
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 */
+	markerOutlines?: any;
+
+	/**
+	 * Gets or sets the maximum number of markers displyed in the plot area of the chart.
+	 */
+	markerMaxCount?: number;
+
+	/**
+	 * Gets or sets the palette of brushes to used for coloring trend lines in this chart.
+	 * The value provided should be an array of CSS color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 */
+	trendLineBrushes?: any;
+
+	/**
+	 * Gets or sets the formula used for calculating trend lines in this chart.This property applies only to these chart types: point, line, spline, and bubble
+	 *
+	 *
+	 * Valid values:
+	 * "none" No trend line will be displayed.
+	 * "linearFit" Linear fit.
+	 * "quadraticFit" Quadratic polynomial fit.
+	 * "cubicFit" Cubic polynomial fit.
+	 * "quarticFit" Quartic polynomial fit.
+	 * "quinticFit" Quintic polynomial fit.
+	 * "logarithmicFit" Logarithmic fit.
+	 * "exponentialFit" Exponential fit.
+	 * "powerLawFit" Powerlaw fit.
+	 * "simpleAverage" Simple moving average.
+	 * "exponentialAverage" Exponential moving average.
+	 * "modifiedAverage" Modified moving average.
+	 * "cumulativeAverage" Cumulative moving average.
+	 * "weightedAverage" Weighted moving average.
+	 */
+	trendLineType?: string;
+
+	/**
+	 * Gets or sets the thickness of the trend lines in this chart.
+	 * This property applies only to these chart types: point, line, spline, and bubble
+	 */
+	trendLineThickness?: number;
+
+	/**
+	 * Gets or sets a value indicating whether grid and tick lines are aligned to device pixels.
+	 */
+	alignsGridLinesToPixels?: boolean;
+	trendLinePeriod?: number;
+
+	/**
+	 * Gets or sets function which takes an context object and returns a formatted label for the X-axis.
+	 */
+	xAxisFormatLabel?: any;
+
+	/**
+	 * Gets or sets function which takes a context object and returns a formatted label for the Y-axis.
+	 */
+	yAxisFormatLabel?: any;
+
+	/**
+	 * Gets or sets the left margin of labels on the X-axis
+	 */
+	xAxisLabelLeftMargin?: number;
+
+	/**
+	 * Gets or sets the top margin of labels on the X-axis
+	 */
+	xAxisLabelTopMargin?: number;
+
+	/**
+	 * Gets or sets the right margin of labels on the X-axis
+	 */
+	xAxisLabelRightMargin?: number;
+
+	/**
+	 * Gets or sets the bottom margin of labels on the X-axis
+	 */
+	xAxisLabelBottomMargin?: number;
+
+	/**
+	 * Gets or sets the left margin of labels on the Y-axis
+	 */
+	yAxisLabelLeftMargin?: number;
+
+	/**
+	 * Gets or sets the top margin of labels on the Y-axis
+	 */
+	yAxisLabelTopMargin?: number;
+
+	/**
+	 * Gets or sets the right margin of labels on the Y-axis
+	 */
+	yAxisLabelRightMargin?: number;
+
+	/**
+	 * Gets or sets the bottom margin of labels on the Y-axis
+	 */
+	yAxisLabelBottomMargin?: number;
+
+	/**
+	 * Gets or sets color of labels on the X-axis
+	 */
+	xAxisLabelTextColor?: string;
+
+	/**
+	 * Gets or sets color of labels on the Y-axis
+	 */
+	yAxisLabelTextColor?: string;
+
 	/**
 	 * Gets or sets the margin around a title on the X-axis
 	 */
@@ -10463,34 +11299,6 @@ interface IgCategoryChart {
 	 * Gets or sets color of title on the Y-axis
 	 */
 	yAxisTitleTextColor?: string;
-	createWrappedTooltip?: any;
-
-	/**
-	 * Gets or sets the id of a template element to use for tooltips, or markup representing the tooltip template.
-	 */
-	tooltipTemplate?: string;
-	tooltipTemplates?: any;
-
-	/**
-	 * Gets or sets function which takes an context object and returns a formatted label for the X-axis.
-	 */
-	xAxisFormatLabel?: any;
-
-	/**
-	 * Gets or sets function which takes a context object and returns a formatted label for the Y-axis.
-	 */
-	yAxisFormatLabel?: any;
-
-	/**
-	 * Gets or sets CSS font property for title on X-axis
-	 */
-	xAxisTitleTextStyle?: string;
-
-	/**
-	 * Gets or sets CSS font property for title on Y-axis
-	 */
-	yAxisTitleTextStyle?: string;
-	widget?: any;
 
 	/**
 	 * Gets or sets CSS font property for labels on X-axis
@@ -10503,222 +11311,14 @@ interface IgCategoryChart {
 	yAxisLabelTextStyle?: string;
 
 	/**
-	 * Gets or sets CSS font property for the chart subtitle
+	 * Gets or sets CSS font property for title on X-axis
 	 */
-	subtitleTextStyle?: string;
+	xAxisTitleTextStyle?: string;
 
 	/**
-	 * Gets or sets CSS font property for the chart title
+	 * Gets or sets CSS font property for title on Y-axis
 	 */
-	titleTextStyle?: string;
-
-	/**
-	 * Gets or sets a collection of data items used to generate the chart.
-	 * Value of this property can be a list of objects containing one or more numeric properties.  Additionally, if the objects in the list implement the IEnumerable interface, the Category Chart will attempt to delve into the sub-collections when reading through the data source.  Databinding can be further configured by attributing the data item classes with the DataSeriesMemberIntentAttribute.
-	 */
-	itemsSource?: any;
-
-	/**
-	 * Gets or sets a set of property paths that should be included for consideration by the category chart, leaving the remaineder excluded. If null, all properties will be considered.
-	 */
-	includedProperties?: any;
-
-	/**
-	 * Gets or sets a set of property paths that should be excluded from consideration by the category chart.
-	 */
-	excludedProperties?: any;
-
-	/**
-	 * Gets or sets the type of chart series to generate from the data.
-	 *
-	 * Valid values:
-	 * "line" Specifies category line series with markers at each data point
-	 * "area" Specifies category area series
-	 * "column" Specifies category column chart with vertical rectangles at each data point
-	 * "point" Specifies category point chart with markers at each data point
-	 * "stepLine" Specifies category step line chart
-	 * "stepArea" Specifies category step area chart
-	 * "spline" Specifies category spline line series with markers at each data point
-	 * "splineArea" Specifies category spline area series
-	 * "waterfall" Specifies category waterfall chart
-	 * "auto" Specifies automatic selection of chart type based on suggestions from Data Adapter
-	 */
-	chartType?: string;
-
-	/**
-	 * Gets or sets the palette of brushes to use for coloring the chart series. The value provided should be an array of CSS color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection
-	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
-	 */
-	brushes?: any;
-
-	/**
-	 * Gets or sets the palette of brushes to use for outlines on the chart series. The value provided should be an array of CSS color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection
-	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
-	 */
-	outlines?: any;
-
-	/**
-	 * Sets the legend to connect this chart to.
-	 * When the legend property is set, the chart will use it to display information about its series.  Legends can be shared by multiple chart controls.
-	 */
-	legend?: any;
-
-	/**
-	 * Gets or sets whether the chart can be horizontally zoomed through user interaction.
-	 */
-	isHorizontalZoomEnabled?: boolean;
-
-	/**
-	 * Gets or sets whether the chart can be vertically zoomed through user interaction.
-	 */
-	isVerticalZoomEnabled?: boolean;
-
-	/**
-	 * Gets or sets the rectangle representing the current scroll and zoom state of the chart.
-	 * WindowRect is expressed as a Rectangle with coordinates and sizes between 0 and 1.
-	 * The provided object should have numeric properties called left, top, width and height.
-	 */
-	windowRect?: any;
-
-	/**
-	 * Gets or sets text to display above the plot area.
-	 */
-	title?: string;
-
-	/**
-	 * Gets or sets text to display below the chart Title, above the plot area.
-	 */
-	subtitle?: string;
-
-	/**
-	 * Gets or sets horizontal alignment which determines the title position, relative to the left and right edges of the chart.
-	 *
-	 * Valid values:
-	 * "left" Align the item to the left
-	 * "center" Center the item
-	 * "right" Align the item to the right
-	 * "stretch" Stretch the item to the full width
-	 */
-	titleAlignment?: string;
-
-	/**
-	 * Gets or sets horizontal alignment which determines the subtitle position, relative to the left and right edges of the chart.
-	 *
-	 * Valid values:
-	 * "left" Align the item to the left
-	 * "center" Center the item
-	 * "right" Align the item to the right
-	 * "stretch" Stretch the item to the full width
-	 */
-	subtitleAlignment?: string;
-
-	/**
-	 * Gets or sets the behavior that determines how unknown values will be plotted on the chart.Null and Double.NaN are two examples of unknown values.
-	 *
-	 * Valid values:
-	 * "linearInterpolate" Plot the unknown value as the midpoint between surrounding known values using linear interpolation.
-	 * "dontPlot" Do not plot the unknown value on the chart.
-	 */
-	unknownValuePlotting?: string;
-
-	/**
-	 * Gets or sets the behavior for markers in each series which are placed too close together for the current view, resulting in a collision.
-	 *
-	 * Valid values:
-	 * "none" Collision avoidance is disabled.
-	 * "omit" Items colliding with other items will be hidden from view.
-	 */
-	markerCollisionAvoidance?: string;
-
-	/**
-	 * Gets or sets whether animation of series plots is enabled when the chart is loading into view
-	 */
-	isTransitionInEnabled?: boolean;
-
-	/**
-	 * Gets or sets the method that determines how to animate series plots when the chart is loading into view
-	 *
-	 * Valid values:
-	 * "auto" Series transitions in an automatically chosen based on type of series and its orientation
-	 * "fromZero" Series transitions in from the reference value of the value axis.
-	 * "sweepFromLeft" Series sweeps in from the left
-	 * "sweepFromRight" Series sweeps in from the right
-	 * "sweepFromTop" Series sweeps in from the top.
-	 * "sweepFromBottom" Series sweeps in from the bottom.
-	 * "sweepFromCenter" Series sweeps in from the center.
-	 * "accordionFromLeft" Series accordions in from the left.
-	 * "accordionFromRight" Series accordions in from the right.
-	 * "accordionFromTop" Series accordions in from the top.
-	 * "accordionFromBottom" Series accordions in from the bottom.
-	 * "expand" Series expands from the value midpoints.
-	 * "sweepFromCategoryAxisMinimum" Series sweeps in from the category axis minimum.
-	 * "sweepFromCategoryAxisMaximum" Series sweeps in from the category axis maximum.
-	 * "sweepFromValueAxisMinimum" Series sweeps in from the value axis minimum.
-	 * "sweepFromValueAxisMaximum" Series sweeps in from the value axis maximum.
-	 * "accordionFromCategoryAxisMinimum" Series accordions in from the category axis minimum.
-	 * "accordionFromCategoryAxisMaximum" Series accordions in from the category axis maximum.
-	 * "accordionFromValueAxisMinimum" Series accordions in from the value axis minimum.
-	 * "accordionFromValueAxisMaximum" Series accordions in from the value axis maximum.
-	 */
-	transitionInMode?: string;
-
-	/**
-	 * Gets or sets the arrival speed used for animating series plots when the chart is loading into view
-	 *
-	 * Valid values:
-	 * "auto" A speed type is automatically selected.
-	 * "normal" All speeds are normal, data points will arrive at the same time.
-	 * "valueScaled" Data points will arrive later if their value is further from the start point.
-	 * "indexScaled" Data points will arrive later if their index is further from the axis origin.
-	 * "random" Data points will arrive at random times.
-	 */
-	transitionInSpeedType?: string;
-
-	/**
-	 * Gets or sets the frequency of displayed labels along the X-axis.
-	 * Gets or sets the set value is a factor that determines which labels will be hidden. For example, an interval of 2 will display every other label.
-	 */
-	xAxisInterval?: number;
-
-	/**
-	 * Gets or sets the frequency of displayed minor lines along the X-axis.
-	 * Gets or sets the set value is a factor that determines how the minor lines will be displayed.
-	 */
-	xAxisMinorInterval?: number;
-
-	/**
-	 * Gets or sets the amount of space between adjacent categories for the X-axis.
-	 * The gap is silently clamped to the range [0, 1] when used.
-	 */
-	xAxisGap?: number;
-
-	/**
-	 * Gets or sets the amount of overlap between adjacent categories for the X-axis.
-	 * Gets or sets the overlap is silently clamped to the range [-1, 1] when used.
-	 */
-	xAxisOverlap?: number;
-
-	/**
-	 * Gets or sets the distance between each label and grid line along the Y-axis.
-	 */
-	yAxisInterval?: number;
-
-	/**
-	 * Gets or sets whether the Y-axis should use a logarithmic scale instead of a linear one.
-	 * Since log(-1) is imaginary and log(0) is undefined, it is recommended to enable this property only when the Y-axis minimum is greater than zero.
-	 */
-	yAxisIsLogarithmic?: boolean;
-
-	/**
-	 * Gets or sets the base value to use in the log function when mapping the position of data items along the Y-axis.
-	 * This property is effective only when YAxisIsLogarithmic is true.
-	 */
-	yAxisLogarithmBase?: number;
-
-	/**
-	 * Gets or sets the frequency of displayed minor lines along the Y-axis.
-	 */
-	yAxisMinorInterval?: number;
+	yAxisTitleTextStyle?: string;
 
 	/**
 	 * Gets or sets the format for labels along the X-axis.
@@ -10821,12 +11421,12 @@ interface IgCategoryChart {
 	yAxisTickStrokeThickness?: number;
 
 	/**
-	 * Text to display below the X-axis.
+	 * Gets or sets the Text to display below the X-axis.
 	 */
 	xAxisTitle?: string;
 
 	/**
-	 * Text to display to the left of the Y-axis.
+	 * Gets or sets the Text to display to the left of the Y-axis.
 	 */
 	yAxisTitle?: string;
 
@@ -10850,6 +11450,16 @@ interface IgCategoryChart {
 	 */
 	yAxisLabelAngle?: number;
 
+	/**
+	 * Gets or sets the distance between the X-axis and the bottom of the chart.
+	 */
+	xAxisExtent?: number;
+
+	/**
+	 * Gets or sets the distance between the Y-axis and the left edge of the chart.
+	 */
+	yAxisExtent?: number;
+
 	/**
 	 * Gets or sets the angle of rotation for the X-axis title.
 	 */
@@ -10861,84 +11471,17 @@ interface IgCategoryChart {
 	yAxisTitleAngle?: number;
 
 	/**
-	 * Gets or sets the rendering resolution for series in this chart.
-	 * Where n = Resolution, for every n horizontal pixels, combine all items into a single datapoint.  When Resolution = 0, all datapoints will be rendered as graphical objects.  Charts with a higher resolution will have faster performance.
-	 */
-	resolution?: number;
-
-	/**
-	 * Gets or sets the palette of brushes to used for coloring trend lines in this chart. The value provided should be an array of CSS color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection
-	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
-	 */
-	trendLineBrushes?: any;
-
-	/**
-	 * Gets or sets the formula used for calculating trend lines in this chart.
-	 *
-	 * Valid values:
-	 * "none" No trend line will be displayed.
-	 * "linearFit" Linear fit.
-	 * "quadraticFit" Quadratic polynomial fit.
-	 * "cubicFit" Cubic polynomial fit.
-	 * "quarticFit" Quartic polynomial fit.
-	 * "quinticFit" Quintic polynomial fit.
-	 * "logarithmicFit" Logarithmic fit.
-	 * "exponentialFit" Exponential fit.
-	 * "powerLawFit" Powerlaw fit.
-	 * "simpleAverage" Simple moving average.
-	 * "exponentialAverage" Exponential moving average.
-	 * "modifiedAverage" Modified moving average.
-	 * "cumulativeAverage" Cumulative moving average.
-	 * "weightedAverage" Weighted moving average.
-	 */
-	trendLineType?: string;
-
-	/**
-	 * Gets or sets the thickness of the chart series. Depending on the ChartType, this can be the main brush used, or just the outline.
-	 */
-	thickness?: number;
-
-	/**
-	 * Gets or sets the collection of marker shapes used for representing data points of series in this chart.
-	 * When MarkerTypes is null or empty, each series' marker type will be set to none or automatic, depending on the series type.
-	 */
-	markerTypes?: any;
-
-	/**
-	 * Gets or sets the palette of brushes used as the fill color for data point markers.
-	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
-	 */
-	markerBrushes?: any;
-
-	/**
-	 * Gets or sets the palette of brushes used for coloring outline of data point markers.
-	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
-	 */
-	markerOutlines?: any;
-
-	/**
-	 * Gets or sets the thickness of the trend lines in this chart.
-	 */
-	trendLineThickness?: number;
-
-	/**
-	 * Gets or sets whether the direction of the X-axis is inverted, placing the first data items on the right side instead of left side
+	 * Gets or sets whether to invert the direction of the X-axis by placing the first data items on the right side of the chart.
 	 */
 	xAxisInverted?: boolean;
 
 	/**
-	 * Gets or sets whether the direction of the Y-axis is inverted, placing minimum numeric value at the top of the axis instead of bottom
+	 * Gets or sets whether to invert the direction of the Y-axis by placing the minimum numeric value at the top of the chart.
 	 */
 	yAxisInverted?: boolean;
 
 	/**
-	 * Gets or sets the palette used for coloring negative items of Waterfall chart type.
-	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
-	 */
-	negativeBrushes?: any;
-
-	/**
-	 * Gets or sets the horizontal alignment of the X-axis title.
+	 * Gets or sets Horizontal alignment of the X-axis title.
 	 *
 	 * Valid values:
 	 * "left" Align the item to the left
@@ -10949,7 +11492,7 @@ interface IgCategoryChart {
 	xAxisTitleAlignment?: string;
 
 	/**
-	 * Gets or sets the vertical alignment of the Y-axis title.
+	 * Gets or sets Vertical alignment of the Y-axis title.
 	 *
 	 * Valid values:
 	 * "top" Align the item to the top
@@ -10960,7 +11503,7 @@ interface IgCategoryChart {
 	yAxisTitleAlignment?: string;
 
 	/**
-	 * Gets or sets the horizontal alignment of X-axis labels.
+	 * Gets or sets Horizontal alignment of X-axis labels.
 	 *
 	 * Valid values:
 	 * "left" Align the item to the left
@@ -10971,7 +11514,7 @@ interface IgCategoryChart {
 	xAxisLabelHorizontalAlignment?: string;
 
 	/**
-	 * Gets or sets the horizontal alignment of Y-axis labels.
+	 * Gets or sets Horizontal alignment of Y-axis labels.
 	 *
 	 * Valid values:
 	 * "left" Align the item to the left
@@ -10982,7 +11525,7 @@ interface IgCategoryChart {
 	yAxisLabelHorizontalAlignment?: string;
 
 	/**
-	 * Gets or sets the vertical alignment of X-axis labels.
+	 * Gets or sets Vertical alignment of X-axis labels.
 	 *
 	 * Valid values:
 	 * "top" Align the item to the top
@@ -10993,7 +11536,7 @@ interface IgCategoryChart {
 	xAxisLabelVerticalAlignment?: string;
 
 	/**
-	 * Gets or sets the vertical alignment of Y-axis labels.
+	 * Gets or sets Vertical alignment of Y-axis labels.
 	 *
 	 * Valid values:
 	 * "top" Align the item to the top
@@ -11004,7 +11547,7 @@ interface IgCategoryChart {
 	yAxisLabelVerticalAlignment?: string;
 
 	/**
-	 * Gets or sets the visibility of X-axis labels.
+	 * Gets or sets Visibility of X-axis labels.
 	 *
 	 * Valid values:
 	 * "visible" Display the element.
@@ -11013,7 +11556,7 @@ interface IgCategoryChart {
 	xAxisLabelVisibility?: string;
 
 	/**
-	 * Gets or sets the visibility of Y-axis labels.
+	 * Gets or sets Visibility of Y-axis labels.
 	 *
 	 * Valid values:
 	 * "visible" Display the element.
@@ -11021,6 +11564,164 @@ interface IgCategoryChart {
 	 */
 	yAxisLabelVisibility?: string;
 
+	/**
+	 * The location of Y-axis labels, relative to the plot area.
+	 *
+	 * Valid values:
+	 * "outsideTop" Places the axis labels at the top, outside of the plotting area.
+	 * "outsideBottom" Places the axis labels at the bottom, outside of the plotting area
+	 * "outsideLeft" Places the axis labels to the left, outside of the plotting area.
+	 * "outsideRight" Places the axis labels to the right, outside of the plotting area.
+	 * "insideTop" Places the axis labels inside the plotting area above the axis line.
+	 * "insideBottom" Places the axis labels inside the plotting area below the axis line.
+	 * "insideLeft" Places the axis labels inside the plotting area and to the left of the axis line.
+	 * "insideRight" Places the axis labels inside the plotting area and to the right of the axis line.
+	 */
+	yAxisLabelLocation?: string;
+
+	/**
+	 * Gets or sets the duration used for animating series plots when the chart is loading into view
+	 */
+	transitionInDuration?: number;
+
+	/**
+	 * Gets or sets the easing function used for animating series plots when the chart is loading into view
+	 * This can be set to one of the known values "linear" or "cubic," or it can be set to an easing function which takes a single numeric parameter and returns a number.
+	 */
+	transitionInEasingFunction?: any;
+
+	/**
+	 * Gets or sets the type of chart series to generate from the data.
+	 *
+	 * Valid values:
+	 * "line" Specifies category line series with markers at each data point
+	 * "area" Specifies category area series
+	 * "column" Specifies category column chart with vertical rectangles at each data point
+	 * "point" Specifies category point chart with markers at each data point
+	 * "stepLine" Specifies category step line chart
+	 * "stepArea" Specifies category step area chart
+	 * "spline" Specifies category spline line series with markers at each data point
+	 * "splineArea" Specifies category spline area series
+	 * "waterfall" Specifies category waterfall chart
+	 * "auto" Specifies automatic selection of chart type based on suggestions from Data Adapter
+	 */
+	chartType?: string;
+
+	/**
+	 * Gets or sets the behavior for markers in each series which are placed too close together for the current view, resulting in a collision.
+	 *
+	 * Valid values:
+	 * "none" Collision avoidance is disabled.
+	 * "omit" Items colliding with other items will be hidden from view.
+	 */
+	markerCollisionAvoidance?: string;
+
+	/**
+	 * Gets or sets whether animation of series plots is enabled when the chart is loading into view
+	 */
+	isTransitionInEnabled?: boolean;
+
+	/**
+	 * Gets or sets the method that determines how to animate series plots when the chart is loading into view
+	 *
+	 * Valid values:
+	 * "auto" Series transitions in an automatically chosen based on type of series and its orientation
+	 * "fromZero" Series transitions in from the reference value of the value axis.
+	 * "sweepFromLeft" Series sweeps in from the left
+	 * "sweepFromRight" Series sweeps in from the right
+	 * "sweepFromTop" Series sweeps in from the top.
+	 * "sweepFromBottom" Series sweeps in from the bottom.
+	 * "sweepFromCenter" Series sweeps in from the center.
+	 * "accordionFromLeft" Series accordions in from the left.
+	 * "accordionFromRight" Series accordions in from the right.
+	 * "accordionFromTop" Series accordions in from the top.
+	 * "accordionFromBottom" Series accordions in from the bottom.
+	 * "expand" Series expands from the value midpoints.
+	 * "sweepFromCategoryAxisMinimum" Series sweeps in from the category axis minimum.
+	 * "sweepFromCategoryAxisMaximum" Series sweeps in from the category axis maximum.
+	 * "sweepFromValueAxisMinimum" Series sweeps in from the value axis minimum.
+	 * "sweepFromValueAxisMaximum" Series sweeps in from the value axis maximum.
+	 * "accordionFromCategoryAxisMinimum" Series accordions in from the category axis minimum.
+	 * "accordionFromCategoryAxisMaximum" Series accordions in from the category axis maximum.
+	 * "accordionFromValueAxisMinimum" Series accordions in from the value axis minimum.
+	 * "accordionFromValueAxisMaximum" Series accordions in from the value axis maximum.
+	 */
+	transitionInMode?: string;
+
+	/**
+	 * Gets or sets the arrival speed used for animating series plots when the chart is loading into view
+	 *
+	 * Valid values:
+	 * "auto" A speed type is automatically selected.
+	 * "normal" All speeds are normal, data points will arrive at the same time.
+	 * "valueScaled" Data points will arrive later if their value is further from the start point.
+	 * "indexScaled" Data points will arrive later if their index is further from the axis origin.
+	 * "random" Data points will arrive at random times.
+	 */
+	transitionInSpeedType?: string;
+
+	/**
+	 * Gets or sets the frequency of displayed labels along the X-axis.
+	 * Gets or sets the set value is a factor that determines which labels will be hidden. For example, an interval of 2 will display every other label.
+	 */
+	xAxisInterval?: number;
+
+	/**
+	 * Gets or sets the frequency of displayed minor lines along the X-axis.
+	 * Gets or sets the set value is a factor that determines how the minor lines will be displayed.
+	 */
+	xAxisMinorInterval?: number;
+
+	/**
+	 * Gets or sets the amount of space between adjacent categories for the X-axis.
+	 * The gap is silently clamped to the range [0, 1] when used.
+	 */
+	xAxisGap?: number;
+
+	/**
+	 * Gets or sets the amount of overlap between adjacent categories for the X-axis.
+	 * Gets or sets the overlap is silently clamped to the range [-1, 1] when used.
+	 */
+	xAxisOverlap?: number;
+
+	/**
+	 * Gets or sets the distance between each label and grid line along the Y-axis.
+	 */
+	yAxisInterval?: number;
+
+	/**
+	 * Gets or sets whether the Y-axis should use a logarithmic scale instead of a linear one.
+	 * Since log(-1) is imaginary and log(0) is undefined, it is recommended to enable this property only when the Y-axis minimum is greater than zero.
+	 */
+	yAxisIsLogarithmic?: boolean;
+
+	/**
+	 * Gets or sets the base value to use in the log function when mapping the position of data items along the Y-axis.
+	 * This property is effective only when YAxisIsLogarithmic is true.
+	 */
+	yAxisLogarithmBase?: number;
+
+	/**
+	 * Gets or sets the data value corresponding to the minimum value of the Y-axis.
+	 */
+	yAxisMinimumValue?: number;
+
+	/**
+	 * Gets or sets the data value corresponding to the maximum value of the Y-axis.
+	 */
+	yAxisMaximumValue?: number;
+
+	/**
+	 * Gets or sets the frequency of displayed minor lines along the Y-axis.
+	 */
+	yAxisMinorInterval?: number;
+
+	/**
+	 * Gets or sets the palette used for coloring negative items of Waterfall chart type.
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 */
+	negativeBrushes?: any;
+
 	/**
 	 * Brushes to use for drawing negative elements, when using a chart type with contextual coloring, such as Waterfall.
 	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
@@ -11028,9 +11729,14 @@ interface IgCategoryChart {
 	negativeOutlines?: any;
 
 	/**
-	 * Gets or sets a value indicating whether grid and tick lines are aligned to device pixels.
+	 * Gets or sets whether the series animations should be allowed when a range change has been detected on an axis.
 	 */
-	alignsGridLinesToPixels?: boolean;
+	animateSeriesWhenAxisRangeChanges?: boolean;
+
+	/**
+	 * Gets or sets whether the large numbers on the Y-axis labels are abbreviated.
+	 */
+	yAxisAbbreviateLargeNumbers?: boolean;
 
 	/**
 	 * The width of the chart.
@@ -11075,20 +11781,45 @@ interface IgCategoryChart {
 	responseDataKey?: string;
 
 	/**
-	 * Event raised when a property value is changed.
+	 * Event raised when a property value is changed on this chart
 	 */
 	propertyChanged?: PropertyChangedEvent;
 
 	/**
-	 * Event raised when a series is initialized
+	 * Event raised when a series is initialized and added to this chart.
 	 */
 	seriesAdded?: SeriesAddedEvent;
 
 	/**
-	 * Event raised when a series is removed from the CategoryChart
+	 * Event raised when a series is removed from this chart.
 	 */
 	seriesRemoved?: SeriesRemovedEvent;
 
+	/**
+	 * Occurs when the pointer enters a Series.
+	 */
+	seriesPointerEnter?: SeriesPointerEnterEvent;
+
+	/**
+	 * Occurs when the pointer leaves a Series.
+	 */
+	seriesPointerLeave?: SeriesPointerLeaveEvent;
+
+	/**
+	 * Occurs when the pointer moves over a Series.
+	 */
+	seriesPointerMove?: SeriesPointerMoveEvent;
+
+	/**
+	 * Occurs when the pointer is pressed down over a Series.
+	 */
+	seriesPointerDown?: SeriesPointerDownEvent;
+
+	/**
+	 * Occurs when the pointer is released over a Series.
+	 */
+	seriesPointerUp?: SeriesPointerUpEvent;
+
 	/**
 	 * Event which is raised before data binding.
 	 * Return false in order to cancel data binding.
@@ -11266,52 +11997,28 @@ interface JQuery {
 	igCategoryChart(methodName: "flush"): void;
 
 	/**
-	 * Gets  the data value corresponding to the minimum value of the Y-axis.
+	 * Gets  the id of a template element to use for tooltips, or markup representing the tooltip template.
 	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "yAxisMinimumValue"): number;
+	igCategoryChart(optionLiteral: 'option', optionName: "tooltipTemplate"): any;
 
 	/**
-	 * Sets the data value corresponding to the minimum value of the Y-axis.
+	 * Sets the id of a template element to use for tooltips, or markup representing the tooltip template.
 	 *
 	 * @optionValue New value to be set.
 	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "yAxisMinimumValue", optionValue: number): void;
+	igCategoryChart(optionLiteral: 'option', optionName: "tooltipTemplate", optionValue: any): void;
 
 	/**
-	 * Gets  the data value corresponding to the maximum value of the Y-axis.
+	 * Gets  the names of tooltip templates
 	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "yAxisMaximumValue"): number;
+	igCategoryChart(optionLiteral: 'option', optionName: "tooltipTemplates"): any;
 
 	/**
-	 * Sets the data value corresponding to the maximum value of the Y-axis.
+	 * Sets the names of tooltip templates
 	 *
 	 * @optionValue New value to be set.
 	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "yAxisMaximumValue", optionValue: number): void;
-
-	/**
-	 * Gets  the distance between the X-axis and the bottom of the chart.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "xAxisExtent"): number;
-
-	/**
-	 * Sets the distance between the X-axis and the bottom of the chart.
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "xAxisExtent", optionValue: number): void;
-
-	/**
-	 * Gets  the distance between the Y-axis and the left edge of the chart.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "yAxisExtent"): number;
-
-	/**
-	 * Sets the distance between the Y-axis and the left edge of the chart.
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "yAxisExtent", optionValue: number): void;
+	igCategoryChart(optionLiteral: 'option', optionName: "tooltipTemplates", optionValue: any): void;
 
 	/**
 	 * Gets  the left margin of chart title
@@ -11361,178 +12068,6 @@ interface JQuery {
 	 */
 	igCategoryChart(optionLiteral: 'option', optionName: "titleBottomMargin", optionValue: number): void;
 
-	/**
-	 * Gets  the duration used for animating series plots when the chart is loading into view
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "transitionInDuration"): number;
-
-	/**
-	 * Sets the duration used for animating series plots when the chart is loading into view
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "transitionInDuration", optionValue: number): void;
-
-	/**
-	 * Gets  the duration used for animating series plots when the data is changing
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "transitionDuration"): number;
-
-	/**
-	 * Sets the duration used for animating series plots when the data is changing
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "transitionDuration", optionValue: number): void;
-
-	/**
-	 * Gets  the easing function used for animating series plots when the chart is loading into view
-	 * This can be set to one of the known values "linear" or "cubic," or it can be set to an easing function which takes a single numeric parameter and returns a number.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "transitionInEasingFunction"): any;
-
-	/**
-	 * Sets the easing function used for animating series plots when the chart is loading into view
-	 * This can be set to one of the known values "linear" or "cubic," or it can be set to an easing function which takes a single numeric parameter and returns a number.
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "transitionInEasingFunction", optionValue: any): void;
-
-	/**
-	 * Gets  the easing function used for animating series plots when the data is changing.
-	 * This can be set to one of the known values "linear" or "cubic," or it can be set to an easing function which takes a single numeric parameter and returns a number.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "transitionEasingFunction"): any;
-
-	/**
-	 * Sets the easing function used for animating series plots when the data is changing.
-	 * This can be set to one of the known values "linear" or "cubic," or it can be set to an easing function which takes a single numeric parameter and returns a number.
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "transitionEasingFunction", optionValue: any): void;
-
-	/**
-	 * Gets  the left margin of labels on the X-axis
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "xAxisLabelLeftMargin"): number;
-
-	/**
-	 * Sets the left margin of labels on the X-axis
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "xAxisLabelLeftMargin", optionValue: number): void;
-
-	/**
-	 * Gets  the top margin of labels on the X-axis
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "xAxisLabelTopMargin"): number;
-
-	/**
-	 * Sets the top margin of labels on the X-axis
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "xAxisLabelTopMargin", optionValue: number): void;
-
-	/**
-	 * Gets  the right margin of labels on the X-axis
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "xAxisLabelRightMargin"): number;
-
-	/**
-	 * Sets the right margin of labels on the X-axis
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "xAxisLabelRightMargin", optionValue: number): void;
-
-	/**
-	 * Gets  the bottom margin of labels on the X-axis
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "xAxisLabelBottomMargin"): number;
-
-	/**
-	 * Sets the bottom margin of labels on the X-axis
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "xAxisLabelBottomMargin", optionValue: number): void;
-
-	/**
-	 * Gets  the left margin of labels on the Y-axis
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "yAxisLabelLeftMargin"): number;
-
-	/**
-	 * Sets the left margin of labels on the Y-axis
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "yAxisLabelLeftMargin", optionValue: number): void;
-
-	/**
-	 * Gets  the top margin of labels on the Y-axis
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "yAxisLabelTopMargin"): number;
-
-	/**
-	 * Sets the top margin of labels on the Y-axis
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "yAxisLabelTopMargin", optionValue: number): void;
-
-	/**
-	 * Gets  the right margin of labels on the Y-axis
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "yAxisLabelRightMargin"): number;
-
-	/**
-	 * Sets the right margin of labels on the Y-axis
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "yAxisLabelRightMargin", optionValue: number): void;
-
-	/**
-	 * Gets  the bottom margin of labels on the Y-axis
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "yAxisLabelBottomMargin"): number;
-
-	/**
-	 * Sets the bottom margin of labels on the Y-axis
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "yAxisLabelBottomMargin", optionValue: number): void;
-
-	/**
-	 * Gets  color of labels on the X-axis
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "xAxisLabelTextColor"): string;
-
-	/**
-	 * Sets color of labels on the X-axis
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "xAxisLabelTextColor", optionValue: string): void;
-
-	/**
-	 * Gets  color of labels on the Y-axis
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "yAxisLabelTextColor"): string;
-
-	/**
-	 * Sets color of labels on the Y-axis
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "yAxisLabelTextColor", optionValue: string): void;
-
 	/**
 	 * Gets  the left margin of chart subtitle
 	 */
@@ -11653,6 +12188,568 @@ interface JQuery {
 	 */
 	igCategoryChart(optionLiteral: 'option', optionName: "bottomMargin", optionValue: number): void;
 
+	/**
+	 * Gets  the duration used for animating series plots when the data is changing
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "transitionDuration"): number;
+
+	/**
+	 * Sets the duration used for animating series plots when the data is changing
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "transitionDuration", optionValue: number): void;
+
+	/**
+	 * Gets  the easing function used for animating series plots when the data is changing.
+	 * This can be set to one of the known values "linear" or "cubic," or it can be set to an easing function which takes a single numeric parameter and returns a number.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "transitionEasingFunction"): any;
+
+	/**
+	 * Sets the easing function used for animating series plots when the data is changing.
+	 * This can be set to one of the known values "linear" or "cubic," or it can be set to an easing function which takes a single numeric parameter and returns a number.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "transitionEasingFunction", optionValue: any): void;
+
+	/**
+	 * Gets  a function for creating wrapped tooltip
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "createWrappedTooltip"): any;
+
+	/**
+	 * Sets a function for creating wrapped tooltip
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "createWrappedTooltip", optionValue: any): void;
+
+	/**
+	 * Gets  the widget of this control
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "widget"): any;
+
+	/**
+	 * Sets the widget of this control
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "widget", optionValue: any): void;
+
+	/**
+	 * Gets  CSS font property for the chart subtitle
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "subtitleTextStyle"): string;
+
+	/**
+	 * Sets CSS font property for the chart subtitle
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "subtitleTextStyle", optionValue: string): void;
+
+	/**
+	 * Gets  CSS font property for the chart title
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "titleTextStyle"): string;
+
+	/**
+	 * Sets CSS font property for the chart title
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "titleTextStyle", optionValue: string): void;
+
+	/**
+	 * Gets  a collection of data items used to generate the chart.
+	 * The ItemsSource of this chart can be a list of objects containing one or more numeric properties.
+	 * Additionally, if the objects in the list implement the IEnumerable interface,
+	 * the Chart will attempt to delve into the sub-collections when reading through the data source.
+	 * Databinding can be further configured by attributing the data item classes
+	 * with the DataSeriesMemberIntentAttribute.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "itemsSource"): any;
+
+	/**
+	 * Sets a collection of data items used to generate the chart.
+	 * The ItemsSource of this chart can be a list of objects containing one or more numeric properties.
+	 * Additionally, if the objects in the list implement the IEnumerable interface,
+	 * the Chart will attempt to delve into the sub-collections when reading through the data source.
+	 * Databinding can be further configured by attributing the data item classes
+	 * with the DataSeriesMemberIntentAttribute.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "itemsSource", optionValue: any): void;
+
+	/**
+	 * Gets  a set of property paths that should be included for consideration by the category chart, leaving the remainder excluded. If null, all properties will be considered.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "includedProperties"): any;
+
+	/**
+	 * Sets a set of property paths that should be included for consideration by the category chart, leaving the remainder excluded. If null, all properties will be considered.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "includedProperties", optionValue: any): void;
+
+	/**
+	 * Gets  a set of property paths that should be excluded from consideration by the category chart.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "excludedProperties"): any;
+
+	/**
+	 * Sets a set of property paths that should be excluded from consideration by the category chart.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "excludedProperties", optionValue: any): void;
+
+	/**
+	 * Gets  the palette of brushes to use for coloring the chart series.
+	 * The value provided should be an array of CSS color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "brushes"): any;
+
+	/**
+	 * Sets the palette of brushes to use for coloring the chart series.
+	 * The value provided should be an array of CSS color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "brushes", optionValue: any): void;
+
+	/**
+	 * Gets  the palette of brushes to use for outlines on the chart series.
+	 * The value provided should be an array of CSS color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "outlines"): any;
+
+	/**
+	 * Sets the palette of brushes to use for outlines on the chart series.
+	 * The value provided should be an array of CSS color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "outlines", optionValue: any): void;
+
+	/**
+	 * Gets  the legend to connect this chart to.
+	 * When the legend property is set, the chart will use it to display information about its series.  Legends can be shared by multiple chart controls.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "legend"): any;
+
+	/**
+	 * Sets the legend to connect this chart to.
+	 * When the legend property is set, the chart will use it to display information about its series.  Legends can be shared by multiple chart controls.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "legend", optionValue: any): void;
+
+	/**
+	 * Gets  whether the chart can be horizontally zoomed through user interactions.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "isHorizontalZoomEnabled"): boolean;
+
+	/**
+	 * Sets whether the chart can be horizontally zoomed through user interactions.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "isHorizontalZoomEnabled", optionValue: boolean): void;
+
+	/**
+	 * Gets  whether the chart can be vertically zoomed through user interactions.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "isVerticalZoomEnabled"): boolean;
+
+	/**
+	 * Sets whether the chart can be vertically zoomed through user interactions.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "isVerticalZoomEnabled", optionValue: boolean): void;
+
+	/**
+	 * Gets  the rectangle representing the current scroll and zoom state of the chart.
+	 * WindowRect is expressed as a Rectangle with coordinates and sizes between 0 and 1.
+	 * The provided object should have numeric properties called left, top, width and height.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "windowRect"): any;
+
+	/**
+	 * Sets the rectangle representing the current scroll and zoom state of the chart.
+	 * WindowRect is expressed as a Rectangle with coordinates and sizes between 0 and 1.
+	 * The provided object should have numeric properties called left, top, width and height.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "windowRect", optionValue: any): void;
+
+	/**
+	 * Gets  text to display above the plot area.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "title"): string;
+
+	/**
+	 * Sets text to display above the plot area.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "title", optionValue: string): void;
+
+	/**
+	 * Gets  text to display below the Title, above the plot area.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "subtitle"): string;
+
+	/**
+	 * Sets text to display below the Title, above the plot area.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "subtitle", optionValue: string): void;
+
+	/**
+	 * Gets  horizontal alignment which determines the title position, relative to the left and right edges of the control.
+	 */
+
+	igCategoryChart(optionLiteral: 'option', optionName: "titleAlignment"): string;
+
+	/**
+	 * Sets horizontal alignment which determines the title position, relative to the left and right edges of the control.
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igCategoryChart(optionLiteral: 'option', optionName: "titleAlignment", optionValue: string): void;
+
+	/**
+	 * Gets  horizontal alignment which determines the subtitle position, relative to the left and right edges of the control.
+	 */
+
+	igCategoryChart(optionLiteral: 'option', optionName: "subtitleAlignment"): string;
+
+	/**
+	 * Sets horizontal alignment which determines the subtitle position, relative to the left and right edges of the control.
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igCategoryChart(optionLiteral: 'option', optionName: "subtitleAlignment", optionValue: string): void;
+
+	/**
+	 * Gets  the behavior that determines how unknown values will be plotted on the chart.Null and Double.NaN are two examples of unknown values.
+	 *
+	 */
+
+	igCategoryChart(optionLiteral: 'option', optionName: "unknownValuePlotting"): string;
+
+	/**
+	 * Sets the behavior that determines how unknown values will be plotted on the chart.Null and Double.NaN are two examples of unknown values.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igCategoryChart(optionLiteral: 'option', optionName: "unknownValuePlotting", optionValue: string): void;
+
+	/**
+	 * Gets  the rendering resolution for all series in this chart.
+	 * Where n = Resolution, for every n horizontal pixels, combine all items into a single datapoint.  When Resolution = 0, all datapoints will be rendered as graphical objects.  Charts with a higher resolution will have faster performance.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "resolution"): number;
+
+	/**
+	 * Sets the rendering resolution for all series in this chart.
+	 * Where n = Resolution, for every n horizontal pixels, combine all items into a single datapoint.  When Resolution = 0, all datapoints will be rendered as graphical objects.  Charts with a higher resolution will have faster performance.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "resolution", optionValue: number): void;
+
+	/**
+	 * Gets  the thickness for all series in this chart. Depending on the ChartType, this can be the main brush used, or just the outline.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "thickness"): number;
+
+	/**
+	 * Sets the thickness for all series in this chart. Depending on the ChartType, this can be the main brush used, or just the outline.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "thickness", optionValue: number): void;
+
+	/**
+	 * Gets  the marker shapes used for indicating location of data points in this chart.
+	 * This property applies only to these chart types: point, line, spline, bubble, and polygon
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "markerTypes"): any;
+
+	/**
+	 * Sets the marker shapes used for indicating location of data points in this chart.
+	 * This property applies only to these chart types: point, line, spline, bubble, and polygon
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "markerTypes", optionValue: any): void;
+
+	/**
+	 * Gets  the palette of brushes used for rendering fill area of data point markers.
+	 * This property applies only to these chart types: point, line, spline, bubble, and polygon
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "markerBrushes"): any;
+
+	/**
+	 * Sets the palette of brushes used for rendering fill area of data point markers.
+	 * This property applies only to these chart types: point, line, spline, bubble, and polygon
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "markerBrushes", optionValue: any): void;
+
+	/**
+	 * Gets  the palette of brushes used for rendering outlines of data point markers.
+	 * This property applies only to these chart types: point, line, spline, bubble, and polygon
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "markerOutlines"): any;
+
+	/**
+	 * Sets the palette of brushes used for rendering outlines of data point markers.
+	 * This property applies only to these chart types: point, line, spline, bubble, and polygon
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "markerOutlines", optionValue: any): void;
+
+	/**
+	 * Gets  the maximum number of markers displyed in the plot area of the chart.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "markerMaxCount"): number;
+
+	/**
+	 * Sets the maximum number of markers displyed in the plot area of the chart.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "markerMaxCount", optionValue: number): void;
+
+	/**
+	 * Gets  the palette of brushes to used for coloring trend lines in this chart.
+	 * The value provided should be an array of CSS color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "trendLineBrushes"): any;
+
+	/**
+	 * Sets the palette of brushes to used for coloring trend lines in this chart.
+	 * The value provided should be an array of CSS color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "trendLineBrushes", optionValue: any): void;
+
+	/**
+	 * Gets  the formula used for calculating trend lines in this chart.This property applies only to these chart types: point, line, spline, and bubble
+	 *
+	 */
+
+	igCategoryChart(optionLiteral: 'option', optionName: "trendLineType"): string;
+
+	/**
+	 * Sets the formula used for calculating trend lines in this chart.This property applies only to these chart types: point, line, spline, and bubble
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igCategoryChart(optionLiteral: 'option', optionName: "trendLineType", optionValue: string): void;
+
+	/**
+	 * Gets  the thickness of the trend lines in this chart.
+	 * This property applies only to these chart types: point, line, spline, and bubble
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "trendLineThickness"): number;
+
+	/**
+	 * Sets the thickness of the trend lines in this chart.
+	 * This property applies only to these chart types: point, line, spline, and bubble
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "trendLineThickness", optionValue: number): void;
+
+	/**
+	 * Gets  a value indicating whether grid and tick lines are aligned to device pixels.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "alignsGridLinesToPixels"): boolean;
+
+	/**
+	 * Sets a value indicating whether grid and tick lines are aligned to device pixels.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "alignsGridLinesToPixels", optionValue: boolean): void;
+	igCategoryChart(optionLiteral: 'option', optionName: "trendLinePeriod"): number;
+	igCategoryChart(optionLiteral: 'option', optionName: "trendLinePeriod", optionValue: number): void;
+
+	/**
+	 * Gets  function which takes an context object and returns a formatted label for the X-axis.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "xAxisFormatLabel"): any;
+
+	/**
+	 * Sets function which takes an context object and returns a formatted label for the X-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "xAxisFormatLabel", optionValue: any): void;
+
+	/**
+	 * Gets  function which takes a context object and returns a formatted label for the Y-axis.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "yAxisFormatLabel"): any;
+
+	/**
+	 * Sets function which takes a context object and returns a formatted label for the Y-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "yAxisFormatLabel", optionValue: any): void;
+
+	/**
+	 * Gets  the left margin of labels on the X-axis
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "xAxisLabelLeftMargin"): number;
+
+	/**
+	 * Sets the left margin of labels on the X-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "xAxisLabelLeftMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the top margin of labels on the X-axis
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "xAxisLabelTopMargin"): number;
+
+	/**
+	 * Sets the top margin of labels on the X-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "xAxisLabelTopMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the right margin of labels on the X-axis
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "xAxisLabelRightMargin"): number;
+
+	/**
+	 * Sets the right margin of labels on the X-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "xAxisLabelRightMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the bottom margin of labels on the X-axis
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "xAxisLabelBottomMargin"): number;
+
+	/**
+	 * Sets the bottom margin of labels on the X-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "xAxisLabelBottomMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the left margin of labels on the Y-axis
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "yAxisLabelLeftMargin"): number;
+
+	/**
+	 * Sets the left margin of labels on the Y-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "yAxisLabelLeftMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the top margin of labels on the Y-axis
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "yAxisLabelTopMargin"): number;
+
+	/**
+	 * Sets the top margin of labels on the Y-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "yAxisLabelTopMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the right margin of labels on the Y-axis
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "yAxisLabelRightMargin"): number;
+
+	/**
+	 * Sets the right margin of labels on the Y-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "yAxisLabelRightMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the bottom margin of labels on the Y-axis
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "yAxisLabelBottomMargin"): number;
+
+	/**
+	 * Sets the bottom margin of labels on the Y-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "yAxisLabelBottomMargin", optionValue: number): void;
+
+	/**
+	 * Gets  color of labels on the X-axis
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "xAxisLabelTextColor"): string;
+
+	/**
+	 * Sets color of labels on the X-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "xAxisLabelTextColor", optionValue: string): void;
+
+	/**
+	 * Gets  color of labels on the Y-axis
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "yAxisLabelTextColor"): string;
+
+	/**
+	 * Sets color of labels on the Y-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "yAxisLabelTextColor", optionValue: string): void;
+
 	/**
 	 * Gets  the margin around a title on the X-axis
 	 */
@@ -11796,72 +12893,6 @@ interface JQuery {
 	 * @optionValue New value to be set.
 	 */
 	igCategoryChart(optionLiteral: 'option', optionName: "yAxisTitleTextColor", optionValue: string): void;
-	igCategoryChart(optionLiteral: 'option', optionName: "createWrappedTooltip"): any;
-	igCategoryChart(optionLiteral: 'option', optionName: "createWrappedTooltip", optionValue: any): void;
-
-	/**
-	 * Gets  the id of a template element to use for tooltips, or markup representing the tooltip template.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "tooltipTemplate"): string;
-
-	/**
-	 * Sets the id of a template element to use for tooltips, or markup representing the tooltip template.
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "tooltipTemplate", optionValue: string): void;
-	igCategoryChart(optionLiteral: 'option', optionName: "tooltipTemplates"): any;
-	igCategoryChart(optionLiteral: 'option', optionName: "tooltipTemplates", optionValue: any): void;
-
-	/**
-	 * Gets  function which takes an context object and returns a formatted label for the X-axis.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "xAxisFormatLabel"): any;
-
-	/**
-	 * Sets function which takes an context object and returns a formatted label for the X-axis.
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "xAxisFormatLabel", optionValue: any): void;
-
-	/**
-	 * Gets  function which takes a context object and returns a formatted label for the Y-axis.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "yAxisFormatLabel"): any;
-
-	/**
-	 * Sets function which takes a context object and returns a formatted label for the Y-axis.
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "yAxisFormatLabel", optionValue: any): void;
-
-	/**
-	 * Gets  CSS font property for title on X-axis
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "xAxisTitleTextStyle"): string;
-
-	/**
-	 * Sets CSS font property for title on X-axis
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "xAxisTitleTextStyle", optionValue: string): void;
-
-	/**
-	 * Gets  CSS font property for title on Y-axis
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "yAxisTitleTextStyle"): string;
-
-	/**
-	 * Sets CSS font property for title on Y-axis
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "yAxisTitleTextStyle", optionValue: string): void;
-	igCategoryChart(optionLiteral: 'option', optionName: "widget"): any;
-	igCategoryChart(optionLiteral: 'option', optionName: "widget", optionValue: any): void;
 
 	/**
 	 * Gets  CSS font property for labels on X-axis
@@ -11888,390 +12919,28 @@ interface JQuery {
 	igCategoryChart(optionLiteral: 'option', optionName: "yAxisLabelTextStyle", optionValue: string): void;
 
 	/**
-	 * Gets  CSS font property for the chart subtitle
+	 * Gets  CSS font property for title on X-axis
 	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "subtitleTextStyle"): string;
+	igCategoryChart(optionLiteral: 'option', optionName: "xAxisTitleTextStyle"): string;
 
 	/**
-	 * Sets CSS font property for the chart subtitle
+	 * Sets CSS font property for title on X-axis
 	 *
 	 * @optionValue New value to be set.
 	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "subtitleTextStyle", optionValue: string): void;
+	igCategoryChart(optionLiteral: 'option', optionName: "xAxisTitleTextStyle", optionValue: string): void;
 
 	/**
-	 * Gets  CSS font property for the chart title
+	 * Gets  CSS font property for title on Y-axis
 	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "titleTextStyle"): string;
+	igCategoryChart(optionLiteral: 'option', optionName: "yAxisTitleTextStyle"): string;
 
 	/**
-	 * Sets CSS font property for the chart title
+	 * Sets CSS font property for title on Y-axis
 	 *
 	 * @optionValue New value to be set.
 	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "titleTextStyle", optionValue: string): void;
-
-	/**
-	 * Gets  a collection of data items used to generate the chart.
-	 * Value of this property can be a list of objects containing one or more numeric properties.  Additionally, if the objects in the list implement the IEnumerable interface, the Category Chart will attempt to delve into the sub-collections when reading through the data source.  Databinding can be further configured by attributing the data item classes with the DataSeriesMemberIntentAttribute.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "itemsSource"): any;
-
-	/**
-	 * Sets a collection of data items used to generate the chart.
-	 * Value of this property can be a list of objects containing one or more numeric properties.  Additionally, if the objects in the list implement the IEnumerable interface, the Category Chart will attempt to delve into the sub-collections when reading through the data source.  Databinding can be further configured by attributing the data item classes with the DataSeriesMemberIntentAttribute.
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "itemsSource", optionValue: any): void;
-
-	/**
-	 * Gets  a set of property paths that should be included for consideration by the category chart, leaving the remaineder excluded. If null, all properties will be considered.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "includedProperties"): any;
-
-	/**
-	 * Sets a set of property paths that should be included for consideration by the category chart, leaving the remaineder excluded. If null, all properties will be considered.
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "includedProperties", optionValue: any): void;
-
-	/**
-	 * Gets  a set of property paths that should be excluded from consideration by the category chart.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "excludedProperties"): any;
-
-	/**
-	 * Sets a set of property paths that should be excluded from consideration by the category chart.
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "excludedProperties", optionValue: any): void;
-
-	/**
-	 * Gets  the type of chart series to generate from the data.
-	 */
-
-	igCategoryChart(optionLiteral: 'option', optionName: "chartType"): string;
-
-	/**
-	 * Sets the type of chart series to generate from the data.
-	 *
-	 * @optionValue New value to be set.
-	 */
-
-	igCategoryChart(optionLiteral: 'option', optionName: "chartType", optionValue: string): void;
-
-	/**
-	 * Gets  the palette of brushes to use for coloring the chart series. The value provided should be an array of CSS color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection
-	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "brushes"): any;
-
-	/**
-	 * Sets the palette of brushes to use for coloring the chart series. The value provided should be an array of CSS color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection
-	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "brushes", optionValue: any): void;
-
-	/**
-	 * Gets  the palette of brushes to use for outlines on the chart series. The value provided should be an array of CSS color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection
-	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "outlines"): any;
-
-	/**
-	 * Sets the palette of brushes to use for outlines on the chart series. The value provided should be an array of CSS color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection
-	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "outlines", optionValue: any): void;
-
-	/**
-	 * Sets the legend to connect this chart to.
-	 * When the legend property is set, the chart will use it to display information about its series.  Legends can be shared by multiple chart controls.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "legend"): any;
-
-	/**
-	 * Sets the legend to connect this chart to.
-	 * When the legend property is set, the chart will use it to display information about its series.  Legends can be shared by multiple chart controls.
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "legend", optionValue: any): void;
-
-	/**
-	 * Gets  whether the chart can be horizontally zoomed through user interaction.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "isHorizontalZoomEnabled"): boolean;
-
-	/**
-	 * Sets whether the chart can be horizontally zoomed through user interaction.
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "isHorizontalZoomEnabled", optionValue: boolean): void;
-
-	/**
-	 * Gets  whether the chart can be vertically zoomed through user interaction.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "isVerticalZoomEnabled"): boolean;
-
-	/**
-	 * Sets whether the chart can be vertically zoomed through user interaction.
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "isVerticalZoomEnabled", optionValue: boolean): void;
-
-	/**
-	 * Gets  the rectangle representing the current scroll and zoom state of the chart.
-	 * WindowRect is expressed as a Rectangle with coordinates and sizes between 0 and 1.
-	 * The provided object should have numeric properties called left, top, width and height.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "windowRect"): any;
-
-	/**
-	 * Sets the rectangle representing the current scroll and zoom state of the chart.
-	 * WindowRect is expressed as a Rectangle with coordinates and sizes between 0 and 1.
-	 * The provided object should have numeric properties called left, top, width and height.
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "windowRect", optionValue: any): void;
-
-	/**
-	 * Gets  text to display above the plot area.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "title"): string;
-
-	/**
-	 * Sets text to display above the plot area.
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "title", optionValue: string): void;
-
-	/**
-	 * Gets  text to display below the chart Title, above the plot area.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "subtitle"): string;
-
-	/**
-	 * Sets text to display below the chart Title, above the plot area.
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "subtitle", optionValue: string): void;
-
-	/**
-	 * Gets  horizontal alignment which determines the title position, relative to the left and right edges of the chart.
-	 */
-
-	igCategoryChart(optionLiteral: 'option', optionName: "titleAlignment"): string;
-
-	/**
-	 * Sets horizontal alignment which determines the title position, relative to the left and right edges of the chart.
-	 *
-	 * @optionValue New value to be set.
-	 */
-
-	igCategoryChart(optionLiteral: 'option', optionName: "titleAlignment", optionValue: string): void;
-
-	/**
-	 * Gets  horizontal alignment which determines the subtitle position, relative to the left and right edges of the chart.
-	 */
-
-	igCategoryChart(optionLiteral: 'option', optionName: "subtitleAlignment"): string;
-
-	/**
-	 * Sets horizontal alignment which determines the subtitle position, relative to the left and right edges of the chart.
-	 *
-	 * @optionValue New value to be set.
-	 */
-
-	igCategoryChart(optionLiteral: 'option', optionName: "subtitleAlignment", optionValue: string): void;
-
-	/**
-	 * Gets  the behavior that determines how unknown values will be plotted on the chart.Null and Double.NaN are two examples of unknown values.
-	 */
-
-	igCategoryChart(optionLiteral: 'option', optionName: "unknownValuePlotting"): string;
-
-	/**
-	 * Sets the behavior that determines how unknown values will be plotted on the chart.Null and Double.NaN are two examples of unknown values.
-	 *
-	 * @optionValue New value to be set.
-	 */
-
-	igCategoryChart(optionLiteral: 'option', optionName: "unknownValuePlotting", optionValue: string): void;
-
-	/**
-	 * Gets  the behavior for markers in each series which are placed too close together for the current view, resulting in a collision.
-	 */
-
-	igCategoryChart(optionLiteral: 'option', optionName: "markerCollisionAvoidance"): string;
-
-	/**
-	 * Sets the behavior for markers in each series which are placed too close together for the current view, resulting in a collision.
-	 *
-	 * @optionValue New value to be set.
-	 */
-
-	igCategoryChart(optionLiteral: 'option', optionName: "markerCollisionAvoidance", optionValue: string): void;
-
-	/**
-	 * Gets  whether animation of series plots is enabled when the chart is loading into view
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "isTransitionInEnabled"): boolean;
-
-	/**
-	 * Sets whether animation of series plots is enabled when the chart is loading into view
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "isTransitionInEnabled", optionValue: boolean): void;
-
-	/**
-	 * Gets  the method that determines how to animate series plots when the chart is loading into view
-	 */
-
-	igCategoryChart(optionLiteral: 'option', optionName: "transitionInMode"): string;
-
-	/**
-	 * Sets the method that determines how to animate series plots when the chart is loading into view
-	 *
-	 * @optionValue New value to be set.
-	 */
-
-	igCategoryChart(optionLiteral: 'option', optionName: "transitionInMode", optionValue: string): void;
-
-	/**
-	 * Gets  the arrival speed used for animating series plots when the chart is loading into view
-	 */
-
-	igCategoryChart(optionLiteral: 'option', optionName: "transitionInSpeedType"): string;
-
-	/**
-	 * Sets the arrival speed used for animating series plots when the chart is loading into view
-	 *
-	 * @optionValue New value to be set.
-	 */
-
-	igCategoryChart(optionLiteral: 'option', optionName: "transitionInSpeedType", optionValue: string): void;
-
-	/**
-	 * Gets  the frequency of displayed labels along the X-axis.
-	 * Gets  the set value is a factor that determines which labels will be hidden. For example, an interval of 2 will display every other label.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "xAxisInterval"): number;
-
-	/**
-	 * Sets the frequency of displayed labels along the X-axis.
-	 *  sets the set value is a factor that determines which labels will be hidden. For example, an interval of 2 will display every other label.
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "xAxisInterval", optionValue: number): void;
-
-	/**
-	 * Gets  the frequency of displayed minor lines along the X-axis.
-	 * Gets  the set value is a factor that determines how the minor lines will be displayed.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "xAxisMinorInterval"): number;
-
-	/**
-	 * Sets the frequency of displayed minor lines along the X-axis.
-	 *  sets the set value is a factor that determines how the minor lines will be displayed.
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "xAxisMinorInterval", optionValue: number): void;
-
-	/**
-	 * Gets  the amount of space between adjacent categories for the X-axis.
-	 * The gap is silently clamped to the range [0, 1] when used.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "xAxisGap"): number;
-
-	/**
-	 * Sets the amount of space between adjacent categories for the X-axis.
-	 * The gap is silently clamped to the range [0, 1] when used.
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "xAxisGap", optionValue: number): void;
-
-	/**
-	 * Gets  the amount of overlap between adjacent categories for the X-axis.
-	 * Gets  the overlap is silently clamped to the range [-1, 1] when used.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "xAxisOverlap"): number;
-
-	/**
-	 * Sets the amount of overlap between adjacent categories for the X-axis.
-	 *  sets the overlap is silently clamped to the range [-1, 1] when used.
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "xAxisOverlap", optionValue: number): void;
-
-	/**
-	 * Gets  the distance between each label and grid line along the Y-axis.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "yAxisInterval"): number;
-
-	/**
-	 * Sets the distance between each label and grid line along the Y-axis.
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "yAxisInterval", optionValue: number): void;
-
-	/**
-	 * Gets  whether the Y-axis should use a logarithmic scale instead of a linear one.
-	 * Since log(-1) is imaginary and log(0) is undefined, it is recommended to enable this property only when the Y-axis minimum is greater than zero.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "yAxisIsLogarithmic"): boolean;
-
-	/**
-	 * Sets whether the Y-axis should use a logarithmic scale instead of a linear one.
-	 * Since log(-1) is imaginary and log(0) is undefined, it is recommended to enable this property only when the Y-axis minimum is greater than zero.
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "yAxisIsLogarithmic", optionValue: boolean): void;
-
-	/**
-	 * Gets  the base value to use in the log function when mapping the position of data items along the Y-axis.
-	 * This property is effective only when YAxisIsLogarithmic is true.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "yAxisLogarithmBase"): number;
-
-	/**
-	 * Sets the base value to use in the log function when mapping the position of data items along the Y-axis.
-	 * This property is effective only when YAxisIsLogarithmic is true.
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "yAxisLogarithmBase", optionValue: number): void;
-
-	/**
-	 * Gets  the frequency of displayed minor lines along the Y-axis.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "yAxisMinorInterval"): number;
-
-	/**
-	 * Sets the frequency of displayed minor lines along the Y-axis.
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "yAxisMinorInterval", optionValue: number): void;
+	igCategoryChart(optionLiteral: 'option', optionName: "yAxisTitleTextStyle", optionValue: string): void;
 
 	/**
 	 * Gets  the format for labels along the X-axis.
@@ -12514,24 +13183,24 @@ interface JQuery {
 	igCategoryChart(optionLiteral: 'option', optionName: "yAxisTickStrokeThickness", optionValue: number): void;
 
 	/**
-	 * Text to display below the X-axis.
+	 * Gets  the Text to display below the X-axis.
 	 */
 	igCategoryChart(optionLiteral: 'option', optionName: "xAxisTitle"): string;
 
 	/**
-	 * Text to display below the X-axis.
+	 * Sets the Text to display below the X-axis.
 	 *
 	 * @optionValue New value to be set.
 	 */
 	igCategoryChart(optionLiteral: 'option', optionName: "xAxisTitle", optionValue: string): void;
 
 	/**
-	 * Text to display to the left of the Y-axis.
+	 * Gets  the Text to display to the left of the Y-axis.
 	 */
 	igCategoryChart(optionLiteral: 'option', optionName: "yAxisTitle"): string;
 
 	/**
-	 * Text to display to the left of the Y-axis.
+	 * Sets the Text to display to the left of the Y-axis.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -12585,6 +13254,30 @@ interface JQuery {
 	 */
 	igCategoryChart(optionLiteral: 'option', optionName: "yAxisLabelAngle", optionValue: number): void;
 
+	/**
+	 * Gets  the distance between the X-axis and the bottom of the chart.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "xAxisExtent"): number;
+
+	/**
+	 * Sets the distance between the X-axis and the bottom of the chart.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "xAxisExtent", optionValue: number): void;
+
+	/**
+	 * Gets  the distance between the Y-axis and the left edge of the chart.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "yAxisExtent"): number;
+
+	/**
+	 * Sets the distance between the Y-axis and the left edge of the chart.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "yAxisExtent", optionValue: number): void;
+
 	/**
 	 * Gets  the angle of rotation for the X-axis title.
 	 */
@@ -12610,137 +13303,381 @@ interface JQuery {
 	igCategoryChart(optionLiteral: 'option', optionName: "yAxisTitleAngle", optionValue: number): void;
 
 	/**
-	 * Gets  the rendering resolution for series in this chart.
-	 * Where n = Resolution, for every n horizontal pixels, combine all items into a single datapoint.  When Resolution = 0, all datapoints will be rendered as graphical objects.  Charts with a higher resolution will have faster performance.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "resolution"): number;
-
-	/**
-	 * Sets the rendering resolution for series in this chart.
-	 * Where n = Resolution, for every n horizontal pixels, combine all items into a single datapoint.  When Resolution = 0, all datapoints will be rendered as graphical objects.  Charts with a higher resolution will have faster performance.
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "resolution", optionValue: number): void;
-
-	/**
-	 * Gets  the palette of brushes to used for coloring trend lines in this chart. The value provided should be an array of CSS color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection
-	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "trendLineBrushes"): any;
-
-	/**
-	 * Sets the palette of brushes to used for coloring trend lines in this chart. The value provided should be an array of CSS color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection
-	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "trendLineBrushes", optionValue: any): void;
-
-	/**
-	 * Gets  the formula used for calculating trend lines in this chart.
-	 */
-
-	igCategoryChart(optionLiteral: 'option', optionName: "trendLineType"): string;
-
-	/**
-	 * Sets the formula used for calculating trend lines in this chart.
-	 *
-	 * @optionValue New value to be set.
-	 */
-
-	igCategoryChart(optionLiteral: 'option', optionName: "trendLineType", optionValue: string): void;
-
-	/**
-	 * Gets  the thickness of the chart series. Depending on the ChartType, this can be the main brush used, or just the outline.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "thickness"): number;
-
-	/**
-	 * Sets the thickness of the chart series. Depending on the ChartType, this can be the main brush used, or just the outline.
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "thickness", optionValue: number): void;
-
-	/**
-	 * Gets  the collection of marker shapes used for representing data points of series in this chart.
-	 * When MarkerTypes is null or empty, each series' marker type will be set to none or automatic, depending on the series type.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "markerTypes"): any;
-
-	/**
-	 * Sets the collection of marker shapes used for representing data points of series in this chart.
-	 * When MarkerTypes is null or empty, each series' marker type will be set to none or automatic, depending on the series type.
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "markerTypes", optionValue: any): void;
-
-	/**
-	 * Gets  the palette of brushes used as the fill color for data point markers.
-	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "markerBrushes"): any;
-
-	/**
-	 * Sets the palette of brushes used as the fill color for data point markers.
-	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "markerBrushes", optionValue: any): void;
-
-	/**
-	 * Gets  the palette of brushes used for coloring outline of data point markers.
-	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "markerOutlines"): any;
-
-	/**
-	 * Sets the palette of brushes used for coloring outline of data point markers.
-	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "markerOutlines", optionValue: any): void;
-
-	/**
-	 * Gets  the thickness of the trend lines in this chart.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "trendLineThickness"): number;
-
-	/**
-	 * Sets the thickness of the trend lines in this chart.
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "trendLineThickness", optionValue: number): void;
-
-	/**
-	 * Gets  whether the direction of the X-axis is inverted, placing the first data items on the right side instead of left side
+	 * Gets  whether to invert the direction of the X-axis by placing the first data items on the right side of the chart.
 	 */
 	igCategoryChart(optionLiteral: 'option', optionName: "xAxisInverted"): boolean;
 
 	/**
-	 * Sets whether the direction of the X-axis is inverted, placing the first data items on the right side instead of left side
+	 * Sets whether to invert the direction of the X-axis by placing the first data items on the right side of the chart.
 	 *
 	 * @optionValue New value to be set.
 	 */
 	igCategoryChart(optionLiteral: 'option', optionName: "xAxisInverted", optionValue: boolean): void;
 
 	/**
-	 * Gets  whether the direction of the Y-axis is inverted, placing minimum numeric value at the top of the axis instead of bottom
+	 * Gets  whether to invert the direction of the Y-axis by placing the minimum numeric value at the top of the chart.
 	 */
 	igCategoryChart(optionLiteral: 'option', optionName: "yAxisInverted"): boolean;
 
 	/**
-	 * Sets whether the direction of the Y-axis is inverted, placing minimum numeric value at the top of the axis instead of bottom
+	 * Sets whether to invert the direction of the Y-axis by placing the minimum numeric value at the top of the chart.
 	 *
 	 * @optionValue New value to be set.
 	 */
 	igCategoryChart(optionLiteral: 'option', optionName: "yAxisInverted", optionValue: boolean): void;
 
+	/**
+	 * Gets  Horizontal alignment of the X-axis title.
+	 */
+
+	igCategoryChart(optionLiteral: 'option', optionName: "xAxisTitleAlignment"): string;
+
+	/**
+	 * Sets Horizontal alignment of the X-axis title.
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igCategoryChart(optionLiteral: 'option', optionName: "xAxisTitleAlignment", optionValue: string): void;
+
+	/**
+	 * Gets  Vertical alignment of the Y-axis title.
+	 */
+
+	igCategoryChart(optionLiteral: 'option', optionName: "yAxisTitleAlignment"): string;
+
+	/**
+	 * Sets Vertical alignment of the Y-axis title.
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igCategoryChart(optionLiteral: 'option', optionName: "yAxisTitleAlignment", optionValue: string): void;
+
+	/**
+	 * Gets  Horizontal alignment of X-axis labels.
+	 */
+
+	igCategoryChart(optionLiteral: 'option', optionName: "xAxisLabelHorizontalAlignment"): string;
+
+	/**
+	 * Sets Horizontal alignment of X-axis labels.
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igCategoryChart(optionLiteral: 'option', optionName: "xAxisLabelHorizontalAlignment", optionValue: string): void;
+
+	/**
+	 * Gets  Horizontal alignment of Y-axis labels.
+	 */
+
+	igCategoryChart(optionLiteral: 'option', optionName: "yAxisLabelHorizontalAlignment"): string;
+
+	/**
+	 * Sets Horizontal alignment of Y-axis labels.
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igCategoryChart(optionLiteral: 'option', optionName: "yAxisLabelHorizontalAlignment", optionValue: string): void;
+
+	/**
+	 * Gets  Vertical alignment of X-axis labels.
+	 */
+
+	igCategoryChart(optionLiteral: 'option', optionName: "xAxisLabelVerticalAlignment"): string;
+
+	/**
+	 * Sets Vertical alignment of X-axis labels.
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igCategoryChart(optionLiteral: 'option', optionName: "xAxisLabelVerticalAlignment", optionValue: string): void;
+
+	/**
+	 * Gets  Vertical alignment of Y-axis labels.
+	 */
+
+	igCategoryChart(optionLiteral: 'option', optionName: "yAxisLabelVerticalAlignment"): string;
+
+	/**
+	 * Sets Vertical alignment of Y-axis labels.
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igCategoryChart(optionLiteral: 'option', optionName: "yAxisLabelVerticalAlignment", optionValue: string): void;
+
+	/**
+	 * Gets  Visibility of X-axis labels.
+	 */
+
+	igCategoryChart(optionLiteral: 'option', optionName: "xAxisLabelVisibility"): string;
+
+	/**
+	 * Sets Visibility of X-axis labels.
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igCategoryChart(optionLiteral: 'option', optionName: "xAxisLabelVisibility", optionValue: string): void;
+
+	/**
+	 * Gets  Visibility of Y-axis labels.
+	 */
+
+	igCategoryChart(optionLiteral: 'option', optionName: "yAxisLabelVisibility"): string;
+
+	/**
+	 * Sets Visibility of Y-axis labels.
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igCategoryChart(optionLiteral: 'option', optionName: "yAxisLabelVisibility", optionValue: string): void;
+
+	/**
+	 * The location of Y-axis labels, relative to the plot area.
+	 */
+
+	igCategoryChart(optionLiteral: 'option', optionName: "yAxisLabelLocation"): string;
+
+	/**
+	 * The location of Y-axis labels, relative to the plot area.
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igCategoryChart(optionLiteral: 'option', optionName: "yAxisLabelLocation", optionValue: string): void;
+
+	/**
+	 * Gets  the duration used for animating series plots when the chart is loading into view
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "transitionInDuration"): number;
+
+	/**
+	 * Sets the duration used for animating series plots when the chart is loading into view
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "transitionInDuration", optionValue: number): void;
+
+	/**
+	 * Gets  the easing function used for animating series plots when the chart is loading into view
+	 * This can be set to one of the known values "linear" or "cubic," or it can be set to an easing function which takes a single numeric parameter and returns a number.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "transitionInEasingFunction"): any;
+
+	/**
+	 * Sets the easing function used for animating series plots when the chart is loading into view
+	 * This can be set to one of the known values "linear" or "cubic," or it can be set to an easing function which takes a single numeric parameter and returns a number.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "transitionInEasingFunction", optionValue: any): void;
+
+	/**
+	 * Gets  the type of chart series to generate from the data.
+	 */
+
+	igCategoryChart(optionLiteral: 'option', optionName: "chartType"): string;
+
+	/**
+	 * Sets the type of chart series to generate from the data.
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igCategoryChart(optionLiteral: 'option', optionName: "chartType", optionValue: string): void;
+
+	/**
+	 * Gets  the behavior for markers in each series which are placed too close together for the current view, resulting in a collision.
+	 */
+
+	igCategoryChart(optionLiteral: 'option', optionName: "markerCollisionAvoidance"): string;
+
+	/**
+	 * Sets the behavior for markers in each series which are placed too close together for the current view, resulting in a collision.
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igCategoryChart(optionLiteral: 'option', optionName: "markerCollisionAvoidance", optionValue: string): void;
+
+	/**
+	 * Gets  whether animation of series plots is enabled when the chart is loading into view
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "isTransitionInEnabled"): boolean;
+
+	/**
+	 * Sets whether animation of series plots is enabled when the chart is loading into view
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "isTransitionInEnabled", optionValue: boolean): void;
+
+	/**
+	 * Gets  the method that determines how to animate series plots when the chart is loading into view
+	 */
+
+	igCategoryChart(optionLiteral: 'option', optionName: "transitionInMode"): string;
+
+	/**
+	 * Sets the method that determines how to animate series plots when the chart is loading into view
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igCategoryChart(optionLiteral: 'option', optionName: "transitionInMode", optionValue: string): void;
+
+	/**
+	 * Gets  the arrival speed used for animating series plots when the chart is loading into view
+	 */
+
+	igCategoryChart(optionLiteral: 'option', optionName: "transitionInSpeedType"): string;
+
+	/**
+	 * Sets the arrival speed used for animating series plots when the chart is loading into view
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igCategoryChart(optionLiteral: 'option', optionName: "transitionInSpeedType", optionValue: string): void;
+
+	/**
+	 * Gets  the frequency of displayed labels along the X-axis.
+	 * Gets  the set value is a factor that determines which labels will be hidden. For example, an interval of 2 will display every other label.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "xAxisInterval"): number;
+
+	/**
+	 * Sets the frequency of displayed labels along the X-axis.
+	 *  sets the set value is a factor that determines which labels will be hidden. For example, an interval of 2 will display every other label.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "xAxisInterval", optionValue: number): void;
+
+	/**
+	 * Gets  the frequency of displayed minor lines along the X-axis.
+	 * Gets  the set value is a factor that determines how the minor lines will be displayed.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "xAxisMinorInterval"): number;
+
+	/**
+	 * Sets the frequency of displayed minor lines along the X-axis.
+	 *  sets the set value is a factor that determines how the minor lines will be displayed.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "xAxisMinorInterval", optionValue: number): void;
+
+	/**
+	 * Gets  the amount of space between adjacent categories for the X-axis.
+	 * The gap is silently clamped to the range [0, 1] when used.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "xAxisGap"): number;
+
+	/**
+	 * Sets the amount of space between adjacent categories for the X-axis.
+	 * The gap is silently clamped to the range [0, 1] when used.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "xAxisGap", optionValue: number): void;
+
+	/**
+	 * Gets  the amount of overlap between adjacent categories for the X-axis.
+	 * Gets  the overlap is silently clamped to the range [-1, 1] when used.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "xAxisOverlap"): number;
+
+	/**
+	 * Sets the amount of overlap between adjacent categories for the X-axis.
+	 *  sets the overlap is silently clamped to the range [-1, 1] when used.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "xAxisOverlap", optionValue: number): void;
+
+	/**
+	 * Gets  the distance between each label and grid line along the Y-axis.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "yAxisInterval"): number;
+
+	/**
+	 * Sets the distance between each label and grid line along the Y-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "yAxisInterval", optionValue: number): void;
+
+	/**
+	 * Gets  whether the Y-axis should use a logarithmic scale instead of a linear one.
+	 * Since log(-1) is imaginary and log(0) is undefined, it is recommended to enable this property only when the Y-axis minimum is greater than zero.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "yAxisIsLogarithmic"): boolean;
+
+	/**
+	 * Sets whether the Y-axis should use a logarithmic scale instead of a linear one.
+	 * Since log(-1) is imaginary and log(0) is undefined, it is recommended to enable this property only when the Y-axis minimum is greater than zero.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "yAxisIsLogarithmic", optionValue: boolean): void;
+
+	/**
+	 * Gets  the base value to use in the log function when mapping the position of data items along the Y-axis.
+	 * This property is effective only when YAxisIsLogarithmic is true.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "yAxisLogarithmBase"): number;
+
+	/**
+	 * Sets the base value to use in the log function when mapping the position of data items along the Y-axis.
+	 * This property is effective only when YAxisIsLogarithmic is true.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "yAxisLogarithmBase", optionValue: number): void;
+
+	/**
+	 * Gets  the data value corresponding to the minimum value of the Y-axis.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "yAxisMinimumValue"): number;
+
+	/**
+	 * Sets the data value corresponding to the minimum value of the Y-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "yAxisMinimumValue", optionValue: number): void;
+
+	/**
+	 * Gets  the data value corresponding to the maximum value of the Y-axis.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "yAxisMaximumValue"): number;
+
+	/**
+	 * Sets the data value corresponding to the maximum value of the Y-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "yAxisMaximumValue", optionValue: number): void;
+
+	/**
+	 * Gets  the frequency of displayed minor lines along the Y-axis.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "yAxisMinorInterval"): number;
+
+	/**
+	 * Sets the frequency of displayed minor lines along the Y-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "yAxisMinorInterval", optionValue: number): void;
+
 	/**
 	 * Gets  the palette used for coloring negative items of Waterfall chart type.
 	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
@@ -12755,118 +13692,6 @@ interface JQuery {
 	 */
 	igCategoryChart(optionLiteral: 'option', optionName: "negativeBrushes", optionValue: any): void;
 
-	/**
-	 * Gets  the horizontal alignment of the X-axis title.
-	 */
-
-	igCategoryChart(optionLiteral: 'option', optionName: "xAxisTitleAlignment"): string;
-
-	/**
-	 * Sets the horizontal alignment of the X-axis title.
-	 *
-	 * @optionValue New value to be set.
-	 */
-
-	igCategoryChart(optionLiteral: 'option', optionName: "xAxisTitleAlignment", optionValue: string): void;
-
-	/**
-	 * Gets  the vertical alignment of the Y-axis title.
-	 */
-
-	igCategoryChart(optionLiteral: 'option', optionName: "yAxisTitleAlignment"): string;
-
-	/**
-	 * Sets the vertical alignment of the Y-axis title.
-	 *
-	 * @optionValue New value to be set.
-	 */
-
-	igCategoryChart(optionLiteral: 'option', optionName: "yAxisTitleAlignment", optionValue: string): void;
-
-	/**
-	 * Gets  the horizontal alignment of X-axis labels.
-	 */
-
-	igCategoryChart(optionLiteral: 'option', optionName: "xAxisLabelHorizontalAlignment"): string;
-
-	/**
-	 * Sets the horizontal alignment of X-axis labels.
-	 *
-	 * @optionValue New value to be set.
-	 */
-
-	igCategoryChart(optionLiteral: 'option', optionName: "xAxisLabelHorizontalAlignment", optionValue: string): void;
-
-	/**
-	 * Gets  the horizontal alignment of Y-axis labels.
-	 */
-
-	igCategoryChart(optionLiteral: 'option', optionName: "yAxisLabelHorizontalAlignment"): string;
-
-	/**
-	 * Sets the horizontal alignment of Y-axis labels.
-	 *
-	 * @optionValue New value to be set.
-	 */
-
-	igCategoryChart(optionLiteral: 'option', optionName: "yAxisLabelHorizontalAlignment", optionValue: string): void;
-
-	/**
-	 * Gets  the vertical alignment of X-axis labels.
-	 */
-
-	igCategoryChart(optionLiteral: 'option', optionName: "xAxisLabelVerticalAlignment"): string;
-
-	/**
-	 * Sets the vertical alignment of X-axis labels.
-	 *
-	 * @optionValue New value to be set.
-	 */
-
-	igCategoryChart(optionLiteral: 'option', optionName: "xAxisLabelVerticalAlignment", optionValue: string): void;
-
-	/**
-	 * Gets  the vertical alignment of Y-axis labels.
-	 */
-
-	igCategoryChart(optionLiteral: 'option', optionName: "yAxisLabelVerticalAlignment"): string;
-
-	/**
-	 * Sets the vertical alignment of Y-axis labels.
-	 *
-	 * @optionValue New value to be set.
-	 */
-
-	igCategoryChart(optionLiteral: 'option', optionName: "yAxisLabelVerticalAlignment", optionValue: string): void;
-
-	/**
-	 * Gets  the visibility of X-axis labels.
-	 */
-
-	igCategoryChart(optionLiteral: 'option', optionName: "xAxisLabelVisibility"): string;
-
-	/**
-	 * Sets the visibility of X-axis labels.
-	 *
-	 * @optionValue New value to be set.
-	 */
-
-	igCategoryChart(optionLiteral: 'option', optionName: "xAxisLabelVisibility", optionValue: string): void;
-
-	/**
-	 * Gets  the visibility of Y-axis labels.
-	 */
-
-	igCategoryChart(optionLiteral: 'option', optionName: "yAxisLabelVisibility"): string;
-
-	/**
-	 * Sets the visibility of Y-axis labels.
-	 *
-	 * @optionValue New value to be set.
-	 */
-
-	igCategoryChart(optionLiteral: 'option', optionName: "yAxisLabelVisibility", optionValue: string): void;
-
 	/**
 	 * Brushes to use for drawing negative elements, when using a chart type with contextual coloring, such as Waterfall.
 	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
@@ -12882,16 +13707,28 @@ interface JQuery {
 	igCategoryChart(optionLiteral: 'option', optionName: "negativeOutlines", optionValue: any): void;
 
 	/**
-	 * Gets  a value indicating whether grid and tick lines are aligned to device pixels.
+	 * Gets  whether the series animations should be allowed when a range change has been detected on an axis.
 	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "alignsGridLinesToPixels"): boolean;
+	igCategoryChart(optionLiteral: 'option', optionName: "animateSeriesWhenAxisRangeChanges"): boolean;
 
 	/**
-	 * Sets a value indicating whether grid and tick lines are aligned to device pixels.
+	 * Sets whether the series animations should be allowed when a range change has been detected on an axis.
 	 *
 	 * @optionValue New value to be set.
 	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "alignsGridLinesToPixels", optionValue: boolean): void;
+	igCategoryChart(optionLiteral: 'option', optionName: "animateSeriesWhenAxisRangeChanges", optionValue: boolean): void;
+
+	/**
+	 * Gets  whether the large numbers on the Y-axis labels are abbreviated.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "yAxisAbbreviateLargeNumbers"): boolean;
+
+	/**
+	 * Sets whether the large numbers on the Y-axis labels are abbreviated.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "yAxisAbbreviateLargeNumbers", optionValue: boolean): void;
 
 	/**
 	 * The width of the chart.
@@ -12994,41 +13831,101 @@ interface JQuery {
 	igCategoryChart(optionLiteral: 'option', optionName: "responseDataKey", optionValue: string): void;
 
 	/**
-	 * Event raised when a property value is changed.
+	 * Event raised when a property value is changed on this chart
 	 */
 	igCategoryChart(optionLiteral: 'option', optionName: "propertyChanged"): PropertyChangedEvent;
 
 	/**
-	 * Event raised when a property value is changed.
+	 * Event raised when a property value is changed on this chart
 	 *
 	 * @optionValue Define event handler function.
 	 */
 	igCategoryChart(optionLiteral: 'option', optionName: "propertyChanged", optionValue: PropertyChangedEvent): void;
 
 	/**
-	 * Event raised when a series is initialized
+	 * Event raised when a series is initialized and added to this chart.
 	 */
 	igCategoryChart(optionLiteral: 'option', optionName: "seriesAdded"): SeriesAddedEvent;
 
 	/**
-	 * Event raised when a series is initialized
+	 * Event raised when a series is initialized and added to this chart.
 	 *
 	 * @optionValue Define event handler function.
 	 */
 	igCategoryChart(optionLiteral: 'option', optionName: "seriesAdded", optionValue: SeriesAddedEvent): void;
 
 	/**
-	 * Event raised when a series is removed from the CategoryChart
+	 * Event raised when a series is removed from this chart.
 	 */
 	igCategoryChart(optionLiteral: 'option', optionName: "seriesRemoved"): SeriesRemovedEvent;
 
 	/**
-	 * Event raised when a series is removed from the CategoryChart
+	 * Event raised when a series is removed from this chart.
 	 *
 	 * @optionValue Define event handler function.
 	 */
 	igCategoryChart(optionLiteral: 'option', optionName: "seriesRemoved", optionValue: SeriesRemovedEvent): void;
 
+	/**
+	 * Occurs when the pointer enters a Series.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "seriesPointerEnter"): SeriesPointerEnterEvent;
+
+	/**
+	 * Occurs when the pointer enters a Series.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "seriesPointerEnter", optionValue: SeriesPointerEnterEvent): void;
+
+	/**
+	 * Occurs when the pointer leaves a Series.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "seriesPointerLeave"): SeriesPointerLeaveEvent;
+
+	/**
+	 * Occurs when the pointer leaves a Series.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "seriesPointerLeave", optionValue: SeriesPointerLeaveEvent): void;
+
+	/**
+	 * Occurs when the pointer moves over a Series.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "seriesPointerMove"): SeriesPointerMoveEvent;
+
+	/**
+	 * Occurs when the pointer moves over a Series.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "seriesPointerMove", optionValue: SeriesPointerMoveEvent): void;
+
+	/**
+	 * Occurs when the pointer is pressed down over a Series.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "seriesPointerDown"): SeriesPointerDownEvent;
+
+	/**
+	 * Occurs when the pointer is pressed down over a Series.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "seriesPointerDown", optionValue: SeriesPointerDownEvent): void;
+
+	/**
+	 * Occurs when the pointer is released over a Series.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "seriesPointerUp"): SeriesPointerUpEvent;
+
+	/**
+	 * Occurs when the pointer is released over a Series.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "seriesPointerUp", optionValue: SeriesPointerUpEvent): void;
+
 	/**
 	 * Event which is raised before data binding.
 	 * Return false in order to cancel data binding.
@@ -13167,6 +14064,7 @@ interface IgDataChartLegend {
 	/**
 	 * The height of the legend.null will stretch vertically to fit data, no other height are defined.
 	 *
+	 *
 	 * Valid values:
 	 * "null"
 	 */
@@ -13191,6 +14089,7 @@ interface IgDataChartAxes {
 	 * "categoryAngle" Specify the axis as category angle axis. Useful for displaying polar and radial categories.
 	 * "numericAngle" Specify the axis as numeric angle axis. Useful for displaying polar and radial series.
 	 * "numericRadius" Specify the axis as numeric radius axis. Useful for displaying polar and radial series.
+	 * "time" Specify the axis as time X axis. Useful for displaying date based data with time breaks.
 	 */
 	type?: string;
 
@@ -13375,6 +14274,7 @@ interface IgDataChartAxes {
 	/**
 	 * Gets or sets the axis MinimumValue.
 	 *
+	 *
 	 * Valid values:
 	 * "number" The minimum value can be set to be a number when the axis is of numeric type
 	 * "date" The minimum value can be set to be a date object when [type](ui.igDataChart#options:axes.type) option is set to "categoryDateTimeX"
@@ -13384,6 +14284,7 @@ interface IgDataChartAxes {
 	/**
 	 * Gets or sets the axis MaximumValue.
 	 *
+	 *
 	 * Valid values:
 	 * "number" The maximum value can be set to be a number when the axis is of numeric type
 	 * "date" The maximum value can be set to be a date object when [type](ui.igDataChart#options:axes.type) option is set to "categoryDateTimeX"
@@ -13604,6 +14505,7 @@ interface IgDataChartSeriesLegend {
 	/**
 	 * The height of the legend.null will stretch vertically to fit data, no other height are defined
 	 *
+	 *
 	 * Valid values:
 	 * "null"
 	 */
@@ -13633,19 +14535,77 @@ interface IgDataChartSeries {
 	 * "waterfall" Specify the series as Waterfall series.
 	 * "financial" Specify the series as Financial series.
 	 * "typicalPriceIndicator" Specify the series as Typical Price Indicator series.
+	 * "point" Specify the series as Point series.
+	 * "polarSplineArea" Specify the series as Polar Spline Area series.
+	 * "polarSpline" Specify the series as Polar Spline series.
 	 * "polarArea" Specify the series as Polar Area series.
 	 * "polarLine" Specify the series as Polar Line series.
 	 * "polarScatter" Specify the series as Polar Scatter series.
 	 * "radialColumn" Specify the series as Radial Column series.
 	 * "radialLine" Specify the series as Radial Line series.
 	 * "radialPie" Specify the series as Radial Pie series.
+	 * "radialArea" Specify the series as Radial Area series.
 	 * "scatter" Specify the series as Scatter series.
 	 * "scatterLine" Specify the series as Scatter Line series.
+	 * "scatterSpline" Specify the series as Scatter Spline series.
+	 * "scatterArea" Specify the series as Scatter Area series.
+	 * "scatterContour" Specify the series as Scatter Contour series.
+	 * "scatterPolygon" Specify the series as Scatter Polygon series.
+	 * "scatterPolyline" Specify the series as Scatter Polyline series.
 	 * "bubble" Specify the series as Bubble series.
 	 * "absoluteVolumeOscillatorIndicator" Specify the series as Absolute Volume Oscillator Indicator series.
 	 * "averageTrueRangeIndicator" Specify the series as Average True Range Indicator series.
 	 * "accumulationDistributionIndicator" Specify the series as Accumulation Distribution Indicator series
 	 * "averageDirectionalIndexIndicator" Specify the series as Average Directional Index Indicator series.
+	 * "bollingerBandWidthIndicator" Specify the series as Bollinger Band Width Indicator series.
+	 * "chaikinOscillatorIndicator" Specify the series as Chaikin Oscillator Indicator series.
+	 * "chaikinVolatilityIndicator" Specify the series as Chaikin Volitility Indicator series.
+	 * "commodityChannelIndexIndicator" Specify the series as Commodity Channel Index Indicator series.
+	 * "detrendedPriceOscillatorIndicator" Specify the series as Detrended Price Oscillator Indicator series.
+	 * "easeOfMovementIndicator" Specify the series as Ease Of Movement Indicator series.
+	 * "fastStochasticOscillatorIndicator" Specify the series as Fast Stochastic Oscillator Indicator series.
+	 * "forceIndexIndicator" Specify the series as Force Index Indicator series.
+	 * "fullStochasticOscillatorIndicator" Specify the series as Full Stochastic Oscillator Indicator series.
+	 * "marketFacilitationIndexIndicator" Specify the series as Market Facilitation Index Indicator series.
+	 * "massIndexIndicator" Specify the series as Mass Index Indicator series.
+	 * "medianPriceIndicator" Specify the series as Median Price Indicator series.
+	 * "moneyFlowIndexIndicator" Specify the series as Money Flow Index Indicator series.
+	 * "movingAverageConvergenceDivergenceIndicator" Specify the series as Moving Average Convergence Divergence Indicator series.
+	 * "negativeVolumeIndexIndicator" Specify the series as Negative Volume Index Indicator series.
+	 * "onBalanceVolumeIndicator" Specify the series as On Balance Volume Indicator series.
+	 * "percentagePriceOscillatorIndicator" Specify the series as Percentage Price Oscillator Indicator series.
+	 * "percentageVolumeOscillatorIndicator" Specify the series as Percentage Volume Oscillator Indicator series.
+	 * "positiveVolumeIndexIndicator" Specify the series as Positive Volume Index Indicator series.
+	 * "priceVolumeTrendIndictor" Specify the series as Price Volume Trend Indictor series.
+	 * "rateOfChangeAndMomentumIndicator" Specify the series as Rate Of Change And Momentum Indicator series.
+	 * "relativeStrengthIndexIndicator" Specify the series as Relative Strength Index Indicator series.
+	 * "slowStochasticOscillatorIndicator" Specify the series as Slow Stochastic Oscillator Indicator series.
+	 * "standardDeviationIndicator" Specify the series as Standard Deviation Indicator series.
+	 * "stochRSIIndicator" Specify the series as Stoch RSI Indicator series.
+	 * "trixIndicator" Specify the series as Trix Indicator series.
+	 * "ultimateOscillatorIndicator" Specify the series as Ultimate Oscillator Indicator series.
+	 * "weightedCloseIndicator" Specify the series as Weighted Close Indicator series.
+	 * "williamsPercentRIndicator" Specify the series as Williams Percent R Indicator series.
+	 * "bollingerBandsOverlay" Specify the series as Bollinger Bands Overlay series.
+	 * "priceChannelOverlay" Specify the series as Price Channel Overlay series.
+	 * "customIndicator" Specify the series as Custom Indicator series.
+	 * "stackedBar" Specify the series as Stacked Bar series.
+	 * "stacked100Bar" Specify the series as Stacked 100 Bar series.
+	 * "stackedArea" Specify the series as Stacked Area series.
+	 * "stacked100Area" Specify the series as Stacked 100 Area series.
+	 * "stackedColumn" Specify the series as Stacked Column series.
+	 * "stacked100Column" Specify the series as Stacked 100 Column series.
+	 * "stackedLine" Specify the series as Stacked Line series.
+	 * "stacked100Line" Specify the series as Stacked 100 Line series.
+	 * "stackedSpline" Specify the series as Stacked Spline series.
+	 * "stacked100Spline" Specify the series as Stacked 100 Spline series.
+	 * "stackedSplineArea" Specify the series as Stacked Spline Area series.
+	 * "stacked100SplineArea" Specify the series as Stacked 100 Spline Area series.
+	 * "crosshairLayer" Specify the series as a crosshair layer.
+	 * "categoryHighlightLayer" Specify the series as a category highlight layer.
+	 * "categoryItemHighlightLayer" Specify the series as a category item highlight layer.
+	 * "itemToolTipLayer" Specify the series as an item tooltip layer.
+	 * "categoryToolTipLayer" Specify the series as a category tooltip layer.
 	 */
 	type?: string;
 
@@ -15138,6 +16098,7 @@ interface IgDataChart {
 	/**
 	 * The response to user panning and zooming: whether to update the view immediately while the user action is happening, or to defer the update to after the user action is complete.  The user action will be an action such as a mouse drag which causes panning and/or zooming to occur.
 	 *
+	 *
 	 * Valid values:
 	 * "deferred" Defer the view update until after the user action is complete.
 	 * "immediate" Update the view immediately while the user action is happening.
@@ -15583,6 +16544,24 @@ interface IgDataChart {
 	 */
 	theme?: string;
 
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	locale?: any;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	language?: string;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+	regional?: string|Object;
+
 	/**
 	 * Event fired when the mouse has hovered on a series and the tooltip is about to show
 	 * Function takes arguments evt and ui.
@@ -16270,6 +17249,24 @@ interface IgDataChartMethods {
 	 * Clears the tile zoom tile cache so that new tiles will be generated. Only applies if the viewer is using a tile based zoom.
 	 */
 	clearTileZoomCache(): void;
+
+	/**
+	 * Changes the all locales contained into a specified container to the language specified in [options.language](ui.igwidget#options:language)
+	 * Note that this method is for rare scenarios, use [language](ui.igwidget#options:language) or [locale](ui.igwidget#options:locale) option setter
+	 *
+	 * @param $container Optional parameter - if not set it would use the element of the widget as $container
+	 */
+	changeLocale($container: Object): void;
+
+	/**
+	 * Changes the widget language to global language. Global language is the value in $.ig.util.language
+	 */
+	changeGlobalLanguage(): void;
+
+	/**
+	 * Changes the widget regional settins to global regional settings. Global regional settings are container in $.ig.util.regional
+	 */
+	changeGlobalRegional(): void;
 }
 interface JQuery {
 	data(propertyName: "igDataChart"): IgDataChartMethods;
@@ -16471,6 +17468,7 @@ interface IgPieChart {
 	/**
 	 * Gets or sets the position of chart labels.
 	 *
+	 *
 	 * Valid values:
 	 * "none" No labels will be displayed.
 	 * "center" Labels will be displayed in the center.
@@ -16495,6 +17493,7 @@ interface IgPieChart {
 	/**
 	 * Gets or sets the type of selection the pie chart allows.
 	 *
+	 *
 	 * Valid values:
 	 * "single" A single slice is allowed to be selected.
 	 * "multiple" Multiple slices are allowed to be selected.
@@ -16517,6 +17516,7 @@ interface IgPieChart {
 	/**
 	 * Gets or sets whether the leader lines are visible.
 	 *
+	 *
 	 * Valid values:
 	 * "visible"
 	 * "collapsed"
@@ -16526,6 +17526,7 @@ interface IgPieChart {
 	/**
 	 * Gets or sets what type of leader lines will be used for the outside end labels.
 	 *
+	 *
 	 * Valid values:
 	 * "straight"
 	 * "arc"
@@ -16634,6 +17635,7 @@ interface IgPieChart {
 	/**
 	 * Gets or sets the rotational direction of the chart.
 	 *
+	 *
 	 * Valid values:
 	 * "counterclockwise"
 	 * "clockwise"
@@ -16685,6 +17687,24 @@ interface IgPieChart {
 	 */
 	theme?: string;
 
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	locale?: any;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	language?: string;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+	regional?: string|Object;
+
 	/**
 	 * Event fired when the mouse has hovered on an element long enough to display a tooltip
 	 * Function takes arguments evt and ui.
@@ -16859,6 +17879,24 @@ interface IgPieChartMethods {
 	 * Forces any pending deferred work to render on the chart before continuing
 	 */
 	flush(): void;
+
+	/**
+	 * Changes the all locales contained into a specified container to the language specified in [options.language](ui.igwidget#options:language)
+	 * Note that this method is for rare scenarios, use [language](ui.igwidget#options:language) or [locale](ui.igwidget#options:locale) option setter
+	 *
+	 * @param $container Optional parameter - if not set it would use the element of the widget as $container
+	 */
+	changeLocale($container: Object): void;
+
+	/**
+	 * Changes the widget language to global language. Global language is the value in $.ig.util.language
+	 */
+	changeGlobalLanguage(): void;
+
+	/**
+	 * Changes the widget regional settins to global regional settings. Global regional settings are container in $.ig.util.regional
+	 */
+	changeGlobalRegional(): void;
 }
 interface JQuery {
 	data(propertyName: "igPieChart"): IgPieChartMethods;
@@ -16921,6 +17959,9 @@ interface JQuery {
 	igDataChart(methodName: "startTiledZoomingIfNecessary"): void;
 	igDataChart(methodName: "endTiledZoomingIfRunning"): void;
 	igDataChart(methodName: "clearTileZoomCache"): void;
+	igDataChart(methodName: "changeLocale", $container: Object): void;
+	igDataChart(methodName: "changeGlobalLanguage"): void;
+	igDataChart(methodName: "changeGlobalRegional"): void;
 
 	/**
 	 * Gets  whether the series viewer can allow the page to pan if a control pan is not possible in the requested direction.
@@ -17052,6 +18093,7 @@ interface JQuery {
 
 	/**
 	 * The response to user panning and zooming: whether to update the view immediately while the user action is happening, or to defer the update to after the user action is complete.  The user action will be an action such as a mouse drag which causes panning and/or zooming to occur.
+	 *
 	 */
 
 	igDataChart(optionLiteral: 'option', optionName: "windowResponse"): string;
@@ -17059,6 +18101,7 @@ interface JQuery {
 	/**
 	 * The response to user panning and zooming: whether to update the view immediately while the user action is happening, or to defer the update to after the user action is complete.  The user action will be an action such as a mouse drag which causes panning and/or zooming to occur.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -18008,6 +19051,50 @@ interface JQuery {
 	 */
 	igDataChart(optionLiteral: 'option', optionName: "theme", optionValue: string): void;
 
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	igDataChart(optionLiteral: 'option', optionName: "locale"): any;
+
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igDataChart(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	igDataChart(optionLiteral: 'option', optionName: "language"): string;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igDataChart(optionLiteral: 'option', optionName: "language", optionValue: string): void;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+
+	igDataChart(optionLiteral: 'option', optionName: "regional"): string|Object;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igDataChart(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
+
 	/**
 	 * Event fired when the mouse has hovered on a series and the tooltip is about to show
 	 * Function takes arguments evt and ui.
@@ -18561,6 +19648,9 @@ interface JQuery {
 	igPieChart(methodName: "exportVisualData"): void;
 	igPieChart(methodName: "getData"): Object;
 	igPieChart(methodName: "flush"): void;
+	igPieChart(methodName: "changeLocale", $container: Object): void;
+	igPieChart(methodName: "changeGlobalLanguage"): void;
+	igPieChart(methodName: "changeGlobalRegional"): void;
 
 	/**
 	 * The width of the chart. It can be set as a number in pixels, string (px) or percentage (%).
@@ -18700,6 +19790,7 @@ interface JQuery {
 
 	/**
 	 * Gets  the position of chart labels.
+	 *
 	 */
 
 	igPieChart(optionLiteral: 'option', optionName: "labelsPosition"): string;
@@ -18707,6 +19798,7 @@ interface JQuery {
 	/**
 	 * Sets the position of chart labels.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -18742,6 +19834,7 @@ interface JQuery {
 
 	/**
 	 * Gets  the type of selection the pie chart allows.
+	 *
 	 */
 
 	igPieChart(optionLiteral: 'option', optionName: "selectionMode"): string;
@@ -18749,6 +19842,7 @@ interface JQuery {
 	/**
 	 * Sets the type of selection the pie chart allows.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -18784,6 +19878,7 @@ interface JQuery {
 
 	/**
 	 * Gets  whether the leader lines are visible.
+	 *
 	 */
 
 	igPieChart(optionLiteral: 'option', optionName: "leaderLineVisibility"): string;
@@ -18791,6 +19886,7 @@ interface JQuery {
 	/**
 	 * Sets whether the leader lines are visible.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -18798,6 +19894,7 @@ interface JQuery {
 
 	/**
 	 * Gets  what type of leader lines will be used for the outside end labels.
+	 *
 	 */
 
 	igPieChart(optionLiteral: 'option', optionName: "leaderLineType"): string;
@@ -18805,6 +19902,7 @@ interface JQuery {
 	/**
 	 * Sets what type of leader lines will be used for the outside end labels.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -19036,6 +20134,7 @@ interface JQuery {
 
 	/**
 	 * Gets  the rotational direction of the chart.
+	 *
 	 */
 
 	igPieChart(optionLiteral: 'option', optionName: "sweepDirection"): string;
@@ -19043,6 +20142,7 @@ interface JQuery {
 	/**
 	 * Sets the rotational direction of the chart.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -19152,6 +20252,50 @@ interface JQuery {
 	 */
 	igPieChart(optionLiteral: 'option', optionName: "theme", optionValue: string): void;
 
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	igPieChart(optionLiteral: 'option', optionName: "locale"): any;
+
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igPieChart(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	igPieChart(optionLiteral: 'option', optionName: "language"): string;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igPieChart(optionLiteral: 'option', optionName: "language", optionValue: string): void;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+
+	igPieChart(optionLiteral: 'option', optionName: "regional"): string|Object;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igPieChart(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
+
 	/**
 	 * Event fired when the mouse has hovered on an element long enough to display a tooltip
 	 * Function takes arguments evt and ui.
@@ -19537,6 +20681,24 @@ interface IgChartLegend {
 	 */
 	theme?: string;
 
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	locale?: any;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	language?: string;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+	regional?: string|Object;
+
 	/**
 	 * Occurs when the left mouse button is pressed while the mouse pointer is over an element of this legend.
 	 * Function takes arguments evt and ui.
@@ -19607,6 +20769,24 @@ interface IgChartLegendMethods {
 	 * Returns the ID of the DOM element holding the legend.
 	 */
 	id(): string;
+
+	/**
+	 * Changes the all locales contained into a specified container to the language specified in [options.language](ui.igwidget#options:language)
+	 * Note that this method is for rare scenarios, use [language](ui.igwidget#options:language) or [locale](ui.igwidget#options:locale) option setter
+	 *
+	 * @param $container Optional parameter - if not set it would use the element of the widget as $container
+	 */
+	changeLocale($container: Object): void;
+
+	/**
+	 * Changes the widget language to global language. Global language is the value in $.ig.util.language
+	 */
+	changeGlobalLanguage(): void;
+
+	/**
+	 * Changes the widget regional settins to global regional settings. Global regional settings are container in $.ig.util.regional
+	 */
+	changeGlobalRegional(): void;
 }
 interface JQuery {
 	data(propertyName: "igChartLegend"): IgChartLegendMethods;
@@ -19617,6 +20797,9 @@ interface JQuery {
 	igChartLegend(methodName: "destroy"): void;
 	igChartLegend(methodName: "widget"): void;
 	igChartLegend(methodName: "id"): string;
+	igChartLegend(methodName: "changeLocale", $container: Object): void;
+	igChartLegend(methodName: "changeGlobalLanguage"): void;
+	igChartLegend(methodName: "changeGlobalRegional"): void;
 
 	/**
 	 * Type of the legend.
@@ -19672,6 +20855,50 @@ interface JQuery {
 	 */
 	igChartLegend(optionLiteral: 'option', optionName: "theme", optionValue: string): void;
 
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	igChartLegend(optionLiteral: 'option', optionName: "locale"): any;
+
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igChartLegend(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	igChartLegend(optionLiteral: 'option', optionName: "language"): string;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igChartLegend(optionLiteral: 'option', optionName: "language", optionValue: string): void;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+
+	igChartLegend(optionLiteral: 'option', optionName: "regional"): string|Object;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igChartLegend(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
+
 	/**
 	 * Occurs when the left mouse button is pressed while the mouse pointer is over an element of this legend.
 	 * Function takes arguments evt and ui.
@@ -19796,12 +21023,14 @@ interface IgColorPicker {
 	/**
 	 * Gets/Sets the default colors. Default colors are the ones displayed in the upper table of the color picker.
 	 *             The array should contain arrays that contain the color values for every next row.
+	 *
 	 */
 	colors?: string;
 
 	/**
 	 * Gets/Sets the standard colors. Standard colors are the ones displayed in the color picker bottom,
 	 *             visually separated from the default colors. The array should contain the color values.
+	 *
 	 */
 	standardColors?: any[];
 
@@ -19869,6 +21098,7 @@ interface JQuery {
 	/**
 	 * Gets/Sets the default colors. Default colors are the ones displayed in the upper table of the color picker.
 	 *             The array should contain arrays that contain the color values for every next row.
+	 *
 	 */
 	igColorPicker(optionLiteral: 'option', optionName: "colors"): string;
 
@@ -19876,6 +21106,7 @@ interface JQuery {
 	 * /Sets the default colors. Default colors are the ones displayed in the upper table of the color picker.
 	 *             The array should contain arrays that contain the color values for every next row.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igColorPicker(optionLiteral: 'option', optionName: "colors", optionValue: string): void;
@@ -19883,6 +21114,7 @@ interface JQuery {
 	/**
 	 * Gets/Sets the standard colors. Standard colors are the ones displayed in the color picker bottom,
 	 *             visually separated from the default colors. The array should contain the color values.
+	 *
 	 */
 	igColorPicker(optionLiteral: 'option', optionName: "standardColors"): any[];
 
@@ -19890,6 +21122,7 @@ interface JQuery {
 	 * /Sets the standard colors. Standard colors are the ones displayed in the color picker bottom,
 	 *             visually separated from the default colors. The array should contain the color values.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igColorPicker(optionLiteral: 'option', optionName: "standardColors", optionValue: any[]): void;
@@ -19975,26 +21208,31 @@ interface CollapsingEventUIParam {
 interface IgColorPickerSplitButton {
 	/**
 	 * Button items.
+	 *
 	 */
 	items?: any[];
 
 	/**
 	 * Gets/sets the button default color value.
+	 *
 	 */
 	defaultColor?: string;
 
 	/**
 	 * If this option is set to true, the igColorPickerSplitButton will be rendered with an icon.
+	 *
 	 */
 	hasDefaultIcon?: boolean;
 
 	/**
 	 * Default button item name.
+	 *
 	 */
 	defaultItemName?: string;
 
 	/**
 	 * Specifies whether the default button will be switched when another button is selected.
+	 *
 	 */
 	swapDefaultEnabled?: boolean;
 
@@ -20053,11 +21291,15 @@ interface IgColorPickerSplitButtonMethods {
 
 	/**
 	 * Collapse the widget.
+	 *
+	 * @param e
 	 */
 	collapse(e: Object): Object;
 
 	/**
 	 * Expands the widget.
+	 *
+	 * @param e
 	 */
 	expand(e: Object): Object;
 
@@ -20096,60 +21338,70 @@ interface JQuery {
 
 	/**
 	 * Button items.
+	 *
 	 */
 	igColorPickerSplitButton(optionLiteral: 'option', optionName: "items"): any[];
 
 	/**
 	 * Button items.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igColorPickerSplitButton(optionLiteral: 'option', optionName: "items", optionValue: any[]): void;
 
 	/**
 	 * Gets/ the button default color value.
+	 *
 	 */
 	igColorPickerSplitButton(optionLiteral: 'option', optionName: "defaultColor"): string;
 
 	/**
 	 * /sets the button default color value.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igColorPickerSplitButton(optionLiteral: 'option', optionName: "defaultColor", optionValue: string): void;
 
 	/**
 	 * If this option is set to true, the igColorPickerSplitButton will be rendered with an icon.
+	 *
 	 */
 	igColorPickerSplitButton(optionLiteral: 'option', optionName: "hasDefaultIcon"): boolean;
 
 	/**
 	 * If this option is set to true, the igColorPickerSplitButton will be rendered with an icon.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igColorPickerSplitButton(optionLiteral: 'option', optionName: "hasDefaultIcon", optionValue: boolean): void;
 
 	/**
 	 * Default button item name.
+	 *
 	 */
 	igColorPickerSplitButton(optionLiteral: 'option', optionName: "defaultItemName"): string;
 
 	/**
 	 * Default button item name.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igColorPickerSplitButton(optionLiteral: 'option', optionName: "defaultItemName", optionValue: string): void;
 
 	/**
 	 * Gets whether the default button will be switched when another button is selected.
+	 *
 	 */
 	igColorPickerSplitButton(optionLiteral: 'option', optionName: "swapDefaultEnabled"): boolean;
 
 	/**
 	 * Sets whether the default button will be switched when another button is selected.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igColorPickerSplitButton(optionLiteral: 'option', optionName: "swapDefaultEnabled", optionValue: boolean): void;
@@ -20252,21 +21504,25 @@ interface JQuery {
 interface IgComboLocale {
 	/**
 	 * Gets/Sets text of list item for condition when [filteringType](ui.igcombo#options:filteringType) option is enabled and no match was found.
+	 *
 	 */
 	noMatchFoundText?: any;
 
 	/**
 	 * Gets/Sets title for html element which represent the drop-down button.
+	 *
 	 */
 	dropDownButtonTitle?: any;
 
 	/**
 	 * Gets/Sets title for html element which represent the clear button.
+	 *
 	 */
 	clearButtonTitle?: any;
 
 	/**
 	 * Gets/Sets value that is displayed when input field is empty.
+	 *
 	 */
 	placeHolder?: any;
 
@@ -20279,11 +21535,13 @@ interface IgComboLocale {
 interface IgComboLoadOnDemandSettings {
 	/**
 	 * Gets/Sets option to enable load on demand.
+	 *
 	 */
 	enabled?: boolean;
 
 	/**
 	 * Gets/Sets number of records loaded on each request.
+	 *
 	 */
 	pageSize?: number;
 
@@ -20296,21 +21554,25 @@ interface IgComboLoadOnDemandSettings {
 interface IgComboMultiSelection {
 	/**
 	 * Set enabled to true to turn multi selection on. Set to true by default when target element for the combo is a select with the multiple attribute set.
+	 *
 	 */
 	enabled?: boolean;
 
 	/**
 	 * Set addWithKeyModifier to true to disable the additive selection, then additive selection can be done by ctrl + mouse click / enter.
+	 *
 	 */
 	addWithKeyModifier?: boolean;
 
 	/**
 	 * Set showCheckboxes to true to render check boxes in front of each drop down item.
+	 *
 	 */
 	showCheckboxes?: boolean;
 
 	/**
 	 * Use itemSeparator to set what string to be rendered between items in field.
+	 *
 	 */
 	itemSeparator?: string;
 
@@ -20323,12 +21585,14 @@ interface IgComboMultiSelection {
 interface IgComboGrouping {
 	/**
 	 * Gets/Sets name of column by which the records will be grouped. Setting this option enables the grouping.
+	 *
 	 */
 	key?: string;
 
 	/**
 	 * Specifies the sort order - ascending or descending.
 	 *
+	 *
 	 * Valid values:
 	 * "asc"
 	 * "desc"
@@ -20344,11 +21608,13 @@ interface IgComboGrouping {
 interface IgComboInitialSelectedItem {
 	/**
 	 * Optional="true" Index of item in the list. The index should be greater than -1 and less than the count of the [items](ui.igcombo#methods:items) in the list (rows in dataSource).
+	 *
 	 */
 	index?: number;
 
 	/**
 	 * Optional="true" Value matching the [valueKey](ui.igcombo#options:valueKey) property of the item.
+	 *
 	 */
 	value?: any;
 
@@ -20547,17 +21813,20 @@ interface SelectionChangedEventUIParam {
 interface IgCombo {
 	/**
 	 * Gets/Sets the width of combo. The numeric and string values (valid html units for size) are supported. It includes %, px, em and other units.
+	 *
 	 */
 	width?: string|number;
 
 	/**
 	 * Gets/Sets height of combo. The numeric and string values (valid html units for size) are supported. It includes %, px, em and other units.
+	 *
 	 */
 	height?: string|number;
 
 	/**
 	 * Gets/Sets the width of drop-down list in pixels.
 	 *
+	 *
 	 * Valid values:
 	 * "string" The default drop-down list width can be set in pixels (px).
 	 * "number" The default drop-down list width can be set as a number.
@@ -20567,33 +21836,39 @@ interface IgCombo {
 	/**
 	 * Gets/Sets a valid data source accepted by [$.ig.DataSource](ig.datasource), or an instance of an [$.ig.DataSource](ig.datasource) itself.
 	 * Note: if it is set to string and [dataSourceType](ui.igcombo#options:dataSourceType) option is not set, then [$.ig.JSONDataSource](ig.jsondatasource) is used.
+	 *
 	 */
 	dataSource?: any;
 
 	/**
 	 * Sets data source type (such as "json", "xml", etc). Please refer to the documentation of [$.ig.DataSource](ig.datasource) and its [type](ig.datasource#options:settings.type) property.
+	 *
 	 */
 	dataSourceType?: string;
 
 	/**
 	 * Sets URL which is used for sending JSON on request for remote filtering (MVC for example). That option is required when [load on demand](ui.igcombo#options:loadOnDemandSettings) is
 	 * [enabled](ui.igcombo#options:loadOnDemandSettings.enabled) and its [type](ui.igcombo#options:filteringType) is remote.
+	 *
 	 */
 	dataSourceUrl?: string;
 
 	/**
 	 * See [$.ig.DataSource](ig.datasource) property in the response specifying the total number of records on the server.
+	 *
 	 */
 	responseTotalRecCountKey?: string;
 
 	/**
 	 * See [$.ig.DataSource](ig.datasource) This is basically the property in the response where data records are held, if the response is wrapped.
+	 *
 	 */
 	responseDataKey?: string;
 
 	/**
 	 * Response type when a URL is set as the data source. See http://api.jquery.com/jQuery.ajax/ => dataType.
 	 *
+	 *
 	 * Valid values:
 	 * "json"
 	 * "xml"
@@ -20606,32 +21881,38 @@ interface IgCombo {
 
 	/**
 	 * Content type of the response. See http://api.jquery.com/jQuery.ajax/ => contentType.
+	 *
 	 */
 	responseContentType?: string;
 
 	/**
 	 * Specifies the HTTP verb to be used to issue the request.
+	 *
 	 */
 	requestType?: string;
 
 	/**
 	 * Gets/Sets name of column which contains the "value". If it is missing, then the name of first column will be used.
+	 *
 	 */
 	valueKey?: string;
 
 	/**
 	 * Gets/Sets name of column which contains the displayed text. If it is missing, then [valueKey](ui.igcombo#options:valueKey) option will be used.
+	 *
 	 */
 	textKey?: string;
 
 	/**
 	 * Gets/Sets a template used to render an item in list. The igCombo utilizes igTemplating for generating node content templates.
 	 * More info on the templating engine can be found here: http://www.igniteui.com/help/infragistics-templating-engine.
+	 *
 	 */
 	itemTemplate?: string;
 
 	/**
 	 * Gets/Sets template used to render a header in the drop-down list. The template is rendered inside of a DIV html element.
+	 *
 	 */
 	headerTemplate?: string;
 
@@ -20644,33 +21925,39 @@ interface IgCombo {
 	 * - {1}: Number of records in dataSource
 	 * - {2}: Number of (filtered) records on server
 	 * - {3}: Number of all records on server
+	 *
 	 */
 	footerTemplate?: string;
 
 	/**
 	 * Gets/Sets the name of a hidden INPUT element, which is used when submitting data. Its value will be set to the values of the selected items valueKeys separated by ',' character on any change in igCombo. If the combo element has 'name' attribute and this option is not set, the 'name' attribute will be used for the input name.
+	 *
 	 */
 	inputName?: string;
 
 	/**
 	 * Gets/Sets show drop-down list animation duration in milliseconds.
+	 *
 	 */
 	animationShowDuration?: number;
 
 	/**
 	 * Gets/Sets hide drop-down list animation duration in milliseconds.
+	 *
 	 */
 	animationHideDuration?: number;
 
 	/**
 	 * If set to true, the container of the drop-down list is appended to the body.
 	 * If set to false, it is appended to the parent element of the combo.
+	 *
 	 */
 	dropDownAttachedToBody?: boolean;
 
 	/**
 	 * Gets/Sets type of filtering.Note: option is set to "remote", then the "css.waitFiltering" is applied to combo and its drop-down list.
 	 *
+	 *
 	 * Valid values:
 	 * "remote" filtering is performed by server
 	 * "local" filtering is performed by $.ig.DataSource
@@ -20680,12 +21967,14 @@ interface IgCombo {
 
 	/**
 	 * Gets/Sets URL key name that specifies how the remote filtering expressions will be encoded for remote requests, e.g. &filter('col') = startsWith. Default is OData.
+	 *
 	 */
 	filterExprUrlKey?: string;
 
 	/**
 	 * Gets/Sets condition used for filtering.Note: When [autoComplete](ui.igcombo#options:autoComplete) is enabled, the filtering condition is always "startsWith".
 	 *
+	 *
 	 * Valid values:
 	 * "contains"
 	 * "doesNotContain"
@@ -20703,6 +21992,7 @@ interface IgCombo {
 	/**
 	 * Gets/Sets filtering logic.
 	 *
+	 *
 	 * Valid values:
 	 * "OR"
 	 * "AND"
@@ -20743,6 +22033,7 @@ interface IgCombo {
 	 * Notes:
 	 * That option has effect only when data is loaded remotely using [dataSourceUrl](ui.igcombo#options:dataSourceUrl).
 	 * Selection is supported only for already loaded items.
+	 *
 	 */
 	loadOnDemandSettings?: IgComboLoadOnDemandSettings;
 
@@ -20750,12 +22041,14 @@ interface IgCombo {
 	 * Gets/Sets how many items should be shown at once.
 	 *    Notes:
 	 *    This option is used for [virtualization](ui.igcombo#options:virtualization) in order to render initial list items.
+	 *
 	 */
 	visibleItemsCount?: number;
 
 	/**
 	 * Sets gets functionality mode.
 	 *
+	 *
 	 * Valid values:
 	 * "editable" Allows to modify value by edit field and drop-down list.
 	 * "dropdown" Allows to modify value by drop-down list only.
@@ -20767,28 +22060,33 @@ interface IgCombo {
 	/**
 	 * Gets/Sets ability to use virtual rendering for drop-down list. Enable to boost performance when combo has lots of records.
 	 * If that option is enabled, then only visible items are created and the top edge of the first visible item in list is aligned to the top edge of list.
+	 *
 	 */
 	virtualization?: boolean;
 
 	/**
 	 * Gets/Sets object specifying multi selection feature options. Note showCheckboxes and itemSeparator has effect only if multi selection is enabled.
+	 *
 	 */
 	multiSelection?: IgComboMultiSelection;
 
 	/**
 	 * Gets/Sets object specifying grouping feature options. The option has key and dir properties.
+	 *
 	 */
 	grouping?: IgComboGrouping;
 
 	/**
 	 * Gets/Sets object which contains options supported by [igValidator](ui.igvalidator).
 	 * Notes: in order for validator to work, application should ensure that [igValidator](ui.igvalidator) is loaded (ig.ui.validator.js/css files).
+	 *
 	 */
 	validatorOptions?: any;
 
 	/**
 	 * Gets/Sets condition used for highlighting of matching parts in items of drop-down list.
 	 *
+	 *
 	 * Valid values:
 	 * "multi" multiple matches in a single item are rendered
 	 * "contains" match at any position in item is rendered
@@ -20800,17 +22098,20 @@ interface IgCombo {
 
 	/**
 	 * If set to true, filtering and auto selection will be case-sensitive.
+	 *
 	 */
 	caseSensitive?: boolean;
 
 	/**
 	 * Gets/Sets whether the first matching item should be auto selected when typing in input. When [multiSelection](ui.igcombo#options:multiSelection) is enabled this option will instead put the active item on the matching element.
+	 *
 	 */
 	autoSelectFirstMatch?: boolean;
 
 	/**
 	 * Gets/Sets ability to autocomplete field from first matching item in list.
 	 * Note: When autoComplete option is enabled, then "startsWith" is used for [filteringCondition](ui.igcombo#options:filteringCondition).
+	 *
 	 */
 	autoComplete?: boolean;
 
@@ -20818,47 +22119,56 @@ interface IgCombo {
 	 * If set to true:
 	 * 1. Allows custom value input only with single selection.
 	 * 2. Custom values will be auto completed to the closest value if [autoComplete](ui.igcombo#options:autoComplete) is enabled.
+	 *
 	 */
 	allowCustomValue?: boolean;
 
 	/**
 	 * Gets/Sets ability to close drop-down list when control loses focus.
+	 *
 	 */
 	closeDropDownOnBlur?: boolean;
 
 	/**
 	 * Specifies the delay duration before processing the changes in the input. Useful to boost performance by lowering the count of selection, filtering, auto complete and highlighting operations executed on each input change.
+	 *
 	 */
 	delayInputChangeProcessing?: number;
 
 	/**
 	 * Gets/Sets tabIndex for the field of the combo.
+	 *
 	 */
 	tabIndex?: number;
 
 	/**
 	 * Gets/Sets ability to show the drop-down list when the combo is in focus. This option has effect only if the combo is in editable [mode](ui.igcombo#options:mode).
+	 *
 	 */
 	dropDownOnFocus?: boolean;
 
 	/**
 	 * Gets sets ability to close drop-down list when single item in the list is selected with mouse click or enter press. The default value when [multiSelection](ui.igcombo#options:multiSelection) is enabled will be false. This option will not close the drop down when [multiSelection](ui.igcombo#options:multiSelection) is enabled and additive selection is performed.
+	 *
 	 */
 	closeDropDownOnSelect?: boolean;
 
 	/**
 	 * Gets/Sets ability to select items by space button press.
+	 *
 	 */
 	selectItemBySpaceKey?: boolean;
 
 	/**
 	 * Gets/Sets list of items to be selected when the combo is initialized. It should contain array of objects with index or value property, then on initialization the matching items will be selected. If initialSelectedItems are not set, the combo is with single selection and it is in a dropdown, readonly or readonlylist [mode](ui.igcombo#options:mode), the first item will be automatically selected.
 	 * Note: Only items loaded on initialization can be selected. When using [load on demand](ui.igCombo#options:loadOnDemandSettings), selecting an item which is not loaded yet will fail.
+	 *
 	 */
 	initialSelectedItems?: IgComboInitialSelectedItem[];
 
 	/**
 	 * Gets/Sets ability to prevent submitting form on enter key press.
+	 *
 	 */
 	preventSubmitOnEnter?: boolean;
 
@@ -20871,24 +22181,28 @@ interface IgCombo {
 	 * Custom values can be something like "currency", "percent", "dateLong", "time", "MMM-dd-yyyy H:mm tt", etc.
 	 *
 	 * Custom format strings should match the data type in "textKey" column.
+	 *
 	 */
 	format?: string;
 
 	/**
 	 * Gets/Sets whether the onscreen keyboard should be shown when the dropdown button is clicked (touch devices only).
 	 * Note: The keyboard will still show when the combo input is focused in editable mode.
+	 *
 	 */
 	suppressKeyboard?: boolean;
 
 	/**
 	 * Specifies whether the clear button should be rendered.
 	 * When the [mode](ui.igcombo#options:mode) is single selection, readonly or readonlylist this option will default to false. It can still be enabled when it is specifically set to true.
+	 *
 	 */
 	enableClearButton?: boolean;
 
 	/**
 	 * Gets/Sets drop-down list orientation when open button is clicked.
 	 *
+	 *
 	 * Valid values:
 	 * "auto" if there is enough space, it positions the drop-down list below the combo input, otherwise - above the combo input
 	 * "bottom" below the combo input
@@ -20896,6 +22210,18 @@ interface IgCombo {
 	 */
 	dropDownOrientation?: string;
 
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	language?: string;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+	regional?: string|Object;
+
 	/**
 	 * Event which is raised after rendering of the combo completes.
 	 *
@@ -21029,7 +22355,16 @@ interface IgCombo {
 	[optionName: string]: any;
 }
 interface IgComboMethods {
+	/**
+	 * Changes the all locales into the widget element to the language specified in [options.language](ui.igcombo#options:language)
+	 * Note that this method is for rare scenarios, see [language](ui.igcombo#options:language) or [locale](ui.igcombo#options:locale) option setter
+	 */
 	changeLocale(): void;
+
+	/**
+	 * Changes the the regional settings of widget element to the language specified in [options.regional](ui.igcombo#options:regional)
+	 * Note that this method is for rare scenarios, use [regional](ui.igcombo#options:regional) option setter
+	 */
 	changeRegional(): void;
 
 	/**
@@ -21354,6 +22689,16 @@ interface IgComboMethods {
 	 * Destroys the igCombo widget.
 	 */
 	destroy(): Object;
+
+	/**
+	 * Changes the widget language to global language. Global language is the value in $.ig.util.language
+	 */
+	changeGlobalLanguage(): void;
+
+	/**
+	 * Changes the widget regional settins to global regional settings. Global regional settings are container in $.ig.util.regional
+	 */
+	changeGlobalRegional(): void;
 }
 interface JQuery {
 	data(propertyName: "igCombo"): IgComboMethods;
@@ -21403,9 +22748,12 @@ interface JQuery {
 	igCombo(methodName: "dropDownOpened"): boolean;
 	igCombo(methodName: "positionDropDown"): Object;
 	igCombo(methodName: "destroy"): Object;
+	igCombo(methodName: "changeGlobalLanguage"): void;
+	igCombo(methodName: "changeGlobalRegional"): void;
 
 	/**
 	 * Gets/Sets the width of combo. The numeric and string values (valid html units for size) are supported. It includes %, px, em and other units.
+	 *
 	 */
 
 	igCombo(optionLiteral: 'option', optionName: "width"): string|number;
@@ -21413,6 +22761,7 @@ interface JQuery {
 	/**
 	 * /Sets the width of combo. The numeric and string values (valid html units for size) are supported. It includes %, px, em and other units.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -21420,6 +22769,7 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets height of combo. The numeric and string values (valid html units for size) are supported. It includes %, px, em and other units.
+	 *
 	 */
 
 	igCombo(optionLiteral: 'option', optionName: "height"): string|number;
@@ -21427,6 +22777,7 @@ interface JQuery {
 	/**
 	 * /Sets height of combo. The numeric and string values (valid html units for size) are supported. It includes %, px, em and other units.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -21434,6 +22785,7 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the width of drop-down list in pixels.
+	 *
 	 */
 
 	igCombo(optionLiteral: 'option', optionName: "dropDownWidth"): string|number;
@@ -21441,6 +22793,7 @@ interface JQuery {
 	/**
 	 * /Sets the width of drop-down list in pixels.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -21449,6 +22802,7 @@ interface JQuery {
 	/**
 	 * Gets/Sets a valid data source accepted by [$.ig.DataSource](ig.datasource), or an instance of an [$.ig.DataSource](ig.datasource) itself.
 	 * Note: if it is set to string and [dataSourceType](ui.igcombo#options:dataSourceType) option is not set, then [$.ig.JSONDataSource](ig.jsondatasource) is used.
+	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "dataSource"): any;
 
@@ -21456,18 +22810,21 @@ interface JQuery {
 	 * /Sets a valid data source accepted by [$.ig.DataSource](ig.datasource), or an instance of an [$.ig.DataSource](ig.datasource) itself.
 	 * Note: if it is set to string and [dataSourceType](ui.igcombo#options:dataSourceType) option is not set, then [$.ig.JSONDataSource](ig.jsondatasource) is used.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "dataSource", optionValue: any): void;
 
 	/**
 	 * Sets data source type (such as "json", "xml", etc). Please refer to the documentation of [$.ig.DataSource](ig.datasource) and its [type](ig.datasource#options:settings.type) property.
+	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "dataSourceType"): string;
 
 	/**
 	 * Sets data source type (such as "json", "xml", etc). Please refer to the documentation of [$.ig.DataSource](ig.datasource) and its [type](ig.datasource#options:settings.type) property.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "dataSourceType", optionValue: string): void;
@@ -21475,6 +22832,7 @@ interface JQuery {
 	/**
 	 * Sets URL which is used for sending JSON on request for remote filtering (MVC for example). That option is required when [load on demand](ui.igcombo#options:loadOnDemandSettings) is
 	 * [enabled](ui.igcombo#options:loadOnDemandSettings.enabled) and its [type](ui.igcombo#options:filteringType) is remote.
+	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "dataSourceUrl"): string;
 
@@ -21482,36 +22840,42 @@ interface JQuery {
 	 * Sets URL which is used for sending JSON on request for remote filtering (MVC for example). That option is required when [load on demand](ui.igcombo#options:loadOnDemandSettings) is
 	 * [enabled](ui.igcombo#options:loadOnDemandSettings.enabled) and its [type](ui.igcombo#options:filteringType) is remote.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "dataSourceUrl", optionValue: string): void;
 
 	/**
 	 * See [$.ig.DataSource](ig.datasource) property in the response specifying the total number of records on the server.
+	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "responseTotalRecCountKey"): string;
 
 	/**
 	 * See [$.ig.DataSource](ig.datasource) property in the response specifying the total number of records on the server.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "responseTotalRecCountKey", optionValue: string): void;
 
 	/**
 	 * See [$.ig.DataSource](ig.datasource) This is basically the property in the response where data records are held, if the response is wrapped.
+	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "responseDataKey"): string;
 
 	/**
 	 * See [$.ig.DataSource](ig.datasource) This is basically the property in the response where data records are held, if the response is wrapped.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "responseDataKey", optionValue: string): void;
 
 	/**
 	 * Response type when a URL is set as the data source. See http://api.jquery.com/jQuery.ajax/ => dataType.
+	 *
 	 */
 
 	igCombo(optionLiteral: 'option', optionName: "responseDataType"): string;
@@ -21519,6 +22883,7 @@ interface JQuery {
 	/**
 	 * Response type when a URL is set as the data source. See http://api.jquery.com/jQuery.ajax/ => dataType.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -21526,48 +22891,56 @@ interface JQuery {
 
 	/**
 	 * Content type of the response. See http://api.jquery.com/jQuery.ajax/ => contentType.
+	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "responseContentType"): string;
 
 	/**
 	 * Content type of the response. See http://api.jquery.com/jQuery.ajax/ => contentType.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "responseContentType", optionValue: string): void;
 
 	/**
 	 * Specifies the HTTP verb to be used to issue the request.
+	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "requestType"): string;
 
 	/**
 	 * Specifies the HTTP verb to be used to issue the request.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "requestType", optionValue: string): void;
 
 	/**
 	 * Gets/Sets name of column which contains the "value". If it is missing, then the name of first column will be used.
+	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "valueKey"): string;
 
 	/**
 	 * /Sets name of column which contains the "value". If it is missing, then the name of first column will be used.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "valueKey", optionValue: string): void;
 
 	/**
 	 * Gets/Sets name of column which contains the displayed text. If it is missing, then [valueKey](ui.igcombo#options:valueKey) option will be used.
+	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "textKey"): string;
 
 	/**
 	 * /Sets name of column which contains the displayed text. If it is missing, then [valueKey](ui.igcombo#options:valueKey) option will be used.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "textKey", optionValue: string): void;
@@ -21575,6 +22948,7 @@ interface JQuery {
 	/**
 	 * Gets/Sets a template used to render an item in list. The igCombo utilizes igTemplating for generating node content templates.
 	 * More info on the templating engine can be found here: http://www.igniteui.com/help/infragistics-templating-engine.
+	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "itemTemplate"): string;
 
@@ -21582,18 +22956,21 @@ interface JQuery {
 	 * /Sets a template used to render an item in list. The igCombo utilizes igTemplating for generating node content templates.
 	 * More info on the templating engine can be found here: http://www.igniteui.com/help/infragistics-templating-engine.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "itemTemplate", optionValue: string): void;
 
 	/**
 	 * Gets/Sets template used to render a header in the drop-down list. The template is rendered inside of a DIV html element.
+	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "headerTemplate"): string;
 
 	/**
 	 * /Sets template used to render a header in the drop-down list. The template is rendered inside of a DIV html element.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "headerTemplate", optionValue: string): void;
@@ -21607,6 +22984,7 @@ interface JQuery {
 	 * - {1}: Number of records in dataSource
 	 * - {2}: Number of (filtered) records on server
 	 * - {3}: Number of all records on server
+	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "footerTemplate"): string;
 
@@ -21620,42 +22998,49 @@ interface JQuery {
 	 * - {2}: Number of (filtered) records on server
 	 * - {3}: Number of all records on server
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "footerTemplate", optionValue: string): void;
 
 	/**
 	 * Gets/Sets the name of a hidden INPUT element, which is used when submitting data. Its value will be set to the values of the selected items valueKeys separated by ',' character on any change in igCombo. If the combo element has 'name' attribute and this option is not set, the 'name' attribute will be used for the input name.
+	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "inputName"): string;
 
 	/**
 	 * /Sets the name of a hidden INPUT element, which is used when submitting data. Its value will be set to the values of the selected items valueKeys separated by ',' character on any change in igCombo. If the combo element has 'name' attribute and this option is not set, the 'name' attribute will be used for the input name.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "inputName", optionValue: string): void;
 
 	/**
 	 * Gets/Sets show drop-down list animation duration in milliseconds.
+	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "animationShowDuration"): number;
 
 	/**
 	 * /Sets show drop-down list animation duration in milliseconds.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "animationShowDuration", optionValue: number): void;
 
 	/**
 	 * Gets/Sets hide drop-down list animation duration in milliseconds.
+	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "animationHideDuration"): number;
 
 	/**
 	 * /Sets hide drop-down list animation duration in milliseconds.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "animationHideDuration", optionValue: number): void;
@@ -21663,6 +23048,7 @@ interface JQuery {
 	/**
 	 * If set to true, the container of the drop-down list is appended to the body.
 	 * If set to false, it is appended to the parent element of the combo.
+	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "dropDownAttachedToBody"): boolean;
 
@@ -21670,12 +23056,14 @@ interface JQuery {
 	 * If set to true, the container of the drop-down list is appended to the body.
 	 * If set to false, it is appended to the parent element of the combo.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "dropDownAttachedToBody", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets type of filtering.Note: option is set to "remote", then the "css.waitFiltering" is applied to combo and its drop-down list.
+	 *
 	 */
 
 	igCombo(optionLiteral: 'option', optionName: "filteringType"): string;
@@ -21683,6 +23071,7 @@ interface JQuery {
 	/**
 	 * /Sets type of filtering.Note: option is set to "remote", then the "css.waitFiltering" is applied to combo and its drop-down list.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -21690,18 +23079,21 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets URL key name that specifies how the remote filtering expressions will be encoded for remote requests, e.g. &filter('col') = startsWith. Default is OData.
+	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "filterExprUrlKey"): string;
 
 	/**
 	 * /Sets URL key name that specifies how the remote filtering expressions will be encoded for remote requests, e.g. &filter('col') = startsWith. Default is OData.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "filterExprUrlKey", optionValue: string): void;
 
 	/**
 	 * Gets/Sets condition used for filtering.Note: When [autoComplete](ui.igcombo#options:autoComplete) is enabled, the filtering condition is always "startsWith".
+	 *
 	 */
 
 	igCombo(optionLiteral: 'option', optionName: "filteringCondition"): string;
@@ -21709,6 +23101,7 @@ interface JQuery {
 	/**
 	 * /Sets condition used for filtering.Note: When [autoComplete](ui.igcombo#options:autoComplete) is enabled, the filtering condition is always "startsWith".
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -21716,6 +23109,7 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets filtering logic.
+	 *
 	 */
 
 	igCombo(optionLiteral: 'option', optionName: "filteringLogic"): string;
@@ -21723,6 +23117,7 @@ interface JQuery {
 	/**
 	 * /Sets filtering logic.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -21799,6 +23194,7 @@ interface JQuery {
 	 * Notes:
 	 * That option has effect only when data is loaded remotely using [dataSourceUrl](ui.igcombo#options:dataSourceUrl).
 	 * Selection is supported only for already loaded items.
+	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "loadOnDemandSettings"): IgComboLoadOnDemandSettings;
 
@@ -21808,6 +23204,7 @@ interface JQuery {
 	 * That option has effect only when data is loaded remotely using [dataSourceUrl](ui.igcombo#options:dataSourceUrl).
 	 * Selection is supported only for already loaded items.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "loadOnDemandSettings", optionValue: IgComboLoadOnDemandSettings): void;
@@ -21816,6 +23213,7 @@ interface JQuery {
 	 * Gets/Sets how many items should be shown at once.
 	 *    Notes:
 	 *    This option is used for [virtualization](ui.igcombo#options:virtualization) in order to render initial list items.
+	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "visibleItemsCount"): number;
 
@@ -21824,12 +23222,14 @@ interface JQuery {
 	 *    Notes:
 	 *    This option is used for [virtualization](ui.igcombo#options:virtualization) in order to render initial list items.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "visibleItemsCount", optionValue: number): void;
 
 	/**
 	 * Sets gets functionality mode.
+	 *
 	 */
 
 	igCombo(optionLiteral: 'option', optionName: "mode"): string;
@@ -21837,6 +23237,7 @@ interface JQuery {
 	/**
 	 * Sets gets functionality mode.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -21845,6 +23246,7 @@ interface JQuery {
 	/**
 	 * Gets/Sets ability to use virtual rendering for drop-down list. Enable to boost performance when combo has lots of records.
 	 * If that option is enabled, then only visible items are created and the top edge of the first visible item in list is aligned to the top edge of list.
+	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "virtualization"): boolean;
 
@@ -21852,30 +23254,35 @@ interface JQuery {
 	 * /Sets ability to use virtual rendering for drop-down list. Enable to boost performance when combo has lots of records.
 	 * If that option is enabled, then only visible items are created and the top edge of the first visible item in list is aligned to the top edge of list.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "virtualization", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets object specifying multi selection feature options. Note showCheckboxes and itemSeparator has effect only if multi selection is enabled.
+	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "multiSelection"): IgComboMultiSelection;
 
 	/**
 	 * /Sets object specifying multi selection feature options. Note showCheckboxes and itemSeparator has effect only if multi selection is enabled.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "multiSelection", optionValue: IgComboMultiSelection): void;
 
 	/**
 	 * Gets/Sets object specifying grouping feature options. The option has key and dir properties.
+	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "grouping"): IgComboGrouping;
 
 	/**
 	 * /Sets object specifying grouping feature options. The option has key and dir properties.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "grouping", optionValue: IgComboGrouping): void;
@@ -21883,6 +23290,7 @@ interface JQuery {
 	/**
 	 * Gets/Sets object which contains options supported by [igValidator](ui.igvalidator).
 	 * Notes: in order for validator to work, application should ensure that [igValidator](ui.igvalidator) is loaded (ig.ui.validator.js/css files).
+	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "validatorOptions"): any;
 
@@ -21890,12 +23298,14 @@ interface JQuery {
 	 * /Sets object which contains options supported by [igValidator](ui.igvalidator).
 	 * Notes: in order for validator to work, application should ensure that [igValidator](ui.igvalidator) is loaded (ig.ui.validator.js/css files).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "validatorOptions", optionValue: any): void;
 
 	/**
 	 * Gets/Sets condition used for highlighting of matching parts in items of drop-down list.
+	 *
 	 */
 
 	igCombo(optionLiteral: 'option', optionName: "highlightMatchesMode"): string;
@@ -21903,6 +23313,7 @@ interface JQuery {
 	/**
 	 * /Sets condition used for highlighting of matching parts in items of drop-down list.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -21910,24 +23321,28 @@ interface JQuery {
 
 	/**
 	 * If set to true, filtering and auto selection will be case-sensitive.
+	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "caseSensitive"): boolean;
 
 	/**
 	 * If set to true, filtering and auto selection will be case-sensitive.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "caseSensitive", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets whether the first matching item should be auto selected when typing in input. When [multiSelection](ui.igcombo#options:multiSelection) is enabled this option will instead put the active item on the matching element.
+	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "autoSelectFirstMatch"): boolean;
 
 	/**
 	 * /Sets whether the first matching item should be auto selected when typing in input. When [multiSelection](ui.igcombo#options:multiSelection) is enabled this option will instead put the active item on the matching element.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "autoSelectFirstMatch", optionValue: boolean): void;
@@ -21935,6 +23350,7 @@ interface JQuery {
 	/**
 	 * Gets/Sets ability to autocomplete field from first matching item in list.
 	 * Note: When autoComplete option is enabled, then "startsWith" is used for [filteringCondition](ui.igcombo#options:filteringCondition).
+	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "autoComplete"): boolean;
 
@@ -21942,6 +23358,7 @@ interface JQuery {
 	 * /Sets ability to autocomplete field from first matching item in list.
 	 * Note: When autoComplete option is enabled, then "startsWith" is used for [filteringCondition](ui.igcombo#options:filteringCondition).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "autoComplete", optionValue: boolean): void;
@@ -21950,6 +23367,7 @@ interface JQuery {
 	 * If set to true:
 	 * 1. Allows custom value input only with single selection.
 	 * 2. Custom values will be auto completed to the closest value if [autoComplete](ui.igcombo#options:autoComplete) is enabled.
+	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "allowCustomValue"): boolean;
 
@@ -21958,78 +23376,91 @@ interface JQuery {
 	 * 1. Allows custom value input only with single selection.
 	 * 2. Custom values will be auto completed to the closest value if [autoComplete](ui.igcombo#options:autoComplete) is enabled.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "allowCustomValue", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets ability to close drop-down list when control loses focus.
+	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "closeDropDownOnBlur"): boolean;
 
 	/**
 	 * /Sets ability to close drop-down list when control loses focus.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "closeDropDownOnBlur", optionValue: boolean): void;
 
 	/**
 	 * Gets the delay duration before processing the changes in the input. Useful to boost performance by lowering the count of selection, filtering, auto complete and highlighting operations executed on each input change.
+	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "delayInputChangeProcessing"): number;
 
 	/**
 	 * Sets the delay duration before processing the changes in the input. Useful to boost performance by lowering the count of selection, filtering, auto complete and highlighting operations executed on each input change.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "delayInputChangeProcessing", optionValue: number): void;
 
 	/**
 	 * Gets/Sets tabIndex for the field of the combo.
+	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "tabIndex"): number;
 
 	/**
 	 * /Sets tabIndex for the field of the combo.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "tabIndex", optionValue: number): void;
 
 	/**
 	 * Gets/Sets ability to show the drop-down list when the combo is in focus. This option has effect only if the combo is in editable [mode](ui.igcombo#options:mode).
+	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "dropDownOnFocus"): boolean;
 
 	/**
 	 * /Sets ability to show the drop-down list when the combo is in focus. This option has effect only if the combo is in editable [mode](ui.igcombo#options:mode).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "dropDownOnFocus", optionValue: boolean): void;
 
 	/**
 	 * Gets  ability to close drop-down list when single item in the list is selected with mouse click or enter press. The default value when [multiSelection](ui.igcombo#options:multiSelection) is enabled will be false. This option will not close the drop down when [multiSelection](ui.igcombo#options:multiSelection) is enabled and additive selection is performed.
+	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "closeDropDownOnSelect"): boolean;
 
 	/**
 	 * Sets ability to close drop-down list when single item in the list is selected with mouse click or enter press. The default value when [multiSelection](ui.igcombo#options:multiSelection) is enabled will be false. This option will not close the drop down when [multiSelection](ui.igcombo#options:multiSelection) is enabled and additive selection is performed.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "closeDropDownOnSelect", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets ability to select items by space button press.
+	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "selectItemBySpaceKey"): boolean;
 
 	/**
 	 * /Sets ability to select items by space button press.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "selectItemBySpaceKey", optionValue: boolean): void;
@@ -22037,6 +23468,7 @@ interface JQuery {
 	/**
 	 * Gets/Sets list of items to be selected when the combo is initialized. It should contain array of objects with index or value property, then on initialization the matching items will be selected. If initialSelectedItems are not set, the combo is with single selection and it is in a dropdown, readonly or readonlylist [mode](ui.igcombo#options:mode), the first item will be automatically selected.
 	 * Note: Only items loaded on initialization can be selected. When using [load on demand](ui.igCombo#options:loadOnDemandSettings), selecting an item which is not loaded yet will fail.
+	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "initialSelectedItems"): IgComboInitialSelectedItem[];
 
@@ -22044,18 +23476,21 @@ interface JQuery {
 	 * /Sets list of items to be selected when the combo is initialized. It should contain array of objects with index or value property, then on initialization the matching items will be selected. If initialSelectedItems are not set, the combo is with single selection and it is in a dropdown, readonly or readonlylist [mode](ui.igcombo#options:mode), the first item will be automatically selected.
 	 * Note: Only items loaded on initialization can be selected. When using [load on demand](ui.igCombo#options:loadOnDemandSettings), selecting an item which is not loaded yet will fail.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "initialSelectedItems", optionValue: IgComboInitialSelectedItem[]): void;
 
 	/**
 	 * Gets/Sets ability to prevent submitting form on enter key press.
+	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "preventSubmitOnEnter"): boolean;
 
 	/**
 	 * /Sets ability to prevent submitting form on enter key press.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "preventSubmitOnEnter", optionValue: boolean): void;
@@ -22069,6 +23504,7 @@ interface JQuery {
 	 * Custom values can be something like "currency", "percent", "dateLong", "time", "MMM-dd-yyyy H:mm tt", etc.
 	 *
 	 * Custom format strings should match the data type in "textKey" column.
+	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "format"): string;
 
@@ -22082,6 +23518,7 @@ interface JQuery {
 	 *
 	 * Custom format strings should match the data type in "textKey" column.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "format", optionValue: string): void;
@@ -22089,6 +23526,7 @@ interface JQuery {
 	/**
 	 * Gets/Sets whether the onscreen keyboard should be shown when the dropdown button is clicked (touch devices only).
 	 * Note: The keyboard will still show when the combo input is focused in editable mode.
+	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "suppressKeyboard"): boolean;
 
@@ -22096,6 +23534,7 @@ interface JQuery {
 	 * /Sets whether the onscreen keyboard should be shown when the dropdown button is clicked (touch devices only).
 	 * Note: The keyboard will still show when the combo input is focused in editable mode.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "suppressKeyboard", optionValue: boolean): void;
@@ -22103,6 +23542,7 @@ interface JQuery {
 	/**
 	 * Gets whether the clear button should be rendered.
 	 * When the [mode](ui.igcombo#options:mode) is single selection, readonly or readonlylist this option will default to false. It can still be enabled when it is specifically set to true.
+	 *
 	 */
 	igCombo(optionLiteral: 'option', optionName: "enableClearButton"): boolean;
 
@@ -22110,12 +23550,14 @@ interface JQuery {
 	 * Sets whether the clear button should be rendered.
 	 * When the [mode](ui.igcombo#options:mode) is single selection, readonly or readonlylist this option will default to false. It can still be enabled when it is specifically set to true.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCombo(optionLiteral: 'option', optionName: "enableClearButton", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets drop-down list orientation when open button is clicked.
+	 *
 	 */
 
 	igCombo(optionLiteral: 'option', optionName: "dropDownOrientation"): string;
@@ -22123,11 +23565,42 @@ interface JQuery {
 	/**
 	 * /Sets drop-down list orientation when open button is clicked.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
 	igCombo(optionLiteral: 'option', optionName: "dropDownOrientation", optionValue: string): void;
 
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	igCombo(optionLiteral: 'option', optionName: "language"): string;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCombo(optionLiteral: 'option', optionName: "language", optionValue: string): void;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+
+	igCombo(optionLiteral: 'option', optionName: "regional"): string|Object;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igCombo(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
+
 	/**
 	 * Event which is raised after rendering of the combo completes.
 	 *
@@ -22416,31 +23889,37 @@ interface JQuery {
 interface IgDialogLocale {
 	/**
 	 * Gets/Sets the title/tooltip for the close button in the dialog.
+	 *
 	 */
 	closeButtonTitle?: string;
 
 	/**
 	 * Gets/Sets the title/tooltip for the minimize button in the dialog.
+	 *
 	 */
 	minimizeButtonTitle?: string;
 
 	/**
 	 * Gets/Sets the title/tooltip for the maximize button in the dialog.
+	 *
 	 */
 	maximizeButtonTitle?: string;
 
 	/**
 	 * Gets/Sets the title/tooltip for the pin button in the dialog.
+	 *
 	 */
 	pinButtonTitle?: string;
 
 	/**
 	 * Gets/Sets the title/tooltip for the pin button in the dialog.
+	 *
 	 */
 	unpinButtonTitle?: string;
 
 	/**
 	 * Gets/Sets the title/tooltip for the restore button in the dialog.
+	 *
 	 */
 	restoreButtonTitle?: string;
 
@@ -22456,29 +23935,29 @@ interface StateChangingEvent {
 
 interface StateChangingEventUIParam {
 	/**
-	 * Used to obtain a reference to the igDialog.
+	 * Gets a reference to the igDialog widget.
 	 */
 	owner?: any;
 
 	/**
-	 * Used ton to obtain the name of the button, which triggered the event. Note: if the state was modified from the code, then "button" is undefined.
+	 * Gets the name of the button, which triggered the event. Note: if the state was modified from the code, then "button" is undefined.
 	 */
-	button?: any;
+	button?: string;
 
 	/**
-	 * Used to obtain the old state of the dialog, which can be one of the following: "opened", "minimized", "maximized", "closed".
+	 * Gets the old state of the dialog, which can be one of the following: "opened", "minimized", "maximized", "closed".
 	 */
-	oldState?: any;
+	oldState?: string;
 
 	/**
-	 * Used to obtain the boolean value of the old pin state of the dialog.
+	 * Gets the boolean value of the old pin state of the dialog.
 	 */
-	oldPinned?: any;
+	oldPinned?: boolean;
 
 	/**
-	 * Used to obtain the name of the action. That can be one of the following:
+	 * Gets the name of the action. That can be one of the following: "open" - request to open the dialog. "close" - request to close the dialog. "minimize" - request to minimize the dialog. "maximize" - request to maximize the dialog. "restore" - request to restore the dialog from minimized or maximized state. "pin" - request to pin the dialog. "unpin" - request to unpin the dialog.
 	 */
-	action?: any;
+	action?: string;
 }
 
 interface StateChangedEvent {
@@ -22487,29 +23966,29 @@ interface StateChangedEvent {
 
 interface StateChangedEventUIParam {
 	/**
-	 * Used to obtain a reference to the igDialog.
+	 * Gets a reference to the igDialog widget.
 	 */
 	owner?: any;
 
 	/**
-	 * Used ton to obtain the name of the button, which triggered the event. Note: if the state was modified from the code, then "button" is undefined.
+	 * Gets the name of the button, which triggered the event. Note: if the state was modified from the code, then "button" is undefined.
 	 */
-	button?: any;
+	button?: string;
 
 	/**
-	 * Used to obtain the old state of the dialog, which can be one of the following: "opened", "minimized", "maximized", "closed".
+	 * Gets the old state of the dialog, which can be one of the following: "opened", "minimized", "maximized", "closed".
 	 */
-	oldState?: any;
+	oldState?: string;
 
 	/**
-	 * Used to obtain the boolean value of the old pin state of the dialog.
+	 * Gets the boolean value of the old pin state of the dialog.
 	 */
-	oldPinned?: any;
+	oldPinned?: boolean;
 
 	/**
-	 * Used to obtain the name of the action. That can be one of the following:
+	 * Gets the name of the action. That can be one of the following: "open" - the dialog was opened. Note: the event is raised before a possible "openAnimation" started. "close" - the dialog was closed. Note: the event is raised before a possible "closeAnimation" started. "minimize" - the dialog was minimized. "maximize" - the dialog was maximized. "restore" - the dialog was restored from minimized or maximized state. "pin" - the dialog was pinned. "unpin" - the dialog was unpinned.
 	 */
-	action?: any;
+	action?: string;
 }
 
 interface AnimationEndedEvent {
@@ -22518,14 +23997,29 @@ interface AnimationEndedEvent {
 
 interface AnimationEndedEventUIParam {
 	/**
-	 * Used to obtain a reference to the igDialog.
+	 * Gets a reference to the igDialog widget.
 	 */
 	owner?: any;
 
 	/**
-	 * Used to obtain the name of the action, which triggered the animation.
+	 * Gets the name of the button, which triggered the event. Note: if the state was modified from the code, then "button" is undefined.
 	 */
-	action?: any;
+	button?: string;
+
+	/**
+	 * Gets the old state of the dialog, which can be one of the following: "opened", "minimized", "maximized", "closed".
+	 */
+	oldState?: string;
+
+	/**
+	 * Gets the boolean value of the old pin state of the dialog.
+	 */
+	oldPinned?: boolean;
+
+	/**
+	 * Gets the name of the action, which triggered the animation.
+	 */
+	action?: string;
 }
 
 interface IgFocusEvent {
@@ -22534,7 +24028,7 @@ interface IgFocusEvent {
 
 interface IgFocusEventUIParam {
 	/**
-	 * Used to obtain a reference to the igDialog.
+	 * Gets a reference to the igDialog widget.
 	 */
 	owner?: any;
 }
@@ -22545,7 +24039,7 @@ interface BlurEvent {
 
 interface BlurEventUIParam {
 	/**
-	 * Used to obtain a reference to the igDialog.
+	 * Gets a reference to the igDialog widget.
 	 */
 	owner?: any;
 }
@@ -22558,12 +24052,14 @@ interface IgDialog {
 	 * 2. It should not have parent.
 	 * 3. It should not contain attributes which might destroy layout or appearance of the dialog.
 	 * 4. Change of that option is not supported.
+	 *
 	 */
 	mainElement?: Element;
 
 	/**
 	 * Gets/Sets the state of the dialog.Note: when the dialog is modal, then pinned and minimized states are not supported, because that will trigger misbehavior.
 	 *
+	 *
 	 * Valid values:
 	 * "opened" The dialog is opened.
 	 * "minimized" The dialog is minimized.
@@ -22579,66 +24075,79 @@ interface IgDialog {
 	 * Notes:
 	 * 1. If the parent element of the original target-element is invisible, then the pinned dialog becomes invisible as well.
 	 * 2. Pinned state is not supported for modal dialog.
+	 *
 	 */
 	pinned?: boolean;
 
 	/**
 	 * Gets/Sets whether the dialog should close when Esc key is pressed.
+	 *
 	 */
 	closeOnEscape?: boolean;
 
 	/**
 	 * Gets/Sets whether the close button in the dialog header should be visible.
+	 *
 	 */
 	showCloseButton?: boolean;
 
 	/**
 	 * Gets/Sets whether the maximize button in the dialog header should be visible.
+	 *
 	 */
 	showMaximizeButton?: boolean;
 
 	/**
 	 * Gets/Sets whether the minimize button in the dialog header should be visible.
+	 *
 	 */
 	showMinimizeButton?: boolean;
 
 	/**
 	 * Gets/Sets whether the pin button in the dialog header should be visible.
+	 *
 	 */
 	showPinButton?: boolean;
 
 	/**
 	 * Gets/Sets whether the dialog will be pinned on minimize.
+	 *
 	 */
 	pinOnMinimized?: boolean;
 
 	/**
 	 * Gets the name of the css class which is applied to the SPAN element located on the left side of the header.
+	 *
 	 */
 	imageClass?: string;
 
 	/**
 	 * Gets/Sets the text which appears in the header of the dialog.
+	 *
 	 */
 	headerText?: string;
 
 	/**
 	 * Gets/Sets whether the dialog header should be visible.
+	 *
 	 */
 	showHeader?: boolean;
 
 	/**
 	 * Gets/Sets whether the dialog footer should be visible.
+	 *
 	 */
 	showFooter?: boolean;
 
 	/**
 	 * Gets/Sets the text which appears in the footer of the dialog.
+	 *
 	 */
 	footerText?: string;
 
 	/**
 	 * Gets the name of the css class which is applied to the main DIV element of the dialog.
+	 *
 	 */
 	dialogClass?: string;
 
@@ -22647,74 +24156,88 @@ interface IgDialog {
 	 * That can be reference to html element, jquery selector or jquery object.
 	 * By default the parent form of the original target element is used. If a form is not found, then the body is used.
 	 * Note: If the "position" of the container is not set or it is "static", then the position is set to "relative".
+	 *
 	 */
 	container?: any;
 
 	/**
 	 * Gets/Sets the initial height of the dialog in pixels for normal state.Besides numeric values, following units are supported: "px", "em" and "%".
 	 * In case of "%", the size of browser window is used and it has effect only on open action.
+	 *
 	 */
 	height?: number|string;
 
 	/**
 	 * Gets/Sets the initial width of the dialog in pixels for normal state.Besides numeric values, following units are supported: "px", "em" and "%".
 	 * In case of "%", the size of browser window is used and it has effect only on open action.
+	 *
 	 */
 	width?: number|string;
 
 	/**
 	 * Gets/Sets the minimal height of the dialog in normal state.
+	 *
 	 */
 	minHeight?: number;
 
 	/**
 	 * Gets/Sets the minimal width of the dialog in normal state.
+	 *
 	 */
 	minWidth?: number;
 
 	/**
 	 * Gets/Sets the maximal height of the dialog in normal state. Note: that option has effect only while resizing the dialog by the end user.
+	 *
 	 */
 	maxHeight?: number;
 
 	/**
 	 * Gets/Sets the maximal width of the dialog in normal state. Note: that option has effect only while resizing the dialog by the end user.
+	 *
 	 */
 	maxWidth?: number;
 
 	/**
 	 * Gets/Sets whether the dialog can be dragged by the user.
+	 *
 	 */
 	draggable?: boolean;
 
 	/**
 	 * Gets/Sets the initial position of the dialog. That should be an object, which contains "top" and "left" members or an object
 	 * supported by jquery.position(param) method. Examples: { left: 100, top: 200 }, { my: "left top", at: "left top", offset: "100 200" }
+	 *
 	 */
 	position?: any;
 
 	/**
 	 * Gets/Sets whether the dialog can be resized by the user.
+	 *
 	 */
 	resizable?: boolean;
 
 	/**
 	 * Gets/Sets the value for the tabIndex attribute applied to the main html element of the dialog.
+	 *
 	 */
 	tabIndex?: number;
 
 	/**
 	 * Gets/Sets the animation applied to the dialog when it is opened. That can be any object supported by the jquery show(param) method.
+	 *
 	 */
 	openAnimation?: any;
 
 	/**
 	 * Gets/Sets the animation applied to the dialog when it is closed. That can be any object supported by the jquery hide(param) method.
+	 *
 	 */
 	closeAnimation?: any;
 
 	/**
 	 * Gets/Sets the value of zIndex applied to the main html element of the dialog. If value is not set, then 1000 is used.
+	 *
 	 */
 	zIndex?: number;
 
@@ -22722,6 +24245,7 @@ interface IgDialog {
 	 * Gets/Sets the modal state of the dialog.
 	 * If there are more than 1 modal igDialog, then the last opened dialog wins and becomes on the top.
 	 * Note: the modal functionality is not supported when the dialog is minimized or pinned, because that will trigger misbehavior.
+	 *
 	 */
 	modal?: boolean;
 
@@ -22731,6 +24255,7 @@ interface IgDialog {
 	 * If that option is enabled, then focus and blur event handlers are added to all the child elements of the dialog.
 	 * If the dialog is modal or it can be maximized, then it is not recommended to disable that option.
 	 * If that option is modified after the igDialog was already created, then depending on current state of the dialog, it will be temporary closed-opened or opened-closed.
+	 *
 	 */
 	trackFocus?: boolean;
 
@@ -22773,11 +24298,13 @@ interface IgDialog {
 
 	/**
 	 * Gets/Sets the temporary value for src, which is used while changing the parent of the base element if it is an instance of IFRAME. That allows getting around possible JavaScript exceptions under IE.
+	 *
 	 */
 	temporaryUrl?: string;
 
 	/**
 	 * Gets/Sets the ability to adjust the state of the header depending on focused and not-focused states. Note: the "trackFocus" option should be enabled.
+	 *
 	 */
 	enableHeaderFocus?: boolean;
 
@@ -22785,76 +24312,45 @@ interface IgDialog {
 	 * Gets/Sets the processing of the double-click on the dialog-header.If this option is not false and dialog was minimized, then its state will be set to normal.
 	 * If this option is set to "auto" and showMaximizeButton is enabled or if this option is set to true, then the dialog will be maximized when it was in normal state,
 	 * and dialog-state will be set to normal if it was maximized.
+	 *
 	 */
 	enableDblclick?: any;
 
 	/**
-	 * Event which is raised before the state of dialog was changed.
-	 * Return false in order to cancel action.
+	 * Set/Get the locale language setting for the widget.
 	 *
-	 * The function takes arguments "evt" and "ui".
-	 * Use evt to obtain the browser event. That parameter can be null if the state was modified from the code.
-	 * Use ui.owner to obtain a reference to the igDialog.
-	 * Use ui.button to obtain the name of the button, which triggered the event. Note: if the state was modified from the code, then "button" is undefined.
-	 * Use ui.oldState to obtain the old state of the dialog, which can be one of the following: "opened", "minimized", "maximized", "closed".
-	 * Use ui.oldPinned to obtain the boolean value of the old pin state of the dialog.
-	 * Use ui.action to obtain the name of the action. That can be one of the following:
-	 * "open" - request to open the dialog
-	 * "close" - request to close the dialog
-	 * "minimize" - request to minimize the dialog
-	 * "maximize" - request to maximize the dialog
-	 * "restore" - request to restore the dialog from minimized or maximized state
-	 * "pin" - request to pin the dialog
-	 * "unpin" - request to unpin the dialog
+	 */
+	language?: string;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+	regional?: string|Object;
+
+	/**
+	 * Event which is raised before the state of the dialog was changed.
+	 * Return false in order to cancel the action.
 	 */
 	stateChanging?: StateChangingEvent;
 
 	/**
 	 * Event which is raised after the state of the dialog was changed.
-	 *
-	 * The function takes arguments "evt" and "ui".
-	 * Use evt to obtain the browser event. That parameter can be null if the state was modified from the code.
-	 * Use ui.owner to obtain a reference to the igDialog.
-	 * Use ui.button to obtain the name of the button, which triggered the event. Note: if the state was modified from the code, then "button" is undefined.
-	 * Use ui.oldState to obtain the old state of the dialog, which can be one of the following: "opened", "minimized", "maximized", "closed".
-	 * Use ui.oldPinned to obtain the boolean value of the old pin state of the dialog.
-	 * Use ui.action to obtain the name of the action. That can be one of the following:
-	 * "open" - the dialog was opened. Note: the event is raised before a possible "openAnimation" started.
-	 * "close" - the dialog was closed. Note: the event is raised before a possible "closeAnimation" started.
-	 * "minimize" - the dialog was minimized
-	 * "maximize" - the dialog was maximized
-	 * "restore" - the dialog was restored from minimized or maximized state
-	 * "pin" - the dialog was pinned
-	 * "unpin" - the dialog was unpinned
 	 */
 	stateChanged?: StateChangedEvent;
 
 	/**
-	 * Event which is raised after the end of the animation when the dialod was closed or opened.
-	 *
-	 * The function takes arguments "evt" and "ui".
-	 * Use ui.owner to obtain a reference to the igDialog.
-	 * Use ui.action to obtain the name of the action, which triggered the animation.
-	 * "open" - the dialog was opened
-	 * "close" - the dialog was closed
+	 * Event which is raised after the end of the animation when the dialog was closed or opened.
 	 */
 	animationEnded?: AnimationEndedEvent;
 
 	/**
 	 * Event which is raised when the dialog or its content gets focus.
-	 *
-	 * The function takes arguments "evt" and "ui".
-	 * Use evt to obtain the browser event.
-	 * Use ui.owner to obtain a reference to the igDialog.
 	 */
 	focus?: IgFocusEvent;
 
 	/**
 	 * Event which is raised when the dialog or its content loses focus.
-	 *
-	 * The function takes arguments "evt" and "ui".
-	 * Use evt to obtain the browser event.
-	 * Use ui.owner to obtain a reference to the igDialog.
 	 */
 	blur?: BlurEvent;
 
@@ -22957,7 +24453,22 @@ interface IgDialogMethods {
 	 * @param newContent The new html content provided as a string. If the parameter is provided then the method acts as a setter.
 	 */
 	content(newContent?: string): Object;
+
+	/**
+	 * Changes the all locales into the widget element to the language specified in [options.language](ui.igdialog#options:language)
+	 * Note that this method is for rare scenarios, see [language](ui.igdialog#options:language) or [locale](ui.igdialog#options:locale) option setter
+	 */
 	changeLocale(): void;
+
+	/**
+	 * Changes the widget language to global language. Global language is the value in $.ig.util.language
+	 */
+	changeGlobalLanguage(): void;
+
+	/**
+	 * Changes the widget regional settins to global regional settings. Global regional settings are container in $.ig.util.regional
+	 */
+	changeGlobalRegional(): void;
 }
 interface JQuery {
 	data(propertyName: "igDialog"): IgDialogMethods;
@@ -22979,6 +24490,8 @@ interface JQuery {
 	igDialog(methodName: "moveToTop", e?: Object): Object;
 	igDialog(methodName: "content", newContent?: string): Object;
 	igDialog(methodName: "changeLocale"): void;
+	igDialog(methodName: "changeGlobalLanguage"): void;
+	igDialog(methodName: "changeGlobalRegional"): void;
 
 	/**
 	 * Gets the jquery DIV object which is used as the main container for the dialog.
@@ -22987,6 +24500,7 @@ interface JQuery {
 	 * 2. It should not have parent.
 	 * 3. It should not contain attributes which might destroy layout or appearance of the dialog.
 	 * 4. Change of that option is not supported.
+	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "mainElement"): Element;
 
@@ -22998,12 +24512,14 @@ interface JQuery {
 	 * 3. It should not contain attributes which might destroy layout or appearance of the dialog.
 	 * 4. Change of that option is not supported.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "mainElement", optionValue: Element): void;
 
 	/**
 	 * Gets/Sets the state of the dialog.Note: when the dialog is modal, then pinned and minimized states are not supported, because that will trigger misbehavior.
+	 *
 	 */
 
 	igDialog(optionLiteral: 'option', optionName: "state"): string;
@@ -23011,6 +24527,7 @@ interface JQuery {
 	/**
 	 * /Sets the state of the dialog.Note: when the dialog is modal, then pinned and minimized states are not supported, because that will trigger misbehavior.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -23023,6 +24540,7 @@ interface JQuery {
 	 * Notes:
 	 * 1. If the parent element of the original target-element is invisible, then the pinned dialog becomes invisible as well.
 	 * 2. Pinned state is not supported for modal dialog.
+	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "pinned"): boolean;
 
@@ -23034,150 +24552,175 @@ interface JQuery {
 	 * 1. If the parent element of the original target-element is invisible, then the pinned dialog becomes invisible as well.
 	 * 2. Pinned state is not supported for modal dialog.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "pinned", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets whether the dialog should close when Esc key is pressed.
+	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "closeOnEscape"): boolean;
 
 	/**
 	 * /Sets whether the dialog should close when Esc key is pressed.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "closeOnEscape", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets whether the close button in the dialog header should be visible.
+	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "showCloseButton"): boolean;
 
 	/**
 	 * /Sets whether the close button in the dialog header should be visible.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "showCloseButton", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets whether the maximize button in the dialog header should be visible.
+	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "showMaximizeButton"): boolean;
 
 	/**
 	 * /Sets whether the maximize button in the dialog header should be visible.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "showMaximizeButton", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets whether the minimize button in the dialog header should be visible.
+	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "showMinimizeButton"): boolean;
 
 	/**
 	 * /Sets whether the minimize button in the dialog header should be visible.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "showMinimizeButton", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets whether the pin button in the dialog header should be visible.
+	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "showPinButton"): boolean;
 
 	/**
 	 * /Sets whether the pin button in the dialog header should be visible.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "showPinButton", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets whether the dialog will be pinned on minimize.
+	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "pinOnMinimized"): boolean;
 
 	/**
 	 * /Sets whether the dialog will be pinned on minimize.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "pinOnMinimized", optionValue: boolean): void;
 
 	/**
 	 * Gets the name of the css class which is applied to the SPAN element located on the left side of the header.
+	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "imageClass"): string;
 
 	/**
 	 * The name of the css class which is applied to the SPAN element located on the left side of the header.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "imageClass", optionValue: string): void;
 
 	/**
 	 * Gets/Sets the text which appears in the header of the dialog.
+	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "headerText"): string;
 
 	/**
 	 * /Sets the text which appears in the header of the dialog.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "headerText", optionValue: string): void;
 
 	/**
 	 * Gets/Sets whether the dialog header should be visible.
+	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "showHeader"): boolean;
 
 	/**
 	 * /Sets whether the dialog header should be visible.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "showHeader", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets whether the dialog footer should be visible.
+	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "showFooter"): boolean;
 
 	/**
 	 * /Sets whether the dialog footer should be visible.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "showFooter", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the text which appears in the footer of the dialog.
+	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "footerText"): string;
 
 	/**
 	 * /Sets the text which appears in the footer of the dialog.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "footerText", optionValue: string): void;
 
 	/**
 	 * Gets the name of the css class which is applied to the main DIV element of the dialog.
+	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "dialogClass"): string;
 
 	/**
 	 * The name of the css class which is applied to the main DIV element of the dialog.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "dialogClass", optionValue: string): void;
@@ -23187,6 +24730,7 @@ interface JQuery {
 	 * That can be reference to html element, jquery selector or jquery object.
 	 * By default the parent form of the original target element is used. If a form is not found, then the body is used.
 	 * Note: If the "position" of the container is not set or it is "static", then the position is set to "relative".
+	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "container"): any;
 
@@ -23196,6 +24740,7 @@ interface JQuery {
 	 * By default the parent form of the original target element is used. If a form is not found, then the body is used.
 	 * Note: If the "position" of the container is not set or it is "static", then the position is set to "relative".
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "container", optionValue: any): void;
@@ -23203,6 +24748,7 @@ interface JQuery {
 	/**
 	 * Gets/Sets the initial height of the dialog in pixels for normal state.Besides numeric values, following units are supported: "px", "em" and "%".
 	 * In case of "%", the size of browser window is used and it has effect only on open action.
+	 *
 	 */
 
 	igDialog(optionLiteral: 'option', optionName: "height"): number|string;
@@ -23211,6 +24757,7 @@ interface JQuery {
 	 * /Sets the initial height of the dialog in pixels for normal state.Besides numeric values, following units are supported: "px", "em" and "%".
 	 * In case of "%", the size of browser window is used and it has effect only on open action.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -23219,6 +24766,7 @@ interface JQuery {
 	/**
 	 * Gets/Sets the initial width of the dialog in pixels for normal state.Besides numeric values, following units are supported: "px", "em" and "%".
 	 * In case of "%", the size of browser window is used and it has effect only on open action.
+	 *
 	 */
 
 	igDialog(optionLiteral: 'option', optionName: "width"): number|string;
@@ -23227,6 +24775,7 @@ interface JQuery {
 	 * /Sets the initial width of the dialog in pixels for normal state.Besides numeric values, following units are supported: "px", "em" and "%".
 	 * In case of "%", the size of browser window is used and it has effect only on open action.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -23234,60 +24783,70 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the minimal height of the dialog in normal state.
+	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "minHeight"): number;
 
 	/**
 	 * /Sets the minimal height of the dialog in normal state.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "minHeight", optionValue: number): void;
 
 	/**
 	 * Gets/Sets the minimal width of the dialog in normal state.
+	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "minWidth"): number;
 
 	/**
 	 * /Sets the minimal width of the dialog in normal state.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "minWidth", optionValue: number): void;
 
 	/**
 	 * Gets/Sets the maximal height of the dialog in normal state. Note: that option has effect only while resizing the dialog by the end user.
+	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "maxHeight"): number;
 
 	/**
 	 * /Sets the maximal height of the dialog in normal state. Note: that option has effect only while resizing the dialog by the end user.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "maxHeight", optionValue: number): void;
 
 	/**
 	 * Gets/Sets the maximal width of the dialog in normal state. Note: that option has effect only while resizing the dialog by the end user.
+	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "maxWidth"): number;
 
 	/**
 	 * /Sets the maximal width of the dialog in normal state. Note: that option has effect only while resizing the dialog by the end user.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "maxWidth", optionValue: number): void;
 
 	/**
 	 * Gets/Sets whether the dialog can be dragged by the user.
+	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "draggable"): boolean;
 
 	/**
 	 * /Sets whether the dialog can be dragged by the user.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "draggable", optionValue: boolean): void;
@@ -23295,6 +24854,7 @@ interface JQuery {
 	/**
 	 * Gets/Sets the initial position of the dialog. That should be an object, which contains "top" and "left" members or an object
 	 * supported by jquery.position(param) method. Examples: { left: 100, top: 200 }, { my: "left top", at: "left top", offset: "100 200" }
+	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "position"): any;
 
@@ -23302,66 +24862,77 @@ interface JQuery {
 	 * /Sets the initial position of the dialog. That should be an object, which contains "top" and "left" members or an object
 	 * supported by jquery.position(param) method. Examples: { left: 100, top: 200 }, { my: "left top", at: "left top", offset: "100 200" }
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "position", optionValue: any): void;
 
 	/**
 	 * Gets/Sets whether the dialog can be resized by the user.
+	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "resizable"): boolean;
 
 	/**
 	 * /Sets whether the dialog can be resized by the user.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "resizable", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the value for the tabIndex attribute applied to the main html element of the dialog.
+	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "tabIndex"): number;
 
 	/**
 	 * /Sets the value for the tabIndex attribute applied to the main html element of the dialog.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "tabIndex", optionValue: number): void;
 
 	/**
 	 * Gets/Sets the animation applied to the dialog when it is opened. That can be any object supported by the jquery show(param) method.
+	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "openAnimation"): any;
 
 	/**
 	 * /Sets the animation applied to the dialog when it is opened. That can be any object supported by the jquery show(param) method.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "openAnimation", optionValue: any): void;
 
 	/**
 	 * Gets/Sets the animation applied to the dialog when it is closed. That can be any object supported by the jquery hide(param) method.
+	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "closeAnimation"): any;
 
 	/**
 	 * /Sets the animation applied to the dialog when it is closed. That can be any object supported by the jquery hide(param) method.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "closeAnimation", optionValue: any): void;
 
 	/**
 	 * Gets/Sets the value of zIndex applied to the main html element of the dialog. If value is not set, then 1000 is used.
+	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "zIndex"): number;
 
 	/**
 	 * /Sets the value of zIndex applied to the main html element of the dialog. If value is not set, then 1000 is used.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "zIndex", optionValue: number): void;
@@ -23370,6 +24941,7 @@ interface JQuery {
 	 * Gets/Sets the modal state of the dialog.
 	 * If there are more than 1 modal igDialog, then the last opened dialog wins and becomes on the top.
 	 * Note: the modal functionality is not supported when the dialog is minimized or pinned, because that will trigger misbehavior.
+	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "modal"): boolean;
 
@@ -23378,6 +24950,7 @@ interface JQuery {
 	 * If there are more than 1 modal igDialog, then the last opened dialog wins and becomes on the top.
 	 * Note: the modal functionality is not supported when the dialog is minimized or pinned, because that will trigger misbehavior.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "modal", optionValue: boolean): void;
@@ -23388,6 +24961,7 @@ interface JQuery {
 	 * If that option is enabled, then focus and blur event handlers are added to all the child elements of the dialog.
 	 * If the dialog is modal or it can be maximized, then it is not recommended to disable that option.
 	 * If that option is modified after the igDialog was already created, then depending on current state of the dialog, it will be temporary closed-opened or opened-closed.
+	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "trackFocus"): boolean;
 
@@ -23398,6 +24972,7 @@ interface JQuery {
 	 * If the dialog is modal or it can be maximized, then it is not recommended to disable that option.
 	 * If that option is modified after the igDialog was already created, then depending on current state of the dialog, it will be temporary closed-opened or opened-closed.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "trackFocus", optionValue: boolean): void;
@@ -23490,24 +25065,28 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the temporary value for src, which is used while changing the parent of the base element if it is an instance of IFRAME. That allows getting around possible JavaScript exceptions under IE.
+	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "temporaryUrl"): string;
 
 	/**
 	 * /Sets the temporary value for src, which is used while changing the parent of the base element if it is an instance of IFRAME. That allows getting around possible JavaScript exceptions under IE.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "temporaryUrl", optionValue: string): void;
 
 	/**
 	 * Gets/Sets the ability to adjust the state of the header depending on focused and not-focused states. Note: the "trackFocus" option should be enabled.
+	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "enableHeaderFocus"): boolean;
 
 	/**
 	 * /Sets the ability to adjust the state of the header depending on focused and not-focused states. Note: the "trackFocus" option should be enabled.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "enableHeaderFocus", optionValue: boolean): void;
@@ -23516,6 +25095,7 @@ interface JQuery {
 	 * Gets/Sets the processing of the double-click on the dialog-header.If this option is not false and dialog was minimized, then its state will be set to normal.
 	 * If this option is set to "auto" and showMaximizeButton is enabled or if this option is set to true, then the dialog will be maximized when it was in normal state,
 	 * and dialog-state will be set to normal if it was maximized.
+	 *
 	 */
 	igDialog(optionLiteral: 'option', optionName: "enableDblclick"): any;
 
@@ -23524,49 +25104,50 @@ interface JQuery {
 	 * If this option is set to "auto" and showMaximizeButton is enabled or if this option is set to true, then the dialog will be maximized when it was in normal state,
 	 * and dialog-state will be set to normal if it was maximized.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "enableDblclick", optionValue: any): void;
 
 	/**
-	 * Event which is raised before the state of dialog was changed.
-	 * Return false in order to cancel action.
+	 * Set/Get the locale language setting for the widget.
 	 *
-	 * The function takes arguments "evt" and "ui".
-	 * Use evt to obtain the browser event. That parameter can be null if the state was modified from the code.
-	 * Use ui.owner to obtain a reference to the igDialog.
-	 * Use ui.button to obtain the name of the button, which triggered the event. Note: if the state was modified from the code, then "button" is undefined.
-	 * Use ui.oldState to obtain the old state of the dialog, which can be one of the following: "opened", "minimized", "maximized", "closed".
-	 * Use ui.oldPinned to obtain the boolean value of the old pin state of the dialog.
-	 * Use ui.action to obtain the name of the action. That can be one of the following:
-	 * "open" - request to open the dialog
-	 * "close" - request to close the dialog
-	 * "minimize" - request to minimize the dialog
-	 * "maximize" - request to maximize the dialog
-	 * "restore" - request to restore the dialog from minimized or maximized state
-	 * "pin" - request to pin the dialog
-	 * "unpin" - request to unpin the dialog
+	 */
+	igDialog(optionLiteral: 'option', optionName: "language"): string;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igDialog(optionLiteral: 'option', optionName: "language", optionValue: string): void;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+
+	igDialog(optionLiteral: 'option', optionName: "regional"): string|Object;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igDialog(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
+
+	/**
+	 * Event which is raised before the state of the dialog was changed.
+	 * Return false in order to cancel the action.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "stateChanging"): StateChangingEvent;
 
 	/**
-	 * Event which is raised before the state of dialog was changed.
-	 * Return false in order to cancel action.
-	 *
-	 * The function takes arguments "evt" and "ui".
-	 * Use evt to obtain the browser event. That parameter can be null if the state was modified from the code.
-	 * Use ui.owner to obtain a reference to the igDialog.
-	 * Use ui.button to obtain the name of the button, which triggered the event. Note: if the state was modified from the code, then "button" is undefined.
-	 * Use ui.oldState to obtain the old state of the dialog, which can be one of the following: "opened", "minimized", "maximized", "closed".
-	 * Use ui.oldPinned to obtain the boolean value of the old pin state of the dialog.
-	 * Use ui.action to obtain the name of the action. That can be one of the following:
-	 * "open" - request to open the dialog
-	 * "close" - request to close the dialog
-	 * "minimize" - request to minimize the dialog
-	 * "maximize" - request to maximize the dialog
-	 * "restore" - request to restore the dialog from minimized or maximized state
-	 * "pin" - request to pin the dialog
-	 * "unpin" - request to unpin the dialog
+	 * Event which is raised before the state of the dialog was changed.
+	 * Return false in order to cancel the action.
 	 *
 	 * @optionValue Define event handler function.
 	 */
@@ -23574,65 +25155,23 @@ interface JQuery {
 
 	/**
 	 * Event which is raised after the state of the dialog was changed.
-	 *
-	 * The function takes arguments "evt" and "ui".
-	 * Use evt to obtain the browser event. That parameter can be null if the state was modified from the code.
-	 * Use ui.owner to obtain a reference to the igDialog.
-	 * Use ui.button to obtain the name of the button, which triggered the event. Note: if the state was modified from the code, then "button" is undefined.
-	 * Use ui.oldState to obtain the old state of the dialog, which can be one of the following: "opened", "minimized", "maximized", "closed".
-	 * Use ui.oldPinned to obtain the boolean value of the old pin state of the dialog.
-	 * Use ui.action to obtain the name of the action. That can be one of the following:
-	 * "open" - the dialog was opened. Note: the event is raised before a possible "openAnimation" started.
-	 * "close" - the dialog was closed. Note: the event is raised before a possible "closeAnimation" started.
-	 * "minimize" - the dialog was minimized
-	 * "maximize" - the dialog was maximized
-	 * "restore" - the dialog was restored from minimized or maximized state
-	 * "pin" - the dialog was pinned
-	 * "unpin" - the dialog was unpinned
 	 */
 	igDialog(optionLiteral: 'option', optionName: "stateChanged"): StateChangedEvent;
 
 	/**
 	 * Event which is raised after the state of the dialog was changed.
 	 *
-	 * The function takes arguments "evt" and "ui".
-	 * Use evt to obtain the browser event. That parameter can be null if the state was modified from the code.
-	 * Use ui.owner to obtain a reference to the igDialog.
-	 * Use ui.button to obtain the name of the button, which triggered the event. Note: if the state was modified from the code, then "button" is undefined.
-	 * Use ui.oldState to obtain the old state of the dialog, which can be one of the following: "opened", "minimized", "maximized", "closed".
-	 * Use ui.oldPinned to obtain the boolean value of the old pin state of the dialog.
-	 * Use ui.action to obtain the name of the action. That can be one of the following:
-	 * "open" - the dialog was opened. Note: the event is raised before a possible "openAnimation" started.
-	 * "close" - the dialog was closed. Note: the event is raised before a possible "closeAnimation" started.
-	 * "minimize" - the dialog was minimized
-	 * "maximize" - the dialog was maximized
-	 * "restore" - the dialog was restored from minimized or maximized state
-	 * "pin" - the dialog was pinned
-	 * "unpin" - the dialog was unpinned
-	 *
 	 * @optionValue Define event handler function.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "stateChanged", optionValue: StateChangedEvent): void;
 
 	/**
-	 * Event which is raised after the end of the animation when the dialod was closed or opened.
-	 *
-	 * The function takes arguments "evt" and "ui".
-	 * Use ui.owner to obtain a reference to the igDialog.
-	 * Use ui.action to obtain the name of the action, which triggered the animation.
-	 * "open" - the dialog was opened
-	 * "close" - the dialog was closed
+	 * Event which is raised after the end of the animation when the dialog was closed or opened.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "animationEnded"): AnimationEndedEvent;
 
 	/**
-	 * Event which is raised after the end of the animation when the dialod was closed or opened.
-	 *
-	 * The function takes arguments "evt" and "ui".
-	 * Use ui.owner to obtain a reference to the igDialog.
-	 * Use ui.action to obtain the name of the action, which triggered the animation.
-	 * "open" - the dialog was opened
-	 * "close" - the dialog was closed
+	 * Event which is raised after the end of the animation when the dialog was closed or opened.
 	 *
 	 * @optionValue Define event handler function.
 	 */
@@ -23640,40 +25179,24 @@ interface JQuery {
 
 	/**
 	 * Event which is raised when the dialog or its content gets focus.
-	 *
-	 * The function takes arguments "evt" and "ui".
-	 * Use evt to obtain the browser event.
-	 * Use ui.owner to obtain a reference to the igDialog.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "focus"): IgFocusEvent;
 
 	/**
 	 * Event which is raised when the dialog or its content gets focus.
 	 *
-	 * The function takes arguments "evt" and "ui".
-	 * Use evt to obtain the browser event.
-	 * Use ui.owner to obtain a reference to the igDialog.
-	 *
 	 * @optionValue Define event handler function.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "focus", optionValue: IgFocusEvent): void;
 
 	/**
 	 * Event which is raised when the dialog or its content loses focus.
-	 *
-	 * The function takes arguments "evt" and "ui".
-	 * Use evt to obtain the browser event.
-	 * Use ui.owner to obtain a reference to the igDialog.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "blur"): BlurEvent;
 
 	/**
 	 * Event which is raised when the dialog or its content loses focus.
 	 *
-	 * The function takes arguments "evt" and "ui".
-	 * Use evt to obtain the browser event.
-	 * Use ui.owner to obtain a reference to the igDialog.
-	 *
 	 * @optionValue Define event handler function.
 	 */
 	igDialog(optionLiteral: 'option', optionName: "blur", optionValue: BlurEvent): void;
@@ -23683,968 +25206,18 @@ interface JQuery {
 	igDialog(optionLiteral: 'option', optionName: string, optionValue: any): JQuery;
 	igDialog(methodName: string, ...methodParams: any[]): any;
 }
-interface IgDoughnutChartSeries {
-	/**
-	 * Gets or sets the current series type.
-	 *
-	 * Valid values:
-	 * "flat" Series has flat 1-dimensional data.
-	 */
-	type?: string;
-
-	/**
-	 * Whether the series should render a tooltip.
-	 */
-	showTooltip?: boolean;
-
-	/**
-	 * The name of template or the template itself that chart tooltip will use to render.
-	 */
-	tooltipTemplate?: string;
-
-	/**
-	 * Gets or sets the data source for the chart.
-	 */
-	itemsSource?: any;
-
-	/**
-	 * Gets or Sets the property name that contains the values.
-	 */
-	valueMemberPath?: string;
-
-	/**
-	 * Gets or sets the property name that contains the labels.
-	 */
-	labelMemberPath?: string;
-
-	/**
-	 * Gets or sets the property name that contains the legend labels.
-	 */
-	legendLabelMemberPath?: string;
-
-	/**
-	 * Gets or sets the position of chart labels.
-	 *
-	 * Valid values:
-	 * "none" No labels will be displayed.
-	 * "center" Labels will be displayed in the center.
-	 * "insideEnd" Labels will be displayed inside and by the edge of the container.
-	 * "outsideEnd" Labels will be displayed outside the container.
-	 * "bestFit" Labels will automatically decide their location.
-	 */
-	labelsPosition?: string;
-
-	/**
-	 * Gets or sets whether the leader lines are visible.
-	 *
-	 * Valid values:
-	 * "visible" Display the element.
-	 * "collapsed" Do not display the element.
-	 */
-	leaderLineVisibility?: string;
-
-	/**
-	 * Gets or sets the style for the leader lines.
-	 */
-	leaderLineStyle?: any;
-
-	/**
-	 * Gets or sets what type of leader lines will be used for the outside end labels.
-	 *
-	 * Valid values:
-	 * "straight" A straight line is drawn between the slice and its label.
-	 * "arc" A curved line is drawn between the slice and its label. The line follows makes a natural turn from the slice to the label.
-	 * "spline" A curved line is drawn between the slice and its label. The line starts radially from the slice and then turns to the label.
-	 */
-	leaderLineType?: string;
-
-	/**
-	 * Gets or sets the margin between a label and its leader line. The default is 6 pixels.
-	 */
-	leaderLineMargin?: number;
-
-	/**
-	 * Gets or sets the threshold value that determines if slices are grouped into the Others slice.
-	 */
-	othersCategoryThreshold?: number;
-
-	/**
-	 * Gets or sets whether to use numeric or percent-based threshold value.
-	 *
-	 * Valid values:
-	 * "number" Data value is compared directly to the value of OthersCategoryThreshold.
-	 * "percent" Data value is compared to OthersCategoryThreshold as a percentage of the total.
-	 */
-	othersCategoryType?: string;
-
-	/**
-	 * Gets or sets the label of the Others slice.
-	 */
-	othersCategoryText?: string;
-
-	/**
-	 * Gets or sets the legend used for the current chart.
-	 */
-	legend?: any;
-
-	/**
-	 * Sets or gets a function which takes an object that produces a formatted label for displaying in the chart.
-	 */
-	formatLabel?: any;
-
-	/**
-	 * Sets or gets a function which takes an object that produces a formatted label for displaying in the chart's legend.
-	 */
-	formatLegendLabel?: any;
-
-	/**
-	 * Gets or sets the pixel amount by which the labels are offset from the edge of the slices.
-	 */
-	labelExtent?: number;
-
-	/**
-	 * Gets or sets the starting angle of the chart.
-	 * The default zero value is equivalent to 3 o'clock.
-	 */
-	startAngle?: number;
-
-	/**
-	 * Gets or sets the style used when a slice is selected.
-	 */
-	selectedStyle?: any;
-
-	/**
-	 * Gets or sets the palette of brushes to use for coloring the slices.
-	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
-	 */
-	brushes?: any;
-
-	/**
-	 * Gets or sets the palette of brushes to use for outlines on the slices.
-	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
-	 */
-	outlines?: any;
-
-	/**
-	 * Gets or sets whether all surface interactions with the plot area should be disabled.
-	 */
-	isSurfaceInteractionDisabled?: any;
-
-	/**
-	 * Gets or sets the scaling factor of the chart's radius. Value between 0 and 1.
-	 */
-	radiusFactor?: number;
-
-	/**
-	 * Option for IgDoughnutChartSeries
-	 */
-	[optionName: string]: any;
-}
-
-interface HoleDimensionsChangedEvent {
-	(event: Event, ui: HoleDimensionsChangedEventUIParam): void;
-}
-
-interface HoleDimensionsChangedEventUIParam {}
-
-interface IgDoughnutChart {
-	/**
-	 * The width of the chart. It can be set as a number in pixels, string (px) or percentage (%).
-	 */
-	width?: string|number;
-
-	/**
-	 * The height of the chart. It can be set as a number in pixels, string (px) or percentage (%).
-	 */
-	height?: string|number;
-
-	/**
-	 * An array of series objects.
-	 */
-	series?: IgDoughnutChartSeries[];
-
-	/**
-	 * Gets or sets whether the slices can be selected.
-	 */
-	allowSliceSelection?: boolean;
-
-	/**
-	 * Gets or sets whether all surface interactions with the plot area should be disabled.
-	 */
-	isSurfaceInteractionDisabled?: any;
-
-	/**
-	 * Gets or sets whether the slices can be exploded.
-	 */
-	allowSliceExplosion?: boolean;
-
-	/**
-	 * Gets or sets the inner extent of the doughnut chart. It is percent from the outer ring's radius.
-	 */
-	innerExtent?: number;
-
-	/**
-	 * Gets or sets the style used when a slice is selected.
-	 */
-	selectedStyle?: any;
-
-	/**
-	 * Gets sets template for tooltip associated with chart item.
-	 * Example: "Value: $(ValueMemberPathInDataSource)"
-	 */
-	tooltipTemplate?: string;
-
-	/**
-	 * Gets sets maximum number of displayed records in chart.
-	 */
-	maxRecCount?: number;
-
-	/**
-	 * Gets sets a valid data source.
-	 * That can be instance of array or primitives, array of objects, instance of $.ig.DataSource, or any other data accepted by $.ig.DataSource.
-	 * Note: if it is set to string and "dataSourceType" option is not set, then $.ig.JSONPDataSource is used.
-	 */
-	dataSource?: any;
-
-	/**
-	 * Gets sets data source type (such as "json", "xml", etc). Please refer to the documentation of $.ig.DataSource and its type property
-	 */
-	dataSourceType?: string;
-
-	/**
-	 * Gets sets url which is used for sending JSON on request for remote data.
-	 */
-	dataSourceUrl?: string;
-
-	/**
-	 * See $.ig.DataSource. property in the response specifying the total number of records on the server.
-	 */
-	responseTotalRecCountKey?: string;
-
-	/**
-	 * See $.ig.DataSource. This is basically the property in the responses where data records are held, if the response is wrapped.
-	 */
-	responseDataKey?: string;
-
-	/**
-	 * Event fired when the mouse has hovered on a series and the tooltip is about to show
-	 * Function takes arguments evt and ui.
-	 * Use ui.element to get reference to tooltip DOM element.
-	 * Use ui.item to get reference to current series item object.
-	 * Use ui.chart to get reference to chart object.
-	 * Use ui.series to get reference to current series object.
-	 * Use ui.actualItemBrush to get item brush.
-	 * Use ui.actualSeriesBrush to get series brush.
-	 */
-	tooltipShowing?: TooltipShowingEvent;
-
-	/**
-	 * Event fired after a tooltip is shown
-	 * Function takes arguments evt and ui.
-	 * Use ui.element to get reference to tooltip DOM element.
-	 * Use ui.item to get reference to current series item object.
-	 * Use ui.chart to get reference to chart object.
-	 * Use ui.series to get reference to current series object.
-	 * Use ui.actualItemBrush to get item brush.
-	 * Use ui.actualSeriesBrush to get series brush.
-	 */
-	tooltipShown?: TooltipShownEvent;
-
-	/**
-	 * Event fired when the mouse has left a series and the tooltip is about to hide
-	 * Function takes arguments evt and ui.
-	 * Use ui.element to get reference to tooltip DOM element.
-	 * Use ui.item to get reference to current series item object.
-	 * Use ui.chart to get reference to chart object.
-	 * Use ui.series to get reference to current series object.
-	 * Use ui.actualItemBrush to get item brush.
-	 * Use ui.actualSeriesBrush to get series brush.
-	 */
-	tooltipHiding?: TooltipHidingEvent;
-
-	/**
-	 * Event fired after a tooltip is hidden
-	 * Function takes arguments evt and ui.
-	 * Use ui.element to get reference to tooltip DOM element.
-	 * Use ui.item to get reference to current series item object.
-	 * Use ui.chart to get reference to chart object.
-	 * Use ui.series to get reference to current series object.
-	 * Use ui.actualItemBrush to get item brush.
-	 * Use ui.actualSeriesBrush to get series brush.
-	 */
-	tooltipHidden?: TooltipHiddenEvent;
-
-	/**
-	 * Event fired when the control is displayed on a non HTML5 compliant browser
-	 */
-	browserNotSupported?: BrowserNotSupportedEvent;
-
-	/**
-	 * Raised when the slice is clicked.
-	 */
-	sliceClick?: SliceClickEvent;
-
-	/**
-	 * Raised when the dimensions (center point or radius) of the doughnut hole change.
-	 */
-	holeDimensionsChanged?: HoleDimensionsChangedEvent;
-
-	/**
-	 * Event which is raised before data binding.
-	 * Return false in order to cancel data binding.
-	 * Function takes first argument null and second argument ui.
-	 * Use ui.owner to obtain reference to chart widget.
-	 * Use ui.dataSource to obtain reference to instance of $.ig.DataSource.
-	 */
-	dataBinding?: DataBindingEvent;
-
-	/**
-	 * Event which is raised after data binding.
-	 * Function takes first argument null and second argument ui.
-	 * Use ui.owner to obtain reference to chart widget.
-	 * Use ui.data to obtain reference to array actual data which is displayed by chart.
-	 * Use ui.dataSource to obtain reference to instance of $.ig.DataSource.
-	 */
-	dataBound?: DataBoundEvent;
-
-	/**
-	 * Event which is raised before tooltip is updated.
-	 * Return false in order to cancel updating and hide tooltip.
-	 * Function takes first argument null and second argument ui.
-	 * Use ui.owner to obtain reference to chart widget.
-	 * Use ui.text to obtain html of tooltip. Value of that member can be modified. If modified value is null or empty string, then current content of tooltip keeps old value.
-	 * Use ui.item to obtain reference to item. Value of that member can be modified or replaced by custom item.
-	 * Use ui.x to obtain left position of tooltip in pixels relative to widget. Value of that member can be modified.
-	 * Use ui.y to obtain top position of tooltip in pixels relative to widget. Value of that member can be modified.
-	 * Use ui.element to obtain reference to jquery object which represents tooltip. Value of that member can be replaced by custom element.
-	 */
-	updateTooltip?: UpdateTooltipEvent;
-
-	/**
-	 * Event which is raised before tooltip is hidden.
-	 * Return false in order to cancel hiding and keep tooltip visible.
-	 * Function takes first argument null and second argument ui.
-	 * Use ui.owner to obtain reference to chart widget.
-	 * Use ui.item to obtain reference to item.
-	 * Use ui.element to obtain reference to jquery object which represents tooltip or value of ui.element from last updateTooltip event. Value of that member can be replaced by custom element.
-	 */
-	hideTooltip?: HideTooltipEvent;
-
-	/**
-	 * Option for igDoughnutChart
-	 */
-	[optionName: string]: any;
-}
-interface IgDoughnutChartMethods {
-	/**
-	 * Adds a new series to the doughnut chart.
-	 *
-	 * @param seriesObj The series object to be added.
-	 */
-	addSeries(seriesObj: Object): void;
-
-	/**
-	 * Removes the specified series from the doughnut chart.
-	 *
-	 * @param seriesObj The series object identifying the series to be removed.
-	 */
-	removeSeries(seriesObj: Object): void;
-
-	/**
-	 * Updates the series with the specified name with the specified new property values.
-	 *
-	 * @param value The series object identifying the series to be updated.
-	 */
-	updateSeries(value: Object): void;
-
-	/**
-	 * Returns the center of the doughnut chart.
-	 */
-	getCenterCoordinates(): Object;
-
-	/**
-	 * Returns the radius of the chart's hole.
-	 */
-	getHoleRadius(): number;
-
-	/**
-	 * Returns information about how the doughnut chart is rendered.
-	 */
-	exportVisualData(): Object;
-
-	/**
-	 * Causes all of the series that have pending changes e.g. by changed property values to be rendered immediately.
-	 */
-	flush(): void;
-
-	/**
-	 * Destroys the widget.
-	 */
-	destroy(): void;
-
-	/**
-	 * Returns data source of the series.
-	 *
-	 * @param series Optional. The series name. If not provided an array of series data sources is returned.
-	 */
-	getData(series: string): Object;
-
-	/**
-	 * Find index of item within actual data used by chart.
-	 *
-	 * @param item The reference to item.
-	 */
-	findIndexOfItem(item: Object): number;
-
-	/**
-	 * Get item within actual data used by chart. That is similar to this.getData()[ index ].
-	 *
-	 * @param index Index of data item.
-	 */
-	getDataItem(index: Object): Object;
-
-	/**
-	 * Adds a new item to the data source and notifies the chart.
-	 *
-	 * @param item The item that we want to add to the data source.
-	 */
-	addItem(item: Object): Object;
-
-	/**
-	 * Inserts a new item to the data source and notifies the chart.
-	 *
-	 * @param item the new item that we want to insert in the data source.
-	 * @param index The index in the data source where the new item will be inserted.
-	 */
-	insertItem(item: Object, index: number): Object;
-
-	/**
-	 * Deletes an item from the data source and notifies the chart.
-	 *
-	 * @param index The index in the data source from where the item will be been removed.
-	 */
-	removeItem(index: number): Object;
-
-	/**
-	 * Updates an item in the data source and notifies the chart.
-	 *
-	 * @param index The index of the item in the data source that we want to change.
-	 * @param item The new item object that will be set in the data source.
-	 */
-	setItem(index: number, item: Object): Object;
-
-	/**
-	 * Notifies the chart that an item has been set in an associated data source.
-	 *
-	 * @param dataSource The data source in which the change happened.
-	 * @param index The index in the items source that has been changed.
-	 * @param newItem the new item that has been set in the collection.
-	 * @param oldItem the old item that has been overwritten in the collection.
-	 */
-	notifySetItem(dataSource: Object, index: number, newItem: Object, oldItem: Object): Object;
-
-	/**
-	 * Notifies the chart that the items have been cleared from an associated data source.
-	 * It's not necessary to notify more than one target of a change if they share the same items source.
-	 *
-	 * @param dataSource The data source in which the change happened.
-	 */
-	notifyClearItems(dataSource: Object): Object;
-
-	/**
-	 * Notifies the target axis or series that an item has been inserted at the specified index in its data source.
-	 * It's not necessary to notify more than one target of a change if they share the same items source.
-	 *
-	 * @param dataSource The data source in which the change happened.
-	 * @param index The index in the items source where the new item has been inserted.
-	 * @param newItem the new item that has been set in the collection.
-	 */
-	notifyInsertItem(dataSource: Object, index: number, newItem: Object): Object;
-
-	/**
-	 * Notifies the target axis or series that an item has been removed from the specified index in its data source.
-	 * It's not necessary to notify more than one target of a change if they share the same items source.
-	 *
-	 * @param dataSource The data source in which the change happened.
-	 * @param index The index in the items source from where the old item has been removed.
-	 * @param oldItem the old item that has been removed from the collection.
-	 */
-	notifyRemoveItem(dataSource: Object, index: number, oldItem: Object): Object;
-
-	/**
-	 * Get reference to chart object.
-	 */
-	chart(): Object;
-
-	/**
-	 * Binds data to the chart
-	 */
-	dataBind(): void;
-}
-interface JQuery {
-	data(propertyName: "igDoughnutChart"): IgDoughnutChartMethods;
-}
-
-interface JQuery {
-	igDoughnutChart(methodName: "addSeries", seriesObj: Object): void;
-	igDoughnutChart(methodName: "removeSeries", seriesObj: Object): void;
-	igDoughnutChart(methodName: "updateSeries", value: Object): void;
-	igDoughnutChart(methodName: "getCenterCoordinates"): Object;
-	igDoughnutChart(methodName: "getHoleRadius"): number;
-	igDoughnutChart(methodName: "exportVisualData"): Object;
-	igDoughnutChart(methodName: "flush"): void;
-	igDoughnutChart(methodName: "destroy"): void;
-	igDoughnutChart(methodName: "getData", series: string): Object;
-	igDoughnutChart(methodName: "findIndexOfItem", item: Object): number;
-	igDoughnutChart(methodName: "getDataItem", index: Object): Object;
-	igDoughnutChart(methodName: "addItem", item: Object): Object;
-	igDoughnutChart(methodName: "insertItem", item: Object, index: number): Object;
-	igDoughnutChart(methodName: "removeItem", index: number): Object;
-	igDoughnutChart(methodName: "setItem", index: number, item: Object): Object;
-	igDoughnutChart(methodName: "notifySetItem", dataSource: Object, index: number, newItem: Object, oldItem: Object): Object;
-	igDoughnutChart(methodName: "notifyClearItems", dataSource: Object): Object;
-	igDoughnutChart(methodName: "notifyInsertItem", dataSource: Object, index: number, newItem: Object): Object;
-	igDoughnutChart(methodName: "notifyRemoveItem", dataSource: Object, index: number, oldItem: Object): Object;
-	igDoughnutChart(methodName: "chart"): Object;
-	igDoughnutChart(methodName: "dataBind"): void;
-
-	/**
-	 * The width of the chart. It can be set as a number in pixels, string (px) or percentage (%).
-	 */
-
-	igDoughnutChart(optionLiteral: 'option', optionName: "width"): string|number;
-
-	/**
-	 * The width of the chart. It can be set as a number in pixels, string (px) or percentage (%).
-	 *
-	 * @optionValue New value to be set.
-	 */
-
-	igDoughnutChart(optionLiteral: 'option', optionName: "width", optionValue: string|number): void;
-
-	/**
-	 * The height of the chart. It can be set as a number in pixels, string (px) or percentage (%).
-	 */
-
-	igDoughnutChart(optionLiteral: 'option', optionName: "height"): string|number;
-
-	/**
-	 * The height of the chart. It can be set as a number in pixels, string (px) or percentage (%).
-	 *
-	 * @optionValue New value to be set.
-	 */
-
-	igDoughnutChart(optionLiteral: 'option', optionName: "height", optionValue: string|number): void;
-
-	/**
-	 * An array of series objects.
-	 */
-	igDoughnutChart(optionLiteral: 'option', optionName: "series"): IgDoughnutChartSeries[];
-
-	/**
-	 * An array of series objects.
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igDoughnutChart(optionLiteral: 'option', optionName: "series", optionValue: IgDoughnutChartSeries[]): void;
-
-	/**
-	 * Gets  whether the slices can be selected.
-	 */
-	igDoughnutChart(optionLiteral: 'option', optionName: "allowSliceSelection"): boolean;
-
-	/**
-	 * Sets whether the slices can be selected.
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igDoughnutChart(optionLiteral: 'option', optionName: "allowSliceSelection", optionValue: boolean): void;
-
-	/**
-	 * Gets  whether all surface interactions with the plot area should be disabled.
-	 */
-	igDoughnutChart(optionLiteral: 'option', optionName: "isSurfaceInteractionDisabled"): any;
-
-	/**
-	 * Sets whether all surface interactions with the plot area should be disabled.
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igDoughnutChart(optionLiteral: 'option', optionName: "isSurfaceInteractionDisabled", optionValue: any): void;
-
-	/**
-	 * Gets  whether the slices can be exploded.
-	 */
-	igDoughnutChart(optionLiteral: 'option', optionName: "allowSliceExplosion"): boolean;
-
-	/**
-	 * Sets whether the slices can be exploded.
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igDoughnutChart(optionLiteral: 'option', optionName: "allowSliceExplosion", optionValue: boolean): void;
-
-	/**
-	 * Gets  the inner extent of the doughnut chart. It is percent from the outer ring's radius.
-	 */
-	igDoughnutChart(optionLiteral: 'option', optionName: "innerExtent"): number;
-
-	/**
-	 * Sets the inner extent of the doughnut chart. It is percent from the outer ring's radius.
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igDoughnutChart(optionLiteral: 'option', optionName: "innerExtent", optionValue: number): void;
-
-	/**
-	 * Gets  the style used when a slice is selected.
-	 */
-	igDoughnutChart(optionLiteral: 'option', optionName: "selectedStyle"): any;
-
-	/**
-	 * Sets the style used when a slice is selected.
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igDoughnutChart(optionLiteral: 'option', optionName: "selectedStyle", optionValue: any): void;
-
-	/**
-	 * Gets  template for tooltip associated with chart item.
-	 * Example: "Value: $(ValueMemberPathInDataSource)"
-	 */
-	igDoughnutChart(optionLiteral: 'option', optionName: "tooltipTemplate"): string;
-
-	/**
-	 * Sets template for tooltip associated with chart item.
-	 * Example: "Value: $(ValueMemberPathInDataSource)"
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igDoughnutChart(optionLiteral: 'option', optionName: "tooltipTemplate", optionValue: string): void;
-
-	/**
-	 * Gets  maximum number of displayed records in chart.
-	 */
-	igDoughnutChart(optionLiteral: 'option', optionName: "maxRecCount"): number;
-
-	/**
-	 * Sets maximum number of displayed records in chart.
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igDoughnutChart(optionLiteral: 'option', optionName: "maxRecCount", optionValue: number): void;
-
-	/**
-	 * Gets  a valid data source.
-	 * That can be instance of array or primitives, array of objects, instance of $.ig.DataSource, or any other data accepted by $.ig.DataSource.
-	 * Note: if it is set to string and "dataSourceType" option is not set, then $.ig.JSONPDataSource is used.
-	 */
-	igDoughnutChart(optionLiteral: 'option', optionName: "dataSource"): any;
-
-	/**
-	 * Sets a valid data source.
-	 * That can be instance of array or primitives, array of objects, instance of $.ig.DataSource, or any other data accepted by $.ig.DataSource.
-	 * Note: if it is set to string and "dataSourceType" option is not set, then $.ig.JSONPDataSource is used.
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igDoughnutChart(optionLiteral: 'option', optionName: "dataSource", optionValue: any): void;
-
-	/**
-	 * Gets  data source type (such as "json", "xml", etc). Please refer to the documentation of $.ig.DataSource and its type property
-	 */
-	igDoughnutChart(optionLiteral: 'option', optionName: "dataSourceType"): string;
-
-	/**
-	 * Sets data source type (such as "json", "xml", etc). Please refer to the documentation of $.ig.DataSource and its type property
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igDoughnutChart(optionLiteral: 'option', optionName: "dataSourceType", optionValue: string): void;
-
-	/**
-	 * Gets  url which is used for sending JSON on request for remote data.
-	 */
-	igDoughnutChart(optionLiteral: 'option', optionName: "dataSourceUrl"): string;
-
-	/**
-	 * Sets url which is used for sending JSON on request for remote data.
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igDoughnutChart(optionLiteral: 'option', optionName: "dataSourceUrl", optionValue: string): void;
-
-	/**
-	 * See $.ig.DataSource. property in the response specifying the total number of records on the server.
-	 */
-	igDoughnutChart(optionLiteral: 'option', optionName: "responseTotalRecCountKey"): string;
-
-	/**
-	 * See $.ig.DataSource. property in the response specifying the total number of records on the server.
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igDoughnutChart(optionLiteral: 'option', optionName: "responseTotalRecCountKey", optionValue: string): void;
-
-	/**
-	 * See $.ig.DataSource. This is basically the property in the responses where data records are held, if the response is wrapped.
-	 */
-	igDoughnutChart(optionLiteral: 'option', optionName: "responseDataKey"): string;
-
-	/**
-	 * See $.ig.DataSource. This is basically the property in the responses where data records are held, if the response is wrapped.
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igDoughnutChart(optionLiteral: 'option', optionName: "responseDataKey", optionValue: string): void;
-
-	/**
-	 * Event fired when the mouse has hovered on a series and the tooltip is about to show
-	 * Function takes arguments evt and ui.
-	 * Use ui.element to get reference to tooltip DOM element.
-	 * Use ui.item to get reference to current series item object.
-	 * Use ui.chart to get reference to chart object.
-	 * Use ui.series to get reference to current series object.
-	 * Use ui.actualItemBrush to get item brush.
-	 * Use ui.actualSeriesBrush to get series brush.
-	 */
-	igDoughnutChart(optionLiteral: 'option', optionName: "tooltipShowing"): TooltipShowingEvent;
-
-	/**
-	 * Event fired when the mouse has hovered on a series and the tooltip is about to show
-	 * Function takes arguments evt and ui.
-	 * Use ui.element to get reference to tooltip DOM element.
-	 * Use ui.item to get reference to current series item object.
-	 * Use ui.chart to get reference to chart object.
-	 * Use ui.series to get reference to current series object.
-	 * Use ui.actualItemBrush to get item brush.
-	 * Use ui.actualSeriesBrush to get series brush.
-	 *
-	 * @optionValue Define event handler function.
-	 */
-	igDoughnutChart(optionLiteral: 'option', optionName: "tooltipShowing", optionValue: TooltipShowingEvent): void;
-
-	/**
-	 * Event fired after a tooltip is shown
-	 * Function takes arguments evt and ui.
-	 * Use ui.element to get reference to tooltip DOM element.
-	 * Use ui.item to get reference to current series item object.
-	 * Use ui.chart to get reference to chart object.
-	 * Use ui.series to get reference to current series object.
-	 * Use ui.actualItemBrush to get item brush.
-	 * Use ui.actualSeriesBrush to get series brush.
-	 */
-	igDoughnutChart(optionLiteral: 'option', optionName: "tooltipShown"): TooltipShownEvent;
-
-	/**
-	 * Event fired after a tooltip is shown
-	 * Function takes arguments evt and ui.
-	 * Use ui.element to get reference to tooltip DOM element.
-	 * Use ui.item to get reference to current series item object.
-	 * Use ui.chart to get reference to chart object.
-	 * Use ui.series to get reference to current series object.
-	 * Use ui.actualItemBrush to get item brush.
-	 * Use ui.actualSeriesBrush to get series brush.
-	 *
-	 * @optionValue Define event handler function.
-	 */
-	igDoughnutChart(optionLiteral: 'option', optionName: "tooltipShown", optionValue: TooltipShownEvent): void;
-
-	/**
-	 * Event fired when the mouse has left a series and the tooltip is about to hide
-	 * Function takes arguments evt and ui.
-	 * Use ui.element to get reference to tooltip DOM element.
-	 * Use ui.item to get reference to current series item object.
-	 * Use ui.chart to get reference to chart object.
-	 * Use ui.series to get reference to current series object.
-	 * Use ui.actualItemBrush to get item brush.
-	 * Use ui.actualSeriesBrush to get series brush.
-	 */
-	igDoughnutChart(optionLiteral: 'option', optionName: "tooltipHiding"): TooltipHidingEvent;
-
-	/**
-	 * Event fired when the mouse has left a series and the tooltip is about to hide
-	 * Function takes arguments evt and ui.
-	 * Use ui.element to get reference to tooltip DOM element.
-	 * Use ui.item to get reference to current series item object.
-	 * Use ui.chart to get reference to chart object.
-	 * Use ui.series to get reference to current series object.
-	 * Use ui.actualItemBrush to get item brush.
-	 * Use ui.actualSeriesBrush to get series brush.
-	 *
-	 * @optionValue Define event handler function.
-	 */
-	igDoughnutChart(optionLiteral: 'option', optionName: "tooltipHiding", optionValue: TooltipHidingEvent): void;
-
-	/**
-	 * Event fired after a tooltip is hidden
-	 * Function takes arguments evt and ui.
-	 * Use ui.element to get reference to tooltip DOM element.
-	 * Use ui.item to get reference to current series item object.
-	 * Use ui.chart to get reference to chart object.
-	 * Use ui.series to get reference to current series object.
-	 * Use ui.actualItemBrush to get item brush.
-	 * Use ui.actualSeriesBrush to get series brush.
-	 */
-	igDoughnutChart(optionLiteral: 'option', optionName: "tooltipHidden"): TooltipHiddenEvent;
-
-	/**
-	 * Event fired after a tooltip is hidden
-	 * Function takes arguments evt and ui.
-	 * Use ui.element to get reference to tooltip DOM element.
-	 * Use ui.item to get reference to current series item object.
-	 * Use ui.chart to get reference to chart object.
-	 * Use ui.series to get reference to current series object.
-	 * Use ui.actualItemBrush to get item brush.
-	 * Use ui.actualSeriesBrush to get series brush.
-	 *
-	 * @optionValue Define event handler function.
-	 */
-	igDoughnutChart(optionLiteral: 'option', optionName: "tooltipHidden", optionValue: TooltipHiddenEvent): void;
-
-	/**
-	 * Event fired when the control is displayed on a non HTML5 compliant browser
-	 */
-	igDoughnutChart(optionLiteral: 'option', optionName: "browserNotSupported"): BrowserNotSupportedEvent;
-
-	/**
-	 * Event fired when the control is displayed on a non HTML5 compliant browser
-	 *
-	 * @optionValue Define event handler function.
-	 */
-	igDoughnutChart(optionLiteral: 'option', optionName: "browserNotSupported", optionValue: BrowserNotSupportedEvent): void;
-
-	/**
-	 * Raised when the slice is clicked.
-	 */
-	igDoughnutChart(optionLiteral: 'option', optionName: "sliceClick"): SliceClickEvent;
-
-	/**
-	 * Raised when the slice is clicked.
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igDoughnutChart(optionLiteral: 'option', optionName: "sliceClick", optionValue: SliceClickEvent): void;
-
-	/**
-	 * Raised when the dimensions (center point or radius) of the doughnut hole change.
-	 */
-	igDoughnutChart(optionLiteral: 'option', optionName: "holeDimensionsChanged"): HoleDimensionsChangedEvent;
-
-	/**
-	 * Raised when the dimensions (center point or radius) of the doughnut hole change.
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igDoughnutChart(optionLiteral: 'option', optionName: "holeDimensionsChanged", optionValue: HoleDimensionsChangedEvent): void;
-
-	/**
-	 * Event which is raised before data binding.
-	 * Return false in order to cancel data binding.
-	 * Function takes first argument null and second argument ui.
-	 * Use ui.owner to obtain reference to chart widget.
-	 * Use ui.dataSource to obtain reference to instance of $.ig.DataSource.
-	 */
-	igDoughnutChart(optionLiteral: 'option', optionName: "dataBinding"): DataBindingEvent;
-
-	/**
-	 * Event which is raised before data binding.
-	 * Return false in order to cancel data binding.
-	 * Function takes first argument null and second argument ui.
-	 * Use ui.owner to obtain reference to chart widget.
-	 * Use ui.dataSource to obtain reference to instance of $.ig.DataSource.
-	 *
-	 * @optionValue Define event handler function.
-	 */
-	igDoughnutChart(optionLiteral: 'option', optionName: "dataBinding", optionValue: DataBindingEvent): void;
-
-	/**
-	 * Event which is raised after data binding.
-	 * Function takes first argument null and second argument ui.
-	 * Use ui.owner to obtain reference to chart widget.
-	 * Use ui.data to obtain reference to array actual data which is displayed by chart.
-	 * Use ui.dataSource to obtain reference to instance of $.ig.DataSource.
-	 */
-	igDoughnutChart(optionLiteral: 'option', optionName: "dataBound"): DataBoundEvent;
-
-	/**
-	 * Event which is raised after data binding.
-	 * Function takes first argument null and second argument ui.
-	 * Use ui.owner to obtain reference to chart widget.
-	 * Use ui.data to obtain reference to array actual data which is displayed by chart.
-	 * Use ui.dataSource to obtain reference to instance of $.ig.DataSource.
-	 *
-	 * @optionValue Define event handler function.
-	 */
-	igDoughnutChart(optionLiteral: 'option', optionName: "dataBound", optionValue: DataBoundEvent): void;
-
-	/**
-	 * Event which is raised before tooltip is updated.
-	 * Return false in order to cancel updating and hide tooltip.
-	 * Function takes first argument null and second argument ui.
-	 * Use ui.owner to obtain reference to chart widget.
-	 * Use ui.text to obtain html of tooltip. Value of that member can be modified. If modified value is null or empty string, then current content of tooltip keeps old value.
-	 * Use ui.item to obtain reference to item. Value of that member can be modified or replaced by custom item.
-	 * Use ui.x to obtain left position of tooltip in pixels relative to widget. Value of that member can be modified.
-	 * Use ui.y to obtain top position of tooltip in pixels relative to widget. Value of that member can be modified.
-	 * Use ui.element to obtain reference to jquery object which represents tooltip. Value of that member can be replaced by custom element.
-	 */
-	igDoughnutChart(optionLiteral: 'option', optionName: "updateTooltip"): UpdateTooltipEvent;
-
-	/**
-	 * Event which is raised before tooltip is updated.
-	 * Return false in order to cancel updating and hide tooltip.
-	 * Function takes first argument null and second argument ui.
-	 * Use ui.owner to obtain reference to chart widget.
-	 * Use ui.text to obtain html of tooltip. Value of that member can be modified. If modified value is null or empty string, then current content of tooltip keeps old value.
-	 * Use ui.item to obtain reference to item. Value of that member can be modified or replaced by custom item.
-	 * Use ui.x to obtain left position of tooltip in pixels relative to widget. Value of that member can be modified.
-	 * Use ui.y to obtain top position of tooltip in pixels relative to widget. Value of that member can be modified.
-	 * Use ui.element to obtain reference to jquery object which represents tooltip. Value of that member can be replaced by custom element.
-	 *
-	 * @optionValue Define event handler function.
-	 */
-	igDoughnutChart(optionLiteral: 'option', optionName: "updateTooltip", optionValue: UpdateTooltipEvent): void;
-
-	/**
-	 * Event which is raised before tooltip is hidden.
-	 * Return false in order to cancel hiding and keep tooltip visible.
-	 * Function takes first argument null and second argument ui.
-	 * Use ui.owner to obtain reference to chart widget.
-	 * Use ui.item to obtain reference to item.
-	 * Use ui.element to obtain reference to jquery object which represents tooltip or value of ui.element from last updateTooltip event. Value of that member can be replaced by custom element.
-	 */
-	igDoughnutChart(optionLiteral: 'option', optionName: "hideTooltip"): HideTooltipEvent;
-
-	/**
-	 * Event which is raised before tooltip is hidden.
-	 * Return false in order to cancel hiding and keep tooltip visible.
-	 * Function takes first argument null and second argument ui.
-	 * Use ui.owner to obtain reference to chart widget.
-	 * Use ui.item to obtain reference to item.
-	 * Use ui.element to obtain reference to jquery object which represents tooltip or value of ui.element from last updateTooltip event. Value of that member can be replaced by custom element.
-	 *
-	 * @optionValue Define event handler function.
-	 */
-	igDoughnutChart(optionLiteral: 'option', optionName: "hideTooltip", optionValue: HideTooltipEvent): void;
-	igDoughnutChart(options: IgDoughnutChart): JQuery;
-	igDoughnutChart(optionLiteral: 'option', optionName: string): any;
-	igDoughnutChart(optionLiteral: 'option', options: IgDoughnutChart): JQuery;
-	igDoughnutChart(optionLiteral: 'option', optionName: string, optionValue: any): JQuery;
-	igDoughnutChart(methodName: string, ...methodParams: any[]): any;
-}
 interface RenderingEvent {
 	(event: Event, ui: RenderingEventUIParam): void;
 }
 
 interface RenderingEventUIParam {
 	/**
-	 * Used to get a reference to the editor performing rendering.
+	 * Gets a reference to the editor performing rendering.
 	 */
 	owner?: any;
 
 	/**
-	 * Used to get a reference to the editor element.
+	 * Gets a reference to the editor element.
 	 */
 	element?: any;
 }
@@ -24655,17 +25228,17 @@ interface MousedownEvent {
 
 interface MousedownEventUIParam {
 	/**
-	 * Used to obtain reference to igEditor.
+	 * Gets a reference to the editor.
 	 */
 	owner?: any;
 
 	/**
-	 * Used to obtain a reference to the event target.
+	 * Gets a reference to the event target.
 	 */
 	element?: any;
 
 	/**
-	 * Used torInput to get a reference to the editor field.
+	 * Gets a reference to the editor input field.
 	 */
 	editorInput?: any;
 }
@@ -24676,17 +25249,17 @@ interface MouseupEvent {
 
 interface MouseupEventUIParam {
 	/**
-	 * Used to obtain reference to igEditor.
+	 * Gets a reference to the editor.
 	 */
 	owner?: any;
 
 	/**
-	 * Used to obtain a reference to the event target.
+	 * Gets a reference to the event target.
 	 */
 	element?: any;
 
 	/**
-	 * Used torInput to get a reference to the editor field.
+	 * Gets a reference to the editor input field.
 	 */
 	editorInput?: any;
 }
@@ -24697,17 +25270,17 @@ interface MousemoveEvent {
 
 interface MousemoveEventUIParam {
 	/**
-	 * Used to obtain reference to igEditor.
+	 * Gets a reference to the editor.
 	 */
 	owner?: any;
 
 	/**
-	 * Used to obtain a reference to the event target.
+	 * Gets a reference to the event target.
 	 */
 	element?: any;
 
 	/**
-	 * Used torInput to get a reference to the editor field.
+	 * Gets a reference to the editor input field.
 	 */
 	editorInput?: any;
 }
@@ -24718,19 +25291,24 @@ interface MouseoverEvent {
 
 interface MouseoverEventUIParam {
 	/**
-	 * Used to obtain reference to igEditor.
+	 * Gets a reference to the editor.
 	 */
 	owner?: any;
 
 	/**
-	 * Used to obtain a reference to the event target.
+	 * Gets a reference to the event target.
 	 */
 	element?: any;
 
 	/**
-	 * Used torInput to get a reference to the editor field.
+	 * Gets a reference to the editor input field.
 	 */
 	editorInput?: any;
+
+	/**
+	 * Gets a reference to the event object of the browser.
+	 */
+	originalEvent?: any;
 }
 
 interface MouseoutEvent {
@@ -24739,19 +25317,24 @@ interface MouseoutEvent {
 
 interface MouseoutEventUIParam {
 	/**
-	 * Used to obtain reference to igEditor.
+	 * Gets a reference to the editor.
 	 */
 	owner?: any;
 
 	/**
-	 * Used to obtain a reference to the event target.
+	 * Gets a reference to the event target.
 	 */
 	element?: any;
 
 	/**
-	 * Used torInput to get a reference to the editor field.
+	 * Gets a reference to the editor input field.
 	 */
 	editorInput?: any;
+
+	/**
+	 * Gets a reference to the event object of the browser.
+	 */
+	originalEvent?: any;
 }
 
 interface KeydownEvent {
@@ -24760,12 +25343,22 @@ interface KeydownEvent {
 
 interface KeydownEventUIParam {
 	/**
-	 * Used to obtain reference to igEditor.
+	 * Gets a reference to the editor.
 	 */
 	owner?: any;
 
 	/**
-	 * Used to obtain value of keyCode.
+	 * Gets a reference to the event target.
+	 */
+	element?: any;
+
+	/**
+	 * Gets a reference to the editor input field.
+	 */
+	editorInput?: any;
+
+	/**
+	 * Gets the value of the keyCode.
 	 */
 	key?: any;
 }
@@ -24776,14 +25369,29 @@ interface KeypressEvent {
 
 interface KeypressEventUIParam {
 	/**
-	 * Used to obtain reference to igEditor.
+	 * Gets a reference to the editor.
 	 */
 	owner?: any;
 
 	/**
-	 * Used to obtain value of keyCode.
+	 * Gets a reference to the event target.
+	 */
+	element?: any;
+
+	/**
+	 * Gets a reference to the editor input field.
+	 */
+	editorInput?: any;
+
+	/**
+	 * Gets the value of the keyCode.
 	 */
 	key?: any;
+
+	/**
+	 * Gets a reference to the event object of the browser.
+	 */
+	originalEvent?: any;
 }
 
 interface KeyupEvent {
@@ -24792,14 +25400,29 @@ interface KeyupEvent {
 
 interface KeyupEventUIParam {
 	/**
-	 * Used to obtain reference to igEditor.
+	 * Gets a reference to the editor.
 	 */
 	owner?: any;
 
 	/**
-	 * Used to obtain value of keyCode.
+	 * Gets a reference to the event target.
+	 */
+	element?: any;
+
+	/**
+	 * Gets a reference to the editor input field.
+	 */
+	editorInput?: any;
+
+	/**
+	 * Gets the value of the keyCode.
 	 */
 	key?: any;
+
+	/**
+	 * Gets a reference to the event object of the browser.
+	 */
+	originalEvent?: any;
 }
 
 interface ValueChangingEvent {
@@ -24808,24 +25431,24 @@ interface ValueChangingEvent {
 
 interface ValueChangingEventUIParam {
 	/**
-	 * Used to obtain reference to igEditor.
+	 * Gets a reference to the editor.
 	 */
 	owner?: any;
 
 	/**
-	 * Used to obtain the new value.
+	 * Gets the editor input.
+	 */
+	editorInput?: any;
+
+	/**
+	 * Gets the editor's new value. The argument type might differ depending on the editor type.
 	 */
 	newValue?: any;
 
 	/**
-	 * Used to obtain the old value.
+	 * Gets the editor's old value. The argument type might differ depending on the editor type.
 	 */
 	oldValue?: any;
-
-	/**
-	 * Used torInput to obtain reference to the editor input.
-	 */
-	editorInput?: any;
 }
 
 interface ValueChangedEvent {
@@ -24834,30 +25457,31 @@ interface ValueChangedEvent {
 
 interface ValueChangedEventUIParam {
 	/**
-	 * Used to obtain reference to igEditor.
+	 * Gets a reference to the editor.
 	 */
 	owner?: any;
 
 	/**
-	 * Used to obtain the value entered from the user after internal formatting.
+	 * Gets the editor input.
+	 */
+	editorInput?: any;
+
+	/**
+	 * Gets the value entered from the user after internal formatting. The argument type might differ depending on the editor type.
 	 */
 	newValue?: any;
 
 	/**
-	 * Used to obtain the value entered from the user before internal formatting.
+	 * Gets the value entered from the user before internal formatting. The argument type might differ depending on the editor type.
 	 */
 	originalValue?: any;
-
-	/**
-	 * Used torInput to obtain reference to the editor input.
-	 */
-	editorInput?: any;
 }
 
 interface IgBaseEditor {
 	/**
 	 * Gets/Sets the width of the control.
 	 *
+	 *
 	 * Valid values:
 	 * "null" will stretch to fit data, if no other widths are defined.
 	 */
@@ -24866,6 +25490,7 @@ interface IgBaseEditor {
 	/**
 	 * Gets/Sets the height of the control.
 	 *
+	 *
 	 * Valid values:
 	 * "null" will fit the editor inside its parent container, if no other heights are defined.
 	 */
@@ -24873,37 +25498,44 @@ interface IgBaseEditor {
 
 	/**
 	 * Gets/Sets value in editor. The effect of setting/getting that option depends on type of editor and on dataMode options for every type of editor.
+	 *
 	 */
 	value?: any;
 
 	/**
 	 * Gets/Sets tabIndex attribute for the editor input.
+	 *
 	 */
 	tabIndex?: number;
 
 	/**
 	 * Gets/Sets whether the editor value can become null.
 	 * If that option is false, and editor has no value, then value is set to an empty string.
+	 *
 	 */
 	allowNullValue?: boolean;
 
 	/**
 	 * Gets/Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
+	 *
 	 */
 	nullValue?: string|number;
 
 	/**
 	 * Gets/Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
+	 *
 	 */
 	inputName?: string;
 
 	/**
 	 * Gets/Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
+	 *
 	 */
 	readOnly?: boolean;
 
 	/**
 	 * Gets/Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
+	 *
 	 */
 	disabled?: boolean;
 
@@ -24911,151 +25543,99 @@ interface IgBaseEditor {
 	 * Gets/Sets options supported by the [igValidator](ui.igvalidator#options) widget.
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
+	 *
 	 */
 	validatorOptions?: any;
 
 	/**
 	 * Set/Get the locale setting for the widget.
+	 *
 	 */
 	locale?: any;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
+	 *
 	 */
 	language?: string;
 
 	/**
 	 * Set/Get the regional setting for the widget.
+	 *
 	 */
 	regional?: string|Object;
 
 	/**
-	 * Event which is raised before rendering of the editor completes.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to get a reference to the editor performing rendering.
-	 * Use ui.element to get a reference to the editor element.
+	 * Fired before rendering of the editor has finished.
 	 */
 	rendering?: RenderingEvent;
 
 	/**
-	 * Event which is raised after rendering of the editor completes.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to get a reference to the editor performing rendering.
-	 * Use ui.element to get a reference to the editor element.
+	 * Fired after rendering of the editor has finished.
 	 */
 	rendered?: RenderedEvent;
 
 	/**
-	 * Event which is raised on mousedown event.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired on mousedown event.
 	 */
 	mousedown?: MousedownEvent;
 
 	/**
-	 * Event which is raised on mouseup event.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired on mouseup event.
 	 */
 	mouseup?: MouseupEvent;
 
 	/**
-	 * Event which is raised on mousemove at any part of editor including drop-down list.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired on mousemove at any part of editor including the drop-down list.
 	 */
 	mousemove?: MousemoveEvent;
 
 	/**
-	 * Event which is raised on mouseover at any part of editor including drop-down list.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired on mouseover at any part of editor including the drop-down list.
 	 */
 	mouseover?: MouseoverEvent;
 
 	/**
-	 * Event which is raised on mouseleave at any part of editor including drop-down list.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired on mouseleave at any part of editor including the drop-down list.
 	 */
 	mouseout?: MouseoutEvent;
 
 	/**
-	 * Event which is raised when input field of editor loses focus.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired when the input field of the editor loses focus.
 	 */
 	blur?: BlurEvent;
 
 	/**
-	 * Event which is raised when input field of editor gets focus.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired when the input field of the editor gets focus.
 	 */
 	focus?: IgFocusEvent;
 
 	/**
-	 * Event which is raised on keydown event.
+	 * Fired on keydown event.
 	 * Return false in order to cancel key action.
-	 * Function takes arguments evt and ui.
-	 * Use evt.originalEvent to obtain reference to event of browser.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.key to obtain value of keyCode.
 	 */
 	keydown?: KeydownEvent;
 
 	/**
-	 * Event which is raised on keypress event.
+	 * Fired on keypress event.
 	 * Return false in order to cancel key action.
-	 * Function takes arguments evt and ui.
-	 * Use evt.originalEvent to obtain reference to event of browser.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.key to obtain value of keyCode.
 	 */
 	keypress?: KeypressEvent;
 
 	/**
-	 * Event which is raised on keyup event.
-	 * Function takes arguments evt and ui.
-	 * Use evt.originalEvent to obtain reference to event of browser.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.key to obtain value of keyCode.
+	 * Fired on keyup event.
 	 */
 	keyup?: KeyupEvent;
 
 	/**
-	 * Event which is raised before the editor value is changed.
+	 * Fired before changing the editor's value.
 	 * Return false in order to cancel change.
 	 * It can be raised after loosing focus or on spin events.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.newValue to obtain the new value.
-	 * Use ui.oldValue to obtain the old value.
-	 * Use ui.editorInput to obtain reference to the editor input.
 	 */
 	valueChanging?: ValueChangingEvent;
 
 	/**
-	 * Event which is raised after the editor value is changed. It can be raised after loosing focus or on spin events.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.newValue to obtain the value entered from the user after internal formatting.
-	 * Use ui.originalValue to obtain the value entered from the user before internal formatting.
-	 * Use ui.editorInput to obtain reference to the editor input.
+	 * Fired after the editor value is changed. It can be raised after loosing focus or on spin events.
 	 */
 	valueChanged?: ValueChangedEvent;
 
@@ -25124,8 +25704,23 @@ interface IgBaseEditorMethods {
 	 * Destroys the widget
 	 */
 	destroy(): void;
+
+	/**
+	 * Changes the all locales contained into a specified container to the language specified in [options.language](ui.igwidget#options:language)
+	 * Note that this method is for rare scenarios, use [language](ui.igwidget#options:language) or [locale](ui.igwidget#options:locale) option setter
+	 *
+	 * @param $container Optional parameter - if not set it would use the element of the widget as $container
+	 */
 	changeLocale($container: Object): void;
+
+	/**
+	 * Changes the widget language to global language. Global language is the value in $.ig.util.language
+	 */
 	changeGlobalLanguage(): void;
+
+	/**
+	 * Changes the widget regional settins to global regional settings. Global regional settings are container in $.ig.util.regional
+	 */
 	changeGlobalRegional(): void;
 }
 interface JQuery {
@@ -25138,17 +25733,22 @@ interface DropDownListOpeningEvent {
 
 interface DropDownListOpeningEventUIParam {
 	/**
-	 * Used to obtain reference to igEditor.
+	 * Gets a reference to the editor.
 	 */
 	owner?: any;
 
 	/**
-	 * Used torInput to obtain reference to the editable input
+	 * Gets a reference to the editor container.
+	 */
+	editor?: any;
+
+	/**
+	 * Gets a reference to the editable input.
 	 */
 	editorInput?: any;
 
 	/**
-	 * Used to obtain reference to the list contaier.
+	 * Gets a reference to the list contaier.
 	 */
 	list?: any;
 }
@@ -25159,17 +25759,17 @@ interface DropDownListOpenedEvent {
 
 interface DropDownListOpenedEventUIParam {
 	/**
-	 * Used to obtain reference to igEditor.
+	 * Gets a reference to the editor.
 	 */
 	owner?: any;
 
 	/**
-	 * Used torInput to obtain reference to the editable input
+	 * Gets a reference to the editable input.
 	 */
 	editorInput?: any;
 
 	/**
-	 * Used to obtain reference to the list contaier.
+	 * Gets a reference to the list contaier.
 	 */
 	list?: any;
 }
@@ -25180,17 +25780,22 @@ interface DropDownListClosingEvent {
 
 interface DropDownListClosingEventUIParam {
 	/**
-	 * Used to obtain reference to igEditor.
+	 * Gets a reference to the editor.
 	 */
 	owner?: any;
 
 	/**
-	 * Used torInput to obtain reference to the editable input
+	 * Gets a reference to the editor container.
+	 */
+	editor?: any;
+
+	/**
+	 * Gets a reference to the editable input.
 	 */
 	editorInput?: any;
 
 	/**
-	 * Used to obtain reference to the list contaier.
+	 * Gets a reference to the list contaier.
 	 */
 	list?: any;
 }
@@ -25201,17 +25806,22 @@ interface DropDownListClosedEvent {
 
 interface DropDownListClosedEventUIParam {
 	/**
-	 * Used to obtain reference to igEditor.
+	 * Gets a reference to the editor.
 	 */
 	owner?: any;
 
 	/**
-	 * Used torInput to obtain reference to the editable input
+	 * Gets a reference to the editor container.
+	 */
+	editor?: any;
+
+	/**
+	 * Gets a reference to the editable input.
 	 */
 	editorInput?: any;
 
 	/**
-	 * Used to obtain reference to the list contaier.
+	 * Gets a reference to the list contaier.
 	 */
 	list?: any;
 }
@@ -25222,22 +25832,27 @@ interface DropDownItemSelectingEvent {
 
 interface DropDownItemSelectingEventUIParam {
 	/**
-	 * Used to obtain reference to igEditor.
+	 * Gets a reference to the editor.
 	 */
 	owner?: any;
 
 	/**
-	 * Used torInput to obtain reference to the editable input
+	 * Gets a reference to the editor container.
+	 */
+	editor?: any;
+
+	/**
+	 * Gets a reference to the editable input.
 	 */
 	editorInput?: any;
 
 	/**
-	 * Used to obtain reference to the list contaier.
+	 * Gets a reference to the list contaier.
 	 */
 	list?: any;
 
 	/**
-	 * Used to obtain reference to the list item which is about to be selected.
+	 * Gets a reference to the list item which is about to be selected.
 	 */
 	item?: any;
 }
@@ -25248,22 +25863,22 @@ interface DropDownItemSelectedEvent {
 
 interface DropDownItemSelectedEventUIParam {
 	/**
-	 * Used to obtain reference to igEditor.
+	 * Gets a reference to the editor.
 	 */
 	owner?: any;
 
 	/**
-	 * Used torInput to obtain reference to the editable input
+	 * Gets a reference to the editable input.
 	 */
 	editorInput?: any;
 
 	/**
-	 * Used to obtain reference to the list contaier.
+	 * Gets a reference to the list contaier.
 	 */
 	list?: any;
 
 	/**
-	 * Used to obtain reference to the list item which is selected.
+	 * Gets a reference to the list item which is selected.
 	 */
 	item?: any;
 }
@@ -25274,25 +25889,26 @@ interface TextChangedEvent {
 
 interface TextChangedEventUIParam {
 	/**
-	 * Used to obtain reference to igEditor.
+	 * Gets a reference to the editor.
 	 */
 	owner?: any;
 
 	/**
-	 * Used to obtain new text
+	 * Gets a reference to the new text.
 	 */
-	text?: any;
+	text?: string;
 
 	/**
-	 * Used to obtain the old text.
+	 * Gets a reference to the old text.
 	 */
-	oldText?: any;
+	oldText?: string;
 }
 
 interface IgTextEditor {
 	/**
 	 * Gets visibility of the spin, clear and drop-down button. That option can be set only on initialization. Combinations like 'dropdown,spin' or 'spin,clear' are supported too.Note! This option can not be set runtime.
 	 *
+	 *
 	 * Valid values:
 	 * "dropdown" A button to open/close the list is located on the right side of the editor.
 	 * "clear" A button to clear the value is located on the right side of the editor.
@@ -25303,16 +25919,19 @@ interface IgTextEditor {
 	/**
 	 * Gets/Sets list of items which are used as a source for the drop-down list.
 	 * Items in the list can be of type string.
+	 *
 	 */
 	listItems?: any[];
 
 	/**
 	 * Gets/Sets custom width of the drop-down list in pixels. If the value is equal to 0 or negative, then the width of editor is set as a drop-down width.
+	 *
 	 */
 	listWidth?: number;
 
 	/**
 	 * Gets/Sets the hover/unhover animation duration of a drop-down list item.
+	 *
 	 */
 	listItemHoverDuration?: number;
 
@@ -25321,11 +25940,13 @@ interface IgTextEditor {
 	 * If the option is set to false the editor will attach the drop-down list element to the editor container
 	 * If the option is set to true the editor will attach its drop-down list to as a child of the body.
 	 * Note! This option can not be set runtime.
+	 *
 	 */
 	dropDownAttachedToBody?: boolean;
 
 	/**
 	 * Gets/Sets show/hide drop-down list animation duration in milliseconds.
+	 *
 	 */
 	dropDownAnimationDuration?: number;
 
@@ -25334,6 +25955,7 @@ interface IgTextEditor {
 	 * Notes:
 	 * This option is overwritten if the number of list items is less than the set value. In that case the drop-down list displays all the items.
 	 * This option can not be set runtime.
+	 *
 	 */
 	visibleItemsCount?: number;
 
@@ -25342,6 +25964,7 @@ interface IgTextEditor {
 	 * Notes:
 	 * If both "excludeKeys" and "includeKeys" options are used, then "excludeKeys" has priority and includeKeys options is not respected.
 	 * The option is case sensitive! If the option is set runtime it's not applied on the current value.
+	 *
 	 */
 	includeKeys?: string;
 
@@ -25350,12 +25973,14 @@ interface IgTextEditor {
 	 * Notes:
 	 * If both "excludeKeys" and "includeKeys" options are used, then "excludeKeys" has priority and includeKeys options is not respected.
 	 * The option is case sensitive! If the option is set runtime it's not applied on the current value.
+	 *
 	 */
 	excludeKeys?: string;
 
 	/**
 	 * Gets/Sets the horizontal alignment of the text in the editor.
 	 *
+	 *
 	 * Valid values:
 	 * "left" The text into the input gets aligned to the left.
 	 * "right" The text into the input gets aligned to the right.
@@ -25365,12 +25990,14 @@ interface IgTextEditor {
 
 	/**
 	 * Gets/Sets the text which appears in the editor when it has no focus and the "value" is null or empty string.
+	 *
 	 */
 	placeHolder?: string;
 
 	/**
 	 * Gets/Sets the action when the editor gets focused. The default value is selectAll.
 	 *
+	 *
 	 * Valid values:
 	 * "selectAll" Setting this option will select all the text into the editor when the edit mode gets enetered.
 	 * "atStart" Setting this option will move the cursor at the begining the text into the editor when the edit mode gets enetered.
@@ -25382,6 +26009,7 @@ interface IgTextEditor {
 	/**
 	 * Gets the text mode of the editor such as: single-line text editor, password editor or multiline editor. That option has effect only on initialization. If based element (selector) is TEXTAREA, then it is used as input-field.
 	 *
+	 *
 	 * Valid values:
 	 * "text" Single line text editor based on INPUT element is created.
 	 * "password" Editor based on INPUT element with type password is created.
@@ -25391,27 +26019,32 @@ interface IgTextEditor {
 
 	/**
 	 * Gets/Sets the ability of the editor to automatically move the dropdown list selection item from one end to the opposite side. When the last item is reached and spin down is performed, the first item gets selected and vice versa. This option has no effect there is no drop-down list.
+	 *
 	 */
 	spinWrapAround?: boolean;
 
 	/**
 	 * Gets/Sets if the editor should only allow values from the list of items. Matching is case-insensitive.
+	 *
 	 */
 	isLimitedToListValues?: boolean;
 
 	/**
 	 * Gets/Sets if the editor should revert it's value to the previously valid value in case the value on blur, or enter key is not valid. If the opiton is set to false, editor calls clear functionality.
+	 *
 	 */
 	revertIfNotValid?: boolean;
 
 	/**
 	 * Gets/Sets if the editor should prevent form submition when enter key is pressed.
+	 *
 	 */
 	preventSubmitOnEnter?: boolean;
 
 	/**
 	 * Gets/Sets the drop-down list opening orientation when the list gets open. If the option is set to auto the editor has priority to open the drop-down list bottom. If the space is not enough it tries to open the list top. If the space is not enough in both directions then the list gets opened at the bottom of the editor.
 	 *
+	 *
 	 * Valid values:
 	 * "auto" If the option is set to auto the editor has priority to open the drop-down list bottom. If the space is not enough it tries to open the list top. If the space is not enough in both directions then the list gets opened at the bottom of the editor.
 	 * "bottom" The drop-down list is opened at the bottom of the editor.
@@ -25422,6 +26055,7 @@ interface IgTextEditor {
 	/**
 	 * Gets/Sets the maximum length of a text which can be entered by the user.
 	 * Negative values or 0 disables that behavior. If set at runtime the editor doesn't apply the option to the cuurent value.
+	 *
 	 */
 	maxLength?: number;
 
@@ -25429,23 +26063,27 @@ interface IgTextEditor {
 	 * Gets the ability to limit the editor to be used only as a dropdown list. When set to true the editor input is not editable.
 	 * Note! In case there are no list items - the editor will reamin readonly
 	 * Note! This option can not be set runtime.
+	 *
 	 */
 	dropDownOnReadOnly?: boolean;
 
 	/**
 	 * Gets/Sets the ability to convert the input characters to upper case (true) or keeps the characters as they are (false). The option has effect only while keyboard entries and paste.
 	 * Note! When the option is set at runtime the editor is not changing the current value.
+	 *
 	 */
 	toUpper?: boolean;
 
 	/**
 	 * Gets/Sets the ability to convert the input characters to lower case (true) or keeps the characters as they are (false). The option has effect only while keyboard entries and paste.
 	 * Note! When the option is set at runtime the editor is not changing the current value.
+	 *
 	 */
 	toLower?: boolean;
 
 	/**
 	 * Disables/Enables default notifications for basic validation scenarios built in the editors such as required list selection, value wrapping around or spin limits.
+	 *
 	 */
 	suppressNotifications?: boolean;
 
@@ -25453,12 +26091,14 @@ interface IgTextEditor {
 	 * Gets/Sets whether the onscreen keyboard (if available on device) should be shown when the dropdown button is clicked/tapped. This option prevents initial focus or removes it when the drop button is clicked/tapped.
 	 * Note: The option does not perform device detection so its behavior is always active if enabled.
 	 * Note: When drop down is opened the only way to close it will be using the drop down button.
+	 *
 	 */
 	suppressKeyboard?: boolean;
 
 	/**
 	 * Gets/Sets the width of the control.
 	 *
+	 *
 	 * Valid values:
 	 * "null" will stretch to fit data, if no other widths are defined.
 	 */
@@ -25467,6 +26107,7 @@ interface IgTextEditor {
 	/**
 	 * Gets/Sets the height of the control.
 	 *
+	 *
 	 * Valid values:
 	 * "null" will fit the editor inside its parent container, if no other heights are defined.
 	 */
@@ -25474,37 +26115,44 @@ interface IgTextEditor {
 
 	/**
 	 * Gets/Sets value in editor. The effect of setting/getting that option depends on type of editor and on dataMode options for every type of editor.
+	 *
 	 */
 	value?: any;
 
 	/**
 	 * Gets/Sets tabIndex attribute for the editor input.
+	 *
 	 */
 	tabIndex?: number;
 
 	/**
 	 * Gets/Sets whether the editor value can become null.
 	 * If that option is false, and editor has no value, then value is set to an empty string.
+	 *
 	 */
 	allowNullValue?: boolean;
 
 	/**
 	 * Gets/Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
+	 *
 	 */
 	nullValue?: string|number;
 
 	/**
 	 * Gets/Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
+	 *
 	 */
 	inputName?: string;
 
 	/**
 	 * Gets/Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
+	 *
 	 */
 	readOnly?: boolean;
 
 	/**
 	 * Gets/Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
+	 *
 	 */
 	disabled?: boolean;
 
@@ -25512,217 +26160,135 @@ interface IgTextEditor {
 	 * Gets/Sets options supported by the [igValidator](ui.igvalidator#options) widget.
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
+	 *
 	 */
 	validatorOptions?: any;
 
 	/**
 	 * Set/Get the locale setting for the widget.
+	 *
 	 */
 	locale?: any;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
+	 *
 	 */
 	language?: string;
 
 	/**
 	 * Set/Get the regional setting for the widget.
+	 *
 	 */
 	regional?: string|Object;
 
 	/**
-	 * Event which is raised when the drop down is opening.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.editorInput to obtain reference to the editable input
-	 * Use ui.list to obtain reference to the list contaier.
+	 * Fired when the drop down is opening.
 	 */
 	dropDownListOpening?: DropDownListOpeningEvent;
 
 	/**
-	 * Event which is raised after the drop down is opened.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.editorInput to obtain reference to the editable input
-	 * Use ui.list to obtain reference to the list contaier.
+	 * Fired after the drop down is opened.
 	 */
 	dropDownListOpened?: DropDownListOpenedEvent;
 
 	/**
-	 * Event which is raised when the drop down is closing.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.editorInput to obtain reference to the editable input
-	 * Use ui.list to obtain reference to the list contaier.
+	 * Fired when the drop down is closing.
 	 */
 	dropDownListClosing?: DropDownListClosingEvent;
 
 	/**
-	 * Event which is raised after the drop down is closed.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.editorInput to obtain reference to the editable input
-	 * Use ui.list to obtain reference to the list contaier.
+	 * Fired after the drop down is closed.
 	 */
 	dropDownListClosed?: DropDownListClosedEvent;
 
 	/**
-	 * Event which is raised when an item in the drop down list is being selected.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.editorInput to obtain reference to the editable input
-	 * Use ui.list to obtain reference to the list contaier.
-	 * Use ui.item to obtain reference to the list item which is about to be selected.
+	 * Fired when an item in the drop down list is being selected.
 	 */
 	dropDownItemSelecting?: DropDownItemSelectingEvent;
 
 	/**
-	 * Event which is raised after an item in the drop down list is selected.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.editorInput to obtain reference to the editable input
-	 * Use ui.list to obtain reference to the list contaier.
-	 * Use ui.item to obtain reference to the list item which is selected.
+	 * Fired after an item in the drop down list is selected.
 	 */
 	dropDownItemSelected?: DropDownItemSelectedEvent;
 
 	/**
-	 * Event which is raised after text in the editor was changed. It can be raised when keyUp event occurs,
+	 * Fired after the editor's text has been changed. It can be raised when keyUp event occurs,
 	 * when the clear button is clicked or when an item from a list is selected.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.text to obtain new text
-	 * Use ui.oldText to obtain the old text.
 	 */
 	textChanged?: TextChangedEvent;
 
 	/**
-	 * Event which is raised before rendering of the editor completes.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to get a reference to the editor performing rendering.
-	 * Use ui.element to get a reference to the editor element.
+	 * Fired before rendering of the editor has finished.
 	 */
 	rendering?: RenderingEvent;
 
 	/**
-	 * Event which is raised after rendering of the editor completes.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to get a reference to the editor performing rendering.
-	 * Use ui.element to get a reference to the editor element.
+	 * Fired after rendering of the editor has finished.
 	 */
 	rendered?: RenderedEvent;
 
 	/**
-	 * Event which is raised on mousedown event.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired on mousedown event.
 	 */
 	mousedown?: MousedownEvent;
 
 	/**
-	 * Event which is raised on mouseup event.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired on mouseup event.
 	 */
 	mouseup?: MouseupEvent;
 
 	/**
-	 * Event which is raised on mousemove at any part of editor including drop-down list.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired on mousemove at any part of editor including the drop-down list.
 	 */
 	mousemove?: MousemoveEvent;
 
 	/**
-	 * Event which is raised on mouseover at any part of editor including drop-down list.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired on mouseover at any part of editor including the drop-down list.
 	 */
 	mouseover?: MouseoverEvent;
 
 	/**
-	 * Event which is raised on mouseleave at any part of editor including drop-down list.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired on mouseleave at any part of editor including the drop-down list.
 	 */
 	mouseout?: MouseoutEvent;
 
 	/**
-	 * Event which is raised when input field of editor loses focus.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired when the input field of the editor loses focus.
 	 */
 	blur?: BlurEvent;
 
 	/**
-	 * Event which is raised when input field of editor gets focus.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired when the input field of the editor gets focus.
 	 */
 	focus?: IgFocusEvent;
 
 	/**
-	 * Event which is raised on keydown event.
+	 * Fired on keydown event.
 	 * Return false in order to cancel key action.
-	 * Function takes arguments evt and ui.
-	 * Use evt.originalEvent to obtain reference to event of browser.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.key to obtain value of keyCode.
 	 */
 	keydown?: KeydownEvent;
 
 	/**
-	 * Event which is raised on keypress event.
+	 * Fired on keypress event.
 	 * Return false in order to cancel key action.
-	 * Function takes arguments evt and ui.
-	 * Use evt.originalEvent to obtain reference to event of browser.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.key to obtain value of keyCode.
 	 */
 	keypress?: KeypressEvent;
 
 	/**
-	 * Event which is raised on keyup event.
-	 * Function takes arguments evt and ui.
-	 * Use evt.originalEvent to obtain reference to event of browser.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.key to obtain value of keyCode.
+	 * Fired on keyup event.
 	 */
 	keyup?: KeyupEvent;
 
 	/**
-	 * Event which is raised before the editor value is changed.
+	 * Fired before changing the editor's value.
 	 * Return false in order to cancel change.
 	 * It can be raised after loosing focus or on spin events.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.newValue to obtain the new value.
-	 * Use ui.oldValue to obtain the old value.
-	 * Use ui.editorInput to obtain reference to the editor input.
 	 */
 	valueChanging?: ValueChangingEvent;
 
 	/**
-	 * Event which is raised after the editor value is changed. It can be raised after loosing focus or on spin events.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.newValue to obtain the value entered from the user after internal formatting.
-	 * Use ui.originalValue to obtain the value entered from the user before internal formatting.
-	 * Use ui.editorInput to obtain reference to the editor input.
+	 * Fired after the editor value is changed. It can be raised after loosing focus or on spin events.
 	 */
 	valueChanged?: ValueChangedEvent;
 
@@ -25732,6 +26298,10 @@ interface IgTextEditor {
 	[optionName: string]: any;
 }
 interface IgTextEditorMethods {
+	/**
+	 * Changes the all locales into the widget element to the language specified in [options.language](ui.igtexteditor#options:language)
+	 * Note that this method is for rare scenarios, see [language](ui.igtexteditor#options:language) or [locale](ui.igtexteditor#options:locale) option setter
+	 */
 	changeLocale(): void;
 
 	/**
@@ -25908,6 +26478,7 @@ interface IgNumericEditor {
 	/**
 	 * Gets/Sets list of items which are used as a source for the drop-down list.
 	 * Items in the list can be of type number.
+	 *
 	 */
 	listItems?: any[];
 
@@ -25916,6 +26487,7 @@ interface IgNumericEditor {
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [groupSeparator](ui.igNumericEditor#options:groupSeparator) or [decimalSeparator](ui.igNumericEditor#options:decimalSeparator) options.
+	 *
 	 */
 	negativeSign?: string;
 
@@ -25923,6 +26495,7 @@ interface IgNumericEditor {
 	 * Gets/Sets the string, which is used as negative pattern. The "n" flag represents the value of number. The "-" and "()" flags are static part of pattern.
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
+	 *
 	 */
 	negativePattern?: string;
 
@@ -25931,6 +26504,7 @@ interface IgNumericEditor {
 	 * Note: this option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [groupSeparator](ui.igNumericEditor#options:groupSeparator) or [negativeSign](ui.igNumericEditor#options:negativeSign) options.
+	 *
 	 */
 	decimalSeparator?: string;
 
@@ -25940,6 +26514,7 @@ interface IgNumericEditor {
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [decimalSeparator](ui.igNumericEditor#options:decimalSeparator) or [negativeSign](ui.igNumericEditor#options:negativeSign) options.
+	 *
 	 */
 	groupSeparator?: string;
 
@@ -25952,6 +26527,7 @@ interface IgNumericEditor {
 	 * Note: The numbers in the array must be positive integers.
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
+	 *
 	 */
 	groups?: any[];
 
@@ -25961,6 +26537,7 @@ interface IgNumericEditor {
 	 * Note: In case of min decimals value higher than max decimals - max decimals are equaled to min decimals property.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option supports values between 0 and 15, when dataMode is 'double' (default) and values between 0 and 7 in 'float' mode.
+	 *
 	 */
 	maxDecimals?: number;
 
@@ -25971,6 +26548,7 @@ interface IgNumericEditor {
 	 * Note: In case of min decimals value higher than max decimals - max decimals are equaled to min decimals property.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option supports values between 0 and 15, when dataMode is 'double' (default) and values between 0 and 7 in 'float' mode.
+	 *
 	 */
 	minDecimals?: number;
 
@@ -25978,12 +26556,14 @@ interface IgNumericEditor {
 	 * Gets/Sets whether the last decimal place will be rounded, when the maxDecimal option is defined and applied.
 	 * For example if the initial editor value is set to 123.4567, maxDecimals option is set to 3 and roundDecimals is enabled,
 	 * then editor will round the value and will display it as 123.457. If roundDecimals is disabled then editor value will be truncated to 123.456.
+	 *
 	 */
 	roundDecimals?: boolean;
 
 	/**
 	 * Gets/Sets the horizontal alignment of the text in the editor.
 	 *
+	 *
 	 * Valid values:
 	 * "left" The text into the input gets aligned to the left.
 	 * "right" The text into the input gets aligned to the right.
@@ -25996,6 +26576,7 @@ interface IgNumericEditor {
 	 * The range for the specific type follows the numeric type standards, e.g. in .NET Framework  [floating-point](https://msdn.microsoft.com/en-us/library/9ahet949.aspx) types and [integral types](https://msdn.microsoft.com/en-us/library/exx3b86w.aspx).
 	 * In addition, the maximum value that can be set to [minDecimals](ui.igNumericEditor#options:minDecimals) and [maxDecimals](ui.igNumericEditor#options:maxDecimals) options can be 15, when editor is in 'double' mode and 7, when in 'float' mode.
 	 *
+	 *
 	 * Valid values:
 	 * "double" the Number object is used with the limits of a double and if the value is not set, then the null or Number.NaN is used depending on the option [allowNullValue](ui.igNumericEditor#options:allowNullValue). Note: that is used as default.
 	 * "float" the Number object is used with the limits of a float and if the value is not set, then the null or Number.NaN is used depending on the option [allowNullValue](ui.igNumericEditor#options:allowNullValue).
@@ -26012,22 +26593,26 @@ interface IgNumericEditor {
 
 	/**
 	 * Gets/Sets the minimum value which can be entered in the editor by the end user.
+	 *
 	 */
 	minValue?: number;
 
 	/**
 	 * Gets/Sets the maximum value which can be entered in the editor by the end user.
+	 *
 	 */
 	maxValue?: number;
 
 	/**
 	 * Gets/Sets whether the editor value can become null.
 	 * If that option is disabled, and editor has no value, then value is set to 0 (or minValue/maxValue).
+	 *
 	 */
 	allowNullValue?: boolean;
 
 	/**
 	 * Gets/Sets the default delta-value which is used with "spin" [buttonType](ui.igNumericEditor#options:buttonType) or [spinUp](ui.igNumericEditor#methods:spinUp) and [spinDown](ui.igNumericEditor#methods:spinDown) methods to increment or decrement value in the editor. The value can not be negative. Non integer value is supported only for dataMode double and float.
+	 *
 	 */
 	spinDelta?: number;
 
@@ -26036,6 +26621,7 @@ interface IgNumericEditor {
 	 * If that option is set, then numeric value appears as a string with possible E-power flag. In edit mode the "E" or "e" character can be entered as well.
 	 * Notes: The "+" character is not supported in edit mode.
 	 *
+	 *
 	 * Valid values:
 	 * "null" scientific format is disabled.
 	 * "E" scientific format is enabled and the "E" character is used.
@@ -26048,11 +26634,13 @@ interface IgNumericEditor {
 	/**
 	 * Gets/Set the ability of the editor to automatically set value in the editor to the opposite side of the limit, when the spin action reaches minimum or maximum limit.
 	 * This applies to [minValue](ui.%%WidgetNameLowered%%#options:minValue) and [maxValue](ui.%%WidgetNameLowered%%#options:maxValue) or cycling through list items if [isLimitedToListValues](ui.%%WidgetNameLowered%%#options:isLimitedToListValues) is enabled.
+	 *
 	 */
 	spinWrapAround?: boolean;
 
 	/**
 	 * Gets/Sets if the editor should only allow values from the list of items. Enabling this also causes spin actions to cycle through list items instead.
+	 *
 	 */
 	isLimitedToListValues?: boolean;
 
@@ -26086,12 +26674,14 @@ interface IgNumericEditor {
 	/**
 	 * Gets/Sets value in editor. The effect of setting/getting that option depends on type of editor and on dataMode options for every type of editor.
 	 *
+	 *
 	 */
 	value?: any;
 
 	/**
 	 * Gets visibility of the spin, clear and drop-down button. That option can be set only on initialization. Combinations like 'dropdown,spin' or 'spin,clear' are supported too.Note! This option can not be set runtime.
 	 *
+	 *
 	 * Valid values:
 	 * "dropdown" A button to open/close the list is located on the right side of the editor.
 	 * "clear" A button to clear the value is located on the right side of the editor.
@@ -26101,11 +26691,13 @@ interface IgNumericEditor {
 
 	/**
 	 * Gets/Sets custom width of the drop-down list in pixels. If the value is equal to 0 or negative, then the width of editor is set as a drop-down width.
+	 *
 	 */
 	listWidth?: number;
 
 	/**
 	 * Gets/Sets the hover/unhover animation duration of a drop-down list item.
+	 *
 	 */
 	listItemHoverDuration?: number;
 
@@ -26114,11 +26706,13 @@ interface IgNumericEditor {
 	 * If the option is set to false the editor will attach the drop-down list element to the editor container
 	 * If the option is set to true the editor will attach its drop-down list to as a child of the body.
 	 * Note! This option can not be set runtime.
+	 *
 	 */
 	dropDownAttachedToBody?: boolean;
 
 	/**
 	 * Gets/Sets show/hide drop-down list animation duration in milliseconds.
+	 *
 	 */
 	dropDownAnimationDuration?: number;
 
@@ -26127,17 +26721,20 @@ interface IgNumericEditor {
 	 * Notes:
 	 * This option is overwritten if the number of list items is less than the set value. In that case the drop-down list displays all the items.
 	 * This option can not be set runtime.
+	 *
 	 */
 	visibleItemsCount?: number;
 
 	/**
 	 * Gets/Sets the text which appears in the editor when it has no focus and the "value" is null or empty string.
+	 *
 	 */
 	placeHolder?: string;
 
 	/**
 	 * Gets/Sets the action when the editor gets focused. The default value is selectAll.
 	 *
+	 *
 	 * Valid values:
 	 * "selectAll" Setting this option will select all the text into the editor when the edit mode gets enetered.
 	 * "atStart" Setting this option will move the cursor at the begining the text into the editor when the edit mode gets enetered.
@@ -26148,17 +26745,20 @@ interface IgNumericEditor {
 
 	/**
 	 * Gets/Sets if the editor should revert it's value to the previously valid value in case the value on blur, or enter key is not valid. If the opiton is set to false, editor calls clear functionality.
+	 *
 	 */
 	revertIfNotValid?: boolean;
 
 	/**
 	 * Gets/Sets if the editor should prevent form submition when enter key is pressed.
+	 *
 	 */
 	preventSubmitOnEnter?: boolean;
 
 	/**
 	 * Gets/Sets the drop-down list opening orientation when the list gets open. If the option is set to auto the editor has priority to open the drop-down list bottom. If the space is not enough it tries to open the list top. If the space is not enough in both directions then the list gets opened at the bottom of the editor.
 	 *
+	 *
 	 * Valid values:
 	 * "auto" If the option is set to auto the editor has priority to open the drop-down list bottom. If the space is not enough it tries to open the list top. If the space is not enough in both directions then the list gets opened at the bottom of the editor.
 	 * "bottom" The drop-down list is opened at the bottom of the editor.
@@ -26170,11 +26770,13 @@ interface IgNumericEditor {
 	 * Gets the ability to limit the editor to be used only as a dropdown list. When set to true the editor input is not editable.
 	 * Note! In case there are no list items - the editor will reamin readonly
 	 * Note! This option can not be set runtime.
+	 *
 	 */
 	dropDownOnReadOnly?: boolean;
 
 	/**
 	 * Disables/Enables default notifications for basic validation scenarios built in the editors such as required list selection, value wrapping around or spin limits.
+	 *
 	 */
 	suppressNotifications?: boolean;
 
@@ -26182,12 +26784,14 @@ interface IgNumericEditor {
 	 * Gets/Sets whether the onscreen keyboard (if available on device) should be shown when the dropdown button is clicked/tapped. This option prevents initial focus or removes it when the drop button is clicked/tapped.
 	 * Note: The option does not perform device detection so its behavior is always active if enabled.
 	 * Note: When drop down is opened the only way to close it will be using the drop down button.
+	 *
 	 */
 	suppressKeyboard?: boolean;
 
 	/**
 	 * Gets/Sets the width of the control.
 	 *
+	 *
 	 * Valid values:
 	 * "null" will stretch to fit data, if no other widths are defined.
 	 */
@@ -26196,6 +26800,7 @@ interface IgNumericEditor {
 	/**
 	 * Gets/Sets the height of the control.
 	 *
+	 *
 	 * Valid values:
 	 * "null" will fit the editor inside its parent container, if no other heights are defined.
 	 */
@@ -26203,26 +26808,31 @@ interface IgNumericEditor {
 
 	/**
 	 * Gets/Sets tabIndex attribute for the editor input.
+	 *
 	 */
 	tabIndex?: number;
 
 	/**
 	 * Gets/Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
+	 *
 	 */
 	nullValue?: string|number;
 
 	/**
 	 * Gets/Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
+	 *
 	 */
 	inputName?: string;
 
 	/**
 	 * Gets/Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
+	 *
 	 */
 	readOnly?: boolean;
 
 	/**
 	 * Gets/Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
+	 *
 	 */
 	disabled?: boolean;
 
@@ -26230,87 +26840,61 @@ interface IgNumericEditor {
 	 * Gets/Sets options supported by the [igValidator](ui.igvalidator#options) widget.
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
+	 *
 	 */
 	validatorOptions?: any;
 
 	/**
 	 * Set/Get the locale setting for the widget.
+	 *
 	 */
 	locale?: any;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
+	 *
 	 */
 	language?: string;
 
 	/**
 	 * Set/Get the regional setting for the widget.
+	 *
 	 */
 	regional?: string|Object;
 
 	/**
-	 * Event which is raised when the drop down is opening.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.editorInput to obtain reference to the editable input
-	 * Use ui.list to obtain reference to the list contaier.
+	 * Fired when the drop down is opening.
 	 */
 	dropDownListOpening?: DropDownListOpeningEvent;
 
 	/**
-	 * Event which is raised after the drop down is opened.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.editorInput to obtain reference to the editable input
-	 * Use ui.list to obtain reference to the list contaier.
+	 * Fired after the drop down is opened.
 	 */
 	dropDownListOpened?: DropDownListOpenedEvent;
 
 	/**
-	 * Event which is raised when the drop down is closing.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.editorInput to obtain reference to the editable input
-	 * Use ui.list to obtain reference to the list contaier.
+	 * Fired when the drop down is closing.
 	 */
 	dropDownListClosing?: DropDownListClosingEvent;
 
 	/**
-	 * Event which is raised after the drop down is closed.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.editorInput to obtain reference to the editable input
-	 * Use ui.list to obtain reference to the list contaier.
+	 * Fired after the drop down is closed.
 	 */
 	dropDownListClosed?: DropDownListClosedEvent;
 
 	/**
-	 * Event which is raised when an item in the drop down list is being selected.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.editorInput to obtain reference to the editable input
-	 * Use ui.list to obtain reference to the list contaier.
-	 * Use ui.item to obtain reference to the list item which is about to be selected.
+	 * Fired when an item in the drop down list is being selected.
 	 */
 	dropDownItemSelecting?: DropDownItemSelectingEvent;
 
 	/**
-	 * Event which is raised after an item in the drop down list is selected.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.editorInput to obtain reference to the editable input
-	 * Use ui.list to obtain reference to the list contaier.
-	 * Use ui.item to obtain reference to the list item which is selected.
+	 * Fired after an item in the drop down list is selected.
 	 */
 	dropDownItemSelected?: DropDownItemSelectedEvent;
 
 	/**
-	 * Event which is raised after text in the editor was changed. It can be raised when keyUp event occurs,
+	 * Fired after the editor's text has been changed. It can be raised when keyUp event occurs,
 	 * when the clear button is clicked or when an item from a list is selected.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.text to obtain new text
-	 * Use ui.oldText to obtain the old text.
 	 */
 	textChanged?: TextChangedEvent;
 
@@ -26365,7 +26949,17 @@ interface IgNumericEditorMethods {
 	 * Gets current regional.
 	 */
 	getRegionalOption(): string;
+
+	/**
+	 * Changes the the regional settings of widget element to the language specified in [options.regional](ui.ignumericeditor#options:regional)
+	 * Note that this method is for rare scenarios, use [regional](ui.ignumericeditor#options:regional) option setter
+	 */
 	changeRegional(): void;
+
+	/**
+	 * Changes the all locales into the widget element to the language specified in [options.language](ui.igtexteditor#options:language)
+	 * Note that this method is for rare scenarios, see [language](ui.igtexteditor#options:language) or [locale](ui.igtexteditor#options:locale) option setter
+	 */
 	changeLocale(): void;
 
 	/**
@@ -26450,17 +27044,20 @@ interface IgCurrencyEditor {
 	 * Gets/Sets the string, which is used as positive pattern. The "n" flag represents the value of number.
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
+	 *
 	 */
 	positivePattern?: string;
 
 	/**
 	 * Gets/Sets a string that is used as the currency symbol that is shown in display mode.
+	 *
 	 */
 	currencySymbol?: string;
 
 	/**
 	 * Gets/Sets list of items which are used as a source for the drop-down list.
 	 * Items in the list can be of type number.
+	 *
 	 */
 	listItems?: any[];
 
@@ -26469,6 +27066,7 @@ interface IgCurrencyEditor {
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [groupSeparator](ui.igNumericEditor#options:groupSeparator) or [decimalSeparator](ui.igNumericEditor#options:decimalSeparator) options.
+	 *
 	 */
 	negativeSign?: string;
 
@@ -26476,6 +27074,7 @@ interface IgCurrencyEditor {
 	 * Gets/Sets the string, which is used as negative pattern. The "n" flag represents the value of number. The "-" and "()" flags are static part of pattern.
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
+	 *
 	 */
 	negativePattern?: string;
 
@@ -26484,6 +27083,7 @@ interface IgCurrencyEditor {
 	 * Note: this option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [groupSeparator](ui.igNumericEditor#options:groupSeparator) or [negativeSign](ui.igNumericEditor#options:negativeSign) options.
+	 *
 	 */
 	decimalSeparator?: string;
 
@@ -26493,6 +27093,7 @@ interface IgCurrencyEditor {
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [decimalSeparator](ui.igNumericEditor#options:decimalSeparator) or [negativeSign](ui.igNumericEditor#options:negativeSign) options.
+	 *
 	 */
 	groupSeparator?: string;
 
@@ -26505,6 +27106,7 @@ interface IgCurrencyEditor {
 	 * Note: The numbers in the array must be positive integers.
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
+	 *
 	 */
 	groups?: any[];
 
@@ -26514,6 +27116,7 @@ interface IgCurrencyEditor {
 	 * Note: In case of min decimals value higher than max decimals - max decimals are equaled to min decimals property.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option supports values between 0 and 15, when dataMode is 'double' (default) and values between 0 and 7 in 'float' mode.
+	 *
 	 */
 	maxDecimals?: number;
 
@@ -26524,6 +27127,7 @@ interface IgCurrencyEditor {
 	 * Note: In case of min decimals value higher than max decimals - max decimals are equaled to min decimals property.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option supports values between 0 and 15, when dataMode is 'double' (default) and values between 0 and 7 in 'float' mode.
+	 *
 	 */
 	minDecimals?: number;
 
@@ -26531,12 +27135,14 @@ interface IgCurrencyEditor {
 	 * Gets/Sets whether the last decimal place will be rounded, when the maxDecimal option is defined and applied.
 	 * For example if the initial editor value is set to 123.4567, maxDecimals option is set to 3 and roundDecimals is enabled,
 	 * then editor will round the value and will display it as 123.457. If roundDecimals is disabled then editor value will be truncated to 123.456.
+	 *
 	 */
 	roundDecimals?: boolean;
 
 	/**
 	 * Gets/Sets the horizontal alignment of the text in the editor.
 	 *
+	 *
 	 * Valid values:
 	 * "left" The text into the input gets aligned to the left.
 	 * "right" The text into the input gets aligned to the right.
@@ -26549,6 +27155,7 @@ interface IgCurrencyEditor {
 	 * The range for the specific type follows the numeric type standards, e.g. in .NET Framework  [floating-point](https://msdn.microsoft.com/en-us/library/9ahet949.aspx) types and [integral types](https://msdn.microsoft.com/en-us/library/exx3b86w.aspx).
 	 * In addition, the maximum value that can be set to [minDecimals](ui.igNumericEditor#options:minDecimals) and [maxDecimals](ui.igNumericEditor#options:maxDecimals) options can be 15, when editor is in 'double' mode and 7, when in 'float' mode.
 	 *
+	 *
 	 * Valid values:
 	 * "double" the Number object is used with the limits of a double and if the value is not set, then the null or Number.NaN is used depending on the option [allowNullValue](ui.igNumericEditor#options:allowNullValue). Note: that is used as default.
 	 * "float" the Number object is used with the limits of a float and if the value is not set, then the null or Number.NaN is used depending on the option [allowNullValue](ui.igNumericEditor#options:allowNullValue).
@@ -26565,22 +27172,26 @@ interface IgCurrencyEditor {
 
 	/**
 	 * Gets/Sets the minimum value which can be entered in the editor by the end user.
+	 *
 	 */
 	minValue?: number;
 
 	/**
 	 * Gets/Sets the maximum value which can be entered in the editor by the end user.
+	 *
 	 */
 	maxValue?: number;
 
 	/**
 	 * Gets/Sets whether the editor value can become null.
 	 * If that option is disabled, and editor has no value, then value is set to 0 (or minValue/maxValue).
+	 *
 	 */
 	allowNullValue?: boolean;
 
 	/**
 	 * Gets/Sets the default delta-value which is used with "spin" [buttonType](ui.igNumericEditor#options:buttonType) or [spinUp](ui.igNumericEditor#methods:spinUp) and [spinDown](ui.igNumericEditor#methods:spinDown) methods to increment or decrement value in the editor. The value can not be negative. Non integer value is supported only for dataMode double and float.
+	 *
 	 */
 	spinDelta?: number;
 
@@ -26589,6 +27200,7 @@ interface IgCurrencyEditor {
 	 * If that option is set, then numeric value appears as a string with possible E-power flag. In edit mode the "E" or "e" character can be entered as well.
 	 * Notes: The "+" character is not supported in edit mode.
 	 *
+	 *
 	 * Valid values:
 	 * "null" scientific format is disabled.
 	 * "E" scientific format is enabled and the "E" character is used.
@@ -26601,11 +27213,13 @@ interface IgCurrencyEditor {
 	/**
 	 * Gets/Set the ability of the editor to automatically set value in the editor to the opposite side of the limit, when the spin action reaches minimum or maximum limit.
 	 * This applies to [minValue](ui.%%WidgetNameLowered%%#options:minValue) and [maxValue](ui.%%WidgetNameLowered%%#options:maxValue) or cycling through list items if [isLimitedToListValues](ui.%%WidgetNameLowered%%#options:isLimitedToListValues) is enabled.
+	 *
 	 */
 	spinWrapAround?: boolean;
 
 	/**
 	 * Gets/Sets if the editor should only allow values from the list of items. Enabling this also causes spin actions to cycle through list items instead.
+	 *
 	 */
 	isLimitedToListValues?: boolean;
 
@@ -26639,12 +27253,14 @@ interface IgCurrencyEditor {
 	/**
 	 * Gets/Sets value in editor. The effect of setting/getting that option depends on type of editor and on dataMode options for every type of editor.
 	 *
+	 *
 	 */
 	value?: any;
 
 	/**
 	 * Gets visibility of the spin, clear and drop-down button. That option can be set only on initialization. Combinations like 'dropdown,spin' or 'spin,clear' are supported too.Note! This option can not be set runtime.
 	 *
+	 *
 	 * Valid values:
 	 * "dropdown" A button to open/close the list is located on the right side of the editor.
 	 * "clear" A button to clear the value is located on the right side of the editor.
@@ -26654,11 +27270,13 @@ interface IgCurrencyEditor {
 
 	/**
 	 * Gets/Sets custom width of the drop-down list in pixels. If the value is equal to 0 or negative, then the width of editor is set as a drop-down width.
+	 *
 	 */
 	listWidth?: number;
 
 	/**
 	 * Gets/Sets the hover/unhover animation duration of a drop-down list item.
+	 *
 	 */
 	listItemHoverDuration?: number;
 
@@ -26667,11 +27285,13 @@ interface IgCurrencyEditor {
 	 * If the option is set to false the editor will attach the drop-down list element to the editor container
 	 * If the option is set to true the editor will attach its drop-down list to as a child of the body.
 	 * Note! This option can not be set runtime.
+	 *
 	 */
 	dropDownAttachedToBody?: boolean;
 
 	/**
 	 * Gets/Sets show/hide drop-down list animation duration in milliseconds.
+	 *
 	 */
 	dropDownAnimationDuration?: number;
 
@@ -26680,17 +27300,20 @@ interface IgCurrencyEditor {
 	 * Notes:
 	 * This option is overwritten if the number of list items is less than the set value. In that case the drop-down list displays all the items.
 	 * This option can not be set runtime.
+	 *
 	 */
 	visibleItemsCount?: number;
 
 	/**
 	 * Gets/Sets the text which appears in the editor when it has no focus and the "value" is null or empty string.
+	 *
 	 */
 	placeHolder?: string;
 
 	/**
 	 * Gets/Sets the action when the editor gets focused. The default value is selectAll.
 	 *
+	 *
 	 * Valid values:
 	 * "selectAll" Setting this option will select all the text into the editor when the edit mode gets enetered.
 	 * "atStart" Setting this option will move the cursor at the begining the text into the editor when the edit mode gets enetered.
@@ -26701,17 +27324,20 @@ interface IgCurrencyEditor {
 
 	/**
 	 * Gets/Sets if the editor should revert it's value to the previously valid value in case the value on blur, or enter key is not valid. If the opiton is set to false, editor calls clear functionality.
+	 *
 	 */
 	revertIfNotValid?: boolean;
 
 	/**
 	 * Gets/Sets if the editor should prevent form submition when enter key is pressed.
+	 *
 	 */
 	preventSubmitOnEnter?: boolean;
 
 	/**
 	 * Gets/Sets the drop-down list opening orientation when the list gets open. If the option is set to auto the editor has priority to open the drop-down list bottom. If the space is not enough it tries to open the list top. If the space is not enough in both directions then the list gets opened at the bottom of the editor.
 	 *
+	 *
 	 * Valid values:
 	 * "auto" If the option is set to auto the editor has priority to open the drop-down list bottom. If the space is not enough it tries to open the list top. If the space is not enough in both directions then the list gets opened at the bottom of the editor.
 	 * "bottom" The drop-down list is opened at the bottom of the editor.
@@ -26723,11 +27349,13 @@ interface IgCurrencyEditor {
 	 * Gets the ability to limit the editor to be used only as a dropdown list. When set to true the editor input is not editable.
 	 * Note! In case there are no list items - the editor will reamin readonly
 	 * Note! This option can not be set runtime.
+	 *
 	 */
 	dropDownOnReadOnly?: boolean;
 
 	/**
 	 * Disables/Enables default notifications for basic validation scenarios built in the editors such as required list selection, value wrapping around or spin limits.
+	 *
 	 */
 	suppressNotifications?: boolean;
 
@@ -26735,12 +27363,14 @@ interface IgCurrencyEditor {
 	 * Gets/Sets whether the onscreen keyboard (if available on device) should be shown when the dropdown button is clicked/tapped. This option prevents initial focus or removes it when the drop button is clicked/tapped.
 	 * Note: The option does not perform device detection so its behavior is always active if enabled.
 	 * Note: When drop down is opened the only way to close it will be using the drop down button.
+	 *
 	 */
 	suppressKeyboard?: boolean;
 
 	/**
 	 * Gets/Sets the width of the control.
 	 *
+	 *
 	 * Valid values:
 	 * "null" will stretch to fit data, if no other widths are defined.
 	 */
@@ -26749,6 +27379,7 @@ interface IgCurrencyEditor {
 	/**
 	 * Gets/Sets the height of the control.
 	 *
+	 *
 	 * Valid values:
 	 * "null" will fit the editor inside its parent container, if no other heights are defined.
 	 */
@@ -26756,26 +27387,31 @@ interface IgCurrencyEditor {
 
 	/**
 	 * Gets/Sets tabIndex attribute for the editor input.
+	 *
 	 */
 	tabIndex?: number;
 
 	/**
 	 * Gets/Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
+	 *
 	 */
 	nullValue?: string|number;
 
 	/**
 	 * Gets/Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
+	 *
 	 */
 	inputName?: string;
 
 	/**
 	 * Gets/Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
+	 *
 	 */
 	readOnly?: boolean;
 
 	/**
 	 * Gets/Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
+	 *
 	 */
 	disabled?: boolean;
 
@@ -26783,21 +27419,25 @@ interface IgCurrencyEditor {
 	 * Gets/Sets options supported by the [igValidator](ui.igvalidator#options) widget.
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
+	 *
 	 */
 	validatorOptions?: any;
 
 	/**
 	 * Set/Get the locale setting for the widget.
+	 *
 	 */
 	locale?: any;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
+	 *
 	 */
 	language?: string;
 
 	/**
 	 * Set/Get the regional setting for the widget.
+	 *
 	 */
 	regional?: string|Object;
 
@@ -26859,6 +27499,11 @@ interface IgCurrencyEditorMethods {
 	 * Gets current regional.
 	 */
 	getRegionalOption(): string;
+
+	/**
+	 * Changes the the regional settings of widget element to the language specified in [options.regional](ui.ignumericeditor#options:regional)
+	 * Note that this method is for rare scenarios, use [regional](ui.ignumericeditor#options:regional) option setter
+	 */
 	changeRegional(): void;
 }
 interface JQuery {
@@ -26870,12 +27515,14 @@ interface IgPercentEditor {
 	 * Gets/Sets the pattern for positive numeric values, which is used in display (no focus) state.
 	 * If you use the "en-US" culture the default value for "positivePattern" will be "n$" where the "$" flag represents the "numericSymbol" and the "n" flag represents the value of the number.
 	 * Note: this option has priority over possible regional settings.
+	 *
 	 */
 	positivePattern?: string;
 
 	/**
 	 * Gets/Sets the symbol, which is used in display (no focus) state.
 	 * Note: this option has priority over possible regional settings.
+	 *
 	 */
 	percentSymbol?: string;
 
@@ -26885,6 +27532,7 @@ interface IgPercentEditor {
 	 * For example, if the factor is 100 and the "value" is set to 0.123, then the editor will show string "12.3".
 	 * Possible values: 1 or 100.
 	 * Note: this option has priority over possible regional settings.
+	 *
 	 */
 	displayFactor?: number;
 
@@ -26893,6 +27541,7 @@ interface IgPercentEditor {
 	 * The range for the specific type follows the numeric type standards, e.g. in .NET Framework  [floating-point](https://msdn.microsoft.com/en-us/library/9ahet949.aspx) types and [integral types](https://msdn.microsoft.com/en-us/library/exx3b86w.aspx).
 	 * In addition, the maximum value that can be set to [minDecimals](ui.igPercentEditor#options:minDecimals) and [maxDecimals](ui.igPercentEditor#options:maxDecimals) options can be 15, when editor is in 'double' mode and 7, when in 'float' mode.
 	 *
+	 *
 	 * Valid values:
 	 * "double" the Number object is used with the limits of a double and if the value is not set, then the null or Number.NaN is used depending on the option [allowNullValue](ui.igpercenteditor#options:allowNullValue). Note: that is used as default.
 	 * "float" the Number object is used with the limits of a float and if the value is not set, then the null or Number.NaN is used depending on the option [allowNullValue](ui.igpercenteditor#options:allowNullValue).
@@ -26909,12 +27558,14 @@ interface IgPercentEditor {
 
 	/**
 	 * Gets/Sets the default delta-value which is used with "spin" [buttonType](ui.igpercenteditor#options:buttonType) or [spinUp](ui.igpercenteditor#methods:spinUp) and [spinDown](ui.igpercenteditor#methods:spinDown) methods to increment or decrement value in the editor. The value can not be negative. Non integer value is supported only for dataMode double and float.
+	 *
 	 */
 	spinDelta?: number;
 
 	/**
 	 * Gets/Sets list of items which are used as a source for the drop-down list.
 	 * Items in the list can be of type number.
+	 *
 	 */
 	listItems?: any[];
 
@@ -26923,6 +27574,7 @@ interface IgPercentEditor {
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [groupSeparator](ui.igNumericEditor#options:groupSeparator) or [decimalSeparator](ui.igNumericEditor#options:decimalSeparator) options.
+	 *
 	 */
 	negativeSign?: string;
 
@@ -26930,6 +27582,7 @@ interface IgPercentEditor {
 	 * Gets/Sets the string, which is used as negative pattern. The "n" flag represents the value of number. The "-" and "()" flags are static part of pattern.
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
+	 *
 	 */
 	negativePattern?: string;
 
@@ -26938,6 +27591,7 @@ interface IgPercentEditor {
 	 * Note: this option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [groupSeparator](ui.igNumericEditor#options:groupSeparator) or [negativeSign](ui.igNumericEditor#options:negativeSign) options.
+	 *
 	 */
 	decimalSeparator?: string;
 
@@ -26947,6 +27601,7 @@ interface IgPercentEditor {
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [decimalSeparator](ui.igNumericEditor#options:decimalSeparator) or [negativeSign](ui.igNumericEditor#options:negativeSign) options.
+	 *
 	 */
 	groupSeparator?: string;
 
@@ -26959,6 +27614,7 @@ interface IgPercentEditor {
 	 * Note: The numbers in the array must be positive integers.
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
+	 *
 	 */
 	groups?: any[];
 
@@ -26968,6 +27624,7 @@ interface IgPercentEditor {
 	 * Note: In case of min decimals value higher than max decimals - max decimals are equaled to min decimals property.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option supports values between 0 and 15, when dataMode is 'double' (default) and values between 0 and 7 in 'float' mode.
+	 *
 	 */
 	maxDecimals?: number;
 
@@ -26978,6 +27635,7 @@ interface IgPercentEditor {
 	 * Note: In case of min decimals value higher than max decimals - max decimals are equaled to min decimals property.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option supports values between 0 and 15, when dataMode is 'double' (default) and values between 0 and 7 in 'float' mode.
+	 *
 	 */
 	minDecimals?: number;
 
@@ -26985,12 +27643,14 @@ interface IgPercentEditor {
 	 * Gets/Sets whether the last decimal place will be rounded, when the maxDecimal option is defined and applied.
 	 * For example if the initial editor value is set to 123.4567, maxDecimals option is set to 3 and roundDecimals is enabled,
 	 * then editor will round the value and will display it as 123.457. If roundDecimals is disabled then editor value will be truncated to 123.456.
+	 *
 	 */
 	roundDecimals?: boolean;
 
 	/**
 	 * Gets/Sets the horizontal alignment of the text in the editor.
 	 *
+	 *
 	 * Valid values:
 	 * "left" The text into the input gets aligned to the left.
 	 * "right" The text into the input gets aligned to the right.
@@ -27000,17 +27660,20 @@ interface IgPercentEditor {
 
 	/**
 	 * Gets/Sets the minimum value which can be entered in the editor by the end user.
+	 *
 	 */
 	minValue?: number;
 
 	/**
 	 * Gets/Sets the maximum value which can be entered in the editor by the end user.
+	 *
 	 */
 	maxValue?: number;
 
 	/**
 	 * Gets/Sets whether the editor value can become null.
 	 * If that option is disabled, and editor has no value, then value is set to 0 (or minValue/maxValue).
+	 *
 	 */
 	allowNullValue?: boolean;
 
@@ -27019,6 +27682,7 @@ interface IgPercentEditor {
 	 * If that option is set, then numeric value appears as a string with possible E-power flag. In edit mode the "E" or "e" character can be entered as well.
 	 * Notes: The "+" character is not supported in edit mode.
 	 *
+	 *
 	 * Valid values:
 	 * "null" scientific format is disabled.
 	 * "E" scientific format is enabled and the "E" character is used.
@@ -27031,11 +27695,13 @@ interface IgPercentEditor {
 	/**
 	 * Gets/Set the ability of the editor to automatically set value in the editor to the opposite side of the limit, when the spin action reaches minimum or maximum limit.
 	 * This applies to [minValue](ui.%%WidgetNameLowered%%#options:minValue) and [maxValue](ui.%%WidgetNameLowered%%#options:maxValue) or cycling through list items if [isLimitedToListValues](ui.%%WidgetNameLowered%%#options:isLimitedToListValues) is enabled.
+	 *
 	 */
 	spinWrapAround?: boolean;
 
 	/**
 	 * Gets/Sets if the editor should only allow values from the list of items. Enabling this also causes spin actions to cycle through list items instead.
+	 *
 	 */
 	isLimitedToListValues?: boolean;
 
@@ -27069,12 +27735,14 @@ interface IgPercentEditor {
 	/**
 	 * Gets/Sets value in editor. The effect of setting/getting that option depends on type of editor and on dataMode options for every type of editor.
 	 *
+	 *
 	 */
 	value?: any;
 
 	/**
 	 * Gets visibility of the spin, clear and drop-down button. That option can be set only on initialization. Combinations like 'dropdown,spin' or 'spin,clear' are supported too.Note! This option can not be set runtime.
 	 *
+	 *
 	 * Valid values:
 	 * "dropdown" A button to open/close the list is located on the right side of the editor.
 	 * "clear" A button to clear the value is located on the right side of the editor.
@@ -27084,11 +27752,13 @@ interface IgPercentEditor {
 
 	/**
 	 * Gets/Sets custom width of the drop-down list in pixels. If the value is equal to 0 or negative, then the width of editor is set as a drop-down width.
+	 *
 	 */
 	listWidth?: number;
 
 	/**
 	 * Gets/Sets the hover/unhover animation duration of a drop-down list item.
+	 *
 	 */
 	listItemHoverDuration?: number;
 
@@ -27097,11 +27767,13 @@ interface IgPercentEditor {
 	 * If the option is set to false the editor will attach the drop-down list element to the editor container
 	 * If the option is set to true the editor will attach its drop-down list to as a child of the body.
 	 * Note! This option can not be set runtime.
+	 *
 	 */
 	dropDownAttachedToBody?: boolean;
 
 	/**
 	 * Gets/Sets show/hide drop-down list animation duration in milliseconds.
+	 *
 	 */
 	dropDownAnimationDuration?: number;
 
@@ -27110,17 +27782,20 @@ interface IgPercentEditor {
 	 * Notes:
 	 * This option is overwritten if the number of list items is less than the set value. In that case the drop-down list displays all the items.
 	 * This option can not be set runtime.
+	 *
 	 */
 	visibleItemsCount?: number;
 
 	/**
 	 * Gets/Sets the text which appears in the editor when it has no focus and the "value" is null or empty string.
+	 *
 	 */
 	placeHolder?: string;
 
 	/**
 	 * Gets/Sets the action when the editor gets focused. The default value is selectAll.
 	 *
+	 *
 	 * Valid values:
 	 * "selectAll" Setting this option will select all the text into the editor when the edit mode gets enetered.
 	 * "atStart" Setting this option will move the cursor at the begining the text into the editor when the edit mode gets enetered.
@@ -27131,17 +27806,20 @@ interface IgPercentEditor {
 
 	/**
 	 * Gets/Sets if the editor should revert it's value to the previously valid value in case the value on blur, or enter key is not valid. If the opiton is set to false, editor calls clear functionality.
+	 *
 	 */
 	revertIfNotValid?: boolean;
 
 	/**
 	 * Gets/Sets if the editor should prevent form submition when enter key is pressed.
+	 *
 	 */
 	preventSubmitOnEnter?: boolean;
 
 	/**
 	 * Gets/Sets the drop-down list opening orientation when the list gets open. If the option is set to auto the editor has priority to open the drop-down list bottom. If the space is not enough it tries to open the list top. If the space is not enough in both directions then the list gets opened at the bottom of the editor.
 	 *
+	 *
 	 * Valid values:
 	 * "auto" If the option is set to auto the editor has priority to open the drop-down list bottom. If the space is not enough it tries to open the list top. If the space is not enough in both directions then the list gets opened at the bottom of the editor.
 	 * "bottom" The drop-down list is opened at the bottom of the editor.
@@ -27153,11 +27831,13 @@ interface IgPercentEditor {
 	 * Gets the ability to limit the editor to be used only as a dropdown list. When set to true the editor input is not editable.
 	 * Note! In case there are no list items - the editor will reamin readonly
 	 * Note! This option can not be set runtime.
+	 *
 	 */
 	dropDownOnReadOnly?: boolean;
 
 	/**
 	 * Disables/Enables default notifications for basic validation scenarios built in the editors such as required list selection, value wrapping around or spin limits.
+	 *
 	 */
 	suppressNotifications?: boolean;
 
@@ -27165,12 +27845,14 @@ interface IgPercentEditor {
 	 * Gets/Sets whether the onscreen keyboard (if available on device) should be shown when the dropdown button is clicked/tapped. This option prevents initial focus or removes it when the drop button is clicked/tapped.
 	 * Note: The option does not perform device detection so its behavior is always active if enabled.
 	 * Note: When drop down is opened the only way to close it will be using the drop down button.
+	 *
 	 */
 	suppressKeyboard?: boolean;
 
 	/**
 	 * Gets/Sets the width of the control.
 	 *
+	 *
 	 * Valid values:
 	 * "null" will stretch to fit data, if no other widths are defined.
 	 */
@@ -27179,6 +27861,7 @@ interface IgPercentEditor {
 	/**
 	 * Gets/Sets the height of the control.
 	 *
+	 *
 	 * Valid values:
 	 * "null" will fit the editor inside its parent container, if no other heights are defined.
 	 */
@@ -27186,26 +27869,31 @@ interface IgPercentEditor {
 
 	/**
 	 * Gets/Sets tabIndex attribute for the editor input.
+	 *
 	 */
 	tabIndex?: number;
 
 	/**
 	 * Gets/Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
+	 *
 	 */
 	nullValue?: string|number;
 
 	/**
 	 * Gets/Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
+	 *
 	 */
 	inputName?: string;
 
 	/**
 	 * Gets/Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
+	 *
 	 */
 	readOnly?: boolean;
 
 	/**
 	 * Gets/Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
+	 *
 	 */
 	disabled?: boolean;
 
@@ -27213,21 +27901,25 @@ interface IgPercentEditor {
 	 * Gets/Sets options supported by the [igValidator](ui.igvalidator#options) widget.
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
+	 *
 	 */
 	validatorOptions?: any;
 
 	/**
 	 * Set/Get the locale setting for the widget.
+	 *
 	 */
 	locale?: any;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
+	 *
 	 */
 	language?: string;
 
 	/**
 	 * Set/Get the regional setting for the widget.
+	 *
 	 */
 	regional?: string|Object;
 
@@ -27297,6 +27989,11 @@ interface IgPercentEditorMethods {
 	 * Gets current regional.
 	 */
 	getRegionalOption(): string;
+
+	/**
+	 * Changes the the regional settings of widget element to the language specified in [options.regional](ui.ignumericeditor#options:regional)
+	 * Note that this method is for rare scenarios, use [regional](ui.ignumericeditor#options:regional) option setter
+	 */
 	changeRegional(): void;
 }
 interface JQuery {
@@ -27307,6 +28004,7 @@ interface IgMaskEditor {
 	/**
 	 * Gets visibility of the clear button. That option can be set only on initialization.
 	 *
+	 *
 	 * Valid values:
 	 * "clear" A button to clear the value is located on the right side of the editor.
 	 */
@@ -27330,12 +28028,14 @@ interface IgMaskEditor {
 	 * >: all letters to the right are converted to the upper case. In order to disable conversion, the ">" flag should be used again.
 	 * <: all letters to the right are converted to the lower case. In order to disable conversion, the "<" flag should be used again.
 	 * Note! This option can not be set runtime.
+	 *
 	 */
 	inputMask?: string;
 
 	/**
 	 * It affects the value of the control (value method/option and submitted in forms). It defines what the value should contain from text, unfilled prompts and literals. The default is allText and when used value method/option returns the text entered, all prompts (positions) and literals.
 	 *
+	 *
 	 * Valid values:
 	 * "rawText" only entered text. All unfilled prompts (positions) and literals are ignored (removed).
 	 * "rawTextWithRequiredPrompts" only entered text and required prompts (positions). All optional unfilled prompts and literals are ignored (removed)
@@ -27348,16 +28048,19 @@ interface IgMaskEditor {
 
 	/**
 	 * Gets character which is used as prompt in edit mode for available entry position.
+	 *
 	 */
 	unfilledCharsPrompt?: string;
 
 	/**
 	 * Gets/Sets character which is used as replacement of not-filled required position in mask when editor is in display mode (not focused).
+	 *
 	 */
 	padChar?: string;
 
 	/**
 	 * Gets/Sets character which is used as replacement of not-filled required position in mask when application calls get for the [value](ui.igmaskeditor#methods:value) methods.
+	 *
 	 */
 	emptyChar?: string;
 
@@ -27366,6 +28069,7 @@ interface IgMaskEditor {
 	 * Notes:
 	 * If "excludeKeys" option contains same characters as this option, then "excludeKeys" has priority.
 	 * Note! This option can not be se runtime.
+	 *
 	 */
 	includeKeys?: string;
 
@@ -27374,6 +28078,7 @@ interface IgMaskEditor {
 	 * Notes:
 	 * If a character is specified in "includeKeys" option also, then "excludeKeys" has priority.
 	 * Note! This option can not be se runtime.
+	 *
 	 */
 	excludeKeys?: string;
 
@@ -27440,6 +28145,7 @@ interface IgMaskEditor {
 
 	/**
 	 * Gets/Sets value in editor. The effect of setting/getting that option depends on type of editor and on dataMode options for every type of editor.
+	 *
 	 */
 	value?: any;
 	suppressKeyboard?: boolean;
@@ -27447,6 +28153,7 @@ interface IgMaskEditor {
 	/**
 	 * Gets/Sets the horizontal alignment of the text in the editor.
 	 *
+	 *
 	 * Valid values:
 	 * "left" The text into the input gets aligned to the left.
 	 * "right" The text into the input gets aligned to the right.
@@ -27456,12 +28163,14 @@ interface IgMaskEditor {
 
 	/**
 	 * Gets/Sets the text which appears in the editor when it has no focus and the "value" is null or empty string.
+	 *
 	 */
 	placeHolder?: string;
 
 	/**
 	 * Gets/Sets the action when the editor gets focused. The default value is selectAll.
 	 *
+	 *
 	 * Valid values:
 	 * "selectAll" Setting this option will select all the text into the editor when the edit mode gets enetered.
 	 * "atStart" Setting this option will move the cursor at the begining the text into the editor when the edit mode gets enetered.
@@ -27472,34 +28181,40 @@ interface IgMaskEditor {
 
 	/**
 	 * Gets/Sets if the editor should revert it's value to the previously valid value in case the value on blur, or enter key is not valid. If the opiton is set to false, editor calls clear functionality.
+	 *
 	 */
 	revertIfNotValid?: boolean;
 
 	/**
 	 * Gets/Sets if the editor should prevent form submition when enter key is pressed.
+	 *
 	 */
 	preventSubmitOnEnter?: boolean;
 
 	/**
 	 * Gets/Sets the ability to convert the input characters to upper case (true) or keeps the characters as they are (false). The option has effect only while keyboard entries and paste.
 	 * Note! When the option is set at runtime the editor is not changing the current value.
+	 *
 	 */
 	toUpper?: boolean;
 
 	/**
 	 * Gets/Sets the ability to convert the input characters to lower case (true) or keeps the characters as they are (false). The option has effect only while keyboard entries and paste.
 	 * Note! When the option is set at runtime the editor is not changing the current value.
+	 *
 	 */
 	toLower?: boolean;
 
 	/**
 	 * Disables/Enables default notifications for basic validation scenarios built in the editors such as required list selection, value wrapping around or spin limits.
+	 *
 	 */
 	suppressNotifications?: boolean;
 
 	/**
 	 * Gets/Sets the width of the control.
 	 *
+	 *
 	 * Valid values:
 	 * "null" will stretch to fit data, if no other widths are defined.
 	 */
@@ -27508,6 +28223,7 @@ interface IgMaskEditor {
 	/**
 	 * Gets/Sets the height of the control.
 	 *
+	 *
 	 * Valid values:
 	 * "null" will fit the editor inside its parent container, if no other heights are defined.
 	 */
@@ -27515,32 +28231,38 @@ interface IgMaskEditor {
 
 	/**
 	 * Gets/Sets tabIndex attribute for the editor input.
+	 *
 	 */
 	tabIndex?: number;
 
 	/**
 	 * Gets/Sets whether the editor value can become null.
 	 * If that option is false, and editor has no value, then value is set to an empty string.
+	 *
 	 */
 	allowNullValue?: boolean;
 
 	/**
 	 * Gets/Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
+	 *
 	 */
 	nullValue?: string|number;
 
 	/**
 	 * Gets/Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
+	 *
 	 */
 	inputName?: string;
 
 	/**
 	 * Gets/Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
+	 *
 	 */
 	readOnly?: boolean;
 
 	/**
 	 * Gets/Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
+	 *
 	 */
 	disabled?: boolean;
 
@@ -27548,21 +28270,25 @@ interface IgMaskEditor {
 	 * Gets/Sets options supported by the [igValidator](ui.igvalidator#options) widget.
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
+	 *
 	 */
 	validatorOptions?: any;
 
 	/**
 	 * Set/Get the locale setting for the widget.
+	 *
 	 */
 	locale?: any;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
+	 *
 	 */
 	language?: string;
 
 	/**
 	 * Set/Get the regional setting for the widget.
+	 *
 	 */
 	regional?: string|Object;
 	dropDownListOpening?: DropDownListOpeningEvent;
@@ -27573,12 +28299,8 @@ interface IgMaskEditor {
 	dropDownItemSelected?: DropDownItemSelectedEvent;
 
 	/**
-	 * Event which is raised after text in the editor was changed. It can be raised when keyUp event occurs,
+	 * Fired after the editor's text has been changed. It can be raised when keyUp event occurs,
 	 * when the clear button is clicked or when an item from a list is selected.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.text to obtain new text
-	 * Use ui.oldText to obtain the old text.
 	 */
 	textChanged?: TextChangedEvent;
 
@@ -27611,6 +28333,11 @@ interface IgMaskEditorMethods {
 	 * Checks if the value in the editor is valid. Note: This function will not trigger automatic notifications.
 	 */
 	isValid(): boolean;
+
+	/**
+	 * Changes the all locales into the widget element to the language specified in [options.language](ui.igtexteditor#options:language)
+	 * Note that this method is for rare scenarios, see [language](ui.igtexteditor#options:language) or [locale](ui.igtexteditor#options:locale) option setter
+	 */
 	changeLocale(): void;
 
 	/**
@@ -27662,18 +28389,21 @@ interface IgDateEditor {
 	/**
 	 * Gets/Sets the value of the editor. Date object can be set as value. String can be set and the editor will pass it to the Date object constructor and use the corresponding Date object as the value. MVC date format can be used too.
 	 * Note! This option doesn't use the dateInputFormat to extract the date.
+	 *
 	 */
 	value?: Date;
 
 	/**
 	 * Gets the minimum value which can be entered in editor by user. Date object can be set as value. String value can be passed and the editor will use the javascript Date object constructor to create date object and will use it for the comparison. MVC date format can be used too.
 	 * Note! This option doesn't use the dateInputFormat to extract the date.
+	 *
 	 */
 	minValue?: Date;
 
 	/**
 	 * Gets the maximum value which can be entered in editor by user. Date object can be set as value. String value can be passed and the editor will use the javascript Date object constructor to create date object and will use it for the comparison. MVC date format can be used too.
 	 * Note! This option doesn't use the dateInputFormat to extract the date.
+	 *
 	 */
 	maxValue?: Date;
 
@@ -27715,6 +28445,7 @@ interface IgDateEditor {
 	 * "f": milliseconds field in hundreds
 	 * "ff": milliseconds field in tenths
 	 * "fff": milliseconds field
+	 *
 	 */
 	dateDisplayFormat?: string;
 
@@ -27745,6 +28476,7 @@ interface IgDateEditor {
 	 * "ff": milliseconds field in tenths
 	 * "fff": milliseconds field
 	 * Note! This option can not be set runtime.
+	 *
 	 */
 	dateInputFormat?: string;
 
@@ -27754,6 +28486,7 @@ interface IgDateEditor {
 	 * For example 10:00 AM from a client with local offset of 5 hours ahead of GMT will be serialized as:
 	 * "2016-11-11T10:00:00+05:00"
 	 *
+	 *
 	 * Valid values:
 	 * "date" The value method returns a Date object. When this mode is set the value sent to the server on submit is serialized as ISO 8061 string with local time and zone values by default.
 	 * "displayModeText" The "text" in display mode (no focus) format (pattern) is used to be send to the server and is returned from the value() method (returns a string object).
@@ -27765,12 +28498,14 @@ interface IgDateEditor {
 	 * Gets/Sets time zone offset from UTC, in minutes. The client date values are displayed with this offset instead of the local one.
 	 * Note: It is recommended that this option is used with an UTC value (e.g. "2016-11-03T14:08:08.504Z") so the outcome is consistent.
 	 * Values with ambiguous time zone could map to unpredictable times depending on the user agent local zone.
+	 *
 	 */
 	displayTimeOffset?: any;
 
 	/**
 	 * Gets visibility of the spin and clear buttons. That option can be set only on initialization. Combinations like 'spin,clear' are supported too.
 	 *
+	 *
 	 * Valid values:
 	 * "clear" A button to clear the value is located on the right side of the editor.
 	 * "spin" Spin buttons are located on the right side of the editor
@@ -27792,6 +28527,7 @@ interface IgDateEditor {
 	 * }
 	 * Time periods that don't have values use 1 as default.
 	 *
+	 *
 	 * Valid values:
 	 * "number" Value this value it is applied to all time periods - years, days, minutes, etc.
 	 * "object" A configuration object, which defines specific values for each time period. The option can accept the following format:
@@ -27802,12 +28538,14 @@ interface IgDateEditor {
 	 * Gets/Sets ability to modify only 1 date field on spin events.
 	 * Value false enables changes of other date fields when incremented or decremented date-field reaches its limits.
 	 * Value true modifies only value of one field.
+	 *
 	 */
 	limitSpinToCurrentField?: boolean;
 
 	/**
 	 * Enables/Disables serializing client date as UTC ISO 8061 string instead of using the local time and zone values.
 	 * The option is only applied in "date" [dataMode](ui.%%WidgetNameLowered%%#options:dataMode).
+	 *
 	 */
 	enableUTCDates?: boolean;
 
@@ -27815,16 +28553,19 @@ interface IgDateEditor {
 	 * Gets/Sets year for auto detection of 20th and 21st centuries.
 	 * That option is used to automatically fill century when the user entered only 1 or 2 digits into the year field or when the date pattern contains only 1 or 2 year positions, e.g. "yy" or "y".
 	 * If user entered value larger than value of this option, then 20th century is used, otherwise the 21st.
+	 *
 	 */
 	centuryThreshold?: number;
 
 	/**
 	 * Gets/Set value used to increase/decrease year part of the date, in order to set difference between year in Gregorian calendar and displayed year.
+	 *
 	 */
 	yearShift?: number;
 
 	/**
 	 * Gets/Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
+	 *
 	 */
 	nullValue?: string|number|Date;
 
@@ -27899,6 +28640,7 @@ interface IgDateEditor {
 	 * Notes:
 	 * If "excludeKeys" option contains same characters as this option, then "excludeKeys" has priority.
 	 * Note! This option can not be se runtime.
+	 *
 	 */
 	includeKeys?: string;
 
@@ -27907,6 +28649,7 @@ interface IgDateEditor {
 	 * Notes:
 	 * If a character is specified in "includeKeys" option also, then "excludeKeys" has priority.
 	 * Note! This option can not be se runtime.
+	 *
 	 */
 	excludeKeys?: string;
 
@@ -27938,6 +28681,7 @@ interface IgDateEditor {
 	/**
 	 * Gets/Sets the horizontal alignment of the text in the editor.
 	 *
+	 *
 	 * Valid values:
 	 * "left" The text into the input gets aligned to the left.
 	 * "right" The text into the input gets aligned to the right.
@@ -27947,12 +28691,14 @@ interface IgDateEditor {
 
 	/**
 	 * Gets/Sets the text which appears in the editor when it has no focus and the "value" is null or empty string.
+	 *
 	 */
 	placeHolder?: string;
 
 	/**
 	 * Gets/Sets the action when the editor gets focused. The default value is selectAll.
 	 *
+	 *
 	 * Valid values:
 	 * "selectAll" Setting this option will select all the text into the editor when the edit mode gets enetered.
 	 * "atStart" Setting this option will move the cursor at the begining the text into the editor when the edit mode gets enetered.
@@ -27963,22 +28709,26 @@ interface IgDateEditor {
 
 	/**
 	 * Gets/Sets if the editor should revert it's value to the previously valid value in case the value on blur, or enter key is not valid. If the opiton is set to false, editor calls clear functionality.
+	 *
 	 */
 	revertIfNotValid?: boolean;
 
 	/**
 	 * Gets/Sets if the editor should prevent form submition when enter key is pressed.
+	 *
 	 */
 	preventSubmitOnEnter?: boolean;
 
 	/**
 	 * Disables/Enables default notifications for basic validation scenarios built in the editors such as required list selection, value wrapping around or spin limits.
+	 *
 	 */
 	suppressNotifications?: boolean;
 
 	/**
 	 * Gets/Sets the width of the control.
 	 *
+	 *
 	 * Valid values:
 	 * "null" will stretch to fit data, if no other widths are defined.
 	 */
@@ -27987,6 +28737,7 @@ interface IgDateEditor {
 	/**
 	 * Gets/Sets the height of the control.
 	 *
+	 *
 	 * Valid values:
 	 * "null" will fit the editor inside its parent container, if no other heights are defined.
 	 */
@@ -27994,27 +28745,32 @@ interface IgDateEditor {
 
 	/**
 	 * Gets/Sets tabIndex attribute for the editor input.
+	 *
 	 */
 	tabIndex?: number;
 
 	/**
 	 * Gets/Sets whether the editor value can become null.
 	 * If that option is false, and editor has no value, then value is set to an empty string.
+	 *
 	 */
 	allowNullValue?: boolean;
 
 	/**
 	 * Gets/Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
+	 *
 	 */
 	inputName?: string;
 
 	/**
 	 * Gets/Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
+	 *
 	 */
 	readOnly?: boolean;
 
 	/**
 	 * Gets/Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
+	 *
 	 */
 	disabled?: boolean;
 
@@ -28022,21 +28778,25 @@ interface IgDateEditor {
 	 * Gets/Sets options supported by the [igValidator](ui.igvalidator#options) widget.
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
+	 *
 	 */
 	validatorOptions?: any;
 
 	/**
 	 * Set/Get the locale setting for the widget.
+	 *
 	 */
 	locale?: any;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
+	 *
 	 */
 	language?: string;
 
 	/**
 	 * Set/Get the regional setting for the widget.
+	 *
 	 */
 	regional?: string|Object;
 
@@ -28076,6 +28836,10 @@ interface IgDateEditor {
 	[optionName: string]: any;
 }
 interface IgDateEditorMethods {
+	/**
+	 * Changes the the regional settings of widget element to the language specified in [options.regional](ui.igdateeditor#options:regional)
+	 * Note that this method is for rare scenarios, use [regional](ui.igdateeditor#options:regional) option setter
+	 */
 	changeRegional(): void;
 
 	/**
@@ -28096,6 +28860,8 @@ interface IgDateEditorMethods {
 	/**
 	 * Sets selected date. This method can be used when dataMode is set as either displayModeText or editModeText.
 	 * In such cases the value() cannot accept a date object as a new value and getSelectedDate() can be used to replace that functionality.
+	 *
+	 * @param date
 	 */
 	selectDate(date: Date): void;
 
@@ -28146,22 +28912,22 @@ interface ItemSelectedEvent {
 
 interface ItemSelectedEventUIParam {
 	/**
-	 * Used to obtain reference to igEditor.
+	 * Gets a reference to the editor.
 	 */
 	owner?: any;
 
 	/**
-	 * Used to obtain reference to the date object which is selected.
+	 * Gets a reference to the selected date object.
 	 */
 	dateFromPicker?: any;
 
 	/**
-	 * Used to obtain a referece to the selected html element from the calendar.
+	 * Gets a reference to the selected html element from the calendar.
 	 */
 	item?: any;
 
 	/**
-	 * Used to obtain a reference to jQuery UI date picker, used as a calendar from the igDatePicker.
+	 * Gets a reference to jQuery UI date picker widget, used as a calendar from the igDatePicker.
 	 */
 	calendar?: any;
 }
@@ -28170,6 +28936,7 @@ interface IgDatePicker {
 	/**
 	 * Gets visibility of the spin, clear and drop-down button. That option can be set only on initialization. Combinations like 'dropdown,spin' or 'spin,clear' are supported too.
 	 *
+	 *
 	 * Valid values:
 	 * "dropdown" A button to open/close the list is located on the right side of the editor.
 	 * "clear" A button to clear the value is located on the right side of the editor.
@@ -28179,12 +28946,14 @@ interface IgDatePicker {
 
 	/**
 	 * Gets/Sets the options supported by the [jquery.ui.datepicker](http://api.jqueryui.com/datepicker/). Only options related to the drop-down calendar are supported.
+	 *
 	 */
 	datepickerOptions?: any;
 
 	/**
 	 * Gets the ability to limit igDatePicker to be used only as s calendar. When set to true the editor input is not editable.
 	 * Note! This option can not be set runtime.
+	 *
 	 */
 	dropDownOnReadOnly?: boolean;
 
@@ -28216,24 +28985,28 @@ interface IgDatePicker {
 	/**
 	 * Gets/Sets whether the onscreen keyboard (if available on device) should be shown when the dropdown button is clicked/tapped. This option prevents initial focus or removes it when the drop button is clicked/tapped.
 	 * Note: The option does not perform device detection so its behavior is always active if enabled.
+	 *
 	 */
 	suppressKeyboard?: boolean;
 
 	/**
 	 * Gets/Sets the value of the editor. Date object can be set as value. String can be set and the editor will pass it to the Date object constructor and use the corresponding Date object as the value. MVC date format can be used too.
 	 * Note! This option doesn't use the dateInputFormat to extract the date.
+	 *
 	 */
 	value?: Date;
 
 	/**
 	 * Gets the minimum value which can be entered in editor by user. Date object can be set as value. String value can be passed and the editor will use the javascript Date object constructor to create date object and will use it for the comparison. MVC date format can be used too.
 	 * Note! This option doesn't use the dateInputFormat to extract the date.
+	 *
 	 */
 	minValue?: Date;
 
 	/**
 	 * Gets the maximum value which can be entered in editor by user. Date object can be set as value. String value can be passed and the editor will use the javascript Date object constructor to create date object and will use it for the comparison. MVC date format can be used too.
 	 * Note! This option doesn't use the dateInputFormat to extract the date.
+	 *
 	 */
 	maxValue?: Date;
 
@@ -28275,6 +29048,7 @@ interface IgDatePicker {
 	 * "f": milliseconds field in hundreds
 	 * "ff": milliseconds field in tenths
 	 * "fff": milliseconds field
+	 *
 	 */
 	dateDisplayFormat?: string;
 
@@ -28305,6 +29079,7 @@ interface IgDatePicker {
 	 * "ff": milliseconds field in tenths
 	 * "fff": milliseconds field
 	 * Note! This option can not be set runtime.
+	 *
 	 */
 	dateInputFormat?: string;
 
@@ -28314,6 +29089,7 @@ interface IgDatePicker {
 	 * For example 10:00 AM from a client with local offset of 5 hours ahead of GMT will be serialized as:
 	 * "2016-11-11T10:00:00+05:00"
 	 *
+	 *
 	 * Valid values:
 	 * "date" The value method returns a Date object. When this mode is set the value sent to the server on submit is serialized as ISO 8061 string with local time and zone values by default.
 	 * "displayModeText" The "text" in display mode (no focus) format (pattern) is used to be send to the server and is returned from the value() method (returns a string object).
@@ -28325,6 +29101,7 @@ interface IgDatePicker {
 	 * Gets/Sets time zone offset from UTC, in minutes. The client date values are displayed with this offset instead of the local one.
 	 * Note: It is recommended that this option is used with an UTC value (e.g. "2016-11-03T14:08:08.504Z") so the outcome is consistent.
 	 * Values with ambiguous time zone could map to unpredictable times depending on the user agent local zone.
+	 *
 	 */
 	displayTimeOffset?: any;
 
@@ -28343,6 +29120,7 @@ interface IgDatePicker {
 	 * }
 	 * Time periods that don't have values use 1 as default.
 	 *
+	 *
 	 * Valid values:
 	 * "number" Value this value it is applied to all time periods - years, days, minutes, etc.
 	 * "object" A configuration object, which defines specific values for each time period. The option can accept the following format:
@@ -28353,12 +29131,14 @@ interface IgDatePicker {
 	 * Gets/Sets ability to modify only 1 date field on spin events.
 	 * Value false enables changes of other date fields when incremented or decremented date-field reaches its limits.
 	 * Value true modifies only value of one field.
+	 *
 	 */
 	limitSpinToCurrentField?: boolean;
 
 	/**
 	 * Enables/Disables serializing client date as UTC ISO 8061 string instead of using the local time and zone values.
 	 * The option is only applied in "date" [dataMode](ui.%%WidgetNameLowered%%#options:dataMode).
+	 *
 	 */
 	enableUTCDates?: boolean;
 
@@ -28366,16 +29146,19 @@ interface IgDatePicker {
 	 * Gets/Sets year for auto detection of 20th and 21st centuries.
 	 * That option is used to automatically fill century when the user entered only 1 or 2 digits into the year field or when the date pattern contains only 1 or 2 year positions, e.g. "yy" or "y".
 	 * If user entered value larger than value of this option, then 20th century is used, otherwise the 21st.
+	 *
 	 */
 	centuryThreshold?: number;
 
 	/**
 	 * Gets/Set value used to increase/decrease year part of the date, in order to set difference between year in Gregorian calendar and displayed year.
+	 *
 	 */
 	yearShift?: number;
 
 	/**
 	 * Gets/Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
+	 *
 	 */
 	nullValue?: string|number|Date;
 
@@ -28419,6 +29202,7 @@ interface IgDatePicker {
 	 * Notes:
 	 * If "excludeKeys" option contains same characters as this option, then "excludeKeys" has priority.
 	 * Note! This option can not be se runtime.
+	 *
 	 */
 	includeKeys?: string;
 
@@ -28427,6 +29211,7 @@ interface IgDatePicker {
 	 * Notes:
 	 * If a character is specified in "includeKeys" option also, then "excludeKeys" has priority.
 	 * Note! This option can not be se runtime.
+	 *
 	 */
 	excludeKeys?: string;
 
@@ -28458,6 +29243,7 @@ interface IgDatePicker {
 	/**
 	 * Gets/Sets the horizontal alignment of the text in the editor.
 	 *
+	 *
 	 * Valid values:
 	 * "left" The text into the input gets aligned to the left.
 	 * "right" The text into the input gets aligned to the right.
@@ -28467,12 +29253,14 @@ interface IgDatePicker {
 
 	/**
 	 * Gets/Sets the text which appears in the editor when it has no focus and the "value" is null or empty string.
+	 *
 	 */
 	placeHolder?: string;
 
 	/**
 	 * Gets/Sets the action when the editor gets focused. The default value is selectAll.
 	 *
+	 *
 	 * Valid values:
 	 * "selectAll" Setting this option will select all the text into the editor when the edit mode gets enetered.
 	 * "atStart" Setting this option will move the cursor at the begining the text into the editor when the edit mode gets enetered.
@@ -28483,22 +29271,26 @@ interface IgDatePicker {
 
 	/**
 	 * Gets/Sets if the editor should revert it's value to the previously valid value in case the value on blur, or enter key is not valid. If the opiton is set to false, editor calls clear functionality.
+	 *
 	 */
 	revertIfNotValid?: boolean;
 
 	/**
 	 * Gets/Sets if the editor should prevent form submition when enter key is pressed.
+	 *
 	 */
 	preventSubmitOnEnter?: boolean;
 
 	/**
 	 * Disables/Enables default notifications for basic validation scenarios built in the editors such as required list selection, value wrapping around or spin limits.
+	 *
 	 */
 	suppressNotifications?: boolean;
 
 	/**
 	 * Gets/Sets the width of the control.
 	 *
+	 *
 	 * Valid values:
 	 * "null" will stretch to fit data, if no other widths are defined.
 	 */
@@ -28507,6 +29299,7 @@ interface IgDatePicker {
 	/**
 	 * Gets/Sets the height of the control.
 	 *
+	 *
 	 * Valid values:
 	 * "null" will fit the editor inside its parent container, if no other heights are defined.
 	 */
@@ -28514,27 +29307,32 @@ interface IgDatePicker {
 
 	/**
 	 * Gets/Sets tabIndex attribute for the editor input.
+	 *
 	 */
 	tabIndex?: number;
 
 	/**
 	 * Gets/Sets whether the editor value can become null.
 	 * If that option is false, and editor has no value, then value is set to an empty string.
+	 *
 	 */
 	allowNullValue?: boolean;
 
 	/**
 	 * Gets/Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
+	 *
 	 */
 	inputName?: string;
 
 	/**
 	 * Gets/Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
+	 *
 	 */
 	readOnly?: boolean;
 
 	/**
 	 * Gets/Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
+	 *
 	 */
 	disabled?: boolean;
 
@@ -28542,39 +29340,35 @@ interface IgDatePicker {
 	 * Gets/Sets options supported by the [igValidator](ui.igvalidator#options) widget.
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
+	 *
 	 */
 	validatorOptions?: any;
 
 	/**
 	 * Set/Get the locale setting for the widget.
+	 *
 	 */
 	locale?: any;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
+	 *
 	 */
 	language?: string;
 
 	/**
 	 * Set/Get the regional setting for the widget.
+	 *
 	 */
 	regional?: string|Object;
 
 	/**
-	 * Event which is raised when the drop down is opening.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.editorInput to obtain reference to the editable input
-	 * Use ui.calendar to obtain a reference to jQuery UI date picker widget, used as a calendar from the igDatePicker.
+	 * Fired when the drop down is opening.
 	 */
 	dropDownListOpening?: DropDownListOpeningEvent;
 
 	/**
-	 * Event which is raised after the drop down is opened.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.editorInput to obtain reference to the editable input
-	 * Use ui.calendar to obtain a reference to jQuery UI date picker widget, used as a calendar from the igDatePicker.
+	 * Fired after the drop down is opened.
 	 */
 	dropDownListOpened?: DropDownListOpenedEvent;
 
@@ -28589,11 +29383,7 @@ interface IgDatePicker {
 	dropDownItemSelecting?: DropDownItemSelectingEvent;
 
 	/**
-	 * Event which is raised after the drop down (calendar) is closed.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.editorInput to obtain reference to the editable input
-	 * Use ui.calendar to obtain a reference to jQuery UI date picker widget, used as a calendar from the igDatePicker.
+	 * Fired after the drop down (calendar) is closed.
 	 */
 	dropDownListClosed?: DropDownListClosedEvent;
 
@@ -28603,12 +29393,7 @@ interface IgDatePicker {
 	dropDownItemSelected?: DropDownItemSelectedEvent;
 
 	/**
-	 * Event which is raised after a date selection in the calendar.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.dateFromPicker to obtain reference to the date object which is selected.
-	 * Use ui.item to obtain a referece to the selected html element from the calendar.
-	 * Use ui.calendar to obtain a reference to jQuery UI date picker, used as a calendar from the igDatePicker.
+	 * Fired after a date selection in the calendar.
 	 */
 	itemSelected?: ItemSelectedEvent;
 
@@ -28618,6 +29403,10 @@ interface IgDatePicker {
 	[optionName: string]: any;
 }
 interface IgDatePickerMethods {
+	/**
+	 * Changes the the regional settings of widget element to the language specified in [options.regional](ui.igdatepicker#options:regional)
+	 * Note that this method is for rare scenarios, use [regional](ui.igdatepicker#options:regional) option setter
+	 */
 	changeRegional(): void;
 
 	/**
@@ -28672,6 +29461,8 @@ interface IgDatePickerMethods {
 	/**
 	 * Sets selected date. This method can be used when dataMode is set as either displayModeText or editModeText.
 	 * In such cases the value() cannot accept a date object as a new value and getSelectedDate() can be used to replace that functionality.
+	 *
+	 * @param date
 	 */
 	selectDate(date: Date): void;
 
@@ -28711,12 +29502,14 @@ interface JQuery {
 interface IgCheckboxEditor {
 	/**
 	 * Gets/Sets whether the checkbox is checked.
+	 *
 	 */
 	checked?: boolean;
 
 	/**
 	 * Gets/Sets size of the checkbox based on preset styles.For different sizes, define 'width' and 'height' options instead.
 	 *
+	 *
 	 * Valid values:
 	 * "verysmall" The size of the Checkbox editor is very small.
 	 * "small" The size of the Checkbox editor is small.
@@ -28728,16 +29521,19 @@ interface IgCheckboxEditor {
 	/**
 	 * Gets/Sets a custom class on the checkbox. Custom image can be used this way.
 	 * The following jQuery classes can be used in addition http://api.jqueryui.com/theming/icons/
+	 *
 	 */
 	iconClass?: string;
 
 	/**
 	 * Gets/Sets tabIndex attribute for the editor input.
+	 *
 	 */
 	tabIndex?: number;
 
 	/**
 	 * Gets/Sets the readonly attribute. Does not allow editing. Disables changing the checkbox state as an interaction, but it still can be changed programmatically. On submit the current value is sent into the request.
+	 *
 	 */
 	readOnly?: boolean;
 	allowNullValue?: boolean;
@@ -28746,6 +29542,7 @@ interface IgCheckboxEditor {
 	/**
 	 * Gets/Sets the width of the control.
 	 *
+	 *
 	 * Valid values:
 	 * "null" will stretch to fit data, if no other widths are defined.
 	 */
@@ -28754,6 +29551,7 @@ interface IgCheckboxEditor {
 	/**
 	 * Gets/Sets the height of the control.
 	 *
+	 *
 	 * Valid values:
 	 * "null" will fit the editor inside its parent container, if no other heights are defined.
 	 */
@@ -28761,16 +29559,19 @@ interface IgCheckboxEditor {
 
 	/**
 	 * Gets/Sets value in editor. The effect of setting/getting that option depends on type of editor and on dataMode options for every type of editor.
+	 *
 	 */
 	value?: any;
 
 	/**
 	 * Gets/Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
+	 *
 	 */
 	inputName?: string;
 
 	/**
 	 * Gets/Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
+	 *
 	 */
 	disabled?: boolean;
 
@@ -28778,154 +29579,98 @@ interface IgCheckboxEditor {
 	 * Gets/Sets options supported by the [igValidator](ui.igvalidator#options) widget.
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
+	 *
 	 */
 	validatorOptions?: any;
 
 	/**
 	 * Set/Get the locale setting for the widget.
+	 *
 	 */
 	locale?: any;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
+	 *
 	 */
 	language?: string;
 
 	/**
 	 * Set/Get the regional setting for the widget.
+	 *
 	 */
 	regional?: string|Object;
 
 	/**
-	 * Event which is raised before value in editor was changed.
+	 * Fired before changing the editor's value.
 	 * Return false in order to cancel change.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.newValue to obtain the new value.
-	 * Use ui.newState to obtain the new state.
-	 * Use ui.oldValue to obtain the old value.
-	 * Use ui.oldState to obtain the old state.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput obtain reference to the editor element.
 	 */
 	valueChanging?: ValueChangingEvent;
 
 	/**
-	 * Event which is raised after value in editor was changed.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.newValue to obtain the new value.
-	 * Use ui.newState to obtain the new state.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput obtain reference to the editor element.
+	 * Fired after the editor's value has been changed.
 	 */
 	valueChanged?: ValueChangedEvent;
 
 	/**
-	 * Event which is raised before rendering of the editor completes.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to get a reference to the editor performing rendering.
-	 * Use ui.element to get a reference to the editor element.
+	 * Fired before rendering of the editor has finished.
 	 */
 	rendering?: RenderingEvent;
 
 	/**
-	 * Event which is raised after rendering of the editor completes.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to get a reference to the editor performing rendering.
-	 * Use ui.element to get a reference to the editor element.
+	 * Fired after rendering of the editor has finished.
 	 */
 	rendered?: RenderedEvent;
 
 	/**
-	 * Event which is raised on mousedown event.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired on mousedown event.
 	 */
 	mousedown?: MousedownEvent;
 
 	/**
-	 * Event which is raised on mouseup event.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired on mouseup event.
 	 */
 	mouseup?: MouseupEvent;
 
 	/**
-	 * Event which is raised on mousemove at any part of editor including drop-down list.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired on mousemove at any part of editor including the drop-down list.
 	 */
 	mousemove?: MousemoveEvent;
 
 	/**
-	 * Event which is raised on mouseover at any part of editor including drop-down list.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired on mouseover at any part of editor including the drop-down list.
 	 */
 	mouseover?: MouseoverEvent;
 
 	/**
-	 * Event which is raised on mouseleave at any part of editor including drop-down list.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired on mouseleave at any part of editor including the drop-down list.
 	 */
 	mouseout?: MouseoutEvent;
 
 	/**
-	 * Event which is raised when input field of editor loses focus.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired when the input field of the editor loses focus.
 	 */
 	blur?: BlurEvent;
 
 	/**
-	 * Event which is raised when input field of editor gets focus.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired when the input field of the editor gets focus.
 	 */
 	focus?: IgFocusEvent;
 
 	/**
-	 * Event which is raised on keydown event.
+	 * Fired on keydown event.
 	 * Return false in order to cancel key action.
-	 * Function takes arguments evt and ui.
-	 * Use evt.originalEvent to obtain reference to event of browser.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.key to obtain value of keyCode.
 	 */
 	keydown?: KeydownEvent;
 
 	/**
-	 * Event which is raised on keypress event.
+	 * Fired on keypress event.
 	 * Return false in order to cancel key action.
-	 * Function takes arguments evt and ui.
-	 * Use evt.originalEvent to obtain reference to event of browser.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.key to obtain value of keyCode.
 	 */
 	keypress?: KeypressEvent;
 
 	/**
-	 * Event which is raised on keyup event.
-	 * Function takes arguments evt and ui.
-	 * Use evt.originalEvent to obtain reference to event of browser.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.key to obtain value of keyCode.
+	 * Fired on keyup event.
 	 */
 	keyup?: KeyupEvent;
 
@@ -28946,6 +29691,8 @@ interface IgCheckboxEditorMethods {
 	 * This option is used when the checkbox is intended to operate as a Boolean editor. In that case the return type is bool.
 	 * 2. If the [value](ui.igcheckboxeditor#options:value) option IS defined, then 'value' method will return the value that will be submitted when the editor is checked and the form is submitted.
 	 * To get checked state regardless of the 'value' option, use $(".selector").igCheckboxEditor("option", "checked");
+	 *
+	 * @param newValue
 	 */
 	value(newValue: Object): string;
 
@@ -29012,6 +29759,553 @@ interface JQuery {
 	data(propertyName: "igCheckboxEditor"): IgCheckboxEditorMethods;
 }
 
+interface IgTimePickerItemsDelta {
+	hours?: number;
+	minutes?: number;
+
+	/**
+	 * Option for IgTimePickerItemsDelta
+	 */
+	[optionName: string]: any;
+}
+
+interface IgTimePicker {
+	/**
+	 * Gets delta-value which is used to generate the drop-down items for the time picker.
+	 * Accepted values for deltas are positive integer numbers, and the fractional portion of floating point numbers is ignored.
+	 *
+	 * object  A configuration object, which defines specific values for each time period. The option can accept the following format:
+	 * itemsDelta: {
+	 * hours: 0,
+	 * minutes: 30,
+	 * }
+	 * Time periods that don't have values use 0 as default for hours and 30 for minutes.
+	 */
+	itemsDelta?: IgTimePickerItemsDelta;
+
+	/**
+	 * Gets/Sets delta-value which is used to increment or decrement the editor time on spin actions.When not editing (focused) the delta is applied on the day if available in the input mask or the lowest available period.
+	 * When in edit mode the time period, where the cursor is positioned, is incremented or decremented with the defined delta value.
+	 * Accepted values for deltas are positive integer numbers, and the fractional portion of floating point numbers is ignored.
+	 * spinDelta: {
+	 * hours: 12,
+	 * minutes: 15
+	 * }
+	 * Default value is {hours: 1, minutes: 30}.
+	 *
+	 */
+	spinDelta?: any;
+
+	/**
+	 * Gets format of time while timepicker has focus.
+	 * Value of that option can be set to explicit time pattern or to a flag defined by regional settings.
+	 * If value is set to explicit time pattern and pattern besides date-flags has explicit characters which match with time-flags or mask-flags, then the "escape" character should be used in front of them.
+	 * If option is not set, then the "time" is used automatically.
+	 * List of predefined regional flags:
+	 * "time": the timePattern member of regional option is used
+	 * List of explicit characters, which should have escape \\ character in front of them: C, &, a, A, ?, L, 9, 0, #, >, <, y, M, d, h, H, m, s, t, f.
+	 * List of time-flags when explicit time pattern is used:
+	 * "t": first character of string which represents AM/PM field
+	 * "tt": 2 characters of string which represents AM/PM field
+	 * "hh": hours field in 12-hours format with leading zero
+	 * "HH": hours field in 24-hours format with leading zero
+	 * "mm": minutes field with leading zero
+	 * Note! This option can not be set runtime.
+	 *
+	 */
+	timeInputFormat?: string;
+
+	/**
+	 * Gets/Sets format of time while timepicker has no focus.
+	 * Value of that option can be set to a specific time pattern or to a flag defined by regional settings.
+	 * If value is not set, then the timeInputFormat is used automatically.
+	 * If value is set to explicit time pattern and pattern besides time-flags has explicit characters which match with time-flags or mask-flags, then the "escape" character should be used in front of them.
+	 * List of predefined regional flags:
+	 * "time": the timePattern member of regional option is used
+	 * List of explicit characters, which should have escape \\ character in front of them:
+	 * C, &, a, A, ?, L, 9, 0, #, >, <, y, M, d, h, H, m, s, t, f.
+	 * List of time-flags when explicit time pattern is used:
+	 * "t": first character of string which represents AM/PM field
+	 * "tt": 2 characters of string which represents AM/PM field
+	 * "h": hours field in 12-hours format without leading zero
+	 * "hh": hours field in 12-hours format with leading zero
+	 * "H": hours field in 24-hours format without leading zero
+	 * "HH": hours field in 24-hours format with leading zero
+	 * "m": minutes field without leading zero
+	 * "mm": minutes field with leading zero
+	 *
+	 */
+	timeDisplayFormat?: string;
+
+	/**
+	 * Gets/Sets if the editor should only allow values from the list of items. Matching is case-insensitive.
+	 *
+	 */
+	isLimitedToListValues?: boolean;
+
+	/**
+	 * Gets/Sets whether the onscreen keyboard (if available on device) should be shown when the dropdown button is clicked/tapped. This option prevents initial focus or removes it when the drop button is clicked/tapped.
+	 * Note: The option does not perform device detection so its behavior is always active if enabled.
+	 * Note: When drop down is opened the only way to close it will be using the drop down button.
+	 *
+	 */
+	suppressKeyboard?: boolean;
+
+	/**
+	 * Gets/Sets the drop-down list opening orientation when the list gets open. If the option is set to auto the timepicker has priority to open the drop-down list bottom. If the space is not enough it tries to open the list top. If the space is not enough in both directions then the list gets opened at the bottom of the editor.
+	 *
+	 *
+	 * Valid values:
+	 * "auto" If the option is set to auto the timepicker has priority to open the drop-down list bottom. If the space is not enough it tries to open the list top. If the space is not enough in both directions then the list gets opened at the bottom of the editor.
+	 * "bottom" The drop-down list is opened at the bottom of the timepicker.
+	 * "top" The drop-down list is opened at the top of the timepicker.
+	 */
+	dropDownOrientation?: string;
+
+	/**
+	 * Gets the number of the items to be shown at once when the drop-down list get opened.
+	 * Notes:
+	 * This option is overwritten if the number of list items is less than the set value. In that case the drop-down list displays all the items.
+	 * This option can not be set runtime.
+	 *
+	 */
+	visibleItemsCount?: number;
+
+	/**
+	 * Gets/Sets custom width of the drop-down list in pixels. If the value is equal to 0 or negative, then the width of timepicker is set as a drop-down width.
+	 *
+	 */
+	listWidth?: number;
+
+	/**
+	 * Gets/Sets the hover/unhover animation duration of a drop-down list item.
+	 *
+	 */
+	listItemHoverDuration?: number;
+
+	/**
+	 * Gets wheather the drop-down list element is attached to the body of the document, or to the timepicker container element.
+	 * If the option is set to false the timepicker will attach the drop-down list element to the timepicker container
+	 * If the option is set to true the timepicker will attach its drop-down list to as a child of the body.
+	 * Note! This option can not be set runtime.
+	 *
+	 */
+	dropDownAttachedToBody?: boolean;
+
+	/**
+	 * Gets/Sets show/hide drop-down list animation duration in milliseconds.
+	 *
+	 */
+	dropDownAnimationDuration?: number;
+
+	/**
+	 * Gets visibility of the spin, clear and drop-down button. That option can be set only on initialization. Combinations like 'dropdown, clear' or 'spin, clear' are supported too.Note! This option can not be set runtime.
+	 * Note! A combination like 'dropdown, spin' is not allowed.
+	 *
+	 *
+	 * Valid values:
+	 * "dropdown" A button to open/close the list is located on the right side of the editor.
+	 * "clear" A button to clear the value is located on the right side of the editor.
+	 * "spin" Spin buttons are located on the right side of the editor.
+	 */
+	buttonType?: string;
+
+	/**
+	 * Gets/Set the ability of the editor to automatically set value in the editor to the opposite side of the limit, when the spin action reaches minimum or maximum limit.
+	 * This applies to [minValue](ui.%%WidgetNameLowered%%#options:minValue) and [maxValue](ui.%%WidgetNameLowered%%#options:maxValue) or cycling through list items if [isLimitedToListValues](ui.%%WidgetNameLowered%%#options:isLimitedToListValues) is enabled.
+	 *
+	 */
+	spinWrapAround?: boolean;
+
+	/**
+	 * Removed from timepicker options
+	 */
+	dateDisplayFormat?: any;
+
+	/**
+	 * Removed from timepicker options
+	 */
+	dateInputFormat?: any;
+
+	/**
+	 * Removed from timepicker options
+	 */
+	yearShift?: any;
+
+	/**
+	 * Removed from timepicker options
+	 */
+	displayTimeOffset?: any;
+
+	/**
+	 * Gets/Sets the value of the editor. Date object can be set as value. String can be set and the editor will pass it to the Date object constructor and use the corresponding Date object as the value. MVC date format can be used too.
+	 * Note! This option doesn't use the dateInputFormat to extract the date.
+	 *
+	 */
+	value?: Date;
+
+	/**
+	 * Gets the minimum value which can be entered in editor by user. Date object can be set as value. String value can be passed and the editor will use the javascript Date object constructor to create date object and will use it for the comparison. MVC date format can be used too.
+	 * Note! This option doesn't use the dateInputFormat to extract the date.
+	 *
+	 */
+	minValue?: Date;
+
+	/**
+	 * Gets the maximum value which can be entered in editor by user. Date object can be set as value. String value can be passed and the editor will use the javascript Date object constructor to create date object and will use it for the comparison. MVC date format can be used too.
+	 * Note! This option doesn't use the dateInputFormat to extract the date.
+	 *
+	 */
+	maxValue?: Date;
+
+	/**
+	 * Gets the value type returned by the get of value() method and option. Also affects how the value is stored for form submit.
+	 * The [enableUTCDates](ui.%%WidgetNameLowered%%#options:enableUTCDates) option can be used to output an UTC ISO string instead.
+	 * For example 10:00 AM from a client with local offset of 5 hours ahead of GMT will be serialized as:
+	 * "2016-11-11T10:00:00+05:00"
+	 *
+	 *
+	 * Valid values:
+	 * "date" The value method returns a Date object. When this mode is set the value sent to the server on submit is serialized as ISO 8061 string with local time and zone values by default.
+	 * "displayModeText" The "text" in display mode (no focus) format (pattern) is used to be send to the server and is returned from the value() method (returns a string object).
+	 * "editModeText" The "text" in edit mode (focus) format (pattern) is used to be send to the server and is returned from the value() method (returns a string object).
+	 */
+	dataMode?: string;
+
+	/**
+	 * Gets/Sets ability to modify only 1 date field on spin events.
+	 * Value false enables changes of other date fields when incremented or decremented date-field reaches its limits.
+	 * Value true modifies only value of one field.
+	 *
+	 */
+	limitSpinToCurrentField?: boolean;
+
+	/**
+	 * Enables/Disables serializing client date as UTC ISO 8061 string instead of using the local time and zone values.
+	 * The option is only applied in "date" [dataMode](ui.%%WidgetNameLowered%%#options:dataMode).
+	 *
+	 */
+	enableUTCDates?: boolean;
+
+	/**
+	 * Gets/Sets year for auto detection of 20th and 21st centuries.
+	 * That option is used to automatically fill century when the user entered only 1 or 2 digits into the year field or when the date pattern contains only 1 or 2 year positions, e.g. "yy" or "y".
+	 * If user entered value larger than value of this option, then 20th century is used, otherwise the 21st.
+	 *
+	 */
+	centuryThreshold?: number;
+
+	/**
+	 * Gets/Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
+	 *
+	 */
+	nullValue?: string|number|Date;
+
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for igDateEditor
+	 */
+	listItems?: any;
+
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for igDateEditor
+	 */
+	dropDownOnReadOnly?: boolean;
+
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for igDateEditor
+	 */
+	inputMask?: string;
+
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for igDateEditor
+	 */
+	unfilledCharsPrompt?: string;
+
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for igDateEditor
+	 */
+	padChar?: string;
+
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for igDateEditor
+	 */
+	emptyChar?: string;
+
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for igDateEditor
+	 */
+	toUpper?: boolean;
+
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for igDateEditor
+	 */
+	toLower?: boolean;
+
+	/**
+	 * Gets ability to enter only specific characters in input-field from keyboard and on paste.
+	 * Notes:
+	 * If "excludeKeys" option contains same characters as this option, then "excludeKeys" has priority.
+	 * Note! This option can not be se runtime.
+	 *
+	 */
+	includeKeys?: string;
+
+	/**
+	 * Gets ability to prevent entering specific characters from keyboard or on paste.
+	 * Notes:
+	 * If a character is specified in "includeKeys" option also, then "excludeKeys" has priority.
+	 * Note! This option can not be se runtime.
+	 *
+	 */
+	excludeKeys?: string;
+
+	textMode?: any;
+
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for igMaskEditor
+	 */
+	maxLength?: any;
+
+	/**
+	 * Gets/Sets the horizontal alignment of the text in the editor.
+	 *
+	 *
+	 * Valid values:
+	 * "left" The text into the input gets aligned to the left.
+	 * "right" The text into the input gets aligned to the right.
+	 * "center" The text into the input gets aligned to the center.
+	 */
+	textAlign?: string;
+
+	/**
+	 * Gets/Sets the text which appears in the editor when it has no focus and the "value" is null or empty string.
+	 *
+	 */
+	placeHolder?: string;
+
+	/**
+	 * Gets/Sets the action when the editor gets focused. The default value is selectAll.
+	 *
+	 *
+	 * Valid values:
+	 * "selectAll" Setting this option will select all the text into the editor when the edit mode gets enetered.
+	 * "atStart" Setting this option will move the cursor at the begining the text into the editor when the edit mode gets enetered.
+	 * "atEnd" Setting this option will move the cursor at the end the text into the editor when the edit mode gets enetered.
+	 * "browserDefault" Setting this option won't do any extra logic, but proceed with the browser default behavior.
+	 */
+	selectionOnFocus?: string;
+
+	/**
+	 * Gets/Sets if the editor should revert it's value to the previously valid value in case the value on blur, or enter key is not valid. If the opiton is set to false, editor calls clear functionality.
+	 *
+	 */
+	revertIfNotValid?: boolean;
+
+	/**
+	 * Gets/Sets if the editor should prevent form submition when enter key is pressed.
+	 *
+	 */
+	preventSubmitOnEnter?: boolean;
+
+	/**
+	 * Disables/Enables default notifications for basic validation scenarios built in the editors such as required list selection, value wrapping around or spin limits.
+	 *
+	 */
+	suppressNotifications?: boolean;
+
+	/**
+	 * Gets/Sets the width of the control.
+	 *
+	 *
+	 * Valid values:
+	 * "null" will stretch to fit data, if no other widths are defined.
+	 */
+	width?: string|number;
+
+	/**
+	 * Gets/Sets the height of the control.
+	 *
+	 *
+	 * Valid values:
+	 * "null" will fit the editor inside its parent container, if no other heights are defined.
+	 */
+	height?: string|number;
+
+	/**
+	 * Gets/Sets tabIndex attribute for the editor input.
+	 *
+	 */
+	tabIndex?: number;
+
+	/**
+	 * Gets/Sets whether the editor value can become null.
+	 * If that option is false, and editor has no value, then value is set to an empty string.
+	 *
+	 */
+	allowNullValue?: boolean;
+
+	/**
+	 * Gets/Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
+	 *
+	 */
+	inputName?: string;
+
+	/**
+	 * Gets/Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
+	 *
+	 */
+	readOnly?: boolean;
+
+	/**
+	 * Gets/Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
+	 *
+	 */
+	disabled?: boolean;
+
+	/**
+	 * Gets/Sets options supported by the [igValidator](ui.igvalidator#options) widget.
+	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
+	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
+	 *
+	 */
+	validatorOptions?: any;
+
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	locale?: any;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	language?: string;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+	regional?: string|Object;
+
+	/**
+	 * Fired when the drop down is opening.
+	 */
+	dropDownListOpening?: DropDownListOpeningEvent;
+
+	/**
+	 * Fired after the drop down is opened.
+	 */
+	dropDownListOpened?: DropDownListOpenedEvent;
+
+	/**
+	 * Fired when the drop down is closing.
+	 */
+	dropDownListClosing?: DropDownListClosingEvent;
+
+	/**
+	 * Fired after the drop down is closed.
+	 */
+	dropDownListClosed?: DropDownListClosedEvent;
+
+	/**
+	 * Fired when an item in the drop down list is being selected.
+	 */
+	dropDownItemSelecting?: DropDownItemSelectingEvent;
+
+	/**
+	 * Fired after an item in the drop down list is selected.
+	 */
+	dropDownItemSelected?: DropDownItemSelectedEvent;
+
+	/**
+	 * Option for igTimePicker
+	 */
+	[optionName: string]: any;
+}
+interface IgTimePickerMethods {
+	/**
+	 * Gets the selected list item.
+	 */
+	getSelectedListItem(): string;
+
+	/**
+	 * Returns the visibility state of the calendar.
+	 */
+	dropDownVisible(): boolean;
+
+	/**
+	 * Returns a reference to the drop-down button UI element of the editor.
+	 */
+	dropDownButton(): string;
+
+	/**
+	 * Gets reference to jquery object which is used as container of drop-down list.
+	 */
+	dropDownContainer(): string;
+
+	/**
+	 * Finds index of list item by text that matches with the search parameters.
+	 *
+	 * @param text The text to search for in the drop down list.
+	 * @param matchType The rule that is applied for searching the text.
+	 */
+	findListItemIndex(text: string, matchType?: Object): number;
+
+	/**
+	 * Gets the index of the selected list item. Sets selected item by index.
+	 *
+	 * @param index The index of the item that needs to be selected.
+	 */
+	selectedListIndex(index?: number): number;
+	value(newValue: Object): void;
+	selectDate(): void;
+
+	/**
+	 * Changes the the regional settings of widget element to the language specified in [options.regional](ui.igdateeditor#options:regional)
+	 * Note that this method is for rare scenarios, use [regional](ui.igdateeditor#options:regional) option setter
+	 */
+	changeRegional(): void;
+
+	/**
+	 * Gets selected date as a date object. This method can be used when dataMode is set as either displayModeText or editModeText.
+	 * In such cases the value() method will not return date object and getSelectedDate() can be used to replace that functionality.
+	 */
+	getSelectedDate(): Date;
+
+	/**
+	 * Increases the date or time period, depending on the current cursor position.
+	 *
+	 * @param delta The increase delta.
+	 */
+	spinUp(delta?: number): void;
+
+	/**
+	 * Decreases the date or time period, depending on the current cursor position.
+	 *
+	 * @param delta The decrease delta.
+	 */
+	spinDown(delta?: number): void;
+
+	/**
+	 * Returns a reference to the spin up UI element of the editor.
+	 */
+	spinUpButton(): string;
+
+	/**
+	 * Returns a reference to the spin down UI element of the editor.
+	 */
+	spinDownButton(): string;
+
+	/**
+	 * Checks if the value in the editor is valid. Note: This function will not trigger automatic notifications.
+	 */
+	isValid(): boolean;
+}
+interface JQuery {
+	data(propertyName: "igTimePicker"): IgTimePickerMethods;
+}
+
 interface JQuery {
 	igBaseEditor(methodName: "inputName", newValue?: string): string;
 	igBaseEditor(methodName: "value", newValue: Object): void;
@@ -29031,6 +30325,7 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the width of the control.
+	 *
 	 */
 
 	igBaseEditor(optionLiteral: 'option', optionName: "width"): string|number;
@@ -29038,6 +30333,7 @@ interface JQuery {
 	/**
 	 * /Sets the width of the control.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -29045,6 +30341,7 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the height of the control.
+	 *
 	 */
 
 	igBaseEditor(optionLiteral: 'option', optionName: "height"): string|number;
@@ -29052,6 +30349,7 @@ interface JQuery {
 	/**
 	 * /Sets the height of the control.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -29059,24 +30357,28 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets value in editor. The effect of setting/getting that option depends on type of editor and on dataMode options for every type of editor.
+	 *
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "value"): any;
 
 	/**
 	 * /Sets value in editor. The effect of setting/getting that option depends on type of editor and on dataMode options for every type of editor.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "value", optionValue: any): void;
 
 	/**
 	 * Gets/Sets tabIndex attribute for the editor input.
+	 *
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "tabIndex"): number;
 
 	/**
 	 * /Sets tabIndex attribute for the editor input.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "tabIndex", optionValue: number): void;
@@ -29084,6 +30386,7 @@ interface JQuery {
 	/**
 	 * Gets/Sets whether the editor value can become null.
 	 * If that option is false, and editor has no value, then value is set to an empty string.
+	 *
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "allowNullValue"): boolean;
 
@@ -29091,12 +30394,14 @@ interface JQuery {
 	 * /Sets whether the editor value can become null.
 	 * If that option is false, and editor has no value, then value is set to an empty string.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "allowNullValue", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
+	 *
 	 */
 
 	igBaseEditor(optionLiteral: 'option', optionName: "nullValue"): string|number;
@@ -29104,6 +30409,7 @@ interface JQuery {
 	/**
 	 * /Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -29111,36 +30417,42 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
+	 *
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "inputName"): string;
 
 	/**
 	 * /Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "inputName", optionValue: string): void;
 
 	/**
 	 * Gets/Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
+	 *
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "readOnly"): boolean;
 
 	/**
 	 * /Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "readOnly", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
+	 *
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "disabled"): boolean;
 
 	/**
 	 * /Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "disabled", optionValue: boolean): void;
@@ -29149,6 +30461,7 @@ interface JQuery {
 	 * Gets/Sets options supported by the [igValidator](ui.igvalidator#options) widget.
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
+	 *
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "validatorOptions"): any;
 
@@ -29157,36 +30470,42 @@ interface JQuery {
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "validatorOptions", optionValue: any): void;
 
 	/**
 	 * Set/Get the locale setting for the widget.
+	 *
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "locale"): any;
 
 	/**
 	 * Set/Get the locale setting for the widget.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
+	 *
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "language"): string;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "language", optionValue: string): void;
 
 	/**
 	 * Set/Get the regional setting for the widget.
+	 *
 	 */
 
 	igBaseEditor(optionLiteral: 'option', optionName: "regional"): string|Object;
@@ -29194,296 +30513,185 @@ interface JQuery {
 	/**
 	 * Set/Get the regional setting for the widget.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
 	igBaseEditor(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
 
 	/**
-	 * Event which is raised before rendering of the editor completes.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to get a reference to the editor performing rendering.
-	 * Use ui.element to get a reference to the editor element.
+	 * Fired before rendering of the editor has finished.
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "rendering"): RenderingEvent;
 
 	/**
-	 * Event which is raised before rendering of the editor completes.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to get a reference to the editor performing rendering.
-	 * Use ui.element to get a reference to the editor element.
+	 * Fired before rendering of the editor has finished.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "rendering", optionValue: RenderingEvent): void;
 
 	/**
-	 * Event which is raised after rendering of the editor completes.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to get a reference to the editor performing rendering.
-	 * Use ui.element to get a reference to the editor element.
+	 * Fired after rendering of the editor has finished.
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "rendered"): RenderedEvent;
 
 	/**
-	 * Event which is raised after rendering of the editor completes.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to get a reference to the editor performing rendering.
-	 * Use ui.element to get a reference to the editor element.
+	 * Fired after rendering of the editor has finished.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "rendered", optionValue: RenderedEvent): void;
 
 	/**
-	 * Event which is raised on mousedown event.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired on mousedown event.
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "mousedown"): MousedownEvent;
 
 	/**
-	 * Event which is raised on mousedown event.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired on mousedown event.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "mousedown", optionValue: MousedownEvent): void;
 
 	/**
-	 * Event which is raised on mouseup event.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired on mouseup event.
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "mouseup"): MouseupEvent;
 
 	/**
-	 * Event which is raised on mouseup event.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired on mouseup event.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "mouseup", optionValue: MouseupEvent): void;
 
 	/**
-	 * Event which is raised on mousemove at any part of editor including drop-down list.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired on mousemove at any part of editor including the drop-down list.
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "mousemove"): MousemoveEvent;
 
 	/**
-	 * Event which is raised on mousemove at any part of editor including drop-down list.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired on mousemove at any part of editor including the drop-down list.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "mousemove", optionValue: MousemoveEvent): void;
 
 	/**
-	 * Event which is raised on mouseover at any part of editor including drop-down list.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired on mouseover at any part of editor including the drop-down list.
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "mouseover"): MouseoverEvent;
 
 	/**
-	 * Event which is raised on mouseover at any part of editor including drop-down list.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired on mouseover at any part of editor including the drop-down list.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "mouseover", optionValue: MouseoverEvent): void;
 
 	/**
-	 * Event which is raised on mouseleave at any part of editor including drop-down list.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired on mouseleave at any part of editor including the drop-down list.
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "mouseout"): MouseoutEvent;
 
 	/**
-	 * Event which is raised on mouseleave at any part of editor including drop-down list.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired on mouseleave at any part of editor including the drop-down list.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "mouseout", optionValue: MouseoutEvent): void;
 
 	/**
-	 * Event which is raised when input field of editor loses focus.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired when the input field of the editor loses focus.
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "blur"): BlurEvent;
 
 	/**
-	 * Event which is raised when input field of editor loses focus.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired when the input field of the editor loses focus.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "blur", optionValue: BlurEvent): void;
 
 	/**
-	 * Event which is raised when input field of editor gets focus.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired when the input field of the editor gets focus.
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "focus"): IgFocusEvent;
 
 	/**
-	 * Event which is raised when input field of editor gets focus.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired when the input field of the editor gets focus.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "focus", optionValue: IgFocusEvent): void;
 
 	/**
-	 * Event which is raised on keydown event.
+	 * Fired on keydown event.
 	 * Return false in order to cancel key action.
-	 * Function takes arguments evt and ui.
-	 * Use evt.originalEvent to obtain reference to event of browser.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.key to obtain value of keyCode.
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "keydown"): KeydownEvent;
 
 	/**
-	 * Event which is raised on keydown event.
+	 * Fired on keydown event.
 	 * Return false in order to cancel key action.
-	 * Function takes arguments evt and ui.
-	 * Use evt.originalEvent to obtain reference to event of browser.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.key to obtain value of keyCode.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "keydown", optionValue: KeydownEvent): void;
 
 	/**
-	 * Event which is raised on keypress event.
+	 * Fired on keypress event.
 	 * Return false in order to cancel key action.
-	 * Function takes arguments evt and ui.
-	 * Use evt.originalEvent to obtain reference to event of browser.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.key to obtain value of keyCode.
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "keypress"): KeypressEvent;
 
 	/**
-	 * Event which is raised on keypress event.
+	 * Fired on keypress event.
 	 * Return false in order to cancel key action.
-	 * Function takes arguments evt and ui.
-	 * Use evt.originalEvent to obtain reference to event of browser.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.key to obtain value of keyCode.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "keypress", optionValue: KeypressEvent): void;
 
 	/**
-	 * Event which is raised on keyup event.
-	 * Function takes arguments evt and ui.
-	 * Use evt.originalEvent to obtain reference to event of browser.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.key to obtain value of keyCode.
+	 * Fired on keyup event.
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "keyup"): KeyupEvent;
 
 	/**
-	 * Event which is raised on keyup event.
-	 * Function takes arguments evt and ui.
-	 * Use evt.originalEvent to obtain reference to event of browser.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.key to obtain value of keyCode.
+	 * Fired on keyup event.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "keyup", optionValue: KeyupEvent): void;
 
 	/**
-	 * Event which is raised before the editor value is changed.
+	 * Fired before changing the editor's value.
 	 * Return false in order to cancel change.
 	 * It can be raised after loosing focus or on spin events.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.newValue to obtain the new value.
-	 * Use ui.oldValue to obtain the old value.
-	 * Use ui.editorInput to obtain reference to the editor input.
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "valueChanging"): ValueChangingEvent;
 
 	/**
-	 * Event which is raised before the editor value is changed.
+	 * Fired before changing the editor's value.
 	 * Return false in order to cancel change.
 	 * It can be raised after loosing focus or on spin events.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.newValue to obtain the new value.
-	 * Use ui.oldValue to obtain the old value.
-	 * Use ui.editorInput to obtain reference to the editor input.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "valueChanging", optionValue: ValueChangingEvent): void;
 
 	/**
-	 * Event which is raised after the editor value is changed. It can be raised after loosing focus or on spin events.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.newValue to obtain the value entered from the user after internal formatting.
-	 * Use ui.originalValue to obtain the value entered from the user before internal formatting.
-	 * Use ui.editorInput to obtain reference to the editor input.
+	 * Fired after the editor value is changed. It can be raised after loosing focus or on spin events.
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "valueChanged"): ValueChangedEvent;
 
 	/**
-	 * Event which is raised after the editor value is changed. It can be raised after loosing focus or on spin events.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.newValue to obtain the value entered from the user after internal formatting.
-	 * Use ui.originalValue to obtain the value entered from the user before internal formatting.
-	 * Use ui.editorInput to obtain reference to the editor input.
+	 * Fired after the editor value is changed. It can be raised after loosing focus or on spin events.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igBaseEditor(optionLiteral: 'option', optionName: "valueChanged", optionValue: ValueChangedEvent): void;
 	igBaseEditor(options: IgBaseEditor): JQuery;
@@ -29528,6 +30736,7 @@ interface JQuery {
 
 	/**
 	 * Gets visibility of the spin, clear and drop-down button. That option can be set only on initialization. Combinations like 'dropdown,spin' or 'spin,clear' are supported too.Note! This option can not be set runtime.
+	 *
 	 */
 
 	igTextEditor(optionLiteral: 'option', optionName: "buttonType"): string;
@@ -29535,6 +30744,7 @@ interface JQuery {
 	/**
 	 * Visibility of the spin, clear and drop-down button. That option can be set only on initialization. Combinations like 'dropdown,spin' or 'spin,clear' are supported too.Note! This option can not be set runtime.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -29543,6 +30753,7 @@ interface JQuery {
 	/**
 	 * Gets/Sets list of items which are used as a source for the drop-down list.
 	 * Items in the list can be of type string.
+	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "listItems"): any[];
 
@@ -29550,30 +30761,35 @@ interface JQuery {
 	 * /Sets list of items which are used as a source for the drop-down list.
 	 * Items in the list can be of type string.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "listItems", optionValue: any[]): void;
 
 	/**
 	 * Gets/Sets custom width of the drop-down list in pixels. If the value is equal to 0 or negative, then the width of editor is set as a drop-down width.
+	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "listWidth"): number;
 
 	/**
 	 * /Sets custom width of the drop-down list in pixels. If the value is equal to 0 or negative, then the width of editor is set as a drop-down width.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "listWidth", optionValue: number): void;
 
 	/**
 	 * Gets/Sets the hover/unhover animation duration of a drop-down list item.
+	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "listItemHoverDuration"): number;
 
 	/**
 	 * /Sets the hover/unhover animation duration of a drop-down list item.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "listItemHoverDuration", optionValue: number): void;
@@ -29583,6 +30799,7 @@ interface JQuery {
 	 * If the option is set to false the editor will attach the drop-down list element to the editor container
 	 * If the option is set to true the editor will attach its drop-down list to as a child of the body.
 	 * Note! This option can not be set runtime.
+	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "dropDownAttachedToBody"): boolean;
 
@@ -29592,18 +30809,21 @@ interface JQuery {
 	 * If the option is set to true the editor will attach its drop-down list to as a child of the body.
 	 * Note! This option can not be set runtime.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "dropDownAttachedToBody", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets show/hide drop-down list animation duration in milliseconds.
+	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "dropDownAnimationDuration"): number;
 
 	/**
 	 * /Sets show/hide drop-down list animation duration in milliseconds.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "dropDownAnimationDuration", optionValue: number): void;
@@ -29613,6 +30833,7 @@ interface JQuery {
 	 * Notes:
 	 * This option is overwritten if the number of list items is less than the set value. In that case the drop-down list displays all the items.
 	 * This option can not be set runtime.
+	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "visibleItemsCount"): number;
 
@@ -29622,6 +30843,7 @@ interface JQuery {
 	 * This option is overwritten if the number of list items is less than the set value. In that case the drop-down list displays all the items.
 	 * This option can not be set runtime.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "visibleItemsCount", optionValue: number): void;
@@ -29631,6 +30853,7 @@ interface JQuery {
 	 * Notes:
 	 * If both "excludeKeys" and "includeKeys" options are used, then "excludeKeys" has priority and includeKeys options is not respected.
 	 * The option is case sensitive! If the option is set runtime it's not applied on the current value.
+	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "includeKeys"): string;
 
@@ -29640,6 +30863,7 @@ interface JQuery {
 	 * If both "excludeKeys" and "includeKeys" options are used, then "excludeKeys" has priority and includeKeys options is not respected.
 	 * The option is case sensitive! If the option is set runtime it's not applied on the current value.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "includeKeys", optionValue: string): void;
@@ -29649,6 +30873,7 @@ interface JQuery {
 	 * Notes:
 	 * If both "excludeKeys" and "includeKeys" options are used, then "excludeKeys" has priority and includeKeys options is not respected.
 	 * The option is case sensitive! If the option is set runtime it's not applied on the current value.
+	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "excludeKeys"): string;
 
@@ -29658,12 +30883,14 @@ interface JQuery {
 	 * If both "excludeKeys" and "includeKeys" options are used, then "excludeKeys" has priority and includeKeys options is not respected.
 	 * The option is case sensitive! If the option is set runtime it's not applied on the current value.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "excludeKeys", optionValue: string): void;
 
 	/**
 	 * Gets/Sets the horizontal alignment of the text in the editor.
+	 *
 	 */
 
 	igTextEditor(optionLiteral: 'option', optionName: "textAlign"): string;
@@ -29671,6 +30898,7 @@ interface JQuery {
 	/**
 	 * /Sets the horizontal alignment of the text in the editor.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -29678,18 +30906,21 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the text which appears in the editor when it has no focus and the "value" is null or empty string.
+	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "placeHolder"): string;
 
 	/**
 	 * /Sets the text which appears in the editor when it has no focus and the "value" is null or empty string.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "placeHolder", optionValue: string): void;
 
 	/**
 	 * Gets/Sets the action when the editor gets focused. The default value is selectAll.
+	 *
 	 */
 
 	igTextEditor(optionLiteral: 'option', optionName: "selectionOnFocus"): string;
@@ -29697,6 +30928,7 @@ interface JQuery {
 	/**
 	 * /Sets the action when the editor gets focused. The default value is selectAll.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -29704,6 +30936,7 @@ interface JQuery {
 
 	/**
 	 * Gets the text mode of the editor such as: single-line text editor, password editor or multiline editor. That option has effect only on initialization. If based element (selector) is TEXTAREA, then it is used as input-field.
+	 *
 	 */
 
 	igTextEditor(optionLiteral: 'option', optionName: "textMode"): string;
@@ -29711,6 +30944,7 @@ interface JQuery {
 	/**
 	 * The text mode of the editor such as: single-line text editor, password editor or multiline editor. That option has effect only on initialization. If based element (selector) is TEXTAREA, then it is used as input-field.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -29718,54 +30952,63 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the ability of the editor to automatically move the dropdown list selection item from one end to the opposite side. When the last item is reached and spin down is performed, the first item gets selected and vice versa. This option has no effect there is no drop-down list.
+	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "spinWrapAround"): boolean;
 
 	/**
 	 * /Sets the ability of the editor to automatically move the dropdown list selection item from one end to the opposite side. When the last item is reached and spin down is performed, the first item gets selected and vice versa. This option has no effect there is no drop-down list.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "spinWrapAround", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets if the editor should only allow values from the list of items. Matching is case-insensitive.
+	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "isLimitedToListValues"): boolean;
 
 	/**
 	 * /Sets if the editor should only allow values from the list of items. Matching is case-insensitive.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "isLimitedToListValues", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets if the editor should revert it's value to the previously valid value in case the value on blur, or enter key is not valid. If the opiton is set to false, editor calls clear functionality.
+	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "revertIfNotValid"): boolean;
 
 	/**
 	 * /Sets if the editor should revert it's value to the previously valid value in case the value on blur, or enter key is not valid. If the opiton is set to false, editor calls clear functionality.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "revertIfNotValid", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets if the editor should prevent form submition when enter key is pressed.
+	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "preventSubmitOnEnter"): boolean;
 
 	/**
 	 * /Sets if the editor should prevent form submition when enter key is pressed.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "preventSubmitOnEnter", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the drop-down list opening orientation when the list gets open. If the option is set to auto the editor has priority to open the drop-down list bottom. If the space is not enough it tries to open the list top. If the space is not enough in both directions then the list gets opened at the bottom of the editor.
+	 *
 	 */
 
 	igTextEditor(optionLiteral: 'option', optionName: "dropDownOrientation"): string;
@@ -29773,6 +31016,7 @@ interface JQuery {
 	/**
 	 * /Sets the drop-down list opening orientation when the list gets open. If the option is set to auto the editor has priority to open the drop-down list bottom. If the space is not enough it tries to open the list top. If the space is not enough in both directions then the list gets opened at the bottom of the editor.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -29781,6 +31025,7 @@ interface JQuery {
 	/**
 	 * Gets/Sets the maximum length of a text which can be entered by the user.
 	 * Negative values or 0 disables that behavior. If set at runtime the editor doesn't apply the option to the cuurent value.
+	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "maxLength"): number;
 
@@ -29788,6 +31033,7 @@ interface JQuery {
 	 * /Sets the maximum length of a text which can be entered by the user.
 	 * Negative values or 0 disables that behavior. If set at runtime the editor doesn't apply the option to the cuurent value.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "maxLength", optionValue: number): void;
@@ -29796,6 +31042,7 @@ interface JQuery {
 	 * Gets the ability to limit the editor to be used only as a dropdown list. When set to true the editor input is not editable.
 	 * Note! In case there are no list items - the editor will reamin readonly
 	 * Note! This option can not be set runtime.
+	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "dropDownOnReadOnly"): boolean;
 
@@ -29804,6 +31051,7 @@ interface JQuery {
 	 * Note! In case there are no list items - the editor will reamin readonly
 	 * Note! This option can not be set runtime.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "dropDownOnReadOnly", optionValue: boolean): void;
@@ -29811,6 +31059,7 @@ interface JQuery {
 	/**
 	 * Gets/Sets the ability to convert the input characters to upper case (true) or keeps the characters as they are (false). The option has effect only while keyboard entries and paste.
 	 * Note! When the option is set at runtime the editor is not changing the current value.
+	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "toUpper"): boolean;
 
@@ -29818,6 +31067,7 @@ interface JQuery {
 	 * /Sets the ability to convert the input characters to upper case (true) or keeps the characters as they are (false). The option has effect only while keyboard entries and paste.
 	 * Note! When the option is set at runtime the editor is not changing the current value.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "toUpper", optionValue: boolean): void;
@@ -29825,6 +31075,7 @@ interface JQuery {
 	/**
 	 * Gets/Sets the ability to convert the input characters to lower case (true) or keeps the characters as they are (false). The option has effect only while keyboard entries and paste.
 	 * Note! When the option is set at runtime the editor is not changing the current value.
+	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "toLower"): boolean;
 
@@ -29832,18 +31083,21 @@ interface JQuery {
 	 * /Sets the ability to convert the input characters to lower case (true) or keeps the characters as they are (false). The option has effect only while keyboard entries and paste.
 	 * Note! When the option is set at runtime the editor is not changing the current value.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "toLower", optionValue: boolean): void;
 
 	/**
 	 * Disables/Enables default notifications for basic validation scenarios built in the editors such as required list selection, value wrapping around or spin limits.
+	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "suppressNotifications"): boolean;
 
 	/**
 	 * Disables/Enables default notifications for basic validation scenarios built in the editors such as required list selection, value wrapping around or spin limits.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "suppressNotifications", optionValue: boolean): void;
@@ -29852,6 +31106,7 @@ interface JQuery {
 	 * Gets/Sets whether the onscreen keyboard (if available on device) should be shown when the dropdown button is clicked/tapped. This option prevents initial focus or removes it when the drop button is clicked/tapped.
 	 * Note: The option does not perform device detection so its behavior is always active if enabled.
 	 * Note: When drop down is opened the only way to close it will be using the drop down button.
+	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "suppressKeyboard"): boolean;
 
@@ -29860,12 +31115,14 @@ interface JQuery {
 	 * Note: The option does not perform device detection so its behavior is always active if enabled.
 	 * Note: When drop down is opened the only way to close it will be using the drop down button.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "suppressKeyboard", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the width of the control.
+	 *
 	 */
 
 	igTextEditor(optionLiteral: 'option', optionName: "width"): string|number;
@@ -29873,6 +31130,7 @@ interface JQuery {
 	/**
 	 * /Sets the width of the control.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -29880,6 +31138,7 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the height of the control.
+	 *
 	 */
 
 	igTextEditor(optionLiteral: 'option', optionName: "height"): string|number;
@@ -29887,6 +31146,7 @@ interface JQuery {
 	/**
 	 * /Sets the height of the control.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -29894,24 +31154,28 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets value in editor. The effect of setting/getting that option depends on type of editor and on dataMode options for every type of editor.
+	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "value"): any;
 
 	/**
 	 * /Sets value in editor. The effect of setting/getting that option depends on type of editor and on dataMode options for every type of editor.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "value", optionValue: any): void;
 
 	/**
 	 * Gets/Sets tabIndex attribute for the editor input.
+	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "tabIndex"): number;
 
 	/**
 	 * /Sets tabIndex attribute for the editor input.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "tabIndex", optionValue: number): void;
@@ -29919,6 +31183,7 @@ interface JQuery {
 	/**
 	 * Gets/Sets whether the editor value can become null.
 	 * If that option is false, and editor has no value, then value is set to an empty string.
+	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "allowNullValue"): boolean;
 
@@ -29926,12 +31191,14 @@ interface JQuery {
 	 * /Sets whether the editor value can become null.
 	 * If that option is false, and editor has no value, then value is set to an empty string.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "allowNullValue", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
+	 *
 	 */
 
 	igTextEditor(optionLiteral: 'option', optionName: "nullValue"): string|number;
@@ -29939,6 +31206,7 @@ interface JQuery {
 	/**
 	 * /Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -29946,36 +31214,42 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
+	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "inputName"): string;
 
 	/**
 	 * /Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "inputName", optionValue: string): void;
 
 	/**
 	 * Gets/Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
+	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "readOnly"): boolean;
 
 	/**
 	 * /Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "readOnly", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
+	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "disabled"): boolean;
 
 	/**
 	 * /Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "disabled", optionValue: boolean): void;
@@ -29984,6 +31258,7 @@ interface JQuery {
 	 * Gets/Sets options supported by the [igValidator](ui.igvalidator#options) widget.
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
+	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "validatorOptions"): any;
 
@@ -29992,36 +31267,42 @@ interface JQuery {
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "validatorOptions", optionValue: any): void;
 
 	/**
 	 * Set/Get the locale setting for the widget.
+	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "locale"): any;
 
 	/**
 	 * Set/Get the locale setting for the widget.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
+	 *
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "language"): string;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "language", optionValue: string): void;
 
 	/**
 	 * Set/Get the regional setting for the widget.
+	 *
 	 */
 
 	igTextEditor(optionLiteral: 'option', optionName: "regional"): string|Object;
@@ -30029,442 +31310,271 @@ interface JQuery {
 	/**
 	 * Set/Get the regional setting for the widget.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
 	igTextEditor(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
 
 	/**
-	 * Event which is raised when the drop down is opening.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.editorInput to obtain reference to the editable input
-	 * Use ui.list to obtain reference to the list contaier.
+	 * Fired when the drop down is opening.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "dropDownListOpening"): DropDownListOpeningEvent;
 
 	/**
-	 * Event which is raised when the drop down is opening.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.editorInput to obtain reference to the editable input
-	 * Use ui.list to obtain reference to the list contaier.
+	 * Fired when the drop down is opening.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "dropDownListOpening", optionValue: DropDownListOpeningEvent): void;
 
 	/**
-	 * Event which is raised after the drop down is opened.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.editorInput to obtain reference to the editable input
-	 * Use ui.list to obtain reference to the list contaier.
+	 * Fired after the drop down is opened.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "dropDownListOpened"): DropDownListOpenedEvent;
 
 	/**
-	 * Event which is raised after the drop down is opened.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.editorInput to obtain reference to the editable input
-	 * Use ui.list to obtain reference to the list contaier.
+	 * Fired after the drop down is opened.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "dropDownListOpened", optionValue: DropDownListOpenedEvent): void;
 
 	/**
-	 * Event which is raised when the drop down is closing.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.editorInput to obtain reference to the editable input
-	 * Use ui.list to obtain reference to the list contaier.
+	 * Fired when the drop down is closing.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "dropDownListClosing"): DropDownListClosingEvent;
 
 	/**
-	 * Event which is raised when the drop down is closing.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.editorInput to obtain reference to the editable input
-	 * Use ui.list to obtain reference to the list contaier.
+	 * Fired when the drop down is closing.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "dropDownListClosing", optionValue: DropDownListClosingEvent): void;
 
 	/**
-	 * Event which is raised after the drop down is closed.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.editorInput to obtain reference to the editable input
-	 * Use ui.list to obtain reference to the list contaier.
+	 * Fired after the drop down is closed.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "dropDownListClosed"): DropDownListClosedEvent;
 
 	/**
-	 * Event which is raised after the drop down is closed.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.editorInput to obtain reference to the editable input
-	 * Use ui.list to obtain reference to the list contaier.
+	 * Fired after the drop down is closed.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "dropDownListClosed", optionValue: DropDownListClosedEvent): void;
 
 	/**
-	 * Event which is raised when an item in the drop down list is being selected.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.editorInput to obtain reference to the editable input
-	 * Use ui.list to obtain reference to the list contaier.
-	 * Use ui.item to obtain reference to the list item which is about to be selected.
+	 * Fired when an item in the drop down list is being selected.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "dropDownItemSelecting"): DropDownItemSelectingEvent;
 
 	/**
-	 * Event which is raised when an item in the drop down list is being selected.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.editorInput to obtain reference to the editable input
-	 * Use ui.list to obtain reference to the list contaier.
-	 * Use ui.item to obtain reference to the list item which is about to be selected.
+	 * Fired when an item in the drop down list is being selected.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "dropDownItemSelecting", optionValue: DropDownItemSelectingEvent): void;
 
 	/**
-	 * Event which is raised after an item in the drop down list is selected.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.editorInput to obtain reference to the editable input
-	 * Use ui.list to obtain reference to the list contaier.
-	 * Use ui.item to obtain reference to the list item which is selected.
+	 * Fired after an item in the drop down list is selected.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "dropDownItemSelected"): DropDownItemSelectedEvent;
 
 	/**
-	 * Event which is raised after an item in the drop down list is selected.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.editorInput to obtain reference to the editable input
-	 * Use ui.list to obtain reference to the list contaier.
-	 * Use ui.item to obtain reference to the list item which is selected.
+	 * Fired after an item in the drop down list is selected.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "dropDownItemSelected", optionValue: DropDownItemSelectedEvent): void;
 
 	/**
-	 * Event which is raised after text in the editor was changed. It can be raised when keyUp event occurs,
+	 * Fired after the editor's text has been changed. It can be raised when keyUp event occurs,
 	 * when the clear button is clicked or when an item from a list is selected.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.text to obtain new text
-	 * Use ui.oldText to obtain the old text.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "textChanged"): TextChangedEvent;
 
 	/**
-	 * Event which is raised after text in the editor was changed. It can be raised when keyUp event occurs,
+	 * Fired after the editor's text has been changed. It can be raised when keyUp event occurs,
 	 * when the clear button is clicked or when an item from a list is selected.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.text to obtain new text
-	 * Use ui.oldText to obtain the old text.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "textChanged", optionValue: TextChangedEvent): void;
 
 	/**
-	 * Event which is raised before rendering of the editor completes.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to get a reference to the editor performing rendering.
-	 * Use ui.element to get a reference to the editor element.
+	 * Fired before rendering of the editor has finished.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "rendering"): RenderingEvent;
 
 	/**
-	 * Event which is raised before rendering of the editor completes.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to get a reference to the editor performing rendering.
-	 * Use ui.element to get a reference to the editor element.
+	 * Fired before rendering of the editor has finished.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "rendering", optionValue: RenderingEvent): void;
 
 	/**
-	 * Event which is raised after rendering of the editor completes.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to get a reference to the editor performing rendering.
-	 * Use ui.element to get a reference to the editor element.
+	 * Fired after rendering of the editor has finished.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "rendered"): RenderedEvent;
 
 	/**
-	 * Event which is raised after rendering of the editor completes.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to get a reference to the editor performing rendering.
-	 * Use ui.element to get a reference to the editor element.
+	 * Fired after rendering of the editor has finished.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "rendered", optionValue: RenderedEvent): void;
 
 	/**
-	 * Event which is raised on mousedown event.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired on mousedown event.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "mousedown"): MousedownEvent;
 
 	/**
-	 * Event which is raised on mousedown event.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired on mousedown event.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "mousedown", optionValue: MousedownEvent): void;
 
 	/**
-	 * Event which is raised on mouseup event.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired on mouseup event.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "mouseup"): MouseupEvent;
 
 	/**
-	 * Event which is raised on mouseup event.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired on mouseup event.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "mouseup", optionValue: MouseupEvent): void;
 
 	/**
-	 * Event which is raised on mousemove at any part of editor including drop-down list.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired on mousemove at any part of editor including the drop-down list.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "mousemove"): MousemoveEvent;
 
 	/**
-	 * Event which is raised on mousemove at any part of editor including drop-down list.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired on mousemove at any part of editor including the drop-down list.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "mousemove", optionValue: MousemoveEvent): void;
 
 	/**
-	 * Event which is raised on mouseover at any part of editor including drop-down list.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired on mouseover at any part of editor including the drop-down list.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "mouseover"): MouseoverEvent;
 
 	/**
-	 * Event which is raised on mouseover at any part of editor including drop-down list.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired on mouseover at any part of editor including the drop-down list.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "mouseover", optionValue: MouseoverEvent): void;
 
 	/**
-	 * Event which is raised on mouseleave at any part of editor including drop-down list.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired on mouseleave at any part of editor including the drop-down list.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "mouseout"): MouseoutEvent;
 
 	/**
-	 * Event which is raised on mouseleave at any part of editor including drop-down list.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired on mouseleave at any part of editor including the drop-down list.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "mouseout", optionValue: MouseoutEvent): void;
 
 	/**
-	 * Event which is raised when input field of editor loses focus.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired when the input field of the editor loses focus.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "blur"): BlurEvent;
 
 	/**
-	 * Event which is raised when input field of editor loses focus.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired when the input field of the editor loses focus.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "blur", optionValue: BlurEvent): void;
 
 	/**
-	 * Event which is raised when input field of editor gets focus.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired when the input field of the editor gets focus.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "focus"): IgFocusEvent;
 
 	/**
-	 * Event which is raised when input field of editor gets focus.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired when the input field of the editor gets focus.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "focus", optionValue: IgFocusEvent): void;
 
 	/**
-	 * Event which is raised on keydown event.
+	 * Fired on keydown event.
 	 * Return false in order to cancel key action.
-	 * Function takes arguments evt and ui.
-	 * Use evt.originalEvent to obtain reference to event of browser.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.key to obtain value of keyCode.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "keydown"): KeydownEvent;
 
 	/**
-	 * Event which is raised on keydown event.
+	 * Fired on keydown event.
 	 * Return false in order to cancel key action.
-	 * Function takes arguments evt and ui.
-	 * Use evt.originalEvent to obtain reference to event of browser.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.key to obtain value of keyCode.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "keydown", optionValue: KeydownEvent): void;
 
 	/**
-	 * Event which is raised on keypress event.
+	 * Fired on keypress event.
 	 * Return false in order to cancel key action.
-	 * Function takes arguments evt and ui.
-	 * Use evt.originalEvent to obtain reference to event of browser.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.key to obtain value of keyCode.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "keypress"): KeypressEvent;
 
 	/**
-	 * Event which is raised on keypress event.
+	 * Fired on keypress event.
 	 * Return false in order to cancel key action.
-	 * Function takes arguments evt and ui.
-	 * Use evt.originalEvent to obtain reference to event of browser.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.key to obtain value of keyCode.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "keypress", optionValue: KeypressEvent): void;
 
 	/**
-	 * Event which is raised on keyup event.
-	 * Function takes arguments evt and ui.
-	 * Use evt.originalEvent to obtain reference to event of browser.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.key to obtain value of keyCode.
+	 * Fired on keyup event.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "keyup"): KeyupEvent;
 
 	/**
-	 * Event which is raised on keyup event.
-	 * Function takes arguments evt and ui.
-	 * Use evt.originalEvent to obtain reference to event of browser.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.key to obtain value of keyCode.
+	 * Fired on keyup event.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "keyup", optionValue: KeyupEvent): void;
 
 	/**
-	 * Event which is raised before the editor value is changed.
+	 * Fired before changing the editor's value.
 	 * Return false in order to cancel change.
 	 * It can be raised after loosing focus or on spin events.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.newValue to obtain the new value.
-	 * Use ui.oldValue to obtain the old value.
-	 * Use ui.editorInput to obtain reference to the editor input.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "valueChanging"): ValueChangingEvent;
 
 	/**
-	 * Event which is raised before the editor value is changed.
+	 * Fired before changing the editor's value.
 	 * Return false in order to cancel change.
 	 * It can be raised after loosing focus or on spin events.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.newValue to obtain the new value.
-	 * Use ui.oldValue to obtain the old value.
-	 * Use ui.editorInput to obtain reference to the editor input.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "valueChanging", optionValue: ValueChangingEvent): void;
 
 	/**
-	 * Event which is raised after the editor value is changed. It can be raised after loosing focus or on spin events.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.newValue to obtain the value entered from the user after internal formatting.
-	 * Use ui.originalValue to obtain the value entered from the user before internal formatting.
-	 * Use ui.editorInput to obtain reference to the editor input.
+	 * Fired after the editor value is changed. It can be raised after loosing focus or on spin events.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "valueChanged"): ValueChangedEvent;
 
 	/**
-	 * Event which is raised after the editor value is changed. It can be raised after loosing focus or on spin events.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.newValue to obtain the value entered from the user after internal formatting.
-	 * Use ui.originalValue to obtain the value entered from the user before internal formatting.
-	 * Use ui.editorInput to obtain reference to the editor input.
+	 * Fired after the editor value is changed. It can be raised after loosing focus or on spin events.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igTextEditor(optionLiteral: 'option', optionName: "valueChanged", optionValue: ValueChangedEvent): void;
 	igTextEditor(options: IgTextEditor): JQuery;
@@ -30503,6 +31613,7 @@ interface JQuery {
 	/**
 	 * Gets/Sets list of items which are used as a source for the drop-down list.
 	 * Items in the list can be of type number.
+	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "listItems"): any[];
 
@@ -30510,6 +31621,7 @@ interface JQuery {
 	 * /Sets list of items which are used as a source for the drop-down list.
 	 * Items in the list can be of type number.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "listItems", optionValue: any[]): void;
@@ -30519,6 +31631,7 @@ interface JQuery {
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [groupSeparator](ui.igNumericEditor#options:groupSeparator) or [decimalSeparator](ui.igNumericEditor#options:decimalSeparator) options.
+	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "negativeSign"): string;
 
@@ -30528,6 +31641,7 @@ interface JQuery {
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [groupSeparator](ui.igNumericEditor#options:groupSeparator) or [decimalSeparator](ui.igNumericEditor#options:decimalSeparator) options.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "negativeSign", optionValue: string): void;
@@ -30536,6 +31650,7 @@ interface JQuery {
 	 * Gets/Sets the string, which is used as negative pattern. The "n" flag represents the value of number. The "-" and "()" flags are static part of pattern.
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
+	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "negativePattern"): string;
 
@@ -30544,6 +31659,7 @@ interface JQuery {
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "negativePattern", optionValue: string): void;
@@ -30553,6 +31669,7 @@ interface JQuery {
 	 * Note: this option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [groupSeparator](ui.igNumericEditor#options:groupSeparator) or [negativeSign](ui.igNumericEditor#options:negativeSign) options.
+	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "decimalSeparator"): string;
 
@@ -30562,6 +31679,7 @@ interface JQuery {
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [groupSeparator](ui.igNumericEditor#options:groupSeparator) or [negativeSign](ui.igNumericEditor#options:negativeSign) options.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "decimalSeparator", optionValue: string): void;
@@ -30572,6 +31690,7 @@ interface JQuery {
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [decimalSeparator](ui.igNumericEditor#options:decimalSeparator) or [negativeSign](ui.igNumericEditor#options:negativeSign) options.
+	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "groupSeparator"): string;
 
@@ -30582,6 +31701,7 @@ interface JQuery {
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [decimalSeparator](ui.igNumericEditor#options:decimalSeparator) or [negativeSign](ui.igNumericEditor#options:negativeSign) options.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "groupSeparator", optionValue: string): void;
@@ -30595,6 +31715,7 @@ interface JQuery {
 	 * Note: The numbers in the array must be positive integers.
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
+	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "groups"): any[];
 
@@ -30608,6 +31729,7 @@ interface JQuery {
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "groups", optionValue: any[]): void;
@@ -30618,6 +31740,7 @@ interface JQuery {
 	 * Note: In case of min decimals value higher than max decimals - max decimals are equaled to min decimals property.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option supports values between 0 and 15, when dataMode is 'double' (default) and values between 0 and 7 in 'float' mode.
+	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "maxDecimals"): number;
 
@@ -30628,6 +31751,7 @@ interface JQuery {
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option supports values between 0 and 15, when dataMode is 'double' (default) and values between 0 and 7 in 'float' mode.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "maxDecimals", optionValue: number): void;
@@ -30639,6 +31763,7 @@ interface JQuery {
 	 * Note: In case of min decimals value higher than max decimals - max decimals are equaled to min decimals property.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option supports values between 0 and 15, when dataMode is 'double' (default) and values between 0 and 7 in 'float' mode.
+	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "minDecimals"): number;
 
@@ -30650,6 +31775,7 @@ interface JQuery {
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option supports values between 0 and 15, when dataMode is 'double' (default) and values between 0 and 7 in 'float' mode.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "minDecimals", optionValue: number): void;
@@ -30658,6 +31784,7 @@ interface JQuery {
 	 * Gets/Sets whether the last decimal place will be rounded, when the maxDecimal option is defined and applied.
 	 * For example if the initial editor value is set to 123.4567, maxDecimals option is set to 3 and roundDecimals is enabled,
 	 * then editor will round the value and will display it as 123.457. If roundDecimals is disabled then editor value will be truncated to 123.456.
+	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "roundDecimals"): boolean;
 
@@ -30666,12 +31793,14 @@ interface JQuery {
 	 * For example if the initial editor value is set to 123.4567, maxDecimals option is set to 3 and roundDecimals is enabled,
 	 * then editor will round the value and will display it as 123.457. If roundDecimals is disabled then editor value will be truncated to 123.456.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "roundDecimals", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the horizontal alignment of the text in the editor.
+	 *
 	 */
 
 	igNumericEditor(optionLiteral: 'option', optionName: "textAlign"): string;
@@ -30679,6 +31808,7 @@ interface JQuery {
 	/**
 	 * /Sets the horizontal alignment of the text in the editor.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -30688,6 +31818,7 @@ interface JQuery {
 	 * Defines the range that editor's value can accept.This is achieved by setting the [minValue](ui.igNumericEditor#options:minValue) and [maxValue](ui.igNumericEditor#options:maxValue) editor's options, accordingly to the lowest and highest accepted values for the defined numeric mode.
 	 * The range for the specific type follows the numeric type standards, e.g. in .NET Framework  [floating-point](https://msdn.microsoft.com/en-us/library/9ahet949.aspx) types and [integral types](https://msdn.microsoft.com/en-us/library/exx3b86w.aspx).
 	 * In addition, the maximum value that can be set to [minDecimals](ui.igNumericEditor#options:minDecimals) and [maxDecimals](ui.igNumericEditor#options:maxDecimals) options can be 15, when editor is in 'double' mode and 7, when in 'float' mode.
+	 *
 	 */
 
 	igNumericEditor(optionLiteral: 'option', optionName: "dataMode"): string;
@@ -30697,6 +31828,7 @@ interface JQuery {
 	 * The range for the specific type follows the numeric type standards, e.g. in .NET Framework  [floating-point](https://msdn.microsoft.com/en-us/library/9ahet949.aspx) types and [integral types](https://msdn.microsoft.com/en-us/library/exx3b86w.aspx).
 	 * In addition, the maximum value that can be set to [minDecimals](ui.igNumericEditor#options:minDecimals) and [maxDecimals](ui.igNumericEditor#options:maxDecimals) options can be 15, when editor is in 'double' mode and 7, when in 'float' mode.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -30704,24 +31836,28 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the minimum value which can be entered in the editor by the end user.
+	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "minValue"): number;
 
 	/**
 	 * /Sets the minimum value which can be entered in the editor by the end user.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "minValue", optionValue: number): void;
 
 	/**
 	 * Gets/Sets the maximum value which can be entered in the editor by the end user.
+	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "maxValue"): number;
 
 	/**
 	 * /Sets the maximum value which can be entered in the editor by the end user.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "maxValue", optionValue: number): void;
@@ -30729,6 +31865,7 @@ interface JQuery {
 	/**
 	 * Gets/Sets whether the editor value can become null.
 	 * If that option is disabled, and editor has no value, then value is set to 0 (or minValue/maxValue).
+	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "allowNullValue"): boolean;
 
@@ -30736,18 +31873,21 @@ interface JQuery {
 	 * /Sets whether the editor value can become null.
 	 * If that option is disabled, and editor has no value, then value is set to 0 (or minValue/maxValue).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "allowNullValue", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the default delta-value which is used with "spin" [buttonType](ui.igNumericEditor#options:buttonType) or [spinUp](ui.igNumericEditor#methods:spinUp) and [spinDown](ui.igNumericEditor#methods:spinDown) methods to increment or decrement value in the editor. The value can not be negative. Non integer value is supported only for dataMode double and float.
+	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "spinDelta"): number;
 
 	/**
 	 * /Sets the default delta-value which is used with "spin" [buttonType](ui.igNumericEditor#options:buttonType) or [spinUp](ui.igNumericEditor#methods:spinUp) and [spinDown](ui.igNumericEditor#methods:spinDown) methods to increment or decrement value in the editor. The value can not be negative. Non integer value is supported only for dataMode double and float.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "spinDelta", optionValue: number): void;
@@ -30756,6 +31896,7 @@ interface JQuery {
 	 * Gets/Sets support for scientific format.
 	 * If that option is set, then numeric value appears as a string with possible E-power flag. In edit mode the "E" or "e" character can be entered as well.
 	 * Notes: The "+" character is not supported in edit mode.
+	 *
 	 */
 
 	igNumericEditor(optionLiteral: 'option', optionName: "scientificFormat"): string;
@@ -30765,6 +31906,7 @@ interface JQuery {
 	 * If that option is set, then numeric value appears as a string with possible E-power flag. In edit mode the "E" or "e" character can be entered as well.
 	 * Notes: The "+" character is not supported in edit mode.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -30773,6 +31915,7 @@ interface JQuery {
 	/**
 	 * Gets/Set the ability of the editor to automatically set value in the editor to the opposite side of the limit, when the spin action reaches minimum or maximum limit.
 	 * This applies to [minValue](ui.%%WidgetNameLowered%%#options:minValue) and [maxValue](ui.%%WidgetNameLowered%%#options:maxValue) or cycling through list items if [isLimitedToListValues](ui.%%WidgetNameLowered%%#options:isLimitedToListValues) is enabled.
+	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "spinWrapAround"): boolean;
 
@@ -30780,18 +31923,21 @@ interface JQuery {
 	 * /Set the ability of the editor to automatically set value in the editor to the opposite side of the limit, when the spin action reaches minimum or maximum limit.
 	 * This applies to [minValue](ui.%%WidgetNameLowered%%#options:minValue) and [maxValue](ui.%%WidgetNameLowered%%#options:maxValue) or cycling through list items if [isLimitedToListValues](ui.%%WidgetNameLowered%%#options:isLimitedToListValues) is enabled.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "spinWrapAround", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets if the editor should only allow values from the list of items. Enabling this also causes spin actions to cycle through list items instead.
+	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "isLimitedToListValues"): boolean;
 
 	/**
 	 * /Sets if the editor should only allow values from the list of items. Enabling this also causes spin actions to cycle through list items instead.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "isLimitedToListValues", optionValue: boolean): void;
@@ -30863,6 +32009,7 @@ interface JQuery {
 	/**
 	 * Gets/Sets value in editor. The effect of setting/getting that option depends on type of editor and on dataMode options for every type of editor.
 	 *
+	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "value"): any;
 
@@ -30870,12 +32017,14 @@ interface JQuery {
 	 * /Sets value in editor. The effect of setting/getting that option depends on type of editor and on dataMode options for every type of editor.
 	 *
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "value", optionValue: any): void;
 
 	/**
 	 * Gets visibility of the spin, clear and drop-down button. That option can be set only on initialization. Combinations like 'dropdown,spin' or 'spin,clear' are supported too.Note! This option can not be set runtime.
+	 *
 	 */
 
 	igNumericEditor(optionLiteral: 'option', optionName: "buttonType"): string;
@@ -30883,6 +32032,7 @@ interface JQuery {
 	/**
 	 * Visibility of the spin, clear and drop-down button. That option can be set only on initialization. Combinations like 'dropdown,spin' or 'spin,clear' are supported too.Note! This option can not be set runtime.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -30890,24 +32040,28 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets custom width of the drop-down list in pixels. If the value is equal to 0 or negative, then the width of editor is set as a drop-down width.
+	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "listWidth"): number;
 
 	/**
 	 * /Sets custom width of the drop-down list in pixels. If the value is equal to 0 or negative, then the width of editor is set as a drop-down width.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "listWidth", optionValue: number): void;
 
 	/**
 	 * Gets/Sets the hover/unhover animation duration of a drop-down list item.
+	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "listItemHoverDuration"): number;
 
 	/**
 	 * /Sets the hover/unhover animation duration of a drop-down list item.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "listItemHoverDuration", optionValue: number): void;
@@ -30917,6 +32071,7 @@ interface JQuery {
 	 * If the option is set to false the editor will attach the drop-down list element to the editor container
 	 * If the option is set to true the editor will attach its drop-down list to as a child of the body.
 	 * Note! This option can not be set runtime.
+	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "dropDownAttachedToBody"): boolean;
 
@@ -30926,18 +32081,21 @@ interface JQuery {
 	 * If the option is set to true the editor will attach its drop-down list to as a child of the body.
 	 * Note! This option can not be set runtime.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "dropDownAttachedToBody", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets show/hide drop-down list animation duration in milliseconds.
+	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "dropDownAnimationDuration"): number;
 
 	/**
 	 * /Sets show/hide drop-down list animation duration in milliseconds.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "dropDownAnimationDuration", optionValue: number): void;
@@ -30947,6 +32105,7 @@ interface JQuery {
 	 * Notes:
 	 * This option is overwritten if the number of list items is less than the set value. In that case the drop-down list displays all the items.
 	 * This option can not be set runtime.
+	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "visibleItemsCount"): number;
 
@@ -30956,24 +32115,28 @@ interface JQuery {
 	 * This option is overwritten if the number of list items is less than the set value. In that case the drop-down list displays all the items.
 	 * This option can not be set runtime.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "visibleItemsCount", optionValue: number): void;
 
 	/**
 	 * Gets/Sets the text which appears in the editor when it has no focus and the "value" is null or empty string.
+	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "placeHolder"): string;
 
 	/**
 	 * /Sets the text which appears in the editor when it has no focus and the "value" is null or empty string.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "placeHolder", optionValue: string): void;
 
 	/**
 	 * Gets/Sets the action when the editor gets focused. The default value is selectAll.
+	 *
 	 */
 
 	igNumericEditor(optionLiteral: 'option', optionName: "selectionOnFocus"): string;
@@ -30981,6 +32144,7 @@ interface JQuery {
 	/**
 	 * /Sets the action when the editor gets focused. The default value is selectAll.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -30988,30 +32152,35 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets if the editor should revert it's value to the previously valid value in case the value on blur, or enter key is not valid. If the opiton is set to false, editor calls clear functionality.
+	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "revertIfNotValid"): boolean;
 
 	/**
 	 * /Sets if the editor should revert it's value to the previously valid value in case the value on blur, or enter key is not valid. If the opiton is set to false, editor calls clear functionality.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "revertIfNotValid", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets if the editor should prevent form submition when enter key is pressed.
+	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "preventSubmitOnEnter"): boolean;
 
 	/**
 	 * /Sets if the editor should prevent form submition when enter key is pressed.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "preventSubmitOnEnter", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the drop-down list opening orientation when the list gets open. If the option is set to auto the editor has priority to open the drop-down list bottom. If the space is not enough it tries to open the list top. If the space is not enough in both directions then the list gets opened at the bottom of the editor.
+	 *
 	 */
 
 	igNumericEditor(optionLiteral: 'option', optionName: "dropDownOrientation"): string;
@@ -31019,6 +32188,7 @@ interface JQuery {
 	/**
 	 * /Sets the drop-down list opening orientation when the list gets open. If the option is set to auto the editor has priority to open the drop-down list bottom. If the space is not enough it tries to open the list top. If the space is not enough in both directions then the list gets opened at the bottom of the editor.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -31028,6 +32198,7 @@ interface JQuery {
 	 * Gets the ability to limit the editor to be used only as a dropdown list. When set to true the editor input is not editable.
 	 * Note! In case there are no list items - the editor will reamin readonly
 	 * Note! This option can not be set runtime.
+	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "dropDownOnReadOnly"): boolean;
 
@@ -31036,18 +32207,21 @@ interface JQuery {
 	 * Note! In case there are no list items - the editor will reamin readonly
 	 * Note! This option can not be set runtime.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "dropDownOnReadOnly", optionValue: boolean): void;
 
 	/**
 	 * Disables/Enables default notifications for basic validation scenarios built in the editors such as required list selection, value wrapping around or spin limits.
+	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "suppressNotifications"): boolean;
 
 	/**
 	 * Disables/Enables default notifications for basic validation scenarios built in the editors such as required list selection, value wrapping around or spin limits.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "suppressNotifications", optionValue: boolean): void;
@@ -31056,6 +32230,7 @@ interface JQuery {
 	 * Gets/Sets whether the onscreen keyboard (if available on device) should be shown when the dropdown button is clicked/tapped. This option prevents initial focus or removes it when the drop button is clicked/tapped.
 	 * Note: The option does not perform device detection so its behavior is always active if enabled.
 	 * Note: When drop down is opened the only way to close it will be using the drop down button.
+	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "suppressKeyboard"): boolean;
 
@@ -31064,12 +32239,14 @@ interface JQuery {
 	 * Note: The option does not perform device detection so its behavior is always active if enabled.
 	 * Note: When drop down is opened the only way to close it will be using the drop down button.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "suppressKeyboard", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the width of the control.
+	 *
 	 */
 
 	igNumericEditor(optionLiteral: 'option', optionName: "width"): string|number;
@@ -31077,6 +32254,7 @@ interface JQuery {
 	/**
 	 * /Sets the width of the control.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -31084,6 +32262,7 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the height of the control.
+	 *
 	 */
 
 	igNumericEditor(optionLiteral: 'option', optionName: "height"): string|number;
@@ -31091,6 +32270,7 @@ interface JQuery {
 	/**
 	 * /Sets the height of the control.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -31098,18 +32278,21 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets tabIndex attribute for the editor input.
+	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "tabIndex"): number;
 
 	/**
 	 * /Sets tabIndex attribute for the editor input.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "tabIndex", optionValue: number): void;
 
 	/**
 	 * Gets/Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
+	 *
 	 */
 
 	igNumericEditor(optionLiteral: 'option', optionName: "nullValue"): string|number;
@@ -31117,6 +32300,7 @@ interface JQuery {
 	/**
 	 * /Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -31124,36 +32308,42 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
+	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "inputName"): string;
 
 	/**
 	 * /Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "inputName", optionValue: string): void;
 
 	/**
 	 * Gets/Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
+	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "readOnly"): boolean;
 
 	/**
 	 * /Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "readOnly", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
+	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "disabled"): boolean;
 
 	/**
 	 * /Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "disabled", optionValue: boolean): void;
@@ -31162,6 +32352,7 @@ interface JQuery {
 	 * Gets/Sets options supported by the [igValidator](ui.igvalidator#options) widget.
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
+	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "validatorOptions"): any;
 
@@ -31170,36 +32361,42 @@ interface JQuery {
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "validatorOptions", optionValue: any): void;
 
 	/**
 	 * Set/Get the locale setting for the widget.
+	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "locale"): any;
 
 	/**
 	 * Set/Get the locale setting for the widget.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
+	 *
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "language"): string;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "language", optionValue: string): void;
 
 	/**
 	 * Set/Get the regional setting for the widget.
+	 *
 	 */
 
 	igNumericEditor(optionLiteral: 'option', optionName: "regional"): string|Object;
@@ -31207,154 +32404,95 @@ interface JQuery {
 	/**
 	 * Set/Get the regional setting for the widget.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
 	igNumericEditor(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
 
 	/**
-	 * Event which is raised when the drop down is opening.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.editorInput to obtain reference to the editable input
-	 * Use ui.list to obtain reference to the list contaier.
+	 * Fired when the drop down is opening.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "dropDownListOpening"): DropDownListOpeningEvent;
 
 	/**
-	 * Event which is raised when the drop down is opening.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.editorInput to obtain reference to the editable input
-	 * Use ui.list to obtain reference to the list contaier.
+	 * Fired when the drop down is opening.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "dropDownListOpening", optionValue: DropDownListOpeningEvent): void;
 
 	/**
-	 * Event which is raised after the drop down is opened.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.editorInput to obtain reference to the editable input
-	 * Use ui.list to obtain reference to the list contaier.
+	 * Fired after the drop down is opened.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "dropDownListOpened"): DropDownListOpenedEvent;
 
 	/**
-	 * Event which is raised after the drop down is opened.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.editorInput to obtain reference to the editable input
-	 * Use ui.list to obtain reference to the list contaier.
+	 * Fired after the drop down is opened.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "dropDownListOpened", optionValue: DropDownListOpenedEvent): void;
 
 	/**
-	 * Event which is raised when the drop down is closing.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.editorInput to obtain reference to the editable input
-	 * Use ui.list to obtain reference to the list contaier.
+	 * Fired when the drop down is closing.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "dropDownListClosing"): DropDownListClosingEvent;
 
 	/**
-	 * Event which is raised when the drop down is closing.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.editorInput to obtain reference to the editable input
-	 * Use ui.list to obtain reference to the list contaier.
+	 * Fired when the drop down is closing.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "dropDownListClosing", optionValue: DropDownListClosingEvent): void;
 
 	/**
-	 * Event which is raised after the drop down is closed.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.editorInput to obtain reference to the editable input
-	 * Use ui.list to obtain reference to the list contaier.
+	 * Fired after the drop down is closed.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "dropDownListClosed"): DropDownListClosedEvent;
 
 	/**
-	 * Event which is raised after the drop down is closed.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.editorInput to obtain reference to the editable input
-	 * Use ui.list to obtain reference to the list contaier.
+	 * Fired after the drop down is closed.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "dropDownListClosed", optionValue: DropDownListClosedEvent): void;
 
 	/**
-	 * Event which is raised when an item in the drop down list is being selected.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.editorInput to obtain reference to the editable input
-	 * Use ui.list to obtain reference to the list contaier.
-	 * Use ui.item to obtain reference to the list item which is about to be selected.
+	 * Fired when an item in the drop down list is being selected.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "dropDownItemSelecting"): DropDownItemSelectingEvent;
 
 	/**
-	 * Event which is raised when an item in the drop down list is being selected.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.editorInput to obtain reference to the editable input
-	 * Use ui.list to obtain reference to the list contaier.
-	 * Use ui.item to obtain reference to the list item which is about to be selected.
+	 * Fired when an item in the drop down list is being selected.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "dropDownItemSelecting", optionValue: DropDownItemSelectingEvent): void;
 
 	/**
-	 * Event which is raised after an item in the drop down list is selected.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.editorInput to obtain reference to the editable input
-	 * Use ui.list to obtain reference to the list contaier.
-	 * Use ui.item to obtain reference to the list item which is selected.
+	 * Fired after an item in the drop down list is selected.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "dropDownItemSelected"): DropDownItemSelectedEvent;
 
 	/**
-	 * Event which is raised after an item in the drop down list is selected.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.editorInput to obtain reference to the editable input
-	 * Use ui.list to obtain reference to the list contaier.
-	 * Use ui.item to obtain reference to the list item which is selected.
+	 * Fired after an item in the drop down list is selected.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "dropDownItemSelected", optionValue: DropDownItemSelectedEvent): void;
 
 	/**
-	 * Event which is raised after text in the editor was changed. It can be raised when keyUp event occurs,
+	 * Fired after the editor's text has been changed. It can be raised when keyUp event occurs,
 	 * when the clear button is clicked or when an item from a list is selected.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.text to obtain new text
-	 * Use ui.oldText to obtain the old text.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "textChanged"): TextChangedEvent;
 
 	/**
-	 * Event which is raised after text in the editor was changed. It can be raised when keyUp event occurs,
+	 * Fired after the editor's text has been changed. It can be raised when keyUp event occurs,
 	 * when the clear button is clicked or when an item from a list is selected.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.text to obtain new text
-	 * Use ui.oldText to obtain the old text.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igNumericEditor(optionLiteral: 'option', optionName: "textChanged", optionValue: TextChangedEvent): void;
 	igNumericEditor(options: IgNumericEditor): JQuery;
@@ -31381,6 +32519,7 @@ interface JQuery {
 	 * Gets/Sets the string, which is used as positive pattern. The "n" flag represents the value of number.
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
+	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "positivePattern"): string;
 
@@ -31389,18 +32528,21 @@ interface JQuery {
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "positivePattern", optionValue: string): void;
 
 	/**
 	 * Gets/Sets a string that is used as the currency symbol that is shown in display mode.
+	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "currencySymbol"): string;
 
 	/**
 	 * /Sets a string that is used as the currency symbol that is shown in display mode.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "currencySymbol", optionValue: string): void;
@@ -31408,6 +32550,7 @@ interface JQuery {
 	/**
 	 * Gets/Sets list of items which are used as a source for the drop-down list.
 	 * Items in the list can be of type number.
+	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "listItems"): any[];
 
@@ -31415,6 +32558,7 @@ interface JQuery {
 	 * /Sets list of items which are used as a source for the drop-down list.
 	 * Items in the list can be of type number.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "listItems", optionValue: any[]): void;
@@ -31424,6 +32568,7 @@ interface JQuery {
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [groupSeparator](ui.igNumericEditor#options:groupSeparator) or [decimalSeparator](ui.igNumericEditor#options:decimalSeparator) options.
+	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "negativeSign"): string;
 
@@ -31433,6 +32578,7 @@ interface JQuery {
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [groupSeparator](ui.igNumericEditor#options:groupSeparator) or [decimalSeparator](ui.igNumericEditor#options:decimalSeparator) options.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "negativeSign", optionValue: string): void;
@@ -31441,6 +32587,7 @@ interface JQuery {
 	 * Gets/Sets the string, which is used as negative pattern. The "n" flag represents the value of number. The "-" and "()" flags are static part of pattern.
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
+	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "negativePattern"): string;
 
@@ -31449,6 +32596,7 @@ interface JQuery {
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "negativePattern", optionValue: string): void;
@@ -31458,6 +32606,7 @@ interface JQuery {
 	 * Note: this option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [groupSeparator](ui.igNumericEditor#options:groupSeparator) or [negativeSign](ui.igNumericEditor#options:negativeSign) options.
+	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "decimalSeparator"): string;
 
@@ -31467,6 +32616,7 @@ interface JQuery {
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [groupSeparator](ui.igNumericEditor#options:groupSeparator) or [negativeSign](ui.igNumericEditor#options:negativeSign) options.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "decimalSeparator", optionValue: string): void;
@@ -31477,6 +32627,7 @@ interface JQuery {
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [decimalSeparator](ui.igNumericEditor#options:decimalSeparator) or [negativeSign](ui.igNumericEditor#options:negativeSign) options.
+	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "groupSeparator"): string;
 
@@ -31487,6 +32638,7 @@ interface JQuery {
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [decimalSeparator](ui.igNumericEditor#options:decimalSeparator) or [negativeSign](ui.igNumericEditor#options:negativeSign) options.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "groupSeparator", optionValue: string): void;
@@ -31500,6 +32652,7 @@ interface JQuery {
 	 * Note: The numbers in the array must be positive integers.
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
+	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "groups"): any[];
 
@@ -31513,6 +32666,7 @@ interface JQuery {
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "groups", optionValue: any[]): void;
@@ -31523,6 +32677,7 @@ interface JQuery {
 	 * Note: In case of min decimals value higher than max decimals - max decimals are equaled to min decimals property.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option supports values between 0 and 15, when dataMode is 'double' (default) and values between 0 and 7 in 'float' mode.
+	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "maxDecimals"): number;
 
@@ -31533,6 +32688,7 @@ interface JQuery {
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option supports values between 0 and 15, when dataMode is 'double' (default) and values between 0 and 7 in 'float' mode.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "maxDecimals", optionValue: number): void;
@@ -31544,6 +32700,7 @@ interface JQuery {
 	 * Note: In case of min decimals value higher than max decimals - max decimals are equaled to min decimals property.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option supports values between 0 and 15, when dataMode is 'double' (default) and values between 0 and 7 in 'float' mode.
+	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "minDecimals"): number;
 
@@ -31555,6 +32712,7 @@ interface JQuery {
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option supports values between 0 and 15, when dataMode is 'double' (default) and values between 0 and 7 in 'float' mode.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "minDecimals", optionValue: number): void;
@@ -31563,6 +32721,7 @@ interface JQuery {
 	 * Gets/Sets whether the last decimal place will be rounded, when the maxDecimal option is defined and applied.
 	 * For example if the initial editor value is set to 123.4567, maxDecimals option is set to 3 and roundDecimals is enabled,
 	 * then editor will round the value and will display it as 123.457. If roundDecimals is disabled then editor value will be truncated to 123.456.
+	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "roundDecimals"): boolean;
 
@@ -31571,12 +32730,14 @@ interface JQuery {
 	 * For example if the initial editor value is set to 123.4567, maxDecimals option is set to 3 and roundDecimals is enabled,
 	 * then editor will round the value and will display it as 123.457. If roundDecimals is disabled then editor value will be truncated to 123.456.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "roundDecimals", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the horizontal alignment of the text in the editor.
+	 *
 	 */
 
 	igCurrencyEditor(optionLiteral: 'option', optionName: "textAlign"): string;
@@ -31584,6 +32745,7 @@ interface JQuery {
 	/**
 	 * /Sets the horizontal alignment of the text in the editor.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -31593,6 +32755,7 @@ interface JQuery {
 	 * Defines the range that editor's value can accept.This is achieved by setting the [minValue](ui.igNumericEditor#options:minValue) and [maxValue](ui.igNumericEditor#options:maxValue) editor's options, accordingly to the lowest and highest accepted values for the defined numeric mode.
 	 * The range for the specific type follows the numeric type standards, e.g. in .NET Framework  [floating-point](https://msdn.microsoft.com/en-us/library/9ahet949.aspx) types and [integral types](https://msdn.microsoft.com/en-us/library/exx3b86w.aspx).
 	 * In addition, the maximum value that can be set to [minDecimals](ui.igNumericEditor#options:minDecimals) and [maxDecimals](ui.igNumericEditor#options:maxDecimals) options can be 15, when editor is in 'double' mode and 7, when in 'float' mode.
+	 *
 	 */
 
 	igCurrencyEditor(optionLiteral: 'option', optionName: "dataMode"): string;
@@ -31602,6 +32765,7 @@ interface JQuery {
 	 * The range for the specific type follows the numeric type standards, e.g. in .NET Framework  [floating-point](https://msdn.microsoft.com/en-us/library/9ahet949.aspx) types and [integral types](https://msdn.microsoft.com/en-us/library/exx3b86w.aspx).
 	 * In addition, the maximum value that can be set to [minDecimals](ui.igNumericEditor#options:minDecimals) and [maxDecimals](ui.igNumericEditor#options:maxDecimals) options can be 15, when editor is in 'double' mode and 7, when in 'float' mode.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -31609,24 +32773,28 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the minimum value which can be entered in the editor by the end user.
+	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "minValue"): number;
 
 	/**
 	 * /Sets the minimum value which can be entered in the editor by the end user.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "minValue", optionValue: number): void;
 
 	/**
 	 * Gets/Sets the maximum value which can be entered in the editor by the end user.
+	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "maxValue"): number;
 
 	/**
 	 * /Sets the maximum value which can be entered in the editor by the end user.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "maxValue", optionValue: number): void;
@@ -31634,6 +32802,7 @@ interface JQuery {
 	/**
 	 * Gets/Sets whether the editor value can become null.
 	 * If that option is disabled, and editor has no value, then value is set to 0 (or minValue/maxValue).
+	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "allowNullValue"): boolean;
 
@@ -31641,18 +32810,21 @@ interface JQuery {
 	 * /Sets whether the editor value can become null.
 	 * If that option is disabled, and editor has no value, then value is set to 0 (or minValue/maxValue).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "allowNullValue", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the default delta-value which is used with "spin" [buttonType](ui.igNumericEditor#options:buttonType) or [spinUp](ui.igNumericEditor#methods:spinUp) and [spinDown](ui.igNumericEditor#methods:spinDown) methods to increment or decrement value in the editor. The value can not be negative. Non integer value is supported only for dataMode double and float.
+	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "spinDelta"): number;
 
 	/**
 	 * /Sets the default delta-value which is used with "spin" [buttonType](ui.igNumericEditor#options:buttonType) or [spinUp](ui.igNumericEditor#methods:spinUp) and [spinDown](ui.igNumericEditor#methods:spinDown) methods to increment or decrement value in the editor. The value can not be negative. Non integer value is supported only for dataMode double and float.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "spinDelta", optionValue: number): void;
@@ -31661,6 +32833,7 @@ interface JQuery {
 	 * Gets/Sets support for scientific format.
 	 * If that option is set, then numeric value appears as a string with possible E-power flag. In edit mode the "E" or "e" character can be entered as well.
 	 * Notes: The "+" character is not supported in edit mode.
+	 *
 	 */
 
 	igCurrencyEditor(optionLiteral: 'option', optionName: "scientificFormat"): string;
@@ -31670,6 +32843,7 @@ interface JQuery {
 	 * If that option is set, then numeric value appears as a string with possible E-power flag. In edit mode the "E" or "e" character can be entered as well.
 	 * Notes: The "+" character is not supported in edit mode.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -31678,6 +32852,7 @@ interface JQuery {
 	/**
 	 * Gets/Set the ability of the editor to automatically set value in the editor to the opposite side of the limit, when the spin action reaches minimum or maximum limit.
 	 * This applies to [minValue](ui.%%WidgetNameLowered%%#options:minValue) and [maxValue](ui.%%WidgetNameLowered%%#options:maxValue) or cycling through list items if [isLimitedToListValues](ui.%%WidgetNameLowered%%#options:isLimitedToListValues) is enabled.
+	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "spinWrapAround"): boolean;
 
@@ -31685,18 +32860,21 @@ interface JQuery {
 	 * /Set the ability of the editor to automatically set value in the editor to the opposite side of the limit, when the spin action reaches minimum or maximum limit.
 	 * This applies to [minValue](ui.%%WidgetNameLowered%%#options:minValue) and [maxValue](ui.%%WidgetNameLowered%%#options:maxValue) or cycling through list items if [isLimitedToListValues](ui.%%WidgetNameLowered%%#options:isLimitedToListValues) is enabled.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "spinWrapAround", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets if the editor should only allow values from the list of items. Enabling this also causes spin actions to cycle through list items instead.
+	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "isLimitedToListValues"): boolean;
 
 	/**
 	 * /Sets if the editor should only allow values from the list of items. Enabling this also causes spin actions to cycle through list items instead.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "isLimitedToListValues", optionValue: boolean): void;
@@ -31768,6 +32946,7 @@ interface JQuery {
 	/**
 	 * Gets/Sets value in editor. The effect of setting/getting that option depends on type of editor and on dataMode options for every type of editor.
 	 *
+	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "value"): any;
 
@@ -31775,12 +32954,14 @@ interface JQuery {
 	 * /Sets value in editor. The effect of setting/getting that option depends on type of editor and on dataMode options for every type of editor.
 	 *
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "value", optionValue: any): void;
 
 	/**
 	 * Gets visibility of the spin, clear and drop-down button. That option can be set only on initialization. Combinations like 'dropdown,spin' or 'spin,clear' are supported too.Note! This option can not be set runtime.
+	 *
 	 */
 
 	igCurrencyEditor(optionLiteral: 'option', optionName: "buttonType"): string;
@@ -31788,6 +32969,7 @@ interface JQuery {
 	/**
 	 * Visibility of the spin, clear and drop-down button. That option can be set only on initialization. Combinations like 'dropdown,spin' or 'spin,clear' are supported too.Note! This option can not be set runtime.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -31795,24 +32977,28 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets custom width of the drop-down list in pixels. If the value is equal to 0 or negative, then the width of editor is set as a drop-down width.
+	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "listWidth"): number;
 
 	/**
 	 * /Sets custom width of the drop-down list in pixels. If the value is equal to 0 or negative, then the width of editor is set as a drop-down width.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "listWidth", optionValue: number): void;
 
 	/**
 	 * Gets/Sets the hover/unhover animation duration of a drop-down list item.
+	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "listItemHoverDuration"): number;
 
 	/**
 	 * /Sets the hover/unhover animation duration of a drop-down list item.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "listItemHoverDuration", optionValue: number): void;
@@ -31822,6 +33008,7 @@ interface JQuery {
 	 * If the option is set to false the editor will attach the drop-down list element to the editor container
 	 * If the option is set to true the editor will attach its drop-down list to as a child of the body.
 	 * Note! This option can not be set runtime.
+	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "dropDownAttachedToBody"): boolean;
 
@@ -31831,18 +33018,21 @@ interface JQuery {
 	 * If the option is set to true the editor will attach its drop-down list to as a child of the body.
 	 * Note! This option can not be set runtime.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "dropDownAttachedToBody", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets show/hide drop-down list animation duration in milliseconds.
+	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "dropDownAnimationDuration"): number;
 
 	/**
 	 * /Sets show/hide drop-down list animation duration in milliseconds.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "dropDownAnimationDuration", optionValue: number): void;
@@ -31852,6 +33042,7 @@ interface JQuery {
 	 * Notes:
 	 * This option is overwritten if the number of list items is less than the set value. In that case the drop-down list displays all the items.
 	 * This option can not be set runtime.
+	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "visibleItemsCount"): number;
 
@@ -31861,24 +33052,28 @@ interface JQuery {
 	 * This option is overwritten if the number of list items is less than the set value. In that case the drop-down list displays all the items.
 	 * This option can not be set runtime.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "visibleItemsCount", optionValue: number): void;
 
 	/**
 	 * Gets/Sets the text which appears in the editor when it has no focus and the "value" is null or empty string.
+	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "placeHolder"): string;
 
 	/**
 	 * /Sets the text which appears in the editor when it has no focus and the "value" is null or empty string.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "placeHolder", optionValue: string): void;
 
 	/**
 	 * Gets/Sets the action when the editor gets focused. The default value is selectAll.
+	 *
 	 */
 
 	igCurrencyEditor(optionLiteral: 'option', optionName: "selectionOnFocus"): string;
@@ -31886,6 +33081,7 @@ interface JQuery {
 	/**
 	 * /Sets the action when the editor gets focused. The default value is selectAll.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -31893,30 +33089,35 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets if the editor should revert it's value to the previously valid value in case the value on blur, or enter key is not valid. If the opiton is set to false, editor calls clear functionality.
+	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "revertIfNotValid"): boolean;
 
 	/**
 	 * /Sets if the editor should revert it's value to the previously valid value in case the value on blur, or enter key is not valid. If the opiton is set to false, editor calls clear functionality.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "revertIfNotValid", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets if the editor should prevent form submition when enter key is pressed.
+	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "preventSubmitOnEnter"): boolean;
 
 	/**
 	 * /Sets if the editor should prevent form submition when enter key is pressed.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "preventSubmitOnEnter", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the drop-down list opening orientation when the list gets open. If the option is set to auto the editor has priority to open the drop-down list bottom. If the space is not enough it tries to open the list top. If the space is not enough in both directions then the list gets opened at the bottom of the editor.
+	 *
 	 */
 
 	igCurrencyEditor(optionLiteral: 'option', optionName: "dropDownOrientation"): string;
@@ -31924,6 +33125,7 @@ interface JQuery {
 	/**
 	 * /Sets the drop-down list opening orientation when the list gets open. If the option is set to auto the editor has priority to open the drop-down list bottom. If the space is not enough it tries to open the list top. If the space is not enough in both directions then the list gets opened at the bottom of the editor.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -31933,6 +33135,7 @@ interface JQuery {
 	 * Gets the ability to limit the editor to be used only as a dropdown list. When set to true the editor input is not editable.
 	 * Note! In case there are no list items - the editor will reamin readonly
 	 * Note! This option can not be set runtime.
+	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "dropDownOnReadOnly"): boolean;
 
@@ -31941,18 +33144,21 @@ interface JQuery {
 	 * Note! In case there are no list items - the editor will reamin readonly
 	 * Note! This option can not be set runtime.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "dropDownOnReadOnly", optionValue: boolean): void;
 
 	/**
 	 * Disables/Enables default notifications for basic validation scenarios built in the editors such as required list selection, value wrapping around or spin limits.
+	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "suppressNotifications"): boolean;
 
 	/**
 	 * Disables/Enables default notifications for basic validation scenarios built in the editors such as required list selection, value wrapping around or spin limits.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "suppressNotifications", optionValue: boolean): void;
@@ -31961,6 +33167,7 @@ interface JQuery {
 	 * Gets/Sets whether the onscreen keyboard (if available on device) should be shown when the dropdown button is clicked/tapped. This option prevents initial focus or removes it when the drop button is clicked/tapped.
 	 * Note: The option does not perform device detection so its behavior is always active if enabled.
 	 * Note: When drop down is opened the only way to close it will be using the drop down button.
+	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "suppressKeyboard"): boolean;
 
@@ -31969,12 +33176,14 @@ interface JQuery {
 	 * Note: The option does not perform device detection so its behavior is always active if enabled.
 	 * Note: When drop down is opened the only way to close it will be using the drop down button.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "suppressKeyboard", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the width of the control.
+	 *
 	 */
 
 	igCurrencyEditor(optionLiteral: 'option', optionName: "width"): string|number;
@@ -31982,6 +33191,7 @@ interface JQuery {
 	/**
 	 * /Sets the width of the control.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -31989,6 +33199,7 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the height of the control.
+	 *
 	 */
 
 	igCurrencyEditor(optionLiteral: 'option', optionName: "height"): string|number;
@@ -31996,6 +33207,7 @@ interface JQuery {
 	/**
 	 * /Sets the height of the control.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -32003,18 +33215,21 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets tabIndex attribute for the editor input.
+	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "tabIndex"): number;
 
 	/**
 	 * /Sets tabIndex attribute for the editor input.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "tabIndex", optionValue: number): void;
 
 	/**
 	 * Gets/Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
+	 *
 	 */
 
 	igCurrencyEditor(optionLiteral: 'option', optionName: "nullValue"): string|number;
@@ -32022,6 +33237,7 @@ interface JQuery {
 	/**
 	 * /Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -32029,36 +33245,42 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
+	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "inputName"): string;
 
 	/**
 	 * /Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "inputName", optionValue: string): void;
 
 	/**
 	 * Gets/Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
+	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "readOnly"): boolean;
 
 	/**
 	 * /Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "readOnly", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
+	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "disabled"): boolean;
 
 	/**
 	 * /Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "disabled", optionValue: boolean): void;
@@ -32067,6 +33289,7 @@ interface JQuery {
 	 * Gets/Sets options supported by the [igValidator](ui.igvalidator#options) widget.
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
+	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "validatorOptions"): any;
 
@@ -32075,36 +33298,42 @@ interface JQuery {
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "validatorOptions", optionValue: any): void;
 
 	/**
 	 * Set/Get the locale setting for the widget.
+	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "locale"): any;
 
 	/**
 	 * Set/Get the locale setting for the widget.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
+	 *
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "language"): string;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCurrencyEditor(optionLiteral: 'option', optionName: "language", optionValue: string): void;
 
 	/**
 	 * Set/Get the regional setting for the widget.
+	 *
 	 */
 
 	igCurrencyEditor(optionLiteral: 'option', optionName: "regional"): string|Object;
@@ -32112,6 +33341,7 @@ interface JQuery {
 	/**
 	 * Set/Get the regional setting for the widget.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -32141,6 +33371,7 @@ interface JQuery {
 	 * Gets/Sets the pattern for positive numeric values, which is used in display (no focus) state.
 	 * If you use the "en-US" culture the default value for "positivePattern" will be "n$" where the "$" flag represents the "numericSymbol" and the "n" flag represents the value of the number.
 	 * Note: this option has priority over possible regional settings.
+	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "positivePattern"): string;
 
@@ -32149,6 +33380,7 @@ interface JQuery {
 	 * If you use the "en-US" culture the default value for "positivePattern" will be "n$" where the "$" flag represents the "numericSymbol" and the "n" flag represents the value of the number.
 	 * Note: this option has priority over possible regional settings.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "positivePattern", optionValue: string): void;
@@ -32156,6 +33388,7 @@ interface JQuery {
 	/**
 	 * Gets/Sets the symbol, which is used in display (no focus) state.
 	 * Note: this option has priority over possible regional settings.
+	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "percentSymbol"): string;
 
@@ -32163,6 +33396,7 @@ interface JQuery {
 	 * /Sets the symbol, which is used in display (no focus) state.
 	 * Note: this option has priority over possible regional settings.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "percentSymbol", optionValue: string): void;
@@ -32173,6 +33407,7 @@ interface JQuery {
 	 * For example, if the factor is 100 and the "value" is set to 0.123, then the editor will show string "12.3".
 	 * Possible values: 1 or 100.
 	 * Note: this option has priority over possible regional settings.
+	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "displayFactor"): number;
 
@@ -32183,6 +33418,7 @@ interface JQuery {
 	 * Possible values: 1 or 100.
 	 * Note: this option has priority over possible regional settings.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "displayFactor", optionValue: number): void;
@@ -32191,6 +33427,7 @@ interface JQuery {
 	 * Defines the range that editor's value can accept.This is achieved by setting the [minValue](ui.igPercentEditor#options:minValue) and [maxValue](ui.igPercentEditor#options:maxValue) editor's options, accordingly to the lowest and highest accepted values for the defined numeric mode.
 	 * The range for the specific type follows the numeric type standards, e.g. in .NET Framework  [floating-point](https://msdn.microsoft.com/en-us/library/9ahet949.aspx) types and [integral types](https://msdn.microsoft.com/en-us/library/exx3b86w.aspx).
 	 * In addition, the maximum value that can be set to [minDecimals](ui.igPercentEditor#options:minDecimals) and [maxDecimals](ui.igPercentEditor#options:maxDecimals) options can be 15, when editor is in 'double' mode and 7, when in 'float' mode.
+	 *
 	 */
 
 	igPercentEditor(optionLiteral: 'option', optionName: "dataMode"): string;
@@ -32200,6 +33437,7 @@ interface JQuery {
 	 * The range for the specific type follows the numeric type standards, e.g. in .NET Framework  [floating-point](https://msdn.microsoft.com/en-us/library/9ahet949.aspx) types and [integral types](https://msdn.microsoft.com/en-us/library/exx3b86w.aspx).
 	 * In addition, the maximum value that can be set to [minDecimals](ui.igPercentEditor#options:minDecimals) and [maxDecimals](ui.igPercentEditor#options:maxDecimals) options can be 15, when editor is in 'double' mode and 7, when in 'float' mode.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -32207,12 +33445,14 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the default delta-value which is used with "spin" [buttonType](ui.igpercenteditor#options:buttonType) or [spinUp](ui.igpercenteditor#methods:spinUp) and [spinDown](ui.igpercenteditor#methods:spinDown) methods to increment or decrement value in the editor. The value can not be negative. Non integer value is supported only for dataMode double and float.
+	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "spinDelta"): number;
 
 	/**
 	 * /Sets the default delta-value which is used with "spin" [buttonType](ui.igpercenteditor#options:buttonType) or [spinUp](ui.igpercenteditor#methods:spinUp) and [spinDown](ui.igpercenteditor#methods:spinDown) methods to increment or decrement value in the editor. The value can not be negative. Non integer value is supported only for dataMode double and float.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "spinDelta", optionValue: number): void;
@@ -32220,6 +33460,7 @@ interface JQuery {
 	/**
 	 * Gets/Sets list of items which are used as a source for the drop-down list.
 	 * Items in the list can be of type number.
+	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "listItems"): any[];
 
@@ -32227,6 +33468,7 @@ interface JQuery {
 	 * /Sets list of items which are used as a source for the drop-down list.
 	 * Items in the list can be of type number.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "listItems", optionValue: any[]): void;
@@ -32236,6 +33478,7 @@ interface JQuery {
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [groupSeparator](ui.igNumericEditor#options:groupSeparator) or [decimalSeparator](ui.igNumericEditor#options:decimalSeparator) options.
+	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "negativeSign"): string;
 
@@ -32245,6 +33488,7 @@ interface JQuery {
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [groupSeparator](ui.igNumericEditor#options:groupSeparator) or [decimalSeparator](ui.igNumericEditor#options:decimalSeparator) options.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "negativeSign", optionValue: string): void;
@@ -32253,6 +33497,7 @@ interface JQuery {
 	 * Gets/Sets the string, which is used as negative pattern. The "n" flag represents the value of number. The "-" and "()" flags are static part of pattern.
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
+	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "negativePattern"): string;
 
@@ -32261,6 +33506,7 @@ interface JQuery {
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "negativePattern", optionValue: string): void;
@@ -32270,6 +33516,7 @@ interface JQuery {
 	 * Note: this option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [groupSeparator](ui.igNumericEditor#options:groupSeparator) or [negativeSign](ui.igNumericEditor#options:negativeSign) options.
+	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "decimalSeparator"): string;
 
@@ -32279,6 +33526,7 @@ interface JQuery {
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [groupSeparator](ui.igNumericEditor#options:groupSeparator) or [negativeSign](ui.igNumericEditor#options:negativeSign) options.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "decimalSeparator", optionValue: string): void;
@@ -32289,6 +33537,7 @@ interface JQuery {
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [decimalSeparator](ui.igNumericEditor#options:decimalSeparator) or [negativeSign](ui.igNumericEditor#options:negativeSign) options.
+	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "groupSeparator"): string;
 
@@ -32299,6 +33548,7 @@ interface JQuery {
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option's value should not be equal to the value of [decimalSeparator](ui.igNumericEditor#options:decimalSeparator) or [negativeSign](ui.igNumericEditor#options:negativeSign) options.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "groupSeparator", optionValue: string): void;
@@ -32312,6 +33562,7 @@ interface JQuery {
 	 * Note: The numbers in the array must be positive integers.
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
+	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "groups"): any[];
 
@@ -32325,6 +33576,7 @@ interface JQuery {
 	 * Note: This option has priority over possible regional settings.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "groups", optionValue: any[]): void;
@@ -32335,6 +33587,7 @@ interface JQuery {
 	 * Note: In case of min decimals value higher than max decimals - max decimals are equaled to min decimals property.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option supports values between 0 and 15, when dataMode is 'double' (default) and values between 0 and 7 in 'float' mode.
+	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "maxDecimals"): number;
 
@@ -32345,6 +33598,7 @@ interface JQuery {
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option supports values between 0 and 15, when dataMode is 'double' (default) and values between 0 and 7 in 'float' mode.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "maxDecimals", optionValue: number): void;
@@ -32356,6 +33610,7 @@ interface JQuery {
 	 * Note: In case of min decimals value higher than max decimals - max decimals are equaled to min decimals property.
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option supports values between 0 and 15, when dataMode is 'double' (default) and values between 0 and 7 in 'float' mode.
+	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "minDecimals"): number;
 
@@ -32367,6 +33622,7 @@ interface JQuery {
 	 * Note: Even if the default value is null - if internationalization file is provided and it contains default values for those properties the values are imlicitly set.
 	 * Note: This option supports values between 0 and 15, when dataMode is 'double' (default) and values between 0 and 7 in 'float' mode.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "minDecimals", optionValue: number): void;
@@ -32375,6 +33631,7 @@ interface JQuery {
 	 * Gets/Sets whether the last decimal place will be rounded, when the maxDecimal option is defined and applied.
 	 * For example if the initial editor value is set to 123.4567, maxDecimals option is set to 3 and roundDecimals is enabled,
 	 * then editor will round the value and will display it as 123.457. If roundDecimals is disabled then editor value will be truncated to 123.456.
+	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "roundDecimals"): boolean;
 
@@ -32383,12 +33640,14 @@ interface JQuery {
 	 * For example if the initial editor value is set to 123.4567, maxDecimals option is set to 3 and roundDecimals is enabled,
 	 * then editor will round the value and will display it as 123.457. If roundDecimals is disabled then editor value will be truncated to 123.456.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "roundDecimals", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the horizontal alignment of the text in the editor.
+	 *
 	 */
 
 	igPercentEditor(optionLiteral: 'option', optionName: "textAlign"): string;
@@ -32396,6 +33655,7 @@ interface JQuery {
 	/**
 	 * /Sets the horizontal alignment of the text in the editor.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -32403,24 +33663,28 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the minimum value which can be entered in the editor by the end user.
+	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "minValue"): number;
 
 	/**
 	 * /Sets the minimum value which can be entered in the editor by the end user.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "minValue", optionValue: number): void;
 
 	/**
 	 * Gets/Sets the maximum value which can be entered in the editor by the end user.
+	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "maxValue"): number;
 
 	/**
 	 * /Sets the maximum value which can be entered in the editor by the end user.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "maxValue", optionValue: number): void;
@@ -32428,6 +33692,7 @@ interface JQuery {
 	/**
 	 * Gets/Sets whether the editor value can become null.
 	 * If that option is disabled, and editor has no value, then value is set to 0 (or minValue/maxValue).
+	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "allowNullValue"): boolean;
 
@@ -32435,6 +33700,7 @@ interface JQuery {
 	 * /Sets whether the editor value can become null.
 	 * If that option is disabled, and editor has no value, then value is set to 0 (or minValue/maxValue).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "allowNullValue", optionValue: boolean): void;
@@ -32443,6 +33709,7 @@ interface JQuery {
 	 * Gets/Sets support for scientific format.
 	 * If that option is set, then numeric value appears as a string with possible E-power flag. In edit mode the "E" or "e" character can be entered as well.
 	 * Notes: The "+" character is not supported in edit mode.
+	 *
 	 */
 
 	igPercentEditor(optionLiteral: 'option', optionName: "scientificFormat"): string;
@@ -32452,6 +33719,7 @@ interface JQuery {
 	 * If that option is set, then numeric value appears as a string with possible E-power flag. In edit mode the "E" or "e" character can be entered as well.
 	 * Notes: The "+" character is not supported in edit mode.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -32460,6 +33728,7 @@ interface JQuery {
 	/**
 	 * Gets/Set the ability of the editor to automatically set value in the editor to the opposite side of the limit, when the spin action reaches minimum or maximum limit.
 	 * This applies to [minValue](ui.%%WidgetNameLowered%%#options:minValue) and [maxValue](ui.%%WidgetNameLowered%%#options:maxValue) or cycling through list items if [isLimitedToListValues](ui.%%WidgetNameLowered%%#options:isLimitedToListValues) is enabled.
+	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "spinWrapAround"): boolean;
 
@@ -32467,18 +33736,21 @@ interface JQuery {
 	 * /Set the ability of the editor to automatically set value in the editor to the opposite side of the limit, when the spin action reaches minimum or maximum limit.
 	 * This applies to [minValue](ui.%%WidgetNameLowered%%#options:minValue) and [maxValue](ui.%%WidgetNameLowered%%#options:maxValue) or cycling through list items if [isLimitedToListValues](ui.%%WidgetNameLowered%%#options:isLimitedToListValues) is enabled.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "spinWrapAround", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets if the editor should only allow values from the list of items. Enabling this also causes spin actions to cycle through list items instead.
+	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "isLimitedToListValues"): boolean;
 
 	/**
 	 * /Sets if the editor should only allow values from the list of items. Enabling this also causes spin actions to cycle through list items instead.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "isLimitedToListValues", optionValue: boolean): void;
@@ -32550,6 +33822,7 @@ interface JQuery {
 	/**
 	 * Gets/Sets value in editor. The effect of setting/getting that option depends on type of editor and on dataMode options for every type of editor.
 	 *
+	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "value"): any;
 
@@ -32557,12 +33830,14 @@ interface JQuery {
 	 * /Sets value in editor. The effect of setting/getting that option depends on type of editor and on dataMode options for every type of editor.
 	 *
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "value", optionValue: any): void;
 
 	/**
 	 * Gets visibility of the spin, clear and drop-down button. That option can be set only on initialization. Combinations like 'dropdown,spin' or 'spin,clear' are supported too.Note! This option can not be set runtime.
+	 *
 	 */
 
 	igPercentEditor(optionLiteral: 'option', optionName: "buttonType"): string;
@@ -32570,6 +33845,7 @@ interface JQuery {
 	/**
 	 * Visibility of the spin, clear and drop-down button. That option can be set only on initialization. Combinations like 'dropdown,spin' or 'spin,clear' are supported too.Note! This option can not be set runtime.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -32577,24 +33853,28 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets custom width of the drop-down list in pixels. If the value is equal to 0 or negative, then the width of editor is set as a drop-down width.
+	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "listWidth"): number;
 
 	/**
 	 * /Sets custom width of the drop-down list in pixels. If the value is equal to 0 or negative, then the width of editor is set as a drop-down width.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "listWidth", optionValue: number): void;
 
 	/**
 	 * Gets/Sets the hover/unhover animation duration of a drop-down list item.
+	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "listItemHoverDuration"): number;
 
 	/**
 	 * /Sets the hover/unhover animation duration of a drop-down list item.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "listItemHoverDuration", optionValue: number): void;
@@ -32604,6 +33884,7 @@ interface JQuery {
 	 * If the option is set to false the editor will attach the drop-down list element to the editor container
 	 * If the option is set to true the editor will attach its drop-down list to as a child of the body.
 	 * Note! This option can not be set runtime.
+	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "dropDownAttachedToBody"): boolean;
 
@@ -32613,18 +33894,21 @@ interface JQuery {
 	 * If the option is set to true the editor will attach its drop-down list to as a child of the body.
 	 * Note! This option can not be set runtime.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "dropDownAttachedToBody", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets show/hide drop-down list animation duration in milliseconds.
+	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "dropDownAnimationDuration"): number;
 
 	/**
 	 * /Sets show/hide drop-down list animation duration in milliseconds.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "dropDownAnimationDuration", optionValue: number): void;
@@ -32634,6 +33918,7 @@ interface JQuery {
 	 * Notes:
 	 * This option is overwritten if the number of list items is less than the set value. In that case the drop-down list displays all the items.
 	 * This option can not be set runtime.
+	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "visibleItemsCount"): number;
 
@@ -32643,24 +33928,28 @@ interface JQuery {
 	 * This option is overwritten if the number of list items is less than the set value. In that case the drop-down list displays all the items.
 	 * This option can not be set runtime.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "visibleItemsCount", optionValue: number): void;
 
 	/**
 	 * Gets/Sets the text which appears in the editor when it has no focus and the "value" is null or empty string.
+	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "placeHolder"): string;
 
 	/**
 	 * /Sets the text which appears in the editor when it has no focus and the "value" is null or empty string.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "placeHolder", optionValue: string): void;
 
 	/**
 	 * Gets/Sets the action when the editor gets focused. The default value is selectAll.
+	 *
 	 */
 
 	igPercentEditor(optionLiteral: 'option', optionName: "selectionOnFocus"): string;
@@ -32668,6 +33957,7 @@ interface JQuery {
 	/**
 	 * /Sets the action when the editor gets focused. The default value is selectAll.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -32675,30 +33965,35 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets if the editor should revert it's value to the previously valid value in case the value on blur, or enter key is not valid. If the opiton is set to false, editor calls clear functionality.
+	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "revertIfNotValid"): boolean;
 
 	/**
 	 * /Sets if the editor should revert it's value to the previously valid value in case the value on blur, or enter key is not valid. If the opiton is set to false, editor calls clear functionality.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "revertIfNotValid", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets if the editor should prevent form submition when enter key is pressed.
+	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "preventSubmitOnEnter"): boolean;
 
 	/**
 	 * /Sets if the editor should prevent form submition when enter key is pressed.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "preventSubmitOnEnter", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the drop-down list opening orientation when the list gets open. If the option is set to auto the editor has priority to open the drop-down list bottom. If the space is not enough it tries to open the list top. If the space is not enough in both directions then the list gets opened at the bottom of the editor.
+	 *
 	 */
 
 	igPercentEditor(optionLiteral: 'option', optionName: "dropDownOrientation"): string;
@@ -32706,6 +34001,7 @@ interface JQuery {
 	/**
 	 * /Sets the drop-down list opening orientation when the list gets open. If the option is set to auto the editor has priority to open the drop-down list bottom. If the space is not enough it tries to open the list top. If the space is not enough in both directions then the list gets opened at the bottom of the editor.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -32715,6 +34011,7 @@ interface JQuery {
 	 * Gets the ability to limit the editor to be used only as a dropdown list. When set to true the editor input is not editable.
 	 * Note! In case there are no list items - the editor will reamin readonly
 	 * Note! This option can not be set runtime.
+	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "dropDownOnReadOnly"): boolean;
 
@@ -32723,18 +34020,21 @@ interface JQuery {
 	 * Note! In case there are no list items - the editor will reamin readonly
 	 * Note! This option can not be set runtime.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "dropDownOnReadOnly", optionValue: boolean): void;
 
 	/**
 	 * Disables/Enables default notifications for basic validation scenarios built in the editors such as required list selection, value wrapping around or spin limits.
+	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "suppressNotifications"): boolean;
 
 	/**
 	 * Disables/Enables default notifications for basic validation scenarios built in the editors such as required list selection, value wrapping around or spin limits.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "suppressNotifications", optionValue: boolean): void;
@@ -32743,6 +34043,7 @@ interface JQuery {
 	 * Gets/Sets whether the onscreen keyboard (if available on device) should be shown when the dropdown button is clicked/tapped. This option prevents initial focus or removes it when the drop button is clicked/tapped.
 	 * Note: The option does not perform device detection so its behavior is always active if enabled.
 	 * Note: When drop down is opened the only way to close it will be using the drop down button.
+	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "suppressKeyboard"): boolean;
 
@@ -32751,12 +34052,14 @@ interface JQuery {
 	 * Note: The option does not perform device detection so its behavior is always active if enabled.
 	 * Note: When drop down is opened the only way to close it will be using the drop down button.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "suppressKeyboard", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the width of the control.
+	 *
 	 */
 
 	igPercentEditor(optionLiteral: 'option', optionName: "width"): string|number;
@@ -32764,6 +34067,7 @@ interface JQuery {
 	/**
 	 * /Sets the width of the control.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -32771,6 +34075,7 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the height of the control.
+	 *
 	 */
 
 	igPercentEditor(optionLiteral: 'option', optionName: "height"): string|number;
@@ -32778,6 +34083,7 @@ interface JQuery {
 	/**
 	 * /Sets the height of the control.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -32785,18 +34091,21 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets tabIndex attribute for the editor input.
+	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "tabIndex"): number;
 
 	/**
 	 * /Sets tabIndex attribute for the editor input.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "tabIndex", optionValue: number): void;
 
 	/**
 	 * Gets/Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
+	 *
 	 */
 
 	igPercentEditor(optionLiteral: 'option', optionName: "nullValue"): string|number;
@@ -32804,6 +34113,7 @@ interface JQuery {
 	/**
 	 * /Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -32811,36 +34121,42 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
+	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "inputName"): string;
 
 	/**
 	 * /Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "inputName", optionValue: string): void;
 
 	/**
 	 * Gets/Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
+	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "readOnly"): boolean;
 
 	/**
 	 * /Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "readOnly", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
+	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "disabled"): boolean;
 
 	/**
 	 * /Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "disabled", optionValue: boolean): void;
@@ -32849,6 +34165,7 @@ interface JQuery {
 	 * Gets/Sets options supported by the [igValidator](ui.igvalidator#options) widget.
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
+	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "validatorOptions"): any;
 
@@ -32857,36 +34174,42 @@ interface JQuery {
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "validatorOptions", optionValue: any): void;
 
 	/**
 	 * Set/Get the locale setting for the widget.
+	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "locale"): any;
 
 	/**
 	 * Set/Get the locale setting for the widget.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
+	 *
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "language"): string;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPercentEditor(optionLiteral: 'option', optionName: "language", optionValue: string): void;
 
 	/**
 	 * Set/Get the regional setting for the widget.
+	 *
 	 */
 
 	igPercentEditor(optionLiteral: 'option', optionName: "regional"): string|Object;
@@ -32894,6 +34217,7 @@ interface JQuery {
 	/**
 	 * Set/Get the regional setting for the widget.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -32930,6 +34254,7 @@ interface JQuery {
 
 	/**
 	 * Gets visibility of the clear button. That option can be set only on initialization.
+	 *
 	 */
 
 	igMaskEditor(optionLiteral: 'option', optionName: "buttonType"): string;
@@ -32937,6 +34262,7 @@ interface JQuery {
 	/**
 	 * Visibility of the clear button. That option can be set only on initialization.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -32960,6 +34286,7 @@ interface JQuery {
 	 * >: all letters to the right are converted to the upper case. In order to disable conversion, the ">" flag should be used again.
 	 * <: all letters to the right are converted to the lower case. In order to disable conversion, the "<" flag should be used again.
 	 * Note! This option can not be set runtime.
+	 *
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "inputMask"): string;
 
@@ -32982,12 +34309,14 @@ interface JQuery {
 	 * <: all letters to the right are converted to the lower case. In order to disable conversion, the "<" flag should be used again.
 	 * Note! This option can not be set runtime.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "inputMask", optionValue: string): void;
 
 	/**
 	 * It affects the value of the control (value method/option and submitted in forms). It defines what the value should contain from text, unfilled prompts and literals. The default is allText and when used value method/option returns the text entered, all prompts (positions) and literals.
+	 *
 	 */
 
 	igMaskEditor(optionLiteral: 'option', optionName: "dataMode"): string;
@@ -32995,6 +34324,7 @@ interface JQuery {
 	/**
 	 * It affects the value of the control (value method/option and submitted in forms). It defines what the value should contain from text, unfilled prompts and literals. The default is allText and when used value method/option returns the text entered, all prompts (positions) and literals.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -33002,36 +34332,42 @@ interface JQuery {
 
 	/**
 	 * Gets character which is used as prompt in edit mode for available entry position.
+	 *
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "unfilledCharsPrompt"): string;
 
 	/**
 	 * Character which is used as prompt in edit mode for available entry position.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "unfilledCharsPrompt", optionValue: string): void;
 
 	/**
 	 * Gets/Sets character which is used as replacement of not-filled required position in mask when editor is in display mode (not focused).
+	 *
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "padChar"): string;
 
 	/**
 	 * /Sets character which is used as replacement of not-filled required position in mask when editor is in display mode (not focused).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "padChar", optionValue: string): void;
 
 	/**
 	 * Gets/Sets character which is used as replacement of not-filled required position in mask when application calls get for the [value](ui.igmaskeditor#methods:value) methods.
+	 *
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "emptyChar"): string;
 
 	/**
 	 * /Sets character which is used as replacement of not-filled required position in mask when application calls get for the [value](ui.igmaskeditor#methods:value) methods.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "emptyChar", optionValue: string): void;
@@ -33041,6 +34377,7 @@ interface JQuery {
 	 * Notes:
 	 * If "excludeKeys" option contains same characters as this option, then "excludeKeys" has priority.
 	 * Note! This option can not be se runtime.
+	 *
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "includeKeys"): string;
 
@@ -33050,6 +34387,7 @@ interface JQuery {
 	 * If "excludeKeys" option contains same characters as this option, then "excludeKeys" has priority.
 	 * Note! This option can not be se runtime.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "includeKeys", optionValue: string): void;
@@ -33059,6 +34397,7 @@ interface JQuery {
 	 * Notes:
 	 * If a character is specified in "includeKeys" option also, then "excludeKeys" has priority.
 	 * Note! This option can not be se runtime.
+	 *
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "excludeKeys"): string;
 
@@ -33068,6 +34407,7 @@ interface JQuery {
 	 * If a character is specified in "includeKeys" option also, then "excludeKeys" has priority.
 	 * Note! This option can not be se runtime.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "excludeKeys", optionValue: string): void;
@@ -33218,12 +34558,14 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets value in editor. The effect of setting/getting that option depends on type of editor and on dataMode options for every type of editor.
+	 *
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "value"): any;
 
 	/**
 	 * /Sets value in editor. The effect of setting/getting that option depends on type of editor and on dataMode options for every type of editor.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "value", optionValue: any): void;
@@ -33232,6 +34574,7 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the horizontal alignment of the text in the editor.
+	 *
 	 */
 
 	igMaskEditor(optionLiteral: 'option', optionName: "textAlign"): string;
@@ -33239,6 +34582,7 @@ interface JQuery {
 	/**
 	 * /Sets the horizontal alignment of the text in the editor.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -33246,18 +34590,21 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the text which appears in the editor when it has no focus and the "value" is null or empty string.
+	 *
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "placeHolder"): string;
 
 	/**
 	 * /Sets the text which appears in the editor when it has no focus and the "value" is null or empty string.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "placeHolder", optionValue: string): void;
 
 	/**
 	 * Gets/Sets the action when the editor gets focused. The default value is selectAll.
+	 *
 	 */
 
 	igMaskEditor(optionLiteral: 'option', optionName: "selectionOnFocus"): string;
@@ -33265,6 +34612,7 @@ interface JQuery {
 	/**
 	 * /Sets the action when the editor gets focused. The default value is selectAll.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -33272,24 +34620,28 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets if the editor should revert it's value to the previously valid value in case the value on blur, or enter key is not valid. If the opiton is set to false, editor calls clear functionality.
+	 *
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "revertIfNotValid"): boolean;
 
 	/**
 	 * /Sets if the editor should revert it's value to the previously valid value in case the value on blur, or enter key is not valid. If the opiton is set to false, editor calls clear functionality.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "revertIfNotValid", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets if the editor should prevent form submition when enter key is pressed.
+	 *
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "preventSubmitOnEnter"): boolean;
 
 	/**
 	 * /Sets if the editor should prevent form submition when enter key is pressed.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "preventSubmitOnEnter", optionValue: boolean): void;
@@ -33297,6 +34649,7 @@ interface JQuery {
 	/**
 	 * Gets/Sets the ability to convert the input characters to upper case (true) or keeps the characters as they are (false). The option has effect only while keyboard entries and paste.
 	 * Note! When the option is set at runtime the editor is not changing the current value.
+	 *
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "toUpper"): boolean;
 
@@ -33304,6 +34657,7 @@ interface JQuery {
 	 * /Sets the ability to convert the input characters to upper case (true) or keeps the characters as they are (false). The option has effect only while keyboard entries and paste.
 	 * Note! When the option is set at runtime the editor is not changing the current value.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "toUpper", optionValue: boolean): void;
@@ -33311,6 +34665,7 @@ interface JQuery {
 	/**
 	 * Gets/Sets the ability to convert the input characters to lower case (true) or keeps the characters as they are (false). The option has effect only while keyboard entries and paste.
 	 * Note! When the option is set at runtime the editor is not changing the current value.
+	 *
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "toLower"): boolean;
 
@@ -33318,24 +34673,28 @@ interface JQuery {
 	 * /Sets the ability to convert the input characters to lower case (true) or keeps the characters as they are (false). The option has effect only while keyboard entries and paste.
 	 * Note! When the option is set at runtime the editor is not changing the current value.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "toLower", optionValue: boolean): void;
 
 	/**
 	 * Disables/Enables default notifications for basic validation scenarios built in the editors such as required list selection, value wrapping around or spin limits.
+	 *
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "suppressNotifications"): boolean;
 
 	/**
 	 * Disables/Enables default notifications for basic validation scenarios built in the editors such as required list selection, value wrapping around or spin limits.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "suppressNotifications", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the width of the control.
+	 *
 	 */
 
 	igMaskEditor(optionLiteral: 'option', optionName: "width"): string|number;
@@ -33343,6 +34702,7 @@ interface JQuery {
 	/**
 	 * /Sets the width of the control.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -33350,6 +34710,7 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the height of the control.
+	 *
 	 */
 
 	igMaskEditor(optionLiteral: 'option', optionName: "height"): string|number;
@@ -33357,6 +34718,7 @@ interface JQuery {
 	/**
 	 * /Sets the height of the control.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -33364,12 +34726,14 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets tabIndex attribute for the editor input.
+	 *
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "tabIndex"): number;
 
 	/**
 	 * /Sets tabIndex attribute for the editor input.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "tabIndex", optionValue: number): void;
@@ -33377,6 +34741,7 @@ interface JQuery {
 	/**
 	 * Gets/Sets whether the editor value can become null.
 	 * If that option is false, and editor has no value, then value is set to an empty string.
+	 *
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "allowNullValue"): boolean;
 
@@ -33384,12 +34749,14 @@ interface JQuery {
 	 * /Sets whether the editor value can become null.
 	 * If that option is false, and editor has no value, then value is set to an empty string.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "allowNullValue", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
+	 *
 	 */
 
 	igMaskEditor(optionLiteral: 'option', optionName: "nullValue"): string|number;
@@ -33397,6 +34764,7 @@ interface JQuery {
 	/**
 	 * /Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -33404,36 +34772,42 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
+	 *
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "inputName"): string;
 
 	/**
 	 * /Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "inputName", optionValue: string): void;
 
 	/**
 	 * Gets/Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
+	 *
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "readOnly"): boolean;
 
 	/**
 	 * /Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "readOnly", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
+	 *
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "disabled"): boolean;
 
 	/**
 	 * /Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "disabled", optionValue: boolean): void;
@@ -33442,6 +34816,7 @@ interface JQuery {
 	 * Gets/Sets options supported by the [igValidator](ui.igvalidator#options) widget.
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
+	 *
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "validatorOptions"): any;
 
@@ -33450,36 +34825,42 @@ interface JQuery {
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "validatorOptions", optionValue: any): void;
 
 	/**
 	 * Set/Get the locale setting for the widget.
+	 *
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "locale"): any;
 
 	/**
 	 * Set/Get the locale setting for the widget.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
+	 *
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "language"): string;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "language", optionValue: string): void;
 
 	/**
 	 * Set/Get the regional setting for the widget.
+	 *
 	 */
 
 	igMaskEditor(optionLiteral: 'option', optionName: "regional"): string|Object;
@@ -33487,6 +34868,7 @@ interface JQuery {
 	/**
 	 * Set/Get the regional setting for the widget.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -33505,24 +34887,16 @@ interface JQuery {
 	igMaskEditor(optionLiteral: 'option', optionName: "dropDownItemSelected", optionValue: DropDownItemSelectedEvent): void;
 
 	/**
-	 * Event which is raised after text in the editor was changed. It can be raised when keyUp event occurs,
+	 * Fired after the editor's text has been changed. It can be raised when keyUp event occurs,
 	 * when the clear button is clicked or when an item from a list is selected.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.text to obtain new text
-	 * Use ui.oldText to obtain the old text.
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "textChanged"): TextChangedEvent;
 
 	/**
-	 * Event which is raised after text in the editor was changed. It can be raised when keyUp event occurs,
+	 * Fired after the editor's text has been changed. It can be raised when keyUp event occurs,
 	 * when the clear button is clicked or when an item from a list is selected.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.text to obtain new text
-	 * Use ui.oldText to obtain the old text.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igMaskEditor(optionLiteral: 'option', optionName: "textChanged", optionValue: TextChangedEvent): void;
 	igMaskEditor(options: IgMaskEditor): JQuery;
@@ -33553,6 +34927,7 @@ interface JQuery {
 	/**
 	 * Gets/Sets the value of the editor. Date object can be set as value. String can be set and the editor will pass it to the Date object constructor and use the corresponding Date object as the value. MVC date format can be used too.
 	 * Note! This option doesn't use the dateInputFormat to extract the date.
+	 *
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "value"): Date;
 
@@ -33560,6 +34935,7 @@ interface JQuery {
 	 * /Sets the value of the editor. Date object can be set as value. String can be set and the editor will pass it to the Date object constructor and use the corresponding Date object as the value. MVC date format can be used too.
 	 * Note! This option doesn't use the dateInputFormat to extract the date.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "value", optionValue: Date): void;
@@ -33567,6 +34943,7 @@ interface JQuery {
 	/**
 	 * Gets the minimum value which can be entered in editor by user. Date object can be set as value. String value can be passed and the editor will use the javascript Date object constructor to create date object and will use it for the comparison. MVC date format can be used too.
 	 * Note! This option doesn't use the dateInputFormat to extract the date.
+	 *
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "minValue"): Date;
 
@@ -33574,6 +34951,7 @@ interface JQuery {
 	 * The minimum value which can be entered in editor by user. Date object can be set as value. String value can be passed and the editor will use the javascript Date object constructor to create date object and will use it for the comparison. MVC date format can be used too.
 	 * Note! This option doesn't use the dateInputFormat to extract the date.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "minValue", optionValue: Date): void;
@@ -33581,6 +34959,7 @@ interface JQuery {
 	/**
 	 * Gets the maximum value which can be entered in editor by user. Date object can be set as value. String value can be passed and the editor will use the javascript Date object constructor to create date object and will use it for the comparison. MVC date format can be used too.
 	 * Note! This option doesn't use the dateInputFormat to extract the date.
+	 *
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "maxValue"): Date;
 
@@ -33588,6 +34967,7 @@ interface JQuery {
 	 * The maximum value which can be entered in editor by user. Date object can be set as value. String value can be passed and the editor will use the javascript Date object constructor to create date object and will use it for the comparison. MVC date format can be used too.
 	 * Note! This option doesn't use the dateInputFormat to extract the date.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "maxValue", optionValue: Date): void;
@@ -33630,6 +35010,7 @@ interface JQuery {
 	 * "f": milliseconds field in hundreds
 	 * "ff": milliseconds field in tenths
 	 * "fff": milliseconds field
+	 *
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "dateDisplayFormat"): string;
 
@@ -33672,6 +35053,7 @@ interface JQuery {
 	 * "ff": milliseconds field in tenths
 	 * "fff": milliseconds field
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "dateDisplayFormat", optionValue: string): void;
@@ -33703,6 +35085,7 @@ interface JQuery {
 	 * "ff": milliseconds field in tenths
 	 * "fff": milliseconds field
 	 * Note! This option can not be set runtime.
+	 *
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "dateInputFormat"): string;
 
@@ -33734,6 +35117,7 @@ interface JQuery {
 	 * "fff": milliseconds field
 	 * Note! This option can not be set runtime.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "dateInputFormat", optionValue: string): void;
@@ -33743,6 +35127,7 @@ interface JQuery {
 	 * The [enableUTCDates](ui.%%WidgetNameLowered%%#options:enableUTCDates) option can be used to output an UTC ISO string instead.
 	 * For example 10:00 AM from a client with local offset of 5 hours ahead of GMT will be serialized as:
 	 * "2016-11-11T10:00:00+05:00"
+	 *
 	 */
 
 	igDateEditor(optionLiteral: 'option', optionName: "dataMode"): string;
@@ -33753,6 +35138,7 @@ interface JQuery {
 	 * For example 10:00 AM from a client with local offset of 5 hours ahead of GMT will be serialized as:
 	 * "2016-11-11T10:00:00+05:00"
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -33762,6 +35148,7 @@ interface JQuery {
 	 * Gets/Sets time zone offset from UTC, in minutes. The client date values are displayed with this offset instead of the local one.
 	 * Note: It is recommended that this option is used with an UTC value (e.g. "2016-11-03T14:08:08.504Z") so the outcome is consistent.
 	 * Values with ambiguous time zone could map to unpredictable times depending on the user agent local zone.
+	 *
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "displayTimeOffset"): any;
 
@@ -33770,12 +35157,14 @@ interface JQuery {
 	 * Note: It is recommended that this option is used with an UTC value (e.g. "2016-11-03T14:08:08.504Z") so the outcome is consistent.
 	 * Values with ambiguous time zone could map to unpredictable times depending on the user agent local zone.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "displayTimeOffset", optionValue: any): void;
 
 	/**
 	 * Gets visibility of the spin and clear buttons. That option can be set only on initialization. Combinations like 'spin,clear' are supported too.
+	 *
 	 */
 
 	igDateEditor(optionLiteral: 'option', optionName: "buttonType"): string;
@@ -33783,6 +35172,7 @@ interface JQuery {
 	/**
 	 * Visibility of the spin and clear buttons. That option can be set only on initialization. Combinations like 'spin,clear' are supported too.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -33802,6 +35192,7 @@ interface JQuery {
 	 * milliseconds: 100
 	 * }
 	 * Time periods that don't have values use 1 as default.
+	 *
 	 */
 
 	igDateEditor(optionLiteral: 'option', optionName: "spinDelta"): number|Object;
@@ -33821,6 +35212,7 @@ interface JQuery {
 	 * }
 	 * Time periods that don't have values use 1 as default.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -33830,6 +35222,7 @@ interface JQuery {
 	 * Gets/Sets ability to modify only 1 date field on spin events.
 	 * Value false enables changes of other date fields when incremented or decremented date-field reaches its limits.
 	 * Value true modifies only value of one field.
+	 *
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "limitSpinToCurrentField"): boolean;
 
@@ -33838,6 +35231,7 @@ interface JQuery {
 	 * Value false enables changes of other date fields when incremented or decremented date-field reaches its limits.
 	 * Value true modifies only value of one field.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "limitSpinToCurrentField", optionValue: boolean): void;
@@ -33845,6 +35239,7 @@ interface JQuery {
 	/**
 	 * Enables/Disables serializing client date as UTC ISO 8061 string instead of using the local time and zone values.
 	 * The option is only applied in "date" [dataMode](ui.%%WidgetNameLowered%%#options:dataMode).
+	 *
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "enableUTCDates"): boolean;
 
@@ -33852,6 +35247,7 @@ interface JQuery {
 	 * Enables/Disables serializing client date as UTC ISO 8061 string instead of using the local time and zone values.
 	 * The option is only applied in "date" [dataMode](ui.%%WidgetNameLowered%%#options:dataMode).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "enableUTCDates", optionValue: boolean): void;
@@ -33860,6 +35256,7 @@ interface JQuery {
 	 * Gets/Sets year for auto detection of 20th and 21st centuries.
 	 * That option is used to automatically fill century when the user entered only 1 or 2 digits into the year field or when the date pattern contains only 1 or 2 year positions, e.g. "yy" or "y".
 	 * If user entered value larger than value of this option, then 20th century is used, otherwise the 21st.
+	 *
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "centuryThreshold"): number;
 
@@ -33868,24 +35265,28 @@ interface JQuery {
 	 * That option is used to automatically fill century when the user entered only 1 or 2 digits into the year field or when the date pattern contains only 1 or 2 year positions, e.g. "yy" or "y".
 	 * If user entered value larger than value of this option, then 20th century is used, otherwise the 21st.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "centuryThreshold", optionValue: number): void;
 
 	/**
 	 * Gets/Set value used to increase/decrease year part of the date, in order to set difference between year in Gregorian calendar and displayed year.
+	 *
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "yearShift"): number;
 
 	/**
 	 * /Set value used to increase/decrease year part of the date, in order to set difference between year in Gregorian calendar and displayed year.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "yearShift", optionValue: number): void;
 
 	/**
 	 * Gets/Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
+	 *
 	 */
 
 	igDateEditor(optionLiteral: 'option', optionName: "nullValue"): string|number|Date;
@@ -33893,6 +35294,7 @@ interface JQuery {
 	/**
 	 * /Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -34061,6 +35463,7 @@ interface JQuery {
 	 * Notes:
 	 * If "excludeKeys" option contains same characters as this option, then "excludeKeys" has priority.
 	 * Note! This option can not be se runtime.
+	 *
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "includeKeys"): string;
 
@@ -34070,6 +35473,7 @@ interface JQuery {
 	 * If "excludeKeys" option contains same characters as this option, then "excludeKeys" has priority.
 	 * Note! This option can not be se runtime.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "includeKeys", optionValue: string): void;
@@ -34079,6 +35483,7 @@ interface JQuery {
 	 * Notes:
 	 * If a character is specified in "includeKeys" option also, then "excludeKeys" has priority.
 	 * Note! This option can not be se runtime.
+	 *
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "excludeKeys"): string;
 
@@ -34088,6 +35493,7 @@ interface JQuery {
 	 * If a character is specified in "includeKeys" option also, then "excludeKeys" has priority.
 	 * Note! This option can not be se runtime.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "excludeKeys", optionValue: string): void;
@@ -34152,6 +35558,7 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the horizontal alignment of the text in the editor.
+	 *
 	 */
 
 	igDateEditor(optionLiteral: 'option', optionName: "textAlign"): string;
@@ -34159,6 +35566,7 @@ interface JQuery {
 	/**
 	 * /Sets the horizontal alignment of the text in the editor.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -34166,18 +35574,21 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the text which appears in the editor when it has no focus and the "value" is null or empty string.
+	 *
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "placeHolder"): string;
 
 	/**
 	 * /Sets the text which appears in the editor when it has no focus and the "value" is null or empty string.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "placeHolder", optionValue: string): void;
 
 	/**
 	 * Gets/Sets the action when the editor gets focused. The default value is selectAll.
+	 *
 	 */
 
 	igDateEditor(optionLiteral: 'option', optionName: "selectionOnFocus"): string;
@@ -34185,6 +35596,7 @@ interface JQuery {
 	/**
 	 * /Sets the action when the editor gets focused. The default value is selectAll.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -34192,42 +35604,49 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets if the editor should revert it's value to the previously valid value in case the value on blur, or enter key is not valid. If the opiton is set to false, editor calls clear functionality.
+	 *
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "revertIfNotValid"): boolean;
 
 	/**
 	 * /Sets if the editor should revert it's value to the previously valid value in case the value on blur, or enter key is not valid. If the opiton is set to false, editor calls clear functionality.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "revertIfNotValid", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets if the editor should prevent form submition when enter key is pressed.
+	 *
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "preventSubmitOnEnter"): boolean;
 
 	/**
 	 * /Sets if the editor should prevent form submition when enter key is pressed.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "preventSubmitOnEnter", optionValue: boolean): void;
 
 	/**
 	 * Disables/Enables default notifications for basic validation scenarios built in the editors such as required list selection, value wrapping around or spin limits.
+	 *
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "suppressNotifications"): boolean;
 
 	/**
 	 * Disables/Enables default notifications for basic validation scenarios built in the editors such as required list selection, value wrapping around or spin limits.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "suppressNotifications", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the width of the control.
+	 *
 	 */
 
 	igDateEditor(optionLiteral: 'option', optionName: "width"): string|number;
@@ -34235,6 +35654,7 @@ interface JQuery {
 	/**
 	 * /Sets the width of the control.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -34242,6 +35662,7 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the height of the control.
+	 *
 	 */
 
 	igDateEditor(optionLiteral: 'option', optionName: "height"): string|number;
@@ -34249,6 +35670,7 @@ interface JQuery {
 	/**
 	 * /Sets the height of the control.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -34256,12 +35678,14 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets tabIndex attribute for the editor input.
+	 *
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "tabIndex"): number;
 
 	/**
 	 * /Sets tabIndex attribute for the editor input.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "tabIndex", optionValue: number): void;
@@ -34269,6 +35693,7 @@ interface JQuery {
 	/**
 	 * Gets/Sets whether the editor value can become null.
 	 * If that option is false, and editor has no value, then value is set to an empty string.
+	 *
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "allowNullValue"): boolean;
 
@@ -34276,42 +35701,49 @@ interface JQuery {
 	 * /Sets whether the editor value can become null.
 	 * If that option is false, and editor has no value, then value is set to an empty string.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "allowNullValue", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
+	 *
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "inputName"): string;
 
 	/**
 	 * /Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "inputName", optionValue: string): void;
 
 	/**
 	 * Gets/Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
+	 *
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "readOnly"): boolean;
 
 	/**
 	 * /Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "readOnly", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
+	 *
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "disabled"): boolean;
 
 	/**
 	 * /Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "disabled", optionValue: boolean): void;
@@ -34320,6 +35752,7 @@ interface JQuery {
 	 * Gets/Sets options supported by the [igValidator](ui.igvalidator#options) widget.
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
+	 *
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "validatorOptions"): any;
 
@@ -34328,36 +35761,42 @@ interface JQuery {
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "validatorOptions", optionValue: any): void;
 
 	/**
 	 * Set/Get the locale setting for the widget.
+	 *
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "locale"): any;
 
 	/**
 	 * Set/Get the locale setting for the widget.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
+	 *
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "language"): string;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDateEditor(optionLiteral: 'option', optionName: "language", optionValue: string): void;
 
 	/**
 	 * Set/Get the regional setting for the widget.
+	 *
 	 */
 
 	igDateEditor(optionLiteral: 'option', optionName: "regional"): string|Object;
@@ -34365,6 +35804,7 @@ interface JQuery {
 	/**
 	 * Set/Get the regional setting for the widget.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -34470,6 +35910,7 @@ interface JQuery {
 
 	/**
 	 * Gets visibility of the spin, clear and drop-down button. That option can be set only on initialization. Combinations like 'dropdown,spin' or 'spin,clear' are supported too.
+	 *
 	 */
 
 	igDatePicker(optionLiteral: 'option', optionName: "buttonType"): string;
@@ -34477,6 +35918,7 @@ interface JQuery {
 	/**
 	 * Visibility of the spin, clear and drop-down button. That option can be set only on initialization. Combinations like 'dropdown,spin' or 'spin,clear' are supported too.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -34484,12 +35926,14 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the options supported by the [jquery.ui.datepicker](http://api.jqueryui.com/datepicker/). Only options related to the drop-down calendar are supported.
+	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "datepickerOptions"): any;
 
 	/**
 	 * /Sets the options supported by the [jquery.ui.datepicker](http://api.jqueryui.com/datepicker/). Only options related to the drop-down calendar are supported.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "datepickerOptions", optionValue: any): void;
@@ -34497,6 +35941,7 @@ interface JQuery {
 	/**
 	 * Gets the ability to limit igDatePicker to be used only as s calendar. When set to true the editor input is not editable.
 	 * Note! This option can not be set runtime.
+	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "dropDownOnReadOnly"): boolean;
 
@@ -34504,6 +35949,7 @@ interface JQuery {
 	 * The ability to limit igDatePicker to be used only as s calendar. When set to true the editor input is not editable.
 	 * Note! This option can not be set runtime.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "dropDownOnReadOnly", optionValue: boolean): void;
@@ -34571,6 +36017,7 @@ interface JQuery {
 	/**
 	 * Gets/Sets whether the onscreen keyboard (if available on device) should be shown when the dropdown button is clicked/tapped. This option prevents initial focus or removes it when the drop button is clicked/tapped.
 	 * Note: The option does not perform device detection so its behavior is always active if enabled.
+	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "suppressKeyboard"): boolean;
 
@@ -34578,6 +36025,7 @@ interface JQuery {
 	 * /Sets whether the onscreen keyboard (if available on device) should be shown when the dropdown button is clicked/tapped. This option prevents initial focus or removes it when the drop button is clicked/tapped.
 	 * Note: The option does not perform device detection so its behavior is always active if enabled.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "suppressKeyboard", optionValue: boolean): void;
@@ -34585,6 +36033,7 @@ interface JQuery {
 	/**
 	 * Gets/Sets the value of the editor. Date object can be set as value. String can be set and the editor will pass it to the Date object constructor and use the corresponding Date object as the value. MVC date format can be used too.
 	 * Note! This option doesn't use the dateInputFormat to extract the date.
+	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "value"): Date;
 
@@ -34592,6 +36041,7 @@ interface JQuery {
 	 * /Sets the value of the editor. Date object can be set as value. String can be set and the editor will pass it to the Date object constructor and use the corresponding Date object as the value. MVC date format can be used too.
 	 * Note! This option doesn't use the dateInputFormat to extract the date.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "value", optionValue: Date): void;
@@ -34599,6 +36049,7 @@ interface JQuery {
 	/**
 	 * Gets the minimum value which can be entered in editor by user. Date object can be set as value. String value can be passed and the editor will use the javascript Date object constructor to create date object and will use it for the comparison. MVC date format can be used too.
 	 * Note! This option doesn't use the dateInputFormat to extract the date.
+	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "minValue"): Date;
 
@@ -34606,6 +36057,7 @@ interface JQuery {
 	 * The minimum value which can be entered in editor by user. Date object can be set as value. String value can be passed and the editor will use the javascript Date object constructor to create date object and will use it for the comparison. MVC date format can be used too.
 	 * Note! This option doesn't use the dateInputFormat to extract the date.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "minValue", optionValue: Date): void;
@@ -34613,6 +36065,7 @@ interface JQuery {
 	/**
 	 * Gets the maximum value which can be entered in editor by user. Date object can be set as value. String value can be passed and the editor will use the javascript Date object constructor to create date object and will use it for the comparison. MVC date format can be used too.
 	 * Note! This option doesn't use the dateInputFormat to extract the date.
+	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "maxValue"): Date;
 
@@ -34620,6 +36073,7 @@ interface JQuery {
 	 * The maximum value which can be entered in editor by user. Date object can be set as value. String value can be passed and the editor will use the javascript Date object constructor to create date object and will use it for the comparison. MVC date format can be used too.
 	 * Note! This option doesn't use the dateInputFormat to extract the date.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "maxValue", optionValue: Date): void;
@@ -34662,6 +36116,7 @@ interface JQuery {
 	 * "f": milliseconds field in hundreds
 	 * "ff": milliseconds field in tenths
 	 * "fff": milliseconds field
+	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "dateDisplayFormat"): string;
 
@@ -34704,6 +36159,7 @@ interface JQuery {
 	 * "ff": milliseconds field in tenths
 	 * "fff": milliseconds field
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "dateDisplayFormat", optionValue: string): void;
@@ -34735,6 +36191,7 @@ interface JQuery {
 	 * "ff": milliseconds field in tenths
 	 * "fff": milliseconds field
 	 * Note! This option can not be set runtime.
+	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "dateInputFormat"): string;
 
@@ -34766,6 +36223,7 @@ interface JQuery {
 	 * "fff": milliseconds field
 	 * Note! This option can not be set runtime.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "dateInputFormat", optionValue: string): void;
@@ -34775,6 +36233,7 @@ interface JQuery {
 	 * The [enableUTCDates](ui.%%WidgetNameLowered%%#options:enableUTCDates) option can be used to output an UTC ISO string instead.
 	 * For example 10:00 AM from a client with local offset of 5 hours ahead of GMT will be serialized as:
 	 * "2016-11-11T10:00:00+05:00"
+	 *
 	 */
 
 	igDatePicker(optionLiteral: 'option', optionName: "dataMode"): string;
@@ -34785,6 +36244,7 @@ interface JQuery {
 	 * For example 10:00 AM from a client with local offset of 5 hours ahead of GMT will be serialized as:
 	 * "2016-11-11T10:00:00+05:00"
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -34794,6 +36254,7 @@ interface JQuery {
 	 * Gets/Sets time zone offset from UTC, in minutes. The client date values are displayed with this offset instead of the local one.
 	 * Note: It is recommended that this option is used with an UTC value (e.g. "2016-11-03T14:08:08.504Z") so the outcome is consistent.
 	 * Values with ambiguous time zone could map to unpredictable times depending on the user agent local zone.
+	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "displayTimeOffset"): any;
 
@@ -34802,6 +36263,7 @@ interface JQuery {
 	 * Note: It is recommended that this option is used with an UTC value (e.g. "2016-11-03T14:08:08.504Z") so the outcome is consistent.
 	 * Values with ambiguous time zone could map to unpredictable times depending on the user agent local zone.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "displayTimeOffset", optionValue: any): void;
@@ -34820,6 +36282,7 @@ interface JQuery {
 	 * milliseconds: 100
 	 * }
 	 * Time periods that don't have values use 1 as default.
+	 *
 	 */
 
 	igDatePicker(optionLiteral: 'option', optionName: "spinDelta"): number|Object;
@@ -34839,6 +36302,7 @@ interface JQuery {
 	 * }
 	 * Time periods that don't have values use 1 as default.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -34848,6 +36312,7 @@ interface JQuery {
 	 * Gets/Sets ability to modify only 1 date field on spin events.
 	 * Value false enables changes of other date fields when incremented or decremented date-field reaches its limits.
 	 * Value true modifies only value of one field.
+	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "limitSpinToCurrentField"): boolean;
 
@@ -34856,6 +36321,7 @@ interface JQuery {
 	 * Value false enables changes of other date fields when incremented or decremented date-field reaches its limits.
 	 * Value true modifies only value of one field.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "limitSpinToCurrentField", optionValue: boolean): void;
@@ -34863,6 +36329,7 @@ interface JQuery {
 	/**
 	 * Enables/Disables serializing client date as UTC ISO 8061 string instead of using the local time and zone values.
 	 * The option is only applied in "date" [dataMode](ui.%%WidgetNameLowered%%#options:dataMode).
+	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "enableUTCDates"): boolean;
 
@@ -34870,6 +36337,7 @@ interface JQuery {
 	 * Enables/Disables serializing client date as UTC ISO 8061 string instead of using the local time and zone values.
 	 * The option is only applied in "date" [dataMode](ui.%%WidgetNameLowered%%#options:dataMode).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "enableUTCDates", optionValue: boolean): void;
@@ -34878,6 +36346,7 @@ interface JQuery {
 	 * Gets/Sets year for auto detection of 20th and 21st centuries.
 	 * That option is used to automatically fill century when the user entered only 1 or 2 digits into the year field or when the date pattern contains only 1 or 2 year positions, e.g. "yy" or "y".
 	 * If user entered value larger than value of this option, then 20th century is used, otherwise the 21st.
+	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "centuryThreshold"): number;
 
@@ -34886,24 +36355,28 @@ interface JQuery {
 	 * That option is used to automatically fill century when the user entered only 1 or 2 digits into the year field or when the date pattern contains only 1 or 2 year positions, e.g. "yy" or "y".
 	 * If user entered value larger than value of this option, then 20th century is used, otherwise the 21st.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "centuryThreshold", optionValue: number): void;
 
 	/**
 	 * Gets/Set value used to increase/decrease year part of the date, in order to set difference between year in Gregorian calendar and displayed year.
+	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "yearShift"): number;
 
 	/**
 	 * /Set value used to increase/decrease year part of the date, in order to set difference between year in Gregorian calendar and displayed year.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "yearShift", optionValue: number): void;
 
 	/**
 	 * Gets/Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
+	 *
 	 */
 
 	igDatePicker(optionLiteral: 'option', optionName: "nullValue"): string|number|Date;
@@ -34911,6 +36384,7 @@ interface JQuery {
 	/**
 	 * /Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -35005,6 +36479,7 @@ interface JQuery {
 	 * Notes:
 	 * If "excludeKeys" option contains same characters as this option, then "excludeKeys" has priority.
 	 * Note! This option can not be se runtime.
+	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "includeKeys"): string;
 
@@ -35014,6 +36489,7 @@ interface JQuery {
 	 * If "excludeKeys" option contains same characters as this option, then "excludeKeys" has priority.
 	 * Note! This option can not be se runtime.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "includeKeys", optionValue: string): void;
@@ -35023,6 +36499,7 @@ interface JQuery {
 	 * Notes:
 	 * If a character is specified in "includeKeys" option also, then "excludeKeys" has priority.
 	 * Note! This option can not be se runtime.
+	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "excludeKeys"): string;
 
@@ -35032,6 +36509,7 @@ interface JQuery {
 	 * If a character is specified in "includeKeys" option also, then "excludeKeys" has priority.
 	 * Note! This option can not be se runtime.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "excludeKeys", optionValue: string): void;
@@ -35096,6 +36574,7 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the horizontal alignment of the text in the editor.
+	 *
 	 */
 
 	igDatePicker(optionLiteral: 'option', optionName: "textAlign"): string;
@@ -35103,6 +36582,7 @@ interface JQuery {
 	/**
 	 * /Sets the horizontal alignment of the text in the editor.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -35110,18 +36590,21 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the text which appears in the editor when it has no focus and the "value" is null or empty string.
+	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "placeHolder"): string;
 
 	/**
 	 * /Sets the text which appears in the editor when it has no focus and the "value" is null or empty string.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "placeHolder", optionValue: string): void;
 
 	/**
 	 * Gets/Sets the action when the editor gets focused. The default value is selectAll.
+	 *
 	 */
 
 	igDatePicker(optionLiteral: 'option', optionName: "selectionOnFocus"): string;
@@ -35129,6 +36612,7 @@ interface JQuery {
 	/**
 	 * /Sets the action when the editor gets focused. The default value is selectAll.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -35136,42 +36620,49 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets if the editor should revert it's value to the previously valid value in case the value on blur, or enter key is not valid. If the opiton is set to false, editor calls clear functionality.
+	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "revertIfNotValid"): boolean;
 
 	/**
 	 * /Sets if the editor should revert it's value to the previously valid value in case the value on blur, or enter key is not valid. If the opiton is set to false, editor calls clear functionality.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "revertIfNotValid", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets if the editor should prevent form submition when enter key is pressed.
+	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "preventSubmitOnEnter"): boolean;
 
 	/**
 	 * /Sets if the editor should prevent form submition when enter key is pressed.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "preventSubmitOnEnter", optionValue: boolean): void;
 
 	/**
 	 * Disables/Enables default notifications for basic validation scenarios built in the editors such as required list selection, value wrapping around or spin limits.
+	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "suppressNotifications"): boolean;
 
 	/**
 	 * Disables/Enables default notifications for basic validation scenarios built in the editors such as required list selection, value wrapping around or spin limits.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "suppressNotifications", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the width of the control.
+	 *
 	 */
 
 	igDatePicker(optionLiteral: 'option', optionName: "width"): string|number;
@@ -35179,6 +36670,7 @@ interface JQuery {
 	/**
 	 * /Sets the width of the control.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -35186,6 +36678,7 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the height of the control.
+	 *
 	 */
 
 	igDatePicker(optionLiteral: 'option', optionName: "height"): string|number;
@@ -35193,6 +36686,7 @@ interface JQuery {
 	/**
 	 * /Sets the height of the control.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -35200,12 +36694,14 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets tabIndex attribute for the editor input.
+	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "tabIndex"): number;
 
 	/**
 	 * /Sets tabIndex attribute for the editor input.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "tabIndex", optionValue: number): void;
@@ -35213,6 +36709,7 @@ interface JQuery {
 	/**
 	 * Gets/Sets whether the editor value can become null.
 	 * If that option is false, and editor has no value, then value is set to an empty string.
+	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "allowNullValue"): boolean;
 
@@ -35220,42 +36717,49 @@ interface JQuery {
 	 * /Sets whether the editor value can become null.
 	 * If that option is false, and editor has no value, then value is set to an empty string.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "allowNullValue", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
+	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "inputName"): string;
 
 	/**
 	 * /Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "inputName", optionValue: string): void;
 
 	/**
 	 * Gets/Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
+	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "readOnly"): boolean;
 
 	/**
 	 * /Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "readOnly", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
+	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "disabled"): boolean;
 
 	/**
 	 * /Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "disabled", optionValue: boolean): void;
@@ -35264,6 +36768,7 @@ interface JQuery {
 	 * Gets/Sets options supported by the [igValidator](ui.igvalidator#options) widget.
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
+	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "validatorOptions"): any;
 
@@ -35272,36 +36777,42 @@ interface JQuery {
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "validatorOptions", optionValue: any): void;
 
 	/**
 	 * Set/Get the locale setting for the widget.
+	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "locale"): any;
 
 	/**
 	 * Set/Get the locale setting for the widget.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
+	 *
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "language"): string;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "language", optionValue: string): void;
 
 	/**
 	 * Set/Get the regional setting for the widget.
+	 *
 	 */
 
 	igDatePicker(optionLiteral: 'option', optionName: "regional"): string|Object;
@@ -35309,48 +36820,33 @@ interface JQuery {
 	/**
 	 * Set/Get the regional setting for the widget.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
 	igDatePicker(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
 
 	/**
-	 * Event which is raised when the drop down is opening.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.editorInput to obtain reference to the editable input
-	 * Use ui.calendar to obtain a reference to jQuery UI date picker widget, used as a calendar from the igDatePicker.
+	 * Fired when the drop down is opening.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "dropDownListOpening"): DropDownListOpeningEvent;
 
 	/**
-	 * Event which is raised when the drop down is opening.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.editorInput to obtain reference to the editable input
-	 * Use ui.calendar to obtain a reference to jQuery UI date picker widget, used as a calendar from the igDatePicker.
+	 * Fired when the drop down is opening.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "dropDownListOpening", optionValue: DropDownListOpeningEvent): void;
 
 	/**
-	 * Event which is raised after the drop down is opened.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.editorInput to obtain reference to the editable input
-	 * Use ui.calendar to obtain a reference to jQuery UI date picker widget, used as a calendar from the igDatePicker.
+	 * Fired after the drop down is opened.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "dropDownListOpened"): DropDownListOpenedEvent;
 
 	/**
-	 * Event which is raised after the drop down is opened.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.editorInput to obtain reference to the editable input
-	 * Use ui.calendar to obtain a reference to jQuery UI date picker widget, used as a calendar from the igDatePicker.
+	 * Fired after the drop down is opened.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "dropDownListOpened", optionValue: DropDownListOpenedEvent): void;
 
@@ -35379,22 +36875,14 @@ interface JQuery {
 	igDatePicker(optionLiteral: 'option', optionName: "dropDownItemSelecting", optionValue: DropDownItemSelectingEvent): void;
 
 	/**
-	 * Event which is raised after the drop down (calendar) is closed.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.editorInput to obtain reference to the editable input
-	 * Use ui.calendar to obtain a reference to jQuery UI date picker widget, used as a calendar from the igDatePicker.
+	 * Fired after the drop down (calendar) is closed.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "dropDownListClosed"): DropDownListClosedEvent;
 
 	/**
-	 * Event which is raised after the drop down (calendar) is closed.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.editorInput to obtain reference to the editable input
-	 * Use ui.calendar to obtain a reference to jQuery UI date picker widget, used as a calendar from the igDatePicker.
+	 * Fired after the drop down (calendar) is closed.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "dropDownListClosed", optionValue: DropDownListClosedEvent): void;
 
@@ -35411,24 +36899,14 @@ interface JQuery {
 	igDatePicker(optionLiteral: 'option', optionName: "dropDownItemSelected", optionValue: DropDownItemSelectedEvent): void;
 
 	/**
-	 * Event which is raised after a date selection in the calendar.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.dateFromPicker to obtain reference to the date object which is selected.
-	 * Use ui.item to obtain a referece to the selected html element from the calendar.
-	 * Use ui.calendar to obtain a reference to jQuery UI date picker, used as a calendar from the igDatePicker.
+	 * Fired after a date selection in the calendar.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "itemSelected"): ItemSelectedEvent;
 
 	/**
-	 * Event which is raised after a date selection in the calendar.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.dateFromPicker to obtain reference to the date object which is selected.
-	 * Use ui.item to obtain a referece to the selected html element from the calendar.
-	 * Use ui.calendar to obtain a reference to jQuery UI date picker, used as a calendar from the igDatePicker.
+	 * Fired after a date selection in the calendar.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igDatePicker(optionLiteral: 'option', optionName: "itemSelected", optionValue: ItemSelectedEvent): void;
 	igDatePicker(options: IgDatePicker): JQuery;
@@ -35454,18 +36932,21 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets whether the checkbox is checked.
+	 *
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "checked"): boolean;
 
 	/**
 	 * /Sets whether the checkbox is checked.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "checked", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets size of the checkbox based on preset styles.For different sizes, define 'width' and 'height' options instead.
+	 *
 	 */
 
 	igCheckboxEditor(optionLiteral: 'option', optionName: "size"): string;
@@ -35473,6 +36954,7 @@ interface JQuery {
 	/**
 	 * /Sets size of the checkbox based on preset styles.For different sizes, define 'width' and 'height' options instead.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -35481,6 +36963,7 @@ interface JQuery {
 	/**
 	 * Gets/Sets a custom class on the checkbox. Custom image can be used this way.
 	 * The following jQuery classes can be used in addition http://api.jqueryui.com/theming/icons/
+	 *
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "iconClass"): string;
 
@@ -35488,30 +36971,35 @@ interface JQuery {
 	 * /Sets a custom class on the checkbox. Custom image can be used this way.
 	 * The following jQuery classes can be used in addition http://api.jqueryui.com/theming/icons/
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "iconClass", optionValue: string): void;
 
 	/**
 	 * Gets/Sets tabIndex attribute for the editor input.
+	 *
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "tabIndex"): number;
 
 	/**
 	 * /Sets tabIndex attribute for the editor input.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "tabIndex", optionValue: number): void;
 
 	/**
 	 * Gets/Sets the readonly attribute. Does not allow editing. Disables changing the checkbox state as an interaction, but it still can be changed programmatically. On submit the current value is sent into the request.
+	 *
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "readOnly"): boolean;
 
 	/**
 	 * /Sets the readonly attribute. Does not allow editing. Disables changing the checkbox state as an interaction, but it still can be changed programmatically. On submit the current value is sent into the request.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "readOnly", optionValue: boolean): void;
@@ -35522,6 +37010,7 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the width of the control.
+	 *
 	 */
 
 	igCheckboxEditor(optionLiteral: 'option', optionName: "width"): string|number;
@@ -35529,6 +37018,7 @@ interface JQuery {
 	/**
 	 * /Sets the width of the control.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -35536,6 +37026,7 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the height of the control.
+	 *
 	 */
 
 	igCheckboxEditor(optionLiteral: 'option', optionName: "height"): string|number;
@@ -35543,6 +37034,7 @@ interface JQuery {
 	/**
 	 * /Sets the height of the control.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -35550,36 +37042,42 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets value in editor. The effect of setting/getting that option depends on type of editor and on dataMode options for every type of editor.
+	 *
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "value"): any;
 
 	/**
 	 * /Sets value in editor. The effect of setting/getting that option depends on type of editor and on dataMode options for every type of editor.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "value", optionValue: any): void;
 
 	/**
 	 * Gets/Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
+	 *
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "inputName"): string;
 
 	/**
 	 * /Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "inputName", optionValue: string): void;
 
 	/**
 	 * Gets/Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
+	 *
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "disabled"): boolean;
 
 	/**
 	 * /Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "disabled", optionValue: boolean): void;
@@ -35588,6 +37086,7 @@ interface JQuery {
 	 * Gets/Sets options supported by the [igValidator](ui.igvalidator#options) widget.
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
+	 *
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "validatorOptions"): any;
 
@@ -35596,36 +37095,42 @@ interface JQuery {
 	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
 	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "validatorOptions", optionValue: any): void;
 
 	/**
 	 * Set/Get the locale setting for the widget.
+	 *
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "locale"): any;
 
 	/**
 	 * Set/Get the locale setting for the widget.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
+	 *
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "language"): string;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "language", optionValue: string): void;
 
 	/**
 	 * Set/Get the regional setting for the widget.
+	 *
 	 */
 
 	igCheckboxEditor(optionLiteral: 'option', optionName: "regional"): string|Object;
@@ -35633,302 +37138,183 @@ interface JQuery {
 	/**
 	 * Set/Get the regional setting for the widget.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
 	igCheckboxEditor(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
 
 	/**
-	 * Event which is raised before value in editor was changed.
+	 * Fired before changing the editor's value.
 	 * Return false in order to cancel change.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.newValue to obtain the new value.
-	 * Use ui.newState to obtain the new state.
-	 * Use ui.oldValue to obtain the old value.
-	 * Use ui.oldState to obtain the old state.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput obtain reference to the editor element.
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "valueChanging"): ValueChangingEvent;
 
 	/**
-	 * Event which is raised before value in editor was changed.
+	 * Fired before changing the editor's value.
 	 * Return false in order to cancel change.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.newValue to obtain the new value.
-	 * Use ui.newState to obtain the new state.
-	 * Use ui.oldValue to obtain the old value.
-	 * Use ui.oldState to obtain the old state.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput obtain reference to the editor element.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "valueChanging", optionValue: ValueChangingEvent): void;
 
 	/**
-	 * Event which is raised after value in editor was changed.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.newValue to obtain the new value.
-	 * Use ui.newState to obtain the new state.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput obtain reference to the editor element.
+	 * Fired after the editor's value has been changed.
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "valueChanged"): ValueChangedEvent;
 
 	/**
-	 * Event which is raised after value in editor was changed.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.newValue to obtain the new value.
-	 * Use ui.newState to obtain the new state.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput obtain reference to the editor element.
+	 * Fired after the editor's value has been changed.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "valueChanged", optionValue: ValueChangedEvent): void;
 
 	/**
-	 * Event which is raised before rendering of the editor completes.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to get a reference to the editor performing rendering.
-	 * Use ui.element to get a reference to the editor element.
+	 * Fired before rendering of the editor has finished.
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "rendering"): RenderingEvent;
 
 	/**
-	 * Event which is raised before rendering of the editor completes.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to get a reference to the editor performing rendering.
-	 * Use ui.element to get a reference to the editor element.
+	 * Fired before rendering of the editor has finished.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "rendering", optionValue: RenderingEvent): void;
 
 	/**
-	 * Event which is raised after rendering of the editor completes.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to get a reference to the editor performing rendering.
-	 * Use ui.element to get a reference to the editor element.
+	 * Fired after rendering of the editor has finished.
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "rendered"): RenderedEvent;
 
 	/**
-	 * Event which is raised after rendering of the editor completes.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to get a reference to the editor performing rendering.
-	 * Use ui.element to get a reference to the editor element.
+	 * Fired after rendering of the editor has finished.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "rendered", optionValue: RenderedEvent): void;
 
 	/**
-	 * Event which is raised on mousedown event.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired on mousedown event.
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "mousedown"): MousedownEvent;
 
 	/**
-	 * Event which is raised on mousedown event.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired on mousedown event.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "mousedown", optionValue: MousedownEvent): void;
 
 	/**
-	 * Event which is raised on mouseup event.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired on mouseup event.
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "mouseup"): MouseupEvent;
 
 	/**
-	 * Event which is raised on mouseup event.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired on mouseup event.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "mouseup", optionValue: MouseupEvent): void;
 
 	/**
-	 * Event which is raised on mousemove at any part of editor including drop-down list.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired on mousemove at any part of editor including the drop-down list.
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "mousemove"): MousemoveEvent;
 
 	/**
-	 * Event which is raised on mousemove at any part of editor including drop-down list.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired on mousemove at any part of editor including the drop-down list.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "mousemove", optionValue: MousemoveEvent): void;
 
 	/**
-	 * Event which is raised on mouseover at any part of editor including drop-down list.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired on mouseover at any part of editor including the drop-down list.
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "mouseover"): MouseoverEvent;
 
 	/**
-	 * Event which is raised on mouseover at any part of editor including drop-down list.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired on mouseover at any part of editor including the drop-down list.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "mouseover", optionValue: MouseoverEvent): void;
 
 	/**
-	 * Event which is raised on mouseleave at any part of editor including drop-down list.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired on mouseleave at any part of editor including the drop-down list.
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "mouseout"): MouseoutEvent;
 
 	/**
-	 * Event which is raised on mouseleave at any part of editor including drop-down list.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired on mouseleave at any part of editor including the drop-down list.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "mouseout", optionValue: MouseoutEvent): void;
 
 	/**
-	 * Event which is raised when input field of editor loses focus.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired when the input field of the editor loses focus.
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "blur"): BlurEvent;
 
 	/**
-	 * Event which is raised when input field of editor loses focus.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired when the input field of the editor loses focus.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "blur", optionValue: BlurEvent): void;
 
 	/**
-	 * Event which is raised when input field of editor gets focus.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired when the input field of the editor gets focus.
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "focus"): IgFocusEvent;
 
 	/**
-	 * Event which is raised when input field of editor gets focus.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.element to obtain a reference to the event target.
-	 * Use ui.editorInput to get a reference to the editor field.
+	 * Fired when the input field of the editor gets focus.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "focus", optionValue: IgFocusEvent): void;
 
 	/**
-	 * Event which is raised on keydown event.
+	 * Fired on keydown event.
 	 * Return false in order to cancel key action.
-	 * Function takes arguments evt and ui.
-	 * Use evt.originalEvent to obtain reference to event of browser.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.key to obtain value of keyCode.
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "keydown"): KeydownEvent;
 
 	/**
-	 * Event which is raised on keydown event.
+	 * Fired on keydown event.
 	 * Return false in order to cancel key action.
-	 * Function takes arguments evt and ui.
-	 * Use evt.originalEvent to obtain reference to event of browser.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.key to obtain value of keyCode.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "keydown", optionValue: KeydownEvent): void;
 
 	/**
-	 * Event which is raised on keypress event.
+	 * Fired on keypress event.
 	 * Return false in order to cancel key action.
-	 * Function takes arguments evt and ui.
-	 * Use evt.originalEvent to obtain reference to event of browser.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.key to obtain value of keyCode.
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "keypress"): KeypressEvent;
 
 	/**
-	 * Event which is raised on keypress event.
+	 * Fired on keypress event.
 	 * Return false in order to cancel key action.
-	 * Function takes arguments evt and ui.
-	 * Use evt.originalEvent to obtain reference to event of browser.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.key to obtain value of keyCode.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "keypress", optionValue: KeypressEvent): void;
 
 	/**
-	 * Event which is raised on keyup event.
-	 * Function takes arguments evt and ui.
-	 * Use evt.originalEvent to obtain reference to event of browser.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.key to obtain value of keyCode.
+	 * Fired on keyup event.
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "keyup"): KeyupEvent;
 
 	/**
-	 * Event which is raised on keyup event.
-	 * Function takes arguments evt and ui.
-	 * Use evt.originalEvent to obtain reference to event of browser.
-	 * Use ui.owner to obtain reference to igEditor.
-	 * Use ui.key to obtain value of keyCode.
+	 * Fired on keyup event.
 	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igCheckboxEditor(optionLiteral: 'option', optionName: "keyup", optionValue: KeyupEvent): void;
 	igCheckboxEditor(options: IgCheckboxEditor): JQuery;
@@ -35937,6 +37323,4447 @@ interface JQuery {
 	igCheckboxEditor(optionLiteral: 'option', optionName: string, optionValue: any): JQuery;
 	igCheckboxEditor(methodName: string, ...methodParams: any[]): any;
 }
+interface JQuery {
+	igTimePicker(methodName: "getSelectedListItem"): string;
+	igTimePicker(methodName: "dropDownVisible"): boolean;
+	igTimePicker(methodName: "dropDownButton"): string;
+	igTimePicker(methodName: "dropDownContainer"): string;
+	igTimePicker(methodName: "findListItemIndex", text: string, matchType?: Object): number;
+	igTimePicker(methodName: "selectedListIndex", index?: number): number;
+	igTimePicker(methodName: "value", newValue: Object): void;
+	igTimePicker(methodName: "selectDate"): void;
+	igTimePicker(methodName: "changeRegional"): void;
+	igTimePicker(methodName: "getSelectedDate"): Date;
+	igTimePicker(methodName: "spinUp", delta?: number): void;
+	igTimePicker(methodName: "spinDown", delta?: number): void;
+	igTimePicker(methodName: "spinUpButton"): string;
+	igTimePicker(methodName: "spinDownButton"): string;
+	igTimePicker(methodName: "isValid"): boolean;
+
+	/**
+	 * Gets delta-value which is used to generate the drop-down items for the time picker.
+	 * Accepted values for deltas are positive integer numbers, and the fractional portion of floating point numbers is ignored.
+	 *
+	 * object  A configuration object, which defines specific values for each time period. The option can accept the following format:
+	 * itemsDelta: {
+	 * hours: 0,
+	 * minutes: 30,
+	 * }
+	 * Time periods that don't have values use 0 as default for hours and 30 for minutes.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "itemsDelta"): IgTimePickerItemsDelta;
+
+	/**
+	 * Delta-value which is used to generate the drop-down items for the time picker.
+	 * Accepted values for deltas are positive integer numbers, and the fractional portion of floating point numbers is ignored.
+	 *
+	 * object  A configuration object, which defines specific values for each time period. The option can accept the following format:
+	 * itemsDelta: {
+	 * hours: 0,
+	 * minutes: 30,
+	 * }
+	 * Time periods that don't have values use 0 as default for hours and 30 for minutes.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "itemsDelta", optionValue: IgTimePickerItemsDelta): void;
+
+	/**
+	 * Gets/Sets delta-value which is used to increment or decrement the editor time on spin actions.When not editing (focused) the delta is applied on the day if available in the input mask or the lowest available period.
+	 * When in edit mode the time period, where the cursor is positioned, is incremented or decremented with the defined delta value.
+	 * Accepted values for deltas are positive integer numbers, and the fractional portion of floating point numbers is ignored.
+	 * spinDelta: {
+	 * hours: 12,
+	 * minutes: 15
+	 * }
+	 * Default value is {hours: 1, minutes: 30}.
+	 *
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "spinDelta"): any;
+
+	/**
+	 * /Sets delta-value which is used to increment or decrement the editor time on spin actions.When not editing (focused) the delta is applied on the day if available in the input mask or the lowest available period.
+	 * When in edit mode the time period, where the cursor is positioned, is incremented or decremented with the defined delta value.
+	 * Accepted values for deltas are positive integer numbers, and the fractional portion of floating point numbers is ignored.
+	 * spinDelta: {
+	 * hours: 12,
+	 * minutes: 15
+	 * }
+	 * Default value is {hours: 1, minutes: 30}.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "spinDelta", optionValue: any): void;
+
+	/**
+	 * Gets format of time while timepicker has focus.
+	 * Value of that option can be set to explicit time pattern or to a flag defined by regional settings.
+	 * If value is set to explicit time pattern and pattern besides date-flags has explicit characters which match with time-flags or mask-flags, then the "escape" character should be used in front of them.
+	 * If option is not set, then the "time" is used automatically.
+	 * List of predefined regional flags:
+	 * "time": the timePattern member of regional option is used
+	 * List of explicit characters, which should have escape \\ character in front of them: C, &, a, A, ?, L, 9, 0, #, >, <, y, M, d, h, H, m, s, t, f.
+	 * List of time-flags when explicit time pattern is used:
+	 * "t": first character of string which represents AM/PM field
+	 * "tt": 2 characters of string which represents AM/PM field
+	 * "hh": hours field in 12-hours format with leading zero
+	 * "HH": hours field in 24-hours format with leading zero
+	 * "mm": minutes field with leading zero
+	 * Note! This option can not be set runtime.
+	 *
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "timeInputFormat"): string;
+
+	/**
+	 * Format of time while timepicker has focus.
+	 * Value of that option can be set to explicit time pattern or to a flag defined by regional settings.
+	 * If value is set to explicit time pattern and pattern besides date-flags has explicit characters which match with time-flags or mask-flags, then the "escape" character should be used in front of them.
+	 * If option is not set, then the "time" is used automatically.
+	 * List of predefined regional flags:
+	 * "time": the timePattern member of regional option is used
+	 * List of explicit characters, which should have escape \\ character in front of them: C, &, a, A, ?, L, 9, 0, #, >, <, y, M, d, h, H, m, s, t, f.
+	 * List of time-flags when explicit time pattern is used:
+	 * "t": first character of string which represents AM/PM field
+	 * "tt": 2 characters of string which represents AM/PM field
+	 * "hh": hours field in 12-hours format with leading zero
+	 * "HH": hours field in 24-hours format with leading zero
+	 * "mm": minutes field with leading zero
+	 * Note! This option can not be set runtime.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "timeInputFormat", optionValue: string): void;
+
+	/**
+	 * Gets/Sets format of time while timepicker has no focus.
+	 * Value of that option can be set to a specific time pattern or to a flag defined by regional settings.
+	 * If value is not set, then the timeInputFormat is used automatically.
+	 * If value is set to explicit time pattern and pattern besides time-flags has explicit characters which match with time-flags or mask-flags, then the "escape" character should be used in front of them.
+	 * List of predefined regional flags:
+	 * "time": the timePattern member of regional option is used
+	 * List of explicit characters, which should have escape \\ character in front of them:
+	 * C, &, a, A, ?, L, 9, 0, #, >, <, y, M, d, h, H, m, s, t, f.
+	 * List of time-flags when explicit time pattern is used:
+	 * "t": first character of string which represents AM/PM field
+	 * "tt": 2 characters of string which represents AM/PM field
+	 * "h": hours field in 12-hours format without leading zero
+	 * "hh": hours field in 12-hours format with leading zero
+	 * "H": hours field in 24-hours format without leading zero
+	 * "HH": hours field in 24-hours format with leading zero
+	 * "m": minutes field without leading zero
+	 * "mm": minutes field with leading zero
+	 *
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "timeDisplayFormat"): string;
+
+	/**
+	 * /Sets format of time while timepicker has no focus.
+	 * Value of that option can be set to a specific time pattern or to a flag defined by regional settings.
+	 * If value is not set, then the timeInputFormat is used automatically.
+	 * If value is set to explicit time pattern and pattern besides time-flags has explicit characters which match with time-flags or mask-flags, then the "escape" character should be used in front of them.
+	 * List of predefined regional flags:
+	 * "time": the timePattern member of regional option is used
+	 * List of explicit characters, which should have escape \\ character in front of them:
+	 * C, &, a, A, ?, L, 9, 0, #, >, <, y, M, d, h, H, m, s, t, f.
+	 * List of time-flags when explicit time pattern is used:
+	 * "t": first character of string which represents AM/PM field
+	 * "tt": 2 characters of string which represents AM/PM field
+	 * "h": hours field in 12-hours format without leading zero
+	 * "hh": hours field in 12-hours format with leading zero
+	 * "H": hours field in 24-hours format without leading zero
+	 * "HH": hours field in 24-hours format with leading zero
+	 * "m": minutes field without leading zero
+	 * "mm": minutes field with leading zero
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "timeDisplayFormat", optionValue: string): void;
+
+	/**
+	 * Gets/Sets if the editor should only allow values from the list of items. Matching is case-insensitive.
+	 *
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "isLimitedToListValues"): boolean;
+
+	/**
+	 * /Sets if the editor should only allow values from the list of items. Matching is case-insensitive.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "isLimitedToListValues", optionValue: boolean): void;
+
+	/**
+	 * Gets/Sets whether the onscreen keyboard (if available on device) should be shown when the dropdown button is clicked/tapped. This option prevents initial focus or removes it when the drop button is clicked/tapped.
+	 * Note: The option does not perform device detection so its behavior is always active if enabled.
+	 * Note: When drop down is opened the only way to close it will be using the drop down button.
+	 *
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "suppressKeyboard"): boolean;
+
+	/**
+	 * /Sets whether the onscreen keyboard (if available on device) should be shown when the dropdown button is clicked/tapped. This option prevents initial focus or removes it when the drop button is clicked/tapped.
+	 * Note: The option does not perform device detection so its behavior is always active if enabled.
+	 * Note: When drop down is opened the only way to close it will be using the drop down button.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "suppressKeyboard", optionValue: boolean): void;
+
+	/**
+	 * Gets/Sets the drop-down list opening orientation when the list gets open. If the option is set to auto the timepicker has priority to open the drop-down list bottom. If the space is not enough it tries to open the list top. If the space is not enough in both directions then the list gets opened at the bottom of the editor.
+	 *
+	 */
+
+	igTimePicker(optionLiteral: 'option', optionName: "dropDownOrientation"): string;
+
+	/**
+	 * /Sets the drop-down list opening orientation when the list gets open. If the option is set to auto the timepicker has priority to open the drop-down list bottom. If the space is not enough it tries to open the list top. If the space is not enough in both directions then the list gets opened at the bottom of the editor.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igTimePicker(optionLiteral: 'option', optionName: "dropDownOrientation", optionValue: string): void;
+
+	/**
+	 * Gets the number of the items to be shown at once when the drop-down list get opened.
+	 * Notes:
+	 * This option is overwritten if the number of list items is less than the set value. In that case the drop-down list displays all the items.
+	 * This option can not be set runtime.
+	 *
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "visibleItemsCount"): number;
+
+	/**
+	 * The number of the items to be shown at once when the drop-down list get opened.
+	 * Notes:
+	 * This option is overwritten if the number of list items is less than the set value. In that case the drop-down list displays all the items.
+	 * This option can not be set runtime.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "visibleItemsCount", optionValue: number): void;
+
+	/**
+	 * Gets/Sets custom width of the drop-down list in pixels. If the value is equal to 0 or negative, then the width of timepicker is set as a drop-down width.
+	 *
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "listWidth"): number;
+
+	/**
+	 * /Sets custom width of the drop-down list in pixels. If the value is equal to 0 or negative, then the width of timepicker is set as a drop-down width.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "listWidth", optionValue: number): void;
+
+	/**
+	 * Gets/Sets the hover/unhover animation duration of a drop-down list item.
+	 *
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "listItemHoverDuration"): number;
+
+	/**
+	 * /Sets the hover/unhover animation duration of a drop-down list item.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "listItemHoverDuration", optionValue: number): void;
+
+	/**
+	 * Gets wheather the drop-down list element is attached to the body of the document, or to the timepicker container element.
+	 * If the option is set to false the timepicker will attach the drop-down list element to the timepicker container
+	 * If the option is set to true the timepicker will attach its drop-down list to as a child of the body.
+	 * Note! This option can not be set runtime.
+	 *
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "dropDownAttachedToBody"): boolean;
+
+	/**
+	 * Wheather the drop-down list element is attached to the body of the document, or to the timepicker container element.
+	 * If the option is set to false the timepicker will attach the drop-down list element to the timepicker container
+	 * If the option is set to true the timepicker will attach its drop-down list to as a child of the body.
+	 * Note! This option can not be set runtime.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "dropDownAttachedToBody", optionValue: boolean): void;
+
+	/**
+	 * Gets/Sets show/hide drop-down list animation duration in milliseconds.
+	 *
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "dropDownAnimationDuration"): number;
+
+	/**
+	 * /Sets show/hide drop-down list animation duration in milliseconds.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "dropDownAnimationDuration", optionValue: number): void;
+
+	/**
+	 * Gets visibility of the spin, clear and drop-down button. That option can be set only on initialization. Combinations like 'dropdown, clear' or 'spin, clear' are supported too.Note! This option can not be set runtime.
+	 * Note! A combination like 'dropdown, spin' is not allowed.
+	 *
+	 */
+
+	igTimePicker(optionLiteral: 'option', optionName: "buttonType"): string;
+
+	/**
+	 * Visibility of the spin, clear and drop-down button. That option can be set only on initialization. Combinations like 'dropdown, clear' or 'spin, clear' are supported too.Note! This option can not be set runtime.
+	 * Note! A combination like 'dropdown, spin' is not allowed.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igTimePicker(optionLiteral: 'option', optionName: "buttonType", optionValue: string): void;
+
+	/**
+	 * Gets/Set the ability of the editor to automatically set value in the editor to the opposite side of the limit, when the spin action reaches minimum or maximum limit.
+	 * This applies to [minValue](ui.%%WidgetNameLowered%%#options:minValue) and [maxValue](ui.%%WidgetNameLowered%%#options:maxValue) or cycling through list items if [isLimitedToListValues](ui.%%WidgetNameLowered%%#options:isLimitedToListValues) is enabled.
+	 *
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "spinWrapAround"): boolean;
+
+	/**
+	 * /Set the ability of the editor to automatically set value in the editor to the opposite side of the limit, when the spin action reaches minimum or maximum limit.
+	 * This applies to [minValue](ui.%%WidgetNameLowered%%#options:minValue) and [maxValue](ui.%%WidgetNameLowered%%#options:maxValue) or cycling through list items if [isLimitedToListValues](ui.%%WidgetNameLowered%%#options:isLimitedToListValues) is enabled.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "spinWrapAround", optionValue: boolean): void;
+
+	/**
+	 * Removed from timepicker options
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "dateDisplayFormat"): any;
+
+	/**
+	 * Removed from timepicker options
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "dateDisplayFormat", optionValue: any): void;
+
+	/**
+	 * Removed from timepicker options
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "dateInputFormat"): any;
+
+	/**
+	 * Removed from timepicker options
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "dateInputFormat", optionValue: any): void;
+
+	/**
+	 * Removed from timepicker options
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "yearShift"): any;
+
+	/**
+	 * Removed from timepicker options
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "yearShift", optionValue: any): void;
+
+	/**
+	 * Removed from timepicker options
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "displayTimeOffset"): any;
+
+	/**
+	 * Removed from timepicker options
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "displayTimeOffset", optionValue: any): void;
+
+	/**
+	 * Gets/Sets the value of the editor. Date object can be set as value. String can be set and the editor will pass it to the Date object constructor and use the corresponding Date object as the value. MVC date format can be used too.
+	 * Note! This option doesn't use the dateInputFormat to extract the date.
+	 *
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "value"): Date;
+
+	/**
+	 * /Sets the value of the editor. Date object can be set as value. String can be set and the editor will pass it to the Date object constructor and use the corresponding Date object as the value. MVC date format can be used too.
+	 * Note! This option doesn't use the dateInputFormat to extract the date.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "value", optionValue: Date): void;
+
+	/**
+	 * Gets the minimum value which can be entered in editor by user. Date object can be set as value. String value can be passed and the editor will use the javascript Date object constructor to create date object and will use it for the comparison. MVC date format can be used too.
+	 * Note! This option doesn't use the dateInputFormat to extract the date.
+	 *
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "minValue"): Date;
+
+	/**
+	 * The minimum value which can be entered in editor by user. Date object can be set as value. String value can be passed and the editor will use the javascript Date object constructor to create date object and will use it for the comparison. MVC date format can be used too.
+	 * Note! This option doesn't use the dateInputFormat to extract the date.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "minValue", optionValue: Date): void;
+
+	/**
+	 * Gets the maximum value which can be entered in editor by user. Date object can be set as value. String value can be passed and the editor will use the javascript Date object constructor to create date object and will use it for the comparison. MVC date format can be used too.
+	 * Note! This option doesn't use the dateInputFormat to extract the date.
+	 *
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "maxValue"): Date;
+
+	/**
+	 * The maximum value which can be entered in editor by user. Date object can be set as value. String value can be passed and the editor will use the javascript Date object constructor to create date object and will use it for the comparison. MVC date format can be used too.
+	 * Note! This option doesn't use the dateInputFormat to extract the date.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "maxValue", optionValue: Date): void;
+
+	/**
+	 * Gets the value type returned by the get of value() method and option. Also affects how the value is stored for form submit.
+	 * The [enableUTCDates](ui.%%WidgetNameLowered%%#options:enableUTCDates) option can be used to output an UTC ISO string instead.
+	 * For example 10:00 AM from a client with local offset of 5 hours ahead of GMT will be serialized as:
+	 * "2016-11-11T10:00:00+05:00"
+	 *
+	 */
+
+	igTimePicker(optionLiteral: 'option', optionName: "dataMode"): string;
+
+	/**
+	 * The value type returned by the get of value() method and option. Also affects how the value is stored for form submit.
+	 * The [enableUTCDates](ui.%%WidgetNameLowered%%#options:enableUTCDates) option can be used to output an UTC ISO string instead.
+	 * For example 10:00 AM from a client with local offset of 5 hours ahead of GMT will be serialized as:
+	 * "2016-11-11T10:00:00+05:00"
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igTimePicker(optionLiteral: 'option', optionName: "dataMode", optionValue: string): void;
+
+	/**
+	 * Gets/Sets ability to modify only 1 date field on spin events.
+	 * Value false enables changes of other date fields when incremented or decremented date-field reaches its limits.
+	 * Value true modifies only value of one field.
+	 *
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "limitSpinToCurrentField"): boolean;
+
+	/**
+	 * /Sets ability to modify only 1 date field on spin events.
+	 * Value false enables changes of other date fields when incremented or decremented date-field reaches its limits.
+	 * Value true modifies only value of one field.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "limitSpinToCurrentField", optionValue: boolean): void;
+
+	/**
+	 * Enables/Disables serializing client date as UTC ISO 8061 string instead of using the local time and zone values.
+	 * The option is only applied in "date" [dataMode](ui.%%WidgetNameLowered%%#options:dataMode).
+	 *
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "enableUTCDates"): boolean;
+
+	/**
+	 * Enables/Disables serializing client date as UTC ISO 8061 string instead of using the local time and zone values.
+	 * The option is only applied in "date" [dataMode](ui.%%WidgetNameLowered%%#options:dataMode).
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "enableUTCDates", optionValue: boolean): void;
+
+	/**
+	 * Gets/Sets year for auto detection of 20th and 21st centuries.
+	 * That option is used to automatically fill century when the user entered only 1 or 2 digits into the year field or when the date pattern contains only 1 or 2 year positions, e.g. "yy" or "y".
+	 * If user entered value larger than value of this option, then 20th century is used, otherwise the 21st.
+	 *
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "centuryThreshold"): number;
+
+	/**
+	 * /Sets year for auto detection of 20th and 21st centuries.
+	 * That option is used to automatically fill century when the user entered only 1 or 2 digits into the year field or when the date pattern contains only 1 or 2 year positions, e.g. "yy" or "y".
+	 * If user entered value larger than value of this option, then 20th century is used, otherwise the 21st.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "centuryThreshold", optionValue: number): void;
+
+	/**
+	 * Gets/Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
+	 *
+	 */
+
+	igTimePicker(optionLiteral: 'option', optionName: "nullValue"): string|number|Date;
+
+	/**
+	 * /Sets the representation of null value. In case of default the value for the input is set to null, which makes the input to hold an empty string
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igTimePicker(optionLiteral: 'option', optionName: "nullValue", optionValue: string|number|Date): void;
+
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for igDateEditor
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "listItems"): any;
+
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for igDateEditor
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "listItems", optionValue: any): void;
+
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for igDateEditor
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "dropDownOnReadOnly"): boolean;
+
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for igDateEditor
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "dropDownOnReadOnly", optionValue: boolean): void;
+
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for igDateEditor
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "inputMask"): string;
+
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for igDateEditor
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "inputMask", optionValue: string): void;
+
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for igDateEditor
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "unfilledCharsPrompt"): string;
+
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for igDateEditor
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "unfilledCharsPrompt", optionValue: string): void;
+
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for igDateEditor
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "padChar"): string;
+
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for igDateEditor
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "padChar", optionValue: string): void;
+
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for igDateEditor
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "emptyChar"): string;
+
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for igDateEditor
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "emptyChar", optionValue: string): void;
+
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for igDateEditor
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "toUpper"): boolean;
+
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for igDateEditor
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "toUpper", optionValue: boolean): void;
+
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for igDateEditor
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "toLower"): boolean;
+
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for igDateEditor
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "toLower", optionValue: boolean): void;
+
+	/**
+	 * Gets ability to enter only specific characters in input-field from keyboard and on paste.
+	 * Notes:
+	 * If "excludeKeys" option contains same characters as this option, then "excludeKeys" has priority.
+	 * Note! This option can not be se runtime.
+	 *
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "includeKeys"): string;
+
+	/**
+	 * Ability to enter only specific characters in input-field from keyboard and on paste.
+	 * Notes:
+	 * If "excludeKeys" option contains same characters as this option, then "excludeKeys" has priority.
+	 * Note! This option can not be se runtime.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "includeKeys", optionValue: string): void;
+
+	/**
+	 * Gets ability to prevent entering specific characters from keyboard or on paste.
+	 * Notes:
+	 * If a character is specified in "includeKeys" option also, then "excludeKeys" has priority.
+	 * Note! This option can not be se runtime.
+	 *
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "excludeKeys"): string;
+
+	/**
+	 * Ability to prevent entering specific characters from keyboard or on paste.
+	 * Notes:
+	 * If a character is specified in "includeKeys" option also, then "excludeKeys" has priority.
+	 * Note! This option can not be se runtime.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "excludeKeys", optionValue: string): void;
+
+	igTimePicker(optionLiteral: 'option', optionName: "textMode"): any;
+
+	igTimePicker(optionLiteral: 'option', optionName: "textMode", optionValue: any): void;
+
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for igMaskEditor
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "maxLength"): any;
+
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for igMaskEditor
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "maxLength", optionValue: any): void;
+
+	/**
+	 * Gets/Sets the horizontal alignment of the text in the editor.
+	 *
+	 */
+
+	igTimePicker(optionLiteral: 'option', optionName: "textAlign"): string;
+
+	/**
+	 * /Sets the horizontal alignment of the text in the editor.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igTimePicker(optionLiteral: 'option', optionName: "textAlign", optionValue: string): void;
+
+	/**
+	 * Gets/Sets the text which appears in the editor when it has no focus and the "value" is null or empty string.
+	 *
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "placeHolder"): string;
+
+	/**
+	 * /Sets the text which appears in the editor when it has no focus and the "value" is null or empty string.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "placeHolder", optionValue: string): void;
+
+	/**
+	 * Gets/Sets the action when the editor gets focused. The default value is selectAll.
+	 *
+	 */
+
+	igTimePicker(optionLiteral: 'option', optionName: "selectionOnFocus"): string;
+
+	/**
+	 * /Sets the action when the editor gets focused. The default value is selectAll.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igTimePicker(optionLiteral: 'option', optionName: "selectionOnFocus", optionValue: string): void;
+
+	/**
+	 * Gets/Sets if the editor should revert it's value to the previously valid value in case the value on blur, or enter key is not valid. If the opiton is set to false, editor calls clear functionality.
+	 *
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "revertIfNotValid"): boolean;
+
+	/**
+	 * /Sets if the editor should revert it's value to the previously valid value in case the value on blur, or enter key is not valid. If the opiton is set to false, editor calls clear functionality.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "revertIfNotValid", optionValue: boolean): void;
+
+	/**
+	 * Gets/Sets if the editor should prevent form submition when enter key is pressed.
+	 *
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "preventSubmitOnEnter"): boolean;
+
+	/**
+	 * /Sets if the editor should prevent form submition when enter key is pressed.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "preventSubmitOnEnter", optionValue: boolean): void;
+
+	/**
+	 * Disables/Enables default notifications for basic validation scenarios built in the editors such as required list selection, value wrapping around or spin limits.
+	 *
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "suppressNotifications"): boolean;
+
+	/**
+	 * Disables/Enables default notifications for basic validation scenarios built in the editors such as required list selection, value wrapping around or spin limits.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "suppressNotifications", optionValue: boolean): void;
+
+	/**
+	 * Gets/Sets the width of the control.
+	 *
+	 */
+
+	igTimePicker(optionLiteral: 'option', optionName: "width"): string|number;
+
+	/**
+	 * /Sets the width of the control.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igTimePicker(optionLiteral: 'option', optionName: "width", optionValue: string|number): void;
+
+	/**
+	 * Gets/Sets the height of the control.
+	 *
+	 */
+
+	igTimePicker(optionLiteral: 'option', optionName: "height"): string|number;
+
+	/**
+	 * /Sets the height of the control.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igTimePicker(optionLiteral: 'option', optionName: "height", optionValue: string|number): void;
+
+	/**
+	 * Gets/Sets tabIndex attribute for the editor input.
+	 *
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "tabIndex"): number;
+
+	/**
+	 * /Sets tabIndex attribute for the editor input.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "tabIndex", optionValue: number): void;
+
+	/**
+	 * Gets/Sets whether the editor value can become null.
+	 * If that option is false, and editor has no value, then value is set to an empty string.
+	 *
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "allowNullValue"): boolean;
+
+	/**
+	 * /Sets whether the editor value can become null.
+	 * If that option is false, and editor has no value, then value is set to an empty string.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "allowNullValue", optionValue: boolean): void;
+
+	/**
+	 * Gets/Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
+	 *
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "inputName"): string;
+
+	/**
+	 * /Sets the name attribute of the value input. This input is used to sent the value to the server. In case the target element is input and it has name attribute, but the developer has set the inputName option, so this option overwrites the value input and removes the attribute from the element.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "inputName", optionValue: string): void;
+
+	/**
+	 * Gets/Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
+	 *
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "readOnly"): boolean;
+
+	/**
+	 * /Sets the readonly attribute for the input. If set to true the input is readonly, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is submitted.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "readOnly", optionValue: boolean): void;
+
+	/**
+	 * Gets/Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
+	 *
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "disabled"): boolean;
+
+	/**
+	 * /Sets the disabled attribute for the input. If set to true the input is disabled, and all buttons and interactions are disabled. On submitting the form the editor belongs to, the value is not submitted.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "disabled", optionValue: boolean): void;
+
+	/**
+	 * Gets/Sets options supported by the [igValidator](ui.igvalidator#options) widget.
+	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
+	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
+	 *
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "validatorOptions"): any;
+
+	/**
+	 * /Sets options supported by the [igValidator](ui.igvalidator#options) widget.
+	 * Note: Validation rules of [igValidator](ui.igvalidator#options), such as min and max value/length are applied separately triggering errors,
+	 * while the corresponding options of the editor prevent values violating the defined rules from being entered.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "validatorOptions", optionValue: any): void;
+
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "locale"): any;
+
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "language"): string;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "language", optionValue: string): void;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+
+	igTimePicker(optionLiteral: 'option', optionName: "regional"): string|Object;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igTimePicker(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
+
+	/**
+	 * Fired when the drop down is opening.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "dropDownListOpening"): DropDownListOpeningEvent;
+
+	/**
+	 * Fired when the drop down is opening.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "dropDownListOpening", optionValue: DropDownListOpeningEvent): void;
+
+	/**
+	 * Fired after the drop down is opened.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "dropDownListOpened"): DropDownListOpenedEvent;
+
+	/**
+	 * Fired after the drop down is opened.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "dropDownListOpened", optionValue: DropDownListOpenedEvent): void;
+
+	/**
+	 * Fired when the drop down is closing.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "dropDownListClosing"): DropDownListClosingEvent;
+
+	/**
+	 * Fired when the drop down is closing.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "dropDownListClosing", optionValue: DropDownListClosingEvent): void;
+
+	/**
+	 * Fired after the drop down is closed.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "dropDownListClosed"): DropDownListClosedEvent;
+
+	/**
+	 * Fired after the drop down is closed.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "dropDownListClosed", optionValue: DropDownListClosedEvent): void;
+
+	/**
+	 * Fired when an item in the drop down list is being selected.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "dropDownItemSelecting"): DropDownItemSelectingEvent;
+
+	/**
+	 * Fired when an item in the drop down list is being selected.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "dropDownItemSelecting", optionValue: DropDownItemSelectingEvent): void;
+
+	/**
+	 * Fired after an item in the drop down list is selected.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "dropDownItemSelected"): DropDownItemSelectedEvent;
+
+	/**
+	 * Fired after an item in the drop down list is selected.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTimePicker(optionLiteral: 'option', optionName: "dropDownItemSelected", optionValue: DropDownItemSelectedEvent): void;
+	igTimePicker(options: IgTimePicker): JQuery;
+	igTimePicker(optionLiteral: 'option', optionName: string): any;
+	igTimePicker(optionLiteral: 'option', options: IgTimePicker): JQuery;
+	igTimePicker(optionLiteral: 'option', optionName: string, optionValue: any): JQuery;
+	igTimePicker(methodName: string, ...methodParams: any[]): any;
+}
+interface ApplyCustomIndicatorsEvent {
+	(event: Event, ui: ApplyCustomIndicatorsEventUIParam): void;
+}
+
+interface ApplyCustomIndicatorsEventUIParam {}
+
+interface IgFinancialChart {
+	/**
+	 * Gets or sets the id of a template element to use for tooltips, or markup representing the tooltip template.
+	 */
+	tooltipTemplate?: any;
+
+	/**
+	 * Gets or sets the names of tooltip templates
+	 */
+	tooltipTemplates?: any;
+
+	/**
+	 * Gets or sets the left margin of chart title
+	 */
+	titleLeftMargin?: number;
+
+	/**
+	 * Gets or sets the right margin of chart title
+	 */
+	titleRightMargin?: number;
+
+	/**
+	 * Gets or sets the top margin of chart title
+	 */
+	titleTopMargin?: number;
+
+	/**
+	 * Gets or sets the bottom margin of chart title
+	 */
+	titleBottomMargin?: number;
+
+	/**
+	 * Gets or sets the left margin of chart subtitle
+	 */
+	subtitleLeftMargin?: number;
+
+	/**
+	 * Gets or sets the top margin of chart subtitle
+	 */
+	subtitleTopMargin?: number;
+
+	/**
+	 * Gets or sets the right margin of chart subtitle
+	 */
+	subtitleRightMargin?: number;
+
+	/**
+	 * Gets or sets the bottom margin of chart subtitle
+	 */
+	subtitleBottomMargin?: number;
+
+	/**
+	 * Gets or sets color of chart subtitle
+	 */
+	subtitleTextColor?: string;
+
+	/**
+	 * Gets or sets color of chart title
+	 */
+	titleTextColor?: string;
+
+	/**
+	 * Gets or sets the left margin of the chart content.
+	 */
+	leftMargin?: number;
+
+	/**
+	 * Gets or sets the top margin of the chart content.
+	 */
+	topMargin?: number;
+
+	/**
+	 * Gets or sets the right margin of the chart content.
+	 */
+	rightMargin?: number;
+
+	/**
+	 * Gets or sets the bottom margin around the chart content.
+	 */
+	bottomMargin?: number;
+
+	/**
+	 * Gets or sets the duration used for animating series plots when the data is changing
+	 */
+	transitionDuration?: number;
+
+	/**
+	 * Gets or sets the easing function used for animating series plots when the data is changing.
+	 * This can be set to one of the known values "linear" or "cubic," or it can be set to an easing function which takes a single numeric parameter and returns a number.
+	 */
+	transitionEasingFunction?: any;
+
+	/**
+	 * Gets or sets a function for creating wrapped tooltip
+	 */
+	createWrappedTooltip?: any;
+
+	/**
+	 * Gets or sets the widget of this control
+	 */
+	widget?: any;
+
+	/**
+	 * Gets or sets CSS font property for the chart subtitle
+	 */
+	subtitleTextStyle?: string;
+
+	/**
+	 * Gets or sets CSS font property for the chart title
+	 */
+	titleTextStyle?: string;
+
+	/**
+	 * Gets or sets a collection of data items used to generate the chart.
+	 * The ItemsSource of this chart can be a list of objects containing one or more numeric properties.
+	 * Additionally, if the objects in the list implement the IEnumerable interface,
+	 * the Chart will attempt to delve into the sub-collections when reading through the data source.
+	 * Databinding can be further configured by attributing the data item classes
+	 * with the DataSeriesMemberIntentAttribute.
+	 */
+	itemsSource?: any;
+
+	/**
+	 * Gets or sets a set of property paths that should be included for consideration by the category chart, leaving the remainder excluded. If null, all properties will be considered.
+	 */
+	includedProperties?: any;
+
+	/**
+	 * Gets or sets a set of property paths that should be excluded from consideration by the category chart.
+	 */
+	excludedProperties?: any;
+
+	/**
+	 * Gets or sets the palette of brushes to use for coloring the chart series.
+	 * The value provided should be an array of CSS color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 */
+	brushes?: any;
+
+	/**
+	 * Gets or sets the palette of brushes to use for outlines on the chart series.
+	 * The value provided should be an array of CSS color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 */
+	outlines?: any;
+
+	/**
+	 * Gets or sets the legend to connect this chart to.
+	 * When the legend property is set, the chart will use it to display information about its series.  Legends can be shared by multiple chart controls.
+	 */
+	legend?: any;
+
+	/**
+	 * Gets or sets whether the chart can be horizontally zoomed through user interactions.
+	 */
+	isHorizontalZoomEnabled?: boolean;
+
+	/**
+	 * Gets or sets whether the chart can be vertically zoomed through user interactions.
+	 */
+	isVerticalZoomEnabled?: boolean;
+
+	/**
+	 * Gets or sets the rectangle representing the current scroll and zoom state of the chart.
+	 * WindowRect is expressed as a Rectangle with coordinates and sizes between 0 and 1.
+	 * The provided object should have numeric properties called left, top, width and height.
+	 */
+	windowRect?: any;
+
+	/**
+	 * Gets or sets text to display above the plot area.
+	 */
+	title?: string;
+
+	/**
+	 * Gets or sets text to display below the Title, above the plot area.
+	 */
+	subtitle?: string;
+
+	/**
+	 * Gets or sets horizontal alignment which determines the title position, relative to the left and right edges of the control.
+	 *
+	 * Valid values:
+	 * "left" Align the item to the left
+	 * "center" Center the item
+	 * "right" Align the item to the right
+	 * "stretch" Stretch the item to the full width
+	 */
+	titleAlignment?: string;
+
+	/**
+	 * Gets or sets horizontal alignment which determines the subtitle position, relative to the left and right edges of the control.
+	 *
+	 * Valid values:
+	 * "left" Align the item to the left
+	 * "center" Center the item
+	 * "right" Align the item to the right
+	 * "stretch" Stretch the item to the full width
+	 */
+	subtitleAlignment?: string;
+
+	/**
+	 * Gets or sets the behavior that determines how unknown values will be plotted on the chart.Null and Double.NaN are two examples of unknown values.
+	 *
+	 *
+	 * Valid values:
+	 * "linearInterpolate" Plot the unknown value as the midpoint between surrounding known values using linear interpolation.
+	 * "dontPlot" Do not plot the unknown value on the chart.
+	 */
+	unknownValuePlotting?: string;
+
+	/**
+	 * Gets or sets the rendering resolution for all series in this chart.
+	 * Where n = Resolution, for every n horizontal pixels, combine all items into a single datapoint.  When Resolution = 0, all datapoints will be rendered as graphical objects.  Charts with a higher resolution will have faster performance.
+	 */
+	resolution?: number;
+
+	/**
+	 * Gets or sets the thickness for all series in this chart. Depending on the ChartType, this can be the main brush used, or just the outline.
+	 */
+	thickness?: number;
+
+	/**
+	 * Gets or sets the marker shapes used for indicating location of data points in this chart.
+	 * This property applies only to these chart types: point, line, spline, bubble, and polygon
+	 */
+	markerTypes?: any;
+
+	/**
+	 * Gets or sets the palette of brushes used for rendering fill area of data point markers.
+	 * This property applies only to these chart types: point, line, spline, bubble, and polygon
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 */
+	markerBrushes?: any;
+
+	/**
+	 * Gets or sets the palette of brushes used for rendering outlines of data point markers.
+	 * This property applies only to these chart types: point, line, spline, bubble, and polygon
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 */
+	markerOutlines?: any;
+
+	/**
+	 * Gets or sets the maximum number of markers displyed in the plot area of the chart.
+	 */
+	markerMaxCount?: number;
+
+	/**
+	 * Gets or sets the palette of brushes to used for coloring trend lines in this chart.
+	 * The value provided should be an array of CSS color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 */
+	trendLineBrushes?: any;
+
+	/**
+	 * Gets or sets the formula used for calculating trend lines in this chart.This property applies only to these chart types: point, line, spline, and bubble
+	 *
+	 *
+	 * Valid values:
+	 * "none" No trend line will be displayed.
+	 * "linearFit" Linear fit.
+	 * "quadraticFit" Quadratic polynomial fit.
+	 * "cubicFit" Cubic polynomial fit.
+	 * "quarticFit" Quartic polynomial fit.
+	 * "quinticFit" Quintic polynomial fit.
+	 * "logarithmicFit" Logarithmic fit.
+	 * "exponentialFit" Exponential fit.
+	 * "powerLawFit" Powerlaw fit.
+	 * "simpleAverage" Simple moving average.
+	 * "exponentialAverage" Exponential moving average.
+	 * "modifiedAverage" Modified moving average.
+	 * "cumulativeAverage" Cumulative moving average.
+	 * "weightedAverage" Weighted moving average.
+	 */
+	trendLineType?: string;
+
+	/**
+	 * Gets or sets the thickness of the trend lines in this chart.
+	 * This property applies only to these chart types: point, line, spline, and bubble
+	 */
+	trendLineThickness?: number;
+
+	/**
+	 * Gets or sets a value indicating whether grid and tick lines are aligned to device pixels.
+	 */
+	alignsGridLinesToPixels?: boolean;
+	trendLinePeriod?: number;
+
+	/**
+	 * Gets or sets function which takes an context object and returns a formatted label for the X-axis.
+	 */
+	xAxisFormatLabel?: any;
+
+	/**
+	 * Gets or sets function which takes a context object and returns a formatted label for the Y-axis.
+	 */
+	yAxisFormatLabel?: any;
+
+	/**
+	 * Gets or sets the left margin of labels on the X-axis
+	 */
+	xAxisLabelLeftMargin?: number;
+
+	/**
+	 * Gets or sets the top margin of labels on the X-axis
+	 */
+	xAxisLabelTopMargin?: number;
+
+	/**
+	 * Gets or sets the right margin of labels on the X-axis
+	 */
+	xAxisLabelRightMargin?: number;
+
+	/**
+	 * Gets or sets the bottom margin of labels on the X-axis
+	 */
+	xAxisLabelBottomMargin?: number;
+
+	/**
+	 * Gets or sets the left margin of labels on the Y-axis
+	 */
+	yAxisLabelLeftMargin?: number;
+
+	/**
+	 * Gets or sets the top margin of labels on the Y-axis
+	 */
+	yAxisLabelTopMargin?: number;
+
+	/**
+	 * Gets or sets the right margin of labels on the Y-axis
+	 */
+	yAxisLabelRightMargin?: number;
+
+	/**
+	 * Gets or sets the bottom margin of labels on the Y-axis
+	 */
+	yAxisLabelBottomMargin?: number;
+
+	/**
+	 * Gets or sets color of labels on the X-axis
+	 */
+	xAxisLabelTextColor?: string;
+
+	/**
+	 * Gets or sets color of labels on the Y-axis
+	 */
+	yAxisLabelTextColor?: string;
+
+	/**
+	 * Gets or sets the margin around a title on the X-axis
+	 */
+	xAxisTitleMargin?: number;
+
+	/**
+	 * Gets or sets the margin around a title on the Y-axis
+	 */
+	yAxisTitleMargin?: number;
+
+	/**
+	 * Gets or sets the left margin of a title on the X-axis
+	 */
+	xAxisTitleLeftMargin?: number;
+
+	/**
+	 * Gets or sets the left margin of a title on the Y-axis
+	 */
+	yAxisTitleLeftMargin?: number;
+
+	/**
+	 * Gets or sets the top margin of a title on the X-axis
+	 */
+	xAxisTitleTopMargin?: number;
+
+	/**
+	 * Gets or sets the top margin of a title on the Y-axis
+	 */
+	yAxisTitleTopMargin?: number;
+
+	/**
+	 * Gets or sets the right margin of a title on the X-axis
+	 */
+	xAxisTitleRightMargin?: number;
+
+	/**
+	 * Gets or sets the right margin of a title on the Y-axis
+	 */
+	yAxisTitleRightMargin?: number;
+
+	/**
+	 * Gets or sets the bottom margin of a title on the X-axis
+	 */
+	xAxisTitleBottomMargin?: number;
+
+	/**
+	 * Gets or sets the bottom margin of a title on the Y-axis
+	 */
+	yAxisTitleBottomMargin?: number;
+
+	/**
+	 * Gets or sets color of title on the X-axis
+	 */
+	xAxisTitleTextColor?: string;
+
+	/**
+	 * Gets or sets color of title on the Y-axis
+	 */
+	yAxisTitleTextColor?: string;
+
+	/**
+	 * Gets or sets CSS font property for labels on X-axis
+	 */
+	xAxisLabelTextStyle?: string;
+
+	/**
+	 * Gets or sets CSS font property for labels on Y-axis
+	 */
+	yAxisLabelTextStyle?: string;
+
+	/**
+	 * Gets or sets CSS font property for title on X-axis
+	 */
+	xAxisTitleTextStyle?: string;
+
+	/**
+	 * Gets or sets CSS font property for title on Y-axis
+	 */
+	yAxisTitleTextStyle?: string;
+
+	/**
+	 * Gets or sets the format for labels along the X-axis.
+	 */
+	xAxisLabel?: any;
+
+	/**
+	 * Gets or sets the format for labels along the Y-axis.
+	 */
+	yAxisLabel?: any;
+
+	/**
+	 * Gets or sets the color to apply to major gridlines along the X-axis.
+	 */
+	xAxisMajorStroke?: string;
+
+	/**
+	 * Gets or sets the color to apply to major gridlines along the Y-axis.
+	 */
+	yAxisMajorStroke?: string;
+
+	/**
+	 * Gets or sets the thickness to apply to major gridlines along the X-axis.
+	 */
+	xAxisMajorStrokeThickness?: number;
+
+	/**
+	 * Gets or sets the thickness to apply to major gridlines along the Y-axis.
+	 */
+	yAxisMajorStrokeThickness?: number;
+
+	/**
+	 * Gets or sets the thickness to apply to minor gridlines along the X-axis.
+	 */
+	xAxisMinorStrokeThickness?: number;
+
+	/**
+	 * Gets or sets the thickness to apply to minor gridlines along the Y-axis.
+	 */
+	yAxisMinorStrokeThickness?: number;
+
+	/**
+	 * Gets or sets the color to apply to stripes along the X-axis.
+	 */
+	xAxisStrip?: string;
+
+	/**
+	 * Gets or sets the color to apply to stripes along the Y-axis.
+	 */
+	yAxisStrip?: string;
+
+	/**
+	 * Gets or sets the color to apply to the X-axis line.
+	 */
+	xAxisStroke?: string;
+
+	/**
+	 * Gets or sets the color to apply to the Y-axis line.
+	 */
+	yAxisStroke?: string;
+
+	/**
+	 * Gets or sets the thickness to apply to the X-axis line.
+	 */
+	xAxisStrokeThickness?: number;
+
+	/**
+	 * Gets or sets the thickness to apply to the Y-axis line.
+	 */
+	yAxisStrokeThickness?: number;
+
+	/**
+	 * Gets or sets the length of tickmarks along the X-axis.
+	 */
+	xAxisTickLength?: number;
+
+	/**
+	 * Gets or sets the length of tickmarks along the Y-axis.
+	 */
+	yAxisTickLength?: number;
+
+	/**
+	 * Gets or sets the color to apply to tickmarks along the X-axis.
+	 */
+	xAxisTickStroke?: string;
+
+	/**
+	 * Gets or sets the color to apply to tickmarks along the Y-axis.
+	 */
+	yAxisTickStroke?: string;
+
+	/**
+	 * Gets or sets the thickness to apply to tickmarks along the X-axis.
+	 */
+	xAxisTickStrokeThickness?: number;
+
+	/**
+	 * Gets or sets the thickness to apply to tickmarks along the Y-axis.
+	 */
+	yAxisTickStrokeThickness?: number;
+
+	/**
+	 * Gets or sets the Text to display below the X-axis.
+	 */
+	xAxisTitle?: string;
+
+	/**
+	 * Gets or sets the Text to display to the left of the Y-axis.
+	 */
+	yAxisTitle?: string;
+
+	/**
+	 * Gets or sets the color to apply to minor gridlines along the X-axis.
+	 */
+	xAxisMinorStroke?: string;
+
+	/**
+	 * Gets or sets the color to apply to minor gridlines along the Y-axis.
+	 */
+	yAxisMinorStroke?: string;
+
+	/**
+	 * Gets or sets the angle of rotation for labels along the X-axis.
+	 */
+	xAxisLabelAngle?: number;
+
+	/**
+	 * Gets or sets the angle of rotation for labels along the Y-axis.
+	 */
+	yAxisLabelAngle?: number;
+
+	/**
+	 * Gets or sets the distance between the X-axis and the bottom of the chart.
+	 */
+	xAxisExtent?: number;
+
+	/**
+	 * Gets or sets the distance between the Y-axis and the left edge of the chart.
+	 */
+	yAxisExtent?: number;
+
+	/**
+	 * Gets or sets the angle of rotation for the X-axis title.
+	 */
+	xAxisTitleAngle?: number;
+
+	/**
+	 * Gets or sets the angle of rotation for the Y-axis title.
+	 */
+	yAxisTitleAngle?: number;
+
+	/**
+	 * Gets or sets whether to invert the direction of the X-axis by placing the first data items on the right side of the chart.
+	 */
+	xAxisInverted?: boolean;
+
+	/**
+	 * Gets or sets whether to invert the direction of the Y-axis by placing the minimum numeric value at the top of the chart.
+	 */
+	yAxisInverted?: boolean;
+
+	/**
+	 * Gets or sets Horizontal alignment of the X-axis title.
+	 *
+	 * Valid values:
+	 * "left" Align the item to the left
+	 * "center" Center the item
+	 * "right" Align the item to the right
+	 * "stretch" Stretch the item to the full width
+	 */
+	xAxisTitleAlignment?: string;
+
+	/**
+	 * Gets or sets Vertical alignment of the Y-axis title.
+	 *
+	 * Valid values:
+	 * "top" Align the item to the top
+	 * "center" Center the item
+	 * "bottom" Align the item to the bottom
+	 * "stretch" Stretch the item to the full height
+	 */
+	yAxisTitleAlignment?: string;
+
+	/**
+	 * Gets or sets Horizontal alignment of X-axis labels.
+	 *
+	 * Valid values:
+	 * "left" Align the item to the left
+	 * "center" Center the item
+	 * "right" Align the item to the right
+	 * "stretch" Stretch the item to the full width
+	 */
+	xAxisLabelHorizontalAlignment?: string;
+
+	/**
+	 * Gets or sets Horizontal alignment of Y-axis labels.
+	 *
+	 * Valid values:
+	 * "left" Align the item to the left
+	 * "center" Center the item
+	 * "right" Align the item to the right
+	 * "stretch" Stretch the item to the full width
+	 */
+	yAxisLabelHorizontalAlignment?: string;
+
+	/**
+	 * Gets or sets Vertical alignment of X-axis labels.
+	 *
+	 * Valid values:
+	 * "top" Align the item to the top
+	 * "center" Center the item
+	 * "bottom" Align the item to the bottom
+	 * "stretch" Stretch the item to the full height
+	 */
+	xAxisLabelVerticalAlignment?: string;
+
+	/**
+	 * Gets or sets Vertical alignment of Y-axis labels.
+	 *
+	 * Valid values:
+	 * "top" Align the item to the top
+	 * "center" Center the item
+	 * "bottom" Align the item to the bottom
+	 * "stretch" Stretch the item to the full height
+	 */
+	yAxisLabelVerticalAlignment?: string;
+
+	/**
+	 * Gets or sets Visibility of X-axis labels.
+	 *
+	 * Valid values:
+	 * "visible" Display the element.
+	 * "collapsed" Do not display the element.
+	 */
+	xAxisLabelVisibility?: string;
+
+	/**
+	 * Gets or sets Visibility of Y-axis labels.
+	 *
+	 * Valid values:
+	 * "visible" Display the element.
+	 * "collapsed" Do not display the element.
+	 */
+	yAxisLabelVisibility?: string;
+
+	/**
+	 * The location of Y-axis labels, relative to the plot area.
+	 *
+	 * Valid values:
+	 * "outsideTop" Places the axis labels at the top, outside of the plotting area.
+	 * "outsideBottom" Places the axis labels at the bottom, outside of the plotting area
+	 * "outsideLeft" Places the axis labels to the left, outside of the plotting area.
+	 * "outsideRight" Places the axis labels to the right, outside of the plotting area.
+	 * "insideTop" Places the axis labels inside the plotting area above the axis line.
+	 * "insideBottom" Places the axis labels inside the plotting area below the axis line.
+	 * "insideLeft" Places the axis labels inside the plotting area and to the left of the axis line.
+	 * "insideRight" Places the axis labels inside the plotting area and to the right of the axis line.
+	 */
+	yAxisLabelLocation?: string;
+	rangeSelectorTemplate?: any;
+	toolbarTemplate?: any;
+	chartTypePickerTemplate?: any;
+	trendLineTypePickerTemplate?: any;
+	volumeTypePickerTemplate?: any;
+	indicatorPickerTemplate?: any;
+	overlayPickerTemplate?: any;
+	toolbarHeight?: number;
+
+	/**
+	 * Gets or sets whether the Y-axis should use a logarithmic scale instead of a linear one.
+	 * Since log(-1) is imaginary and log(0) is undefined, it is recommended to enable this property only when the Y-axis minimum is greater than zero.
+	 */
+	yAxisIsLogarithmic?: boolean;
+
+	/**
+	 * Gets or sets the base value to use in the log function when mapping the position of data items along the Y-axis.
+	 * This property is effective only when YAxisIsLogarithmic is true.
+	 */
+	yAxisLogarithmBase?: number;
+
+	/**
+	 * Gets or sets the distance between each label and grid line along the Y-axis.
+	 */
+	yAxisInterval?: number;
+
+	/**
+	 * Gets or sets the data value corresponding to the minimum value of the Y-axis.
+	 */
+	yAxisMinimumValue?: number;
+
+	/**
+	 * Gets or sets the data value corresponding to the maximum value of the Y-axis.
+	 */
+	yAxisMaximumValue?: number;
+
+	/**
+	 * Gets or sets the frequency of displayed minor lines along the Y-axis.
+	 */
+	yAxisMinorInterval?: number;
+
+	/**
+	 * The type of series to display in the volume pane.
+	 *
+	 * Valid values:
+	 * "none" Do not display the volume pane.
+	 * "column" Display column series in the volume pane.
+	 * "line" Display line series in the volume pane.
+	 * "area" Display area series in the volume pane.
+	 */
+	volumeType?: string;
+
+	/**
+	 * The scaling mode of the X-axis.
+	 *
+	 * Valid values:
+	 * "ordinal" An ordinal scale with time labels.
+	 * "time" A time scale.
+	 */
+	xAxisMode?: string;
+
+	/**
+	 * The scaling mode of the Y-axis.
+	 *
+	 * Valid values:
+	 * "numeric" A linear or logarithmic numeric scale.
+	 * "percentChange" A numeric scale where all values are scaled proportionally to a reference value.
+	 */
+	yAxisMode?: string;
+
+	/**
+	 * A boolean property controlling the visibility of the toolbar.
+	 */
+	isToolbarVisible?: boolean;
+
+	/**
+	 * The type of price series to display in the main chart.
+	 *
+	 * Valid values:
+	 * "auto" Automatically determine the price series type to display in the main chart.
+	 * "bar" Display financial bar series in the main chart.
+	 * "candle" Display candlestick series in the main chart.
+	 * "column" Display column series in the main chart.
+	 * "line" Display line series in the main chart.
+	 */
+	chartType?: string;
+
+	/**
+	 * A boolean indicating whether the chart should automatically zoom in vertically on the currently visible range of data.
+	 * When this property is set to true, panning and zooming along the X-axis will result in a corresponding zoom on the Y-axis, so that the visible range of data fills the zoom window as fully as possible.
+	 */
+	isWindowSyncedToVisibleRange?: boolean;
+
+	/**
+	 * A collection indicating what financial indicator types to display on the Financial Chart.
+	 */
+	indicatorTypes?: any;
+
+	/**
+	 * A collection indicating what financial overlay types to display on the Financial Chart.
+	 */
+	overlayTypes?: any;
+
+	/**
+	 * Gets or sets whether the large numbers on the Y-axis labels are abbreviated.
+	 */
+	yAxisAbbreviateLargeNumbers?: boolean;
+
+	/**
+	 * The type of series to display in the zoom slider pane.
+	 *
+	 * Valid values:
+	 * "none" Do not display the zoom slider pane.
+	 * "bar" Display financial bar series in the zoom slider pane.
+	 * "candle" Display candle series in the zoom slider pane.
+	 * "column" Display column series in the zoom slider pane.
+	 * "line" Display line series in the zoom slider pane.
+	 * "area" Display an area series in the zoom slider pane.
+	 */
+	zoomSliderType?: string;
+
+	/**
+	 * Gets or sets the palette used for coloring negative items of Waterfall chart type.
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 */
+	negativeBrushes?: any;
+
+	/**
+	 * Brushes to use for drawing negative elements, when using a chart type with contextual coloring, such as Waterfall.
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 */
+	negativeOutlines?: any;
+
+	/**
+	 * Brushes to use for filling financial overlays.
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 */
+	overlayBrushes?: any;
+
+	/**
+	 * Brushes to use for outlining financial overlays.
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 */
+	overlayOutlines?: any;
+
+	/**
+	 * Brushes to use for outlining volume series in the volume pane.
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 */
+	volumeOutlines?: any;
+
+	/**
+	 * Brushes to use for filling volume series in the volume pane.
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 */
+	volumeBrushes?: any;
+
+	/**
+	 * Brushes to use for negative elements in financial indicators.
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 */
+	indicatorNegativeBrushes?: any;
+
+	/**
+	 * Brushes to use for financial indicators.
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 */
+	indicatorBrushes?: any;
+
+	/**
+	 * The outline thickness of volume series in the volume pane.
+	 */
+	volumeThickness?: number;
+
+	/**
+	 * The outline thickness of financial overlays.
+	 */
+	overlayThickness?: number;
+
+	/**
+	 * The outline or stroke thickness of financial indicators.
+	 */
+	indicatorThickness?: number;
+
+	/**
+	 * The display types of financial indicators.
+	 */
+	indicatorDisplayTypes?: any;
+
+	/**
+	 * The period of financial indicators, where applicable.
+	 */
+	indicatorPeriod?: number;
+
+	/**
+	 * The multiplier of financial indicators, where applicable.
+	 */
+	indicatorMultiplier?: number;
+
+	/**
+	 * The smoothing period of financial indicators, where applicable.
+	 */
+	indicatorSmoothingPeriod?: number;
+
+	/**
+	 * The short period of financial indicators, where applicable.
+	 */
+	indicatorShortPeriod?: number;
+
+	/**
+	 * The long period of financial indicators, where applicable.
+	 */
+	indicatorLongPeriod?: number;
+
+	/**
+	 * The signal period of financial indicators, where applicable.
+	 */
+	indicatorSignalPeriod?: number;
+
+	/**
+	 * A FinancialChartRangeSelectorOptionCollection containing the available range selector options on the toolbar.
+	 */
+	rangeSelectorOptions?: any;
+
+	/**
+	 * A FinancialChartRangeSelectorOptionCollection containing the available range selector options on the toolbar.
+	 * This will be the intersection of the user-defined range selector options, if any, and the range selector options which are automatically determined based on the range of data.
+	 */
+	actualRangeSelectorOptions?: any;
+
+	/**
+	 * The names of custom indicators to add to the chart.
+	 * When CustomIndicatorNames is set, the ApplyCustomIndicators event will be raised for each custom indicator name.
+	 */
+	customIndicatorNames?: any;
+
+	/**
+	 * The width of the chart.
+	 */
+	width?: number;
+
+	/**
+	 * The height of the chart.
+	 */
+	height?: number;
+
+	/**
+	 * Gets sets maximum number of displayed records in chart.
+	 */
+	maxRecCount?: number;
+
+	/**
+	 * Gets sets a valid data source.
+	 * That can be instance of array or primitives, array of objects, instance of $.ig.DataSource, or any other data accepted by $.ig.DataSource.
+	 * Note: if it is set to string and "dataSourceType" option is not set, then $.ig.JSONPDataSource is used.
+	 */
+	dataSource?: any;
+
+	/**
+	 * Gets sets data source type (such as "json", "xml", etc). Please refer to the documentation of $.ig.DataSource and its type property
+	 */
+	dataSourceType?: string;
+
+	/**
+	 * Gets sets url which is used for sending JSON on request for remote data.
+	 */
+	dataSourceUrl?: string;
+
+	/**
+	 * See $.ig.DataSource. property in the response specifying the total number of records on the server.
+	 */
+	responseTotalRecCountKey?: string;
+
+	/**
+	 * See $.ig.DataSource. This is basically the property in the responses where data records are held, if the response is wrapped.
+	 */
+	responseDataKey?: string;
+
+	/**
+	 * Event raised when a property value is changed on this chart
+	 */
+	propertyChanged?: PropertyChangedEvent;
+
+	/**
+	 * Event raised when a series is initialized and added to this chart.
+	 */
+	seriesAdded?: SeriesAddedEvent;
+
+	/**
+	 * Event raised when a series is removed from this chart.
+	 */
+	seriesRemoved?: SeriesRemovedEvent;
+
+	/**
+	 * Occurs when the pointer enters a Series.
+	 */
+	seriesPointerEnter?: SeriesPointerEnterEvent;
+
+	/**
+	 * Occurs when the pointer leaves a Series.
+	 */
+	seriesPointerLeave?: SeriesPointerLeaveEvent;
+
+	/**
+	 * Occurs when the pointer moves over a Series.
+	 */
+	seriesPointerMove?: SeriesPointerMoveEvent;
+
+	/**
+	 * Occurs when the pointer is pressed down over a Series.
+	 */
+	seriesPointerDown?: SeriesPointerDownEvent;
+
+	/**
+	 * Occurs when the pointer is released over a Series.
+	 */
+	seriesPointerUp?: SeriesPointerUpEvent;
+
+	/**
+	 * Event raised by the chart when custom indicator data is needed from the application.
+	 * During series rendering, event will be raised once for each value in the CustomIndicatorNames collection.
+	 */
+	applyCustomIndicators?: ApplyCustomIndicatorsEvent;
+
+	/**
+	 * Event which is raised before data binding.
+	 * Return false in order to cancel data binding.
+	 * Function takes first argument null and second argument ui.
+	 * Use ui.owner to obtain reference to chart widget.
+	 * Use ui.dataSource to obtain reference to instance of $.ig.DataSource.
+	 */
+	dataBinding?: DataBindingEvent;
+
+	/**
+	 * Event which is raised after data binding.
+	 * Function takes first argument null and second argument ui.
+	 * Use ui.owner to obtain reference to chart widget.
+	 * Use ui.data to obtain reference to array actual data which is displayed by chart.
+	 * Use ui.dataSource to obtain reference to instance of $.ig.DataSource.
+	 */
+	dataBound?: DataBoundEvent;
+
+	/**
+	 * Event which is raised before tooltip is updated.
+	 * Return false in order to cancel updating and hide tooltip.
+	 * Function takes first argument null and second argument ui.
+	 * Use ui.owner to obtain reference to chart widget.
+	 * Use ui.text to obtain html of tooltip. Value of that member can be modified. If modified value is null or empty string, then current content of tooltip keeps old value.
+	 * Use ui.item to obtain reference to item. Value of that member can be modified or replaced by custom item.
+	 * Use ui.x to obtain left position of tooltip in pixels relative to widget. Value of that member can be modified.
+	 * Use ui.y to obtain top position of tooltip in pixels relative to widget. Value of that member can be modified.
+	 * Use ui.element to obtain reference to jquery object which represents tooltip. Value of that member can be replaced by custom element.
+	 */
+	updateTooltip?: UpdateTooltipEvent;
+
+	/**
+	 * Event which is raised before tooltip is hidden.
+	 * Return false in order to cancel hiding and keep tooltip visible.
+	 * Function takes first argument null and second argument ui.
+	 * Use ui.owner to obtain reference to chart widget.
+	 * Use ui.item to obtain reference to item.
+	 * Use ui.element to obtain reference to jquery object which represents tooltip or value of ui.element from last updateTooltip event. Value of that member can be replaced by custom element.
+	 */
+	hideTooltip?: HideTooltipEvent;
+
+	/**
+	 * Option for igFinancialChart
+	 */
+	[optionName: string]: any;
+}
+interface IgFinancialChartMethods {
+	destroy(): void;
+	id(): void;
+	exportVisualData(): void;
+
+	/**
+	 * Find index of item within actual data used by chart.
+	 *
+	 * @param item The reference to item.
+	 */
+	findIndexOfItem(item: Object): number;
+
+	/**
+	 * Get item within actual data used by chart. That is similar to this.getData()[ index ].
+	 *
+	 * @param index Index of data item.
+	 */
+	getDataItem(index: Object): Object;
+
+	/**
+	 * Get reference of actual data used by chart.
+	 */
+	getData(): any[];
+
+	/**
+	 * Adds a new item to the data source and notifies the chart.
+	 *
+	 * @param item The item that we want to add to the data source.
+	 */
+	addItem(item: Object): Object;
+
+	/**
+	 * Inserts a new item to the data source and notifies the chart.
+	 *
+	 * @param item the new item that we want to insert in the data source.
+	 * @param index The index in the data source where the new item will be inserted.
+	 */
+	insertItem(item: Object, index: number): Object;
+
+	/**
+	 * Deletes an item from the data source and notifies the chart.
+	 *
+	 * @param index The index in the data source from where the item will be been removed.
+	 */
+	removeItem(index: number): Object;
+
+	/**
+	 * Updates an item in the data source and notifies the chart.
+	 *
+	 * @param index The index of the item in the data source that we want to change.
+	 * @param item The new item object that will be set in the data source.
+	 */
+	setItem(index: number, item: Object): Object;
+
+	/**
+	 * Notifies the chart that an item has been set in an associated data source.
+	 *
+	 * @param dataSource The data source in which the change happened.
+	 * @param index The index in the items source that has been changed.
+	 * @param newItem the new item that has been set in the collection.
+	 * @param oldItem the old item that has been overwritten in the collection.
+	 */
+	notifySetItem(dataSource: Object, index: number, newItem: Object, oldItem: Object): Object;
+
+	/**
+	 * Notifies the chart that the items have been cleared from an associated data source.
+	 * It's not necessary to notify more than one target of a change if they share the same items source.
+	 *
+	 * @param dataSource The data source in which the change happened.
+	 */
+	notifyClearItems(dataSource: Object): Object;
+
+	/**
+	 * Notifies the target axis or series that an item has been inserted at the specified index in its data source.
+	 * It's not necessary to notify more than one target of a change if they share the same items source.
+	 *
+	 * @param dataSource The data source in which the change happened.
+	 * @param index The index in the items source where the new item has been inserted.
+	 * @param newItem the new item that has been set in the collection.
+	 */
+	notifyInsertItem(dataSource: Object, index: number, newItem: Object): Object;
+
+	/**
+	 * Notifies the target axis or series that an item has been removed from the specified index in its data source.
+	 * It's not necessary to notify more than one target of a change if they share the same items source.
+	 *
+	 * @param dataSource The data source in which the change happened.
+	 * @param index The index in the items source from where the old item has been removed.
+	 * @param oldItem the old item that has been removed from the collection.
+	 */
+	notifyRemoveItem(dataSource: Object, index: number, oldItem: Object): Object;
+
+	/**
+	 * Get reference to chart object.
+	 */
+	chart(): Object;
+
+	/**
+	 * Binds data to the chart
+	 */
+	dataBind(): void;
+
+	/**
+	 * Forces any pending deferred work to render on the chart before continuing
+	 */
+	flush(): void;
+}
+interface JQuery {
+	data(propertyName: "igFinancialChart"): IgFinancialChartMethods;
+}
+
+interface JQuery {
+	igFinancialChart(methodName: "destroy"): void;
+	igFinancialChart(methodName: "id"): void;
+	igFinancialChart(methodName: "exportVisualData"): void;
+	igFinancialChart(methodName: "findIndexOfItem", item: Object): number;
+	igFinancialChart(methodName: "getDataItem", index: Object): Object;
+	igFinancialChart(methodName: "getData"): any[];
+	igFinancialChart(methodName: "addItem", item: Object): Object;
+	igFinancialChart(methodName: "insertItem", item: Object, index: number): Object;
+	igFinancialChart(methodName: "removeItem", index: number): Object;
+	igFinancialChart(methodName: "setItem", index: number, item: Object): Object;
+	igFinancialChart(methodName: "notifySetItem", dataSource: Object, index: number, newItem: Object, oldItem: Object): Object;
+	igFinancialChart(methodName: "notifyClearItems", dataSource: Object): Object;
+	igFinancialChart(methodName: "notifyInsertItem", dataSource: Object, index: number, newItem: Object): Object;
+	igFinancialChart(methodName: "notifyRemoveItem", dataSource: Object, index: number, oldItem: Object): Object;
+	igFinancialChart(methodName: "chart"): Object;
+	igFinancialChart(methodName: "dataBind"): void;
+	igFinancialChart(methodName: "flush"): void;
+
+	/**
+	 * Gets  the id of a template element to use for tooltips, or markup representing the tooltip template.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "tooltipTemplate"): any;
+
+	/**
+	 * Sets the id of a template element to use for tooltips, or markup representing the tooltip template.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "tooltipTemplate", optionValue: any): void;
+
+	/**
+	 * Gets  the names of tooltip templates
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "tooltipTemplates"): any;
+
+	/**
+	 * Sets the names of tooltip templates
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "tooltipTemplates", optionValue: any): void;
+
+	/**
+	 * Gets  the left margin of chart title
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "titleLeftMargin"): number;
+
+	/**
+	 * Sets the left margin of chart title
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "titleLeftMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the right margin of chart title
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "titleRightMargin"): number;
+
+	/**
+	 * Sets the right margin of chart title
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "titleRightMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the top margin of chart title
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "titleTopMargin"): number;
+
+	/**
+	 * Sets the top margin of chart title
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "titleTopMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the bottom margin of chart title
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "titleBottomMargin"): number;
+
+	/**
+	 * Sets the bottom margin of chart title
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "titleBottomMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the left margin of chart subtitle
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "subtitleLeftMargin"): number;
+
+	/**
+	 * Sets the left margin of chart subtitle
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "subtitleLeftMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the top margin of chart subtitle
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "subtitleTopMargin"): number;
+
+	/**
+	 * Sets the top margin of chart subtitle
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "subtitleTopMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the right margin of chart subtitle
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "subtitleRightMargin"): number;
+
+	/**
+	 * Sets the right margin of chart subtitle
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "subtitleRightMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the bottom margin of chart subtitle
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "subtitleBottomMargin"): number;
+
+	/**
+	 * Sets the bottom margin of chart subtitle
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "subtitleBottomMargin", optionValue: number): void;
+
+	/**
+	 * Gets  color of chart subtitle
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "subtitleTextColor"): string;
+
+	/**
+	 * Sets color of chart subtitle
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "subtitleTextColor", optionValue: string): void;
+
+	/**
+	 * Gets  color of chart title
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "titleTextColor"): string;
+
+	/**
+	 * Sets color of chart title
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "titleTextColor", optionValue: string): void;
+
+	/**
+	 * Gets  the left margin of the chart content.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "leftMargin"): number;
+
+	/**
+	 * Sets the left margin of the chart content.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "leftMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the top margin of the chart content.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "topMargin"): number;
+
+	/**
+	 * Sets the top margin of the chart content.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "topMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the right margin of the chart content.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "rightMargin"): number;
+
+	/**
+	 * Sets the right margin of the chart content.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "rightMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the bottom margin around the chart content.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "bottomMargin"): number;
+
+	/**
+	 * Sets the bottom margin around the chart content.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "bottomMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the duration used for animating series plots when the data is changing
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "transitionDuration"): number;
+
+	/**
+	 * Sets the duration used for animating series plots when the data is changing
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "transitionDuration", optionValue: number): void;
+
+	/**
+	 * Gets  the easing function used for animating series plots when the data is changing.
+	 * This can be set to one of the known values "linear" or "cubic," or it can be set to an easing function which takes a single numeric parameter and returns a number.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "transitionEasingFunction"): any;
+
+	/**
+	 * Sets the easing function used for animating series plots when the data is changing.
+	 * This can be set to one of the known values "linear" or "cubic," or it can be set to an easing function which takes a single numeric parameter and returns a number.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "transitionEasingFunction", optionValue: any): void;
+
+	/**
+	 * Gets  a function for creating wrapped tooltip
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "createWrappedTooltip"): any;
+
+	/**
+	 * Sets a function for creating wrapped tooltip
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "createWrappedTooltip", optionValue: any): void;
+
+	/**
+	 * Gets  the widget of this control
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "widget"): any;
+
+	/**
+	 * Sets the widget of this control
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "widget", optionValue: any): void;
+
+	/**
+	 * Gets  CSS font property for the chart subtitle
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "subtitleTextStyle"): string;
+
+	/**
+	 * Sets CSS font property for the chart subtitle
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "subtitleTextStyle", optionValue: string): void;
+
+	/**
+	 * Gets  CSS font property for the chart title
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "titleTextStyle"): string;
+
+	/**
+	 * Sets CSS font property for the chart title
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "titleTextStyle", optionValue: string): void;
+
+	/**
+	 * Gets  a collection of data items used to generate the chart.
+	 * The ItemsSource of this chart can be a list of objects containing one or more numeric properties.
+	 * Additionally, if the objects in the list implement the IEnumerable interface,
+	 * the Chart will attempt to delve into the sub-collections when reading through the data source.
+	 * Databinding can be further configured by attributing the data item classes
+	 * with the DataSeriesMemberIntentAttribute.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "itemsSource"): any;
+
+	/**
+	 * Sets a collection of data items used to generate the chart.
+	 * The ItemsSource of this chart can be a list of objects containing one or more numeric properties.
+	 * Additionally, if the objects in the list implement the IEnumerable interface,
+	 * the Chart will attempt to delve into the sub-collections when reading through the data source.
+	 * Databinding can be further configured by attributing the data item classes
+	 * with the DataSeriesMemberIntentAttribute.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "itemsSource", optionValue: any): void;
+
+	/**
+	 * Gets  a set of property paths that should be included for consideration by the category chart, leaving the remainder excluded. If null, all properties will be considered.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "includedProperties"): any;
+
+	/**
+	 * Sets a set of property paths that should be included for consideration by the category chart, leaving the remainder excluded. If null, all properties will be considered.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "includedProperties", optionValue: any): void;
+
+	/**
+	 * Gets  a set of property paths that should be excluded from consideration by the category chart.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "excludedProperties"): any;
+
+	/**
+	 * Sets a set of property paths that should be excluded from consideration by the category chart.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "excludedProperties", optionValue: any): void;
+
+	/**
+	 * Gets  the palette of brushes to use for coloring the chart series.
+	 * The value provided should be an array of CSS color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "brushes"): any;
+
+	/**
+	 * Sets the palette of brushes to use for coloring the chart series.
+	 * The value provided should be an array of CSS color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "brushes", optionValue: any): void;
+
+	/**
+	 * Gets  the palette of brushes to use for outlines on the chart series.
+	 * The value provided should be an array of CSS color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "outlines"): any;
+
+	/**
+	 * Sets the palette of brushes to use for outlines on the chart series.
+	 * The value provided should be an array of CSS color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "outlines", optionValue: any): void;
+
+	/**
+	 * Gets  the legend to connect this chart to.
+	 * When the legend property is set, the chart will use it to display information about its series.  Legends can be shared by multiple chart controls.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "legend"): any;
+
+	/**
+	 * Sets the legend to connect this chart to.
+	 * When the legend property is set, the chart will use it to display information about its series.  Legends can be shared by multiple chart controls.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "legend", optionValue: any): void;
+
+	/**
+	 * Gets  whether the chart can be horizontally zoomed through user interactions.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "isHorizontalZoomEnabled"): boolean;
+
+	/**
+	 * Sets whether the chart can be horizontally zoomed through user interactions.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "isHorizontalZoomEnabled", optionValue: boolean): void;
+
+	/**
+	 * Gets  whether the chart can be vertically zoomed through user interactions.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "isVerticalZoomEnabled"): boolean;
+
+	/**
+	 * Sets whether the chart can be vertically zoomed through user interactions.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "isVerticalZoomEnabled", optionValue: boolean): void;
+
+	/**
+	 * Gets  the rectangle representing the current scroll and zoom state of the chart.
+	 * WindowRect is expressed as a Rectangle with coordinates and sizes between 0 and 1.
+	 * The provided object should have numeric properties called left, top, width and height.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "windowRect"): any;
+
+	/**
+	 * Sets the rectangle representing the current scroll and zoom state of the chart.
+	 * WindowRect is expressed as a Rectangle with coordinates and sizes between 0 and 1.
+	 * The provided object should have numeric properties called left, top, width and height.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "windowRect", optionValue: any): void;
+
+	/**
+	 * Gets  text to display above the plot area.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "title"): string;
+
+	/**
+	 * Sets text to display above the plot area.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "title", optionValue: string): void;
+
+	/**
+	 * Gets  text to display below the Title, above the plot area.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "subtitle"): string;
+
+	/**
+	 * Sets text to display below the Title, above the plot area.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "subtitle", optionValue: string): void;
+
+	/**
+	 * Gets  horizontal alignment which determines the title position, relative to the left and right edges of the control.
+	 */
+
+	igFinancialChart(optionLiteral: 'option', optionName: "titleAlignment"): string;
+
+	/**
+	 * Sets horizontal alignment which determines the title position, relative to the left and right edges of the control.
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igFinancialChart(optionLiteral: 'option', optionName: "titleAlignment", optionValue: string): void;
+
+	/**
+	 * Gets  horizontal alignment which determines the subtitle position, relative to the left and right edges of the control.
+	 */
+
+	igFinancialChart(optionLiteral: 'option', optionName: "subtitleAlignment"): string;
+
+	/**
+	 * Sets horizontal alignment which determines the subtitle position, relative to the left and right edges of the control.
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igFinancialChart(optionLiteral: 'option', optionName: "subtitleAlignment", optionValue: string): void;
+
+	/**
+	 * Gets  the behavior that determines how unknown values will be plotted on the chart.Null and Double.NaN are two examples of unknown values.
+	 *
+	 */
+
+	igFinancialChart(optionLiteral: 'option', optionName: "unknownValuePlotting"): string;
+
+	/**
+	 * Sets the behavior that determines how unknown values will be plotted on the chart.Null and Double.NaN are two examples of unknown values.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igFinancialChart(optionLiteral: 'option', optionName: "unknownValuePlotting", optionValue: string): void;
+
+	/**
+	 * Gets  the rendering resolution for all series in this chart.
+	 * Where n = Resolution, for every n horizontal pixels, combine all items into a single datapoint.  When Resolution = 0, all datapoints will be rendered as graphical objects.  Charts with a higher resolution will have faster performance.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "resolution"): number;
+
+	/**
+	 * Sets the rendering resolution for all series in this chart.
+	 * Where n = Resolution, for every n horizontal pixels, combine all items into a single datapoint.  When Resolution = 0, all datapoints will be rendered as graphical objects.  Charts with a higher resolution will have faster performance.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "resolution", optionValue: number): void;
+
+	/**
+	 * Gets  the thickness for all series in this chart. Depending on the ChartType, this can be the main brush used, or just the outline.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "thickness"): number;
+
+	/**
+	 * Sets the thickness for all series in this chart. Depending on the ChartType, this can be the main brush used, or just the outline.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "thickness", optionValue: number): void;
+
+	/**
+	 * Gets  the marker shapes used for indicating location of data points in this chart.
+	 * This property applies only to these chart types: point, line, spline, bubble, and polygon
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "markerTypes"): any;
+
+	/**
+	 * Sets the marker shapes used for indicating location of data points in this chart.
+	 * This property applies only to these chart types: point, line, spline, bubble, and polygon
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "markerTypes", optionValue: any): void;
+
+	/**
+	 * Gets  the palette of brushes used for rendering fill area of data point markers.
+	 * This property applies only to these chart types: point, line, spline, bubble, and polygon
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "markerBrushes"): any;
+
+	/**
+	 * Sets the palette of brushes used for rendering fill area of data point markers.
+	 * This property applies only to these chart types: point, line, spline, bubble, and polygon
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "markerBrushes", optionValue: any): void;
+
+	/**
+	 * Gets  the palette of brushes used for rendering outlines of data point markers.
+	 * This property applies only to these chart types: point, line, spline, bubble, and polygon
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "markerOutlines"): any;
+
+	/**
+	 * Sets the palette of brushes used for rendering outlines of data point markers.
+	 * This property applies only to these chart types: point, line, spline, bubble, and polygon
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "markerOutlines", optionValue: any): void;
+
+	/**
+	 * Gets  the maximum number of markers displyed in the plot area of the chart.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "markerMaxCount"): number;
+
+	/**
+	 * Sets the maximum number of markers displyed in the plot area of the chart.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "markerMaxCount", optionValue: number): void;
+
+	/**
+	 * Gets  the palette of brushes to used for coloring trend lines in this chart.
+	 * The value provided should be an array of CSS color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "trendLineBrushes"): any;
+
+	/**
+	 * Sets the palette of brushes to used for coloring trend lines in this chart.
+	 * The value provided should be an array of CSS color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "trendLineBrushes", optionValue: any): void;
+
+	/**
+	 * Gets  the formula used for calculating trend lines in this chart.This property applies only to these chart types: point, line, spline, and bubble
+	 *
+	 */
+
+	igFinancialChart(optionLiteral: 'option', optionName: "trendLineType"): string;
+
+	/**
+	 * Sets the formula used for calculating trend lines in this chart.This property applies only to these chart types: point, line, spline, and bubble
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igFinancialChart(optionLiteral: 'option', optionName: "trendLineType", optionValue: string): void;
+
+	/**
+	 * Gets  the thickness of the trend lines in this chart.
+	 * This property applies only to these chart types: point, line, spline, and bubble
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "trendLineThickness"): number;
+
+	/**
+	 * Sets the thickness of the trend lines in this chart.
+	 * This property applies only to these chart types: point, line, spline, and bubble
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "trendLineThickness", optionValue: number): void;
+
+	/**
+	 * Gets  a value indicating whether grid and tick lines are aligned to device pixels.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "alignsGridLinesToPixels"): boolean;
+
+	/**
+	 * Sets a value indicating whether grid and tick lines are aligned to device pixels.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "alignsGridLinesToPixels", optionValue: boolean): void;
+	igFinancialChart(optionLiteral: 'option', optionName: "trendLinePeriod"): number;
+	igFinancialChart(optionLiteral: 'option', optionName: "trendLinePeriod", optionValue: number): void;
+
+	/**
+	 * Gets  function which takes an context object and returns a formatted label for the X-axis.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisFormatLabel"): any;
+
+	/**
+	 * Sets function which takes an context object and returns a formatted label for the X-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisFormatLabel", optionValue: any): void;
+
+	/**
+	 * Gets  function which takes a context object and returns a formatted label for the Y-axis.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisFormatLabel"): any;
+
+	/**
+	 * Sets function which takes a context object and returns a formatted label for the Y-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisFormatLabel", optionValue: any): void;
+
+	/**
+	 * Gets  the left margin of labels on the X-axis
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisLabelLeftMargin"): number;
+
+	/**
+	 * Sets the left margin of labels on the X-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisLabelLeftMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the top margin of labels on the X-axis
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisLabelTopMargin"): number;
+
+	/**
+	 * Sets the top margin of labels on the X-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisLabelTopMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the right margin of labels on the X-axis
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisLabelRightMargin"): number;
+
+	/**
+	 * Sets the right margin of labels on the X-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisLabelRightMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the bottom margin of labels on the X-axis
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisLabelBottomMargin"): number;
+
+	/**
+	 * Sets the bottom margin of labels on the X-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisLabelBottomMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the left margin of labels on the Y-axis
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisLabelLeftMargin"): number;
+
+	/**
+	 * Sets the left margin of labels on the Y-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisLabelLeftMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the top margin of labels on the Y-axis
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisLabelTopMargin"): number;
+
+	/**
+	 * Sets the top margin of labels on the Y-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisLabelTopMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the right margin of labels on the Y-axis
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisLabelRightMargin"): number;
+
+	/**
+	 * Sets the right margin of labels on the Y-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisLabelRightMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the bottom margin of labels on the Y-axis
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisLabelBottomMargin"): number;
+
+	/**
+	 * Sets the bottom margin of labels on the Y-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisLabelBottomMargin", optionValue: number): void;
+
+	/**
+	 * Gets  color of labels on the X-axis
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisLabelTextColor"): string;
+
+	/**
+	 * Sets color of labels on the X-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisLabelTextColor", optionValue: string): void;
+
+	/**
+	 * Gets  color of labels on the Y-axis
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisLabelTextColor"): string;
+
+	/**
+	 * Sets color of labels on the Y-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisLabelTextColor", optionValue: string): void;
+
+	/**
+	 * Gets  the margin around a title on the X-axis
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisTitleMargin"): number;
+
+	/**
+	 * Sets the margin around a title on the X-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisTitleMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the margin around a title on the Y-axis
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisTitleMargin"): number;
+
+	/**
+	 * Sets the margin around a title on the Y-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisTitleMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the left margin of a title on the X-axis
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisTitleLeftMargin"): number;
+
+	/**
+	 * Sets the left margin of a title on the X-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisTitleLeftMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the left margin of a title on the Y-axis
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisTitleLeftMargin"): number;
+
+	/**
+	 * Sets the left margin of a title on the Y-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisTitleLeftMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the top margin of a title on the X-axis
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisTitleTopMargin"): number;
+
+	/**
+	 * Sets the top margin of a title on the X-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisTitleTopMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the top margin of a title on the Y-axis
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisTitleTopMargin"): number;
+
+	/**
+	 * Sets the top margin of a title on the Y-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisTitleTopMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the right margin of a title on the X-axis
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisTitleRightMargin"): number;
+
+	/**
+	 * Sets the right margin of a title on the X-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisTitleRightMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the right margin of a title on the Y-axis
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisTitleRightMargin"): number;
+
+	/**
+	 * Sets the right margin of a title on the Y-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisTitleRightMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the bottom margin of a title on the X-axis
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisTitleBottomMargin"): number;
+
+	/**
+	 * Sets the bottom margin of a title on the X-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisTitleBottomMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the bottom margin of a title on the Y-axis
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisTitleBottomMargin"): number;
+
+	/**
+	 * Sets the bottom margin of a title on the Y-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisTitleBottomMargin", optionValue: number): void;
+
+	/**
+	 * Gets  color of title on the X-axis
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisTitleTextColor"): string;
+
+	/**
+	 * Sets color of title on the X-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisTitleTextColor", optionValue: string): void;
+
+	/**
+	 * Gets  color of title on the Y-axis
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisTitleTextColor"): string;
+
+	/**
+	 * Sets color of title on the Y-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisTitleTextColor", optionValue: string): void;
+
+	/**
+	 * Gets  CSS font property for labels on X-axis
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisLabelTextStyle"): string;
+
+	/**
+	 * Sets CSS font property for labels on X-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisLabelTextStyle", optionValue: string): void;
+
+	/**
+	 * Gets  CSS font property for labels on Y-axis
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisLabelTextStyle"): string;
+
+	/**
+	 * Sets CSS font property for labels on Y-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisLabelTextStyle", optionValue: string): void;
+
+	/**
+	 * Gets  CSS font property for title on X-axis
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisTitleTextStyle"): string;
+
+	/**
+	 * Sets CSS font property for title on X-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisTitleTextStyle", optionValue: string): void;
+
+	/**
+	 * Gets  CSS font property for title on Y-axis
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisTitleTextStyle"): string;
+
+	/**
+	 * Sets CSS font property for title on Y-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisTitleTextStyle", optionValue: string): void;
+
+	/**
+	 * Gets  the format for labels along the X-axis.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisLabel"): any;
+
+	/**
+	 * Sets the format for labels along the X-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisLabel", optionValue: any): void;
+
+	/**
+	 * Gets  the format for labels along the Y-axis.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisLabel"): any;
+
+	/**
+	 * Sets the format for labels along the Y-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisLabel", optionValue: any): void;
+
+	/**
+	 * Gets  the color to apply to major gridlines along the X-axis.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisMajorStroke"): string;
+
+	/**
+	 * Sets the color to apply to major gridlines along the X-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisMajorStroke", optionValue: string): void;
+
+	/**
+	 * Gets  the color to apply to major gridlines along the Y-axis.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisMajorStroke"): string;
+
+	/**
+	 * Sets the color to apply to major gridlines along the Y-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisMajorStroke", optionValue: string): void;
+
+	/**
+	 * Gets  the thickness to apply to major gridlines along the X-axis.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisMajorStrokeThickness"): number;
+
+	/**
+	 * Sets the thickness to apply to major gridlines along the X-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisMajorStrokeThickness", optionValue: number): void;
+
+	/**
+	 * Gets  the thickness to apply to major gridlines along the Y-axis.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisMajorStrokeThickness"): number;
+
+	/**
+	 * Sets the thickness to apply to major gridlines along the Y-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisMajorStrokeThickness", optionValue: number): void;
+
+	/**
+	 * Gets  the thickness to apply to minor gridlines along the X-axis.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisMinorStrokeThickness"): number;
+
+	/**
+	 * Sets the thickness to apply to minor gridlines along the X-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisMinorStrokeThickness", optionValue: number): void;
+
+	/**
+	 * Gets  the thickness to apply to minor gridlines along the Y-axis.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisMinorStrokeThickness"): number;
+
+	/**
+	 * Sets the thickness to apply to minor gridlines along the Y-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisMinorStrokeThickness", optionValue: number): void;
+
+	/**
+	 * Gets  the color to apply to stripes along the X-axis.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisStrip"): string;
+
+	/**
+	 * Sets the color to apply to stripes along the X-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisStrip", optionValue: string): void;
+
+	/**
+	 * Gets  the color to apply to stripes along the Y-axis.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisStrip"): string;
+
+	/**
+	 * Sets the color to apply to stripes along the Y-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisStrip", optionValue: string): void;
+
+	/**
+	 * Gets  the color to apply to the X-axis line.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisStroke"): string;
+
+	/**
+	 * Sets the color to apply to the X-axis line.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisStroke", optionValue: string): void;
+
+	/**
+	 * Gets  the color to apply to the Y-axis line.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisStroke"): string;
+
+	/**
+	 * Sets the color to apply to the Y-axis line.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisStroke", optionValue: string): void;
+
+	/**
+	 * Gets  the thickness to apply to the X-axis line.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisStrokeThickness"): number;
+
+	/**
+	 * Sets the thickness to apply to the X-axis line.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisStrokeThickness", optionValue: number): void;
+
+	/**
+	 * Gets  the thickness to apply to the Y-axis line.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisStrokeThickness"): number;
+
+	/**
+	 * Sets the thickness to apply to the Y-axis line.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisStrokeThickness", optionValue: number): void;
+
+	/**
+	 * Gets  the length of tickmarks along the X-axis.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisTickLength"): number;
+
+	/**
+	 * Sets the length of tickmarks along the X-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisTickLength", optionValue: number): void;
+
+	/**
+	 * Gets  the length of tickmarks along the Y-axis.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisTickLength"): number;
+
+	/**
+	 * Sets the length of tickmarks along the Y-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisTickLength", optionValue: number): void;
+
+	/**
+	 * Gets  the color to apply to tickmarks along the X-axis.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisTickStroke"): string;
+
+	/**
+	 * Sets the color to apply to tickmarks along the X-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisTickStroke", optionValue: string): void;
+
+	/**
+	 * Gets  the color to apply to tickmarks along the Y-axis.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisTickStroke"): string;
+
+	/**
+	 * Sets the color to apply to tickmarks along the Y-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisTickStroke", optionValue: string): void;
+
+	/**
+	 * Gets  the thickness to apply to tickmarks along the X-axis.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisTickStrokeThickness"): number;
+
+	/**
+	 * Sets the thickness to apply to tickmarks along the X-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisTickStrokeThickness", optionValue: number): void;
+
+	/**
+	 * Gets  the thickness to apply to tickmarks along the Y-axis.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisTickStrokeThickness"): number;
+
+	/**
+	 * Sets the thickness to apply to tickmarks along the Y-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisTickStrokeThickness", optionValue: number): void;
+
+	/**
+	 * Gets  the Text to display below the X-axis.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisTitle"): string;
+
+	/**
+	 * Sets the Text to display below the X-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisTitle", optionValue: string): void;
+
+	/**
+	 * Gets  the Text to display to the left of the Y-axis.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisTitle"): string;
+
+	/**
+	 * Sets the Text to display to the left of the Y-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisTitle", optionValue: string): void;
+
+	/**
+	 * Gets  the color to apply to minor gridlines along the X-axis.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisMinorStroke"): string;
+
+	/**
+	 * Sets the color to apply to minor gridlines along the X-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisMinorStroke", optionValue: string): void;
+
+	/**
+	 * Gets  the color to apply to minor gridlines along the Y-axis.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisMinorStroke"): string;
+
+	/**
+	 * Sets the color to apply to minor gridlines along the Y-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisMinorStroke", optionValue: string): void;
+
+	/**
+	 * Gets  the angle of rotation for labels along the X-axis.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisLabelAngle"): number;
+
+	/**
+	 * Sets the angle of rotation for labels along the X-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisLabelAngle", optionValue: number): void;
+
+	/**
+	 * Gets  the angle of rotation for labels along the Y-axis.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisLabelAngle"): number;
+
+	/**
+	 * Sets the angle of rotation for labels along the Y-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisLabelAngle", optionValue: number): void;
+
+	/**
+	 * Gets  the distance between the X-axis and the bottom of the chart.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisExtent"): number;
+
+	/**
+	 * Sets the distance between the X-axis and the bottom of the chart.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisExtent", optionValue: number): void;
+
+	/**
+	 * Gets  the distance between the Y-axis and the left edge of the chart.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisExtent"): number;
+
+	/**
+	 * Sets the distance between the Y-axis and the left edge of the chart.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisExtent", optionValue: number): void;
+
+	/**
+	 * Gets  the angle of rotation for the X-axis title.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisTitleAngle"): number;
+
+	/**
+	 * Sets the angle of rotation for the X-axis title.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisTitleAngle", optionValue: number): void;
+
+	/**
+	 * Gets  the angle of rotation for the Y-axis title.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisTitleAngle"): number;
+
+	/**
+	 * Sets the angle of rotation for the Y-axis title.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisTitleAngle", optionValue: number): void;
+
+	/**
+	 * Gets  whether to invert the direction of the X-axis by placing the first data items on the right side of the chart.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisInverted"): boolean;
+
+	/**
+	 * Sets whether to invert the direction of the X-axis by placing the first data items on the right side of the chart.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisInverted", optionValue: boolean): void;
+
+	/**
+	 * Gets  whether to invert the direction of the Y-axis by placing the minimum numeric value at the top of the chart.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisInverted"): boolean;
+
+	/**
+	 * Sets whether to invert the direction of the Y-axis by placing the minimum numeric value at the top of the chart.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisInverted", optionValue: boolean): void;
+
+	/**
+	 * Gets  Horizontal alignment of the X-axis title.
+	 */
+
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisTitleAlignment"): string;
+
+	/**
+	 * Sets Horizontal alignment of the X-axis title.
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisTitleAlignment", optionValue: string): void;
+
+	/**
+	 * Gets  Vertical alignment of the Y-axis title.
+	 */
+
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisTitleAlignment"): string;
+
+	/**
+	 * Sets Vertical alignment of the Y-axis title.
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisTitleAlignment", optionValue: string): void;
+
+	/**
+	 * Gets  Horizontal alignment of X-axis labels.
+	 */
+
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisLabelHorizontalAlignment"): string;
+
+	/**
+	 * Sets Horizontal alignment of X-axis labels.
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisLabelHorizontalAlignment", optionValue: string): void;
+
+	/**
+	 * Gets  Horizontal alignment of Y-axis labels.
+	 */
+
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisLabelHorizontalAlignment"): string;
+
+	/**
+	 * Sets Horizontal alignment of Y-axis labels.
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisLabelHorizontalAlignment", optionValue: string): void;
+
+	/**
+	 * Gets  Vertical alignment of X-axis labels.
+	 */
+
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisLabelVerticalAlignment"): string;
+
+	/**
+	 * Sets Vertical alignment of X-axis labels.
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisLabelVerticalAlignment", optionValue: string): void;
+
+	/**
+	 * Gets  Vertical alignment of Y-axis labels.
+	 */
+
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisLabelVerticalAlignment"): string;
+
+	/**
+	 * Sets Vertical alignment of Y-axis labels.
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisLabelVerticalAlignment", optionValue: string): void;
+
+	/**
+	 * Gets  Visibility of X-axis labels.
+	 */
+
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisLabelVisibility"): string;
+
+	/**
+	 * Sets Visibility of X-axis labels.
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisLabelVisibility", optionValue: string): void;
+
+	/**
+	 * Gets  Visibility of Y-axis labels.
+	 */
+
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisLabelVisibility"): string;
+
+	/**
+	 * Sets Visibility of Y-axis labels.
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisLabelVisibility", optionValue: string): void;
+
+	/**
+	 * The location of Y-axis labels, relative to the plot area.
+	 */
+
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisLabelLocation"): string;
+
+	/**
+	 * The location of Y-axis labels, relative to the plot area.
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisLabelLocation", optionValue: string): void;
+	igFinancialChart(optionLiteral: 'option', optionName: "rangeSelectorTemplate"): any;
+	igFinancialChart(optionLiteral: 'option', optionName: "rangeSelectorTemplate", optionValue: any): void;
+	igFinancialChart(optionLiteral: 'option', optionName: "toolbarTemplate"): any;
+	igFinancialChart(optionLiteral: 'option', optionName: "toolbarTemplate", optionValue: any): void;
+	igFinancialChart(optionLiteral: 'option', optionName: "chartTypePickerTemplate"): any;
+	igFinancialChart(optionLiteral: 'option', optionName: "chartTypePickerTemplate", optionValue: any): void;
+	igFinancialChart(optionLiteral: 'option', optionName: "trendLineTypePickerTemplate"): any;
+	igFinancialChart(optionLiteral: 'option', optionName: "trendLineTypePickerTemplate", optionValue: any): void;
+	igFinancialChart(optionLiteral: 'option', optionName: "volumeTypePickerTemplate"): any;
+	igFinancialChart(optionLiteral: 'option', optionName: "volumeTypePickerTemplate", optionValue: any): void;
+	igFinancialChart(optionLiteral: 'option', optionName: "indicatorPickerTemplate"): any;
+	igFinancialChart(optionLiteral: 'option', optionName: "indicatorPickerTemplate", optionValue: any): void;
+	igFinancialChart(optionLiteral: 'option', optionName: "overlayPickerTemplate"): any;
+	igFinancialChart(optionLiteral: 'option', optionName: "overlayPickerTemplate", optionValue: any): void;
+	igFinancialChart(optionLiteral: 'option', optionName: "toolbarHeight"): number;
+	igFinancialChart(optionLiteral: 'option', optionName: "toolbarHeight", optionValue: number): void;
+
+	/**
+	 * Gets  whether the Y-axis should use a logarithmic scale instead of a linear one.
+	 * Since log(-1) is imaginary and log(0) is undefined, it is recommended to enable this property only when the Y-axis minimum is greater than zero.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisIsLogarithmic"): boolean;
+
+	/**
+	 * Sets whether the Y-axis should use a logarithmic scale instead of a linear one.
+	 * Since log(-1) is imaginary and log(0) is undefined, it is recommended to enable this property only when the Y-axis minimum is greater than zero.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisIsLogarithmic", optionValue: boolean): void;
+
+	/**
+	 * Gets  the base value to use in the log function when mapping the position of data items along the Y-axis.
+	 * This property is effective only when YAxisIsLogarithmic is true.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisLogarithmBase"): number;
+
+	/**
+	 * Sets the base value to use in the log function when mapping the position of data items along the Y-axis.
+	 * This property is effective only when YAxisIsLogarithmic is true.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisLogarithmBase", optionValue: number): void;
+
+	/**
+	 * Gets  the distance between each label and grid line along the Y-axis.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisInterval"): number;
+
+	/**
+	 * Sets the distance between each label and grid line along the Y-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisInterval", optionValue: number): void;
+
+	/**
+	 * Gets  the data value corresponding to the minimum value of the Y-axis.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisMinimumValue"): number;
+
+	/**
+	 * Sets the data value corresponding to the minimum value of the Y-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisMinimumValue", optionValue: number): void;
+
+	/**
+	 * Gets  the data value corresponding to the maximum value of the Y-axis.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisMaximumValue"): number;
+
+	/**
+	 * Sets the data value corresponding to the maximum value of the Y-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisMaximumValue", optionValue: number): void;
+
+	/**
+	 * Gets  the frequency of displayed minor lines along the Y-axis.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisMinorInterval"): number;
+
+	/**
+	 * Sets the frequency of displayed minor lines along the Y-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisMinorInterval", optionValue: number): void;
+
+	/**
+	 * The type of series to display in the volume pane.
+	 */
+
+	igFinancialChart(optionLiteral: 'option', optionName: "volumeType"): string;
+
+	/**
+	 * The type of series to display in the volume pane.
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igFinancialChart(optionLiteral: 'option', optionName: "volumeType", optionValue: string): void;
+
+	/**
+	 * The scaling mode of the X-axis.
+	 */
+
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisMode"): string;
+
+	/**
+	 * The scaling mode of the X-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igFinancialChart(optionLiteral: 'option', optionName: "xAxisMode", optionValue: string): void;
+
+	/**
+	 * The scaling mode of the Y-axis.
+	 */
+
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisMode"): string;
+
+	/**
+	 * The scaling mode of the Y-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisMode", optionValue: string): void;
+
+	/**
+	 * A boolean property controlling the visibility of the toolbar.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "isToolbarVisible"): boolean;
+
+	/**
+	 * A boolean property controlling the visibility of the toolbar.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "isToolbarVisible", optionValue: boolean): void;
+
+	/**
+	 * The type of price series to display in the main chart.
+	 */
+
+	igFinancialChart(optionLiteral: 'option', optionName: "chartType"): string;
+
+	/**
+	 * The type of price series to display in the main chart.
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igFinancialChart(optionLiteral: 'option', optionName: "chartType", optionValue: string): void;
+
+	/**
+	 * A boolean indicating whether the chart should automatically zoom in vertically on the currently visible range of data.
+	 * When this property is set to true, panning and zooming along the X-axis will result in a corresponding zoom on the Y-axis, so that the visible range of data fills the zoom window as fully as possible.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "isWindowSyncedToVisibleRange"): boolean;
+
+	/**
+	 * A boolean indicating whether the chart should automatically zoom in vertically on the currently visible range of data.
+	 * When this property is set to true, panning and zooming along the X-axis will result in a corresponding zoom on the Y-axis, so that the visible range of data fills the zoom window as fully as possible.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "isWindowSyncedToVisibleRange", optionValue: boolean): void;
+
+	/**
+	 * A collection indicating what financial indicator types to display on the Financial Chart.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "indicatorTypes"): any;
+
+	/**
+	 * A collection indicating what financial indicator types to display on the Financial Chart.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "indicatorTypes", optionValue: any): void;
+
+	/**
+	 * A collection indicating what financial overlay types to display on the Financial Chart.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "overlayTypes"): any;
+
+	/**
+	 * A collection indicating what financial overlay types to display on the Financial Chart.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "overlayTypes", optionValue: any): void;
+
+	/**
+	 * Gets  whether the large numbers on the Y-axis labels are abbreviated.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisAbbreviateLargeNumbers"): boolean;
+
+	/**
+	 * Sets whether the large numbers on the Y-axis labels are abbreviated.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "yAxisAbbreviateLargeNumbers", optionValue: boolean): void;
+
+	/**
+	 * The type of series to display in the zoom slider pane.
+	 */
+
+	igFinancialChart(optionLiteral: 'option', optionName: "zoomSliderType"): string;
+
+	/**
+	 * The type of series to display in the zoom slider pane.
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igFinancialChart(optionLiteral: 'option', optionName: "zoomSliderType", optionValue: string): void;
+
+	/**
+	 * Gets  the palette used for coloring negative items of Waterfall chart type.
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "negativeBrushes"): any;
+
+	/**
+	 * Sets the palette used for coloring negative items of Waterfall chart type.
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "negativeBrushes", optionValue: any): void;
+
+	/**
+	 * Brushes to use for drawing negative elements, when using a chart type with contextual coloring, such as Waterfall.
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "negativeOutlines"): any;
+
+	/**
+	 * Brushes to use for drawing negative elements, when using a chart type with contextual coloring, such as Waterfall.
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "negativeOutlines", optionValue: any): void;
+
+	/**
+	 * Brushes to use for filling financial overlays.
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "overlayBrushes"): any;
+
+	/**
+	 * Brushes to use for filling financial overlays.
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "overlayBrushes", optionValue: any): void;
+
+	/**
+	 * Brushes to use for outlining financial overlays.
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "overlayOutlines"): any;
+
+	/**
+	 * Brushes to use for outlining financial overlays.
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "overlayOutlines", optionValue: any): void;
+
+	/**
+	 * Brushes to use for outlining volume series in the volume pane.
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "volumeOutlines"): any;
+
+	/**
+	 * Brushes to use for outlining volume series in the volume pane.
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "volumeOutlines", optionValue: any): void;
+
+	/**
+	 * Brushes to use for filling volume series in the volume pane.
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "volumeBrushes"): any;
+
+	/**
+	 * Brushes to use for filling volume series in the volume pane.
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "volumeBrushes", optionValue: any): void;
+
+	/**
+	 * Brushes to use for negative elements in financial indicators.
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "indicatorNegativeBrushes"): any;
+
+	/**
+	 * Brushes to use for negative elements in financial indicators.
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "indicatorNegativeBrushes", optionValue: any): void;
+
+	/**
+	 * Brushes to use for financial indicators.
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "indicatorBrushes"): any;
+
+	/**
+	 * Brushes to use for financial indicators.
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "indicatorBrushes", optionValue: any): void;
+
+	/**
+	 * The outline thickness of volume series in the volume pane.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "volumeThickness"): number;
+
+	/**
+	 * The outline thickness of volume series in the volume pane.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "volumeThickness", optionValue: number): void;
+
+	/**
+	 * The outline thickness of financial overlays.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "overlayThickness"): number;
+
+	/**
+	 * The outline thickness of financial overlays.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "overlayThickness", optionValue: number): void;
+
+	/**
+	 * The outline or stroke thickness of financial indicators.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "indicatorThickness"): number;
+
+	/**
+	 * The outline or stroke thickness of financial indicators.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "indicatorThickness", optionValue: number): void;
+
+	/**
+	 * The display types of financial indicators.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "indicatorDisplayTypes"): any;
+
+	/**
+	 * The display types of financial indicators.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "indicatorDisplayTypes", optionValue: any): void;
+
+	/**
+	 * The period of financial indicators, where applicable.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "indicatorPeriod"): number;
+
+	/**
+	 * The period of financial indicators, where applicable.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "indicatorPeriod", optionValue: number): void;
+
+	/**
+	 * The multiplier of financial indicators, where applicable.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "indicatorMultiplier"): number;
+
+	/**
+	 * The multiplier of financial indicators, where applicable.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "indicatorMultiplier", optionValue: number): void;
+
+	/**
+	 * The smoothing period of financial indicators, where applicable.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "indicatorSmoothingPeriod"): number;
+
+	/**
+	 * The smoothing period of financial indicators, where applicable.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "indicatorSmoothingPeriod", optionValue: number): void;
+
+	/**
+	 * The short period of financial indicators, where applicable.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "indicatorShortPeriod"): number;
+
+	/**
+	 * The short period of financial indicators, where applicable.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "indicatorShortPeriod", optionValue: number): void;
+
+	/**
+	 * The long period of financial indicators, where applicable.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "indicatorLongPeriod"): number;
+
+	/**
+	 * The long period of financial indicators, where applicable.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "indicatorLongPeriod", optionValue: number): void;
+
+	/**
+	 * The signal period of financial indicators, where applicable.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "indicatorSignalPeriod"): number;
+
+	/**
+	 * The signal period of financial indicators, where applicable.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "indicatorSignalPeriod", optionValue: number): void;
+
+	/**
+	 * A FinancialChartRangeSelectorOptionCollection containing the available range selector options on the toolbar.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "rangeSelectorOptions"): any;
+
+	/**
+	 * A FinancialChartRangeSelectorOptionCollection containing the available range selector options on the toolbar.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "rangeSelectorOptions", optionValue: any): void;
+
+	/**
+	 * A FinancialChartRangeSelectorOptionCollection containing the available range selector options on the toolbar.
+	 * This will be the intersection of the user-defined range selector options, if any, and the range selector options which are automatically determined based on the range of data.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "actualRangeSelectorOptions"): any;
+
+	/**
+	 * A FinancialChartRangeSelectorOptionCollection containing the available range selector options on the toolbar.
+	 * This will be the intersection of the user-defined range selector options, if any, and the range selector options which are automatically determined based on the range of data.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "actualRangeSelectorOptions", optionValue: any): void;
+
+	/**
+	 * The names of custom indicators to add to the chart.
+	 * When CustomIndicatorNames is set, the ApplyCustomIndicators event will be raised for each custom indicator name.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "customIndicatorNames"): any;
+
+	/**
+	 * The names of custom indicators to add to the chart.
+	 * When CustomIndicatorNames is set, the ApplyCustomIndicators event will be raised for each custom indicator name.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "customIndicatorNames", optionValue: any): void;
+
+	/**
+	 * The width of the chart.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "width"): number;
+
+	/**
+	 * The width of the chart.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "width", optionValue: number): void;
+
+	/**
+	 * The height of the chart.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "height"): number;
+
+	/**
+	 * The height of the chart.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "height", optionValue: number): void;
+
+	/**
+	 * Gets  maximum number of displayed records in chart.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "maxRecCount"): number;
+
+	/**
+	 * Sets maximum number of displayed records in chart.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "maxRecCount", optionValue: number): void;
+
+	/**
+	 * Gets  a valid data source.
+	 * That can be instance of array or primitives, array of objects, instance of $.ig.DataSource, or any other data accepted by $.ig.DataSource.
+	 * Note: if it is set to string and "dataSourceType" option is not set, then $.ig.JSONPDataSource is used.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "dataSource"): any;
+
+	/**
+	 * Sets a valid data source.
+	 * That can be instance of array or primitives, array of objects, instance of $.ig.DataSource, or any other data accepted by $.ig.DataSource.
+	 * Note: if it is set to string and "dataSourceType" option is not set, then $.ig.JSONPDataSource is used.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "dataSource", optionValue: any): void;
+
+	/**
+	 * Gets  data source type (such as "json", "xml", etc). Please refer to the documentation of $.ig.DataSource and its type property
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "dataSourceType"): string;
+
+	/**
+	 * Sets data source type (such as "json", "xml", etc). Please refer to the documentation of $.ig.DataSource and its type property
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "dataSourceType", optionValue: string): void;
+
+	/**
+	 * Gets  url which is used for sending JSON on request for remote data.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "dataSourceUrl"): string;
+
+	/**
+	 * Sets url which is used for sending JSON on request for remote data.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "dataSourceUrl", optionValue: string): void;
+
+	/**
+	 * See $.ig.DataSource. property in the response specifying the total number of records on the server.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "responseTotalRecCountKey"): string;
+
+	/**
+	 * See $.ig.DataSource. property in the response specifying the total number of records on the server.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "responseTotalRecCountKey", optionValue: string): void;
+
+	/**
+	 * See $.ig.DataSource. This is basically the property in the responses where data records are held, if the response is wrapped.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "responseDataKey"): string;
+
+	/**
+	 * See $.ig.DataSource. This is basically the property in the responses where data records are held, if the response is wrapped.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "responseDataKey", optionValue: string): void;
+
+	/**
+	 * Event raised when a property value is changed on this chart
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "propertyChanged"): PropertyChangedEvent;
+
+	/**
+	 * Event raised when a property value is changed on this chart
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "propertyChanged", optionValue: PropertyChangedEvent): void;
+
+	/**
+	 * Event raised when a series is initialized and added to this chart.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "seriesAdded"): SeriesAddedEvent;
+
+	/**
+	 * Event raised when a series is initialized and added to this chart.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "seriesAdded", optionValue: SeriesAddedEvent): void;
+
+	/**
+	 * Event raised when a series is removed from this chart.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "seriesRemoved"): SeriesRemovedEvent;
+
+	/**
+	 * Event raised when a series is removed from this chart.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "seriesRemoved", optionValue: SeriesRemovedEvent): void;
+
+	/**
+	 * Occurs when the pointer enters a Series.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "seriesPointerEnter"): SeriesPointerEnterEvent;
+
+	/**
+	 * Occurs when the pointer enters a Series.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "seriesPointerEnter", optionValue: SeriesPointerEnterEvent): void;
+
+	/**
+	 * Occurs when the pointer leaves a Series.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "seriesPointerLeave"): SeriesPointerLeaveEvent;
+
+	/**
+	 * Occurs when the pointer leaves a Series.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "seriesPointerLeave", optionValue: SeriesPointerLeaveEvent): void;
+
+	/**
+	 * Occurs when the pointer moves over a Series.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "seriesPointerMove"): SeriesPointerMoveEvent;
+
+	/**
+	 * Occurs when the pointer moves over a Series.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "seriesPointerMove", optionValue: SeriesPointerMoveEvent): void;
+
+	/**
+	 * Occurs when the pointer is pressed down over a Series.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "seriesPointerDown"): SeriesPointerDownEvent;
+
+	/**
+	 * Occurs when the pointer is pressed down over a Series.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "seriesPointerDown", optionValue: SeriesPointerDownEvent): void;
+
+	/**
+	 * Occurs when the pointer is released over a Series.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "seriesPointerUp"): SeriesPointerUpEvent;
+
+	/**
+	 * Occurs when the pointer is released over a Series.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "seriesPointerUp", optionValue: SeriesPointerUpEvent): void;
+
+	/**
+	 * Event raised by the chart when custom indicator data is needed from the application.
+	 * During series rendering, event will be raised once for each value in the CustomIndicatorNames collection.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "applyCustomIndicators"): ApplyCustomIndicatorsEvent;
+
+	/**
+	 * Event raised by the chart when custom indicator data is needed from the application.
+	 * During series rendering, event will be raised once for each value in the CustomIndicatorNames collection.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "applyCustomIndicators", optionValue: ApplyCustomIndicatorsEvent): void;
+
+	/**
+	 * Event which is raised before data binding.
+	 * Return false in order to cancel data binding.
+	 * Function takes first argument null and second argument ui.
+	 * Use ui.owner to obtain reference to chart widget.
+	 * Use ui.dataSource to obtain reference to instance of $.ig.DataSource.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "dataBinding"): DataBindingEvent;
+
+	/**
+	 * Event which is raised before data binding.
+	 * Return false in order to cancel data binding.
+	 * Function takes first argument null and second argument ui.
+	 * Use ui.owner to obtain reference to chart widget.
+	 * Use ui.dataSource to obtain reference to instance of $.ig.DataSource.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "dataBinding", optionValue: DataBindingEvent): void;
+
+	/**
+	 * Event which is raised after data binding.
+	 * Function takes first argument null and second argument ui.
+	 * Use ui.owner to obtain reference to chart widget.
+	 * Use ui.data to obtain reference to array actual data which is displayed by chart.
+	 * Use ui.dataSource to obtain reference to instance of $.ig.DataSource.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "dataBound"): DataBoundEvent;
+
+	/**
+	 * Event which is raised after data binding.
+	 * Function takes first argument null and second argument ui.
+	 * Use ui.owner to obtain reference to chart widget.
+	 * Use ui.data to obtain reference to array actual data which is displayed by chart.
+	 * Use ui.dataSource to obtain reference to instance of $.ig.DataSource.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "dataBound", optionValue: DataBoundEvent): void;
+
+	/**
+	 * Event which is raised before tooltip is updated.
+	 * Return false in order to cancel updating and hide tooltip.
+	 * Function takes first argument null and second argument ui.
+	 * Use ui.owner to obtain reference to chart widget.
+	 * Use ui.text to obtain html of tooltip. Value of that member can be modified. If modified value is null or empty string, then current content of tooltip keeps old value.
+	 * Use ui.item to obtain reference to item. Value of that member can be modified or replaced by custom item.
+	 * Use ui.x to obtain left position of tooltip in pixels relative to widget. Value of that member can be modified.
+	 * Use ui.y to obtain top position of tooltip in pixels relative to widget. Value of that member can be modified.
+	 * Use ui.element to obtain reference to jquery object which represents tooltip. Value of that member can be replaced by custom element.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "updateTooltip"): UpdateTooltipEvent;
+
+	/**
+	 * Event which is raised before tooltip is updated.
+	 * Return false in order to cancel updating and hide tooltip.
+	 * Function takes first argument null and second argument ui.
+	 * Use ui.owner to obtain reference to chart widget.
+	 * Use ui.text to obtain html of tooltip. Value of that member can be modified. If modified value is null or empty string, then current content of tooltip keeps old value.
+	 * Use ui.item to obtain reference to item. Value of that member can be modified or replaced by custom item.
+	 * Use ui.x to obtain left position of tooltip in pixels relative to widget. Value of that member can be modified.
+	 * Use ui.y to obtain top position of tooltip in pixels relative to widget. Value of that member can be modified.
+	 * Use ui.element to obtain reference to jquery object which represents tooltip. Value of that member can be replaced by custom element.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "updateTooltip", optionValue: UpdateTooltipEvent): void;
+
+	/**
+	 * Event which is raised before tooltip is hidden.
+	 * Return false in order to cancel hiding and keep tooltip visible.
+	 * Function takes first argument null and second argument ui.
+	 * Use ui.owner to obtain reference to chart widget.
+	 * Use ui.item to obtain reference to item.
+	 * Use ui.element to obtain reference to jquery object which represents tooltip or value of ui.element from last updateTooltip event. Value of that member can be replaced by custom element.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "hideTooltip"): HideTooltipEvent;
+
+	/**
+	 * Event which is raised before tooltip is hidden.
+	 * Return false in order to cancel hiding and keep tooltip visible.
+	 * Function takes first argument null and second argument ui.
+	 * Use ui.owner to obtain reference to chart widget.
+	 * Use ui.item to obtain reference to item.
+	 * Use ui.element to obtain reference to jquery object which represents tooltip or value of ui.element from last updateTooltip event. Value of that member can be replaced by custom element.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "hideTooltip", optionValue: HideTooltipEvent): void;
+	igFinancialChart(options: IgFinancialChart): JQuery;
+	igFinancialChart(optionLiteral: 'option', optionName: string): any;
+	igFinancialChart(optionLiteral: 'option', options: IgFinancialChart): JQuery;
+	igFinancialChart(optionLiteral: 'option', optionName: string, optionValue: any): JQuery;
+	igFinancialChart(methodName: string, ...methodParams: any[]): any;
+}
 interface SliceClickedEvent {
 	(event: Event, ui: SliceClickedEventUIParam): void;
 }
@@ -37104,6 +42931,7 @@ interface JQuery {
 interface IgGridAppendRowsOnDemandLocale {
 	/**
 	 * Specifies caption text for the "load more data" button.
+	 *
 	 */
 	loadMoreDataButtonText?: string;
 
@@ -37164,6 +42992,7 @@ interface IgGridAppendRowsOnDemand {
 	/**
 	 * Defines local or remote type of appending rows on demand in igGrid
 	 *
+	 *
 	 * Valid values:
 	 * "remote" request data from the remote endpoint
 	 * "local" loading data on the client-side
@@ -37172,37 +43001,44 @@ interface IgGridAppendRowsOnDemand {
 
 	/**
 	 * Default number of records per chunk
+	 *
 	 */
 	chunkSize?: number;
 
 	/**
 	 * The property in the response that will hold the total number of records in the data source
+	 *
 	 */
 	recordCountKey?: string;
 
 	/**
 	 * Denotes the name of the encoded URL parameter that will state what is the currently requested chunk size
+	 *
 	 */
 	chunkSizeUrlKey?: string;
 
 	/**
 	 * Denotes the name of the encoded URL parameter that will state what is the currently requested chunk index
+	 *
 	 */
 	chunkIndexUrlKey?: string;
 
 	/**
 	 * Initial chunk index position
+	 *
 	 */
 	defaultChunkIndex?: number;
 
 	/**
 	 * Current chunk index position
+	 *
 	 */
 	currentChunkIndex?: number;
 
 	/**
 	 * denotes the append rows on demand request method
 	 *
+	 *
 	 * Valid values:
 	 * "auto" new record will be appended to the grid while the user scrolls the scrollbar
 	 * "button" a button will be rendered at the bottom of the grid. The user should press it to load more rows
@@ -37253,6 +43089,7 @@ interface JQuery {
 
 	/**
 	 * Defines local or remote type of appending rows on demand in igGrid
+	 *
 	 */
 
 	igGridAppendRowsOnDemand(optionLiteral: 'option', optionName: "type"): string;
@@ -37260,6 +43097,7 @@ interface JQuery {
 	/**
 	 * Defines local or remote type of appending rows on demand in igGrid
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -37267,78 +43105,91 @@ interface JQuery {
 
 	/**
 	 * Default number of records per chunk
+	 *
 	 */
 	igGridAppendRowsOnDemand(optionLiteral: 'option', optionName: "chunkSize"): number;
 
 	/**
 	 * Default number of records per chunk
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridAppendRowsOnDemand(optionLiteral: 'option', optionName: "chunkSize", optionValue: number): void;
 
 	/**
 	 * The property in the response that will hold the total number of records in the data source
+	 *
 	 */
 	igGridAppendRowsOnDemand(optionLiteral: 'option', optionName: "recordCountKey"): string;
 
 	/**
 	 * The property in the response that will hold the total number of records in the data source
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridAppendRowsOnDemand(optionLiteral: 'option', optionName: "recordCountKey", optionValue: string): void;
 
 	/**
 	 * Denotes the name of the encoded URL parameter that will state what is the currently requested chunk size
+	 *
 	 */
 	igGridAppendRowsOnDemand(optionLiteral: 'option', optionName: "chunkSizeUrlKey"): string;
 
 	/**
 	 * Denotes the name of the encoded URL parameter that will state what is the currently requested chunk size
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridAppendRowsOnDemand(optionLiteral: 'option', optionName: "chunkSizeUrlKey", optionValue: string): void;
 
 	/**
 	 * Denotes the name of the encoded URL parameter that will state what is the currently requested chunk index
+	 *
 	 */
 	igGridAppendRowsOnDemand(optionLiteral: 'option', optionName: "chunkIndexUrlKey"): string;
 
 	/**
 	 * Denotes the name of the encoded URL parameter that will state what is the currently requested chunk index
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridAppendRowsOnDemand(optionLiteral: 'option', optionName: "chunkIndexUrlKey", optionValue: string): void;
 
 	/**
 	 * Initial chunk index position
+	 *
 	 */
 	igGridAppendRowsOnDemand(optionLiteral: 'option', optionName: "defaultChunkIndex"): number;
 
 	/**
 	 * Initial chunk index position
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridAppendRowsOnDemand(optionLiteral: 'option', optionName: "defaultChunkIndex", optionValue: number): void;
 
 	/**
 	 * Current chunk index position
+	 *
 	 */
 	igGridAppendRowsOnDemand(optionLiteral: 'option', optionName: "currentChunkIndex"): number;
 
 	/**
 	 * Current chunk index position
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridAppendRowsOnDemand(optionLiteral: 'option', optionName: "currentChunkIndex", optionValue: number): void;
 
 	/**
 	 * Denotes the append rows on demand request method
+	 *
 	 */
 
 	igGridAppendRowsOnDemand(optionLiteral: 'option', optionName: "loadTrigger"): string;
@@ -37346,6 +43197,7 @@ interface JQuery {
 	/**
 	 * Denotes the append rows on demand request method
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -37401,17 +43253,20 @@ interface JQuery {
 interface IgGridCellMergingColumnSetting {
 	/**
 	 * Column index. This is a required property in every column setting if columnKey is not set.
+	 *
 	 */
 	columnIndex?: number;
 
 	/**
 	 * Column key. This is a required property in every column setting if columnIndex is not set.
+	 *
 	 */
 	columnKey?: string;
 
 	/**
 	 * Defines when merging should be applied.
 	 *
+	 *
 	 * Valid values:
 	 * "sorting" The column will only be merged when sorted
 	 * "always" The column will always be merged
@@ -37422,6 +43277,7 @@ interface IgGridCellMergingColumnSetting {
 	/**
 	 * Defines the rules merging is based on.
 	 *
+	 *
 	 * Valid values:
 	 * "duplicate" Duplicate values in the column will be merged together.
 	 * "null" Merging will be applied for each subsequent null value after a non-null value.
@@ -37525,6 +43381,7 @@ interface IgGridCellMerging {
 	/**
 	 * Defines the type of merging.
 	 *
+	 *
 	 * Valid values:
 	 * "visual" the grid cells will be merged only visually
 	 * "physical" the grid cell will be merged physically throughout rowspan
@@ -37534,6 +43391,7 @@ interface IgGridCellMerging {
 	/**
 	 * Defines when merging should be applied.
 	 *
+	 *
 	 * Valid values:
 	 * "sorting" Only sorted columns will have merging applied
 	 * "always" Merging will be applied to all columns always
@@ -37544,6 +43402,7 @@ interface IgGridCellMerging {
 	/**
 	 * Defines the rules merging is based on.
 	 *
+	 *
 	 * Valid values:
 	 * "duplicate" Duplicate values in the column will be merged together.
 	 * "null" Merging will be applied for each subsequent null value after a non-null value.
@@ -37552,6 +43411,7 @@ interface IgGridCellMerging {
 
 	/**
 	 * A list of column settings that specifies hiding options on a per column basis.
+	 *
 	 */
 	columnSettings?: IgGridCellMergingColumnSetting[];
 
@@ -37560,6 +43420,24 @@ interface IgGridCellMerging {
 	 */
 	inherit?: boolean;
 
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	locale?: any;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	language?: string;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+	regional?: string|Object;
+
 	/**
 	 * Event fired before a new merged cells group is created.
 	 */
@@ -37572,6 +43450,9 @@ interface IgGridCellMerging {
 	[optionName: string]: any;
 }
 interface IgGridCellMergingMethods {
+	changeGlobalLanguage(): void;
+	changeGlobalRegional(): void;
+
 	/**
 	 * Removes all igGridCellMerging UI changes and destroys the widget
 	 */
@@ -37598,19 +43479,31 @@ interface IgGridCellMergingMethods {
 	 * @param column The column index or column key to get the state for.
 	 */
 	isMerged(column: Object): boolean;
+
+	/**
+	 * Changes the all locales contained into a specified container to the language specified in [options.language](ui.igwidget#options:language)
+	 * Note that this method is for rare scenarios, use [language](ui.igwidget#options:language) or [locale](ui.igwidget#options:locale) option setter
+	 *
+	 * @param $container Optional parameter - if not set it would use the element of the widget as $container
+	 */
+	changeLocale($container: Object): void;
 }
 interface JQuery {
 	data(propertyName: "igGridCellMerging"): IgGridCellMergingMethods;
 }
 
 interface JQuery {
+	igGridCellMerging(methodName: "changeGlobalLanguage"): void;
+	igGridCellMerging(methodName: "changeGlobalRegional"): void;
 	igGridCellMerging(methodName: "destroy"): void;
 	igGridCellMerging(methodName: "mergeColumn", column: Object, raiseEvents: boolean): string;
 	igGridCellMerging(methodName: "unmergeColumn", column: Object): string;
 	igGridCellMerging(methodName: "isMerged", column: Object): boolean;
+	igGridCellMerging(methodName: "changeLocale", $container: Object): void;
 
 	/**
 	 * Defines the type of merging.
+	 *
 	 */
 
 	igGridCellMerging(optionLiteral: 'option', optionName: "mergeType"): string;
@@ -37618,6 +43511,7 @@ interface JQuery {
 	/**
 	 * Defines the type of merging.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -37625,6 +43519,7 @@ interface JQuery {
 
 	/**
 	 * Defines when merging should be applied.
+	 *
 	 */
 
 	igGridCellMerging(optionLiteral: 'option', optionName: "mergeOn"): string;
@@ -37632,6 +43527,7 @@ interface JQuery {
 	/**
 	 * Defines when merging should be applied.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -37639,6 +43535,7 @@ interface JQuery {
 
 	/**
 	 * Defines the rules merging is based on.
+	 *
 	 */
 
 	igGridCellMerging(optionLiteral: 'option', optionName: "mergeStrategy"): string|Function;
@@ -37646,6 +43543,7 @@ interface JQuery {
 	/**
 	 * Defines the rules merging is based on.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -37653,12 +43551,14 @@ interface JQuery {
 
 	/**
 	 * A list of column settings that specifies hiding options on a per column basis.
+	 *
 	 */
 	igGridCellMerging(optionLiteral: 'option', optionName: "columnSettings"): IgGridCellMergingColumnSetting[];
 
 	/**
 	 * A list of column settings that specifies hiding options on a per column basis.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridCellMerging(optionLiteral: 'option', optionName: "columnSettings", optionValue: IgGridCellMergingColumnSetting[]): void;
@@ -37675,6 +43575,50 @@ interface JQuery {
 	 */
 	igGridCellMerging(optionLiteral: 'option', optionName: "inherit", optionValue: boolean): void;
 
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	igGridCellMerging(optionLiteral: 'option', optionName: "locale"): any;
+
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igGridCellMerging(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	igGridCellMerging(optionLiteral: 'option', optionName: "language"): string;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igGridCellMerging(optionLiteral: 'option', optionName: "language", optionValue: string): void;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+
+	igGridCellMerging(optionLiteral: 'option', optionName: "regional"): string|Object;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igGridCellMerging(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
+
 	/**
 	 * Event fired before a new merged cells group is created.
 	 */
@@ -37697,53 +43641,25 @@ interface JQuery {
 interface IgGridColumnFixingLocale {
 	/**
 	 * Specifies the tooltip text on the column fixing header icon when column is not fixed.
-	 *                 ```
-	 * //Initialize
-	 * $(".selector").%%ParentWidgetName%%({
-	 * features: [
-	 * {
-	 * name : "ColumnFixing",
-	 *                             locale: { headerFixButtonText : "Click to fix this column"}
-	 * }
-	 * ]
-	 * });
 	 *
-	 *                 //Get
-	 * var headerFixButtonText = $(".selector").%%WidgetName%%("option", "locale").headerFixButtonText;
-	 *
-	 *                 //Set
-	 *                 $(".selector").%%WidgetName%%("option", "locale", { headerFixButtonText : "Click to fix this column"});
 	 */
 	headerFixButtonText?: string;
 
 	/**
 	 * Specifies the tooltip text on the column fixing header icon when column is not fixed.
-	 *                 ```
-	 *                 //Initialize
-	 *                 $(".selector").%%ParentWidgetName%%({
-	 *                     features: [
-	 *                         {
-	 *                             name : "ColumnFixing",
-	 *                             locale: { headerUnfixButtonText : "Click to unfix this column"}
-	 *                         }
-	 *                     ]
-	 *                 });
 	 *
-	 *                 //Get
-	 *                 var headerUnfixButtonText = $(".selector").%%WidgetName%%("option", "locale").headerUnfixButtonText;
-	 *
-	 *                 //Set
-	 *                 $(".selector").%%WidgetName%%("option", "locale", { headerUnfixButtonText : "Click to unfix this column"});
 	 */
 	headerUnfixButtonText?: string;
 
 	/**
 	 * Text of the feature chooser button for fixing a currently unfixed column.
+	 *
 	 */
 	featureChooserTextFixedColumn?: string;
 
 	/**
 	 * Text of the feature chooser button for unfixing a currently fixed column.
+	 *
 	 */
 	featureChooserTextUnfixedColumn?: string;
 
@@ -37756,21 +43672,25 @@ interface IgGridColumnFixingLocale {
 interface IgGridColumnFixingColumnSetting {
 	/**
 	 * Identifies the grid column by key. Either key or index must be set in every column setting.
+	 *
 	 */
 	columnKey?: string;
 
 	/**
 	 * Identifies the grid column by index. Either key or index must be set in every column setting.
+	 *
 	 */
 	columnIndex?: number;
 
 	/**
 	 * Specifies whether the column can be fixed or not. If allow fixing is false, then the fixing pin will not be rendered for the column.
+	 *
 	 */
 	allowFixing?: boolean;
 
 	/**
 	 * Specifies whether the column is initially fixed or not. Check [this topic](http://www.igniteui.com/help/iggrid-columnfixing-configuring#initial-state) out for more information.
+	 *
 	 */
 	isFixed?: boolean;
 
@@ -37944,22 +43864,26 @@ interface IgGridColumnFixing {
 
 	/**
 	 * Specifies whether to show the column fixing buttons in header cells/feature chooser.
+	 *
 	 */
 	showFixButtons?: boolean;
 
 	/**
 	 * Enable row height sync for the fixed and unfixed portion of the grid. If you're observing row misalignment, please refer to [this article](http://www.igniteui.com/help/iggrid-known-issues#misalignment-ie9).
+	 *
 	 */
 	syncRowHeights?: boolean;
 
 	/**
 	 * Scroll delta in pixels when scrolling with the mouse wheel or the keyboard in the fixed columns area of the grid.
+	 *
 	 */
 	scrollDelta?: number;
 
 	/**
 	 * Configures which side the fixed columns of the grid will be rendered on. Check [this topic](http://www.igniteui.com/help/iggrid-columnfixing-configuring#direction) out of more information.
 	 *
+	 *
 	 * Valid values:
 	 * "left" Fixed columns are rendered on the left side of the main grid.
 	 * "right" Fixed columns are rendered on the right side of the main grid.
@@ -37968,12 +43892,14 @@ interface IgGridColumnFixing {
 
 	/**
 	 * List of column settings that specifies custom column fixing options on a per column basis.
+	 *
 	 */
 	columnSettings?: IgGridColumnFixingColumnSetting[];
 
 	/**
 	 * Minimal visible area in pixels for the unfixed columns. If the end user tries to fix a column(or columns), which causes the width of the fixed columns to grow such that the width of visible area of unfixed columns is less than this option then fixing will be canceled. Check [this topic](http://www.igniteui.com/help/iggrid-columnfixing-configuring#non-fixable-min-width) out for more information.
 	 *
+	 *
 	 * Valid values:
 	 * "string" The width can be set in pixels (px) and percentage (%).
 	 * "number" The width can be set in pixels as a number.
@@ -37982,6 +43908,7 @@ interface IgGridColumnFixing {
 
 	/**
 	 * Specify initial fixing of all non data columns. Non-data columns are columns in the grid rendered for specific features, like the row selectors feature. The column containing the row numbering is such a column. This option is applicable when [fixingDirection](ui.iggridcolumnfixing#options:fixingDirection) is set to left. For a full column fixing configuration summary please refer to [this topic](http://www.igniteui.com/help/iggrid-columnfixing-configuring#configuration-summary).
+	 *
 	 */
 	fixNondataColumns?: boolean;
 
@@ -37990,6 +43917,18 @@ interface IgGridColumnFixing {
 	 */
 	populateDataRowsAttributes?: boolean;
 
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	language?: string;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+	regional?: string|Object;
+
 	/**
 	 * Event which is fired when column fixing operation is initiated.
 	 */
@@ -38026,6 +43965,9 @@ interface IgGridColumnFixing {
 	[optionName: string]: any;
 }
 interface IgGridColumnFixingMethods {
+	changeGlobalLanguage(): void;
+	changeGlobalRegional(): void;
+
 	/**
 	 * Unfixes a column by specified column identifier - column key or column index.
 	 *
@@ -38047,6 +43989,11 @@ interface IgGridColumnFixingMethods {
 	 * @param clearRowsHeights Clears row heigths for all visible rows.
 	 */
 	syncHeights(check?: boolean, clearRowsHeights?: boolean): void;
+
+	/**
+	 * Changes the all locales into the widget element to the language specified in [options.language](ui.iggridcolumnfixing#options:language)
+	 * Note that this method is for rare scenarios, see [language](ui.iggridcolumnfixing#options:language) or [locale](ui.iggridcolumnfixing#options:locale) option setter
+	 */
 	changeLocale(): void;
 
 	/**
@@ -38131,6 +44078,8 @@ interface JQuery {
 }
 
 interface JQuery {
+	igGridColumnFixing(methodName: "changeGlobalLanguage"): void;
+	igGridColumnFixing(methodName: "changeGlobalRegional"): void;
 	igGridColumnFixing(methodName: "unfixColumn", colIdentifier: Object, target?: string, after?: boolean): Object;
 	igGridColumnFixing(methodName: "checkAndSyncHeights"): void;
 	igGridColumnFixing(methodName: "syncHeights", check?: boolean, clearRowsHeights?: boolean): void;
@@ -38208,42 +44157,49 @@ interface JQuery {
 
 	/**
 	 * Gets whether to show the column fixing buttons in header cells/feature chooser.
+	 *
 	 */
 	igGridColumnFixing(optionLiteral: 'option', optionName: "showFixButtons"): boolean;
 
 	/**
 	 * Sets whether to show the column fixing buttons in header cells/feature chooser.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridColumnFixing(optionLiteral: 'option', optionName: "showFixButtons", optionValue: boolean): void;
 
 	/**
 	 * Enable row height sync for the fixed and unfixed portion of the grid. If you're observing row misalignment, please refer to [this article](http://www.igniteui.com/help/iggrid-known-issues#misalignment-ie9).
+	 *
 	 */
 	igGridColumnFixing(optionLiteral: 'option', optionName: "syncRowHeights"): boolean;
 
 	/**
 	 * Enable row height sync for the fixed and unfixed portion of the grid. If you're observing row misalignment, please refer to [this article](http://www.igniteui.com/help/iggrid-known-issues#misalignment-ie9).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridColumnFixing(optionLiteral: 'option', optionName: "syncRowHeights", optionValue: boolean): void;
 
 	/**
 	 * Scroll delta in pixels when scrolling with the mouse wheel or the keyboard in the fixed columns area of the grid.
+	 *
 	 */
 	igGridColumnFixing(optionLiteral: 'option', optionName: "scrollDelta"): number;
 
 	/**
 	 * Scroll delta in pixels when scrolling with the mouse wheel or the keyboard in the fixed columns area of the grid.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridColumnFixing(optionLiteral: 'option', optionName: "scrollDelta", optionValue: number): void;
 
 	/**
 	 * Configures which side the fixed columns of the grid will be rendered on. Check [this topic](http://www.igniteui.com/help/iggrid-columnfixing-configuring#direction) out of more information.
+	 *
 	 */
 
 	igGridColumnFixing(optionLiteral: 'option', optionName: "fixingDirection"): string;
@@ -38251,6 +44207,7 @@ interface JQuery {
 	/**
 	 * Configures which side the fixed columns of the grid will be rendered on. Check [this topic](http://www.igniteui.com/help/iggrid-columnfixing-configuring#direction) out of more information.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -38258,18 +44215,21 @@ interface JQuery {
 
 	/**
 	 * List of column settings that specifies custom column fixing options on a per column basis.
+	 *
 	 */
 	igGridColumnFixing(optionLiteral: 'option', optionName: "columnSettings"): IgGridColumnFixingColumnSetting[];
 
 	/**
 	 * List of column settings that specifies custom column fixing options on a per column basis.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridColumnFixing(optionLiteral: 'option', optionName: "columnSettings", optionValue: IgGridColumnFixingColumnSetting[]): void;
 
 	/**
 	 * Minimal visible area in pixels for the unfixed columns. If the end user tries to fix a column(or columns), which causes the width of the fixed columns to grow such that the width of visible area of unfixed columns is less than this option then fixing will be canceled. Check [this topic](http://www.igniteui.com/help/iggrid-columnfixing-configuring#non-fixable-min-width) out for more information.
+	 *
 	 */
 
 	igGridColumnFixing(optionLiteral: 'option', optionName: "minimalVisibleAreaWidth"): string|number;
@@ -38277,6 +44237,7 @@ interface JQuery {
 	/**
 	 * Minimal visible area in pixels for the unfixed columns. If the end user tries to fix a column(or columns), which causes the width of the fixed columns to grow such that the width of visible area of unfixed columns is less than this option then fixing will be canceled. Check [this topic](http://www.igniteui.com/help/iggrid-columnfixing-configuring#non-fixable-min-width) out for more information.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -38284,12 +44245,14 @@ interface JQuery {
 
 	/**
 	 * Specify initial fixing of all non data columns. Non-data columns are columns in the grid rendered for specific features, like the row selectors feature. The column containing the row numbering is such a column. This option is applicable when [fixingDirection](ui.iggridcolumnfixing#options:fixingDirection) is set to left. For a full column fixing configuration summary please refer to [this topic](http://www.igniteui.com/help/iggrid-columnfixing-configuring#configuration-summary).
+	 *
 	 */
 	igGridColumnFixing(optionLiteral: 'option', optionName: "fixNondataColumns"): boolean;
 
 	/**
 	 * Specify initial fixing of all non data columns. Non-data columns are columns in the grid rendered for specific features, like the row selectors feature. The column containing the row numbering is such a column. This option is applicable when [fixingDirection](ui.iggridcolumnfixing#options:fixingDirection) is set to left. For a full column fixing configuration summary please refer to [this topic](http://www.igniteui.com/help/iggrid-columnfixing-configuring#configuration-summary).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridColumnFixing(optionLiteral: 'option', optionName: "fixNondataColumns", optionValue: boolean): void;
@@ -38306,6 +44269,36 @@ interface JQuery {
 	 */
 	igGridColumnFixing(optionLiteral: 'option', optionName: "populateDataRowsAttributes", optionValue: boolean): void;
 
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	igGridColumnFixing(optionLiteral: 'option', optionName: "language"): string;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igGridColumnFixing(optionLiteral: 'option', optionName: "language", optionValue: string): void;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+
+	igGridColumnFixing(optionLiteral: 'option', optionName: "regional"): string|Object;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igGridColumnFixing(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
+
 	/**
 	 * Event which is fired when column fixing operation is initiated.
 	 */
@@ -38386,16 +44379,19 @@ interface JQuery {
 interface IgGridColumnMovingColumnSetting {
 	/**
 	 * Column key. This is a required property in every column setting if columnIndex is not set.
+	 *
 	 */
 	columnKey?: string;
 
 	/**
 	 * Column index. Can be used in place of column key. The preferred way of populating a column setting is to always use the column keys as identifiers.
+	 *
 	 */
 	columnIndex?: number;
 
 	/**
 	 * Allows the column to be moved.
+	 *
 	 */
 	allowMoving?: boolean;
 
@@ -38408,71 +44404,85 @@ interface IgGridColumnMovingColumnSetting {
 interface IgGridColumnMovingLocale {
 	/**
 	 * Specifies the apply button text.
+	 *
 	 */
 	movingDialogButtonApplyText?: string;
 
 	/**
 	 * Specifies the cancel button text.
+	 *
 	 */
 	movingDialogButtonCancelText?: string;
 
 	/**
 	 * Specifies caption for each move down button in the column moving dialog.
+	 *
 	 */
 	movingDialogCaptionButtonDesc?: string;
 
 	/**
 	 * Specifies caption for each move up button in the column moving dialog.
+	 *
 	 */
 	movingDialogCaptionButtonAsc?: string;
 
 	/**
 	 * Specifies caption text for the column moving dialog.
+	 *
 	 */
 	movingDialogCaptionText?: string;
 
 	/**
 	 * Specifies caption text for the feature chooser entry.
+	 *
 	 */
 	movingDialogDisplayText?: string;
 
 	/**
 	 * Specifies text for drop tooltip in column moving dialog.
+	 *
 	 */
 	movingDialogDropTooltipText?: string;
 
 	/**
 	 * Specifies title for close dialog button.
+	 *
 	 */
 	movingDialogCloseButtonTitle?: string;
 
 	/**
 	 * Specifies caption for the move left dropdown button.
+	 *
 	 */
 	dropDownMoveLeftText?: string;
 
 	/**
 	 * Specifies caption for the move right dropdown button.
+	 *
 	 */
 	dropDownMoveRightText?: string;
 
 	/**
 	 * Specifies caption for the move first dropdown button.
+	 *
 	 */
 	dropDownMoveFirstText?: string;
 
 	/**
 	 * Specifies caption for the move last dropdown button.
+	 *
 	 */
 	dropDownMoveLastText?: string;
 
 	/**
 	 * Specifies tooltip text for the move indicator.
+	 *
 	 */
 	movingToolTipMove?: string;
 
 	/**
 	 * Specifies caption text for the feature chooser submenu button.
+	 *
 	 */
 	featureChooserSubmenuText?: string;
 
@@ -38751,12 +44761,14 @@ interface MovingDialogDragColumnMovedEventUIParam {
 interface IgGridColumnMoving {
 	/**
 	 * A list of column settings that specifies moving options on a per column basis.
+	 *
 	 */
 	columnSettings?: IgGridColumnMovingColumnSetting[];
 
 	/**
 	 * Specify the drag-and-drop mode for the feature
 	 *
+	 *
 	 * Valid values:
 	 * "immediate" Column headers will rearange as you drag with a space opening under the cursor for the header to be dropped on
 	 * "deferred" A clone of the header dragged will be created and indicators will be shown between columns to help navigate the drop.
@@ -38766,6 +44778,7 @@ interface IgGridColumnMoving {
 	/**
 	 * Specify the way columns will be rearranged
 	 *
+	 *
 	 * Valid values:
 	 * "dom" Columns will be rearranged through dom manipulation
 	 * "render" Columns will not be rearranged but the grid will be rendered again with the new column order. Please note this option is incompatible with immediate move mode.
@@ -38774,47 +44787,56 @@ interface IgGridColumnMoving {
 
 	/**
 	 * Specifies if header cells should include an additional button that opens a moving helper dropdown.
+	 *
 	 */
 	addMovingDropdown?: boolean;
 
 	/**
 	 * Specifies width of column moving dialog
+	 *
 	 */
 	movingDialogWidth?: number;
 
 	/**
 	 * Specifies height of column moving dialog
+	 *
 	 */
 	movingDialogHeight?: number;
 
 	/**
 	 * Specifies time in milliseconds for animation duration to show/hide modal dialog
+	 *
 	 */
 	movingDialogAnimationDuration?: number;
 
 	/**
 	 * Specifies the length (in pixels) between the dragged column and the column edges below which the move operation is accepted
+	 *
 	 */
 	movingAcceptanceTolerance?: number;
 
 	/**
 	 * Specifies the length (in pixels) between the dragged column and the grid edges below which horizontal scrolling occurs
+	 *
 	 */
 	movingScrollTolerance?: number;
 
 	/**
 	 * Specifies a multiplier for the delay between subsequent scroll operations. The larger this number is, the slower scrolling will appear to be.
+	 *
 	 */
 	scrollSpeedMultiplier?: number;
 
 	/**
 	 * Specifies the length (in pixels) of each individual scroll operation
+	 *
 	 */
 	scrollDelta?: number;
 
 	/**
 	 * Specifies whether the contents of the column being dragged will get hidden. The option is only
 	 * relevant in immediate moving mode.
+	 *
 	 */
 	hideHeaderContentsDuringDrag?: boolean;
 
@@ -38822,6 +44844,7 @@ interface IgGridColumnMoving {
 	 * Specifies the opacity of the drag markup, while a column header is being dragged.
 	 * The value must be between 0 and 1. When GroupBy is enabled, the corresponding option in the GroupBy configuration
 	 * will be used with priority over this one.
+	 *
 	 */
 	dragHelperOpacity?: number;
 
@@ -38894,6 +44917,7 @@ interface IgGridColumnMoving {
 
 	/**
 	 * Specifies markup for drop tooltip in column moving dialog
+	 *
 	 */
 	movingDialogDropTooltipMarkup?: string;
 
@@ -38907,6 +44931,7 @@ interface IgGridColumnMoving {
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog.
+	 *
 	 */
 	dialogWidget?: string;
 
@@ -38915,6 +44940,18 @@ interface IgGridColumnMoving {
 	 */
 	inherit?: boolean;
 
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	language?: string;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+	regional?: string|Object;
+
 	/**
 	 * Event which is fired when a drag operation begins on a column header
 	 */
@@ -39001,6 +45038,13 @@ interface IgGridColumnMoving {
 	[optionName: string]: any;
 }
 interface IgGridColumnMovingMethods {
+	changeGlobalLanguage(): void;
+	changeGlobalRegional(): void;
+
+	/**
+	 * Changes the all locales into the widget element to the language specified in [options.language](ui.iggridcolumnmoving#options:language)
+	 * Note that this method is for rare scenarios, see [language](ui.iggridcolumnmoving#options:language) or [locale](ui.iggridcolumnmoving#options:locale) option setter
+	 */
 	changeLocale(): void;
 
 	/**
@@ -39025,24 +45069,29 @@ interface JQuery {
 }
 
 interface JQuery {
+	igGridColumnMoving(methodName: "changeGlobalLanguage"): void;
+	igGridColumnMoving(methodName: "changeGlobalRegional"): void;
 	igGridColumnMoving(methodName: "changeLocale"): void;
 	igGridColumnMoving(methodName: "destroy"): void;
 	igGridColumnMoving(methodName: "moveColumn", column: Object, target: Object, after?: boolean, inDom?: boolean, callback?: Function): void;
 
 	/**
 	 * A list of column settings that specifies moving options on a per column basis.
+	 *
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "columnSettings"): IgGridColumnMovingColumnSetting[];
 
 	/**
 	 * A list of column settings that specifies moving options on a per column basis.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "columnSettings", optionValue: IgGridColumnMovingColumnSetting[]): void;
 
 	/**
 	 * Specify the drag-and-drop mode for the feature
+	 *
 	 */
 
 	igGridColumnMoving(optionLiteral: 'option', optionName: "mode"): string;
@@ -39050,6 +45099,7 @@ interface JQuery {
 	/**
 	 * Specify the drag-and-drop mode for the feature
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -39057,6 +45107,7 @@ interface JQuery {
 
 	/**
 	 * Specify the way columns will be rearranged
+	 *
 	 */
 
 	igGridColumnMoving(optionLiteral: 'option', optionName: "moveType"): string;
@@ -39064,6 +45115,7 @@ interface JQuery {
 	/**
 	 * Specify the way columns will be rearranged
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -39071,96 +45123,112 @@ interface JQuery {
 
 	/**
 	 * Gets if header cells should include an additional button that opens a moving helper dropdown.
+	 *
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "addMovingDropdown"): boolean;
 
 	/**
 	 * Sets if header cells should include an additional button that opens a moving helper dropdown.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "addMovingDropdown", optionValue: boolean): void;
 
 	/**
 	 * Gets width of column moving dialog
+	 *
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "movingDialogWidth"): number;
 
 	/**
 	 * Sets width of column moving dialog
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "movingDialogWidth", optionValue: number): void;
 
 	/**
 	 * Gets height of column moving dialog
+	 *
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "movingDialogHeight"): number;
 
 	/**
 	 * Sets height of column moving dialog
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "movingDialogHeight", optionValue: number): void;
 
 	/**
 	 * Gets time in milliseconds for animation duration to show/hide modal dialog
+	 *
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "movingDialogAnimationDuration"): number;
 
 	/**
 	 * Sets time in milliseconds for animation duration to show/hide modal dialog
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "movingDialogAnimationDuration", optionValue: number): void;
 
 	/**
 	 * Gets the length (in pixels) between the dragged column and the column edges below which the move operation is accepted
+	 *
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "movingAcceptanceTolerance"): number;
 
 	/**
 	 * Sets the length (in pixels) between the dragged column and the column edges below which the move operation is accepted
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "movingAcceptanceTolerance", optionValue: number): void;
 
 	/**
 	 * Gets the length (in pixels) between the dragged column and the grid edges below which horizontal scrolling occurs
+	 *
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "movingScrollTolerance"): number;
 
 	/**
 	 * Sets the length (in pixels) between the dragged column and the grid edges below which horizontal scrolling occurs
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "movingScrollTolerance", optionValue: number): void;
 
 	/**
 	 * Gets a multiplier for the delay between subsequent scroll operations. The larger this number is, the slower scrolling will appear to be.
+	 *
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "scrollSpeedMultiplier"): number;
 
 	/**
 	 * Sets a multiplier for the delay between subsequent scroll operations. The larger this number is, the slower scrolling will appear to be.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "scrollSpeedMultiplier", optionValue: number): void;
 
 	/**
 	 * Gets the length (in pixels) of each individual scroll operation
+	 *
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "scrollDelta"): number;
 
 	/**
 	 * Sets the length (in pixels) of each individual scroll operation
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "scrollDelta", optionValue: number): void;
@@ -39168,6 +45236,7 @@ interface JQuery {
 	/**
 	 * Gets whether the contents of the column being dragged will get hidden. The option is only
 	 * relevant in immediate moving mode.
+	 *
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "hideHeaderContentsDuringDrag"): boolean;
 
@@ -39175,6 +45244,7 @@ interface JQuery {
 	 * Sets whether the contents of the column being dragged will get hidden. The option is only
 	 * relevant in immediate moving mode.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "hideHeaderContentsDuringDrag", optionValue: boolean): void;
@@ -39183,6 +45253,7 @@ interface JQuery {
 	 * Gets the opacity of the drag markup, while a column header is being dragged.
 	 * The value must be between 0 and 1. When GroupBy is enabled, the corresponding option in the GroupBy configuration
 	 * will be used with priority over this one.
+	 *
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "dragHelperOpacity"): number;
 
@@ -39191,6 +45262,7 @@ interface JQuery {
 	 * The value must be between 0 and 1. When GroupBy is enabled, the corresponding option in the GroupBy configuration
 	 * will be used with priority over this one.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "dragHelperOpacity", optionValue: number): void;
@@ -39353,12 +45425,14 @@ interface JQuery {
 
 	/**
 	 * Gets markup for drop tooltip in column moving dialog
+	 *
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "movingDialogDropTooltipMarkup"): string;
 
 	/**
 	 * Sets markup for drop tooltip in column moving dialog
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "movingDialogDropTooltipMarkup", optionValue: string): void;
@@ -39383,12 +45457,14 @@ interface JQuery {
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog.
+	 *
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "dialogWidget"): string;
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "dialogWidget", optionValue: string): void;
@@ -39405,6 +45481,36 @@ interface JQuery {
 	 */
 	igGridColumnMoving(optionLiteral: 'option', optionName: "inherit", optionValue: boolean): void;
 
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	igGridColumnMoving(optionLiteral: 'option', optionName: "language"): string;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igGridColumnMoving(optionLiteral: 'option', optionName: "language", optionValue: string): void;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+
+	igGridColumnMoving(optionLiteral: 'option', optionName: "regional"): string|Object;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igGridColumnMoving(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
+
 	/**
 	 * Event which is fired when a drag operation begins on a column header
 	 */
@@ -39732,6 +45838,7 @@ interface IgGridFeatureChooserPopover {
 	/**
 	 * controls the direction in which the control shows relative to the target element
 	 *
+	 *
 	 * Valid values:
 	 * "auto" lets the control show on the side where enough space is available with the priority specified by the [directionPriority](ui.%%WidgetNameLowered%%#options:directionPriority) property
 	 * "left" shows popover on the left side of the target element
@@ -39744,12 +45851,14 @@ interface IgGridFeatureChooserPopover {
 	/**
 	 * Controls the priority in which the control searches for space to show relative to the target element.
 	 * This property has effect only if the [direction](ui.%%WidgetNameLowered%%#options:direction) property value is "auto" or unset.
+	 *
 	 */
 	directionPriority?: any[];
 
 	/**
 	 * controls the position of the popover according to the target element in case the popover is larger than the target on the side we want to position, if the popover is smaller it should always be in the middle of the visible area
 	 *
+	 *
 	 * Valid values:
 	 * "auto" lets the control choose a position depending on available space with the following priority balanced > end > start
 	 * "balanced" the popover is positioned at the middle of the target element
@@ -39760,37 +45869,44 @@ interface IgGridFeatureChooserPopover {
 
 	/**
 	 * defines width for the popover. leave null for auto.
+	 *
 	 */
 	width?: number|string;
 
 	/**
 	 * defines height for the popover. leave null for auto
+	 *
 	 */
 	height?: number|string;
 
 	/**
 	 * defines width the popover won't go under the value even if no specific one is set.
+	 *
 	 */
 	minWidth?: number|string;
 
 	/**
 	 * defines width the popover won't exceed even if no specific one is set.
+	 *
 	 */
 	maxWidth?: number|string;
 
 	/**
 	 * defines height the popover won't exceed even if no specific one is set.
+	 *
 	 */
 	maxHeight?: number|string;
 
 	/**
 	 * Sets the time popover fades in and out when showing/hiding
+	 *
 	 */
 	animationDuration?: number;
 
 	/**
 	 * sets the content for the popover container. If left null the content will be get from the target.
 	 *
+	 *
 	 * Valid values:
 	 * "string" String content of the popover container
 	 * "function" Function which is a callback that should return the content. Use the 'this' value to access the target DOM element.
@@ -39799,17 +45915,20 @@ interface IgGridFeatureChooserPopover {
 
 	/**
 	 * Selectors indicating which items should show popovers. The predefined value is [title]. Customize if you're using something other then the title attribute for the popover content, or if you need a different selector for event delegation. When changing this option, you likely need to also change the contentTemplate option
+	 *
 	 */
 	selectors?: string;
 
 	/**
 	 * Sets the content for the popover header
+	 *
 	 */
 	headerTemplate?: IgPopoverHeaderTemplate;
 
 	/**
 	 * sets the event on which the popover will be shown. Predefined values are "mouseenter", "click" and "focus"
 	 *
+	 *
 	 * Valid values:
 	 * "mouseenter" the popover is shown on mouse enter in the target element
 	 * "click" the popover is shown on click on the target element
@@ -39820,6 +45939,7 @@ interface IgGridFeatureChooserPopover {
 	/**
 	 * Controls where the popover DOM should be attached to.
 	 *
+	 *
 	 * Valid values:
 	 * "string" A valid jQuery selector for the element
 	 * "object" A reference to the parent jQuery object
@@ -39957,6 +46077,24 @@ interface FeatureToggledEventUIParam {}
 interface IgGridFeatureChooser {
 	dropDownWidth?: any;
 	animationDuration?: number;
+
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	locale?: any;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	language?: string;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+	regional?: string|Object;
 	featureChooserRendering?: FeatureChooserRenderingEvent;
 	featureChooserRendered?: FeatureChooserRenderedEvent;
 	featureChooserDropDownOpening?: FeatureChooserDropDownOpeningEvent;
@@ -39972,6 +46110,11 @@ interface IgGridFeatureChooser {
 }
 interface IgGridFeatureChooserMethods {
 	shouldShowFeatureIcon(key: Object): void;
+
+	/**
+	 * Changes the all locales into the widget element to the language specified in [options.language](ui.iggridfeaturechooser#options:language)
+	 * Note that this method is for rare scenarios, see [language](ui.iggridfeaturechooser#options:language) or [locale](ui.iggridfeaturechooser#options:locale) option setter
+	 */
 	changeLocale(): void;
 
 	/**
@@ -40002,6 +46145,16 @@ interface IgGridFeatureChooserMethods {
 	 */
 	toggleDropDown(columnKey: string): void;
 	destroy(e: Object, args: Object): void;
+
+	/**
+	 * Changes the widget language to global language. Global language is the value in $.ig.util.language
+	 */
+	changeGlobalLanguage(): void;
+
+	/**
+	 * Changes the widget regional settins to global regional settings. Global regional settings are container in $.ig.util.regional
+	 */
+	changeGlobalRegional(): void;
 }
 interface JQuery {
 	data(propertyName: "igGridFeatureChooser"): IgGridFeatureChooserMethods;
@@ -40031,6 +46184,7 @@ interface JQuery {
 
 	/**
 	 * Controls the direction in which the control shows relative to the target element
+	 *
 	 */
 
 	igGridFeatureChooserPopover(optionLiteral: 'option', optionName: "direction"): string;
@@ -40038,6 +46192,7 @@ interface JQuery {
 	/**
 	 * Controls the direction in which the control shows relative to the target element
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -40046,6 +46201,7 @@ interface JQuery {
 	/**
 	 * Controls the priority in which the control searches for space to show relative to the target element.
 	 * This property has effect only if the [direction](ui.%%WidgetNameLowered%%#options:direction) property value is "auto" or unset.
+	 *
 	 */
 	igGridFeatureChooserPopover(optionLiteral: 'option', optionName: "directionPriority"): any[];
 
@@ -40053,12 +46209,14 @@ interface JQuery {
 	 * Controls the priority in which the control searches for space to show relative to the target element.
 	 * This property has effect only if the [direction](ui.%%WidgetNameLowered%%#options:direction) property value is "auto" or unset.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridFeatureChooserPopover(optionLiteral: 'option', optionName: "directionPriority", optionValue: any[]): void;
 
 	/**
 	 * Controls the position of the popover according to the target element in case the popover is larger than the target on the side we want to position, if the popover is smaller it should always be in the middle of the visible area
+	 *
 	 */
 
 	igGridFeatureChooserPopover(optionLiteral: 'option', optionName: "position"): string;
@@ -40066,6 +46224,7 @@ interface JQuery {
 	/**
 	 * Controls the position of the popover according to the target element in case the popover is larger than the target on the side we want to position, if the popover is smaller it should always be in the middle of the visible area
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -40073,6 +46232,7 @@ interface JQuery {
 
 	/**
 	 * Defines width for the popover. leave null for auto.
+	 *
 	 */
 
 	igGridFeatureChooserPopover(optionLiteral: 'option', optionName: "width"): number|string;
@@ -40080,6 +46240,7 @@ interface JQuery {
 	/**
 	 * Defines width for the popover. leave null for auto.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -40087,6 +46248,7 @@ interface JQuery {
 
 	/**
 	 * Defines height for the popover. leave null for auto
+	 *
 	 */
 
 	igGridFeatureChooserPopover(optionLiteral: 'option', optionName: "height"): number|string;
@@ -40094,6 +46256,7 @@ interface JQuery {
 	/**
 	 * Defines height for the popover. leave null for auto
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -40101,6 +46264,7 @@ interface JQuery {
 
 	/**
 	 * Defines width the popover won't go under the value even if no specific one is set.
+	 *
 	 */
 
 	igGridFeatureChooserPopover(optionLiteral: 'option', optionName: "minWidth"): number|string;
@@ -40108,6 +46272,7 @@ interface JQuery {
 	/**
 	 * Defines width the popover won't go under the value even if no specific one is set.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -40115,6 +46280,7 @@ interface JQuery {
 
 	/**
 	 * Defines width the popover won't exceed even if no specific one is set.
+	 *
 	 */
 
 	igGridFeatureChooserPopover(optionLiteral: 'option', optionName: "maxWidth"): number|string;
@@ -40122,6 +46288,7 @@ interface JQuery {
 	/**
 	 * Defines width the popover won't exceed even if no specific one is set.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -40129,6 +46296,7 @@ interface JQuery {
 
 	/**
 	 * Defines height the popover won't exceed even if no specific one is set.
+	 *
 	 */
 
 	igGridFeatureChooserPopover(optionLiteral: 'option', optionName: "maxHeight"): number|string;
@@ -40136,6 +46304,7 @@ interface JQuery {
 	/**
 	 * Defines height the popover won't exceed even if no specific one is set.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -40143,18 +46312,21 @@ interface JQuery {
 
 	/**
 	 * The time popover fades in and out when showing/hiding
+	 *
 	 */
 	igGridFeatureChooserPopover(optionLiteral: 'option', optionName: "animationDuration"): number;
 
 	/**
 	 * Sets the time popover fades in and out when showing/hiding
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridFeatureChooserPopover(optionLiteral: 'option', optionName: "animationDuration", optionValue: number): void;
 
 	/**
 	 * The content for the popover container. If left null the content will be get from the target.
+	 *
 	 */
 
 	igGridFeatureChooserPopover(optionLiteral: 'option', optionName: "contentTemplate"): string|Function;
@@ -40162,6 +46334,7 @@ interface JQuery {
 	/**
 	 * Sets the content for the popover container. If left null the content will be get from the target.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -40169,30 +46342,35 @@ interface JQuery {
 
 	/**
 	 * Selectors indicating which items should show popovers. The predefined value is [title]. Customize if you're using something other then the title attribute for the popover content, or if you need a different selector for event delegation. When changing this option, you likely need to also change the contentTemplate option
+	 *
 	 */
 	igGridFeatureChooserPopover(optionLiteral: 'option', optionName: "selectors"): string;
 
 	/**
 	 * Selectors indicating which items should show popovers. The predefined value is [title]. Customize if you're using something other then the title attribute for the popover content, or if you need a different selector for event delegation. When changing this option, you likely need to also change the contentTemplate option
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridFeatureChooserPopover(optionLiteral: 'option', optionName: "selectors", optionValue: string): void;
 
 	/**
 	 * The content for the popover header
+	 *
 	 */
 	igGridFeatureChooserPopover(optionLiteral: 'option', optionName: "headerTemplate"): IgPopoverHeaderTemplate;
 
 	/**
 	 * Sets the content for the popover header
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridFeatureChooserPopover(optionLiteral: 'option', optionName: "headerTemplate", optionValue: IgPopoverHeaderTemplate): void;
 
 	/**
 	 * The event on which the popover will be shown. Predefined values are "mouseenter", "click" and "focus"
+	 *
 	 */
 
 	igGridFeatureChooserPopover(optionLiteral: 'option', optionName: "showOn"): string;
@@ -40200,6 +46378,7 @@ interface JQuery {
 	/**
 	 * Sets the event on which the popover will be shown. Predefined values are "mouseenter", "click" and "focus"
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -40207,6 +46386,7 @@ interface JQuery {
 
 	/**
 	 * Controls where the popover DOM should be attached to.
+	 *
 	 */
 
 	igGridFeatureChooserPopover(optionLiteral: 'option', optionName: "appendTo"): string|Object;
@@ -40214,6 +46394,7 @@ interface JQuery {
 	/**
 	 * Controls where the popover DOM should be attached to.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -40280,10 +46461,56 @@ interface JQuery {
 	igGridFeatureChooser(methodName: "getDropDownByColumnKey", columnKey: string): void;
 	igGridFeatureChooser(methodName: "toggleDropDown", columnKey: string): void;
 	igGridFeatureChooser(methodName: "destroy", e: Object, args: Object): void;
+	igGridFeatureChooser(methodName: "changeGlobalLanguage"): void;
+	igGridFeatureChooser(methodName: "changeGlobalRegional"): void;
 	igGridFeatureChooser(optionLiteral: 'option', optionName: "dropDownWidth"): any;
 	igGridFeatureChooser(optionLiteral: 'option', optionName: "dropDownWidth", optionValue: any): void;
 	igGridFeatureChooser(optionLiteral: 'option', optionName: "animationDuration"): number;
 	igGridFeatureChooser(optionLiteral: 'option', optionName: "animationDuration", optionValue: number): void;
+
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	igGridFeatureChooser(optionLiteral: 'option', optionName: "locale"): any;
+
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igGridFeatureChooser(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	igGridFeatureChooser(optionLiteral: 'option', optionName: "language"): string;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igGridFeatureChooser(optionLiteral: 'option', optionName: "language", optionValue: string): void;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+
+	igGridFeatureChooser(optionLiteral: 'option', optionName: "regional"): string|Object;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igGridFeatureChooser(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
 	igGridFeatureChooser(optionLiteral: 'option', optionName: "featureChooserRendering"): FeatureChooserRenderingEvent;
 	igGridFeatureChooser(optionLiteral: 'option', optionName: "featureChooserRendering", optionValue: FeatureChooserRenderingEvent): void;
 	igGridFeatureChooser(optionLiteral: 'option', optionName: "featureChooserRendered"): FeatureChooserRenderedEvent;
@@ -40314,22 +46541,26 @@ interface IgGridFilteringColumnSettingDefaultExpressions {
 interface IgGridFilteringColumnSetting {
 	/**
 	 * Identifies the grid column by key. Either key or index must be set in every column setting.
+	 *
 	 */
 	columnKey?: string;
 
 	/**
 	 * Identifies the grid column by index. Either key or index must be set in every column setting.
+	 *
 	 */
 	columnIndex?: number;
 
 	/**
 	 * Enables/disables filtering for the column.
+	 *
 	 */
 	allowFiltering?: boolean;
 
 	/**
 	 * Initial filtering condition for the column.
 	 *
+	 *
 	 * Valid values:
 	 * "empty"
 	 * "notEmpty"
@@ -40364,11 +46595,13 @@ interface IgGridFilteringColumnSetting {
 
 	/**
 	 * An array of strings that determine which [conditions](ui.iggridfiltering#options:columnSettings.condition) to display for this column.
+	 *
 	 */
 	conditionList?: any[];
 
 	/**
 	 * Initial filtering expressions - if set they will be applied on initialization together with the preset [condition](ui.iggridfiltering#options:columnSettings.condition).
+	 *
 	 */
 	defaultExpressions?: IgGridFilteringColumnSettingDefaultExpressions;
 
@@ -40392,316 +46625,379 @@ interface IgGridFilteringColumnSetting {
 interface IgGridFilteringLocale {
 	/**
 	 * StartsWith null text that will be used for the filter editors.
+	 *
 	 */
 	startsWithNullText?: string;
 
 	/**
 	 * EndsWith null text that will be used for the filter editors.
+	 *
 	 */
 	endsWithNullText?: string;
 
 	/**
 	 * Contains null text that will be used for the filter editors.
+	 *
 	 */
 	containsNullText?: string;
 
 	/**
 	 * Does not contain null text that will be used for the filter editors.
+	 *
 	 */
 	doesNotContainNullText?: string;
 
 	/**
 	 * Equals null text that will be used for the filter editors.
+	 *
 	 */
 	equalsNullText?: string;
 
 	/**
 	 * Does not equal null text that will be used for the filter editors.
+	 *
 	 */
 	doesNotEqualNullText?: string;
 
 	/**
 	 * Greater than null text that will be used for the filter editors.
+	 *
 	 */
 	greaterThanNullText?: string;
 
 	/**
 	 * Less than null text that will be used for the filter editors.
+	 *
 	 */
 	lessThanNullText?: string;
 
 	/**
 	 * Greater than or equal to null text that will be used for the filter editors.
+	 *
 	 */
 	greaterThanOrEqualToNullText?: string;
 
 	/**
 	 * Less than or equal to null text that will be used for the filter editors.
+	 *
 	 */
 	lessThanOrEqualToNullText?: string;
 
 	/**
 	 * On null text that will be used for the filter editors.
+	 *
 	 */
 	onNullText?: string;
 
 	/**
 	 * Not on null text that will be used for the filter editors.
+	 *
 	 */
 	notOnNullText?: string;
 
 	/**
 	 * After null text that will be used for the filter editors.
+	 *
 	 */
 	afterNullText?: string;
 
 	/**
 	 * Before null text that will be used for the filter editors.
+	 *
 	 */
 	beforeNullText?: string;
 
 	/**
 	 * Empty null text that will be used for the filter editors.
+	 *
 	 */
 	emptyNullText?: string;
 
 	/**
 	 * Not empty null text that will be used for the filter editors.
+	 *
 	 */
 	notEmptyNullText?: string;
 
 	/**
 	 * Not empty null text that will be used for the filter editors.
+	 *
 	 */
 	nullNullText?: string;
 
 	/**
 	 * Not empty null text that will be used for the filter editors.
+	 *
 	 */
 	notNullNullText?: string;
 
 	/**
 	 * 'Starts with' label that is used for the predefined filtering conditions in the filter dropdowns.
+	 *
 	 */
 	startsWithLabel?: string;
 
 	/**
 	 * 'Starts with' label that is used for the predefined filtering conditions in the filter dropdowns.
+	 *
 	 */
 	endsWithLabel?: string;
 
 	/**
 	 * 'Contains' label that is used for the predefined filtering conditions in the filter dropdowns.
+	 *
 	 */
 	containsLabel?: string;
 
 	/**
 	 * 'Does not contain' label that is used for the predefined filtering conditions in the filter dropdowns.
+	 *
 	 */
 	doesNotContainLabel?: string;
 
 	/**
 	 * 'Equals' label that is used for the predefined filtering conditions in the filter dropdowns.
+	 *
 	 */
 	equalsLabel?: string;
 
 	/**
 	 * 'Does not Equal' label that is used for the predefined filtering conditions in the filter dropdowns.
+	 *
 	 */
 	doesNotEqualLabel?: string;
 
 	/**
 	 * 'Greater Than' label that is used for the predefined filtering conditions in the filter dropdowns.
+	 *
 	 */
 	greaterThanLabel?: string;
 
 	/**
 	 * 'Less Than' label that is used for the predefined filtering conditions in the filter dropdowns.
+	 *
 	 */
 	lessThanLabel?: string;
 
 	/**
 	 * 'Greater Than or Equal' label that is used for the predefined filtering conditions in the filter dropdowns.
+	 *
 	 */
 	greaterThanOrEqualToLabel?: string;
 
 	/**
 	 * 'Less Than or Equal' label that is used for the predefined filtering conditions in the filter dropdowns.
+	 *
 	 */
 	lessThanOrEqualToLabel?: string;
 
 	/**
 	 * 'True' label that is used for the predefined filtering conditions in the filter dropdowns.
+	 *
 	 */
 	trueLabel?: string;
 
 	/**
 	 * 'False' label that is used for the predefined filtering conditions in the filter dropdowns.
+	 *
 	 */
 	falseLabel?: string;
 
 	/**
 	 * 'After' label that is used for the predefined filtering conditions in the filter dropdowns.
+	 *
 	 */
 	afterLabel?: string;
 
 	/**
 	 * 'Before' label that is used for the predefined filtering conditions in the filter dropdowns.
+	 *
 	 */
 	beforeLabel?: string;
 
 	/**
 	 * 'Today' label that is used for the predefined filtering conditions in the filter dropdowns.
+	 *
 	 */
 	todayLabel?: string;
 
 	/**
 	 * 'Yesterday' label that is used for the predefined filtering conditions in the filter dropdowns.
+	 *
 	 */
 	yesterdayLabel?: string;
 
 	/**
 	 * 'This Month' label that is used for the predefined filtering conditions in the filter dropdowns.
+	 *
 	 */
 	thisMonthLabel?: string;
 
 	/**
 	 * 'Last Month' label that is used for the predefined filtering conditions in the filter dropdowns.
+	 *
 	 */
 	lastMonthLabel?: string;
 
 	/**
 	 * 'Next Month' label that is used for the predefined filtering conditions in the filter dropdowns.
+	 *
 	 */
 	nextMonthLabel?: string;
 
 	/**
 	 * 'This Year' label that is used for the predefined filtering conditions in the filter dropdowns.
+	 *
 	 */
 	thisYearLabel?: string;
 
 	/**
 	 * 'Last Year' label that is used for the predefined filtering conditions in the filter dropdowns.
+	 *
 	 */
 	lastYearLabel?: string;
 
 	/**
 	 * 'Next Year' label that is used for the predefined filtering conditions in the filter dropdowns.
+	 *
 	 */
 	nextYearLabel?: string;
 
 	/**
 	 * 'Clear' label that is used for the predefined filtering conditions in the filter dropdowns.
+	 *
 	 */
 	clearLabel?: string;
 
 	/**
 	 * 'No Filter' label that is used for the predefined filtering conditions in the filter dropdowns.
+	 *
 	 */
 	noFilterLabel?: string;
 
 	/**
 	 * 'On' label that is used for the predefined filtering conditions in the filter dropdowns.
+	 *
 	 */
 	onLabel?: string;
 
 	/**
 	 * 'Not On' label that is used for the predefined filtering conditions in the filter dropdowns.
+	 *
 	 */
 	notOnLabel?: string;
 
 	/**
 	 * 'Advance Button' label that is used for the predefined filtering conditions in the filter dropdowns.
+	 *
 	 */
 	advancedButtonLabel?: string;
 
 	/**
 	 * Specifies the filter dialog caption label.
+	 *
 	 */
 	filterDialogCaptionLabel?: string;
 
 	/**
 	 * Specifies the filter condition label.
+	 *
 	 */
 	filterDialogConditionLabel1?: string;
 
 	/**
 	 * Specifies the filter condition label.
+	 *
 	 */
 	filterDialogConditionLabel2?: string;
 
 	/**
 	 * Specifies the filter condition drop-down label.
+	 *
 	 */
 	filterDialogConditionDropDownLabel?: string;
 
 	/**
 	 * Specifies the dialog's Ok button label.
+	 *
 	 */
 	filterDialogOkLabel?: string;
 
 	/**
 	 * Specifies the dialog's Cancel button label.
+	 *
 	 */
 	filterDialogCancelLabel?: string;
 
 	/**
 	 * Specifies the Any label for the filtering dialog.
+	 *
 	 */
 	filterDialogAnyLabel?: string;
 
 	/**
 	 * Specifies the All label for the filtering dialog.
+	 *
 	 */
 	filterDialogAllLabel?: string;
 
 	/**
 	 * Specifies the Add button label for the filtering dialog.
+	 *
 	 */
 	filterDialogAddLabel?: string;
 
 	/**
 	 * Specifies the Error label for the filtering dialog.
+	 *
 	 */
 	filterDialogErrorLabel?: string;
 
 	/**
 	 * Specifies the Close label for the filtering dialog.
+	 *
 	 */
 	filterDialogCloseLabel?: string;
 
 	/**
 	 * Specifies the Filtering summary title.
+	 *
 	 */
 	filterSummaryTitleLabel?: string;
 
 	/**
 	 * Specifies the summary template for the matching records.
+	 *
 	 */
 	filterSummaryTemplate?: string;
 
 	/**
 	 * Specifies clear all label in the filter dialog.
+	 *
 	 */
 	filterDialogClearAllLabel?: string;
 
 	/**
 	 * Custom tooltip template for the filter button, when a filter is applied.
+	 *
 	 */
 	tooltipTemplate?: string;
 
 	/**
 	 * Feature chooser text when filter is shown and filter [mode](ui.iggridfiltering#options:mode) is simple.
+	 *
 	 */
 	featureChooserText?: string;
 
 	/**
 	 * Feature chooser text when filter is hidden and filter [mode](ui.iggridfiltering#options:mode) is simple.
+	 *
 	 */
 	featureChooserTextHide?: string;
 
 	/**
 	 * Feature chooser text when filter [mode](ui.iggridfiltering#options:mode) is advanced.
+	 *
 	 */
 	featureChooserTextAdvancedFilter?: string;
 
@@ -40711,9 +47007,222 @@ interface IgGridFilteringLocale {
 	[optionName: string]: any;
 }
 
+interface DataFilteringEvent {
+	(event: Event, ui: DataFilteringEventUIParam): void;
+}
+
+interface DataFilteringEventUIParam {
+	/**
+	 * Gets reference to GridFiltering.
+	 */
+	owner?: any;
+
+	/**
+	 * Gets the column index. Applicable only when filtering mode is "simple".
+	 */
+	columnIndex?: number;
+
+	/**
+	 * Gets the column key. Applicable only when filtering mode is "simple".
+	 */
+	columnKey?: string;
+
+	/**
+	 * Gets the filtering expressions. Filtering expressions could be changed in this event handler and after that data binding is applied. In this way the user could control filtering more easily before applying data-binding.
+	 */
+	newExpressions?: any[];
+}
+
+interface DataFilteredEvent {
+	(event: Event, ui: DataFilteredEventUIParam): void;
+}
+
+interface DataFilteredEventUIParam {
+	/**
+	 * Gets reference to GridFiltering.
+	 */
+	owner?: any;
+
+	/**
+	 * Gets the column index. Applicable only when filtering mode is "simple".
+	 */
+	columnIndex?: number;
+
+	/**
+	 * Gets the column key. Applicable only when filtering mode is "simple".
+	 */
+	columnKey?: string;
+
+	/**
+	 * Gets the filtered expressions.
+	 */
+	expressions?: any[];
+}
+
+interface FilterDialogOpeningEvent {
+	(event: Event, ui: FilterDialogOpeningEventUIParam): void;
+}
+
+interface FilterDialogOpeningEventUIParam {
+	/**
+	 * Gets reference to GridFiltering.
+	 */
+	owner?: any;
+
+	/**
+	 * Gets reference to the filtering dialog DOM element.
+	 */
+	dialog?: string;
+}
+
+interface FilterDialogOpenedEvent {
+	(event: Event, ui: FilterDialogOpenedEventUIParam): void;
+}
+
+interface FilterDialogOpenedEventUIParam {
+	/**
+	 * Gets reference to GridFiltering.
+	 */
+	owner?: any;
+
+	/**
+	 * Gets reference to the filtering dialog DOM element.
+	 */
+	dialog?: string;
+}
+
+interface FilterDialogMovingEvent {
+	(event: Event, ui: FilterDialogMovingEventUIParam): void;
+}
+
+interface FilterDialogMovingEventUIParam {
+	/**
+	 * Gets reference to GridFiltering.
+	 */
+	owner?: any;
+
+	/**
+	 * Gets reference to filtering dialog DOM element.
+	 */
+	dialog?: string;
+
+	/**
+	 * Gets the original position of the groupby dialog div as { top, left } object, relative to the page.
+	 */
+	originalPosition?: any;
+
+	/**
+	 * Gets the current position of the groupby dialog div as { top, left } object, relative to the page.
+	 */
+	position?: any;
+}
+
+interface FilterDialogFilterAddingEvent {
+	(event: Event, ui: FilterDialogFilterAddingEventUIParam): void;
+}
+
+interface FilterDialogFilterAddingEventUIParam {
+	/**
+	 * Gets reference to GridFiltering.
+	 */
+	owner?: any;
+
+	/**
+	 * Gets reference to filters table body DOM element.
+	 */
+	filtersTableBody?: string;
+}
+
+interface FilterDialogFilterAddedEvent {
+	(event: Event, ui: FilterDialogFilterAddedEventUIParam): void;
+}
+
+interface FilterDialogFilterAddedEventUIParam {
+	/**
+	 * Gets reference to GridFiltering.
+	 */
+	owner?: any;
+
+	/**
+	 * Gets reference to the filters table row DOM element.
+	 */
+	filter?: string;
+}
+
+interface FilterDialogClosingEvent {
+	(event: Event, ui: FilterDialogClosingEventUIParam): void;
+}
+
+interface FilterDialogClosingEventUIParam {
+	/**
+	 * Gets reference to GridFiltering.
+	 */
+	owner?: any;
+}
+
+interface FilterDialogClosedEvent {
+	(event: Event, ui: FilterDialogClosedEventUIParam): void;
+}
+
+interface FilterDialogClosedEventUIParam {
+	/**
+	 * Gets reference to GridFiltering.
+	 */
+	owner?: any;
+}
+
+interface FilterDialogContentsRenderingEvent {
+	(event: Event, ui: FilterDialogContentsRenderingEventUIParam): void;
+}
+
+interface FilterDialogContentsRenderingEventUIParam {
+	/**
+	 * Gets reference to GridFiltering.
+	 */
+	owner?: any;
+
+	/**
+	 * Gets reference to the filtering dialog DOM element.
+	 */
+	dialogElement?: string;
+}
+
+interface FilterDialogContentsRenderedEvent {
+	(event: Event, ui: FilterDialogContentsRenderedEventUIParam): void;
+}
+
+interface FilterDialogContentsRenderedEventUIParam {
+	/**
+	 * Gets reference to GridFiltering.
+	 */
+	owner?: any;
+
+	/**
+	 * Gets reference to the filtering dialog DOM element.
+	 */
+	dialogElement?: string;
+}
+
+interface FilterDialogFilteringEvent {
+	(event: Event, ui: FilterDialogFilteringEventUIParam): void;
+}
+
+interface FilterDialogFilteringEventUIParam {
+	/**
+	 * Gets reference to GridFiltering.
+	 */
+	owner?: any;
+
+	/**
+	 * Gets reference to filtering dialog DOM element.
+	 */
+	dialog?: string;
+}
+
 interface IgGridFiltering {
 	/**
 	 * Enables or disables the filtering case sensitivity. Works only for local filtering. If true, it case sensitive filtering is performed. If false, filtering is case insensitive.
+	 *
 	 */
 	caseSensitive?: boolean;
 
@@ -40721,11 +47230,13 @@ interface IgGridFiltering {
 	 * Enable/disable footer visibility with summary info about the filter.
 	 * When false, the filter summary row (in the footer) will only be visible when paging is enabled (or some other feature that renders a footer).
 	 * When true, the filter summary row will only be visible when a filter is applied i.e. it's not visible by default.
+	 *
 	 */
 	filterSummaryAlwaysVisible?: boolean;
 
 	/**
 	 * Render in [Feature Chooser](http://www.igniteui.com/help/iggrid-feature-chooser)
+	 *
 	 */
 	renderFC?: boolean;
 
@@ -40738,6 +47249,7 @@ interface IgGridFiltering {
 	/**
 	 * Type of animations for the column filter dropdowns.
 	 *
+	 *
 	 * Valid values:
 	 * "linear" The column filtering drop downs are shown with a linear animation.
 	 * "none" No animation is used when showing the filtering drop downs.
@@ -40746,12 +47258,14 @@ interface IgGridFiltering {
 
 	/**
 	 * Animation duration in milliseconds for the [filterDropDownAnimations](ui.iggridfiltering#options:filterDropDownAnimations).
+	 *
 	 */
 	filterDropDownAnimationDuration?: number;
 
 	/**
 	 * Width of the column filter dropdowns.
 	 *
+	 *
 	 * Valid values:
 	 * "string" The width in pixels (0px)
 	 * "number" The width in pixels as a number (0)
@@ -40768,12 +47282,14 @@ interface IgGridFiltering {
 
 	/**
 	 * URL key name that specifies how the filtering expressions will be encoded for remote requests, e.g. &filter('col') = startsWith. Default is OData.
+	 *
 	 */
 	filterExprUrlKey?: string;
 
 	/**
 	 * Enable/disable filter icons visibility.
 	 *
+	 *
 	 * Valid values:
 	 * "true" All predefined filters in the filter dropdowns will have icons rendered in front of the text.
 	 * "false" No icons will be rendered.
@@ -40782,12 +47298,14 @@ interface IgGridFiltering {
 
 	/**
 	 * A list of column settings that specifies custom filtering options on a per column basis.
+	 *
 	 */
 	columnSettings?: IgGridFilteringColumnSetting[];
 
 	/**
 	 * Type of filtering. Delegates all filtering functionality to the [$.ig.DataSource](ig.datasource).
 	 *
+	 *
 	 * Valid values:
 	 * "remote" Filtering is performed by a remote end-point.
 	 * "local" Filtering is performed locally by the [$.ig.DataSource](ig.datasource).
@@ -40796,12 +47314,14 @@ interface IgGridFiltering {
 
 	/**
 	 * Time in milliseconds for which widget will wait between keystrokes before sending filtering requests.
+	 *
 	 */
 	filterDelay?: number;
 
 	/**
 	 * Default is 'simple' for non-virtualized grids, and 'advanced' when [virtualization](ui.iggrid#options:virtualization) is enabled.
 	 *
+	 *
 	 * Valid values:
 	 * "simple" Renders just a filter row.
 	 * "advanced" Allows to configure multiple filters from a dialog - Excel style.
@@ -40810,12 +47330,14 @@ interface IgGridFiltering {
 
 	/**
 	 * Defines whether to render editors in advanced [mode](ui.iggridfiltering#options:mode). If false, no editors will be rendered in the advanced [mode](ui.iggridfiltering#options:mode).
+	 *
 	 */
 	advancedModeEditorsVisible?: boolean;
 
 	/**
 	 * Location of the advanced filtering button when [advancedModeEditorsVisible](ui.iggridfiltering#options:advancedModeEditorsVisible) is false (i.e. when the button is rendered in the header).
 	 *
+	 *
 	 * Valid values:
 	 * "left"
 	 * "right"
@@ -40825,6 +47347,7 @@ interface IgGridFiltering {
 	/**
 	 * Default filter dialog width (used for Advanced filtering [mode](ui.iggridfiltering#options:mode)).
 	 *
+	 *
 	 * Valid values:
 	 * "string" The dialog window width in pixels (370px).
 	 * "number" The dialog window width in pixels as a number (370).
@@ -40834,6 +47357,7 @@ interface IgGridFiltering {
 	/**
 	 * default filter dialog height (used for Advanced filtering [mode](ui.iggridfiltering#options:mode)).
 	 *
+	 *
 	 * Valid values:
 	 * "string" The dialog window height in pixels (350px).
 	 * "number" The dialog window height in pixels as a number (350).
@@ -40843,6 +47367,7 @@ interface IgGridFiltering {
 	/**
 	 * Width of the filtering condition dropdowns in the advanced filter dialog.
 	 *
+	 *
 	 * Valid values:
 	 * "string" The filtering condition dropdowns width in pixels (80px).
 	 * "number" The filtering condition dropdowns width in pixels as a number (80).
@@ -40852,6 +47377,7 @@ interface IgGridFiltering {
 	/**
 	 * Width of the filtering expression input boxes in the advanced filter dialog.
 	 *
+	 *
 	 * Valid values:
 	 * "string" The filtering expression input boxes width in pixels (80px).
 	 * "number" The filtering expression input boxes width in pixels as a number (80).
@@ -40861,6 +47387,7 @@ interface IgGridFiltering {
 	/**
 	 * Width of the column chooser dropdowns in the advanced filter dialog.
 	 *
+	 *
 	 * Valid values:
 	 * "string" The column chooser dropdowns width in pixels (80px).
 	 * "number" The column chooser dropdowns width in pixels  as a number (80).
@@ -40869,12 +47396,14 @@ interface IgGridFiltering {
 
 	/**
 	 * Enable/disable filter button visibility. If false, no filter dropdown buttons will be rendered and a predefined list of filters will not be rendered for the columns.
+	 *
 	 */
 	renderFilterButton?: boolean;
 
 	/**
 	 * The filtering button for filter dropdowns can be rendered either on the left of the filter editor, or on the right.
 	 *
+	 *
 	 * Valid values:
 	 * "left" The button is rendered on the left.
 	 * "right" The button is rendered on the right.
@@ -40920,11 +47449,13 @@ interface IgGridFiltering {
 
 	/**
 	 * Custom template for add condition area in the filter dialog. The default template is "<div><span>${label1}</span><div><select></select></div><span>${label2}</span></div>".
+	 *
 	 */
 	filterDialogAddConditionTemplate?: string;
 
 	/**
 	 * Custom template for options in dropdown in add condition area in the filter dialog. The default template is "<option value='${value}'>${text}</option>".
+	 *
 	 */
 	filterDialogAddConditionDropDownTemplate?: string;
 
@@ -40934,17 +47465,20 @@ interface IgGridFiltering {
 	 * E.g.: DOM element used for selecting column has attribute "data-af-col", for selecting filter condition - "data-af-cond", for filter expression- "data-af-expr".
 	 * NOTE: The template is supported only with <tr />.
 	 * The default template is "<tr data-af-row><td><input data-af-col/></td><td><select data-af-cond></select></td><td><input data-af-expr /> </td><td><span data-af-rmv></span></td></tr>".
+	 *
 	 */
 	filterDialogFilterTemplate?: string;
 
 	/**
 	 * Custom template for options in condition list in filter dialog. The default template is "<option value='${condition}'>${text}</option>".
+	 *
 	 */
 	filterDialogFilterConditionTemplate?: string;
 
 	/**
 	 * Add button width - in the advanced filter dialog.
 	 *
+	 *
 	 * Valid values:
 	 * "string" The dialog Add button width in pixels (100px).
 	 * "number" The dialog Add button width in pixels as a number (100).
@@ -40954,6 +47488,7 @@ interface IgGridFiltering {
 	/**
 	 * Width of the Ok and Cancel buttons in the advanced filtering dialogs.
 	 *
+	 *
 	 * Valid values:
 	 * "string" The advanced filter dialog Ok and Cancel buttons width in pixels (120px).
 	 * "number" The advanced filter dialog Ok and Cancel buttons width in pixels as a number (120).
@@ -40962,6 +47497,7 @@ interface IgGridFiltering {
 
 	/**
 	 * Maximum number of filter rows in the advanced filtering dialog. If this number is exceeded, an error message will be rendered.
+	 *
 	 */
 	filterDialogMaxFilterCount?: number;
 
@@ -40975,44 +47511,212 @@ interface IgGridFiltering {
 
 	/**
 	 * Enable/disable empty condition visibility in the filter. If true, shows empty and not empty filtering conditions in the dropdowns.
+	 *
 	 */
 	showEmptyConditions?: boolean;
 
 	/**
 	 * Enable/disable visibility of null and not null filtering conditions in the dropdowns. If true, shows null and not null filtering conditions in the dropdowns.
+	 *
 	 */
 	showNullConditions?: boolean;
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog.
+	 *
 	 */
 	dialogWidget?: string;
 
 	/**
 	 * Enables/disables filtering persistence between states.
+	 *
 	 */
 	persist?: boolean;
 
 	/**
 	 * Enables/disables feature inheritance for the child [layouts](ui.ighierarchicalgrid#options:columnLayouts). NOTE: It only applies for [igHierarchicalGrid](ui.ighierarchicalgrid).
+	 *
 	 */
 	inherit?: boolean;
 
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	language?: string;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+	regional?: string|Object;
+
+	/**
+	 * Event fired before a filtering operation is executed (remote request or local).
+	 * Return false in order to cancel filtering operation.
+	 */
+	dataFiltering?: DataFilteringEvent;
+
+	/**
+	 * Event fired after the filtering has been executed and results are rendered.
+	 */
+	dataFiltered?: DataFilteredEvent;
+
+	/**
+	 * Event fired before the filter dropdown is opened for a specific column.
+	 * Return false in order to cancel dropdown opening.
+	 */
+	dropDownOpening?: DropDownOpeningEvent;
+
+	/**
+	 * Event fired after the filter dropdown is opened for a specific column.
+	 */
+	dropDownOpened?: DropDownOpenedEvent;
+
+	/**
+	 * Event fired before the filter dropdown starts closing.
+	 * Return false in order to cancel dropdown closing.
+	 */
+	dropDownClosing?: DropDownClosingEvent;
+
+	/**
+	 * Event fired after a filter column dropdown is completely closed.
+	 */
+	dropDownClosed?: DropDownClosedEvent;
+
+	/**
+	 * Event fired before the advanced filtering dialog is opened.
+	 * Return false in order to cancel filter dialog opening.
+	 */
+	filterDialogOpening?: FilterDialogOpeningEvent;
+
+	/**
+	 * Event fired after the advanced filter dialog is already opened.
+	 */
+	filterDialogOpened?: FilterDialogOpenedEvent;
+
+	/**
+	 * Event fired every time the advanced filter dialog changes its position.
+	 */
+	filterDialogMoving?: FilterDialogMovingEvent;
+
+	/**
+	 * Event fired before a filter row is added to the advanced filter dialog.
+	 * Return false in order to cancel filter adding to the advanced filtering dialog.
+	 */
+	filterDialogFilterAdding?: FilterDialogFilterAddingEvent;
+
+	/**
+	 * Event fired after a filter row is added to the advanced filter dialog.
+	 */
+	filterDialogFilterAdded?: FilterDialogFilterAddedEvent;
+
+	/**
+	 * Event fired before the advanced filter dialog is closed.
+	 * Return false in order to cancel filtering dialog closing.
+	 */
+	filterDialogClosing?: FilterDialogClosingEvent;
+
+	/**
+	 * Event fired after the advanced filter dialog has been closed.
+	 */
+	filterDialogClosed?: FilterDialogClosedEvent;
+
+	/**
+	 * Event fired before the contents of the advanced filter dialog are rendered.
+	 * Return false in order to cancel filtering dialog rendering.
+	 */
+	filterDialogContentsRendering?: FilterDialogContentsRenderingEvent;
+
+	/**
+	 * Event fired after the contents of the advanced filter dialog are rendered.
+	 */
+	filterDialogContentsRendered?: FilterDialogContentsRenderedEvent;
+
+	/**
+	 * Event fired when the OK button in the advanced filter dialog is pressed.
+	 */
+	filterDialogFiltering?: FilterDialogFilteringEvent;
+
 	/**
 	 * Option for igGridFiltering
 	 */
 	[optionName: string]: any;
 }
+interface IgGridFilteringMethods {
+	changeGlobalLanguage(): void;
+	changeGlobalRegional(): void;
+
+	/**
+	 * Changes the all locales into the widget element to the language specified in [options.language](ui.iggridfiltering#options:language)
+	 * Note that this method is for rare scenarios, see [language](ui.iggridfiltering#options:language) or [locale](ui.iggridfiltering#options:locale) option setter
+	 */
+	changeLocale(): void;
+
+	/**
+	 * Changes the the regional settings of widget element to the language specified in [options.regional](ui.iggridfiltering#options:regional)
+	 * Note that this method is for rare scenarios, use [regional](ui.iggridfiltering#options:regional) option setter
+	 */
+	changeRegional(): void;
+
+	/**
+	 * Destroys the filtering widget - remove fitler row, unbinds events, returns the grid to its previous state.
+	 */
+	destroy(): void;
+
+	/**
+	 * Returns the count of data records that match filtering conditions
+	 */
+	getFilteringMatchesCount(): number;
+
+	/**
+	 * Toggle filter row when mode is simple or [advancedModeEditorsVisible](ui.iggridfiltering#options:advancedModeEditorsVisible) is true. Otherwise show/hide advanced dialog.
+	 *
+	 * @param event Column key
+	 */
+	toggleFilterRowByFeatureChooser(event: string): void;
+
+	/**
+	 * Applies filtering programmatically and updates the UI by default.
+	 *
+	 * @param expressions An array of filtering expressions, each one having the format {fieldName: , expr: , cond: , logic: } where  fieldName is the key of the column, expr is the actual expression string with which we would like to filter, logic is 'AND' or 'OR', and cond is one of the following strings: "equals", "doesNotEqual", "contains", "doesNotContain", "greaterThan", "lessThan", "greaterThanOrEqualTo", "lessThanOrEqualTo", "true", "false", "null", "notNull", "empty", "notEmpty", "startsWith", "endsWith", "today", "yesterday", "on", "notOn", "thisMonth", "lastMonth", "nextMonth", "before", "after", "thisYear", "lastYear", "nextYear". The difference between the empty and null filtering conditions is that empty includes null, NaN, and undefined, as well as the empty string.
+	 * @param updateUI specifies whether the filter row should be also updated once the grid is filtered
+	 * @param addedFromAdvanced
+	 */
+	filter(expressions: any[], updateUI?: boolean, addedFromAdvanced?: boolean): void;
+
+	/**
+	 * Check whether filterCondition requires or not filtering expression - e.g. if filterCondition is "lastMonth", "thisMonth", "null", "notNull", "true", "false", etc. then filtering expression is NOT required
+	 *
+	 * @param filterCondition filtering condition - e.g. "true", "false",  "yesterday", "empty", "null", etc.
+	 */
+	requiresFilteringExpression(filterCondition: string): boolean;
+}
+interface JQuery {
+	data(propertyName: "igGridFiltering"): IgGridFilteringMethods;
+}
 
 interface JQuery {
+	igGridFiltering(methodName: "changeGlobalLanguage"): void;
+	igGridFiltering(methodName: "changeGlobalRegional"): void;
+	igGridFiltering(methodName: "changeLocale"): void;
+	igGridFiltering(methodName: "changeRegional"): void;
+	igGridFiltering(methodName: "destroy"): void;
+	igGridFiltering(methodName: "getFilteringMatchesCount"): number;
+	igGridFiltering(methodName: "toggleFilterRowByFeatureChooser", event: string): void;
+	igGridFiltering(methodName: "filter", expressions: any[], updateUI?: boolean, addedFromAdvanced?: boolean): void;
+	igGridFiltering(methodName: "requiresFilteringExpression", filterCondition: string): boolean;
+
 	/**
 	 * Enables or disables the filtering case sensitivity. Works only for local filtering. If true, it case sensitive filtering is performed. If false, filtering is case insensitive.
+	 *
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "caseSensitive"): boolean;
 
 	/**
 	 * Enables or disables the filtering case sensitivity. Works only for local filtering. If true, it case sensitive filtering is performed. If false, filtering is case insensitive.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "caseSensitive", optionValue: boolean): void;
@@ -41021,6 +47725,7 @@ interface JQuery {
 	 * Enable/disable footer visibility with summary info about the filter.
 	 * When false, the filter summary row (in the footer) will only be visible when paging is enabled (or some other feature that renders a footer).
 	 * When true, the filter summary row will only be visible when a filter is applied i.e. it's not visible by default.
+	 *
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "filterSummaryAlwaysVisible"): boolean;
 
@@ -41029,18 +47734,21 @@ interface JQuery {
 	 * When false, the filter summary row (in the footer) will only be visible when paging is enabled (or some other feature that renders a footer).
 	 * When true, the filter summary row will only be visible when a filter is applied i.e. it's not visible by default.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "filterSummaryAlwaysVisible", optionValue: boolean): void;
 
 	/**
 	 * Render in [Feature Chooser](http://www.igniteui.com/help/iggrid-feature-chooser)
+	 *
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "renderFC"): boolean;
 
 	/**
 	 * Render in [Feature Chooser](http://www.igniteui.com/help/iggrid-feature-chooser)
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "renderFC", optionValue: boolean): void;
@@ -41061,6 +47769,7 @@ interface JQuery {
 
 	/**
 	 * Type of animations for the column filter dropdowns.
+	 *
 	 */
 
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDropDownAnimations"): string;
@@ -41068,6 +47777,7 @@ interface JQuery {
 	/**
 	 * Type of animations for the column filter dropdowns.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -41075,18 +47785,21 @@ interface JQuery {
 
 	/**
 	 * Animation duration in milliseconds for the [filterDropDownAnimations](ui.iggridfiltering#options:filterDropDownAnimations).
+	 *
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDropDownAnimationDuration"): number;
 
 	/**
 	 * Animation duration in milliseconds for the [filterDropDownAnimations](ui.iggridfiltering#options:filterDropDownAnimations).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDropDownAnimationDuration", optionValue: number): void;
 
 	/**
 	 * Width of the column filter dropdowns.
+	 *
 	 */
 
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDropDownWidth"): string|number;
@@ -41094,6 +47807,7 @@ interface JQuery {
 	/**
 	 * Width of the column filter dropdowns.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -41119,18 +47833,21 @@ interface JQuery {
 
 	/**
 	 * URL key name that specifies how the filtering expressions will be encoded for remote requests, e.g. &filter('col') = startsWith. Default is OData.
+	 *
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "filterExprUrlKey"): string;
 
 	/**
 	 * URL key name that specifies how the filtering expressions will be encoded for remote requests, e.g. &filter('col') = startsWith. Default is OData.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "filterExprUrlKey", optionValue: string): void;
 
 	/**
 	 * Enable/disable filter icons visibility.
+	 *
 	 */
 
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDropDownItemIcons"): boolean;
@@ -41138,6 +47855,7 @@ interface JQuery {
 	/**
 	 * Enable/disable filter icons visibility.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -41145,18 +47863,21 @@ interface JQuery {
 
 	/**
 	 * A list of column settings that specifies custom filtering options on a per column basis.
+	 *
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "columnSettings"): IgGridFilteringColumnSetting[];
 
 	/**
 	 * A list of column settings that specifies custom filtering options on a per column basis.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "columnSettings", optionValue: IgGridFilteringColumnSetting[]): void;
 
 	/**
 	 * Type of filtering. Delegates all filtering functionality to the [$.ig.DataSource](ig.datasource).
+	 *
 	 */
 
 	igGridFiltering(optionLiteral: 'option', optionName: "type"): string;
@@ -41164,6 +47885,7 @@ interface JQuery {
 	/**
 	 * Type of filtering. Delegates all filtering functionality to the [$.ig.DataSource](ig.datasource).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -41171,18 +47893,21 @@ interface JQuery {
 
 	/**
 	 * Time in milliseconds for which widget will wait between keystrokes before sending filtering requests.
+	 *
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDelay"): number;
 
 	/**
 	 * Time in milliseconds for which widget will wait between keystrokes before sending filtering requests.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDelay", optionValue: number): void;
 
 	/**
 	 * Default is 'simple' for non-virtualized grids, and 'advanced' when [virtualization](ui.iggrid#options:virtualization) is enabled.
+	 *
 	 */
 
 	igGridFiltering(optionLiteral: 'option', optionName: "mode"): string;
@@ -41190,6 +47915,7 @@ interface JQuery {
 	/**
 	 * Default is 'simple' for non-virtualized grids, and 'advanced' when [virtualization](ui.iggrid#options:virtualization) is enabled.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -41197,18 +47923,21 @@ interface JQuery {
 
 	/**
 	 * Defines whether to render editors in advanced [mode](ui.iggridfiltering#options:mode). If false, no editors will be rendered in the advanced [mode](ui.iggridfiltering#options:mode).
+	 *
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "advancedModeEditorsVisible"): boolean;
 
 	/**
 	 * Defines whether to render editors in advanced [mode](ui.iggridfiltering#options:mode). If false, no editors will be rendered in the advanced [mode](ui.iggridfiltering#options:mode).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "advancedModeEditorsVisible", optionValue: boolean): void;
 
 	/**
 	 * Location of the advanced filtering button when [advancedModeEditorsVisible](ui.iggridfiltering#options:advancedModeEditorsVisible) is false (i.e. when the button is rendered in the header).
+	 *
 	 */
 
 	igGridFiltering(optionLiteral: 'option', optionName: "advancedModeHeaderButtonLocation"): string;
@@ -41216,6 +47945,7 @@ interface JQuery {
 	/**
 	 * Location of the advanced filtering button when [advancedModeEditorsVisible](ui.iggridfiltering#options:advancedModeEditorsVisible) is false (i.e. when the button is rendered in the header).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -41223,6 +47953,7 @@ interface JQuery {
 
 	/**
 	 * Default filter dialog width (used for Advanced filtering [mode](ui.iggridfiltering#options:mode)).
+	 *
 	 */
 
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogWidth"): string|number;
@@ -41230,6 +47961,7 @@ interface JQuery {
 	/**
 	 * Default filter dialog width (used for Advanced filtering [mode](ui.iggridfiltering#options:mode)).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -41237,6 +47969,7 @@ interface JQuery {
 
 	/**
 	 * Default filter dialog height (used for Advanced filtering [mode](ui.iggridfiltering#options:mode)).
+	 *
 	 */
 
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogHeight"): string|number;
@@ -41244,6 +47977,7 @@ interface JQuery {
 	/**
 	 * Default filter dialog height (used for Advanced filtering [mode](ui.iggridfiltering#options:mode)).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -41251,6 +47985,7 @@ interface JQuery {
 
 	/**
 	 * Width of the filtering condition dropdowns in the advanced filter dialog.
+	 *
 	 */
 
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogFilterDropDownDefaultWidth"): string|number;
@@ -41258,6 +47993,7 @@ interface JQuery {
 	/**
 	 * Width of the filtering condition dropdowns in the advanced filter dialog.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -41265,6 +48001,7 @@ interface JQuery {
 
 	/**
 	 * Width of the filtering expression input boxes in the advanced filter dialog.
+	 *
 	 */
 
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogExprInputDefaultWidth"): string|number;
@@ -41272,6 +48009,7 @@ interface JQuery {
 	/**
 	 * Width of the filtering expression input boxes in the advanced filter dialog.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -41279,6 +48017,7 @@ interface JQuery {
 
 	/**
 	 * Width of the column chooser dropdowns in the advanced filter dialog.
+	 *
 	 */
 
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogColumnDropDownDefaultWidth"): string|number;
@@ -41286,6 +48025,7 @@ interface JQuery {
 	/**
 	 * Width of the column chooser dropdowns in the advanced filter dialog.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -41293,18 +48033,21 @@ interface JQuery {
 
 	/**
 	 * Enable/disable filter button visibility. If false, no filter dropdown buttons will be rendered and a predefined list of filters will not be rendered for the columns.
+	 *
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "renderFilterButton"): boolean;
 
 	/**
 	 * Enable/disable filter button visibility. If false, no filter dropdown buttons will be rendered and a predefined list of filters will not be rendered for the columns.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "renderFilterButton", optionValue: boolean): void;
 
 	/**
 	 * The filtering button for filter dropdowns can be rendered either on the left of the filter editor, or on the right.
+	 *
 	 */
 
 	igGridFiltering(optionLiteral: 'option', optionName: "filterButtonLocation"): string;
@@ -41312,6 +48055,7 @@ interface JQuery {
 	/**
 	 * The filtering button for filter dropdowns can be rendered either on the left of the filter editor, or on the right.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -41405,24 +48149,28 @@ interface JQuery {
 
 	/**
 	 * Custom template for add condition area in the filter dialog. The default template is "<div><span>${label1}</span><div><select></select></div><span>${label2}</span></div>".
+	 *
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogAddConditionTemplate"): string;
 
 	/**
 	 * Custom template for add condition area in the filter dialog. The default template is "<div><span>${label1}</span><div><select></select></div><span>${label2}</span></div>".
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogAddConditionTemplate", optionValue: string): void;
 
 	/**
 	 * Custom template for options in dropdown in add condition area in the filter dialog. The default template is "<option value='${value}'>${text}</option>".
+	 *
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogAddConditionDropDownTemplate"): string;
 
 	/**
 	 * Custom template for options in dropdown in add condition area in the filter dialog. The default template is "<option value='${value}'>${text}</option>".
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogAddConditionDropDownTemplate", optionValue: string): void;
@@ -41433,6 +48181,7 @@ interface JQuery {
 	 * E.g.: DOM element used for selecting column has attribute "data-af-col", for selecting filter condition - "data-af-cond", for filter expression- "data-af-expr".
 	 * NOTE: The template is supported only with <tr />.
 	 * The default template is "<tr data-af-row><td><input data-af-col/></td><td><select data-af-cond></select></td><td><input data-af-expr /> </td><td><span data-af-rmv></span></td></tr>".
+	 *
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogFilterTemplate"): string;
 
@@ -41443,24 +48192,28 @@ interface JQuery {
 	 * NOTE: The template is supported only with <tr />.
 	 * The default template is "<tr data-af-row><td><input data-af-col/></td><td><select data-af-cond></select></td><td><input data-af-expr /> </td><td><span data-af-rmv></span></td></tr>".
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogFilterTemplate", optionValue: string): void;
 
 	/**
 	 * Custom template for options in condition list in filter dialog. The default template is "<option value='${condition}'>${text}</option>".
+	 *
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogFilterConditionTemplate"): string;
 
 	/**
 	 * Custom template for options in condition list in filter dialog. The default template is "<option value='${condition}'>${text}</option>".
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogFilterConditionTemplate", optionValue: string): void;
 
 	/**
 	 * Add button width - in the advanced filter dialog.
+	 *
 	 */
 
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogAddButtonWidth"): string|number;
@@ -41468,6 +48221,7 @@ interface JQuery {
 	/**
 	 * Add button width - in the advanced filter dialog.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -41475,6 +48229,7 @@ interface JQuery {
 
 	/**
 	 * Width of the Ok and Cancel buttons in the advanced filtering dialogs.
+	 *
 	 */
 
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogOkCancelButtonWidth"): string|number;
@@ -41482,6 +48237,7 @@ interface JQuery {
 	/**
 	 * Width of the Ok and Cancel buttons in the advanced filtering dialogs.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -41489,12 +48245,14 @@ interface JQuery {
 
 	/**
 	 * Maximum number of filter rows in the advanced filtering dialog. If this number is exceeded, an error message will be rendered.
+	 *
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogMaxFilterCount"): number;
 
 	/**
 	 * Maximum number of filter rows in the advanced filtering dialog. If this number is exceeded, an error message will be rendered.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogMaxFilterCount", optionValue: number): void;
@@ -41519,63 +48277,309 @@ interface JQuery {
 
 	/**
 	 * Enable/disable empty condition visibility in the filter. If true, shows empty and not empty filtering conditions in the dropdowns.
+	 *
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "showEmptyConditions"): boolean;
 
 	/**
 	 * Enable/disable empty condition visibility in the filter. If true, shows empty and not empty filtering conditions in the dropdowns.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "showEmptyConditions", optionValue: boolean): void;
 
 	/**
 	 * Enable/disable visibility of null and not null filtering conditions in the dropdowns. If true, shows null and not null filtering conditions in the dropdowns.
+	 *
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "showNullConditions"): boolean;
 
 	/**
 	 * Enable/disable visibility of null and not null filtering conditions in the dropdowns. If true, shows null and not null filtering conditions in the dropdowns.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "showNullConditions", optionValue: boolean): void;
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog.
+	 *
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "dialogWidget"): string;
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "dialogWidget", optionValue: string): void;
 
 	/**
 	 * Enables/disables filtering persistence between states.
+	 *
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "persist"): boolean;
 
 	/**
 	 * Enables/disables filtering persistence between states.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "persist", optionValue: boolean): void;
 
 	/**
 	 * Enables/disables feature inheritance for the child [layouts](ui.ighierarchicalgrid#options:columnLayouts). NOTE: It only applies for [igHierarchicalGrid](ui.ighierarchicalgrid).
+	 *
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "inherit"): boolean;
 
 	/**
 	 * Enables/disables feature inheritance for the child [layouts](ui.ighierarchicalgrid#options:columnLayouts). NOTE: It only applies for [igHierarchicalGrid](ui.ighierarchicalgrid).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridFiltering(optionLiteral: 'option', optionName: "inherit", optionValue: boolean): void;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	igGridFiltering(optionLiteral: 'option', optionName: "language"): string;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igGridFiltering(optionLiteral: 'option', optionName: "language", optionValue: string): void;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+
+	igGridFiltering(optionLiteral: 'option', optionName: "regional"): string|Object;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igGridFiltering(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
+
+	/**
+	 * Event fired before a filtering operation is executed (remote request or local).
+	 * Return false in order to cancel filtering operation.
+	 */
+	igGridFiltering(optionLiteral: 'option', optionName: "dataFiltering"): DataFilteringEvent;
+
+	/**
+	 * Event fired before a filtering operation is executed (remote request or local).
+	 * Return false in order to cancel filtering operation.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igGridFiltering(optionLiteral: 'option', optionName: "dataFiltering", optionValue: DataFilteringEvent): void;
+
+	/**
+	 * Event fired after the filtering has been executed and results are rendered.
+	 */
+	igGridFiltering(optionLiteral: 'option', optionName: "dataFiltered"): DataFilteredEvent;
+
+	/**
+	 * Event fired after the filtering has been executed and results are rendered.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igGridFiltering(optionLiteral: 'option', optionName: "dataFiltered", optionValue: DataFilteredEvent): void;
+
+	/**
+	 * Event fired before the filter dropdown is opened for a specific column.
+	 * Return false in order to cancel dropdown opening.
+	 */
+	igGridFiltering(optionLiteral: 'option', optionName: "dropDownOpening"): DropDownOpeningEvent;
+
+	/**
+	 * Event fired before the filter dropdown is opened for a specific column.
+	 * Return false in order to cancel dropdown opening.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igGridFiltering(optionLiteral: 'option', optionName: "dropDownOpening", optionValue: DropDownOpeningEvent): void;
+
+	/**
+	 * Event fired after the filter dropdown is opened for a specific column.
+	 */
+	igGridFiltering(optionLiteral: 'option', optionName: "dropDownOpened"): DropDownOpenedEvent;
+
+	/**
+	 * Event fired after the filter dropdown is opened for a specific column.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igGridFiltering(optionLiteral: 'option', optionName: "dropDownOpened", optionValue: DropDownOpenedEvent): void;
+
+	/**
+	 * Event fired before the filter dropdown starts closing.
+	 * Return false in order to cancel dropdown closing.
+	 */
+	igGridFiltering(optionLiteral: 'option', optionName: "dropDownClosing"): DropDownClosingEvent;
+
+	/**
+	 * Event fired before the filter dropdown starts closing.
+	 * Return false in order to cancel dropdown closing.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igGridFiltering(optionLiteral: 'option', optionName: "dropDownClosing", optionValue: DropDownClosingEvent): void;
+
+	/**
+	 * Event fired after a filter column dropdown is completely closed.
+	 */
+	igGridFiltering(optionLiteral: 'option', optionName: "dropDownClosed"): DropDownClosedEvent;
+
+	/**
+	 * Event fired after a filter column dropdown is completely closed.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igGridFiltering(optionLiteral: 'option', optionName: "dropDownClosed", optionValue: DropDownClosedEvent): void;
+
+	/**
+	 * Event fired before the advanced filtering dialog is opened.
+	 * Return false in order to cancel filter dialog opening.
+	 */
+	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogOpening"): FilterDialogOpeningEvent;
+
+	/**
+	 * Event fired before the advanced filtering dialog is opened.
+	 * Return false in order to cancel filter dialog opening.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogOpening", optionValue: FilterDialogOpeningEvent): void;
+
+	/**
+	 * Event fired after the advanced filter dialog is already opened.
+	 */
+	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogOpened"): FilterDialogOpenedEvent;
+
+	/**
+	 * Event fired after the advanced filter dialog is already opened.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogOpened", optionValue: FilterDialogOpenedEvent): void;
+
+	/**
+	 * Event fired every time the advanced filter dialog changes its position.
+	 */
+	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogMoving"): FilterDialogMovingEvent;
+
+	/**
+	 * Event fired every time the advanced filter dialog changes its position.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogMoving", optionValue: FilterDialogMovingEvent): void;
+
+	/**
+	 * Event fired before a filter row is added to the advanced filter dialog.
+	 * Return false in order to cancel filter adding to the advanced filtering dialog.
+	 */
+	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogFilterAdding"): FilterDialogFilterAddingEvent;
+
+	/**
+	 * Event fired before a filter row is added to the advanced filter dialog.
+	 * Return false in order to cancel filter adding to the advanced filtering dialog.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogFilterAdding", optionValue: FilterDialogFilterAddingEvent): void;
+
+	/**
+	 * Event fired after a filter row is added to the advanced filter dialog.
+	 */
+	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogFilterAdded"): FilterDialogFilterAddedEvent;
+
+	/**
+	 * Event fired after a filter row is added to the advanced filter dialog.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogFilterAdded", optionValue: FilterDialogFilterAddedEvent): void;
+
+	/**
+	 * Event fired before the advanced filter dialog is closed.
+	 * Return false in order to cancel filtering dialog closing.
+	 */
+	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogClosing"): FilterDialogClosingEvent;
+
+	/**
+	 * Event fired before the advanced filter dialog is closed.
+	 * Return false in order to cancel filtering dialog closing.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogClosing", optionValue: FilterDialogClosingEvent): void;
+
+	/**
+	 * Event fired after the advanced filter dialog has been closed.
+	 */
+	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogClosed"): FilterDialogClosedEvent;
+
+	/**
+	 * Event fired after the advanced filter dialog has been closed.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogClosed", optionValue: FilterDialogClosedEvent): void;
+
+	/**
+	 * Event fired before the contents of the advanced filter dialog are rendered.
+	 * Return false in order to cancel filtering dialog rendering.
+	 */
+	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogContentsRendering"): FilterDialogContentsRenderingEvent;
+
+	/**
+	 * Event fired before the contents of the advanced filter dialog are rendered.
+	 * Return false in order to cancel filtering dialog rendering.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogContentsRendering", optionValue: FilterDialogContentsRenderingEvent): void;
+
+	/**
+	 * Event fired after the contents of the advanced filter dialog are rendered.
+	 */
+	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogContentsRendered"): FilterDialogContentsRenderedEvent;
+
+	/**
+	 * Event fired after the contents of the advanced filter dialog are rendered.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogContentsRendered", optionValue: FilterDialogContentsRenderedEvent): void;
+
+	/**
+	 * Event fired when the OK button in the advanced filter dialog is pressed.
+	 */
+	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogFiltering"): FilterDialogFilteringEvent;
+
+	/**
+	 * Event fired when the OK button in the advanced filter dialog is pressed.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igGridFiltering(optionLiteral: 'option', optionName: "filterDialogFiltering", optionValue: FilterDialogFilteringEvent): void;
 	igGridFiltering(options: IgGridFiltering): JQuery;
 	igGridFiltering(optionLiteral: 'option', optionName: string): any;
 	igGridFiltering(optionLiteral: 'option', options: IgGridFiltering): JQuery;
@@ -41585,17 +48589,20 @@ interface JQuery {
 interface IgGridColumnGroupOptions {
 	/**
 	 * Sets whether the group is expanded or collapsed. Applied only if the allowGroupCollapsing is set to true.
+	 *
 	 */
 	expanded?: boolean;
 
 	/**
 	 * Sets whether expansion indicators are visible in the group header.
+	 *
 	 */
 	allowGroupCollapsing?: boolean;
 
 	/**
 	 * Sets when should the group be hidden. Applied only if the allowGroupCollapsing is set to true.
 	 *
+	 *
 	 * Valid values:
 	 * "never" never hide the group
 	 * "always" always hide the group
@@ -41613,17 +48620,20 @@ interface IgGridColumnGroupOptions {
 interface IgGridColumn {
 	/**
 	 * Header text for the specified column.
+	 *
 	 */
 	headerText?: string;
 
 	/**
 	 * The property in the data source to which the column is bound. Also used to identify the column by, and find specific columns with API methods such as [columnByKey](ui.iggrid#methods:columnByKey).
+	 *
 	 */
 	key?: string;
 
 	/**
 	 * Reference to a function (string or function) which will be used for formatting the cell values. The function should accept a value and return the new formatted value. [Here column formatting is explained in details](http://www.igniteui.com/help/iggrid-columns-and-layout#column-formatting)
 	 *
+	 *
 	 * Valid values:
 	 * "string" The name of the function which will be used for formatting the cell values.
 	 * "function" Function which will be used for formatting the cell values. The function should accept a value and return the new formatted value.
@@ -41644,12 +48654,21 @@ interface IgGridColumn {
 
 	/**
 	 * Data type of the column cell values: string, number, bool, date, object.
+	 *
+	 *
+	 * Valid values:
+	 * "string" Used when the data for the column is of type string
+	 * "number" Used when the data for the column is of type number
+	 * "boolean" Used when the data for the column is of type boolean
+	 * "date" Used when the data for the column is of type date
+	 * "object" Used when the data for the column is of type object
 	 */
-	dataType?: string|number|boolean|Date|Object;
+	dataType?: string;
 
 	/**
 	 * Width of the column in pixels or percentage. Can also be set as '*', in which case the width auto-size based on the content of the column cells (including the header text).If width is not defined and [defaultColumnWidth](ui.iggrid#options:defaultColumnWidth) is set, it is assumed for all columns.
 	 *
+	 *
 	 * Valid values:
 	 * "string" The column width can be set in pixels (px), percentage (%) or as '*' in order to auto-size based on the cells and header content.
 	 * "number" The column width can be set as a number
@@ -41658,32 +48677,38 @@ interface IgGridColumn {
 
 	/**
 	 * Initial visibility of the column. A column can be hidden without the Hiding feature being enabled but there will be no UI for unhiding it. Columns can be defined as hidden in the options of the Hiding feature as well and those definitions take precedence.
+	 *
 	 */
 	hidden?: boolean;
 
 	/**
 	 * Sets a template for an individual column. the contents of the template should be the HTML markup that goes inside the table cell, or the entire table cell markup. [Here's an example of creating a basic column template](http://www.igniteui.com/help/creating-a-basic-column-template-in-the-iggrid)
+	 *
 	 */
 	template?: string;
 
 	/**
 	 * Sets whether column data is derived from the datasource. If set to true, then the cells in this column are not bound to the data source. The data in this column is populated using [formula](ui.iggrid#options:columns.formula), or using [unboundValues](ui.iggrid#options:columns.unboundValues), or through the [setUnboundValues](ui.iggrid#methods:setUnboundValues) API method. [Here's an overview of the unbound columns feature](http://www.igniteui.com/help/iggrid-unboundcolumns-overview)
+	 *
 	 */
 	unbound?: boolean;
 
 	/**
 	 * Options used to configure collapsible column [groups](ui.iggrid#options:columns.group).
+	 *
 	 */
 	groupOptions?: IgGridColumnGroupOptions;
 
 	/**
 	 * Array of child column definitions. If the column has the property group than the grid has multi column headers.
+	 *
 	 */
 	group?: any[];
 
 	/**
 	 * Determines the way in which dates will be displayed in the grid for this column.
 	 *
+	 *
 	 * Valid values:
 	 * "local" The dates for this column will be rendered in the client's local timezone.
 	 * "utc" The dates for this column will be rendered in their UTC representation.
@@ -41699,6 +48724,7 @@ interface IgGridColumn {
 	/**
 	 * A reference to or the name of a JavaScript function, which will calculate the value of the current cell based on other cell values in the same row. Used with [unbound columns](ui.iggrid#options:columns.unbound).
 	 *
+	 *
 	 * Valid values:
 	 * "string" The name of the JavaScript function.
 	 * "function" Reference to the JavaScript function.
@@ -41707,22 +48733,26 @@ interface IgGridColumn {
 
 	/**
 	 * Array of values which will be populated in the column cells at initialization, if the column is [unbound](ui.iggrid#options:columns.unbound).
+	 *
 	 */
 	unboundValues?: any[];
 
 	/**
 	 * Space-separated list of CSS classes to be applied on the header cell of this column.
+	 *
 	 */
 	headerCssClass?: string;
 
 	/**
 	 * Space-separated list of CSS classes to be applied on the data cells of this column. The class is not applied if the column has a column [template](ui.iggrid#options:columns.template) defined, which contains full <td> definition in the template.
+	 *
 	 */
 	columnCssClass?: string;
 
 	/**
 	 * This option is applicable only for columns with [dataType](ui.iggrid#options:columns.dataType) of object. Reference to a function, or the name of the function, that will be used for complex data extraction from the data records, whose return value will be used for all data operations associated with this column and will be displayed as cell value. [Here you can find more examples of how to setup a column mapper](http://www.igniteui.com/help/iggrid-columns-and-layout#defining-mapper)
 	 *
+	 *
 	 * Valid values:
 	 * "string" The name of the mapper function.
 	 * "function" Reference to the mapper function.
@@ -41731,26 +48761,31 @@ interface IgGridColumn {
 
 	/**
 	 * Specifies the row index of the cell in a Multi-Row Layout configuration. All columns must have this property set for the multi-row-layout mode to be enabled. [Here you can find more about the Multi-Row Layout feature](http://www.igniteui.com/help/iggrid-multirowlayout)
+	 *
 	 */
 	rowIndex?: number;
 
 	/**
 	 * Specifies the column index of the cell in a Multi-Row Layout configuration. All columns must have this property set for the multi-row-layout mode to be enabled. [Here you can find more about the Multi-Row Layout feature](http://www.igniteui.com/help/iggrid-multirowlayout)
+	 *
 	 */
 	columnIndex?: number;
 
 	/**
 	 * Specifies the navigation index of the cell for the TAB sequence when the cells are in edit mode in a Multi-Row Layout grid. Has no effect otherwise. [Here you can find more about the Multi-Row Layout feature](http://www.igniteui.com/help/iggrid-multirowlayout)
+	 *
 	 */
 	navigationIndex?: number;
 
 	/**
 	 * Specifies the colSpan of the cell in a Multi-Row Layout configuration. colSpan 0 is not supported and will be changed to 1 by the grid. [Here you can find more about the Multi-Row Layout feature](http://www.igniteui.com/help/iggrid-multirowlayout)
+	 *
 	 */
 	colSpan?: number;
 
 	/**
 	 * Specifies the rowSpan of the cell in a Multi-Row Layout configuration. rowSpan 0 is not supported and will be changed to 1 by the grid. [Here you can find more about the Multi-Row Layout feature](http://www.igniteui.com/help/iggrid-multirowlayout). If multi-row-layout is not used but multi-column-header is set then this option is used to adjust span of header cell.
+	 *
 	 */
 	rowSpan?: number;
 
@@ -41775,16 +48810,19 @@ interface IgGridFeature {
 interface IgGridRestSettingsCreate {
 	/**
 	 * Specifies a remote URL to which create requests will be sent. This will be used for both batch and non-batch, however if template is also set, this URL will only be used for batch requests.
+	 *
 	 */
 	url?: string;
 
 	/**
 	 * Specifies a remote URL template. Use ${id} in place of the resource id.
+	 *
 	 */
 	template?: string;
 
 	/**
 	 * Specifies whether create requests will be sent in batches
+	 *
 	 */
 	batch?: boolean;
 
@@ -41841,6 +48879,7 @@ interface IgGridRestSettingsRemove {
 interface IgGridRestSettings {
 	/**
 	 * Settings for create requests
+	 *
 	 */
 	create?: IgGridRestSettingsCreate;
 
@@ -41861,11 +48900,13 @@ interface IgGridRestSettings {
 
 	/**
 	 * Specifies a custom function to serialize content sent to the server. It should accept a single object or an array of objects and return a string. If not specified, JSON.stringify() will be used.
+	 *
 	 */
 	contentSerializer?: Function;
 
 	/**
 	 * Specifies the content type of the request. See http://api.jquery.com/jQuery.ajax/ => contentType
+	 *
 	 */
 	contentType?: string;
 
@@ -41878,41 +48919,49 @@ interface IgGridRestSettings {
 interface IgGridScrollSettings {
 	/**
 	 * Sets gets current vertical position.
+	 *
 	 */
 	scrollTop?: number;
 
 	/**
 	 * Sets gets current horizontal position.
+	 *
 	 */
 	scrollLeft?: number;
 
 	/**
 	 * Sets gets the step of the default scrolling behavior when using the mouse wheel.
+	 *
 	 */
 	wheelStep?: number;
 
 	/**
 	 * Sets gets if smoother scrolling with small intertia should be used when using the mouse wheel.
+	 *
 	 */
 	smoothing?: boolean;
 
 	/**
 	 * Sets or gets the modifier for how many pixels will be scrolled when using the mouse wheel once. This is used only for the [smooth scrolling behavior](ui.iggrid#options:scrollSettings.smoothing).
+	 *
 	 */
 	smoothingStep?: number;
 
 	/**
 	 * Sets or gets the modifier for how long the scroll ‘animation’ lasts when using the mouse wheel once. This is used only for the [smooth scrolling behavior](ui.iggrid#options:scrollSettings.smoothing).
+	 *
 	 */
 	smoothingDuration?: number;
 
 	/**
 	 * Sets gets the modifier for how much the inertia scrolls on touch devices. Note: Value set to 0 would disable touch movements. Value set to -1 would invert them.
+	 *
 	 */
 	inertiaStep?: number;
 
 	/**
 	 * Sets gets the modifier for how long the inertia last on touch devices.
+	 *
 	 */
 	inertiaDuration?: number;
 
@@ -42231,9 +49280,16 @@ interface DestroyedEventUIParam {
 }
 
 interface IgGrid {
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	locale?: any;
+
 	/**
 	 * Defines the grid width in pixels or percents. [Here you can find more info about setting igGrid width](http://www.igniteui.com/help/iggrid-columns-and-layout#width-height).
 	 *
+	 *
 	 * Valid values:
 	 * "string" The widget width can be set in pixels (px) or percentage (%). Example values: "800px", "800" (defaults to pixels), "100%".
 	 * "number" The widget width can be set in pixels as a number. Example values: 800, 700.
@@ -42244,6 +49300,7 @@ interface IgGrid {
 	/**
 	 * This is the total height of the grid, including all UI elements - scroll container with data rows, header, footer, filter row - (if any), etc. [Here you can find more info about setting igGrid height](http://www.igniteui.com/help/iggrid-columns-and-layout#width-height).
 	 *
+	 *
 	 * Valid values:
 	 * "string" The widget height can be set in pixels (px) and percentage (%).
 	 * "number" The widget height can be set as a number
@@ -42253,12 +49310,14 @@ interface IgGrid {
 
 	/**
 	 * If autoAdjustHeight is set to false, the [height](ui.iggrid#options:height) will be set only on the scrolling container, and all other UI elements such as paging footer / filter row / headers will add on top of that, so the total height of the grid will be more than this value - the height of the scroll container (content area) will not be dynamically calculated. Setting this option to false will usually result in a lot better initial rendering performance for large data sets ( > 1000 rows rendered at once, no [virtualization](ui.iggrid#options:virtualization) enabled), since no reflows will be made by browsers when accessing DOM properties such as offsetHeight.
+	 *
 	 */
 	autoAdjustHeight?: boolean;
 
 	/**
 	 * Used for [row virtualization](ui.iggrid#options:rowVirtualization) in [fixed mode](ui.iggrid#options:virtualizationMode). This is the average value in pixels (default) that will be used to calculate how many rows to render as the end user scrolls. Also all rows' height will be automatically set to this value.
 	 *
+	 *
 	 * Valid values:
 	 * "string" The avarage row height can be set in pixels ("25px").
 	 * "number" The avarage row height can be set in pixels as a number (25).
@@ -42268,6 +49327,7 @@ interface IgGrid {
 	/**
 	 * Used for [column virtualization](ui.iggrid#options:columnVirtualization) in [fixed mode](ui.iggrid#options:virtualizationMode). This is the average value in pixels for a column width.
 	 *
+	 *
 	 * Valid values:
 	 * "string" The avarage column width can be set in pixels ("25px").
 	 * "number" The avarage column width can be set in pixels as a number (25).
@@ -42275,10 +49335,11 @@ interface IgGrid {
 	avgColumnWidth?: string|number;
 
 	/**
-	 * Default column width that will be set for all columns, that don't have [column width](ui.iggrid#options:columns.width) defined.
+	 * Default column width that will be set for all columns, that don't have [column width](ui.iggrid#options:columns.width) defined. Can also be set as '*', in which case the width auto-size based on the content of the column cells (including the header text).
+	 *
 	 *
 	 * Valid values:
-	 * "string" The default column width can be set in pixels ("100px").
+	 * "string" The default column width can be set in pixels ("100px") or as '*' in order to auto-size based on the cells and header content.
 	 * "number" The default column width can be set in pixels as a number (100).
 	 */
 	defaultColumnWidth?: string|number;
@@ -42287,17 +49348,20 @@ interface IgGrid {
 	 * If no [columns](ui.iggrid#options:columns) collection is defined, and autoGenerateColumns is set to true, [columns](ui.iggrid#options:columns) will be inferred from the data source before the [dataRendering](ui.iggrid#events:dataRendering) event is fired. The inferred [columns](ui.iggrid#options:columns) collection will be available to the developer for modification at [dataRendering](ui.iggrid#events:dataRendering). If autoGenerateColumns is not explicitly set and [columns](ui.iggrid#options:columns) has at least one column defined then autoGenerateColumns is automatically set to false.
 	 * If autoGenerateColumns is true and there are columns defined auto-generated columns will render after the explicitly defined ones.
 	 * Since auto-generated columns don't have width defined consider setting [defaultColumnWidth](ui.iggrid#options:defaultColumnWidth) as well.
+	 *
 	 */
 	autoGenerateColumns?: boolean;
 
 	/**
 	 * Enables/disables column and row virtualization at the same time. Virtualization can greatly enhance rendering performance. If enabled, the number of actual rendered rows (DOM elements) will be constant and related to the visible viewport of the grid. As the end user scrolls, those DOM elements will be dynamically reused to render the new data. [Here you can find more info about the performance guidelines when using the igGrid](http://www.igniteui.com/help/iggrid-performance-guide)
+	 *
 	 */
 	virtualization?: boolean;
 
 	/**
 	 * Determines row virtualization mode.
 	 *
+	 *
 	 * Valid values:
 	 * "fixed" Renders only the visible rows and/or columns in the grid. On scrolling the same rows and/or columns are updated with new data from the data source. Only fixed virtualization can work with column virtualization at the same time. Fixed virtualization is not supported by some grid features: Resizing, Group By, Responsive.
 	 * "continuous" renders a pre-defined number of rows in the grid. On scrolling the continuous virtualization loads another portion of rows and disposes the current one.
@@ -42306,27 +49370,32 @@ interface IgGrid {
 
 	/**
 	 * Enables virtualization for rows only. [Here you can find more info about igGrid row virtualization](http://www.igniteui.com/help/iggrid-virtualization-overview)
+	 *
 	 */
 	rowVirtualization?: boolean;
 
 	/**
 	 * Enables virtualization for columns only. Column virtualization can work only in combination with fixed row virtalization. Setting columnVirtualization to true will automatically set [virtualization](ui.iggrid#options:virtualization) to true and [virtualizationMode](ui.iggrid#options:virtualizationMode) to "fixed".
+	 *
 	 */
 	columnVirtualization?: boolean;
 
 	/**
 	 * Number of pixels to scroll the grid by, when virtualization is enabled, and mouse wheel scrolling is performed over the virtual grid area. If "null" the step will be equal to the [avgRowHeight](ui.iggrid#options:avgRowHeight).
+	 *
 	 */
 	virtualizationMouseWheelStep?: number;
 
 	/**
 	 * If this option is set to true, the height of the grid row will be calculated automatically based on the [avgRowHeight](ui.iggrid#options:avgRowHeight) and the visible virtual records. If no [avgRowHeight](ui.iggrid#options:avgRowHeight) is specified, it will be calculated automatically at runtime.
+	 *
 	 */
 	adjustVirtualHeights?: boolean;
 
 	/**
 	 * The templating engine that will be used to render the grid [column templates](ui.iggrid#options:columns.template). [Here you can find](http://www.infragistics.com/community/blogs/marina_stoyanova/archive/2014/05/30/using-different-template-engines-with-ignite-ui-controls.aspx) how to use templating engines other than igTemplating and jsRender.
 	 *
+	 *
 	 * Valid values:
 	 * "infragistics" The grid will use the Infragistics Templating engine to render its [column templates](ui.iggrid#options:columns.template) and specific parts of the UI.
 	 * "jsRender" The grid will use jsRender to render its [column templates](ui.iggrid#options:columns.template) and specific parts of the UI.
@@ -42335,12 +49404,14 @@ interface IgGrid {
 
 	/**
 	 * An array of column objects. Checkout the [Columns and Layout](http://www.igniteui.com/help/iggrid-columns-and-layout#defining-columns) topic for details on configuring the columns array.
+	 *
 	 */
 	columns?: IgGridColumn[];
 
 	/**
 	 * Can be any valid data source accepted by [$.ig.DataSource](ig.datasource), or an instance of an $.ig.DataSource itself
 	 *
+	 *
 	 * Valid values:
 	 * "array" dataSource as an array
 	 * "object" ddataSource as an object
@@ -42350,86 +49421,102 @@ interface IgGrid {
 
 	/**
 	 * Specifies a remote URL as a data source, from which data will be retrieved using the [$.ig.DataSource](ig.datasource).
+	 *
 	 */
 	dataSourceUrl?: string;
 
 	/**
 	 * Explicitly set data source type (such as "json"). Please refer to the documentation of [$.ig.DataSource type](ig.datasource#options:settings.type).
+	 *
 	 */
 	dataSourceType?: string;
 
 	/**
 	 * See [$.ig.DataSource responseDataKey](ig.datasource#options:settings.responseDataKey). This is the property in the responses where data records are held, if the response is wrapped.
+	 *
 	 */
 	responseDataKey?: string;
 
 	/**
-	 * See [$.ig.DataSource responseTotalRecCountKey](ig.datasource#options:settings.responseTotalRecCountKey). Property in the response specifying the total number of records on the server.
+	 * This option has been deprecated. See [$.ig.DataSource responseTotalRecCountKey](ig.datasource#options:settings.responseTotalRecCountKey). Property in the response specifying the total number of records on the server.
 	 */
 	responseTotalRecCountKey?: string;
 
 	/**
 	 * Specifies the HTTP verb to be used to issue the requests to a remote data source.
+	 *
 	 */
 	requestType?: string;
 
 	/**
 	 * Content type of the response. See http://api.jquery.com/jQuery.ajax/ => contentType
+	 *
 	 */
 	responseContentType?: string;
 
 	/**
 	 * Controls the visibility of the grid header.
+	 *
 	 */
 	showHeader?: boolean;
 
 	/**
 	 * Controls the visibility of the grid footer.
+	 *
 	 */
 	showFooter?: boolean;
 
 	/**
 	 * Headers will be fixed if this option is set to true, and only the grid data will be scrollable. If [virtualization](ui.iggrid#options:virtualization) is enabled, fixedHeaders will always act as if it's true, no matter which value is set.
+	 *
 	 */
 	fixedHeaders?: boolean;
 
 	/**
 	 * Footers will be fixed if this option is set to true, and only the grid data will be scrollable. If [virtualization](ui.iggrid#options:virtualization) is enabled, fixedFooters will always act as if it's true, no matter which value is set.
+	 *
 	 */
 	fixedFooters?: boolean;
 
 	/**
 	 * Caption text that will be shown above the grid header.
+	 *
 	 */
 	caption?: string;
 
 	/**
 	 * List of grid feature definitions: sorting, paging, etc. Each feature goes with its separate options that are documented for the feature accordingly. [Here you can find detailed documentation for all igGrid features](http://www.igniteui.com/help/iggrid-features-landing-page)
+	 *
 	 */
 	features?: IgGridFeature[];
 
 	/**
 	 * Initial tabIndex attribute that will be set on all focusable elements.
+	 *
 	 */
 	tabIndex?: number;
 
 	/**
 	 * If this option is set to false, the data to which the grid is bound will be used "as is" with no additional transformations based on [columns](ui.iggrid#options:columns) defined. Otherwise only the subset of data properties used in the [columns](ui.iggrid#options:columns) defined will be extracted in a new object and used.
+	 *
 	 */
 	localSchemaTransform?: boolean;
 
 	/**
 	 * Key of the column containing unique identifiers for the data records.
+	 *
 	 */
 	primaryKey?: string;
 
 	/**
 	 * If true, the transaction log will always be sent in the request for remote data, by the data source. Also this means that if there are values in the log, a POST will be performed instead of GET.
+	 *
 	 */
 	serializeTransactionLog?: boolean;
 
 	/**
 	 * Automatically commits the transactions as rows/cells are being edited to the client data source. A [saveChanges](ui.iggrid#methods:saveChanges) call still needs to be performed in order to commit the transactions to a server-side data source.
+	 *
 	 */
 	autoCommit?: boolean;
 
@@ -42439,12 +49526,14 @@ interface IgGrid {
 	 * If a new row is added, edited, then deleted, there will be no transaction added to the log.
 	 * If several edits are made to a row or an individual cell, this should result in a single transaction.
 	 * Note: This option takes effect only when [autoCommit](ui.iggrid#options:autoCommit) is set to false.
+	 *
 	 */
 	aggregateTransactions?: boolean;
 
 	/**
 	 * Sets gets ability to automatically format text in cells for numeric and date columns. The format patterns and rules for numbers and dates are defined in $.ig.regional.defaults object. [Here column formatting is explained in details](http://www.igniteui.com/help/iggrid-columns-and-layout#column-formatting)
 	 *
+	 *
 	 * Valid values:
 	 * "date" formats only Date columns
 	 * "number" formats only number columns
@@ -42456,58 +49545,69 @@ interface IgGrid {
 
 	/**
 	 * Gets sets ability to render checkboxes and use checkbox editor when dataType of a column is "bool". Checkboxes are not rendered for boolean values in columns with a [column template](ui.iggrid#options:columns.template).
+	 *
 	 */
 	renderCheckboxes?: boolean;
 
 	/**
 	 * URL to which updating requests will be made.
+	 *
 	 */
 	updateUrl?: string;
 
 	/**
 	 * Settings related to REST compliant update routines.
+	 *
 	 */
 	restSettings?: IgGridRestSettings;
 
 	/**
 	 * Enables/disables rendering of alternating row styles (odd and even rows receive different styling).
+	 *
 	 */
 	alternateRowStyles?: boolean;
 
 	/**
 	 * If set to true and all columns' widths are specified and their combined width is less than the grid width then the last column width will be automatically adjusted to fill the remaining empty space of the grid.
+	 *
 	 */
 	autofitLastColumn?: boolean;
 
 	/**
 	 * Enables/disables rendering of hover styles when the mouse is over a record. This can be useful in templating scenarios, for example, where we don't want to apply hover styling to templated content.
+	 *
 	 */
 	enableHoverStyles?: boolean;
 
 	/**
 	 * Enables/Disables serializing client date as UTC ISO 8061 string instead of using the local time and zone values.
+	 *
 	 */
 	enableUTCDates?: boolean;
 
 	/**
 	 * Merge unbound columns values inside data source when data source is remote. If true then the unbound columns are merged to the data source at runtime on the server. Note that data source is expanded with the new data and this could cause performance issues when the data is huge. If mergeUnboundColumns is false then the unbound data is sent and merged on the client. This option is used by the [igGrid MVC Helper](http://www.igniteui.com/help/iggrid-developing-asp-net-mvc-applications-with-iggrid).
 	 * Checkout [Populating Unbound Columns Remotely (igGrid)](http://www.igniteui.com/help/iggrid-unboundcolumns-populating-with-data-remotely) topic for more information.
+	 *
 	 */
 	mergeUnboundColumns?: boolean;
 
 	/**
 	 * When dataSource is a remote URL, defines whether to set the type of the remote data source to JSONP.
+	 *
 	 */
 	jsonpRequest?: boolean;
 
 	/**
 	 * Enables/disables grid adjusting its dimensions when its [width](ui.iggrid#options:width) and/or [height](ui.iggrid#options:height) is set in percent (%) and grid parent DOM container is resized.
+	 *
 	 */
 	enableResizeContainerCheck?: boolean;
 
 	/**
 	 * Configures how the feature chooser icon should display on header cells - e.g. to display as gear icon or not.
 	 *
+	 *
 	 * Valid values:
 	 * "none" Always hide the feature chooser icon; The feature chooser is shown on tapping/clicking the column header.
 	 * "desktopOnly" Always show the icon on desktop but hide when touch device detected.
@@ -42517,9 +49617,22 @@ interface IgGrid {
 
 	/**
 	 * Settings related to content scrolling.
+	 *
 	 */
 	scrollSettings?: IgGridScrollSettings;
 
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	language?: string;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+	regional?: string|Object;
+
 	/**
 	 * Event fired when a cell is clicked.
 	 */
@@ -42658,6 +49771,11 @@ interface IgGridMethods {
 	 * Returns the element holding the data records
 	 */
 	widget(): void;
+
+	/**
+	 * Changes the the regional settings of widget element to the language specified in [options.regional](ui.iggrid#options:regional)
+	 * Note that this method is for rare scenarios, use [regional](ui.iggrid#options:regional) option setter
+	 */
 	changeRegional(): void;
 
 	/**
@@ -43001,6 +50119,8 @@ interface IgGridMethods {
 
 	/**
 	 * Causes the grid to data bind to the data source (local or remote) , and re-render all of the data as well
+	 *
+	 * @param internal
 	 */
 	dataBind(internal: Object): void;
 
@@ -43119,8 +50239,28 @@ interface IgGridMethods {
 	 * 1. Remove custom CSS classes that were added.
 	 * 2. Unwrap any wrapping elements such as scrolling divs and other containers.
 	 * 3. Unbind all events that were bound.
+	 *
+	 * @param notToCallDestroy
 	 */
 	destroy(notToCallDestroy: Object): void;
+
+	/**
+	 * Changes the all locales contained into a specified container to the language specified in [options.language](ui.igwidget#options:language)
+	 * Note that this method is for rare scenarios, use [language](ui.igwidget#options:language) or [locale](ui.igwidget#options:locale) option setter
+	 *
+	 * @param $container Optional parameter - if not set it would use the element of the widget as $container
+	 */
+	changeLocale($container: Object): void;
+
+	/**
+	 * Changes the widget language to global language. Global language is the value in $.ig.util.language
+	 */
+	changeGlobalLanguage(): void;
+
+	/**
+	 * Changes the widget regional settins to global regional settings. Global regional settings are container in $.ig.util.regional
+	 */
+	changeGlobalRegional(): void;
 }
 interface JQuery {
 	data(propertyName: "igGrid"): IgGridMethods;
@@ -43199,9 +50339,27 @@ interface JQuery {
 	igGrid(methodName: "virtualScrollTo", scrollerPosition: Object): void;
 	igGrid(methodName: "getColumnByTD", $td: Object): Object;
 	igGrid(methodName: "destroy", notToCallDestroy: Object): void;
+	igGrid(methodName: "changeLocale", $container: Object): void;
+	igGrid(methodName: "changeGlobalLanguage"): void;
+	igGrid(methodName: "changeGlobalRegional"): void;
+
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	igGrid(optionLiteral: 'option', optionName: "locale"): any;
+
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igGrid(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
 
 	/**
 	 * Defines the grid width in pixels or percents. [Here you can find more info about setting igGrid width](http://www.igniteui.com/help/iggrid-columns-and-layout#width-height).
+	 *
 	 */
 
 	igGrid(optionLiteral: 'option', optionName: "width"): string|number;
@@ -43209,6 +50367,7 @@ interface JQuery {
 	/**
 	 * Defines the grid width in pixels or percents. [Here you can find more info about setting igGrid width](http://www.igniteui.com/help/iggrid-columns-and-layout#width-height).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -43216,6 +50375,7 @@ interface JQuery {
 
 	/**
 	 * This is the total height of the grid, including all UI elements - scroll container with data rows, header, footer, filter row - (if any), etc. [Here you can find more info about setting igGrid height](http://www.igniteui.com/help/iggrid-columns-and-layout#width-height).
+	 *
 	 */
 
 	igGrid(optionLiteral: 'option', optionName: "height"): string|number;
@@ -43223,6 +50383,7 @@ interface JQuery {
 	/**
 	 * This is the total height of the grid, including all UI elements - scroll container with data rows, header, footer, filter row - (if any), etc. [Here you can find more info about setting igGrid height](http://www.igniteui.com/help/iggrid-columns-and-layout#width-height).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -43230,18 +50391,21 @@ interface JQuery {
 
 	/**
 	 * If autoAdjustHeight is set to false, the [height](ui.iggrid#options:height) will be set only on the scrolling container, and all other UI elements such as paging footer / filter row / headers will add on top of that, so the total height of the grid will be more than this value - the height of the scroll container (content area) will not be dynamically calculated. Setting this option to false will usually result in a lot better initial rendering performance for large data  ( > 1000 rows rendered at once, no [virtualization](ui.iggrid#options:virtualization) enabled), since no reflows will be made by browsers when accessing DOM properties such as offsetHeight.
+	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "autoAdjustHeight"): boolean;
 
 	/**
 	 * If autoAdjustHeight is set to false, the [height](ui.iggrid#options:height) will be set only on the scrolling container, and all other UI elements such as paging footer / filter row / headers will add on top of that, so the total height of the grid will be more than this value - the height of the scroll container (content area) will not be dynamically calculated. Setting this option to false will usually result in a lot better initial rendering performance for large data sets ( > 1000 rows rendered at once, no [virtualization](ui.iggrid#options:virtualization) enabled), since no reflows will be made by browsers when accessing DOM properties such as offsetHeight.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "autoAdjustHeight", optionValue: boolean): void;
 
 	/**
 	 * Used for [row virtualization](ui.iggrid#options:rowVirtualization) in [fixed mode](ui.iggrid#options:virtualizationMode). This is the average value in pixels (default) that will be used to calculate how many rows to render as the end user scrolls. Also all rows' height will be automatically set to this value.
+	 *
 	 */
 
 	igGrid(optionLiteral: 'option', optionName: "avgRowHeight"): string|number;
@@ -43249,6 +50413,7 @@ interface JQuery {
 	/**
 	 * Used for [row virtualization](ui.iggrid#options:rowVirtualization) in [fixed mode](ui.iggrid#options:virtualizationMode). This is the average value in pixels (default) that will be used to calculate how many rows to render as the end user scrolls. Also all rows' height will be automatically set to this value.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -43256,6 +50421,7 @@ interface JQuery {
 
 	/**
 	 * Used for [column virtualization](ui.iggrid#options:columnVirtualization) in [fixed mode](ui.iggrid#options:virtualizationMode). This is the average value in pixels for a column width.
+	 *
 	 */
 
 	igGrid(optionLiteral: 'option', optionName: "avgColumnWidth"): string|number;
@@ -43263,19 +50429,22 @@ interface JQuery {
 	/**
 	 * Used for [column virtualization](ui.iggrid#options:columnVirtualization) in [fixed mode](ui.iggrid#options:virtualizationMode). This is the average value in pixels for a column width.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
 	igGrid(optionLiteral: 'option', optionName: "avgColumnWidth", optionValue: string|number): void;
 
 	/**
-	 * Default column width that will be set for all columns, that don't have [column width](ui.iggrid#options:columns.width) defined.
+	 * Default column width that will be set for all columns, that don't have [column width](ui.iggrid#options:columns.width) defined. Can also be set as '*', in which case the width auto-size based on the content of the column cells (including the header text).
+	 *
 	 */
 
 	igGrid(optionLiteral: 'option', optionName: "defaultColumnWidth"): string|number;
 
 	/**
-	 * Default column width that will be set for all columns, that don't have [column width](ui.iggrid#options:columns.width) defined.
+	 * Default column width that will be set for all columns, that don't have [column width](ui.iggrid#options:columns.width) defined. Can also be set as '*', in which case the width auto-size based on the content of the column cells (including the header text).
+	 *
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -43286,6 +50455,7 @@ interface JQuery {
 	 * If no [columns](ui.iggrid#options:columns) collection is defined, and autoGenerateColumns is set to true, [columns](ui.iggrid#options:columns) will be inferred from the data source before the [dataRendering](ui.iggrid#events:dataRendering) event is fired. The inferred [columns](ui.iggrid#options:columns) collection will be available to the developer for modification at [dataRendering](ui.iggrid#events:dataRendering). If autoGenerateColumns is not explicitly set and [columns](ui.iggrid#options:columns) has at least one column defined then autoGenerateColumns is automatically set to false.
 	 * If autoGenerateColumns is true and there are columns defined auto-generated columns will render after the explicitly defined ones.
 	 * Since auto-generated columns don't have width defined consider setting [defaultColumnWidth](ui.iggrid#options:defaultColumnWidth) as well.
+	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "autoGenerateColumns"): boolean;
 
@@ -43294,24 +50464,28 @@ interface JQuery {
 	 * If autoGenerateColumns is true and there are columns defined auto-generated columns will render after the explicitly defined ones.
 	 * Since auto-generated columns don't have width defined consider setting [defaultColumnWidth](ui.iggrid#options:defaultColumnWidth) as well.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "autoGenerateColumns", optionValue: boolean): void;
 
 	/**
 	 * Enables/disables column and row virtualization at the same time. Virtualization can greatly enhance rendering performance. If enabled, the number of actual rendered rows (DOM elements) will be constant and related to the visible viewport of the grid. As the end user scrolls, those DOM elements will be dynamically reused to render the new data. [Here you can find more info about the performance guidelines when using the igGrid](http://www.igniteui.com/help/iggrid-performance-guide)
+	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "virtualization"): boolean;
 
 	/**
 	 * Enables/disables column and row virtualization at the same time. Virtualization can greatly enhance rendering performance. If enabled, the number of actual rendered rows (DOM elements) will be constant and related to the visible viewport of the grid. As the end user scrolls, those DOM elements will be dynamically reused to render the new data. [Here you can find more info about the performance guidelines when using the igGrid](http://www.igniteui.com/help/iggrid-performance-guide)
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "virtualization", optionValue: boolean): void;
 
 	/**
 	 * Determines row virtualization mode.
+	 *
 	 */
 
 	igGrid(optionLiteral: 'option', optionName: "virtualizationMode"): string;
@@ -43319,6 +50493,7 @@ interface JQuery {
 	/**
 	 * Determines row virtualization mode.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -43326,54 +50501,63 @@ interface JQuery {
 
 	/**
 	 * Enables virtualization for rows only. [Here you can find more info about igGrid row virtualization](http://www.igniteui.com/help/iggrid-virtualization-overview)
+	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "rowVirtualization"): boolean;
 
 	/**
 	 * Enables virtualization for rows only. [Here you can find more info about igGrid row virtualization](http://www.igniteui.com/help/iggrid-virtualization-overview)
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "rowVirtualization", optionValue: boolean): void;
 
 	/**
 	 * Enables virtualization for columns only. Column virtualization can work only in combination with fixed row virtalization. Setting columnVirtualization to true will automatically set [virtualization](ui.iggrid#options:virtualization) to true and [virtualizationMode](ui.iggrid#options:virtualizationMode) to "fixed".
+	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "columnVirtualization"): boolean;
 
 	/**
 	 * Enables virtualization for columns only. Column virtualization can work only in combination with fixed row virtalization. Setting columnVirtualization to true will automatically set [virtualization](ui.iggrid#options:virtualization) to true and [virtualizationMode](ui.iggrid#options:virtualizationMode) to "fixed".
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "columnVirtualization", optionValue: boolean): void;
 
 	/**
 	 * Number of pixels to scroll the grid by, when virtualization is enabled, and mouse wheel scrolling is performed over the virtual grid area. If "null" the step will be equal to the [avgRowHeight](ui.iggrid#options:avgRowHeight).
+	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "virtualizationMouseWheelStep"): number;
 
 	/**
 	 * Number of pixels to scroll the grid by, when virtualization is enabled, and mouse wheel scrolling is performed over the virtual grid area. If "null" the step will be equal to the [avgRowHeight](ui.iggrid#options:avgRowHeight).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "virtualizationMouseWheelStep", optionValue: number): void;
 
 	/**
 	 * If this option is set to true, the height of the grid row will be calculated automatically based on the [avgRowHeight](ui.iggrid#options:avgRowHeight) and the visible virtual records. If no [avgRowHeight](ui.iggrid#options:avgRowHeight) is specified, it will be calculated automatically at runtime.
+	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "adjustVirtualHeights"): boolean;
 
 	/**
 	 * If this option is set to true, the height of the grid row will be calculated automatically based on the [avgRowHeight](ui.iggrid#options:avgRowHeight) and the visible virtual records. If no [avgRowHeight](ui.iggrid#options:avgRowHeight) is specified, it will be calculated automatically at runtime.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "adjustVirtualHeights", optionValue: boolean): void;
 
 	/**
 	 * The templating engine that will be used to render the grid [column templates](ui.iggrid#options:columns.template). [Here you can find](http://www.infragistics.com/community/blogs/marina_stoyanova/archive/2014/05/30/using-different-template-engines-with-ignite-ui-controls.aspx) how to use templating engines other than igTemplating and jsRender.
+	 *
 	 */
 
 	igGrid(optionLiteral: 'option', optionName: "templatingEngine"): string;
@@ -43381,6 +50565,7 @@ interface JQuery {
 	/**
 	 * The templating engine that will be used to render the grid [column templates](ui.iggrid#options:columns.template). [Here you can find](http://www.infragistics.com/community/blogs/marina_stoyanova/archive/2014/05/30/using-different-template-engines-with-ignite-ui-controls.aspx) how to use templating engines other than igTemplating and jsRender.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -43388,18 +50573,21 @@ interface JQuery {
 
 	/**
 	 * An array of column objects. Checkout the [Columns and Layout](http://www.igniteui.com/help/iggrid-columns-and-layout#defining-columns) topic for details on configuring the columns array.
+	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "columns"): IgGridColumn[];
 
 	/**
 	 * An array of column objects. Checkout the [Columns and Layout](http://www.igniteui.com/help/iggrid-columns-and-layout#defining-columns) topic for details on configuring the columns array.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "columns", optionValue: IgGridColumn[]): void;
 
 	/**
 	 * Can be any valid data source accepted by [$.ig.DataSource](ig.datasource), or an instance of an $.ig.DataSource itself
+	 *
 	 */
 
 	igGrid(optionLiteral: 'option', optionName: "dataSource"): Array<any>|Object|string;
@@ -43407,6 +50595,7 @@ interface JQuery {
 	/**
 	 * Can be any valid data source accepted by [$.ig.DataSource](ig.datasource), or an instance of an $.ig.DataSource itself
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -43414,47 +50603,53 @@ interface JQuery {
 
 	/**
 	 * Gets a remote URL as a data source, from which data will be retrieved using the [$.ig.DataSource](ig.datasource).
+	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "dataSourceUrl"): string;
 
 	/**
 	 * Sets a remote URL as a data source, from which data will be retrieved using the [$.ig.DataSource](ig.datasource).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "dataSourceUrl", optionValue: string): void;
 
 	/**
 	 * Explicitly set data source type (such as "json"). Please refer to the documentation of [$.ig.DataSource type](ig.datasource#options:settings.type).
+	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "dataSourceType"): string;
 
 	/**
 	 * Explicitly set data source type (such as "json"). Please refer to the documentation of [$.ig.DataSource type](ig.datasource#options:settings.type).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "dataSourceType", optionValue: string): void;
 
 	/**
 	 * See [$.ig.DataSource responseDataKey](ig.datasource#options:settings.responseDataKey). This is the property in the responses where data records are held, if the response is wrapped.
+	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "responseDataKey"): string;
 
 	/**
 	 * See [$.ig.DataSource responseDataKey](ig.datasource#options:settings.responseDataKey). This is the property in the responses where data records are held, if the response is wrapped.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "responseDataKey", optionValue: string): void;
 
 	/**
-	 * See [$.ig.DataSource responseTotalRecCountKey](ig.datasource#options:settings.responseTotalRecCountKey). Property in the response specifying the total number of records on the server.
+	 * This option has been deprecated. See [$.ig.DataSource responseTotalRecCountKey](ig.datasource#options:settings.responseTotalRecCountKey). Property in the response specifying the total number of records on the server.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "responseTotalRecCountKey"): string;
 
 	/**
-	 * See [$.ig.DataSource responseTotalRecCountKey](ig.datasource#options:settings.responseTotalRecCountKey). Property in the response specifying the total number of records on the server.
+	 * This option has been deprecated. See [$.ig.DataSource responseTotalRecCountKey](ig.datasource#options:settings.responseTotalRecCountKey). Property in the response specifying the total number of records on the server.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -43462,156 +50657,182 @@ interface JQuery {
 
 	/**
 	 * Gets the HTTP verb to be used to issue the requests to a remote data source.
+	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "requestType"): string;
 
 	/**
 	 * Sets the HTTP verb to be used to issue the requests to a remote data source.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "requestType", optionValue: string): void;
 
 	/**
 	 * Content type of the response. See http://api.jquery.com/jQuery.ajax/ => contentType
+	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "responseContentType"): string;
 
 	/**
 	 * Content type of the response. See http://api.jquery.com/jQuery.ajax/ => contentType
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "responseContentType", optionValue: string): void;
 
 	/**
 	 * Controls the visibility of the grid header.
+	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "showHeader"): boolean;
 
 	/**
 	 * Controls the visibility of the grid header.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "showHeader", optionValue: boolean): void;
 
 	/**
 	 * Controls the visibility of the grid footer.
+	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "showFooter"): boolean;
 
 	/**
 	 * Controls the visibility of the grid footer.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "showFooter", optionValue: boolean): void;
 
 	/**
 	 * Headers will be fixed if this option is set to true, and only the grid data will be scrollable. If [virtualization](ui.iggrid#options:virtualization) is enabled, fixedHeaders will always act as if it's true, no matter which value is set.
+	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "fixedHeaders"): boolean;
 
 	/**
 	 * Headers will be fixed if this option is set to true, and only the grid data will be scrollable. If [virtualization](ui.iggrid#options:virtualization) is enabled, fixedHeaders will always act as if it's true, no matter which value is set.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "fixedHeaders", optionValue: boolean): void;
 
 	/**
 	 * Footers will be fixed if this option is set to true, and only the grid data will be scrollable. If [virtualization](ui.iggrid#options:virtualization) is enabled, fixedFooters will always act as if it's true, no matter which value is set.
+	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "fixedFooters"): boolean;
 
 	/**
 	 * Footers will be fixed if this option is set to true, and only the grid data will be scrollable. If [virtualization](ui.iggrid#options:virtualization) is enabled, fixedFooters will always act as if it's true, no matter which value is set.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "fixedFooters", optionValue: boolean): void;
 
 	/**
 	 * Caption text that will be shown above the grid header.
+	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "caption"): string;
 
 	/**
 	 * Caption text that will be shown above the grid header.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "caption", optionValue: string): void;
 
 	/**
 	 * List of grid feature definitions: sorting, paging, etc. Each feature goes with its separate options that are documented for the feature accordingly. [Here you can find detailed documentation for all igGrid features](http://www.igniteui.com/help/iggrid-features-landing-page)
+	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "features"): IgGridFeature[];
 
 	/**
 	 * List of grid feature definitions: sorting, paging, etc. Each feature goes with its separate options that are documented for the feature accordingly. [Here you can find detailed documentation for all igGrid features](http://www.igniteui.com/help/iggrid-features-landing-page)
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "features", optionValue: IgGridFeature[]): void;
 
 	/**
 	 * Initial tabIndex attribute that will be set on all focusable elements.
+	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "tabIndex"): number;
 
 	/**
 	 * Initial tabIndex attribute that will be set on all focusable elements.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "tabIndex", optionValue: number): void;
 
 	/**
 	 * If this option is set to false, the data to which the grid is bound will be used "as is" with no additional transformations based on [columns](ui.iggrid#options:columns) defined. Otherwise only the subset of data properties used in the [columns](ui.iggrid#options:columns) defined will be extracted in a new object and used.
+	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "localSchemaTransform"): boolean;
 
 	/**
 	 * If this option is set to false, the data to which the grid is bound will be used "as is" with no additional transformations based on [columns](ui.iggrid#options:columns) defined. Otherwise only the subset of data properties used in the [columns](ui.iggrid#options:columns) defined will be extracted in a new object and used.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "localSchemaTransform", optionValue: boolean): void;
 
 	/**
 	 * Key of the column containing unique identifiers for the data records.
+	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "primaryKey"): string;
 
 	/**
 	 * Key of the column containing unique identifiers for the data records.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "primaryKey", optionValue: string): void;
 
 	/**
 	 * If true, the transaction log will always be sent in the request for remote data, by the data source. Also this means that if there are values in the log, a POST will be performed instead of GET.
+	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "serializeTransactionLog"): boolean;
 
 	/**
 	 * If true, the transaction log will always be sent in the request for remote data, by the data source. Also this means that if there are values in the log, a POST will be performed instead of GET.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "serializeTransactionLog", optionValue: boolean): void;
 
 	/**
 	 * Automatically commits the transactions as rows/cells are being edited to the client data source. A [saveChanges](ui.iggrid#methods:saveChanges) call still needs to be performed in order to commit the transactions to a server-side data source.
+	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "autoCommit"): boolean;
 
 	/**
 	 * Automatically commits the transactions as rows/cells are being edited to the client data source. A [saveChanges](ui.iggrid#methods:saveChanges) call still needs to be performed in order to commit the transactions to a server-side data source.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "autoCommit", optionValue: boolean): void;
@@ -43622,6 +50843,7 @@ interface JQuery {
 	 * If a new row is added, edited, then deleted, there will be no transaction added to the log.
 	 * If several edits are made to a row or an individual cell, this should result in a single transaction.
 	 * Note: This option takes effect only when [autoCommit](ui.iggrid#options:autoCommit) is set to false.
+	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "aggregateTransactions"): boolean;
 
@@ -43632,12 +50854,14 @@ interface JQuery {
 	 * If several edits are made to a row or an individual cell, this should result in a single transaction.
 	 * Note: This option takes effect only when [autoCommit](ui.iggrid#options:autoCommit) is set to false.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "aggregateTransactions", optionValue: boolean): void;
 
 	/**
 	 * Sets gets ability to automatically format text in cells for numeric and date columns. The format patterns and rules for numbers and dates are defined in $.ig.regional.defaults object. [Here column formatting is explained in details](http://www.igniteui.com/help/iggrid-columns-and-layout#column-formatting)
+	 *
 	 */
 
 	igGrid(optionLiteral: 'option', optionName: "autoFormat"): string|boolean;
@@ -43645,6 +50869,7 @@ interface JQuery {
 	/**
 	 * Sets gets ability to automatically format text in cells for numeric and date columns. The format patterns and rules for numbers and dates are defined in $.ig.regional.defaults object. [Here column formatting is explained in details](http://www.igniteui.com/help/iggrid-columns-and-layout#column-formatting)
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -43652,84 +50877,98 @@ interface JQuery {
 
 	/**
 	 * Gets  ability to render checkboxes and use checkbox editor when dataType of a column is "bool". Checkboxes are not rendered for boolean values in columns with a [column template](ui.iggrid#options:columns.template).
+	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "renderCheckboxes"): boolean;
 
 	/**
 	 * Sets ability to render checkboxes and use checkbox editor when dataType of a column is "bool". Checkboxes are not rendered for boolean values in columns with a [column template](ui.iggrid#options:columns.template).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "renderCheckboxes", optionValue: boolean): void;
 
 	/**
 	 * URL to which updating requests will be made.
+	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "updateUrl"): string;
 
 	/**
 	 * URL to which updating requests will be made.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "updateUrl", optionValue: string): void;
 
 	/**
 	 * Settings related to REST compliant update routines.
+	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "restSettings"): IgGridRestSettings;
 
 	/**
 	 * Settings related to REST compliant update routines.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "restSettings", optionValue: IgGridRestSettings): void;
 
 	/**
 	 * Enables/disables rendering of alternating row styles (odd and even rows receive different styling).
+	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "alternateRowStyles"): boolean;
 
 	/**
 	 * Enables/disables rendering of alternating row styles (odd and even rows receive different styling).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "alternateRowStyles", optionValue: boolean): void;
 
 	/**
 	 * If set to true and all columns' widths are specified and their combined width is less than the grid width then the last column width will be automatically adjusted to fill the remaining empty space of the grid.
+	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "autofitLastColumn"): boolean;
 
 	/**
 	 * If set to true and all columns' widths are specified and their combined width is less than the grid width then the last column width will be automatically adjusted to fill the remaining empty space of the grid.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "autofitLastColumn", optionValue: boolean): void;
 
 	/**
 	 * Enables/disables rendering of hover styles when the mouse is over a record. This can be useful in templating scenarios, for example, where we don't want to apply hover styling to templated content.
+	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "enableHoverStyles"): boolean;
 
 	/**
 	 * Enables/disables rendering of hover styles when the mouse is over a record. This can be useful in templating scenarios, for example, where we don't want to apply hover styling to templated content.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "enableHoverStyles", optionValue: boolean): void;
 
 	/**
 	 * Enables/Disables serializing client date as UTC ISO 8061 string instead of using the local time and zone values.
+	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "enableUTCDates"): boolean;
 
 	/**
 	 * Enables/Disables serializing client date as UTC ISO 8061 string instead of using the local time and zone values.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "enableUTCDates", optionValue: boolean): void;
@@ -43737,6 +50976,7 @@ interface JQuery {
 	/**
 	 * Merge unbound columns values inside data source when data source is remote. If true then the unbound columns are merged to the data source at runtime on the server. Note that data source is expanded with the new data and this could cause performance issues when the data is huge. If mergeUnboundColumns is false then the unbound data is sent and merged on the client. This option is used by the [igGrid MVC Helper](http://www.igniteui.com/help/iggrid-developing-asp-net-mvc-applications-with-iggrid).
 	 * Checkout [Populating Unbound Columns Remotely (igGrid)](http://www.igniteui.com/help/iggrid-unboundcolumns-populating-with-data-remotely) topic for more information.
+	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "mergeUnboundColumns"): boolean;
 
@@ -43744,36 +50984,42 @@ interface JQuery {
 	 * Merge unbound columns values inside data source when data source is remote. If true then the unbound columns are merged to the data source at runtime on the server. Note that data source is expanded with the new data and this could cause performance issues when the data is huge. If mergeUnboundColumns is false then the unbound data is sent and merged on the client. This option is used by the [igGrid MVC Helper](http://www.igniteui.com/help/iggrid-developing-asp-net-mvc-applications-with-iggrid).
 	 * Checkout [Populating Unbound Columns Remotely (igGrid)](http://www.igniteui.com/help/iggrid-unboundcolumns-populating-with-data-remotely) topic for more information.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "mergeUnboundColumns", optionValue: boolean): void;
 
 	/**
 	 * When dataSource is a remote URL, defines whether to set the type of the remote data source to JSONP.
+	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "jsonpRequest"): boolean;
 
 	/**
 	 * When dataSource is a remote URL, defines whether to set the type of the remote data source to JSONP.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "jsonpRequest", optionValue: boolean): void;
 
 	/**
 	 * Enables/disables grid adjusting its dimensions when its [width](ui.iggrid#options:width) and/or [height](ui.iggrid#options:height) is set in percent (%) and grid parent DOM container is resized.
+	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "enableResizeContainerCheck"): boolean;
 
 	/**
 	 * Enables/disables grid adjusting its dimensions when its [width](ui.iggrid#options:width) and/or [height](ui.iggrid#options:height) is set in percent (%) and grid parent DOM container is resized.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "enableResizeContainerCheck", optionValue: boolean): void;
 
 	/**
 	 * Configures how the feature chooser icon should display on header cells - e.g. to display as gear icon or not.
+	 *
 	 */
 
 	igGrid(optionLiteral: 'option', optionName: "featureChooserIconDisplay"): string;
@@ -43781,6 +51027,7 @@ interface JQuery {
 	/**
 	 * Configures how the feature chooser icon should display on header cells - e.g. to display as gear icon or not.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -43788,16 +51035,48 @@ interface JQuery {
 
 	/**
 	 * Settings related to content scrolling.
+	 *
 	 */
 	igGrid(optionLiteral: 'option', optionName: "scrollSettings"): IgGridScrollSettings;
 
 	/**
 	 * Settings related to content scrolling.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGrid(optionLiteral: 'option', optionName: "scrollSettings", optionValue: IgGridScrollSettings): void;
 
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	igGrid(optionLiteral: 'option', optionName: "language"): string;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igGrid(optionLiteral: 'option', optionName: "language", optionValue: string): void;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+
+	igGrid(optionLiteral: 'option', optionName: "regional"): string|Object;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igGrid(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
+
 	/**
 	 * Event fired when a cell is clicked.
 	 */
@@ -44111,16 +51390,19 @@ interface IgGridGroupByGroupedColumn {
 
 	/**
 	 * sort order - ascending or descending
+	 *
 	 */
 	dir?: any;
 
 	/**
 	 * Key of the columnLayout, if the grid is hierarchical
+	 *
 	 */
 	layout?: string;
 
 	/**
 	 * [column](ui.iggrid#options:columns) object for the column that is grouped
+	 *
 	 */
 	col?: any;
 
@@ -44133,11 +51415,13 @@ interface IgGridGroupByGroupedColumn {
 interface IgGridGroupBySummarySettings {
 	/**
 	 * Specifies the delimiter for multiple summaries.
+	 *
 	 */
 	multiSummaryDelimiter?: string;
 
 	/**
 	 * Format of the summary value. By default, two digits are shown after the decimal place. Checkout [Formatting Dates, Numbers and Strings](http://www.igniteui.com/help/formatting-dates-numbers-and-strings) for details on the valid formatting specifiers.
+	 *
 	 */
 	summaryFormat?: string;
 
@@ -44151,6 +51435,7 @@ interface IgGridGroupByColumnSettingsSummaries {
 	/**
 	 * the summary function key
 	 *
+	 *
 	 * Valid values:
 	 * "avg" average summary function
 	 * "min" minimum summary function
@@ -44163,6 +51448,7 @@ interface IgGridGroupByColumnSettingsSummaries {
 
 	/**
 	 * Specifies the summary text that will be shown before the value
+	 *
 	 */
 	text?: string;
 
@@ -44173,6 +51459,7 @@ interface IgGridGroupByColumnSettingsSummaries {
 	 * key - key of the grouped column,
 	 * allGroupData - array of data records for the group(for the whole data source - not only for the data view)
 	 *
+	 *
 	 * Valid values:
 	 * "string" the name of the function as a string located in the global window object.
 	 * "function" which will be used for calculating the summary value.
@@ -44188,11 +51475,13 @@ interface IgGridGroupByColumnSettingsSummaries {
 interface IgGridGroupByColumnSettings {
 	/**
 	 * Enables/disables grouping a column from the UI. By default all columns can be grouped.
+	 *
 	 */
 	allowGrouping?: boolean;
 
 	/**
 	 * Specifies the initial column grouped state.
+	 *
 	 */
 	isGroupBy?: boolean;
 
@@ -44207,6 +51496,7 @@ interface IgGridGroupByColumnSettings {
 	 * 1 - indicating that val1 > val2
 	 * -1 - indicating that val1 < val2
 	 *
+	 *
 	 * Valid values:
 	 * "string" the name of the function as a string located in the global window object.
 	 * "function" function which will be used for custom comparison.
@@ -44221,6 +51511,7 @@ interface IgGridGroupByColumnSettings {
 	/**
 	 * Reference/name of a function (string or function) which will be used for formatting the cell values. The function should accept a value from the grouped column and return the new formatted value in the label of the row.
 	 *
+	 *
 	 * Valid values:
 	 * "string" the name of the function as a string located in the global window object.
 	 * "function" which will be used for formatting the cell values.
@@ -44229,16 +51520,19 @@ interface IgGridGroupByColumnSettings {
 
 	/**
 	 * Specifies the sort order - ascending or descending when the column is initially grouped ([isGroupBy](ui.iggridgroupby#options:columnSettings.isGroupBy) = true).
+	 *
 	 */
 	dir?: any;
 
 	/**
 	 * A list of aggregation functions to calculate on the column values for each group. When not specified the default aggregate function is "count".
+	 *
 	 */
 	summaries?: IgGridGroupByColumnSettingsSummaries;
 
 	/**
 	 * Enables/disables default summaries per group data island or specifies summaries that are applied to specific column no matter the group.
+	 *
 	 */
 	groupSummaries?: any;
 
@@ -44251,96 +51545,115 @@ interface IgGridGroupByColumnSettings {
 interface IgGridGroupByLocale {
 	/**
 	 * Specifies the group by area text.
+	 *
 	 */
 	emptyGroupByAreaContent?: string;
 
 	/**
 	 * Specifies the text for the hyperlink which opens the GroupBy Dialog.
+	 *
 	 */
 	emptyGroupByAreaContentSelectColumns?: string;
 
 	/**
 	 * Specifies the caption for the hyperlink which opens the GroupBy Dialog.
+	 *
 	 */
 	emptyGroupByAreaContentSelectColumnsCaption?: string;
 
 	/**
 	 * Specifies the expand groups button tooltip.
+	 *
 	 */
 	expandTooltip?: string;
 
 	/**
 	 * Specifies the collapse groups button tooltip.
+	 *
 	 */
 	collapseTooltip?: string;
 
 	/**
 	 * Specifies the remove group button tooltip.
+	 *
 	 */
 	removeButtonTooltip?: string;
 
 	/**
 	 * Specifies caption for each descending sorted column in GroupBy Dialog.
+	 *
 	 */
 	modalDialogCaptionButtonDesc?: string;
 
 	/**
 	 * Specifies caption for each descending sorted column in GroupBy Dialog.
+	 *
 	 */
 	modalDialogCaptionButtonAsc?: string;
 
 	/**
 	 * Specifies caption for ungroup button in GroupBy Dialog.
+	 *
 	 */
 	modalDialogCaptionButtonUngroup?: string;
 
 	/**
 	 * Specifies text for group button in GroupBy Dialog.
+	 *
 	 */
 	modalDialogGroupByButtonText?: string;
 
 	/**
 	 * Specifies caption text for the GroupBy Dialog.
+	 *
 	 */
 	modalDialogCaptionText?: string;
 
 	/**
 	 * Specifies label for layouts dropdown in the GroupBy Dialog.
+	 *
 	 */
 	modalDialogDropDownLabel?: string;
 
 	/**
 	 * Specifies label for "Clear all" button in the GroupBy Dialog.
+	 *
 	 */
 	modalDialogClearAllButtonLabel?: string;
 
 	/**
 	 * Specifies name of the root layout which is shown for the layouts in the modal dialog tree.
+	 *
 	 */
 	modalDialogRootLevelHierarchicalGrid?: string;
 
 	/**
 	 * Specifies caption of layouts dropdown button in the GroupBy Dialog.
+	 *
 	 */
 	modalDialogDropDownButtonCaption?: string;
 
 	/**
 	 * Specifies text of button which apply changes in modal dialog.
+	 *
 	 */
 	modalDialogButtonApplyText?: string;
 
 	/**
 	 * Specifies text of button which cancel changes in modal dialog.
+	 *
 	 */
 	modalDialogButtonCancelText?: string;
 
 	/**
 	 * Specifies the summary row title.
+	 *
 	 */
 	summaryRowTitle?: string;
 
 	/**
 	 * Specifies the summary icon title.
+	 *
 	 */
 	summaryIconTitle?: string;
 
@@ -44720,6 +52033,7 @@ interface IgGridGroupBy {
 	/**
 	 * Sets the place in the grid where the GroupBy area will be
 	 *
+	 *
 	 * Valid values:
 	 * "top" the GroupBy area will be rendered above the grid headers
 	 * "hidden" the GroupBy area will not be rendered
@@ -44729,12 +52043,14 @@ interface IgGridGroupBy {
 
 	/**
 	 * Specifies if after grouping, the grouped rows will be initially expanded or collapsed.
+	 *
 	 */
 	initialExpand?: boolean;
 
 	/**
 	 * Specifies when paging is applied and there is at least one grouped column which records should be included in page processing.
 	 *
+	 *
 	 * Valid values:
 	 * "allRecords" All records are included in page processing - data records and group-by metadata records
 	 * "dataRecordsOnly" Only data records are included in page processing(metadata group-by records are ignored)
@@ -44743,27 +52059,32 @@ interface IgGridGroupBy {
 
 	/**
 	 * Specifies if grouped rows will have an expander image that will allow end users to expand and collapse them. This option can be set only at initialization.
+	 *
 	 */
 	expansionIndicatorVisibility?: boolean;
 
 	/**
 	 * By default, the column width for the header is taken. If this is specified it's used for all headers.
+	 *
 	 */
 	groupByLabelWidth?: number;
 
 	/**
 	 * Specifies the opacity of the drag markup, while a column header is being dragged. The value must be between 0 and 1.
+	 *
 	 */
 	labelDragHelperOpacity?: number;
 
 	/**
 	 * Specifies the indentation for a grouped row. If several columns are grouped, the total indentation will grow
+	 *
 	 */
 	indentation?: number;
 
 	/**
 	 * default sort order - ascending or descending
 	 *
+	 *
 	 * Valid values:
 	 * "asc" The group is sorted in ascending order.
 	 * "desc" The group is sorted in descending order.
@@ -44772,22 +52093,26 @@ interface IgGridGroupBy {
 
 	/**
 	 * Returns the list of currently grouped columns. The option is read-only and cannot be set at initialization or at runtime.
+	 *
 	 */
 	groupedColumns?: IgGridGroupByGroupedColumn[];
 
 	/**
 	 * Specifies a key to get group by data from the remote response.
+	 *
 	 */
 	resultResponseKey?: string;
 
 	/**
 	 * Template for the grouped row's text. Variables available for the template are ${key}, ${val} and ${count}.
+	 *
 	 */
 	groupedRowTextTemplate?: string;
 
 	/**
 	 * Specifies whether the GroupBy operation takes place locally on client-side or remotely on server-side.
 	 *
+	 *
 	 * Valid values:
 	 * "local" Execute the GroupBy operation locally on client-side.
 	 * "remote" Execute the GroupBy operation by a request to the server.
@@ -44796,26 +52121,31 @@ interface IgGridGroupBy {
 
 	/**
 	 * URL param name which specifies a GroupBy [expression](ig.datasource#options:settings.sorting.expressions). When groupByUrlKey, [groupByUrlKeyAscValue](ui.iggridgroupby#options:groupByUrlKeyAscValue) and [groupByUrlKeyDescValue](ui.iggridgroupby#options:groupByUrlKeyDescValue) are set the request looks like: ?<groupByUrlKey>(<columnKey>)=<groupByUrlKeyAscValue/groupByUrlKeyDescValue> (Example: ?groupby(col1)=asc). Otherwise the OData conventions for sorting params are used.
+	 *
 	 */
 	groupByUrlKey?: string;
 
 	/**
 	 * URL param value denoting ascending grouping. When [groupByUrlKey](ui.iggridgroupby#options:groupByUrlKey), groupByUrlKeyAscValue and [groupByUrlKeyDescValue](ui.iggridgroupby#options:groupByUrlKeyDescValue) are set the request looks like: ?<groupByUrlKey>(<columnKey>)=<groupByUrlKeyAscValue/groupByUrlKeyDescValue> (Example: ?groupby(col1)=asc). Otherwise the OData conventions for sorting params are used.
+	 *
 	 */
 	groupByUrlKeyAscValue?: string;
 
 	/**
 	 * URL param value denoting descending grouping. When [groupByUrlKey](ui.iggridgroupby#options:groupByUrlKey), [groupByUrlKeyAscValue](ui.iggridgroupby#options:groupByUrlKeyAscValue) and groupByUrlKeyDescValue are set the request looks like: ?<groupByUrlKey>(<columnKey>)=<groupByUrlKeyAscValue/groupByUrlKeyDescValue> (Example: ?groupby(col1)=asc). Otherwise the OData conventions for sorting params are used.
+	 *
 	 */
 	groupByUrlKeyDescValue?: string;
 
 	/**
 	 * Specifies the settings for GroupBy summaries.
+	 *
 	 */
 	summarySettings?: IgGridGroupBySummarySettings;
 
 	/**
 	 * Configures individual column settings.
+	 *
 	 */
 	columnSettings?: IgGridGroupByColumnSettings;
 
@@ -44912,27 +52242,32 @@ interface IgGridGroupBy {
 
 	/**
 	 * Enables/disables immediate column grouping/ungrouping. When false operation is delayed until after "Apply" button is clicked by the user.
+	 *
 	 */
 	modalDialogGroupByOnClick?: boolean;
 
 	/**
 	 * Specifies width of layouts dropdown in the GroupBy Dialog
+	 *
 	 */
 	modalDialogDropDownWidth?: number;
 
 	/**
 	 * Specifies width of layouts dropdown in the GroupBy Dialog
+	 *
 	 */
 	modalDialogDropDownAreaWidth?: number;
 
 	/**
 	 * Specifies time in milliseconds for animation duration to show/hide modal dialog
+	 *
 	 */
 	modalDialogAnimationDuration?: number;
 
 	/**
 	 * Specifies width of the GroupBy Dialog
 	 *
+	 *
 	 * Valid values:
 	 * "string" The dialog width can be set in pixels (px) or percentage (%). Example values: "800px", "800" (defaults to pixels), "100%".
 	 * "number" The dialog width can be set in pixels as a number. Example values: 800, 700.
@@ -44942,6 +52277,7 @@ interface IgGridGroupBy {
 	/**
 	 * Specifies height of the GroupBy Dialog
 	 *
+	 *
 	 * Valid values:
 	 * "string" The dialog height can be set in pixels (px) or percentage (%). Example values: "800px", "800" (defaults to pixels), "100%".
 	 * "number" The dialog height can be set in pixels as a number. Example values: 800, 700.
@@ -44950,17 +52286,20 @@ interface IgGridGroupBy {
 
 	/**
 	 * Format grouped column using the formatter set in [igGrid.columns.formatter](ui.iggrid#options:columns.formatter) or [igGrid.columns.format](ui.iggrid#options:columns.format).
+	 *
 	 */
 	useGridColumnFormatter?: boolean;
 
 	/**
 	 * Enables / disables GroupBy persistence between states. Checkout the [GroupBy Persistence](http://www.igniteui.com/help/iggrid-groupby-overview#groupBy-persistence) topic for details.
+	 *
 	 */
 	persist?: boolean;
 
 	/**
 	 * Controls containment behavior for the GroupBy Dialog.
 	 *
+	 *
 	 * Valid values:
 	 * "owner" The GroupBy Dialog will be draggable only in the grid area
 	 * "window" The GroupBy Dialog will be draggable in the whole window area
@@ -44969,6 +52308,7 @@ interface IgGridGroupBy {
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog. Checkout the [Extending igGrid Modal Dialog](http://www.igniteui.com/help/extending-iggrid-modal-dialog) topic for details.
+	 *
 	 */
 	dialogWidget?: string;
 
@@ -44980,12 +52320,14 @@ interface IgGridGroupBy {
 	/**
 	 * Specifies default summaries that will appear when grouping by a column on the bottom of each group as a row.This option has a lower priority than the groupSummaries defined under columnSettings for each column.
 	 * All default summaries are defined under $.ig.util.defaultSummaryMethods
+	 *
 	 */
 	groupSummaries?: any;
 
 	/**
 	 * Specifies the groupSummaries postion inside each group.
 	 *
+	 *
 	 * Valid values:
 	 * "top" One summary row will be displayed at the top for each group
 	 * "bottom"  One summary row will be displayed at the bottom for each group
@@ -44993,6 +52335,18 @@ interface IgGridGroupBy {
 	 */
 	groupSummariesPosition?: string;
 
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	language?: string;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+	regional?: string|Object;
+
 	/**
 	 * Event which is fired when the grouped columns collection is about to change. This event is fired even when button OK is clicked from the modal dialog(after event modalDialogButtonApplyClick is fired)
 	 */
@@ -45079,7 +52433,19 @@ interface IgGridGroupBy {
 	[optionName: string]: any;
 }
 interface IgGridGroupByMethods {
+	changeGlobalLanguage(): void;
+	changeGlobalRegional(): void;
+
+	/**
+	 * Changes the all locales into the widget element to the language specified in [options.language](ui.iggridgroupby#options:language)
+	 * Note that this method is for rare scenarios, see [language](ui.iggridgroupby#options:language) or [locale](ui.iggridgroupby#options:locale) option setter
+	 */
 	changeLocale(): void;
+
+	/**
+	 * Changes the the regional settings of widget element to the language specified in [options.regional](ui.iggridgroupby#options:regional)
+	 * Note that this method is for rare scenarios, use [regional](ui.iggridgroupby#options:regional) option setter
+	 */
 	changeRegional(): void;
 
 	/**
@@ -45175,6 +52541,8 @@ interface JQuery {
 }
 
 interface JQuery {
+	igGridGroupBy(methodName: "changeGlobalLanguage"): void;
+	igGridGroupBy(methodName: "changeGlobalRegional"): void;
 	igGridGroupBy(methodName: "changeLocale"): void;
 	igGridGroupBy(methodName: "changeRegional"): void;
 	igGridGroupBy(methodName: "openGroupByDialog"): void;
@@ -45194,6 +52562,7 @@ interface JQuery {
 
 	/**
 	 * Sets the place in the grid where the GroupBy area will be
+	 *
 	 */
 
 	igGridGroupBy(optionLiteral: 'option', optionName: "groupByAreaVisibility"): string;
@@ -45201,6 +52570,7 @@ interface JQuery {
 	/**
 	 * Sets the place in the grid where the GroupBy area will be
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -45208,18 +52578,21 @@ interface JQuery {
 
 	/**
 	 * Gets if after grouping, the grouped rows will be initially expanded or collapsed.
+	 *
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "initialExpand"): boolean;
 
 	/**
 	 * Sets if after grouping, the grouped rows will be initially expanded or collapsed.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "initialExpand", optionValue: boolean): void;
 
 	/**
 	 * Gets when paging is applied and there is at least one grouped column which records should be included in page processing.
+	 *
 	 */
 
 	igGridGroupBy(optionLiteral: 'option', optionName: "pagingMode"): string;
@@ -45227,6 +52600,7 @@ interface JQuery {
 	/**
 	 * Sets when paging is applied and there is at least one grouped column which records should be included in page processing.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -45234,54 +52608,63 @@ interface JQuery {
 
 	/**
 	 * Gets if grouped rows will have an expander image that will allow end users to expand and collapse them. This option can be set only at initialization.
+	 *
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "expansionIndicatorVisibility"): boolean;
 
 	/**
 	 * Sets if grouped rows will have an expander image that will allow end users to expand and collapse them. This option can be set only at initialization.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "expansionIndicatorVisibility", optionValue: boolean): void;
 
 	/**
 	 * By default, the column width for the header is taken. If this is specified it's used for all headers.
+	 *
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "groupByLabelWidth"): number;
 
 	/**
 	 * By default, the column width for the header is taken. If this is specified it's used for all headers.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "groupByLabelWidth", optionValue: number): void;
 
 	/**
 	 * Gets the opacity of the drag markup, while a column header is being dragged. The value must be between 0 and 1.
+	 *
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "labelDragHelperOpacity"): number;
 
 	/**
 	 * Sets the opacity of the drag markup, while a column header is being dragged. The value must be between 0 and 1.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "labelDragHelperOpacity", optionValue: number): void;
 
 	/**
 	 * Specifies the indentation for a grouped row. If several columns are grouped, the total indentation will grow
+	 *
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "indentation"): number;
 
 	/**
 	 * Specifies the indentation for a grouped row. If several columns are grouped, the total indentation will grow
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "indentation", optionValue: number): void;
 
 	/**
 	 * Default sort order - ascending or descending
+	 *
 	 */
 
 	igGridGroupBy(optionLiteral: 'option', optionName: "defaultSortingDirection"): string;
@@ -45289,6 +52672,7 @@ interface JQuery {
 	/**
 	 * Default sort order - ascending or descending
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -45296,42 +52680,49 @@ interface JQuery {
 
 	/**
 	 * Returns the list of currently grouped columns. The option is read-only and cannot be set at initialization or at runtime.
+	 *
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "groupedColumns"): IgGridGroupByGroupedColumn[];
 
 	/**
 	 * Returns the list of currently grouped columns. The option is read-only and cannot be set at initialization or at runtime.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "groupedColumns", optionValue: IgGridGroupByGroupedColumn[]): void;
 
 	/**
 	 * Gets a key to get group by data from the remote response.
+	 *
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "resultResponseKey"): string;
 
 	/**
 	 * Sets a key to get group by data from the remote response.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "resultResponseKey", optionValue: string): void;
 
 	/**
 	 * Template for the grouped row's text. Variables available for the template are ${key}, ${val} and ${count}.
+	 *
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "groupedRowTextTemplate"): string;
 
 	/**
 	 * Template for the grouped row's text. Variables available for the template are ${key}, ${val} and ${count}.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "groupedRowTextTemplate", optionValue: string): void;
 
 	/**
 	 * Gets whether the GroupBy operation takes place locally on client-side or remotely on server-side.
+	 *
 	 */
 
 	igGridGroupBy(optionLiteral: 'option', optionName: "type"): string;
@@ -45339,6 +52730,7 @@ interface JQuery {
 	/**
 	 * Sets whether the GroupBy operation takes place locally on client-side or remotely on server-side.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -45346,60 +52738,70 @@ interface JQuery {
 
 	/**
 	 * URL param name which specifies a GroupBy [expression](ig.datasource#options:settings.sorting.expressions). When groupByUrlKey, [groupByUrlKeyAscValue](ui.iggridgroupby#options:groupByUrlKeyAscValue) and [groupByUrlKeyDescValue](ui.iggridgroupby#options:groupByUrlKeyDescValue) are set the request looks like: ?<groupByUrlKey>(<columnKey>)=<groupByUrlKeyAscValue/groupByUrlKeyDescValue> (Example: ?groupby(col1)=asc). Otherwise the OData conventions for sorting params are used.
+	 *
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "groupByUrlKey"): string;
 
 	/**
 	 * URL param name which specifies a GroupBy [expression](ig.datasource#options:settings.sorting.expressions). When groupByUrlKey, [groupByUrlKeyAscValue](ui.iggridgroupby#options:groupByUrlKeyAscValue) and [groupByUrlKeyDescValue](ui.iggridgroupby#options:groupByUrlKeyDescValue) are set the request looks like: ?<groupByUrlKey>(<columnKey>)=<groupByUrlKeyAscValue/groupByUrlKeyDescValue> (Example: ?groupby(col1)=asc). Otherwise the OData conventions for sorting params are used.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "groupByUrlKey", optionValue: string): void;
 
 	/**
 	 * URL param value denoting ascending grouping. When [groupByUrlKey](ui.iggridgroupby#options:groupByUrlKey), groupByUrlKeyAscValue and [groupByUrlKeyDescValue](ui.iggridgroupby#options:groupByUrlKeyDescValue) are set the request looks like: ?<groupByUrlKey>(<columnKey>)=<groupByUrlKeyAscValue/groupByUrlKeyDescValue> (Example: ?groupby(col1)=asc). Otherwise the OData conventions for sorting params are used.
+	 *
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "groupByUrlKeyAscValue"): string;
 
 	/**
 	 * URL param value denoting ascending grouping. When [groupByUrlKey](ui.iggridgroupby#options:groupByUrlKey), groupByUrlKeyAscValue and [groupByUrlKeyDescValue](ui.iggridgroupby#options:groupByUrlKeyDescValue) are set the request looks like: ?<groupByUrlKey>(<columnKey>)=<groupByUrlKeyAscValue/groupByUrlKeyDescValue> (Example: ?groupby(col1)=asc). Otherwise the OData conventions for sorting params are used.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "groupByUrlKeyAscValue", optionValue: string): void;
 
 	/**
 	 * URL param value denoting descending grouping. When [groupByUrlKey](ui.iggridgroupby#options:groupByUrlKey), [groupByUrlKeyAscValue](ui.iggridgroupby#options:groupByUrlKeyAscValue) and groupByUrlKeyDescValue are set the request looks like: ?<groupByUrlKey>(<columnKey>)=<groupByUrlKeyAscValue/groupByUrlKeyDescValue> (Example: ?groupby(col1)=asc). Otherwise the OData conventions for sorting params are used.
+	 *
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "groupByUrlKeyDescValue"): string;
 
 	/**
 	 * URL param value denoting descending grouping. When [groupByUrlKey](ui.iggridgroupby#options:groupByUrlKey), [groupByUrlKeyAscValue](ui.iggridgroupby#options:groupByUrlKeyAscValue) and groupByUrlKeyDescValue are set the request looks like: ?<groupByUrlKey>(<columnKey>)=<groupByUrlKeyAscValue/groupByUrlKeyDescValue> (Example: ?groupby(col1)=asc). Otherwise the OData conventions for sorting params are used.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "groupByUrlKeyDescValue", optionValue: string): void;
 
 	/**
 	 * Gets the settings for GroupBy summaries.
+	 *
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "summarySettings"): IgGridGroupBySummarySettings;
 
 	/**
 	 * Sets the settings for GroupBy summaries.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "summarySettings", optionValue: IgGridGroupBySummarySettings): void;
 
 	/**
 	 * Configures individual column settings.
+	 *
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "columnSettings"): IgGridGroupByColumnSettings;
 
 	/**
 	 * Configures individual column settings.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "columnSettings", optionValue: IgGridGroupByColumnSettings): void;
@@ -45618,54 +53020,63 @@ interface JQuery {
 
 	/**
 	 * Enables/disables immediate column grouping/ungrouping. When false operation is delayed until after "Apply" button is clicked by the user.
+	 *
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "modalDialogGroupByOnClick"): boolean;
 
 	/**
 	 * Enables/disables immediate column grouping/ungrouping. When false operation is delayed until after "Apply" button is clicked by the user.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "modalDialogGroupByOnClick", optionValue: boolean): void;
 
 	/**
 	 * Gets width of layouts dropdown in the GroupBy Dialog
+	 *
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "modalDialogDropDownWidth"): number;
 
 	/**
 	 * Sets width of layouts dropdown in the GroupBy Dialog
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "modalDialogDropDownWidth", optionValue: number): void;
 
 	/**
 	 * Gets width of layouts dropdown in the GroupBy Dialog
+	 *
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "modalDialogDropDownAreaWidth"): number;
 
 	/**
 	 * Sets width of layouts dropdown in the GroupBy Dialog
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "modalDialogDropDownAreaWidth", optionValue: number): void;
 
 	/**
 	 * Gets time in milliseconds for animation duration to show/hide modal dialog
+	 *
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "modalDialogAnimationDuration"): number;
 
 	/**
 	 * Sets time in milliseconds for animation duration to show/hide modal dialog
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "modalDialogAnimationDuration", optionValue: number): void;
 
 	/**
 	 * Gets width of the GroupBy Dialog
+	 *
 	 */
 
 	igGridGroupBy(optionLiteral: 'option', optionName: "modalDialogWidth"): string|number;
@@ -45673,6 +53084,7 @@ interface JQuery {
 	/**
 	 * Sets width of the GroupBy Dialog
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -45680,6 +53092,7 @@ interface JQuery {
 
 	/**
 	 * Gets height of the GroupBy Dialog
+	 *
 	 */
 
 	igGridGroupBy(optionLiteral: 'option', optionName: "modalDialogHeight"): string|number;
@@ -45687,6 +53100,7 @@ interface JQuery {
 	/**
 	 * Sets height of the GroupBy Dialog
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -45694,30 +53108,35 @@ interface JQuery {
 
 	/**
 	 * Format grouped column using the formatter set in [igGrid.columns.formatter](ui.iggrid#options:columns.formatter) or [igGrid.columns.format](ui.iggrid#options:columns.format).
+	 *
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "useGridColumnFormatter"): boolean;
 
 	/**
 	 * Format grouped column using the formatter set in [igGrid.columns.formatter](ui.iggrid#options:columns.formatter) or [igGrid.columns.format](ui.iggrid#options:columns.format).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "useGridColumnFormatter", optionValue: boolean): void;
 
 	/**
 	 * Enables / disables GroupBy persistence between states. Checkout the [GroupBy Persistence](http://www.igniteui.com/help/iggrid-groupby-overview#groupBy-persistence) topic for details.
+	 *
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "persist"): boolean;
 
 	/**
 	 * Enables / disables GroupBy persistence between states. Checkout the [GroupBy Persistence](http://www.igniteui.com/help/iggrid-groupby-overview#groupBy-persistence) topic for details.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "persist", optionValue: boolean): void;
 
 	/**
 	 * Controls containment behavior for the GroupBy Dialog.
+	 *
 	 */
 
 	igGridGroupBy(optionLiteral: 'option', optionName: "groupByDialogContainment"): string;
@@ -45725,6 +53144,7 @@ interface JQuery {
 	/**
 	 * Controls containment behavior for the GroupBy Dialog.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -45732,12 +53152,14 @@ interface JQuery {
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog. Checkout the [Extending igGrid Modal Dialog](http://www.igniteui.com/help/extending-iggrid-modal-dialog) topic for details.
+	 *
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "dialogWidget"): string;
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog. Checkout the [Extending igGrid Modal Dialog](http://www.igniteui.com/help/extending-iggrid-modal-dialog) topic for details.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "dialogWidget", optionValue: string): void;
@@ -45757,6 +53179,7 @@ interface JQuery {
 	/**
 	 * Gets default summaries that will appear when grouping by a column on the bottom of each group as a row.This option has a lower priority than the groupSummaries defined under columnSettings for each column.
 	 * All default summaries are defined under $.ig.util.defaultSummaryMethods
+	 *
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "groupSummaries"): any;
 
@@ -45764,12 +53187,14 @@ interface JQuery {
 	 * Sets default summaries that will appear when grouping by a column on the bottom of each group as a row.This option has a lower priority than the groupSummaries defined under columnSettings for each column.
 	 * All default summaries are defined under $.ig.util.defaultSummaryMethods
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridGroupBy(optionLiteral: 'option', optionName: "groupSummaries", optionValue: any): void;
 
 	/**
 	 * Gets the groupSummaries postion inside each group.
+	 *
 	 */
 
 	igGridGroupBy(optionLiteral: 'option', optionName: "groupSummariesPosition"): string;
@@ -45777,11 +53202,42 @@ interface JQuery {
 	/**
 	 * Sets the groupSummaries postion inside each group.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
 	igGridGroupBy(optionLiteral: 'option', optionName: "groupSummariesPosition", optionValue: string): void;
 
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	igGridGroupBy(optionLiteral: 'option', optionName: "language"): string;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igGridGroupBy(optionLiteral: 'option', optionName: "language", optionValue: string): void;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+
+	igGridGroupBy(optionLiteral: 'option', optionName: "regional"): string|Object;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igGridGroupBy(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
+
 	/**
 	 * Event which is fired when the grouped columns collection is about to change. This event is fired even when button OK is clicked from the modal dialog(after event modalDialogButtonApplyClick is fired)
 	 */
@@ -45982,21 +53438,25 @@ interface JQuery {
 interface IgGridHidingColumnSetting {
 	/**
 	 * Column key. this is a required property in every column setting if columnIndex is not set.
+	 *
 	 */
 	columnKey?: string;
 
 	/**
 	 * Column index. Can be used in place of column key. the preferred way of populating a column setting is to always use the column keys as identifiers.
+	 *
 	 */
 	columnIndex?: number;
 
 	/**
 	 * Allows the column to be hidden.
+	 *
 	 */
 	allowHiding?: boolean;
 
 	/**
 	 * Sets the initial visibility of the column.
+	 *
 	 */
 	hidden?: boolean;
 
@@ -46009,56 +53469,67 @@ interface IgGridHidingColumnSetting {
 interface IgGridHidingLocale {
 	/**
 	 * The text used in the drop down tools menu(Feature Chooser) to launch the column chooser dialog.
+	 *
 	 */
 	columnChooserDisplayText?: string;
 
 	/**
 	 * The text displayed in the tooltip of the hidden column indicator.
+	 *
 	 */
 	hiddenColumnIndicatorTooltipText?: string;
 
 	/**
 	 * The text used in the drop down tools menu(Feature Chooser) to hide a column.
+	 *
 	 */
 	columnHideText?: string;
 
 	/**
 	 * The caption of the column chooser dialog.
+	 *
 	 */
 	columnChooserCaptionLabel?: string;
 
 	/**
 	 * The close button tooltip of the column chooser dialog.
+	 *
 	 */
 	columnChooserCloseButtonTooltip?: string;
 
 	/**
 	 * Specifies the hiding column icon tooltip.
+	 *
 	 */
 	hideColumnIconTooltip?: string;
 
 	/**
 	 * The text used in the column chooser to show column.
+	 *
 	 */
 	columnChooserShowText?: string;
 
 	/**
 	 * The text used in the column chooser to hide column.
+	 *
 	 */
 	columnChooserHideText?: string;
 
 	/**
 	 * Text label for reset button.
+	 *
 	 */
 	columnChooserResetButtonLabel?: string;
 
 	/**
 	 * Specifies the text of the button which applies changes in the modal dialog.
+	 *
 	 */
 	columnChooserButtonApplyText?: string;
 
 	/**
 	 * Specifies the text of the button which cancels changes in the modal dialog.
+	 *
 	 */
 	columnChooserButtonCancelText?: string;
 
@@ -46367,11 +53838,13 @@ interface ColumnChooserButtonResetClickEventUIParam {
 interface IgGridHiding {
 	/**
 	 * A list of column settings that specifies hiding options on a per column basis.
+	 *
 	 */
 	columnSettings?: IgGridHidingColumnSetting[];
 
 	/**
 	 * The width in pixels of the hidden column indicator in the header.
+	 *
 	 */
 	hiddenColumnIndicatorHeaderWidth?: number;
 
@@ -46385,16 +53858,19 @@ interface IgGridHiding {
 
 	/**
 	 * The default column chooser width.
+	 *
 	 */
 	columnChooserWidth?: string;
 
 	/**
 	 * The default column chooser height.
+	 *
 	 */
 	columnChooserHeight?: string;
 
 	/**
 	 * The duration of the dropdown animation in milliseconds.
+	 *
 	 */
 	dropDownAnimationDuration?: number;
 
@@ -46455,24 +53931,40 @@ interface IgGridHiding {
 
 	/**
 	 * Specifies on click show/hide directly to be shown/hidden columns. If columnChooserHideOnClick is false then Apply and Cancel Buttons are shown on the bottom of modal dialog. Columns are Shown/Hidden after the Apply button is clicked
+	 *
 	 */
 	columnChooserHideOnClick?: boolean;
 
 	/**
 	 * Specifies time of milliseconds for animation duration to show/hide modal dialog
+	 *
 	 */
 	columnChooserAnimationDuration?: number;
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog.
+	 *
 	 */
 	dialogWidget?: string;
 
 	/**
 	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
+	 *
 	 */
 	inherit?: boolean;
 
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	language?: string;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+	regional?: string|Object;
+
 	/**
 	 * Event fired before a hiding operation is executed.
 	 */
@@ -46559,7 +54051,13 @@ interface IgGridHiding {
 	[optionName: string]: any;
 }
 interface IgGridHidingMethods {
+	/**
+	 * Changes the all locales into the widget element to the language specified in [options.language](ui.iggridhiding#options:language)
+	 * Note that this method is for rare scenarios, see [language](ui.iggridhiding#options:language) or [locale](ui.iggridhiding#options:locale) option setter
+	 */
 	changeLocale(): void;
+	changeGlobalLanguage(): void;
+	changeGlobalRegional(): void;
 
 	/**
 	 * Destroys the hiding widget
@@ -46638,6 +54136,8 @@ interface JQuery {
 
 interface JQuery {
 	igGridHiding(methodName: "changeLocale"): void;
+	igGridHiding(methodName: "changeGlobalLanguage"): void;
+	igGridHiding(methodName: "changeGlobalRegional"): void;
 	igGridHiding(methodName: "destroy"): void;
 	igGridHiding(methodName: "showColumnChooser"): void;
 	igGridHiding(methodName: "hideColumnChooser"): void;
@@ -46652,24 +54152,28 @@ interface JQuery {
 
 	/**
 	 * A list of column settings that specifies hiding options on a per column basis.
+	 *
 	 */
 	igGridHiding(optionLiteral: 'option', optionName: "columnSettings"): IgGridHidingColumnSetting[];
 
 	/**
 	 * A list of column settings that specifies hiding options on a per column basis.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridHiding(optionLiteral: 'option', optionName: "columnSettings", optionValue: IgGridHidingColumnSetting[]): void;
 
 	/**
 	 * The width in pixels of the hidden column indicator in the header.
+	 *
 	 */
 	igGridHiding(optionLiteral: 'option', optionName: "hiddenColumnIndicatorHeaderWidth"): number;
 
 	/**
 	 * The width in pixels of the hidden column indicator in the header.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridHiding(optionLiteral: 'option', optionName: "hiddenColumnIndicatorHeaderWidth", optionValue: number): void;
@@ -46694,36 +54198,42 @@ interface JQuery {
 
 	/**
 	 * The default column chooser width.
+	 *
 	 */
 	igGridHiding(optionLiteral: 'option', optionName: "columnChooserWidth"): string;
 
 	/**
 	 * The default column chooser width.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridHiding(optionLiteral: 'option', optionName: "columnChooserWidth", optionValue: string): void;
 
 	/**
 	 * The default column chooser height.
+	 *
 	 */
 	igGridHiding(optionLiteral: 'option', optionName: "columnChooserHeight"): string;
 
 	/**
 	 * The default column chooser height.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridHiding(optionLiteral: 'option', optionName: "columnChooserHeight", optionValue: string): void;
 
 	/**
 	 * The duration of the dropdown animation in milliseconds.
+	 *
 	 */
 	igGridHiding(optionLiteral: 'option', optionName: "dropDownAnimationDuration"): number;
 
 	/**
 	 * The duration of the dropdown animation in milliseconds.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridHiding(optionLiteral: 'option', optionName: "dropDownAnimationDuration", optionValue: number): void;
@@ -46858,52 +54368,90 @@ interface JQuery {
 
 	/**
 	 * Gets on click show/hide directly to be shown/hidden columns. If columnChooserHideOnClick is false then Apply and Cancel Buttons are shown on the bottom of modal dialog. Columns are Shown/Hidden after the Apply button is clicked
+	 *
 	 */
 	igGridHiding(optionLiteral: 'option', optionName: "columnChooserHideOnClick"): boolean;
 
 	/**
 	 * Sets on click show/hide directly to be shown/hidden columns. If columnChooserHideOnClick is false then Apply and Cancel Buttons are shown on the bottom of modal dialog. Columns are Shown/Hidden after the Apply button is clicked
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridHiding(optionLiteral: 'option', optionName: "columnChooserHideOnClick", optionValue: boolean): void;
 
 	/**
 	 * Gets time of milliseconds for animation duration to show/hide modal dialog
+	 *
 	 */
 	igGridHiding(optionLiteral: 'option', optionName: "columnChooserAnimationDuration"): number;
 
 	/**
 	 * Sets time of milliseconds for animation duration to show/hide modal dialog
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridHiding(optionLiteral: 'option', optionName: "columnChooserAnimationDuration", optionValue: number): void;
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog.
+	 *
 	 */
 	igGridHiding(optionLiteral: 'option', optionName: "dialogWidget"): string;
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridHiding(optionLiteral: 'option', optionName: "dialogWidget", optionValue: string): void;
 
 	/**
 	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
+	 *
 	 */
 	igGridHiding(optionLiteral: 'option', optionName: "inherit"): boolean;
 
 	/**
 	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridHiding(optionLiteral: 'option', optionName: "inherit", optionValue: boolean): void;
 
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	igGridHiding(optionLiteral: 'option', optionName: "language"): string;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igGridHiding(optionLiteral: 'option', optionName: "language", optionValue: string): void;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+
+	igGridHiding(optionLiteral: 'option', optionName: "regional"): string|Object;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igGridHiding(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
+
 	/**
 	 * Event fired before a hiding operation is executed.
 	 */
@@ -47104,11 +54652,13 @@ interface JQuery {
 interface IgHierarchicalGridLocale {
 	/**
 	 * Specifies the default tooltip applied to an expand column cell, that is currently collapsed.
+	 *
 	 */
 	expandTooltip?: string;
 
 	/**
 	 * Specifies the default tooltip applied to an expand column cell, that is currently expanded.
+	 *
 	 */
 	collapseTooltip?: string;
 
@@ -47143,17 +54693,20 @@ interface IgHierarchicalGridColumnLayout {
 interface IgHierarchicalGridColumnGroupOptions {
 	/**
 	 * Sets whether the group is expanded or collapsed. Applied only if the allowGroupCollapsing is set to true.
+	 *
 	 */
 	expanded?: boolean;
 
 	/**
 	 * Sets whether expansion indicators are visible in the group header.
+	 *
 	 */
 	allowGroupCollapsing?: boolean;
 
 	/**
 	 * Sets when should the group be hidden. Applied only if the allowGroupCollapsing is set to true.
 	 *
+	 *
 	 * Valid values:
 	 * "never" never hide the group
 	 * "always" always hide the group
@@ -47171,17 +54724,20 @@ interface IgHierarchicalGridColumnGroupOptions {
 interface IgHierarchicalGridColumn {
 	/**
 	 * Header text for the specified column.
+	 *
 	 */
 	headerText?: string;
 
 	/**
 	 * The property in the data source to which the column is bound. Also used to identify the column by, and find specific columns with API methods such as [columnByKey](ui.ighierarchicalgrid#methods:columnByKey).
+	 *
 	 */
 	key?: string;
 
 	/**
 	 * Reference to a function (string or function) which will be used for formatting the cell values. The function should accept a value and return the new formatted value. [Here column formatting is explained in details](http://www.igniteui.com/help/iggrid-columns-and-layout#column-formatting)
 	 *
+	 *
 	 * Valid values:
 	 * "string" The name of the function which will be used for formatting the cell values.
 	 * "function" Function which will be used for formatting the cell values. The function should accept a value and return the new formatted value.
@@ -47202,12 +54758,21 @@ interface IgHierarchicalGridColumn {
 
 	/**
 	 * Data type of the column cell values: string, number, bool, date, object.
+	 *
+	 *
+	 * Valid values:
+	 * "string" The data inside the column is of type string
+	 * "number" The data inside the column is of type number
+	 * "boolean" The data inside the column is of type boolean
+	 * "date" The data inside the column is of type date
+	 * "object" The data inside the column is of type object
 	 */
-	dataType?: string|number|boolean|Date|Object;
+	dataType?: string;
 
 	/**
 	 * Width of the column in pixels or percentage. Can also be set as '*', in which case the width auto-size based on the content of the column cells (including the header text).If width is not defined and [defaultColumnWidth](ui.ighierarchicalgrid#options:defaultColumnWidth) is set, it is assumed for all columns.
 	 *
+	 *
 	 * Valid values:
 	 * "string" The column width can be set in pixels (px), percentage (%) or as '*' in order to auto-size based on the cells and header content.
 	 * "number" The column width can be set as a number
@@ -47216,32 +54781,38 @@ interface IgHierarchicalGridColumn {
 
 	/**
 	 * Initial visibility of the column. A column can be hidden without the Hiding feature being enabled but there will be no UI for unhiding it. Columns can be defined as hidden in the options of the Hiding feature as well and those definitions take precedence.
+	 *
 	 */
 	hidden?: boolean;
 
 	/**
 	 * Sets a template for an individual column. the contents of the template should be the HTML markup that goes inside the table cell, or the entire table cell markup. [Here's an example of creating a basic column template](http://www.igniteui.com/help/creating-a-basic-column-template-in-the-iggrid)
+	 *
 	 */
 	template?: string;
 
 	/**
 	 * Sets whether column data is derived from the datasource. If set to true, then the cells in this column are not bound to the data source. The data in this column is populated using [formula](ui.ighierarchicalgrid#options:columns.formula), or using [unboundValues](ui.ighierarchicalgrid#options:columns.unboundValues), or through the [setUnboundValues](ui.ighierarchicalgrid#methods:setUnboundValues) API method. [Here's an overview of the unbound columns feature](http://www.igniteui.com/help/iggrid-unboundcolumns-overview)
+	 *
 	 */
 	unbound?: boolean;
 
 	/**
 	 * Options used to configure collapsible column [groups](ui.ighierarchicalgrid#options:columns.group).
+	 *
 	 */
 	groupOptions?: IgHierarchicalGridColumnGroupOptions;
 
 	/**
 	 * Array of child column definitions. If the column has the property group than the grid has multi column headers.
+	 *
 	 */
 	group?: any[];
 
 	/**
 	 * Determines the way in which dates will be displayed in the grid for this column.
 	 *
+	 *
 	 * Valid values:
 	 * "local" The dates for this column will be rendered in the client's local timezone.
 	 * "utc" The dates for this column will be rendered in their UTC representation.
@@ -47257,6 +54828,7 @@ interface IgHierarchicalGridColumn {
 	/**
 	 * A reference to or the name of a JavaScript function, which will calculate the value of the current cell based on other cell values in the same row. Used with [unbound columns](ui.ighierarchicalgrid#options:columns.unbound).
 	 *
+	 *
 	 * Valid values:
 	 * "string" The name of the JavaScript function.
 	 * "function" Reference to the JavaScript function.
@@ -47265,22 +54837,26 @@ interface IgHierarchicalGridColumn {
 
 	/**
 	 * Array of values which will be populated in the column cells at initialization, if the column is [unbound](ui.ighierarchicalgrid#options:columns.unbound).
+	 *
 	 */
 	unboundValues?: any[];
 
 	/**
 	 * Space-separated list of CSS classes to be applied on the header cell of this column.
+	 *
 	 */
 	headerCssClass?: string;
 
 	/**
 	 * Space-separated list of CSS classes to be applied on the data cells of this column. The class is not applied if the column has a column [template](ui.ighierarchicalgrid#options:columns.template) defined, which contains full <td> definition in the template.
+	 *
 	 */
 	columnCssClass?: string;
 
 	/**
 	 * This option is applicable only for columns with [dataType](ui.ighierarchicalgrid#options:columns.dataType) of object. Reference to a function, or the name of the function, that will be used for complex data extraction from the data records, whose return value will be used for all data operations associated with this column and will be displayed as cell value. [Here you can find more examples of how to setup a column mapper](http://www.igniteui.com/help/iggrid-columns-and-layout#defining-mapper)
 	 *
+	 *
 	 * Valid values:
 	 * "string" The name of the mapper function.
 	 * "function" Reference to the mapper function.
@@ -47289,26 +54865,31 @@ interface IgHierarchicalGridColumn {
 
 	/**
 	 * Specifies the row index of the cell in a Multi-Row Layout configuration. All columns must have this property set for the multi-row-layout mode to be enabled. [Here you can find more about the Multi-Row Layout feature](http://www.igniteui.com/help/iggrid-multirowlayout)
+	 *
 	 */
 	rowIndex?: number;
 
 	/**
 	 * Specifies the column index of the cell in a Multi-Row Layout configuration. All columns must have this property set for the multi-row-layout mode to be enabled. [Here you can find more about the Multi-Row Layout feature](http://www.igniteui.com/help/iggrid-multirowlayout)
+	 *
 	 */
 	columnIndex?: number;
 
 	/**
 	 * Specifies the navigation index of the cell for the TAB sequence when the cells are in edit mode in a Multi-Row Layout grid. Has no effect otherwise. [Here you can find more about the Multi-Row Layout feature](http://www.igniteui.com/help/iggrid-multirowlayout)
+	 *
 	 */
 	navigationIndex?: number;
 
 	/**
 	 * Specifies the colSpan of the cell in a Multi-Row Layout configuration. colSpan 0 is not supported and will be changed to 1 by the grid. [Here you can find more about the Multi-Row Layout feature](http://www.igniteui.com/help/iggrid-multirowlayout)
+	 *
 	 */
 	colSpan?: number;
 
 	/**
 	 * Specifies the rowSpan of the cell in a Multi-Row Layout configuration. rowSpan 0 is not supported and will be changed to 1 by the grid. [Here you can find more about the Multi-Row Layout feature](http://www.igniteui.com/help/iggrid-multirowlayout). If multi-row-layout is not used but multi-column-header is set then this option is used to adjust span of header cell.
+	 *
 	 */
 	rowSpan?: number;
 
@@ -47333,16 +54914,19 @@ interface IgHierarchicalGridFeature {
 interface IgHierarchicalGridRestSettingsCreate {
 	/**
 	 * Specifies a remote URL to which create requests will be sent. This will be used for both batch and non-batch, however if template is also set, this URL will only be used for batch requests.
+	 *
 	 */
 	url?: string;
 
 	/**
 	 * Specifies a remote URL template. Use ${id} in place of the resource id.
+	 *
 	 */
 	template?: string;
 
 	/**
 	 * Specifies whether create requests will be sent in batches
+	 *
 	 */
 	batch?: boolean;
 
@@ -47399,6 +54983,7 @@ interface IgHierarchicalGridRestSettingsRemove {
 interface IgHierarchicalGridRestSettings {
 	/**
 	 * Settings for create requests
+	 *
 	 */
 	create?: IgHierarchicalGridRestSettingsCreate;
 
@@ -47419,11 +55004,13 @@ interface IgHierarchicalGridRestSettings {
 
 	/**
 	 * Specifies a custom function to serialize content sent to the server. It should accept a single object or an array of objects and return a string. If not specified, JSON.stringify() will be used.
+	 *
 	 */
 	contentSerializer?: Function;
 
 	/**
 	 * Specifies the content type of the request. See http://api.jquery.com/jQuery.ajax/ => contentType
+	 *
 	 */
 	contentType?: string;
 
@@ -47436,41 +55023,49 @@ interface IgHierarchicalGridRestSettings {
 interface IgHierarchicalGridScrollSettings {
 	/**
 	 * Sets gets current vertical position.
+	 *
 	 */
 	scrollTop?: number;
 
 	/**
 	 * Sets gets current horizontal position.
+	 *
 	 */
 	scrollLeft?: number;
 
 	/**
 	 * Sets gets the step of the default scrolling behavior when using the mouse wheel.
+	 *
 	 */
 	wheelStep?: number;
 
 	/**
 	 * Sets gets if smoother scrolling with small intertia should be used when using the mouse wheel.
+	 *
 	 */
 	smoothing?: boolean;
 
 	/**
 	 * Sets or gets the modifier for how many pixels will be scrolled when using the mouse wheel once. This is used only for the [smooth scrolling behavior](ui.ighierarchicalgrid#options:scrollSettings.smoothing).
+	 *
 	 */
 	smoothingStep?: number;
 
 	/**
 	 * Sets or gets the modifier for how long the scroll ‘animation’ lasts when using the mouse wheel once. This is used only for the [smooth scrolling behavior](ui.ighierarchicalgrid#options:scrollSettings.smoothing).
+	 *
 	 */
 	smoothingDuration?: number;
 
 	/**
 	 * Sets gets the modifier for how much the inertia scrolls on touch devices. Note: Value set to 0 would disable touch movements. Value set to -1 would invert them.
+	 *
 	 */
 	inertiaStep?: number;
 
 	/**
 	 * Sets gets the modifier for how long the inertia last on touch devices.
+	 *
 	 */
 	inertiaDuration?: number;
 
@@ -47621,59 +55216,70 @@ interface ChildGridCreatedEventUIParam {}
 
 interface IgHierarchicalGrid {
 	/**
-	 * Only the first level will be data-bound initially. Also serves as "render" depth, meaning that depending on this prop, the grid will
+	 * Only the first level will be data-bound initially. Also serves as "render" depth, meaning that depending on this prop, the grid will render the child grids up to the specified level.
+	 *
 	 */
 	initialDataBindDepth?: number;
 
 	/**
 	 * No levels will be automatically expanded when the widget is instantiated for the first time
+	 *
 	 */
 	initialExpandDepth?: number;
 
 	/**
 	 * If true, encodes all requests using OData conventions and the $expand syntax
+	 *
 	 */
 	odata?: boolean;
 
 	/**
 	 * If true, load on demand will be achieved using REST compliant resource access with appropriate url-s for
 	 * the ajax GET calls.
+	 *
 	 */
 	rest?: boolean;
 
 	/**
 	 * Specifies the limit on the number of levels to bind to
+	 *
 	 */
 	maxDataBindDepth?: number;
 
 	/**
 	 * Specifies the default property in the response where children will be located
+	 *
 	 */
 	defaultChildrenDataProperty?: string;
 
 	/**
 	 * If true, will autogenerate all layouts assuming default values for "childrenDataProperty"
 	 * When autoGenerateLayouts is enabled, it will automatically generate all columns recursively. (all columns on all levels)
+	 *
 	 */
 	autoGenerateLayouts?: boolean;
 
 	/**
 	 * Applies a linear animation - either expanding or collapsing depending on the parent row state
+	 *
 	 */
 	expandCollapseAnimations?: boolean;
 
 	/**
 	 * Specifies the expand column width
+	 *
 	 */
 	expandColWidth?: number;
 
 	/**
 	 * Specifies the delimiter for constructing paths , for hierarchical lookup of data
+	 *
 	 */
 	pathSeparator?: string;
 
 	/**
 	 * The row expanding/collapsing animation duration in ms.
+	 *
 	 */
 	animationDuration?: number;
 
@@ -47692,12 +55298,14 @@ interface IgHierarchicalGrid {
 
 	/**
 	 * List of columnLayout objects that specify the structure of the child grids. All options that are applicable to a flat grid are also applicable here
+	 *
 	 */
 	columnLayouts?: IgHierarchicalGridColumnLayout[];
 
 	/**
 	 * Defines the grid width in pixels or percents. [Here you can find more info about setting igGrid width](http://www.igniteui.com/help/iggrid-columns-and-layout#width-height).
 	 *
+	 *
 	 * Valid values:
 	 * "string" The widget width can be set in pixels (px) or percentage (%). Example values: "800px", "800" (defaults to pixels), "100%".
 	 * "number" The widget width can be set in pixels as a number. Example values: 800, 700.
@@ -47708,6 +55316,7 @@ interface IgHierarchicalGrid {
 	/**
 	 * This is the total height of the grid, including all UI elements - scroll container with data rows, header, footer, filter row - (if any), etc. [Here you can find more info about setting igGrid height](http://www.igniteui.com/help/iggrid-columns-and-layout#width-height).
 	 *
+	 *
 	 * Valid values:
 	 * "string" The widget height can be set in pixels (px) and percentage (%).
 	 * "number" The widget height can be set as a number
@@ -47717,12 +55326,14 @@ interface IgHierarchicalGrid {
 
 	/**
 	 * If autoAdjustHeight is set to false, the [height](ui.ighierarchicalgrid#options:height) will be set only on the scrolling container, and all other UI elements such as paging footer / filter row / headers will add on top of that, so the total height of the grid will be more than this value - the height of the scroll container (content area) will not be dynamically calculated. Setting this option to false will usually result in a lot better initial rendering performance for large data sets ( > 1000 rows rendered at once, no [virtualization](ui.ighierarchicalgrid#options:virtualization) enabled), since no reflows will be made by browsers when accessing DOM properties such as offsetHeight.
+	 *
 	 */
 	autoAdjustHeight?: boolean;
 
 	/**
 	 * Used for [row virtualization](ui.ighierarchicalgrid#options:rowVirtualization) in [fixed mode](ui.ighierarchicalgrid#options:virtualizationMode). This is the average value in pixels (default) that will be used to calculate how many rows to render as the end user scrolls. Also all rows' height will be automatically set to this value.
 	 *
+	 *
 	 * Valid values:
 	 * "string" The avarage row height can be set in pixels ("25px").
 	 * "number" The avarage row height can be set in pixels as a number (25).
@@ -47732,6 +55343,7 @@ interface IgHierarchicalGrid {
 	/**
 	 * Used for [column virtualization](ui.ighierarchicalgrid#options:columnVirtualization) in [fixed mode](ui.ighierarchicalgrid#options:virtualizationMode). This is the average value in pixels for a column width.
 	 *
+	 *
 	 * Valid values:
 	 * "string" The avarage column width can be set in pixels ("25px").
 	 * "number" The avarage column width can be set in pixels as a number (25).
@@ -47741,6 +55353,7 @@ interface IgHierarchicalGrid {
 	/**
 	 * Default column width that will be set for all columns, that don't have [column width](ui.ighierarchicalgrid#options:columns.width) defined.
 	 *
+	 *
 	 * Valid values:
 	 * "string" The default column width can be set in pixels ("100px").
 	 * "number" The default column width can be set in pixels as a number (100).
@@ -47751,17 +55364,20 @@ interface IgHierarchicalGrid {
 	 * If no [columns](ui.ighierarchicalgrid#options:columns) collection is defined, and autoGenerateColumns is set to true, [columns](ui.ighierarchicalgrid#options:columns) will be inferred from the data source before the [dataRendering](ui.iggrid#events:dataRendering) event is fired. The inferred [columns](ui.ighierarchicalgrid#options:columns) collection will be available to the developer for modification at [dataRendering](ui.iggrid#events:dataRendering). If autoGenerateColumns is not explicitly set and [columns](ui.ighierarchicalgrid#options:columns) has at least one column defined then autoGenerateColumns is automatically set to false.
 	 * If autoGenerateColumns is true and there are columns defined auto-generated columns will render after the explicitly defined ones.
 	 * Since auto-generated columns don't have width defined consider setting [defaultColumnWidth](ui.ighierarchicalgrid#options:defaultColumnWidth) as well.
+	 *
 	 */
 	autoGenerateColumns?: boolean;
 
 	/**
 	 * Enables/disables column and row virtualization at the same time. Virtualization can greatly enhance rendering performance. If enabled, the number of actual rendered rows (DOM elements) will be constant and related to the visible viewport of the grid. As the end user scrolls, those DOM elements will be dynamically reused to render the new data. [Here you can find more info about the performance guidelines when using the igGrid](http://www.igniteui.com/help/iggrid-performance-guide)
+	 *
 	 */
 	virtualization?: boolean;
 
 	/**
 	 * Determines row virtualization mode.
 	 *
+	 *
 	 * Valid values:
 	 * "fixed" Renders only the visible rows and/or columns in the grid. On scrolling the same rows and/or columns are updated with new data from the data source. Only fixed virtualization can work with column virtualization at the same time. Fixed virtualization is not supported by some grid features: Resizing, Group By, Responsive.
 	 * "continuous" renders a pre-defined number of rows in the grid. On scrolling the continuous virtualization loads another portion of rows and disposes the current one.
@@ -47770,27 +55386,32 @@ interface IgHierarchicalGrid {
 
 	/**
 	 * Enables virtualization for rows only. [Here you can find more info about igGrid row virtualization](http://www.igniteui.com/help/iggrid-virtualization-overview)
+	 *
 	 */
 	rowVirtualization?: boolean;
 
 	/**
 	 * Enables virtualization for columns only. Column virtualization can work only in combination with fixed row virtalization. Setting columnVirtualization to true will automatically set [virtualization](ui.ighierarchicalgrid#options:virtualization) to true and [virtualizationMode](ui.ighierarchicalgrid#options:virtualizationMode) to "fixed".
+	 *
 	 */
 	columnVirtualization?: boolean;
 
 	/**
 	 * Number of pixels to scroll the grid by, when virtualization is enabled, and mouse wheel scrolling is performed over the virtual grid area. If "null" the step will be equal to the [avgRowHeight](ui.ighierarchicalgrid#options:avgRowHeight).
+	 *
 	 */
 	virtualizationMouseWheelStep?: number;
 
 	/**
 	 * If this option is set to true, the height of the grid row will be calculated automatically based on the [avgRowHeight](ui.ighierarchicalgrid#options:avgRowHeight) and the visible virtual records. If no [avgRowHeight](ui.ighierarchicalgrid#options:avgRowHeight) is specified, it will be calculated automatically at runtime.
+	 *
 	 */
 	adjustVirtualHeights?: boolean;
 
 	/**
 	 * The templating engine that will be used to render the grid [column templates](ui.ighierarchicalgrid#options:columns.template). [Here you can find](http://www.infragistics.com/community/blogs/marina_stoyanova/archive/2014/05/30/using-different-template-engines-with-ignite-ui-controls.aspx) how to use templating engines other than igTemplating and jsRender.
 	 *
+	 *
 	 * Valid values:
 	 * "infragistics" The grid will use the Infragistics Templating engine to render its [column templates](ui.ighierarchicalgrid#options:columns.template) and specific parts of the UI.
 	 * "jsRender" The grid will use jsRender to render its [column templates](ui.ighierarchicalgrid#options:columns.template) and specific parts of the UI.
@@ -47799,96 +55420,120 @@ interface IgHierarchicalGrid {
 
 	/**
 	 * An array of column objects. Checkout the [Columns and Layout](http://www.igniteui.com/help/iggrid-columns-and-layout#defining-columns) topic for details on configuring the columns array.
+	 *
 	 */
 	columns?: IgHierarchicalGridColumn[];
 
 	/**
 	 * Can be any valid data source accepted by [$.ig.DataSource](ig.datasource), or an instance of an $.ig.DataSource itself
+	 *
+	 *
+	 * Valid values:
+	 * "string" DataSource as a string. For example a Url.
+	 * "array" DataSource as an array.
+	 * "object" DataSource as an object. For example a JSON object
 	 */
-	dataSource?: any;
+	dataSource?: string|Array<any>|Object;
 
 	/**
 	 * Specifies a remote URL as a data source, from which data will be retrieved using the [$.ig.DataSource](ig.datasource).
+	 *
 	 */
 	dataSourceUrl?: string;
 
 	/**
 	 * Explicitly set data source type (such as "json"). Please refer to the documentation of [$.ig.DataSource type](ig.datasource#options:settings.type).
+	 *
 	 */
 	dataSourceType?: string;
 
 	/**
 	 * See [$.ig.DataSource responseDataKey](ig.datasource#options:settings.responseDataKey). This is the property in the responses where data records are held, if the response is wrapped.
+	 *
 	 */
 	responseDataKey?: string;
 
 	/**
 	 * See [$.ig.DataSource responseTotalRecCountKey](ig.datasource#options:settings.responseTotalRecCountKey). Property in the response specifying the total number of records on the server.
+	 *
 	 */
 	responseTotalRecCountKey?: string;
 
 	/**
 	 * Specifies the HTTP verb to be used to issue the requests to a remote data source.
+	 *
 	 */
 	requestType?: string;
 
 	/**
 	 * Content type of the response. See http://api.jquery.com/jQuery.ajax/ => contentType
+	 *
 	 */
 	responseContentType?: string;
 
 	/**
 	 * Controls the visibility of the grid header.
+	 *
 	 */
 	showHeader?: boolean;
 
 	/**
 	 * Controls the visibility of the grid footer.
+	 *
 	 */
 	showFooter?: boolean;
 
 	/**
 	 * Headers will be fixed if this option is set to true, and only the grid data will be scrollable. If [virtualization](ui.ighierarchicalgrid#options:virtualization) is enabled, fixedHeaders will always act as if it's true, no matter which value is set.
+	 *
 	 */
 	fixedHeaders?: boolean;
 
 	/**
 	 * Footers will be fixed if this option is set to true, and only the grid data will be scrollable. If [virtualization](ui.ighierarchicalgrid#options:virtualization) is enabled, fixedFooters will always act as if it's true, no matter which value is set.
+	 *
 	 */
 	fixedFooters?: boolean;
 
 	/**
 	 * Caption text that will be shown above the grid header.
+	 *
 	 */
 	caption?: string;
 
 	/**
 	 * List of grid feature definitions: sorting, paging, etc. Each feature goes with its separate options that are documented for the feature accordingly. [Here you can find detailed documentation for all igGrid features](http://www.igniteui.com/help/iggrid-features-landing-page)
+	 *
 	 */
 	features?: IgHierarchicalGridFeature[];
 
 	/**
 	 * Initial tabIndex attribute that will be set on all focusable elements.
+	 *
 	 */
 	tabIndex?: number;
 
 	/**
 	 * If this option is set to false, the data to which the grid is bound will be used "as is" with no additional transformations based on [columns](ui.ighierarchicalgrid#options:columns) defined. Otherwise only the subset of data properties used in the [columns](ui.ighierarchicalgrid#options:columns) defined will be extracted in a new object and used.
+	 *
 	 */
 	localSchemaTransform?: boolean;
 
 	/**
 	 * Key of the column containing unique identifiers for the data records.
+	 *
 	 */
 	primaryKey?: string;
 
 	/**
 	 * If true, the transaction log will always be sent in the request for remote data, by the data source. Also this means that if there are values in the log, a POST will be performed instead of GET.
+	 *
 	 */
 	serializeTransactionLog?: boolean;
 
 	/**
 	 * Automatically commits the transactions as rows/cells are being edited to the client data source. A [saveChanges](ui.ighierarchicalgrid#methods:saveChanges) call still needs to be performed in order to commit the transactions to a server-side data source.
+	 *
 	 */
 	autoCommit?: boolean;
 
@@ -47898,12 +55543,14 @@ interface IgHierarchicalGrid {
 	 * If a new row is added, edited, then deleted, there will be no transaction added to the log.
 	 * If several edits are made to a row or an individual cell, this should result in a single transaction.
 	 * Note: This option takes effect only when [autoCommit](ui.ighierarchicalgrid#options:autoCommit) is set to false.
+	 *
 	 */
 	aggregateTransactions?: boolean;
 
 	/**
 	 * Sets gets ability to automatically format text in cells for numeric and date columns. The format patterns and rules for numbers and dates are defined in $.ig.regional.defaults object. [Here column formatting is explained in details](http://www.igniteui.com/help/iggrid-columns-and-layout#column-formatting)
 	 *
+	 *
 	 * Valid values:
 	 * "date" formats only Date columns
 	 * "number" formats only number columns
@@ -47915,58 +55562,69 @@ interface IgHierarchicalGrid {
 
 	/**
 	 * Gets sets ability to render checkboxes and use checkbox editor when dataType of a column is "bool". Checkboxes are not rendered for boolean values in columns with a [column template](ui.ighierarchicalgrid#options:columns.template).
+	 *
 	 */
 	renderCheckboxes?: boolean;
 
 	/**
 	 * URL to which updating requests will be made.
+	 *
 	 */
 	updateUrl?: string;
 
 	/**
 	 * Settings related to REST compliant update routines.
+	 *
 	 */
 	restSettings?: IgHierarchicalGridRestSettings;
 
 	/**
 	 * Enables/disables rendering of alternating row styles (odd and even rows receive different styling).
+	 *
 	 */
 	alternateRowStyles?: boolean;
 
 	/**
 	 * If set to true and all columns' widths are specified and their combined width is less than the grid width then the last column width will be automatically adjusted to fill the remaining empty space of the grid.
+	 *
 	 */
 	autofitLastColumn?: boolean;
 
 	/**
 	 * Enables/disables rendering of hover styles when the mouse is over a record. This can be useful in templating scenarios, for example, where we don't want to apply hover styling to templated content.
+	 *
 	 */
 	enableHoverStyles?: boolean;
 
 	/**
 	 * Nables/Disables serializing client date as UTC ISO 8061 string instead of using the local time and zone values.
+	 *
 	 */
 	enableUTCDates?: boolean;
 
 	/**
 	 * Merge unbound columns values inside data source when data source is remote. If true then the unbound columns are merged to the data source at runtime on the server. Note that data source is expanded with the new data and this could cause performance issues when the data is huge. If mergeUnboundColumns is false then the unbound data is sent and merged on the client. This option is used by the [igGrid MVC Helper](http://www.igniteui.com/help/iggrid-developing-asp-net-mvc-applications-with-iggrid).
 	 * Checkout [Populating Unbound Columns Remotely (igGrid)](http://www.igniteui.com/help/iggrid-unboundcolumns-populating-with-data-remotely) topic for more information.
+	 *
 	 */
 	mergeUnboundColumns?: boolean;
 
 	/**
 	 * When dataSource is a remote URL, defines whether to set the type of the remote data source to JSONP.
+	 *
 	 */
 	jsonpRequest?: boolean;
 
 	/**
 	 * Enables/disables grid adjusting its dimensions when its [width](ui.ighierarchicalgrid#options:width) and/or [height](ui.ighierarchicalgrid#options:height) is set in percent (%) and grid parent DOM container is resized.
+	 *
 	 */
 	enableResizeContainerCheck?: boolean;
 
 	/**
 	 * Configures how the feature chooser icon should display on header cells - e.g. to display as gear icon or not.
 	 *
+	 *
 	 * Valid values:
 	 * "none" Always hide the feature chooser icon; The feature chooser is shown on tapping/clicking the column header.
 	 * "desktopOnly" Always show the icon on desktop but hide when touch device detected.
@@ -47976,9 +55634,22 @@ interface IgHierarchicalGrid {
 
 	/**
 	 * Settings related to content scrolling.
+	 *
 	 */
 	scrollSettings?: IgHierarchicalGridScrollSettings;
 
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	language?: string;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+	regional?: string|Object;
+
 	/**
 	 * Event which is fired when a hierarchical row is about to be expanded
 	 */
@@ -48158,7 +55829,16 @@ interface IgHierarchicalGrid {
 	[optionName: string]: any;
 }
 interface IgHierarchicalGridMethods {
+	/**
+	 * Changes the all locales into the widget element to the language specified in [options.language](ui.ighierarchicalgrid#options:language)
+	 * Note that this method is for rare scenarios, see [language](ui.ighierarchicalgrid#options:language) or [locale](ui.ighierarchicalgrid#options:locale) option setter
+	 */
 	changeLocale(): void;
+
+	/**
+	 * Changes the the regional settings of widget element to the language specified in [options.regional](ui.ighierarchicalgrid#options:regional)
+	 * Note that this method is for rare scenarios, use [regional](ui.ighierarchicalgrid#options:regional) option setter
+	 */
 	changeRegional(): void;
 
 	/**
@@ -48258,6 +55938,16 @@ interface IgHierarchicalGridMethods {
 	 * Destroys the hierarchical grid by recursively destroying all child grids
 	 */
 	destroy(): void;
+
+	/**
+	 * Changes the widget language to global language. Global language is the value in $.ig.util.language
+	 */
+	changeGlobalLanguage(): void;
+
+	/**
+	 * Changes the widget regional settins to global regional settings. Global regional settings are container in $.ig.util.regional
+	 */
+	changeGlobalRegional(): void;
 }
 interface JQuery {
 	data(propertyName: "igHierarchicalGrid"): IgHierarchicalGridMethods;
@@ -48281,14 +55971,18 @@ interface JQuery {
 	igHierarchicalGrid(methodName: "rollback", rebind?: boolean): void;
 	igHierarchicalGrid(methodName: "saveChanges", success: Function, error: Function): void;
 	igHierarchicalGrid(methodName: "destroy"): void;
+	igHierarchicalGrid(methodName: "changeGlobalLanguage"): void;
+	igHierarchicalGrid(methodName: "changeGlobalRegional"): void;
 
 	/**
-	 * Only the first level will be data-bound initially. Also serves as "render" depth, meaning that depending on this prop, the grid will
+	 * Only the first level will be data-bound initially. Also serves as "render" depth, meaning that depending on this prop, the grid will render the child grids up to the specified level.
+	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "initialDataBindDepth"): number;
 
 	/**
-	 * Only the first level will be data-bound initially. Also serves as "render" depth, meaning that depending on this prop, the grid will
+	 * Only the first level will be data-bound initially. Also serves as "render" depth, meaning that depending on this prop, the grid will render the child grids up to the specified level.
+	 *
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -48296,24 +55990,28 @@ interface JQuery {
 
 	/**
 	 * No levels will be automatically expanded when the widget is instantiated for the first time
+	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "initialExpandDepth"): number;
 
 	/**
 	 * No levels will be automatically expanded when the widget is instantiated for the first time
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "initialExpandDepth", optionValue: number): void;
 
 	/**
 	 * If true, encodes all requests using OData conventions and the $expand syntax
+	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "odata"): boolean;
 
 	/**
 	 * If true, encodes all requests using OData conventions and the $expand syntax
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "odata", optionValue: boolean): void;
@@ -48321,6 +56019,7 @@ interface JQuery {
 	/**
 	 * If true, load on demand will be achieved using REST compliant resource access with appropriate url-s for
 	 * the ajax GET calls.
+	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "rest"): boolean;
 
@@ -48328,30 +56027,35 @@ interface JQuery {
 	 * If true, load on demand will be achieved using REST compliant resource access with appropriate url-s for
 	 * the ajax GET calls.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "rest", optionValue: boolean): void;
 
 	/**
 	 * Gets the limit on the number of levels to bind to
+	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "maxDataBindDepth"): number;
 
 	/**
 	 * Sets the limit on the number of levels to bind to
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "maxDataBindDepth", optionValue: number): void;
 
 	/**
 	 * Gets the default property in the response where children will be located
+	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "defaultChildrenDataProperty"): string;
 
 	/**
 	 * Sets the default property in the response where children will be located
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "defaultChildrenDataProperty", optionValue: string): void;
@@ -48359,6 +56063,7 @@ interface JQuery {
 	/**
 	 * If true, will autogenerate all layouts assuming default values for "childrenDataProperty"
 	 * When autoGenerateLayouts is enabled, it will automatically generate all columns recursively. (all columns on all levels)
+	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "autoGenerateLayouts"): boolean;
 
@@ -48366,54 +56071,63 @@ interface JQuery {
 	 * If true, will autogenerate all layouts assuming default values for "childrenDataProperty"
 	 * When autoGenerateLayouts is enabled, it will automatically generate all columns recursively. (all columns on all levels)
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "autoGenerateLayouts", optionValue: boolean): void;
 
 	/**
 	 * Applies a linear animation - either expanding or collapsing depending on the parent row state
+	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "expandCollapseAnimations"): boolean;
 
 	/**
 	 * Applies a linear animation - either expanding or collapsing depending on the parent row state
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "expandCollapseAnimations", optionValue: boolean): void;
 
 	/**
 	 * Gets the expand column width
+	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "expandColWidth"): number;
 
 	/**
 	 * Sets the expand column width
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "expandColWidth", optionValue: number): void;
 
 	/**
 	 * Gets the delimiter for constructing paths , for hierarchical lookup of data
+	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "pathSeparator"): string;
 
 	/**
 	 * Sets the delimiter for constructing paths , for hierarchical lookup of data
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "pathSeparator", optionValue: string): void;
 
 	/**
 	 * The row expanding/collapsing animation duration in ms.
+	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "animationDuration"): number;
 
 	/**
 	 * The row expanding/collapsing animation duration in ms.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "animationDuration", optionValue: number): void;
@@ -48450,18 +56164,21 @@ interface JQuery {
 
 	/**
 	 * List of columnLayout objects that specify the structure of the child grids. All options that are applicable to a flat grid are also applicable here
+	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "columnLayouts"): IgHierarchicalGridColumnLayout[];
 
 	/**
 	 * List of columnLayout objects that specify the structure of the child grids. All options that are applicable to a flat grid are also applicable here
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "columnLayouts", optionValue: IgHierarchicalGridColumnLayout[]): void;
 
 	/**
 	 * Defines the grid width in pixels or percents. [Here you can find more info about setting igGrid width](http://www.igniteui.com/help/iggrid-columns-and-layout#width-height).
+	 *
 	 */
 
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "width"): string|number;
@@ -48469,6 +56186,7 @@ interface JQuery {
 	/**
 	 * Defines the grid width in pixels or percents. [Here you can find more info about setting igGrid width](http://www.igniteui.com/help/iggrid-columns-and-layout#width-height).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -48476,6 +56194,7 @@ interface JQuery {
 
 	/**
 	 * This is the total height of the grid, including all UI elements - scroll container with data rows, header, footer, filter row - (if any), etc. [Here you can find more info about setting igGrid height](http://www.igniteui.com/help/iggrid-columns-and-layout#width-height).
+	 *
 	 */
 
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "height"): string|number;
@@ -48483,6 +56202,7 @@ interface JQuery {
 	/**
 	 * This is the total height of the grid, including all UI elements - scroll container with data rows, header, footer, filter row - (if any), etc. [Here you can find more info about setting igGrid height](http://www.igniteui.com/help/iggrid-columns-and-layout#width-height).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -48490,18 +56210,21 @@ interface JQuery {
 
 	/**
 	 * If autoAdjustHeight is set to false, the [height](ui.ighierarchicalgrid#options:height) will be set only on the scrolling container, and all other UI elements such as paging footer / filter row / headers will add on top of that, so the total height of the grid will be more than this value - the height of the scroll container (content area) will not be dynamically calculated. Setting this option to false will usually result in a lot better initial rendering performance for large data  ( > 1000 rows rendered at once, no [virtualization](ui.ighierarchicalgrid#options:virtualization) enabled), since no reflows will be made by browsers when accessing DOM properties such as offsetHeight.
+	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "autoAdjustHeight"): boolean;
 
 	/**
 	 * If autoAdjustHeight is set to false, the [height](ui.ighierarchicalgrid#options:height) will be set only on the scrolling container, and all other UI elements such as paging footer / filter row / headers will add on top of that, so the total height of the grid will be more than this value - the height of the scroll container (content area) will not be dynamically calculated. Setting this option to false will usually result in a lot better initial rendering performance for large data sets ( > 1000 rows rendered at once, no [virtualization](ui.ighierarchicalgrid#options:virtualization) enabled), since no reflows will be made by browsers when accessing DOM properties such as offsetHeight.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "autoAdjustHeight", optionValue: boolean): void;
 
 	/**
 	 * Used for [row virtualization](ui.ighierarchicalgrid#options:rowVirtualization) in [fixed mode](ui.ighierarchicalgrid#options:virtualizationMode). This is the average value in pixels (default) that will be used to calculate how many rows to render as the end user scrolls. Also all rows' height will be automatically set to this value.
+	 *
 	 */
 
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "avgRowHeight"): string|number;
@@ -48509,6 +56232,7 @@ interface JQuery {
 	/**
 	 * Used for [row virtualization](ui.ighierarchicalgrid#options:rowVirtualization) in [fixed mode](ui.ighierarchicalgrid#options:virtualizationMode). This is the average value in pixels (default) that will be used to calculate how many rows to render as the end user scrolls. Also all rows' height will be automatically set to this value.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -48516,6 +56240,7 @@ interface JQuery {
 
 	/**
 	 * Used for [column virtualization](ui.ighierarchicalgrid#options:columnVirtualization) in [fixed mode](ui.ighierarchicalgrid#options:virtualizationMode). This is the average value in pixels for a column width.
+	 *
 	 */
 
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "avgColumnWidth"): string|number;
@@ -48523,6 +56248,7 @@ interface JQuery {
 	/**
 	 * Used for [column virtualization](ui.ighierarchicalgrid#options:columnVirtualization) in [fixed mode](ui.ighierarchicalgrid#options:virtualizationMode). This is the average value in pixels for a column width.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -48530,6 +56256,7 @@ interface JQuery {
 
 	/**
 	 * Default column width that will be set for all columns, that don't have [column width](ui.ighierarchicalgrid#options:columns.width) defined.
+	 *
 	 */
 
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "defaultColumnWidth"): string|number;
@@ -48537,6 +56264,7 @@ interface JQuery {
 	/**
 	 * Default column width that will be set for all columns, that don't have [column width](ui.ighierarchicalgrid#options:columns.width) defined.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -48546,6 +56274,7 @@ interface JQuery {
 	 * If no [columns](ui.ighierarchicalgrid#options:columns) collection is defined, and autoGenerateColumns is set to true, [columns](ui.ighierarchicalgrid#options:columns) will be inferred from the data source before the [dataRendering](ui.iggrid#events:dataRendering) event is fired. The inferred [columns](ui.ighierarchicalgrid#options:columns) collection will be available to the developer for modification at [dataRendering](ui.iggrid#events:dataRendering). If autoGenerateColumns is not explicitly set and [columns](ui.ighierarchicalgrid#options:columns) has at least one column defined then autoGenerateColumns is automatically set to false.
 	 * If autoGenerateColumns is true and there are columns defined auto-generated columns will render after the explicitly defined ones.
 	 * Since auto-generated columns don't have width defined consider setting [defaultColumnWidth](ui.ighierarchicalgrid#options:defaultColumnWidth) as well.
+	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "autoGenerateColumns"): boolean;
 
@@ -48554,24 +56283,28 @@ interface JQuery {
 	 * If autoGenerateColumns is true and there are columns defined auto-generated columns will render after the explicitly defined ones.
 	 * Since auto-generated columns don't have width defined consider setting [defaultColumnWidth](ui.ighierarchicalgrid#options:defaultColumnWidth) as well.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "autoGenerateColumns", optionValue: boolean): void;
 
 	/**
 	 * Enables/disables column and row virtualization at the same time. Virtualization can greatly enhance rendering performance. If enabled, the number of actual rendered rows (DOM elements) will be constant and related to the visible viewport of the grid. As the end user scrolls, those DOM elements will be dynamically reused to render the new data. [Here you can find more info about the performance guidelines when using the igGrid](http://www.igniteui.com/help/iggrid-performance-guide)
+	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "virtualization"): boolean;
 
 	/**
 	 * Enables/disables column and row virtualization at the same time. Virtualization can greatly enhance rendering performance. If enabled, the number of actual rendered rows (DOM elements) will be constant and related to the visible viewport of the grid. As the end user scrolls, those DOM elements will be dynamically reused to render the new data. [Here you can find more info about the performance guidelines when using the igGrid](http://www.igniteui.com/help/iggrid-performance-guide)
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "virtualization", optionValue: boolean): void;
 
 	/**
 	 * Determines row virtualization mode.
+	 *
 	 */
 
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "virtualizationMode"): string;
@@ -48579,6 +56312,7 @@ interface JQuery {
 	/**
 	 * Determines row virtualization mode.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -48586,54 +56320,63 @@ interface JQuery {
 
 	/**
 	 * Enables virtualization for rows only. [Here you can find more info about igGrid row virtualization](http://www.igniteui.com/help/iggrid-virtualization-overview)
+	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "rowVirtualization"): boolean;
 
 	/**
 	 * Enables virtualization for rows only. [Here you can find more info about igGrid row virtualization](http://www.igniteui.com/help/iggrid-virtualization-overview)
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "rowVirtualization", optionValue: boolean): void;
 
 	/**
 	 * Enables virtualization for columns only. Column virtualization can work only in combination with fixed row virtalization. Setting columnVirtualization to true will automatically set [virtualization](ui.ighierarchicalgrid#options:virtualization) to true and [virtualizationMode](ui.ighierarchicalgrid#options:virtualizationMode) to "fixed".
+	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "columnVirtualization"): boolean;
 
 	/**
 	 * Enables virtualization for columns only. Column virtualization can work only in combination with fixed row virtalization. Setting columnVirtualization to true will automatically set [virtualization](ui.ighierarchicalgrid#options:virtualization) to true and [virtualizationMode](ui.ighierarchicalgrid#options:virtualizationMode) to "fixed".
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "columnVirtualization", optionValue: boolean): void;
 
 	/**
 	 * Number of pixels to scroll the grid by, when virtualization is enabled, and mouse wheel scrolling is performed over the virtual grid area. If "null" the step will be equal to the [avgRowHeight](ui.ighierarchicalgrid#options:avgRowHeight).
+	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "virtualizationMouseWheelStep"): number;
 
 	/**
 	 * Number of pixels to scroll the grid by, when virtualization is enabled, and mouse wheel scrolling is performed over the virtual grid area. If "null" the step will be equal to the [avgRowHeight](ui.ighierarchicalgrid#options:avgRowHeight).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "virtualizationMouseWheelStep", optionValue: number): void;
 
 	/**
 	 * If this option is set to true, the height of the grid row will be calculated automatically based on the [avgRowHeight](ui.ighierarchicalgrid#options:avgRowHeight) and the visible virtual records. If no [avgRowHeight](ui.ighierarchicalgrid#options:avgRowHeight) is specified, it will be calculated automatically at runtime.
+	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "adjustVirtualHeights"): boolean;
 
 	/**
 	 * If this option is set to true, the height of the grid row will be calculated automatically based on the [avgRowHeight](ui.ighierarchicalgrid#options:avgRowHeight) and the visible virtual records. If no [avgRowHeight](ui.ighierarchicalgrid#options:avgRowHeight) is specified, it will be calculated automatically at runtime.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "adjustVirtualHeights", optionValue: boolean): void;
 
 	/**
 	 * The templating engine that will be used to render the grid [column templates](ui.ighierarchicalgrid#options:columns.template). [Here you can find](http://www.infragistics.com/community/blogs/marina_stoyanova/archive/2014/05/30/using-different-template-engines-with-ignite-ui-controls.aspx) how to use templating engines other than igTemplating and jsRender.
+	 *
 	 */
 
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "templatingEngine"): string;
@@ -48641,6 +56384,7 @@ interface JQuery {
 	/**
 	 * The templating engine that will be used to render the grid [column templates](ui.ighierarchicalgrid#options:columns.template). [Here you can find](http://www.infragistics.com/community/blogs/marina_stoyanova/archive/2014/05/30/using-different-template-engines-with-ignite-ui-controls.aspx) how to use templating engines other than igTemplating and jsRender.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -48648,228 +56392,268 @@ interface JQuery {
 
 	/**
 	 * An array of column objects. Checkout the [Columns and Layout](http://www.igniteui.com/help/iggrid-columns-and-layout#defining-columns) topic for details on configuring the columns array.
+	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "columns"): IgHierarchicalGridColumn[];
 
 	/**
 	 * An array of column objects. Checkout the [Columns and Layout](http://www.igniteui.com/help/iggrid-columns-and-layout#defining-columns) topic for details on configuring the columns array.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "columns", optionValue: IgHierarchicalGridColumn[]): void;
 
 	/**
 	 * Can be any valid data source accepted by [$.ig.DataSource](ig.datasource), or an instance of an $.ig.DataSource itself
+	 *
 	 */
-	igHierarchicalGrid(optionLiteral: 'option', optionName: "dataSource"): any;
+
+	igHierarchicalGrid(optionLiteral: 'option', optionName: "dataSource"): string|Array<any>|Object;
 
 	/**
 	 * Can be any valid data source accepted by [$.ig.DataSource](ig.datasource), or an instance of an $.ig.DataSource itself
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
-	igHierarchicalGrid(optionLiteral: 'option', optionName: "dataSource", optionValue: any): void;
+
+	igHierarchicalGrid(optionLiteral: 'option', optionName: "dataSource", optionValue: string|Array<any>|Object): void;
 
 	/**
 	 * Gets a remote URL as a data source, from which data will be retrieved using the [$.ig.DataSource](ig.datasource).
+	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "dataSourceUrl"): string;
 
 	/**
 	 * Sets a remote URL as a data source, from which data will be retrieved using the [$.ig.DataSource](ig.datasource).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "dataSourceUrl", optionValue: string): void;
 
 	/**
 	 * Explicitly set data source type (such as "json"). Please refer to the documentation of [$.ig.DataSource type](ig.datasource#options:settings.type).
+	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "dataSourceType"): string;
 
 	/**
 	 * Explicitly set data source type (such as "json"). Please refer to the documentation of [$.ig.DataSource type](ig.datasource#options:settings.type).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "dataSourceType", optionValue: string): void;
 
 	/**
 	 * See [$.ig.DataSource responseDataKey](ig.datasource#options:settings.responseDataKey). This is the property in the responses where data records are held, if the response is wrapped.
+	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "responseDataKey"): string;
 
 	/**
 	 * See [$.ig.DataSource responseDataKey](ig.datasource#options:settings.responseDataKey). This is the property in the responses where data records are held, if the response is wrapped.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "responseDataKey", optionValue: string): void;
 
 	/**
 	 * See [$.ig.DataSource responseTotalRecCountKey](ig.datasource#options:settings.responseTotalRecCountKey). Property in the response specifying the total number of records on the server.
+	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "responseTotalRecCountKey"): string;
 
 	/**
 	 * See [$.ig.DataSource responseTotalRecCountKey](ig.datasource#options:settings.responseTotalRecCountKey). Property in the response specifying the total number of records on the server.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "responseTotalRecCountKey", optionValue: string): void;
 
 	/**
 	 * Gets the HTTP verb to be used to issue the requests to a remote data source.
+	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "requestType"): string;
 
 	/**
 	 * Sets the HTTP verb to be used to issue the requests to a remote data source.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "requestType", optionValue: string): void;
 
 	/**
 	 * Content type of the response. See http://api.jquery.com/jQuery.ajax/ => contentType
+	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "responseContentType"): string;
 
 	/**
 	 * Content type of the response. See http://api.jquery.com/jQuery.ajax/ => contentType
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "responseContentType", optionValue: string): void;
 
 	/**
 	 * Controls the visibility of the grid header.
+	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "showHeader"): boolean;
 
 	/**
 	 * Controls the visibility of the grid header.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "showHeader", optionValue: boolean): void;
 
 	/**
 	 * Controls the visibility of the grid footer.
+	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "showFooter"): boolean;
 
 	/**
 	 * Controls the visibility of the grid footer.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "showFooter", optionValue: boolean): void;
 
 	/**
 	 * Headers will be fixed if this option is set to true, and only the grid data will be scrollable. If [virtualization](ui.ighierarchicalgrid#options:virtualization) is enabled, fixedHeaders will always act as if it's true, no matter which value is set.
+	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "fixedHeaders"): boolean;
 
 	/**
 	 * Headers will be fixed if this option is set to true, and only the grid data will be scrollable. If [virtualization](ui.ighierarchicalgrid#options:virtualization) is enabled, fixedHeaders will always act as if it's true, no matter which value is set.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "fixedHeaders", optionValue: boolean): void;
 
 	/**
 	 * Footers will be fixed if this option is set to true, and only the grid data will be scrollable. If [virtualization](ui.ighierarchicalgrid#options:virtualization) is enabled, fixedFooters will always act as if it's true, no matter which value is set.
+	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "fixedFooters"): boolean;
 
 	/**
 	 * Footers will be fixed if this option is set to true, and only the grid data will be scrollable. If [virtualization](ui.ighierarchicalgrid#options:virtualization) is enabled, fixedFooters will always act as if it's true, no matter which value is set.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "fixedFooters", optionValue: boolean): void;
 
 	/**
 	 * Caption text that will be shown above the grid header.
+	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "caption"): string;
 
 	/**
 	 * Caption text that will be shown above the grid header.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "caption", optionValue: string): void;
 
 	/**
 	 * List of grid feature definitions: sorting, paging, etc. Each feature goes with its separate options that are documented for the feature accordingly. [Here you can find detailed documentation for all igGrid features](http://www.igniteui.com/help/iggrid-features-landing-page)
+	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "features"): IgHierarchicalGridFeature[];
 
 	/**
 	 * List of grid feature definitions: sorting, paging, etc. Each feature goes with its separate options that are documented for the feature accordingly. [Here you can find detailed documentation for all igGrid features](http://www.igniteui.com/help/iggrid-features-landing-page)
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "features", optionValue: IgHierarchicalGridFeature[]): void;
 
 	/**
 	 * Initial tabIndex attribute that will be set on all focusable elements.
+	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "tabIndex"): number;
 
 	/**
 	 * Initial tabIndex attribute that will be set on all focusable elements.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "tabIndex", optionValue: number): void;
 
 	/**
 	 * If this option is set to false, the data to which the grid is bound will be used "as is" with no additional transformations based on [columns](ui.ighierarchicalgrid#options:columns) defined. Otherwise only the subset of data properties used in the [columns](ui.ighierarchicalgrid#options:columns) defined will be extracted in a new object and used.
+	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "localSchemaTransform"): boolean;
 
 	/**
 	 * If this option is set to false, the data to which the grid is bound will be used "as is" with no additional transformations based on [columns](ui.ighierarchicalgrid#options:columns) defined. Otherwise only the subset of data properties used in the [columns](ui.ighierarchicalgrid#options:columns) defined will be extracted in a new object and used.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "localSchemaTransform", optionValue: boolean): void;
 
 	/**
 	 * Key of the column containing unique identifiers for the data records.
+	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "primaryKey"): string;
 
 	/**
 	 * Key of the column containing unique identifiers for the data records.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "primaryKey", optionValue: string): void;
 
 	/**
 	 * If true, the transaction log will always be sent in the request for remote data, by the data source. Also this means that if there are values in the log, a POST will be performed instead of GET.
+	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "serializeTransactionLog"): boolean;
 
 	/**
 	 * If true, the transaction log will always be sent in the request for remote data, by the data source. Also this means that if there are values in the log, a POST will be performed instead of GET.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "serializeTransactionLog", optionValue: boolean): void;
 
 	/**
 	 * Automatically commits the transactions as rows/cells are being edited to the client data source. A [saveChanges](ui.ighierarchicalgrid#methods:saveChanges) call still needs to be performed in order to commit the transactions to a server-side data source.
+	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "autoCommit"): boolean;
 
 	/**
 	 * Automatically commits the transactions as rows/cells are being edited to the client data source. A [saveChanges](ui.ighierarchicalgrid#methods:saveChanges) call still needs to be performed in order to commit the transactions to a server-side data source.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "autoCommit", optionValue: boolean): void;
@@ -48880,6 +56664,7 @@ interface JQuery {
 	 * If a new row is added, edited, then deleted, there will be no transaction added to the log.
 	 * If several edits are made to a row or an individual cell, this should result in a single transaction.
 	 * Note: This option takes effect only when [autoCommit](ui.ighierarchicalgrid#options:autoCommit) is set to false.
+	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "aggregateTransactions"): boolean;
 
@@ -48890,12 +56675,14 @@ interface JQuery {
 	 * If several edits are made to a row or an individual cell, this should result in a single transaction.
 	 * Note: This option takes effect only when [autoCommit](ui.ighierarchicalgrid#options:autoCommit) is set to false.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "aggregateTransactions", optionValue: boolean): void;
 
 	/**
 	 * Sets gets ability to automatically format text in cells for numeric and date columns. The format patterns and rules for numbers and dates are defined in $.ig.regional.defaults object. [Here column formatting is explained in details](http://www.igniteui.com/help/iggrid-columns-and-layout#column-formatting)
+	 *
 	 */
 
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "autoFormat"): string|boolean;
@@ -48903,6 +56690,7 @@ interface JQuery {
 	/**
 	 * Sets gets ability to automatically format text in cells for numeric and date columns. The format patterns and rules for numbers and dates are defined in $.ig.regional.defaults object. [Here column formatting is explained in details](http://www.igniteui.com/help/iggrid-columns-and-layout#column-formatting)
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -48910,84 +56698,98 @@ interface JQuery {
 
 	/**
 	 * Gets  ability to render checkboxes and use checkbox editor when dataType of a column is "bool". Checkboxes are not rendered for boolean values in columns with a [column template](ui.ighierarchicalgrid#options:columns.template).
+	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "renderCheckboxes"): boolean;
 
 	/**
 	 * Sets ability to render checkboxes and use checkbox editor when dataType of a column is "bool". Checkboxes are not rendered for boolean values in columns with a [column template](ui.ighierarchicalgrid#options:columns.template).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "renderCheckboxes", optionValue: boolean): void;
 
 	/**
 	 * URL to which updating requests will be made.
+	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "updateUrl"): string;
 
 	/**
 	 * URL to which updating requests will be made.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "updateUrl", optionValue: string): void;
 
 	/**
 	 * Settings related to REST compliant update routines.
+	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "restSettings"): IgHierarchicalGridRestSettings;
 
 	/**
 	 * Settings related to REST compliant update routines.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "restSettings", optionValue: IgHierarchicalGridRestSettings): void;
 
 	/**
 	 * Enables/disables rendering of alternating row styles (odd and even rows receive different styling).
+	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "alternateRowStyles"): boolean;
 
 	/**
 	 * Enables/disables rendering of alternating row styles (odd and even rows receive different styling).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "alternateRowStyles", optionValue: boolean): void;
 
 	/**
 	 * If set to true and all columns' widths are specified and their combined width is less than the grid width then the last column width will be automatically adjusted to fill the remaining empty space of the grid.
+	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "autofitLastColumn"): boolean;
 
 	/**
 	 * If set to true and all columns' widths are specified and their combined width is less than the grid width then the last column width will be automatically adjusted to fill the remaining empty space of the grid.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "autofitLastColumn", optionValue: boolean): void;
 
 	/**
 	 * Enables/disables rendering of hover styles when the mouse is over a record. This can be useful in templating scenarios, for example, where we don't want to apply hover styling to templated content.
+	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "enableHoverStyles"): boolean;
 
 	/**
 	 * Enables/disables rendering of hover styles when the mouse is over a record. This can be useful in templating scenarios, for example, where we don't want to apply hover styling to templated content.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "enableHoverStyles", optionValue: boolean): void;
 
 	/**
 	 * Nables/Disables serializing client date as UTC ISO 8061 string instead of using the local time and zone values.
+	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "enableUTCDates"): boolean;
 
 	/**
 	 * Nables/Disables serializing client date as UTC ISO 8061 string instead of using the local time and zone values.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "enableUTCDates", optionValue: boolean): void;
@@ -48995,6 +56797,7 @@ interface JQuery {
 	/**
 	 * Merge unbound columns values inside data source when data source is remote. If true then the unbound columns are merged to the data source at runtime on the server. Note that data source is expanded with the new data and this could cause performance issues when the data is huge. If mergeUnboundColumns is false then the unbound data is sent and merged on the client. This option is used by the [igGrid MVC Helper](http://www.igniteui.com/help/iggrid-developing-asp-net-mvc-applications-with-iggrid).
 	 * Checkout [Populating Unbound Columns Remotely (igGrid)](http://www.igniteui.com/help/iggrid-unboundcolumns-populating-with-data-remotely) topic for more information.
+	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "mergeUnboundColumns"): boolean;
 
@@ -49002,36 +56805,42 @@ interface JQuery {
 	 * Merge unbound columns values inside data source when data source is remote. If true then the unbound columns are merged to the data source at runtime on the server. Note that data source is expanded with the new data and this could cause performance issues when the data is huge. If mergeUnboundColumns is false then the unbound data is sent and merged on the client. This option is used by the [igGrid MVC Helper](http://www.igniteui.com/help/iggrid-developing-asp-net-mvc-applications-with-iggrid).
 	 * Checkout [Populating Unbound Columns Remotely (igGrid)](http://www.igniteui.com/help/iggrid-unboundcolumns-populating-with-data-remotely) topic for more information.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "mergeUnboundColumns", optionValue: boolean): void;
 
 	/**
 	 * When dataSource is a remote URL, defines whether to set the type of the remote data source to JSONP.
+	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "jsonpRequest"): boolean;
 
 	/**
 	 * When dataSource is a remote URL, defines whether to set the type of the remote data source to JSONP.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "jsonpRequest", optionValue: boolean): void;
 
 	/**
 	 * Enables/disables grid adjusting its dimensions when its [width](ui.ighierarchicalgrid#options:width) and/or [height](ui.ighierarchicalgrid#options:height) is set in percent (%) and grid parent DOM container is resized.
+	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "enableResizeContainerCheck"): boolean;
 
 	/**
 	 * Enables/disables grid adjusting its dimensions when its [width](ui.ighierarchicalgrid#options:width) and/or [height](ui.ighierarchicalgrid#options:height) is set in percent (%) and grid parent DOM container is resized.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "enableResizeContainerCheck", optionValue: boolean): void;
 
 	/**
 	 * Configures how the feature chooser icon should display on header cells - e.g. to display as gear icon or not.
+	 *
 	 */
 
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "featureChooserIconDisplay"): string;
@@ -49039,6 +56848,7 @@ interface JQuery {
 	/**
 	 * Configures how the feature chooser icon should display on header cells - e.g. to display as gear icon or not.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -49046,16 +56856,48 @@ interface JQuery {
 
 	/**
 	 * Settings related to content scrolling.
+	 *
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "scrollSettings"): IgHierarchicalGridScrollSettings;
 
 	/**
 	 * Settings related to content scrolling.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHierarchicalGrid(optionLiteral: 'option', optionName: "scrollSettings", optionValue: IgHierarchicalGridScrollSettings): void;
 
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	igHierarchicalGrid(optionLiteral: 'option', optionName: "language"): string;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igHierarchicalGrid(optionLiteral: 'option', optionName: "language", optionValue: string): void;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+
+	igHierarchicalGrid(optionLiteral: 'option', optionName: "regional"): string|Object;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igHierarchicalGrid(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
+
 	/**
 	 * Event which is fired when a hierarchical row is about to be expanded
 	 */
@@ -49580,6 +57422,10 @@ interface IgGridMultiColumnHeaders {
 	[optionName: string]: any;
 }
 interface IgGridMultiColumnHeadersMethods {
+	/**
+	 * Changes the all locales into the widget element to the language specified in [options.language](ui.iggridmulticolumnheader#options:language)
+	 * Note that this method is for rare scenarios, see [language](ui.iggridmulticolumnheader#options:language) or [locale](ui.iggridmulticolumnheader#options:locale) option setter
+	 */
 	changeLocale(): void;
 
 	/**
@@ -49699,87 +57545,104 @@ interface JQuery {
 interface IgGridPagingLocale {
 	/**
 	 * Text rendered in front of the page size dropdown, when [showPageSizeDropDown](ui.iggridpaging#options:showPageSizeDropDown) is set to true.
+	 *
 	 */
 	pageSizeDropDownLabel?: string;
 
 	/**
 	 * Trailing text for the page size dropdown, when [showPageSizeDropDown](ui.iggridpaging#options:showPageSizeDropDown) is set to true.
+	 *
 	 */
 	pageSizeDropDownTrailingLabel?: string;
 
 	/**
 	 * Text for the next page label.
+	 *
 	 */
 	nextPageLabelText?: string;
 
 	/**
 	 * Text for the previous page label.
+	 *
 	 */
 	prevPageLabelText?: string;
 
 	/**
 	 * Text for the first page label.
+	 *
 	 */
 	firstPageLabelText?: string;
 
 	/**
 	 * Text for the last page label.
+	 *
 	 */
 	lastPageLabelText?: string;
 
 	/**
 	 * Leading label text for the drop down from where the page index can be switched.
+	 *
 	 */
 	currentPageDropDownLeadingLabel?: string;
 
 	/**
 	 * Trailing label text for the drop down from where the page index can be switched.
+	 *
 	 */
 	currentPageDropDownTrailingLabel?: string;
 
 	/**
 	 * Tooltip text for the page index drop down.
+	 *
 	 */
 	currentPageDropDownTooltip?: string;
 
 	/**
 	 * Tooltip text for the page size drop down.
+	 *
 	 */
 	pageSizeDropDownTooltip?: string;
 
 	/**
 	 * Tooltip text for the pager records label.
+	 *
 	 */
 	pagerRecordsLabelTooltip?: string;
 
 	/**
 	 * Tooltip text for the previous page button.
+	 *
 	 */
 	prevPageTooltip?: string;
 
 	/**
 	 * Tooltip text for the next page button.
+	 *
 	 */
 	nextPageTooltip?: string;
 
 	/**
 	 * Tooltip text for the first page button.
+	 *
 	 */
 	firstPageTooltip?: string;
 
 	/**
 	 * Tooltip text for the last page button.
+	 *
 	 */
 	lastPageTooltip?: string;
 
 	/**
 	 * Tooltip text templates of buttons that navigate to a particular page. The format string follows the [igTemplating](http://www.igniteui.com/help/igtemplating-overview) style and syntax.
 	 * See also the [pageCountLimit](ui.iggridpaging#options:pageCountLimit) option.
+	 *
 	 */
 	pageTooltipFormat?: string;
 
 	/**
 	 * Custom pager records label template - in [igTemplating](http://www.igniteui.com/help/igtemplating-overview) style and syntax.
+	 *
 	 */
 	pagerRecordsLabelTemplate?: string;
 
@@ -49840,6 +57703,11 @@ interface PageSizeChangingEventUIParam {
 	 * Gets the current page size.
 	 */
 	currentPageSize?: number;
+
+	/**
+	 * Gets the new page size.
+	 */
+	newPageSize?: number;
 }
 
 interface PageSizeChangedEvent {
@@ -49855,7 +57723,7 @@ interface PageSizeChangedEventUIParam {
 	/**
 	 * Gets the current page size.
 	 */
-	currentPageSize?: number;
+	pageSize?: number;
 }
 
 interface PagerRenderingEvent {
@@ -49893,32 +57761,38 @@ interface PagerRenderedEventUIParam {
 interface IgGridPaging {
 	/**
 	 * Number of records loaded and displayed per page.
+	 *
 	 */
 	pageSize?: number;
 
 	/**
 	 * The property in the response data, when using remote data source, that will hold the total number of records in the data source.
+	 *
 	 */
 	recordCountKey?: string;
 
 	/**
 	 * Denotes the name of the encoded URL parameter that will state what is the currently requested page size.
+	 *
 	 */
 	pageSizeUrlKey?: string;
 
 	/**
 	 * Denotes the name of the encoded URL parameter that will state what is the currently requested page index.
+	 *
 	 */
 	pageIndexUrlKey?: string;
 
 	/**
 	 * Current page index that's bound in the data source and rendered in the UI.
+	 *
 	 */
 	currentPageIndex?: number;
 
 	/**
 	 * Type of paging. Delegates all paging functionality to the [$.ig.DataSource](ig.datasource).
 	 *
+	 *
 	 * Valid values:
 	 * "remote" Paging is performed by a remote end-point.
 	 * "local" Paging is performed locally by the [$.ig.DataSource](ig.datasource).
@@ -49927,6 +57801,7 @@ interface IgGridPaging {
 
 	/**
 	 * If false, a dropdown allowing to change the page size will not be rendered in the UI.
+	 *
 	 */
 	showPageSizeDropDown?: boolean;
 
@@ -50040,6 +57915,7 @@ interface IgGridPaging {
 	/**
 	 * Page size dropdown location, when [showPageSizeDropDown](ui.iggridpaging#options:showPageSizeDropDown) is set to true. Can be rendered above the grid header or inside the pager, next to the page links.
 	 *
+	 *
 	 * Valid values:
 	 * "above" The page size drop down will be rendered above the grid header.
 	 * "inpager" The page size drop down will be rendered next to page links.
@@ -50048,54 +57924,76 @@ interface IgGridPaging {
 
 	/**
 	 * Option specifying whether to show summary label for the currently rendered records or not.
+	 *
 	 */
 	showPagerRecordsLabel?: boolean;
 
 	/**
 	 * Option specifying whether to render the first and last page navigation buttons.
+	 *
 	 */
 	showFirstLastPages?: boolean;
 
 	/**
 	 * Option specifying whether to render the previous and next page navigation buttons.
+	 *
 	 */
 	showPrevNextPages?: boolean;
 
 	/**
 	 * Predefined page sizes that are available to the end user to switch their grid paging to, through a drop down in the grid header.
+	 *
 	 */
 	pageSizeList?: any;
 
 	/**
 	 * Sets/Gets the number of pages which if exceeded a drop down list of page indices is displayed. If the number of pages is less than or equal to this option then buttons for each page are displayed.
+	 *
 	 */
 	pageCountLimit?: number;
 
 	/**
 	 * Number of page buttons, adjacent to and including the [active page](ui.iggridpaging#options:currentPageIndex), that are constantly visible. For the invisible pages, previous and next buttons are used.
+	 *
 	 */
 	visiblePageCount?: number;
 
 	/**
 	 * Drop down width for the page size and page index drop downs.
+	 *
 	 */
 	defaultDropDownWidth?: number;
 
 	/**
 	 * Time in milliseconds for which page drop down will wait for keystrokes before changing the page.
+	 *
 	 */
 	delayOnPageChanged?: number;
 
 	/**
 	 * Enables/disables paging persistence between states.
+	 *
 	 */
 	persist?: boolean;
 
 	/**
 	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
+	 *
 	 */
 	inherit?: boolean;
 
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	language?: string;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+	regional?: string|Object;
+
 	/**
 	 * Event fired before the page index is changed.
 	 * Return false in order to cancel page index changing.
@@ -50110,7 +58008,6 @@ interface IgGridPaging {
 	/**
 	 * Event fired when the page size is about to be changed from the page size dropdown.
 	 * Return false in order to cancel page size changing.
-	 * Use ui.newPageSize to get new page size.
 	 */
 	pageSizeChanging?: PageSizeChangingEvent;
 
@@ -50136,6 +58033,13 @@ interface IgGridPaging {
 	[optionName: string]: any;
 }
 interface IgGridPagingMethods {
+	changeGlobalLanguage(): void;
+	changeGlobalRegional(): void;
+
+	/**
+	 * Changes the all locales into the widget element to the language specified in [options.language](ui.iggridpaging#options:language)
+	 * Note that this method is for rare scenarios, see [language](ui.iggridpaging#options:language) or [locale](ui.iggridpaging#options:locale) option setter
+	 */
 	changeLocale(): void;
 
 	/**
@@ -50162,6 +58066,8 @@ interface JQuery {
 }
 
 interface JQuery {
+	igGridPaging(methodName: "changeGlobalLanguage"): void;
+	igGridPaging(methodName: "changeGlobalRegional"): void;
 	igGridPaging(methodName: "changeLocale"): void;
 	igGridPaging(methodName: "pageIndex", index?: number): number;
 	igGridPaging(methodName: "pageSize", size?: number): number;
@@ -50169,66 +58075,77 @@ interface JQuery {
 
 	/**
 	 * Number of records loaded and displayed per page.
+	 *
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "pageSize"): number;
 
 	/**
 	 * Number of records loaded and displayed per page.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "pageSize", optionValue: number): void;
 
 	/**
 	 * The property in the response data, when using remote data source, that will hold the total number of records in the data source.
+	 *
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "recordCountKey"): string;
 
 	/**
 	 * The property in the response data, when using remote data source, that will hold the total number of records in the data source.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "recordCountKey", optionValue: string): void;
 
 	/**
 	 * Denotes the name of the encoded URL parameter that will state what is the currently requested page size.
+	 *
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "pageSizeUrlKey"): string;
 
 	/**
 	 * Denotes the name of the encoded URL parameter that will state what is the currently requested page size.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "pageSizeUrlKey", optionValue: string): void;
 
 	/**
 	 * Denotes the name of the encoded URL parameter that will state what is the currently requested page index.
+	 *
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "pageIndexUrlKey"): string;
 
 	/**
 	 * Denotes the name of the encoded URL parameter that will state what is the currently requested page index.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "pageIndexUrlKey", optionValue: string): void;
 
 	/**
 	 * Current page index that's bound in the data source and rendered in the UI.
+	 *
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "currentPageIndex"): number;
 
 	/**
 	 * Current page index that's bound in the data source and rendered in the UI.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "currentPageIndex", optionValue: number): void;
 
 	/**
 	 * Type of paging. Delegates all paging functionality to the [$.ig.DataSource](ig.datasource).
+	 *
 	 */
 
 	igGridPaging(optionLiteral: 'option', optionName: "type"): string;
@@ -50236,6 +58153,7 @@ interface JQuery {
 	/**
 	 * Type of paging. Delegates all paging functionality to the [$.ig.DataSource](ig.datasource).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -50243,12 +58161,14 @@ interface JQuery {
 
 	/**
 	 * If false, a dropdown allowing to change the page size will not be rendered in the UI.
+	 *
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "showPageSizeDropDown"): boolean;
 
 	/**
 	 * If false, a dropdown allowing to change the page size will not be rendered in the UI.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "showPageSizeDropDown", optionValue: boolean): void;
@@ -50503,6 +58423,7 @@ interface JQuery {
 
 	/**
 	 * Page size dropdown location, when [showPageSizeDropDown](ui.iggridpaging#options:showPageSizeDropDown) is set to true. Can be rendered above the grid header or inside the pager, next to the page links.
+	 *
 	 */
 
 	igGridPaging(optionLiteral: 'option', optionName: "pageSizeDropDownLocation"): string;
@@ -50510,6 +58431,7 @@ interface JQuery {
 	/**
 	 * Page size dropdown location, when [showPageSizeDropDown](ui.iggridpaging#options:showPageSizeDropDown) is set to true. Can be rendered above the grid header or inside the pager, next to the page links.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -50517,124 +58439,174 @@ interface JQuery {
 
 	/**
 	 * Option specifying whether to show summary label for the currently rendered records or not.
+	 *
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "showPagerRecordsLabel"): boolean;
 
 	/**
 	 * Option specifying whether to show summary label for the currently rendered records or not.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "showPagerRecordsLabel", optionValue: boolean): void;
 
 	/**
 	 * Option specifying whether to render the first and last page navigation buttons.
+	 *
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "showFirstLastPages"): boolean;
 
 	/**
 	 * Option specifying whether to render the first and last page navigation buttons.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "showFirstLastPages", optionValue: boolean): void;
 
 	/**
 	 * Option specifying whether to render the previous and next page navigation buttons.
+	 *
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "showPrevNextPages"): boolean;
 
 	/**
 	 * Option specifying whether to render the previous and next page navigation buttons.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "showPrevNextPages", optionValue: boolean): void;
 
 	/**
 	 * Predefined page sizes that are available to the end user to switch their grid paging to, through a drop down in the grid header.
+	 *
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "pageSizeList"): any;
 
 	/**
 	 * Predefined page sizes that are available to the end user to switch their grid paging to, through a drop down in the grid header.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "pageSizeList", optionValue: any): void;
 
 	/**
 	 * Sets/Gets the number of pages which if exceeded a drop down list of page indices is displayed. If the number of pages is less than or equal to this option then buttons for each page are displayed.
+	 *
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "pageCountLimit"): number;
 
 	/**
 	 * Sets/ the number of pages which if exceeded a drop down list of page indices is displayed. If the number of pages is less than or equal to this option then buttons for each page are displayed.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "pageCountLimit", optionValue: number): void;
 
 	/**
 	 * Number of page buttons, adjacent to and including the [active page](ui.iggridpaging#options:currentPageIndex), that are constantly visible. For the invisible pages, previous and next buttons are used.
+	 *
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "visiblePageCount"): number;
 
 	/**
 	 * Number of page buttons, adjacent to and including the [active page](ui.iggridpaging#options:currentPageIndex), that are constantly visible. For the invisible pages, previous and next buttons are used.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "visiblePageCount", optionValue: number): void;
 
 	/**
 	 * Drop down width for the page size and page index drop downs.
+	 *
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "defaultDropDownWidth"): number;
 
 	/**
 	 * Drop down width for the page size and page index drop downs.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "defaultDropDownWidth", optionValue: number): void;
 
 	/**
 	 * Time in milliseconds for which page drop down will wait for keystrokes before changing the page.
+	 *
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "delayOnPageChanged"): number;
 
 	/**
 	 * Time in milliseconds for which page drop down will wait for keystrokes before changing the page.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "delayOnPageChanged", optionValue: number): void;
 
 	/**
 	 * Enables/disables paging persistence between states.
+	 *
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "persist"): boolean;
 
 	/**
 	 * Enables/disables paging persistence between states.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "persist", optionValue: boolean): void;
 
 	/**
 	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
+	 *
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "inherit"): boolean;
 
 	/**
 	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "inherit", optionValue: boolean): void;
 
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	igGridPaging(optionLiteral: 'option', optionName: "language"): string;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igGridPaging(optionLiteral: 'option', optionName: "language", optionValue: string): void;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+
+	igGridPaging(optionLiteral: 'option', optionName: "regional"): string|Object;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igGridPaging(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
+
 	/**
 	 * Event fired before the page index is changed.
 	 * Return false in order to cancel page index changing.
@@ -50664,14 +58636,12 @@ interface JQuery {
 	/**
 	 * Event fired when the page size is about to be changed from the page size dropdown.
 	 * Return false in order to cancel page size changing.
-	 * Use ui.newPageSize to get new page size.
 	 */
 	igGridPaging(optionLiteral: 'option', optionName: "pageSizeChanging"): PageSizeChangingEvent;
 
 	/**
 	 * Event fired when the page size is about to be changed from the page size dropdown.
 	 * Return false in order to cancel page size changing.
-	 * Use ui.newPageSize to get new page size.
 	 *
 	 * @optionValue Define event handler function.
 	 */
@@ -50723,26 +58693,31 @@ interface JQuery {
 interface IgGridResizingColumnSetting {
 	/**
 	 * Column key. this is a required property in every column setting if columnIndex is not set.
+	 *
 	 */
 	columnKey?: string;
 
 	/**
 	 * Column index. Can be used in place of column key. the preferred way of populating a column setting is to always use the column keys as identifiers.
+	 *
 	 */
 	columnIndex?: number;
 
 	/**
 	 * Enables disables resizing for the column.
+	 *
 	 */
 	allowResizing?: boolean;
 
 	/**
 	 * Minimum column width in pixels or percents.
+	 *
 	 */
 	minimumWidth?: string|number;
 
 	/**
 	 * Maximum column width in pixels or percents.
+	 *
 	 */
 	maximumWidth?: string|number;
 
@@ -50838,21 +58813,25 @@ interface ColumnResizedEventUIParam {
 interface IgGridResizing {
 	/**
 	 * Resize the column to the size of the longest currently visible cell value.
+	 *
 	 */
 	allowDoubleClickToResize?: boolean;
 
 	/**
 	 * Specifies whether the resizing should be deferred until the user finishes resizing or applied immediately.
+	 *
 	 */
 	deferredResizing?: boolean;
 
 	/**
 	 * A list of column settings that specifies resizing options on a per column basis.
+	 *
 	 */
 	columnSettings?: IgGridResizingColumnSetting[];
 
 	/**
 	 * The width in pixels of the resizing handle which is position at the right side of each resizeable column header.
+	 *
 	 */
 	handleThreshold?: number;
 
@@ -50861,6 +58840,24 @@ interface IgGridResizing {
 	 */
 	inherit?: boolean;
 
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	locale?: any;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	language?: string;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+	regional?: string|Object;
+
 	/**
 	 * Event fired before a resizing operation is executed.
 	 */
@@ -50882,6 +58879,9 @@ interface IgGridResizing {
 	[optionName: string]: any;
 }
 interface IgGridResizingMethods {
+	changeGlobalLanguage(): void;
+	changeGlobalRegional(): void;
+
 	/**
 	 * Destroys the resizing widget
 	 */
@@ -50894,59 +58894,78 @@ interface IgGridResizingMethods {
 	 * @param width Width of the column in pixels or percents. If no width or "*" is specified the column will be auto-sized to the width of the data in it (including header and footer cells).
 	 */
 	resize(column: Object, width?: Object): void;
+
+	/**
+	 * Changes the all locales contained into a specified container to the language specified in [options.language](ui.igwidget#options:language)
+	 * Note that this method is for rare scenarios, use [language](ui.igwidget#options:language) or [locale](ui.igwidget#options:locale) option setter
+	 *
+	 * @param $container Optional parameter - if not set it would use the element of the widget as $container
+	 */
+	changeLocale($container: Object): void;
 }
 interface JQuery {
 	data(propertyName: "igGridResizing"): IgGridResizingMethods;
 }
 
 interface JQuery {
+	igGridResizing(methodName: "changeGlobalLanguage"): void;
+	igGridResizing(methodName: "changeGlobalRegional"): void;
 	igGridResizing(methodName: "destroy"): void;
 	igGridResizing(methodName: "resize", column: Object, width?: Object): void;
+	igGridResizing(methodName: "changeLocale", $container: Object): void;
 
 	/**
 	 * Resize the column to the size of the longest currently visible cell value.
+	 *
 	 */
 	igGridResizing(optionLiteral: 'option', optionName: "allowDoubleClickToResize"): boolean;
 
 	/**
 	 * Resize the column to the size of the longest currently visible cell value.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridResizing(optionLiteral: 'option', optionName: "allowDoubleClickToResize", optionValue: boolean): void;
 
 	/**
 	 * Gets whether the resizing should be deferred until the user finishes resizing or applied immediately.
+	 *
 	 */
 	igGridResizing(optionLiteral: 'option', optionName: "deferredResizing"): boolean;
 
 	/**
 	 * Sets whether the resizing should be deferred until the user finishes resizing or applied immediately.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridResizing(optionLiteral: 'option', optionName: "deferredResizing", optionValue: boolean): void;
 
 	/**
 	 * A list of column settings that specifies resizing options on a per column basis.
+	 *
 	 */
 	igGridResizing(optionLiteral: 'option', optionName: "columnSettings"): IgGridResizingColumnSetting[];
 
 	/**
 	 * A list of column settings that specifies resizing options on a per column basis.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridResizing(optionLiteral: 'option', optionName: "columnSettings", optionValue: IgGridResizingColumnSetting[]): void;
 
 	/**
 	 * The width in pixels of the resizing handle which is position at the right side of each resizeable column header.
+	 *
 	 */
 	igGridResizing(optionLiteral: 'option', optionName: "handleThreshold"): number;
 
 	/**
 	 * The width in pixels of the resizing handle which is position at the right side of each resizeable column header.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridResizing(optionLiteral: 'option', optionName: "handleThreshold", optionValue: number): void;
@@ -50963,6 +58982,50 @@ interface JQuery {
 	 */
 	igGridResizing(optionLiteral: 'option', optionName: "inherit", optionValue: boolean): void;
 
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	igGridResizing(optionLiteral: 'option', optionName: "locale"): any;
+
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igGridResizing(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	igGridResizing(optionLiteral: 'option', optionName: "language"): string;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igGridResizing(optionLiteral: 'option', optionName: "language", optionValue: string): void;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+
+	igGridResizing(optionLiteral: 'option', optionName: "regional"): string|Object;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igGridResizing(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
+
 	/**
 	 * Event fired before a resizing operation is executed.
 	 */
@@ -51007,21 +59070,25 @@ interface JQuery {
 interface IgGridResponsiveColumnSetting {
 	/**
 	 * Column key. This is a required property in every column setting if columnIndex is not set.
+	 *
 	 */
 	columnKey?: string;
 
 	/**
 	 * Column index. Can be used in place of column key. The preferred way of populating a column setting is to always use the column keys as identifiers.
+	 *
 	 */
 	columnIndex?: number;
 
 	/**
 	 * A list of predefined classes to decide element's visibility on.
+	 *
 	 */
 	classes?: string;
 
 	/**
 	 * A configuration object to use for the responsive functionality. Uses the keys defined in the widget's responsiveModes object. The classes property is not used if this one is set.
+	 *
 	 */
 	configuration?: any;
 
@@ -51034,26 +59101,31 @@ interface IgGridResponsiveColumnSetting {
 interface IgGridResponsiveAllowedColumnWidthPerType {
 	/**
 	 * Minimal width in pixels string columns can take before forcing vertical rendering
+	 *
 	 */
 	string?: number;
 
 	/**
 	 * Minimal width in pixels number columns can take before forcing vertical rendering
+	 *
 	 */
 	number?: number;
 
 	/**
 	 * Minimal width in pixels bool columns can take before forcing vertical rendering
+	 *
 	 */
 	bool?: number;
 
 	/**
 	 * Minimal width in pixels date columns can take before forcing vertical rendering
+	 *
 	 */
 	date?: number;
 
 	/**
 	 * Minimal width in pixels object columns can take before forcing vertical rendering
+	 *
 	 */
 	object?: number;
 
@@ -51171,37 +59243,44 @@ interface ResponsiveModeChangedEventUIParam {
 interface IgGridResponsive {
 	/**
 	 * A list of column settings that specifies how columns will react based on the environment the grid is run on.
+	 *
 	 */
 	columnSettings?: IgGridResponsiveColumnSetting[];
 
 	/**
 	 * If this option is set to true an igResponsiveContainer widget will be attached to the igGrid control which will notify the feature when changes in the width of the container occur.
+	 *
 	 */
 	reactOnContainerWidthChanges?: boolean;
 
 	/**
 	 * If this option is set to true the widget will ensure the grid's width is always set to 100%.
+	 *
 	 */
 	forceResponsiveGridWidth?: boolean;
 
 	/**
 	 * The amount of pixels the window needs to resize with for the grid to respond.
+	 *
 	 */
 	responsiveSensitivity?: number;
 
 	/**
 	 * The recognized types of environments and their configuration.
+	 *
 	 */
 	responsiveModes?: any;
 
 	/**
 	 * Enable or disable the responsive vertical rendering for the grid.
+	 *
 	 */
 	enableVerticalRendering?: boolean;
 
 	/**
 	 * The window's width under which the grid will render its contents vertically.
 	 *
+	 *
 	 * Valid values:
 	 * "string" The width in a (px) string
 	 * "number" The width as a number
@@ -51212,6 +59291,7 @@ interface IgGridResponsive {
 	/**
 	 * The width of the properties column when vertical rendering is enabled
 	 *
+	 *
 	 * Valid values:
 	 * "string" The width in a (%) string
 	 * "number" The width as a number in percents
@@ -51221,6 +59301,7 @@ interface IgGridResponsive {
 	/**
 	 * The width of the values column when vertical rendering is enabled
 	 *
+	 *
 	 * Valid values:
 	 * "string" The width in a (%) string
 	 * "number" The width as a number in percents
@@ -51230,11 +59311,13 @@ interface IgGridResponsive {
 	/**
 	 * When windowWidthToRenderVertically is null, determine minimal widths columns can take before
 	 * forcing vertical rendering for the grid
+	 *
 	 */
 	allowedColumnWidthPerType?: IgGridResponsiveAllowedColumnWidthPerType;
 
 	/**
 	 * Specifies a template to render a record with in a list-view style layout per mode.
+	 *
 	 */
 	singleColumnTemplate?: any;
 
@@ -51356,78 +59439,91 @@ interface JQuery {
 
 	/**
 	 * A list of column settings that specifies how columns will react based on the environment the grid is run on.
+	 *
 	 */
 	igGridResponsive(optionLiteral: 'option', optionName: "columnSettings"): IgGridResponsiveColumnSetting[];
 
 	/**
 	 * A list of column settings that specifies how columns will react based on the environment the grid is run on.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridResponsive(optionLiteral: 'option', optionName: "columnSettings", optionValue: IgGridResponsiveColumnSetting[]): void;
 
 	/**
 	 * If this option is set to true an igResponsiveContainer widget will be attached to the igGrid control which will notify the feature when changes in the width of the container occur.
+	 *
 	 */
 	igGridResponsive(optionLiteral: 'option', optionName: "reactOnContainerWidthChanges"): boolean;
 
 	/**
 	 * If this option is set to true an igResponsiveContainer widget will be attached to the igGrid control which will notify the feature when changes in the width of the container occur.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridResponsive(optionLiteral: 'option', optionName: "reactOnContainerWidthChanges", optionValue: boolean): void;
 
 	/**
 	 * If this option is set to true the widget will ensure the grid's width is always set to 100%.
+	 *
 	 */
 	igGridResponsive(optionLiteral: 'option', optionName: "forceResponsiveGridWidth"): boolean;
 
 	/**
 	 * If this option is set to true the widget will ensure the grid's width is always set to 100%.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridResponsive(optionLiteral: 'option', optionName: "forceResponsiveGridWidth", optionValue: boolean): void;
 
 	/**
 	 * The amount of pixels the window needs to resize with for the grid to respond.
+	 *
 	 */
 	igGridResponsive(optionLiteral: 'option', optionName: "responsiveSensitivity"): number;
 
 	/**
 	 * The amount of pixels the window needs to resize with for the grid to respond.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridResponsive(optionLiteral: 'option', optionName: "responsiveSensitivity", optionValue: number): void;
 
 	/**
 	 * The recognized types of environments and their configuration.
+	 *
 	 */
 	igGridResponsive(optionLiteral: 'option', optionName: "responsiveModes"): any;
 
 	/**
 	 * The recognized types of environments and their configuration.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridResponsive(optionLiteral: 'option', optionName: "responsiveModes", optionValue: any): void;
 
 	/**
 	 * Enable or disable the responsive vertical rendering for the grid.
+	 *
 	 */
 	igGridResponsive(optionLiteral: 'option', optionName: "enableVerticalRendering"): boolean;
 
 	/**
 	 * Enable or disable the responsive vertical rendering for the grid.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridResponsive(optionLiteral: 'option', optionName: "enableVerticalRendering", optionValue: boolean): void;
 
 	/**
 	 * The window's width under which the grid will render its contents vertically.
+	 *
 	 */
 
 	igGridResponsive(optionLiteral: 'option', optionName: "windowWidthToRenderVertically"): string|number;
@@ -51435,6 +59531,7 @@ interface JQuery {
 	/**
 	 * The window's width under which the grid will render its contents vertically.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -51442,6 +59539,7 @@ interface JQuery {
 
 	/**
 	 * The width of the properties column when vertical rendering is enabled
+	 *
 	 */
 
 	igGridResponsive(optionLiteral: 'option', optionName: "propertiesColumnWidth"): string|number;
@@ -51449,6 +59547,7 @@ interface JQuery {
 	/**
 	 * The width of the properties column when vertical rendering is enabled
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -51456,6 +59555,7 @@ interface JQuery {
 
 	/**
 	 * The width of the values column when vertical rendering is enabled
+	 *
 	 */
 
 	igGridResponsive(optionLiteral: 'option', optionName: "valuesColumnWidth"): string|number;
@@ -51463,6 +59563,7 @@ interface JQuery {
 	/**
 	 * The width of the values column when vertical rendering is enabled
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -51471,6 +59572,7 @@ interface JQuery {
 	/**
 	 * When windowWidthToRenderVertically is null, determine minimal widths columns can take before
 	 * forcing vertical rendering for the grid
+	 *
 	 */
 	igGridResponsive(optionLiteral: 'option', optionName: "allowedColumnWidthPerType"): IgGridResponsiveAllowedColumnWidthPerType;
 
@@ -51478,18 +59580,21 @@ interface JQuery {
 	 * When windowWidthToRenderVertically is null, determine minimal widths columns can take before
 	 * forcing vertical rendering for the grid
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridResponsive(optionLiteral: 'option', optionName: "allowedColumnWidthPerType", optionValue: IgGridResponsiveAllowedColumnWidthPerType): void;
 
 	/**
 	 * Gets a template to render a record with in a list-view style layout per mode.
+	 *
 	 */
 	igGridResponsive(optionLiteral: 'option', optionName: "singleColumnTemplate"): any;
 
 	/**
 	 * Sets a template to render a record with in a list-view style layout per mode.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridResponsive(optionLiteral: 'option', optionName: "singleColumnTemplate", optionValue: any): void;
@@ -51574,21 +59679,25 @@ interface JQuery {
 interface IgGridRowSelectorsLocale {
 	/**
 	 * Selected records text for the select/deselect all overlay.
+	 *
 	 */
 	selectedRecordsText?: string;
 
 	/**
 	 * Deselected records text for the select/deselect all overlay.
+	 *
 	 */
 	deselectedRecordsText?: string;
 
 	/**
 	 * Select all text for the select/deselect all overlay.
+	 *
 	 */
 	selectAllText?: string;
 
 	/**
 	 * Deselect all text for the select/deselect all overlay.
+	 *
 	 */
 	deselectAllText?: string;
 
@@ -51739,22 +59848,26 @@ interface CheckBoxStateChangedEventUIParam {
 interface IgGridRowSelectors {
 	/**
 	 * Determines whether the row selectors column should contain row numbering
+	 *
 	 */
 	enableRowNumbering?: boolean;
 
 	/**
 	 * Determines whether the row selectors column should contain checkboxes
+	 *
 	 */
 	enableCheckBoxes?: boolean;
 
 	/**
 	 * The seed to be added to the default numbering
+	 *
 	 */
 	rowNumberingSeed?: number;
 
 	/**
 	 * defines width of the row selector`s column in pixels or percentage.
 	 *
+	 *
 	 * Valid values:
 	 * "string" The row selector column width can be set in pixels (px) and percentage (%)
 	 * "number" The row selector width can be set as a number
@@ -51766,11 +59879,13 @@ interface IgGridRowSelectors {
 	 * Determines whether the selection feature is required for the row selectors. If set to "false"
 	 * the widget will not check for Selection availability. If set to "true" an exception will be thrown if Selection is
 	 * not available.
+	 *
 	 */
 	requireSelection?: boolean;
 
 	/**
 	 * Determines whether checkboxes will be shown only if row selectors are on focus/selected.
+	 *
 	 */
 	showCheckBoxesOnFocus?: boolean;
 
@@ -51781,6 +59896,7 @@ interface IgGridRowSelectors {
 
 	/**
 	 * Enables/disables showing an overlay after clicking on the header checkbox, which allows selecting all records from all pages.
+	 *
 	 */
 	enableSelectAllForPaging?: boolean;
 
@@ -51790,6 +59906,7 @@ interface IgGridRowSelectors {
 	 * Element with attribute data-rs-close-all is used for closing the overlay
 	 * The default template is "<div class='ui-widget-header ui-priority-secondary' tabindex='0'><div>You have selected ${checked} records. <a href='#' tabindex='0' data-rs-select-all>Select all ${totalRecordsCount} records</a><div style='float:right;'><span data-rs-close-all class='ui-icon-close ui-icon ui-button' tabindex='0'></div></span></div></div>"
 	 * There is also ${allCheckedRecords} parameter which is not used in the default template, but it represents the checked records from all pages.
+	 *
 	 */
 	selectAllForPagingTemplate?: string;
 
@@ -51799,6 +59916,7 @@ interface IgGridRowSelectors {
 	 * Element with attribute data-rs-close-all is used for closing the overlay
 	 * The default template is "<div class='ui-widget-header ui-priority-secondary' tabindex='0'><div>You have deselected ${unchecked} records. <a href='#' tabindex='0' data-rs-deselect-all>Deselect all ${totalRecordsCount} records</a><div style='float:right;'><span data-rs-close-all class='ui-icon-close ui-icon ui-button' tabindex='0'></div></span></div></div>"
 	 * There is also ${allCheckedRecords} parameter which is not used in the default template, but it represents the checked records from all pages.
+	 *
 	 */
 	deselectAllForPagingTemplate?: string;
 	locale?: IgGridRowSelectorsLocale;
@@ -51825,6 +59943,11 @@ interface IgGridRowSelectors {
 }
 interface IgGridRowSelectorsMethods {
 	destroy(): void;
+
+	/**
+	 * Changes the all locales into the widget element to the language specified in [options.language](ui.iggridrowselectors#options:language)
+	 * Note that this method is for rare scenarios, see [language](ui.iggridrowselectors#options:language) or [locale](ui.iggridrowselectors#options:locale) option setter
+	 */
 	changeLocale(): void;
 }
 interface JQuery {
@@ -51837,42 +59960,49 @@ interface JQuery {
 
 	/**
 	 * Determines whether the row selectors column should contain row numbering
+	 *
 	 */
 	igGridRowSelectors(optionLiteral: 'option', optionName: "enableRowNumbering"): boolean;
 
 	/**
 	 * Determines whether the row selectors column should contain row numbering
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridRowSelectors(optionLiteral: 'option', optionName: "enableRowNumbering", optionValue: boolean): void;
 
 	/**
 	 * Determines whether the row selectors column should contain checkboxes
+	 *
 	 */
 	igGridRowSelectors(optionLiteral: 'option', optionName: "enableCheckBoxes"): boolean;
 
 	/**
 	 * Determines whether the row selectors column should contain checkboxes
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridRowSelectors(optionLiteral: 'option', optionName: "enableCheckBoxes", optionValue: boolean): void;
 
 	/**
 	 * The seed to be added to the default numbering
+	 *
 	 */
 	igGridRowSelectors(optionLiteral: 'option', optionName: "rowNumberingSeed"): number;
 
 	/**
 	 * The seed to be added to the default numbering
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridRowSelectors(optionLiteral: 'option', optionName: "rowNumberingSeed", optionValue: number): void;
 
 	/**
 	 * Defines width of the row selector`s column in pixels or percentage.
+	 *
 	 */
 
 	igGridRowSelectors(optionLiteral: 'option', optionName: "rowSelectorColumnWidth"): string|number;
@@ -51880,6 +60010,7 @@ interface JQuery {
 	/**
 	 * Defines width of the row selector`s column in pixels or percentage.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -51889,6 +60020,7 @@ interface JQuery {
 	 * Determines whether the selection feature is required for the row selectors. If set to "false"
 	 * the widget will not check for Selection availability. If set to "true" an exception will be thrown if Selection is
 	 * not available.
+	 *
 	 */
 	igGridRowSelectors(optionLiteral: 'option', optionName: "requireSelection"): boolean;
 
@@ -51897,18 +60029,21 @@ interface JQuery {
 	 * the widget will not check for Selection availability. If set to "true" an exception will be thrown if Selection is
 	 * not available.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridRowSelectors(optionLiteral: 'option', optionName: "requireSelection", optionValue: boolean): void;
 
 	/**
 	 * Determines whether checkboxes will be shown only if row selectors are on focus/selected.
+	 *
 	 */
 	igGridRowSelectors(optionLiteral: 'option', optionName: "showCheckBoxesOnFocus"): boolean;
 
 	/**
 	 * Determines whether checkboxes will be shown only if row selectors are on focus/selected.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridRowSelectors(optionLiteral: 'option', optionName: "showCheckBoxesOnFocus", optionValue: boolean): void;
@@ -51927,12 +60062,14 @@ interface JQuery {
 
 	/**
 	 * Enables/disables showing an overlay after clicking on the header checkbox, which allows selecting all records from all pages.
+	 *
 	 */
 	igGridRowSelectors(optionLiteral: 'option', optionName: "enableSelectAllForPaging"): boolean;
 
 	/**
 	 * Enables/disables showing an overlay after clicking on the header checkbox, which allows selecting all records from all pages.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridRowSelectors(optionLiteral: 'option', optionName: "enableSelectAllForPaging", optionValue: boolean): void;
@@ -51943,6 +60080,7 @@ interface JQuery {
 	 * Element with attribute data-rs-close-all is used for closing the overlay
 	 * The default template is "<div class='ui-widget-header ui-priority-secondary' tabindex='0'><div>You have selected ${checked} records. <a href='#' tabindex='0' data-rs-select-all>Select all ${totalRecordsCount} records</a><div style='float:right;'><span data-rs-close-all class='ui-icon-close ui-icon ui-button' tabindex='0'></div></span></div></div>"
 	 * There is also ${allCheckedRecords} parameter which is not used in the default template, but it represents the checked records from all pages.
+	 *
 	 */
 	igGridRowSelectors(optionLiteral: 'option', optionName: "selectAllForPagingTemplate"): string;
 
@@ -51953,6 +60091,7 @@ interface JQuery {
 	 * The default template is "<div class='ui-widget-header ui-priority-secondary' tabindex='0'><div>You have selected ${checked} records. <a href='#' tabindex='0' data-rs-select-all>Select all ${totalRecordsCount} records</a><div style='float:right;'><span data-rs-close-all class='ui-icon-close ui-icon ui-button' tabindex='0'></div></span></div></div>"
 	 * There is also ${allCheckedRecords} parameter which is not used in the default template, but it represents the checked records from all pages.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridRowSelectors(optionLiteral: 'option', optionName: "selectAllForPagingTemplate", optionValue: string): void;
@@ -51963,6 +60102,7 @@ interface JQuery {
 	 * Element with attribute data-rs-close-all is used for closing the overlay
 	 * The default template is "<div class='ui-widget-header ui-priority-secondary' tabindex='0'><div>You have deselected ${unchecked} records. <a href='#' tabindex='0' data-rs-deselect-all>Deselect all ${totalRecordsCount} records</a><div style='float:right;'><span data-rs-close-all class='ui-icon-close ui-icon ui-button' tabindex='0'></div></span></div></div>"
 	 * There is also ${allCheckedRecords} parameter which is not used in the default template, but it represents the checked records from all pages.
+	 *
 	 */
 	igGridRowSelectors(optionLiteral: 'option', optionName: "deselectAllForPagingTemplate"): string;
 
@@ -51973,6 +60113,7 @@ interface JQuery {
 	 * The default template is "<div class='ui-widget-header ui-priority-secondary' tabindex='0'><div>You have deselected ${unchecked} records. <a href='#' tabindex='0' data-rs-deselect-all>Deselect all ${totalRecordsCount} records</a><div style='float:right;'><span data-rs-close-all class='ui-icon-close ui-icon ui-button' tabindex='0'></div></span></div></div>"
 	 * There is also ${allCheckedRecords} parameter which is not used in the default template, but it represents the checked records from all pages.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridRowSelectors(optionLiteral: 'option', optionName: "deselectAllForPagingTemplate", optionValue: string): void;
@@ -52201,17 +60342,20 @@ interface ActiveRowChangedEventUIParam {
 interface IgGridSelection {
 	/**
 	 * Enables / Disables multiple selection of cells and rows - depending on the mode
+	 *
 	 */
 	multipleSelection?: boolean;
 
 	/**
 	 * Enables / disables selection via dragging with the mouse - only applicable for cell selection
+	 *
 	 */
 	mouseDragSelect?: boolean;
 
 	/**
 	 * Defines type of the selection.
 	 *
+	 *
 	 * Valid values:
 	 * "row" Defines row selection mode.
 	 * "cell" Defines cell selection mode.
@@ -52220,36 +60364,43 @@ interface IgGridSelection {
 
 	/**
 	 * Enables / disables activation of rows and cells. Activation implies ability to perform navigating through cells and rows via the keyboard, and selecting rows and cells using CTRL / SHIFT - in the way cells/rows are selected in Ms Excel
+	 *
 	 */
 	activation?: boolean;
 
 	/**
 	 * If wrapAround is enabled and selection is on the first or last row or cell, then when the end user tries to go beyond that, the first/last row or cell will be selected
+	 *
 	 */
 	wrapAround?: boolean;
 
 	/**
 	 * If true will basically skip going into child grids with down / up / right / left arrow keys, when in the context of hierarchical grid
+	 *
 	 */
 	skipChildren?: boolean;
 
 	/**
 	 * If true multiple selection of cells is done as if CTRL is being held. the option is disregarded if mode is set to row. this option is useful for enabling multiple discountinued selection on touch environments.
+	 *
 	 */
 	multipleCellSelectOnClick?: boolean;
 
 	/**
-	 * Enables / disables selection via continuous touch event - only applicable for cell selection and touch-supported environments
+	 * Deprecated="true" Enables / disables selection via continuous touch event - only applicable for cell selection and touch-supported environments
+	 *
 	 */
 	touchDragSelect?: boolean;
 
 	/**
 	 * Enables / disables selection persistance between states.
+	 *
 	 */
 	persist?: boolean;
 
 	/**
 	 * Enables / disables the ability to ctrl drag multiple selection windows when selection mode is 'cell'
+	 *
 	 */
 	allowMultipleRangeSelection?: boolean;
 
@@ -52548,30 +60699,35 @@ interface JQuery {
 
 	/**
 	 * Enables / Disables multiple selection of cells and rows - depending on the mode
+	 *
 	 */
 	igGridSelection(optionLiteral: 'option', optionName: "multipleSelection"): boolean;
 
 	/**
 	 * Enables / Disables multiple selection of cells and rows - depending on the mode
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSelection(optionLiteral: 'option', optionName: "multipleSelection", optionValue: boolean): void;
 
 	/**
 	 * Enables / disables selection via dragging with the mouse - only applicable for cell selection
+	 *
 	 */
 	igGridSelection(optionLiteral: 'option', optionName: "mouseDragSelect"): boolean;
 
 	/**
 	 * Enables / disables selection via dragging with the mouse - only applicable for cell selection
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSelection(optionLiteral: 'option', optionName: "mouseDragSelect", optionValue: boolean): void;
 
 	/**
 	 * Defines type of the selection.
+	 *
 	 */
 
 	igGridSelection(optionLiteral: 'option', optionName: "mode"): string;
@@ -52579,6 +60735,7 @@ interface JQuery {
 	/**
 	 * Defines type of the selection.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -52586,59 +60743,69 @@ interface JQuery {
 
 	/**
 	 * Enables / disables activation of rows and cells. Activation implies ability to perform navigating through cells and rows via the keyboard, and selecting rows and cells using CTRL / SHIFT - in the way cells/rows are selected in Ms Excel
+	 *
 	 */
 	igGridSelection(optionLiteral: 'option', optionName: "activation"): boolean;
 
 	/**
 	 * Enables / disables activation of rows and cells. Activation implies ability to perform navigating through cells and rows via the keyboard, and selecting rows and cells using CTRL / SHIFT - in the way cells/rows are selected in Ms Excel
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSelection(optionLiteral: 'option', optionName: "activation", optionValue: boolean): void;
 
 	/**
 	 * If wrapAround is enabled and selection is on the first or last row or cell, then when the end user tries to go beyond that, the first/last row or cell will be selected
+	 *
 	 */
 	igGridSelection(optionLiteral: 'option', optionName: "wrapAround"): boolean;
 
 	/**
 	 * If wrapAround is enabled and selection is on the first or last row or cell, then when the end user tries to go beyond that, the first/last row or cell will be selected
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSelection(optionLiteral: 'option', optionName: "wrapAround", optionValue: boolean): void;
 
 	/**
 	 * If true will basically skip going into child grids with down / up / right / left arrow keys, when in the context of hierarchical grid
+	 *
 	 */
 	igGridSelection(optionLiteral: 'option', optionName: "skipChildren"): boolean;
 
 	/**
 	 * If true will basically skip going into child grids with down / up / right / left arrow keys, when in the context of hierarchical grid
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSelection(optionLiteral: 'option', optionName: "skipChildren", optionValue: boolean): void;
 
 	/**
 	 * If true multiple selection of cells is done as if CTRL is being held. the option is disregarded if mode is set to row. this option is useful for enabling multiple discountinued selection on touch environments.
+	 *
 	 */
 	igGridSelection(optionLiteral: 'option', optionName: "multipleCellSelectOnClick"): boolean;
 
 	/**
 	 * If true multiple selection of cells is done as if CTRL is being held. the option is disregarded if mode is set to row. this option is useful for enabling multiple discountinued selection on touch environments.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSelection(optionLiteral: 'option', optionName: "multipleCellSelectOnClick", optionValue: boolean): void;
 
 	/**
-	 * Enables / disables selection via continuous touch event - only applicable for cell selection and touch-supported environments
+	 * Deprecated="true" Enables / disables selection via continuous touch event - only applicable for cell selection and touch-supported environments
+	 *
 	 */
 	igGridSelection(optionLiteral: 'option', optionName: "touchDragSelect"): boolean;
 
 	/**
-	 * Enables / disables selection via continuous touch event - only applicable for cell selection and touch-supported environments
+	 * Deprecated="true" Enables / disables selection via continuous touch event - only applicable for cell selection and touch-supported environments
+	 *
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -52646,24 +60813,28 @@ interface JQuery {
 
 	/**
 	 * Enables / disables selection persistance between states.
+	 *
 	 */
 	igGridSelection(optionLiteral: 'option', optionName: "persist"): boolean;
 
 	/**
 	 * Enables / disables selection persistance between states.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSelection(optionLiteral: 'option', optionName: "persist", optionValue: boolean): void;
 
 	/**
 	 * Enables / disables the ability to ctrl drag multiple selection windows when selection mode is 'cell'
+	 *
 	 */
 	igGridSelection(optionLiteral: 'option', optionName: "allowMultipleRangeSelection"): boolean;
 
 	/**
 	 * Enables / disables the ability to ctrl drag multiple selection windows when selection mode is 'cell'
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSelection(optionLiteral: 'option', optionName: "allowMultipleRangeSelection", optionValue: boolean): void;
@@ -52833,6 +61004,24 @@ interface IgGridModalDialog {
 	 */
 	tabIndex?: number;
 
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	locale?: any;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	language?: string;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+	regional?: string|Object;
+
 	/**
 	 * Event fired before the modal dialog is opened.
 	 */
@@ -52888,12 +61077,27 @@ interface IgGridModalDialog {
 }
 interface IgGridModalDialogMethods {
 	openModalDialog(): void;
+
+	/**
+	 * Changes the all locales into the widget element to the language specified in [options.language](ui.iggridmodaldialog#options:language)
+	 * Note that this method is for rare scenarios, see [language](ui.iggridmodaldialog#options:language) or [locale](ui.iggridmodaldialog#options:locale) option setter
+	 */
 	changeLocale(): void;
 	closeModalDialog(accepted: Object, e: Object): void;
 	getCaptionButtonContainer(): void;
 	getFooter(): void;
 	getContent(): void;
 	destroy(): void;
+
+	/**
+	 * Changes the widget language to global language. Global language is the value in $.ig.util.language
+	 */
+	changeGlobalLanguage(): void;
+
+	/**
+	 * Changes the widget regional settins to global regional settings. Global regional settings are container in $.ig.util.regional
+	 */
+	changeGlobalRegional(): void;
 }
 interface JQuery {
 	data(propertyName: "igGridModalDialog"): IgGridModalDialogMethods;
@@ -52921,6 +61125,13 @@ declare namespace Infragistics {
 class EditorProvider {
 	/**
 	 * Create handlers cache
+	 *
+	 * @param callbacks
+	 * @param key
+	 * @param editorOptions
+	 * @param tabIndex
+	 * @param format
+	 * @param element
 	 */
 	createEditor(callbacks: Object, key: Object, editorOptions: Object, tabIndex: Object, format: Object, element: Object): void;
 	keyDown(evt: Object, ui: Object): void;
@@ -52944,6 +61155,13 @@ declare namespace Infragistics {
 class EditorProviderBase {
 	/**
 	 * Call parent createEditor
+	 *
+	 * @param callbacks
+	 * @param key
+	 * @param editorOptions
+	 * @param tabIndex
+	 * @param format
+	 * @param element
 	 */
 	createEditor(callbacks: Object, key: Object, editorOptions: Object, tabIndex: Object, format: Object, element: Object): void;
 	textChanged(evt: Object, ui: Object): void;
@@ -53152,6 +61370,10 @@ class SortingExpressionsManager {
 	/**
 	 * Insert expr at the first position of the se (sorting expressions) if there are not any other expressions with flag group by
 	 *  otherwise if there are such expressions inserts after the last
+	 *
+	 * @param se
+	 * @param expr
+	 * @param feature
 	 */
 	addSortingExpression(se: Object, expr: Object, feature: Object): void;
 	setFormattersForSortingExprs(exprs: Object, grid: Object): void;
@@ -53166,6 +61388,8 @@ interface JQuery {
 	igGridModalDialog(methodName: "getFooter"): void;
 	igGridModalDialog(methodName: "getContent"): void;
 	igGridModalDialog(methodName: "destroy"): void;
+	igGridModalDialog(methodName: "changeGlobalLanguage"): void;
+	igGridModalDialog(methodName: "changeGlobalRegional"): void;
 
 	/**
 	 * The default modal dialog width in pixels.
@@ -53221,6 +61445,50 @@ interface JQuery {
 	 */
 	igGridModalDialog(optionLiteral: 'option', optionName: "tabIndex", optionValue: number): void;
 
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	igGridModalDialog(optionLiteral: 'option', optionName: "locale"): any;
+
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igGridModalDialog(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	igGridModalDialog(optionLiteral: 'option', optionName: "language"): string;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igGridModalDialog(optionLiteral: 'option', optionName: "language", optionValue: string): void;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+
+	igGridModalDialog(optionLiteral: 'option', optionName: "regional"): string|Object;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igGridModalDialog(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
+
 	/**
 	 * Event fired before the modal dialog is opened.
 	 */
@@ -53356,76 +61624,91 @@ interface JQuery {
 interface IgGridSortingLocale {
 	/**
 	 * Custom sorted column tooltip in [igTemplating](http://www.igniteui.com/help/igtemplating-overview) format.
+	 *
 	 */
 	sortedColumnTooltipFormat?: string;
 
 	/**
 	 * Unsorted column tooltip.
+	 *
 	 */
 	unsortedColumnTooltip?: string;
 
 	/**
 	 * Ascending text used for header title.
+	 *
 	 */
 	ascending?: string;
 
 	/**
 	 * Descending text used for header title.
+	 *
 	 */
 	descending?: string;
 
 	/**
 	 * Specifies sortby button text for each unsorted column in multiple sorting dialog.
+	 *
 	 */
 	modalDialogSortByButtonText?: string;
 
 	/**
 	 * Specifies reset button text in the modal dialog.
+	 *
 	 */
 	modalDialogResetButton?: string;
 
 	/**
 	 * Specifies caption for each descending sorted column in multiple sorting dialog.
+	 *
 	 */
 	modalDialogCaptionButtonDesc?: string;
 
 	/**
 	 * Specifies caption for each ascending sorted column in multiple sorting dialog.
+	 *
 	 */
 	modalDialogCaptionButtonAsc?: string;
 
 	/**
 	 * Specifies caption for unsort button in multiple sorting dialog.
+	 *
 	 */
 	modalDialogCaptionButtonUnsort?: string;
 
 	/**
 	 * Specifies the text of the feature chooser sorting button.
+	 *
 	 */
 	featureChooserText?: string;
 
 	/**
 	 * Specifies caption text for multiple sorting dialog.
+	 *
 	 */
 	modalDialogCaptionText?: string;
 
 	/**
 	 * Specifies text of button which applies changes in modal dialog.
+	 *
 	 */
 	modalDialogButtonApplyText?: string;
 
 	/**
 	 * Specifies text of button which cancels the changes in the advanced sorting modal dialog.
+	 *
 	 */
 	modalDialogButtonCancelText?: string;
 
 	/**
 	 * Specifies the text shown in the feature chooser item for sorting in ascending order (displayed only on touch environment).
+	 *
 	 */
 	featureChooserSortAsc?: string;
 
 	/**
 	 * Specifies the text shown in the feature chooser item for sorting in descending order (displayed only on touch environment).
+	 *
 	 */
 	featureChooserSortDesc?: string;
 
@@ -53438,17 +61721,20 @@ interface IgGridSortingLocale {
 interface IgGridSortingColumnSetting {
 	/**
 	 * Identifies the grid column by key. Either key or index must be set in every column setting.
+	 *
 	 */
 	columnKey?: string;
 
 	/**
 	 * Identifies the grid column by index. Either key or index must be set in every column setting.
+	 *
 	 */
 	columnIndex?: number;
 
 	/**
 	 * This will be the first sort direction when the column hasn't been sorted before.
 	 *
+	 *
 	 * Valid values:
 	 * "asc" The first sort of the column data will be in ascending order.
 	 * "desc" The first sort of the column data will be in descending order.
@@ -53458,6 +61744,7 @@ interface IgGridSortingColumnSetting {
 	/**
 	 * The current (or default) sort direction. If this setting is specified, the column will be rendered sorted according to this option.
 	 *
+	 *
 	 * Valid values:
 	 * "asc" The initial sort of the column data will be in ascending order.
 	 * "desc" The initial sort of the column data will be in descending order.
@@ -53466,6 +61753,7 @@ interface IgGridSortingColumnSetting {
 
 	/**
 	 * Enables/disables sorting on the specified column. By default all columns are sortable.
+	 *
 	 */
 	allowSorting?: boolean;
 
@@ -53480,6 +61768,7 @@ interface IgGridSortingColumnSetting {
 	 * 1 - indicating that val1 > val2,
 	 * -1 - indicating that val1 < val2.
 	 *
+	 *
 	 * Valid values:
 	 * "string" The name of the function as a string located in the global window object.
 	 * "function" Function which will be used for custom comparison.
@@ -53616,6 +61905,7 @@ interface IgGridSorting {
 	/**
 	 * Defines local or remote sorting operations.
 	 *
+	 *
 	 * Valid values:
 	 * "remote" Sorting is performed remotely as a server-side operation.
 	 * "local" Sorting is performed locally by the [$.ig.DataSource](ig.datasource) component.
@@ -53624,32 +61914,38 @@ interface IgGridSorting {
 
 	/**
 	 * Enables or disables the case sensitivity of the sorting. Works only for [local](ui.iggridsorting#options:type) sorting.
+	 *
 	 */
 	caseSensitive?: boolean;
 
 	/**
 	 * Enables/disables special styling for sorted columns. If false, sorted column cells will not have any special sort-related styling.
+	 *
 	 */
 	applySortedColumnCss?: boolean;
 
 	/**
 	 * URL param name which specifies how sorting expressions will be encoded in the URL. Uses OData conventions. ex: ?sort(col1)=asc
+	 *
 	 */
 	sortUrlKey?: string;
 
 	/**
 	 * URL param value for ascending type of sorting. Uses OData conventions. Example: ?sort(col1)=asc
+	 *
 	 */
 	sortUrlKeyAscValue?: string;
 
 	/**
 	 * URL param value for descending type of sorting. Uses OData conventions. Example: ?sort(col1)=desc
+	 *
 	 */
 	sortUrlKeyDescValue?: string;
 
 	/**
 	 * Defines single column sorting or multiple column sorting.
 	 *
+	 *
 	 * Valid values:
 	 * "single" Only a single column can be sorted. Previously sorted columns will not preserve their sorting upon sorting a new column.
 	 * "multi" If enabled, previous sorted state for columns won't be cleared
@@ -53658,12 +61954,14 @@ interface IgGridSorting {
 
 	/**
 	 * Custom sort function(or name of the function as a string) accepting three parameters - the data to be sorted, an array of data source field definitions, and the direction to sort with (optional). The function should return the sorted data array.
+	 *
 	 */
 	customSortFunction?: Function;
 
 	/**
 	 * Specifies which direction to use on the first click / keydown, if the column is sorted for the first time.
 	 *
+	 *
 	 * Valid values:
 	 * "ascending" The first sort of the column data will be in ascending order.
 	 * "descending" The first sort of the column data will be in descending order.
@@ -53672,6 +61970,7 @@ interface IgGridSorting {
 
 	/**
 	 * Specifies whether sorting to be applied immediately when click sort/unsort columns when using the multiple sorting dialog. When it is false Apply button shows and sorting is applied when the button is clicked.
+	 *
 	 */
 	modalDialogSortOnClick?: boolean;
 
@@ -53763,6 +62062,7 @@ interface IgGridSorting {
 	/**
 	 * Specifies width of multiple sorting dialog.
 	 *
+	 *
 	 * Valid values:
 	 * "string" Specifies the width in pixels as a string ("300px").
 	 * "number" Specifies the width in pixels as a number (300)
@@ -53772,6 +62072,7 @@ interface IgGridSorting {
 	/**
 	 * Specifies height of multiple sorting dialog.
 	 *
+	 *
 	 * Valid values:
 	 * "string" The widget height can be set in pixels (px) and percentage (%).
 	 * "number" The widget height can be set in pixels as a number.
@@ -53780,16 +62081,19 @@ interface IgGridSorting {
 
 	/**
 	 * Specifies time of milliseconds for animation duration to show/hide modal dialog.
+	 *
 	 */
 	modalDialogAnimationDuration?: number;
 
 	/**
 	 * A list of custom column settings that specify custom sorting settings for a specific column (whether sorting is enabled / disabled, default sort direction, first sort direction, etc.).
+	 *
 	 */
 	columnSettings?: IgGridSortingColumnSetting[];
 
 	/**
 	 * Enables/disables sorting persistence when the grid is rebound.
+	 *
 	 */
 	persist?: boolean;
 
@@ -53803,14 +62107,28 @@ interface IgGridSorting {
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog.
+	 *
 	 */
 	dialogWidget?: string;
 
 	/**
 	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
+	 *
 	 */
 	inherit?: boolean;
 
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	language?: string;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+	regional?: string|Object;
+
 	/**
 	 * Event fired before sorting is invoked for a certain column.
 	 * Return false in order to cancel column sorting.
@@ -53888,6 +62206,13 @@ interface IgGridSorting {
 	[optionName: string]: any;
 }
 interface IgGridSortingMethods {
+	changeGlobalLanguage(): void;
+	changeGlobalRegional(): void;
+
+	/**
+	 * Changes the all locales into the widget element to the language specified in [options.language](ui.iggridsorting#options:language)
+	 * Note that this method is for rare scenarios, see [language](ui.iggridsorting#options:language) or [locale](ui.iggridsorting#options:locale) option setter
+	 */
 	changeLocale(): void;
 
 	/**
@@ -53895,6 +62220,7 @@ interface IgGridSortingMethods {
 	 *
 	 * @param index Column key (string) or index (number) - for multi-row grid only column key can be used. Specifies the column which we want to sort. If the mode is multiple, previous sorting states are not cleared.
 	 * @param direction Specifies sorting direction (ascending or descending)
+	 * @param header
 	 */
 	sortColumn(index: Object, direction: Object, header: Object): void;
 
@@ -53935,6 +62261,8 @@ interface IgGridSortingMethods {
 
 	/**
 	 * Renders content of multiple sorting dialog - sorted and unsorted columns.
+	 *
+	 * @param isToCallEvents
 	 */
 	renderMultipleSortingDialogContent(isToCallEvents: Object): void;
 
@@ -53948,6 +62276,8 @@ interface JQuery {
 }
 
 interface JQuery {
+	igGridSorting(methodName: "changeGlobalLanguage"): void;
+	igGridSorting(methodName: "changeGlobalRegional"): void;
 	igGridSorting(methodName: "changeLocale"): void;
 	igGridSorting(methodName: "sortColumn", index: Object, direction: Object, header: Object): void;
 	igGridSorting(methodName: "sortMultiple", exprs?: any[]): void;
@@ -53961,6 +62291,7 @@ interface JQuery {
 
 	/**
 	 * Defines local or remote sorting operations.
+	 *
 	 */
 
 	igGridSorting(optionLiteral: 'option', optionName: "type"): string;
@@ -53968,6 +62299,7 @@ interface JQuery {
 	/**
 	 * Defines local or remote sorting operations.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -53975,66 +62307,77 @@ interface JQuery {
 
 	/**
 	 * Enables or disables the case sensitivity of the sorting. Works only for [local](ui.iggridsorting#options:type) sorting.
+	 *
 	 */
 	igGridSorting(optionLiteral: 'option', optionName: "caseSensitive"): boolean;
 
 	/**
 	 * Enables or disables the case sensitivity of the sorting. Works only for [local](ui.iggridsorting#options:type) sorting.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSorting(optionLiteral: 'option', optionName: "caseSensitive", optionValue: boolean): void;
 
 	/**
 	 * Enables/disables special styling for sorted columns. If false, sorted column cells will not have any special sort-related styling.
+	 *
 	 */
 	igGridSorting(optionLiteral: 'option', optionName: "applySortedColumnCss"): boolean;
 
 	/**
 	 * Enables/disables special styling for sorted columns. If false, sorted column cells will not have any special sort-related styling.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSorting(optionLiteral: 'option', optionName: "applySortedColumnCss", optionValue: boolean): void;
 
 	/**
 	 * URL param name which specifies how sorting expressions will be encoded in the URL. Uses OData conventions. ex: ?sort(col1)=asc
+	 *
 	 */
 	igGridSorting(optionLiteral: 'option', optionName: "sortUrlKey"): string;
 
 	/**
 	 * URL param name which specifies how sorting expressions will be encoded in the URL. Uses OData conventions. ex: ?sort(col1)=asc
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSorting(optionLiteral: 'option', optionName: "sortUrlKey", optionValue: string): void;
 
 	/**
 	 * URL param value for ascending type of sorting. Uses OData conventions. Example: ?sort(col1)=asc
+	 *
 	 */
 	igGridSorting(optionLiteral: 'option', optionName: "sortUrlKeyAscValue"): string;
 
 	/**
 	 * URL param value for ascending type of sorting. Uses OData conventions. Example: ?sort(col1)=asc
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSorting(optionLiteral: 'option', optionName: "sortUrlKeyAscValue", optionValue: string): void;
 
 	/**
 	 * URL param value for descending type of sorting. Uses OData conventions. Example: ?sort(col1)=desc
+	 *
 	 */
 	igGridSorting(optionLiteral: 'option', optionName: "sortUrlKeyDescValue"): string;
 
 	/**
 	 * URL param value for descending type of sorting. Uses OData conventions. Example: ?sort(col1)=desc
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSorting(optionLiteral: 'option', optionName: "sortUrlKeyDescValue", optionValue: string): void;
 
 	/**
 	 * Defines single column sorting or multiple column sorting.
+	 *
 	 */
 
 	igGridSorting(optionLiteral: 'option', optionName: "mode"): string;
@@ -54042,6 +62385,7 @@ interface JQuery {
 	/**
 	 * Defines single column sorting or multiple column sorting.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -54049,18 +62393,21 @@ interface JQuery {
 
 	/**
 	 * Custom sort function(or name of the function as a string) accepting three parameters - the data to be sorted, an array of data source field definitions, and the direction to sort with (optional). The function should return the sorted data array.
+	 *
 	 */
 	igGridSorting(optionLiteral: 'option', optionName: "customSortFunction"): Function;
 
 	/**
 	 * Custom sort function(or name of the function as a string) accepting three parameters - the data to be sorted, an array of data source field definitions, and the direction to sort with (optional). The function should return the sorted data array.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSorting(optionLiteral: 'option', optionName: "customSortFunction", optionValue: Function): void;
 
 	/**
 	 * Gets which direction to use on the first click / keydown, if the column is sorted for the first time.
+	 *
 	 */
 
 	igGridSorting(optionLiteral: 'option', optionName: "firstSortDirection"): string;
@@ -54068,6 +62415,7 @@ interface JQuery {
 	/**
 	 * Sets which direction to use on the first click / keydown, if the column is sorted for the first time.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -54075,12 +62423,14 @@ interface JQuery {
 
 	/**
 	 * Gets whether sorting to be applied immediately when click sort/unsort columns when using the multiple sorting dialog. When it is false Apply button shows and sorting is applied when the button is clicked.
+	 *
 	 */
 	igGridSorting(optionLiteral: 'option', optionName: "modalDialogSortOnClick"): boolean;
 
 	/**
 	 * Sets whether sorting to be applied immediately when click sort/unsort columns when using the multiple sorting dialog. When it is false Apply button shows and sorting is applied when the button is clicked.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSorting(optionLiteral: 'option', optionName: "modalDialogSortOnClick", optionValue: boolean): void;
@@ -54281,6 +62631,7 @@ interface JQuery {
 
 	/**
 	 * Gets width of multiple sorting dialog.
+	 *
 	 */
 
 	igGridSorting(optionLiteral: 'option', optionName: "modalDialogWidth"): string|number;
@@ -54288,6 +62639,7 @@ interface JQuery {
 	/**
 	 * Sets width of multiple sorting dialog.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -54295,6 +62647,7 @@ interface JQuery {
 
 	/**
 	 * Gets height of multiple sorting dialog.
+	 *
 	 */
 
 	igGridSorting(optionLiteral: 'option', optionName: "modalDialogHeight"): string|number;
@@ -54302,6 +62655,7 @@ interface JQuery {
 	/**
 	 * Sets height of multiple sorting dialog.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -54309,36 +62663,42 @@ interface JQuery {
 
 	/**
 	 * Gets time of milliseconds for animation duration to show/hide modal dialog.
+	 *
 	 */
 	igGridSorting(optionLiteral: 'option', optionName: "modalDialogAnimationDuration"): number;
 
 	/**
 	 * Sets time of milliseconds for animation duration to show/hide modal dialog.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSorting(optionLiteral: 'option', optionName: "modalDialogAnimationDuration", optionValue: number): void;
 
 	/**
 	 * A list of custom column settings that specify custom sorting settings for a specific column (whether sorting is enabled / disabled, default sort direction, first sort direction, etc.).
+	 *
 	 */
 	igGridSorting(optionLiteral: 'option', optionName: "columnSettings"): IgGridSortingColumnSetting[];
 
 	/**
 	 * A list of custom column settings that specify custom sorting settings for a specific column (whether sorting is enabled / disabled, default sort direction, first sort direction, etc.).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSorting(optionLiteral: 'option', optionName: "columnSettings", optionValue: IgGridSortingColumnSetting[]): void;
 
 	/**
 	 * Enables/disables sorting persistence when the grid is rebound.
+	 *
 	 */
 	igGridSorting(optionLiteral: 'option', optionName: "persist"): boolean;
 
 	/**
 	 * Enables/disables sorting persistence when the grid is rebound.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSorting(optionLiteral: 'option', optionName: "persist", optionValue: boolean): void;
@@ -54363,28 +62723,62 @@ interface JQuery {
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog.
+	 *
 	 */
 	igGridSorting(optionLiteral: 'option', optionName: "dialogWidget"): string;
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSorting(optionLiteral: 'option', optionName: "dialogWidget", optionValue: string): void;
 
 	/**
 	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
+	 *
 	 */
 	igGridSorting(optionLiteral: 'option', optionName: "inherit"): boolean;
 
 	/**
 	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSorting(optionLiteral: 'option', optionName: "inherit", optionValue: boolean): void;
 
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	igGridSorting(optionLiteral: 'option', optionName: "language"): string;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igGridSorting(optionLiteral: 'option', optionName: "language", optionValue: string): void;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+
+	igGridSorting(optionLiteral: 'option', optionName: "regional"): string|Object;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igGridSorting(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
+
 	/**
 	 * Event fired before sorting is invoked for a certain column.
 	 * Return false in order to cancel column sorting.
@@ -54563,12 +62957,14 @@ interface JQuery {
 interface IgGridSummariesColumnSettingSummaryOperand {
 	/**
 	 * Text of the summary method which is shown in summary cell
+	 *
 	 */
 	rowDisplayLabel?: string;
 
 	/**
 	 * Set type of summary operand
 	 *
+	 *
 	 * Valid values:
 	 * "count" calculate count of result rows for the specified column
 	 * "min" calculate min of result rows for the specified column
@@ -54581,16 +62977,19 @@ interface IgGridSummariesColumnSettingSummaryOperand {
 
 	/**
 	 * If it is false the summary operand will be shown in dropdown but it will not be made calculation
+	 *
 	 */
 	active?: boolean;
 
 	/**
 	 * Name of the custom summary function which should be executed when type is custom
+	 *
 	 */
 	summaryCalculator?: string;
 
 	/**
 	 * Specifies the order of elements in dropdown. It is recommended to set order of custom operands and to be greater or equal to 5
+	 *
 	 */
 	order?: number;
 
@@ -54599,6 +62998,7 @@ interface IgGridSummariesColumnSettingSummaryOperand {
 	 * When this option is not set, the [format](ui.iggrid#options:columns.format) of the column it is in will taken into account.
 	 * When this option and the column [format](ui.iggrid#options:columns.format) is not set, the regional settings will be taken depending on the [autoFormat](ui.iggrid#options:autoFormat) option.
 	 * If the column type is not specified in the [autoFormat](ui.iggrid#options:autoFormat) option and no format is set for both column and summary operand, no formatting is applied.
+	 *
 	 */
 	format?: string;
 
@@ -54611,21 +63011,25 @@ interface IgGridSummariesColumnSettingSummaryOperand {
 interface IgGridSummariesColumnSetting {
 	/**
 	 * Enables disables summaries for the column
+	 *
 	 */
 	allowSummaries?: boolean;
 
 	/**
 	 * Column key. This is a required property in every column setting if columnIndex is not set
+	 *
 	 */
 	columnKey?: string;
 
 	/**
 	 * Column index. Can be used in place of column key. The preferred way of populating a column setting is to always use the column keys as identifiers
+	 *
 	 */
 	columnIndex?: number;
 
 	/**
 	 * Check defaultSummaryOperands
+	 *
 	 */
 	summaryOperands?: IgGridSummariesColumnSettingSummaryOperand[];
 
@@ -54638,31 +63042,37 @@ interface IgGridSummariesColumnSetting {
 interface IgGridSummariesLocale {
 	/**
 	 * Text of the button OK in the summaries dropdown
+	 *
 	 */
 	dialogButtonOKText?: string;
 
 	/**
 	 * Text of the button Cancel in the summaries dropdown
+	 *
 	 */
 	dialogButtonCancelText?: string;
 
 	/**
 	 * Get or set text that is shown in the feature chooser dropdown when summaries are hidden
+	 *
 	 */
 	featureChooserText?: string;
 
 	/**
 	 * Get or set text that is shown in the feauture chooser dropdown when summaries are shown
+	 *
 	 */
 	featureChooserTextHide?: string;
 
 	/**
 	 * Empty text template to be shown for empty cells
+	 *
 	 */
 	emptyCellText?: string;
 
 	/**
 	 * Tooltip text for header cell button
+	 *
 	 */
 	summariesHeaderButtonTooltip?: string;
 
@@ -54798,6 +63208,7 @@ interface IgGridSummaries {
 	/**
 	 * type of summaries calculating.
 	 *
+	 *
 	 * Valid values:
 	 * "remote" when it is remote summaries calculations are made on the server
 	 * "local"	When it is local calculations are made on the client
@@ -54849,6 +63260,7 @@ interface IgGridSummaries {
 	/**
 	 * Specifies when calculations are made.
 	 *
+	 *
 	 * Valid values:
 	 * "onselect" summaries are updated when checkbox is checked/unchecked
 	 * "okcancelbuttons" summaries are updated only when OK button is clicked
@@ -54860,47 +63272,56 @@ interface IgGridSummaries {
 	 * When true indicates that the summaries may be rendered compactly, even mixing different summaries on the same line.
 	 * False ensures that each summary type is occupying a separate line.
 	 * Auto will use True if the maximum number of visible summaries is one or less and False otherwise.
+	 *
 	 */
 	compactRenderingMode?: any;
 
 	/**
 	 * Show header button icon in the header cell. On click - shows/hides summaries. If false then summary icon should not be shown in the feature chooser(if shown).
+	 *
 	 */
 	showSummariesButton?: boolean;
 
 	/**
 	 * Result key by which we get data from the result returned by remote data source.
+	 *
 	 */
 	summariesResponseKey?: string;
 
 	/**
 	 * Set key in GET Request for summaries - used only when type is remote
+	 *
 	 */
 	summaryExprUrlKey?: string;
 
 	/**
 	 * Function reference - it is called when data is retrieved from the data source
+	 *
 	 */
 	callee?: Function;
 
 	/**
 	 * Height of the dropdown in pixels
+	 *
 	 */
 	dropDownHeight?: number;
 
 	/**
 	 * Width of the dropdown in pixels
+	 *
 	 */
 	dropDownWidth?: number;
 
 	/**
 	 * Show/hide footer button(on click show/hide dropdown)
+	 *
 	 */
 	showDropDownButton?: boolean;
 
 	/**
 	 * Determines when the summary values are calculated when type is local
 	 *
+	 *
 	 * Valid values:
 	 * "priortofilteringandpaging" summaries are calculated prior to filtering and paging
 	 * "afterfilteringbeforepaging" summaries are calculated after filtering and before paging
@@ -54910,21 +63331,25 @@ interface IgGridSummaries {
 
 	/**
 	 * Dropdown animation duration
+	 *
 	 */
 	dropDownDialogAnimationDuration?: number;
 
 	/**
 	 * Result template for summary result(shown in table cell)
+	 *
 	 */
 	resultTemplate?: string;
 
 	/**
 	 * a reference or name of a javascript function - renders summary cell in grid footer.(if not set it is used default render function) It takes 3 parameters - methodName(summary method), columnKey, data(summary data which should be rendered)
+	 *
 	 */
 	renderSummaryCellFunc?: string|Object;
 
 	/**
 	 * A list of column settings that specifies custom summaries options per column basis
+	 *
 	 */
 	columnSettings?: IgGridSummariesColumnSetting[];
 
@@ -54934,6 +63359,18 @@ interface IgGridSummaries {
 	inherit?: boolean;
 	locale?: IgGridSummariesLocale;
 
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	language?: string;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+	regional?: string|Object;
+
 	/**
 	 * Event fired before drop down is opened for a specific column summary
 	 * Return false in order to cancel opening the drop down.
@@ -54999,7 +63436,19 @@ interface IgGridSummaries {
 	[optionName: string]: any;
 }
 interface IgGridSummariesMethods {
+	changeGlobalLanguage(): void;
+	changeGlobalRegional(): void;
+
+	/**
+	 * Changes the all locales into the widget element to the language specified in [options.language](ui.iggridsummaries#options:language)
+	 * Note that this method is for rare scenarios, see [language](ui.iggridsummaries#options:language) or [locale](ui.iggridsummaries#options:locale) option setter
+	 */
 	changeLocale(): void;
+
+	/**
+	 * Changes the the regional settings of widget element to the language specified in [options.regional](ui.iggridsummaries#options:regional)
+	 * Note that this method is for rare scenarios, use [regional](ui.iggridsummaries#options:regional) option setter
+	 */
 	changeRegional(): void;
 	destroy(): void;
 
@@ -55063,6 +63512,7 @@ interface IgGridSummariesMethods {
 	 * @param columnMethods Array of column methods objects
 	 * @param data Object which represents result
 	 * represents dataType for the current column
+	 * @param dataType
 	 */
 	calculateSummaryColumn(ck: string, columnMethods: any[], data: Object, dataType: Object): void;
 
@@ -55073,6 +63523,8 @@ interface IgGridSummariesMethods {
 
 	/**
 	 * Return a JQUERY object which holds all summaries for column with the specified column key
+	 *
+	 * @param columnKey
 	 */
 	summariesFor(columnKey: Object): void;
 }
@@ -55081,6 +63533,8 @@ interface JQuery {
 }
 
 interface JQuery {
+	igGridSummaries(methodName: "changeGlobalLanguage"): void;
+	igGridSummaries(methodName: "changeGlobalRegional"): void;
 	igGridSummaries(methodName: "changeLocale"): void;
 	igGridSummaries(methodName: "changeRegional"): void;
 	igGridSummaries(methodName: "destroy"): void;
@@ -55098,6 +63552,7 @@ interface JQuery {
 
 	/**
 	 * Type of summaries calculating.
+	 *
 	 */
 
 	igGridSummaries(optionLiteral: 'option', optionName: "type"): string;
@@ -55105,6 +63560,7 @@ interface JQuery {
 	/**
 	 * Type of summaries calculating.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -55208,6 +63664,7 @@ interface JQuery {
 
 	/**
 	 * Gets when calculations are made.
+	 *
 	 */
 
 	igGridSummaries(optionLiteral: 'option', optionName: "calculateRenderMode"): string;
@@ -55215,6 +63672,7 @@ interface JQuery {
 	/**
 	 * Sets when calculations are made.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -55225,6 +63683,7 @@ interface JQuery {
 	 * When true indicates that the summaries may be rendered compactly, even mixing different summaries on the same line.
 	 * False ensures that each summary type is occupying a separate line.
 	 * Auto will use True if the maximum number of visible summaries is one or less and False otherwise.
+	 *
 	 */
 	igGridSummaries(optionLiteral: 'option', optionName: "compactRenderingMode"): any;
 
@@ -55234,96 +63693,112 @@ interface JQuery {
 	 * False ensures that each summary type is occupying a separate line.
 	 * Auto will use True if the maximum number of visible summaries is one or less and False otherwise.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSummaries(optionLiteral: 'option', optionName: "compactRenderingMode", optionValue: any): void;
 
 	/**
 	 * Show header button icon in the header cell. On click - shows/hides summaries. If false then summary icon should not be shown in the feature chooser(if shown).
+	 *
 	 */
 	igGridSummaries(optionLiteral: 'option', optionName: "showSummariesButton"): boolean;
 
 	/**
 	 * Show header button icon in the header cell. On click - shows/hides summaries. If false then summary icon should not be shown in the feature chooser(if shown).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSummaries(optionLiteral: 'option', optionName: "showSummariesButton", optionValue: boolean): void;
 
 	/**
 	 * Result key by which we get data from the result returned by remote data source.
+	 *
 	 */
 	igGridSummaries(optionLiteral: 'option', optionName: "summariesResponseKey"): string;
 
 	/**
 	 * Result key by which we get data from the result returned by remote data source.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSummaries(optionLiteral: 'option', optionName: "summariesResponseKey", optionValue: string): void;
 
 	/**
 	 * Set key in GET Request for summaries - used only when type is remote
+	 *
 	 */
 	igGridSummaries(optionLiteral: 'option', optionName: "summaryExprUrlKey"): string;
 
 	/**
 	 * Set key in GET Request for summaries - used only when type is remote
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSummaries(optionLiteral: 'option', optionName: "summaryExprUrlKey", optionValue: string): void;
 
 	/**
 	 * Function reference - it is called when data is retrieved from the data source
+	 *
 	 */
 	igGridSummaries(optionLiteral: 'option', optionName: "callee"): Function;
 
 	/**
 	 * Function reference - it is called when data is retrieved from the data source
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSummaries(optionLiteral: 'option', optionName: "callee", optionValue: Function): void;
 
 	/**
 	 * Height of the dropdown in pixels
+	 *
 	 */
 	igGridSummaries(optionLiteral: 'option', optionName: "dropDownHeight"): number;
 
 	/**
 	 * Height of the dropdown in pixels
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSummaries(optionLiteral: 'option', optionName: "dropDownHeight", optionValue: number): void;
 
 	/**
 	 * Width of the dropdown in pixels
+	 *
 	 */
 	igGridSummaries(optionLiteral: 'option', optionName: "dropDownWidth"): number;
 
 	/**
 	 * Width of the dropdown in pixels
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSummaries(optionLiteral: 'option', optionName: "dropDownWidth", optionValue: number): void;
 
 	/**
 	 * Show/hide footer button(on click show/hide dropdown)
+	 *
 	 */
 	igGridSummaries(optionLiteral: 'option', optionName: "showDropDownButton"): boolean;
 
 	/**
 	 * Show/hide footer button(on click show/hide dropdown)
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSummaries(optionLiteral: 'option', optionName: "showDropDownButton", optionValue: boolean): void;
 
 	/**
 	 * Determines when the summary values are calculated when type is local
+	 *
 	 */
 
 	igGridSummaries(optionLiteral: 'option', optionName: "summaryExecution"): string;
@@ -55331,6 +63806,7 @@ interface JQuery {
 	/**
 	 * Determines when the summary values are calculated when type is local
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -55338,30 +63814,35 @@ interface JQuery {
 
 	/**
 	 * Dropdown animation duration
+	 *
 	 */
 	igGridSummaries(optionLiteral: 'option', optionName: "dropDownDialogAnimationDuration"): number;
 
 	/**
 	 * Dropdown animation duration
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSummaries(optionLiteral: 'option', optionName: "dropDownDialogAnimationDuration", optionValue: number): void;
 
 	/**
 	 * Result template for summary result(shown in table cell)
+	 *
 	 */
 	igGridSummaries(optionLiteral: 'option', optionName: "resultTemplate"): string;
 
 	/**
 	 * Result template for summary result(shown in table cell)
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSummaries(optionLiteral: 'option', optionName: "resultTemplate", optionValue: string): void;
 
 	/**
 	 * A reference or name of a javascript function - renders summary cell in grid footer.(if not set it is used default render function) It takes 3 parameters - methodName(summary method), columnKey, data(summary data which should be rendered)
+	 *
 	 */
 
 	igGridSummaries(optionLiteral: 'option', optionName: "renderSummaryCellFunc"): string|Object;
@@ -55369,6 +63850,7 @@ interface JQuery {
 	/**
 	 * A reference or name of a javascript function - renders summary cell in grid footer.(if not set it is used default render function) It takes 3 parameters - methodName(summary method), columnKey, data(summary data which should be rendered)
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -55376,12 +63858,14 @@ interface JQuery {
 
 	/**
 	 * A list of column settings that specifies custom summaries options per column basis
+	 *
 	 */
 	igGridSummaries(optionLiteral: 'option', optionName: "columnSettings"): IgGridSummariesColumnSetting[];
 
 	/**
 	 * A list of column settings that specifies custom summaries options per column basis
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridSummaries(optionLiteral: 'option', optionName: "columnSettings", optionValue: IgGridSummariesColumnSetting[]): void;
@@ -55400,6 +63884,36 @@ interface JQuery {
 	igGridSummaries(optionLiteral: 'option', optionName: "locale"): IgGridSummariesLocale;
 	igGridSummaries(optionLiteral: 'option', optionName: "locale", optionValue: IgGridSummariesLocale): void;
 
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	igGridSummaries(optionLiteral: 'option', optionName: "language"): string;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igGridSummaries(optionLiteral: 'option', optionName: "language", optionValue: string): void;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+
+	igGridSummaries(optionLiteral: 'option', optionName: "regional"): string|Object;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igGridSummaries(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
+
 	/**
 	 * Event fired before drop down is opened for a specific column summary
 	 * Return false in order to cancel opening the drop down.
@@ -55548,21 +64062,25 @@ interface JQuery {
 interface IgGridTooltipsColumnSettings {
 	/**
 	 * Either key or index must be set in every column setting.
+	 *
 	 */
 	columnKey?: string;
 
 	/**
 	 * Either key or index must be set in every column setting.
+	 *
 	 */
 	columnIndex?: number;
 
 	/**
 	 * Enables / disables tooltips on the specified column. By default tooltips are displayed for each column. Note: This option is mandatory.
+	 *
 	 */
 	allowTooltips?: boolean;
 
 	/**
 	 * Specifies the maximum width (in pixels) of the tooltip when shown for the specified column. If unset the width of the column will be used instead.
+	 *
 	 */
 	maxWidth?: number;
 
@@ -55574,7 +64092,8 @@ interface IgGridTooltipsColumnSettings {
 
 interface IgGridTooltips {
 	/**
-	 * determines the tooltip visibility option
+	 * Determines the tooltip visibility option
+	 *
 	 *
 	 * Valid values:
 	 * "always" tooltips always show for hovered elements
@@ -55584,7 +64103,8 @@ interface IgGridTooltips {
 	visibility?: string;
 
 	/**
-	 * controls the tooltip's style
+	 * Controls the tooltip's style
+	 *
 	 *
 	 * Valid values:
 	 * "tooltip" The tooltip will be positioned according to the mouse cursor. Will render the tooltip content as plain text.
@@ -55595,32 +64115,38 @@ interface IgGridTooltips {
 	/**
 	 * The time in milliseconds after which tooltip will show when
 	 * mouse cursor is hovered over a cell.
+	 *
 	 */
 	showDelay?: number;
 
 	/**
 	 * Type="integer" The time in milliseconds after which tooltip hides when mouse
 	 * cursor gets outside of the cell.
+	 *
 	 */
 	hideDelay?: number;
 
 	/**
 	 * A list of custom column settings that specify custom tooltip settings for a specific column (whether tooltips are enabled / disabled)
+	 *
 	 */
 	columnSettings?: IgGridTooltipsColumnSettings;
 
 	/**
 	 * Sets the time tooltip fades in and out when showing/hiding
+	 *
 	 */
 	fadeTimespan?: number;
 
 	/**
 	 * Sets the left position of the tooltip relative to the mouse cursor
+	 *
 	 */
 	cursorLeftOffset?: number;
 
 	/**
 	 * Sets the top position of the tooltip relative to the mouse cursor
+	 *
 	 */
 	cursorTopOffset?: number;
 
@@ -55675,6 +64201,7 @@ interface JQuery {
 
 	/**
 	 * Determines the tooltip visibility option
+	 *
 	 */
 
 	igGridTooltips(optionLiteral: 'option', optionName: "visibility"): string;
@@ -55682,6 +64209,7 @@ interface JQuery {
 	/**
 	 * Determines the tooltip visibility option
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -55689,6 +64217,7 @@ interface JQuery {
 
 	/**
 	 * Controls the tooltip's style
+	 *
 	 */
 
 	igGridTooltips(optionLiteral: 'option', optionName: "style"): string;
@@ -55696,6 +64225,7 @@ interface JQuery {
 	/**
 	 * Controls the tooltip's style
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -55704,6 +64234,7 @@ interface JQuery {
 	/**
 	 * The time in milliseconds after which tooltip will show when
 	 * mouse cursor is hovered over a cell.
+	 *
 	 */
 	igGridTooltips(optionLiteral: 'option', optionName: "showDelay"): number;
 
@@ -55711,6 +64242,7 @@ interface JQuery {
 	 * The time in milliseconds after which tooltip will show when
 	 * mouse cursor is hovered over a cell.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridTooltips(optionLiteral: 'option', optionName: "showDelay", optionValue: number): void;
@@ -55718,6 +64250,7 @@ interface JQuery {
 	/**
 	 * Type="integer" The time in milliseconds after which tooltip hides when mouse
 	 * cursor gets outside of the cell.
+	 *
 	 */
 	igGridTooltips(optionLiteral: 'option', optionName: "hideDelay"): number;
 
@@ -55725,54 +64258,63 @@ interface JQuery {
 	 * Type="integer" The time in milliseconds after which tooltip hides when mouse
 	 * cursor gets outside of the cell.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridTooltips(optionLiteral: 'option', optionName: "hideDelay", optionValue: number): void;
 
 	/**
 	 * A list of custom column settings that specify custom tooltip settings for a specific column (whether tooltips are enabled / disabled)
+	 *
 	 */
 	igGridTooltips(optionLiteral: 'option', optionName: "columnSettings"): IgGridTooltipsColumnSettings;
 
 	/**
 	 * A list of custom column settings that specify custom tooltip settings for a specific column (whether tooltips are enabled / disabled)
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridTooltips(optionLiteral: 'option', optionName: "columnSettings", optionValue: IgGridTooltipsColumnSettings): void;
 
 	/**
 	 * The time tooltip fades in and out when showing/hiding
+	 *
 	 */
 	igGridTooltips(optionLiteral: 'option', optionName: "fadeTimespan"): number;
 
 	/**
 	 * Sets the time tooltip fades in and out when showing/hiding
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridTooltips(optionLiteral: 'option', optionName: "fadeTimespan", optionValue: number): void;
 
 	/**
 	 * The left position of the tooltip relative to the mouse cursor
+	 *
 	 */
 	igGridTooltips(optionLiteral: 'option', optionName: "cursorLeftOffset"): number;
 
 	/**
 	 * Sets the left position of the tooltip relative to the mouse cursor
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridTooltips(optionLiteral: 'option', optionName: "cursorLeftOffset", optionValue: number): void;
 
 	/**
 	 * The top position of the tooltip relative to the mouse cursor
+	 *
 	 */
 	igGridTooltips(optionLiteral: 'option', optionName: "cursorTopOffset"): number;
 
 	/**
 	 * Sets the top position of the tooltip relative to the mouse cursor
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridTooltips(optionLiteral: 'option', optionName: "cursorTopOffset", optionValue: number): void;
@@ -55845,12 +64387,14 @@ interface JQuery {
 interface IgGridUpdatingColumnSetting {
 	/**
 	 * Identifies the grid column by key.
+	 *
 	 */
 	columnKey?: string;
 
 	/**
 	 * Specifies the type of editor to use for the column.
 	 *
+	 *
 	 * Valid values:
 	 * "text" An igTextEditor will be created
 	 * "mask" An igMaskEditor will be created
@@ -55883,31 +64427,37 @@ interface IgGridUpdatingColumnSetting {
 	 * validate: function (noLabel) {},
 	 * isValid: function () {}
 	 * });
+	 *
 	 */
 	editorProvider?: any;
 
 	/**
 	 * Specifies options to initialize the corresponding editor with.
+	 *
 	 */
 	editorOptions?: any;
 
 	/**
 	 * Specifies if the end-user will be allowed to leave the editor's value empty during edit mode or not.
+	 *
 	 */
 	required?: boolean;
 
 	/**
 	 * Specifies if the column is read-only. In 'cell' and 'row' [editMode](ui.iggridupdating#options:editMode) no editor will be created for read-only columns. In 'dialog' mode enabling [showReadonlyEditors](ui.iggridupdating#options:rowEditDialogOptions.showReadonlyEditors) will display disabled editors for such columns.
+	 *
 	 */
 	readOnly?: boolean;
 
 	/**
 	 * Specifies if the column's value should be validated or not. The validation is done based on the rules of the corresponding editor.
+	 *
 	 */
 	validation?: boolean;
 
 	/**
 	 * Specifies the default value for the column when adding new rows. When in edit mode for adding a row the value will be pre-filled in the column's editor (if the column is not read-only). The value should be of the type specified for the column in the grid's [columns](ui.iggrid#options:columns) collection.
+	 *
 	 */
 	defaultValue?: any;
 
@@ -55921,6 +64471,7 @@ interface IgGridUpdatingRowEditDialogOptions {
 	/**
 	 * Controls the containment of the dialog's drag operation.
 	 *
+	 *
 	 * Valid values:
 	 * "owner" The row edit dialog will be draggable only in the grid area.
 	 * "window" The row edit dialog will be draggable in the whole window area.
@@ -55930,6 +64481,7 @@ interface IgGridUpdatingRowEditDialogOptions {
 	/**
 	 * Controls the default row edit dialog width.
 	 *
+	 *
 	 * Valid values:
 	 * "string" The dialog window width in pixels (400px).
 	 * "number" The dialog window width as a number (400).
@@ -55939,6 +64491,7 @@ interface IgGridUpdatingRowEditDialogOptions {
 	/**
 	 * Controls the default row edit dialog height.
 	 *
+	 *
 	 * Valid values:
 	 * "string" The dialog window height in pixels (350px).
 	 * "number" The dialog window height as a number (350).
@@ -55947,22 +64500,26 @@ interface IgGridUpdatingRowEditDialogOptions {
 
 	/**
 	 * Specifies the animation duration for the opening and closing operations.
+	 *
 	 */
 	animationDuration?: number;
 
 	/**
 	 * Controls if editors should be rendered for read-only columns. If rendered, these editors will be disabled.
+	 *
 	 */
 	showReadonlyEditors?: boolean;
 
 	/**
 	 * Controls if editors should be rendered for hidden columns.
+	 *
 	 */
 	showEditorsForHiddenColumns?: boolean;
 
 	/**
 	 * Controls the width of the column containing the column names in the default row edit dialog.
 	 *
+	 *
 	 * Valid values:
 	 * "string" The width of the column in pixels (100px) or percents (20%).
 	 * "number" The width of the column as a number (100) in pixels.
@@ -55973,6 +64530,7 @@ interface IgGridUpdatingRowEditDialogOptions {
 	/**
 	 * Controls the width of the column containing the editors in the default row edit dialog.
 	 *
+	 *
 	 * Valid values:
 	 * "string" The width of the column in pixels (100px) or percents (20%).
 	 * "number" The width of the column as a number (100) in pixels.
@@ -55983,28 +64541,33 @@ interface IgGridUpdatingRowEditDialogOptions {
 	/**
 	 * Controls the visibility of the done and cancel buttons for the dialog.
 	 * If disabled the end-user will be able to stop editing only with the Enter and Esc keys.
+	 *
 	 */
 	showDoneCancelButtons?: boolean;
 
 	/**
 	 * Specifies a template to be rendered against the currently edited record (or up-to-date key-value pairs in the case of not yet created records). It may contain an element decorated with the 'data-render-tmpl' attribute to specify where the control should render the editors template specified in the [editorsTemplate](ui.iggridupdating#options:rowEditDialogOptions.editorsTemplate) option. For custom dialogs, the elements can be decorated with 'data-editor-for-<columnKey>' attributes where columnKey is the key of the column that editor or input will be used to edit. If both dialogTemplate and [dialogTemplateSelector](ui.iggridupdating#options:rowEditDialogOptions.dialogTemplateSelector) are specified, dialogTemplateSelector will be used.The default template is '<table><colgroup><col></col><col></col></colgroup><tbody data-render-tmpl></tbody></table>'.
+	 *
 	 */
 	dialogTemplate?: string;
 
 	/**
 	 * Specifies a selector to a template rendered against the currently edited record (or up-to-date key-value pairs in the case of not yet created records). It may contain an element decorated with the 'data-render-tmpl' attribute to specify where the control should render the editors template specified in the [editorsTemplate](ui.iggridupdating#options:rowEditDialogOptions.editorsTemplate) option. For custom dialogs, the elements can be decorated with 'data-editor-for-<columnKey>' attributes where columnKey is the key of the column that editor or input will be used to edit. If both [dialogTemplate](ui.iggridupdating#options:rowEditDialogOptions.dialogTemplate) and dialogTemplateSelector are specified, dialogTemplateSelector will be used.The default template is '<table><colgroup><col></col><col></col></colgroup><tbody data-render-tmpl></tbody></table>'.
+	 *
 	 */
 	dialogTemplateSelector?: string;
 
 	/**
 	 * Specifies a template to be executed for each column in the grid's column collection (or just the read-write columns if [showReadonlyEditors](ui.iggridupdating#options:rowEditDialogOptions.showReadonlyEditors) is false). Decorate the element to be used as an editor with 'data-editor-for-${key}'. The ${key} template tag should be replaced with the chosen templating engine's syntax for rendering values. If any editors for columns are specified in the dialog markup they will be exluded from the data the template will be rendered for. This property is ignored if [dialogTemplate](ui.iggridupdating#options:rowEditDialogOptions.dialogTemplate) does not include an element with the 'data-render-tmpl' attribute. If both editorsTemplate and [editorsTemplateSelector](ui.iggridupdating#options:rowEditDialogOptions.editorsTemplateSelector) are specified, editorsTemplateSelector will be used.
 	 * The default template is '<tr><td>${headerText}</td><td><input data-editor-for-${key} /></td></tr>'
+	 *
 	 */
 	editorsTemplate?: string;
 
 	/**
 	 * Specifies a selector to a template to be executed for each column in the grid's column collection (or just the read-write columns if [showReadonlyEditors](ui.iggridupdating#options:rowEditDialogOptions.showReadonlyEditors) is false). Decorate the element to be used as an editor with 'data-editor-for-${key}'. The ${key} template tag should be replaced with the chosen templating engine's syntax for rendering values. If any editors for columns are specified in the dialog markup they will be exluded from the data the template will be rendered for. This property is ignored if [dialogTemplate](ui.iggridupdating#options:rowEditDialogOptions.dialogTemplate) does not include an element with the 'data-render-tmpl' attribute. If both [editorsTemplate](ui.iggridupdating#options:rowEditDialogOptions.editorsTemplate) and editorsTemplateSelector are specified, editorsTemplateSelector will be used.
 	 * The default template is '<tr><td>${headerText}</td><td><input data-editor-for-${key} /></td></tr>'
+	 *
 	 */
 	editorsTemplateSelector?: string;
 
@@ -56017,41 +64580,49 @@ interface IgGridUpdatingRowEditDialogOptions {
 interface IgGridUpdatingLocale {
 	/**
 	 * Specifies the label for the Done editing button (only applicable when the [showDoneCancelButtons](ui.iggridupdating#options:showDoneCancelButtons) option is enabled). If not set, $.ig.GridUpdating.locale.doneLabel is used.
+	 *
 	 */
 	doneLabel?: string;
 
 	/**
 	 * Specifies the title for the Done editing button (only applicable when the [showDoneCancelButtons](ui.iggridupdating#options:showDoneCancelButtons) option is enabled). If not set, $.ig.GridUpdating.locale.doneTooltip is used.
+	 *
 	 */
 	doneTooltip?: string;
 
 	/**
 	 * Specifies the label for the Cancel editing button (only applicable when the [showDoneCancelButtons](ui.iggridupdating#options:showDoneCancelButtons) option is enabled). If not set, $.ig.GridUpdating.locale.cancelLabel is used.
+	 *
 	 */
 	cancelLabel?: string;
 
 	/**
 	 * Specifies the title for the Cancel editing button (only applicable when the [showDoneCancelButtons](ui.iggridupdating#options:showDoneCancelButtons) option is enabled). If not set, $.ig.GridUpdating.locale.cancelTooltip is used.
+	 *
 	 */
 	cancelTooltip?: string;
 
 	/**
 	 * Specifies the label for the button starting edit mode for row adding. If not set, $.ig.GridUpdating.locale.addRowLabel is used.
+	 *
 	 */
 	addRowLabel?: string;
 
 	/**
 	 * Specifies the title for the button starting edit mode for row adding. If not set, $.ig.GridUpdating.locale.addRowTooltip is used.
+	 *
 	 */
 	addRowTooltip?: string;
 
 	/**
 	 * Specifies the label for the delete button. If not set, $.ig.GridUpdating.locale.deleteRowLabel is used.
+	 *
 	 */
 	deleteRowLabel?: string;
 
 	/**
 	 * Specifies the title for the delete button. If not set, $.ig.GridUpdating.locale.deleteRowTooltip is used.
+	 *
 	 */
 	deleteRowTooltip?: string;
 
@@ -56453,12 +65024,14 @@ interface RowEditDialogContentsRenderedEventUIParam {
 interface IgGridUpdating {
 	/**
 	 * A list of custom column options that specify editing and validation settings for a specific column.
+	 *
 	 */
 	columnSettings?: IgGridUpdatingColumnSetting[];
 
 	/**
 	 * Specifies the edit mode.
 	 *
+	 *
 	 * Valid values:
 	 * "row" Editors are shown for all columns that are not read-only. The editor of the clicked cell receives initial focus. Done and Cancel buttons may be displayed based on the [showDoneCancelButtons](ui.iggridupdating#options:showDoneCancelButtons) property.
 	 * "cell" An editor is shown for the cell entering edit mode. The Done and Cancel buttons are not supported for this mode.
@@ -56469,16 +65042,19 @@ interface IgGridUpdating {
 
 	/**
 	 * Specifies if deleting rows through the UI is enabled.
+	 *
 	 */
 	enableDeleteRow?: boolean;
 
 	/**
 	 * Specifies if adding rows through the UI is enabled. When enabled an additional row is rendered at the bottom of the grid's header that works as a button. When the end-user clicks on it edit mode is initiated either through a dialog (when [editMode](ui.iggridupdating#options:editMode) is 'dialog') or mimicking the look and feel of 'row' [editMode](ui.iggridupdating#options:editMode) (when [editMode](ui.iggridupdating#options:editMode) is 'row' or 'cell').
+	 *
 	 */
 	enableAddRow?: boolean;
 
 	/**
 	 * Specifies if the value of each editable column in the grid should be validated. The validation is done based on the rules of their corresponding editors.
+	 *
 	 */
 	validation?: boolean;
 
@@ -56540,56 +65116,67 @@ interface IgGridUpdating {
 
 	/**
 	 * Determines if the Done and Cancel buttons will be available as means to end edit mode for [editMode](ui.iggridupdating#options:editMode) 'row' and when adding a new row.
+	 *
 	 */
 	showDoneCancelButtons?: boolean;
 
 	/**
 	 * Specifies if an exception should be thrown when the grid's data view changes while there are pending transactions in the data source. The data view changes when the data source performs a sorting, filtering, groupby or paging operation and the exception thrown will prevent the operation from succeeding. All pending transactions must be committed before a data view operation is able to complete. Committing transactions can be done manually through the grid's [commit](ui.iggrid#methods:commit) function or automatically by setting [autoCommit](ui.iggrid#options:autoCommit) to 'true'.
+	 *
 	 */
 	enableDataDirtyException?: boolean;
 
 	/**
 	 * Specifies how end-users are able to start edit mode. Possible values: "click", "dblclick", "F2", "enter" and their combinations separated by coma or in array. The keyboard triggers have effect only if the grid cells can receive focus (the grid's [tabIndex](ui.iggrid#options:tabIndex) property should not have a negative value) or Selection is enabled. If "dblclick" is included, then "click" has no effect.
+	 *
 	 */
 	startEditTriggers?: string|Array<any>;
 
 	/**
 	 * Determines if pressing Enter to navigate away from the currently edited cell should move the focus horizontally or vertically (default).
+	 *
 	 */
 	horizontalMoveOnEnter?: boolean;
 
 	/**
 	 * Enables excel navigation style. When turned on, the arrow keys can be used for changing the currently edited cell similar to how Tab and Enter behave. When disabled, the arrow keys control the cursor inside editors.
+	 *
 	 */
 	excelNavigationMode?: boolean;
 
 	/**
 	 * Sets a custom function to be called when the AJAX request to the URL specified by the [updateUrl](ui.iggrid#options:updateUrl) property succeeds. The function will be called with arguments representing the data returned by the server.
+	 *
 	 */
 	saveChangesSuccessHandler?: Function|string;
 
 	/**
 	 * Sets a custom function to be called when the AJAX request to the URL specified by the [updateUrl](ui.iggrid#options:updateUrl) property fails. The function will be called with arguments representing the data returned by the server.
+	 *
 	 */
 	saveChangesErrorHandler?: Function|string;
 
 	/**
 	 * On touch-enabled devices specifies the swipe distance for the delete button to appear.
+	 *
 	 */
 	swipeDistance?: string|number;
 
 	/**
 	 * Controls if navigation will wrap around the grid. The feature will never wrap around virtual grids.
+	 *
 	 */
 	wrapAround?: boolean;
 
 	/**
 	 * A list of options controlling the rendering behavior of the row edit dialog. If [editMode](ui.iggridupdating#options:editMode) is not 'dialog' these have no effect.
+	 *
 	 */
 	rowEditDialogOptions?: IgGridUpdatingRowEditDialogOptions;
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog. For more information on how to utilize this property, please refer to the [Extending igGrid Modal Dialog](http://www.igniteui.com/help/extending-iggrid-modal-dialog) topic.
+	 *
 	 */
 	dialogWidget?: string;
 
@@ -56793,7 +65380,17 @@ interface IgGridUpdatingMethods {
 	 * Destroys igGridUpdating.
 	 */
 	destroy(): Object;
+
+	/**
+	 * Changes the the regional settings of widget element to the language specified in [options.regional](ui.iggridupdating#options:regional)
+	 * Note that this method is for rare scenarios, use [regional](ui.iggridupdating#options:regional) option setter
+	 */
 	changeRegional(): void;
+
+	/**
+	 * Changes the all locales into the widget element to the language specified in [options.language](ui.iggridupdating#options:language)
+	 * Note that this method is for rare scenarios, see [language](ui.iggridupdating#options:language) or [locale](ui.iggridupdating#options:locale) option setter
+	 */
 	changeLocale(): void;
 
 	/**
@@ -56832,18 +65429,21 @@ interface JQuery {
 
 	/**
 	 * A list of custom column options that specify editing and validation settings for a specific column.
+	 *
 	 */
 	igGridUpdating(optionLiteral: 'option', optionName: "columnSettings"): IgGridUpdatingColumnSetting[];
 
 	/**
 	 * A list of custom column options that specify editing and validation settings for a specific column.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridUpdating(optionLiteral: 'option', optionName: "columnSettings", optionValue: IgGridUpdatingColumnSetting[]): void;
 
 	/**
 	 * Gets the edit mode.
+	 *
 	 */
 
 	igGridUpdating(optionLiteral: 'option', optionName: "editMode"): string;
@@ -56851,6 +65451,7 @@ interface JQuery {
 	/**
 	 * Sets the edit mode.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -56858,36 +65459,42 @@ interface JQuery {
 
 	/**
 	 * Gets if deleting rows through the UI is enabled.
+	 *
 	 */
 	igGridUpdating(optionLiteral: 'option', optionName: "enableDeleteRow"): boolean;
 
 	/**
 	 * Sets if deleting rows through the UI is enabled.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridUpdating(optionLiteral: 'option', optionName: "enableDeleteRow", optionValue: boolean): void;
 
 	/**
 	 * Gets if adding rows through the UI is enabled. When enabled an additional row is rendered at the bottom of the grid's header that works as a button. When the end-user clicks on it edit mode is initiated either through a dialog (when [editMode](ui.iggridupdating#options:editMode) is 'dialog') or mimicking the look and feel of 'row' [editMode](ui.iggridupdating#options:editMode) (when [editMode](ui.iggridupdating#options:editMode) is 'row' or 'cell').
+	 *
 	 */
 	igGridUpdating(optionLiteral: 'option', optionName: "enableAddRow"): boolean;
 
 	/**
 	 * Sets if adding rows through the UI is enabled. When enabled an additional row is rendered at the bottom of the grid's header that works as a button. When the end-user clicks on it edit mode is initiated either through a dialog (when [editMode](ui.iggridupdating#options:editMode) is 'dialog') or mimicking the look and feel of 'row' [editMode](ui.iggridupdating#options:editMode) (when [editMode](ui.iggridupdating#options:editMode) is 'row' or 'cell').
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridUpdating(optionLiteral: 'option', optionName: "enableAddRow", optionValue: boolean): void;
 
 	/**
 	 * Gets if the value of each editable column in the grid should be validated. The validation is done based on the rules of their corresponding editors.
+	 *
 	 */
 	igGridUpdating(optionLiteral: 'option', optionName: "validation"): boolean;
 
 	/**
 	 * Sets if the value of each editable column in the grid should be validated. The validation is done based on the rules of their corresponding editors.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridUpdating(optionLiteral: 'option', optionName: "validation", optionValue: boolean): void;
@@ -57022,30 +65629,35 @@ interface JQuery {
 
 	/**
 	 * Determines if the Done and Cancel buttons will be available as means to end edit mode for [editMode](ui.iggridupdating#options:editMode) 'row' and when adding a new row.
+	 *
 	 */
 	igGridUpdating(optionLiteral: 'option', optionName: "showDoneCancelButtons"): boolean;
 
 	/**
 	 * Determines if the Done and Cancel buttons will be available as means to end edit mode for [editMode](ui.iggridupdating#options:editMode) 'row' and when adding a new row.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridUpdating(optionLiteral: 'option', optionName: "showDoneCancelButtons", optionValue: boolean): void;
 
 	/**
 	 * Gets if an exception should be thrown when the grid's data view changes while there are pending transactions in the data source. The data view changes when the data source performs a sorting, filtering, groupby or paging operation and the exception thrown will prevent the operation from succeeding. All pending transactions must be committed before a data view operation is able to complete. Committing transactions can be done manually through the grid's [commit](ui.iggrid#methods:commit) function or automatically by setting [autoCommit](ui.iggrid#options:autoCommit) to 'true'.
+	 *
 	 */
 	igGridUpdating(optionLiteral: 'option', optionName: "enableDataDirtyException"): boolean;
 
 	/**
 	 * Sets if an exception should be thrown when the grid's data view changes while there are pending transactions in the data source. The data view changes when the data source performs a sorting, filtering, groupby or paging operation and the exception thrown will prevent the operation from succeeding. All pending transactions must be committed before a data view operation is able to complete. Committing transactions can be done manually through the grid's [commit](ui.iggrid#methods:commit) function or automatically by setting [autoCommit](ui.iggrid#options:autoCommit) to 'true'.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridUpdating(optionLiteral: 'option', optionName: "enableDataDirtyException", optionValue: boolean): void;
 
 	/**
 	 * Gets how end-users are able to start edit mode. Possible values: "click", "dblclick", "F2", "enter" and their combinations separated by coma or in array. The keyboard triggers have effect only if the grid cells can receive focus (the grid's [tabIndex](ui.iggrid#options:tabIndex) property should not have a negative value) or Selection is enabled. If "dblclick" is included, then "click" has no effect.
+	 *
 	 */
 
 	igGridUpdating(optionLiteral: 'option', optionName: "startEditTriggers"): string|Array<any>;
@@ -57053,6 +65665,7 @@ interface JQuery {
 	/**
 	 * Sets how end-users are able to start edit mode. Possible values: "click", "dblclick", "F2", "enter" and their combinations separated by coma or in array. The keyboard triggers have effect only if the grid cells can receive focus (the grid's [tabIndex](ui.iggrid#options:tabIndex) property should not have a negative value) or Selection is enabled. If "dblclick" is included, then "click" has no effect.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -57060,30 +65673,35 @@ interface JQuery {
 
 	/**
 	 * Determines if pressing Enter to navigate away from the currently edited cell should move the focus horizontally or vertically (default).
+	 *
 	 */
 	igGridUpdating(optionLiteral: 'option', optionName: "horizontalMoveOnEnter"): boolean;
 
 	/**
 	 * Determines if pressing Enter to navigate away from the currently edited cell should move the focus horizontally or vertically (default).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridUpdating(optionLiteral: 'option', optionName: "horizontalMoveOnEnter", optionValue: boolean): void;
 
 	/**
 	 * Enables excel navigation style. When turned on, the arrow keys can be used for changing the currently edited cell similar to how Tab and Enter behave. When disabled, the arrow keys control the cursor inside editors.
+	 *
 	 */
 	igGridUpdating(optionLiteral: 'option', optionName: "excelNavigationMode"): boolean;
 
 	/**
 	 * Enables excel navigation style. When turned on, the arrow keys can be used for changing the currently edited cell similar to how Tab and Enter behave. When disabled, the arrow keys control the cursor inside editors.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridUpdating(optionLiteral: 'option', optionName: "excelNavigationMode", optionValue: boolean): void;
 
 	/**
 	 * Sets a custom function to be called when the AJAX request to the URL specified by the [updateUrl](ui.iggrid#options:updateUrl) property succeeds. The function will be called with arguments representing the data returned by the server.
+	 *
 	 */
 
 	igGridUpdating(optionLiteral: 'option', optionName: "saveChangesSuccessHandler"): Function|string;
@@ -57091,6 +65709,7 @@ interface JQuery {
 	/**
 	 * Sets a custom function to be called when the AJAX request to the URL specified by the [updateUrl](ui.iggrid#options:updateUrl) property succeeds. The function will be called with arguments representing the data returned by the server.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -57098,6 +65717,7 @@ interface JQuery {
 
 	/**
 	 * Sets a custom function to be called when the AJAX request to the URL specified by the [updateUrl](ui.iggrid#options:updateUrl) property fails. The function will be called with arguments representing the data returned by the server.
+	 *
 	 */
 
 	igGridUpdating(optionLiteral: 'option', optionName: "saveChangesErrorHandler"): Function|string;
@@ -57105,6 +65725,7 @@ interface JQuery {
 	/**
 	 * Sets a custom function to be called when the AJAX request to the URL specified by the [updateUrl](ui.iggrid#options:updateUrl) property fails. The function will be called with arguments representing the data returned by the server.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -57112,6 +65733,7 @@ interface JQuery {
 
 	/**
 	 * On touch-enabled devices specifies the swipe distance for the delete button to appear.
+	 *
 	 */
 
 	igGridUpdating(optionLiteral: 'option', optionName: "swipeDistance"): string|number;
@@ -57119,6 +65741,7 @@ interface JQuery {
 	/**
 	 * On touch-enabled devices specifies the swipe distance for the delete button to appear.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -57126,36 +65749,42 @@ interface JQuery {
 
 	/**
 	 * Controls if navigation will wrap around the grid. The feature will never wrap around virtual grids.
+	 *
 	 */
 	igGridUpdating(optionLiteral: 'option', optionName: "wrapAround"): boolean;
 
 	/**
 	 * Controls if navigation will wrap around the grid. The feature will never wrap around virtual grids.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridUpdating(optionLiteral: 'option', optionName: "wrapAround", optionValue: boolean): void;
 
 	/**
 	 * A list of options controlling the rendering behavior of the row edit dialog. If [editMode](ui.iggridupdating#options:editMode) is not 'dialog' these have no effect.
+	 *
 	 */
 	igGridUpdating(optionLiteral: 'option', optionName: "rowEditDialogOptions"): IgGridUpdatingRowEditDialogOptions;
 
 	/**
 	 * A list of options controlling the rendering behavior of the row edit dialog. If [editMode](ui.iggridupdating#options:editMode) is not 'dialog' these have no effect.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridUpdating(optionLiteral: 'option', optionName: "rowEditDialogOptions", optionValue: IgGridUpdatingRowEditDialogOptions): void;
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog. For more information on how to utilize this property, please refer to the [Extending igGrid Modal Dialog](http://www.igniteui.com/help/extending-iggrid-modal-dialog) topic.
+	 *
 	 */
 	igGridUpdating(optionLiteral: 'option', optionName: "dialogWidget"): string;
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog. For more information on how to utilize this property, please refer to the [Extending igGrid Modal Dialog](http://www.igniteui.com/help/extending-iggrid-modal-dialog) topic.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igGridUpdating(optionLiteral: 'option', optionName: "dialogWidget", optionValue: string): void;
@@ -57496,54 +66125,82 @@ interface WorkspaceResizedEventUIParam {}
 interface IgHtmlEditor {
 	/**
 	 * Shows/hides the "Formatting" toolbar.
+	 *
 	 */
 	showFormattingToolbar?: boolean;
 
 	/**
 	 * Shows/hides the "Text" toolbar.
+	 *
 	 */
 	showTextToolbar?: boolean;
 
 	/**
 	 * Shows/hides the "Insert Object" toolbar.
+	 *
 	 */
 	showInsertObjectToolbar?: boolean;
 
 	/**
 	 * Shows/hides the "Copy Paste" toolbar.
+	 *
 	 */
 	showCopyPasteToolbar?: boolean;
 
 	/**
 	 * The width of the html editor. It can be set as a number in pixels, string (px) or percentage (%).
+	 *
 	 */
 	width?: string|number;
 
 	/**
 	 * The height of the html editor. It can be set as a number in pixels, string (px) or percentage (%).
+	 *
 	 */
 	height?: string|number;
 
 	/**
 	 * The html editor toolbars list.
+	 *
 	 */
 	toolbarSettings?: any[];
 
 	/**
 	 * The html editor custom toolbars list.
+	 *
 	 */
 	customToolbars?: any[];
 
 	/**
 	 * The name attribute of the html editor source view.
+	 *
 	 */
 	inputName?: string;
 
 	/**
 	 * Used to render inside the html editor as initial content
+	 *
 	 */
 	value?: string;
 
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	locale?: any;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	language?: string;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+	regional?: string|Object;
+
 	/**
 	 * Event fired after the html editor widget has been rendered.
 	 */
@@ -57624,6 +66281,11 @@ interface IgHtmlEditorMethods {
 	 * Returns the element on which the widget was instantiated
 	 */
 	widget(): void;
+
+	/**
+	 * Changes the all locales into the widget element to the language specified in [options.language](ui.ightmleditor#options:language)
+	 *             Note that this method is for rare scenarios, use [language](ui.ightmleditor#options:language) or [locale](ui.ightmleditor#options:locale) option setter
+	 */
 	changeLocale(): void;
 
 	/**
@@ -57695,6 +66357,16 @@ interface IgHtmlEditorMethods {
 	 * @param element Accepts html string, DOM element or a jQuery object.
 	 */
 	insertAtCaret(element: Object): void;
+
+	/**
+	 * Changes the widget language to global language. Global language is the value in $.ig.util.language
+	 */
+	changeGlobalLanguage(): void;
+
+	/**
+	 * Changes the widget regional settins to global regional settings. Global regional settings are container in $.ig.util.regional
+	 */
+	changeGlobalRegional(): void;
 }
 interface JQuery {
 	data(propertyName: "igHtmlEditor"): IgHtmlEditorMethods;
@@ -57737,6 +66409,24 @@ interface IgHtmlEditorPopover {
 	item?: any;
 	target?: any;
 	isHidden?: boolean;
+
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	locale?: any;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	language?: string;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+	regional?: string|Object;
 	apply?: ApplyEvent;
 	cancel?: CancelEvent;
 	show?: ShowEvent;
@@ -57750,6 +66440,32 @@ interface IgHtmlEditorPopover {
 interface IgHtmlEditorPopoverMethods {
 	show(item: Object): void;
 	hide(): void;
+
+	/**
+	 * Changes the all locales contained into a specified container to the language specified in [options.language](ui.igwidget#options:language)
+	 * Note that this method is for rare scenarios, use [language](ui.igwidget#options:language) or [locale](ui.igwidget#options:locale) option setter
+	 *
+	 * @param $container Optional parameter - if not set it would use the element of the widget as $container
+	 */
+	changeLocale($container: Object): void;
+
+	/**
+	 * Changes the widget language to global language. Global language is the value in $.ig.util.language
+	 */
+	changeGlobalLanguage(): void;
+
+	/**
+	 * Changes the widget regional settins to global regional settings. Global regional settings are container in $.ig.util.regional
+	 */
+	changeGlobalRegional(): void;
+
+	/**
+	 * Destroy is part of the jQuery UI widget API and does the following:
+	 * 1. Remove custom CSS classes that were added.
+	 * 2. Unwrap any wrapping elements such as scrolling divs and other containers.
+	 * 3. Unbind all events that were bound.
+	 */
+	destroy(): void;
 }
 interface JQuery {
 	data(propertyName: "igHtmlEditorPopover"): IgHtmlEditorPopoverMethods;
@@ -57759,6 +66475,24 @@ interface IgLinkPropertiesDialog {
 	item?: any;
 	target?: any;
 	isHidden?: boolean;
+
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	locale?: any;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	language?: string;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+	regional?: string|Object;
 	apply?: ApplyEvent;
 	cancel?: CancelEvent;
 	show?: ShowEvent;
@@ -57781,6 +66515,24 @@ interface IgTablePropertiesDialog {
 	item?: any;
 	target?: any;
 	isHidden?: boolean;
+
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	locale?: any;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	language?: string;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+	regional?: string|Object;
 	apply?: ApplyEvent;
 	cancel?: CancelEvent;
 	show?: ShowEvent;
@@ -57803,6 +66555,24 @@ interface IgImagePropertiesDialog {
 	item?: any;
 	target?: any;
 	isHidden?: boolean;
+
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	locale?: any;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	language?: string;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+	regional?: string|Object;
 	apply?: ApplyEvent;
 	cancel?: CancelEvent;
 	show?: ShowEvent;
@@ -57859,57 +66629,68 @@ interface JQuery {
 	igHtmlEditor(methodName: "selection"): Object;
 	igHtmlEditor(methodName: "range"): Object;
 	igHtmlEditor(methodName: "insertAtCaret", element: Object): void;
+	igHtmlEditor(methodName: "changeGlobalLanguage"): void;
+	igHtmlEditor(methodName: "changeGlobalRegional"): void;
 
 	/**
 	 * Shows/hides the "Formatting" toolbar.
+	 *
 	 */
 	igHtmlEditor(optionLiteral: 'option', optionName: "showFormattingToolbar"): boolean;
 
 	/**
 	 * Shows/hides the "Formatting" toolbar.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHtmlEditor(optionLiteral: 'option', optionName: "showFormattingToolbar", optionValue: boolean): void;
 
 	/**
 	 * Shows/hides the "Text" toolbar.
+	 *
 	 */
 	igHtmlEditor(optionLiteral: 'option', optionName: "showTextToolbar"): boolean;
 
 	/**
 	 * Shows/hides the "Text" toolbar.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHtmlEditor(optionLiteral: 'option', optionName: "showTextToolbar", optionValue: boolean): void;
 
 	/**
 	 * Shows/hides the "Insert Object" toolbar.
+	 *
 	 */
 	igHtmlEditor(optionLiteral: 'option', optionName: "showInsertObjectToolbar"): boolean;
 
 	/**
 	 * Shows/hides the "Insert Object" toolbar.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHtmlEditor(optionLiteral: 'option', optionName: "showInsertObjectToolbar", optionValue: boolean): void;
 
 	/**
 	 * Shows/hides the "Copy Paste" toolbar.
+	 *
 	 */
 	igHtmlEditor(optionLiteral: 'option', optionName: "showCopyPasteToolbar"): boolean;
 
 	/**
 	 * Shows/hides the "Copy Paste" toolbar.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHtmlEditor(optionLiteral: 'option', optionName: "showCopyPasteToolbar", optionValue: boolean): void;
 
 	/**
 	 * The width of the html editor. It can be set as a number in pixels, string (px) or percentage (%).
+	 *
 	 */
 
 	igHtmlEditor(optionLiteral: 'option', optionName: "width"): string|number;
@@ -57917,6 +66698,7 @@ interface JQuery {
 	/**
 	 * The width of the html editor. It can be set as a number in pixels, string (px) or percentage (%).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -57924,6 +66706,7 @@ interface JQuery {
 
 	/**
 	 * The height of the html editor. It can be set as a number in pixels, string (px) or percentage (%).
+	 *
 	 */
 
 	igHtmlEditor(optionLiteral: 'option', optionName: "height"): string|number;
@@ -57931,6 +66714,7 @@ interface JQuery {
 	/**
 	 * The height of the html editor. It can be set as a number in pixels, string (px) or percentage (%).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -57938,52 +66722,104 @@ interface JQuery {
 
 	/**
 	 * The html editor toolbars list.
+	 *
 	 */
 	igHtmlEditor(optionLiteral: 'option', optionName: "toolbarSettings"): any[];
 
 	/**
 	 * The html editor toolbars list.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHtmlEditor(optionLiteral: 'option', optionName: "toolbarSettings", optionValue: any[]): void;
 
 	/**
 	 * The html editor custom toolbars list.
+	 *
 	 */
 	igHtmlEditor(optionLiteral: 'option', optionName: "customToolbars"): any[];
 
 	/**
 	 * The html editor custom toolbars list.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHtmlEditor(optionLiteral: 'option', optionName: "customToolbars", optionValue: any[]): void;
 
 	/**
 	 * The name attribute of the html editor source view.
+	 *
 	 */
 	igHtmlEditor(optionLiteral: 'option', optionName: "inputName"): string;
 
 	/**
 	 * The name attribute of the html editor source view.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHtmlEditor(optionLiteral: 'option', optionName: "inputName", optionValue: string): void;
 
 	/**
 	 * Used to render inside the html editor as initial content
+	 *
 	 */
 	igHtmlEditor(optionLiteral: 'option', optionName: "value"): string;
 
 	/**
 	 * Used to render inside the html editor as initial content
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igHtmlEditor(optionLiteral: 'option', optionName: "value", optionValue: string): void;
 
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	igHtmlEditor(optionLiteral: 'option', optionName: "locale"): any;
+
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igHtmlEditor(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	igHtmlEditor(optionLiteral: 'option', optionName: "language"): string;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igHtmlEditor(optionLiteral: 'option', optionName: "language", optionValue: string): void;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+
+	igHtmlEditor(optionLiteral: 'option', optionName: "regional"): string|Object;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igHtmlEditor(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
+
 	/**
 	 * Event fired after the html editor widget has been rendered.
 	 */
@@ -58169,12 +67005,60 @@ interface JQuery {
 interface JQuery {
 	igHtmlEditorPopover(methodName: "show", item: Object): void;
 	igHtmlEditorPopover(methodName: "hide"): void;
+	igHtmlEditorPopover(methodName: "changeLocale", $container: Object): void;
+	igHtmlEditorPopover(methodName: "changeGlobalLanguage"): void;
+	igHtmlEditorPopover(methodName: "changeGlobalRegional"): void;
+	igHtmlEditorPopover(methodName: "destroy"): void;
 	igHtmlEditorPopover(optionLiteral: 'option', optionName: "item"): any;
 	igHtmlEditorPopover(optionLiteral: 'option', optionName: "item", optionValue: any): void;
 	igHtmlEditorPopover(optionLiteral: 'option', optionName: "target"): any;
 	igHtmlEditorPopover(optionLiteral: 'option', optionName: "target", optionValue: any): void;
 	igHtmlEditorPopover(optionLiteral: 'option', optionName: "isHidden"): boolean;
 	igHtmlEditorPopover(optionLiteral: 'option', optionName: "isHidden", optionValue: boolean): void;
+
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	igHtmlEditorPopover(optionLiteral: 'option', optionName: "locale"): any;
+
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igHtmlEditorPopover(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	igHtmlEditorPopover(optionLiteral: 'option', optionName: "language"): string;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igHtmlEditorPopover(optionLiteral: 'option', optionName: "language", optionValue: string): void;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+
+	igHtmlEditorPopover(optionLiteral: 'option', optionName: "regional"): string|Object;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igHtmlEditorPopover(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
 	igHtmlEditorPopover(optionLiteral: 'option', optionName: "apply"): ApplyEvent;
 	igHtmlEditorPopover(optionLiteral: 'option', optionName: "apply", optionValue: ApplyEvent): void;
 	igHtmlEditorPopover(optionLiteral: 'option', optionName: "cancel"): CancelEvent;
@@ -58198,6 +67082,50 @@ interface JQuery {
 	igLinkPropertiesDialog(optionLiteral: 'option', optionName: "target", optionValue: any): void;
 	igLinkPropertiesDialog(optionLiteral: 'option', optionName: "isHidden"): boolean;
 	igLinkPropertiesDialog(optionLiteral: 'option', optionName: "isHidden", optionValue: boolean): void;
+
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	igLinkPropertiesDialog(optionLiteral: 'option', optionName: "locale"): any;
+
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igLinkPropertiesDialog(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	igLinkPropertiesDialog(optionLiteral: 'option', optionName: "language"): string;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igLinkPropertiesDialog(optionLiteral: 'option', optionName: "language", optionValue: string): void;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+
+	igLinkPropertiesDialog(optionLiteral: 'option', optionName: "regional"): string|Object;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igLinkPropertiesDialog(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
 	igLinkPropertiesDialog(optionLiteral: 'option', optionName: "apply"): ApplyEvent;
 	igLinkPropertiesDialog(optionLiteral: 'option', optionName: "apply", optionValue: ApplyEvent): void;
 	igLinkPropertiesDialog(optionLiteral: 'option', optionName: "cancel"): CancelEvent;
@@ -58221,6 +67149,50 @@ interface JQuery {
 	igTablePropertiesDialog(optionLiteral: 'option', optionName: "target", optionValue: any): void;
 	igTablePropertiesDialog(optionLiteral: 'option', optionName: "isHidden"): boolean;
 	igTablePropertiesDialog(optionLiteral: 'option', optionName: "isHidden", optionValue: boolean): void;
+
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	igTablePropertiesDialog(optionLiteral: 'option', optionName: "locale"): any;
+
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTablePropertiesDialog(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	igTablePropertiesDialog(optionLiteral: 'option', optionName: "language"): string;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTablePropertiesDialog(optionLiteral: 'option', optionName: "language", optionValue: string): void;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+
+	igTablePropertiesDialog(optionLiteral: 'option', optionName: "regional"): string|Object;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igTablePropertiesDialog(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
 	igTablePropertiesDialog(optionLiteral: 'option', optionName: "apply"): ApplyEvent;
 	igTablePropertiesDialog(optionLiteral: 'option', optionName: "apply", optionValue: ApplyEvent): void;
 	igTablePropertiesDialog(optionLiteral: 'option', optionName: "cancel"): CancelEvent;
@@ -58244,6 +67216,50 @@ interface JQuery {
 	igImagePropertiesDialog(optionLiteral: 'option', optionName: "target", optionValue: any): void;
 	igImagePropertiesDialog(optionLiteral: 'option', optionName: "isHidden"): boolean;
 	igImagePropertiesDialog(optionLiteral: 'option', optionName: "isHidden", optionValue: boolean): void;
+
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	igImagePropertiesDialog(optionLiteral: 'option', optionName: "locale"): any;
+
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igImagePropertiesDialog(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	igImagePropertiesDialog(optionLiteral: 'option', optionName: "language"): string;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igImagePropertiesDialog(optionLiteral: 'option', optionName: "language", optionValue: string): void;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+
+	igImagePropertiesDialog(optionLiteral: 'option', optionName: "regional"): string|Object;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igImagePropertiesDialog(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
 	igImagePropertiesDialog(optionLiteral: 'option', optionName: "apply"): ApplyEvent;
 	igImagePropertiesDialog(optionLiteral: 'option', optionName: "apply", optionValue: ApplyEvent): void;
 	igImagePropertiesDialog(optionLiteral: 'option', optionName: "cancel"): CancelEvent;
@@ -58261,31 +67277,37 @@ interface JQuery {
 interface IgLayoutManagerBorderLayout {
 	/**
 	 * Option specifying the width of the left region, either in px or percentages
+	 *
 	 */
 	leftWidth?: string;
 
 	/**
 	 * Option specifying the width of the right region, either in px or percentages
+	 *
 	 */
 	rightWidth?: string;
 
 	/**
 	 * Option specifying whether the footer region in the border layout will be hidden or shown
+	 *
 	 */
 	showFooter?: boolean;
 
 	/**
 	 * Option specifying whether the header region in the border layout will be hidden or shown
+	 *
 	 */
 	showHeader?: boolean;
 
 	/**
 	 * Option specifying whether the left region in the border layout will be hidden or shown
+	 *
 	 */
 	showLeft?: boolean;
 
 	/**
 	 * Option specifying whether the right region in the border layout will be hidden or shown
+	 *
 	 */
 	showRight?: boolean;
 
@@ -58298,11 +67320,13 @@ interface IgLayoutManagerBorderLayout {
 interface IgLayoutManagerGridLayout {
 	/**
 	 * Specifies the duration of the animations in the layout manager"s grid layout
+	 *
 	 */
 	animationDuration?: number;
 
 	/**
 	 * Number of columns in the grid
+	 *
 	 */
 	cols?: number;
 
@@ -58311,6 +67335,7 @@ interface IgLayoutManagerGridLayout {
 	 *                         It can also accept an array, specifying height for each column. If more than one column
 	 *                         has an asterisk value, the remaining height will be equally distributed between these columns.
 	 *                     array The column height can be set as an array of heights.
+	 *
 	 */
 	columnHeight?: string|number|Array<any>;
 
@@ -58319,32 +67344,38 @@ interface IgLayoutManagerGridLayout {
 	 *                         It can also accept an array, specifying width for each column. If more than one column
 	 *                         has an asterisk value, the remaining width will be equally distributed between these columns.
 	 *                     array The column width can be set as an array of widths.
+	 *
 	 */
 	columnWidth?: string|number|Array<any>;
 
 	/**
 	 * Specifies the margin left css property for items
+	 *
 	 */
 	marginLeft?: number;
 
 	/**
 	 * Specifies the margin top css property for items
+	 *
 	 */
 	marginTop?: number;
 
 	/**
 	 * Specifies whether the previous set options should be overriden when setting options
+	 *
 	 */
 	overrideConfigOnSetOption?: boolean;
 
 	/**
 	 * Specified whether the items should rearrange to fit in the container when it is resized.
 	 *                         Have effect only when fixed columnWidth option is set.
+	 *
 	 */
 	rearrangeItems?: boolean;
 
 	/**
 	 * Number of rows in the grid
+	 *
 	 */
 	rows?: number;
 
@@ -58357,33 +67388,39 @@ interface IgLayoutManagerGridLayout {
 interface IgLayoutManagerItem {
 	/**
 	 * Column index of the item in the grid
+	 *
 	 */
 	colIndex?: number;
 
 	/**
 	 * ColSpan of the item
+	 *
 	 */
 	colSpan?: number;
 
 	/**
 	 * Gets/Sets individual item height, either in px or percentage
 	 *                         string The default height can be set in pixels (px), %, em and other units.
+	 *
 	 */
 	height?: string;
 
 	/**
 	 * Row index of the item in the grid
+	 *
 	 */
 	rowIndex?: number;
 
 	/**
 	 * RowSpan of the item
+	 *
 	 */
 	rowSpan?: number;
 
 	/**
 	 * Gets/Sets individual item width, either in px or percentage
 	 *                         string The default width can be set in pixels (px), %, em and other units.
+	 *
 	 */
 	width?: number;
 
@@ -58470,21 +67507,25 @@ interface ItemRenderingEventUIParam {
 interface IgLayoutManager {
 	/**
 	 * Options specific to a border layout
+	 *
 	 */
 	borderLayout?: IgLayoutManagerBorderLayout;
 
 	/**
 	 * Options specific to grid layout mode
+	 *
 	 */
 	gridLayout?: IgLayoutManagerGridLayout;
 
 	/**
 	 * Gets/Sets height of the layout container.
+	 *
 	 */
 	height?: string|number;
 
 	/**
 	 * Number of items to render, this is only applicable to layouts: vertical and flow
+	 *
 	 */
 	itemCount?: number;
 
@@ -58496,6 +67537,7 @@ interface IgLayoutManager {
 	 *                     items can have various properties some of which may not be applicable
 	 *                     depending on the layoutMode.
 	 *                     for example rowSpan/colSpan/colIndex/rowIndex are only applicable to gridlayout
+	 *
 	 */
 	items?: IgLayoutManagerItem[];
 
@@ -58507,6 +67549,7 @@ interface IgLayoutManager {
 	 *                 column Column type can be set with column layout
 	 *                 vertical Column type can be set with vertical layout
 	 *
+	 *
 	 * Valid values:
 	 * "grid"
 	 * "border"
@@ -58518,6 +67561,7 @@ interface IgLayoutManager {
 
 	/**
 	 * Gets/Sets width of the layout container.
+	 *
 	 */
 	width?: string|number;
 
@@ -58594,30 +67638,35 @@ interface JQuery {
 
 	/**
 	 * Options specific to a border layout
+	 *
 	 */
 	igLayoutManager(optionLiteral: 'option', optionName: "borderLayout"): IgLayoutManagerBorderLayout;
 
 	/**
 	 * Options specific to a border layout
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igLayoutManager(optionLiteral: 'option', optionName: "borderLayout", optionValue: IgLayoutManagerBorderLayout): void;
 
 	/**
 	 * Options specific to grid layout mode
+	 *
 	 */
 	igLayoutManager(optionLiteral: 'option', optionName: "gridLayout"): IgLayoutManagerGridLayout;
 
 	/**
 	 * Options specific to grid layout mode
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igLayoutManager(optionLiteral: 'option', optionName: "gridLayout", optionValue: IgLayoutManagerGridLayout): void;
 
 	/**
 	 * Gets/Sets height of the layout container.
+	 *
 	 */
 
 	igLayoutManager(optionLiteral: 'option', optionName: "height"): string|number;
@@ -58625,6 +67674,7 @@ interface JQuery {
 	/**
 	 * /Sets height of the layout container.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -58632,12 +67682,14 @@ interface JQuery {
 
 	/**
 	 * Number of items to render, this is only applicable to layouts: vertical and flow
+	 *
 	 */
 	igLayoutManager(optionLiteral: 'option', optionName: "itemCount"): number;
 
 	/**
 	 * Number of items to render, this is only applicable to layouts: vertical and flow
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igLayoutManager(optionLiteral: 'option', optionName: "itemCount", optionValue: number): void;
@@ -58650,6 +67702,7 @@ interface JQuery {
 	 *                     items can have various properties some of which may not be applicable
 	 *                     depending on the layoutMode.
 	 *                     for example rowSpan/colSpan/colIndex/rowIndex are only applicable to gridlayout
+	 *
 	 */
 	igLayoutManager(optionLiteral: 'option', optionName: "items"): IgLayoutManagerItem[];
 
@@ -58662,6 +67715,7 @@ interface JQuery {
 	 *                     depending on the layoutMode.
 	 *                     for example rowSpan/colSpan/colIndex/rowIndex are only applicable to gridlayout
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igLayoutManager(optionLiteral: 'option', optionName: "items", optionValue: IgLayoutManagerItem[]): void;
@@ -58673,6 +67727,7 @@ interface JQuery {
 	 *                 flow Column type can be set with flow layout
 	 *                 column Column type can be set with column layout
 	 *                 vertical Column type can be set with vertical layout
+	 *
 	 */
 	igLayoutManager(optionLiteral: 'option', optionName: "layoutMode"): any;
 
@@ -58684,12 +67739,14 @@ interface JQuery {
 	 *                 column Column type can be set with column layout
 	 *                 vertical Column type can be set with vertical layout
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igLayoutManager(optionLiteral: 'option', optionName: "layoutMode", optionValue: any): void;
 
 	/**
 	 * Gets/Sets width of the layout container.
+	 *
 	 */
 
 	igLayoutManager(optionLiteral: 'option', optionName: "width"): string|number;
@@ -58697,6 +67754,7 @@ interface JQuery {
 	/**
 	 * /Sets width of the layout container.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -59201,6 +68259,24 @@ interface IgLinearGauge {
 	 */
 	pixelScalingRatio?: number;
 
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	locale?: any;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	language?: string;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+	regional?: string|Object;
+
 	/**
 	 * Event which is raised when a label of the the gauge is formatted.
 	 * Function takes first argument evt and second argument ui.
@@ -59266,6 +68342,9 @@ interface IgLinearGaugeMethods {
 
 	/**
 	 * Gets the value for the main scale of the gauge for a given point within the bounds of the gauge.
+	 *
+	 * @param x
+	 * @param y
 	 */
 	getValueForPoint(x: Object, y: Object): number;
 
@@ -59296,6 +68375,24 @@ interface IgLinearGaugeMethods {
 	 * Re-polls the css styles for the widget. Use this method when the css styles have been modified.
 	 */
 	styleUpdated(): void;
+
+	/**
+	 * Changes the all locales contained into a specified container to the language specified in [options.language](ui.igwidget#options:language)
+	 * Note that this method is for rare scenarios, use [language](ui.igwidget#options:language) or [locale](ui.igwidget#options:locale) option setter
+	 *
+	 * @param $container Optional parameter - if not set it would use the element of the widget as $container
+	 */
+	changeLocale($container: Object): void;
+
+	/**
+	 * Changes the widget language to global language. Global language is the value in $.ig.util.language
+	 */
+	changeGlobalLanguage(): void;
+
+	/**
+	 * Changes the widget regional settins to global regional settings. Global regional settings are container in $.ig.util.regional
+	 */
+	changeGlobalRegional(): void;
 }
 interface JQuery {
 	data(propertyName: "igLinearGauge"): IgLinearGaugeMethods;
@@ -59312,6 +68409,9 @@ interface JQuery {
 	igLinearGauge(methodName: "flush"): void;
 	igLinearGauge(methodName: "destroy"): void;
 	igLinearGauge(methodName: "styleUpdated"): void;
+	igLinearGauge(methodName: "changeLocale", $container: Object): void;
+	igLinearGauge(methodName: "changeGlobalLanguage"): void;
+	igLinearGauge(methodName: "changeGlobalRegional"): void;
 
 	/**
 	 * The width of the gauge. It can be set as a number in pixels, string (px) or percentage (%).
@@ -60113,6 +69213,50 @@ interface JQuery {
 	 */
 	igLinearGauge(optionLiteral: 'option', optionName: "pixelScalingRatio", optionValue: number): void;
 
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	igLinearGauge(optionLiteral: 'option', optionName: "locale"): any;
+
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igLinearGauge(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	igLinearGauge(optionLiteral: 'option', optionName: "language"): string;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igLinearGauge(optionLiteral: 'option', optionName: "language", optionValue: string): void;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+
+	igLinearGauge(optionLiteral: 'option', optionName: "regional"): string|Object;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igLinearGauge(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
+
 	/**
 	 * Event which is raised when a label of the the gauge is formatted.
 	 * Function takes first argument evt and second argument ui.
@@ -60438,6 +69582,7 @@ interface IgMapSeries {
 	/**
 	 * Gets or sets the marker type for the current series object.If the MarkerTemplate property is set, the setting of the MarkerType property will be ignored.
 	 *
+	 *
 	 * Valid values:
 	 * "unset"
 	 * "none"
@@ -60879,6 +70024,7 @@ interface IgMap {
 	/**
 	 * The response to user panning and zooming: whether to update the view immediately while the user action is happening, or to defer the update to after the user action is complete.  The user action will be an action such as a mouse drag which causes panning and/or zooming to occur.
 	 *
+	 *
 	 * Valid values:
 	 * "deferred" Defer the view update until after the user action is complete.
 	 * "immediate" Update the view immediately while the user action is happening.
@@ -61019,6 +70165,24 @@ interface IgMap {
 	 */
 	theme?: string;
 
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	locale?: any;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	language?: string;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+	regional?: string|Object;
+
 	/**
 	 * Event fired when the mouse has hovered on a series and the tooltip is about to show
 	 * Function takes arguments evt and ui.
@@ -61358,11 +70522,15 @@ interface IgMapMethods {
 
 	/**
 	 * Gets the actual minimum value of the target xAxis or yAxis
+	 *
+	 * @param targetName
 	 */
 	getActualMinimumValue(targetName: Object): void;
 
 	/**
 	 * Gets the actual maximum value of the target xAxis or yAxis
+	 *
+	 * @param targetName
 	 */
 	getActualMaximumValue(targetName: Object): void;
 
@@ -61404,147 +70572,29 @@ interface IgMapMethods {
 	 * @param animate Whether the change should be animated, if possible.
 	 */
 	renderSeries(targetName: string, animate: boolean): void;
+
+	/**
+	 * Changes the all locales contained into a specified container to the language specified in [options.language](ui.igwidget#options:language)
+	 * Note that this method is for rare scenarios, use [language](ui.igwidget#options:language) or [locale](ui.igwidget#options:locale) option setter
+	 *
+	 * @param $container Optional parameter - if not set it would use the element of the widget as $container
+	 */
+	changeLocale($container: Object): void;
+
+	/**
+	 * Changes the widget language to global language. Global language is the value in $.ig.util.language
+	 */
+	changeGlobalLanguage(): void;
+
+	/**
+	 * Changes the widget regional settins to global regional settings. Global regional settings are container in $.ig.util.regional
+	 */
+	changeGlobalRegional(): void;
 }
 interface JQuery {
 	data(propertyName: "igMap"): IgMapMethods;
 }
 
-interface ShapeDataSourceSettings {
-	/**
-	 * The unique identifier.
-	 */
-	id?: string;
-
-	/**
-	 * The Uri of the .shp portion of the Shapefile.
-	 */
-	shapefileSource?: string;
-
-	/**
-	 * The Uri of the .dbf portion of the Shapefile.
-	 */
-	databaseSource?: string;
-
-	/**
-	 * Callback function to call when data binding is complete.
-	 */
-	callback?: Function;
-
-	/**
-	 * Object on which to invoke the callback function.
-	 */
-	callee?: any;
-
-	/**
-	 * Callback function to call to allow shape records to be transformed.
-	 * paramType="object" the shape record to be transformed.
-	 */
-	transformRecord?: Function;
-
-	/**
-	 * Callback function to call to allow points in the shape records to be transformed.
-	 * paramType="object" the point to be transformed in place. The object will look like { x: value, y: value2 }
-	 */
-	transformPoint?: Function;
-
-	/**
-	 * Callback function to call to allow the bounds of the shape data source to be transformed.
-	 * paramType="object" the bounds of the shape datasource to be transformed in place. The object will look like { top: value, left: value, width: value, height: value }
-	 */
-	transformBounds?: Function;
-
-	/**
-	 * Callback function to call when the import process has been completed
-	 * paramType="object" the ShapeDataSource instance
-	 */
-	importCompleted?: Function;
-
-	/**
-	 * Option for ShapeDataSourceSettings
-	 */
-	[optionName: string]: any;
-}
-
-declare namespace Infragistics {
-class ShapeDataSource {
-	constructor(settings: ShapeDataSourceSettings);
-
-	/**
-	 * Loads to the current data source
-	 */
-	dataBind(): void;
-
-	/**
-	 * Returns true if data is loaded
-	 */
-	isBound(): boolean;
-
-	/**
-	 * Returns the current converter instance
-	 */
-	converter(): Object;
-}
-}
-interface IgniteUIStatic {
-ShapeDataSource: typeof Infragistics.ShapeDataSource;
-}
-
-interface TriangulationDataSourceSettings {
-	/**
-	 * The unique identifier.
-	 */
-	id?: string;
-
-	/**
-	 * A Uri specifying the location of the Itf file.
-	 */
-	source?: string;
-
-	/**
-	 * The TriangulationSource which is typically created after importing the Itf from the Source Uri.
-	 */
-	triangulationSource?: string;
-
-	/**
-	 * Callback function to call when data binding is complete
-	 */
-	callback?: Function;
-
-	/**
-	 * Object on which to invoke the callback function
-	 */
-	callee?: any;
-
-	/**
-	 * Option for TriangulationDataSourceSettings
-	 */
-	[optionName: string]: any;
-}
-
-declare namespace Infragistics {
-class TriangulationDataSource {
-	constructor(settings: TriangulationDataSourceSettings);
-
-	/**
-	 * Loads to the current data source
-	 */
-	dataBind(): void;
-
-	/**
-	 * Returns true if data is loaded
-	 */
-	isBound(): boolean;
-
-	/**
-	 * Returns the current converter instance
-	 */
-	converter(): Object;
-}
-}
-interface IgniteUIStatic {
-TriangulationDataSource: typeof Infragistics.TriangulationDataSource;
-}
-
 interface JQuery {
 	igMap(methodName: "option"): void;
 	igMap(methodName: "destroy"): void;
@@ -61576,6 +70626,9 @@ interface JQuery {
 	igMap(methodName: "getZoomFromGeographic", rect: Object): Object;
 	igMap(methodName: "print"): void;
 	igMap(methodName: "renderSeries", targetName: string, animate: boolean): void;
+	igMap(methodName: "changeLocale", $container: Object): void;
+	igMap(methodName: "changeGlobalLanguage"): void;
+	igMap(methodName: "changeGlobalRegional"): void;
 
 	/**
 	 * The width of the map. It can be set as a number in pixels, string (px) or percentage (%).
@@ -61821,6 +70874,7 @@ interface JQuery {
 
 	/**
 	 * The response to user panning and zooming: whether to update the view immediately while the user action is happening, or to defer the update to after the user action is complete.  The user action will be an action such as a mouse drag which causes panning and/or zooming to occur.
+	 *
 	 */
 
 	igMap(optionLiteral: 'option', optionName: "windowResponse"): string;
@@ -61828,6 +70882,7 @@ interface JQuery {
 	/**
 	 * The response to user panning and zooming: whether to update the view immediately while the user action is happening, or to defer the update to after the user action is complete.  The user action will be an action such as a mouse drag which causes panning and/or zooming to occur.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -62141,6 +71196,50 @@ interface JQuery {
 	 */
 	igMap(optionLiteral: 'option', optionName: "theme", optionValue: string): void;
 
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	igMap(optionLiteral: 'option', optionName: "locale"): any;
+
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igMap(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	igMap(optionLiteral: 'option', optionName: "language"): string;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igMap(optionLiteral: 'option', optionName: "language", optionValue: string): void;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+
+	igMap(optionLiteral: 'option', optionName: "regional"): string|Object;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igMap(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
+
 	/**
 	 * Event fired when the mouse has hovered on a series and the tooltip is about to show
 	 * Function takes arguments evt and ui.
@@ -62535,11 +71634,13 @@ interface JQuery {
 interface IgNotifierHeaderTemplate {
 	/**
 	 * Controls whether the popover renders a functional close button
+	 *
 	 */
 	closeButton?: boolean;
 
 	/**
 	 * Sets the content for the popover header.
+	 *
 	 */
 	title?: string;
 
@@ -62553,6 +71654,7 @@ interface IgNotifier {
 	/**
 	 * Gets/Sets the current state of the igNotifier messages. State controls what CSS classes are applied to the messages and target and has interactions with other options as well.
 	 *
+	 *
 	 * Valid values:
 	 * "success" Messages and target CSS have success styles applied.
 	 * "info" Messages have info applied. Target is unaffected.
@@ -62564,6 +71666,7 @@ interface IgNotifier {
 	/**
 	 * Controls the level of notifications shown by automatic and manual messages using the [notify](ui.ignotifier#methods:notify) method. Use [show](ui.ignotifier#methods:show) to ignore the level.
 	 *
+	 *
 	 * Valid values:
 	 * "success" Show all types of messages
 	 * "info" Show everything from info level messages up
@@ -62575,6 +71678,7 @@ interface IgNotifier {
 	/**
 	 * Controls where the popover DOM should be attached to (only applies to popovers).
 	 *
+	 *
 	 * Valid values:
 	 * "string" A valid jQuery selector for the element
 	 * "object" A reference to the parent jQuery object
@@ -62584,6 +71688,7 @@ interface IgNotifier {
 	/**
 	 * Controls the positioning mode of messages. Setting a mode will override the default behavior which is auto.Note: Inline element uses a block container as is always placed after the target.
 	 *
+	 *
 	 * Valid values:
 	 * "auto" Uses popover for info and warning messages and inline for errors and success.
 	 * "popover" Displays messages in a configurable popover.
@@ -62593,17 +71698,20 @@ interface IgNotifier {
 
 	/**
 	 * Allows setting the respective state CSS on the target element (used to apply border color by default)
+	 *
 	 */
 	allowCSSOnTarget?: boolean;
 
 	/**
 	 * Allows rendering a span with the respective state CSS to display jQuery UI framework icons
+	 *
 	 */
 	showIcon?: boolean;
 
 	/**
 	 * Gets/Sets the content for the popover container. Templated with parameters by default: {0} - icon container class, {1} - the icon class and {2} - message text.
 	 *
+	 *
 	 * Valid values:
 	 * "string" String content of the popover container
 	 * "function" Function which is a callback that should return the content. Use the 'this' value to access the target DOM element and passed argument for state value. Result can also include the same template parametes.
@@ -62612,12 +71720,14 @@ interface IgNotifier {
 
 	/**
 	 * Sets the content for the popover header
+	 *
 	 */
 	headerTemplate?: IgNotifierHeaderTemplate;
 
 	/**
 	 * Sets the event on which the notification will be shown. Predefined values are "mouseenter", "click" and "focus"
 	 *
+	 *
 	 * Valid values:
 	 * "mouseenter" The popover is shown on mouse enter in the target element
 	 * "click" The popover is shown on click on the target element
@@ -62628,16 +71738,19 @@ interface IgNotifier {
 
 	/**
 	 * Controls whether the popover will close on blur or not. This option has effect only when the corresponding [showOn](ui.ignotifier#options:showOn) is set (manual by default)
+	 *
 	 */
 	closeOnBlur?: boolean;
 
 	/**
 	 * Gets/Sets the time in milliseconds the notification fades in and out when showing/hiding
+	 *
 	 */
 	animationDuration?: number;
 
 	/**
 	 * Gets/Sets the distance in pixels a notification popover slides outwards as it's shown.
+	 *
 	 */
 	animationSlideDistance?: number;
 
@@ -62649,6 +71762,7 @@ interface IgNotifier {
 	/**
 	 * controls the direction in which the control shows relative to the target element
 	 *
+	 *
 	 * Valid values:
 	 * "auto" lets the control show on the side where enough space is available with the priority specified by the [directionPriority](ui.%%WidgetNameLowered%%#options:directionPriority) property
 	 * "left" shows popover on the left side of the target element
@@ -62661,12 +71775,14 @@ interface IgNotifier {
 	/**
 	 * Controls the priority in which the control searches for space to show relative to the target element.
 	 * This property has effect only if the [direction](ui.%%WidgetNameLowered%%#options:direction) property value is "auto" or unset.
+	 *
 	 */
 	directionPriority?: any[];
 
 	/**
 	 * controls the position of the popover according to the target element in case the popover is larger than the target on the side we want to position, if the popover is smaller it should always be in the middle of the visible area
 	 *
+	 *
 	 * Valid values:
 	 * "auto" lets the control choose a position depending on available space with the following priority balanced > end > start
 	 * "balanced" the popover is positioned at the middle of the target element
@@ -62677,31 +71793,37 @@ interface IgNotifier {
 
 	/**
 	 * defines width for the popover. leave null for auto.
+	 *
 	 */
 	width?: number|string;
 
 	/**
 	 * defines height for the popover. leave null for auto
+	 *
 	 */
 	height?: number|string;
 
 	/**
 	 * defines width the popover won't go under the value even if no specific one is set.
+	 *
 	 */
 	minWidth?: number|string;
 
 	/**
 	 * defines width the popover won't exceed even if no specific one is set.
+	 *
 	 */
 	maxWidth?: number|string;
 
 	/**
 	 * defines height the popover won't exceed even if no specific one is set.
+	 *
 	 */
 	maxHeight?: number|string;
 
 	/**
 	 * Sets the containment for the popover. Accepts a jQuery object
+	 *
 	 */
 	containment?: any;
 
@@ -62731,6 +71853,10 @@ interface IgNotifier {
 	[optionName: string]: any;
 }
 interface IgNotifierMethods {
+	/**
+	 * Changes the all locales into the widget element to the language specified in [options.language](ui.ignotifier#options:language)
+	 * Note that this method is for rare scenarios, use [language](ui.ignotifier#options:language) or [locale](ui.ignotifier#options:locale) option setter
+	 */
 	changeLocale(): void;
 
 	/**
@@ -62824,6 +71950,7 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the current state of the igNotifier messages. State controls what CSS classes are applied to the messages and target and has interactions with other options as well.
+	 *
 	 */
 
 	igNotifier(optionLiteral: 'option', optionName: "state"): string;
@@ -62831,6 +71958,7 @@ interface JQuery {
 	/**
 	 * /Sets the current state of the igNotifier messages. State controls what CSS classes are applied to the messages and target and has interactions with other options as well.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -62838,6 +71966,7 @@ interface JQuery {
 
 	/**
 	 * Controls the level of notifications shown by automatic and manual messages using the [notify](ui.ignotifier#methods:notify) method. Use [show](ui.ignotifier#methods:show) to ignore the level.
+	 *
 	 */
 
 	igNotifier(optionLiteral: 'option', optionName: "notifyLevel"): string;
@@ -62845,6 +71974,7 @@ interface JQuery {
 	/**
 	 * Controls the level of notifications shown by automatic and manual messages using the [notify](ui.ignotifier#methods:notify) method. Use [show](ui.ignotifier#methods:show) to ignore the level.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -62852,6 +71982,7 @@ interface JQuery {
 
 	/**
 	 * Controls where the popover DOM should be attached to (only applies to popovers).
+	 *
 	 */
 
 	igNotifier(optionLiteral: 'option', optionName: "appendTo"): string|Object;
@@ -62859,6 +71990,7 @@ interface JQuery {
 	/**
 	 * Controls where the popover DOM should be attached to (only applies to popovers).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -62866,6 +71998,7 @@ interface JQuery {
 
 	/**
 	 * Controls the positioning mode of messages. Setting a mode will override the default behavior which is auto.Note: Inline element uses a block container as is always placed after the target.
+	 *
 	 */
 
 	igNotifier(optionLiteral: 'option', optionName: "mode"): string;
@@ -62873,6 +72006,7 @@ interface JQuery {
 	/**
 	 * Controls the positioning mode of messages. Setting a mode will override the default behavior which is auto.Note: Inline element uses a block container as is always placed after the target.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -62880,30 +72014,35 @@ interface JQuery {
 
 	/**
 	 * Allows setting the respective state CSS on the target element (used to apply border color by default)
+	 *
 	 */
 	igNotifier(optionLiteral: 'option', optionName: "allowCSSOnTarget"): boolean;
 
 	/**
 	 * Allows setting the respective state CSS on the target element (used to apply border color by default)
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igNotifier(optionLiteral: 'option', optionName: "allowCSSOnTarget", optionValue: boolean): void;
 
 	/**
 	 * Allows rendering a span with the respective state CSS to display jQuery UI framework icons
+	 *
 	 */
 	igNotifier(optionLiteral: 'option', optionName: "showIcon"): boolean;
 
 	/**
 	 * Allows rendering a span with the respective state CSS to display jQuery UI framework icons
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igNotifier(optionLiteral: 'option', optionName: "showIcon", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the content for the popover container. Templated with parameters by default: {0} - icon container class, {1} - the icon class and {2} - message text.
+	 *
 	 */
 
 	igNotifier(optionLiteral: 'option', optionName: "contentTemplate"): string|Function;
@@ -62911,6 +72050,7 @@ interface JQuery {
 	/**
 	 * /Sets the content for the popover container. Templated with parameters by default: {0} - icon container class, {1} - the icon class and {2} - message text.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -62918,18 +72058,21 @@ interface JQuery {
 
 	/**
 	 * The content for the popover header
+	 *
 	 */
 	igNotifier(optionLiteral: 'option', optionName: "headerTemplate"): IgNotifierHeaderTemplate;
 
 	/**
 	 * Sets the content for the popover header
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igNotifier(optionLiteral: 'option', optionName: "headerTemplate", optionValue: IgNotifierHeaderTemplate): void;
 
 	/**
 	 * Sets the event on which the notification will be shown. Predefined values are "mouseenter", "click" and "focus"
+	 *
 	 */
 
 	igNotifier(optionLiteral: 'option', optionName: "showOn"): string;
@@ -62937,6 +72080,7 @@ interface JQuery {
 	/**
 	 * Sets the event on which the notification will be shown. Predefined values are "mouseenter", "click" and "focus"
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -62944,36 +72088,42 @@ interface JQuery {
 
 	/**
 	 * Controls whether the popover will close on blur or not. This option has effect only when the corresponding [showOn](ui.ignotifier#options:showOn) is set (manual by default)
+	 *
 	 */
 	igNotifier(optionLiteral: 'option', optionName: "closeOnBlur"): boolean;
 
 	/**
 	 * Controls whether the popover will close on blur or not. This option has effect only when the corresponding [showOn](ui.ignotifier#options:showOn) is set (manual by default)
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igNotifier(optionLiteral: 'option', optionName: "closeOnBlur", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the time in milliseconds the notification fades in and out when showing/hiding
+	 *
 	 */
 	igNotifier(optionLiteral: 'option', optionName: "animationDuration"): number;
 
 	/**
 	 * /Sets the time in milliseconds the notification fades in and out when showing/hiding
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igNotifier(optionLiteral: 'option', optionName: "animationDuration", optionValue: number): void;
 
 	/**
 	 * Gets/Sets the distance in pixels a notification popover slides outwards as it's shown.
+	 *
 	 */
 	igNotifier(optionLiteral: 'option', optionName: "animationSlideDistance"): number;
 
 	/**
 	 * /Sets the distance in pixels a notification popover slides outwards as it's shown.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igNotifier(optionLiteral: 'option', optionName: "animationSlideDistance", optionValue: number): void;
@@ -62992,6 +72142,7 @@ interface JQuery {
 
 	/**
 	 * Controls the direction in which the control shows relative to the target element
+	 *
 	 */
 
 	igNotifier(optionLiteral: 'option', optionName: "direction"): string;
@@ -62999,6 +72150,7 @@ interface JQuery {
 	/**
 	 * Controls the direction in which the control shows relative to the target element
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -63007,6 +72159,7 @@ interface JQuery {
 	/**
 	 * Controls the priority in which the control searches for space to show relative to the target element.
 	 * This property has effect only if the [direction](ui.%%WidgetNameLowered%%#options:direction) property value is "auto" or unset.
+	 *
 	 */
 	igNotifier(optionLiteral: 'option', optionName: "directionPriority"): any[];
 
@@ -63014,12 +72167,14 @@ interface JQuery {
 	 * Controls the priority in which the control searches for space to show relative to the target element.
 	 * This property has effect only if the [direction](ui.%%WidgetNameLowered%%#options:direction) property value is "auto" or unset.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igNotifier(optionLiteral: 'option', optionName: "directionPriority", optionValue: any[]): void;
 
 	/**
 	 * Controls the position of the popover according to the target element in case the popover is larger than the target on the side we want to position, if the popover is smaller it should always be in the middle of the visible area
+	 *
 	 */
 
 	igNotifier(optionLiteral: 'option', optionName: "position"): string;
@@ -63027,6 +72182,7 @@ interface JQuery {
 	/**
 	 * Controls the position of the popover according to the target element in case the popover is larger than the target on the side we want to position, if the popover is smaller it should always be in the middle of the visible area
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -63034,6 +72190,7 @@ interface JQuery {
 
 	/**
 	 * Defines width for the popover. leave null for auto.
+	 *
 	 */
 
 	igNotifier(optionLiteral: 'option', optionName: "width"): number|string;
@@ -63041,6 +72198,7 @@ interface JQuery {
 	/**
 	 * Defines width for the popover. leave null for auto.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -63048,6 +72206,7 @@ interface JQuery {
 
 	/**
 	 * Defines height for the popover. leave null for auto
+	 *
 	 */
 
 	igNotifier(optionLiteral: 'option', optionName: "height"): number|string;
@@ -63055,6 +72214,7 @@ interface JQuery {
 	/**
 	 * Defines height for the popover. leave null for auto
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -63062,6 +72222,7 @@ interface JQuery {
 
 	/**
 	 * Defines width the popover won't go under the value even if no specific one is set.
+	 *
 	 */
 
 	igNotifier(optionLiteral: 'option', optionName: "minWidth"): number|string;
@@ -63069,6 +72230,7 @@ interface JQuery {
 	/**
 	 * Defines width the popover won't go under the value even if no specific one is set.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -63076,6 +72238,7 @@ interface JQuery {
 
 	/**
 	 * Defines width the popover won't exceed even if no specific one is set.
+	 *
 	 */
 
 	igNotifier(optionLiteral: 'option', optionName: "maxWidth"): number|string;
@@ -63083,6 +72246,7 @@ interface JQuery {
 	/**
 	 * Defines width the popover won't exceed even if no specific one is set.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -63090,6 +72254,7 @@ interface JQuery {
 
 	/**
 	 * Defines height the popover won't exceed even if no specific one is set.
+	 *
 	 */
 
 	igNotifier(optionLiteral: 'option', optionName: "maxHeight"): number|string;
@@ -63097,6 +72262,7 @@ interface JQuery {
 	/**
 	 * Defines height the popover won't exceed even if no specific one is set.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -63104,12 +72270,14 @@ interface JQuery {
 
 	/**
 	 * The containment for the popover. Accepts a jQuery object
+	 *
 	 */
 	igNotifier(optionLiteral: 'option', optionName: "containment"): any;
 
 	/**
 	 * Sets the containment for the popover. Accepts a jQuery object
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igNotifier(optionLiteral: 'option', optionName: "containment", optionValue: any): void;
@@ -63170,8 +72338,8 @@ interface JQuery {
 interface IgPivotDataSelectorDataSourceOptionsXmlaOptionsRequestOptions {
 	/**
 	 * The value is applied to XmlHttpRequest.withCredentials if supported by the user agent.
-	 *                             Setting this property to true will allow IE8/IE9 to make authenticated cross-origin requests to tusted domains through XmlHttpRequest instead of XDomainRequest
-	 *                             and will prompt the user for credentials.
+	 * Setting this property to true will allow IE8/IE9 to make authenticated cross-origin requests to tusted domains through XmlHttpRequest instead of XDomainRequest
+	 * and will prompt the user for credentials.
 	 */
 	withCredentials?: boolean;
 
@@ -63256,13 +72424,13 @@ interface IgPivotDataSelectorDataSourceOptionsXmlaOptions {
 
 	/**
 	 * Additional properties sent with every discover request.
-	 *                         The object is treated as a key/value store where each property name is used as the key and the property value as the value.
+	 * The object is treated as a key/value store where each property name is used as the key and the property value as the value.
 	 */
 	discoverProperties?: any;
 
 	/**
 	 * Additional properties sent with every execute request.
-	 *                         The object is treated as a key/value store where each property name is used as the key and the property value as the value.
+	 * The object is treated as a key/value store where each property name is used as the key and the property value as the value.
 	 */
 	executeProperties?: any;
 
@@ -63290,7 +72458,7 @@ interface IgPivotDataSelectorDataSourceOptionsFlatDataOptionsMetadataCubeMeasure
 
 	/**
 	 * Optional="false" An aggregator function called when each cell is evaluated.
-	 *                                         Returns a value for the cell. If the returned value is null, no cell will be created in for the data source result.
+	 * Returns a value for the cell. If the returned value is null, no cell will be created in for the data source result.
 	 */
 	aggregator?: Function;
 
@@ -63308,14 +72476,14 @@ interface IgPivotDataSelectorDataSourceOptionsFlatDataOptionsMetadataCubeMeasure
 interface IgPivotDataSelectorDataSourceOptionsFlatDataOptionsMetadataCubeMeasuresDimension {
 	/**
 	 * A unique name for the measures dimension.
-	 *                                     The default value is "Measures". This name is used to create the names of dimensions using the following pattern:
-	 *                                     [<measuresDimensionMetadata.name>].[<measureMetadata.name>]
+	 * The default value is "Measures". This name is used to create the names of dimensions using the following pattern:
+	 * [<measuresDimensionMetadata.name>].[<measureMetadata.name>]
 	 */
 	name?: string;
 
 	/**
 	 * A caption for the measures dimension.
-	 *                                     The default value is "Measures".
+	 * The default value is "Measures".
 	 */
 	caption?: string;
 
@@ -63333,8 +72501,8 @@ interface IgPivotDataSelectorDataSourceOptionsFlatDataOptionsMetadataCubeMeasure
 interface IgPivotDataSelectorDataSourceOptionsFlatDataOptionsMetadataCubeDimensionHierarchieLevel {
 	/**
 	 * Optional="false" A name for the level.
-	 *                                             The unique name of the level is formed using the following pattern:
-	 *                                             {<hierarchy.uniqueName>}.[<levelMetadata.name>]
+	 * The unique name of the level is formed using the following pattern:
+	 * {<hierarchy.uniqueName>}.[<levelMetadata.name>]
 	 */
 	name?: string;
 
@@ -63345,7 +72513,7 @@ interface IgPivotDataSelectorDataSourceOptionsFlatDataOptionsMetadataCubeDimensi
 
 	/**
 	 * A function called for each item of the data source array when level members are created.
-	 *                                             Based on the item parameter the function should return a value that will form the $.ig.Member’s name and caption.
+	 * Based on the item parameter the function should return a value that will form the $.ig.Member’s name and caption.
 	 */
 	memberProvider?: Function;
 
@@ -63358,8 +72526,8 @@ interface IgPivotDataSelectorDataSourceOptionsFlatDataOptionsMetadataCubeDimensi
 interface IgPivotDataSelectorDataSourceOptionsFlatDataOptionsMetadataCubeDimensionHierarchie {
 	/**
 	 * Optional="false" A name for the hierarchy.
-	 *                                         The unique name of the hierarchy is formed using the following pattern:
-	 *                                         [<parentDimension.name>].[<hierarchyMetadata.name>]
+	 * The unique name of the hierarchy is formed using the following pattern:
+	 * [<parentDimension.name>].[<hierarchyMetadata.name>]
 	 */
 	name?: string;
 
@@ -63370,8 +72538,8 @@ interface IgPivotDataSelectorDataSourceOptionsFlatDataOptionsMetadataCubeDimensi
 
 	/**
 	 * The path to be used when displaying the hierarchy in the user interface.
-	 *                                         Nested folders are indicated by a backslash (\).
-	 *                                         The folder hierarchy will appear under parent dimension node.
+	 * Nested folders are indicated by a backslash (\).
+	 * The folder hierarchy will appear under parent dimension node.
 	 */
 	displayFolder?: string;
 
@@ -63465,14 +72633,14 @@ interface IgPivotDataSelectorDataSourceOptionsFlatDataOptions {
 
 	/**
 	 * See $.ig.DataSource.
-	 *                         string Specifies the name of the property in which data records are held if the response is wrapped.
-	 *                         null Option is ignored.
+	 * string Specifies the name of the property in which data records are held if the response is wrapped.
+	 * null Option is ignored.
 	 */
 	responseDataKey?: string;
 
 	/**
 	 * String Explicitly set data source type (such as "json"). Please refer to the documentation of $.ig.DataSource and its type property.
-	 *                         null Option is ignored.
+	 * null Option is ignored.
 	 */
 	responseDataType?: string;
 
@@ -63531,7 +72699,8 @@ interface IgPivotDataSelectorDragAndDropSettings {
 	appendTo?: any;
 
 	/**
-	 * Specifies the containment for the drag helper. The area inside of which the                                     helper is contained would be scrollable while dragging.
+	 * Specifies the containment for the drag helper. The area inside of which thehelper is contained would be scrollable while dragging.
+	 *
 	 */
 	containment?: boolean|string|Array<any>;
 
@@ -63552,7 +72721,7 @@ interface DataSelectorRenderedEvent {
 
 interface DataSelectorRenderedEventUIParam {
 	/**
-	 * Used to get a reference to the data selector.
+	 * Gets a reference to the data selector.
 	 */
 	owner?: any;
 }
@@ -63563,22 +72732,22 @@ interface DataSourceInitializedEvent {
 
 interface DataSourceInitializedEventUIParam {
 	/**
-	 * Used to get a reference to the data selector.
+	 * Gets a reference to the data selector.
 	 */
 	owner?: any;
 
 	/**
-	 * Used to get a reference to the data source.
+	 * Gets a reference to the data source.
 	 */
 	dataSource?: any;
 
 	/**
-	 * Used to see if an error has occured during initialization.
+	 * See if an error has occured during initialization.
 	 */
-	error?: any;
+	error?: string;
 
 	/**
-	 * Used to get a reference to the root of the data source metatadata root item.
+	 * Gets a reference to the root of the data source metatadata root item.
 	 */
 	metadataTreeRoot?: any;
 }
@@ -63589,22 +72758,22 @@ interface DataSourceUpdatedEvent {
 
 interface DataSourceUpdatedEventUIParam {
 	/**
-	 * Used to get a reference to the data selector.
+	 * Gets a reference to the data selector.
 	 */
 	owner?: any;
 
 	/**
-	 * Used to get a reference to the data source.
+	 * Gets a reference to the data source.
 	 */
 	dataSource?: any;
 
 	/**
-	 * Used to see if an error has occured during update.
+	 * See if an error has occured during update.
 	 */
-	error?: any;
+	error?: string;
 
 	/**
-	 * Used to get the result of the update operation.
+	 * Gets the result of the update operation.
 	 */
 	result?: any;
 }
@@ -63615,14 +72784,14 @@ interface DeferUpdateChangedEvent {
 
 interface DeferUpdateChangedEventUIParam {
 	/**
-	 * Used to get a reference to the data selector.
+	 * Gets a reference to the data selector.
 	 */
 	owner?: any;
 
 	/**
-	 * Used to get the defer update value.
+	 * Gets the defer update value.
 	 */
-	deferUpdate?: any;
+	deferUpdate?: boolean;
 }
 
 interface DragStartEvent {
@@ -63631,27 +72800,27 @@ interface DragStartEvent {
 
 interface DragStartEventUIParam {
 	/**
-	 * Used to get a reference to the data.
+	 * Gets a reference to the data.
 	 */
 	metadata?: any;
 
 	/**
-	 * Used to get a reference to the helper.
+	 * Gets a reference to the helper.
 	 */
-	helper?: any;
+	helper?: string;
 
 	/**
-	 * Used to get a reference to the offset.
+	 * Gets a reference to the offset.
 	 */
 	offset?: any;
 
 	/**
-	 * Used to get a reference to the original position of the draggable element.
+	 * Gets a reference to the original position of the draggable element.
 	 */
 	originalPosition?: any;
 
 	/**
-	 * Used to get a reference to the current position of the draggable element.
+	 * Gets a reference to the current position of the draggable element.
 	 */
 	position?: any;
 }
@@ -63662,27 +72831,27 @@ interface DragEvent {
 
 interface DragEventUIParam {
 	/**
-	 * Used to get a reference to the data.
+	 * Gets a reference to the data.
 	 */
 	metadata?: any;
 
 	/**
-	 * Used to get a reference to the helper.
+	 * Gets a reference to the helper.
 	 */
-	helper?: any;
+	helper?: string;
 
 	/**
-	 * Used to get a reference to the offset.
+	 * Gets a reference to the offset.
 	 */
 	offset?: any;
 
 	/**
-	 * Used to get a reference to the original position of the draggable element.
+	 * Gets a reference to the original position of the draggable element.
 	 */
 	originalPosition?: any;
 
 	/**
-	 * Used to get a reference to the current position of the draggable element.
+	 * Gets a reference to the current position of the draggable element.
 	 */
 	position?: any;
 }
@@ -63693,22 +72862,22 @@ interface DragStopEvent {
 
 interface DragStopEventUIParam {
 	/**
-	 * Used to get a reference to the helper.
+	 * Gets a reference to the helper.
 	 */
-	helper?: any;
+	helper?: string;
 
 	/**
-	 * Used to get a reference to the offset.
+	 * Gets a reference to the offset.
 	 */
 	offset?: any;
 
 	/**
-	 * Used to get a reference to the original position of the draggable element.
+	 * Gets a reference to the original position of the draggable element.
 	 */
 	originalPosition?: any;
 
 	/**
-	 * Used to get a reference to the current position of the draggable element.
+	 * Gets a reference to the current position of the draggable element.
 	 */
 	position?: any;
 }
@@ -63719,37 +72888,37 @@ interface MetadataDroppingEvent {
 
 interface MetadataDroppingEventUIParam {
 	/**
-	 * Used to the drop target.
+	 * A reference to the drop target.
 	 */
-	targetElement?: any;
+	targetElement?: string;
 
 	/**
-	 * Used to the dragged element.
+	 * A reference to the dragged element.
 	 */
-	draggedElement?: any;
+	draggedElement?: string;
 
 	/**
-	 * Used to get a reference to the data.
+	 * Gets a reference to the data.
 	 */
 	metadata?: any;
 
 	/**
-	 * Used to get the index at which the metadata will be inserted.
+	 * Gets the index at which the metadata will be inserted.
 	 */
-	metadataIndex?: any;
+	metadataIndex?: number;
 
 	/**
-	 * Used to get a reference to the helper.
+	 * Gets a reference to the helper.
 	 */
-	helper?: any;
+	helper?: string;
 
 	/**
-	 * Used to get a reference to the offset.
+	 * Gets a reference to the offset.
 	 */
 	offset?: any;
 
 	/**
-	 * Used to get a reference to the current position of the draggable element.
+	 * Gets a reference to the current position of the draggable element.
 	 */
 	position?: any;
 }
@@ -63760,37 +72929,37 @@ interface MetadataDroppedEvent {
 
 interface MetadataDroppedEventUIParam {
 	/**
-	 * Used to the drop target.
+	 * A reference to the drop target.
 	 */
-	targetElement?: any;
+	targetElement?: string;
 
 	/**
-	 * Used to the dragged element.
+	 * A reference to the dragged element.
 	 */
-	draggedElement?: any;
+	draggedElement?: string;
 
 	/**
-	 * Used to get a reference to the data.
+	 * Gets a reference to the data.
 	 */
 	metadata?: any;
 
 	/**
-	 * Used to get the index at which the metadata is inserted.
+	 * Gets the index at which the metadata is inserted.
 	 */
-	metadataIndex?: any;
+	metadataIndex?: number;
 
 	/**
-	 * Used to get a reference to the helper.
+	 * Gets a reference to the helper.
 	 */
-	helper?: any;
+	helper?: string;
 
 	/**
-	 * Used to get a reference to the offset.
+	 * Gets a reference to the offset.
 	 */
 	offset?: any;
 
 	/**
-	 * Used to get a reference to the current position of the draggable element.
+	 * Gets a reference to the current position of the draggable element.
 	 */
 	position?: any;
 }
@@ -63801,12 +72970,12 @@ interface MetadataRemovingEvent {
 
 interface MetadataRemovingEventUIParam {
 	/**
-	 * Used to the dragged element.
+	 * A reference to the dragged element.
 	 */
-	targetElement?: any;
+	targetElement?: string;
 
 	/**
-	 * Used to get a reference to the data.
+	 * Gets a reference to the data.
 	 */
 	metadata?: any;
 }
@@ -63817,7 +72986,7 @@ interface MetadataRemovedEvent {
 
 interface MetadataRemovedEventUIParam {
 	/**
-	 * Used to get a reference to the data.
+	 * Gets a reference to the data.
 	 */
 	metadata?: any;
 }
@@ -63828,7 +72997,7 @@ interface FilterDropDownOpeningEvent {
 
 interface FilterDropDownOpeningEventUIParam {
 	/**
-	 * Used to the hierarchy.
+	 * A reference to the hierarchy.
 	 */
 	hierarchy?: any;
 }
@@ -63839,14 +73008,14 @@ interface FilterDropDownOpenedEvent {
 
 interface FilterDropDownOpenedEventUIParam {
 	/**
-	 * Used to the hierarchy.
+	 * A reference to the hierarchy.
 	 */
 	hierarchy?: any;
 
 	/**
-	 * Used to the drop down.
+	 * A reference to the drop down.
 	 */
-	dropDownElement?: any;
+	dropDownElement?: string;
 }
 
 interface FilterMembersLoadedEvent {
@@ -63855,11 +73024,19 @@ interface FilterMembersLoadedEvent {
 
 interface FilterMembersLoadedEventUIParam {
 	/**
-	 * Used to get the parent node or the igTree instance in the initial load.
+	 * Gets the parent node or the igTree instance in the initial load.
 	 */
-	parent?: any;
-	rootFilterMembers?: any;
-	filterMembers?: any;
+	parent?: string;
+
+	/**
+	 * A collection with the root filter members .
+	 */
+	rootFilterMembers?: any[];
+
+	/**
+	 * A collection with the newly loaded filter members.
+	 */
+	filterMembers?: any[];
 }
 
 interface FilterDropDownOkEvent {
@@ -63868,15 +73045,19 @@ interface FilterDropDownOkEvent {
 
 interface FilterDropDownOkEventUIParam {
 	/**
-	 * Used to the hierarchy.
+	 * A reference to the hierarchy.
 	 */
 	hierarchy?: any;
-	filterMembers?: any;
 
 	/**
-	 * Used to the drop down.
+	 * A collection with the selected filter members. If all filter members are selected the collection will be empty.
 	 */
-	dropDownElement?: any;
+	filterMembers?: any[];
+
+	/**
+	 * A reference to the drop down.
+	 */
+	dropDownElement?: string;
 }
 
 interface FilterDropDownClosingEvent {
@@ -63885,14 +73066,14 @@ interface FilterDropDownClosingEvent {
 
 interface FilterDropDownClosingEventUIParam {
 	/**
-	 * Used to the hierarchy.
+	 * A reference to the hierarchy.
 	 */
 	hierarchy?: any;
 
 	/**
-	 * Used to the drop down.
+	 * A reference to the drop down.
 	 */
-	dropDownElement?: any;
+	dropDownElement?: string;
 }
 
 interface FilterDropDownClosedEvent {
@@ -63901,17 +73082,26 @@ interface FilterDropDownClosedEvent {
 
 interface FilterDropDownClosedEventUIParam {
 	/**
-	 * Used to the hierarchy.
+	 * A reference to the hierarchy.
 	 */
 	hierarchy?: any;
 }
 
 interface IgPivotDataSelector {
+	/**
+	 *
+	 *
+	 * Valid values:
+	 * "string" The widget width can be set in pixels (px) and percentage (%). The recommended width is 250px.
+	 * "number" The widget width can be set as a number.
+	 * "null" will stretch to fit data, if no other widths are defined.
+	 */
 	width?: string|number;
 
 	/**
 	 * This is the total height of the grid, including all UI elements - scroll container with data rows, header, footer, filter row -  (if any), etc.
 	 *
+	 *
 	 * Valid values:
 	 * "string" The widget height can be set in pixels (px) and percentage (%).
 	 * "number" The widget height can be set as a number.
@@ -63921,22 +73111,26 @@ interface IgPivotDataSelector {
 
 	/**
 	 * An instance of $.ig.OlapXmlaDataSource or $.ig.OlapFlatDataSource.
+	 *
 	 */
 	dataSource?: any;
 
 	/**
 	 * An object that will be used to create an instance of $.ig.OlapXmlaDataSource or $.ig.OlapFlatDataSource.
-	 *                 The provided value must contain an object with settings for one of the data source types - xmlaOptions or flatDataOptions.
+	 * The provided value must contain an object with settings for one of the data source types - xmlaOptions or flatDataOptions.
+	 *
 	 */
 	dataSourceOptions?: IgPivotDataSelectorDataSourceOptions;
 
 	/**
 	 * Setting deferUpdate to true will not apply changes to the data source until the update method is called or the update layout button is clicked.
+	 *
 	 */
 	deferUpdate?: boolean;
 
 	/**
 	 * Settings for the drag and drop functionality of the igPivotDataSelector.
+	 *
 	 */
 	dragAndDropSettings?: IgPivotDataSelectorDragAndDropSettings;
 
@@ -63947,173 +73141,138 @@ interface IgPivotDataSelector {
 
 	/**
 	 * Disable the drag and drop for the rows drop area and the ability to use filtering and remove items from it.
+	 *
 	 */
 	disableRowsDropArea?: boolean;
 
 	/**
 	 * Disable the drag and drop for the columns drop area and the ability to use filtering and remove items from it.
+	 *
 	 */
 	disableColumnsDropArea?: boolean;
 
 	/**
 	 * Disable the drag and drop for the measures drop area and the ability to use filtering and remove items from it.
+	 *
 	 */
 	disableMeasuresDropArea?: boolean;
 
 	/**
 	 * Disable the drag and drop for the filters drop area and the ability to use filtering and remove items from it.
+	 *
 	 */
 	disableFiltersDropArea?: boolean;
 
 	/**
 	 * A function that will be called to determine if an item can be moved in or dropped on an area of the data selector.
-	 *                 paramType="string" The location where the item will be moved - igPivotGrid, igPivotDataSelector, filters, rows, columns or measures.
-	 *                 paramType="string" The type of the item - Hierarchy, Measure or MeasureList.
-	 *                 paramType="string" The unique name of the item.
-	 *                 returnType="bool"  The function must return true if the item should be accepted.
+	 *
+	 * paramType="string" The location where the item will be moved - igPivotGrid, igPivotDataSelector, filters, rows, columns or measures.
+	 * paramType="string" The type of the item - Hierarchy, Measure or MeasureList.
+	 * paramType="string" The unique name of the item.
+	 * returnType="bool"  The function must return true if the item should be accepted.
 	 */
 	customMoveValidation?: Function;
 
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	locale?: any;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	language?: string;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+	regional?: string|Object;
+
 	/**
 	 * Fired after the data selector is rendered. Changing the data source instance will re-render the data selector.
-	 *                 Function takes arguments evt and ui.
-	 *                 Use ui.owner to get a reference to the data selector.
 	 */
 	dataSelectorRendered?: DataSelectorRenderedEvent;
 
 	/**
 	 * Fired after the data source has initialized.
-	 *                 Function takes arguments evt and ui.
-	 *                 Use ui.owner to get a reference to the data selector.
-	 *                 Use ui.dataSource to get a reference to the data source.
-	 *                 Use ui.error to see if an error has occured during initialization.
-	 *                 Use ui.metadataTreeRoot to get a reference to the root of the data source metatadata root item.
 	 */
 	dataSourceInitialized?: DataSourceInitializedEvent;
 
 	/**
 	 * Fired after the data source has updated.
-	 *                 Function takes arguments evt and ui.
-	 *                 Use ui.owner to get a reference to the data selector.
-	 *                 Use ui.dataSource to get a reference to the data source.
-	 *                 Use ui.error to see if an error has occured during update.
-	 *                 Use ui.result to get the result of the update operation.
 	 */
 	dataSourceUpdated?: DataSourceUpdatedEvent;
 
 	/**
 	 * Fired when the defer update checkbox changes.
-	 *                 Function takes arguments evt and ui.
-	 *                 Use ui.owner to get a reference to the data selector.
-	 *                 Use ui.deferUpdate to get the defer update value.
 	 */
 	deferUpdateChanged?: DeferUpdateChangedEvent;
 
 	/**
 	 * Fired on drag start. Return false to cancel the drag.
-	 * Use ui.metadatato get a reference to the data.
-	 * Use ui.helper to get a reference to the helper.
-	 * Use ui.offset to get a reference to the offset.
-	 * Use ui.originalPosition to get a reference to the original position of the draggable element.
-	 * Use ui.position to get a reference to the current position of the draggable element.
 	 */
 	dragStart?: DragStartEvent;
 
 	/**
 	 * Fired on drag. Return false to cancel the dragging.
-	 * Use ui.metadatato get a reference to the data.
-	 * Use ui.helper to get a reference to the helper.
-	 * Use ui.offset to get a reference to the offset.
-	 * Use ui.originalPosition to get a reference to the original position of the draggable element.
-	 * Use ui.position to get a reference to the current position of the draggable element.
 	 */
 	drag?: DragEvent;
 
 	/**
 	 * Fired on drag stop.
-	 * Use ui.helper to get a reference to the helper.
-	 * Use ui.offset to get a reference to the offset.
-	 * Use ui.originalPosition to get a reference to the original position of the draggable element.
-	 * Use ui.position to get a reference to the current position of the draggable element.
 	 */
 	dragStop?: DragStopEvent;
 
 	/**
 	 * Fired before a metadata item drop. Return false to cancel the drop.
-	 *                 Use ui.targetElement for a reference to the drop target.
-	 *                 Use ui.draggedElement for a reference to the dragged element.
-	 * Use ui.metadatato get a reference to the data.
-	 *                 Use ui.metadataIndex to get the index at which the metadata will be inserted.
-	 * Use ui.helper to get a reference to the helper.
-	 * Use ui.offset to get a reference to the offset.
-	 * Use ui.position to get a reference to the current position of the draggable element.
 	 */
 	metadataDropping?: MetadataDroppingEvent;
 
 	/**
 	 * Fired after a metadata item drop.
-	 *                 Use ui.targetElement for a reference to the drop target.
-	 *                 Use ui.draggedElement for a reference to the dragged element.
-	 * Use ui.metadatato get a reference to the data.
-	 *                 Use ui.metadataIndex to get the index at which the metadata is inserted.
-	 * Use ui.helper to get a reference to the helper.
-	 * Use ui.offset to get a reference to the offset.
-	 * Use ui.position to get a reference to the current position of the draggable element.
 	 */
 	metadataDropped?: MetadataDroppedEvent;
 
 	/**
 	 * Fired before a metadata item is removed when the user clicks the close icon. Return false to cancel the removing.
-	 *                 Use ui.targetElement for a reference to the dragged element.
-	 *                 Use ui.metadatato get a reference to the data.
 	 */
 	metadataRemoving?: MetadataRemovingEvent;
 
 	/**
 	 * Fired after a metadata item is removed when the user clicks the close icon.
-	 *                 Use ui.metadatato get a reference to the data.
 	 */
 	metadataRemoved?: MetadataRemovedEvent;
 
 	/**
 	 * Fired before the filter members drop down opens. Return false to cancel the opening.
-	 *                 Use ui.hierarchy for a reference to the hierarchy.
 	 */
 	filterDropDownOpening?: FilterDropDownOpeningEvent;
 
 	/**
 	 * Fired after the filter members drop down opens.
-	 *                 Use ui.hierarchy for a reference to the hierarchy.
-	 *                 Use ui.dropDownElement for a reference to the drop down.
 	 */
 	filterDropDownOpened?: FilterDropDownOpenedEvent;
 
 	/**
 	 * Fired after the filter members are loaded.
-	 *                 Use ui.parent to get the parent node or the igTree instance in the initial load.
-	 *                 Use ui.rootFilterMembers for a collection with the root filter members .
-	 *                 Use ui.filterMembers for a collection with the newly loaded filter members.
 	 */
 	filterMembersLoaded?: FilterMembersLoadedEvent;
 
 	/**
 	 * Fired after the OK button in the filter members drop down is clicked. Return false to cancel the applying of the filters.
-	 *                 Use ui.hierarchy for a reference to the hierarchy.
-	 *                 Use ui.filterMembers for a collection with the selected filter members. If all filter members are selected the collection will be empty.
-	 *                 Use ui.dropDownElement for a reference to the drop down.
 	 */
 	filterDropDownOk?: FilterDropDownOkEvent;
 
 	/**
 	 * Fired before the filter members drop down closes. Return false to cancel the closing.
-	 *                 Use ui.hierarchy for a reference to the hierarchy.
-	 *                 Use ui.dropDownElement for a reference to the drop down.
 	 */
 	filterDropDownClosing?: FilterDropDownClosingEvent;
 
 	/**
 	 * Fired after the filter members drop down closes.
-	 *                 Use ui.hierarchy for a reference to the hierarchy.
 	 */
 	filterDropDownClosed?: FilterDropDownClosedEvent;
 
@@ -64123,6 +73282,10 @@ interface IgPivotDataSelector {
 	[optionName: string]: any;
 }
 interface IgPivotDataSelectorMethods {
+	/**
+	 * Changes the all locales into the widget element to the language specified in [options.language](ui.igpivotdataselector#options:language)
+	 * Note that this method is for rare scenarios, see [language](ui.igpivotdataselector#options:language) or [locale](ui.igpivotdataselector#options:locale) option setter
+	 */
 	changeLocale(): void;
 
 	/**
@@ -64132,11 +73295,21 @@ interface IgPivotDataSelectorMethods {
 
 	/**
 	 * Destroy is part of the jQuery UI widget API and does the following:
-	 *                 1. Remove custom CSS classes that were added.
-	 *                 2. Unwrap any wrapping elements such as scrolling divs and other containers.
-	 *                 3. Unbind all events that were bound.
+	 * 1. Remove custom CSS classes that were added.
+	 * 2. Unwrap any wrapping elements such as scrolling divs and other containers.
+	 * 3. Unbind all events that were bound.
 	 */
 	destroy(): void;
+
+	/**
+	 * Changes the widget language to global language. Global language is the value in $.ig.util.language
+	 */
+	changeGlobalLanguage(): void;
+
+	/**
+	 * Changes the widget regional settins to global regional settings. Global regional settings are container in $.ig.util.regional
+	 */
+	changeGlobalRegional(): void;
 }
 interface JQuery {
 	data(propertyName: "igPivotDataSelector"): IgPivotDataSelectorMethods;
@@ -64146,13 +73319,26 @@ interface JQuery {
 	igPivotDataSelector(methodName: "changeLocale"): void;
 	igPivotDataSelector(methodName: "update"): void;
 	igPivotDataSelector(methodName: "destroy"): void;
+	igPivotDataSelector(methodName: "changeGlobalLanguage"): void;
+	igPivotDataSelector(methodName: "changeGlobalRegional"): void;
+
+	/**
+	 * *
+	 */
 
 	igPivotDataSelector(optionLiteral: 'option', optionName: "width"): string|number;
 
+	/**
+	 * *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
 	igPivotDataSelector(optionLiteral: 'option', optionName: "width", optionValue: string|number): void;
 
 	/**
 	 * This is the total height of the grid, including all UI elements - scroll container with data rows, header, footer, filter row -  (if any), etc.
+	 *
 	 */
 
 	igPivotDataSelector(optionLiteral: 'option', optionName: "height"): string|number;
@@ -64160,6 +73346,7 @@ interface JQuery {
 	/**
 	 * This is the total height of the grid, including all UI elements - scroll container with data rows, header, footer, filter row -  (if any), etc.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -64167,25 +73354,29 @@ interface JQuery {
 
 	/**
 	 * An instance of $.ig.OlapXmlaDataSource or $.ig.OlapFlatDataSource.
+	 *
 	 */
 	igPivotDataSelector(optionLiteral: 'option', optionName: "dataSource"): any;
 
 	/**
 	 * An instance of $.ig.OlapXmlaDataSource or $.ig.OlapFlatDataSource.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPivotDataSelector(optionLiteral: 'option', optionName: "dataSource", optionValue: any): void;
 
 	/**
 	 * An object that will be used to create an instance of $.ig.OlapXmlaDataSource or $.ig.OlapFlatDataSource.
-	 *                 The provided value must contain an object with settings for one of the data source types - xmlaOptions or flatDataOptions.
+	 * The provided value must contain an object with settings for one of the data source types - xmlaOptions or flatDataOptions.
+	 *
 	 */
 	igPivotDataSelector(optionLiteral: 'option', optionName: "dataSourceOptions"): IgPivotDataSelectorDataSourceOptions;
 
 	/**
 	 * An object that will be used to create an instance of $.ig.OlapXmlaDataSource or $.ig.OlapFlatDataSource.
-	 *                 The provided value must contain an object with settings for one of the data source types - xmlaOptions or flatDataOptions.
+	 * The provided value must contain an object with settings for one of the data source types - xmlaOptions or flatDataOptions.
+	 *
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -64193,24 +73384,28 @@ interface JQuery {
 
 	/**
 	 * Setting deferUpdate to true will not apply changes to the data source until the update method is called or the update layout button is clicked.
+	 *
 	 */
 	igPivotDataSelector(optionLiteral: 'option', optionName: "deferUpdate"): boolean;
 
 	/**
 	 * Setting deferUpdate to true will not apply changes to the data source until the update method is called or the update layout button is clicked.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPivotDataSelector(optionLiteral: 'option', optionName: "deferUpdate", optionValue: boolean): void;
 
 	/**
 	 * Settings for the drag and drop functionality of the igPivotDataSelector.
+	 *
 	 */
 	igPivotDataSelector(optionLiteral: 'option', optionName: "dragAndDropSettings"): IgPivotDataSelectorDragAndDropSettings;
 
 	/**
 	 * Settings for the drag and drop functionality of the igPivotDataSelector.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPivotDataSelector(optionLiteral: 'option', optionName: "dragAndDropSettings", optionValue: IgPivotDataSelectorDragAndDropSettings): void;
@@ -64229,83 +73424,133 @@ interface JQuery {
 
 	/**
 	 * Disable the drag and drop for the rows drop area and the ability to use filtering and remove items from it.
+	 *
 	 */
 	igPivotDataSelector(optionLiteral: 'option', optionName: "disableRowsDropArea"): boolean;
 
 	/**
 	 * Disable the drag and drop for the rows drop area and the ability to use filtering and remove items from it.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPivotDataSelector(optionLiteral: 'option', optionName: "disableRowsDropArea", optionValue: boolean): void;
 
 	/**
 	 * Disable the drag and drop for the columns drop area and the ability to use filtering and remove items from it.
+	 *
 	 */
 	igPivotDataSelector(optionLiteral: 'option', optionName: "disableColumnsDropArea"): boolean;
 
 	/**
 	 * Disable the drag and drop for the columns drop area and the ability to use filtering and remove items from it.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPivotDataSelector(optionLiteral: 'option', optionName: "disableColumnsDropArea", optionValue: boolean): void;
 
 	/**
 	 * Disable the drag and drop for the measures drop area and the ability to use filtering and remove items from it.
+	 *
 	 */
 	igPivotDataSelector(optionLiteral: 'option', optionName: "disableMeasuresDropArea"): boolean;
 
 	/**
 	 * Disable the drag and drop for the measures drop area and the ability to use filtering and remove items from it.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPivotDataSelector(optionLiteral: 'option', optionName: "disableMeasuresDropArea", optionValue: boolean): void;
 
 	/**
 	 * Disable the drag and drop for the filters drop area and the ability to use filtering and remove items from it.
+	 *
 	 */
 	igPivotDataSelector(optionLiteral: 'option', optionName: "disableFiltersDropArea"): boolean;
 
 	/**
 	 * Disable the drag and drop for the filters drop area and the ability to use filtering and remove items from it.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPivotDataSelector(optionLiteral: 'option', optionName: "disableFiltersDropArea", optionValue: boolean): void;
 
 	/**
 	 * A function that will be called to determine if an item can be moved in or dropped on an area of the data selector.
-	 *                 paramType="string" The location where the item will be moved - igPivotGrid, igPivotDataSelector, filters, rows, columns or measures.
-	 *                 paramType="string" The type of the item - Hierarchy, Measure or MeasureList.
-	 *                 paramType="string" The unique name of the item.
-	 *                 returnType="bool"  The function must return true if the item should be accepted.
+	 *
+	 * paramType="string" The location where the item will be moved - igPivotGrid, igPivotDataSelector, filters, rows, columns or measures.
+	 * paramType="string" The type of the item - Hierarchy, Measure or MeasureList.
+	 * paramType="string" The unique name of the item.
+	 * returnType="bool"  The function must return true if the item should be accepted.
 	 */
 	igPivotDataSelector(optionLiteral: 'option', optionName: "customMoveValidation"): Function;
 
 	/**
 	 * A function that will be called to determine if an item can be moved in or dropped on an area of the data selector.
-	 *                 paramType="string" The location where the item will be moved - igPivotGrid, igPivotDataSelector, filters, rows, columns or measures.
-	 *                 paramType="string" The type of the item - Hierarchy, Measure or MeasureList.
-	 *                 paramType="string" The unique name of the item.
-	 *                 returnType="bool"  The function must return true if the item should be accepted.
+	 *
+	 * paramType="string" The location where the item will be moved - igPivotGrid, igPivotDataSelector, filters, rows, columns or measures.
+	 * paramType="string" The type of the item - Hierarchy, Measure or MeasureList.
+	 * paramType="string" The unique name of the item.
+	 * returnType="bool"  The function must return true if the item should be accepted.
 	 *
 	 * @optionValue New value to be set.
 	 */
 	igPivotDataSelector(optionLiteral: 'option', optionName: "customMoveValidation", optionValue: Function): void;
 
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	igPivotDataSelector(optionLiteral: 'option', optionName: "locale"): any;
+
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igPivotDataSelector(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	igPivotDataSelector(optionLiteral: 'option', optionName: "language"): string;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igPivotDataSelector(optionLiteral: 'option', optionName: "language", optionValue: string): void;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+
+	igPivotDataSelector(optionLiteral: 'option', optionName: "regional"): string|Object;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igPivotDataSelector(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
+
 	/**
 	 * Fired after the data selector is rendered. Changing the data source instance will re-render the data selector.
-	 *                 Function takes arguments evt and ui.
-	 *                 Use ui.owner to get a reference to the data selector.
 	 */
 	igPivotDataSelector(optionLiteral: 'option', optionName: "dataSelectorRendered"): DataSelectorRenderedEvent;
 
 	/**
 	 * Fired after the data selector is rendered. Changing the data source instance will re-render the data selector.
-	 *                 Function takes arguments evt and ui.
-	 *                 Use ui.owner to get a reference to the data selector.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -64313,21 +73558,11 @@ interface JQuery {
 
 	/**
 	 * Fired after the data source has initialized.
-	 *                 Function takes arguments evt and ui.
-	 *                 Use ui.owner to get a reference to the data selector.
-	 *                 Use ui.dataSource to get a reference to the data source.
-	 *                 Use ui.error to see if an error has occured during initialization.
-	 *                 Use ui.metadataTreeRoot to get a reference to the root of the data source metatadata root item.
 	 */
 	igPivotDataSelector(optionLiteral: 'option', optionName: "dataSourceInitialized"): DataSourceInitializedEvent;
 
 	/**
 	 * Fired after the data source has initialized.
-	 *                 Function takes arguments evt and ui.
-	 *                 Use ui.owner to get a reference to the data selector.
-	 *                 Use ui.dataSource to get a reference to the data source.
-	 *                 Use ui.error to see if an error has occured during initialization.
-	 *                 Use ui.metadataTreeRoot to get a reference to the root of the data source metatadata root item.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -64335,21 +73570,11 @@ interface JQuery {
 
 	/**
 	 * Fired after the data source has updated.
-	 *                 Function takes arguments evt and ui.
-	 *                 Use ui.owner to get a reference to the data selector.
-	 *                 Use ui.dataSource to get a reference to the data source.
-	 *                 Use ui.error to see if an error has occured during update.
-	 *                 Use ui.result to get the result of the update operation.
 	 */
 	igPivotDataSelector(optionLiteral: 'option', optionName: "dataSourceUpdated"): DataSourceUpdatedEvent;
 
 	/**
 	 * Fired after the data source has updated.
-	 *                 Function takes arguments evt and ui.
-	 *                 Use ui.owner to get a reference to the data selector.
-	 *                 Use ui.dataSource to get a reference to the data source.
-	 *                 Use ui.error to see if an error has occured during update.
-	 *                 Use ui.result to get the result of the update operation.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -64357,17 +73582,11 @@ interface JQuery {
 
 	/**
 	 * Fired when the defer update checkbox changes.
-	 *                 Function takes arguments evt and ui.
-	 *                 Use ui.owner to get a reference to the data selector.
-	 *                 Use ui.deferUpdate to get the defer update value.
 	 */
 	igPivotDataSelector(optionLiteral: 'option', optionName: "deferUpdateChanged"): DeferUpdateChangedEvent;
 
 	/**
 	 * Fired when the defer update checkbox changes.
-	 *                 Function takes arguments evt and ui.
-	 *                 Use ui.owner to get a reference to the data selector.
-	 *                 Use ui.deferUpdate to get the defer update value.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -64375,21 +73594,11 @@ interface JQuery {
 
 	/**
 	 * Fired on drag start. Return false to cancel the drag.
-	 * Use ui.metadatato get a reference to the data.
-	 * Use ui.helper to get a reference to the helper.
-	 * Use ui.offset to get a reference to the offset.
-	 * Use ui.originalPosition to get a reference to the original position of the draggable element.
-	 * Use ui.position to get a reference to the current position of the draggable element.
 	 */
 	igPivotDataSelector(optionLiteral: 'option', optionName: "dragStart"): DragStartEvent;
 
 	/**
 	 * Fired on drag start. Return false to cancel the drag.
-	 * Use ui.metadatato get a reference to the data.
-	 * Use ui.helper to get a reference to the helper.
-	 * Use ui.offset to get a reference to the offset.
-	 * Use ui.originalPosition to get a reference to the original position of the draggable element.
-	 * Use ui.position to get a reference to the current position of the draggable element.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -64397,21 +73606,11 @@ interface JQuery {
 
 	/**
 	 * Fired on drag. Return false to cancel the dragging.
-	 * Use ui.metadatato get a reference to the data.
-	 * Use ui.helper to get a reference to the helper.
-	 * Use ui.offset to get a reference to the offset.
-	 * Use ui.originalPosition to get a reference to the original position of the draggable element.
-	 * Use ui.position to get a reference to the current position of the draggable element.
 	 */
 	igPivotDataSelector(optionLiteral: 'option', optionName: "drag"): DragEvent;
 
 	/**
 	 * Fired on drag. Return false to cancel the dragging.
-	 * Use ui.metadatato get a reference to the data.
-	 * Use ui.helper to get a reference to the helper.
-	 * Use ui.offset to get a reference to the offset.
-	 * Use ui.originalPosition to get a reference to the original position of the draggable element.
-	 * Use ui.position to get a reference to the current position of the draggable element.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -64419,19 +73618,11 @@ interface JQuery {
 
 	/**
 	 * Fired on drag stop.
-	 * Use ui.helper to get a reference to the helper.
-	 * Use ui.offset to get a reference to the offset.
-	 * Use ui.originalPosition to get a reference to the original position of the draggable element.
-	 * Use ui.position to get a reference to the current position of the draggable element.
 	 */
 	igPivotDataSelector(optionLiteral: 'option', optionName: "dragStop"): DragStopEvent;
 
 	/**
 	 * Fired on drag stop.
-	 * Use ui.helper to get a reference to the helper.
-	 * Use ui.offset to get a reference to the offset.
-	 * Use ui.originalPosition to get a reference to the original position of the draggable element.
-	 * Use ui.position to get a reference to the current position of the draggable element.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -64439,25 +73630,11 @@ interface JQuery {
 
 	/**
 	 * Fired before a metadata item drop. Return false to cancel the drop.
-	 *                 Use ui.targetElement for a reference to the drop target.
-	 *                 Use ui.draggedElement for a reference to the dragged element.
-	 * Use ui.metadatato get a reference to the data.
-	 *                 Use ui.metadataIndex to get the index at which the metadata will be inserted.
-	 * Use ui.helper to get a reference to the helper.
-	 * Use ui.offset to get a reference to the offset.
-	 * Use ui.position to get a reference to the current position of the draggable element.
 	 */
 	igPivotDataSelector(optionLiteral: 'option', optionName: "metadataDropping"): MetadataDroppingEvent;
 
 	/**
 	 * Fired before a metadata item drop. Return false to cancel the drop.
-	 *                 Use ui.targetElement for a reference to the drop target.
-	 *                 Use ui.draggedElement for a reference to the dragged element.
-	 * Use ui.metadatato get a reference to the data.
-	 *                 Use ui.metadataIndex to get the index at which the metadata will be inserted.
-	 * Use ui.helper to get a reference to the helper.
-	 * Use ui.offset to get a reference to the offset.
-	 * Use ui.position to get a reference to the current position of the draggable element.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -64465,25 +73642,11 @@ interface JQuery {
 
 	/**
 	 * Fired after a metadata item drop.
-	 *                 Use ui.targetElement for a reference to the drop target.
-	 *                 Use ui.draggedElement for a reference to the dragged element.
-	 * Use ui.metadatato get a reference to the data.
-	 *                 Use ui.metadataIndex to get the index at which the metadata is inserted.
-	 * Use ui.helper to get a reference to the helper.
-	 * Use ui.offset to get a reference to the offset.
-	 * Use ui.position to get a reference to the current position of the draggable element.
 	 */
 	igPivotDataSelector(optionLiteral: 'option', optionName: "metadataDropped"): MetadataDroppedEvent;
 
 	/**
 	 * Fired after a metadata item drop.
-	 *                 Use ui.targetElement for a reference to the drop target.
-	 *                 Use ui.draggedElement for a reference to the dragged element.
-	 * Use ui.metadatato get a reference to the data.
-	 *                 Use ui.metadataIndex to get the index at which the metadata is inserted.
-	 * Use ui.helper to get a reference to the helper.
-	 * Use ui.offset to get a reference to the offset.
-	 * Use ui.position to get a reference to the current position of the draggable element.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -64491,15 +73654,11 @@ interface JQuery {
 
 	/**
 	 * Fired before a metadata item is removed when the user clicks the close icon. Return false to cancel the removing.
-	 *                 Use ui.targetElement for a reference to the dragged element.
-	 *                 Use ui.metadatato get a reference to the data.
 	 */
 	igPivotDataSelector(optionLiteral: 'option', optionName: "metadataRemoving"): MetadataRemovingEvent;
 
 	/**
 	 * Fired before a metadata item is removed when the user clicks the close icon. Return false to cancel the removing.
-	 *                 Use ui.targetElement for a reference to the dragged element.
-	 *                 Use ui.metadatato get a reference to the data.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -64507,13 +73666,11 @@ interface JQuery {
 
 	/**
 	 * Fired after a metadata item is removed when the user clicks the close icon.
-	 *                 Use ui.metadatato get a reference to the data.
 	 */
 	igPivotDataSelector(optionLiteral: 'option', optionName: "metadataRemoved"): MetadataRemovedEvent;
 
 	/**
 	 * Fired after a metadata item is removed when the user clicks the close icon.
-	 *                 Use ui.metadatato get a reference to the data.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -64521,13 +73678,11 @@ interface JQuery {
 
 	/**
 	 * Fired before the filter members drop down opens. Return false to cancel the opening.
-	 *                 Use ui.hierarchy for a reference to the hierarchy.
 	 */
 	igPivotDataSelector(optionLiteral: 'option', optionName: "filterDropDownOpening"): FilterDropDownOpeningEvent;
 
 	/**
 	 * Fired before the filter members drop down opens. Return false to cancel the opening.
-	 *                 Use ui.hierarchy for a reference to the hierarchy.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -64535,15 +73690,11 @@ interface JQuery {
 
 	/**
 	 * Fired after the filter members drop down opens.
-	 *                 Use ui.hierarchy for a reference to the hierarchy.
-	 *                 Use ui.dropDownElement for a reference to the drop down.
 	 */
 	igPivotDataSelector(optionLiteral: 'option', optionName: "filterDropDownOpened"): FilterDropDownOpenedEvent;
 
 	/**
 	 * Fired after the filter members drop down opens.
-	 *                 Use ui.hierarchy for a reference to the hierarchy.
-	 *                 Use ui.dropDownElement for a reference to the drop down.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -64551,17 +73702,11 @@ interface JQuery {
 
 	/**
 	 * Fired after the filter members are loaded.
-	 *                 Use ui.parent to get the parent node or the igTree instance in the initial load.
-	 *                 Use ui.rootFilterMembers for a collection with the root filter members .
-	 *                 Use ui.filterMembers for a collection with the newly loaded filter members.
 	 */
 	igPivotDataSelector(optionLiteral: 'option', optionName: "filterMembersLoaded"): FilterMembersLoadedEvent;
 
 	/**
 	 * Fired after the filter members are loaded.
-	 *                 Use ui.parent to get the parent node or the igTree instance in the initial load.
-	 *                 Use ui.rootFilterMembers for a collection with the root filter members .
-	 *                 Use ui.filterMembers for a collection with the newly loaded filter members.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -64569,17 +73714,11 @@ interface JQuery {
 
 	/**
 	 * Fired after the OK button in the filter members drop down is clicked. Return false to cancel the applying of the filters.
-	 *                 Use ui.hierarchy for a reference to the hierarchy.
-	 *                 Use ui.filterMembers for a collection with the selected filter members. If all filter members are selected the collection will be empty.
-	 *                 Use ui.dropDownElement for a reference to the drop down.
 	 */
 	igPivotDataSelector(optionLiteral: 'option', optionName: "filterDropDownOk"): FilterDropDownOkEvent;
 
 	/**
 	 * Fired after the OK button in the filter members drop down is clicked. Return false to cancel the applying of the filters.
-	 *                 Use ui.hierarchy for a reference to the hierarchy.
-	 *                 Use ui.filterMembers for a collection with the selected filter members. If all filter members are selected the collection will be empty.
-	 *                 Use ui.dropDownElement for a reference to the drop down.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -64587,15 +73726,11 @@ interface JQuery {
 
 	/**
 	 * Fired before the filter members drop down closes. Return false to cancel the closing.
-	 *                 Use ui.hierarchy for a reference to the hierarchy.
-	 *                 Use ui.dropDownElement for a reference to the drop down.
 	 */
 	igPivotDataSelector(optionLiteral: 'option', optionName: "filterDropDownClosing"): FilterDropDownClosingEvent;
 
 	/**
 	 * Fired before the filter members drop down closes. Return false to cancel the closing.
-	 *                 Use ui.hierarchy for a reference to the hierarchy.
-	 *                 Use ui.dropDownElement for a reference to the drop down.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -64603,13 +73738,11 @@ interface JQuery {
 
 	/**
 	 * Fired after the filter members drop down closes.
-	 *                 Use ui.hierarchy for a reference to the hierarchy.
 	 */
 	igPivotDataSelector(optionLiteral: 'option', optionName: "filterDropDownClosed"): FilterDropDownClosedEvent;
 
 	/**
 	 * Fired after the filter members drop down closes.
-	 *                 Use ui.hierarchy for a reference to the hierarchy.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -65018,6 +74151,7 @@ interface IgPivotGridGridOptions {
 
 	/**
 	 * Headers will be fixed if this option is set to true, and only the grid data will be scrollable.
+	 *
 	 */
 	fixedHeaders?: boolean;
 
@@ -65028,11 +74162,13 @@ interface IgPivotGridGridOptions {
 
 	/**
 	 * A list of grid features definitions. The supported features are Resizing and Tooltips. Each feature goes with its separate options that are documented for the feature accordingly.
+	 *
 	 */
 	features?: IgPivotGridGridOptionsFeatures;
 
 	/**
 	 * Initial tabIndex attribute that will be set on the container element.
+	 *
 	 */
 	tabIndex?: number;
 
@@ -65060,6 +74196,7 @@ interface IgPivotGridDragAndDropSettings {
 
 	/**
 	 * Specifies the containment for the drag helper. The area inside of which thehelper is contained would be scrollable while dragging.
+	 *
 	 */
 	containment?: boolean|string|Array<any>;
 
@@ -65080,19 +74217,19 @@ interface PivotGridHeadersRenderedEvent {
 
 interface PivotGridHeadersRenderedEventUIParam {
 	/**
-	 * Used to get a reference to the pivot grid.
+	 * Gets a reference to the pivot grid.
 	 */
 	owner?: any;
 
 	/**
-	 * Used to get a reference to the igGrid widget, which holds the headers.
+	 * Gets a reference to the igGrid widget, which holds the headers.
 	 */
 	grid?: any;
 
 	/**
-	 * Used to get a reference to the headers table DOM element.
+	 * Gets a reference to the headers table DOM element.
 	 */
-	table?: any;
+	table?: Element;
 }
 
 interface PivotGridRenderedEvent {
@@ -65101,12 +74238,12 @@ interface PivotGridRenderedEvent {
 
 interface PivotGridRenderedEventUIParam {
 	/**
-	 * Used to get a reference to the pivot grid.
+	 * Gets a reference to the pivot grid.
 	 */
 	owner?: any;
 
 	/**
-	 * Used to get reference to the igGrid widget, which represents the data.
+	 * Gets reference to the igGrid widget, which represents the data.
 	 */
 	grid?: any;
 }
@@ -65117,29 +74254,29 @@ interface TupleMemberExpandingEvent {
 
 interface TupleMemberExpandingEventUIParam {
 	/**
-	 * Used to get a reference to the pivot grid.
+	 * Gets a reference to the pivot grid.
 	 */
 	owner?: any;
 
 	/**
-	 * Used to get a reference to the data source.
+	 * Gets a reference to the data source.
 	 */
 	dataSource?: any;
 
 	/**
-	 * Used to get the name of axis, which holds the member and the tuple.
+	 * Gets the name of axis, which holds the member and the tuple.
 	 */
-	axisName?: any;
+	axisName?: string;
 
 	/**
-	 * Used to get the index of the tuple in the axis.
+	 * Gets the index of the tuple in the axis.
 	 */
-	tupleIndex?: any;
+	tupleIndex?: number;
 
 	/**
-	 * Used to get the index of the member in the tuple.
+	 * Gets the index of the member in the tuple.
 	 */
-	memberIndex?: any;
+	memberIndex?: number;
 }
 
 interface TupleMemberExpandedEvent {
@@ -65148,29 +74285,29 @@ interface TupleMemberExpandedEvent {
 
 interface TupleMemberExpandedEventUIParam {
 	/**
-	 * Used to get a reference to the pivot grid.
+	 * Gets a reference to the pivot grid.
 	 */
 	owner?: any;
 
 	/**
-	 * Used to get a reference to the data source.
+	 * Gets a reference to the data source.
 	 */
 	dataSource?: any;
 
 	/**
-	 * Used to get the name of axis, which holds the member and the tuple.
+	 * Gets the name of axis, which holds the member and the tuple.
 	 */
-	axisName?: any;
+	axisName?: string;
 
 	/**
-	 * Used to get the index of the tuple in the axis.
+	 * Gets the index of the tuple in the axis.
 	 */
-	tupleIndex?: any;
+	tupleIndex?: number;
 
 	/**
-	 * Used to get the index of the member in the tuple.
+	 * Gets the index of the member in the tuple.
 	 */
-	memberIndex?: any;
+	memberIndex?: number;
 }
 
 interface TupleMemberCollapsingEvent {
@@ -65179,29 +74316,29 @@ interface TupleMemberCollapsingEvent {
 
 interface TupleMemberCollapsingEventUIParam {
 	/**
-	 * Used to get a reference to the pivot grid.
+	 * Gets a reference to the pivot grid.
 	 */
 	owner?: any;
 
 	/**
-	 * Used to get a reference to the data source.
+	 * Gets a reference to the data source.
 	 */
 	dataSource?: any;
 
 	/**
-	 * Used to get the name of axis, which holds the member and the tuple.
+	 * Gets the name of axis, which holds the member and the tuple.
 	 */
-	axisName?: any;
+	axisName?: string;
 
 	/**
-	 * Used to get the index of the tuple in the axis.
+	 * Gets the index of the tuple in the axis.
 	 */
-	tupleIndex?: any;
+	tupleIndex?: number;
 
 	/**
-	 * Used to get the index of the member in the tuple.
+	 * Gets the index of the member in the tuple.
 	 */
-	memberIndex?: any;
+	memberIndex?: number;
 }
 
 interface TupleMemberCollapsedEvent {
@@ -65210,29 +74347,29 @@ interface TupleMemberCollapsedEvent {
 
 interface TupleMemberCollapsedEventUIParam {
 	/**
-	 * Used to get a reference to the pivot grid.
+	 * Gets a reference to the pivot grid.
 	 */
 	owner?: any;
 
 	/**
-	 * Used to get a reference to the data source.
+	 * Gets a reference to the data source.
 	 */
 	dataSource?: any;
 
 	/**
-	 * Used to get the name of axis, which holds the member and the tuple.
+	 * Gets the name of axis, which holds the member and the tuple.
 	 */
-	axisName?: any;
+	axisName?: string;
 
 	/**
-	 * Used to get the index of the tuple in the axis.
+	 * Gets the index of the tuple in the axis.
 	 */
-	tupleIndex?: any;
+	tupleIndex?: number;
 
 	/**
-	 * Used to get the index of the member in the tuple.
+	 * Gets the index of the member in the tuple.
 	 */
-	memberIndex?: any;
+	memberIndex?: number;
 }
 
 interface SortingEvent {
@@ -65241,14 +74378,14 @@ interface SortingEvent {
 
 interface SortingEventUIParam {
 	/**
-	 * Used to get a reference to the pivot grid.
+	 * Gets a reference to the pivot grid.
 	 */
 	owner?: any;
 
 	/**
-	 * Used to get an array of the tuple indices and sort directions that will be used.
+	 * Gets an array of the tuple indices and sort directions that will be used.
 	 */
-	sortDirections?: any;
+	sortDirections?: any[];
 }
 
 interface SortedEvent {
@@ -65257,19 +74394,19 @@ interface SortedEvent {
 
 interface SortedEventUIParam {
 	/**
-	 * Used to get a reference to the pivot grid.
+	 * Gets a reference to the pivot grid.
 	 */
 	owner?: any;
 
 	/**
-	 * Used to get an array of the tuple indices and sort directions that were passed to the table view.
+	 * Gets an array of the tuple indices and sort directions that were passed to the table view.
 	 */
-	sortDirections?: any;
+	sortDirections?: any[];
 
 	/**
-	 * Used to get an array of the tuple indices and sort directions that were actually applied to the table view.
+	 * Gets an array of the tuple indices and sort directions that were actually applied to the table view.
 	 */
-	appliedSortDirections?: any;
+	appliedSortDirections?: any[];
 }
 
 interface HeadersSortingEvent {
@@ -65278,14 +74415,14 @@ interface HeadersSortingEvent {
 
 interface HeadersSortingEventUIParam {
 	/**
-	 * Used to get a reference to the pivot grid.
+	 * Gets a reference to the pivot grid.
 	 */
 	owner?: any;
 
 	/**
-	 * Used to get an array of the level names and sort directions that will be used.
+	 * Gets an array of the level names and sort directions that will be used.
 	 */
-	levelSortDirections?: any;
+	levelSortDirections?: any[];
 }
 
 interface HeadersSortedEvent {
@@ -65294,27 +74431,34 @@ interface HeadersSortedEvent {
 
 interface HeadersSortedEventUIParam {
 	/**
-	 * Used to get a reference to the pivot grid.
+	 * Gets a reference to the pivot grid.
 	 */
 	owner?: any;
 
 	/**
-	 * Used to get an array of the level names and sort directions that were used.
+	 * Gets an array of the level names and sort directions that were used.
 	 */
-	levelSortDirections?: any;
+	levelSortDirections?: any[];
 
 	/**
-	 * Used to get an array of the level names and sort directions that were actually applied to the table view.
+	 * Gets an array of the level names and sort directions that were actually applied to the table view.
 	 */
-	appliedLevelSortDirections?: any;
+	appliedLevelSortDirections?: any[];
 }
 
 interface IgPivotGrid {
+	/**
+	 *
+	 *
+	 * Valid values:
+	 * "null" Will stretch to fit the data, if no other widths are defined.
+	 */
 	width?: string|number;
 
 	/**
 	 * This is the total height of the grid.
 	 *
+	 *
 	 * Valid values:
 	 * "null" Will stretch vertically to fit data, if no other heights are defined
 	 */
@@ -65322,17 +74466,20 @@ interface IgPivotGrid {
 
 	/**
 	 * An instance of $.ig.OlapXmlaDataSource or $.ig.OlapFlatDataSource.
+	 *
 	 */
 	dataSource?: any;
 
 	/**
 	 * An object that will be used to create an instance of $.ig.OlapXmlaDataSource or $.ig.OlapFlatDataSource.
 	 * The provided value must contain an object with settings for one of the data source types - xmlaOptions or flatDataOptions.
+	 *
 	 */
 	dataSourceOptions?: IgPivotGridDataSourceOptions;
 
 	/**
 	 * Setting deferUpdate to true will not apply changes to the data source until the updateGrid method is called.
+	 *
 	 */
 	deferUpdate?: boolean;
 
@@ -65340,6 +74487,7 @@ interface IgPivotGrid {
 	 * A boolean value indicating whether a parent in the columns is in front of its children.
 	 * If set to true, the query set sorts members in a level in their natural order - child members immediately follow their parent members.
 	 * If set to false the query set sorts the members in a level using a post-natural order. In other words, child members precede their parents.
+	 *
 	 */
 	isParentInFrontForColumns?: boolean;
 
@@ -65347,16 +74495,19 @@ interface IgPivotGrid {
 	 * A boolean value indicating whether a parent in the rows is in front of its children.
 	 * If set to true, the query set sorts members in a level in their natural order - child members immediately follow their parent members.
 	 * If set to false the query set sorts the members in a level using a post-natural order. In other words, child members precede their parents.
+	 *
 	 */
 	isParentInFrontForRows?: boolean;
 
 	/**
 	 * A boolean value indicating whether the column headers should be arranged for compact header layout i.e. each hierarchy is in a single row.
+	 *
 	 */
 	compactColumnHeaders?: boolean;
 
 	/**
 	 * A boolean value indicating whether the row headers should be arranged for compact header layout i.e. each hierarchy is in a single column.
+	 *
 	 */
 	compactRowHeaders?: boolean;
 
@@ -65365,6 +74516,7 @@ interface IgPivotGrid {
 	 * superCompact Each hierarchy in the rows is displayed in a separate column. The child members of a member in the rows are displayed on above or below it (Depending on the isParentInFrontForRows setting).
 	 * tree All hierarchies in the rows are displayed in a tree-like structure in a single column (The column's width is dependent on the defaultRowHEaderWidth, which can be set to "null" to enable the built-in auto-sizing functionality).
 	 *
+	 *
 	 * Valid values:
 	 * "standard"
 	 * "superCompact"
@@ -65374,11 +74526,13 @@ interface IgPivotGrid {
 
 	/**
 	 * The indentation for every level column when the compactColumnHeaders is set to true.
+	 *
 	 */
 	compactColumnHeaderIndentation?: number;
 
 	/**
 	 * The indentation for every level row when the rowHeadersLayout is set to 'superCompact'.
+	 *
 	 */
 	compactRowHeaderIndentation?: number;
 
@@ -65394,31 +74548,37 @@ interface IgPivotGrid {
 
 	/**
 	 * Specifies the width of the row headers.
+	 *
 	 */
 	defaultRowHeaderWidth?: number;
 
 	/**
 	 * Enables sorting of the value cells in columns.
+	 *
 	 */
 	allowSorting?: boolean;
 
 	/**
 	 * Specifies the default sort direction for the rows.
+	 *
 	 */
 	firstSortDirection?: any;
 
 	/**
 	 * Enables sorting of the header cells in rows.
+	 *
 	 */
 	allowHeaderRowsSorting?: boolean;
 
 	/**
 	 * Enables sorting of the header cells in columns.
+	 *
 	 */
 	allowHeaderColumnsSorting?: boolean;
 
 	/**
 	 * An array of level sort direction items, which predefine the sorted header cells.
+	 *
 	 */
 	levelSortDirections?: IgPivotGridLevelSortDirection[];
 
@@ -65433,16 +74593,19 @@ interface IgPivotGrid {
 
 	/**
 	 * Specifies the default sort direction for the levels if no sort direction is specified in an item from the levelSortDirections option.
+	 *
 	 */
 	firstLevelSortDirection?: any;
 
 	/**
 	 * Options specific to the igGrid that will render the pivot grid view.
+	 *
 	 */
 	gridOptions?: IgPivotGridGridOptions;
 
 	/**
 	 * Settings for the drag and drop functionality of the igPivotGrid.
+	 *
 	 */
 	dragAndDropSettings?: IgPivotGridDragAndDropSettings;
 
@@ -65453,46 +74616,55 @@ interface IgPivotGrid {
 
 	/**
 	 * Disable the drag and drop for the rows drop area and the ability to use filtering and remove items from it.
+	 *
 	 */
 	disableRowsDropArea?: boolean;
 
 	/**
 	 * Disable the drag and drop for the columns drop area and the ability to use filtering and remove items from it.
+	 *
 	 */
 	disableColumnsDropArea?: boolean;
 
 	/**
 	 * Disable the drag and drop for the measures drop area and the ability to use filtering and remove items from it.
+	 *
 	 */
 	disableMeasuresDropArea?: boolean;
 
 	/**
 	 * Disable the drag and drop for the filters drop area and the ability to use filtering and remove items from it.
+	 *
 	 */
 	disableFiltersDropArea?: boolean;
 
 	/**
 	 * Hide the rows drop area.
+	 *
 	 */
 	hideRowsDropArea?: boolean;
 
 	/**
 	 * Hide the columns drop area.
+	 *
 	 */
 	hideColumnsDropArea?: boolean;
 
 	/**
 	 * Hide the measures drop area.
+	 *
 	 */
 	hideMeasuresDropArea?: boolean;
 
 	/**
 	 * Hide the filters drop area.
+	 *
 	 */
 	hideFiltersDropArea?: boolean;
 
 	/**
 	 * A function that will be called to determine if an item can be moved in or dropped on an area of the pivot grid.
+	 *
 	 * paramType="string" The location where the item will be moved - igPivotGrid, igPivotDataSelector, filters, rows, columns or measures.
 	 * paramType="string" The type of the item - Hierarchy, Measure or MeasureList.
 	 * paramType="string" The unique name of the item.
@@ -65500,226 +74672,146 @@ interface IgPivotGrid {
 	 */
 	customMoveValidation?: Function;
 
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	locale?: any;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	language?: string;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+	regional?: string|Object;
+
 	/**
 	 * Fired after the data source has initialized.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to get a reference to the pivot grid.
-	 * Use ui.dataSource to get a reference to the data source.
-	 * Use ui.error to see if an error has occured during initialization.
-	 * Use ui.metadataTreeRoot to get a reference to the root of the data source metatadata root item.
 	 */
 	dataSourceInitialized?: DataSourceInitializedEvent;
 
 	/**
 	 * Fired after the data source has updated.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to get a reference to the pivot grid.
-	 * Use ui.dataSource to get a reference to the data source.
-	 * Use ui.error to see if an error has occured during update.
-	 * Use ui.result to get the result of the update operation.
 	 */
 	dataSourceUpdated?: DataSourceUpdatedEvent;
 
 	/**
 	 * Event fired after the headers have been rendered.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to get a reference to the pivot grid.
-	 * Use ui.grid to get a reference to the igGrid widget, which holds the headers.
-	 * Use ui.table to get a reference to the headers table DOM element.
 	 */
 	pivotGridHeadersRendered?: PivotGridHeadersRenderedEvent;
 
 	/**
 	 * Event fired after the whole grid widget has been rendered (including headers, footers, etc.).
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to get a reference to the pivot grid.
-	 * Use ui.grid to get reference to the igGrid widget, which represents the data.
 	 */
 	pivotGridRendered?: PivotGridRenderedEvent;
 
 	/**
-	 * Fired before the expand of the tuple member.
-	 * Function takes arguments evt and ui. Return false to cancel the expanding.
-	 * Use ui.owner to get a reference to the pivot grid.
-	 * Use ui.dataSource to get a reference to the data source.
-	 * Use ui.axisName to get the name of axis, which holds the member and the tuple.
-	 * Use ui.tupleIndex to get the index of the tuple in the axis.
-	 * Use ui.memberIndex to get the index of the member in the tuple.
+	 * Fired before the expand of the tuple member. Return false to cancel the expanding.
 	 */
 	tupleMemberExpanding?: TupleMemberExpandingEvent;
 
 	/**
 	 * Fired after the expand of the tuple member.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to get a reference to the pivot grid.
-	 * Use ui.dataSource to get a reference to the data source.
-	 * Use ui.axisName to get the name of axis, which holds the member and the tuple.
-	 * Use ui.tupleIndex to get the index of the tuple in the axis.
-	 * Use ui.memberIndex to get the index of the member in the tuple.
 	 */
 	tupleMemberExpanded?: TupleMemberExpandedEvent;
 
 	/**
-	 * Fired before the collapse of the tuple member.
-	 * Function takes arguments evt and ui. Return false to cancel the collapsing.
-	 * Use ui.owner to get a reference to the pivot grid.
-	 * Use ui.dataSource to get a reference to the data source.
-	 * Use ui.axisName to get the name of axis, which holds the member and the tuple.
-	 * Use ui.tupleIndex to get the index of the tuple in the axis.
-	 * Use ui.memberIndex to get the index of the member in the tuple.
+	 * Fired before the collapse of the tuple member. Return false to cancel the collapsing.
 	 */
 	tupleMemberCollapsing?: TupleMemberCollapsingEvent;
 
 	/**
 	 * Fired after the collapse of the tuple member.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to get a reference to the pivot grid.
-	 * Use ui.dataSource to get a reference to the data source.
-	 * Use ui.axisName to get the name of axis, which holds the member and the tuple.
-	 * Use ui.tupleIndex to get the index of the tuple in the axis.
-	 * Use ui.memberIndex to get the index of the member in the tuple.
 	 */
 	tupleMemberCollapsed?: TupleMemberCollapsedEvent;
 
 	/**
-	 * Fired before the sorting of the columns.
-	 * Function takes arguments evt and ui. Return false to cancel the sorting.
-	 * Use ui.owner to get a reference to the pivot grid.
-	 * Use ui.sortDirections to get an array of the tuple indices and sort directions that will be used.
+	 * Fired before the sorting of the columns. Return false to cancel the sorting.
 	 */
 	sorting?: SortingEvent;
 
 	/**
 	 * Fired after the sorting of the columns.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to get a reference to the pivot grid.
-	 * Use ui.sortDirections to get an array of the tuple indices and sort directions that were passed to the table view.
-	 * Use ui.appliedSortDirections to get an array of the tuple indices and sort directions that were actually applied to the table view.
 	 */
 	sorted?: SortedEvent;
 
 	/**
-	 * Fired before the sorting of the headers.
-	 * Function takes arguments evt and ui. Return false to cancel the sorting.
-	 * Use ui.owner to get a reference to the pivot grid.
-	 * Use ui.levelSortDirections to get an array of the level names and sort directions that will be used.
+	 * Fired before the sorting of the headers. Return false to cancel the sorting.
 	 */
 	headersSorting?: HeadersSortingEvent;
 
 	/**
 	 * Fired after the sorting of the headers.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to get a reference to the pivot grid.
-	 * Use ui.levelSortDirections to get an array of the level names and sort directions that were used.
-	 * Use ui.appliedLevelSortDirections to get an array of the level names and sort directions that were actually applied to the table view.
 	 */
 	headersSorted?: HeadersSortedEvent;
 
 	/**
 	 * Fired on drag start. Return false to cancel the dragging.
-	 * Use ui.metadatato get a reference to the data.
-	 * Use ui.helper to get a reference to the helper.
-	 * Use ui.offset to get a reference to the offset.
-	 * Use ui.originalPosition to get a reference to the original position of the draggable element.
-	 * Use ui.position to get a reference to the current position of the draggable element.
 	 */
 	dragStart?: DragStartEvent;
 
 	/**
 	 * Fired on drag. Return false to cancel the drag.
-	 * Use ui.metadatato get a reference to the data.
-	 * Use ui.helper to get a reference to the helper.
-	 * Use ui.offset to get a reference to the offset.
-	 * Use ui.originalPosition to get a reference to the original position of the draggable element.
-	 * Use ui.position to get a reference to the current position of the draggable element.
 	 */
 	drag?: DragEvent;
 
 	/**
 	 * Fired on drag stop.
-	 * Use ui.helper to get a reference to the helper.
-	 * Use ui.offset to get a reference to the offset.
-	 * Use ui.originalPosition to get a reference to the original position of the draggable element.
-	 * Use ui.position to get a reference to the current position of the draggable element.
 	 */
 	dragStop?: DragStopEvent;
 
 	/**
 	 * Fired before a metadata item drop. Return false to cancel the drop.
-	 * Use ui.targetElement for a reference to the drop target.
-	 * Use ui.draggedElement for a reference to the metadata item element.
-	 * Use ui.metadatato get a reference to the data.
-	 * Use ui.metadataIndex to get the index at which the metadata will be inserted.
-	 * Use ui.helper to get a reference to the helper.
-	 * Use ui.offset to get a reference to the offset.
-	 * Use ui.position to get a reference to the current position of the draggable element.
 	 */
 	metadataDropping?: MetadataDroppingEvent;
 
 	/**
 	 * Fired after a metadata item drop.
-	 * Use ui.targetElement for a reference to the drop target.
-	 * Use ui.draggedElement for a reference to the dragged element.
-	 * Use ui.metadatato get a reference to the data.
-	 * Use ui.metadataIndex to get the index at which the metadata is inserted.
-	 * Use ui.helper to get a reference to the helper.
-	 * Use ui.offset to get a reference to the offset.
-	 * Use ui.position to get a reference to the current position of the draggable element.
 	 */
 	metadataDropped?: MetadataDroppedEvent;
 
 	/**
 	 * Fired before a metadata item is removed when the user clicks the close icon. Return false to cancel the removing.
-	 * Use ui.targetElement for a reference to the dragged element.
-	 * Use ui.metadatato get a reference to the data.
 	 */
 	metadataRemoving?: MetadataRemovingEvent;
 
 	/**
 	 * Fired after a metadata item is removed when the user clicks the close icon.
-	 * Use ui.metadatato get a reference to the data.
 	 */
 	metadataRemoved?: MetadataRemovedEvent;
 
 	/**
 	 * Fired before the filter members drop down opens. Return false to cancel the opening.
-	 * Use ui.hierarchy for a reference to the hierarchy.
 	 */
 	filterDropDownOpening?: FilterDropDownOpeningEvent;
 
 	/**
 	 * Fired after the filter members drop down opens.
-	 * Use ui.hierarchy for a reference to the hierarchy.
-	 * Use ui.dropDownElement for a reference to the drop down.
 	 */
 	filterDropDownOpened?: FilterDropDownOpenedEvent;
 
 	/**
 	 * Fired after the filter members are loaded.
-	 * Use ui.parent to get the parent node or the igTree instance in the initial load.
-	 * Use ui.rootFilterMembers for a collection with the root filter members .
-	 * Use ui.filterMembers for a collection with the newly loaded filter members.
 	 */
 	filterMembersLoaded?: FilterMembersLoadedEvent;
 
 	/**
 	 * Fired after the OK button in the filter members drop down is clicked. Return false to cancel the applying of the filters.
-	 * Use ui.hierarchy for a reference to the hierarchy.
-	 * Use ui.filterMembers for a collection with the selected filter members. If all filter members are selected the collection will be empty.
-	 * Use ui.dropDownElement for a reference to the drop down.
 	 */
 	filterDropDownOk?: FilterDropDownOkEvent;
 
 	/**
 	 * Fired before the filter members drop down closes. Return false to cancel the closing.
-	 * Use ui.hierarchy for a reference to the hierarchy.
-	 * Use ui.dropDownElement for a reference to the drop down.
 	 */
 	filterDropDownClosing?: FilterDropDownClosingEvent;
 
 	/**
 	 * Fired after the filter members drop down closes.
-	 * Use ui.hierarchy for a reference to the hierarchy.
 	 */
 	filterDropDownClosed?: FilterDropDownClosedEvent;
 
@@ -65729,7 +74821,16 @@ interface IgPivotGrid {
 	[optionName: string]: any;
 }
 interface IgPivotGridMethods {
+	/**
+	 * Changes the all locales into the widget element to the language specified in [options.language](ui.igpivotgrid#options:language)
+	 * Note that this method is for rare scenarios, see [language](ui.igpivotgrid#options:language) or [locale](ui.igpivotgrid#options:locale) option setter
+	 */
 	changeLocale(): void;
+
+	/**
+	 * Changes the the regional settings of widget element to the language specified in [options.regional](ui.igpivotgrid#options:regional)
+	 * Note that this method is for rare scenarios, use [regional](ui.igpivotgrid#options:regional) option setter
+	 */
 	changeRegional(): void;
 
 	/**
@@ -65764,6 +74865,7 @@ interface IgPivotGridMethods {
 
 	/**
 	 * Returns an array with the applied sort directions on the igPivotGrid's columns. The returned array contains objects with the following properties:
+	 *
 	 * memberNames: The names of the members in the tuple.
 	 * tupleIndex: The index of the tuple on the column axis in the original unsorted result.
 	 * sortDirection: The direction of the sort - ascending or descending.
@@ -65772,6 +74874,7 @@ interface IgPivotGridMethods {
 
 	/**
 	 * Returns an array with the applied level sort direction items, which were used for the sorting of the header cells. The returned array contains objects with the following properties:
+	 *
 	 * levelUniqueName: Specifies the unique name of the level, which was sorted.
 	 * sortDirection: The direction of the header sort - ascending or descending.
 	 */
@@ -65784,6 +74887,16 @@ interface IgPivotGridMethods {
 	 * 3. Unbind all events that were bound.
 	 */
 	destroy(): void;
+
+	/**
+	 * Changes the widget language to global language. Global language is the value in $.ig.util.language
+	 */
+	changeGlobalLanguage(): void;
+
+	/**
+	 * Changes the widget regional settins to global regional settings. Global regional settings are container in $.ig.util.regional
+	 */
+	changeGlobalRegional(): void;
 }
 interface JQuery {
 	data(propertyName: "igPivotGrid"): IgPivotGridMethods;
@@ -65799,13 +74912,26 @@ interface JQuery {
 	igPivotGrid(methodName: "appliedColumnSortDirections"): any[];
 	igPivotGrid(methodName: "appliedLevelSortDirections"): any[];
 	igPivotGrid(methodName: "destroy"): void;
+	igPivotGrid(methodName: "changeGlobalLanguage"): void;
+	igPivotGrid(methodName: "changeGlobalRegional"): void;
+
+	/**
+	 * *
+	 */
 
 	igPivotGrid(optionLiteral: 'option', optionName: "width"): string|number;
 
+	/**
+	 * *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
 	igPivotGrid(optionLiteral: 'option', optionName: "width", optionValue: string|number): void;
 
 	/**
 	 * This is the total height of the grid.
+	 *
 	 */
 
 	igPivotGrid(optionLiteral: 'option', optionName: "height"): string|number;
@@ -65813,6 +74939,7 @@ interface JQuery {
 	/**
 	 * This is the total height of the grid.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -65820,12 +74947,14 @@ interface JQuery {
 
 	/**
 	 * An instance of $.ig.OlapXmlaDataSource or $.ig.OlapFlatDataSource.
+	 *
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "dataSource"): any;
 
 	/**
 	 * An instance of $.ig.OlapXmlaDataSource or $.ig.OlapFlatDataSource.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "dataSource", optionValue: any): void;
@@ -65833,6 +74962,7 @@ interface JQuery {
 	/**
 	 * An object that will be used to create an instance of $.ig.OlapXmlaDataSource or $.ig.OlapFlatDataSource.
 	 * The provided value must contain an object with settings for one of the data source types - xmlaOptions or flatDataOptions.
+	 *
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "dataSourceOptions"): IgPivotGridDataSourceOptions;
 
@@ -65840,18 +74970,21 @@ interface JQuery {
 	 * An object that will be used to create an instance of $.ig.OlapXmlaDataSource or $.ig.OlapFlatDataSource.
 	 * The provided value must contain an object with settings for one of the data source types - xmlaOptions or flatDataOptions.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "dataSourceOptions", optionValue: IgPivotGridDataSourceOptions): void;
 
 	/**
 	 * Setting deferUpdate to true will not apply changes to the data source until the updateGrid method is called.
+	 *
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "deferUpdate"): boolean;
 
 	/**
 	 * Setting deferUpdate to true will not apply changes to the data source until the updateGrid method is called.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "deferUpdate", optionValue: boolean): void;
@@ -65860,6 +74993,7 @@ interface JQuery {
 	 * A boolean value indicating whether a parent in the columns is in front of its children.
 	 * If set to true, the query set sorts members in a level in their natural order - child members immediately follow their parent members.
 	 * If set to false the query set sorts the members in a level using a post-natural order. In other words, child members precede their parents.
+	 *
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "isParentInFrontForColumns"): boolean;
 
@@ -65868,6 +75002,7 @@ interface JQuery {
 	 * If set to true, the query set sorts members in a level in their natural order - child members immediately follow their parent members.
 	 * If set to false the query set sorts the members in a level using a post-natural order. In other words, child members precede their parents.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "isParentInFrontForColumns", optionValue: boolean): void;
@@ -65876,6 +75011,7 @@ interface JQuery {
 	 * A boolean value indicating whether a parent in the rows is in front of its children.
 	 * If set to true, the query set sorts members in a level in their natural order - child members immediately follow their parent members.
 	 * If set to false the query set sorts the members in a level using a post-natural order. In other words, child members precede their parents.
+	 *
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "isParentInFrontForRows"): boolean;
 
@@ -65884,30 +75020,35 @@ interface JQuery {
 	 * If set to true, the query set sorts members in a level in their natural order - child members immediately follow their parent members.
 	 * If set to false the query set sorts the members in a level using a post-natural order. In other words, child members precede their parents.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "isParentInFrontForRows", optionValue: boolean): void;
 
 	/**
 	 * A boolean value indicating whether the column headers should be arranged for compact header layout i.e. each hierarchy is in a single row.
+	 *
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "compactColumnHeaders"): boolean;
 
 	/**
 	 * A boolean value indicating whether the column headers should be arranged for compact header layout i.e. each hierarchy is in a single row.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "compactColumnHeaders", optionValue: boolean): void;
 
 	/**
 	 * A boolean value indicating whether the row headers should be arranged for compact header layout i.e. each hierarchy is in a single column.
+	 *
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "compactRowHeaders"): boolean;
 
 	/**
 	 * A boolean value indicating whether the row headers should be arranged for compact header layout i.e. each hierarchy is in a single column.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "compactRowHeaders", optionValue: boolean): void;
@@ -65916,6 +75057,7 @@ interface JQuery {
 	 * A value indicating whether the layout that row headers should be arranged.standard Each hierarchy in the rows is displayed in a separate column. The child members of a member in the rows are displayed on its right.
 	 * superCompact Each hierarchy in the rows is displayed in a separate column. The child members of a member in the rows are displayed on above or below it (Depending on the isParentInFrontForRows setting).
 	 * tree All hierarchies in the rows are displayed in a tree-like structure in a single column (The column's width is dependent on the defaultRowHEaderWidth, which can be set to "null" to enable the built-in auto-sizing functionality).
+	 *
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "rowHeadersLayout"): any;
 
@@ -65924,30 +75066,35 @@ interface JQuery {
 	 * superCompact Each hierarchy in the rows is displayed in a separate column. The child members of a member in the rows are displayed on above or below it (Depending on the isParentInFrontForRows setting).
 	 * tree All hierarchies in the rows are displayed in a tree-like structure in a single column (The column's width is dependent on the defaultRowHEaderWidth, which can be set to "null" to enable the built-in auto-sizing functionality).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "rowHeadersLayout", optionValue: any): void;
 
 	/**
 	 * The indentation for every level column when the compactColumnHeaders is set to true.
+	 *
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "compactColumnHeaderIndentation"): number;
 
 	/**
 	 * The indentation for every level column when the compactColumnHeaders is set to true.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "compactColumnHeaderIndentation", optionValue: number): void;
 
 	/**
 	 * The indentation for every level row when the rowHeadersLayout is set to 'superCompact'.
+	 *
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "compactRowHeaderIndentation"): number;
 
 	/**
 	 * The indentation for every level row when the rowHeadersLayout is set to 'superCompact'.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "compactRowHeaderIndentation", optionValue: number): void;
@@ -65978,72 +75125,84 @@ interface JQuery {
 
 	/**
 	 * Gets the width of the row headers.
+	 *
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "defaultRowHeaderWidth"): number;
 
 	/**
 	 * Sets the width of the row headers.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "defaultRowHeaderWidth", optionValue: number): void;
 
 	/**
 	 * Enables sorting of the value cells in columns.
+	 *
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "allowSorting"): boolean;
 
 	/**
 	 * Enables sorting of the value cells in columns.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "allowSorting", optionValue: boolean): void;
 
 	/**
 	 * Gets the default sort direction for the rows.
+	 *
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "firstSortDirection"): any;
 
 	/**
 	 * Sets the default sort direction for the rows.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "firstSortDirection", optionValue: any): void;
 
 	/**
 	 * Enables sorting of the header cells in rows.
+	 *
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "allowHeaderRowsSorting"): boolean;
 
 	/**
 	 * Enables sorting of the header cells in rows.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "allowHeaderRowsSorting", optionValue: boolean): void;
 
 	/**
 	 * Enables sorting of the header cells in columns.
+	 *
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "allowHeaderColumnsSorting"): boolean;
 
 	/**
 	 * Enables sorting of the header cells in columns.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "allowHeaderColumnsSorting", optionValue: boolean): void;
 
 	/**
 	 * An array of level sort direction items, which predefine the sorted header cells.
+	 *
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "levelSortDirections"): IgPivotGridLevelSortDirection[];
 
 	/**
 	 * An array of level sort direction items, which predefine the sorted header cells.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "levelSortDirections", optionValue: IgPivotGridLevelSortDirection[]): void;
@@ -66064,36 +75223,42 @@ interface JQuery {
 
 	/**
 	 * Gets the default sort direction for the levels if no sort direction is specified in an item from the levelSortDirections option.
+	 *
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "firstLevelSortDirection"): any;
 
 	/**
 	 * Sets the default sort direction for the levels if no sort direction is specified in an item from the levelSortDirections option.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "firstLevelSortDirection", optionValue: any): void;
 
 	/**
 	 * Options specific to the igGrid that will render the pivot grid view.
+	 *
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "gridOptions"): IgPivotGridGridOptions;
 
 	/**
 	 * Options specific to the igGrid that will render the pivot grid view.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "gridOptions", optionValue: IgPivotGridGridOptions): void;
 
 	/**
 	 * Settings for the drag and drop functionality of the igPivotGrid.
+	 *
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "dragAndDropSettings"): IgPivotGridDragAndDropSettings;
 
 	/**
 	 * Settings for the drag and drop functionality of the igPivotGrid.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "dragAndDropSettings", optionValue: IgPivotGridDragAndDropSettings): void;
@@ -66112,102 +75277,119 @@ interface JQuery {
 
 	/**
 	 * Disable the drag and drop for the rows drop area and the ability to use filtering and remove items from it.
+	 *
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "disableRowsDropArea"): boolean;
 
 	/**
 	 * Disable the drag and drop for the rows drop area and the ability to use filtering and remove items from it.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "disableRowsDropArea", optionValue: boolean): void;
 
 	/**
 	 * Disable the drag and drop for the columns drop area and the ability to use filtering and remove items from it.
+	 *
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "disableColumnsDropArea"): boolean;
 
 	/**
 	 * Disable the drag and drop for the columns drop area and the ability to use filtering and remove items from it.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "disableColumnsDropArea", optionValue: boolean): void;
 
 	/**
 	 * Disable the drag and drop for the measures drop area and the ability to use filtering and remove items from it.
+	 *
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "disableMeasuresDropArea"): boolean;
 
 	/**
 	 * Disable the drag and drop for the measures drop area and the ability to use filtering and remove items from it.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "disableMeasuresDropArea", optionValue: boolean): void;
 
 	/**
 	 * Disable the drag and drop for the filters drop area and the ability to use filtering and remove items from it.
+	 *
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "disableFiltersDropArea"): boolean;
 
 	/**
 	 * Disable the drag and drop for the filters drop area and the ability to use filtering and remove items from it.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "disableFiltersDropArea", optionValue: boolean): void;
 
 	/**
 	 * Hide the rows drop area.
+	 *
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "hideRowsDropArea"): boolean;
 
 	/**
 	 * Hide the rows drop area.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "hideRowsDropArea", optionValue: boolean): void;
 
 	/**
 	 * Hide the columns drop area.
+	 *
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "hideColumnsDropArea"): boolean;
 
 	/**
 	 * Hide the columns drop area.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "hideColumnsDropArea", optionValue: boolean): void;
 
 	/**
 	 * Hide the measures drop area.
+	 *
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "hideMeasuresDropArea"): boolean;
 
 	/**
 	 * Hide the measures drop area.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "hideMeasuresDropArea", optionValue: boolean): void;
 
 	/**
 	 * Hide the filters drop area.
+	 *
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "hideFiltersDropArea"): boolean;
 
 	/**
 	 * Hide the filters drop area.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "hideFiltersDropArea", optionValue: boolean): void;
 
 	/**
 	 * A function that will be called to determine if an item can be moved in or dropped on an area of the pivot grid.
+	 *
 	 * paramType="string" The location where the item will be moved - igPivotGrid, igPivotDataSelector, filters, rows, columns or measures.
 	 * paramType="string" The type of the item - Hierarchy, Measure or MeasureList.
 	 * paramType="string" The unique name of the item.
@@ -66217,6 +75399,7 @@ interface JQuery {
 
 	/**
 	 * A function that will be called to determine if an item can be moved in or dropped on an area of the pivot grid.
+	 *
 	 * paramType="string" The location where the item will be moved - igPivotGrid, igPivotDataSelector, filters, rows, columns or measures.
 	 * paramType="string" The type of the item - Hierarchy, Measure or MeasureList.
 	 * paramType="string" The unique name of the item.
@@ -66226,23 +75409,57 @@ interface JQuery {
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "customMoveValidation", optionValue: Function): void;
 
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	igPivotGrid(optionLiteral: 'option', optionName: "locale"): any;
+
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igPivotGrid(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	igPivotGrid(optionLiteral: 'option', optionName: "language"): string;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igPivotGrid(optionLiteral: 'option', optionName: "language", optionValue: string): void;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+
+	igPivotGrid(optionLiteral: 'option', optionName: "regional"): string|Object;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igPivotGrid(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
+
 	/**
 	 * Fired after the data source has initialized.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to get a reference to the pivot grid.
-	 * Use ui.dataSource to get a reference to the data source.
-	 * Use ui.error to see if an error has occured during initialization.
-	 * Use ui.metadataTreeRoot to get a reference to the root of the data source metatadata root item.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "dataSourceInitialized"): DataSourceInitializedEvent;
 
 	/**
 	 * Fired after the data source has initialized.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to get a reference to the pivot grid.
-	 * Use ui.dataSource to get a reference to the data source.
-	 * Use ui.error to see if an error has occured during initialization.
-	 * Use ui.metadataTreeRoot to get a reference to the root of the data source metatadata root item.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -66250,21 +75467,11 @@ interface JQuery {
 
 	/**
 	 * Fired after the data source has updated.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to get a reference to the pivot grid.
-	 * Use ui.dataSource to get a reference to the data source.
-	 * Use ui.error to see if an error has occured during update.
-	 * Use ui.result to get the result of the update operation.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "dataSourceUpdated"): DataSourceUpdatedEvent;
 
 	/**
 	 * Fired after the data source has updated.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to get a reference to the pivot grid.
-	 * Use ui.dataSource to get a reference to the data source.
-	 * Use ui.error to see if an error has occured during update.
-	 * Use ui.result to get the result of the update operation.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -66272,19 +75479,11 @@ interface JQuery {
 
 	/**
 	 * Event fired after the headers have been rendered.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to get a reference to the pivot grid.
-	 * Use ui.grid to get a reference to the igGrid widget, which holds the headers.
-	 * Use ui.table to get a reference to the headers table DOM element.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "pivotGridHeadersRendered"): PivotGridHeadersRenderedEvent;
 
 	/**
 	 * Event fired after the headers have been rendered.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to get a reference to the pivot grid.
-	 * Use ui.grid to get a reference to the igGrid widget, which holds the headers.
-	 * Use ui.table to get a reference to the headers table DOM element.
 	 *
 	 * @optionValue Define event handler function.
 	 */
@@ -66292,41 +75491,23 @@ interface JQuery {
 
 	/**
 	 * Event fired after the whole grid widget has been rendered (including headers, footers, etc.).
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to get a reference to the pivot grid.
-	 * Use ui.grid to get reference to the igGrid widget, which represents the data.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "pivotGridRendered"): PivotGridRenderedEvent;
 
 	/**
 	 * Event fired after the whole grid widget has been rendered (including headers, footers, etc.).
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to get a reference to the pivot grid.
-	 * Use ui.grid to get reference to the igGrid widget, which represents the data.
 	 *
 	 * @optionValue Define event handler function.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "pivotGridRendered", optionValue: PivotGridRenderedEvent): void;
 
 	/**
-	 * Fired before the expand of the tuple member.
-	 * Function takes arguments evt and ui. Return false to cancel the expanding.
-	 * Use ui.owner to get a reference to the pivot grid.
-	 * Use ui.dataSource to get a reference to the data source.
-	 * Use ui.axisName to get the name of axis, which holds the member and the tuple.
-	 * Use ui.tupleIndex to get the index of the tuple in the axis.
-	 * Use ui.memberIndex to get the index of the member in the tuple.
+	 * Fired before the expand of the tuple member. Return false to cancel the expanding.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "tupleMemberExpanding"): TupleMemberExpandingEvent;
 
 	/**
-	 * Fired before the expand of the tuple member.
-	 * Function takes arguments evt and ui. Return false to cancel the expanding.
-	 * Use ui.owner to get a reference to the pivot grid.
-	 * Use ui.dataSource to get a reference to the data source.
-	 * Use ui.axisName to get the name of axis, which holds the member and the tuple.
-	 * Use ui.tupleIndex to get the index of the tuple in the axis.
-	 * Use ui.memberIndex to get the index of the member in the tuple.
+	 * Fired before the expand of the tuple member. Return false to cancel the expanding.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -66334,47 +75515,23 @@ interface JQuery {
 
 	/**
 	 * Fired after the expand of the tuple member.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to get a reference to the pivot grid.
-	 * Use ui.dataSource to get a reference to the data source.
-	 * Use ui.axisName to get the name of axis, which holds the member and the tuple.
-	 * Use ui.tupleIndex to get the index of the tuple in the axis.
-	 * Use ui.memberIndex to get the index of the member in the tuple.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "tupleMemberExpanded"): TupleMemberExpandedEvent;
 
 	/**
 	 * Fired after the expand of the tuple member.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to get a reference to the pivot grid.
-	 * Use ui.dataSource to get a reference to the data source.
-	 * Use ui.axisName to get the name of axis, which holds the member and the tuple.
-	 * Use ui.tupleIndex to get the index of the tuple in the axis.
-	 * Use ui.memberIndex to get the index of the member in the tuple.
 	 *
 	 * @optionValue New value to be set.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "tupleMemberExpanded", optionValue: TupleMemberExpandedEvent): void;
 
 	/**
-	 * Fired before the collapse of the tuple member.
-	 * Function takes arguments evt and ui. Return false to cancel the collapsing.
-	 * Use ui.owner to get a reference to the pivot grid.
-	 * Use ui.dataSource to get a reference to the data source.
-	 * Use ui.axisName to get the name of axis, which holds the member and the tuple.
-	 * Use ui.tupleIndex to get the index of the tuple in the axis.
-	 * Use ui.memberIndex to get the index of the member in the tuple.
+	 * Fired before the collapse of the tuple member. Return false to cancel the collapsing.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "tupleMemberCollapsing"): TupleMemberCollapsingEvent;
 
 	/**
-	 * Fired before the collapse of the tuple member.
-	 * Function takes arguments evt and ui. Return false to cancel the collapsing.
-	 * Use ui.owner to get a reference to the pivot grid.
-	 * Use ui.dataSource to get a reference to the data source.
-	 * Use ui.axisName to get the name of axis, which holds the member and the tuple.
-	 * Use ui.tupleIndex to get the index of the tuple in the axis.
-	 * Use ui.memberIndex to get the index of the member in the tuple.
+	 * Fired before the collapse of the tuple member. Return false to cancel the collapsing.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -66382,41 +75539,23 @@ interface JQuery {
 
 	/**
 	 * Fired after the collapse of the tuple member.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to get a reference to the pivot grid.
-	 * Use ui.dataSource to get a reference to the data source.
-	 * Use ui.axisName to get the name of axis, which holds the member and the tuple.
-	 * Use ui.tupleIndex to get the index of the tuple in the axis.
-	 * Use ui.memberIndex to get the index of the member in the tuple.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "tupleMemberCollapsed"): TupleMemberCollapsedEvent;
 
 	/**
 	 * Fired after the collapse of the tuple member.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to get a reference to the pivot grid.
-	 * Use ui.dataSource to get a reference to the data source.
-	 * Use ui.axisName to get the name of axis, which holds the member and the tuple.
-	 * Use ui.tupleIndex to get the index of the tuple in the axis.
-	 * Use ui.memberIndex to get the index of the member in the tuple.
 	 *
 	 * @optionValue New value to be set.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "tupleMemberCollapsed", optionValue: TupleMemberCollapsedEvent): void;
 
 	/**
-	 * Fired before the sorting of the columns.
-	 * Function takes arguments evt and ui. Return false to cancel the sorting.
-	 * Use ui.owner to get a reference to the pivot grid.
-	 * Use ui.sortDirections to get an array of the tuple indices and sort directions that will be used.
+	 * Fired before the sorting of the columns. Return false to cancel the sorting.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "sorting"): SortingEvent;
 
 	/**
-	 * Fired before the sorting of the columns.
-	 * Function takes arguments evt and ui. Return false to cancel the sorting.
-	 * Use ui.owner to get a reference to the pivot grid.
-	 * Use ui.sortDirections to get an array of the tuple indices and sort directions that will be used.
+	 * Fired before the sorting of the columns. Return false to cancel the sorting.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -66424,37 +75563,23 @@ interface JQuery {
 
 	/**
 	 * Fired after the sorting of the columns.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to get a reference to the pivot grid.
-	 * Use ui.sortDirections to get an array of the tuple indices and sort directions that were passed to the table view.
-	 * Use ui.appliedSortDirections to get an array of the tuple indices and sort directions that were actually applied to the table view.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "sorted"): SortedEvent;
 
 	/**
 	 * Fired after the sorting of the columns.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to get a reference to the pivot grid.
-	 * Use ui.sortDirections to get an array of the tuple indices and sort directions that were passed to the table view.
-	 * Use ui.appliedSortDirections to get an array of the tuple indices and sort directions that were actually applied to the table view.
 	 *
 	 * @optionValue New value to be set.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "sorted", optionValue: SortedEvent): void;
 
 	/**
-	 * Fired before the sorting of the headers.
-	 * Function takes arguments evt and ui. Return false to cancel the sorting.
-	 * Use ui.owner to get a reference to the pivot grid.
-	 * Use ui.levelSortDirections to get an array of the level names and sort directions that will be used.
+	 * Fired before the sorting of the headers. Return false to cancel the sorting.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "headersSorting"): HeadersSortingEvent;
 
 	/**
-	 * Fired before the sorting of the headers.
-	 * Function takes arguments evt and ui. Return false to cancel the sorting.
-	 * Use ui.owner to get a reference to the pivot grid.
-	 * Use ui.levelSortDirections to get an array of the level names and sort directions that will be used.
+	 * Fired before the sorting of the headers. Return false to cancel the sorting.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -66462,19 +75587,11 @@ interface JQuery {
 
 	/**
 	 * Fired after the sorting of the headers.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to get a reference to the pivot grid.
-	 * Use ui.levelSortDirections to get an array of the level names and sort directions that were used.
-	 * Use ui.appliedLevelSortDirections to get an array of the level names and sort directions that were actually applied to the table view.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "headersSorted"): HeadersSortedEvent;
 
 	/**
 	 * Fired after the sorting of the headers.
-	 * Function takes arguments evt and ui.
-	 * Use ui.owner to get a reference to the pivot grid.
-	 * Use ui.levelSortDirections to get an array of the level names and sort directions that were used.
-	 * Use ui.appliedLevelSortDirections to get an array of the level names and sort directions that were actually applied to the table view.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -66482,21 +75599,11 @@ interface JQuery {
 
 	/**
 	 * Fired on drag start. Return false to cancel the dragging.
-	 * Use ui.metadatato get a reference to the data.
-	 * Use ui.helper to get a reference to the helper.
-	 * Use ui.offset to get a reference to the offset.
-	 * Use ui.originalPosition to get a reference to the original position of the draggable element.
-	 * Use ui.position to get a reference to the current position of the draggable element.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "dragStart"): DragStartEvent;
 
 	/**
 	 * Fired on drag start. Return false to cancel the dragging.
-	 * Use ui.metadatato get a reference to the data.
-	 * Use ui.helper to get a reference to the helper.
-	 * Use ui.offset to get a reference to the offset.
-	 * Use ui.originalPosition to get a reference to the original position of the draggable element.
-	 * Use ui.position to get a reference to the current position of the draggable element.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -66504,21 +75611,11 @@ interface JQuery {
 
 	/**
 	 * Fired on drag. Return false to cancel the drag.
-	 * Use ui.metadatato get a reference to the data.
-	 * Use ui.helper to get a reference to the helper.
-	 * Use ui.offset to get a reference to the offset.
-	 * Use ui.originalPosition to get a reference to the original position of the draggable element.
-	 * Use ui.position to get a reference to the current position of the draggable element.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "drag"): DragEvent;
 
 	/**
 	 * Fired on drag. Return false to cancel the drag.
-	 * Use ui.metadatato get a reference to the data.
-	 * Use ui.helper to get a reference to the helper.
-	 * Use ui.offset to get a reference to the offset.
-	 * Use ui.originalPosition to get a reference to the original position of the draggable element.
-	 * Use ui.position to get a reference to the current position of the draggable element.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -66526,19 +75623,11 @@ interface JQuery {
 
 	/**
 	 * Fired on drag stop.
-	 * Use ui.helper to get a reference to the helper.
-	 * Use ui.offset to get a reference to the offset.
-	 * Use ui.originalPosition to get a reference to the original position of the draggable element.
-	 * Use ui.position to get a reference to the current position of the draggable element.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "dragStop"): DragStopEvent;
 
 	/**
 	 * Fired on drag stop.
-	 * Use ui.helper to get a reference to the helper.
-	 * Use ui.offset to get a reference to the offset.
-	 * Use ui.originalPosition to get a reference to the original position of the draggable element.
-	 * Use ui.position to get a reference to the current position of the draggable element.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -66546,25 +75635,11 @@ interface JQuery {
 
 	/**
 	 * Fired before a metadata item drop. Return false to cancel the drop.
-	 * Use ui.targetElement for a reference to the drop target.
-	 * Use ui.draggedElement for a reference to the metadata item element.
-	 * Use ui.metadatato get a reference to the data.
-	 * Use ui.metadataIndex to get the index at which the metadata will be inserted.
-	 * Use ui.helper to get a reference to the helper.
-	 * Use ui.offset to get a reference to the offset.
-	 * Use ui.position to get a reference to the current position of the draggable element.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "metadataDropping"): MetadataDroppingEvent;
 
 	/**
 	 * Fired before a metadata item drop. Return false to cancel the drop.
-	 * Use ui.targetElement for a reference to the drop target.
-	 * Use ui.draggedElement for a reference to the metadata item element.
-	 * Use ui.metadatato get a reference to the data.
-	 * Use ui.metadataIndex to get the index at which the metadata will be inserted.
-	 * Use ui.helper to get a reference to the helper.
-	 * Use ui.offset to get a reference to the offset.
-	 * Use ui.position to get a reference to the current position of the draggable element.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -66572,25 +75647,11 @@ interface JQuery {
 
 	/**
 	 * Fired after a metadata item drop.
-	 * Use ui.targetElement for a reference to the drop target.
-	 * Use ui.draggedElement for a reference to the dragged element.
-	 * Use ui.metadatato get a reference to the data.
-	 * Use ui.metadataIndex to get the index at which the metadata is inserted.
-	 * Use ui.helper to get a reference to the helper.
-	 * Use ui.offset to get a reference to the offset.
-	 * Use ui.position to get a reference to the current position of the draggable element.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "metadataDropped"): MetadataDroppedEvent;
 
 	/**
 	 * Fired after a metadata item drop.
-	 * Use ui.targetElement for a reference to the drop target.
-	 * Use ui.draggedElement for a reference to the dragged element.
-	 * Use ui.metadatato get a reference to the data.
-	 * Use ui.metadataIndex to get the index at which the metadata is inserted.
-	 * Use ui.helper to get a reference to the helper.
-	 * Use ui.offset to get a reference to the offset.
-	 * Use ui.position to get a reference to the current position of the draggable element.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -66598,15 +75659,11 @@ interface JQuery {
 
 	/**
 	 * Fired before a metadata item is removed when the user clicks the close icon. Return false to cancel the removing.
-	 * Use ui.targetElement for a reference to the dragged element.
-	 * Use ui.metadatato get a reference to the data.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "metadataRemoving"): MetadataRemovingEvent;
 
 	/**
 	 * Fired before a metadata item is removed when the user clicks the close icon. Return false to cancel the removing.
-	 * Use ui.targetElement for a reference to the dragged element.
-	 * Use ui.metadatato get a reference to the data.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -66614,13 +75671,11 @@ interface JQuery {
 
 	/**
 	 * Fired after a metadata item is removed when the user clicks the close icon.
-	 * Use ui.metadatato get a reference to the data.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "metadataRemoved"): MetadataRemovedEvent;
 
 	/**
 	 * Fired after a metadata item is removed when the user clicks the close icon.
-	 * Use ui.metadatato get a reference to the data.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -66628,13 +75683,11 @@ interface JQuery {
 
 	/**
 	 * Fired before the filter members drop down opens. Return false to cancel the opening.
-	 * Use ui.hierarchy for a reference to the hierarchy.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "filterDropDownOpening"): FilterDropDownOpeningEvent;
 
 	/**
 	 * Fired before the filter members drop down opens. Return false to cancel the opening.
-	 * Use ui.hierarchy for a reference to the hierarchy.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -66642,15 +75695,11 @@ interface JQuery {
 
 	/**
 	 * Fired after the filter members drop down opens.
-	 * Use ui.hierarchy for a reference to the hierarchy.
-	 * Use ui.dropDownElement for a reference to the drop down.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "filterDropDownOpened"): FilterDropDownOpenedEvent;
 
 	/**
 	 * Fired after the filter members drop down opens.
-	 * Use ui.hierarchy for a reference to the hierarchy.
-	 * Use ui.dropDownElement for a reference to the drop down.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -66658,17 +75707,11 @@ interface JQuery {
 
 	/**
 	 * Fired after the filter members are loaded.
-	 * Use ui.parent to get the parent node or the igTree instance in the initial load.
-	 * Use ui.rootFilterMembers for a collection with the root filter members .
-	 * Use ui.filterMembers for a collection with the newly loaded filter members.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "filterMembersLoaded"): FilterMembersLoadedEvent;
 
 	/**
 	 * Fired after the filter members are loaded.
-	 * Use ui.parent to get the parent node or the igTree instance in the initial load.
-	 * Use ui.rootFilterMembers for a collection with the root filter members .
-	 * Use ui.filterMembers for a collection with the newly loaded filter members.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -66676,17 +75719,11 @@ interface JQuery {
 
 	/**
 	 * Fired after the OK button in the filter members drop down is clicked. Return false to cancel the applying of the filters.
-	 * Use ui.hierarchy for a reference to the hierarchy.
-	 * Use ui.filterMembers for a collection with the selected filter members. If all filter members are selected the collection will be empty.
-	 * Use ui.dropDownElement for a reference to the drop down.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "filterDropDownOk"): FilterDropDownOkEvent;
 
 	/**
 	 * Fired after the OK button in the filter members drop down is clicked. Return false to cancel the applying of the filters.
-	 * Use ui.hierarchy for a reference to the hierarchy.
-	 * Use ui.filterMembers for a collection with the selected filter members. If all filter members are selected the collection will be empty.
-	 * Use ui.dropDownElement for a reference to the drop down.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -66694,15 +75731,11 @@ interface JQuery {
 
 	/**
 	 * Fired before the filter members drop down closes. Return false to cancel the closing.
-	 * Use ui.hierarchy for a reference to the hierarchy.
-	 * Use ui.dropDownElement for a reference to the drop down.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "filterDropDownClosing"): FilterDropDownClosingEvent;
 
 	/**
 	 * Fired before the filter members drop down closes. Return false to cancel the closing.
-	 * Use ui.hierarchy for a reference to the hierarchy.
-	 * Use ui.dropDownElement for a reference to the drop down.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -66710,13 +75743,11 @@ interface JQuery {
 
 	/**
 	 * Fired after the filter members drop down closes.
-	 * Use ui.hierarchy for a reference to the hierarchy.
 	 */
 	igPivotGrid(optionLiteral: 'option', optionName: "filterDropDownClosed"): FilterDropDownClosedEvent;
 
 	/**
 	 * Fired after the filter members drop down closes.
-	 * Use ui.hierarchy for a reference to the hierarchy.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -67092,6 +76123,7 @@ interface IgPivotViewPivotGridOptionsLevelSortDirection {
 
 	/**
 	 * optional="true" Specifies the sort direction. If no direction is specified,the level is going to be sorted in the direction specified by the firstLevelSortDirection option.
+	 *
 	 */
 	sortDirection?: any;
 
@@ -67161,7 +76193,8 @@ interface IgPivotViewPivotGridOptionsDragAndDropSettings {
 	appendTo?: any;
 
 	/**
-	 * Specifies the containment for the drag helper. The area inside of which the helper is contained would be scrollable while dragging.
+	 * Specifies the containment for the drag helper. The area inside of which thehelper is contained would be scrollable while dragging.
+	 *
 	 */
 	containment?: boolean|string|Array<any>;
 
@@ -67323,7 +76356,8 @@ interface IgPivotViewDataSelectorOptionsDragAndDropSettings {
 	appendTo?: any;
 
 	/**
-	 * Specifies the containment for the drag helper. The area inside of which the helper is contained would be scrollable while dragging.
+	 * Specifies the containment for the drag helper. The area inside of which thehelper is contained would be scrollable while dragging.
+	 *
 	 */
 	containment?: boolean|string|Array<any>;
 
@@ -67434,40 +76468,81 @@ interface IgPivotViewDataSelectorPanel {
 }
 
 interface IgPivotView {
+	/**
+	 *
+	 *
+	 * Valid values:
+	 * "string" The widget width can be set in pixels (px) and percentage (%).
+	 * "number" The widget width can be set as a number.
+	 * "null" will stretch to fit the parent, if no other widths are defined.
+	 */
 	width?: string|number;
+
+	/**
+	 *
+	 *
+	 * Valid values:
+	 * "string" The widget height can be set in pixels (px) and percentage (%).
+	 * "number" The widget height can be set as a number.
+	 * "null" will stretch vertically to fit the parent, if no other heights are defined.
+	 */
 	height?: string|number;
 
 	/**
 	 * An instance of $.ig.OlapXmlaDataSource or $.ig.OlapFlatDataSource.
+	 *
 	 */
 	dataSource?: any;
 
 	/**
 	 * An object that will be used to create an instance of $.ig.OlapXmlaDataSource or $.ig.OlapFlatDataSource.
 	 * The provided value must contain an object with settings for one of the data source types - xmlaOptions or flatDataOptions.
+	 *
 	 */
 	dataSourceOptions?: IgPivotViewDataSourceOptions;
 
 	/**
 	 * Configuration settings that will be assigned to the igPivotGrid widget.
+	 *
 	 */
 	pivotGridOptions?: IgPivotViewPivotGridOptions;
 
 	/**
 	 * Configuration settings that will be assigned to the igPivotDataSelector widget.
+	 *
 	 */
 	dataSelectorOptions?: IgPivotViewDataSelectorOptions;
 
 	/**
 	 * Configuration settings for the panel containing the igPivotGrid.
+	 *
 	 */
 	pivotGridPanel?: IgPivotViewPivotGridPanel;
 
 	/**
 	 * Configuration settings for the panel containing the igPivotDataSelector.
+	 *
 	 */
 	dataSelectorPanel?: IgPivotViewDataSelectorPanel;
 
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	locale?: any;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	language?: string;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+	regional?: string|Object;
+
 	/**
 	 * Option for igPivotView
 	 */
@@ -67496,6 +76571,24 @@ interface IgPivotViewMethods {
 	 * 3. Unbind all events that were bound.
 	 */
 	destroy(): void;
+
+	/**
+	 * Changes the all locales contained into a specified container to the language specified in [options.language](ui.igwidget#options:language)
+	 * Note that this method is for rare scenarios, use [language](ui.igwidget#options:language) or [locale](ui.igwidget#options:locale) option setter
+	 *
+	 * @param $container Optional parameter - if not set it would use the element of the widget as $container
+	 */
+	changeLocale($container: Object): void;
+
+	/**
+	 * Changes the widget language to global language. Global language is the value in $.ig.util.language
+	 */
+	changeGlobalLanguage(): void;
+
+	/**
+	 * Changes the widget regional settins to global regional settings. Global regional settings are container in $.ig.util.regional
+	 */
+	changeGlobalRegional(): void;
 }
 interface JQuery {
 	data(propertyName: "igPivotView"): IgPivotViewMethods;
@@ -67506,23 +76599,48 @@ interface JQuery {
 	igPivotView(methodName: "dataSelector"): Object;
 	igPivotView(methodName: "splitter"): Object;
 	igPivotView(methodName: "destroy"): void;
+	igPivotView(methodName: "changeLocale", $container: Object): void;
+	igPivotView(methodName: "changeGlobalLanguage"): void;
+	igPivotView(methodName: "changeGlobalRegional"): void;
+
+	/**
+	 * *
+	 */
 
 	igPivotView(optionLiteral: 'option', optionName: "width"): string|number;
 
+	/**
+	 * *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
 	igPivotView(optionLiteral: 'option', optionName: "width", optionValue: string|number): void;
 
+	/**
+	 * *
+	 */
+
 	igPivotView(optionLiteral: 'option', optionName: "height"): string|number;
 
+	/**
+	 * *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
 	igPivotView(optionLiteral: 'option', optionName: "height", optionValue: string|number): void;
 
 	/**
 	 * An instance of $.ig.OlapXmlaDataSource or $.ig.OlapFlatDataSource.
+	 *
 	 */
 	igPivotView(optionLiteral: 'option', optionName: "dataSource"): any;
 
 	/**
 	 * An instance of $.ig.OlapXmlaDataSource or $.ig.OlapFlatDataSource.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPivotView(optionLiteral: 'option', optionName: "dataSource", optionValue: any): void;
@@ -67530,6 +76648,7 @@ interface JQuery {
 	/**
 	 * An object that will be used to create an instance of $.ig.OlapXmlaDataSource or $.ig.OlapFlatDataSource.
 	 * The provided value must contain an object with settings for one of the data source types - xmlaOptions or flatDataOptions.
+	 *
 	 */
 	igPivotView(optionLiteral: 'option', optionName: "dataSourceOptions"): IgPivotViewDataSourceOptions;
 
@@ -67537,57 +76656,110 @@ interface JQuery {
 	 * An object that will be used to create an instance of $.ig.OlapXmlaDataSource or $.ig.OlapFlatDataSource.
 	 * The provided value must contain an object with settings for one of the data source types - xmlaOptions or flatDataOptions.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPivotView(optionLiteral: 'option', optionName: "dataSourceOptions", optionValue: IgPivotViewDataSourceOptions): void;
 
 	/**
 	 * Configuration settings that will be assigned to the igPivotGrid widget.
+	 *
 	 */
 	igPivotView(optionLiteral: 'option', optionName: "pivotGridOptions"): IgPivotViewPivotGridOptions;
 
 	/**
 	 * Configuration settings that will be assigned to the igPivotGrid widget.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPivotView(optionLiteral: 'option', optionName: "pivotGridOptions", optionValue: IgPivotViewPivotGridOptions): void;
 
 	/**
 	 * Configuration settings that will be assigned to the igPivotDataSelector widget.
+	 *
 	 */
 	igPivotView(optionLiteral: 'option', optionName: "dataSelectorOptions"): IgPivotViewDataSelectorOptions;
 
 	/**
 	 * Configuration settings that will be assigned to the igPivotDataSelector widget.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPivotView(optionLiteral: 'option', optionName: "dataSelectorOptions", optionValue: IgPivotViewDataSelectorOptions): void;
 
 	/**
 	 * Configuration settings for the panel containing the igPivotGrid.
+	 *
 	 */
 	igPivotView(optionLiteral: 'option', optionName: "pivotGridPanel"): IgPivotViewPivotGridPanel;
 
 	/**
 	 * Configuration settings for the panel containing the igPivotGrid.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPivotView(optionLiteral: 'option', optionName: "pivotGridPanel", optionValue: IgPivotViewPivotGridPanel): void;
 
 	/**
 	 * Configuration settings for the panel containing the igPivotDataSelector.
+	 *
 	 */
 	igPivotView(optionLiteral: 'option', optionName: "dataSelectorPanel"): IgPivotViewDataSelectorPanel;
 
 	/**
 	 * Configuration settings for the panel containing the igPivotDataSelector.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPivotView(optionLiteral: 'option', optionName: "dataSelectorPanel", optionValue: IgPivotViewDataSelectorPanel): void;
+
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	igPivotView(optionLiteral: 'option', optionName: "locale"): any;
+
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igPivotView(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	igPivotView(optionLiteral: 'option', optionName: "language"): string;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igPivotView(optionLiteral: 'option', optionName: "language", optionValue: string): void;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+
+	igPivotView(optionLiteral: 'option', optionName: "regional"): string|Object;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igPivotView(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
 	igPivotView(options: IgPivotView): JQuery;
 	igPivotView(optionLiteral: 'option', optionName: string): any;
 	igPivotView(optionLiteral: 'option', options: IgPivotView): JQuery;
@@ -67597,12 +76769,14 @@ interface JQuery {
 interface IgPopover {
 	/**
 	 * Controls whether the popover will close on blur or not
+	 *
 	 */
 	closeOnBlur?: boolean;
 
 	/**
 	 * controls the direction in which the control shows relative to the target element
 	 *
+	 *
 	 * Valid values:
 	 * "auto" lets the control show on the side where enough space is available with the priority specified by the [directionPriority](ui.%%WidgetNameLowered%%#options:directionPriority) property
 	 * "left" shows popover on the left side of the target element
@@ -67615,12 +76789,14 @@ interface IgPopover {
 	/**
 	 * Controls the priority in which the control searches for space to show relative to the target element.
 	 * This property has effect only if the [direction](ui.%%WidgetNameLowered%%#options:direction) property value is "auto" or unset.
+	 *
 	 */
 	directionPriority?: any[];
 
 	/**
 	 * controls the position of the popover according to the target element in case the popover is larger than the target on the side we want to position, if the popover is smaller it should always be in the middle of the visible area
 	 *
+	 *
 	 * Valid values:
 	 * "auto" lets the control choose a position depending on available space with the following priority balanced > end > start
 	 * "balanced" the popover is positioned at the middle of the target element
@@ -67631,37 +76807,44 @@ interface IgPopover {
 
 	/**
 	 * defines width for the popover. leave null for auto.
+	 *
 	 */
 	width?: number|string;
 
 	/**
 	 * defines height for the popover. leave null for auto
+	 *
 	 */
 	height?: number|string;
 
 	/**
 	 * defines width the popover won't go under the value even if no specific one is set.
+	 *
 	 */
 	minWidth?: number|string;
 
 	/**
 	 * defines width the popover won't exceed even if no specific one is set.
+	 *
 	 */
 	maxWidth?: number|string;
 
 	/**
 	 * defines height the popover won't exceed even if no specific one is set.
+	 *
 	 */
 	maxHeight?: number|string;
 
 	/**
 	 * Sets the time popover fades in and out when showing/hiding
+	 *
 	 */
 	animationDuration?: number;
 
 	/**
 	 * sets the content for the popover container. If left null the content will be get from the target.
 	 *
+	 *
 	 * Valid values:
 	 * "string" String content of the popover container
 	 * "function" Function which is a callback that should return the content. Use the 'this' value to access the target DOM element.
@@ -67670,17 +76853,20 @@ interface IgPopover {
 
 	/**
 	 * Selectors indicating which items should show popovers. The predefined value is [title]. Customize if you're using something other then the title attribute for the popover content, or if you need a different selector for event delegation. When changing this option, you likely need to also change the contentTemplate option
+	 *
 	 */
 	selectors?: string;
 
 	/**
 	 * Sets the content for the popover header
+	 *
 	 */
 	headerTemplate?: IgPopoverHeaderTemplate;
 
 	/**
 	 * sets the event on which the popover will be shown. Predefined values are "mouseenter", "click" and "focus"
 	 *
+	 *
 	 * Valid values:
 	 * "mouseenter" the popover is shown on mouse enter in the target element
 	 * "click" the popover is shown on click on the target element
@@ -67690,18 +76876,38 @@ interface IgPopover {
 
 	/**
 	 * Sets the containment for the popover. Accepts a jQuery object
+	 *
 	 */
 	containment?: any;
 
 	/**
 	 * Controls where the popover DOM should be attached to.
 	 *
+	 *
 	 * Valid values:
 	 * "string" A valid jQuery selector for the element
 	 * "object" A reference to the parent jQuery object
 	 */
 	appendTo?: string|Object;
 
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	locale?: any;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	language?: string;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+	regional?: string|Object;
+
 	/**
 	 * Event fired before popover is shown.
 	 */
@@ -67784,6 +76990,24 @@ interface IgPopoverMethods {
 	 * @param pos The popover coordinates in pixels.
 	 */
 	setCoordinates(pos: Object): void;
+
+	/**
+	 * Changes the all locales contained into a specified container to the language specified in [options.language](ui.igwidget#options:language)
+	 * Note that this method is for rare scenarios, use [language](ui.igwidget#options:language) or [locale](ui.igwidget#options:locale) option setter
+	 *
+	 * @param $container Optional parameter - if not set it would use the element of the widget as $container
+	 */
+	changeLocale($container: Object): void;
+
+	/**
+	 * Changes the widget language to global language. Global language is the value in $.ig.util.language
+	 */
+	changeGlobalLanguage(): void;
+
+	/**
+	 * Changes the widget regional settins to global regional settings. Global regional settings are container in $.ig.util.regional
+	 */
+	changeGlobalRegional(): void;
 }
 interface JQuery {
 	data(propertyName: "igPopover"): IgPopoverMethods;
@@ -67800,21 +77024,27 @@ interface JQuery {
 	igPopover(methodName: "target"): Object;
 	igPopover(methodName: "getCoordinates"): Object;
 	igPopover(methodName: "setCoordinates", pos: Object): void;
+	igPopover(methodName: "changeLocale", $container: Object): void;
+	igPopover(methodName: "changeGlobalLanguage"): void;
+	igPopover(methodName: "changeGlobalRegional"): void;
 
 	/**
 	 * Controls whether the popover will close on blur or not
+	 *
 	 */
 	igPopover(optionLiteral: 'option', optionName: "closeOnBlur"): boolean;
 
 	/**
 	 * Controls whether the popover will close on blur or not
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPopover(optionLiteral: 'option', optionName: "closeOnBlur", optionValue: boolean): void;
 
 	/**
 	 * Controls the direction in which the control shows relative to the target element
+	 *
 	 */
 
 	igPopover(optionLiteral: 'option', optionName: "direction"): string;
@@ -67822,6 +77052,7 @@ interface JQuery {
 	/**
 	 * Controls the direction in which the control shows relative to the target element
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -67830,6 +77061,7 @@ interface JQuery {
 	/**
 	 * Controls the priority in which the control searches for space to show relative to the target element.
 	 * This property has effect only if the [direction](ui.%%WidgetNameLowered%%#options:direction) property value is "auto" or unset.
+	 *
 	 */
 	igPopover(optionLiteral: 'option', optionName: "directionPriority"): any[];
 
@@ -67837,12 +77069,14 @@ interface JQuery {
 	 * Controls the priority in which the control searches for space to show relative to the target element.
 	 * This property has effect only if the [direction](ui.%%WidgetNameLowered%%#options:direction) property value is "auto" or unset.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPopover(optionLiteral: 'option', optionName: "directionPriority", optionValue: any[]): void;
 
 	/**
 	 * Controls the position of the popover according to the target element in case the popover is larger than the target on the side we want to position, if the popover is smaller it should always be in the middle of the visible area
+	 *
 	 */
 
 	igPopover(optionLiteral: 'option', optionName: "position"): string;
@@ -67850,6 +77084,7 @@ interface JQuery {
 	/**
 	 * Controls the position of the popover according to the target element in case the popover is larger than the target on the side we want to position, if the popover is smaller it should always be in the middle of the visible area
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -67857,6 +77092,7 @@ interface JQuery {
 
 	/**
 	 * Defines width for the popover. leave null for auto.
+	 *
 	 */
 
 	igPopover(optionLiteral: 'option', optionName: "width"): number|string;
@@ -67864,6 +77100,7 @@ interface JQuery {
 	/**
 	 * Defines width for the popover. leave null for auto.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -67871,6 +77108,7 @@ interface JQuery {
 
 	/**
 	 * Defines height for the popover. leave null for auto
+	 *
 	 */
 
 	igPopover(optionLiteral: 'option', optionName: "height"): number|string;
@@ -67878,6 +77116,7 @@ interface JQuery {
 	/**
 	 * Defines height for the popover. leave null for auto
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -67885,6 +77124,7 @@ interface JQuery {
 
 	/**
 	 * Defines width the popover won't go under the value even if no specific one is set.
+	 *
 	 */
 
 	igPopover(optionLiteral: 'option', optionName: "minWidth"): number|string;
@@ -67892,6 +77132,7 @@ interface JQuery {
 	/**
 	 * Defines width the popover won't go under the value even if no specific one is set.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -67899,6 +77140,7 @@ interface JQuery {
 
 	/**
 	 * Defines width the popover won't exceed even if no specific one is set.
+	 *
 	 */
 
 	igPopover(optionLiteral: 'option', optionName: "maxWidth"): number|string;
@@ -67906,6 +77148,7 @@ interface JQuery {
 	/**
 	 * Defines width the popover won't exceed even if no specific one is set.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -67913,6 +77156,7 @@ interface JQuery {
 
 	/**
 	 * Defines height the popover won't exceed even if no specific one is set.
+	 *
 	 */
 
 	igPopover(optionLiteral: 'option', optionName: "maxHeight"): number|string;
@@ -67920,6 +77164,7 @@ interface JQuery {
 	/**
 	 * Defines height the popover won't exceed even if no specific one is set.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -67927,18 +77172,21 @@ interface JQuery {
 
 	/**
 	 * The time popover fades in and out when showing/hiding
+	 *
 	 */
 	igPopover(optionLiteral: 'option', optionName: "animationDuration"): number;
 
 	/**
 	 * Sets the time popover fades in and out when showing/hiding
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPopover(optionLiteral: 'option', optionName: "animationDuration", optionValue: number): void;
 
 	/**
 	 * The content for the popover container. If left null the content will be get from the target.
+	 *
 	 */
 
 	igPopover(optionLiteral: 'option', optionName: "contentTemplate"): string|Function;
@@ -67946,6 +77194,7 @@ interface JQuery {
 	/**
 	 * Sets the content for the popover container. If left null the content will be get from the target.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -67953,30 +77202,35 @@ interface JQuery {
 
 	/**
 	 * Selectors indicating which items should show popovers. The predefined value is [title]. Customize if you're using something other then the title attribute for the popover content, or if you need a different selector for event delegation. When changing this option, you likely need to also change the contentTemplate option
+	 *
 	 */
 	igPopover(optionLiteral: 'option', optionName: "selectors"): string;
 
 	/**
 	 * Selectors indicating which items should show popovers. The predefined value is [title]. Customize if you're using something other then the title attribute for the popover content, or if you need a different selector for event delegation. When changing this option, you likely need to also change the contentTemplate option
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPopover(optionLiteral: 'option', optionName: "selectors", optionValue: string): void;
 
 	/**
 	 * The content for the popover header
+	 *
 	 */
 	igPopover(optionLiteral: 'option', optionName: "headerTemplate"): IgPopoverHeaderTemplate;
 
 	/**
 	 * Sets the content for the popover header
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPopover(optionLiteral: 'option', optionName: "headerTemplate", optionValue: IgPopoverHeaderTemplate): void;
 
 	/**
 	 * The event on which the popover will be shown. Predefined values are "mouseenter", "click" and "focus"
+	 *
 	 */
 
 	igPopover(optionLiteral: 'option', optionName: "showOn"): string;
@@ -67984,6 +77238,7 @@ interface JQuery {
 	/**
 	 * Sets the event on which the popover will be shown. Predefined values are "mouseenter", "click" and "focus"
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -67991,18 +77246,21 @@ interface JQuery {
 
 	/**
 	 * The containment for the popover. Accepts a jQuery object
+	 *
 	 */
 	igPopover(optionLiteral: 'option', optionName: "containment"): any;
 
 	/**
 	 * Sets the containment for the popover. Accepts a jQuery object
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igPopover(optionLiteral: 'option', optionName: "containment", optionValue: any): void;
 
 	/**
 	 * Controls where the popover DOM should be attached to.
+	 *
 	 */
 
 	igPopover(optionLiteral: 'option', optionName: "appendTo"): string|Object;
@@ -68010,11 +77268,56 @@ interface JQuery {
 	/**
 	 * Controls where the popover DOM should be attached to.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
 	igPopover(optionLiteral: 'option', optionName: "appendTo", optionValue: string|Object): void;
 
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	igPopover(optionLiteral: 'option', optionName: "locale"): any;
+
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igPopover(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	igPopover(optionLiteral: 'option', optionName: "language"): string;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igPopover(optionLiteral: 'option', optionName: "language", optionValue: string): void;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+
+	igPopover(optionLiteral: 'option', optionName: "regional"): string|Object;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igPopover(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
+
 	/**
 	 * Event fired before popover is shown.
 	 */
@@ -68290,6 +77593,24 @@ interface IgQRCodeBarcode {
 	 */
 	applicationIndicator?: string;
 
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	locale?: any;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	language?: string;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+	regional?: string|Object;
+
 	/**
 	 * Occurs when an error has happened.
 	 * Function takes first argument evt and second argument ui.
@@ -68331,6 +77652,24 @@ interface IgQRCodeBarcodeMethods {
 	 * Re-polls the css styles for the widget. Use this method when the css styles have been modified.
 	 */
 	styleUpdated(): void;
+
+	/**
+	 * Changes the all locales contained into a specified container to the language specified in [options.language](ui.igwidget#options:language)
+	 * Note that this method is for rare scenarios, use [language](ui.igwidget#options:language) or [locale](ui.igwidget#options:locale) option setter
+	 *
+	 * @param $container Optional parameter - if not set it would use the element of the widget as $container
+	 */
+	changeLocale($container: Object): void;
+
+	/**
+	 * Changes the widget language to global language. Global language is the value in $.ig.util.language
+	 */
+	changeGlobalLanguage(): void;
+
+	/**
+	 * Changes the widget regional settins to global regional settings. Global regional settings are container in $.ig.util.regional
+	 */
+	changeGlobalRegional(): void;
 }
 interface JQuery {
 	data(propertyName: "igQRCodeBarcode"): IgQRCodeBarcodeMethods;
@@ -68341,6 +77680,9 @@ interface JQuery {
 	igQRCodeBarcode(methodName: "flush"): void;
 	igQRCodeBarcode(methodName: "destroy"): void;
 	igQRCodeBarcode(methodName: "styleUpdated"): void;
+	igQRCodeBarcode(methodName: "changeLocale", $container: Object): void;
+	igQRCodeBarcode(methodName: "changeGlobalLanguage"): void;
+	igQRCodeBarcode(methodName: "changeGlobalRegional"): void;
 
 	/**
 	 * The width of the barcode. It can be set as a number in pixels, string (px) or percentage (%).
@@ -68632,6 +77974,50 @@ interface JQuery {
 	 */
 	igQRCodeBarcode(optionLiteral: 'option', optionName: "applicationIndicator", optionValue: string): void;
 
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	igQRCodeBarcode(optionLiteral: 'option', optionName: "locale"): any;
+
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igQRCodeBarcode(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	igQRCodeBarcode(optionLiteral: 'option', optionName: "language"): string;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igQRCodeBarcode(optionLiteral: 'option', optionName: "language", optionValue: string): void;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+
+	igQRCodeBarcode(optionLiteral: 'option', optionName: "regional"): string|Object;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igQRCodeBarcode(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
+
 	/**
 	 * Occurs when an error has happened.
 	 * Function takes first argument evt and second argument ui.
@@ -69127,6 +78513,24 @@ interface IgRadialGauge {
 	 */
 	pixelScalingRatio?: number;
 
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	locale?: any;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	language?: string;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+	regional?: string|Object;
+
 	/**
 	 * Event which is raised when a label of the gauge is formatted.
 	 * Function takes first argument null and second argument ui.
@@ -69177,16 +78581,22 @@ interface IgRadialGaugeMethods {
 
 	/**
 	 * Adds a new range to the radial gauge.
+	 *
+	 * @param value
 	 */
 	addRange(value: Object): void;
 
 	/**
 	 * Removes a specified range.
+	 *
+	 * @param value
 	 */
 	removeRange(value: Object): void;
 
 	/**
 	 * Updates the range.
+	 *
+	 * @param value
 	 */
 	updateRange(value: Object): void;
 
@@ -69197,26 +78607,39 @@ interface IgRadialGaugeMethods {
 
 	/**
 	 * Scales a value on the gauge's main scale to an angle around the center point of the gauge, in radians.
+	 *
+	 * @param value
 	 */
 	scaleValue(value: Object): void;
 
 	/**
 	 * Unscales a value from an angle in radians to the represented value along the main scale of the gauge.
+	 *
+	 * @param value
 	 */
 	unscaleValue(value: Object): void;
 
 	/**
 	 * Gets the value for the main scale of the gauge for a given point within the bounds of the gauge.
+	 *
+	 * @param x
+	 * @param y
 	 */
 	getValueForPoint(x: Object, y: Object): number;
 
 	/**
 	 * Gets the point on the gauge for a given scale value and extent.
+	 *
+	 * @param value
+	 * @param extent
 	 */
 	getPointForValue(value: Object, extent: Object): void;
 
 	/**
 	 * Returns true if the main gauge needle bounding box contains the point provided, otherwise false.
+	 *
+	 * @param x
+	 * @param y
 	 */
 	needleContainsPoint(x: Object, y: Object): void;
 
@@ -69239,6 +78662,24 @@ interface IgRadialGaugeMethods {
 	 * Returns true if the style was updated for the radial gauge.
 	 */
 	styleUpdated(): void;
+
+	/**
+	 * Changes the all locales contained into a specified container to the language specified in [options.language](ui.igwidget#options:language)
+	 * Note that this method is for rare scenarios, use [language](ui.igwidget#options:language) or [locale](ui.igwidget#options:locale) option setter
+	 *
+	 * @param $container Optional parameter - if not set it would use the element of the widget as $container
+	 */
+	changeLocale($container: Object): void;
+
+	/**
+	 * Changes the widget language to global language. Global language is the value in $.ig.util.language
+	 */
+	changeGlobalLanguage(): void;
+
+	/**
+	 * Changes the widget regional settins to global regional settings. Global regional settings are container in $.ig.util.regional
+	 */
+	changeGlobalRegional(): void;
 }
 interface JQuery {
 	data(propertyName: "igRadialGauge"): IgRadialGaugeMethods;
@@ -69259,6 +78700,9 @@ interface JQuery {
 	igRadialGauge(methodName: "flush"): void;
 	igRadialGauge(methodName: "destroy"): void;
 	igRadialGauge(methodName: "styleUpdated"): void;
+	igRadialGauge(methodName: "changeLocale", $container: Object): void;
+	igRadialGauge(methodName: "changeGlobalLanguage"): void;
+	igRadialGauge(methodName: "changeGlobalRegional"): void;
 
 	/**
 	 * The width of the gauge. It can be set as a number in pixels, string (px) or percentage (%).
@@ -70112,6 +79556,50 @@ interface JQuery {
 	 */
 	igRadialGauge(optionLiteral: 'option', optionName: "pixelScalingRatio", optionValue: number): void;
 
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	igRadialGauge(optionLiteral: 'option', optionName: "locale"): any;
+
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igRadialGauge(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	igRadialGauge(optionLiteral: 'option', optionName: "language"): string;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igRadialGauge(optionLiteral: 'option', optionName: "language", optionValue: string): void;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+
+	igRadialGauge(optionLiteral: 'option', optionName: "regional"): string|Object;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igRadialGauge(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
+
 	/**
 	 * Event which is raised when a label of the gauge is formatted.
 	 * Function takes first argument null and second argument ui.
@@ -70201,6 +79689,7 @@ interface IgRadialMenuItem {
 	/**
 	 * Gets or sets a value indicating what type of item is being provided.
 	 *
+	 *
 	 * Valid values:
 	 * "button"
 	 * "coloritem"
@@ -70666,6 +80155,24 @@ interface IgRadialMenu {
 	wedgePaddingInDegrees?: number;
 	pixelScalingRatio?: number;
 
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	locale?: any;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	language?: string;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+	regional?: string|Object;
+
 	/**
 	 * Invoked when the IsOpen property is changed to false.
 	 * Function takes a first argument ui.
@@ -70714,6 +80221,24 @@ interface IgRadialMenuMethods {
 	 * Notify the radial menu that style information used for rendering the menu may have been updated.
 	 */
 	styleUpdated(): void;
+
+	/**
+	 * Changes the all locales contained into a specified container to the language specified in [options.language](ui.igwidget#options:language)
+	 * Note that this method is for rare scenarios, use [language](ui.igwidget#options:language) or [locale](ui.igwidget#options:locale) option setter
+	 *
+	 * @param $container Optional parameter - if not set it would use the element of the widget as $container
+	 */
+	changeLocale($container: Object): void;
+
+	/**
+	 * Changes the widget language to global language. Global language is the value in $.ig.util.language
+	 */
+	changeGlobalLanguage(): void;
+
+	/**
+	 * Changes the widget regional settins to global regional settings. Global regional settings are container in $.ig.util.regional
+	 */
+	changeGlobalRegional(): void;
 }
 interface JQuery {
 	data(propertyName: "igRadialMenu"): IgRadialMenuMethods;
@@ -70725,6 +80250,9 @@ interface JQuery {
 	igRadialMenu(methodName: "flush"): void;
 	igRadialMenu(methodName: "destroy"): void;
 	igRadialMenu(methodName: "styleUpdated"): void;
+	igRadialMenu(methodName: "changeLocale", $container: Object): void;
+	igRadialMenu(methodName: "changeGlobalLanguage"): void;
+	igRadialMenu(methodName: "changeGlobalRegional"): void;
 
 	/**
 	 * Gets  the items in the menu.
@@ -71040,6 +80568,50 @@ interface JQuery {
 	igRadialMenu(optionLiteral: 'option', optionName: "pixelScalingRatio"): number;
 	igRadialMenu(optionLiteral: 'option', optionName: "pixelScalingRatio", optionValue: number): void;
 
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	igRadialMenu(optionLiteral: 'option', optionName: "locale"): any;
+
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igRadialMenu(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	igRadialMenu(optionLiteral: 'option', optionName: "language"): string;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igRadialMenu(optionLiteral: 'option', optionName: "language", optionValue: string): void;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+
+	igRadialMenu(optionLiteral: 'option', optionName: "regional"): string|Object;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igRadialMenu(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
+
 	/**
 	 * Invoked when the IsOpen property is changed to false.
 	 * Function takes a first argument ui.
@@ -71083,14 +80655,14 @@ interface HoverChangeEvent {
 
 interface HoverChangeEventUIParam {
 	/**
-	 * Used to get new value.
+	 * Gets the new hovered value.
 	 */
-	value?: any;
+	value?: number;
 
 	/**
-	 * Used to get old value.
+	 * Gets the old value.
 	 */
-	oldValue?: any;
+	oldValue?: number;
 }
 
 interface ValueChangeEvent {
@@ -71099,45 +80671,51 @@ interface ValueChangeEvent {
 
 interface ValueChangeEventUIParam {
 	/**
-	 * Used to get new value.
+	 * Gets the new selected value.
 	 */
-	value?: any;
+	value?: number;
 
 	/**
-	 * Used to get old value.
+	 * Gets the previously selected value.
 	 */
-	oldValue?: any;
+	oldValue?: number;
 }
 
 interface IgRating {
 	/**
 	 * Gets a vertical or horizontal orientation for the votes.
 	 * Change of that option is not supported after igRating was created.
+	 *
 	 */
 	vertical?: boolean;
 
 	/**
 	 * Gets/Sets value (selected votes or percent). If the value is of type string, it should be suitable for parsing to number. According to [valueAsPercent](ui.igrating#options:valueAsPercent) options the value is used as number of selected votes or as a percent of the votes.
+	 *
 	 */
 	value?: number|string;
 
 	/**
 	 * Gets/Sets value-hover (hovered votes or percent of hovered votes). The default is same as value. If the value is of type string, it should be suitable for parsing to number. According to [valueAsPercent](ui.igrating#options:valueAsPercent) options the valueHover is used as number of hovered votes or as a percent of the hovered votes.
+	 *
 	 */
 	valueHover?: number|string;
 
 	/**
 	 * Gets/Sets number of votes.
+	 *
 	 */
 	voteCount?: number;
 
 	/**
 	 * Gets/Sets custom width of a vote in pixels. In case of 0 the run time style value is used.
+	 *
 	 */
 	voteWidth?: number;
 
 	/**
 	 * Gets/Sets custom height of a vote in pixels. In case of 0 the run time style value is used.
+	 *
 	 */
 	voteHeight?: number;
 
@@ -71145,6 +80723,7 @@ interface IgRating {
 	 * Gets the direction of selected and hovered votes. Change of that option is not supported after igRating was created.
 	 * Value true: from left to right or from top to bottom.
 	 * Value false: from right to left or from bottom to left.
+	 *
 	 */
 	swapDirection?: boolean;
 
@@ -71152,6 +80731,7 @@ interface IgRating {
 	 * Gets/Sets percent or vote number to measure value and value-hover.
 	 * Value true: value is measured as percent (from 0 to 1).
 	 * Value false: value is measured in number of voted (from 0 to voteCount)
+	 *
 	 */
 	valueAsPercent?: boolean;
 
@@ -71159,12 +80739,14 @@ interface IgRating {
 	 * Gets if igRating can have focus. Change of that option is not supported after igRating was created.
 	 * Value true: can get focus and process key events.
 	 * Value false: cannot get focus.
+	 *
 	 */
 	focusable?: boolean;
 
 	/**
 	 * Gets/Sets precision. Precision of value and valueHover.
 	 *
+	 *
 	 * Valid values:
 	 * "exact" Value corresponds location of mouse.
 	 * "half" Value is rounded to the half of vote.
@@ -71177,6 +80759,7 @@ interface IgRating {
 	 * It has effect only when precision is set to "half" or "whole".
 	 * If user clicks between edge of the first vote and (sizeOfVote * precisionZeroVote), then value is set to 0.
 	 * Same is applied for mouseover as well.
+	 *
 	 */
 	precisionZeroVote?: number;
 
@@ -71187,6 +80770,7 @@ interface IgRating {
 	 * If precision is "whole" or "half" and roundedDecimalPlaces is set in range of 0..2, then 3 is used.
 	 * If valueAsPercent is enabled and roundedDecimalPlaces is set to 0, then 1 is used.
 	 * If it is larger than 15, then 15 is used.
+	 *
 	 */
 	roundedDecimalPlaces?: number;
 
@@ -71194,12 +80778,14 @@ interface IgRating {
 	 * Gets/Sets selector for css classes.
 	 * That option allows replacing all default css styles by custom values.
 	 * Application should provide css classes for all members defined in the css options with "theme" selector.
+	 *
 	 */
 	theme?: string;
 
 	/**
 	 * Gets/Sets object which contains options supported by igValidator.
 	 * Note that for onblur validation depends on the [focusable](ui.igrating#options:focusable) option.
+	 *
 	 */
 	validatorOptions?: any;
 
@@ -71215,26 +80801,37 @@ interface IgRating {
 	 * will customize only second vote with [normalCss](ui.igrating#theming:ui-igrating ui-state-default ui-widget-content) for normal state, [hoverCss](ui.igrating#theming:ui-igrating-hover ui-state-hover) for hover state and [selectedCss](ui.igrating#theming:ui-igrating-voteselected) for selected state.
 	 * [[null, 's1', 'h1'], [null, 's2', 'h2'], [null, 's3', 'h3']]
 	 * will customize selected and hover states for first 3 votes with classes h# and s#.
+	 *
 	 */
 	cssVotes?: any;
 
 	/**
-	 * Event which is raised before hover value is changed.
-	 * If application returns false, then action is canceled and hover value stays unchanged.
+	 * Set/Get the locale setting for the widget.
 	 *
-	 * Function takes arguments evt and ui.
-	 * Use ui.value to get new value.
-	 * Use ui.oldValue to get old value.
+	 */
+	locale?: any;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	language?: string;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+	regional?: string|Object;
+
+	/**
+	 * Fired before hover value is changed.
+	 * If the application returns false, then the action is canceled and the value remains unchanged.
 	 */
 	hoverChange?: HoverChangeEvent;
 
 	/**
-	 * Event which is raised before (selected) value is changed.
-	 * If application returns false, then action is canceled and value stays unchanged.
-	 *
-	 * Function takes arguments evt and ui.
-	 * Use ui.value to get new value.
-	 * Use ui.oldValue to get old value.
+	 * Fired before (selected) value is changed.
+	 * If the application returns false, then the action is canceled and the value remains unchanged.
 	 */
 	valueChange?: ValueChangeEvent;
 
@@ -71286,6 +80883,24 @@ interface IgRatingMethods {
 	 * Destroys igRating widget.
 	 */
 	destroy(): Object;
+
+	/**
+	 * Changes the all locales contained into a specified container to the language specified in [options.language](ui.igwidget#options:language)
+	 * Note that this method is for rare scenarios, use [language](ui.igwidget#options:language) or [locale](ui.igwidget#options:locale) option setter
+	 *
+	 * @param $container Optional parameter - if not set it would use the element of the widget as $container
+	 */
+	changeLocale($container: Object): void;
+
+	/**
+	 * Changes the widget language to global language. Global language is the value in $.ig.util.language
+	 */
+	changeGlobalLanguage(): void;
+
+	/**
+	 * Changes the widget regional settins to global regional settings. Global regional settings are container in $.ig.util.regional
+	 */
+	changeGlobalRegional(): void;
 }
 interface JQuery {
 	data(propertyName: "igRating"): IgRatingMethods;
@@ -71299,10 +80914,14 @@ interface JQuery {
 	igRating(methodName: "hasFocus"): boolean;
 	igRating(methodName: "focus"): Object;
 	igRating(methodName: "destroy"): Object;
+	igRating(methodName: "changeLocale", $container: Object): void;
+	igRating(methodName: "changeGlobalLanguage"): void;
+	igRating(methodName: "changeGlobalRegional"): void;
 
 	/**
 	 * Gets a vertical or horizontal orientation for the votes.
 	 * Change of that option is not supported after igRating was created.
+	 *
 	 */
 	igRating(optionLiteral: 'option', optionName: "vertical"): boolean;
 
@@ -71310,12 +80929,14 @@ interface JQuery {
 	 * A vertical or horizontal orientation for the votes.
 	 * Change of that option is not supported after igRating was created.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igRating(optionLiteral: 'option', optionName: "vertical", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets value (selected votes or percent). If the value is of type string, it should be suitable for parsing to number. According to [valueAsPercent](ui.igrating#options:valueAsPercent) options the value is used as number of selected votes or as a percent of the votes.
+	 *
 	 */
 
 	igRating(optionLiteral: 'option', optionName: "value"): number|string;
@@ -71323,6 +80944,7 @@ interface JQuery {
 	/**
 	 * /Sets value (selected votes or percent). If the value is of type string, it should be suitable for parsing to number. According to [valueAsPercent](ui.igrating#options:valueAsPercent) options the value is used as number of selected votes or as a percent of the votes.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -71330,6 +80952,7 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets value-hover (hovered votes or percent of hovered votes). The default is same as value. If the value is of type string, it should be suitable for parsing to number. According to [valueAsPercent](ui.igrating#options:valueAsPercent) options the valueHover is used as number of hovered votes or as a percent of the hovered votes.
+	 *
 	 */
 
 	igRating(optionLiteral: 'option', optionName: "valueHover"): number|string;
@@ -71337,6 +80960,7 @@ interface JQuery {
 	/**
 	 * /Sets value-hover (hovered votes or percent of hovered votes). The default is same as value. If the value is of type string, it should be suitable for parsing to number. According to [valueAsPercent](ui.igrating#options:valueAsPercent) options the valueHover is used as number of hovered votes or as a percent of the hovered votes.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -71344,36 +80968,42 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets number of votes.
+	 *
 	 */
 	igRating(optionLiteral: 'option', optionName: "voteCount"): number;
 
 	/**
 	 * /Sets number of votes.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igRating(optionLiteral: 'option', optionName: "voteCount", optionValue: number): void;
 
 	/**
 	 * Gets/Sets custom width of a vote in pixels. In case of 0 the run time style value is used.
+	 *
 	 */
 	igRating(optionLiteral: 'option', optionName: "voteWidth"): number;
 
 	/**
 	 * /Sets custom width of a vote in pixels. In case of 0 the run time style value is used.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igRating(optionLiteral: 'option', optionName: "voteWidth", optionValue: number): void;
 
 	/**
 	 * Gets/Sets custom height of a vote in pixels. In case of 0 the run time style value is used.
+	 *
 	 */
 	igRating(optionLiteral: 'option', optionName: "voteHeight"): number;
 
 	/**
 	 * /Sets custom height of a vote in pixels. In case of 0 the run time style value is used.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igRating(optionLiteral: 'option', optionName: "voteHeight", optionValue: number): void;
@@ -71382,6 +81012,7 @@ interface JQuery {
 	 * Gets the direction of selected and hovered votes. Change of that option is not supported after igRating was created.
 	 * Value true: from left to right or from top to bottom.
 	 * Value false: from right to left or from bottom to left.
+	 *
 	 */
 	igRating(optionLiteral: 'option', optionName: "swapDirection"): boolean;
 
@@ -71390,6 +81021,7 @@ interface JQuery {
 	 * Value true: from left to right or from top to bottom.
 	 * Value false: from right to left or from bottom to left.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igRating(optionLiteral: 'option', optionName: "swapDirection", optionValue: boolean): void;
@@ -71398,6 +81030,7 @@ interface JQuery {
 	 * Gets/Sets percent or vote number to measure value and value-hover.
 	 * Value true: value is measured as percent (from 0 to 1).
 	 * Value false: value is measured in number of voted (from 0 to voteCount)
+	 *
 	 */
 	igRating(optionLiteral: 'option', optionName: "valueAsPercent"): boolean;
 
@@ -71406,6 +81039,7 @@ interface JQuery {
 	 * Value true: value is measured as percent (from 0 to 1).
 	 * Value false: value is measured in number of voted (from 0 to voteCount)
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igRating(optionLiteral: 'option', optionName: "valueAsPercent", optionValue: boolean): void;
@@ -71414,6 +81048,7 @@ interface JQuery {
 	 * Gets if igRating can have focus. Change of that option is not supported after igRating was created.
 	 * Value true: can get focus and process key events.
 	 * Value false: cannot get focus.
+	 *
 	 */
 	igRating(optionLiteral: 'option', optionName: "focusable"): boolean;
 
@@ -71422,12 +81057,14 @@ interface JQuery {
 	 * Value true: can get focus and process key events.
 	 * Value false: cannot get focus.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igRating(optionLiteral: 'option', optionName: "focusable", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets precision. Precision of value and valueHover.
+	 *
 	 */
 
 	igRating(optionLiteral: 'option', optionName: "precision"): string;
@@ -71435,6 +81072,7 @@ interface JQuery {
 	/**
 	 * /Sets precision. Precision of value and valueHover.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -71445,6 +81083,7 @@ interface JQuery {
 	 * It has effect only when precision is set to "half" or "whole".
 	 * If user clicks between edge of the first vote and (sizeOfVote * precisionZeroVote), then value is set to 0.
 	 * Same is applied for mouseover as well.
+	 *
 	 */
 	igRating(optionLiteral: 'option', optionName: "precisionZeroVote"): number;
 
@@ -71454,6 +81093,7 @@ interface JQuery {
 	 * If user clicks between edge of the first vote and (sizeOfVote * precisionZeroVote), then value is set to 0.
 	 * Same is applied for mouseover as well.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igRating(optionLiteral: 'option', optionName: "precisionZeroVote", optionValue: number): void;
@@ -71465,6 +81105,7 @@ interface JQuery {
 	 * If precision is "whole" or "half" and roundedDecimalPlaces is set in range of 0..2, then 3 is used.
 	 * If valueAsPercent is enabled and roundedDecimalPlaces is set to 0, then 1 is used.
 	 * If it is larger than 15, then 15 is used.
+	 *
 	 */
 	igRating(optionLiteral: 'option', optionName: "roundedDecimalPlaces"): number;
 
@@ -71476,6 +81117,7 @@ interface JQuery {
 	 * If valueAsPercent is enabled and roundedDecimalPlaces is set to 0, then 1 is used.
 	 * If it is larger than 15, then 15 is used.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igRating(optionLiteral: 'option', optionName: "roundedDecimalPlaces", optionValue: number): void;
@@ -71484,6 +81126,7 @@ interface JQuery {
 	 * Gets/Sets selector for css classes.
 	 * That option allows replacing all default css styles by custom values.
 	 * Application should provide css classes for all members defined in the css options with "theme" selector.
+	 *
 	 */
 	igRating(optionLiteral: 'option', optionName: "theme"): string;
 
@@ -71492,6 +81135,7 @@ interface JQuery {
 	 * That option allows replacing all default css styles by custom values.
 	 * Application should provide css classes for all members defined in the css options with "theme" selector.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igRating(optionLiteral: 'option', optionName: "theme", optionValue: string): void;
@@ -71499,6 +81143,7 @@ interface JQuery {
 	/**
 	 * Gets/Sets object which contains options supported by igValidator.
 	 * Note that for onblur validation depends on the [focusable](ui.igrating#options:focusable) option.
+	 *
 	 */
 	igRating(optionLiteral: 'option', optionName: "validatorOptions"): any;
 
@@ -71506,6 +81151,7 @@ interface JQuery {
 	 * /Sets object which contains options supported by igValidator.
 	 * Note that for onblur validation depends on the [focusable](ui.igrating#options:focusable) option.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igRating(optionLiteral: 'option', optionName: "validatorOptions", optionValue: any): void;
@@ -71522,6 +81168,7 @@ interface JQuery {
 	 * will customize only second vote with [normalCss](ui.igrating#theming:ui-igrating ui-state-default ui-widget-content) for normal state, [hoverCss](ui.igrating#theming:ui-igrating-hover ui-state-hover) for hover state and [selectedCss](ui.igrating#theming:ui-igrating-voteselected) for selected state.
 	 * [[null, 's1', 'h1'], [null, 's2', 'h2'], [null, 's3', 'h3']]
 	 * will customize selected and hover states for first 3 votes with classes h# and s#.
+	 *
 	 */
 	igRating(optionLiteral: 'option', optionName: "cssVotes"): any;
 
@@ -71538,51 +81185,80 @@ interface JQuery {
 	 * [[null, 's1', 'h1'], [null, 's2', 'h2'], [null, 's3', 'h3']]
 	 * will customize selected and hover states for first 3 votes with classes h# and s#.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igRating(optionLiteral: 'option', optionName: "cssVotes", optionValue: any): void;
 
 	/**
-	 * Event which is raised before hover value is changed.
-	 * If application returns false, then action is canceled and hover value stays unchanged.
+	 * Set/Get the locale setting for the widget.
 	 *
-	 * Function takes arguments evt and ui.
-	 * Use ui.value to get new value.
-	 * Use ui.oldValue to get old value.
+	 */
+	igRating(optionLiteral: 'option', optionName: "locale"): any;
+
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igRating(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	igRating(optionLiteral: 'option', optionName: "language"): string;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igRating(optionLiteral: 'option', optionName: "language", optionValue: string): void;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+
+	igRating(optionLiteral: 'option', optionName: "regional"): string|Object;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igRating(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
+
+	/**
+	 * Fired before hover value is changed.
+	 * If the application returns false, then the action is canceled and the value remains unchanged.
 	 */
 	igRating(optionLiteral: 'option', optionName: "hoverChange"): HoverChangeEvent;
 
 	/**
-	 * Event which is raised before hover value is changed.
-	 * If application returns false, then action is canceled and hover value stays unchanged.
+	 * Fired before hover value is changed.
+	 * If the application returns false, then the action is canceled and the value remains unchanged.
 	 *
-	 * Function takes arguments evt and ui.
-	 * Use ui.value to get new value.
-	 * Use ui.oldValue to get old value.
-	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igRating(optionLiteral: 'option', optionName: "hoverChange", optionValue: HoverChangeEvent): void;
 
 	/**
-	 * Event which is raised before (selected) value is changed.
-	 * If application returns false, then action is canceled and value stays unchanged.
-	 *
-	 * Function takes arguments evt and ui.
-	 * Use ui.value to get new value.
-	 * Use ui.oldValue to get old value.
+	 * Fired before (selected) value is changed.
+	 * If the application returns false, then the action is canceled and the value remains unchanged.
 	 */
 	igRating(optionLiteral: 'option', optionName: "valueChange"): ValueChangeEvent;
 
 	/**
-	 * Event which is raised before (selected) value is changed.
-	 * If application returns false, then action is canceled and value stays unchanged.
+	 * Fired before (selected) value is changed.
+	 * If the application returns false, then the action is canceled and the value remains unchanged.
 	 *
-	 * Function takes arguments evt and ui.
-	 * Use ui.value to get new value.
-	 * Use ui.oldValue to get old value.
-	 *
-	 * @optionValue Define event handler function.
+	 * @optionValue New value to be set.
 	 */
 	igRating(optionLiteral: 'option', optionName: "valueChange", optionValue: ValueChangeEvent): void;
 	igRating(options: IgRating): JQuery;
@@ -71594,6 +81270,7 @@ interface JQuery {
 interface IgSchedulerAgendaViewSettings {
 	/**
 	 * Gets/Sets the number of days shown in AgendaView mode.
+	 *
 	 */
 	dateRangeInterval?: number;
 
@@ -71603,6 +81280,56 @@ interface IgSchedulerAgendaViewSettings {
 	[optionName: string]: any;
 }
 
+interface IgSchedulerWeekViewSettings {
+	/**
+	 * Gets/Sets the week view display mode (whether to show all days or just working days).
+	 *
+	 */
+	weekViewDisplayMode?: number;
+
+	/**
+	 * Gets/Sets whether to display all hours or just working hours.
+	 *
+	 */
+	workingHoursDisplayMode?: number;
+
+	/**
+	 * Gets/Sets the time slots duration. 5, 6, 10, 15, 30 and 60 minutes are supported.
+	 *
+	 */
+	timeSlotInterval?: number;
+
+	/**
+	 * Option for IgSchedulerWeekViewSettings
+	 */
+	[optionName: string]: any;
+}
+
+interface IgSchedulerDayViewSettings {
+	/**
+	 * Gets/Sets the time slots duration. 5, 6, 10, 15, 30 and 60 minutes are supported.
+	 *
+	 */
+	timeSlotInterval?: number;
+
+	/**
+	 * Gets/Sets the number of days are visible at a time in the day view. 1 to 7 days are supported.
+	 *
+	 */
+	dayViewNumberOfDays?: number;
+
+	/**
+	 * Gets/Sets whether to display all hours or just working hours.
+	 *
+	 */
+	workingHoursDisplayMode?: number;
+
+	/**
+	 * Option for IgSchedulerDayViewSettings
+	 */
+	[optionName: string]: any;
+}
+
 interface IgSchedulerMonthViewSettings {
 	/**
 	 * Gets/Sets the type of content displayed in a MonthView day.
@@ -71615,6 +81342,7 @@ interface IgSchedulerMonthViewSettings {
 
 	/**
 	 * Gets/Sets the visibility of an AgendaView in a MonthView.  When true, the MonthView will display an AgendaView showing the Appointments for the currently selected day at the top of its list of Appointments.
+	 *
 	 */
 	isAgendaVisible?: boolean;
 
@@ -71637,31 +81365,37 @@ interface IgSchedulerMonthViewSettings {
 
 	/**
 	 * Gets/sets the visibility of the horizontal separators between weeks in the MonthView.
+	 *
 	 */
 	isHorizontalSeparatorVisibile?: boolean;
 
 	/**
 	 * Gets/sets the visibility of the vertical separators between days of the week in a MonthView.
+	 *
 	 */
 	isVerticalSeparatorVisibile?: boolean;
 
 	/**
 	 * Gets/sets the visibility of the weekday names in MonthView.
+	 *
 	 */
 	isWeekdayVisible?: boolean;
 
 	/**
 	 * Gets/sets the visibility of the week numbers in a MonthView.
+	 *
 	 */
 	isWeekNumberVisible?: boolean;
 
 	/**
 	 * Gets/sets the visibility of the days from the previous month that occur in the first week of a given month.
+	 *
 	 */
 	isPreviousMonthShown?: boolean;
 
 	/**
 	 * Gets/sets the visibility of the days from the next month that occur in the last week of a given month.
+	 *
 	 */
 	isNextMonthShown?: boolean;
 
@@ -71771,6 +81505,80 @@ interface MonthChangedEventUIParam {
 	newSelectedDate?: any;
 }
 
+interface WeekChangingEvent {
+	(event: Event, ui: WeekChangingEventUIParam): void;
+}
+
+interface WeekChangingEventUIParam {
+	/**
+	 * Gets a reference to the scheduler.
+	 */
+	owner?: any;
+
+	/**
+	 * Gets a reference to newly selected date.
+	 */
+	newSelectedDate?: any;
+
+	/**
+	 * Gets a reference to the currently selected date.
+	 */
+	currentSelectedDate?: any;
+}
+
+interface WeekChangedEvent {
+	(event: Event, ui: WeekChangedEventUIParam): void;
+}
+
+interface WeekChangedEventUIParam {
+	/**
+	 * Gets a reference to the scheduler.
+	 */
+	owner?: any;
+
+	/**
+	 * Gets a reference to newly selected date.
+	 */
+	newSelectedDate?: any;
+}
+
+interface DayChangingEvent {
+	(event: Event, ui: DayChangingEventUIParam): void;
+}
+
+interface DayChangingEventUIParam {
+	/**
+	 * Gets a reference to the scheduler.
+	 */
+	owner?: any;
+
+	/**
+	 * Gets a reference to newly selected date.
+	 */
+	newSelectedDate?: any;
+
+	/**
+	 * Gets a reference to the currently selected date.
+	 */
+	currentSelectedDate?: any;
+}
+
+interface DayChangedEvent {
+	(event: Event, ui: DayChangedEventUIParam): void;
+}
+
+interface DayChangedEventUIParam {
+	/**
+	 * Gets a reference to the scheduler.
+	 */
+	owner?: any;
+
+	/**
+	 * Gets a reference to newly selected date.
+	 */
+	newSelectedDate?: any;
+}
+
 interface ViewChangingEvent {
 	(event: Event, ui: ViewChangingEventUIParam): void;
 }
@@ -71996,12 +81804,14 @@ interface AppointmentEditedEventUIParam {
 interface IgScheduler {
 	/**
 	 * Lists of all the views, rendered in the Scheduler.
+	 *
 	 */
 	views?: any[];
 
 	/**
 	 * Gets/Sets current view mode in the Scheduler. If this options is not defined, then the first defined view in the views property is taken.
 	 *
+	 *
 	 * Valid values:
 	 * "monthView" Enables MonthView in the Scheduler.
 	 * "agendaView" Enables AgendaView in the Scheduler.
@@ -72009,13 +81819,21 @@ interface IgScheduler {
 	viewMode?: string;
 
 	/**
-	 * Enables/Disables today button.
+	 * Gets/Sets selected date in the Scheduler.
+	 *
 	 */
-	selectedDate?: boolean;
+	selectedDate?: Date;
+
+	/**
+	 * Enables/Disables today button.
+	 *
+	 */
+	enableTodayButton?: boolean;
 
 	/**
 	 * Gets/Sets the width of the control.
 	 *
+	 *
 	 * Valid values:
 	 * "null" will stretch to fit data, if no other widths are defined.
 	 */
@@ -72024,6 +81842,7 @@ interface IgScheduler {
 	/**
 	 * Gets/Sets the height of the control.
 	 *
+	 *
 	 * Valid values:
 	 * "null" will fit the editor inside its parent container, if no other heights are defined.
 	 */
@@ -72031,24 +81850,74 @@ interface IgScheduler {
 
 	/**
 	 * Gets/Sets AgendaView settings.
+	 *
 	 */
 	agendaViewSettings?: IgSchedulerAgendaViewSettings;
 
+	/**
+	 * Gets/Sets WeekView settings.
+	 *
+	 */
+	weekViewSettings?: IgSchedulerWeekViewSettings;
+
+	/**
+	 * Gets/Sets DayView settings.
+	 *
+	 */
+	dayViewSettings?: IgSchedulerDayViewSettings;
+
 	/**
 	 * Gets/Sets MonthView settings.
+	 *
 	 */
 	monthViewSettings?: IgSchedulerMonthViewSettings;
 
 	/**
 	 * Gets/Sets whether the appointment dialog and the related day and appointment popups should be shown.
+	 *
 	 */
 	appointmentDialogSuppress?: boolean;
 
 	/**
 	 * Gets/Sets dataSource of type $.ig.scheduler.ScheduleListDataSource.
+	 *
 	 */
 	dataSource?: any;
 
+	/**
+	 * Gets the resources collection that holds the activities` owners
+	 *
+	 * //Initialize
+	 * var resources = [
+	 * { id: 1, displayName: "Trina Friesen" },
+	 * { id: 2, displayName: "Mack Koch" }];
+	 * $(".selector").%%WidgetName%%({
+	 * resources: resources
+	 * });
+	 *
+	 * // Get
+	 * var resources = $(".selector").%%WidgetName%%("option", "resources");
+	 */
+	resources?: any;
+
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	locale?: any;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	language?: string;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+	regional?: string|Object;
+
 	/**
 	 * Fired before agenda view range is changed when using previous and next buttons (fired only in Agenda View)
 	 */
@@ -72084,6 +81953,26 @@ interface IgScheduler {
 	 */
 	rendered?: RenderedEvent;
 
+	/**
+	 * Fired before changing the week begins, when using previous and next buttons (fired only in Week View)
+	 */
+	weekChanging?: WeekChangingEvent;
+
+	/**
+	 * Fired after week is changed when using previous and next buttons (fired only in Week View)
+	 */
+	weekChanged?: WeekChangedEvent;
+
+	/**
+	 * Fired before changing the day begins, when using previous and next buttons (fired only in Day View)
+	 */
+	dayChanging?: DayChangingEvent;
+
+	/**
+	 * Fired after day is changed when using previous and next buttons (fired only in Day View)
+	 */
+	dayChanged?: DayChangedEvent;
+
 	/**
 	 * Fired before the view is changed, when using the menu buttons.
 	 */
@@ -72151,15 +82040,20 @@ interface IgScheduler {
 }
 interface IgSchedulerMethods {
 	/**
-	 * Gets reference to appointment by id
-	 */
-	getAppointmentById(id: Object): Object;
-
-	/**
-	 * Creates a new appointment and renders it to the scheduler
+	 * Creates an appointment and adds it to the appointment collection
+	 *
+	 * @param appointment appointment
 	 */
 	createAppointment(appointment: Object): Object;
 
+	/**
+	 * Gets reference to a collection of all appointments for the given time range
+	 *
+	 * @param start Start date.
+	 * @param end End date.
+	 */
+	getAppointmentsInRange(start: Date, end: Date): Object;
+
 	/**
 	 * Deletes appointment from the appointment collection
 	 *
@@ -72174,6 +82068,11 @@ interface IgSchedulerMethods {
 	 * @param updateAppoinment updateAppoinment
 	 */
 	editAppointment(appointment: Object, updateAppoinment: Object): Object;
+
+	/**
+	 * Changes the all locales into the widget element to the language specified in [options.language](ui.igscheduler#options:language)
+	 * Note that this method is for rare scenarios, see [language](ui.igscheduler#options:language) or [locale](ui.igscheduler#options:locale) option setter
+	 */
 	changeLocale(): void;
 
 	/**
@@ -72205,14 +82104,24 @@ interface IgSchedulerMethods {
 	 * Gets reference to the jQuery calendar UI control.
 	 */
 	getCalendar(): string;
+
+	/**
+	 * Changes the widget language to global language. Global language is the value in $.ig.util.language
+	 */
+	changeGlobalLanguage(): void;
+
+	/**
+	 * Changes the widget regional settins to global regional settings. Global regional settings are container in $.ig.util.regional
+	 */
+	changeGlobalRegional(): void;
 }
 interface JQuery {
 	data(propertyName: "igScheduler"): IgSchedulerMethods;
 }
 
 interface JQuery {
-	igScheduler(methodName: "getAppointmentById", id: Object): Object;
 	igScheduler(methodName: "createAppointment", appointment: Object): Object;
+	igScheduler(methodName: "getAppointmentsInRange", start: Date, end: Date): Object;
 	igScheduler(methodName: "deleteAppointment", appointment: Object): Object;
 	igScheduler(methodName: "editAppointment", appointment: Object, updateAppoinment: Object): Object;
 	igScheduler(methodName: "changeLocale"): void;
@@ -72222,21 +82131,26 @@ interface JQuery {
 	igScheduler(methodName: "dateRangeButton"): string;
 	igScheduler(methodName: "nextButton"): string;
 	igScheduler(methodName: "getCalendar"): string;
+	igScheduler(methodName: "changeGlobalLanguage"): void;
+	igScheduler(methodName: "changeGlobalRegional"): void;
 
 	/**
 	 * Lists of all the views, rendered in the Scheduler.
+	 *
 	 */
 	igScheduler(optionLiteral: 'option', optionName: "views"): any[];
 
 	/**
 	 * Lists of all the views, rendered in the Scheduler.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igScheduler(optionLiteral: 'option', optionName: "views", optionValue: any[]): void;
 
 	/**
 	 * Gets/Sets current view mode in the Scheduler. If this options is not defined, then the first defined view in the views property is taken.
+	 *
 	 */
 
 	igScheduler(optionLiteral: 'option', optionName: "viewMode"): string;
@@ -72244,25 +82158,43 @@ interface JQuery {
 	/**
 	 * /Sets current view mode in the Scheduler. If this options is not defined, then the first defined view in the views property is taken.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
 	igScheduler(optionLiteral: 'option', optionName: "viewMode", optionValue: string): void;
 
 	/**
-	 * Enables/Disables today button.
+	 * Gets/Sets selected date in the Scheduler.
+	 *
 	 */
-	igScheduler(optionLiteral: 'option', optionName: "selectedDate"): boolean;
+	igScheduler(optionLiteral: 'option', optionName: "selectedDate"): Date;
+
+	/**
+	 * /Sets selected date in the Scheduler.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igScheduler(optionLiteral: 'option', optionName: "selectedDate", optionValue: Date): void;
 
 	/**
 	 * Enables/Disables today button.
 	 *
+	 */
+	igScheduler(optionLiteral: 'option', optionName: "enableTodayButton"): boolean;
+
+	/**
+	 * Enables/Disables today button.
+	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
-	igScheduler(optionLiteral: 'option', optionName: "selectedDate", optionValue: boolean): void;
+	igScheduler(optionLiteral: 'option', optionName: "enableTodayButton", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the width of the control.
+	 *
 	 */
 
 	igScheduler(optionLiteral: 'option', optionName: "width"): string|number;
@@ -72270,6 +82202,7 @@ interface JQuery {
 	/**
 	 * /Sets the width of the control.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -72277,6 +82210,7 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the height of the control.
+	 *
 	 */
 
 	igScheduler(optionLiteral: 'option', optionName: "height"): string|number;
@@ -72284,6 +82218,7 @@ interface JQuery {
 	/**
 	 * /Sets the height of the control.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -72291,52 +82226,166 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets AgendaView settings.
+	 *
 	 */
 	igScheduler(optionLiteral: 'option', optionName: "agendaViewSettings"): IgSchedulerAgendaViewSettings;
 
 	/**
 	 * /Sets AgendaView settings.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igScheduler(optionLiteral: 'option', optionName: "agendaViewSettings", optionValue: IgSchedulerAgendaViewSettings): void;
 
+	/**
+	 * Gets/Sets WeekView settings.
+	 *
+	 */
+	igScheduler(optionLiteral: 'option', optionName: "weekViewSettings"): IgSchedulerWeekViewSettings;
+
+	/**
+	 * /Sets WeekView settings.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igScheduler(optionLiteral: 'option', optionName: "weekViewSettings", optionValue: IgSchedulerWeekViewSettings): void;
+
+	/**
+	 * Gets/Sets DayView settings.
+	 *
+	 */
+	igScheduler(optionLiteral: 'option', optionName: "dayViewSettings"): IgSchedulerDayViewSettings;
+
+	/**
+	 * /Sets DayView settings.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igScheduler(optionLiteral: 'option', optionName: "dayViewSettings", optionValue: IgSchedulerDayViewSettings): void;
+
 	/**
 	 * Gets/Sets MonthView settings.
+	 *
 	 */
 	igScheduler(optionLiteral: 'option', optionName: "monthViewSettings"): IgSchedulerMonthViewSettings;
 
 	/**
 	 * /Sets MonthView settings.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igScheduler(optionLiteral: 'option', optionName: "monthViewSettings", optionValue: IgSchedulerMonthViewSettings): void;
 
 	/**
 	 * Gets/Sets whether the appointment dialog and the related day and appointment popups should be shown.
+	 *
 	 */
 	igScheduler(optionLiteral: 'option', optionName: "appointmentDialogSuppress"): boolean;
 
 	/**
 	 * /Sets whether the appointment dialog and the related day and appointment popups should be shown.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igScheduler(optionLiteral: 'option', optionName: "appointmentDialogSuppress", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets dataSource of type $.ig.scheduler.ScheduleListDataSource.
+	 *
 	 */
 	igScheduler(optionLiteral: 'option', optionName: "dataSource"): any;
 
 	/**
 	 * /Sets dataSource of type $.ig.scheduler.ScheduleListDataSource.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igScheduler(optionLiteral: 'option', optionName: "dataSource", optionValue: any): void;
 
+	/**
+	 * Gets the resources collection that holds the activities` owners
+	 *
+	 * //Initialize
+	 * var resources = [
+	 * { id: 1, displayName: "Trina Friesen" },
+	 * { id: 2, displayName: "Mack Koch" }];
+	 * $(".selector").%%WidgetName%%({
+	 * resources: resources
+	 * });
+	 *
+	 * // Get
+	 * var resources = $(".selector").%%WidgetName%%("option", "resources");
+	 */
+	igScheduler(optionLiteral: 'option', optionName: "resources"): any;
+
+	/**
+	 * The resources collection that holds the activities` owners
+	 *
+	 * //Initialize
+	 * var resources = [
+	 * { id: 1, displayName: "Trina Friesen" },
+	 * { id: 2, displayName: "Mack Koch" }];
+	 * $(".selector").%%WidgetName%%({
+	 * resources: resources
+	 * });
+	 *
+	 * // Get
+	 * var resources = $(".selector").%%WidgetName%%("option", "resources");
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igScheduler(optionLiteral: 'option', optionName: "resources", optionValue: any): void;
+
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	igScheduler(optionLiteral: 'option', optionName: "locale"): any;
+
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igScheduler(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	igScheduler(optionLiteral: 'option', optionName: "language"): string;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igScheduler(optionLiteral: 'option', optionName: "language", optionValue: string): void;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+
+	igScheduler(optionLiteral: 'option', optionName: "regional"): string|Object;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igScheduler(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
+
 	/**
 	 * Fired before agenda view range is changed when using previous and next buttons (fired only in Agenda View)
 	 */
@@ -72421,6 +82470,54 @@ interface JQuery {
 	 */
 	igScheduler(optionLiteral: 'option', optionName: "rendered", optionValue: RenderedEvent): void;
 
+	/**
+	 * Fired before changing the week begins, when using previous and next buttons (fired only in Week View)
+	 */
+	igScheduler(optionLiteral: 'option', optionName: "weekChanging"): WeekChangingEvent;
+
+	/**
+	 * Fired before changing the week begins, when using previous and next buttons (fired only in Week View)
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igScheduler(optionLiteral: 'option', optionName: "weekChanging", optionValue: WeekChangingEvent): void;
+
+	/**
+	 * Fired after week is changed when using previous and next buttons (fired only in Week View)
+	 */
+	igScheduler(optionLiteral: 'option', optionName: "weekChanged"): WeekChangedEvent;
+
+	/**
+	 * Fired after week is changed when using previous and next buttons (fired only in Week View)
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igScheduler(optionLiteral: 'option', optionName: "weekChanged", optionValue: WeekChangedEvent): void;
+
+	/**
+	 * Fired before changing the day begins, when using previous and next buttons (fired only in Day View)
+	 */
+	igScheduler(optionLiteral: 'option', optionName: "dayChanging"): DayChangingEvent;
+
+	/**
+	 * Fired before changing the day begins, when using previous and next buttons (fired only in Day View)
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igScheduler(optionLiteral: 'option', optionName: "dayChanging", optionValue: DayChangingEvent): void;
+
+	/**
+	 * Fired after day is changed when using previous and next buttons (fired only in Day View)
+	 */
+	igScheduler(optionLiteral: 'option', optionName: "dayChanged"): DayChangedEvent;
+
+	/**
+	 * Fired after day is changed when using previous and next buttons (fired only in Day View)
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igScheduler(optionLiteral: 'option', optionName: "dayChanged", optionValue: DayChangedEvent): void;
+
 	/**
 	 * Fired before the view is changed, when using the menu buttons.
 	 */
@@ -72715,12 +82812,14 @@ interface ResizedEventUIParam {
 interface IgScroll {
 	/**
 	 * Sets or gets if the scrollbars should be always visible (on all environments). Otherwise it will be the default behavior. Note: this option is only for the custom scrollbars set through the scrollbarType option.
+	 *
 	 */
 	alwaysVisible?: boolean;
 
 	/**
 	 * Sets or gets what type of scrollbars should be using the igScroll (on all environments).
 	 *
+	 *
 	 * Valid values:
 	 * "custom" Custom scrollbars with custom ui and events.
 	 * "native" Native scrollbars
@@ -72728,126 +82827,174 @@ interface IgScroll {
 	 */
 	scrollbarType?: string;
 
+	/**
+	 * Sets or gets the minimum size of the thumb drag in pixels. For the vertical thumb it means its minimum height, for the horizontal thumb it means its minimum width. This affects only the custom scrollblar when scrollbarType is set to "custom".
+	 *
+	 */
+	minThumbSize?: number|string;
+
 	/**
 	 * Sets or gets if igScroll can modify the DOM when it is initialized on certain element so that the content can be scrollable.
+	 *
 	 */
 	modifyDOM?: boolean;
 
 	/**
 	 * Sets custom value for how high is actually the content. Useful when wanting to scroll and update the shown content manually.
+	 *
 	 */
 	scrollHeight?: number;
 
 	/**
 	 * Sets custom value for what width is actually the content. Useful when wanting to scroll and update the shown content manually.
+	 *
 	 */
 	scrollWidth?: number;
 
 	/**
 	 * Sets gets current vertical position of the content.
+	 *
 	 */
 	scrollTop?: number;
 
 	/**
 	 * Sets gets current horizontal position of the content.
+	 *
 	 */
 	scrollLeft?: number;
 
 	/**
 	 * Sets gets the step of the default scrolling behavior when using mouse wheel
+	 *
 	 */
 	wheelStep?: number;
 
 	/**
 	 * Sets gets the step of the default scrolling behavior when using any of the custom scrollbar arrows
+	 *
 	 */
 	smallIncrementStep?: number;
 
 	/**
 	 * Sets gets the step of the default scrolling behavior when using any of the custom scrollbar track areas.
+	 *
 	 */
 	bigIncrementStep?: number;
 
 	/**
 	 * Sets gets if smoother scrolling with small intertia should be used when using mouse wheel
+	 *
 	 */
 	smoothing?: boolean;
 
 	/**
 	 * Sets or gets the modifier for how many pixels will be scrolled when using the mouse wheel once. This is used only for the smooth scrolling behavior.
+	 *
 	 */
 	smoothingStep?: number;
 
 	/**
 	 * Sets or gets the modifier for how long the scroll ‘animation’ lasts when using the mouse wheel once. This is used only for the smooth scrolling behavior.
+	 *
 	 */
 	smoothingDuration?: number;
 
 	/**
 	 * Sets gets the modifier for how much the inertia scrolls on mobile devices
+	 *
 	 */
 	inertiaStep?: number;
 
 	/**
 	 * Sets gets the modifier for how long the inertia last on mobile devices
+	 *
 	 */
 	inertiaDuration?: number;
 
 	/**
 	 * Sets gets how much pixels of toleration there will be when initially swiping horizontally. This is to improve swiping up/down without scrolling left/right when not intended due to small deviation left/right
+	 *
 	 */
 	swipeToleranceX?: number;
 
 	/**
 	 * Sets gets at least how many times the horizontal speed should be bigger so the inertia proceeds only horizontally without scrolling vertically. This is to improve interactions due to not perfectly swiping left/right with some deviation down/up
+	 *
 	 */
 	inertiaDeltaX?: number;
 
 	/**
 	 * Sets gets at least how many times the vertical speed should be bigger so the inertia proceeds only vertically without scrolling horizontally. This is to improve interactions due to not perfectly swiping down/up with some deviation left/right
+	 *
 	 */
 	inertiaDeltaY?: number;
 
 	/**
 	 * Sets gets elements that are linked to the main content horizontally. When the content is scrolled on X axis the linked elements scroll accordingly.
+	 *
 	 */
 	syncedElemsH?: any[];
 
 	/**
 	 * Sets gets elements that are linked to the main content vertically. When the content is scrolled on Y axis the linked elements scroll accordingly.
+	 *
 	 */
 	syncedElemsV?: any[];
 
 	/**
 	 * Sets gets html or jQuery element which is used for horizontal scrolling.
+	 *
 	 */
 	scrollbarH?: string;
 
 	/**
 	 * Sets gets html or jQuery element which is used for vertical scrolling.
+	 *
 	 */
 	scrollbarV?: string;
 
 	/**
 	 * Sets gets if only the linked horizontal scrollbar should be used for horizontal scrolling. Note: The behavior when the linked scrollbar is scrolled in this case should be handled manually.
+	 *
 	 */
 	scrollOnlyHBar?: boolean;
 
 	/**
 	 * Sets gets if only the linked vertical scrollbar should be used for vertical scrolling. Note: The behavior when the linked scrollbar is scrolled in this case should be handled manually.
+	 *
 	 */
 	scrollOnlyVBar?: boolean;
 
 	/**
 	 * Sets gets html or jQuery element to which the horizontal scrollbar will be appended to.
+	 *
 	 */
 	scrollbarHParent?: string;
 
 	/**
 	 * Sets gets html or jQuery element to which the vertical scrollbar will be appended to.
+	 *
 	 */
 	scrollbarVParent?: string;
 
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	locale?: any;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	language?: string;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+	regional?: string|Object;
+
 	/**
 	 * Event which is raised after the scroller has been rendered fully
 	 */
@@ -72902,9 +83049,24 @@ interface IgScroll {
 }
 interface IgScrollMethods {
 	refresh(): void;
+
+	/**
+	 * This method overrides the base method and does nothing, because the scoll container shouldn't change the container locales
+	 * Note that this method is for rare scenarios, use [language](ui.igupload#options:language) or [locale](ui.igupload#options:locale) option setter
+	 */
 	changeLocale(): void;
 	option(optionName: Object, value: Object): void;
 	destroy(): void;
+
+	/**
+	 * Changes the widget language to global language. Global language is the value in $.ig.util.language
+	 */
+	changeGlobalLanguage(): void;
+
+	/**
+	 * Changes the widget regional settins to global regional settings. Global regional settings are container in $.ig.util.regional
+	 */
+	changeGlobalRegional(): void;
 }
 interface JQuery {
 	data(propertyName: "igScroll"): IgScrollMethods;
@@ -72915,21 +83077,26 @@ interface JQuery {
 	igScroll(methodName: "changeLocale"): void;
 	igScroll(methodName: "option", optionName: Object, value: Object): void;
 	igScroll(methodName: "destroy"): void;
+	igScroll(methodName: "changeGlobalLanguage"): void;
+	igScroll(methodName: "changeGlobalRegional"): void;
 
 	/**
 	 * Sets or gets if the scrollbars should be always visible (on all environments). Otherwise it will be the default behavior. Note: this option is only for the custom scrollbars set through the scrollbarType option.
+	 *
 	 */
 	igScroll(optionLiteral: 'option', optionName: "alwaysVisible"): boolean;
 
 	/**
 	 * Sets or gets if the scrollbars should be always visible (on all environments). Otherwise it will be the default behavior. Note: this option is only for the custom scrollbars set through the scrollbarType option.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igScroll(optionLiteral: 'option', optionName: "alwaysVisible", optionValue: boolean): void;
 
 	/**
 	 * Sets or gets what type of scrollbars should be using the igScroll (on all environments).
+	 *
 	 */
 
 	igScroll(optionLiteral: 'option', optionName: "scrollbarType"): string;
@@ -72937,299 +83104,408 @@ interface JQuery {
 	/**
 	 * Sets or gets what type of scrollbars should be using the igScroll (on all environments).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
 	igScroll(optionLiteral: 'option', optionName: "scrollbarType", optionValue: string): void;
 
+	/**
+	 * Sets or gets the minimum size of the thumb drag in pixels. For the vertical thumb it means its minimum height, for the horizontal thumb it means its minimum width. This affects only the custom scrollblar when scrollbarType is set to "custom".
+	 *
+	 */
+
+	igScroll(optionLiteral: 'option', optionName: "minThumbSize"): number|string;
+
+	/**
+	 * Sets or gets the minimum size of the thumb drag in pixels. For the vertical thumb it means its minimum height, for the horizontal thumb it means its minimum width. This affects only the custom scrollblar when scrollbarType is set to "custom".
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igScroll(optionLiteral: 'option', optionName: "minThumbSize", optionValue: number|string): void;
+
 	/**
 	 * Sets or gets if igScroll can modify the DOM when it is initialized on certain element so that the content can be scrollable.
+	 *
 	 */
 	igScroll(optionLiteral: 'option', optionName: "modifyDOM"): boolean;
 
 	/**
 	 * Sets or gets if igScroll can modify the DOM when it is initialized on certain element so that the content can be scrollable.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igScroll(optionLiteral: 'option', optionName: "modifyDOM", optionValue: boolean): void;
 
 	/**
 	 * Sets custom value for how high is actually the content. Useful when wanting to scroll and update the shown content manually.
+	 *
 	 */
 	igScroll(optionLiteral: 'option', optionName: "scrollHeight"): number;
 
 	/**
 	 * Sets custom value for how high is actually the content. Useful when wanting to scroll and update the shown content manually.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igScroll(optionLiteral: 'option', optionName: "scrollHeight", optionValue: number): void;
 
 	/**
 	 * Sets custom value for what width is actually the content. Useful when wanting to scroll and update the shown content manually.
+	 *
 	 */
 	igScroll(optionLiteral: 'option', optionName: "scrollWidth"): number;
 
 	/**
 	 * Sets custom value for what width is actually the content. Useful when wanting to scroll and update the shown content manually.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igScroll(optionLiteral: 'option', optionName: "scrollWidth", optionValue: number): void;
 
 	/**
 	 * Sets gets current vertical position of the content.
+	 *
 	 */
 	igScroll(optionLiteral: 'option', optionName: "scrollTop"): number;
 
 	/**
 	 * Sets gets current vertical position of the content.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igScroll(optionLiteral: 'option', optionName: "scrollTop", optionValue: number): void;
 
 	/**
 	 * Sets gets current horizontal position of the content.
+	 *
 	 */
 	igScroll(optionLiteral: 'option', optionName: "scrollLeft"): number;
 
 	/**
 	 * Sets gets current horizontal position of the content.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igScroll(optionLiteral: 'option', optionName: "scrollLeft", optionValue: number): void;
 
 	/**
 	 * Sets gets the step of the default scrolling behavior when using mouse wheel
+	 *
 	 */
 	igScroll(optionLiteral: 'option', optionName: "wheelStep"): number;
 
 	/**
 	 * Sets gets the step of the default scrolling behavior when using mouse wheel
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igScroll(optionLiteral: 'option', optionName: "wheelStep", optionValue: number): void;
 
 	/**
 	 * Sets gets the step of the default scrolling behavior when using any of the custom scrollbar arrows
+	 *
 	 */
 	igScroll(optionLiteral: 'option', optionName: "smallIncrementStep"): number;
 
 	/**
 	 * Sets gets the step of the default scrolling behavior when using any of the custom scrollbar arrows
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igScroll(optionLiteral: 'option', optionName: "smallIncrementStep", optionValue: number): void;
 
 	/**
 	 * Sets gets the step of the default scrolling behavior when using any of the custom scrollbar track areas.
+	 *
 	 */
 	igScroll(optionLiteral: 'option', optionName: "bigIncrementStep"): number;
 
 	/**
 	 * Sets gets the step of the default scrolling behavior when using any of the custom scrollbar track areas.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igScroll(optionLiteral: 'option', optionName: "bigIncrementStep", optionValue: number): void;
 
 	/**
 	 * Sets gets if smoother scrolling with small intertia should be used when using mouse wheel
+	 *
 	 */
 	igScroll(optionLiteral: 'option', optionName: "smoothing"): boolean;
 
 	/**
 	 * Sets gets if smoother scrolling with small intertia should be used when using mouse wheel
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igScroll(optionLiteral: 'option', optionName: "smoothing", optionValue: boolean): void;
 
 	/**
 	 * Sets or gets the modifier for how many pixels will be scrolled when using the mouse wheel once. This is used only for the smooth scrolling behavior.
+	 *
 	 */
 	igScroll(optionLiteral: 'option', optionName: "smoothingStep"): number;
 
 	/**
 	 * Sets or gets the modifier for how many pixels will be scrolled when using the mouse wheel once. This is used only for the smooth scrolling behavior.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igScroll(optionLiteral: 'option', optionName: "smoothingStep", optionValue: number): void;
 
 	/**
 	 * Sets or gets the modifier for how long the scroll ‘animation’ lasts when using the mouse wheel once. This is used only for the smooth scrolling behavior.
+	 *
 	 */
 	igScroll(optionLiteral: 'option', optionName: "smoothingDuration"): number;
 
 	/**
 	 * Sets or gets the modifier for how long the scroll ‘animation’ lasts when using the mouse wheel once. This is used only for the smooth scrolling behavior.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igScroll(optionLiteral: 'option', optionName: "smoothingDuration", optionValue: number): void;
 
 	/**
 	 * Sets gets the modifier for how much the inertia scrolls on mobile devices
+	 *
 	 */
 	igScroll(optionLiteral: 'option', optionName: "inertiaStep"): number;
 
 	/**
 	 * Sets gets the modifier for how much the inertia scrolls on mobile devices
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igScroll(optionLiteral: 'option', optionName: "inertiaStep", optionValue: number): void;
 
 	/**
 	 * Sets gets the modifier for how long the inertia last on mobile devices
+	 *
 	 */
 	igScroll(optionLiteral: 'option', optionName: "inertiaDuration"): number;
 
 	/**
 	 * Sets gets the modifier for how long the inertia last on mobile devices
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igScroll(optionLiteral: 'option', optionName: "inertiaDuration", optionValue: number): void;
 
 	/**
 	 * Sets gets how much pixels of toleration there will be when initially swiping horizontally. This is to improve swiping up/down without scrolling left/right when not intended due to small deviation left/right
+	 *
 	 */
 	igScroll(optionLiteral: 'option', optionName: "swipeToleranceX"): number;
 
 	/**
 	 * Sets gets how much pixels of toleration there will be when initially swiping horizontally. This is to improve swiping up/down without scrolling left/right when not intended due to small deviation left/right
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igScroll(optionLiteral: 'option', optionName: "swipeToleranceX", optionValue: number): void;
 
 	/**
 	 * Sets gets at least how many times the horizontal speed should be bigger so the inertia proceeds only horizontally without scrolling vertically. This is to improve interactions due to not perfectly swiping left/right with some deviation down/up
+	 *
 	 */
 	igScroll(optionLiteral: 'option', optionName: "inertiaDeltaX"): number;
 
 	/**
 	 * Sets gets at least how many times the horizontal speed should be bigger so the inertia proceeds only horizontally without scrolling vertically. This is to improve interactions due to not perfectly swiping left/right with some deviation down/up
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igScroll(optionLiteral: 'option', optionName: "inertiaDeltaX", optionValue: number): void;
 
 	/**
 	 * Sets gets at least how many times the vertical speed should be bigger so the inertia proceeds only vertically without scrolling horizontally. This is to improve interactions due to not perfectly swiping down/up with some deviation left/right
+	 *
 	 */
 	igScroll(optionLiteral: 'option', optionName: "inertiaDeltaY"): number;
 
 	/**
 	 * Sets gets at least how many times the vertical speed should be bigger so the inertia proceeds only vertically without scrolling horizontally. This is to improve interactions due to not perfectly swiping down/up with some deviation left/right
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igScroll(optionLiteral: 'option', optionName: "inertiaDeltaY", optionValue: number): void;
 
 	/**
 	 * Sets gets elements that are linked to the main content horizontally. When the content is scrolled on X axis the linked elements scroll accordingly.
+	 *
 	 */
 	igScroll(optionLiteral: 'option', optionName: "syncedElemsH"): any[];
 
 	/**
 	 * Sets gets elements that are linked to the main content horizontally. When the content is scrolled on X axis the linked elements scroll accordingly.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igScroll(optionLiteral: 'option', optionName: "syncedElemsH", optionValue: any[]): void;
 
 	/**
 	 * Sets gets elements that are linked to the main content vertically. When the content is scrolled on Y axis the linked elements scroll accordingly.
+	 *
 	 */
 	igScroll(optionLiteral: 'option', optionName: "syncedElemsV"): any[];
 
 	/**
 	 * Sets gets elements that are linked to the main content vertically. When the content is scrolled on Y axis the linked elements scroll accordingly.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igScroll(optionLiteral: 'option', optionName: "syncedElemsV", optionValue: any[]): void;
 
 	/**
 	 * Sets gets html or jQuery element which is used for horizontal scrolling.
+	 *
 	 */
 	igScroll(optionLiteral: 'option', optionName: "scrollbarH"): string;
 
 	/**
 	 * Sets gets html or jQuery element which is used for horizontal scrolling.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igScroll(optionLiteral: 'option', optionName: "scrollbarH", optionValue: string): void;
 
 	/**
 	 * Sets gets html or jQuery element which is used for vertical scrolling.
+	 *
 	 */
 	igScroll(optionLiteral: 'option', optionName: "scrollbarV"): string;
 
 	/**
 	 * Sets gets html or jQuery element which is used for vertical scrolling.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igScroll(optionLiteral: 'option', optionName: "scrollbarV", optionValue: string): void;
 
 	/**
 	 * Sets gets if only the linked horizontal scrollbar should be used for horizontal scrolling. Note: The behavior when the linked scrollbar is scrolled in this case should be handled manually.
+	 *
 	 */
 	igScroll(optionLiteral: 'option', optionName: "scrollOnlyHBar"): boolean;
 
 	/**
 	 * Sets gets if only the linked horizontal scrollbar should be used for horizontal scrolling. Note: The behavior when the linked scrollbar is scrolled in this case should be handled manually.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igScroll(optionLiteral: 'option', optionName: "scrollOnlyHBar", optionValue: boolean): void;
 
 	/**
 	 * Sets gets if only the linked vertical scrollbar should be used for vertical scrolling. Note: The behavior when the linked scrollbar is scrolled in this case should be handled manually.
+	 *
 	 */
 	igScroll(optionLiteral: 'option', optionName: "scrollOnlyVBar"): boolean;
 
 	/**
 	 * Sets gets if only the linked vertical scrollbar should be used for vertical scrolling. Note: The behavior when the linked scrollbar is scrolled in this case should be handled manually.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igScroll(optionLiteral: 'option', optionName: "scrollOnlyVBar", optionValue: boolean): void;
 
 	/**
 	 * Sets gets html or jQuery element to which the horizontal scrollbar will be appended to.
+	 *
 	 */
 	igScroll(optionLiteral: 'option', optionName: "scrollbarHParent"): string;
 
 	/**
 	 * Sets gets html or jQuery element to which the horizontal scrollbar will be appended to.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igScroll(optionLiteral: 'option', optionName: "scrollbarHParent", optionValue: string): void;
 
 	/**
 	 * Sets gets html or jQuery element to which the vertical scrollbar will be appended to.
+	 *
 	 */
 	igScroll(optionLiteral: 'option', optionName: "scrollbarVParent"): string;
 
 	/**
 	 * Sets gets html or jQuery element to which the vertical scrollbar will be appended to.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igScroll(optionLiteral: 'option', optionName: "scrollbarVParent", optionValue: string): void;
 
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	igScroll(optionLiteral: 'option', optionName: "locale"): any;
+
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igScroll(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	igScroll(optionLiteral: 'option', optionName: "language"): string;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igScroll(optionLiteral: 'option', optionName: "language", optionValue: string): void;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+
+	igScroll(optionLiteral: 'option', optionName: "regional"): string|Object;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igScroll(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
+
 	/**
 	 * Event which is raised after the scroller has been rendered fully
 	 */
@@ -73345,6 +83621,3062 @@ interface JQuery {
 	igScroll(optionLiteral: 'option', optionName: string, optionValue: any): JQuery;
 	igScroll(methodName: string, ...methodParams: any[]): any;
 }
+interface IgShapeChart {
+	/**
+	 * The triangulated file source URI or an instance of $.ig.ShapeDataSource.
+	 */
+	shapeDataSource?: string;
+
+	/**
+	 * String The database source URI.
+	 */
+	databaseSource?: string;
+
+	/**
+	 * The triangulated file source URI or an instance of $.ig.TriangulationDataSource.
+	 */
+	triangulationDataSource?: string;
+
+	/**
+	 * Gets or sets the id of a template element to use for tooltips, or markup representing the tooltip template.
+	 */
+	tooltipTemplate?: any;
+
+	/**
+	 * Gets or sets the names of tooltip templates
+	 */
+	tooltipTemplates?: any;
+
+	/**
+	 * Gets or sets the left margin of chart title
+	 */
+	titleLeftMargin?: number;
+
+	/**
+	 * Gets or sets the right margin of chart title
+	 */
+	titleRightMargin?: number;
+
+	/**
+	 * Gets or sets the top margin of chart title
+	 */
+	titleTopMargin?: number;
+
+	/**
+	 * Gets or sets the bottom margin of chart title
+	 */
+	titleBottomMargin?: number;
+
+	/**
+	 * Gets or sets the left margin of chart subtitle
+	 */
+	subtitleLeftMargin?: number;
+
+	/**
+	 * Gets or sets the top margin of chart subtitle
+	 */
+	subtitleTopMargin?: number;
+
+	/**
+	 * Gets or sets the right margin of chart subtitle
+	 */
+	subtitleRightMargin?: number;
+
+	/**
+	 * Gets or sets the bottom margin of chart subtitle
+	 */
+	subtitleBottomMargin?: number;
+
+	/**
+	 * Gets or sets color of chart subtitle
+	 */
+	subtitleTextColor?: string;
+
+	/**
+	 * Gets or sets color of chart title
+	 */
+	titleTextColor?: string;
+
+	/**
+	 * Gets or sets the left margin of the chart content.
+	 */
+	leftMargin?: number;
+
+	/**
+	 * Gets or sets the top margin of the chart content.
+	 */
+	topMargin?: number;
+
+	/**
+	 * Gets or sets the right margin of the chart content.
+	 */
+	rightMargin?: number;
+
+	/**
+	 * Gets or sets the bottom margin around the chart content.
+	 */
+	bottomMargin?: number;
+
+	/**
+	 * Gets or sets the duration used for animating series plots when the data is changing
+	 */
+	transitionDuration?: number;
+
+	/**
+	 * Gets or sets the easing function used for animating series plots when the data is changing.
+	 * This can be set to one of the known values "linear" or "cubic," or it can be set to an easing function which takes a single numeric parameter and returns a number.
+	 */
+	transitionEasingFunction?: any;
+
+	/**
+	 * Gets or sets a function for creating wrapped tooltip
+	 */
+	createWrappedTooltip?: any;
+
+	/**
+	 * Gets or sets the widget of this control
+	 */
+	widget?: any;
+
+	/**
+	 * Gets or sets CSS font property for the chart subtitle
+	 */
+	subtitleTextStyle?: string;
+
+	/**
+	 * Gets or sets CSS font property for the chart title
+	 */
+	titleTextStyle?: string;
+
+	/**
+	 * Gets or sets a collection of data items used to generate the chart.
+	 * The ItemsSource of this chart can be a list of objects containing one or more numeric properties.
+	 * Additionally, if the objects in the list implement the IEnumerable interface,
+	 * the Chart will attempt to delve into the sub-collections when reading through the data source.
+	 * Databinding can be further configured by attributing the data item classes
+	 * with the DataSeriesMemberIntentAttribute.
+	 */
+	itemsSource?: any;
+
+	/**
+	 * Gets or sets a set of property paths that should be included for consideration by the category chart, leaving the remainder excluded. If null, all properties will be considered.
+	 */
+	includedProperties?: any;
+
+	/**
+	 * Gets or sets a set of property paths that should be excluded from consideration by the category chart.
+	 */
+	excludedProperties?: any;
+
+	/**
+	 * Gets or sets the palette of brushes to use for coloring the chart series.
+	 * The value provided should be an array of CSS color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 */
+	brushes?: any;
+
+	/**
+	 * Gets or sets the palette of brushes to use for outlines on the chart series.
+	 * The value provided should be an array of CSS color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 */
+	outlines?: any;
+
+	/**
+	 * Gets or sets the legend to connect this chart to.
+	 * When the legend property is set, the chart will use it to display information about its series.  Legends can be shared by multiple chart controls.
+	 */
+	legend?: any;
+
+	/**
+	 * Gets or sets whether the chart can be horizontally zoomed through user interactions.
+	 */
+	isHorizontalZoomEnabled?: boolean;
+
+	/**
+	 * Gets or sets whether the chart can be vertically zoomed through user interactions.
+	 */
+	isVerticalZoomEnabled?: boolean;
+
+	/**
+	 * Gets or sets the rectangle representing the current scroll and zoom state of the chart.
+	 * WindowRect is expressed as a Rectangle with coordinates and sizes between 0 and 1.
+	 * The provided object should have numeric properties called left, top, width and height.
+	 */
+	windowRect?: any;
+
+	/**
+	 * Gets or sets text to display above the plot area.
+	 */
+	title?: string;
+
+	/**
+	 * Gets or sets text to display below the Title, above the plot area.
+	 */
+	subtitle?: string;
+
+	/**
+	 * Gets or sets horizontal alignment which determines the title position, relative to the left and right edges of the control.
+	 *
+	 * Valid values:
+	 * "left" Align the item to the left
+	 * "center" Center the item
+	 * "right" Align the item to the right
+	 * "stretch" Stretch the item to the full width
+	 */
+	titleAlignment?: string;
+
+	/**
+	 * Gets or sets horizontal alignment which determines the subtitle position, relative to the left and right edges of the control.
+	 *
+	 * Valid values:
+	 * "left" Align the item to the left
+	 * "center" Center the item
+	 * "right" Align the item to the right
+	 * "stretch" Stretch the item to the full width
+	 */
+	subtitleAlignment?: string;
+
+	/**
+	 * Gets or sets the behavior that determines how unknown values will be plotted on the chart.Null and Double.NaN are two examples of unknown values.
+	 *
+	 *
+	 * Valid values:
+	 * "linearInterpolate" Plot the unknown value as the midpoint between surrounding known values using linear interpolation.
+	 * "dontPlot" Do not plot the unknown value on the chart.
+	 */
+	unknownValuePlotting?: string;
+
+	/**
+	 * Gets or sets the rendering resolution for all series in this chart.
+	 * Where n = Resolution, for every n horizontal pixels, combine all items into a single datapoint.  When Resolution = 0, all datapoints will be rendered as graphical objects.  Charts with a higher resolution will have faster performance.
+	 */
+	resolution?: number;
+
+	/**
+	 * Gets or sets the thickness for all series in this chart. Depending on the ChartType, this can be the main brush used, or just the outline.
+	 */
+	thickness?: number;
+
+	/**
+	 * Gets or sets the marker shapes used for indicating location of data points in this chart.
+	 * This property applies only to these chart types: point, line, spline, bubble, and polygon
+	 */
+	markerTypes?: any;
+
+	/**
+	 * Gets or sets the palette of brushes used for rendering fill area of data point markers.
+	 * This property applies only to these chart types: point, line, spline, bubble, and polygon
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 */
+	markerBrushes?: any;
+
+	/**
+	 * Gets or sets the palette of brushes used for rendering outlines of data point markers.
+	 * This property applies only to these chart types: point, line, spline, bubble, and polygon
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 */
+	markerOutlines?: any;
+
+	/**
+	 * Gets or sets the maximum number of markers displyed in the plot area of the chart.
+	 */
+	markerMaxCount?: number;
+
+	/**
+	 * Gets or sets the palette of brushes to used for coloring trend lines in this chart.
+	 * The value provided should be an array of CSS color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 */
+	trendLineBrushes?: any;
+
+	/**
+	 * Gets or sets the formula used for calculating trend lines in this chart.This property applies only to these chart types: point, line, spline, and bubble
+	 *
+	 *
+	 * Valid values:
+	 * "none" No trend line will be displayed.
+	 * "linearFit" Linear fit.
+	 * "quadraticFit" Quadratic polynomial fit.
+	 * "cubicFit" Cubic polynomial fit.
+	 * "quarticFit" Quartic polynomial fit.
+	 * "quinticFit" Quintic polynomial fit.
+	 * "logarithmicFit" Logarithmic fit.
+	 * "exponentialFit" Exponential fit.
+	 * "powerLawFit" Powerlaw fit.
+	 * "simpleAverage" Simple moving average.
+	 * "exponentialAverage" Exponential moving average.
+	 * "modifiedAverage" Modified moving average.
+	 * "cumulativeAverage" Cumulative moving average.
+	 * "weightedAverage" Weighted moving average.
+	 */
+	trendLineType?: string;
+
+	/**
+	 * Gets or sets the thickness of the trend lines in this chart.
+	 * This property applies only to these chart types: point, line, spline, and bubble
+	 */
+	trendLineThickness?: number;
+
+	/**
+	 * Gets or sets a value indicating whether grid and tick lines are aligned to device pixels.
+	 */
+	alignsGridLinesToPixels?: boolean;
+	trendLinePeriod?: number;
+
+	/**
+	 * Gets or sets function which takes an context object and returns a formatted label for the X-axis.
+	 */
+	xAxisFormatLabel?: any;
+
+	/**
+	 * Gets or sets function which takes a context object and returns a formatted label for the Y-axis.
+	 */
+	yAxisFormatLabel?: any;
+
+	/**
+	 * Gets or sets the left margin of labels on the X-axis
+	 */
+	xAxisLabelLeftMargin?: number;
+
+	/**
+	 * Gets or sets the top margin of labels on the X-axis
+	 */
+	xAxisLabelTopMargin?: number;
+
+	/**
+	 * Gets or sets the right margin of labels on the X-axis
+	 */
+	xAxisLabelRightMargin?: number;
+
+	/**
+	 * Gets or sets the bottom margin of labels on the X-axis
+	 */
+	xAxisLabelBottomMargin?: number;
+
+	/**
+	 * Gets or sets the left margin of labels on the Y-axis
+	 */
+	yAxisLabelLeftMargin?: number;
+
+	/**
+	 * Gets or sets the top margin of labels on the Y-axis
+	 */
+	yAxisLabelTopMargin?: number;
+
+	/**
+	 * Gets or sets the right margin of labels on the Y-axis
+	 */
+	yAxisLabelRightMargin?: number;
+
+	/**
+	 * Gets or sets the bottom margin of labels on the Y-axis
+	 */
+	yAxisLabelBottomMargin?: number;
+
+	/**
+	 * Gets or sets color of labels on the X-axis
+	 */
+	xAxisLabelTextColor?: string;
+
+	/**
+	 * Gets or sets color of labels on the Y-axis
+	 */
+	yAxisLabelTextColor?: string;
+
+	/**
+	 * Gets or sets the margin around a title on the X-axis
+	 */
+	xAxisTitleMargin?: number;
+
+	/**
+	 * Gets or sets the margin around a title on the Y-axis
+	 */
+	yAxisTitleMargin?: number;
+
+	/**
+	 * Gets or sets the left margin of a title on the X-axis
+	 */
+	xAxisTitleLeftMargin?: number;
+
+	/**
+	 * Gets or sets the left margin of a title on the Y-axis
+	 */
+	yAxisTitleLeftMargin?: number;
+
+	/**
+	 * Gets or sets the top margin of a title on the X-axis
+	 */
+	xAxisTitleTopMargin?: number;
+
+	/**
+	 * Gets or sets the top margin of a title on the Y-axis
+	 */
+	yAxisTitleTopMargin?: number;
+
+	/**
+	 * Gets or sets the right margin of a title on the X-axis
+	 */
+	xAxisTitleRightMargin?: number;
+
+	/**
+	 * Gets or sets the right margin of a title on the Y-axis
+	 */
+	yAxisTitleRightMargin?: number;
+
+	/**
+	 * Gets or sets the bottom margin of a title on the X-axis
+	 */
+	xAxisTitleBottomMargin?: number;
+
+	/**
+	 * Gets or sets the bottom margin of a title on the Y-axis
+	 */
+	yAxisTitleBottomMargin?: number;
+
+	/**
+	 * Gets or sets color of title on the X-axis
+	 */
+	xAxisTitleTextColor?: string;
+
+	/**
+	 * Gets or sets color of title on the Y-axis
+	 */
+	yAxisTitleTextColor?: string;
+
+	/**
+	 * Gets or sets CSS font property for labels on X-axis
+	 */
+	xAxisLabelTextStyle?: string;
+
+	/**
+	 * Gets or sets CSS font property for labels on Y-axis
+	 */
+	yAxisLabelTextStyle?: string;
+
+	/**
+	 * Gets or sets CSS font property for title on X-axis
+	 */
+	xAxisTitleTextStyle?: string;
+
+	/**
+	 * Gets or sets CSS font property for title on Y-axis
+	 */
+	yAxisTitleTextStyle?: string;
+
+	/**
+	 * Gets or sets the format for labels along the X-axis.
+	 */
+	xAxisLabel?: any;
+
+	/**
+	 * Gets or sets the format for labels along the Y-axis.
+	 */
+	yAxisLabel?: any;
+
+	/**
+	 * Gets or sets the color to apply to major gridlines along the X-axis.
+	 */
+	xAxisMajorStroke?: string;
+
+	/**
+	 * Gets or sets the color to apply to major gridlines along the Y-axis.
+	 */
+	yAxisMajorStroke?: string;
+
+	/**
+	 * Gets or sets the thickness to apply to major gridlines along the X-axis.
+	 */
+	xAxisMajorStrokeThickness?: number;
+
+	/**
+	 * Gets or sets the thickness to apply to major gridlines along the Y-axis.
+	 */
+	yAxisMajorStrokeThickness?: number;
+
+	/**
+	 * Gets or sets the thickness to apply to minor gridlines along the X-axis.
+	 */
+	xAxisMinorStrokeThickness?: number;
+
+	/**
+	 * Gets or sets the thickness to apply to minor gridlines along the Y-axis.
+	 */
+	yAxisMinorStrokeThickness?: number;
+
+	/**
+	 * Gets or sets the color to apply to stripes along the X-axis.
+	 */
+	xAxisStrip?: string;
+
+	/**
+	 * Gets or sets the color to apply to stripes along the Y-axis.
+	 */
+	yAxisStrip?: string;
+
+	/**
+	 * Gets or sets the color to apply to the X-axis line.
+	 */
+	xAxisStroke?: string;
+
+	/**
+	 * Gets or sets the color to apply to the Y-axis line.
+	 */
+	yAxisStroke?: string;
+
+	/**
+	 * Gets or sets the thickness to apply to the X-axis line.
+	 */
+	xAxisStrokeThickness?: number;
+
+	/**
+	 * Gets or sets the thickness to apply to the Y-axis line.
+	 */
+	yAxisStrokeThickness?: number;
+
+	/**
+	 * Gets or sets the length of tickmarks along the X-axis.
+	 */
+	xAxisTickLength?: number;
+
+	/**
+	 * Gets or sets the length of tickmarks along the Y-axis.
+	 */
+	yAxisTickLength?: number;
+
+	/**
+	 * Gets or sets the color to apply to tickmarks along the X-axis.
+	 */
+	xAxisTickStroke?: string;
+
+	/**
+	 * Gets or sets the color to apply to tickmarks along the Y-axis.
+	 */
+	yAxisTickStroke?: string;
+
+	/**
+	 * Gets or sets the thickness to apply to tickmarks along the X-axis.
+	 */
+	xAxisTickStrokeThickness?: number;
+
+	/**
+	 * Gets or sets the thickness to apply to tickmarks along the Y-axis.
+	 */
+	yAxisTickStrokeThickness?: number;
+
+	/**
+	 * Gets or sets the Text to display below the X-axis.
+	 */
+	xAxisTitle?: string;
+
+	/**
+	 * Gets or sets the Text to display to the left of the Y-axis.
+	 */
+	yAxisTitle?: string;
+
+	/**
+	 * Gets or sets the color to apply to minor gridlines along the X-axis.
+	 */
+	xAxisMinorStroke?: string;
+
+	/**
+	 * Gets or sets the color to apply to minor gridlines along the Y-axis.
+	 */
+	yAxisMinorStroke?: string;
+
+	/**
+	 * Gets or sets the angle of rotation for labels along the X-axis.
+	 */
+	xAxisLabelAngle?: number;
+
+	/**
+	 * Gets or sets the angle of rotation for labels along the Y-axis.
+	 */
+	yAxisLabelAngle?: number;
+
+	/**
+	 * Gets or sets the distance between the X-axis and the bottom of the chart.
+	 */
+	xAxisExtent?: number;
+
+	/**
+	 * Gets or sets the distance between the Y-axis and the left edge of the chart.
+	 */
+	yAxisExtent?: number;
+
+	/**
+	 * Gets or sets the angle of rotation for the X-axis title.
+	 */
+	xAxisTitleAngle?: number;
+
+	/**
+	 * Gets or sets the angle of rotation for the Y-axis title.
+	 */
+	yAxisTitleAngle?: number;
+
+	/**
+	 * Gets or sets whether to invert the direction of the X-axis by placing the first data items on the right side of the chart.
+	 */
+	xAxisInverted?: boolean;
+
+	/**
+	 * Gets or sets whether to invert the direction of the Y-axis by placing the minimum numeric value at the top of the chart.
+	 */
+	yAxisInverted?: boolean;
+
+	/**
+	 * Gets or sets Horizontal alignment of the X-axis title.
+	 *
+	 * Valid values:
+	 * "left" Align the item to the left
+	 * "center" Center the item
+	 * "right" Align the item to the right
+	 * "stretch" Stretch the item to the full width
+	 */
+	xAxisTitleAlignment?: string;
+
+	/**
+	 * Gets or sets Vertical alignment of the Y-axis title.
+	 *
+	 * Valid values:
+	 * "top" Align the item to the top
+	 * "center" Center the item
+	 * "bottom" Align the item to the bottom
+	 * "stretch" Stretch the item to the full height
+	 */
+	yAxisTitleAlignment?: string;
+
+	/**
+	 * Gets or sets Horizontal alignment of X-axis labels.
+	 *
+	 * Valid values:
+	 * "left" Align the item to the left
+	 * "center" Center the item
+	 * "right" Align the item to the right
+	 * "stretch" Stretch the item to the full width
+	 */
+	xAxisLabelHorizontalAlignment?: string;
+
+	/**
+	 * Gets or sets Horizontal alignment of Y-axis labels.
+	 *
+	 * Valid values:
+	 * "left" Align the item to the left
+	 * "center" Center the item
+	 * "right" Align the item to the right
+	 * "stretch" Stretch the item to the full width
+	 */
+	yAxisLabelHorizontalAlignment?: string;
+
+	/**
+	 * Gets or sets Vertical alignment of X-axis labels.
+	 *
+	 * Valid values:
+	 * "top" Align the item to the top
+	 * "center" Center the item
+	 * "bottom" Align the item to the bottom
+	 * "stretch" Stretch the item to the full height
+	 */
+	xAxisLabelVerticalAlignment?: string;
+
+	/**
+	 * Gets or sets Vertical alignment of Y-axis labels.
+	 *
+	 * Valid values:
+	 * "top" Align the item to the top
+	 * "center" Center the item
+	 * "bottom" Align the item to the bottom
+	 * "stretch" Stretch the item to the full height
+	 */
+	yAxisLabelVerticalAlignment?: string;
+
+	/**
+	 * Gets or sets Visibility of X-axis labels.
+	 *
+	 * Valid values:
+	 * "visible" Display the element.
+	 * "collapsed" Do not display the element.
+	 */
+	xAxisLabelVisibility?: string;
+
+	/**
+	 * Gets or sets Visibility of Y-axis labels.
+	 *
+	 * Valid values:
+	 * "visible" Display the element.
+	 * "collapsed" Do not display the element.
+	 */
+	yAxisLabelVisibility?: string;
+
+	/**
+	 * The location of Y-axis labels, relative to the plot area.
+	 *
+	 * Valid values:
+	 * "outsideTop" Places the axis labels at the top, outside of the plotting area.
+	 * "outsideBottom" Places the axis labels at the bottom, outside of the plotting area
+	 * "outsideLeft" Places the axis labels to the left, outside of the plotting area.
+	 * "outsideRight" Places the axis labels to the right, outside of the plotting area.
+	 * "insideTop" Places the axis labels inside the plotting area above the axis line.
+	 * "insideBottom" Places the axis labels inside the plotting area below the axis line.
+	 * "insideLeft" Places the axis labels inside the plotting area and to the left of the axis line.
+	 * "insideRight" Places the axis labels inside the plotting area and to the right of the axis line.
+	 */
+	yAxisLabelLocation?: string;
+
+	/**
+	 * Gets or sets the frequency of displayed labels along the X-axis.
+	 * Gets or sets the set value is a factor that determines which labels will be hidden. For example, an interval of 2 will display every other label.
+	 */
+	xAxisInterval?: number;
+
+	/**
+	 * Gets or sets the frequency of displayed minor lines along the X-axis.
+	 * Gets or sets the set value is a factor that determines how the minor lines will be displayed.
+	 */
+	xAxisMinorInterval?: number;
+
+	/**
+	 * Gets or sets the distance between each label and grid line along the Y-axis.
+	 */
+	yAxisInterval?: number;
+
+	/**
+	 * Gets or sets whether the Y-axis should use a logarithmic scale instead of a linear one.
+	 * Since log(-1) is imaginary and log(0) is undefined, it is recommended to enable this property only when the Y-axis minimum is greater than zero.
+	 */
+	yAxisIsLogarithmic?: boolean;
+
+	/**
+	 * Gets or sets the base value to use in the log function when mapping the position of data items along the Y-axis.
+	 * This property is effective only when YAxisIsLogarithmic is true.
+	 */
+	yAxisLogarithmBase?: number;
+
+	/**
+	 * Gets or sets the data value corresponding to the minimum value of the Y-axis.
+	 */
+	yAxisMinimumValue?: number;
+
+	/**
+	 * Gets or sets the data value corresponding to the maximum value of the Y-axis.
+	 */
+	yAxisMaximumValue?: number;
+
+	/**
+	 * Gets or sets the frequency of displayed minor lines along the Y-axis.
+	 */
+	yAxisMinorInterval?: number;
+
+	/**
+	 * Gets or sets whether the X-axis will use a logarithmic scale, instead of a linear one.
+	 * Since log(-1) is imaginary and log(0) is undefined, it is recommended to enable this property only when the X-axis minimum is greater than zero.
+	 */
+	xAxisIsLogarithmic?: boolean;
+
+	/**
+	 * Gets or sets the base value to use in the log function when mapping the position of data items along the X-axis.
+	 * This property is effective only when y-axis is logarithmic
+	 */
+	xAxisLogarithmBase?: number;
+
+	/**
+	 * Gets or sets the data value corresponding to the minimum value on the X-axis.
+	 */
+	xAxisMinimumValue?: number;
+
+	/**
+	 * Gets or sets the data value corresponding to the maximum value on the X-axis.
+	 */
+	xAxisMaximumValue?: number;
+
+	/**
+	 * Gets or sets whether the large numbers on the X-axis labels are abbreviated.
+	 */
+	xAxisAbbreviateLargeNumbers?: boolean;
+
+	/**
+	 * Gets or sets whether the large numbers on the Y-axis labels are abbreviated.
+	 */
+	yAxisAbbreviateLargeNumbers?: boolean;
+
+	/**
+	 * Gets or sets collision avoidance between markers on series that support this behaviour.
+	 *
+	 * Valid values:
+	 * "none" Collision avoidance is disabled.
+	 * "omit" Items colliding with other items will be hidden from view.
+	 * "fade" Items colliding with other items will be partially hidden from view by reducing their opacity.
+	 * "omitAndShift" Items colliding with other items will be either hidden from view or moved to new positions.
+	 * "fadeAndShift" Items colliding with other items will be either partially hidden from view by reducing their opacity, or moved to new positions, or a combination of both.
+	 */
+	markerCollision?: string;
+
+	/**
+	 * Gets or sets the type of chart series to generate from the data.
+	 *
+	 * Valid values:
+	 * "auto" Specifies automatic selection of chart type based on suggestion from internal Data Adapter
+	 * "point" Specifies point chart with small markers at X/Y data
+	 * "line" Specifies line chart with small markers at X/Y data and connected with lines
+	 * "spline" Specifies spline chart with small markers at X/Y data and connected with splines
+	 * "bubble" Specifies bubble chart with proportional markers at X/Y data
+	 * "highDensity" Specifies high density chart with colored bitmap pixels at X/Y data based on density of nearby points
+	 * "area" Specifies area chart with colored surface based on a triangulation of X/Y data with numeric values assigned to each point.
+	 * "contour" Specifies area chart with colored lines based on a triangulation of X/Y data with numeric values assigned to each point.
+	 * "polygon" Specifies polygon chart with polygons defined by X/Y data
+	 * "polyline" Specifies polyline chart with polylines defined by X/Y data
+	 */
+	chartType?: string;
+
+	/**
+	 * The width of the chart.
+	 */
+	width?: number;
+
+	/**
+	 * The height of the chart.
+	 */
+	height?: number;
+
+	/**
+	 * Gets sets maximum number of displayed records in chart.
+	 */
+	maxRecCount?: number;
+
+	/**
+	 * Gets sets a valid data source.
+	 * That can be instance of array or primitives, array of objects, instance of $.ig.DataSource, or any other data accepted by $.ig.DataSource.
+	 * Note: if it is set to string and "dataSourceType" option is not set, then $.ig.JSONPDataSource is used.
+	 */
+	dataSource?: any;
+
+	/**
+	 * Gets sets data source type (such as "json", "xml", etc). Please refer to the documentation of $.ig.DataSource and its type property
+	 */
+	dataSourceType?: string;
+
+	/**
+	 * Gets sets url which is used for sending JSON on request for remote data.
+	 */
+	dataSourceUrl?: string;
+
+	/**
+	 * See $.ig.DataSource. property in the response specifying the total number of records on the server.
+	 */
+	responseTotalRecCountKey?: string;
+
+	/**
+	 * See $.ig.DataSource. This is basically the property in the responses where data records are held, if the response is wrapped.
+	 */
+	responseDataKey?: string;
+
+	/**
+	 * Event raised when a property value is changed on this chart
+	 */
+	propertyChanged?: PropertyChangedEvent;
+
+	/**
+	 * Event raised when a series is initialized and added to this chart.
+	 */
+	seriesAdded?: SeriesAddedEvent;
+
+	/**
+	 * Event raised when a series is removed from this chart.
+	 */
+	seriesRemoved?: SeriesRemovedEvent;
+
+	/**
+	 * Occurs when the pointer enters a Series.
+	 */
+	seriesPointerEnter?: SeriesPointerEnterEvent;
+
+	/**
+	 * Occurs when the pointer leaves a Series.
+	 */
+	seriesPointerLeave?: SeriesPointerLeaveEvent;
+
+	/**
+	 * Occurs when the pointer moves over a Series.
+	 */
+	seriesPointerMove?: SeriesPointerMoveEvent;
+
+	/**
+	 * Occurs when the pointer is pressed down over a Series.
+	 */
+	seriesPointerDown?: SeriesPointerDownEvent;
+
+	/**
+	 * Occurs when the pointer is released over a Series.
+	 */
+	seriesPointerUp?: SeriesPointerUpEvent;
+
+	/**
+	 * Event which is raised before data binding.
+	 * Return false in order to cancel data binding.
+	 * Function takes first argument null and second argument ui.
+	 * Use ui.owner to obtain reference to chart widget.
+	 * Use ui.dataSource to obtain reference to instance of $.ig.DataSource.
+	 */
+	dataBinding?: DataBindingEvent;
+
+	/**
+	 * Event which is raised after data binding.
+	 * Function takes first argument null and second argument ui.
+	 * Use ui.owner to obtain reference to chart widget.
+	 * Use ui.data to obtain reference to array actual data which is displayed by chart.
+	 * Use ui.dataSource to obtain reference to instance of $.ig.DataSource.
+	 */
+	dataBound?: DataBoundEvent;
+
+	/**
+	 * Event which is raised before tooltip is updated.
+	 * Return false in order to cancel updating and hide tooltip.
+	 * Function takes first argument null and second argument ui.
+	 * Use ui.owner to obtain reference to chart widget.
+	 * Use ui.text to obtain html of tooltip. Value of that member can be modified. If modified value is null or empty string, then current content of tooltip keeps old value.
+	 * Use ui.item to obtain reference to item. Value of that member can be modified or replaced by custom item.
+	 * Use ui.x to obtain left position of tooltip in pixels relative to widget. Value of that member can be modified.
+	 * Use ui.y to obtain top position of tooltip in pixels relative to widget. Value of that member can be modified.
+	 * Use ui.element to obtain reference to jquery object which represents tooltip. Value of that member can be replaced by custom element.
+	 */
+	updateTooltip?: UpdateTooltipEvent;
+
+	/**
+	 * Event which is raised before tooltip is hidden.
+	 * Return false in order to cancel hiding and keep tooltip visible.
+	 * Function takes first argument null and second argument ui.
+	 * Use ui.owner to obtain reference to chart widget.
+	 * Use ui.item to obtain reference to item.
+	 * Use ui.element to obtain reference to jquery object which represents tooltip or value of ui.element from last updateTooltip event. Value of that member can be replaced by custom element.
+	 */
+	hideTooltip?: HideTooltipEvent;
+
+	/**
+	 * Option for igShapeChart
+	 */
+	[optionName: string]: any;
+}
+interface IgShapeChartMethods {
+	destroy(): void;
+	id(): void;
+	exportVisualData(): void;
+
+	/**
+	 * Find index of item within actual data used by chart.
+	 *
+	 * @param item The reference to item.
+	 */
+	findIndexOfItem(item: Object): number;
+
+	/**
+	 * Get item within actual data used by chart. That is similar to this.getData()[ index ].
+	 *
+	 * @param index Index of data item.
+	 */
+	getDataItem(index: Object): Object;
+
+	/**
+	 * Get reference of actual data used by chart.
+	 */
+	getData(): any[];
+
+	/**
+	 * Adds a new item to the data source and notifies the chart.
+	 *
+	 * @param item The item that we want to add to the data source.
+	 */
+	addItem(item: Object): Object;
+
+	/**
+	 * Inserts a new item to the data source and notifies the chart.
+	 *
+	 * @param item the new item that we want to insert in the data source.
+	 * @param index The index in the data source where the new item will be inserted.
+	 */
+	insertItem(item: Object, index: number): Object;
+
+	/**
+	 * Deletes an item from the data source and notifies the chart.
+	 *
+	 * @param index The index in the data source from where the item will be been removed.
+	 */
+	removeItem(index: number): Object;
+
+	/**
+	 * Updates an item in the data source and notifies the chart.
+	 *
+	 * @param index The index of the item in the data source that we want to change.
+	 * @param item The new item object that will be set in the data source.
+	 */
+	setItem(index: number, item: Object): Object;
+
+	/**
+	 * Notifies the chart that an item has been set in an associated data source.
+	 *
+	 * @param dataSource The data source in which the change happened.
+	 * @param index The index in the items source that has been changed.
+	 * @param newItem the new item that has been set in the collection.
+	 * @param oldItem the old item that has been overwritten in the collection.
+	 */
+	notifySetItem(dataSource: Object, index: number, newItem: Object, oldItem: Object): Object;
+
+	/**
+	 * Notifies the chart that the items have been cleared from an associated data source.
+	 * It's not necessary to notify more than one target of a change if they share the same items source.
+	 *
+	 * @param dataSource The data source in which the change happened.
+	 */
+	notifyClearItems(dataSource: Object): Object;
+
+	/**
+	 * Notifies the target axis or series that an item has been inserted at the specified index in its data source.
+	 * It's not necessary to notify more than one target of a change if they share the same items source.
+	 *
+	 * @param dataSource The data source in which the change happened.
+	 * @param index The index in the items source where the new item has been inserted.
+	 * @param newItem the new item that has been set in the collection.
+	 */
+	notifyInsertItem(dataSource: Object, index: number, newItem: Object): Object;
+
+	/**
+	 * Notifies the target axis or series that an item has been removed from the specified index in its data source.
+	 * It's not necessary to notify more than one target of a change if they share the same items source.
+	 *
+	 * @param dataSource The data source in which the change happened.
+	 * @param index The index in the items source from where the old item has been removed.
+	 * @param oldItem the old item that has been removed from the collection.
+	 */
+	notifyRemoveItem(dataSource: Object, index: number, oldItem: Object): Object;
+
+	/**
+	 * Get reference to chart object.
+	 */
+	chart(): Object;
+
+	/**
+	 * Binds data to the chart
+	 */
+	dataBind(): void;
+
+	/**
+	 * Forces any pending deferred work to render on the chart before continuing
+	 */
+	flush(): void;
+}
+interface JQuery {
+	data(propertyName: "igShapeChart"): IgShapeChartMethods;
+}
+
+interface JQuery {
+	igShapeChart(methodName: "destroy"): void;
+	igShapeChart(methodName: "id"): void;
+	igShapeChart(methodName: "exportVisualData"): void;
+	igShapeChart(methodName: "findIndexOfItem", item: Object): number;
+	igShapeChart(methodName: "getDataItem", index: Object): Object;
+	igShapeChart(methodName: "getData"): any[];
+	igShapeChart(methodName: "addItem", item: Object): Object;
+	igShapeChart(methodName: "insertItem", item: Object, index: number): Object;
+	igShapeChart(methodName: "removeItem", index: number): Object;
+	igShapeChart(methodName: "setItem", index: number, item: Object): Object;
+	igShapeChart(methodName: "notifySetItem", dataSource: Object, index: number, newItem: Object, oldItem: Object): Object;
+	igShapeChart(methodName: "notifyClearItems", dataSource: Object): Object;
+	igShapeChart(methodName: "notifyInsertItem", dataSource: Object, index: number, newItem: Object): Object;
+	igShapeChart(methodName: "notifyRemoveItem", dataSource: Object, index: number, oldItem: Object): Object;
+	igShapeChart(methodName: "chart"): Object;
+	igShapeChart(methodName: "dataBind"): void;
+	igShapeChart(methodName: "flush"): void;
+
+	/**
+	 * The triangulated file source URI or an instance of $.ig.ShapeDataSource.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "shapeDataSource"): string;
+
+	/**
+	 * The triangulated file source URI or an instance of $.ig.ShapeDataSource.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "shapeDataSource", optionValue: string): void;
+
+	/**
+	 * String The database source URI.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "databaseSource"): string;
+
+	/**
+	 * String The database source URI.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "databaseSource", optionValue: string): void;
+
+	/**
+	 * The triangulated file source URI or an instance of $.ig.TriangulationDataSource.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "triangulationDataSource"): string;
+
+	/**
+	 * The triangulated file source URI or an instance of $.ig.TriangulationDataSource.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "triangulationDataSource", optionValue: string): void;
+
+	/**
+	 * Gets  the id of a template element to use for tooltips, or markup representing the tooltip template.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "tooltipTemplate"): any;
+
+	/**
+	 * Sets the id of a template element to use for tooltips, or markup representing the tooltip template.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "tooltipTemplate", optionValue: any): void;
+
+	/**
+	 * Gets  the names of tooltip templates
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "tooltipTemplates"): any;
+
+	/**
+	 * Sets the names of tooltip templates
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "tooltipTemplates", optionValue: any): void;
+
+	/**
+	 * Gets  the left margin of chart title
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "titleLeftMargin"): number;
+
+	/**
+	 * Sets the left margin of chart title
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "titleLeftMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the right margin of chart title
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "titleRightMargin"): number;
+
+	/**
+	 * Sets the right margin of chart title
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "titleRightMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the top margin of chart title
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "titleTopMargin"): number;
+
+	/**
+	 * Sets the top margin of chart title
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "titleTopMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the bottom margin of chart title
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "titleBottomMargin"): number;
+
+	/**
+	 * Sets the bottom margin of chart title
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "titleBottomMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the left margin of chart subtitle
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "subtitleLeftMargin"): number;
+
+	/**
+	 * Sets the left margin of chart subtitle
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "subtitleLeftMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the top margin of chart subtitle
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "subtitleTopMargin"): number;
+
+	/**
+	 * Sets the top margin of chart subtitle
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "subtitleTopMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the right margin of chart subtitle
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "subtitleRightMargin"): number;
+
+	/**
+	 * Sets the right margin of chart subtitle
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "subtitleRightMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the bottom margin of chart subtitle
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "subtitleBottomMargin"): number;
+
+	/**
+	 * Sets the bottom margin of chart subtitle
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "subtitleBottomMargin", optionValue: number): void;
+
+	/**
+	 * Gets  color of chart subtitle
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "subtitleTextColor"): string;
+
+	/**
+	 * Sets color of chart subtitle
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "subtitleTextColor", optionValue: string): void;
+
+	/**
+	 * Gets  color of chart title
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "titleTextColor"): string;
+
+	/**
+	 * Sets color of chart title
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "titleTextColor", optionValue: string): void;
+
+	/**
+	 * Gets  the left margin of the chart content.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "leftMargin"): number;
+
+	/**
+	 * Sets the left margin of the chart content.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "leftMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the top margin of the chart content.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "topMargin"): number;
+
+	/**
+	 * Sets the top margin of the chart content.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "topMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the right margin of the chart content.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "rightMargin"): number;
+
+	/**
+	 * Sets the right margin of the chart content.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "rightMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the bottom margin around the chart content.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "bottomMargin"): number;
+
+	/**
+	 * Sets the bottom margin around the chart content.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "bottomMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the duration used for animating series plots when the data is changing
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "transitionDuration"): number;
+
+	/**
+	 * Sets the duration used for animating series plots when the data is changing
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "transitionDuration", optionValue: number): void;
+
+	/**
+	 * Gets  the easing function used for animating series plots when the data is changing.
+	 * This can be set to one of the known values "linear" or "cubic," or it can be set to an easing function which takes a single numeric parameter and returns a number.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "transitionEasingFunction"): any;
+
+	/**
+	 * Sets the easing function used for animating series plots when the data is changing.
+	 * This can be set to one of the known values "linear" or "cubic," or it can be set to an easing function which takes a single numeric parameter and returns a number.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "transitionEasingFunction", optionValue: any): void;
+
+	/**
+	 * Gets  a function for creating wrapped tooltip
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "createWrappedTooltip"): any;
+
+	/**
+	 * Sets a function for creating wrapped tooltip
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "createWrappedTooltip", optionValue: any): void;
+
+	/**
+	 * Gets  the widget of this control
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "widget"): any;
+
+	/**
+	 * Sets the widget of this control
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "widget", optionValue: any): void;
+
+	/**
+	 * Gets  CSS font property for the chart subtitle
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "subtitleTextStyle"): string;
+
+	/**
+	 * Sets CSS font property for the chart subtitle
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "subtitleTextStyle", optionValue: string): void;
+
+	/**
+	 * Gets  CSS font property for the chart title
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "titleTextStyle"): string;
+
+	/**
+	 * Sets CSS font property for the chart title
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "titleTextStyle", optionValue: string): void;
+
+	/**
+	 * Gets  a collection of data items used to generate the chart.
+	 * The ItemsSource of this chart can be a list of objects containing one or more numeric properties.
+	 * Additionally, if the objects in the list implement the IEnumerable interface,
+	 * the Chart will attempt to delve into the sub-collections when reading through the data source.
+	 * Databinding can be further configured by attributing the data item classes
+	 * with the DataSeriesMemberIntentAttribute.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "itemsSource"): any;
+
+	/**
+	 * Sets a collection of data items used to generate the chart.
+	 * The ItemsSource of this chart can be a list of objects containing one or more numeric properties.
+	 * Additionally, if the objects in the list implement the IEnumerable interface,
+	 * the Chart will attempt to delve into the sub-collections when reading through the data source.
+	 * Databinding can be further configured by attributing the data item classes
+	 * with the DataSeriesMemberIntentAttribute.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "itemsSource", optionValue: any): void;
+
+	/**
+	 * Gets  a set of property paths that should be included for consideration by the category chart, leaving the remainder excluded. If null, all properties will be considered.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "includedProperties"): any;
+
+	/**
+	 * Sets a set of property paths that should be included for consideration by the category chart, leaving the remainder excluded. If null, all properties will be considered.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "includedProperties", optionValue: any): void;
+
+	/**
+	 * Gets  a set of property paths that should be excluded from consideration by the category chart.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "excludedProperties"): any;
+
+	/**
+	 * Sets a set of property paths that should be excluded from consideration by the category chart.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "excludedProperties", optionValue: any): void;
+
+	/**
+	 * Gets  the palette of brushes to use for coloring the chart series.
+	 * The value provided should be an array of CSS color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "brushes"): any;
+
+	/**
+	 * Sets the palette of brushes to use for coloring the chart series.
+	 * The value provided should be an array of CSS color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "brushes", optionValue: any): void;
+
+	/**
+	 * Gets  the palette of brushes to use for outlines on the chart series.
+	 * The value provided should be an array of CSS color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "outlines"): any;
+
+	/**
+	 * Sets the palette of brushes to use for outlines on the chart series.
+	 * The value provided should be an array of CSS color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "outlines", optionValue: any): void;
+
+	/**
+	 * Gets  the legend to connect this chart to.
+	 * When the legend property is set, the chart will use it to display information about its series.  Legends can be shared by multiple chart controls.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "legend"): any;
+
+	/**
+	 * Sets the legend to connect this chart to.
+	 * When the legend property is set, the chart will use it to display information about its series.  Legends can be shared by multiple chart controls.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "legend", optionValue: any): void;
+
+	/**
+	 * Gets  whether the chart can be horizontally zoomed through user interactions.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "isHorizontalZoomEnabled"): boolean;
+
+	/**
+	 * Sets whether the chart can be horizontally zoomed through user interactions.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "isHorizontalZoomEnabled", optionValue: boolean): void;
+
+	/**
+	 * Gets  whether the chart can be vertically zoomed through user interactions.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "isVerticalZoomEnabled"): boolean;
+
+	/**
+	 * Sets whether the chart can be vertically zoomed through user interactions.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "isVerticalZoomEnabled", optionValue: boolean): void;
+
+	/**
+	 * Gets  the rectangle representing the current scroll and zoom state of the chart.
+	 * WindowRect is expressed as a Rectangle with coordinates and sizes between 0 and 1.
+	 * The provided object should have numeric properties called left, top, width and height.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "windowRect"): any;
+
+	/**
+	 * Sets the rectangle representing the current scroll and zoom state of the chart.
+	 * WindowRect is expressed as a Rectangle with coordinates and sizes between 0 and 1.
+	 * The provided object should have numeric properties called left, top, width and height.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "windowRect", optionValue: any): void;
+
+	/**
+	 * Gets  text to display above the plot area.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "title"): string;
+
+	/**
+	 * Sets text to display above the plot area.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "title", optionValue: string): void;
+
+	/**
+	 * Gets  text to display below the Title, above the plot area.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "subtitle"): string;
+
+	/**
+	 * Sets text to display below the Title, above the plot area.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "subtitle", optionValue: string): void;
+
+	/**
+	 * Gets  horizontal alignment which determines the title position, relative to the left and right edges of the control.
+	 */
+
+	igShapeChart(optionLiteral: 'option', optionName: "titleAlignment"): string;
+
+	/**
+	 * Sets horizontal alignment which determines the title position, relative to the left and right edges of the control.
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igShapeChart(optionLiteral: 'option', optionName: "titleAlignment", optionValue: string): void;
+
+	/**
+	 * Gets  horizontal alignment which determines the subtitle position, relative to the left and right edges of the control.
+	 */
+
+	igShapeChart(optionLiteral: 'option', optionName: "subtitleAlignment"): string;
+
+	/**
+	 * Sets horizontal alignment which determines the subtitle position, relative to the left and right edges of the control.
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igShapeChart(optionLiteral: 'option', optionName: "subtitleAlignment", optionValue: string): void;
+
+	/**
+	 * Gets  the behavior that determines how unknown values will be plotted on the chart.Null and Double.NaN are two examples of unknown values.
+	 *
+	 */
+
+	igShapeChart(optionLiteral: 'option', optionName: "unknownValuePlotting"): string;
+
+	/**
+	 * Sets the behavior that determines how unknown values will be plotted on the chart.Null and Double.NaN are two examples of unknown values.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igShapeChart(optionLiteral: 'option', optionName: "unknownValuePlotting", optionValue: string): void;
+
+	/**
+	 * Gets  the rendering resolution for all series in this chart.
+	 * Where n = Resolution, for every n horizontal pixels, combine all items into a single datapoint.  When Resolution = 0, all datapoints will be rendered as graphical objects.  Charts with a higher resolution will have faster performance.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "resolution"): number;
+
+	/**
+	 * Sets the rendering resolution for all series in this chart.
+	 * Where n = Resolution, for every n horizontal pixels, combine all items into a single datapoint.  When Resolution = 0, all datapoints will be rendered as graphical objects.  Charts with a higher resolution will have faster performance.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "resolution", optionValue: number): void;
+
+	/**
+	 * Gets  the thickness for all series in this chart. Depending on the ChartType, this can be the main brush used, or just the outline.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "thickness"): number;
+
+	/**
+	 * Sets the thickness for all series in this chart. Depending on the ChartType, this can be the main brush used, or just the outline.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "thickness", optionValue: number): void;
+
+	/**
+	 * Gets  the marker shapes used for indicating location of data points in this chart.
+	 * This property applies only to these chart types: point, line, spline, bubble, and polygon
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "markerTypes"): any;
+
+	/**
+	 * Sets the marker shapes used for indicating location of data points in this chart.
+	 * This property applies only to these chart types: point, line, spline, bubble, and polygon
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "markerTypes", optionValue: any): void;
+
+	/**
+	 * Gets  the palette of brushes used for rendering fill area of data point markers.
+	 * This property applies only to these chart types: point, line, spline, bubble, and polygon
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "markerBrushes"): any;
+
+	/**
+	 * Sets the palette of brushes used for rendering fill area of data point markers.
+	 * This property applies only to these chart types: point, line, spline, bubble, and polygon
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "markerBrushes", optionValue: any): void;
+
+	/**
+	 * Gets  the palette of brushes used for rendering outlines of data point markers.
+	 * This property applies only to these chart types: point, line, spline, bubble, and polygon
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "markerOutlines"): any;
+
+	/**
+	 * Sets the palette of brushes used for rendering outlines of data point markers.
+	 * This property applies only to these chart types: point, line, spline, bubble, and polygon
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "markerOutlines", optionValue: any): void;
+
+	/**
+	 * Gets  the maximum number of markers displyed in the plot area of the chart.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "markerMaxCount"): number;
+
+	/**
+	 * Sets the maximum number of markers displyed in the plot area of the chart.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "markerMaxCount", optionValue: number): void;
+
+	/**
+	 * Gets  the palette of brushes to used for coloring trend lines in this chart.
+	 * The value provided should be an array of CSS color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "trendLineBrushes"): any;
+
+	/**
+	 * Sets the palette of brushes to used for coloring trend lines in this chart.
+	 * The value provided should be an array of CSS color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection
+	 * The value provided should be an array of css color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "trendLineBrushes", optionValue: any): void;
+
+	/**
+	 * Gets  the formula used for calculating trend lines in this chart.This property applies only to these chart types: point, line, spline, and bubble
+	 *
+	 */
+
+	igShapeChart(optionLiteral: 'option', optionName: "trendLineType"): string;
+
+	/**
+	 * Sets the formula used for calculating trend lines in this chart.This property applies only to these chart types: point, line, spline, and bubble
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igShapeChart(optionLiteral: 'option', optionName: "trendLineType", optionValue: string): void;
+
+	/**
+	 * Gets  the thickness of the trend lines in this chart.
+	 * This property applies only to these chart types: point, line, spline, and bubble
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "trendLineThickness"): number;
+
+	/**
+	 * Sets the thickness of the trend lines in this chart.
+	 * This property applies only to these chart types: point, line, spline, and bubble
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "trendLineThickness", optionValue: number): void;
+
+	/**
+	 * Gets  a value indicating whether grid and tick lines are aligned to device pixels.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "alignsGridLinesToPixels"): boolean;
+
+	/**
+	 * Sets a value indicating whether grid and tick lines are aligned to device pixels.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "alignsGridLinesToPixels", optionValue: boolean): void;
+	igShapeChart(optionLiteral: 'option', optionName: "trendLinePeriod"): number;
+	igShapeChart(optionLiteral: 'option', optionName: "trendLinePeriod", optionValue: number): void;
+
+	/**
+	 * Gets  function which takes an context object and returns a formatted label for the X-axis.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisFormatLabel"): any;
+
+	/**
+	 * Sets function which takes an context object and returns a formatted label for the X-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisFormatLabel", optionValue: any): void;
+
+	/**
+	 * Gets  function which takes a context object and returns a formatted label for the Y-axis.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisFormatLabel"): any;
+
+	/**
+	 * Sets function which takes a context object and returns a formatted label for the Y-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisFormatLabel", optionValue: any): void;
+
+	/**
+	 * Gets  the left margin of labels on the X-axis
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisLabelLeftMargin"): number;
+
+	/**
+	 * Sets the left margin of labels on the X-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisLabelLeftMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the top margin of labels on the X-axis
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisLabelTopMargin"): number;
+
+	/**
+	 * Sets the top margin of labels on the X-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisLabelTopMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the right margin of labels on the X-axis
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisLabelRightMargin"): number;
+
+	/**
+	 * Sets the right margin of labels on the X-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisLabelRightMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the bottom margin of labels on the X-axis
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisLabelBottomMargin"): number;
+
+	/**
+	 * Sets the bottom margin of labels on the X-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisLabelBottomMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the left margin of labels on the Y-axis
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisLabelLeftMargin"): number;
+
+	/**
+	 * Sets the left margin of labels on the Y-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisLabelLeftMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the top margin of labels on the Y-axis
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisLabelTopMargin"): number;
+
+	/**
+	 * Sets the top margin of labels on the Y-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisLabelTopMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the right margin of labels on the Y-axis
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisLabelRightMargin"): number;
+
+	/**
+	 * Sets the right margin of labels on the Y-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisLabelRightMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the bottom margin of labels on the Y-axis
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisLabelBottomMargin"): number;
+
+	/**
+	 * Sets the bottom margin of labels on the Y-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisLabelBottomMargin", optionValue: number): void;
+
+	/**
+	 * Gets  color of labels on the X-axis
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisLabelTextColor"): string;
+
+	/**
+	 * Sets color of labels on the X-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisLabelTextColor", optionValue: string): void;
+
+	/**
+	 * Gets  color of labels on the Y-axis
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisLabelTextColor"): string;
+
+	/**
+	 * Sets color of labels on the Y-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisLabelTextColor", optionValue: string): void;
+
+	/**
+	 * Gets  the margin around a title on the X-axis
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisTitleMargin"): number;
+
+	/**
+	 * Sets the margin around a title on the X-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisTitleMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the margin around a title on the Y-axis
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisTitleMargin"): number;
+
+	/**
+	 * Sets the margin around a title on the Y-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisTitleMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the left margin of a title on the X-axis
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisTitleLeftMargin"): number;
+
+	/**
+	 * Sets the left margin of a title on the X-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisTitleLeftMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the left margin of a title on the Y-axis
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisTitleLeftMargin"): number;
+
+	/**
+	 * Sets the left margin of a title on the Y-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisTitleLeftMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the top margin of a title on the X-axis
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisTitleTopMargin"): number;
+
+	/**
+	 * Sets the top margin of a title on the X-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisTitleTopMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the top margin of a title on the Y-axis
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisTitleTopMargin"): number;
+
+	/**
+	 * Sets the top margin of a title on the Y-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisTitleTopMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the right margin of a title on the X-axis
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisTitleRightMargin"): number;
+
+	/**
+	 * Sets the right margin of a title on the X-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisTitleRightMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the right margin of a title on the Y-axis
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisTitleRightMargin"): number;
+
+	/**
+	 * Sets the right margin of a title on the Y-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisTitleRightMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the bottom margin of a title on the X-axis
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisTitleBottomMargin"): number;
+
+	/**
+	 * Sets the bottom margin of a title on the X-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisTitleBottomMargin", optionValue: number): void;
+
+	/**
+	 * Gets  the bottom margin of a title on the Y-axis
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisTitleBottomMargin"): number;
+
+	/**
+	 * Sets the bottom margin of a title on the Y-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisTitleBottomMargin", optionValue: number): void;
+
+	/**
+	 * Gets  color of title on the X-axis
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisTitleTextColor"): string;
+
+	/**
+	 * Sets color of title on the X-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisTitleTextColor", optionValue: string): void;
+
+	/**
+	 * Gets  color of title on the Y-axis
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisTitleTextColor"): string;
+
+	/**
+	 * Sets color of title on the Y-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisTitleTextColor", optionValue: string): void;
+
+	/**
+	 * Gets  CSS font property for labels on X-axis
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisLabelTextStyle"): string;
+
+	/**
+	 * Sets CSS font property for labels on X-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisLabelTextStyle", optionValue: string): void;
+
+	/**
+	 * Gets  CSS font property for labels on Y-axis
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisLabelTextStyle"): string;
+
+	/**
+	 * Sets CSS font property for labels on Y-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisLabelTextStyle", optionValue: string): void;
+
+	/**
+	 * Gets  CSS font property for title on X-axis
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisTitleTextStyle"): string;
+
+	/**
+	 * Sets CSS font property for title on X-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisTitleTextStyle", optionValue: string): void;
+
+	/**
+	 * Gets  CSS font property for title on Y-axis
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisTitleTextStyle"): string;
+
+	/**
+	 * Sets CSS font property for title on Y-axis
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisTitleTextStyle", optionValue: string): void;
+
+	/**
+	 * Gets  the format for labels along the X-axis.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisLabel"): any;
+
+	/**
+	 * Sets the format for labels along the X-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisLabel", optionValue: any): void;
+
+	/**
+	 * Gets  the format for labels along the Y-axis.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisLabel"): any;
+
+	/**
+	 * Sets the format for labels along the Y-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisLabel", optionValue: any): void;
+
+	/**
+	 * Gets  the color to apply to major gridlines along the X-axis.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisMajorStroke"): string;
+
+	/**
+	 * Sets the color to apply to major gridlines along the X-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisMajorStroke", optionValue: string): void;
+
+	/**
+	 * Gets  the color to apply to major gridlines along the Y-axis.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisMajorStroke"): string;
+
+	/**
+	 * Sets the color to apply to major gridlines along the Y-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisMajorStroke", optionValue: string): void;
+
+	/**
+	 * Gets  the thickness to apply to major gridlines along the X-axis.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisMajorStrokeThickness"): number;
+
+	/**
+	 * Sets the thickness to apply to major gridlines along the X-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisMajorStrokeThickness", optionValue: number): void;
+
+	/**
+	 * Gets  the thickness to apply to major gridlines along the Y-axis.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisMajorStrokeThickness"): number;
+
+	/**
+	 * Sets the thickness to apply to major gridlines along the Y-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisMajorStrokeThickness", optionValue: number): void;
+
+	/**
+	 * Gets  the thickness to apply to minor gridlines along the X-axis.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisMinorStrokeThickness"): number;
+
+	/**
+	 * Sets the thickness to apply to minor gridlines along the X-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisMinorStrokeThickness", optionValue: number): void;
+
+	/**
+	 * Gets  the thickness to apply to minor gridlines along the Y-axis.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisMinorStrokeThickness"): number;
+
+	/**
+	 * Sets the thickness to apply to minor gridlines along the Y-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisMinorStrokeThickness", optionValue: number): void;
+
+	/**
+	 * Gets  the color to apply to stripes along the X-axis.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisStrip"): string;
+
+	/**
+	 * Sets the color to apply to stripes along the X-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisStrip", optionValue: string): void;
+
+	/**
+	 * Gets  the color to apply to stripes along the Y-axis.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisStrip"): string;
+
+	/**
+	 * Sets the color to apply to stripes along the Y-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisStrip", optionValue: string): void;
+
+	/**
+	 * Gets  the color to apply to the X-axis line.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisStroke"): string;
+
+	/**
+	 * Sets the color to apply to the X-axis line.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisStroke", optionValue: string): void;
+
+	/**
+	 * Gets  the color to apply to the Y-axis line.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisStroke"): string;
+
+	/**
+	 * Sets the color to apply to the Y-axis line.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisStroke", optionValue: string): void;
+
+	/**
+	 * Gets  the thickness to apply to the X-axis line.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisStrokeThickness"): number;
+
+	/**
+	 * Sets the thickness to apply to the X-axis line.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisStrokeThickness", optionValue: number): void;
+
+	/**
+	 * Gets  the thickness to apply to the Y-axis line.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisStrokeThickness"): number;
+
+	/**
+	 * Sets the thickness to apply to the Y-axis line.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisStrokeThickness", optionValue: number): void;
+
+	/**
+	 * Gets  the length of tickmarks along the X-axis.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisTickLength"): number;
+
+	/**
+	 * Sets the length of tickmarks along the X-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisTickLength", optionValue: number): void;
+
+	/**
+	 * Gets  the length of tickmarks along the Y-axis.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisTickLength"): number;
+
+	/**
+	 * Sets the length of tickmarks along the Y-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisTickLength", optionValue: number): void;
+
+	/**
+	 * Gets  the color to apply to tickmarks along the X-axis.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisTickStroke"): string;
+
+	/**
+	 * Sets the color to apply to tickmarks along the X-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisTickStroke", optionValue: string): void;
+
+	/**
+	 * Gets  the color to apply to tickmarks along the Y-axis.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisTickStroke"): string;
+
+	/**
+	 * Sets the color to apply to tickmarks along the Y-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisTickStroke", optionValue: string): void;
+
+	/**
+	 * Gets  the thickness to apply to tickmarks along the X-axis.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisTickStrokeThickness"): number;
+
+	/**
+	 * Sets the thickness to apply to tickmarks along the X-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisTickStrokeThickness", optionValue: number): void;
+
+	/**
+	 * Gets  the thickness to apply to tickmarks along the Y-axis.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisTickStrokeThickness"): number;
+
+	/**
+	 * Sets the thickness to apply to tickmarks along the Y-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisTickStrokeThickness", optionValue: number): void;
+
+	/**
+	 * Gets  the Text to display below the X-axis.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisTitle"): string;
+
+	/**
+	 * Sets the Text to display below the X-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisTitle", optionValue: string): void;
+
+	/**
+	 * Gets  the Text to display to the left of the Y-axis.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisTitle"): string;
+
+	/**
+	 * Sets the Text to display to the left of the Y-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisTitle", optionValue: string): void;
+
+	/**
+	 * Gets  the color to apply to minor gridlines along the X-axis.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisMinorStroke"): string;
+
+	/**
+	 * Sets the color to apply to minor gridlines along the X-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisMinorStroke", optionValue: string): void;
+
+	/**
+	 * Gets  the color to apply to minor gridlines along the Y-axis.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisMinorStroke"): string;
+
+	/**
+	 * Sets the color to apply to minor gridlines along the Y-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisMinorStroke", optionValue: string): void;
+
+	/**
+	 * Gets  the angle of rotation for labels along the X-axis.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisLabelAngle"): number;
+
+	/**
+	 * Sets the angle of rotation for labels along the X-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisLabelAngle", optionValue: number): void;
+
+	/**
+	 * Gets  the angle of rotation for labels along the Y-axis.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisLabelAngle"): number;
+
+	/**
+	 * Sets the angle of rotation for labels along the Y-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisLabelAngle", optionValue: number): void;
+
+	/**
+	 * Gets  the distance between the X-axis and the bottom of the chart.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisExtent"): number;
+
+	/**
+	 * Sets the distance between the X-axis and the bottom of the chart.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisExtent", optionValue: number): void;
+
+	/**
+	 * Gets  the distance between the Y-axis and the left edge of the chart.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisExtent"): number;
+
+	/**
+	 * Sets the distance between the Y-axis and the left edge of the chart.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisExtent", optionValue: number): void;
+
+	/**
+	 * Gets  the angle of rotation for the X-axis title.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisTitleAngle"): number;
+
+	/**
+	 * Sets the angle of rotation for the X-axis title.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisTitleAngle", optionValue: number): void;
+
+	/**
+	 * Gets  the angle of rotation for the Y-axis title.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisTitleAngle"): number;
+
+	/**
+	 * Sets the angle of rotation for the Y-axis title.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisTitleAngle", optionValue: number): void;
+
+	/**
+	 * Gets  whether to invert the direction of the X-axis by placing the first data items on the right side of the chart.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisInverted"): boolean;
+
+	/**
+	 * Sets whether to invert the direction of the X-axis by placing the first data items on the right side of the chart.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisInverted", optionValue: boolean): void;
+
+	/**
+	 * Gets  whether to invert the direction of the Y-axis by placing the minimum numeric value at the top of the chart.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisInverted"): boolean;
+
+	/**
+	 * Sets whether to invert the direction of the Y-axis by placing the minimum numeric value at the top of the chart.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisInverted", optionValue: boolean): void;
+
+	/**
+	 * Gets  Horizontal alignment of the X-axis title.
+	 */
+
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisTitleAlignment"): string;
+
+	/**
+	 * Sets Horizontal alignment of the X-axis title.
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisTitleAlignment", optionValue: string): void;
+
+	/**
+	 * Gets  Vertical alignment of the Y-axis title.
+	 */
+
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisTitleAlignment"): string;
+
+	/**
+	 * Sets Vertical alignment of the Y-axis title.
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisTitleAlignment", optionValue: string): void;
+
+	/**
+	 * Gets  Horizontal alignment of X-axis labels.
+	 */
+
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisLabelHorizontalAlignment"): string;
+
+	/**
+	 * Sets Horizontal alignment of X-axis labels.
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisLabelHorizontalAlignment", optionValue: string): void;
+
+	/**
+	 * Gets  Horizontal alignment of Y-axis labels.
+	 */
+
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisLabelHorizontalAlignment"): string;
+
+	/**
+	 * Sets Horizontal alignment of Y-axis labels.
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisLabelHorizontalAlignment", optionValue: string): void;
+
+	/**
+	 * Gets  Vertical alignment of X-axis labels.
+	 */
+
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisLabelVerticalAlignment"): string;
+
+	/**
+	 * Sets Vertical alignment of X-axis labels.
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisLabelVerticalAlignment", optionValue: string): void;
+
+	/**
+	 * Gets  Vertical alignment of Y-axis labels.
+	 */
+
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisLabelVerticalAlignment"): string;
+
+	/**
+	 * Sets Vertical alignment of Y-axis labels.
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisLabelVerticalAlignment", optionValue: string): void;
+
+	/**
+	 * Gets  Visibility of X-axis labels.
+	 */
+
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisLabelVisibility"): string;
+
+	/**
+	 * Sets Visibility of X-axis labels.
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisLabelVisibility", optionValue: string): void;
+
+	/**
+	 * Gets  Visibility of Y-axis labels.
+	 */
+
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisLabelVisibility"): string;
+
+	/**
+	 * Sets Visibility of Y-axis labels.
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisLabelVisibility", optionValue: string): void;
+
+	/**
+	 * The location of Y-axis labels, relative to the plot area.
+	 */
+
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisLabelLocation"): string;
+
+	/**
+	 * The location of Y-axis labels, relative to the plot area.
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisLabelLocation", optionValue: string): void;
+
+	/**
+	 * Gets  the frequency of displayed labels along the X-axis.
+	 * Gets  the set value is a factor that determines which labels will be hidden. For example, an interval of 2 will display every other label.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisInterval"): number;
+
+	/**
+	 * Sets the frequency of displayed labels along the X-axis.
+	 *  sets the set value is a factor that determines which labels will be hidden. For example, an interval of 2 will display every other label.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisInterval", optionValue: number): void;
+
+	/**
+	 * Gets  the frequency of displayed minor lines along the X-axis.
+	 * Gets  the set value is a factor that determines how the minor lines will be displayed.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisMinorInterval"): number;
+
+	/**
+	 * Sets the frequency of displayed minor lines along the X-axis.
+	 *  sets the set value is a factor that determines how the minor lines will be displayed.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisMinorInterval", optionValue: number): void;
+
+	/**
+	 * Gets  the distance between each label and grid line along the Y-axis.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisInterval"): number;
+
+	/**
+	 * Sets the distance between each label and grid line along the Y-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisInterval", optionValue: number): void;
+
+	/**
+	 * Gets  whether the Y-axis should use a logarithmic scale instead of a linear one.
+	 * Since log(-1) is imaginary and log(0) is undefined, it is recommended to enable this property only when the Y-axis minimum is greater than zero.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisIsLogarithmic"): boolean;
+
+	/**
+	 * Sets whether the Y-axis should use a logarithmic scale instead of a linear one.
+	 * Since log(-1) is imaginary and log(0) is undefined, it is recommended to enable this property only when the Y-axis minimum is greater than zero.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisIsLogarithmic", optionValue: boolean): void;
+
+	/**
+	 * Gets  the base value to use in the log function when mapping the position of data items along the Y-axis.
+	 * This property is effective only when YAxisIsLogarithmic is true.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisLogarithmBase"): number;
+
+	/**
+	 * Sets the base value to use in the log function when mapping the position of data items along the Y-axis.
+	 * This property is effective only when YAxisIsLogarithmic is true.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisLogarithmBase", optionValue: number): void;
+
+	/**
+	 * Gets  the data value corresponding to the minimum value of the Y-axis.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisMinimumValue"): number;
+
+	/**
+	 * Sets the data value corresponding to the minimum value of the Y-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisMinimumValue", optionValue: number): void;
+
+	/**
+	 * Gets  the data value corresponding to the maximum value of the Y-axis.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisMaximumValue"): number;
+
+	/**
+	 * Sets the data value corresponding to the maximum value of the Y-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisMaximumValue", optionValue: number): void;
+
+	/**
+	 * Gets  the frequency of displayed minor lines along the Y-axis.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisMinorInterval"): number;
+
+	/**
+	 * Sets the frequency of displayed minor lines along the Y-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisMinorInterval", optionValue: number): void;
+
+	/**
+	 * Gets  whether the X-axis will use a logarithmic scale, instead of a linear one.
+	 * Since log(-1) is imaginary and log(0) is undefined, it is recommended to enable this property only when the X-axis minimum is greater than zero.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisIsLogarithmic"): boolean;
+
+	/**
+	 * Sets whether the X-axis will use a logarithmic scale, instead of a linear one.
+	 * Since log(-1) is imaginary and log(0) is undefined, it is recommended to enable this property only when the X-axis minimum is greater than zero.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisIsLogarithmic", optionValue: boolean): void;
+
+	/**
+	 * Gets  the base value to use in the log function when mapping the position of data items along the X-axis.
+	 * This property is effective only when y-axis is logarithmic
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisLogarithmBase"): number;
+
+	/**
+	 * Sets the base value to use in the log function when mapping the position of data items along the X-axis.
+	 * This property is effective only when y-axis is logarithmic
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisLogarithmBase", optionValue: number): void;
+
+	/**
+	 * Gets  the data value corresponding to the minimum value on the X-axis.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisMinimumValue"): number;
+
+	/**
+	 * Sets the data value corresponding to the minimum value on the X-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisMinimumValue", optionValue: number): void;
+
+	/**
+	 * Gets  the data value corresponding to the maximum value on the X-axis.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisMaximumValue"): number;
+
+	/**
+	 * Sets the data value corresponding to the maximum value on the X-axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisMaximumValue", optionValue: number): void;
+
+	/**
+	 * Gets  whether the large numbers on the X-axis labels are abbreviated.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisAbbreviateLargeNumbers"): boolean;
+
+	/**
+	 * Sets whether the large numbers on the X-axis labels are abbreviated.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "xAxisAbbreviateLargeNumbers", optionValue: boolean): void;
+
+	/**
+	 * Gets  whether the large numbers on the Y-axis labels are abbreviated.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisAbbreviateLargeNumbers"): boolean;
+
+	/**
+	 * Sets whether the large numbers on the Y-axis labels are abbreviated.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "yAxisAbbreviateLargeNumbers", optionValue: boolean): void;
+
+	/**
+	 * Gets  collision avoidance between markers on series that support this behaviour.
+	 */
+
+	igShapeChart(optionLiteral: 'option', optionName: "markerCollision"): string;
+
+	/**
+	 * Sets collision avoidance between markers on series that support this behaviour.
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igShapeChart(optionLiteral: 'option', optionName: "markerCollision", optionValue: string): void;
+
+	/**
+	 * Gets  the type of chart series to generate from the data.
+	 */
+
+	igShapeChart(optionLiteral: 'option', optionName: "chartType"): string;
+
+	/**
+	 * Sets the type of chart series to generate from the data.
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igShapeChart(optionLiteral: 'option', optionName: "chartType", optionValue: string): void;
+
+	/**
+	 * The width of the chart.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "width"): number;
+
+	/**
+	 * The width of the chart.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "width", optionValue: number): void;
+
+	/**
+	 * The height of the chart.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "height"): number;
+
+	/**
+	 * The height of the chart.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "height", optionValue: number): void;
+
+	/**
+	 * Gets  maximum number of displayed records in chart.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "maxRecCount"): number;
+
+	/**
+	 * Sets maximum number of displayed records in chart.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "maxRecCount", optionValue: number): void;
+
+	/**
+	 * Gets  a valid data source.
+	 * That can be instance of array or primitives, array of objects, instance of $.ig.DataSource, or any other data accepted by $.ig.DataSource.
+	 * Note: if it is set to string and "dataSourceType" option is not set, then $.ig.JSONPDataSource is used.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "dataSource"): any;
+
+	/**
+	 * Sets a valid data source.
+	 * That can be instance of array or primitives, array of objects, instance of $.ig.DataSource, or any other data accepted by $.ig.DataSource.
+	 * Note: if it is set to string and "dataSourceType" option is not set, then $.ig.JSONPDataSource is used.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "dataSource", optionValue: any): void;
+
+	/**
+	 * Gets  data source type (such as "json", "xml", etc). Please refer to the documentation of $.ig.DataSource and its type property
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "dataSourceType"): string;
+
+	/**
+	 * Sets data source type (such as "json", "xml", etc). Please refer to the documentation of $.ig.DataSource and its type property
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "dataSourceType", optionValue: string): void;
+
+	/**
+	 * Gets  url which is used for sending JSON on request for remote data.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "dataSourceUrl"): string;
+
+	/**
+	 * Sets url which is used for sending JSON on request for remote data.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "dataSourceUrl", optionValue: string): void;
+
+	/**
+	 * See $.ig.DataSource. property in the response specifying the total number of records on the server.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "responseTotalRecCountKey"): string;
+
+	/**
+	 * See $.ig.DataSource. property in the response specifying the total number of records on the server.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "responseTotalRecCountKey", optionValue: string): void;
+
+	/**
+	 * See $.ig.DataSource. This is basically the property in the responses where data records are held, if the response is wrapped.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "responseDataKey"): string;
+
+	/**
+	 * See $.ig.DataSource. This is basically the property in the responses where data records are held, if the response is wrapped.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "responseDataKey", optionValue: string): void;
+
+	/**
+	 * Event raised when a property value is changed on this chart
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "propertyChanged"): PropertyChangedEvent;
+
+	/**
+	 * Event raised when a property value is changed on this chart
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "propertyChanged", optionValue: PropertyChangedEvent): void;
+
+	/**
+	 * Event raised when a series is initialized and added to this chart.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "seriesAdded"): SeriesAddedEvent;
+
+	/**
+	 * Event raised when a series is initialized and added to this chart.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "seriesAdded", optionValue: SeriesAddedEvent): void;
+
+	/**
+	 * Event raised when a series is removed from this chart.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "seriesRemoved"): SeriesRemovedEvent;
+
+	/**
+	 * Event raised when a series is removed from this chart.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "seriesRemoved", optionValue: SeriesRemovedEvent): void;
+
+	/**
+	 * Occurs when the pointer enters a Series.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "seriesPointerEnter"): SeriesPointerEnterEvent;
+
+	/**
+	 * Occurs when the pointer enters a Series.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "seriesPointerEnter", optionValue: SeriesPointerEnterEvent): void;
+
+	/**
+	 * Occurs when the pointer leaves a Series.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "seriesPointerLeave"): SeriesPointerLeaveEvent;
+
+	/**
+	 * Occurs when the pointer leaves a Series.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "seriesPointerLeave", optionValue: SeriesPointerLeaveEvent): void;
+
+	/**
+	 * Occurs when the pointer moves over a Series.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "seriesPointerMove"): SeriesPointerMoveEvent;
+
+	/**
+	 * Occurs when the pointer moves over a Series.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "seriesPointerMove", optionValue: SeriesPointerMoveEvent): void;
+
+	/**
+	 * Occurs when the pointer is pressed down over a Series.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "seriesPointerDown"): SeriesPointerDownEvent;
+
+	/**
+	 * Occurs when the pointer is pressed down over a Series.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "seriesPointerDown", optionValue: SeriesPointerDownEvent): void;
+
+	/**
+	 * Occurs when the pointer is released over a Series.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "seriesPointerUp"): SeriesPointerUpEvent;
+
+	/**
+	 * Occurs when the pointer is released over a Series.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "seriesPointerUp", optionValue: SeriesPointerUpEvent): void;
+
+	/**
+	 * Event which is raised before data binding.
+	 * Return false in order to cancel data binding.
+	 * Function takes first argument null and second argument ui.
+	 * Use ui.owner to obtain reference to chart widget.
+	 * Use ui.dataSource to obtain reference to instance of $.ig.DataSource.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "dataBinding"): DataBindingEvent;
+
+	/**
+	 * Event which is raised before data binding.
+	 * Return false in order to cancel data binding.
+	 * Function takes first argument null and second argument ui.
+	 * Use ui.owner to obtain reference to chart widget.
+	 * Use ui.dataSource to obtain reference to instance of $.ig.DataSource.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "dataBinding", optionValue: DataBindingEvent): void;
+
+	/**
+	 * Event which is raised after data binding.
+	 * Function takes first argument null and second argument ui.
+	 * Use ui.owner to obtain reference to chart widget.
+	 * Use ui.data to obtain reference to array actual data which is displayed by chart.
+	 * Use ui.dataSource to obtain reference to instance of $.ig.DataSource.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "dataBound"): DataBoundEvent;
+
+	/**
+	 * Event which is raised after data binding.
+	 * Function takes first argument null and second argument ui.
+	 * Use ui.owner to obtain reference to chart widget.
+	 * Use ui.data to obtain reference to array actual data which is displayed by chart.
+	 * Use ui.dataSource to obtain reference to instance of $.ig.DataSource.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "dataBound", optionValue: DataBoundEvent): void;
+
+	/**
+	 * Event which is raised before tooltip is updated.
+	 * Return false in order to cancel updating and hide tooltip.
+	 * Function takes first argument null and second argument ui.
+	 * Use ui.owner to obtain reference to chart widget.
+	 * Use ui.text to obtain html of tooltip. Value of that member can be modified. If modified value is null or empty string, then current content of tooltip keeps old value.
+	 * Use ui.item to obtain reference to item. Value of that member can be modified or replaced by custom item.
+	 * Use ui.x to obtain left position of tooltip in pixels relative to widget. Value of that member can be modified.
+	 * Use ui.y to obtain top position of tooltip in pixels relative to widget. Value of that member can be modified.
+	 * Use ui.element to obtain reference to jquery object which represents tooltip. Value of that member can be replaced by custom element.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "updateTooltip"): UpdateTooltipEvent;
+
+	/**
+	 * Event which is raised before tooltip is updated.
+	 * Return false in order to cancel updating and hide tooltip.
+	 * Function takes first argument null and second argument ui.
+	 * Use ui.owner to obtain reference to chart widget.
+	 * Use ui.text to obtain html of tooltip. Value of that member can be modified. If modified value is null or empty string, then current content of tooltip keeps old value.
+	 * Use ui.item to obtain reference to item. Value of that member can be modified or replaced by custom item.
+	 * Use ui.x to obtain left position of tooltip in pixels relative to widget. Value of that member can be modified.
+	 * Use ui.y to obtain top position of tooltip in pixels relative to widget. Value of that member can be modified.
+	 * Use ui.element to obtain reference to jquery object which represents tooltip. Value of that member can be replaced by custom element.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "updateTooltip", optionValue: UpdateTooltipEvent): void;
+
+	/**
+	 * Event which is raised before tooltip is hidden.
+	 * Return false in order to cancel hiding and keep tooltip visible.
+	 * Function takes first argument null and second argument ui.
+	 * Use ui.owner to obtain reference to chart widget.
+	 * Use ui.item to obtain reference to item.
+	 * Use ui.element to obtain reference to jquery object which represents tooltip or value of ui.element from last updateTooltip event. Value of that member can be replaced by custom element.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "hideTooltip"): HideTooltipEvent;
+
+	/**
+	 * Event which is raised before tooltip is hidden.
+	 * Return false in order to cancel hiding and keep tooltip visible.
+	 * Function takes first argument null and second argument ui.
+	 * Use ui.owner to obtain reference to chart widget.
+	 * Use ui.item to obtain reference to item.
+	 * Use ui.element to obtain reference to jquery object which represents tooltip or value of ui.element from last updateTooltip event. Value of that member can be replaced by custom element.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "hideTooltip", optionValue: HideTooltipEvent): void;
+	igShapeChart(options: IgShapeChart): JQuery;
+	igShapeChart(optionLiteral: 'option', optionName: string): any;
+	igShapeChart(optionLiteral: 'option', options: IgShapeChart): JQuery;
+	igShapeChart(optionLiteral: 'option', optionName: string, optionValue: any): JQuery;
+	igShapeChart(methodName: string, ...methodParams: any[]): any;
+}
 interface IgLoading {
 	cssClass?: any;
 	includeVerticalOffset?: boolean;
@@ -75295,16 +88627,19 @@ interface IgSplitButtonItem {
 interface IgSplitButton {
 	/**
 	 * Button items.
+	 *
 	 */
 	items?: IgSplitButtonItem[];
 
 	/**
 	 * Default button item name.
+	 *
 	 */
 	defaultItemName?: string;
 
 	/**
 	 * Specifies whether the default button will be switched when another button is selected.
+	 *
 	 */
 	swapDefaultEnabled?: boolean;
 
@@ -75402,36 +88737,42 @@ interface JQuery {
 
 	/**
 	 * Button items.
+	 *
 	 */
 	igSplitButton(optionLiteral: 'option', optionName: "items"): IgSplitButtonItem[];
 
 	/**
 	 * Button items.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igSplitButton(optionLiteral: 'option', optionName: "items", optionValue: IgSplitButtonItem[]): void;
 
 	/**
 	 * Default button item name.
+	 *
 	 */
 	igSplitButton(optionLiteral: 'option', optionName: "defaultItemName"): string;
 
 	/**
 	 * Default button item name.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igSplitButton(optionLiteral: 'option', optionName: "defaultItemName", optionValue: string): void;
 
 	/**
 	 * Gets whether the default button will be switched when another button is selected.
+	 *
 	 */
 	igSplitButton(optionLiteral: 'option', optionName: "swapDefaultEnabled"): boolean;
 
 	/**
 	 * Sets whether the default button will be switched when another button is selected.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igSplitButton(optionLiteral: 'option', optionName: "swapDefaultEnabled", optionValue: boolean): void;
@@ -75534,31 +88875,37 @@ interface JQuery {
 interface IgSplitterPanel {
 	/**
 	 * Gets the size of the panel
+	 *
 	 */
 	size?: string|number;
 
 	/**
 	 * Gets the minimum size that the panel can have
+	 *
 	 */
 	min?: string|number;
 
 	/**
 	 * Gets the maximum size that the panel can have
+	 *
 	 */
 	max?: string|number;
 
 	/**
 	 * Gets whether the panel can be resized
+	 *
 	 */
 	resizable?: boolean;
 
 	/**
 	 * Gets whether the panel is initially collapsed
+	 *
 	 */
 	collapsed?: boolean;
 
 	/**
 	 * Gets whether the panel can be collapsed
+	 *
 	 */
 	collapsible?: boolean;
 
@@ -75616,6 +88963,7 @@ interface IgSplitter {
 	/**
 	 * Gets/Sets the width of the container.
 	 *
+	 *
 	 * Valid values:
 	 * "null" will stretch to fit data, if no other widths are defined.
 	 */
@@ -75624,6 +88972,7 @@ interface IgSplitter {
 	/**
 	 * Gets/Sets the height of the container.
 	 *
+	 *
 	 * Valid values:
 	 * "null" will fit the tree inside its parent container, if no other widths are defined.
 	 */
@@ -75632,6 +88981,7 @@ interface IgSplitter {
 	/**
 	 * Specifies the orientation of the splitter.
 	 *
+	 *
 	 * Valid values:
 	 * "vertical"
 	 * "horizontal"
@@ -75640,19 +88990,40 @@ interface IgSplitter {
 
 	/**
 	 * Array of objects options that specify the panels settings. The panels are no more than two. Settings are specified via enumeration.
+	 *
 	 */
 	panels?: IgSplitterPanel[];
 
 	/**
 	 * Specifies drag delta of the split bar. In order to start dragging "move", the mouse has to be moved specific distance from its original position.
+	 *
 	 */
 	dragDelta?: number;
 
 	/**
 	 * Specifies whether the other splitters on the page will be resized as this splitter resizes.
+	 *
 	 */
 	resizeOtherSplitters?: boolean;
 
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	locale?: any;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	language?: string;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+	regional?: string|Object;
+
 	/**
 	 * Fired after collapsing is performed
 	 *
@@ -75769,6 +89140,24 @@ interface IgSplitterMethods {
 	 * Destroys the igSplitter widget
 	 */
 	destroy(): void;
+
+	/**
+	 * Changes the all locales contained into a specified container to the language specified in [options.language](ui.igwidget#options:language)
+	 * Note that this method is for rare scenarios, use [language](ui.igwidget#options:language) or [locale](ui.igwidget#options:locale) option setter
+	 *
+	 * @param $container Optional parameter - if not set it would use the element of the widget as $container
+	 */
+	changeLocale($container: Object): void;
+
+	/**
+	 * Changes the widget language to global language. Global language is the value in $.ig.util.language
+	 */
+	changeGlobalLanguage(): void;
+
+	/**
+	 * Changes the widget regional settins to global regional settings. Global regional settings are container in $.ig.util.regional
+	 */
+	changeGlobalRegional(): void;
 }
 interface JQuery {
 	data(propertyName: "igSplitter"): IgSplitterMethods;
@@ -75784,9 +89173,13 @@ interface JQuery {
 	igSplitter(methodName: "setFirstPanelSize", size: Object): void;
 	igSplitter(methodName: "setSecondPanelSize", size: Object): void;
 	igSplitter(methodName: "destroy"): void;
+	igSplitter(methodName: "changeLocale", $container: Object): void;
+	igSplitter(methodName: "changeGlobalLanguage"): void;
+	igSplitter(methodName: "changeGlobalRegional"): void;
 
 	/**
 	 * Gets/Sets the width of the container.
+	 *
 	 */
 
 	igSplitter(optionLiteral: 'option', optionName: "width"): string|number;
@@ -75794,6 +89187,7 @@ interface JQuery {
 	/**
 	 * /Sets the width of the container.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -75801,6 +89195,7 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the height of the container.
+	 *
 	 */
 
 	igSplitter(optionLiteral: 'option', optionName: "height"): string|number;
@@ -75808,6 +89203,7 @@ interface JQuery {
 	/**
 	 * /Sets the height of the container.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -75815,6 +89211,7 @@ interface JQuery {
 
 	/**
 	 * Gets the orientation of the splitter.
+	 *
 	 */
 
 	igSplitter(optionLiteral: 'option', optionName: "orientation"): string;
@@ -75822,6 +89219,7 @@ interface JQuery {
 	/**
 	 * Sets the orientation of the splitter.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -75829,40 +89227,90 @@ interface JQuery {
 
 	/**
 	 * Array of objects options that specify the panels settings. The panels are no more than two. Settings are specified via enumeration.
+	 *
 	 */
 	igSplitter(optionLiteral: 'option', optionName: "panels"): IgSplitterPanel[];
 
 	/**
 	 * Array of objects options that specify the panels settings. The panels are no more than two. Settings are specified via enumeration.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igSplitter(optionLiteral: 'option', optionName: "panels", optionValue: IgSplitterPanel[]): void;
 
 	/**
 	 * Gets drag delta of the split bar. In order to start dragging "move", the mouse has to be moved specific distance from its original position.
+	 *
 	 */
 	igSplitter(optionLiteral: 'option', optionName: "dragDelta"): number;
 
 	/**
 	 * Sets drag delta of the split bar. In order to start dragging "move", the mouse has to be moved specific distance from its original position.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igSplitter(optionLiteral: 'option', optionName: "dragDelta", optionValue: number): void;
 
 	/**
 	 * Gets whether the other splitters on the page will be resized as this splitter resizes.
+	 *
 	 */
 	igSplitter(optionLiteral: 'option', optionName: "resizeOtherSplitters"): boolean;
 
 	/**
 	 * Sets whether the other splitters on the page will be resized as this splitter resizes.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igSplitter(optionLiteral: 'option', optionName: "resizeOtherSplitters", optionValue: boolean): void;
 
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	igSplitter(optionLiteral: 'option', optionName: "locale"): any;
+
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igSplitter(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	igSplitter(optionLiteral: 'option', optionName: "language"): string;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igSplitter(optionLiteral: 'option', optionName: "language", optionValue: string): void;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+
+	igSplitter(optionLiteral: 'option', optionName: "regional"): string|Object;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igSplitter(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
+
 	/**
 	 * Fired after collapsing is performed
 	 *
@@ -76029,6 +89477,27 @@ interface ActivePaneChangedEventUIParam {
 	visibleRange?: string;
 }
 
+interface ActiveTableChangedEvent {
+	(event: Event, ui: ActiveTableChangedEventUIParam): void;
+}
+
+interface ActiveTableChangedEventUIParam {
+	/**
+	 * Gets a reference to the spreadsheet widget.
+	 */
+	owner?: any;
+
+	/**
+	 * Gets the previous active [Table](ig.excel.WorksheetTable).
+	 */
+	oldActiveTable?: any;
+
+	/**
+	 * Gets the current active [Table](ig.excel.WorksheetTable).
+	 */
+	newActiveTable?: any;
+}
+
 interface ActiveWorksheetChangedEvent {
 	(event: Event, ui: ActiveWorksheetChangedEventUIParam): void;
 }
@@ -76253,6 +89722,7 @@ interface IgSpreadsheet {
 	/**
 	 * The width of the spreadsheet. It can be set as a number in pixels, string (px) or percentage (%).
 	 *
+	 *
 	 * Valid values:
 	 * "string" The widget width can be set in pixels (px) and percentage (%).
 	 * "number" The widget width can be set as a number
@@ -76262,6 +89732,7 @@ interface IgSpreadsheet {
 	/**
 	 * The height of the spreadsheet. It can be set as a number in pixels, string (px) or percentage (%).
 	 *
+	 *
 	 * Valid values:
 	 * "string" The widget height can be set in pixels (px) and percentage (%).
 	 * "number" The widget height can be set as a number
@@ -76270,6 +89741,7 @@ interface IgSpreadsheet {
 
 	/**
 	 * Returns or sets the A1 format address of the current active cell within the selected worksheet.
+	 *
 	 */
 	activeCell?: string;
 
@@ -76279,31 +89751,37 @@ interface IgSpreadsheet {
 	 * if an arrow key is pressed while the scroll lock is enabled the cell area will be scrolled rather than changing
 	 * the active cell. Note: This property is not maintained/changed by the control. It is just queried when
 	 * performing actions that consider whether the scroll lock is enabled.
+	 *
 	 */
 	isScrollLocked?: boolean;
 
 	/**
 	 * Returns or sets the Worksheet from the workbook whose content should be displayed within the control.
+	 *
 	 */
 	activeWorksheet?: any;
 
 	/**
 	 * Returns or sets a boolean indicating whether the spreadsheet allows adding worksheets.
+	 *
 	 */
 	allowAddWorksheet?: boolean;
 
 	/**
 	 * Returns or sets a boolean indicating whether the spreadsheet allows deleting worksheets.
+	 *
 	 */
 	allowDeleteWorksheet?: boolean;
 
 	/**
 	 * Returns or sets a boolean indicating if the grid lines are displayed in the selected worksheets.
+	 *
 	 */
 	areGridlinesVisible?: boolean;
 
 	/**
 	 * Returns or sets a boolean indicating if the row and column headers are displayed for the selected worksheets.
+	 *
 	 */
 	areHeadersVisible?: boolean;
 
@@ -76311,6 +89789,7 @@ interface IgSpreadsheet {
 	 * Returns or sets an enumeration indicating the direction of the cell adjacent to the activeCell that should be activated when the enter key is pressed.This property is only used if the isEnterKeyNavigationEnabled is set to true. Also, the reverse direction is
 	 * navigated when Shift + Enter are pressed.
 	 *
+	 *
 	 * Valid values:
 	 * "down" The cell below should be activated.
 	 * "right" The cell to the right should be activated
@@ -76321,21 +89800,25 @@ interface IgSpreadsheet {
 
 	/**
 	 * Returns or sets the number of decimal places by which a whole number typed in during edit mode should be adjusted when isFixedDecimalEnabled is true
+	 *
 	 */
 	fixedDecimalPlaceCount?: number;
 
 	/**
 	 * Returns or sets a boolean indicating whether the adjacent cell indicated by the enterKeyNavigationDirection should be navigated to when the enter key is pressed.
+	 *
 	 */
 	isEnterKeyNavigationEnabled?: boolean;
 
 	/**
 	 * Returns or sets a boolean indicating whether a fixed decimal place is automatically added when a whole number is entered while in edit mode.
+	 *
 	 */
 	isFixedDecimalEnabled?: boolean;
 
 	/**
 	 * Returns or sets a boolean indicating if the formula bar is displayed within the Spreadsheet.
+	 *
 	 */
 	isFormulaBarVisible?: boolean;
 
@@ -76345,22 +89828,26 @@ interface IgSpreadsheet {
 	 * end mode and one presses the right arrow, the activeCell will be changed to be the first cell to the right of the current ActiveCell
 	 * that has a value (even if the value is ""). If there were no cells to the right with a value then it would activate the right most cell in that row. End
 	 * mode will end automatically such as when one presses an arrow key.
+	 *
 	 */
 	isInEndMode?: boolean;
 
 	/**
 	 * Returns or sets a boolean indicating whether undo is enabled for the control.
+	 *
 	 */
 	isUndoEnabled?: boolean;
 
 	/**
 	 * Returns or sets the width of the name box within the formula bar.
+	 *
 	 */
 	nameBoxWidth?: number;
 
 	/**
 	 * Returns or sets a value indicating how the selection is updated when interacting with the cells via the mouse or keyboard.
 	 *
+	 *
 	 * Valid values:
 	 * "normal" The selection is replaced when dragging the mouse to select a cell or range of cells. Similarly when navigating via the keyboard a new selection is created. One may add a new range by holding the Ctrl key and using the mouse and one may alter the selection range containing the active cell by holding the Shift key down while clicking with the mouse or navigating with the keyboard such as with the arrow keys.
 	 * "extendSelection" The selection range in the cellRanges representing the active cell is updated as one uses the mouse to select a cell or navigating via the keyboard.
@@ -76370,6 +89857,7 @@ interface IgSpreadsheet {
 
 	/**
 	 * Type="ig.excel.Worksheet[]" Returns or sets an array of the Worksheets whose tabs are selected.
+	 *
 	 */
 	selectedWorksheets?: any;
 
@@ -76382,26 +89870,31 @@ interface IgSpreadsheet {
 
 	/**
 	 * Returns or sets the workbook whose information is displayed in the control.
+	 *
 	 */
 	workbook?: any;
 
 	/**
 	 * Returns or sets the magnification of the selected worksheets.
+	 *
 	 */
 	zoomLevel?: number;
 
 	/**
 	 * Set/Get the locale setting for the widget.
+	 *
 	 */
 	locale?: any;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
+	 *
 	 */
 	language?: string;
 
 	/**
 	 * Set/Get the regional setting for the widget.
+	 *
 	 */
 	regional?: string|Object;
 
@@ -76425,6 +89918,11 @@ interface IgSpreadsheet {
 	 */
 	activePaneChanged?: ActivePaneChangedEvent;
 
+	/**
+	 * Invoked when the activeTable of the Spreadsheet has changed.
+	 */
+	activeTableChanged?: ActiveTableChangedEvent;
+
 	/**
 	 * Invoked when the activeWorksheet of the Spreadsheet has changed.
 	 */
@@ -76499,6 +89997,11 @@ interface IgSpreadsheetMethods {
 	 */
 	getActivePane(): Object;
 
+	/**
+	 * Returns an object that represents the pane with the focus.
+	 */
+	getActiveTable(): Object;
+
 	/**
 	 * Returns an object that represents the current selection of the active pane.
 	 */
@@ -76542,6 +90045,22 @@ interface IgSpreadsheetMethods {
 	 */
 	executeAction(action: Object): boolean;
 
+	/**
+	 * Shows the filter dialog for the specified relative column of the [filterSettings](ig.excel.worksheet#methods:filterSettings) of the [activeWorksheet](ui.igspreadsheet#options:activeWorksheet).
+	 *
+	 * @param relativeColumnIndex A zero based column index relative to the [region](ig.excel.worksheetFilterSettings#methods:region) of the active worksheet.
+	 * @param spreadsheetFilterDialogOption Optional enumeration that specifies the initial display of the filter dialog.
+	 */
+	showFilterDialogForWorksheet(relativeColumnIndex: number, spreadsheetFilterDialogOption: Object): void;
+
+	/**
+	 * Shows the filter dialog for the specified relative column of the [filterSettings](ig.excel.Worksheet#methods:filterSettings) of the [activeWorksheet](ui.igspreadsheet#options:activeWorksheet).
+	 *
+	 * @param worksheetTableColumn A [region](ig.excel.WorksheetTableColumn) whose filter is to be viewed or changed.
+	 * @param spreadsheetFilterDialogOption Optional enumeration that specifies the initial display of the filter dialog.
+	 */
+	showFilterDialogForTable(worksheetTableColumn: Object, spreadsheetFilterDialogOption: Object): void;
+
 	/**
 	 * Forces any pending deferred work to render on the spreadsheet before continuing
 	 */
@@ -76557,7 +90076,15 @@ interface IgSpreadsheetMethods {
 	 * Notify the spreadsheet that style information used for rendering the spreadsheet may have been updated.
 	 */
 	styleUpdated(): void;
+
+	/**
+	 * Changes the widget language to global language. Global language is the value in $.ig.util.language
+	 */
 	changeGlobalLanguage(): void;
+
+	/**
+	 * Changes the widget regional settins to global regional settings. Global regional settings are container in $.ig.util.regional
+	 */
 	changeGlobalRegional(): void;
 }
 interface JQuery {
@@ -76566,6 +90093,7 @@ interface JQuery {
 
 interface JQuery {
 	igSpreadsheet(methodName: "getActivePane"): Object;
+	igSpreadsheet(methodName: "getActiveTable"): Object;
 	igSpreadsheet(methodName: "getActiveSelection"): Object;
 	igSpreadsheet(methodName: "getActiveSelectionCellRangeFormat"): Object;
 	igSpreadsheet(methodName: "getCellEditMode"): Object;
@@ -76573,6 +90101,8 @@ interface JQuery {
 	igSpreadsheet(methodName: "getIsRenamingWorksheet"): boolean;
 	igSpreadsheet(methodName: "getPanes"): void;
 	igSpreadsheet(methodName: "executeAction", action: Object): boolean;
+	igSpreadsheet(methodName: "showFilterDialogForWorksheet", relativeColumnIndex: number, spreadsheetFilterDialogOption: Object): void;
+	igSpreadsheet(methodName: "showFilterDialogForTable", worksheetTableColumn: Object, spreadsheetFilterDialogOption: Object): void;
 	igSpreadsheet(methodName: "flush"): void;
 	igSpreadsheet(methodName: "destroy"): void;
 	igSpreadsheet(methodName: "changeLocale", $container: Object): void;
@@ -76582,6 +90112,7 @@ interface JQuery {
 
 	/**
 	 * The width of the spreadsheet. It can be set as a number in pixels, string (px) or percentage (%).
+	 *
 	 */
 
 	igSpreadsheet(optionLiteral: 'option', optionName: "width"): string|number;
@@ -76589,6 +90120,7 @@ interface JQuery {
 	/**
 	 * The width of the spreadsheet. It can be set as a number in pixels, string (px) or percentage (%).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -76596,6 +90128,7 @@ interface JQuery {
 
 	/**
 	 * The height of the spreadsheet. It can be set as a number in pixels, string (px) or percentage (%).
+	 *
 	 */
 
 	igSpreadsheet(optionLiteral: 'option', optionName: "height"): string|number;
@@ -76603,6 +90136,7 @@ interface JQuery {
 	/**
 	 * The height of the spreadsheet. It can be set as a number in pixels, string (px) or percentage (%).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -76610,12 +90144,14 @@ interface JQuery {
 
 	/**
 	 * Returns  the A1 format address of the current active cell within the selected worksheet.
+	 *
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "activeCell"): string;
 
 	/**
 	 * Returns or sets the A1 format address of the current active cell within the selected worksheet.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "activeCell", optionValue: string): void;
@@ -76626,6 +90162,7 @@ interface JQuery {
 	 * if an arrow key is pressed while the scroll lock is enabled the cell area will be scrolled rather than changing
 	 * the active cell. Note: This property is not maintained/changed by the control. It is just queried when
 	 * performing actions that consider whether the scroll lock is enabled.
+	 *
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "isScrollLocked"): boolean;
 
@@ -76636,66 +90173,77 @@ interface JQuery {
 	 * the active cell. Note: This property is not maintained/changed by the control. It is just queried when
 	 * performing actions that consider whether the scroll lock is enabled.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "isScrollLocked", optionValue: boolean): void;
 
 	/**
 	 * Returns  the Worksheet from the workbook whose content should be displayed within the control.
+	 *
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "activeWorksheet"): any;
 
 	/**
 	 * Returns or sets the Worksheet from the workbook whose content should be displayed within the control.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "activeWorksheet", optionValue: any): void;
 
 	/**
 	 * Returns  a boolean indicating whether the spreadsheet allows adding worksheets.
+	 *
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "allowAddWorksheet"): boolean;
 
 	/**
 	 * Returns or sets a boolean indicating whether the spreadsheet allows adding worksheets.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "allowAddWorksheet", optionValue: boolean): void;
 
 	/**
 	 * Returns  a boolean indicating whether the spreadsheet allows deleting worksheets.
+	 *
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "allowDeleteWorksheet"): boolean;
 
 	/**
 	 * Returns or sets a boolean indicating whether the spreadsheet allows deleting worksheets.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "allowDeleteWorksheet", optionValue: boolean): void;
 
 	/**
 	 * Returns  a boolean indicating if the grid lines are displayed in the selected worksheets.
+	 *
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "areGridlinesVisible"): boolean;
 
 	/**
 	 * Returns or sets a boolean indicating if the grid lines are displayed in the selected worksheets.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "areGridlinesVisible", optionValue: boolean): void;
 
 	/**
 	 * Returns  a boolean indicating if the row and column headers are displayed for the selected worksheets.
+	 *
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "areHeadersVisible"): boolean;
 
 	/**
 	 * Returns or sets a boolean indicating if the row and column headers are displayed for the selected worksheets.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "areHeadersVisible", optionValue: boolean): void;
@@ -76703,6 +90251,7 @@ interface JQuery {
 	/**
 	 * Returns  an enumeration indicating the direction of the cell adjacent to the activeCell that should be activated when the enter key is pressed.This property is only used if the isEnterKeyNavigationEnabled is set to true. Also, the reverse direction is
 	 * navigated when Shift + Enter are pressed.
+	 *
 	 */
 
 	igSpreadsheet(optionLiteral: 'option', optionName: "enterKeyNavigationDirection"): string;
@@ -76711,6 +90260,7 @@ interface JQuery {
 	 * Returns or sets an enumeration indicating the direction of the cell adjacent to the activeCell that should be activated when the enter key is pressed.This property is only used if the isEnterKeyNavigationEnabled is set to true. Also, the reverse direction is
 	 * navigated when Shift + Enter are pressed.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -76718,48 +90268,56 @@ interface JQuery {
 
 	/**
 	 * Returns  the number of decimal places by which a whole number typed in during edit mode should be adjusted when isFixedDecimalEnabled is true
+	 *
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "fixedDecimalPlaceCount"): number;
 
 	/**
 	 * Returns or sets the number of decimal places by which a whole number typed in during edit mode should be adjusted when isFixedDecimalEnabled is true
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "fixedDecimalPlaceCount", optionValue: number): void;
 
 	/**
 	 * Returns  a boolean indicating whether the adjacent cell indicated by the enterKeyNavigationDirection should be navigated to when the enter key is pressed.
+	 *
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "isEnterKeyNavigationEnabled"): boolean;
 
 	/**
 	 * Returns or sets a boolean indicating whether the adjacent cell indicated by the enterKeyNavigationDirection should be navigated to when the enter key is pressed.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "isEnterKeyNavigationEnabled", optionValue: boolean): void;
 
 	/**
 	 * Returns  a boolean indicating whether a fixed decimal place is automatically added when a whole number is entered while in edit mode.
+	 *
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "isFixedDecimalEnabled"): boolean;
 
 	/**
 	 * Returns or sets a boolean indicating whether a fixed decimal place is automatically added when a whole number is entered while in edit mode.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "isFixedDecimalEnabled", optionValue: boolean): void;
 
 	/**
 	 * Returns  a boolean indicating if the formula bar is displayed within the Spreadsheet.
+	 *
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "isFormulaBarVisible"): boolean;
 
 	/**
 	 * Returns or sets a boolean indicating if the formula bar is displayed within the Spreadsheet.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "isFormulaBarVisible", optionValue: boolean): void;
@@ -76770,6 +90328,7 @@ interface JQuery {
 	 * end mode and one presses the right arrow, the activeCell will be changed to be the first cell to the right of the current ActiveCell
 	 * that has a value (even if the value is ""). If there were no cells to the right with a value then it would activate the right most cell in that row. End
 	 * mode will end automatically such as when one presses an arrow key.
+	 *
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "isInEndMode"): boolean;
 
@@ -76780,36 +90339,42 @@ interface JQuery {
 	 * that has a value (even if the value is ""). If there were no cells to the right with a value then it would activate the right most cell in that row. End
 	 * mode will end automatically such as when one presses an arrow key.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "isInEndMode", optionValue: boolean): void;
 
 	/**
 	 * Returns  a boolean indicating whether undo is enabled for the control.
+	 *
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "isUndoEnabled"): boolean;
 
 	/**
 	 * Returns or sets a boolean indicating whether undo is enabled for the control.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "isUndoEnabled", optionValue: boolean): void;
 
 	/**
 	 * Returns  the width of the name box within the formula bar.
+	 *
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "nameBoxWidth"): number;
 
 	/**
 	 * Returns or sets the width of the name box within the formula bar.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "nameBoxWidth", optionValue: number): void;
 
 	/**
 	 * Returns  a value indicating how the selection is updated when interacting with the cells via the mouse or keyboard.
+	 *
 	 */
 
 	igSpreadsheet(optionLiteral: 'option', optionName: "selectionMode"): string;
@@ -76817,6 +90382,7 @@ interface JQuery {
 	/**
 	 * Returns or sets a value indicating how the selection is updated when interacting with the cells via the mouse or keyboard.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -76824,12 +90390,14 @@ interface JQuery {
 
 	/**
 	 * Type="ig.excel.Worksheet[]" Returns  an array of the Worksheets whose tabs are selected.
+	 *
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "selectedWorksheets"): any;
 
 	/**
 	 * Type="ig.excel.Worksheet[]" Returns or sets an array of the Worksheets whose tabs are selected.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "selectedWorksheets", optionValue: any): void;
@@ -76852,54 +90420,63 @@ interface JQuery {
 
 	/**
 	 * Returns  the workbook whose information is displayed in the control.
+	 *
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "workbook"): any;
 
 	/**
 	 * Returns or sets the workbook whose information is displayed in the control.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "workbook", optionValue: any): void;
 
 	/**
 	 * Returns  the magnification of the selected worksheets.
+	 *
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "zoomLevel"): number;
 
 	/**
 	 * Returns or sets the magnification of the selected worksheets.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "zoomLevel", optionValue: number): void;
 
 	/**
 	 * Set/Get the locale setting for the widget.
+	 *
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "locale"): any;
 
 	/**
 	 * Set/Get the locale setting for the widget.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
+	 *
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "language"): string;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "language", optionValue: string): void;
 
 	/**
 	 * Set/Get the regional setting for the widget.
+	 *
 	 */
 
 	igSpreadsheet(optionLiteral: 'option', optionName: "regional"): string|Object;
@@ -76907,6 +90484,7 @@ interface JQuery {
 	/**
 	 * Set/Get the regional setting for the widget.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -76960,6 +90538,18 @@ interface JQuery {
 	 */
 	igSpreadsheet(optionLiteral: 'option', optionName: "activePaneChanged", optionValue: ActivePaneChangedEvent): void;
 
+	/**
+	 * Invoked when the activeTable of the Spreadsheet has changed.
+	 */
+	igSpreadsheet(optionLiteral: 'option', optionName: "activeTableChanged"): ActiveTableChangedEvent;
+
+	/**
+	 * Invoked when the activeTable of the Spreadsheet has changed.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igSpreadsheet(optionLiteral: 'option', optionName: "activeTableChanged", optionValue: ActiveTableChangedEvent): void;
+
 	/**
 	 * Invoked when the activeWorksheet of the Spreadsheet has changed.
 	 */
@@ -77141,21 +90731,25 @@ interface IgTileManagerSplitterOptionsEvents {
 interface IgTileManagerSplitterOptions {
 	/**
 	 * Gets/Sets whether the splitter should be enabled.
+	 *
 	 */
 	enabled?: boolean;
 
 	/**
 	 * Gets whether the splitter can be collapsible.
+	 *
 	 */
 	collapsible?: boolean;
 
 	/**
 	 * Gets whether the splitter should be initially collapsed.
+	 *
 	 */
 	collapsed?: boolean;
 
 	/**
 	 * Gets/Sets splitter events.
+	 *
 	 */
 	events?: IgTileManagerSplitterOptionsEvents;
 
@@ -77273,6 +90867,7 @@ interface TileMinimizedEventUIParam {
 
 interface IgTileManager {
 	/**
+	 *
 	 *
 	 * Valid values:
 	 * "string" The container width can be set in pixels (px) and percentage (%).
@@ -77283,6 +90878,7 @@ interface IgTileManager {
 	/**
 	 * Gets/Sets the height of the container.
 	 *
+	 *
 	 * Valid values:
 	 * "string" The height width can be set in pixels (px) and percentage (%).
 	 * "number" The height width can be set as a number in pixels.
@@ -77293,6 +90889,7 @@ interface IgTileManager {
 	/**
 	 * Gets/Sets the width of each column in the container.
 	 *
+	 *
 	 * Valid values:
 	 * "string" The column width can be set in pixels (px), percentage (%) or asterisk (*) which will distribute all the width between all the columns equally.
 	 * "number" The column width can be set as a number representing value in pixels.
@@ -77304,6 +90901,7 @@ interface IgTileManager {
 	/**
 	 * Gets/Sets the height of each column in the container.
 	 *
+	 *
 	 * Valid values:
 	 * "string" The column height can be set in pixels (px), percentage (%) or asterisk (*) which will distribute all the height between all the columns equally.
 	 * "number" The column height can be set as a number representing value in pixels.
@@ -77315,6 +90913,7 @@ interface IgTileManager {
 	/**
 	 * Gets/Sets the columns count in the container.
 	 *
+	 *
 	 * Valid values:
 	 * "null" The column count will be automatically calculated.
 	 * "number" The column count can be set as a number.
@@ -77324,6 +90923,7 @@ interface IgTileManager {
 	/**
 	 * Gets/Sets the rows count in the container.
 	 *
+	 *
 	 * Valid values:
 	 * "number" The row count can be set as a number.
 	 * "null" The row count will be automatically calculated.
@@ -77346,12 +90946,14 @@ interface IgTileManager {
 
 	/**
 	 * Gets/Sets whether the items will rearrange when the container is resized.
+	 *
 	 */
 	rearrangeItems?: boolean;
 
 	/**
 	 * Gets/Sets the tiles configurations. Every tile is described by rowSpan, colSpan, rowIndex and colIndex.
 	 *
+	 *
 	 * Valid values:
 	 * "array" An array with colSpan, rowSpan, colIndex, rowIndex configurations for each tile.
 	 * "null" Default tile configurations of rowSpan: 1 and colSpan: 1 will be used.
@@ -77360,12 +90962,14 @@ interface IgTileManager {
 
 	/**
 	 * Specifies any valid data source accepted by [$.ig.DataSource](ig.datasource), or an instance of an [$.ig.DataSource](ig.datasource) itself.
+	 *
 	 */
 	dataSource?: any;
 
 	/**
 	 * Gets/Sets the content of the tiles in minimized state.
 	 *
+	 *
 	 * Valid values:
 	 * "string" When initializing on html markup provide jQuery selector specifying what content of the tile to be shown in minimized state. When initializing on data source provide igTemplate that will be rendered for the minimized state.
 	 * "null" The whole content of the tile will be visible in minimized state.
@@ -77375,6 +90979,7 @@ interface IgTileManager {
 	/**
 	 * Gets/Sets the content of the tiles in maximized state.
 	 *
+	 *
 	 * Valid values:
 	 * "string" When initializing on html markup provide jQuery selector specifying which elements of the tile to be shown in maximized state. When initializing on data source provide igTemplate that will be rendered for the maximized state.
 	 * "null" The whole content of the tile will be visible in maximized state.
@@ -77384,6 +90989,7 @@ interface IgTileManager {
 	/**
 	 * Gets/Sets the index of which items configuration will be used for positioning and sizing of the maximized tile.
 	 *
+	 *
 	 * Valid values:
 	 * "number" The maximizedTileindex can be set as a number.
 	 * "null" Option is ignored.
@@ -77393,6 +90999,7 @@ interface IgTileManager {
 	/**
 	 * Gets/Sets how many columns to be displayed in the right panel when the tiles are minimized.
 	 *
+	 *
 	 * Valid values:
 	 * "number" Set the number of right panel columns as a number. The minimum value is 1.
 	 * "null" Default of 1 column will be used.
@@ -77402,6 +91009,7 @@ interface IgTileManager {
 	/**
 	 * Gets/Sets the width of the minimized tiles in the right panel.
 	 *
+	 *
 	 * Valid values:
 	 * "number" Set the width of the minimized tiles as a number.
 	 * "null" Default value equal to the column width will be used.
@@ -77411,6 +91019,7 @@ interface IgTileManager {
 	/**
 	 * Gets/Sets the height of the minimized tiles in the right panel.
 	 *
+	 *
 	 * Valid values:
 	 * "number" Set the height of the minimized tiles as a number.
 	 * "null" Default value equal to the column height will be used.
@@ -77419,32 +91028,38 @@ interface IgTileManager {
 
 	/**
 	 * Gets/Sets whether the right panel should show scrollbar when tiles are overflowing.
+	 *
 	 */
 	showRightPanelScroll?: boolean;
 
 	/**
 	 * Configure the container variable representation, which defines splitter functionality.
+	 *
 	 */
 	splitterOptions?: IgTileManagerSplitterOptions;
 
 	/**
 	 * Gets/Sets JQuery selector that specifies which elements will not trigger maximizing when clicked on.
+	 *
 	 */
 	preventMaximizingSelector?: string;
 
 	/**
 	 * Gets/Sets the duration of the animations in the tile manager.
+	 *
 	 */
 	animationDuration?: number;
 
 	/**
 	 * Specifies a remote URL accepted by [$.ig.DataSource](ig.datasource) in order to request data from it.
+	 *
 	 */
 	dataSourceUrl?: string;
 
 	/**
 	 * Property in the response which specifies where the data records array will be held (if the response is wrapped). See [$.ig.DataSource responseDataKey](ig.datasource#options:settings.responseDataKey).
 	 *
+	 *
 	 * Valid values:
 	 * "string" Specifies the name of the property in which data records are held if the response is wrapped.
 	 * "null" Option is ignored.
@@ -77454,6 +91069,7 @@ interface IgTileManager {
 	/**
 	 * Explicitly set data source type (such as "json"). Please refer to the documentation of [$.ig.DataSource type](ig.datasource#options:settings.type) and its type property.
 	 *
+	 *
 	 * Valid values:
 	 * "string" Explicitly set data source type (such as "json"). Please refer to the documentation of $.ig.DataSource and its type property.
 	 * "null" Option is ignored.
@@ -77462,19 +91078,40 @@ interface IgTileManager {
 
 	/**
 	 * Explicitly set data source type (such as "json"). Please refer to the documentation of [$.ig.DataSource type](ig.datasource#options:settings.type) and its type property.
+	 *
 	 */
 	dataSourceType?: string;
 
 	/**
 	 * Specifies the HTTP request method.
+	 *
 	 */
 	requestType?: string;
 
 	/**
 	 * Gets/Sets the HTTP content type for the response object. See [Perform an asynchronous HTTP (Ajax) request](http://api.jquery.com/jQuery.ajax/).
+	 *
 	 */
 	responseContentType?: string;
 
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	locale?: any;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	language?: string;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+	regional?: string|Object;
+
 	/**
 	 * Fired before databinding is performed
 	 *
@@ -77639,6 +91276,24 @@ interface IgTileManagerMethods {
 	 * Deletes the widget instance (client object). It is no longer accessible and all its event handlers stop working. Destroys all child widgets. Removes auto-generated HTML content, which is outside the widget, e.g. detached popups, dropdowns, etc.
 	 */
 	destroy(): Object;
+
+	/**
+	 * Changes the all locales contained into a specified container to the language specified in [options.language](ui.igwidget#options:language)
+	 * Note that this method is for rare scenarios, use [language](ui.igwidget#options:language) or [locale](ui.igwidget#options:locale) option setter
+	 *
+	 * @param $container Optional parameter - if not set it would use the element of the widget as $container
+	 */
+	changeLocale($container: Object): void;
+
+	/**
+	 * Changes the widget language to global language. Global language is the value in $.ig.util.language
+	 */
+	changeGlobalLanguage(): void;
+
+	/**
+	 * Changes the widget regional settins to global regional settings. Global regional settings are container in $.ig.util.regional
+	 */
+	changeGlobalRegional(): void;
 }
 interface JQuery {
 	data(propertyName: "igTileManager"): IgTileManagerMethods;
@@ -77655,6 +91310,9 @@ interface JQuery {
 	igTileManager(methodName: "widget"): Object;
 	igTileManager(methodName: "dataBind"): void;
 	igTileManager(methodName: "destroy"): Object;
+	igTileManager(methodName: "changeLocale", $container: Object): void;
+	igTileManager(methodName: "changeGlobalLanguage"): void;
+	igTileManager(methodName: "changeGlobalRegional"): void;
 
 	/**
 	 * *
@@ -77672,6 +91330,7 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the height of the container.
+	 *
 	 */
 
 	igTileManager(optionLiteral: 'option', optionName: "height"): string|number;
@@ -77679,6 +91338,7 @@ interface JQuery {
 	/**
 	 * /Sets the height of the container.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -77686,6 +91346,7 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the width of each column in the container.
+	 *
 	 */
 
 	igTileManager(optionLiteral: 'option', optionName: "columnWidth"): string|number|Array<any>;
@@ -77693,6 +91354,7 @@ interface JQuery {
 	/**
 	 * /Sets the width of each column in the container.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -77700,6 +91362,7 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the height of each column in the container.
+	 *
 	 */
 
 	igTileManager(optionLiteral: 'option', optionName: "columnHeight"): string|number|Array<any>;
@@ -77707,6 +91370,7 @@ interface JQuery {
 	/**
 	 * /Sets the height of each column in the container.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -77714,6 +91378,7 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the columns count in the container.
+	 *
 	 */
 
 	igTileManager(optionLiteral: 'option', optionName: "cols"): number;
@@ -77721,6 +91386,7 @@ interface JQuery {
 	/**
 	 * /Sets the columns count in the container.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -77728,6 +91394,7 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the rows count in the container.
+	 *
 	 */
 
 	igTileManager(optionLiteral: 'option', optionName: "rows"): number;
@@ -77735,6 +91402,7 @@ interface JQuery {
 	/**
 	 * /Sets the rows count in the container.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -77774,18 +91442,21 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets whether the items will rearrange when the container is resized.
+	 *
 	 */
 	igTileManager(optionLiteral: 'option', optionName: "rearrangeItems"): boolean;
 
 	/**
 	 * /Sets whether the items will rearrange when the container is resized.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTileManager(optionLiteral: 'option', optionName: "rearrangeItems", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the tiles configurations. Every tile is described by rowSpan, colSpan, rowIndex and colIndex.
+	 *
 	 */
 
 	igTileManager(optionLiteral: 'option', optionName: "items"): Object;
@@ -77793,6 +91464,7 @@ interface JQuery {
 	/**
 	 * /Sets the tiles configurations. Every tile is described by rowSpan, colSpan, rowIndex and colIndex.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -77800,18 +91472,21 @@ interface JQuery {
 
 	/**
 	 * Gets any valid data source accepted by [$.ig.DataSource](ig.datasource), or an instance of an [$.ig.DataSource](ig.datasource) itself.
+	 *
 	 */
 	igTileManager(optionLiteral: 'option', optionName: "dataSource"): any;
 
 	/**
 	 * Sets any valid data source accepted by [$.ig.DataSource](ig.datasource), or an instance of an [$.ig.DataSource](ig.datasource) itself.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTileManager(optionLiteral: 'option', optionName: "dataSource", optionValue: any): void;
 
 	/**
 	 * Gets/Sets the content of the tiles in minimized state.
+	 *
 	 */
 
 	igTileManager(optionLiteral: 'option', optionName: "minimizedState"): string;
@@ -77819,6 +91494,7 @@ interface JQuery {
 	/**
 	 * /Sets the content of the tiles in minimized state.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -77826,6 +91502,7 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the content of the tiles in maximized state.
+	 *
 	 */
 
 	igTileManager(optionLiteral: 'option', optionName: "maximizedState"): string;
@@ -77833,6 +91510,7 @@ interface JQuery {
 	/**
 	 * /Sets the content of the tiles in maximized state.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -77840,6 +91518,7 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the index of which items configuration will be used for positioning and sizing of the maximized tile.
+	 *
 	 */
 
 	igTileManager(optionLiteral: 'option', optionName: "maximizedTileIndex"): number;
@@ -77847,6 +91526,7 @@ interface JQuery {
 	/**
 	 * /Sets the index of which items configuration will be used for positioning and sizing of the maximized tile.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -77854,6 +91534,7 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets how many columns to be displayed in the right panel when the tiles are minimized.
+	 *
 	 */
 
 	igTileManager(optionLiteral: 'option', optionName: "rightPanelCols"): number;
@@ -77861,6 +91542,7 @@ interface JQuery {
 	/**
 	 * /Sets how many columns to be displayed in the right panel when the tiles are minimized.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -77868,6 +91550,7 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the width of the minimized tiles in the right panel.
+	 *
 	 */
 
 	igTileManager(optionLiteral: 'option', optionName: "rightPanelTilesWidth"): number;
@@ -77875,6 +91558,7 @@ interface JQuery {
 	/**
 	 * /Sets the width of the minimized tiles in the right panel.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -77882,6 +91566,7 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the height of the minimized tiles in the right panel.
+	 *
 	 */
 
 	igTileManager(optionLiteral: 'option', optionName: "rightPanelTilesHeight"): number;
@@ -77889,6 +91574,7 @@ interface JQuery {
 	/**
 	 * /Sets the height of the minimized tiles in the right panel.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -77896,66 +91582,77 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets whether the right panel should show scrollbar when tiles are overflowing.
+	 *
 	 */
 	igTileManager(optionLiteral: 'option', optionName: "showRightPanelScroll"): boolean;
 
 	/**
 	 * /Sets whether the right panel should show scrollbar when tiles are overflowing.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTileManager(optionLiteral: 'option', optionName: "showRightPanelScroll", optionValue: boolean): void;
 
 	/**
 	 * Configure the container variable representation, which defines splitter functionality.
+	 *
 	 */
 	igTileManager(optionLiteral: 'option', optionName: "splitterOptions"): IgTileManagerSplitterOptions;
 
 	/**
 	 * Configure the container variable representation, which defines splitter functionality.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTileManager(optionLiteral: 'option', optionName: "splitterOptions", optionValue: IgTileManagerSplitterOptions): void;
 
 	/**
 	 * Gets/Sets JQuery selector that specifies which elements will not trigger maximizing when clicked on.
+	 *
 	 */
 	igTileManager(optionLiteral: 'option', optionName: "preventMaximizingSelector"): string;
 
 	/**
 	 * /Sets JQuery selector that specifies which elements will not trigger maximizing when clicked on.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTileManager(optionLiteral: 'option', optionName: "preventMaximizingSelector", optionValue: string): void;
 
 	/**
 	 * Gets/Sets the duration of the animations in the tile manager.
+	 *
 	 */
 	igTileManager(optionLiteral: 'option', optionName: "animationDuration"): number;
 
 	/**
 	 * /Sets the duration of the animations in the tile manager.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTileManager(optionLiteral: 'option', optionName: "animationDuration", optionValue: number): void;
 
 	/**
 	 * Gets a remote URL accepted by [$.ig.DataSource](ig.datasource) in order to request data from it.
+	 *
 	 */
 	igTileManager(optionLiteral: 'option', optionName: "dataSourceUrl"): string;
 
 	/**
 	 * Sets a remote URL accepted by [$.ig.DataSource](ig.datasource) in order to request data from it.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTileManager(optionLiteral: 'option', optionName: "dataSourceUrl", optionValue: string): void;
 
 	/**
 	 * Property in the response which specifies where the data records array will be held (if the response is wrapped). See [$.ig.DataSource responseDataKey](ig.datasource#options:settings.responseDataKey).
+	 *
 	 */
 
 	igTileManager(optionLiteral: 'option', optionName: "responseDataKey"): string;
@@ -77963,6 +91660,7 @@ interface JQuery {
 	/**
 	 * Property in the response which specifies where the data records array will be held (if the response is wrapped). See [$.ig.DataSource responseDataKey](ig.datasource#options:settings.responseDataKey).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -77970,6 +91668,7 @@ interface JQuery {
 
 	/**
 	 * Explicitly set data source type (such as "json"). Please refer to the documentation of [$.ig.DataSource type](ig.datasource#options:settings.type) and its type property.
+	 *
 	 */
 
 	igTileManager(optionLiteral: 'option', optionName: "responseDataType"): string;
@@ -77977,6 +91676,7 @@ interface JQuery {
 	/**
 	 * Explicitly set data source type (such as "json"). Please refer to the documentation of [$.ig.DataSource type](ig.datasource#options:settings.type) and its type property.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -77984,40 +91684,90 @@ interface JQuery {
 
 	/**
 	 * Explicitly set data source type (such as "json"). Please refer to the documentation of [$.ig.DataSource type](ig.datasource#options:settings.type) and its type property.
+	 *
 	 */
 	igTileManager(optionLiteral: 'option', optionName: "dataSourceType"): string;
 
 	/**
 	 * Explicitly set data source type (such as "json"). Please refer to the documentation of [$.ig.DataSource type](ig.datasource#options:settings.type) and its type property.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTileManager(optionLiteral: 'option', optionName: "dataSourceType", optionValue: string): void;
 
 	/**
 	 * Gets the HTTP request method.
+	 *
 	 */
 	igTileManager(optionLiteral: 'option', optionName: "requestType"): string;
 
 	/**
 	 * Sets the HTTP request method.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTileManager(optionLiteral: 'option', optionName: "requestType", optionValue: string): void;
 
 	/**
 	 * Gets/Sets the HTTP content type for the response object. See [Perform an asynchronous HTTP (Ajax) request](http://api.jquery.com/jQuery.ajax/).
+	 *
 	 */
 	igTileManager(optionLiteral: 'option', optionName: "responseContentType"): string;
 
 	/**
 	 * /Sets the HTTP content type for the response object. See [Perform an asynchronous HTTP (Ajax) request](http://api.jquery.com/jQuery.ajax/).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTileManager(optionLiteral: 'option', optionName: "responseContentType", optionValue: string): void;
 
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	igTileManager(optionLiteral: 'option', optionName: "locale"): any;
+
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTileManager(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	igTileManager(optionLiteral: 'option', optionName: "language"): string;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTileManager(optionLiteral: 'option', optionName: "language", optionValue: string): void;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+
+	igTileManager(optionLiteral: 'option', optionName: "regional"): string|Object;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igTileManager(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
+
 	/**
 	 * Fired before databinding is performed
 	 *
@@ -78234,11 +91984,13 @@ interface JQuery {
 interface IgToolbarLocale {
 	/**
 	 * Gets/Sets collapse button title.
+	 *
 	 */
 	collapseButtonTitle?: any;
 
 	/**
 	 * Gets/Sets expand button title.
+	 *
 	 */
 	expandButtonTitle?: any;
 
@@ -78305,50 +92057,71 @@ interface WindowResizedEventUIParam {}
 interface IgToolbar {
 	/**
 	 * Set/Get the widget height.
+	 *
 	 */
 	height?: any;
 
 	/**
 	 * Set/Get the widget width.
+	 *
 	 */
 	width?: any;
 
 	/**
 	 * Get/Set whether the toolbar can be collapsed.
+	 *
 	 */
 	allowCollapsing?: boolean;
 
 	/**
 	 * The css class that will be applied to collapseButtonIcon.
+	 *
 	 */
 	collapseButtonIcon?: string;
 
 	/**
 	 * The css class that will be applied to the expand/collapse button icon.
+	 *
 	 */
 	expandButtonIcon?: string;
 
 	/**
 	 * Formal name of the widget.
+	 *
 	 */
 	name?: string;
 
 	/**
 	 * Display Name of the widget.
+	 *
 	 */
 	displayName?: string;
 
 	/**
 	 * Get/Set Toolbar's items.
+	 *
 	 */
 	items?: any[];
 
 	/**
 	 * Get/Set whether the widget is expanded initially.
+	 *
 	 */
 	isExpanded?: boolean;
 	locale?: IgToolbarLocale;
 
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	language?: string;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+	regional?: string|Object;
+
 	/**
 	 * Event fired after a click on any toolbar button
 	 */
@@ -78472,6 +92245,16 @@ interface IgToolbarMethods {
 	 * Destroy the widget.
 	 */
 	destroy(): void;
+
+	/**
+	 * Changes the widget language to global language. Global language is the value in $.ig.util.language
+	 */
+	changeGlobalLanguage(): void;
+
+	/**
+	 * Changes the widget regional settins to global regional settings. Global regional settings are container in $.ig.util.regional
+	 */
+	changeGlobalRegional(): void;
 }
 interface JQuery {
 	data(propertyName: "igToolbar"): IgToolbarMethods;
@@ -78487,117 +92270,167 @@ interface JQuery {
 	igToolbar(methodName: "activateItem", index: Object, activated: Object): void;
 	igToolbar(methodName: "deactivateAll"): void;
 	igToolbar(methodName: "destroy"): void;
+	igToolbar(methodName: "changeGlobalLanguage"): void;
+	igToolbar(methodName: "changeGlobalRegional"): void;
 
 	/**
 	 * Set/Get the widget height.
+	 *
 	 */
 	igToolbar(optionLiteral: 'option', optionName: "height"): any;
 
 	/**
 	 * Set/Get the widget height.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igToolbar(optionLiteral: 'option', optionName: "height", optionValue: any): void;
 
 	/**
 	 * Set/Get the widget width.
+	 *
 	 */
 	igToolbar(optionLiteral: 'option', optionName: "width"): any;
 
 	/**
 	 * Set/Get the widget width.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igToolbar(optionLiteral: 'option', optionName: "width", optionValue: any): void;
 
 	/**
 	 * Get/Set whether the toolbar can be collapsed.
+	 *
 	 */
 	igToolbar(optionLiteral: 'option', optionName: "allowCollapsing"): boolean;
 
 	/**
 	 * Get/Set whether the toolbar can be collapsed.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igToolbar(optionLiteral: 'option', optionName: "allowCollapsing", optionValue: boolean): void;
 
 	/**
 	 * The css class that will be applied to collapseButtonIcon.
+	 *
 	 */
 	igToolbar(optionLiteral: 'option', optionName: "collapseButtonIcon"): string;
 
 	/**
 	 * The css class that will be applied to collapseButtonIcon.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igToolbar(optionLiteral: 'option', optionName: "collapseButtonIcon", optionValue: string): void;
 
 	/**
 	 * The css class that will be applied to the expand/collapse button icon.
+	 *
 	 */
 	igToolbar(optionLiteral: 'option', optionName: "expandButtonIcon"): string;
 
 	/**
 	 * The css class that will be applied to the expand/collapse button icon.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igToolbar(optionLiteral: 'option', optionName: "expandButtonIcon", optionValue: string): void;
 
 	/**
 	 * Formal name of the widget.
+	 *
 	 */
 	igToolbar(optionLiteral: 'option', optionName: "name"): string;
 
 	/**
 	 * Formal name of the widget.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igToolbar(optionLiteral: 'option', optionName: "name", optionValue: string): void;
 
 	/**
 	 * Display Name of the widget.
+	 *
 	 */
 	igToolbar(optionLiteral: 'option', optionName: "displayName"): string;
 
 	/**
 	 * Display Name of the widget.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igToolbar(optionLiteral: 'option', optionName: "displayName", optionValue: string): void;
 
 	/**
 	 * Get/Set Toolbar's items.
+	 *
 	 */
 	igToolbar(optionLiteral: 'option', optionName: "items"): any[];
 
 	/**
 	 * Get/Set Toolbar's items.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igToolbar(optionLiteral: 'option', optionName: "items", optionValue: any[]): void;
 
 	/**
 	 * Get/Set whether the widget is expanded initially.
+	 *
 	 */
 	igToolbar(optionLiteral: 'option', optionName: "isExpanded"): boolean;
 
 	/**
 	 * Get/Set whether the widget is expanded initially.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igToolbar(optionLiteral: 'option', optionName: "isExpanded", optionValue: boolean): void;
 	igToolbar(optionLiteral: 'option', optionName: "locale"): IgToolbarLocale;
 	igToolbar(optionLiteral: 'option', optionName: "locale", optionValue: IgToolbarLocale): void;
 
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	igToolbar(optionLiteral: 'option', optionName: "language"): string;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igToolbar(optionLiteral: 'option', optionName: "language", optionValue: string): void;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+
+	igToolbar(optionLiteral: 'option', optionName: "regional"): string|Object;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igToolbar(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
+
 	/**
 	 * Event fired after a click on any toolbar button
 	 */
@@ -78806,11 +92639,13 @@ interface DeactivatedEventUIParam {
 interface IgToolbarButton {
 	/**
 	 * Enable/Disable the "Toggling" of a button.
+	 *
 	 */
 	allowToggling?: boolean;
 
 	/**
 	 * Get/Set whether the toolbar button is selected.
+	 *
 	 */
 	isSelected?: boolean;
 
@@ -78855,11 +92690,15 @@ interface IgToolbarButtonMethods {
 
 	/**
 	 * Activate toolbar button
+	 *
+	 * @param event
 	 */
 	activate(event: Object): void;
 
 	/**
 	 * Deactivate toolbar button
+	 *
+	 * @param event
 	 */
 	deactivate(event: Object): void;
 
@@ -78886,24 +92725,28 @@ interface JQuery {
 
 	/**
 	 * Gets the "Toggling" of a button.
+	 *
 	 */
 	igToolbarButton(optionLiteral: 'option', optionName: "allowToggling"): boolean;
 
 	/**
 	 * Enable/Disable the "Toggling" of a button.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igToolbarButton(optionLiteral: 'option', optionName: "allowToggling", optionValue: boolean): void;
 
 	/**
 	 * Get/Set whether the toolbar button is selected.
+	 *
 	 */
 	igToolbarButton(optionLiteral: 'option', optionName: "isSelected"): boolean;
 
 	/**
 	 * Get/Set whether the toolbar button is selected.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igToolbarButton(optionLiteral: 'option', optionName: "isSelected", optionValue: boolean): void;
@@ -78987,53 +92830,63 @@ interface IgTreeBindingsBindings {
 interface IgTreeBindings {
 	/**
 	 * Gets the name of the data source property the value of which would be the node text.
+	 *
 	 */
 	textKey?: string;
 
 	/**
 	 * Gets the XPath to the text attribute/node. Used in client-only binding directly to XML.
+	 *
 	 */
 	textXPath?: string;
 
 	/**
 	 * Gets the name of the data source property the value of which would be the node value.
+	 *
 	 */
 	valueKey?: string;
 
 	/**
 	 * Gets the XPath to the value attribute/node. Used in client-only binding directly to XML.
+	 *
 	 */
 	valueXPath?: string;
 
 	/**
 	 * Gets the name of the data source property the value of which would be used as a URL for the node image.
+	 *
 	 */
 	imageUrlKey?: string;
 
 	/**
 	 * Gets the XPath to the image URL attribute/node. Used in client-only binding directly to XML.
+	 *
 	 */
 	imageUrlXPath?: string;
 
 	/**
 	 * Gets the name of the data source property the value of which would be used as an href attribute for the node anchor.
+	 *
 	 */
 	navigateUrlKey?: string;
 
 	/**
 	 * Gets the XPath to the navigate URL attribute/node. Used in client-only binding directly to XML.
+	 *
 	 */
 	navigateUrlXPath?: string;
 
 	/**
 	 * Gets the name of the data source property the value of which would be used as a target
 	 * attribute for the node anchor.
+	 *
 	 */
 	targetKey?: string;
 
 	/**
 	 * Gets the name of the data source property the value of which would hold the node`s
 	 * expanded state. The expanded state is represented by a boolean.
+	 *
 	 */
 	expandedKey?: string;
 
@@ -79041,6 +92894,7 @@ interface IgTreeBindings {
 	 * Gets the name of the data source property the value of which would hold the node's
 	 * check state. The check state itself is represented by a string enumeration with the
 	 * checked|partially checked|unchecked states being respectively "on|partial|off".
+	 *
 	 */
 	checkedKey?: string;
 
@@ -79048,32 +92902,38 @@ interface IgTreeBindings {
 	 * Gets the name of the data source property the value of which is the primary key attribute
 	 * for the data. This property is used when load on demand is enabled and if specified the node paths
 	 * would be generated using primary keys instead of indices.
+	 *
 	 */
 	primaryKey?: string;
 
 	/**
 	 * Gets the node content template for the current layer of bindings. The igTree utilizes igTemplating
 	 * for generating node content templates. A good example of how to setup templating can be found here http://www.infragistics.com/community/blogs/marina_stoyanova/archive/2014/06/17/how-to-use-templates-to-style-the-different-nodes-of-the-ignite-ui-tree-control.aspx
+	 *
 	 */
 	nodeContentTemplate?: string;
 
 	/**
 	 * Gets the name of the data source property that holds the child data of the current layer node.
+	 *
 	 */
 	childDataProperty?: string;
 
 	/**
 	 * Gets the XPath to the child data node. Used in client-only binding directly to XML.
+	 *
 	 */
 	childDataXPath?: string;
 
 	/**
 	 * Gets the XPath to the root data node. Used in client-only binding directly to XML.
+	 *
 	 */
 	searchFieldXPath?: string;
 
 	/**
 	 * Gets the next layer of bindings in a recursive fashion.
+	 *
 	 */
 	bindings?: IgTreeBindingsBindings;
 
@@ -79086,12 +92946,14 @@ interface IgTreeBindings {
 interface IgTreeDragAndDropSettings {
 	/**
 	 * Gets whether the widget will accept drag and drop from other controls.
+	 *
 	 */
 	allowDrop?: boolean;
 
 	/**
 	 * Gets the drag and drop mode.
 	 *
+	 *
 	 * Valid values:
 	 * "default" Performs "copy" when holding the Ctrl key, otherwise "move" is performed.
 	 * "copy" Makes a copy of the dragged node at the drop location.
@@ -79101,43 +92963,51 @@ interface IgTreeDragAndDropSettings {
 
 	/**
 	 * Gets the opacity of the drag helper: 0 is fully transparent while 1 is fully opaque.
+	 *
 	 */
 	dragOpacity?: number;
 
 	/**
 	 * Gets whether the helper would revert to its original position upon an invalid drop.
+	 *
 	 */
 	revert?: boolean;
 
 	/**
 	 * Gets the duration of the revert animation.
+	 *
 	 */
 	revertDuration?: number;
 
 	/**
 	 * Gets the z-index that would be set for the drag helper.
+	 *
 	 */
 	zIndex?: number;
 
 	/**
 	 * Gets the delay between mousedown and the start of the actual drag. Smaller values make the nodes
 	 * more sensitive to drag and may interfere with selection.
+	 *
 	 */
 	dragStartDelay?: number;
 
 	/**
 	 * Gets whether when dragging over a collapsed node with children will trigger the node to expand.
+	 *
 	 */
 	expandOnDragOver?: boolean;
 
 	/**
 	 * Gets the delay after hovering a parent node before expanding that node during drag when [expandOnDragOver](ui.igtree#options:dragAndDropSettings.expandOnDragOver) is set to true.
+	 *
 	 */
 	expandDelay?: number;
 
 	/**
 	 * Gets the type of helper to be rendered for the drag operation.
 	 *
+	 *
 	 * Valid values:
 	 * "function" A function that will return a DOMElement to use while dragging.
 	 * "default" would render the default igTree helper.
@@ -79147,6 +93017,7 @@ interface IgTreeDragAndDropSettings {
 	/**
 	 * Gets the method for custom drop point validation. Returning true from this function would render the drop point valid, while false would make it invalid. The function has one parameter which is the current drop point and the context (this) of the function is the drag element.
 	 *
+	 *
 	 * Valid values:
 	 * "function" A function that will be used for validating drop points.
 	 * "null" Only built-in validation is applied.
@@ -79156,6 +93027,7 @@ interface IgTreeDragAndDropSettings {
 	/**
 	 * Gets the containment for the drag helper. The area inside of which thehelper is contained would be scrollable while dragging.
 	 *
+	 *
 	 * Valid values:
 	 * "boolean" If set to false, then the draggable elements will be contained in their window.
 	 * "selector" The draggable element will be contained to the bounding box of the first element found by the selector. If no element is found, no containment will be set.
@@ -79167,46 +93039,55 @@ interface IgTreeDragAndDropSettings {
 
 	/**
 	 * Gets the HTML markup for the invalid helper.
+	 *
 	 */
 	invalidMoveToMarkup?: string;
 
 	/**
 	 * Gets the HTML markup for the "move to" helper.
+	 *
 	 */
 	moveToMarkup?: string;
 
 	/**
 	 * Gets the HTML markup for the "move between" helper.
+	 *
 	 */
 	moveBetweenMarkup?: string;
 
 	/**
 	 * Gets the HTML markup for the "move after" helper.
+	 *
 	 */
 	moveAfterMarkup?: string;
 
 	/**
 	 * Gets the HTML markup for the "move before" helper.
+	 *
 	 */
 	moveBeforeMarkup?: string;
 
 	/**
 	 * Gets the HTML markup for the "copy to" helper.
+	 *
 	 */
 	copyToMarkup?: string;
 
 	/**
 	 * Gets the HTML markup for the "copy between" helper.
+	 *
 	 */
 	copyBetweenMarkup?: string;
 
 	/**
 	 * Gets the HTML markup for the "copy after" helper.
+	 *
 	 */
 	copyAfterMarkup?: string;
 
 	/**
 	 * Gets the HTML markup for the "copy before" helper.
+	 *
 	 */
 	copyBeforeMarkup?: string;
 
@@ -79532,6 +93413,7 @@ interface IgTree {
 	/**
 	 * Gets/Sets the width of the control container.
 	 *
+	 *
 	 * Valid values:
 	 * "string" The widget width can be set in pixels (px) and percentage (%).
 	 * "number" The widget width can be set as a number in pixels.
@@ -79542,6 +93424,7 @@ interface IgTree {
 	/**
 	 * Gets/Sets how the height of of the control container.
 	 *
+	 *
 	 * Valid values:
 	 * "string" The widget height can be set in pixels (px) and percentage (%).
 	 * "number" The widget height can be set as a number in pixels.
@@ -79552,6 +93435,7 @@ interface IgTree {
 	/**
 	 * Gets the behavior and type of the checkboxes rendered for the tree nodes. Can be set only at initialization.
 	 *
+	 *
 	 * Valid values:
 	 * "off" Checkboxes are turned off and are not rendered for the tree.
 	 * "biState" Checkboxes are rendered and support two states (checked and unchecked). Checkboxes do not cascade down or up in this mode.
@@ -79561,17 +93445,20 @@ interface IgTree {
 
 	/**
 	 * Gets/Sets one or more branches to be expanded at a time. If set to true then only one branch at each level of the tree can be expanded at a time. Otherwise multiple branches can be expanded at a time.
+	 *
 	 */
 	singleBranchExpand?: boolean;
 
 	/**
 	 * Gets/Sets whether nodes are hoverable. Setting this option to false would make the tree to not apply hover styles on the nodes when they are hovered.
+	 *
 	 */
 	hotTracking?: boolean;
 
 	/**
 	 * Gets/Sets the image url applied to all parent nodes.
 	 *
+	 *
 	 * Valid values:
 	 * "string" Image with the specified URL will be rendered for each node that has children (If you define both parentNodeImageUrl and parentNodeImageClass the parentNodeImageUrl would take priority).
 	 * "null" Option is ignored
@@ -79581,6 +93468,7 @@ interface IgTree {
 	/**
 	 * Gets/Sets the CSS class applied to all parent nodes.
 	 *
+	 *
 	 * Valid values:
 	 * "string" Specified class with a CSS sprite that would be rendered for each node that has children (If you define both parentNodeImageUrl and parentNodeImageClass the parentNodeImageUrl would take priority).
 	 * "null" Option is ignored
@@ -79590,6 +93478,7 @@ interface IgTree {
 	/**
 	 * Gets/Sets the tooltip applied to all parent node images.
 	 *
+	 *
 	 * Valid values:
 	 * "string" Specified a tooltip that would be rendered for each node that has children.
 	 * "null" Option is ignored
@@ -79599,6 +93488,7 @@ interface IgTree {
 	/**
 	 * Gets/Sets the image url applied to all leaf nodes.
 	 *
+	 *
 	 * Valid values:
 	 * "string" Image with the specified URL will be rendered for each node that has no children (If you define both leafNodeImageUrl and leafNodeImageClass the leafNodeImageUrl would take priority).
 	 * "null" Option is ignored
@@ -79608,6 +93498,7 @@ interface IgTree {
 	/**
 	 * Gets/Sets the CSS class applied to all leaf nodes.
 	 *
+	 *
 	 * Valid values:
 	 * "string" Specified class with a CSS sprite that would be rendered for each node that has no children (If you define both leafNodeImageUrl and leafNodeImageClass the leafNodeImageUrl would take priority).
 	 * "null" Option is ignored
@@ -79617,6 +93508,7 @@ interface IgTree {
 	/**
 	 * Gets/Sets the tooltip applied to all leaf node images.
 	 *
+	 *
 	 * Valid values:
 	 * "string" Specified a tooltip that would be rendered for each node that has no children.
 	 * "null" Option is ignored
@@ -79625,23 +93517,27 @@ interface IgTree {
 
 	/**
 	 * Gets/Sets the duration of each animation such as the expand/collapse.
+	 *
 	 */
 	animationDuration?: number;
 
 	/**
 	 * Gets the node data-path attribute separator character.
+	 *
 	 */
 	pathSeparator?: string;
 
 	/**
 	 * Gets/Sets the igTree data source. Accepts any valid data source accepted by $.ig.DataSource, or an instance of an $.ig.DataSource itself.
 	 * Once the data source is initialized, this option becomes an instance of the $.ig.HierarchicalDataSource.
+	 *
 	 */
 	dataSource?: any;
 
 	/**
 	 * Gets/Sets a remote URL accepted by [$.ig.DataSource](ig.datasource) in order to request data from it.
 	 *
+	 *
 	 * Valid values:
 	 * "string" Specifies the remote url.
 	 * "null" Option is ignored.
@@ -79651,6 +93547,7 @@ interface IgTree {
 	/**
 	 * Gets the type of the data source. Delegates the value to [$.ig.DataSource.settings.type](ig.datasource#options:settings.type). Explicitly set data source type (such as "json"). Please refer to the documentation of $.ig.DataSource.settings.type.
 	 *
+	 *
 	 * Valid values:
 	 * "string" Specifies the data source type implicitly.
 	 * "null" Type is inferred.
@@ -79660,6 +93557,7 @@ interface IgTree {
 	/**
 	 * Gets the JSON key at which a remote data source will write the data. Delegates the value to [$.ig.DataSource.settings.responseDataKey](ig.datasource#options:settings.responseDataKey). Please refer to the documentation of $.ig.DataSource.settings.responseDataKey.
 	 *
+	 *
 	 * Valid values:
 	 * "string" Specifies the name of the property in which data records are held if the response is wrapped.
 	 * "null" Option is ignored.
@@ -79669,6 +93567,7 @@ interface IgTree {
 	/**
 	 * Gets the data type of the remote data source response. Delegates the value to [$.ig.DataSource.settings.responseDataType](ig.datasource#options:settings.responseDataType). Please refer to the documentation of $.ig.DataSource.settings.responseDataType.
 	 *
+	 *
 	 * Valid values:
 	 * "string" Response type when a URL is set as the data source. See http://api.jquery.com/jQuery.ajax/ => dataType.
 	 * "null" Type is inferred.
@@ -79677,49 +93576,76 @@ interface IgTree {
 
 	/**
 	 * Gets the HTTP verb used for remote requests. Specifies the HTTP verb to be used to issue the requests to the [dataSourceUrl](ui.igtree#options:dataSourceUrl).
+	 *
 	 */
 	requestType?: string;
 
 	/**
 	 * Gets the type of the content in a remote data source response. Content type of the response from the [dataSourceUrl](ui.igtree#options:dataSourceUrl). See http://api.jquery.com/jQuery.ajax/ => contentType
+	 *
 	 */
 	responseContentType?: string;
 
 	/**
 	 * Gets the initial depth the igTree is going to be expanded to upon initial render.
+	 *
 	 */
 	initialExpandDepth?: number;
 
 	/**
 	 * Gets whether all the data would be bound initially or each child collection would be bound upon expand.
+	 *
 	 */
 	loadOnDemand?: boolean;
 
 	/**
 	 * Gets the data binding properties and keys. The igTree uses these to extract the corresponding data from the dataSource.
+	 *
 	 */
 	bindings?: IgTreeBindings;
 
 	/**
 	 * Gets the default target attribute value for the node anchors.
+	 *
 	 */
 	defaultNodeTarget?: string;
 
 	/**
 	 * Gets/Sets whether drag and drop functionality is enabled.
+	 *
 	 */
 	dragAndDrop?: boolean;
 
 	/**
 	 * Gets the URL to which updating requests will be made.
+	 *
 	 */
 	updateUrl?: string;
 
 	/**
 	 * Gets/Sets specific settings for the drag and drop functionality.
+	 *
 	 */
 	dragAndDropSettings?: IgTreeDragAndDropSettings;
 
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	locale?: any;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	language?: string;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+	regional?: string|Object;
+
 	/**
 	 * Fired before databinding is performed.
 	 */
@@ -79850,6 +93776,7 @@ interface IgTreeMethods {
 	 * Applies a checked state to a node.
 	 *
 	 * @param nodeObj Specifies the node element to apply the state to.
+	 * @param cascadeDir
 	 */
 	checkNode(nodeObj: Object, cascadeDir: Object): void;
 
@@ -79857,6 +93784,7 @@ interface IgTreeMethods {
 	 * Applies an unchecked state to a node.
 	 *
 	 * @param nodeObj Specifies the node element to apply the state to.
+	 * @param cascadeDir
 	 */
 	uncheckNode(nodeObj: Object, cascadeDir: Object): void;
 
@@ -79864,6 +93792,7 @@ interface IgTreeMethods {
 	 * Applies a partially checked state to a node.
 	 *
 	 * @param nodeObj Specifies the node element to apply the state to.
+	 * @param cascadeDir
 	 */
 	partiallyCheckNode(nodeObj: Object, cascadeDir: Object): void;
 
@@ -79987,9 +93916,9 @@ interface IgTreeMethods {
 	/**
 	 * Retrieves a node object for the specified node element.
 	 *
-	 * @param element Specifies the node element.
+	 * @param element Specifies the node jQuery element.
 	 */
-	nodeFromElement(element: Object): Object;
+	nodeFromElement(element: string): Object;
 
 	/**
 	 * Retrieves a node object collection of the immediate children of the provided node element.
@@ -80080,6 +94009,16 @@ interface IgTreeMethods {
 	 * Destructor for the igTree widget.
 	 */
 	destroy(): void;
+
+	/**
+	 * Changes the widget language to global language. Global language is the value in $.ig.util.language
+	 */
+	changeGlobalLanguage(): void;
+
+	/**
+	 * Changes the widget regional settins to global regional settings. Global regional settings are container in $.ig.util.regional
+	 */
+	changeGlobalRegional(): void;
 }
 interface JQuery {
 	data(propertyName: "igTree"): IgTreeMethods;
@@ -80109,7 +94048,7 @@ interface JQuery {
 	igTree(methodName: "findNodesByText", text: string, parent?: Object): any[];
 	igTree(methodName: "findImmediateNodesByText", text: string, parent?: Object): any[];
 	igTree(methodName: "nodeByIndex", index: number, parent?: Object): Object;
-	igTree(methodName: "nodeFromElement", element: Object): Object;
+	igTree(methodName: "nodeFromElement", element: string): Object;
 	igTree(methodName: "children", parent: Object): any[];
 	igTree(methodName: "childrenByPath", path: string): any[];
 	igTree(methodName: "isSelected", node: Object): boolean;
@@ -80123,9 +94062,12 @@ interface JQuery {
 	igTree(methodName: "transactionLog"): any[];
 	igTree(methodName: "nodeDataFor", path: string): Object;
 	igTree(methodName: "destroy"): void;
+	igTree(methodName: "changeGlobalLanguage"): void;
+	igTree(methodName: "changeGlobalRegional"): void;
 
 	/**
 	 * Gets/Sets the width of the control container.
+	 *
 	 */
 
 	igTree(optionLiteral: 'option', optionName: "width"): string|number;
@@ -80133,6 +94075,7 @@ interface JQuery {
 	/**
 	 * /Sets the width of the control container.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -80140,6 +94083,7 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets how the height of of the control container.
+	 *
 	 */
 
 	igTree(optionLiteral: 'option', optionName: "height"): string|number;
@@ -80147,6 +94091,7 @@ interface JQuery {
 	/**
 	 * /Sets how the height of of the control container.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -80154,6 +94099,7 @@ interface JQuery {
 
 	/**
 	 * Gets the behavior and type of the checkboxes rendered for the tree nodes. Can be set only at initialization.
+	 *
 	 */
 
 	igTree(optionLiteral: 'option', optionName: "checkboxMode"): string;
@@ -80161,6 +94107,7 @@ interface JQuery {
 	/**
 	 * The behavior and type of the checkboxes rendered for the tree nodes. Can be set only at initialization.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -80168,30 +94115,35 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets one or more branches to be expanded at a time. If set to true then only one branch at each level of the tree can be expanded at a time. Otherwise multiple branches can be expanded at a time.
+	 *
 	 */
 	igTree(optionLiteral: 'option', optionName: "singleBranchExpand"): boolean;
 
 	/**
 	 * /Sets one or more branches to be expanded at a time. If set to true then only one branch at each level of the tree can be expanded at a time. Otherwise multiple branches can be expanded at a time.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTree(optionLiteral: 'option', optionName: "singleBranchExpand", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets whether nodes are hoverable. Setting this option to false would make the tree to not apply hover styles on the nodes when they are hovered.
+	 *
 	 */
 	igTree(optionLiteral: 'option', optionName: "hotTracking"): boolean;
 
 	/**
 	 * /Sets whether nodes are hoverable. Setting this option to false would make the tree to not apply hover styles on the nodes when they are hovered.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTree(optionLiteral: 'option', optionName: "hotTracking", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the image url applied to all parent nodes.
+	 *
 	 */
 
 	igTree(optionLiteral: 'option', optionName: "parentNodeImageUrl"): string;
@@ -80199,6 +94151,7 @@ interface JQuery {
 	/**
 	 * /Sets the image url applied to all parent nodes.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -80206,6 +94159,7 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the CSS class applied to all parent nodes.
+	 *
 	 */
 
 	igTree(optionLiteral: 'option', optionName: "parentNodeImageClass"): string;
@@ -80213,6 +94167,7 @@ interface JQuery {
 	/**
 	 * /Sets the CSS class applied to all parent nodes.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -80220,6 +94175,7 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the tooltip applied to all parent node images.
+	 *
 	 */
 
 	igTree(optionLiteral: 'option', optionName: "parentNodeImageTooltip"): string;
@@ -80227,6 +94183,7 @@ interface JQuery {
 	/**
 	 * /Sets the tooltip applied to all parent node images.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -80234,6 +94191,7 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the image url applied to all leaf nodes.
+	 *
 	 */
 
 	igTree(optionLiteral: 'option', optionName: "leafNodeImageUrl"): string;
@@ -80241,6 +94199,7 @@ interface JQuery {
 	/**
 	 * /Sets the image url applied to all leaf nodes.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -80248,6 +94207,7 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the CSS class applied to all leaf nodes.
+	 *
 	 */
 
 	igTree(optionLiteral: 'option', optionName: "leafNodeImageClass"): string;
@@ -80255,6 +94215,7 @@ interface JQuery {
 	/**
 	 * /Sets the CSS class applied to all leaf nodes.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -80262,6 +94223,7 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the tooltip applied to all leaf node images.
+	 *
 	 */
 
 	igTree(optionLiteral: 'option', optionName: "leafNodeImageTooltip"): string;
@@ -80269,6 +94231,7 @@ interface JQuery {
 	/**
 	 * /Sets the tooltip applied to all leaf node images.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -80276,24 +94239,28 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the duration of each animation such as the expand/collapse.
+	 *
 	 */
 	igTree(optionLiteral: 'option', optionName: "animationDuration"): number;
 
 	/**
 	 * /Sets the duration of each animation such as the expand/collapse.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTree(optionLiteral: 'option', optionName: "animationDuration", optionValue: number): void;
 
 	/**
 	 * Gets the node data-path attribute separator character.
+	 *
 	 */
 	igTree(optionLiteral: 'option', optionName: "pathSeparator"): string;
 
 	/**
 	 * The node data-path attribute separator character.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTree(optionLiteral: 'option', optionName: "pathSeparator", optionValue: string): void;
@@ -80301,6 +94268,7 @@ interface JQuery {
 	/**
 	 * Gets/Sets the igTree data source. Accepts any valid data source accepted by $.ig.DataSource, or an instance of an $.ig.DataSource itself.
 	 * Once the data source is initialized, this option becomes an instance of the $.ig.HierarchicalDataSource.
+	 *
 	 */
 	igTree(optionLiteral: 'option', optionName: "dataSource"): any;
 
@@ -80308,12 +94276,14 @@ interface JQuery {
 	 * /Sets the igTree data source. Accepts any valid data source accepted by $.ig.DataSource, or an instance of an $.ig.DataSource itself.
 	 * Once the data source is initialized, this option becomes an instance of the $.ig.HierarchicalDataSource.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTree(optionLiteral: 'option', optionName: "dataSource", optionValue: any): void;
 
 	/**
 	 * Gets/Sets a remote URL accepted by [$.ig.DataSource](ig.datasource) in order to request data from it.
+	 *
 	 */
 
 	igTree(optionLiteral: 'option', optionName: "dataSourceUrl"): string;
@@ -80321,6 +94291,7 @@ interface JQuery {
 	/**
 	 * /Sets a remote URL accepted by [$.ig.DataSource](ig.datasource) in order to request data from it.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -80328,6 +94299,7 @@ interface JQuery {
 
 	/**
 	 * Gets the type of the data source. Delegates the value to [$.ig.DataSource.settings.type](ig.datasource#options:settings.type). Explicitly set data source type (such as "json"). Please refer to the documentation of $.ig.DataSource.settings.type.
+	 *
 	 */
 
 	igTree(optionLiteral: 'option', optionName: "dataSourceType"): string;
@@ -80335,6 +94307,7 @@ interface JQuery {
 	/**
 	 * The type of the data source. Delegates the value to [$.ig.DataSource.settings.type](ig.datasource#options:settings.type). Explicitly set data source type (such as "json"). Please refer to the documentation of $.ig.DataSource.settings.type.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -80342,6 +94315,7 @@ interface JQuery {
 
 	/**
 	 * Gets the JSON key at which a remote data source will write the data. Delegates the value to [$.ig.DataSource.settings.responseDataKey](ig.datasource#options:settings.responseDataKey). Please refer to the documentation of $.ig.DataSource.settings.responseDataKey.
+	 *
 	 */
 
 	igTree(optionLiteral: 'option', optionName: "responseDataKey"): string;
@@ -80349,6 +94323,7 @@ interface JQuery {
 	/**
 	 * The JSON key at which a remote data source will write the data. Delegates the value to [$.ig.DataSource.settings.responseDataKey](ig.datasource#options:settings.responseDataKey). Please refer to the documentation of $.ig.DataSource.settings.responseDataKey.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -80356,6 +94331,7 @@ interface JQuery {
 
 	/**
 	 * Gets the data type of the remote data source response. Delegates the value to [$.ig.DataSource.settings.responseDataType](ig.datasource#options:settings.responseDataType). Please refer to the documentation of $.ig.DataSource.settings.responseDataType.
+	 *
 	 */
 
 	igTree(optionLiteral: 'option', optionName: "responseDataType"): string;
@@ -80363,6 +94339,7 @@ interface JQuery {
 	/**
 	 * The data type of the remote data source response. Delegates the value to [$.ig.DataSource.settings.responseDataType](ig.datasource#options:settings.responseDataType). Please refer to the documentation of $.ig.DataSource.settings.responseDataType.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -80370,112 +94347,174 @@ interface JQuery {
 
 	/**
 	 * Gets the HTTP verb used for remote requests. Gets the HTTP verb to be used to issue the requests to the [dataSourceUrl](ui.igtree#options:dataSourceUrl).
+	 *
 	 */
 	igTree(optionLiteral: 'option', optionName: "requestType"): string;
 
 	/**
 	 * The HTTP verb used for remote requests. Sets the HTTP verb to be used to issue the requests to the [dataSourceUrl](ui.igtree#options:dataSourceUrl).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTree(optionLiteral: 'option', optionName: "requestType", optionValue: string): void;
 
 	/**
 	 * Gets the type of the content in a remote data source response. Content type of the response from the [dataSourceUrl](ui.igtree#options:dataSourceUrl). See http://api.jquery.com/jQuery.ajax/ => contentType
+	 *
 	 */
 	igTree(optionLiteral: 'option', optionName: "responseContentType"): string;
 
 	/**
 	 * The type of the content in a remote data source response. Content type of the response from the [dataSourceUrl](ui.igtree#options:dataSourceUrl). See http://api.jquery.com/jQuery.ajax/ => contentType
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTree(optionLiteral: 'option', optionName: "responseContentType", optionValue: string): void;
 
 	/**
 	 * Gets the initial depth the igTree is going to be expanded to upon initial render.
+	 *
 	 */
 	igTree(optionLiteral: 'option', optionName: "initialExpandDepth"): number;
 
 	/**
 	 * The initial depth the igTree is going to be expanded to upon initial render.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTree(optionLiteral: 'option', optionName: "initialExpandDepth", optionValue: number): void;
 
 	/**
 	 * Gets whether all the data would be bound initially or each child collection would be bound upon expand.
+	 *
 	 */
 	igTree(optionLiteral: 'option', optionName: "loadOnDemand"): boolean;
 
 	/**
 	 * Whether all the data would be bound initially or each child collection would be bound upon expand.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTree(optionLiteral: 'option', optionName: "loadOnDemand", optionValue: boolean): void;
 
 	/**
 	 * Gets the data binding properties and keys. The igTree uses these to extract the corresponding data from the dataSource.
+	 *
 	 */
 	igTree(optionLiteral: 'option', optionName: "bindings"): IgTreeBindings;
 
 	/**
 	 * The data binding properties and keys. The igTree uses these to extract the corresponding data from the dataSource.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTree(optionLiteral: 'option', optionName: "bindings", optionValue: IgTreeBindings): void;
 
 	/**
 	 * Gets the default target attribute value for the node anchors.
+	 *
 	 */
 	igTree(optionLiteral: 'option', optionName: "defaultNodeTarget"): string;
 
 	/**
 	 * The default target attribute value for the node anchors.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTree(optionLiteral: 'option', optionName: "defaultNodeTarget", optionValue: string): void;
 
 	/**
 	 * Gets/Sets whether drag and drop functionality is enabled.
+	 *
 	 */
 	igTree(optionLiteral: 'option', optionName: "dragAndDrop"): boolean;
 
 	/**
 	 * /Sets whether drag and drop functionality is enabled.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTree(optionLiteral: 'option', optionName: "dragAndDrop", optionValue: boolean): void;
 
 	/**
 	 * Gets the URL to which updating requests will be made.
+	 *
 	 */
 	igTree(optionLiteral: 'option', optionName: "updateUrl"): string;
 
 	/**
 	 * The URL to which updating requests will be made.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTree(optionLiteral: 'option', optionName: "updateUrl", optionValue: string): void;
 
 	/**
 	 * Gets/Sets specific settings for the drag and drop functionality.
+	 *
 	 */
 	igTree(optionLiteral: 'option', optionName: "dragAndDropSettings"): IgTreeDragAndDropSettings;
 
 	/**
 	 * /Sets specific settings for the drag and drop functionality.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTree(optionLiteral: 'option', optionName: "dragAndDropSettings", optionValue: IgTreeDragAndDropSettings): void;
 
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	igTree(optionLiteral: 'option', optionName: "locale"): any;
+
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTree(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	igTree(optionLiteral: 'option', optionName: "language"): string;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTree(optionLiteral: 'option', optionName: "language", optionValue: string): void;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+
+	igTree(optionLiteral: 'option', optionName: "regional"): string|Object;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igTree(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
+
 	/**
 	 * Fired before databinding is performed.
 	 */
@@ -80761,22 +94800,26 @@ interface IgTreeGridColumnFixing {
 
 	/**
 	 * Specifies whether to show the column fixing buttons in header cells/feature chooser.
+	 *
 	 */
 	showFixButtons?: boolean;
 
 	/**
 	 * Enable row height sync for the fixed and unfixed portion of the grid. If you're observing row misalignment, please refer to [this article](http://www.igniteui.com/help/iggrid-known-issues#misalignment-ie9).
+	 *
 	 */
 	syncRowHeights?: boolean;
 
 	/**
 	 * Scroll delta in pixels when scrolling with the mouse wheel or the keyboard in the fixed columns area of the grid.
+	 *
 	 */
 	scrollDelta?: number;
 
 	/**
 	 * Configures which side the fixed columns of the grid will be rendered on. Check [this topic](http://www.igniteui.com/help/iggrid-columnfixing-configuring#direction) out of more information.
 	 *
+	 *
 	 * Valid values:
 	 * "left" Fixed columns are rendered on the left side of the main grid.
 	 * "right" Fixed columns are rendered on the right side of the main grid.
@@ -80785,12 +94828,14 @@ interface IgTreeGridColumnFixing {
 
 	/**
 	 * List of column settings that specifies custom column fixing options on a per column basis.
+	 *
 	 */
 	columnSettings?: IgGridColumnFixingColumnSetting[];
 
 	/**
 	 * Minimal visible area in pixels for the unfixed columns. If the end user tries to fix a column(or columns), which causes the width of the fixed columns to grow such that the width of visible area of unfixed columns is less than this option then fixing will be canceled. Check [this topic](http://www.igniteui.com/help/iggrid-columnfixing-configuring#non-fixable-min-width) out for more information.
 	 *
+	 *
 	 * Valid values:
 	 * "string" The width can be set in pixels (px) and percentage (%).
 	 * "number" The width can be set in pixels as a number.
@@ -80799,6 +94844,7 @@ interface IgTreeGridColumnFixing {
 
 	/**
 	 * Specify initial fixing of all non data columns. Non-data columns are columns in the grid rendered for specific features, like the row selectors feature. The column containing the row numbering is such a column. This option is applicable when [fixingDirection](ui.iggridcolumnfixing#options:fixingDirection) is set to left. For a full column fixing configuration summary please refer to [this topic](http://www.igniteui.com/help/iggrid-columnfixing-configuring#configuration-summary).
+	 *
 	 */
 	fixNondataColumns?: boolean;
 
@@ -80844,6 +94890,8 @@ interface IgTreeGridColumnFixing {
 }
 interface IgTreeGridColumnFixingMethods {
 	destroy(): void;
+	changeGlobalLanguage(): void;
+	changeGlobalRegional(): void;
 
 	/**
 	 * Unfixes a column by specified column identifier - column key or column index.
@@ -80866,6 +94914,11 @@ interface IgTreeGridColumnFixingMethods {
 	 * @param clearRowsHeights Clears row heigths for all visible rows.
 	 */
 	syncHeights(check?: boolean, clearRowsHeights?: boolean): void;
+
+	/**
+	 * Changes the all locales into the widget element to the language specified in [options.language](ui.iggridcolumnfixing#options:language)
+	 * Note that this method is for rare scenarios, see [language](ui.iggridcolumnfixing#options:language) or [locale](ui.iggridcolumnfixing#options:locale) option setter
+	 */
 	changeLocale(): void;
 
 	/**
@@ -80946,6 +94999,8 @@ interface JQuery {
 
 interface JQuery {
 	igTreeGridColumnFixing(methodName: "destroy"): void;
+	igTreeGridColumnFixing(methodName: "changeGlobalLanguage"): void;
+	igTreeGridColumnFixing(methodName: "changeGlobalRegional"): void;
 	igTreeGridColumnFixing(methodName: "unfixColumn", colIdentifier: Object, target?: string, after?: boolean): Object;
 	igTreeGridColumnFixing(methodName: "checkAndSyncHeights"): void;
 	igTreeGridColumnFixing(methodName: "syncHeights", check?: boolean, clearRowsHeights?: boolean): void;
@@ -81022,42 +95077,49 @@ interface JQuery {
 
 	/**
 	 * Gets whether to show the column fixing buttons in header cells/feature chooser.
+	 *
 	 */
 	igTreeGridColumnFixing(optionLiteral: 'option', optionName: "showFixButtons"): boolean;
 
 	/**
 	 * Sets whether to show the column fixing buttons in header cells/feature chooser.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridColumnFixing(optionLiteral: 'option', optionName: "showFixButtons", optionValue: boolean): void;
 
 	/**
 	 * Enable row height sync for the fixed and unfixed portion of the grid. If you're observing row misalignment, please refer to [this article](http://www.igniteui.com/help/iggrid-known-issues#misalignment-ie9).
+	 *
 	 */
 	igTreeGridColumnFixing(optionLiteral: 'option', optionName: "syncRowHeights"): boolean;
 
 	/**
 	 * Enable row height sync for the fixed and unfixed portion of the grid. If you're observing row misalignment, please refer to [this article](http://www.igniteui.com/help/iggrid-known-issues#misalignment-ie9).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridColumnFixing(optionLiteral: 'option', optionName: "syncRowHeights", optionValue: boolean): void;
 
 	/**
 	 * Scroll delta in pixels when scrolling with the mouse wheel or the keyboard in the fixed columns area of the grid.
+	 *
 	 */
 	igTreeGridColumnFixing(optionLiteral: 'option', optionName: "scrollDelta"): number;
 
 	/**
 	 * Scroll delta in pixels when scrolling with the mouse wheel or the keyboard in the fixed columns area of the grid.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridColumnFixing(optionLiteral: 'option', optionName: "scrollDelta", optionValue: number): void;
 
 	/**
 	 * Configures which side the fixed columns of the grid will be rendered on. Check [this topic](http://www.igniteui.com/help/iggrid-columnfixing-configuring#direction) out of more information.
+	 *
 	 */
 
 	igTreeGridColumnFixing(optionLiteral: 'option', optionName: "fixingDirection"): string;
@@ -81065,6 +95127,7 @@ interface JQuery {
 	/**
 	 * Configures which side the fixed columns of the grid will be rendered on. Check [this topic](http://www.igniteui.com/help/iggrid-columnfixing-configuring#direction) out of more information.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -81072,18 +95135,21 @@ interface JQuery {
 
 	/**
 	 * List of column settings that specifies custom column fixing options on a per column basis.
+	 *
 	 */
 	igTreeGridColumnFixing(optionLiteral: 'option', optionName: "columnSettings"): IgGridColumnFixingColumnSetting[];
 
 	/**
 	 * List of column settings that specifies custom column fixing options on a per column basis.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridColumnFixing(optionLiteral: 'option', optionName: "columnSettings", optionValue: IgGridColumnFixingColumnSetting[]): void;
 
 	/**
 	 * Minimal visible area in pixels for the unfixed columns. If the end user tries to fix a column(or columns), which causes the width of the fixed columns to grow such that the width of visible area of unfixed columns is less than this option then fixing will be canceled. Check [this topic](http://www.igniteui.com/help/iggrid-columnfixing-configuring#non-fixable-min-width) out for more information.
+	 *
 	 */
 
 	igTreeGridColumnFixing(optionLiteral: 'option', optionName: "minimalVisibleAreaWidth"): string|number;
@@ -81091,6 +95157,7 @@ interface JQuery {
 	/**
 	 * Minimal visible area in pixels for the unfixed columns. If the end user tries to fix a column(or columns), which causes the width of the fixed columns to grow such that the width of visible area of unfixed columns is less than this option then fixing will be canceled. Check [this topic](http://www.igniteui.com/help/iggrid-columnfixing-configuring#non-fixable-min-width) out for more information.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -81098,12 +95165,14 @@ interface JQuery {
 
 	/**
 	 * Specify initial fixing of all non data columns. Non-data columns are columns in the grid rendered for specific features, like the row selectors feature. The column containing the row numbering is such a column. This option is applicable when [fixingDirection](ui.iggridcolumnfixing#options:fixingDirection) is set to left. For a full column fixing configuration summary please refer to [this topic](http://www.igniteui.com/help/iggrid-columnfixing-configuring#configuration-summary).
+	 *
 	 */
 	igTreeGridColumnFixing(optionLiteral: 'option', optionName: "fixNondataColumns"): boolean;
 
 	/**
 	 * Specify initial fixing of all non data columns. Non-data columns are columns in the grid rendered for specific features, like the row selectors feature. The column containing the row numbering is such a column. This option is applicable when [fixingDirection](ui.iggridcolumnfixing#options:fixingDirection) is set to left. For a full column fixing configuration summary please refer to [this topic](http://www.igniteui.com/help/iggrid-columnfixing-configuring#configuration-summary).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridColumnFixing(optionLiteral: 'option', optionName: "fixNondataColumns", optionValue: boolean): void;
@@ -81198,14 +95267,21 @@ interface JQuery {
 	igTreeGridColumnFixing(methodName: string, ...methodParams: any[]): any;
 }
 interface IgTreeGridColumnMoving {
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for the igTreeGrid.
+	 */
+	inherit?: boolean;
+
 	/**
 	 * A list of column settings that specifies moving options on a per column basis.
+	 *
 	 */
 	columnSettings?: IgGridColumnMovingColumnSetting[];
 
 	/**
 	 * Specify the drag-and-drop mode for the feature
 	 *
+	 *
 	 * Valid values:
 	 * "immediate" Column headers will rearange as you drag with a space opening under the cursor for the header to be dropped on
 	 * "deferred" A clone of the header dragged will be created and indicators will be shown between columns to help navigate the drop.
@@ -81215,6 +95291,7 @@ interface IgTreeGridColumnMoving {
 	/**
 	 * Specify the way columns will be rearranged
 	 *
+	 *
 	 * Valid values:
 	 * "dom" Columns will be rearranged through dom manipulation
 	 * "render" Columns will not be rearranged but the grid will be rendered again with the new column order. Please note this option is incompatible with immediate move mode.
@@ -81223,47 +95300,56 @@ interface IgTreeGridColumnMoving {
 
 	/**
 	 * Specifies if header cells should include an additional button that opens a moving helper dropdown.
+	 *
 	 */
 	addMovingDropdown?: boolean;
 
 	/**
 	 * Specifies width of column moving dialog
+	 *
 	 */
 	movingDialogWidth?: number;
 
 	/**
 	 * Specifies height of column moving dialog
+	 *
 	 */
 	movingDialogHeight?: number;
 
 	/**
 	 * Specifies time in milliseconds for animation duration to show/hide modal dialog
+	 *
 	 */
 	movingDialogAnimationDuration?: number;
 
 	/**
 	 * Specifies the length (in pixels) between the dragged column and the column edges below which the move operation is accepted
+	 *
 	 */
 	movingAcceptanceTolerance?: number;
 
 	/**
 	 * Specifies the length (in pixels) between the dragged column and the grid edges below which horizontal scrolling occurs
+	 *
 	 */
 	movingScrollTolerance?: number;
 
 	/**
 	 * Specifies a multiplier for the delay between subsequent scroll operations. The larger this number is, the slower scrolling will appear to be.
+	 *
 	 */
 	scrollSpeedMultiplier?: number;
 
 	/**
 	 * Specifies the length (in pixels) of each individual scroll operation
+	 *
 	 */
 	scrollDelta?: number;
 
 	/**
 	 * Specifies whether the contents of the column being dragged will get hidden. The option is only
 	 * relevant in immediate moving mode.
+	 *
 	 */
 	hideHeaderContentsDuringDrag?: boolean;
 
@@ -81271,6 +95357,7 @@ interface IgTreeGridColumnMoving {
 	 * Specifies the opacity of the drag markup, while a column header is being dragged.
 	 * The value must be between 0 and 1. When GroupBy is enabled, the corresponding option in the GroupBy configuration
 	 * will be used with priority over this one.
+	 *
 	 */
 	dragHelperOpacity?: number;
 
@@ -81343,6 +95430,7 @@ interface IgTreeGridColumnMoving {
 
 	/**
 	 * Specifies markup for drop tooltip in column moving dialog
+	 *
 	 */
 	movingDialogDropTooltipMarkup?: string;
 
@@ -81356,14 +95444,10 @@ interface IgTreeGridColumnMoving {
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog.
+	 *
 	 */
 	dialogWidget?: string;
 
-	/**
-	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
-	 */
-	inherit?: boolean;
-
 	/**
 	 * Event which is fired when a drag operation begins on a column header
 	 */
@@ -81451,6 +95535,13 @@ interface IgTreeGridColumnMoving {
 }
 interface IgTreeGridColumnMovingMethods {
 	destroy(): void;
+	changeGlobalLanguage(): void;
+	changeGlobalRegional(): void;
+
+	/**
+	 * Changes the all locales into the widget element to the language specified in [options.language](ui.iggridcolumnmoving#options:language)
+	 * Note that this method is for rare scenarios, see [language](ui.iggridcolumnmoving#options:language) or [locale](ui.iggridcolumnmoving#options:locale) option setter
+	 */
 	changeLocale(): void;
 
 	/**
@@ -81471,23 +95562,40 @@ interface JQuery {
 
 interface JQuery {
 	igTreeGridColumnMoving(methodName: "destroy"): void;
+	igTreeGridColumnMoving(methodName: "changeGlobalLanguage"): void;
+	igTreeGridColumnMoving(methodName: "changeGlobalRegional"): void;
 	igTreeGridColumnMoving(methodName: "changeLocale"): void;
 	igTreeGridColumnMoving(methodName: "moveColumn", column: Object, target: Object, after?: boolean, inDom?: boolean, callback?: Function): void;
 
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for the igTreeGrid.
+	 */
+	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "inherit"): boolean;
+
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for the igTreeGrid.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "inherit", optionValue: boolean): void;
+
 	/**
 	 * A list of column settings that specifies moving options on a per column basis.
+	 *
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "columnSettings"): IgGridColumnMovingColumnSetting[];
 
 	/**
 	 * A list of column settings that specifies moving options on a per column basis.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "columnSettings", optionValue: IgGridColumnMovingColumnSetting[]): void;
 
 	/**
 	 * Specify the drag-and-drop mode for the feature
+	 *
 	 */
 
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "mode"): string;
@@ -81495,6 +95603,7 @@ interface JQuery {
 	/**
 	 * Specify the drag-and-drop mode for the feature
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -81502,6 +95611,7 @@ interface JQuery {
 
 	/**
 	 * Specify the way columns will be rearranged
+	 *
 	 */
 
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "moveType"): string;
@@ -81509,6 +95619,7 @@ interface JQuery {
 	/**
 	 * Specify the way columns will be rearranged
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -81516,96 +95627,112 @@ interface JQuery {
 
 	/**
 	 * Gets if header cells should include an additional button that opens a moving helper dropdown.
+	 *
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "addMovingDropdown"): boolean;
 
 	/**
 	 * Sets if header cells should include an additional button that opens a moving helper dropdown.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "addMovingDropdown", optionValue: boolean): void;
 
 	/**
 	 * Gets width of column moving dialog
+	 *
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "movingDialogWidth"): number;
 
 	/**
 	 * Sets width of column moving dialog
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "movingDialogWidth", optionValue: number): void;
 
 	/**
 	 * Gets height of column moving dialog
+	 *
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "movingDialogHeight"): number;
 
 	/**
 	 * Sets height of column moving dialog
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "movingDialogHeight", optionValue: number): void;
 
 	/**
 	 * Gets time in milliseconds for animation duration to show/hide modal dialog
+	 *
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "movingDialogAnimationDuration"): number;
 
 	/**
 	 * Sets time in milliseconds for animation duration to show/hide modal dialog
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "movingDialogAnimationDuration", optionValue: number): void;
 
 	/**
 	 * Gets the length (in pixels) between the dragged column and the column edges below which the move operation is accepted
+	 *
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "movingAcceptanceTolerance"): number;
 
 	/**
 	 * Sets the length (in pixels) between the dragged column and the column edges below which the move operation is accepted
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "movingAcceptanceTolerance", optionValue: number): void;
 
 	/**
 	 * Gets the length (in pixels) between the dragged column and the grid edges below which horizontal scrolling occurs
+	 *
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "movingScrollTolerance"): number;
 
 	/**
 	 * Sets the length (in pixels) between the dragged column and the grid edges below which horizontal scrolling occurs
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "movingScrollTolerance", optionValue: number): void;
 
 	/**
 	 * Gets a multiplier for the delay between subsequent scroll operations. The larger this number is, the slower scrolling will appear to be.
+	 *
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "scrollSpeedMultiplier"): number;
 
 	/**
 	 * Sets a multiplier for the delay between subsequent scroll operations. The larger this number is, the slower scrolling will appear to be.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "scrollSpeedMultiplier", optionValue: number): void;
 
 	/**
 	 * Gets the length (in pixels) of each individual scroll operation
+	 *
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "scrollDelta"): number;
 
 	/**
 	 * Sets the length (in pixels) of each individual scroll operation
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "scrollDelta", optionValue: number): void;
@@ -81613,6 +95740,7 @@ interface JQuery {
 	/**
 	 * Gets whether the contents of the column being dragged will get hidden. The option is only
 	 * relevant in immediate moving mode.
+	 *
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "hideHeaderContentsDuringDrag"): boolean;
 
@@ -81620,6 +95748,7 @@ interface JQuery {
 	 * Sets whether the contents of the column being dragged will get hidden. The option is only
 	 * relevant in immediate moving mode.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "hideHeaderContentsDuringDrag", optionValue: boolean): void;
@@ -81628,6 +95757,7 @@ interface JQuery {
 	 * Gets the opacity of the drag markup, while a column header is being dragged.
 	 * The value must be between 0 and 1. When GroupBy is enabled, the corresponding option in the GroupBy configuration
 	 * will be used with priority over this one.
+	 *
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "dragHelperOpacity"): number;
 
@@ -81636,6 +95766,7 @@ interface JQuery {
 	 * The value must be between 0 and 1. When GroupBy is enabled, the corresponding option in the GroupBy configuration
 	 * will be used with priority over this one.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "dragHelperOpacity", optionValue: number): void;
@@ -81798,12 +95929,14 @@ interface JQuery {
 
 	/**
 	 * Gets markup for drop tooltip in column moving dialog
+	 *
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "movingDialogDropTooltipMarkup"): string;
 
 	/**
 	 * Sets markup for drop tooltip in column moving dialog
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "movingDialogDropTooltipMarkup", optionValue: string): void;
@@ -81828,27 +95961,17 @@ interface JQuery {
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog.
+	 *
 	 */
 	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "dialogWidget"): string;
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog.
 	 *
-	 * @optionValue New value to be set.
-	 */
-	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "dialogWidget", optionValue: string): void;
-
-	/**
-	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
-	 */
-	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "inherit"): boolean;
-
-	/**
-	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
 	 *
 	 * @optionValue New value to be set.
 	 */
-	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "inherit", optionValue: boolean): void;
+	igTreeGridColumnMoving(optionLiteral: 'option', optionName: "dialogWidget", optionValue: string): void;
 
 	/**
 	 * Event which is fired when a drag operation begins on a column header
@@ -82056,6 +96179,7 @@ interface IgTreeGridFilteringLocale {
 	 * ${startRecord} (paging)
 	 * ${endRecord} (paging)
 	 * ${recordCount} (paging)
+	 *
 	 */
 	filterSummaryInPagerTemplate?: string;
 
@@ -82068,21 +96192,25 @@ interface IgTreeGridFilteringLocale {
 interface IgTreeGridFiltering {
 	/**
 	 * The property in the response that will hold the total number of records in the data source
+	 *
 	 */
 	recordCountKey?: string;
 
 	/**
 	 * Specifies from which data bound level to be applied filtering - 0 is the first level
+	 *
 	 */
 	fromLevel?: number;
 
 	/**
 	 * Specifies to which data bound level to be applied filtering - if -1 filtering should be applied to the last data bound level
+	 *
 	 */
 	toLevel?: number;
 
 	/**
 	 * If displayMode is showWithAncestorsAndDescendants, show all records that match filtering conditions and their child records, even if child records don"t match filtering conditions. If displayMode is showWithAncestors show only those records that match filtering conditions and do not show child records(if any) that don"t match filtering conditions
+	 *
 	 */
 	displayMode?: any;
 
@@ -82090,6 +96218,7 @@ interface IgTreeGridFiltering {
 	 * Specifies the name of a boolean property in the dataRecord object that indicates whether the dataRow matches the filtering conditions.
 	 * When filtering a boolean flag  with the specified name is added on each data record object with a value of true if it matches the condition or false if it doesn"t.
 	 * This is used mainly for internal purposes.
+	 *
 	 */
 	matchFiltering?: string;
 
@@ -82107,8 +96236,14 @@ interface IgTreeGridFiltering {
 	filterSummaryInPagerTemplate?: string;
 	locale?: IgTreeGridFilteringLocale;
 
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for the igTreeGrid.
+	 */
+	inherit?: boolean;
+
 	/**
 	 * Enables or disables the filtering case sensitivity. Works only for local filtering. If true, it case sensitive filtering is performed. If false, filtering is case insensitive.
+	 *
 	 */
 	caseSensitive?: boolean;
 
@@ -82116,11 +96251,13 @@ interface IgTreeGridFiltering {
 	 * Enable/disable footer visibility with summary info about the filter.
 	 * When false, the filter summary row (in the footer) will only be visible when paging is enabled (or some other feature that renders a footer).
 	 * When true, the filter summary row will only be visible when a filter is applied i.e. it's not visible by default.
+	 *
 	 */
 	filterSummaryAlwaysVisible?: boolean;
 
 	/**
 	 * Render in [Feature Chooser](http://www.igniteui.com/help/iggrid-feature-chooser)
+	 *
 	 */
 	renderFC?: boolean;
 
@@ -82133,6 +96270,7 @@ interface IgTreeGridFiltering {
 	/**
 	 * Type of animations for the column filter dropdowns.
 	 *
+	 *
 	 * Valid values:
 	 * "linear" The column filtering drop downs are shown with a linear animation.
 	 * "none" No animation is used when showing the filtering drop downs.
@@ -82141,12 +96279,14 @@ interface IgTreeGridFiltering {
 
 	/**
 	 * Animation duration in milliseconds for the [filterDropDownAnimations](ui.iggridfiltering#options:filterDropDownAnimations).
+	 *
 	 */
 	filterDropDownAnimationDuration?: number;
 
 	/**
 	 * Width of the column filter dropdowns.
 	 *
+	 *
 	 * Valid values:
 	 * "string" The width in pixels (0px)
 	 * "number" The width in pixels as a number (0)
@@ -82163,12 +96303,14 @@ interface IgTreeGridFiltering {
 
 	/**
 	 * URL key name that specifies how the filtering expressions will be encoded for remote requests, e.g. &filter('col') = startsWith. Default is OData.
+	 *
 	 */
 	filterExprUrlKey?: string;
 
 	/**
 	 * Enable/disable filter icons visibility.
 	 *
+	 *
 	 * Valid values:
 	 * "true" All predefined filters in the filter dropdowns will have icons rendered in front of the text.
 	 * "false" No icons will be rendered.
@@ -82177,12 +96319,14 @@ interface IgTreeGridFiltering {
 
 	/**
 	 * A list of column settings that specifies custom filtering options on a per column basis.
+	 *
 	 */
 	columnSettings?: IgGridFilteringColumnSetting[];
 
 	/**
 	 * Type of filtering. Delegates all filtering functionality to the [$.ig.DataSource](ig.datasource).
 	 *
+	 *
 	 * Valid values:
 	 * "remote" Filtering is performed by a remote end-point.
 	 * "local" Filtering is performed locally by the [$.ig.DataSource](ig.datasource).
@@ -82191,12 +96335,14 @@ interface IgTreeGridFiltering {
 
 	/**
 	 * Time in milliseconds for which widget will wait between keystrokes before sending filtering requests.
+	 *
 	 */
 	filterDelay?: number;
 
 	/**
 	 * Default is 'simple' for non-virtualized grids, and 'advanced' when [virtualization](ui.iggrid#options:virtualization) is enabled.
 	 *
+	 *
 	 * Valid values:
 	 * "simple" Renders just a filter row.
 	 * "advanced" Allows to configure multiple filters from a dialog - Excel style.
@@ -82205,12 +96351,14 @@ interface IgTreeGridFiltering {
 
 	/**
 	 * Defines whether to render editors in advanced [mode](ui.iggridfiltering#options:mode). If false, no editors will be rendered in the advanced [mode](ui.iggridfiltering#options:mode).
+	 *
 	 */
 	advancedModeEditorsVisible?: boolean;
 
 	/**
 	 * Location of the advanced filtering button when [advancedModeEditorsVisible](ui.iggridfiltering#options:advancedModeEditorsVisible) is false (i.e. when the button is rendered in the header).
 	 *
+	 *
 	 * Valid values:
 	 * "left"
 	 * "right"
@@ -82220,6 +96368,7 @@ interface IgTreeGridFiltering {
 	/**
 	 * Default filter dialog width (used for Advanced filtering [mode](ui.iggridfiltering#options:mode)).
 	 *
+	 *
 	 * Valid values:
 	 * "string" The dialog window width in pixels (370px).
 	 * "number" The dialog window width in pixels as a number (370).
@@ -82229,6 +96378,7 @@ interface IgTreeGridFiltering {
 	/**
 	 * default filter dialog height (used for Advanced filtering [mode](ui.iggridfiltering#options:mode)).
 	 *
+	 *
 	 * Valid values:
 	 * "string" The dialog window height in pixels (350px).
 	 * "number" The dialog window height in pixels as a number (350).
@@ -82238,6 +96388,7 @@ interface IgTreeGridFiltering {
 	/**
 	 * Width of the filtering condition dropdowns in the advanced filter dialog.
 	 *
+	 *
 	 * Valid values:
 	 * "string" The filtering condition dropdowns width in pixels (80px).
 	 * "number" The filtering condition dropdowns width in pixels as a number (80).
@@ -82247,6 +96398,7 @@ interface IgTreeGridFiltering {
 	/**
 	 * Width of the filtering expression input boxes in the advanced filter dialog.
 	 *
+	 *
 	 * Valid values:
 	 * "string" The filtering expression input boxes width in pixels (80px).
 	 * "number" The filtering expression input boxes width in pixels as a number (80).
@@ -82256,6 +96408,7 @@ interface IgTreeGridFiltering {
 	/**
 	 * Width of the column chooser dropdowns in the advanced filter dialog.
 	 *
+	 *
 	 * Valid values:
 	 * "string" The column chooser dropdowns width in pixels (80px).
 	 * "number" The column chooser dropdowns width in pixels  as a number (80).
@@ -82264,12 +96417,14 @@ interface IgTreeGridFiltering {
 
 	/**
 	 * Enable/disable filter button visibility. If false, no filter dropdown buttons will be rendered and a predefined list of filters will not be rendered for the columns.
+	 *
 	 */
 	renderFilterButton?: boolean;
 
 	/**
 	 * The filtering button for filter dropdowns can be rendered either on the left of the filter editor, or on the right.
 	 *
+	 *
 	 * Valid values:
 	 * "left" The button is rendered on the left.
 	 * "right" The button is rendered on the right.
@@ -82314,11 +96469,13 @@ interface IgTreeGridFiltering {
 
 	/**
 	 * Custom template for add condition area in the filter dialog. The default template is "<div><span>${label1}</span><div><select></select></div><span>${label2}</span></div>".
+	 *
 	 */
 	filterDialogAddConditionTemplate?: string;
 
 	/**
 	 * Custom template for options in dropdown in add condition area in the filter dialog. The default template is "<option value='${value}'>${text}</option>".
+	 *
 	 */
 	filterDialogAddConditionDropDownTemplate?: string;
 
@@ -82328,17 +96485,20 @@ interface IgTreeGridFiltering {
 	 * E.g.: DOM element used for selecting column has attribute "data-af-col", for selecting filter condition - "data-af-cond", for filter expression- "data-af-expr".
 	 * NOTE: The template is supported only with <tr />.
 	 * The default template is "<tr data-af-row><td><input data-af-col/></td><td><select data-af-cond></select></td><td><input data-af-expr /> </td><td><span data-af-rmv></span></td></tr>".
+	 *
 	 */
 	filterDialogFilterTemplate?: string;
 
 	/**
 	 * Custom template for options in condition list in filter dialog. The default template is "<option value='${condition}'>${text}</option>".
+	 *
 	 */
 	filterDialogFilterConditionTemplate?: string;
 
 	/**
 	 * Add button width - in the advanced filter dialog.
 	 *
+	 *
 	 * Valid values:
 	 * "string" The dialog Add button width in pixels (100px).
 	 * "number" The dialog Add button width in pixels as a number (100).
@@ -82348,6 +96508,7 @@ interface IgTreeGridFiltering {
 	/**
 	 * Width of the Ok and Cancel buttons in the advanced filtering dialogs.
 	 *
+	 *
 	 * Valid values:
 	 * "string" The advanced filter dialog Ok and Cancel buttons width in pixels (120px).
 	 * "number" The advanced filter dialog Ok and Cancel buttons width in pixels as a number (120).
@@ -82356,6 +96517,7 @@ interface IgTreeGridFiltering {
 
 	/**
 	 * Maximum number of filter rows in the advanced filtering dialog. If this number is exceeded, an error message will be rendered.
+	 *
 	 */
 	filterDialogMaxFilterCount?: number;
 
@@ -82369,28 +96531,114 @@ interface IgTreeGridFiltering {
 
 	/**
 	 * Enable/disable empty condition visibility in the filter. If true, shows empty and not empty filtering conditions in the dropdowns.
+	 *
 	 */
 	showEmptyConditions?: boolean;
 
 	/**
 	 * Enable/disable visibility of null and not null filtering conditions in the dropdowns. If true, shows null and not null filtering conditions in the dropdowns.
+	 *
 	 */
 	showNullConditions?: boolean;
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog.
+	 *
 	 */
 	dialogWidget?: string;
 
 	/**
 	 * Enables/disables filtering persistence between states.
+	 *
 	 */
 	persist?: boolean;
 
 	/**
-	 * Enables/disables feature inheritance for the child [layouts](ui.ighierarchicalgrid#options:columnLayouts). NOTE: It only applies for [igHierarchicalGrid](ui.ighierarchicalgrid).
+	 * Event fired before a filtering operation is executed (remote request or local).
+	 * Return false in order to cancel filtering operation.
 	 */
-	inherit?: boolean;
+	dataFiltering?: DataFilteringEvent;
+
+	/**
+	 * Event fired after the filtering has been executed and results are rendered.
+	 */
+	dataFiltered?: DataFilteredEvent;
+
+	/**
+	 * Event fired before the filter dropdown is opened for a specific column.
+	 * Return false in order to cancel dropdown opening.
+	 */
+	dropDownOpening?: DropDownOpeningEvent;
+
+	/**
+	 * Event fired after the filter dropdown is opened for a specific column.
+	 */
+	dropDownOpened?: DropDownOpenedEvent;
+
+	/**
+	 * Event fired before the filter dropdown starts closing.
+	 * Return false in order to cancel dropdown closing.
+	 */
+	dropDownClosing?: DropDownClosingEvent;
+
+	/**
+	 * Event fired after a filter column dropdown is completely closed.
+	 */
+	dropDownClosed?: DropDownClosedEvent;
+
+	/**
+	 * Event fired before the advanced filtering dialog is opened.
+	 * Return false in order to cancel filter dialog opening.
+	 */
+	filterDialogOpening?: FilterDialogOpeningEvent;
+
+	/**
+	 * Event fired after the advanced filter dialog is already opened.
+	 */
+	filterDialogOpened?: FilterDialogOpenedEvent;
+
+	/**
+	 * Event fired every time the advanced filter dialog changes its position.
+	 */
+	filterDialogMoving?: FilterDialogMovingEvent;
+
+	/**
+	 * Event fired before a filter row is added to the advanced filter dialog.
+	 * Return false in order to cancel filter adding to the advanced filtering dialog.
+	 */
+	filterDialogFilterAdding?: FilterDialogFilterAddingEvent;
+
+	/**
+	 * Event fired after a filter row is added to the advanced filter dialog.
+	 */
+	filterDialogFilterAdded?: FilterDialogFilterAddedEvent;
+
+	/**
+	 * Event fired before the advanced filter dialog is closed.
+	 * Return false in order to cancel filtering dialog closing.
+	 */
+	filterDialogClosing?: FilterDialogClosingEvent;
+
+	/**
+	 * Event fired after the advanced filter dialog has been closed.
+	 */
+	filterDialogClosed?: FilterDialogClosedEvent;
+
+	/**
+	 * Event fired before the contents of the advanced filter dialog are rendered.
+	 * Return false in order to cancel filtering dialog rendering.
+	 */
+	filterDialogContentsRendering?: FilterDialogContentsRenderingEvent;
+
+	/**
+	 * Event fired after the contents of the advanced filter dialog are rendered.
+	 */
+	filterDialogContentsRendered?: FilterDialogContentsRenderedEvent;
+
+	/**
+	 * Event fired when the OK button in the advanced filter dialog is pressed.
+	 */
+	filterDialogFiltering?: FilterDialogFilteringEvent;
 
 	/**
 	 * Option for igTreeGridFiltering
@@ -82403,6 +96651,43 @@ interface IgTreeGridFilteringMethods {
 	 */
 	getFilteringMatchesCount(): number;
 	destroy(): void;
+	changeGlobalLanguage(): void;
+	changeGlobalRegional(): void;
+
+	/**
+	 * Changes the all locales into the widget element to the language specified in [options.language](ui.iggridfiltering#options:language)
+	 * Note that this method is for rare scenarios, see [language](ui.iggridfiltering#options:language) or [locale](ui.iggridfiltering#options:locale) option setter
+	 */
+	changeLocale(): void;
+
+	/**
+	 * Changes the the regional settings of widget element to the language specified in [options.regional](ui.iggridfiltering#options:regional)
+	 * Note that this method is for rare scenarios, use [regional](ui.iggridfiltering#options:regional) option setter
+	 */
+	changeRegional(): void;
+
+	/**
+	 * Toggle filter row when mode is simple or [advancedModeEditorsVisible](ui.iggridfiltering#options:advancedModeEditorsVisible) is true. Otherwise show/hide advanced dialog.
+	 *
+	 * @param event Column key
+	 */
+	toggleFilterRowByFeatureChooser(event: string): void;
+
+	/**
+	 * Applies filtering programmatically and updates the UI by default.
+	 *
+	 * @param expressions An array of filtering expressions, each one having the format {fieldName: , expr: , cond: , logic: } where  fieldName is the key of the column, expr is the actual expression string with which we would like to filter, logic is 'AND' or 'OR', and cond is one of the following strings: "equals", "doesNotEqual", "contains", "doesNotContain", "greaterThan", "lessThan", "greaterThanOrEqualTo", "lessThanOrEqualTo", "true", "false", "null", "notNull", "empty", "notEmpty", "startsWith", "endsWith", "today", "yesterday", "on", "notOn", "thisMonth", "lastMonth", "nextMonth", "before", "after", "thisYear", "lastYear", "nextYear". The difference between the empty and null filtering conditions is that empty includes null, NaN, and undefined, as well as the empty string.
+	 * @param updateUI specifies whether the filter row should be also updated once the grid is filtered
+	 * @param addedFromAdvanced
+	 */
+	filter(expressions: any[], updateUI?: boolean, addedFromAdvanced?: boolean): void;
+
+	/**
+	 * Check whether filterCondition requires or not filtering expression - e.g. if filterCondition is "lastMonth", "thisMonth", "null", "notNull", "true", "false", etc. then filtering expression is NOT required
+	 *
+	 * @param filterCondition filtering condition - e.g. "true", "false",  "yesterday", "empty", "null", etc.
+	 */
+	requiresFilteringExpression(filterCondition: string): boolean;
 }
 interface JQuery {
 	data(propertyName: "igTreeGridFiltering"): IgTreeGridFilteringMethods;
@@ -82411,51 +96696,66 @@ interface JQuery {
 interface JQuery {
 	igTreeGridFiltering(methodName: "getFilteringMatchesCount"): number;
 	igTreeGridFiltering(methodName: "destroy"): void;
+	igTreeGridFiltering(methodName: "changeGlobalLanguage"): void;
+	igTreeGridFiltering(methodName: "changeGlobalRegional"): void;
+	igTreeGridFiltering(methodName: "changeLocale"): void;
+	igTreeGridFiltering(methodName: "changeRegional"): void;
+	igTreeGridFiltering(methodName: "toggleFilterRowByFeatureChooser", event: string): void;
+	igTreeGridFiltering(methodName: "filter", expressions: any[], updateUI?: boolean, addedFromAdvanced?: boolean): void;
+	igTreeGridFiltering(methodName: "requiresFilteringExpression", filterCondition: string): boolean;
 
 	/**
 	 * The property in the response that will hold the total number of records in the data source
+	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "recordCountKey"): string;
 
 	/**
 	 * The property in the response that will hold the total number of records in the data source
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "recordCountKey", optionValue: string): void;
 
 	/**
 	 * Specifies from which data bound level to be applied filtering - 0 is the first level
+	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "fromLevel"): number;
 
 	/**
 	 * Specifies from which data bound level to be applied filtering - 0 is the first level
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "fromLevel", optionValue: number): void;
 
 	/**
 	 * Specifies to which data bound level to be applied filtering - if -1 filtering should be applied to the last data bound level
+	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "toLevel"): number;
 
 	/**
 	 * Specifies to which data bound level to be applied filtering - if -1 filtering should be applied to the last data bound level
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "toLevel", optionValue: number): void;
 
 	/**
 	 * If displayMode is showWithAncestorsAndDescendants, show all records that match filtering conditions and their child records, even if child records don"t match filtering conditions. If displayMode is showWithAncestors show only those records that match filtering conditions and do not show child records(if any) that don"t match filtering conditions
+	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "displayMode"): any;
 
 	/**
 	 * If displayMode is showWithAncestorsAndDescendants, show all records that match filtering conditions and their child records, even if child records don"t match filtering conditions. If displayMode is showWithAncestors show only those records that match filtering conditions and do not show child records(if any) that don"t match filtering conditions
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "displayMode", optionValue: any): void;
@@ -82464,6 +96764,7 @@ interface JQuery {
 	 * Gets the name of a boolean property in the dataRecord object that indicates whether the dataRow matches the filtering conditions.
 	 * When filtering a boolean flag  with the specified name is added on each data record object with a value of true if it matches the condition or false if it doesn"t.
 	 * This is used mainly for internal purposes.
+	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "matchFiltering"): string;
 
@@ -82472,6 +96773,7 @@ interface JQuery {
 	 * When filtering a boolean flag  with the specified name is added on each data record object with a value of true if it matches the condition or false if it doesn"t.
 	 * This is used mainly for internal purposes.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "matchFiltering", optionValue: string): void;
@@ -82506,14 +96808,28 @@ interface JQuery {
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "locale"): IgTreeGridFilteringLocale;
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "locale", optionValue: IgTreeGridFilteringLocale): void;
 
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for the igTreeGrid.
+	 */
+	igTreeGridFiltering(optionLiteral: 'option', optionName: "inherit"): boolean;
+
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for the igTreeGrid.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTreeGridFiltering(optionLiteral: 'option', optionName: "inherit", optionValue: boolean): void;
+
 	/**
 	 * Enables or disables the filtering case sensitivity. Works only for local filtering. If true, it case sensitive filtering is performed. If false, filtering is case insensitive.
+	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "caseSensitive"): boolean;
 
 	/**
 	 * Enables or disables the filtering case sensitivity. Works only for local filtering. If true, it case sensitive filtering is performed. If false, filtering is case insensitive.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "caseSensitive", optionValue: boolean): void;
@@ -82522,6 +96838,7 @@ interface JQuery {
 	 * Enable/disable footer visibility with summary info about the filter.
 	 * When false, the filter summary row (in the footer) will only be visible when paging is enabled (or some other feature that renders a footer).
 	 * When true, the filter summary row will only be visible when a filter is applied i.e. it's not visible by default.
+	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterSummaryAlwaysVisible"): boolean;
 
@@ -82530,18 +96847,21 @@ interface JQuery {
 	 * When false, the filter summary row (in the footer) will only be visible when paging is enabled (or some other feature that renders a footer).
 	 * When true, the filter summary row will only be visible when a filter is applied i.e. it's not visible by default.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterSummaryAlwaysVisible", optionValue: boolean): void;
 
 	/**
 	 * Render in [Feature Chooser](http://www.igniteui.com/help/iggrid-feature-chooser)
+	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "renderFC"): boolean;
 
 	/**
 	 * Render in [Feature Chooser](http://www.igniteui.com/help/iggrid-feature-chooser)
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "renderFC", optionValue: boolean): void;
@@ -82562,6 +96882,7 @@ interface JQuery {
 
 	/**
 	 * Type of animations for the column filter dropdowns.
+	 *
 	 */
 
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDropDownAnimations"): string;
@@ -82569,6 +96890,7 @@ interface JQuery {
 	/**
 	 * Type of animations for the column filter dropdowns.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -82576,18 +96898,21 @@ interface JQuery {
 
 	/**
 	 * Animation duration in milliseconds for the [filterDropDownAnimations](ui.iggridfiltering#options:filterDropDownAnimations).
+	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDropDownAnimationDuration"): number;
 
 	/**
 	 * Animation duration in milliseconds for the [filterDropDownAnimations](ui.iggridfiltering#options:filterDropDownAnimations).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDropDownAnimationDuration", optionValue: number): void;
 
 	/**
 	 * Width of the column filter dropdowns.
+	 *
 	 */
 
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDropDownWidth"): string|number;
@@ -82595,6 +96920,7 @@ interface JQuery {
 	/**
 	 * Width of the column filter dropdowns.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -82620,18 +96946,21 @@ interface JQuery {
 
 	/**
 	 * URL key name that specifies how the filtering expressions will be encoded for remote requests, e.g. &filter('col') = startsWith. Default is OData.
+	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterExprUrlKey"): string;
 
 	/**
 	 * URL key name that specifies how the filtering expressions will be encoded for remote requests, e.g. &filter('col') = startsWith. Default is OData.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterExprUrlKey", optionValue: string): void;
 
 	/**
 	 * Enable/disable filter icons visibility.
+	 *
 	 */
 
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDropDownItemIcons"): boolean;
@@ -82639,6 +96968,7 @@ interface JQuery {
 	/**
 	 * Enable/disable filter icons visibility.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -82646,18 +96976,21 @@ interface JQuery {
 
 	/**
 	 * A list of column settings that specifies custom filtering options on a per column basis.
+	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "columnSettings"): IgGridFilteringColumnSetting[];
 
 	/**
 	 * A list of column settings that specifies custom filtering options on a per column basis.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "columnSettings", optionValue: IgGridFilteringColumnSetting[]): void;
 
 	/**
 	 * Type of filtering. Delegates all filtering functionality to the [$.ig.DataSource](ig.datasource).
+	 *
 	 */
 
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "type"): string;
@@ -82665,6 +96998,7 @@ interface JQuery {
 	/**
 	 * Type of filtering. Delegates all filtering functionality to the [$.ig.DataSource](ig.datasource).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -82672,18 +97006,21 @@ interface JQuery {
 
 	/**
 	 * Time in milliseconds for which widget will wait between keystrokes before sending filtering requests.
+	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDelay"): number;
 
 	/**
 	 * Time in milliseconds for which widget will wait between keystrokes before sending filtering requests.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDelay", optionValue: number): void;
 
 	/**
 	 * Default is 'simple' for non-virtualized grids, and 'advanced' when [virtualization](ui.iggrid#options:virtualization) is enabled.
+	 *
 	 */
 
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "mode"): string;
@@ -82691,6 +97028,7 @@ interface JQuery {
 	/**
 	 * Default is 'simple' for non-virtualized grids, and 'advanced' when [virtualization](ui.iggrid#options:virtualization) is enabled.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -82698,18 +97036,21 @@ interface JQuery {
 
 	/**
 	 * Defines whether to render editors in advanced [mode](ui.iggridfiltering#options:mode). If false, no editors will be rendered in the advanced [mode](ui.iggridfiltering#options:mode).
+	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "advancedModeEditorsVisible"): boolean;
 
 	/**
 	 * Defines whether to render editors in advanced [mode](ui.iggridfiltering#options:mode). If false, no editors will be rendered in the advanced [mode](ui.iggridfiltering#options:mode).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "advancedModeEditorsVisible", optionValue: boolean): void;
 
 	/**
 	 * Location of the advanced filtering button when [advancedModeEditorsVisible](ui.iggridfiltering#options:advancedModeEditorsVisible) is false (i.e. when the button is rendered in the header).
+	 *
 	 */
 
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "advancedModeHeaderButtonLocation"): string;
@@ -82717,6 +97058,7 @@ interface JQuery {
 	/**
 	 * Location of the advanced filtering button when [advancedModeEditorsVisible](ui.iggridfiltering#options:advancedModeEditorsVisible) is false (i.e. when the button is rendered in the header).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -82724,6 +97066,7 @@ interface JQuery {
 
 	/**
 	 * Default filter dialog width (used for Advanced filtering [mode](ui.iggridfiltering#options:mode)).
+	 *
 	 */
 
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogWidth"): string|number;
@@ -82731,6 +97074,7 @@ interface JQuery {
 	/**
 	 * Default filter dialog width (used for Advanced filtering [mode](ui.iggridfiltering#options:mode)).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -82738,6 +97082,7 @@ interface JQuery {
 
 	/**
 	 * Default filter dialog height (used for Advanced filtering [mode](ui.iggridfiltering#options:mode)).
+	 *
 	 */
 
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogHeight"): string|number;
@@ -82745,6 +97090,7 @@ interface JQuery {
 	/**
 	 * Default filter dialog height (used for Advanced filtering [mode](ui.iggridfiltering#options:mode)).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -82752,6 +97098,7 @@ interface JQuery {
 
 	/**
 	 * Width of the filtering condition dropdowns in the advanced filter dialog.
+	 *
 	 */
 
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogFilterDropDownDefaultWidth"): string|number;
@@ -82759,6 +97106,7 @@ interface JQuery {
 	/**
 	 * Width of the filtering condition dropdowns in the advanced filter dialog.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -82766,6 +97114,7 @@ interface JQuery {
 
 	/**
 	 * Width of the filtering expression input boxes in the advanced filter dialog.
+	 *
 	 */
 
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogExprInputDefaultWidth"): string|number;
@@ -82773,6 +97122,7 @@ interface JQuery {
 	/**
 	 * Width of the filtering expression input boxes in the advanced filter dialog.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -82780,6 +97130,7 @@ interface JQuery {
 
 	/**
 	 * Width of the column chooser dropdowns in the advanced filter dialog.
+	 *
 	 */
 
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogColumnDropDownDefaultWidth"): string|number;
@@ -82787,6 +97138,7 @@ interface JQuery {
 	/**
 	 * Width of the column chooser dropdowns in the advanced filter dialog.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -82794,18 +97146,21 @@ interface JQuery {
 
 	/**
 	 * Enable/disable filter button visibility. If false, no filter dropdown buttons will be rendered and a predefined list of filters will not be rendered for the columns.
+	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "renderFilterButton"): boolean;
 
 	/**
 	 * Enable/disable filter button visibility. If false, no filter dropdown buttons will be rendered and a predefined list of filters will not be rendered for the columns.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "renderFilterButton", optionValue: boolean): void;
 
 	/**
 	 * The filtering button for filter dropdowns can be rendered either on the left of the filter editor, or on the right.
+	 *
 	 */
 
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterButtonLocation"): string;
@@ -82813,6 +97168,7 @@ interface JQuery {
 	/**
 	 * The filtering button for filter dropdowns can be rendered either on the left of the filter editor, or on the right.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -82904,24 +97260,28 @@ interface JQuery {
 
 	/**
 	 * Custom template for add condition area in the filter dialog. The default template is "<div><span>${label1}</span><div><select></select></div><span>${label2}</span></div>".
+	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogAddConditionTemplate"): string;
 
 	/**
 	 * Custom template for add condition area in the filter dialog. The default template is "<div><span>${label1}</span><div><select></select></div><span>${label2}</span></div>".
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogAddConditionTemplate", optionValue: string): void;
 
 	/**
 	 * Custom template for options in dropdown in add condition area in the filter dialog. The default template is "<option value='${value}'>${text}</option>".
+	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogAddConditionDropDownTemplate"): string;
 
 	/**
 	 * Custom template for options in dropdown in add condition area in the filter dialog. The default template is "<option value='${value}'>${text}</option>".
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogAddConditionDropDownTemplate", optionValue: string): void;
@@ -82932,6 +97292,7 @@ interface JQuery {
 	 * E.g.: DOM element used for selecting column has attribute "data-af-col", for selecting filter condition - "data-af-cond", for filter expression- "data-af-expr".
 	 * NOTE: The template is supported only with <tr />.
 	 * The default template is "<tr data-af-row><td><input data-af-col/></td><td><select data-af-cond></select></td><td><input data-af-expr /> </td><td><span data-af-rmv></span></td></tr>".
+	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogFilterTemplate"): string;
 
@@ -82942,24 +97303,28 @@ interface JQuery {
 	 * NOTE: The template is supported only with <tr />.
 	 * The default template is "<tr data-af-row><td><input data-af-col/></td><td><select data-af-cond></select></td><td><input data-af-expr /> </td><td><span data-af-rmv></span></td></tr>".
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogFilterTemplate", optionValue: string): void;
 
 	/**
 	 * Custom template for options in condition list in filter dialog. The default template is "<option value='${condition}'>${text}</option>".
+	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogFilterConditionTemplate"): string;
 
 	/**
 	 * Custom template for options in condition list in filter dialog. The default template is "<option value='${condition}'>${text}</option>".
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogFilterConditionTemplate", optionValue: string): void;
 
 	/**
 	 * Add button width - in the advanced filter dialog.
+	 *
 	 */
 
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogAddButtonWidth"): string|number;
@@ -82967,6 +97332,7 @@ interface JQuery {
 	/**
 	 * Add button width - in the advanced filter dialog.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -82974,6 +97340,7 @@ interface JQuery {
 
 	/**
 	 * Width of the Ok and Cancel buttons in the advanced filtering dialogs.
+	 *
 	 */
 
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogOkCancelButtonWidth"): string|number;
@@ -82981,6 +97348,7 @@ interface JQuery {
 	/**
 	 * Width of the Ok and Cancel buttons in the advanced filtering dialogs.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -82988,12 +97356,14 @@ interface JQuery {
 
 	/**
 	 * Maximum number of filter rows in the advanced filtering dialog. If this number is exceeded, an error message will be rendered.
+	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogMaxFilterCount"): number;
 
 	/**
 	 * Maximum number of filter rows in the advanced filtering dialog. If this number is exceeded, an error message will be rendered.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogMaxFilterCount", optionValue: number): void;
@@ -83018,63 +97388,265 @@ interface JQuery {
 
 	/**
 	 * Enable/disable empty condition visibility in the filter. If true, shows empty and not empty filtering conditions in the dropdowns.
+	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "showEmptyConditions"): boolean;
 
 	/**
 	 * Enable/disable empty condition visibility in the filter. If true, shows empty and not empty filtering conditions in the dropdowns.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "showEmptyConditions", optionValue: boolean): void;
 
 	/**
 	 * Enable/disable visibility of null and not null filtering conditions in the dropdowns. If true, shows null and not null filtering conditions in the dropdowns.
+	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "showNullConditions"): boolean;
 
 	/**
 	 * Enable/disable visibility of null and not null filtering conditions in the dropdowns. If true, shows null and not null filtering conditions in the dropdowns.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "showNullConditions", optionValue: boolean): void;
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog.
+	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "dialogWidget"): string;
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "dialogWidget", optionValue: string): void;
 
 	/**
 	 * Enables/disables filtering persistence between states.
+	 *
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "persist"): boolean;
 
 	/**
 	 * Enables/disables filtering persistence between states.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridFiltering(optionLiteral: 'option', optionName: "persist", optionValue: boolean): void;
 
 	/**
-	 * Enables/disables feature inheritance for the child [layouts](ui.ighierarchicalgrid#options:columnLayouts). NOTE: It only applies for [igHierarchicalGrid](ui.ighierarchicalgrid).
+	 * Event fired before a filtering operation is executed (remote request or local).
+	 * Return false in order to cancel filtering operation.
 	 */
-	igTreeGridFiltering(optionLiteral: 'option', optionName: "inherit"): boolean;
+	igTreeGridFiltering(optionLiteral: 'option', optionName: "dataFiltering"): DataFilteringEvent;
 
 	/**
-	 * Enables/disables feature inheritance for the child [layouts](ui.ighierarchicalgrid#options:columnLayouts). NOTE: It only applies for [igHierarchicalGrid](ui.ighierarchicalgrid).
+	 * Event fired before a filtering operation is executed (remote request or local).
+	 * Return false in order to cancel filtering operation.
 	 *
-	 * @optionValue New value to be set.
+	 * @optionValue Define event handler function.
 	 */
-	igTreeGridFiltering(optionLiteral: 'option', optionName: "inherit", optionValue: boolean): void;
+	igTreeGridFiltering(optionLiteral: 'option', optionName: "dataFiltering", optionValue: DataFilteringEvent): void;
+
+	/**
+	 * Event fired after the filtering has been executed and results are rendered.
+	 */
+	igTreeGridFiltering(optionLiteral: 'option', optionName: "dataFiltered"): DataFilteredEvent;
+
+	/**
+	 * Event fired after the filtering has been executed and results are rendered.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igTreeGridFiltering(optionLiteral: 'option', optionName: "dataFiltered", optionValue: DataFilteredEvent): void;
+
+	/**
+	 * Event fired before the filter dropdown is opened for a specific column.
+	 * Return false in order to cancel dropdown opening.
+	 */
+	igTreeGridFiltering(optionLiteral: 'option', optionName: "dropDownOpening"): DropDownOpeningEvent;
+
+	/**
+	 * Event fired before the filter dropdown is opened for a specific column.
+	 * Return false in order to cancel dropdown opening.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igTreeGridFiltering(optionLiteral: 'option', optionName: "dropDownOpening", optionValue: DropDownOpeningEvent): void;
+
+	/**
+	 * Event fired after the filter dropdown is opened for a specific column.
+	 */
+	igTreeGridFiltering(optionLiteral: 'option', optionName: "dropDownOpened"): DropDownOpenedEvent;
+
+	/**
+	 * Event fired after the filter dropdown is opened for a specific column.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igTreeGridFiltering(optionLiteral: 'option', optionName: "dropDownOpened", optionValue: DropDownOpenedEvent): void;
+
+	/**
+	 * Event fired before the filter dropdown starts closing.
+	 * Return false in order to cancel dropdown closing.
+	 */
+	igTreeGridFiltering(optionLiteral: 'option', optionName: "dropDownClosing"): DropDownClosingEvent;
+
+	/**
+	 * Event fired before the filter dropdown starts closing.
+	 * Return false in order to cancel dropdown closing.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igTreeGridFiltering(optionLiteral: 'option', optionName: "dropDownClosing", optionValue: DropDownClosingEvent): void;
+
+	/**
+	 * Event fired after a filter column dropdown is completely closed.
+	 */
+	igTreeGridFiltering(optionLiteral: 'option', optionName: "dropDownClosed"): DropDownClosedEvent;
+
+	/**
+	 * Event fired after a filter column dropdown is completely closed.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igTreeGridFiltering(optionLiteral: 'option', optionName: "dropDownClosed", optionValue: DropDownClosedEvent): void;
+
+	/**
+	 * Event fired before the advanced filtering dialog is opened.
+	 * Return false in order to cancel filter dialog opening.
+	 */
+	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogOpening"): FilterDialogOpeningEvent;
+
+	/**
+	 * Event fired before the advanced filtering dialog is opened.
+	 * Return false in order to cancel filter dialog opening.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogOpening", optionValue: FilterDialogOpeningEvent): void;
+
+	/**
+	 * Event fired after the advanced filter dialog is already opened.
+	 */
+	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogOpened"): FilterDialogOpenedEvent;
+
+	/**
+	 * Event fired after the advanced filter dialog is already opened.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogOpened", optionValue: FilterDialogOpenedEvent): void;
+
+	/**
+	 * Event fired every time the advanced filter dialog changes its position.
+	 */
+	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogMoving"): FilterDialogMovingEvent;
+
+	/**
+	 * Event fired every time the advanced filter dialog changes its position.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogMoving", optionValue: FilterDialogMovingEvent): void;
+
+	/**
+	 * Event fired before a filter row is added to the advanced filter dialog.
+	 * Return false in order to cancel filter adding to the advanced filtering dialog.
+	 */
+	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogFilterAdding"): FilterDialogFilterAddingEvent;
+
+	/**
+	 * Event fired before a filter row is added to the advanced filter dialog.
+	 * Return false in order to cancel filter adding to the advanced filtering dialog.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogFilterAdding", optionValue: FilterDialogFilterAddingEvent): void;
+
+	/**
+	 * Event fired after a filter row is added to the advanced filter dialog.
+	 */
+	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogFilterAdded"): FilterDialogFilterAddedEvent;
+
+	/**
+	 * Event fired after a filter row is added to the advanced filter dialog.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogFilterAdded", optionValue: FilterDialogFilterAddedEvent): void;
+
+	/**
+	 * Event fired before the advanced filter dialog is closed.
+	 * Return false in order to cancel filtering dialog closing.
+	 */
+	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogClosing"): FilterDialogClosingEvent;
+
+	/**
+	 * Event fired before the advanced filter dialog is closed.
+	 * Return false in order to cancel filtering dialog closing.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogClosing", optionValue: FilterDialogClosingEvent): void;
+
+	/**
+	 * Event fired after the advanced filter dialog has been closed.
+	 */
+	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogClosed"): FilterDialogClosedEvent;
+
+	/**
+	 * Event fired after the advanced filter dialog has been closed.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogClosed", optionValue: FilterDialogClosedEvent): void;
+
+	/**
+	 * Event fired before the contents of the advanced filter dialog are rendered.
+	 * Return false in order to cancel filtering dialog rendering.
+	 */
+	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogContentsRendering"): FilterDialogContentsRenderingEvent;
+
+	/**
+	 * Event fired before the contents of the advanced filter dialog are rendered.
+	 * Return false in order to cancel filtering dialog rendering.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogContentsRendering", optionValue: FilterDialogContentsRenderingEvent): void;
+
+	/**
+	 * Event fired after the contents of the advanced filter dialog are rendered.
+	 */
+	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogContentsRendered"): FilterDialogContentsRenderedEvent;
+
+	/**
+	 * Event fired after the contents of the advanced filter dialog are rendered.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogContentsRendered", optionValue: FilterDialogContentsRenderedEvent): void;
+
+	/**
+	 * Event fired when the OK button in the advanced filter dialog is pressed.
+	 */
+	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogFiltering"): FilterDialogFilteringEvent;
+
+	/**
+	 * Event fired when the OK button in the advanced filter dialog is pressed.
+	 *
+	 * @optionValue Define event handler function.
+	 */
+	igTreeGridFiltering(optionLiteral: 'option', optionName: "filterDialogFiltering", optionValue: FilterDialogFilteringEvent): void;
 	igTreeGridFiltering(options: IgTreeGridFiltering): JQuery;
 	igTreeGridFiltering(optionLiteral: 'option', optionName: string): any;
 	igTreeGridFiltering(optionLiteral: 'option', options: IgTreeGridFiltering): JQuery;
@@ -83082,13 +97654,20 @@ interface JQuery {
 	igTreeGridFiltering(methodName: string, ...methodParams: any[]): any;
 }
 interface IgTreeGridHiding {
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for the igTreeGrid.
+	 */
+	inherit?: boolean;
+
 	/**
 	 * A list of column settings that specifies hiding options on a per column basis.
+	 *
 	 */
 	columnSettings?: IgGridHidingColumnSetting[];
 
 	/**
 	 * The width in pixels of the hidden column indicator in the header.
+	 *
 	 */
 	hiddenColumnIndicatorHeaderWidth?: number;
 
@@ -83102,16 +97681,19 @@ interface IgTreeGridHiding {
 
 	/**
 	 * The default column chooser width.
+	 *
 	 */
 	columnChooserWidth?: string;
 
 	/**
 	 * The default column chooser height.
+	 *
 	 */
 	columnChooserHeight?: string;
 
 	/**
 	 * The duration of the dropdown animation in milliseconds.
+	 *
 	 */
 	dropDownAnimationDuration?: number;
 
@@ -83172,24 +97754,22 @@ interface IgTreeGridHiding {
 
 	/**
 	 * Specifies on click show/hide directly to be shown/hidden columns. If columnChooserHideOnClick is false then Apply and Cancel Buttons are shown on the bottom of modal dialog. Columns are Shown/Hidden after the Apply button is clicked
+	 *
 	 */
 	columnChooserHideOnClick?: boolean;
 
 	/**
 	 * Specifies time of milliseconds for animation duration to show/hide modal dialog
+	 *
 	 */
 	columnChooserAnimationDuration?: number;
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog.
+	 *
 	 */
 	dialogWidget?: string;
 
-	/**
-	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
-	 */
-	inherit?: boolean;
-
 	/**
 	 * Event fired before a hiding operation is executed.
 	 */
@@ -83277,7 +97857,14 @@ interface IgTreeGridHiding {
 }
 interface IgTreeGridHidingMethods {
 	destroy(): void;
+
+	/**
+	 * Changes the all locales into the widget element to the language specified in [options.language](ui.iggridhiding#options:language)
+	 * Note that this method is for rare scenarios, see [language](ui.iggridhiding#options:language) or [locale](ui.iggridhiding#options:locale) option setter
+	 */
 	changeLocale(): void;
+	changeGlobalLanguage(): void;
+	changeGlobalRegional(): void;
 
 	/**
 	 * Shows the Column Chooser dialog. If it is visible the method does nothing.
@@ -83352,6 +97939,8 @@ interface JQuery {
 interface JQuery {
 	igTreeGridHiding(methodName: "destroy"): void;
 	igTreeGridHiding(methodName: "changeLocale"): void;
+	igTreeGridHiding(methodName: "changeGlobalLanguage"): void;
+	igTreeGridHiding(methodName: "changeGlobalRegional"): void;
 	igTreeGridHiding(methodName: "showColumnChooser"): void;
 	igTreeGridHiding(methodName: "hideColumnChooser"): void;
 	igTreeGridHiding(methodName: "showColumn", column: Object, callback?: Function): void;
@@ -83363,26 +97952,42 @@ interface JQuery {
 	igTreeGridHiding(methodName: "renderColumnChooserResetButton"): void;
 	igTreeGridHiding(methodName: "removeColumnChooserResetButton"): void;
 
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for the igTreeGrid.
+	 */
+	igTreeGridHiding(optionLiteral: 'option', optionName: "inherit"): boolean;
+
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for the igTreeGrid.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTreeGridHiding(optionLiteral: 'option', optionName: "inherit", optionValue: boolean): void;
+
 	/**
 	 * A list of column settings that specifies hiding options on a per column basis.
+	 *
 	 */
 	igTreeGridHiding(optionLiteral: 'option', optionName: "columnSettings"): IgGridHidingColumnSetting[];
 
 	/**
 	 * A list of column settings that specifies hiding options on a per column basis.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridHiding(optionLiteral: 'option', optionName: "columnSettings", optionValue: IgGridHidingColumnSetting[]): void;
 
 	/**
 	 * The width in pixels of the hidden column indicator in the header.
+	 *
 	 */
 	igTreeGridHiding(optionLiteral: 'option', optionName: "hiddenColumnIndicatorHeaderWidth"): number;
 
 	/**
 	 * The width in pixels of the hidden column indicator in the header.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridHiding(optionLiteral: 'option', optionName: "hiddenColumnIndicatorHeaderWidth", optionValue: number): void;
@@ -83407,36 +98012,42 @@ interface JQuery {
 
 	/**
 	 * The default column chooser width.
+	 *
 	 */
 	igTreeGridHiding(optionLiteral: 'option', optionName: "columnChooserWidth"): string;
 
 	/**
 	 * The default column chooser width.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridHiding(optionLiteral: 'option', optionName: "columnChooserWidth", optionValue: string): void;
 
 	/**
 	 * The default column chooser height.
+	 *
 	 */
 	igTreeGridHiding(optionLiteral: 'option', optionName: "columnChooserHeight"): string;
 
 	/**
 	 * The default column chooser height.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridHiding(optionLiteral: 'option', optionName: "columnChooserHeight", optionValue: string): void;
 
 	/**
 	 * The duration of the dropdown animation in milliseconds.
+	 *
 	 */
 	igTreeGridHiding(optionLiteral: 'option', optionName: "dropDownAnimationDuration"): number;
 
 	/**
 	 * The duration of the dropdown animation in milliseconds.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridHiding(optionLiteral: 'option', optionName: "dropDownAnimationDuration", optionValue: number): void;
@@ -83571,51 +98182,45 @@ interface JQuery {
 
 	/**
 	 * Gets on click show/hide directly to be shown/hidden columns. If columnChooserHideOnClick is false then Apply and Cancel Buttons are shown on the bottom of modal dialog. Columns are Shown/Hidden after the Apply button is clicked
+	 *
 	 */
 	igTreeGridHiding(optionLiteral: 'option', optionName: "columnChooserHideOnClick"): boolean;
 
 	/**
 	 * Sets on click show/hide directly to be shown/hidden columns. If columnChooserHideOnClick is false then Apply and Cancel Buttons are shown on the bottom of modal dialog. Columns are Shown/Hidden after the Apply button is clicked
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridHiding(optionLiteral: 'option', optionName: "columnChooserHideOnClick", optionValue: boolean): void;
 
 	/**
 	 * Gets time of milliseconds for animation duration to show/hide modal dialog
+	 *
 	 */
 	igTreeGridHiding(optionLiteral: 'option', optionName: "columnChooserAnimationDuration"): number;
 
 	/**
 	 * Sets time of milliseconds for animation duration to show/hide modal dialog
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridHiding(optionLiteral: 'option', optionName: "columnChooserAnimationDuration", optionValue: number): void;
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog.
+	 *
 	 */
 	igTreeGridHiding(optionLiteral: 'option', optionName: "dialogWidget"): string;
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog.
 	 *
-	 * @optionValue New value to be set.
-	 */
-	igTreeGridHiding(optionLiteral: 'option', optionName: "dialogWidget", optionValue: string): void;
-
-	/**
-	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
-	 */
-	igTreeGridHiding(optionLiteral: 'option', optionName: "inherit"): boolean;
-
-	/**
-	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
 	 *
 	 * @optionValue New value to be set.
 	 */
-	igTreeGridHiding(optionLiteral: 'option', optionName: "inherit", optionValue: boolean): void;
+	igTreeGridHiding(optionLiteral: 'option', optionName: "dialogWidget", optionValue: string): void;
 
 	/**
 	 * Event fired before a hiding operation is executed.
@@ -83818,27 +98423,32 @@ interface IgTreeGridDataSourceSettings {
 	/**
 	 * *** IMPORTANT DEPRECATED *** Use the expandedKey option instead.
 	 * The name of the property that keeps track of the expansion state of a data item. Defaults to __ig_options.expanded.
+	 *
 	 */
 	propertyExpanded?: any;
 
 	/**
 	 * *** IMPORTANT DEPRECATED *** Use the dataLevelKey option instead.
 	 * The name of the property that keeps track of the level in the hierarchy.Defaults to __ig_options.dataLevel.
+	 *
 	 */
 	propertyDataLevel?: any;
 
 	/**
 	 * The name of the property that keeps track of the expansion state of a data item. Defaults to __ig_options.expanded.
+	 *
 	 */
 	expandedKey?: string;
 
 	/**
 	 * The name of the property that keeps track of the level in the hierarchy.Defaults to __ig_options.dataLevel.
+	 *
 	 */
 	dataLevelKey?: string;
 
 	/**
 	 * If set to TRUE it is expected that the source of data is normalized and transformed(has set dataLevel and expansion state). The source of data is used as flatDataView. Usually used when the paging is remote and paging mode is allLevels, or features are remote(and the processing of the returned result should be made on the server)
+	 *
 	 */
 	initialFlatDataView?: boolean;
 
@@ -83851,11 +98461,13 @@ interface IgTreeGridDataSourceSettings {
 interface IgTreeGridLocale {
 	/**
 	 * Specifies the expansion indicator tooltip text.
+	 *
 	 */
 	expandTooltipText?: string;
 
 	/**
 	 * Specifies the collapse indicator tooltip text.
+	 *
 	 */
 	collapseTooltipText?: string;
 
@@ -83865,19 +98477,29 @@ interface IgTreeGridLocale {
 	[optionName: string]: any;
 }
 
+interface IgTreeGridRestSettings {
+	/**
+	 * Option for IgTreeGridRestSettings
+	 */
+	[optionName: string]: any;
+}
+
 interface IgTreeGrid {
 	/**
 	 * Specifies the indentation (in pixels or percent) for a tree grid row. Nested indentation is achieved by calculating the level times the indentation value. Ex: '10px' or '5%'. Default is 30.
+	 *
 	 */
 	indentation?: string;
 
 	/**
 	 * If initial indentation level is set then it is used to be calculated width of the data skip column(usually used when remote load on demand is enabled)
+	 *
 	 */
 	initialIndentationLevel?: number;
 
 	/**
 	 * Specifies if rows(that have child rows) will have an expander image that will allow end users to expand and collapse them. This option can be set only at initialization.
+	 *
 	 */
 	showExpansionIndicator?: boolean;
 
@@ -83897,58 +98519,90 @@ interface IgTreeGrid {
 
 	/**
 	 * Unique identifier used in a self-referencing flat data source. Used with primaryKey to create a relationship among flat data sources.
+	 *
 	 */
 	foreignKey?: string;
 
 	/**
 	 * Specifies the depth down to which the tree grid would be expanded upon initial render. To expand all rows set value to -1. Default is -1.
+	 *
 	 */
 	initialExpandDepth?: number;
 
 	/**
 	 * Specifies the foreign key value in the data source to treat as the root level once the grid is data bound. Defaults to -1 (which includes the entire data source)
+	 *
 	 */
 	foreignKeyRootValue?: number|string;
 
 	/**
 	 * Specify whether to render non-data column which contains expander indicators
+	 *
 	 */
 	renderExpansionIndicatorColumn?: boolean;
 
 	/**
 	 * a reference or name of a javascript function which changes first data cell - renders indentation according to databound level
+	 *
 	 */
 	renderFirstDataCellFunction?: string|Object;
 
 	/**
 	 * Property name of the array of child data in a hierarchical data source.
+	 *
 	 */
 	childDataKey?: string;
 
 	/**
 	 * a reference or name of a javascript function which renders expand indicators(called ONLY IF option renderExpansionIndicatorColumn is true)
+	 *
 	 */
 	renderExpansionCellFunction?: string|Object;
 
 	/**
 	 * Specifies to the tree grid if data is loaded on demand from a remote server. Default is false.
+	 *
 	 */
 	enableRemoteLoadOnDemand?: boolean;
 
 	/**
 	 * Options object to configure data source-specific settings
+	 *
 	 */
 	dataSourceSettings?: IgTreeGridDataSourceSettings;
 	locale?: IgTreeGridLocale;
 
+	/**
+	 * Determines row virtualization mode. For igTreeGrid only continuous virtualization can be used.
+	 *
+	 * continuous  renders a pre-defined number of rows in the grid. On scrolling the continuous virtualization loads another portion of rows and disposes the current one.
+	 */
+	virtualizationMode?: string;
+
 	/**
 	 * This option is inherited from a parent widget and it's not applicable for the igTreeGrid.
 	 */
-	restSettings?: any;
+	avgColumnWidth?: any;
+
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for the igTreeGrid.
+	 */
+	avgRowHeight?: any;
+
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for the igTreeGrid.
+	 */
+	columnVirtualization?: any;
+
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for the igTreeGrid.
+	 */
+	restSettings?: IgTreeGridRestSettings;
 
 	/**
 	 * Defines the grid width in pixels or percents. [Here you can find more info about setting igGrid width](http://www.igniteui.com/help/iggrid-columns-and-layout#width-height).
 	 *
+	 *
 	 * Valid values:
 	 * "string" The widget width can be set in pixels (px) or percentage (%). Example values: "800px", "800" (defaults to pixels), "100%".
 	 * "number" The widget width can be set in pixels as a number. Example values: 800, 700.
@@ -83959,6 +98613,7 @@ interface IgTreeGrid {
 	/**
 	 * This is the total height of the grid, including all UI elements - scroll container with data rows, header, footer, filter row - (if any), etc. [Here you can find more info about setting igGrid height](http://www.igniteui.com/help/iggrid-columns-and-layout#width-height).
 	 *
+	 *
 	 * Valid values:
 	 * "string" The widget height can be set in pixels (px) and percentage (%).
 	 * "number" The widget height can be set as a number
@@ -83968,32 +98623,16 @@ interface IgTreeGrid {
 
 	/**
 	 * If autoAdjustHeight is set to false, the [height](ui.iggrid#options:height) will be set only on the scrolling container, and all other UI elements such as paging footer / filter row / headers will add on top of that, so the total height of the grid will be more than this value - the height of the scroll container (content area) will not be dynamically calculated. Setting this option to false will usually result in a lot better initial rendering performance for large data sets ( > 1000 rows rendered at once, no [virtualization](ui.iggrid#options:virtualization) enabled), since no reflows will be made by browsers when accessing DOM properties such as offsetHeight.
+	 *
 	 */
 	autoAdjustHeight?: boolean;
 
 	/**
-	 * Used for [row virtualization](ui.iggrid#options:rowVirtualization) in [fixed mode](ui.iggrid#options:virtualizationMode). This is the average value in pixels (default) that will be used to calculate how many rows to render as the end user scrolls. Also all rows' height will be automatically set to this value.
+	 * Default column width that will be set for all columns, that don't have [column width](ui.iggrid#options:columns.width) defined. Can also be set as '*', in which case the width auto-size based on the content of the column cells (including the header text).
+	 *
 	 *
 	 * Valid values:
-	 * "string" The avarage row height can be set in pixels ("25px").
-	 * "number" The avarage row height can be set in pixels as a number (25).
-	 */
-	avgRowHeight?: string|number;
-
-	/**
-	 * Used for [column virtualization](ui.iggrid#options:columnVirtualization) in [fixed mode](ui.iggrid#options:virtualizationMode). This is the average value in pixels for a column width.
-	 *
-	 * Valid values:
-	 * "string" The avarage column width can be set in pixels ("25px").
-	 * "number" The avarage column width can be set in pixels as a number (25).
-	 */
-	avgColumnWidth?: string|number;
-
-	/**
-	 * Default column width that will be set for all columns, that don't have [column width](ui.iggrid#options:columns.width) defined.
-	 *
-	 * Valid values:
-	 * "string" The default column width can be set in pixels ("100px").
+	 * "string" The default column width can be set in pixels ("100px") or as '*' in order to auto-size based on the cells and header content.
 	 * "number" The default column width can be set in pixels as a number (100).
 	 */
 	defaultColumnWidth?: string|number;
@@ -84002,46 +98641,38 @@ interface IgTreeGrid {
 	 * If no [columns](ui.iggrid#options:columns) collection is defined, and autoGenerateColumns is set to true, [columns](ui.iggrid#options:columns) will be inferred from the data source before the [dataRendering](ui.iggrid#events:dataRendering) event is fired. The inferred [columns](ui.iggrid#options:columns) collection will be available to the developer for modification at [dataRendering](ui.iggrid#events:dataRendering). If autoGenerateColumns is not explicitly set and [columns](ui.iggrid#options:columns) has at least one column defined then autoGenerateColumns is automatically set to false.
 	 * If autoGenerateColumns is true and there are columns defined auto-generated columns will render after the explicitly defined ones.
 	 * Since auto-generated columns don't have width defined consider setting [defaultColumnWidth](ui.iggrid#options:defaultColumnWidth) as well.
+	 *
 	 */
 	autoGenerateColumns?: boolean;
 
 	/**
 	 * Enables/disables column and row virtualization at the same time. Virtualization can greatly enhance rendering performance. If enabled, the number of actual rendered rows (DOM elements) will be constant and related to the visible viewport of the grid. As the end user scrolls, those DOM elements will be dynamically reused to render the new data. [Here you can find more info about the performance guidelines when using the igGrid](http://www.igniteui.com/help/iggrid-performance-guide)
+	 *
 	 */
 	virtualization?: boolean;
 
-	/**
-	 * Determines row virtualization mode.
-	 *
-	 * Valid values:
-	 * "fixed" Renders only the visible rows and/or columns in the grid. On scrolling the same rows and/or columns are updated with new data from the data source. Only fixed virtualization can work with column virtualization at the same time. Fixed virtualization is not supported by some grid features: Resizing, Group By, Responsive.
-	 * "continuous" renders a pre-defined number of rows in the grid. On scrolling the continuous virtualization loads another portion of rows and disposes the current one.
-	 */
-	virtualizationMode?: string;
-
 	/**
 	 * Enables virtualization for rows only. [Here you can find more info about igGrid row virtualization](http://www.igniteui.com/help/iggrid-virtualization-overview)
+	 *
 	 */
 	rowVirtualization?: boolean;
 
-	/**
-	 * Enables virtualization for columns only. Column virtualization can work only in combination with fixed row virtalization. Setting columnVirtualization to true will automatically set [virtualization](ui.iggrid#options:virtualization) to true and [virtualizationMode](ui.iggrid#options:virtualizationMode) to "fixed".
-	 */
-	columnVirtualization?: boolean;
-
 	/**
 	 * Number of pixels to scroll the grid by, when virtualization is enabled, and mouse wheel scrolling is performed over the virtual grid area. If "null" the step will be equal to the [avgRowHeight](ui.iggrid#options:avgRowHeight).
+	 *
 	 */
 	virtualizationMouseWheelStep?: number;
 
 	/**
 	 * If this option is set to true, the height of the grid row will be calculated automatically based on the [avgRowHeight](ui.iggrid#options:avgRowHeight) and the visible virtual records. If no [avgRowHeight](ui.iggrid#options:avgRowHeight) is specified, it will be calculated automatically at runtime.
+	 *
 	 */
 	adjustVirtualHeights?: boolean;
 
 	/**
 	 * The templating engine that will be used to render the grid [column templates](ui.iggrid#options:columns.template). [Here you can find](http://www.infragistics.com/community/blogs/marina_stoyanova/archive/2014/05/30/using-different-template-engines-with-ignite-ui-controls.aspx) how to use templating engines other than igTemplating and jsRender.
 	 *
+	 *
 	 * Valid values:
 	 * "infragistics" The grid will use the Infragistics Templating engine to render its [column templates](ui.iggrid#options:columns.template) and specific parts of the UI.
 	 * "jsRender" The grid will use jsRender to render its [column templates](ui.iggrid#options:columns.template) and specific parts of the UI.
@@ -84050,12 +98681,14 @@ interface IgTreeGrid {
 
 	/**
 	 * An array of column objects. Checkout the [Columns and Layout](http://www.igniteui.com/help/iggrid-columns-and-layout#defining-columns) topic for details on configuring the columns array.
+	 *
 	 */
 	columns?: IgGridColumn[];
 
 	/**
 	 * Can be any valid data source accepted by [$.ig.DataSource](ig.datasource), or an instance of an $.ig.DataSource itself
 	 *
+	 *
 	 * Valid values:
 	 * "array" dataSource as an array
 	 * "object" ddataSource as an object
@@ -84065,86 +98698,102 @@ interface IgTreeGrid {
 
 	/**
 	 * Specifies a remote URL as a data source, from which data will be retrieved using the [$.ig.DataSource](ig.datasource).
+	 *
 	 */
 	dataSourceUrl?: string;
 
 	/**
 	 * Explicitly set data source type (such as "json"). Please refer to the documentation of [$.ig.DataSource type](ig.datasource#options:settings.type).
+	 *
 	 */
 	dataSourceType?: string;
 
 	/**
 	 * See [$.ig.DataSource responseDataKey](ig.datasource#options:settings.responseDataKey). This is the property in the responses where data records are held, if the response is wrapped.
+	 *
 	 */
 	responseDataKey?: string;
 
 	/**
-	 * See [$.ig.DataSource responseTotalRecCountKey](ig.datasource#options:settings.responseTotalRecCountKey). Property in the response specifying the total number of records on the server.
+	 * This option has been deprecated. See [$.ig.DataSource responseTotalRecCountKey](ig.datasource#options:settings.responseTotalRecCountKey). Property in the response specifying the total number of records on the server.
 	 */
 	responseTotalRecCountKey?: string;
 
 	/**
 	 * Specifies the HTTP verb to be used to issue the requests to a remote data source.
+	 *
 	 */
 	requestType?: string;
 
 	/**
 	 * Content type of the response. See http://api.jquery.com/jQuery.ajax/ => contentType
+	 *
 	 */
 	responseContentType?: string;
 
 	/**
 	 * Controls the visibility of the grid header.
+	 *
 	 */
 	showHeader?: boolean;
 
 	/**
 	 * Controls the visibility of the grid footer.
+	 *
 	 */
 	showFooter?: boolean;
 
 	/**
 	 * Headers will be fixed if this option is set to true, and only the grid data will be scrollable. If [virtualization](ui.iggrid#options:virtualization) is enabled, fixedHeaders will always act as if it's true, no matter which value is set.
+	 *
 	 */
 	fixedHeaders?: boolean;
 
 	/**
 	 * Footers will be fixed if this option is set to true, and only the grid data will be scrollable. If [virtualization](ui.iggrid#options:virtualization) is enabled, fixedFooters will always act as if it's true, no matter which value is set.
+	 *
 	 */
 	fixedFooters?: boolean;
 
 	/**
 	 * Caption text that will be shown above the grid header.
+	 *
 	 */
 	caption?: string;
 
 	/**
 	 * List of grid feature definitions: sorting, paging, etc. Each feature goes with its separate options that are documented for the feature accordingly. [Here you can find detailed documentation for all igGrid features](http://www.igniteui.com/help/iggrid-features-landing-page)
+	 *
 	 */
 	features?: IgGridFeature[];
 
 	/**
 	 * Initial tabIndex attribute that will be set on all focusable elements.
+	 *
 	 */
 	tabIndex?: number;
 
 	/**
 	 * If this option is set to false, the data to which the grid is bound will be used "as is" with no additional transformations based on [columns](ui.iggrid#options:columns) defined. Otherwise only the subset of data properties used in the [columns](ui.iggrid#options:columns) defined will be extracted in a new object and used.
+	 *
 	 */
 	localSchemaTransform?: boolean;
 
 	/**
 	 * Key of the column containing unique identifiers for the data records.
+	 *
 	 */
 	primaryKey?: string;
 
 	/**
 	 * If true, the transaction log will always be sent in the request for remote data, by the data source. Also this means that if there are values in the log, a POST will be performed instead of GET.
+	 *
 	 */
 	serializeTransactionLog?: boolean;
 
 	/**
 	 * Automatically commits the transactions as rows/cells are being edited to the client data source. A [saveChanges](ui.iggrid#methods:saveChanges) call still needs to be performed in order to commit the transactions to a server-side data source.
+	 *
 	 */
 	autoCommit?: boolean;
 
@@ -84154,12 +98803,14 @@ interface IgTreeGrid {
 	 * If a new row is added, edited, then deleted, there will be no transaction added to the log.
 	 * If several edits are made to a row or an individual cell, this should result in a single transaction.
 	 * Note: This option takes effect only when [autoCommit](ui.iggrid#options:autoCommit) is set to false.
+	 *
 	 */
 	aggregateTransactions?: boolean;
 
 	/**
 	 * Sets gets ability to automatically format text in cells for numeric and date columns. The format patterns and rules for numbers and dates are defined in $.ig.regional.defaults object. [Here column formatting is explained in details](http://www.igniteui.com/help/iggrid-columns-and-layout#column-formatting)
 	 *
+	 *
 	 * Valid values:
 	 * "date" formats only Date columns
 	 * "number" formats only number columns
@@ -84171,53 +98822,63 @@ interface IgTreeGrid {
 
 	/**
 	 * Gets sets ability to render checkboxes and use checkbox editor when dataType of a column is "bool". Checkboxes are not rendered for boolean values in columns with a [column template](ui.iggrid#options:columns.template).
+	 *
 	 */
 	renderCheckboxes?: boolean;
 
 	/**
 	 * URL to which updating requests will be made.
+	 *
 	 */
 	updateUrl?: string;
 
 	/**
 	 * Enables/disables rendering of alternating row styles (odd and even rows receive different styling).
+	 *
 	 */
 	alternateRowStyles?: boolean;
 
 	/**
 	 * If set to true and all columns' widths are specified and their combined width is less than the grid width then the last column width will be automatically adjusted to fill the remaining empty space of the grid.
+	 *
 	 */
 	autofitLastColumn?: boolean;
 
 	/**
 	 * Enables/disables rendering of hover styles when the mouse is over a record. This can be useful in templating scenarios, for example, where we don't want to apply hover styling to templated content.
+	 *
 	 */
 	enableHoverStyles?: boolean;
 
 	/**
 	 * Enables/Disables serializing client date as UTC ISO 8061 string instead of using the local time and zone values.
+	 *
 	 */
 	enableUTCDates?: boolean;
 
 	/**
 	 * Merge unbound columns values inside data source when data source is remote. If true then the unbound columns are merged to the data source at runtime on the server. Note that data source is expanded with the new data and this could cause performance issues when the data is huge. If mergeUnboundColumns is false then the unbound data is sent and merged on the client. This option is used by the [igGrid MVC Helper](http://www.igniteui.com/help/iggrid-developing-asp-net-mvc-applications-with-iggrid).
 	 * Checkout [Populating Unbound Columns Remotely (igGrid)](http://www.igniteui.com/help/iggrid-unboundcolumns-populating-with-data-remotely) topic for more information.
+	 *
 	 */
 	mergeUnboundColumns?: boolean;
 
 	/**
 	 * When dataSource is a remote URL, defines whether to set the type of the remote data source to JSONP.
+	 *
 	 */
 	jsonpRequest?: boolean;
 
 	/**
 	 * Enables/disables grid adjusting its dimensions when its [width](ui.iggrid#options:width) and/or [height](ui.iggrid#options:height) is set in percent (%) and grid parent DOM container is resized.
+	 *
 	 */
 	enableResizeContainerCheck?: boolean;
 
 	/**
 	 * Configures how the feature chooser icon should display on header cells - e.g. to display as gear icon or not.
 	 *
+	 *
 	 * Valid values:
 	 * "none" Always hide the feature chooser icon; The feature chooser is shown on tapping/clicking the column header.
 	 * "desktopOnly" Always show the icon on desktop but hide when touch device detected.
@@ -84227,6 +98888,7 @@ interface IgTreeGrid {
 
 	/**
 	 * Settings related to content scrolling.
+	 *
 	 */
 	scrollSettings?: IgGridScrollSettings;
 
@@ -84438,6 +99100,11 @@ interface IgTreeGridMethods {
 	 * Returns the element holding the data records
 	 */
 	widget(): void;
+
+	/**
+	 * Changes the the regional settings of widget element to the language specified in [options.regional](ui.iggrid#options:regional)
+	 * Note that this method is for rare scenarios, use [regional](ui.iggrid#options:regional) option setter
+	 */
 	changeRegional(): void;
 
 	/**
@@ -84965,36 +99632,42 @@ interface JQuery {
 
 	/**
 	 * Gets the indentation (in pixels or percent) for a tree grid row. Nested indentation is achieved by calculating the level times the indentation value. Ex: '10px' or '5%'. Default is 30.
+	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "indentation"): string;
 
 	/**
 	 * Sets the indentation (in pixels or percent) for a tree grid row. Nested indentation is achieved by calculating the level times the indentation value. Ex: '10px' or '5%'. Default is 30.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "indentation", optionValue: string): void;
 
 	/**
 	 * If initial indentation level is set then it is used to be calculated width of the data skip column(usually used when remote load on demand is enabled)
+	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "initialIndentationLevel"): number;
 
 	/**
 	 * If initial indentation level is set then it is used to be calculated width of the data skip column(usually used when remote load on demand is enabled)
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "initialIndentationLevel", optionValue: number): void;
 
 	/**
 	 * Gets if rows(that have child rows) will have an expander image that will allow end users to expand and collapse them. This option can be set only at initialization.
+	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "showExpansionIndicator"): boolean;
 
 	/**
 	 * Sets if rows(that have child rows) will have an expander image that will allow end users to expand and collapse them. This option can be set only at initialization.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "showExpansionIndicator", optionValue: boolean): void;
@@ -85033,30 +99706,35 @@ interface JQuery {
 
 	/**
 	 * Unique identifier used in a self-referencing flat data source. Used with primaryKey to create a relationship among flat data sources.
+	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "foreignKey"): string;
 
 	/**
 	 * Unique identifier used in a self-referencing flat data source. Used with primaryKey to create a relationship among flat data sources.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "foreignKey", optionValue: string): void;
 
 	/**
 	 * Gets the depth down to which the tree grid would be expanded upon initial render. To expand all rows set value to -1. Default is -1.
+	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "initialExpandDepth"): number;
 
 	/**
 	 * Sets the depth down to which the tree grid would be expanded upon initial render. To expand all rows set value to -1. Default is -1.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "initialExpandDepth", optionValue: number): void;
 
 	/**
 	 * Gets the foreign key value in the data source to treat as the root level once the grid is data bound. Defaults to -1 (which includes the entire data source)
+	 *
 	 */
 
 	igTreeGrid(optionLiteral: 'option', optionName: "foreignKeyRootValue"): number|string;
@@ -85064,6 +99742,7 @@ interface JQuery {
 	/**
 	 * Sets the foreign key value in the data source to treat as the root level once the grid is data bound. Defaults to -1 (which includes the entire data source)
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -85071,18 +99750,21 @@ interface JQuery {
 
 	/**
 	 * Specify whether to render non-data column which contains expander indicators
+	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "renderExpansionIndicatorColumn"): boolean;
 
 	/**
 	 * Specify whether to render non-data column which contains expander indicators
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "renderExpansionIndicatorColumn", optionValue: boolean): void;
 
 	/**
 	 * A reference or name of a javascript function which changes first data cell - renders indentation according to databound level
+	 *
 	 */
 
 	igTreeGrid(optionLiteral: 'option', optionName: "renderFirstDataCellFunction"): string|Object;
@@ -85090,6 +99772,7 @@ interface JQuery {
 	/**
 	 * A reference or name of a javascript function which changes first data cell - renders indentation according to databound level
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -85097,18 +99780,21 @@ interface JQuery {
 
 	/**
 	 * Property name of the array of child data in a hierarchical data source.
+	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "childDataKey"): string;
 
 	/**
 	 * Property name of the array of child data in a hierarchical data source.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "childDataKey", optionValue: string): void;
 
 	/**
 	 * A reference or name of a javascript function which renders expand indicators(called ONLY IF option renderExpansionIndicatorColumn is true)
+	 *
 	 */
 
 	igTreeGrid(optionLiteral: 'option', optionName: "renderExpansionCellFunction"): string|Object;
@@ -85116,6 +99802,7 @@ interface JQuery {
 	/**
 	 * A reference or name of a javascript function which renders expand indicators(called ONLY IF option renderExpansionIndicatorColumn is true)
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -85123,44 +99810,101 @@ interface JQuery {
 
 	/**
 	 * Gets to the tree grid if data is loaded on demand from a remote server. Default is false.
+	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "enableRemoteLoadOnDemand"): boolean;
 
 	/**
 	 * Sets to the tree grid if data is loaded on demand from a remote server. Default is false.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "enableRemoteLoadOnDemand", optionValue: boolean): void;
 
 	/**
 	 * Options object to configure data source-specific settings
+	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "dataSourceSettings"): IgTreeGridDataSourceSettings;
 
 	/**
 	 * Options object to configure data source-specific settings
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "dataSourceSettings", optionValue: IgTreeGridDataSourceSettings): void;
 	igTreeGrid(optionLiteral: 'option', optionName: "locale"): IgTreeGridLocale;
 	igTreeGrid(optionLiteral: 'option', optionName: "locale", optionValue: IgTreeGridLocale): void;
 
+	/**
+	 * Determines row virtualization mode. For igTreeGrid only continuous virtualization can be used.
+	 *
+	 * continuous  renders a pre-defined number of rows in the grid. On scrolling the continuous virtualization loads another portion of rows and disposes the current one.
+	 */
+	igTreeGrid(optionLiteral: 'option', optionName: "virtualizationMode"): string;
+
+	/**
+	 * Determines row virtualization mode. For igTreeGrid only continuous virtualization can be used.
+	 *
+	 * continuous  renders a pre-defined number of rows in the grid. On scrolling the continuous virtualization loads another portion of rows and disposes the current one.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTreeGrid(optionLiteral: 'option', optionName: "virtualizationMode", optionValue: string): void;
+
 	/**
 	 * This option is inherited from a parent widget and it's not applicable for the igTreeGrid.
 	 */
-	igTreeGrid(optionLiteral: 'option', optionName: "restSettings"): any;
+	igTreeGrid(optionLiteral: 'option', optionName: "avgColumnWidth"): any;
 
 	/**
 	 * This option is inherited from a parent widget and it's not applicable for the igTreeGrid.
 	 *
 	 * @optionValue New value to be set.
 	 */
-	igTreeGrid(optionLiteral: 'option', optionName: "restSettings", optionValue: any): void;
+	igTreeGrid(optionLiteral: 'option', optionName: "avgColumnWidth", optionValue: any): void;
+
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for the igTreeGrid.
+	 */
+	igTreeGrid(optionLiteral: 'option', optionName: "avgRowHeight"): any;
+
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for the igTreeGrid.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTreeGrid(optionLiteral: 'option', optionName: "avgRowHeight", optionValue: any): void;
+
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for the igTreeGrid.
+	 */
+	igTreeGrid(optionLiteral: 'option', optionName: "columnVirtualization"): any;
+
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for the igTreeGrid.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTreeGrid(optionLiteral: 'option', optionName: "columnVirtualization", optionValue: any): void;
+
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for the igTreeGrid.
+	 */
+	igTreeGrid(optionLiteral: 'option', optionName: "restSettings"): IgTreeGridRestSettings;
+
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for the igTreeGrid.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTreeGrid(optionLiteral: 'option', optionName: "restSettings", optionValue: IgTreeGridRestSettings): void;
 
 	/**
 	 * Defines the grid width in pixels or percents. [Here you can find more info about setting igGrid width](http://www.igniteui.com/help/iggrid-columns-and-layout#width-height).
+	 *
 	 */
 
 	igTreeGrid(optionLiteral: 'option', optionName: "width"): string|number;
@@ -85168,6 +99912,7 @@ interface JQuery {
 	/**
 	 * Defines the grid width in pixels or percents. [Here you can find more info about setting igGrid width](http://www.igniteui.com/help/iggrid-columns-and-layout#width-height).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -85175,6 +99920,7 @@ interface JQuery {
 
 	/**
 	 * This is the total height of the grid, including all UI elements - scroll container with data rows, header, footer, filter row - (if any), etc. [Here you can find more info about setting igGrid height](http://www.igniteui.com/help/iggrid-columns-and-layout#width-height).
+	 *
 	 */
 
 	igTreeGrid(optionLiteral: 'option', optionName: "height"): string|number;
@@ -85182,6 +99928,7 @@ interface JQuery {
 	/**
 	 * This is the total height of the grid, including all UI elements - scroll container with data rows, header, footer, filter row - (if any), etc. [Here you can find more info about setting igGrid height](http://www.igniteui.com/help/iggrid-columns-and-layout#width-height).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -85189,52 +99936,28 @@ interface JQuery {
 
 	/**
 	 * If autoAdjustHeight is set to false, the [height](ui.iggrid#options:height) will be set only on the scrolling container, and all other UI elements such as paging footer / filter row / headers will add on top of that, so the total height of the grid will be more than this value - the height of the scroll container (content area) will not be dynamically calculated. Setting this option to false will usually result in a lot better initial rendering performance for large data  ( > 1000 rows rendered at once, no [virtualization](ui.iggrid#options:virtualization) enabled), since no reflows will be made by browsers when accessing DOM properties such as offsetHeight.
+	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "autoAdjustHeight"): boolean;
 
 	/**
 	 * If autoAdjustHeight is set to false, the [height](ui.iggrid#options:height) will be set only on the scrolling container, and all other UI elements such as paging footer / filter row / headers will add on top of that, so the total height of the grid will be more than this value - the height of the scroll container (content area) will not be dynamically calculated. Setting this option to false will usually result in a lot better initial rendering performance for large data sets ( > 1000 rows rendered at once, no [virtualization](ui.iggrid#options:virtualization) enabled), since no reflows will be made by browsers when accessing DOM properties such as offsetHeight.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "autoAdjustHeight", optionValue: boolean): void;
 
 	/**
-	 * Used for [row virtualization](ui.iggrid#options:rowVirtualization) in [fixed mode](ui.iggrid#options:virtualizationMode). This is the average value in pixels (default) that will be used to calculate how many rows to render as the end user scrolls. Also all rows' height will be automatically set to this value.
-	 */
-
-	igTreeGrid(optionLiteral: 'option', optionName: "avgRowHeight"): string|number;
-
-	/**
-	 * Used for [row virtualization](ui.iggrid#options:rowVirtualization) in [fixed mode](ui.iggrid#options:virtualizationMode). This is the average value in pixels (default) that will be used to calculate how many rows to render as the end user scrolls. Also all rows' height will be automatically set to this value.
+	 * Default column width that will be set for all columns, that don't have [column width](ui.iggrid#options:columns.width) defined. Can also be set as '*', in which case the width auto-size based on the content of the column cells (including the header text).
 	 *
-	 * @optionValue New value to be set.
-	 */
-
-	igTreeGrid(optionLiteral: 'option', optionName: "avgRowHeight", optionValue: string|number): void;
-
-	/**
-	 * Used for [column virtualization](ui.iggrid#options:columnVirtualization) in [fixed mode](ui.iggrid#options:virtualizationMode). This is the average value in pixels for a column width.
-	 */
-
-	igTreeGrid(optionLiteral: 'option', optionName: "avgColumnWidth"): string|number;
-
-	/**
-	 * Used for [column virtualization](ui.iggrid#options:columnVirtualization) in [fixed mode](ui.iggrid#options:virtualizationMode). This is the average value in pixels for a column width.
-	 *
-	 * @optionValue New value to be set.
-	 */
-
-	igTreeGrid(optionLiteral: 'option', optionName: "avgColumnWidth", optionValue: string|number): void;
-
-	/**
-	 * Default column width that will be set for all columns, that don't have [column width](ui.iggrid#options:columns.width) defined.
 	 */
 
 	igTreeGrid(optionLiteral: 'option', optionName: "defaultColumnWidth"): string|number;
 
 	/**
-	 * Default column width that will be set for all columns, that don't have [column width](ui.iggrid#options:columns.width) defined.
+	 * Default column width that will be set for all columns, that don't have [column width](ui.iggrid#options:columns.width) defined. Can also be set as '*', in which case the width auto-size based on the content of the column cells (including the header text).
+	 *
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -85245,6 +99968,7 @@ interface JQuery {
 	 * If no [columns](ui.iggrid#options:columns) collection is defined, and autoGenerateColumns is set to true, [columns](ui.iggrid#options:columns) will be inferred from the data source before the [dataRendering](ui.iggrid#events:dataRendering) event is fired. The inferred [columns](ui.iggrid#options:columns) collection will be available to the developer for modification at [dataRendering](ui.iggrid#events:dataRendering). If autoGenerateColumns is not explicitly set and [columns](ui.iggrid#options:columns) has at least one column defined then autoGenerateColumns is automatically set to false.
 	 * If autoGenerateColumns is true and there are columns defined auto-generated columns will render after the explicitly defined ones.
 	 * Since auto-generated columns don't have width defined consider setting [defaultColumnWidth](ui.iggrid#options:defaultColumnWidth) as well.
+	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "autoGenerateColumns"): boolean;
 
@@ -85253,86 +99977,70 @@ interface JQuery {
 	 * If autoGenerateColumns is true and there are columns defined auto-generated columns will render after the explicitly defined ones.
 	 * Since auto-generated columns don't have width defined consider setting [defaultColumnWidth](ui.iggrid#options:defaultColumnWidth) as well.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "autoGenerateColumns", optionValue: boolean): void;
 
 	/**
 	 * Enables/disables column and row virtualization at the same time. Virtualization can greatly enhance rendering performance. If enabled, the number of actual rendered rows (DOM elements) will be constant and related to the visible viewport of the grid. As the end user scrolls, those DOM elements will be dynamically reused to render the new data. [Here you can find more info about the performance guidelines when using the igGrid](http://www.igniteui.com/help/iggrid-performance-guide)
+	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "virtualization"): boolean;
 
 	/**
 	 * Enables/disables column and row virtualization at the same time. Virtualization can greatly enhance rendering performance. If enabled, the number of actual rendered rows (DOM elements) will be constant and related to the visible viewport of the grid. As the end user scrolls, those DOM elements will be dynamically reused to render the new data. [Here you can find more info about the performance guidelines when using the igGrid](http://www.igniteui.com/help/iggrid-performance-guide)
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "virtualization", optionValue: boolean): void;
 
-	/**
-	 * Determines row virtualization mode.
-	 */
-
-	igTreeGrid(optionLiteral: 'option', optionName: "virtualizationMode"): string;
-
-	/**
-	 * Determines row virtualization mode.
-	 *
-	 * @optionValue New value to be set.
-	 */
-
-	igTreeGrid(optionLiteral: 'option', optionName: "virtualizationMode", optionValue: string): void;
-
 	/**
 	 * Enables virtualization for rows only. [Here you can find more info about igGrid row virtualization](http://www.igniteui.com/help/iggrid-virtualization-overview)
+	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "rowVirtualization"): boolean;
 
 	/**
 	 * Enables virtualization for rows only. [Here you can find more info about igGrid row virtualization](http://www.igniteui.com/help/iggrid-virtualization-overview)
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "rowVirtualization", optionValue: boolean): void;
 
-	/**
-	 * Enables virtualization for columns only. Column virtualization can work only in combination with fixed row virtalization. Setting columnVirtualization to true will automatically set [virtualization](ui.iggrid#options:virtualization) to true and [virtualizationMode](ui.iggrid#options:virtualizationMode) to "fixed".
-	 */
-	igTreeGrid(optionLiteral: 'option', optionName: "columnVirtualization"): boolean;
-
-	/**
-	 * Enables virtualization for columns only. Column virtualization can work only in combination with fixed row virtalization. Setting columnVirtualization to true will automatically set [virtualization](ui.iggrid#options:virtualization) to true and [virtualizationMode](ui.iggrid#options:virtualizationMode) to "fixed".
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igTreeGrid(optionLiteral: 'option', optionName: "columnVirtualization", optionValue: boolean): void;
-
 	/**
 	 * Number of pixels to scroll the grid by, when virtualization is enabled, and mouse wheel scrolling is performed over the virtual grid area. If "null" the step will be equal to the [avgRowHeight](ui.iggrid#options:avgRowHeight).
+	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "virtualizationMouseWheelStep"): number;
 
 	/**
 	 * Number of pixels to scroll the grid by, when virtualization is enabled, and mouse wheel scrolling is performed over the virtual grid area. If "null" the step will be equal to the [avgRowHeight](ui.iggrid#options:avgRowHeight).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "virtualizationMouseWheelStep", optionValue: number): void;
 
 	/**
 	 * If this option is set to true, the height of the grid row will be calculated automatically based on the [avgRowHeight](ui.iggrid#options:avgRowHeight) and the visible virtual records. If no [avgRowHeight](ui.iggrid#options:avgRowHeight) is specified, it will be calculated automatically at runtime.
+	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "adjustVirtualHeights"): boolean;
 
 	/**
 	 * If this option is set to true, the height of the grid row will be calculated automatically based on the [avgRowHeight](ui.iggrid#options:avgRowHeight) and the visible virtual records. If no [avgRowHeight](ui.iggrid#options:avgRowHeight) is specified, it will be calculated automatically at runtime.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "adjustVirtualHeights", optionValue: boolean): void;
 
 	/**
 	 * The templating engine that will be used to render the grid [column templates](ui.iggrid#options:columns.template). [Here you can find](http://www.infragistics.com/community/blogs/marina_stoyanova/archive/2014/05/30/using-different-template-engines-with-ignite-ui-controls.aspx) how to use templating engines other than igTemplating and jsRender.
+	 *
 	 */
 
 	igTreeGrid(optionLiteral: 'option', optionName: "templatingEngine"): string;
@@ -85340,6 +100048,7 @@ interface JQuery {
 	/**
 	 * The templating engine that will be used to render the grid [column templates](ui.iggrid#options:columns.template). [Here you can find](http://www.infragistics.com/community/blogs/marina_stoyanova/archive/2014/05/30/using-different-template-engines-with-ignite-ui-controls.aspx) how to use templating engines other than igTemplating and jsRender.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -85347,18 +100056,21 @@ interface JQuery {
 
 	/**
 	 * An array of column objects. Checkout the [Columns and Layout](http://www.igniteui.com/help/iggrid-columns-and-layout#defining-columns) topic for details on configuring the columns array.
+	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "columns"): IgGridColumn[];
 
 	/**
 	 * An array of column objects. Checkout the [Columns and Layout](http://www.igniteui.com/help/iggrid-columns-and-layout#defining-columns) topic for details on configuring the columns array.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "columns", optionValue: IgGridColumn[]): void;
 
 	/**
 	 * Can be any valid data source accepted by [$.ig.DataSource](ig.datasource), or an instance of an $.ig.DataSource itself
+	 *
 	 */
 
 	igTreeGrid(optionLiteral: 'option', optionName: "dataSource"): Array<any>|Object|string;
@@ -85366,6 +100078,7 @@ interface JQuery {
 	/**
 	 * Can be any valid data source accepted by [$.ig.DataSource](ig.datasource), or an instance of an $.ig.DataSource itself
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -85373,47 +100086,53 @@ interface JQuery {
 
 	/**
 	 * Gets a remote URL as a data source, from which data will be retrieved using the [$.ig.DataSource](ig.datasource).
+	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "dataSourceUrl"): string;
 
 	/**
 	 * Sets a remote URL as a data source, from which data will be retrieved using the [$.ig.DataSource](ig.datasource).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "dataSourceUrl", optionValue: string): void;
 
 	/**
 	 * Explicitly set data source type (such as "json"). Please refer to the documentation of [$.ig.DataSource type](ig.datasource#options:settings.type).
+	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "dataSourceType"): string;
 
 	/**
 	 * Explicitly set data source type (such as "json"). Please refer to the documentation of [$.ig.DataSource type](ig.datasource#options:settings.type).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "dataSourceType", optionValue: string): void;
 
 	/**
 	 * See [$.ig.DataSource responseDataKey](ig.datasource#options:settings.responseDataKey). This is the property in the responses where data records are held, if the response is wrapped.
+	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "responseDataKey"): string;
 
 	/**
 	 * See [$.ig.DataSource responseDataKey](ig.datasource#options:settings.responseDataKey). This is the property in the responses where data records are held, if the response is wrapped.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "responseDataKey", optionValue: string): void;
 
 	/**
-	 * See [$.ig.DataSource responseTotalRecCountKey](ig.datasource#options:settings.responseTotalRecCountKey). Property in the response specifying the total number of records on the server.
+	 * This option has been deprecated. See [$.ig.DataSource responseTotalRecCountKey](ig.datasource#options:settings.responseTotalRecCountKey). Property in the response specifying the total number of records on the server.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "responseTotalRecCountKey"): string;
 
 	/**
-	 * See [$.ig.DataSource responseTotalRecCountKey](ig.datasource#options:settings.responseTotalRecCountKey). Property in the response specifying the total number of records on the server.
+	 * This option has been deprecated. See [$.ig.DataSource responseTotalRecCountKey](ig.datasource#options:settings.responseTotalRecCountKey). Property in the response specifying the total number of records on the server.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -85421,156 +100140,182 @@ interface JQuery {
 
 	/**
 	 * Gets the HTTP verb to be used to issue the requests to a remote data source.
+	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "requestType"): string;
 
 	/**
 	 * Sets the HTTP verb to be used to issue the requests to a remote data source.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "requestType", optionValue: string): void;
 
 	/**
 	 * Content type of the response. See http://api.jquery.com/jQuery.ajax/ => contentType
+	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "responseContentType"): string;
 
 	/**
 	 * Content type of the response. See http://api.jquery.com/jQuery.ajax/ => contentType
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "responseContentType", optionValue: string): void;
 
 	/**
 	 * Controls the visibility of the grid header.
+	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "showHeader"): boolean;
 
 	/**
 	 * Controls the visibility of the grid header.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "showHeader", optionValue: boolean): void;
 
 	/**
 	 * Controls the visibility of the grid footer.
+	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "showFooter"): boolean;
 
 	/**
 	 * Controls the visibility of the grid footer.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "showFooter", optionValue: boolean): void;
 
 	/**
 	 * Headers will be fixed if this option is set to true, and only the grid data will be scrollable. If [virtualization](ui.iggrid#options:virtualization) is enabled, fixedHeaders will always act as if it's true, no matter which value is set.
+	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "fixedHeaders"): boolean;
 
 	/**
 	 * Headers will be fixed if this option is set to true, and only the grid data will be scrollable. If [virtualization](ui.iggrid#options:virtualization) is enabled, fixedHeaders will always act as if it's true, no matter which value is set.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "fixedHeaders", optionValue: boolean): void;
 
 	/**
 	 * Footers will be fixed if this option is set to true, and only the grid data will be scrollable. If [virtualization](ui.iggrid#options:virtualization) is enabled, fixedFooters will always act as if it's true, no matter which value is set.
+	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "fixedFooters"): boolean;
 
 	/**
 	 * Footers will be fixed if this option is set to true, and only the grid data will be scrollable. If [virtualization](ui.iggrid#options:virtualization) is enabled, fixedFooters will always act as if it's true, no matter which value is set.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "fixedFooters", optionValue: boolean): void;
 
 	/**
 	 * Caption text that will be shown above the grid header.
+	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "caption"): string;
 
 	/**
 	 * Caption text that will be shown above the grid header.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "caption", optionValue: string): void;
 
 	/**
 	 * List of grid feature definitions: sorting, paging, etc. Each feature goes with its separate options that are documented for the feature accordingly. [Here you can find detailed documentation for all igGrid features](http://www.igniteui.com/help/iggrid-features-landing-page)
+	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "features"): IgGridFeature[];
 
 	/**
 	 * List of grid feature definitions: sorting, paging, etc. Each feature goes with its separate options that are documented for the feature accordingly. [Here you can find detailed documentation for all igGrid features](http://www.igniteui.com/help/iggrid-features-landing-page)
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "features", optionValue: IgGridFeature[]): void;
 
 	/**
 	 * Initial tabIndex attribute that will be set on all focusable elements.
+	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "tabIndex"): number;
 
 	/**
 	 * Initial tabIndex attribute that will be set on all focusable elements.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "tabIndex", optionValue: number): void;
 
 	/**
 	 * If this option is set to false, the data to which the grid is bound will be used "as is" with no additional transformations based on [columns](ui.iggrid#options:columns) defined. Otherwise only the subset of data properties used in the [columns](ui.iggrid#options:columns) defined will be extracted in a new object and used.
+	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "localSchemaTransform"): boolean;
 
 	/**
 	 * If this option is set to false, the data to which the grid is bound will be used "as is" with no additional transformations based on [columns](ui.iggrid#options:columns) defined. Otherwise only the subset of data properties used in the [columns](ui.iggrid#options:columns) defined will be extracted in a new object and used.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "localSchemaTransform", optionValue: boolean): void;
 
 	/**
 	 * Key of the column containing unique identifiers for the data records.
+	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "primaryKey"): string;
 
 	/**
 	 * Key of the column containing unique identifiers for the data records.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "primaryKey", optionValue: string): void;
 
 	/**
 	 * If true, the transaction log will always be sent in the request for remote data, by the data source. Also this means that if there are values in the log, a POST will be performed instead of GET.
+	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "serializeTransactionLog"): boolean;
 
 	/**
 	 * If true, the transaction log will always be sent in the request for remote data, by the data source. Also this means that if there are values in the log, a POST will be performed instead of GET.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "serializeTransactionLog", optionValue: boolean): void;
 
 	/**
 	 * Automatically commits the transactions as rows/cells are being edited to the client data source. A [saveChanges](ui.iggrid#methods:saveChanges) call still needs to be performed in order to commit the transactions to a server-side data source.
+	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "autoCommit"): boolean;
 
 	/**
 	 * Automatically commits the transactions as rows/cells are being edited to the client data source. A [saveChanges](ui.iggrid#methods:saveChanges) call still needs to be performed in order to commit the transactions to a server-side data source.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "autoCommit", optionValue: boolean): void;
@@ -85581,6 +100326,7 @@ interface JQuery {
 	 * If a new row is added, edited, then deleted, there will be no transaction added to the log.
 	 * If several edits are made to a row or an individual cell, this should result in a single transaction.
 	 * Note: This option takes effect only when [autoCommit](ui.iggrid#options:autoCommit) is set to false.
+	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "aggregateTransactions"): boolean;
 
@@ -85591,12 +100337,14 @@ interface JQuery {
 	 * If several edits are made to a row or an individual cell, this should result in a single transaction.
 	 * Note: This option takes effect only when [autoCommit](ui.iggrid#options:autoCommit) is set to false.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "aggregateTransactions", optionValue: boolean): void;
 
 	/**
 	 * Sets gets ability to automatically format text in cells for numeric and date columns. The format patterns and rules for numbers and dates are defined in $.ig.regional.defaults object. [Here column formatting is explained in details](http://www.igniteui.com/help/iggrid-columns-and-layout#column-formatting)
+	 *
 	 */
 
 	igTreeGrid(optionLiteral: 'option', optionName: "autoFormat"): string|boolean;
@@ -85604,6 +100352,7 @@ interface JQuery {
 	/**
 	 * Sets gets ability to automatically format text in cells for numeric and date columns. The format patterns and rules for numbers and dates are defined in $.ig.regional.defaults object. [Here column formatting is explained in details](http://www.igniteui.com/help/iggrid-columns-and-layout#column-formatting)
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -85611,72 +100360,84 @@ interface JQuery {
 
 	/**
 	 * Gets  ability to render checkboxes and use checkbox editor when dataType of a column is "bool". Checkboxes are not rendered for boolean values in columns with a [column template](ui.iggrid#options:columns.template).
+	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "renderCheckboxes"): boolean;
 
 	/**
 	 * Sets ability to render checkboxes and use checkbox editor when dataType of a column is "bool". Checkboxes are not rendered for boolean values in columns with a [column template](ui.iggrid#options:columns.template).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "renderCheckboxes", optionValue: boolean): void;
 
 	/**
 	 * URL to which updating requests will be made.
+	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "updateUrl"): string;
 
 	/**
 	 * URL to which updating requests will be made.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "updateUrl", optionValue: string): void;
 
 	/**
 	 * Enables/disables rendering of alternating row styles (odd and even rows receive different styling).
+	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "alternateRowStyles"): boolean;
 
 	/**
 	 * Enables/disables rendering of alternating row styles (odd and even rows receive different styling).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "alternateRowStyles", optionValue: boolean): void;
 
 	/**
 	 * If set to true and all columns' widths are specified and their combined width is less than the grid width then the last column width will be automatically adjusted to fill the remaining empty space of the grid.
+	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "autofitLastColumn"): boolean;
 
 	/**
 	 * If set to true and all columns' widths are specified and their combined width is less than the grid width then the last column width will be automatically adjusted to fill the remaining empty space of the grid.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "autofitLastColumn", optionValue: boolean): void;
 
 	/**
 	 * Enables/disables rendering of hover styles when the mouse is over a record. This can be useful in templating scenarios, for example, where we don't want to apply hover styling to templated content.
+	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "enableHoverStyles"): boolean;
 
 	/**
 	 * Enables/disables rendering of hover styles when the mouse is over a record. This can be useful in templating scenarios, for example, where we don't want to apply hover styling to templated content.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "enableHoverStyles", optionValue: boolean): void;
 
 	/**
 	 * Enables/Disables serializing client date as UTC ISO 8061 string instead of using the local time and zone values.
+	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "enableUTCDates"): boolean;
 
 	/**
 	 * Enables/Disables serializing client date as UTC ISO 8061 string instead of using the local time and zone values.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "enableUTCDates", optionValue: boolean): void;
@@ -85684,6 +100445,7 @@ interface JQuery {
 	/**
 	 * Merge unbound columns values inside data source when data source is remote. If true then the unbound columns are merged to the data source at runtime on the server. Note that data source is expanded with the new data and this could cause performance issues when the data is huge. If mergeUnboundColumns is false then the unbound data is sent and merged on the client. This option is used by the [igGrid MVC Helper](http://www.igniteui.com/help/iggrid-developing-asp-net-mvc-applications-with-iggrid).
 	 * Checkout [Populating Unbound Columns Remotely (igGrid)](http://www.igniteui.com/help/iggrid-unboundcolumns-populating-with-data-remotely) topic for more information.
+	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "mergeUnboundColumns"): boolean;
 
@@ -85691,36 +100453,42 @@ interface JQuery {
 	 * Merge unbound columns values inside data source when data source is remote. If true then the unbound columns are merged to the data source at runtime on the server. Note that data source is expanded with the new data and this could cause performance issues when the data is huge. If mergeUnboundColumns is false then the unbound data is sent and merged on the client. This option is used by the [igGrid MVC Helper](http://www.igniteui.com/help/iggrid-developing-asp-net-mvc-applications-with-iggrid).
 	 * Checkout [Populating Unbound Columns Remotely (igGrid)](http://www.igniteui.com/help/iggrid-unboundcolumns-populating-with-data-remotely) topic for more information.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "mergeUnboundColumns", optionValue: boolean): void;
 
 	/**
 	 * When dataSource is a remote URL, defines whether to set the type of the remote data source to JSONP.
+	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "jsonpRequest"): boolean;
 
 	/**
 	 * When dataSource is a remote URL, defines whether to set the type of the remote data source to JSONP.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "jsonpRequest", optionValue: boolean): void;
 
 	/**
 	 * Enables/disables grid adjusting its dimensions when its [width](ui.iggrid#options:width) and/or [height](ui.iggrid#options:height) is set in percent (%) and grid parent DOM container is resized.
+	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "enableResizeContainerCheck"): boolean;
 
 	/**
 	 * Enables/disables grid adjusting its dimensions when its [width](ui.iggrid#options:width) and/or [height](ui.iggrid#options:height) is set in percent (%) and grid parent DOM container is resized.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "enableResizeContainerCheck", optionValue: boolean): void;
 
 	/**
 	 * Configures how the feature chooser icon should display on header cells - e.g. to display as gear icon or not.
+	 *
 	 */
 
 	igTreeGrid(optionLiteral: 'option', optionName: "featureChooserIconDisplay"): string;
@@ -85728,6 +100496,7 @@ interface JQuery {
 	/**
 	 * Configures how the feature chooser icon should display on header cells - e.g. to display as gear icon or not.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -85735,12 +100504,14 @@ interface JQuery {
 
 	/**
 	 * Settings related to content scrolling.
+	 *
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "scrollSettings"): IgGridScrollSettings;
 
 	/**
 	 * Settings related to content scrolling.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGrid(optionLiteral: 'option', optionName: "scrollSettings", optionValue: IgGridScrollSettings): void;
@@ -86100,7 +100871,7 @@ interface JQuery {
 }
 interface IgTreeGridMultiColumnHeaders {
 	/**
-	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
+	 * This option is inherited from a parent widget and it's not applicable for the igTreeGrid.
 	 */
 	inherit?: boolean;
 
@@ -86131,6 +100902,11 @@ interface IgTreeGridMultiColumnHeaders {
 }
 interface IgTreeGridMultiColumnHeadersMethods {
 	destroy(): void;
+
+	/**
+	 * Changes the all locales into the widget element to the language specified in [options.language](ui.iggridmulticolumnheader#options:language)
+	 * Note that this method is for rare scenarios, see [language](ui.iggridmulticolumnheader#options:language) or [locale](ui.iggridmulticolumnheader#options:locale) option setter
+	 */
 	changeLocale(): void;
 
 	/**
@@ -86178,12 +100954,12 @@ interface JQuery {
 	igTreeGridMultiColumnHeaders(methodName: "getMultiColumnHeaders"): any[];
 
 	/**
-	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
+	 * This option is inherited from a parent widget and it's not applicable for the igTreeGrid.
 	 */
 	igTreeGridMultiColumnHeaders(optionLiteral: 'option', optionName: "inherit"): boolean;
 
 	/**
-	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
+	 * This option is inherited from a parent widget and it's not applicable for the igTreeGrid.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -86245,11 +101021,13 @@ interface JQuery {
 interface IgTreeGridPagingLocale {
 	/**
 	 * Sets/gets the text message shown while loading content of the context row(while processing breadcrumb/immediate parent row). It is set via $.html(). If set to null loading message is not shown.
+	 *
 	 */
 	contextRowLoadingText?: string;
 
 	/**
 	 * Sets/gets the content of the context row when the first record in the page is root(hasn't ancestors) record. It is set via $.html()
+	 *
 	 */
 	contextRowRootText?: string;
 
@@ -86320,6 +101098,7 @@ interface IgTreeGridPaging {
 	/**
 	 * Sets gets paging mode.
 	 *
+	 *
 	 * Valid values:
 	 * "rootLevelOnly" Only pages records at the root of the tree grid are displayed.
 	 * "allLevels" includes all visible records in paging.
@@ -86329,6 +101108,7 @@ interface IgTreeGridPaging {
 	/**
 	 * When data flows to the next page there are a couple of different modes that can help communicate the context of a leaf level row. When mode option is "rootLevelOnly" then the context row always shows the value of the contextRowRootText option.
 	 *
+	 *
 	 * Valid values:
 	 * "none" Does not render the contextual row
 	 * "parent" Renders a read-only representation of the immediate parent row
@@ -86352,48 +101132,62 @@ interface IgTreeGridPaging {
 
 	/**
 	 * Sets/gets the column key of ancestor to be shown in the breadcrumb trail. It is used only when contextRowMode is breadcrumb
+	 *
 	 */
 	breadcrumbKey?: string;
 
 	/**
 	 * Sets/gets (it is set via  $.html()) delimiter between ancestors in the breadcrumb trail. It is used only when contextRowMode is breadcrumb
+	 *
 	 */
 	breadcrumbDelimiter?: string;
 
 	/**
 	 * Reference to the (or name of )function, called before rendering context row content(rendering loading message/bread crumb/parent row). The function takes 4 arguments- dataRow, $textArea- jQuery representation of the text area of the context row(when mode is loading/breadcrumb then it is <span /> otherwise <tr />), array of parent rows and context mode - "loading"|"breadcrumb"|"parent". When the function returns string it is used as html set in $textArea. If the function does not return result or returns false/empty string then rendering of the content of the context row should be handled by the developer(similar to canceling rendering of context row content).
+	 *
 	 */
 	renderContextRowFunc?: Function|string;
 	locale?: IgTreeGridPagingLocale;
 
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for the igTreeGrid.
+	 */
+	inherit?: boolean;
+
 	/**
 	 * Number of records loaded and displayed per page.
+	 *
 	 */
 	pageSize?: number;
 
 	/**
 	 * The property in the response data, when using remote data source, that will hold the total number of records in the data source.
+	 *
 	 */
 	recordCountKey?: string;
 
 	/**
 	 * Denotes the name of the encoded URL parameter that will state what is the currently requested page size.
+	 *
 	 */
 	pageSizeUrlKey?: string;
 
 	/**
 	 * Denotes the name of the encoded URL parameter that will state what is the currently requested page index.
+	 *
 	 */
 	pageIndexUrlKey?: string;
 
 	/**
 	 * Current page index that's bound in the data source and rendered in the UI.
+	 *
 	 */
 	currentPageIndex?: number;
 
 	/**
 	 * Type of paging. Delegates all paging functionality to the [$.ig.DataSource](ig.datasource).
 	 *
+	 *
 	 * Valid values:
 	 * "remote" Paging is performed by a remote end-point.
 	 * "local" Paging is performed locally by the [$.ig.DataSource](ig.datasource).
@@ -86402,6 +101196,7 @@ interface IgTreeGridPaging {
 
 	/**
 	 * If false, a dropdown allowing to change the page size will not be rendered in the UI.
+	 *
 	 */
 	showPageSizeDropDown?: boolean;
 
@@ -86514,6 +101309,7 @@ interface IgTreeGridPaging {
 	/**
 	 * Page size dropdown location, when [showPageSizeDropDown](ui.iggridpaging#options:showPageSizeDropDown) is set to true. Can be rendered above the grid header or inside the pager, next to the page links.
 	 *
+	 *
 	 * Valid values:
 	 * "above" The page size drop down will be rendered above the grid header.
 	 * "inpager" The page size drop down will be rendered next to page links.
@@ -86522,54 +101318,58 @@ interface IgTreeGridPaging {
 
 	/**
 	 * Option specifying whether to show summary label for the currently rendered records or not.
+	 *
 	 */
 	showPagerRecordsLabel?: boolean;
 
 	/**
 	 * Option specifying whether to render the first and last page navigation buttons.
+	 *
 	 */
 	showFirstLastPages?: boolean;
 
 	/**
 	 * Option specifying whether to render the previous and next page navigation buttons.
+	 *
 	 */
 	showPrevNextPages?: boolean;
 
 	/**
 	 * Predefined page sizes that are available to the end user to switch their grid paging to, through a drop down in the grid header.
+	 *
 	 */
 	pageSizeList?: any;
 
 	/**
 	 * Sets/Gets the number of pages which if exceeded a drop down list of page indices is displayed. If the number of pages is less than or equal to this option then buttons for each page are displayed.
+	 *
 	 */
 	pageCountLimit?: number;
 
 	/**
 	 * Number of page buttons, adjacent to and including the [active page](ui.iggridpaging#options:currentPageIndex), that are constantly visible. For the invisible pages, previous and next buttons are used.
+	 *
 	 */
 	visiblePageCount?: number;
 
 	/**
 	 * Drop down width for the page size and page index drop downs.
+	 *
 	 */
 	defaultDropDownWidth?: number;
 
 	/**
 	 * Time in milliseconds for which page drop down will wait for keystrokes before changing the page.
+	 *
 	 */
 	delayOnPageChanged?: number;
 
 	/**
 	 * Enables/disables paging persistence between states.
+	 *
 	 */
 	persist?: boolean;
 
-	/**
-	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
-	 */
-	inherit?: boolean;
-
 	/**
 	 * Event fired before rendering context row content.
 	 * Return false in order to cancel this event.
@@ -86595,7 +101395,6 @@ interface IgTreeGridPaging {
 	/**
 	 * Event fired when the page size is about to be changed from the page size dropdown.
 	 * Return false in order to cancel page size changing.
-	 * Use ui.newPageSize to get new page size.
 	 */
 	pageSizeChanging?: PageSizeChangingEvent;
 
@@ -86621,6 +101420,10 @@ interface IgTreeGridPaging {
 	[optionName: string]: any;
 }
 interface IgTreeGridPagingMethods {
+	/**
+	 * Changes the all locales into the widget element to the language specified in [options.language](ui.igtreegridpaging#options:language)
+	 * Note that this method is for rare scenarios, see [language](ui.igtreegridpaging#options:language) or [locale](ui.igtreegridpaging#options:locale) option setter
+	 */
 	changeLocale(): void;
 
 	/**
@@ -86637,6 +101440,8 @@ interface IgTreeGridPagingMethods {
 	 * Get jQuery representation of element that holds text area of the context row. If there isn't such element - creates it.
 	 */
 	getContextRowTextArea(): Object;
+	changeGlobalLanguage(): void;
+	changeGlobalRegional(): void;
 
 	/**
 	 * Gets/Sets the current page index, delegates data binding and paging to [$.ig.DataSource](ig.datasource).
@@ -86661,11 +101466,14 @@ interface JQuery {
 	igTreeGridPaging(methodName: "destroy"): void;
 	igTreeGridPaging(methodName: "getContextRow"): Object;
 	igTreeGridPaging(methodName: "getContextRowTextArea"): Object;
+	igTreeGridPaging(methodName: "changeGlobalLanguage"): void;
+	igTreeGridPaging(methodName: "changeGlobalRegional"): void;
 	igTreeGridPaging(methodName: "pageIndex", index?: number): number;
 	igTreeGridPaging(methodName: "pageSize", size?: number): number;
 
 	/**
 	 * Sets gets paging mode.
+	 *
 	 */
 
 	igTreeGridPaging(optionLiteral: 'option', optionName: "mode"): string;
@@ -86673,6 +101481,7 @@ interface JQuery {
 	/**
 	 * Sets gets paging mode.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -86680,6 +101489,7 @@ interface JQuery {
 
 	/**
 	 * When data flows to the next page there are a couple of different modes that can help communicate the context of a leaf level row. When mode option is "rootLevelOnly" then the context row always shows the value of the contextRowRootText option.
+	 *
 	 */
 
 	igTreeGridPaging(optionLiteral: 'option', optionName: "contextRowMode"): string;
@@ -86687,6 +101497,7 @@ interface JQuery {
 	/**
 	 * When data flows to the next page there are a couple of different modes that can help communicate the context of a leaf level row. When mode option is "rootLevelOnly" then the context row always shows the value of the contextRowRootText option.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -86726,30 +101537,35 @@ interface JQuery {
 
 	/**
 	 * Sets/gets the column key of ancestor to be shown in the breadcrumb trail. It is used only when contextRowMode is breadcrumb
+	 *
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "breadcrumbKey"): string;
 
 	/**
 	 * Sets/gets the column key of ancestor to be shown in the breadcrumb trail. It is used only when contextRowMode is breadcrumb
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "breadcrumbKey", optionValue: string): void;
 
 	/**
 	 * Sets/gets (it is set via  $.html()) delimiter between ancestors in the breadcrumb trail. It is used only when contextRowMode is breadcrumb
+	 *
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "breadcrumbDelimiter"): string;
 
 	/**
 	 * Sets/gets (it is set via  $.html()) delimiter between ancestors in the breadcrumb trail. It is used only when contextRowMode is breadcrumb
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "breadcrumbDelimiter", optionValue: string): void;
 
 	/**
 	 * Reference to the (or name of )function, called before rendering context row content(rendering loading message/bread crumb/parent row). The function takes 4 arguments- dataRow, $textArea- jQuery representation of the text area of the context row(when mode is loading/breadcrumb then it is <span /> otherwise <tr />), array of parent rows and context mode - "loading"|"breadcrumb"|"parent". When the function returns string it is used as html set in $textArea. If the function does not return result or returns false/empty string then rendering of the content of the context row should be handled by the developer(similar to canceling rendering of context row content).
+	 *
 	 */
 
 	igTreeGridPaging(optionLiteral: 'option', optionName: "renderContextRowFunc"): Function|string;
@@ -86757,6 +101573,7 @@ interface JQuery {
 	/**
 	 * Reference to the (or name of )function, called before rendering context row content(rendering loading message/bread crumb/parent row). The function takes 4 arguments- dataRow, $textArea- jQuery representation of the text area of the context row(when mode is loading/breadcrumb then it is <span /> otherwise <tr />), array of parent rows and context mode - "loading"|"breadcrumb"|"parent". When the function returns string it is used as html set in $textArea. If the function does not return result or returns false/empty string then rendering of the content of the context row should be handled by the developer(similar to canceling rendering of context row content).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -86764,68 +101581,91 @@ interface JQuery {
 	igTreeGridPaging(optionLiteral: 'option', optionName: "locale"): IgTreeGridPagingLocale;
 	igTreeGridPaging(optionLiteral: 'option', optionName: "locale", optionValue: IgTreeGridPagingLocale): void;
 
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for the igTreeGrid.
+	 */
+	igTreeGridPaging(optionLiteral: 'option', optionName: "inherit"): boolean;
+
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for the igTreeGrid.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTreeGridPaging(optionLiteral: 'option', optionName: "inherit", optionValue: boolean): void;
+
 	/**
 	 * Number of records loaded and displayed per page.
+	 *
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "pageSize"): number;
 
 	/**
 	 * Number of records loaded and displayed per page.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "pageSize", optionValue: number): void;
 
 	/**
 	 * The property in the response data, when using remote data source, that will hold the total number of records in the data source.
+	 *
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "recordCountKey"): string;
 
 	/**
 	 * The property in the response data, when using remote data source, that will hold the total number of records in the data source.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "recordCountKey", optionValue: string): void;
 
 	/**
 	 * Denotes the name of the encoded URL parameter that will state what is the currently requested page size.
+	 *
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "pageSizeUrlKey"): string;
 
 	/**
 	 * Denotes the name of the encoded URL parameter that will state what is the currently requested page size.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "pageSizeUrlKey", optionValue: string): void;
 
 	/**
 	 * Denotes the name of the encoded URL parameter that will state what is the currently requested page index.
+	 *
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "pageIndexUrlKey"): string;
 
 	/**
 	 * Denotes the name of the encoded URL parameter that will state what is the currently requested page index.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "pageIndexUrlKey", optionValue: string): void;
 
 	/**
 	 * Current page index that's bound in the data source and rendered in the UI.
+	 *
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "currentPageIndex"): number;
 
 	/**
 	 * Current page index that's bound in the data source and rendered in the UI.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "currentPageIndex", optionValue: number): void;
 
 	/**
 	 * Type of paging. Delegates all paging functionality to the [$.ig.DataSource](ig.datasource).
+	 *
 	 */
 
 	igTreeGridPaging(optionLiteral: 'option', optionName: "type"): string;
@@ -86833,6 +101673,7 @@ interface JQuery {
 	/**
 	 * Type of paging. Delegates all paging functionality to the [$.ig.DataSource](ig.datasource).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -86840,12 +101681,14 @@ interface JQuery {
 
 	/**
 	 * If false, a dropdown allowing to change the page size will not be rendered in the UI.
+	 *
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "showPageSizeDropDown"): boolean;
 
 	/**
 	 * If false, a dropdown allowing to change the page size will not be rendered in the UI.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "showPageSizeDropDown", optionValue: boolean): void;
@@ -87098,6 +101941,7 @@ interface JQuery {
 
 	/**
 	 * Page size dropdown location, when [showPageSizeDropDown](ui.iggridpaging#options:showPageSizeDropDown) is set to true. Can be rendered above the grid header or inside the pager, next to the page links.
+	 *
 	 */
 
 	igTreeGridPaging(optionLiteral: 'option', optionName: "pageSizeDropDownLocation"): string;
@@ -87105,6 +101949,7 @@ interface JQuery {
 	/**
 	 * Page size dropdown location, when [showPageSizeDropDown](ui.iggridpaging#options:showPageSizeDropDown) is set to true. Can be rendered above the grid header or inside the pager, next to the page links.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -87112,123 +101957,129 @@ interface JQuery {
 
 	/**
 	 * Option specifying whether to show summary label for the currently rendered records or not.
+	 *
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "showPagerRecordsLabel"): boolean;
 
 	/**
 	 * Option specifying whether to show summary label for the currently rendered records or not.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "showPagerRecordsLabel", optionValue: boolean): void;
 
 	/**
 	 * Option specifying whether to render the first and last page navigation buttons.
+	 *
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "showFirstLastPages"): boolean;
 
 	/**
 	 * Option specifying whether to render the first and last page navigation buttons.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "showFirstLastPages", optionValue: boolean): void;
 
 	/**
 	 * Option specifying whether to render the previous and next page navigation buttons.
+	 *
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "showPrevNextPages"): boolean;
 
 	/**
 	 * Option specifying whether to render the previous and next page navigation buttons.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "showPrevNextPages", optionValue: boolean): void;
 
 	/**
 	 * Predefined page sizes that are available to the end user to switch their grid paging to, through a drop down in the grid header.
+	 *
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "pageSizeList"): any;
 
 	/**
 	 * Predefined page sizes that are available to the end user to switch their grid paging to, through a drop down in the grid header.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "pageSizeList", optionValue: any): void;
 
 	/**
 	 * Sets/Gets the number of pages which if exceeded a drop down list of page indices is displayed. If the number of pages is less than or equal to this option then buttons for each page are displayed.
+	 *
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "pageCountLimit"): number;
 
 	/**
 	 * Sets/ the number of pages which if exceeded a drop down list of page indices is displayed. If the number of pages is less than or equal to this option then buttons for each page are displayed.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "pageCountLimit", optionValue: number): void;
 
 	/**
 	 * Number of page buttons, adjacent to and including the [active page](ui.iggridpaging#options:currentPageIndex), that are constantly visible. For the invisible pages, previous and next buttons are used.
+	 *
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "visiblePageCount"): number;
 
 	/**
 	 * Number of page buttons, adjacent to and including the [active page](ui.iggridpaging#options:currentPageIndex), that are constantly visible. For the invisible pages, previous and next buttons are used.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "visiblePageCount", optionValue: number): void;
 
 	/**
 	 * Drop down width for the page size and page index drop downs.
+	 *
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "defaultDropDownWidth"): number;
 
 	/**
 	 * Drop down width for the page size and page index drop downs.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "defaultDropDownWidth", optionValue: number): void;
 
 	/**
 	 * Time in milliseconds for which page drop down will wait for keystrokes before changing the page.
+	 *
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "delayOnPageChanged"): number;
 
 	/**
 	 * Time in milliseconds for which page drop down will wait for keystrokes before changing the page.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "delayOnPageChanged", optionValue: number): void;
 
 	/**
 	 * Enables/disables paging persistence between states.
+	 *
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "persist"): boolean;
 
 	/**
 	 * Enables/disables paging persistence between states.
 	 *
-	 * @optionValue New value to be set.
-	 */
-	igTreeGridPaging(optionLiteral: 'option', optionName: "persist", optionValue: boolean): void;
-
-	/**
-	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
-	 */
-	igTreeGridPaging(optionLiteral: 'option', optionName: "inherit"): boolean;
-
-	/**
-	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
 	 *
 	 * @optionValue New value to be set.
 	 */
-	igTreeGridPaging(optionLiteral: 'option', optionName: "inherit", optionValue: boolean): void;
+	igTreeGridPaging(optionLiteral: 'option', optionName: "persist", optionValue: boolean): void;
 
 	/**
 	 * Event fired before rendering context row content.
@@ -87285,14 +102136,12 @@ interface JQuery {
 	/**
 	 * Event fired when the page size is about to be changed from the page size dropdown.
 	 * Return false in order to cancel page size changing.
-	 * Use ui.newPageSize to get new page size.
 	 */
 	igTreeGridPaging(optionLiteral: 'option', optionName: "pageSizeChanging"): PageSizeChangingEvent;
 
 	/**
 	 * Event fired when the page size is about to be changed from the page size dropdown.
 	 * Return false in order to cancel page size changing.
-	 * Use ui.newPageSize to get new page size.
 	 *
 	 * @optionValue Define event handler function.
 	 */
@@ -87342,31 +102191,35 @@ interface JQuery {
 	igTreeGridPaging(methodName: string, ...methodParams: any[]): any;
 }
 interface IgTreeGridResizing {
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for the igTreeGrid.
+	 */
+	inherit?: boolean;
+
 	/**
 	 * Resize the column to the size of the longest currently visible cell value.
+	 *
 	 */
 	allowDoubleClickToResize?: boolean;
 
 	/**
 	 * Specifies whether the resizing should be deferred until the user finishes resizing or applied immediately.
+	 *
 	 */
 	deferredResizing?: boolean;
 
 	/**
 	 * A list of column settings that specifies resizing options on a per column basis.
+	 *
 	 */
 	columnSettings?: IgGridResizingColumnSetting[];
 
 	/**
 	 * The width in pixels of the resizing handle which is position at the right side of each resizeable column header.
+	 *
 	 */
 	handleThreshold?: number;
 
-	/**
-	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
-	 */
-	inherit?: boolean;
-
 	/**
 	 * Event fired before a resizing operation is executed.
 	 */
@@ -87389,6 +102242,8 @@ interface IgTreeGridResizing {
 }
 interface IgTreeGridResizingMethods {
 	destroy(): void;
+	changeGlobalLanguage(): void;
+	changeGlobalRegional(): void;
 
 	/**
 	 * Resizes a column to a specified width in pixels, percents or auto if no width is specified.
@@ -87404,67 +102259,77 @@ interface JQuery {
 
 interface JQuery {
 	igTreeGridResizing(methodName: "destroy"): void;
+	igTreeGridResizing(methodName: "changeGlobalLanguage"): void;
+	igTreeGridResizing(methodName: "changeGlobalRegional"): void;
 	igTreeGridResizing(methodName: "resize", column: Object, width?: Object): void;
 
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for the igTreeGrid.
+	 */
+	igTreeGridResizing(optionLiteral: 'option', optionName: "inherit"): boolean;
+
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for the igTreeGrid.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTreeGridResizing(optionLiteral: 'option', optionName: "inherit", optionValue: boolean): void;
+
 	/**
 	 * Resize the column to the size of the longest currently visible cell value.
+	 *
 	 */
 	igTreeGridResizing(optionLiteral: 'option', optionName: "allowDoubleClickToResize"): boolean;
 
 	/**
 	 * Resize the column to the size of the longest currently visible cell value.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridResizing(optionLiteral: 'option', optionName: "allowDoubleClickToResize", optionValue: boolean): void;
 
 	/**
 	 * Gets whether the resizing should be deferred until the user finishes resizing or applied immediately.
+	 *
 	 */
 	igTreeGridResizing(optionLiteral: 'option', optionName: "deferredResizing"): boolean;
 
 	/**
 	 * Sets whether the resizing should be deferred until the user finishes resizing or applied immediately.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridResizing(optionLiteral: 'option', optionName: "deferredResizing", optionValue: boolean): void;
 
 	/**
 	 * A list of column settings that specifies resizing options on a per column basis.
+	 *
 	 */
 	igTreeGridResizing(optionLiteral: 'option', optionName: "columnSettings"): IgGridResizingColumnSetting[];
 
 	/**
 	 * A list of column settings that specifies resizing options on a per column basis.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridResizing(optionLiteral: 'option', optionName: "columnSettings", optionValue: IgGridResizingColumnSetting[]): void;
 
 	/**
 	 * The width in pixels of the resizing handle which is position at the right side of each resizeable column header.
+	 *
 	 */
 	igTreeGridResizing(optionLiteral: 'option', optionName: "handleThreshold"): number;
 
 	/**
 	 * The width in pixels of the resizing handle which is position at the right side of each resizeable column header.
 	 *
-	 * @optionValue New value to be set.
-	 */
-	igTreeGridResizing(optionLiteral: 'option', optionName: "handleThreshold", optionValue: number): void;
-
-	/**
-	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
-	 */
-	igTreeGridResizing(optionLiteral: 'option', optionName: "inherit"): boolean;
-
-	/**
-	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
 	 *
 	 * @optionValue New value to be set.
 	 */
-	igTreeGridResizing(optionLiteral: 'option', optionName: "inherit", optionValue: boolean): void;
+	igTreeGridResizing(optionLiteral: 'option', optionName: "handleThreshold", optionValue: number): void;
 
 	/**
 	 * Event fired before a resizing operation is executed.
@@ -87511,6 +102376,7 @@ interface IgTreeGridRowSelectors {
 	/**
 	 * Determines row numbering format.
 	 *
+	 *
 	 * Valid values:
 	 * "sequential" Defines numbering format to be the index of the visible records.
 	 * "hierarchical" Defines numbering format to be concatenation of the parent and children indexes.
@@ -87520,30 +102386,40 @@ interface IgTreeGridRowSelectors {
 	/**
 	 * Gets the type of checkboxes rendered in the row selector. Can be set only at initialization.
 	 *
+	 *
 	 * Valid values:
 	 * "biState" Checkboxes are rendered and support two states(checked and unchecked). Checkboxes do not cascade down or up in this mode.
 	 * "triState" Checkboxes are rendered and support three states(checked, partial and unchecked). Checkboxes cascade up and down in this mode.
 	 */
 	checkBoxMode?: string;
 
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for the igTreeGrid.
+	 */
+	inherit?: boolean;
+
 	/**
 	 * Determines whether the row selectors column should contain row numbering
+	 *
 	 */
 	enableRowNumbering?: boolean;
 
 	/**
 	 * Determines whether the row selectors column should contain checkboxes
+	 *
 	 */
 	enableCheckBoxes?: boolean;
 
 	/**
 	 * The seed to be added to the default numbering
+	 *
 	 */
 	rowNumberingSeed?: number;
 
 	/**
 	 * defines width of the row selector`s column in pixels or percentage.
 	 *
+	 *
 	 * Valid values:
 	 * "string" The row selector column width can be set in pixels (px) and percentage (%)
 	 * "number" The row selector width can be set as a number
@@ -87555,21 +102431,19 @@ interface IgTreeGridRowSelectors {
 	 * Determines whether the selection feature is required for the row selectors. If set to "false"
 	 * the widget will not check for Selection availability. If set to "true" an exception will be thrown if Selection is
 	 * not available.
+	 *
 	 */
 	requireSelection?: boolean;
 
 	/**
 	 * Determines whether checkboxes will be shown only if row selectors are on focus/selected.
+	 *
 	 */
 	showCheckBoxesOnFocus?: boolean;
 
-	/**
-	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
-	 */
-	inherit?: boolean;
-
 	/**
 	 * Enables/disables showing an overlay after clicking on the header checkbox, which allows selecting all records from all pages.
+	 *
 	 */
 	enableSelectAllForPaging?: boolean;
 
@@ -87579,6 +102453,7 @@ interface IgTreeGridRowSelectors {
 	 * Element with attribute data-rs-close-all is used for closing the overlay
 	 * The default template is "<div class='ui-widget-header ui-priority-secondary' tabindex='0'><div>You have selected ${checked} records. <a href='#' tabindex='0' data-rs-select-all>Select all ${totalRecordsCount} records</a><div style='float:right;'><span data-rs-close-all class='ui-icon-close ui-icon ui-button' tabindex='0'></div></span></div></div>"
 	 * There is also ${allCheckedRecords} parameter which is not used in the default template, but it represents the checked records from all pages.
+	 *
 	 */
 	selectAllForPagingTemplate?: string;
 
@@ -87588,6 +102463,7 @@ interface IgTreeGridRowSelectors {
 	 * Element with attribute data-rs-close-all is used for closing the overlay
 	 * The default template is "<div class='ui-widget-header ui-priority-secondary' tabindex='0'><div>You have deselected ${unchecked} records. <a href='#' tabindex='0' data-rs-deselect-all>Deselect all ${totalRecordsCount} records</a><div style='float:right;'><span data-rs-close-all class='ui-icon-close ui-icon ui-button' tabindex='0'></div></span></div></div>"
 	 * There is also ${allCheckedRecords} parameter which is not used in the default template, but it represents the checked records from all pages.
+	 *
 	 */
 	deselectAllForPagingTemplate?: string;
 	locale?: IgGridRowSelectorsLocale;
@@ -87614,6 +102490,11 @@ interface IgTreeGridRowSelectors {
 }
 interface IgTreeGridRowSelectorsMethods {
 	destroy(): void;
+
+	/**
+	 * Changes the all locales into the widget element to the language specified in [options.language](ui.igtreegridrowselectors#options:language)
+	 * Note that this method is for rare scenarios, see [language](ui.igtreegridrowselectors#options:language) or [locale](ui.igtreegridrowselectors#options:locale) option setter
+	 */
 	changeLocale(): void;
 
 	/**
@@ -87663,6 +102544,8 @@ interface IgTreeGridRowSelectorsMethods {
 
 	/**
 	 * Returns the check state of the row by id.
+	 *
+	 * @param rowId
 	 */
 	checkStateById(rowId: Object): string;
 }
@@ -87684,6 +102567,7 @@ interface JQuery {
 
 	/**
 	 * Determines row numbering format.
+	 *
 	 */
 
 	igTreeGridRowSelectors(optionLiteral: 'option', optionName: "rowSelectorNumberingMode"): string;
@@ -87691,6 +102575,7 @@ interface JQuery {
 	/**
 	 * Determines row numbering format.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -87698,6 +102583,7 @@ interface JQuery {
 
 	/**
 	 * Gets the type of checkboxes rendered in the row selector. Can be set only at initialization.
+	 *
 	 */
 
 	igTreeGridRowSelectors(optionLiteral: 'option', optionName: "checkBoxMode"): string;
@@ -87705,49 +102591,69 @@ interface JQuery {
 	/**
 	 * The type of checkboxes rendered in the row selector. Can be set only at initialization.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
 	igTreeGridRowSelectors(optionLiteral: 'option', optionName: "checkBoxMode", optionValue: string): void;
 
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for the igTreeGrid.
+	 */
+	igTreeGridRowSelectors(optionLiteral: 'option', optionName: "inherit"): boolean;
+
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for the igTreeGrid.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTreeGridRowSelectors(optionLiteral: 'option', optionName: "inherit", optionValue: boolean): void;
+
 	/**
 	 * Determines whether the row selectors column should contain row numbering
+	 *
 	 */
 	igTreeGridRowSelectors(optionLiteral: 'option', optionName: "enableRowNumbering"): boolean;
 
 	/**
 	 * Determines whether the row selectors column should contain row numbering
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridRowSelectors(optionLiteral: 'option', optionName: "enableRowNumbering", optionValue: boolean): void;
 
 	/**
 	 * Determines whether the row selectors column should contain checkboxes
+	 *
 	 */
 	igTreeGridRowSelectors(optionLiteral: 'option', optionName: "enableCheckBoxes"): boolean;
 
 	/**
 	 * Determines whether the row selectors column should contain checkboxes
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridRowSelectors(optionLiteral: 'option', optionName: "enableCheckBoxes", optionValue: boolean): void;
 
 	/**
 	 * The seed to be added to the default numbering
+	 *
 	 */
 	igTreeGridRowSelectors(optionLiteral: 'option', optionName: "rowNumberingSeed"): number;
 
 	/**
 	 * The seed to be added to the default numbering
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridRowSelectors(optionLiteral: 'option', optionName: "rowNumberingSeed", optionValue: number): void;
 
 	/**
 	 * Defines width of the row selector`s column in pixels or percentage.
+	 *
 	 */
 
 	igTreeGridRowSelectors(optionLiteral: 'option', optionName: "rowSelectorColumnWidth"): string|number;
@@ -87755,6 +102661,7 @@ interface JQuery {
 	/**
 	 * Defines width of the row selector`s column in pixels or percentage.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -87764,6 +102671,7 @@ interface JQuery {
 	 * Determines whether the selection feature is required for the row selectors. If set to "false"
 	 * the widget will not check for Selection availability. If set to "true" an exception will be thrown if Selection is
 	 * not available.
+	 *
 	 */
 	igTreeGridRowSelectors(optionLiteral: 'option', optionName: "requireSelection"): boolean;
 
@@ -87772,42 +102680,35 @@ interface JQuery {
 	 * the widget will not check for Selection availability. If set to "true" an exception will be thrown if Selection is
 	 * not available.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridRowSelectors(optionLiteral: 'option', optionName: "requireSelection", optionValue: boolean): void;
 
 	/**
 	 * Determines whether checkboxes will be shown only if row selectors are on focus/selected.
+	 *
 	 */
 	igTreeGridRowSelectors(optionLiteral: 'option', optionName: "showCheckBoxesOnFocus"): boolean;
 
 	/**
 	 * Determines whether checkboxes will be shown only if row selectors are on focus/selected.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridRowSelectors(optionLiteral: 'option', optionName: "showCheckBoxesOnFocus", optionValue: boolean): void;
 
-	/**
-	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
-	 */
-	igTreeGridRowSelectors(optionLiteral: 'option', optionName: "inherit"): boolean;
-
-	/**
-	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igTreeGridRowSelectors(optionLiteral: 'option', optionName: "inherit", optionValue: boolean): void;
-
 	/**
 	 * Enables/disables showing an overlay after clicking on the header checkbox, which allows selecting all records from all pages.
+	 *
 	 */
 	igTreeGridRowSelectors(optionLiteral: 'option', optionName: "enableSelectAllForPaging"): boolean;
 
 	/**
 	 * Enables/disables showing an overlay after clicking on the header checkbox, which allows selecting all records from all pages.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridRowSelectors(optionLiteral: 'option', optionName: "enableSelectAllForPaging", optionValue: boolean): void;
@@ -87818,6 +102719,7 @@ interface JQuery {
 	 * Element with attribute data-rs-close-all is used for closing the overlay
 	 * The default template is "<div class='ui-widget-header ui-priority-secondary' tabindex='0'><div>You have selected ${checked} records. <a href='#' tabindex='0' data-rs-select-all>Select all ${totalRecordsCount} records</a><div style='float:right;'><span data-rs-close-all class='ui-icon-close ui-icon ui-button' tabindex='0'></div></span></div></div>"
 	 * There is also ${allCheckedRecords} parameter which is not used in the default template, but it represents the checked records from all pages.
+	 *
 	 */
 	igTreeGridRowSelectors(optionLiteral: 'option', optionName: "selectAllForPagingTemplate"): string;
 
@@ -87828,6 +102730,7 @@ interface JQuery {
 	 * The default template is "<div class='ui-widget-header ui-priority-secondary' tabindex='0'><div>You have selected ${checked} records. <a href='#' tabindex='0' data-rs-select-all>Select all ${totalRecordsCount} records</a><div style='float:right;'><span data-rs-close-all class='ui-icon-close ui-icon ui-button' tabindex='0'></div></span></div></div>"
 	 * There is also ${allCheckedRecords} parameter which is not used in the default template, but it represents the checked records from all pages.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridRowSelectors(optionLiteral: 'option', optionName: "selectAllForPagingTemplate", optionValue: string): void;
@@ -87838,6 +102741,7 @@ interface JQuery {
 	 * Element with attribute data-rs-close-all is used for closing the overlay
 	 * The default template is "<div class='ui-widget-header ui-priority-secondary' tabindex='0'><div>You have deselected ${unchecked} records. <a href='#' tabindex='0' data-rs-deselect-all>Deselect all ${totalRecordsCount} records</a><div style='float:right;'><span data-rs-close-all class='ui-icon-close ui-icon ui-button' tabindex='0'></div></span></div></div>"
 	 * There is also ${allCheckedRecords} parameter which is not used in the default template, but it represents the checked records from all pages.
+	 *
 	 */
 	igTreeGridRowSelectors(optionLiteral: 'option', optionName: "deselectAllForPagingTemplate"): string;
 
@@ -87848,6 +102752,7 @@ interface JQuery {
 	 * The default template is "<div class='ui-widget-header ui-priority-secondary' tabindex='0'><div>You have deselected ${unchecked} records. <a href='#' tabindex='0' data-rs-deselect-all>Deselect all ${totalRecordsCount} records</a><div style='float:right;'><span data-rs-close-all class='ui-icon-close ui-icon ui-button' tabindex='0'></div></span></div></div>"
 	 * There is also ${allCheckedRecords} parameter which is not used in the default template, but it represents the checked records from all pages.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridRowSelectors(optionLiteral: 'option', optionName: "deselectAllForPagingTemplate", optionValue: string): void;
@@ -87898,17 +102803,20 @@ interface JQuery {
 interface IgTreeGridSelection {
 	/**
 	 * Enables / Disables multiple selection of cells and rows - depending on the mode
+	 *
 	 */
 	multipleSelection?: boolean;
 
 	/**
 	 * Enables / disables selection via dragging with the mouse - only applicable for cell selection
+	 *
 	 */
 	mouseDragSelect?: boolean;
 
 	/**
 	 * Defines type of the selection.
 	 *
+	 *
 	 * Valid values:
 	 * "row" Defines row selection mode.
 	 * "cell" Defines cell selection mode.
@@ -87917,36 +102825,43 @@ interface IgTreeGridSelection {
 
 	/**
 	 * Enables / disables activation of rows and cells. Activation implies ability to perform navigating through cells and rows via the keyboard, and selecting rows and cells using CTRL / SHIFT - in the way cells/rows are selected in Ms Excel
+	 *
 	 */
 	activation?: boolean;
 
 	/**
 	 * If wrapAround is enabled and selection is on the first or last row or cell, then when the end user tries to go beyond that, the first/last row or cell will be selected
+	 *
 	 */
 	wrapAround?: boolean;
 
 	/**
 	 * If true will basically skip going into child grids with down / up / right / left arrow keys, when in the context of hierarchical grid
+	 *
 	 */
 	skipChildren?: boolean;
 
 	/**
 	 * If true multiple selection of cells is done as if CTRL is being held. the option is disregarded if mode is set to row. this option is useful for enabling multiple discountinued selection on touch environments.
+	 *
 	 */
 	multipleCellSelectOnClick?: boolean;
 
 	/**
-	 * Enables / disables selection via continuous touch event - only applicable for cell selection and touch-supported environments
+	 * Deprecated="true" Enables / disables selection via continuous touch event - only applicable for cell selection and touch-supported environments
+	 *
 	 */
 	touchDragSelect?: boolean;
 
 	/**
 	 * Enables / disables selection persistance between states.
+	 *
 	 */
 	persist?: boolean;
 
 	/**
 	 * Enables / disables the ability to ctrl drag multiple selection windows when selection mode is 'cell'
+	 *
 	 */
 	allowMultipleRangeSelection?: boolean;
 
@@ -88131,30 +103046,35 @@ interface JQuery {
 
 	/**
 	 * Enables / Disables multiple selection of cells and rows - depending on the mode
+	 *
 	 */
 	igTreeGridSelection(optionLiteral: 'option', optionName: "multipleSelection"): boolean;
 
 	/**
 	 * Enables / Disables multiple selection of cells and rows - depending on the mode
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridSelection(optionLiteral: 'option', optionName: "multipleSelection", optionValue: boolean): void;
 
 	/**
 	 * Enables / disables selection via dragging with the mouse - only applicable for cell selection
+	 *
 	 */
 	igTreeGridSelection(optionLiteral: 'option', optionName: "mouseDragSelect"): boolean;
 
 	/**
 	 * Enables / disables selection via dragging with the mouse - only applicable for cell selection
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridSelection(optionLiteral: 'option', optionName: "mouseDragSelect", optionValue: boolean): void;
 
 	/**
 	 * Defines type of the selection.
+	 *
 	 */
 
 	igTreeGridSelection(optionLiteral: 'option', optionName: "mode"): string;
@@ -88162,6 +103082,7 @@ interface JQuery {
 	/**
 	 * Defines type of the selection.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -88169,59 +103090,69 @@ interface JQuery {
 
 	/**
 	 * Enables / disables activation of rows and cells. Activation implies ability to perform navigating through cells and rows via the keyboard, and selecting rows and cells using CTRL / SHIFT - in the way cells/rows are selected in Ms Excel
+	 *
 	 */
 	igTreeGridSelection(optionLiteral: 'option', optionName: "activation"): boolean;
 
 	/**
 	 * Enables / disables activation of rows and cells. Activation implies ability to perform navigating through cells and rows via the keyboard, and selecting rows and cells using CTRL / SHIFT - in the way cells/rows are selected in Ms Excel
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridSelection(optionLiteral: 'option', optionName: "activation", optionValue: boolean): void;
 
 	/**
 	 * If wrapAround is enabled and selection is on the first or last row or cell, then when the end user tries to go beyond that, the first/last row or cell will be selected
+	 *
 	 */
 	igTreeGridSelection(optionLiteral: 'option', optionName: "wrapAround"): boolean;
 
 	/**
 	 * If wrapAround is enabled and selection is on the first or last row or cell, then when the end user tries to go beyond that, the first/last row or cell will be selected
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridSelection(optionLiteral: 'option', optionName: "wrapAround", optionValue: boolean): void;
 
 	/**
 	 * If true will basically skip going into child grids with down / up / right / left arrow keys, when in the context of hierarchical grid
+	 *
 	 */
 	igTreeGridSelection(optionLiteral: 'option', optionName: "skipChildren"): boolean;
 
 	/**
 	 * If true will basically skip going into child grids with down / up / right / left arrow keys, when in the context of hierarchical grid
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridSelection(optionLiteral: 'option', optionName: "skipChildren", optionValue: boolean): void;
 
 	/**
 	 * If true multiple selection of cells is done as if CTRL is being held. the option is disregarded if mode is set to row. this option is useful for enabling multiple discountinued selection on touch environments.
+	 *
 	 */
 	igTreeGridSelection(optionLiteral: 'option', optionName: "multipleCellSelectOnClick"): boolean;
 
 	/**
 	 * If true multiple selection of cells is done as if CTRL is being held. the option is disregarded if mode is set to row. this option is useful for enabling multiple discountinued selection on touch environments.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridSelection(optionLiteral: 'option', optionName: "multipleCellSelectOnClick", optionValue: boolean): void;
 
 	/**
-	 * Enables / disables selection via continuous touch event - only applicable for cell selection and touch-supported environments
+	 * Deprecated="true" Enables / disables selection via continuous touch event - only applicable for cell selection and touch-supported environments
+	 *
 	 */
 	igTreeGridSelection(optionLiteral: 'option', optionName: "touchDragSelect"): boolean;
 
 	/**
-	 * Enables / disables selection via continuous touch event - only applicable for cell selection and touch-supported environments
+	 * Deprecated="true" Enables / disables selection via continuous touch event - only applicable for cell selection and touch-supported environments
+	 *
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -88229,24 +103160,28 @@ interface JQuery {
 
 	/**
 	 * Enables / disables selection persistance between states.
+	 *
 	 */
 	igTreeGridSelection(optionLiteral: 'option', optionName: "persist"): boolean;
 
 	/**
 	 * Enables / disables selection persistance between states.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridSelection(optionLiteral: 'option', optionName: "persist", optionValue: boolean): void;
 
 	/**
 	 * Enables / disables the ability to ctrl drag multiple selection windows when selection mode is 'cell'
+	 *
 	 */
 	igTreeGridSelection(optionLiteral: 'option', optionName: "allowMultipleRangeSelection"): boolean;
 
 	/**
 	 * Enables / disables the ability to ctrl drag multiple selection windows when selection mode is 'cell'
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridSelection(optionLiteral: 'option', optionName: "allowMultipleRangeSelection", optionValue: boolean): void;
@@ -88363,17 +103298,25 @@ interface JQuery {
 interface IgTreeGridSorting {
 	/**
 	 * Specifies from which data bound level to be applied sorting - 0 is the first level
+	 *
 	 */
 	fromLevel?: number;
 
 	/**
 	 * Specifies to which data bound level to be applied sorting - if -1 sorting should be applied to the last data bound level
+	 *
 	 */
 	toLevel?: number;
 
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for the igTreeGrid.
+	 */
+	inherit?: boolean;
+
 	/**
 	 * Defines local or remote sorting operations.
 	 *
+	 *
 	 * Valid values:
 	 * "remote" Sorting is performed remotely as a server-side operation.
 	 * "local" Sorting is performed locally by the [$.ig.DataSource](ig.datasource) component.
@@ -88382,32 +103325,38 @@ interface IgTreeGridSorting {
 
 	/**
 	 * Enables or disables the case sensitivity of the sorting. Works only for [local](ui.iggridsorting#options:type) sorting.
+	 *
 	 */
 	caseSensitive?: boolean;
 
 	/**
 	 * Enables/disables special styling for sorted columns. If false, sorted column cells will not have any special sort-related styling.
+	 *
 	 */
 	applySortedColumnCss?: boolean;
 
 	/**
 	 * URL param name which specifies how sorting expressions will be encoded in the URL. Uses OData conventions. ex: ?sort(col1)=asc
+	 *
 	 */
 	sortUrlKey?: string;
 
 	/**
 	 * URL param value for ascending type of sorting. Uses OData conventions. Example: ?sort(col1)=asc
+	 *
 	 */
 	sortUrlKeyAscValue?: string;
 
 	/**
 	 * URL param value for descending type of sorting. Uses OData conventions. Example: ?sort(col1)=desc
+	 *
 	 */
 	sortUrlKeyDescValue?: string;
 
 	/**
 	 * Defines single column sorting or multiple column sorting.
 	 *
+	 *
 	 * Valid values:
 	 * "single" Only a single column can be sorted. Previously sorted columns will not preserve their sorting upon sorting a new column.
 	 * "multi" If enabled, previous sorted state for columns won't be cleared
@@ -88416,12 +103365,14 @@ interface IgTreeGridSorting {
 
 	/**
 	 * Custom sort function(or name of the function as a string) accepting three parameters - the data to be sorted, an array of data source field definitions, and the direction to sort with (optional). The function should return the sorted data array.
+	 *
 	 */
 	customSortFunction?: Function;
 
 	/**
 	 * Specifies which direction to use on the first click / keydown, if the column is sorted for the first time.
 	 *
+	 *
 	 * Valid values:
 	 * "ascending" The first sort of the column data will be in ascending order.
 	 * "descending" The first sort of the column data will be in descending order.
@@ -88430,6 +103381,7 @@ interface IgTreeGridSorting {
 
 	/**
 	 * Specifies whether sorting to be applied immediately when click sort/unsort columns when using the multiple sorting dialog. When it is false Apply button shows and sorting is applied when the button is clicked.
+	 *
 	 */
 	modalDialogSortOnClick?: boolean;
 
@@ -88521,6 +103473,7 @@ interface IgTreeGridSorting {
 	/**
 	 * Specifies width of multiple sorting dialog.
 	 *
+	 *
 	 * Valid values:
 	 * "string" Specifies the width in pixels as a string ("300px").
 	 * "number" Specifies the width in pixels as a number (300)
@@ -88530,6 +103483,7 @@ interface IgTreeGridSorting {
 	/**
 	 * Specifies height of multiple sorting dialog.
 	 *
+	 *
 	 * Valid values:
 	 * "string" The widget height can be set in pixels (px) and percentage (%).
 	 * "number" The widget height can be set in pixels as a number.
@@ -88538,16 +103492,19 @@ interface IgTreeGridSorting {
 
 	/**
 	 * Specifies time of milliseconds for animation duration to show/hide modal dialog.
+	 *
 	 */
 	modalDialogAnimationDuration?: number;
 
 	/**
 	 * A list of custom column settings that specify custom sorting settings for a specific column (whether sorting is enabled / disabled, default sort direction, first sort direction, etc.).
+	 *
 	 */
 	columnSettings?: IgGridSortingColumnSetting[];
 
 	/**
 	 * Enables/disables sorting persistence when the grid is rebound.
+	 *
 	 */
 	persist?: boolean;
 
@@ -88561,14 +103518,10 @@ interface IgTreeGridSorting {
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog.
+	 *
 	 */
 	dialogWidget?: string;
 
-	/**
-	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
-	 */
-	inherit?: boolean;
-
 	/**
 	 * Event fired before sorting is invoked for a certain column.
 	 * Return false in order to cancel column sorting.
@@ -88646,6 +103599,10 @@ interface IgTreeGridSorting {
 	[optionName: string]: any;
 }
 interface IgTreeGridSortingMethods {
+	/**
+	 * Changes the all locales into the widget element to the language specified in [options.language](ui.igtreegridsorting#options:language)
+	 * Note that this method is for rare scenarios, see [language](ui.igtreegridsorting#options:language) or [locale](ui.igtreegridsorting#options:locale) option setter
+	 */
 	changeLocale(): void;
 
 	/**
@@ -88655,12 +103612,15 @@ interface IgTreeGridSortingMethods {
 	 */
 	isColumnSorted(columnKey: string): boolean;
 	destroy(): void;
+	changeGlobalLanguage(): void;
+	changeGlobalRegional(): void;
 
 	/**
 	 * Sorts the data in a grid column  and updates the UI.
 	 *
 	 * @param index Column key (string) or index (number) - for multi-row grid only column key can be used. Specifies the column which we want to sort. If the mode is multiple, previous sorting states are not cleared.
 	 * @param direction Specifies sorting direction (ascending or descending)
+	 * @param header
 	 */
 	sortColumn(index: Object, direction: Object, header: Object): void;
 
@@ -88696,6 +103656,8 @@ interface IgTreeGridSortingMethods {
 
 	/**
 	 * Renders content of multiple sorting dialog - sorted and unsorted columns.
+	 *
+	 * @param isToCallEvents
 	 */
 	renderMultipleSortingDialogContent(isToCallEvents: Object): void;
 
@@ -88712,6 +103674,8 @@ interface JQuery {
 	igTreeGridSorting(methodName: "changeLocale"): void;
 	igTreeGridSorting(methodName: "isColumnSorted", columnKey: string): boolean;
 	igTreeGridSorting(methodName: "destroy"): void;
+	igTreeGridSorting(methodName: "changeGlobalLanguage"): void;
+	igTreeGridSorting(methodName: "changeGlobalRegional"): void;
 	igTreeGridSorting(methodName: "sortColumn", index: Object, direction: Object, header: Object): void;
 	igTreeGridSorting(methodName: "sortMultiple", exprs?: any[]): void;
 	igTreeGridSorting(methodName: "clearSorting"): void;
@@ -88723,30 +103687,47 @@ interface JQuery {
 
 	/**
 	 * Specifies from which data bound level to be applied sorting - 0 is the first level
+	 *
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "fromLevel"): number;
 
 	/**
 	 * Specifies from which data bound level to be applied sorting - 0 is the first level
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "fromLevel", optionValue: number): void;
 
 	/**
 	 * Specifies to which data bound level to be applied sorting - if -1 sorting should be applied to the last data bound level
+	 *
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "toLevel"): number;
 
 	/**
 	 * Specifies to which data bound level to be applied sorting - if -1 sorting should be applied to the last data bound level
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "toLevel", optionValue: number): void;
 
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for the igTreeGrid.
+	 */
+	igTreeGridSorting(optionLiteral: 'option', optionName: "inherit"): boolean;
+
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for the igTreeGrid.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTreeGridSorting(optionLiteral: 'option', optionName: "inherit", optionValue: boolean): void;
+
 	/**
 	 * Defines local or remote sorting operations.
+	 *
 	 */
 
 	igTreeGridSorting(optionLiteral: 'option', optionName: "type"): string;
@@ -88754,6 +103735,7 @@ interface JQuery {
 	/**
 	 * Defines local or remote sorting operations.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -88761,66 +103743,77 @@ interface JQuery {
 
 	/**
 	 * Enables or disables the case sensitivity of the sorting. Works only for [local](ui.iggridsorting#options:type) sorting.
+	 *
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "caseSensitive"): boolean;
 
 	/**
 	 * Enables or disables the case sensitivity of the sorting. Works only for [local](ui.iggridsorting#options:type) sorting.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "caseSensitive", optionValue: boolean): void;
 
 	/**
 	 * Enables/disables special styling for sorted columns. If false, sorted column cells will not have any special sort-related styling.
+	 *
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "applySortedColumnCss"): boolean;
 
 	/**
 	 * Enables/disables special styling for sorted columns. If false, sorted column cells will not have any special sort-related styling.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "applySortedColumnCss", optionValue: boolean): void;
 
 	/**
 	 * URL param name which specifies how sorting expressions will be encoded in the URL. Uses OData conventions. ex: ?sort(col1)=asc
+	 *
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "sortUrlKey"): string;
 
 	/**
 	 * URL param name which specifies how sorting expressions will be encoded in the URL. Uses OData conventions. ex: ?sort(col1)=asc
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "sortUrlKey", optionValue: string): void;
 
 	/**
 	 * URL param value for ascending type of sorting. Uses OData conventions. Example: ?sort(col1)=asc
+	 *
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "sortUrlKeyAscValue"): string;
 
 	/**
 	 * URL param value for ascending type of sorting. Uses OData conventions. Example: ?sort(col1)=asc
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "sortUrlKeyAscValue", optionValue: string): void;
 
 	/**
 	 * URL param value for descending type of sorting. Uses OData conventions. Example: ?sort(col1)=desc
+	 *
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "sortUrlKeyDescValue"): string;
 
 	/**
 	 * URL param value for descending type of sorting. Uses OData conventions. Example: ?sort(col1)=desc
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "sortUrlKeyDescValue", optionValue: string): void;
 
 	/**
 	 * Defines single column sorting or multiple column sorting.
+	 *
 	 */
 
 	igTreeGridSorting(optionLiteral: 'option', optionName: "mode"): string;
@@ -88828,6 +103821,7 @@ interface JQuery {
 	/**
 	 * Defines single column sorting or multiple column sorting.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -88835,18 +103829,21 @@ interface JQuery {
 
 	/**
 	 * Custom sort function(or name of the function as a string) accepting three parameters - the data to be sorted, an array of data source field definitions, and the direction to sort with (optional). The function should return the sorted data array.
+	 *
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "customSortFunction"): Function;
 
 	/**
 	 * Custom sort function(or name of the function as a string) accepting three parameters - the data to be sorted, an array of data source field definitions, and the direction to sort with (optional). The function should return the sorted data array.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "customSortFunction", optionValue: Function): void;
 
 	/**
 	 * Gets which direction to use on the first click / keydown, if the column is sorted for the first time.
+	 *
 	 */
 
 	igTreeGridSorting(optionLiteral: 'option', optionName: "firstSortDirection"): string;
@@ -88854,6 +103851,7 @@ interface JQuery {
 	/**
 	 * Sets which direction to use on the first click / keydown, if the column is sorted for the first time.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -88861,12 +103859,14 @@ interface JQuery {
 
 	/**
 	 * Gets whether sorting to be applied immediately when click sort/unsort columns when using the multiple sorting dialog. When it is false Apply button shows and sorting is applied when the button is clicked.
+	 *
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "modalDialogSortOnClick"): boolean;
 
 	/**
 	 * Sets whether sorting to be applied immediately when click sort/unsort columns when using the multiple sorting dialog. When it is false Apply button shows and sorting is applied when the button is clicked.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "modalDialogSortOnClick", optionValue: boolean): void;
@@ -89067,6 +104067,7 @@ interface JQuery {
 
 	/**
 	 * Gets width of multiple sorting dialog.
+	 *
 	 */
 
 	igTreeGridSorting(optionLiteral: 'option', optionName: "modalDialogWidth"): string|number;
@@ -89074,6 +104075,7 @@ interface JQuery {
 	/**
 	 * Sets width of multiple sorting dialog.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -89081,6 +104083,7 @@ interface JQuery {
 
 	/**
 	 * Gets height of multiple sorting dialog.
+	 *
 	 */
 
 	igTreeGridSorting(optionLiteral: 'option', optionName: "modalDialogHeight"): string|number;
@@ -89088,6 +104091,7 @@ interface JQuery {
 	/**
 	 * Sets height of multiple sorting dialog.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -89095,36 +104099,42 @@ interface JQuery {
 
 	/**
 	 * Gets time of milliseconds for animation duration to show/hide modal dialog.
+	 *
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "modalDialogAnimationDuration"): number;
 
 	/**
 	 * Sets time of milliseconds for animation duration to show/hide modal dialog.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "modalDialogAnimationDuration", optionValue: number): void;
 
 	/**
 	 * A list of custom column settings that specify custom sorting settings for a specific column (whether sorting is enabled / disabled, default sort direction, first sort direction, etc.).
+	 *
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "columnSettings"): IgGridSortingColumnSetting[];
 
 	/**
 	 * A list of custom column settings that specify custom sorting settings for a specific column (whether sorting is enabled / disabled, default sort direction, first sort direction, etc.).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "columnSettings", optionValue: IgGridSortingColumnSetting[]): void;
 
 	/**
 	 * Enables/disables sorting persistence when the grid is rebound.
+	 *
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "persist"): boolean;
 
 	/**
 	 * Enables/disables sorting persistence when the grid is rebound.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "persist", optionValue: boolean): void;
@@ -89149,27 +104159,17 @@ interface JQuery {
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog.
+	 *
 	 */
 	igTreeGridSorting(optionLiteral: 'option', optionName: "dialogWidget"): string;
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog.
 	 *
-	 * @optionValue New value to be set.
-	 */
-	igTreeGridSorting(optionLiteral: 'option', optionName: "dialogWidget", optionValue: string): void;
-
-	/**
-	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
-	 */
-	igTreeGridSorting(optionLiteral: 'option', optionName: "inherit"): boolean;
-
-	/**
-	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
 	 *
 	 * @optionValue New value to be set.
 	 */
-	igTreeGridSorting(optionLiteral: 'option', optionName: "inherit", optionValue: boolean): void;
+	igTreeGridSorting(optionLiteral: 'option', optionName: "dialogWidget", optionValue: string): void;
 
 	/**
 	 * Event fired before sorting is invoked for a certain column.
@@ -89348,7 +104348,13 @@ interface JQuery {
 }
 interface IgTreeGridTooltips {
 	/**
-	 * determines the tooltip visibility option
+	 * This option is inherited from a parent widget and it's not applicable for the igTreeGrid.
+	 */
+	inherit?: boolean;
+
+	/**
+	 * Determines the tooltip visibility option
+	 *
 	 *
 	 * Valid values:
 	 * "always" tooltips always show for hovered elements
@@ -89358,7 +104364,8 @@ interface IgTreeGridTooltips {
 	visibility?: string;
 
 	/**
-	 * controls the tooltip's style
+	 * Controls the tooltip's style
+	 *
 	 *
 	 * Valid values:
 	 * "tooltip" The tooltip will be positioned according to the mouse cursor. Will render the tooltip content as plain text.
@@ -89369,40 +104376,41 @@ interface IgTreeGridTooltips {
 	/**
 	 * The time in milliseconds after which tooltip will show when
 	 * mouse cursor is hovered over a cell.
+	 *
 	 */
 	showDelay?: number;
 
 	/**
 	 * Type="integer" The time in milliseconds after which tooltip hides when mouse
 	 * cursor gets outside of the cell.
+	 *
 	 */
 	hideDelay?: number;
 
 	/**
 	 * A list of custom column settings that specify custom tooltip settings for a specific column (whether tooltips are enabled / disabled)
+	 *
 	 */
 	columnSettings?: IgGridTooltipsColumnSettings;
 
 	/**
 	 * Sets the time tooltip fades in and out when showing/hiding
+	 *
 	 */
 	fadeTimespan?: number;
 
 	/**
 	 * Sets the left position of the tooltip relative to the mouse cursor
+	 *
 	 */
 	cursorLeftOffset?: number;
 
 	/**
 	 * Sets the top position of the tooltip relative to the mouse cursor
+	 *
 	 */
 	cursorTopOffset?: number;
 
-	/**
-	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
-	 */
-	inherit?: boolean;
-
 	/**
 	 * Event fired when the mouse has hovered on an element long enough to display a tooltip
 	 */
@@ -89444,8 +104452,21 @@ interface JQuery {
 	igTreeGridTooltips(methodName: "destroy"): void;
 	igTreeGridTooltips(methodName: "id"): string;
 
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for the igTreeGrid.
+	 */
+	igTreeGridTooltips(optionLiteral: 'option', optionName: "inherit"): boolean;
+
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for the igTreeGrid.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTreeGridTooltips(optionLiteral: 'option', optionName: "inherit", optionValue: boolean): void;
+
 	/**
 	 * Determines the tooltip visibility option
+	 *
 	 */
 
 	igTreeGridTooltips(optionLiteral: 'option', optionName: "visibility"): string;
@@ -89453,6 +104474,7 @@ interface JQuery {
 	/**
 	 * Determines the tooltip visibility option
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -89460,6 +104482,7 @@ interface JQuery {
 
 	/**
 	 * Controls the tooltip's style
+	 *
 	 */
 
 	igTreeGridTooltips(optionLiteral: 'option', optionName: "style"): string;
@@ -89467,6 +104490,7 @@ interface JQuery {
 	/**
 	 * Controls the tooltip's style
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -89475,6 +104499,7 @@ interface JQuery {
 	/**
 	 * The time in milliseconds after which tooltip will show when
 	 * mouse cursor is hovered over a cell.
+	 *
 	 */
 	igTreeGridTooltips(optionLiteral: 'option', optionName: "showDelay"): number;
 
@@ -89482,6 +104507,7 @@ interface JQuery {
 	 * The time in milliseconds after which tooltip will show when
 	 * mouse cursor is hovered over a cell.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridTooltips(optionLiteral: 'option', optionName: "showDelay", optionValue: number): void;
@@ -89489,6 +104515,7 @@ interface JQuery {
 	/**
 	 * Type="integer" The time in milliseconds after which tooltip hides when mouse
 	 * cursor gets outside of the cell.
+	 *
 	 */
 	igTreeGridTooltips(optionLiteral: 'option', optionName: "hideDelay"): number;
 
@@ -89496,69 +104523,66 @@ interface JQuery {
 	 * Type="integer" The time in milliseconds after which tooltip hides when mouse
 	 * cursor gets outside of the cell.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridTooltips(optionLiteral: 'option', optionName: "hideDelay", optionValue: number): void;
 
 	/**
 	 * A list of custom column settings that specify custom tooltip settings for a specific column (whether tooltips are enabled / disabled)
+	 *
 	 */
 	igTreeGridTooltips(optionLiteral: 'option', optionName: "columnSettings"): IgGridTooltipsColumnSettings;
 
 	/**
 	 * A list of custom column settings that specify custom tooltip settings for a specific column (whether tooltips are enabled / disabled)
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridTooltips(optionLiteral: 'option', optionName: "columnSettings", optionValue: IgGridTooltipsColumnSettings): void;
 
 	/**
 	 * The time tooltip fades in and out when showing/hiding
+	 *
 	 */
 	igTreeGridTooltips(optionLiteral: 'option', optionName: "fadeTimespan"): number;
 
 	/**
 	 * Sets the time tooltip fades in and out when showing/hiding
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridTooltips(optionLiteral: 'option', optionName: "fadeTimespan", optionValue: number): void;
 
 	/**
 	 * The left position of the tooltip relative to the mouse cursor
+	 *
 	 */
 	igTreeGridTooltips(optionLiteral: 'option', optionName: "cursorLeftOffset"): number;
 
 	/**
 	 * Sets the left position of the tooltip relative to the mouse cursor
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridTooltips(optionLiteral: 'option', optionName: "cursorLeftOffset", optionValue: number): void;
 
 	/**
 	 * The top position of the tooltip relative to the mouse cursor
+	 *
 	 */
 	igTreeGridTooltips(optionLiteral: 'option', optionName: "cursorTopOffset"): number;
 
 	/**
 	 * Sets the top position of the tooltip relative to the mouse cursor
 	 *
-	 * @optionValue New value to be set.
-	 */
-	igTreeGridTooltips(optionLiteral: 'option', optionName: "cursorTopOffset", optionValue: number): void;
-
-	/**
-	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
-	 */
-	igTreeGridTooltips(optionLiteral: 'option', optionName: "inherit"): boolean;
-
-	/**
-	 * Enables/disables feature inheritance for the child layouts. NOTE: It only applies for igHierarchicalGrid.
 	 *
 	 * @optionValue New value to be set.
 	 */
-	igTreeGridTooltips(optionLiteral: 'option', optionName: "inherit", optionValue: boolean): void;
+	igTreeGridTooltips(optionLiteral: 'option', optionName: "cursorTopOffset", optionValue: number): void;
 
 	/**
 	 * Event fired when the mouse has hovered on an element long enough to display a tooltip
@@ -89616,11 +104640,13 @@ interface JQuery {
 interface IgTreeGridUpdatingLocale {
 	/**
 	 * Specifies the add child tooltip text.
+	 *
 	 */
 	addChildTooltip?: string;
 
 	/**
 	 * Specifies the label of the add child button in touch environment.
+	 *
 	 */
 	addChildButtonLabel?: string;
 
@@ -89633,6 +104659,7 @@ interface IgTreeGridUpdatingLocale {
 interface IgTreeGridUpdating {
 	/**
 	 * Specifies whether to enable or disable adding children to rows.
+	 *
 	 */
 	enableAddChild?: boolean;
 
@@ -89649,14 +104676,21 @@ interface IgTreeGridUpdating {
 	addChildButtonLabel?: string;
 	locale?: IgTreeGridUpdatingLocale;
 
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for the igTreeGrid.
+	 */
+	inherit?: boolean;
+
 	/**
 	 * A list of custom column options that specify editing and validation settings for a specific column.
+	 *
 	 */
 	columnSettings?: IgGridUpdatingColumnSetting[];
 
 	/**
 	 * Specifies the edit mode.
 	 *
+	 *
 	 * Valid values:
 	 * "row" Editors are shown for all columns that are not read-only. The editor of the clicked cell receives initial focus. Done and Cancel buttons may be displayed based on the [showDoneCancelButtons](ui.iggridupdating#options:showDoneCancelButtons) property.
 	 * "cell" An editor is shown for the cell entering edit mode. The Done and Cancel buttons are not supported for this mode.
@@ -89667,16 +104701,19 @@ interface IgTreeGridUpdating {
 
 	/**
 	 * Specifies if deleting rows through the UI is enabled.
+	 *
 	 */
 	enableDeleteRow?: boolean;
 
 	/**
 	 * Specifies if adding rows through the UI is enabled. When enabled an additional row is rendered at the bottom of the grid's header that works as a button. When the end-user clicks on it edit mode is initiated either through a dialog (when [editMode](ui.iggridupdating#options:editMode) is 'dialog') or mimicking the look and feel of 'row' [editMode](ui.iggridupdating#options:editMode) (when [editMode](ui.iggridupdating#options:editMode) is 'row' or 'cell').
+	 *
 	 */
 	enableAddRow?: boolean;
 
 	/**
 	 * Specifies if the value of each editable column in the grid should be validated. The validation is done based on the rules of their corresponding editors.
+	 *
 	 */
 	validation?: boolean;
 
@@ -89738,64 +104775,70 @@ interface IgTreeGridUpdating {
 
 	/**
 	 * Determines if the Done and Cancel buttons will be available as means to end edit mode for [editMode](ui.iggridupdating#options:editMode) 'row' and when adding a new row.
+	 *
 	 */
 	showDoneCancelButtons?: boolean;
 
 	/**
 	 * Specifies if an exception should be thrown when the grid's data view changes while there are pending transactions in the data source. The data view changes when the data source performs a sorting, filtering, groupby or paging operation and the exception thrown will prevent the operation from succeeding. All pending transactions must be committed before a data view operation is able to complete. Committing transactions can be done manually through the grid's [commit](ui.iggrid#methods:commit) function or automatically by setting [autoCommit](ui.iggrid#options:autoCommit) to 'true'.
+	 *
 	 */
 	enableDataDirtyException?: boolean;
 
 	/**
 	 * Specifies how end-users are able to start edit mode. Possible values: "click", "dblclick", "F2", "enter" and their combinations separated by coma or in array. The keyboard triggers have effect only if the grid cells can receive focus (the grid's [tabIndex](ui.iggrid#options:tabIndex) property should not have a negative value) or Selection is enabled. If "dblclick" is included, then "click" has no effect.
+	 *
 	 */
 	startEditTriggers?: string|Array<any>;
 
 	/**
 	 * Determines if pressing Enter to navigate away from the currently edited cell should move the focus horizontally or vertically (default).
+	 *
 	 */
 	horizontalMoveOnEnter?: boolean;
 
 	/**
 	 * Enables excel navigation style. When turned on, the arrow keys can be used for changing the currently edited cell similar to how Tab and Enter behave. When disabled, the arrow keys control the cursor inside editors.
+	 *
 	 */
 	excelNavigationMode?: boolean;
 
 	/**
 	 * Sets a custom function to be called when the AJAX request to the URL specified by the [updateUrl](ui.iggrid#options:updateUrl) property succeeds. The function will be called with arguments representing the data returned by the server.
+	 *
 	 */
 	saveChangesSuccessHandler?: Function|string;
 
 	/**
 	 * Sets a custom function to be called when the AJAX request to the URL specified by the [updateUrl](ui.iggrid#options:updateUrl) property fails. The function will be called with arguments representing the data returned by the server.
+	 *
 	 */
 	saveChangesErrorHandler?: Function|string;
 
 	/**
 	 * On touch-enabled devices specifies the swipe distance for the delete button to appear.
+	 *
 	 */
 	swipeDistance?: string|number;
 
 	/**
 	 * Controls if navigation will wrap around the grid. The feature will never wrap around virtual grids.
+	 *
 	 */
 	wrapAround?: boolean;
 
 	/**
 	 * A list of options controlling the rendering behavior of the row edit dialog. If [editMode](ui.iggridupdating#options:editMode) is not 'dialog' these have no effect.
+	 *
 	 */
 	rowEditDialogOptions?: IgGridUpdatingRowEditDialogOptions;
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog. For more information on how to utilize this property, please refer to the [Extending igGrid Modal Dialog](http://www.igniteui.com/help/extending-iggrid-modal-dialog) topic.
+	 *
 	 */
 	dialogWidget?: string;
 
-	/**
-	 * Enables/disables feature inheritance for the child layouts in igHierarchicalGrid.
-	 */
-	inherit?: boolean;
-
 	/**
 	 * Event fired before row editing begins.
 	 * Return false in order to cancel editing.
@@ -89904,6 +104947,10 @@ interface IgTreeGridUpdating {
 	[optionName: string]: any;
 }
 interface IgTreeGridUpdatingMethods {
+	/**
+	 * Changes the all locales into the widget element to the language specified in [options.language](ui.igtreegridupdating#options:language)
+	 * Note that this method is for rare scenarios, see [language](ui.igtreegridupdating#options:language) or [locale](ui.igtreegridupdating#options:locale) option setter
+	 */
 	changeLocale(): void;
 
 	/**
@@ -90016,6 +105063,11 @@ interface IgTreeGridUpdatingMethods {
 	 * @param create Requests to create the editor if it has not been created yet.
 	 */
 	editorForCell(cell: string, create?: boolean): Object;
+
+	/**
+	 * Changes the the regional settings of widget element to the language specified in [options.regional](ui.iggridupdating#options:regional)
+	 * Note that this method is for rare scenarios, use [regional](ui.iggridupdating#options:regional) option setter
+	 */
 	changeRegional(): void;
 
 	/**
@@ -90058,12 +105110,14 @@ interface JQuery {
 
 	/**
 	 * Gets whether to enable or disable adding children to rows.
+	 *
 	 */
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "enableAddChild"): boolean;
 
 	/**
 	 * Sets whether to enable or disable adding children to rows.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "enableAddChild", optionValue: boolean): void;
@@ -90098,20 +105152,35 @@ interface JQuery {
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "locale"): IgTreeGridUpdatingLocale;
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "locale", optionValue: IgTreeGridUpdatingLocale): void;
 
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for the igTreeGrid.
+	 */
+	igTreeGridUpdating(optionLiteral: 'option', optionName: "inherit"): boolean;
+
+	/**
+	 * This option is inherited from a parent widget and it's not applicable for the igTreeGrid.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igTreeGridUpdating(optionLiteral: 'option', optionName: "inherit", optionValue: boolean): void;
+
 	/**
 	 * A list of custom column options that specify editing and validation settings for a specific column.
+	 *
 	 */
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "columnSettings"): IgGridUpdatingColumnSetting[];
 
 	/**
 	 * A list of custom column options that specify editing and validation settings for a specific column.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "columnSettings", optionValue: IgGridUpdatingColumnSetting[]): void;
 
 	/**
 	 * Gets the edit mode.
+	 *
 	 */
 
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "editMode"): string;
@@ -90119,6 +105188,7 @@ interface JQuery {
 	/**
 	 * Sets the edit mode.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -90126,36 +105196,42 @@ interface JQuery {
 
 	/**
 	 * Gets if deleting rows through the UI is enabled.
+	 *
 	 */
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "enableDeleteRow"): boolean;
 
 	/**
 	 * Sets if deleting rows through the UI is enabled.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "enableDeleteRow", optionValue: boolean): void;
 
 	/**
 	 * Gets if adding rows through the UI is enabled. When enabled an additional row is rendered at the bottom of the grid's header that works as a button. When the end-user clicks on it edit mode is initiated either through a dialog (when [editMode](ui.iggridupdating#options:editMode) is 'dialog') or mimicking the look and feel of 'row' [editMode](ui.iggridupdating#options:editMode) (when [editMode](ui.iggridupdating#options:editMode) is 'row' or 'cell').
+	 *
 	 */
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "enableAddRow"): boolean;
 
 	/**
 	 * Sets if adding rows through the UI is enabled. When enabled an additional row is rendered at the bottom of the grid's header that works as a button. When the end-user clicks on it edit mode is initiated either through a dialog (when [editMode](ui.iggridupdating#options:editMode) is 'dialog') or mimicking the look and feel of 'row' [editMode](ui.iggridupdating#options:editMode) (when [editMode](ui.iggridupdating#options:editMode) is 'row' or 'cell').
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "enableAddRow", optionValue: boolean): void;
 
 	/**
 	 * Gets if the value of each editable column in the grid should be validated. The validation is done based on the rules of their corresponding editors.
+	 *
 	 */
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "validation"): boolean;
 
 	/**
 	 * Sets if the value of each editable column in the grid should be validated. The validation is done based on the rules of their corresponding editors.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "validation", optionValue: boolean): void;
@@ -90290,30 +105366,35 @@ interface JQuery {
 
 	/**
 	 * Determines if the Done and Cancel buttons will be available as means to end edit mode for [editMode](ui.iggridupdating#options:editMode) 'row' and when adding a new row.
+	 *
 	 */
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "showDoneCancelButtons"): boolean;
 
 	/**
 	 * Determines if the Done and Cancel buttons will be available as means to end edit mode for [editMode](ui.iggridupdating#options:editMode) 'row' and when adding a new row.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "showDoneCancelButtons", optionValue: boolean): void;
 
 	/**
 	 * Gets if an exception should be thrown when the grid's data view changes while there are pending transactions in the data source. The data view changes when the data source performs a sorting, filtering, groupby or paging operation and the exception thrown will prevent the operation from succeeding. All pending transactions must be committed before a data view operation is able to complete. Committing transactions can be done manually through the grid's [commit](ui.iggrid#methods:commit) function or automatically by setting [autoCommit](ui.iggrid#options:autoCommit) to 'true'.
+	 *
 	 */
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "enableDataDirtyException"): boolean;
 
 	/**
 	 * Sets if an exception should be thrown when the grid's data view changes while there are pending transactions in the data source. The data view changes when the data source performs a sorting, filtering, groupby or paging operation and the exception thrown will prevent the operation from succeeding. All pending transactions must be committed before a data view operation is able to complete. Committing transactions can be done manually through the grid's [commit](ui.iggrid#methods:commit) function or automatically by setting [autoCommit](ui.iggrid#options:autoCommit) to 'true'.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "enableDataDirtyException", optionValue: boolean): void;
 
 	/**
 	 * Gets how end-users are able to start edit mode. Possible values: "click", "dblclick", "F2", "enter" and their combinations separated by coma or in array. The keyboard triggers have effect only if the grid cells can receive focus (the grid's [tabIndex](ui.iggrid#options:tabIndex) property should not have a negative value) or Selection is enabled. If "dblclick" is included, then "click" has no effect.
+	 *
 	 */
 
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "startEditTriggers"): string|Array<any>;
@@ -90321,6 +105402,7 @@ interface JQuery {
 	/**
 	 * Sets how end-users are able to start edit mode. Possible values: "click", "dblclick", "F2", "enter" and their combinations separated by coma or in array. The keyboard triggers have effect only if the grid cells can receive focus (the grid's [tabIndex](ui.iggrid#options:tabIndex) property should not have a negative value) or Selection is enabled. If "dblclick" is included, then "click" has no effect.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -90328,30 +105410,35 @@ interface JQuery {
 
 	/**
 	 * Determines if pressing Enter to navigate away from the currently edited cell should move the focus horizontally or vertically (default).
+	 *
 	 */
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "horizontalMoveOnEnter"): boolean;
 
 	/**
 	 * Determines if pressing Enter to navigate away from the currently edited cell should move the focus horizontally or vertically (default).
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "horizontalMoveOnEnter", optionValue: boolean): void;
 
 	/**
 	 * Enables excel navigation style. When turned on, the arrow keys can be used for changing the currently edited cell similar to how Tab and Enter behave. When disabled, the arrow keys control the cursor inside editors.
+	 *
 	 */
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "excelNavigationMode"): boolean;
 
 	/**
 	 * Enables excel navigation style. When turned on, the arrow keys can be used for changing the currently edited cell similar to how Tab and Enter behave. When disabled, the arrow keys control the cursor inside editors.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "excelNavigationMode", optionValue: boolean): void;
 
 	/**
 	 * Sets a custom function to be called when the AJAX request to the URL specified by the [updateUrl](ui.iggrid#options:updateUrl) property succeeds. The function will be called with arguments representing the data returned by the server.
+	 *
 	 */
 
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "saveChangesSuccessHandler"): Function|string;
@@ -90359,6 +105446,7 @@ interface JQuery {
 	/**
 	 * Sets a custom function to be called when the AJAX request to the URL specified by the [updateUrl](ui.iggrid#options:updateUrl) property succeeds. The function will be called with arguments representing the data returned by the server.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -90366,6 +105454,7 @@ interface JQuery {
 
 	/**
 	 * Sets a custom function to be called when the AJAX request to the URL specified by the [updateUrl](ui.iggrid#options:updateUrl) property fails. The function will be called with arguments representing the data returned by the server.
+	 *
 	 */
 
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "saveChangesErrorHandler"): Function|string;
@@ -90373,6 +105462,7 @@ interface JQuery {
 	/**
 	 * Sets a custom function to be called when the AJAX request to the URL specified by the [updateUrl](ui.iggrid#options:updateUrl) property fails. The function will be called with arguments representing the data returned by the server.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -90380,6 +105470,7 @@ interface JQuery {
 
 	/**
 	 * On touch-enabled devices specifies the swipe distance for the delete button to appear.
+	 *
 	 */
 
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "swipeDistance"): string|number;
@@ -90387,6 +105478,7 @@ interface JQuery {
 	/**
 	 * On touch-enabled devices specifies the swipe distance for the delete button to appear.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -90394,51 +105486,45 @@ interface JQuery {
 
 	/**
 	 * Controls if navigation will wrap around the grid. The feature will never wrap around virtual grids.
+	 *
 	 */
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "wrapAround"): boolean;
 
 	/**
 	 * Controls if navigation will wrap around the grid. The feature will never wrap around virtual grids.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "wrapAround", optionValue: boolean): void;
 
 	/**
 	 * A list of options controlling the rendering behavior of the row edit dialog. If [editMode](ui.iggridupdating#options:editMode) is not 'dialog' these have no effect.
+	 *
 	 */
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "rowEditDialogOptions"): IgGridUpdatingRowEditDialogOptions;
 
 	/**
 	 * A list of options controlling the rendering behavior of the row edit dialog. If [editMode](ui.iggridupdating#options:editMode) is not 'dialog' these have no effect.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "rowEditDialogOptions", optionValue: IgGridUpdatingRowEditDialogOptions): void;
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog. For more information on how to utilize this property, please refer to the [Extending igGrid Modal Dialog](http://www.igniteui.com/help/extending-iggrid-modal-dialog) topic.
+	 *
 	 */
 	igTreeGridUpdating(optionLiteral: 'option', optionName: "dialogWidget"): string;
 
 	/**
 	 * Name of the dialog widget to be used. It should inherit from $.ui.igGridModalDialog. For more information on how to utilize this property, please refer to the [Extending igGrid Modal Dialog](http://www.igniteui.com/help/extending-iggrid-modal-dialog) topic.
 	 *
-	 * @optionValue New value to be set.
-	 */
-	igTreeGridUpdating(optionLiteral: 'option', optionName: "dialogWidget", optionValue: string): void;
-
-	/**
-	 * Enables/disables feature inheritance for the child layouts in igHierarchicalGrid.
-	 */
-	igTreeGridUpdating(optionLiteral: 'option', optionName: "inherit"): boolean;
-
-	/**
-	 * Enables/disables feature inheritance for the child layouts in igHierarchicalGrid.
 	 *
 	 * @optionValue New value to be set.
 	 */
-	igTreeGridUpdating(optionLiteral: 'option', optionName: "inherit", optionValue: boolean): void;
+	igTreeGridUpdating(optionLiteral: 'option', optionName: "dialogWidget", optionValue: string): void;
 
 	/**
 	 * Event fired before row editing begins.
@@ -90717,171 +105803,205 @@ interface JQuery {
 interface IgUploadLocale {
 	/**
 	 * Get or set label for the first shown browse button. When file is selected for the first time this button is hidden.
+	 *
 	 */
 	labelUploadButton?: string;
 
 	/**
 	 * Get or set label for browse button in main container.
+	 *
 	 */
 	labelAddButton?: string;
 
 	/**
 	 * Get or set label for summary Clear all button. It will be shown only in multiple upload mode.
+	 *
 	 */
 	labelClearAllButton?: string;
 
 	/**
 	 * Get or set template for showing summary template. {0} is count of uploaded files. {1} is total count of file to be uploaded.
+	 *
 	 */
 	labelSummaryTemplate?: string;
 
 	/**
 	 * Get or set template for showing uploading information in summary progress bar. It will be shown only in multiple upload mode. {0} uploaded filesize. {1} - total file size.
+	 *
 	 */
 	labelSummaryProgressBarTemplate?: string;
 
 	/**
 	 * Get or set label for show/hide details button when main container is hidden.
+	 *
 	 */
 	labelShowDetails?: string;
 
 	/**
 	 * Get or set label for show/hide details button when main container is shown.
+	 *
 	 */
 	labelHideDetails?: string;
 
 	/**
 	 * Get or set label for button cancelling all files. Shown only in multiple upload mode.
+	 *
 	 */
 	labelSummaryProgressButtonCancel?: string;
 
 	/**
 	 * Get or set label for start upload batch files. Shown only in multiple upload mode and autostartupload is false.
+	 *
 	 */
 	labelSummaryProgressButtonContinue?: string;
 
 	/**
 	 * Get or set label when upload is finished. Shown only in multiple upload mode.
+	 *
 	 */
 	labelSummaryProgressButtonDone?: string;
 
 	/**
 	 * Get or set filename when it could not be shown the whole file name and should be shorten.
+	 *
 	 */
 	labelProgressBarFileNameContinue?: string;
 
 	/**
 	 * Get or set message shown when max file size of the uploaded file exceeds the limit.
+	 *
 	 */
 	errorMessageFileSizeExceeded?: string;
 
 	/**
 	 * Get or set error message when ajax call to get file status throws error.
+	 *
 	 */
 	errorMessageGetFileStatus?: string;
 
 	/**
 	 * Get or set error message when ajax call to send cancel upload command.
+	 *
 	 */
 	errorMessageCancelUpload?: string;
 
 	/**
 	 * Get or set error message when file is not found.
+	 *
 	 */
 	errorMessageNoSuchFile?: string;
 
 	/**
 	 * Get or set error message different from the other messages.
+	 *
 	 */
 	errorMessageOther?: string;
 
 	/**
 	 * Get or set error message when file extension validation failed.
+	 *
 	 */
 	errorMessageValidatingFileExtension?: string;
 
 	/**
 	 * Get or set error message when AJAX Request to get file size throws error.
+	 *
 	 */
 	errorMessageAJAXRequestFileSize?: string;
 
 	/**
 	 * Get or set error message when maximum allowed files exceeded.
+	 *
 	 */
 	errorMessageMaxUploadedFiles?: string;
 
 	/**
 	 * Get or set error message when maximum simultaneous files is less or equal to 0.
+	 *
 	 */
 	errorMessageMaxSimultaneousFiles?: string;
 
 	/**
 	 * Get or set error message when trying to remove non existing file.
+	 *
 	 */
 	errorMessageTryToRemoveNonExistingFile?: string;
 
 	/**
 	 * Get or set error message when trying to start non existing file.
+	 *
 	 */
 	errorMessageTryToStartNonExistingFile?: string;
 
 	/**
 	 * Get or set error message when trying to drop more than 1 file and mode is single.
+	 *
 	 */
 	errorMessageDropMultipleFilesWhenSingleModel?: string;
 
 	/**
 	 * Get or set title for the first shown browse button. When file is selected for the first time this button is hidden.
+	 *
 	 */
 	titleUploadFileButtonInit?: string;
 
 	/**
 	 * Get or set title for browse button in main container.
+	 *
 	 */
 	titleAddFileButton?: string;
 
 	/**
 	 * Get or set title for the cancel upload button.
+	 *
 	 */
 	titleCancelUploadButton?: string;
 
 	/**
 	 * Get or set title for start upload batch files. Shown only in multiple upload mode and autostartupload is false.
+	 *
 	 */
 	titleSummaryProgressButtonContinue?: string;
 
 	/**
 	 * Get or set title for summary Clear all button. It will be shown only in multiple upload mode.
+	 *
 	 */
 	titleClearUploaded?: string;
 
 	/**
 	 * Get or set title for show details button.
+	 *
 	 */
 	titleShowDetailsButton?: string;
 
 	/**
 	 * Get or set title for hide details button.
+	 *
 	 */
 	titleHideDetailsButton?: string;
 
 	/**
 	 * Get or set title for button cancelling all files. Shown only in multiple upload mode.
+	 *
 	 */
 	titleSummaryProgressButtonCancel?: string;
 
 	/**
 	 * Get or set title when upload is finished. Shown only in multiple upload mode.
+	 *
 	 */
 	titleSummaryProgressButtonDone?: string;
 
 	/**
 	 * Get or set title for Continue button.
+	 *
 	 */
 	titleSingleUploadButtonContinue?: string;
 
 	/**
 	 * Get or set title for summary Clear all button. It will be shown only in multiple upload mode.
+	 *
 	 */
 	titleClearAllButton?: string;
 
@@ -91181,16 +106301,19 @@ interface OnFormDataSubmitEventUIParam {
 interface IgUpload {
 	/**
 	 * Get or set width of the main container of the file upload control. Main container contains all buttons, progressbar, etc.
+	 *
 	 */
 	width?: number|string;
 
 	/**
 	 * Get or set height of the main container of the file upload control. Main container contains all buttons, progressbar, etc.
+	 *
 	 */
 	height?: number|string;
 
 	/**
 	 * Get or set whether the file start upload automatically when it is selected. Default is false.
+	 *
 	 */
 	autostartupload?: boolean;
 
@@ -91358,66 +106481,79 @@ interface IgUpload {
 
 	/**
 	 * Get or set URL for uploading.
+	 *
 	 */
 	uploadUrl?: string;
 
 	/**
 	 * Get or set URL of HTTPHandler to get information about file upload, current size and also to get commands
+	 *
 	 */
 	progressUrl?: string;
 
 	/**
 	 * Get or set file allowed file extensions. When this array is empty - it is not made such validation. Example ["gif", "jpg", "bmp"].
+	 *
 	 */
 	allowedExtensions?: any[];
 
 	/**
 	 * Get or set whether to show File Extension icon
+	 *
 	 */
 	showFileExtensionIcon?: boolean;
 
 	/**
 	 * Get or set control specific CSS options. For example you can override specific control classes with custom ones.
+	 *
 	 */
 	css?: any;
 
 	/**
 	 * Set icon css classes for specified file extension
+	 *
 	 */
 	fileExtensionIcons?: IgUploadFileExtensionIcons;
 
 	/**
 	 * Get or set multiple or single file upload. In single upload it is possible to upload only one file at the same time.
+	 *
 	 */
 	mode?: any;
 
 	/**
 	 * Get or set a bool setting that allows user to select(for upload) more than 1 file from the browse dialog at once. HTML 5+ - it is supported by Chrome, MOzilla FF, Safar, Opera latest versions and IE10+
+	 *
 	 */
 	multipleFiles?: boolean;
 
 	/**
 	 * Get or set the maximum number of allowed files to upload.
+	 *
 	 */
 	maxUploadedFiles?: number;
 
 	/**
 	 * Get or set count of files that could be uploaded at the same time.
+	 *
 	 */
 	maxSimultaneousFilesUploads?: number;
 
 	/**
 	 * Get or set file size metrics how to be shown files size.
+	 *
 	 */
 	fileSizeMetric?: any;
 
 	/**
 	 * UniqueId of the control - should not be changed by developer. Set from server-side wrapper.
+	 *
 	 */
 	controlId?: string;
 
 	/**
 	 * The number of digits after the decimal point.
+	 *
 	 */
 	fileSizeDecimalDisplay?: number;
 
@@ -91426,6 +106562,24 @@ interface IgUpload {
 	 */
 	maxFileSize?: any;
 
+	/**
+	 * Get or set whether to use only one request for sending data, when you are sending more than one file.
+	 *
+	 */
+	useSingleRequest?: boolean;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	language?: string;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+	regional?: string|Object;
+
 	/**
 	 * Defines the name of the file upload selecting event. Fired when browse button is pressed.
 	 * Return false in order to cancel selecting file.
@@ -91519,7 +106673,7 @@ interface IgUploadMethods {
 	/**
 	 * Start uploading file as submitting form with the specified formNumber.
 	 *
-	 * @param formNumber id of the upload form
+	 * @param formNumber id of the upload form. If left undefined and useSingleRequest is true all pending files will be uploaded.
 	 */
 	startUpload(formNumber: number): void;
 
@@ -91530,6 +106684,11 @@ interface IgUploadMethods {
 	 * @param formNumber id of the form which should be cancelled
 	 */
 	cancelUpload(formNumber: number): void;
+
+	/**
+	 * Changes the all locales into the widget element to the language specified in [options.language](ui.igupload#options:language)
+	 * Note that this method is for rare scenarios, use [language](ui.igupload#options:language) or [locale](ui.igupload#options:locale) option setter
+	 */
 	changeLocale(): void;
 
 	/**
@@ -91553,6 +106712,16 @@ interface IgUploadMethods {
 	 * @param fileIndex unique identifier of the file
 	 */
 	getFileInfo(fileIndex: number): Object;
+
+	/**
+	 * Changes the widget language to global language. Global language is the value in $.ig.util.language
+	 */
+	changeGlobalLanguage(): void;
+
+	/**
+	 * Changes the widget regional settins to global regional settings. Global regional settings are container in $.ig.util.regional
+	 */
+	changeGlobalRegional(): void;
 }
 interface JQuery {
 	data(propertyName: "igUpload"): IgUploadMethods;
@@ -91597,9 +106766,12 @@ interface JQuery {
 	igUpload(methodName: "getFileInfoData"): Object;
 	igUpload(methodName: "cancelAll"): void;
 	igUpload(methodName: "getFileInfo", fileIndex: number): Object;
+	igUpload(methodName: "changeGlobalLanguage"): void;
+	igUpload(methodName: "changeGlobalRegional"): void;
 
 	/**
 	 * Get or set width of the main container of the file upload control. Main container contains all buttons, progressbar, etc.
+	 *
 	 */
 
 	igUpload(optionLiteral: 'option', optionName: "width"): number|string;
@@ -91607,6 +106779,7 @@ interface JQuery {
 	/**
 	 * Get or set width of the main container of the file upload control. Main container contains all buttons, progressbar, etc.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -91614,6 +106787,7 @@ interface JQuery {
 
 	/**
 	 * Get or set height of the main container of the file upload control. Main container contains all buttons, progressbar, etc.
+	 *
 	 */
 
 	igUpload(optionLiteral: 'option', optionName: "height"): number|string;
@@ -91621,6 +106795,7 @@ interface JQuery {
 	/**
 	 * Get or set height of the main container of the file upload control. Main container contains all buttons, progressbar, etc.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -91628,12 +106803,14 @@ interface JQuery {
 
 	/**
 	 * Get or set whether the file start upload automatically when it is selected. Default is false.
+	 *
 	 */
 	igUpload(optionLiteral: 'option', optionName: "autostartupload"): boolean;
 
 	/**
 	 * Get or set whether the file start upload automatically when it is selected. Default is false.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igUpload(optionLiteral: 'option', optionName: "autostartupload", optionValue: boolean): void;
@@ -92010,156 +107187,182 @@ interface JQuery {
 
 	/**
 	 * Get or set URL for uploading.
+	 *
 	 */
 	igUpload(optionLiteral: 'option', optionName: "uploadUrl"): string;
 
 	/**
 	 * Get or set URL for uploading.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igUpload(optionLiteral: 'option', optionName: "uploadUrl", optionValue: string): void;
 
 	/**
 	 * Get or set URL of HTTPHandler to get information about file upload, current size and also to get commands
+	 *
 	 */
 	igUpload(optionLiteral: 'option', optionName: "progressUrl"): string;
 
 	/**
 	 * Get or set URL of HTTPHandler to get information about file upload, current size and also to get commands
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igUpload(optionLiteral: 'option', optionName: "progressUrl", optionValue: string): void;
 
 	/**
 	 * Get or set file allowed file extensions. When this array is empty - it is not made such validation. Example ["gif", "jpg", "bmp"].
+	 *
 	 */
 	igUpload(optionLiteral: 'option', optionName: "allowedExtensions"): any[];
 
 	/**
 	 * Get or set file allowed file extensions. When this array is empty - it is not made such validation. Example ["gif", "jpg", "bmp"].
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igUpload(optionLiteral: 'option', optionName: "allowedExtensions", optionValue: any[]): void;
 
 	/**
 	 * Get or set whether to show File Extension icon
+	 *
 	 */
 	igUpload(optionLiteral: 'option', optionName: "showFileExtensionIcon"): boolean;
 
 	/**
 	 * Get or set whether to show File Extension icon
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igUpload(optionLiteral: 'option', optionName: "showFileExtensionIcon", optionValue: boolean): void;
 
 	/**
 	 * Get or set control specific CSS options. For example you can override specific control classes with custom ones.
+	 *
 	 */
 	igUpload(optionLiteral: 'option', optionName: "css"): any;
 
 	/**
 	 * Get or set control specific CSS options. For example you can override specific control classes with custom ones.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igUpload(optionLiteral: 'option', optionName: "css", optionValue: any): void;
 
 	/**
 	 * Set icon css classes for specified file extension
+	 *
 	 */
 	igUpload(optionLiteral: 'option', optionName: "fileExtensionIcons"): IgUploadFileExtensionIcons;
 
 	/**
 	 * Set icon css classes for specified file extension
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igUpload(optionLiteral: 'option', optionName: "fileExtensionIcons", optionValue: IgUploadFileExtensionIcons): void;
 
 	/**
 	 * Get or set multiple or single file upload. In single upload it is possible to upload only one file at the same time.
+	 *
 	 */
 	igUpload(optionLiteral: 'option', optionName: "mode"): any;
 
 	/**
 	 * Get or set multiple or single file upload. In single upload it is possible to upload only one file at the same time.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igUpload(optionLiteral: 'option', optionName: "mode", optionValue: any): void;
 
 	/**
 	 * Get or set a bool setting that allows user to select(for upload) more than 1 file from the browse dialog at once. HTML 5+ - it is supported by Chrome, MOzilla FF, Safar, Opera latest versions and IE10+
+	 *
 	 */
 	igUpload(optionLiteral: 'option', optionName: "multipleFiles"): boolean;
 
 	/**
 	 * Get or set a bool setting that allows user to select(for upload) more than 1 file from the browse dialog at once. HTML 5+ - it is supported by Chrome, MOzilla FF, Safar, Opera latest versions and IE10+
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igUpload(optionLiteral: 'option', optionName: "multipleFiles", optionValue: boolean): void;
 
 	/**
 	 * Get or set the maximum number of allowed files to upload.
+	 *
 	 */
 	igUpload(optionLiteral: 'option', optionName: "maxUploadedFiles"): number;
 
 	/**
 	 * Get or set the maximum number of allowed files to upload.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igUpload(optionLiteral: 'option', optionName: "maxUploadedFiles", optionValue: number): void;
 
 	/**
 	 * Get or set count of files that could be uploaded at the same time.
+	 *
 	 */
 	igUpload(optionLiteral: 'option', optionName: "maxSimultaneousFilesUploads"): number;
 
 	/**
 	 * Get or set count of files that could be uploaded at the same time.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igUpload(optionLiteral: 'option', optionName: "maxSimultaneousFilesUploads", optionValue: number): void;
 
 	/**
 	 * Get or set file size metrics how to be shown files size.
+	 *
 	 */
 	igUpload(optionLiteral: 'option', optionName: "fileSizeMetric"): any;
 
 	/**
 	 * Get or set file size metrics how to be shown files size.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igUpload(optionLiteral: 'option', optionName: "fileSizeMetric", optionValue: any): void;
 
 	/**
 	 * UniqueId of the control - should not be changed by developer. Set from server-side wrapper.
+	 *
 	 */
 	igUpload(optionLiteral: 'option', optionName: "controlId"): string;
 
 	/**
 	 * UniqueId of the control - should not be changed by developer. Set from server-side wrapper.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igUpload(optionLiteral: 'option', optionName: "controlId", optionValue: string): void;
 
 	/**
 	 * The number of digits after the decimal point.
+	 *
 	 */
 	igUpload(optionLiteral: 'option', optionName: "fileSizeDecimalDisplay"): number;
 
 	/**
 	 * The number of digits after the decimal point.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igUpload(optionLiteral: 'option', optionName: "fileSizeDecimalDisplay", optionValue: number): void;
@@ -92176,6 +107379,50 @@ interface JQuery {
 	 */
 	igUpload(optionLiteral: 'option', optionName: "maxFileSize", optionValue: any): void;
 
+	/**
+	 * Get or set whether to use only one request for sending data, when you are sending more than one file.
+	 *
+	 */
+	igUpload(optionLiteral: 'option', optionName: "useSingleRequest"): boolean;
+
+	/**
+	 * Get or set whether to use only one request for sending data, when you are sending more than one file.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igUpload(optionLiteral: 'option', optionName: "useSingleRequest", optionValue: boolean): void;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	igUpload(optionLiteral: 'option', optionName: "language"): string;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igUpload(optionLiteral: 'option', optionName: "language", optionValue: string): void;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+
+	igUpload(optionLiteral: 'option', optionName: "regional"): string|Object;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igUpload(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
+
 	/**
 	 * Defines the name of the file upload selecting event. Fired when browse button is pressed.
 	 * Return false in order to cancel selecting file.
@@ -92311,6 +107558,7 @@ interface IgValidatorField {
 	/**
 	 * Gets the target element (input or control target) to be validated. This field setting is required.
 	 *
+	 *
 	 * Valid values:
 	 * "string" A valid jQuery selector for the element
 	 * "object" A reference to a jQuery object
@@ -92749,23 +107997,27 @@ interface IgValidator {
 	 * Gets/Sets whether validation is triggered when the text in editor changes.
 	 * Note that this is more appropriate for selection controls such as checkbox, combo or rating.
 	 * As it can cause excessive messages with text-based fields, the initial validation can be delayed via the [threshold](ui.igvalidator#options:threshold) option.
+	 *
 	 */
 	onchange?: boolean;
 
 	/**
 	 * Gets/Sets whether validation is triggered when the editor loses focus.
+	 *
 	 */
 	onblur?: boolean;
 
 	/**
 	 * Gets/Sets whether validation is triggered when a form containing validation targets is submitting. If any of the validations fail, the submit action will be prevented.
 	 * Note that this doesn't apply to the native JavaScript submit function, but will handle the jQuery equivalent and the browser default action.
+	 *
 	 */
 	onsubmit?: boolean;
 
 	/**
 	 * Gets/Sets option to validate if a value was entered (not empty text, selected item, etc.)
 	 *
+	 *
 	 * Valid values:
 	 * "boolean" A boolean value indicating if the field is required.
 	 * "object" A configuration object with optional error message (e.g. required: { errorMessage: "Error!"} )
@@ -92775,6 +108027,7 @@ interface IgValidator {
 	/**
 	 * Gets/Sets number validation rule options.Default separators for decimals and thousands are '.' and ',' respectively and are defined in the "$.ui.igValidator.defaults" object.
 	 *
+	 *
 	 * Valid values:
 	 * "boolean" A boolean value indicating if the field should be a number. Default separators are used.
 	 * "object" A configuration object with errorMessage, decimalSeparator and thousandsSeparator. Those properties are all optional.
@@ -92784,6 +108037,7 @@ interface IgValidator {
 	/**
 	 * Gets/Sets date validation rule options. This can additionally help guide the [valueRange](ui.igvalidator#options:valueRange) validation.Note: Dependant on JavaScript Date parsing which will accept a wide range of values.
 	 *
+	 *
 	 * Valid values:
 	 * "boolean" A boolean value indicating if the field should be a valid JavaScript Date or can be parsed as one.
 	 * "object" A configuration object with optional error message (e.g. date: { errorMessage: "Enter a valid number"} )
@@ -92793,6 +108047,7 @@ interface IgValidator {
 	/**
 	 * Gets/Sets email validation rule options. Uses a RegExp defined in the "$.ui.igValidator.defaults" object.
 	 *
+	 *
 	 * Valid values:
 	 * "boolean" A boolean value indicating if the field should be an email.
 	 * "object" A configuration object with optional error message (e.g. email: { errorMessage: "Enter a valid email"} )
@@ -92802,6 +108057,7 @@ interface IgValidator {
 	/**
 	 * Gets/Sets a minimum and/or maximum length of text or number of selected items. Null or 0 values are ignored.
 	 *
+	 *
 	 * Valid values:
 	 * "array" An array of two numbers, where the first value is the minimum and the second is the maximum. (e.g. lengthRange: [ 1, 10] )
 	 * "object" A configuration object with optional error message. Message strings can contain format items for min and max respectively (e.g. lengthRange: { min: 6, max: 20, errorMessage: "Password must be at least {0} long and no more than {1}." } )
@@ -92811,6 +108067,7 @@ interface IgValidator {
 	/**
 	 * Gets/Sets a minimum and/or maximum value. Null values are ignored.
 	 *
+	 *
 	 * Valid values:
 	 * "array" An array of two numbers or dates, where the first is the minimum and the second is the maximum. (e.g. valueRange: [ 1, 10] )
 	 * "object" A configuration object with optional error message. Message strings can contain format items for min and max respectively (e.g. lengthRange: { min: 6, max: 20, errorMessage: "Value must be between {0} and {1}." } )
@@ -92820,6 +108077,7 @@ interface IgValidator {
 	/**
 	 * Gets/Sets Credit Card number validation rule options.Note: This rule will only validate the checksum of the number using Luhn algorithm irregardless of card type.
 	 *
+	 *
 	 * Valid values:
 	 * "boolean" A boolean value indicating if the field should be a valid Credit Card number.
 	 * "object" A configuration object with optional error message (e.g. creditCard: { errorMessage: "Enter a valid card number"} )
@@ -92829,6 +108087,7 @@ interface IgValidator {
 	/**
 	 * Gets/Sets regular expression validation rule options.
 	 *
+	 *
 	 * Valid values:
 	 * "string" A string containing regular expression.
 	 * "object" A RegExp object or an object with expression and errorMessage properties.
@@ -92838,33 +108097,39 @@ interface IgValidator {
 	/**
 	 * Gets/Sets if all rules for a field should be checked, so even if one fails the rest will continue executing.
 	 * Note: This will not force checks on an empty field for rules that don't normally execute without a value.
+	 *
 	 */
 	executeAllRules?: boolean;
 
 	/**
 	 * Gets/Sets a custom jQuery element to be used for validation messages. That inner HTML of the target is modified, can be a SPAN, LABEL or DIV.
+	 *
 	 */
 	messageTarget?: Element;
 
 	/**
 	 * Gets/Sets text for an error message to be used if none is set for the particular rule. Overrides default rule-specific error messages.
+	 *
 	 */
 	errorMessage?: string;
 
 	/**
 	 * Gets/Sets text for a success message. Note that since there is no default, setting this message will enable showing success indication.
+	 *
 	 */
 	successMessage?: string;
 
 	/**
 	 * Gets/Sets validation minimum input length. Validation won't be triggered for input before that value is reached on change and focus loss.
 	 * Note: This will not affect required fields on form submit.
+	 *
 	 */
 	threshold?: number;
 
 	/**
 	 * Gets/Sets a requirement for the value in this field to be the same as another input element or editor control.
 	 *
+	 *
 	 * Valid values:
 	 * "string" A valid jQuery selector for the target element
 	 * "object" A reference to the jQuery object for the target or an object with selector property and custom errorMessage.
@@ -92874,6 +108139,7 @@ interface IgValidator {
 	/**
 	 * Gets/Sets a custom function to perform validation. Use 'this' to reference the calling validator and the value and optional field settings arguments to determine and return the state of the field.
 	 *
+	 *
 	 * Valid values:
 	 * "function" The function to call
 	 * "string" Function name, must be in global namespace (window["name"])
@@ -92884,26 +108150,48 @@ interface IgValidator {
 	/**
 	 * Gets a list of target field items describing each with validation options and a required selector. Fields can contain any of the validation rules and triggers but not other fields or event handlers.
 	 * Applicable options are also inherited from the global control configuration if not set.
+	 *
 	 */
 	fields?: IgValidatorField[];
 
 	/**
 	 * Gets/Sets the options for the [igNotifier](ui.ignotifier#options) used to show error messages.
+	 *
 	 */
 	notificationOptions?: any;
 
 	/**
 	 * Gets/Sets the option to show an asterisks indication next to required fields.
 	 * Note: Indicators are not supported on grouped controls such as checkbox or radio button sets and the igRating control.
+	 *
 	 */
 	requiredIndication?: boolean;
 
 	/**
 	 * Gets/Sets the option to show a label indication next to optional fields.
 	 * Note: Indicators are not supported on grouped controls such as checkbox or radio button sets and the igRating control.
+	 *
 	 */
 	optionalIndication?: boolean;
 
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	locale?: any;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	language?: string;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+	regional?: string|Object;
+
 	/**
 	 * Event which is raised on validation before default validation logic is applied.
 	 * Return false in order to cancel the event and consider the field valid.
@@ -93097,6 +108385,24 @@ interface IgValidatorMethods {
 	 * Destroys the validator widget.
 	 */
 	destroy(): void;
+
+	/**
+	 * Changes the all locales contained into a specified container to the language specified in [options.language](ui.igwidget#options:language)
+	 * Note that this method is for rare scenarios, use [language](ui.igwidget#options:language) or [locale](ui.igwidget#options:locale) option setter
+	 *
+	 * @param $container Optional parameter - if not set it would use the element of the widget as $container
+	 */
+	changeLocale($container: Object): void;
+
+	/**
+	 * Changes the widget language to global language. Global language is the value in $.ig.util.language
+	 */
+	changeGlobalLanguage(): void;
+
+	/**
+	 * Changes the widget regional settins to global regional settings. Global regional settings are container in $.ig.util.regional
+	 */
+	changeGlobalRegional(): void;
 }
 interface JQuery {
 	data(propertyName: "igValidator"): IgValidatorMethods;
@@ -93111,11 +108417,15 @@ class IgValidatorBaseRule {
 	/**
 	 * Gets the error message type to get from locale settings (matching as "<type>Message>"). Returns the rule name by default.
 	 * Only used when there's no errorMessage option available through getRuleMessage.
+	 *
+	 * @param options
 	 */
 	getMessageType(options: Object): string;
 
 	/**
 	 * Gets an errorMessage from either the rule or field/global options.
+	 *
+	 * @param options
 	 */
 	getRuleMessage(options: Object): string;
 
@@ -93162,6 +108472,8 @@ class IgValidatorRequiredRule {
 
 	/**
 	 * Gets an errorMessage from either the rule or field/global options.
+	 *
+	 * @param options
 	 */
 	getRuleMessage(options: Object): string;
 
@@ -93186,6 +108498,8 @@ class IgValidatorControlRule {
 
 	/**
 	 * Returns an error message for the rule from options
+	 *
+	 * @param options
 	 */
 	getRuleMessage(options: Object): void;
 	shouldRun(options: Object, value: Object): void;
@@ -93213,11 +108527,15 @@ class IgValidatorNumberRule {
 	/**
 	 * Gets the error message type to get from locale settings (matching as "<type>Message>"). Returns the rule name by default.
 	 * Only used when there's no errorMessage option available through getRuleMessage.
+	 *
+	 * @param options
 	 */
 	getMessageType(options: Object): string;
 
 	/**
 	 * Gets an errorMessage from either the rule or field/global options.
+	 *
+	 * @param options
 	 */
 	getRuleMessage(options: Object): string;
 
@@ -93251,11 +108569,15 @@ class IgValidatorDateRule {
 	/**
 	 * Gets the error message type to get from locale settings (matching as "<type>Message>"). Returns the rule name by default.
 	 * Only used when there's no errorMessage option available through getRuleMessage.
+	 *
+	 * @param options
 	 */
 	getMessageType(options: Object): string;
 
 	/**
 	 * Gets an errorMessage from either the rule or field/global options.
+	 *
+	 * @param options
 	 */
 	getRuleMessage(options: Object): string;
 
@@ -93289,6 +108611,8 @@ class IgValidatorLengthRule {
 
 	/**
 	 * Gets an errorMessage from either the rule or field/global options.
+	 *
+	 * @param options
 	 */
 	getRuleMessage(options: Object): string;
 
@@ -93335,11 +108659,15 @@ class IgValidatorEqualToRule {
 	/**
 	 * Gets the error message type to get from locale settings (matching as "<type>Message>"). Returns the rule name by default.
 	 * Only used when there's no errorMessage option available through getRuleMessage.
+	 *
+	 * @param options
 	 */
 	getMessageType(options: Object): string;
 
 	/**
 	 * Gets an errorMessage from either the rule or field/global options.
+	 *
+	 * @param options
 	 */
 	getRuleMessage(options: Object): string;
 
@@ -93373,11 +108701,15 @@ class IgValidatorEmailRule {
 	/**
 	 * Gets the error message type to get from locale settings (matching as "<type>Message>"). Returns the rule name by default.
 	 * Only used when there's no errorMessage option available through getRuleMessage.
+	 *
+	 * @param options
 	 */
 	getMessageType(options: Object): string;
 
 	/**
 	 * Gets an errorMessage from either the rule or field/global options.
+	 *
+	 * @param options
 	 */
 	getRuleMessage(options: Object): string;
 
@@ -93411,11 +108743,15 @@ class IgValidatorPatternRule {
 	/**
 	 * Gets the error message type to get from locale settings (matching as "<type>Message>"). Returns the rule name by default.
 	 * Only used when there's no errorMessage option available through getRuleMessage.
+	 *
+	 * @param options
 	 */
 	getMessageType(options: Object): string;
 
 	/**
 	 * Gets an errorMessage from either the rule or field/global options.
+	 *
+	 * @param options
 	 */
 	getRuleMessage(options: Object): string;
 
@@ -93450,6 +108786,8 @@ class IgValidatorCustomRule {
 
 	/**
 	 * Gets an errorMessage from either the rule or field/global options.
+	 *
+	 * @param options
 	 */
 	getRuleMessage(options: Object): string;
 
@@ -93475,17 +108813,24 @@ class IgValidatorCreditCardRule {
 	 * Based on ASP.NET CreditCardAttribute check,
 	 * https://github.com/Microsoft/referencesource/blob/master/System.ComponentModel.DataAnnotations/DataAnnotations/CreditCardAttribute.cs
 	 *    using Luhn algorithm https://en.wikipedia.org/wiki/Luhn_algorithm
+	 *
+	 * @param options
+	 * @param value
 	 */
 	isValid(options: Object, value: Object): void;
 
 	/**
 	 * Gets the error message type to get from locale settings (matching as "<type>Message>"). Returns the rule name by default.
 	 * Only used when there's no errorMessage option available through getRuleMessage.
+	 *
+	 * @param options
 	 */
 	getMessageType(options: Object): string;
 
 	/**
 	 * Gets an errorMessage from either the rule or field/global options.
+	 *
+	 * @param options
 	 */
 	getRuleMessage(options: Object): string;
 
@@ -93520,11 +108865,15 @@ interface JQuery {
 	igValidator(methodName: "removeField", field: Object): void;
 	igValidator(methodName: "updateField", field: Object, fieldOptions?: Object): void;
 	igValidator(methodName: "destroy"): void;
+	igValidator(methodName: "changeLocale", $container: Object): void;
+	igValidator(methodName: "changeGlobalLanguage"): void;
+	igValidator(methodName: "changeGlobalRegional"): void;
 
 	/**
 	 * Gets/Sets whether validation is triggered when the text in editor changes.
 	 * Note that this is more appropriate for selection controls such as checkbox, combo or rating.
 	 * As it can cause excessive messages with text-based fields, the initial validation can be delayed via the [threshold](ui.igvalidator#options:threshold) option.
+	 *
 	 */
 	igValidator(optionLiteral: 'option', optionName: "onchange"): boolean;
 
@@ -93533,18 +108882,21 @@ interface JQuery {
 	 * Note that this is more appropriate for selection controls such as checkbox, combo or rating.
 	 * As it can cause excessive messages with text-based fields, the initial validation can be delayed via the [threshold](ui.igvalidator#options:threshold) option.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igValidator(optionLiteral: 'option', optionName: "onchange", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets whether validation is triggered when the editor loses focus.
+	 *
 	 */
 	igValidator(optionLiteral: 'option', optionName: "onblur"): boolean;
 
 	/**
 	 * /Sets whether validation is triggered when the editor loses focus.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igValidator(optionLiteral: 'option', optionName: "onblur", optionValue: boolean): void;
@@ -93552,6 +108904,7 @@ interface JQuery {
 	/**
 	 * Gets/Sets whether validation is triggered when a form containing validation targets is submitting. If any of the validations fail, the submit action will be prevented.
 	 * Note that this doesn't apply to the native JavaScript submit function, but will handle the jQuery equivalent and the browser default action.
+	 *
 	 */
 	igValidator(optionLiteral: 'option', optionName: "onsubmit"): boolean;
 
@@ -93559,12 +108912,14 @@ interface JQuery {
 	 * /Sets whether validation is triggered when a form containing validation targets is submitting. If any of the validations fail, the submit action will be prevented.
 	 * Note that this doesn't apply to the native JavaScript submit function, but will handle the jQuery equivalent and the browser default action.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igValidator(optionLiteral: 'option', optionName: "onsubmit", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets option to validate if a value was entered (not empty text, selected item, etc.)
+	 *
 	 */
 
 	igValidator(optionLiteral: 'option', optionName: "required"): boolean|Object;
@@ -93572,6 +108927,7 @@ interface JQuery {
 	/**
 	 * /Sets option to validate if a value was entered (not empty text, selected item, etc.)
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -93579,6 +108935,7 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets number validation rule options.Default separators for decimals and thousands are '.' and ',' respectively and are defined in the "$.ui.igValidator.defaults" object.
+	 *
 	 */
 
 	igValidator(optionLiteral: 'option', optionName: "number"): boolean|Object;
@@ -93586,6 +108943,7 @@ interface JQuery {
 	/**
 	 * /Sets number validation rule options.Default separators for decimals and thousands are '.' and ',' respectively and are defined in the "$.ui.igValidator.defaults" object.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -93593,6 +108951,7 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets date validation rule options. This can additionally help guide the [valueRange](ui.igvalidator#options:valueRange) validation.Note: Dependant on JavaScript Date parsing which will accept a wide range of values.
+	 *
 	 */
 
 	igValidator(optionLiteral: 'option', optionName: "date"): boolean|Object;
@@ -93600,6 +108959,7 @@ interface JQuery {
 	/**
 	 * /Sets date validation rule options. This can additionally help guide the [valueRange](ui.igvalidator#options:valueRange) validation.Note: Dependant on JavaScript Date parsing which will accept a wide range of values.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -93607,6 +108967,7 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets email validation rule options. Uses a RegExp defined in the "$.ui.igValidator.defaults" object.
+	 *
 	 */
 
 	igValidator(optionLiteral: 'option', optionName: "email"): boolean|Object;
@@ -93614,6 +108975,7 @@ interface JQuery {
 	/**
 	 * /Sets email validation rule options. Uses a RegExp defined in the "$.ui.igValidator.defaults" object.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -93621,6 +108983,7 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets a minimum and/or maximum length of text or number of selected items. Null or 0 values are ignored.
+	 *
 	 */
 
 	igValidator(optionLiteral: 'option', optionName: "lengthRange"): Array<any>|Object;
@@ -93628,6 +108991,7 @@ interface JQuery {
 	/**
 	 * /Sets a minimum and/or maximum length of text or number of selected items. Null or 0 values are ignored.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -93635,6 +108999,7 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets a minimum and/or maximum value. Null values are ignored.
+	 *
 	 */
 
 	igValidator(optionLiteral: 'option', optionName: "valueRange"): Array<any>|Object;
@@ -93642,6 +109007,7 @@ interface JQuery {
 	/**
 	 * /Sets a minimum and/or maximum value. Null values are ignored.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -93649,6 +109015,7 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets Credit Card number validation rule options.Note: This rule will only validate the checksum of the number using Luhn algorithm irregardless of card type.
+	 *
 	 */
 
 	igValidator(optionLiteral: 'option', optionName: "creditCard"): boolean|Object;
@@ -93656,6 +109023,7 @@ interface JQuery {
 	/**
 	 * /Sets Credit Card number validation rule options.Note: This rule will only validate the checksum of the number using Luhn algorithm irregardless of card type.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -93663,6 +109031,7 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets regular expression validation rule options.
+	 *
 	 */
 
 	igValidator(optionLiteral: 'option', optionName: "pattern"): string|Object;
@@ -93670,6 +109039,7 @@ interface JQuery {
 	/**
 	 * /Sets regular expression validation rule options.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -93678,6 +109048,7 @@ interface JQuery {
 	/**
 	 * Gets/Sets if all rules for a field should be checked, so even if one fails the rest will continue executing.
 	 * Note: This will not force checks on an empty field for rules that don't normally execute without a value.
+	 *
 	 */
 	igValidator(optionLiteral: 'option', optionName: "executeAllRules"): boolean;
 
@@ -93685,42 +109056,49 @@ interface JQuery {
 	 * /Sets if all rules for a field should be checked, so even if one fails the rest will continue executing.
 	 * Note: This will not force checks on an empty field for rules that don't normally execute without a value.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igValidator(optionLiteral: 'option', optionName: "executeAllRules", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets a custom jQuery element to be used for validation messages. That inner HTML of the target is modified, can be a SPAN, LABEL or DIV.
+	 *
 	 */
 	igValidator(optionLiteral: 'option', optionName: "messageTarget"): Element;
 
 	/**
 	 * /Sets a custom jQuery element to be used for validation messages. That inner HTML of the target is modified, can be a SPAN, LABEL or DIV.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igValidator(optionLiteral: 'option', optionName: "messageTarget", optionValue: Element): void;
 
 	/**
 	 * Gets/Sets text for an error message to be used if none is set for the particular rule. Overrides default rule-specific error messages.
+	 *
 	 */
 	igValidator(optionLiteral: 'option', optionName: "errorMessage"): string;
 
 	/**
 	 * /Sets text for an error message to be used if none is set for the particular rule. Overrides default rule-specific error messages.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igValidator(optionLiteral: 'option', optionName: "errorMessage", optionValue: string): void;
 
 	/**
 	 * Gets/Sets text for a success message. Note that since there is no default, setting this message will enable showing success indication.
+	 *
 	 */
 	igValidator(optionLiteral: 'option', optionName: "successMessage"): string;
 
 	/**
 	 * /Sets text for a success message. Note that since there is no default, setting this message will enable showing success indication.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igValidator(optionLiteral: 'option', optionName: "successMessage", optionValue: string): void;
@@ -93728,6 +109106,7 @@ interface JQuery {
 	/**
 	 * Gets/Sets validation minimum input length. Validation won't be triggered for input before that value is reached on change and focus loss.
 	 * Note: This will not affect required fields on form submit.
+	 *
 	 */
 	igValidator(optionLiteral: 'option', optionName: "threshold"): number;
 
@@ -93735,12 +109114,14 @@ interface JQuery {
 	 * /Sets validation minimum input length. Validation won't be triggered for input before that value is reached on change and focus loss.
 	 * Note: This will not affect required fields on form submit.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igValidator(optionLiteral: 'option', optionName: "threshold", optionValue: number): void;
 
 	/**
 	 * Gets/Sets a requirement for the value in this field to be the same as another input element or editor control.
+	 *
 	 */
 
 	igValidator(optionLiteral: 'option', optionName: "equalTo"): string|Object;
@@ -93748,6 +109129,7 @@ interface JQuery {
 	/**
 	 * /Sets a requirement for the value in this field to be the same as another input element or editor control.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -93755,6 +109137,7 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets a custom function to perform validation. Use 'this' to reference the calling validator and the value and optional field settings arguments to determine and return the state of the field.
+	 *
 	 */
 
 	igValidator(optionLiteral: 'option', optionName: "custom"): Function|string|Object;
@@ -93762,6 +109145,7 @@ interface JQuery {
 	/**
 	 * /Sets a custom function to perform validation. Use 'this' to reference the calling validator and the value and optional field settings arguments to determine and return the state of the field.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -93770,6 +109154,7 @@ interface JQuery {
 	/**
 	 * Gets a list of target field items describing each with validation options and a required selector. Fields can contain any of the validation rules and triggers but not other fields or event handlers.
 	 * Applicable options are also inherited from the global control configuration if not set.
+	 *
 	 */
 	igValidator(optionLiteral: 'option', optionName: "fields"): IgValidatorField[];
 
@@ -93777,18 +109162,21 @@ interface JQuery {
 	 * A list of target field items describing each with validation options and a required selector. Fields can contain any of the validation rules and triggers but not other fields or event handlers.
 	 * Applicable options are also inherited from the global control configuration if not set.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igValidator(optionLiteral: 'option', optionName: "fields", optionValue: IgValidatorField[]): void;
 
 	/**
 	 * Gets/Sets the options for the [igNotifier](ui.ignotifier#options) used to show error messages.
+	 *
 	 */
 	igValidator(optionLiteral: 'option', optionName: "notificationOptions"): any;
 
 	/**
 	 * /Sets the options for the [igNotifier](ui.ignotifier#options) used to show error messages.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igValidator(optionLiteral: 'option', optionName: "notificationOptions", optionValue: any): void;
@@ -93796,6 +109184,7 @@ interface JQuery {
 	/**
 	 * Gets/Sets the option to show an asterisks indication next to required fields.
 	 * Note: Indicators are not supported on grouped controls such as checkbox or radio button  and the igRating control.
+	 *
 	 */
 	igValidator(optionLiteral: 'option', optionName: "requiredIndication"): boolean;
 
@@ -93803,6 +109192,7 @@ interface JQuery {
 	 * /Sets the option to show an asterisks indication next to required fields.
 	 * Note: Indicators are not supported on grouped controls such as checkbox or radio button sets and the igRating control.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igValidator(optionLiteral: 'option', optionName: "requiredIndication", optionValue: boolean): void;
@@ -93810,6 +109200,7 @@ interface JQuery {
 	/**
 	 * Gets/Sets the option to show a label indication next to optional fields.
 	 * Note: Indicators are not supported on grouped controls such as checkbox or radio button  and the igRating control.
+	 *
 	 */
 	igValidator(optionLiteral: 'option', optionName: "optionalIndication"): boolean;
 
@@ -93817,10 +109208,55 @@ interface JQuery {
 	 * /Sets the option to show a label indication next to optional fields.
 	 * Note: Indicators are not supported on grouped controls such as checkbox or radio button sets and the igRating control.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igValidator(optionLiteral: 'option', optionName: "optionalIndication", optionValue: boolean): void;
 
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	igValidator(optionLiteral: 'option', optionName: "locale"): any;
+
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igValidator(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	igValidator(optionLiteral: 'option', optionName: "language"): string;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igValidator(optionLiteral: 'option', optionName: "language", optionValue: string): void;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+
+	igValidator(optionLiteral: 'option', optionName: "regional"): string|Object;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igValidator(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
+
 	/**
 	 * Event which is raised on validation before default validation logic is applied.
 	 * Return false in order to cancel the event and consider the field valid.
@@ -94093,16 +109529,19 @@ interface JQuery {
 interface IgVideoPlayerBookmark {
 	/**
 	 * Gets/Sets where the bookmark will be positioned. Should be between 0 and movie duration in seconds.
+	 *
 	 */
 	time?: number;
 
 	/**
 	 * Gets/Sets bookmark title. It is shown as tooltip on hover.
+	 *
 	 */
 	title?: string;
 
 	/**
 	 * Gets/Sets whether the bookmark is disabled or not.
+	 *
 	 */
 	disabled?: boolean;
 
@@ -94115,36 +109554,43 @@ interface IgVideoPlayerBookmark {
 interface IgVideoPlayerRelatedVideo {
 	/**
 	 * Gets/Sets the URL of the related video image.
+	 *
 	 */
 	imageUrl?: string;
 
 	/**
 	 * Gets/Sets the title of the video.
+	 *
 	 */
 	title?: string;
 
 	/**
 	 * Gets/Sets the width of the related video image.
+	 *
 	 */
 	width?: number;
 
 	/**
 	 * Gets/Sets the height of the related video image.
+	 *
 	 */
 	height?: number;
 
 	/**
 	 * Gets/Sets a link to a page that will play the related video. It will be opened in a new window. If there are sources also, the link property has a priority.
+	 *
 	 */
 	link?: string;
 
 	/**
 	 * Gets/Sets the sources of the related video.
+	 *
 	 */
 	sources?: any[];
 
 	/**
 	 * Gets/Sets custom CSS class to be applied on the related video element.
+	 *
 	 */
 	css?: string;
 
@@ -94157,61 +109603,73 @@ interface IgVideoPlayerRelatedVideo {
 interface IgVideoPlayerBanner {
 	/**
 	 * Gets/Sets the banner image url.
+	 *
 	 */
 	imageUrl?: string;
 
 	/**
 	 * Gets/Sets an array of numbers. Each number specifies on which second in the movie the banner will pop.
+	 *
 	 */
 	times?: any[];
 
 	/**
 	 * Gets/Sets whether the user will be able to close the banner or not.
+	 *
 	 */
 	closeBanner?: boolean;
 
 	/**
 	 * Gets/Sets whether to apply animation effects when showing or hiding the banner. If set to true, the animation is played for banner.duration in milliseconds.
+	 *
 	 */
 	animate?: boolean;
 
 	/**
 	 * Gets/Sets whether the banner is visible or not.
+	 *
 	 */
 	visible?: boolean;
 
 	/**
 	 * Gets/Sets the banner animation duration.
+	 *
 	 */
 	duration?: number;
 
 	/**
 	 * Gets/Sets whether to automatically hide the banner. If set to true, the banner is hidden after [hidedelay](ui.igvideoplayer#options:banners.hidedelay) in milliseconds.
+	 *
 	 */
 	autohide?: boolean;
 
 	/**
 	 * Gets/Sets the banner autohide delay in milliseconds. It is taken into account only if the banner.autohide option is set to true.
+	 *
 	 */
 	hidedelay?: number;
 
 	/**
 	 * Gets/Sets the banner link that will open in new window.
+	 *
 	 */
 	link?: string;
 
 	/**
 	 * Gets/Sets the banner width
+	 *
 	 */
 	width?: number|string;
 
 	/**
 	 * Gets/Sets the banner height
+	 *
 	 */
 	height?: number|string;
 
 	/**
 	 * Gets/Sets the banner specific css class, that will be applied on the banner grid.
+	 *
 	 */
 	css?: string;
 
@@ -94224,21 +109682,25 @@ interface IgVideoPlayerBanner {
 interface IgVideoPlayerCommercialsLinkedCommercial {
 	/**
 	 * Gets/Sets the sources of the linked commercial video.
+	 *
 	 */
 	sources?: any[];
 
 	/**
 	 * Gets/Sets the second in the video at which the linked commercial should play.
+	 *
 	 */
 	startTime?: number;
 
 	/**
 	 * Gets/Sets the link to open on linked commercial click.
+	 *
 	 */
 	link?: string;
 
 	/**
 	 * Gets/Sets the tooltip for the linked commercial bookmark.
+	 *
 	 */
 	title?: string;
 
@@ -94251,21 +109713,25 @@ interface IgVideoPlayerCommercialsLinkedCommercial {
 interface IgVideoPlayerCommercialsEmbeddedCommercial {
 	/**
 	 * Gets/Sets the start second of the embedded commercial.
+	 *
 	 */
 	startTime?: number;
 
 	/**
 	 * Gets/Sets the end second of the embedded commercial.
+	 *
 	 */
 	endTime?: number;
 
 	/**
 	 * Gets/Sets the sponsored link of the embedded commercial.
+	 *
 	 */
 	link?: string;
 
 	/**
 	 * Gets/Sets the tooltip for the bookmark of the embedded commercial.
+	 *
 	 */
 	title?: string;
 
@@ -94278,21 +109744,25 @@ interface IgVideoPlayerCommercialsEmbeddedCommercial {
 interface IgVideoPlayerCommercialsAdMessage {
 	/**
 	 * Gets/Sets whether to apply an animation effect when showing or hiding the ad message. If set to true, the animation is played for [animationDuration](ui.igvideoplayer#options:commercials.adMessage.animationDuration) in milliseconds.
+	 *
 	 */
 	animate?: boolean;
 
 	/**
 	 * Gets/Sets the ad message auto hide of the commercial.
+	 *
 	 */
 	autoHide?: boolean;
 
 	/**
 	 * Gets/Sets the ad message hide delay.
+	 *
 	 */
 	hideDelay?: number;
 
 	/**
 	 * Gets/Sets the ad message animation duration of the commercial.
+	 *
 	 */
 	animationDuration?: number;
 
@@ -94305,26 +109775,31 @@ interface IgVideoPlayerCommercialsAdMessage {
 interface IgVideoPlayerCommercials {
 	/**
 	 * Gets/Sets an array of linked commercial objects. A linked commercial is a separate video file that will be played in the specified position of the original movie clip by [startTime](ui.igvideoplayer#options:commercials.linkedCommercials.startTime). This feature is useful if you have frequently changing outside commercial sources.
+	 *
 	 */
 	linkedCommercials?: IgVideoPlayerCommercialsLinkedCommercial[];
 
 	/**
 	 * Gets/Sets an array of embedded commercials objects. An embedded commercial is an ad that is contained in the original video file. It is suitable when you want to mark some sections of the video as commercials.
+	 *
 	 */
 	embeddedCommercials?: IgVideoPlayerCommercialsEmbeddedCommercial[];
 
 	/**
 	 * Gets/Sets whether the commercials will play againg during the repetitive video plays.
+	 *
 	 */
 	alwaysPlayCommercials?: boolean;
 
 	/**
 	 * Gets/Sets whether to show commercial locations or not.
+	 *
 	 */
 	showBookmarks?: boolean;
 
 	/**
 	 * Customizes the ad message settings of the commercial. Ad message shows the duration of the commercial and pops up when the commercial starts playing.
+	 *
 	 */
 	adMessage?: IgVideoPlayerCommercialsAdMessage;
 
@@ -94337,96 +109812,115 @@ interface IgVideoPlayerCommercials {
 interface IgVideoPlayerLocale {
 	/**
 	 * Gets/Sets live stream video title.
+	 *
 	 */
 	liveStream?: boolean;
 
 	/**
 	 * Gets/Sets live video title.
+	 *
 	 */
 	live?: boolean;
 
 	/**
 	 * Gets/Sets paused button title.
+	 *
 	 */
 	paused?: boolean;
 
 	/**
 	 * Gets/Sets playing button title.
+	 *
 	 */
 	playing?: boolean;
 
 	/**
 	 * Gets/Sets play button title.
+	 *
 	 */
 	play?: boolean;
 
 	/**
 	 * Gets/Sets volume button title.
+	 *
 	 */
 	volume?: boolean;
 
 	/**
 	 * Gets/Sets progress label long format.
+	 *
 	 */
 	progressLabelLongFormat?: boolean;
 
 	/**
 	 * Gets/Sets progress label short format.
+	 *
 	 */
 	progressLabelShortFormat?: boolean;
 
 	/**
 	 * Gets/Sets enter fullscreen button title.
+	 *
 	 */
 	enterFullscreen?: boolean;
 
 	/**
 	 * Gets/Sets exit fullscreen button title.
+	 *
 	 */
 	exitFullscreen?: boolean;
 
 	/**
 	 * Gets/Sets skip to button title.
+	 *
 	 */
 	skipTo?: boolean;
 
 	/**
 	 * Gets/Sets buffering label text.
+	 *
 	 */
 	buffering?: boolean;
 
 	/**
 	 * Gets/Sets ad message text.
+	 *
 	 */
 	adMessage?: boolean;
 
 	/**
 	 * Gets/Sets long ad message text.
+	 *
 	 */
 	adMessageLong?: boolean;
 
 	/**
 	 * Gets/Sets ad message text when no duration is specified.
+	 *
 	 */
 	adMessageNoDuration?: boolean;
 
 	/**
 	 * Gets/Sets new ad window title.
+	 *
 	 */
 	adNewWindowTip?: boolean;
 
 	/**
 	 * Gets/Sets related videos text.
+	 *
 	 */
 	relatedVideos?: boolean;
 
 	/**
 	 * Gets/Sets replay button text.
+	 *
 	 */
 	replayButton?: boolean;
 
 	/**
 	 * Gets/Sets replay button tooltip.
+	 *
 	 */
 	replayTooltip?: boolean;
 
@@ -94442,14 +109936,14 @@ interface EndedEvent {
 
 interface EndedEventUIParam {
 	/**
-	 * Used to get the url of the playing video.
+	 * Get the video duration in seconds.
 	 */
-	source?: any;
+	duration?: number;
 
 	/**
-	 * Used to get the video duration in seconds.
+	 * Get the url of the playing video.
 	 */
-	duration?: any;
+	source?: string;
 }
 
 interface PlayingEvent {
@@ -94458,14 +109952,19 @@ interface PlayingEvent {
 
 interface PlayingEventUIParam {
 	/**
-	 * Used to get the url of the playing video.
+	 * Get the current time in the video at which the event was fired.
 	 */
-	source?: any;
+	currentTime?: number;
 
 	/**
-	 * Used to get the video duration in seconds.
+	 * Get the video duration in seconds.
 	 */
-	duration?: any;
+	duration?: number;
+
+	/**
+	 * Get the url of the playing video.
+	 */
+	source?: string;
 }
 
 interface PausedEvent {
@@ -94474,14 +109973,19 @@ interface PausedEvent {
 
 interface PausedEventUIParam {
 	/**
-	 * Used to get the url of the playing video.
+	 * Get the current time in the video at which the event was fired.
 	 */
-	source?: any;
+	currentTime?: number;
 
 	/**
-	 * Used to get the video duration in seconds.
+	 * Get the video duration in seconds.
 	 */
-	duration?: any;
+	duration?: number;
+
+	/**
+	 * Get the url of the playing video.
+	 */
+	source?: string;
 }
 
 interface BufferingEvent {
@@ -94490,14 +109994,14 @@ interface BufferingEvent {
 
 interface BufferingEventUIParam {
 	/**
-	 * Used to get the url of the playing video.
+	 * Get buffered percentage.
 	 */
-	source?: any;
+	buffered?: number;
 
 	/**
-	 * Used to get buffered percentage.
+	 * Get the url of the playing video.
 	 */
-	buffered?: any;
+	source?: string;
 }
 
 interface ProgressEvent {
@@ -94506,19 +110010,19 @@ interface ProgressEvent {
 
 interface ProgressEventUIParam {
 	/**
-	 * Used to get the url of the playing video.
+	 * Get the current time in the video at which the event was fired.
 	 */
-	source?: any;
+	currentTime?: number;
 
 	/**
-	 * Used to get current position in the video at which the event was fired.
+	 * Get the video duration in seconds.
 	 */
-	currentTime?: any;
+	duration?: number;
 
 	/**
-	 * Used to get the video duration in seconds.
+	 * Get the url of the playing video.
 	 */
-	duration?: any;
+	source?: string;
 }
 
 interface WaitingEvent {
@@ -94527,19 +110031,19 @@ interface WaitingEvent {
 
 interface WaitingEventUIParam {
 	/**
-	 * Used to get the url of the playing video.
+	 * Get the current time in the video at which the event was fired.
 	 */
-	source?: any;
+	currentTime?: number;
 
 	/**
-	 * Used to get current position in the video at which the event was fired.
+	 * Get the video duration in seconds.
 	 */
-	currentTime?: any;
+	duration?: number;
 
 	/**
-	 * Used to get the video duration in seconds.
+	 * Get the url of the playing video.
 	 */
-	duration?: any;
+	source?: string;
 }
 
 interface EnterFullScreenEvent {
@@ -94548,9 +110052,9 @@ interface EnterFullScreenEvent {
 
 interface EnterFullScreenEventUIParam {
 	/**
-	 * Used to get the url of the playing video.
+	 * Get the url of the playing video.
 	 */
-	source?: any;
+	source?: string;
 }
 
 interface ExitFullScreenEvent {
@@ -94559,9 +110063,9 @@ interface ExitFullScreenEvent {
 
 interface ExitFullScreenEventUIParam {
 	/**
-	 * Used to get the url of the playing video.
+	 * Get the url of the playing video.
 	 */
-	source?: any;
+	source?: string;
 }
 
 interface RelatedVideoClickEvent {
@@ -94570,12 +110074,12 @@ interface RelatedVideoClickEvent {
 
 interface RelatedVideoClickEventUIParam {
 	/**
-	 * Used to get the relatedVideo object from the relatedVideos array.
+	 * Get the relatedVideo object from the relatedVideos array.
 	 */
 	relatedVideo?: any;
 
 	/**
-	 * Used to get the relatedVideo html element in the DOM.
+	 * Get the relatedVideo html element in the DOM.
 	 */
 	relatedVideoElement?: any;
 }
@@ -94586,19 +110090,19 @@ interface BannerVisibleEvent {
 
 interface BannerVisibleEventUIParam {
 	/**
-	 * Used to get the banner index in the banners array.
-	 */
-	index?: any;
-
-	/**
-	 * Used to get the banner object from the banners array.
+	 * Get the banner object from the banners array.
 	 */
 	banner?: any;
 
 	/**
-	 * Used to get the banner html element in the DOM.
+	 * Get the banner html element in the DOM.
 	 */
 	bannerElement?: any;
+
+	/**
+	 * Get the banner index in the banners array.
+	 */
+	index?: number;
 }
 
 interface BannerHiddenEvent {
@@ -94607,19 +110111,19 @@ interface BannerHiddenEvent {
 
 interface BannerHiddenEventUIParam {
 	/**
-	 * Used to get the banner index in the banners array.
-	 */
-	index?: any;
-
-	/**
-	 * Used to get the banner object from the banners array.
+	 * Get the banner object from the banners array.
 	 */
 	banner?: any;
 
 	/**
-	 * Used to get the banner html element in the DOM.
+	 * Get the banner html element in the DOM.
 	 */
 	bannerElement?: any;
+
+	/**
+	 * Get the banner index in the banners array.
+	 */
+	index?: number;
 }
 
 interface BannerClickEvent {
@@ -94628,7 +110132,7 @@ interface BannerClickEvent {
 
 interface BannerClickEventUIParam {
 	/**
-	 * Used to get the banner html element in the DOM.
+	 * Get the banner html element in the DOM.
 	 */
 	bannerElement?: any;
 }
@@ -94636,116 +110140,147 @@ interface BannerClickEventUIParam {
 interface IgVideoPlayer {
 	/**
 	 * Gets/Sets a list of video sources to choose from. Best coded/format is automatically detected by the control. Supported types are depending on the browser and could be one of the following mov, mp4, webm, ogg.
+	 *
 	 */
 	sources?: any[];
 
 	/**
 	 * Gets/Sets the width of the control. By default null will stretch the control to fit data, if no other widths are defined.
+	 *
 	 */
 	width?: string|number;
 
 	/**
 	 * Gets/Sets the height of the control. By default null will stretch the control to fit data, if no other heights are defined.
+	 *
 	 */
 	height?: string|number;
 
 	/**
 	 * Gets/Sets a URL to an image to show, when no video data is available.
+	 *
 	 */
 	posterUrl?: string;
 
 	/**
 	 * Gets/Sets whether to preload load initial data for duration of video. If true it may start buffering the video, but this highly depends on the specific browser implementation.
+	 *
 	 */
 	preload?: boolean;
 
 	/**
 	 * Gets/Sets whether the video should start playing immediately after the control is loaded.
+	 *
 	 */
 	autoplay?: boolean;
 
 	/**
 	 * Gets/Sets whether player controls will auto hide when video is not hovered. This is applicable only when Infragistics playback controls are used.
+	 *
 	 */
 	autohide?: boolean;
 
 	/**
 	 * Gets/Sets volume slider auto hide delay. This is applicable only when Infragistics playback controls are used.
+	 *
 	 */
 	volumeAutohideDelay?: number;
 
 	/**
 	 * Gets/Sets the center big button hide delay.
+	 *
 	 */
 	centerButtonHideDelay?: number;
 
 	/**
 	 * Gets/Sets whether the video to start again after it has ended.
+	 *
 	 */
 	loop?: boolean;
 
 	/**
 	 * Gets/Sets whether if you want to use the built in browser controls. By default player uses Infragistics playback controls. Note that you may have different look and feel across different browsers if you use the built in browser controls. When this option is set to true, no [commercials](ui.igvideoplayer#options:commercials) will be displayed as they are not supported.
+	 *
 	 */
 	browserControls?: boolean;
 
 	/**
 	 * Gets/Sets whether the video player to be in full screen or not. This is not a pure full screen, because browsers do not allow that. It just sets 100% width and height to the control.
+	 *
 	 */
 	fullscreen?: boolean;
 
 	/**
 	 * Gets/Sets the video volume. It can be between 0.0 and 1.0.
+	 *
 	 */
 	volume?: number;
 
 	/**
 	 * Gets/Sets whether the video volume is muted.
+	 *
 	 */
 	muted?: boolean;
 
 	/**
 	 * Gets/Sets video title.
+	 *
 	 */
 	title?: string;
 
 	/**
 	 * Gets/Sets whether the control seek tool tip will be shown when hovering the video progress bar.
+	 *
 	 */
 	showSeekTime?: boolean;
 
 	/**
 	 * Gets/Sets the format of the video progress label. You should use ${currentTime} to represent current playback position and ${duration} to represent video duration.
+	 *
 	 */
 	progressLabelFormat?: string;
 
 	/**
 	 * Gets/Sets an array of bookmarks that will be displayed in the video player control.
+	 *
 	 */
 	bookmarks?: IgVideoPlayerBookmark[];
 
 	/**
 	 * Gets/Sets an array of related videos that will be displayed when video playback has ended.
+	 *
 	 */
 	relatedVideos?: IgVideoPlayerRelatedVideo[];
 
 	/**
 	 * Gets/Sets an array of banner objects that will show the banners when the video clip is played.
+	 *
 	 */
 	banners?: IgVideoPlayerBanner[];
 
 	/**
 	 * Gets/Sets an array of commercials objects that will be displayed when the video is playing. Note that [broswerControls](ui.igvideoplayer#options:browserControls) doesn't support commercials.
+	 *
 	 */
 	commercials?: IgVideoPlayerCommercials;
 	locale?: IgVideoPlayerLocale;
 
 	/**
-	 * Occurs when video has ended.
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	language?: string;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+	regional?: string|Object;
+
+	/**
+	 * Occurs when the video has ended.
 	 *
 	 * Function takes arguments evt and ui.
-	 * Use ui.source to get the url of the playing video.
-	 * Use ui.duration to get the video duration in seconds.
 	 */
 	ended?: EndedEvent;
 
@@ -94753,17 +110288,13 @@ interface IgVideoPlayer {
 	 * Occurs when video gets playing.
 	 *
 	 * Function takes arguments evt and ui.
-	 * Use ui.source to get the url of the playing video.
-	 * Use ui.duration to get the video duration in seconds.
 	 */
 	playing?: PlayingEvent;
 
 	/**
-	 * Occurs when video is paused.
+	 * Occurs when the video is paused.
 	 *
 	 * Function takes arguments evt and ui.
-	 * Use ui.source to get the url of the playing video.
-	 * Use ui.duration to get the video duration in seconds.
 	 */
 	paused?: PausedEvent;
 
@@ -94771,18 +110302,13 @@ interface IgVideoPlayer {
 	 * Occurs when a chunk of data is buffered.
 	 *
 	 * Function takes arguments evt and ui.
-	 * Use ui.source to get the url of the playing video.
-	 * Use ui.buffered to get buffered percentage.
 	 */
 	buffering?: BufferingEvent;
 
 	/**
-	 * Occurs when video has advanced the playback position.
+	 * Occurs when the video has advanced the playback position.
 	 *
 	 * Function takes arguments evt and ui.
-	 * Use ui.source to get the url of the playing video.
-	 * Use ui.currentTime to get current position in the video at which the event was fired.
-	 * Use ui.duration to get the video duration in seconds.
 	 */
 	progress?: ProgressEvent;
 
@@ -94790,28 +110316,20 @@ interface IgVideoPlayer {
 	 * Occurs when igVideoPlayer is waiting for data from the server.
 	 *
 	 * Function takes arguments evt and ui.
-	 * Use ui.source to get the url of the playing video.
-	 * Use ui.currentTime to get current position in the video at which the event was fired.
-	 * Use ui.duration to get the video duration in seconds.
 	 */
 	waiting?: WaitingEvent;
 
 	/**
-	 * Occurs when the bookmark is hit.
+	 * Occurs when a bookmark is hit.
 	 *
 	 * Function takes arguments evt and ui.
-	 * Use ui.source to get the url of the playing video.
-	 * Use ui.bookmark to get the bookmark object from the bookmarks array.
-	 * Use ui.bookmarkElement to get the html element in the DOM.
 	 */
 	bookmarkHit?: BookmarkHitEvent;
 
 	/**
-	 * Occurs when the bookmark is clicked.
+	 * Occurs when a bookmark is clicked.
 	 *
 	 * Function takes arguments evt and ui.
-	 * Use ui.bookmark to get the bookmark object from the bookmarks array.
-	 * Use ui.bookmarkElement to get the html element in the DOM.
 	 */
 	bookmarkClick?: BookmarkClickEvent;
 
@@ -94819,7 +110337,6 @@ interface IgVideoPlayer {
 	 * Occurs when igVideoPlayer enters full screen mode.
 	 *
 	 * Function takes arguments evt and ui.
-	 * Use ui.source to get the url of the playing video.
 	 */
 	enterFullScreen?: EnterFullScreenEvent;
 
@@ -94827,16 +110344,13 @@ interface IgVideoPlayer {
 	 * Occurs when igVideoPlayer exits full screen mode.
 	 *
 	 * Function takes arguments evt and ui.
-	 * Use ui.source to get the url of the playing video.
 	 */
 	exitFullScreen?: ExitFullScreenEvent;
 
 	/**
-	 * Occurs when related video is clicked.
+	 * Occurs when a related video is clicked.
 	 *
 	 * Function takes arguments evt and ui.
-	 * Use ui.relatedVideo to get the relatedVideo object from the relatedVideos array.
-	 * Use ui.relatedVideoElement to get the relatedVideo html element in the DOM.
 	 */
 	relatedVideoClick?: RelatedVideoClickEvent;
 
@@ -94844,9 +110358,6 @@ interface IgVideoPlayer {
 	 * Defines the name of the player banner visible event. Fired when the banner has been displayed.
 	 *
 	 * Function takes arguments evt and ui.
-	 * Use ui.index to get the banner index in the banners array.
-	 * Use ui.banner to get the banner object from the banners array.
-	 * Use ui.bannerElement to get the banner html element in the DOM.
 	 */
 	bannerVisible?: BannerVisibleEvent;
 
@@ -94854,9 +110365,6 @@ interface IgVideoPlayer {
 	 * Occurs when the banner is hidden.
 	 *
 	 * Function takes arguments evt and ui.
-	 * Use ui.index to get the banner index in the banners array.
-	 * Use ui.banner to get the banner object from the banners array.
-	 * Use ui.bannerElement to get the banner html element in the DOM.
 	 */
 	bannerHidden?: BannerHiddenEvent;
 
@@ -94864,7 +110372,6 @@ interface IgVideoPlayer {
 	 * Occurs when the banner is clicked.
 	 *
 	 * Function takes arguments evt and ui.
-	 * Use ui.bannerElement to get the banner html element in the DOM.
 	 */
 	bannerClick?: BannerClickEvent;
 
@@ -94914,6 +110421,11 @@ interface IgVideoPlayerMethods {
 	 * Resets the commercials, to be shown again.
 	 */
 	resetCommercialsShow(): void;
+
+	/**
+	 * Changes the all locales into the widget element to the language specified in [options.language](ui.igvideoplayer#options:language)
+	 * Note that this method is for rare scenarios, use [language](ui.igvideoplayer#options:language) or [locale](ui.igvideoplayer#options:locale) option setter
+	 */
 	changeLocale(): void;
 
 	/**
@@ -94989,6 +110501,16 @@ interface IgVideoPlayerMethods {
 	 * Destroys the widget.
 	 */
 	destroy(): void;
+
+	/**
+	 * Changes the widget language to global language. Global language is the value in $.ig.util.language
+	 */
+	changeGlobalLanguage(): void;
+
+	/**
+	 * Changes the widget regional settins to global regional settings. Global regional settings are container in $.ig.util.regional
+	 */
+	changeGlobalRegional(): void;
 }
 interface JQuery {
 	data(propertyName: "igVideoPlayer"): IgVideoPlayerMethods;
@@ -95016,21 +110538,26 @@ interface JQuery {
 	igVideoPlayer(methodName: "duration"): number;
 	igVideoPlayer(methodName: "seeking"): boolean;
 	igVideoPlayer(methodName: "destroy"): void;
+	igVideoPlayer(methodName: "changeGlobalLanguage"): void;
+	igVideoPlayer(methodName: "changeGlobalRegional"): void;
 
 	/**
 	 * Gets/Sets a list of video sources to choose from. Best coded/format is automatically detected by the control. Supported types are depending on the browser and could be one of the following mov, mp4, webm, ogg.
+	 *
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "sources"): any[];
 
 	/**
 	 * /Sets a list of video sources to choose from. Best coded/format is automatically detected by the control. Supported types are depending on the browser and could be one of the following mov, mp4, webm, ogg.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "sources", optionValue: any[]): void;
 
 	/**
 	 * Gets/Sets the width of the control. By default null will stretch the control to fit data, if no other widths are defined.
+	 *
 	 */
 
 	igVideoPlayer(optionLiteral: 'option', optionName: "width"): string|number;
@@ -95038,6 +110565,7 @@ interface JQuery {
 	/**
 	 * /Sets the width of the control. By default null will stretch the control to fit data, if no other widths are defined.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -95045,6 +110573,7 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets the height of the control. By default null will stretch the control to fit data, if no other heights are defined.
+	 *
 	 */
 
 	igVideoPlayer(optionLiteral: 'option', optionName: "height"): string|number;
@@ -95052,6 +110581,7 @@ interface JQuery {
 	/**
 	 * /Sets the height of the control. By default null will stretch the control to fit data, if no other heights are defined.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -95059,216 +110589,252 @@ interface JQuery {
 
 	/**
 	 * Gets/Sets a URL to an image to show, when no video data is available.
+	 *
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "posterUrl"): string;
 
 	/**
 	 * /Sets a URL to an image to show, when no video data is available.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "posterUrl", optionValue: string): void;
 
 	/**
 	 * Gets/Sets whether to preload load initial data for duration of video. If true it may start buffering the video, but this highly depends on the specific browser implementation.
+	 *
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "preload"): boolean;
 
 	/**
 	 * /Sets whether to preload load initial data for duration of video. If true it may start buffering the video, but this highly depends on the specific browser implementation.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "preload", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets whether the video should start playing immediately after the control is loaded.
+	 *
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "autoplay"): boolean;
 
 	/**
 	 * /Sets whether the video should start playing immediately after the control is loaded.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "autoplay", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets whether player controls will auto hide when video is not hovered. This is applicable only when Infragistics playback controls are used.
+	 *
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "autohide"): boolean;
 
 	/**
 	 * /Sets whether player controls will auto hide when video is not hovered. This is applicable only when Infragistics playback controls are used.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "autohide", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets volume slider auto hide delay. This is applicable only when Infragistics playback controls are used.
+	 *
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "volumeAutohideDelay"): number;
 
 	/**
 	 * /Sets volume slider auto hide delay. This is applicable only when Infragistics playback controls are used.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "volumeAutohideDelay", optionValue: number): void;
 
 	/**
 	 * Gets/Sets the center big button hide delay.
+	 *
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "centerButtonHideDelay"): number;
 
 	/**
 	 * /Sets the center big button hide delay.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "centerButtonHideDelay", optionValue: number): void;
 
 	/**
 	 * Gets/Sets whether the video to start again after it has ended.
+	 *
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "loop"): boolean;
 
 	/**
 	 * /Sets whether the video to start again after it has ended.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "loop", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets whether if you want to use the built in browser controls. By default player uses Infragistics playback controls. Note that you may have different look and feel across different browsers if you use the built in browser controls. When this option is set to true, no [commercials](ui.igvideoplayer#options:commercials) will be displayed as they are not supported.
+	 *
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "browserControls"): boolean;
 
 	/**
 	 * /Sets whether if you want to use the built in browser controls. By default player uses Infragistics playback controls. Note that you may have different look and feel across different browsers if you use the built in browser controls. When this option is set to true, no [commercials](ui.igvideoplayer#options:commercials) will be displayed as they are not supported.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "browserControls", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets whether the video player to be in full screen or not. This is not a pure full screen, because browsers do not allow that. It just  100% width and height to the control.
+	 *
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "fullscreen"): boolean;
 
 	/**
 	 * /Sets whether the video player to be in full screen or not. This is not a pure full screen, because browsers do not allow that. It just sets 100% width and height to the control.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "fullscreen", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the video volume. It can be between 0.0 and 1.0.
+	 *
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "volume"): number;
 
 	/**
 	 * /Sets the video volume. It can be between 0.0 and 1.0.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "volume", optionValue: number): void;
 
 	/**
 	 * Gets/Sets whether the video volume is muted.
+	 *
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "muted"): boolean;
 
 	/**
 	 * /Sets whether the video volume is muted.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "muted", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets video title.
+	 *
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "title"): string;
 
 	/**
 	 * /Sets video title.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "title", optionValue: string): void;
 
 	/**
 	 * Gets/Sets whether the control seek tool tip will be shown when hovering the video progress bar.
+	 *
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "showSeekTime"): boolean;
 
 	/**
 	 * /Sets whether the control seek tool tip will be shown when hovering the video progress bar.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "showSeekTime", optionValue: boolean): void;
 
 	/**
 	 * Gets/Sets the format of the video progress label. You should use ${currentTime} to represent current playback position and ${duration} to represent video duration.
+	 *
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "progressLabelFormat"): string;
 
 	/**
 	 * /Sets the format of the video progress label. You should use ${currentTime} to represent current playback position and ${duration} to represent video duration.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "progressLabelFormat", optionValue: string): void;
 
 	/**
 	 * Gets/Sets an array of bookmarks that will be displayed in the video player control.
+	 *
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "bookmarks"): IgVideoPlayerBookmark[];
 
 	/**
 	 * /Sets an array of bookmarks that will be displayed in the video player control.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "bookmarks", optionValue: IgVideoPlayerBookmark[]): void;
 
 	/**
 	 * Gets/Sets an array of related videos that will be displayed when video playback has ended.
+	 *
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "relatedVideos"): IgVideoPlayerRelatedVideo[];
 
 	/**
 	 * /Sets an array of related videos that will be displayed when video playback has ended.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "relatedVideos", optionValue: IgVideoPlayerRelatedVideo[]): void;
 
 	/**
 	 * Gets/Sets an array of banner objects that will show the banners when the video clip is played.
+	 *
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "banners"): IgVideoPlayerBanner[];
 
 	/**
 	 * /Sets an array of banner objects that will show the banners when the video clip is played.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "banners", optionValue: IgVideoPlayerBanner[]): void;
 
 	/**
 	 * Gets/Sets an array of commercials objects that will be displayed when the video is playing. Note that [broswerControls](ui.igvideoplayer#options:browserControls) doesn't support commercials.
+	 *
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "commercials"): IgVideoPlayerCommercials;
 
 	/**
 	 * /Sets an array of commercials objects that will be displayed when the video is playing. Note that [broswerControls](ui.igvideoplayer#options:browserControls) doesn't support commercials.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "commercials", optionValue: IgVideoPlayerCommercials): void;
@@ -95276,20 +110842,46 @@ interface JQuery {
 	igVideoPlayer(optionLiteral: 'option', optionName: "locale", optionValue: IgVideoPlayerLocale): void;
 
 	/**
-	 * Occurs when video has ended.
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	igVideoPlayer(optionLiteral: 'option', optionName: "language"): string;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igVideoPlayer(optionLiteral: 'option', optionName: "language", optionValue: string): void;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+
+	igVideoPlayer(optionLiteral: 'option', optionName: "regional"): string|Object;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igVideoPlayer(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
+
+	/**
+	 * Occurs when the video has ended.
 	 *
 	 * Function takes arguments evt and ui.
-	 * Use ui.source to get the url of the playing video.
-	 * Use ui.duration to get the video duration in seconds.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "ended"): EndedEvent;
 
 	/**
-	 * Occurs when video has ended.
+	 * Occurs when the video has ended.
 	 *
 	 * Function takes arguments evt and ui.
-	 * Use ui.source to get the url of the playing video.
-	 * Use ui.duration to get the video duration in seconds.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -95299,8 +110891,6 @@ interface JQuery {
 	 * Occurs when video gets playing.
 	 *
 	 * Function takes arguments evt and ui.
-	 * Use ui.source to get the url of the playing video.
-	 * Use ui.duration to get the video duration in seconds.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "playing"): PlayingEvent;
 
@@ -95308,28 +110898,22 @@ interface JQuery {
 	 * Occurs when video gets playing.
 	 *
 	 * Function takes arguments evt and ui.
-	 * Use ui.source to get the url of the playing video.
-	 * Use ui.duration to get the video duration in seconds.
 	 *
 	 * @optionValue New value to be set.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "playing", optionValue: PlayingEvent): void;
 
 	/**
-	 * Occurs when video is paused.
+	 * Occurs when the video is paused.
 	 *
 	 * Function takes arguments evt and ui.
-	 * Use ui.source to get the url of the playing video.
-	 * Use ui.duration to get the video duration in seconds.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "paused"): PausedEvent;
 
 	/**
-	 * Occurs when video is paused.
+	 * Occurs when the video is paused.
 	 *
 	 * Function takes arguments evt and ui.
-	 * Use ui.source to get the url of the playing video.
-	 * Use ui.duration to get the video duration in seconds.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -95339,8 +110923,6 @@ interface JQuery {
 	 * Occurs when a chunk of data is buffered.
 	 *
 	 * Function takes arguments evt and ui.
-	 * Use ui.source to get the url of the playing video.
-	 * Use ui.buffered to get buffered percentage.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "buffering"): BufferingEvent;
 
@@ -95348,30 +110930,22 @@ interface JQuery {
 	 * Occurs when a chunk of data is buffered.
 	 *
 	 * Function takes arguments evt and ui.
-	 * Use ui.source to get the url of the playing video.
-	 * Use ui.buffered to get buffered percentage.
 	 *
 	 * @optionValue New value to be set.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "buffering", optionValue: BufferingEvent): void;
 
 	/**
-	 * Occurs when video has advanced the playback position.
+	 * Occurs when the video has advanced the playback position.
 	 *
 	 * Function takes arguments evt and ui.
-	 * Use ui.source to get the url of the playing video.
-	 * Use ui.currentTime to get current position in the video at which the event was fired.
-	 * Use ui.duration to get the video duration in seconds.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "progress"): ProgressEvent;
 
 	/**
-	 * Occurs when video has advanced the playback position.
+	 * Occurs when the video has advanced the playback position.
 	 *
 	 * Function takes arguments evt and ui.
-	 * Use ui.source to get the url of the playing video.
-	 * Use ui.currentTime to get current position in the video at which the event was fired.
-	 * Use ui.duration to get the video duration in seconds.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -95381,9 +110955,6 @@ interface JQuery {
 	 * Occurs when igVideoPlayer is waiting for data from the server.
 	 *
 	 * Function takes arguments evt and ui.
-	 * Use ui.source to get the url of the playing video.
-	 * Use ui.currentTime to get current position in the video at which the event was fired.
-	 * Use ui.duration to get the video duration in seconds.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "waiting"): WaitingEvent;
 
@@ -95391,51 +110962,38 @@ interface JQuery {
 	 * Occurs when igVideoPlayer is waiting for data from the server.
 	 *
 	 * Function takes arguments evt and ui.
-	 * Use ui.source to get the url of the playing video.
-	 * Use ui.currentTime to get current position in the video at which the event was fired.
-	 * Use ui.duration to get the video duration in seconds.
 	 *
 	 * @optionValue New value to be set.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "waiting", optionValue: WaitingEvent): void;
 
 	/**
-	 * Occurs when the bookmark is hit.
+	 * Occurs when a bookmark is hit.
 	 *
 	 * Function takes arguments evt and ui.
-	 * Use ui.source to get the url of the playing video.
-	 * Use ui.bookmark to get the bookmark object from the bookmarks array.
-	 * Use ui.bookmarkElement to get the html element in the DOM.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "bookmarkHit"): BookmarkHitEvent;
 
 	/**
-	 * Occurs when the bookmark is hit.
+	 * Occurs when a bookmark is hit.
 	 *
 	 * Function takes arguments evt and ui.
-	 * Use ui.source to get the url of the playing video.
-	 * Use ui.bookmark to get the bookmark object from the bookmarks array.
-	 * Use ui.bookmarkElement to get the html element in the DOM.
 	 *
 	 * @optionValue New value to be set.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "bookmarkHit", optionValue: BookmarkHitEvent): void;
 
 	/**
-	 * Occurs when the bookmark is clicked.
+	 * Occurs when a bookmark is clicked.
 	 *
 	 * Function takes arguments evt and ui.
-	 * Use ui.bookmark to get the bookmark object from the bookmarks array.
-	 * Use ui.bookmarkElement to get the html element in the DOM.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "bookmarkClick"): BookmarkClickEvent;
 
 	/**
-	 * Occurs when the bookmark is clicked.
+	 * Occurs when a bookmark is clicked.
 	 *
 	 * Function takes arguments evt and ui.
-	 * Use ui.bookmark to get the bookmark object from the bookmarks array.
-	 * Use ui.bookmarkElement to get the html element in the DOM.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -95445,7 +111003,6 @@ interface JQuery {
 	 * Occurs when igVideoPlayer enters full screen mode.
 	 *
 	 * Function takes arguments evt and ui.
-	 * Use ui.source to get the url of the playing video.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "enterFullScreen"): EnterFullScreenEvent;
 
@@ -95453,7 +111010,6 @@ interface JQuery {
 	 * Occurs when igVideoPlayer enters full screen mode.
 	 *
 	 * Function takes arguments evt and ui.
-	 * Use ui.source to get the url of the playing video.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -95463,7 +111019,6 @@ interface JQuery {
 	 * Occurs when igVideoPlayer exits full screen mode.
 	 *
 	 * Function takes arguments evt and ui.
-	 * Use ui.source to get the url of the playing video.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "exitFullScreen"): ExitFullScreenEvent;
 
@@ -95471,27 +111026,22 @@ interface JQuery {
 	 * Occurs when igVideoPlayer exits full screen mode.
 	 *
 	 * Function takes arguments evt and ui.
-	 * Use ui.source to get the url of the playing video.
 	 *
 	 * @optionValue New value to be set.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "exitFullScreen", optionValue: ExitFullScreenEvent): void;
 
 	/**
-	 * Occurs when related video is clicked.
+	 * Occurs when a related video is clicked.
 	 *
 	 * Function takes arguments evt and ui.
-	 * Use ui.relatedVideo to get the relatedVideo object from the relatedVideos array.
-	 * Use ui.relatedVideoElement to get the relatedVideo html element in the DOM.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "relatedVideoClick"): RelatedVideoClickEvent;
 
 	/**
-	 * Occurs when related video is clicked.
+	 * Occurs when a related video is clicked.
 	 *
 	 * Function takes arguments evt and ui.
-	 * Use ui.relatedVideo to get the relatedVideo object from the relatedVideos array.
-	 * Use ui.relatedVideoElement to get the relatedVideo html element in the DOM.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -95501,9 +111051,6 @@ interface JQuery {
 	 * Defines the name of the player banner visible event. Fired when the banner has been displayed.
 	 *
 	 * Function takes arguments evt and ui.
-	 * Use ui.index to get the banner index in the banners array.
-	 * Use ui.banner to get the banner object from the banners array.
-	 * Use ui.bannerElement to get the banner html element in the DOM.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "bannerVisible"): BannerVisibleEvent;
 
@@ -95511,9 +111058,6 @@ interface JQuery {
 	 * Defines the name of the player banner visible event. Fired when the banner has been displayed.
 	 *
 	 * Function takes arguments evt and ui.
-	 * Use ui.index to get the banner index in the banners array.
-	 * Use ui.banner to get the banner object from the banners array.
-	 * Use ui.bannerElement to get the banner html element in the DOM.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -95523,9 +111067,6 @@ interface JQuery {
 	 * Occurs when the banner is hidden.
 	 *
 	 * Function takes arguments evt and ui.
-	 * Use ui.index to get the banner index in the banners array.
-	 * Use ui.banner to get the banner object from the banners array.
-	 * Use ui.bannerElement to get the banner html element in the DOM.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "bannerHidden"): BannerHiddenEvent;
 
@@ -95533,9 +111074,6 @@ interface JQuery {
 	 * Occurs when the banner is hidden.
 	 *
 	 * Function takes arguments evt and ui.
-	 * Use ui.index to get the banner index in the banners array.
-	 * Use ui.banner to get the banner object from the banners array.
-	 * Use ui.bannerElement to get the banner html element in the DOM.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -95545,7 +111083,6 @@ interface JQuery {
 	 * Occurs when the banner is clicked.
 	 *
 	 * Function takes arguments evt and ui.
-	 * Use ui.bannerElement to get the banner html element in the DOM.
 	 */
 	igVideoPlayer(optionLiteral: 'option', optionName: "bannerClick"): BannerClickEvent;
 
@@ -95553,7 +111090,6 @@ interface JQuery {
 	 * Occurs when the banner is clicked.
 	 *
 	 * Function takes arguments evt and ui.
-	 * Use ui.bannerElement to get the banner html element in the DOM.
 	 *
 	 * @optionValue New value to be set.
 	 */
@@ -95579,16 +111115,19 @@ interface JQuery {
 interface IgWidget {
 	/**
 	 * Set/Get the locale setting for the widget.
+	 *
 	 */
 	locale?: any;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
+	 *
 	 */
 	language?: string;
 
 	/**
 	 * Set/Get the regional setting for the widget.
+	 *
 	 */
 	regional?: string|Object;
 
@@ -95598,9 +111137,30 @@ interface IgWidget {
 	[optionName: string]: any;
 }
 interface IgWidgetMethods {
+	/**
+	 * Changes the all locales contained into a specified container to the language specified in [options.language](ui.igwidget#options:language)
+	 * Note that this method is for rare scenarios, use [language](ui.igwidget#options:language) or [locale](ui.igwidget#options:locale) option setter
+	 *
+	 * @param $container Optional parameter - if not set it would use the element of the widget as $container
+	 */
 	changeLocale($container: Object): void;
+
+	/**
+	 * Changes the widget language to global language. Global language is the value in $.ig.util.language
+	 */
 	changeGlobalLanguage(): void;
+
+	/**
+	 * Changes the widget regional settins to global regional settings. Global regional settings are container in $.ig.util.regional
+	 */
 	changeGlobalRegional(): void;
+
+	/**
+	 * Destroy is part of the jQuery UI widget API and does the following:
+	 * 1. Remove custom CSS classes that were added.
+	 * 2. Unwrap any wrapping elements such as scrolling divs and other containers.
+	 * 3. Unbind all events that were bound.
+	 */
 	destroy(): void;
 }
 interface JQuery {
@@ -95615,30 +111175,35 @@ interface JQuery {
 
 	/**
 	 * Set/Get the locale setting for the widget.
+	 *
 	 */
 	igWidget(optionLiteral: 'option', optionName: "locale"): any;
 
 	/**
 	 * Set/Get the locale setting for the widget.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igWidget(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
+	 *
 	 */
 	igWidget(optionLiteral: 'option', optionName: "language"): string;
 
 	/**
 	 * Set/Get the locale language setting for the widget.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igWidget(optionLiteral: 'option', optionName: "language", optionValue: string): void;
 
 	/**
 	 * Set/Get the regional setting for the widget.
+	 *
 	 */
 
 	igWidget(optionLiteral: 'option', optionName: "regional"): string|Object;
@@ -95646,6 +111211,7 @@ interface JQuery {
 	/**
 	 * Set/Get the regional setting for the widget.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -95659,11 +111225,13 @@ interface JQuery {
 interface IgZoombarDefaultZoomWindow {
 	/**
 	 * The left component of the zoom window in percentages.
+	 *
 	 */
 	left?: number;
 
 	/**
 	 * The width of the zoom window in percentages.
+	 *
 	 */
 	width?: string;
 
@@ -95787,6 +111355,7 @@ interface IgZoombar {
 	/**
 	 * Specifies the element on which the widget the Zoombar is attached to is initialized.
 	 * object A valid jQuery object, the first element of which is that element.
+	 *
 	 */
 	target?: string|Object;
 
@@ -95794,6 +111363,7 @@ interface IgZoombar {
 	 * Specifies how the target widget's clone is rendered inside the Zoombar.
 	 * object A valid set of properties to initialize the clone with.
 	 *
+	 *
 	 * Valid values:
 	 * "auto" Options for initializing the clone will be inferred from the target widget. Certain properties will be altered to make the clone more suitable for using inside the Zoombar.
 	 * "none" No clone of the target widget will be initialized inside the Zoombar.
@@ -95803,8 +111373,11 @@ interface IgZoombar {
 	/**
 	 * Specifies the width of the Zoombar.
 	 *
+	 *
 	 * Valid values:
 	 * "auto" The width of the Zoombar will be the same as the widget it is attached to.
+	 * "number" The widget width in pixels (px).
+	 * "string" The widget width can be set in pixels (px) and percentage (%).
 	 * "null" The Zoombar will stretch horizontally to fit its container if it has width set, otherwise assumes auto.
 	 */
 	width?: string|number;
@@ -95812,6 +111385,7 @@ interface IgZoombar {
 	/**
 	 * Specifies the height of the Zoombar.
 	 *
+	 *
 	 * Valid values:
 	 * "null" The Zoombar will stretch vertically to fit its container if it has height set, otherwise assumes 70px.
 	 */
@@ -95820,6 +111394,7 @@ interface IgZoombar {
 	/**
 	 * Specifies when the zoom effect is applied.
 	 *
+	 *
 	 * Valid values:
 	 * "immediate" The zoom action is applied as the end-user interacts with the zoom window.
 	 * "deferred" The zoom action is applied after the interaction with the zoom window completes.
@@ -95828,34 +111403,58 @@ interface IgZoombar {
 
 	/**
 	 * Specifies the distance (in percents) the zoom window moves when the left or right scroll bar buttons are clicked.
+	 *
 	 */
 	zoomWindowMoveDistance?: number;
 
 	/**
 	 * Specifies the default zoom in percentages.
+	 *
 	 */
 	defaultZoomWindow?: IgZoombarDefaultZoomWindow;
 
 	/**
 	 * The minimal width the zoom window can have in percentages.
+	 *
 	 */
 	zoomWindowMinWidth?: number;
 
 	/**
 	 * Specifies the animation duration (in milliseconds) when hover style is applied or removed from elements.
+	 *
 	 */
 	hoverStyleAnimationDuration?: number;
 
 	/**
 	 * Specifies the pan duration (in milliseconds) when the window changes position. Set to 0 for snap.
+	 *
 	 */
 	windowPanDuration?: number;
 
 	/**
 	 * Initial tabIndex for the Zoombar container elements.
+	 *
 	 */
 	tabIndex?: number;
 
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	locale?: any;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	language?: string;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+	regional?: string|Object;
+
 	/**
 	 * Event fired before a zoom action is applied
 	 */
@@ -95945,6 +111544,24 @@ interface IgZoombarMethods {
 	 * @param width The width parameter of the new zoom window in percentages
 	 */
 	zoom(left?: number, width?: number): Object;
+
+	/**
+	 * Changes the all locales contained into a specified container to the language specified in [options.language](ui.igwidget#options:language)
+	 * Note that this method is for rare scenarios, use [language](ui.igwidget#options:language) or [locale](ui.igwidget#options:locale) option setter
+	 *
+	 * @param $container Optional parameter - if not set it would use the element of the widget as $container
+	 */
+	changeLocale($container: Object): void;
+
+	/**
+	 * Changes the widget language to global language. Global language is the value in $.ig.util.language
+	 */
+	changeGlobalLanguage(): void;
+
+	/**
+	 * Changes the widget regional settins to global regional settings. Global regional settings are container in $.ig.util.regional
+	 */
+	changeGlobalRegional(): void;
 }
 interface JQuery {
 	data(propertyName: "igZoombar"): IgZoombarMethods;
@@ -96041,6 +111658,9 @@ class ZoombarProviderDefault {
 
 	/**
 	 * Jshint ignore:line
+	 *
+	 * @param a
+	 * @param b
 	 */
 	update(a: Object, b: Object): void;
 }
@@ -96075,6 +111695,9 @@ interface JQuery {
 	igZoombar(methodName: "container"): Element;
 	igZoombar(methodName: "clone"): Element;
 	igZoombar(methodName: "zoom", left?: number, width?: number): Object;
+	igZoombar(methodName: "changeLocale", $container: Object): void;
+	igZoombar(methodName: "changeGlobalLanguage"): void;
+	igZoombar(methodName: "changeGlobalRegional"): void;
 
 	/**
 	 * Gets a provider class which interfaces the widget that is being zoomed.
@@ -96093,6 +111716,7 @@ interface JQuery {
 	/**
 	 * Gets the element on which the widget the Zoombar is attached to is initialized.
 	 * object A valid jQuery object, the first element of which is that element.
+	 *
 	 */
 
 	igZoombar(optionLiteral: 'option', optionName: "target"): string|Object;
@@ -96101,6 +111725,7 @@ interface JQuery {
 	 * Sets the element on which the widget the Zoombar is attached to is initialized.
 	 * object A valid jQuery object, the first element of which is that element.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -96109,6 +111734,7 @@ interface JQuery {
 	/**
 	 * Gets how the target widget's clone is rendered inside the Zoombar.
 	 * object A valid set of properties to initialize the clone with.
+	 *
 	 */
 
 	igZoombar(optionLiteral: 'option', optionName: "clone"): string|Object;
@@ -96117,6 +111743,7 @@ interface JQuery {
 	 * Sets how the target widget's clone is rendered inside the Zoombar.
 	 * object A valid set of properties to initialize the clone with.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -96124,6 +111751,7 @@ interface JQuery {
 
 	/**
 	 * Gets the width of the Zoombar.
+	 *
 	 */
 
 	igZoombar(optionLiteral: 'option', optionName: "width"): string|number;
@@ -96131,6 +111759,7 @@ interface JQuery {
 	/**
 	 * Sets the width of the Zoombar.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -96138,6 +111767,7 @@ interface JQuery {
 
 	/**
 	 * Gets the height of the Zoombar.
+	 *
 	 */
 
 	igZoombar(optionLiteral: 'option', optionName: "height"): number|string;
@@ -96145,6 +111775,7 @@ interface JQuery {
 	/**
 	 * Sets the height of the Zoombar.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -96152,6 +111783,7 @@ interface JQuery {
 
 	/**
 	 * Gets when the zoom effect is applied.
+	 *
 	 */
 
 	igZoombar(optionLiteral: 'option', optionName: "zoomAction"): string;
@@ -96159,6 +111791,7 @@ interface JQuery {
 	/**
 	 * Sets when the zoom effect is applied.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 
@@ -96166,76 +111799,132 @@ interface JQuery {
 
 	/**
 	 * Gets the distance (in percents) the zoom window moves when the left or right scroll bar buttons are clicked.
+	 *
 	 */
 	igZoombar(optionLiteral: 'option', optionName: "zoomWindowMoveDistance"): number;
 
 	/**
 	 * Sets the distance (in percents) the zoom window moves when the left or right scroll bar buttons are clicked.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igZoombar(optionLiteral: 'option', optionName: "zoomWindowMoveDistance", optionValue: number): void;
 
 	/**
 	 * Gets the default zoom in percentages.
+	 *
 	 */
 	igZoombar(optionLiteral: 'option', optionName: "defaultZoomWindow"): IgZoombarDefaultZoomWindow;
 
 	/**
 	 * Sets the default zoom in percentages.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igZoombar(optionLiteral: 'option', optionName: "defaultZoomWindow", optionValue: IgZoombarDefaultZoomWindow): void;
 
 	/**
 	 * The minimal width the zoom window can have in percentages.
+	 *
 	 */
 	igZoombar(optionLiteral: 'option', optionName: "zoomWindowMinWidth"): number;
 
 	/**
 	 * The minimal width the zoom window can have in percentages.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igZoombar(optionLiteral: 'option', optionName: "zoomWindowMinWidth", optionValue: number): void;
 
 	/**
 	 * Gets the animation duration (in milliseconds) when hover style is applied or removed from elements.
+	 *
 	 */
 	igZoombar(optionLiteral: 'option', optionName: "hoverStyleAnimationDuration"): number;
 
 	/**
 	 * Sets the animation duration (in milliseconds) when hover style is applied or removed from elements.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igZoombar(optionLiteral: 'option', optionName: "hoverStyleAnimationDuration", optionValue: number): void;
 
 	/**
 	 * Gets the pan duration (in milliseconds) when the window changes position. Set to 0 for snap.
+	 *
 	 */
 	igZoombar(optionLiteral: 'option', optionName: "windowPanDuration"): number;
 
 	/**
 	 * Sets the pan duration (in milliseconds) when the window changes position. Set to 0 for snap.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igZoombar(optionLiteral: 'option', optionName: "windowPanDuration", optionValue: number): void;
 
 	/**
 	 * Initial tabIndex for the Zoombar container elements.
+	 *
 	 */
 	igZoombar(optionLiteral: 'option', optionName: "tabIndex"): number;
 
 	/**
 	 * Initial tabIndex for the Zoombar container elements.
 	 *
+	 *
 	 * @optionValue New value to be set.
 	 */
 	igZoombar(optionLiteral: 'option', optionName: "tabIndex", optionValue: number): void;
 
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 */
+	igZoombar(optionLiteral: 'option', optionName: "locale"): any;
+
+	/**
+	 * Set/Get the locale setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igZoombar(optionLiteral: 'option', optionName: "locale", optionValue: any): void;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 */
+	igZoombar(optionLiteral: 'option', optionName: "language"): string;
+
+	/**
+	 * Set/Get the locale language setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igZoombar(optionLiteral: 'option', optionName: "language", optionValue: string): void;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 */
+
+	igZoombar(optionLiteral: 'option', optionName: "regional"): string|Object;
+
+	/**
+	 * Set/Get the regional setting for the widget.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igZoombar(optionLiteral: 'option', optionName: "regional", optionValue: string|Object): void;
+
 	/**
 	 * Event fired before a zoom action is applied
 	 */
@@ -96363,6 +112052,233 @@ interface JQuery {
 	igZoombar(optionLiteral: 'option', optionName: string, optionValue: any): JQuery;
 	igZoombar(methodName: string, ...methodParams: any[]): any;
 }
+interface ResolvingAxisValueEvent {
+	(event: Event, ui: ResolvingAxisValueEventUIParam): void;
+}
+
+interface ResolvingAxisValueEventUIParam {}
+
+interface IgZoomSlider {
+	/**
+	 * The width of the gauge. It can be set as a number in pixels, string (px) or percentage (%).
+	 */
+	width?: string|number;
+
+	/**
+	 * The height of the gauge. It can be set as a number in pixels, string (px) or percentage (%).
+	 */
+	height?: string|number;
+	panTransitionDuration?: number;
+	maxZoomWidth?: number;
+	pixelScalingRatio?: number;
+	actualPixelScalingRatio?: number;
+	windowRect?: any;
+	minZoomWidth?: number;
+	startInset?: number;
+	endInset?: number;
+	trackStartInset?: number;
+	trackEndInset?: number;
+	barExtent?: number;
+	orientation?: string;
+	lowerThumbBrush?: any;
+	lowerThumbStrokeThickness?: number;
+	higherThumbStrokeThickness?: number;
+	higherThumbBrush?: any;
+	lowerThumbOutline?: any;
+	higherThumbOutline?: any;
+	lowerThumbRidgesBrush?: any;
+	higherThumbRidgesBrush?: any;
+	lowerThumbWidth?: number;
+	higherThumbWidth?: number;
+	lowerThumbHeight?: number;
+	higherThumbHeight?: number;
+	lowerShadeBrush?: any;
+	lowerShadeOutline?: any;
+	lowerShadeStrokeThickness?: number;
+	higherShadeBrush?: any;
+	higherShadeOutline?: any;
+	higherShadeStrokeThickness?: number;
+	barBrush?: any;
+	barOutline?: any;
+	barStrokeThickness?: number;
+	rangeThumbBrush?: any;
+	rangeThumbOutline?: any;
+	rangeThumbStrokeThickness?: number;
+	rangeThumbRidgesBrush?: any;
+	lowerCalloutBrush?: any;
+	lowerCalloutTextColor?: any;
+	lowerCalloutOutline?: any;
+	lowerCalloutStrokeThickness?: number;
+	higherCalloutBrush?: any;
+	higherCalloutTextColor?: any;
+	higherCalloutOutline?: any;
+	higherCalloutStrokeThickness?: number;
+	areThumbCalloutsEnabled?: boolean;
+	thumbCalloutTextStyle?: any;
+	propertyChanged?: PropertyChangedEvent;
+	resolvingAxisValue?: ResolvingAxisValueEvent;
+	windowRectChanged?: WindowRectChangedEvent;
+
+	/**
+	 * Option for igZoomSlider
+	 */
+	[optionName: string]: any;
+}
+interface IgZoomSliderMethods {
+	notifySizeChanged(): void;
+
+	/**
+	 * Flushes the gauge.
+	 */
+	flush(): void;
+
+	/**
+	 * Destroys widget.
+	 */
+	destroy(): void;
+}
+interface JQuery {
+	data(propertyName: "igZoomSlider"): IgZoomSliderMethods;
+}
+
+interface JQuery {
+	igZoomSlider(methodName: "notifySizeChanged"): void;
+	igZoomSlider(methodName: "flush"): void;
+	igZoomSlider(methodName: "destroy"): void;
+
+	/**
+	 * The width of the gauge. It can be set as a number in pixels, string (px) or percentage (%).
+	 */
+
+	igZoomSlider(optionLiteral: 'option', optionName: "width"): string|number;
+
+	/**
+	 * The width of the gauge. It can be set as a number in pixels, string (px) or percentage (%).
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igZoomSlider(optionLiteral: 'option', optionName: "width", optionValue: string|number): void;
+
+	/**
+	 * The height of the gauge. It can be set as a number in pixels, string (px) or percentage (%).
+	 */
+
+	igZoomSlider(optionLiteral: 'option', optionName: "height"): string|number;
+
+	/**
+	 * The height of the gauge. It can be set as a number in pixels, string (px) or percentage (%).
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igZoomSlider(optionLiteral: 'option', optionName: "height", optionValue: string|number): void;
+	igZoomSlider(optionLiteral: 'option', optionName: "panTransitionDuration"): number;
+	igZoomSlider(optionLiteral: 'option', optionName: "panTransitionDuration", optionValue: number): void;
+	igZoomSlider(optionLiteral: 'option', optionName: "maxZoomWidth"): number;
+	igZoomSlider(optionLiteral: 'option', optionName: "maxZoomWidth", optionValue: number): void;
+	igZoomSlider(optionLiteral: 'option', optionName: "pixelScalingRatio"): number;
+	igZoomSlider(optionLiteral: 'option', optionName: "pixelScalingRatio", optionValue: number): void;
+	igZoomSlider(optionLiteral: 'option', optionName: "actualPixelScalingRatio"): number;
+	igZoomSlider(optionLiteral: 'option', optionName: "actualPixelScalingRatio", optionValue: number): void;
+	igZoomSlider(optionLiteral: 'option', optionName: "windowRect"): any;
+	igZoomSlider(optionLiteral: 'option', optionName: "windowRect", optionValue: any): void;
+	igZoomSlider(optionLiteral: 'option', optionName: "minZoomWidth"): number;
+	igZoomSlider(optionLiteral: 'option', optionName: "minZoomWidth", optionValue: number): void;
+	igZoomSlider(optionLiteral: 'option', optionName: "startInset"): number;
+	igZoomSlider(optionLiteral: 'option', optionName: "startInset", optionValue: number): void;
+	igZoomSlider(optionLiteral: 'option', optionName: "endInset"): number;
+	igZoomSlider(optionLiteral: 'option', optionName: "endInset", optionValue: number): void;
+	igZoomSlider(optionLiteral: 'option', optionName: "trackStartInset"): number;
+	igZoomSlider(optionLiteral: 'option', optionName: "trackStartInset", optionValue: number): void;
+	igZoomSlider(optionLiteral: 'option', optionName: "trackEndInset"): number;
+	igZoomSlider(optionLiteral: 'option', optionName: "trackEndInset", optionValue: number): void;
+	igZoomSlider(optionLiteral: 'option', optionName: "barExtent"): number;
+	igZoomSlider(optionLiteral: 'option', optionName: "barExtent", optionValue: number): void;
+	igZoomSlider(optionLiteral: 'option', optionName: "orientation"): string;
+	igZoomSlider(optionLiteral: 'option', optionName: "orientation", optionValue: string): void;
+	igZoomSlider(optionLiteral: 'option', optionName: "lowerThumbBrush"): any;
+	igZoomSlider(optionLiteral: 'option', optionName: "lowerThumbBrush", optionValue: any): void;
+	igZoomSlider(optionLiteral: 'option', optionName: "lowerThumbStrokeThickness"): number;
+	igZoomSlider(optionLiteral: 'option', optionName: "lowerThumbStrokeThickness", optionValue: number): void;
+	igZoomSlider(optionLiteral: 'option', optionName: "higherThumbStrokeThickness"): number;
+	igZoomSlider(optionLiteral: 'option', optionName: "higherThumbStrokeThickness", optionValue: number): void;
+	igZoomSlider(optionLiteral: 'option', optionName: "higherThumbBrush"): any;
+	igZoomSlider(optionLiteral: 'option', optionName: "higherThumbBrush", optionValue: any): void;
+	igZoomSlider(optionLiteral: 'option', optionName: "lowerThumbOutline"): any;
+	igZoomSlider(optionLiteral: 'option', optionName: "lowerThumbOutline", optionValue: any): void;
+	igZoomSlider(optionLiteral: 'option', optionName: "higherThumbOutline"): any;
+	igZoomSlider(optionLiteral: 'option', optionName: "higherThumbOutline", optionValue: any): void;
+	igZoomSlider(optionLiteral: 'option', optionName: "lowerThumbRidgesBrush"): any;
+	igZoomSlider(optionLiteral: 'option', optionName: "lowerThumbRidgesBrush", optionValue: any): void;
+	igZoomSlider(optionLiteral: 'option', optionName: "higherThumbRidgesBrush"): any;
+	igZoomSlider(optionLiteral: 'option', optionName: "higherThumbRidgesBrush", optionValue: any): void;
+	igZoomSlider(optionLiteral: 'option', optionName: "lowerThumbWidth"): number;
+	igZoomSlider(optionLiteral: 'option', optionName: "lowerThumbWidth", optionValue: number): void;
+	igZoomSlider(optionLiteral: 'option', optionName: "higherThumbWidth"): number;
+	igZoomSlider(optionLiteral: 'option', optionName: "higherThumbWidth", optionValue: number): void;
+	igZoomSlider(optionLiteral: 'option', optionName: "lowerThumbHeight"): number;
+	igZoomSlider(optionLiteral: 'option', optionName: "lowerThumbHeight", optionValue: number): void;
+	igZoomSlider(optionLiteral: 'option', optionName: "higherThumbHeight"): number;
+	igZoomSlider(optionLiteral: 'option', optionName: "higherThumbHeight", optionValue: number): void;
+	igZoomSlider(optionLiteral: 'option', optionName: "lowerShadeBrush"): any;
+	igZoomSlider(optionLiteral: 'option', optionName: "lowerShadeBrush", optionValue: any): void;
+	igZoomSlider(optionLiteral: 'option', optionName: "lowerShadeOutline"): any;
+	igZoomSlider(optionLiteral: 'option', optionName: "lowerShadeOutline", optionValue: any): void;
+	igZoomSlider(optionLiteral: 'option', optionName: "lowerShadeStrokeThickness"): number;
+	igZoomSlider(optionLiteral: 'option', optionName: "lowerShadeStrokeThickness", optionValue: number): void;
+	igZoomSlider(optionLiteral: 'option', optionName: "higherShadeBrush"): any;
+	igZoomSlider(optionLiteral: 'option', optionName: "higherShadeBrush", optionValue: any): void;
+	igZoomSlider(optionLiteral: 'option', optionName: "higherShadeOutline"): any;
+	igZoomSlider(optionLiteral: 'option', optionName: "higherShadeOutline", optionValue: any): void;
+	igZoomSlider(optionLiteral: 'option', optionName: "higherShadeStrokeThickness"): number;
+	igZoomSlider(optionLiteral: 'option', optionName: "higherShadeStrokeThickness", optionValue: number): void;
+	igZoomSlider(optionLiteral: 'option', optionName: "barBrush"): any;
+	igZoomSlider(optionLiteral: 'option', optionName: "barBrush", optionValue: any): void;
+	igZoomSlider(optionLiteral: 'option', optionName: "barOutline"): any;
+	igZoomSlider(optionLiteral: 'option', optionName: "barOutline", optionValue: any): void;
+	igZoomSlider(optionLiteral: 'option', optionName: "barStrokeThickness"): number;
+	igZoomSlider(optionLiteral: 'option', optionName: "barStrokeThickness", optionValue: number): void;
+	igZoomSlider(optionLiteral: 'option', optionName: "rangeThumbBrush"): any;
+	igZoomSlider(optionLiteral: 'option', optionName: "rangeThumbBrush", optionValue: any): void;
+	igZoomSlider(optionLiteral: 'option', optionName: "rangeThumbOutline"): any;
+	igZoomSlider(optionLiteral: 'option', optionName: "rangeThumbOutline", optionValue: any): void;
+	igZoomSlider(optionLiteral: 'option', optionName: "rangeThumbStrokeThickness"): number;
+	igZoomSlider(optionLiteral: 'option', optionName: "rangeThumbStrokeThickness", optionValue: number): void;
+	igZoomSlider(optionLiteral: 'option', optionName: "rangeThumbRidgesBrush"): any;
+	igZoomSlider(optionLiteral: 'option', optionName: "rangeThumbRidgesBrush", optionValue: any): void;
+	igZoomSlider(optionLiteral: 'option', optionName: "lowerCalloutBrush"): any;
+	igZoomSlider(optionLiteral: 'option', optionName: "lowerCalloutBrush", optionValue: any): void;
+	igZoomSlider(optionLiteral: 'option', optionName: "lowerCalloutTextColor"): any;
+	igZoomSlider(optionLiteral: 'option', optionName: "lowerCalloutTextColor", optionValue: any): void;
+	igZoomSlider(optionLiteral: 'option', optionName: "lowerCalloutOutline"): any;
+	igZoomSlider(optionLiteral: 'option', optionName: "lowerCalloutOutline", optionValue: any): void;
+	igZoomSlider(optionLiteral: 'option', optionName: "lowerCalloutStrokeThickness"): number;
+	igZoomSlider(optionLiteral: 'option', optionName: "lowerCalloutStrokeThickness", optionValue: number): void;
+	igZoomSlider(optionLiteral: 'option', optionName: "higherCalloutBrush"): any;
+	igZoomSlider(optionLiteral: 'option', optionName: "higherCalloutBrush", optionValue: any): void;
+	igZoomSlider(optionLiteral: 'option', optionName: "higherCalloutTextColor"): any;
+	igZoomSlider(optionLiteral: 'option', optionName: "higherCalloutTextColor", optionValue: any): void;
+	igZoomSlider(optionLiteral: 'option', optionName: "higherCalloutOutline"): any;
+	igZoomSlider(optionLiteral: 'option', optionName: "higherCalloutOutline", optionValue: any): void;
+	igZoomSlider(optionLiteral: 'option', optionName: "higherCalloutStrokeThickness"): number;
+	igZoomSlider(optionLiteral: 'option', optionName: "higherCalloutStrokeThickness", optionValue: number): void;
+	igZoomSlider(optionLiteral: 'option', optionName: "areThumbCalloutsEnabled"): boolean;
+	igZoomSlider(optionLiteral: 'option', optionName: "areThumbCalloutsEnabled", optionValue: boolean): void;
+	igZoomSlider(optionLiteral: 'option', optionName: "thumbCalloutTextStyle"): any;
+	igZoomSlider(optionLiteral: 'option', optionName: "thumbCalloutTextStyle", optionValue: any): void;
+	igZoomSlider(optionLiteral: 'option', optionName: "propertyChanged"): PropertyChangedEvent;
+	igZoomSlider(optionLiteral: 'option', optionName: "propertyChanged", optionValue: PropertyChangedEvent): void;
+	igZoomSlider(optionLiteral: 'option', optionName: "resolvingAxisValue"): ResolvingAxisValueEvent;
+	igZoomSlider(optionLiteral: 'option', optionName: "resolvingAxisValue", optionValue: ResolvingAxisValueEvent): void;
+	igZoomSlider(optionLiteral: 'option', optionName: "windowRectChanged"): WindowRectChangedEvent;
+	igZoomSlider(optionLiteral: 'option', optionName: "windowRectChanged", optionValue: WindowRectChangedEvent): void;
+	igZoomSlider(options: IgZoomSlider): JQuery;
+	igZoomSlider(optionLiteral: 'option', optionName: string): any;
+	igZoomSlider(optionLiteral: 'option', options: IgZoomSlider): JQuery;
+	igZoomSlider(optionLiteral: 'option', optionName: string, optionValue: any): JQuery;
+	igZoomSlider(methodName: string, ...methodParams: any[]): any;
+}
 
 interface IgLoader {
     scriptPath: string;

From df22c6534ac2c8901a29e091a3a9cd6c9e5733a5 Mon Sep 17 00:00:00 2001
From: Angel Merino <amerino@voxel.at>
Date: Tue, 17 Apr 2018 18:46:34 +0200
Subject: [PATCH 1331/1382] Update types for dnssd (#25054)

* Added types for dnssd

* Cosmetics, test passed

* Removed unused rules

* Service entry type added
Browser implements EventEmitter

* make tslint happy
---
 types/dnssd/index.d.ts | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/types/dnssd/index.d.ts b/types/dnssd/index.d.ts
index 3f5617afcb..9c66a6d6a4 100644
--- a/types/dnssd/index.d.ts
+++ b/types/dnssd/index.d.ts
@@ -4,6 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
+import { EventEmitter } from 'events';
 
 /** Declaration file generated by dts-gen */
 
@@ -17,7 +18,27 @@ export class Advertisement {
     updateTXT(txtObj: any): void;
 }
 
-export class Browser {
+/**
+ * A service entry as returned by serviceUp
+ */
+export class Service {
+    fullname: string;         // 'InstanceName._googlecast._tcp.local.'
+    name: string;             // 'InstanceName'
+    type: SType;              // { name: 'googlecast'; protocol: 'tcp' }
+    domain: string;           // 'local'
+    host: string;             // 'Hostname.local.'
+    port: number;             // 8009
+    addresses: string[];      // ['192.168.1.15']
+    txt: any;                 // { id: 'strings' }
+    txtRaw: any;
+}
+
+export class SType {
+    name: string;
+    protocol: string;
+}
+
+export class Browser extends EventEmitter {
     constructor(type: any, ...args: any[]);
 
     list(): any;

From 7354268b5373c3fe2128ed63eba07c86d0c553ec Mon Sep 17 00:00:00 2001
From: Giovanni Gonzaga <giovanni@buildo.io>
Date: Tue, 17 Apr 2018 18:57:01 +0200
Subject: [PATCH 1332/1382] pg: query method missing an overload (#24940)

* Update index.d.ts

* Update pg-tests.ts
---
 types/pg/index.d.ts  |  4 ++--
 types/pg/pg-tests.ts | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/types/pg/index.d.ts b/types/pg/index.d.ts
index a0efbb1555..9098f400e7 100644
--- a/types/pg/index.d.ts
+++ b/types/pg/index.d.ts
@@ -107,7 +107,7 @@ export class Pool extends events.EventEmitter {
     query(queryStream: QueryConfig & stream.Readable): stream.Readable;
     query(queryConfig: QueryArrayConfig): Promise<QueryArrayResult>;
     query(queryConfig: QueryConfig): Promise<QueryResult>;
-    query(queryText: string, values?: any[]): Promise<QueryResult>;
+    query(queryTextOrConfig: string | QueryConfig, values?: any[]): Promise<QueryResult>;
     query(queryConfig: QueryArrayConfig, callback: (err: Error, result: QueryArrayResult) => void): Query;
     query(queryTextOrConfig: string | QueryConfig, callback: (err: Error, result: QueryResult) => void): Query;
     query(queryText: string, values: any[], callback: (err: Error, result: QueryResult) => void): Query;
@@ -125,7 +125,7 @@ export class ClientBase extends events.EventEmitter {
     query(queryStream: QueryConfig & stream.Readable): stream.Readable;
     query(queryConfig: QueryArrayConfig): Promise<QueryArrayResult>;
     query(queryConfig: QueryConfig): Promise<QueryResult>;
-    query(queryText: string, values?: any[]): Promise<QueryResult>;
+    query(queryTextOrConfig: string | QueryConfig, values?: any[]): Promise<QueryResult>;
     query(queryConfig: QueryArrayConfig, callback: (err: Error, result: QueryArrayResult) => void): Query;
     query(queryTextOrConfig: string | QueryConfig, callback: (err: Error, result: QueryResult) => void): Query;
     query(queryText: string, values: any[], callback: (err: Error, result: QueryResult) => void): Query;
diff --git a/types/pg/pg-tests.ts b/types/pg/pg-tests.ts
index f0defa0fb2..48f7dafe36 100644
--- a/types/pg/pg-tests.ts
+++ b/types/pg/pg-tests.ts
@@ -66,6 +66,14 @@ client.query(query)
   .catch(e => {
     console.error(e.stack);
   });
+client.query(query, ['brianc'])
+  .then(res => {
+    console.log(res.rows);
+    console.log(res.fields.map(f => f.name));
+  })
+  .catch(e => {
+    console.error(e.stack);
+  });
 
 const queryArrMode: QueryArrayConfig = {
   name: 'get-name-array',
@@ -156,6 +164,9 @@ pool.query('SELECT $1::text as name', ['brianc'], (err, result) => {
 pool.query('SELECT $1::text as name', ['brianc'])
   .then((res) => console.log(res.rows[0].name))
   .catch(err => console.error('Error executing query', err.stack));
+pool.query({ text: 'SELECT $1::text as name' }, ['brianc'])
+  .then((res) => console.log(res.rows[0].name))
+  .catch(err => console.error('Error executing query', err.stack));
 
 pool.end(() => {
   console.log('pool has ended');

From a9e8ad80f96e72bbaaa90677a35931d4b3f6976c Mon Sep 17 00:00:00 2001
From: doomsower <K.Kuznetcov@gmail.com>
Date: Tue, 17 Apr 2018 19:57:43 +0300
Subject: [PATCH 1333/1382] [react-navigation] Loosen navigator
 navigationOptions (#24943)

* Loosen navigator navigationOptions

* Fix linter
---
 types/react-navigation/index.d.ts             | 19 ++++++++++---------
 .../react-navigation-tests.tsx                |  5 ++++-
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index 9aafc994fb..517ec8784d 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -158,9 +158,7 @@ export interface NavigationScreenDetails<T> {
   navigation: NavigationScreenProp<NavigationRoute>;
 }
 
-export interface NavigationScreenOptions {
-  title?: string;
-}
+export type NavigationScreenOptions = NavigationStackScreenOptions & NavigationTabScreenOptions & NavigationDrawerScreenOptions;
 
 export interface NavigationScreenConfigProps {
   navigation: NavigationScreenProp<NavigationRoute>;
@@ -289,7 +287,8 @@ export interface NavigationStackViewConfig {
   onTransitionEnd?: () => void;
 }
 
-export type NavigationStackScreenOptions = NavigationScreenOptions & {
+export interface NavigationStackScreenOptions {
+  title?: string;
   header?: (React.ReactElement<any> | ((headerProps: HeaderProps) => React.ReactElement<any>)) | null;
   headerTransparent?: boolean;
   headerTitle?: string | React.ReactElement<any>;
@@ -305,14 +304,14 @@ export type NavigationStackScreenOptions = NavigationScreenOptions & {
   headerBackground?: React.ReactNode | React.ReactType;
   gesturesEnabled?: boolean;
   gestureResponseDistance?: { vertical?: number; horizontal?: number };
-};
+}
 
 export interface NavigationStackRouterConfig {
   headerTransitionPreset?: 'fade-in-place' | 'uikit';
   initialRouteName?: string;
   initialRouteParams?: NavigationParams;
   paths?: NavigationPathsConfig;
-  navigationOptions?: NavigationScreenConfig<NavigationStackScreenOptions>;
+  navigationOptions?: NavigationScreenConfig<NavigationScreenOptions>;
 }
 
 export type NavigationStackAction =
@@ -352,7 +351,7 @@ export interface NavigationPathsConfig {
 export interface NavigationTabRouterConfig {
   initialRouteName?: string;
   paths?: NavigationPathsConfig;
-  navigationOptions?: NavigationScreenConfig<NavigationTabScreenOptions>;
+  navigationOptions?: NavigationScreenConfig<NavigationScreenOptions>;
   order?: string[]; // todo: type these as the real route names rather than 'string'
 
   // Does the back button cause the router to switch to the initial tab
@@ -364,7 +363,8 @@ export interface TabScene {
     index: number;
     tintColor?: string;
 }
-export interface NavigationTabScreenOptions extends NavigationScreenOptions {
+export interface NavigationTabScreenOptions {
+  title?: string;
   tabBarIcon?:
     React.ReactElement<any>
     | ((options: { tintColor: (string | null), focused: boolean }) => (React.ReactElement<
@@ -384,7 +384,8 @@ export interface NavigationTabScreenOptions extends NavigationScreenOptions {
   }) => void;
 }
 
-export interface NavigationDrawerScreenOptions extends NavigationScreenOptions {
+export interface NavigationDrawerScreenOptions {
+  title?: string;
   drawerIcon?:
     React.ReactElement<any>
     | ((options: { tintColor: (string | null), focused: boolean }) => (React.ReactElement<
diff --git a/types/react-navigation/react-navigation-tests.tsx b/types/react-navigation/react-navigation-tests.tsx
index 7e956d2c1a..ec43f2c86a 100644
--- a/types/react-navigation/react-navigation-tests.tsx
+++ b/types/react-navigation/react-navigation-tests.tsx
@@ -193,7 +193,10 @@ const tabNavigatorConfigWithNavigationOptions: TabNavigatorConfig = {
     navigationOptions: {
         tabBarOnPress: ({scene, jumpToIndex}) => {
             jumpToIndex(scene.index);
-        }
+        },
+        headerStyle: {
+            backgroundColor: 'red',
+        },
     },
 };
 

From 5227ddf7d53c976ce6238535e26a5700fca01506 Mon Sep 17 00:00:00 2001
From: Aankhen <Aankhen@users.noreply.github.com>
Date: Wed, 18 Apr 2018 01:22:41 +0530
Subject: [PATCH 1334/1382] Add `write-file-atomically` types. (#25064)

---
 types/write-file-atomically/index.d.ts        | 14 +++++++++++
 types/write-file-atomically/tsconfig.json     | 23 +++++++++++++++++++
 types/write-file-atomically/tslint.json       |  1 +
 .../write-file-atomically-tests.ts            | 10 ++++++++
 4 files changed, 48 insertions(+)
 create mode 100644 types/write-file-atomically/index.d.ts
 create mode 100644 types/write-file-atomically/tsconfig.json
 create mode 100644 types/write-file-atomically/tslint.json
 create mode 100644 types/write-file-atomically/write-file-atomically-tests.ts

diff --git a/types/write-file-atomically/index.d.ts b/types/write-file-atomically/index.d.ts
new file mode 100644
index 0000000000..b4e3957a80
--- /dev/null
+++ b/types/write-file-atomically/index.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for write-file-atomically 2.0
+// Project: https://github.com/shinnn/write-file-atomically#readme
+// Definitions by: Aankhen <https://github.com/Aankhen>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import writeFileAtomic = require("write-file-atomic");
+
+export = WriteFileAtomically;
+
+declare function WriteFileAtomically(path: string, data: WriteFileAtomically.Data, options?: writeFileAtomic.Options): Promise<void>;
+
+declare namespace WriteFileAtomically {
+    type Data = string | Buffer | Uint8Array;
+}
diff --git a/types/write-file-atomically/tsconfig.json b/types/write-file-atomically/tsconfig.json
new file mode 100644
index 0000000000..eb3aedbee9
--- /dev/null
+++ b/types/write-file-atomically/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "write-file-atomically-tests.ts"
+    ]
+}
diff --git a/types/write-file-atomically/tslint.json b/types/write-file-atomically/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/write-file-atomically/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/write-file-atomically/write-file-atomically-tests.ts b/types/write-file-atomically/write-file-atomically-tests.ts
new file mode 100644
index 0000000000..a1654d6cb6
--- /dev/null
+++ b/types/write-file-atomically/write-file-atomically-tests.ts
@@ -0,0 +1,10 @@
+import writeFileAtomically = require('write-file-atomically');
+
+writeFileAtomically(1, '_');    // $ExpectError
+
+import { readFileSync } from 'fs';
+
+(() => {
+    writeFileAtomically('file.txt', 'Hi!');
+    readFileSync('file.txt', 'utf8');
+})();

From 8c3fdbcf025bea5dc20b09800c495cb95b7bccca Mon Sep 17 00:00:00 2001
From: Stas Vilchik <stas.vilchik@sonarsource.com>
Date: Tue, 17 Apr 2018 22:16:35 +0200
Subject: [PATCH 1335/1382] [estree] make function declaration id nullable
 (#24854)

* [estree] make function declaration id nullable

* apply review feedback

* [estree] make class declaration id nullable
---
 types/estree/estree-tests.ts | 7 ++++++-
 types/estree/index.d.ts      | 6 ++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/types/estree/estree-tests.ts b/types/estree/estree-tests.ts
index 5cd065d03f..24e92ddc38 100644
--- a/types/estree/estree-tests.ts
+++ b/types/estree/estree-tests.ts
@@ -223,7 +223,8 @@ boolean = memberExpression.computed;
 
 // Declarations
 var functionDeclaration: ESTree.FunctionDeclaration;
-identifier = functionDeclaration.id;
+var identifierOrNull: ESTree.Identifier | null = functionDeclaration.id;
+functionDeclaration.id = null;
 var params: Array<ESTree.Pattern> = functionDeclaration.params;
 blockStatement = functionDeclaration.body;
 booleanMaybe = functionDeclaration.generator;
@@ -237,6 +238,10 @@ var variableDeclarator: ESTree.VariableDeclarator;
 pattern = variableDeclarator.id; // Pattern
 expressionMaybe = variableDeclarator.init;
 
+var classDeclaration: ESTree.ClassDeclaration;
+identifierOrNull = classDeclaration.id;
+classDeclaration.id = null;
+
 // Clauses
 // SwitchCase
 string = switchCase.type;
diff --git a/types/estree/index.d.ts b/types/estree/index.d.ts
index 068cbfd8ce..0133991c9f 100644
--- a/types/estree/index.d.ts
+++ b/types/estree/index.d.ts
@@ -196,7 +196,8 @@ interface BaseDeclaration extends BaseStatement { }
 
 export interface FunctionDeclaration extends BaseFunction, BaseDeclaration {
   type: "FunctionDeclaration";
-  id: Identifier;
+  /** It is null when a function declaration is a part of the `export default function` statement */
+  id: Identifier | null;
   body: BlockStatement;
 }
 
@@ -473,7 +474,8 @@ export interface MethodDefinition extends BaseNode {
 
 export interface ClassDeclaration extends BaseClass, BaseDeclaration {
   type: "ClassDeclaration";
-  id: Identifier;
+  /** It is null when a class declaration is a part of the `export default class` statement */
+  id: Identifier | null;
 }
 
 export interface ClassExpression extends BaseClass, BaseExpression {

From 16c3ba2628afff477e2fdc41bda1752e498c415a Mon Sep 17 00:00:00 2001
From: Abram Booth <aaxelb@users.noreply.github.com>
Date: Tue, 17 Apr 2018 21:11:35 -0400
Subject: [PATCH 1336/1382] Fix DS.Model.belongsTo and DS.Model.hasMany args
 (#25072)

---
 types/ember-data/index.d.ts            | 4 ++--
 types/ember-data/test/relationships.ts | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/types/ember-data/index.d.ts b/types/ember-data/index.d.ts
index ea3de94436..5e4fa4eb60 100644
--- a/types/ember-data/index.d.ts
+++ b/types/ember-data/index.d.ts
@@ -521,11 +521,11 @@ declare module 'ember-data' {
             /**
              * Get the reference for the specified belongsTo relationship.
              */
-            belongsTo(name: keyof ModelRegistry): BelongsToReference;
+            belongsTo(name: RelationshipsFor<this>): BelongsToReference;
             /**
              * Get the reference for the specified hasMany relationship.
              */
-            hasMany(name: keyof ModelRegistry): HasManyReference<any>;
+            hasMany(name: RelationshipsFor<this>): HasManyReference<any>;
             /**
              * Given a callback, iterates over each of the relationships in the model,
              * invoking the callback with the name of each relationship and its relationship
diff --git a/types/ember-data/test/relationships.ts b/types/ember-data/test/relationships.ts
index fb89d4410c..df43387bb4 100644
--- a/types/ember-data/test/relationships.ts
+++ b/types/ember-data/test/relationships.ts
@@ -16,17 +16,23 @@ class Comment extends DS.Model {
     author = DS.attr('string');
 }
 
+class Series extends DS.Model {
+    title = DS.attr('string');
+}
+
 class RelationalPost extends DS.Model {
     title = DS.attr('string');
     tag = DS.attr('string');
     comments = DS.hasMany('comment', { async: true });
     relatedPosts = DS.hasMany('post');
+    series = DS.belongsTo('series');
 }
 
 declare module 'ember-data' {
     interface ModelRegistry {
         'relational-post': RelationalPost;
         comment: Comment;
+        series: Series;
     }
 }
 
@@ -35,3 +41,6 @@ blogPost!.get('comments').then((comments) => {
     // now we can work with the comments
     let author: string = comments.get('firstObject')!.get('author');
 });
+
+blogPost!.hasMany('relatedPosts');
+blogPost!.belongsTo('series');

From 302ef7b926ace5e05e376e59611d206a7fa14c7d Mon Sep 17 00:00:00 2001
From: Abram Booth <aaxelb@users.noreply.github.com>
Date: Tue, 17 Apr 2018 21:11:52 -0400
Subject: [PATCH 1337/1382] Fix EmberArray.uniqBy typing (#25073)

---
 types/ember/index.d.ts        | 2 +-
 types/ember/test/array-ext.ts | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/types/ember/index.d.ts b/types/ember/index.d.ts
index cd4ba0f85f..aeb05d115d 100755
--- a/types/ember/index.d.ts
+++ b/types/ember/index.d.ts
@@ -1243,7 +1243,7 @@ declare module 'ember' {
              * Returns a new enumerable that contains only items containing a unique property value.
              * The default implementation returns an array regardless of the receiver type.
              */
-            uniqBy(): NativeArray<T>;
+            uniqBy(property: string): NativeArray<T>;
             /**
              * Returns `true` if the passed object can be found in the enumerable.
              */
diff --git a/types/ember/test/array-ext.ts b/types/ember/test/array-ext.ts
index 86e84fd7c5..059d60c00c 100755
--- a/types/ember/test/array-ext.ts
+++ b/types/ember/test/array-ext.ts
@@ -16,3 +16,6 @@ assertType<number>(array.get('length'));
 assertType<Person | undefined>(array.get('firstObject'));
 assertType<string[]>(array.mapBy('name'));
 assertType<string[]>(array.map(p => p.get('name')));
+assertType<Person[]>(array.sortBy('name'));
+assertType<Person[]>(array.uniq());
+assertType<Person[]>(array.uniqBy('name'));

From cfa60b7c664ad32b5fd9c008f83178f90cda7b58 Mon Sep 17 00:00:00 2001
From: Chris Krycho <chris@chriskrycho.com>
Date: Tue, 17 Apr 2018 19:12:12 -0600
Subject: [PATCH 1338/1382] Ember: Make `RegistryProxyMixin.register` options
 optional. (#25076)

* Ember: Make `RegistryProxyMixin.register` options optional.

* Add tests for register change.
---
 types/ember/index.d.ts                   |  2 +-
 types/ember/test/application-instance.ts | 17 +++++++++++++++++
 types/ember/tsconfig.json                |  1 +
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 types/ember/test/application-instance.ts

diff --git a/types/ember/index.d.ts b/types/ember/index.d.ts
index aeb05d115d..81d3bd69e6 100755
--- a/types/ember/index.d.ts
+++ b/types/ember/index.d.ts
@@ -325,7 +325,7 @@ declare module 'ember' {
              * `inject`) or for service lookup. Each factory is registered with
              * a full name including two parts: `type:name`.
              */
-            register(fullName: string, factory: Function, options: {}): any;
+            register(fullName: string, factory: Function, options?: { singleton?: boolean, instantiate?: boolean }): any;
             /**
              * Unregister a factory.
              */
diff --git a/types/ember/test/application-instance.ts b/types/ember/test/application-instance.ts
new file mode 100644
index 0000000000..dfda446463
--- /dev/null
+++ b/types/ember/test/application-instance.ts
@@ -0,0 +1,17 @@
+import ApplicationInstance from '@ember/application/instance';
+
+const appInstance = ApplicationInstance.create();
+appInstance.register('some:injection', class Foo {});
+
+appInstance.register('some:injection', class Foo {}, {
+  singleton: true,
+});
+
+appInstance.register('some:injection', class Foo {}, {
+  instantiate: false,
+});
+
+appInstance.register('some:injection', class Foo {}, {
+    singleton: false,
+    instantiate: true,
+});
diff --git a/types/ember/tsconfig.json b/types/ember/tsconfig.json
index cbdb6b6afc..b4bc966044 100755
--- a/types/ember/tsconfig.json
+++ b/types/ember/tsconfig.json
@@ -22,6 +22,7 @@
         "index.d.ts",
         "test/lib/assert.ts",
         "test/application.ts",
+        "test/application-instance.ts",
         "test/ember-tests.ts",
         "test/error.ts",
         "test/event.ts",

From 932727f5785b3bdab808da5852467358dc09d588 Mon Sep 17 00:00:00 2001
From: Don Denton <don@happycollision.com>
Date: Tue, 17 Apr 2018 20:12:42 -0500
Subject: [PATCH 1339/1382] Use partials for setting methods which take options
 (#24959)

This commit addresses a problem where the following would produce a type
error, even though it was valid code:

```typescript
setCanvasData({left: 23})
```

I have changed the argument type for all of the `setXXX` methods which
accept an object as their argument. In the spec files for cropperjs,
@fengyuanchen uses these objects as partials for setters. So I have
made the type definitions follow that same pattern.

I changed the `cropperjs.CropBoxData` type to act the same way as well.
It looks like  it was changed at some point, I am guessing to allow it
to be used as a partial in the `setCropBoxData` method. Since, like all
the other data structures here, it contains all members when you `get`
it, I have made all members required parts of the object and changed
the setter method to accept a partial.

I hope this all makes sense. Basically, I went from the first line below
to the second.

```typescript
setXXXXX(thing: cropperjs.SomeInterface): void

setXXXXX(thing: Partial<cropperjs.SomeInterface>): void
```

Then I changed `cropperjs.CropBoxData` to fit this new system.
---
 types/cropperjs/index.d.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/types/cropperjs/index.d.ts b/types/cropperjs/index.d.ts
index 60b508dd8f..30556e11fc 100644
--- a/types/cropperjs/index.d.ts
+++ b/types/cropperjs/index.d.ts
@@ -312,19 +312,19 @@ declare namespace cropperjs {
         /**
          * the offset left of the crop box
          */
-        left?: number;
+        left: number;
         /**
          * the offset top of the crop box
          */
-        top?: number;
+        top: number;
         /**
          * the width of the crop box
          */
-        width?: number;
+        width: number;
         /**
          * the height of the crop box
          */
-        height?: number;
+        height: number;
     }
     interface CanvasData {
         /**
@@ -516,7 +516,7 @@ declare class cropperjs {
     /**
      * Change the cropped area position and size with new data (base on the original image).
      */
-    setData(data: cropperjs.Data): void;
+    setData(data: Partial<cropperjs.Data>): void;
 
     /**
      * Output the container size data.
@@ -545,7 +545,7 @@ declare class cropperjs {
     /**
      * Change the canvas (image wrapper) position and size with new data.
      */
-    setCanvasData(data: cropperjs.CanvasData): void;
+    setCanvasData(data: Partial<cropperjs.CanvasData>): void;
 
     /**
      * Output the crop box position and size data.
@@ -555,7 +555,7 @@ declare class cropperjs {
     /**
      * Change the crop box position and size with new data.
      */
-    setCropBoxData(data: cropperjs.CropBoxData): void;
+    setCropBoxData(data: Partial<cropperjs.CropBoxData>): void;
 
     /**
      * Get a canvas drawn the cropped image.

From 3204acf72ad613c89e741d6dd378d0e212a13a8b Mon Sep 17 00:00:00 2001
From: Alexander Christie <alexander@fundstack.com>
Date: Wed, 18 Apr 2018 17:44:50 +0100
Subject: [PATCH 1340/1382] Add support for the Collation argument to Cursors
 (#25099)

http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#collation
---
 types/mongodb/index.d.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/types/mongodb/index.d.ts b/types/mongodb/index.d.ts
index 00356214c6..561cb153bb 100644
--- a/types/mongodb/index.d.ts
+++ b/types/mongodb/index.d.ts
@@ -1215,6 +1215,8 @@ export class Cursor<T = Default> extends Readable {
     /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#close */
     close(): Promise<CursorResult>;
     close(callback: MongoCallback<CursorResult>): void;
+    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#collation */
+    collation(value: Object): Cursor<T>;
     /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#comment */
     comment(value: string): Cursor<T>;
     /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#count */

From 713eb722d96eaee1f716b67a0fc7da0b467c4c35 Mon Sep 17 00:00:00 2001
From: Kagami Sascha Rosylight <saschaplas@outlook.com>
Date: Thu, 19 Apr 2018 01:45:49 +0900
Subject: [PATCH 1341/1382] [webidl2] extAttrs.rhs can be null (#25092)

---
 types/webidl2/index.d.ts       | 2 +-
 types/webidl2/webidl2-tests.ts | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/types/webidl2/index.d.ts b/types/webidl2/index.d.ts
index 9992642749..90a938b22a 100644
--- a/types/webidl2/index.d.ts
+++ b/types/webidl2/index.d.ts
@@ -249,7 +249,7 @@ export interface ExtendedAttributes {
     /** If the extended attribute takes arguments or if its right-hand side does they are listed here. */
     arguments: Argument[];
     /** If there is a right-hand side, this will capture its type ("identifier" or "identifier-list") and its value. */
-    rhs: ExtendedAttributeRightHandSideIdentifier | ExtendedAttributeRightHandSideIdentifierList;
+    rhs: ExtendedAttributeRightHandSideIdentifier | ExtendedAttributeRightHandSideIdentifierList | null;
 }
 
 export interface Token {
diff --git a/types/webidl2/webidl2-tests.ts b/types/webidl2/webidl2-tests.ts
index a1c3165edf..179c1fcea5 100644
--- a/types/webidl2/webidl2-tests.ts
+++ b/types/webidl2/webidl2-tests.ts
@@ -106,6 +106,9 @@ function logExtAttrs(extAttrs: webidl2.ExtendedAttributes[]) {
     console.log(extAttrs[0].name);
     logArguments(extAttrs[0].arguments);
     const { rhs } = extAttrs[0];
+    if (rhs === null) {
+        return;
+    }
     if (rhs.type === "identifier") {
         console.log(rhs);
     } else {

From d38890b46abbd28a39be1c27954d8c2109997c35 Mon Sep 17 00:00:00 2001
From: Adam Laycock <adam@arcath.net>
Date: Wed, 18 Apr 2018 17:46:05 +0100
Subject: [PATCH 1342/1382] update to type-screeps 2.3.0 (#25086)

---
 types/screeps/index.d.ts       | 11 +++++++----
 types/screeps/screeps-tests.ts |  5 +++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/types/screeps/index.d.ts b/types/screeps/index.d.ts
index 77d472f447..d6153f8d64 100644
--- a/types/screeps/index.d.ts
+++ b/types/screeps/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Screeps 2.2
+// Type definitions for Screeps 2.3
 // Project: https://github.com/screeps/screeps
 // Definitions by: Marko Sulamägi <https://github.com/MarkoSulamagi>
 //                 Nhan Ho <https://github.com/NhanHo>
@@ -344,6 +344,7 @@ declare const DENSITY_HIGH: number;
 declare const DENSITY_ULTRA: number;
 
 declare const TERMINAL_CAPACITY: number;
+declare const TERMINAL_COOLDOWN: number;
 declare const TERMINAL_HITS: number;
 declare const TERMINAL_SEND_COST: number;
 declare const TERMINAL_MIN_SEND: number;
@@ -777,7 +778,7 @@ interface Creep extends RoomObject {
      * @param target The target object to be attacked.
      * @returns Result Code: OK, ERR_NOT_OWNER, ERR_BUSY, ERR_NOT_ENOUGH_RESOURCES, ERR_INVALID_TARGET, ERR_NOT_IN_RANGE, ERR_NO_BODYPART, ERR_RCL_NOT_ENOUGH
      */
-    build(target: ConstructionSite): CreepActionReturnCode | ERR_RCL_NOT_ENOUGH;
+    build(target: ConstructionSite): CreepActionReturnCode | ERR_NOT_ENOUGH_RESOURCES | ERR_RCL_NOT_ENOUGH;
     /**
      * Cancel the order given during the current game tick.
      * @param methodName The name of a creep's method to be cancelled.
@@ -981,7 +982,7 @@ interface Creep extends RoomObject {
      * @param resourceType The target One of the RESOURCE_* constants..
      * @param amount The amount of resources to be transferred. If omitted, all the available amount is used.
      */
-    withdraw(target: Structure, resourceType: ResourceConstant, amount?: number): ScreepsReturnCode;
+    withdraw(target: Structure | Tombstone, resourceType: ResourceConstant, amount?: number): ScreepsReturnCode;
 }
 
 interface CreepConstructor extends _Constructor<Creep>, _ConstructorById<Creep> {
@@ -1127,7 +1128,7 @@ interface Game {
     notify(message: string, groupInterval?: number): undefined;
 }
 
-declare let Game: Game;
+declare var Game: Game;
 interface _HasRoomPosition {
     pos: RoomPosition;
 }
@@ -3899,6 +3900,8 @@ type AnyStructure =
     StructureRoad |
     StructureWall;
 interface Tombstone extends RoomObject {
+    /** The tombstones game objects id. */
+    id: string;
     /** The tick that the creep died. */
     deathTime: number;
     store: StoreDefinition;
diff --git a/types/screeps/screeps-tests.ts b/types/screeps/screeps-tests.ts
index 17a78de496..a8700a853b 100644
--- a/types/screeps/screeps-tests.ts
+++ b/types/screeps/screeps-tests.ts
@@ -541,6 +541,11 @@ interface CreepMemory {
     tombstone.creep.my;
 
     tombstone.store.energy;
+
+    tombstone.id;
+
+    const creep = Game.creeps['dave'];
+    creep.withdraw(tombstone, RESOURCE_ENERGY);
 }
 
 {

From 59648ae466892cf17a448afe4db700ac91a551f1 Mon Sep 17 00:00:00 2001
From: Stephen Haberman <stephen.haberman@gmail.com>
Date: Wed, 18 Apr 2018 11:46:55 -0500
Subject: [PATCH 1343/1382] enzyme: Fix `find` override for components with
 strict null checks. (#24811)

* Fix `find` override for components with strict null checks.

With strict null checks enabled, code like:

   shallow(...).find(SomeComponent)

Would return ShallowWrapper<any, any>.

This is because the `find` override:

   find<P2>(component: ComponentClass<P2>): ShallowWrapper<P2, any>;

Would not match, and instead fallback on find(EnzymePropSelector).

The ComponentClass<P2> did not match because the `new(props?, context?)`
does not actually match to `new(props)`, as polymorphically `props` is
a restriction on `props?`.

Instead, we explicitly model each potential constructor pattern,
no-arg, 1-arg, 2-arg, and union them together.

This also allows enabling strict null checks for the entire enzyme
typings.

This required a few tangential changes, e.g. changing the test's
numberProp?/stringProp? to non-optional, as with null checking
enabled several of the existing tests were making non-null safe
accesses (e.g. the reduce/map/etc. checks).

* Change let to const to fix tslint error.

* Simplify prefix fix, just need to change props? to props.

Also, I changed the new return type from Component<Props, any> to
Component<Props, {}>.

This more exactly matches the ComponentClass declaration and fixes
what I was seeing with React Native where:

find(View) --> returns ReactWrapper<ViewProperties, any>
find(Button) -- returns ReactWrapper<any, any>

After changing the new return type to Component<Props, {}> then
find(Button) successfully returns ReactWrapper<ButtonProperties, any>.

* Fix lint error, as {} is already the default type.
---
 types/enzyme/enzyme-tests.tsx | 52 ++++++++++++++++++-----------------
 types/enzyme/index.d.ts       |  8 +++---
 types/enzyme/tsconfig.json    |  2 +-
 3 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/types/enzyme/enzyme-tests.tsx b/types/enzyme/enzyme-tests.tsx
index 50f9bf3f38..bbdd8f404f 100644
--- a/types/enzyme/enzyme-tests.tsx
+++ b/types/enzyme/enzyme-tests.tsx
@@ -8,13 +8,14 @@ import {
     configure,
     EnzymeAdapter,
     ShallowRendererProps,
+    ComponentClass as EnzymeComponentClass
 } from "enzyme";
 import { Component, ReactElement, HTMLAttributes, ComponentClass, StatelessComponent } from "react";
 
 // Help classes/interfaces
 interface MyComponentProps {
-    stringProp?: string;
-    numberProp?: number;
+    stringProp: string;
+    numberProp: number;
 }
 
 interface AnotherComponentProps {
@@ -65,27 +66,27 @@ function configureTest() {
 // ShallowWrapper
 function ShallowWrapperTest() {
     let shallowWrapper: ShallowWrapper<MyComponentProps, MyComponentState> =
-        shallow<MyComponentProps, MyComponentState>(<MyComponent stringProp="value" />);
+        shallow<MyComponentProps, MyComponentState>(<MyComponent stringProp="value" numberProp={1} />);
 
     let reactElement: ReactElement<any>;
     let reactElements: Array<ReactElement<any>>;
     let domElement: Element;
     let boolVal: boolean;
     let stringVal: string;
-    let numOrStringVal: number | string;
+    let numOrStringVal: number | string | undefined;
     let elementWrapper: ShallowWrapper<HTMLAttributes<{}>>;
     let anotherStatelessWrapper: ShallowWrapper<AnotherStatelessProps, never>;
     let anotherComponentWrapper: ShallowWrapper<AnotherComponentProps, any>;
 
     function test_props_state_inferring() {
         let wrapper: ShallowWrapper<MyComponentProps, MyComponentState>;
-        wrapper = shallow(<MyComponent stringProp="value" />);
+        wrapper = shallow(<MyComponent stringProp="value" numberProp={1} />);
         wrapper.state().stateProperty;
         wrapper.props().stringProp.toUpperCase();
     }
 
     function test_shallow_options() {
-        shallow(<MyComponent stringProp="1" />, {
+        shallow(<MyComponent stringProp="1" numberProp={1} />, {
             context: {
                 test: "a",
             },
@@ -99,6 +100,9 @@ function ShallowWrapperTest() {
         anotherStatelessWrapper = shallowWrapper.find(AnotherStatelessComponent);
         shallowWrapper = shallowWrapper.find({ prop: 'value' });
         elementWrapper = shallowWrapper.find('.selector');
+        // Since AnotherComponent does not have a constructor, it cannot match the
+        // previous selector overload of ComponentClass { new(props?, contenxt? ) }
+        const s1: EnzymeComponentClass<AnotherComponentProps> = AnotherComponent;
     }
 
     function test_findWhere() {
@@ -155,7 +159,7 @@ function ShallowWrapperTest() {
     }
 
     function test_hostNodes() {
-	    shallowWrapper.hostNodes();
+        shallowWrapper.hostNodes();
     }
 
     function test_equals() {
@@ -411,20 +415,19 @@ function ShallowWrapperTest() {
 
     function test_constructor() {
         let anyWrapper: ShallowWrapper;
-        anyWrapper = new ShallowWrapper(<MyComponent />);
-        anyWrapper = new ShallowWrapper<MyComponentProps>(<MyComponent />);
-        shallowWrapper = new ShallowWrapper<MyComponentProps, MyComponentState>(<MyComponent />);
-        shallowWrapper = new ShallowWrapper<MyComponentProps, MyComponentState>([<MyComponent />, <MyComponent />]);
-        shallowWrapper = new ShallowWrapper<MyComponentProps, MyComponentState>(<MyComponent />, shallowWrapper);
-        shallowWrapper = new ShallowWrapper<MyComponentProps, MyComponentState>(<MyComponent />, null, { lifecycleExperimental: true });
-        shallowWrapper = new ShallowWrapper<MyComponentProps, MyComponentState>(<MyComponent />, shallowWrapper, { lifecycleExperimental: true });
+        anyWrapper = new ShallowWrapper(<MyComponent stringProp="1" numberProp={1} />);
+        shallowWrapper = new ShallowWrapper<MyComponentProps, MyComponentState>(<MyComponent stringProp="1" numberProp={1} />);
+        shallowWrapper = new ShallowWrapper<MyComponentProps, MyComponentState>([<MyComponent stringProp="1" numberProp={1} />, <MyComponent stringProp="1" numberProp={1} />]);
+        shallowWrapper = new ShallowWrapper<MyComponentProps, MyComponentState>(<MyComponent stringProp="1" numberProp={1} />, shallowWrapper);
+        shallowWrapper = new ShallowWrapper<MyComponentProps, MyComponentState>(<MyComponent stringProp="1" numberProp={1} />, undefined, { lifecycleExperimental: true });
+        shallowWrapper = new ShallowWrapper<MyComponentProps, MyComponentState>(<MyComponent stringProp="1" numberProp={1} />, shallowWrapper, { lifecycleExperimental: true });
     }
 }
 
 // ReactWrapper
 function ReactWrapperTest() {
     let reactWrapper: ReactWrapper<MyComponentProps, MyComponentState> =
-        mount<MyComponentProps, MyComponentState>(<MyComponent stringProp="value" />);
+        mount<MyComponentProps, MyComponentState>(<MyComponent stringProp="value" numberProp={1} />);
 
     let reactElement: ReactElement<any>;
     let reactElements: Array<ReactElement<any>>;
@@ -437,7 +440,7 @@ function ReactWrapperTest() {
 
     function test_prop_state_inferring() {
         let wrapper: ReactWrapper<MyComponentProps, MyComponentState>;
-        wrapper = mount(<MyComponent stringProp="value" />);
+        wrapper = mount(<MyComponent stringProp="value" numberProp={1} />);
         wrapper.state().stateProperty;
         wrapper.props().stringProp.toUpperCase();
     }
@@ -449,7 +452,7 @@ function ReactWrapperTest() {
     function test_mount() {
         reactWrapper = reactWrapper.mount();
 
-        mount(<MyComponent stringProp='1' />, {
+        mount(<MyComponent stringProp='1' numberProp={1} />, {
             attachTo: document.getElementById('test'),
             context: {
                 a: "b"
@@ -685,7 +688,7 @@ function ReactWrapperTest() {
     }
 
     function test_setProps() {
-        reactWrapper = reactWrapper.setProps({ stringProp: 'foo' }, () => {});
+        reactWrapper = reactWrapper.setProps({ stringProp: 'foo' }, () => { });
     }
 
     function test_setContext() {
@@ -764,13 +767,12 @@ function ReactWrapperTest() {
 
     function test_constructor() {
         let anyWrapper: ReactWrapper;
-        anyWrapper = new ReactWrapper(<MyComponent />);
-        anyWrapper = new ReactWrapper<MyComponentProps>(<MyComponent />);
-        reactWrapper = new ReactWrapper<MyComponentProps, MyComponentState>(<MyComponent />);
-        reactWrapper = new ReactWrapper<MyComponentProps, MyComponentState>([<MyComponent />, <MyComponent />]);
-        reactWrapper = new ReactWrapper<MyComponentProps, MyComponentState>(<MyComponent />, reactWrapper);
-        reactWrapper = new ReactWrapper<MyComponentProps, MyComponentState>(<MyComponent />, null, { attachTo: document.createElement('div') });
-        reactWrapper = new ReactWrapper<MyComponentProps, MyComponentState>(<MyComponent />, reactWrapper, { attachTo: document.createElement('div') });
+        anyWrapper = new ReactWrapper(<MyComponent stringProp="1" numberProp={1} />);
+        reactWrapper = new ReactWrapper<MyComponentProps, MyComponentState>(<MyComponent stringProp="1" numberProp={1} />);
+        reactWrapper = new ReactWrapper<MyComponentProps, MyComponentState>([<MyComponent stringProp="1" numberProp={1} />, <MyComponent stringProp="1" numberProp={1} />]);
+        reactWrapper = new ReactWrapper<MyComponentProps, MyComponentState>(<MyComponent stringProp="1" numberProp={1} />, reactWrapper);
+        reactWrapper = new ReactWrapper<MyComponentProps, MyComponentState>(<MyComponent stringProp="1" numberProp={1} />, undefined, { attachTo: document.createElement('div') });
+        reactWrapper = new ReactWrapper<MyComponentProps, MyComponentState>(<MyComponent stringProp="1" numberProp={1} />, reactWrapper, { attachTo: document.createElement('div') });
     }
 }
 
diff --git a/types/enzyme/index.d.ts b/types/enzyme/index.d.ts
index fbb953e167..0a741460f6 100644
--- a/types/enzyme/index.d.ts
+++ b/types/enzyme/index.d.ts
@@ -23,7 +23,7 @@ export class ElementClass extends Component<any, any> {
  * all specified in the implementation. TS chooses the EnzymePropSelector overload and loses the generics
  */
 export interface ComponentClass<Props> {
-    new(props?: Props, context?: any): Component<Props, any>;
+    new(props: Props, context?: any): Component<Props>;
 }
 
 export type StatelessComponent<Props> = (props: Props, context?: any) => JSX.Element;
@@ -354,7 +354,7 @@ export interface CommonWrapper<P = {}, S = {}> {
 }
 
 // tslint:disable-next-line no-empty-interface
-export interface ShallowWrapper<P = {}, S = {}> extends CommonWrapper<P, S> {}
+export interface ShallowWrapper<P = {}, S = {}> extends CommonWrapper<P, S> { }
 export class ShallowWrapper<P = {}, S = {}> {
     constructor(nodes: JSX.Element[] | JSX.Element, root?: ShallowWrapper<any, any>, options?: ShallowRendererProps);
     shallow(options?: ShallowRendererProps): ShallowWrapper<P, S>;
@@ -440,7 +440,7 @@ export class ShallowWrapper<P = {}, S = {}> {
 }
 
 // tslint:disable-next-line no-empty-interface
-export interface ReactWrapper<P = {}, S = {}> extends CommonWrapper<P, S> {}
+export interface ReactWrapper<P = {}, S = {}> extends CommonWrapper<P, S> { }
 export class ReactWrapper<P = {}, S = {}> {
     constructor(nodes: JSX.Element | JSX.Element[], root?: ReactWrapper<any, any>, options?: MountRendererProps);
 
@@ -577,7 +577,7 @@ export interface MountRendererProps {
     /**
      * DOM Element to attach the component to
      */
-    attachTo?: HTMLElement;
+    attachTo?: HTMLElement | null;
     /**
      * Merged contextTypes for all children of the wrapper
      */
diff --git a/types/enzyme/tsconfig.json b/types/enzyme/tsconfig.json
index 096b64a111..c04256e39a 100644
--- a/types/enzyme/tsconfig.json
+++ b/types/enzyme/tsconfig.json
@@ -7,7 +7,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "jsx": "react",

From 147bef129f34285a08807396f2ab216c4e9098e9 Mon Sep 17 00:00:00 2001
From: Jarom Loveridge <jarom@timpnet.net>
Date: Wed, 18 Apr 2018 10:47:35 -0600
Subject: [PATCH 1344/1382] Update SSLOptions to match documentation. (#25080)

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

diff --git a/types/mongodb/index.d.ts b/types/mongodb/index.d.ts
index 561cb153bb..f72af738a3 100644
--- a/types/mongodb/index.d.ts
+++ b/types/mongodb/index.d.ts
@@ -104,6 +104,10 @@ export interface MongoClientOptions extends
 }
 
 export interface SSLOptions {
+    // Passed directly through to tls.createSecureContext. See https://nodejs.org/dist/latest-v9.x/docs/api/tls.html#tls_tls_createsecurecontext_options for more info.
+    ciphers?: string;
+    // Passed directly through to tls.createSecureContext. See https://nodejs.org/dist/latest-v9.x/docs/api/tls.html#tls_tls_createsecurecontext_options for more info.
+    ecdhCurve?: string;
     // Default:5; Number of connections for each server instance
     poolSize?: number;
     // Use ssl connection (needs to have a mongod server with ssl support)
@@ -115,7 +119,7 @@ export interface SSLOptions {
     // Array of valid certificates either as Buffers or Strings
     sslCA?: Array<Buffer | string>;
     // SSL Certificate revocation list binary buffer
-    sslCRL?: Buffer;
+    sslCRL?: Array<Buffer | string>;
     // SSL Certificate binary buffer
     sslCert?: Buffer | string;
     // SSL Key file binary buffer
diff --git a/types/mongodb/mongodb-tests.ts b/types/mongodb/mongodb-tests.ts
index 270379989a..bdbddb1250 100644
--- a/types/mongodb/mongodb-tests.ts
+++ b/types/mongodb/mongodb-tests.ts
@@ -23,6 +23,7 @@ let options: mongodb.MongoClientOptions = {
     sslValidate: false,
     checkServerIdentity: function () { },
     sslCA: ['str'],
+    sslCRL: ['str'],
     sslCert: new Buffer(999),
     sslKey: new Buffer(999),
     sslPass: new Buffer(999),

From cfbc3cd2a000d33ffcd5e32812a44b010198b721 Mon Sep 17 00:00:00 2001
From: ikokostya <ikokostya@gmail.com>
Date: Wed, 18 Apr 2018 19:58:55 +0300
Subject: [PATCH 1345/1382] [got] Update to 8.3.0 (#25098)

* [got] Update to 8.3.0

Fixes #23454

* Return support for legacy url object

* Simplify agent option type

Because https.Agent is compatible with http.Agent

* Rename RequestOptions interface to InternalRequestOptions and move outside got namespace

* Add myself to "Definitions by" section
---
 types/got/got-tests.ts | 58 +++++++++++++++++++++++++++++++++++
 types/got/index.d.ts   | 68 ++++++++++++++++++++++++++++++++----------
 2 files changed, 110 insertions(+), 16 deletions(-)

diff --git a/types/got/got-tests.ts b/types/got/got-tests.ts
index 7048533295..8c88cef3bc 100644
--- a/types/got/got-tests.ts
+++ b/types/got/got-tests.ts
@@ -3,6 +3,8 @@ import cookie = require('cookie');
 import FormData = require('form-data');
 import * as fs from 'fs';
 import * as http from 'http';
+import * as https from 'https';
+import * as url from 'url';
 
 let str: string;
 let buf: Buffer;
@@ -94,6 +96,7 @@ let res: http.IncomingMessage | undefined;
 let opts: got.GotOptions<string | null>;
 let err: got.GotError;
 let href: string | undefined;
+let progress: got.Progress;
 
 const stream = got.stream('todomvc.com');
 stream.addListener('request', (r) => req = r);
@@ -107,6 +110,12 @@ stream.addListener('error', (e, b, r) => {
     err = e;
     res = r;
 });
+stream.addListener('downloadProgress', (p) => {
+    progress = p;
+});
+stream.addListener('uploadProgress', (p) => {
+    progress = p;
+});
 
 stream.on('request', (r) => req = r);
 stream.on('response', (r) => res = r);
@@ -119,6 +128,12 @@ stream.on('error', (e, b, r) => {
     err = e;
     res = r;
 });
+stream.on('downloadProgress', (p) => {
+    progress = p;
+});
+stream.on('uploadProgress', (p) => {
+    progress = p;
+});
 
 stream.once('request', (r) => req = r);
 stream.once('response', (r) => res = r);
@@ -131,6 +146,12 @@ stream.once('error', (e, b, r) => {
     err = e;
     res = r;
 });
+stream.once('downloadProgress', (p) => {
+    progress = p;
+});
+stream.once('uploadProgress', (p) => {
+    progress = p;
+});
 
 stream.prependListener('request', (r) => req = r);
 stream.prependListener('response', (r) => res = r);
@@ -143,6 +164,12 @@ stream.prependListener('error', (e, b, r) => {
     err = e;
     res = r;
 });
+stream.prependListener('downloadProgress', (p) => {
+    progress = p;
+});
+stream.prependListener('uploadProgress', (p) => {
+    progress = p;
+});
 
 stream.prependOnceListener('request', (r) => req = r);
 stream.prependOnceListener('response', (r) => res = r);
@@ -155,6 +182,12 @@ stream.prependOnceListener('error', (e, b, r) => {
     err = e;
     res = r;
 });
+stream.prependOnceListener('downloadProgress', (p) => {
+    progress = p;
+});
+stream.prependOnceListener('uploadProgress', (p) => {
+    progress = p;
+});
 
 stream.removeListener('request', (r) => req = r);
 stream.removeListener('response', (r) => res = r);
@@ -167,6 +200,12 @@ stream.removeListener('error', (e, b, r) => {
     err = e;
     res = r;
 });
+stream.removeListener('downloadProgress', (p) => {
+    progress = p;
+});
+stream.removeListener('uploadProgress', (p) => {
+    progress = p;
+});
 
 got('google.com', {
     headers: {
@@ -190,3 +229,22 @@ got('todomvc.com', {
 
 got('https://httpbin.org/404')
     .catch(err => err instanceof got.HTTPError && err.statusCode === 404);
+
+got('todomvc', {
+    throwHttpErrors: false
+});
+
+got('todomvc', {
+    agent: {
+        http: new http.Agent(),
+        https: new https.Agent()
+    }
+});
+
+got('todomvc', {
+    cache: new Map()
+}).then(res => res.fromCache);
+
+got(new url.URL('http://todomvc.com'));
+
+got(url.parse('http://todomvc.com'));
diff --git a/types/got/index.d.ts b/types/got/index.d.ts
index 5872b4f993..47c281fb53 100644
--- a/types/got/index.d.ts
+++ b/types/got/index.d.ts
@@ -1,14 +1,16 @@
-// Type definitions for got 7.1
+// Type definitions for got 8.3
 // Project: https://github.com/sindresorhus/got#readme
 // Definitions by: BendingBender <https://github.com/BendingBender>
 //                 Linus Unnebäck <https://github.com/LinusU>
+//                 Konstantin Ikonnikov <https://github.com/ikokostya>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
 /// <reference types="node"/>
 
-import { Url } from 'url';
+import { Url, URL } from 'url';
 import * as http from 'http';
+import * as https from 'https';
 import * as nodeStream from 'stream';
 
 export = got;
@@ -45,6 +47,10 @@ declare class UnsupportedProtocolError extends StdError {
     name: 'UnsupportedProtocolError';
 }
 
+declare class CancelError extends StdError {
+    name: 'CancelError';
+}
+
 declare class StdError extends Error {
     code?: string;
     host?: string;
@@ -59,15 +65,22 @@ declare class StdError extends Error {
 declare const got: got.GotFn &
     Record<'get' | 'post' | 'put' | 'patch' | 'head' | 'delete', got.GotFn> &
     {
-        stream: got.GotStreamFn & Record<'get' | 'post' | 'put' | 'patch' | 'head' | 'delete', got.GotStreamFn>
-        RequestError: typeof RequestError
-        ReadError: typeof ReadError
-        ParseError: typeof ParseError
-        HTTPError: typeof HTTPError
-        MaxRedirectsError: typeof MaxRedirectsError
-        UnsupportedProtocolError: typeof UnsupportedProtocolError
+        stream: got.GotStreamFn & Record<'get' | 'post' | 'put' | 'patch' | 'head' | 'delete', got.GotStreamFn>;
+        RequestError: typeof RequestError;
+        ReadError: typeof ReadError;
+        ParseError: typeof ParseError;
+        HTTPError: typeof HTTPError;
+        MaxRedirectsError: typeof MaxRedirectsError;
+        UnsupportedProtocolError: typeof UnsupportedProtocolError;
+        CancelError: typeof CancelError;
     };
 
+interface InternalRequestOptions extends http.RequestOptions {
+    // Redeclare options with `any` type for allow specify types incompatible with http.RequestOptions.
+    timeout?: any;
+    agent?: any;
+}
+
 declare namespace got {
     interface GotFn {
         (url: GotUrl): GotPromise<string>;
@@ -80,7 +93,7 @@ declare namespace got {
 
     type GotStreamFn = (url: GotUrl, options?: GotOptions<string | null>) => GotEmitter & nodeStream.Duplex;
 
-    type GotUrl = string | http.RequestOptions | Url;
+    type GotUrl = string | http.RequestOptions | Url | URL;
 
     interface GotBodyOptions<E extends string | null> extends GotOptions<E> {
         body?: string | Buffer | nodeStream.Readable;
@@ -98,11 +111,7 @@ declare namespace got {
         json?: boolean;
     }
 
-    interface TimoutRequestOptions extends http.RequestOptions {
-        timeout?: any;
-    }
-
-    interface GotOptions<E extends string | null> extends TimoutRequestOptions {
+    interface GotOptions<E extends string | null> extends InternalRequestOptions {
         encoding?: E;
         query?: string | object;
         timeout?: number | TimeoutOptions;
@@ -110,6 +119,9 @@ declare namespace got {
         followRedirect?: boolean;
         decompress?: boolean;
         useElectronNet?: boolean;
+        cache?: Map<string, any>;
+        agent?: http.Agent | boolean | AgentOptions;
+        throwHttpErrors?: boolean;
     }
 
     interface TimeoutOptions {
@@ -118,12 +130,18 @@ declare namespace got {
         request?: number;
     }
 
+    interface AgentOptions {
+        http: http.Agent;
+        https: https.Agent;
+    }
+
     type RetryFunction = (retry: number, error: any) => number;
 
     interface Response<B extends Buffer | string | object> extends http.IncomingMessage {
         body: B;
         url: string;
         requestUrl: string;
+        fromCache: boolean;
         redirectUrls?: string[];
     }
 
@@ -134,32 +152,50 @@ declare namespace got {
         addListener(event: 'response', listener: (res: http.IncomingMessage) => void): this;
         addListener(event: 'redirect', listener: (res: http.IncomingMessage, nextOptions: GotOptions<string | null> & Url) => void): this;
         addListener(event: 'error', listener: (error: GotError, body?: any, res?: http.IncomingMessage) => void): this;
+        addListener(event: 'downloadProgress', listener: (progress: Progress) => void): this;
+        addListener(event: 'uploadProgress', listener: (progress: Progress) => void): this;
 
         on(event: 'request', listener: (req: http.ClientRequest) => void): this;
         on(event: 'response', listener: (res: http.IncomingMessage) => void): this;
         on(event: 'redirect', listener: (res: http.IncomingMessage, nextOptions: GotOptions<string | null> & Url) => void): this;
         on(event: 'error', listener: (error: GotError, body?: any, res?: http.IncomingMessage) => void): this;
+        on(event: 'downloadProgress', listener: (progress: Progress) => void): this;
+        on(event: 'uploadProgress', listener: (progress: Progress) => void): this;
 
         once(event: 'request', listener: (req: http.ClientRequest) => void): this;
         once(event: 'response', listener: (res: http.IncomingMessage) => void): this;
         once(event: 'redirect', listener: (res: http.IncomingMessage, nextOptions: GotOptions<string | null> & Url) => void): this;
         once(event: 'error', listener: (error: GotError, body?: any, res?: http.IncomingMessage) => void): this;
+        once(event: 'downloadProgress', listener: (progress: Progress) => void): this;
+        once(event: 'uploadProgress', listener: (progress: Progress) => void): this;
 
         prependListener(event: 'request', listener: (req: http.ClientRequest) => void): this;
         prependListener(event: 'response', listener: (res: http.IncomingMessage) => void): this;
         prependListener(event: 'redirect', listener: (res: http.IncomingMessage, nextOptions: GotOptions<string | null> & Url) => void): this;
         prependListener(event: 'error', listener: (error: GotError, body?: any, res?: http.IncomingMessage) => void): this;
+        prependListener(event: 'downloadProgress', listener: (progress: Progress) => void): this;
+        prependListener(event: 'uploadProgress', listener: (progress: Progress) => void): this;
 
         prependOnceListener(event: 'request', listener: (req: http.ClientRequest) => void): this;
         prependOnceListener(event: 'response', listener: (res: http.IncomingMessage) => void): this;
         prependOnceListener(event: 'redirect', listener: (res: http.IncomingMessage, nextOptions: GotOptions<string | null> & Url) => void): this;
         prependOnceListener(event: 'error', listener: (error: GotError, body?: any, res?: http.IncomingMessage) => void): this;
+        prependOnceListener(event: 'downloadProgress', listener: (progress: Progress) => void): this;
+        prependOnceListener(event: 'uploadProgress', listener: (progress: Progress) => void): this;
 
         removeListener(event: 'request', listener: (req: http.ClientRequest) => void): this;
         removeListener(event: 'response', listener: (res: http.IncomingMessage) => void): this;
         removeListener(event: 'redirect', listener: (res: http.IncomingMessage, nextOptions: GotOptions<string | null> & Url) => void): this;
         removeListener(event: 'error', listener: (error: GotError, body?: any, res?: http.IncomingMessage) => void): this;
+        removeListener(event: 'downloadProgress', listener: (progress: Progress) => void): this;
+        removeListener(event: 'uploadProgress', listener: (progress: Progress) => void): this;
     }
 
-    type GotError = RequestError | ReadError | ParseError | HTTPError | MaxRedirectsError | UnsupportedProtocolError;
+    type GotError = RequestError | ReadError | ParseError | HTTPError | MaxRedirectsError | UnsupportedProtocolError | CancelError;
+
+    interface Progress {
+        percent: number;
+        transferred: number;
+        total: number | null;
+    }
 }

From 42c65bb609fd847132e78ba9ffe30d016a8b724b Mon Sep 17 00:00:00 2001
From: Lucas Terra <lucasterra@users.noreply.github.com>
Date: Wed, 18 Apr 2018 13:59:23 -0300
Subject: [PATCH 1346/1382] [recompose] Add aliases to recompose sub modules.
 (#25069)

---
 types/recompose/index.d.ts          | 249 +++++++++++++++++++++++++++-
 types/recompose/recompose-tests.tsx |  42 +++++
 2 files changed, 290 insertions(+), 1 deletion(-)

diff --git a/types/recompose/index.d.ts b/types/recompose/index.d.ts
index c057521570..222f0ed539 100644
--- a/types/recompose/index.d.ts
+++ b/types/recompose/index.d.ts
@@ -1,9 +1,10 @@
-// Type definitions for Recompose 0.24
+// Type definitions for Recompose 0.26
 // Project: https://github.com/acdlite/recompose
 // Definitions by: Iskander Sierra <https://github.com/iskandersierra>
 //                 Samuel DeSota <https://github.com/mrapogee>
 //                 Curtis Layne <https://github.com/clayne11>
 //                 Rasmus Eneman <https://github.com/Pajn>
+//                 Lucas Terra <https://github.com/lucasterra>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -453,3 +454,249 @@ declare module 'recompose/kefirObservableConfig' {
 
     export default kefirConfig;
 }
+
+// https://github.com/acdlite/recompose/blob/master/docs/API.md#mapprops
+declare module 'recompose/mapProps' {
+    import { mapProps } from 'recompose';
+    export default mapProps;
+}
+
+// https://github.com/acdlite/recompose/blob/master/docs/API.md#withprops
+declare module 'recompose/withProps' {
+    import { withProps } from 'recompose';
+    export default withProps;
+}
+
+// https://github.com/acdlite/recompose/blob/master/docs/API.md#withpropsonchange
+declare module 'recompose/withPropsOnChange' {
+    import { withPropsOnChange } from 'recompose';
+    export default withPropsOnChange;
+}
+
+// https://github.com/acdlite/recompose/blob/master/docs/API.md#withhandlers
+declare module 'recompose/withHandlers' {
+    import { withHandlers } from 'recompose';
+    export default withHandlers;
+}
+
+// https://github.com/acdlite/recompose/blob/master/docs/API.md#defaultprops
+declare module 'recompose/defaultProps' {
+    import { defaultProps } from 'recompose';
+    export default defaultProps;
+}
+
+// https://github.com/acdlite/recompose/blob/master/docs/API.md#renameprop
+declare module 'recompose/renameProp' {
+    import { renameProp } from 'recompose';
+    export default renameProp;
+}
+
+// https://github.com/acdlite/recompose/blob/master/docs/API.md#renameprops
+declare module 'recompose/renameProps' {
+    import { renameProps } from 'recompose';
+    export default renameProps;
+}
+
+// https://github.com/acdlite/recompose/blob/master/docs/API.md#flattenprop
+declare module 'recompose/flattenProp' {
+    import { flattenProp } from 'recompose';
+    export default flattenProp;
+}
+
+// https://github.com/acdlite/recompose/blob/master/docs/API.md#withstate
+declare module 'recompose/withState' {
+    import { withState } from 'recompose';
+    export default withState;
+}
+
+// https://github.com/acdlite/recompose/blob/master/docs/API.md#withstatehandlers
+declare module 'recompose/withStateHandlers' {
+    import { withStateHandlers } from 'recompose';
+    export default withStateHandlers;
+}
+
+// https://github.com/acdlite/recompose/blob/master/docs/API.md#withreducer
+declare module 'recompose/withReducer' {
+    import { withReducer } from 'recompose';
+    export default withReducer;
+}
+
+// https://github.com/acdlite/recompose/blob/master/docs/API.md#branch
+declare module 'recompose/branch' {
+    import { branch } from 'recompose';
+    export default branch;
+}
+
+// https://github.com/acdlite/recompose/blob/master/docs/API.md#rendercomponent
+declare module 'recompose/renderComponent' {
+    import { renderComponent } from 'recompose';
+    export default renderComponent;
+}
+
+// https://github.com/acdlite/recompose/blob/master/docs/API.md#rendernothing
+declare module 'recompose/renderNothing' {
+    import { renderNothing } from 'recompose';
+    export default renderNothing;
+}
+
+// https://github.com/acdlite/recompose/blob/master/docs/API.md#shouldupdate
+declare module 'recompose/shouldUpdate' {
+    import { shouldUpdate } from 'recompose';
+    export default shouldUpdate;
+}
+
+// https://github.com/acdlite/recompose/blob/master/docs/API.md#pure
+declare module 'recompose/pure' {
+    import { pure } from 'recompose';
+    export default pure;
+}
+
+// https://github.com/acdlite/recompose/blob/master/docs/API.md#onlyupdateforkeys
+declare module 'recompose/onlyUpdateForKeys' {
+    import { onlyUpdateForKeys } from 'recompose';
+    export default onlyUpdateForKeys;
+}
+
+// https://github.com/acdlite/recompose/blob/master/docs/API.md#onlyupdateforproptypes
+declare module 'recompose/onlyUpdateForPropTypes' {
+    import { onlyUpdateForPropTypes } from 'recompose';
+    export default onlyUpdateForPropTypes;
+}
+
+// https://github.com/acdlite/recompose/blob/master/docs/API.md#withcontext
+declare module 'recompose/withContext' {
+    import { withContext } from 'recompose';
+    export default withContext;
+}
+
+// https://github.com/acdlite/recompose/blob/master/docs/API.md#getcontext
+declare module 'recompose/getContext' {
+    import { getContext } from 'recompose';
+    export default getContext;
+}
+
+// https://github.com/acdlite/recompose/blob/master/docs/API.md#lifecycle
+declare module 'recompose/lifecycle' {
+    import { lifecycle } from 'recompose';
+    export default lifecycle;
+}
+
+// https://github.com/acdlite/recompose/blob/master/docs/API.md#toclass
+declare module 'recompose/toClass' {
+    import { toClass } from 'recompose';
+    export default toClass;
+}
+
+// https://github.com/acdlite/recompose/blob/master/docs/API.md#setstatic
+declare module 'recompose/setStatic' {
+    import { setStatic } from 'recompose';
+    export default setStatic;
+}
+
+// https://github.com/acdlite/recompose/blob/master/docs/API.md#setproptypes
+declare module 'recompose/setPropTypes' {
+    import { setPropTypes } from 'recompose';
+    export default setPropTypes;
+}
+
+// https://github.com/acdlite/recompose/blob/master/docs/API.md#setdisplayname
+declare module 'recompose/setDisplayName' {
+    import { setDisplayName } from 'recompose';
+    export default setDisplayName;
+}
+
+// https://github.com/acdlite/recompose/blob/master/docs/API.md#compose
+declare module 'recompose/compose' {
+    import { compose } from 'recompose';
+    export default compose;
+}
+
+// https://github.com/acdlite/recompose/blob/master/docs/API.md#getdisplayname
+declare module 'recompose/getDisplayName' {
+    import { getDisplayName } from 'recompose';
+    export default getDisplayName;
+}
+
+// https://github.com/acdlite/recompose/blob/master/docs/API.md#wrapdisplayname
+declare module 'recompose/wrapDisplayName' {
+    import { wrapDisplayName } from 'recompose';
+    export default wrapDisplayName;
+}
+
+// https://github.com/acdlite/recompose/blob/master/docs/API.md#shallowequal
+declare module 'recompose/shallowEqual' {
+    import { shallowEqual } from 'recompose';
+    export default shallowEqual;
+}
+
+// https://github.com/acdlite/recompose/blob/master/docs/API.md#isclasscomponent
+declare module 'recompose/isClassComponent' {
+    import { isClassComponent } from 'recompose';
+    export default isClassComponent;
+}
+
+// https://github.com/acdlite/recompose/blob/master/docs/API.md#createsink
+declare module 'recompose/createSink' {
+    import { createSink } from 'recompose';
+    export default createSink;
+}
+
+// https://github.com/acdlite/recompose/blob/master/docs/API.md#componentfromprop
+declare module 'recompose/componentFromProp' {
+    import { componentFromProp } from 'recompose';
+    export default componentFromProp;
+}
+
+// https://github.com/acdlite/recompose/blob/master/docs/API.md#nest
+declare module 'recompose/nest' {
+    import { nest } from 'recompose';
+    export default nest;
+}
+
+// https://github.com/acdlite/recompose/blob/master/docs/API.md#hoiststatics
+declare module 'recompose/hoistStatics' {
+    import { hoistStatics } from 'recompose';
+    export default hoistStatics;
+}
+
+// https://github.com/acdlite/recompose/blob/master/docs/API.md#componentfromstream
+declare module 'recompose/componentFromStream' {
+    import { componentFromStream } from 'recompose';
+    export default componentFromStream;
+}
+
+// https://github.com/acdlite/recompose/blob/master/docs/API.md#componentfromstreamwithconfig
+declare module 'recompose/componentFromStreamWithConfig' {
+    import { componentFromStreamWithConfig } from 'recompose';
+    export default componentFromStreamWithConfig;
+}
+
+// https://github.com/acdlite/recompose/blob/master/docs/API.md#mappropsstream
+declare module 'recompose/mapPropsStream' {
+    import { mapPropsStream } from 'recompose';
+    export default mapPropsStream;
+}
+
+// https://github.com/acdlite/recompose/blob/master/docs/API.md#mappropsstreamwithconfig
+declare module 'recompose/mapPropsStreamWithConfig' {
+    import { mapPropsStreamWithConfig } from 'recompose';
+    export default mapPropsStreamWithConfig;
+}
+
+// https://github.com/acdlite/recompose/blob/master/docs/API.md#createeventhandler
+declare module 'recompose/createEventHandler' {
+    import { createEventHandler } from 'recompose';
+    export default createEventHandler;
+}
+
+// https://github.com/acdlite/recompose/blob/master/docs/API.md#createeventhandlerwithconfig
+declare module 'recompose/createEventHandlerWithConfig' {
+    import { createEventHandlerWithConfig } from 'recompose';
+    export default createEventHandlerWithConfig;
+}
+
+// https://github.com/acdlite/recompose/blob/master/docs/API.md#setobservableconfig
+declare module 'recompose/setObservableConfig' {
+    import { setObservableConfig } from 'recompose';
+    export default setObservableConfig;
+}
diff --git a/types/recompose/recompose-tests.tsx b/types/recompose/recompose-tests.tsx
index c239cbacb1..75d64b468d 100644
--- a/types/recompose/recompose-tests.tsx
+++ b/types/recompose/recompose-tests.tsx
@@ -28,6 +28,48 @@ import xstreamConfig from "recompose/xstreamObservableConfig";
 import baconConfig from "recompose/baconObservableConfig";
 import kefirConfig from "recompose/kefirObservableConfig";
 
+import mapPropsStandalone from "recompose/mapProps";
+import withPropsStandalone from "recompose/withProps";
+import withPropsOnChangeStandalone from "recompose/withPropsOnChange";
+import withHandlersStandalone from "recompose/withHandlers";
+import defaultPropsStandalone from "recompose/defaultProps";
+import renamePropStandalone from "recompose/renameProp";
+import renamePropsStandalone from "recompose/renameProps";
+import flattenPropStandalone from "recompose/flattenProp";
+import withStateStandalone from "recompose/withState";
+import withStateHandlersStandalone from "recompose/withStateHandlers";
+import withReducerStandalone from "recompose/withReducer";
+import branchStandalone from "recompose/branch";
+import renderComponentStandalone from "recompose/renderComponent";
+import renderNothingStandalone from "recompose/renderNothing";
+import shouldUpdateStandalone from "recompose/shouldUpdate";
+import pureStandalone from "recompose/pure";
+import onlyUpdateForKeysStandalone from "recompose/onlyUpdateForKeys";
+import onlyUpdateForPropTypesStandalone from "recompose/onlyUpdateForPropTypes";
+import withContextStandalone from "recompose/withContext";
+import getContextStandalone from "recompose/getContext";
+import lifecycleStandalone from "recompose/lifecycle";
+import toClassStandalone from "recompose/toClass";
+import setStaticStandalone from "recompose/setStatic";
+import setPropTypesStandalone from "recompose/setPropTypes";
+import setDisplayNameStandalone from "recompose/setDisplayName";
+import composeStandalone from "recompose/compose";
+import getDisplayNameStandalone from "recompose/getDisplayName";
+import wrapDisplayNameStandalone from "recompose/wrapDisplayName";
+import shallowEqualStandalone from "recompose/shallowEqual";
+import isClassComponentStandalone from "recompose/isClassComponent";
+import createSinkStandalone from "recompose/createSink";
+import componentFromPropStandalone from "recompose/componentFromProp";
+import nestStandalone from "recompose/nest";
+import hoistStaticsStandalone from "recompose/hoistStatics";
+import componentFromStreamStandalone from "recompose/componentFromStream";
+import componentFromStreamWithConfigStandalone from "recompose/componentFromStreamWithConfig";
+import mapPropsStreamStandalone from "recompose/mapPropsStream";
+import mapPropsStreamWithConfigStandalone from "recompose/mapPropsStreamWithConfig";
+import createEventHandlerStandalone from "recompose/createEventHandler";
+import createEventHandlerWithConfigStandalone from "recompose/createEventHandlerWithConfig";
+import setObservableConfigStandalone from "recompose/setObservableConfig";
+
 function testMapProps() {
     interface InnerProps {
         inn: number

From a8de5cf374997d843a70cbbbe8c306f048a79d72 Mon Sep 17 00:00:00 2001
From: Bruno Lemos <brunolemos@users.noreply.github.com>
Date: Wed, 18 Apr 2018 15:25:23 -0300
Subject: [PATCH 1347/1382] [react-native] Add missing layout props (#25081)

borderEndWidth, borderStartWidth, display, end, marginEnd, marginStart, paddingEnd, paddingStart, start

https://github.com/facebook/react-native/blob/master/Libraries/StyleSheet/LayoutPropTypes.js
---
 types/react-native/index.d.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index 4e48a85ba2..e42f1f2055 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -544,11 +544,15 @@ export interface FlexStyle {
     alignSelf?: "auto" | FlexAlignType;
     aspectRatio?: number;
     borderBottomWidth?: number;
+    borderEndWidth?: number | string;
     borderLeftWidth?: number;
     borderRightWidth?: number;
+    borderStartWidth?: number | string;
     borderTopWidth?: number;
     borderWidth?: number;
     bottom?: number | string;
+    display?: "none" | "flex";
+    end?: number | string;
     flex?: number;
     flexBasis?: number | string;
     flexDirection?: "row" | "column" | "row-reverse" | "column-reverse";
@@ -560,9 +564,11 @@ export interface FlexStyle {
     left?: number | string;
     margin?: number | string;
     marginBottom?: number | string;
+    marginEnd?: number | string;
     marginHorizontal?: number | string;
     marginLeft?: number | string;
     marginRight?: number | string;
+    marginStart?: number | string;
     marginTop?: number | string;
     marginVertical?: number | string;
     maxHeight?: number | string;
@@ -572,13 +578,16 @@ export interface FlexStyle {
     overflow?: "visible" | "hidden" | "scroll";
     padding?: number | string;
     paddingBottom?: number | string;
+    paddingEnd?: number | string;
     paddingHorizontal?: number | string;
     paddingLeft?: number | string;
     paddingRight?: number | string;
+    paddingStart?: number | string;
     paddingTop?: number | string;
     paddingVertical?: number | string;
     position?: "absolute" | "relative";
     right?: number | string;
+    start?: number | string;
     top?: number | string;
     width?: number | string;
     zIndex?: number;

From b244b1661a205bfb7d15d545c8a0178132b2d75d Mon Sep 17 00:00:00 2001
From: Jarom Loveridge <jarom@timpnet.net>
Date: Wed, 18 Apr 2018 12:25:46 -0600
Subject: [PATCH 1348/1382] Add additional SSL configuration options. (#25079)

http://mongodb.github.io/node-mongodb-native/3.0/api/Server.html
---
 types/mongoose/index.d.ts        | 20 ++++++++++++++++++++
 types/mongoose/mongoose-tests.ts | 19 +++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/types/mongoose/index.d.ts b/types/mongoose/index.d.ts
index d8ffa046e9..723a88bdf8 100644
--- a/types/mongoose/index.d.ts
+++ b/types/mongoose/index.d.ts
@@ -326,6 +326,26 @@ declare module "mongoose" {
     /** How long driver keeps waiting for servers to come back up (default: Number.MAX_VALUE) */
     bufferMaxEntries?: number;
 
+    /** additional SSL configuration options */
+    /** Array of valid certificates either as Buffers or Strings */
+    sslCA?: ReadonlyArray<Buffer | string>;
+    /** Array of revocation certificates either as Buffers or Strings (needs to have a mongod server with ssl support, 2.4 or higher) */
+    sslCRL?: ReadonlyArray<Buffer | string>;
+    /** SSL certificate */
+    sslCert?: Buffer | string;
+    /** SSL private key */
+    sslKey?: Buffer | string;
+    /** SSL Certificate pass phrase */
+    sslPass?: Buffer | string;
+    /** Default: true; Server identity checking during SSL */
+    checkServerIdentity?: boolean | Function;
+    /** String containing the server name requested via TLS SNI. */
+    servername?: string;
+
+    /** Passed directly through to tls.createSecureContext. See https://nodejs.org/dist/latest-v9.x/docs/api/tls.html#tls_tls_createsecurecontext_options for more info. */
+    ciphers?: string;
+    ecdhCurve?: string;
+
     // TODO
     safe?: any;
     fsync?: any;
diff --git a/types/mongoose/mongoose-tests.ts b/types/mongoose/mongoose-tests.ts
index 244658ac9b..d6fbe3cd82 100644
--- a/types/mongoose/mongoose-tests.ts
+++ b/types/mongoose/mongoose-tests.ts
@@ -65,6 +65,25 @@ mongoose.Types.ObjectId;
 mongoose.Types.Decimal128;
 mongoose.version.toLowerCase();
 
+const sslConnections: {[key: string]: mongoose.Connection} = {
+  basic: mongoose.createConnection(connectUri, {ssl: true}),
+  customCA: mongoose.createConnection(
+    connectUri,
+    {
+      ssl: true,
+      sslCA: [new Buffer('ca string')],
+      sslCRL: [new Buffer('crl buffer')],
+      sslCert: 'ssl cert',
+      sslKey: new Buffer('ssl private key'),
+      sslPass: 'ssl password',
+      servername: 'localhost',
+      checkServerIdentity: true,
+      ciphers: 'ciphers',
+      ecdhCurve: 'ecdhCurve',
+    }
+  ),
+};
+
 /*
  * section collection.js
  * http://mongoosejs.com/docs/api.html#collection-js

From 05650a7853db6ebd51879d73f72916b3c3ec36ca Mon Sep 17 00:00:00 2001
From: Jarom Loveridge <jarom@timpnet.net>
Date: Wed, 18 Apr 2018 12:26:14 -0600
Subject: [PATCH 1349/1382] Add `models` hash object. (#25078)

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

diff --git a/types/mongoose/index.d.ts b/types/mongoose/index.d.ts
index 723a88bdf8..7363701f2f 100644
--- a/types/mongoose/index.d.ts
+++ b/types/mongoose/index.d.ts
@@ -72,6 +72,8 @@ declare module "mongoose" {
   export var STATES: any;
   /** The default connection of the mongoose module. */
   export var connection: Connection;
+  /** Models registred on the default mongoose connection. */
+  export var models: { [index: string]: Model<any> };
   /** The node-mongodb-native driver Mongoose uses. */
   export var mongo: typeof mongodb;
   /** The Mongoose version */
@@ -254,6 +256,9 @@ declare module "mongoose" {
     /** A hash of the collections associated with this connection */
     collections: { [index: string]: Collection };
 
+    /** A hash of models registered with this connection */
+    models: { [index: string]: Model<any> };
+
     /**
      * Connection ready state
      * 0 = disconnected
diff --git a/types/mongoose/mongoose-tests.ts b/types/mongoose/mongoose-tests.ts
index d6fbe3cd82..a6fe9f406a 100644
--- a/types/mongoose/mongoose-tests.ts
+++ b/types/mongoose/mongoose-tests.ts
@@ -51,6 +51,7 @@ mongoose.model('Actor', new mongoose.Schema({
 }), 'collectionName', true).find({});
 mongoose.model('Actor').find({});
 mongoose.modelNames()[0].toLowerCase();
+mongoose.models.Actor.findOne({}).exec();
 new (new mongoose.Mongoose(9, 8, 7)).Mongoose(1, 2, 3).connect('');
 mongoose.plugin(cb, {}).connect('');
 mongoose.set('test', 'value');
@@ -131,6 +132,7 @@ conn1.openSet('mongodb://localhost/test', 'db', {
 conn1.close().catch(function (err) {});
 conn1.collection('name').$format(999);
 conn1.model('myModel', new mongoose.Schema({}), 'myCol').find();
+conn1.models.myModel.findOne().exec();
 interface IStatics {
   staticMethod1: (a: number) => string;
 }

From 658cdc180f1b4399019c946d1082c2ac6ab82592 Mon Sep 17 00:00:00 2001
From: Denis Tokarev <github@devlato.com>
Date: Wed, 18 Apr 2018 20:28:34 +0200
Subject: [PATCH 1350/1382] iScroll: Update types for zoom-related
 functionality (#25090)

* iScroll: zoom takes scale as first parameter

iScroll's zoom() method takes scale as the first parameter. The rest parameters are optional according to the documentation:
https://github.com/cubiq/iscroll#zoomscale-x-y-time

* iScroll: Update tests

Update tests for iScroll to reflect the changes

* iScroll: iScroll instance has 'scale' public numeric property
---
 types/iscroll/index.d.ts       | 5 +++--
 types/iscroll/iscroll-tests.ts | 5 +++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/types/iscroll/index.d.ts b/types/iscroll/index.d.ts
index 13cd83cf99..1ba48227fe 100644
--- a/types/iscroll/index.d.ts
+++ b/types/iscroll/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for iScroll 5.2
 // Project: http://cubiq.org/iscroll-5-ready-for-beta-test
-// Definitions by: Christiaan Rakowski <https://github.com/csrakowski>
+// Definitions by: Christiaan Rakowski <https://github.com/csrakowski>, Denis Tokarev <https://github.com/devlato>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 interface IScrollOptions {
@@ -81,6 +81,7 @@ declare class IScroll {
 
 	x: number;
 	y: number;
+	scale: number;
 
 	destroy(): void;
 	refresh(): void;
@@ -92,7 +93,7 @@ declare class IScroll {
 	disable(): void;
 	enable(): void;
 	stop(): void;
-	zoom(x: number, y: number, scale: number, time?: number): void;
+	zoom(scale: number, x?: number, y?: number, time?: number): void;
 	isReady(): boolean;
 
 	// Events
diff --git a/types/iscroll/iscroll-tests.ts b/types/iscroll/iscroll-tests.ts
index 7bb8604937..4d7b71f93a 100644
--- a/types/iscroll/iscroll-tests.ts
+++ b/types/iscroll/iscroll-tests.ts
@@ -24,6 +24,11 @@ myScroll1.scrollTo(0, 100);
 myScroll1.scrollTo(0, 100, 200);
 myScroll1.scrollTo(0, 100, 200, true);
 
+myScroll1.zoom(1);
+myScroll1.zoom(-1);
+myScroll1.zoom(1, 100, 200);
+myScroll1.zoom(1, 200, 250, 100);
+
 myScroll1.scrollToElement('selectedElement');
 myScroll1.scrollToElement('selectedElement', 250);
 

From e1894fb7e98283ece14287b7c928d835abe0e3f1 Mon Sep 17 00:00:00 2001
From: Atanas Atanasov <nascovt@gmail.com>
Date: Wed, 18 Apr 2018 22:32:45 +0300
Subject: [PATCH 1351/1382] upgrade gijgo typings to version 1.9.6 (#25093)

---
 types/gijgo/index.d.ts | 58 ++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 56 insertions(+), 2 deletions(-)

diff --git a/types/gijgo/index.d.ts b/types/gijgo/index.d.ts
index 188d8753b1..611373be11 100644
--- a/types/gijgo/index.d.ts
+++ b/types/gijgo/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Gijgo v1.8.2
+// Type definitions for Gijgo v1.9.6
 // Project: http://gijgo.com
 // Definitions by: Atanas Atanasov <https://github.com/atatanasov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -88,6 +88,7 @@ declare module Types {
         //Configuration options
         autoGenerateColumns?: boolean;
         autoLoad?: boolean;
+        bodyRowHeight?: string;
         columnReorder?: boolean;
         columns?: Array<GridColumn>;
         dataSource?: any;
@@ -97,6 +98,7 @@ declare module Types {
         fontSize?: string;
         grouping?: GridGrouping;
         headerFilter?: GridHeaderFilter;
+        headerRowHeight?: string;
         icons?: GridIcons;
         iconsLibrary?: string;
         inlineEditing?: GridInlineEditing;
@@ -158,7 +160,7 @@ declare module Types {
         edit(id: string): Grid<Entity, Params>;
         expandAll(): Grid<Entity, Params>;
         //get(position: number): Entity; //TODO: rename to getByPosition to avoid conflicts with jquery.get
-        getAll(): Array<Entity>;
+        getAll(includeAllRecords?: boolean): Array<Entity>;
         getById(id: string): Entity;
         getChanges(): Array<Entity>;
         getCSV(includeAllRecords?: boolean): string;
@@ -256,11 +258,16 @@ declare module Types {
         keyboardNavigation?: boolean;
         locale?: string;
         icons?: DatePickerIcons;
+        size?: string;
+        modal?: boolean;
+        header?: boolean;
+        footer?: boolean;
 
         //Events
         change?: (e: any) => any;
         open?: (e: any) => any;
         close?: (e: any) => any;
+        select?: (e: any, type: string) => any;
     }
 
     interface DatePicker extends JQuery {
@@ -285,6 +292,7 @@ declare module Types {
         uiLibrary?: string;
         iconsLibrary?: string;
         icons?: DropDownIcons;
+        placeholder?: string;
 
         //Events
         change?: (e: any) => any;
@@ -325,11 +333,13 @@ declare module Types {
         value?: string;
         mode?: string;
         locale?: string;
+        size?: string;
 
         //Events
         change?: (e: any) => any;
         open?: (e: any) => any;
         close?: (e: any) => any;
+        select?: (e: any, type: string) => any;
     }
 
     interface TimePicker extends JQuery {
@@ -339,6 +349,45 @@ declare module Types {
         value(value?: string):  string | TimePicker;
     }
 
+    // DateTimePicker
+    interface DateTimePickerSettings {
+        datepicker?: Types.DatePickerSettings;
+        footer?: boolean;
+        format?: string;
+        locale?: string;
+        modal?: boolean;
+        size?: string;
+        uiLibrary?: string;
+        value?: string;
+        width?: number;
+
+        //Events
+        change?: (e: any) => any;
+    }
+
+    interface DateTimePicker extends JQuery {
+        destroy(): void;
+        value(value?: string):  string | DateTimePicker;
+    }
+
+    // Slider
+    interface SliderSettings {
+        min?: number;
+        max?: number;
+        uiLibrary?: string;
+        value?: string;
+        width?: number;
+
+        //Events
+        change?: (e: any) => any;
+        slide?: (e: any, value: number) => any;
+    }
+
+    interface Slider extends JQuery {
+        destroy(): void;
+        value(value?: string):  string | Slider;
+    }
+
     // Tree
     interface TreeIcons {
         expand?: string;
@@ -397,6 +446,7 @@ declare module Types {
         render(response: any): any;
         addNode(data: any, parentNode: any, position: number): Tree;
         removeNode(node: any): Tree;
+        updateNode(id: string, record: any) : Tree;
         destroy(): void;
         expand(node: any, cascade: boolean): Tree;
         collapse(node: any, cascade: boolean) : Tree;
@@ -444,5 +494,9 @@ interface JQuery {
 
     timepicker(settings: Types.TimePickerSettings): Types.TimePicker;
 
+    datetimepicker(settings: Types.DateTimePickerSettings): Types.DateTimePicker;
+
+    slider(settings: Types.SliderSettings): Types.Slider;
+
     tree(settings: Types.TreeSettings): Types.Tree;
 }

From 6b7871531fd192478830c7bf5b06443bd9b87ad8 Mon Sep 17 00:00:00 2001
From: Pupskuchen <Pupskuchen@users.noreply.github.com>
Date: Wed, 18 Apr 2018 21:33:39 +0200
Subject: [PATCH 1352/1382] iframe-resizer: fix options property type (#24970)

* fix iframe-resizer options property type

add string as valid value type for bodyMargin

* iframe-resizer: change spacing
---
 types/iframe-resizer/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/iframe-resizer/index.d.ts b/types/iframe-resizer/index.d.ts
index 70d9c1d4f3..3858cab780 100644
--- a/types/iframe-resizer/index.d.ts
+++ b/types/iframe-resizer/index.d.ts
@@ -31,7 +31,7 @@ export interface IFrameOptions {
    * Override the default body margin style in the iFrame. A string can be any valid value for the
    * CSS margin attribute, for example '8px 3em'. A number value is converted into px.
    */
-  bodyMargin?: number;
+  bodyMargin?: number | string;
   /**
    * When set to true, only allow incoming messages from the domain listed in the src property of the iFrame tag.
    * If your iFrame navigates between different domains, ports or protocols; then you will need to

From 38c005479f4b4e392b212a6a8cdc7315574c239f Mon Sep 17 00:00:00 2001
From: Troy Lamerton <troy.lamerton@gmail.com>
Date: Wed, 18 Apr 2018 21:34:15 +0200
Subject: [PATCH 1353/1382] add scope(s) to authorization code flow (#25096)

---
 types/simple-oauth2/index.d.ts             | 16 +++++++++-------
 types/simple-oauth2/simple-oauth2-tests.ts |  3 ++-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/types/simple-oauth2/index.d.ts b/types/simple-oauth2/index.d.ts
index b93bbc229f..f5f7659b99 100644
--- a/types/simple-oauth2/index.d.ts
+++ b/types/simple-oauth2/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for simple-oauth2 1.1
 // Project: https://github.com/lelylan/simple-oauth2
-// Definitions by: [Michael Müller] <https://github.com/mad-mike>
+// Definitions by: Michael Müller <https://github.com/mad-mike>,
+//                 Troy Lamerton <https://github.com/troy-lamerton>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -64,6 +65,7 @@ export type AuthorizationCode = string;
 export interface AuthorizationTokenConfig {
     code: AuthorizationCode;
     redirect_uri: string;
+    scope?: string | string[];
 }
 
 export interface PasswordTokenConfig {
@@ -71,13 +73,13 @@ export interface PasswordTokenConfig {
     username: string;
     /** A string that represents the registered password. */
     password: string;
-    /** A string that represents the application privileges */
-    scope: string;
+    /** A string or array of strings that represents the application privileges */
+    scope: string | string[];
 }
 
 export interface ClientCredentialTokenConfig {
     /** A string that represents the application privileges */
-    scope?: string;
+    scope?: string | string[];
 }
 
 export interface OAuthClient {
@@ -89,9 +91,9 @@ export interface OAuthClient {
         authorizeURL(params?: {
             /** A string that represents the registered application URI where the user is redirected after authentication */
             redirect_uri?: string,
-            /** A String that represents the application privileges */
-            scope?: string,
-            /** A String that represents an option opaque value used by the client to main the state between the request and the callback */
+            /** A string or array of strings that represents the application privileges */
+            scope?: string | string[],
+            /** A string that represents an option opaque value used by the client to main the state between the request and the callback */
             state?: string
         }): string,
 
diff --git a/types/simple-oauth2/simple-oauth2-tests.ts b/types/simple-oauth2/simple-oauth2-tests.ts
index 713d930f23..f83a616681 100644
--- a/types/simple-oauth2/simple-oauth2-tests.ts
+++ b/types/simple-oauth2/simple-oauth2-tests.ts
@@ -32,7 +32,8 @@ const oauth2 = oauth2lib.create(credentials);
     // Get the access token object (the authorization code is given from the previous step).
     const tokenConfig = {
         code: '<code>',
-        redirect_uri: 'http://localhost:3000/callback'
+        redirect_uri: 'http://localhost:3000/callback',
+        scope: ['<scope1>', '<scope2>']
     };
 
     // Callbacks

From 589a7cff2151802998340fc5ef0f385da4503766 Mon Sep 17 00:00:00 2001
From: Hendrik Schaeidt <he.schaeidt@gmail.com>
Date: Wed, 18 Apr 2018 21:34:35 +0200
Subject: [PATCH 1354/1382] linkify-it: fix typings to reflect the api (#25102)

* the constructor accepts as first parameter or the SchemaRules or the
Options
* the validate callback can be either a string, RegExp or Validate type
* Rule only accepts a string or a FullRule, where when a string is set,
it applies the same rules as the given schema name
* add more tests to showcase and type test the implementation
---
 types/linkify-it/index.d.ts          | 74 +++++++++++++++-------------
 types/linkify-it/linkify-it-tests.ts | 44 +++++++++++++----
 2 files changed, 75 insertions(+), 43 deletions(-)

diff --git a/types/linkify-it/index.d.ts b/types/linkify-it/index.d.ts
index f361d88bba..e3696e09c4 100644
--- a/types/linkify-it/index.d.ts
+++ b/types/linkify-it/index.d.ts
@@ -4,47 +4,55 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare const LinkifyIt: {
-  (schemas?: LinkifyIt.SchemaRules, options?: LinkifyIt.Options): LinkifyIt.LinkifyIt;
-  new (schemas?: LinkifyIt.SchemaRules, options?: LinkifyIt.Options): LinkifyIt.LinkifyIt;
+    (
+        schemas?: LinkifyIt.SchemaRules | LinkifyIt.Options,
+        options?: LinkifyIt.Options
+    ): LinkifyIt.LinkifyIt;
+    new (
+        schemas?: LinkifyIt.SchemaRules | LinkifyIt.Options,
+        options?: LinkifyIt.Options
+    ): LinkifyIt.LinkifyIt;
 };
 
 declare namespace LinkifyIt {
-  interface FullRule {
-    validate(text: string, pos: number, self: LinkifyIt): number;
-    normalize?(match: string): string;
-  }
+    type Validate = (text: string, pos: number, self: LinkifyIt) => number;
 
-  type Rule = string | RegExp | FullRule;
+    interface FullRule {
+        validate: string | RegExp | Validate;
+        normalize?(match: string): string;
+    }
 
-  interface SchemaRules {
-    [schema: string]: Rule;
-  }
+    type Rule = string | FullRule;
 
-  interface Options {
-    fuzzyLink?: boolean;
-    fuzzyIP?: boolean;
-    fuzzyEmail?: boolean;
-  }
+    interface SchemaRules {
+        [schema: string]: Rule;
+    }
 
-  interface Match {
-    index: number;
-    lastIndex: number;
-    raw: string;
-    schema: string;
-    text: string;
-    url: string;
-  }
+    interface Options {
+        fuzzyLink?: boolean;
+        fuzzyIP?: boolean;
+        fuzzyEmail?: boolean;
+    }
 
-  interface LinkifyIt {
-    add(schema: string, rule: Rule): LinkifyIt;
-    match(text: string): Match[];
-    normalize(raw: string): string;
-    pretest(text: string): boolean;
-    set(options: Options): LinkifyIt;
-    test(text: string): boolean;
-    testSchemaAt(text: string, schemaName: string, pos: number): number;
-    tlds(list: string | string[], keepOld?: boolean): LinkifyIt;
-  }
+    interface Match {
+        index: number;
+        lastIndex: number;
+        raw: string;
+        schema: string;
+        text: string;
+        url: string;
+    }
+
+    interface LinkifyIt {
+        add(schema: string, rule: Rule): LinkifyIt;
+        match(text: string): Match[];
+        normalize(raw: string): string;
+        pretest(text: string): boolean;
+        set(options: Options): LinkifyIt;
+        test(text: string): boolean;
+        testSchemaAt(text: string, schemaName: string, pos: number): number;
+        tlds(list: string | string[], keepOld?: boolean): LinkifyIt;
+    }
 }
 
 export = LinkifyIt;
diff --git a/types/linkify-it/linkify-it-tests.ts b/types/linkify-it/linkify-it-tests.ts
index c4366321cf..1768bd5efb 100644
--- a/types/linkify-it/linkify-it-tests.ts
+++ b/types/linkify-it/linkify-it-tests.ts
@@ -1,24 +1,48 @@
-import LinkifyIt = require('linkify-it');
+import LinkifyIt = require("linkify-it");
+
+// constructor formats
+const linkifier = new LinkifyIt();
+const withOptions = new LinkifyIt({ fuzzyLink: false });
+const withSchema = new LinkifyIt(
+    {
+        "myCustom:": {
+            validate: /23/
+        },
+        "other:": {
+            validate: (text, pos, self) => 42
+        },
+        "git:": "http:"
+    },
+    {
+        fuzzyIP: false,
+        fuzzyLink: false
+    }
+);
 
 // fluent interface
-const linkifier = new LinkifyIt();
-
 linkifier
-    .add('git:', 'http:')
+    .add("git:", "http:")
     .set({ fuzzyIP: true })
-    .tlds('onion', true)
+    .tlds("onion", true)
     .test("https://github.com/DefinitelyTyped/DefinitelyTyped/");
 
 // match
-const matches = linkifier.match("https://github.com/DefinitelyTyped/DefinitelyTyped/");
-matches.forEach(({index, lastIndex, raw, schema, text, url}) => {});
+const matches = linkifier.match(
+    "https://github.com/DefinitelyTyped/DefinitelyTyped/"
+);
+matches.forEach(({ index, lastIndex, raw, schema, text, url }) => {});
 
 // complex rule
-linkifier.add('@', {
+linkifier.add("@", {
     validate: (text, pos, self) => {
         return 42;
     },
-    normalize: (match) => {
-        return 'forty-two';
+    normalize: match => {
+        return "forty-two";
     }
 });
+
+// regexp rule
+linkifier.add("custom:", {
+    validate: /^\/\/\d+/
+});

From 31b8246a65d5485ef71ab1f2a31db568044e178b Mon Sep 17 00:00:00 2001
From: Clark Stevenson <a.scotsman@gmail.com>
Date: Wed, 18 Apr 2018 20:36:54 +0100
Subject: [PATCH 1355/1382] Update Pixi.js to 4.7.3 (#25091)

---
 types/pixi.js/index.d.ts | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/types/pixi.js/index.d.ts b/types/pixi.js/index.d.ts
index f503867b5b..d4f1097601 100644
--- a/types/pixi.js/index.d.ts
+++ b/types/pixi.js/index.d.ts
@@ -319,7 +319,7 @@ declare namespace PIXI {
         buttonMode: boolean;
         cursor: string;
         trackedPointers(): { [key: number]: interaction.InteractionTrackingData; };
-        // depricated
+        // Deprecated
         defaultCursor: string;
         // end interactive target
 
@@ -775,12 +775,12 @@ declare namespace PIXI {
         legacy?: boolean;
 
         /**
-         * Depricated
+         * Deprecated
          */
         context?: WebGLRenderingContext;
 
         /**
-         * Depricated
+         * Deprecated
          */
         autoResize?: boolean;
 
@@ -1116,6 +1116,8 @@ declare namespace PIXI {
     }
     class FilterManager extends WebGLManager {
         constructor(renderer: WebGLRenderer);
+        protected _screenWidth: number;
+        protected _screenHeight: number;
         gl: WebGLRenderingContext;
         quad: Quad;
         stack: FilterManagerStackItem[];
@@ -1123,6 +1125,7 @@ declare namespace PIXI {
         shaderCache: any;
         filterData: any;
 
+        onPrerender(): void;
         pushFilter(target: RenderTarget, filters: Array<Filter<any>>): void;
         popFilter(): void;
         applyFilter(shader: glCore.GLShader | Filter<any>, inputTarget: RenderTarget, outputTarget: RenderTarget, clear?: boolean): void;
@@ -1185,7 +1188,7 @@ declare namespace PIXI {
         // name is set by pixi if uniforms were automatically extracted from shader code, but not used anywhere
         name?: string;
     }
-    type UniformDataMap<U> = {[K in keyof U]: UniformData<U[K]>};
+    type UniformDataMap<U> = { [K in keyof U]: UniformData<U[K]> };
     class Filter<U extends Object> {
         constructor(vertexSrc?: string, fragmentSrc?: string, uniforms?: UniformDataMap<U>);
 
@@ -2041,7 +2044,7 @@ declare namespace PIXI {
             cursor: string;
             trackedPointers(): { [key: number]: InteractionTrackingData; };
 
-            // depricated
+            // Deprecated
             defaultCursor: string;
         }
         interface InteractionTrackingData {
@@ -2159,7 +2162,7 @@ declare namespace PIXI {
             protected normalizeToPointerData(event: TouchEvent | MouseEvent | PointerEvent): PointerEvent[];
             destroy(): void;
 
-            // depricated
+            // Deprecated
             defaultCursorStyle: string;
             currentCursorStyle: string;
         }
@@ -2554,7 +2557,8 @@ declare namespace PIXI {
             protected _maxSize: number;
             protected _batchSize: number;
             protected _glBuffers: { [n: number]: WebGLBuffer; };
-            protected _bufferToUpdate: number;
+            protected _bufferUpdateIDs: number[];
+            protected _updateID: number;
             interactiveChildren: boolean;
             blendMode: number;
             autoSize: boolean;
@@ -2582,6 +2586,8 @@ declare namespace PIXI {
             dynamicData: any;
             dynamicDataUint32: any;
 
+            protected _updateID: number;
+
             destroy(): void;
         }
         interface ParticleRendererProperty {
@@ -2867,6 +2873,8 @@ declare namespace PIXI {
         function sign(n: number): number;
         function removeItems<T>(arr: T[], startIdx: number, removeCount: number): void;
         function correctBlendMode(blendMode: number, premultiplied: boolean): number;
+        function clearTextureCache(): void;
+        function destroyTextureCache(): void;
         function premultiplyTint(tint: number, alpha: number): number;
         function premultiplyRgba(rgb: Float32Array | number[], alpha: number, out?: Float32Array, premultiply?: boolean): Float32Array;
         function premultiplyTintToRgba(tint: number, alpha: number, out?: Float32Array, premultiply?: boolean): Float32Array;

From 3cb9ea62c06f483ed432a80876b0b6be9f683ca3 Mon Sep 17 00:00:00 2001
From: Vytautas Strimaitis <vstrimaitis@gmail.com>
Date: Wed, 18 Apr 2018 22:44:05 +0300
Subject: [PATCH 1356/1382] Add type definitions for react-credit-cards
 (#25106)

* Added type definitions for react-credit-cards

* Lint fixes

* Use ReadonlyArray
---
 types/react-credit-cards/index.d.ts           | 31 +++++++++++++++++++
 .../react-credit-cards-tests.tsx              | 22 +++++++++++++
 types/react-credit-cards/tsconfig.json        | 25 +++++++++++++++
 types/react-credit-cards/tslint.json          |  1 +
 4 files changed, 79 insertions(+)
 create mode 100644 types/react-credit-cards/index.d.ts
 create mode 100644 types/react-credit-cards/react-credit-cards-tests.tsx
 create mode 100644 types/react-credit-cards/tsconfig.json
 create mode 100644 types/react-credit-cards/tslint.json

diff --git a/types/react-credit-cards/index.d.ts b/types/react-credit-cards/index.d.ts
new file mode 100644
index 0000000000..bc9a8fbf51
--- /dev/null
+++ b/types/react-credit-cards/index.d.ts
@@ -0,0 +1,31 @@
+// Type definitions for react-credit-cards 0.7
+// Project: https://github.com/amarofashion/react-credit-cards
+// Definitions by: Vytautas Strimaitis <https://github.com/vstrimaitis>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.7
+
+import * as React from "react";
+
+export interface CallbackArgument {
+    isValid: boolean;
+    type: { issuer: string; maxLength: number; };
+}
+
+export interface ReactCreditCardProps {
+    acceptedCards?: ReadonlyArray<string>;
+    callback?: (type: CallbackArgument, isValid: boolean) => void;
+    cvc: string | number;
+    expiry: string | number;
+    focused?: "name" | "number" | "expiry" | "cvc";
+    issuer?: string;
+    locale?: { valid: string; };
+    name: string;
+    number: string | number;
+    placeholders?: { name: string; };
+    preview?: boolean;
+}
+
+declare class ReactCreditCard extends React.Component<ReactCreditCardProps, never> {
+}
+
+export default ReactCreditCard;
diff --git a/types/react-credit-cards/react-credit-cards-tests.tsx b/types/react-credit-cards/react-credit-cards-tests.tsx
new file mode 100644
index 0000000000..8e1a92f002
--- /dev/null
+++ b/types/react-credit-cards/react-credit-cards-tests.tsx
@@ -0,0 +1,22 @@
+import * as React from "react";
+import Card, { CallbackArgument, ReactCreditCardProps } from "react-credit-cards";
+
+const defaultProps: ReactCreditCardProps = {
+    acceptedCards: [],
+    callback: (type: CallbackArgument, isValid: boolean) => {},
+    cvc: "123",
+    expiry: "04/18",
+    focused: "number",
+    issuer: "visa",
+    locale: {valid: "valid through"},
+    name: "Name Surname",
+    number: "4111111111111111",
+    placeholders: {name: "YOUR NAME"},
+    preview: true
+};
+
+class CardTest extends React.Component {
+    render() {
+        return (<Card {...defaultProps} />);
+    }
+}
diff --git a/types/react-credit-cards/tsconfig.json b/types/react-credit-cards/tsconfig.json
new file mode 100644
index 0000000000..b011d560b5
--- /dev/null
+++ b/types/react-credit-cards/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react"
+    },
+    "files": [
+        "index.d.ts",
+        "react-credit-cards-tests.tsx"
+    ]
+}
diff --git a/types/react-credit-cards/tslint.json b/types/react-credit-cards/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-credit-cards/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From eabc8ca7627c57a7de6ce798c3f1671c4535fe6c Mon Sep 17 00:00:00 2001
From: Su-Shing Chen <Shingyx@users.noreply.github.com>
Date: Thu, 19 Apr 2018 07:45:15 +1200
Subject: [PATCH 1357/1382] [@types/when] Make when.js promises compatible with
 native promises (#24904)

* Make when.js promises compatible with native promises

* Stricter compiler options and fix revealed issues

- Remove optional parameters from callbacks
- Replace `Number` type with `number`
- Improve type checking of when.settle and promise.inspect

* Add stricter types and backwards compatibility

* Minor renaming
---
 types/when/index.d.ts    | 70 ++++++++++++++++++++++++++++------------
 types/when/tsconfig.json |  6 ++--
 types/when/when-tests.ts | 70 ++++++++++++++++++++++++++++++++++++----
 3 files changed, 115 insertions(+), 31 deletions(-)

diff --git a/types/when/index.d.ts b/types/when/index.d.ts
index a459e031a1..3736cfa7dd 100644
--- a/types/when/index.d.ts
+++ b/types/when/index.d.ts
@@ -109,7 +109,7 @@ declare namespace When {
      * @returns a promise that will fulfill with an array of mapped values
      *  or reject if any input promise rejects.
      */
-    function map<T>(promisesOrValues: any[], mapFunc: (value: any, index?: Number) => any): Promise<T>;
+    function map<T>(promisesOrValues: any[], mapFunc: (value: any, index: number) => any): Promise<T>;
 
     /**
      * Traditional reduce function, similar to `Array.prototype.reduce()`, but
@@ -118,10 +118,10 @@ declare namespace When {
      * be a promise for the starting value.
      * @param promisesOrValues array or promise for an array of anything,
      *      may contain a mix of promises and values.
-     * @param reduceFunc function(accumulated:*, x:*, index:Number):*} f reduce function
+     * @param reduceFunc function(accumulated:*, x:*, index:number):*} f reduce function
      * @returns a promise that will resolve to the final reduced value
      */
-    function reduce<T>(promisesOrValues: any[], reduceFunc: (reduction: T, value: any, index?: Number) => T | Promise<T>, initialValue: T): Promise<T>;
+    function reduce<T>(promisesOrValues: any[], reduceFunc: (reduction: T, value: any, index: number) => T | Promise<T>, initialValue: T): Promise<T>;
 
     /**
      * Traditional reduce function, similar to `Array.prototype.reduceRight()`, but
@@ -130,22 +130,38 @@ declare namespace When {
      * be a promise for the starting value.
      * @param promisesOrValues array or promise for an array of anything,
      *      may contain a mix of promises and values.
-     * @param reduceFunc function(accumulated:*, x:*, index:Number):*} f reduce function
+     * @param reduceFunc function(accumulated:*, x:*, index:number):*} f reduce function
      * @returns a promise that will resolve to the final reduced value
      */
-    function reduceRight<T>(promisesOrValues: any[], reduceFunc: (reduction: T, value: any, index?: Number) => T | Promise<T>, initialValue: T): Promise<T>;
+    function reduceRight<T>(promisesOrValues: any[], reduceFunc: (reduction: T, value: any, index: number) => T | Promise<T>, initialValue: T): Promise<T>;
 
     /**
-     * Describes the status of a promise.
+     * Describes the outcome of a promise.
      * state may be one of:
      * "fulfilled" - the promise has resolved
-     * "pending" - the promise is still pending to resolve/reject
      * "rejected" - the promise has rejected
      */
-    interface Descriptor<T> {
-        state: string;
-        value?: T;
-        reason?: any;
+    type Descriptor<T> = FulfilledDescriptor<T> | RejectedDescriptor;
+
+    /**
+     * Snapshot which describes the status of a promise.
+     * state may be one of:
+     * "fulfilled" - the promise has resolved
+     * "rejected" - the promise has rejected
+     * "pending" - the promise is still pending to resolve/reject
+     */
+    type Snapshot<T> = FulfilledDescriptor<T> | RejectedDescriptor | PendingDescriptor;
+
+    interface FulfilledDescriptor<T> {
+        state: 'fulfilled';
+        value: T;
+    }
+    interface RejectedDescriptor {
+        state: 'rejected';
+        reason: any;
+    }
+    interface PendingDescriptor {
+        state: 'pending';
     }
 
     /**
@@ -269,7 +285,26 @@ declare namespace When {
         // be a constructor with prototype set to an instance of Error.
         otherwise<U>(exceptionType: any, onRejected?: (reason: any) => U | Promise<U>): Promise<U>;
 
-        then<U>(onFulfilled: (value: T) => U | Promise<U>, onRejected?: (reason: any) => U | Promise<U>, onProgress?: (update: any) => void): Promise<U>;
+        then(
+            onFulfilled?: ((value: T) => T | Thenable<T>) | undefined | null,
+            onRejected?: ((reason: any) => T | Thenable<T>) | undefined | null,
+            onProgress?: (update: any) => void
+        ): Promise<T>;
+        then<TResult>(
+            onFulfilled: ((value: T) => TResult | Thenable<TResult>),
+            onRejected?: ((reason: any) => TResult | Thenable<TResult>) | undefined | null,
+            onProgress?: (update: any) => void
+        ): Promise<TResult>;
+        then<TResult>(
+            onFulfilled: ((value: T) => T | Thenable<T>) | undefined | null,
+            onRejected: ((reason: any) => TResult | Thenable<TResult>),
+            onProgress?: (update: any) => void
+        ): Promise<T | TResult>;
+        then<TResult1, TResult2>(
+            onFulfilled: ((value: T) => TResult1 | Thenable<TResult1>),
+            onRejected: ((reason: any) => TResult2 | Thenable<TResult2>),
+            onProgress?: (update: any) => void
+        ): Promise<TResult1 | TResult2>;
 
         spread<T>(onFulfilled: _.Fn0<Promise<T> | T>): Promise<T>;
         spread<A1, T>(onFulfilled: _.Fn1<A1, Promise<T> | T>): Promise<T>;
@@ -284,13 +319,7 @@ declare namespace When {
     }
 
     interface Thenable<T> {
-        then<U>(onFulfilled: (value: T) => U, onRejected?: (reason: any) => U): Thenable<U>;
-    }
-
-    interface Snapshot<T> {
-        state: string;
-        value?: T;
-        reason?: any;
+        then<U>(onFulfilled?: (value: T) => U, onRejected?: (reason: any) => U): Thenable<U>;
     }
 }
 
@@ -369,8 +398,7 @@ declare module "when/node" {
 
     interface Resolver<T> {
         reject(reason: any): void;
-        resolve(value?: T): void;
-        resolve(value?: when.Promise<T>): void;
+        resolve(value?: T | when.Promise<T>): void;
     }
 
     function createCallback<TArg>(resolver: Resolver<TArg>): (err: any, arg: TArg) => void;
diff --git a/types/when/tsconfig.json b/types/when/tsconfig.json
index f903b8862c..2162d713fc 100644
--- a/types/when/tsconfig.json
+++ b/types/when/tsconfig.json
@@ -6,8 +6,8 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
-        "strictFunctionTypes": false,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -20,4 +20,4 @@
         "index.d.ts",
         "when-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/when/when-tests.ts b/types/when/when-tests.ts
index 63fbba2234..d44752b950 100644
--- a/types/when/when-tests.ts
+++ b/types/when/when-tests.ts
@@ -10,13 +10,17 @@ class ForeignPromise<T> {
 	constructor(private readonly value: T) {
 	}
 
-	then<U>(onFulfilled: (value: T) => U, onRejected?: (reason: any) => U) { return new ForeignPromise<U>(onFulfilled(this.value)); }
+	then<U>(onFulfilled?: (value: T) => U, onRejected?: (reason: any) => U): ForeignPromise<U>
+	then(onFulfilled?: (value: T) => T, onRejected?: (reason: any) => T): ForeignPromise<T> {
+		return new ForeignPromise(onFulfilled ? onFulfilled(this.value) : this.value);
+	}
 };
 
 var promise: when.Promise<number>;
 var foreign = new ForeignPromise<number>(1);
 var error = new Error("boom!");
 var example: () => void;
+var native: Promise<number>;
 
 /* * * * * * *
  *   Core    *
@@ -100,8 +104,16 @@ when.all<number[]>([when(1), when(2), when(3)]).then(results => {
 when.map<number[]>([when(1), 2, 3], (num: number, index: number) => num * index).then((results) => {
 	return results.reduce((r, x) => r + x, 0);
 });
+when.map<number[]>([when(1), 2, 3], (num: number) => num * num).then((results) => {
+	return results.reduce((r, x) => r + x, 0);
+});
 
 /* when.reduce(arr, reduceFunc, initialValue) */
+when.reduce<number>([when(1), 2, 3], (reduction: number, value: number, index: number) => {
+	return reduction += value * index;
+}, 0).then((result: number) => {
+	return result;
+});
 when.reduce<number>([when(1), 2, 3], (reduction: number, value: number) => {
 	return reduction += value;
 }, 0).then((result: number) => {
@@ -109,6 +121,12 @@ when.reduce<number>([when(1), 2, 3], (reduction: number, value: number) => {
 });
 
 /* when.reduceRight(arr, reduceFunc, initialValue) */
+when.reduceRight<number>([when(1), 2, 3], (reduction: number, value: number, index: number) => {
+	return when(value * index)
+	.then((v) => reduction += v);
+}, 0).then((result: number) => {
+	return result;
+});
 when.reduceRight<number>([when(1), 2, 3], (reduction: number, value: number) => {
 	return when(value)
 	.then((v) => reduction += v);
@@ -118,7 +136,24 @@ when.reduceRight<number>([when(1), 2, 3], (reduction: number, value: number) =>
 
 /* when.settle(arr) */
 when.settle<number>([when(1), when(2), when.reject(new Error("Foo"))]).then(descriptors => {
-	return descriptors.filter(d => d.state === 'rejected').reduce((r, d) => r + d.value, 0);
+	return descriptors.reduce((r, d) => {
+		if (d.state === 'fulfilled') {
+			return r + d.value;
+		} else {
+			console.error(d.reason);
+			return r;
+		}
+	}, 0);
+});
+when.settle<number>([when(1), when(2), when.reject(new Error("Foo"))]).then(descriptors => {
+	return descriptors.reduce((r, d) => {
+		if (d.state === 'rejected') {
+			console.error(d.reason);
+			return r;
+		} else {
+			return r + d.value;
+		}
+	}, 0);
 });
 
 /* when.iterate(f, predicate, handler, seed) */
@@ -174,13 +209,16 @@ deferred.reject(error);
 
 when(1).done();
 when(1).done((val: number) => console.log(val));
+when(1).done(undefined, (err: any) => console.log(err));
 when(1).done((val: number) => console.log(val), (err: any) => console.log(err));
 
 /* promise.then(onFulfilled) */
 
+promise = when(1).then();
 promise = when(1).then((val: number) => val + val);
 promise = when(1).then((val: number) => when(val + val));
 
+promise = when(1).then(undefined, (err: any) => 2);
 promise = when(1).then((val: number) => val + val, (err: any) => 2);
 promise = when(1).then((val: number) => when(val + val), (err: any) => 2);
 
@@ -261,6 +299,17 @@ var status: {
 
 status = when(1).inspect()
 
+var status2: when.Snapshot<number>;
+
+status2 = when(1).inspect();
+if (status2.state === 'fulfilled') {
+	console.log(status2.value + 2);
+} else if (status2.state === 'rejected') {
+	console.log(status2.reason);
+} else {
+	console.log(status2.state === 'pending');
+}
+
 /* promise.with(thisArg) */
 
 promise = when(1).with(2);
@@ -416,8 +465,8 @@ example = function () {
 /* node.liftCallback */
 
 example = function () {
-	var fetchData: (key: string) => when.Promise<number>;
-	var handleData: (err: any, result: number) => void;
+	var fetchData: (key: string) => when.Promise<number> = () => when(1);
+	var handleData: (err: any, result: number) => void = () => undefined;
 
 	var handlePromisedData: (result: when.Promise<number>) => when.Promise<number>;
 	handlePromisedData = nodefn.liftCallback(handleData);
@@ -428,8 +477,8 @@ example = function () {
 /* node.bindCallback */
 
 example = function () {
-	var fetchData: (key: string) => when.Promise<number>;
-	var handleData: (err: any, result: number) => void;
+	var fetchData: (key: string) => when.Promise<number> = () => when(1);
+	var handleData: (err: any, result: number) => void = () => undefined;
 
 	nodefn.bindCallback(fetchData('thing'), handleData);
 };
@@ -437,9 +486,16 @@ example = function () {
 /* node.createCallback */
 
 example = function () {
-	when.promise((resolve, reject) =>
+	when.promise<number>((resolve, reject) =>
 			nodeFn2(1, '2', nodefn.createCallback({ resolve: resolve, reject: reject })))
 		.then(
 			(value: number) => console.log(value),
 			(err: any) => console.error(err));
 };
+
+/* * * * * * * * * * *
+ *  Native Promises  *
+ * * * * * * * * * * */
+
+native = Promise.resolve(when(1));
+native = Promise.all([when(1)]).then(([x]) => x);

From 8d24d22453819922bd870c1967528bd7672fec3e Mon Sep 17 00:00:00 2001
From: Justin Beckwith <justin.beckwith@gmail.com>
Date: Wed, 18 Apr 2018 15:56:48 -0400
Subject: [PATCH 1358/1382] add d.ts for pumpify (#25049)

* add d.ts for pumpify

* pr feedback
---
 types/pumpify/index.d.ts       | 17 +++++++++++++++++
 types/pumpify/pumpify-tests.ts | 14 ++++++++++++++
 types/pumpify/tsconfig.json    | 24 ++++++++++++++++++++++++
 types/pumpify/tslint.json      |  1 +
 4 files changed, 56 insertions(+)
 create mode 100644 types/pumpify/index.d.ts
 create mode 100644 types/pumpify/pumpify-tests.ts
 create mode 100644 types/pumpify/tsconfig.json
 create mode 100644 types/pumpify/tslint.json

diff --git a/types/pumpify/index.d.ts b/types/pumpify/index.d.ts
new file mode 100644
index 0000000000..474484b95b
--- /dev/null
+++ b/types/pumpify/index.d.ts
@@ -0,0 +1,17 @@
+// Type definitions for pumpify 1.4
+// Project: https://github.com/mafintosh/pumpify
+// Definitions by: Justin Beckwith <https://github.com/JustinBeckwith>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import { Stream, Duplex } from 'stream';
+
+export = pumpify;
+
+declare class pumpify extends Duplex {
+  constructor();
+  setPipeline(...args: Stream[]): void;
+}
+
+declare namespace pumpify {}
diff --git a/types/pumpify/pumpify-tests.ts b/types/pumpify/pumpify-tests.ts
new file mode 100644
index 0000000000..d4dff3bd70
--- /dev/null
+++ b/types/pumpify/pumpify-tests.ts
@@ -0,0 +1,14 @@
+import pumpify from 'pumpify';
+import { Duplex, Transform, PassThrough } from 'stream';
+
+class Pumpy extends pumpify {
+  constructor() {
+    super();
+    const dup1 = new Duplex();
+    const dup2 = new Transform();
+    this.setPipeline(dup1, dup2);
+  }
+}
+
+const pumpy = new Pumpy();
+pumpy.pipe(new PassThrough());
diff --git a/types/pumpify/tsconfig.json b/types/pumpify/tsconfig.json
new file mode 100644
index 0000000000..1404589863
--- /dev/null
+++ b/types/pumpify/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es5"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "allowSyntheticDefaultImports": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "pumpify-tests.ts"
+    ]
+}
diff --git a/types/pumpify/tslint.json b/types/pumpify/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/pumpify/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From fdcf6d8469ec75bf11c9239afca16bf7bb1c9662 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Majchrzak?= <rafal2228@gmail.com>
Date: Thu, 19 Apr 2018 00:32:37 +0200
Subject: [PATCH 1359/1382] feature(zapier-core-platform): add missing methods
 to Z object (#25101)

---
 types/zapier-platform-core/index.d.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/types/zapier-platform-core/index.d.ts b/types/zapier-platform-core/index.d.ts
index 474de4f0fd..2f0c11bd01 100644
--- a/types/zapier-platform-core/index.d.ts
+++ b/types/zapier-platform-core/index.d.ts
@@ -58,6 +58,8 @@ export interface Z {
             new (message?: string): RefreshAuthError;
         };
     };
+    stashFile: (promise: Promise<HttpResponse>, knownLength?: number | string, filename?: string, contentType?: string) => Promise<string>;
+    dehydrate: <T>(callback: (z: Z, bundle: Bundle<T>) => any, inputData: T) => string;
 }
 
 export interface AuthData {

From f8e09cf492816cc3c7d7d554146ccfc23c9ef727 Mon Sep 17 00:00:00 2001
From: Dmitrii Sorin <info@staypositive.ru>
Date: Thu, 19 Apr 2018 08:33:10 +1000
Subject: [PATCH 1360/1382] Describe loadFiles method and suite property
 (#24982)

* Document loadFiles method

* Document suite property

* Update index.d.ts
---
 types/mocha/index.d.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/types/mocha/index.d.ts b/types/mocha/index.d.ts
index 98443f5569..7817e205c3 100644
--- a/types/mocha/index.d.ts
+++ b/types/mocha/index.d.ts
@@ -74,6 +74,8 @@ interface ReporterConstructor {
 
 declare class Mocha {
     currentTest: Mocha.ITestDefinition;
+    suite: Mocha.ISuite;
+
     constructor(options?: {
         grep?: RegExp;
         ui?: string;
@@ -119,6 +121,7 @@ declare class Mocha {
     noHighlighting(value: boolean): Mocha;
     /** Runs tests and invokes `onComplete()` when finished. */
     run(onComplete?: (failures: number) => void): Mocha.IRunner;
+    loadFiles(cb?: () => any): void;
 }
 
 // merge the Mocha class declaration with a module
@@ -168,6 +171,7 @@ declare namespace Mocha {
     interface ISuite {
         parent: ISuite;
         title: string;
+        suites: ISuite[];
 
         fullTitle(): string;
     }

From 4478031e2fbc4ed9cafbe27ea4eb28f787cca00c Mon Sep 17 00:00:00 2001
From: Dmitrii Sorin <info@staypositive.ru>
Date: Thu, 19 Apr 2018 08:33:38 +1000
Subject: [PATCH 1361/1382] IRunner should be an instance of EventEmitter
 (#24971)

* IRunner extends EventEmitter

https://github.com/mochajs/mocha/blob/master/lib/runner.js#L97

* Update index.d.ts
---
 types/mocha/index.d.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/types/mocha/index.d.ts b/types/mocha/index.d.ts
index 7817e205c3..b99fa24ab2 100644
--- a/types/mocha/index.d.ts
+++ b/types/mocha/index.d.ts
@@ -1,13 +1,16 @@
-// Type definitions for mocha 5.0
+// Type definitions for mocha 5.1
 // Project: http://mochajs.org/
 // Definitions by: Kazi Manzur Rashid <https://github.com/kazimanzurrashid>
 //                 otiai10 <https://github.com/otiai10>
 //                 jt000 <https://github.com/jt000>
 //                 Vadim Macagon <https://github.com/enlight>
 //                 Andrew Bradley <https://github.com/cspotcode>
+//                 Dmitrii Sorin <https://github.com/1999>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
+/// <reference types="node" />
+
 interface MochaSetupOptions {
     // milliseconds to wait before considering a test slow
     slow?: number;
@@ -201,7 +204,7 @@ declare namespace Mocha {
     }
 
     /** Partial interface for Mocha's `Runner` class. */
-    interface IRunner {
+    interface IRunner extends NodeJS.EventEmitter {
         stats?: IStats;
         started: boolean;
         suite: ISuite;

From a0d4396ad9fb92ef8b185134ccbdc37b6fe846c5 Mon Sep 17 00:00:00 2001
From: Zev Spitz <shivisi@etrog.net.il>
Date: Thu, 19 Apr 2018 01:48:25 +0300
Subject: [PATCH 1362/1382] ADOX; reduce any; return type of Execute; default
 properties; Bookmark (#25107)

* Removal of any

* Reduce any; fix default values in JsDoc

* Note about Execute and RecordsAffected; Default property on Recordset

* Expanded tests

* Fixed linting errors

* Fix long lines

* Define return value of Execute methods

* Add Bookmark

* Initial commit for ADOX

* Clean up `any` in ADOX

* Removed duplicate types from ADOX; add jsDoc to Attribute properties

* ADOX tests

* Lint fixes

* State flag comment

* Reduce any

* Add multicolumn index finder in tests file

* Update activex-access version

* Updated activex-infopath version
---
 types/activex-access/index.d.ts            |    2 +-
 types/activex-adodb/activex-adodb-tests.ts |  459 +++++++-
 types/activex-adodb/index.d.ts             |  401 ++++---
 types/activex-adodb/tslint.json            |    3 +-
 types/activex-adox/activex-adox-tests.ts   | 1204 ++++++++++++++++++++
 types/activex-adox/index.d.ts              |  335 ++++++
 types/activex-adox/package.json            |    6 +
 types/activex-adox/tsconfig.json           |   22 +
 types/activex-adox/tslint.json             |    7 +
 types/activex-infopath/index.d.ts          |    2 +-
 10 files changed, 2211 insertions(+), 230 deletions(-)
 create mode 100644 types/activex-adox/activex-adox-tests.ts
 create mode 100644 types/activex-adox/index.d.ts
 create mode 100644 types/activex-adox/package.json
 create mode 100644 types/activex-adox/tsconfig.json
 create mode 100644 types/activex-adox/tslint.json

diff --git a/types/activex-access/index.d.ts b/types/activex-access/index.d.ts
index 0fd93502f8..2529538cad 100644
--- a/types/activex-access/index.d.ts
+++ b/types/activex-access/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://msdn.microsoft.com/en-us/library/dn142571.aspx
 // Definitions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.6
 
 /// <reference types="activex-office" />
 /// <reference types="activex-dao" />
diff --git a/types/activex-adodb/activex-adodb-tests.ts b/types/activex-adodb/activex-adodb-tests.ts
index f409b888d3..347e1d9c9f 100644
--- a/types/activex-adodb/activex-adodb-tests.ts
+++ b/types/activex-adodb/activex-adodb-tests.ts
@@ -1,57 +1,426 @@
-let obj0 = new ActiveXObject('ADODB.Command');
+// Note -- running these tests under cscript requires some ES5 polyfills
 
-let obj1 = new ActiveXObject('ADODB.Connection');
+const collectionToArray = <T>(col: { Item(key: any): T }): T[] => {
+    const results: T[] = [];
+    const enumerator = new Enumerator<T>(col);
+    enumerator.moveFirst();
+    while (!enumerator.atEnd()) {
+        results.push(enumerator.item());
+        enumerator.moveNext();
+    }
+    return results;
+};
 
-let obj2 = new ActiveXObject('ADODB.Parameter');
-
-let obj3 = new ActiveXObject('ADODB.Record');
-
-let obj4 = new ActiveXObject('ADODB.Recordset');
-
-let obj5 = new ActiveXObject('ADODB.Stream');
-
-// open connection to an Excel file
-let pathToExcelFile = 'C:\\path\\to\\excel\\file.xlsx';
-let conn = new ActiveXObject('ADODB.Connection');
-conn.Provider = 'Microsoft.ACE.OLEDB.12.0';
-conn.ConnectionString = `Data Source="${pathToExcelFile}";Extended Properties="Excel 12.0;HDR=Yes"`;
-conn.Open();
-
-// create a Command to access the data
-let cmd = new ActiveXObject('ADODB.Command');
-cmd.ActiveConnection = conn;
-cmd.CommandText = 'SELECT DISTINCT LastName, CityName FROM [Sheet1$]';
-// get a Recordset
-let rs = cmd.Execute();
-// build a string from the Recordset
-let s = rs.GetString(ADODB.StringFormatEnum.adClipString, -1, '\t', '\n', '(NULL)');
-rs.Close();
-WScript.Echo(s);
-
-// create a disconnected recordset -- https://support.microsoft.com/en-us/help/184397/how-to-create-ado-disconnected-recordsets-in-vba-c-java
-(() => {
-    conn = new ActiveXObject('ADODB.Connection');
-    conn.Open(); // pass connection details here
-
-    rs = new ActiveXObject('ADODB.Recordset');
-    rs.CursorLocation = ADODB.CursorLocationEnum.adUseClient;
-    rs.Open('SELECT * FROM Table1', conn, ADODB.CursorTypeEnum.adOpenForwardOnly, ADODB.LockTypeEnum.adLockBatchOptimistic);
-    rs.ActiveConnection = null;
-
-    const v = rs.Fields.Item(0).Value;
-    conn.Close();
-})();
-
-// helper function
 const toSafeArray = <T>(...items: T[]): SafeArray<T> => {
     const dict = new ActiveXObject('Scripting.Dictionary');
     items.forEach((x, index) => dict.Add(index, x));
     return dict.Items() as SafeArray<T>;
 };
 
+const toConnectionString = (o: { [index: string]: any }) => {
+    o.Provider = o.Provider || 'sqloledb';
+    o['Data Source'] = o['Data Source'] || 'Server';
+    o['Integrated Security'] = o['Integrated Security'] || 'SSPI';
+
+    const parts: string[] = [];
+    for (const key in o) {
+        let val = o[key];
+        if (typeof val === 'string') { val = `'${val}'`; }
+        parts.push(`${key}=${val}`);
+    }
+    return parts.join(';');
+};
+
+const printLine = () => WScript.Echo(new Array(26).join('-'));
+
+{
+    // open connection to an Excel file
+    const pathToExcelFile = 'C:\\path\\to\\excel\\file.xlsx';
+    const conn = new ActiveXObject('ADODB.Connection');
+    conn.ConnectionString = toConnectionString({
+        Provider: 'Microsoft.ACE.OLEDB.12.0',
+        'Data Source': pathToExcelFile,
+        'Extended Properties': "Excel 12.0;HDR=Yes"
+    });
+    conn.Open();
+
+    // create a Command to access the data
+    const cmd = new ActiveXObject('ADODB.Command');
+    cmd.ActiveConnection = conn;
+    cmd.CommandText = 'SELECT DISTINCT LastName, CityName FROM [Sheet1$]';
+    // get a Recordset
+    const rs = cmd.Execute() as ADODB.Recordset;
+    // build a string from the Recordset
+    const s = rs.GetString(ADODB.StringFormatEnum.adClipString, -1, '\t', '\n', '(NULL)');
+    rs.Close();
+    WScript.Echo(s);
+}
+
+// create a disconnected recordset -- https://support.microsoft.com/en-us/help/184397/how-to-create-ado-disconnected-recordsets-in-vba-c-java
+{
+    const conn = new ActiveXObject('ADODB.Connection');
+    conn.Open(); // pass connection details here
+
+    const rs = new ActiveXObject('ADODB.Recordset');
+    rs.CursorLocation = ADODB.CursorLocationEnum.adUseClient;
+    rs.Open('SELECT * FROM Table1', conn, ADODB.CursorTypeEnum.adOpenForwardOnly, ADODB.LockTypeEnum.adLockBatchOptimistic);
+    rs.ActiveConnection = null;
+
+    const v = rs(0).Value;
+    conn.Close();
+}
+
 // update with SafeArray
-(() => {
+{
+    const rs = new ActiveXObject('ADODB.Recordset');
+    rs.Open(); // missing connection details here
     const fields = toSafeArray('FirstName', 'LastName', 'DOB');
     const values = toSafeArray<any>('Plony', 'Almony', new Date(1980, 1, 1).getVarDate());
     rs.Update(fields, values);
-})();
+    rs.Close();
+}
+
+const withConnection = (initialCatalog: string, fn: (conn: ADODB.Connection) => void) => {
+    let conn: ADODB.Connection | null = new ActiveXObject('ADODB.Connection');
+    const connectionString = toConnectionString({
+        'Initial Catalog': initialCatalog
+    });
+    try {
+        conn.Open(connectionString);
+        fn(conn);
+    } catch (e) {
+        WScript.Echo(e.message);
+    } finally {
+        if (conn.State === ADODB.ObjectStateEnum.adStateOpen) {
+            conn.Close();
+        }
+        conn = null;
+    }
+};
+
+const withRs = (catalogOrConnection: string | ADODB.Connection, tableOrCommand: string | ADODB.Command, fn: (rs: ADODB.Recordset) => void,
+    type: ADODB.CursorTypeEnum = ADODB.CursorTypeEnum.adOpenUnspecified,
+    location: ADODB.CursorLocationEnum = ADODB.CursorLocationEnum.adUseNone,
+    lockType: ADODB.LockTypeEnum = ADODB.LockTypeEnum.adLockOptimistic
+) => {
+    let connection = catalogOrConnection;
+    if (typeof connection === 'string') {
+        // expand catalog to full connection string
+        connection = toConnectionString({
+            'Initial Catalog': connection
+        });
+    }
+
+    let rs: ADODB.Recordset | null = null;
+    try {
+        if (typeof tableOrCommand === 'string') {
+            rs = new ActiveXObject('ADODB.Recordset');
+            rs.CursorLocation = location;
+            rs.LockType = lockType;
+            rs.Open(tableOrCommand, connection, type, lockType, ADODB.CommandTypeEnum.adCmdTable);
+        } else {
+            tableOrCommand.ActiveConnection = connection;
+            rs = tableOrCommand.Execute() as ADODB.Recordset;
+        }
+        fn(rs);
+    } catch (e) {
+        WScript.Echo(e.message);
+    } finally {
+        if (rs && rs.State === ADODB.ObjectStateEnum.adStateOpen) {
+            rs.Close();
+        }
+        rs = null;
+    }
+};
+
+const withEmployees = (fn: (rs: ADODB.Recordset) => void, type: ADODB.CursorTypeEnum) =>
+    withRs('Northwind', 'Employees', fn, type, ADODB.CursorLocationEnum.adUseClient);
+
+// https://msdn.microsoft.com/en-us/library/jj249882.aspx
+{
+    withConnection('Northwind', conn => {
+        withEmployees(rs => {
+            const FName = 'first name';
+            const LName = 'last name';
+
+            rs.AddNew();
+            rs('FirstName').Value = FName;
+            rs('LastName').Value = LName;
+            rs.Update();
+            WScript.Echo('New record added.');
+        }, ADODB.CursorTypeEnum.adOpenKeyset);
+    });
+}
+
+// https://msdn.microsoft.com/en-us/library/jj249434.aspx
+{
+    withConnection('Northwind', conn => {
+        withEmployees(rs => {
+            // Set PageSize to five to display names and hire dates of five employees at a time
+            rs.PageSize = 5;
+            const pageCount = rs.PageCount;
+
+            WScript.Echo(`There are ${pageCount} pages, each containing ${rs.PageSize} or fewer records`.trim());
+
+            for (let i = 1; i <= pageCount; i++) {
+                rs.AbsolutePage = i;
+
+                for (let iRecord = 1; iRecord <= rs.PageSize; iRecord++) {
+                    // First column in row contains page number on
+                    // first record of each page. Otherwise, the column
+                    // contains a non-breaking space.
+                    const page = iRecord === 1 ? `Page ${i} of ${rs.PageCount}` : '';
+
+                    // First and last name are in first column.
+                    const name = `${rs('FirstName')} ${rs('LastName')}`;
+
+                    // Hire date in second column.
+                    const hireDate = new Date(rs('HireDate').Value as VarDate).toString();
+
+                    // Write the row
+                    WScript.Echo([page, name, hireDate].join('\t'));
+
+                    // Get next record.
+                    rs.MoveNext();
+
+                    if (rs.EOF) { break; }
+                }
+            }
+        }, ADODB.CursorTypeEnum.adOpenStatic);
+    });
+}
+
+// https://msdn.microsoft.com/en-us/library/jj250117.aspx
+{
+    withConnection('Northwind', conn => {
+        withEmployees(rs => {
+            WScript.Echo(['AbsolutePosition', 'Name', 'Hire Date'].join('\t'));
+
+            while (!rs.EOF) {
+                // First column in row contains AbsolutePosition value.
+                const recordCount = `${rs.AbsolutePosition} of ${rs.RecordCount}`;
+
+                // First and last name are in first column.
+                const name = `${rs('FirstName')} ${rs('LastName')}`;
+
+                // Hire date in second column.
+                const hireDate = new Date(rs('HireDate').Value as VarDate).toString();
+
+                WScript.Echo([recordCount, name, hireDate].join('\t'));
+            }
+        }, ADODB.CursorTypeEnum.adOpenStatic);
+    });
+}
+
+// https://msdn.microsoft.com/en-us/library/jj249824.aspx
+{
+    withConnection('Northwind', conn => {
+        WScript.Echo('Enter city name, and press ENTER:');
+        const cityName = WScript.StdIn.ReadLine();
+
+        const cmdContact = new ActiveXObject('ADODB.Command');
+        cmdContact.CommandText = 'SELECT ContactName FROM Customers WHERE City = ?';
+        cmdContact.ActiveConnection = conn;
+
+        // create parameter and insert variable value
+        const param = cmdContact.CreateParameter('CityName', ADODB.DataTypeEnum.adChar, ADODB.ParameterDirectionEnum.adParamInput, 30, cityName);
+        cmdContact.Parameters.Append(param);
+
+        let rsContact: ADODB.Recordset | null = null;
+        try {
+            // Open a recordset using the command object
+            rsContact = cmdContact.Execute() as ADODB.Recordset;
+
+            while (!rsContact.EOF) {
+                WScript.Echo(rsContact('ContactName'));
+                rsContact.MoveNext();
+            }
+        } catch (e) {
+            WScript.Echo(e.message);
+        } finally {
+            if (rsContact && rsContact.State === ADODB.ObjectStateEnum.adStateOpen) {
+                rsContact.Close();
+            }
+        }
+    });
+}
+
+// https://msdn.microsoft.com/en-us/library/jj249056.aspx
+// https://msdn.microsoft.com/en-us/library/jj249494.aspx
+{
+    WScript.Echo('Enter royalty value, and press ENTER:');
+    const iRoyalty = parseInt(WScript.StdIn.ReadLine(), 10);
+    if (iRoyalty > -1) {
+        withConnection('pubs', conn => {
+            const cmdByRoyalty = new ActiveXObject('ADODB.Command');
+            cmdByRoyalty.CommandText = 'byroyalty';
+            cmdByRoyalty.CommandType = ADODB.CommandTypeEnum.adCmdStoredProc;
+            cmdByRoyalty.CommandTimeout = 15;
+
+            // The stored procedure called above is as follows:
+            /*
+            CREATE PROCEDURE byroyalty
+                @percentage int
+            AS
+                SELECT au_id from titleauthor
+                WHERE titleauthor.royaltyper = @percentage
+            GO
+            */
+
+            const prmByRoyalty = new ActiveXObject('ADODB.Parameter');
+            prmByRoyalty.Type = ADODB.DataTypeEnum.adInteger;
+            prmByRoyalty.Size = 3;
+            prmByRoyalty.Direction = ADODB.ParameterDirectionEnum.adParamInput;
+            prmByRoyalty.Value = iRoyalty;
+            cmdByRoyalty.Parameters.Append(prmByRoyalty);
+
+            // open byRoyalty recordset via Command
+            withRs(conn, cmdByRoyalty, rsByRoyalty => {
+                // open authors recordset directly
+                withRs(conn, 'Authors', rsAuthor => {
+                    while (!rsByRoyalty.EOF) {
+                        // set filter
+                        rsAuthor.Filter = `au_id='${rsByRoyalty('au_id')}'`;
+
+                        // write author name
+                        WScript.Echo(`${rsAuthor('au_fname')} ${rsAuthor('au_lname')}`);
+                    }
+
+                    // get next record
+                    rsByRoyalty.MoveNext();
+                });
+            });
+        });
+    }
+}
+
+// https://msdn.microsoft.com/en-us/library/jj250032.aspx
+{
+    withRs('Northwind', 'Suppliers', rsSuppliers => {
+        WScript.Echo(['Field Value', 'Defined Size', 'Actual Size'].join('\t'));
+        while (!rsSuppliers.EOF) {
+            const fld = rsSuppliers('CompanyName');
+            WScript.Echo([fld.Value, fld.DefinedSize, fld.ActualSize].join('\t'));
+        }
+        rsSuppliers.MoveNext();
+    });
+}
+
+// https://msdn.microsoft.com/en-us/library/jj249928.aspx
+{
+    withRs('Northwind', 'Customers', rs => {
+        const loop20 = () => {
+            const start = new Date().getTime();
+
+            // loop through the recordset 20 times
+            for (let i = 0; i < 20; i++) {
+                rs.MoveFirst();
+                while (!rs.EOF) {
+                    // do something with the record
+                    const strTemp = rs('CompanyName').Value as string;
+                    rs.MoveNext();
+                }
+            }
+
+            const end = new Date().getTime();
+            return end - start;
+        };
+
+        const noCache = loop20();
+
+        // cache records in groups of 30
+        rs.MoveFirst();
+        rs.CacheSize = 30;
+
+        const cache = loop20();
+
+        WScript.Echo(`No cache: ${noCache}; with cache: ${cache}`);
+    }, ADODB.CursorTypeEnum.adOpenUnspecified, ADODB.CursorLocationEnum.adUseClient);
+}
+
+// https://msdn.microsoft.com/en-us/library/jj249157.aspx
+{
+    const printAuthorRecordset = (caption: string, rs: ADODB.Recordset) => {
+        printLine();
+        WScript.Echo(`**${caption}**`);
+        while (!rs.EOF) {
+            // write current row's data
+            const name = `${rs('au_fname')} ${rs('au_lname')}`;
+            WScript.Echo(name);
+
+            // get next record
+            rs.MoveNext;
+        }
+    };
+
+    WScript.Echo('Enter last name of author to find (e.g., Ringer) and then press ENTER:');
+    const lastName = WScript.StdIn.ReadLine() || '';
+    if (lastName.length > 0) {
+        withConnection('pubs', conn => {
+            // command object parameters
+            const cmdAuthor = new ActiveXObject('ADODB.Command');
+            cmdAuthor.CommandText = 'SELECT * FROM Authors WHERE au_name = ?';
+            const lastNameParameter = cmdAuthor.CreateParameter('Last Name', ADODB.DataTypeEnum.adChar, ADODB.ParameterDirectionEnum.adParamInput, 20, lastName);
+            cmdAuthor.Parameters.Append(lastNameParameter);
+            cmdAuthor.ActiveConnection = conn;
+
+            // recordset from command.execute
+            const rsAuthor = cmdAuthor.Execute() as ADODB.Recordset;
+
+            // recordset from connection.execute
+            const rsAuthor2 = conn.Execute('SELECT * FROM Authors') as ADODB.Recordset;
+
+            const errs = collectionToArray(conn.Errors);
+            if (errs.length > 0) {
+                for (const err of errs) {
+                    WScript.Echo(err);
+                }
+            }
+            conn.Errors.Clear();
+
+            printAuthorRecordset('Command.Execute results', rsAuthor);
+            printAuthorRecordset('Connection.Execute results', rsAuthor2);
+        });
+    }
+}
+
+// https://msdn.microsoft.com/en-us/library/jj249466.aspx
+{
+    withConnection('Northwind', conn => {
+        const sql = 'SELECT * FROM Customers';
+        withRs(conn, sql, rs => {
+            rs.MoveFirst();
+            if (rs.RecordCount === 0) {
+                WScript.Echo(`No records matched for '${sql}'`);
+                return;
+            }
+
+            // print headings for each field name
+            WScript.Echo(collectionToArray(rs.Fields).map(fld => fld.Name).join('\t'));
+
+            // JScript doesn't support multi-dimensional arrays
+            // so we'll convert the returned array to a single
+            // dimensional JScript array and then display the data.
+            const safeArray = rs.GetRows();
+            const data = new VBArray(safeArray).toArray();
+
+            const fieldCount = rs.Fields.Count;
+
+            data.forEach((cellValue, index) => {
+                const currentField = index % fieldCount;
+
+                // don't print tab character for first and last columns
+                if (currentField > 0 && currentField < fieldCount - 1) {
+                    WScript.StdOut.Write('\t');
+                }
+
+                const displayValue = cellValue === null ? '-null-' : cellValue;
+                if (currentField === fieldCount - 1) {
+                    WScript.StdOut.WriteLine(displayValue);
+                } else {
+                    WScript.StdOut.Write(displayValue);
+                }
+            });
+        }, ADODB.CursorTypeEnum.adOpenKeyset, ADODB.CursorLocationEnum.adUseClient, ADODB.LockTypeEnum.adLockOptimistic);
+    });
+}
diff --git a/types/activex-adodb/index.d.ts b/types/activex-adodb/index.d.ts
index 43f43f5bd5..1879891b2d 100644
--- a/types/activex-adodb/index.d.ts
+++ b/types/activex-adodb/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://msdn.microsoft.com/en-us/library/jj249010.aspx
 // Definitions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 declare namespace ADODB {
     const enum ADCPROP_ASYNCTHREADPRIORITY_ENUM {
@@ -594,10 +594,19 @@ declare namespace ADODB {
         adXactSyncPhaseOne = 1048576,
     }
 
+    class Bookmark {
+        private 'ADODB.Bookmark_typekey': Bookmark;
+        private constructor();
+    }
+
     class Command {
         private 'ADODB.Command_typekey': Command;
         private constructor();
-        ActiveConnection: Connection;
+
+        /**
+         * Sets or returns a String value that contains a definition for a connection if the connection is closed, or a Variant containing the current Connection object if the connection is open. Default is a null object reference.
+         */
+        ActiveConnection: string | Connection | null;
         Cancel(): void;
         CommandStream: any;
         CommandText: string;
@@ -605,28 +614,40 @@ declare namespace ADODB {
         CommandType: CommandTypeEnum;
 
         /**
-         * @param string [Name='']
-         * @param ADODB.DataTypeEnum [Type=0]
-         * @param ADODB.ParameterDirectionEnum [Direction=1]
-         * @param number [Size=0]
+         * @param Name [Name='']
+         * @param Type [Type=0]
+         * @param Direction [Direction=1]
+         * @param Size [Size=0]
          */
         CreateParameter(Name?: string, Type?: DataTypeEnum, Direction?: ParameterDirectionEnum, Size?: number, Value?: any): Parameter;
         Dialect: string;
 
-        /** @param number [Options=-1] */
-        Execute(RecordsAffected?: number, Parameters?: SafeArray, Options?: number): Recordset;
+        /**
+         * @param Options [Options=-1]
+         *
+         * The **RecordsAffected** parameter is meant to take a variable to be modified by reference, which is not supported by Javascript
+         *
+         * The return value is as follows:
+         *
+         * * If the **adExecuteNoRecords** option is passed in, the method will return `null`. Otherwise:
+         * * If the command specifies a row-returning query, then the method will return a new read-only, forward-only **Recordset** object with the results.
+         * * If the command isn't intended to return results (e.g. an `UPDATE` statement), a closed empty **Recordset** will be returned.
+         */
+        Execute(RecordsAffected?: undefined, Parameters?: SafeArray, Options?: number): Recordset | null;
         Name: string;
         NamedParameters: boolean;
         readonly Parameters: Parameters;
         Prepared: boolean;
         readonly Properties: Properties;
-        readonly State: number;
+        readonly State: ObjectStateEnum;
     }
 
     class Connection {
         private 'ADODB.Connection_typekey': Connection;
         private constructor();
-        Attributes: number;
+
+        /** Sum of one or more of the values in the **XactAttributeEnum** enum */
+        Attributes: XactAttributeEnum;
         BeginTrans(): number;
         Cancel(): void;
         Close(): void;
@@ -638,23 +659,45 @@ declare namespace ADODB {
         DefaultDatabase: string;
         readonly Errors: Errors;
 
-        /** @param number [Options=-1] */
-        Execute(CommandText: string, RecordsAffected: any, Options?: number): Recordset;
+        /**
+         * @param Options [Options=-1]
+         *
+         * The **RecordsAffected** parameter is meant to take a variable to be modified by reference, which is not supported by Javascript
+         *
+         * The return value is as follows:
+         *
+         * * If the **adExecuteNoRecords** option is passed in, the method will return `null`. Otherwise:
+         * * If **CommandText** specifies a row-returning query, then the method will return a new read-only, forward-only **Recordset** object with the results
+         * * If **CommandText** isn't intended to return results (e.g. an `UPDATE` statement), a closed empty **Recordset** will be returned.
+         */
+        Execute(CommandText: string, RecordsAffected?: undefined, Options?: CommandTypeEnum | ExecuteOptionEnum): Recordset | null;
         IsolationLevel: IsolationLevelEnum;
         Mode: ConnectModeEnum;
 
         /**
-         * @param string [ConnectionString='']
-         * @param string [UserID='']
-         * @param string [Password='']
-         * @param number [Options=-1]
+         * @param ConnectionString [ConnectionString='']
+         * @param UserID [UserID='']
+         * @param Password [Password='']
+         * @param Options [Options=-1]
          */
         Open(ConnectionString?: string, UserID?: string, Password?: string, Options?: number): void;
-        OpenSchema(Schema: SchemaEnum, Restrictions?: any, SchemaID?: any): Recordset;
+
+        /**
+         * Returns a Recordset object that contains schema information
+         * @param Schema Type of schema query to run
+         * @param Restrictions A SafeArray of query constraints; depends on the [type of the schema query](https://msdn.microsoft.com/en-us/library/jj249359.aspx)
+         */
+        OpenSchema(Schema: SchemaEnum, Restrictions?: SafeArray<string>): Recordset;
+
+        /**
+         * Returns a Recordset object that contains schema information, for a provider-specific schema query type
+         * @param SchemaID The GUID for a provider-schema query not defined by the OLE DB specification.
+         */
+        OpenSchema(Schema: SchemaEnum.adSchemaProviderSpecific, Restrictions: SafeArray<string>, SchemaID: string): Recordset;
         readonly Properties: Properties;
         Provider: string;
         RollbackTrans(): void;
-        readonly State: number;
+        readonly State: ObjectStateEnum;
         readonly Version: string;
     }
 
@@ -670,13 +713,12 @@ declare namespace ADODB {
         readonly SQLState: string;
     }
 
-    class Errors {
-        private 'ADODB.Errors_typekey': Errors;
-        private constructor();
+    interface Errors {
         Clear(): void;
         readonly Count: number;
         Item(Index: any): Error;
         Refresh(): void;
+        (Index: any): Error;
     }
 
     class Field {
@@ -684,7 +726,9 @@ declare namespace ADODB {
         private constructor();
         readonly ActualSize: number;
         AppendChunk(Data: any): void;
-        Attributes: number;
+
+        /** Sum of one or more of the values in the **FieldAttributeEnum** enum */
+        Attributes: FieldAttributeEnum;
         DataFormat: any;
         DefinedSize: number;
         GetChunk(Length: number): any;
@@ -699,37 +743,37 @@ declare namespace ADODB {
         Value: any;
     }
 
-    class Fields {
-        private 'ADODB.Fields_typekey': Fields;
-        private constructor();
-
+    interface Fields {
         /**
-         * @param number [DefinedSize=0]
-         * @param ADODB.FieldAttributeEnum [Attrib=-1]
+         * @param DefinedSize [DefinedSize=0]
+         * @param Attrib [Attrib=-1]
          */
         _Append(Name: string, Type: DataTypeEnum, DefinedSize?: number, Attrib?: FieldAttributeEnum): void;
 
         /**
-         * @param number [DefinedSize=0]
-         * @param ADODB.FieldAttributeEnum [Attrib=-1]
+         * @param DefinedSize [DefinedSize=0]
+         * @param Attrib [Attrib=-1]
          */
         Append(Name: string, Type: DataTypeEnum, DefinedSize?: number, Attrib?: FieldAttributeEnum, FieldValue?: any): void;
         CancelUpdate(): void;
         readonly Count: number;
-        Delete(Index: any): void;
-        Item(Index: any): Field;
+        Delete(Index: string | number): void;
+        Item(Index: string | number): Field;
         Refresh(): void;
 
-        /** @param ADODB.ResyncEnum [ResyncValues=2] */
+        /** @param ResyncValues [ResyncValues=2] */
         Resync(ResyncValues?: ResyncEnum): void;
         Update(): void;
+        (Index: string | number): Field;
     }
 
     class Parameter {
         private 'ADODB.Parameter_typekey': Parameter;
         private constructor();
         AppendChunk(Val: any): void;
-        Attributes: number;
+
+        /** Sum of one or more of the values in the **ParameterAttributesEnum** enum */
+        Attributes: ParameterAttributesEnum;
         Direction: ParameterDirectionEnum;
         Name: string;
         NumericScale: number;
@@ -740,28 +784,28 @@ declare namespace ADODB {
         Value: any;
     }
 
-    class Parameters {
-        private 'ADODB.Parameters_typekey': Parameters;
-        private constructor();
+    interface Parameters {
         Append(Object: any): void;
         readonly Count: number;
-        Delete(Index: any): void;
-        Item(Index: any): Parameter;
+        Delete(Index: string | number): void;
+        Item(Index: string | number): Parameter;
         Refresh(): void;
+        (Index: string | number): Parameter;
     }
 
-    class Properties {
-        private 'ADODB.Properties_typekey': Properties;
-        private constructor();
+    interface Properties {
         readonly Count: number;
-        Item(Index: any): Property;
+        Item(Index: string | number): Property;
         Refresh(): void;
+        (Index: string | number): Property;
     }
 
     class Property {
         private 'ADODB.Property_typekey': Property;
         private constructor();
-        Attributes: number;
+
+        /** Sum of one or more of the values in the **PropertyAttributesEnum** enum */
+        Attributes: PropertyAttributesEnum;
         readonly Name: string;
         readonly Type: DataTypeEnum;
         Value: any;
@@ -770,23 +814,27 @@ declare namespace ADODB {
     class Record {
         private 'ADODB.Record_typekey': Record;
         private constructor();
-        ActiveConnection: any;
+
+        /**
+         * Sets or returns a String value that contains a definition for a connection if the connection is closed, or a Variant containing the current Connection object if the connection is open. Default is a null object reference.
+         */
+        ActiveConnection: string | Connection | null;
         Cancel(): void;
         Close(): void;
 
         /**
-         * @param string [Source='']
-         * @param string [Destination='']
-         * @param string [UserName='']
-         * @param string [Password='']
-         * @param ADODB.CopyRecordOptionsEnum [Options=-1]
-         * @param boolean [Async=false]
+         * @param Source [Source='']
+         * @param Destination [Destination='']
+         * @param UserName [UserName='']
+         * @param Password [Password='']
+         * @param Options [Options=-1]
+         * @param Async [Async=false]
          */
         CopyRecord(Source?: string, Destination?: string, UserName?: string, Password?: string, Options?: CopyRecordOptionsEnum, Async?: boolean): string;
 
         /**
-         * @param string [Source='']
-         * @param boolean [Async=false]
+         * @param Source [Source='']
+         * @param Async [Async=false]
          */
         DeleteRecord(Source?: string, Async?: boolean): void;
         readonly Fields: Fields;
@@ -794,137 +842,174 @@ declare namespace ADODB {
         Mode: ConnectModeEnum;
 
         /**
-         * @param string [Source='']
-         * @param string [Destination='']
-         * @param string [UserName='']
-         * @param string [Password='']
-         * @param ADODB.MoveRecordOptionsEnum [Options=-1]
-         * @param boolean [Async=false]
+         * @param Source [Source='']
+         * @param Destination [Destination='']
+         * @param UserName [UserName='']
+         * @param Password [Password='']
+         * @param Options [Options=-1]
+         * @param Async [Async=false]
          */
         MoveRecord(Source?: string, Destination?: string, UserName?: string, Password?: string, Options?: MoveRecordOptionsEnum, Async?: boolean): string;
 
         /**
-         * @param ADODB.ConnectModeEnum [Mode=0]
-         * @param ADODB.RecordCreateOptionsEnum [CreateOptions=-1]
-         * @param ADODB.RecordOpenOptionsEnum [Options=-1]
-         * @param string [UserName='']
-         * @param string [Password='']
+         * Source may be:
+         * * A URL. If the protocol for the URL is http, then the Internet Provider will be invoked by default. If the URL points to a node that contains an executable script (such as an .ASP page), then a Record containing the source rather than the executed contents is opened by default. Use the Options argument to modify this behavior.
+         * * A Record object. A Record object opened from another Record will clone the original Record object.
+         * * A Command object. The opened Record object represents the single row returned by executing the Command. If the results contain more than a single row, the contents of the first row are placed in the record and an error may be added to the Errors collection.
+         * * A SQL SELECT statement. The opened Record object represents the single row returned by executing the contents of the string. If the results contain more than a single row, the contents of the first row are placed in the record and an error may be added to the Errors collection.
+         * * A table name.
+         *
+         * @param Mode [Mode=0]
+         * @param CreateOptions [CreateOptions=-1]
+         * @param Options [Options=-1]
+         * @param UserName [UserName='']
+         * @param Password [Password='']
          */
-        Open(Source: any, ActiveConnection: any, Mode?: ConnectModeEnum, CreateOptions?: RecordCreateOptionsEnum, Options?: RecordOpenOptionsEnum, UserName?: string, Password?: string): void;
+        Open(Source?: string | Record | Recordset | Command, ActiveConnection?: string | Connection, Mode?: ConnectModeEnum, CreateOptions?: RecordCreateOptionsEnum, Options?: RecordOpenOptionsEnum, UserName?: string, Password?: string): void;
         readonly ParentURL: string;
         readonly Properties: Properties;
         readonly RecordType: RecordTypeEnum;
-        Source: any;
+        Source: string | Recordset | Command;
         readonly State: ObjectStateEnum;
     }
 
-    class Recordset {
-        private 'ADODB.Recordset_typekey': Recordset;
-        private constructor();
+    interface Recordset {
         _xClone(): Recordset;
 
-        /** @param ADODB.AffectEnum [AffectRecords=3] */
+        /** @param AffectRecords [AffectRecords=3] */
         _xResync(AffectRecords?: AffectEnum): void;
 
         /**
-         * @param string [FileName='']
-         * @param ADODB.PersistFormatEnum [PersistFormat=0]
+         * @param FileName [FileName='']
+         * @param PersistFormat [PersistFormat=0]
          */
         _xSave(FileName?: string, PersistFormat?: PersistFormatEnum): void;
         AbsolutePage: PositionEnum;
         AbsolutePosition: PositionEnum;
-        readonly ActiveCommand: any;
-        ActiveConnection: any;
-        AddNew(FieldList?: any, Values?: any): void;
+        readonly ActiveCommand?: Command;
+
+        /**
+         * Sets or returns a String value that contains a definition for a connection if the connection is closed, or a Variant containing the current Connection object if the connection is open. Default is a null object reference.
+         */
+        ActiveConnection: string | Connection | null;
+        AddNew(): void;
+        AddNew(Fields: SafeArray<string | number>, Values: SafeArray): void;
+        AddNew(Field: string, Value: any): void;
         readonly BOF: boolean;
-        Bookmark: any;
+        Bookmark: Bookmark;
         CacheSize: number;
         Cancel(): void;
 
-        /** @param ADODB.AffectEnum [AffectRecords=3] */
+        /** @param AffectRecords [AffectRecords=3] */
         CancelBatch(AffectRecords?: AffectEnum): void;
         CancelUpdate(): void;
 
-        /** @param ADODB.LockTypeEnum [LockType=-1] */
+        /** @param LockType [LockType=-1] */
         Clone(LockType?: LockTypeEnum): Recordset;
         Close(): void;
         Collect(Index: any): any;
-        CompareBookmarks(Bookmark1: any, Bookmark2: any): CompareEnum;
+        CompareBookmarks(Bookmark1: Bookmark, Bookmark2: Bookmark): CompareEnum;
         CursorLocation: CursorLocationEnum;
         CursorType: CursorTypeEnum;
         DataMember: string;
         DataSource: any;
 
-        /** @param ADODB.AffectEnum [AffectRecords=1] */
+        /** @param AffectRecords [AffectRecords=1] */
         Delete(AffectRecords?: AffectEnum): void;
         readonly EditMode: EditModeEnum;
         readonly EOF: boolean;
         readonly Fields: Fields;
-        Filter: any;
 
         /**
-         * @param number [SkipRecords=0]
-         * @param ADODB.SearchDirectionEnum [SearchDirection=1]
+         * Sets or returns one of the following:
+         * * Criteria string — a string made up of one or more individual clauses concatenated with AND or OR operators.
+         * * Array of bookmarks — an array of unique bookmark values that point to records in the Recordset object.
+         * * A FilterGroupEnum value
          */
-        Find(Criteria: string, SkipRecords?: number, SearchDirection?: SearchDirectionEnum, Start?: any): void;
-
-        /** @param number [Rows=-1] */
-        GetRows(Rows?: number, Start?: any, Fields?: any): any;
+        Filter: string | SafeArray<Bookmark> | FilterGroupEnum;
 
         /**
-         * @param ADODB.StringFormatEnum [StringFormat=2]
-         * @param number [NumRows=-1]
-         * @param string [ColumnDelimeter='']
-         * @param string [RowDelimeter='']
-         * @param string [NullExpr='']
+         * @param SkipRecords [SkipRecords=0]
+         * @param SearchDirection [SearchDirection=1]
+         */
+        Find(Criteria: string, SkipRecords?: number, SearchDirection?: SearchDirectionEnum, Start?: Bookmark): void;
+
+        /** @param Rows [Rows=-1] */
+        GetRows(Rows?: number, Start?: string | Bookmark | BookmarkEnum, Fields?: string | SafeArray<string | number>): SafeArray;
+
+        /**
+         * @param StringFormat [StringFormat=2]
+         * @param NumRows [NumRows=-1]
+         * @param ColumnDelimeter [ColumnDelimeter='']
+         * @param RowDelimeter [RowDelimeter='']
+         * @param NullExpr [NullExpr='']
          */
         GetString(StringFormat?: StringFormatEnum, NumRows?: number, ColumnDelimeter?: string, RowDelimeter?: string, NullExpr?: string): string;
         Index: string;
         LockType: LockTypeEnum;
         MarshalOptions: MarshalOptionsEnum;
         MaxRecords: number;
-        Move(NumRecords: number, Start?: any): void;
+        Move(NumRecords: number, Start?: string | Bookmark | BookmarkEnum): void;
         MoveFirst(): void;
         MoveLast(): void;
         MoveNext(): void;
         MovePrevious(): void;
-        NextRecordset(RecordsAffected?: any): Recordset;
+
+        /** Since Javascript doesn't support byref parameters, the RecordsAffected parameter cannot be used */
+        NextRecordset(): Recordset;
 
         /**
-         * @param ADODB.CursorTypeEnum [CursorType=-1]
-         * @param ADODB.LockTypeEnum [LockType=-1]
-         * @param number [Options=-1]
+         * @param CursorType [CursorType=-1]
+         * @param LockType [LockType=-1]
+         * @param Options [Options=-1]
          */
-        Open(Source: any, ActiveConnection: any, CursorType?: CursorTypeEnum, LockType?: LockTypeEnum, Options?: number): void;
+        Open(Source: Command, ActiveConnection: null, CursorType?: CursorTypeEnum, LockType?: LockTypeEnum, Options?: CommandTypeEnum | ExecuteOptionEnum): void;
+        Open(Source?: Stream): void;
+
+        /**
+         * @param CursorType [CursorType=-1]
+         * @param LockType [LockType=-1]
+         * @param Options [Options=-1]
+         */
+        Open(Source: string, ActiveConnection: string | Connection, CursorType?: CursorTypeEnum, LockType?: LockTypeEnum, Options?: CommandTypeEnum | ExecuteOptionEnum): void;
         readonly PageCount: number;
         PageSize: number;
         readonly Properties: Properties;
         readonly RecordCount: number;
 
-        /** @param number [Options=-1] */
+        /** @param Options [Options=-1] */
         Requery(Options?: number): void;
 
         /**
-         * @param ADODB.AffectEnum [AffectRecords=3]
-         * @param ADODB.ResyncEnum [ResyncValues=2]
+         * @param AffectRecords [AffectRecords=3]
+         * @param ResyncValues [ResyncValues=2]
          */
         Resync(AffectRecords?: AffectEnum, ResyncValues?: ResyncEnum): void;
 
-        /** @param ADODB.PersistFormatEnum [PersistFormat=0] */
-        Save(Destination: any, PersistFormat?: PersistFormatEnum): void;
+        /** @param PersistFormat [PersistFormat=0] */
+        Save(Destination: string | Stream, PersistFormat?: PersistFormatEnum): void;
 
-        /** @param ADODB.SeekEnum [SeekOption=1] */
+        /**
+         * @param SeekOption [SeekOption=1]
+         *
+         * For a single-column index, pass in a single value to seek in the column of the index
+         *
+         * For a multi-column index, pass in a SafeArray containing the multiple values to seek in the columns of the index.
+         */
         Seek(KeyValues: any, SeekOption?: SeekEnum): void;
         Sort: string;
-        Source: any;
-        readonly State: number;
+        Source: string | Command;
+        readonly State: ObjectStateEnum;
         readonly Status: number;
         StayInSync: boolean;
         Supports(CursorOptions: CursorOptionEnum): boolean;
-        Update(Fields?: string | SafeArray<string | number>, Values?: any): void;
+        Update(): void;
+        Update(Fields: SafeArray<string | number>, Values: SafeArray): void;
+        Update(Field: string, Value: any): void;
 
-        /** @param ADODB.AffectEnum [AffectRecords=3] */
+        /** @param AffectRecords [AffectRecords=3] */
         UpdateBatch(AffectRecords?: AffectEnum): void;
+        (FieldIndex: string | number): Field;
     }
 
     class Stream {
@@ -934,7 +1019,7 @@ declare namespace ADODB {
         Charset: string;
         Close(): void;
 
-        /** @param number [CharNumber=-1] */
+        /** @param CharNumber [CharNumber=-1] */
         CopyTo(DestStream: Stream, CharNumber?: number): void;
         readonly EOS: boolean;
         Flush(): void;
@@ -943,21 +1028,21 @@ declare namespace ADODB {
         Mode: ConnectModeEnum;
 
         /**
-         * @param ADODB.ConnectModeEnum [Mode=0]
-         * @param ADODB.StreamOpenOptionsEnum [Options=-1]
-         * @param string [UserName='']
-         * @param string [Password='']
+         * @param Mode [Mode=0]
+         * @param Options [Options=-1]
+         * @param UserName [UserName='']
+         * @param Password [Password='']
          */
-        Open(Source: any, Mode?: ConnectModeEnum, Options?: StreamOpenOptionsEnum, UserName?: string, Password?: string): void;
+        Open(Source?: string | Record, Mode?: ConnectModeEnum, Options?: StreamOpenOptionsEnum, UserName?: string, Password?: string): void;
         Position: number;
 
-        /** @param number [NumBytes=-1] */
+        /** @param NumBytes [NumBytes=-1] */
         Read(NumBytes?: number): any;
 
-        /** @param number [NumChars=-1] */
+        /** @param NumChars [NumChars=-1] */
         ReadText(NumChars?: number): string;
 
-        /** @param ADODB.SaveOptionsEnum [Options=1] */
+        /** @param Options [Options=1] */
         SaveToFile(FileName: string, Options?: SaveOptionsEnum): void;
         SetEOS(): void;
         readonly Size: number;
@@ -966,7 +1051,7 @@ declare namespace ADODB {
         Type: StreamTypeEnum;
         Write(Buffer: any): void;
 
-        /** @param ADODB.StreamWriteEnum [Options=0] */
+        /** @param Options [Options=0] */
         WriteText(Data: string, Options?: StreamWriteEnum): void;
     }
 
@@ -1009,60 +1094,23 @@ declare namespace ADODB {
 }
 
 interface ActiveXObject {
-    on(
-        obj: ADODB.Connection, event: 'BeginTransComplete', argNames: ['TransactionLevel', 'pError', 'adStatus', 'pConnection'], handler: (
-            this: ADODB.Connection, parameter: {
-                readonly TransactionLevel: number, readonly pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, readonly pConnection: ADODB.Connection}) => void): void;
-    on(
-        obj: ADODB.Connection, event: 'CommitTransComplete' | 'ConnectComplete' | 'InfoMessage' | 'RollbackTransComplete', argNames: ['pError', 'adStatus', 'pConnection'],
-        handler: (this: ADODB.Connection, parameter: {readonly pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, readonly pConnection: ADODB.Connection}) => void): void;
-    on(
-        obj: ADODB.Connection, event: 'Disconnect', argNames: ['adStatus', 'pConnection'], handler: (
-            this: ADODB.Connection, parameter: {adStatus: ADODB.EventStatusEnum, readonly pConnection: ADODB.Connection}) => void): void;
-    on(
-        obj: ADODB.Connection, event: 'ExecuteComplete', argNames: ADODB.EventHelperTypes.Connection_ExecuteComplete_ArgNames, handler: (
-            this: ADODB.Connection, parameter: ADODB.EventHelperTypes.Connection_ExecuteComplete_Parameter) => void): void;
-    on(
-        obj: ADODB.Connection, event: 'WillConnect', argNames: ADODB.EventHelperTypes.Connection_WillConnect_ArgNames, handler: (
-            this: ADODB.Connection, parameter: ADODB.EventHelperTypes.Connection_WillConnect_Parameter) => void): void;
-    on(
-        obj: ADODB.Connection, event: 'WillExecute', argNames: ADODB.EventHelperTypes.Connection_WillExecute_ArgNames, handler: (
-            this: ADODB.Connection, parameter: ADODB.EventHelperTypes.Connection_WillExecute_Parameter) => void): void;
-    on(
-        obj: ADODB.Recordset, event: 'EndOfRecordset', argNames: ['fMoreData', 'adStatus', 'pRecordset'], handler: (
-            this: ADODB.Recordset, parameter: {fMoreData: boolean, adStatus: ADODB.EventStatusEnum, readonly pRecordset: ADODB.Recordset}) => void): void;
-    on(
-        obj: ADODB.Recordset, event: 'FetchComplete', argNames: ['pError', 'adStatus', 'pRecordset'], handler: (
-            this: ADODB.Recordset, parameter: {readonly pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, readonly pRecordset: ADODB.Recordset}) => void): void;
-    on(
-        obj: ADODB.Recordset, event: 'FetchProgress', argNames: ['Progress', 'MaxProgress', 'adStatus', 'pRecordset'], handler: (
-            this: ADODB.Recordset, parameter: {readonly Progress: number, readonly MaxProgress: number, adStatus: ADODB.EventStatusEnum, readonly pRecordset: ADODB.Recordset}) => void): void;
-    on(
-        obj: ADODB.Recordset, event: 'FieldChangeComplete', argNames: ['cFields', 'Fields', 'pError', 'adStatus', 'pRecordset'], handler: (
-            this: ADODB.Recordset, parameter: {
-                readonly cFields: number, readonly Fields: any, readonly pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, readonly pRecordset: ADODB.Recordset}) => void): void;
-    on(
-        obj: ADODB.Recordset, event: 'MoveComplete' | 'RecordsetChangeComplete', argNames: ['adReason', 'pError', 'adStatus', 'pRecordset'],
-        handler: (
-            this: ADODB.Recordset, parameter: {
-                readonly adReason: ADODB.EventReasonEnum, readonly pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, readonly pRecordset: ADODB.Recordset}) => void): void;
-    on(
-        obj: ADODB.Recordset, event: 'RecordChangeComplete', argNames: ['adReason', 'cRecords', 'pError', 'adStatus', 'pRecordset'], handler: (
-            this: ADODB.Recordset, parameter: {
-                readonly adReason: ADODB.EventReasonEnum, readonly cRecords: number, readonly pError: ADODB.Error,
-                adStatus: ADODB.EventStatusEnum, readonly pRecordset: ADODB.Recordset}) => void): void;
-    on(
-        obj: ADODB.Recordset, event: 'WillChangeField', argNames: ['cFields', 'Fields', 'adStatus', 'pRecordset'], handler: (
-            this: ADODB.Recordset, parameter: {readonly cFields: number, readonly Fields: any, adStatus: ADODB.EventStatusEnum, readonly pRecordset: ADODB.Recordset}) => void): void;
-    on(
-        obj: ADODB.Recordset, event: 'WillChangeRecord', argNames: ['adReason', 'cRecords', 'adStatus', 'pRecordset'], handler: (
-            this: ADODB.Recordset, parameter: {
-                readonly adReason: ADODB.EventReasonEnum, readonly cRecords: number, adStatus: ADODB.EventStatusEnum, readonly pRecordset: ADODB.Recordset}) => void): void;
-    on(
-        obj: ADODB.Recordset, event: 'WillChangeRecordset' | 'WillMove', argNames: ['adReason', 'adStatus', 'pRecordset'], handler: (
-            this: ADODB.Recordset, parameter: {readonly adReason: ADODB.EventReasonEnum, adStatus: ADODB.EventStatusEnum, readonly pRecordset: ADODB.Recordset}) => void): void;
-    set(obj: ADODB.Recordset, propertyName: 'Collect', parameterTypes: [any], newValue: any): void;
     new<K extends keyof ActiveXObjectNameMap = any>(progid: K): ActiveXObjectNameMap[K];
+    on(obj: ADODB.Connection, event: 'BeginTransComplete', argNames: ['TransactionLevel', 'pError', 'adStatus', 'pConnection'], handler: (this: ADODB.Connection, parameter: {readonly TransactionLevel: number, readonly pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, readonly pConnection: ADODB.Connection}) => void): void;
+    on(obj: ADODB.Connection, event: 'CommitTransComplete' | 'ConnectComplete' | 'InfoMessage' | 'RollbackTransComplete', argNames: ['pError', 'adStatus', 'pConnection'], handler: (this: ADODB.Connection, parameter: {readonly pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, readonly pConnection: ADODB.Connection}) => void): void;
+    on(obj: ADODB.Connection, event: 'Disconnect', argNames: ['adStatus', 'pConnection'], handler: (this: ADODB.Connection, parameter: {adStatus: ADODB.EventStatusEnum, readonly pConnection: ADODB.Connection}) => void): void;
+    on(obj: ADODB.Connection, event: 'ExecuteComplete', argNames: ADODB.EventHelperTypes.Connection_ExecuteComplete_ArgNames, handler: (this: ADODB.Connection, parameter: ADODB.EventHelperTypes.Connection_ExecuteComplete_Parameter) => void): void;
+    on(obj: ADODB.Connection, event: 'WillConnect', argNames: ADODB.EventHelperTypes.Connection_WillConnect_ArgNames, handler: (this: ADODB.Connection, parameter: ADODB.EventHelperTypes.Connection_WillConnect_Parameter) => void): void;
+    on(obj: ADODB.Connection, event: 'WillExecute', argNames: ADODB.EventHelperTypes.Connection_WillExecute_ArgNames, handler: (this: ADODB.Connection, parameter: ADODB.EventHelperTypes.Connection_WillExecute_Parameter) => void): void;
+    on(obj: ADODB.Recordset, event: 'EndOfRecordset', argNames: ['fMoreData', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {fMoreData: boolean, adStatus: ADODB.EventStatusEnum, readonly pRecordset: ADODB.Recordset}) => void): void;
+    on(obj: ADODB.Recordset, event: 'FetchComplete', argNames: ['pError', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {readonly pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, readonly pRecordset: ADODB.Recordset}) => void): void;
+    on(obj: ADODB.Recordset, event: 'FetchProgress', argNames: ['Progress', 'MaxProgress', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {readonly Progress: number, readonly MaxProgress: number, adStatus: ADODB.EventStatusEnum, readonly pRecordset: ADODB.Recordset}) => void): void;
+    on(obj: ADODB.Recordset, event: 'FieldChangeComplete', argNames: ['cFields', 'Fields', 'pError', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {readonly cFields: number, readonly Fields: any, readonly pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, readonly pRecordset: ADODB.Recordset}) => void): void;
+    on(obj: ADODB.Recordset, event: 'MoveComplete' | 'RecordsetChangeComplete', argNames: ['adReason', 'pError', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {readonly adReason: ADODB.EventReasonEnum, readonly pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, readonly pRecordset: ADODB.Recordset}) => void): void;
+    on(obj: ADODB.Recordset, event: 'RecordChangeComplete', argNames: ['adReason', 'cRecords', 'pError', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {readonly adReason: ADODB.EventReasonEnum, readonly cRecords: number, readonly pError: ADODB.Error, adStatus: ADODB.EventStatusEnum, readonly pRecordset: ADODB.Recordset}) => void): void;
+    on(obj: ADODB.Recordset, event: 'WillChangeField', argNames: ['cFields', 'Fields', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {readonly cFields: number, readonly Fields: any, adStatus: ADODB.EventStatusEnum, readonly pRecordset: ADODB.Recordset}) => void): void;
+    on(obj: ADODB.Recordset, event: 'WillChangeRecord', argNames: ['adReason', 'cRecords', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {readonly adReason: ADODB.EventReasonEnum, readonly cRecords: number, adStatus: ADODB.EventStatusEnum, readonly pRecordset: ADODB.Recordset}) => void): void;
+    on(obj: ADODB.Recordset, event: 'WillChangeRecordset' | 'WillMove', argNames: ['adReason', 'adStatus', 'pRecordset'], handler: (this: ADODB.Recordset, parameter: {readonly adReason: ADODB.EventReasonEnum, adStatus: ADODB.EventStatusEnum, readonly pRecordset: ADODB.Recordset}) => void): void;
+    set(obj: ADODB.Recordset, propertyName: 'Collect', parameterTypes: [any], newValue: any): void;
 }
 
 interface ActiveXObjectNameMap {
@@ -1073,14 +1121,3 @@ interface ActiveXObjectNameMap {
     'ADODB.Recordset': ADODB.Recordset;
     'ADODB.Stream': ADODB.Stream;
 }
-
-interface EnumeratorConstructor {
-    new(col: ADODB.Errors): Enumerator<ADODB.Error>;
-    new(col: ADODB.Fields): Enumerator<ADODB.Field>;
-    new(col: ADODB.Parameters): Enumerator<ADODB.Parameter>;
-    new(col: ADODB.Properties): Enumerator<ADODB.Property>;
-}
-
-interface SafeArray<T = any> {
-    _brand: SafeArray<T>;
-}
diff --git a/types/activex-adodb/tslint.json b/types/activex-adodb/tslint.json
index 3224b40b8b..7b89accc6d 100644
--- a/types/activex-adodb/tslint.json
+++ b/types/activex-adodb/tslint.json
@@ -1,6 +1,7 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "no-const-enum": false
+        "no-const-enum": false,
+        "max-line-length": false
     }
 }
diff --git a/types/activex-adox/activex-adox-tests.ts b/types/activex-adox/activex-adox-tests.ts
new file mode 100644
index 0000000000..1b6ec21d1f
--- /dev/null
+++ b/types/activex-adox/activex-adox-tests.ts
@@ -0,0 +1,1204 @@
+const collectionToArray = <T>(col: { Item(key: any): T }): T[] => {
+    const results: T[] = [];
+    const enumerator = new Enumerator<T>(col);
+    enumerator.moveFirst();
+    while (!enumerator.atEnd()) {
+        results.push(enumerator.item());
+        enumerator.moveNext();
+    }
+    return results;
+};
+
+const toConnectionString = (o: { [index: string]: any }) => {
+    o.Provider = o.Provider || 'sqloledb';
+    o['Data Source'] = o['Data Source'] || 'Server';
+    o['Integrated Security'] = o['Integrated Security'] || 'SSPI';
+
+    const parts: string[] = [];
+    for (const key in o) {
+        let val = o[key];
+        if (typeof val === 'string') { val = `'${val}'`; }
+        parts.push(`${key}=${val}`);
+    }
+    return parts.join(';');
+};
+
+const connectionString = toConnectionString({
+    Provider: 'Microsoft.Jet.OLEDB.4.0',
+    'Data Source': 'c:\\Program Files\\Microsoft Office\\Office\\Samples\\Northwind.mdb'
+});
+const connectionStringWithSys = toConnectionString({
+    Provider: 'Microsoft.Jet.OLEDB.4.0',
+    'Data Source': 'c:\\Program Files\\Microsoft Office\\Office\\Samples\\Northwind.mdb',
+    'jet oledb:system database': 'c:\\Program Files\\Microsoft Office\\Office\\system.mdw'
+});
+
+const adPermObjTable = ADOX.ObjectTypeEnum.adPermObjTable;
+const adRightFull = ADOX.RightsEnum.adRightFull;
+
+const adInteger = ADODB.DataTypeEnum.adInteger;
+const adVarWChar = ADODB.DataTypeEnum.adVarWChar;
+const adVarChar = ADODB.DataTypeEnum.adVarChar;
+
+const adOpenKeyset = ADODB.CursorTypeEnum.adOpenKeyset;
+const adLockOptimistic = ADODB.LockTypeEnum.adLockOptimistic;
+
+const tryClose = (obj: { State: ADODB.ObjectStateEnum, Close(): void } | null) => {
+    // TODO State could also be a combination of multiple values in this enum
+    if (obj && obj.State === ADODB.ObjectStateEnum.adStateOpen) {
+        obj.Close();
+    }
+    return null;
+};
+
+// https://docs.microsoft.com/en-us/sql/ado/reference/adox-api/columns-and-tables-append-methods-name-property-example-vb
+{
+    let cat: ADOX.Catalog | null = null;
+    let tbl: ADOX.Table | null = null;
+    try {
+        cat = new ActiveXObject('ADOX.Catalog');
+        cat.ActiveConnection = connectionString;
+
+        tbl = new ActiveXObject('ADOX.Table');
+        tbl.Name = 'MyTable';
+        tbl.Columns.Append('Column1', adInteger);
+        tbl.Columns.Append('Column2', adInteger);
+        tbl.Columns.Append('Column3', adVarChar, 50);
+        cat.Tables.Append(tbl);
+        WScript.Echo('Table "MyTables" is added.');
+
+        cat.Tables.Delete(tbl.Name);
+        WScript.Echo('Table "MyTable" is deleted');
+
+        cat.ActiveConnection = null;
+    } catch (error) {
+        WScript.Echo(error);
+    } finally {
+        if (cat) {
+            cat.ActiveConnection = null;
+        }
+        cat = null;
+        tbl = null;
+    }
+}
+
+// https://docs.microsoft.com/en-us/sql/ado/reference/adox-api/connection-close-method-table-type-property-example-vb
+{
+    let conn: ADODB.Connection | null = null;
+    let cat: ADOX.Catalog | null = null;
+    try {
+        conn = new ActiveXObject('ADODB.Connection');
+        conn.Open(connectionString);
+        cat = new ActiveXObject('ADOX.Catalog');
+        cat.ActiveConnection = conn;
+        const tbl = cat.Tables(0);
+        WScript.Echo(tbl.Type); // Cache tbl.Type info
+        cat.ActiveConnection = null; // tbl is orphaned
+
+        // The following two lines will succeed only if the information was cached
+        WScript.Echo(tbl.Type);
+        WScript.Echo(tbl.Columns(0).DefinedSize);
+    } catch (error) {
+        WScript.Echo(error);
+    } finally {
+        // Clean up
+        if (cat) { cat.ActiveConnection = null; }
+        cat = null;
+        conn = tryClose(conn);
+    }
+}
+
+// https://docs.microsoft.com/en-us/sql/ado/reference/adox-api/create-method-example-vb
+{
+    let cat: ADOX.Catalog | null = null;
+    try {
+        cat = new ActiveXObject('ADOX.Catalog');
+        cat.Create("Provider='Microsoft.Jet.OLEDB.4.0';Data Source='new.mdb'");
+    } catch (error) {
+        WScript.Echo(error);
+    } finally {
+        cat = null;
+    }
+}
+
+// https://docs.microsoft.com/en-us/sql/ado/reference/adox-api/getobjectowner-and-setobjectowner-methods-example-vb
+{
+    const cat = new ActiveXObject('ADOX.Catalog');
+    cat.ActiveConnection = connectionStringWithSys;
+
+    // Print the original owner of Categories
+    const strOwner = cat.GetObjectOwner('Categories', adPermObjTable);
+    WScript.Echo(`Ower of Categories: ${strOwner}`);
+
+    // Set the owner of Categories to Accounting
+    cat.SetObjectOwner('Categories', adPermObjTable, 'Accounting');
+
+    for (const tblLoop of collectionToArray(cat.Tables)) {
+        WScript.Echo(`
+Table: ${tblLoop.Name}
+Owner: ${cat.GetObjectOwner(tblLoop.Name, adPermObjTable)}
+        `.trim());
+    }
+
+    // Restore the original owner of Categories
+    cat.SetObjectOwner('Categories', adPermObjTable, strOwner);
+}
+
+// https://docs.microsoft.com/en-us/sql/ado/reference/adox-api/getpermissions-and-setpermissions-methods-example-vb
+{
+    let cnn: ADODB.Connection | null = null;
+    let cat: ADOX.Catalog | null = null;
+    try {
+        cnn = new ActiveXObject('ADODB.Connection');
+        cnn.Provider = 'Microsoft.Jet.OLEDB.4.0';
+        cnn.Open("Data Source='Northwind.mdb';jet oledb:system database='system.mdw'");
+
+        cat = new ActiveXObject('ADOX.Catalog');
+        cat.ActiveConnection = cnn;
+
+        const displayPermissions = (title: string) =>
+            WScript.Echo(`${title}: ${cat!.Users('admin').GetPermissions('Orders', adPermObjTable)}`);
+
+        // Retrieve original permissions
+        const perm = cat.Users('admin').GetPermissions('Orders', adPermObjTable);
+        WScript.Echo(`Permissions: ${perm}`);
+
+        // Revoke all permissions
+        cat.Users('admin').SetPermissions('Orders', adPermObjTable, ADOX.ActionEnum.adAccessRevoke, adRightFull);
+        displayPermissions('Revoked permissions');
+
+        // Give the Admin user full rights on the orders object
+        cat.Users('admin').SetPermissions('Orders', adPermObjTable, ADOX.ActionEnum.adAccessSet, adRightFull);
+        displayPermissions('Full permissions');
+
+        // Restore original permissions
+        cat.Users('admin').SetPermissions('Orders', adPermObjTable, ADOX.ActionEnum.adAccessSet, perm);
+        displayPermissions('Final permissions');
+    } catch (error) {
+        WScript.Echo(error);
+    } finally {
+        cat = null;
+        cnn = tryClose(cnn);
+    }
+}
+
+// https://docs.microsoft.com/en-us/sql/ado/reference/adox-api/groups-and-users-append-changepassword-methods-example-vb
+{
+    let cat: ADOX.Catalog | null = null;
+    let usrNew: ADOX.User | null = null;
+    let usrLoop: ADOX.User | null;
+    let grpLoop: ADOX.Group | null;
+    let user: ADOX.User | null;
+    let group: ADOX.Group | null;
+    try {
+        cat = new ActiveXObject('ADOX.Catalog');
+        cat.ActiveConnection = connectionStringWithSys;
+
+        // Create and append a new group with a string
+        cat.Groups.Append('Accounting');
+
+        // Create and append a new user with an object
+        usrNew = new ActiveXObject('ADOX.User');
+        usrNew.Name = 'Pat Smith';
+        usrNew.ChangePassword('', 'Password1');
+        cat.Users.Append(usrNew);
+
+        // Make the user Pat Smith a member of the
+        // Accounting group by creating and adding the
+        // appropriate Group object to the user's Groups
+        // collection. The same is accomplished if a User
+        // object representing Pat Smith is created and
+        // appended to the Accounting group Users collection
+        usrNew.Groups.Append('Accounting');
+
+        // Enumerate all User objects in the catalog's Users collection.
+        for (usrLoop of collectionToArray(cat.Users)) {
+            WScript.Echo(`${usrLoop.Name} belongs to the following groups:`);
+
+            // Enumerate all Group objects in each User object's Groups collection
+            const groups = collectionToArray(usrLoop.Groups);
+            if (groups.length !== 0) {
+                for (group of groups) {
+                    WScript.Echo(`\t\t${group.Name}`);
+                }
+            } else {
+                WScript.Echo('\t[None]');
+            }
+        }
+
+        // Enumerate all Group objects in the default workspace's Groups collection
+        for (grpLoop of collectionToArray(cat.Groups)) {
+            WScript.Echo(`${grpLoop.Name} has as its members:`);
+
+            // Enumerate all User objects in each Group object's User collection
+            const users = collectionToArray(grpLoop.Users);
+            if (users.length !== 0) {
+                for (user of users) {
+                    WScript.Echo(`\t\t${user.Name}`);
+                }
+            } else {
+                WScript.Echo('\t[None]');
+            }
+        }
+
+        // Delete new User and Group objects because this is only a demonstration
+        cat.Users.Delete('Pat Smith');
+        cat.Groups.Delete('Accounting');
+    } catch (error) {
+        WScript.Echo(error);
+    } finally {
+        if (cat) { cat.ActiveConnection = null; }
+        cat = null;
+        usrNew = null;
+        usrLoop = null;
+        grpLoop = null;
+        user = null;
+        group = null;
+    }
+}
+
+// https://docs.microsoft.com/en-us/sql/ado/reference/adox-api/indexes-append-method-example-vb
+{
+    let cat: ADOX.Catalog | null = null;
+    let tbl: ADOX.Table | null = null;
+    let idx: ADOX.Index | null = null;
+    try {
+        // Open the catalog
+        cat = new ActiveXObject('ADOX.Catalog');
+        cat.ActiveConnection = connectionString;
+
+        // Define the table and append it to the catalog
+        tbl = new ActiveXObject('ADOX.Table');
+        tbl.Name = 'MyTable';
+        tbl.Columns.Append('Column1', adInteger);
+        tbl.Columns.Append('Column2', adInteger);
+        tbl.Columns.Append('Column3', adVarChar, 50);
+        cat.Tables.Append(tbl);
+        WScript.Echo('Table "MyTables" is added.');
+
+        // Define a multi-column index
+        idx = new ActiveXObject('ADOX.Index');
+        idx.Name = 'multicolidx';
+        idx.Columns.Append('Column1');
+        idx.Columns.Append('Column2');
+
+        // Append the index to the table
+        tbl.Indexes.Append(idx);
+        WScript.Echo('The index is appended to table "MyTable".');
+
+        // Delete the table as this is a demonstration
+        cat.Tables.Delete(tbl.Name);
+        WScript.Echo('Table "MyTable" is deleeted.');
+    } catch (error) {
+        WScript.Echo(error);
+    } finally {
+        if (cat) { cat.ActiveConnection = null; }
+        cat = null;
+        tbl = null;
+        idx = null;
+    }
+}
+
+// https://docs.microsoft.com/en-us/sql/ado/reference/adox-api/keys-append-method-key-type-relatedcolumn-relatedtable-example-vb
+{
+    let cat: ADOX.Catalog | null = null;
+    let kyForeign: ADOX.Key | null = null;
+    try {
+        // Connect to the catalog
+        cat = new ActiveXObject('ADOX.Catalog');
+        cat.ActiveConnection = connectionString;
+
+        // Define the foreign key
+        kyForeign = new ActiveXObject('ADOX.Key');
+        kyForeign.Name = 'CustOrder';
+        kyForeign.Type = ADOX.KeyTypeEnum.adKeyForeign;
+        kyForeign.RelatedTable = 'Customers';
+        kyForeign.Columns.Append('CustomerId');
+        kyForeign.Columns('CustomerId').RelatedColumn = 'CustomerID';
+        kyForeign.UpdateRule = ADOX.RuleEnum.adRICascade;
+
+        // Append the foreign key to the keys collection
+        cat.Tables('Orders').Keys.Append(kyForeign);
+
+        // Delete the key to demonstrate the Detele method
+        cat.Tables('Orders').Keys.Delete(kyForeign.Name);
+    } catch (error) {
+        WScript.Echo(error);
+    } finally {
+        if (cat) { cat.ActiveConnection = null; }
+        cat = null;
+        kyForeign = null;
+    }
+}
+
+// https://docs.microsoft.com/en-us/sql/ado/reference/adox-api/procedures-append-method-example-vb
+{
+    let cnn: ADODB.Connection | null = null;
+    let cmd: ADODB.Command | null = null;
+    let cat: ADOX.Catalog | null = null;
+    try {
+        // Open the Connection
+        cnn = new ActiveXObject('ADODB.Connection');
+        cnn.Open(connectionString);
+
+        // Create the parameterized command (Microsoft Jet specific)
+        cmd = new ActiveXObject('ADODB.Command');
+        cmd.ActiveConnection = cnn;
+        cmd.CommandText = `
+            PARAMETERS [CustId] TEXT;
+            SELECT * FROM Customers WHERE CustomerId = [CustId]
+        `;
+
+        // Open the Catalog
+        cat = new ActiveXObject('ADOX.Catalog');
+        cat.ActiveConnection = cnn;
+
+        // Create the new Procedure
+        cat.Procedures.Append('CustomerById', cmd);
+    } catch (error) {
+        WScript.Echo(error);
+    } finally {
+        cat = null;
+        cmd = null;
+        cnn = tryClose(cnn);
+    }
+}
+
+// https://docs.microsoft.com/en-us/sql/ado/reference/adox-api/procedures-delete-method-example-vb
+{
+    let cat: ADOX.Catalog | null = null;
+    try {
+        // Open the catalog
+        cat = new ActiveXObject('ADOX.Catalog');
+        cat.ActiveConnection = connectionString;
+
+        // Delete the procedure
+        cat.Procedures.Delete('CustomerById');
+    } catch (error) {
+        WScript.Echo(error);
+    } finally {
+        if (cat) { cat.ActiveConnection = null; }
+        cat = null;
+    }
+}
+
+// https://docs.microsoft.com/en-us/sql/ado/reference/adox-api/procedures-refresh-method-example-vb
+{
+    let cat: ADOX.Catalog | null = null;
+    try {
+        // Open the catalog
+        cat = new ActiveXObject('ADOX.Catalog');
+        cat.ActiveConnection = connectionString;
+
+        // Refresh the Procedures collection
+        cat.Procedures.Refresh();
+    } catch (error) {
+        WScript.Echo(error);
+    } finally {
+        if (cat) { cat.ActiveConnection = null; }
+        cat = null;
+    }
+}
+
+// https://docs.microsoft.com/en-us/sql/ado/reference/adox-api/views-append-method-example-vb
+{
+    let cat: ADOX.Catalog | null = null;
+    let cmd: ADODB.Command | null = null;
+    try {
+        // Open the catalog
+        cat = new ActiveXObject('ADOX.Catalog');
+        cat.ActiveConnection = connectionString;
+
+        // Create the command representing the view.
+        cmd = new ActiveXObject('ADODB.Command');
+        cmd.CommandText = 'SELECT * FROM Customers';
+
+        // Create the new View
+        cat.Views.Append('All Customers', cmd);
+    } catch (error) {
+        WScript.Echo(error);
+    } finally {
+        if (cat) { cat.ActiveConnection = null; }
+        cat = null;
+        cmd = null;
+    }
+}
+
+// https://docs.microsoft.com/en-us/sql/ado/reference/adox-api/views-delete-method-example-vb
+{
+    let cat: ADOX.Catalog | null = null;
+    try {
+        // Open the catalog
+        cat = new ActiveXObject('ADOX.Catalog');
+        cat.ActiveConnection = connectionString;
+
+        // Delete the View
+        cat.Views.Delete('All Customers');
+    } catch (error) {
+        WScript.Echo(error);
+    } finally {
+        if (cat) { cat.ActiveConnection = null; }
+        cat = null;
+    }
+}
+
+// https://docs.microsoft.com/en-us/sql/ado/reference/adox-api/views-refresh-method-example-vb
+{
+    let cat: ADOX.Catalog | null = null;
+    try {
+        // Open the catalog
+        cat = new ActiveXObject('ADOX.Catalog');
+        cat.ActiveConnection = connectionString;
+
+        // Refresh the Views collection
+        cat.Views.Refresh();
+    } catch (error) {
+        WScript.Echo(error);
+    } finally {
+        cat = null;
+    }
+}
+
+// https://docs.microsoft.com/en-us/sql/ado/reference/adox-api/attributes-property-example-vb
+{
+    let cnn: ADODB.Connection | null = null;
+    let cat: ADOX.Catalog | null = null;
+    let tblEmp: ADOX.Table | null = null;
+    let colTemp: ADOX.Column | null = null;
+    let rstEmployees: ADODB.Recordset | null = null;
+    try {
+        // Connect the catalog
+        cnn = new ActiveXObject('ADODB.Connection');
+        cnn.Open(connectionString);
+        cat = new ActiveXObject('ADOX.Catalog');
+        cat.ActiveConnection = cnn;
+
+        tblEmp = cat.Tables('Employees');
+
+        // Create a new Field object and append it to the Field collection of the Employees table
+        colTemp = new ActiveXObject('ADOX.Column');
+        colTemp.Name = 'FaxPhone';
+        colTemp.Type = adVarWChar;
+        colTemp.DefinedSize = 24;
+        colTemp.Attributes = ADOX.ColumnAttributesEnum.adColNullable;
+        tblEmp.Columns.Append(colTemp.Name, ADODB.DataTypeEnum.adWChar, 24);
+
+        // Open the Employees table for updating as a Recordset
+        rstEmployees = new ActiveXObject('ADODB.Recordset');
+        rstEmployees.Open('Employees', cnn, adOpenKeyset, adLockOptimistic, ADODB.CommandTypeEnum.adCmdTable);
+
+        // Get user input
+        WScript.Echo(`
+Enter fax number for ${rstEmployees('FirstName')} ${rstEmployees('LastName')}.
+[? - unknown, X - has no fax]
+        `.trim());
+        const strInput = WScript.StdIn.ReadLine().toUpperCase().trim();
+        if (strInput) {
+            let newValue: string | null;
+            if (strInput === '?') {
+                newValue = null;
+            } else if (strInput === 'X') {
+                newValue = '';
+            } else {
+                newValue = strInput;
+            }
+            rstEmployees('FaxPhone').Value = newValue;
+            rstEmployees.Update();
+
+            // Print report
+            const faxValue = rstEmployees('FaxPhone').Value;
+            let faxDisplayString: string;
+            if (faxValue === null) {
+                faxDisplayString = '[Unkown]';
+            } else if (faxValue === '') {
+                faxDisplayString = '[Has no fax]';
+            } else {
+                faxDisplayString = faxValue;
+            }
+            WScript.Echo(`
+Name\t\tFax number
+${rstEmployees('FirstName')} ${rstEmployees('LastName')}\t\t${faxDisplayString}
+            `.trim());
+        }
+    } catch (error) {
+        WScript.Echo(error);
+    } finally {
+        rstEmployees = tryClose(rstEmployees);
+        if (tblEmp) {
+            tblEmp.Columns.Delete(colTemp!.Name);
+        }
+        cnn = tryClose(cnn);
+        cat = null;
+        colTemp = null;
+    }
+}
+
+// https://docs.microsoft.com/en-us/sql/ado/reference/adox-api/catalog-activeconnection-property-example-vb
+{
+    let cnn: ADODB.Connection | null = null;
+    let cat: ADOX.Catalog | null = null;
+    try {
+        cnn = new ActiveXObject('ADODB.Connection');
+        cnn.Open(connectionString);
+        cat = new ActiveXObject('ADOX.Catalog');
+        cat.ActiveConnection = cnn;
+        WScript.Echo(cat.Tables(0).Type);
+    } catch (error) {
+        WScript.Echo(error);
+    } finally {
+        cat = null;
+        cnn = tryClose(cnn);
+    }
+}
+
+// https://docs.microsoft.com/en-us/sql/ado/reference/adox-api/clustered-property-example-vb
+{
+    let cnn: ADODB.Connection | null = null;
+    let cat: ADOX.Catalog | null = null;
+    let tblLoop: ADOX.Table | null;
+    let idxLoop: ADOX.Index | null;
+    try {
+        // Connect to the catalog
+        cnn = new ActiveXObject('ADODB.Connection');
+        cnn.Open(connectionString);
+        cat = new ActiveXObject('ADOX.Catalog');
+        cat.ActiveConnection = cnn;
+
+        // Enumerate the tables
+        for (tblLoop of collectionToArray(cat.Tables)) {
+            // Enumerate the indexes
+            for (idxLoop of collectionToArray(tblLoop.Indexes)) {
+                WScript.Echo(`${tblLoop.Name} ${idxLoop.Name} ${idxLoop.Clustered}`);
+            }
+        }
+    } catch (error) {
+        WScript.Echo(error);
+    } finally {
+        cat = null;
+        cnn = tryClose(cnn);
+        tblLoop = null;
+        idxLoop = null;
+    }
+}
+
+// https://docs.microsoft.com/en-us/sql/ado/reference/adox-api/command-and-commandtext-properties-example-vb
+{
+    let cnn: ADODB.Connection | null = null;
+    let cat: ADOX.Catalog | null = null;
+    let cmd: ADODB.Command | null = null;
+    try {
+        // Open the connection
+        cnn = new ActiveXObject('ADODB.Connection');
+        cnn.Open(connectionString);
+
+        // Open the catalog
+        cat = new ActiveXObject('ADOX.Catalog');
+        cat.ActiveConnection = cnn;
+
+        // Get the command
+        cmd = new ActiveXObject('ADODB.Command');
+        cmd = cat.Procedures('CustomerById').Command;
+
+        // Update the CommandText
+        cmd.CommandText = `
+            SELECT CustomerID, CompanyName ContactName
+            FROM Customers
+            WHERE CustomerId = [CustId]
+        `.trim();
+
+        // Update the procedure
+        cat.Procedures('CustomerById').Command = cmd;
+    } catch (error) {
+        WScript.Echo(error);
+    } finally {
+        cnn = tryClose(cnn);
+        cat = null;
+        cmd = null;
+    }
+}
+
+// https://docs.microsoft.com/en-us/sql/ado/reference/adox-api/parameters-collection-command-property-example-vb
+{
+    let cnn: ADODB.Connection | null = null;
+    let cat: ADOX.Catalog | null = null;
+    let cmd: ADODB.Command | null = null;
+    let prm: ADODB.Parameter | null;
+    try {
+        // Open the connection
+        cnn = new ActiveXObject('ADODB.Connection');
+        cnn.Open(connectionString);
+
+        // Open the catalog
+        cat = new ActiveXObject('ADOX.Catalog');
+        cat.ActiveConnection = cnn;
+
+        // Get the command
+        cmd = cat.Procedures('CustomerById').Command;
+
+        // Retreive Parameter information
+        cmd.Parameters.Refresh();
+        for (prm of collectionToArray(cmd.Parameters)) {
+            WScript.Echo(`${prm.Name}: ${prm.Type}`);
+        }
+    } catch (error) {
+        WScript.Echo(error);
+    } finally {
+        cat = null;
+        cmd = null;
+        cnn = tryClose(cnn);
+        prm = null;
+    }
+}
+
+// https://docs.microsoft.com/en-us/sql/ado/reference/adox-api/views-collection-commandtext-property-example-vb
+{
+    let cnn: ADODB.Connection | null = null;
+    let cat: ADOX.Catalog | null = null;
+    let cmd: ADODB.Command | null = null;
+    try {
+        // Open the connection
+        cnn = new ActiveXObject('ADODB.Connection');
+        cnn.Open(connectionString);
+
+        // Open the catalog
+        cat = new ActiveXObject('ADOX.Catalog');
+        cat.ActiveConnection = cnn;
+
+        // Get the command
+        cmd = cat.Views('AllCustomers').Command;
+
+        // Update the CommandText of the command
+        cmd.CommandText = 'SELECT CustomerId, CompanyName, ContactName FROM Customers';
+
+        // Update the view
+        cat.Views('AllCustomers').Command = cmd;
+    } catch (error) {
+        WScript.Echo(error);
+    } finally {
+        cat = null;
+        cmd = null;
+        cnn = tryClose(cnn);
+    }
+}
+
+// https://docs.microsoft.com/en-us/sql/ado/reference/adox-api/datecreated-and-datemodified-properties-example-vb
+{
+    const dateOutput = (caption: string, tbl: ADOX.Table) => {
+        // Print DateCreated and DateModified information about specified Table object
+        WScript.Echo(caption);
+        WScript.Echo(`\tTable: ${tbl.Name}`);
+        WScript.Echo(`\t\t${new Date(tbl.DateCreated).toString()}`);
+        WScript.Echo(`\t\t${new Date(tbl.DateModified).toString()}`);
+        WScript.Echo('');
+    };
+
+    let cat: ADOX.Catalog | null = null;
+    try {
+        // Connect to the catalog.
+        cat = new ActiveXObject('ADOX.Catalog');
+        cat.ActiveConnection = connectionString;
+        const tblEmployees = cat.Tables('Employees');
+
+        // Print current information about the Employees table
+        dateOutput('Current properties', tblEmployees);
+
+        // Create and append column to the Employees table.
+        tblEmployees.Columns.Append('NewColumn', adInteger);
+        cat.Tables.Refresh();
+
+        // Print new information about the Employees table.
+        dateOutput('After creating a new column', tblEmployees);
+
+        // Delete new column because this is a demonstration
+        tblEmployees.Columns.Delete('NewColumn');
+
+        // Create and append new Table object to the Northwind database
+        const tblNewTable = new ActiveXObject('ADOX.Table');
+        tblNewTable.Name = 'NewTable';
+        tblNewTable.Columns.Append('NewColumn', adInteger);
+        cat.Tables.Append(tblNewTable);
+        cat.Tables.Refresh();
+
+        // Print information about the new Table object
+        dateOutput('After creating a new table', cat.Tables('NewTable'));
+
+        // Delete new Table object because this is a demonstration
+        cat.Tables.Delete(tblNewTable.Name);
+    } catch (error) {
+        WScript.Echo(error);
+    } finally {
+        if (cat) { cat.ActiveConnection = null; }
+        cat = null;
+    }
+}
+
+// https://docs.microsoft.com/en-us/sql/ado/reference/adox-api/definedsize-property-example-vb
+{
+    let rstEmployees: ADODB.Recordset | null = null;
+    let catNorthwind: ADOX.Catalog | null;
+    let colFirstname: ADOX.Column | null;
+    let colNewFirstName: ADOX.Column | null;
+    try {
+        // Open a Recordset for the Employees table.
+        rstEmployees = new ActiveXObject('ADODB.Recordset');
+        rstEmployees.Open('Employees', connectionString, adOpenKeyset, undefined, ADODB.CommandTypeEnum.adCmdTable);
+
+        // Open a Catalog for the Northwind database, using same connection as rstEmployees
+        catNorthwind = new ActiveXObject('ADOX.Catalog');
+        catNorthwind.ActiveConnection = rstEmployees.ActiveConnection;
+
+        // Loop through the recordset displaying the contents of the FirstName field, the field's defined size,
+        // and its actual size. Also store FirstName values in aryFirstName array.
+        rstEmployees.MoveFirst();
+        WScript.Echo('');
+        WScript.Echo('Original Defined Size and Actual Size');
+        const firstnames: string[] = [];
+        for (let i = 0; !rstEmployees.EOF; i++) {
+            const firstField = rstEmployees('FirstName');
+            const [firstname, lastname] = [firstField.Value as string, rstEmployees('LastName').Value as string];
+            WScript.Echo(`Employee name: ${firstname} ${lastname}`);
+            WScript.Echo(`\tFirstName Defined size: ${firstField.DefinedSize}`);
+            WScript.Echo(`\tFirstName Actual size: ${firstField.ActualSize}`);
+            firstnames[i] = firstname; // we don't check for null, because null is better than undefined when putting the first names back
+            rstEmployees.MoveNext();
+        }
+        rstEmployees.Close();
+
+        // Redefine the DefinedSize of FirstName in the catalog
+        colFirstname = catNorthwind.Tables('Employees').Columns('FirstName');
+        colNewFirstName = new ActiveXObject('ADOX.Column');
+        colNewFirstName.Name = colFirstname.Name;
+        colNewFirstName.Type = colFirstname.Type;
+        colNewFirstName.DefinedSize = colFirstname.DefinedSize + 1;
+
+        // Append new FirstName column to catalog
+        catNorthwind.Tables('Employees').Columns.Delete(colFirstname.Name);
+        catNorthwind.Tables('Employees').Columns.Append(colNewFirstName);
+
+        // Open Employee table in Recordset for updating
+        rstEmployees.Open('Employees', catNorthwind.ActiveConnection!, adOpenKeyset, adLockOptimistic, ADODB.CommandTypeEnum.adCmdTable);
+
+        // Loop through the recordset displaying the contents of the FirstName field, the field's defined size,
+        // and its actual size. Also restore FirstName values from aryFirstName.
+        rstEmployees.MoveFirst();
+        WScript.Echo('');
+        WScript.Echo('Original Defined Size and Actual Size');
+        for (let i = 0; !rstEmployees.EOF; i++) {
+            const firstField = rstEmployees('FirstName');
+            firstField.Value = firstnames[i];
+            WScript.Echo(`Employee name: ${firstField.Value} ${rstEmployees('LastName').Value}`);
+            WScript.Echo(`\tFirstName Defined size: ${firstField.DefinedSize}`);
+            WScript.Echo(`\tFirstName Actual size: ${firstField.ActualSize}`);
+            rstEmployees.MoveNext();
+        }
+        rstEmployees.Close();
+
+        // Restore original FirstName column to catalog
+        catNorthwind.Tables('Employees').Columns.Delete(colNewFirstName.Name);
+        catNorthwind.Tables('Employees').Columns.Append(colFirstname);
+
+        // Restore original FirstName values to Employees table
+        rstEmployees.Open('Employees', catNorthwind.ActiveConnection!, adOpenKeyset, adLockOptimistic, ADODB.CommandTypeEnum.adCmdTable);
+        rstEmployees.MoveFirst();
+        for (let i = 0; !rstEmployees.EOF; i++) {
+            rstEmployees('FirstName').Value = firstnames[i];
+            rstEmployees.MoveNext();
+        }
+        rstEmployees.Close();
+    } catch (error) {
+        WScript.Echo(error);
+    } finally {
+        catNorthwind = null;
+        colNewFirstName = null;
+        colFirstname = null;
+        rstEmployees = tryClose(rstEmployees);
+    }
+}
+
+// https://docs.microsoft.com/en-us/sql/ado/reference/adox-api/deleterule-property-example-vb
+{
+    let cat: ADOX.Catalog | null = null;
+    let tblNew: ADOX.Table | null;
+    let kyPrimary: ADOX.Key | null;
+    try {
+        // Connect the catalog
+        cat = new ActiveXObject('ADOX.Catalog');
+        cat.ActiveConnection = connectionString;
+
+        // Name new table
+        tblNew = new ActiveXObject('ADOX.Table');
+        tblNew.Name = 'NewTable';
+
+        // Append a numeric and a text field to new table.
+        tblNew.Columns.Append('NumField', adInteger, 20);
+        tblNew.Columns.Append('TextField', adVarChar, 20);
+
+        // Append the new table
+        cat.Tables.Append(tblNew);
+
+        // Define the Primary key
+        kyPrimary = new ActiveXObject('ADOX.Key');
+        kyPrimary.Name = 'NumField';
+        kyPrimary.Type = ADOX.KeyTypeEnum.adKeyPrimary;
+        kyPrimary.RelatedTable = 'Customers';
+        kyPrimary.Columns.Append('NumField');
+        kyPrimary.Columns('NumField').RelatedColumn = 'CustomerId';
+        kyPrimary.DeleteRule = ADOX.RuleEnum.adRICascade;
+
+        // Append the primary key
+        cat.Tables('NewTable').Keys.Append(kyPrimary);
+        WScript.Echo('The primary key is appended.');
+
+        // Delete the table as this is a demonstration.
+        cat.Tables.Delete(tblNew.Name);
+        WScript.Echo('The primary key is deleted.');
+    } catch (error) {
+        WScript.Echo(error);
+    } finally {
+        if (cat) { cat.ActiveConnection = null; }
+        cat = null;
+        kyPrimary = null;
+        tblNew = null;
+    }
+}
+
+// https://docs.microsoft.com/en-us/sql/ado/reference/adox-api/indexnulls-property-example-vb
+{
+    // Connect the catalog.
+    const cnn = new ActiveXObject('ADODB.Connection');
+    cnn.Open(connectionString);
+
+    let catNorthwind: ADOX.Catalog | null = new ActiveXObject('ADOX.Catalog');
+    catNorthwind.ActiveConnection = cnn;
+
+    // Append Country column to new index
+    const idxNew = new ActiveXObject('ADOX.Index');
+    idxNew.Columns.Append('Country');
+    idxNew.Name = 'NewIndex';
+
+    // Set IndexNulls based on user selection
+    WScript.Echo('Allow nulls Y/N (Y to allow, N to ignore)?');
+    const input = WScript.StdIn.ReadLine().toUpperCase();
+    switch (input) {
+        case 'Y':
+            idxNew.IndexNulls = ADOX.AllowNullsEnum.adIndexNullsAllow;
+            break;
+        case 'N':
+            idxNew.IndexNulls = ADOX.AllowNullsEnum.adIndexNullsIgnore;
+            break;
+    }
+
+    // Append new index to Employees table
+    catNorthwind.Tables('Employees').Indexes.Append(idxNew);
+
+    const rstEmployees = new ActiveXObject('ADODB.Recordset');
+    rstEmployees.Index = idxNew.Name;
+    rstEmployees.Open('Employees', cnn, adOpenKeyset, adLockOptimistic, ADODB.CommandTypeEnum.adCmdTableDirect);
+
+    // Add a new record to the Employees table.
+    rstEmployees.AddNew();
+    rstEmployees('FirstName').Value = 'Gary';
+    rstEmployees('LastName').Value = 'Haarsager';
+    rstEmployees.Update();
+
+    // Bookmark the newly added record
+    const bookmark = rstEmployees.Bookmark;
+
+    // Use the new index to set the order of the records.
+    rstEmployees.MoveFirst();
+
+    WScript.Echo(`Index = ${rstEmployees.Index}, IndexNulls = ${idxNew.IndexNulls}`);
+    WScript.Echo('\tCountry - Name');
+
+    // Enumerate the Recordset. The value of the IndexNulls property will determine if the newly added record appears in the output.
+    while (!rstEmployees.EOF) {
+        const country = rstEmployees('Country').Value as string | null || '[NULL]';
+        WScript.Echo(`\t${country} - ${rstEmployees('FirstName').Value} ${rstEmployees('LastName').Value}`);
+        rstEmployees.MoveNext();
+    }
+
+    // Delete new record because this is a demonstration.
+    rstEmployees.Bookmark = bookmark;
+    rstEmployees.Delete();
+
+    rstEmployees.Close();
+
+    catNorthwind.Tables('Employees').Indexes.Delete(idxNew.Name);
+    catNorthwind = null;
+}
+
+// https://docs.microsoft.com/en-us/sql/ado/reference/adox-api/adox-code-example-numericscale-and-precision-properties-example-vb
+{
+    let cnn: ADODB.Connection | null = null;
+    let cat: ADOX.Catalog | null;
+    let colLoop: ADOX.Column | null;
+    try {
+        // Connect the catalog.
+        cnn = new ActiveXObject('ADODB.Connection');
+        cnn.Open(connectionString);
+        cat = new ActiveXObject('ADOX.Catalog');
+        cat.ActiveConnection = cnn;
+
+        // Retrieve the Order Details table
+        const tblOD = cat.Tables('Order Details');
+
+        // Display numeric scale and precision of small integer fields.
+        for (colLoop of collectionToArray(tblOD.Columns)) {
+            if (colLoop.Type === ADODB.DataTypeEnum.adSmallInt) {
+                WScript.Echo(`
+Column: ${colLoop.Name}
+Numeric scale: ${colLoop.NumericScale}
+Precision: ${colLoop.Precision}
+                `.trim());
+            }
+        }
+    } catch (error) {
+        WScript.Echo(error);
+    } finally {
+        cat = null;
+        cnn = tryClose(cnn);
+        colLoop = null;
+    }
+}
+
+// https://docs.microsoft.com/en-us/sql/ado/reference/adox-api/parentcatalog-property-example-vb
+{
+    let cnn: ADODB.Connection | null = null;
+    let cat: ADOX.Catalog | null;
+    let tbl: ADOX.Table | null;
+    try {
+        cnn = new ActiveXObject('ADODB.Connection');
+        cnn.Open(connectionString);
+        cat = new ActiveXObject('ADOX.Catalog');
+        cat.ActiveConnection = cnn;
+
+        tbl = new ActiveXObject('ADOX.Table');
+        tbl.Name = 'MyContacts';
+        tbl.ParentCatalog = cat;
+
+        // Create fields and append them to the new Table object.
+        tbl.Columns.Append('ContactId', adInteger);
+        tbl.Columns.Append('CustomerID', adVarWChar);
+        tbl.Columns.Append('FirstName', adVarWChar);
+        tbl.Columns.Append('LastName', adVarWChar);
+        tbl.Columns.Append('Phone', adVarWChar, 20);
+        tbl.Columns.Append('Notes', ADODB.DataTypeEnum.adLongVarWChar);
+
+        // Make the ContactId column an auto incrementing column
+        tbl.Columns('ContactId').Properties('AutoIncrement').Value = true;
+
+        cat.Tables.Append(tbl);
+        WScript.Echo(`Table 'MyContacts' is added.`);
+
+        // Delete the table as this is a demonstration.
+        cat.Tables.Delete(tbl.Name);
+        WScript.Echo(`Table 'MyContacts' is deleted.`);
+    } catch (error) {
+        WScript.Echo(error);
+    } finally {
+        cnn = tryClose(cnn);
+        cat = null;
+        tbl = null;
+    }
+}
+
+// https://docs.microsoft.com/en-us/sql/ado/reference/adox-api/primarykey-and-unique-properties-example-vb
+{
+    let catNorthwind: ADOX.Catalog | null = null;
+    let tblNew: ADOX.Table | null;
+    let idxNew: ADOX.Index | null;
+    let idxLoop: ADOX.Index | null;
+    try {
+        // Connect the catalog
+        catNorthwind = new ActiveXObject('ADOX.Catalog');
+        catNorthwind.ActiveConnection = connectionString;
+
+        // Name new table
+        tblNew = new ActiveXObject('ADOX.Table');
+        tblNew.Name = 'NewTable';
+
+        // Append a numeric and a text field to new table.
+        tblNew.Columns.Append('NumField', adInteger, 20);
+        tblNew.Columns.Append('TextField', adVarWChar, 20);
+
+        // Append new Primary Key index on NumField column to new table
+        idxNew = new ActiveXObject('ADOX.Index');
+        idxNew.Name = 'NumIndex';
+        idxNew.Columns.Append('NumField');
+        idxNew.PrimaryKey = true;
+        idxNew.Unique = true;
+        tblNew.Indexes.Append(idxNew);
+
+        // Append an index on Textfield to new table..
+        // Note the different technique: Specifying index and column name as parameters of the Append method
+        tblNew.Indexes.Append('TextIndex', 'TextField');
+
+        // Append the new table
+        catNorthwind.Tables.Append(tblNew);
+
+        WScript.Echo(`${tblNew.Indexes.Count} indexes in '${tblNew.Name}' table`);
+
+        // Enumerate Indexes collection.
+        for (idxLoop of collectionToArray(tblNew.Indexes)) {
+            WScript.Echo(`
+Index ${idxLoop.Name}
+    Primary key = ${idxLoop.PrimaryKey}
+    Unique = ${idxLoop.Unique}
+    Columns = ${collectionToArray(idxLoop.Columns).map(colLoop => colLoop.Name).join(', ')}
+            `.trim());
+        }
+
+        // Delete new table as this is a demonstration.
+        catNorthwind.Tables.Delete(tblNew.Name);
+    } catch (error) {
+        WScript.Echo(error);
+    } finally {
+        if (catNorthwind) { catNorthwind.ActiveConnection = null; }
+        catNorthwind = null;
+        tblNew = null;
+        idxNew = null;
+        idxLoop = null;
+    }
+}
+
+// https://docs.microsoft.com/en-us/sql/ado/reference/adox-api/sortorder-property-example-vb
+{
+    let cnn: ADODB.Connection | null = null;
+    let catNorthwind: ADOX.Catalog | null;
+    let idxAscending: ADOX.Index | null;
+    let rstEmployees: ADODB.Recordset | null = null;
+    let idxDescending: ADOX.Index | null;
+
+    try {
+        // Connect to the catalog.
+        cnn = new ActiveXObject('ADODB.Connection');
+        cnn.Open(connectionString);
+        catNorthwind = new ActiveXObject('ADOX.Catalog');
+        catNorthwind.ActiveConnection = cnn;
+
+        const enumerateRecordset = (indexName: string) => {
+            rstEmployees = new ActiveXObject('ADODB.Recordset');
+            rstEmployees.Index = indexName;
+            rstEmployees.Open('Employees', cnn!, adOpenKeyset, adLockOptimistic, ADODB.CommandTypeEnum.adCmdTableDirect);
+
+            rstEmployees.MoveFirst();
+            WScript.Echo(`Index = ${rstEmployees.Index}`);
+            WScript.Echo('\tCountry - Name');
+
+            // Enumerate the Recordset. The value of the IndexNulls property will determine if the newly added record appears in the output.
+            while (!rstEmployees.EOF) {
+                WScript.Echo(`\t${rstEmployees('Country').Value} - ${rstEmployees('FirstName').Value} ${rstEmployees('LastName').Value}`);
+                rstEmployees.MoveNext();
+            }
+
+            rstEmployees.Close();
+        };
+
+        // Append Country column to new index.
+        idxAscending = new ActiveXObject('ADOX.Index');
+        idxAscending.Columns.Append('Country');
+        idxAscending.Columns('Country').SortOrder = ADOX.SortOrderEnum.adSortAscending;
+        idxAscending.Name = 'Ascending';
+        idxAscending.IndexNulls = ADOX.AllowNullsEnum.adIndexNullsAllow;
+
+        // Append new index to Employees table.
+        catNorthwind.Tables('Employees').Indexes.Append(idxAscending);
+
+        enumerateRecordset(idxAscending.Name);
+
+        // Append Country column to new index.
+        idxDescending = new ActiveXObject('ADOX.Index');
+        idxDescending.Columns.Append('Country');
+        idxDescending.Columns('Country').SortOrder = ADOX.SortOrderEnum.adSortDescending;
+        idxDescending.Name = 'Descending';
+        idxDescending.IndexNulls = ADOX.AllowNullsEnum.adIndexNullsAllow;
+
+        // Append descending index to Employees table.
+        catNorthwind.Tables('Employees').Indexes.Append(idxDescending);
+
+        enumerateRecordset(idxDescending.Name);
+
+        // Delete new indexes because this is a demonstration.
+        catNorthwind.Tables('Employees').Indexes.Delete(idxAscending.Name);
+        catNorthwind.Tables('Employees').Indexes.Delete(idxDescending.Name);
+    } catch (error) {
+        WScript.Echo(error);
+    } finally {
+        cnn = tryClose(cnn);
+        catNorthwind = null;
+        idxAscending = null;
+        idxDescending = null;
+        rstEmployees = tryClose(rstEmployees);
+    }
+}
+
+// https://docs.microsoft.com/en-us/sql/ado/reference/adox-api/views-and-fields-collections-example-vb
+{
+    let cnn: ADODB.Connection | null = null;
+    let cat: ADOX.Catalog | null;
+    let rst: ADODB.Recordset | null = null;
+    let fld: ADODB.Field | null;
+    try {
+        // Open the Connection
+        cnn = new ActiveXObject('ADODB.Connection');
+        cnn.Open(connectionString);
+
+        // Open the catalog
+        cat = new ActiveXObject('ADOX.Catalog');
+        cat.ActiveConnection = cnn;
+
+        // Set the Source for the Recordset
+        rst = new ActiveXObject('ADODB.Recordset');
+        rst.Source = cat.Views('AllCustomers').Command;
+
+        // Retrieve Field information
+        rst.Fields.Refresh();
+
+        for (fld of collectionToArray(rst.Fields)) {
+            WScript.Echo(`${fld.Name}.${fld.Type}`);
+        }
+    } catch (error) {
+        WScript.Echo(error);
+    } finally {
+        cnn = tryClose(cnn);
+        cat = null;
+        rst = tryClose(rst);
+        fld = null;
+    }
+}
+
+const flatten = <T>(arr: T[][], result: T[] = []) => {
+    for (let i = 0, length = arr.length; i < length; i++) {
+        const value: T | any[] = arr[i]; // any in this context is because the array might have an arbitrary depth
+        if (Array.isArray(value)) {
+            flatten(value, result);
+        } else {
+            result.push(value);
+        }
+    }
+    return result;
+};
+
+// List indexes with multiple columns
+{
+    interface TableIndex {
+        tbl: ADOX.Table;
+        idx: ADOX.Index;
+    }
+
+    const cat = new ActiveXObject('ADOX.Catalog');
+    cat.ActiveConnection = connectionString;
+
+    let multicolumnIndexes = flatten(
+        collectionToArray(cat.Tables).map(tbl =>
+            collectionToArray(tbl.Indexes).map<TableIndex>(idx =>
+                ({ tbl, idx })
+            )
+        )
+    ).filter(x => x.idx.Columns.Count > 1);
+    for (const x of multicolumnIndexes) {
+        const columns = collectionToArray(x.idx.Columns).map(col => col.Name).join(', ');
+        WScript.Echo(`${x.tbl.Name}.${x.idx.Name} -- ${columns}`);
+    }
+    multicolumnIndexes = [];
+}
diff --git a/types/activex-adox/index.d.ts b/types/activex-adox/index.d.ts
new file mode 100644
index 0000000000..8960dd0a31
--- /dev/null
+++ b/types/activex-adox/index.d.ts
@@ -0,0 +1,335 @@
+// Type definitions for Microsoft ADO Extensions 6.0 for DDL and Security - ADOX 6.0
+// Project: https://docs.microsoft.com/en-us/sql/ado/reference/adox-api/adox-object-model
+// Definitions by: Zev Spitz <https://github.com/zspitz>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+/// <reference types="activex-adodb" />
+
+declare namespace ADOX {
+    const enum ActionEnum {
+        adAccessDeny = 3,
+        adAccessGrant = 1,
+        adAccessRevoke = 4,
+        adAccessSet = 2,
+    }
+
+    const enum AllowNullsEnum {
+        adIndexNullsAllow = 0,
+        adIndexNullsDisallow = 1,
+        adIndexNullsIgnore = 2,
+        adIndexNullsIgnoreAny = 4,
+    }
+
+    const enum ColumnAttributesEnum {
+        adColFixed = 1,
+        adColNullable = 2,
+    }
+
+    const enum InheritTypeEnum {
+        adInheritBoth = 3,
+        adInheritContainers = 2,
+        adInheritNone = 0,
+        adInheritNoPropogate = 4,
+        adInheritObjects = 1,
+    }
+
+    const enum KeyTypeEnum {
+        adKeyForeign = 2,
+        adKeyPrimary = 1,
+        adKeyUnique = 3,
+    }
+
+    const enum ObjectTypeEnum {
+        adPermObjColumn = 2,
+        adPermObjDatabase = 3,
+        adPermObjProcedure = 4,
+        adPermObjProviderSpecific = -1,
+        adPermObjTable = 1,
+        adPermObjView = 5,
+    }
+
+    const enum RightsEnum {
+        adRightCreate = 16384,
+        adRightDelete = 65536,
+        adRightDrop = 256,
+        adRightExclusive = 512,
+        adRightExecute = 536870912,
+        adRightFull = 268435456,
+        adRightInsert = 32768,
+        adRightMaximumAllowed = 33554432,
+        adRightNone = 0,
+        adRightRead = -2147483648,
+        adRightReadDesign = 1024,
+        adRightReadPermissions = 131072,
+        adRightReference = 8192,
+        adRightUpdate = 1073741824,
+        adRightWithGrant = 4096,
+        adRightWriteDesign = 2048,
+        adRightWriteOwner = 524288,
+        adRightWritePermissions = 262144,
+    }
+
+    const enum RuleEnum {
+        adRICascade = 1,
+        adRINone = 0,
+        adRISetDefault = 3,
+        adRISetNull = 2,
+    }
+
+    const enum SortOrderEnum {
+        adSortAscending = 1,
+        adSortDescending = 2,
+    }
+
+    class Catalog {
+        private constructor();
+        private 'ADOX.Catalog_typekey': Catalog;
+
+        /** Can be set to a Connection object or a string. Returns the active Connection object, or `null` */
+        ActiveConnection: string | ADODB.Connection | null;
+
+        /**
+         * The **Create** method creates and opens a new ADO Connection to the data source specified in _ConnectString_. If successful, the new **Connection** object is assigned to the **ActiveConnection** property.
+         *
+         * An error will occur if the provider does not support creating new catalogs.
+         *
+         * @param ConnectString Connection string
+         */
+        Create(ConnectString: string): void;
+
+        /**
+         * @param ObjectTypeId Specifies the GUID for a provider object type not defined by the OLE DB specification
+         */
+        GetObjectOwner(ObjectName: string, ObjectType: ObjectTypeEnum.adPermObjProviderSpecific, ObjectTypeId: any): string;
+        GetObjectOwner(ObjectName: string, ObjectType: ObjectTypeEnum): string;
+        readonly Groups: Groups;
+        readonly Procedures: Procedures;
+
+        /**
+         * @param UserName Specifies the name of the **User** or **Group** to own the object
+         * @param ObjectTypeId Specifies the GUID for a provider object type that is not defined by the OLE DB specification
+         */
+        SetObjectOwner(ObjectName: string, ObjectType: ObjectTypeEnum.adPermObjProviderSpecific, UserName: string, ObjectTypeId: any): void;
+        SetObjectOwner(ObjectName: string, ObjectType: ObjectTypeEnum, UserName: string): void;
+        readonly Tables: Tables;
+        readonly Users: Users;
+        readonly Views: Views;
+    }
+
+    class Column {
+        private constructor();
+        private 'ADOX.Column_typekey': Column;
+        Attributes: ColumnAttributesEnum;
+        DefinedSize: number;
+        Name: string;
+        NumericScale: number;
+        ParentCatalog: Catalog;
+        Precision: number;
+        readonly Properties: ADODB.Properties;
+        RelatedColumn: string;
+        SortOrder: SortOrderEnum;
+        Type: ADODB.DataTypeEnum;
+    }
+
+    interface Columns {
+        /**
+         * @param Type [Type=202]
+         * @param DefinedSize [DefinedSize=0]
+         */
+        Append(Item: Column | string, Type?: ADODB.DataTypeEnum, DefinedSize?: number): void;
+        readonly Count: number;
+        Delete(Item: string | number): void;
+        Item(Item: string | number): Column;
+        Refresh(): void;
+        (Item: string | number): Column;
+    }
+
+    class Group {
+        private constructor();
+        private 'ADOX.Group_typekey': Group;
+
+        /**
+         * @param Name Specifies the name of the object for which to set permissions. Pass `null` if you want to get the permissions for the object container.
+         * @param ObjectTypeId Specifies the GUID for a provider object type not defined by the OLE DB specification.
+         */
+        GetPermissions(Name: string | null, ObjectType: ObjectTypeEnum.adPermObjProviderSpecific, ObjectTypeId: any): RightsEnum;
+        GetPermissions(Name: string | null, ObjectType: ObjectTypeEnum): RightsEnum;
+        Name: string;
+        ParentCatalog: Catalog;
+        readonly Properties: ADODB.Properties;
+
+        /**
+         * @param Rights A bitmask of one or more of the **RightsEnum** constants, that indicates the rights to set.
+         * @param Inherit [Inherit=0]
+         * @param ObjectTypeId Specifies the GUID for a provider object type not defined by the OLE DB specification.
+         */
+        SetPermissions(Name: string, ObjectType: ObjectTypeEnum.adPermObjProviderSpecific, Action: ActionEnum, Rights: RightsEnum, Inherit: InheritTypeEnum, ObjectTypeId: any): void;
+        SetPermissions(Name: string, ObjectType: ObjectTypeEnum, Action: ActionEnum, Rights: RightsEnum, Inherit?: InheritTypeEnum): void;
+        readonly Users: Users;
+    }
+
+    interface Groups {
+        Append(Item: Group | string): void;
+        readonly Count: number;
+        Delete(Item: string | number): void;
+        Item(Item: string | number): Group;
+        Refresh(): void;
+        (Item: string | number): Group;
+    }
+
+    class Index {
+        private constructor();
+        private 'ADOX.Index_typekey': Index;
+        Clustered: boolean;
+        readonly Columns: Columns;
+        IndexNulls: AllowNullsEnum;
+        Name: string;
+        PrimaryKey: boolean;
+        readonly Properties: ADODB.Properties;
+        Unique: boolean;
+    }
+
+    // tslint:disable-next-line:interface-name
+    interface Indexes {
+        Append(Item: Index | string, Columns?: string | SafeArray<string>): void; // is this actually two overloads, one with [Index] and one with [string,string | SafeArray<string>]?
+        readonly Count: number;
+        Delete(Item: string | number): void;
+        Item(Item: string | number): Index;
+        Refresh(): void;
+        (Item: string | number): Index;
+    }
+
+    class Key {
+        private constructor();
+        private 'ADOX.Key_typekey': Key;
+        readonly Columns: Columns;
+        DeleteRule: RuleEnum;
+        Name: string;
+        RelatedTable: string;
+        Type: KeyTypeEnum;
+        UpdateRule: RuleEnum;
+    }
+
+    interface Keys {
+        /**
+         * @param Type [Type=1]
+         * @param RelatedTable [RelatedTable='']
+         * @param RelatedColumn [RelatedColumn='']
+         */
+        Append(Item: Key | string, Type?: KeyTypeEnum, Column?: string | SafeArray<string>, RelatedTable?: string, RelatedColumn?: string): void;
+        readonly Count: number;
+        Delete(Item: string | number): void;
+        Item(Item: string | number): Key;
+        Refresh(): void;
+        (Item: string | number): Key;
+    }
+
+    class Procedure {
+        private constructor();
+        private 'ADOX.Procedure_typekey': Procedure;
+        Command: ADODB.Command;
+        readonly DateCreated: VarDate | null;
+        readonly DateModified: VarDate | null;
+        readonly Name: string;
+    }
+
+    interface Procedures {
+        Append(Name: string, Command: ADODB.Command): void;
+        readonly Count: number;
+        Delete(Item: string | number): void;
+        Item(Item: string | number): Procedure;
+        Refresh(): void;
+        (Item: string | number): Procedure;
+    }
+
+    class Table {
+        private constructor();
+        private 'ADOX.Table_typekey': Table;
+        readonly Columns: Columns;
+        readonly DateCreated: VarDate;
+        readonly DateModified: VarDate;
+        readonly Indexes: Indexes;
+        readonly Keys: Keys;
+        Name: string;
+        ParentCatalog: Catalog;
+        readonly Properties: ADODB.Properties;
+        readonly Type: string;
+    }
+
+    interface Tables {
+        Append(Item: Table | string): void;
+        readonly Count: number;
+        Delete(Item: string | number): void;
+        Item(Item: string | number): Table;
+        Refresh(): void;
+        (Item: string | number): Table;
+    }
+
+    class User {
+        private constructor();
+        private 'ADOX.User_typekey': User;
+        ChangePassword(OldPassword: string, NewPassword: string): void;
+
+        /**
+         * @param Name Specifies the name of the object for which to set permissions. Pass `null` if you want to get the permissions for the object container.
+         * @param ObjectTypeId Specifies the GUID for a provider object type not defined by the OLE DB specification.
+         */
+        GetPermissions(Name: string | null, ObjectType: ObjectTypeEnum.adPermObjProviderSpecific, ObjectTypeId: any): RightsEnum;
+        GetPermissions(Name: string | null, ObjectType: ObjectTypeEnum): RightsEnum;
+        readonly Groups: Groups;
+        Name: string;
+        ParentCatalog: Catalog;
+        readonly Properties: ADODB.Properties;
+
+        /**
+         * @param Rights A bitmask of one or more of the **RightsEnum** constants, that indicates the rights to set.
+         * @param Inherit [Inherit=0]
+         * @param ObjectTypeId Specifies the GUID for a provider object type not defined by the OLE DB specification.
+         */
+        SetPermissions(Name: string, ObjectType: ObjectTypeEnum.adPermObjProviderSpecific, Action: ActionEnum, Rights: RightsEnum, Inherit: InheritTypeEnum, ObjectTypeId: any): void;
+        SetPermissions(Name: string, ObjectType: ObjectTypeEnum, Action: ActionEnum, Rights: RightsEnum, Inherit?: InheritTypeEnum): void;
+    }
+
+    interface Users {
+        /** @param Password [Password=''] */
+        Append(Item: User | string, Password?: string): void;
+        readonly Count: number;
+        Delete(Item: string | number): void;
+        Item(Item: string | number): User;
+        Refresh(): void;
+        (Item: string | number): User;
+    }
+
+    class View {
+        private constructor();
+        private 'ADOX.View_typekey': View;
+        Command: ADODB.Command;
+        readonly DateCreated: VarDate;
+        readonly DateModified: VarDate;
+        readonly Name: string;
+    }
+
+    interface Views {
+        Append(Name: string, Command: ADODB.Command): void;
+        readonly Count: number;
+        Delete(Item: string | number): void;
+        Item(Item: string | number): View;
+        Refresh(): void;
+        (Item: string | number): View;
+    }
+}
+
+interface ActiveXObject {
+    new<K extends keyof ActiveXObjectNameMap = any>(progid: K): ActiveXObjectNameMap[K];
+}
+
+interface ActiveXObjectNameMap {
+    'ADOX.Catalog': ADOX.Catalog;
+    'ADOX.Column': ADOX.Column;
+    'ADOX.Group': ADOX.Group;
+    'ADOX.Index': ADOX.Index;
+    'ADOX.Key': ADOX.Key;
+    'ADOX.Table': ADOX.Table;
+    'ADOX.User': ADOX.User;
+}
diff --git a/types/activex-adox/package.json b/types/activex-adox/package.json
new file mode 100644
index 0000000000..d9b1031263
--- /dev/null
+++ b/types/activex-adox/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "activex-helpers": "*"
+    }
+}
\ No newline at end of file
diff --git a/types/activex-adox/tsconfig.json b/types/activex-adox/tsconfig.json
new file mode 100644
index 0000000000..7aaa955db5
--- /dev/null
+++ b/types/activex-adox/tsconfig.json
@@ -0,0 +1,22 @@
+
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es5", "scripthost"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "activex-adox-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/activex-adox/tslint.json b/types/activex-adox/tslint.json
new file mode 100644
index 0000000000..b06c06beef
--- /dev/null
+++ b/types/activex-adox/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-const-enum": false,
+        "max-line-length": false
+    }
+}
\ No newline at end of file
diff --git a/types/activex-infopath/index.d.ts b/types/activex-infopath/index.d.ts
index 1aa8cba2f9..c00c67e197 100644
--- a/types/activex-infopath/index.d.ts
+++ b/types/activex-infopath/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://msdn.microsoft.com/en-us/library/jj602751.aspx
 // Definitions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.6
 
 /// <reference types="activex-adodb" />
 /// <reference types="activex-msxml2" />

From 2111782c01a2daccabdbc92d617306ca84872690 Mon Sep 17 00:00:00 2001
From: leozhao0709 <leozhao0709@users.noreply.github.com>
Date: Wed, 18 Apr 2018 17:05:05 -0700
Subject: [PATCH 1363/1382] add prompt options (#24983)

add prompt options which used to prompt the user to select their account
---
 types/passport/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/passport/index.d.ts b/types/passport/index.d.ts
index 4a91d2b64b..0be63d337e 100644
--- a/types/passport/index.d.ts
+++ b/types/passport/index.d.ts
@@ -51,6 +51,7 @@ declare namespace passport {
         pauseStream?: boolean;
         userProperty?: string;
         passReqToCallback?: boolean;
+        prompt?: string;
     }
 
     interface Authenticator<InitializeRet = express.Handler, AuthenticateRet = any, AuthorizeRet = AuthenticateRet> {

From aa93526d48b171bcec787e806993332ffd9b3128 Mon Sep 17 00:00:00 2001
From: Bruno Scheufler <4772980+BrunoScheufler@users.noreply.github.com>
Date: Thu, 19 Apr 2018 17:45:08 +0200
Subject: [PATCH 1364/1382] Node: Added missing windowsHide properties to
 SpawnOptions (revision) (#25122)

* Added missing windowsHide properties to SpawnOptions of child_process module

* Retrigger CI
---
 types/node/index.d.ts       | 2 ++
 types/node/node-tests.ts    | 3 ++-
 types/node/v8/index.d.ts    | 2 ++
 types/node/v8/node-tests.ts | 5 +++--
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index d27e680aed..50a17ddb76 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -20,6 +20,7 @@
 //                 Klaus Meinhardt <https://github.com/ajafff>
 //                 Huw <https://github.com/hoo29>
 //                 Nicolas Even <https://github.com/n-e>
+//                 Bruno Scheufler <https://github.com/brunoscheufler>
 //                 Mohsen Azimi <https://github.com/mohsen1>
 //                 Hoàng Văn Khải <https://github.com/KSXGitHub>
 //                 Alexander T. <https://github.com/a-tarasyuk>
@@ -2087,6 +2088,7 @@ declare module "child_process" {
         gid?: number;
         shell?: boolean | string;
         windowsVerbatimArguments?: boolean;
+        windowsHide?: boolean;
     }
 
     export function spawn(command: string, args?: string[], options?: SpawnOptions): ChildProcess;
diff --git a/types/node/node-tests.ts b/types/node/node-tests.ts
index 776364a740..7a055c620e 100644
--- a/types/node/node-tests.ts
+++ b/types/node/node-tests.ts
@@ -2059,7 +2059,8 @@ namespace string_decoder_tests {
 namespace child_process_tests {
     {
         childProcess.exec("echo test");
-        childProcess.exec("echo test", {windowsHide: true});
+        childProcess.exec("echo test", { windowsHide: true });
+        childProcess.spawn("echo", ["test"], { windowsHide: true });
         childProcess.spawnSync("echo test");
         childProcess.spawnSync("echo test", {windowsVerbatimArguments: false});
     }
diff --git a/types/node/v8/index.d.ts b/types/node/v8/index.d.ts
index 642a957eca..f055cd0716 100644
--- a/types/node/v8/index.d.ts
+++ b/types/node/v8/index.d.ts
@@ -19,6 +19,7 @@
 //                 Alberto Schiabel <https://github.com/jkomyno>
 //                 Huw <https://github.com/hoo29>
 //                 Nicolas Even <https://github.com/n-e>
+//                 Bruno Scheufler <https://github.com/brunoscheufler>
 //                 Hoàng Văn Khải <https://github.com/KSXGitHub>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
@@ -2086,6 +2087,7 @@ declare module "child_process" {
         gid?: number;
         shell?: boolean | string;
         windowsVerbatimArguments?: boolean;
+        windowsHide?: boolean;
     }
 
     export function spawn(command: string, args?: string[], options?: SpawnOptions): ChildProcess;
diff --git a/types/node/v8/node-tests.ts b/types/node/v8/node-tests.ts
index 2546184d0a..a79d96aa6a 100644
--- a/types/node/v8/node-tests.ts
+++ b/types/node/v8/node-tests.ts
@@ -2033,9 +2033,10 @@ namespace string_decoder_tests {
 namespace child_process_tests {
     {
         childProcess.exec("echo test");
-        childProcess.exec("echo test", {windowsHide: true});
+        childProcess.spawn("echo", ["test"], { windowsHide: true });
+        childProcess.exec("echo test", { windowsHide: true });
         childProcess.spawnSync("echo test");
-        childProcess.spawnSync("echo test", {windowsVerbatimArguments: false});
+        childProcess.spawnSync("echo test", { windowsVerbatimArguments: false });
     }
 
     {

From 92760d42ac53cc42e49cb694e21d890e3a948767 Mon Sep 17 00:00:00 2001
From: falsandtru <falsandtru@users.noreply.github.com>
Date: Fri, 20 Apr 2018 02:05:43 +0900
Subject: [PATCH 1365/1382] mocha: fix a regression bug (#25117)

* Revert "IRunner should be an instance of EventEmitter (#24971)"

This reverts commit 4478031e2fbc4ed9cafbe27ea4eb28f787cca00c.

* Bump version

* Add tests
---
 types/mocha/index.d.ts     | 7 ++-----
 types/mocha/mocha-tests.ts | 5 +++++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/types/mocha/index.d.ts b/types/mocha/index.d.ts
index b99fa24ab2..0e066791eb 100644
--- a/types/mocha/index.d.ts
+++ b/types/mocha/index.d.ts
@@ -1,16 +1,13 @@
-// Type definitions for mocha 5.1
+// Type definitions for mocha 5.2
 // Project: http://mochajs.org/
 // Definitions by: Kazi Manzur Rashid <https://github.com/kazimanzurrashid>
 //                 otiai10 <https://github.com/otiai10>
 //                 jt000 <https://github.com/jt000>
 //                 Vadim Macagon <https://github.com/enlight>
 //                 Andrew Bradley <https://github.com/cspotcode>
-//                 Dmitrii Sorin <https://github.com/1999>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
-/// <reference types="node" />
-
 interface MochaSetupOptions {
     // milliseconds to wait before considering a test slow
     slow?: number;
@@ -204,7 +201,7 @@ declare namespace Mocha {
     }
 
     /** Partial interface for Mocha's `Runner` class. */
-    interface IRunner extends NodeJS.EventEmitter {
+    interface IRunner {
         stats?: IStats;
         started: boolean;
         suite: ISuite;
diff --git a/types/mocha/mocha-tests.ts b/types/mocha/mocha-tests.ts
index 4694c66fe7..f2fa323f19 100644
--- a/types/mocha/mocha-tests.ts
+++ b/types/mocha/mocha-tests.ts
@@ -10,6 +10,11 @@ import {
     xit as importedXit
 } from 'mocha';
 
+// Warning!!
+// Don't refer node.d.ts!!
+// See #22510.
+(): number => setTimeout(() => 0, 0);
+
 let boolean: boolean;
 let string: string;
 let number: number;

From 026ef4246a938045684872351966d2d490560632 Mon Sep 17 00:00:00 2001
From: Andy Patterson <andnpatterson@gmail.com>
Date: Thu, 19 Apr 2018 13:09:13 -0400
Subject: [PATCH 1366/1382] [@types/mathjs] tests only test types, not runtime
 behaviour (#24875)

---
 types/mathjs/mathjs-tests.ts | 575 ++++++++++-------------------------
 1 file changed, 157 insertions(+), 418 deletions(-)

diff --git a/types/mathjs/mathjs-tests.ts b/types/mathjs/mathjs-tests.ts
index 306ab44ccd..6cf43dc698 100644
--- a/types/mathjs/mathjs-tests.ts
+++ b/types/mathjs/mathjs-tests.ts
@@ -3,20 +3,16 @@ Basic usage examples
 */
 {
 	// functions and constants
-	math.round(math.e, 3);           // 2.718
-	math.atan2(3, -3) / math.pi;     // 0.75
-	math.log(10000, 10);             // 4
-	math.sqrt(-4);                   // 2i
-	math.pow([[-1, 2], [3, 1]], 2);  // [[7, 0], [0, 7]]
+	math.round(math.e, 3);
+	math.atan2(3, -3) / math.pi;
+	math.log(10000, 10);
+	math.sqrt(-4);
+	math.pow([[-1, 2], [3, 1]], 2);
 	const angle = 0.2;
-	math.add(math.pow(math.sin(angle), 2), math.pow(math.cos(angle), 2)); // returns number ~1
+	math.add(math.pow(math.sin(angle), 2), math.pow(math.cos(angle), 2));
 
 	// expressions
-	math.eval('1.2 * (2 + 4.5)');    // 7.8
-	math.eval('5.08 cm to inch');    // 2 inch
-	math.eval('sin(45 deg) ^ 2');    // 0.5
-	math.eval('9 / 3 + 2i');         // 3 + 2i
-	math.eval('det([-1, 2; 3, 1])'); // -7
+	math.eval('1.2 * (2 + 4.5)');
 
 	// chained operations
 	const a = math.chain(3)
@@ -25,7 +21,6 @@ Basic usage examples
 		.done(); // 14
 
 	// mixed use of different data types in functions
-	console.log('mixed use of data types');
 	math.add(4, [5, 6]);                   // number + Array, [9, 10]
 	math.multiply(math.unit('5 mm'), 3);   // Unit * number,  15 mm
 	math.subtract([2, 3, 4], 5);           // Array - number, [-3, -2, -1]
@@ -38,40 +33,20 @@ Bignumbers examples
 {
 	// configure the default type of numbers as BigNumbers
 	math.config({
-		number: 'bignumber',	// Default type of number:
-								// 'number' (default), 'bignumber', or 'fraction'
-		precision: 20       	// Number of significant digits for BigNumbers
+		number: 'bignumber',
+		precision: 20,
 	});
 
-	console.log('round-off errors with numbers');
-	math.add(0.1, 0.2);    // number, 0.30000000000000004
-	math.divide(0.3, 0.2); // number, 1.4999999999999998
-	console.log();
-
-	console.log('no round-off errors with BigNumbers');
-	math.add(math.bignumber(0.1), math.bignumber(0.2));     // BigNumber, 0.3
-	math.divide(math.bignumber(0.3), math.bignumber(0.2));  // BigNumber, 1.5
-	console.log();
-
-	console.log('create BigNumbers from strings when exceeding the range of a number');
-	math.bignumber(1.2e+500);    // BigNumber, Infinity      WRONG
-	math.bignumber('1.2e+500');  // BigNumber, 1.2e+500
-	console.log();
-
-	// one can work conveniently with BigNumbers using the expression parser.
-	// note though that BigNumbers are only supported in arithmetic functions
-	console.log('use BigNumbers in the expression parser');
-	math.eval('0.1 + 0.2');  // BigNumber, 0.3
-	math.eval('0.3 / 0.2');  // BigNumber, 1.5
-	console.log();
+	{
+		math.add(math.bignumber(0.1), math.bignumber(0.2));     // BigNumber, 0.3
+		math.divide(math.bignumber(0.3), math.bignumber(0.2));  // BigNumber, 1.5
+	}
 }
 
 /*
 Chaining examples
 */
 {
-	// create a chained operation using the function `chain(value)`
-	// end a chain using done(). Let's calculate (3 + 4) * 2
 	const a = math.chain(3)
 		.add(4)
 		.multiply(2)
@@ -82,19 +57,13 @@ Chaining examples
 		.divide(4)
 		.sin()
 		.square()
-		.done(); // 0.5
-
-	// A chain has a few special methods: done, toString, valueOf, get, and set.
-	// these are demonstrated in the following examples
+		.done();
 
 	// toString will return a string representation of the chain's value
 	const chain = math.chain(2).divide(3);
-	const str = chain.toString(); // "0.6666666666666666"
+	const str: string = chain.toString(); // "0.6666666666666666"
 
-	// a chain has a function .valueOf(), which returns the value hold by the chain.
-	// This allows using it in regular operations. The function valueOf() acts the
-	// same as function done().
-	chain.valueOf(); // 0.66666666666667
+	chain.valueOf();
 
 	// the function subset can be used to get or replace sub matrices
 	const array = [[1, 2], [3, 4]];
@@ -105,212 +74,114 @@ Chaining examples
 	const m = math.chain(array)
 		.subset(math.index(0, 0), 8)
 		.multiply(3)
-		.done(); // [[24, 6], [9, 12]]
+		.done();
 }
 
 /*
 Complex numbers examples
 */
 {
-	const a = math.complex(2, 3); // 2 + 3i
+	const a = math.complex(2, 3);
+	// create a complex number by providing a string with real and complex parts
+	const b = math.complex('3 - 7i');
 
 	// read the real and complex parts of the complex number
-	a.re;                    // 2
-	a.im;                    // 3
+	{
+		const x: number = a.re;
+		const y: number = a.im;
+
+		// adjust the complex value
+		a.re = 5;
+	}
 
 	// clone a complex value
-	const clone = a.clone(); // 2 + 3i
-
-	// adjust the complex value
-	a.re = 5; // 5 + 3i
-
-	// create a complex number by providing a string with real and complex parts
-	const b = math.complex('3 - 7i'); // 3 - 7i
-	console.log();
+	{
+		const clone = a.clone();
+	}
 
 	// perform operations with complex numbers
-	console.log('perform operations');
-	math.add(a, b);          // 8 - 4i
-	math.multiply(a, b);     // 36 - 26i
-	math.sin(a);             // -9.6541254768548 + 2.8416922956064i
-
-	// some operations will return a complex number depending on the arguments
-	math.sqrt(4);           // 2
-	math.sqrt(-4);          // 2i
+	{
+		math.add(a, b);
+		math.multiply(a, b);
+		math.sin(a);
+	}
 
 	// create a complex number from polar coordinates
-	console.log('create complex numbers with polar coordinates');
-	const c = math.complex({r: math.sqrt(2), phi: math.pi / 4}); // 1 + i
+	{
+		const p: math.PolarCoordinates = { r: math.sqrt(2), phi: math.pi / 4 };
+		const c: math.Complex = math
+			.complex(p);
+	}
 
 	// get polar coordinates of a complex number
-	const d = math.complex(3, 4);
-        d.toPolar();      // { r: 5, phi: 0.9272952180016122 }
+	{
+		const p: math.PolarCoordinates = math
+			.complex(3, 4)
+			.toPolar();
+	}
 }
 
 /*
 Expressions examples
 */
 {
-	// 1. using the function math.eval
-	//
-	// Function `eval` accepts a single expression or an array with
-	// expressions as first argument, and has an optional second argument
-	// containing a scope with variables and functions. The scope is a regular
-	// JavaScript Object. The scope will be used to resolve symbols, and to write
-	// assigned variables or function.
-	console.log('1. USING FUNCTION MATH.EVAL');
-
 	// evaluate expressions
-	console.log('\nevaluate expressions');
-	math.eval('sqrt(3^2 + 4^2)');        // 5
-	math.eval('sqrt(-4)');               // 2i
-	math.eval('2 inch to cm');           // 5.08 cm
-	math.eval('cos(45 deg)');            // 0.70711
+	{
+		math.eval('sqrt(3^2 + 4^2)');
+	}
 
 	// evaluate multiple expressions at once
-	console.log('\nevaluate multiple expressions at once');
-	math.eval([
-		'f = 3',
-		'g = 4',
-		'f * g'
-	]); // [3, 4, 12]
-
-	// provide a scope (just a regular JavaScript Object)
-	console.log('\nevaluate expressions providing a scope with variables and functions');
-	let scope: any = {
-		a: 3,
-		b: 4,
-	};
-
-	// variables can be read from the scope
-	math.eval('a * b', scope);           // 12
-
-	// variable assignments are written to the scope
-	math.eval('c = 2.3 + 4.5', scope);   // 6.8
-	scope.c;                             // 6.8
+	{
+		math.eval([
+			'f = 3',
+			'g = 4',
+			'f * g'
+		]);
+	}
 
 	// scope can contain both variables and functions
-	scope["hello"] = function(name: string) {
-		return `hello, ${name}!`;
-	};
-	math.eval('hello("hero")', scope);   // "hello, hero!"
+	{
+		const scope = { hello: (name: string) => `hello, ${name}!` };
+		math.eval('hello("hero")', scope);   // "hello, hero!"
+	}
 
 	// define a function as an expression
-	let f = math.eval('f(x) = x ^ a', scope);
-	f(2);                                // 8
-	scope.f(2);                          // 8
+	{
+		const scope: any = {
+			a: 3,
+			b: 4,
+		};
+		const f = math.eval('f(x) = x ^ a', scope);
+		f(2);
+		scope.f(2);
+	}
 
-	// 2. using function math.parse
-	//
-	// Function `math.parse` parses expressions into a node tree. The syntax is
-	// similar to function `math.eval`.
-	// Function `parse` accepts a single expression or an array with
-	// expressions as first argument. The function returns a node tree, which
-	// then can be compiled against math, and then evaluated against an (optional
-	// scope. This scope is a regular JavaScript Object. The scope will be used
-	// to resolve symbols, and to write assigned variables or function.
-	console.log('\n2. USING FUNCTION MATH.PARSE');
-
-	// parse an expression
-	console.log('\nparse an expression into a node tree');
-	const node1 = math.parse('sqrt(3^2 + 4^2)');
-	node1.toString();                    // "sqrt((3 ^ 2) + (4 ^ 2))"
-
-	// compile and evaluate the compiled code
-	// you could also do this in two steps: node1.compile().eval()
-	node1.eval();                        // 5
-
-	// provide a scope
-	console.log('\nprovide a scope');
-	const node2 = math.parse('x^a');
-	let code2 = node2.compile();
-	node2.toString();                    // "x ^ a"
-	scope = {
-		x: 3,
-		a: 2,
-	};
-	code2.eval(scope);                   // 9
-
-	// change a value in the scope and re-evaluate the node
-	scope.a = 3;
-	code2.eval(scope);                   // 27
+	{
+		const node2 = math.parse('x^a');
+		const code2: math.EvalFunction = node2.compile();
+		node2.toString();
+	}
 
 	// 3. using function math.compile
-	//
-	// Function `math.compile` compiles expressions into a node tree. The syntax is
-	// similar to function `math.eval`.
-	// Function `compile` accepts a single expression or an array with
-	// expressions as first argument, and returns an object with a function eval
-	// to evaluate the compiled expression. On evaluation, an optional scope can
-	// be provided. This scope will be used to resolve symbols, and to write
-	// assigned variables or function.
-	console.log('\n3. USING FUNCTION MATH.COMPILE');
-
 	// parse an expression
-	console.log('\ncompile an expression');
-	const code3 = math.compile('sqrt(3^2 + 4^2)');
-
-	// evaluate the compiled code
-	code3.eval();                        // 5
-
-	// provide a scope for the variable assignment
-	console.log('\nprovide a scope');
-	code2 = math.compile('a = a + 3');
-	scope = { a: 7 };
-	code2.eval(scope);
-	scope.a;                             // 10
-
+	{
+		// provide a scope for the variable assignment
+		const code2 = math.compile('a = a + 3');
+		const scope = { a: 7 };
+		code2.eval(scope);
+	}
 	// 4. using a parser
-	//
-	// In addition to the static functions `math.eval` and `math.parse`, math.js
-	// contains a parser with functions `eval` and `parse`, which automatically
-	// keeps a scope with assigned variables in memory. The parser also contains
-	// some convenience methods to get, set, and remove variables from memory.
-	console.log('\n4. USING A PARSER');
 	const parser = math.parser();
 
-	// evaluate with parser
-	console.log('\nevaluate expressions');
-	parser.eval('sqrt(3^2 + 4^2)');          // 5
-	parser.eval('sqrt(-4)');                 // 2i
-	parser.eval('2 inch to cm');             // 5.08 cm
-	parser.eval('cos(45 deg)');              // 0.70711
-
-	// define variables and functions
-	console.log('\ndefine variables and functions');
-	parser.eval('x = 7 / 2');                // 3.5
-	parser.eval('x + 3');                    // 6.5
-	parser.eval('f(x, y) = x^y');            // f(x, y)
-	parser.eval('f(2, 3)');                  // 8
-
-	// manipulate matrices
-	// Note that matrix indexes in the expression parser are one-based with the
-	// upper-bound included. On a JavaScript level however, math.js uses zero-based
-	// indexes with an excluded upper-bound.
-	console.log('\nmanipulate matrices');
-	parser.eval('k = [1, 2; 3, 4]');         // [[1, 2], [3, 4]]
-	parser.eval('l = zeros(2, 2)');          // [[0, 0], [0, 0]]
-	parser.eval('l[1, 1:2] = [5, 6]');       // [[5, 6], [0, 0]]
-	parser.eval('l[2, :] = [7, 8]');         // [[5, 6], [7, 8]]
-	parser.eval('m = k * l');                // [[19, 22], [43, 50]]
-	parser.eval('n = m[2, 1]');              // 43
-	parser.eval('n = m[:, 1]');              // [[19], [43]]
-
 	// get and set variables and functions
-	console.log('\nget and set variables and function in the scope of the parser');
-	const x = parser.get('x');
-	console.log('x =', x);                          // x = 7
-	f = parser.get('f');
-	console.log('f =', math.format(f));             // f = f(x, y)
-	const g = f(3, 3);
-	console.log('g =', g);                          // g = 27
+	{
+		const x = parser.get('x');
+		const f = parser.get('f');
+		const g = f(3, 3);
 
-	parser.set('h', 500);
-	parser.eval('h / 2');                    // 250
-	parser.set('hello', function(name: string) {
-	return `hello, ${name}!`;
-	});
-	parser.eval('hello("hero")');            // "hello, hero!"
+		parser.set('h', 500);
+		parser.set('hello', (name: string) => `hello, ${name}!`);
+	}
 
 	// clear defined functions and variables
 	parser.clear();
@@ -322,51 +193,21 @@ Fractions examples
 {
 	// configure the default type of numbers as Fractions
 	math.config({
-		number: 'fraction'   // Default type of number:
-							// 'number' (default), 'bignumber', or 'fraction'
+		number: 'fraction',
 	});
 
-	console.log('basic usage');
-	math.fraction(0.125);         // Fraction, 1/8
-	math.fraction(0.32);          // Fraction, 8/25
-	math.fraction('1/3');         // Fraction, 1/3
-	math.fraction('0.(3)');       // Fraction, 1/3
-	math.fraction(2, 3);          // Fraction, 2/3
-	math.fraction('0.(285714)');  // Fraction, 2/7
-	console.log();
+	const x = math.fraction(0.125);
+	const y = math.fraction('1/3');
+	math.fraction(2, 3);
 
-	console.log('round-off errors with numbers');
-	math.add(0.1, 0.2);                // number, 0.30000000000000004
-	math.divide(0.3, 0.2);             // number, 1.4999999999999998
-	console.log();
-
-	console.log('no round-off errors with fractions :)');
-	math.add(math.fraction(0.1), math.fraction(0.2));     // Fraction, 3/10
-	math.divide(math.fraction(0.3), math.fraction(0.2));  // Fraction, 3/2
-	console.log();
-
-	console.log('represent an infinite number of repeating digits');
-	math.fraction('1/3');        // Fraction, 0.(3)
-	math.fraction('2/7');        // Fraction, 0.(285714)
-	math.fraction('23/11');      // Fraction, 2.(09)
-	console.log();
-
-	// one can work conveniently with fractions using the expression parser.
-	// note though that Fractions are only supported by basic arithmetic functions
-	console.log('use fractions in the expression parser');
-	math.eval('0.1 + 0.2'); // Fraction,  3/10
-	math.eval('0.3 / 0.2'); // Fraction,  3/2
-	math.eval('23 / 11');   // Fraction, 23/11
-	console.log();
+	math.add(x, y);
+	math.divide(x, y);
 
 	// output formatting
-	console.log('output formatting of fractions');
 	const a = math.fraction('2/3');
-	console.log(math.format(a));                          // Fraction,  2/3
-	console.log(math.format(a, {fraction: 'ratio'}));     // Fraction,  2/3
-	console.log(math.format(a, {fraction: 'decimal'}));   // Fraction,  0.(6)
-	console.log(a.toString());                            // Fraction,  0.(6)
-        console.log();
+	console.log(math.format(a));
+	console.log(math.format(a, {fraction: 'ratio'}));
+	console.log(math.format(a, {fraction: 'decimal'}));
 }
 
 /*
@@ -375,76 +216,60 @@ Matrices examples
 {
 	// create matrices and arrays. a matrix is just a wrapper around an Array,
 	// providing some handy utilities.
-	console.log('create a matrix');
-	const a = math.matrix([1, 4, 9, 16, 25]); // [1, 4, 9, 16, 25]
-	const b = math.matrix(math.ones([2, 3])); // [[1, 1, 1], [1, 1, 1]]
-	b.size();                           // [2, 3]
+	const a: math.Matrix = math.matrix([1, 4, 9, 16, 25]);
+	const b: math.Matrix = math.matrix(math.ones([2, 3]));
+	b.size();
 
 	// the Array data of a Matrix can be retrieved using valueOf()
-	const array = a.valueOf();  // [1, 4, 9, 16, 25]
+	const array = a.valueOf();
 
 	// Matrices can be cloned
-	const clone = a.clone(); // [1, 4, 9, 16, 25]
-	console.log();
+	const clone: math.Matrix = a.clone();
 
 	// perform operations with matrices
-	console.log('perform operations');
-	math.sqrt(a);                       // [1, 2, 3, 4, 5]
-	const c = [1, 2, 3, 4, 5];
-	math.factorial(c);                  // [1, 2, 6, 24, 120]
-	console.log();
+	math.sqrt(a);
+	math.factorial(a);
 
 	// create and manipulate matrices. Arrays and Matrices can be used mixed.
-	console.log('manipulate matrices');
-	const d = [[1, 2], [3, 4]]; // [[1, 2], [3, 4]]
-	const e = math.matrix([[5, 6], [1, 1]]); // [[5, 6], [1, 1]]
+	{
+		const a = [[1, 2], [3, 4]];
+		const b: math.Matrix = math.matrix([[5, 6], [1, 1]]);
 
-	// set a submatrix.
-	// Matrix indexes are zero-based.
-	e.subset(math.index(1, [0, 1]), [[7, 8]]); // [[5, 6], [7, 8]]
-	const f = math.multiply(d, e); // [[19, 22], [43, 50]]
-	const g = f.subset(math.index(1, 0)); // 43
-	console.log();
+		b.subset(math.index(1, [0, 1]), [[7, 8]]);
+		const c = math.multiply(a, b);
+		const d: math.Matrix = c.subset(math.index(1, 0));
+	}
 
 	// get a sub matrix
-	// Matrix indexes are zero-based.
-	console.log('get a sub matrix');
-	const h = math.diag(math.range(1, 4)); // [[1, 0, 0], [0, 2, 0], [0, 0, 3]]
-	h.subset(math.index([1, 2], [1, 2])); // [[2, 0], [0, 3]]
-	const i = math.range(1, 6); // [1, 2, 3, 4, 5]
-	i.subset(math.index(math.range(1, 4))); // [2, 3, 4]
-	console.log();
+	{
+		const a: math.Matrix = math.diag(math.range(1, 4));
+		a.subset(math.index([1, 2], [1, 2]));
+		const b: math.Matrix = math.range(1, 6);
+		b.subset(math.index(math.range(1, 4)));
+	}
 
 	// resize a multi dimensional matrix
-	console.log('resizing a matrix');
-	const j = math.matrix();
-	let defaultValue = 0;
-	j.resize([2, 2, 2], defaultValue); // [[[0, 0], [0, 0]], [[0, 0], [0, 0]]]
-	j.size();                            // [2, 2, 2]
-	j.resize([2, 2]); // [[0, 0], [0, 0]]
-	j.size();                            // [2, 2]
-	console.log();
+	{
+		const a = math.matrix();
+		a.resize([2, 2, 2], 0);
+		a.size();
+		a.resize([2, 2]);
+		a.size();
+	}
 
-	// setting a value outside the matrices range will resize the matrix.
-	// new elements will be initialized with zero.
-	console.log('set a value outside a matrices range');
-	const k = math.matrix();
-	k.subset(math.index(2), 6); // [0, 0, 6]
-	console.log();
-
-	console.log('set a value outside a matrices range, leaving new entries uninitialized');
-	const m = math.matrix();
-	defaultValue = math.uninitialized;
-	m.subset(math.index(2), 6, defaultValue); // [undefined, undefined, 6]
-	console.log();
+	// can set a subset of a matrix to uninitialized
+	{
+		const m = math.matrix();
+		m.subset(math.index(2), 6, math.uninitialized);
+	}
 
 	// create ranges
-	console.log('create ranges');
-	math.range(1, 6);                    // [1, 2, 3, 4, 5]
-	math.range(0, 18, 3);                // [0, 3, 6, 9, 12, 15]
-	math.range('2:-1:-3');               // [2, 1, 0, -1, -2]
-	math.factorial(math.range('1:6'));   // [1, 2, 6, 24, 120]
-	console.log();
+	{
+		math.range(1, 6);
+		math.range(0, 18, 3);
+		math.range('2:-1:-3');
+		math.factorial(math.range('1:6'));
+	}
 }
 
 /*
@@ -452,20 +277,13 @@ Sparse matrices examples
 */
 {
 	// create a sparse matrix
-	console.log('creating a 1000x1000 sparse matrix...');
 	const a = math.eye(1000, 1000, 'sparse');
 
 	// do operations with a sparse matrix
-	console.log('doing some operations on the sparse matrix...');
 	const b = math.multiply(a, a);
 	const c = math.multiply(b, math.complex(2, 2));
 	const d = math.transpose(c);
 	const e = math.multiply(d, a);
-
-	// we will not print the output, but doing the same operations
-	// with a dense matrix are very slow, try it for yourself.
-	console.log('already done');
-	console.log('now try this with a dense matrix :)');
 }
 
 /*
@@ -474,10 +292,8 @@ Units examples
 {
 	// units can be created by providing a value and unit name, or by providing
 	// a string with a valued unit.
-	console.log('create units');
 	const a = math.unit(45, 'cm'); // 450 mm
 	const b = math.unit('0.1m'); // 100 mm
-	console.log();
 
 	// creating units
 	math.createUnit('foo');
@@ -509,88 +325,19 @@ Units examples
 	math.createUnit('c', {definition: b}, {override: true});
 
 	// units can be added, subtracted, and multiplied or divided by numbers and by other units
-	console.log('perform operations');
-	math.add(a, b);                                  // 0.55 m
-	math.multiply(b, 2);                             // 200 mm
-	math.divide(math.unit('1 m'), math.unit('1 s')); // 1 m / s
-	math.pow(math.unit('12 in'), 3);                 // 1728 in^3
-	console.log();
+	math.add(a, b);
+	math.multiply(b, 2);
+	math.divide(math.unit('1 m'), math.unit('1 s'));
+	math.pow(math.unit('12 in'), 3);
 
 	// units can be converted to a specific type, or to a number
-	console.log('convert to another type or to a number');
-	b.to('cm');                    // 10 cm  Alternatively: math.to(b, 'cm')
-	math.to(b, 'inch');            // 3.9370... inch
-	b.toNumber('cm');              // 10
-	math.number(b, 'cm');          // 10
-	console.log();
+	b.to('cm');
+	math.to(b, 'inch');
+	b.toNumber('cm');
+	math.number(b, 'cm');
 
 	// the expression parser supports units too
-	console.log('parse expressions');
-	math.eval('2 inch to cm');     // 5.08 cm
-	math.eval('cos(45 deg)');      // 0.70711...
-	math.eval('90 km/h to m/s');   // 25 m / s
-	console.log();
-
-	// convert a unit to a number
-	// A second parameter with the unit for the exported number must be provided
-	math.eval('number(5 cm, mm)'); // number, 50
-	console.log();
-
-	// simplify units
-	console.log('simplify units');
-	math.eval('100000 N / m^2');   // 100 kPa
-	math.eval('9.81 m/s^2 * 100 kg * 40 m'); // 39.24 kJ
-	console.log();
-
-	// example engineering calculations
-	console.log('compute molar volume of ideal gas at 65 Fahrenheit, 14.7 psi in L/mol');
-	const Rg = math.unit('8.314 N m / (mol K)');
-	const T = math.unit('65 degF');
-	const P = math.unit('14.7 psi');
-	const v = math.divide(math.multiply(Rg, T), P);
-	console.log('gas constant (Rg) = ', format(Rg));
-	console.log('P = ' + format(P));
-	console.log('T = ' + format(T));
-	console.log('v = Rg * T / P = ' + format(math.to(v, 'L/mol'))); // 23.910... L / mol
-	console.log();
-
-	console.log('compute speed of fluid flowing out of hole in a container');
-	const g = math.unit('9.81 m / s^2');
-	const h = math.unit('1 m');
-	const v2 = math.pow(math.multiply(2, math.multiply(g, h)), 0.5); // Can also use math.sqrt
-	console.log('g = ' + format(g));
-	console.log('h = ' + format(h));
-	console.log('v = (2 g h) ^ 0.5 = ' + format(v2)); // 4.429... m / s
-	console.log();
-
-	console.log('electrical power consumption:');
-	let expr = '460 V * 20 A * 30 days to kWh';
-	console.log(`${expr} = ${math.eval(expr)}`);  // 6624 kWh
-	console.log();
-
-	console.log('circuit design:');
-	expr = '24 V / (6 mA)';
-	console.log(`${expr} = ${math.eval(expr)}`);  // 4 kohm
-	console.log();
-
-	console.log('operations on arrays:');
-	const B = math.eval('[1, 0, 0] T');
-	const v3 = math.eval('[0, 1, 0] m/s');
-	const q = math.eval('1 C');
-	const F = math.multiply(q, math.cross(v3, B));
-	console.log('B (magnetic field strength) = ' + format(B)); // [1 T, 0 T, 0 T]
-	console.log('v (particle velocity) = ' + format(v3));       // [0 m / s, 1 m / s, 0 m / s]
-	console.log('q (particle charge) = ' + format(q));         // 1 C
-	console.log('F (force) = q (v cross B) = ' + format(F));   // [0 N, 0 N, -1 N]
-
-	/**
-	 * Helper function to format an output a value.
-	 * @return Returns the formatted value
-	 */
-	function format(value: any): string {
-		const precision = 14;
-		return math.format(value, precision);
-	}
+	math.eval('2 inch to cm');
 }
 
 /*
@@ -598,31 +345,23 @@ Expression tree examples
 */
 {
 	// Filter an expression tree
-	console.log('Filter all symbol nodes "x" in the expression "x^2 + x/4 + 3*y"');
-	const node = math.parse('x^2 + x/4 + 3*y');
-	const filtered = node.filter(function(node) {
-		return node.isSymbolNode && node.name === 'x';
-	});
-	// returns an array with two entries: two SymbolNodes 'x'
+	const node: math.MathNode = math.parse('x^2 + x/4 + 3*y');
+	const filtered: math.MathNode[] = node.filter((node: math.MathNode) => node.isSymbolNode && node.name === 'x');
 
-	filtered.forEach(function(node) {
-		console.log(node.type, node.toString());
-	});
-	// outputs:
-	//  SymbolNode x
-	//  SymbolNode x
+	const arr: string[] = filtered.map((node: math.MathNode) => node.toString());
 
 	// Traverse an expression tree
-	console.log();
-	console.log('Traverse the expression tree of expression "3 * x + 2"');
-	const node1 = math.parse('3 * x + 2');
-	node1.traverse(function(node, path, parent) {
-	switch (node.type) {
-		// case 'OperatorNode': console.log(node.type, node.op);    break;
-		case 'OperatorNode': console.log(node.type);             break; // for now removing .op
-		case 'ConstantNode': console.log(node.type, node.value); break;
-		case 'SymbolNode':   console.log(node.type, node.name);  break;
-		default:             console.log(node.type);
-	}
+	const node1: math.MathNode = math.parse('3 * x + 2');
+	node1.traverse((node: math.MathNode, path: string, parent: math.MathNode) => {
+		switch (node.type) {
+			case 'OperatorNode':
+				return node.type === 'OperatorNode';
+			case 'ConstantNode':
+				return node.type === 'ConstantNode';
+			case 'SymbolNode':
+				return node.type === 'SymbolNode';
+			default:
+				return node.type === 'any string at all';
+		}
 	});
 }

From 9f74c6978a7bffa50425ed5a4e23dc791a60b173 Mon Sep 17 00:00:00 2001
From: GiorgosPap <gipap90@gmail.com>
Date: Thu, 19 Apr 2018 20:18:19 +0300
Subject: [PATCH 1367/1382] added typings for npm package ng-tags-input
 (#24946)

* Added typings for ngTagsInput

* Adding typings for ng-tags-input (#2)

* fixed travis CI issues

* fixed CI travis issues #2

* fixed CI travis issues #3
---
 types/ng-tags-input/index.d.ts             | 82 ++++++++++++++++++++++
 types/ng-tags-input/ng-tags-input-tests.ts |  8 +++
 types/ng-tags-input/tsconfig.json          | 23 ++++++
 types/ng-tags-input/tslint.json            |  1 +
 4 files changed, 114 insertions(+)
 create mode 100644 types/ng-tags-input/index.d.ts
 create mode 100644 types/ng-tags-input/ng-tags-input-tests.ts
 create mode 100644 types/ng-tags-input/tsconfig.json
 create mode 100644 types/ng-tags-input/tslint.json

diff --git a/types/ng-tags-input/index.d.ts b/types/ng-tags-input/index.d.ts
new file mode 100644
index 0000000000..624bbac7f0
--- /dev/null
+++ b/types/ng-tags-input/index.d.ts
@@ -0,0 +1,82 @@
+// Type definitions for ng-tags-input for 3.2
+// Project: https://github.com/mbenford/ngTagsInput
+// Definitions by: George Pap <https://github.com/GiorgosPap>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as angular from 'angular';
+
+export type ITagsInputParams = angular.ngTagsInput.TagsInputParams;
+export type IAutocompleteParams = angular.ngTagsInput.AutocompleteParams;
+export type ITagsInputConfigurationProvider = angular.ngTagsInput.TagsInputConfigurationProvider;
+
+declare module 'angular' {
+    namespace ngTagsInput {
+        interface TagsInputParams {
+            ngModel?: string;
+            useStrings?: boolean;
+            template?: string | boolean;
+            templateScope?: string | boolean;
+            displayProperty?: string | boolean;
+            keyProperty?: string | boolean;
+            type?: string | boolean;
+            text?: string | boolean;
+            tabindex?: number | boolean;
+            placeholder?: string | boolean;
+            minLength?: number | boolean;
+            maxLength?: number | boolean;
+            minTags?: number | boolean;
+            maxTags?: number | boolean;
+            allowLeftoverText?: boolean;
+            removeTagSymbol?: string | boolean;
+            addOnEnter?: boolean;
+            addOnSpace?: boolean;
+            addOnComma?: boolean;
+            addOnBlur?: boolean;
+            addOnPaste?: boolean;
+            pasteSplitPattern?: string | boolean;
+            replaceSpacesWithDashes?: boolean;
+            allowedTagsPattern?: string | boolean;
+            enableEditingLastTag?: boolean;
+            addFromAutocompleteOnly?: boolean;
+            spellcheck?: boolean;
+            tagClass?: any;
+            onTagAdding?: any;
+            onTagAdded?: any;
+            onInvalidTag?: any;
+            onTagRemoving?: any;
+            onTagRemoved?: any;
+            onTagClicked?: any;
+        }
+
+        interface AutocompleteParams {
+            source?: any;
+            template?: string | boolean;
+            displayProperty?: string | boolean;
+            debounceDelay?: number | boolean;
+            minLength?: number | boolean;
+            highlightMatchedText?: boolean;
+            maxResultsToShow?: number | boolean;
+            loadOnDownArrow?: boolean;
+            loadOnEmpty?: boolean;
+            loadOnFocus?: boolean;
+            selectFirstMatch?: boolean;
+            matchClass?: any;
+        }
+
+        interface TagsInputConfigurationProvider extends IServiceProvider {
+            /**
+             * Sets the default configuration option for a directive.
+             */
+            setDefaults(directive: string, defaults: ITagsInputParams | IAutocompleteParams): any;
+            /**
+             * Sets active interpolation for a set of options.
+             */
+            setActiveInterpolation(directive: string, options: ITagsInputParams | IAutocompleteParams): any;
+            /**
+             * Sets the threshold used by the tagsInput directive to re-size the inner input field element based on its contents.
+             */
+            setTextAutosizeThreshold(threshold: number): any;
+        }
+    }
+}
diff --git a/types/ng-tags-input/ng-tags-input-tests.ts b/types/ng-tags-input/ng-tags-input-tests.ts
new file mode 100644
index 0000000000..f0b31d457d
--- /dev/null
+++ b/types/ng-tags-input/ng-tags-input-tests.ts
@@ -0,0 +1,8 @@
+import * as angular from 'angular';
+angular.module('testModule', ['ngTagsInput'])
+    .config((tagsInputConfigProvider: angular.ngTagsInput.TagsInputConfigurationProvider) => {
+        const options: angular.ngTagsInput.TagsInputParams = {
+            placeholder: true
+        };
+        tagsInputConfigProvider.setActiveInterpolation('tagsInput', options);
+    });
diff --git a/types/ng-tags-input/tsconfig.json b/types/ng-tags-input/tsconfig.json
new file mode 100644
index 0000000000..42a59350cb
--- /dev/null
+++ b/types/ng-tags-input/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "ng-tags-input-tests.ts"
+    ]
+}
diff --git a/types/ng-tags-input/tslint.json b/types/ng-tags-input/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/ng-tags-input/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From ebf96ffc55c516ff2132bd7db6b0472cd59c54c7 Mon Sep 17 00:00:00 2001
From: Kyle Roach <kroach.work@gmail.com>
Date: Thu, 19 Apr 2018 13:56:03 -0400
Subject: [PATCH 1368/1382] (react-native-modalbox) Remove ViewProperties from
 main props (#25128)

---
 types/react-native-modalbox/index.d.ts | 301 +++++++++++++------------
 1 file changed, 153 insertions(+), 148 deletions(-)

diff --git a/types/react-native-modalbox/index.d.ts b/types/react-native-modalbox/index.d.ts
index 683773e995..84461471f2 100644
--- a/types/react-native-modalbox/index.d.ts
+++ b/types/react-native-modalbox/index.d.ts
@@ -5,176 +5,181 @@
 // TypeScript Version: 2.6
 
 import * as React from 'react';
-import { ViewProperties } from 'react-native';
+import { StyleProp, ViewStyle } from 'react-native';
 
-export interface ModalProps extends ViewProperties {
-  /**
-   * Checks if the modal is open
-   *
-   * Default is false
-   *
-   */
-  isOpen?: boolean;
+export interface ModalProps {
+    /**
+     * Checks if the modal is open
+     *
+     * Default is false
+     *
+     */
+    isOpen?: boolean;
 
-  /**
-   * Checks if the modal is disabled
-   *
-   * Default is false
-   *
-   */
-  isDisabled?: boolean;
+    /**
+     * Checks if the modal is disabled
+     *
+     * Default is false
+     *
+     */
+    isDisabled?: boolean;
 
-  /**
-   * If the modal can be closed by pressing on the backdrop
-   *
-   * Default is true
-   *
-   */
-  backdropPressToClose?: boolean;
+    /**
+     * If the modal can be closed by pressing on the backdrop
+     *
+     * Default is true
+     *
+     */
+    backdropPressToClose?: boolean;
 
-  /**
-   * If the modal can be closed by swiping
-   *
-   * Default is true
-   *
-   */
-  swipeToClose?: boolean;
+    /**
+     * If the modal can be closed by swiping
+     *
+     * Default is true
+     *
+     */
+    swipeToClose?: boolean;
 
-  /**
-   * The threshold to reach in pixels to close the modal
-   *
-   * Default is 50
-   *
-   */
-  swipeThreshold?: number;
+    /**
+     * The threshold to reach in pixels to close the modal
+     *
+     * Default is 50
+     *
+     */
+    swipeThreshold?: number;
 
-  /**
-   * The height in pixels of the swipeable area
-   *
-   * Default is the Window Height
-   *
-   */
-  swipeArea?: number;
+    /**
+     * The height in pixels of the swipeable area
+     *
+     * Default is the Window Height
+     *
+     */
+    swipeArea?: number;
 
-  /**
-   * The final position of the modal.
-   * Accepts top, center or bottom
-   *
-   * Default is center
-   *
-   */
-  position?: 'top' | 'center' | 'bottom' | string;
+    /**
+     * The final position of the modal.
+     * Accepts top, center or bottom
+     *
+     * Default is center
+     *
+     */
+    position?: 'top' | 'center' | 'bottom' | string;
 
-  /**
-   * The direction modal enters from
-   *
-   * Default is bottom
-   *
-   */
-  entry?: 'top' | 'bottom' | string;
+    /**
+     * The direction modal enters from
+     *
+     * Default is bottom
+     *
+     */
+    entry?: 'top' | 'bottom' | string;
 
-  /**
-   * If a backdrop is displayed behind the modal
-   *
-   * Default is true
-   *
-   */
-  backdrop?: boolean;
+    /**
+     * If a backdrop is displayed behind the modal
+     *
+     * Default is true
+     *
+     */
+    backdrop?: boolean;
 
-  /**
-   * Opacity of the backdrop
-   *
-   * Default is 0.5
-   *
-   */
-  backdropOpacity?: number;
+    /**
+     * Opacity of the backdrop
+     *
+     * Default is 0.5
+     *
+     */
+    backdropOpacity?: number;
 
-  /**
-   * Background color of the backdrop
-   *
-   * Default is black
-   *
-   */
-  backdropColor?: string;
+    /**
+     * Background color of the backdrop
+     *
+     * Default is black
+     *
+     */
+    backdropColor?: string;
 
-  /**
-   * Add an element in the backdrop (a close button for example)
-   *
-   * Default is null
-   *
-   */
-  backdropContent?: React.ReactNode;
+    /**
+     * Add an element in the backdrop (a close button for example)
+     *
+     * Default is null
+     *
+     */
+    backdropContent?: React.ReactNode;
 
-  /**
-   * Duration of the animation
-   *
-   * Default is 400ms
-   *
-   */
-  animationDuration?: number;
+    /**
+     * Duration of the animation
+     *
+     * Default is 400ms
+     *
+     */
+    animationDuration?: number;
 
-  /**
-   * (Android only) Close modal when receiving back button event
-   *
-   * Default is false
-   *
-   */
-  backButtonClose?: boolean;
+    /**
+     * (Android only) Close modal when receiving back button event
+     *
+     * Default is false
+     *
+     */
+    backButtonClose?: boolean;
 
-  /**
-   *
-   * Default is false
-   */
-  coverScreen?: boolean;
+    /**
+     *
+     * Default is false
+     */
+    coverScreen?: boolean;
 
-  /**
-   * If the modal should appear open without animation upon first mount
-   *
-   * Default is false
-   *
-   */
-  startOpen?: boolean;
+    /**
+     * If the modal should appear open without animation upon first mount
+     *
+     * Default is false
+     *
+     */
+    startOpen?: boolean;
 
-  /**
-   * This property prevent the modal to cover the ios status bar when the modal is scrolling up because the keyboard is opening
-   *
-   * Default is ios:22, android:0
-   */
-  keyboardTopOffset?: number;
+    /**
+     * This property prevent the modal to cover the ios status bar when the modal is scrolling up because the keyboard is opening
+     *
+     * Default is ios:22, android:0
+     */
+    keyboardTopOffset?: number;
 
-  /**
-   * Event fired when the modal is closed and the animation is complete
-   *
-   */
-  onClosed?(): void;
+    /**
+     * Custom styling for the content area
+     */
+    style?: StyleProp<ViewStyle>;
 
-  /**
-   * Event fired when the modal is opened and the animation is complete
-   *
-   */
-  onOpened?(): void;
+    /**
+     * Event fired when the modal is closed and the animation is complete
+     *
+     */
+    onClosed?(): void;
 
-  /**
-   * When the state of the swipe to close feature has changed
-   * (useful to change the content of the modal, display a message for example)
-   *
-   *
-   */
-  onClosingState?(state: boolean): void;
+    /**
+     * Event fired when the modal is opened and the animation is complete
+     *
+     */
+    onOpened?(): void;
+
+    /**
+     * When the state of the swipe to close feature has changed
+     * (useful to change the content of the modal, display a message for example)
+     *
+     *
+     */
+    onClosingState?(state: boolean): void;
 }
 
 export default class Modal extends React.Component<ModalProps> {
-  /**
-   * Open the modal
-   *
-   *
-   */
-  open(): void;
+    /**
+     * Open the modal
+     *
+     *
+     */
+    open(): void;
 
-  /**
-   * Close the modal
-   *
-   *
-   */
-  close(): void;
+    /**
+     * Close the modal
+     *
+     *
+     */
+    close(): void;
 }

From df9434571ff294ac73caf5d674bc1d1849c88534 Mon Sep 17 00:00:00 2001
From: am <amedvedev@ciferox.com>
Date: Thu, 19 Apr 2018 19:57:20 +0200
Subject: [PATCH 1369/1382] [adone] refactoring, additions (#25114)

* [adone] refactoring, additions
* [math] add decimal
* [math] index decomposition
* [math] add min, max

* [adone] collections, async
* add adone.async
* TimedoutMap -> TimeMap
* normalize lru constructors

* [adone] is, collection, regex
* [is] add multiAddress, ip options
* [collection.ByteArray] add readUInt24BE, writeUInt24BE
* [regex] ip options, ip
---
 types/adone/adone.d.ts                        |    3 +
 types/adone/async.d.ts                        |    3 +
 .../adone/glosses/collections/byte_array.d.ts |   14 +
 types/adone/glosses/collections/fast_lru.d.ts |   11 +-
 types/adone/glosses/collections/index.d.ts    |    2 +-
 types/adone/glosses/collections/lru.d.ts      |    9 +-
 types/adone/glosses/collections/ns_cache.d.ts |    2 +-
 .../{timedout_map.d.ts => time_map.d.ts}      |    2 +-
 types/adone/glosses/is.d.ts                   |   29 +-
 types/adone/glosses/math/bignumber.d.ts       |  227 +++
 types/adone/glosses/math/bitset.d.ts          |  225 +++
 types/adone/glosses/math/decimal.d.ts         | 1287 +++++++++++++++++
 types/adone/glosses/math/index.d.ts           |  762 +---------
 types/adone/glosses/math/long.d.ts            |  293 ++++
 types/adone/glosses/regex.d.ts                |   12 +-
 .../test/glosses/collections/byte_array.ts    |   10 +
 .../test/glosses/collections/fast_lru.ts      |    4 +-
 types/adone/test/glosses/collections/lru.ts   |    7 +-
 .../test/glosses/collections/time_map.ts      |   22 +
 .../test/glosses/collections/timedout_map.ts  |   22 -
 types/adone/test/glosses/is.ts                |    7 +
 types/adone/test/glosses/math/bignumber.ts    |  154 ++
 types/adone/test/glosses/math/bitset.ts       |   62 +
 types/adone/test/glosses/math/decimal.ts      |  445 ++++++
 types/adone/test/glosses/math/index.ts        |  486 +------
 types/adone/test/glosses/math/long.ts         |  261 ++++
 types/adone/test/glosses/regex.ts             |    4 +
 types/adone/test/index.ts                     |    5 +
 types/adone/tsconfig.json                     |   13 +-
 29 files changed, 3114 insertions(+), 1269 deletions(-)
 create mode 100644 types/adone/async.d.ts
 rename types/adone/glosses/collections/{timedout_map.d.ts => time_map.d.ts} (93%)
 create mode 100644 types/adone/glosses/math/bignumber.d.ts
 create mode 100644 types/adone/glosses/math/bitset.d.ts
 create mode 100644 types/adone/glosses/math/decimal.d.ts
 create mode 100644 types/adone/glosses/math/long.d.ts
 create mode 100644 types/adone/test/glosses/collections/time_map.ts
 delete mode 100644 types/adone/test/glosses/collections/timedout_map.ts
 create mode 100644 types/adone/test/glosses/math/bignumber.ts
 create mode 100644 types/adone/test/glosses/math/bitset.ts
 create mode 100644 types/adone/test/glosses/math/decimal.ts
 create mode 100644 types/adone/test/glosses/math/long.ts

diff --git a/types/adone/adone.d.ts b/types/adone/adone.d.ts
index d4e8b67b7b..6322bf6efc 100644
--- a/types/adone/adone.d.ts
+++ b/types/adone/adone.d.ts
@@ -1,6 +1,7 @@
 /// <reference types="node" />
 /// <reference types="lodash" />
 /// <reference types="benchmark" />
+/// <reference types="async" />
 
 declare namespace adone {
     const _null: symbol;
@@ -110,4 +111,6 @@ declare namespace adone {
     export const lodash: _.LoDashStatic;
 
     export const benchmark: typeof tbenchmark;
+
+    export const async: typeof tasync;
 }
diff --git a/types/adone/async.d.ts b/types/adone/async.d.ts
new file mode 100644
index 0000000000..4cd3d421da
--- /dev/null
+++ b/types/adone/async.d.ts
@@ -0,0 +1,3 @@
+export * from "async";
+
+export as namespace tasync;
diff --git a/types/adone/glosses/collections/byte_array.d.ts b/types/adone/glosses/collections/byte_array.d.ts
index 1dc3080fb3..e6f145ce38 100644
--- a/types/adone/glosses/collections/byte_array.d.ts
+++ b/types/adone/glosses/collections/byte_array.d.ts
@@ -103,6 +103,13 @@ declare namespace adone.collection {
          */
         readUInt16BE(offset?: number): number;
 
+        /**
+         * Reads a 24bit unsigned be integer
+         *
+         * @param offset Offset to read from
+         */
+        readUInt24BE(offset?: number): number;
+
         /**
          * Reads a 32bit signed le integer
          *
@@ -260,6 +267,13 @@ declare namespace adone.collection {
          */
         writeUInt16BE(value: number, offset?: number): this;
 
+        /**
+         * Writes a 24bit unsigned be integer
+         *
+         * @param offset Offset to write at
+         */
+        writeUInt24BE(value: number, offset?: number): this;
+
         /**
          * Writes a 32bit signed le integer
          *
diff --git a/types/adone/glosses/collections/fast_lru.d.ts b/types/adone/glosses/collections/fast_lru.d.ts
index e991322bc0..3418f60ffa 100644
--- a/types/adone/glosses/collections/fast_lru.d.ts
+++ b/types/adone/glosses/collections/fast_lru.d.ts
@@ -4,13 +4,18 @@ declare namespace adone.collection {
      */
     class FastLRU<K = any, V = any> {
         /**
-         * @param size Cache size, unlimited by default
+         * @param size
          */
-        constructor(size?: number, options?: {
+        constructor(options?: {
+            /**
+             * Cache size, unlimited by default
+             */
+            maxSize?: number;
+
             /**
              * Function that is called when a value is deleted
              */
-            dispose?(key: K, value: V): void
+            dispose?(key: K, value: V): void;
         });
 
         /**
diff --git a/types/adone/glosses/collections/index.d.ts b/types/adone/glosses/collections/index.d.ts
index 234ffe85f4..ab4e744d1a 100644
--- a/types/adone/glosses/collections/index.d.ts
+++ b/types/adone/glosses/collections/index.d.ts
@@ -16,7 +16,7 @@
 /// <reference path="./refcounted_cache.d.ts" />
 /// <reference path="./set.d.ts" />
 /// <reference path="./stack.d.ts" />
-/// <reference path="./timedout_map.d.ts" />
+/// <reference path="./time_map.d.ts" />
 
 declare namespace adone {
     /**
diff --git a/types/adone/glosses/collections/lru.d.ts b/types/adone/glosses/collections/lru.d.ts
index 7d41e32cd5..730845ae16 100644
--- a/types/adone/glosses/collections/lru.d.ts
+++ b/types/adone/glosses/collections/lru.d.ts
@@ -6,7 +6,7 @@ declare namespace adone.collection {
              * The maximum size of the cache, checked by applying the length function to all values in the cache.
              * Default is Infinity
              */
-            max?: number;
+            maxSize?: number;
 
             /**
              * Maximum age in ms. Items are not pro-actively pruned out as they age,
@@ -85,11 +85,6 @@ declare namespace adone.collection {
      * Represent an LRU cache
      */
     class LRU<K = any, V = any> {
-        /**
-         * Creates an LRU cache of the given size
-         */
-        constructor(max: number);
-
         /**
          * Creates an LRU cache with the given options
          */
@@ -98,7 +93,7 @@ declare namespace adone.collection {
         /**
          * The length of the cache, setter resizes the cache
          */
-        max: number;
+        maxSize: number;
 
         /**
          * stale setting
diff --git a/types/adone/glosses/collections/ns_cache.d.ts b/types/adone/glosses/collections/ns_cache.d.ts
index 5630c295d3..1c6e88702f 100644
--- a/types/adone/glosses/collections/ns_cache.d.ts
+++ b/types/adone/glosses/collections/ns_cache.d.ts
@@ -1,6 +1,6 @@
 declare namespace adone.collection {
     class NSCache<T = any> {
-        constructor(size: number, namespaces: string[]);
+        constructor(maxSize: number, namespaces: string[]);
 
         resize(newSize: number): void;
 
diff --git a/types/adone/glosses/collections/timedout_map.d.ts b/types/adone/glosses/collections/time_map.d.ts
similarity index 93%
rename from types/adone/glosses/collections/timedout_map.d.ts
rename to types/adone/glosses/collections/time_map.d.ts
index fedcf79fa2..ae5d23e62b 100644
--- a/types/adone/glosses/collections/timedout_map.d.ts
+++ b/types/adone/glosses/collections/time_map.d.ts
@@ -2,7 +2,7 @@ declare namespace adone.collection {
     /**
      * Represents a Map that keeps keys only for a specified interval of time
      */
-    class TimedoutMap<K = any, V = any> extends Map<K, V> {
+    class TimeMap<K = any, V = any> extends Map<K, V> {
         /**
          * @param timeout maximum age of the keys, 1000 by default
          * @param callback callback that is called with each key when the timeout is passed
diff --git a/types/adone/glosses/is.d.ts b/types/adone/glosses/is.d.ts
index d112d3f109..011b906234 100644
--- a/types/adone/glosses/is.d.ts
+++ b/types/adone/glosses/is.d.ts
@@ -490,12 +490,17 @@ declare namespace adone {
         /**
          * Checks whether the given string is an IPv4 address
          */
-        export function ip4(str: string): boolean;
+        export function ip4(str: string, options?: adone.regex.I.IP.Options): boolean;
 
         /**
          * Checks whether the given string is an IPv6 address
          */
-        export function ip6(str: string): boolean;
+        export function ip6(str: string, options?: adone.regex.I.IP.Options): boolean;
+
+        /**
+         * Checks whether the given string is IPv4 or IPv6 address
+         */
+        export function ip(str: string, options?: adone.regex.I.IP.Options): boolean;
 
         /**
          * Checks whether the given object is an array buffer
@@ -628,21 +633,6 @@ declare namespace adone {
             requireTld?: boolean
         }): obj is string;
 
-        /**
-         * Checks whether the given object is a valid IPv4 address
-         */
-        export function ip(obj: any, version: 4): boolean;
-
-        /**
-         * Checks whether the given object is a valid IPv6 address
-         */
-        export function ip(obj: any, version: 6): boolean;
-
-        /**
-         * Checks whether the given object in a valid IPv4 or IPv6 address
-         */
-        export function ip(obj: any): boolean;
-
         /**
          * Checks whether the given object is a valid UUIDv1 identifier
          */
@@ -680,5 +670,10 @@ declare namespace adone {
         export const openbsd: boolean;
 
         export const aix: boolean;
+
+        /**
+         * Checks whether the given object is adone.multi.address.Multiaddr
+         */
+        export function multiAddress(obj: any): boolean; // TODO: obj is adone.multi.address.Multiaddr
     }
 }
diff --git a/types/adone/glosses/math/bignumber.d.ts b/types/adone/glosses/math/bignumber.d.ts
new file mode 100644
index 0000000000..f746ebfe02
--- /dev/null
+++ b/types/adone/glosses/math/bignumber.d.ts
@@ -0,0 +1,227 @@
+declare namespace adone.math {
+    namespace I.BigNumber {
+        interface BufferConvertOptions {
+            endian?: 1 | -1 | "big" | "little";
+            size?: "auto" | number;
+        }
+    }
+
+    /**
+     * Represents a number of arbitrary precision
+     */
+    class BigNumber {
+        /**
+         * Creates a BigNumber from the given value, the base is 10
+         */
+        constructor(n: number | string | BigNumber);
+
+        /**
+         * Creates a BigNumber from the given string and base
+         */
+        constructor(n: string, base: number);
+
+        /**
+         * Converts the number to a string in the given base
+         */
+        toString(base?: number): string;
+
+        /**
+         * Converts the bignum into a Number.
+         * If the bignum is too big you'll lose precision or you'll get ±Infinity.
+         */
+        toNumber(): number;
+
+        /**
+         * Returns a new Buffer with the data from the bignum.
+         */
+        toBuffer(opts?: I.BigNumber.BufferConvertOptions): Buffer;
+
+        /**
+         * Returns a new bignum containing the instance value plus n
+         */
+        add(n: number | string | BigNumber): BigNumber;
+
+        /**
+         * Return a new bignum containing the instance value minus n
+         */
+        sub(n: number | string | BigNumber): BigNumber;
+
+        /**
+         * Returns a new bignum containing the instance value multiplied by n
+         */
+        mul(n: number | string | BigNumber): BigNumber;
+
+        /**
+         * Returns a new bignum containing the instance value integrally divided by n
+         */
+        div(n: number | string | BigNumber): BigNumber;
+
+        /**
+         * Returns a new bignum with the absolute value of the instance
+         */
+        abs(): BigNumber;
+
+        /**
+         * Returns a new bignum with the negative of the instance value
+         */
+        neg(): BigNumber;
+
+        /**
+         * Compares the instance value to n.
+         *
+         * Returns a positive integer if > n, a negative integer if < n, and 0 if == n
+         */
+        cmp(n: number | string | BigNumber): number;
+
+        /**
+         * Checks whether the instance value is greater than n (> n).
+         */
+        gt(n: number | string | BigNumber): boolean;
+
+        /**
+         * Checks whether the instance value is greater than or equal to n (>= n).
+         */
+        ge(n: number | string | BigNumber): boolean;
+
+        /**
+         * Checks whether the instance value is equal to n (== n).
+         */
+        eq(n: number | string | BigNumber): boolean;
+
+        /**
+         * Checks whether the instance value is less than n (< n).
+         */
+        lt(n: number | string | BigNumber): boolean;
+
+        /**
+         * Checks whether the instance value is less than or equal to n (<= n).
+         */
+        le(n: number | string | BigNumber): boolean;
+
+        /**
+         * Returns a new bignum with the instance value bitwise AND (&)-ed with n.
+         */
+        and(n: number | string | BigNumber): BigNumber;
+
+        /**
+         * Returns a new bignum with the instance value bitwise inclusive-OR (|)-ed with n.
+         */
+        or(n: number | string | BigNumber): BigNumber;
+
+        /**
+         * Returns a new bignum with the instance value bitwise exclusive-OR (^)-ed with n.
+         */
+        xor(n: number | string | BigNumber): BigNumber;
+
+        /**
+         * Returns a new bignum with the instance value modulo n.
+         */
+        mod(n: number | string | BigNumber): BigNumber;
+
+        /**
+         * Returns a new bignum with the instance value raised to the nth power.
+         */
+        pow(n: number | string | BigNumber): BigNumber;
+
+        /**
+         * Returns a new bignum with the instance value raised to the nth power modulo m.
+         */
+        powm(n: number | string | BigNumber, m: number | string | BigNumber): BigNumber;
+
+        /**
+         * Computes the multiplicative inverse modulo m.
+         */
+        invertm(m: number | string | BigNumber): BigNumber;
+
+        /**
+         * Returns a random number from 0 to this -1
+         */
+        rand(): BigNumber;
+
+        /**
+         * Returns a random number from this to upperBound - 1
+         */
+        rand(upperBound: number | string | BigNumber): BigNumber;
+
+        /**
+         * Checks whether the bignum is:
+         *
+         * - certainly prime (true)
+         *
+         * - probably prime ('maybe')
+         *
+         * - certainly composite (false)
+         */
+        probPrime(): boolean | "maybe";
+
+        /**
+         * Returns the next prime number after this bignum
+         */
+        nextPrime(): BigNumber;
+
+        /**
+         * Returns a new bignum that is the square root. This truncates.
+         */
+        sqrt(): BigNumber;
+
+        /**
+         * Returns a new bignum that is the nth root. This truncates.
+         */
+        root(n: number | string | BigNumber): BigNumber;
+
+        /**
+         * Returns a new bignum that is the 2^n multiple. Equivalent of the << operator.
+         */
+        shiftLeft(n: number | string | BigNumber): BigNumber;
+
+        /**
+         * Returns a new bignum of the value integer divided by 2^n. Equivalent of the >> operator.
+         */
+        shiftRight(n: number | string | BigNumber): BigNumber;
+
+        /**
+         * Returns the greatest common divisor of the current bignum with n as a new bignum.
+         */
+        gcd(n: number | string | BigNumber): BigNumber;
+
+        /**
+         * Returns the Jacobi symbol (or Legendre symbol if n is prime) of the current bignum (= a) over n.
+         * Note that n must be odd and >= 3. 0 <= a < n.
+         * Returns -1 or 1
+         */
+        jacobi(n: number | string | BigNumber): number;
+
+        /**
+         * Returns the number of bits used to represent the current bignum
+         */
+        bitLength(): number;
+
+        /**
+         * Checks whether the bit at the given index is set
+         */
+        isBitSet(n: number): boolean;
+
+        /**
+         * Generates a probable prime number of length bits.
+         *
+         * @param bits the number of bits
+         * @param safe If true, it will be a "safe" prime of the form p=2p'+1 where p' is also prime. Default: true
+         */
+        static prime(bits: number, safe?: boolean): BigNumber;
+
+        /**
+         * Creates a new bignum from a Buffer.
+         */
+        static fromBuffer(buf: Buffer, opts?: I.BigNumber.BufferConvertOptions): BigNumber;
+
+        /**
+         * One
+         */
+        static ONE: BigNumber;
+
+        /**
+         * Zero
+         */
+        static ZERO: BigNumber;
+    }
+}
diff --git a/types/adone/glosses/math/bitset.d.ts b/types/adone/glosses/math/bitset.d.ts
new file mode 100644
index 0000000000..a6bbd36989
--- /dev/null
+++ b/types/adone/glosses/math/bitset.d.ts
@@ -0,0 +1,225 @@
+declare namespace adone.math {
+    /**
+     * Represents a set of bits
+     */
+    class BitSet {
+        /**
+         * Creates a new bitset of n bits
+         */
+        constructor(n: number);
+
+        /**
+         * Creates a new bitset from a dehydrated bitset
+         */
+        constructor(key: string);
+
+        /**
+         * Checks whether a bit at a specific index is set
+         */
+        get(idx: number): boolean;
+
+        /**
+         * Sets a single bit.
+         * Returns true if set was successfull
+         */
+        set(idx: number): boolean;
+
+        /**
+         * Sets a range of bits.
+         * Returns true if set was successfull
+         */
+        setRange(from: number, to: number): boolean;
+
+        /**
+         * Unsets a single bit.
+         * Returns true if unset was successfull
+         */
+        unset(idx: number): boolean;
+
+        /**
+         * Unsets a range of bits.
+         * Returns true if unset was successfull
+         */
+        unsetRange(from: number, to: number): boolean;
+
+        /**
+         * Toggles a single bit
+         */
+        toggle(idx: number): boolean;
+
+        /**
+         * Toggles a range of bits
+         */
+        toggleRange(from: number, to: number): boolean;
+
+        /**
+         * Clears the entire bitset
+         */
+        clear(): boolean;
+
+        /**
+         * Clones the set
+         */
+        clone(): BitSet;
+
+        /**
+         * Turns the bitset into a comma separated string that skips leading & trailing 0 words.
+         * Ends with the number of leading 0s and MAX_BIT.
+         * Useful if you need the bitset to be an object key (eg dynamic programming).
+         * Can rehydrate by passing the result into the constructor
+         */
+        dehydrate(): string;
+
+        /**
+         * Performs a bitwise AND on 2 bitsets or 1 bitset and 1 index.
+         * Both bitsets must have the same number of words, no length check is performed to prevent and overflow.
+         */
+        and(value: number | BitSet): BitSet;
+
+        /**
+         * Performs a bitwise OR on 2 bitsets or 1 bitset and 1 index.
+         * Both bitsets must have the same number of words, no length check is performed to prevent and overflow.
+         */
+        or(value: number | BitSet): BitSet;
+
+        /**
+         * Performs a bitwise XOR on 2 bitsets or 1 bitset and 1 index.
+         * Both bitsets must have the same number of words, no length check is performed to prevent and overflow.
+         */
+        xor(value: number | BitSet): BitSet;
+
+        /**
+         * Runs a custom function on every set bit.
+         * Faster than iterating over the entire bitset with a get().
+         * If the callback returns `false` it stops iterating.
+         */
+        forEach(callback: ((idx: number) => void | boolean)): void;
+
+        /**
+         * Performs a circular shift bitset by an offset
+         *
+         * @param n number of positions that the bitset that will be shifted to the right. Using a negative number will result in a left shift.
+         */
+        circularShift(n: number): BitSet;
+
+        /**
+         * Gets the cardinality (count of set bits) for the entire bitset
+         */
+        getCardinality(): number;
+
+        /**
+         * Gets the indices of all set bits
+         */
+        getIndices(): number[];
+
+        /**
+         * Checks if one bitset is subset of another.
+         */
+        isSubsetOf(other: BitSet): boolean;
+
+        /**
+         * Quickly determines if a bitset is empty
+         */
+        isEmpty(): boolean;
+
+        /**
+         * Quickly determines if both bitsets are equal (faster than checking if the XOR of the two is === 0).
+         * Both bitsets must have the same number of words, no length check is performed to prevent and overflow.
+         */
+        isEqual(other: BitSet): boolean;
+
+        /**
+         * Gets a string representation of the entire bitset, including leading 0s
+         */
+        toString(): string;
+
+        /**
+         * Finds first set bit (useful for processing queues, breadth-first tree searches, etc.).
+         * Returns -1 if not found
+         *
+         * @param startWord the word to start with (only used internally by nextSetBit)
+         */
+        ffs(startWord?: number): number;
+
+        /**
+         * Finds first zero (unset bit).
+         * Returns -1 if not found
+         *
+         * @param startWord the word to start with (only used internally by nextUnsetBit)
+         */
+        ffz(startWord?: number): number;
+
+        /**
+         * Finds last set bit.
+         * Returns -1 if not found
+         *
+         * @param startWord the word to start with (only used internally by previousSetBit)
+         */
+        fls(startWord?: number): number;
+
+        /**
+         * Finds last zero (unset bit).
+         * Returns -1 if not found
+         *
+         * @param startWord the word to start with (only used internally by previousUnsetBit)
+         */
+        flz(startWord?: number): number;
+
+        /**
+         * Finds first set bit, starting at a given index.
+         * Return -1 if not found
+         *
+         * @param idx the starting index for the next set bit
+         */
+        nextSetBit(idx: number): number;
+
+        /**
+         * Finds first unset bit, starting at a given index.
+         * Return -1 if not found
+         *
+         * @param idx the starting index for the next unset bit
+         */
+        nextUnsetBit(idx: number): number;
+
+        /**
+         * Finds last set bit, up to a given index.
+         * Returns -1 if not found
+         *
+         * @param idx the starting index for the next unset bit (going in reverse)
+         */
+        previousSetBit(idx: number): number;
+
+        /**
+         * Finds last unset bit, up to a given index.
+         * Returns -1 if not found
+         */
+        previousUnsetBit(idx: number): number;
+
+        /**
+         * Converts the bitset to a math.Long number
+         */
+        toLong(): Long;
+
+        /**
+         * Reads an unsigned integer of the given bits from the given offset
+         *
+         * @param bits number of bits, 1 by default
+         * @param offset offset, 0 by default
+         */
+        readUInt(bits?: number, offset?: number): number;
+
+        /**
+         * Writes the given unsigned integer
+         *
+         * @param val integer
+         * @param bits number of bits to write, 1 by default
+         * @param offset write offset, 0 by default
+         */
+        writeUInt(val: number, bits?: number, offset?: number): void;
+
+        /**
+         * Creates a new BitSet from the given math.Long number
+         */
+        static fromLong(l: Long): BitSet;
+    }
+}
diff --git a/types/adone/glosses/math/decimal.d.ts b/types/adone/glosses/math/decimal.d.ts
new file mode 100644
index 0000000000..a7acb0ecad
--- /dev/null
+++ b/types/adone/glosses/math/decimal.d.ts
@@ -0,0 +1,1287 @@
+declare namespace adone.math {
+    namespace I.Decimal {
+        type Constructor = typeof Decimal;
+        type Instance = Decimal;
+        type Rounding = 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8;
+        type Modulo = Rounding | 9;
+        type Value = string | number | Decimal;
+
+        interface Config {
+            /**
+             * The maximum number of significant digits of the result of an operation.
+             *
+             * @default 20
+             */
+            precision?: number;
+
+            /**
+             * The default rounding mode used when rounding the result of an operation to precision significant digits, and when rounding
+             * the return value of the round, toBinary, toDecimalPlaces, toExponential, toFixed, toHexadecimal, toNearest, toOctal,
+             * toPrecision and toSignificantDigits methods.
+             *
+             * @default 4 (ROUND_HALF_UP)
+             */
+            rounding?: Rounding;
+
+            /**
+             * The negative exponent value at and below which toString returns exponential notation.
+             *
+             * JavaScript numbers use exponential notation for negative exponents of -7 and below.
+             *
+             * @default -7
+             */
+            toExpNeg?: number;
+
+            /**
+             * The positive exponent value at and above which toString returns exponential notation.
+             *
+             * JavaScript numbers use exponential notation for positive exponents of 20 and above.
+             *
+             * @default 20
+             */
+            toExpPos?: number;
+
+            /**
+             * The negative exponent limit, i.e. the exponent value below which underflow to zero occurs.
+             *
+             * If the Decimal to be returned by a calculation would have an exponent lower than minE then the value of that Decimal becomes zero.
+             *
+             * JavaScript numbers underflow to zero for exponents below -324.
+             *
+             * @default -9e15
+             */
+            minE?: number;
+
+            /**
+             * The positive exponent limit, i.e. the exponent value above which overflow to Infinity occurs.
+             *
+             * If the Decimal to be returned by a calculation would have an exponent higher than maxE then the value of that Decimal becomes Infinity.
+             *
+             * JavaScript numbers overflow to Infinity for exponents above 308.
+             *
+             * @default 9e15
+             */
+            maxE?: number;
+
+            /**
+             * The value that determines whether cryptographically-secure pseudo-random number generation is used.
+             */
+            crypto?: boolean;
+
+            /**
+             * The modulo mode used when calculating the modulus: a mod n.
+             *
+             * The quotient, q = a / n, is calculated according to the rounding mode that corresponds to the chosen modulo mode.
+             *
+             * The remainder, r, is calculated as: r = a - n * q.
+             *
+             * @default 1 (ROUND_DOWN)
+             */
+            modulo?: Modulo;
+
+            defaults?: boolean;
+        }
+    }
+
+    /**
+     * An arbitrary precision decimal number
+     */
+    class Decimal {
+        /**
+         * digits
+         */
+        readonly d: number[];
+
+        /**
+         * exponent
+         */
+        readonly e: number;
+
+        /**
+         * sign
+         */
+        readonly s: number;
+
+        private readonly name: string;
+
+        constructor(x: I.Decimal.Value);
+
+        /**
+         * Returns a new Decimal whose value is the absolute value, i.e. the magnitude, of the value of this Decimal.
+         *
+         * @alias abs
+         */
+        absoluteValue(): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the absolute value, i.e. the magnitude, of the value of this Decimal.
+         *
+         * @alias absoluteValue
+         */
+        abs(): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the value of this Decimal rounded to a whole number in the direction of positive Infinity.
+         *
+         * The return value is not affected by the value of the precision setting.
+         */
+        ceil(): Decimal;
+
+        /**
+         * 1	if the value of this Decimal is greater than the value of x
+         *
+         * -1	if the value of this Decimal is less than the value of x
+         *
+         * 0	if this Decimal and x have the same value
+         *
+         * NaN	if the value of either this Decimal or x is NaN
+         *
+         * @alias cmp
+         */
+        comparedTo(x: I.Decimal.Value): number;
+
+        /**
+         * 1	if the value of this Decimal is greater than the value of x
+         *
+         * -1	if the value of this Decimal is less than the value of x
+         *
+         * 0	if this Decimal and x have the same value
+         *
+         * NaN	if the value of either this Decimal or x is NaN
+         *
+         * @alias comparedTo
+         */
+        cmp(x: I.Decimal.Value): number;
+
+        /**
+         * Returns a new Decimal whose value is the cosine of the value in radians of this Decimal,
+         * rounded to precision significant digits using rounding mode rounding.
+         *
+         * @alias cos
+         */
+        cosine(): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the cosine of the value in radians of this Decimal,
+         * rounded to precision significant digits using rounding mode rounding.
+         *
+         * @alias cosine
+         */
+        cos(): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the cube root of this Decimal,
+         * rounded to precision significant digits using rounding mode rounding.
+         *
+         * The return value will be correctly rounded,
+         * i.e. rounded as if the result was first calculated to an infinite number of correct digits before rounding.
+         *
+         * @alias cbrt
+         */
+        cubeRoot(): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the cube root of this Decimal,
+         * rounded to precision significant digits using rounding mode rounding.
+         *
+         * The return value will be correctly rounded,
+         * i.e. rounded as if the result was first calculated to an infinite number of correct digits before rounding.
+         *
+         * @alias cubeRoot
+         */
+        cbrt(): Decimal;
+
+        /**
+         * Returns the number of decimal places, i.e. the number of digits after the decimal point, of the value of this Decimal.
+         *
+         * @alias dp
+         */
+        decimalPlaces(): number;
+
+        /**
+         * Returns the number of decimal places, i.e. the number of digits after the decimal point, of the value of this Decimal.
+         *
+         * @alias decimalPlaces
+         */
+        dp(): number;
+
+        /**
+         * Returns a new Decimal whose value is the value of this Decimal divided by x,
+         * rounded to precision significant digits using rounding mode rounding.
+         *
+         * @alias div
+         */
+        dividedBy(x: I.Decimal.Value): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the value of this Decimal divided by x,
+         * rounded to precision significant digits using rounding mode rounding.
+         *
+         * @alias dividedBy
+         */
+        div(x: I.Decimal.Value): Decimal;
+
+        /**
+         * Return a new Decimal whose value is the integer part of dividing this Decimal by x,
+         * rounded to precision significant digits using rounding mode rounding.
+         *
+         * @alias divToInt
+         */
+        dividedToIntegerBy(x: I.Decimal.Value): Decimal;
+
+        /**
+         * Return a new Decimal whose value is the integer part of dividing this Decimal by x,
+         * rounded to precision significant digits using rounding mode rounding.
+         *
+         * @alias dividedToIntegerBy
+         */
+        divToInt(x: I.Decimal.Value): Decimal;
+
+        /**
+         * Returns true if the value of this Decimal equals the value of x, otherwise returns false.
+         * As with JavaScript, NaN does not equal NaN.
+         *
+         * @alias eq
+         */
+        equals(x: I.Decimal.Value): boolean;
+
+        /**
+         * Returns true if the value of this Decimal equals the value of x, otherwise returns false.
+         * As with JavaScript, NaN does not equal NaN.
+         *
+         * @alias equals
+         */
+        eq(x: I.Decimal.Value): boolean;
+
+        /**
+         * Returns a new Decimal whose value is the value of this Decimal rounded to a whole number in the direction of negative Infinity.
+         *
+         * The return value is not affected by the value of the precision setting.
+         */
+        floor(): Decimal;
+
+        /**
+         * Returns true if the value of this Decimal is greater than the value of x, otherwise returns false.
+         *
+         * @alias gt
+         */
+        greaterThan(x: I.Decimal.Value): boolean;
+
+        /**
+         * Returns true if the value of this Decimal is greater than the value of x, otherwise returns false.
+         *
+         * @alias greaterThan
+         */
+        gt(x: I.Decimal.Value): boolean;
+
+        /**
+         * Returns true if the value of this Decimal is greater than or equal to the value of x, otherwise returns false.
+         *
+         * @alias gte
+         */
+        greaterThanOrEqualTo(x: I.Decimal.Value): boolean;
+
+        /**
+         * Returns true if the value of this Decimal is greater than or equal to the value of x, otherwise returns false.
+         *
+         * @alias greaterThanOrEqualTo
+         */
+        gte(x: I.Decimal.Value): boolean;
+
+        /**
+         * Returns a new Decimal whose value is the hyperbolic cosine of the value in radians of this Decimal,
+         * rounded to precision significant digits using rounding mode rounding.
+         *
+         * @alias cosh
+         */
+        hyperbolicCosine(): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the hyperbolic cosine of the value in radians of this Decimal,
+         * rounded to precision significant digits using rounding mode rounding.
+         *
+         * @alias hyperbolicCosine
+         */
+        cosh(): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the hyperbolic sine of the value in radians of this Decimal,
+         * rounded to precision significant digits using rounding mode rounding.
+         *
+         * @alias sinh
+         */
+        hyperbolicSine(): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the hyperbolic sine of the value in radians of this Decimal,
+         * rounded to precision significant digits using rounding mode rounding.
+         *
+         * @alias hyperbolicSine
+         */
+        sinh(): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the inverse hyperbolic tangent in radians of the value of this Decimal,
+         * rounded to precision significant digits using rounding mode rounding.
+         *
+         * @alias tanh
+         */
+        hyperbolicTangent(): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the inverse hyperbolic tangent in radians of the value of this Decimal,
+         * rounded to precision significant digits using rounding mode rounding.
+         *
+         * @alias hyperbolicTangent
+         */
+        tanh(): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the inverse cosine in radians of the value of this Decimal,
+         * rounded to precision significant digits using rounding mode rounding.
+         *
+         * @alias acos
+         */
+        inverseCosine(): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the inverse cosine in radians of the value of this Decimal,
+         * rounded to precision significant digits using rounding mode rounding.
+         *
+         * @alias inverseCosine
+         */
+        acos(): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the inverse hyperbolic cosine in radians of the value of this Decimal,
+         * rounded to precision significant digits using rounding mode rounding.
+         *
+         * @alias acosh
+         */
+        inverseHyperbolicCosine(): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the inverse hyperbolic cosine in radians of the value of this Decimal,
+         * rounded to precision significant digits using rounding mode rounding.
+         *
+         * @alias inverseHyperbolicCosine
+         */
+        acosh(): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the inverse hyperbolic sine in radians of the value of this Decimal,
+         * rounded to precision significant digits using rounding mode rounding.
+         *
+         * @alias asinh
+         */
+        inverseHyperbolicSine(): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the inverse hyperbolic sine in radians of the value of this Decimal,
+         * rounded to precision significant digits using rounding mode rounding.
+         *
+         * @alias inverseHyperbolicSine
+         */
+        asinh(): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the inverse hyperbolic tangent in radians of the value of this Decimal,
+         * rounded to precision significant digits using rounding mode rounding.
+         *
+         * @alias atanh
+         */
+        inverseHyperbolicTangent(): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the inverse hyperbolic tangent in radians of the value of this Decimal,
+         * rounded to precision significant digits using rounding mode rounding.
+         *
+         * @alias inverseHyperbolicTangent
+         */
+        atanh(): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the inverse sine in radians of the value of this Decimal,
+         * rounded to precision significant digits using rounding mode rounding.
+         *
+         * @alias asin
+         */
+        inverseSine(): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the inverse sine in radians of the value of this Decimal,
+         * rounded to precision significant digits using rounding mode rounding.
+         *
+         * @alias inverseSine
+         */
+        asin(): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the inverse tangent in radians of the value of this Decimal,
+         * rounded to precision significant digits using rounding mode rounding.
+         *
+         * @alias atan
+         */
+        inverseTangent(): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the inverse tangent in radians of the value of this Decimal,
+         * rounded to precision significant digits using rounding mode rounding.
+         *
+         * @alias inverseTangent
+         */
+        atan(): Decimal;
+
+        /**
+         * Returns true if the value of this Decimal is a finite number, otherwise returns false.
+         * The only possible non-finite values of a Decimal are NaN, Infinity and -Infinity.
+         */
+        isFinite(): boolean;
+
+        /**
+         * Returns true if the value of this Decimal is a whole number, otherwise returns false.
+         *
+         * @alias isInt
+         */
+        isInteger(): boolean;
+
+        /**
+         * Returns true if the value of this Decimal is a whole number, otherwise returns false.
+         *
+         * @alias isInteger
+         */
+        isInt(): boolean;
+
+        /**
+         * Returns true if the value of this Decimal is NaN, otherwise returns false.
+         */
+        isNaN(): boolean;
+
+        /**
+         * Returns true if the value of this Decimal is negative, otherwise returns false.
+         *
+         * @alias isNeg
+         */
+        isNegative(): boolean;
+
+        /**
+         * Returns true if the value of this Decimal is negative, otherwise returns false.
+         *
+         * @alias isNegative
+         */
+        isNeg(): boolean;
+
+        /**
+         * Returns true if the value of this Decimal is positive, otherwise returns false.
+         *
+         * @alias isPos
+         */
+        isPositive(): boolean;
+
+        /**
+         * Returns true if the value of this Decimal is positive, otherwise returns false.
+         *
+         * @alias isPositive
+         */
+        isPos(): boolean;
+
+        /**
+         * Returns true if the value of this Decimal is zero or minus zero, otherwise returns false.
+         */
+        isZero(): boolean;
+
+        /**
+         * Returns true if the value of this Decimal is less than the value of x, otherwise returns false.
+         *
+         * @alias lt
+         */
+        lessThan(x: I.Decimal.Value): boolean;
+
+        /**
+         * Returns true if the value of this Decimal is less than the value of x, otherwise returns false.
+         *
+         * @alias lessThan
+         */
+        lt(x: I.Decimal.Value): boolean;
+
+        /**
+         * Returns true if the value of this Decimal is less than or equal to the value of x, otherwise returns false.
+         *
+         * @alias lte
+         */
+        lessThanOrEqualTo(x: I.Decimal.Value): boolean;
+
+        /**
+         * Returns true if the value of this Decimal is less than or equal to the value of x, otherwise returns false.
+         *
+         * @alias lessThanOrEqualTo
+         */
+        lte(x: I.Decimal.Value): boolean;
+
+        /**
+         * Returns a new Decimal whose value is the base x logarithm of the value of this Decimal,
+         * rounded to precision significant digits using rounding mode rounding.
+         *
+         * @alias log
+         */
+        logarithm(n?: I.Decimal.Value): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the base x logarithm of the value of this Decimal,
+         * rounded to precision significant digits using rounding mode rounding.
+         *
+         * @alias logarithm
+         */
+        log(n?: I.Decimal.Value): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the value of this Decimal minus x,
+         * rounded to precision significant digits using rounding mode rounding.
+         *
+         * @alias sub
+         */
+        minus(x: I.Decimal.Value): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the value of this Decimal minus x,
+         * rounded to precision significant digits using rounding mode rounding.
+         *
+         * @alias minus
+         */
+        sub(x: I.Decimal.Value): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the value of this Decimal modulo x,
+         * rounded to precision significant digits using rounding mode rounding.
+         *
+         * The value returned, and in particular its sign, is dependent on the value of the modulo property of this Decimal's constructor.
+         * If it is 1 (default value), the result will have the same sign as this Decimal,
+         * and it will match that of Javascript's % operator (within the limits of double precision) and BigDecimal's remainder method.
+         *
+         * @alias mod
+         */
+        modulo(x: I.Decimal.Value): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the value of this Decimal modulo x,
+         * rounded to precision significant digits using rounding mode rounding.
+         *
+         * The value returned, and in particular its sign, is dependent on the value of the modulo property of this Decimal's constructor.
+         * If it is 1 (default value), the result will have the same sign as this Decimal,
+         * and it will match that of Javascript's % operator (within the limits of double precision) and BigDecimal's remainder method.
+         *
+         * @alias modulo
+         */
+        mod(x: I.Decimal.Value): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the base e (Euler's number, the base of the natural logarithm) exponential of the value of this Decimal,
+         * rounded to precision significant digits using rounding mode rounding.
+         *
+         * @alias exp
+         */
+        naturalExponential(): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the base e (Euler's number, the base of the natural logarithm) exponential of the value of this Decimal,
+         * rounded to precision significant digits using rounding mode rounding.
+         *
+         * @alias naturalExponential
+         */
+        exp(): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the natural logarithm of the value of this Decimal,
+         * rounded to precision significant digits using rounding mode rounding.
+         *
+         * @alias ln
+         */
+        naturalLogarithm(): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the natural logarithm of the value of this Decimal,
+         * rounded to precision significant digits using rounding mode rounding.
+         *
+         * @alias naturalLogarithm
+         */
+        ln(): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the value of this Decimal negated, i.e. multiplied by -1.
+         *
+         * @alias neg
+         */
+        negated(): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the value of this Decimal negated, i.e. multiplied by -1.
+         *
+         * @alias negated
+         */
+        neg(): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the value of this Decimal plus x,
+         * rounded to precision significant digits using rounding mode rounding.
+         *
+         * @alias add
+         */
+        plus(x: I.Decimal.Value): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the value of this Decimal plus x,
+         * rounded to precision significant digits using rounding mode rounding.
+         *
+         * @alias plus
+         */
+        add(x: I.Decimal.Value): Decimal;
+
+        /**
+         * Returns the number of significant digits of the value of this Decimal.
+         *
+         * @param includeZeros If it is true or 1 then any trailing zeros of the integer part of a number are counted as significant digits,
+         *                     otherwise they are not.
+         * @alias sd
+         */
+        precision(includeZeros?: boolean): number;
+
+        /**
+         * Returns the number of significant digits of the value of this Decimal.
+         *
+         * @param includeZeros If it is true or 1 then any trailing zeros of the integer part of a number are counted as significant digits,
+         *                     otherwise they are not.
+         * @alias precision
+         */
+        sd(includeZeros?: boolean): number;
+
+        /**
+         * Returns a new Decimal whose value is the value of this Decimal rounded to a whole number using rounding mode rounding.
+         */
+        round(): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the sine of the value in radians of this Decimal,
+         * rounded to precision significant digits using rounding mode rounding.
+         *
+         * @alias sin
+         */
+        sine(): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the sine of the value in radians of this Decimal,
+         * rounded to precision significant digits using rounding mode rounding.
+         *
+         * @alias sine
+         */
+        sin(): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the square root of this Decimal,
+         * rounded to precision significant digits using rounding mode rounding.
+         *
+         * The return value will be correctly rounded,
+         * i.e. rounded as if the result was first calculated to an infinite number of correct digits before rounding.
+         *
+         * @alias sqrt
+         */
+        squareRoot(): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the square root of this Decimal,
+         * rounded to precision significant digits using rounding mode rounding.
+         *
+         * The return value will be correctly rounded,
+         * i.e. rounded as if the result was first calculated to an infinite number of correct digits before rounding.
+         *
+         * @alias squareRoot
+         */
+        sqrt(): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the tangent of the value in radians of this Decimal,
+         * rounded to precision significant digits using rounding mode rounding.
+         *
+         * @alias tan
+         */
+        tangent(): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the tangent of the value in radians of this Decimal,
+         * rounded to precision significant digits using rounding mode rounding.
+         *
+         * @alias tangent
+         */
+        tan(): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the value of this Decimal times x,
+         * rounded to precision significant digits using rounding mode rounding.
+         *
+         * @alias mul
+         */
+        times(x: I.Decimal.Value): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the value of this Decimal times x,
+         * rounded to precision significant digits using rounding mode rounding.
+         *
+         * @alias times
+         */
+        mul(x: I.Decimal.Value): Decimal;
+
+        /**
+         * Returns a string representing the value of this Decimal in binary, rounded to sd significant digits using rounding mode rm.
+         */
+        toBinary(significantDigits?: number): string;
+
+        /**
+         * Returns a string representing the value of this Decimal in binary, rounded to sd significant digits using rounding mode rm.
+         */
+        toBinary(significantDigits: number, rounding: I.Decimal.Rounding): string;
+
+        /**
+         * Returns a new Decimal whose value is the value of this Decimal rounded to dp decimal places using rounding mode rm.
+         *
+         * @alias toDP
+         */
+        toDecimalPlaces(decimalPlaces?: number): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the value of this Decimal rounded to dp decimal places using rounding mode rm.
+         *
+         * @alias toDP
+         */
+        toDecimalPlaces(decimalPlaces: number, rounding: I.Decimal.Rounding): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the value of this Decimal rounded to dp decimal places using rounding mode rm.
+         *
+         * @alias toDecimalPlaces
+         */
+        toDP(decimalPlaces?: number): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the value of this Decimal rounded to dp decimal places using rounding mode rm.
+         *
+         * @alias toDecimalPlaces
+         */
+        toDP(decimalPlaces: number, rounding: I.Decimal.Rounding): Decimal;
+
+        /**
+         * Returns a string representing the value of this Decimal in exponential notation rounded using rounding mode rm to dp decimal places,
+         * i.e with one digit before the decimal point and dp digits after it.
+         *
+         * If the value of this Decimal in exponential notation has fewer than dp fraction digits,
+         * the return value will be appended with zeros accordingly.
+         */
+        toExponential(decimalPlaces?: number): string;
+
+        /**
+         * Returns a string representing the value of this Decimal in exponential notation rounded using rounding mode rm to dp decimal places,
+         * i.e with one digit before the decimal point and dp digits after it.
+         *
+         * If the value of this Decimal in exponential notation has fewer than dp fraction digits,
+         * the return value will be appended with zeros accordingly.
+         */
+        toExponential(decimalPlaces: number, rounding: I.Decimal.Rounding): string;
+
+        /**
+         * Returns a string representing the value of this Decimal in normal (fixed-point) notation rounded to dp decimal places using rounding mode rm.
+         *
+         * If the value of this Decimal in normal notation has fewer than dp fraction digits, the return value will be appended with zeros accordingly.
+         *
+         * Unlike Number.prototype.toFixed, which returns exponential notation if a number is greater or equal to 1021, this method will always return normal notation.
+         */
+        toFixed(decimalPlaces?: number): string;
+
+        /**
+         * Returns a string representing the value of this Decimal in normal (fixed-point) notation rounded to dp decimal places using rounding mode rm.
+         *
+         * If the value of this Decimal in normal notation has fewer than dp fraction digits, the return value will be appended with zeros accordingly.
+         *
+         * Unlike Number.prototype.toFixed, which returns exponential notation if a number is greater or equal to 1021, this method will always return normal notation.
+         */
+        toFixed(decimalPlaces: number, rounding: I.Decimal.Rounding): string;
+
+        /**
+         * Returns an array of two Decimals representing the value of this Decimal as a simple fraction with an integer numerator and an integer denominator.
+         * The denominator will be a positive non-zero value less than or equal to maxDenominator.
+         *
+         * If a maximum denominator is omitted, the denominator will be the lowest value necessary to represent the number exactly.
+         */
+        toFraction(maxDenominator?: I.Decimal.Value): Decimal[];
+
+        /**
+         * Returns a string representing the value of this Decimal in hexadecimal, rounded to sd significant digits using rounding mode rm.
+         *
+         * @alias toHex
+         */
+        toHexadecimal(significantDigits?: number): string;
+
+        /**
+         * Returns a string representing the value of this Decimal in hexadecimal, rounded to sd significant digits using rounding mode rm.
+         *
+         * @alias toHex
+         */
+        toHexadecimal(significantDigits: number, rounding: I.Decimal.Rounding): string;
+
+        /**
+         * Returns a string representing the value of this Decimal in hexadecimal, rounded to sd significant digits using rounding mode rm.
+         *
+         * @alias toHexadecimal
+         */
+        toHex(significantDigits?: number): string;
+
+        /**
+         * Returns a string representing the value of this Decimal in hexadecimal, rounded to sd significant digits using rounding mode rm.
+         *
+         * @alias toHexadecimal
+         */
+        toHex(significantDigits: number, rounding?: I.Decimal.Rounding): string;
+
+        /**
+         * Same as valueOf
+         */
+        toJSON(): string;
+
+        /**
+         * Returns a new Decimal whose value is the nearest multiple of x in the direction of rounding mode rm, or rounding if rm is omitted,
+         * to the value of this Decimal.
+         *
+         * The return value will always have the same sign as this Decimal, unless either this Decimal or x is NaN,
+         * in which case the return value will be also be NaN.
+         */
+        toNearest(x?: I.Decimal.Value, rounding?: I.Decimal.Rounding): Decimal;
+
+        /**
+         * Returns the value of this Decimal converted to a primitive number.
+         *
+         * Type coercion with, for example, JavaScript's unary plus operator will also work,
+         * except that a Decimal with the value minus zero will convert to positive zero.
+         */
+        toNumber(): number;
+
+        /**
+         * Returns a string representing the value of this Decimal in octal, rounded to sd significant digits using rounding mode rm.
+         */
+        toOctal(significantDigits?: number): string;
+
+        /**
+         * Returns a string representing the value of this Decimal in octal, rounded to sd significant digits using rounding mode rm.
+         */
+        toOctal(significantDigits: number, rounding: I.Decimal.Rounding): string;
+
+        /**
+         * Returns a new Decimal whose value is the value of this Decimal raised to the power x,
+         * rounded to precision significant digits using rounding mode rounding.
+         *
+         * The return value will almost always be correctly rounded,
+         * i.e. rounded as if the result was first calculated to an infinite number of correct digits before rounding.
+         * If a result is incorrectly rounded the maximum error will be 1 ulp (unit in the last place).
+         *
+         * @alias pow
+         */
+        toPower(x: I.Decimal.Value): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the value of this Decimal raised to the power x,
+         * rounded to precision significant digits using rounding mode rounding.
+         *
+         * The return value will almost always be correctly rounded,
+         * i.e. rounded as if the result was first calculated to an infinite number of correct digits before rounding.
+         * If a result is incorrectly rounded the maximum error will be 1 ulp (unit in the last place).
+         *
+         * @alias toPower
+         */
+        pow(x: I.Decimal.Value): Decimal;
+
+        /**
+         * Returns a string representing the value of this Decimal rounded to sd significant digits using rounding mode rm.
+         */
+        toPrecision(significantDigits?: number): string;
+
+        /**
+         * Returns a string representing the value of this Decimal rounded to sd significant digits using rounding mode rm.
+         */
+        toPrecision(significantDigits: number, rounding: I.Decimal.Rounding): string;
+
+        /**
+         * Returns a new Decimal whose value is the value of this Decimal rounded to sd significant digits using rounding mode rm.
+         *
+         * @alias toSD
+         */
+        toSignificantDigits(significantDigits?: number): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the value of this Decimal rounded to sd significant digits using rounding mode rm.
+         *
+         * @alias toSD
+         */
+        toSignificantDigits(significantDigits: number, rounding: I.Decimal.Rounding): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the value of this Decimal rounded to sd significant digits using rounding mode rm.
+         *
+         * @alias toSignificantDigits
+         */
+        toSD(significantDigits?: number): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the value of this Decimal rounded to sd significant digits using rounding mode rm.
+         *
+         * @alias toSignificantDigits
+         */
+        toSD(significantDigits: number, rounding: I.Decimal.Rounding): Decimal;
+
+        /**
+         * Returns a string representing the value of this Decimal.
+         *
+         * If this Decimal has a positive exponent that is equal to or greater than toExpPos,
+         * or a negative exponent equal to or less than toExpNeg, then exponential notation will be returned.
+         */
+        toString(): string;
+
+        /**
+         * Returns a new Decimal whose value is the value of this Decimal truncated to a whole number.
+         *
+         * @alias trunc
+         */
+        truncated(): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the value of this Decimal truncated to a whole number.
+         *
+         * @alias truncated
+         */
+        trunc(): Decimal;
+
+        /**
+         * As toString, but zero is signed.
+         */
+        valueOf(): string;
+
+        /**
+         * Returns a new Decimal whose value is the absolute value of x
+         */
+        static abs(x: I.Decimal.Value): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the inverse cosine in radians of x, rounded to precision significant digits using rounding mode rounding.
+         */
+        static acos(x: I.Decimal.Value): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the inverse cosine in radians of x, rounded to precision significant digits using rounding mode rounding.
+         */
+        static acosh(x: I.Decimal.Value): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the value of x + y, rounded to precision significant digits using rounding mode rounding.
+         */
+        static add(x: I.Decimal.Value, y: I.Decimal.Value): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the inverse sine in radians of x, rounded to precision significant digits using rounding mode rounding.
+         */
+        static asin(x: I.Decimal.Value): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the inverse hyperbolic sine in radians of x, rounded to precision significant digits using rounding mode rounding.
+         */
+        static asinh(x: I.Decimal.Value): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the inverse tangent in radians of x, rounded to precision significant digits using rounding mode rounding.
+         */
+        static atan(x: I.Decimal.Value): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the inverse hyperbolic tangent in radians of x, rounded to precision significant digits using rounding mode rounding.
+         */
+        static atanh(x: I.Decimal.Value): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the inverse tangent in radians of the quotient of y and x, rounded to precision significant digits using rounding mode rounding.
+         *
+         * The signs of y and x are used to determine the quadrant of the result.
+         */
+        static atan2(y: I.Decimal.Value, x: I.Decimal.Value): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the cube root of x, rounded to precision significant digits using rounding mode rounding.
+         */
+        static cbrt(x: I.Decimal.Value): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the value of x rounded to a whole number in the direction of positive Infinity.
+         */
+        static ceil(x: I.Decimal.Value): Decimal;
+
+        /**
+         * Returns a new independent Decimal constructor with configuration settings as described by object, or with the same settings as this Decimal constructor if object is omitted.
+         *
+         * @alias config
+         */
+        static clone(object?: I.Decimal.Config): I.Decimal.Constructor;
+
+        /**
+         * Configures the 'global' settings for this particular Decimal constructor, i.e. the settings which apply to operations performed on the Decimal instances created by it.
+         *
+         * @alias set
+         */
+        static config(object: I.Decimal.Config): I.Decimal.Constructor;
+
+        /**
+         * Configures the 'global' settings for this particular Decimal constructor, i.e. the settings which apply to operations performed on the Decimal instances created by it.
+         *
+         * @alias config
+         */
+        static set(object: I.Decimal.Config): I.Decimal.Constructor;
+
+        /**
+         * Returns a new Decimal whose value is the cosine of the value in radians of x, rounded to precision significant digits using rounding mode rounding.
+         */
+        static cos(x: I.Decimal.Value): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the inverse hyperbolic cosine in radians of x, rounded to precision significant digits using rounding mode rounding.
+         */
+        static cosh(x: I.Decimal.Value): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the value of x divided by x, rounded to precision significant digits using rounding mode rounding.
+         */
+        static div(x: I.Decimal.Value, y: I.Decimal.Value): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the base e (Euler's number, the base of the natural logarithm) exponential of x, rounded to precision significant digits using rounding mode rounding.
+         */
+        static exp(x: I.Decimal.Value): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the value of x rounded to a whole number in the direction of negative Infinity.
+         */
+        static floor(x: I.Decimal.Value): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the square root of the sum of the squares of the arguments, rounded to precision significant digits using rounding mode rounding.
+         */
+        static hypot(...x: I.Decimal.Value[]): Decimal;
+
+        /**
+         * Returns true if object is a Decimal instance (where Decimal is any Decimal constructor), or false if it is not.
+         */
+        static isDecimal(object: any): boolean;
+
+        /**
+         * Returns a new Decimal whose value is the natural logarithm of x, rounded to precision significant digits using rounding mode rounding.
+         */
+        static ln(x: I.Decimal.Value): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the base x logarithm of x, rounded to precision significant digits using rounding mode rounding.
+         *
+         * @param base logarithm base, default is 10
+         */
+        static log(x: I.Decimal.Value, base?: I.Decimal.Value): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the base 2 logarithm of x, rounded to precision significant digits using rounding mode rounding.
+         */
+        static log2(x: I.Decimal.Value): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the base 10 logarithm of x, rounded to precision significant digits using rounding mode rounding.
+         */
+        static log10(x: I.Decimal.Value): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the maximum of the arguments.
+         */
+        static max(...x: I.Decimal.Value[]): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the minimum of the arguments.
+         */
+        static min(...x: I.Decimal.Value[]): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is x modulo y, rounded to precision significant digits using rounding mode rounding.
+         */
+        static mod(x: I.Decimal.Value, y: I.Decimal.Value): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is x times y, rounded to precision significant digits using rounding mode rounding.
+         */
+        static mul(x: I.Decimal.Value, y: I.Decimal.Value): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is base raised to the power exponent, rounded to precision significant digits using rounding mode rounding.
+         */
+        static pow(base: I.Decimal.Value, exponent: I.Decimal.Value): Decimal;
+
+        /**
+         * Returns a new Decimal with a pseudo-random value equal to or greater than 0 and less than 1.
+         *
+         * The return value will have dp decimal places (or less if trailing zeros are produced). If dp is omitted then the number of decimal places will default to the current precision setting.
+         */
+        static random(significantDigits?: number): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is x rounded to a whole number using rounding mode rounding.
+         */
+        static round(x: I.Decimal.Value): Decimal;
+
+        /**
+         * 1	if the value of x is non-zero and its sign is positive
+         *
+         * -1	if the value of x is non-zero and its sign is negative
+         *
+         * 0	if the value of x is positive zero
+         *
+         * -0	if the value of x is negative zero
+         *
+         * NaN	if the value of x is NaN
+         */
+        static sign(x: I.Decimal.Value): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the sine of the value in radians of x, rounded to precision significant digits using rounding mode rounding.
+         */
+        static sin(x: I.Decimal.Value): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the hyperbolic sine of the value in radians of x, rounded to precision significant digits using rounding mode rounding.
+         */
+        static sinh(x: I.Decimal.Value): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the square root of x, rounded to precision significant digits using rounding mode rounding.
+         */
+        static sqrt(x: I.Decimal.Value): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is x minus y, rounded to precision significant digits using rounding mode rounding.
+         */
+        static sub(x: I.Decimal.Value, y: I.Decimal.Value): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the tangent of the value in radians of x, rounded to precision significant digits using rounding mode rounding.
+         */
+        static tan(x: I.Decimal.Value): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is the hyperbolic tangent of the value in radians of x, rounded to precision significant digits using rounding mode rounding.
+         */
+        static tanh(x: I.Decimal.Value): Decimal;
+
+        /**
+         * Returns a new Decimal whose value is x truncated to a whole number.
+         */
+        static trunc(x: I.Decimal.Value): Decimal;
+
+        static readonly default?: I.Decimal.Constructor;
+        static readonly Decimal?: I.Decimal.Constructor;
+
+        /**
+         * The maximum number of significant digits of the result of an operation.
+         */
+        static readonly precision: number;
+
+        /**
+         * The default rounding mode used when rounding the result of an operation to precision significant digits, and when rounding
+         * the return value of the round, toBinary, toDecimalPlaces, toExponential, toFixed, toHexadecimal, toNearest, toOctal,
+         * toPrecision and toSignificantDigits methods.
+         */
+        static readonly rounding: I.Decimal.Rounding;
+
+        /**
+         * The negative exponent value at and below which toString returns exponential notation.
+         *
+         * JavaScript numbers use exponential notation for negative exponents of -7 and below.
+         */
+        static readonly toExpNeg: number;
+
+        /**
+         * The positive exponent value at and above which toString returns exponential notation.
+         *
+         * JavaScript numbers use exponential notation for positive exponents of 20 and above.
+         */
+        static readonly toExpPos: number;
+
+        static readonly minE: number;
+
+        static readonly maxE: number;
+
+        static readonly crypto: boolean;
+
+        /**
+         * The modulo mode used when calculating the modulus: a mod n.
+         *
+         * The quotient, q = a / n, is calculated according to the rounding mode that corresponds to the chosen modulo mode.
+         *
+         * The remainder, r, is calculated as: r = a - n * q.
+         */
+        static readonly modulo: I.Decimal.Modulo;
+
+        /**
+         * Rounds away from zero
+         */
+        static readonly ROUND_UP: 0;
+
+        /**
+         * Rounds towards zero
+         */
+        static readonly ROUND_DOWN: 1;
+
+        /**
+         * Rounds towards Infinity
+         */
+        static readonly ROUND_CEIL: 2;
+
+        /**
+         * Rounds towards -Infinity
+         */
+        static readonly ROUND_FLOOR: 3;
+
+        /**
+         * Rounds towards nearest neighbour.
+         *
+         * If equidistant, rounds away from zero
+         */
+        static readonly ROUND_HALF_UP: 4;
+
+        /**
+         * Rounds towards nearest neighbour.
+         *
+         * If equidistant, rounds towards zero
+         */
+        static readonly ROUND_HALF_DOWN: 5;
+
+        /**
+         * Rounds towards nearest neighbour.
+         *
+         * If equidistant, rounds towards even neighbour
+         */
+        static readonly ROUND_HALF_EVEN: 6;
+
+        /**
+         * Rounds towards nearest neighbour.
+         *
+         * If equidistant, rounds towards Infinity
+         */
+        static readonly ROUND_HALF_CEIL: 7;
+
+        /**
+         * Rounds towards nearest neighbour.
+         *
+         * If equidistant, rounds towards -Infinity
+         */
+        static readonly ROUND_HALF_FLOOR: 8;
+
+        /**
+         * Not a rounding mode
+         */
+        static readonly EUCLID: 9;
+      }
+}
diff --git a/types/adone/glosses/math/index.d.ts b/types/adone/glosses/math/index.d.ts
index 2713196e6e..5e6bbeea65 100644
--- a/types/adone/glosses/math/index.d.ts
+++ b/types/adone/glosses/math/index.d.ts
@@ -1,3 +1,7 @@
+/// <reference path="./bignumber.d.ts" />
+/// <reference path="./bitset.d.ts" />
+/// <reference path="./decimal.d.ts" />
+/// <reference path="./long.d.ts" />
 /// <reference path="./matrix.d.ts" />
 /// <reference path="./simd.d.ts" />
 
@@ -6,748 +10,6 @@ declare namespace adone {
      * math related things
      */
     namespace math {
-        namespace I {
-            interface LowHighBits {
-                /**
-                 * The low (signed) 32 bits of the long
-                 */
-                low: number;
-                /**
-                 * The high (signed) 32 bits of the long
-                 */
-                high: number;
-            }
-            type Longable = Long | number | string | LowHighBits;
-        }
-
-        /**
-         * Represents a 64 bit two's-complement integer
-         */
-        class Long {
-            low: number;
-            high: number;
-            unsigned: boolean;
-
-            /**
-             * @param low The low (signed) 32 bits of the long
-             * @param high The high (signed) 32 bits of the long
-             * @param unsigned Whether unsigned or not, defaults to false for signed
-             */
-            constructor(low?: number, high?: number, unsigned?: boolean);
-
-            /**
-             * Converts the Long to a 32 bit integer, assuming it is a 32 bit integer
-             */
-            toInt(): number;
-
-            /**
-             * Converts the Long to a the nearest floating-point representation of this value (double, 53 bit mantissa)
-             */
-            toNumber(): number;
-
-            /**
-             * Converts the Long to a string written in the specified radix
-             *
-             * @param radix Radix (2-36), 10 by default
-             */
-            toString(radix?: number): string;
-
-            inspect(): string;
-
-            /**
-             * Gets the high 32 bits as a signed integer
-             */
-            getHighBits(): number;
-
-            /**
-             * Gets the high 32 bits as an unsigned integer
-             */
-            getHighBitsUnsigned(): number;
-
-            /**
-             * Gets the low 32 bits as a signed integer
-             */
-            getLowBits(): number;
-
-            /**
-             * Gets the low 32 bits as an unsigned integer
-             */
-            getLowBitsUnsigned(): number;
-
-            /**
-             * Gets the number of bits needed to represent the absolute value of this Long
-             */
-            getNumBitsAbs(): number;
-
-            /**
-             * Tests if this Long's value equals zero
-             */
-            isZero(): boolean;
-
-            /**
-             * Tests if this Long's value is negative
-             */
-            isNegative(): boolean;
-
-            /**
-             * Tests if this Long's value is positive
-             */
-            isPositive(): boolean;
-
-            /**
-             * Tests if this Long's value is odd
-             */
-            isOdd(): boolean;
-
-            /**
-             * Tests if this Long's value is even
-             */
-            isEven(): boolean;
-
-            /**
-             * Tests if this Long's value equals the specified's
-             */
-            equals(other: I.Longable): boolean;
-
-            /**
-             * Tests if this Long's value is less than the specified's
-             */
-            lessThan(other: I.Longable): boolean;
-
-            /**
-             * Tests if this Long's value is less than or equal the specified's
-             */
-            lessThanOrEqual(other: I.Longable): boolean;
-
-            /**
-             * Tests if this Long's value is greater than the specified's
-             */
-            greaterThan(other: I.Longable): boolean;
-
-            /**
-             * Tests if this Long's value is greater than or equal the specified's
-             */
-            greaterThanOrEqual(other: I.Longable): boolean;
-
-            /**
-             * Compares this Long's value with the specified's.
-             * Returns 0 if they are the same, 1 if the this is greater and -1 if the given one is greater
-             */
-            compare(other: I.Longable): number;
-
-            /**
-             * Negates this Long's value
-             */
-            negate(): Long;
-
-            /**
-             * Returns the sum of this and the specified Long
-             */
-            add(addend: I.Longable): Long;
-
-            /**
-             * Returns the difference of this and the specified Long
-             */
-            sub(subtrahend: I.Longable): Long;
-
-            /**
-             * Returns the product of this and the specified Long
-             */
-            mul(multiplier: I.Longable): Long;
-
-            /**
-             * Returns this Long divided by the specified
-             */
-            div(divisor: I.Longable): Long;
-
-            /**
-             * Returns this Long modulo the specified
-             */
-            mod(divisor: I.Longable): Long;
-
-            /**
-             * Returns the bitwise NOT of this Long
-             */
-            not(): Long;
-
-            /**
-             * Returns the bitwise AND of this Long and the specified
-             */
-            and(other: I.Longable): Long;
-
-            /**
-             * Returns the bitwise OR of this Long and the specifieds
-             */
-            or(other: I.Longable): Long;
-
-            /**
-             * Returns the bitwise XOR of this Long and the given one
-             */
-            xor(other: I.Longable): Long;
-
-            /**
-             * Returns this Long with bits shifted to the left by the given amount
-             */
-            shl(numBits: number | Long): Long;
-
-            /**
-             * Returns this Long with bits arithmetically shifted to the right by the given amount
-             */
-            shr(numBits: number | Long): Long;
-
-            /**
-             * Returns this Long with bits logically shifted to the right by the given amount
-             */
-            shru(numBits: number | Long): Long;
-
-            /**
-             * Converts this Long to signed
-             */
-            toSigned(): Long;
-
-            /**
-             * Converts this Long to unsigned
-             */
-            toUnsigned(): Long;
-
-            /**
-             * Converts this Long to an array of bytes, big-endian by default
-             *
-             * @param le Whether to return an array in little-endian format
-             */
-            toBytes(le?: boolean): number[];
-
-            /**
-             * Converts this Long to an array of bytes in little-endian format
-             */
-            toBytesLE(): number[];
-
-            /**
-             * Converts this Long to an array of bytes in big-endian format
-             */
-            toBytesBE(): number[];
-
-            /**
-             * Returns a Long representing the given 32 bit integer value
-             */
-            static fromInt(value: number, unsigned?: boolean): Long;
-
-            /**
-             * Returns a Long representing the given value, provided that it is a finite number. Otherwise, zero is returned
-             */
-            static fromNumber(value?: number, unsigned?: boolean): Long;
-
-            /**
-             * Returns a Long representing the 64 bit integer that comes by concatenating the given low and high bits. Each is assumed to use 32 bits
-             */
-            static fromBits(lowBits: number, highBits: number, unsigned?: boolean): Long;
-
-            /**
-             * Returns a Long representation of the given string, written using the specified radix
-             */
-            static fromString(str: string, unsigned?: boolean, radix?: number): Long;
-
-            /**
-             * Returns a Long representation of the given string, written using the specified radix
-             */
-            static fromString(str: string, radix?: number): Long;
-
-            /**
-             * Converts the specified value to a Long
-             */
-            static fromValue(val: I.Longable): Long;
-
-            /**
-             * Minimum signed value
-             */
-            static MIN_VALUE: Long;
-
-            /**
-             * Maximum signed value
-             */
-            static MAX_VALUE: Long;
-
-            /**
-             * Maximum unsigned value
-             */
-            static MAX_UNSIGNED_VALUE: Long;
-
-            /**
-             * Signed zero
-             */
-            static ZERO: Long;
-
-            /**
-             * Unsigned zero
-             */
-            static UZERO: Long;
-
-            /**
-             * Signed one
-             */
-            static ONE: Long;
-
-            /**
-             * Unsigned one
-             */
-            static UONE: Long;
-
-            /**
-             * Signed negative one
-             */
-            static NEG_ONE: Long;
-        }
-
-        namespace I.BigNumber {
-            interface BufferConvertOptions {
-                endian?: 1 | -1 | "big" | "little";
-                size?: "auto" | number;
-            }
-        }
-
-        /**
-         * Represents a number of arbitrary precision
-         */
-        class BigNumber {
-            /**
-             * Creates a BigNumber from the given value, the base is 10
-             */
-            constructor(n: number | string | BigNumber);
-
-            /**
-             * Creates a BigNumber from the given string and base
-             */
-            constructor(n: string, base: number);
-
-            /**
-             * Converts the number to a string in the given base
-             */
-            toString(base?: number): string;
-
-            /**
-             * Converts the bignum into a Number.
-             * If the bignum is too big you'll lose precision or you'll get ±Infinity.
-             */
-            toNumber(): number;
-
-            /**
-             * Returns a new Buffer with the data from the bignum.
-             */
-            toBuffer(opts?: I.BigNumber.BufferConvertOptions): Buffer;
-
-            /**
-             * Returns a new bignum containing the instance value plus n
-             */
-            add(n: number | string | BigNumber): BigNumber;
-
-            /**
-             * Return a new bignum containing the instance value minus n
-             */
-            sub(n: number | string | BigNumber): BigNumber;
-
-            /**
-             * Returns a new bignum containing the instance value multiplied by n
-             */
-            mul(n: number | string | BigNumber): BigNumber;
-
-            /**
-             * Returns a new bignum containing the instance value integrally divided by n
-             */
-            div(n: number | string | BigNumber): BigNumber;
-
-            /**
-             * Returns a new bignum with the absolute value of the instance
-             */
-            abs(): BigNumber;
-
-            /**
-             * Returns a new bignum with the negative of the instance value
-             */
-            neg(): BigNumber;
-
-            /**
-             * Compares the instance value to n.
-             *
-             * Returns a positive integer if > n, a negative integer if < n, and 0 if == n
-             */
-            cmp(n: number | string | BigNumber): number;
-
-            /**
-             * Checks whether the instance value is greater than n (> n).
-             */
-            gt(n: number | string | BigNumber): boolean;
-
-            /**
-             * Checks whether the instance value is greater than or equal to n (>= n).
-             */
-            ge(n: number | string | BigNumber): boolean;
-
-            /**
-             * Checks whether the instance value is equal to n (== n).
-             */
-            eq(n: number | string | BigNumber): boolean;
-
-            /**
-             * Checks whether the instance value is less than n (< n).
-             */
-            lt(n: number | string | BigNumber): boolean;
-
-            /**
-             * Checks whether the instance value is less than or equal to n (<= n).
-             */
-            le(n: number | string | BigNumber): boolean;
-
-            /**
-             * Returns a new bignum with the instance value bitwise AND (&)-ed with n.
-             */
-            and(n: number | string | BigNumber): BigNumber;
-
-            /**
-             * Returns a new bignum with the instance value bitwise inclusive-OR (|)-ed with n.
-             */
-            or(n: number | string | BigNumber): BigNumber;
-
-            /**
-             * Returns a new bignum with the instance value bitwise exclusive-OR (^)-ed with n.
-             */
-            xor(n: number | string | BigNumber): BigNumber;
-
-            /**
-             * Returns a new bignum with the instance value modulo n.
-             */
-            mod(n: number | string | BigNumber): BigNumber;
-
-            /**
-             * Returns a new bignum with the instance value raised to the nth power.
-             */
-            pow(n: number | string | BigNumber): BigNumber;
-
-            /**
-             * Returns a new bignum with the instance value raised to the nth power modulo m.
-             */
-            powm(n: number | string | BigNumber, m: number | string | BigNumber): BigNumber;
-
-            /**
-             * Computes the multiplicative inverse modulo m.
-             */
-            invertm(m: number | string | BigNumber): BigNumber;
-
-            /**
-             * Returns a random number from 0 to this -1
-             */
-            rand(): BigNumber;
-
-            /**
-             * Returns a random number from this to upperBound - 1
-             */
-            rand(upperBound: number | string | BigNumber): BigNumber;
-
-            /**
-             * Checks whether the bignum is:
-             *
-             * - certainly prime (true)
-             *
-             * - probably prime ('maybe')
-             *
-             * - certainly composite (false)
-             */
-            probPrime(): boolean | "maybe";
-
-            /**
-             * Returns the next prime number after this bignum
-             */
-            nextPrime(): BigNumber;
-
-            /**
-             * Returns a new bignum that is the square root. This truncates.
-             */
-            sqrt(): BigNumber;
-
-            /**
-             * Returns a new bignum that is the nth root. This truncates.
-             */
-            root(n: number | string | BigNumber): BigNumber;
-
-            /**
-             * Returns a new bignum that is the 2^n multiple. Equivalent of the << operator.
-             */
-            shiftLeft(n: number | string | BigNumber): BigNumber;
-
-            /**
-             * Returns a new bignum of the value integer divided by 2^n. Equivalent of the >> operator.
-             */
-            shiftRight(n: number | string | BigNumber): BigNumber;
-
-            /**
-             * Returns the greatest common divisor of the current bignum with n as a new bignum.
-             */
-            gcd(n: number | string | BigNumber): BigNumber;
-
-            /**
-             * Returns the Jacobi symbol (or Legendre symbol if n is prime) of the current bignum (= a) over n.
-             * Note that n must be odd and >= 3. 0 <= a < n.
-             * Returns -1 or 1
-             */
-            jacobi(n: number | string | BigNumber): number;
-
-            /**
-             * Returns the number of bits used to represent the current bignum
-             */
-            bitLength(): number;
-
-            /**
-             * Checks whether the bit at the given index is set
-             */
-            isBitSet(n: number): boolean;
-
-            /**
-             * Generates a probable prime number of length bits.
-             *
-             * @param bits the number of bits
-             * @param safe If true, it will be a "safe" prime of the form p=2p'+1 where p' is also prime. Default: true
-             */
-            static prime(bits: number, safe?: boolean): BigNumber;
-
-            /**
-             * Creates a new bignum from a Buffer.
-             */
-            static fromBuffer(buf: Buffer, opts?: I.BigNumber.BufferConvertOptions): BigNumber;
-
-            /**
-             * One
-             */
-            static ONE: BigNumber;
-
-            /**
-             * Zero
-             */
-            static ZERO: BigNumber;
-        }
-
-        /**
-         * Represents a set of bits
-         */
-        class BitSet {
-            /**
-             * Creates a new bitset of n bits
-             */
-            constructor(n: number);
-
-            /**
-             * Creates a new bitset from a dehydrated bitset
-             */
-            constructor(key: string);
-
-            /**
-             * Checks whether a bit at a specific index is set
-             */
-            get(idx: number): boolean;
-
-            /**
-             * Sets a single bit.
-             * Returns true if set was successfull
-             */
-            set(idx: number): boolean;
-
-            /**
-             * Sets a range of bits.
-             * Returns true if set was successfull
-             */
-            setRange(from: number, to: number): boolean;
-
-            /**
-             * Unsets a single bit.
-             * Returns true if unset was successfull
-             */
-            unset(idx: number): boolean;
-
-            /**
-             * Unsets a range of bits.
-             * Returns true if unset was successfull
-             */
-            unsetRange(from: number, to: number): boolean;
-
-            /**
-             * Toggles a single bit
-             */
-            toggle(idx: number): boolean;
-
-            /**
-             * Toggles a range of bits
-             */
-            toggleRange(from: number, to: number): boolean;
-
-            /**
-             * Clears the entire bitset
-             */
-            clear(): boolean;
-
-            /**
-             * Clones the set
-             */
-            clone(): BitSet;
-
-            /**
-             * Turns the bitset into a comma separated string that skips leading & trailing 0 words.
-             * Ends with the number of leading 0s and MAX_BIT.
-             * Useful if you need the bitset to be an object key (eg dynamic programming).
-             * Can rehydrate by passing the result into the constructor
-             */
-            dehydrate(): string;
-
-            /**
-             * Performs a bitwise AND on 2 bitsets or 1 bitset and 1 index.
-             * Both bitsets must have the same number of words, no length check is performed to prevent and overflow.
-             */
-            and(value: number | BitSet): BitSet;
-
-            /**
-             * Performs a bitwise OR on 2 bitsets or 1 bitset and 1 index.
-             * Both bitsets must have the same number of words, no length check is performed to prevent and overflow.
-             */
-            or(value: number | BitSet): BitSet;
-
-            /**
-             * Performs a bitwise XOR on 2 bitsets or 1 bitset and 1 index.
-             * Both bitsets must have the same number of words, no length check is performed to prevent and overflow.
-             */
-            xor(value: number | BitSet): BitSet;
-
-            /**
-             * Runs a custom function on every set bit.
-             * Faster than iterating over the entire bitset with a get().
-             * If the callback returns `false` it stops iterating.
-             */
-            forEach(callback: ((idx: number) => void | boolean)): void;
-
-            /**
-             * Performs a circular shift bitset by an offset
-             *
-             * @param n number of positions that the bitset that will be shifted to the right. Using a negative number will result in a left shift.
-             */
-            circularShift(n: number): BitSet;
-
-            /**
-             * Gets the cardinality (count of set bits) for the entire bitset
-             */
-            getCardinality(): number;
-
-            /**
-             * Gets the indices of all set bits
-             */
-            getIndices(): number[];
-
-            /**
-             * Checks if one bitset is subset of another.
-             */
-            isSubsetOf(other: BitSet): boolean;
-
-            /**
-             * Quickly determines if a bitset is empty
-             */
-            isEmpty(): boolean;
-
-            /**
-             * Quickly determines if both bitsets are equal (faster than checking if the XOR of the two is === 0).
-             * Both bitsets must have the same number of words, no length check is performed to prevent and overflow.
-             */
-            isEqual(other: BitSet): boolean;
-
-            /**
-             * Gets a string representation of the entire bitset, including leading 0s
-             */
-            toString(): string;
-
-            /**
-             * Finds first set bit (useful for processing queues, breadth-first tree searches, etc.).
-             * Returns -1 if not found
-             *
-             * @param startWord the word to start with (only used internally by nextSetBit)
-             */
-            ffs(startWord?: number): number;
-
-            /**
-             * Finds first zero (unset bit).
-             * Returns -1 if not found
-             *
-             * @param startWord the word to start with (only used internally by nextUnsetBit)
-             */
-            ffz(startWord?: number): number;
-
-            /**
-             * Finds last set bit.
-             * Returns -1 if not found
-             *
-             * @param startWord the word to start with (only used internally by previousSetBit)
-             */
-            fls(startWord?: number): number;
-
-            /**
-             * Finds last zero (unset bit).
-             * Returns -1 if not found
-             *
-             * @param startWord the word to start with (only used internally by previousUnsetBit)
-             */
-            flz(startWord?: number): number;
-
-            /**
-             * Finds first set bit, starting at a given index.
-             * Return -1 if not found
-             *
-             * @param idx the starting index for the next set bit
-             */
-            nextSetBit(idx: number): number;
-
-            /**
-             * Finds first unset bit, starting at a given index.
-             * Return -1 if not found
-             *
-             * @param idx the starting index for the next unset bit
-             */
-            nextUnsetBit(idx: number): number;
-
-            /**
-             * Finds last set bit, up to a given index.
-             * Returns -1 if not found
-             *
-             * @param idx the starting index for the next unset bit (going in reverse)
-             */
-            previousSetBit(idx: number): number;
-
-            /**
-             * Finds last unset bit, up to a given index.
-             * Returns -1 if not found
-             */
-            previousUnsetBit(idx: number): number;
-
-            /**
-             * Converts the bitset to a math.Long number
-             */
-            toLong(): Long;
-
-            /**
-             * Reads an unsigned integer of the given bits from the given offset
-             *
-             * @param bits number of bits, 1 by default
-             * @param offset offset, 0 by default
-             */
-            readUInt(bits?: number, offset?: number): number;
-
-            /**
-             * Writes the given unsigned integer
-             *
-             * @param val integer
-             * @param bits number of bits to write, 1 by default
-             * @param offset write offset, 0 by default
-             */
-            writeUInt(val: number, bits?: number, offset?: number): void;
-
-            /**
-             * Creates a new BitSet from the given math.Long number
-             */
-            static fromLong(l: Long): BitSet;
-        }
-
         /**
          * Returns a random number from min to max - 1
          *
@@ -755,5 +17,21 @@ declare namespace adone {
          * @param max upper bound, default is 0xFFFFFFFF
          */
         function random(min?: number, max?: number): number;
+
+        /**
+         * Returns the maximum value from the given array
+         *
+         * @param array array of values
+         * @param score function to calculate the element score value
+         */
+        function max<T>(array: T[], score?: (x: T) => any): T;
+
+        /**
+         * Returns the minimum value from the given array
+         *
+         * @param array array of values
+         * @param score function to calculate the element score value
+         */
+        function min<T>(array: T[], score?: (x: T) => any): T;
     }
 }
diff --git a/types/adone/glosses/math/long.d.ts b/types/adone/glosses/math/long.d.ts
new file mode 100644
index 0000000000..a4a15e2be5
--- /dev/null
+++ b/types/adone/glosses/math/long.d.ts
@@ -0,0 +1,293 @@
+declare namespace adone.math {
+    namespace I {
+        interface LowHighBits {
+            /**
+             * The low (signed) 32 bits of the long
+             */
+            low: number;
+            /**
+             * The high (signed) 32 bits of the long
+             */
+            high: number;
+        }
+        type Longable = Long | number | string | LowHighBits;
+    }
+
+    /**
+     * Represents a 64 bit two's-complement integer
+     */
+    class Long {
+        low: number;
+        high: number;
+        unsigned: boolean;
+
+        /**
+         * @param low The low (signed) 32 bits of the long
+         * @param high The high (signed) 32 bits of the long
+         * @param unsigned Whether unsigned or not, defaults to false for signed
+         */
+        constructor(low?: number, high?: number, unsigned?: boolean);
+
+        /**
+         * Converts the Long to a 32 bit integer, assuming it is a 32 bit integer
+         */
+        toInt(): number;
+
+        /**
+         * Converts the Long to a the nearest floating-point representation of this value (double, 53 bit mantissa)
+         */
+        toNumber(): number;
+
+        /**
+         * Converts the Long to a string written in the specified radix
+         *
+         * @param radix Radix (2-36), 10 by default
+         */
+        toString(radix?: number): string;
+
+        inspect(): string;
+
+        /**
+         * Gets the high 32 bits as a signed integer
+         */
+        getHighBits(): number;
+
+        /**
+         * Gets the high 32 bits as an unsigned integer
+         */
+        getHighBitsUnsigned(): number;
+
+        /**
+         * Gets the low 32 bits as a signed integer
+         */
+        getLowBits(): number;
+
+        /**
+         * Gets the low 32 bits as an unsigned integer
+         */
+        getLowBitsUnsigned(): number;
+
+        /**
+         * Gets the number of bits needed to represent the absolute value of this Long
+         */
+        getNumBitsAbs(): number;
+
+        /**
+         * Tests if this Long's value equals zero
+         */
+        isZero(): boolean;
+
+        /**
+         * Tests if this Long's value is negative
+         */
+        isNegative(): boolean;
+
+        /**
+         * Tests if this Long's value is positive
+         */
+        isPositive(): boolean;
+
+        /**
+         * Tests if this Long's value is odd
+         */
+        isOdd(): boolean;
+
+        /**
+         * Tests if this Long's value is even
+         */
+        isEven(): boolean;
+
+        /**
+         * Tests if this Long's value equals the specified's
+         */
+        equals(other: I.Longable): boolean;
+
+        /**
+         * Tests if this Long's value is less than the specified's
+         */
+        lessThan(other: I.Longable): boolean;
+
+        /**
+         * Tests if this Long's value is less than or equal the specified's
+         */
+        lessThanOrEqual(other: I.Longable): boolean;
+
+        /**
+         * Tests if this Long's value is greater than the specified's
+         */
+        greaterThan(other: I.Longable): boolean;
+
+        /**
+         * Tests if this Long's value is greater than or equal the specified's
+         */
+        greaterThanOrEqual(other: I.Longable): boolean;
+
+        /**
+         * Compares this Long's value with the specified's.
+         * Returns 0 if they are the same, 1 if the this is greater and -1 if the given one is greater
+         */
+        compare(other: I.Longable): number;
+
+        /**
+         * Negates this Long's value
+         */
+        negate(): Long;
+
+        /**
+         * Returns the sum of this and the specified Long
+         */
+        add(addend: I.Longable): Long;
+
+        /**
+         * Returns the difference of this and the specified Long
+         */
+        sub(subtrahend: I.Longable): Long;
+
+        /**
+         * Returns the product of this and the specified Long
+         */
+        mul(multiplier: I.Longable): Long;
+
+        /**
+         * Returns this Long divided by the specified
+         */
+        div(divisor: I.Longable): Long;
+
+        /**
+         * Returns this Long modulo the specified
+         */
+        mod(divisor: I.Longable): Long;
+
+        /**
+         * Returns the bitwise NOT of this Long
+         */
+        not(): Long;
+
+        /**
+         * Returns the bitwise AND of this Long and the specified
+         */
+        and(other: I.Longable): Long;
+
+        /**
+         * Returns the bitwise OR of this Long and the specifieds
+         */
+        or(other: I.Longable): Long;
+
+        /**
+         * Returns the bitwise XOR of this Long and the given one
+         */
+        xor(other: I.Longable): Long;
+
+        /**
+         * Returns this Long with bits shifted to the left by the given amount
+         */
+        shl(numBits: number | Long): Long;
+
+        /**
+         * Returns this Long with bits arithmetically shifted to the right by the given amount
+         */
+        shr(numBits: number | Long): Long;
+
+        /**
+         * Returns this Long with bits logically shifted to the right by the given amount
+         */
+        shru(numBits: number | Long): Long;
+
+        /**
+         * Converts this Long to signed
+         */
+        toSigned(): Long;
+
+        /**
+         * Converts this Long to unsigned
+         */
+        toUnsigned(): Long;
+
+        /**
+         * Converts this Long to an array of bytes, big-endian by default
+         *
+         * @param le Whether to return an array in little-endian format
+         */
+        toBytes(le?: boolean): number[];
+
+        /**
+         * Converts this Long to an array of bytes in little-endian format
+         */
+        toBytesLE(): number[];
+
+        /**
+         * Converts this Long to an array of bytes in big-endian format
+         */
+        toBytesBE(): number[];
+
+        /**
+         * Returns a Long representing the given 32 bit integer value
+         */
+        static fromInt(value: number, unsigned?: boolean): Long;
+
+        /**
+         * Returns a Long representing the given value, provided that it is a finite number. Otherwise, zero is returned
+         */
+        static fromNumber(value?: number, unsigned?: boolean): Long;
+
+        /**
+         * Returns a Long representing the 64 bit integer that comes by concatenating the given low and high bits. Each is assumed to use 32 bits
+         */
+        static fromBits(lowBits: number, highBits: number, unsigned?: boolean): Long;
+
+        /**
+         * Returns a Long representation of the given string, written using the specified radix
+         */
+        static fromString(str: string, unsigned?: boolean, radix?: number): Long;
+
+        /**
+         * Returns a Long representation of the given string, written using the specified radix
+         */
+        static fromString(str: string, radix?: number): Long;
+
+        /**
+         * Converts the specified value to a Long
+         */
+        static fromValue(val: I.Longable): Long;
+
+        /**
+         * Minimum signed value
+         */
+        static MIN_VALUE: Long;
+
+        /**
+         * Maximum signed value
+         */
+        static MAX_VALUE: Long;
+
+        /**
+         * Maximum unsigned value
+         */
+        static MAX_UNSIGNED_VALUE: Long;
+
+        /**
+         * Signed zero
+         */
+        static ZERO: Long;
+
+        /**
+         * Unsigned zero
+         */
+        static UZERO: Long;
+
+        /**
+         * Signed one
+         */
+        static ONE: Long;
+
+        /**
+         * Unsigned one
+         */
+        static UONE: Long;
+
+        /**
+         * Signed negative one
+         */
+        static NEG_ONE: Long;
+    }
+}
diff --git a/types/adone/glosses/regex.d.ts b/types/adone/glosses/regex.d.ts
index e5c3be642a..edd66d324f 100644
--- a/types/adone/glosses/regex.d.ts
+++ b/types/adone/glosses/regex.d.ts
@@ -2,9 +2,17 @@ declare namespace adone {
     namespace regex {
         function filename(): RegExp;
 
-        function ip4(): RegExp;
+        namespace I.IP {
+            interface Options {
+                exact?: boolean;
+            }
+        }
 
-        function ip6(): RegExp;
+        function ip(options?: I.IP.Options): RegExp;
+
+        function ip4(options?: I.IP.Options): RegExp;
+
+        function ip6(options?: I.IP.Options): RegExp;
 
         function protocol(): RegExp;
 
diff --git a/types/adone/test/glosses/collections/byte_array.ts b/types/adone/test/glosses/collections/byte_array.ts
index 7254008322..377acfba9c 100644
--- a/types/adone/test/glosses/collections/byte_array.ts
+++ b/types/adone/test/glosses/collections/byte_array.ts
@@ -56,6 +56,11 @@ namespace adoneTests.collection.ByteArray {
         const b: number = buffer.readUInt16BE(10);
     }
 
+    namespace readUInt24BE {
+        const a: number = buffer.readUInt24BE();
+        const b: number = buffer.readUInt24BE(10);
+    }
+
     namespace readInt32LE {
         const a: number = buffer.readInt32LE();
         const b: number = buffer.readInt32LE(10);
@@ -162,6 +167,11 @@ namespace adoneTests.collection.ByteArray {
         const b: adone.collection.ByteArray = buffer.writeUInt16BE(10, 10);
     }
 
+    namespace writeUInt24BE {
+        const a: adone.collection.ByteArray = buffer.writeUInt24BE(10);
+        const b: adone.collection.ByteArray = buffer.writeUInt24BE(10, 10);
+    }
+
     namespace writeInt32LE {
         const a: adone.collection.ByteArray = buffer.writeInt32LE(10);
         const b: adone.collection.ByteArray = buffer.writeInt32LE(10, 10);
diff --git a/types/adone/test/glosses/collections/fast_lru.ts b/types/adone/test/glosses/collections/fast_lru.ts
index 0e61f51dc5..6df1164d53 100644
--- a/types/adone/test/glosses/collections/fast_lru.ts
+++ b/types/adone/test/glosses/collections/fast_lru.ts
@@ -6,8 +6,8 @@ namespace adoneTests.collection.FastLRU {
     } = adone;
 
     new FastLRU();
-    new FastLRU(100);
-    new FastLRU<string, number>(100, { dispose: (key: string, value: number) => null });
+    new FastLRU({ maxSize: 100 });
+    new FastLRU<string, number>({ maxSize: 100, dispose: (key: string, value: number) => null });
     { const a: number = new FastLRU().size; }
     { const a: number | undefined = new FastLRU<string, number>().get("key"); }
     new FastLRU<string, number>().set("key", 123);
diff --git a/types/adone/test/glosses/collections/lru.ts b/types/adone/test/glosses/collections/lru.ts
index 934e5a1fbf..59e7b77694 100644
--- a/types/adone/test/glosses/collections/lru.ts
+++ b/types/adone/test/glosses/collections/lru.ts
@@ -8,15 +8,14 @@ namespace adoneTests.collection.LRU {
     type LRU = adone.collection.LRU;
 
     new LRU();
-    new LRU(100);
+    new LRU({ maxSize: 100 });
     new LRU({});
-    new LRU({ max: 100 });
     new LRU<string, number>({ dispose: (key: string, value: number) => null });
     new LRU<string, number>({ maxAge: 100 });
     new LRU<string, number>({ noDisposeOnSet: false });
     new LRU<string, number>({ stale: true });
-    { const a: number = new LRU<string, number>().max; }
-    { new LRU<string, number>().max = 100; }
+    { const a: number = new LRU<string, number>().maxSize; }
+    { new LRU<string, number>().maxSize = 100; }
     { const a: boolean = new LRU<string, number>().allowStale; }
     { new LRU<string, number>().allowStale = false; }
     { const a: number = new LRU<string, number>().maxAge; }
diff --git a/types/adone/test/glosses/collections/time_map.ts b/types/adone/test/glosses/collections/time_map.ts
new file mode 100644
index 0000000000..5cabcdac9d
--- /dev/null
+++ b/types/adone/test/glosses/collections/time_map.ts
@@ -0,0 +1,22 @@
+namespace adoneTests.collection.TimedoutMap {
+    const {
+        collection: {
+            TimeMap
+        }
+    } = adone;
+
+    type TimeMap<K = any, V = any> = adone.collection.TimeMap<K, V>;
+
+    new TimeMap();
+    new TimeMap(1000);
+    new TimeMap<string, number>(1000, (key: string) => null);
+    {
+        const a: TimeMap<string, number> = new TimeMap<string, number>().forEach((value: number, key: string) => null);
+    }
+    {
+        const a: TimeMap<string, number> = new TimeMap<string, number>().forEach(function (value: number, key: string) {
+            const a: number = this.a;
+        }, { a: 1 });
+    }
+    { const a: boolean = new TimeMap<string, number>().delete("123"); }
+}
diff --git a/types/adone/test/glosses/collections/timedout_map.ts b/types/adone/test/glosses/collections/timedout_map.ts
deleted file mode 100644
index ffca754e2a..0000000000
--- a/types/adone/test/glosses/collections/timedout_map.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-namespace adoneTests.collection.TimedoutMap {
-    const {
-        collection: {
-            TimedoutMap
-        }
-    } = adone;
-
-    type TimedoutMap<K = any, V = any> = adone.collection.TimedoutMap<K, V>;
-
-    new TimedoutMap();
-    new TimedoutMap(1000);
-    new TimedoutMap<string, number>(1000, (key: string) => null);
-    {
-        const a: TimedoutMap<string, number> = new TimedoutMap<string, number>().forEach((value: number, key: string) => null);
-    }
-    {
-        const a: TimedoutMap<string, number> = new TimedoutMap<string, number>().forEach(function (value: number, key: string) {
-            const a: number = this.a;
-        }, { a: 1 });
-    }
-    { const a: boolean = new TimedoutMap<string, number>().delete("123"); }
-}
diff --git a/types/adone/test/glosses/is.ts b/types/adone/test/glosses/is.ts
index 455dd745da..96c954d284 100644
--- a/types/adone/test/glosses/is.ts
+++ b/types/adone/test/glosses/is.ts
@@ -345,7 +345,11 @@ namespace isTests {
     { const a: boolean = is.binaryExtension("mp3"); }
     { const a: boolean = is.binaryPath("a.mp3"); }
     { const a: boolean = is.ip4("192.168.1.1"); }
+    { const a: boolean = is.ip4("192.168.1.1", { exact: true }); }
     { const a: boolean = is.ip6("::192.168.1.1"); }
+    { const a: boolean = is.ip6("::192.168.1.1", { exact: true }); }
+    { const a: boolean = is.ip("::192.168.1.1"); }
+    { const a: boolean = is.ip("::192.168.1.1", { exact: true }); }
     {
         const a: boolean = is.arrayBuffer({});
         const b: any = 2;
@@ -492,4 +496,7 @@ namespace isTests {
             b.charCodeAt(0);
         }
     }
+    {
+        const a: boolean = is.multiAddress(2);
+    }
 }
diff --git a/types/adone/test/glosses/math/bignumber.ts b/types/adone/test/glosses/math/bignumber.ts
new file mode 100644
index 0000000000..8466abae7f
--- /dev/null
+++ b/types/adone/test/glosses/math/bignumber.ts
@@ -0,0 +1,154 @@
+namespace mathTests.bignumberTests {
+    const {
+        math: {
+            BigNumber
+        }
+    } = adone;
+
+    type BigNumber = adone.math.BigNumber;
+
+    new BigNumber(10);
+    new BigNumber("10");
+    new BigNumber(new BigNumber(10));
+    new BigNumber("10", 2);
+
+    { const a: string = new BigNumber(1).toString(); }
+    { const a: string = new BigNumber(1).toString(2); }
+
+    { const a: number = new BigNumber(1).toNumber(); }
+
+    { const a: Buffer = new BigNumber(1).toBuffer(); }
+    { const a: Buffer = new BigNumber(1).toBuffer({}); }
+    { const a: Buffer = new BigNumber(1).toBuffer({ endian: 1 }); }
+    { const a: Buffer = new BigNumber(1).toBuffer({ endian: -1 }); }
+    { const a: Buffer = new BigNumber(1).toBuffer({ endian: "big" }); }
+    { const a: Buffer = new BigNumber(1).toBuffer({ endian: "little" }); }
+    { const a: Buffer = new BigNumber(1).toBuffer({ size: 1 }); }
+    { const a: Buffer = new BigNumber(1).toBuffer({ size: "auto" }); }
+
+    { const a: BigNumber = new BigNumber(10).add(1); }
+    { const a: BigNumber = new BigNumber(10).add("1"); }
+    { const a: BigNumber = new BigNumber(10).add(new BigNumber(1)); }
+
+    { const a: BigNumber = new BigNumber(10).sub(1); }
+    { const a: BigNumber = new BigNumber(10).sub("1"); }
+    { const a: BigNumber = new BigNumber(10).sub(new BigNumber(1)); }
+
+    { const a: BigNumber = new BigNumber(10).mul(1); }
+    { const a: BigNumber = new BigNumber(10).mul("1"); }
+    { const a: BigNumber = new BigNumber(10).mul(new BigNumber(1)); }
+
+    { const a: BigNumber = new BigNumber(10).div(1); }
+    { const a: BigNumber = new BigNumber(10).div("1"); }
+    { const a: BigNumber = new BigNumber(10).div(new BigNumber(1)); }
+
+    { const a: BigNumber = new BigNumber(10).abs(); }
+
+    { const a: BigNumber = new BigNumber(10).neg(); }
+
+    { const a: number = new BigNumber(10).cmp(1); }
+    { const a: number = new BigNumber(10).cmp("1"); }
+    { const a: number = new BigNumber(10).cmp(new BigNumber(1)); }
+
+    { const a: boolean = new BigNumber(10).gt(1); }
+    { const a: boolean = new BigNumber(10).gt("1"); }
+    { const a: boolean = new BigNumber(10).gt(new BigNumber(10)); }
+
+    { const a: boolean = new BigNumber(10).ge(1); }
+    { const a: boolean = new BigNumber(10).ge("1"); }
+    { const a: boolean = new BigNumber(10).ge(new BigNumber(10)); }
+
+    { const a: boolean = new BigNumber(10).eq(1); }
+    { const a: boolean = new BigNumber(10).eq("1"); }
+    { const a: boolean = new BigNumber(10).eq(new BigNumber(10)); }
+
+    { const a: boolean = new BigNumber(10).lt(1); }
+    { const a: boolean = new BigNumber(10).lt("1"); }
+    { const a: boolean = new BigNumber(10).lt(new BigNumber(10)); }
+
+    { const a: boolean = new BigNumber(10).le(1); }
+    { const a: boolean = new BigNumber(10).le("1"); }
+    { const a: boolean = new BigNumber(10).le(new BigNumber(10)); }
+
+    { const a: BigNumber = new BigNumber(10).and(1); }
+    { const a: BigNumber = new BigNumber(10).and("1"); }
+    { const a: BigNumber = new BigNumber(10).and(new BigNumber(1)); }
+
+    { const a: BigNumber = new BigNumber(10).or(1); }
+    { const a: BigNumber = new BigNumber(10).or("1"); }
+    { const a: BigNumber = new BigNumber(10).or(new BigNumber(1)); }
+
+    { const a: BigNumber = new BigNumber(10).xor(1); }
+    { const a: BigNumber = new BigNumber(10).xor("1"); }
+    { const a: BigNumber = new BigNumber(10).xor(new BigNumber(1)); }
+
+    { const a: BigNumber = new BigNumber(10).mod(1); }
+    { const a: BigNumber = new BigNumber(10).mod("1"); }
+    { const a: BigNumber = new BigNumber(10).mod(new BigNumber(1)); }
+
+    { const a: BigNumber = new BigNumber(10).pow(1); }
+    { const a: BigNumber = new BigNumber(10).pow("1"); }
+    { const a: BigNumber = new BigNumber(10).pow(new BigNumber(1)); }
+
+    { const a: BigNumber = new BigNumber(10).powm(1, 1); }
+    { const a: BigNumber = new BigNumber(10).powm("1", 1); }
+    { const a: BigNumber = new BigNumber(10).powm(new BigNumber(1), 1); }
+    { const a: BigNumber = new BigNumber(10).powm(1, "1"); }
+    { const a: BigNumber = new BigNumber(10).powm("1", "1"); }
+    { const a: BigNumber = new BigNumber(10).powm(new BigNumber(1), "1"); }
+    { const a: BigNumber = new BigNumber(10).powm(1, new BigNumber(1)); }
+    { const a: BigNumber = new BigNumber(10).powm("1", new BigNumber(1)); }
+    { const a: BigNumber = new BigNumber(10).powm(new BigNumber(1), new BigNumber(1)); }
+
+    { const a: BigNumber = new BigNumber(10).invertm(1); }
+    { const a: BigNumber = new BigNumber(10).invertm("1"); }
+    { const a: BigNumber = new BigNumber(10).invertm(new BigNumber(1)); }
+
+    { const a: BigNumber = new BigNumber(10).rand(); }
+    { const a: BigNumber = new BigNumber(10).rand(1); }
+    { const a: BigNumber = new BigNumber(10).rand("1"); }
+    { const a: BigNumber = new BigNumber(10).rand(new BigNumber(1)); }
+
+    { const a: boolean | "maybe" = new BigNumber(10).probPrime(); }
+
+    { const a: BigNumber = new BigNumber(10).nextPrime(); }
+
+    { const a: BigNumber = new BigNumber(10).sqrt(); }
+
+    { const a: BigNumber = new BigNumber(10).root(1); }
+    { const a: BigNumber = new BigNumber(10).root("1"); }
+    { const a: BigNumber = new BigNumber(10).root(new BigNumber(1)); }
+
+    { const a: BigNumber = new BigNumber(10).shiftLeft(1); }
+    { const a: BigNumber = new BigNumber(10).shiftLeft("1"); }
+    { const a: BigNumber = new BigNumber(10).shiftLeft(new BigNumber(1)); }
+
+    { const a: BigNumber = new BigNumber(10).shiftRight(1); }
+    { const a: BigNumber = new BigNumber(10).shiftRight("1"); }
+    { const a: BigNumber = new BigNumber(10).shiftRight(new BigNumber(1)); }
+
+    { const a: BigNumber = new BigNumber(10).gcd(1); }
+    { const a: BigNumber = new BigNumber(10).gcd("1"); }
+    { const a: BigNumber = new BigNumber(10).gcd(new BigNumber(1)); }
+
+    { const a: number = new BigNumber(10).jacobi(1); }
+    { const a: number = new BigNumber(10).jacobi("1"); }
+    { const a: number = new BigNumber(10).jacobi(new BigNumber(1)); }
+
+    { const a: number = new BigNumber(10).bitLength(); }
+
+    { const a: boolean = new BigNumber(10).isBitSet(10); }
+
+    { const a: BigNumber = BigNumber.prime(10); }
+    { const a: BigNumber = BigNumber.prime(10, true); }
+
+    { const a: BigNumber = BigNumber.fromBuffer(Buffer.alloc(10)); }
+    { const a: BigNumber = BigNumber.fromBuffer(Buffer.alloc(10), { endian: "little" }); }
+    { const a: BigNumber = BigNumber.fromBuffer(Buffer.alloc(10), { endian: -1 }); }
+    { const a: BigNumber = BigNumber.fromBuffer(Buffer.alloc(10), { endian: 1 }); }
+    { const a: BigNumber = BigNumber.fromBuffer(Buffer.alloc(10), { endian: "big" }); }
+    { const a: BigNumber = BigNumber.fromBuffer(Buffer.alloc(10), { size: "auto" }); }
+
+    { const a: BigNumber = BigNumber.ONE; }
+    { const a: BigNumber = BigNumber.ZERO; }
+}
diff --git a/types/adone/test/glosses/math/bitset.ts b/types/adone/test/glosses/math/bitset.ts
new file mode 100644
index 0000000000..1e08d0649f
--- /dev/null
+++ b/types/adone/test/glosses/math/bitset.ts
@@ -0,0 +1,62 @@
+namespace mathTests.bitsetTests {
+    const {
+        math: {
+            BitSet
+        }
+    } = adone;
+
+    type BitSet = adone.math.BitSet;
+
+    new BitSet(10);
+    new BitSet(new BitSet(10).dehydrate());
+
+    { const a: boolean = new BitSet(10).get(0); }
+    { const a: boolean = new BitSet(10).set(0); }
+    { const a: boolean = new BitSet(10).setRange(0, 10); }
+    { const a: boolean = new BitSet(10).unset(0); }
+    { const a: boolean = new BitSet(10).unsetRange(0, 10); }
+    { const a: boolean = new BitSet(10).toggle(0); }
+    { const a: boolean = new BitSet(10).toggleRange(0, 10); }
+    { const a: boolean = new BitSet(10).clear(); }
+    { const a: BitSet = new BitSet(10).clone(); }
+    { const a: string = new BitSet(10).dehydrate(); }
+
+    { const a: BitSet = new BitSet(10).and(1); }
+    { const a: BitSet = new BitSet(10).and(new BitSet(10)); }
+
+    { const a: BitSet = new BitSet(10).or(1); }
+    { const a: BitSet = new BitSet(10).or(new BitSet(10)); }
+
+    { const a: BitSet = new BitSet(10).xor(1); }
+    { const a: BitSet = new BitSet(10).xor(new BitSet(10)); }
+
+    new BitSet(10).forEach((x: number) => {});
+    new BitSet(10).forEach((x: number) => false);
+
+    { const a: BitSet = new BitSet(10).circularShift(10); }
+    { const a: number = new BitSet(10).getCardinality(); }
+    { const a: number[] = new BitSet(10).getIndices(); }
+    { const a: boolean = new BitSet(10).isSubsetOf(new BitSet(10)); }
+    { const a: boolean = new BitSet(10).isEmpty(); }
+    { const a: boolean = new BitSet(10).isEqual(new BitSet(10)); }
+    { const a: string = new BitSet(10).toString(); }
+    { const a: number = new BitSet(10).ffs(); }
+    { const a: number = new BitSet(10).ffs(1); }
+    { const a: number = new BitSet(10).ffz(); }
+    { const a: number = new BitSet(10).ffz(1); }
+    { const a: number = new BitSet(10).fls(); }
+    { const a: number = new BitSet(10).fls(1); }
+    { const a: number = new BitSet(10).flz(); }
+    { const a: number = new BitSet(10).flz(1); }
+    { const a: number = new BitSet(10).nextSetBit(1); }
+    { const a: number = new BitSet(10).nextUnsetBit(1); }
+    { const a: number = new BitSet(10).previousSetBit(1); }
+    { const a: number = new BitSet(10).previousUnsetBit(1); }
+    { const a: number = new BitSet(10).readUInt(); }
+    { const a: number = new BitSet(10).readUInt(1); }
+    { const a: number = new BitSet(10).readUInt(1, 2); }
+    { new BitSet(10).writeUInt(1); }
+    { new BitSet(10).writeUInt(1, 2); }
+    { new BitSet(10).writeUInt(1, 2, 3); }
+    { const a: BitSet = BitSet.fromLong(new adone.math.Long(10, 20)); }
+}
diff --git a/types/adone/test/glosses/math/decimal.ts b/types/adone/test/glosses/math/decimal.ts
new file mode 100644
index 0000000000..7c5f450c35
--- /dev/null
+++ b/types/adone/test/glosses/math/decimal.ts
@@ -0,0 +1,445 @@
+namespace mathTests.decimalTest {
+    const {
+        math: {
+            Decimal
+        }
+    } = adone;
+
+    type Decimal = adone.math.Decimal;
+
+    new Decimal(0);
+    new Decimal("0");
+    new Decimal(new Decimal(0));
+
+    new Decimal(0).e.toExponential();
+    new Decimal(0).d[0].toExponential();
+    new Decimal(0).s.toExponential();
+
+    const d = new Decimal(0);
+
+    { const a: Decimal = d.abs(); }
+    { const a: Decimal = d.absoluteValue(); }
+
+    { const a: Decimal = d.ceil(); }
+
+    { const a: number = d.comparedTo(1); }
+    { const a: number = d.comparedTo("1"); }
+    { const a: number = d.comparedTo(d); }
+    { const a: number = d.cmp(1); }
+    { const a: number = d.cmp("1"); }
+    { const a: number = d.cmp(d); }
+
+    { const a: Decimal = d.cos(); }
+    { const a: Decimal = d.cosine(); }
+
+    { const a: Decimal = d.cubeRoot(); }
+    { const a: Decimal = d.cbrt(); }
+
+    { const a: number = d.decimalPlaces(); }
+    { const a: number = d.dp(); }
+
+    { const a: Decimal = d.dividedBy(1); }
+    { const a: Decimal = d.dividedBy("1"); }
+    { const a: Decimal = d.dividedBy(d); }
+    { const a: Decimal = d.div(1); }
+    { const a: Decimal = d.div("1"); }
+    { const a: Decimal = d.div(d); }
+
+    { const a: Decimal = d.dividedToIntegerBy(1); }
+    { const a: Decimal = d.dividedToIntegerBy("1"); }
+    { const a: Decimal = d.dividedToIntegerBy(d); }
+    { const a: Decimal = d.divToInt(1); }
+    { const a: Decimal = d.divToInt("1"); }
+    { const a: Decimal = d.divToInt(d); }
+
+    { const a: boolean = d.equals(1); }
+    { const a: boolean = d.equals("1"); }
+    { const a: boolean = d.equals(d); }
+    { const a: boolean = d.eq(1); }
+    { const a: boolean = d.eq("1"); }
+    { const a: boolean = d.eq(d); }
+
+    { const a: Decimal = d.floor(); }
+
+    { const a: boolean = d.greaterThan(1); }
+    { const a: boolean = d.greaterThan("1"); }
+    { const a: boolean = d.greaterThan(d); }
+    { const a: boolean = d.gt(1); }
+    { const a: boolean = d.gt("1"); }
+    { const a: boolean = d.gt(d); }
+
+    { const a: boolean = d.greaterThanOrEqualTo(1); }
+    { const a: boolean = d.greaterThanOrEqualTo("1"); }
+    { const a: boolean = d.greaterThanOrEqualTo(d); }
+    { const a: boolean = d.gte(1); }
+    { const a: boolean = d.gte("1"); }
+    { const a: boolean = d.gte(d); }
+
+    { const a: Decimal = d.hyperbolicCosine(); }
+    { const a: Decimal = d.cosh(); }
+
+    { const a: Decimal = d.hyperbolicSine(); }
+    { const a: Decimal = d.sinh(); }
+
+    { const a: Decimal = d.hyperbolicTangent(); }
+    { const a: Decimal = d.tanh(); }
+
+    { const a: Decimal = d.inverseCosine(); }
+    { const a: Decimal = d.acos(); }
+
+    { const a: Decimal = d.inverseHyperbolicCosine(); }
+    { const a: Decimal = d.acosh(); }
+
+    { const a: Decimal = d.inverseHyperbolicSine(); }
+    { const a: Decimal = d.asinh(); }
+
+    { const a: Decimal = d.inverseHyperbolicTangent(); }
+    { const a: Decimal = d.atanh(); }
+
+    { const a: Decimal = d.inverseSine(); }
+    { const a: Decimal = d.asin(); }
+
+    { const a: Decimal = d.inverseTangent(); }
+    { const a: Decimal = d.atan(); }
+
+    { const a: boolean = d.isFinite(); }
+
+    { const a: boolean = d.isInteger(); }
+    { const a: boolean = d.isInt(); }
+
+    { const a: boolean = d.isNaN(); }
+
+    { const a: boolean = d.isNegative(); }
+    { const a: boolean = d.isNeg(); }
+
+    { const a: boolean = d.isPositive(); }
+    { const a: boolean = d.isPos(); }
+
+    { const a: boolean = d.isZero(); }
+
+    { const a: boolean = d.lessThan(1); }
+    { const a: boolean = d.lessThan("1"); }
+    { const a: boolean = d.lessThan(d); }
+    { const a: boolean = d.lt(1); }
+    { const a: boolean = d.lt("1"); }
+    { const a: boolean = d.lt(d); }
+
+    { const a: boolean = d.lessThanOrEqualTo(1); }
+    { const a: boolean = d.lessThanOrEqualTo("1"); }
+    { const a: boolean = d.lessThanOrEqualTo(d); }
+    { const a: boolean = d.lte(1); }
+    { const a: boolean = d.lte("1"); }
+    { const a: boolean = d.lte(d); }
+
+    { const a: Decimal = d.logarithm(); }
+    { const a: Decimal = d.logarithm(1); }
+    { const a: Decimal = d.logarithm("1"); }
+    { const a: Decimal = d.logarithm(d); }
+    { const a: Decimal = d.log(); }
+    { const a: Decimal = d.log(1); }
+    { const a: Decimal = d.log("1"); }
+    { const a: Decimal = d.log(d); }
+
+    { const a: Decimal = d.minus(1); }
+    { const a: Decimal = d.minus("1"); }
+    { const a: Decimal = d.minus(d); }
+    { const a: Decimal = d.sub(1); }
+    { const a: Decimal = d.sub("1"); }
+    { const a: Decimal = d.sub(d); }
+
+    { const a: Decimal = d.modulo(1); }
+    { const a: Decimal = d.modulo("1"); }
+    { const a: Decimal = d.modulo(d); }
+    { const a: Decimal = d.mod(1); }
+    { const a: Decimal = d.mod("1"); }
+    { const a: Decimal = d.mod(d); }
+
+    { const a: Decimal = d.naturalExponential(); }
+    { const a: Decimal = d.exp(); }
+
+    { const a: Decimal = d.naturalLogarithm(); }
+    { const a: Decimal = d.ln(); }
+
+    { const a: Decimal = d.negated(); }
+    { const a: Decimal = d.neg(); }
+
+    { const a: Decimal = d.plus(1); }
+    { const a: Decimal = d.plus("1"); }
+    { const a: Decimal = d.plus(d); }
+    { const a: Decimal = d.add(1); }
+    { const a: Decimal = d.add("1"); }
+    { const a: Decimal = d.add(d); }
+
+    { const a: number = d.precision(); }
+    { const a: number = d.precision(true); }
+    { const a: number = d.sd(); }
+    { const a: number = d.sd(true); }
+
+    { const a: Decimal = d.round(); }
+
+    { const a: Decimal = d.sine(); }
+    { const a: Decimal = d.sin(); }
+
+    { const a: Decimal = d.squareRoot(); }
+    { const a: Decimal = d.sqrt(); }
+
+    { const a: Decimal = d.tangent(); }
+    { const a: Decimal = d.tan(); }
+
+    { const a: Decimal = d.times(1); }
+    { const a: Decimal = d.times("1"); }
+    { const a: Decimal = d.times(d); }
+    { const a: Decimal = d.mul(1); }
+    { const a: Decimal = d.mul("1"); }
+    { const a: Decimal = d.mul(d); }
+
+    { const a: string = d.toBinary(); }
+    { const a: string = d.toBinary(1); }
+    { const a: string = d.toBinary(1, 1); }
+
+    { const a: Decimal = d.toDecimalPlaces(); }
+    { const a: Decimal = d.toDecimalPlaces(1); }
+    { const a: Decimal = d.toDecimalPlaces(1, 1); }
+    { const a: Decimal = d.toDP(); }
+    { const a: Decimal = d.toDP(1); }
+    { const a: Decimal = d.toDP(1, 1); }
+
+    { const a: string = d.toExponential(); }
+    { const a: string = d.toExponential(1); }
+    { const a: string = d.toExponential(1, 1); }
+
+    { const a: string = d.toFixed(); }
+    { const a: string = d.toFixed(1); }
+    { const a: string = d.toFixed(1, 1); }
+
+    { const a: Decimal[] = d.toFraction(); }
+    { const a: Decimal[] = d.toFraction(1); }
+    { const a: Decimal[] = d.toFraction("1"); }
+    { const a: Decimal[] = d.toFraction(d); }
+
+    { const a: string = d.toHexadecimal(); }
+    { const a: string = d.toHexadecimal(1); }
+    { const a: string = d.toHexadecimal(1, 1); }
+    { const a: string = d.toHex(); }
+    { const a: string = d.toHex(1); }
+    { const a: string = d.toHex(1, 1); }
+
+    { const a: string = d.toJSON(); }
+
+    { const a: Decimal = d.toNearest(); }
+    { const a: Decimal = d.toNearest(1); }
+    { const a: Decimal = d.toNearest("1"); }
+    { const a: Decimal = d.toNearest(d); }
+    { const a: Decimal = d.toNearest(d, 1); }
+
+    { const a: number = d.toNumber(); }
+
+    { const a: string = d.toOctal(); }
+    { const a: string = d.toOctal(1); }
+    { const a: string = d.toOctal(1, 1); }
+
+    { const a: Decimal = d.toPower(1); }
+    { const a: Decimal = d.toPower("1"); }
+    { const a: Decimal = d.toPower(d); }
+    { const a: Decimal = d.pow(1); }
+    { const a: Decimal = d.pow("1"); }
+    { const a: Decimal = d.pow(d); }
+
+    { const a: string = d.toPrecision(); }
+    { const a: string = d.toPrecision(1); }
+    { const a: string = d.toPrecision(1, 1); }
+
+    { const a: Decimal = d.toSignificantDigits(); }
+    { const a: Decimal = d.toSignificantDigits(1); }
+    { const a: Decimal = d.toSignificantDigits(1, 1); }
+    { const a: Decimal = d.toSD(); }
+    { const a: Decimal = d.toSD(1); }
+    { const a: Decimal = d.toSD(1, 1); }
+
+    { const a: string = d.toString(); }
+
+    { const a: Decimal = d.truncated(); }
+    { const a: Decimal = d.trunc(); }
+
+    { const a: string = d.valueOf(); }
+
+    { const a: Decimal = Decimal.abs(1); }
+    { const a: Decimal = Decimal.abs("1"); }
+    { const a: Decimal = Decimal.abs(d); }
+
+    { const a: Decimal = Decimal.acos(1); }
+    { const a: Decimal = Decimal.acos("1"); }
+    { const a: Decimal = Decimal.acos(d); }
+
+    { const a: Decimal = Decimal.acosh(1); }
+    { const a: Decimal = Decimal.acosh("1"); }
+    { const a: Decimal = Decimal.acosh(d); }
+
+    { const a: Decimal = Decimal.asin(1); }
+    { const a: Decimal = Decimal.asin("1"); }
+    { const a: Decimal = Decimal.asin(d); }
+
+    { const a: Decimal = Decimal.asinh(1); }
+    { const a: Decimal = Decimal.asinh("1"); }
+    { const a: Decimal = Decimal.asinh(d); }
+
+    { const a: Decimal = Decimal.atan(1); }
+    { const a: Decimal = Decimal.atan("1"); }
+    { const a: Decimal = Decimal.atan(d); }
+
+    { const a: Decimal = Decimal.atan2(1, 1); }
+    { const a: Decimal = Decimal.atan2("1", "1"); }
+    { const a: Decimal = Decimal.atan2(d, d); }
+
+    { const a: Decimal = Decimal.cbrt(1); }
+    { const a: Decimal = Decimal.cbrt("1"); }
+    { const a: Decimal = Decimal.cbrt(d); }
+
+    { const a: typeof Decimal = Decimal.clone({}); }
+    { const a: typeof Decimal = Decimal.clone({ crypto: true }); }
+    { const a: typeof Decimal = Decimal.clone({ defaults: true }); }
+    { const a: typeof Decimal = Decimal.clone({ maxE: 1 }); }
+    { const a: typeof Decimal = Decimal.clone({ minE: 1 }); }
+    { const a: typeof Decimal = Decimal.clone({ modulo: 1 }); }
+    { const a: typeof Decimal = Decimal.clone({ precision: 1 }); }
+    { const a: typeof Decimal = Decimal.clone({ rounding: 1 }); }
+    { const a: typeof Decimal = Decimal.clone({ toExpNeg: 1 }); }
+    { const a: typeof Decimal = Decimal.clone({ toExpPos: 1 }); }
+    { const a: typeof Decimal = Decimal.clone({}); }
+
+    { const a: typeof Decimal = Decimal.config({ crypto: true }); }
+    { const a: typeof Decimal = Decimal.config({ defaults: true }); }
+    { const a: typeof Decimal = Decimal.config({ maxE: 1 }); }
+    { const a: typeof Decimal = Decimal.config({ minE: 1 }); }
+    { const a: typeof Decimal = Decimal.config({ modulo: 1 }); }
+    { const a: typeof Decimal = Decimal.config({ precision: 1 }); }
+    { const a: typeof Decimal = Decimal.config({ rounding: 1 }); }
+    { const a: typeof Decimal = Decimal.config({ toExpNeg: 1 }); }
+    { const a: typeof Decimal = Decimal.config({ toExpPos: 1 }); }
+
+    { const a: typeof Decimal = Decimal.set({ crypto: true }); }
+    { const a: typeof Decimal = Decimal.set({ defaults: true }); }
+    { const a: typeof Decimal = Decimal.set({ maxE: 1 }); }
+    { const a: typeof Decimal = Decimal.set({ minE: 1 }); }
+    { const a: typeof Decimal = Decimal.set({ modulo: 1 }); }
+    { const a: typeof Decimal = Decimal.set({ precision: 1 }); }
+    { const a: typeof Decimal = Decimal.set({ rounding: 1 }); }
+    { const a: typeof Decimal = Decimal.set({ toExpNeg: 1 }); }
+    { const a: typeof Decimal = Decimal.set({ toExpPos: 1 }); }
+
+    { const a: Decimal = Decimal.cos(1); }
+    { const a: Decimal = Decimal.cos("1"); }
+    { const a: Decimal = Decimal.cos(d); }
+
+    { const a: Decimal = Decimal.div(1, 1); }
+    { const a: Decimal = Decimal.div("1", "1"); }
+    { const a: Decimal = Decimal.div(d, d); }
+
+    { const a: Decimal = Decimal.exp(1); }
+    { const a: Decimal = Decimal.exp("1"); }
+    { const a: Decimal = Decimal.exp(d); }
+
+    { const a: Decimal = Decimal.floor(1); }
+    { const a: Decimal = Decimal.floor("1"); }
+    { const a: Decimal = Decimal.floor(d); }
+
+    { const a: Decimal = Decimal.hypot(1); }
+    { const a: Decimal = Decimal.hypot("1"); }
+    { const a: Decimal = Decimal.hypot(d); }
+    { const a: Decimal = Decimal.hypot(1, 1); }
+    { const a: Decimal = Decimal.hypot("1", "1"); }
+    { const a: Decimal = Decimal.hypot(d, d); }
+    { const a: Decimal = Decimal.hypot(1, 1, 1); }
+    { const a: Decimal = Decimal.hypot("1", "1", "1"); }
+    { const a: Decimal = Decimal.hypot(d, d, d); }
+    { const a: Decimal = Decimal.hypot(1, 1, 1, 1, 1, 1, 1, 1, 1, d, 1, 1, 1, "1", d); }
+
+    { const a: boolean = Decimal.isDecimal(d); }
+
+    { const a: Decimal = Decimal.ln(1); }
+    { const a: Decimal = Decimal.ln("1"); }
+    { const a: Decimal = Decimal.ln(d); }
+
+    { const a: Decimal = Decimal.log(1); }
+    { const a: Decimal = Decimal.log("1"); }
+    { const a: Decimal = Decimal.log(d); }
+    { const a: Decimal = Decimal.log(1, 2); }
+    { const a: Decimal = Decimal.log("1", 2); }
+    { const a: Decimal = Decimal.log(d, 2); }
+
+    { const a: Decimal = Decimal.log2(1); }
+    { const a: Decimal = Decimal.log2("1"); }
+    { const a: Decimal = Decimal.log2(d); }
+
+    { const a: Decimal = Decimal.log10(1); }
+    { const a: Decimal = Decimal.log10("1"); }
+    { const a: Decimal = Decimal.log10(d); }
+
+    { const a: Decimal = Decimal.min(1, "1", 1, d); }
+
+    { const a: Decimal = Decimal.max(1, "1", 1, d); }
+
+    { const a: Decimal = Decimal.mul(1, 1); }
+    { const a: Decimal = Decimal.mul("1", "1"); }
+    { const a: Decimal = Decimal.mul(d, d); }
+
+    { const a: Decimal = Decimal.pow(1, 1); }
+    { const a: Decimal = Decimal.pow("1", "1"); }
+    { const a: Decimal = Decimal.pow(d, d); }
+
+    { const a: Decimal = Decimal.random(); }
+    { const a: Decimal = Decimal.random(1); }
+
+    { const a: Decimal = Decimal.round(1); }
+    { const a: Decimal = Decimal.round("1"); }
+    { const a: Decimal = Decimal.round(d); }
+
+    { const a: Decimal = Decimal.sign(1); }
+    { const a: Decimal = Decimal.sign("1"); }
+    { const a: Decimal = Decimal.sign(d); }
+
+    { const a: Decimal = Decimal.sin(1); }
+    { const a: Decimal = Decimal.sin("1"); }
+    { const a: Decimal = Decimal.sin(d); }
+
+    { const a: Decimal = Decimal.sinh(1); }
+    { const a: Decimal = Decimal.sinh("1"); }
+    { const a: Decimal = Decimal.sinh(d); }
+
+    { const a: Decimal = Decimal.sqrt(1); }
+    { const a: Decimal = Decimal.sqrt("1"); }
+    { const a: Decimal = Decimal.sqrt(d); }
+
+    { const a: Decimal = Decimal.sub(1, 1); }
+    { const a: Decimal = Decimal.sub("1", "1"); }
+    { const a: Decimal = Decimal.sub(d, d); }
+
+    { const a: Decimal = Decimal.tan(1); }
+    { const a: Decimal = Decimal.tan("1"); }
+    { const a: Decimal = Decimal.tan(d); }
+
+    { const a: Decimal = Decimal.tanh(1); }
+    { const a: Decimal = Decimal.tanh("1"); }
+    { const a: Decimal = Decimal.tanh(d); }
+
+    { const a: Decimal = Decimal.trunc(1); }
+    { const a: Decimal = Decimal.trunc("1"); }
+    { const a: Decimal = Decimal.trunc(d); }
+
+    { const a: number = Decimal.precision; }
+    { const a: number = Decimal.rounding; }
+    { const a: number = Decimal.toExpNeg; }
+    { const a: number = Decimal.minE; }
+    { const a: boolean = Decimal.crypto; }
+    { const a: number = Decimal.modulo; }
+    { const a: number = Decimal.ROUND_UP; }
+    { const a: number = Decimal.ROUND_DOWN; }
+    { const a: number = Decimal.ROUND_CEIL; }
+    { const a: number = Decimal.ROUND_FLOOR; }
+    { const a: number = Decimal.ROUND_HALF_UP; }
+    { const a: number = Decimal.ROUND_HALF_DOWN; }
+    { const a: number = Decimal.ROUND_HALF_EVEN; }
+    { const a: number = Decimal.ROUND_HALF_CEIL; }
+    { const a: number = Decimal.ROUND_HALF_FLOOR; }
+    { const a: number = Decimal.EUCLID; }
+}
diff --git a/types/adone/test/glosses/math/index.ts b/types/adone/test/glosses/math/index.ts
index 928977fad9..d85c08bdef 100644
--- a/types/adone/test/glosses/math/index.ts
+++ b/types/adone/test/glosses/math/index.ts
@@ -1,469 +1,7 @@
 namespace mathTests {
-    const { math } = adone;
-
-    namespace LongTests {
-        new math.Long();
-        new math.Long(0);
-        new math.Long(0, 0);
-        new math.Long(0, 0, true);
-
-        namespace toInt {
-            const a: number = new math.Long().toInt();
-        }
-
-        namespace toNumber {
-            const a: number = new math.Long().toNumber();
-        }
-
-        namespace toString {
-            const a: string = new math.Long().toString();
-            const b: string = new math.Long().toString(16);
-        }
-
-        namespace getHighBits {
-            const a: number = new math.Long().getHighBits();
-        }
-
-        namespace getLowBits {
-            const a: number = new math.Long().getLowBits();
-        }
-
-        namespace getLowBitsUnsigned {
-            const a: number = new math.Long().getLowBitsUnsigned();
-        }
-
-        namespace getHighBitsUnsigned {
-            const a: number = new math.Long().getHighBitsUnsigned();
-        }
-
-        namespace getNumBitsAbs {
-            const a: number = new math.Long().getNumBitsAbs();
-        }
-
-        namespace isZero {
-            const a: boolean = new math.Long().isZero();
-        }
-
-        namespace isNegative {
-            const a: boolean = new math.Long().isNegative();
-        }
-
-        namespace isPositive {
-            const a: boolean = new math.Long().isPositive();
-        }
-
-        namespace isOdd {
-            const a: boolean = new math.Long().isOdd();
-        }
-
-        namespace isEven {
-            const a: boolean = new math.Long().isEven();
-        }
-
-        namespace equals {
-            const a = new math.Long();
-            const b: boolean = a.equals(new math.Long());
-            const c: boolean = a.equals(1);
-            const d: boolean = a.equals("1");
-            const e: boolean = a.equals({ low: 0, high: 0 });
-        }
-
-        namespace lessThan {
-            const a = new math.Long();
-            const b: boolean = a.lessThan(new math.Long());
-            const c: boolean = a.lessThan(1);
-            const d: boolean = a.lessThan("1");
-            const e: boolean = a.lessThan({ low: 0, high: 0 });
-        }
-
-        namespace lessThanOrEqual {
-            const a = new math.Long();
-            const b: boolean = a.lessThanOrEqual(new math.Long());
-            const c: boolean = a.lessThanOrEqual(1);
-            const d: boolean = a.lessThanOrEqual("1");
-            const e: boolean = a.lessThanOrEqual({ low: 0, high: 0 });
-        }
-
-        namespace greaterThan {
-            const a = new math.Long();
-            const b: boolean = a.greaterThan(new math.Long());
-            const c: boolean = a.greaterThan(1);
-            const d: boolean = a.greaterThan("1");
-            const e: boolean = a.greaterThan({ low: 0, high: 0 });
-        }
-
-        namespace greaterThanOrEqual {
-            const a = new math.Long();
-            const b: boolean = a.greaterThanOrEqual(new math.Long());
-            const c: boolean = a.greaterThanOrEqual(1);
-            const d: boolean = a.greaterThanOrEqual("1");
-            const e: boolean = a.greaterThanOrEqual({ low: 0, high: 0 });
-        }
-
-        namespace compareTests {
-            const a = new math.Long();
-            const b: number = a.compare(new math.Long());
-            const c: number = a.compare(1);
-            const d: number = a.compare("1");
-            const e: number = a.compare({ low: 0, high: 0 });
-        }
-
-        namespace negate {
-            const a: adone.math.Long = new math.Long().negate();
-        }
-
-        namespace add {
-            const a = new math.Long();
-            const b: adone.math.Long = a.add(new math.Long());
-            const c: adone.math.Long = a.add(1);
-            const d: adone.math.Long = a.add("1");
-            const e: adone.math.Long = a.add({ low: 0, high: 0 });
-        }
-
-        namespace sub {
-            const a = new math.Long();
-            const b: adone.math.Long = a.sub(new math.Long());
-            const c: adone.math.Long = a.sub(1);
-            const d: adone.math.Long = a.sub("1");
-            const e: adone.math.Long = a.sub({ low: 0, high: 0 });
-        }
-
-        namespace mul {
-            const a = new math.Long();
-            const b: adone.math.Long = a.mul(new math.Long());
-            const c: adone.math.Long = a.mul(1);
-            const d: adone.math.Long = a.mul("1");
-            const e: adone.math.Long = a.mul({ low: 0, high: 0 });
-        }
-
-        namespace div {
-            const a = new math.Long();
-            const b: adone.math.Long = a.div(new math.Long());
-            const c: adone.math.Long = a.div(1);
-            const d: adone.math.Long = a.div("1");
-            const e: adone.math.Long = a.div({ low: 0, high: 0 });
-        }
-
-        namespace mod {
-            const a = new math.Long();
-            const b: adone.math.Long = a.mod(new math.Long());
-            const c: adone.math.Long = a.mod(1);
-            const d: adone.math.Long = a.mod("1");
-            const e: adone.math.Long = a.mod({ low: 0, high: 0 });
-        }
-
-        namespace not {
-            const a: adone.math.Long = new math.Long().not();
-        }
-
-        namespace and {
-            const a = new math.Long();
-            const b: adone.math.Long = a.and(new math.Long());
-            const c: adone.math.Long = a.and(1);
-            const d: adone.math.Long = a.and("1");
-            const e: adone.math.Long = a.and({ low: 0, high: 0 });
-        }
-
-        namespace or {
-            const a = new math.Long();
-            const b: adone.math.Long = a.or(new math.Long());
-            const c: adone.math.Long = a.or(1);
-            const d: adone.math.Long = a.or("1");
-            const e: adone.math.Long = a.or({ low: 0, high: 0 });
-        }
-
-        namespace xor {
-            const a = new math.Long();
-            const b: adone.math.Long = a.xor(new math.Long());
-            const c: adone.math.Long = a.xor(1);
-            const d: adone.math.Long = a.xor("1");
-            const e: adone.math.Long = a.xor({ low: 0, high: 0 });
-        }
-
-        namespace shl {
-            const a = new math.Long();
-            const b: adone.math.Long = a.shl(new math.Long());
-            const c: adone.math.Long = a.shl(1);
-        }
-
-        namespace shr {
-            const a = new math.Long();
-            const b: adone.math.Long = a.shr(new math.Long());
-            const c: adone.math.Long = a.shr(1);
-        }
-
-        namespace shru {
-            const a = new math.Long();
-            const b: adone.math.Long = a.shr(new math.Long());
-            const c: adone.math.Long = a.shr(1);
-        }
-
-        namespace toSigned {
-            const a: adone.math.Long = new math.Long().toSigned();
-        }
-
-        namespace toUnsigned {
-            const a: adone.math.Long = new math.Long().toUnsigned();
-        }
-
-        namespace toBytes {
-            const a: number[] = new math.Long().toBytes();
-        }
-
-        namespace toBytesLE {
-            const a: number[] = new math.Long().toBytesLE();
-        }
-
-        namespace static {
-            namespace fromInt {
-                const a: adone.math.Long = math.Long.fromInt(123);
-                const b: adone.math.Long = math.Long.fromInt(123, true);
-            }
-
-            namespace fromNumber {
-                const a: adone.math.Long = math.Long.fromNumber(123);
-                const b: adone.math.Long = math.Long.fromNumber(123, true);
-            }
-
-            namespace fromBits {
-                const a: adone.math.Long = math.Long.fromBits(0, 0);
-                const b: adone.math.Long = math.Long.fromBits(123, 0, true);
-            }
-
-            namespace fromString {
-                const a: adone.math.Long = math.Long.fromString("123");
-                const b: adone.math.Long = math.Long.fromString("123", true);
-                const c: adone.math.Long = math.Long.fromString("123", 16);
-                const d: adone.math.Long = math.Long.fromString("123", true, 16);
-            }
-
-            namespace fromValue {
-                const a: adone.math.Long = math.Long.fromValue(new math.Long());
-                const b: adone.math.Long = math.Long.fromValue(1);
-                const c: adone.math.Long = math.Long.fromValue("1");
-                const e: adone.math.Long = math.Long.fromValue({ low: 0, high: 0 });
-            }
-
-            namespace constants {
-                const a: adone.math.Long = math.Long.MIN_VALUE;
-                const b: adone.math.Long = math.Long.MAX_VALUE;
-                const c: adone.math.Long = math.Long.MAX_UNSIGNED_VALUE;
-                const d: adone.math.Long = math.Long.ZERO;
-                const e: adone.math.Long = math.Long.UZERO;
-                const f: adone.math.Long = math.Long.ONE;
-                const g: adone.math.Long = math.Long.UONE;
-                const h: adone.math.Long = math.Long.NEG_ONE;
-            }
-        }
-    }
-
-    namespace BigNumberTests {
-        const { BigNumber } = math;
-        type BigNumber = adone.math.BigNumber;
-
-        new BigNumber(10);
-        new BigNumber("10");
-        new BigNumber(new BigNumber(10));
-        new BigNumber("10", 2);
-
-        { const a: string = new BigNumber(1).toString(); }
-        { const a: string = new BigNumber(1).toString(2); }
-
-        { const a: number = new BigNumber(1).toNumber(); }
-
-        { const a: Buffer = new BigNumber(1).toBuffer(); }
-        { const a: Buffer = new BigNumber(1).toBuffer({}); }
-        { const a: Buffer = new BigNumber(1).toBuffer({ endian: 1 }); }
-        { const a: Buffer = new BigNumber(1).toBuffer({ endian: -1 }); }
-        { const a: Buffer = new BigNumber(1).toBuffer({ endian: "big" }); }
-        { const a: Buffer = new BigNumber(1).toBuffer({ endian: "little" }); }
-        { const a: Buffer = new BigNumber(1).toBuffer({ size: 1 }); }
-        { const a: Buffer = new BigNumber(1).toBuffer({ size: "auto" }); }
-
-        { const a: BigNumber = new BigNumber(10).add(1); }
-        { const a: BigNumber = new BigNumber(10).add("1"); }
-        { const a: BigNumber = new BigNumber(10).add(new BigNumber(1)); }
-
-        { const a: BigNumber = new BigNumber(10).sub(1); }
-        { const a: BigNumber = new BigNumber(10).sub("1"); }
-        { const a: BigNumber = new BigNumber(10).sub(new BigNumber(1)); }
-
-        { const a: BigNumber = new BigNumber(10).mul(1); }
-        { const a: BigNumber = new BigNumber(10).mul("1"); }
-        { const a: BigNumber = new BigNumber(10).mul(new BigNumber(1)); }
-
-        { const a: BigNumber = new BigNumber(10).div(1); }
-        { const a: BigNumber = new BigNumber(10).div("1"); }
-        { const a: BigNumber = new BigNumber(10).div(new BigNumber(1)); }
-
-        { const a: BigNumber = new BigNumber(10).abs(); }
-
-        { const a: BigNumber = new BigNumber(10).neg(); }
-
-        { const a: number = new BigNumber(10).cmp(1); }
-        { const a: number = new BigNumber(10).cmp("1"); }
-        { const a: number = new BigNumber(10).cmp(new BigNumber(1)); }
-
-        { const a: boolean = new BigNumber(10).gt(1); }
-        { const a: boolean = new BigNumber(10).gt("1"); }
-        { const a: boolean = new BigNumber(10).gt(new BigNumber(10)); }
-
-        { const a: boolean = new BigNumber(10).ge(1); }
-        { const a: boolean = new BigNumber(10).ge("1"); }
-        { const a: boolean = new BigNumber(10).ge(new BigNumber(10)); }
-
-        { const a: boolean = new BigNumber(10).eq(1); }
-        { const a: boolean = new BigNumber(10).eq("1"); }
-        { const a: boolean = new BigNumber(10).eq(new BigNumber(10)); }
-
-        { const a: boolean = new BigNumber(10).lt(1); }
-        { const a: boolean = new BigNumber(10).lt("1"); }
-        { const a: boolean = new BigNumber(10).lt(new BigNumber(10)); }
-
-        { const a: boolean = new BigNumber(10).le(1); }
-        { const a: boolean = new BigNumber(10).le("1"); }
-        { const a: boolean = new BigNumber(10).le(new BigNumber(10)); }
-
-        { const a: BigNumber = new BigNumber(10).and(1); }
-        { const a: BigNumber = new BigNumber(10).and("1"); }
-        { const a: BigNumber = new BigNumber(10).and(new BigNumber(1)); }
-
-        { const a: BigNumber = new BigNumber(10).or(1); }
-        { const a: BigNumber = new BigNumber(10).or("1"); }
-        { const a: BigNumber = new BigNumber(10).or(new BigNumber(1)); }
-
-        { const a: BigNumber = new BigNumber(10).xor(1); }
-        { const a: BigNumber = new BigNumber(10).xor("1"); }
-        { const a: BigNumber = new BigNumber(10).xor(new BigNumber(1)); }
-
-        { const a: BigNumber = new BigNumber(10).mod(1); }
-        { const a: BigNumber = new BigNumber(10).mod("1"); }
-        { const a: BigNumber = new BigNumber(10).mod(new BigNumber(1)); }
-
-        { const a: BigNumber = new BigNumber(10).pow(1); }
-        { const a: BigNumber = new BigNumber(10).pow("1"); }
-        { const a: BigNumber = new BigNumber(10).pow(new BigNumber(1)); }
-
-        { const a: BigNumber = new BigNumber(10).powm(1, 1); }
-        { const a: BigNumber = new BigNumber(10).powm("1", 1); }
-        { const a: BigNumber = new BigNumber(10).powm(new BigNumber(1), 1); }
-        { const a: BigNumber = new BigNumber(10).powm(1, "1"); }
-        { const a: BigNumber = new BigNumber(10).powm("1", "1"); }
-        { const a: BigNumber = new BigNumber(10).powm(new BigNumber(1), "1"); }
-        { const a: BigNumber = new BigNumber(10).powm(1, new BigNumber(1)); }
-        { const a: BigNumber = new BigNumber(10).powm("1", new BigNumber(1)); }
-        { const a: BigNumber = new BigNumber(10).powm(new BigNumber(1), new BigNumber(1)); }
-
-        { const a: BigNumber = new BigNumber(10).invertm(1); }
-        { const a: BigNumber = new BigNumber(10).invertm("1"); }
-        { const a: BigNumber = new BigNumber(10).invertm(new BigNumber(1)); }
-
-        { const a: BigNumber = new BigNumber(10).rand(); }
-        { const a: BigNumber = new BigNumber(10).rand(1); }
-        { const a: BigNumber = new BigNumber(10).rand("1"); }
-        { const a: BigNumber = new BigNumber(10).rand(new BigNumber(1)); }
-
-        { const a: boolean | "maybe" = new BigNumber(10).probPrime(); }
-
-        { const a: BigNumber = new BigNumber(10).nextPrime(); }
-
-        { const a: BigNumber = new BigNumber(10).sqrt(); }
-
-        { const a: BigNumber = new BigNumber(10).root(1); }
-        { const a: BigNumber = new BigNumber(10).root("1"); }
-        { const a: BigNumber = new BigNumber(10).root(new BigNumber(1)); }
-
-        { const a: BigNumber = new BigNumber(10).shiftLeft(1); }
-        { const a: BigNumber = new BigNumber(10).shiftLeft("1"); }
-        { const a: BigNumber = new BigNumber(10).shiftLeft(new BigNumber(1)); }
-
-        { const a: BigNumber = new BigNumber(10).shiftRight(1); }
-        { const a: BigNumber = new BigNumber(10).shiftRight("1"); }
-        { const a: BigNumber = new BigNumber(10).shiftRight(new BigNumber(1)); }
-
-        { const a: BigNumber = new BigNumber(10).gcd(1); }
-        { const a: BigNumber = new BigNumber(10).gcd("1"); }
-        { const a: BigNumber = new BigNumber(10).gcd(new BigNumber(1)); }
-
-        { const a: number = new BigNumber(10).jacobi(1); }
-        { const a: number = new BigNumber(10).jacobi("1"); }
-        { const a: number = new BigNumber(10).jacobi(new BigNumber(1)); }
-
-        { const a: number = new BigNumber(10).bitLength(); }
-
-        { const a: boolean = new BigNumber(10).isBitSet(10); }
-
-        { const a: BigNumber = BigNumber.prime(10); }
-        { const a: BigNumber = BigNumber.prime(10, true); }
-
-        { const a: BigNumber = BigNumber.fromBuffer(Buffer.alloc(10)); }
-        { const a: BigNumber = BigNumber.fromBuffer(Buffer.alloc(10), { endian: "little" }); }
-        { const a: BigNumber = BigNumber.fromBuffer(Buffer.alloc(10), { endian: -1 }); }
-        { const a: BigNumber = BigNumber.fromBuffer(Buffer.alloc(10), { endian: 1 }); }
-        { const a: BigNumber = BigNumber.fromBuffer(Buffer.alloc(10), { endian: "big" }); }
-        { const a: BigNumber = BigNumber.fromBuffer(Buffer.alloc(10), { size: "auto" }); }
-
-        { const a: BigNumber = BigNumber.ONE; }
-        { const a: BigNumber = BigNumber.ZERO; }
-    }
-
-    namespace bitSetTests {
-        const { BitSet } = math;
-        type BitSet = adone.math.BitSet;
-
-        new BitSet(10);
-        new BitSet(new BitSet(10).dehydrate());
-
-        { const a: boolean = new BitSet(10).get(0); }
-        { const a: boolean = new BitSet(10).set(0); }
-        { const a: boolean = new BitSet(10).setRange(0, 10); }
-        { const a: boolean = new BitSet(10).unset(0); }
-        { const a: boolean = new BitSet(10).unsetRange(0, 10); }
-        { const a: boolean = new BitSet(10).toggle(0); }
-        { const a: boolean = new BitSet(10).toggleRange(0, 10); }
-        { const a: boolean = new BitSet(10).clear(); }
-        { const a: BitSet = new BitSet(10).clone(); }
-        { const a: string = new BitSet(10).dehydrate(); }
-
-        { const a: BitSet = new BitSet(10).and(1); }
-        { const a: BitSet = new BitSet(10).and(new BitSet(10)); }
-
-        { const a: BitSet = new BitSet(10).or(1); }
-        { const a: BitSet = new BitSet(10).or(new BitSet(10)); }
-
-        { const a: BitSet = new BitSet(10).xor(1); }
-        { const a: BitSet = new BitSet(10).xor(new BitSet(10)); }
-
-        new BitSet(10).forEach((x: number) => {});
-        new BitSet(10).forEach((x: number) => false);
-
-        { const a: BitSet = new BitSet(10).circularShift(10); }
-        { const a: number = new BitSet(10).getCardinality(); }
-        { const a: number[] = new BitSet(10).getIndices(); }
-        { const a: boolean = new BitSet(10).isSubsetOf(new BitSet(10)); }
-        { const a: boolean = new BitSet(10).isEmpty(); }
-        { const a: boolean = new BitSet(10).isEqual(new BitSet(10)); }
-        { const a: string = new BitSet(10).toString(); }
-        { const a: number = new BitSet(10).ffs(); }
-        { const a: number = new BitSet(10).ffs(1); }
-        { const a: number = new BitSet(10).ffz(); }
-        { const a: number = new BitSet(10).ffz(1); }
-        { const a: number = new BitSet(10).fls(); }
-        { const a: number = new BitSet(10).fls(1); }
-        { const a: number = new BitSet(10).flz(); }
-        { const a: number = new BitSet(10).flz(1); }
-        { const a: number = new BitSet(10).nextSetBit(1); }
-        { const a: number = new BitSet(10).nextUnsetBit(1); }
-        { const a: number = new BitSet(10).previousSetBit(1); }
-        { const a: number = new BitSet(10).previousUnsetBit(1); }
-        { const a: number = new BitSet(10).readUInt(); }
-        { const a: number = new BitSet(10).readUInt(1); }
-        { const a: number = new BitSet(10).readUInt(1, 2); }
-        { new BitSet(10).writeUInt(1); }
-        { new BitSet(10).writeUInt(1, 2); }
-        { new BitSet(10).writeUInt(1, 2, 3); }
-        { const a: BitSet = BitSet.fromLong(new adone.math.Long(10, 20)); }
-    }
+    const {
+        math
+    } = adone;
 
     namespace randomTests {
         const { random } = math;
@@ -471,4 +9,22 @@ namespace mathTests {
         random(100);
         random(0, 10);
     }
+
+    namespace maxTests {
+        const { max } = math;
+        max([]);
+        { const a: number = max([1, 2, 3]); }
+        { const a: string = max(["1", "2", "3"]); }
+        { const a: string = max(["1", "2", "3"], (a) => a.length); }
+        { const a: number = max([1, 2, 3], (a) => a.toExponential()); }
+    }
+
+    namespace minTests {
+        const { min } = math;
+        min([]);
+        { const a: number = min([1, 2, 3]); }
+        { const a: string = min(["1", "2", "3"]); }
+        { const a: string = min(["1", "2", "3"], (a) => a.length); }
+        { const a: number = min([1, 2, 3], (a) => a.toExponential()); }
+    }
 }
diff --git a/types/adone/test/glosses/math/long.ts b/types/adone/test/glosses/math/long.ts
new file mode 100644
index 0000000000..f0dfa0b7ec
--- /dev/null
+++ b/types/adone/test/glosses/math/long.ts
@@ -0,0 +1,261 @@
+namespace mathTests.longTests {
+    const {
+        math: {
+            Long
+        }
+    } = adone;
+
+    new Long();
+    new Long(0);
+    new Long(0, 0);
+    new Long(0, 0, true);
+
+    namespace toInt {
+        const a: number = new Long().toInt();
+    }
+
+    namespace toNumber {
+        const a: number = new Long().toNumber();
+    }
+
+    namespace toString {
+        const a: string = new Long().toString();
+        const b: string = new Long().toString(16);
+    }
+
+    namespace getHighBits {
+        const a: number = new Long().getHighBits();
+    }
+
+    namespace getLowBits {
+        const a: number = new Long().getLowBits();
+    }
+
+    namespace getLowBitsUnsigned {
+        const a: number = new Long().getLowBitsUnsigned();
+    }
+
+    namespace getHighBitsUnsigned {
+        const a: number = new Long().getHighBitsUnsigned();
+    }
+
+    namespace getNumBitsAbs {
+        const a: number = new Long().getNumBitsAbs();
+    }
+
+    namespace isZero {
+        const a: boolean = new Long().isZero();
+    }
+
+    namespace isNegative {
+        const a: boolean = new Long().isNegative();
+    }
+
+    namespace isPositive {
+        const a: boolean = new Long().isPositive();
+    }
+
+    namespace isOdd {
+        const a: boolean = new Long().isOdd();
+    }
+
+    namespace isEven {
+        const a: boolean = new Long().isEven();
+    }
+
+    namespace equals {
+        const a = new Long();
+        const b: boolean = a.equals(new Long());
+        const c: boolean = a.equals(1);
+        const d: boolean = a.equals("1");
+        const e: boolean = a.equals({ low: 0, high: 0 });
+    }
+
+    namespace lessThan {
+        const a = new Long();
+        const b: boolean = a.lessThan(new Long());
+        const c: boolean = a.lessThan(1);
+        const d: boolean = a.lessThan("1");
+        const e: boolean = a.lessThan({ low: 0, high: 0 });
+    }
+
+    namespace lessThanOrEqual {
+        const a = new Long();
+        const b: boolean = a.lessThanOrEqual(new Long());
+        const c: boolean = a.lessThanOrEqual(1);
+        const d: boolean = a.lessThanOrEqual("1");
+        const e: boolean = a.lessThanOrEqual({ low: 0, high: 0 });
+    }
+
+    namespace greaterThan {
+        const a = new Long();
+        const b: boolean = a.greaterThan(new Long());
+        const c: boolean = a.greaterThan(1);
+        const d: boolean = a.greaterThan("1");
+        const e: boolean = a.greaterThan({ low: 0, high: 0 });
+    }
+
+    namespace greaterThanOrEqual {
+        const a = new Long();
+        const b: boolean = a.greaterThanOrEqual(new Long());
+        const c: boolean = a.greaterThanOrEqual(1);
+        const d: boolean = a.greaterThanOrEqual("1");
+        const e: boolean = a.greaterThanOrEqual({ low: 0, high: 0 });
+    }
+
+    namespace compareTests {
+        const a = new Long();
+        const b: number = a.compare(new Long());
+        const c: number = a.compare(1);
+        const d: number = a.compare("1");
+        const e: number = a.compare({ low: 0, high: 0 });
+    }
+
+    namespace negate {
+        const a: adone.math.Long = new Long().negate();
+    }
+
+    namespace add {
+        const a = new Long();
+        const b: adone.math.Long = a.add(new Long());
+        const c: adone.math.Long = a.add(1);
+        const d: adone.math.Long = a.add("1");
+        const e: adone.math.Long = a.add({ low: 0, high: 0 });
+    }
+
+    namespace sub {
+        const a = new Long();
+        const b: adone.math.Long = a.sub(new Long());
+        const c: adone.math.Long = a.sub(1);
+        const d: adone.math.Long = a.sub("1");
+        const e: adone.math.Long = a.sub({ low: 0, high: 0 });
+    }
+
+    namespace mul {
+        const a = new Long();
+        const b: adone.math.Long = a.mul(new Long());
+        const c: adone.math.Long = a.mul(1);
+        const d: adone.math.Long = a.mul("1");
+        const e: adone.math.Long = a.mul({ low: 0, high: 0 });
+    }
+
+    namespace div {
+        const a = new Long();
+        const b: adone.math.Long = a.div(new Long());
+        const c: adone.math.Long = a.div(1);
+        const d: adone.math.Long = a.div("1");
+        const e: adone.math.Long = a.div({ low: 0, high: 0 });
+    }
+
+    namespace mod {
+        const a = new Long();
+        const b: adone.math.Long = a.mod(new Long());
+        const c: adone.math.Long = a.mod(1);
+        const d: adone.math.Long = a.mod("1");
+        const e: adone.math.Long = a.mod({ low: 0, high: 0 });
+    }
+
+    namespace not {
+        const a: adone.math.Long = new Long().not();
+    }
+
+    namespace and {
+        const a = new Long();
+        const b: adone.math.Long = a.and(new Long());
+        const c: adone.math.Long = a.and(1);
+        const d: adone.math.Long = a.and("1");
+        const e: adone.math.Long = a.and({ low: 0, high: 0 });
+    }
+
+    namespace or {
+        const a = new Long();
+        const b: adone.math.Long = a.or(new Long());
+        const c: adone.math.Long = a.or(1);
+        const d: adone.math.Long = a.or("1");
+        const e: adone.math.Long = a.or({ low: 0, high: 0 });
+    }
+
+    namespace xor {
+        const a = new Long();
+        const b: adone.math.Long = a.xor(new Long());
+        const c: adone.math.Long = a.xor(1);
+        const d: adone.math.Long = a.xor("1");
+        const e: adone.math.Long = a.xor({ low: 0, high: 0 });
+    }
+
+    namespace shl {
+        const a = new Long();
+        const b: adone.math.Long = a.shl(new Long());
+        const c: adone.math.Long = a.shl(1);
+    }
+
+    namespace shr {
+        const a = new Long();
+        const b: adone.math.Long = a.shr(new Long());
+        const c: adone.math.Long = a.shr(1);
+    }
+
+    namespace shru {
+        const a = new Long();
+        const b: adone.math.Long = a.shr(new Long());
+        const c: adone.math.Long = a.shr(1);
+    }
+
+    namespace toSigned {
+        const a: adone.math.Long = new Long().toSigned();
+    }
+
+    namespace toUnsigned {
+        const a: adone.math.Long = new Long().toUnsigned();
+    }
+
+    namespace toBytes {
+        const a: number[] = new Long().toBytes();
+    }
+
+    namespace toBytesLE {
+        const a: number[] = new Long().toBytesLE();
+    }
+
+    namespace static {
+        namespace fromInt {
+            const a: adone.math.Long = Long.fromInt(123);
+            const b: adone.math.Long = Long.fromInt(123, true);
+        }
+
+        namespace fromNumber {
+            const a: adone.math.Long = Long.fromNumber(123);
+            const b: adone.math.Long = Long.fromNumber(123, true);
+        }
+
+        namespace fromBits {
+            const a: adone.math.Long = Long.fromBits(0, 0);
+            const b: adone.math.Long = Long.fromBits(123, 0, true);
+        }
+
+        namespace fromString {
+            const a: adone.math.Long = Long.fromString("123");
+            const b: adone.math.Long = Long.fromString("123", true);
+            const c: adone.math.Long = Long.fromString("123", 16);
+            const d: adone.math.Long = Long.fromString("123", true, 16);
+        }
+
+        namespace fromValue {
+            const a: adone.math.Long = Long.fromValue(new Long());
+            const b: adone.math.Long = Long.fromValue(1);
+            const c: adone.math.Long = Long.fromValue("1");
+            const e: adone.math.Long = Long.fromValue({ low: 0, high: 0 });
+        }
+
+        namespace constants {
+            const a: adone.math.Long = Long.MIN_VALUE;
+            const b: adone.math.Long = Long.MAX_VALUE;
+            const c: adone.math.Long = Long.MAX_UNSIGNED_VALUE;
+            const d: adone.math.Long = Long.ZERO;
+            const e: adone.math.Long = Long.UZERO;
+            const f: adone.math.Long = Long.ONE;
+            const g: adone.math.Long = Long.UONE;
+            const h: adone.math.Long = Long.NEG_ONE;
+        }
+    }
+}
diff --git a/types/adone/test/glosses/regex.ts b/types/adone/test/glosses/regex.ts
index 7aab1e0d8d..2acf6cc24e 100644
--- a/types/adone/test/glosses/regex.ts
+++ b/types/adone/test/glosses/regex.ts
@@ -7,7 +7,11 @@ namespace adoneTests.regex {
     regex.filename().test("a");
     regex.idn().test("a");
     regex.ip4().test("a");
+    regex.ip4({ exact: true }).test("a");
     regex.ip6().test("a");
+    regex.ip6({ exact: true }).test("a");
+    regex.ip().test("a");
+    regex.ip({ exact: true }).test("a");
     regex.protocol().test("a");
     regex.punycode().test("a");
     regex.shebang().test("a");
diff --git a/types/adone/test/index.ts b/types/adone/test/index.ts
index aec454539b..c97886c1e0 100644
--- a/types/adone/test/index.ts
+++ b/types/adone/test/index.ts
@@ -65,4 +65,9 @@ namespace AdoneRootTests {
         const b = new adone.benchmark.Benchmark.Suite();
         b.add(() => {}).add("", () => {}).run();
     }
+
+    namespace asyncTests {
+        adone.async.all([], () => {});
+        adone.async.forEach([], () => {});
+    }
 }
diff --git a/types/adone/tsconfig.json b/types/adone/tsconfig.json
index 6a1af264a3..3f02029dcc 100644
--- a/types/adone/tsconfig.json
+++ b/types/adone/tsconfig.json
@@ -22,6 +22,7 @@
     "files": [
         "adone-tests.ts",
         "adone.d.ts",
+        "async.d.ts",
         "benchmark.d.ts",
         "glosses/archives.d.ts",
         "glosses/assertion.d.ts",
@@ -44,7 +45,7 @@
         "glosses/collections/refcounted_cache.d.ts",
         "glosses/collections/set.d.ts",
         "glosses/collections/stack.d.ts",
-        "glosses/collections/timedout_map.d.ts",
+        "glosses/collections/time_map.d.ts",
         "glosses/compressors.d.ts",
         "glosses/crypto/asn1.d.ts",
         "glosses/crypto/ed25519.d.ts",
@@ -58,7 +59,11 @@
         "glosses/fast.d.ts",
         "glosses/fs.d.ts",
         "glosses/is.d.ts",
+        "glosses/math/bignumber.d.ts",
+        "glosses/math/bitset.d.ts",
+        "glosses/math/decimal.d.ts",
         "glosses/math/index.d.ts",
+        "glosses/math/long.d.ts",
         "glosses/math/matrix.d.ts",
         "glosses/math/simd.d.ts",
         "glosses/meta.d.ts",
@@ -111,7 +116,7 @@
         "test/glosses/collections/refcounted_cache.ts",
         "test/glosses/collections/set.ts",
         "test/glosses/collections/stack.ts",
-        "test/glosses/collections/timedout_map.ts",
+        "test/glosses/collections/time_map.ts",
         "test/glosses/compressors.ts",
         "test/glosses/crypto/asn1.ts",
         "test/glosses/crypto/ed25519.ts",
@@ -124,7 +129,11 @@
         "test/glosses/fast.ts",
         "test/glosses/fs.ts",
         "test/glosses/is.ts",
+        "test/glosses/math/bignumber.ts",
+        "test/glosses/math/bitset.ts",
+        "test/glosses/math/decimal.ts",
         "test/glosses/math/index.ts",
+        "test/glosses/math/long.ts",
         "test/glosses/math/matrix.ts",
         "test/glosses/math/simd.ts",
         "test/glosses/meta.ts",

From a146d147bbb945a124c005b1a5c5f7f835ed0c62 Mon Sep 17 00:00:00 2001
From: Glen M <glencfl@gmail.com>
Date: Thu, 19 Apr 2018 13:57:56 -0400
Subject: [PATCH 1370/1382] [atom] Support version v1.26. (#25111)

* [atom] bump to v1.26.

* [atom] support ContextMenu placement properties.
---
 types/atom/atom-tests.ts                |  4 ++
 types/atom/autocomplete-plus/index.d.ts |  9 ----
 types/atom/index.d.ts                   | 64 +++++++++++++++----------
 3 files changed, 44 insertions(+), 33 deletions(-)

diff --git a/types/atom/atom-tests.ts b/types/atom/atom-tests.ts
index 5396338e9c..57420d5059 100644
--- a/types/atom/atom-tests.ts
+++ b/types/atom/atom-tests.ts
@@ -88,6 +88,10 @@ function testAtomEnvironment() {
                 { label: "Undo", command: "core:undo" },
                 { label: "Redo", command: "core:redo" },
             ],
+            after: ["test"],
+            before: ["test"],
+            afterGroupContaining: ["test"],
+            beforeGroupContaining: ["test"]
         }],
     });
 
diff --git a/types/atom/autocomplete-plus/index.d.ts b/types/atom/autocomplete-plus/index.d.ts
index 8f23911540..5176ca0f30 100644
--- a/types/atom/autocomplete-plus/index.d.ts
+++ b/types/atom/autocomplete-plus/index.d.ts
@@ -30,15 +30,6 @@ export interface SuggestionInsertedEvent {
     suggestion: TextSuggestion|SnippetSuggestion;
 }
 
-/**
- *  COMPATIBILITY STUB. WILL BE REMOVED
- */
-// tslint:disable-next-line:no-empty-interface
-export interface Suggestion<
-  T extends { text: string }|{ snippet: string }
-  > extends SuggestionBase {}
-// TODO: Remove on next minor version
-
 /**
  *  An autocompletion suggestion for the user.
  *  Primary data type for the Atom Autocomplete+ service.
diff --git a/types/atom/index.d.ts b/types/atom/index.d.ts
index e46ee9d0cf..3cee95ace5 100644
--- a/types/atom/index.d.ts
+++ b/types/atom/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Atom 1.25
+// Type definitions for Atom 1.26
 // Project: https://github.com/atom/atom
 // Definitions by: GlenCFL <https://github.com/GlenCFL>
 //                 smhxx <https://github.com/smhxx>
@@ -7,7 +7,7 @@
 // TypeScript Version: 2.3
 
 // NOTE: only those classes exported within this file should be retain that status below.
-// https://github.com/atom/atom/blob/v1.25.0/exports/atom.js
+// https://github.com/atom/atom/blob/v1.26.0/exports/atom.js
 
 /// <reference types="node" />
 
@@ -1529,7 +1529,7 @@ export class TextEditor {
 
     /** Set the text in the given Range in buffer coordinates. */
     setTextInBufferRange(range: RangeCompatible, text: string, options?:
-        { normalizeLineEndings?: boolean, undo?: "skip" }): Range;
+        TextEditOptions): Range;
 
     /* For each selection, replace the selected text with the given text. */
     insertText(text: string, options?: TextInsertionOptions): Range|false;
@@ -5145,16 +5145,13 @@ export class TextBuffer {
     setTextViaDiff(text: string): void;
 
     /** Set the text in the given range. */
-    setTextInRange(range: RangeCompatible, text: string, options?:
-        { normalizeLineEndings?: boolean, undo?: "skip" }): Range;
+    setTextInRange(range: RangeCompatible, text: string, options?: TextEditOptions): Range;
 
     /** Insert text at the given position. */
-    insert(position: PointCompatible, text: string, options?:
-        { normalizeLineEndings?: boolean, undo?: "skip" }): Range;
+    insert(position: PointCompatible, text: string, options?: TextEditOptions): Range;
 
     /** Append text to the end of the buffer. */
-    append(text: string, options?: { normalizeLineEndings?: boolean, undo?:
-        "skip" }): Range;
+    append(text: string, options?: TextEditOptions): Range;
 
     /** Delete the text in the given range. */
     delete(range: RangeCompatible): Range;
@@ -5831,7 +5828,7 @@ export interface TextEditorObservedEvent {
 // information under certain contexts.
 
 // NOTE: the config schema with these defaults can be found here:
-//   https://github.com/atom/atom/blob/v1.25.0/src/config-schema.js
+//   https://github.com/atom/atom/blob/v1.26.0/src/config-schema.js
 /**
  *  Allows you to strongly type Atom configuration variables. Additional key:value
  *  pairings merged into this interface will result in configuration values under
@@ -6170,7 +6167,7 @@ export interface ConfirmationOptions {
     normalizeAccessKeys?: boolean;
 }
 
-export interface ContextMenuOptions {
+export interface ContextMenuItemOptions {
     /** The menu item's label. */
     label?: string;
 
@@ -6189,12 +6186,6 @@ export interface ContextMenuOptions {
     /** An array of additional items. */
     submenu?: ReadonlyArray<ContextMenuOptions>;
 
-    /**
-     *  If you want to create a separator, provide an item with type: 'separator'
-     *  and no other keys.
-     */
-    type?: "separator";
-
     /** Whether the menu item should appear in the menu. Defaults to true. */
     visible?: boolean;
 
@@ -6209,8 +6200,28 @@ export interface ContextMenuOptions {
      *  given context menu deployment.
      */
     shouldDisplay?(event: Event): void;
+
+    /** Place this menu item before the menu items representing the given commands. */
+    before?: ReadonlyArray<string>;
+
+    /** Place this menu item after the menu items representing the given commands. */
+    after?: ReadonlyArray<string>;
+
+    /**
+     * Place this menu item's group before the containing group of the menu items
+     * representing the given commands.
+     */
+    beforeGroupContaining?: ReadonlyArray<string>;
+
+    /**
+     * Place this menu item's group after the containing group of the menu items
+     * representing the given commands.
+     */
+    afterGroupContaining?: ReadonlyArray<string>;
 }
 
+export type ContextMenuOptions = ContextMenuItemOptions | { type: "separator" };
+
 export interface CopyMarkerOptions {
     /** Whether or not the marker should be tailed. */
     tailed?: boolean;
@@ -6483,7 +6494,18 @@ export interface SpawnProcessOptions {
     shell?: boolean | string;
 }
 
-export interface TextInsertionOptions {
+export interface TextEditOptions {
+    /** If true, all line endings will be normalized to match the editor's current mode. */
+    normalizeLineEndings?: boolean;
+
+    /**
+     * If skip, skips the undo stack for this operation.
+     * @deprecated Call groupLastChanges() on the TextBuffer afterward instead.
+     */
+    undo?: "skip";
+}
+
+export interface TextInsertionOptions extends TextEditOptions {
     /** If true, selects the newly added text. */
     select?: boolean;
 
@@ -6506,12 +6528,6 @@ export interface TextInsertionOptions {
      *  true, this behavior is suppressed.
      */
     preserveTrailingLineIndentation?: boolean;
-
-    /** If true, all line endings will be normalized to match the editor's current mode. */
-    normalizeLineEndings?: boolean;
-
-    /** If skip, skips the undo stack for this operation. */
-    undo?: "skip";
 }
 
 /** The options for a Bootstrap 3 Tooltip class, which Atom uses a variant of. */

From c72a09b00f0768979d783325adb21434c2b4c19d Mon Sep 17 00:00:00 2001
From: heroboy <yangweiqin@gmail.com>
Date: Fri, 20 Apr 2018 01:58:49 +0800
Subject: [PATCH 1371/1382] [THREE] add Curve.arcLengthDivisions (#25116)

* Update three-core.d.ts

add `optionalTarget` parameter

* Update three-core.d.ts

add Curve.arcLengthDivisions

* fix Indentation
---
 types/three/three-core.d.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/types/three/three-core.d.ts b/types/three/three-core.d.ts
index d08d7ad1db..d3bd6fadcc 100644
--- a/types/three/three-core.d.ts
+++ b/types/three/three-core.d.ts
@@ -6582,6 +6582,14 @@ export class AudioListener extends Object3D {
  * class Curve&lt;T extends Vector&gt;
  */
 export class Curve<T extends Vector> {
+	
+    /**
+     * This value determines the amount of divisions when calculating the cumulative segment lengths of a curve via .getLengths. 
+     * To ensure precision when using methods like .getSpacedPoints, it is recommended to increase .arcLengthDivisions if the curve is very large. 
+     * Default is 200.
+     */
+    arcLengthDivisions:number;
+	
     /**
      * Returns a vector for point t of the curve where t is between 0 and 1
      * getPoint(t: number): T;

From ac1a16b0d6beaaf3a4495a075cf78eee84bf17b8 Mon Sep 17 00:00:00 2001
From: ougunbu <36983387+ougunbu@users.noreply.github.com>
Date: Fri, 20 Apr 2018 01:59:28 +0800
Subject: [PATCH 1372/1382] Added the statement of ActiveSelection (#25084)

* Added the statement of ActiveSelection

A declaration about ActiveSelection has been added after Group.

* Update types

Line number 1723: changed any[] to Object[]
Line number 1751: changed any to Group
Line number 1751: changed "(activeSelection: ActiveSelection) => any" to "(activeSelection: ActiveSelection) => void"
---
 types/fabric/fabric-impl.d.ts | 41 +++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/types/fabric/fabric-impl.d.ts b/types/fabric/fabric-impl.d.ts
index 31509435a5..369856130c 100644
--- a/types/fabric/fabric-impl.d.ts
+++ b/types/fabric/fabric-impl.d.ts
@@ -1710,6 +1710,47 @@ export class Group {
 	static fromObject(object: any, callback: (group: Group) => any): void;
 }
 
+///////////////////////////////////////////////////////////////////////////////
+// ActiveSelection
+//////////////////////////////////////////////////////////////////////////////
+export interface ActiveSelection extends Object, ICollection<Group> {}
+export class ActiveSelection {
+	/**
+	 * Constructor
+	 * @param objects ActiveSelection objects
+	 * @param [options] Options object
+	 */
+	constructor(items?: Object[], options?: IObjectOptions);
+
+	/**
+     * Change te activeSelection to a normal group,
+     * High level function that automatically adds it to canvas as
+     * active object. no events fired.
+     */
+	toGroup(): Group;
+
+	/**
+	 * Removes objects from a collection, then renders canvas (if `renderOnAddRemove` is not `false`)
+	 * @param object Zero or more fabric instances
+	 * @return thisArg
+	 * @chainable
+	 */
+	remove(...object: Object[]): Group;
+
+	/**
+	 * Returns string represenation of a group
+	 */
+	toString(): string;
+
+	/**
+	 * Returns {@link fabric.ActiveSelection} instance from an object representation
+	 * @memberOf fabric.ActiveSelection
+	 * @param object Object to create a group from
+	 * @param [callback] Callback to invoke when an ActiveSelection instance is created
+	 */
+	static fromObject(object: Group, callback: (activeSelection: ActiveSelection) => void): void;
+}
+
 interface IImageOptions extends IObjectOptions {
 	/**
 	 * crossOrigin value (one of "", "anonymous", "allow-credentials")

From ef37d26fdfa8c98883ee665c3780c742a53bb612 Mon Sep 17 00:00:00 2001
From: Alex Watson <suniahk@users.noreply.github.com>
Date: Thu, 19 Apr 2018 14:00:04 -0400
Subject: [PATCH 1373/1382] Updating react-native-drawer definitions from 2.3
 to 2.5 (#25118)

* Updating types for v2.5.0 of react-native-drawer

* Adding credit for updates

* Increment version number

* Adding test contents for proposed changes

* Adding missing comment markers

* Removing bad asterisk
---
 types/react-native-drawer/index.d.ts                | 13 +++++++++++--
 .../react-native-drawer-tests.tsx                   |  3 +++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/types/react-native-drawer/index.d.ts b/types/react-native-drawer/index.d.ts
index ac64c55fd9..3a82e3363a 100644
--- a/types/react-native-drawer/index.d.ts
+++ b/types/react-native-drawer/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for react-native-drawer 2.3
+// Type definitions for react-native-drawer 2.5
 // Project: https://github.com/root-two/react-native-drawer
 // Definitions by: jnbt <https://github.com/jnbt>
+//                 suniahk <https://github.com/suniahk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -108,6 +109,10 @@ export interface DrawerProperties {
      * Callback fired at the start of an open animation
      */
     onOpenStart?(): void;
+    /**
+     * Callback fired when a drag gesture starts.
+     */
+    onDragStart?(): void;
     /**
      * Will be called immediately after the drawer has entered the closed state
      */
@@ -137,6 +142,10 @@ export interface DrawerProperties {
      * disable the drawer while still allowing programmatic control
      */
     acceptPan?: boolean;
+    /**
+     * Allow Pan when drawer is 'open'
+     */
+    acceptPanOnDrawer?: boolean;
     /**
      * Same as acceptTap, except only for close
      */
@@ -167,7 +176,7 @@ export interface DrawerProperties {
     /**
      * which side the drawer should be on.
      */
-    side?: 'left' | 'right';
+    side?: 'left' | 'right' | 'top' | 'bottom';
     /**
      * if true will run InteractionManager for open/close animations.
      */
diff --git a/types/react-native-drawer/react-native-drawer-tests.tsx b/types/react-native-drawer/react-native-drawer-tests.tsx
index 10aa1991bd..530fe25a1c 100644
--- a/types/react-native-drawer/react-native-drawer-tests.tsx
+++ b/types/react-native-drawer/react-native-drawer-tests.tsx
@@ -25,6 +25,9 @@ class DrawerTest extends React.Component<{}, {open: boolean}> {
               onClose={this.onClose}
               closedDrawerOffset={100}
               openDrawerOffset={(viewport: ScaledSize) => 50}
+              side={ "bottom" }
+              acceptPanOnDrawer={ true }
+              onDragStart={ () => {} }
             >
             </Drawer>
         );

From a3245ce3a48086d888729b5a748f6e3c3ffbcbb7 Mon Sep 17 00:00:00 2001
From: Erik Moldtmann <erik@moldtmann.de>
Date: Thu, 19 Apr 2018 20:05:36 +0200
Subject: [PATCH 1374/1382] change member types from variable to method
 (#25097)

---
 types/nodegit/diff-line.d.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/types/nodegit/diff-line.d.ts b/types/nodegit/diff-line.d.ts
index bf4ad7de91..7d1c071348 100644
--- a/types/nodegit/diff-line.d.ts
+++ b/types/nodegit/diff-line.d.ts
@@ -11,10 +11,10 @@ export class DiffLine {
      *
      */
     rawContent(): string;
-    origin: number;
-    oldLineno: number;
-    newLineno: number;
-    numLines: number;
-    contentLen: number;
-    contentOffset: number;
+    origin(): number;
+    oldLineno(): number;
+    newLineno(): number;
+    numLines(): number;
+    contentLen(): number;
+    contentOffset(): number;
 }

From 97c9e20e981fbbbabb724aa067b5ab27ac2b3f4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Pradel?= <pradel.leo@gmail.com>
Date: Thu, 19 Apr 2018 20:07:30 +0200
Subject: [PATCH 1375/1382] dotenv-safe 5.0 (#25124)

---
 types/dotenv-safe/dotenv-safe-tests.ts |  6 ++++++
 types/dotenv-safe/index.d.ts           | 29 +++++++++++++++++++-------
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/types/dotenv-safe/dotenv-safe-tests.ts b/types/dotenv-safe/dotenv-safe-tests.ts
index eca6c0937a..a204a4fc6c 100644
--- a/types/dotenv-safe/dotenv-safe-tests.ts
+++ b/types/dotenv-safe/dotenv-safe-tests.ts
@@ -5,3 +5,9 @@ env.load({
   path: "/foo/bar/baz.env",
   sample: "/foo/bar/qux.env"
 })
+
+env.config({
+  allowEmptyValues: true,
+  path: "/foo/bar/baz.env",
+  sample: "/foo/bar/qux.env"
+})
diff --git a/types/dotenv-safe/index.d.ts b/types/dotenv-safe/index.d.ts
index 2c696ae1b5..114edce926 100644
--- a/types/dotenv-safe/index.d.ts
+++ b/types/dotenv-safe/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for dotenv-safe 4.0
+// Type definitions for dotenv-safe 5.0
 // Project: https://github.com/rolodato/dotenv-safe
 // Definitions by: Stan Goldmann <https://github.com/krenor>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -18,12 +18,11 @@ export interface MissingEnvVarsError extends Error {
   missing: string[]
 }
 
-/**
- * Loads environment variables file into 'process.env'.
- *
- * @throws MissingEnvVarsError
- */
-export function load(options?: {
+export interface DotenvSafeOptions {
+  /**
+   * You can specify a custom path if your file containing environment variables is named or located differently.
+   * @default '.env'
+   */
   path?: string,
   /**
    * Path to example environment file.
@@ -45,4 +44,18 @@ export function load(options?: {
    * @default false
    */
   allowEmptyValues?: boolean,
-}): env.DotenvResult
+}
+
+/**
+ * Loads environment variables file into 'process.env'.
+ *
+ * @throws MissingEnvVarsError
+ */
+export function load(options?: DotenvSafeOptions): env.DotenvResult
+
+/**
+ * Loads environment variables file into 'process.env'.
+ *
+ * @throws MissingEnvVarsError
+ */
+export function config(options?: DotenvSafeOptions): env.DotenvResult

From 3b33d22565a7ae876841c3ddda8aa7d289191f6b Mon Sep 17 00:00:00 2001
From: Edward Sammut Alessi <Slessi@users.noreply.github.com>
Date: Thu, 19 Apr 2018 20:09:13 +0200
Subject: [PATCH 1376/1382] React-navigation onTransition event pass props
 (#25121)

* React-navigation onTransition prop passing

* Only transition start takes a promise
---
 types/react-navigation/index.d.ts                 |  9 +++++----
 types/react-navigation/react-navigation-tests.tsx | 12 ++++++++++--
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index 517ec8784d..d3f288c217 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -15,6 +15,7 @@
 //                 Steven Miller <https://github.com/YourGamesBeOver>
 //                 Armando Assuncao <https://github.com/ArmandoAssuncao>
 //                 Ciaran Liedeman <https://github.com/cliedeman>
+//                 Edward Sammut Alessi <https://github.com/Slessi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -283,8 +284,8 @@ export interface NavigationStackViewConfig {
     prevTransitionProps: NavigationTransitionProps,
     isModal: boolean,
   ) => TransitionConfig;
-  onTransitionStart?: () => void;
-  onTransitionEnd?: () => void;
+  onTransitionStart?: (transitionProps: NavigationTransitionProps, prevTransitionProps?: NavigationTransitionProps) => Promise<void> | void;
+  onTransitionEnd?: (transitionProps: NavigationTransitionProps, prevTransitionProps?: NavigationTransitionProps) => void;
 }
 
 export interface NavigationStackScreenOptions {
@@ -797,8 +798,8 @@ export interface TransitionerProps {
     prevTransitionProps?: NavigationTransitionProps
   ) => NavigationTransitionSpec;
   navigation: NavigationScreenProp<NavigationState>;
-  onTransitionEnd?: () => void;
-  onTransitionStart?: () => void;
+  onTransitionStart?: (transitionProps: NavigationTransitionProps, prevTransitionProps?: NavigationTransitionProps) => Promise<void> | void;
+  onTransitionEnd?: (transitionProps: NavigationTransitionProps, prevTransitionProps?: NavigationTransitionProps) => void;
   render: (
     transitionProps: NavigationTransitionProps,
     prevTransitionProps?: NavigationTransitionProps
diff --git a/types/react-navigation/react-navigation-tests.tsx b/types/react-navigation/react-navigation-tests.tsx
index ec43f2c86a..15ad2a62f5 100644
--- a/types/react-navigation/react-navigation-tests.tsx
+++ b/types/react-navigation/react-navigation-tests.tsx
@@ -329,8 +329,16 @@ class CustomTransitioner extends React.Component<CustomTransitionerProps, null>
                 configureTransition={this._configureTransition}
                 navigation={this.props.navigation}
                 render={this._render}
-                onTransitionStart={() => { }}
-                onTransitionEnd={() => { }}
+                onTransitionStart={(curr, prev) => {
+                    if (prev) {
+                        prev.position.setValue(curr.navigation.state.index);
+                    }
+                }}
+                onTransitionEnd={(curr, prev) => {
+                    if (prev) {
+                        prev.position.setValue(curr.navigation.state.index);
+                    }
+                }}
             />
         );
     }

From 97163eecd660296d4de02e4e1a6c87e5d9290f15 Mon Sep 17 00:00:00 2001
From: JFGHT <jsfuentes@alu.ucam.edu>
Date: Thu, 19 Apr 2018 20:11:54 +0200
Subject: [PATCH 1377/1382] Fixed AccountResponse's signers' object (#25095)

* Update index.d.ts

Fixed AccountResponse signers object.

* Update index.d.ts

Fixed public_key in another place.
---
 types/stellar-sdk/index.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/stellar-sdk/index.d.ts b/types/stellar-sdk/index.d.ts
index b098ea0896..f7eb20af73 100644
--- a/types/stellar-sdk/index.d.ts
+++ b/types/stellar-sdk/index.d.ts
@@ -92,7 +92,7 @@ export interface AccountRecord extends Record {
     >;
     signers: Array<
     {
-        _key: string
+        public_key: string
         weight: number
     }
     >;
@@ -425,7 +425,7 @@ export class AccountResponse implements AccountRecord {
         >;
     signers: Array<
         {
-            _key: string
+            public_key: string
             weight: number
         }
         >;

From 4f374d225e56812b71a70a02c8f9607abe6093fb Mon Sep 17 00:00:00 2001
From: Ricardo Albuquerque Pinto <ralbuque@sereno.com.br>
Date: Thu, 19 Apr 2018 15:15:21 -0300
Subject: [PATCH 1378/1382] React animate on scroll (#25131)

* Added type definitions for react-animate-on-scroll

* Corrected itens pointed by tslint
---
 types/react-animate-on-scroll/index.d.ts      | 24 +++++++++++++++++++
 .../react-animate-on-scroll-tests.tsx         | 12 ++++++++++
 types/react-animate-on-scroll/tsconfig.json   | 24 +++++++++++++++++++
 types/react-animate-on-scroll/tslint.json     |  1 +
 4 files changed, 61 insertions(+)
 create mode 100644 types/react-animate-on-scroll/index.d.ts
 create mode 100644 types/react-animate-on-scroll/react-animate-on-scroll-tests.tsx
 create mode 100644 types/react-animate-on-scroll/tsconfig.json
 create mode 100644 types/react-animate-on-scroll/tslint.json

diff --git a/types/react-animate-on-scroll/index.d.ts b/types/react-animate-on-scroll/index.d.ts
new file mode 100644
index 0000000000..6584833cbe
--- /dev/null
+++ b/types/react-animate-on-scroll/index.d.ts
@@ -0,0 +1,24 @@
+// Type definitions for react-animate-on-scroll 2.1
+// Project: https://github.com/dbramwell/react-animate-on-scroll
+// Definitions by: Ricardo Albuquerque <https://github.com/ralbuque>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+import * as React from 'react';
+
+export interface ScrollAnimationProps {
+    animateIn?: string;
+    animateOut?: string;
+    offset?: number;
+    duration?: number;
+    delay?: number;
+    initiallyVisible?: boolean;
+    animateOnce?: boolean;
+    style?: object;
+    scrollableParentSelector?: string;
+    className?: string;
+}
+
+export default class ScrollAnimation extends React.Component<ScrollAnimationProps> {
+    constructor(props: ScrollAnimationProps);
+}
diff --git a/types/react-animate-on-scroll/react-animate-on-scroll-tests.tsx b/types/react-animate-on-scroll/react-animate-on-scroll-tests.tsx
new file mode 100644
index 0000000000..cba9342f78
--- /dev/null
+++ b/types/react-animate-on-scroll/react-animate-on-scroll-tests.tsx
@@ -0,0 +1,12 @@
+import * as React from "react";
+import ScrollAnimation from 'react-animate-on-scroll';
+
+export default class ReactAnimateOnScrollTest extends React.Component {
+    render() {
+        return (
+            <ScrollAnimation animateIn="fadeIn">
+				Some Text
+            </ScrollAnimation>
+        );
+    }
+}
diff --git a/types/react-animate-on-scroll/tsconfig.json b/types/react-animate-on-scroll/tsconfig.json
new file mode 100644
index 0000000000..aff07b55c5
--- /dev/null
+++ b/types/react-animate-on-scroll/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"		
+        ],
+		"jsx": "react",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true        
+    },
+    "files": [
+        "index.d.ts",
+        "react-animate-on-scroll-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/types/react-animate-on-scroll/tslint.json b/types/react-animate-on-scroll/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-animate-on-scroll/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }

From f0bf0a7cef76f97cbbd43a5b853223b805c23a47 Mon Sep 17 00:00:00 2001
From: Alexey Gorshkov <agorshkov23@users.noreply.github.com>
Date: Thu, 19 Apr 2018 21:16:02 +0300
Subject: [PATCH 1379/1382] added typings for mapbox-gl-leaflet (#25120)

* added typings for mapbox-gl-leaflet

* fixed build errors
---
 types/mapbox-gl-leaflet/index.d.ts            | 20 ++++++++++++++++
 .../mapbox-gl-leaflet-tests.ts                | 14 +++++++++++
 types/mapbox-gl-leaflet/tsconfig.json         | 24 +++++++++++++++++++
 types/mapbox-gl-leaflet/tslint.json           |  3 +++
 4 files changed, 61 insertions(+)
 create mode 100644 types/mapbox-gl-leaflet/index.d.ts
 create mode 100644 types/mapbox-gl-leaflet/mapbox-gl-leaflet-tests.ts
 create mode 100644 types/mapbox-gl-leaflet/tsconfig.json
 create mode 100644 types/mapbox-gl-leaflet/tslint.json

diff --git a/types/mapbox-gl-leaflet/index.d.ts b/types/mapbox-gl-leaflet/index.d.ts
new file mode 100644
index 0000000000..34e3578eac
--- /dev/null
+++ b/types/mapbox-gl-leaflet/index.d.ts
@@ -0,0 +1,20 @@
+// Type definitions for mapbox-gl-leaflet 0.0
+// Project: https://github.com/brunob/leaflet.fullscreen
+// Definitions by: Alexey Gorshkov <https://github.com/agorshkov23>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as L from 'leaflet';
+
+declare module 'leaflet' {
+  class MapboxGL extends Layer {
+    constructor(options: MapboxGLOptions);
+  }
+
+  function mapboxGL(options: MapboxGLOptions): MapboxGL;
+
+  interface MapboxGLOptions {
+    accessToken: string;
+    style: string;
+  }
+}
diff --git a/types/mapbox-gl-leaflet/mapbox-gl-leaflet-tests.ts b/types/mapbox-gl-leaflet/mapbox-gl-leaflet-tests.ts
new file mode 100644
index 0000000000..3c8bc6a207
--- /dev/null
+++ b/types/mapbox-gl-leaflet/mapbox-gl-leaflet-tests.ts
@@ -0,0 +1,14 @@
+import * as L from 'leaflet';
+
+const token = 'token';
+
+const map = L.map('map').setView([38.912753, -77.032194], 15);
+L.marker([38.912753, -77.032194])
+    .bindPopup("Hello <b>Leaflet GL</b>!<br>Whoa, it works!")
+    .addTo(map)
+    .openPopup();
+
+const gl = L.mapboxGL({
+    accessToken: token,
+    style: 'mapbox://styles/mapbox/bright-v8'
+}).addTo(map);
diff --git a/types/mapbox-gl-leaflet/tsconfig.json b/types/mapbox-gl-leaflet/tsconfig.json
new file mode 100644
index 0000000000..0eef6c85dd
--- /dev/null
+++ b/types/mapbox-gl-leaflet/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "strictNullChecks": true,
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "mapbox-gl-leaflet-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/mapbox-gl-leaflet/tslint.json b/types/mapbox-gl-leaflet/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/mapbox-gl-leaflet/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}

From c9de295a0942129af7d4f16865326c33fb53fa34 Mon Sep 17 00:00:00 2001
From: Jacob Gillespie <jacobwgillespie@gmail.com>
Date: Thu, 19 Apr 2018 13:19:37 -0500
Subject: [PATCH 1380/1382] react: change default type value of snapshot to any
 (#24987)

* Add getSnapshotBeforeUpdate test for React.createElement

* Add test for using component with new lifecycles

* Add test for pure component with new lifecycle methods

* Chage react snapshot SS to default to any
---
 types/react/index.d.ts    |  4 ++--
 types/react/test/index.ts | 14 +++++++++++++-
 types/react/test/tsx.tsx  | 20 ++++++++++++++++++++
 3 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index b766eee600..123bf15d02 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -278,7 +278,7 @@ declare namespace React {
 
     // Base component for plain JS classes
     // tslint:disable-next-line:no-empty-interface
-    interface Component<P = {}, S = {}, SS = never> extends ComponentLifecycle<P, S, SS> { }
+    interface Component<P = {}, S = {}, SS = any> extends ComponentLifecycle<P, S, SS> { }
     class Component<P, S> {
         constructor(props: P, context?: any);
 
@@ -306,7 +306,7 @@ declare namespace React {
         };
     }
 
-    class PureComponent<P = {}, S = {}> extends Component<P, S> { }
+    class PureComponent<P = {}, S = {}, SS = any> extends Component<P, S, SS> { }
 
     interface ClassicComponent<P = {}, S = {}> extends Component<P, S> {
         replaceState(nextState: S, callback?: () => void): void;
diff --git a/types/react/test/index.ts b/types/react/test/index.ts
index 6dae0cbe3c..64d1b20955 100644
--- a/types/react/test/index.ts
+++ b/types/react/test/index.ts
@@ -25,6 +25,10 @@ interface State {
     seconds?: number;
 }
 
+interface Snapshot {
+    baz: string;
+}
+
 interface Context {
     someValue?: string;
 }
@@ -51,7 +55,7 @@ declare const container: Element;
 // Top-Level API
 // --------------------------------------------------------------------------
 
-class ModernComponent extends React.Component<Props, State>
+class ModernComponent extends React.Component<Props, State, Snapshot>
     implements MyComponent, React.ChildContextProvider<ChildContext> {
     static propTypes: React.ValidationMap<Props> = {
         foo: PropTypes.number
@@ -103,6 +107,14 @@ class ModernComponent extends React.Component<Props, State>
     shouldComponentUpdate(nextProps: Props, nextState: State, nextContext: any): boolean {
         return shallowCompare(this, nextProps, nextState);
     }
+
+    getSnapshotBeforeUpdate(prevProps: Readonly<Props>) {
+        return { baz: `${prevProps.foo}baz` };
+    }
+
+    componentDidUpdate(prevProps: Readonly<Props>, prevState: Readonly<State>, snapshot: Snapshot) {
+        return;
+    }
 }
 
 class ModernComponentArrayRender extends React.Component<Props> {
diff --git a/types/react/test/tsx.tsx b/types/react/test/tsx.tsx
index dca7a1f814..431cef2fa0 100644
--- a/types/react/test/tsx.tsx
+++ b/types/react/test/tsx.tsx
@@ -153,6 +153,26 @@ class ComponentWithNewLifecycles extends React.Component<NewProps, NewState, { b
         return this.state.bar;
     }
 }
+<ComponentWithNewLifecycles foo="bar" />;
+
+class PureComponentWithNewLifecycles extends React.PureComponent<NewProps, NewState, { baz: string }> {
+    static getDerivedStateFromProps: React.GetDerivedStateFromProps<NewProps, NewState> = (nextProps) => {
+        return { bar: `${nextProps.foo}bar` };
+    }
+
+    getSnapshotBeforeUpdate(prevProps: Readonly<NewProps>) {
+        return { baz: `${prevProps.foo}baz` };
+    }
+
+    componentDidUpdate(prevProps: Readonly<NewProps>, prevState: Readonly<NewState>, snapshot: { baz: string }) {
+        return;
+    }
+
+    render() {
+        return this.state.bar;
+    }
+}
+<PureComponentWithNewLifecycles foo="bar" />;
 
 class ComponentWithLargeState extends React.Component<{}, Record<'a'|'b'|'c', string>> {
     static getDerivedStateFromProps: React.GetDerivedStateFromProps<{}, Record<'a'|'b'|'c', string>> = () => {

From 57f3c174f95b1d74cda580cc0b497eff62d1363b Mon Sep 17 00:00:00 2001
From: Edo Rivai <edo.rivai@gmail.com>
Date: Thu, 19 Apr 2018 20:42:38 +0200
Subject: [PATCH 1381/1382] [knex] Add QueryBuilder to knex.raw bindings
 (#25100)

* Ignore no-var tslint rule

* [knex] Add QueryBuilder to knex.raw bindings
---
 types/knex/index.d.ts    | 11 +++++------
 types/knex/knex-tests.ts | 15 ++++++++++++---
 types/knex/tslint.json   |  1 +
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/types/knex/index.d.ts b/types/knex/index.d.ts
index 34715ec6cc..90a700b7dc 100644
--- a/types/knex/index.d.ts
+++ b/types/knex/index.d.ts
@@ -18,7 +18,7 @@ import Bluebird = require("bluebird");
 type Callback = Function;
 type Client = Function;
 type Value = string | number | boolean | Date | Array<string> | Array<number> | Array<Date> | Array<boolean> | Buffer | Knex.Raw;
-type ValueMap = { [key: string]: Value };
+type ValueMap = { [key: string]: Value | Knex.QueryBuilder };
 type ColumnName = string | Knex.Raw | Knex.QueryBuilder | {[key: string]: string };
 type TableName = string | Knex.Raw | Knex.QueryBuilder;
 
@@ -338,8 +338,8 @@ declare namespace Knex {
     }
 
     interface RawQueryBuilder {
-        (sql: string, ...bindings: Value[]): QueryBuilder;
-        (sql: string, bindings: Value[] | ValueMap): QueryBuilder;
+        (sql: string, ...bindings: (Value | QueryBuilder)[]): QueryBuilder;
+        (sql: string, bindings: (Value | QueryBuilder)[] | ValueMap): QueryBuilder;
         (raw: Raw): QueryBuilder;
     }
 
@@ -351,9 +351,8 @@ declare namespace Knex {
 
     interface RawBuilder {
         (value: Value): Raw;
-        (sql: string, ...bindings: Value[]): Raw;
-        (sql: string, bindings: Value[]): Raw;
-        (sql: string, bindings: ValueMap): Raw;
+        (sql: string, ...bindings: (Value | QueryBuilder)[]): Raw;
+        (sql: string, bindings: (Value | QueryBuilder)[] | ValueMap): Raw;
     }
 
     //
diff --git a/types/knex/knex-tests.ts b/types/knex/knex-tests.ts
index 112732a2e5..eaf186a186 100644
--- a/types/knex/knex-tests.ts
+++ b/types/knex/knex-tests.ts
@@ -247,6 +247,7 @@ knex('users').whereNotBetween('votes', [1, 100]);
 
 knex('users').whereRaw('id = ?', [1]);
 knex('users').whereRaw('id = :id', { id: 1 });
+knex('users').whereRaw('id = :id', { id: knex('users').select('id').limit(1) });
 
 // Join methods
 knex('users')
@@ -409,7 +410,15 @@ knex.select('*').from('users').join('accounts', (join: Knex.JoinClause) => {
 
 knex.select('*').from('users').join('accounts', 'accounts.type', knex.raw('?', ['admin']));
 
+knex.raw('? ON CONFLICT DO NOTHING', [knex('account').insert([{}])]);
+knex.raw('select * from users where id = ? OR id = ?',
+  1,
+  knex('users').select('id').limit(1),
+);
 knex.raw('select * from users where id = :user_id', { user_id: 1 });
+knex.raw('select * from users where id = :user_id_query', {
+  user_id_query: knex('ids').select('id').limit(1)
+});
 
 knex.from('users').innerJoin('accounts', 'users.id', 'accounts.user_id');
 
@@ -812,7 +821,7 @@ knex('users')
   .orWhere(knex.raw('status <> ?', [1]))
   .groupBy('status');
 
-  knex.raw('select * from users where id = ?', [1]).then(function(resp) {
+knex.raw('select * from users where id = ?', [1]).then(function(resp) {
     // ...
   });
 
@@ -963,9 +972,9 @@ knex.select('*')
     // ...
   });
 
-  knex.select('*').from('users').where(knex.raw('id = ?', [1])).toString();
+knex.select('*').from('users').where(knex.raw('id = ?', [1])).toString();
 
-  knex.select('*').from('users').where(knex.raw('id = ?', [1])).toSQL();
+knex.select('*').from('users').where(knex.raw('id = ?', [1])).toSQL();
 
 //
 // Callback functions
diff --git a/types/knex/tslint.json b/types/knex/tslint.json
index cf7f07f094..d84fe24e60 100644
--- a/types/knex/tslint.json
+++ b/types/knex/tslint.json
@@ -50,6 +50,7 @@
         "no-unnecessary-type-assertion": false,
         "no-useless-files": false,
         "no-var-keyword": false,
+        "no-var": false,
         "no-var-requires": false,
         "no-void-expression": false,
         "no-trailing-whitespace": false,

From 8a3389ca45cca46006f367337f707559d27d44b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=B8rch?= <tbowmo@users.noreply.github.com>
Date: Thu, 19 Apr 2018 20:43:24 +0200
Subject: [PATCH 1382/1382] Adding more siblings to Red interface in node-red
 (#25013)

* Adding more siblings to Red interface in node-red

* Fixed typo
---
 types/node-red/index.d.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/types/node-red/index.d.ts b/types/node-red/index.d.ts
index 8a013128c8..4c9a1f093a 100644
--- a/types/node-red/index.d.ts
+++ b/types/node-red/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for node-red 0.17
 // Project: http://nodered.org
 // Definitions by: Anders E. Andersen <https://github.com/andersea>
+//                 Thomas B. Mørch <https://github.com/tbowmo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -18,6 +19,12 @@ export interface Red {
     settings: any;
     events: any;
     util: any;
+    httpAdmin: any;
+    auth: any;
+    comms: any;
+    library: any;
+    httpNode: any;
+    server: any;
     /** Returns the version of the running Node-RED environment. */
     version(): string;
 }